diff --git a/.cargo/collab-config.toml b/.cargo/collab-config.toml
deleted file mode 100644
index 74603802d8..0000000000
--- a/.cargo/collab-config.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file is used to build collab in a Docker image.
-# In particular, we don't use clang.
-[build]
-# v0 mangling scheme provides more detailed backtraces around closures
-rustflags = ["-C", "symbol-mangling-version=v0", "--cfg", "tokio_unstable"]
diff --git a/.cloudflare/README.md b/.cloudflare/README.md
deleted file mode 100644
index d21377ddff..0000000000
--- a/.cloudflare/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-We have two cloudflare workers that let us serve some assets of this repo
-from Cloudflare.
-
-- `open-source-website-assets` is used for `install.sh`
-- `docs-proxy` is used for `https://zed.dev/docs`
-
-On push to `main`, both of these (and the files they depend on) are uploaded to Cloudflare.
-
-### Deployment
-
-These functions are deployed on push to main by the deploy_cloudflare.yml workflow. Worker Rules in Cloudflare intercept requests to zed.dev and proxy them to the appropriate workers.
-
-### Testing
-
-You can use [wrangler](https://developers.cloudflare.com/workers/cli-wrangler/install-update) to test these workers locally, or to deploy custom versions.
diff --git a/.cloudflare/docs-proxy/src/worker.js b/.cloudflare/docs-proxy/src/worker.js
deleted file mode 100644
index f9f441883a..0000000000
--- a/.cloudflare/docs-proxy/src/worker.js
+++ /dev/null
@@ -1,14 +0,0 @@
-export default {
-  async fetch(request, _env, _ctx) {
-    const url = new URL(request.url);
-    url.hostname = "docs-anw.pages.dev";
-
-    let res = await fetch(url, request);
-
-    if (res.status === 404) {
-      res = await fetch("https://zed.dev/404");
-    }
-
-    return res;
-  },
-};
diff --git a/.cloudflare/docs-proxy/wrangler.toml b/.cloudflare/docs-proxy/wrangler.toml
deleted file mode 100644
index b5262cc070..0000000000
--- a/.cloudflare/docs-proxy/wrangler.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-name = "docs-proxy"
-main = "src/worker.js"
-compatibility_date = "2024-05-03"
-workers_dev = true
-
-[[routes]]
-pattern = "zed.dev/docs*"
-zone_name = "zed.dev"
diff --git a/.cloudflare/open-source-website-assets/src/worker.js b/.cloudflare/open-source-website-assets/src/worker.js
deleted file mode 100644
index be34f8d118..0000000000
--- a/.cloudflare/open-source-website-assets/src/worker.js
+++ /dev/null
@@ -1,19 +0,0 @@
-export default {
-  async fetch(request, env) {
-    const url = new URL(request.url);
-    const key = url.pathname.slice(1);
-
-    const object = await env.OPEN_SOURCE_WEBSITE_ASSETS_BUCKET.get(key);
-    if (!object) {
-      return await fetch("https://zed.dev/404");
-    }
-
-    const headers = new Headers();
-    object.writeHttpMetadata(headers);
-    headers.set("etag", object.httpEtag);
-
-    return new Response(object.body, {
-      headers,
-    });
-  },
-};
diff --git a/.cloudflare/open-source-website-assets/wrangler.toml b/.cloudflare/open-source-website-assets/wrangler.toml
deleted file mode 100644
index b4947fa938..0000000000
--- a/.cloudflare/open-source-website-assets/wrangler.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-name = "open-source-website-assets"
-main = "src/worker.js"
-compatibility_date = "2024-05-15"
-workers_dev = true
-
-[[r2_buckets]]
-binding = 'OPEN_SOURCE_WEBSITE_ASSETS_BUCKET'
-bucket_name = 'zed-open-source-website-assets'
diff --git a/.config/nextest.toml b/.config/nextest.toml
index 49fb4d01f7..e8fa9bdf9d 100644
--- a/.config/nextest.toml
+++ b/.config/nextest.toml
@@ -1,20 +1,5 @@
-[test-groups]
-sequential-db-tests = { max-threads = 1 }
+# Nextest configuration for GPUI
+# https://nexte.st/book/configuration.html
 
-[[profile.default.overrides]]
-filter = 'package(db)'
-test-group = 'sequential-db-tests'
-
-# Run slowest tests first.
-#
-[[profile.default.overrides]]
-filter = 'package(worktree) and test(test_random_worktree_changes)'
-priority = 100
-
-[[profile.default.overrides]]
-filter = 'package(collab) and (test(random_project_collaboration_tests) or test(random_channel_buffer_tests) or test(test_contact_requests) or test(test_basic_following))'
-priority = 99
-
-[[profile.default.overrides]]
-filter = 'package(extension_host) and test(test_extension_store_with_test_extension)'
-priority = 99
+[profile.default]
+# Default test settings
\ No newline at end of file
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
deleted file mode 100644
index fbcc76a865..0000000000
--- a/.git-blame-ignore-revs
+++ /dev/null
@@ -1,36 +0,0 @@
-# .git-blame-ignore-revs
-#
-# This file consists of a list of commits that should be ignored for
-# `git blame` purposes. This is useful for ignoring commits that only
-# changed whitespace / indentation / formatting, but did not change
-# the underlying syntax tree.
-#
-# GitHub will pick this up automatically for blame views:
-#   https://docs.github.com/en/repositories/working-with-files/using-files/viewing-a-file#ignore-commits-in-the-blame-view
-# To use this file locally, run:
-#   git blame --ignore-revs-file .git-blame-ignore-revs
-# To always use this file by default, run:
-#   git config --local blame.ignoreRevsFile .git-blame-ignore-revs
-# To disable this functionality, run:
-#   git config --local blame.ignoreRevsFile ""
-# Comments are optional, but may provide helpful context.
-
-# 2023-04-20 Set default tab_size for JSON to 2 and apply new formatting
-# https://github.com/zed-industries/zed/pull/2394
-eca93c124a488b4e538946cd2d313bd571aa2b86
-
-# 2024-02-15 Format YAML files
-# https://github.com/zed-industries/zed/pull/7887
-a161a7d0c95ca7505bf9218bfae640ee5444c88b
-
-# 2024-02-25 Format JSON files in assets/
-# https://github.com/zed-industries/zed/pull/8405
-ffdda588b41f7d9d270ffe76cab116f828ad545e
-
-# 2024-07-05 Improved formatting of default keymaps (single line per bind)
-# https://github.com/zed-industries/zed/pull/13887
-813cc3f5e537372fc86720b5e71b6e1c815440ab
-
-# 2024-07-24 docs: Format docs
-# https://github.com/zed-industries/zed/pull/15352
-3a44a59f8ec114ac1ba22f7da1652717ef7e4e5c
diff --git a/.gitattributes b/.gitattributes
index 57afd4ea69..9973cfb4db 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,2 @@
 # Prevent GitHub from displaying comments within JSON files as errors.
 *.json linguist-language=JSON-with-Comments
-
-# Ensure the WSL script always has LF line endings, even on Windows
-crates/zed/resources/windows/zed.sh text eol=lf
diff --git a/.github/ISSUE_TEMPLATE/10_bug_report.yml b/.github/ISSUE_TEMPLATE/10_bug_report.yml
deleted file mode 100644
index cae10f02ec..0000000000
--- a/.github/ISSUE_TEMPLATE/10_bug_report.yml
+++ /dev/null
@@ -1,115 +0,0 @@
-name: Report a bug
-description: Report a problem with Zed.
-type: Bug
-labels: "state:needs triage"
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Is this bug already reported? Upvote to get it noticed faster. [Here's the search](https://github.com/zed-industries/zed/issues). Upvote means giving it a :+1: reaction.
-
-        Feature request? Please open in [discussions](https://github.com/zed-industries/zed/discussions/new/choose) instead.
-
-        Just have a question or need support? Welcome to [Discord Support Forums](https://discord.com/invite/zedindustries).
-  - type: textarea
-    attributes:
-      label: Reproduction steps
-      description: A step-by-step description of how to reproduce the bug from a **clean Zed install**. The more context you provide, the easier it is to find and fix the problem fast.
-      placeholder: |
-        1. Start Zed
-        2. Click X
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Current vs. Expected behavior
-      description: |
-        Current behavior (screenshots, videos, etc. are appreciated), vs. what you expected the behavior to be.
-
-      placeholder: |
-        Current behavior: <screenshot with an arrow> The icon is blue. Expected behavior: The icon should be red because this is what the setting is documented to do.
-    validations:
-      required: true
-  - type: textarea
-    id: environment
-    attributes:
-      label: Zed version and system specs
-      description: |
-        Open the command palette in Zed, then type “zed: copy system specs into clipboard”.
-      placeholder: |
-        Zed: v0.215.0 (Zed Nightly bfe141ea79aa4984028934067ba75c48d99136ae)
-        OS: macOS 15.1
-        Memory: 36 GiB
-        Architecture: aarch64
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Attach Zed log file
-      description: |
-        Open the command palette in Zed, then type `zed: open log` to see the last 1000 lines. Or type `zed: reveal log in file manager` in the command palette to reveal the log file itself.
-      value: |
-        <details><summary>Zed.log</summary>
-
-        <!-- Paste your log inside the code block. -->
-        ```log
-
-        ```
-
-        </details>
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Relevant Zed settings
-      description: |
-        Open the command palette in Zed, then type “zed: open settings file” and copy/paste any relevant (e.g., LSP-specific) settings.
-      value: |
-        <details><summary>settings.json</summary>
-
-        <!-- Paste your settings inside the code block. -->
-        ```json
-
-        ```
-
-        </details>
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Relevant Keymap
-      description: |
-        Open the command palette in Zed, then type “zed: open keymap file” and copy/paste the file's contents.
-      value: |
-        <details><summary>keymap.json</summary>
-
-        <!-- Paste your keymap file inside the code block. -->
-        ```json
-
-        ```
-
-        </details>
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: (for AI issues) Model provider details
-      placeholder: |
-        - Provider: (Anthropic via ZedPro, Anthropic via API key, Copilot Chat, Mistral, OpenAI, etc.)
-        - Model Name: (Claude Sonnet 4.5, Gemini 3 Pro, GPT-5)
-        - Mode: (Agent Panel, Inline Assistant, Terminal Assistant or Text Threads)
-        - Other details (ACPs, MCPs, other settings, etc.):
-    validations:
-      required: false
-  - type: dropdown
-    attributes:
-      label: If you are using WSL on Windows, what flavor of Linux are you using?
-      multiple: false
-      options:
-        - Arch Linux
-        - Ubuntu
-        - Fedora
-        - Mint
-        - Pop!_OS
-        - NixOS
-        - Other
diff --git a/.github/ISSUE_TEMPLATE/11_crash_report.yml b/.github/ISSUE_TEMPLATE/11_crash_report.yml
deleted file mode 100644
index a019848e87..0000000000
--- a/.github/ISSUE_TEMPLATE/11_crash_report.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-name: Report a crash
-description: Zed is crashing or freezing or hanging.
-type: Crash
-labels: "state:needs triage"
-body:
-  - type: textarea
-    attributes:
-      label: Reproduction steps
-      description: A step-by-step description of how to reproduce the crash from a **clean Zed install**. The more context you provide, the easier it is to find and fix the problem fast.
-      placeholder: |
-        1. Start Zed
-        2. Perform an action
-        3. Zed crashes
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Zed version and system specs
-      description: |
-        Open the command palette in Zed, then type “zed: copy system specs into clipboard”.
-      placeholder: |
-        Zed: v0.215.0 (Zed Nightly bfe141ea79aa4984028934067ba75c48d99136ae)
-        OS: macOS 15.1
-        Memory: 36 GiB
-        Architecture: aarch64
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Attach Zed log file
-      description: |
-        Open the command palette in Zed, then type `zed: open log` to see the last 1000 lines. Or type `zed: reveal log in file manager` in the command palette to reveal the log file itself.
-      value: |
-        <details><summary>Zed.log</summary>
-
-        <!-- Paste your log inside the code block. -->
-        ```log
-
-        ```
-
-        </details>
-    validations:
-      required: false
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
deleted file mode 100644
index 9bf14ce72d..0000000000
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-# yaml-language-server: $schema=https://www.schemastore.org/github-issue-config.json
-blank_issues_enabled: false
-contact_links:
-  - name: Feature request
-    url: https://github.com/zed-industries/zed/discussions/new/choose
-    about: To request a feature, open a new discussion under one of the appropriate categories.
-  - name: Our Discord community
-    url: https://discord.com/invite/zedindustries
-    about: Join our Discord server for real-time discussion and user support.
diff --git a/.github/actionlint.yml b/.github/actionlint.yml
deleted file mode 100644
index 6d8e0107e9..0000000000
--- a/.github/actionlint.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-# Configuration related to self-hosted runner.
-self-hosted-runner:
-  # Labels of self-hosted runner in array of strings.
-  labels:
-    # GitHub-hosted Runners
-    - github-8vcpu-ubuntu-2404
-    - github-16vcpu-ubuntu-2404
-    - github-32vcpu-ubuntu-2404
-    - github-8vcpu-ubuntu-2204
-    - github-16vcpu-ubuntu-2204
-    - github-32vcpu-ubuntu-2204
-    - github-16vcpu-ubuntu-2204-arm
-    - windows-2025-16
-    - windows-2025-32
-    - windows-2025-64
-    # Namespace Ubuntu 20.04 (Release builds)
-    - namespace-profile-16x32-ubuntu-2004
-    - namespace-profile-32x64-ubuntu-2004
-    - namespace-profile-16x32-ubuntu-2004-arm
-    - namespace-profile-32x64-ubuntu-2004-arm
-    # Namespace Ubuntu 22.04 (Everything else)
-    - namespace-profile-4x8-ubuntu-2204
-    - namespace-profile-8x16-ubuntu-2204
-    - namespace-profile-16x32-ubuntu-2204
-    - namespace-profile-32x64-ubuntu-2204
-    # Namespace Ubuntu 24.04 (like ubuntu-latest)
-    - namespace-profile-2x4-ubuntu-2404
-    # Namespace Limited Preview
-    - namespace-profile-8x16-ubuntu-2004-arm-m4
-    - namespace-profile-8x32-ubuntu-2004-arm-m4
-    # Self Hosted Runners
-    - self-mini-macos
-    - self-32vcpu-windows-2022
-
-# Disable shellcheck because it doesn't like powershell
-# This should have been triggered with initial rollout of actionlint
-# but https://github.com/zed-industries/zed/pull/36693
-# somehow caused actionlint to actually check those windows jobs
-# where previously they were being skipped. Likely caused by an
-# unknown bug in actionlint where parsing of `runs-on: [ ]`
-# breaks something else. (yuck)
-paths:
-  .github/workflows/{ci,release_nightly}.yml:
-    ignore:
-      - "shellcheck"
diff --git a/.github/actions/build_docs/action.yml b/.github/actions/build_docs/action.yml
deleted file mode 100644
index d2e62d5b22..0000000000
--- a/.github/actions/build_docs/action.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-name: "Build docs"
-description: "Build the docs"
-
-runs:
-  using: "composite"
-  steps:
-    - name: Setup mdBook
-      uses: peaceiris/actions-mdbook@ee69d230fe19748b7abf22df32acaa93833fad08 # v2
-      with:
-        mdbook-version: "0.4.37"
-
-    - name: Cache dependencies
-      uses: swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2
-      with:
-        save-if: ${{ github.ref == 'refs/heads/main' }}
-        # cache-provider: "buildjet"
-
-    - name: Install Linux dependencies
-      shell: bash -euxo pipefail {0}
-      run: ./script/linux
-
-    - name: Check for broken links (in MD)
-      uses: lycheeverse/lychee-action@82202e5e9c2f4ef1a55a3d02563e1cb6041e5332 # v2.4.1
-      with:
-        args: --no-progress --exclude '^http' './docs/src/**/*'
-        fail: true
-
-    - name: Build book
-      shell: bash -euxo pipefail {0}
-      run: |
-        mkdir -p target/deploy
-        mdbook build ./docs --dest-dir=../target/deploy/docs/
-
-    - name: Check for broken links (in HTML)
-      uses: lycheeverse/lychee-action@82202e5e9c2f4ef1a55a3d02563e1cb6041e5332 # v2.4.1
-      with:
-        args: --no-progress --exclude '^http' 'target/deploy/docs/'
-        fail: true
diff --git a/.github/actions/check_style/action.yml b/.github/actions/check_style/action.yml
deleted file mode 100644
index f8362bc636..0000000000
--- a/.github/actions/check_style/action.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-name: "Check formatting"
-description: "Checks code formatting use cargo fmt"
-
-runs:
-  using: "composite"
-  steps:
-    - name: cargo fmt
-      shell: bash -euxo pipefail {0}
-      run: cargo fmt --all -- --check
diff --git a/.github/actions/run_tests/action.yml b/.github/actions/run_tests/action.yml
deleted file mode 100644
index a071aba3a8..0000000000
--- a/.github/actions/run_tests/action.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: "Run tests"
-description: "Runs the tests"
-
-runs:
-  using: "composite"
-  steps:
-    - name: Install nextest
-      uses: taiki-e/install-action@nextest
-
-    - name: Install Node
-      uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
-      with:
-        node-version: "18"
-
-    - name: Limit target directory size
-      env:
-        MAX_SIZE: ${{ runner.os == 'macOS' && 300 || 100 }}
-      shell: bash -euxo pipefail {0}
-      # Use the variable in the run command
-      run: script/clear-target-dir-if-larger-than ${{ env.MAX_SIZE }}
-
-    - name: Run tests
-      shell: bash -euxo pipefail {0}
-      run: cargo nextest run --workspace --no-fail-fast --failure-output immediate-final
diff --git a/.github/actions/run_tests_windows/action.yml b/.github/actions/run_tests_windows/action.yml
deleted file mode 100644
index 307b73f363..0000000000
--- a/.github/actions/run_tests_windows/action.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: "Run tests on Windows"
-description: "Runs the tests on Windows"
-
-inputs:
-  working-directory:
-    description: "The working directory"
-    required: true
-    default: "."
-
-runs:
-  using: "composite"
-  steps:
-    - name: Install test runner
-      working-directory: ${{ inputs.working-directory }}
-      uses: taiki-e/install-action@nextest
-
-    - name: Install Node
-      uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
-      with:
-        node-version: "18"
-
-    - name: Run tests
-      shell: powershell
-      working-directory: ${{ inputs.working-directory }}
-      run: |
-        cargo nextest run --workspace --no-fail-fast --failure-output immediate-final
diff --git a/.github/cherry-pick-bot.yml b/.github/cherry-pick-bot.yml
deleted file mode 100644
index 1f62315d79..0000000000
--- a/.github/cherry-pick-bot.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-enabled: true
-preservePullRequestTitle: true
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
deleted file mode 100644
index e107c14470..0000000000
--- a/.github/pull_request_template.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Closes #ISSUE
-
-Release Notes:
-
-- N/A *or* Added/Fixed/Improved ...
diff --git a/.github/workflows/after_release.yml b/.github/workflows/after_release.yml
deleted file mode 100644
index 21b9a8fe0e..0000000000
--- a/.github/workflows/after_release.yml
+++ /dev/null
@@ -1,119 +0,0 @@
-# Generated from xtask::workflows::after_release
-# Rebuild with `cargo xtask workflows`.
-name: after_release
-on:
-  release:
-    types:
-    - published
-  workflow_dispatch:
-    inputs:
-      tag_name:
-        description: tag_name
-        required: true
-        type: string
-      prerelease:
-        description: prerelease
-        required: true
-        type: boolean
-      body:
-        description: body
-        type: string
-        default: ''
-jobs:
-  rebuild_releases_page:
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
-    runs-on: namespace-profile-2x4-ubuntu-2404
-    steps:
-    - name: after_release::rebuild_releases_page::refresh_cloud_releases
-      run: curl -fX POST https://cloud.zed.dev/releases/refresh?expect_tag=${{ github.event.release.tag_name || inputs.tag_name }}
-      shell: bash -euxo pipefail {0}
-    - name: after_release::rebuild_releases_page::redeploy_zed_dev
-      run: npm exec --yes -- vercel@37 --token="$VERCEL_TOKEN" --scope zed-industries redeploy https://zed.dev
-      shell: bash -euxo pipefail {0}
-      env:
-        VERCEL_TOKEN: ${{ secrets.VERCEL_TOKEN }}
-  post_to_discord:
-    needs:
-    - rebuild_releases_page
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
-    runs-on: namespace-profile-2x4-ubuntu-2404
-    steps:
-    - id: get-release-url
-      name: after_release::post_to_discord::get_release_url
-      run: |
-        if [ "${{ github.event.release.prerelease || inputs.prerelease }}" == "true" ]; then
-            URL="https://zed.dev/releases/preview"
-        else
-            URL="https://zed.dev/releases/stable"
-        fi
-
-        echo "URL=$URL" >> "$GITHUB_OUTPUT"
-      shell: bash -euxo pipefail {0}
-    - id: get-content
-      name: after_release::post_to_discord::get_content
-      uses: 2428392/gh-truncate-string-action@b3ff790d21cf42af3ca7579146eedb93c8fb0757
-      with:
-        stringToTruncate: |
-          📣 Zed [${{ github.event.release.tag_name || inputs.tag_name }}](<${{ steps.get-release-url.outputs.URL }}>)  was just released!
-
-          ${{ github.event.release.body || inputs.body }}
-        maxLength: 2000
-        truncationSymbol: '...'
-    - name: after_release::post_to_discord::discord_webhook_action
-      uses: tsickert/discord-webhook@c840d45a03a323fbc3f7507ac7769dbd91bfb164
-      with:
-        webhook-url: ${{ secrets.DISCORD_WEBHOOK_RELEASE_NOTES }}
-        content: ${{ steps.get-content.outputs.string }}
-  publish_winget:
-    runs-on: self-32vcpu-windows-2022
-    steps:
-    - id: set-package-name
-      name: after_release::publish_winget::set_package_name
-      run: |
-        if ("${{ github.event.release.prerelease || inputs.prerelease }}" -eq "true") {
-            $PACKAGE_NAME = "ZedIndustries.Zed.Preview"
-        } else {
-            $PACKAGE_NAME = "ZedIndustries.Zed"
-        }
-
-        echo "PACKAGE_NAME=$PACKAGE_NAME" >> $env:GITHUB_OUTPUT
-      shell: pwsh
-    - name: after_release::publish_winget::winget_releaser
-      uses: vedantmgoyal9/winget-releaser@19e706d4c9121098010096f9c495a70a7518b30f
-      with:
-        identifier: ${{ steps.set-package-name.outputs.PACKAGE_NAME }}
-        release-tag: ${{ github.event.release.tag_name || inputs.tag_name }}
-        max-versions-to-keep: 5
-        token: ${{ secrets.WINGET_TOKEN }}
-  create_sentry_release:
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
-    runs-on: namespace-profile-2x4-ubuntu-2404
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: release::create_sentry_release
-      uses: getsentry/action-release@526942b68292201ac6bbb99b9a0747d4abee354c
-      with:
-        environment: production
-      env:
-        SENTRY_ORG: zed-dev
-        SENTRY_PROJECT: zed
-        SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-  notify_on_failure:
-    needs:
-    - rebuild_releases_page
-    - post_to_discord
-    - publish_winget
-    - create_sentry_release
-    if: failure()
-    runs-on: namespace-profile-2x4-ubuntu-2404
-    steps:
-    - name: release::notify_on_failure::notify_slack
-      run: |-
-        curl -X POST -H 'Content-type: application/json'\
-         --data '{"text":"${{ github.workflow }} failed:  ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"}' "$SLACK_WEBHOOK"
-      shell: bash -euxo pipefail {0}
-      env:
-        SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_WORKFLOW_FAILURES }}
diff --git a/.github/workflows/bump_collab_staging.yml b/.github/workflows/bump_collab_staging.yml
deleted file mode 100644
index d400905b4d..0000000000
--- a/.github/workflows/bump_collab_staging.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: Bump collab-staging Tag
-
-on:
-  schedule:
-    # Fire every day at 16:00 UTC (At the start of the US workday)
-    - cron: "0 16 * * *"
-
-jobs:
-  update-collab-staging-tag:
-    if: github.repository_owner == 'zed-industries'
-    runs-on: namespace-profile-2x4-ubuntu-2404
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-        with:
-          fetch-depth: 0
-
-      - name: Update collab-staging tag
-        run: |
-          git config user.name github-actions
-          git config user.email github-actions@github.com
-          git tag -f collab-staging
-          git push origin collab-staging --force
diff --git a/.github/workflows/bump_patch_version.yml b/.github/workflows/bump_patch_version.yml
deleted file mode 100644
index e1ae890043..0000000000
--- a/.github/workflows/bump_patch_version.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-name: bump_patch_version
-
-on:
-  workflow_dispatch:
-    inputs:
-      branch:
-        description: "Branch name to run on"
-        required: true
-
-concurrency:
-  # Allow only one workflow per any non-`main` branch.
-  group: ${{ github.workflow }}-${{ inputs.branch }}
-  cancel-in-progress: true
-
-jobs:
-  bump_patch_version:
-    if: github.repository_owner == 'zed-industries'
-    runs-on:
-      - namespace-profile-16x32-ubuntu-2204
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-        with:
-          ref: ${{ github.event.inputs.branch }}
-          ssh-key: ${{ secrets.ZED_BOT_DEPLOY_KEY }}
-
-      - name: Bump Patch Version
-        run: |
-          set -eux
-
-          channel="$(cat crates/zed/RELEASE_CHANNEL)"
-
-          tag_suffix=""
-          case $channel in
-            stable)
-              ;;
-            preview)
-              tag_suffix="-pre"
-              ;;
-            *)
-              echo "this must be run on either of stable|preview release branches" >&2
-              exit 1
-              ;;
-          esac
-          which cargo-set-version > /dev/null || cargo install cargo-edit -f --no-default-features --features "set-version"
-          output="$(cargo set-version -p zed --bump patch 2>&1 | sed 's/.* //')"
-          export GIT_COMMITTER_NAME="Zed Bot"
-          export GIT_COMMITTER_EMAIL="hi@zed.dev"
-          git commit -am "Bump to $output for @$GITHUB_ACTOR" --author "Zed Bot <hi@zed.dev>"
-          git tag "v${output}${tag_suffix}"
-          git push origin HEAD "v${output}${tag_suffix}"
diff --git a/.github/workflows/cherry_pick.yml b/.github/workflows/cherry_pick.yml
deleted file mode 100644
index bc01aae17e..0000000000
--- a/.github/workflows/cherry_pick.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-# Generated from xtask::workflows::cherry_pick
-# Rebuild with `cargo xtask workflows`.
-name: cherry_pick
-run-name: 'cherry_pick to ${{ inputs.channel }} #${{ inputs.pr_number }}'
-on:
-  workflow_dispatch:
-    inputs:
-      commit:
-        description: commit
-        required: true
-        type: string
-      branch:
-        description: branch
-        required: true
-        type: string
-      channel:
-        description: channel
-        required: true
-        type: string
-      pr_number:
-        description: pr_number
-        required: true
-        type: string
-jobs:
-  run_cherry_pick:
-    runs-on: namespace-profile-2x4-ubuntu-2404
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - id: get-app-token
-      name: cherry_pick::run_cherry_pick::authenticate_as_zippy
-      uses: actions/create-github-app-token@bef1eaf1c0ac2b148ee2a0a74c65fbe6db0631f1
-      with:
-        app-id: ${{ secrets.ZED_ZIPPY_APP_ID }}
-        private-key: ${{ secrets.ZED_ZIPPY_APP_PRIVATE_KEY }}
-    - name: cherry_pick::run_cherry_pick::cherry_pick
-      run: ./script/cherry-pick ${{ inputs.branch }} ${{ inputs.commit }} ${{ inputs.channel }}
-      shell: bash -euxo pipefail {0}
-      env:
-        GIT_COMMITTER_NAME: Zed Zippy
-        GIT_COMMITTER_EMAIL: hi@zed.dev
-        GITHUB_TOKEN: ${{ steps.get-app-token.outputs.token }}
diff --git a/.github/workflows/community_champion_auto_labeler.yml b/.github/workflows/community_champion_auto_labeler.yml
deleted file mode 100644
index 93f1d56023..0000000000
--- a/.github/workflows/community_champion_auto_labeler.yml
+++ /dev/null
@@ -1,107 +0,0 @@
-name: Community Champion Auto Labeler
-
-on:
-  issues:
-    types: [opened]
-  pull_request_target:
-    types: [opened]
-
-jobs:
-  label_community_champion:
-    if: github.repository_owner == 'zed-industries'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check if author is a community champion and apply label
-        uses: actions/github-script@v7
-        env:
-          COMMUNITY_CHAMPIONS: |
-            0x2CA
-            5brian
-            5herlocked
-            abdelq
-            afgomez
-            AidanV
-            akbxr
-            AlvaroParker
-            amtoaer
-            artemevsevev
-            bajrangCoder
-            bcomnes
-            Be-ing
-            blopker
-            bnjjj
-            bobbymannino
-            CharlesChen0823
-            chbk
-            cppcoffee
-            davewa
-            ddoemonn
-            djsauble
-            errmayank
-            fantacell
-            findrakecil
-            FloppyDisco
-            gko
-            huacnlee
-            imumesh18
-            jacobtread
-            jansol
-            jeffreyguenther
-            jenslys
-            jongretar
-            lemorage
-            lnay
-            marcocondrache
-            marius851000
-            mikebronner
-            ognevny
-            playdohface
-            RemcoSmitsDev
-            romaninsh
-            Simek
-            someone13574
-            sourcefrog
-            suxiaoshao
-            Takk8IS
-            thedadams
-            tidely
-            timvermeulen
-            valentinegb
-            versecafe
-            vitallium
-            warrenjokinen
-            WhySoBad
-            ya7010
-            Zertsov
-        with:
-          script: |
-            const communityChampions = process.env.COMMUNITY_CHAMPIONS
-              .split('\n')
-              .map(handle => handle.trim().toLowerCase())
-              .filter(handle => handle.length > 0);
-
-            let author;
-            if (context.eventName === 'issues') {
-              author = context.payload.issue.user.login;
-            } else if (context.eventName === 'pull_request_target') {
-              author = context.payload.pull_request.user.login;
-            }
-
-            if (!author || !communityChampions.includes(author.toLowerCase())) {
-              return;
-            }
-
-            const issueNumber = context.payload.issue?.number || context.payload.pull_request?.number;
-
-            try {
-              await github.rest.issues.addLabels({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: issueNumber,
-                labels: ['community champion']
-              });
-
-              console.log(`Applied 'community champion' label to #${issueNumber} by ${author}`);
-            } catch (error) {
-              console.error(`Failed to apply label: ${error.message}`);
-            }
diff --git a/.github/workflows/community_close_stale_issues.yml b/.github/workflows/community_close_stale_issues.yml
deleted file mode 100644
index 14c1a0a083..0000000000
--- a/.github/workflows/community_close_stale_issues.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: "Close Stale Issues"
-on:
-  schedule:
-    - cron: "0 8 31 DEC *"
-  workflow_dispatch:
-
-jobs:
-  stale:
-    if: github.repository_owner == 'zed-industries'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          stale-issue-message: >
-            Hi there! 👋
-
-            We're working to clean up our issue tracker by closing older bugs that might not be relevant anymore. If you are able to reproduce this issue in the latest version of Zed, please let us know by commenting on this issue, and it will be kept open. If you can't reproduce it, feel free to close the issue yourself. Otherwise, it will close automatically in 14 days.
-
-            Thanks for your help!
-          close-issue-message: "This issue was closed due to inactivity. If you're still experiencing this problem, please open a new issue with a link to this issue."
-          days-before-stale: 60
-          days-before-close: 14
-          only-issue-types: "Bug,Crash"
-          operations-per-run: 1000
-          ascending: true
-          enable-statistics: true
-          stale-issue-label: "stale"
-          exempt-issue-labels: "never stale"
diff --git a/.github/workflows/community_update_all_top_ranking_issues.yml b/.github/workflows/community_update_all_top_ranking_issues.yml
deleted file mode 100644
index 66b1873b95..0000000000
--- a/.github/workflows/community_update_all_top_ranking_issues.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: Update All Top Ranking Issues
-
-on:
-  schedule:
-    - cron: "0 */12 * * *"
-  workflow_dispatch:
-
-jobs:
-  update_top_ranking_issues:
-    runs-on: ubuntu-latest
-    if: github.repository == 'zed-industries/zed'
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-      - name: Set up uv
-        uses: astral-sh/setup-uv@caf0cab7a618c569241d31dcd442f54681755d39 # v3
-        with:
-          version: "latest"
-          enable-cache: true
-          cache-dependency-glob: "script/update_top_ranking_issues/pyproject.toml"
-      - name: Install Python 3.13
-        run: uv python install 3.13
-      - name: Install dependencies
-        run: uv sync --project script/update_top_ranking_issues -p 3.13
-      - name: Run script
-        run: uv run --project script/update_top_ranking_issues script/update_top_ranking_issues/main.py --github-token ${{ secrets.GITHUB_TOKEN }} --issue-reference-number 5393
diff --git a/.github/workflows/community_update_weekly_top_ranking_issues.yml b/.github/workflows/community_update_weekly_top_ranking_issues.yml
deleted file mode 100644
index e1514da716..0000000000
--- a/.github/workflows/community_update_weekly_top_ranking_issues.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: Update Weekly Top Ranking Issues
-
-on:
-  schedule:
-    - cron: "0 15 * * *"
-  workflow_dispatch:
-
-jobs:
-  update_top_ranking_issues:
-    runs-on: ubuntu-latest
-    if: github.repository == 'zed-industries/zed'
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-      - name: Set up uv
-        uses: astral-sh/setup-uv@caf0cab7a618c569241d31dcd442f54681755d39 # v3
-        with:
-          version: "latest"
-          enable-cache: true
-          cache-dependency-glob: "script/update_top_ranking_issues/pyproject.toml"
-      - name: Install Python 3.13
-        run: uv python install 3.13
-      - name: Install dependencies
-        run: uv sync --project script/update_top_ranking_issues -p 3.13
-      - name: Run script
-        run: uv run --project script/update_top_ranking_issues script/update_top_ranking_issues/main.py --github-token ${{ secrets.GITHUB_TOKEN }} --issue-reference-number 6952 --query-day-interval 7
diff --git a/.github/workflows/compare_perf.yml b/.github/workflows/compare_perf.yml
deleted file mode 100644
index 48fc850f8f..0000000000
--- a/.github/workflows/compare_perf.yml
+++ /dev/null
@@ -1,80 +0,0 @@
-# Generated from xtask::workflows::compare_perf
-# Rebuild with `cargo xtask workflows`.
-name: compare_perf
-on:
-  workflow_dispatch:
-    inputs:
-      head:
-        description: head
-        required: true
-        type: string
-      base:
-        description: base
-        required: true
-        type: string
-      crate_name:
-        description: crate_name
-        type: string
-        default: ''
-jobs:
-  run_perf:
-    runs-on: namespace-profile-16x32-ubuntu-2204
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: steps::setup_cargo_config
-      run: |
-        mkdir -p ./../.cargo
-        cp ./.cargo/ci-config.toml ./../.cargo/config.toml
-      shell: bash -euxo pipefail {0}
-    - name: steps::setup_linux
-      run: ./script/linux
-      shell: bash -euxo pipefail {0}
-    - name: steps::install_mold
-      run: ./script/install-mold
-      shell: bash -euxo pipefail {0}
-    - name: steps::download_wasi_sdk
-      run: ./script/download-wasi-sdk
-      shell: bash -euxo pipefail {0}
-    - name: compare_perf::run_perf::install_hyperfine
-      uses: taiki-e/install-action@hyperfine
-    - name: steps::git_checkout
-      run: git fetch origin ${{ inputs.base }} && git checkout ${{ inputs.base }}
-      shell: bash -euxo pipefail {0}
-    - name: compare_perf::run_perf::cargo_perf_test
-      run: |2-
-
-                    if [ -n "${{ inputs.crate_name }}" ]; then
-                        cargo perf-test -p ${{ inputs.crate_name }} -- --json=${{ inputs.base }};
-                    else
-                        cargo perf-test -p vim -- --json=${{ inputs.base }};
-                    fi
-      shell: bash -euxo pipefail {0}
-    - name: steps::git_checkout
-      run: git fetch origin ${{ inputs.head }} && git checkout ${{ inputs.head }}
-      shell: bash -euxo pipefail {0}
-    - name: compare_perf::run_perf::cargo_perf_test
-      run: |2-
-
-                    if [ -n "${{ inputs.crate_name }}" ]; then
-                        cargo perf-test -p ${{ inputs.crate_name }} -- --json=${{ inputs.head }};
-                    else
-                        cargo perf-test -p vim -- --json=${{ inputs.head }};
-                    fi
-      shell: bash -euxo pipefail {0}
-    - name: compare_perf::run_perf::compare_runs
-      run: cargo perf-compare --save=results.md ${{ inputs.base }} ${{ inputs.head }}
-      shell: bash -euxo pipefail {0}
-    - name: '@actions/upload-artifact results.md'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
-      with:
-        name: results.md
-        path: results.md
-        if-no-files-found: error
-    - name: steps::cleanup_cargo_config
-      if: always()
-      run: |
-        rm -rf ./../.cargo
-      shell: bash -euxo pipefail {0}
diff --git a/.github/workflows/congrats.yml b/.github/workflows/congrats.yml
deleted file mode 100644
index efd9812d80..0000000000
--- a/.github/workflows/congrats.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-name: Congratsbot
-
-on:
-  push:
-    branches: [main]
-
-jobs:
-  check-author:
-    if: ${{ github.repository_owner == 'zed-industries' }}
-    runs-on: ubuntu-latest
-    outputs:
-      should_congratulate: ${{ steps.check.outputs.should_congratulate }}
-    steps:
-      - name: Get PR info and check if author is external
-        id: check
-        uses: actions/github-script@v7
-        with:
-          github-token: ${{ secrets.CONGRATSBOT_GITHUB_TOKEN }}
-          script: |
-            const { data: prs } = await github.rest.repos.listPullRequestsAssociatedWithCommit({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              commit_sha: context.sha
-            });
-
-            if (prs.length === 0) {
-              core.setOutput('should_congratulate', 'false');
-              return;
-            }
-
-            const mergedPR = prs.find(pr => pr.merged_at !== null) || prs[0];
-            const prAuthor = mergedPR.user.login;
-
-            try {
-              await github.rest.teams.getMembershipForUserInOrg({
-                org: 'zed-industries',
-                team_slug: 'staff',
-                username: prAuthor
-              });
-              core.setOutput('should_congratulate', 'false');
-            } catch (error) {
-              if (error.status === 404) {
-                core.setOutput('should_congratulate', 'true');
-              } else {
-                console.error(`Error checking team membership: ${error.message}`);
-                core.setOutput('should_congratulate', 'false');
-              }
-            }
-
-  congrats:
-    needs: check-author
-    if: needs.check-author.outputs.should_congratulate == 'true'
-    uses: withastro/automation/.github/workflows/congratsbot.yml@main
-    with:
-      EMOJIS: 🎉,🎊,🧑‍🚀,🥳,🙌,🚀,🦀,🔥,🚢
-    secrets:
-      DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK_CONGRATS }}
diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml
deleted file mode 100644
index 9d6054eb3e..0000000000
--- a/.github/workflows/danger.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-# Generated from xtask::workflows::danger
-# Rebuild with `cargo xtask workflows`.
-name: danger
-on:
-  pull_request:
-    types:
-    - opened
-    - synchronize
-    - reopened
-    - edited
-    branches:
-    - main
-jobs:
-  danger:
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
-    runs-on: namespace-profile-2x4-ubuntu-2404
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: steps::setup_pnpm
-      uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2
-      with:
-        version: '9'
-    - name: steps::setup_node
-      uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
-      with:
-        node-version: '20'
-        cache: pnpm
-        cache-dependency-path: script/danger/pnpm-lock.yaml
-    - name: danger::danger_job::install_deps
-      run: pnpm install --dir script/danger
-      shell: bash -euxo pipefail {0}
-    - name: danger::danger_job::run
-      run: pnpm run --dir script/danger danger ci
-      shell: bash -euxo pipefail {0}
-      env:
-        GITHUB_TOKEN: not_a_real_token
-        DANGER_GITHUB_API_BASE_URL: https://danger-proxy.fly.dev/github
diff --git a/.github/workflows/deploy_cloudflare.yml b/.github/workflows/deploy_cloudflare.yml
deleted file mode 100644
index 2650cce140..0000000000
--- a/.github/workflows/deploy_cloudflare.yml
+++ /dev/null
@@ -1,61 +0,0 @@
-name: Deploy Docs
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  deploy-docs:
-    name: Deploy Docs
-    if: github.repository_owner == 'zed-industries'
-    runs-on: namespace-profile-16x32-ubuntu-2204
-
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-        with:
-          clean: false
-
-      - name: Set up default .cargo/config.toml
-        run: cp ./.cargo/collab-config.toml ./.cargo/config.toml
-
-      - name: Build docs
-        uses: ./.github/actions/build_docs
-        env:
-          DOCS_AMPLITUDE_API_KEY: ${{ secrets.DOCS_AMPLITUDE_API_KEY }}
-
-      - name: Deploy Docs
-        uses: cloudflare/wrangler-action@da0e0dfe58b7a431659754fdf3f186c529afbe65 # v3
-        with:
-          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-          command: pages deploy target/deploy --project-name=docs
-
-      - name: Deploy Install
-        uses: cloudflare/wrangler-action@da0e0dfe58b7a431659754fdf3f186c529afbe65 # v3
-        with:
-          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-          command: r2 object put -f script/install.sh zed-open-source-website-assets/install.sh
-
-      - name: Deploy Docs Workers
-        uses: cloudflare/wrangler-action@da0e0dfe58b7a431659754fdf3f186c529afbe65 # v3
-        with:
-          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-          command: deploy .cloudflare/docs-proxy/src/worker.js
-
-      - name: Deploy Install Workers
-        uses: cloudflare/wrangler-action@da0e0dfe58b7a431659754fdf3f186c529afbe65 # v3
-        with:
-          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-          command: deploy .cloudflare/docs-proxy/src/worker.js
-
-      - name: Preserve Wrangler logs
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
-        if: always()
-        with:
-          name: wrangler_logs
-          path: /home/runner/.config/.wrangler/logs/
diff --git a/.github/workflows/deploy_collab.yml b/.github/workflows/deploy_collab.yml
deleted file mode 100644
index ce0c0eac40..0000000000
--- a/.github/workflows/deploy_collab.yml
+++ /dev/null
@@ -1,148 +0,0 @@
-name: Publish Collab Server Image
-
-on:
-  push:
-    tags:
-      - collab-production
-      - collab-staging
-
-env:
-  DOCKER_BUILDKIT: 1
-
-jobs:
-  style:
-    name: Check formatting and Clippy lints
-    if: github.repository_owner == 'zed-industries'
-    runs-on:
-      - self-hosted
-      - macOS
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-        with:
-          clean: false
-          fetch-depth: 0
-
-      - name: Run style checks
-        uses: ./.github/actions/check_style
-
-      - name: Run clippy
-        run: ./script/clippy
-
-  tests:
-    name: Run tests
-    runs-on:
-      - self-hosted
-      - macOS
-    needs: style
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-        with:
-          clean: false
-          fetch-depth: 0
-
-      - name: Install cargo nextest
-        uses: taiki-e/install-action@nextest
-
-      - name: Limit target directory size
-        shell: bash -euxo pipefail {0}
-        run: script/clear-target-dir-if-larger-than 300
-
-      - name: Run tests
-        shell: bash -euxo pipefail {0}
-        run: cargo nextest run --package collab --no-fail-fast
-
-  publish:
-    name: Publish collab server image
-    needs:
-      - style
-      - tests
-    runs-on:
-      - namespace-profile-16x32-ubuntu-2204
-    steps:
-      - name: Install doctl
-        uses: digitalocean/action-doctl@v2
-        with:
-          token: ${{ secrets.DIGITALOCEAN_ACCESS_TOKEN }}
-
-      - name: Sign into DigitalOcean docker registry
-        run: doctl registry login
-
-      - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-        with:
-          clean: false
-
-      - name: Build docker image
-        run: |
-          docker build -f Dockerfile-collab \
-            --build-arg "GITHUB_SHA=$GITHUB_SHA" \
-            --tag "registry.digitalocean.com/zed/collab:$GITHUB_SHA" \
-            .
-
-      - name: Publish docker image
-        run: docker push "registry.digitalocean.com/zed/collab:${GITHUB_SHA}"
-
-      - name: Prune Docker system
-        run: docker system prune  --filter 'until=72h' -f
-
-  deploy:
-    name: Deploy new server image
-    needs:
-      - publish
-    runs-on:
-      - namespace-profile-16x32-ubuntu-2204
-
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-        with:
-          clean: false
-
-      - name: Install doctl
-        uses: digitalocean/action-doctl@v2
-        with:
-          token: ${{ secrets.DIGITALOCEAN_ACCESS_TOKEN }}
-
-      - name: Sign into Kubernetes
-        run: doctl kubernetes cluster kubeconfig save --expiry-seconds 600 ${{ secrets.CLUSTER_NAME }}
-
-      - name: Start rollout
-        run: |
-          set -eu
-          if [[ $GITHUB_REF_NAME = "collab-production" ]]; then
-            export ZED_KUBE_NAMESPACE=production
-            export ZED_COLLAB_LOAD_BALANCER_SIZE_UNIT=10
-            export ZED_API_LOAD_BALANCER_SIZE_UNIT=2
-          elif [[ $GITHUB_REF_NAME = "collab-staging" ]]; then
-            export ZED_KUBE_NAMESPACE=staging
-            export ZED_COLLAB_LOAD_BALANCER_SIZE_UNIT=1
-            export ZED_API_LOAD_BALANCER_SIZE_UNIT=1
-          else
-            echo "cowardly refusing to deploy from an unknown branch"
-            exit 1
-          fi
-
-          echo "Deploying collab:$GITHUB_SHA to $ZED_KUBE_NAMESPACE"
-
-          source script/lib/deploy-helpers.sh
-          export_vars_for_environment $ZED_KUBE_NAMESPACE
-
-          ZED_DO_CERTIFICATE_ID="$(doctl compute certificate list --format ID --no-header)"
-          export ZED_DO_CERTIFICATE_ID
-          export ZED_IMAGE_ID="registry.digitalocean.com/zed/collab:${GITHUB_SHA}"
-
-          export ZED_SERVICE_NAME=collab
-          export ZED_LOAD_BALANCER_SIZE_UNIT=$ZED_COLLAB_LOAD_BALANCER_SIZE_UNIT
-          export DATABASE_MAX_CONNECTIONS=850
-          envsubst < crates/collab/k8s/collab.template.yml | kubectl apply -f -
-          kubectl -n "$ZED_KUBE_NAMESPACE" rollout status deployment/$ZED_SERVICE_NAME --watch
-          echo "deployed ${ZED_SERVICE_NAME} to ${ZED_KUBE_NAMESPACE}"
-
-          export ZED_SERVICE_NAME=api
-          export ZED_LOAD_BALANCER_SIZE_UNIT=$ZED_API_LOAD_BALANCER_SIZE_UNIT
-          export DATABASE_MAX_CONNECTIONS=60
-          envsubst < crates/collab/k8s/collab.template.yml | kubectl apply -f -
-          kubectl -n "$ZED_KUBE_NAMESPACE" rollout status deployment/$ZED_SERVICE_NAME --watch
-          echo "deployed ${ZED_SERVICE_NAME} to ${ZED_KUBE_NAMESPACE}"
diff --git a/.github/workflows/extension_bump.yml b/.github/workflows/extension_bump.yml
deleted file mode 100644
index c7582378f1..0000000000
--- a/.github/workflows/extension_bump.yml
+++ /dev/null
@@ -1,147 +0,0 @@
-# Generated from xtask::workflows::extension_bump
-# Rebuild with `cargo xtask workflows`.
-name: extension_bump
-env:
-  CARGO_TERM_COLOR: always
-  RUST_BACKTRACE: '1'
-  CARGO_INCREMENTAL: '0'
-  ZED_EXTENSION_CLI_SHA: 7cfce605704d41ca247e3f84804bf323f6c6caaf
-on:
-  workflow_call:
-    inputs:
-      bump-type:
-        description: bump-type
-        type: string
-        default: patch
-      force-bump:
-        description: force-bump
-        required: true
-        type: boolean
-    secrets:
-      app-id:
-        description: The app ID used to create the PR
-        required: true
-      app-secret:
-        description: The app secret for the corresponding app ID
-        required: true
-jobs:
-  check_bump_needed:
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
-    runs-on: namespace-profile-2x4-ubuntu-2404
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-        fetch-depth: 0
-    - id: compare-versions-check
-      name: extension_bump::compare_versions
-      run: |
-        CURRENT_VERSION="$(sed -n 's/version = \"\(.*\)\"/\1/p' < extension.toml)"
-        PR_PARENT_SHA="${{ github.event.pull_request.head.sha }}"
-
-        if [[ -n "$PR_PARENT_SHA" ]]; then
-            git checkout "$PR_PARENT_SHA"
-        elif BRANCH_PARENT_SHA="$(git merge-base origin/main origin/zed-zippy-autobump)"; then
-            git checkout "$BRANCH_PARENT_SHA"
-        else
-            git checkout "$(git log -1 --format=%H)"~1
-        fi
-
-        PARENT_COMMIT_VERSION="$(sed -n 's/version = \"\(.*\)\"/\1/p' < extension.toml)"
-
-        [[ "$CURRENT_VERSION" == "$PARENT_COMMIT_VERSION" ]] && \
-          echo "needs_bump=true" >> "$GITHUB_OUTPUT" || \
-          echo "needs_bump=false" >> "$GITHUB_OUTPUT"
-
-        echo "current_version=${CURRENT_VERSION}" >> "$GITHUB_OUTPUT"
-      shell: bash -euxo pipefail {0}
-    outputs:
-      needs_bump: ${{ steps.compare-versions-check.outputs.needs_bump }}
-      current_version: ${{ steps.compare-versions-check.outputs.current_version }}
-    timeout-minutes: 1
-  bump_extension_version:
-    needs:
-    - check_bump_needed
-    if: |-
-      (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions') &&
-      (inputs.force-bump == 'true' || needs.check_bump_needed.outputs.needs_bump == 'true')
-    runs-on: namespace-profile-8x16-ubuntu-2204
-    steps:
-    - id: generate-token
-      name: extension_bump::generate_token
-      uses: actions/create-github-app-token@v2
-      with:
-        app-id: ${{ secrets.app-id }}
-        private-key: ${{ secrets.app-secret }}
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: extension_bump::install_bump_2_version
-      run: pip install bump2version
-      shell: bash -euxo pipefail {0}
-    - id: bump-version
-      name: extension_bump::bump_version
-      run: |
-        OLD_VERSION="${{ needs.check_bump_needed.outputs.current_version }}"
-
-        BUMP_FILES=("extension.toml")
-        if [[ -f "Cargo.toml" ]]; then
-            BUMP_FILES+=("Cargo.toml")
-        fi
-
-        bump2version --verbose --current-version "$OLD_VERSION" --no-configured-files ${{ inputs.bump-type }} "${BUMP_FILES[@]}"
-
-        if [[ -f "Cargo.toml" ]]; then
-            cargo update --workspace
-        fi
-
-        NEW_VERSION="$(sed -n 's/version = \"\(.*\)\"/\1/p' < extension.toml)"
-
-        echo "new_version=${NEW_VERSION}" >> "$GITHUB_OUTPUT"
-      shell: bash -euxo pipefail {0}
-    - name: extension_bump::create_pull_request
-      uses: peter-evans/create-pull-request@v7
-      with:
-        title: Bump version to ${{ steps.bump-version.outputs.new_version }}
-        body: This PR bumps the version of this extension to v${{ steps.bump-version.outputs.new_version }}
-        commit-message: Bump version to v${{ steps.bump-version.outputs.new_version }}
-        branch: zed-zippy-autobump
-        committer: zed-zippy[bot] <234243425+zed-zippy[bot]@users.noreply.github.com>
-        base: main
-        delete-branch: true
-        token: ${{ steps.generate-token.outputs.token }}
-        sign-commits: true
-    timeout-minutes: 1
-  create_version_label:
-    needs:
-    - check_bump_needed
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions') && github.event_name == 'push' && github.ref == 'refs/heads/main' && needs.check_bump_needed.outputs.needs_bump == 'false'
-    runs-on: namespace-profile-8x16-ubuntu-2204
-    steps:
-    - id: generate-token
-      name: extension_bump::generate_token
-      uses: actions/create-github-app-token@v2
-      with:
-        app-id: ${{ secrets.app-id }}
-        private-key: ${{ secrets.app-secret }}
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: extension_bump::create_version_tag
-      uses: actions/github-script@v7
-      with:
-        script: |-
-          github.rest.git.createRef({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              ref: 'refs/tags/v${{ needs.check_bump_needed.outputs.current_version }}',
-              sha: context.sha
-          })
-        github-token: ${{ steps.generate-token.outputs.token }}
-    timeout-minutes: 1
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.ref_name == 'main' && github.sha || 'anysha' }}
-  cancel-in-progress: true
diff --git a/.github/workflows/extension_release.yml b/.github/workflows/extension_release.yml
deleted file mode 100644
index 5212a79c3e..0000000000
--- a/.github/workflows/extension_release.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-# Generated from xtask::workflows::extension_release
-# Rebuild with `cargo xtask workflows`.
-name: extension_release
-on:
-  workflow_call:
-    secrets:
-      app-id:
-        description: The app ID used to create the PR
-        required: true
-      app-secret:
-        description: The app secret for the corresponding app ID
-        required: true
-jobs:
-  create_release:
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
-    runs-on: namespace-profile-8x16-ubuntu-2204
-    steps:
-    - id: generate-token
-      name: extension_bump::generate_token
-      uses: actions/create-github-app-token@v2
-      with:
-        app-id: ${{ secrets.app-id }}
-        private-key: ${{ secrets.app-secret }}
-        owner: zed-industries
-        repositories: extensions
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - id: get-extension-id
-      name: extension_release::get_extension_id
-      run: |
-        EXTENSION_ID="$(sed -n 's/id = \"\(.*\)\"/\1/p' < extension.toml)"
-
-        echo "extension_id=${EXTENSION_ID}" >> "$GITHUB_OUTPUT"
-      shell: bash -euxo pipefail {0}
-    - name: extension_release::release_action
-      uses: huacnlee/zed-extension-action@v2
-      with:
-        extension-name: ${{ steps.get-extension-id.outputs.extension_id }}
-        push-to: zed-industries/extensions
-      env:
-        COMMITTER_TOKEN: ${{ steps.generate-token.outputs.token }}
diff --git a/.github/workflows/extension_tests.yml b/.github/workflows/extension_tests.yml
deleted file mode 100644
index 9f0917e388..0000000000
--- a/.github/workflows/extension_tests.yml
+++ /dev/null
@@ -1,133 +0,0 @@
-# Generated from xtask::workflows::extension_tests
-# Rebuild with `cargo xtask workflows`.
-name: extension_tests
-env:
-  CARGO_TERM_COLOR: always
-  RUST_BACKTRACE: '1'
-  CARGO_INCREMENTAL: '0'
-  ZED_EXTENSION_CLI_SHA: 7cfce605704d41ca247e3f84804bf323f6c6caaf
-on:
-  workflow_call: {}
-jobs:
-  orchestrate:
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
-    runs-on: namespace-profile-2x4-ubuntu-2404
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-        fetch-depth: ${{ github.ref == 'refs/heads/main' && 2 || 350 }}
-    - id: filter
-      name: filter
-      run: |
-        if [ -z "$GITHUB_BASE_REF" ]; then
-          echo "Not in a PR context (i.e., push to main/stable/preview)"
-          COMPARE_REV="$(git rev-parse HEAD~1)"
-        else
-          echo "In a PR context comparing to pull_request.base.ref"
-          git fetch origin "$GITHUB_BASE_REF" --depth=350
-          COMPARE_REV="$(git merge-base "origin/${GITHUB_BASE_REF}" HEAD)"
-        fi
-        CHANGED_FILES="$(git diff --name-only "$COMPARE_REV" ${{ github.sha }})"
-
-        check_pattern() {
-          local output_name="$1"
-          local pattern="$2"
-          local grep_arg="$3"
-
-          echo "$CHANGED_FILES" | grep "$grep_arg" "$pattern" && \
-            echo "${output_name}=true" >> "$GITHUB_OUTPUT" || \
-            echo "${output_name}=false" >> "$GITHUB_OUTPUT"
-        }
-
-        check_pattern "check_rust" '^(Cargo.lock|Cargo.toml|.*\.rs)$' -qP
-        check_pattern "check_extension" '^.*\.scm$' -qP
-      shell: bash -euxo pipefail {0}
-    outputs:
-      check_rust: ${{ steps.filter.outputs.check_rust }}
-      check_extension: ${{ steps.filter.outputs.check_extension }}
-  check_rust:
-    needs:
-    - orchestrate
-    if: needs.orchestrate.outputs.check_rust == 'true'
-    runs-on: namespace-profile-16x32-ubuntu-2204
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: steps::cache_rust_dependencies_namespace
-      uses: namespacelabs/nscloud-cache-action@v1
-      with:
-        cache: rust
-    - name: steps::cargo_fmt
-      run: cargo fmt --all -- --check
-      shell: bash -euxo pipefail {0}
-    - name: extension_tests::run_clippy
-      run: cargo clippy --release --all-targets --all-features -- --deny warnings
-      shell: bash -euxo pipefail {0}
-    - name: steps::cargo_install_nextest
-      uses: taiki-e/install-action@nextest
-    - name: steps::cargo_nextest
-      run: cargo nextest run --workspace --no-fail-fast
-      shell: bash -euxo pipefail {0}
-      env:
-        NEXTEST_NO_TESTS: warn
-    timeout-minutes: 3
-  check_extension:
-    needs:
-    - orchestrate
-    if: needs.orchestrate.outputs.check_extension == 'true'
-    runs-on: namespace-profile-2x4-ubuntu-2404
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - id: cache-zed-extension-cli
-      name: extension_tests::cache_zed_extension_cli
-      uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830
-      with:
-        path: zed-extension
-        key: zed-extension-${{ env.ZED_EXTENSION_CLI_SHA }}
-    - name: extension_tests::download_zed_extension_cli
-      if: steps.cache-zed-extension-cli.outputs.cache-hit != 'true'
-      run: |
-        wget --quiet "https://zed-extension-cli.nyc3.digitaloceanspaces.com/$ZED_EXTENSION_CLI_SHA/x86_64-unknown-linux-gnu/zed-extension"
-        chmod +x zed-extension
-      shell: bash -euxo pipefail {0}
-    - name: extension_tests::check
-      run: |
-        mkdir -p /tmp/ext-scratch
-        mkdir -p /tmp/ext-output
-        ./zed-extension --source-dir . --scratch-dir /tmp/ext-scratch --output-dir /tmp/ext-output
-      shell: bash -euxo pipefail {0}
-    timeout-minutes: 2
-  tests_pass:
-    needs:
-    - orchestrate
-    - check_rust
-    - check_extension
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions') && always()
-    runs-on: namespace-profile-2x4-ubuntu-2404
-    steps:
-    - name: run_tests::tests_pass
-      run: |
-        set +x
-        EXIT_CODE=0
-
-        check_result() {
-          echo "* $1: $2"
-          if [[ "$2" != "skipped" && "$2" != "success" ]]; then EXIT_CODE=1; fi
-        }
-
-        check_result "orchestrate" "${{ needs.orchestrate.result }}"
-        check_result "check_rust" "${{ needs.check_rust.result }}"
-        check_result "check_extension" "${{ needs.check_extension.result }}"
-
-        exit $EXIT_CODE
-      shell: bash -euxo pipefail {0}
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.ref_name == 'main' && github.sha || 'anysha' }}
-  cancel-in-progress: true
diff --git a/.github/workflows/good_first_issue_notifier.yml b/.github/workflows/good_first_issue_notifier.yml
deleted file mode 100644
index 1db992502b..0000000000
--- a/.github/workflows/good_first_issue_notifier.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: Good First Issue Notifier
-
-on:
-  issues:
-    types: [labeled]
-
-jobs:
-  handle-good-first-issue:
-    if: github.event.label.name == 'good first issue' && github.repository_owner == 'zed-industries'
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-
-      - name: Prepare Discord message
-        id: prepare-message
-        env:
-          ISSUE_TITLE: ${{ github.event.issue.title }}
-          ISSUE_NUMBER: ${{ github.event.issue.number }}
-          ISSUE_URL: ${{ github.event.issue.html_url }}
-          ISSUE_AUTHOR: ${{ github.event.issue.user.login }}
-        run: |
-          MESSAGE="[${ISSUE_TITLE} (#${ISSUE_NUMBER})](<${ISSUE_URL}>)"
-
-          {
-            echo "message<<EOF"
-            echo "$MESSAGE"
-            echo "EOF"
-          } >> "$GITHUB_OUTPUT"
-
-      - name: Discord Webhook Action
-        uses: tsickert/discord-webhook@c840d45a03a323fbc3f7507ac7769dbd91bfb164 # v5.3.0
-        with:
-          webhook-url: ${{ secrets.DISCORD_WEBHOOK_GOOD_FIRST_ISSUE }}
-          content: ${{ steps.prepare-message.outputs.message }}
diff --git a/.github/workflows/publish_extension_cli.yml b/.github/workflows/publish_extension_cli.yml
deleted file mode 100644
index 2daabb0de4..0000000000
--- a/.github/workflows/publish_extension_cli.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-name: Publish zed-extension CLI
-
-on:
-  push:
-    tags:
-      - extension-cli
-
-env:
-  CARGO_TERM_COLOR: always
-  CARGO_INCREMENTAL: 0
-
-jobs:
-  publish:
-    name: Publish zed-extension CLI
-    if: github.repository_owner == 'zed-industries'
-    runs-on:
-      - ubuntu-latest
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-        with:
-          clean: false
-
-      - name: Cache dependencies
-        uses: swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2
-        with:
-          save-if: ${{ github.ref == 'refs/heads/main' }}
-          cache-provider: "github"
-
-      - name: Configure linux
-        shell: bash -euxo pipefail {0}
-        run: script/linux
-
-      - name: Build extension CLI
-        run: cargo build --release --package extension_cli
-
-      - name: Upload binary
-        env:
-          DIGITALOCEAN_SPACES_ACCESS_KEY: ${{ secrets.DIGITALOCEAN_SPACES_ACCESS_KEY }}
-          DIGITALOCEAN_SPACES_SECRET_KEY: ${{ secrets.DIGITALOCEAN_SPACES_SECRET_KEY }}
-        run: script/upload-extension-cli ${{ github.sha }}
diff --git a/.github/workflows/randomized_tests.yml b/.github/workflows/randomized_tests.yml
deleted file mode 100644
index de96c3df78..0000000000
--- a/.github/workflows/randomized_tests.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: Randomized Tests
-
-concurrency: randomized-tests
-
-on:
-  push:
-    branches:
-      - randomized-tests-runner
-  # schedule:
-  #    - cron: '0 * * * *'
-
-env:
-  CARGO_TERM_COLOR: always
-  CARGO_INCREMENTAL: 0
-  RUST_BACKTRACE: 1
-  ZED_SERVER_URL: https://zed.dev
-
-jobs:
-  tests:
-    name: Run randomized tests
-    if: github.repository_owner == 'zed-industries'
-    runs-on:
-      - namespace-profile-16x32-ubuntu-2204
-    steps:
-      - name: Install Node
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
-        with:
-          node-version: "18"
-
-      - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-        with:
-          clean: false
-
-      - name: Run randomized tests
-        run: script/randomized-test-ci
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
deleted file mode 100644
index 7afac285b5..0000000000
--- a/.github/workflows/release.yml
+++ /dev/null
@@ -1,496 +0,0 @@
-# Generated from xtask::workflows::release
-# Rebuild with `cargo xtask workflows`.
-name: release
-env:
-  CARGO_TERM_COLOR: always
-  RUST_BACKTRACE: '1'
-on:
-  push:
-    tags:
-    - v*
-jobs:
-  run_tests_mac:
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
-    runs-on: self-mini-macos
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: steps::setup_cargo_config
-      run: |
-        mkdir -p ./../.cargo
-        cp ./.cargo/ci-config.toml ./../.cargo/config.toml
-      shell: bash -euxo pipefail {0}
-    - name: steps::setup_node
-      uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
-      with:
-        node-version: '20'
-    - name: steps::clippy
-      run: ./script/clippy
-      shell: bash -euxo pipefail {0}
-    - name: steps::clear_target_dir_if_large
-      run: ./script/clear-target-dir-if-larger-than 300
-      shell: bash -euxo pipefail {0}
-    - name: steps::cargo_nextest
-      run: cargo nextest run --workspace --no-fail-fast
-      shell: bash -euxo pipefail {0}
-    - name: steps::cleanup_cargo_config
-      if: always()
-      run: |
-        rm -rf ./../.cargo
-      shell: bash -euxo pipefail {0}
-    timeout-minutes: 60
-  run_tests_linux:
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
-    runs-on: namespace-profile-16x32-ubuntu-2204
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: steps::setup_cargo_config
-      run: |
-        mkdir -p ./../.cargo
-        cp ./.cargo/ci-config.toml ./../.cargo/config.toml
-      shell: bash -euxo pipefail {0}
-    - name: steps::cache_rust_dependencies_namespace
-      uses: namespacelabs/nscloud-cache-action@v1
-      with:
-        cache: rust
-    - name: steps::setup_linux
-      run: ./script/linux
-      shell: bash -euxo pipefail {0}
-    - name: steps::install_mold
-      run: ./script/install-mold
-      shell: bash -euxo pipefail {0}
-    - name: steps::download_wasi_sdk
-      run: ./script/download-wasi-sdk
-      shell: bash -euxo pipefail {0}
-    - name: steps::setup_node
-      uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
-      with:
-        node-version: '20'
-    - name: steps::clippy
-      run: ./script/clippy
-      shell: bash -euxo pipefail {0}
-    - name: steps::cargo_install_nextest
-      uses: taiki-e/install-action@nextest
-    - name: steps::clear_target_dir_if_large
-      run: ./script/clear-target-dir-if-larger-than 250
-      shell: bash -euxo pipefail {0}
-    - name: steps::cargo_nextest
-      run: cargo nextest run --workspace --no-fail-fast
-      shell: bash -euxo pipefail {0}
-    - name: steps::cleanup_cargo_config
-      if: always()
-      run: |
-        rm -rf ./../.cargo
-      shell: bash -euxo pipefail {0}
-    timeout-minutes: 60
-  run_tests_windows:
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
-    runs-on: self-32vcpu-windows-2022
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: steps::setup_cargo_config
-      run: |
-        New-Item -ItemType Directory -Path "./../.cargo" -Force
-        Copy-Item -Path "./.cargo/ci-config.toml" -Destination "./../.cargo/config.toml"
-      shell: pwsh
-    - name: steps::setup_node
-      uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
-      with:
-        node-version: '20'
-    - name: steps::clippy
-      run: ./script/clippy.ps1
-      shell: pwsh
-    - name: steps::clear_target_dir_if_large
-      run: ./script/clear-target-dir-if-larger-than.ps1 250
-      shell: pwsh
-    - name: steps::cargo_nextest
-      run: cargo nextest run --workspace --no-fail-fast
-      shell: pwsh
-    - name: steps::cleanup_cargo_config
-      if: always()
-      run: |
-        Remove-Item -Recurse -Path "./../.cargo" -Force -ErrorAction SilentlyContinue
-      shell: pwsh
-    timeout-minutes: 60
-  check_scripts:
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
-    runs-on: namespace-profile-2x4-ubuntu-2404
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: run_tests::check_scripts::run_shellcheck
-      run: ./script/shellcheck-scripts error
-      shell: bash -euxo pipefail {0}
-    - id: get_actionlint
-      name: run_tests::check_scripts::download_actionlint
-      run: bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash)
-      shell: bash -euxo pipefail {0}
-    - name: run_tests::check_scripts::run_actionlint
-      run: |
-        ${{ steps.get_actionlint.outputs.executable }} -color
-      shell: bash -euxo pipefail {0}
-    - name: run_tests::check_scripts::check_xtask_workflows
-      run: |
-        cargo xtask workflows
-        if ! git diff --exit-code .github; then
-          echo "Error: .github directory has uncommitted changes after running 'cargo xtask workflows'"
-          echo "Please run 'cargo xtask workflows' locally and commit the changes"
-          exit 1
-        fi
-      shell: bash -euxo pipefail {0}
-    timeout-minutes: 60
-  create_draft_release:
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
-    runs-on: namespace-profile-2x4-ubuntu-2404
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-        fetch-depth: 25
-        ref: ${{ github.ref }}
-    - name: script/determine-release-channel
-      run: script/determine-release-channel
-      shell: bash -euxo pipefail {0}
-    - name: mkdir -p target/
-      run: mkdir -p target/
-      shell: bash -euxo pipefail {0}
-    - name: release::create_draft_release::generate_release_notes
-      run: node --redirect-warnings=/dev/null ./script/draft-release-notes "$RELEASE_VERSION" "$RELEASE_CHANNEL" > target/release-notes.md
-      shell: bash -euxo pipefail {0}
-    - name: release::create_draft_release::create_release
-      run: script/create-draft-release target/release-notes.md
-      shell: bash -euxo pipefail {0}
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    timeout-minutes: 60
-  bundle_linux_aarch64:
-    needs:
-    - run_tests_linux
-    - check_scripts
-    runs-on: namespace-profile-8x32-ubuntu-2004-arm-m4
-    env:
-      CARGO_INCREMENTAL: 0
-      ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
-      ZED_MINIDUMP_ENDPOINT: ${{ secrets.ZED_SENTRY_MINIDUMP_ENDPOINT }}
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: steps::setup_sentry
-      uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b
-      with:
-        token: ${{ secrets.SENTRY_AUTH_TOKEN }}
-    - name: steps::setup_linux
-      run: ./script/linux
-      shell: bash -euxo pipefail {0}
-    - name: steps::install_mold
-      run: ./script/install-mold
-      shell: bash -euxo pipefail {0}
-    - name: steps::download_wasi_sdk
-      run: ./script/download-wasi-sdk
-      shell: bash -euxo pipefail {0}
-    - name: ./script/bundle-linux
-      run: ./script/bundle-linux
-      shell: bash -euxo pipefail {0}
-    - name: '@actions/upload-artifact zed-linux-aarch64.tar.gz'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
-      with:
-        name: zed-linux-aarch64.tar.gz
-        path: target/release/zed-linux-aarch64.tar.gz
-        if-no-files-found: error
-    - name: '@actions/upload-artifact zed-remote-server-linux-aarch64.gz'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
-      with:
-        name: zed-remote-server-linux-aarch64.gz
-        path: target/zed-remote-server-linux-aarch64.gz
-        if-no-files-found: error
-    timeout-minutes: 60
-  bundle_linux_x86_64:
-    needs:
-    - run_tests_linux
-    - check_scripts
-    runs-on: namespace-profile-32x64-ubuntu-2004
-    env:
-      CARGO_INCREMENTAL: 0
-      ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
-      ZED_MINIDUMP_ENDPOINT: ${{ secrets.ZED_SENTRY_MINIDUMP_ENDPOINT }}
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: steps::setup_sentry
-      uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b
-      with:
-        token: ${{ secrets.SENTRY_AUTH_TOKEN }}
-    - name: steps::setup_linux
-      run: ./script/linux
-      shell: bash -euxo pipefail {0}
-    - name: steps::install_mold
-      run: ./script/install-mold
-      shell: bash -euxo pipefail {0}
-    - name: steps::download_wasi_sdk
-      run: ./script/download-wasi-sdk
-      shell: bash -euxo pipefail {0}
-    - name: ./script/bundle-linux
-      run: ./script/bundle-linux
-      shell: bash -euxo pipefail {0}
-    - name: '@actions/upload-artifact zed-linux-x86_64.tar.gz'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
-      with:
-        name: zed-linux-x86_64.tar.gz
-        path: target/release/zed-linux-x86_64.tar.gz
-        if-no-files-found: error
-    - name: '@actions/upload-artifact zed-remote-server-linux-x86_64.gz'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
-      with:
-        name: zed-remote-server-linux-x86_64.gz
-        path: target/zed-remote-server-linux-x86_64.gz
-        if-no-files-found: error
-    timeout-minutes: 60
-  bundle_mac_aarch64:
-    needs:
-    - run_tests_mac
-    - check_scripts
-    runs-on: self-mini-macos
-    env:
-      CARGO_INCREMENTAL: 0
-      ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
-      ZED_MINIDUMP_ENDPOINT: ${{ secrets.ZED_SENTRY_MINIDUMP_ENDPOINT }}
-      MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }}
-      MACOS_CERTIFICATE_PASSWORD: ${{ secrets.MACOS_CERTIFICATE_PASSWORD }}
-      APPLE_NOTARIZATION_KEY: ${{ secrets.APPLE_NOTARIZATION_KEY }}
-      APPLE_NOTARIZATION_KEY_ID: ${{ secrets.APPLE_NOTARIZATION_KEY_ID }}
-      APPLE_NOTARIZATION_ISSUER_ID: ${{ secrets.APPLE_NOTARIZATION_ISSUER_ID }}
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: steps::setup_node
-      uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
-      with:
-        node-version: '20'
-    - name: steps::setup_sentry
-      uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b
-      with:
-        token: ${{ secrets.SENTRY_AUTH_TOKEN }}
-    - name: steps::clear_target_dir_if_large
-      run: ./script/clear-target-dir-if-larger-than 300
-      shell: bash -euxo pipefail {0}
-    - name: run_bundling::bundle_mac::bundle_mac
-      run: ./script/bundle-mac aarch64-apple-darwin
-      shell: bash -euxo pipefail {0}
-    - name: '@actions/upload-artifact Zed-aarch64.dmg'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
-      with:
-        name: Zed-aarch64.dmg
-        path: target/aarch64-apple-darwin/release/Zed-aarch64.dmg
-        if-no-files-found: error
-    - name: '@actions/upload-artifact zed-remote-server-macos-aarch64.gz'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
-      with:
-        name: zed-remote-server-macos-aarch64.gz
-        path: target/zed-remote-server-macos-aarch64.gz
-        if-no-files-found: error
-    timeout-minutes: 60
-  bundle_mac_x86_64:
-    needs:
-    - run_tests_mac
-    - check_scripts
-    runs-on: self-mini-macos
-    env:
-      CARGO_INCREMENTAL: 0
-      ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
-      ZED_MINIDUMP_ENDPOINT: ${{ secrets.ZED_SENTRY_MINIDUMP_ENDPOINT }}
-      MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }}
-      MACOS_CERTIFICATE_PASSWORD: ${{ secrets.MACOS_CERTIFICATE_PASSWORD }}
-      APPLE_NOTARIZATION_KEY: ${{ secrets.APPLE_NOTARIZATION_KEY }}
-      APPLE_NOTARIZATION_KEY_ID: ${{ secrets.APPLE_NOTARIZATION_KEY_ID }}
-      APPLE_NOTARIZATION_ISSUER_ID: ${{ secrets.APPLE_NOTARIZATION_ISSUER_ID }}
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: steps::setup_node
-      uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
-      with:
-        node-version: '20'
-    - name: steps::setup_sentry
-      uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b
-      with:
-        token: ${{ secrets.SENTRY_AUTH_TOKEN }}
-    - name: steps::clear_target_dir_if_large
-      run: ./script/clear-target-dir-if-larger-than 300
-      shell: bash -euxo pipefail {0}
-    - name: run_bundling::bundle_mac::bundle_mac
-      run: ./script/bundle-mac x86_64-apple-darwin
-      shell: bash -euxo pipefail {0}
-    - name: '@actions/upload-artifact Zed-x86_64.dmg'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
-      with:
-        name: Zed-x86_64.dmg
-        path: target/x86_64-apple-darwin/release/Zed-x86_64.dmg
-        if-no-files-found: error
-    - name: '@actions/upload-artifact zed-remote-server-macos-x86_64.gz'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
-      with:
-        name: zed-remote-server-macos-x86_64.gz
-        path: target/zed-remote-server-macos-x86_64.gz
-        if-no-files-found: error
-    timeout-minutes: 60
-  bundle_windows_aarch64:
-    needs:
-    - run_tests_windows
-    - check_scripts
-    runs-on: self-32vcpu-windows-2022
-    env:
-      CARGO_INCREMENTAL: 0
-      ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
-      ZED_MINIDUMP_ENDPOINT: ${{ secrets.ZED_SENTRY_MINIDUMP_ENDPOINT }}
-      AZURE_TENANT_ID: ${{ secrets.AZURE_SIGNING_TENANT_ID }}
-      AZURE_CLIENT_ID: ${{ secrets.AZURE_SIGNING_CLIENT_ID }}
-      AZURE_CLIENT_SECRET: ${{ secrets.AZURE_SIGNING_CLIENT_SECRET }}
-      ACCOUNT_NAME: ${{ vars.AZURE_SIGNING_ACCOUNT_NAME }}
-      CERT_PROFILE_NAME: ${{ vars.AZURE_SIGNING_CERT_PROFILE_NAME }}
-      ENDPOINT: ${{ vars.AZURE_SIGNING_ENDPOINT }}
-      FILE_DIGEST: SHA256
-      TIMESTAMP_DIGEST: SHA256
-      TIMESTAMP_SERVER: http://timestamp.acs.microsoft.com
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: steps::setup_sentry
-      uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b
-      with:
-        token: ${{ secrets.SENTRY_AUTH_TOKEN }}
-    - name: run_bundling::bundle_windows::bundle_windows
-      run: script/bundle-windows.ps1 -Architecture aarch64
-      shell: pwsh
-      working-directory: ${{ env.ZED_WORKSPACE }}
-    - name: '@actions/upload-artifact Zed-aarch64.exe'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
-      with:
-        name: Zed-aarch64.exe
-        path: target/Zed-aarch64.exe
-        if-no-files-found: error
-    timeout-minutes: 60
-  bundle_windows_x86_64:
-    needs:
-    - run_tests_windows
-    - check_scripts
-    runs-on: self-32vcpu-windows-2022
-    env:
-      CARGO_INCREMENTAL: 0
-      ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
-      ZED_MINIDUMP_ENDPOINT: ${{ secrets.ZED_SENTRY_MINIDUMP_ENDPOINT }}
-      AZURE_TENANT_ID: ${{ secrets.AZURE_SIGNING_TENANT_ID }}
-      AZURE_CLIENT_ID: ${{ secrets.AZURE_SIGNING_CLIENT_ID }}
-      AZURE_CLIENT_SECRET: ${{ secrets.AZURE_SIGNING_CLIENT_SECRET }}
-      ACCOUNT_NAME: ${{ vars.AZURE_SIGNING_ACCOUNT_NAME }}
-      CERT_PROFILE_NAME: ${{ vars.AZURE_SIGNING_CERT_PROFILE_NAME }}
-      ENDPOINT: ${{ vars.AZURE_SIGNING_ENDPOINT }}
-      FILE_DIGEST: SHA256
-      TIMESTAMP_DIGEST: SHA256
-      TIMESTAMP_SERVER: http://timestamp.acs.microsoft.com
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: steps::setup_sentry
-      uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b
-      with:
-        token: ${{ secrets.SENTRY_AUTH_TOKEN }}
-    - name: run_bundling::bundle_windows::bundle_windows
-      run: script/bundle-windows.ps1 -Architecture x86_64
-      shell: pwsh
-      working-directory: ${{ env.ZED_WORKSPACE }}
-    - name: '@actions/upload-artifact Zed-x86_64.exe'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
-      with:
-        name: Zed-x86_64.exe
-        path: target/Zed-x86_64.exe
-        if-no-files-found: error
-    timeout-minutes: 60
-  upload_release_assets:
-    needs:
-    - create_draft_release
-    - bundle_linux_aarch64
-    - bundle_linux_x86_64
-    - bundle_mac_aarch64
-    - bundle_mac_x86_64
-    - bundle_windows_aarch64
-    - bundle_windows_x86_64
-    runs-on: namespace-profile-4x8-ubuntu-2204
-    steps:
-    - name: release::download_workflow_artifacts
-      uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53
-      with:
-        path: ./artifacts/
-    - name: ls -lR ./artifacts
-      run: ls -lR ./artifacts
-      shell: bash -euxo pipefail {0}
-    - name: release::prep_release_artifacts
-      run: |-
-        mkdir -p release-artifacts/
-
-        mv ./artifacts/Zed-aarch64.dmg/Zed-aarch64.dmg release-artifacts/Zed-aarch64.dmg
-        mv ./artifacts/Zed-x86_64.dmg/Zed-x86_64.dmg release-artifacts/Zed-x86_64.dmg
-        mv ./artifacts/zed-linux-aarch64.tar.gz/zed-linux-aarch64.tar.gz release-artifacts/zed-linux-aarch64.tar.gz
-        mv ./artifacts/zed-linux-x86_64.tar.gz/zed-linux-x86_64.tar.gz release-artifacts/zed-linux-x86_64.tar.gz
-        mv ./artifacts/Zed-x86_64.exe/Zed-x86_64.exe release-artifacts/Zed-x86_64.exe
-        mv ./artifacts/Zed-aarch64.exe/Zed-aarch64.exe release-artifacts/Zed-aarch64.exe
-        mv ./artifacts/zed-remote-server-macos-aarch64.gz/zed-remote-server-macos-aarch64.gz release-artifacts/zed-remote-server-macos-aarch64.gz
-        mv ./artifacts/zed-remote-server-macos-x86_64.gz/zed-remote-server-macos-x86_64.gz release-artifacts/zed-remote-server-macos-x86_64.gz
-        mv ./artifacts/zed-remote-server-linux-aarch64.gz/zed-remote-server-linux-aarch64.gz release-artifacts/zed-remote-server-linux-aarch64.gz
-        mv ./artifacts/zed-remote-server-linux-x86_64.gz/zed-remote-server-linux-x86_64.gz release-artifacts/zed-remote-server-linux-x86_64.gz
-      shell: bash -euxo pipefail {0}
-    - name: gh release upload "$GITHUB_REF_NAME" --repo=zed-industries/zed release-artifacts/*
-      run: gh release upload "$GITHUB_REF_NAME" --repo=zed-industries/zed release-artifacts/*
-      shell: bash -euxo pipefail {0}
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  auto_release_preview:
-    needs:
-    - upload_release_assets
-    if: startsWith(github.ref, 'refs/tags/v') && endsWith(github.ref, '-pre') && !endsWith(github.ref, '.0-pre')
-    runs-on: namespace-profile-2x4-ubuntu-2404
-    steps:
-    - name: gh release edit "$GITHUB_REF_NAME" --repo=zed-industries/zed --draft=false
-      run: gh release edit "$GITHUB_REF_NAME" --repo=zed-industries/zed --draft=false
-      shell: bash -euxo pipefail {0}
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  notify_on_failure:
-    needs:
-    - upload_release_assets
-    - auto_release_preview
-    if: failure()
-    runs-on: namespace-profile-2x4-ubuntu-2404
-    steps:
-    - name: release::notify_on_failure::notify_slack
-      run: |-
-        curl -X POST -H 'Content-type: application/json'\
-         --data '{"text":"${{ github.workflow }} failed:  ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"}' "$SLACK_WEBHOOK"
-      shell: bash -euxo pipefail {0}
-      env:
-        SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_WORKFLOW_FAILURES }}
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.ref_name == 'main' && github.sha || 'anysha' }}
-  cancel-in-progress: true
diff --git a/.github/workflows/release_nightly.yml b/.github/workflows/release_nightly.yml
deleted file mode 100644
index d76244175a..0000000000
--- a/.github/workflows/release_nightly.yml
+++ /dev/null
@@ -1,510 +0,0 @@
-# Generated from xtask::workflows::release_nightly
-# Rebuild with `cargo xtask workflows`.
-name: release_nightly
-env:
-  CARGO_TERM_COLOR: always
-  RUST_BACKTRACE: '1'
-on:
-  push:
-    tags:
-    - nightly
-  schedule:
-  - cron: 0 7 * * *
-jobs:
-  check_style:
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
-    runs-on: self-mini-macos
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-        fetch-depth: 0
-    - name: steps::cargo_fmt
-      run: cargo fmt --all -- --check
-      shell: bash -euxo pipefail {0}
-    - name: ./script/clippy
-      run: ./script/clippy
-      shell: bash -euxo pipefail {0}
-    timeout-minutes: 60
-  run_tests_windows:
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
-    runs-on: self-32vcpu-windows-2022
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: steps::setup_cargo_config
-      run: |
-        New-Item -ItemType Directory -Path "./../.cargo" -Force
-        Copy-Item -Path "./.cargo/ci-config.toml" -Destination "./../.cargo/config.toml"
-      shell: pwsh
-    - name: steps::setup_node
-      uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
-      with:
-        node-version: '20'
-    - name: steps::clippy
-      run: ./script/clippy.ps1
-      shell: pwsh
-    - name: steps::clear_target_dir_if_large
-      run: ./script/clear-target-dir-if-larger-than.ps1 250
-      shell: pwsh
-    - name: steps::cargo_nextest
-      run: cargo nextest run --workspace --no-fail-fast
-      shell: pwsh
-    - name: steps::cleanup_cargo_config
-      if: always()
-      run: |
-        Remove-Item -Recurse -Path "./../.cargo" -Force -ErrorAction SilentlyContinue
-      shell: pwsh
-    timeout-minutes: 60
-  bundle_linux_aarch64:
-    needs:
-    - check_style
-    - run_tests_windows
-    runs-on: namespace-profile-8x32-ubuntu-2004-arm-m4
-    env:
-      CARGO_INCREMENTAL: 0
-      ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
-      ZED_MINIDUMP_ENDPOINT: ${{ secrets.ZED_SENTRY_MINIDUMP_ENDPOINT }}
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: run_bundling::set_release_channel_to_nightly
-      run: |
-        set -eu
-        version=$(git rev-parse --short HEAD)
-        echo "Publishing version: ${version} on release channel nightly"
-        echo "nightly" > crates/zed/RELEASE_CHANNEL
-      shell: bash -euxo pipefail {0}
-    - name: steps::setup_sentry
-      uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b
-      with:
-        token: ${{ secrets.SENTRY_AUTH_TOKEN }}
-    - name: steps::setup_linux
-      run: ./script/linux
-      shell: bash -euxo pipefail {0}
-    - name: steps::install_mold
-      run: ./script/install-mold
-      shell: bash -euxo pipefail {0}
-    - name: steps::download_wasi_sdk
-      run: ./script/download-wasi-sdk
-      shell: bash -euxo pipefail {0}
-    - name: ./script/bundle-linux
-      run: ./script/bundle-linux
-      shell: bash -euxo pipefail {0}
-    - name: '@actions/upload-artifact zed-linux-aarch64.tar.gz'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
-      with:
-        name: zed-linux-aarch64.tar.gz
-        path: target/release/zed-linux-aarch64.tar.gz
-        if-no-files-found: error
-    - name: '@actions/upload-artifact zed-remote-server-linux-aarch64.gz'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
-      with:
-        name: zed-remote-server-linux-aarch64.gz
-        path: target/zed-remote-server-linux-aarch64.gz
-        if-no-files-found: error
-    timeout-minutes: 60
-  bundle_linux_x86_64:
-    needs:
-    - check_style
-    - run_tests_windows
-    runs-on: namespace-profile-32x64-ubuntu-2004
-    env:
-      CARGO_INCREMENTAL: 0
-      ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
-      ZED_MINIDUMP_ENDPOINT: ${{ secrets.ZED_SENTRY_MINIDUMP_ENDPOINT }}
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: run_bundling::set_release_channel_to_nightly
-      run: |
-        set -eu
-        version=$(git rev-parse --short HEAD)
-        echo "Publishing version: ${version} on release channel nightly"
-        echo "nightly" > crates/zed/RELEASE_CHANNEL
-      shell: bash -euxo pipefail {0}
-    - name: steps::setup_sentry
-      uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b
-      with:
-        token: ${{ secrets.SENTRY_AUTH_TOKEN }}
-    - name: steps::setup_linux
-      run: ./script/linux
-      shell: bash -euxo pipefail {0}
-    - name: steps::install_mold
-      run: ./script/install-mold
-      shell: bash -euxo pipefail {0}
-    - name: steps::download_wasi_sdk
-      run: ./script/download-wasi-sdk
-      shell: bash -euxo pipefail {0}
-    - name: ./script/bundle-linux
-      run: ./script/bundle-linux
-      shell: bash -euxo pipefail {0}
-    - name: '@actions/upload-artifact zed-linux-x86_64.tar.gz'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
-      with:
-        name: zed-linux-x86_64.tar.gz
-        path: target/release/zed-linux-x86_64.tar.gz
-        if-no-files-found: error
-    - name: '@actions/upload-artifact zed-remote-server-linux-x86_64.gz'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
-      with:
-        name: zed-remote-server-linux-x86_64.gz
-        path: target/zed-remote-server-linux-x86_64.gz
-        if-no-files-found: error
-    timeout-minutes: 60
-  bundle_mac_aarch64:
-    needs:
-    - check_style
-    - run_tests_windows
-    runs-on: self-mini-macos
-    env:
-      CARGO_INCREMENTAL: 0
-      ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
-      ZED_MINIDUMP_ENDPOINT: ${{ secrets.ZED_SENTRY_MINIDUMP_ENDPOINT }}
-      MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }}
-      MACOS_CERTIFICATE_PASSWORD: ${{ secrets.MACOS_CERTIFICATE_PASSWORD }}
-      APPLE_NOTARIZATION_KEY: ${{ secrets.APPLE_NOTARIZATION_KEY }}
-      APPLE_NOTARIZATION_KEY_ID: ${{ secrets.APPLE_NOTARIZATION_KEY_ID }}
-      APPLE_NOTARIZATION_ISSUER_ID: ${{ secrets.APPLE_NOTARIZATION_ISSUER_ID }}
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: run_bundling::set_release_channel_to_nightly
-      run: |
-        set -eu
-        version=$(git rev-parse --short HEAD)
-        echo "Publishing version: ${version} on release channel nightly"
-        echo "nightly" > crates/zed/RELEASE_CHANNEL
-      shell: bash -euxo pipefail {0}
-    - name: steps::setup_node
-      uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
-      with:
-        node-version: '20'
-    - name: steps::setup_sentry
-      uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b
-      with:
-        token: ${{ secrets.SENTRY_AUTH_TOKEN }}
-    - name: steps::clear_target_dir_if_large
-      run: ./script/clear-target-dir-if-larger-than 300
-      shell: bash -euxo pipefail {0}
-    - name: run_bundling::bundle_mac::bundle_mac
-      run: ./script/bundle-mac aarch64-apple-darwin
-      shell: bash -euxo pipefail {0}
-    - name: '@actions/upload-artifact Zed-aarch64.dmg'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
-      with:
-        name: Zed-aarch64.dmg
-        path: target/aarch64-apple-darwin/release/Zed-aarch64.dmg
-        if-no-files-found: error
-    - name: '@actions/upload-artifact zed-remote-server-macos-aarch64.gz'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
-      with:
-        name: zed-remote-server-macos-aarch64.gz
-        path: target/zed-remote-server-macos-aarch64.gz
-        if-no-files-found: error
-    timeout-minutes: 60
-  bundle_mac_x86_64:
-    needs:
-    - check_style
-    - run_tests_windows
-    runs-on: self-mini-macos
-    env:
-      CARGO_INCREMENTAL: 0
-      ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
-      ZED_MINIDUMP_ENDPOINT: ${{ secrets.ZED_SENTRY_MINIDUMP_ENDPOINT }}
-      MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }}
-      MACOS_CERTIFICATE_PASSWORD: ${{ secrets.MACOS_CERTIFICATE_PASSWORD }}
-      APPLE_NOTARIZATION_KEY: ${{ secrets.APPLE_NOTARIZATION_KEY }}
-      APPLE_NOTARIZATION_KEY_ID: ${{ secrets.APPLE_NOTARIZATION_KEY_ID }}
-      APPLE_NOTARIZATION_ISSUER_ID: ${{ secrets.APPLE_NOTARIZATION_ISSUER_ID }}
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: run_bundling::set_release_channel_to_nightly
-      run: |
-        set -eu
-        version=$(git rev-parse --short HEAD)
-        echo "Publishing version: ${version} on release channel nightly"
-        echo "nightly" > crates/zed/RELEASE_CHANNEL
-      shell: bash -euxo pipefail {0}
-    - name: steps::setup_node
-      uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
-      with:
-        node-version: '20'
-    - name: steps::setup_sentry
-      uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b
-      with:
-        token: ${{ secrets.SENTRY_AUTH_TOKEN }}
-    - name: steps::clear_target_dir_if_large
-      run: ./script/clear-target-dir-if-larger-than 300
-      shell: bash -euxo pipefail {0}
-    - name: run_bundling::bundle_mac::bundle_mac
-      run: ./script/bundle-mac x86_64-apple-darwin
-      shell: bash -euxo pipefail {0}
-    - name: '@actions/upload-artifact Zed-x86_64.dmg'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
-      with:
-        name: Zed-x86_64.dmg
-        path: target/x86_64-apple-darwin/release/Zed-x86_64.dmg
-        if-no-files-found: error
-    - name: '@actions/upload-artifact zed-remote-server-macos-x86_64.gz'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
-      with:
-        name: zed-remote-server-macos-x86_64.gz
-        path: target/zed-remote-server-macos-x86_64.gz
-        if-no-files-found: error
-    timeout-minutes: 60
-  bundle_windows_aarch64:
-    needs:
-    - check_style
-    - run_tests_windows
-    runs-on: self-32vcpu-windows-2022
-    env:
-      CARGO_INCREMENTAL: 0
-      ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
-      ZED_MINIDUMP_ENDPOINT: ${{ secrets.ZED_SENTRY_MINIDUMP_ENDPOINT }}
-      AZURE_TENANT_ID: ${{ secrets.AZURE_SIGNING_TENANT_ID }}
-      AZURE_CLIENT_ID: ${{ secrets.AZURE_SIGNING_CLIENT_ID }}
-      AZURE_CLIENT_SECRET: ${{ secrets.AZURE_SIGNING_CLIENT_SECRET }}
-      ACCOUNT_NAME: ${{ vars.AZURE_SIGNING_ACCOUNT_NAME }}
-      CERT_PROFILE_NAME: ${{ vars.AZURE_SIGNING_CERT_PROFILE_NAME }}
-      ENDPOINT: ${{ vars.AZURE_SIGNING_ENDPOINT }}
-      FILE_DIGEST: SHA256
-      TIMESTAMP_DIGEST: SHA256
-      TIMESTAMP_SERVER: http://timestamp.acs.microsoft.com
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: run_bundling::set_release_channel_to_nightly
-      run: |
-        $ErrorActionPreference = "Stop"
-        $version = git rev-parse --short HEAD
-        Write-Host "Publishing version: $version on release channel nightly"
-        "nightly" | Set-Content -Path "crates/zed/RELEASE_CHANNEL"
-      shell: pwsh
-      working-directory: ${{ env.ZED_WORKSPACE }}
-    - name: steps::setup_sentry
-      uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b
-      with:
-        token: ${{ secrets.SENTRY_AUTH_TOKEN }}
-    - name: run_bundling::bundle_windows::bundle_windows
-      run: script/bundle-windows.ps1 -Architecture aarch64
-      shell: pwsh
-      working-directory: ${{ env.ZED_WORKSPACE }}
-    - name: '@actions/upload-artifact Zed-aarch64.exe'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
-      with:
-        name: Zed-aarch64.exe
-        path: target/Zed-aarch64.exe
-        if-no-files-found: error
-    timeout-minutes: 60
-  bundle_windows_x86_64:
-    needs:
-    - check_style
-    - run_tests_windows
-    runs-on: self-32vcpu-windows-2022
-    env:
-      CARGO_INCREMENTAL: 0
-      ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
-      ZED_MINIDUMP_ENDPOINT: ${{ secrets.ZED_SENTRY_MINIDUMP_ENDPOINT }}
-      AZURE_TENANT_ID: ${{ secrets.AZURE_SIGNING_TENANT_ID }}
-      AZURE_CLIENT_ID: ${{ secrets.AZURE_SIGNING_CLIENT_ID }}
-      AZURE_CLIENT_SECRET: ${{ secrets.AZURE_SIGNING_CLIENT_SECRET }}
-      ACCOUNT_NAME: ${{ vars.AZURE_SIGNING_ACCOUNT_NAME }}
-      CERT_PROFILE_NAME: ${{ vars.AZURE_SIGNING_CERT_PROFILE_NAME }}
-      ENDPOINT: ${{ vars.AZURE_SIGNING_ENDPOINT }}
-      FILE_DIGEST: SHA256
-      TIMESTAMP_DIGEST: SHA256
-      TIMESTAMP_SERVER: http://timestamp.acs.microsoft.com
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: run_bundling::set_release_channel_to_nightly
-      run: |
-        $ErrorActionPreference = "Stop"
-        $version = git rev-parse --short HEAD
-        Write-Host "Publishing version: $version on release channel nightly"
-        "nightly" | Set-Content -Path "crates/zed/RELEASE_CHANNEL"
-      shell: pwsh
-      working-directory: ${{ env.ZED_WORKSPACE }}
-    - name: steps::setup_sentry
-      uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b
-      with:
-        token: ${{ secrets.SENTRY_AUTH_TOKEN }}
-    - name: run_bundling::bundle_windows::bundle_windows
-      run: script/bundle-windows.ps1 -Architecture x86_64
-      shell: pwsh
-      working-directory: ${{ env.ZED_WORKSPACE }}
-    - name: '@actions/upload-artifact Zed-x86_64.exe'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
-      with:
-        name: Zed-x86_64.exe
-        path: target/Zed-x86_64.exe
-        if-no-files-found: error
-    timeout-minutes: 60
-  build_nix_linux_x86_64:
-    needs:
-    - check_style
-    - run_tests_windows
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
-    runs-on: namespace-profile-32x64-ubuntu-2004
-    env:
-      ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
-      ZED_MINIDUMP_ENDPOINT: ${{ secrets.ZED_SENTRY_MINIDUMP_ENDPOINT }}
-      ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON: ${{ secrets.ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON }}
-      GIT_LFS_SKIP_SMUDGE: '1'
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: nix_build::build_nix::install_nix
-      uses: cachix/install-nix-action@02a151ada4993995686f9ed4f1be7cfbb229e56f
-      with:
-        github_access_token: ${{ secrets.GITHUB_TOKEN }}
-    - name: nix_build::build_nix::cachix_action
-      uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad
-      with:
-        name: zed
-        authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
-        cachixArgs: -v
-    - name: nix_build::build_nix::build
-      run: nix build .#default -L --accept-flake-config
-      shell: bash -euxo pipefail {0}
-    timeout-minutes: 60
-    continue-on-error: true
-  build_nix_mac_aarch64:
-    needs:
-    - check_style
-    - run_tests_windows
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
-    runs-on: self-mini-macos
-    env:
-      ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
-      ZED_MINIDUMP_ENDPOINT: ${{ secrets.ZED_SENTRY_MINIDUMP_ENDPOINT }}
-      ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON: ${{ secrets.ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON }}
-      GIT_LFS_SKIP_SMUDGE: '1'
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: nix_build::build_nix::set_path
-      run: |
-        echo "/nix/var/nix/profiles/default/bin" >> "$GITHUB_PATH"
-        echo "/Users/administrator/.nix-profile/bin" >> "$GITHUB_PATH"
-      shell: bash -euxo pipefail {0}
-    - name: nix_build::build_nix::cachix_action
-      uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad
-      with:
-        name: zed
-        authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
-        cachixArgs: -v
-    - name: nix_build::build_nix::build
-      run: nix build .#default -L --accept-flake-config
-      shell: bash -euxo pipefail {0}
-    - name: nix_build::build_nix::limit_store
-      run: |-
-        if [ "$(du -sm /nix/store | cut -f1)" -gt 50000 ]; then
-            nix-collect-garbage -d || true
-        fi
-      shell: bash -euxo pipefail {0}
-    timeout-minutes: 60
-    continue-on-error: true
-  update_nightly_tag:
-    needs:
-    - bundle_linux_aarch64
-    - bundle_linux_x86_64
-    - bundle_mac_aarch64
-    - bundle_mac_x86_64
-    - bundle_windows_aarch64
-    - bundle_windows_x86_64
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
-    runs-on: namespace-profile-4x8-ubuntu-2204
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-        fetch-depth: 0
-    - name: release::download_workflow_artifacts
-      uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53
-      with:
-        path: ./artifacts/
-    - name: ls -lR ./artifacts
-      run: ls -lR ./artifacts
-      shell: bash -euxo pipefail {0}
-    - name: release::prep_release_artifacts
-      run: |-
-        mkdir -p release-artifacts/
-
-        mv ./artifacts/Zed-aarch64.dmg/Zed-aarch64.dmg release-artifacts/Zed-aarch64.dmg
-        mv ./artifacts/Zed-x86_64.dmg/Zed-x86_64.dmg release-artifacts/Zed-x86_64.dmg
-        mv ./artifacts/zed-linux-aarch64.tar.gz/zed-linux-aarch64.tar.gz release-artifacts/zed-linux-aarch64.tar.gz
-        mv ./artifacts/zed-linux-x86_64.tar.gz/zed-linux-x86_64.tar.gz release-artifacts/zed-linux-x86_64.tar.gz
-        mv ./artifacts/Zed-x86_64.exe/Zed-x86_64.exe release-artifacts/Zed-x86_64.exe
-        mv ./artifacts/Zed-aarch64.exe/Zed-aarch64.exe release-artifacts/Zed-aarch64.exe
-        mv ./artifacts/zed-remote-server-macos-aarch64.gz/zed-remote-server-macos-aarch64.gz release-artifacts/zed-remote-server-macos-aarch64.gz
-        mv ./artifacts/zed-remote-server-macos-x86_64.gz/zed-remote-server-macos-x86_64.gz release-artifacts/zed-remote-server-macos-x86_64.gz
-        mv ./artifacts/zed-remote-server-linux-aarch64.gz/zed-remote-server-linux-aarch64.gz release-artifacts/zed-remote-server-linux-aarch64.gz
-        mv ./artifacts/zed-remote-server-linux-x86_64.gz/zed-remote-server-linux-x86_64.gz release-artifacts/zed-remote-server-linux-x86_64.gz
-      shell: bash -euxo pipefail {0}
-    - name: ./script/upload-nightly
-      run: ./script/upload-nightly
-      shell: bash -euxo pipefail {0}
-      env:
-        DIGITALOCEAN_SPACES_ACCESS_KEY: ${{ secrets.DIGITALOCEAN_SPACES_ACCESS_KEY }}
-        DIGITALOCEAN_SPACES_SECRET_KEY: ${{ secrets.DIGITALOCEAN_SPACES_SECRET_KEY }}
-    - name: release_nightly::update_nightly_tag_job::update_nightly_tag
-      run: |
-        if [ "$(git rev-parse nightly)" = "$(git rev-parse HEAD)" ]; then
-          echo "Nightly tag already points to current commit. Skipping tagging."
-          exit 0
-        fi
-        git config user.name github-actions
-        git config user.email github-actions@github.com
-        git tag -f nightly
-        git push origin nightly --force
-      shell: bash -euxo pipefail {0}
-    - name: release::create_sentry_release
-      uses: getsentry/action-release@526942b68292201ac6bbb99b9a0747d4abee354c
-      with:
-        environment: production
-      env:
-        SENTRY_ORG: zed-dev
-        SENTRY_PROJECT: zed
-        SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-    timeout-minutes: 60
-  notify_on_failure:
-    needs:
-    - bundle_linux_aarch64
-    - bundle_linux_x86_64
-    - bundle_mac_aarch64
-    - bundle_mac_x86_64
-    - bundle_windows_aarch64
-    - bundle_windows_x86_64
-    if: failure()
-    runs-on: namespace-profile-2x4-ubuntu-2404
-    steps:
-    - name: release::notify_on_failure::notify_slack
-      run: |-
-        curl -X POST -H 'Content-type: application/json'\
-         --data '{"text":"${{ github.workflow }} failed:  ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"}' "$SLACK_WEBHOOK"
-      shell: bash -euxo pipefail {0}
-      env:
-        SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_WORKFLOW_FAILURES }}
diff --git a/.github/workflows/run_agent_evals.yml b/.github/workflows/run_agent_evals.yml
deleted file mode 100644
index 421d5a1c80..0000000000
--- a/.github/workflows/run_agent_evals.yml
+++ /dev/null
@@ -1,67 +0,0 @@
-# Generated from xtask::workflows::run_agent_evals
-# Rebuild with `cargo xtask workflows`.
-name: run_agent_evals
-env:
-  CARGO_TERM_COLOR: always
-  CARGO_INCREMENTAL: '0'
-  RUST_BACKTRACE: '1'
-  ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
-  OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
-  GOOGLE_AI_API_KEY: ${{ secrets.GOOGLE_AI_API_KEY }}
-  GOOGLE_CLOUD_PROJECT: ${{ secrets.GOOGLE_CLOUD_PROJECT }}
-  ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
-  ZED_EVAL_TELEMETRY: '1'
-  MODEL_NAME: ${{ inputs.model_name }}
-on:
-  workflow_dispatch:
-    inputs:
-      model_name:
-        description: model_name
-        required: true
-        type: string
-jobs:
-  agent_evals:
-    runs-on: namespace-profile-16x32-ubuntu-2204
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: steps::cache_rust_dependencies_namespace
-      uses: namespacelabs/nscloud-cache-action@v1
-      with:
-        cache: rust
-    - name: steps::setup_linux
-      run: ./script/linux
-      shell: bash -euxo pipefail {0}
-    - name: steps::install_mold
-      run: ./script/install-mold
-      shell: bash -euxo pipefail {0}
-    - name: steps::download_wasi_sdk
-      run: ./script/download-wasi-sdk
-      shell: bash -euxo pipefail {0}
-    - name: steps::setup_cargo_config
-      run: |
-        mkdir -p ./../.cargo
-        cp ./.cargo/ci-config.toml ./../.cargo/config.toml
-      shell: bash -euxo pipefail {0}
-    - name: cargo build --package=eval
-      run: cargo build --package=eval
-      shell: bash -euxo pipefail {0}
-    - name: run_agent_evals::agent_evals::run_eval
-      run: cargo run --package=eval -- --repetitions=8 --concurrency=1 --model "${MODEL_NAME}"
-      shell: bash -euxo pipefail {0}
-      env:
-        ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
-        OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
-        GOOGLE_AI_API_KEY: ${{ secrets.GOOGLE_AI_API_KEY }}
-        GOOGLE_CLOUD_PROJECT: ${{ secrets.GOOGLE_CLOUD_PROJECT }}
-    - name: steps::cleanup_cargo_config
-      if: always()
-      run: |
-        rm -rf ./../.cargo
-      shell: bash -euxo pipefail {0}
-    timeout-minutes: 600
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.ref_name == 'main' && github.sha || 'anysha' }}
-  cancel-in-progress: true
diff --git a/.github/workflows/run_bundling.yml b/.github/workflows/run_bundling.yml
deleted file mode 100644
index f56e56ac7f..0000000000
--- a/.github/workflows/run_bundling.yml
+++ /dev/null
@@ -1,269 +0,0 @@
-# Generated from xtask::workflows::run_bundling
-# Rebuild with `cargo xtask workflows`.
-name: run_bundling
-env:
-  CARGO_TERM_COLOR: always
-  RUST_BACKTRACE: '1'
-on:
-  pull_request:
-    types:
-    - labeled
-    - synchronize
-jobs:
-  bundle_linux_aarch64:
-    if: |-
-      (github.event.action == 'labeled' && github.event.label.name == 'run-bundling') ||
-      (github.event.action == 'synchronize' && contains(github.event.pull_request.labels.*.name, 'run-bundling'))
-    runs-on: namespace-profile-8x32-ubuntu-2004-arm-m4
-    env:
-      CARGO_INCREMENTAL: 0
-      ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
-      ZED_MINIDUMP_ENDPOINT: ${{ secrets.ZED_SENTRY_MINIDUMP_ENDPOINT }}
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: steps::setup_sentry
-      uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b
-      with:
-        token: ${{ secrets.SENTRY_AUTH_TOKEN }}
-    - name: steps::setup_linux
-      run: ./script/linux
-      shell: bash -euxo pipefail {0}
-    - name: steps::install_mold
-      run: ./script/install-mold
-      shell: bash -euxo pipefail {0}
-    - name: steps::download_wasi_sdk
-      run: ./script/download-wasi-sdk
-      shell: bash -euxo pipefail {0}
-    - name: ./script/bundle-linux
-      run: ./script/bundle-linux
-      shell: bash -euxo pipefail {0}
-    - name: '@actions/upload-artifact zed-linux-aarch64.tar.gz'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
-      with:
-        name: zed-linux-aarch64.tar.gz
-        path: target/release/zed-linux-aarch64.tar.gz
-        if-no-files-found: error
-    - name: '@actions/upload-artifact zed-remote-server-linux-aarch64.gz'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
-      with:
-        name: zed-remote-server-linux-aarch64.gz
-        path: target/zed-remote-server-linux-aarch64.gz
-        if-no-files-found: error
-    timeout-minutes: 60
-  bundle_linux_x86_64:
-    if: |-
-      (github.event.action == 'labeled' && github.event.label.name == 'run-bundling') ||
-      (github.event.action == 'synchronize' && contains(github.event.pull_request.labels.*.name, 'run-bundling'))
-    runs-on: namespace-profile-32x64-ubuntu-2004
-    env:
-      CARGO_INCREMENTAL: 0
-      ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
-      ZED_MINIDUMP_ENDPOINT: ${{ secrets.ZED_SENTRY_MINIDUMP_ENDPOINT }}
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: steps::setup_sentry
-      uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b
-      with:
-        token: ${{ secrets.SENTRY_AUTH_TOKEN }}
-    - name: steps::setup_linux
-      run: ./script/linux
-      shell: bash -euxo pipefail {0}
-    - name: steps::install_mold
-      run: ./script/install-mold
-      shell: bash -euxo pipefail {0}
-    - name: steps::download_wasi_sdk
-      run: ./script/download-wasi-sdk
-      shell: bash -euxo pipefail {0}
-    - name: ./script/bundle-linux
-      run: ./script/bundle-linux
-      shell: bash -euxo pipefail {0}
-    - name: '@actions/upload-artifact zed-linux-x86_64.tar.gz'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
-      with:
-        name: zed-linux-x86_64.tar.gz
-        path: target/release/zed-linux-x86_64.tar.gz
-        if-no-files-found: error
-    - name: '@actions/upload-artifact zed-remote-server-linux-x86_64.gz'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
-      with:
-        name: zed-remote-server-linux-x86_64.gz
-        path: target/zed-remote-server-linux-x86_64.gz
-        if-no-files-found: error
-    timeout-minutes: 60
-  bundle_mac_aarch64:
-    if: |-
-      (github.event.action == 'labeled' && github.event.label.name == 'run-bundling') ||
-      (github.event.action == 'synchronize' && contains(github.event.pull_request.labels.*.name, 'run-bundling'))
-    runs-on: self-mini-macos
-    env:
-      CARGO_INCREMENTAL: 0
-      ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
-      ZED_MINIDUMP_ENDPOINT: ${{ secrets.ZED_SENTRY_MINIDUMP_ENDPOINT }}
-      MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }}
-      MACOS_CERTIFICATE_PASSWORD: ${{ secrets.MACOS_CERTIFICATE_PASSWORD }}
-      APPLE_NOTARIZATION_KEY: ${{ secrets.APPLE_NOTARIZATION_KEY }}
-      APPLE_NOTARIZATION_KEY_ID: ${{ secrets.APPLE_NOTARIZATION_KEY_ID }}
-      APPLE_NOTARIZATION_ISSUER_ID: ${{ secrets.APPLE_NOTARIZATION_ISSUER_ID }}
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: steps::setup_node
-      uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
-      with:
-        node-version: '20'
-    - name: steps::setup_sentry
-      uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b
-      with:
-        token: ${{ secrets.SENTRY_AUTH_TOKEN }}
-    - name: steps::clear_target_dir_if_large
-      run: ./script/clear-target-dir-if-larger-than 300
-      shell: bash -euxo pipefail {0}
-    - name: run_bundling::bundle_mac::bundle_mac
-      run: ./script/bundle-mac aarch64-apple-darwin
-      shell: bash -euxo pipefail {0}
-    - name: '@actions/upload-artifact Zed-aarch64.dmg'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
-      with:
-        name: Zed-aarch64.dmg
-        path: target/aarch64-apple-darwin/release/Zed-aarch64.dmg
-        if-no-files-found: error
-    - name: '@actions/upload-artifact zed-remote-server-macos-aarch64.gz'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
-      with:
-        name: zed-remote-server-macos-aarch64.gz
-        path: target/zed-remote-server-macos-aarch64.gz
-        if-no-files-found: error
-    timeout-minutes: 60
-  bundle_mac_x86_64:
-    if: |-
-      (github.event.action == 'labeled' && github.event.label.name == 'run-bundling') ||
-      (github.event.action == 'synchronize' && contains(github.event.pull_request.labels.*.name, 'run-bundling'))
-    runs-on: self-mini-macos
-    env:
-      CARGO_INCREMENTAL: 0
-      ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
-      ZED_MINIDUMP_ENDPOINT: ${{ secrets.ZED_SENTRY_MINIDUMP_ENDPOINT }}
-      MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }}
-      MACOS_CERTIFICATE_PASSWORD: ${{ secrets.MACOS_CERTIFICATE_PASSWORD }}
-      APPLE_NOTARIZATION_KEY: ${{ secrets.APPLE_NOTARIZATION_KEY }}
-      APPLE_NOTARIZATION_KEY_ID: ${{ secrets.APPLE_NOTARIZATION_KEY_ID }}
-      APPLE_NOTARIZATION_ISSUER_ID: ${{ secrets.APPLE_NOTARIZATION_ISSUER_ID }}
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: steps::setup_node
-      uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
-      with:
-        node-version: '20'
-    - name: steps::setup_sentry
-      uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b
-      with:
-        token: ${{ secrets.SENTRY_AUTH_TOKEN }}
-    - name: steps::clear_target_dir_if_large
-      run: ./script/clear-target-dir-if-larger-than 300
-      shell: bash -euxo pipefail {0}
-    - name: run_bundling::bundle_mac::bundle_mac
-      run: ./script/bundle-mac x86_64-apple-darwin
-      shell: bash -euxo pipefail {0}
-    - name: '@actions/upload-artifact Zed-x86_64.dmg'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
-      with:
-        name: Zed-x86_64.dmg
-        path: target/x86_64-apple-darwin/release/Zed-x86_64.dmg
-        if-no-files-found: error
-    - name: '@actions/upload-artifact zed-remote-server-macos-x86_64.gz'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
-      with:
-        name: zed-remote-server-macos-x86_64.gz
-        path: target/zed-remote-server-macos-x86_64.gz
-        if-no-files-found: error
-    timeout-minutes: 60
-  bundle_windows_aarch64:
-    if: |-
-      (github.event.action == 'labeled' && github.event.label.name == 'run-bundling') ||
-      (github.event.action == 'synchronize' && contains(github.event.pull_request.labels.*.name, 'run-bundling'))
-    runs-on: self-32vcpu-windows-2022
-    env:
-      CARGO_INCREMENTAL: 0
-      ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
-      ZED_MINIDUMP_ENDPOINT: ${{ secrets.ZED_SENTRY_MINIDUMP_ENDPOINT }}
-      AZURE_TENANT_ID: ${{ secrets.AZURE_SIGNING_TENANT_ID }}
-      AZURE_CLIENT_ID: ${{ secrets.AZURE_SIGNING_CLIENT_ID }}
-      AZURE_CLIENT_SECRET: ${{ secrets.AZURE_SIGNING_CLIENT_SECRET }}
-      ACCOUNT_NAME: ${{ vars.AZURE_SIGNING_ACCOUNT_NAME }}
-      CERT_PROFILE_NAME: ${{ vars.AZURE_SIGNING_CERT_PROFILE_NAME }}
-      ENDPOINT: ${{ vars.AZURE_SIGNING_ENDPOINT }}
-      FILE_DIGEST: SHA256
-      TIMESTAMP_DIGEST: SHA256
-      TIMESTAMP_SERVER: http://timestamp.acs.microsoft.com
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: steps::setup_sentry
-      uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b
-      with:
-        token: ${{ secrets.SENTRY_AUTH_TOKEN }}
-    - name: run_bundling::bundle_windows::bundle_windows
-      run: script/bundle-windows.ps1 -Architecture aarch64
-      shell: pwsh
-      working-directory: ${{ env.ZED_WORKSPACE }}
-    - name: '@actions/upload-artifact Zed-aarch64.exe'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
-      with:
-        name: Zed-aarch64.exe
-        path: target/Zed-aarch64.exe
-        if-no-files-found: error
-    timeout-minutes: 60
-  bundle_windows_x86_64:
-    if: |-
-      (github.event.action == 'labeled' && github.event.label.name == 'run-bundling') ||
-      (github.event.action == 'synchronize' && contains(github.event.pull_request.labels.*.name, 'run-bundling'))
-    runs-on: self-32vcpu-windows-2022
-    env:
-      CARGO_INCREMENTAL: 0
-      ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
-      ZED_MINIDUMP_ENDPOINT: ${{ secrets.ZED_SENTRY_MINIDUMP_ENDPOINT }}
-      AZURE_TENANT_ID: ${{ secrets.AZURE_SIGNING_TENANT_ID }}
-      AZURE_CLIENT_ID: ${{ secrets.AZURE_SIGNING_CLIENT_ID }}
-      AZURE_CLIENT_SECRET: ${{ secrets.AZURE_SIGNING_CLIENT_SECRET }}
-      ACCOUNT_NAME: ${{ vars.AZURE_SIGNING_ACCOUNT_NAME }}
-      CERT_PROFILE_NAME: ${{ vars.AZURE_SIGNING_CERT_PROFILE_NAME }}
-      ENDPOINT: ${{ vars.AZURE_SIGNING_ENDPOINT }}
-      FILE_DIGEST: SHA256
-      TIMESTAMP_DIGEST: SHA256
-      TIMESTAMP_SERVER: http://timestamp.acs.microsoft.com
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: steps::setup_sentry
-      uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b
-      with:
-        token: ${{ secrets.SENTRY_AUTH_TOKEN }}
-    - name: run_bundling::bundle_windows::bundle_windows
-      run: script/bundle-windows.ps1 -Architecture x86_64
-      shell: pwsh
-      working-directory: ${{ env.ZED_WORKSPACE }}
-    - name: '@actions/upload-artifact Zed-x86_64.exe'
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
-      with:
-        name: Zed-x86_64.exe
-        path: target/Zed-x86_64.exe
-        if-no-files-found: error
-    timeout-minutes: 60
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
-  cancel-in-progress: true
diff --git a/.github/workflows/run_cron_unit_evals.yml b/.github/workflows/run_cron_unit_evals.yml
deleted file mode 100644
index cdfb51cc5b..0000000000
--- a/.github/workflows/run_cron_unit_evals.yml
+++ /dev/null
@@ -1,77 +0,0 @@
-# Generated from xtask::workflows::run_cron_unit_evals
-# Rebuild with `cargo xtask workflows`.
-name: run_cron_unit_evals
-env:
-  CARGO_TERM_COLOR: always
-  CARGO_INCREMENTAL: '0'
-  RUST_BACKTRACE: '1'
-  ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
-on:
-  schedule:
-  - cron: 47 1 * * 2
-  workflow_dispatch: {}
-jobs:
-  cron_unit_evals:
-    runs-on: namespace-profile-16x32-ubuntu-2204
-    strategy:
-      matrix:
-        model:
-        - anthropic/claude-sonnet-4-5-latest
-        - anthropic/claude-opus-4-5-latest
-        - google/gemini-3-pro
-        - openai/gpt-5
-      fail-fast: false
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: steps::setup_cargo_config
-      run: |
-        mkdir -p ./../.cargo
-        cp ./.cargo/ci-config.toml ./../.cargo/config.toml
-      shell: bash -euxo pipefail {0}
-    - name: steps::cache_rust_dependencies_namespace
-      uses: namespacelabs/nscloud-cache-action@v1
-      with:
-        cache: rust
-    - name: steps::setup_linux
-      run: ./script/linux
-      shell: bash -euxo pipefail {0}
-    - name: steps::install_mold
-      run: ./script/install-mold
-      shell: bash -euxo pipefail {0}
-    - name: steps::download_wasi_sdk
-      run: ./script/download-wasi-sdk
-      shell: bash -euxo pipefail {0}
-    - name: steps::cargo_install_nextest
-      uses: taiki-e/install-action@nextest
-    - name: steps::clear_target_dir_if_large
-      run: ./script/clear-target-dir-if-larger-than 250
-      shell: bash -euxo pipefail {0}
-    - name: ./script/run-unit-evals
-      run: ./script/run-unit-evals
-      shell: bash -euxo pipefail {0}
-      env:
-        ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
-        OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
-        GOOGLE_AI_API_KEY: ${{ secrets.GOOGLE_AI_API_KEY }}
-        GOOGLE_CLOUD_PROJECT: ${{ secrets.GOOGLE_CLOUD_PROJECT }}
-        ZED_AGENT_MODEL: ${{ matrix.model }}
-    - name: steps::cleanup_cargo_config
-      if: always()
-      run: |
-        rm -rf ./../.cargo
-      shell: bash -euxo pipefail {0}
-    - name: run_agent_evals::cron_unit_evals::send_failure_to_slack
-      if: ${{ failure() }}
-      uses: slackapi/slack-github-action@b0fa283ad8fea605de13dc3f449259339835fc52
-      with:
-        method: chat.postMessage
-        token: ${{ secrets.SLACK_APP_ZED_UNIT_EVALS_BOT_TOKEN }}
-        payload: |
-          channel: C04UDRNNJFQ
-          text: "Unit Evals Failed: https://github.com/zed-industries/zed/actions/runs/${{ github.run_id }}"
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.ref_name == 'main' && github.sha || 'anysha' }}
-  cancel-in-progress: true
diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
deleted file mode 100644
index 9584d7a0cb..0000000000
--- a/.github/workflows/run_tests.yml
+++ /dev/null
@@ -1,578 +0,0 @@
-# Generated from xtask::workflows::run_tests
-# Rebuild with `cargo xtask workflows`.
-name: run_tests
-env:
-  CARGO_TERM_COLOR: always
-  RUST_BACKTRACE: '1'
-  CARGO_INCREMENTAL: '0'
-on:
-  pull_request:
-    branches:
-    - '**'
-  push:
-    branches:
-    - main
-    - v[0-9]+.[0-9]+.x
-jobs:
-  orchestrate:
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
-    runs-on: namespace-profile-2x4-ubuntu-2404
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-        fetch-depth: ${{ github.ref == 'refs/heads/main' && 2 || 350 }}
-    - id: filter
-      name: filter
-      run: |
-        if [ -z "$GITHUB_BASE_REF" ]; then
-          echo "Not in a PR context (i.e., push to main/stable/preview)"
-          COMPARE_REV="$(git rev-parse HEAD~1)"
-        else
-          echo "In a PR context comparing to pull_request.base.ref"
-          git fetch origin "$GITHUB_BASE_REF" --depth=350
-          COMPARE_REV="$(git merge-base "origin/${GITHUB_BASE_REF}" HEAD)"
-        fi
-        CHANGED_FILES="$(git diff --name-only "$COMPARE_REV" ${{ github.sha }})"
-
-        check_pattern() {
-          local output_name="$1"
-          local pattern="$2"
-          local grep_arg="$3"
-
-          echo "$CHANGED_FILES" | grep "$grep_arg" "$pattern" && \
-            echo "${output_name}=true" >> "$GITHUB_OUTPUT" || \
-            echo "${output_name}=false" >> "$GITHUB_OUTPUT"
-        }
-
-        check_pattern "run_action_checks" '^\.github/(workflows/|actions/|actionlint.yml)|tooling/xtask|script/' -qP
-        check_pattern "run_docs" '^(docs/|crates/.*\.rs)' -qP
-        check_pattern "run_licenses" '^(Cargo.lock|script/.*licenses)' -qP
-        check_pattern "run_nix" '^(nix/|flake\.|Cargo\.|rust-toolchain.toml|\.cargo/config.toml)' -qP
-        check_pattern "run_tests" '^(docs/|script/update_top_ranking_issues/|\.github/(ISSUE_TEMPLATE|workflows/(?!run_tests)))' -qvP
-      shell: bash -euxo pipefail {0}
-    outputs:
-      run_action_checks: ${{ steps.filter.outputs.run_action_checks }}
-      run_docs: ${{ steps.filter.outputs.run_docs }}
-      run_licenses: ${{ steps.filter.outputs.run_licenses }}
-      run_nix: ${{ steps.filter.outputs.run_nix }}
-      run_tests: ${{ steps.filter.outputs.run_tests }}
-  check_style:
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
-    runs-on: namespace-profile-4x8-ubuntu-2204
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: steps::cache_rust_dependencies_namespace
-      uses: namespacelabs/nscloud-cache-action@v1
-      with:
-        cache: rust
-    - name: steps::setup_pnpm
-      uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2
-      with:
-        version: '9'
-    - name: ./script/prettier
-      run: ./script/prettier
-      shell: bash -euxo pipefail {0}
-    - name: ./script/check-todos
-      run: ./script/check-todos
-      shell: bash -euxo pipefail {0}
-    - name: ./script/check-keymaps
-      run: ./script/check-keymaps
-      shell: bash -euxo pipefail {0}
-    - name: run_tests::check_style::check_for_typos
-      uses: crate-ci/typos@2d0ce569feab1f8752f1dde43cc2f2aa53236e06
-      with:
-        config: ./typos.toml
-    - name: steps::cargo_fmt
-      run: cargo fmt --all -- --check
-      shell: bash -euxo pipefail {0}
-    timeout-minutes: 60
-  run_tests_windows:
-    needs:
-    - orchestrate
-    if: needs.orchestrate.outputs.run_tests == 'true'
-    runs-on: self-32vcpu-windows-2022
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: steps::setup_cargo_config
-      run: |
-        New-Item -ItemType Directory -Path "./../.cargo" -Force
-        Copy-Item -Path "./.cargo/ci-config.toml" -Destination "./../.cargo/config.toml"
-      shell: pwsh
-    - name: steps::setup_node
-      uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
-      with:
-        node-version: '20'
-    - name: steps::clippy
-      run: ./script/clippy.ps1
-      shell: pwsh
-    - name: steps::clear_target_dir_if_large
-      run: ./script/clear-target-dir-if-larger-than.ps1 250
-      shell: pwsh
-    - name: steps::cargo_nextest
-      run: cargo nextest run --workspace --no-fail-fast
-      shell: pwsh
-    - name: steps::cleanup_cargo_config
-      if: always()
-      run: |
-        Remove-Item -Recurse -Path "./../.cargo" -Force -ErrorAction SilentlyContinue
-      shell: pwsh
-    timeout-minutes: 60
-  run_tests_linux:
-    needs:
-    - orchestrate
-    if: needs.orchestrate.outputs.run_tests == 'true'
-    runs-on: namespace-profile-16x32-ubuntu-2204
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: steps::setup_cargo_config
-      run: |
-        mkdir -p ./../.cargo
-        cp ./.cargo/ci-config.toml ./../.cargo/config.toml
-      shell: bash -euxo pipefail {0}
-    - name: steps::cache_rust_dependencies_namespace
-      uses: namespacelabs/nscloud-cache-action@v1
-      with:
-        cache: rust
-    - name: steps::setup_linux
-      run: ./script/linux
-      shell: bash -euxo pipefail {0}
-    - name: steps::install_mold
-      run: ./script/install-mold
-      shell: bash -euxo pipefail {0}
-    - name: steps::download_wasi_sdk
-      run: ./script/download-wasi-sdk
-      shell: bash -euxo pipefail {0}
-    - name: steps::setup_node
-      uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
-      with:
-        node-version: '20'
-    - name: steps::clippy
-      run: ./script/clippy
-      shell: bash -euxo pipefail {0}
-    - name: steps::cargo_install_nextest
-      uses: taiki-e/install-action@nextest
-    - name: steps::clear_target_dir_if_large
-      run: ./script/clear-target-dir-if-larger-than 250
-      shell: bash -euxo pipefail {0}
-    - name: steps::cargo_nextest
-      run: cargo nextest run --workspace --no-fail-fast
-      shell: bash -euxo pipefail {0}
-    - name: steps::cleanup_cargo_config
-      if: always()
-      run: |
-        rm -rf ./../.cargo
-      shell: bash -euxo pipefail {0}
-    timeout-minutes: 60
-  run_tests_mac:
-    needs:
-    - orchestrate
-    if: needs.orchestrate.outputs.run_tests == 'true'
-    runs-on: self-mini-macos
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: steps::setup_cargo_config
-      run: |
-        mkdir -p ./../.cargo
-        cp ./.cargo/ci-config.toml ./../.cargo/config.toml
-      shell: bash -euxo pipefail {0}
-    - name: steps::setup_node
-      uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
-      with:
-        node-version: '20'
-    - name: steps::clippy
-      run: ./script/clippy
-      shell: bash -euxo pipefail {0}
-    - name: steps::clear_target_dir_if_large
-      run: ./script/clear-target-dir-if-larger-than 300
-      shell: bash -euxo pipefail {0}
-    - name: steps::cargo_nextest
-      run: cargo nextest run --workspace --no-fail-fast
-      shell: bash -euxo pipefail {0}
-    - name: steps::cleanup_cargo_config
-      if: always()
-      run: |
-        rm -rf ./../.cargo
-      shell: bash -euxo pipefail {0}
-    timeout-minutes: 60
-  doctests:
-    needs:
-    - orchestrate
-    if: needs.orchestrate.outputs.run_tests == 'true'
-    runs-on: namespace-profile-16x32-ubuntu-2204
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: steps::cache_rust_dependencies_namespace
-      uses: namespacelabs/nscloud-cache-action@v1
-      with:
-        cache: rust
-    - name: steps::setup_linux
-      run: ./script/linux
-      shell: bash -euxo pipefail {0}
-    - name: steps::install_mold
-      run: ./script/install-mold
-      shell: bash -euxo pipefail {0}
-    - name: steps::download_wasi_sdk
-      run: ./script/download-wasi-sdk
-      shell: bash -euxo pipefail {0}
-    - name: steps::setup_cargo_config
-      run: |
-        mkdir -p ./../.cargo
-        cp ./.cargo/ci-config.toml ./../.cargo/config.toml
-      shell: bash -euxo pipefail {0}
-    - id: run_doctests
-      name: run_tests::doctests::run_doctests
-      run: |
-        cargo test --workspace --doc --no-fail-fast
-      shell: bash -euxo pipefail {0}
-    - name: steps::cleanup_cargo_config
-      if: always()
-      run: |
-        rm -rf ./../.cargo
-      shell: bash -euxo pipefail {0}
-    timeout-minutes: 60
-  check_workspace_binaries:
-    needs:
-    - orchestrate
-    if: needs.orchestrate.outputs.run_tests == 'true'
-    runs-on: namespace-profile-8x16-ubuntu-2204
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: steps::setup_cargo_config
-      run: |
-        mkdir -p ./../.cargo
-        cp ./.cargo/ci-config.toml ./../.cargo/config.toml
-      shell: bash -euxo pipefail {0}
-    - name: steps::cache_rust_dependencies_namespace
-      uses: namespacelabs/nscloud-cache-action@v1
-      with:
-        cache: rust
-    - name: steps::setup_linux
-      run: ./script/linux
-      shell: bash -euxo pipefail {0}
-    - name: steps::install_mold
-      run: ./script/install-mold
-      shell: bash -euxo pipefail {0}
-    - name: steps::download_wasi_sdk
-      run: ./script/download-wasi-sdk
-      shell: bash -euxo pipefail {0}
-    - name: cargo build -p collab
-      run: cargo build -p collab
-      shell: bash -euxo pipefail {0}
-    - name: cargo build --workspace --bins --examples
-      run: cargo build --workspace --bins --examples
-      shell: bash -euxo pipefail {0}
-    - name: steps::cleanup_cargo_config
-      if: always()
-      run: |
-        rm -rf ./../.cargo
-      shell: bash -euxo pipefail {0}
-    timeout-minutes: 60
-  check_dependencies:
-    needs:
-    - orchestrate
-    if: needs.orchestrate.outputs.run_tests == 'true'
-    runs-on: namespace-profile-2x4-ubuntu-2404
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: steps::cache_rust_dependencies_namespace
-      uses: namespacelabs/nscloud-cache-action@v1
-      with:
-        cache: rust
-    - name: run_tests::check_dependencies::install_cargo_machete
-      uses: clechasseur/rs-cargo@8435b10f6e71c2e3d4d3b7573003a8ce4bfc6386
-      with:
-        command: install
-        args: cargo-machete@0.7.0
-    - name: run_tests::check_dependencies::run_cargo_machete
-      uses: clechasseur/rs-cargo@8435b10f6e71c2e3d4d3b7573003a8ce4bfc6386
-      with:
-        command: machete
-    - name: run_tests::check_dependencies::check_cargo_lock
-      run: cargo update --locked --workspace
-      shell: bash -euxo pipefail {0}
-    - name: run_tests::check_dependencies::check_vulnerable_dependencies
-      if: github.event_name == 'pull_request'
-      uses: actions/dependency-review-action@67d4f4bd7a9b17a0db54d2a7519187c65e339de8
-      with:
-        license-check: false
-    timeout-minutes: 60
-  check_docs:
-    needs:
-    - orchestrate
-    if: needs.orchestrate.outputs.run_docs == 'true'
-    runs-on: namespace-profile-8x16-ubuntu-2204
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: steps::setup_cargo_config
-      run: |
-        mkdir -p ./../.cargo
-        cp ./.cargo/ci-config.toml ./../.cargo/config.toml
-      shell: bash -euxo pipefail {0}
-    - name: steps::cache_rust_dependencies_namespace
-      uses: namespacelabs/nscloud-cache-action@v1
-      with:
-        cache: rust
-    - name: run_tests::check_docs::lychee_link_check
-      uses: lycheeverse/lychee-action@82202e5e9c2f4ef1a55a3d02563e1cb6041e5332
-      with:
-        args: --no-progress --exclude '^http' './docs/src/**/*'
-        fail: true
-        jobSummary: false
-    - name: steps::setup_linux
-      run: ./script/linux
-      shell: bash -euxo pipefail {0}
-    - name: steps::install_mold
-      run: ./script/install-mold
-      shell: bash -euxo pipefail {0}
-    - name: steps::download_wasi_sdk
-      run: ./script/download-wasi-sdk
-      shell: bash -euxo pipefail {0}
-    - name: run_tests::check_docs::install_mdbook
-      uses: peaceiris/actions-mdbook@ee69d230fe19748b7abf22df32acaa93833fad08
-      with:
-        mdbook-version: 0.4.37
-    - name: run_tests::check_docs::build_docs
-      run: |
-        mkdir -p target/deploy
-        mdbook build ./docs --dest-dir=../target/deploy/docs/
-      shell: bash -euxo pipefail {0}
-    - name: run_tests::check_docs::lychee_link_check
-      uses: lycheeverse/lychee-action@82202e5e9c2f4ef1a55a3d02563e1cb6041e5332
-      with:
-        args: --no-progress --exclude '^http' 'target/deploy/docs'
-        fail: true
-        jobSummary: false
-    timeout-minutes: 60
-  check_licenses:
-    needs:
-    - orchestrate
-    if: needs.orchestrate.outputs.run_licenses == 'true'
-    runs-on: namespace-profile-2x4-ubuntu-2404
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: steps::cache_rust_dependencies_namespace
-      uses: namespacelabs/nscloud-cache-action@v1
-      with:
-        cache: rust
-    - name: ./script/check-licenses
-      run: ./script/check-licenses
-      shell: bash -euxo pipefail {0}
-    - name: ./script/generate-licenses
-      run: ./script/generate-licenses
-      shell: bash -euxo pipefail {0}
-  check_scripts:
-    needs:
-    - orchestrate
-    if: needs.orchestrate.outputs.run_action_checks == 'true'
-    runs-on: namespace-profile-2x4-ubuntu-2404
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: run_tests::check_scripts::run_shellcheck
-      run: ./script/shellcheck-scripts error
-      shell: bash -euxo pipefail {0}
-    - id: get_actionlint
-      name: run_tests::check_scripts::download_actionlint
-      run: bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash)
-      shell: bash -euxo pipefail {0}
-    - name: run_tests::check_scripts::run_actionlint
-      run: |
-        ${{ steps.get_actionlint.outputs.executable }} -color
-      shell: bash -euxo pipefail {0}
-    - name: run_tests::check_scripts::check_xtask_workflows
-      run: |
-        cargo xtask workflows
-        if ! git diff --exit-code .github; then
-          echo "Error: .github directory has uncommitted changes after running 'cargo xtask workflows'"
-          echo "Please run 'cargo xtask workflows' locally and commit the changes"
-          exit 1
-        fi
-      shell: bash -euxo pipefail {0}
-    timeout-minutes: 60
-  build_nix_linux_x86_64:
-    needs:
-    - orchestrate
-    if: needs.orchestrate.outputs.run_nix == 'true'
-    runs-on: namespace-profile-32x64-ubuntu-2004
-    env:
-      ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
-      ZED_MINIDUMP_ENDPOINT: ${{ secrets.ZED_SENTRY_MINIDUMP_ENDPOINT }}
-      ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON: ${{ secrets.ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON }}
-      GIT_LFS_SKIP_SMUDGE: '1'
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: nix_build::build_nix::install_nix
-      uses: cachix/install-nix-action@02a151ada4993995686f9ed4f1be7cfbb229e56f
-      with:
-        github_access_token: ${{ secrets.GITHUB_TOKEN }}
-    - name: nix_build::build_nix::cachix_action
-      uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad
-      with:
-        name: zed
-        authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
-        cachixArgs: -v
-        pushFilter: -zed-editor-[0-9.]*-nightly
-    - name: nix_build::build_nix::build
-      run: nix build .#debug -L --accept-flake-config
-      shell: bash -euxo pipefail {0}
-    timeout-minutes: 60
-    continue-on-error: true
-  build_nix_mac_aarch64:
-    needs:
-    - orchestrate
-    if: needs.orchestrate.outputs.run_nix == 'true'
-    runs-on: self-mini-macos
-    env:
-      ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
-      ZED_MINIDUMP_ENDPOINT: ${{ secrets.ZED_SENTRY_MINIDUMP_ENDPOINT }}
-      ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON: ${{ secrets.ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON }}
-      GIT_LFS_SKIP_SMUDGE: '1'
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: nix_build::build_nix::set_path
-      run: |
-        echo "/nix/var/nix/profiles/default/bin" >> "$GITHUB_PATH"
-        echo "/Users/administrator/.nix-profile/bin" >> "$GITHUB_PATH"
-      shell: bash -euxo pipefail {0}
-    - name: nix_build::build_nix::cachix_action
-      uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad
-      with:
-        name: zed
-        authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
-        cachixArgs: -v
-        pushFilter: -zed-editor-[0-9.]*-nightly
-    - name: nix_build::build_nix::build
-      run: nix build .#debug -L --accept-flake-config
-      shell: bash -euxo pipefail {0}
-    - name: nix_build::build_nix::limit_store
-      run: |-
-        if [ "$(du -sm /nix/store | cut -f1)" -gt 50000 ]; then
-            nix-collect-garbage -d || true
-        fi
-      shell: bash -euxo pipefail {0}
-    timeout-minutes: 60
-    continue-on-error: true
-  check_postgres_and_protobuf_migrations:
-    needs:
-    - orchestrate
-    if: needs.orchestrate.outputs.run_tests == 'true'
-    runs-on: namespace-profile-16x32-ubuntu-2204
-    env:
-      GIT_AUTHOR_NAME: Protobuf Action
-      GIT_AUTHOR_EMAIL: ci@zed.dev
-      GIT_COMMITTER_NAME: Protobuf Action
-      GIT_COMMITTER_EMAIL: ci@zed.dev
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        fetch-depth: 0
-    - name: run_tests::check_postgres_and_protobuf_migrations::remove_untracked_files
-      run: git clean -df
-      shell: bash -euxo pipefail {0}
-    - name: run_tests::check_postgres_and_protobuf_migrations::ensure_fresh_merge
-      run: |
-        if [ -z "$GITHUB_BASE_REF" ];
-        then
-          echo "BUF_BASE_BRANCH=$(git merge-base origin/main HEAD)" >> "$GITHUB_ENV"
-        else
-          git checkout -B temp
-          git merge -q "origin/$GITHUB_BASE_REF" -m "merge main into temp"
-          echo "BUF_BASE_BRANCH=$GITHUB_BASE_REF" >> "$GITHUB_ENV"
-        fi
-      shell: bash -euxo pipefail {0}
-    - name: run_tests::check_postgres_and_protobuf_migrations::bufbuild_setup_action
-      uses: bufbuild/buf-setup-action@v1
-      with:
-        version: v1.29.0
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-    - name: run_tests::check_postgres_and_protobuf_migrations::bufbuild_breaking_action
-      uses: bufbuild/buf-breaking-action@v1
-      with:
-        input: crates/proto/proto/
-        against: https://github.com/${GITHUB_REPOSITORY}.git#branch=${BUF_BASE_BRANCH},subdir=crates/proto/proto/
-    timeout-minutes: 60
-  tests_pass:
-    needs:
-    - orchestrate
-    - check_style
-    - run_tests_windows
-    - run_tests_linux
-    - run_tests_mac
-    - doctests
-    - check_workspace_binaries
-    - check_dependencies
-    - check_docs
-    - check_licenses
-    - check_scripts
-    - build_nix_linux_x86_64
-    - build_nix_mac_aarch64
-    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions') && always()
-    runs-on: namespace-profile-2x4-ubuntu-2404
-    steps:
-    - name: run_tests::tests_pass
-      run: |
-        set +x
-        EXIT_CODE=0
-
-        check_result() {
-          echo "* $1: $2"
-          if [[ "$2" != "skipped" && "$2" != "success" ]]; then EXIT_CODE=1; fi
-        }
-
-        check_result "orchestrate" "${{ needs.orchestrate.result }}"
-        check_result "check_style" "${{ needs.check_style.result }}"
-        check_result "run_tests_windows" "${{ needs.run_tests_windows.result }}"
-        check_result "run_tests_linux" "${{ needs.run_tests_linux.result }}"
-        check_result "run_tests_mac" "${{ needs.run_tests_mac.result }}"
-        check_result "doctests" "${{ needs.doctests.result }}"
-        check_result "check_workspace_binaries" "${{ needs.check_workspace_binaries.result }}"
-        check_result "check_dependencies" "${{ needs.check_dependencies.result }}"
-        check_result "check_docs" "${{ needs.check_docs.result }}"
-        check_result "check_licenses" "${{ needs.check_licenses.result }}"
-        check_result "check_scripts" "${{ needs.check_scripts.result }}"
-        check_result "build_nix_linux_x86_64" "${{ needs.build_nix_linux_x86_64.result }}"
-        check_result "build_nix_mac_aarch64" "${{ needs.build_nix_mac_aarch64.result }}"
-
-        exit $EXIT_CODE
-      shell: bash -euxo pipefail {0}
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.ref_name == 'main' && github.sha || 'anysha' }}
-  cancel-in-progress: true
diff --git a/.github/workflows/run_unit_evals.yml b/.github/workflows/run_unit_evals.yml
deleted file mode 100644
index 8f64a5c8bc..0000000000
--- a/.github/workflows/run_unit_evals.yml
+++ /dev/null
@@ -1,69 +0,0 @@
-# Generated from xtask::workflows::run_unit_evals
-# Rebuild with `cargo xtask workflows`.
-name: run_unit_evals
-env:
-  CARGO_TERM_COLOR: always
-  CARGO_INCREMENTAL: '0'
-  RUST_BACKTRACE: '1'
-  ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
-  ZED_EVAL_TELEMETRY: '1'
-  MODEL_NAME: ${{ inputs.model_name }}
-on:
-  workflow_dispatch:
-    inputs:
-      model_name:
-        description: model_name
-        required: true
-        type: string
-      commit_sha:
-        description: commit_sha
-        required: true
-        type: string
-jobs:
-  run_unit_evals:
-    runs-on: namespace-profile-16x32-ubuntu-2204
-    steps:
-    - name: steps::checkout_repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      with:
-        clean: false
-    - name: steps::setup_cargo_config
-      run: |
-        mkdir -p ./../.cargo
-        cp ./.cargo/ci-config.toml ./../.cargo/config.toml
-      shell: bash -euxo pipefail {0}
-    - name: steps::cache_rust_dependencies_namespace
-      uses: namespacelabs/nscloud-cache-action@v1
-      with:
-        cache: rust
-    - name: steps::setup_linux
-      run: ./script/linux
-      shell: bash -euxo pipefail {0}
-    - name: steps::install_mold
-      run: ./script/install-mold
-      shell: bash -euxo pipefail {0}
-    - name: steps::download_wasi_sdk
-      run: ./script/download-wasi-sdk
-      shell: bash -euxo pipefail {0}
-    - name: steps::cargo_install_nextest
-      uses: taiki-e/install-action@nextest
-    - name: steps::clear_target_dir_if_large
-      run: ./script/clear-target-dir-if-larger-than 250
-      shell: bash -euxo pipefail {0}
-    - name: ./script/run-unit-evals
-      run: ./script/run-unit-evals
-      shell: bash -euxo pipefail {0}
-      env:
-        ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
-        OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
-        GOOGLE_AI_API_KEY: ${{ secrets.GOOGLE_AI_API_KEY }}
-        GOOGLE_CLOUD_PROJECT: ${{ secrets.GOOGLE_CLOUD_PROJECT }}
-        UNIT_EVAL_COMMIT: ${{ inputs.commit_sha }}
-    - name: steps::cleanup_cargo_config
-      if: always()
-      run: |
-        rm -rf ./../.cargo
-      shell: bash -euxo pipefail {0}
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.run_id }}
-  cancel-in-progress: true
diff --git a/.gitignore b/.gitignore
index ccf4f471d5..d3157ef5a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,44 +1,33 @@
-**/*.db
-**/cargo-target
+# Build artifacts
 **/target
-**/venv
-**/.direnv
+**/cargo-target
 *.wasm
-*.xcodeproj
+
+# IDE and editor
 .DS_Store
-.blob_store
-.build
-.envrc
-.flatpak-builder
 .idea
-.netrc
-*.pyc
-.pytest_cache
-.swiftpm
-.swiftpm/config/registries.json
-.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
-.venv
 .vscode
-.wrangler
-.perf-runs
-/assets/*licenses.*
-/crates/collab/seed.json
-/crates/theme/schemas/theme.json
-/crates/zed/resources/flatpak/flatpak-cargo-sources.json
-/crates/project_panel/benches/linux_repo_snapshot.txt
-/dev.zed.Zed*.json
-/node_modules/
-/plugins/bin
-/script/node_modules
-/snap
-/zed.xcworkspace
+*.xcodeproj
+*.xcworkspace
 DerivedData/
-Packages
 xcuserdata/
 
-# Don't commit any secrets to the repo.
+# Python
+**/venv
+.venv
+*.pyc
+.pytest_cache
+
+# Nix
+**/.direnv
+.envrc
+/result
+
+# Environment and secrets
 .env
 .env.secret.toml
+.netrc
 
-# `nix build` output
-/result 
+# Misc
+**/*.db
+.build
diff --git a/.mailmap b/.mailmap
deleted file mode 100644
index db4632d6ca..0000000000
--- a/.mailmap
+++ /dev/null
@@ -1,147 +0,0 @@
-# Canonical author names and emails.
-#
-# Use this to provide a canonical name and email for an author when their
-# name is not always written the same way and/or they have commits authored
-# under different email addresses.
-#
-# Reference: https://git-scm.com/docs/gitmailmap
-
-# Keep these entries sorted alphabetically.
-# In Zed: `editor: sort lines case insensitive`
-
-Agus Zubiaga <agus@zed.dev>
-Agus Zubiaga <agus@zed.dev> <hi@aguz.me>
-Alex Viscreanu <alexviscreanu@gmail.com>
-Alex Viscreanu <alexviscreanu@gmail.com> <alexandru.viscreanu@kiwi.com>
-Alexander Mankuta <alex@pointless.one>
-Alexander Mankuta <alex@pointless.one> <alex+github@pointless.one>
-amtoaer <amtoaer@gmail.com>
-amtoaer <amtoaer@gmail.com> <amtoaer@outlook.com>
-Andrei Zvonimir Crnković <andrei@0x7f.dev>
-Andrei Zvonimir Crnković <andrei@0x7f.dev> <andreicek@0x7f.dev>
-Angelk90 <angelo.k90@hotmail.it>
-Angelk90 <angelo.k90@hotmail.it> <20476002+Angelk90@users.noreply.github.com>
-Antonio Scandurra <me@as-cii.com>
-Antonio Scandurra <me@as-cii.com> <antonio@zed.dev>
-Ben Kunkle <ben@zed.dev>
-Ben Kunkle <ben@zed.dev> <ben.kunkle@gmail.com>
-Bennet Bo Fenner <bennet@zed.dev>
-Bennet Bo Fenner <bennet@zed.dev> <53836821+bennetbo@users.noreply.github.com>
-Bennet Bo Fenner <bennet@zed.dev> <bennetbo@gmx.de>
-Boris Cherny <boris@anthropic.com>
-Boris Cherny <boris@anthropic.com> <boris@performancejs.com>
-Brian Tan <brian.tan88@gmail.com>
-Chris Hayes <chris+git@hayes.software>
-Christian Bergschneider <christian.bergschneider@gmx.de>
-Christian Bergschneider <christian.bergschneider@gmx.de> <magiclake@gmx.de>
-Conrad Irwin <conrad@zed.dev>
-Conrad Irwin <conrad@zed.dev> <conrad.irwin@gmail.com>
-Dairon Medina <dairon.medina@gmail.com>
-Danilo Leal <danilo@zed.dev>
-Danilo Leal <danilo@zed.dev> <67129314+danilo-leal@users.noreply.github.com>
-Edwin Aronsson <75266237+4teapo@users.noreply.github.com>
-Elvis Pranskevichus <elvis@geldata.com>
-Elvis Pranskevichus <elvis@geldata.com> <elvis@magic.io>
-Evren Sen <nervenes@icloud.com>
-Evren Sen <nervenes@icloud.com> <146845123+evrensen467@users.noreply.github.com>
-Evren Sen <nervenes@icloud.com> <146845123+evrsen@users.noreply.github.com>
-Fernando Tagawa <tagawafernando@gmail.com>
-Fernando Tagawa <tagawafernando@gmail.com> <fernando.tagawa.gamail.com@gmail.com>
-Finn Evers <dev@bahn.sh>
-Finn Evers <dev@bahn.sh> <75036051+MrSubidubi@users.noreply.github.com>
-Finn Evers <dev@bahn.sh> <finn.evers@outlook.de>
-Gowtham K <73059450+dovakin0007@users.noreply.github.com>
-Greg Morenz <greg-morenz@droid.cafe>
-Greg Morenz <greg-morenz@droid.cafe> <morenzg@gmail.com>
-Ihnat Aŭtuška <autushka.ihnat@gmail.com>
-Ivan Žužak <izuzak@gmail.com>
-Ivan Žužak <izuzak@gmail.com> <ivan.zuzak@github.com>
-Joseph T. Lyons <JosephTLyons@gmail.com>
-Joseph T. Lyons <JosephTLyons@gmail.com> <JosephTLyons@users.noreply.github.com>
-Julia <floc@unpromptedtirade.com>
-Julia <floc@unpromptedtirade.com> <30666851+ForLoveOfCats@users.noreply.github.com>
-Kaylee Simmons <kay@the-simmons.net>
-Kaylee Simmons <kay@the-simmons.net> <kay@zed.dev>
-Kaylee Simmons <kay@the-simmons.net> <keith@the-simmons.net>
-Kaylee Simmons <kay@the-simmons.net> <keith@zed.dev>
-Kirill Bulatov <kirill@zed.dev>
-Kirill Bulatov <kirill@zed.dev> <mail4score@gmail.com>
-Kyle Caverly <kylebcaverly@gmail.com>
-Kyle Caverly <kylebcaverly@gmail.com> <kyle@zed.dev>
-Lilith Iris <itslirissama@gmail.com>
-Lilith Iris <itslirissama@gmail.com> <83819417+Irilith@users.noreply.github.com>
-LoganDark <contact@logandark.mozmail.com>
-LoganDark <contact@logandark.mozmail.com> <git@logandark.mozmail.com>
-LoganDark <contact@logandark.mozmail.com> <github@logandark.mozmail.com>
-Marko Kungla <marko.kungla@gmail.com>
-Marko Kungla <marko.kungla@gmail.com> <marko@mkungla.dev>
-Marshall Bowers <git@maxdeviant.com>
-Marshall Bowers <git@maxdeviant.com> <elliott.codes@gmail.com>
-Marshall Bowers <git@maxdeviant.com> <marshall@zed.dev>
-Matt Fellenz <matt@felle.nz>
-Matt Fellenz <matt@felle.nz> <matt+github@felle.nz>
-Max Brunsfeld <maxbrunsfeld@gmail.com>
-Max Brunsfeld <maxbrunsfeld@gmail.com> <max@zed.dev>
-Max Linke <maxlinke88@gmail.com>
-Max Linke <maxlinke88@gmail.com> <kain88-de@users.noreply.github.com>
-Michael Sloan <michael@zed.dev>
-Michael Sloan <michael@zed.dev> <mgsloan@gmail.com>
-Michael Sloan <michael@zed.dev> <mgsloan@google.com>
-Mikayla Maki <mikayla@zed.dev>
-Mikayla Maki <mikayla@zed.dev> <mikayla.c.maki@gmail.com>
-Mikayla Maki <mikayla@zed.dev> <mikayla.c.maki@icloud.com>
-Morgan Krey <morgan@zed.dev>
-Muhammad Talal Anwar <mail@talal.io>
-Muhammad Talal Anwar <mail@talal.io> <talalanwar@outlook.com>
-Nate Butler <iamnbutler@gmail.com>
-Nate Butler <iamnbutler@gmail.com> <nate@zed.dev>
-Nathan Sobo <nathan@zed.dev>
-Nathan Sobo <nathan@zed.dev> <nathan@warp.dev>
-Nathan Sobo <nathan@zed.dev> <nathansobo@gmail.com>
-Nigel Jose <nigelmjose@gmail.com>
-Nigel Jose <nigelmjose@gmail.com> <nigel.jose@student.manchester.ac.uk>
-Peter Tripp <peter@zed.dev>
-Peter Tripp <peter@zed.dev> <petertripp@gmail.com>
-Petros Amoiridis <petros@hey.com>
-Petros Amoiridis <petros@hey.com> <petros@zed.dev>
-Piotr Osiewicz <piotr@zed.dev>
-Piotr Osiewicz <piotr@zed.dev> <24362066+osiewicz@users.noreply.github.com>
-Pocæus <github@pocaeus.com>
-Pocæus <github@pocaeus.com> <pseudomata@proton.me>
-Rashid Almheiri <r.muhairi@pm.me>
-Rashid Almheiri <r.muhairi@pm.me> <69181766+huwaireb@users.noreply.github.com>
-Richard Feldman <oss@rtfeldman.com>
-Richard Feldman <oss@rtfeldman.com> <richard@zed.dev>
-Robert Clover <git@clo4.net>
-Robert Clover <git@clo4.net> <robert@clover.gdn>
-Roy Williams <roy.williams.iii@gmail.com>
-Roy Williams <roy.williams.iii@gmail.com> <roy@anthropic.com>
-Sebastijan Kelnerič <sebastijan.kelneric@sebba.dev>
-Sebastijan Kelnerič <sebastijan.kelneric@sebba.dev> <sebastijan.kelneric@vichava.com>
-Sergey Onufrienko <sergey@onufrienko.com>
-Shish <webmaster@shishnet.org>
-Shish <webmaster@shishnet.org> <shish@shishnet.org>
-Smit Barmase <0xtimsb@gmail.com>
-Smit Barmase <0xtimsb@gmail.com> <smit@zed.dev>
-Thomas <github.thomaub@gmail.com>
-Thomas <github.thomaub@gmail.com> <thomas.aubry94@gmail.com>
-Thomas <github.thomaub@gmail.com> <thomas.aubry@paylead.fr>
-Thomas Heartman <thomasheartman+github@gmail.com>
-Thomas Heartman <thomasheartman+github@gmail.com> <thomas@getunleash.io>
-Thomas Mickley-Doyle <tmickleydoyle@gmail.com>
-Thomas Mickley-Doyle <tmickleydoyle@gmail.com> <thomas@zed.dev>
-Thorben Kröger <dev@thorben.net>
-Thorben Kröger <dev@thorben.net> <thorben.kroeger@hexagon.com>
-Thorsten Ball <mrnugget@gmail.com>
-Thorsten Ball <mrnugget@gmail.com> <me@thorstenball.com>
-Thorsten Ball <mrnugget@gmail.com> <thorsten@zed.dev>
-Tristan Hume <tris.hume@gmail.com>
-Tristan Hume <tris.hume@gmail.com> <tristan@anthropic.com>
-Uladzislau Kaminski <i@uladkaminski.com>
-Uladzislau Kaminski <i@uladkaminski.com> <uladzislau_kaminski@epam.com>
-Vitaly Slobodin <vitaliy.slobodin@gmail.com>
-Vitaly Slobodin <vitaliy.slobodin@gmail.com> <vitaly_slobodin@fastmail.com>
-Will Bradley <williambbradley@gmail.com>
-Will Bradley <williambbradley@gmail.com> <will@zed.dev>
-WindSoilder <WindSoilder@outlook.com>
-张小白 <364772080@qq.com>
diff --git a/.prettierrc b/.prettierrc
deleted file mode 100644
index 963354f231..0000000000
--- a/.prettierrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "printWidth": 120
-}
diff --git a/.zed/debug.json b/.zed/debug.json
deleted file mode 100644
index 6f4e936c80..0000000000
--- a/.zed/debug.json
+++ /dev/null
@@ -1,20 +0,0 @@
-[
-  {
-    "label": "Debug Zed (CodeLLDB)",
-    "adapter": "CodeLLDB",
-    "build": {
-      "label": "Build Zed",
-      "command": "cargo",
-      "args": ["build"]
-    }
-  },
-  {
-    "label": "Debug Zed (GDB)",
-    "adapter": "GDB",
-    "build": {
-      "label": "Build Zed",
-      "command": "cargo",
-      "args": ["build"]
-    }
-  }
-]
diff --git a/.zed/settings.json b/.zed/settings.json
index 2760be9581..4f7a5a6245 100644
--- a/.zed/settings.json
+++ b/.zed/settings.json
@@ -2,55 +2,27 @@
   "languages": {
     "Markdown": {
       "tab_size": 2,
-      "formatter": "prettier"
     },
     "TOML": {
-      "formatter": "prettier",
-      "format_on_save": "off"
+      "format_on_save": "off",
     },
     "YAML": {
       "tab_size": 2,
-      "formatter": "prettier"
     },
     "JSON": {
       "tab_size": 2,
       "preferred_line_length": 120,
-      "formatter": "prettier"
     },
     "JSONC": {
       "tab_size": 2,
       "preferred_line_length": 120,
-      "formatter": "prettier"
     },
-    "JavaScript": {
-      "tab_size": 2,
-      "formatter": "prettier"
-    },
-    "CSS": {
-      "tab_size": 2,
-      "formatter": "prettier"
-    },
-    "Rust": {
-      "tasks": {
-        "variables": {
-          "RUST_DEFAULT_PACKAGE_RUN": "zed"
-        }
-      }
-    }
-  },
-  "file_types": {
-    "Dockerfile": ["Dockerfile*[!dockerignore]"],
-    "JSONC": ["**/assets/**/*.json", "renovate.json"],
-    "Git Ignore": ["dockerignore"]
   },
   "hard_tabs": false,
   "formatter": "auto",
   "remove_trailing_whitespace_on_save": true,
   "ensure_final_newline_on_save": true,
   "file_scan_exclusions": [
-    "crates/agent/src/edit_agent/evals/fixtures",
-    "crates/eval/worktrees/",
-    "crates/eval/repos/",
     "**/.git",
     "**/.svn",
     "**/.hg",
@@ -58,7 +30,6 @@
     "**/CVS",
     "**/.DS_Store",
     "**/Thumbs.db",
-    "**/.classpath",
-    "**/.settings"
-  ]
+    "**/target",
+  ],
 }
diff --git a/.zed/tasks.json b/.zed/tasks.json
index b6a9d9f4cd..57f6b28e12 100644
--- a/.zed/tasks.json
+++ b/.zed/tasks.json
@@ -4,13 +4,20 @@
     "command": "./script/clippy",
     "args": [],
     "allow_concurrent_runs": true,
-    "use_new_terminal": false
+    "use_new_terminal": false,
   },
   {
-    "label": "cargo run --profile release-fast",
+    "label": "cargo check gpui",
     "command": "cargo",
-    "args": ["run", "--profile", "release-fast"],
+    "args": ["check", "--package", "gpui"],
     "allow_concurrent_runs": true,
-    "use_new_terminal": false
-  }
+    "use_new_terminal": false,
+  },
+  {
+    "label": "cargo test gpui",
+    "command": "cargo",
+    "args": ["test", "--package", "gpui"],
+    "allow_concurrent_runs": false,
+    "use_new_terminal": false,
+  },
 ]
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
deleted file mode 100644
index 8d064b64f5..0000000000
--- a/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Code of Conduct
-
-The Code of Conduct for this repository can be found online at [zed.dev/code-of-conduct](https://zed.dev/code-of-conduct).
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index 9cbac4af2b..0000000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1,92 +0,0 @@
-# Contributing to Zed
-
-Thank you for helping us make Zed better!
-
-All activity in Zed forums is subject to our [Code of
-Conduct](https://zed.dev/code-of-conduct). Additionally, contributors must sign
-our [Contributor License Agreement](https://zed.dev/cla) before their
-contributions can be merged.
-
-## Contribution ideas
-
-Zed is a large project with a number of priorities. We spend most of
-our time working on what we believe the product needs, but we also love working
-with the community to improve the product in ways we haven't thought of (or had time to get to yet!)
-
-In particular we love PRs that are:
-
-- Fixes to existing bugs and issues.
-- Small enhancements to existing features, particularly to make them work for more people.
-- Small extra features, like keybindings or actions you miss from other editors or extensions.
-- Work towards shipping larger features on our roadmap.
-
-If you're looking for concrete ideas:
-
-- Our [top-ranking issues](https://github.com/zed-industries/zed/issues/5393) based on votes by the community.
-- Our [public roadmap](https://zed.dev/roadmap) contains a rough outline of our near-term priorities for Zed.
-
-## Sending changes
-
-The Zed culture values working code and synchronous conversations over long
-discussion threads.
-
-The best way to get us to take a look at a proposed change is to send a pull
-request. We will get back to you (though this sometimes takes longer than we'd
-like, sorry).
-
-Although we will take a look, we tend to only merge about half the PRs that are
-submitted. If you'd like your PR to have the best chance of being merged:
-
-- Include a clear description of what you're solving, and why it's important to you.
-- Include tests.
-- If it changes the UI, attach screenshots or screen recordings.
-
-The internal advice for reviewers is as follows:
-
-- If the fix/feature is obviously great, and the code is great. Hit merge.
-- If the fix/feature is obviously great, and the code is nearly great. Send PR comments, or offer to pair to get things perfect.
-- If the fix/feature is not obviously great, or the code needs rewriting from scratch. Close the PR with a thank you and some explanation.
-
-If you need more feedback from us: the best way is to be responsive to
-Github comments, or to offer up time to pair with us.
-
-If you are making a larger change, or need advice on how to finish the change
-you're making, please open the PR early. We would love to help you get
-things right, and it's often easier to see how to solve a problem before the
-diff gets too big.
-
-## Things we will (probably) not merge
-
-Although there are few hard and fast rules, typically we don't merge:
-
-- Anything that can be provided by an extension. For example a new language, or theme. For adding themes or support for a new language to Zed, check out our [docs on developing extensions](https://zed.dev/docs/extensions/developing-extensions).
-- New file icons. Zed's default icon theme consists of icons that are hand-designed to fit together in a cohesive manner, please don't submit PRs with off-the-shelf SVGs.
-- Giant refactorings.
-- Non-trivial changes with no tests.
-- Stylistic code changes that do not alter any app logic. Reducing allocations, removing `.unwrap()`s, fixing typos is great; making code "more readable" — maybe not so much.
-- Features where (in our subjective opinion) the extra complexity isn't worth it for the number of people who will benefit.
-- Anything that seems completely AI generated.
-
-## Bird's-eye view of Zed
-
-We suggest you keep the [Zed glossary](docs/src/development/glossary.md) at your side when starting out. It lists and explains some of the structures and terms you will see throughout the codebase.
-
-Zed is made up of several smaller crates - let's go over those you're most likely to interact with:
-
-- [`gpui`](/crates/gpui) is a GPU-accelerated UI framework which provides all of the building blocks for Zed. **We recommend familiarizing yourself with the root level GPUI documentation.**
-- [`editor`](/crates/editor) contains the core `Editor` type that drives both the code editor and all various input fields within Zed. It also handles a display layer for LSP features such as Inlay Hints or code completions.
-- [`project`](/crates/project) manages files and navigation within the filetree. It is also Zed's side of communication with LSP.
-- [`workspace`](/crates/workspace) handles local state serialization and groups projects together.
-- [`vim`](/crates/vim) is a thin implementation of Vim workflow over `editor`.
-- [`lsp`](/crates/lsp) handles communication with external LSP server.
-- [`language`](/crates/language) drives `editor`'s understanding of language - from providing a list of symbols to the syntax map.
-- [`collab`](/crates/collab) is the collaboration server itself, driving the collaboration features such as project sharing.
-- [`rpc`](/crates/rpc) defines messages to be exchanged with collaboration server.
-- [`theme`](/crates/theme) defines the theme system and provides a default theme.
-- [`ui`](/crates/ui) is a collection of UI components and common patterns used throughout Zed.
-- [`cli`](/crates/cli) is the CLI crate which invokes the Zed binary.
-- [`zed`](/crates/zed) is where all things come together, and the `main` entry point for Zed.
-
-## Packaging Zed
-
-Check our [notes for packaging Zed](https://zed.dev/docs/development/linux#notes-for-packaging-zed).
diff --git a/Cargo.lock b/Cargo.lock
index 981f59cb5e..b5196d351d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,121 +2,13 @@
 # It is not intended for manual editing.
 version = 4
 
-[[package]]
-name = "acp_thread"
-version = "0.1.0"
-dependencies = [
- "action_log",
- "agent-client-protocol",
- "agent_settings",
- "anyhow",
- "buffer_diff",
- "collections",
- "editor",
- "env_logger 0.11.8",
- "file_icons",
- "futures 0.3.31",
- "gpui",
- "indoc",
- "itertools 0.14.0",
- "language",
- "language_model",
- "markdown",
- "parking_lot",
- "portable-pty",
- "project",
- "prompt_store",
- "rand 0.9.2",
- "serde",
- "serde_json",
- "settings",
- "smol",
- "task",
- "telemetry",
- "tempfile",
- "terminal",
- "ui",
- "url",
- "util",
- "uuid",
- "watch",
- "zlog",
-]
-
-[[package]]
-name = "acp_tools"
-version = "0.1.0"
-dependencies = [
- "agent-client-protocol",
- "collections",
- "gpui",
- "language",
- "markdown",
- "project",
- "serde",
- "serde_json",
- "settings",
- "theme",
- "ui",
- "util",
- "workspace",
-]
-
-[[package]]
-name = "action_log"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "buffer_diff",
- "clock",
- "collections",
- "ctor",
- "futures 0.3.31",
- "gpui",
- "indoc",
- "language",
- "log",
- "pretty_assertions",
- "project",
- "rand 0.9.2",
- "serde_json",
- "settings",
- "telemetry",
- "text",
- "util",
- "watch",
- "zlog",
-]
-
-[[package]]
-name = "activity_indicator"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "auto_update",
- "editor",
- "extension_host",
- "fs",
- "futures 0.3.31",
- "gpui",
- "language",
- "project",
- "proto",
- "release_channel",
- "semver",
- "smallvec",
- "ui",
- "util",
- "workspace",
-]
-
 [[package]]
 name = "addr2line"
 version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b"
 dependencies = [
- "gimli 0.32.3",
+ "gimli",
 ]
 
 [[package]]
@@ -137,287 +29,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "agent"
-version = "0.1.0"
-dependencies = [
- "acp_thread",
- "action_log",
- "agent-client-protocol",
- "agent_servers",
- "agent_settings",
- "anyhow",
- "assistant_text_thread",
- "chrono",
- "client",
- "clock",
- "cloud_llm_client",
- "collections",
- "context_server",
- "ctor",
- "db",
- "derive_more 0.99.20",
- "editor",
- "env_logger 0.11.8",
- "eval_utils",
- "fs",
- "futures 0.3.31",
- "git",
- "gpui",
- "gpui_tokio",
- "handlebars 4.5.0",
- "html_to_markdown",
- "http_client",
- "indoc",
- "itertools 0.14.0",
- "language",
- "language_model",
- "language_models",
- "log",
- "lsp",
- "open",
- "parking_lot",
- "paths",
- "pretty_assertions",
- "project",
- "prompt_store",
- "rand 0.9.2",
- "regex",
- "reqwest_client",
- "rust-embed",
- "schemars",
- "serde",
- "serde_json",
- "settings",
- "smallvec",
- "smol",
- "sqlez",
- "streaming_diff",
- "strsim",
- "task",
- "telemetry",
- "tempfile",
- "terminal",
- "text",
- "theme",
- "thiserror 2.0.17",
- "tree-sitter-rust",
- "ui",
- "unindent",
- "util",
- "uuid",
- "watch",
- "web_search",
- "worktree",
- "zed_env_vars",
- "zlog",
- "zstd",
-]
-
-[[package]]
-name = "agent-client-protocol"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2ffe7d502c1e451aafc5aff655000f84d09c9af681354ac0012527009b1af13"
-dependencies = [
- "agent-client-protocol-schema",
- "anyhow",
- "async-broadcast",
- "async-trait",
- "derive_more 2.0.1",
- "futures 0.3.31",
- "log",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "agent-client-protocol-schema"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8af81cc2d5c3f9c04f73db452efd058333735ba9d51c2cf7ef33c9fee038e7e6"
-dependencies = [
- "anyhow",
- "derive_more 2.0.1",
- "schemars",
- "serde",
- "serde_json",
- "strum 0.27.2",
-]
-
-[[package]]
-name = "agent_servers"
-version = "0.1.0"
-dependencies = [
- "acp_thread",
- "acp_tools",
- "action_log",
- "agent-client-protocol",
- "anyhow",
- "async-trait",
- "client",
- "collections",
- "env_logger 0.11.8",
- "fs",
- "futures 0.3.31",
- "gpui",
- "gpui_tokio",
- "http_client",
- "indoc",
- "language",
- "language_model",
- "language_models",
- "libc",
- "log",
- "nix 0.29.0",
- "project",
- "release_channel",
- "reqwest_client",
- "serde",
- "serde_json",
- "settings",
- "smol",
- "task",
- "tempfile",
- "terminal",
- "thiserror 2.0.17",
- "ui",
- "util",
- "uuid",
- "watch",
-]
-
-[[package]]
-name = "agent_settings"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "cloud_llm_client",
- "collections",
- "convert_case 0.8.0",
- "fs",
- "gpui",
- "language_model",
- "paths",
- "project",
- "schemars",
- "serde",
- "serde_json",
- "serde_json_lenient",
- "settings",
- "util",
-]
-
-[[package]]
-name = "agent_ui"
-version = "0.1.0"
-dependencies = [
- "acp_thread",
- "action_log",
- "agent",
- "agent-client-protocol",
- "agent_servers",
- "agent_settings",
- "ai_onboarding",
- "anyhow",
- "arrayvec",
- "assistant_slash_command",
- "assistant_slash_commands",
- "assistant_text_thread",
- "async-fs",
- "audio",
- "buffer_diff",
- "chrono",
- "client",
- "clock",
- "cloud_llm_client",
- "collections",
- "command_palette_hooks",
- "component",
- "context_server",
- "db",
- "editor",
- "eval_utils",
- "extension",
- "extension_host",
- "feature_flags",
- "file_icons",
- "fs",
- "futures 0.3.31",
- "fuzzy",
- "gpui",
- "gpui_tokio",
- "html_to_markdown",
- "http_client",
- "image",
- "indoc",
- "itertools 0.14.0",
- "jsonschema",
- "language",
- "language_model",
- "language_models",
- "languages",
- "log",
- "lsp",
- "markdown",
- "menu",
- "multi_buffer",
- "notifications",
- "ordered-float 2.10.1",
- "parking_lot",
- "paths",
- "picker",
- "postage",
- "pretty_assertions",
- "project",
- "prompt_store",
- "proto",
- "rand 0.9.2",
- "release_channel",
- "reqwest_client",
- "rope",
- "rules_library",
- "schemars",
- "search",
- "semver",
- "serde",
- "serde_json",
- "serde_json_lenient",
- "settings",
- "smol",
- "streaming_diff",
- "task",
- "telemetry",
- "telemetry_events",
- "terminal",
- "terminal_view",
- "text",
- "theme",
- "time",
- "time_format",
- "tree-sitter-md",
- "ui",
- "ui_input",
- "unindent",
- "url",
- "util",
- "uuid",
- "watch",
- "workspace",
- "zed_actions",
-]
-
-[[package]]
-name = "ahash"
-version = "0.7.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
-dependencies = [
- "getrandom 0.2.16",
- "once_cell",
- "version_check",
-]
-
 [[package]]
 name = "ahash"
 version = "0.8.12"
@@ -426,9 +37,7 @@ checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
 dependencies = [
  "cfg-if",
  "const-random",
- "getrandom 0.3.4",
  "once_cell",
- "serde",
  "version_check",
  "zerocopy",
 ]
@@ -442,53 +51,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "ai_onboarding"
-version = "0.1.0"
-dependencies = [
- "client",
- "cloud_llm_client",
- "component",
- "gpui",
- "language_model",
- "serde",
- "smallvec",
- "telemetry",
- "ui",
- "zed_actions",
-]
-
-[[package]]
-name = "alacritty_terminal"
-version = "0.25.1-rc1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cb5f4f1ef69bdb8b2095ddd14b09dd74ee0303aae8bd5372667a54cff689a1b"
-dependencies = [
- "base64 0.22.1",
- "bitflags 2.9.4",
- "home",
- "libc",
- "log",
- "miow",
- "parking_lot",
- "piper",
- "polling",
- "regex-automata",
- "rustix 1.1.2",
- "rustix-openpty",
- "serde",
- "signal-hook",
- "unicode-width",
- "vte",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "aliasable"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd"
-
 [[package]]
 name = "aligned-vec"
 version = "0.6.4"
@@ -498,68 +60,6 @@ dependencies = [
  "equator",
 ]
 
-[[package]]
-name = "alloc-no-stdlib"
-version = "2.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3"
-
-[[package]]
-name = "alloc-stdlib"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece"
-dependencies = [
- "alloc-no-stdlib",
-]
-
-[[package]]
-name = "allocator-api2"
-version = "0.2.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
-
-[[package]]
-name = "alsa"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed7572b7ba83a31e20d1b48970ee402d2e3e0537dcfe0a3ff4d6eb7508617d43"
-dependencies = [
- "alsa-sys",
- "bitflags 2.9.4",
- "cfg-if",
- "libc",
-]
-
-[[package]]
-name = "alsa-sys"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527"
-dependencies = [
- "libc",
- "pkg-config",
-]
-
-[[package]]
-name = "ambient-authority"
-version = "0.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9d4ee0d472d1cd2e28c97dfa124b3d8d992e10eb0a035f33f5d12e3a177ba3b"
-
-[[package]]
-name = "ammonia"
-version = "4.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17e913097e1a2124b46746c980134e8c954bc17a6a59bb3fde96f088d126dde6"
-dependencies = [
- "cssparser",
- "html5ever 0.35.0",
- "maplit",
- "tendril",
- "url",
-]
-
 [[package]]
 name = "android_system_properties"
 version = "0.1.5"
@@ -569,12 +69,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "anes"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
-
 [[package]]
 name = "anstream"
 version = "0.6.21"
@@ -625,51 +119,17 @@ dependencies = [
  "windows-sys 0.60.2",
 ]
 
-[[package]]
-name = "anthropic"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "chrono",
- "futures 0.3.31",
- "http_client",
- "schemars",
- "serde",
- "serde_json",
- "settings",
- "strum 0.27.2",
- "thiserror 2.0.17",
-]
-
-[[package]]
-name = "any_vec"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34cd60c5e3152cef0a592f1b296f1cc93715d89d2551d85315828c3a09575ff4"
-
 [[package]]
 name = "anyhow"
 version = "1.0.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
 
-[[package]]
-name = "approx"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6"
-dependencies = [
- "num-traits",
-]
-
 [[package]]
 name = "arbitrary"
 version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1"
-dependencies = [
- "derive_arbitrary",
-]
 
 [[package]]
 name = "arg_enum_proc_macro"
@@ -682,12 +142,6 @@ dependencies = [
  "syn 2.0.106",
 ]
 
-[[package]]
-name = "arraydeque"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236"
-
 [[package]]
 name = "arrayref"
 version = "0.3.9"
@@ -699,9 +153,6 @@ name = "arrayvec"
 version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
-dependencies = [
- "serde",
-]
 
 [[package]]
 name = "as-raw-xcb-connection"
@@ -709,12 +160,6 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b"
 
-[[package]]
-name = "ascii"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16"
-
 [[package]]
 name = "ash"
 version = "0.38.0+1.3.281"
@@ -774,146 +219,6 @@ dependencies = [
  "zbus",
 ]
 
-[[package]]
-name = "askpass"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "futures 0.3.31",
- "gpui",
- "log",
- "net",
- "smol",
- "tempfile",
- "util",
- "windows 0.61.3",
- "zeroize",
-]
-
-[[package]]
-name = "assets"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "gpui",
- "rust-embed",
-]
-
-[[package]]
-name = "assistant_slash_command"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "async-trait",
- "collections",
- "derive_more 0.99.20",
- "extension",
- "futures 0.3.31",
- "gpui",
- "language",
- "language_model",
- "parking_lot",
- "pretty_assertions",
- "serde",
- "serde_json",
- "ui",
- "util",
- "workspace",
-]
-
-[[package]]
-name = "assistant_slash_commands"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "assistant_slash_command",
- "chrono",
- "collections",
- "context_server",
- "editor",
- "feature_flags",
- "fs",
- "futures 0.3.31",
- "fuzzy",
- "globset",
- "gpui",
- "html_to_markdown",
- "http_client",
- "language",
- "pretty_assertions",
- "project",
- "prompt_store",
- "rope",
- "serde",
- "serde_json",
- "settings",
- "smol",
- "text",
- "ui",
- "util",
- "workspace",
- "worktree",
- "zlog",
-]
-
-[[package]]
-name = "assistant_text_thread"
-version = "0.1.0"
-dependencies = [
- "agent_settings",
- "anyhow",
- "assistant_slash_command",
- "assistant_slash_commands",
- "chrono",
- "client",
- "clock",
- "cloud_llm_client",
- "collections",
- "context_server",
- "fs",
- "futures 0.3.31",
- "fuzzy",
- "gpui",
- "indoc",
- "itertools 0.14.0",
- "language",
- "language_model",
- "log",
- "open_ai",
- "parking_lot",
- "paths",
- "pretty_assertions",
- "project",
- "prompt_store",
- "proto",
- "rand 0.9.2",
- "regex",
- "rpc",
- "serde",
- "serde_json",
- "settings",
- "smallvec",
- "smol",
- "telemetry_events",
- "text",
- "ui",
- "unindent",
- "util",
- "uuid",
- "workspace",
- "zed_env_vars",
-]
-
-[[package]]
-name = "async-attributes"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5"
-dependencies = [
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "async-broadcast"
 version = "0.7.2"
@@ -949,19 +254,6 @@ dependencies = [
  "pin-project-lite",
 ]
 
-[[package]]
-name = "async-compat"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1ba85bc55464dcbf728b56d97e119d673f4cf9062be330a9a26f3acf504a590"
-dependencies = [
- "futures-core",
- "futures-io",
- "once_cell",
- "pin-project-lite",
- "tokio",
-]
-
 [[package]]
 name = "async-compression"
 version = "0.4.32"
@@ -975,16 +267,6 @@ dependencies = [
  "pin-project-lite",
 ]
 
-[[package]]
-name = "async-dispatcher"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c8bff43baa5b0ca8f8bcd7f9338f5d30fbd75236a2aa89130a7c5121a06d6ca"
-dependencies = [
- "async-task",
- "futures-lite 1.13.0",
-]
-
 [[package]]
 name = "async-executor"
 version = "1.13.3"
@@ -1005,7 +287,7 @@ version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8034a681df4aed8b8edbd7fbe472401ecf009251c8b40556b304567052e294c5"
 dependencies = [
- "async-lock 3.4.1",
+ "async-lock",
  "blocking",
  "futures-lite 2.6.1",
 ]
@@ -1019,7 +301,7 @@ dependencies = [
  "async-channel 2.5.0",
  "async-executor",
  "async-io",
- "async-lock 3.4.1",
+ "async-lock",
  "blocking",
  "futures-lite 2.6.1",
  "once_cell",
@@ -1043,15 +325,6 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
-[[package]]
-name = "async-lock"
-version = "2.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b"
-dependencies = [
- "event-listener 2.5.3",
-]
-
 [[package]]
 name = "async-lock"
 version = "3.4.1"
@@ -1074,15 +347,6 @@ dependencies = [
  "futures-lite 2.6.1",
 ]
 
-[[package]]
-name = "async-pipe"
-version = "0.1.3"
-source = "git+https://github.com/zed-industries/async-pipe-rs?rev=82d00a04211cf4e1236029aa03e6b6ce2a74c553#82d00a04211cf4e1236029aa03e6b6ce2a74c553"
-dependencies = [
- "futures 0.3.31",
- "log",
-]
-
 [[package]]
 name = "async-process"
 version = "2.5.0"
@@ -1091,7 +355,7 @@ checksum = "fc50921ec0055cdd8a16de48773bfeec5c972598674347252c0399676be7da75"
 dependencies = [
  "async-channel 2.5.0",
  "async-io",
- "async-lock 3.4.1",
+ "async-lock",
  "async-signal",
  "async-task",
  "blocking",
@@ -1119,7 +383,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "43c070bbf59cd3570b6b2dd54cd772527c7c3620fce8be898406dd3ed6adc64c"
 dependencies = [
  "async-io",
- "async-lock 3.4.1",
+ "async-lock",
  "atomic-waker",
  "cfg-if",
  "futures-core",
@@ -1136,11 +400,10 @@ version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2c8e079a4ab67ae52b7403632e4618815d6db36d2a010cfe41b02c1b1578f93b"
 dependencies = [
- "async-attributes",
  "async-channel 1.9.0",
  "async-global-executor",
  "async-io",
- "async-lock 3.4.1",
+ "async-lock",
  "async-process",
  "crossbeam-utils",
  "futures-channel",
@@ -1158,28 +421,6 @@ dependencies = [
  "wasm-bindgen-futures",
 ]
 
-[[package]]
-name = "async-stream"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
-dependencies = [
- "async-stream-impl",
- "futures-core",
- "pin-project-lite",
-]
-
-[[package]]
-name = "async-stream-impl"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.106",
-]
-
 [[package]]
 name = "async-tar"
 version = "0.5.1"
@@ -1211,25 +452,6 @@ dependencies = [
  "syn 2.0.106",
 ]
 
-[[package]]
-name = "async-tungstenite"
-version = "0.31.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee88b4c88ac8c9ea446ad43498955750a4bbe64c4392f21ccfe5d952865e318f"
-dependencies = [
- "atomic-waker",
- "futures-core",
- "futures-io",
- "futures-task",
- "futures-util",
- "log",
- "pin-project-lite",
- "rustls-pki-types",
- "tokio",
- "tokio-rustls 0.26.2",
- "tungstenite 0.27.0",
-]
-
 [[package]]
 name = "async_zip"
 version = "0.0.18"
@@ -1243,28 +465,6 @@ dependencies = [
  "thiserror 2.0.17",
 ]
 
-[[package]]
-name = "asynchronous-codec"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a860072022177f903e59730004fb5dc13db9275b79bb2aef7ba8ce831956c233"
-dependencies = [
- "bytes 1.10.1",
- "futures-sink",
- "futures-util",
- "memchr",
- "pin-project-lite",
-]
-
-[[package]]
-name = "atoi"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528"
-dependencies = [
- "num-traits",
-]
-
 [[package]]
 name = "atomic"
 version = "0.5.3"
@@ -1277,99 +477,6 @@ version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
-[[package]]
-name = "audio"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "async-tar",
- "collections",
- "crossbeam",
- "denoise",
- "gpui",
- "libwebrtc",
- "log",
- "parking_lot",
- "rodio",
- "serde",
- "settings",
- "smol",
- "thiserror 2.0.17",
- "util",
-]
-
-[[package]]
-name = "auditable-serde"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c7bf8143dfc3c0258df908843e169b5cc5fcf76c7718bd66135ef4a9cd558c5"
-dependencies = [
- "semver",
- "serde",
- "serde_json",
- "topological-sort",
-]
-
-[[package]]
-name = "auto_update"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "client",
- "clock",
- "ctor",
- "db",
- "futures 0.3.31",
- "gpui",
- "http_client",
- "log",
- "parking_lot",
- "paths",
- "release_channel",
- "semver",
- "serde",
- "serde_json",
- "settings",
- "smol",
- "tempfile",
- "util",
- "which 6.0.3",
- "workspace",
- "zlog",
-]
-
-[[package]]
-name = "auto_update_helper"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "log",
- "simplelog",
- "tempfile",
- "windows 0.61.3",
- "winresource",
-]
-
-[[package]]
-name = "auto_update_ui"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "auto_update",
- "client",
- "editor",
- "gpui",
- "http_client",
- "markdown_preview",
- "release_channel",
- "semver",
- "serde",
- "serde_json",
- "smol",
- "util",
- "workspace",
-]
-
 [[package]]
 name = "autocfg"
 version = "1.5.0"
@@ -1385,7 +492,7 @@ dependencies = [
  "anyhow",
  "arrayvec",
  "log",
- "nom 7.1.3",
+ "nom",
  "num-rational",
  "v_frame",
 ]
@@ -1399,48 +506,6 @@ dependencies = [
  "arrayvec",
 ]
 
-[[package]]
-name = "aws-config"
-version = "1.8.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37cf2b6af2a95a20e266782b4f76f1a5e12bf412a9db2de9c1e9123b9d8c0ad8"
-dependencies = [
- "aws-credential-types",
- "aws-runtime",
- "aws-sdk-sso",
- "aws-sdk-ssooidc",
- "aws-sdk-sts",
- "aws-smithy-async",
- "aws-smithy-http",
- "aws-smithy-json",
- "aws-smithy-runtime",
- "aws-smithy-runtime-api",
- "aws-smithy-types",
- "aws-types",
- "bytes 1.10.1",
- "fastrand 2.3.0",
- "hex",
- "http 1.3.1",
- "ring",
- "time",
- "tokio",
- "tracing",
- "url",
- "zeroize",
-]
-
-[[package]]
-name = "aws-credential-types"
-version = "1.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "faf26925f4a5b59eb76722b63c2892b1d70d06fa053c72e4a100ec308c1d47bc"
-dependencies = [
- "aws-smithy-async",
- "aws-smithy-runtime-api",
- "aws-smithy-types",
- "zeroize",
-]
-
 [[package]]
 name = "aws-lc-rs"
 version = "1.14.1"
@@ -1448,7 +513,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "879b6c89592deb404ba4dc0ae6b58ffd1795c78991cbb5b8bc441c48a070440d"
 dependencies = [
  "aws-lc-sys",
- "untrusted 0.7.1",
  "zeroize",
 ]
 
@@ -1465,502 +529,6 @@ dependencies = [
  "fs_extra",
 ]
 
-[[package]]
-name = "aws-runtime"
-version = "1.5.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa006bb32360ed90ac51203feafb9d02e3d21046e1fd3a450a404b90ea73e5d"
-dependencies = [
- "aws-credential-types",
- "aws-sigv4",
- "aws-smithy-async",
- "aws-smithy-eventstream",
- "aws-smithy-http",
- "aws-smithy-runtime",
- "aws-smithy-runtime-api",
- "aws-smithy-types",
- "aws-types",
- "bytes 1.10.1",
- "fastrand 2.3.0",
- "http 0.2.12",
- "http-body 0.4.6",
- "percent-encoding",
- "pin-project-lite",
- "tracing",
- "uuid",
-]
-
-[[package]]
-name = "aws-sdk-bedrockruntime"
-version = "1.109.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbfdfd941dcb253c17bf70baddbf1e5b22f19e29d313d2e049bad4b1dadb2011"
-dependencies = [
- "aws-credential-types",
- "aws-runtime",
- "aws-sigv4",
- "aws-smithy-async",
- "aws-smithy-eventstream",
- "aws-smithy-http",
- "aws-smithy-json",
- "aws-smithy-runtime",
- "aws-smithy-runtime-api",
- "aws-smithy-types",
- "aws-types",
- "bytes 1.10.1",
- "fastrand 2.3.0",
- "http 0.2.12",
- "hyper 0.14.32",
- "regex-lite",
- "tracing",
-]
-
-[[package]]
-name = "aws-sdk-kinesis"
-version = "1.91.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "699a3d645a2ab5cb12ca02eb23979753953414429fd6584ea8841af6bc4e0516"
-dependencies = [
- "aws-credential-types",
- "aws-runtime",
- "aws-smithy-async",
- "aws-smithy-eventstream",
- "aws-smithy-http",
- "aws-smithy-json",
- "aws-smithy-runtime",
- "aws-smithy-runtime-api",
- "aws-smithy-types",
- "aws-types",
- "bytes 1.10.1",
- "fastrand 2.3.0",
- "http 0.2.12",
- "regex-lite",
- "tracing",
-]
-
-[[package]]
-name = "aws-sdk-s3"
-version = "1.108.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "200be4aed61e3c0669f7268bacb768f283f1c32a7014ce57225e1160be2f6ccb"
-dependencies = [
- "aws-credential-types",
- "aws-runtime",
- "aws-sigv4",
- "aws-smithy-async",
- "aws-smithy-checksums",
- "aws-smithy-eventstream",
- "aws-smithy-http",
- "aws-smithy-json",
- "aws-smithy-runtime",
- "aws-smithy-runtime-api",
- "aws-smithy-types",
- "aws-smithy-xml",
- "aws-types",
- "bytes 1.10.1",
- "fastrand 2.3.0",
- "hex",
- "hmac",
- "http 0.2.12",
- "http 1.3.1",
- "http-body 0.4.6",
- "lru",
- "percent-encoding",
- "regex-lite",
- "sha2",
- "tracing",
- "url",
-]
-
-[[package]]
-name = "aws-sdk-sso"
-version = "1.86.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a0abbfab841446cce6e87af853a3ba2cc1bc9afcd3f3550dd556c43d434c86d"
-dependencies = [
- "aws-credential-types",
- "aws-runtime",
- "aws-smithy-async",
- "aws-smithy-http",
- "aws-smithy-json",
- "aws-smithy-runtime",
- "aws-smithy-runtime-api",
- "aws-smithy-types",
- "aws-types",
- "bytes 1.10.1",
- "fastrand 2.3.0",
- "http 0.2.12",
- "regex-lite",
- "tracing",
-]
-
-[[package]]
-name = "aws-sdk-ssooidc"
-version = "1.88.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a68d675582afea0e94d38b6ca9c5aaae4ca14f1d36faa6edb19b42e687e70d7"
-dependencies = [
- "aws-credential-types",
- "aws-runtime",
- "aws-smithy-async",
- "aws-smithy-http",
- "aws-smithy-json",
- "aws-smithy-runtime",
- "aws-smithy-runtime-api",
- "aws-smithy-types",
- "aws-types",
- "bytes 1.10.1",
- "fastrand 2.3.0",
- "http 0.2.12",
- "regex-lite",
- "tracing",
-]
-
-[[package]]
-name = "aws-sdk-sts"
-version = "1.88.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d30990923f4f675523c51eb1c0dec9b752fb267b36a61e83cbc219c9d86da715"
-dependencies = [
- "aws-credential-types",
- "aws-runtime",
- "aws-smithy-async",
- "aws-smithy-http",
- "aws-smithy-json",
- "aws-smithy-query",
- "aws-smithy-runtime",
- "aws-smithy-runtime-api",
- "aws-smithy-types",
- "aws-smithy-xml",
- "aws-types",
- "fastrand 2.3.0",
- "http 0.2.12",
- "regex-lite",
- "tracing",
-]
-
-[[package]]
-name = "aws-sigv4"
-version = "1.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bffc03068fbb9c8dd5ce1c6fb240678a5cffb86fb2b7b1985c999c4b83c8df68"
-dependencies = [
- "aws-credential-types",
- "aws-smithy-eventstream",
- "aws-smithy-http",
- "aws-smithy-runtime-api",
- "aws-smithy-types",
- "bytes 1.10.1",
- "crypto-bigint 0.5.5",
- "form_urlencoded",
- "hex",
- "hmac",
- "http 0.2.12",
- "http 1.3.1",
- "p256",
- "percent-encoding",
- "ring",
- "sha2",
- "subtle",
- "time",
- "tracing",
- "zeroize",
-]
-
-[[package]]
-name = "aws-smithy-async"
-version = "1.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "127fcfad33b7dfc531141fda7e1c402ac65f88aca5511a4d31e2e3d2cd01ce9c"
-dependencies = [
- "futures-util",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "aws-smithy-checksums"
-version = "0.63.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "165d8583d8d906e2fb5511d29201d447cc710864f075debcdd9c31c265412806"
-dependencies = [
- "aws-smithy-http",
- "aws-smithy-types",
- "bytes 1.10.1",
- "crc-fast",
- "hex",
- "http 0.2.12",
- "http-body 0.4.6",
- "md-5",
- "pin-project-lite",
- "sha1",
- "sha2",
- "tracing",
-]
-
-[[package]]
-name = "aws-smithy-eventstream"
-version = "0.60.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9656b85088f8d9dc7ad40f9a6c7228e1e8447cdf4b046c87e152e0805dea02fa"
-dependencies = [
- "aws-smithy-types",
- "bytes 1.10.1",
- "crc32fast",
-]
-
-[[package]]
-name = "aws-smithy-http"
-version = "0.62.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3feafd437c763db26aa04e0cc7591185d0961e64c61885bece0fb9d50ceac671"
-dependencies = [
- "aws-smithy-eventstream",
- "aws-smithy-runtime-api",
- "aws-smithy-types",
- "bytes 1.10.1",
- "bytes-utils",
- "futures-core",
- "http 0.2.12",
- "http 1.3.1",
- "http-body 0.4.6",
- "percent-encoding",
- "pin-project-lite",
- "pin-utils",
- "tracing",
-]
-
-[[package]]
-name = "aws-smithy-http-client"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1053b5e587e6fa40ce5a79ea27957b04ba660baa02b28b7436f64850152234f1"
-dependencies = [
- "aws-smithy-async",
- "aws-smithy-runtime-api",
- "aws-smithy-types",
- "h2 0.3.27",
- "h2 0.4.12",
- "http 0.2.12",
- "http 1.3.1",
- "http-body 0.4.6",
- "hyper 0.14.32",
- "hyper 1.7.0",
- "hyper-rustls 0.24.2",
- "hyper-rustls 0.27.7",
- "hyper-util",
- "pin-project-lite",
- "rustls 0.21.12",
- "rustls 0.23.33",
- "rustls-native-certs 0.8.2",
- "rustls-pki-types",
- "tokio",
- "tokio-rustls 0.26.2",
- "tower 0.5.2",
- "tracing",
-]
-
-[[package]]
-name = "aws-smithy-json"
-version = "0.61.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cff418fc8ec5cadf8173b10125f05c2e7e1d46771406187b2c878557d4503390"
-dependencies = [
- "aws-smithy-types",
-]
-
-[[package]]
-name = "aws-smithy-observability"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d1881b1ea6d313f9890710d65c158bdab6fb08c91ea825f74c1c8c357baf4cc"
-dependencies = [
- "aws-smithy-runtime-api",
-]
-
-[[package]]
-name = "aws-smithy-query"
-version = "0.60.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d28a63441360c477465f80c7abac3b9c4d075ca638f982e605b7dc2a2c7156c9"
-dependencies = [
- "aws-smithy-types",
- "urlencoding",
-]
-
-[[package]]
-name = "aws-smithy-runtime"
-version = "1.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ab99739082da5347660c556689256438defae3bcefd66c52b095905730e404"
-dependencies = [
- "aws-smithy-async",
- "aws-smithy-http",
- "aws-smithy-http-client",
- "aws-smithy-observability",
- "aws-smithy-runtime-api",
- "aws-smithy-types",
- "bytes 1.10.1",
- "fastrand 2.3.0",
- "http 0.2.12",
- "http 1.3.1",
- "http-body 0.4.6",
- "http-body 1.0.1",
- "pin-project-lite",
- "pin-utils",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "aws-smithy-runtime-api"
-version = "1.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3683c5b152d2ad753607179ed71988e8cfd52964443b4f74fd8e552d0bbfeb46"
-dependencies = [
- "aws-smithy-async",
- "aws-smithy-types",
- "bytes 1.10.1",
- "http 0.2.12",
- "http 1.3.1",
- "pin-project-lite",
- "tokio",
- "tracing",
- "zeroize",
-]
-
-[[package]]
-name = "aws-smithy-types"
-version = "1.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f5b3a7486f6690ba25952cabf1e7d75e34d69eaff5081904a47bc79074d6457"
-dependencies = [
- "base64-simd",
- "bytes 1.10.1",
- "bytes-utils",
- "futures-core",
- "http 0.2.12",
- "http 1.3.1",
- "http-body 0.4.6",
- "http-body 1.0.1",
- "http-body-util",
- "itoa",
- "num-integer",
- "pin-project-lite",
- "pin-utils",
- "ryu",
- "serde",
- "time",
- "tokio",
- "tokio-util",
-]
-
-[[package]]
-name = "aws-smithy-xml"
-version = "0.60.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9c34127e8c624bc2999f3b657e749c1393bedc9cd97b92a804db8ced4d2e163"
-dependencies = [
- "xmlparser",
-]
-
-[[package]]
-name = "aws-types"
-version = "1.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2fd329bf0e901ff3f60425691410c69094dc2a1f34b331f37bfc4e9ac1565a1"
-dependencies = [
- "aws-credential-types",
- "aws-smithy-async",
- "aws-smithy-runtime-api",
- "aws-smithy-types",
- "rustc_version",
- "tracing",
-]
-
-[[package]]
-name = "aws_http_client"
-version = "0.1.0"
-dependencies = [
- "aws-smithy-runtime-api",
- "aws-smithy-types",
- "http_client",
-]
-
-[[package]]
-name = "axum"
-version = "0.6.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf"
-dependencies = [
- "async-trait",
- "axum-core",
- "base64 0.21.7",
- "bitflags 1.3.2",
- "bytes 1.10.1",
- "futures-util",
- "headers",
- "http 0.2.12",
- "http-body 0.4.6",
- "hyper 0.14.32",
- "itoa",
- "matchit",
- "memchr",
- "mime",
- "percent-encoding",
- "pin-project-lite",
- "rustversion",
- "serde",
- "serde_json",
- "serde_path_to_error",
- "serde_urlencoded",
- "sha1",
- "sync_wrapper 0.1.2",
- "tokio",
- "tokio-tungstenite 0.20.1",
- "tower 0.4.13",
- "tower-layer",
- "tower-service",
-]
-
-[[package]]
-name = "axum-core"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c"
-dependencies = [
- "async-trait",
- "bytes 1.10.1",
- "futures-util",
- "http 0.2.12",
- "http-body 0.4.6",
- "mime",
- "rustversion",
- "tower-layer",
- "tower-service",
-]
-
-[[package]]
-name = "axum-extra"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a320103719de37b7b4da4c8eb629d4573f6bcfd3dfe80d3208806895ccf81d"
-dependencies = [
- "axum",
- "bytes 1.10.1",
- "futures-util",
- "http 0.2.12",
- "mime",
- "pin-project-lite",
- "serde",
- "serde_json",
- "tokio",
- "tower 0.4.13",
- "tower-http 0.3.5",
- "tower-layer",
- "tower-service",
-]
-
 [[package]]
 name = "backtrace"
 version = "0.3.76"
@@ -1971,83 +539,17 @@ dependencies = [
  "cfg-if",
  "libc",
  "miniz_oxide",
- "object 0.37.3",
+ "object",
  "rustc-demangle",
  "windows-link 0.2.1",
 ]
 
-[[package]]
-name = "base16ct"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce"
-
-[[package]]
-name = "base64"
-version = "0.21.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
-
 [[package]]
 name = "base64"
 version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
-[[package]]
-name = "base64-simd"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195"
-dependencies = [
- "outref",
- "vsimd",
-]
-
-[[package]]
-name = "base64ct"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba"
-
-[[package]]
-name = "bedrock"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "aws-sdk-bedrockruntime",
- "aws-smithy-types",
- "futures 0.3.31",
- "schemars",
- "serde",
- "serde_json",
- "strum 0.27.2",
- "thiserror 2.0.17",
-]
-
-[[package]]
-name = "bigdecimal"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a22f228ab7a1b23027ccc6c350b72868017af7ea8356fbdf19f8d991c690013"
-dependencies = [
- "autocfg",
- "libm",
- "num-bigint",
- "num-integer",
- "num-traits",
- "serde",
-]
-
-[[package]]
-name = "bincode"
-version = "1.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "bindgen"
 version = "0.71.1"
@@ -2120,9 +622,6 @@ name = "bitflags"
 version = "2.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394"
-dependencies = [
- "serde",
-]
 
 [[package]]
 name = "bitstream-io"
@@ -2130,18 +629,6 @@ version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6099cdc01846bc367c4e7dd630dc5966dccf36b652fae7a74e17b640411a91b2"
 
-[[package]]
-name = "bitvec"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
-dependencies = [
- "funty",
- "radium",
- "tap",
- "wyz",
-]
-
 [[package]]
 name = "blade-graphics"
 version = "0.7.0"
@@ -2152,7 +639,7 @@ dependencies = [
  "ash-window",
  "bitflags 2.9.4",
  "bytemuck",
- "codespan-reporting 0.12.0",
+ "codespan-reporting",
  "glow",
  "gpu-alloc",
  "gpu-alloc-ash",
@@ -2246,84 +733,6 @@ dependencies = [
  "piper",
 ]
 
-[[package]]
-name = "bm25"
-version = "2.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cbd8ffdfb7b4c2ff038726178a780a94f90525ed0ad264c0afaa75dd8c18a64"
-dependencies = [
- "cached",
- "deunicode",
- "fxhash",
- "rust-stemmers",
- "stop-words",
- "unicode-segmentation",
-]
-
-[[package]]
-name = "borrow-or-share"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc0b364ead1874514c8c2855ab558056ebfeb775653e7ae45ff72f28f8f3166c"
-
-[[package]]
-name = "borsh"
-version = "1.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad8646f98db542e39fc66e68a20b2144f6a732636df7c2354e74645faaa433ce"
-dependencies = [
- "borsh-derive",
- "cfg_aliases 0.2.1",
-]
-
-[[package]]
-name = "borsh-derive"
-version = "1.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdd1d3c0c2f5833f22386f252fe8ed005c7f59fdcddeef025c01b4c3b9fd9ac3"
-dependencies = [
- "once_cell",
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn 2.0.106",
-]
-
-[[package]]
-name = "breadcrumbs"
-version = "0.1.0"
-dependencies = [
- "editor",
- "gpui",
- "itertools 0.14.0",
- "settings",
- "theme",
- "ui",
- "workspace",
- "zed_actions",
-]
-
-[[package]]
-name = "brotli"
-version = "8.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bd8b9603c7aa97359dbd97ecf258968c95f3adddd6db2f7e7a5bef101c84560"
-dependencies = [
- "alloc-no-stdlib",
- "alloc-stdlib",
- "brotli-decompressor",
-]
-
-[[package]]
-name = "brotli-decompressor"
-version = "5.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "874bb8112abecc98cbd6d81ea4fa7e94fb9449648c93cc89aa40c81c24d7de03"
-dependencies = [
- "alloc-no-stdlib",
- "alloc-stdlib",
-]
-
 [[package]]
 name = "bstr"
 version = "1.12.0"
@@ -2331,34 +740,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4"
 dependencies = [
  "memchr",
- "regex-automata",
  "serde",
 ]
 
-[[package]]
-name = "buffer_diff"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "clock",
- "ctor",
- "futures 0.3.31",
- "git2",
- "gpui",
- "language",
- "log",
- "pretty_assertions",
- "rand 0.9.2",
- "rope",
- "serde_json",
- "settings",
- "sum_tree",
- "text",
- "unindent",
- "util",
- "zlog",
-]
-
 [[package]]
 name = "built"
 version = "0.7.7"
@@ -2370,43 +754,6 @@ name = "bumpalo"
 version = "3.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
-dependencies = [
- "allocator-api2",
-]
-
-[[package]]
-name = "by_address"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64fa3c856b712db6612c019f14756e64e4bcea13337a6b33b696333a9eaa2d06"
-
-[[package]]
-name = "bytecheck"
-version = "0.6.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2"
-dependencies = [
- "bytecheck_derive",
- "ptr_meta",
- "simdutf8",
-]
-
-[[package]]
-name = "bytecheck_derive"
-version = "0.6.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "bytecount"
-version = "0.6.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "175812e0be2bccb6abe50bb8d566126198344f707e304f45c648fd8f2cc0365e"
 
 [[package]]
 name = "bytemuck"
@@ -2440,110 +787,12 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
 
-[[package]]
-name = "bytes"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c"
-dependencies = [
- "byteorder",
- "iovec",
-]
-
 [[package]]
 name = "bytes"
 version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
 
-[[package]]
-name = "bytes-utils"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dafe3a8757b027e2be6e4e5601ed563c55989fcf1546e933c66c8eb3a058d35"
-dependencies = [
- "bytes 1.10.1",
- "either",
-]
-
-[[package]]
-name = "bzip2"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8"
-dependencies = [
- "bzip2-sys",
- "libc",
-]
-
-[[package]]
-name = "bzip2-sys"
-version = "0.1.13+1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225bff33b2141874fe80d71e07d6eec4f85c5c216453dd96388240f96e1acc14"
-dependencies = [
- "cc",
- "pkg-config",
-]
-
-[[package]]
-name = "cached"
-version = "0.56.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "801927ee168e17809ab8901d9f01f700cd7d8d6a6527997fee44e4b0327a253c"
-dependencies = [
- "ahash 0.8.12",
- "cached_proc_macro",
- "cached_proc_macro_types",
- "hashbrown 0.15.5",
- "once_cell",
- "thiserror 2.0.17",
- "web-time",
-]
-
-[[package]]
-name = "cached_proc_macro"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9225bdcf4e4a9a4c08bf16607908eb2fbf746828d5e0b5e019726dbf6571f201"
-dependencies = [
- "darling",
- "proc-macro2",
- "quote",
- "syn 2.0.106",
-]
-
-[[package]]
-name = "cached_proc_macro_types"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ade8366b8bd5ba243f0a58f036cc0ca8a2f069cff1a2351ef1cac6b083e16fc0"
-
-[[package]]
-name = "call"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "audio",
- "client",
- "collections",
- "feature_flags",
- "fs",
- "futures 0.3.31",
- "gpui",
- "gpui_tokio",
- "http_client",
- "language",
- "livekit_client",
- "log",
- "postage",
- "project",
- "serde",
- "settings",
- "telemetry",
- "util",
-]
-
 [[package]]
 name = "calloop"
 version = "0.14.3"
@@ -2568,179 +817,6 @@ dependencies = [
  "wayland-client",
 ]
 
-[[package]]
-name = "camino"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "276a59bf2b2c967788139340c9f0c5b12d7fd6630315c15c217e559de85d2609"
-dependencies = [
- "serde_core",
-]
-
-[[package]]
-name = "candle-core"
-version = "0.9.1"
-source = "git+https://github.com/zed-industries/candle?branch=9.1-patched#724d75eb3deebefe83f2a7381a45d4fac6eda383"
-dependencies = [
- "byteorder",
- "float8",
- "gemm 0.17.1",
- "half",
- "memmap2",
- "num-traits",
- "num_cpus",
- "rand 0.9.2",
- "rand_distr",
- "rayon",
- "safetensors",
- "thiserror 1.0.69",
- "ug",
- "yoke 0.7.5",
- "zip 1.1.4",
-]
-
-[[package]]
-name = "candle-nn"
-version = "0.9.1"
-source = "git+https://github.com/zed-industries/candle?branch=9.1-patched#724d75eb3deebefe83f2a7381a45d4fac6eda383"
-dependencies = [
- "candle-core",
- "half",
- "libc",
- "num-traits",
- "rayon",
- "safetensors",
- "serde",
- "thiserror 1.0.69",
-]
-
-[[package]]
-name = "candle-onnx"
-version = "0.9.1"
-source = "git+https://github.com/zed-industries/candle?branch=9.1-patched#724d75eb3deebefe83f2a7381a45d4fac6eda383"
-dependencies = [
- "candle-core",
- "candle-nn",
- "prost 0.12.6",
-]
-
-[[package]]
-name = "cap-fs-ext"
-version = "3.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e41cc18551193fe8fa6f15c1e3c799bc5ec9e2cfbfaa8ed46f37013e3e6c173c"
-dependencies = [
- "cap-primitives",
- "cap-std",
- "io-lifetimes",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "cap-net-ext"
-version = "3.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f83833816c66c986e913b22ac887cec216ea09301802054316fc5301809702c"
-dependencies = [
- "cap-primitives",
- "cap-std",
- "rustix 1.1.2",
- "smallvec",
-]
-
-[[package]]
-name = "cap-primitives"
-version = "3.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a1e394ed14f39f8bc26f59d4c0c010dbe7f0a1b9bafff451b1f98b67c8af62a"
-dependencies = [
- "ambient-authority",
- "fs-set-times",
- "io-extras",
- "io-lifetimes",
- "ipnet",
- "maybe-owned",
- "rustix 1.1.2",
- "rustix-linux-procfs",
- "windows-sys 0.59.0",
- "winx",
-]
-
-[[package]]
-name = "cap-rand"
-version = "3.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0acb89ccf798a28683f00089d0630dfaceec087234eae0d308c05ddeaa941b40"
-dependencies = [
- "ambient-authority",
- "rand 0.8.5",
-]
-
-[[package]]
-name = "cap-std"
-version = "3.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07c0355ca583dd58f176c3c12489d684163861ede3c9efa6fd8bba314c984189"
-dependencies = [
- "cap-primitives",
- "io-extras",
- "io-lifetimes",
- "rustix 1.1.2",
-]
-
-[[package]]
-name = "cap-time-ext"
-version = "3.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "491af520b8770085daa0466978c75db90368c71896523f2464214e38359b1a5b"
-dependencies = [
- "ambient-authority",
- "cap-primitives",
- "iana-time-zone",
- "once_cell",
- "rustix 1.1.2",
- "winx",
-]
-
-[[package]]
-name = "cargo-platform"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e35af189006b9c0f00a064685c727031e3ed2d8020f7ba284d78cc2671bd36ea"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "cargo_metadata"
-version = "0.19.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd5eb614ed4c27c5d706420e4320fbe3216ab31fa1c33cd8246ac36dae4479ba"
-dependencies = [
- "camino",
- "cargo-platform",
- "semver",
- "serde",
- "serde_json",
- "thiserror 2.0.17",
-]
-
-[[package]]
-name = "cargo_toml"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fbd1fe9db3ebf71b89060adaf7b0504c2d6a425cf061313099547e382c2e472"
-dependencies = [
- "serde",
- "toml 0.8.23",
-]
-
-[[package]]
-name = "cast"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
-
 [[package]]
 name = "cbc"
 version = "0.1.2"
@@ -2792,7 +868,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
 dependencies = [
- "nom 7.1.3",
+ "nom",
 ]
 
 [[package]]
@@ -2802,7 +878,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02"
 dependencies = [
  "smallvec",
- "target-lexicon 0.12.16",
+ "target-lexicon",
 ]
 
 [[package]]
@@ -2811,12 +887,6 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
-[[package]]
-name = "cfg_aliases"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
-
 [[package]]
 name = "cfg_aliases"
 version = "0.2.1"
@@ -2832,29 +902,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "channel"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "client",
- "clock",
- "collections",
- "futures 0.3.31",
- "gpui",
- "http_client",
- "language",
- "log",
- "postage",
- "release_channel",
- "rpc",
- "semver",
- "settings",
- "text",
- "time",
- "util",
-]
-
 [[package]]
 name = "chrono"
 version = "0.4.42"
@@ -2869,39 +916,6 @@ dependencies = [
  "windows-link 0.2.1",
 ]
 
-[[package]]
-name = "chunked_transfer"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4de3bc4ea267985becf712dc6d9eed8b04c953b3fcfb339ebc87acd9804901"
-
-[[package]]
-name = "ciborium"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e"
-dependencies = [
- "ciborium-io",
- "ciborium-ll",
- "serde",
-]
-
-[[package]]
-name = "ciborium-io"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757"
-
-[[package]]
-name = "ciborium-ll"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
-dependencies = [
- "ciborium-io",
- "half",
-]
-
 [[package]]
 name = "cipher"
 version = "0.4.4"
@@ -2930,187 +944,6 @@ dependencies = [
  "libloading",
 ]
 
-[[package]]
-name = "clap"
-version = "4.5.49"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4512b90fa68d3a9932cea5184017c5d200f5921df706d45e853537dea51508f"
-dependencies = [
- "clap_builder",
- "clap_derive",
-]
-
-[[package]]
-name = "clap_builder"
-version = "4.5.49"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0025e98baa12e766c67ba13ff4695a887a1eba19569aad00a472546795bd6730"
-dependencies = [
- "anstream",
- "anstyle",
- "clap_lex",
- "strsim",
- "terminal_size",
-]
-
-[[package]]
-name = "clap_complete"
-version = "4.5.59"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2348487adcd4631696ced64ccdb40d38ac4d31cae7f2eec8817fcea1b9d1c43c"
-dependencies = [
- "clap",
-]
-
-[[package]]
-name = "clap_derive"
-version = "4.5.49"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a0b5487afeab2deb2ff4e03a807ad1a03ac532ff5a2cee5d86884440c7f7671"
-dependencies = [
- "heck 0.5.0",
- "proc-macro2",
- "quote",
- "syn 2.0.106",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
-
-[[package]]
-name = "cli"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "askpass",
- "clap",
- "collections",
- "core-foundation 0.10.0",
- "core-services",
- "exec",
- "fork",
- "ipc-channel",
- "parking_lot",
- "paths",
- "plist",
- "rayon",
- "release_channel",
- "serde",
- "serde_json",
- "tempfile",
- "util",
- "windows 0.61.3",
-]
-
-[[package]]
-name = "client"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "async-tungstenite",
- "base64 0.22.1",
- "chrono",
- "clock",
- "cloud_api_client",
- "cloud_llm_client",
- "collections",
- "credentials_provider",
- "derive_more 0.99.20",
- "feature_flags",
- "fs",
- "futures 0.3.31",
- "gpui",
- "gpui_tokio",
- "http_client",
- "http_client_tls",
- "httparse",
- "log",
- "objc2-foundation",
- "parking_lot",
- "paths",
- "postage",
- "rand 0.9.2",
- "regex",
- "release_channel",
- "rpc",
- "rustls-pki-types",
- "semver",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "settings",
- "sha2",
- "smol",
- "telemetry",
- "telemetry_events",
- "text",
- "thiserror 2.0.17",
- "time",
- "tiny_http",
- "tokio",
- "tokio-native-tls",
- "tokio-rustls 0.26.2",
- "tokio-socks",
- "url",
- "util",
- "windows 0.61.3",
- "worktree",
-]
-
-[[package]]
-name = "clock"
-version = "0.1.0"
-dependencies = [
- "parking_lot",
- "serde",
- "smallvec",
-]
-
-[[package]]
-name = "cloud_api_client"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "cloud_api_types",
- "futures 0.3.31",
- "gpui",
- "gpui_tokio",
- "http_client",
- "parking_lot",
- "serde_json",
- "yawc",
-]
-
-[[package]]
-name = "cloud_api_types"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "chrono",
- "ciborium",
- "cloud_llm_client",
- "pretty_assertions",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "cloud_llm_client"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "chrono",
- "indoc",
- "pretty_assertions",
- "serde",
- "serde_json",
- "strum 0.27.2",
- "uuid",
-]
-
 [[package]]
 name = "cmake"
 version = "0.1.54"
@@ -3120,15 +953,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "cobs"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa961b519f0b462e3a3b4a34b64d119eeaca1d59af726fe450bbba07a9fc0a1"
-dependencies = [
- "thiserror 2.0.17",
-]
-
 [[package]]
 name = "cocoa"
 version = "0.25.0"
@@ -3140,7 +964,7 @@ dependencies = [
  "cocoa-foundation 0.1.2",
  "core-foundation 0.9.4",
  "core-graphics 0.23.2",
- "foreign-types 0.5.0",
+ "foreign-types",
  "libc",
  "objc",
 ]
@@ -3156,7 +980,7 @@ dependencies = [
  "cocoa-foundation 0.2.0",
  "core-foundation 0.10.0",
  "core-graphics 0.24.0",
- "foreign-types 0.5.0",
+ "foreign-types",
  "libc",
  "objc",
 ]
@@ -3200,183 +1024,6 @@ dependencies = [
  "unicode-width",
 ]
 
-[[package]]
-name = "codespan-reporting"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba7a06c0b31fff5ff2e1e7d37dbf940864e2a974b336e1a2938d10af6e8fb283"
-dependencies = [
- "serde",
- "termcolor",
- "unicode-width",
-]
-
-[[package]]
-name = "codestral"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "edit_prediction_context",
- "edit_prediction_types",
- "futures 0.3.31",
- "gpui",
- "http_client",
- "language",
- "language_models",
- "log",
- "mistral",
- "serde",
- "serde_json",
- "smol",
- "text",
-]
-
-[[package]]
-name = "collab"
-version = "0.44.0"
-dependencies = [
- "agent_settings",
- "anyhow",
- "assistant_slash_command",
- "assistant_text_thread",
- "async-trait",
- "async-tungstenite",
- "audio",
- "aws-config",
- "aws-sdk-kinesis",
- "aws-sdk-s3",
- "axum",
- "axum-extra",
- "base64 0.22.1",
- "buffer_diff",
- "call",
- "channel",
- "chrono",
- "client",
- "clock",
- "collab_ui",
- "collections",
- "command_palette_hooks",
- "context_server",
- "ctor",
- "dap",
- "dap-types",
- "dap_adapters",
- "dashmap 6.1.0",
- "debugger_ui",
- "editor",
- "envy",
- "extension",
- "file_finder",
- "fs",
- "futures 0.3.31",
- "git",
- "git_hosting_providers",
- "git_ui",
- "gpui",
- "gpui_tokio",
- "hex",
- "http_client",
- "hyper 0.14.32",
- "indoc",
- "language",
- "language_model",
- "livekit_api",
- "livekit_client",
- "log",
- "lsp",
- "menu",
- "multi_buffer",
- "nanoid",
- "node_runtime",
- "notifications",
- "parking_lot",
- "pretty_assertions",
- "project",
- "prometheus",
- "prompt_store",
- "prost 0.9.0",
- "rand 0.9.2",
- "recent_projects",
- "release_channel",
- "remote",
- "remote_server",
- "reqwest 0.11.27",
- "reqwest_client",
- "rpc",
- "scrypt",
- "sea-orm",
- "sea-orm-macros",
- "semver",
- "serde",
- "serde_json",
- "session",
- "settings",
- "sha2",
- "smol",
- "sqlx",
- "strum 0.27.2",
- "subtle",
- "supermaven_api",
- "task",
- "telemetry_events",
- "text",
- "theme",
- "time",
- "tokio",
- "toml 0.8.23",
- "tower 0.4.13",
- "tower-http 0.4.4",
- "tracing",
- "tracing-subscriber",
- "unindent",
- "util",
- "uuid",
- "workspace",
- "worktree",
- "zlog",
-]
-
-[[package]]
-name = "collab_ui"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "call",
- "channel",
- "chrono",
- "client",
- "collections",
- "db",
- "editor",
- "futures 0.3.31",
- "fuzzy",
- "gpui",
- "http_client",
- "log",
- "menu",
- "notifications",
- "picker",
- "pretty_assertions",
- "project",
- "release_channel",
- "rpc",
- "serde",
- "serde_json",
- "settings",
- "smallvec",
- "story",
- "telemetry",
- "theme",
- "time",
- "time_format",
- "title_bar",
- "tree-sitter-md",
- "ui",
- "util",
- "workspace",
-]
-
 [[package]]
 name = "collections"
 version = "0.1.0"
@@ -3403,7 +1050,7 @@ version = "4.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
 dependencies = [
- "bytes 1.10.1",
+ "bytes",
  "memchr",
 ]
 
@@ -3417,62 +1064,6 @@ dependencies = [
  "thiserror 2.0.17",
 ]
 
-[[package]]
-name = "command_palette"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "client",
- "collections",
- "command_palette_hooks",
- "ctor",
- "db",
- "editor",
- "env_logger 0.11.8",
- "fuzzy",
- "go_to_line",
- "gpui",
- "language",
- "log",
- "menu",
- "picker",
- "postage",
- "project",
- "serde",
- "serde_json",
- "settings",
- "telemetry",
- "theme",
- "time",
- "ui",
- "util",
- "workspace",
- "zed_actions",
-]
-
-[[package]]
-name = "command_palette_hooks"
-version = "0.1.0"
-dependencies = [
- "collections",
- "derive_more 0.99.20",
- "gpui",
- "workspace",
-]
-
-[[package]]
-name = "component"
-version = "0.1.0"
-dependencies = [
- "collections",
- "documented",
- "gpui",
- "inventory",
- "parking_lot",
- "strum 0.27.2",
- "theme",
-]
-
 [[package]]
 name = "compression-codecs"
 version = "0.4.31"
@@ -3500,25 +1091,6 @@ dependencies = [
  "crossbeam-utils",
 ]
 
-[[package]]
-name = "console"
-version = "0.15.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "054ccb5b10f9f2cbf51eb355ca1d05c2d279ce1804688d0db74b4733a5aeafd8"
-dependencies = [
- "encode_unicode",
- "libc",
- "once_cell",
- "unicode-width",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "const-oid"
-version = "0.9.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
-
 [[package]]
 name = "const-random"
 version = "0.1.18"
@@ -3539,115 +1111,12 @@ dependencies = [
  "tiny-keccak",
 ]
 
-[[package]]
-name = "const_format"
-version = "0.2.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7faa7469a93a566e9ccc1c73fe783b4a65c274c5ace346038dca9c39fe0030ad"
-dependencies = [
- "const_format_proc_macros",
-]
-
-[[package]]
-name = "const_format_proc_macros"
-version = "0.2.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d57c2eccfb16dbac1f4e61e206105db5820c9d26c3c472bc17c774259ef7744"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-xid",
-]
-
-[[package]]
-name = "constant_time_eq"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
-
-[[package]]
-name = "context_server"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "async-trait",
- "collections",
- "futures 0.3.31",
- "gpui",
- "http_client",
- "log",
- "net",
- "parking_lot",
- "postage",
- "schemars",
- "serde",
- "serde_json",
- "settings",
- "smol",
- "tempfile",
- "terminal",
- "url",
- "util",
-]
-
 [[package]]
 name = "convert_case"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
 
-[[package]]
-name = "convert_case"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baaaa0ecca5b51987b9423ccdc971514dd8b0bb7b4060b983d3664dad3f1f89f"
-dependencies = [
- "unicode-segmentation",
-]
-
-[[package]]
-name = "copilot"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "async-std",
- "chrono",
- "client",
- "clock",
- "collections",
- "command_palette_hooks",
- "ctor",
- "dirs 4.0.0",
- "edit_prediction_types",
- "editor",
- "fs",
- "futures 0.3.31",
- "gpui",
- "http_client",
- "indoc",
- "itertools 0.14.0",
- "language",
- "log",
- "lsp",
- "menu",
- "node_runtime",
- "parking_lot",
- "paths",
- "project",
- "rpc",
- "semver",
- "serde",
- "serde_json",
- "settings",
- "sum_tree",
- "task",
- "theme",
- "ui",
- "util",
- "workspace",
- "zlog",
-]
-
 [[package]]
 name = "core-foundation"
 version = "0.9.4"
@@ -3683,7 +1152,7 @@ dependencies = [
  "bitflags 1.3.2",
  "core-foundation 0.9.4",
  "core-graphics-types 0.1.3",
- "foreign-types 0.5.0",
+ "foreign-types",
  "libc",
 ]
 
@@ -3696,7 +1165,7 @@ dependencies = [
  "bitflags 2.9.4",
  "core-foundation 0.10.0",
  "core-graphics-types 0.2.0",
- "foreign-types 0.5.0",
+ "foreign-types",
  "libc",
 ]
 
@@ -3709,7 +1178,7 @@ dependencies = [
  "bitflags 2.9.4",
  "core-foundation 0.9.4",
  "core-graphics-types 0.1.3",
- "foreign-types 0.5.0",
+ "foreign-types",
  "libc",
 ]
 
@@ -3748,15 +1217,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "core-services"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92567e81db522550ebaf742c5d875624ec7820c2c7ee5f8c60e4ce7c2ae3c0fd"
-dependencies = [
- "core-foundation 0.9.4",
-]
-
 [[package]]
 name = "core-text"
 version = "21.0.0"
@@ -3765,7 +1225,7 @@ checksum = "a593227b66cbd4007b2a050dfdd9e1d1318311409c8d600dc82ba1b15ca9c130"
 dependencies = [
  "core-foundation 0.10.0",
  "core-graphics 0.24.0",
- "foreign-types 0.5.0",
+ "foreign-types",
  "libc",
 ]
 
@@ -3792,40 +1252,6 @@ dependencies = [
  "libm",
 ]
 
-[[package]]
-name = "coreaudio-rs"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34ca07354f6d0640333ef95f48d460a4bcf34812a7e7967f9b44c728a8f37c28"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation-sys",
- "coreaudio-sys",
-]
-
-[[package]]
-name = "coreaudio-rs"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1aae284fbaf7d27aa0e292f7677dfbe26503b0d555026f702940805a630eac17"
-dependencies = [
- "bitflags 1.3.2",
- "libc",
- "objc2-audio-toolbox",
- "objc2-core-audio",
- "objc2-core-audio-types",
- "objc2-core-foundation",
-]
-
-[[package]]
-name = "coreaudio-sys"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ceec7a6067e62d6f931a2baf6f3a751f4a892595bcec1461a3c94ef9949864b6"
-dependencies = [
- "bindgen 0.72.1",
-]
-
 [[package]]
 name = "cosmic-text"
 version = "0.14.2"
@@ -3849,41 +1275,6 @@ dependencies = [
  "unicode-segmentation",
 ]
 
-[[package]]
-name = "cpal"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbd307f43cc2a697e2d1f8bc7a1d824b5269e052209e28883e5bc04d095aaa3f"
-dependencies = [
- "alsa",
- "coreaudio-rs 0.13.0",
- "dasp_sample",
- "jni",
- "js-sys",
- "libc",
- "mach2 0.4.3",
- "ndk",
- "ndk-context",
- "num-derive",
- "num-traits",
- "objc2-audio-toolbox",
- "objc2-core-audio",
- "objc2-core-audio-types",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "windows 0.54.0",
-]
-
-[[package]]
-name = "cpp_demangle"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2bb79cb74d735044c972aae58ed0aaa9a837e85b01106a54c39e42e97f62253"
-dependencies = [
- "cfg-if",
-]
-
 [[package]]
 name = "cpufeatures"
 version = "0.2.17"
@@ -3893,189 +1284,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "cranelift-bforest"
-version = "0.116.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e15d04a0ce86cb36ead88ad68cf693ffd6cda47052b9e0ac114bc47fd9cd23c4"
-dependencies = [
- "cranelift-entity",
-]
-
-[[package]]
-name = "cranelift-bitset"
-version = "0.116.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c6e3969a7ce267259ce244b7867c5d3bc9e65b0a87e81039588dfdeaede9f34"
-dependencies = [
- "serde",
- "serde_derive",
-]
-
-[[package]]
-name = "cranelift-codegen"
-version = "0.116.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c22032c4cb42558371cf516bb47f26cdad1819d3475c133e93c49f50ebf304e"
-dependencies = [
- "bumpalo",
- "cranelift-bforest",
- "cranelift-bitset",
- "cranelift-codegen-meta",
- "cranelift-codegen-shared",
- "cranelift-control",
- "cranelift-entity",
- "cranelift-isle",
- "gimli 0.31.1",
- "hashbrown 0.14.5",
- "log",
- "postcard",
- "regalloc2",
- "rustc-hash 2.1.1",
- "serde",
- "serde_derive",
- "sha2",
- "smallvec",
- "target-lexicon 0.13.3",
-]
-
-[[package]]
-name = "cranelift-codegen-meta"
-version = "0.116.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c904bc71c61b27fc57827f4a1379f29de64fe95653b620a3db77d59655eee0b8"
-dependencies = [
- "cranelift-codegen-shared",
-]
-
-[[package]]
-name = "cranelift-codegen-shared"
-version = "0.116.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40180f5497572f644ce88c255480981ae2ec1d7bb4d8e0c0136a13b87a2f2ceb"
-
-[[package]]
-name = "cranelift-control"
-version = "0.116.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d132c6d0bd8a489563472afc171759da0707804a65ece7ceb15a8c6d7dd5ef"
-dependencies = [
- "arbitrary",
-]
-
-[[package]]
-name = "cranelift-entity"
-version = "0.116.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b2d0d9618275474fbf679dd018ac6e009acbd6ae6850f6a67be33fb3b00b323"
-dependencies = [
- "cranelift-bitset",
- "serde",
- "serde_derive",
-]
-
-[[package]]
-name = "cranelift-frontend"
-version = "0.116.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fac41e16729107393174b0c9e3730fb072866100e1e64e80a1a963b2e484d57"
-dependencies = [
- "cranelift-codegen",
- "log",
- "smallvec",
- "target-lexicon 0.13.3",
-]
-
-[[package]]
-name = "cranelift-isle"
-version = "0.116.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ca20d576e5070044d0a72a9effc2deacf4d6aa650403189d8ea50126483944d"
-
-[[package]]
-name = "cranelift-native"
-version = "0.116.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8dee82f3f1f2c4cba9177f1cc5e350fe98764379bcd29340caa7b01f85076c7"
-dependencies = [
- "cranelift-codegen",
- "libc",
- "target-lexicon 0.13.3",
-]
-
-[[package]]
-name = "crash-context"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "031ed29858d90cfdf27fe49fae28028a1f20466db97962fa2f4ea34809aeebf3"
-dependencies = [
- "cfg-if",
- "libc",
- "mach2 0.4.3",
-]
-
-[[package]]
-name = "crash-handler"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2066907075af649bcb8bcb1b9b986329b243677e6918b2d920aa64b0aac5ace3"
-dependencies = [
- "cfg-if",
- "crash-context",
- "libc",
- "mach2 0.4.3",
- "parking_lot",
-]
-
-[[package]]
-name = "crashes"
-version = "0.1.0"
-dependencies = [
- "bincode",
- "cfg-if",
- "crash-handler",
- "extension_host",
- "log",
- "mach2 0.5.0",
- "minidumper",
- "paths",
- "release_channel",
- "serde",
- "serde_json",
- "smol",
- "system_specs",
- "windows 0.61.3",
- "zstd",
-]
-
-[[package]]
-name = "crc"
-version = "3.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9710d3b3739c2e349eb44fe848ad0b7c8cb1e42bd87ee49371df2f7acaf3e675"
-dependencies = [
- "crc-catalog",
-]
-
-[[package]]
-name = "crc-catalog"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
-
-[[package]]
-name = "crc-fast"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bf62af4cc77d8fe1c22dde4e721d87f2f54056139d8c412e1366b740305f56f"
-dependencies = [
- "crc",
- "digest",
- "libc",
- "rand 0.9.2",
- "regex",
-]
-
 [[package]]
 name = "crc32fast"
 version = "1.5.0"
@@ -4085,77 +1293,6 @@ dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "credentials_provider"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "futures 0.3.31",
- "gpui",
- "paths",
- "release_channel",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "criterion"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f"
-dependencies = [
- "anes",
- "cast",
- "ciborium",
- "clap",
- "criterion-plot",
- "is-terminal",
- "itertools 0.10.5",
- "num-traits",
- "once_cell",
- "oorandom",
- "plotters",
- "rayon",
- "regex",
- "serde",
- "serde_derive",
- "serde_json",
- "tinytemplate",
- "walkdir",
-]
-
-[[package]]
-name = "criterion-plot"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1"
-dependencies = [
- "cast",
- "itertools 0.10.5",
-]
-
-[[package]]
-name = "crossbeam"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8"
-dependencies = [
- "crossbeam-channel",
- "crossbeam-deque",
- "crossbeam-epoch",
- "crossbeam-queue",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2"
-dependencies = [
- "crossbeam-utils",
-]
-
 [[package]]
 name = "crossbeam-deque"
 version = "0.8.6"
@@ -4196,28 +1333,6 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
 
-[[package]]
-name = "crypto-bigint"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef"
-dependencies = [
- "generic-array",
- "rand_core 0.6.4",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "crypto-bigint"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
-dependencies = [
- "rand_core 0.6.4",
- "subtle",
-]
-
 [[package]]
 name = "crypto-common"
 version = "0.1.6"
@@ -4229,29 +1344,6 @@ dependencies = [
  "typenum",
 ]
 
-[[package]]
-name = "cssparser"
-version = "0.35.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e901edd733a1472f944a45116df3f846f54d37e67e68640ac8bb69689aca2aa"
-dependencies = [
- "cssparser-macros",
- "dtoa-short",
- "itoa",
- "phf 0.11.3",
- "smallvec",
-]
-
-[[package]]
-name = "cssparser-macros"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
-dependencies = [
- "quote",
- "syn 2.0.106",
-]
-
 [[package]]
 name = "ctor"
 version = "0.4.3"
@@ -4268,473 +1360,31 @@ version = "0.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2931af7e13dc045d8e9d26afccc6fa115d64e115c9c84b1166288b46f6782c2"
 
-[[package]]
-name = "ctrlc"
-version = "3.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "881c5d0a13b2f1498e2306e82cbada78390e152d4b1378fb28a84f4dcd0dc4f3"
-dependencies = [
- "dispatch",
- "nix 0.30.1",
- "windows-sys 0.61.2",
-]
-
-[[package]]
-name = "cursor-icon"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f27ae1dd37df86211c42e150270f82743308803d90a6f6e6651cd730d5e1732f"
-
-[[package]]
-name = "cxx"
-version = "1.0.187"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8465678d499296e2cbf9d3acf14307458fd69b471a31b65b3c519efe8b5e187"
-dependencies = [
- "cc",
- "cxx-build",
- "cxxbridge-cmd",
- "cxxbridge-flags",
- "cxxbridge-macro",
- "foldhash 0.2.0",
- "link-cplusplus",
-]
-
-[[package]]
-name = "cxx-build"
-version = "1.0.187"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d74b6bcf49ebbd91f1b1875b706ea46545032a14003b5557b7dfa4bbeba6766e"
-dependencies = [
- "cc",
- "codespan-reporting 0.13.0",
- "indexmap",
- "proc-macro2",
- "quote",
- "scratch",
- "syn 2.0.106",
-]
-
-[[package]]
-name = "cxxbridge-cmd"
-version = "1.0.187"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94ca2ad69673c4b35585edfa379617ac364bccd0ba0adf319811ba3a74ffa48a"
-dependencies = [
- "clap",
- "codespan-reporting 0.13.0",
- "indexmap",
- "proc-macro2",
- "quote",
- "syn 2.0.106",
-]
-
-[[package]]
-name = "cxxbridge-flags"
-version = "1.0.187"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29b52102aa395386d77d322b3a0522f2035e716171c2c60aa87cc5e9466e523"
-
-[[package]]
-name = "cxxbridge-macro"
-version = "1.0.187"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a8ebf0b6138325af3ec73324cb3a48b64d57721f17291b151206782e61f66cd"
-dependencies = [
- "indexmap",
- "proc-macro2",
- "quote",
- "syn 2.0.106",
-]
-
-[[package]]
-name = "dap"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "async-compression",
- "async-pipe",
- "async-tar",
- "async-trait",
- "client",
- "collections",
- "dap-types",
- "fs",
- "futures 0.3.31",
- "gpui",
- "http_client",
- "language",
- "libc",
- "log",
- "node_runtime",
- "parking_lot",
- "paths",
- "proto",
- "schemars",
- "serde",
- "serde_json",
- "settings",
- "smallvec",
- "smol",
- "task",
- "telemetry",
- "tree-sitter",
- "tree-sitter-go",
- "util",
- "zlog",
-]
-
-[[package]]
-name = "dap-types"
-version = "0.0.1"
-source = "git+https://github.com/zed-industries/dap-types?rev=1b461b310481d01e02b2603c16d7144b926339f8#1b461b310481d01e02b2603c16d7144b926339f8"
-dependencies = [
- "schemars",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "dap_adapters"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "async-trait",
- "collections",
- "dap",
- "dotenvy",
- "fs",
- "futures 0.3.31",
- "gpui",
- "http_client",
- "json_dotpath",
- "language",
- "log",
- "node_runtime",
- "paths",
- "serde",
- "serde_json",
- "settings",
- "smol",
- "task",
- "util",
-]
-
-[[package]]
-name = "darling"
-version = "0.20.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee"
-dependencies = [
- "darling_core",
- "darling_macro",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.20.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim",
- "syn 2.0.106",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.20.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
-dependencies = [
- "darling_core",
- "quote",
- "syn 2.0.106",
-]
-
-[[package]]
-name = "dashmap"
-version = "5.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
-dependencies = [
- "cfg-if",
- "hashbrown 0.14.5",
- "lock_api",
- "once_cell",
- "parking_lot_core",
-]
-
-[[package]]
-name = "dashmap"
-version = "6.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf"
-dependencies = [
- "cfg-if",
- "crossbeam-utils",
- "hashbrown 0.14.5",
- "lock_api",
- "once_cell",
- "parking_lot_core",
-]
-
-[[package]]
-name = "dasp_sample"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f"
-
-[[package]]
-name = "data-encoding"
-version = "2.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476"
-
 [[package]]
 name = "data-url"
 version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be1e0bca6c3637f992fc1cc7cbc52a78c1ef6db076dbf1059c4323d6a2048376"
 
-[[package]]
-name = "db"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "gpui",
- "indoc",
- "log",
- "paths",
- "release_channel",
- "smol",
- "sqlez",
- "sqlez_macros",
- "tempfile",
- "util",
- "zed_env_vars",
-]
-
-[[package]]
-name = "dbus"
-version = "0.9.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "190b6255e8ab55a7b568df5a883e9497edc3e4821c06396612048b430e5ad1e9"
-dependencies = [
- "libc",
- "libdbus-sys",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "debug_adapter_extension"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "async-trait",
- "collections",
- "dap",
- "extension",
- "gpui",
- "serde_json",
- "task",
- "util",
-]
-
-[[package]]
-name = "debugger_tools"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "dap",
- "editor",
- "futures 0.3.31",
- "gpui",
- "project",
- "serde_json",
- "settings",
- "smol",
- "util",
- "workspace",
-]
-
-[[package]]
-name = "debugger_ui"
-version = "0.1.0"
-dependencies = [
- "alacritty_terminal",
- "anyhow",
- "bitflags 2.9.4",
- "client",
- "collections",
- "command_palette_hooks",
- "dap",
- "dap_adapters",
- "db",
- "debugger_tools",
- "editor",
- "feature_flags",
- "file_icons",
- "futures 0.3.31",
- "fuzzy",
- "gpui",
- "hex",
- "indoc",
- "itertools 0.14.0",
- "language",
- "log",
- "menu",
- "notifications",
- "parking_lot",
- "parse_int",
- "paths",
- "picker",
- "pretty_assertions",
- "project",
- "rpc",
- "schemars",
- "serde",
- "serde_json",
- "serde_json_lenient",
- "settings",
- "sysinfo 0.37.2",
- "task",
- "tasks_ui",
- "telemetry",
- "terminal_view",
- "text",
- "theme",
- "tree-sitter",
- "tree-sitter-go",
- "tree-sitter-json",
- "ui",
- "ui_input",
- "unindent",
- "util",
- "workspace",
- "zed_actions",
- "zlog",
-]
-
-[[package]]
-name = "debugid"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d"
-dependencies = [
- "uuid",
-]
-
-[[package]]
-name = "deepseek"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "futures 0.3.31",
- "http_client",
- "schemars",
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "deflate64"
 version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "26bf8fc351c5ed29b5c2f0cbbac1b209b74f60ecd62e675a998df72c49af5204"
 
-[[package]]
-name = "denoise"
-version = "0.1.0"
-dependencies = [
- "candle-core",
- "candle-onnx",
- "log",
- "realfft",
- "rodio",
- "rustfft",
- "thiserror 2.0.17",
-]
-
-[[package]]
-name = "der"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de"
-dependencies = [
- "const-oid",
- "zeroize",
-]
-
-[[package]]
-name = "der"
-version = "0.7.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb"
-dependencies = [
- "const-oid",
- "pem-rfc7468",
- "zeroize",
-]
-
-[[package]]
-name = "deranged"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a41953f86f8a05768a6cda24def994fd2f424b04ec5c719cf89989779f199071"
-dependencies = [
- "powerfmt",
- "serde_core",
-]
-
-[[package]]
-name = "derive_arbitrary"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.106",
-]
-
 [[package]]
 name = "derive_more"
 version = "0.99.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6edb4b64a43d977b8e99788fe3a04d483834fba1215a7e02caa415b626497f7f"
 dependencies = [
- "convert_case 0.4.0",
+ "convert_case",
  "proc-macro2",
  "quote",
  "rustc_version",
  "syn 2.0.106",
 ]
 
-[[package]]
-name = "derive_more"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678"
-dependencies = [
- "derive_more-impl",
-]
-
-[[package]]
-name = "derive_more-impl"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.106",
- "unicode-xid",
-]
-
 [[package]]
 name = "derive_refineable"
 version = "0.1.0"
@@ -4744,85 +1394,12 @@ dependencies = [
  "syn 2.0.106",
 ]
 
-[[package]]
-name = "derive_setters"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae5c625eda104c228c06ecaf988d1c60e542176bd7a490e60eeda3493244c0c9"
-dependencies = [
- "darling",
- "proc-macro2",
- "quote",
- "syn 2.0.106",
-]
-
-[[package]]
-name = "deunicode"
-version = "1.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abd57806937c9cc163efc8ea3910e00a62e2aeb0b8119f1793a978088f8f6b04"
-
-[[package]]
-name = "diagnostics"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "client",
- "collections",
- "component",
- "ctor",
- "editor",
- "gpui",
- "indoc",
- "itertools 0.14.0",
- "language",
- "log",
- "lsp",
- "markdown",
- "pretty_assertions",
- "project",
- "rand 0.9.2",
- "serde",
- "serde_json",
- "settings",
- "text",
- "theme",
- "ui",
- "unindent",
- "util",
- "workspace",
- "zlog",
-]
-
-[[package]]
-name = "dialoguer"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "658bce805d770f407bc62102fca7c2c64ceef2fbcb2b8bd19d2765ce093980de"
-dependencies = [
- "console",
- "fuzzy-matcher",
- "shell-words",
- "tempfile",
- "thiserror 1.0.69",
- "zeroize",
-]
-
 [[package]]
 name = "diff"
 version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
 
-[[package]]
-name = "diffy"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b545b8c50194bdd008283985ab0b31dba153cfd5b3066a92770634fbc0d7d291"
-dependencies = [
- "nu-ansi-term",
-]
-
 [[package]]
 name = "digest"
 version = "0.10.7"
@@ -4830,7 +1407,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
  "block-buffer",
- "const-oid",
  "crypto-common",
  "subtle",
 ]
@@ -4853,15 +1429,6 @@ dependencies = [
  "dirs-sys 0.4.1",
 ]
 
-[[package]]
-name = "dirs"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e"
-dependencies = [
- "dirs-sys 0.5.0",
-]
-
 [[package]]
 name = "dirs-sys"
 version = "0.3.7"
@@ -4869,7 +1436,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
 dependencies = [
  "libc",
- "redox_users 0.4.6",
+ "redox_users",
  "winapi",
 ]
 
@@ -4881,22 +1448,10 @@ checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
 dependencies = [
  "libc",
  "option-ext",
- "redox_users 0.4.6",
+ "redox_users",
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "dirs-sys"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab"
-dependencies = [
- "libc",
- "option-ext",
- "redox_users 0.5.2",
- "windows-sys 0.61.2",
-]
-
 [[package]]
 name = "dispatch"
 version = "0.2.0"
@@ -4933,87 +1488,12 @@ dependencies = [
  "libloading",
 ]
 
-[[package]]
-name = "docs_preprocessor"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "command_palette",
- "gpui",
- "mdbook",
- "regex",
- "serde",
- "serde_json",
- "settings",
- "task",
- "theme",
- "util",
- "zed",
- "zlog",
-]
-
-[[package]]
-name = "documented"
-version = "0.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed6b3e31251e87acd1b74911aed84071c8364fc9087972748ade2f1094ccce34"
-dependencies = [
- "documented-macros",
- "phf 0.12.1",
- "thiserror 2.0.17",
-]
-
-[[package]]
-name = "documented-macros"
-version = "0.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1149cf7462e5e79e17a3c05fd5b1f9055092bbfa95e04c319395c3beacc9370f"
-dependencies = [
- "convert_case 0.8.0",
- "itertools 0.14.0",
- "optfield",
- "proc-macro2",
- "quote",
- "strum 0.27.2",
- "syn 2.0.106",
-]
-
-[[package]]
-name = "dotenvy"
-version = "0.15.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
-
 [[package]]
 name = "downcast-rs"
 version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
 
-[[package]]
-name = "doxygen-rs"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "415b6ec780d34dcf624666747194393603d0373b7141eef01d12ee58881507d9"
-dependencies = [
- "phf 0.11.3",
-]
-
-[[package]]
-name = "dtoa"
-version = "1.0.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6add3b8cff394282be81f3fc1a0605db594ed69890078ca6e2cab1c408bcf04"
-
-[[package]]
-name = "dtoa-short"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87"
-dependencies = [
- "dtoa",
-]
-
 [[package]]
 name = "dtor"
 version = "0.0.6"
@@ -5053,367 +1533,11 @@ version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
 
-[[package]]
-name = "dyn-stack"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56e53799688f5632f364f8fb387488dd05db9fe45db7011be066fc20e7027f8b"
-dependencies = [
- "bytemuck",
- "reborrow",
-]
-
-[[package]]
-name = "dyn-stack"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c4713e43e2886ba72b8271aa66c93d722116acf7a75555cce11dcde84388fe8"
-dependencies = [
- "bytemuck",
- "dyn-stack-macros",
-]
-
-[[package]]
-name = "dyn-stack-macros"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1d926b4d407d372f141f93bb444696142c29d32962ccbd3531117cf3aa0bfa9"
-
-[[package]]
-name = "ec4rs"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b31a881d38439026e3d5dd938ab20328d36e23caca8fd5981c42e4b677f5842"
-
-[[package]]
-name = "ecdsa"
-version = "0.14.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c"
-dependencies = [
- "der 0.6.1",
- "elliptic-curve",
- "rfc6979",
- "signature 1.6.4",
-]
-
-[[package]]
-name = "edit_prediction"
-version = "0.1.0"
-dependencies = [
- "ai_onboarding",
- "anyhow",
- "arrayvec",
- "brotli",
- "client",
- "clock",
- "cloud_api_types",
- "cloud_llm_client",
- "collections",
- "copilot",
- "credentials_provider",
- "ctor",
- "db",
- "edit_prediction_context",
- "edit_prediction_types",
- "feature_flags",
- "fs",
- "futures 0.3.31",
- "gpui",
- "indoc",
- "itertools 0.14.0",
- "language",
- "language_model",
- "log",
- "lsp",
- "menu",
- "open_ai",
- "parking_lot",
- "postage",
- "pretty_assertions",
- "project",
- "rand 0.9.2",
- "regex",
- "release_channel",
- "semver",
- "serde",
- "serde_json",
- "settings",
- "strum 0.27.2",
- "telemetry",
- "telemetry_events",
- "thiserror 2.0.17",
- "ui",
- "util",
- "uuid",
- "workspace",
- "worktree",
- "zed_actions",
- "zeta_prompt",
- "zlog",
-]
-
-[[package]]
-name = "edit_prediction_cli"
-version = "0.1.0"
-dependencies = [
- "anthropic",
- "anyhow",
- "chrono",
- "clap",
- "client",
- "cloud_llm_client",
- "collections",
- "debug_adapter_extension",
- "dirs 4.0.0",
- "edit_prediction",
- "extension",
- "fs",
- "futures 0.3.31",
- "gpui",
- "gpui_tokio",
- "http_client",
- "indoc",
- "language",
- "language_extension",
- "language_model",
- "language_models",
- "languages",
- "libc",
- "log",
- "node_runtime",
- "paths",
- "pretty_assertions",
- "project",
- "prompt_store",
- "pulldown-cmark 0.12.2",
- "release_channel",
- "reqwest_client",
- "serde",
- "serde_json",
- "settings",
- "shellexpand 2.1.2",
- "smol",
- "sqlez",
- "sqlez_macros",
- "terminal_view",
- "util",
- "wasmtime",
- "watch",
- "zeta_prompt",
-]
-
-[[package]]
-name = "edit_prediction_context"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "cloud_llm_client",
- "collections",
- "env_logger 0.11.8",
- "futures 0.3.31",
- "gpui",
- "indoc",
- "language",
- "log",
- "lsp",
- "parking_lot",
- "pretty_assertions",
- "project",
- "serde",
- "serde_json",
- "settings",
- "smallvec",
- "text",
- "tree-sitter",
- "util",
- "zeta_prompt",
- "zlog",
-]
-
-[[package]]
-name = "edit_prediction_types"
-version = "0.1.0"
-dependencies = [
- "client",
- "gpui",
- "language",
- "text",
-]
-
-[[package]]
-name = "edit_prediction_ui"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "buffer_diff",
- "client",
- "cloud_llm_client",
- "codestral",
- "command_palette_hooks",
- "copilot",
- "edit_prediction",
- "edit_prediction_types",
- "editor",
- "feature_flags",
- "fs",
- "futures 0.3.31",
- "gpui",
- "indoc",
- "language",
- "lsp",
- "markdown",
- "menu",
- "multi_buffer",
- "paths",
- "project",
- "regex",
- "serde_json",
- "settings",
- "supermaven",
- "telemetry",
- "text",
- "theme",
- "ui",
- "ui_input",
- "util",
- "workspace",
- "zed_actions",
- "zeta_prompt",
-]
-
-[[package]]
-name = "editor"
-version = "0.1.0"
-dependencies = [
- "aho-corasick",
- "anyhow",
- "assets",
- "buffer_diff",
- "client",
- "clock",
- "collections",
- "convert_case 0.8.0",
- "criterion",
- "ctor",
- "dap",
- "db",
- "edit_prediction_types",
- "emojis",
- "feature_flags",
- "file_icons",
- "fs",
- "futures 0.3.31",
- "fuzzy",
- "git",
- "gpui",
- "http_client",
- "indoc",
- "itertools 0.14.0",
- "language",
- "languages",
- "linkify",
- "log",
- "lsp",
- "markdown",
- "menu",
- "multi_buffer",
- "ordered-float 2.10.1",
- "parking_lot",
- "pretty_assertions",
- "project",
- "rand 0.9.2",
- "regex",
- "release_channel",
- "rope",
- "rpc",
- "schemars",
- "semver",
- "serde",
- "serde_json",
- "settings",
- "smallvec",
- "smol",
- "snippet",
- "sum_tree",
- "task",
- "telemetry",
- "tempfile",
- "text",
- "theme",
- "time",
- "tracing",
- "tree-sitter-bash",
- "tree-sitter-c",
- "tree-sitter-html",
- "tree-sitter-md",
- "tree-sitter-python",
- "tree-sitter-rust",
- "tree-sitter-typescript",
- "tree-sitter-yaml",
- "ui",
- "unicode-script",
- "unicode-segmentation",
- "unindent",
- "url",
- "util",
- "uuid",
- "vim_mode_setting",
- "workspace",
- "zed_actions",
- "zlog",
- "ztracing",
-]
-
 [[package]]
 name = "either"
 version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "elasticlunr-rs"
-version = "3.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41e83863a500656dfa214fee6682de9c5b9f03de6860fec531235ed2ae9f6571"
-dependencies = [
- "regex",
- "serde",
- "serde_derive",
- "serde_json",
-]
-
-[[package]]
-name = "elliptic-curve"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3"
-dependencies = [
- "base16ct",
- "crypto-bigint 0.4.9",
- "der 0.6.1",
- "digest",
- "ff",
- "generic-array",
- "group",
- "pkcs8 0.9.0",
- "rand_core 0.6.4",
- "sec1",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "email_address"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e079f19b08ca6239f47f8ba8509c11cf3ea30095831f7fed61441475edd8c449"
-dependencies = [
- "serde",
-]
 
 [[package]]
 name = "embed-resource"
@@ -5426,36 +1550,9 @@ dependencies = [
  "rustc_version",
  "toml 0.9.8",
  "vswhom",
- "winreg 0.55.0",
+ "winreg",
 ]
 
-[[package]]
-name = "embedded-io"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced"
-
-[[package]]
-name = "embedded-io"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d"
-
-[[package]]
-name = "emojis"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99e1f1df1f181f2539bac8bf027d31ca5ffbf9e559e3f2d09413b9107b5c02f4"
-dependencies = [
- "phf 0.11.3",
-]
-
-[[package]]
-name = "encode_unicode"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
-
 [[package]]
 name = "encoding_rs"
 version = "0.8.35"
@@ -5471,18 +1568,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf"
 
-[[package]]
-name = "enum-as-inner"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc"
-dependencies = [
- "heck 0.5.0",
- "proc-macro2",
- "quote",
- "syn 2.0.106",
-]
-
 [[package]]
 name = "enumflags2"
 version = "0.7.12"
@@ -5514,19 +1599,6 @@ dependencies = [
  "regex",
 ]
 
-[[package]]
-name = "env_logger"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580"
-dependencies = [
- "humantime",
- "is-terminal",
- "log",
- "regex",
- "termcolor",
-]
-
 [[package]]
 name = "env_logger"
 version = "0.11.8"
@@ -5540,15 +1612,6 @@ dependencies = [
  "log",
 ]
 
-[[package]]
-name = "envy"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f47e0157f2cb54f5ae1bd371b30a2ae4311e1c028f575cd4e81de7353215965"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "equator"
 version = "0.4.2"
@@ -5586,17 +1649,6 @@ dependencies = [
  "typeid",
 ]
 
-[[package]]
-name = "errno"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
-dependencies = [
- "errno-dragonfly",
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "errno"
 version = "0.3.14"
@@ -5607,16 +1659,6 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
-[[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
-dependencies = [
- "cc",
- "libc",
-]
-
 [[package]]
 name = "etagere"
 version = "0.2.15"
@@ -5627,17 +1669,6 @@ dependencies = [
  "svg_fmt",
 ]
 
-[[package]]
-name = "etcetera"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943"
-dependencies = [
- "cfg-if",
- "home",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "euclid"
 version = "0.22.11"
@@ -5647,70 +1678,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "eval"
-version = "0.1.0"
-dependencies = [
- "acp_thread",
- "agent",
- "agent-client-protocol",
- "agent_settings",
- "agent_ui",
- "anyhow",
- "async-trait",
- "buffer_diff",
- "chrono",
- "clap",
- "client",
- "collections",
- "debug_adapter_extension",
- "dirs 4.0.0",
- "dotenvy",
- "env_logger 0.11.8",
- "extension",
- "fs",
- "futures 0.3.31",
- "gpui",
- "gpui_tokio",
- "handlebars 4.5.0",
- "language",
- "language_extension",
- "language_model",
- "language_models",
- "languages",
- "markdown",
- "node_runtime",
- "pathdiff",
- "paths",
- "pretty_assertions",
- "project",
- "prompt_store",
- "rand 0.9.2",
- "regex",
- "release_channel",
- "reqwest_client",
- "serde",
- "serde_json",
- "settings",
- "shellexpand 2.1.2",
- "telemetry",
- "terminal_view",
- "toml 0.8.23",
- "unindent",
- "util",
- "uuid",
- "watch",
-]
-
-[[package]]
-name = "eval_utils"
-version = "0.1.0"
-dependencies = [
- "gpui",
- "serde",
- "smol",
-]
-
 [[package]]
 name = "event-listener"
 version = "2.5.3"
@@ -5738,25 +1705,6 @@ dependencies = [
  "pin-project-lite",
 ]
 
-[[package]]
-name = "exec"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "886b70328cba8871bfc025858e1de4be16b1d5088f2ba50b57816f4210672615"
-dependencies = [
- "errno 0.2.8",
- "libc",
-]
-
-[[package]]
-name = "explorer_command_injector"
-version = "0.1.0"
-dependencies = [
- "windows 0.61.3",
- "windows-core 0.61.2",
- "windows-registry 0.5.3",
-]
-
 [[package]]
 name = "exr"
 version = "1.73.0"
@@ -5772,175 +1720,6 @@ dependencies = [
  "zune-inflate",
 ]
 
-[[package]]
-name = "extended"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af9673d8203fcb076b19dfd17e38b3d4ae9f44959416ea532ce72415a6020365"
-
-[[package]]
-name = "extension"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "async-trait",
- "collections",
- "dap",
- "fs",
- "futures 0.3.31",
- "gpui",
- "heck 0.5.0",
- "http_client",
- "indoc",
- "language",
- "log",
- "lsp",
- "parking_lot",
- "pretty_assertions",
- "proto",
- "semver",
- "serde",
- "serde_json",
- "task",
- "tempfile",
- "toml 0.8.23",
- "url",
- "util",
- "wasm-encoder 0.221.3",
- "wasmparser 0.221.3",
-]
-
-[[package]]
-name = "extension_cli"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "clap",
- "env_logger 0.11.8",
- "extension",
- "fs",
- "gpui",
- "language",
- "log",
- "reqwest_client",
- "rpc",
- "serde",
- "serde_json",
- "theme",
- "tokio",
- "toml 0.8.23",
- "tree-sitter",
- "wasmtime",
-]
-
-[[package]]
-name = "extension_host"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "async-compression",
- "async-tar",
- "async-trait",
- "client",
- "collections",
- "criterion",
- "ctor",
- "dap",
- "extension",
- "fs",
- "futures 0.3.31",
- "gpui",
- "gpui_tokio",
- "http_client",
- "language",
- "language_extension",
- "log",
- "lsp",
- "moka",
- "node_runtime",
- "parking_lot",
- "paths",
- "project",
- "rand 0.9.2",
- "release_channel",
- "remote",
- "reqwest_client",
- "semver",
- "serde",
- "serde_json",
- "serde_json_lenient",
- "settings",
- "task",
- "telemetry",
- "tempfile",
- "theme",
- "theme_extension",
- "toml 0.8.23",
- "url",
- "util",
- "wasmparser 0.221.3",
- "wasmtime",
- "wasmtime-wasi",
- "zlog",
-]
-
-[[package]]
-name = "extensions_ui"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "client",
- "collections",
- "db",
- "editor",
- "extension",
- "extension_host",
- "fs",
- "fuzzy",
- "gpui",
- "language",
- "log",
- "num-format",
- "picker",
- "project",
- "release_channel",
- "semver",
- "serde",
- "settings",
- "smallvec",
- "strum 0.27.2",
- "telemetry",
- "theme",
- "ui",
- "util",
- "vim_mode_setting",
- "workspace",
- "zed_actions",
-]
-
-[[package]]
-name = "fallible-iterator"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649"
-
-[[package]]
-name = "fancy-regex"
-version = "0.16.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "998b056554fbe42e03ae0e152895cd1a7e1002aec800fdc6635d20270260c46f"
-dependencies = [
- "bit-set",
- "regex-automata",
- "regex-syntax",
-]
-
-[[package]]
-name = "fast-srgb8"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1"
-
 [[package]]
 name = "fastrand"
 version = "1.9.0"
@@ -5976,17 +1755,6 @@ dependencies = [
  "syn 2.0.106",
 ]
 
-[[package]]
-name = "fd-lock"
-version = "4.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ce92ff622d6dadf7349484f42c93271a0d49b7cc4d466a936405bacbe10aa78"
-dependencies = [
- "cfg-if",
- "rustix 1.1.2",
- "windows-sys 0.59.0",
-]
-
 [[package]]
 name = "fdeflate"
 version = "0.3.7"
@@ -5996,78 +1764,6 @@ dependencies = [
  "simd-adler32",
 ]
 
-[[package]]
-name = "feature_flags"
-version = "0.1.0"
-dependencies = [
- "futures 0.3.31",
- "gpui",
- "smol",
-]
-
-[[package]]
-name = "feedback"
-version = "0.1.0"
-dependencies = [
- "editor",
- "gpui",
- "system_specs",
- "urlencoding",
- "util",
- "workspace",
- "zed_actions",
-]
-
-[[package]]
-name = "ff"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160"
-dependencies = [
- "rand_core 0.6.4",
- "subtle",
-]
-
-[[package]]
-name = "file_finder"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "collections",
- "ctor",
- "editor",
- "file_icons",
- "futures 0.3.31",
- "fuzzy",
- "gpui",
- "language",
- "menu",
- "picker",
- "pretty_assertions",
- "project",
- "schemars",
- "search",
- "serde",
- "serde_json",
- "settings",
- "text",
- "theme",
- "ui",
- "util",
- "workspace",
- "zlog",
-]
-
-[[package]]
-name = "file_icons"
-version = "0.1.0"
-dependencies = [
- "gpui",
- "serde",
- "theme",
- "util",
-]
-
 [[package]]
 name = "filedescriptor"
 version = "0.8.3"
@@ -6097,12 +1793,6 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127"
 
-[[package]]
-name = "fixedbitset"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
-
 [[package]]
 name = "flate2"
 version = "1.1.4"
@@ -6125,35 +1815,12 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ce81f49ae8a0482e4c55ea62ebbd7e5a686af544c00b9d090bba3ff9be97b3d"
 
-[[package]]
-name = "float8"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4203231de188ebbdfb85c11f3c20ca2b063945710de04e7b59268731e728b462"
-dependencies = [
- "half",
- "num-traits",
- "rand 0.9.2",
- "rand_distr",
-]
-
 [[package]]
 name = "float_next_after"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8"
 
-[[package]]
-name = "fluent-uri"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc74ac4d8359ae70623506d512209619e5cf8f347124910440dbc221714b328e"
-dependencies = [
- "borrow-or-share",
- "ref-cast",
- "serde",
-]
-
 [[package]]
 name = "flume"
 version = "0.11.1"
@@ -6178,12 +1845,6 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
 
-[[package]]
-name = "foldhash"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
-
 [[package]]
 name = "font-types"
 version = "0.10.0"
@@ -6230,15 +1891,6 @@ dependencies = [
  "ttf-parser 0.25.1",
 ]
 
-[[package]]
-name = "foreign-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-dependencies = [
- "foreign-types-shared 0.1.1",
-]
-
 [[package]]
 name = "foreign-types"
 version = "0.5.0"
@@ -6246,7 +1898,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
 dependencies = [
  "foreign-types-macros",
- "foreign-types-shared 0.3.1",
+ "foreign-types-shared",
 ]
 
 [[package]]
@@ -6260,27 +1912,12 @@ dependencies = [
  "syn 2.0.106",
 ]
 
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
 [[package]]
 name = "foreign-types-shared"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
 
-[[package]]
-name = "fork"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30268f1eefccc9d72f43692e8b89e659aeb52e84016c3b32b6e7e9f1c8f38f94"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "form_urlencoded"
 version = "1.2.2"
@@ -6290,16 +1927,6 @@ dependencies = [
  "percent-encoding",
 ]
 
-[[package]]
-name = "fraction"
-version = "0.15.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f158e3ff0a1b334408dc9fb811cd99b446986f4d8b741bb08f9df1604085ae7"
-dependencies = [
- "lazy_static",
- "num",
-]
-
 [[package]]
 name = "freetype-sys"
 version = "0.20.1"
@@ -6311,111 +1938,12 @@ dependencies = [
  "pkg-config",
 ]
 
-[[package]]
-name = "fs"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "ashpd 0.11.0",
- "async-tar",
- "async-trait",
- "cocoa 0.26.0",
- "collections",
- "fsevent",
- "futures 0.3.31",
- "git",
- "gpui",
- "ignore",
- "is_executable",
- "libc",
- "log",
- "notify 8.2.0",
- "objc",
- "parking_lot",
- "paths",
- "proto",
- "rope",
- "serde",
- "serde_json",
- "smol",
- "tempfile",
- "text",
- "time",
- "util",
- "windows 0.61.3",
-]
-
-[[package]]
-name = "fs-set-times"
-version = "0.20.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94e7099f6313ecacbe1256e8ff9d617b75d1bcb16a6fddef94866d225a01a14a"
-dependencies = [
- "io-lifetimes",
- "rustix 1.1.2",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "fs2"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "fs_benchmarks"
-version = "0.1.0"
-dependencies = [
- "fs",
- "gpui",
-]
-
 [[package]]
 name = "fs_extra"
 version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
 
-[[package]]
-name = "fsevent"
-version = "0.1.0"
-dependencies = [
- "bitflags 2.9.4",
- "core-foundation 0.10.0",
- "fsevent-sys 3.1.0",
- "log",
- "parking_lot",
- "tempfile",
-]
-
-[[package]]
-name = "fsevent-sys"
-version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca6f5e6817058771c10f0eb0f05ddf1e35844266f972004fe8e4b21fda295bd5"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "fsevent-sys"
-version = "4.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "funty"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
-
 [[package]]
 name = "futf"
 version = "0.1.5"
@@ -6426,12 +1954,6 @@ dependencies = [
  "new_debug_unreachable",
 ]
 
-[[package]]
-name = "futures"
-version = "0.1.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678"
-
 [[package]]
 name = "futures"
 version = "0.3.31"
@@ -6474,17 +1996,6 @@ dependencies = [
  "futures-util",
 ]
 
-[[package]]
-name = "futures-intrusive"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f"
-dependencies = [
- "futures-core",
- "lock_api",
- "parking_lot",
-]
-
 [[package]]
 name = "futures-io"
 version = "0.3.31"
@@ -6548,7 +2059,6 @@ version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
- "futures 0.1.31",
  "futures-channel",
  "futures-core",
  "futures-io",
@@ -6559,285 +2069,6 @@ dependencies = [
  "pin-project-lite",
  "pin-utils",
  "slab",
- "tokio-io",
-]
-
-[[package]]
-name = "fuzzy"
-version = "0.1.0"
-dependencies = [
- "gpui",
- "log",
- "util",
-]
-
-[[package]]
-name = "fuzzy-matcher"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94"
-dependencies = [
- "thread_local",
-]
-
-[[package]]
-name = "fxhash"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
-dependencies = [
- "byteorder",
-]
-
-[[package]]
-name = "gemm"
-version = "0.17.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ab24cc62135b40090e31a76a9b2766a501979f3070fa27f689c27ec04377d32"
-dependencies = [
- "dyn-stack 0.10.0",
- "gemm-c32 0.17.1",
- "gemm-c64 0.17.1",
- "gemm-common 0.17.1",
- "gemm-f16 0.17.1",
- "gemm-f32 0.17.1",
- "gemm-f64 0.17.1",
- "num-complex",
- "num-traits",
- "paste",
- "raw-cpuid 10.7.0",
- "seq-macro",
-]
-
-[[package]]
-name = "gemm"
-version = "0.18.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab96b703d31950f1aeddded248bc95543c9efc7ac9c4a21fda8703a83ee35451"
-dependencies = [
- "dyn-stack 0.13.2",
- "gemm-c32 0.18.2",
- "gemm-c64 0.18.2",
- "gemm-common 0.18.2",
- "gemm-f16 0.18.2",
- "gemm-f32 0.18.2",
- "gemm-f64 0.18.2",
- "num-complex",
- "num-traits",
- "paste",
- "raw-cpuid 11.6.0",
- "seq-macro",
-]
-
-[[package]]
-name = "gemm-c32"
-version = "0.17.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9c030d0b983d1e34a546b86e08f600c11696fde16199f971cd46c12e67512c0"
-dependencies = [
- "dyn-stack 0.10.0",
- "gemm-common 0.17.1",
- "num-complex",
- "num-traits",
- "paste",
- "raw-cpuid 10.7.0",
- "seq-macro",
-]
-
-[[package]]
-name = "gemm-c32"
-version = "0.18.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6db9fd9f40421d00eea9dd0770045a5603b8d684654816637732463f4073847"
-dependencies = [
- "dyn-stack 0.13.2",
- "gemm-common 0.18.2",
- "num-complex",
- "num-traits",
- "paste",
- "raw-cpuid 11.6.0",
- "seq-macro",
-]
-
-[[package]]
-name = "gemm-c64"
-version = "0.17.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbb5f2e79fefb9693d18e1066a557b4546cd334b226beadc68b11a8f9431852a"
-dependencies = [
- "dyn-stack 0.10.0",
- "gemm-common 0.17.1",
- "num-complex",
- "num-traits",
- "paste",
- "raw-cpuid 10.7.0",
- "seq-macro",
-]
-
-[[package]]
-name = "gemm-c64"
-version = "0.18.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfcad8a3d35a43758330b635d02edad980c1e143dc2f21e6fd25f9e4eada8edf"
-dependencies = [
- "dyn-stack 0.13.2",
- "gemm-common 0.18.2",
- "num-complex",
- "num-traits",
- "paste",
- "raw-cpuid 11.6.0",
- "seq-macro",
-]
-
-[[package]]
-name = "gemm-common"
-version = "0.17.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2e7ea062c987abcd8db95db917b4ffb4ecdfd0668471d8dc54734fdff2354e8"
-dependencies = [
- "bytemuck",
- "dyn-stack 0.10.0",
- "half",
- "num-complex",
- "num-traits",
- "once_cell",
- "paste",
- "pulp 0.18.22",
- "raw-cpuid 10.7.0",
- "rayon",
- "seq-macro",
- "sysctl 0.5.5",
-]
-
-[[package]]
-name = "gemm-common"
-version = "0.18.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a352d4a69cbe938b9e2a9cb7a3a63b7e72f9349174a2752a558a8a563510d0f3"
-dependencies = [
- "bytemuck",
- "dyn-stack 0.13.2",
- "half",
- "libm",
- "num-complex",
- "num-traits",
- "once_cell",
- "paste",
- "pulp 0.21.5",
- "raw-cpuid 11.6.0",
- "rayon",
- "seq-macro",
- "sysctl 0.6.0",
-]
-
-[[package]]
-name = "gemm-f16"
-version = "0.17.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ca4c06b9b11952071d317604acb332e924e817bd891bec8dfb494168c7cedd4"
-dependencies = [
- "dyn-stack 0.10.0",
- "gemm-common 0.17.1",
- "gemm-f32 0.17.1",
- "half",
- "num-complex",
- "num-traits",
- "paste",
- "raw-cpuid 10.7.0",
- "rayon",
- "seq-macro",
-]
-
-[[package]]
-name = "gemm-f16"
-version = "0.18.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cff95ae3259432f3c3410eaa919033cd03791d81cebd18018393dc147952e109"
-dependencies = [
- "dyn-stack 0.13.2",
- "gemm-common 0.18.2",
- "gemm-f32 0.18.2",
- "half",
- "num-complex",
- "num-traits",
- "paste",
- "raw-cpuid 11.6.0",
- "rayon",
- "seq-macro",
-]
-
-[[package]]
-name = "gemm-f32"
-version = "0.17.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9a69f51aaefbd9cf12d18faf273d3e982d9d711f60775645ed5c8047b4ae113"
-dependencies = [
- "dyn-stack 0.10.0",
- "gemm-common 0.17.1",
- "num-complex",
- "num-traits",
- "paste",
- "raw-cpuid 10.7.0",
- "seq-macro",
-]
-
-[[package]]
-name = "gemm-f32"
-version = "0.18.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc8d3d4385393304f407392f754cd2dc4b315d05063f62cf09f47b58de276864"
-dependencies = [
- "dyn-stack 0.13.2",
- "gemm-common 0.18.2",
- "num-complex",
- "num-traits",
- "paste",
- "raw-cpuid 11.6.0",
- "seq-macro",
-]
-
-[[package]]
-name = "gemm-f64"
-version = "0.17.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa397a48544fadf0b81ec8741e5c0fba0043008113f71f2034def1935645d2b0"
-dependencies = [
- "dyn-stack 0.10.0",
- "gemm-common 0.17.1",
- "num-complex",
- "num-traits",
- "paste",
- "raw-cpuid 10.7.0",
- "seq-macro",
-]
-
-[[package]]
-name = "gemm-f64"
-version = "0.18.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35b2a4f76ce4b8b16eadc11ccf2e083252d8237c1b589558a49b0183545015bd"
-dependencies = [
- "dyn-stack 0.13.2",
- "gemm-common 0.18.2",
- "num-complex",
- "num-traits",
- "paste",
- "raw-cpuid 11.6.0",
- "seq-macro",
-]
-
-[[package]]
-name = "generator"
-version = "0.8.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "605183a538e3e2a9c1038635cc5c2d194e2ee8fd0d1b66b8349fad7dbacce5a2"
-dependencies = [
- "cc",
- "cfg-if",
- "libc",
- "log",
- "rustversion",
- "windows 0.61.3",
 ]
 
 [[package]]
@@ -6887,33 +2118,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "gh-workflow"
-version = "0.8.0"
-source = "git+https://github.com/zed-industries/gh-workflow?rev=09acfdf2bd5c1d6254abefd609c808ff73547b2c#09acfdf2bd5c1d6254abefd609c808ff73547b2c"
-dependencies = [
- "async-trait",
- "derive_more 2.0.1",
- "derive_setters",
- "gh-workflow-macros",
- "indexmap",
- "merge",
- "serde",
- "serde_json",
- "serde_yaml",
- "strum_macros 0.27.2",
-]
-
-[[package]]
-name = "gh-workflow-macros"
-version = "0.8.0"
-source = "git+https://github.com/zed-industries/gh-workflow?rev=09acfdf2bd5c1d6254abefd609c808ff73547b2c#09acfdf2bd5c1d6254abefd609c808ff73547b2c"
-dependencies = [
- "heck 0.5.0",
- "quote",
- "syn 2.0.106",
-]
-
 [[package]]
 name = "gif"
 version = "0.13.3"
@@ -6924,59 +2128,12 @@ dependencies = [
  "weezl",
 ]
 
-[[package]]
-name = "gimli"
-version = "0.31.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
-dependencies = [
- "fallible-iterator",
- "indexmap",
- "stable_deref_trait",
-]
-
 [[package]]
 name = "gimli"
 version = "0.32.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7"
 
-[[package]]
-name = "git"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "askpass",
- "async-trait",
- "collections",
- "derive_more 0.99.20",
- "futures 0.3.31",
- "git2",
- "gpui",
- "http_client",
- "itertools 0.14.0",
- "log",
- "parking_lot",
- "pretty_assertions",
- "rand 0.9.2",
- "regex",
- "rope",
- "schemars",
- "serde",
- "serde_json",
- "smol",
- "sum_tree",
- "tempfile",
- "text",
- "thiserror 2.0.17",
- "time",
- "unindent",
- "url",
- "urlencoding",
- "util",
- "uuid",
-]
-
 [[package]]
 name = "git2"
 version = "0.20.2"
@@ -6990,88 +2147,6 @@ dependencies = [
  "url",
 ]
 
-[[package]]
-name = "git_hosting_providers"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "async-trait",
- "futures 0.3.31",
- "git",
- "gpui",
- "http_client",
- "indoc",
- "itertools 0.14.0",
- "pretty_assertions",
- "regex",
- "serde",
- "serde_json",
- "settings",
- "url",
- "urlencoding",
- "util",
-]
-
-[[package]]
-name = "git_ui"
-version = "0.1.0"
-dependencies = [
- "agent_settings",
- "anyhow",
- "askpass",
- "buffer_diff",
- "call",
- "cloud_llm_client",
- "collections",
- "command_palette_hooks",
- "component",
- "ctor",
- "db",
- "editor",
- "futures 0.3.31",
- "fuzzy",
- "git",
- "git_hosting_providers",
- "gpui",
- "indoc",
- "itertools 0.14.0",
- "language",
- "language_model",
- "linkify",
- "log",
- "markdown",
- "menu",
- "multi_buffer",
- "notifications",
- "panel",
- "picker",
- "pretty_assertions",
- "project",
- "recent_projects",
- "remote",
- "schemars",
- "serde",
- "serde_json",
- "settings",
- "smol",
- "strum 0.27.2",
- "telemetry",
- "theme",
- "time",
- "time_format",
- "tracing",
- "ui",
- "unindent",
- "util",
- "watch",
- "windows 0.61.3",
- "workspace",
- "zed_actions",
- "zeroize",
- "zlog",
- "ztracing",
-]
-
 [[package]]
 name = "glob"
 version = "0.3.3"
@@ -7115,54 +2190,6 @@ dependencies = [
  "web-sys",
 ]
 
-[[package]]
-name = "go_to_line"
-version = "0.1.0"
-dependencies = [
- "editor",
- "gpui",
- "indoc",
- "language",
- "menu",
- "project",
- "rope",
- "serde",
- "serde_json",
- "settings",
- "text",
- "theme",
- "tree-sitter-rust",
- "tree-sitter-typescript",
- "ui",
- "util",
- "workspace",
-]
-
-[[package]]
-name = "goblin"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b363a30c165f666402fe6a3024d3bec7ebc898f96a4a23bd1c99f8dbf3f4f47"
-dependencies = [
- "log",
- "plain",
- "scroll",
-]
-
-[[package]]
-name = "google_ai"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "futures 0.3.31",
- "http_client",
- "schemars",
- "serde",
- "serde_json",
- "settings",
- "strum 0.27.2",
-]
-
 [[package]]
 name = "gpu-alloc"
 version = "0.6.0"
@@ -7223,14 +2250,14 @@ dependencies = [
  "core-video",
  "cosmic-text",
  "ctor",
- "derive_more 0.99.20",
+ "derive_more",
  "embed-resource",
- "env_logger 0.11.8",
+ "env_logger",
  "etagere",
  "filedescriptor",
  "flume",
- "foreign-types 0.5.0",
- "futures 0.3.31",
+ "foreign-types",
+ "futures",
  "gpui_macros",
  "http_client",
  "image",
@@ -7239,7 +2266,7 @@ dependencies = [
  "libc",
  "log",
  "lyon",
- "mach2 0.5.0",
+ "mach2",
  "media",
  "metal",
  "naga",
@@ -7326,36 +2353,6 @@ version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "12101ecc8225ea6d675bc70263074eab6169079621c2186fe0c66590b2df9681"
 
-[[package]]
-name = "group"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7"
-dependencies = [
- "ff",
- "rand_core 0.6.4",
- "subtle",
-]
-
-[[package]]
-name = "h2"
-version = "0.3.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0beca50380b1fc32983fc1cb4587bfa4bb9e78fc259aad4a0032d2080309222d"
-dependencies = [
- "bytes 1.10.1",
- "fnv",
- "futures-core",
- "futures-sink",
- "futures-util",
- "http 0.2.12",
- "indexmap",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
 [[package]]
 name = "h2"
 version = "0.4.12"
@@ -7363,11 +2360,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f3c0b69cfcb4e1b9f1bf2f53f95f766e4661169728ec61cd3fe5a0166f2d1386"
 dependencies = [
  "atomic-waker",
- "bytes 1.10.1",
+ "bytes",
  "fnv",
  "futures-core",
  "futures-sink",
- "http 1.3.1",
+ "http",
  "indexmap",
  "slab",
  "tokio",
@@ -7381,62 +2378,17 @@ version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b"
 dependencies = [
- "bytemuck",
  "cfg-if",
  "crunchy",
  "num-traits",
- "rand 0.9.2",
- "rand_distr",
  "zerocopy",
 ]
 
-[[package]]
-name = "handlebars"
-version = "4.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "faa67bab9ff362228eb3d00bd024a4965d8231bbb7921167f0cfa66c6626b225"
-dependencies = [
- "log",
- "pest",
- "pest_derive",
- "rust-embed",
- "serde",
- "serde_json",
- "thiserror 1.0.69",
-]
-
-[[package]]
-name = "handlebars"
-version = "5.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d08485b96a0e6393e9e4d1b8d48cf74ad6c063cd905eb33f42c1ce3f0377539b"
-dependencies = [
- "log",
- "pest",
- "pest_derive",
- "serde",
- "serde_json",
- "thiserror 1.0.69",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-dependencies = [
- "ahash 0.7.8",
-]
-
 [[package]]
 name = "hashbrown"
 version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
-dependencies = [
- "ahash 0.8.12",
- "allocator-api2",
-]
 
 [[package]]
 name = "hashbrown"
@@ -7444,10 +2396,7 @@ version = "0.15.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
 dependencies = [
- "allocator-api2",
- "equivalent",
- "foldhash 0.1.5",
- "serde",
+ "foldhash",
 ]
 
 [[package]]
@@ -7455,71 +2404,12 @@ name = "hashbrown"
 version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
-dependencies = [
- "allocator-api2",
- "equivalent",
- "foldhash 0.2.0",
-]
-
-[[package]]
-name = "hashlink"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7"
-dependencies = [
- "hashbrown 0.14.5",
-]
-
-[[package]]
-name = "hashlink"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
-dependencies = [
- "hashbrown 0.15.5",
-]
-
-[[package]]
-name = "headers"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270"
-dependencies = [
- "base64 0.21.7",
- "bytes 1.10.1",
- "headers-core",
- "http 0.2.12",
- "httpdate",
- "mime",
- "sha1",
-]
-
-[[package]]
-name = "headers-core"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429"
-dependencies = [
- "http 0.2.12",
-]
-
-[[package]]
-name = "heck"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
-dependencies = [
- "unicode-segmentation",
-]
 
 [[package]]
 name = "heck"
 version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
-dependencies = [
- "unicode-segmentation",
-]
 
 [[package]]
 name = "heck"
@@ -7527,44 +2417,6 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
-[[package]]
-name = "heed"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd54745cfacb7b97dee45e8fdb91814b62bccddb481debb7de0f9ee6b7bf5b43"
-dependencies = [
- "bitflags 2.9.4",
- "byteorder",
- "heed-traits",
- "heed-types",
- "libc",
- "lmdb-master-sys",
- "once_cell",
- "page_size",
- "serde",
- "synchronoise",
- "url",
-]
-
-[[package]]
-name = "heed-traits"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb3130048d404c57ce5a1ac61a903696e8fcde7e8c2991e9fcfc1f27c3ef74ff"
-
-[[package]]
-name = "heed-types"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13c255bdf46e07fb840d120a36dcc81f385140d7191c76a7391672675c01a55d"
-dependencies = [
- "bincode",
- "byteorder",
- "heed-traits",
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "hermit-abi"
 version = "0.5.2"
@@ -7621,12 +2473,6 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "hound"
-version = "3.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62adaabb884c94955b19907d60019f4e145d091c75345379e70d1ee696f7854f"
-
 [[package]]
 name = "html5ever"
 version = "0.27.0"
@@ -7635,76 +2481,43 @@ checksum = "c13771afe0e6e846f1e67d038d4cb29998a6779f93c809212e4e9c32efd244d4"
 dependencies = [
  "log",
  "mac",
- "markup5ever 0.12.1",
+ "markup5ever",
  "proc-macro2",
  "quote",
  "syn 2.0.106",
 ]
 
-[[package]]
-name = "html5ever"
-version = "0.35.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55d958c2f74b664487a2035fe1dadb032c48718a03b63f3ab0b8537db8549ed4"
-dependencies = [
- "log",
- "markup5ever 0.35.0",
- "match_token",
-]
-
 [[package]]
 name = "html_to_markdown"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "html5ever 0.27.0",
+ "html5ever",
  "indoc",
  "markup5ever_rcdom",
  "pretty_assertions",
  "regex",
 ]
 
-[[package]]
-name = "http"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
-dependencies = [
- "bytes 1.10.1",
- "fnv",
- "itoa",
-]
-
 [[package]]
 name = "http"
 version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
 dependencies = [
- "bytes 1.10.1",
+ "bytes",
  "fnv",
  "itoa",
 ]
 
-[[package]]
-name = "http-body"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
-dependencies = [
- "bytes 1.10.1",
- "http 0.2.12",
- "pin-project-lite",
-]
-
 [[package]]
 name = "http-body"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
 dependencies = [
- "bytes 1.10.1",
- "http 1.3.1",
+ "bytes",
+ "http",
 ]
 
 [[package]]
@@ -7713,19 +2526,13 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
 dependencies = [
- "bytes 1.10.1",
+ "bytes",
  "futures-core",
- "http 1.3.1",
- "http-body 1.0.1",
+ "http",
+ "http-body",
  "pin-project-lite",
 ]
 
-[[package]]
-name = "http-range-header"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f"
-
 [[package]]
 name = "http_client"
 version = "0.1.0"
@@ -7734,11 +2541,11 @@ dependencies = [
  "async-compression",
  "async-fs",
  "async-tar",
- "bytes 1.10.1",
- "derive_more 0.99.20",
- "futures 0.3.31",
- "http 1.3.1",
- "http-body 1.0.1",
+ "bytes",
+ "derive_more",
+ "futures",
+ "http",
+ "http-body",
  "log",
  "parking_lot",
  "serde",
@@ -7754,7 +2561,7 @@ dependencies = [
 name = "http_client_tls"
 version = "0.1.0"
 dependencies = [
- "rustls 0.23.33",
+ "rustls",
  "rustls-platform-verifier",
 ]
 
@@ -7764,48 +2571,6 @@ version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
 
-[[package]]
-name = "httpdate"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
-
-[[package]]
-name = "human_bytes"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91f255a4535024abf7640cb288260811fc14794f62b063652ed349f9a6c2348e"
-
-[[package]]
-name = "humantime"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "135b12329e5e3ce057a9f972339ea52bc954fe1e9358ef27f95e89716fbc5424"
-
-[[package]]
-name = "hyper"
-version = "0.14.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7"
-dependencies = [
- "bytes 1.10.1",
- "futures-channel",
- "futures-core",
- "futures-util",
- "h2 0.3.27",
- "http 0.2.12",
- "http-body 0.4.6",
- "httparse",
- "httpdate",
- "itoa",
- "pin-project-lite",
- "socket2 0.5.10",
- "tokio",
- "tower-service",
- "tracing",
- "want",
-]
-
 [[package]]
 name = "hyper"
 version = "1.7.0"
@@ -7813,12 +2578,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eb3aa54a13a0dfe7fbe3a59e0c76093041720fdc77b110cc0fc260fafb4dc51e"
 dependencies = [
  "atomic-waker",
- "bytes 1.10.1",
+ "bytes",
  "futures-channel",
  "futures-core",
- "h2 0.4.12",
- "http 1.3.1",
- "http-body 1.0.1",
+ "h2",
+ "http",
+ "http-body",
  "httparse",
  "itoa",
  "pin-project-lite",
@@ -7828,71 +2593,39 @@ dependencies = [
  "want",
 ]
 
-[[package]]
-name = "hyper-rustls"
-version = "0.24.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
-dependencies = [
- "futures-util",
- "http 0.2.12",
- "hyper 0.14.32",
- "log",
- "rustls 0.21.12",
- "rustls-native-certs 0.6.3",
- "tokio",
- "tokio-rustls 0.24.1",
-]
-
 [[package]]
 name = "hyper-rustls"
 version = "0.27.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58"
 dependencies = [
- "http 1.3.1",
- "hyper 1.7.0",
+ "http",
+ "hyper",
  "hyper-util",
- "rustls 0.23.33",
- "rustls-native-certs 0.8.2",
+ "rustls",
+ "rustls-native-certs",
  "rustls-pki-types",
  "tokio",
- "tokio-rustls 0.26.2",
+ "tokio-rustls",
  "tower-service",
 ]
 
-[[package]]
-name = "hyper-tls"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
-dependencies = [
- "bytes 1.10.1",
- "hyper 0.14.32",
- "native-tls",
- "tokio",
- "tokio-native-tls",
-]
-
 [[package]]
 name = "hyper-util"
 version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c6995591a8f1380fcb4ba966a252a4b29188d51d2b89e3a252f5305be65aea8"
 dependencies = [
- "base64 0.22.1",
- "bytes 1.10.1",
+ "bytes",
  "futures-channel",
  "futures-core",
  "futures-util",
- "http 1.3.1",
- "http-body 1.0.1",
- "hyper 1.7.0",
- "ipnet",
+ "http",
+ "http-body",
+ "hyper",
  "libc",
- "percent-encoding",
  "pin-project-lite",
- "socket2 0.6.1",
+ "socket2",
  "tokio",
  "tower-service",
  "tracing",
@@ -7922,14 +2655,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "icons"
-version = "0.1.0"
-dependencies = [
- "serde",
- "strum 0.27.2",
-]
-
 [[package]]
 name = "icu_collections"
 version = "2.0.0"
@@ -7938,7 +2663,7 @@ checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47"
 dependencies = [
  "displaydoc",
  "potential_utf",
- "yoke 0.8.0",
+ "yoke",
  "zerofrom",
  "zerovec",
 ]
@@ -8010,24 +2735,12 @@ dependencies = [
  "stable_deref_trait",
  "tinystr",
  "writeable",
- "yoke 0.8.0",
+ "yoke",
  "zerofrom",
  "zerotrie",
  "zerovec",
 ]
 
-[[package]]
-name = "id-arena"
-version = "2.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005"
-
-[[package]]
-name = "ident_case"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
-
 [[package]]
 name = "idna"
 version = "1.1.0"
@@ -8049,22 +2762,6 @@ dependencies = [
  "icu_properties",
 ]
 
-[[package]]
-name = "ignore"
-version = "0.4.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81776e6f9464432afcc28d03e52eb101c93b6f0566f52aef2427663e700f0403"
-dependencies = [
- "crossbeam-deque",
- "globset",
- "log",
- "memchr",
- "regex-automata",
- "same-file",
- "walkdir",
- "winapi-util",
-]
-
 [[package]]
 name = "image"
 version = "0.25.8"
@@ -8099,41 +2796,12 @@ dependencies = [
  "quick-error",
 ]
 
-[[package]]
-name = "image_viewer"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "db",
- "editor",
- "file_icons",
- "gpui",
- "language",
- "log",
- "project",
- "serde",
- "settings",
- "theme",
- "ui",
- "util",
- "workspace",
-]
-
 [[package]]
 name = "imagesize"
 version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "edcd27d72f2f071c64249075f42e205ff93c9a4c5f6c6da53e79ed9f9832c285"
 
-[[package]]
-name = "imara-diff"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17d34b7d42178945f775e84bc4c36dde7c1c6cdfea656d3354d009056f2bb3d2"
-dependencies = [
- "hashbrown 0.15.5",
-]
-
 [[package]]
 name = "imgref"
 version = "1.12.0"
@@ -8158,48 +2826,6 @@ version = "2.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd"
 
-[[package]]
-name = "inherent"
-version = "1.0.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c727f80bfa4a6c6e2508d2f05b6f4bfce242030bd88ed15ae5331c5b5d30fba7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.106",
-]
-
-[[package]]
-name = "inotify"
-version = "0.9.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff"
-dependencies = [
- "bitflags 1.3.2",
- "inotify-sys",
- "libc",
-]
-
-[[package]]
-name = "inotify"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3"
-dependencies = [
- "bitflags 2.9.4",
- "inotify-sys",
- "libc",
-]
-
-[[package]]
-name = "inotify-sys"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "inout"
 version = "0.1.4"
@@ -8210,41 +2836,6 @@ dependencies = [
  "generic-array",
 ]
 
-[[package]]
-name = "inspector_ui"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "command_palette_hooks",
- "editor",
- "fuzzy",
- "gpui",
- "language",
- "project",
- "serde_json",
- "serde_json_lenient",
- "theme",
- "title_bar",
- "ui",
- "util",
- "util_macros",
- "workspace",
- "zed_actions",
-]
-
-[[package]]
-name = "install_cli"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "client",
- "gpui",
- "release_channel",
- "smol",
- "util",
- "workspace",
-]
-
 [[package]]
 name = "instant"
 version = "0.1.13"
@@ -8274,22 +2865,6 @@ dependencies = [
  "rustversion",
 ]
 
-[[package]]
-name = "io-extras"
-version = "0.18.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2285ddfe3054097ef4b2fe909ef8c3bcd1ea52a8f0d274416caebeef39f04a65"
-dependencies = [
- "io-lifetimes",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "io-lifetimes"
-version = "2.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06432fb54d3be7964ecd3649233cddf80db2832f47fec34c01f65b3d9d774983"
-
 [[package]]
 name = "io-surface"
 version = "0.16.1"
@@ -8302,50 +2877,12 @@ dependencies = [
  "leaky-cow",
 ]
 
-[[package]]
-name = "iovec"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "ipc-channel"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fb8251fb7bcd9ccd3725ed8deae9fe7db8e586495c9eb5b0c52e6233e5e75ea"
-dependencies = [
- "bincode",
- "crossbeam-channel",
- "fnv",
- "lazy_static",
- "libc",
- "mio 1.1.0",
- "rand 0.8.5",
- "serde",
- "tempfile",
- "uuid",
- "windows 0.58.0",
-]
-
 [[package]]
 name = "ipnet"
 version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
 
-[[package]]
-name = "iri-string"
-version = "0.7.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2"
-dependencies = [
- "memchr",
- "serde",
-]
-
 [[package]]
 name = "is-docker"
 version = "0.2.0"
@@ -8355,17 +2892,6 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "is-terminal"
-version = "0.4.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9"
-dependencies = [
- "hermit-abi",
- "libc",
- "windows-sys 0.59.0",
-]
-
 [[package]]
 name = "is-wsl"
 version = "0.4.0"
@@ -8376,39 +2902,12 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "is_executable"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baabb8b4867b26294d818bf3f651a454b6901431711abb96e296245888d6e8c4"
-dependencies = [
- "windows-sys 0.60.2",
-]
-
 [[package]]
 name = "is_terminal_polyfill"
 version = "1.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
 
-[[package]]
-name = "itertools"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itertools"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "itertools"
 version = "0.12.1"
@@ -8489,21 +2988,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "journal"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "chrono",
- "editor",
- "gpui",
- "log",
- "serde",
- "settings",
- "shellexpand 2.1.2",
- "workspace",
-]
-
 [[package]]
 name = "js-sys"
 version = "0.3.81"
@@ -8514,153 +2998,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "json_dotpath"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbdcfef3cf5591f0cef62da413ae795e3d1f5a00936ccec0b2071499a32efd1a"
-dependencies = [
- "serde",
- "serde_derive",
- "serde_json",
- "thiserror 1.0.69",
-]
-
-[[package]]
-name = "json_schema_store"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "dap",
- "extension",
- "gpui",
- "language",
- "paths",
- "project",
- "schemars",
- "serde",
- "serde_json",
- "settings",
- "snippet_provider",
- "task",
- "theme",
- "util",
-]
-
-[[package]]
-name = "jsonschema"
-version = "0.37.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73c9ffb2b5c56d58030e1b532d8e8389da94590515f118cf35b5cb68e4764a7e"
-dependencies = [
- "ahash 0.8.12",
- "bytecount",
- "data-encoding",
- "email_address",
- "fancy-regex",
- "fraction",
- "getrandom 0.3.4",
- "idna",
- "itoa",
- "num-cmp",
- "num-traits",
- "percent-encoding",
- "referencing",
- "regex",
- "regex-syntax",
- "reqwest 0.12.24",
- "serde",
- "serde_json",
- "unicode-general-category",
- "uuid-simd",
-]
-
-[[package]]
-name = "jsonwebtoken"
-version = "9.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a87cc7a48537badeae96744432de36f4be2b4a34a05a5ef32e9dd8a1c169dde"
-dependencies = [
- "base64 0.22.1",
- "js-sys",
- "pem",
- "ring",
- "serde",
- "serde_json",
- "simple_asn1",
-]
-
-[[package]]
-name = "jupyter-protocol"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9c047f6b5e551563af2ddb13dafed833f0ec5a5b0f9621d5ad740a9ff1e1095"
-dependencies = [
- "async-trait",
- "bytes 1.10.1",
- "chrono",
- "futures 0.3.31",
- "serde",
- "serde_json",
- "thiserror 2.0.17",
- "uuid",
-]
-
-[[package]]
-name = "jupyter-websocket-client"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4197fa926a6b0bddfed7377d9fed3d00a0dec44a1501e020097bd26604699cae"
-dependencies = [
- "anyhow",
- "async-trait",
- "async-tungstenite",
- "futures 0.3.31",
- "jupyter-protocol",
- "serde",
- "serde_json",
- "tokio",
- "url",
- "uuid",
-]
-
-[[package]]
-name = "keymap_editor"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "collections",
- "command_palette",
- "component",
- "db",
- "editor",
- "fs",
- "fuzzy",
- "gpui",
- "itertools 0.14.0",
- "json_schema_store",
- "language",
- "log",
- "menu",
- "notifications",
- "paths",
- "project",
- "search",
- "serde",
- "serde_json",
- "settings",
- "telemetry",
- "tempfile",
- "theme",
- "tree-sitter-json",
- "tree-sitter-rust",
- "ui",
- "ui_input",
- "util",
- "workspace",
- "zed_actions",
-]
-
 [[package]]
 name = "khronos-egl"
 version = "6.0.0"
@@ -8671,26 +3008,6 @@ dependencies = [
  "libloading",
 ]
 
-[[package]]
-name = "kqueue"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac30106d7dce88daf4a3fcb4879ea939476d5074a9b7ddd0fb97fa4bed5596a"
-dependencies = [
- "kqueue-sys",
- "libc",
-]
-
-[[package]]
-name = "kqueue-sys"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b"
-dependencies = [
- "bitflags 1.3.2",
- "libc",
-]
-
 [[package]]
 name = "kurbo"
 version = "0.11.3"
@@ -8711,305 +3028,6 @@ dependencies = [
  "log",
 ]
 
-[[package]]
-name = "language"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "async-trait",
- "clock",
- "collections",
- "ctor",
- "diffy",
- "ec4rs",
- "fs",
- "futures 0.3.31",
- "fuzzy",
- "globset",
- "gpui",
- "http_client",
- "imara-diff",
- "indoc",
- "itertools 0.14.0",
- "log",
- "lsp",
- "parking_lot",
- "postage",
- "pretty_assertions",
- "rand 0.9.2",
- "regex",
- "rpc",
- "schemars",
- "serde",
- "serde_json",
- "settings",
- "shellexpand 2.1.2",
- "smallvec",
- "smol",
- "streaming-iterator",
- "strsim",
- "sum_tree",
- "task",
- "text",
- "theme",
- "toml 0.8.23",
- "tree-sitter",
- "tree-sitter-elixir",
- "tree-sitter-embedded-template",
- "tree-sitter-heex",
- "tree-sitter-html",
- "tree-sitter-json",
- "tree-sitter-md",
- "tree-sitter-python",
- "tree-sitter-ruby",
- "tree-sitter-rust",
- "tree-sitter-typescript",
- "unicase",
- "unindent",
- "util",
- "watch",
- "zlog",
-]
-
-[[package]]
-name = "language_extension"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "async-trait",
- "collections",
- "extension",
- "fs",
- "futures 0.3.31",
- "gpui",
- "language",
- "log",
- "lsp",
- "project",
- "serde",
- "serde_json",
- "util",
-]
-
-[[package]]
-name = "language_model"
-version = "0.1.0"
-dependencies = [
- "anthropic",
- "anyhow",
- "base64 0.22.1",
- "client",
- "cloud_api_types",
- "cloud_llm_client",
- "collections",
- "futures 0.3.31",
- "gpui",
- "http_client",
- "icons",
- "image",
- "log",
- "open_ai",
- "open_router",
- "parking_lot",
- "proto",
- "schemars",
- "serde",
- "serde_json",
- "settings",
- "smol",
- "telemetry_events",
- "thiserror 2.0.17",
- "util",
-]
-
-[[package]]
-name = "language_models"
-version = "0.1.0"
-dependencies = [
- "ai_onboarding",
- "anthropic",
- "anyhow",
- "aws-config",
- "aws-credential-types",
- "aws_http_client",
- "bedrock",
- "chrono",
- "client",
- "cloud_llm_client",
- "collections",
- "component",
- "convert_case 0.8.0",
- "copilot",
- "credentials_provider",
- "deepseek",
- "editor",
- "fs",
- "futures 0.3.31",
- "google_ai",
- "gpui",
- "gpui_tokio",
- "http_client",
- "language",
- "language_model",
- "lmstudio",
- "log",
- "menu",
- "mistral",
- "ollama",
- "open_ai",
- "open_router",
- "partial-json-fixer",
- "project",
- "release_channel",
- "schemars",
- "semver",
- "serde",
- "serde_json",
- "settings",
- "smol",
- "strum 0.27.2",
- "thiserror 2.0.17",
- "tiktoken-rs",
- "tokio",
- "ui",
- "ui_input",
- "util",
- "vercel",
- "x_ai",
- "zed_env_vars",
-]
-
-[[package]]
-name = "language_onboarding"
-version = "0.1.0"
-dependencies = [
- "db",
- "editor",
- "gpui",
- "project",
- "ui",
- "workspace",
-]
-
-[[package]]
-name = "language_selector"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "editor",
- "file_finder",
- "file_icons",
- "fuzzy",
- "gpui",
- "language",
- "picker",
- "project",
- "settings",
- "ui",
- "util",
- "workspace",
-]
-
-[[package]]
-name = "language_tools"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "client",
- "collections",
- "command_palette_hooks",
- "copilot",
- "editor",
- "futures 0.3.31",
- "gpui",
- "itertools 0.14.0",
- "language",
- "lsp",
- "project",
- "proto",
- "release_channel",
- "semver",
- "serde_json",
- "settings",
- "theme",
- "tree-sitter",
- "ui",
- "util",
- "workspace",
- "zed_actions",
- "zlog",
-]
-
-[[package]]
-name = "languages"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "async-compression",
- "async-fs",
- "async-tar",
- "async-trait",
- "chrono",
- "collections",
- "futures 0.3.31",
- "globset",
- "gpui",
- "http_client",
- "itertools 0.14.0",
- "json_schema_store",
- "language",
- "log",
- "lsp",
- "node_runtime",
- "parking_lot",
- "pet",
- "pet-conda",
- "pet-core",
- "pet-fs",
- "pet-poetry",
- "pet-reporter",
- "pet-virtualenv",
- "pretty_assertions",
- "project",
- "regex",
- "rope",
- "rust-embed",
- "serde",
- "serde_json",
- "serde_json_lenient",
- "settings",
- "smallvec",
- "smol",
- "snippet",
- "task",
- "terminal",
- "text",
- "theme",
- "toml 0.8.23",
- "tree-sitter",
- "tree-sitter-bash",
- "tree-sitter-c",
- "tree-sitter-cpp",
- "tree-sitter-css",
- "tree-sitter-diff",
- "tree-sitter-gitcommit",
- "tree-sitter-go",
- "tree-sitter-gomod",
- "tree-sitter-gowork",
- "tree-sitter-jsdoc",
- "tree-sitter-json",
- "tree-sitter-md",
- "tree-sitter-python",
- "tree-sitter-regex",
- "tree-sitter-rust",
- "tree-sitter-typescript",
- "tree-sitter-yaml",
- "unindent",
- "url",
- "util",
- "workspace",
-]
-
 [[package]]
 name = "lazy_static"
 version = "1.5.0"
@@ -9034,18 +3052,6 @@ dependencies = [
  "leak",
 ]
 
-[[package]]
-name = "leb128"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67"
-
-[[package]]
-name = "leb128fmt"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
-
 [[package]]
 name = "lebe"
 version = "0.5.3"
@@ -9058,16 +3064,6 @@ version = "0.2.177"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
 
-[[package]]
-name = "libdbus-sys"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cbe856efeb50e4681f010e9aaa2bf0a644e10139e54cde10fc83a307c23bd9f"
-dependencies = [
- "cc",
- "pkg-config",
-]
-
 [[package]]
 name = "libfuzzer-sys"
 version = "0.4.10"
@@ -9106,16 +3102,6 @@ version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
 
-[[package]]
-name = "libmimalloc-sys"
-version = "0.1.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "667f4fec20f29dfc6bc7357c582d91796c169ad7e2fce709468aefeb2c099870"
-dependencies = [
- "cc",
- "libc",
-]
-
 [[package]]
 name = "libredox"
 version = "0.1.10"
@@ -9127,40 +3113,6 @@ dependencies = [
  "redox_syscall 0.5.18",
 ]
 
-[[package]]
-name = "libsqlite3-sys"
-version = "0.30.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149"
-dependencies = [
- "cc",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "libwebrtc"
-version = "0.3.10"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=5f04705ac3f356350ae31534ffbc476abc9ea83d#5f04705ac3f356350ae31534ffbc476abc9ea83d"
-dependencies = [
- "cxx",
- "jni",
- "js-sys",
- "lazy_static",
- "livekit-protocol",
- "livekit-runtime",
- "log",
- "parking_lot",
- "serde",
- "serde_json",
- "thiserror 1.0.69",
- "tokio",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "webrtc-sys",
-]
-
 [[package]]
 name = "libz-sys"
 version = "1.1.22"
@@ -9173,38 +3125,6 @@ dependencies = [
  "vcpkg",
 ]
 
-[[package]]
-name = "line_ending_selector"
-version = "0.1.0"
-dependencies = [
- "editor",
- "gpui",
- "language",
- "picker",
- "project",
- "ui",
- "util",
- "workspace",
-]
-
-[[package]]
-name = "link-cplusplus"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f78c730aaa7d0b9336a299029ea49f9ee53b0ed06e9202e8cb7db9bae7b8c82"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "linkify"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1dfa36d52c581e9ec783a7ce2a5e0143da6237be5811a0b3153fedfdbe9f780"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "linux-raw-sys"
 version = "0.4.15"
@@ -9223,156 +3143,6 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
 
-[[package]]
-name = "livekit"
-version = "0.7.8"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=5f04705ac3f356350ae31534ffbc476abc9ea83d#5f04705ac3f356350ae31534ffbc476abc9ea83d"
-dependencies = [
- "chrono",
- "futures-util",
- "lazy_static",
- "libloading",
- "libwebrtc",
- "livekit-api",
- "livekit-protocol",
- "livekit-runtime",
- "log",
- "parking_lot",
- "prost 0.12.6",
- "semver",
- "serde",
- "serde_json",
- "thiserror 1.0.69",
- "tokio",
-]
-
-[[package]]
-name = "livekit-api"
-version = "0.4.2"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=5f04705ac3f356350ae31534ffbc476abc9ea83d#5f04705ac3f356350ae31534ffbc476abc9ea83d"
-dependencies = [
- "futures-util",
- "http 0.2.12",
- "livekit-protocol",
- "livekit-runtime",
- "log",
- "parking_lot",
- "pbjson-types",
- "prost 0.12.6",
- "rand 0.9.2",
- "reqwest 0.11.27",
- "scopeguard",
- "serde",
- "sha2",
- "thiserror 1.0.69",
- "tokio",
- "tokio-tungstenite 0.26.2",
- "url",
-]
-
-[[package]]
-name = "livekit-protocol"
-version = "0.3.9"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=5f04705ac3f356350ae31534ffbc476abc9ea83d#5f04705ac3f356350ae31534ffbc476abc9ea83d"
-dependencies = [
- "futures-util",
- "livekit-runtime",
- "parking_lot",
- "pbjson",
- "pbjson-types",
- "prost 0.12.6",
- "prost-types 0.12.6",
- "serde",
- "thiserror 1.0.69",
- "tokio",
-]
-
-[[package]]
-name = "livekit-runtime"
-version = "0.4.0"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=5f04705ac3f356350ae31534ffbc476abc9ea83d#5f04705ac3f356350ae31534ffbc476abc9ea83d"
-dependencies = [
- "tokio",
- "tokio-stream",
-]
-
-[[package]]
-name = "livekit_api"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "async-trait",
- "jsonwebtoken",
- "log",
- "prost 0.9.0",
- "prost-build 0.9.0",
- "prost-types 0.9.0",
- "serde",
- "zed-reqwest",
-]
-
-[[package]]
-name = "livekit_client"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "async-trait",
- "audio",
- "collections",
- "core-foundation 0.10.0",
- "core-video",
- "coreaudio-rs 0.12.1",
- "cpal",
- "futures 0.3.31",
- "gpui",
- "gpui_tokio",
- "http_client_tls",
- "image",
- "libwebrtc",
- "livekit",
- "livekit_api",
- "log",
- "nanoid",
- "objc",
- "parking_lot",
- "postage",
- "rodio",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "settings",
- "sha2",
- "simplelog",
- "smallvec",
- "tokio-tungstenite 0.26.2",
- "ui",
- "util",
- "zed-scap",
-]
-
-[[package]]
-name = "lmdb-master-sys"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "864808e0b19fb6dd3b70ba94ee671b82fce17554cf80aeb0a155c65bb08027df"
-dependencies = [
- "cc",
- "doxygen-rs",
- "libc",
-]
-
-[[package]]
-name = "lmstudio"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "futures 0.3.31",
- "http_client",
- "schemars",
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "lock_api"
 version = "0.4.14"
@@ -9392,19 +3162,6 @@ dependencies = [
  "value-bag",
 ]
 
-[[package]]
-name = "loom"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "419e0dc8046cb947daa77eb95ae174acfbddb7673b4151f56d1eed8e93fbfaca"
-dependencies = [
- "cfg-if",
- "generator",
- "scoped-tls",
- "tracing",
- "tracing-subscriber",
-]
-
 [[package]]
 name = "loop9"
 version = "0.1.5"
@@ -9414,56 +3171,12 @@ dependencies = [
  "imgref",
 ]
 
-[[package]]
-name = "lru"
-version = "0.12.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
-dependencies = [
- "hashbrown 0.15.5",
-]
-
 [[package]]
 name = "lru-slab"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154"
 
-[[package]]
-name = "lsp"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "async-pipe",
- "collections",
- "ctor",
- "futures 0.3.31",
- "gpui",
- "log",
- "lsp-types",
- "parking_lot",
- "postage",
- "release_channel",
- "schemars",
- "semver",
- "serde",
- "serde_json",
- "smol",
- "util",
- "zlog",
-]
-
-[[package]]
-name = "lsp-types"
-version = "0.95.1"
-source = "git+https://github.com/zed-industries/lsp-types?rev=b71ab4eeb27d9758be8092020a46fe33fbca4e33#b71ab4eeb27d9758be8092020a46fe33fbca4e33"
-dependencies = [
- "bitflags 1.3.2",
- "serde",
- "serde_json",
- "url",
-]
-
 [[package]]
 name = "lyon"
 version = "1.0.16"
@@ -9533,15 +3246,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
 
-[[package]]
-name = "mach2"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d640282b302c0bb0a2a8e0233ead9035e3bed871f0b7e81fe4a1ec829765db44"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "mach2"
 version = "0.5.0"
@@ -9560,61 +3264,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "maplit"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
-
-[[package]]
-name = "markdown"
-version = "0.1.0"
-dependencies = [
- "assets",
- "base64 0.22.1",
- "collections",
- "env_logger 0.11.8",
- "fs",
- "futures 0.3.31",
- "gpui",
- "language",
- "languages",
- "linkify",
- "log",
- "node_runtime",
- "pulldown-cmark 0.12.2",
- "settings",
- "sum_tree",
- "theme",
- "ui",
- "util",
-]
-
-[[package]]
-name = "markdown_preview"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "async-recursion",
- "collections",
- "editor",
- "fs",
- "gpui",
- "html5ever 0.27.0",
- "language",
- "linkify",
- "log",
- "markup5ever_rcdom",
- "pretty_assertions",
- "pulldown-cmark 0.12.2",
- "settings",
- "theme",
- "ui",
- "urlencoding",
- "util",
- "workspace",
-]
-
 [[package]]
 name = "markup5ever"
 version = "0.12.1"
@@ -9622,68 +3271,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "16ce3abbeba692c8b8441d036ef91aea6df8da2c6b6e21c7e14d3c18e526be45"
 dependencies = [
  "log",
- "phf 0.11.3",
+ "phf",
  "phf_codegen",
  "string_cache",
  "string_cache_codegen",
  "tendril",
 ]
 
-[[package]]
-name = "markup5ever"
-version = "0.35.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "311fe69c934650f8f19652b3946075f0fc41ad8757dbb68f1ca14e7900ecc1c3"
-dependencies = [
- "log",
- "tendril",
- "web_atoms",
-]
-
 [[package]]
 name = "markup5ever_rcdom"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "edaa21ab3701bfee5099ade5f7e1f84553fd19228cf332f13cd6e964bf59be18"
 dependencies = [
- "html5ever 0.27.0",
- "markup5ever 0.12.1",
+ "html5ever",
+ "markup5ever",
  "tendril",
  "xml5ever",
 ]
 
-[[package]]
-name = "match_token"
-version = "0.35.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac84fd3f360fcc43dc5f5d186f02a94192761a080e8bc58621ad4d12296a58cf"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.106",
-]
-
-[[package]]
-name = "matchers"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9"
-dependencies = [
- "regex-automata",
-]
-
-[[package]]
-name = "matchit"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
-
-[[package]]
-name = "maybe-owned"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4facc753ae494aeb6e3c22f839b158aebd4f9270f55cd3c79906c45476c47ab4"
-
 [[package]]
 name = "maybe-rayon"
 version = "0.1.1"
@@ -9704,42 +3310,6 @@ dependencies = [
  "digest",
 ]
 
-[[package]]
-name = "mdbook"
-version = "0.4.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b45a38e19bd200220ef07c892b0157ad3d2365e5b5a267ca01ad12182491eea5"
-dependencies = [
- "ammonia",
- "anyhow",
- "chrono",
- "clap",
- "clap_complete",
- "elasticlunr-rs",
- "env_logger 0.11.8",
- "futures-util",
- "handlebars 5.1.2",
- "ignore",
- "log",
- "memchr",
- "notify 6.1.1",
- "notify-debouncer-mini",
- "once_cell",
- "opener",
- "pathdiff",
- "pulldown-cmark 0.10.3",
- "regex",
- "serde",
- "serde_json",
- "shlex",
- "tempfile",
- "tokio",
- "toml 0.5.11",
- "topological-sort",
- "walkdir",
- "warp",
-]
-
 [[package]]
 name = "media"
 version = "0.1.0"
@@ -9749,7 +3319,7 @@ dependencies = [
  "core-foundation 0.10.0",
  "core-video",
  "ctor",
- "foreign-types 0.5.0",
+ "foreign-types",
  "metal",
  "objc",
 ]
@@ -9760,15 +3330,6 @@ version = "2.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
 
-[[package]]
-name = "memfd"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad38eb12aea514a0466ea40a80fd8cc83637065948eb4a426e4aa46261175227"
-dependencies = [
- "rustix 1.1.2",
-]
-
 [[package]]
 name = "memmap2"
 version = "0.9.8"
@@ -9776,7 +3337,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "843a98750cd611cc2965a8213b53b43e715f13c37a9e096c6408e69990961db7"
 dependencies = [
  "libc",
- "stable_deref_trait",
 ]
 
 [[package]]
@@ -9788,35 +3348,6 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "menu"
-version = "0.1.0"
-dependencies = [
- "gpui",
-]
-
-[[package]]
-name = "merge"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10bbef93abb1da61525bbc45eeaff6473a41907d19f8f9aa5168d214e10693e9"
-dependencies = [
- "merge_derive",
- "num-traits",
-]
-
-[[package]]
-name = "merge_derive"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "209d075476da2e63b4b29e72a2ef627b840589588e71400a25e3565c4f849d07"
-dependencies = [
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "metal"
 version = "0.29.0"
@@ -9826,39 +3357,12 @@ dependencies = [
  "bitflags 2.9.4",
  "block",
  "core-graphics-types 0.1.3",
- "foreign-types 0.5.0",
+ "foreign-types",
  "log",
  "objc",
  "paste",
 ]
 
-[[package]]
-name = "migrator"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "collections",
- "convert_case 0.8.0",
- "log",
- "pretty_assertions",
- "serde_json",
- "serde_json_lenient",
- "settings_json",
- "streaming-iterator",
- "tree-sitter",
- "tree-sitter-json",
- "unindent",
-]
-
-[[package]]
-name = "mimalloc"
-version = "0.1.48"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1ee66a4b64c74f4ef288bcbb9192ad9c3feaad75193129ac8509af543894fd8"
-dependencies = [
- "libmimalloc-sys",
-]
-
 [[package]]
 name = "mime"
 version = "0.3.17"
@@ -9875,81 +3379,12 @@ dependencies = [
  "unicase",
 ]
 
-[[package]]
-name = "minidump-common"
-version = "0.21.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c4d14bcca0fd3ed165a03000480aaa364c6860c34e900cb2dafdf3b95340e77"
-dependencies = [
- "bitflags 2.9.4",
- "debugid",
- "num-derive",
- "num-traits",
- "range-map",
- "scroll",
- "smart-default",
-]
-
-[[package]]
-name = "minidump-writer"
-version = "0.8.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abcd9c8a1e6e1e9d56ce3627851f39a17ea83e17c96bc510f29d7e43d78a7d"
-dependencies = [
- "bitflags 2.9.4",
- "byteorder",
- "cfg-if",
- "crash-context",
- "goblin",
- "libc",
- "log",
- "mach2 0.4.3",
- "memmap2",
- "memoffset",
- "minidump-common",
- "nix 0.28.0",
- "procfs-core",
- "scroll",
- "tempfile",
- "thiserror 1.0.69",
-]
-
-[[package]]
-name = "minidumper"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b4ebc9d1f8847ec1d078f78b35ed598e0ebefa1f242d5f83cd8d7f03960a7d1"
-dependencies = [
- "cfg-if",
- "crash-context",
- "libc",
- "log",
- "minidump-writer",
- "parking_lot",
- "polling",
- "scroll",
- "thiserror 1.0.69",
- "uds",
-]
-
 [[package]]
 name = "minimal-lexical"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
-[[package]]
-name = "miniprofiler_ui"
-version = "0.1.0"
-dependencies = [
- "gpui",
- "serde_json",
- "smol",
- "util",
- "workspace",
- "zed_actions",
-]
-
 [[package]]
 name = "miniz_oxide"
 version = "0.8.9"
@@ -9966,18 +3401,6 @@ version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff"
 
-[[package]]
-name = "mio"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
-dependencies = [
- "libc",
- "log",
- "wasi",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "mio"
 version = "1.1.0"
@@ -9985,51 +3408,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873"
 dependencies = [
  "libc",
- "log",
  "wasi",
  "windows-sys 0.61.2",
 ]
 
-[[package]]
-name = "miow"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "536bfad37a309d62069485248eeaba1e8d9853aaf951caaeaed0585a95346f08"
-dependencies = [
- "windows-sys 0.61.2",
-]
-
-[[package]]
-name = "mistral"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "futures 0.3.31",
- "http_client",
- "schemars",
- "serde",
- "serde_json",
- "strum 0.27.2",
-]
-
-[[package]]
-name = "moka"
-version = "0.12.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8261cd88c312e0004c1d51baad2980c66528dfdb2bee62003e643a4d8f86b077"
-dependencies = [
- "crossbeam-channel",
- "crossbeam-epoch",
- "crossbeam-utils",
- "equivalent",
- "parking_lot",
- "portable-atomic",
- "rustc_version",
- "smallvec",
- "tagptr",
- "uuid",
-]
-
 [[package]]
 name = "moxcms"
 version = "0.7.7"
@@ -10040,60 +3422,6 @@ dependencies = [
  "pxfm",
 ]
 
-[[package]]
-name = "msvc_spectre_libs"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29e871a9861f3664f18b7e04e9301d4edd55090c2dadb4b1c602e26ab32b1f5b"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "multi_buffer"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "buffer_diff",
- "clock",
- "collections",
- "ctor",
- "gpui",
- "indoc",
- "itertools 0.14.0",
- "language",
- "log",
- "parking_lot",
- "pretty_assertions",
- "project",
- "rand 0.9.2",
- "rope",
- "serde",
- "settings",
- "smallvec",
- "smol",
- "sum_tree",
- "text",
- "theme",
- "tracing",
- "tree-sitter",
- "util",
- "zlog",
- "ztracing",
-]
-
-[[package]]
-name = "multimap"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
-
-[[package]]
-name = "multimap"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d87ecb2933e8aeadb3e3a02b828fed80a7528047e68b4f424523a0981a3a084"
-
 [[package]]
 name = "naga"
 version = "25.0.1"
@@ -10103,8 +3431,8 @@ dependencies = [
  "arrayvec",
  "bit-set",
  "bitflags 2.9.4",
- "cfg_aliases 0.2.1",
- "codespan-reporting 0.12.0",
+ "cfg_aliases",
+ "codespan-reporting",
  "half",
  "hashbrown 0.15.5",
  "hexf-parse",
@@ -10119,15 +3447,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "nanoid"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ffa00dec017b5b1a8b7cf5e2c008bfda1aa7e0697ac1508b491fdf2622fb4d8"
-dependencies = [
- "rand 0.8.5",
-]
-
 [[package]]
 name = "nanorand"
 version = "0.7.0"
@@ -10137,106 +3456,12 @@ dependencies = [
  "getrandom 0.2.16",
 ]
 
-[[package]]
-name = "native-tls"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e"
-dependencies = [
- "libc",
- "log",
- "openssl",
- "openssl-probe",
- "openssl-sys",
- "schannel",
- "security-framework 2.11.1",
- "security-framework-sys",
- "tempfile",
-]
-
-[[package]]
-name = "nbformat"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89c7229d604d847227002715e1235cd84e81919285d904ccb290a42ecc409348"
-dependencies = [
- "anyhow",
- "chrono",
- "jupyter-protocol",
- "serde",
- "serde_json",
- "thiserror 1.0.69",
- "uuid",
-]
-
-[[package]]
-name = "nc"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "futures 0.3.31",
- "net",
- "smol",
-]
-
-[[package]]
-name = "ndk"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
-dependencies = [
- "bitflags 2.9.4",
- "jni-sys",
- "log",
- "ndk-sys",
- "num_enum",
- "thiserror 1.0.69",
-]
-
-[[package]]
-name = "ndk-context"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
-
-[[package]]
-name = "ndk-sys"
-version = "0.6.0+11769913"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873"
-dependencies = [
- "jni-sys",
-]
-
-[[package]]
-name = "net"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "async-io",
- "smol",
- "tempfile",
- "windows 0.61.3",
-]
-
 [[package]]
 name = "new_debug_unreachable"
 version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
 
-[[package]]
-name = "nix"
-version = "0.28.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
-dependencies = [
- "bitflags 2.9.4",
- "cfg-if",
- "cfg_aliases 0.1.1",
- "libc",
-]
-
 [[package]]
 name = "nix"
 version = "0.29.0"
@@ -10245,7 +3470,7 @@ checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
 dependencies = [
  "bitflags 2.9.4",
  "cfg-if",
- "cfg_aliases 0.2.1",
+ "cfg_aliases",
  "libc",
 ]
 
@@ -10257,33 +3482,11 @@ checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
 dependencies = [
  "bitflags 2.9.4",
  "cfg-if",
- "cfg_aliases 0.2.1",
+ "cfg_aliases",
  "libc",
  "memoffset",
 ]
 
-[[package]]
-name = "node_runtime"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "async-compression",
- "async-std",
- "async-tar",
- "async-trait",
- "futures 0.3.31",
- "http_client",
- "log",
- "paths",
- "semver",
- "serde",
- "serde_json",
- "smol",
- "util",
- "watch",
- "which 6.0.3",
-]
-
 [[package]]
 name = "nom"
 version = "7.1.3"
@@ -10294,103 +3497,12 @@ dependencies = [
  "minimal-lexical",
 ]
 
-[[package]]
-name = "nom"
-version = "8.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "noop_proc_macro"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8"
 
-[[package]]
-name = "normpath"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf23ab2b905654b4cb177e30b629937b3868311d4e1cba859f899c041046e69b"
-dependencies = [
- "windows-sys 0.61.2",
-]
-
-[[package]]
-name = "notifications"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "channel",
- "client",
- "collections",
- "component",
- "db",
- "gpui",
- "rpc",
- "settings",
- "sum_tree",
- "time",
- "ui",
- "util",
- "workspace",
- "zed_actions",
-]
-
-[[package]]
-name = "notify"
-version = "6.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d"
-dependencies = [
- "bitflags 2.9.4",
- "crossbeam-channel",
- "filetime",
- "fsevent-sys 4.1.0",
- "inotify 0.9.6",
- "kqueue",
- "libc",
- "log",
- "mio 0.8.11",
- "walkdir",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "notify"
-version = "8.2.0"
-source = "git+https://github.com/zed-industries/notify.git?rev=b4588b2e5aee68f4c0e100f140e808cbce7b1419#b4588b2e5aee68f4c0e100f140e808cbce7b1419"
-dependencies = [
- "bitflags 2.9.4",
- "fsevent-sys 4.1.0",
- "inotify 0.11.0",
- "kqueue",
- "libc",
- "log",
- "mio 1.1.0",
- "notify-types",
- "walkdir",
- "windows-sys 0.60.2",
-]
-
-[[package]]
-name = "notify-debouncer-mini"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d40b221972a1fc5ef4d858a2f671fb34c75983eb385463dff3780eeff6a9d43"
-dependencies = [
- "crossbeam-channel",
- "log",
- "notify 6.1.1",
-]
-
-[[package]]
-name = "notify-types"
-version = "2.0.0"
-source = "git+https://github.com/zed-industries/notify.git?rev=b4588b2e5aee68f4c0e100f140e808cbce7b1419#b4588b2e5aee68f4c0e100f140e808cbce7b1419"
-
 [[package]]
 name = "ntapi"
 version = "0.4.1"
@@ -10400,15 +3512,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "nu-ansi-term"
-version = "0.50.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
-dependencies = [
- "windows-sys 0.61.2",
-]
-
 [[package]]
 name = "num"
 version = "0.4.3"
@@ -10450,28 +3553,15 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "num-cmp"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63335b2e2c34fae2fb0aa2cecfd9f0832a1e24b3b32ecec612c3426d46dc8aaa"
-
 [[package]]
 name = "num-complex"
 version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
 dependencies = [
- "bytemuck",
  "num-traits",
 ]
 
-[[package]]
-name = "num-conv"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
-
 [[package]]
 name = "num-derive"
 version = "0.4.2"
@@ -10483,16 +3573,6 @@ dependencies = [
  "syn 2.0.106",
 ]
 
-[[package]]
-name = "num-format"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3"
-dependencies = [
- "arrayvec",
- "itoa",
-]
-
 [[package]]
 name = "num-integer"
 version = "0.1.46"
@@ -10544,51 +3624,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "num_enum"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a973b4e44ce6cad84ce69d797acf9a044532e4184c4f267913d1b546a0727b7a"
-dependencies = [
- "num_enum_derive",
- "rustversion",
-]
-
-[[package]]
-name = "num_enum_derive"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77e878c846a8abae00dd069496dbe8751b16ac1c3d6bd2a7283a938e8228f90d"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn 2.0.106",
-]
-
-[[package]]
-name = "num_threads"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "nvim-rs"
-version = "0.9.2"
-source = "git+https://github.com/KillTheMule/nvim-rs?rev=764dd270c642f77f10f3e19d05cc178a6cbe69f3#764dd270c642f77f10f3e19d05cc178a6cbe69f3"
-dependencies = [
- "async-trait",
- "futures 0.3.31",
- "log",
- "rmp",
- "rmpv",
- "tokio",
- "tokio-util",
-]
-
 [[package]]
 name = "objc"
 version = "0.2.7"
@@ -10632,43 +3667,6 @@ dependencies = [
  "objc2-quartz-core",
 ]
 
-[[package]]
-name = "objc2-audio-toolbox"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10cbe18d879e20a4aea544f8befe38bcf52255eb63d3f23eca2842f3319e4c07"
-dependencies = [
- "bitflags 2.9.4",
- "libc",
- "objc2",
- "objc2-core-audio",
- "objc2-core-audio-types",
- "objc2-core-foundation",
- "objc2-foundation",
-]
-
-[[package]]
-name = "objc2-core-audio"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1eebcea8b0dbff5f7c8504f3107c68fc061a3eb44932051c8cf8a68d969c3b2"
-dependencies = [
- "dispatch2",
- "objc2",
- "objc2-core-audio-types",
- "objc2-core-foundation",
-]
-
-[[package]]
-name = "objc2-core-audio-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a89f2ec274a0cf4a32642b2991e8b351a404d290da87bb6a9a9d8632490bd1c"
-dependencies = [
- "bitflags 2.9.4",
- "objc2",
-]
-
 [[package]]
 name = "objc2-core-foundation"
 version = "0.3.2"
@@ -10697,16 +3695,6 @@ dependencies = [
  "objc2-core-foundation",
 ]
 
-[[package]]
-name = "objc2-io-kit"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33fafba39597d6dc1fb709123dfa8289d39406734be322956a69f0931c73bb15"
-dependencies = [
- "libc",
- "objc2-core-foundation",
-]
-
 [[package]]
 name = "objc2-metal"
 version = "0.3.1"
@@ -10765,18 +3753,6 @@ dependencies = [
  "objc",
 ]
 
-[[package]]
-name = "object"
-version = "0.36.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
-dependencies = [
- "crc32fast",
- "hashbrown 0.15.5",
- "indexmap",
- "memchr",
-]
-
 [[package]]
 name = "object"
 version = "0.37.3"
@@ -10786,49 +3762,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "ollama"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "futures 0.3.31",
- "http_client",
- "schemars",
- "serde",
- "serde_json",
- "settings",
-]
-
-[[package]]
-name = "onboarding"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "client",
- "component",
- "db",
- "documented",
- "fs",
- "fuzzy",
- "git",
- "gpui",
- "menu",
- "notifications",
- "picker",
- "project",
- "schemars",
- "serde",
- "settings",
- "telemetry",
- "theme",
- "ui",
- "util",
- "vim_mode_setting",
- "workspace",
- "zed_actions",
- "zlog",
-]
-
 [[package]]
 name = "once_cell"
 version = "1.21.3"
@@ -10851,7 +3784,7 @@ dependencies = [
  "ashpd 0.12.0",
  "async-fs",
  "async-io",
- "async-lock 3.4.1",
+ "async-lock",
  "blocking",
  "cbc",
  "cipher",
@@ -10865,7 +3798,7 @@ dependencies = [
  "md-5",
  "num",
  "num-bigint-dig",
- "pbkdf2 0.12.2",
+ "pbkdf2",
  "rand 0.9.2",
  "serde",
  "sha2",
@@ -10876,12 +3809,6 @@ dependencies = [
  "zvariant",
 ]
 
-[[package]]
-name = "oorandom"
-version = "11.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e"
-
 [[package]]
 name = "open"
 version = "5.3.2"
@@ -10893,128 +3820,18 @@ dependencies = [
  "pathdiff",
 ]
 
-[[package]]
-name = "open_ai"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "futures 0.3.31",
- "http_client",
- "log",
- "schemars",
- "serde",
- "serde_json",
- "settings",
- "strum 0.27.2",
- "thiserror 2.0.17",
-]
-
-[[package]]
-name = "open_router"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "futures 0.3.31",
- "http_client",
- "schemars",
- "serde",
- "serde_json",
- "settings",
- "strum 0.27.2",
- "thiserror 2.0.17",
-]
-
-[[package]]
-name = "opener"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0812e5e4df08da354c851a3376fead46db31c2214f849d3de356d774d057681"
-dependencies = [
- "bstr",
- "dbus",
- "normpath",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "openssl"
-version = "0.10.74"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24ad14dd45412269e1a30f52ad8f0664f0f4f4a89ee8fe28c3b3527021ebb654"
-dependencies = [
- "bitflags 2.9.4",
- "cfg-if",
- "foreign-types 0.3.2",
- "libc",
- "once_cell",
- "openssl-macros",
- "openssl-sys",
-]
-
-[[package]]
-name = "openssl-macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.106",
-]
-
 [[package]]
 name = "openssl-probe"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
 
-[[package]]
-name = "openssl-sys"
-version = "0.9.110"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a9f0075ba3c21b09f8e8b2026584b1d18d49388648f2fbbf3c97ea8deced8e2"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "optfield"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "969ccca8ffc4fb105bd131a228107d5c9dd89d9d627edf3295cbe979156f9712"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.106",
-]
-
 [[package]]
 name = "option-ext"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
 
-[[package]]
-name = "ordered-float"
-version = "2.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "ordered-float"
-version = "4.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bb71e1b3fa6ca1c61f383464aaf2bb0e2f8e772a1f01d486832464de363b951"
-dependencies = [
- "num-traits",
-]
-
 [[package]]
 name = "ordered-stream"
 version = "0.2.0"
@@ -11025,150 +3842,6 @@ dependencies = [
  "pin-project-lite",
 ]
 
-[[package]]
-name = "ouroboros"
-version = "0.18.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e0f050db9c44b97a94723127e6be766ac5c340c48f2c4bb3ffa11713744be59"
-dependencies = [
- "aliasable",
- "ouroboros_macro",
- "static_assertions",
-]
-
-[[package]]
-name = "ouroboros_macro"
-version = "0.18.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c7028bdd3d43083f6d8d4d5187680d0d3560d54df4cc9d752005268b41e64d0"
-dependencies = [
- "heck 0.4.1",
- "proc-macro2",
- "proc-macro2-diagnostics",
- "quote",
- "syn 2.0.106",
-]
-
-[[package]]
-name = "outline"
-version = "0.1.0"
-dependencies = [
- "editor",
- "fuzzy",
- "gpui",
- "indoc",
- "language",
- "menu",
- "ordered-float 2.10.1",
- "picker",
- "project",
- "rope",
- "serde_json",
- "settings",
- "smol",
- "theme",
- "tree-sitter-rust",
- "tree-sitter-typescript",
- "ui",
- "util",
- "workspace",
- "zed_actions",
-]
-
-[[package]]
-name = "outline_panel"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "collections",
- "db",
- "editor",
- "file_icons",
- "fuzzy",
- "gpui",
- "itertools 0.14.0",
- "language",
- "log",
- "menu",
- "outline",
- "pretty_assertions",
- "project",
- "search",
- "serde",
- "serde_json",
- "settings",
- "smallvec",
- "smol",
- "theme",
- "ui",
- "util",
- "workspace",
- "worktree",
- "zed_actions",
-]
-
-[[package]]
-name = "outref"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a80800c0488c3a21695ea981a54918fbb37abf04f4d0720c453632255e2ff0e"
-
-[[package]]
-name = "p256"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594"
-dependencies = [
- "ecdsa",
- "elliptic-curve",
- "sha2",
-]
-
-[[package]]
-name = "page_size"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30d5b2194ed13191c1999ae0704b7839fb18384fa22e49b57eeaa97d79ce40da"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "palette"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cbf71184cc5ecc2e4e1baccdb21026c20e5fc3dcf63028a086131b3ab00b6e6"
-dependencies = [
- "approx",
- "fast-srgb8",
- "palette_derive",
-]
-
-[[package]]
-name = "palette_derive"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5030daf005bface118c096f510ffb781fc28f9ab6a32ab224d8631be6851d30"
-dependencies = [
- "by_address",
- "proc-macro2",
- "quote",
- "syn 2.0.106",
-]
-
-[[package]]
-name = "panel"
-version = "0.1.0"
-dependencies = [
- "editor",
- "gpui",
- "settings",
- "theme",
- "ui",
- "workspace",
-]
-
 [[package]]
 name = "parking"
 version = "2.2.1"
@@ -11198,43 +3871,6 @@ dependencies = [
  "windows-link 0.2.1",
 ]
 
-[[package]]
-name = "parse_int"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c464266693329dd5a8715098c7f86e6c5fd5d985018b8318f53d9c6c2b21a31"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "partial-json-fixer"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35ffd90b3f3b6477db7478016b9efb1b7e9d38eafd095f0542fe0ec2ea884a13"
-
-[[package]]
-name = "password-hash"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700"
-dependencies = [
- "base64ct",
- "rand_core 0.6.4",
- "subtle",
-]
-
-[[package]]
-name = "password-hash"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166"
-dependencies = [
- "base64ct",
- "rand_core 0.6.4",
- "subtle",
-]
-
 [[package]]
 name = "paste"
 version = "1.0.15"
@@ -11266,64 +3902,6 @@ dependencies = [
  "rustc_version",
 ]
 
-[[package]]
-name = "paths"
-version = "0.1.0"
-dependencies = [
- "dirs 4.0.0",
- "ignore",
- "util",
-]
-
-[[package]]
-name = "pbjson"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1030c719b0ec2a2d25a5df729d6cff1acf3cc230bf766f4f97833591f7577b90"
-dependencies = [
- "base64 0.21.7",
- "serde",
-]
-
-[[package]]
-name = "pbjson-build"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2580e33f2292d34be285c5bc3dba5259542b083cfad6037b6d70345f24dcb735"
-dependencies = [
- "heck 0.4.1",
- "itertools 0.11.0",
- "prost 0.12.6",
- "prost-types 0.12.6",
-]
-
-[[package]]
-name = "pbjson-types"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18f596653ba4ac51bdecbb4ef6773bc7f56042dc13927910de1684ad3d32aa12"
-dependencies = [
- "bytes 1.10.1",
- "chrono",
- "pbjson",
- "pbjson-build",
- "prost 0.12.6",
- "prost-build 0.12.6",
- "serde",
-]
-
-[[package]]
-name = "pbkdf2"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917"
-dependencies = [
- "digest",
- "hmac",
- "password-hash 0.4.2",
- "sha2",
-]
-
 [[package]]
 name = "pbkdf2"
 version = "0.12.2"
@@ -11334,31 +3912,6 @@ dependencies = [
  "hmac",
 ]
 
-[[package]]
-name = "pciid-parser"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0008e816fcdaf229cdd540e9b6ca2dc4a10d65c31624abb546c6420a02846e61"
-
-[[package]]
-name = "pem"
-version = "3.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d30c53c26bc5b31a98cd02d20f25a7c8567146caf63ed593a9d87b2775291be"
-dependencies = [
- "base64 0.22.1",
- "serde_core",
-]
-
-[[package]]
-name = "pem-rfc7468"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412"
-dependencies = [
- "base64ct",
-]
-
 [[package]]
 name = "percent-encoding"
 version = "2.3.2"
@@ -11374,472 +3927,13 @@ dependencies = [
  "serde_json",
 ]
 
-[[package]]
-name = "pest"
-version = "2.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "989e7521a040efde50c3ab6bbadafbe15ab6dc042686926be59ac35d74607df4"
-dependencies = [
- "memchr",
- "ucd-trie",
-]
-
-[[package]]
-name = "pest_derive"
-version = "2.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "187da9a3030dbafabbbfb20cb323b976dc7b7ce91fcd84f2f74d6e31d378e2de"
-dependencies = [
- "pest",
- "pest_generator",
-]
-
-[[package]]
-name = "pest_generator"
-version = "2.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49b401d98f5757ebe97a26085998d6c0eecec4995cad6ab7fc30ffdf4b052843"
-dependencies = [
- "pest",
- "pest_meta",
- "proc-macro2",
- "quote",
- "syn 2.0.106",
-]
-
-[[package]]
-name = "pest_meta"
-version = "2.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72f27a2cfee9f9039c4d86faa5af122a0ac3851441a34865b8a043b46be0065a"
-dependencies = [
- "pest",
- "sha2",
-]
-
-[[package]]
-name = "pet"
-version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da#1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da"
-dependencies = [
- "clap",
- "env_logger 0.10.2",
- "lazy_static",
- "log",
- "msvc_spectre_libs",
- "pet-conda",
- "pet-core",
- "pet-env-var-path",
- "pet-fs",
- "pet-global-virtualenvs",
- "pet-homebrew",
- "pet-jsonrpc",
- "pet-linux-global-python",
- "pet-mac-commandlinetools",
- "pet-mac-python-org",
- "pet-mac-xcode",
- "pet-pipenv",
- "pet-pixi",
- "pet-poetry",
- "pet-pyenv",
- "pet-python-utils",
- "pet-reporter",
- "pet-telemetry",
- "pet-uv",
- "pet-venv",
- "pet-virtualenv",
- "pet-virtualenvwrapper",
- "pet-windows-registry",
- "pet-windows-store",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "pet-conda"
-version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da#1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da"
-dependencies = [
- "env_logger 0.10.2",
- "lazy_static",
- "log",
- "msvc_spectre_libs",
- "pet-core",
- "pet-fs",
- "pet-python-utils",
- "pet-reporter",
- "regex",
- "serde",
- "serde_json",
- "yaml-rust2",
-]
-
-[[package]]
-name = "pet-core"
-version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da#1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da"
-dependencies = [
- "clap",
- "lazy_static",
- "log",
- "msvc_spectre_libs",
- "pet-fs",
- "regex",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "pet-env-var-path"
-version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da#1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da"
-dependencies = [
- "lazy_static",
- "log",
- "msvc_spectre_libs",
- "pet-conda",
- "pet-core",
- "pet-fs",
- "pet-python-utils",
- "pet-virtualenv",
- "regex",
-]
-
-[[package]]
-name = "pet-fs"
-version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da#1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da"
-dependencies = [
- "log",
- "msvc_spectre_libs",
-]
-
-[[package]]
-name = "pet-global-virtualenvs"
-version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da#1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da"
-dependencies = [
- "log",
- "msvc_spectre_libs",
- "pet-conda",
- "pet-core",
- "pet-fs",
- "pet-virtualenv",
-]
-
-[[package]]
-name = "pet-homebrew"
-version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da#1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da"
-dependencies = [
- "lazy_static",
- "log",
- "msvc_spectre_libs",
- "pet-conda",
- "pet-core",
- "pet-fs",
- "pet-python-utils",
- "pet-virtualenv",
- "regex",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "pet-jsonrpc"
-version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da#1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da"
-dependencies = [
- "env_logger 0.10.2",
- "log",
- "msvc_spectre_libs",
- "pet-core",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "pet-linux-global-python"
-version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da#1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da"
-dependencies = [
- "log",
- "msvc_spectre_libs",
- "pet-core",
- "pet-fs",
- "pet-python-utils",
- "pet-virtualenv",
-]
-
-[[package]]
-name = "pet-mac-commandlinetools"
-version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da#1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da"
-dependencies = [
- "log",
- "msvc_spectre_libs",
- "pet-core",
- "pet-fs",
- "pet-python-utils",
- "pet-virtualenv",
-]
-
-[[package]]
-name = "pet-mac-python-org"
-version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da#1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da"
-dependencies = [
- "log",
- "msvc_spectre_libs",
- "pet-core",
- "pet-fs",
- "pet-python-utils",
- "pet-virtualenv",
-]
-
-[[package]]
-name = "pet-mac-xcode"
-version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da#1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da"
-dependencies = [
- "log",
- "msvc_spectre_libs",
- "pet-core",
- "pet-fs",
- "pet-python-utils",
- "pet-virtualenv",
-]
-
-[[package]]
-name = "pet-pipenv"
-version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da#1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da"
-dependencies = [
- "log",
- "msvc_spectre_libs",
- "pet-core",
- "pet-fs",
- "pet-python-utils",
- "pet-virtualenv",
-]
-
-[[package]]
-name = "pet-pixi"
-version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da#1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da"
-dependencies = [
- "log",
- "msvc_spectre_libs",
- "pet-conda",
- "pet-core",
- "pet-python-utils",
-]
-
-[[package]]
-name = "pet-poetry"
-version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da#1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da"
-dependencies = [
- "base64 0.22.1",
- "lazy_static",
- "log",
- "msvc_spectre_libs",
- "pet-core",
- "pet-fs",
- "pet-python-utils",
- "pet-reporter",
- "pet-virtualenv",
- "regex",
- "serde",
- "serde_json",
- "sha2",
- "toml 0.8.23",
-]
-
-[[package]]
-name = "pet-pyenv"
-version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da#1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da"
-dependencies = [
- "lazy_static",
- "log",
- "msvc_spectre_libs",
- "pet-conda",
- "pet-core",
- "pet-fs",
- "pet-python-utils",
- "pet-reporter",
- "regex",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "pet-python-utils"
-version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da#1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da"
-dependencies = [
- "env_logger 0.10.2",
- "lazy_static",
- "log",
- "msvc_spectre_libs",
- "pet-core",
- "pet-fs",
- "regex",
- "serde",
- "serde_json",
- "sha2",
-]
-
-[[package]]
-name = "pet-reporter"
-version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da#1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da"
-dependencies = [
- "env_logger 0.10.2",
- "log",
- "msvc_spectre_libs",
- "pet-core",
- "pet-jsonrpc",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "pet-telemetry"
-version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da#1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da"
-dependencies = [
- "env_logger 0.10.2",
- "lazy_static",
- "log",
- "msvc_spectre_libs",
- "pet-core",
- "pet-fs",
- "pet-python-utils",
- "regex",
-]
-
-[[package]]
-name = "pet-uv"
-version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da#1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da"
-dependencies = [
- "log",
- "pet-core",
- "pet-python-utils",
- "serde",
- "toml 0.9.8",
-]
-
-[[package]]
-name = "pet-venv"
-version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da#1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da"
-dependencies = [
- "log",
- "msvc_spectre_libs",
- "pet-core",
- "pet-python-utils",
- "pet-virtualenv",
-]
-
-[[package]]
-name = "pet-virtualenv"
-version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da#1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da"
-dependencies = [
- "log",
- "msvc_spectre_libs",
- "pet-core",
- "pet-fs",
- "pet-python-utils",
-]
-
-[[package]]
-name = "pet-virtualenvwrapper"
-version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da#1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da"
-dependencies = [
- "log",
- "msvc_spectre_libs",
- "pet-core",
- "pet-fs",
- "pet-python-utils",
- "pet-virtualenv",
-]
-
-[[package]]
-name = "pet-windows-registry"
-version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da#1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da"
-dependencies = [
- "lazy_static",
- "log",
- "msvc_spectre_libs",
- "pet-conda",
- "pet-core",
- "pet-fs",
- "pet-python-utils",
- "pet-virtualenv",
- "pet-windows-store",
- "regex",
- "winreg 0.55.0",
-]
-
-[[package]]
-name = "pet-windows-store"
-version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da#1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da"
-dependencies = [
- "lazy_static",
- "log",
- "msvc_spectre_libs",
- "pet-core",
- "pet-fs",
- "pet-python-utils",
- "pet-virtualenv",
- "regex",
- "winreg 0.55.0",
-]
-
-[[package]]
-name = "petgraph"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
-dependencies = [
- "fixedbitset",
- "indexmap",
-]
-
-[[package]]
-name = "pgvector"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc58e2d255979a31caa7cabfa7aac654af0354220719ab7a68520ae7a91e8c0b"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "phf"
 version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078"
 dependencies = [
- "phf_macros 0.11.3",
- "phf_shared 0.11.3",
-]
-
-[[package]]
-name = "phf"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "913273894cec178f401a31ec4b656318d95473527be05c0752cc41cdc32be8b7"
-dependencies = [
- "phf_macros 0.12.1",
- "phf_shared 0.12.1",
+ "phf_shared",
 ]
 
 [[package]]
@@ -11848,8 +3942,8 @@ version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a"
 dependencies = [
- "phf_generator 0.11.3",
- "phf_shared 0.11.3",
+ "phf_generator",
+ "phf_shared",
 ]
 
 [[package]]
@@ -11858,46 +3952,10 @@ version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
 dependencies = [
- "phf_shared 0.11.3",
+ "phf_shared",
  "rand 0.8.5",
 ]
 
-[[package]]
-name = "phf_generator"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cbb1126afed61dd6368748dae63b1ee7dc480191c6262a3b4ff1e29d86a6c5b"
-dependencies = [
- "fastrand 2.3.0",
- "phf_shared 0.12.1",
-]
-
-[[package]]
-name = "phf_macros"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216"
-dependencies = [
- "phf_generator 0.11.3",
- "phf_shared 0.11.3",
- "proc-macro2",
- "quote",
- "syn 2.0.106",
-]
-
-[[package]]
-name = "phf_macros"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d713258393a82f091ead52047ca779d37e5766226d009de21696c4e667044368"
-dependencies = [
- "phf_generator 0.12.1",
- "phf_shared 0.12.1",
- "proc-macro2",
- "quote",
- "syn 2.0.106",
-]
-
 [[package]]
 name = "phf_shared"
 version = "0.11.3"
@@ -11907,33 +3965,6 @@ dependencies = [
  "siphasher",
 ]
 
-[[package]]
-name = "phf_shared"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06005508882fb681fd97892ecff4b7fd0fee13ef1aa569f8695dae7ab9099981"
-dependencies = [
- "siphasher",
-]
-
-[[package]]
-name = "picker"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "ctor",
- "editor",
- "env_logger 0.11.8",
- "gpui",
- "menu",
- "schemars",
- "serde",
- "serde_json",
- "theme",
- "ui",
- "workspace",
-]
-
 [[package]]
 name = "pico-args"
 version = "0.5.0"
@@ -11983,90 +4014,12 @@ dependencies = [
  "futures-io",
 ]
 
-[[package]]
-name = "pkcs1"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f"
-dependencies = [
- "der 0.7.10",
- "pkcs8 0.10.2",
- "spki 0.7.3",
-]
-
-[[package]]
-name = "pkcs8"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba"
-dependencies = [
- "der 0.6.1",
- "spki 0.6.0",
-]
-
-[[package]]
-name = "pkcs8"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
-dependencies = [
- "der 0.7.10",
- "spki 0.7.3",
-]
-
 [[package]]
 name = "pkg-config"
 version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
 
-[[package]]
-name = "plain"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
-
-[[package]]
-name = "plist"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "740ebea15c5d1428f910cd1a5f52cebf8d25006245ed8ade92702f4943d91e07"
-dependencies = [
- "base64 0.22.1",
- "indexmap",
- "quick-xml 0.38.3",
- "serde",
- "time",
-]
-
-[[package]]
-name = "plotters"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747"
-dependencies = [
- "num-traits",
- "plotters-backend",
- "plotters-svg",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "plotters-backend"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a"
-
-[[package]]
-name = "plotters-svg"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670"
-dependencies = [
- "plotters-backend",
-]
-
 [[package]]
 name = "png"
 version = "0.17.16"
@@ -12113,15 +4066,6 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5da3b0203fd7ee5720aa0b5e790b591aa5d3f41c3ed2c34a3a393382198af2f7"
 
-[[package]]
-name = "pori"
-version = "0.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a63d338dec139f56dacc692ca63ad35a6be6a797442479b55acd611d79e906"
-dependencies = [
- "nom 7.1.3",
-]
-
 [[package]]
 name = "portable-atomic"
 version = "1.11.1"
@@ -12137,27 +4081,6 @@ dependencies = [
  "portable-atomic",
 ]
 
-[[package]]
-name = "portable-pty"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4a596a2b3d2752d94f51fac2d4a96737b8705dddd311a32b9af47211f08671e"
-dependencies = [
- "anyhow",
- "bitflags 1.3.2",
- "downcast-rs",
- "filedescriptor",
- "lazy_static",
- "libc",
- "log",
- "nix 0.28.0",
- "serial2",
- "shared_library",
- "shell-words",
- "winapi",
- "winreg 0.10.1",
-]
-
 [[package]]
 name = "postage"
 version = "0.5.0"
@@ -12166,7 +4089,7 @@ checksum = "af3fb618632874fb76937c2361a7f22afd393c982a2165595407edc75b06d3c1"
 dependencies = [
  "atomic",
  "crossbeam-queue",
- "futures 0.3.31",
+ "futures",
  "log",
  "parking_lot",
  "pin-project",
@@ -12175,18 +4098,6 @@ dependencies = [
  "thiserror 1.0.69",
 ]
 
-[[package]]
-name = "postcard"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6764c3b5dd454e283a30e6dfe78e9b31096d9e32036b5d1eaac7a6119ccb9a24"
-dependencies = [
- "cobs",
- "embedded-io 0.4.0",
- "embedded-io 0.6.1",
- "serde",
-]
-
 [[package]]
 name = "potential_utf"
 version = "0.1.3"
@@ -12196,12 +4107,6 @@ dependencies = [
  "zerovec",
 ]
 
-[[package]]
-name = "powerfmt"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
-
 [[package]]
 name = "ppv-lite86"
 version = "0.2.21"
@@ -12217,25 +4122,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
 
-[[package]]
-name = "prettier"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "collections",
- "fs",
- "gpui",
- "language",
- "log",
- "lsp",
- "node_runtime",
- "parking_lot",
- "paths",
- "serde",
- "serde_json",
- "util",
-]
-
 [[package]]
 name = "pretty_assertions"
 version = "1.4.1"
@@ -12256,15 +4142,6 @@ dependencies = [
  "syn 2.0.106",
 ]
 
-[[package]]
-name = "primal-check"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc0d895b311e3af9902528fbb8f928688abbd95872819320517cc24ca6b2bd08"
-dependencies = [
- "num-integer",
-]
-
 [[package]]
 name = "proc-macro-crate"
 version = "3.4.0"
@@ -12274,30 +4151,6 @@ dependencies = [
  "toml_edit 0.23.7",
 ]
 
-[[package]]
-name = "proc-macro-error"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-dependencies = [
- "proc-macro2",
- "quote",
- "version_check",
-]
-
 [[package]]
 name = "proc-macro-error-attr2"
 version = "2.0.0"
@@ -12329,29 +4182,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "proc-macro2-diagnostics"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.106",
- "version_check",
- "yansi",
-]
-
-[[package]]
-name = "procfs-core"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29"
-dependencies = [
- "bitflags 2.9.4",
- "hex",
-]
-
 [[package]]
 name = "profiling"
 version = "1.0.17"
@@ -12371,336 +4201,6 @@ dependencies = [
  "syn 2.0.106",
 ]
 
-[[package]]
-name = "project"
-version = "0.1.0"
-dependencies = [
- "aho-corasick",
- "anyhow",
- "askpass",
- "async-trait",
- "base64 0.22.1",
- "buffer_diff",
- "circular-buffer",
- "client",
- "clock",
- "collections",
- "context_server",
- "dap",
- "dap_adapters",
- "extension",
- "fancy-regex",
- "fs",
- "futures 0.3.31",
- "fuzzy",
- "git",
- "git2",
- "git_hosting_providers",
- "globset",
- "gpui",
- "http_client",
- "image",
- "indexmap",
- "itertools 0.14.0",
- "language",
- "log",
- "lsp",
- "markdown",
- "node_runtime",
- "parking_lot",
- "paths",
- "postage",
- "prettier",
- "pretty_assertions",
- "rand 0.9.2",
- "regex",
- "release_channel",
- "remote",
- "rpc",
- "schemars",
- "semver",
- "serde",
- "serde_json",
- "settings",
- "sha2",
- "shellexpand 2.1.2",
- "smallvec",
- "smol",
- "snippet",
- "snippet_provider",
- "sum_tree",
- "task",
- "tempfile",
- "terminal",
- "text",
- "toml 0.8.23",
- "tracing",
- "unindent",
- "url",
- "util",
- "watch",
- "wax",
- "which 6.0.3",
- "worktree",
- "zeroize",
- "zlog",
- "ztracing",
-]
-
-[[package]]
-name = "project_benchmarks"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "clap",
- "client",
- "futures 0.3.31",
- "gpui",
- "http_client",
- "language",
- "node_runtime",
- "project",
- "settings",
- "watch",
-]
-
-[[package]]
-name = "project_panel"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "client",
- "collections",
- "command_palette_hooks",
- "criterion",
- "db",
- "editor",
- "file_icons",
- "git",
- "git_ui",
- "gpui",
- "language",
- "menu",
- "pretty_assertions",
- "project",
- "rayon",
- "schemars",
- "search",
- "serde",
- "serde_json",
- "settings",
- "smallvec",
- "telemetry",
- "tempfile",
- "theme",
- "ui",
- "util",
- "workspace",
- "worktree",
- "zed_actions",
-]
-
-[[package]]
-name = "project_symbols"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "editor",
- "futures 0.3.31",
- "fuzzy",
- "gpui",
- "language",
- "lsp",
- "ordered-float 2.10.1",
- "picker",
- "project",
- "release_channel",
- "semver",
- "serde_json",
- "settings",
- "theme",
- "util",
- "workspace",
-]
-
-[[package]]
-name = "prometheus"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ca5326d8d0b950a9acd87e6a3f94745394f62e4dae1b1ee22b2bc0c394af43a"
-dependencies = [
- "cfg-if",
- "fnv",
- "lazy_static",
- "memchr",
- "parking_lot",
- "protobuf",
- "thiserror 2.0.17",
-]
-
-[[package]]
-name = "prompt_store"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "assets",
- "chrono",
- "collections",
- "fs",
- "futures 0.3.31",
- "fuzzy",
- "gpui",
- "handlebars 4.5.0",
- "heed",
- "language",
- "log",
- "parking_lot",
- "paths",
- "rope",
- "serde",
- "text",
- "util",
- "uuid",
-]
-
-[[package]]
-name = "prost"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001"
-dependencies = [
- "bytes 1.10.1",
- "prost-derive 0.9.0",
-]
-
-[[package]]
-name = "prost"
-version = "0.12.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29"
-dependencies = [
- "bytes 1.10.1",
- "prost-derive 0.12.6",
-]
-
-[[package]]
-name = "prost-build"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5"
-dependencies = [
- "bytes 1.10.1",
- "heck 0.3.3",
- "itertools 0.10.5",
- "lazy_static",
- "log",
- "multimap 0.8.3",
- "petgraph",
- "prost 0.9.0",
- "prost-types 0.9.0",
- "regex",
- "tempfile",
- "which 4.4.2",
-]
-
-[[package]]
-name = "prost-build"
-version = "0.12.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4"
-dependencies = [
- "bytes 1.10.1",
- "heck 0.5.0",
- "itertools 0.12.1",
- "log",
- "multimap 0.10.1",
- "once_cell",
- "petgraph",
- "prettyplease",
- "prost 0.12.6",
- "prost-types 0.12.6",
- "regex",
- "syn 2.0.106",
- "tempfile",
-]
-
-[[package]]
-name = "prost-derive"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe"
-dependencies = [
- "anyhow",
- "itertools 0.10.5",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "prost-derive"
-version = "0.12.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1"
-dependencies = [
- "anyhow",
- "itertools 0.12.1",
- "proc-macro2",
- "quote",
- "syn 2.0.106",
-]
-
-[[package]]
-name = "prost-types"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a"
-dependencies = [
- "bytes 1.10.1",
- "prost 0.9.0",
-]
-
-[[package]]
-name = "prost-types"
-version = "0.12.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0"
-dependencies = [
- "prost 0.12.6",
-]
-
-[[package]]
-name = "proto"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "collections",
- "prost 0.9.0",
- "prost-build 0.9.0",
- "serde",
- "typed-path",
-]
-
-[[package]]
-name = "protobuf"
-version = "3.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d65a1d4ddae7d8b5de68153b48f6aa3bba8cb002b243dbdbc55a5afbc98f99f4"
-dependencies = [
- "once_cell",
- "protobuf-support",
- "thiserror 1.0.69",
-]
-
-[[package]]
-name = "protobuf-support"
-version = "3.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e36c2f31e0a47f9280fb347ef5e461ffcd2c52dd520d8e216b52f93b0b0d7d6"
-dependencies = [
- "thiserror 1.0.69",
-]
-
 [[package]]
 name = "psm"
 version = "0.1.27"
@@ -12710,93 +4210,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "ptr_meta"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1"
-dependencies = [
- "ptr_meta_derive",
-]
-
-[[package]]
-name = "ptr_meta_derive"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "pulldown-cmark"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76979bea66e7875e7509c4ec5300112b316af87fa7a252ca91c448b32dfe3993"
-dependencies = [
- "bitflags 2.9.4",
- "memchr",
- "pulldown-cmark-escape",
- "unicase",
-]
-
-[[package]]
-name = "pulldown-cmark"
-version = "0.12.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f86ba2052aebccc42cbbb3ed234b8b13ce76f75c3551a303cb2bcffcff12bb14"
-dependencies = [
- "bitflags 2.9.4",
- "memchr",
- "unicase",
-]
-
-[[package]]
-name = "pulldown-cmark-escape"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd348ff538bc9caeda7ee8cad2d1d48236a1f443c1fa3913c6a02fe0043b1dd3"
-
-[[package]]
-name = "pulley-interpreter"
-version = "29.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62d95f8575df49a2708398182f49a888cf9dc30210fb1fd2df87c889edcee75d"
-dependencies = [
- "cranelift-bitset",
- "log",
- "sptr",
- "wasmtime-math",
-]
-
-[[package]]
-name = "pulp"
-version = "0.18.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0a01a0dc67cf4558d279f0c25b0962bd08fc6dec0137699eae304103e882fe6"
-dependencies = [
- "bytemuck",
- "libm",
- "num-complex",
- "reborrow",
-]
-
-[[package]]
-name = "pulp"
-version = "0.21.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96b86df24f0a7ddd5e4b95c94fc9ed8a98f1ca94d3b01bdce2824097e7835907"
-dependencies = [
- "bytemuck",
- "cfg-if",
- "libm",
- "num-complex",
- "reborrow",
- "version_check",
-]
-
 [[package]]
 name = "pxfm"
 version = "0.1.25"
@@ -12839,29 +4252,20 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "quick-xml"
-version = "0.38.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42a232e7487fc2ef313d96dde7948e7a3c05101870d8985e4fd8d26aedd27b89"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "quinn"
 version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20"
 dependencies = [
- "bytes 1.10.1",
- "cfg_aliases 0.2.1",
+ "bytes",
+ "cfg_aliases",
  "pin-project-lite",
  "quinn-proto",
  "quinn-udp",
  "rustc-hash 2.1.1",
- "rustls 0.23.33",
- "socket2 0.6.1",
+ "rustls",
+ "socket2",
  "thiserror 2.0.17",
  "tokio",
  "tracing",
@@ -12874,13 +4278,13 @@ version = "0.11.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31"
 dependencies = [
- "bytes 1.10.1",
+ "bytes",
  "getrandom 0.3.4",
  "lru-slab",
  "rand 0.9.2",
  "ring",
  "rustc-hash 2.1.1",
- "rustls 0.23.33",
+ "rustls",
  "rustls-pki-types",
  "slab",
  "thiserror 2.0.17",
@@ -12895,10 +4299,10 @@ version = "0.5.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd"
 dependencies = [
- "cfg_aliases 0.2.1",
+ "cfg_aliases",
  "libc",
  "once_cell",
- "socket2 0.6.1",
+ "socket2",
  "tracing",
  "windows-sys 0.60.2",
 ]
@@ -12918,12 +4322,6 @@ version = "5.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
 
-[[package]]
-name = "radium"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
-
 [[package]]
 name = "rand"
 version = "0.8.5"
@@ -12983,25 +4381,6 @@ dependencies = [
  "getrandom 0.3.4",
 ]
 
-[[package]]
-name = "rand_distr"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a8615d50dcf34fa31f7ab52692afec947c4dd0ab803cc87cb3b0b4570ff7463"
-dependencies = [
- "num-traits",
- "rand 0.9.2",
-]
-
-[[package]]
-name = "range-map"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12a5a2d6c7039059af621472a4389be1215a816df61aa4d531cfe85264aee95f"
-dependencies = [
- "num-traits",
-]
-
 [[package]]
 name = "rangemap"
 version = "1.6.0"
@@ -13058,24 +4437,6 @@ dependencies = [
  "rgb",
 ]
 
-[[package]]
-name = "raw-cpuid"
-version = "10.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332"
-dependencies = [
- "bitflags 1.3.2",
-]
-
-[[package]]
-name = "raw-cpuid"
-version = "11.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "498cd0dc59d73224351ee52a95fee0f1a617a2eae0e7d9d720cc622c73a54186"
-dependencies = [
- "bitflags 2.9.4",
-]
-
 [[package]]
 name = "raw-window-handle"
 version = "0.6.2"
@@ -13124,64 +4485,6 @@ dependencies = [
  "font-types",
 ]
 
-[[package]]
-name = "realfft"
-version = "3.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f821338fddb99d089116342c46e9f1fbf3828dba077674613e734e01d6ea8677"
-dependencies = [
- "rustfft",
-]
-
-[[package]]
-name = "reborrow"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03251193000f4bd3b042892be858ee50e8b3719f2b08e5833ac4353724632430"
-
-[[package]]
-name = "recent_projects"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "askpass",
- "auto_update",
- "dap",
- "db",
- "editor",
- "extension_host",
- "file_finder",
- "futures 0.3.31",
- "fuzzy",
- "gpui",
- "indoc",
- "language",
- "log",
- "markdown",
- "menu",
- "node_runtime",
- "ordered-float 2.10.1",
- "paths",
- "picker",
- "project",
- "release_channel",
- "remote",
- "semver",
- "serde",
- "serde_json",
- "settings",
- "smol",
- "task",
- "telemetry",
- "theme",
- "ui",
- "util",
- "windows-registry 0.6.1",
- "workspace",
- "worktree",
- "zed_actions",
-]
-
 [[package]]
 name = "redox_syscall"
 version = "0.2.16"
@@ -13211,17 +4514,6 @@ dependencies = [
  "thiserror 1.0.69",
 ]
 
-[[package]]
-name = "redox_users"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac"
-dependencies = [
- "getrandom 0.2.16",
- "libredox",
- "thiserror 2.0.17",
-]
-
 [[package]]
 name = "ref-cast"
 version = "1.0.25"
@@ -13242,21 +4534,6 @@ dependencies = [
  "syn 2.0.106",
 ]
 
-[[package]]
-name = "referencing"
-version = "0.37.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4283168a506f0dcbdce31c9f9cce3129c924da4c6bca46e46707fcb746d2d70c"
-dependencies = [
- "ahash 0.8.12",
- "fluent-uri",
- "getrandom 0.3.4",
- "hashbrown 0.16.1",
- "parking_lot",
- "percent-encoding",
- "serde_json",
-]
-
 [[package]]
 name = "refineable"
 version = "0.1.0"
@@ -13264,21 +4541,6 @@ dependencies = [
  "derive_refineable",
 ]
 
-[[package]]
-name = "regalloc2"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc06e6b318142614e4a48bc725abbf08ff166694835c43c9dae5a9009704639a"
-dependencies = [
- "allocator-api2",
- "bumpalo",
- "hashbrown 0.15.5",
- "log",
- "rustc-hash 2.1.1",
- "serde",
- "smallvec",
-]
-
 [[package]]
 name = "regex"
 version = "1.12.2"
@@ -13302,272 +4564,19 @@ dependencies = [
  "regex-syntax",
 ]
 
-[[package]]
-name = "regex-lite"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d942b98df5e658f56f20d592c7f868833fe38115e65c33003d8cd224b0155da"
-
 [[package]]
 name = "regex-syntax"
 version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
 
-[[package]]
-name = "release_channel"
-version = "0.1.0"
-dependencies = [
- "gpui",
- "semver",
-]
-
-[[package]]
-name = "remote"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "askpass",
- "async-trait",
- "collections",
- "fs",
- "futures 0.3.31",
- "gpui",
- "log",
- "parking_lot",
- "paths",
- "prost 0.9.0",
- "release_channel",
- "rpc",
- "schemars",
- "semver",
- "serde",
- "serde_json",
- "settings",
- "smol",
- "tempfile",
- "thiserror 2.0.17",
- "urlencoding",
- "util",
- "which 6.0.3",
-]
-
-[[package]]
-name = "remote_server"
-version = "0.1.0"
-dependencies = [
- "action_log",
- "agent",
- "anyhow",
- "askpass",
- "cargo_toml",
- "clap",
- "client",
- "clock",
- "collections",
- "crash-handler",
- "crashes",
- "dap",
- "dap_adapters",
- "debug_adapter_extension",
- "editor",
- "env_logger 0.11.8",
- "extension",
- "extension_host",
- "fork",
- "fs",
- "futures 0.3.31",
- "git",
- "git2",
- "git_hosting_providers",
- "gpui",
- "gpui_tokio",
- "http_client",
- "image",
- "json_schema_store",
- "language",
- "language_extension",
- "language_model",
- "languages",
- "libc",
- "log",
- "lsp",
- "minidumper",
- "node_runtime",
- "paths",
- "pretty_assertions",
- "project",
- "prompt_store",
- "proto",
- "rayon",
- "release_channel",
- "remote",
- "reqwest_client",
- "rpc",
- "rust-embed",
- "semver",
- "serde",
- "serde_json",
- "settings",
- "shellexpand 2.1.2",
- "smol",
- "sysinfo 0.37.2",
- "task",
- "theme",
- "thiserror 2.0.17",
- "toml 0.8.23",
- "unindent",
- "util",
- "watch",
- "workspace",
- "worktree",
- "zlog",
-]
-
-[[package]]
-name = "rend"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c"
-dependencies = [
- "bytecheck",
-]
-
-[[package]]
-name = "repl"
-version = "0.1.0"
-dependencies = [
- "alacritty_terminal",
- "anyhow",
- "async-dispatcher",
- "async-tungstenite",
- "base64 0.22.1",
- "client",
- "collections",
- "command_palette_hooks",
- "editor",
- "env_logger 0.11.8",
- "feature_flags",
- "file_icons",
- "futures 0.3.31",
- "gpui",
- "http_client",
- "image",
- "indoc",
- "jupyter-protocol",
- "jupyter-websocket-client",
- "language",
- "languages",
- "log",
- "markdown_preview",
- "menu",
- "multi_buffer",
- "nbformat",
- "picker",
- "project",
- "runtimelib",
- "serde",
- "serde_json",
- "settings",
- "smol",
- "telemetry",
- "terminal",
- "terminal_view",
- "theme",
- "tree-sitter-md",
- "tree-sitter-python",
- "tree-sitter-typescript",
- "ui",
- "util",
- "uuid",
- "workspace",
-]
-
-[[package]]
-name = "reqwest"
-version = "0.11.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
-dependencies = [
- "base64 0.21.7",
- "bytes 1.10.1",
- "encoding_rs",
- "futures-core",
- "futures-util",
- "h2 0.3.27",
- "http 0.2.12",
- "http-body 0.4.6",
- "hyper 0.14.32",
- "hyper-rustls 0.24.2",
- "hyper-tls",
- "ipnet",
- "js-sys",
- "log",
- "mime",
- "native-tls",
- "once_cell",
- "percent-encoding",
- "pin-project-lite",
- "rustls 0.21.12",
- "rustls-native-certs 0.6.3",
- "rustls-pemfile 1.0.4",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "sync_wrapper 0.1.2",
- "system-configuration 0.5.1",
- "tokio",
- "tokio-native-tls",
- "tokio-rustls 0.24.1",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "winreg 0.50.0",
-]
-
-[[package]]
-name = "reqwest"
-version = "0.12.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d0946410b9f7b082a427e4ef5c8ff541a88b357bc6c637c40db3a68ac70a36f"
-dependencies = [
- "base64 0.22.1",
- "bytes 1.10.1",
- "futures-channel",
- "futures-core",
- "futures-util",
- "http 1.3.1",
- "http-body 1.0.1",
- "http-body-util",
- "hyper 1.7.0",
- "hyper-util",
- "js-sys",
- "log",
- "percent-encoding",
- "pin-project-lite",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "sync_wrapper 1.0.2",
- "tokio",
- "tower 0.5.2",
- "tower-http 0.6.6",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
-]
-
 [[package]]
 name = "reqwest_client"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "bytes 1.10.1",
- "futures 0.3.31",
+ "bytes",
+ "futures",
  "gpui",
  "http_client",
  "http_client_tls",
@@ -13592,17 +4601,6 @@ dependencies = [
  "usvg",
 ]
 
-[[package]]
-name = "rfc6979"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb"
-dependencies = [
- "crypto-bigint 0.4.9",
- "hmac",
- "zeroize",
-]
-
 [[package]]
 name = "rgb"
 version = "0.8.52"
@@ -13612,20 +4610,6 @@ dependencies = [
  "bytemuck",
 ]
 
-[[package]]
-name = "rich_text"
-version = "0.1.0"
-dependencies = [
- "futures 0.3.31",
- "gpui",
- "language",
- "linkify",
- "pulldown-cmark 0.12.2",
- "theme",
- "ui",
- "util",
-]
-
 [[package]]
 name = "ring"
 version = "0.17.14"
@@ -13636,202 +4620,16 @@ dependencies = [
  "cfg-if",
  "getrandom 0.2.16",
  "libc",
- "untrusted 0.9.0",
+ "untrusted",
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "rkyv"
-version = "0.7.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b"
-dependencies = [
- "bitvec",
- "bytecheck",
- "bytes 1.10.1",
- "hashbrown 0.12.3",
- "ptr_meta",
- "rend",
- "rkyv_derive",
- "seahash",
- "tinyvec",
- "uuid",
-]
-
-[[package]]
-name = "rkyv_derive"
-version = "0.7.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "rmp"
-version = "0.8.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4"
-dependencies = [
- "byteorder",
- "num-traits",
- "paste",
-]
-
-[[package]]
-name = "rmpv"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58450723cd9ee93273ce44a20b6ec4efe17f8ed2e3631474387bfdecf18bb2a9"
-dependencies = [
- "num-traits",
- "rmp",
-]
-
-[[package]]
-name = "rodio"
-version = "0.21.1"
-source = "git+https://github.com/RustAudio/rodio?rev=e2074c6c2acf07b57cf717e076bdda7a9ac6e70b#e2074c6c2acf07b57cf717e076bdda7a9ac6e70b"
-dependencies = [
- "cpal",
- "dasp_sample",
- "hound",
- "num-rational",
- "rtrb",
- "symphonia",
- "thiserror 2.0.17",
-]
-
-[[package]]
-name = "rope"
-version = "0.1.0"
-dependencies = [
- "arrayvec",
- "criterion",
- "ctor",
- "gpui",
- "log",
- "rand 0.9.2",
- "rayon",
- "sum_tree",
- "tracing",
- "unicode-segmentation",
- "util",
- "zlog",
- "ztracing",
-]
-
 [[package]]
 name = "roxmltree"
 version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97"
 
-[[package]]
-name = "rpc"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "async-tungstenite",
- "base64 0.22.1",
- "chrono",
- "collections",
- "futures 0.3.31",
- "gpui",
- "parking_lot",
- "proto",
- "rand 0.9.2",
- "rsa",
- "serde",
- "serde_json",
- "sha2",
- "strum 0.27.2",
- "tracing",
- "util",
- "zlog",
- "zstd",
-]
-
-[[package]]
-name = "rsa"
-version = "0.9.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40a0376c50d0358279d9d643e4bf7b7be212f1f4ff1da9070a7b54d22ef75c88"
-dependencies = [
- "const-oid",
- "digest",
- "num-bigint-dig",
- "num-integer",
- "num-traits",
- "pkcs1",
- "pkcs8 0.10.2",
- "rand_core 0.6.4",
- "signature 2.2.0",
- "spki 0.7.3",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "rtrb"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad8388ea1a9e0ea807e442e8263a699e7edcb320ecbcd21b4fa8ff859acce3ba"
-
-[[package]]
-name = "rules_library"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "collections",
- "editor",
- "gpui",
- "language",
- "language_model",
- "log",
- "menu",
- "picker",
- "prompt_store",
- "release_channel",
- "rope",
- "serde",
- "settings",
- "theme",
- "title_bar",
- "ui",
- "util",
- "workspace",
- "zed_actions",
-]
-
-[[package]]
-name = "runtimelib"
-version = "0.30.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "481b48894073a0096f28cbe9860af01fc1b861e55b3bc96afafc645ee3de62dc"
-dependencies = [
- "async-dispatcher",
- "async-std",
- "aws-lc-rs",
- "base64 0.22.1",
- "bytes 1.10.1",
- "chrono",
- "data-encoding",
- "dirs 6.0.0",
- "futures 0.3.31",
- "glob",
- "jupyter-protocol",
- "serde",
- "serde_json",
- "shellexpand 3.1.1",
- "smol",
- "thiserror 2.0.17",
- "uuid",
- "zeromq",
-]
-
 [[package]]
 name = "rust-embed"
 version = "8.7.2"
@@ -13867,32 +4665,6 @@ dependencies = [
  "walkdir",
 ]
 
-[[package]]
-name = "rust-stemmers"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e46a2036019fdb888131db7a4c847a1063a7493f971ed94ea82c67eada63ca54"
-dependencies = [
- "serde",
- "serde_derive",
-]
-
-[[package]]
-name = "rust_decimal"
-version = "1.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35affe401787a9bd846712274d97654355d21b2a2c092a3139aabe31e9022282"
-dependencies = [
- "arrayvec",
- "borsh",
- "bytes 1.10.1",
- "num-traits",
- "rand 0.8.5",
- "rkyv",
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "rustc-demangle"
 version = "0.1.26"
@@ -13920,20 +4692,6 @@ dependencies = [
  "semver",
 ]
 
-[[package]]
-name = "rustfft"
-version = "6.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21db5f9893e91f41798c88680037dba611ca6674703c1a18601b01a72c8adb89"
-dependencies = [
- "num-complex",
- "num-integer",
- "num-traits",
- "primal-check",
- "strength_reduce",
- "transpose",
-]
-
 [[package]]
 name = "rustix"
 version = "0.38.44"
@@ -13941,7 +4699,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
 dependencies = [
  "bitflags 2.9.4",
- "errno 0.3.14",
+ "errno",
  "libc",
  "linux-raw-sys 0.4.15",
  "windows-sys 0.59.0",
@@ -13954,45 +4712,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
 dependencies = [
  "bitflags 2.9.4",
- "errno 0.3.14",
+ "errno",
  "libc",
  "linux-raw-sys 0.11.0",
  "windows-sys 0.61.2",
 ]
 
-[[package]]
-name = "rustix-linux-procfs"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fc84bf7e9aa16c4f2c758f27412dc9841341e16aa682d9c7ac308fe3ee12056"
-dependencies = [
- "once_cell",
- "rustix 1.1.2",
-]
-
-[[package]]
-name = "rustix-openpty"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1de16c7c59892b870a6336f185dc10943517f1327447096bbb7bb32cd85e2393"
-dependencies = [
- "errno 0.3.14",
- "libc",
- "rustix 1.1.2",
-]
-
-[[package]]
-name = "rustls"
-version = "0.21.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e"
-dependencies = [
- "log",
- "ring",
- "rustls-webpki 0.101.7",
- "sct",
-]
-
 [[package]]
 name = "rustls"
 version = "0.23.33"
@@ -14004,23 +4729,11 @@ dependencies = [
  "once_cell",
  "ring",
  "rustls-pki-types",
- "rustls-webpki 0.103.7",
+ "rustls-webpki",
  "subtle",
  "zeroize",
 ]
 
-[[package]]
-name = "rustls-native-certs"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00"
-dependencies = [
- "openssl-probe",
- "rustls-pemfile 1.0.4",
- "schannel",
- "security-framework 2.11.1",
-]
-
 [[package]]
 name = "rustls-native-certs"
 version = "0.8.2"
@@ -14030,16 +4743,7 @@ dependencies = [
  "openssl-probe",
  "rustls-pki-types",
  "schannel",
- "security-framework 3.5.1",
-]
-
-[[package]]
-name = "rustls-pemfile"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
-dependencies = [
- "base64 0.21.7",
+ "security-framework",
 ]
 
 [[package]]
@@ -14072,11 +4776,11 @@ dependencies = [
  "jni",
  "log",
  "once_cell",
- "rustls 0.23.33",
- "rustls-native-certs 0.8.2",
+ "rustls",
+ "rustls-native-certs",
  "rustls-platform-verifier-android",
- "rustls-webpki 0.103.7",
- "security-framework 3.5.1",
+ "rustls-webpki",
+ "security-framework",
  "security-framework-sys",
  "webpki-root-certs",
  "windows-sys 0.59.0",
@@ -14088,16 +4792,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f"
 
-[[package]]
-name = "rustls-webpki"
-version = "0.101.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
-dependencies = [
- "ring",
- "untrusted 0.9.0",
-]
-
 [[package]]
 name = "rustls-webpki"
 version = "0.103.7"
@@ -14107,7 +4801,7 @@ dependencies = [
  "aws-lc-rs",
  "ring",
  "rustls-pki-types",
- "untrusted 0.9.0",
+ "untrusted",
 ]
 
 [[package]]
@@ -14157,25 +4851,6 @@ version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 
-[[package]]
-name = "safetensors"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44560c11236a6130a46ce36c836a62936dc81ebf8c36a37947423571be0e55b6"
-dependencies = [
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "salsa20"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213"
-dependencies = [
- "cipher",
-]
-
 [[package]]
 name = "same-file"
 version = "1.0.6"
@@ -14201,24 +4876,11 @@ dependencies = [
  "async-task",
  "backtrace",
  "chrono",
- "futures 0.3.31",
+ "futures",
  "parking_lot",
  "rand 0.9.2",
 ]
 
-[[package]]
-name = "schema_generator"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "clap",
- "env_logger 0.11.8",
- "schemars",
- "serde",
- "serde_json",
- "theme",
-]
-
 [[package]]
 name = "schemars"
 version = "1.0.4"
@@ -14257,12 +4919,6 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
-[[package]]
-name = "scratch"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d68f2ec51b097e4c1a75b681a8bec621909b5e91f15bb7b840c4f2f7b01148b2"
-
 [[package]]
 name = "screencapturekit"
 version = "0.2.8"
@@ -14286,203 +4942,12 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "scroll"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ab8598aa408498679922eff7fa985c25d58a90771bd6be794434c5277eab1a6"
-dependencies = [
- "scroll_derive",
-]
-
-[[package]]
-name = "scroll_derive"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1783eabc414609e28a5ba76aee5ddd52199f7107a0b24c2e9746a1ecc34a683d"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.106",
-]
-
-[[package]]
-name = "scrypt"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f"
-dependencies = [
- "password-hash 0.5.0",
- "pbkdf2 0.12.2",
- "salsa20",
- "sha2",
-]
-
-[[package]]
-name = "sct"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
-dependencies = [
- "ring",
- "untrusted 0.9.0",
-]
-
-[[package]]
-name = "sea-bae"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f694a6ab48f14bc063cfadff30ab551d3c7e46d8f81836c51989d548f44a2a25"
-dependencies = [
- "heck 0.4.1",
- "proc-macro-error2",
- "proc-macro2",
- "quote",
- "syn 2.0.106",
-]
-
-[[package]]
-name = "sea-orm"
-version = "1.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21e61af841881c137d4bc8e0d8411cee9168548b404f9e4788e8af7e8f94bd4e"
-dependencies = [
- "async-stream",
- "async-trait",
- "bigdecimal",
- "chrono",
- "futures-util",
- "log",
- "ouroboros",
- "pgvector",
- "rust_decimal",
- "sea-orm-macros",
- "sea-query",
- "sea-query-binder",
- "serde",
- "serde_json",
- "sqlx",
- "strum 0.26.3",
- "thiserror 2.0.17",
- "time",
- "tracing",
- "url",
- "uuid",
-]
-
-[[package]]
-name = "sea-orm-macros"
-version = "1.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6b86e3e77b548e6c6c1f612a1ca024d557dffdb81b838bf482ad3222140c77b"
-dependencies = [
- "heck 0.4.1",
- "proc-macro2",
- "quote",
- "sea-bae",
- "syn 2.0.106",
- "unicode-ident",
-]
-
-[[package]]
-name = "sea-query"
-version = "0.32.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a5d1c518eaf5eda38e5773f902b26ab6d5e9e9e2bb2349ca6c64cf96f80448c"
-dependencies = [
- "bigdecimal",
- "chrono",
- "inherent",
- "ordered-float 4.6.0",
- "rust_decimal",
- "serde_json",
- "time",
- "uuid",
-]
-
-[[package]]
-name = "sea-query-binder"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0019f47430f7995af63deda77e238c17323359af241233ec768aba1faea7608"
-dependencies = [
- "bigdecimal",
- "chrono",
- "rust_decimal",
- "sea-query",
- "serde_json",
- "sqlx",
- "time",
- "uuid",
-]
-
 [[package]]
 name = "seahash"
 version = "4.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
 
-[[package]]
-name = "search"
-version = "0.1.0"
-dependencies = [
- "any_vec",
- "anyhow",
- "bitflags 2.9.4",
- "client",
- "collections",
- "editor",
- "futures 0.3.31",
- "gpui",
- "itertools 0.14.0",
- "language",
- "lsp",
- "menu",
- "pretty_assertions",
- "project",
- "schemars",
- "serde",
- "serde_json",
- "settings",
- "smol",
- "theme",
- "tracing",
- "ui",
- "unindent",
- "util",
- "util_macros",
- "workspace",
- "zed_actions",
- "ztracing",
-]
-
-[[package]]
-name = "sec1"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928"
-dependencies = [
- "base16ct",
- "der 0.6.1",
- "generic-array",
- "pkcs8 0.9.0",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "security-framework"
-version = "2.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
-dependencies = [
- "bitflags 2.9.4",
- "core-foundation 0.9.4",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
 [[package]]
 name = "security-framework"
 version = "3.5.1"
@@ -14522,12 +4987,6 @@ dependencies = [
  "serde_core",
 ]
 
-[[package]]
-name = "seq-macro"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bc711410fbe7399f390ca1c3b60ad0f53f80e95c5eb935e52268a0e2cd49acc"
-
 [[package]]
 name = "serde"
 version = "1.0.228"
@@ -14605,17 +5064,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "serde_path_to_error"
-version = "0.1.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10a9ff822e371bb5403e391ecd83e182e0e77ba7f6fe0160b795797109d1b457"
-dependencies = [
- "itoa",
- "serde",
- "serde_core",
-]
-
 [[package]]
 name = "serde_repr"
 version = "0.1.20"
@@ -14657,171 +5105,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "serde_yaml"
-version = "0.9.34+deprecated"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
-dependencies = [
- "indexmap",
- "itoa",
- "ryu",
- "serde",
- "unsafe-libyaml",
-]
-
-[[package]]
-name = "serial2"
-version = "0.2.33"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cc76fa68e25e771492ca1e3c53d447ef0be3093e05cd3b47f4b712ba10c6f3c"
-dependencies = [
- "cfg-if",
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "session"
-version = "0.1.0"
-dependencies = [
- "db",
- "gpui",
- "serde_json",
- "util",
- "uuid",
-]
-
-[[package]]
-name = "settings"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "collections",
- "derive_more 0.99.20",
- "ec4rs",
- "fs",
- "futures 0.3.31",
- "gpui",
- "indoc",
- "inventory",
- "log",
- "migrator",
- "paths",
- "pretty_assertions",
- "release_channel",
- "rust-embed",
- "schemars",
- "serde",
- "serde_json",
- "serde_json_lenient",
- "serde_repr",
- "settings_json",
- "settings_macros",
- "smallvec",
- "strum 0.27.2",
- "unindent",
- "util",
- "zlog",
-]
-
-[[package]]
-name = "settings_json"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "pretty_assertions",
- "serde",
- "serde_json",
- "serde_json_lenient",
- "serde_path_to_error",
- "tree-sitter",
- "tree-sitter-json",
- "unindent",
- "util",
-]
-
-[[package]]
-name = "settings_macros"
-version = "0.1.0"
-dependencies = [
- "quote",
- "settings",
- "syn 2.0.106",
-]
-
-[[package]]
-name = "settings_profile_selector"
-version = "0.1.0"
-dependencies = [
- "client",
- "editor",
- "fuzzy",
- "gpui",
- "language",
- "menu",
- "picker",
- "project",
- "serde_json",
- "settings",
- "theme",
- "ui",
- "workspace",
- "zed_actions",
-]
-
-[[package]]
-name = "settings_ui"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "assets",
- "bm25",
- "client",
- "editor",
- "feature_flags",
- "fs",
- "futures 0.3.31",
- "fuzzy",
- "gpui",
- "heck 0.5.0",
- "language",
- "log",
- "menu",
- "node_runtime",
- "paths",
- "picker",
- "pretty_assertions",
- "project",
- "release_channel",
- "schemars",
- "search",
- "serde",
- "session",
- "settings",
- "strum 0.27.2",
- "telemetry",
- "theme",
- "title_bar",
- "ui",
- "ui_input",
- "util",
- "workspace",
- "zed_actions",
- "zlog",
-]
-
-[[package]]
-name = "sha1"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
 [[package]]
 name = "sha1_smol"
 version = "1.0.1"
@@ -14839,65 +5122,12 @@ dependencies = [
  "digest",
 ]
 
-[[package]]
-name = "sharded-slab"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
-dependencies = [
- "lazy_static",
-]
-
-[[package]]
-name = "shared_library"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a9e7e0f2bfae24d8a5b5a66c5b257a83c7412304311512a0c054cd5e619da11"
-dependencies = [
- "lazy_static",
- "libc",
-]
-
-[[package]]
-name = "shell-words"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde"
-
-[[package]]
-name = "shellexpand"
-version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ccc8076840c4da029af4f87e4e8daeb0fca6b87bbb02e10cb60b791450e11e4"
-dependencies = [
- "dirs 4.0.0",
-]
-
-[[package]]
-name = "shellexpand"
-version = "3.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b1fdf65dd6331831494dd616b30351c38e96e45921a27745cf98490458b90bb"
-dependencies = [
- "dirs 6.0.0",
-]
-
 [[package]]
 name = "shlex"
 version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
-[[package]]
-name = "signal-hook"
-version = "0.3.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d881a16cf4426aa584979d30bd82cb33429027e42122b169753d6ef1085ed6e2"
-dependencies = [
- "libc",
- "signal-hook-registry",
-]
-
 [[package]]
 name = "signal-hook-registry"
 version = "1.4.6"
@@ -14907,26 +5137,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "signature"
-version = "1.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
-dependencies = [
- "digest",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "signature"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
-dependencies = [
- "digest",
- "rand_core 0.6.4",
-]
-
 [[package]]
 name = "simd-adler32"
 version = "0.3.7"
@@ -14942,24 +5152,6 @@ dependencies = [
  "quote",
 ]
 
-[[package]]
-name = "simdutf8"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
-
-[[package]]
-name = "simple_asn1"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "297f631f50729c8c99b84667867963997ec0b50f32b2a7dbcab828ef0541e8bb"
-dependencies = [
- "num-bigint",
- "num-traits",
- "thiserror 2.0.17",
- "time",
-]
-
 [[package]]
 name = "simplecss"
 version = "0.2.2"
@@ -14969,17 +5161,6 @@ dependencies = [
  "log",
 ]
 
-[[package]]
-name = "simplelog"
-version = "0.12.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16257adbfaef1ee58b1363bdc0664c9b8e1e30aed86049635fb5f147d065a9c0"
-dependencies = [
- "log",
- "termcolor",
- "time",
-]
-
 [[package]]
 name = "siphasher"
 version = "1.0.1"
@@ -15002,13 +5183,6 @@ version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
 
-[[package]]
-name = "slash_commands_example"
-version = "0.1.0"
-dependencies = [
- "zed_extension_api 0.1.0",
-]
-
 [[package]]
 name = "slotmap"
 version = "1.0.7"
@@ -15023,20 +5197,6 @@ name = "smallvec"
 version = "1.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "smart-default"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0eb01866308440fc64d6c44d9e86c5cc17adfe33c4d6eed55da9145044d0ffc1"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.106",
-]
 
 [[package]]
 name = "smol"
@@ -15048,7 +5208,7 @@ dependencies = [
  "async-executor",
  "async-fs",
  "async-io",
- "async-lock 3.4.1",
+ "async-lock",
  "async-net",
  "async-process",
  "blocking",
@@ -15061,62 +5221,6 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead"
 
-[[package]]
-name = "snippet"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "smallvec",
-]
-
-[[package]]
-name = "snippet_provider"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "collections",
- "extension",
- "fs",
- "futures 0.3.31",
- "gpui",
- "indoc",
- "parking_lot",
- "paths",
- "schemars",
- "serde",
- "serde_json",
- "serde_json_lenient",
- "snippet",
- "util",
-]
-
-[[package]]
-name = "snippets_ui"
-version = "0.1.0"
-dependencies = [
- "file_finder",
- "file_icons",
- "fuzzy",
- "gpui",
- "language",
- "paths",
- "picker",
- "settings",
- "ui",
- "util",
- "workspace",
-]
-
-[[package]]
-name = "socket2"
-version = "0.5.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678"
-dependencies = [
- "libc",
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "socket2"
 version = "0.6.1"
@@ -15127,15 +5231,6 @@ dependencies = [
  "windows-sys 0.60.2",
 ]
 
-[[package]]
-name = "spdx"
-version = "0.10.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3e17e880bafaeb362a7b751ec46bdc5b61445a188f80e0606e68167cd540fa3"
-dependencies = [
- "smallvec",
-]
-
 [[package]]
 name = "spin"
 version = "0.9.8"
@@ -15163,278 +5258,6 @@ dependencies = [
  "bitflags 2.9.4",
 ]
 
-[[package]]
-name = "spki"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b"
-dependencies = [
- "base64ct",
- "der 0.6.1",
-]
-
-[[package]]
-name = "spki"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
-dependencies = [
- "base64ct",
- "der 0.7.10",
-]
-
-[[package]]
-name = "sptr"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a"
-
-[[package]]
-name = "sqlez"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "collections",
- "futures 0.3.31",
- "indoc",
- "libsqlite3-sys",
- "log",
- "parking_lot",
- "smol",
- "sqlformat",
- "thread_local",
- "util",
- "uuid",
-]
-
-[[package]]
-name = "sqlez_macros"
-version = "0.1.0"
-dependencies = [
- "sqlez",
- "sqlformat",
- "syn 2.0.106",
-]
-
-[[package]]
-name = "sqlformat"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bba3a93db0cc4f7bdece8bb09e77e2e785c20bfebf79eb8340ed80708048790"
-dependencies = [
- "nom 7.1.3",
- "unicode_categories",
-]
-
-[[package]]
-name = "sqlx"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fefb893899429669dcdd979aff487bd78f4064e5e7907e4269081e0ef7d97dc"
-dependencies = [
- "sqlx-core",
- "sqlx-macros",
- "sqlx-mysql",
- "sqlx-postgres",
- "sqlx-sqlite",
-]
-
-[[package]]
-name = "sqlx-core"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee6798b1838b6a0f69c007c133b8df5866302197e404e8b6ee8ed3e3a5e68dc6"
-dependencies = [
- "base64 0.22.1",
- "bigdecimal",
- "bytes 1.10.1",
- "chrono",
- "crc",
- "crossbeam-queue",
- "either",
- "event-listener 5.4.1",
- "futures-core",
- "futures-intrusive",
- "futures-io",
- "futures-util",
- "hashbrown 0.15.5",
- "hashlink 0.10.0",
- "indexmap",
- "log",
- "memchr",
- "once_cell",
- "percent-encoding",
- "rust_decimal",
- "rustls 0.23.33",
- "serde",
- "serde_json",
- "sha2",
- "smallvec",
- "thiserror 2.0.17",
- "time",
- "tokio",
- "tokio-stream",
- "tracing",
- "url",
- "uuid",
- "webpki-roots",
-]
-
-[[package]]
-name = "sqlx-macros"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2d452988ccaacfbf5e0bdbc348fb91d7c8af5bee192173ac3636b5fb6e6715d"
-dependencies = [
- "proc-macro2",
- "quote",
- "sqlx-core",
- "sqlx-macros-core",
- "syn 2.0.106",
-]
-
-[[package]]
-name = "sqlx-macros-core"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19a9c1841124ac5a61741f96e1d9e2ec77424bf323962dd894bdb93f37d5219b"
-dependencies = [
- "dotenvy",
- "either",
- "heck 0.5.0",
- "hex",
- "once_cell",
- "proc-macro2",
- "quote",
- "serde",
- "serde_json",
- "sha2",
- "sqlx-core",
- "sqlx-mysql",
- "sqlx-postgres",
- "sqlx-sqlite",
- "syn 2.0.106",
- "tokio",
- "url",
-]
-
-[[package]]
-name = "sqlx-mysql"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa003f0038df784eb8fecbbac13affe3da23b45194bd57dba231c8f48199c526"
-dependencies = [
- "atoi",
- "base64 0.22.1",
- "bigdecimal",
- "bitflags 2.9.4",
- "byteorder",
- "bytes 1.10.1",
- "chrono",
- "crc",
- "digest",
- "dotenvy",
- "either",
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-util",
- "generic-array",
- "hex",
- "hkdf",
- "hmac",
- "itoa",
- "log",
- "md-5",
- "memchr",
- "once_cell",
- "percent-encoding",
- "rand 0.8.5",
- "rsa",
- "rust_decimal",
- "serde",
- "sha1",
- "sha2",
- "smallvec",
- "sqlx-core",
- "stringprep",
- "thiserror 2.0.17",
- "time",
- "tracing",
- "uuid",
- "whoami",
-]
-
-[[package]]
-name = "sqlx-postgres"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db58fcd5a53cf07c184b154801ff91347e4c30d17a3562a635ff028ad5deda46"
-dependencies = [
- "atoi",
- "base64 0.22.1",
- "bigdecimal",
- "bitflags 2.9.4",
- "byteorder",
- "chrono",
- "crc",
- "dotenvy",
- "etcetera",
- "futures-channel",
- "futures-core",
- "futures-util",
- "hex",
- "hkdf",
- "hmac",
- "home",
- "itoa",
- "log",
- "md-5",
- "memchr",
- "num-bigint",
- "once_cell",
- "rand 0.8.5",
- "rust_decimal",
- "serde",
- "serde_json",
- "sha2",
- "smallvec",
- "sqlx-core",
- "stringprep",
- "thiserror 2.0.17",
- "time",
- "tracing",
- "uuid",
- "whoami",
-]
-
-[[package]]
-name = "sqlx-sqlite"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2d12fe70b2c1b4401038055f90f151b78208de1f9f89a7dbfd41587a10c3eea"
-dependencies = [
- "atoi",
- "chrono",
- "flume",
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-intrusive",
- "futures-util",
- "libsqlite3-sys",
- "log",
- "percent-encoding",
- "serde",
- "serde_urlencoded",
- "sqlx-core",
- "thiserror 2.0.17",
- "time",
- "tracing",
- "url",
- "uuid",
-]
-
 [[package]]
 name = "stable_deref_trait"
 version = "1.2.1"
@@ -15481,74 +5304,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
-[[package]]
-name = "stop-words"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645a3d441ccf4bf47f2e4b7681461986681a6eeea9937d4c3bc9febd61d17c71"
-dependencies = [
- "serde_json",
-]
-
-[[package]]
-name = "story"
-version = "0.1.0"
-dependencies = [
- "gpui",
- "itertools 0.14.0",
- "smallvec",
-]
-
-[[package]]
-name = "storybook"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "clap",
- "collab_ui",
- "ctrlc",
- "dialoguer",
- "editor",
- "fuzzy",
- "gpui",
- "indoc",
- "language",
- "log",
- "menu",
- "picker",
- "reqwest_client",
- "rust-embed",
- "settings",
- "simplelog",
- "story",
- "strum 0.27.2",
- "theme",
- "title_bar",
- "ui",
-]
-
-[[package]]
-name = "streaming-iterator"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b2231b7c3057d5e4ad0156fb3dc807d900806020c5ffa3ee6ff2c8c76fb8520"
-
-[[package]]
-name = "streaming_diff"
-version = "0.1.0"
-dependencies = [
- "ordered-float 2.10.1",
- "rand 0.9.2",
- "rope",
- "util",
-]
-
-[[package]]
-name = "strength_reduce"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe895eb47f22e2ddd4dabc02bce419d2e643c8e3b585c78158b349195bc24d82"
-
 [[package]]
 name = "strict-num"
 version = "0.1.1"
@@ -15566,7 +5321,7 @@ checksum = "bf776ba3fa74f83bf4b63c3dcbbf82173db2632ed8452cb2d891d33f459de70f"
 dependencies = [
  "new_debug_unreachable",
  "parking_lot",
- "phf_shared 0.11.3",
+ "phf_shared",
  "precomputed-hash",
  "serde",
 ]
@@ -15577,29 +5332,12 @@ version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c711928715f1fe0fe509c53b43e993a9a557babc2d0a3567d0a3006f1ac931a0"
 dependencies = [
- "phf_generator 0.11.3",
- "phf_shared 0.11.3",
+ "phf_generator",
+ "phf_shared",
  "proc-macro2",
  "quote",
 ]
 
-[[package]]
-name = "stringprep"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
- "unicode-properties",
-]
-
-[[package]]
-name = "strsim"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
-
 [[package]]
 name = "strum"
 version = "0.26.3"
@@ -15659,51 +5397,6 @@ dependencies = [
  "rand 0.9.2",
  "rayon",
  "tracing",
- "zlog",
- "ztracing",
-]
-
-[[package]]
-name = "supermaven"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "client",
- "collections",
- "edit_prediction_types",
- "editor",
- "env_logger 0.11.8",
- "futures 0.3.31",
- "gpui",
- "http_client",
- "language",
- "log",
- "postage",
- "project",
- "serde",
- "serde_json",
- "settings",
- "smol",
- "supermaven_api",
- "text",
- "theme",
- "ui",
- "unicode-segmentation",
- "util",
-]
-
-[[package]]
-name = "supermaven_api"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "futures 0.3.31",
- "http_client",
- "paths",
- "serde",
- "serde_json",
- "smol",
- "util",
 ]
 
 [[package]]
@@ -15790,18 +5483,6 @@ version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0193cc4331cfd2f3d2011ef287590868599a2f33c3e69bc22c1a3d3acf9e02fb"
 
-[[package]]
-name = "svg_preview"
-version = "0.1.0"
-dependencies = [
- "file_icons",
- "gpui",
- "language",
- "multi_buffer",
- "ui",
- "workspace",
-]
-
 [[package]]
 name = "svgtypes"
 version = "0.15.3"
@@ -15823,153 +5504,6 @@ dependencies = [
  "zeno",
 ]
 
-[[package]]
-name = "symphonia"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5773a4c030a19d9bfaa090f49746ff35c75dfddfa700df7a5939d5e076a57039"
-dependencies = [
- "lazy_static",
- "symphonia-bundle-flac",
- "symphonia-bundle-mp3",
- "symphonia-codec-aac",
- "symphonia-codec-pcm",
- "symphonia-codec-vorbis",
- "symphonia-core",
- "symphonia-format-isomp4",
- "symphonia-format-ogg",
- "symphonia-format-riff",
- "symphonia-metadata",
-]
-
-[[package]]
-name = "symphonia-bundle-flac"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c91565e180aea25d9b80a910c546802526ffd0072d0b8974e3ebe59b686c9976"
-dependencies = [
- "log",
- "symphonia-core",
- "symphonia-metadata",
- "symphonia-utils-xiph",
-]
-
-[[package]]
-name = "symphonia-bundle-mp3"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4872dd6bb56bf5eac799e3e957aa1981086c3e613b27e0ac23b176054f7c57ed"
-dependencies = [
- "lazy_static",
- "log",
- "symphonia-core",
- "symphonia-metadata",
-]
-
-[[package]]
-name = "symphonia-codec-aac"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c263845aa86881416849c1729a54c7f55164f8b96111dba59de46849e73a790"
-dependencies = [
- "lazy_static",
- "log",
- "symphonia-core",
-]
-
-[[package]]
-name = "symphonia-codec-pcm"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e89d716c01541ad3ebe7c91ce4c8d38a7cf266a3f7b2f090b108fb0cb031d95"
-dependencies = [
- "log",
- "symphonia-core",
-]
-
-[[package]]
-name = "symphonia-codec-vorbis"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f025837c309cd69ffef572750b4a2257b59552c5399a5e49707cc5b1b85d1c73"
-dependencies = [
- "log",
- "symphonia-core",
- "symphonia-utils-xiph",
-]
-
-[[package]]
-name = "symphonia-core"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea00cc4f79b7f6bb7ff87eddc065a1066f3a43fe1875979056672c9ef948c2af"
-dependencies = [
- "arrayvec",
- "bitflags 1.3.2",
- "bytemuck",
- "lazy_static",
- "log",
-]
-
-[[package]]
-name = "symphonia-format-isomp4"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "243739585d11f81daf8dac8d9f3d18cc7898f6c09a259675fc364b382c30e0a5"
-dependencies = [
- "encoding_rs",
- "log",
- "symphonia-core",
- "symphonia-metadata",
- "symphonia-utils-xiph",
-]
-
-[[package]]
-name = "symphonia-format-ogg"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b4955c67c1ed3aa8ae8428d04ca8397fbef6a19b2b051e73b5da8b1435639cb"
-dependencies = [
- "log",
- "symphonia-core",
- "symphonia-metadata",
- "symphonia-utils-xiph",
-]
-
-[[package]]
-name = "symphonia-format-riff"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2d7c3df0e7d94efb68401d81906eae73c02b40d5ec1a141962c592d0f11a96f"
-dependencies = [
- "extended",
- "log",
- "symphonia-core",
- "symphonia-metadata",
-]
-
-[[package]]
-name = "symphonia-metadata"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36306ff42b9ffe6e5afc99d49e121e0bd62fe79b9db7b9681d48e29fa19e6b16"
-dependencies = [
- "encoding_rs",
- "lazy_static",
- "log",
- "symphonia-core",
-]
-
-[[package]]
-name = "symphonia-utils-xiph"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee27c85ab799a338446b68eec77abf42e1a6f1bb490656e121c6e27bfbab9f16"
-dependencies = [
- "symphonia-core",
- "symphonia-metadata",
-]
-
 [[package]]
 name = "syn"
 version = "1.0.109"
@@ -15992,12 +5526,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "sync_wrapper"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
-
 [[package]]
 name = "sync_wrapper"
 version = "1.0.2"
@@ -16007,15 +5535,6 @@ dependencies = [
  "futures-core",
 ]
 
-[[package]]
-name = "synchronoise"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dbc01390fc626ce8d1cffe3376ded2b72a11bb70e1c75f404a210e4daa4def2"
-dependencies = [
- "crossbeam-queue",
-]
-
 [[package]]
 name = "synstructure"
 version = "0.13.2"
@@ -16036,34 +5555,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "sysctl"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec7dddc5f0fee506baf8b9fdb989e242f17e4b11c61dfbb0635b705217199eea"
-dependencies = [
- "bitflags 2.9.4",
- "byteorder",
- "enum-as-inner",
- "libc",
- "thiserror 1.0.69",
- "walkdir",
-]
-
-[[package]]
-name = "sysctl"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01198a2debb237c62b6826ec7081082d951f46dbb64b0e8c7649a452230d1dfc"
-dependencies = [
- "bitflags 2.9.4",
- "byteorder",
- "enum-as-inner",
- "libc",
- "thiserror 1.0.69",
- "walkdir",
-]
-
 [[package]]
 name = "sysinfo"
 version = "0.31.4"
@@ -16078,31 +5569,6 @@ dependencies = [
  "windows 0.57.0",
 ]
 
-[[package]]
-name = "sysinfo"
-version = "0.37.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16607d5caffd1c07ce073528f9ed972d88db15dd44023fa57142963be3feb11f"
-dependencies = [
- "libc",
- "memchr",
- "ntapi",
- "objc2-core-foundation",
- "objc2-io-kit",
- "windows 0.61.3",
-]
-
-[[package]]
-name = "system-configuration"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation 0.9.4",
- "system-configuration-sys 0.5.0",
-]
-
 [[package]]
 name = "system-configuration"
 version = "0.6.1"
@@ -16111,17 +5577,7 @@ checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
 dependencies = [
  "bitflags 2.9.4",
  "core-foundation 0.9.4",
- "system-configuration-sys 0.6.0",
-]
-
-[[package]]
-name = "system-configuration-sys"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
-dependencies = [
- "core-foundation-sys",
- "libc",
+ "system-configuration-sys",
 ]
 
 [[package]]
@@ -16147,63 +5603,6 @@ dependencies = [
  "version-compare",
 ]
 
-[[package]]
-name = "system-interface"
-version = "0.27.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc4592f674ce18521c2a81483873a49596655b179f71c5e05d10c1fe66c78745"
-dependencies = [
- "bitflags 2.9.4",
- "cap-fs-ext",
- "cap-std",
- "fd-lock",
- "io-lifetimes",
- "rustix 0.38.44",
- "windows-sys 0.59.0",
- "winx",
-]
-
-[[package]]
-name = "system_specs"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "client",
- "gpui",
- "human_bytes",
- "pciid-parser",
- "release_channel",
- "semver",
- "serde",
- "sysinfo 0.37.2",
-]
-
-[[package]]
-name = "tab_switcher"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "collections",
- "ctor",
- "editor",
- "fuzzy",
- "gpui",
- "language",
- "menu",
- "picker",
- "project",
- "schemars",
- "serde",
- "serde_json",
- "settings",
- "smol",
- "theme",
- "ui",
- "util",
- "workspace",
- "zlog",
-]
-
 [[package]]
 name = "taffy"
 version = "0.9.0"
@@ -16216,12 +5615,6 @@ dependencies = [
  "slotmap",
 ]
 
-[[package]]
-name = "tagptr"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417"
-
 [[package]]
 name = "take-until"
 version = "0.2.0"
@@ -16240,92 +5633,12 @@ dependencies = [
  "objc",
 ]
 
-[[package]]
-name = "tap"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
-
 [[package]]
 name = "target-lexicon"
 version = "0.12.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 
-[[package]]
-name = "target-lexicon"
-version = "0.13.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df7f62577c25e07834649fc3b39fafdc597c0a3527dc1c60129201ccfcbaa50c"
-
-[[package]]
-name = "task"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "collections",
- "futures 0.3.31",
- "gpui",
- "hex",
- "log",
- "parking_lot",
- "pretty_assertions",
- "proto",
- "schemars",
- "serde",
- "serde_json",
- "serde_json_lenient",
- "sha2",
- "shellexpand 2.1.2",
- "util",
- "zed_actions",
-]
-
-[[package]]
-name = "tasks_ui"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "collections",
- "editor",
- "file_icons",
- "fuzzy",
- "gpui",
- "itertools 0.14.0",
- "language",
- "menu",
- "picker",
- "project",
- "serde",
- "serde_json",
- "task",
- "tree-sitter-rust",
- "tree-sitter-typescript",
- "ui",
- "util",
- "workspace",
- "zed_actions",
-]
-
-[[package]]
-name = "telemetry"
-version = "0.1.0"
-dependencies = [
- "futures 0.3.31",
- "serde",
- "serde_json",
- "telemetry_events",
-]
-
-[[package]]
-name = "telemetry_events"
-version = "0.1.0"
-dependencies = [
- "semver",
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "tempfile"
 version = "3.23.0"
@@ -16359,181 +5672,6 @@ dependencies = [
  "winapi-util",
 ]
 
-[[package]]
-name = "terminal"
-version = "0.1.0"
-dependencies = [
- "alacritty_terminal",
- "anyhow",
- "collections",
- "futures 0.3.31",
- "gpui",
- "itertools 0.14.0",
- "libc",
- "log",
- "rand 0.9.2",
- "regex",
- "release_channel",
- "schemars",
- "serde",
- "serde_json",
- "settings",
- "smol",
- "sysinfo 0.37.2",
- "task",
- "theme",
- "thiserror 2.0.17",
- "url",
- "urlencoding",
- "util",
- "util_macros",
- "windows 0.61.3",
-]
-
-[[package]]
-name = "terminal_size"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b8cb979cb11c32ce1603f8137b22262a9d131aaa5c37b5678025f22b8becd0"
-dependencies = [
- "rustix 1.1.2",
- "windows-sys 0.60.2",
-]
-
-[[package]]
-name = "terminal_view"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "assistant_slash_command",
- "async-recursion",
- "breadcrumbs",
- "client",
- "collections",
- "db",
- "dirs 4.0.0",
- "editor",
- "futures 0.3.31",
- "gpui",
- "itertools 0.14.0",
- "language",
- "log",
- "pretty_assertions",
- "project",
- "rand 0.9.2",
- "regex",
- "schemars",
- "search",
- "serde",
- "serde_json",
- "settings",
- "shellexpand 2.1.2",
- "task",
- "terminal",
- "theme",
- "ui",
- "util",
- "workspace",
- "zed_actions",
-]
-
-[[package]]
-name = "text"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "clock",
- "collections",
- "ctor",
- "gpui",
- "http_client",
- "log",
- "parking_lot",
- "postage",
- "rand 0.9.2",
- "regex",
- "rope",
- "smallvec",
- "sum_tree",
- "util",
- "zlog",
-]
-
-[[package]]
-name = "theme"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "collections",
- "derive_more 0.99.20",
- "fs",
- "futures 0.3.31",
- "gpui",
- "log",
- "palette",
- "parking_lot",
- "refineable",
- "schemars",
- "serde",
- "serde_json",
- "serde_json_lenient",
- "settings",
- "strum 0.27.2",
- "thiserror 2.0.17",
- "util",
- "uuid",
-]
-
-[[package]]
-name = "theme_extension"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "extension",
- "fs",
- "gpui",
- "theme",
-]
-
-[[package]]
-name = "theme_importer"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "clap",
- "collections",
- "gpui",
- "indexmap",
- "log",
- "palette",
- "serde",
- "serde_json",
- "serde_json_lenient",
- "simplelog",
- "strum 0.27.2",
- "theme",
- "vscode_theme",
-]
-
-[[package]]
-name = "theme_selector"
-version = "0.1.0"
-dependencies = [
- "fs",
- "fuzzy",
- "gpui",
- "log",
- "picker",
- "serde",
- "settings",
- "telemetry",
- "theme",
- "ui",
- "util",
- "workspace",
- "zed_actions",
-]
-
 [[package]]
 name = "thiserror"
 version = "1.0.69"
@@ -16574,15 +5712,6 @@ dependencies = [
  "syn 2.0.106",
 ]
 
-[[package]]
-name = "thread_local"
-version = "1.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185"
-dependencies = [
- "cfg-if",
-]
-
 [[package]]
 name = "tiff"
 version = "0.10.3"
@@ -16597,63 +5726,6 @@ dependencies = [
  "zune-jpeg",
 ]
 
-[[package]]
-name = "tiktoken-rs"
-version = "0.9.1"
-source = "git+https://github.com/zed-industries/tiktoken-rs?rev=2570c4387a8505fb8f1d3f3557454b474f1e8271#2570c4387a8505fb8f1d3f3557454b474f1e8271"
-dependencies = [
- "anyhow",
- "base64 0.22.1",
- "bstr",
- "fancy-regex",
- "lazy_static",
- "regex",
- "rustc-hash 1.1.0",
-]
-
-[[package]]
-name = "time"
-version = "0.3.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d"
-dependencies = [
- "deranged",
- "itoa",
- "libc",
- "num-conv",
- "num_threads",
- "powerfmt",
- "serde",
- "time-core",
- "time-macros",
-]
-
-[[package]]
-name = "time-core"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b"
-
-[[package]]
-name = "time-macros"
-version = "0.2.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3"
-dependencies = [
- "num-conv",
- "time-core",
-]
-
-[[package]]
-name = "time_format"
-version = "0.1.0"
-dependencies = [
- "core-foundation 0.10.0",
- "core-foundation-sys",
- "sys-locale",
- "time",
-]
-
 [[package]]
 name = "tiny-keccak"
 version = "2.0.2"
@@ -16689,19 +5761,6 @@ dependencies = [
  "strict-num",
 ]
 
-[[package]]
-name = "tiny_http"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce51b50006056f590c9b7c3808c3bd70f0d1101666629713866c227d6e58d39"
-dependencies = [
- "ascii",
- "chrono",
- "chunked_transfer",
- "log",
- "url",
-]
-
 [[package]]
 name = "tinystr"
 version = "0.8.1"
@@ -16712,16 +5771,6 @@ dependencies = [
  "zerovec",
 ]
 
-[[package]]
-name = "tinytemplate"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"
-dependencies = [
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "tinyvec"
 version = "1.10.0"
@@ -16737,107 +5786,27 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
-[[package]]
-name = "title_bar"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "auto_update",
- "call",
- "channel",
- "chrono",
- "client",
- "cloud_llm_client",
- "collections",
- "db",
- "gpui",
- "http_client",
- "notifications",
- "pretty_assertions",
- "project",
- "remote",
- "rpc",
- "schemars",
- "serde",
- "settings",
- "smallvec",
- "story",
- "telemetry",
- "theme",
- "tree-sitter-md",
- "ui",
- "util",
- "windows 0.61.3",
- "workspace",
- "zed_actions",
-]
-
 [[package]]
 name = "tokio"
 version = "1.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408"
 dependencies = [
- "bytes 1.10.1",
+ "bytes",
  "libc",
- "mio 1.1.0",
- "parking_lot",
+ "mio",
  "pin-project-lite",
- "signal-hook-registry",
- "socket2 0.6.1",
- "tokio-macros",
+ "socket2",
  "windows-sys 0.61.2",
 ]
 
-[[package]]
-name = "tokio-io"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674"
-dependencies = [
- "bytes 0.4.12",
- "futures 0.1.31",
- "log",
-]
-
-[[package]]
-name = "tokio-macros"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.106",
-]
-
-[[package]]
-name = "tokio-native-tls"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
-dependencies = [
- "native-tls",
- "tokio",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
-dependencies = [
- "rustls 0.21.12",
- "tokio",
-]
-
 [[package]]
 name = "tokio-rustls"
 version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b"
 dependencies = [
- "rustls 0.23.33",
+ "rustls",
  "tokio",
 ]
 
@@ -16848,85 +5817,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f"
 dependencies = [
  "either",
- "futures-io",
  "futures-util",
  "thiserror 1.0.69",
  "tokio",
 ]
 
-[[package]]
-name = "tokio-stream"
-version = "0.1.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
-dependencies = [
- "futures-core",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "tokio-tungstenite"
-version = "0.20.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c"
-dependencies = [
- "futures-util",
- "log",
- "tokio",
- "tungstenite 0.20.1",
-]
-
-[[package]]
-name = "tokio-tungstenite"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38"
-dependencies = [
- "futures-util",
- "log",
- "tokio",
- "tungstenite 0.21.0",
-]
-
-[[package]]
-name = "tokio-tungstenite"
-version = "0.26.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a9daff607c6d2bf6c16fd681ccb7eecc83e4e2cdc1ca067ffaadfca5de7f084"
-dependencies = [
- "futures-util",
- "log",
- "rustls 0.23.33",
- "rustls-pki-types",
- "tokio",
- "tokio-rustls 0.26.2",
- "tungstenite 0.26.2",
-]
-
 [[package]]
 name = "tokio-util"
 version = "0.7.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "14307c986784f72ef81c89db7d9e28d6ac26d16213b109ea501696195e6e3ce5"
 dependencies = [
- "bytes 1.10.1",
+ "bytes",
  "futures-core",
- "futures-io",
  "futures-sink",
  "pin-project-lite",
  "tokio",
 ]
 
-[[package]]
-name = "toml"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "toml"
 version = "0.8.23"
@@ -17019,48 +5927,6 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df8b2b54733674ad286d16267dcfc7a71ed5c776e4ac7aa3c3e2561f7c637bf2"
 
-[[package]]
-name = "toolchain_selector"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "convert_case 0.8.0",
- "editor",
- "file_finder",
- "futures 0.3.31",
- "fuzzy",
- "gpui",
- "language",
- "menu",
- "picker",
- "project",
- "ui",
- "util",
- "workspace",
-]
-
-[[package]]
-name = "topological-sort"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea68304e134ecd095ac6c3574494fc62b909f416c4fca77e440530221e549d3d"
-
-[[package]]
-name = "tower"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
-dependencies = [
- "futures-core",
- "futures-util",
- "pin-project",
- "pin-project-lite",
- "tokio",
- "tower-layer",
- "tower-service",
- "tracing",
-]
-
 [[package]]
 name = "tower"
 version = "0.5.2"
@@ -17070,67 +5936,12 @@ dependencies = [
  "futures-core",
  "futures-util",
  "pin-project-lite",
- "sync_wrapper 1.0.2",
+ "sync_wrapper",
  "tokio",
  "tower-layer",
  "tower-service",
 ]
 
-[[package]]
-name = "tower-http"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858"
-dependencies = [
- "bitflags 1.3.2",
- "bytes 1.10.1",
- "futures-core",
- "futures-util",
- "http 0.2.12",
- "http-body 0.4.6",
- "http-range-header",
- "pin-project-lite",
- "tower-layer",
- "tower-service",
-]
-
-[[package]]
-name = "tower-http"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140"
-dependencies = [
- "bitflags 2.9.4",
- "bytes 1.10.1",
- "futures-core",
- "futures-util",
- "http 0.2.12",
- "http-body 0.4.6",
- "http-range-header",
- "pin-project-lite",
- "tower-layer",
- "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "tower-http"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2"
-dependencies = [
- "bitflags 2.9.4",
- "bytes 1.10.1",
- "futures-util",
- "http 1.3.1",
- "http-body 1.0.1",
- "iri-string",
- "pin-project-lite",
- "tower 0.5.2",
- "tower-layer",
- "tower-service",
-]
-
 [[package]]
 name = "tower-layer"
 version = "0.3.3"
@@ -17173,335 +5984,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a04e24fab5c89c6a36eb8558c9656f30d81de51dfa4d3b45f26b21d61fa0a6c"
 dependencies = [
  "once_cell",
- "valuable",
-]
-
-[[package]]
-name = "tracing-log"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
-dependencies = [
- "log",
- "once_cell",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-serde"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "704b1aeb7be0d0a84fc9828cae51dab5970fee5088f83d1dd7ee6f6246fc6ff1"
-dependencies = [
- "serde",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-subscriber"
-version = "0.3.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e"
-dependencies = [
- "matchers",
- "nu-ansi-term",
- "once_cell",
- "regex-automata",
- "serde",
- "serde_json",
- "sharded-slab",
- "smallvec",
- "thread_local",
- "tracing",
- "tracing-core",
- "tracing-log",
- "tracing-serde",
-]
-
-[[package]]
-name = "tracing-tracy"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0eaa1852afa96e0fe9e44caa53dc0bd2d9d05e0f2611ce09f97f8677af56e4ba"
-dependencies = [
- "tracing-core",
- "tracing-subscriber",
- "tracy-client",
-]
-
-[[package]]
-name = "tracy-client"
-version = "0.18.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91d722a05fe49b31fef971c4732a7d4aa6a18283d9ba46abddab35f484872947"
-dependencies = [
- "loom",
- "once_cell",
- "tracy-client-sys",
-]
-
-[[package]]
-name = "tracy-client-sys"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fb391ac70462b3097a755618fbf9c8f95ecc1eb379a414f7b46f202ed10db1f"
-dependencies = [
- "cc",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "trait-variant"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70977707304198400eb4835a78f6a9f928bf41bba420deb8fdb175cd965d77a7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.106",
-]
-
-[[package]]
-name = "transpose"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ad61aed86bc3faea4300c7aee358b4c6d0c8d6ccc36524c96e4c92ccf26e77e"
-dependencies = [
- "num-integer",
- "strength_reduce",
-]
-
-[[package]]
-name = "tree-sitter"
-version = "0.25.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78f873475d258561b06f1c595d93308a7ed124d9977cb26b148c2084a4a3cc87"
-dependencies = [
- "cc",
- "regex",
- "regex-syntax",
- "serde_json",
- "streaming-iterator",
- "tree-sitter-language",
- "wasmtime-c-api-impl",
-]
-
-[[package]]
-name = "tree-sitter-bash"
-version = "0.25.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e5ec769279cc91b561d3df0d8a5deb26b0ad40d183127f409494d6d8fc53062"
-dependencies = [
- "cc",
- "tree-sitter-language",
-]
-
-[[package]]
-name = "tree-sitter-c"
-version = "0.23.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afd2b1bf1585dc2ef6d69e87d01db8adb059006649dd5f96f31aa789ee6e9c71"
-dependencies = [
- "cc",
- "tree-sitter-language",
-]
-
-[[package]]
-name = "tree-sitter-cpp"
-version = "0.23.4"
-source = "git+https://github.com/tree-sitter/tree-sitter-cpp?rev=5cb9b693cfd7bfacab1d9ff4acac1a4150700609#5cb9b693cfd7bfacab1d9ff4acac1a4150700609"
-dependencies = [
- "cc",
- "tree-sitter-language",
-]
-
-[[package]]
-name = "tree-sitter-css"
-version = "0.23.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ad6489794d41350d12a7fbe520e5199f688618f43aace5443980d1ddcf1b29e"
-dependencies = [
- "cc",
- "tree-sitter-language",
-]
-
-[[package]]
-name = "tree-sitter-diff"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfe1e5ca280a65dfe5ba4205c1bcc84edf486464fed315db53dee6da9a335889"
-dependencies = [
- "cc",
- "tree-sitter-language",
-]
-
-[[package]]
-name = "tree-sitter-elixir"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e45d444647b4fd53d8fd32474c1b8bedc1baa22669ce3a78d083e365fa9a2d3f"
-dependencies = [
- "cc",
- "tree-sitter-language",
-]
-
-[[package]]
-name = "tree-sitter-embedded-template"
-version = "0.23.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "790063ef14e5b67556abc0b3be0ed863fb41d65ee791cf8c0b20eb42a1fa46af"
-dependencies = [
- "cc",
- "tree-sitter-language",
-]
-
-[[package]]
-name = "tree-sitter-gitcommit"
-version = "0.0.1"
-source = "git+https://github.com/zed-industries/tree-sitter-git-commit?rev=88309716a69dd13ab83443721ba6e0b491d37ee9#88309716a69dd13ab83443721ba6e0b491d37ee9"
-dependencies = [
- "cc",
- "tree-sitter-language",
-]
-
-[[package]]
-name = "tree-sitter-go"
-version = "0.23.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b13d476345220dbe600147dd444165c5791bf85ef53e28acbedd46112ee18431"
-dependencies = [
- "cc",
- "tree-sitter-language",
-]
-
-[[package]]
-name = "tree-sitter-gomod"
-version = "1.1.1"
-source = "git+https://github.com/camdencheek/tree-sitter-go-mod?rev=2e886870578eeba1927a2dc4bd2e2b3f598c5f9a#2e886870578eeba1927a2dc4bd2e2b3f598c5f9a"
-dependencies = [
- "cc",
- "tree-sitter-language",
-]
-
-[[package]]
-name = "tree-sitter-gowork"
-version = "0.0.1"
-source = "git+https://github.com/zed-industries/tree-sitter-go-work?rev=acb0617bf7f4fda02c6217676cc64acb89536dc7#acb0617bf7f4fda02c6217676cc64acb89536dc7"
-dependencies = [
- "cc",
- "tree-sitter-language",
-]
-
-[[package]]
-name = "tree-sitter-heex"
-version = "0.0.1"
-source = "git+https://github.com/zed-industries/tree-sitter-heex?rev=1dd45142fbb05562e35b2040c6129c9bca346592#1dd45142fbb05562e35b2040c6129c9bca346592"
-dependencies = [
- "cc",
- "tree-sitter-language",
-]
-
-[[package]]
-name = "tree-sitter-html"
-version = "0.23.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "261b708e5d92061ede329babaaa427b819329a9d427a1d710abb0f67bbef63ee"
-dependencies = [
- "cc",
- "tree-sitter-language",
-]
-
-[[package]]
-name = "tree-sitter-jsdoc"
-version = "0.23.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3862dfcb1038fc5e7812d7df14190afdeb7e1415288fd5f51f58395f8cb0faf"
-dependencies = [
- "cc",
- "tree-sitter-language",
-]
-
-[[package]]
-name = "tree-sitter-json"
-version = "0.24.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d727acca406c0020cffc6cf35516764f36c8e3dc4408e5ebe2cb35a947ec471"
-dependencies = [
- "cc",
- "tree-sitter-language",
-]
-
-[[package]]
-name = "tree-sitter-language"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4013970217383f67b18aef68f6fb2e8d409bc5755227092d32efb0422ba24b8"
-
-[[package]]
-name = "tree-sitter-md"
-version = "0.3.2"
-source = "git+https://github.com/tree-sitter-grammars/tree-sitter-markdown?rev=9a23c1a96c0513d8fc6520972beedd419a973539#9a23c1a96c0513d8fc6520972beedd419a973539"
-dependencies = [
- "cc",
- "tree-sitter-language",
-]
-
-[[package]]
-name = "tree-sitter-python"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bf85fd39652e740bf60f46f4cda9492c3a9ad75880575bf14960f775cb74a1c"
-dependencies = [
- "cc",
- "tree-sitter-language",
-]
-
-[[package]]
-name = "tree-sitter-regex"
-version = "0.24.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712656f8c262a5a4b7d6026e6246950787d178d613864952554e1516a33ab0c1"
-dependencies = [
- "cc",
- "tree-sitter-language",
-]
-
-[[package]]
-name = "tree-sitter-ruby"
-version = "0.23.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be0484ea4ef6bb9c575b4fdabde7e31340a8d2dbc7d52b321ac83da703249f95"
-dependencies = [
- "cc",
- "tree-sitter-language",
-]
-
-[[package]]
-name = "tree-sitter-rust"
-version = "0.24.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b9b18034c684a2420722be8b2a91c9c44f2546b631c039edf575ccba8c61be1"
-dependencies = [
- "cc",
- "tree-sitter-language",
-]
-
-[[package]]
-name = "tree-sitter-typescript"
-version = "0.23.2"
-source = "git+https://github.com/zed-industries/tree-sitter-typescript?rev=e2c53597d6a5d9cf7bbe8dccde576fe1e46c5899#e2c53597d6a5d9cf7bbe8dccde576fe1e46c5899"
-dependencies = [
- "cc",
- "tree-sitter-language",
-]
-
-[[package]]
-name = "tree-sitter-yaml"
-version = "0.6.1"
-source = "git+https://github.com/zed-industries/tree-sitter-yaml?rev=baff0b51c64ef6a1fb1f8390f3ad6015b83ec13a#baff0b51c64ef6a1fb1f8390f3ad6015b83ec13a"
-dependencies = [
- "cc",
- "tree-sitter-language",
 ]
 
 [[package]]
@@ -17531,88 +6013,6 @@ dependencies = [
  "core_maths",
 ]
 
-[[package]]
-name = "tungstenite"
-version = "0.20.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9"
-dependencies = [
- "byteorder",
- "bytes 1.10.1",
- "data-encoding",
- "http 0.2.12",
- "httparse",
- "log",
- "rand 0.8.5",
- "sha1",
- "thiserror 1.0.69",
- "url",
- "utf-8",
-]
-
-[[package]]
-name = "tungstenite"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1"
-dependencies = [
- "byteorder",
- "bytes 1.10.1",
- "data-encoding",
- "http 1.3.1",
- "httparse",
- "log",
- "rand 0.8.5",
- "sha1",
- "thiserror 1.0.69",
- "url",
- "utf-8",
-]
-
-[[package]]
-name = "tungstenite"
-version = "0.26.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4793cb5e56680ecbb1d843515b23b6de9a75eb04b66643e256a396d43be33c13"
-dependencies = [
- "bytes 1.10.1",
- "data-encoding",
- "http 1.3.1",
- "httparse",
- "log",
- "rand 0.9.2",
- "rustls 0.23.33",
- "rustls-pki-types",
- "sha1",
- "thiserror 2.0.17",
- "utf-8",
-]
-
-[[package]]
-name = "tungstenite"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eadc29d668c91fcc564941132e17b28a7ceb2f3ebf0b9dae3e03fd7a6748eb0d"
-dependencies = [
- "bytes 1.10.1",
- "data-encoding",
- "http 1.3.1",
- "httparse",
- "log",
- "rand 0.9.2",
- "rustls 0.23.33",
- "rustls-pki-types",
- "sha1",
- "thiserror 2.0.17",
- "utf-8",
-]
-
-[[package]]
-name = "typed-path"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c462d18470a2857aa657d338af5fa67170bb48bcc80a296710ce3b0802a32566"
-
 [[package]]
 name = "typeid"
 version = "1.0.3"
@@ -17625,21 +6025,6 @@ version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
 
-[[package]]
-name = "ucd-trie"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
-
-[[package]]
-name = "uds"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "885c31f06fce836457fe3ef09a59f83fe8db95d270b11cd78f40a4666c4d1661"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "uds_windows"
 version = "1.1.0"
@@ -17651,87 +6036,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "ug"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90b70b37e9074642bc5f60bb23247fd072a84314ca9e71cdf8527593406a0dd3"
-dependencies = [
- "gemm 0.18.2",
- "half",
- "libloading",
- "memmap2",
- "num",
- "num-traits",
- "num_cpus",
- "rayon",
- "safetensors",
- "serde",
- "thiserror 1.0.69",
- "tracing",
- "yoke 0.7.5",
-]
-
-[[package]]
-name = "ui"
-version = "0.1.0"
-dependencies = [
- "chrono",
- "component",
- "documented",
- "gpui",
- "gpui_macros",
- "icons",
- "itertools 0.14.0",
- "menu",
- "schemars",
- "serde",
- "settings",
- "smallvec",
- "story",
- "strum 0.27.2",
- "theme",
- "ui_macros",
- "util",
- "windows 0.61.3",
-]
-
-[[package]]
-name = "ui_input"
-version = "0.1.0"
-dependencies = [
- "component",
- "editor",
- "gpui",
- "menu",
- "settings",
- "theme",
- "ui",
-]
-
-[[package]]
-name = "ui_macros"
-version = "0.1.0"
-dependencies = [
- "component",
- "quote",
- "syn 2.0.106",
- "ui",
-]
-
-[[package]]
-name = "ui_prompt"
-version = "0.1.0"
-dependencies = [
- "gpui",
- "markdown",
- "menu",
- "settings",
- "theme",
- "ui",
- "workspace",
-]
-
 [[package]]
 name = "unicase"
 version = "2.8.1"
@@ -17768,12 +6072,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ce61d488bcdc9bc8b5d1772c404828b17fc481c0a582b5581e95fb233aef503e"
 
-[[package]]
-name = "unicode-general-category"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b993bddc193ae5bd0d623b49ec06ac3e9312875fdae725a975c51db1cc1677f"
-
 [[package]]
 name = "unicode-ident"
 version = "1.0.19"
@@ -17786,15 +6084,6 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
 
-[[package]]
-name = "unicode-normalization"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
-dependencies = [
- "tinyvec",
-]
-
 [[package]]
 name = "unicode-properties"
 version = "0.1.3"
@@ -17825,36 +6114,6 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
 
-[[package]]
-name = "unicode-xid"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
-
-[[package]]
-name = "unicode_categories"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e"
-
-[[package]]
-name = "unindent"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3"
-
-[[package]]
-name = "unsafe-libyaml"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
-
-[[package]]
-name = "untrusted"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
-
 [[package]]
 name = "untrusted"
 version = "0.9.0"
@@ -17873,19 +6132,13 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "urlencoding"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
-
 [[package]]
 name = "usvg"
 version = "0.45.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "80be9b06fbae3b8b303400ab20778c80bbaf338f563afe567cf3c9eea17b47ef"
 dependencies = [
- "base64 0.22.1",
+ "base64",
  "data-url",
  "flate2",
  "fontdb 0.23.0",
@@ -17935,7 +6188,7 @@ dependencies = [
  "command-fds",
  "dirs 4.0.0",
  "dunce",
- "futures 0.3.31",
+ "futures",
  "futures-lite 1.13.0",
  "git2",
  "globset",
@@ -17943,7 +6196,7 @@ dependencies = [
  "itertools 0.14.0",
  "libc",
  "log",
- "mach2 0.5.0",
+ "mach2",
  "nix 0.29.0",
  "pretty_assertions",
  "rand 0.9.2",
@@ -17961,7 +6214,7 @@ dependencies = [
  "unicase",
  "util_macros",
  "walkdir",
- "which 6.0.3",
+ "which",
 ]
 
 [[package]]
@@ -17986,16 +6239,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "uuid-simd"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23b082222b4f6619906941c17eb2297fff4c2fb96cb60164170522942a200bd8"
-dependencies = [
- "outref",
- "vsimd",
-]
-
 [[package]]
 name = "v_frame"
 version = "0.3.9"
@@ -18007,12 +6250,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "valuable"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
-
 [[package]]
 name = "value-bag"
 version = "1.11.1"
@@ -18055,16 +6292,6 @@ version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
-[[package]]
-name = "vercel"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "schemars",
- "serde",
- "strum 0.27.2",
-]
-
 [[package]]
 name = "version-compare"
 version = "0.2.0"
@@ -18077,81 +6304,6 @@ version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
-[[package]]
-name = "vim"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "assets",
- "async-compat",
- "async-trait",
- "collections",
- "command_palette",
- "command_palette_hooks",
- "db",
- "editor",
- "env_logger 0.11.8",
- "futures 0.3.31",
- "fuzzy",
- "git_ui",
- "gpui",
- "indoc",
- "itertools 0.14.0",
- "language",
- "log",
- "lsp",
- "markdown_preview",
- "menu",
- "multi_buffer",
- "nvim-rs",
- "parking_lot",
- "perf",
- "picker",
- "project",
- "project_panel",
- "regex",
- "release_channel",
- "schemars",
- "search",
- "semver",
- "serde",
- "serde_json",
- "settings",
- "settings_ui",
- "task",
- "text",
- "theme",
- "tokio",
- "ui",
- "util",
- "util_macros",
- "vim_mode_setting",
- "workspace",
- "zed_actions",
-]
-
-[[package]]
-name = "vim_mode_setting"
-version = "0.1.0"
-dependencies = [
- "settings",
-]
-
-[[package]]
-name = "vscode_theme"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b3666211944f2e6ba2c359bc9efc1891157e910b1b11c3900892ea9f18179d2"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "vsimd"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64"
-
 [[package]]
 name = "vswhom"
 version = "0.1.0"
@@ -18172,20 +6324,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "vte"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5924018406ce0063cd67f8e008104968b74b563ee1b85dde3ed1f7cb87d3dbd"
-dependencies = [
- "arrayvec",
- "bitflags 2.9.4",
- "cursor-icon",
- "log",
- "memchr",
- "serde",
-]
-
 [[package]]
 name = "waker-fn"
 version = "1.2.0"
@@ -18211,34 +6349,6 @@ dependencies = [
  "try-lock",
 ]
 
-[[package]]
-name = "warp"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4378d202ff965b011c64817db11d5829506d3404edeadb61f190d111da3f231c"
-dependencies = [
- "bytes 1.10.1",
- "futures-channel",
- "futures-util",
- "headers",
- "http 0.2.12",
- "hyper 0.14.32",
- "log",
- "mime",
- "mime_guess",
- "percent-encoding",
- "pin-project",
- "scoped-tls",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "tokio",
- "tokio-tungstenite 0.21.0",
- "tokio-util",
- "tower-service",
- "tracing",
-]
-
 [[package]]
 name = "wasi"
 version = "0.11.1+wasi-snapshot-preview1"
@@ -18251,15 +6361,9 @@ version = "1.0.1+wasi-0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
 dependencies = [
- "wit-bindgen 0.46.0",
+ "wit-bindgen",
 ]
 
-[[package]]
-name = "wasite"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
-
 [[package]]
 name = "wasm-bindgen"
 version = "0.2.104"
@@ -18332,70 +6436,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "wasm-encoder"
-version = "0.201.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9c7d2731df60006819b013f64ccc2019691deccf6e11a1804bc850cd6748f1a"
-dependencies = [
- "leb128",
-]
-
-[[package]]
-name = "wasm-encoder"
-version = "0.221.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc8444fe4920de80a4fe5ab564fff2ae58b6b73166b89751f8c6c93509da32e5"
-dependencies = [
- "leb128",
- "wasmparser 0.221.3",
-]
-
-[[package]]
-name = "wasm-encoder"
-version = "0.227.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80bb72f02e7fbf07183443b27b0f3d4144abf8c114189f2e088ed95b696a7822"
-dependencies = [
- "leb128fmt",
- "wasmparser 0.227.1",
-]
-
-[[package]]
-name = "wasm-metadata"
-version = "0.201.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fd83062c17b9f4985d438603cde0a5e8c5c8198201a6937f778b607924c7da2"
-dependencies = [
- "anyhow",
- "indexmap",
- "serde",
- "serde_derive",
- "serde_json",
- "spdx",
- "wasm-encoder 0.201.0",
- "wasmparser 0.201.0",
-]
-
-[[package]]
-name = "wasm-metadata"
-version = "0.227.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce1ef0faabbbba6674e97a56bee857ccddf942785a336c8b47b42373c922a91d"
-dependencies = [
- "anyhow",
- "auditable-serde",
- "flate2",
- "indexmap",
- "serde",
- "serde_derive",
- "serde_json",
- "spdx",
- "url",
- "wasm-encoder 0.227.1",
- "wasmparser 0.227.1",
-]
-
 [[package]]
 name = "wasm-streams"
 version = "0.4.2"
@@ -18409,354 +6449,17 @@ dependencies = [
  "web-sys",
 ]
 
-[[package]]
-name = "wasmparser"
-version = "0.201.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84e5df6dba6c0d7fafc63a450f1738451ed7a0b52295d83e868218fa286bf708"
-dependencies = [
- "bitflags 2.9.4",
- "indexmap",
- "semver",
-]
-
-[[package]]
-name = "wasmparser"
-version = "0.221.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d06bfa36ab3ac2be0dee563380147a5b81ba10dd8885d7fbbc9eb574be67d185"
-dependencies = [
- "bitflags 2.9.4",
- "hashbrown 0.15.5",
- "indexmap",
- "semver",
- "serde",
-]
-
-[[package]]
-name = "wasmparser"
-version = "0.227.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f51cad774fb3c9461ab9bccc9c62dfb7388397b5deda31bf40e8108ccd678b2"
-dependencies = [
- "bitflags 2.9.4",
- "hashbrown 0.15.5",
- "indexmap",
- "semver",
-]
-
-[[package]]
-name = "wasmprinter"
-version = "0.221.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7343c42a97f2926c7819ff81b64012092ae954c5d83ddd30c9fcdefd97d0b283"
-dependencies = [
- "anyhow",
- "termcolor",
- "wasmparser 0.221.3",
-]
-
-[[package]]
-name = "wasmtime"
-version = "29.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11976a250672556d1c4c04c6d5d7656ac9192ac9edc42a4587d6c21460010e69"
-dependencies = [
- "anyhow",
- "async-trait",
- "bitflags 2.9.4",
- "bumpalo",
- "cc",
- "cfg-if",
- "encoding_rs",
- "hashbrown 0.14.5",
- "indexmap",
- "libc",
- "log",
- "mach2 0.4.3",
- "memfd",
- "object 0.36.7",
- "once_cell",
- "paste",
- "postcard",
- "psm",
- "pulley-interpreter",
- "rayon",
- "rustix 0.38.44",
- "semver",
- "serde",
- "serde_derive",
- "smallvec",
- "sptr",
- "target-lexicon 0.13.3",
- "trait-variant",
- "wasmparser 0.221.3",
- "wasmtime-asm-macros",
- "wasmtime-component-macro",
- "wasmtime-component-util",
- "wasmtime-cranelift",
- "wasmtime-environ",
- "wasmtime-fiber",
- "wasmtime-jit-icache-coherence",
- "wasmtime-math",
- "wasmtime-slab",
- "wasmtime-versioned-export-macros",
- "wasmtime-winch",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "wasmtime-asm-macros"
-version = "29.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f178b0d125201fbe9f75beaf849bd3e511891f9e45ba216a5b620802ccf64f2"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "wasmtime-c-api-impl"
-version = "29.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea30cef3608f2de5797c7bbb94c1ba4f3676d9a7f81ae86ced1b512e2766ed0c"
-dependencies = [
- "anyhow",
- "log",
- "tracing",
- "wasmtime",
- "wasmtime-c-api-macros",
-]
-
-[[package]]
-name = "wasmtime-c-api-macros"
-version = "29.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "022a79ebe1124d5d384d82463d7e61c6b4dd857d81f15cb8078974eeb86db65b"
-dependencies = [
- "proc-macro2",
- "quote",
-]
-
-[[package]]
-name = "wasmtime-component-macro"
-version = "29.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d74de6592ed945d0a602f71243982a304d5d02f1e501b638addf57f42d57dfaf"
-dependencies = [
- "anyhow",
- "proc-macro2",
- "quote",
- "syn 2.0.106",
- "wasmtime-component-util",
- "wasmtime-wit-bindgen",
- "wit-parser 0.221.3",
-]
-
-[[package]]
-name = "wasmtime-component-util"
-version = "29.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "707dc7b3c112ab5a366b30cfe2fb5b2f8e6a0f682f16df96a5ec582bfe6f056e"
-
-[[package]]
-name = "wasmtime-cranelift"
-version = "29.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "366be722674d4bf153290fbcbc4d7d16895cc82fb3e869f8d550ff768f9e9e87"
-dependencies = [
- "anyhow",
- "cfg-if",
- "cranelift-codegen",
- "cranelift-control",
- "cranelift-entity",
- "cranelift-frontend",
- "cranelift-native",
- "gimli 0.31.1",
- "itertools 0.12.1",
- "log",
- "object 0.36.7",
- "smallvec",
- "target-lexicon 0.13.3",
- "thiserror 1.0.69",
- "wasmparser 0.221.3",
- "wasmtime-environ",
- "wasmtime-versioned-export-macros",
-]
-
-[[package]]
-name = "wasmtime-environ"
-version = "29.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdadc1af7097347aa276a4f008929810f726b5b46946971c660b6d421e9994ad"
-dependencies = [
- "anyhow",
- "cpp_demangle",
- "cranelift-bitset",
- "cranelift-entity",
- "gimli 0.31.1",
- "indexmap",
- "log",
- "object 0.36.7",
- "postcard",
- "rustc-demangle",
- "semver",
- "serde",
- "serde_derive",
- "smallvec",
- "target-lexicon 0.13.3",
- "wasm-encoder 0.221.3",
- "wasmparser 0.221.3",
- "wasmprinter",
- "wasmtime-component-util",
-]
-
-[[package]]
-name = "wasmtime-fiber"
-version = "29.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccba90d4119f081bca91190485650730a617be1fff5228f8c4757ce133d21117"
-dependencies = [
- "anyhow",
- "cc",
- "cfg-if",
- "rustix 0.38.44",
- "wasmtime-asm-macros",
- "wasmtime-versioned-export-macros",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "wasmtime-jit-icache-coherence"
-version = "29.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec5e8552e01692e6c2e5293171704fed8abdec79d1a6995a0870ab190e5747d1"
-dependencies = [
- "anyhow",
- "cfg-if",
- "libc",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "wasmtime-math"
-version = "29.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29210ec2aa25e00f4d54605cedaf080f39ec01a872c5bd520ad04c67af1dde17"
-dependencies = [
- "libm",
-]
-
-[[package]]
-name = "wasmtime-slab"
-version = "29.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcb5821a96fa04ac14bc7b158bb3d5cd7729a053db5a74dad396cd513a5e5ccf"
-
-[[package]]
-name = "wasmtime-versioned-export-macros"
-version = "29.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86ff86db216dc0240462de40c8290887a613dddf9685508eb39479037ba97b5b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.106",
-]
-
-[[package]]
-name = "wasmtime-wasi"
-version = "29.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d1be69bfcab1bdac74daa7a1f9695ab992b9c8e21b9b061e7d66434097e0ca4"
-dependencies = [
- "anyhow",
- "async-trait",
- "bitflags 2.9.4",
- "bytes 1.10.1",
- "cap-fs-ext",
- "cap-net-ext",
- "cap-rand",
- "cap-std",
- "cap-time-ext",
- "fs-set-times",
- "futures 0.3.31",
- "io-extras",
- "io-lifetimes",
- "rustix 0.38.44",
- "system-interface",
- "thiserror 1.0.69",
- "tokio",
- "tracing",
- "trait-variant",
- "url",
- "wasmtime",
- "wiggle",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "wasmtime-winch"
-version = "29.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdbabfb8f20502d5e1d81092b9ead3682ae59988487aafcd7567387b7a43cf8f"
-dependencies = [
- "anyhow",
- "cranelift-codegen",
- "gimli 0.31.1",
- "object 0.36.7",
- "target-lexicon 0.13.3",
- "wasmparser 0.221.3",
- "wasmtime-cranelift",
- "wasmtime-environ",
- "winch-codegen",
-]
-
-[[package]]
-name = "wasmtime-wit-bindgen"
-version = "29.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8358319c2dd1e4db79e3c1c5d3a5af84956615343f9f89f4e4996a36816e06e6"
-dependencies = [
- "anyhow",
- "heck 0.5.0",
- "indexmap",
- "wit-parser 0.221.3",
-]
-
-[[package]]
-name = "wast"
-version = "35.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ef140f1b49946586078353a453a1d28ba90adfc54dde75710bc1931de204d68"
-dependencies = [
- "leb128",
-]
-
 [[package]]
 name = "watch"
 version = "0.1.0"
 dependencies = [
  "ctor",
- "futures 0.3.31",
+ "env_logger",
+ "futures",
  "gpui",
+ "log",
  "parking_lot",
  "rand 0.9.2",
- "zlog",
-]
-
-[[package]]
-name = "wax"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d12a78aa0bab22d2f26ed1a96df7ab58e8a93506a3e20adb47c51a93b4e1357"
-dependencies = [
- "const_format",
- "itertools 0.11.0",
- "nom 7.1.3",
- "pori",
- "regex",
- "thiserror 1.0.69",
- "walkdir",
 ]
 
 [[package]]
@@ -18889,45 +6592,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "web_atoms"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57ffde1dc01240bdf9992e3205668b235e59421fd085e8a317ed98da0178d414"
-dependencies = [
- "phf 0.11.3",
- "phf_codegen",
- "string_cache",
- "string_cache_codegen",
-]
-
-[[package]]
-name = "web_search"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "cloud_llm_client",
- "collections",
- "gpui",
- "serde",
-]
-
-[[package]]
-name = "web_search_providers"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "client",
- "cloud_llm_client",
- "futures 0.3.31",
- "gpui",
- "http_client",
- "language_model",
- "serde",
- "serde_json",
- "web_search",
-]
-
 [[package]]
 name = "webpki-root-certs"
 version = "0.26.8"
@@ -18937,59 +6601,12 @@ dependencies = [
  "rustls-pki-types",
 ]
 
-[[package]]
-name = "webpki-roots"
-version = "0.26.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2210b291f7ea53617fbafcc4939f10914214ec15aace5ba62293a668f322c5c9"
-dependencies = [
- "rustls-pki-types",
-]
-
-[[package]]
-name = "webrtc-sys"
-version = "0.3.7"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=5f04705ac3f356350ae31534ffbc476abc9ea83d#5f04705ac3f356350ae31534ffbc476abc9ea83d"
-dependencies = [
- "cc",
- "cxx",
- "cxx-build",
- "glob",
- "log",
- "webrtc-sys-build",
-]
-
-[[package]]
-name = "webrtc-sys-build"
-version = "0.3.6"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=5f04705ac3f356350ae31534ffbc476abc9ea83d#5f04705ac3f356350ae31534ffbc476abc9ea83d"
-dependencies = [
- "fs2",
- "regex",
- "reqwest 0.11.27",
- "scratch",
- "semver",
- "zip 0.6.6",
-]
-
 [[package]]
 name = "weezl"
 version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a751b3277700db47d3e574514de2eced5e54dc8a5436a3bf7a0b248b2cee16f3"
 
-[[package]]
-name = "which"
-version = "4.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
-dependencies = [
- "either",
- "home",
- "once_cell",
- "rustix 0.38.44",
-]
-
 [[package]]
 name = "which"
 version = "6.0.3"
@@ -19002,58 +6619,6 @@ dependencies = [
  "winsafe",
 ]
 
-[[package]]
-name = "whoami"
-version = "1.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d4a4db5077702ca3015d3d02d74974948aba2ad9e12ab7df718ee64ccd7e97d"
-dependencies = [
- "libredox",
- "wasite",
-]
-
-[[package]]
-name = "wiggle"
-version = "29.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b9af35bc9629c52c261465320a9a07959164928b4241980ba1cf923b9e6751d"
-dependencies = [
- "anyhow",
- "async-trait",
- "bitflags 2.9.4",
- "thiserror 1.0.69",
- "tracing",
- "wasmtime",
- "wiggle-macro",
-]
-
-[[package]]
-name = "wiggle-generate"
-version = "29.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cf267dd05673912c8138f4b54acabe6bd53407d9d1536f0fadb6520dd16e101"
-dependencies = [
- "anyhow",
- "heck 0.5.0",
- "proc-macro2",
- "quote",
- "shellexpand 2.1.2",
- "syn 2.0.106",
- "witx",
-]
-
-[[package]]
-name = "wiggle-macro"
-version = "29.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08c5c473d4198e6c2d377f3809f713ff0c110cab88a0805ae099a82119ee250c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.106",
- "wiggle-generate",
-]
-
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -19085,34 +6650,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
-[[package]]
-name = "winch-codegen"
-version = "29.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f849ef2c5f46cb0a20af4b4487aaa239846e52e2c03f13fa3c784684552859c"
-dependencies = [
- "anyhow",
- "cranelift-codegen",
- "gimli 0.31.1",
- "regalloc2",
- "smallvec",
- "target-lexicon 0.13.3",
- "thiserror 1.0.69",
- "wasmparser 0.221.3",
- "wasmtime-cranelift",
- "wasmtime-environ",
-]
-
-[[package]]
-name = "windows"
-version = "0.54.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49"
-dependencies = [
- "windows-core 0.54.0",
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "windows"
 version = "0.57.0"
@@ -19123,16 +6660,6 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "windows"
-version = "0.58.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6"
-dependencies = [
- "windows-core 0.58.0",
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "windows"
 version = "0.61.3"
@@ -19148,11 +6675,10 @@ dependencies = [
 
 [[package]]
 name = "windows-capture"
-version = "1.4.3"
-source = "git+https://github.com/zed-industries/windows-capture.git?rev=f0d6c1b6691db75461b732f6d5ff56eed002eeb9#f0d6c1b6691db75461b732f6d5ff56eed002eeb9"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a4df73e95feddb9ec1a7e9c2ca6323b8c97d5eeeff78d28f1eccdf19c882b24"
 dependencies = [
- "clap",
- "ctrlc",
  "parking_lot",
  "rayon",
  "thiserror 2.0.17",
@@ -19169,16 +6695,6 @@ dependencies = [
  "windows-core 0.61.2",
 ]
 
-[[package]]
-name = "windows-core"
-version = "0.54.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65"
-dependencies = [
- "windows-result 0.1.2",
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "windows-core"
 version = "0.57.0"
@@ -19191,19 +6707,6 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "windows-core"
-version = "0.58.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99"
-dependencies = [
- "windows-implement 0.58.0",
- "windows-interface 0.58.0",
- "windows-result 0.2.0",
- "windows-strings 0.1.0",
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "windows-core"
 version = "0.61.2"
@@ -19252,17 +6755,6 @@ dependencies = [
  "syn 2.0.106",
 ]
 
-[[package]]
-name = "windows-implement"
-version = "0.58.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.106",
-]
-
 [[package]]
 name = "windows-implement"
 version = "0.60.2"
@@ -19285,17 +6777,6 @@ dependencies = [
  "syn 2.0.106",
 ]
 
-[[package]]
-name = "windows-interface"
-version = "0.58.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.106",
-]
-
 [[package]]
 name = "windows-interface"
 version = "0.59.3"
@@ -19351,17 +6832,6 @@ dependencies = [
  "windows-strings 0.4.2",
 ]
 
-[[package]]
-name = "windows-registry"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720"
-dependencies = [
- "windows-link 0.2.1",
- "windows-result 0.4.1",
- "windows-strings 0.5.1",
-]
-
 [[package]]
 name = "windows-result"
 version = "0.1.2"
@@ -19371,15 +6841,6 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "windows-result"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "windows-result"
 version = "0.3.4"
@@ -19398,16 +6859,6 @@ dependencies = [
  "windows-link 0.2.1",
 ]
 
-[[package]]
-name = "windows-strings"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
-dependencies = [
- "windows-result 0.2.0",
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "windows-strings"
 version = "0.3.1"
@@ -19750,25 +7201,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "winreg"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "winreg"
-version = "0.50.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
-dependencies = [
- "cfg-if",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "winreg"
 version = "0.55.0"
@@ -19779,32 +7211,12 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "winresource"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edcacf11b6f48dd21b9ba002f991bdd5de29b2da8cc2800412f4b80f677e4957"
-dependencies = [
- "toml 0.8.23",
- "version_check",
-]
-
 [[package]]
 name = "winsafe"
 version = "0.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904"
 
-[[package]]
-name = "winx"
-version = "0.36.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f3fd376f71958b862e7afb20cfe5a22830e1963462f3a17f49d82a6c1d1f42d"
-dependencies = [
- "bitflags 2.9.4",
- "windows-sys 0.59.0",
-]
-
 [[package]]
 name = "wio"
 version = "0.2.2"
@@ -19814,332 +7226,18 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "wit-bindgen"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "288f992ea30e6b5c531b52cdd5f3be81c148554b09ea416f058d16556ba92c27"
-dependencies = [
- "bitflags 2.9.4",
- "wit-bindgen-rt 0.22.0",
- "wit-bindgen-rust-macro 0.22.0",
-]
-
-[[package]]
-name = "wit-bindgen"
-version = "0.41.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10fb6648689b3929d56bbc7eb1acf70c9a42a29eb5358c67c10f54dbd5d695de"
-dependencies = [
- "wit-bindgen-rt 0.41.0",
- "wit-bindgen-rust-macro 0.41.0",
-]
-
 [[package]]
 name = "wit-bindgen"
 version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
 
-[[package]]
-name = "wit-bindgen-core"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e85e72719ffbccf279359ad071497e47eb0675fe22106dea4ed2d8a7fcb60ba4"
-dependencies = [
- "anyhow",
- "wit-parser 0.201.0",
-]
-
-[[package]]
-name = "wit-bindgen-core"
-version = "0.41.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92fa781d4f2ff6d3f27f3cc9b74a73327b31ca0dc4a3ef25a0ce2983e0e5af9b"
-dependencies = [
- "anyhow",
- "heck 0.5.0",
- "wit-parser 0.227.1",
-]
-
-[[package]]
-name = "wit-bindgen-rt"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcb8738270f32a2d6739973cbbb7c1b6dd8959ce515578a6e19165853272ee64"
-
-[[package]]
-name = "wit-bindgen-rt"
-version = "0.41.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4db52a11d4dfb0a59f194c064055794ee6564eb1ced88c25da2cf76e50c5621"
-dependencies = [
- "bitflags 2.9.4",
- "futures 0.3.31",
- "once_cell",
-]
-
-[[package]]
-name = "wit-bindgen-rust"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8a39a15d1ae2077688213611209849cad40e9e5cccf6e61951a425850677ff3"
-dependencies = [
- "anyhow",
- "heck 0.4.1",
- "indexmap",
- "wasm-metadata 0.201.0",
- "wit-bindgen-core 0.22.0",
- "wit-component 0.201.0",
-]
-
-[[package]]
-name = "wit-bindgen-rust"
-version = "0.41.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d0809dc5ba19e2e98661bf32fc0addc5a3ca5bf3a6a7083aa6ba484085ff3ce"
-dependencies = [
- "anyhow",
- "heck 0.5.0",
- "indexmap",
- "prettyplease",
- "syn 2.0.106",
- "wasm-metadata 0.227.1",
- "wit-bindgen-core 0.41.0",
- "wit-component 0.227.1",
-]
-
-[[package]]
-name = "wit-bindgen-rust-macro"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d376d3ae5850526dfd00d937faea0d81a06fa18f7ac1e26f386d760f241a8f4b"
-dependencies = [
- "anyhow",
- "proc-macro2",
- "quote",
- "syn 2.0.106",
- "wit-bindgen-core 0.22.0",
- "wit-bindgen-rust 0.22.0",
-]
-
-[[package]]
-name = "wit-bindgen-rust-macro"
-version = "0.41.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad19eec017904e04c60719592a803ee5da76cb51c81e3f6fbf9457f59db49799"
-dependencies = [
- "anyhow",
- "prettyplease",
- "proc-macro2",
- "quote",
- "syn 2.0.106",
- "wit-bindgen-core 0.41.0",
- "wit-bindgen-rust 0.41.0",
-]
-
-[[package]]
-name = "wit-component"
-version = "0.201.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "421c0c848a0660a8c22e2fd217929a0191f14476b68962afd2af89fd22e39825"
-dependencies = [
- "anyhow",
- "bitflags 2.9.4",
- "indexmap",
- "log",
- "serde",
- "serde_derive",
- "serde_json",
- "wasm-encoder 0.201.0",
- "wasm-metadata 0.201.0",
- "wasmparser 0.201.0",
- "wit-parser 0.201.0",
-]
-
-[[package]]
-name = "wit-component"
-version = "0.227.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "635c3adc595422cbf2341a17fb73a319669cc8d33deed3a48368a841df86b676"
-dependencies = [
- "anyhow",
- "bitflags 2.9.4",
- "indexmap",
- "log",
- "serde",
- "serde_derive",
- "serde_json",
- "wasm-encoder 0.227.1",
- "wasm-metadata 0.227.1",
- "wasmparser 0.227.1",
- "wit-parser 0.227.1",
-]
-
-[[package]]
-name = "wit-parser"
-version = "0.201.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "196d3ecfc4b759a8573bf86a9b3f8996b304b3732e4c7de81655f875f6efdca6"
-dependencies = [
- "anyhow",
- "id-arena",
- "indexmap",
- "log",
- "semver",
- "serde",
- "serde_derive",
- "serde_json",
- "unicode-xid",
- "wasmparser 0.201.0",
-]
-
-[[package]]
-name = "wit-parser"
-version = "0.221.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "896112579ed56b4a538b07a3d16e562d101ff6265c46b515ce0c701eef16b2ac"
-dependencies = [
- "anyhow",
- "id-arena",
- "indexmap",
- "log",
- "semver",
- "serde",
- "serde_derive",
- "serde_json",
- "unicode-xid",
- "wasmparser 0.221.3",
-]
-
-[[package]]
-name = "wit-parser"
-version = "0.227.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddf445ed5157046e4baf56f9138c124a0824d4d1657e7204d71886ad8ce2fc11"
-dependencies = [
- "anyhow",
- "id-arena",
- "indexmap",
- "log",
- "semver",
- "serde",
- "serde_derive",
- "serde_json",
- "unicode-xid",
- "wasmparser 0.227.1",
-]
-
-[[package]]
-name = "witx"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e366f27a5cabcddb2706a78296a40b8fcc451e1a6aba2fc1d94b4a01bdaaef4b"
-dependencies = [
- "anyhow",
- "log",
- "thiserror 1.0.69",
- "wast",
-]
-
-[[package]]
-name = "workspace"
-version = "0.1.0"
-dependencies = [
- "any_vec",
- "anyhow",
- "async-recursion",
- "call",
- "client",
- "clock",
- "collections",
- "component",
- "dap",
- "db",
- "fs",
- "futures 0.3.31",
- "gpui",
- "http_client",
- "itertools 0.14.0",
- "language",
- "log",
- "menu",
- "node_runtime",
- "parking_lot",
- "postage",
- "pretty_assertions",
- "project",
- "remote",
- "schemars",
- "serde",
- "serde_json",
- "session",
- "settings",
- "smallvec",
- "sqlez",
- "strum 0.27.2",
- "task",
- "telemetry",
- "tempfile",
- "theme",
- "ui",
- "util",
- "uuid",
- "windows 0.61.3",
- "zed_actions",
- "zlog",
-]
-
-[[package]]
-name = "worktree"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "async-lock 2.8.0",
- "clock",
- "collections",
- "fs",
- "futures 0.3.31",
- "fuzzy",
- "git",
- "git2",
- "gpui",
- "http_client",
- "ignore",
- "language",
- "log",
- "parking_lot",
- "paths",
- "postage",
- "pretty_assertions",
- "rand 0.9.2",
- "rpc",
- "serde",
- "serde_json",
- "settings",
- "smallvec",
- "smol",
- "sum_tree",
- "text",
- "util",
- "zlog",
-]
-
 [[package]]
 name = "writeable"
 version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"
 
-[[package]]
-name = "wyz"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
-dependencies = [
- "tap",
-]
-
 [[package]]
 name = "x11"
 version = "2.21.0"
@@ -20180,16 +7278,6 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ea6fc2961e4ef194dcbfe56bb845534d0dc8098940c7e5c012a258bfec6701bd"
 
-[[package]]
-name = "x_ai"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "schemars",
- "serde",
- "strum 0.27.2",
-]
-
 [[package]]
 name = "xattr"
 version = "0.2.3"
@@ -20259,85 +7347,21 @@ checksum = "9bbb26405d8e919bc1547a5aa9abc95cbfa438f04844f5fdd9dc7596b748bf69"
 dependencies = [
  "log",
  "mac",
- "markup5ever 0.12.1",
+ "markup5ever",
 ]
 
-[[package]]
-name = "xmlparser"
-version = "0.13.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4"
-
 [[package]]
 name = "xmlwriter"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9"
 
-[[package]]
-name = "xtask"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "backtrace",
- "cargo_metadata",
- "cargo_toml",
- "clap",
- "gh-workflow",
- "indexmap",
- "indoc",
- "serde",
- "serde_json",
- "toml 0.8.23",
- "toml_edit 0.22.27",
-]
-
-[[package]]
-name = "yaml-rust2"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8902160c4e6f2fb145dbe9d6760a75e3c9522d8bf796ed7047c85919ac7115f8"
-dependencies = [
- "arraydeque",
- "encoding_rs",
- "hashlink 0.8.4",
-]
-
 [[package]]
 name = "yansi"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
 
-[[package]]
-name = "yawc"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19a5d82922135b4ae73a079a4ffb5501e9aadb4d785b8c660eaa0a8b899028c5"
-dependencies = [
- "base64 0.22.1",
- "bytes 1.10.1",
- "flate2",
- "futures 0.3.31",
- "http-body-util",
- "hyper 1.7.0",
- "hyper-util",
- "js-sys",
- "nom 8.0.0",
- "pin-project",
- "rand 0.8.5",
- "sha1",
- "thiserror 1.0.69",
- "tokio",
- "tokio-rustls 0.26.2",
- "tokio-util",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "webpki-roots",
-]
-
 [[package]]
 name = "yazi"
 version = "0.2.1"
@@ -20355,18 +7379,6 @@ dependencies = [
  "pkg-config",
 ]
 
-[[package]]
-name = "yoke"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
-dependencies = [
- "serde",
- "stable_deref_trait",
- "yoke-derive 0.7.5",
- "zerofrom",
-]
-
 [[package]]
 name = "yoke"
 version = "0.8.0"
@@ -20375,22 +7387,10 @@ checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc"
 dependencies = [
  "serde",
  "stable_deref_trait",
- "yoke-derive 0.8.0",
+ "yoke-derive",
  "zerofrom",
 ]
 
-[[package]]
-name = "yoke-derive"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.106",
- "synstructure",
-]
-
 [[package]]
 name = "yoke-derive"
 version = "0.8.0"
@@ -20412,7 +7412,7 @@ dependencies = [
  "async-broadcast",
  "async-executor",
  "async-io",
- "async-lock 3.4.1",
+ "async-lock",
  "async-process",
  "async-recursion",
  "async-task",
@@ -20464,161 +7464,6 @@ dependencies = [
  "zvariant",
 ]
 
-[[package]]
-name = "zed"
-version = "0.218.0"
-dependencies = [
- "acp_tools",
- "activity_indicator",
- "agent_settings",
- "agent_ui",
- "anyhow",
- "ashpd 0.11.0",
- "askpass",
- "assets",
- "audio",
- "auto_update",
- "auto_update_ui",
- "bincode",
- "breadcrumbs",
- "call",
- "channel",
- "chrono",
- "clap",
- "cli",
- "client",
- "codestral",
- "collab_ui",
- "collections",
- "command_palette",
- "component",
- "copilot",
- "crashes",
- "dap",
- "dap_adapters",
- "db",
- "debug_adapter_extension",
- "debugger_tools",
- "debugger_ui",
- "diagnostics",
- "edit_prediction",
- "edit_prediction_ui",
- "editor",
- "env_logger 0.11.8",
- "extension",
- "extension_host",
- "extensions_ui",
- "feature_flags",
- "feedback",
- "file_finder",
- "fs",
- "futures 0.3.31",
- "git",
- "git_hosting_providers",
- "git_ui",
- "go_to_line",
- "gpui",
- "gpui_tokio",
- "http_client",
- "image_viewer",
- "inspector_ui",
- "install_cli",
- "itertools 0.14.0",
- "journal",
- "json_schema_store",
- "keymap_editor",
- "language",
- "language_extension",
- "language_model",
- "language_models",
- "language_onboarding",
- "language_selector",
- "language_tools",
- "languages",
- "line_ending_selector",
- "log",
- "markdown",
- "markdown_preview",
- "menu",
- "migrator",
- "mimalloc",
- "miniprofiler_ui",
- "nc",
- "node_runtime",
- "notifications",
- "onboarding",
- "outline",
- "outline_panel",
- "parking_lot",
- "paths",
- "picker",
- "pretty_assertions",
- "profiling",
- "project",
- "project_panel",
- "project_symbols",
- "prompt_store",
- "proto",
- "rayon",
- "recent_projects",
- "release_channel",
- "remote",
- "repl",
- "reqwest_client",
- "rope",
- "search",
- "semver",
- "serde",
- "serde_json",
- "session",
- "settings",
- "settings_profile_selector",
- "settings_ui",
- "shellexpand 2.1.2",
- "smol",
- "snippet_provider",
- "snippets_ui",
- "supermaven",
- "svg_preview",
- "sysinfo 0.37.2",
- "system_specs",
- "tab_switcher",
- "task",
- "tasks_ui",
- "telemetry",
- "terminal_view",
- "theme",
- "theme_extension",
- "theme_selector",
- "time",
- "title_bar",
- "toolchain_selector",
- "tracing",
- "tree-sitter-md",
- "tree-sitter-rust",
- "ui",
- "ui_input",
- "ui_prompt",
- "url",
- "urlencoding",
- "util",
- "uuid",
- "vim",
- "vim_mode_setting",
- "watch",
- "web_search",
- "web_search_providers",
- "windows 0.61.3",
- "winresource",
- "workspace",
- "zed-reqwest",
- "zed_actions",
- "zed_env_vars",
- "zlog",
- "zlog_settings",
- "ztracing",
-]
-
 [[package]]
 name = "zed-font-kit"
 version = "0.14.1-zed"
@@ -20648,17 +7493,17 @@ name = "zed-reqwest"
 version = "0.12.15-zed"
 source = "git+https://github.com/zed-industries/reqwest.git?rev=c15662463bda39148ba154100dd44d3fba5873a4#c15662463bda39148ba154100dd44d3fba5873a4"
 dependencies = [
- "base64 0.22.1",
- "bytes 1.10.1",
+ "base64",
+ "bytes",
  "encoding_rs",
  "futures-core",
  "futures-util",
- "h2 0.4.12",
- "http 1.3.1",
- "http-body 1.0.1",
+ "h2",
+ "http",
+ "http-body",
  "http-body-util",
- "hyper 1.7.0",
- "hyper-rustls 0.27.7",
+ "hyper",
+ "hyper-rustls",
  "hyper-util",
  "ipnet",
  "js-sys",
@@ -20669,20 +7514,20 @@ dependencies = [
  "percent-encoding",
  "pin-project-lite",
  "quinn",
- "rustls 0.23.33",
- "rustls-native-certs 0.8.2",
- "rustls-pemfile 2.2.0",
+ "rustls",
+ "rustls-native-certs",
+ "rustls-pemfile",
  "rustls-pki-types",
  "serde",
  "serde_json",
  "serde_urlencoded",
- "sync_wrapper 1.0.2",
- "system-configuration 0.6.1",
+ "sync_wrapper",
+ "system-configuration",
  "tokio",
- "tokio-rustls 0.26.2",
+ "tokio-rustls",
  "tokio-socks",
  "tokio-util",
- "tower 0.5.2",
+ "tower",
  "tower-service",
  "url",
  "wasm-bindgen",
@@ -20705,7 +7550,7 @@ dependencies = [
  "rand 0.8.5",
  "screencapturekit",
  "screencapturekit-sys",
- "sysinfo 0.31.4",
+ "sysinfo",
  "tao-core-video-sys",
  "windows 0.61.3",
  "windows-capture",
@@ -20718,7 +7563,7 @@ name = "zed-xim"
 version = "0.4.0-zed"
 source = "git+https://github.com/zed-industries/xim-rs.git?rev=16f35a2c881b815a2b6cdfd6687988e84f8447d8#16f35a2c881b815a2b6cdfd6687988e84f8447d8"
 dependencies = [
- "ahash 0.8.12",
+ "ahash",
  "hashbrown 0.14.5",
  "log",
  "x11rb",
@@ -20726,82 +7571,6 @@ dependencies = [
  "xim-parser",
 ]
 
-[[package]]
-name = "zed_actions"
-version = "0.1.0"
-dependencies = [
- "gpui",
- "schemars",
- "serde",
- "uuid",
-]
-
-[[package]]
-name = "zed_env_vars"
-version = "0.1.0"
-dependencies = [
- "gpui",
-]
-
-[[package]]
-name = "zed_extension_api"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "594fd10dd0f2f853eb243e2425e7c95938cef49adb81d9602921d002c5e6d9d9"
-dependencies = [
- "serde",
- "serde_json",
- "wit-bindgen 0.22.0",
-]
-
-[[package]]
-name = "zed_extension_api"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0729d50b4ca0a7e28e590bbe32e3ca0194d97ef654961451a424c661a366fca0"
-dependencies = [
- "serde",
- "serde_json",
- "wit-bindgen 0.41.0",
-]
-
-[[package]]
-name = "zed_extension_api"
-version = "0.8.0"
-dependencies = [
- "serde",
- "serde_json",
- "wit-bindgen 0.41.0",
-]
-
-[[package]]
-name = "zed_glsl"
-version = "0.1.0"
-dependencies = [
- "zed_extension_api 0.1.0",
-]
-
-[[package]]
-name = "zed_html"
-version = "0.2.3"
-dependencies = [
- "zed_extension_api 0.7.0",
-]
-
-[[package]]
-name = "zed_proto"
-version = "0.2.3"
-dependencies = [
- "zed_extension_api 0.1.0",
-]
-
-[[package]]
-name = "zed_test_extension"
-version = "0.1.0"
-dependencies = [
- "zed_extension_api 0.8.0",
-]
-
 [[package]]
 name = "zeno"
 version = "0.3.3"
@@ -20869,30 +7638,6 @@ dependencies = [
  "syn 2.0.106",
 ]
 
-[[package]]
-name = "zeromq"
-version = "0.5.0-pre"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1fe92954d37e77bed5e2775cb0fed7dba5f6bc4be6f7f76172a4eb371dc6a9b"
-dependencies = [
- "async-dispatcher",
- "async-std",
- "async-trait",
- "asynchronous-codec",
- "bytes 1.10.1",
- "crossbeam-queue",
- "dashmap 5.5.3",
- "futures 0.3.31",
- "log",
- "num-traits",
- "once_cell",
- "parking_lot",
- "rand 0.8.5",
- "regex",
- "thiserror 1.0.69",
- "uuid",
-]
-
 [[package]]
 name = "zerotrie"
 version = "0.2.2"
@@ -20900,7 +7645,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595"
 dependencies = [
  "displaydoc",
- "yoke 0.8.0",
+ "yoke",
  "zerofrom",
 ]
 
@@ -20910,7 +7655,7 @@ version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b"
 dependencies = [
- "yoke 0.8.0",
+ "yoke",
  "zerofrom",
  "zerovec-derive",
 ]
@@ -20926,113 +7671,6 @@ dependencies = [
  "syn 2.0.106",
 ]
 
-[[package]]
-name = "zeta_prompt"
-version = "0.1.0"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "zip"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261"
-dependencies = [
- "aes",
- "byteorder",
- "bzip2",
- "constant_time_eq",
- "crc32fast",
- "crossbeam-utils",
- "flate2",
- "hmac",
- "pbkdf2 0.11.0",
- "sha1",
- "time",
- "zstd",
-]
-
-[[package]]
-name = "zip"
-version = "1.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cc23c04387f4da0374be4533ad1208cbb091d5c11d070dfef13676ad6497164"
-dependencies = [
- "arbitrary",
- "crc32fast",
- "crossbeam-utils",
- "displaydoc",
- "indexmap",
- "num_enum",
- "thiserror 1.0.69",
-]
-
-[[package]]
-name = "zlog"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "chrono",
- "collections",
- "log",
- "tempfile",
-]
-
-[[package]]
-name = "zlog_settings"
-version = "0.1.0"
-dependencies = [
- "collections",
- "gpui",
- "settings",
- "zlog",
-]
-
-[[package]]
-name = "zstd"
-version = "0.11.2+zstd.1.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4"
-dependencies = [
- "zstd-safe",
-]
-
-[[package]]
-name = "zstd-safe"
-version = "5.0.2+zstd.1.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db"
-dependencies = [
- "libc",
- "zstd-sys",
-]
-
-[[package]]
-name = "zstd-sys"
-version = "2.0.16+zstd.1.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748"
-dependencies = [
- "cc",
- "pkg-config",
-]
-
-[[package]]
-name = "ztracing"
-version = "0.1.0"
-dependencies = [
- "tracing",
- "tracing-subscriber",
- "tracing-tracy",
- "zlog",
- "ztracing_macro",
-]
-
-[[package]]
-name = "ztracing_macro"
-version = "0.1.0"
-
 [[package]]
 name = "zune-core"
 version = "0.4.12"
diff --git a/Cargo.toml b/Cargo.toml
index 523dce229e..9c58e8f496 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,230 +1,24 @@
 [workspace]
 resolver = "2"
 members = [
-    "crates/acp_tools",
-    "crates/acp_thread",
-    "crates/action_log",
-    "crates/activity_indicator",
-    "crates/agent",
-    "crates/agent_servers",
-    "crates/agent_settings",
-    "crates/agent_ui",
-    "crates/ai_onboarding",
-    "crates/anthropic",
-    "crates/askpass",
-    "crates/assets",
-    "crates/assistant_text_thread",
-    "crates/assistant_slash_command",
-    "crates/assistant_slash_commands",
-    "crates/audio",
-    "crates/auto_update",
-    "crates/auto_update_helper",
-    "crates/auto_update_ui",
-    "crates/aws_http_client",
-    "crates/bedrock",
-    "crates/breadcrumbs",
-    "crates/buffer_diff",
-    "crates/call",
-    "crates/channel",
-    "crates/cli",
-    "crates/client",
-    "crates/clock",
-    "crates/cloud_api_client",
-    "crates/cloud_api_types",
-    "crates/cloud_llm_client",
-    "crates/collab",
-    "crates/collab_ui",
     "crates/collections",
-    "crates/command_palette",
-    "crates/command_palette_hooks",
-    "crates/component",
-    "crates/context_server",
-    "crates/copilot",
-    "crates/crashes",
-    "crates/credentials_provider",
-    "crates/dap",
-    "crates/dap_adapters",
-    "crates/db",
-    "crates/debug_adapter_extension",
-    "crates/debugger_tools",
-    "crates/debugger_ui",
-    "crates/deepseek",
-    "crates/denoise",
-    "crates/diagnostics",
-    "crates/docs_preprocessor",
-    "crates/edit_prediction",
-    "crates/edit_prediction_types",
-    "crates/edit_prediction_ui",
-    "crates/edit_prediction_context",
-    "crates/editor",
-    "crates/eval",
-    "crates/eval_utils",
-    "crates/explorer_command_injector",
-    "crates/extension",
-    "crates/extension_api",
-    "crates/extension_cli",
-    "crates/extension_host",
-    "crates/extensions_ui",
-    "crates/feature_flags",
-    "crates/feedback",
-    "crates/file_finder",
-    "crates/file_icons",
-    "crates/fs",
-    "crates/fs_benchmarks",
-    "crates/fsevent",
-    "crates/fuzzy",
-    "crates/git",
-    "crates/git_hosting_providers",
-    "crates/git_ui",
-    "crates/go_to_line",
-    "crates/google_ai",
     "crates/gpui",
     "crates/gpui_macros",
     "crates/gpui_tokio",
     "crates/html_to_markdown",
     "crates/http_client",
     "crates/http_client_tls",
-    "crates/icons",
-    "crates/image_viewer",
-    "crates/inspector_ui",
-    "crates/install_cli",
-    "crates/journal",
-    "crates/json_schema_store",
-    "crates/keymap_editor",
-    "crates/language",
-    "crates/language_extension",
-    "crates/language_model",
-    "crates/language_models",
-    "crates/language_onboarding",
-    "crates/language_selector",
-    "crates/language_tools",
-    "crates/languages",
-    "crates/line_ending_selector",
-    "crates/livekit_api",
-    "crates/livekit_client",
-    "crates/lmstudio",
-    "crates/lsp",
-    "crates/markdown",
-    "crates/markdown_preview",
     "crates/media",
-    "crates/menu",
-    "crates/migrator",
-    "crates/mistral",
-    "crates/miniprofiler_ui",
-    "crates/multi_buffer",
-    "crates/nc",
-    "crates/net",
-    "crates/node_runtime",
-    "crates/notifications",
-    "crates/ollama",
-    "crates/onboarding",
-    "crates/open_ai",
-    "crates/open_router",
-    "crates/outline",
-    "crates/outline_panel",
-    "crates/panel",
-    "crates/paths",
-    "crates/picker",
-    "crates/prettier",
-    "crates/project",
-    "crates/project_benchmarks",
-    "crates/project_panel",
-    "crates/project_symbols",
-    "crates/prompt_store",
-    "crates/proto",
-    "crates/recent_projects",
     "crates/refineable",
     "crates/refineable/derive_refineable",
-    "crates/release_channel",
-    "crates/scheduler",
-    "crates/remote",
-    "crates/remote_server",
-    "crates/repl",
     "crates/reqwest_client",
-    "crates/rich_text",
-    "crates/rope",
-    "crates/rpc",
-    "crates/rules_library",
-    "crates/schema_generator",
-    "crates/search",
-    "crates/session",
-    "crates/settings",
-    "crates/settings_json",
-    "crates/settings_macros",
-    "crates/settings_profile_selector",
-    "crates/settings_ui",
-    "crates/snippet",
-    "crates/snippet_provider",
-    "crates/snippets_ui",
-    "crates/sqlez",
-    "crates/sqlez_macros",
-    "crates/story",
-    "crates/storybook",
-    "crates/streaming_diff",
+    "crates/scheduler",
     "crates/sum_tree",
-    "crates/supermaven",
-    "crates/supermaven_api",
-    "crates/codestral",
-    "crates/svg_preview",
-    "crates/system_specs",
-    "crates/tab_switcher",
-    "crates/task",
-    "crates/tasks_ui",
-    "crates/telemetry",
-    "crates/telemetry_events",
-    "crates/terminal",
-    "crates/terminal_view",
-    "crates/text",
-    "crates/theme",
-    "crates/theme_extension",
-    "crates/theme_importer",
-    "crates/theme_selector",
-    "crates/time_format",
-    "crates/title_bar",
-    "crates/toolchain_selector",
-    "crates/ui",
-    "crates/ui_input",
-    "crates/ui_macros",
-    "crates/ui_prompt",
     "crates/util",
     "crates/util_macros",
-    "crates/vercel",
-    "crates/vim",
-    "crates/vim_mode_setting",
     "crates/watch",
-    "crates/web_search",
-    "crates/web_search_providers",
-    "crates/workspace",
-    "crates/worktree",
-    "crates/x_ai",
-    "crates/zed",
-    "crates/zed_actions",
-    "crates/zed_env_vars",
-    "crates/edit_prediction_cli",
-    "crates/zeta_prompt",
-    "crates/zlog",
-    "crates/zlog_settings",
-    "crates/ztracing",
-    "crates/ztracing_macro",
-
-    #
-    # Extensions
-    #
-
-    "extensions/glsl",
-    "extensions/html",
-    "extensions/proto",
-    "extensions/slash-commands-example",
-    "extensions/test-extension",
-
-    #
-    # Tooling
-    #
-
     "tooling/perf",
-    "tooling/xtask",
 ]
-default-members = ["crates/zed"]
 
 [workspace.package]
 publish = false
@@ -236,207 +30,30 @@ edition = "2024"
 # Workspace member crates
 #
 
-acp_tools = { path = "crates/acp_tools" }
-acp_thread = { path = "crates/acp_thread" }
-action_log = { path = "crates/action_log" }
-agent = { path = "crates/agent" }
-activity_indicator = { path = "crates/activity_indicator" }
-agent_ui = { path = "crates/agent_ui" }
-agent_settings = { path = "crates/agent_settings" }
-agent_servers = { path = "crates/agent_servers" }
-ai_onboarding = { path = "crates/ai_onboarding" }
-anthropic = { path = "crates/anthropic" }
-askpass = { path = "crates/askpass" }
-assets = { path = "crates/assets" }
-assistant_text_thread = { path = "crates/assistant_text_thread" }
-assistant_slash_command = { path = "crates/assistant_slash_command" }
-assistant_slash_commands = { path = "crates/assistant_slash_commands" }
-audio = { path = "crates/audio" }
-auto_update = { path = "crates/auto_update" }
-auto_update_ui = { path = "crates/auto_update_ui" }
-aws_http_client = { path = "crates/aws_http_client" }
-bedrock = { path = "crates/bedrock" }
-breadcrumbs = { path = "crates/breadcrumbs" }
-buffer_diff = { path = "crates/buffer_diff" }
-call = { path = "crates/call" }
-channel = { path = "crates/channel" }
-cli = { path = "crates/cli" }
-client = { path = "crates/client" }
-clock = { path = "crates/clock" }
-cloud_api_client = { path = "crates/cloud_api_client" }
-cloud_api_types = { path = "crates/cloud_api_types" }
-cloud_llm_client = { path = "crates/cloud_llm_client" }
-collab_ui = { path = "crates/collab_ui" }
 collections = { path = "crates/collections", version = "0.1.0" }
-command_palette = { path = "crates/command_palette" }
-command_palette_hooks = { path = "crates/command_palette_hooks" }
-component = { path = "crates/component" }
-context_server = { path = "crates/context_server" }
-copilot = { path = "crates/copilot" }
-crashes = { path = "crates/crashes" }
-credentials_provider = { path = "crates/credentials_provider" }
-crossbeam = "0.8.4"
-dap = { path = "crates/dap" }
-dap_adapters = { path = "crates/dap_adapters" }
-db = { path = "crates/db" }
-debug_adapter_extension = { path = "crates/debug_adapter_extension" }
-debugger_tools = { path = "crates/debugger_tools" }
-debugger_ui = { path = "crates/debugger_ui" }
-deepseek = { path = "crates/deepseek" }
 derive_refineable = { path = "crates/refineable/derive_refineable" }
-diagnostics = { path = "crates/diagnostics" }
-editor = { path = "crates/editor" }
-eval_utils = { path = "crates/eval_utils" }
-extension = { path = "crates/extension" }
-extension_host = { path = "crates/extension_host" }
-extensions_ui = { path = "crates/extensions_ui" }
-feature_flags = { path = "crates/feature_flags" }
-feedback = { path = "crates/feedback" }
-file_finder = { path = "crates/file_finder" }
-file_icons = { path = "crates/file_icons" }
-fs = { path = "crates/fs" }
-fsevent = { path = "crates/fsevent" }
-fuzzy = { path = "crates/fuzzy" }
-git = { path = "crates/git" }
-git_hosting_providers = { path = "crates/git_hosting_providers" }
-git_ui = { path = "crates/git_ui" }
-go_to_line = { path = "crates/go_to_line" }
-google_ai = { path = "crates/google_ai" }
 gpui = { path = "crates/gpui", default-features = false }
 gpui_macros = { path = "crates/gpui_macros" }
 gpui_tokio = { path = "crates/gpui_tokio" }
 html_to_markdown = { path = "crates/html_to_markdown" }
 http_client = { path = "crates/http_client" }
 http_client_tls = { path = "crates/http_client_tls" }
-icons = { path = "crates/icons" }
-image_viewer = { path = "crates/image_viewer" }
-edit_prediction_types = { path = "crates/edit_prediction_types" }
-edit_prediction_ui = { path = "crates/edit_prediction_ui" }
-edit_prediction_context = { path = "crates/edit_prediction_context" }
-inspector_ui = { path = "crates/inspector_ui" }
-install_cli = { path = "crates/install_cli" }
-journal = { path = "crates/journal" }
-json_schema_store = { path = "crates/json_schema_store" }
-keymap_editor = { path = "crates/keymap_editor" }
-language = { path = "crates/language" }
-language_extension = { path = "crates/language_extension" }
-language_model = { path = "crates/language_model" }
-language_models = { path = "crates/language_models" }
-language_onboarding = { path = "crates/language_onboarding" }
-language_selector = { path = "crates/language_selector" }
-language_tools = { path = "crates/language_tools" }
-languages = { path = "crates/languages" }
-line_ending_selector = { path = "crates/line_ending_selector" }
-livekit_api = { path = "crates/livekit_api" }
-livekit_client = { path = "crates/livekit_client" }
-lmstudio = { path = "crates/lmstudio" }
-lsp = { path = "crates/lsp" }
-markdown = { path = "crates/markdown" }
-markdown_preview = { path = "crates/markdown_preview" }
-svg_preview = { path = "crates/svg_preview" }
 media = { path = "crates/media" }
-menu = { path = "crates/menu" }
-migrator = { path = "crates/migrator" }
-mistral = { path = "crates/mistral" }
-multi_buffer = { path = "crates/multi_buffer" }
-miniprofiler_ui = { path = "crates/miniprofiler_ui" }
-nc = { path = "crates/nc" }
-net = { path = "crates/net" }
-node_runtime = { path = "crates/node_runtime" }
-notifications = { path = "crates/notifications" }
-ollama = { path = "crates/ollama" }
-onboarding = { path = "crates/onboarding" }
-open_ai = { path = "crates/open_ai" }
-open_router = { path = "crates/open_router", features = ["schemars"] }
-outline = { path = "crates/outline" }
-outline_panel = { path = "crates/outline_panel" }
-panel = { path = "crates/panel" }
-paths = { path = "crates/paths" }
-perf = { path = "tooling/perf" }
-picker = { path = "crates/picker" }
-prettier = { path = "crates/prettier" }
-settings_profile_selector = { path = "crates/settings_profile_selector" }
-project = { path = "crates/project" }
-project_panel = { path = "crates/project_panel" }
-project_symbols = { path = "crates/project_symbols" }
-prompt_store = { path = "crates/prompt_store" }
-proto = { path = "crates/proto" }
-recent_projects = { path = "crates/recent_projects" }
 refineable = { path = "crates/refineable" }
-release_channel = { path = "crates/release_channel" }
-remote = { path = "crates/remote" }
-remote_server = { path = "crates/remote_server" }
-repl = { path = "crates/repl" }
 reqwest_client = { path = "crates/reqwest_client" }
-rodio = { git = "https://github.com/RustAudio/rodio", rev ="e2074c6c2acf07b57cf717e076bdda7a9ac6e70b", features = ["wav", "playback", "wav_output", "recording"] }
-rope = { path = "crates/rope" }
-rpc = { path = "crates/rpc" }
-rules_library = { path = "crates/rules_library" }
-search = { path = "crates/search" }
-session = { path = "crates/session" }
-settings = { path = "crates/settings" }
-settings_json = { path = "crates/settings_json" }
-settings_macros = { path = "crates/settings_macros" }
-settings_ui = { path = "crates/settings_ui" }
-snippet = { path = "crates/snippet" }
-snippet_provider = { path = "crates/snippet_provider" }
-snippets_ui = { path = "crates/snippets_ui" }
-sqlez = { path = "crates/sqlez" }
-sqlez_macros = { path = "crates/sqlez_macros" }
-story = { path = "crates/story" }
-streaming_diff = { path = "crates/streaming_diff" }
+scheduler = { path = "crates/scheduler" }
 sum_tree = { path = "crates/sum_tree" }
-supermaven = { path = "crates/supermaven" }
-supermaven_api = { path = "crates/supermaven_api" }
-codestral = { path = "crates/codestral" }
-system_specs = { path = "crates/system_specs" }
-tab_switcher = { path = "crates/tab_switcher" }
-task = { path = "crates/task" }
-tasks_ui = { path = "crates/tasks_ui" }
-telemetry = { path = "crates/telemetry" }
-telemetry_events = { path = "crates/telemetry_events" }
-terminal = { path = "crates/terminal" }
-terminal_view = { path = "crates/terminal_view" }
-text = { path = "crates/text" }
-theme = { path = "crates/theme" }
-theme_extension = { path = "crates/theme_extension" }
-theme_selector = { path = "crates/theme_selector" }
-time_format = { path = "crates/time_format" }
-title_bar = { path = "crates/title_bar" }
-toolchain_selector = { path = "crates/toolchain_selector" }
-ui = { path = "crates/ui" }
-ui_input = { path = "crates/ui_input" }
-ui_macros = { path = "crates/ui_macros" }
-ui_prompt = { path = "crates/ui_prompt" }
 util = { path = "crates/util" }
 util_macros = { path = "crates/util_macros" }
-vercel = { path = "crates/vercel" }
-vim = { path = "crates/vim" }
-vim_mode_setting = { path = "crates/vim_mode_setting" }
-
 watch = { path = "crates/watch" }
-web_search = { path = "crates/web_search" }
-web_search_providers = { path = "crates/web_search_providers" }
-workspace = { path = "crates/workspace" }
-worktree = { path = "crates/worktree" }
-x_ai = { path = "crates/x_ai" }
-zed = { path = "crates/zed" }
-zed_actions = { path = "crates/zed_actions" }
-zed_env_vars = { path = "crates/zed_env_vars" }
-edit_prediction = { path = "crates/edit_prediction" }
-zeta_prompt = { path = "crates/zeta_prompt" }
-zlog = { path = "crates/zlog" }
-zlog_settings = { path = "crates/zlog_settings" }
-ztracing = { path = "crates/ztracing" }
-ztracing_macro = { path = "crates/ztracing_macro" }
+perf = { path = "tooling/perf" }
 
 #
 # External crates
 #
 
-agent-client-protocol = { version = "=0.9.0", features = ["unstable"] }
 aho-corasick = "1.1"
-alacritty_terminal = "0.25.1-rc1"
+circular-buffer = "1.0"
 any_vec = "0.14"
 anyhow = "1.0.86"
 arrayvec = { version = "0.7.4", features = ["serde"] }
@@ -446,22 +63,12 @@ async-compression = { version = "0.4", features = ["gzip", "futures-io"] }
 async-dispatcher = "0.1"
 async-fs = "2.1"
 async-lock = "2.1"
-async-pipe = { git = "https://github.com/zed-industries/async-pipe-rs", rev = "82d00a04211cf4e1236029aa03e6b6ce2a74c553" }
 async-recursion = "1.0.0"
 async-tar = "0.5.1"
 async-task = "4.7"
 async-trait = "0.1"
 async-tungstenite = "0.31.0"
 async_zip = { version = "0.0.18", features = ["deflate", "deflate64"] }
-aws-config = { version = "1.6.1", features = ["behavior-version-latest"] }
-aws-credential-types = { version = "1.2.2", features = [
-    "hardcoded-credentials",
-] }
-aws-sdk-bedrockruntime = { version = "1.80.0", features = [
-    "behavior-version-latest",
-] }
-aws-smithy-runtime-api = { version = "1.7.4", features = ["http-1x", "client"] }
-aws-smithy-types = { version = "1.3.0", features = ["http-body-1-x"] }
 backtrace = "0.3"
 base64 = "0.22"
 bincode = "1.2.1"
@@ -471,76 +78,43 @@ blade-macros = { version = "0.3.0" }
 blade-util = { version = "0.3.0" }
 brotli = "8.0.2"
 bytes = "1.0"
-cargo_metadata = "0.19"
-cargo_toml = "0.21"
 cfg-if = "1.0.3"
 chrono = { version = "0.4", features = ["serde"] }
-ciborium = "0.2"
-circular-buffer = "1.0"
-clap = { version = "4.4", features = ["derive", "wrap_help"] }
 cocoa = "=0.26.0"
 cocoa-foundation = "=0.2.0"
 convert_case = "0.8.0"
 core-foundation = "=0.10.0"
 core-foundation-sys = "0.8.6"
 core-video = { version = "0.4.3", features = ["metal"] }
-cpal = "0.16"
-crash-handler = "0.6"
-criterion = { version = "0.5", features = ["html_reports"] }
+crossbeam = "0.8.4"
 ctor = "0.4.0"
-dap-types = { git = "https://github.com/zed-industries/dap-types", rev = "1b461b310481d01e02b2603c16d7144b926339f8" }
 dashmap = "6.0"
 derive_more = "0.99.17"
 dirs = "4.0"
-documented = "0.9.1"
-dotenvy = "0.15.0"
-ec4rs = "1.1"
-emojis = "0.6.1"
 env_logger = "0.11"
-exec = "0.3.1"
-fancy-regex = "0.16.0"
-fork = "0.4.0"
 futures = "0.3"
 futures-lite = "1.13"
-gh-workflow = { git = "https://github.com/zed-industries/gh-workflow", rev = "09acfdf2bd5c1d6254abefd609c808ff73547b2c" }
 git2 = { version = "0.20.1", default-features = false }
 globset = "0.4"
-handlebars = "4.3"
 heck = "0.5"
-heed = { version = "0.21.0", features = ["read-txn-no-tls"] }
 hex = "0.4.3"
-human_bytes = "0.4.1"
 html5ever = "0.27.0"
+indoc = "2"
+inventory = "0.3.19"
 http = "1.1"
 http-body = "1.0"
 hyper = "0.14"
-ignore = "0.4.22"
 image = "0.25.1"
-imara-diff = "0.1.8"
 indexmap = { version = "2.7.0", features = ["serde"] }
-indoc = "2"
-inventory = "0.3.19"
 itertools = "0.14.0"
-json_dotpath = "1.1"
-jsonschema = "0.37.0"
-jsonwebtoken = "9.3"
-jupyter-protocol = "0.10.0"
-jupyter-websocket-client = "0.15.0"
 libc = "0.2"
-libsqlite3-sys = { version = "0.30.1", features = ["bundled"] }
 linkify = "0.10.0"
 log = { version = "0.4.16", features = ["kv_unstable_serde", "serde"] }
-lsp-types = { git = "https://github.com/zed-industries/lsp-types", rev = "b71ab4eeb27d9758be8092020a46fe33fbca4e33" }
 mach2 = "0.5"
 markup5ever_rcdom = "0.3.0"
 metal = "0.29"
-minidumper = "0.8"
-moka = { version = "0.12.10", features = ["sync"] }
 naga = { version = "25.0", features = ["wgsl-in"] }
-nanoid = "0.4"
-nbformat = "0.15.0"
 nix = "0.29"
-num-format = "0.4.4"
 objc = "0.2"
 objc2-foundation = { version = "=0.3.1", default-features = false, features = [
     "NSArray",
@@ -571,25 +145,11 @@ open = "5.0.0"
 ordered-float = "2.1.1"
 palette = { version = "0.7.5", default-features = false, features = ["std"] }
 parking_lot = "0.12.1"
-partial-json-fixer = "0.5.3"
-parse_int = "0.9"
-pciid-parser = "0.8.0"
 pathdiff = "0.2"
-pet = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da" }
-pet-conda = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da" }
-pet-core = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da" }
-pet-fs = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da" }
-pet-poetry = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da" }
-pet-reporter = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da" }
-pet-virtualenv = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da" }
-portable-pty = "0.9.0"
 postage = { version = "0.5", features = ["futures-traits"] }
 pretty_assertions = { version = "1.3.0", features = ["unstable"] }
 proc-macro2 = "1.0.93"
 profiling = "1"
-prost = "0.9"
-prost-build = "0.9"
-prost-types = "0.9"
 pulldown-cmark = { version = "0.12.0", default-features = false }
 quote = "1.0.9"
 rand = "0.9"
@@ -605,10 +165,6 @@ reqwest = { git = "https://github.com/zed-industries/reqwest.git", rev = "c15662
     "socks",
     "stream",
 ], package = "zed-reqwest", version = "0.12.15-zed" }
-rsa = "0.9.6"
-runtimelib = { version = "0.30.0", default-features = false, features = [
-    "async-dispatcher-runtime", "aws-lc-rs"
-] }
 rust-embed = { version = "8.4", features = ["include-exclude"] }
 rustc-hash = "2.1.0"
 rustls = { version = "0.23.26" }
@@ -623,19 +179,14 @@ serde_json_lenient = { version = "0.2", features = [
     "preserve_order",
     "raw_value",
 ] }
-serde_path_to_error = "0.1.17"
-serde_repr = "0.1"
 serde_urlencoded = "0.7"
 sha2 = "0.10"
-shellexpand = "2.1.0"
 shlex = "1.3.0"
-simplelog = "0.12.2"
+shellexpand = "2.1.0"
 slotmap = "1.0.6"
 smallvec = { version = "1.6", features = ["union", "const_new"] }
 smol = "2.0"
-sqlformat = "0.2"
 stacksafe = "0.1"
-streaming-iterator = "0.1"
 strsim = "0.11"
 strum = { version = "0.27.2", features = ["derive"] }
 subtle = "2.5.0"
@@ -645,7 +196,6 @@ sysinfo = "0.37.0"
 take-until = "0.2.0"
 tempfile = "3.20.0"
 thiserror = "2.0.12"
-tiktoken-rs = { git = "https://github.com/zed-industries/tiktoken-rs", rev = "2570c4387a8505fb8f1d3f3557454b474f1e8271" }
 time = { version = "0.3", features = [
     "macros",
     "parsing",
@@ -654,64 +204,20 @@ time = { version = "0.3", features = [
     "formatting",
     "local-offset",
 ] }
-tiny_http = "0.8"
 tokio = { version = "1" }
 tokio-tungstenite = { version = "0.26", features = ["__rustls-tls"] }
 tokio-socks = { version = "0.5.2", default-features = false, features = ["futures-io", "tokio"] }
-toml = "0.8"
-toml_edit = { version = "0.22", default-features = false, features = ["display", "parse", "serde"] }
-tower-http = "0.4.4"
-tree-sitter = { version = "0.25.10", features = ["wasm"] }
-tree-sitter-bash = "0.25.1"
-tree-sitter-c = "0.23"
-tree-sitter-cpp = { git = "https://github.com/tree-sitter/tree-sitter-cpp", rev = "5cb9b693cfd7bfacab1d9ff4acac1a4150700609" }
-tree-sitter-css = "0.23"
-tree-sitter-diff = "0.1.0"
-tree-sitter-elixir = "0.3"
-tree-sitter-embedded-template = "0.23.0"
-tree-sitter-gitcommit = { git = "https://github.com/zed-industries/tree-sitter-git-commit", rev = "88309716a69dd13ab83443721ba6e0b491d37ee9" }
-tree-sitter-go = "0.23"
-tree-sitter-go-mod = { git = "https://github.com/camdencheek/tree-sitter-go-mod", rev = "2e886870578eeba1927a2dc4bd2e2b3f598c5f9a", package = "tree-sitter-gomod" }
-tree-sitter-gowork = { git = "https://github.com/zed-industries/tree-sitter-go-work", rev = "acb0617bf7f4fda02c6217676cc64acb89536dc7" }
-tree-sitter-heex = { git = "https://github.com/zed-industries/tree-sitter-heex", rev = "1dd45142fbb05562e35b2040c6129c9bca346592" }
-tree-sitter-html = "0.23"
-tree-sitter-jsdoc = "0.23"
-tree-sitter-json = "0.24"
-tree-sitter-md = { git = "https://github.com/tree-sitter-grammars/tree-sitter-markdown", rev = "9a23c1a96c0513d8fc6520972beedd419a973539" }
-tree-sitter-python = "0.25"
-tree-sitter-regex = "0.24"
-tree-sitter-ruby = "0.23"
-tree-sitter-rust = "0.24"
-tree-sitter-typescript = { git = "https://github.com/zed-industries/tree-sitter-typescript", rev = "e2c53597d6a5d9cf7bbe8dccde576fe1e46c5899" } # https://github.com/tree-sitter/tree-sitter-typescript/pull/347
-tree-sitter-yaml = { git = "https://github.com/zed-industries/tree-sitter-yaml", rev = "baff0b51c64ef6a1fb1f8390f3ad6015b83ec13a" }
 tracing = "0.1.40"
 unicase = "2.6"
-unicode-script = "0.5.7"
 unicode-segmentation = "1.10"
-unindent = "0.2.0"
 url = "2.2"
-urlencoding = "2.1.2"
 uuid = { version = "1.1.2", features = ["v4", "v5", "v7", "serde"] }
 walkdir = "2.5"
-wasm-encoder = "0.221"
-wasmparser = "0.221"
-wasmtime = { version = "29", default-features = false, features = [
-    "async",
-    "demangle",
-    "runtime",
-    "cranelift",
-    "component-model",
-    "incremental-cache",
-    "parallel-compilation",
-] }
-wasmtime-wasi = "29"
-wax = "0.6"
 which = "6.0.0"
 windows-core = "0.61"
 yawc = "0.2.5"
 zeroize = "1.8"
-zstd = "0.11"
-
+ciborium = "0.2"
 
 [workspace.dependencies.windows]
 version = "0.61"
@@ -765,9 +271,6 @@ features = [
 ]
 
 [patch.crates-io]
-notify = { git = "https://github.com/zed-industries/notify.git", rev = "b4588b2e5aee68f4c0e100f140e808cbce7b1419" }
-notify-types = { git = "https://github.com/zed-industries/notify.git", rev = "b4588b2e5aee68f4c0e100f140e808cbce7b1419" }
-windows-capture = { git = "https://github.com/zed-industries/windows-capture.git", rev = "f0d6c1b6691db75461b732f6d5ff56eed002eeb9" }
 calloop = { git = "https://github.com/zed-industries/calloop" }
 
 [profile.dev]
@@ -785,9 +288,6 @@ codegen-units = 16
 # proc-macros start
 gpui_macros = { opt-level = 3 }
 derive_refineable = { opt-level = 3 }
-settings_macros = { opt-level = 3 }
-sqlez_macros = { opt-level = 3, codegen-units = 1 }
-ui_macros = { opt-level = 3 }
 util_macros = { opt-level = 3 }
 quote = { opt-level = 3 }
 syn = { opt-level = 3 }
@@ -796,52 +296,16 @@ proc-macro2 = { opt-level = 3 }
 
 taffy = { opt-level = 3 }
 resvg = { opt-level = 3 }
-wasmtime = { opt-level = 3 }
-# Build single-source-file crates with cg=1 as it helps make `cargo build` of a whole workspace a bit faster
-activity_indicator = { codegen-units = 1 }
-assets = { codegen-units = 1 }
-breadcrumbs = { codegen-units = 1 }
+
 collections = { codegen-units = 1 }
-command_palette = { codegen-units = 1 }
-command_palette_hooks = { codegen-units = 1 }
-feature_flags = { codegen-units = 1 }
-file_icons = { codegen-units = 1 }
-fsevent = { codegen-units = 1 }
-image_viewer = { codegen-units = 1 }
-edit_prediction_ui = { codegen-units = 1 }
-install_cli = { codegen-units = 1 }
-journal = { codegen-units = 1 }
-json_schema_store = { codegen-units = 1 }
-lmstudio = { codegen-units = 1 }
-menu = { codegen-units = 1 }
-notifications = { codegen-units = 1 }
-ollama = { codegen-units = 1 }
-outline = { codegen-units = 1 }
-paths = { codegen-units = 1 }
-prettier = { codegen-units = 1 }
-project_symbols = { codegen-units = 1 }
 refineable = { codegen-units = 1 }
-release_channel = { codegen-units = 1 }
 reqwest_client = { codegen-units = 1 }
-session = { codegen-units = 1 }
-snippet = { codegen-units = 1 }
-snippets_ui = { codegen-units = 1 }
-story = { codegen-units = 1 }
-supermaven_api = { codegen-units = 1 }
-telemetry_events = { codegen-units = 1 }
-theme_selector = { codegen-units = 1 }
-time_format = { codegen-units = 1 }
-ui_input = { codegen-units = 1 }
-zed_actions = { codegen-units = 1 }
 
 [profile.release]
 debug = "limited"
 lto = "thin"
 codegen-units = 1
 
-[profile.release.package]
-zed = { codegen-units = 16 }
-
 [profile.release-fast]
 inherits = "release"
 debug = "full"
@@ -897,9 +361,5 @@ nonminimal_bool = "allow"
 ignored = [
     "bindgen",
     "cbindgen",
-    "prost_build",
     "serde",
-    "component",
-    "documented",
-    "sea-orm-macros",
-]
+]
\ No newline at end of file
diff --git a/Dockerfile-collab b/Dockerfile-collab
deleted file mode 100644
index 68f898618a..0000000000
--- a/Dockerfile-collab
+++ /dev/null
@@ -1,37 +0,0 @@
-# syntax = docker/dockerfile:1.2
-
-FROM rust:1.91.1-bookworm as builder
-WORKDIR app
-COPY . .
-
-# Replace the Cargo configuration with the one used by collab.
-COPY ./.cargo/collab-config.toml ./.cargo/config.toml
-
-# Compile collab server
-ARG CARGO_PROFILE_RELEASE_PANIC=abort
-ARG GITHUB_SHA
-
-ENV GITHUB_SHA=$GITHUB_SHA
-
-# Also add `cmake`, since we need it to build `wasmtime`.
-RUN apt-get update; \
-    apt-get install -y --no-install-recommends cmake
-
-RUN --mount=type=cache,target=./script/node_modules \
-    --mount=type=cache,target=/usr/local/cargo/registry \
-    --mount=type=cache,target=/usr/local/cargo/git \
-    --mount=type=cache,target=./target \
-    cargo build --release --package collab --bin collab
-
-# Copy collab server binary out of cached directory
-RUN --mount=type=cache,target=./target \
-    cp /app/target/release/collab /app/collab
-
-# Copy collab server binary to the runtime image
-FROM debian:bookworm-slim as runtime
-RUN apt-get update; \
-    apt-get install -y --no-install-recommends libcurl4-openssl-dev ca-certificates \
-    linux-perf binutils
-WORKDIR app
-COPY --from=builder /app/collab /app/collab
-ENTRYPOINT ["/app/collab"]
diff --git a/Dockerfile-collab.dockerignore b/Dockerfile-collab.dockerignore
deleted file mode 100644
index 337b4d4262..0000000000
--- a/Dockerfile-collab.dockerignore
+++ /dev/null
@@ -1,16 +0,0 @@
-.git
-.github
-**/.gitignore
-**/.gitkeep
-.gitattributes
-.mailmap
-**/target
-zed.xcworkspace
-.DS_Store
-compose.yml
-plugins/bin
-script/node_modules
-styles/node_modules
-crates/collab/static/styles.css
-vendor/bin
-assets/themes/
diff --git a/Dockerfile-cross.dockerignore b/Dockerfile-cross.dockerignore
deleted file mode 100644
index 337b4d4262..0000000000
--- a/Dockerfile-cross.dockerignore
+++ /dev/null
@@ -1,16 +0,0 @@
-.git
-.github
-**/.gitignore
-**/.gitkeep
-.gitattributes
-.mailmap
-**/target
-zed.xcworkspace
-.DS_Store
-compose.yml
-plugins/bin
-script/node_modules
-styles/node_modules
-crates/collab/static/styles.css
-vendor/bin
-assets/themes/
diff --git a/Dockerfile-distros b/Dockerfile-distros
deleted file mode 100644
index c8a98d2f7d..0000000000
--- a/Dockerfile-distros
+++ /dev/null
@@ -1,26 +0,0 @@
-# syntax=docker/dockerfile:1
-
-ARG BASE_IMAGE
-FROM ${BASE_IMAGE}
-WORKDIR /app
-ARG TZ=Etc/UTC \
-    LANG=C.UTF-8 \
-    LC_ALL=C.UTF-8 \
-    DEBIAN_FRONTEND=noninteractive
-ENV CARGO_TERM_COLOR=always
-
-COPY script/linux script/
-RUN ./script/linux
-COPY script/install-mold script/install-cmake script/
-RUN ./script/install-mold "2.34.0"
-RUN ./script/install-cmake "3.30.4"
-
-COPY . .
-
-# When debugging, make these into individual RUN statements.
-# Cleanup to avoid saving big layers we aren't going to use.
-RUN . "$HOME/.cargo/env" \
-    && cargo fetch \
-    && cargo build \
-    && cargo run -- --help \
-    && cargo clean --quiet
diff --git a/Dockerfile-distros.dockerignore b/Dockerfile-distros.dockerignore
deleted file mode 100644
index de70e0d167..0000000000
--- a/Dockerfile-distros.dockerignore
+++ /dev/null
@@ -1,2 +0,0 @@
-**/target
-**/node_modules
diff --git a/LICENSE-AGPL b/LICENSE-AGPL
deleted file mode 100644
index 87a0dea90e..0000000000
--- a/LICENSE-AGPL
+++ /dev/null
@@ -1,788 +0,0 @@
-Copyright 2022 - 2025 Zed Industries, Inc.
-
-
-
-
-This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.
-You should have received a copy of the GNU Affero General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-                            Preamble
-
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-
-                       TERMS AND CONDITIONS
-
-
-  0. Definitions.
-
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-
-  1. Source Code.
-
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-
-  2. Basic Permissions.
-
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-
-  4. Conveying Verbatim Copies.
-
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-
-  5. Conveying Modified Source Versions.
-
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-
-  6. Conveying Non-Source Forms.
-
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-
-  7. Additional Terms.
-
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-
-  8. Termination.
-
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-
-  9. Acceptance Not Required for Having Copies.
-
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-
-  10. Automatic Licensing of Downstream Recipients.
-
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-
-  11. Patents.
-
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-
-  12. No Surrender of Others' Freedom.
-
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-
-  14. Revised Versions of this License.
-
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-
-  15. Disclaimer of Warranty.
-
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-
-  16. Limitation of Liability.
-
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-
-  17. Interpretation of Sections 15 and 16.
-
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-
-                     END OF TERMS AND CONDITIONS
-
-
-            How to Apply These Terms to Your New Programs
-
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<https://www.gnu.org/licenses/>.
diff --git a/LICENSE-GPL b/LICENSE-GPL
deleted file mode 100644
index cb82534a8d..0000000000
--- a/LICENSE-GPL
+++ /dev/null
@@ -1,200 +0,0 @@
-GNU GENERAL PUBLIC LICENSE
-Version 3, 29 June 2007
-
-Copyright © 2007 Free Software Foundation, Inc. <https://fsf.org/>
-
-Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
-
-Preamble
-
-The GNU General Public License is a free, copyleft license for software and other kinds of works.
-
-The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too.
-
-When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things.
-
-To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others.
-
-For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
-
-Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it.
-
-For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions.
-
-Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users.
-
-Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free.
-
-The precise terms and conditions for copying, distribution and modification follow.
-
-TERMS AND CONDITIONS
-
-0. Definitions.
-"This License" refers to version 3 of the GNU General Public License.
-
-"Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks.
-
-"The Program" refers to any copyrightable work licensed under this License. Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals or organizations.
-
-To "modify" a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a "modified version" of the earlier work or a work "based on" the earlier work.
-
-A "covered work" means either the unmodified Program or a work based on the Program.
-
-To "propagate" a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well.
-
-To "convey" a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying.
-
-An interactive user interface displays "Appropriate Legal Notices" to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion.
-
-1. Source Code.
-The "source code" for a work means the preferred form of the work for making modifications to it. "Object code" means any non-source form of a work.
-A "Standard Interface" means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language.
-
-The "System Libraries" of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A "Major Component", in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it.
-
-The "Corresponding Source" for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work.
-
-The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source.
-
-The Corresponding Source for a work in source code form is that same work.
-
-2. Basic Permissions.
-All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law.
-You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you.
-
-Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary.
-
-3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures.
-When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures.
-
-4. Conveying Verbatim Copies.
-You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program.
-You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee.
-
-5. Conveying Modified Source Versions.
-You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions:
-a) The work must carry prominent notices stating that you modified it, and giving a relevant date.
-b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to "keep intact all notices".
-c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it.
-d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so.
-A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an "aggregate" if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate.
-
-6. Conveying Non-Source Forms.
-You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways:
-a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange.
-b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge.
-c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b.
-d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements.
-e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d.
-A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work.
-
-A "User Product" is either (1) a "consumer product", which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, "normally used" refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product.
-
-"Installation Information" for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made.
-
-If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM).
-
-The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network.
-
-Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying.
-
-7. Additional Terms.
-"Additional permissions" are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions.
-When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission.
-
-Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms:
-
-a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or
-b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or
-c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or
-d) Limiting the use for publicity purposes of names of licensors or authors of the material; or
-e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or
-f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors.
-All other non-permissive additional terms are considered "further restrictions" within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying.
-
-If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms.
-
-Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way.
-
-8. Termination.
-You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11).
-However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation.
-
-Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice.
-
-Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10.
-
-9. Acceptance Not Required for Having Copies.
-You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so.
-10. Automatic Licensing of Downstream Recipients.
-Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License.
-An "entity transaction" is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts.
-
-You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it.
-
-11. Patents.
-A "contributor" is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's "contributor version".
-A contributor's "essential patent claims" are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, "control" includes the right to grant patent sublicenses in a manner consistent with the requirements of this License.
-
-Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version.
-
-In the following three paragraphs, a "patent license" is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To "grant" such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party.
-
-If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. "Knowingly relying" means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid.
-
-If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it.
-
-A patent license is "discriminatory" if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007.
-
-Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law.
-
-12. No Surrender of Others' Freedom.
-If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program.
-13. Use with the GNU Affero General Public License.
-Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such.
-14. Revised Versions of this License.
-The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
-Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation.
-
-If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program.
-
-Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version.
-
-15. Disclaimer of Warranty.
-THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-16. Limitation of Liability.
-IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-17. Interpretation of Sections 15 and 16.
-If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee.
-
-END OF TERMS AND CONDITIONS
-
-How to Apply These Terms to Your New Programs
-
-If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.
-
-To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found.
-
-<one line to give the program's name and a brief idea of what it does.>
-Copyright (C) <year> <name of author>
-
-This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode:
-
-<program> Copyright (C) <year> <name of author>
-This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, your program's commands might be different; for a GUI interface, you would use an "about box".
-
-You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see <https://www.gnu.org/licenses/>.
-
-The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read <https: //www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/Procfile b/Procfile
deleted file mode 100644
index b3f13f66a6..0000000000
--- a/Procfile
+++ /dev/null
@@ -1,4 +0,0 @@
-collab: RUST_LOG=${RUST_LOG:-info} cargo run --package=collab serve all
-cloud: cd ../cloud; cargo make dev
-livekit: livekit-server --dev
-blob_store: ./script/run-local-minio
diff --git a/Procfile.web b/Procfile.web
deleted file mode 100644
index 63190fc2ee..0000000000
--- a/Procfile.web
+++ /dev/null
@@ -1 +0,0 @@
-website: cd ../zed.dev; npm run dev -- --port=3000
diff --git a/REVIEWERS.conl b/REVIEWERS.conl
deleted file mode 100644
index 45155ba346..0000000000
--- a/REVIEWERS.conl
+++ /dev/null
@@ -1,133 +0,0 @@
-; This file contains a list of people who're interested in reviewing pull requests
-; to certain parts of the code-base.
-;
-; This is mostly used internally for PR assignment, and may change over time.
-;
-; If you have permission to merge PRs (mostly equivalent to "do you work at Zed Industries"),
-; we strongly encourage you to put your name in the "all" bucket, but you can also add yourself
-; to other areas too.
-
-<all>
-  = @cole-miller
-  = @ConradIrwin
-  = @danilo-leal
-  = @dinocosta
-  = @HactarCE
-  = @kubkon
-  = @maxdeviant
-  = @p1n3appl3
-  = @probably-neb
-  = @smitbarmase
-  = @SomeoneToIgnore
-  = @Veykril
-
-ai
-  = @benbrandt
-  = @bennetbo
-  = @danilo-leal
-  = @rtfeldman
-
-audio
-  = @dvdsk
-
-crashes
-  = @p1n3appl3
-  = @Veykril
-
-debugger
-  = @Anthony-Eid
-  = @kubkon
-  = @osiewicz
-
-design
-  = @danilo-leal
-
-docs
-  = @miguelraz
-  = @probably-neb
-  = @yeskunall
-
-extension
-  = @kubkon
-
-git
-  = @cole-miller
-  = @danilo-leal
-  = @dvdsk
-  = @kubkon
-  = @Anthony-Eid
-  = @cameron1024
-
-gpui
-  = @Anthony-Eid
-  = @cameron1024
-  = @mikayla-maki
-  = @probably-neb
-
-helix
-  = @kubkon
-
-languages
-  = @osiewicz
-  = @probably-neb
-  = @smitbarmase
-  = @SomeoneToIgnore
-  = @Veykril
-
-linux
-  = @cole-miller
-  = @dvdsk
-  = @p1n3appl3
-  = @probably-neb
-  = @smitbarmase
-
-lsp
-  = @osiewicz
-  = @smitbarmase
-  = @SomeoneToIgnore
-  = @Veykril
-
-multi_buffer
-  = @Veykril
-  = @SomeoneToIgnore
-
-pickers
-  = @dvdsk
-  = @p1n3appl3
-  = @SomeoneToIgnore
-
-project_panel
-  = @smitbarmase
-
-settings_ui
-  = @Anthony-Eid
-  = @danilo-leal
-  = @probably-neb
-
-sum_tree
-  = @Veykril
-
-support
-  = @miguelraz
-
-tasks
-  = @SomeoneToIgnore
-  = @Veykril
-
-terminal
-  = @kubkon
-  = @Veykril
-
-text
-  = @Veykril
-
-vim
-  = @ConradIrwin
-  = @dinocosta
-  = @p1n3appl3
-  = @probably-neb
-
-windows
-  = @localcc
-  = @reflectronic
-  = @Veykril
diff --git a/assets/badge/v0.json b/assets/badge/v0.json
deleted file mode 100644
index c7d18bb42b..0000000000
--- a/assets/badge/v0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "label": "",
-  "message": "Zed",
-  "logoSvg": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 96 96\"><rect width=\"96\" height=\"96\" fill=\"#000\"/><path fill-rule=\"evenodd\" clip-rule=\"evenodd\" d=\"M9 6C7.34315 6 6 7.34315 6 9V75H0V9C0 4.02944 4.02944 0 9 0H89.3787C93.3878 0 95.3955 4.84715 92.5607 7.68198L43.0551 57.1875H57V51H63V58.6875C63 61.1728 60.9853 63.1875 58.5 63.1875H37.0551L26.7426 73.5H73.5V36H79.5V73.5C79.5 76.8137 76.8137 79.5 73.5 79.5H20.7426L10.2426 90H87C88.6569 90 90 88.6569 90 87V21H96V87C96 91.9706 91.9706 96 87 96H6.62132C2.61224 96 0.604504 91.1529 3.43934 88.318L52.7574 39H39V45H33V37.5C33 35.0147 35.0147 33 37.5 33H58.7574L69.2574 22.5H22.5V60H16.5V22.5C16.5 19.1863 19.1863 16.5 22.5 16.5H75.2574L85.7574 6H9Z\" fill=\"#fff\"/></svg>",
-  "logoWidth": 16,
-  "labelColor": "black",
-  "color": "white"
-}
diff --git a/assets/icons/LICENSES b/assets/icons/LICENSES
deleted file mode 100644
index 7a2fc3b863..0000000000
--- a/assets/icons/LICENSES
+++ /dev/null
@@ -1,9 +0,0 @@
-Lucide License
-
-ISC License
-
-Copyright (c) for portions of Lucide are held by Cole Bemis 2013-2022 as part of Feather (MIT). All other copyright (c) for Lucide are held by Lucide Contributors 2022.
-
-Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/assets/icons/ai.svg b/assets/icons/ai.svg
deleted file mode 100644
index 4236d50337..0000000000
--- a/assets/icons/ai.svg
+++ /dev/null
@@ -1,27 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M10.5 8.75V10.5C8.43097 10.5 7.56903 10.5 5.5 10.5V10L10.5 6V5.5H5.5V7.25" stroke="black" stroke-width="1.2"/>
-    <path d="M1.5 8.5C1.77614 8.5 2 8.27614 2 8C2 7.72386 1.77614 7.5 1.5 7.5C1.22386 7.5 1 7.72386 1 8C1 8.27614 1.22386 8.5 1.5 8.5Z" fill="black"/>
-    <path d="M2.49976 6.33002C2.7759 6.33002 2.99976 6.10616 2.99976 5.83002C2.99976 5.55387 2.7759 5.33002 2.49976 5.33002C2.22361 5.33002 1.99976 5.55387 1.99976 5.83002C1.99976 6.10616 2.22361 6.33002 2.49976 6.33002Z" fill="black"/>
-    <path d="M2.49976 10.66C2.7759 10.66 2.99976 10.4361 2.99976 10.16C2.99976 9.88383 2.7759 9.65997 2.49976 9.65997C2.22361 9.65997 1.99976 9.88383 1.99976 10.16C1.99976 10.4361 2.22361 10.66 2.49976 10.66Z" fill="black"/>
-    <path d="M14.5 8.5C14.7761 8.5 15 8.27614 15 8C15 7.72386 14.7761 7.5 14.5 7.5C14.2239 7.5 14 7.72386 14 8C14 8.27614 14.2239 8.5 14.5 8.5Z" fill="black"/>
-    <path d="M13.5 6.33002C13.7761 6.33002 14 6.10616 14 5.83002C14 5.55387 13.7761 5.33002 13.5 5.33002C13.2239 5.33002 13 5.55387 13 5.83002C13 6.10616 13.2239 6.33002 13.5 6.33002Z" fill="black"/>
-    <path d="M13.5 10.66C13.7761 10.66 14 10.4361 14 10.16C14 9.88383 13.7761 9.65997 13.5 9.65997C13.2239 9.65997 13 9.88383 13 10.16C13 10.4361 13.2239 10.66 13.5 10.66Z" fill="black"/>
-    <path d="M7.99219 2C8.26833 2 8.49219 1.77614 8.49219 1.5C8.49219 1.22386 8.26833 1 7.99219 1C7.71605 1 7.49219 1.22386 7.49219 1.5C7.49219 1.77614 7.71605 2 7.99219 2Z" fill="black"/>
-    <path d="M5.5 3C5.77614 3 6 2.77614 6 2.5C6 2.22386 5.77614 2 5.5 2C5.22386 2 5 2.22386 5 2.5C5 2.77614 5.22386 3 5.5 3Z" fill="black"/>
-    <path d="M3.5 4C3.77614 4 4 3.77614 4 3.5C4 3.22386 3.77614 3 3.5 3C3.22386 3 3 3.22386 3 3.5C3 3.77614 3.22386 4 3.5 4Z" fill="black"/>
-    <path d="M3.49976 13C3.7759 13 3.99976 12.7761 3.99976 12.5C3.99976 12.2239 3.7759 12 3.49976 12C3.22361 12 2.99976 12.2239 2.99976 12.5C2.99976 12.7761 3.22361 13 3.49976 13Z" fill="black"/>
-    <path d="M1.5 12.5C1.77614 12.5 2 12.2761 2 12C2 11.7239 1.77614 11.5 1.5 11.5C1.22386 11.5 1 11.7239 1 12C1 12.2761 1.22386 12.5 1.5 12.5Z" fill="black"/>
-    <path d="M1.5 4.5C1.77614 4.5 2 4.27614 2 4C2 3.72386 1.77614 3.5 1.5 3.5C1.22386 3.5 1 3.72386 1 4C1 4.27614 1.22386 4.5 1.5 4.5Z" fill="black"/>
-    <path d="M14.5 12.5C14.7761 12.5 15 12.2761 15 12C15 11.7239 14.7761 11.5 14.5 11.5C14.2239 11.5 14 11.7239 14 12C14 12.2761 14.2239 12.5 14.5 12.5Z" fill="black"/>
-    <path d="M14.5 4.5C14.7761 4.5 15 4.27614 15 4C15 3.72386 14.7761 3.5 14.5 3.5C14.2239 3.5 14 3.72386 14 4C14 4.27614 14.2239 4.5 14.5 4.5Z" fill="black"/>
-    <path d="M3.49976 15C3.7759 15 3.99976 14.7761 3.99976 14.5C3.99976 14.2239 3.7759 14 3.49976 14C3.22361 14 2.99976 14.2239 2.99976 14.5C2.99976 14.7761 3.22361 15 3.49976 15Z" fill="black"/>
-    <path d="M3.5 2C3.77614 2 4 1.77614 4 1.5C4 1.22386 3.77614 1 3.5 1C3.22386 1 3 1.22386 3 1.5C3 1.77614 3.22386 2 3.5 2Z" fill="black"/>
-    <path d="M12.5 15C12.7761 15 13 14.7761 13 14.5C13 14.2239 12.7761 14 12.5 14C12.2239 14 12 14.2239 12 14.5C12 14.7761 12.2239 15 12.5 15Z" fill="black"/>
-    <path d="M12.5 2C12.7761 2 13 1.77614 13 1.5C13 1.22386 12.7761 1 12.5 1C12.2239 1 12 1.22386 12 1.5C12 1.77614 12.2239 2 12.5 2Z" fill="black"/>
-    <path d="M12.5 4C12.7761 4 13 3.77614 13 3.5C13 3.22386 12.7761 3 12.5 3C12.2239 3 12 3.22386 12 3.5C12 3.77614 12.2239 4 12.5 4Z" fill="black"/>
-    <path d="M12.5 13C12.7761 13 13 12.7761 13 12.5C13 12.2239 12.7761 12 12.5 12C12.2239 12 12 12.2239 12 12.5C12 12.7761 12.2239 13 12.5 13Z" fill="black"/>
-    <path d="M10.5 3C10.7761 3 11 2.77614 11 2.5C11 2.22386 10.7761 2 10.5 2C10.2239 2 10 2.22386 10 2.5C10 2.77614 10.2239 3 10.5 3Z" fill="black"/>
-    <path d="M8 15C8.27614 15 8.5 14.7761 8.5 14.5C8.5 14.2239 8.27614 14 8 14C7.72386 14 7.5 14.2239 7.5 14.5C7.5 14.7761 7.72386 15 8 15Z" fill="black"/>
-    <path d="M5.5 14C5.77614 14 6 13.7761 6 13.5C6 13.2239 5.77614 13 5.5 13C5.22386 13 5 13.2239 5 13.5C5 13.7761 5.22386 14 5.5 14Z" fill="black"/>
-    <path d="M10.5 14C10.7761 14 11 13.7761 11 13.5C11 13.2239 10.7761 13 10.5 13C10.2239 13 10 13.2239 10 13.5C10 13.7761 10.2239 14 10.5 14Z" fill="black"/>
-</svg>
diff --git a/assets/icons/ai_anthropic.svg b/assets/icons/ai_anthropic.svg
deleted file mode 100644
index 12d731fb0b..0000000000
--- a/assets/icons/ai_anthropic.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_1896_18)">
-<path d="M11.094 3.09999H8.952L12.858 12.9H15L11.094 3.09999Z" fill="#1F1F1E"/>
-<path d="M4.906 3.09999L1 12.9H3.184L3.98284 10.842H8.06915L8.868 12.9H11.052L7.146 3.09999H4.906ZM4.68928 9.02199L6.026 5.57799L7.3627 9.02199H4.68928Z" fill="#1F1F1E"/>
-</g>
-<defs>
-<clipPath id="clip0_1896_18">
-<rect width="14" height="9.8" fill="white" transform="translate(1 3.09999)"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/assets/icons/ai_bedrock.svg b/assets/icons/ai_bedrock.svg
deleted file mode 100644
index c9bbcc82e1..0000000000
--- a/assets/icons/ai_bedrock.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<mask id="path-1-outside-1_2722_10821" maskUnits="userSpaceOnUse" x="1.00002" y="0.500015" width="15" height="15" fill="black">
-<rect fill="white" x="1.00002" y="0.500015" width="15" height="15"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M14.0714 7.76784C13.8154 7.76784 13.6071 7.55961 13.6071 7.30355C13.6071 7.0475 13.8154 6.83927 14.0714 6.83927C14.3275 6.83927 14.5357 7.0475 14.5357 7.30355C14.5357 7.55961 14.3275 7.76784 14.0714 7.76784ZM6.66911 14.0143L5.9151 13.5747L7.46234 12.6075L7.21627 12.2138L5.46196 13.3102L4.0893 12.5096V10.4456L5.37885 9.58598L5.12117 9.19969L3.84765 10.0486L2.4643 9.25819V8.13462L3.97231 7.27291L3.74202 6.86991L2.4643 7.6V6.74177L3.85716 5.94598L5.25001 6.74177V7.63645L4.2019 8.26532L4.441 8.66321L5.48215 8.03852L6.52332 8.66321L6.76242 8.26532L5.7143 7.63645V6.73132L7.00385 5.8717C7.06838 5.82852 7.10715 5.75609 7.10715 5.67855V4.05356H6.64287V5.55436L5.47265 6.33436L4.0893 5.54391V3.49038L5.25001 2.81345V4.74998H5.7143V2.54254L6.66911 1.98563L8.50001 2.59594V9.26145L5.13047 11.2832L5.36957 11.6811L8.50001 9.8028V13.404L6.66911 14.0143ZM13.6071 10.3214C13.6071 10.5775 13.3989 10.7857 13.1429 10.7857C12.8868 10.7857 12.6786 10.5775 12.6786 10.3214C12.6786 10.0654 12.8868 9.85712 13.1429 9.85712C13.3989 9.85712 13.6071 10.0654 13.6071 10.3214ZM11.2857 12.6428C11.2857 12.8989 11.0775 13.1071 10.8214 13.1071C10.5654 13.1071 10.3571 12.8989 10.3571 12.6428C10.3571 12.3868 10.5654 12.1785 10.8214 12.1785C11.0775 12.1785 11.2857 12.3868 11.2857 12.6428ZM11.0536 3.35713C11.0536 3.10108 11.2618 2.89284 11.5179 2.89284C11.7739 2.89284 11.9821 3.10108 11.9821 3.35713C11.9821 3.61318 11.7739 3.82141 11.5179 3.82141C11.2618 3.82141 11.0536 3.61318 11.0536 3.35713ZM14.0714 6.37498C13.6399 6.37498 13.2796 6.67212 13.1758 7.07141H8.96429V5.9107H11.5179C11.6462 5.9107 11.75 5.8067 11.75 5.67855V4.25274C12.1493 4.14897 12.4464 3.78845 12.4464 3.35713C12.4464 2.84502 12.03 2.42856 11.5179 2.42856C11.0058 2.42856 10.5893 2.84502 10.5893 3.35713C10.5893 3.78845 10.8864 4.14897 11.2857 4.25274V5.44641H8.96429V2.42856C8.96429 2.32851 8.90046 2.24006 8.80552 2.20826L6.71623 1.51183C6.65263 1.49094 6.58345 1.4979 6.52587 1.53156L3.74016 3.15656C3.66866 3.19811 3.62501 3.27472 3.62501 3.35713V5.54391L2.11702 6.40563C2.04459 6.44695 2.00002 6.52379 2.00002 6.60713V9.39284C2.00002 9.47618 2.04459 9.55301 2.11702 9.59434L3.62501 10.456V12.6428C3.62501 12.7252 3.66866 12.8018 3.74016 12.8434L6.52587 14.4684C6.56162 14.4893 6.60224 14.5 6.64287 14.5C6.66747 14.5 6.69232 14.496 6.71623 14.4881L8.80552 13.7917C8.90046 13.7599 8.96429 13.6715 8.96429 13.5714V10.7857H10.5893V11.7472C10.19 11.851 9.89286 12.2115 9.89286 12.6428C9.89286 13.1549 10.3093 13.5714 10.8214 13.5714C11.3335 13.5714 11.75 13.1549 11.75 12.6428C11.75 12.2115 11.4529 11.851 11.0536 11.7472V10.5535C11.0536 10.4254 10.9498 10.3214 10.8214 10.3214H8.96429V9.16069H11.8661L12.3624 9.8223C12.2698 9.96669 12.2143 10.1373 12.2143 10.3214C12.2143 10.8335 12.6308 11.25 13.1429 11.25C13.655 11.25 14.0714 10.8335 14.0714 10.3214C14.0714 9.8093 13.655 9.39284 13.1429 9.39284C12.9841 9.39284 12.8369 9.43648 12.7062 9.50705L12.1679 8.78927C12.124 8.73077 12.055 8.69641 11.9821 8.69641H8.96429V7.5357H13.1758C13.2796 7.93498 13.6399 8.23212 14.0714 8.23212C14.5835 8.23212 15 7.81566 15 7.30355C15 6.79145 14.5835 6.37498 14.0714 6.37498Z"/>
-</mask>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M14.0714 7.76784C13.8154 7.76784 13.6071 7.55961 13.6071 7.30355C13.6071 7.0475 13.8154 6.83927 14.0714 6.83927C14.3275 6.83927 14.5357 7.0475 14.5357 7.30355C14.5357 7.55961 14.3275 7.76784 14.0714 7.76784ZM6.66911 14.0143L5.9151 13.5747L7.46234 12.6075L7.21627 12.2138L5.46196 13.3102L4.0893 12.5096V10.4456L5.37885 9.58598L5.12117 9.19969L3.84765 10.0486L2.4643 9.25819V8.13462L3.97231 7.27291L3.74202 6.86991L2.4643 7.6V6.74177L3.85716 5.94598L5.25001 6.74177V7.63645L4.2019 8.26532L4.441 8.66321L5.48215 8.03852L6.52332 8.66321L6.76242 8.26532L5.7143 7.63645V6.73132L7.00385 5.8717C7.06838 5.82852 7.10715 5.75609 7.10715 5.67855V4.05356H6.64287V5.55436L5.47265 6.33436L4.0893 5.54391V3.49038L5.25001 2.81345V4.74998H5.7143V2.54254L6.66911 1.98563L8.50001 2.59594V9.26145L5.13047 11.2832L5.36957 11.6811L8.50001 9.8028V13.404L6.66911 14.0143ZM13.6071 10.3214C13.6071 10.5775 13.3989 10.7857 13.1429 10.7857C12.8868 10.7857 12.6786 10.5775 12.6786 10.3214C12.6786 10.0654 12.8868 9.85712 13.1429 9.85712C13.3989 9.85712 13.6071 10.0654 13.6071 10.3214ZM11.2857 12.6428C11.2857 12.8989 11.0775 13.1071 10.8214 13.1071C10.5654 13.1071 10.3571 12.8989 10.3571 12.6428C10.3571 12.3868 10.5654 12.1785 10.8214 12.1785C11.0775 12.1785 11.2857 12.3868 11.2857 12.6428ZM11.0536 3.35713C11.0536 3.10108 11.2618 2.89284 11.5179 2.89284C11.7739 2.89284 11.9821 3.10108 11.9821 3.35713C11.9821 3.61318 11.7739 3.82141 11.5179 3.82141C11.2618 3.82141 11.0536 3.61318 11.0536 3.35713ZM14.0714 6.37498C13.6399 6.37498 13.2796 6.67212 13.1758 7.07141H8.96429V5.9107H11.5179C11.6462 5.9107 11.75 5.8067 11.75 5.67855V4.25274C12.1493 4.14897 12.4464 3.78845 12.4464 3.35713C12.4464 2.84502 12.03 2.42856 11.5179 2.42856C11.0058 2.42856 10.5893 2.84502 10.5893 3.35713C10.5893 3.78845 10.8864 4.14897 11.2857 4.25274V5.44641H8.96429V2.42856C8.96429 2.32851 8.90046 2.24006 8.80552 2.20826L6.71623 1.51183C6.65263 1.49094 6.58345 1.4979 6.52587 1.53156L3.74016 3.15656C3.66866 3.19811 3.62501 3.27472 3.62501 3.35713V5.54391L2.11702 6.40563C2.04459 6.44695 2.00002 6.52379 2.00002 6.60713V9.39284C2.00002 9.47618 2.04459 9.55301 2.11702 9.59434L3.62501 10.456V12.6428C3.62501 12.7252 3.66866 12.8018 3.74016 12.8434L6.52587 14.4684C6.56162 14.4893 6.60224 14.5 6.64287 14.5C6.66747 14.5 6.69232 14.496 6.71623 14.4881L8.80552 13.7917C8.90046 13.7599 8.96429 13.6715 8.96429 13.5714V10.7857H10.5893V11.7472C10.19 11.851 9.89286 12.2115 9.89286 12.6428C9.89286 13.1549 10.3093 13.5714 10.8214 13.5714C11.3335 13.5714 11.75 13.1549 11.75 12.6428C11.75 12.2115 11.4529 11.851 11.0536 11.7472V10.5535C11.0536 10.4254 10.9498 10.3214 10.8214 10.3214H8.96429V9.16069H11.8661L12.3624 9.8223C12.2698 9.96669 12.2143 10.1373 12.2143 10.3214C12.2143 10.8335 12.6308 11.25 13.1429 11.25C13.655 11.25 14.0714 10.8335 14.0714 10.3214C14.0714 9.8093 13.655 9.39284 13.1429 9.39284C12.9841 9.39284 12.8369 9.43648 12.7062 9.50705L12.1679 8.78927C12.124 8.73077 12.055 8.69641 11.9821 8.69641H8.96429V7.5357H13.1758C13.2796 7.93498 13.6399 8.23212 14.0714 8.23212C14.5835 8.23212 15 7.81566 15 7.30355C15 6.79145 14.5835 6.37498 14.0714 6.37498Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M14.0714 7.76784C13.8154 7.76784 13.6071 7.55961 13.6071 7.30355C13.6071 7.0475 13.8154 6.83927 14.0714 6.83927C14.3275 6.83927 14.5357 7.0475 14.5357 7.30355C14.5357 7.55961 14.3275 7.76784 14.0714 7.76784ZM6.66911 14.0143L5.9151 13.5747L7.46234 12.6075L7.21627 12.2138L5.46196 13.3102L4.0893 12.5096V10.4456L5.37885 9.58598L5.12117 9.19969L3.84765 10.0486L2.4643 9.25819V8.13462L3.97231 7.27291L3.74202 6.86991L2.4643 7.6V6.74177L3.85716 5.94598L5.25001 6.74177V7.63645L4.2019 8.26532L4.441 8.66321L5.48215 8.03852L6.52332 8.66321L6.76242 8.26532L5.7143 7.63645V6.73132L7.00385 5.8717C7.06838 5.82852 7.10715 5.75609 7.10715 5.67855V4.05356H6.64287V5.55436L5.47265 6.33436L4.0893 5.54391V3.49038L5.25001 2.81345V4.74998H5.7143V2.54254L6.66911 1.98563L8.50001 2.59594V9.26145L5.13047 11.2832L5.36957 11.6811L8.50001 9.8028V13.404L6.66911 14.0143ZM13.6071 10.3214C13.6071 10.5775 13.3989 10.7857 13.1429 10.7857C12.8868 10.7857 12.6786 10.5775 12.6786 10.3214C12.6786 10.0654 12.8868 9.85712 13.1429 9.85712C13.3989 9.85712 13.6071 10.0654 13.6071 10.3214ZM11.2857 12.6428C11.2857 12.8989 11.0775 13.1071 10.8214 13.1071C10.5654 13.1071 10.3571 12.8989 10.3571 12.6428C10.3571 12.3868 10.5654 12.1785 10.8214 12.1785C11.0775 12.1785 11.2857 12.3868 11.2857 12.6428ZM11.0536 3.35713C11.0536 3.10108 11.2618 2.89284 11.5179 2.89284C11.7739 2.89284 11.9821 3.10108 11.9821 3.35713C11.9821 3.61318 11.7739 3.82141 11.5179 3.82141C11.2618 3.82141 11.0536 3.61318 11.0536 3.35713ZM14.0714 6.37498C13.6399 6.37498 13.2796 6.67212 13.1758 7.07141H8.96429V5.9107H11.5179C11.6462 5.9107 11.75 5.8067 11.75 5.67855V4.25274C12.1493 4.14897 12.4464 3.78845 12.4464 3.35713C12.4464 2.84502 12.03 2.42856 11.5179 2.42856C11.0058 2.42856 10.5893 2.84502 10.5893 3.35713C10.5893 3.78845 10.8864 4.14897 11.2857 4.25274V5.44641H8.96429V2.42856C8.96429 2.32851 8.90046 2.24006 8.80552 2.20826L6.71623 1.51183C6.65263 1.49094 6.58345 1.4979 6.52587 1.53156L3.74016 3.15656C3.66866 3.19811 3.62501 3.27472 3.62501 3.35713V5.54391L2.11702 6.40563C2.04459 6.44695 2.00002 6.52379 2.00002 6.60713V9.39284C2.00002 9.47618 2.04459 9.55301 2.11702 9.59434L3.62501 10.456V12.6428C3.62501 12.7252 3.66866 12.8018 3.74016 12.8434L6.52587 14.4684C6.56162 14.4893 6.60224 14.5 6.64287 14.5C6.66747 14.5 6.69232 14.496 6.71623 14.4881L8.80552 13.7917C8.90046 13.7599 8.96429 13.6715 8.96429 13.5714V10.7857H10.5893V11.7472C10.19 11.851 9.89286 12.2115 9.89286 12.6428C9.89286 13.1549 10.3093 13.5714 10.8214 13.5714C11.3335 13.5714 11.75 13.1549 11.75 12.6428C11.75 12.2115 11.4529 11.851 11.0536 11.7472V10.5535C11.0536 10.4254 10.9498 10.3214 10.8214 10.3214H8.96429V9.16069H11.8661L12.3624 9.8223C12.2698 9.96669 12.2143 10.1373 12.2143 10.3214C12.2143 10.8335 12.6308 11.25 13.1429 11.25C13.655 11.25 14.0714 10.8335 14.0714 10.3214C14.0714 9.8093 13.655 9.39284 13.1429 9.39284C12.9841 9.39284 12.8369 9.43648 12.7062 9.50705L12.1679 8.78927C12.124 8.73077 12.055 8.69641 11.9821 8.69641H8.96429V7.5357H13.1758C13.2796 7.93498 13.6399 8.23212 14.0714 8.23212C14.5835 8.23212 15 7.81566 15 7.30355C15 6.79145 14.5835 6.37498 14.0714 6.37498Z" stroke="black" stroke-width="0.4" mask="url(#path-1-outside-1_2722_10821)"/>
-</svg>
diff --git a/assets/icons/ai_claude.svg b/assets/icons/ai_claude.svg
deleted file mode 100644
index a3e3e1f4cd..0000000000
--- a/assets/icons/ai_claude.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.35443 9.97775L6.71495 8.65418L6.75443 8.53883L6.71495 8.47508H6.59948L6.20456 8.45081L4.8557 8.41436L3.68608 8.36579L2.55291 8.30507L2.26734 8.24438L2 7.89224L2.02734 7.71617L2.26734 7.55528L2.61063 7.58564L3.37013 7.63724L4.50937 7.71617L5.3357 7.76474L6.56 7.89224H6.75443L6.78176 7.81331L6.71495 7.76474L6.66329 7.71617L5.48456 6.91778L4.20861 6.07388L3.54025 5.58815L3.17873 5.34227L2.99646 5.11157L2.91747 4.60764L3.24557 4.24639L3.68608 4.27675L3.79848 4.30711L4.24506 4.65014L5.19899 5.38781L6.44456 6.30458L6.62684 6.45635L6.69974 6.40475L6.70886 6.36833L6.62684 6.23171L5.94938 5.00834L5.22632 3.76372L4.9043 3.24766L4.81924 2.93802C4.78886 2.81053 4.7676 2.70427 4.7676 2.57374L5.14127 2.06678L5.34785 2L5.84609 2.06678L6.0557 2.24893L6.36557 2.95624L6.86684 4.07033L7.64456 5.58512L7.87241 6.0344L7.99391 6.45029L8.03948 6.57779H8.11847V6.50492L8.18228 5.6519L8.30075 4.6046L8.41619 3.25677L8.4557 2.87731L8.64404 2.42196L9.01772 2.17607L9.30938 2.31571L9.54938 2.65874L9.51596 2.88034L9.37316 3.80622L9.09368 5.25728L8.9114 6.22868H9.01772L9.13925 6.10727L9.6314 5.45459L10.4577 4.42246L10.8223 4.01265L11.2476 3.56033L11.521 3.3448H12.0375L12.4172 3.90944L12.2471 4.49228L11.7154 5.1662L11.275 5.73692L10.643 6.58691L10.2481 7.26689L10.2846 7.32152L10.3787 7.31243L11.8066 7.00886L12.5782 6.86921L13.4987 6.71135L13.915 6.90563L13.9605 7.10297L13.7965 7.50671L12.8122 7.74956L11.6577 7.98026L9.93824 8.38706L9.91697 8.40224L9.94127 8.43257L10.716 8.50544L11.0471 8.52365H11.8582L13.3681 8.63597L13.763 8.89703L14 9.21578L13.9605 9.45863L13.3529 9.76829L12.5327 9.57398L10.6187 9.11864L9.96254 8.95472H9.8714V9.00935L10.4182 9.54365L11.4208 10.4483L12.6754 11.614L12.7393 11.9023L12.5782 12.13L12.4081 12.1057L11.3053 11.277L10.88 10.9036L9.91697 10.0931H9.85316V10.1781L10.075 10.5029L11.2476 12.2636L11.3083 12.804L11.2233 12.98L10.9195 13.0863L10.5853 13.0255L9.89873 12.0632L9.19088 10.9795L8.61974 10.0081L8.54987 10.0476L8.21267 13.6752L8.05469 13.8604L7.69013 14L7.38632 13.7693L7.22531 13.3959L7.38632 12.6582L7.58075 11.6959L7.73873 10.9309L7.88153 9.98078L7.96658 9.66506L7.96052 9.64382L7.89062 9.65291L7.17368 10.6365L6.08303 12.1088L5.22026 13.0316L5.01368 13.1136L4.65519 12.9284L4.68861 12.5975L4.88911 12.303L6.08303 10.7852L6.80303 9.84416L7.26785 9.30077L7.26482 9.22187H7.23746L4.06582 11.2801L3.50076 11.3529L3.25772 11.1252L3.2881 10.7518L3.40354 10.6304L4.35747 9.97469L4.35443 9.97775Z" fill="black"/>
-</svg>
diff --git a/assets/icons/ai_deep_seek.svg b/assets/icons/ai_deep_seek.svg
deleted file mode 100644
index c8e5483fb3..0000000000
--- a/assets/icons/ai_deep_seek.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M15.143 3.82006C15.0024 3.75143 14.9415 3.8826 14.8596 3.94956C14.8314 3.97115 14.8076 3.99937 14.7838 4.02483C14.5779 4.24454 14.3377 4.38844 14.0239 4.37128C13.5651 4.34582 13.1733 4.48972 12.8268 4.84059C12.7532 4.40781 12.5086 4.14991 12.1367 3.98387C11.9419 3.89754 11.7449 3.81176 11.6082 3.62414C11.513 3.49076 11.487 3.34189 11.4394 3.19578C11.4089 3.10723 11.3785 3.01702 11.2772 3.00208C11.1665 2.98492 11.1234 3.07735 11.0802 3.15483C10.907 3.47139 10.84 3.82006 10.8466 4.17315C10.8616 4.96788 11.197 5.60101 11.8639 6.05096C11.9397 6.10243 11.9591 6.15445 11.9353 6.22972C11.8899 6.38468 11.8356 6.53521 11.788 6.69073C11.7576 6.7898 11.7122 6.81083 11.606 6.76821C11.2469 6.61391 10.9208 6.39223 10.6452 6.11516C10.1709 5.65691 9.74254 5.15107 9.20792 4.75481C9.08405 4.66328 8.95686 4.57633 8.82661 4.49414C8.28147 3.9645 8.89855 3.5295 9.04134 3.47803C9.19077 3.4238 9.09281 3.23895 8.61021 3.24116C8.12762 3.24338 7.68598 3.40443 7.12313 3.61971C7.03949 3.65176 6.95344 3.67712 6.86578 3.69553C6.33981 3.59643 5.80188 3.5774 5.27023 3.63908C4.227 3.75531 3.39408 4.24897 2.78142 5.09075C2.04535 6.10243 1.87213 7.25247 2.08409 8.45121C2.30713 9.71526 2.95244 10.7618 3.94364 11.5798C4.97192 12.4282 6.15572 12.8438 7.50666 12.7641C8.32685 12.7171 9.24058 12.607 10.2705 11.7347C10.5306 11.8643 10.8029 11.9157 11.2556 11.9545C11.6043 11.9871 11.9397 11.9379 12.1992 11.8836C12.606 11.7973 12.5778 11.4204 12.4311 11.3518C11.2385 10.7961 11.5003 11.0225 11.2617 10.8393C11.8683 10.122 12.7815 9.37711 13.139 6.96357C13.1667 6.77153 13.1429 6.65088 13.139 6.49592C13.1368 6.40184 13.1584 6.36476 13.2663 6.35424C13.5657 6.32318 13.8562 6.23388 14.1213 6.09136C14.8939 5.66909 15.2061 4.97619 15.2797 4.14492C15.2907 4.01763 15.2775 3.88702 15.143 3.82006ZM8.40932 11.3014C7.25319 10.3927 6.69256 10.0933 6.46122 10.106C6.24427 10.1193 6.28357 10.3667 6.33116 10.5283C6.38097 10.6876 6.44572 10.7972 6.53649 10.9372C6.59958 11.0297 6.64275 11.1675 6.47395 11.271C6.10149 11.5012 5.45452 11.1935 5.42408 11.1785C4.67085 10.7347 4.04049 10.1492 3.59719 9.34833C3.16883 8.57739 2.91978 7.75056 2.87883 6.86783C2.86776 6.6542 2.9303 6.57894 3.14282 6.5402C3.42181 6.48681 3.70767 6.47951 3.98902 6.51861C5.16895 6.69128 6.17288 7.21871 7.01521 8.05384C7.49559 8.5298 7.8592 9.09818 8.23388 9.65383C8.63235 10.2438 9.06071 10.8061 9.6064 11.2665C9.79899 11.4281 9.9523 11.551 10.0995 11.6412C9.65565 11.691 8.91516 11.7021 8.40932 11.3014ZM8.96275 7.73728C8.96266 7.70979 8.96925 7.68268 8.98198 7.65831C8.9947 7.63394 9.01316 7.61303 9.03578 7.5974C9.05839 7.58176 9.08447 7.57186 9.11176 7.56856C9.13905 7.56526 9.16674 7.56865 9.19243 7.57844C9.22517 7.59019 9.25343 7.61186 9.27327 7.64043C9.29311 7.669 9.30355 7.70305 9.30312 7.73783C9.30319 7.76031 9.29879 7.78257 9.29018 7.80333C9.28156 7.82408 9.2689 7.84292 9.25293 7.85873C9.23696 7.87454 9.21801 7.88702 9.19717 7.89544C9.17633 7.90385 9.15402 7.90803 9.13155 7.90774C9.10925 7.90781 9.08715 7.90344 9.06656 7.89487C9.04597 7.88631 9.02729 7.87372 9.01163 7.85784C8.99596 7.84197 8.98362 7.82313 8.97532 7.80243C8.96702 7.78173 8.96238 7.75958 8.96275 7.73728ZM10.6839 8.62056C10.5733 8.66539 10.4631 8.70413 10.3574 8.70911C10.1984 8.71466 10.0423 8.66499 9.91577 8.56854C9.76413 8.44125 9.65565 8.37041 9.61027 8.14903C9.59463 8.04085 9.59762 7.93079 9.61913 7.82361C9.65787 7.64264 9.6147 7.52642 9.48686 7.42127C9.38336 7.33493 9.25109 7.31113 9.10609 7.31113C9.05645 7.30825 9.00823 7.29344 8.96552 7.26796C8.90464 7.23808 8.85483 7.16281 8.90243 7.06983C8.91792 7.03995 8.99098 6.9669 9.00869 6.95361C9.20571 6.84182 9.43317 6.87835 9.64293 6.96247C9.83774 7.04216 9.98495 7.18827 10.1969 7.39526C10.4133 7.64485 10.4526 7.71403 10.576 7.9011C10.6734 8.04776 10.762 8.19829 10.8223 8.37041C10.8594 8.47833 10.8118 8.56633 10.6839 8.62056Z" fill="black"/>
-</svg>
diff --git a/assets/icons/ai_edit.svg b/assets/icons/ai_edit.svg
deleted file mode 100644
index 2f93ab9fd9..0000000000
--- a/assets/icons/ai_edit.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.5871 5.40624C12.8514 5.14195 13 4.78346 13 4.40965C13 4.03583 12.8516 3.67731 12.5873 3.41295C12.323 3.14859 11.9645 3.00005 11.5907 3C11.2169 2.99995 10.8584 3.14841 10.594 3.4127L3.92098 10.0874C3.80488 10.2031 3.71903 10.3456 3.67097 10.5024L3.01047 12.6784C2.99754 12.7217 2.99657 12.7676 3.00764 12.8113C3.01872 12.8551 3.04143 12.895 3.07337 12.9269C3.1053 12.9588 3.14528 12.9815 3.18905 12.9925C3.23282 13.0035 3.27875 13.0024 3.32197 12.9894L5.49849 12.3294C5.65508 12.2818 5.79758 12.1964 5.91349 12.0809L12.5871 5.40624Z" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10 4L12 6" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6.38818 3.53598V2.53598" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.56982 12.6995L9.56982 13.6995" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M2.38818 6.53598H3.38818" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13.5698 9.69949L12.5698 9.69949" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M4.38818 4.53598L3.38818 3.53598" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11.5698 11.6995L12.5698 12.6995" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/ai_gemini.svg b/assets/icons/ai_gemini.svg
deleted file mode 100644
index bdde44ed24..0000000000
--- a/assets/icons/ai_gemini.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.44 12.27C7.81333 13.1217 8 14.0317 8 15C8 14.0317 8.18083 13.1217 8.5425 12.27C8.91583 11.4183 9.4175 10.6775 10.0475 10.0475C10.6775 9.4175 11.4183 8.92167 12.27 8.56C13.1217 8.18667 14.0317 8 15 8C14.0317 8 13.1217 7.81917 12.27 7.4575C11.4411 7.1001 10.6871 6.5895 10.0475 5.9525C9.4105 5.31293 8.8999 4.55891 8.5425 3.73C8.18083 2.87833 8 1.96833 8 1C8 1.96833 7.81333 2.87833 7.44 3.73C7.07833 4.58167 6.5825 5.3225 5.9525 5.9525C5.31293 6.5895 4.55891 7.1001 3.73 7.4575C2.87833 7.81917 1.96833 8 1 8C1.96833 8 2.87833 8.18667 3.73 8.56C4.58167 8.92167 5.3225 9.4175 5.9525 10.0475C6.5825 10.6775 7.07833 11.4183 7.44 12.27Z" fill="black"/>
-</svg>
diff --git a/assets/icons/ai_google.svg b/assets/icons/ai_google.svg
deleted file mode 100644
index de28cf82cb..0000000000
--- a/assets/icons/ai_google.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.8695 8.14262C13.8695 11.6221 11.4867 14.0984 7.96785 14.0984C4.59408 14.0984 1.86949 11.3738 1.86949 7.99999C1.86949 4.62622 4.59408 1.90163 7.96785 1.90163C9.61048 1.90163 10.9924 2.50409 12.0572 3.49754L10.3974 5.09344C8.22605 2.99836 4.18834 4.57213 4.18834 7.99999C4.18834 10.127 5.88752 11.8508 7.96785 11.8508C10.3826 11.8508 11.2875 10.1197 11.4301 9.22213H7.96785V7.12458H13.7736C13.8301 7.43688 13.8695 7.73688 13.8695 8.14262Z" fill="black"/>
-</svg>
diff --git a/assets/icons/ai_lm_studio.svg b/assets/icons/ai_lm_studio.svg
deleted file mode 100644
index 5cfdeb5578..0000000000
--- a/assets/icons/ai_lm_studio.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.146 2H4.85398C3.55391 2 2.5 3.05391 2.5 4.35398V11.646C2.5 12.9461 3.55391 14 4.85398 14H12.146C13.4461 14 14.5 12.9461 14.5 11.646V4.35398C14.5 3.05391 13.4461 2 12.146 2Z" stroke="black" stroke-width="1.11504"/>
-<path opacity="0.487119" d="M10.5177 3.60177H6.21681C5.8698 3.60177 5.58849 3.88308 5.58849 4.23009V4.23894C5.58849 4.58595 5.8698 4.86726 6.21681 4.86726H10.5177C10.8647 4.86726 11.146 4.58595 11.146 4.23894V4.23009C11.146 3.88308 10.8647 3.60177 10.5177 3.60177Z" fill="black"/>
-<path opacity="0.845099" d="M8.83628 3.60177H4.53539C4.18838 3.60177 3.90707 3.88308 3.90707 4.23009V4.23894C3.90707 4.58595 4.18838 4.86726 4.53539 4.86726H8.83628C9.18329 4.86726 9.4646 4.58595 9.4646 4.23894V4.23009C9.4646 3.88308 9.18329 3.60177 8.83628 3.60177Z" fill="black"/>
-<path opacity="0.487119" d="M12.7389 5.10619H8.43806C8.09105 5.10619 7.80974 5.3875 7.80974 5.73451V5.74336C7.80974 6.09037 8.09105 6.37168 8.43806 6.37168H12.7389C13.086 6.37168 13.3673 6.09037 13.3673 5.74336V5.73451C13.3673 5.3875 13.086 5.10619 12.7389 5.10619Z" fill="black"/>
-<path opacity="0.845099" d="M11.0575 5.10619H6.75664C6.40963 5.10619 6.12832 5.3875 6.12832 5.73451V5.74336C6.12832 6.09037 6.40963 6.37168 6.75664 6.37168H11.0575C11.4045 6.37168 11.6858 6.09037 11.6858 5.74336V5.73451C11.6858 5.3875 11.4045 5.10619 11.0575 5.10619Z" fill="black"/>
-<path opacity="0.487119" d="M11.5619 6.59292H7.26106C6.91405 6.59292 6.63274 6.87423 6.63274 7.22124V7.23009C6.63274 7.5771 6.91405 7.85841 7.26106 7.85841H11.5619C11.909 7.85841 12.1903 7.5771 12.1903 7.23009V7.22124C12.1903 6.87423 11.909 6.59292 11.5619 6.59292Z" fill="black"/>
-<path opacity="0.845099" d="M9.86284 6.59292H5.56195C5.21494 6.59292 4.93363 6.87423 4.93363 7.22124V7.23009C4.93363 7.5771 5.21494 7.85841 5.56195 7.85841H9.86284C10.2098 7.85841 10.4912 7.5771 10.4912 7.23009V7.22124C10.4912 6.87423 10.2098 6.59292 9.86284 6.59292Z" fill="black"/>
-<path opacity="0.487119" d="M10.1903 8.10619H5.88937C5.54236 8.10619 5.26105 8.3875 5.26105 8.73451V8.74336C5.26105 9.09037 5.54236 9.37168 5.88937 9.37168H10.1903C10.5373 9.37168 10.8186 9.09037 10.8186 8.74336V8.73451C10.8186 8.3875 10.5373 8.10619 10.1903 8.10619Z" fill="black"/>
-<path opacity="0.845099" d="M8.50886 8.10619H4.20797C3.86096 8.10619 3.57965 8.3875 3.57965 8.73451V8.74336C3.57965 9.09037 3.86096 9.37168 4.20797 9.37168H8.50886C8.85587 9.37168 9.13717 9.09037 9.13717 8.74336V8.73451C9.13717 8.3875 8.85587 8.10619 8.50886 8.10619Z" fill="black"/>
-<path opacity="0.487119" d="M10.9513 9.59292H7.37611C7.0291 9.59292 6.74779 9.87423 6.74779 10.2212V10.2301C6.74779 10.5771 7.0291 10.8584 7.37611 10.8584H10.9513C11.2983 10.8584 11.5796 10.5771 11.5796 10.2301V10.2212C11.5796 9.87423 11.2983 9.59292 10.9513 9.59292Z" fill="black"/>
-<path opacity="0.845099" d="M9.23452 9.59292H5.65929C5.31228 9.59292 5.03098 9.87423 5.03098 10.2212V10.2301C5.03098 10.5771 5.31228 10.8584 5.65929 10.8584H9.23452C9.58153 10.8584 9.86283 10.5771 9.86283 10.2301V10.2212C9.86283 9.87423 9.58153 9.59292 9.23452 9.59292Z" fill="black"/>
-<path opacity="0.487119" d="M12.6062 11.0973H9.82744C9.48043 11.0973 9.19912 11.3787 9.19912 11.7257V11.7345C9.19912 12.0815 9.48043 12.3628 9.82744 12.3628H12.6062C12.9532 12.3628 13.2345 12.0815 13.2345 11.7345V11.7257C13.2345 11.3787 12.9532 11.0973 12.6062 11.0973Z" fill="black"/>
-<path opacity="0.845099" d="M10.7389 11.0973H7.96017C7.61316 11.0973 7.33186 11.3787 7.33186 11.7257V11.7345C7.33186 12.0815 7.61316 12.3628 7.96017 12.3628H10.7389C11.0859 12.3628 11.3673 12.0815 11.3673 11.7345V11.7257C11.3673 11.3787 11.0859 11.0973 10.7389 11.0973Z" fill="black"/>
-</svg>
diff --git a/assets/icons/ai_mistral.svg b/assets/icons/ai_mistral.svg
deleted file mode 100644
index f11c177e2f..0000000000
--- a/assets/icons/ai_mistral.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M10.4 4.4V6.8H9.2V4.4H10.4ZM12.8 2V4.4H11.6V2H12.8ZM2 2H3.2V14H2V2ZM6.8 9.2H8V11.6H6.8V9.2ZM11.6 9.2H12.8V14H11.6V9.2Z" fill="black"/>
-<path opacity="0.4" fill-rule="evenodd" clip-rule="evenodd" d="M12.8 2H15.2V4.4H12.8V2ZM3.2 2H5.6V4.4H3.2V2Z" fill="black"/>
-<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M10.4 6.8V4.4H15.2V6.8H10.4ZM3.2 6.8V4.4H8V6.8H3.2Z" fill="black"/>
-<path opacity="0.6" fill-rule="evenodd" clip-rule="evenodd" d="M3.2 9.2V6.8H15.2V9.2H3.2Z" fill="black"/>
-<path opacity="0.7" fill-rule="evenodd" clip-rule="evenodd" d="M8 9.2H10.4V11.6H8V9.2ZM12.8 9.2H15.2V11.6H12.8V9.2ZM3.2 9.2H5.6V11.6H3.2V9.2Z" fill="black"/>
-<path opacity="0.8" fill-rule="evenodd" clip-rule="evenodd" d="M12.8 11.6H15.2V14H12.8V11.6ZM3.2 11.6H5.6V14H3.2V11.6Z" fill="black"/>
-</svg>
diff --git a/assets/icons/ai_ollama.svg b/assets/icons/ai_ollama.svg
deleted file mode 100644
index 36a88c1ad6..0000000000
--- a/assets/icons/ai_ollama.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.51933 0.963322C5.38908 0.984547 5.23278 1.05328 5.12258 1.13818C4.78894 1.3939 4.53045 1.93667 4.42125 2.61287C4.38017 2.86859 4.35212 3.22336 4.35212 3.49425C4.35212 3.81365 4.38919 4.22198 4.44229 4.50398C4.45431 4.56666 4.46032 4.62225 4.45531 4.6263C4.4513 4.63033 4.40221 4.67076 4.3471 4.71523C4.15875 4.86684 3.94334 5.10033 3.79505 5.31361C3.51052 5.72094 3.32617 6.18387 3.24902 6.68519C3.21896 6.8833 3.21095 7.28355 3.23499 7.48166C3.28809 7.93852 3.42435 8.32463 3.65779 8.6784L3.73394 8.79261L3.7119 8.83001C3.5556 9.09483 3.42234 9.4779 3.36023 9.84581C3.31114 10.1369 3.30513 10.2147 3.30513 10.6049C3.30513 10.9981 3.31013 11.0759 3.35622 11.3478C3.41133 11.6733 3.52354 12.018 3.64878 12.2474C3.68986 12.3221 3.79005 12.4778 3.80207 12.4859C3.80608 12.4879 3.79406 12.5253 3.77502 12.5688C3.63074 12.8871 3.50751 13.3107 3.45641 13.6675C3.42034 13.9121 3.41534 13.9909 3.41534 14.2487C3.41534 14.5771 3.43337 14.7368 3.5015 14.9986L3.51152 15.037H3.94034H4.37015L4.3421 14.9834C4.16877 14.66 4.15274 14.0596 4.30202 13.4602C4.37015 13.1833 4.4473 12.9802 4.59157 12.7001L4.67774 12.5304V12.4263C4.67774 12.3292 4.67574 12.3181 4.64468 12.2544C4.62063 12.2059 4.58857 12.1645 4.53146 12.1079C4.43428 12.0129 4.36414 11.9128 4.30803 11.7895C4.06157 11.2497 4.01348 10.4482 4.1868 9.76495C4.25894 9.47992 4.37817 9.22623 4.5034 9.08775C4.58857 8.99273 4.63265 8.88662 4.63265 8.77644C4.63265 8.66222 4.59258 8.56823 4.5024 8.47019C4.24391 8.19122 4.0846 7.8516 4.0275 7.4564C3.94635 6.89341 4.09362 6.27987 4.42826 5.79372C4.75588 5.31662 5.21575 5.01037 5.72975 4.9285C5.84495 4.9093 6.06037 4.91233 6.18059 4.93458C6.31185 4.95782 6.394 4.95073 6.47817 4.9103C6.58236 4.86079 6.63446 4.79913 6.69558 4.65762C6.74968 4.53129 6.79176 4.46254 6.90497 4.32003C7.04124 4.14922 7.17248 4.03298 7.38288 3.89248C7.62335 3.73379 7.89686 3.61857 8.16938 3.56297C8.26856 3.54276 8.31465 3.53973 8.50001 3.53973C8.68537 3.53973 8.73146 3.54276 8.83063 3.56297C9.23039 3.64486 9.62715 3.85307 9.94376 4.1482C10.0119 4.21187 10.1752 4.41605 10.2273 4.50096C10.2473 4.5343 10.2824 4.60507 10.3044 4.65762C10.3655 4.79913 10.4176 4.86079 10.5218 4.9103C10.603 4.94973 10.6881 4.95782 10.8144 4.93659C11.0138 4.90223 11.1671 4.90526 11.3625 4.94569C12.0277 5.08112 12.6069 5.63401 12.8633 6.3749C13.0867 7.0248 13.0236 7.70504 12.691 8.22456C12.6349 8.31251 12.5788 8.38326 12.4976 8.47019C12.3223 8.65919 12.3223 8.89369 12.4966 9.08775C12.7832 9.40412 12.9625 10.1824 12.9083 10.8687C12.8723 11.3215 12.7571 11.7269 12.5988 11.9563C12.5708 11.9967 12.5127 12.0655 12.4686 12.1079C12.4114 12.1645 12.3794 12.2059 12.3553 12.2544C12.3243 12.3181 12.3223 12.3292 12.3223 12.4263V12.5304L12.4085 12.7001C12.5527 12.9802 12.6298 13.1833 12.698 13.4602C12.8453 14.0515 12.8322 14.6399 12.6639 14.9744C12.6499 15.0027 12.6378 15.029 12.6378 15.032C12.6378 15.0351 12.8293 15.037 13.0636 15.037H13.4885L13.4995 14.9936C13.5056 14.9704 13.5155 14.935 13.5205 14.9147C13.5316 14.8703 13.5536 14.7389 13.5716 14.6125C13.5886 14.4851 13.5886 14.0162 13.5716 13.8747C13.5075 13.3612 13.4003 12.9539 13.225 12.5688C13.2059 12.5253 13.1939 12.4879 13.1979 12.4859C13.2029 12.4829 13.231 12.4425 13.261 12.3969C13.4795 12.0634 13.6138 11.644 13.6819 11.09C13.6999 10.9374 13.6999 10.2815 13.6819 10.1349C13.6338 9.75687 13.5756 9.50013 13.4795 9.24037C13.4394 9.13223 13.3332 8.9038 13.2881 8.83001L13.266 8.79261L13.3422 8.6784C13.5756 8.32463 13.7119 7.93852 13.765 7.48166C13.7891 7.28355 13.7811 6.8833 13.751 6.68519C13.6729 6.18284 13.4895 5.72194 13.205 5.31361C13.0567 5.10033 12.8413 4.86684 12.6529 4.71523C12.5978 4.67076 12.5487 4.63033 12.5447 4.6263C12.5397 4.62225 12.5457 4.56666 12.5577 4.50398C12.679 3.86619 12.675 3.07074 12.5477 2.44913C12.4375 1.90737 12.2372 1.47679 11.9787 1.22814C11.7723 1.03003 11.5618 0.945128 11.3093 0.9613C10.7303 0.995666 10.2634 1.66781 10.079 2.72708C10.049 2.8979 10.0229 3.09803 10.0229 3.15261C10.0229 3.17384 10.0189 3.19101 10.0139 3.19101C10.0089 3.19101 9.96981 3.1708 9.92772 3.14554C9.48088 2.87869 8.98392 2.73619 8.50001 2.73619C8.01609 2.73619 7.51914 2.87869 7.07229 3.14554C7.0302 3.1708 6.99114 3.19101 6.98612 3.19101C6.98113 3.19101 6.9771 3.17384 6.9771 3.15261C6.9771 3.096 6.95006 2.88982 6.92101 2.72708C6.75368 1.77596 6.36995 1.14627 5.85999 0.987579C5.78986 0.966354 5.59047 0.952204 5.51933 0.963322ZM5.68967 1.78607C5.83394 1.9013 5.99424 2.23081 6.08641 2.59973C6.10345 2.66644 6.12148 2.74326 6.12649 2.77155C6.1305 2.79886 6.14151 2.8605 6.15054 2.908C6.18962 3.12229 6.20764 3.35375 6.20965 3.63575L6.21065 3.91371L6.14151 4.0168L6.07239 4.12091H5.91108C5.72273 4.12091 5.53536 4.14517 5.35602 4.19369C5.2919 4.20986 5.22978 4.22604 5.21776 4.22907C5.19873 4.23311 5.19572 4.22704 5.1847 4.14416C5.12559 3.69437 5.12859 3.19607 5.19372 2.78166C5.26585 2.31975 5.43418 1.9013 5.59849 1.77799C5.63756 1.74867 5.64458 1.74969 5.68967 1.78607ZM11.4025 1.779C11.5017 1.85278 11.6109 2.04887 11.6921 2.29953C11.8554 2.80087 11.9015 3.48919 11.8154 4.14416C11.8043 4.22704 11.8013 4.23311 11.7822 4.22907C11.7702 4.22604 11.7081 4.20986 11.644 4.19369C11.4646 4.14517 11.2772 4.12091 11.0889 4.12091H10.9276L10.8585 4.0168L10.7894 3.91371L10.7904 3.63575C10.7923 3.24357 10.8284 2.93732 10.9146 2.5967C11.0058 2.23081 11.1671 1.9013 11.3104 1.78607C11.3554 1.74969 11.3625 1.74867 11.4025 1.779Z" fill="black"/>
-<path d="M8.37317 6.82775C8.19555 6.84978 8.14728 6.85816 8.06215 6.88019C7.92382 6.91688 7.73884 6.99866 7.61035 7.07938C7.16347 7.35931 6.85573 7.82587 6.76159 8.36582C6.74277 8.47276 6.74031 8.5084 6.74031 8.68874C6.74031 8.86697 6.74277 8.90576 6.76078 9.00745C6.88601 9.71306 7.39345 10.2342 8.04987 10.3296C8.19229 10.3494 8.80778 10.3494 8.95019 10.3296C9.47729 10.253 9.93072 9.8871 10.1345 9.37336C10.1885 9.23603 10.2147 9.1469 10.2393 9.00745C10.2573 8.90576 10.2597 8.86697 10.2597 8.68874C10.2597 8.5084 10.2573 8.47276 10.2384 8.36582C10.1018 7.58159 9.50757 6.96406 8.77913 6.84663C8.68418 6.83196 8.43538 6.81937 8.37317 6.82775ZM8.67927 7.39811C8.92237 7.43166 9.16709 7.54279 9.36352 7.71054C9.4691 7.80071 9.61807 7.98943 9.6819 8.11315C9.76048 8.2662 9.80549 8.42243 9.82595 8.6122C9.83495 8.69922 9.83006 8.76527 9.80549 8.90576C9.76702 9.11545 9.64752 9.33457 9.48629 9.48764C9.41098 9.55788 9.25466 9.6596 9.15891 9.69943C8.9772 9.77386 8.85852 9.78749 8.43455 9.7833C8.15792 9.78016 8.1088 9.777 8.02941 9.75814C7.7585 9.69314 7.54406 9.55474 7.38855 9.34401C7.2625 9.17415 7.20521 9.019 7.17411 8.76842C7.1602 8.65204 7.18638 8.45913 7.23959 8.29661C7.30425 8.09846 7.47121 7.85209 7.63654 7.71054C7.82806 7.54699 8.08015 7.43062 8.31178 7.39917C8.40099 7.38658 8.59006 7.38658 8.67927 7.39811Z" fill="black"/>
-<path d="M8.05397 8.02145C7.96179 8.0691 7.8975 8.19001 7.91692 8.27951C7.93874 8.37601 8.02729 8.47367 8.16555 8.55388C8.23955 8.5969 8.2444 8.6027 8.24805 8.64571C8.25046 8.67129 8.24076 8.74454 8.22742 8.80964C8.21287 8.87357 8.20194 8.94101 8.20194 8.95961C8.20317 9.0096 8.25168 9.09097 8.30261 9.13049C8.3475 9.16537 8.356 9.16652 8.48213 9.17001C8.59736 9.1735 8.62162 9.17116 8.66771 9.15025C8.78658 9.09444 8.81689 8.99215 8.77323 8.79568C8.73684 8.63177 8.74412 8.60619 8.8351 8.5562C8.9309 8.50272 9.0328 8.40857 9.06311 8.34462C9.12135 8.22257 9.06796 8.08422 8.93939 8.02028C8.90787 8.00516 8.86905 7.9982 8.81205 7.9982C8.7235 7.9982 8.6665 8.01796 8.56219 8.08189L8.50275 8.11794L8.46515 8.09585C8.31112 8.00865 8.28323 7.9982 8.18981 7.99935C8.12311 7.99935 8.08672 8.00516 8.05397 8.02145Z" fill="black"/>
-<path d="M6.02787 6.84439C5.83235 6.90397 5.68655 7.04226 5.61144 7.23906C5.57499 7.33268 5.55732 7.48054 5.57278 7.56032C5.60923 7.75073 5.77159 7.92412 5.95608 7.972C6.18803 8.0305 6.36144 7.9922 6.51498 7.84541C6.60445 7.76137 6.65307 7.68797 6.70166 7.56882C6.73699 7.4848 6.73921 7.46991 6.73921 7.35076L6.74031 7.2231L6.69393 7.13163C6.61991 6.98695 6.48626 6.8795 6.33163 6.84015C6.24436 6.81886 6.10408 6.81994 6.02787 6.84439Z" fill="black"/>
-<path d="M10.6638 6.84103C10.5126 6.88038 10.3778 6.9889 10.3061 7.13148L10.2597 7.22298L10.2608 7.35065C10.2608 7.46982 10.263 7.48471 10.2984 7.56875C10.347 7.68791 10.3955 7.76133 10.4849 7.84538C10.6384 7.99219 10.8117 8.0305 11.0436 7.972C11.1771 7.93794 11.3107 7.82941 11.3748 7.7028C11.43 7.59535 11.4432 7.51768 11.4255 7.39532C11.3847 7.11551 11.2146 6.9123 10.9619 6.84103C10.8878 6.81974 10.7444 6.81974 10.6638 6.84103Z" fill="black"/>
-</svg>
diff --git a/assets/icons/ai_open_ai.svg b/assets/icons/ai_open_ai.svg
deleted file mode 100644
index e45ac315a0..0000000000
--- a/assets/icons/ai_open_ai.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M14.5768 6.73011C14.8987 5.77678 14.7879 4.73245 14.2731 3.86531C13.4989 2.53528 11.9427 1.85102 10.4227 2.17303C9.74656 1.42139 8.7751 0.993944 7.75664 1.00006C6.20301 0.996569 4.82452 1.98358 4.34655 3.44224C3.34849 3.64393 2.48699 4.26038 1.98286 5.13408C1.20294 6.46061 1.38074 8.13277 2.4227 9.27029C2.1008 10.2236 2.21164 11.268 2.72642 12.1351C3.50057 13.4651 5.05686 14.1494 6.57679 13.8274C7.25251 14.579 8.22441 15.0064 9.24287 14.9999C10.7974 15.0038 12.1763 14.0159 12.6543 12.556C13.6524 12.3543 14.5139 11.7379 15.018 10.8641C15.797 9.5376 15.6188 7.86676 14.5773 6.72924L14.5768 6.73011ZM9.24376 14.0851C8.62169 14.0859 8.01912 13.8711 7.5416 13.4778C7.56332 13.4664 7.60101 13.4459 7.6254 13.431L10.4507 11.821C10.5952 11.7401 10.6839 11.5882 10.683 11.4242V7.49401L11.877 8.17433C11.8899 8.18045 11.8983 8.1927 11.9001 8.2067V11.4614C11.8983 12.9086 10.7105 14.082 9.24376 14.0851ZM3.53116 11.6775C3.21946 11.1464 3.10729 10.5237 3.21414 9.91955C3.23498 9.9318 3.27178 9.95411 3.29794 9.96898L6.1232 11.5791C6.26642 11.6617 6.44377 11.6617 6.58743 11.5791L10.0365 9.61373V10.9744C10.0374 10.9884 10.0308 11.002 10.0197 11.0107L7.16383 12.6378C5.89175 13.3606 4.26674 12.9309 3.53116 11.6775ZM2.7876 5.59215C3.09797 5.06014 3.58792 4.65326 4.17141 4.44195C4.17141 4.46601 4.17008 4.50845 4.17008 4.5382V7.75869C4.1692 7.92232 4.25787 8.07414 4.40198 8.15508L7.85108 10.1199L6.65704 10.8002C6.64507 10.8081 6.62999 10.8094 6.61669 10.8037L3.76039 9.17535C2.49098 8.44995 2.05601 6.84692 2.7876 5.59215ZM12.598 7.84488L9.14887 5.8796L10.3429 5.19971C10.3549 5.19183 10.37 5.19052 10.3833 5.19621L13.2396 6.8233C14.5112 7.54826 14.947 9.15347 14.2124 10.4082C13.9015 10.9394 13.412 11.3463 12.829 11.5581V8.24127C12.8303 8.07764 12.7417 7.92626 12.598 7.84488ZM13.7863 6.07998C13.7654 6.06729 13.7286 6.04541 13.7025 6.03054L10.8772 4.42051C10.734 4.33782 10.5566 4.33782 10.413 4.42051L6.96386 6.3858V5.02514C6.96298 5.01114 6.96963 4.99758 6.98071 4.98883L9.83657 3.36305C11.1086 2.63898 12.735 3.06992 13.4683 4.32557C13.7783 4.85583 13.8914 5.47665 13.7863 6.07998ZM6.31475 8.50509L5.12026 7.82476C5.1074 7.81863 5.09898 7.80638 5.09721 7.79238V4.53776C5.09809 3.08873 6.28947 1.91446 7.75797 1.91533C8.37916 1.91533 8.98039 2.13059 9.45792 2.52259C9.43619 2.53397 9.39894 2.55453 9.37412 2.56941L6.54885 4.17944C6.40431 4.26038 6.31563 4.41176 6.31652 4.57582L6.31475 8.50509ZM6.96342 7.12518L8.49976 6.24973L10.0361 7.12475V8.87521L8.49976 9.75023L6.96342 8.87521V7.12518Z" fill="black"/>
-</svg>
diff --git a/assets/icons/ai_open_ai_compat.svg b/assets/icons/ai_open_ai_compat.svg
deleted file mode 100644
index f6557caac3..0000000000
--- a/assets/icons/ai_open_ai_compat.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.25669 0.999943C8.27509 0.993825 9.24655 1.42125 9.9227 2.17279C11.4427 1.85079 12.9991 2.53518 13.7733 3.86518C14.159 4.5149 14.3171 5.26409 14.2372 5.99994H13.2967C13.3789 5.42185 13.265 4.8321 12.9686 4.32514C12.2353 3.06961 10.6088 2.63919 9.33676 3.36322L6.48032 4.98822C6.46926 4.99697 6.46284 5.01135 6.46372 5.02533V6.38568L9.91294 4.42084C10.0565 4.33818 10.2336 4.33823 10.3768 4.42084L13.1502 5.99994H11.2948L9.88364 5.19623C9.87034 5.19054 9.85459 5.19128 9.84262 5.19916L8.64926 5.87983L8.8602 5.99994H7.99985C6.89539 6.00004 5.99988 6.89547 5.99985 7.99994V9.34955L3.90219 8.15522C3.75815 8.07431 3.66897 7.92228 3.66977 7.75873V4.53803C3.66977 4.50828 3.67172 4.4654 3.67172 4.44135C3.08836 4.65262 2.59832 5.0599 2.28794 5.59174C1.55635 6.84647 1.99122 8.44936 3.26059 9.17475L5.99985 10.7363V11.6162C5.87564 11.6568 5.73827 11.6456 5.6229 11.579L2.7977 9.96869C2.77156 9.95382 2.73449 9.9311 2.71372 9.91889C2.60687 10.5231 2.7194 11.1466 3.0311 11.6777C3.6435 12.7209 4.87159 13.1902 5.99985 12.9023V13.8398C4.50443 14.1233 2.98758 13.4424 2.22641 12.1347C1.71174 11.2677 1.60096 10.2237 1.9227 9.27045C0.880739 8.13295 0.703328 6.46023 1.48325 5.13373C1.98739 4.26024 2.84863 3.64401 3.84653 3.44233C4.3245 1.9837 5.70306 0.996447 7.25669 0.999943ZM7.25766 1.91498C5.78932 1.9143 4.59839 3.08914 4.59751 4.53803V7.79193C4.59926 7.80578 4.60735 7.81796 4.61997 7.82416L5.8143 8.50483L5.81626 4.57611C5.81537 4.41216 5.90431 4.2606 6.04868 4.17963L8.87387 2.56928C8.89868 2.55441 8.93612 2.53379 8.95786 2.5224C8.48035 2.13046 7.8788 1.91498 7.25766 1.91498Z" fill="black"/>
-<path d="M13.5 6C14.6046 6 15.5 6.89543 15.5 8V13.5C15.5 14.6046 14.6046 15.5 13.5 15.5H8C6.89543 15.5 6 14.6046 6 13.5V8C6 6.89543 6.89543 6 8 6H13.5ZM10.8916 8.02539C10.0563 8.02539 9.33453 8.27982 8.81934 8.76562C8.30213 9.25335 8.02547 9.94371 8.02539 10.748C8.02539 11.557 8.29852 12.2492 8.81543 12.7373C9.33013 13.2232 10.0521 13.4746 10.8916 13.4746C11.9865 13.4745 12.8545 13.1022 13.3076 12.3525C13.3894 12.2176 13.4521 12.0693 13.4521 11.8857C13.4521 11.4795 13.0933 11.2773 12.7842 11.2773C12.6604 11.2774 12.5292 11.3025 12.4072 11.3779C12.2862 11.4529 12.2058 11.5586 12.1494 11.666L12.1475 11.6689C11.9677 12.0213 11.5535 12.246 10.8955 12.2461C10.4219 12.2461 10.0667 12.0932 9.83008 11.8506C9.59255 11.607 9.44141 11.2389 9.44141 10.748C9.44148 10.264 9.59319 9.89628 9.83203 9.65137C10.0702 9.40725 10.4255 9.25391 10.8916 9.25391C11.4912 9.25399 11.9415 9.50614 12.1289 9.8916V9.89062C12.1888 10.0157 12.276 10.1311 12.4023 10.2129C12.5303 10.2956 12.6724 10.3271 12.8115 10.3271C12.9661 10.3271 13.1303 10.2857 13.2627 10.1758C13.4018 10.0603 13.4746 9.89383 13.4746 9.71582C13.4746 9.61857 13.4542 9.52036 13.4199 9.42773L13.3818 9.33691C12.9749 8.49175 11.9927 8.02548 10.8916 8.02539ZM10.3203 8.97852L10.1494 9.03516C10.2095 9.01178 10.2716 8.99089 10.3359 8.97363C10.3307 8.97505 10.3256 8.97706 10.3203 8.97852ZM10.4814 8.94141C10.4969 8.9385 10.5126 8.93616 10.5283 8.93359C10.5126 8.93617 10.4969 8.9385 10.4814 8.94141ZM10.6709 8.91504C10.6819 8.91399 10.693 8.913 10.7041 8.91211C10.693 8.913 10.6819 8.91399 10.6709 8.91504Z" fill="black" fill-opacity="0.95"/>
-</svg>
diff --git a/assets/icons/ai_open_router.svg b/assets/icons/ai_open_router.svg
deleted file mode 100644
index b6f5164e0b..0000000000
--- a/assets/icons/ai_open_router.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2.54131 7.78012C2.89456 7.78012 4.25937 7.47507 4.96588 7.07512C5.67239 6.67517 5.67239 6.67517 7.13135 5.63951C8.97897 4.32817 10.2858 4.76729 12.4272 4.76729" fill="black"/>
-<path d="M2.54131 7.78012C2.89456 7.78012 4.25937 7.47507 4.96588 7.07512C5.67239 6.67517 5.67239 6.67517 7.13135 5.63951C8.97897 4.32817 10.2858 4.76729 12.4272 4.76729" stroke="black" stroke-width="2.8125"/>
-<path d="M14.4985 4.7801L10.8793 6.86949V2.6907L14.4985 4.7801Z" fill="black" stroke="black"/>
-<path d="M2.47052 7.78088C2.82377 7.78088 4.18859 8.08593 4.8951 8.48588C5.60161 8.88583 5.6016 8.88583 7.06057 9.92149C8.90819 11.2328 10.2142 10.7937 12.3564 10.7937" fill="black"/>
-<path d="M2.47052 7.78088C2.82377 7.78088 4.18859 8.08593 4.8951 8.48588C5.60161 8.88583 5.6016 8.88583 7.06057 9.92149C8.90819 11.2328 10.2142 10.7937 12.3564 10.7937" stroke="black" stroke-width="2.8125"/>
-<path d="M14.4277 10.7809L10.8085 8.6915V12.8703L14.4277 10.7809Z" fill="black" stroke="black"/>
-</svg>
diff --git a/assets/icons/ai_v_zero.svg b/assets/icons/ai_v_zero.svg
deleted file mode 100644
index 26d09ea26a..0000000000
--- a/assets/icons/ai_v_zero.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_2639_570)">
-<g clip-path="url(#clip1_2639_570)">
-<path d="M9.85676 4H13.6675C15.2128 4 16.4654 5.25266 16.4654 6.7979V10.4322H14.9002V6.7979C14.9002 6.76067 14.8988 6.7237 14.8959 6.68706L11.0851 10.4316C11.098 10.432 11.1109 10.4322 11.1238 10.4322H14.9002V11.9105H11.1238C9.57856 11.9105 8.29152 10.6456 8.29152 9.10032V5.47569H9.85676V9.10032C9.85676 9.17012 9.86216 9.23908 9.87264 9.30672L13.7673 5.4798C13.7344 5.47708 13.7012 5.47569 13.6675 5.47569H9.85676V4Z" fill="black"/>
-<path d="M6.00752 11.6382L0.5 5.47504H2.71573L5.94924 9.09348V5.47504H7.6014V11.0298C7.6014 11.8682 6.56616 12.2634 6.00752 11.6382Z" fill="black"/>
-</g>
-</g>
-<defs>
-<clipPath id="clip0_2639_570">
-<rect width="16" height="16" fill="white" transform="translate(0.5)"/>
-</clipPath>
-<clipPath id="clip1_2639_570">
-<rect width="16" height="8" fill="white" transform="translate(0.5 4)"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/assets/icons/ai_x_ai.svg b/assets/icons/ai_x_ai.svg
deleted file mode 100644
index d3400fbe9c..0000000000
--- a/assets/icons/ai_x_ai.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.8451 5.50949L13.1109 15H15.2342L15.5 2.05527L12.8451 5.50949ZM15.499 1H12.2574L7.17206 7.61904L8.79335 9.72761L15.499 1ZM1.5 14.999H4.73963L6.36092 12.8905L4.73963 10.7809L1.5 14.999ZM1.5 5.50851L8.79335 14.999H12.034L4.74061 5.50949L1.5 5.50851Z" fill="black"/>
-</svg>
diff --git a/assets/icons/ai_zed.svg b/assets/icons/ai_zed.svg
deleted file mode 100644
index 6d78efacd5..0000000000
--- a/assets/icons/ai_zed.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M3.625 2.75C3.4179 2.75 3.25 2.9179 3.25 3.125V11.375H2.5V3.125C2.5 2.50368 3.00368 2 3.625 2H13.6723C14.1735 2 14.4244 2.6059 14.0701 2.96025L7.88189 9.14843H9.625V8.375H10.375V9.33593C10.375 9.6466 10.1232 9.8984 9.8125 9.8984H7.13189L5.84282 11.1875H11.6875V6.5H12.4375V11.1875C12.4375 11.6017 12.1017 11.9375 11.6875 11.9375H5.09282L3.78032 13.25H13.375C13.5821 13.25 13.75 13.0821 13.75 12.875V4.625H14.5V12.875C14.5 13.4963 13.9963 14 13.375 14H3.32767C2.82653 14 2.57557 13.3941 2.92992 13.0397L9.09468 6.875H7.375V7.625H6.625V6.6875C6.625 6.37684 6.87684 6.125 7.1875 6.125H9.84468L11.1571 4.8125H5.3125V9.5H4.5625V4.8125C4.5625 4.39829 4.89829 4.0625 5.3125 4.0625H11.9071L13.2197 2.75H3.625Z" fill="black"/>
-</svg>
diff --git a/assets/icons/arrow_circle.svg b/assets/icons/arrow_circle.svg
deleted file mode 100644
index cdfa939795..0000000000
--- a/assets/icons/arrow_circle.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.8989 5.77778L11.6434 4.52222C10.6384 3.55068 9.29673 3.00526 7.89893 3C6.57285 3 5.30103 3.52678 4.36343 4.46447C3.78887 5.03901 3.36856 5.73897 3.12921 6.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.8989 3V5.77778H10.1211" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3.1012 10.2222L4.3568 11.4778C5.3618 12.4493 6.70342 12.9947 8.10122 13C9.42731 13 10.6991 12.4732 11.6368 11.5355C12.2163 10.956 12.6389 10.2487 12.8772 9.47994" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5.87891 10.2222H3.10111V13" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/arrow_down.svg b/assets/icons/arrow_down.svg
deleted file mode 100644
index 60e6584c45..0000000000
--- a/assets/icons/arrow_down.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 13L12.5 8.5M8 13L3.5 8.5M8 13V3" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/arrow_down10.svg b/assets/icons/arrow_down10.svg
deleted file mode 100644
index 5933b758d9..0000000000
--- a/assets/icons/arrow_down10.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="m2.5 10.667 2.667 2.666 2.666-2.666M5.167 13.333V2.667M11.833 6.667v-4H10.5M10.5 6.667h2.667M13.167 10.667a1.333 1.333 0 0 0-2.667 0V12a1.333 1.333 0 0 0 2.667 0v-1.333Z"/></svg>
diff --git a/assets/icons/arrow_down_right.svg b/assets/icons/arrow_down_right.svg
deleted file mode 100644
index ebdb06d77b..0000000000
--- a/assets/icons/arrow_down_right.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.25 4.25L11.125 11.125" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11.75 4.25006V11.7501H4.25" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/arrow_left.svg b/assets/icons/arrow_left.svg
deleted file mode 100644
index f7eacb2a77..0000000000
--- a/assets/icons/arrow_left.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.5 7.50001L8 3M3.5 7.50001L8 12M3.5 7.50001H12.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/arrow_right.svg b/assets/icons/arrow_right.svg
deleted file mode 100644
index b9324af5a2..0000000000
--- a/assets/icons/arrow_right.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.5 8L8 12.5M12.5 8L8 3.5M12.5 8H3.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/arrow_right_left.svg b/assets/icons/arrow_right_left.svg
deleted file mode 100644
index 2c1211056a..0000000000
--- a/assets/icons/arrow_right_left.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11 2L13 4.5L11 7" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.5 4.5H2.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5 14L3 11.5L5 9" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3 11.5H13" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/arrow_up.svg b/assets/icons/arrow_up.svg
deleted file mode 100644
index ff3ad44123..0000000000
--- a/assets/icons/arrow_up.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 3L12.5 7.5M8 3L3.5 7.5M8 3V13" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/arrow_up_right.svg b/assets/icons/arrow_up_right.svg
deleted file mode 100644
index a948ef8f81..0000000000
--- a/assets/icons/arrow_up_right.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.5 11.5L11.5 4.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M4.5 4.5L11.5 4.5L11.5 11.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/at_sign.svg b/assets/icons/at_sign.svg
deleted file mode 100644
index 531c10c8dc..0000000000
--- a/assets/icons/at_sign.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.00156 10.3996C9.32705 10.3996 10.4016 9.32509 10.4016 7.99961C10.4016 6.67413 9.32705 5.59961 8.00156 5.59961C6.67608 5.59961 5.60156 6.67413 5.60156 7.99961C5.60156 9.32509 6.67608 10.3996 8.00156 10.3996Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10.4 5.6V8.6C10.4 9.07739 10.5896 9.53523 10.9272 9.8728C11.2648 10.2104 11.7226 10.4 12.2 10.4C12.6774 10.4 13.1352 10.2104 13.4728 9.8728C13.8104 9.53523 14 9.07739 14 8.6V8C14 6.64839 13.5436 5.33636 12.7048 4.27651C11.8661 3.21665 10.694 2.47105 9.37852 2.16051C8.06306 1.84997 6.68129 1.99269 5.45707 2.56554C4.23285 3.13838 3.23791 4.1078 2.63344 5.31672C2.02898 6.52565 1.85041 7.90325 2.12667 9.22633C2.40292 10.5494 3.11782 11.7405 4.15552 12.6065C5.19323 13.4726 6.49295 13.9629 7.84411 13.998C9.19527 14.0331 10.5187 13.611 11.6 12.8" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/attach.svg b/assets/icons/attach.svg
deleted file mode 100644
index f923a3c7c8..0000000000
--- a/assets/icons/attach.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.37288 4.48506L7.43539 10.6638C7.43539 10.9365 7.54373 11.1981 7.73655 11.3909C7.92938 11.5837 8.19092 11.6921 8.46362 11.6921C8.73632 11.6921 8.99785 11.5837 9.19068 11.3909C9.38351 11.1981 9.49184 10.9366 9.49184 10.6638L9.42933 4.48506C9.42933 3.93975 9.2127 3.41678 8.82711 3.03119C8.44152 2.6456 7.91855 2.42898 7.37324 2.42898C6.82794 2.42898 6.30496 2.6456 5.91937 3.03119C5.53378 3.41678 5.31716 3.93975 5.31716 4.48506L5.37968 10.6384C5.37636 11.0455 5.45368 11.4492 5.60718 11.8263C5.76067 12.2034 5.98731 12.5463 6.27401 12.8354C6.56071 13.1244 6.9018 13.3538 7.27761 13.5104C7.65341 13.667 8.0565 13.7476 8.46362 13.7476C8.87073 13.7476 9.27382 13.667 9.64963 13.5104C10.0254 13.3538 10.3665 13.1244 10.6532 12.8354C10.9399 12.5463 11.1666 12.2034 11.3201 11.8263C11.4736 11.4492 11.5509 11.0455 11.5476 10.6384L11.485 4.48506" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/audio_off.svg b/assets/icons/audio_off.svg
deleted file mode 100644
index 43d2a04344..0000000000
--- a/assets/icons/audio_off.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.6667 6C11.003 6.44823 11.2208 6.97398 11.3001 7.52867" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.9094 3.75732C13.7621 4.6095 14.3383 5.69876 14.5629 6.88315C14.7875 8.06754 14.6502 9.29213 14.1688 10.3973" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M2.66675 2L13.6667 13" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5.33333 4.66669L4.942 5.05802C4.85494 5.1456 4.75136 5.21504 4.63726 5.2623C4.52317 5.30957 4.40083 5.33372 4.27733 5.33335H2.66667C2.48986 5.33335 2.32029 5.40359 2.19526 5.52862C2.07024 5.65364 2 5.82321 2 6.00002V10C2 10.1768 2.07024 10.3464 2.19526 10.4714C2.32029 10.5964 2.48986 10.6667 2.66667 10.6667H4.27733C4.40083 10.6663 4.52317 10.6905 4.63726 10.7377C4.75136 10.785 4.85494 10.8544 4.942 10.942L7.19733 13.198C7.26307 13.2639 7.34687 13.3088 7.43813 13.3269C7.52939 13.3451 7.62399 13.3358 7.70995 13.3002C7.79591 13.2646 7.86936 13.2042 7.921 13.1268C7.97263 13.0494 8.00013 12.9584 8 12.8654V7.33335" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7.21875 2.78136C7.28267 2.71719 7.36421 2.67345 7.45303 2.65568C7.54184 2.63791 7.63393 2.64691 7.71762 2.68154C7.80132 2.71618 7.87284 2.77488 7.92312 2.85022C7.97341 2.92555 8.0002 3.01412 8.00008 3.10469V3.56202" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/audio_on.svg b/assets/icons/audio_on.svg
deleted file mode 100644
index 6e183bd585..0000000000
--- a/assets/icons/audio_on.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 3.13467C7.99987 3.04181 7.97223 2.95107 7.92057 2.8739C7.86892 2.79674 7.79557 2.7366 7.70977 2.70108C7.62397 2.66557 7.52958 2.65626 7.43849 2.67434C7.34741 2.69242 7.26373 2.73707 7.198 2.80266L4.942 5.058C4.85494 5.14558 4.75136 5.21502 4.63726 5.26228C4.52317 5.30954 4.40083 5.33369 4.27733 5.33333H2.66667C2.48986 5.33333 2.32029 5.40357 2.19526 5.52859C2.07024 5.65362 2 5.82319 2 6V10C2 10.1768 2.07024 10.3464 2.19526 10.4714C2.32029 10.5964 2.48986 10.6667 2.66667 10.6667H4.27733C4.40083 10.6663 4.52317 10.6905 4.63726 10.7377C4.75136 10.785 4.85494 10.8544 4.942 10.942L7.19733 13.198C7.26307 13.2639 7.34687 13.3087 7.43813 13.3269C7.52939 13.3451 7.62399 13.3358 7.70995 13.3002C7.79591 13.2645 7.86936 13.2042 7.921 13.1268C7.97263 13.0494 8.00013 12.9584 8 12.8653V3.13467Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10.6667 6C11.0995 6.57699 11.3334 7.27877 11.3334 8C11.3334 8.72123 11.0995 9.42301 10.6667 10" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.9094 12.2427C13.4666 11.6855 13.9085 11.0241 14.2101 10.2961C14.5116 9.56815 14.6668 8.78793 14.6668 7.99999C14.6668 7.21205 14.5116 6.43183 14.2101 5.70387C13.9085 4.97591 13.4666 4.31448 12.9094 3.75732" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/backspace.svg b/assets/icons/backspace.svg
deleted file mode 100644
index 9ef4432b6f..0000000000
--- a/assets/icons/backspace.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.79998 4C6.50183 4.00002 6.21436 4.10574 5.99358 4.29657L2.19677 7.57657C2.1348 7.63013 2.08528 7.69545 2.05139 7.76832C2.01751 7.8412 2 7.92001 2 7.99971C2 8.07941 2.01751 8.15823 2.05139 8.23111C2.08528 8.30398 2.1348 8.36929 2.19677 8.42286L5.99358 11.7034C6.21436 11.8943 6.50183 12 6.79998 12H12.8C13.1183 12 13.4235 11.8796 13.6485 11.6653C13.8736 11.4509 14 11.1602 14 10.8571V5.14286C14 4.83975 13.8736 4.54906 13.6485 4.33474C13.4235 4.12041 13.1183 4 12.8 4H6.79998Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8.5 6.5L11.5 9.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11.5 6.5L8.5 9.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/bell.svg b/assets/icons/bell.svg
deleted file mode 100644
index 70225bb105..0000000000
--- a/assets/icons/bell.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M5.33333 5.8C5.33333 5.05739 5.61429 4.3452 6.11438 3.8201C6.61448 3.295 7.29276 3 8 3C8.70724 3 9.38552 3.295 9.88562 3.8201C10.3857 4.3452 10.6667 5.05739 10.6667 5.8C10.6667 9.06667 12 10 12 10H4C4 10 5.33333 9.06667 5.33333 5.8Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M6 12.5C6.19692 12.8028 6.48641 13.0554 6.83822 13.2313C7.19004 13.4072 7.59127 13.5 8 13.5C8.40873 13.5 8.80996 13.4072 9.16178 13.2313C9.51359 13.0554 9.80308 12.8028 10 12.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/bell_dot.svg b/assets/icons/bell_dot.svg
deleted file mode 100644
index 959a7773cf..0000000000
--- a/assets/icons/bell_dot.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M4.86142 8.6961C4.47786 9.66547 4 9.99997 4 9.99997H12C12 9.99997 10.6667 9.06664 10.6667 5.79997C10.6667 5.05737 10.3857 4.34518 9.88562 3.82007C9.52389 3.44026 9.06893 3.18083 8.57722 3.06635" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M6 12.5C6.19692 12.8028 6.48641 13.0554 6.83822 13.2313C7.19004 13.4072 7.59127 13.5 8 13.5C8.40873 13.5 8.80996 13.4072 9.16178 13.2313C9.51359 13.0554 9.80308 12.8028 10 12.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-    <circle cx="4.5" cy="4.5" r="2.5" fill="black"/>
-</svg>
diff --git a/assets/icons/bell_off.svg b/assets/icons/bell_off.svg
deleted file mode 100644
index 5c3c1a0d68..0000000000
--- a/assets/icons/bell_off.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M10.6667 5.8C10.6667 5.05739 10.3857 4.3452 9.88562 3.8201C9.38552 3.295 8.70724 3 8 3C7.29276 3 6.61448 3.295 6.11438 3.8201C5.61428 4.3452 5.33333 5.05739 5.33333 5.8C5.33333 9.06667 4 10 4 10H7.375" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M6 12.5C6.19692 12.8028 6.48641 13.0554 6.83822 13.2313C7.19004 13.4072 7.59127 13.5 8 13.5C8.40873 13.5 8.80996 13.4072 9.16178 13.2313C9.51359 13.0554 9.80308 12.8028 10 12.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M4 3L12.5 11.5" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-</svg>
diff --git a/assets/icons/bell_ring.svg b/assets/icons/bell_ring.svg
deleted file mode 100644
index 838056cc03..0000000000
--- a/assets/icons/bell_ring.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M5.33333 5.8C5.33333 5.05739 5.61429 4.3452 6.11438 3.8201C6.61448 3.295 7.29276 3 8 3C8.70724 3 9.38552 3.295 9.88562 3.8201C10.3857 4.3452 10.6667 5.05739 10.6667 5.8C10.6667 9.06667 12 10 12 10H4C4 10 5.33333 9.06667 5.33333 5.8Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M6 12.5C6.19692 12.8028 6.48641 13.0554 6.83822 13.2313C7.19004 13.4072 7.59127 13.5 8 13.5C8.40873 13.5 8.80996 13.4072 9.16178 13.2313C9.51359 13.0554 9.80308 12.8028 10 12.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M12 2.02081C12.617 2.89491 13.0754 3.88797 13.2528 5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M4 2.02081C3.38299 2.89491 2.92461 3.88797 2.74719 5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/binary.svg b/assets/icons/binary.svg
deleted file mode 100644
index 3c15e9b547..0000000000
--- a/assets/icons/binary.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M12 10.667a1.333 1.333 0 1 0-2.667 0V12A1.333 1.333 0 1 0 12 12v-1.333ZM6.667 4A1.333 1.333 0 0 0 4 4v1.333a1.333 1.333 0 1 0 2.667 0V4ZM4 13.333h2.667M9.333 6.667H12M4 9.333h1.333v4M9.333 2.667h1.334v4"/></svg>
diff --git a/assets/icons/blocks.svg b/assets/icons/blocks.svg
deleted file mode 100644
index 84725d7892..0000000000
--- a/assets/icons/blocks.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7 13.5V5.143C7 4.97247 6.93226 4.80892 6.81167 4.68833C6.69108 4.56774 6.52753 4.5 6.357 4.5H3.143C2.97247 4.5 2.80892 4.56774 2.68833 4.68833C2.56774 4.80892 2.5 4.97247 2.5 5.143V12.857C2.5 12.9414 2.51663 13.0251 2.54895 13.1031C2.58126 13.1811 2.62862 13.252 2.68833 13.3117C2.74804 13.3714 2.81892 13.4187 2.89693 13.4511C2.97495 13.4834 3.05856 13.5 3.143 13.5H10.857C10.9414 13.5 11.0251 13.4834 11.1031 13.4511C11.1811 13.4187 11.252 13.3714 11.3117 13.3117C11.3714 13.252 11.4187 13.1811 11.4511 13.1031C11.4834 13.0251 11.5 12.9414 11.5 12.857V9.643C11.5 9.47247 11.4323 9.30892 11.3117 9.18833C11.1911 9.06774 11.0275 9 10.857 9H2.5M12.929 2.5H10.07C9.91873 2.50026 9.77376 2.56054 9.66689 2.6676C9.56002 2.77465 9.5 2.91973 9.5 3.071V5.93C9.5 6.245 9.756 6.501 10.071 6.501H12.929C13.0041 6.501 13.0784 6.4862 13.1477 6.45744C13.2171 6.42868 13.2801 6.38653 13.3331 6.3334C13.3861 6.28028 13.4282 6.21721 13.4568 6.14782C13.4855 6.07843 13.5001 6.00407 13.5 5.929V3.07C13.4997 2.91873 13.4395 2.77376 13.3324 2.66689C13.2254 2.56002 13.0803 2.5 12.929 2.5Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/bolt_filled.svg b/assets/icons/bolt_filled.svg
deleted file mode 100644
index 14d8f53e02..0000000000
--- a/assets/icons/bolt_filled.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M9.48836 2.06572C9.62447 2.1282 9.73467 2.23101 9.80181 2.35814C9.86896 2.48527 9.88927 2.62958 9.8596 2.76863L9.10795 6.28572H12.8525C12.9843 6.28571 13.1133 6.32112 13.2242 6.38774C13.335 6.45435 13.4231 6.54936 13.4779 6.66146C13.5326 6.77354 13.5518 6.89799 13.5331 7.01997C13.5143 7.14197 13.4585 7.25635 13.3722 7.34951L7.41396 13.7785C7.31457 13.8856 7.18007 13.959 7.03146 13.9872C6.88284 14.0153 6.72841 13.9968 6.59222 13.9344C6.45604 13.872 6.34575 13.7693 6.27851 13.6421C6.21127 13.515 6.19086 13.3707 6.22048 13.2316L6.97213 9.71452H3.22758C3.0958 9.71453 2.96679 9.67912 2.85591 9.61251C2.74505 9.54589 2.65697 9.45088 2.60221 9.33879C2.54744 9.22671 2.52829 9.10225 2.54702 8.98027C2.56575 8.85827 2.62157 8.7439 2.70784 8.65074L8.66611 2.22173C8.76554 2.1145 8.90011 2.04105 9.04884 2.01284C9.19758 1.98462 9.3521 2.00321 9.48836 2.06572Z" fill="black"/>
-</svg>
diff --git a/assets/icons/bolt_outlined.svg b/assets/icons/bolt_outlined.svg
deleted file mode 100644
index ca9c75fbfd..0000000000
--- a/assets/icons/bolt_outlined.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M9.29787 2.8462C9.41607 2.90046 9.51178 2.98975 9.5701 3.10016C9.62841 3.21057 9.64605 3.3359 9.62028 3.45666L8.96749 6.51117H12.2195C12.334 6.51115 12.446 6.54191 12.5423 6.59976C12.6386 6.65762 12.7151 6.74013 12.7627 6.83748C12.8102 6.93482 12.8269 7.04291 12.8106 7.14885C12.7943 7.2548 12.7458 7.35413 12.6709 7.43504L7.49631 13.0184C7.40998 13.1115 7.29318 13.1752 7.16411 13.1997C7.03504 13.2241 6.90092 13.2081 6.78264 13.1539C6.66437 13.0997 6.56859 13.0104 6.5102 12.9C6.4518 12.7896 6.43408 12.6643 6.45979 12.5435L7.11259 9.48899H3.86054C3.74609 9.489 3.63405 9.45825 3.53776 9.40039C3.44147 9.34254 3.36498 9.26003 3.31742 9.16268C3.26986 9.06534 3.25322 8.95725 3.26949 8.85131C3.28576 8.74536 3.33423 8.64603 3.40916 8.56513L8.58377 2.98169C8.67012 2.88856 8.78699 2.82478 8.91616 2.80028C9.04533 2.77576 9.17953 2.79192 9.29787 2.8462Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.2"/>
-</svg>
diff --git a/assets/icons/book.svg b/assets/icons/book.svg
deleted file mode 100644
index a2ab394be4..0000000000
--- a/assets/icons/book.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M4 12.125v-8.25c0-.365.132-.714.366-.972.235-.258.552-.403.884-.403H12v11H5.25c-.332 0-.65-.145-.884-.403A1.448 1.448 0 0 1 4 12.125Zm0 0c0-.365.132-.714.366-.972.235-.258.552-.403.884-.403H12"/></svg>
diff --git a/assets/icons/book_copy.svg b/assets/icons/book_copy.svg
deleted file mode 100644
index b7afd1df5c..0000000000
--- a/assets/icons/book_copy.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M2.5 10.5V3.643c0-.303.113-.594.315-.808.202-.215.476-.335.762-.335H9.5"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M4.5 9.5h-.667c-.353 0-.692.105-.942.293-.25.187-.391.442-.391.707 0 .265.14.52.39.707.25.188.59.293.943.293H4.5M13.5 11.25H7.577c-.286 0-.56.118-.762.33a1.151 1.151 0 0 0-.315.795m0 0c0 .298.113.585.315.796.202.21.476.329.762.329H13.5v-9H7.577c-.286 0-.56.119-.762.33a1.151 1.151 0 0 0-.315.795v6.75Z"/></svg>
diff --git a/assets/icons/box.svg b/assets/icons/box.svg
deleted file mode 100644
index 7e1276c629..0000000000
--- a/assets/icons/box.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.3996 5.59852C13.3994 5.3881 13.3439 5.18144 13.2386 4.99926C13.1333 4.81709 12.9819 4.66581 12.7997 4.56059L8.59996 2.16076C8.41755 2.05544 8.21063 2 8 2C7.78937 2 7.58246 2.05544 7.40004 2.16076L3.20033 4.56059C3.0181 4.66581 2.86674 4.81709 2.76144 4.99926C2.65613 5.18144 2.60059 5.3881 2.60037 5.59852V10.3982C2.60059 10.6086 2.65613 10.8153 2.76144 10.9975C2.86674 11.1796 3.0181 11.3309 3.20033 11.4361L7.40004 13.836C7.58246 13.9413 7.78937 13.9967 8 13.9967C8.21063 13.9967 8.41755 13.9413 8.59996 13.836L12.7997 11.4361C12.9819 11.3309 13.1333 11.1796 13.2386 10.9975C13.3439 10.8153 13.3994 10.6086 13.3996 10.3982V5.59852Z" stroke="white" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M2.78033 4.99857L7.99998 7.99836L13.2196 4.99857" stroke="white" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8 13.9979V7.99829" stroke="white" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/case_sensitive.svg b/assets/icons/case_sensitive.svg
deleted file mode 100644
index 015e241416..0000000000
--- a/assets/icons/case_sensitive.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path fill="#000" fill-rule="evenodd" d="M4.407 4h1.78l2.408 8.39H7.256l-.596-2.04H3.92l-.582 2.04H2L4.407 4Zm.89 1.44-1.05 3.7h2.1l-1.05-3.7ZM9.852 12.332h-.005a1.228 1.228 0 0 1-.669-.64v-.005C9.053 11.4 9 11 9 10.503c0-.582.082-1.059.27-1.4.187-.362.5-.607.924-.747.423-.14 1.001-.211 1.733-.211h.962v-.14c0-.323-.038-.554-.115-.708v-.005a.575.575 0 0 0-.342-.308c-.173-.067-.438-.11-.804-.11-.236 0-.428.019-.582.048-.154.029-.255.067-.313.115h-.005c-.115.077-.202.25-.216.583l-.01.149H9.188V7.61c0-.472.072-.857.221-1.136.159-.298.429-.5.785-.611.351-.12.832-.178 1.434-.178.63 0 1.127.067 1.488.202.38.14.654.39.808.741.154.342.226.804.226 1.377v4.39h-1.222v-.573a1.676 1.676 0 0 1-.573.481c-.294.145-.722.207-1.266.207-.515 0-.934-.053-1.237-.178Zm.953-2.883a.638.638 0 0 0-.375.294c-.068.134-.111.346-.111.654 0 .4.082.621.197.727.12.101.38.178.828.178.429 0 .742-.067.944-.183.197-.12.351-.317.442-.616.087-.274.14-.669.15-1.189l-1.19.01c-.39.01-.683.053-.88.12l-.005.005Z" clip-rule="evenodd"/></svg>
diff --git a/assets/icons/chat.svg b/assets/icons/chat.svg
deleted file mode 100644
index c64f6b5e0e..0000000000
--- a/assets/icons/chat.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.17279 8.26346C4.87566 8.62402 5.68419 8.72168 6.4527 8.53885C7.2212 8.35601 7.89913 7.90471 8.36433 7.26626C8.82953 6.62781 9.0514 5.8442 8.98996 5.05664C8.92852 4.26908 8.58781 3.52936 8.02922 2.97078C7.47064 2.41219 6.73092 2.07148 5.94336 2.01004C5.1558 1.9486 4.37219 2.17047 3.73374 2.63567C3.09529 3.10087 2.64399 3.7788 2.46115 4.5473C2.27832 5.31581 2.37598 6.12435 2.73654 6.82721L2 9L4.17279 8.26346Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7.07168 11C7.16761 11.4537 7.35843 11.8857 7.63567 12.2662C8.10087 12.9047 8.7788 13.356 9.5473 13.5388C10.3158 13.7217 11.1243 13.624 11.8272 13.2634L14 14L13.2635 11.8272C13.624 11.1243 13.7217 10.3158 13.5388 9.54728C13.356 8.77877 12.9047 8.10084 12.2663 7.63564C11.8858 7.3584 11.4537 7.16759 11 7.07166" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/check.svg b/assets/icons/check.svg
deleted file mode 100644
index 21e2137965..0000000000
--- a/assets/icons/check.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.625 8.98121L7.03402 10.7714L11.3437 4.75989" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/check_circle.svg b/assets/icons/check_circle.svg
deleted file mode 100644
index f9b88c4ce1..0000000000
--- a/assets/icons/check_circle.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.94873 9.02564L7.48722 10.0513L10.0514 6.46149" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8 14C11.3137 14 14 11.3137 14 8C14 4.68629 11.3137 2 8 2C4.68629 2 2 4.68629 2 8C2 11.3137 4.68629 14 8 14Z" stroke="black" stroke-width="1.2"/>
-</svg>
diff --git a/assets/icons/check_double.svg b/assets/icons/check_double.svg
deleted file mode 100644
index fabc700520..0000000000
--- a/assets/icons/check_double.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11.5999 4.38336L4.99996 10.9833L2 7.98332" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M14 6.78339L9.50009 11.2833L8.6001 10.3833" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/chevron_down.svg b/assets/icons/chevron_down.svg
deleted file mode 100644
index e4ca142a91..0000000000
--- a/assets/icons/chevron_down.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.15186 6.47321L7.99258 10.1696L11.8483 6.47321" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/chevron_down_up.svg b/assets/icons/chevron_down_up.svg
deleted file mode 100644
index 340b8d1ad9..0000000000
--- a/assets/icons/chevron_down_up.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11.3335 13.3333L8.00017 10L4.66685 13.3333" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11.3335 2.66669L8.00017 6.00002L4.66685 2.66669" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/chevron_left.svg b/assets/icons/chevron_left.svg
deleted file mode 100644
index fbe438fd4b..0000000000
--- a/assets/icons/chevron_left.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.55361 4.15179L5.85718 7.99251L9.55361 11.8482" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/chevron_right.svg b/assets/icons/chevron_right.svg
deleted file mode 100644
index 4f170717c9..0000000000
--- a/assets/icons/chevron_right.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.44653 4.16071L10.1608 8.00143L6.44653 11.8571" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/chevron_up.svg b/assets/icons/chevron_up.svg
deleted file mode 100644
index bbe6b9762d..0000000000
--- a/assets/icons/chevron_up.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.15186 9.56252L7.99258 5.86609L11.8483 9.56252" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/chevron_up_down.svg b/assets/icons/chevron_up_down.svg
deleted file mode 100644
index 299f6bce5a..0000000000
--- a/assets/icons/chevron_up_down.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.66675 10L8.00008 13.3333L11.3334 10" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M4.66675 6.00002L8.00008 2.66669L11.3334 6.00002" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/circle.svg b/assets/icons/circle.svg
deleted file mode 100644
index 1d80edac09..0000000000
--- a/assets/icons/circle.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 11C9.65685 11 11 9.65685 11 8C11 6.34315 9.65685 5 8 5C6.34315 5 5 6.34315 5 8C5 9.65685 6.34315 11 8 11Z" fill="black"/>
-</svg>
diff --git a/assets/icons/circle_check.svg b/assets/icons/circle_check.svg
deleted file mode 100644
index 8950aa7a0e..0000000000
--- a/assets/icons/circle_check.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 2.5C11.0376 2.5 13.5 4.96243 13.5 8C13.5 11.0376 11.0376 13.5 8 13.5C4.96243 13.5 2.5 11.0376 2.5 8C2.5 4.96243 4.96243 2.5 8 2.5ZM10.6699 5.37598C10.1196 5.06178 9.40923 5.20902 9.0332 5.73535L7.17188 8.33887L6.6416 7.98633L6.62207 7.97461L6.55566 7.93457L6.54395 7.92676L6.53125 7.91992C6.00582 7.64262 5.35445 7.7754 4.97949 8.23633L4.9082 8.33301C4.55035 8.87107 4.66306 9.58687 5.15234 9.99023L5.16211 9.99805L5.17188 10.0049L5.2334 10.0508L5.25488 10.0664L6.79297 11.0918C7.35476 11.4663 8.11112 11.3257 8.50293 10.7783H8.50391L11.0684 7.18848V7.1875C11.4684 6.62649 11.3395 5.84687 10.7783 5.44531V5.44434L10.6699 5.37598Z" fill="black" stroke="black"/>
-</svg>
diff --git a/assets/icons/circle_help.svg b/assets/icons/circle_help.svg
deleted file mode 100644
index 0e623bd1da..0000000000
--- a/assets/icons/circle_help.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 14C11.3137 14 14 11.3137 14 8C14 4.68629 11.3137 2 8 2C4.68629 2 2 4.68629 2 8C2 11.3137 4.68629 14 8 14Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6.54492 6.5C6.66248 6.16582 6.8945 5.88404 7.19991 5.70455C7.50532 5.52506 7.86439 5.45945 8.21354 5.51934C8.56268 5.57922 8.87937 5.76075 9.1075 6.03175C9.33564 6.30276 9.4605 6.64576 9.45997 7C9.45997 8.00002 7.95994 8.50003 7.95994 8.50003" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8 10.5H8.005" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/close.svg b/assets/icons/close.svg
deleted file mode 100644
index 846b3a703d..0000000000
--- a/assets/icons/close.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.70581 4.5L11.294 11.5M11.294 4.5L4.70581 11.5" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-</svg>
diff --git a/assets/icons/cloud_download.svg b/assets/icons/cloud_download.svg
deleted file mode 100644
index 70cda55856..0000000000
--- a/assets/icons/cloud_download.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M8.001 9v4l-2-2M8.001 13l2-2"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M3.436 10.389a4.215 4.215 0 0 1-1.424-3.484 4.227 4.227 0 0 1 1.92-3.236 4.19 4.19 0 0 1 5.335.665 4.22 4.22 0 0 1 .96 1.677H11.3c.584 0 1.151.19 1.618.54a2.71 2.71 0 0 1 .913 3.116A2.709 2.709 0 0 1 12.762 11"/></svg>
diff --git a/assets/icons/code.svg b/assets/icons/code.svg
deleted file mode 100644
index 72d145224a..0000000000
--- a/assets/icons/code.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="m11.75 10.5 2.5-2.5-2.5-2.5M4.25 5.5 1.75 8l2.5 2.5M9.563 3 6.437 13"/></svg>
diff --git a/assets/icons/cog.svg b/assets/icons/cog.svg
deleted file mode 100644
index 7dd3a8beff..0000000000
--- a/assets/icons/cog.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M8 12.8a4.8 4.8 0 1 0 0-9.6 4.8 4.8 0 0 0 0 9.6Z"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M8 9.2a1.2 1.2 0 1 0 0-2.4 1.2 1.2 0 0 0 0 2.4ZM8 2v1.2M8 14v-1.2M11 13.196l-.6-1.038M7.4 6.962 5 2.804M13.196 11l-1.038-.6M2.804 5l1.038.6M9.2 8H14M2 8h1.2M13.196 5l-1.038.6M2.804 11l1.038-.6M11 2.804l-.6 1.038M7.4 9.038 5 13.196"/></svg>
diff --git a/assets/icons/command.svg b/assets/icons/command.svg
deleted file mode 100644
index f361ca2d05..0000000000
--- a/assets/icons/command.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.66667 4.66667V11.3333C9.66667 11.663 9.76441 11.9852 9.94755 12.2593C10.1307 12.5334 10.391 12.747 10.6955 12.8731C11.0001 12.9993 11.3352 13.0323 11.6585 12.968C11.9818 12.9037 12.2788 12.7449 12.5118 12.5118C12.7449 12.2788 12.9037 11.9818 12.968 11.6585C13.0323 11.3352 12.9993 11.0001 12.8731 10.6955C12.747 10.391 12.5334 10.1307 12.2593 9.94755C11.9852 9.76441 11.663 9.66667 11.3333 9.66667H4.66667C4.33703 9.66667 4.0148 9.76441 3.74072 9.94755C3.46663 10.1307 3.25301 10.391 3.12687 10.6955C3.00072 11.0001 2.96772 11.3352 3.03203 11.6585C3.09633 11.9818 3.25507 12.2788 3.48816 12.5118C3.72124 12.7449 4.01822 12.9037 4.34152 12.968C4.66482 13.0323 4.99993 12.9993 5.30447 12.8731C5.60902 12.747 5.86931 12.5334 6.05245 12.2593C6.23559 11.9852 6.33333 11.663 6.33333 11.3333V4.66667C6.33333 4.33703 6.23559 4.0148 6.05245 3.74072C5.86931 3.46663 5.60902 3.25301 5.30447 3.12687C4.99993 3.00072 4.66482 2.96772 4.34152 3.03203C4.01822 3.09633 3.72124 3.25507 3.48816 3.48816C3.25507 3.72124 3.09633 4.01822 3.03203 4.34152C2.96772 4.66482 3.00072 4.99993 3.12687 5.30447C3.25301 5.60902 3.46663 5.86931 3.74072 6.05245C4.0148 6.23559 4.33703 6.33333 4.66667 6.33333H11.3333C11.663 6.33333 11.9852 6.23559 12.2593 6.05245C12.5334 5.86931 12.747 5.60902 12.8731 5.30447C12.9993 4.99993 13.0323 4.66482 12.968 4.34152C12.9037 4.01822 12.7449 3.72124 12.5118 3.48816C12.2788 3.25507 11.9818 3.09633 11.6585 3.03203C11.3352 2.96772 11.0001 3.00072 10.6955 3.12687C10.391 3.25301 10.1307 3.46663 9.94755 3.74072C9.76441 4.0148 9.66667 4.33703 9.66667 4.66667Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/control.svg b/assets/icons/control.svg
deleted file mode 100644
index f9341b6256..0000000000
--- a/assets/icons/control.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.5 6.12487L7.64656 1.97852C7.84183 1.78327 8.1584 1.78328 8.35366 1.97853L12.5 6.12487" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-</svg>
diff --git a/assets/icons/copilot.svg b/assets/icons/copilot.svg
deleted file mode 100644
index 2584cd6310..0000000000
--- a/assets/icons/copilot.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M6.44643 8.76593C6.83106 8.76593 7.14286 9.0793 7.14286 9.46588V10.9825C7.14286 11.369 6.83106 11.6824 6.44643 11.6824C6.06181 11.6824 5.75 11.369 5.75 10.9825V9.46588C5.75 9.0793 6.06181 8.76593 6.44643 8.76593Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M9.57168 8.76593C9.95631 8.76593 10.2681 9.0793 10.2681 9.46588V10.9825C10.2681 11.369 9.95631 11.6824 9.57168 11.6824C9.18705 11.6824 8.87524 11.369 8.87524 10.9825V9.46588C8.87524 9.0793 9.18705 8.76593 9.57168 8.76593Z" fill="black"/>
-<path d="M7.99976 4.17853C7.99976 6.67853 5.83695 7.28202 4.30332 7.28202C2.76971 7.28202 2.44604 6.1547 2.44604 4.76409C2.44604 3.37347 3.68929 2.24615 5.2229 2.24615C6.75651 2.24615 7.99976 2.78791 7.99976 4.17853Z" fill="black" fill-opacity="0.5" stroke="black" stroke-width="1.2"/>
-<path d="M8 4.17853C8 6.67853 10.1628 7.28202 11.6965 7.28202C13.2301 7.28202 13.5537 6.1547 13.5537 4.76409C13.5537 3.37347 12.3105 2.24615 10.7769 2.24615C9.24325 2.24615 8 2.78791 8 4.17853Z" fill="black" fill-opacity="0.5" stroke="black" stroke-width="1.2"/>
-<path d="M12.5894 6.875C12.5894 6.875 13.3413 7.35585 13.7144 8.08398C14.0876 8.81212 14.0894 10.4985 13.7144 11.1064C13.3395 11.7143 12.8931 12.1429 11.7637 12.7543C10.6344 13.3657 9.143 13.7321 9.143 13.7321H6.85728C6.85728 13.7321 5.37513 13.4107 4.23656 12.7543C3.09798 12.0978 2.55371 11.6786 2.28585 11.1064C2.01799 10.5342 1.92871 8.85715 2.28585 8.08398C2.64299 7.31081 3.42871 6.875 3.42871 6.875" stroke="black" stroke-width="1.2" stroke-linejoin="round"/>
-<path d="M11.9375 12.6016V7.33636L13.9052 7.99224V10.9255L11.9375 12.6016Z" fill="black" fill-opacity="0.75"/>
-<path d="M4.01793 12.6016V7.33636L2.05029 7.99224V10.9255L4.01793 12.6016Z" fill="black" fill-opacity="0.75"/>
-</svg>
diff --git a/assets/icons/copilot_disabled.svg b/assets/icons/copilot_disabled.svg
deleted file mode 100644
index 90afa84966..0000000000
--- a/assets/icons/copilot_disabled.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g opacity="0.5">
-<path d="M2.38084 5.44739C2.42754 5.92439 2.54311 6.33781 2.72903 6.68419C2.70043 6.7268 2.67414 6.77045 2.64995 6.81465C2.39071 6.99942 2.09192 7.27316 1.83439 7.54967C1.53258 7.8737 1.18745 8.30675 1.05511 8.70208L1.04265 8.73929L1.03513 8.77782C0.975842 9.08191 0.999402 9.48334 1.04817 9.81846C1.09192 10.1191 1.17095 10.4701 1.29544 10.735C1.44476 11.2894 1.88328 11.6844 2.27302 11.9619C2.6204 12.2092 3.03378 12.4329 3.39179 12.6267C3.4686 12.6683 3.54294 12.7085 3.61345 12.7473L3.62786 12.7552L3.64268 12.7623C4.05361 12.9594 4.69547 13.2491 5.30115 13.4909C5.60351 13.6116 5.90465 13.7235 6.16744 13.8062C6.39236 13.877 6.6532 13.948 6.87108 13.9562C7.19351 13.9948 7.54309 14 7.99999 14C8.45688 14 8.80648 13.9948 9.12892 13.9562C9.34679 13.948 9.60764 13.877 9.83256 13.8062C10.0953 13.7235 10.3965 13.6116 10.6989 13.4909C11.0041 13.369 11.3186 13.235 11.6081 13.1067L10.5467 12.2257C9.92791 12.5006 9.61228 12.6334 9.31639 12.7078C9.00201 12.7869 8.69433 12.8031 7.99999 12.8031C7.30564 12.8031 6.99799 12.7869 6.68361 12.7078C6.35125 12.6243 5.99398 12.467 5.21016 12.1174C4.24428 11.6866 3.83266 11.4004 3.6523 11.2153C3.57295 11.1339 3.5474 11.0807 3.53501 11.0478C3.52011 11.0083 3.5122 10.9688 3.4984 10.8761V8.7332C3.49839 8.31083 3.52629 7.91975 3.6034 7.63032C3.60757 7.61465 3.6118 7.59963 3.61607 7.58525C4.02831 7.80896 4.49555 7.89251 4.95638 7.89251C5.07488 7.89251 5.19417 7.8891 5.31358 7.8818L2.38084 5.44739Z" fill="black"/>
-<path d="M6.63694 8.98022C6.3356 9.00981 6.1001 9.26519 6.1001 9.57584V10.8725C6.1001 11.203 6.3667 11.471 6.69556 11.471C7.02442 11.471 7.29101 11.203 7.29101 10.8725V9.57584C7.29101 9.55739 7.29018 9.53913 7.28856 9.52111L6.63694 8.98022Z" fill="black"/>
-<path d="M8.70898 10.7003V10.8725C8.70898 11.203 8.97557 11.471 9.30443 11.471C9.39784 11.471 9.48622 11.4493 9.5649 11.4108L8.70898 10.7003Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M6.09444 2.02107C5.38906 1.93962 4.51467 2.09228 3.78857 2.51486L4.71546 3.28426C5.14098 3.1227 5.60048 3.06844 5.96984 3.11109C6.8169 3.2089 7.09729 3.4728 7.21756 3.68905C7.36871 3.96084 7.38394 4.34213 7.35706 4.91278C7.34824 5.1 7.32376 5.26765 7.286 5.41801L10.1886 7.82737C10.472 7.87295 10.7601 7.89249 11.0437 7.89249C11.5045 7.89249 11.9718 7.80894 12.384 7.58523C12.3883 7.59961 12.3925 7.61463 12.3967 7.6303C12.4738 7.91973 12.5017 8.31081 12.5017 8.73318V9.74745L14.4066 11.3287C14.538 11.1547 14.6447 10.9577 14.7047 10.735C14.8291 10.4701 14.9082 10.1191 14.9519 9.81844C15.0007 9.48332 15.0243 9.08189 14.965 8.7778L14.9575 8.73927L14.945 8.70206C14.8127 8.30673 14.4675 7.87368 14.1657 7.54965C13.9082 7.27314 13.6094 6.9994 13.3501 6.81463C13.326 6.77043 13.2997 6.72678 13.2711 6.68417C13.5202 6.21998 13.6431 5.63537 13.6431 4.93872C13.6431 3.80567 13.0327 3.01576 12.2747 2.5525C11.5366 2.10138 10.6317 1.93724 9.90572 2.02107C9.01323 2.12413 8.38524 2.41316 8.00008 2.89841C7.61492 2.41316 6.98693 2.12413 6.09444 2.02107ZM11.7075 3.48996C12.2085 3.79616 12.5514 4.26316 12.5514 4.93872C12.5514 5.75753 12.3471 6.19648 12.1135 6.43349C11.8806 6.66983 11.5299 6.79529 11.0437 6.79529C10.3585 6.79529 9.76832 6.65786 9.3546 6.37099C8.96792 6.10286 8.67859 5.66636 8.6431 4.91278C8.61622 4.34213 8.63145 3.96084 8.7826 3.68905C8.90287 3.4728 9.18326 3.2089 10.0303 3.11109C10.527 3.05374 11.1866 3.17162 11.7075 3.48996Z" fill="black"/>
-</g>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M14.1225 13.809C14.0341 13.9146 13.877 13.9289 13.7711 13.8409L1.19311 3.40023C1.08659 3.3118 1.07221 3.15364 1.16104 3.04745L1.87752 2.19103C1.96588 2.08542 2.123 2.07114 2.22895 2.15908L14.8069 12.5998C14.9134 12.6882 14.9278 12.8464 14.839 12.9526L14.1225 13.809Z" fill="black"/>
-</svg>
diff --git a/assets/icons/copilot_error.svg b/assets/icons/copilot_error.svg
deleted file mode 100644
index 77744e7529..0000000000
--- a/assets/icons/copilot_error.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g opacity="0.5">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M6.09436 2.02107C5.36842 1.93724 4.46348 2.10138 3.72539 2.5525C2.96744 3.01576 2.35705 3.80567 2.35705 4.93872C2.35705 5.63537 2.47988 6.21998 2.72903 6.68417C2.70043 6.72678 2.67414 6.77043 2.64995 6.81463C2.39071 6.9994 2.09192 7.27314 1.83439 7.54965C1.53258 7.87368 1.18745 8.30673 1.05511 8.70206L1.04265 8.73927L1.03513 8.7778C0.975842 9.08189 0.999402 9.48332 1.04817 9.81844C1.09192 10.1191 1.17095 10.4701 1.29544 10.735C1.44476 11.2894 1.88328 11.6844 2.27302 11.9619C2.6204 12.2092 3.03378 12.4329 3.39179 12.6267C3.4686 12.6683 3.54294 12.7085 3.61345 12.7473L3.62786 12.7552L3.64268 12.7623C4.05361 12.9594 4.69547 13.2491 5.30115 13.4909C5.60351 13.6116 5.90465 13.7235 6.16744 13.8062C6.39236 13.877 6.6532 13.948 6.87108 13.9562C7.19351 13.9948 7.54309 14 7.99999 14C8.01293 14 8.02579 14 8.03857 14C7.97904 13.903 7.99191 13.7743 8.07655 13.6911L9.0197 12.7639C8.77857 12.7952 8.48273 12.8031 7.99999 12.8031C7.30564 12.8031 6.99799 12.7869 6.68361 12.7078C6.35125 12.6243 5.99398 12.467 5.21016 12.1174C4.24428 11.6866 3.83266 11.4004 3.6523 11.2153C3.57295 11.1339 3.5474 11.0807 3.53501 11.0478C3.52011 11.0083 3.5122 10.9688 3.4984 10.8761V8.73318C3.49839 8.31081 3.52629 7.91973 3.6034 7.6303C3.60757 7.61463 3.6118 7.59961 3.61607 7.58523C4.02831 7.80894 4.49555 7.89249 4.95638 7.89249C5.75982 7.89249 6.59976 7.73566 7.26541 7.27411C7.55937 7.07027 7.8077 6.81497 8 6.50734C8.1923 6.81497 8.44063 7.07027 8.73459 7.27411C9.40024 7.73566 10.2402 7.89249 11.0436 7.89249C11.5044 7.89249 11.9717 7.80894 12.3839 7.58523C12.3882 7.59961 12.3924 7.61463 12.3966 7.6303C12.4737 7.91973 12.5016 8.31081 12.5016 8.73318V9.34082L14.1266 7.7433C14.169 7.70159 14.2225 7.67811 14.2775 7.67276C14.2398 7.63028 14.2024 7.58915 14.1656 7.54965C13.9081 7.27314 13.6093 6.9994 13.35 6.81463C13.3259 6.77043 13.2996 6.72678 13.271 6.68417C13.5201 6.21998 13.643 5.63537 13.643 4.93872C13.643 3.80567 13.0326 3.01576 12.2746 2.5525C11.5365 2.10138 10.6316 1.93724 9.90564 2.02107C9.01315 2.12413 8.38516 2.41316 8 2.89841C7.61484 2.41316 6.98685 2.12413 6.09436 2.02107ZM3.44871 4.93872C3.44871 4.26316 3.79162 3.79616 4.2926 3.48996C4.81346 3.17162 5.4731 3.05374 5.96976 3.11109C6.81682 3.2089 7.09721 3.4728 7.21748 3.68905C7.36863 3.96084 7.38386 4.34213 7.35698 4.91278C7.32149 5.66636 7.03216 6.10286 6.64548 6.37099C6.23176 6.65786 5.64158 6.79529 4.95638 6.79529C4.47018 6.79529 4.11948 6.66983 3.88658 6.43349C3.65302 6.19648 3.44871 5.75753 3.44871 4.93872ZM12.5513 4.93872C12.5513 4.26316 12.2084 3.79616 11.7074 3.48996C11.1865 3.17162 10.5269 3.05374 10.0302 3.11109C9.18318 3.2089 8.90279 3.4728 8.78252 3.68905C8.63137 3.96084 8.61614 4.34213 8.64302 4.91278C8.67851 5.66636 8.96784 6.10286 9.35452 6.37099C9.76824 6.65786 10.3584 6.79529 11.0436 6.79529C11.5298 6.79529 11.8805 6.66983 12.1134 6.43349C12.347 6.19648 12.5513 5.75753 12.5513 4.93872Z" fill="black"/>
-<path d="M7.29101 9.57583C7.29101 9.2453 7.02442 8.97736 6.69556 8.97736C6.3667 8.97736 6.1001 9.2453 6.1001 9.57583V10.8725C6.1001 11.203 6.3667 11.471 6.69556 11.471C7.02442 11.471 7.29101 11.203 7.29101 10.8725V9.57583Z" fill="black"/>
-</g>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M13.6668 14.9102C13.7644 15.0078 13.9227 15.0078 14.0203 14.9102L14.908 14.0224C15.0056 13.9248 15.0056 13.7665 14.908 13.6688L13.2229 11.9836L14.908 10.2983C15.0057 10.2007 15.0057 10.0424 14.908 9.94474L14.0203 9.05695C13.9227 8.95931 13.7644 8.95931 13.6668 9.05695L11.9817 10.7422L10.2966 9.05693C10.199 8.95929 10.0407 8.95929 9.9431 9.05693L9.05539 9.94473C8.95777 10.0424 8.95777 10.2007 9.05539 10.2983L10.7405 11.9836L9.05541 13.6688C8.95779 13.7665 8.95779 13.9248 9.05541 14.0224L9.94312 14.9102C10.0407 15.0079 10.199 15.0079 10.2966 14.9102L11.9817 13.225L13.6668 14.9102Z" fill="black"/>
-</svg>
diff --git a/assets/icons/copilot_init.svg b/assets/icons/copilot_init.svg
deleted file mode 100644
index 754d159584..0000000000
--- a/assets/icons/copilot_init.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M3.44871 4.93872C3.44871 4.26316 3.79162 3.79616 4.2926 3.48996C4.81345 3.17162 5.4731 3.05374 5.96975 3.11109C6.81682 3.2089 7.09721 3.4728 7.21748 3.68905C7.36863 3.96084 7.38386 4.34213 7.35698 4.91278C7.32149 5.66636 7.03216 6.10286 6.64548 6.37099C6.23176 6.65786 5.64158 6.79529 4.95638 6.79529C4.47018 6.79529 4.11948 6.66983 3.88657 6.43349C3.65302 6.19648 3.44871 5.75753 3.44871 4.93872ZM6.09436 2.02107C5.36842 1.93724 4.46348 2.10138 3.72539 2.5525C2.96744 3.01576 2.35705 3.80567 2.35705 4.93872C2.35705 5.63537 2.47987 6.21998 2.72903 6.68417C2.70043 6.72678 2.67414 6.77043 2.64995 6.81463C2.39071 6.9994 2.09192 7.27314 1.83438 7.54965C1.53258 7.87368 1.18744 8.30673 1.0551 8.70206L1.04265 8.73927L1.03513 8.7778C0.975842 9.08189 0.999402 9.48332 1.04817 9.81844C1.09192 10.1191 1.17095 10.4701 1.29544 10.735C1.44475 11.2894 1.88328 11.6844 2.27302 11.9619C2.62039 12.2092 3.03378 12.4329 3.39179 12.6267C3.4686 12.6682 3.54294 12.7085 3.61345 12.7473L3.62786 12.7552L3.64268 12.7623C4.05361 12.9594 4.69547 13.2491 5.30114 13.4909C5.60351 13.6116 5.90465 13.7235 6.16744 13.8062C6.39236 13.877 6.6532 13.948 6.87107 13.9562C7.1935 13.9948 7.54309 14 7.99999 14C8.45051 14 8.79671 13.9949 9.11542 13.9578C9.04 13.6509 9 13.3301 9 13C9 12.9213 9.00228 12.8431 9.00676 12.7656C8.76797 12.7955 8.47413 12.8031 7.99999 12.8031C7.30564 12.8031 6.99799 12.7869 6.68361 12.7078C6.35124 12.6243 5.99398 12.467 5.21016 12.1174C4.24428 11.6866 3.83266 11.4004 3.65229 11.2153C3.57295 11.1339 3.5474 11.0807 3.53501 11.0478C3.5201 11.0083 3.5122 10.9688 3.49839 10.8761V8.73318C3.49838 8.31081 3.52629 7.91973 3.60339 7.6303C3.60757 7.61463 3.6118 7.59961 3.61607 7.58523C4.02831 7.80894 4.49555 7.89249 4.95638 7.89249C5.75981 7.89249 6.59976 7.73566 7.2654 7.27411C7.55937 7.07027 7.80769 6.81497 8 6.50734C8.1923 6.81497 8.44063 7.07027 8.73459 7.27411C9.40024 7.73566 10.2402 7.89249 11.0436 7.89249C11.5045 7.89249 11.9717 7.80894 12.3839 7.58523C12.3882 7.59961 12.3924 7.61463 12.3966 7.6303C12.4737 7.91973 12.5016 8.31081 12.5016 8.73318V9.03072C12.6649 9.01043 12.8312 8.99997 13 8.99997C13.7226 8.99997 14.4004 9.19157 14.9855 9.52673C15.0073 9.26739 15.0077 8.99725 14.9649 8.7778L14.9574 8.73927L14.9449 8.70206C14.8126 8.30673 14.4674 7.87368 14.1656 7.54965C13.9081 7.27314 13.6093 6.9994 13.3501 6.81463C13.3259 6.77043 13.2996 6.72678 13.271 6.68417C13.5201 6.21998 13.643 5.63537 13.643 4.93872C13.643 3.80567 13.0326 3.01576 12.2746 2.5525C11.5365 2.10138 10.6316 1.93724 9.90564 2.02107C9.01314 2.12413 8.38516 2.41316 8 2.89841C7.61484 2.41316 6.98685 2.12413 6.09436 2.02107ZM9.89999 10.4719V9.57581C9.89999 9.24528 9.6334 8.97734 9.30454 8.97734C8.97568 8.97734 8.70909 9.24528 8.70909 9.57581V10.8725C8.70909 11.2024 8.97465 11.4699 9.30264 11.471C9.45293 11.1079 9.65514 10.7718 9.89999 10.4719ZM7.29091 9.57581C7.29091 9.24528 7.02432 8.97734 6.69546 8.97734C6.3666 8.97734 6.1 9.24528 6.1 9.57581V10.8725C6.1 11.203 6.3666 11.471 6.69546 11.471C7.02432 11.471 7.29091 11.203 7.29091 10.8725V9.57581ZM12.5513 4.93872C12.5513 4.26316 12.2084 3.79616 11.7074 3.48996C11.1866 3.17162 10.5269 3.05374 10.0303 3.11109C9.18317 3.2089 8.90278 3.4728 8.78252 3.68905C8.63137 3.96084 8.61614 4.34213 8.64302 4.91278C8.67851 5.66636 8.96784 6.10286 9.35452 6.37099C9.76824 6.65786 10.3584 6.79529 11.0436 6.79529C11.5298 6.79529 11.8805 6.66983 12.1134 6.43349C12.347 6.19648 12.5513 5.75753 12.5513 4.93872Z" fill="black"/>
-<path d="M13 16C14.6569 16 16 14.6569 16 13C16 11.3431 14.6569 10 13 10C11.3431 10 10 11.3431 10 13C10 14.6569 11.3431 16 13 16Z" fill="black"/>
-</svg>
diff --git a/assets/icons/copy.svg b/assets/icons/copy.svg
deleted file mode 100644
index aba193930b..0000000000
--- a/assets/icons/copy.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.486 6.2H7.24795C6.66895 6.2 6.19995 6.669 6.19995 7.248V12.486C6.19995 13.064 6.66895 13.533 7.24795 13.533H12.486C13.064 13.533 13.533 13.064 13.533 12.486V7.248C13.533 6.669 13.064 6.2 12.486 6.2Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3.91712 10.203C3.63951 10.2022 3.37351 10.0915 3.1773 9.89511C2.98109 9.69872 2.87064 9.43261 2.87012 9.155V3.917C2.87091 3.63956 2.98147 3.37371 3.17765 3.17753C3.37383 2.98135 3.63968 2.87079 3.91712 2.87H9.15512C9.43273 2.87053 9.69883 2.98097 9.89523 3.17718C10.0916 3.37339 10.2023 3.63939 10.2031 3.917" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/countdown_timer.svg b/assets/icons/countdown_timer.svg
deleted file mode 100644
index 5d1e775e68..0000000000
--- a/assets/icons/countdown_timer.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M6.8 2h2.4M8 9.2l1.8-1.8M8 14a4.8 4.8 0 1 0 0-9.6A4.8 4.8 0 0 0 8 14Z"/></svg>
diff --git a/assets/icons/crosshair.svg b/assets/icons/crosshair.svg
deleted file mode 100644
index 3af6aa9fa3..0000000000
--- a/assets/icons/crosshair.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 14C11.3137 14 14 11.3137 14 8C14 4.6863 11.3137 2 8 2C4.6863 2 2 4.6863 2 8C2 11.3137 4.6863 14 8 14Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M14 8L11 8" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5 8H2" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8 5V2" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8 14V11" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/cursor_i_beam.svg b/assets/icons/cursor_i_beam.svg
deleted file mode 100644
index 2d513181f9..0000000000
--- a/assets/icons/cursor_i_beam.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11 13H10.4C9.76346 13 9.15302 12.7893 8.70296 12.4142C8.25284 12.0391 8 11.5304 8 11V5C8 4.46957 8.25284 3.96086 8.70296 3.58579C9.15302 3.21071 9.76346 3 10.4 3H11" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5 13H5.6C6.23654 13 6.84698 12.7893 7.29704 12.4142C7.74716 12.0391 8 11.5304 8 11V5C8 4.46957 7.74716 3.96086 7.29704 3.58579C6.84698 3.21071 6.23654 3 5.6 3H5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/dash.svg b/assets/icons/dash.svg
deleted file mode 100644
index 3928ee7cfa..0000000000
--- a/assets/icons/dash.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M3.333 8h9.334"/></svg>
diff --git a/assets/icons/database_zap.svg b/assets/icons/database_zap.svg
deleted file mode 100644
index 76af0f9251..0000000000
--- a/assets/icons/database_zap.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M8.017 5.625c2.974 0 5.385-.804 5.385-1.795 0-.991-2.41-1.795-5.385-1.795-2.973 0-5.384.804-5.384 1.795 0 .991 2.41 1.795 5.384 1.795Z"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M2.633 3.83v8.376c-.003.288.201.571.596.827.394.256.967.477 1.671.643a13.12 13.12 0 0 0 2.373.314c.854.04 1.725.01 2.54-.085M13.402 3.83v1.795M13.402 8.018l-1.795 2.991H14l-1.795 2.992"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M2.633 8.018c0 .28.198.556.575.805.378.25.925.467 1.599.634.673.167 1.454.279 2.28.327.827.048 1.676.032 2.48-.049"/></svg>
diff --git a/assets/icons/debug.svg b/assets/icons/debug.svg
deleted file mode 100644
index 6423a2b090..0000000000
--- a/assets/icons/debug.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.44727 2.19177L6.38617 3.11055" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.64722 3.11055L10.553 2.19177" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5.66298 6.07369L5.66298 5.10997C5.64886 4.80689 5.69884 4.50419 5.80993 4.22016C5.92101 3.93613 6.09088 3.67665 6.3093 3.45738C6.52771 3.23811 6.79013 3.0636 7.08074 2.94437C7.37134 2.82514 7.68409 2.76367 8.00011 2.76367C8.31614 2.76367 8.62889 2.82514 8.91949 2.94437C9.21008 3.0636 9.4725 3.23811 9.69092 3.45738C9.90933 3.67665 10.0792 3.93613 10.1903 4.22016C10.3014 4.50419 10.3514 4.80689 10.3373 5.10997V6.07369" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8.00017 13.1366C6.09924 13.1366 4.54395 11.6686 4.54395 9.87441V8.24333C4.54395 7.66653 4.7867 7.11337 5.21882 6.70552C5.65092 6.29767 6.237 6.06854 6.8481 6.06854H9.15225C9.76335 6.06854 10.3494 6.29767 10.7815 6.70552C11.2136 7.11337 11.4564 7.66653 11.4564 8.24333V9.87441C11.4564 11.6686 9.9011 13.1366 8.00017 13.1366Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M4.54343 6.22415C3.43167 6.10894 2.51001 5.12967 2.51001 3.91998" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M4.54367 8.83472H2.2395" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M2.35449 13.4175C2.35449 12.2078 3.33376 11.1709 4.54345 11.1134" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13.1673 3.91998C13.1673 5.12967 12.2455 6.10894 11.1511 6.22415" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13.7605 8.83472H11.4563" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11.4563 11.1134C12.666 11.1709 13.6453 12.2078 13.6453 13.4175" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/debug_breakpoint.svg b/assets/icons/debug_breakpoint.svg
deleted file mode 100644
index c09a3c159f..0000000000
--- a/assets/icons/debug_breakpoint.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 14C11.3137 14 14 11.3137 14 8C14 4.68629 11.3137 2 8 2C4.68629 2 2 4.68629 2 8C2 11.3137 4.68629 14 8 14Z" fill="black" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/debug_continue.svg b/assets/icons/debug_continue.svg
deleted file mode 100644
index f03a8b2364..0000000000
--- a/assets/icons/debug_continue.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M4.167 3v10M7.167 3l6 5-6 5V3Z"/></svg>
diff --git a/assets/icons/debug_detach.svg b/assets/icons/debug_detach.svg
deleted file mode 100644
index 8b34845571..0000000000
--- a/assets/icons/debug_detach.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><g stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" clip-path="url(#a)"><path d="m13 3 2-2M1 15l2-2M4.202 13.53a1.598 1.598 0 0 0 2.266 0L8 11.997 4.003 8 2.47 9.532a1.6 1.6 0 0 0 0 2.265l1.732 1.733ZM5 9l1.5-1.5M7 11l1.5-1.5M8 4.003 11.997 8l1.533-1.532a1.599 1.599 0 0 0 0-2.266L11.798 2.47a1.598 1.598 0 0 0-2.266 0L8 4.003Z"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h16v16H0z"/></clipPath></defs></svg>
diff --git a/assets/icons/debug_disabled_breakpoint.svg b/assets/icons/debug_disabled_breakpoint.svg
deleted file mode 100644
index 9a7c896f47..0000000000
--- a/assets/icons/debug_disabled_breakpoint.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 14C11.3137 14 14 11.3137 14 8C14 4.68629 11.3137 2 8 2C4.68629 2 2 4.68629 2 8C2 11.3137 4.68629 14 8 14Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/debug_disabled_log_breakpoint.svg b/assets/icons/debug_disabled_log_breakpoint.svg
deleted file mode 100644
index f477f4f32d..0000000000
--- a/assets/icons/debug_disabled_log_breakpoint.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11.8889 2H4.11111C3.49746 2 3 2.59695 3 3.33333V12.6667C3 13.403 3.49746 14 4.11111 14H11.8889C12.5025 14 13 13.403 13 12.6667V3.33333C13 2.59695 12.5025 2 11.8889 2Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9 6H6" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10 10H6" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/debug_ignore_breakpoints.svg b/assets/icons/debug_ignore_breakpoints.svg
deleted file mode 100644
index bc95329c7a..0000000000
--- a/assets/icons/debug_ignore_breakpoints.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2 2L14 14M5.81044 2.41392C6.89676 1.98976 8.08314 1.89138 9.22449 2.13079C10.3658 2.37021 11.4127 2.93705 12.237 3.76199C13.0613 4.58693 13.6273 5.6342 13.8658 6.77573C14.1044 7.91727 14.0051 9.10357 13.5801 10.1896M12.2484 12.2484C11.1176 13.3558 9.59562 13.9724 8.01292 13.9642C6.43021 13.956 4.91467 13.3236 3.79552 12.2045C2.67636 11.0853 2.044 9.56979 2.03578 7.98708C2.02757 6.40438 2.64417 4.88236 3.75165 3.75165" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/debug_log_breakpoint.svg b/assets/icons/debug_log_breakpoint.svg
deleted file mode 100644
index 22eae9d029..0000000000
--- a/assets/icons/debug_log_breakpoint.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11.8887 1.25C13.0386 1.25 13.7498 2.31634 13.75 3.33301V12.667C13.7499 13.6836 13.0386 14.75 11.8887 14.75H4.11133C2.96134 14.75 2.25014 13.6836 2.25 12.667V3.33301C2.25015 2.31635 2.96136 1.25 4.11133 1.25H11.8887ZM6 9.25C5.58579 9.25 5.25 9.58579 5.25 10C5.25 10.4142 5.58579 10.75 6 10.75H10C10.4142 10.75 10.75 10.4142 10.75 10C10.75 9.58579 10.4142 9.25 10 9.25H6ZM6 5.25C5.58579 5.25 5.25 5.58579 5.25 6C5.25 6.41421 5.58579 6.75 6 6.75H9C9.41421 6.75 9.75 6.41421 9.75 6C9.75 5.58579 9.41421 5.25 9 5.25H6Z" fill="black"/>
-</svg>
diff --git a/assets/icons/debug_pause.svg b/assets/icons/debug_pause.svg
deleted file mode 100644
index 65e1949581..0000000000
--- a/assets/icons/debug_pause.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.5 4H9.5C9.22386 4 9 4.22386 9 4.5V11.5001C9 11.7762 9.22386 12.0001 9.5 12.0001H10.5C10.7762 12.0001 11 11.7762 11 11.5001V4.5C11 4.22386 10.7762 4 10.5 4Z" fill="black" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6.50001 4H5.5C5.22386 4 5 4.22386 5 4.5V11.5001C5 11.7762 5.22386 12.0001 5.5 12.0001H6.50001C6.77616 12.0001 7.00002 11.7762 7.00002 11.5001V4.5C7.00002 4.22386 6.77616 4 6.50001 4Z" fill="black" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/debug_step_into.svg b/assets/icons/debug_step_into.svg
deleted file mode 100644
index 0a58823543..0000000000
--- a/assets/icons/debug_step_into.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2 13H5" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11 13H14" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11.5 8.5L8 12M8 12L4.5 8.5M8 12L8 3" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/debug_step_out.svg b/assets/icons/debug_step_out.svg
deleted file mode 100644
index c128f56111..0000000000
--- a/assets/icons/debug_step_out.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.5 6.5L8 3M8 3L11.5 6.5M8 3V12" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M2 13H5" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11 13H14" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/debug_step_over.svg b/assets/icons/debug_step_over.svg
deleted file mode 100644
index 5d8ccd5b7a..0000000000
--- a/assets/icons/debug_step_over.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2 11.333C2.00118 10.1752 2.33729 9.04258 2.96777 8.07159C3.59826 7.10059 4.49621 6.33274 5.55331 5.86064C6.61041 5.38853 7.78152 5.23235 8.9254 5.41091C10.0693 5.58947 11.1371 6.09516 12 6.86698L13 7.76698" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M14 4.66699V8.66699H10" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7 13H10" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/diff.svg b/assets/icons/diff.svg
deleted file mode 100644
index 9d93b2d5b4..0000000000
--- a/assets/icons/diff.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M8 3v8M4 7h8M4 13h8"/></svg>
diff --git a/assets/icons/disconnected.svg b/assets/icons/disconnected.svg
deleted file mode 100644
index 47bd1db478..0000000000
--- a/assets/icons/disconnected.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="m2 2 12 12M4.269 4.27a4.2 4.2 0 0 0 1.93 7.93h5.1c.267 0 .53-.039.785-.116M13.72 10.7a2.699 2.699 0 0 0-2.42-3.9h-1.074A4.204 4.204 0 0 0 6.8 3.842"/></svg>
diff --git a/assets/icons/download.svg b/assets/icons/download.svg
deleted file mode 100644
index 6c105d3fd7..0000000000
--- a/assets/icons/download.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M13 9.667v2.222A1.111 1.111 0 0 1 11.889 13H4.11A1.111 1.111 0 0 1 3 11.889V9.667M5.222 6.889 8 9.667l2.778-2.778M8 9.667V3"/></svg>
diff --git a/assets/icons/editor_atom.svg b/assets/icons/editor_atom.svg
deleted file mode 100644
index cc5fa83843..0000000000
--- a/assets/icons/editor_atom.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.18462 2.1437C6.38492 2.13508 6.58308 2.16739 6.77046 2.23631C7.18077 2.37739 7.56415 2.58524 7.90662 2.85016L7.97446 2.90401L7.97877 2.90724L7.98308 2.91155C8.05388 2.97424 8.10539 3.05578 8.1316 3.14664C8.15781 3.23751 8.15763 3.33395 8.1311 3.42472C8.10457 3.51549 8.05277 3.59685 7.98175 3.65929C7.91073 3.72173 7.82342 3.7627 7.73 3.77739C7.60531 3.79735 7.47768 3.76967 7.37246 3.69985L7.36169 3.69339L7.352 3.68585C7.08527 3.46715 6.78291 3.29594 6.45815 3.1797H6.45385L6.44954 3.17647C6.31942 3.12443 6.17447 3.12328 6.04354 3.17324C5.92077 3.23893 5.80662 3.39293 5.73877 3.68585C5.67415 3.9637 5.66123 4.33308 5.70431 4.77785L5.71292 4.86831C5.73015 5.02662 5.756 5.19355 5.78831 5.36693C6.21046 5.30985 6.63585 5.27216 7.06123 5.25385C7.66005 4.49455 8.34772 3.80977 9.10954 3.21416H9.11169L9.11277 3.21201C9.62754 2.82431 10.1358 2.54647 10.6075 2.41508C11.0792 2.28585 11.5358 2.29878 11.9149 2.52924L11.9214 2.53247L11.9289 2.53785C12.1083 2.66378 12.26 2.82503 12.3748 3.01169C12.4897 3.19836 12.5651 3.40652 12.5966 3.62339C12.6763 4.12524 12.658 4.6357 12.5428 5.13108C12.5148 5.25866 12.4379 5.37014 12.3285 5.44146C12.2191 5.51279 12.086 5.53823 11.958 5.51232C11.8299 5.48673 11.7169 5.41198 11.6432 5.30408C11.5695 5.19619 11.541 5.06373 11.5638 4.93508L11.5649 4.92862L11.5671 4.92216C11.6554 4.55385 11.6726 4.17262 11.6198 3.79678V3.79139C11.6101 3.70973 11.5843 3.6308 11.5441 3.5591C11.5038 3.4874 11.4498 3.42435 11.3851 3.37355C11.2709 3.30893 11.0792 3.29278 10.782 3.39185C10.4848 3.49308 10.1229 3.6977 9.72231 3.99924C9.23769 4.37724 8.78969 4.79616 8.37939 5.2517L8.472 5.25601H8.64646C10.3286 5.34108 11.8643 5.68031 12.9822 6.15416C13.5788 6.40724 14.0742 6.71201 14.4198 7.05878C14.7645 7.40555 14.9734 7.81155 14.9605 8.25632V8.28862L14.9583 8.30585C14.9012 8.70216 14.6998 9.06293 14.3929 9.32139C14.0527 9.61541 13.6624 9.84594 13.2406 10.002L13.2385 10.0031L13.2352 10.0042C13.113 10.0508 12.9774 10.0478 12.8573 9.99594C12.7372 9.94404 12.6421 9.84729 12.5923 9.72632C12.5675 9.66555 12.5551 9.60047 12.5556 9.53485C12.5562 9.46923 12.5698 9.40438 12.5957 9.34406C12.6215 9.28375 12.6591 9.22917 12.7062 9.18349C12.7533 9.13782 12.8091 9.10196 12.8702 9.07801L12.8723 9.07693L12.8755 9.07585C13.1866 8.96224 13.4748 8.79373 13.7263 8.57832L13.7317 8.57401C13.8477 8.48055 13.9283 8.3502 13.96 8.20462C13.9578 8.06785 13.8738 7.89232 13.6445 7.6877C13.4097 7.47878 13.0522 7.2677 12.5891 7.07062C11.5875 6.64416 10.1714 6.33508 8.58185 6.25216L8.42246 6.24462C8.13169 6.23278 7.84523 6.22847 7.56523 6.23278C7.36815 6.49447 7.17431 6.76908 6.98585 7.05447C6.82862 7.29355 6.68215 7.53262 6.54646 7.77278C6.64985 8.01508 6.76723 8.26278 6.89108 8.51262L6.95354 8.63539L7.01815 8.76462L7.08708 8.89601C7.79785 10.2432 8.63785 11.3535 9.41 12.0632L9.47892 12.1257C9.82354 12.4315 10.1402 12.6459 10.4105 12.7643C10.7034 12.8925 10.9005 12.8892 11.0254 12.8268C11.1535 12.7622 11.2666 12.6146 11.3334 12.3292C11.398 12.0439 11.4088 11.6594 11.3592 11.1877C11.2548 10.1635 10.8574 8.85293 10.1854 7.4917C10.1441 7.41731 10.1225 7.33357 10.1228 7.24847C10.1231 7.16338 10.1452 7.07979 10.187 7.00567C10.2288 6.93156 10.2889 6.86941 10.3616 6.82516C10.4343 6.78091 10.5171 6.75604 10.6022 6.75293C10.7033 6.74858 10.8035 6.77481 10.8896 6.82822C10.9756 6.88162 11.0436 6.95971 11.0846 7.05232C11.7997 8.50939 12.2369 9.9417 12.3554 11.0843L12.3662 11.1974C12.4146 11.7649 12.3823 12.2775 12.2552 12.6997C12.1185 13.1531 11.8675 13.5192 11.4755 13.7163C11.0814 13.9155 10.6215 13.8919 10.1595 13.7228C9.69646 13.5526 9.21185 13.2295 8.73369 12.7891C7.83985 11.9717 6.90292 10.7139 6.12539 9.20724L6.05539 9.0737C6.02206 9.01105 5.98975 8.94786 5.95846 8.88416C5.67991 9.47718 5.4592 10.0957 5.29939 10.7311C5.18631 11.2179 5.14862 11.6292 5.182 11.9405C5.21431 12.2474 5.308 12.4154 5.41569 12.494C5.57497 12.5715 5.75838 12.5831 5.92615 12.5263L5.93046 12.5242L5.93477 12.5231C6.32892 12.4046 6.69938 12.2162 7.02569 11.9674L7.02892 11.9652L7.03215 11.9631C7.1128 11.9068 7.2082 11.8755 7.30649 11.873C7.40478 11.8705 7.50164 11.897 7.58504 11.9491C7.66844 12.0011 7.7347 12.0766 7.77559 12.166C7.81649 12.2554 7.83022 12.3549 7.81508 12.452C7.79318 12.5801 7.72206 12.6945 7.61692 12.7708C7.19288 13.0899 6.71454 13.3296 6.20508 13.4783C5.9881 13.5469 5.75927 13.5699 5.53298 13.5458C5.30668 13.5217 5.08782 13.4511 4.89015 13.3383L4.88262 13.3351L4.87615 13.3308C4.50246 13.0831 4.29677 12.6739 4.21815 12.1892C4.13954 11.7079 4.18369 11.1317 4.32908 10.5049V10.5028L4.33015 10.4995C4.57892 9.5217 4.95369 8.57939 5.44369 7.69632C5.28877 7.30626 5.15221 6.90916 5.03446 6.50632C4.84062 6.55047 4.64892 6.60324 4.45938 6.66139C3.992 6.80893 3.628 6.98016 3.38246 7.16108C3.13585 7.34416 3.04538 7.50785 3.03785 7.63924V7.64462C3.03602 7.78511 3.08628 7.9213 3.17892 8.02693L3.19831 8.04847L3.20046 8.04955C3.42769 8.2897 3.698 8.48678 3.99738 8.62893L4.00169 8.63108L4.00492 8.63216C4.12207 8.69325 4.21032 8.79816 4.25046 8.92403C4.2906 9.0499 4.27938 9.18653 4.21923 9.30416C4.15875 9.42078 4.0547 9.50882 3.92967 9.54915C3.80465 9.58948 3.66876 9.57884 3.55154 9.51955C3.13909 9.32129 2.76757 9.04731 2.45631 8.71185C2.31763 8.5645 2.20934 8.39127 2.13765 8.20205C2.06595 8.01283 2.03225 7.81134 2.03846 7.60908V7.60478C2.06 7.16108 2.30338 6.78093 2.67385 6.47185C3.04323 6.16493 3.55369 5.91508 4.15785 5.72447H4.15892C4.37108 5.6577 4.58646 5.60062 4.80292 5.55108C4.76706 5.3627 4.73832 5.17302 4.71677 4.98247C4.64785 4.35678 4.67154 3.79031 4.80723 3.32939C4.94292 2.86631 5.19708 2.49047 5.59554 2.28908L5.59985 2.28693L5.602 2.28585C5.78508 2.1997 5.98323 2.15231 6.18462 2.1437ZM8.65077 7.02108C8.82432 7.03989 8.98969 7.10471 9.1298 7.20884C9.2699 7.31297 9.37965 7.45263 9.44769 7.61339C9.52152 7.79086 9.54067 7.98633 9.50268 8.17474C9.46469 8.36316 9.37129 8.53594 9.23446 8.67093C9.09777 8.80552 8.9245 8.89694 8.73624 8.93378C8.54797 8.97063 8.35303 8.95129 8.17568 8.87817C7.99832 8.80505 7.8464 8.68138 7.73881 8.52255C7.63122 8.36372 7.57273 8.17676 7.57062 7.98493C7.5697 7.79262 7.62633 7.60444 7.73322 7.44457C7.84012 7.28471 7.99239 7.16048 8.17046 7.08785C8.28896 7.03888 8.41593 7.01363 8.54415 7.01355H8.64323L8.65077 7.02108ZM6.29662 6.30493C6.20891 6.31433 6.12131 6.32474 6.03385 6.33616C6.05754 6.41908 6.08339 6.50201 6.11031 6.58708L6.15985 6.50955L6.29662 6.30493Z" fill="black"/>
-</svg>
diff --git a/assets/icons/editor_cursor.svg b/assets/icons/editor_cursor.svg
deleted file mode 100644
index e20013917d..0000000000
--- a/assets/icons/editor_cursor.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.2806 4.66818L8.26042 1.76982C8.09921 1.67673 7.9003 1.67673 7.73909 1.76982L2.71918 4.66818C2.58367 4.74642 2.5 4.89112 2.5 5.04785V10.8924C2.5 11.0489 2.58367 11.1938 2.71918 11.2721L7.73934 14.1704C7.90054 14.2635 8.09946 14.2635 8.26066 14.1704L13.2808 11.2721C13.4163 11.1938 13.5 11.0491 13.5 10.8924V5.04785C13.5 4.89136 13.4163 4.74642 13.2808 4.66818H13.2806ZM12.9653 5.28212L8.11901 13.676C8.08626 13.7326 7.99977 13.7095 7.99977 13.6439V8.14771C7.99977 8.03788 7.94107 7.9363 7.84586 7.88115L3.08613 5.13317C3.02957 5.10041 3.05266 5.0139 3.11818 5.0139H12.8106C12.9483 5.0139 13.0343 5.1631 12.9655 5.28236H12.9653V5.28212Z" fill="#C4CAD4"/>
-</svg>
diff --git a/assets/icons/editor_emacs.svg b/assets/icons/editor_emacs.svg
deleted file mode 100644
index 951d7b2be1..0000000000
--- a/assets/icons/editor_emacs.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_2716_663)">
-<path d="M8.47552 2.45453C11.5167 2.45457 13.9814 4.94501 13.9814 8.01623C13.9814 11.0875 11.5167 13.578 8.47552 13.5781C5.43427 13.5781 2.96948 11.0875 2.96948 8.01623C2.9695 4.94498 5.43429 2.45453 8.47552 2.45453ZM10.8795 4.70348C10.7605 4.16887 10.1328 3.85468 9.53627 3.96342C8.97622 4.06552 7.62871 4.45681 7.62057 4.45916C9.29414 4.44469 9.57429 4.4726 9.69939 4.64751C9.77324 4.7508 9.66576 4.89248 9.21944 4.96538C8.73515 5.04447 7.73014 5.13958 7.72343 5.14022C6.75441 5.19776 6.07177 5.20168 5.86705 5.63512C5.73334 5.91827 6.00968 6.16857 6.13082 6.32527C6.64271 6.89455 7.38215 7.20158 7.85809 7.42767C8.03716 7.51274 8.56257 7.67345 8.56257 7.67345C7.01855 7.58853 5.90474 8.06267 5.2514 8.60855C4.51246 9.29204 4.83937 10.1067 6.35327 10.6084C7.24742 10.9047 7.69094 11.0439 9.02473 10.9238C9.81031 10.8815 9.9342 10.9068 9.94203 10.9712C9.95275 11.062 9.06932 11.2874 8.82812 11.357C8.21455 11.534 6.60645 11.8913 6.59758 11.8932C6.60115 11.8935 7.06249 11.9257 7.65531 11.8735C7.89632 11.8522 8.81142 11.7624 9.49557 11.6123C9.49557 11.6123 10.3297 11.4338 10.7759 11.2693C11.2429 11.0973 11.497 10.9512 11.6113 10.7443C11.6063 10.7019 11.6465 10.5516 11.4313 10.4613C10.8807 10.2304 10.2423 10.2721 8.9789 10.2453C7.57789 10.1972 7.11184 9.9626 6.86356 9.77373C6.62548 9.58212 6.74518 9.05204 7.76528 8.5851C8.27917 8.33646 10.2935 7.87759 10.2935 7.87759C9.61511 7.54227 8.35014 6.95284 8.09005 6.82552C7.86199 6.71388 7.49701 6.54572 7.4179 6.34233C7.32824 6.14709 7.6297 5.97888 7.79813 5.9307C8.34057 5.77424 9.10635 5.67701 9.8033 5.66609C10.1536 5.66061 10.2105 5.63806 10.2105 5.63806C10.6939 5.55787 11.0121 5.22722 10.8795 4.70348Z" fill="black"/>
-</g>
-<defs>
-<clipPath id="clip0_2716_663">
-<rect width="12" height="12" fill="white" transform="translate(2.5 2)"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/assets/icons/editor_jet_brains.svg b/assets/icons/editor_jet_brains.svg
deleted file mode 100644
index 7d9cf0c65c..0000000000
--- a/assets/icons/editor_jet_brains.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.6725 13.9985C3.36161 13.9982 3.06354 13.8746 2.84371 13.6548C2.62388 13.435 2.50026 13.1369 2.5 12.826V7.494C2.5 6.8325 2.7675 6.185 3.2365 5.7165L6.219 2.736C6.45192 2.50247 6.72867 2.31724 7.03335 2.19094C7.33804 2.06464 7.66467 1.99975 7.9945 2H13.3275C13.6384 2.00027 13.9365 2.12388 14.1563 2.34371C14.3761 2.56354 14.4997 2.86162 14.5 3.1725V8.5045C14.4983 9.17074 14.2336 9.80936 13.7635 10.2815L10.781 13.264C10.5477 13.4976 10.2706 13.6829 9.96561 13.8092C9.66059 13.9355 9.33364 14.0003 9.0035 14V13.9985H3.6725ZM8.157 10.5715H5.243V11.257H8.157V10.5715ZM4.4815 5.257H11.243V12.0165L13.3715 9.888C13.7373 9.52036 13.9433 9.02316 13.9445 8.5045V3.1725C13.9445 2.8335 13.6685 2.5555 13.3275 2.5555H7.9945C7.73753 2.55499 7.483 2.6053 7.24556 2.70356C7.00813 2.80181 6.79246 2.94606 6.611 3.128L4.4815 5.257ZM4.3855 5.353L3.628 6.11C3.26258 6.47809 3.0569 6.97533 3.0555 7.494V12.826C3.0555 13.165 3.3315 13.443 3.6725 13.443H9.0055C9.26249 13.4434 9.51701 13.3929 9.75445 13.2946C9.99188 13.1963 10.2075 13.052 10.389 12.87L11.145 12.1145H4.3855V5.353Z" fill="black"/>
-</svg>
diff --git a/assets/icons/editor_sublime.svg b/assets/icons/editor_sublime.svg
deleted file mode 100644
index 95a04f6b54..0000000000
--- a/assets/icons/editor_sublime.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M13.0945 8.01611C13.0945 7.87619 12.9911 7.79551 12.8642 7.8356L4.13456 10.6038C4.00742 10.6441 3.90427 10.7904 3.90427 10.9301V13.7593C3.90427 13.8992 4.00742 13.9801 4.13456 13.9398L12.8642 11.1719C12.9911 11.1315 13.0945 10.9852 13.0945 10.8453V8.01611Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M3.90427 7.92597C3.90427 8.06588 4.00742 8.21218 4.13456 8.25252L12.8655 11.0209C12.9926 11.0613 13.0958 10.9803 13.0958 10.8407V8.01124C13.0958 7.87158 12.9926 7.72529 12.8655 7.68494L4.13456 4.91652C4.00742 4.87618 3.90427 4.95686 3.90427 5.09677V7.92597Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M13.0945 2.20248C13.0945 2.06256 12.9911 1.98163 12.8642 2.02197L4.13456 4.78988C4.00742 4.83022 3.90427 4.97652 3.90427 5.11644V7.94563C3.90427 8.08554 4.00742 8.16622 4.13456 8.12614L12.8642 5.35797C12.9911 5.31763 13.0945 5.17133 13.0945 5.03167V2.20248Z" fill="black"/>
-</svg>
diff --git a/assets/icons/editor_vs_code.svg b/assets/icons/editor_vs_code.svg
deleted file mode 100644
index 2a71ad52af..0000000000
--- a/assets/icons/editor_vs_code.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M11.0094 13.9181C11.1984 13.9917 11.4139 13.987 11.6047 13.8952L14.0753 12.7064C14.3349 12.5814 14.5 12.3187 14.5 12.0305V3.9696C14.5 3.68136 14.3349 3.41862 14.0753 3.2937L11.6047 2.10485C11.3543 1.98438 11.0614 2.01389 10.8416 2.17363C10.8102 2.19645 10.7803 2.22193 10.7523 2.25001L6.02261 6.56498L3.96246 5.00115C3.77068 4.85558 3.50244 4.86751 3.32432 5.02953L2.66356 5.63059C2.44569 5.82877 2.44544 6.17152 2.66302 6.37004L4.44965 8.00001L2.66302 9.62998C2.44544 9.82849 2.44569 10.1713 2.66356 10.3694L3.32432 10.9705C3.50244 11.1325 3.77068 11.1444 3.96246 10.9989L6.02261 9.43504L10.7523 13.75C10.8271 13.8249 10.915 13.8812 11.0094 13.9181ZM11.5018 5.27587L7.91309 8.00001L11.5018 10.7241V5.27587Z" fill="black"/>
-</svg>
diff --git a/assets/icons/ellipsis.svg b/assets/icons/ellipsis.svg
deleted file mode 100644
index 22b5a8fd46..0000000000
--- a/assets/icons/ellipsis.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="3" cy="8" r="1" fill="black" stroke="black" stroke-width="0.5"/>
-<circle cx="8" cy="8" r="1" fill="black" stroke="black" stroke-width="0.5"/>
-<circle cx="13" cy="8" r="1" fill="black" stroke="black" stroke-width="0.5"/>
-</svg>
diff --git a/assets/icons/ellipsis_vertical.svg b/assets/icons/ellipsis_vertical.svg
deleted file mode 100644
index c38437667e..0000000000
--- a/assets/icons/ellipsis_vertical.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="8" cy="3" r="1" fill="black" stroke="black" stroke-width="0.5"/>
-<circle cx="8" cy="8" r="1" fill="black" stroke="black" stroke-width="0.5"/>
-<circle cx="8" cy="13" r="1" fill="black" stroke="black" stroke-width="0.5"/>
-</svg>
diff --git a/assets/icons/envelope.svg b/assets/icons/envelope.svg
deleted file mode 100644
index 273cc6de26..0000000000
--- a/assets/icons/envelope.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M13 4C13.5523 4 14 4.44772 14 5V11C14 11.5523 13.5523 12 13 12H3C2.44772 12 2 11.5523 2 11V5C2 4.44772 2.44772 4 3 4H13Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M13.5 5L7.9999 8.5L2.5 5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/eraser.svg b/assets/icons/eraser.svg
deleted file mode 100644
index ca6209785f..0000000000
--- a/assets/icons/eraser.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="m5.015 12.983-2.567-2.382c-.597-.554-.597-1.385 0-1.884L8.179 3.4c.597-.554 1.493-.554 2.03 0L13.552 6.5c.597.554.597 1.385 0 1.884l-4.955 4.598M14 12.983H5M4.5 7.483l5 5"/></svg>
diff --git a/assets/icons/escape.svg b/assets/icons/escape.svg
deleted file mode 100644
index 1898588a67..0000000000
--- a/assets/icons/escape.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M3 6V3h3M3 3l5 5M8 3a5 5 0 1 1-5 5"/></svg>
diff --git a/assets/icons/exit.svg b/assets/icons/exit.svg
deleted file mode 100644
index 3619a55c87..0000000000
--- a/assets/icons/exit.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.437 11.0461L13.4831 8L10.437 4.95392" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13 8L8 8" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6.6553 13.4659H4.21843C3.89528 13.4659 3.58537 13.3375 3.35687 13.109C3.12837 12.8805 3 12.5706 3 12.2475V3.71843C3 3.39528 3.12837 3.08537 3.35687 2.85687C3.58537 2.62837 3.89528 2.5 4.21843 2.5H6.6553" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/expand_down.svg b/assets/icons/expand_down.svg
deleted file mode 100644
index 9f85ee6720..0000000000
--- a/assets/icons/expand_down.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11.1998 9.60002L7.9998 12.8M7.9998 12.8L4.7998 9.60002M7.9998 12.8V6.40002" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5.33325 3.73334H10.6666" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-</svg>
diff --git a/assets/icons/expand_up.svg b/assets/icons/expand_up.svg
deleted file mode 100644
index 49b084fa8f..0000000000
--- a/assets/icons/expand_up.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.80005 6.93334L8.00005 3.73334M8.00005 3.73334L11.2 6.93334M8.00005 3.73334V10.1333" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5.3335 12.8H10.6668" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-</svg>
diff --git a/assets/icons/expand_vertical.svg b/assets/icons/expand_vertical.svg
deleted file mode 100644
index 5a5fa8ccb5..0000000000
--- a/assets/icons/expand_vertical.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><g stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" clip-path="url(#a)"><path d="M8 14.667v-4M8 5.333v-4M2.667 8H1.333M6.667 8H5.333M10.667 8H9.333M14.667 8h-1.334M10 12.667l-2 2-2-2M10 3.333l-2-2-2 2"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h16v16H0z"/></clipPath></defs></svg>
diff --git a/assets/icons/eye.svg b/assets/icons/eye.svg
deleted file mode 100644
index 327fa751e9..0000000000
--- a/assets/icons/eye.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2.0375 8.2088C1.9875 8.07409 1.9875 7.92592 2.0375 7.79122C2.5245 6.61039 3.35114 5.60076 4.41264 4.89031C5.47414 4.17986 6.72268 3.8006 7.99999 3.8006C9.2773 3.8006 10.5258 4.17986 11.5873 4.89031C12.6488 5.60076 13.4755 6.61039 13.9625 7.79122C14.0125 7.92592 14.0125 8.07409 13.9625 8.2088C13.4755 9.38962 12.6488 10.3993 11.5873 11.1097C10.5258 11.8202 9.2773 12.1994 7.99999 12.1994C6.72268 12.1994 5.47414 11.8202 4.41264 11.1097C3.35114 10.3993 2.5245 9.38962 2.0375 8.2088Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8.0001 9.79988C8.99416 9.79988 9.80001 8.99404 9.80001 7.99998C9.80001 7.00592 8.99416 6.20007 8.0001 6.20007C7.00604 6.20007 6.2002 7.00592 6.2002 7.99998C6.2002 8.99404 7.00604 9.79988 8.0001 9.79988Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/file.svg b/assets/icons/file.svg
deleted file mode 100644
index 60cf2537d9..0000000000
--- a/assets/icons/file.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M9.875 2H4.25c-.332 0-.65.126-.884.351-.234.226-.366.53-.366.849v9.6c0 .318.132.623.366.849.235.225.552.351.884.351h7.5c.332 0 .65-.127.884-.351.234-.225.366-.53.366-.85V5L9.875 2Z"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M9 2v2.667A1.333 1.333 0 0 0 10.333 6H13"/></svg>
diff --git a/assets/icons/file_code.svg b/assets/icons/file_code.svg
deleted file mode 100644
index 548d5a153b..0000000000
--- a/assets/icons/file_code.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M6.8 8.3 5.6 9.8l1.2 1.5M9.2 8.3l1.2 1.5-1.2 1.5M9.2 2v2.4a1.2 1.2 0 0 0 1.2 1.2h2.4"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M9.8 2H4.4a1.2 1.2 0 0 0-1.2 1.2v9.6A1.2 1.2 0 0 0 4.4 14h7.2a1.2 1.2 0 0 0 1.2-1.2V5l-3-3Z"/></svg>
diff --git a/assets/icons/file_diff.svg b/assets/icons/file_diff.svg
deleted file mode 100644
index 193dd7392f..0000000000
--- a/assets/icons/file_diff.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M9.8 2H4.4a1.2 1.2 0 0 0-1.2 1.2v9.6A1.2 1.2 0 0 0 4.4 14h7.2a1.2 1.2 0 0 0 1.2-1.2V5l-3-3ZM6.2 6.8h3.6M8 8.6V5M6.2 11h3.6"/></svg>
diff --git a/assets/icons/file_doc.svg b/assets/icons/file_doc.svg
deleted file mode 100644
index ccd5eeea01..0000000000
--- a/assets/icons/file_doc.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13 11V11.8374C13 11.9431 12.9665 12.046 12.9044 12.1315L12.1498 13.1691C12.0557 13.2985 11.9054 13.375 11.7454 13.375H4.25461C4.09464 13.375 3.94433 13.2985 3.85024 13.1691L3.09563 12.1315C3.03348 12.046 3 11.9431 3 11.8374V3" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-<path d="M3 13V11L8 12H13V13H3Z" fill="black"/>
-<path d="M6.63246 3.04418C7.44914 3.31641 8 4.08069 8 4.94155V11.7306C8 12.0924 7.62757 12.3345 7.29693 12.1875L3.79693 10.632C3.61637 10.5518 3.5 10.3727 3.5 10.1751V2.69374C3.5 2.35246 3.83435 2.11148 4.15811 2.2194L6.63246 3.04418Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.5 3C8.67157 3 8 3.67157 8 4.5V13C8 12.1954 11.2366 12.0382 12.5017 12.0075C12.7778 12.0008 13 11.7761 13 11.5V3.5C13 3.22386 12.7761 3 12.5 3H9.5Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/file_generic.svg b/assets/icons/file_generic.svg
deleted file mode 100644
index 790a5f18d7..0000000000
--- a/assets/icons/file_generic.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3 5H11" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-<path d="M3 8H13" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-<path d="M3 11H9" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-</svg>
diff --git a/assets/icons/file_git.svg b/assets/icons/file_git.svg
deleted file mode 100644
index 2b36b0ffd3..0000000000
--- a/assets/icons/file_git.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5 13C6.10457 13 7 12.1046 7 11C7 9.89543 6.10457 9 5 9C3.89543 9 3 9.89543 3 11C3 12.1046 3.89543 13 5 13Z" stroke="black" stroke-width="1.2"/>
-<path d="M11 7C12.1046 7 13 6.10457 13 5C13 3.89543 12.1046 3 11 3C9.89543 3 9 3.89543 9 5C9 6.10457 9.89543 7 11 7Z" fill="black" stroke="black" stroke-width="1.2"/>
-<path d="M4.625 3.625V8.375" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-<path d="M11 7C11 9.20914 9.20914 11 7 11" stroke="black" stroke-width="1.2"/>
-</svg>
diff --git a/assets/icons/file_icons/ai.svg b/assets/icons/file_icons/ai.svg
deleted file mode 100644
index 4236d50337..0000000000
--- a/assets/icons/file_icons/ai.svg
+++ /dev/null
@@ -1,27 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M10.5 8.75V10.5C8.43097 10.5 7.56903 10.5 5.5 10.5V10L10.5 6V5.5H5.5V7.25" stroke="black" stroke-width="1.2"/>
-    <path d="M1.5 8.5C1.77614 8.5 2 8.27614 2 8C2 7.72386 1.77614 7.5 1.5 7.5C1.22386 7.5 1 7.72386 1 8C1 8.27614 1.22386 8.5 1.5 8.5Z" fill="black"/>
-    <path d="M2.49976 6.33002C2.7759 6.33002 2.99976 6.10616 2.99976 5.83002C2.99976 5.55387 2.7759 5.33002 2.49976 5.33002C2.22361 5.33002 1.99976 5.55387 1.99976 5.83002C1.99976 6.10616 2.22361 6.33002 2.49976 6.33002Z" fill="black"/>
-    <path d="M2.49976 10.66C2.7759 10.66 2.99976 10.4361 2.99976 10.16C2.99976 9.88383 2.7759 9.65997 2.49976 9.65997C2.22361 9.65997 1.99976 9.88383 1.99976 10.16C1.99976 10.4361 2.22361 10.66 2.49976 10.66Z" fill="black"/>
-    <path d="M14.5 8.5C14.7761 8.5 15 8.27614 15 8C15 7.72386 14.7761 7.5 14.5 7.5C14.2239 7.5 14 7.72386 14 8C14 8.27614 14.2239 8.5 14.5 8.5Z" fill="black"/>
-    <path d="M13.5 6.33002C13.7761 6.33002 14 6.10616 14 5.83002C14 5.55387 13.7761 5.33002 13.5 5.33002C13.2239 5.33002 13 5.55387 13 5.83002C13 6.10616 13.2239 6.33002 13.5 6.33002Z" fill="black"/>
-    <path d="M13.5 10.66C13.7761 10.66 14 10.4361 14 10.16C14 9.88383 13.7761 9.65997 13.5 9.65997C13.2239 9.65997 13 9.88383 13 10.16C13 10.4361 13.2239 10.66 13.5 10.66Z" fill="black"/>
-    <path d="M7.99219 2C8.26833 2 8.49219 1.77614 8.49219 1.5C8.49219 1.22386 8.26833 1 7.99219 1C7.71605 1 7.49219 1.22386 7.49219 1.5C7.49219 1.77614 7.71605 2 7.99219 2Z" fill="black"/>
-    <path d="M5.5 3C5.77614 3 6 2.77614 6 2.5C6 2.22386 5.77614 2 5.5 2C5.22386 2 5 2.22386 5 2.5C5 2.77614 5.22386 3 5.5 3Z" fill="black"/>
-    <path d="M3.5 4C3.77614 4 4 3.77614 4 3.5C4 3.22386 3.77614 3 3.5 3C3.22386 3 3 3.22386 3 3.5C3 3.77614 3.22386 4 3.5 4Z" fill="black"/>
-    <path d="M3.49976 13C3.7759 13 3.99976 12.7761 3.99976 12.5C3.99976 12.2239 3.7759 12 3.49976 12C3.22361 12 2.99976 12.2239 2.99976 12.5C2.99976 12.7761 3.22361 13 3.49976 13Z" fill="black"/>
-    <path d="M1.5 12.5C1.77614 12.5 2 12.2761 2 12C2 11.7239 1.77614 11.5 1.5 11.5C1.22386 11.5 1 11.7239 1 12C1 12.2761 1.22386 12.5 1.5 12.5Z" fill="black"/>
-    <path d="M1.5 4.5C1.77614 4.5 2 4.27614 2 4C2 3.72386 1.77614 3.5 1.5 3.5C1.22386 3.5 1 3.72386 1 4C1 4.27614 1.22386 4.5 1.5 4.5Z" fill="black"/>
-    <path d="M14.5 12.5C14.7761 12.5 15 12.2761 15 12C15 11.7239 14.7761 11.5 14.5 11.5C14.2239 11.5 14 11.7239 14 12C14 12.2761 14.2239 12.5 14.5 12.5Z" fill="black"/>
-    <path d="M14.5 4.5C14.7761 4.5 15 4.27614 15 4C15 3.72386 14.7761 3.5 14.5 3.5C14.2239 3.5 14 3.72386 14 4C14 4.27614 14.2239 4.5 14.5 4.5Z" fill="black"/>
-    <path d="M3.49976 15C3.7759 15 3.99976 14.7761 3.99976 14.5C3.99976 14.2239 3.7759 14 3.49976 14C3.22361 14 2.99976 14.2239 2.99976 14.5C2.99976 14.7761 3.22361 15 3.49976 15Z" fill="black"/>
-    <path d="M3.5 2C3.77614 2 4 1.77614 4 1.5C4 1.22386 3.77614 1 3.5 1C3.22386 1 3 1.22386 3 1.5C3 1.77614 3.22386 2 3.5 2Z" fill="black"/>
-    <path d="M12.5 15C12.7761 15 13 14.7761 13 14.5C13 14.2239 12.7761 14 12.5 14C12.2239 14 12 14.2239 12 14.5C12 14.7761 12.2239 15 12.5 15Z" fill="black"/>
-    <path d="M12.5 2C12.7761 2 13 1.77614 13 1.5C13 1.22386 12.7761 1 12.5 1C12.2239 1 12 1.22386 12 1.5C12 1.77614 12.2239 2 12.5 2Z" fill="black"/>
-    <path d="M12.5 4C12.7761 4 13 3.77614 13 3.5C13 3.22386 12.7761 3 12.5 3C12.2239 3 12 3.22386 12 3.5C12 3.77614 12.2239 4 12.5 4Z" fill="black"/>
-    <path d="M12.5 13C12.7761 13 13 12.7761 13 12.5C13 12.2239 12.7761 12 12.5 12C12.2239 12 12 12.2239 12 12.5C12 12.7761 12.2239 13 12.5 13Z" fill="black"/>
-    <path d="M10.5 3C10.7761 3 11 2.77614 11 2.5C11 2.22386 10.7761 2 10.5 2C10.2239 2 10 2.22386 10 2.5C10 2.77614 10.2239 3 10.5 3Z" fill="black"/>
-    <path d="M8 15C8.27614 15 8.5 14.7761 8.5 14.5C8.5 14.2239 8.27614 14 8 14C7.72386 14 7.5 14.2239 7.5 14.5C7.5 14.7761 7.72386 15 8 15Z" fill="black"/>
-    <path d="M5.5 14C5.77614 14 6 13.7761 6 13.5C6 13.2239 5.77614 13 5.5 13C5.22386 13 5 13.2239 5 13.5C5 13.7761 5.22386 14 5.5 14Z" fill="black"/>
-    <path d="M10.5 14C10.7761 14 11 13.7761 11 13.5C11 13.2239 10.7761 13 10.5 13C10.2239 13 10 13.2239 10 13.5C10 13.7761 10.2239 14 10.5 14Z" fill="black"/>
-</svg>
diff --git a/assets/icons/file_icons/archive.svg b/assets/icons/file_icons/archive.svg
deleted file mode 100644
index fd3780164d..0000000000
--- a/assets/icons/file_icons/archive.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.4 3H2.6C2.26863 3 2 3.29848 2 3.66667V6.33333C2 6.70152 2.26863 7 2.6 7H13.4C13.7314 7 14 6.70152 14 6.33333V3.66667C14 3.29848 13.7314 3 13.4 3Z" fill="black"/>
-<path d="M4.35393 12.0822L3.59023 7.5H4.85401C4.78711 7.65312 4.75 7.82222 4.75 8C4.75 8.69036 5.30964 9.25 6 9.25H10C10.6904 9.25 11.25 8.69036 11.25 8C11.25 7.82222 11.2129 7.65312 11.146 7.5H12.4098L11.6461 12.0822C11.6059 12.3233 11.3973 12.5 11.1529 12.5H4.84713C4.60271 12.5 4.39411 12.3233 4.35393 12.0822Z" fill="black" stroke="black"/>
-</svg>
diff --git a/assets/icons/file_icons/astro.svg b/assets/icons/file_icons/astro.svg
deleted file mode 100644
index 0b95d64d92..0000000000
--- a/assets/icons/file_icons/astro.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M6.64076 13.2516C6.03572 12.7646 5.85909 11.7413 6.11118 11C6.54826 11.4674 7.15387 11.6155 7.78116 11.699C8.74955 11.828 9.70061 11.7798 10.6002 11.39C10.7031 11.3454 10.7982 11.2861 10.9107 11.226C10.9951 11.4416 11.0171 11.6593 10.9876 11.8809C10.9159 12.4205 10.6109 12.8373 10.1258 13.1533C9.93187 13.2797 9.72663 13.3927 9.5263 13.5119C8.91086 13.8781 8.74435 14.3076 8.97561 14.9324C8.98111 14.9476 8.98602 14.9628 8.99845 15C8.68422 14.8761 8.4547 14.6958 8.2798 14.4588C8.09509 14.2086 8.00721 13.9318 8.00259 13.6324C8.00028 13.4866 8.00028 13.3396 7.97802 13.1959C7.92367 12.8456 7.73692 12.6888 7.38512 12.6797C7.02407 12.6705 6.73847 12.867 6.66273 13.1765C6.65695 13.2003 6.64915 13.224 6.64076 13.2516Z" fill="#17191E"/>
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M6.30827 9.9337L7.7328 6.2643C7.82177 6.03515 8.17824 6.03515 8.26719 6.2643L9.69173 9.9337C9.69652 9.94603 9.70626 9.95619 9.7189 9.9622C9.80645 9.95762 9.89466 9.9553 9.98347 9.9553C10.8505 9.9553 11.6607 10.1766 12.3495 10.5604C12.5306 10.6613 12.7793 10.4649 12.7002 10.2733L9.83801 3.3343C9.75507 3.13321 9.54362 3 9.30739 3H6.69261C6.45638 3 6.24493 3.13321 6.16199 3.3343L3.29977 10.2733C3.22071 10.4649 3.46945 10.6613 3.65055 10.5604C4.3393 10.1766 5.14949 9.9553 6.01653 9.9553C6.10534 9.9553 6.19356 9.95762 6.2811 9.9622C6.29374 9.95619 6.30348 9.94603 6.30827 9.9337Z" fill="black"/>
-</svg>
diff --git a/assets/icons/file_icons/audio.svg b/assets/icons/file_icons/audio.svg
deleted file mode 100644
index 7948b04616..0000000000
--- a/assets/icons/file_icons/audio.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.5 6.66666V8.66666" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5.5 5V11" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7.5 3V13" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.5 5.33334V10" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11.5 4V12" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13.5 6.66666V8.66666" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/file_icons/book.svg b/assets/icons/file_icons/book.svg
deleted file mode 100644
index ccd5eeea01..0000000000
--- a/assets/icons/file_icons/book.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13 11V11.8374C13 11.9431 12.9665 12.046 12.9044 12.1315L12.1498 13.1691C12.0557 13.2985 11.9054 13.375 11.7454 13.375H4.25461C4.09464 13.375 3.94433 13.2985 3.85024 13.1691L3.09563 12.1315C3.03348 12.046 3 11.9431 3 11.8374V3" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-<path d="M3 13V11L8 12H13V13H3Z" fill="black"/>
-<path d="M6.63246 3.04418C7.44914 3.31641 8 4.08069 8 4.94155V11.7306C8 12.0924 7.62757 12.3345 7.29693 12.1875L3.79693 10.632C3.61637 10.5518 3.5 10.3727 3.5 10.1751V2.69374C3.5 2.35246 3.83435 2.11148 4.15811 2.2194L6.63246 3.04418Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.5 3C8.67157 3 8 3.67157 8 4.5V13C8 12.1954 11.2366 12.0382 12.5017 12.0075C12.7778 12.0008 13 11.7761 13 11.5V3.5C13 3.22386 12.7761 3 12.5 3H9.5Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/file_icons/bun.svg b/assets/icons/file_icons/bun.svg
deleted file mode 100644
index ca1ec900bc..0000000000
--- a/assets/icons/file_icons/bun.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M11.0426 5.32305L11.0426 5.32306L11.0457 5.32471C12.4534 6.05668 13.25 7.21804 13.25 8.42984C13.25 9.40862 12.7315 10.3471 11.7886 11.0652C10.845 11.7839 9.50819 12.25 8 12.25C6.49181 12.25 5.155 11.7839 4.21141 11.0652C3.2685 10.3471 2.75 9.40862 2.75 8.42984C2.75 7.21804 3.54655 6.05668 4.95426 5.32471L4.95427 5.32473L4.95849 5.3225C5.44976 5.06306 5.93128 4.79038 6.4063 4.50125C6.82126 4.25139 7.14467 4.05839 7.42857 3.92422C7.71398 3.78934 7.88783 3.75 8 3.75C8.28571 3.75 8.57685 3.89469 9.43489 4.41073L9.43488 4.41075L9.43944 4.41345C9.47377 4.43377 9.50881 4.45453 9.54456 4.47572C9.94472 4.71289 10.4345 5.00316 11.0426 5.32305Z" stroke="black" stroke-width="1.2"/>
-    <path d="M13 7C15.5 12.5 7.92993 15 3.92993 11" stroke="black" stroke-width="1.25"/>
-    <circle cx="6" cy="7.75" r="1" fill="black"/>
-    <circle cx="10" cy="7.75" r="1" fill="black"/>
-    <path d="M9.5 9.4C9.5 10.2837 8.32812 11 8 11C7.67188 11 6.5 10.2837 6.5 9.4C6.5 8.84374 9.5 8.85938 9.5 9.4Z" fill="black"/>
-    <path d="M9 4C8.33333 4.5 6.6 5.4 5 5" stroke="black" stroke-width="1.25"/>
-</svg>
diff --git a/assets/icons/file_icons/c.svg b/assets/icons/file_icons/c.svg
deleted file mode 100644
index dab784fef1..0000000000
--- a/assets/icons/file_icons/c.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_1791_43)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M13.8473 4.79901C13.7531 4.63587 13.6232 4.4934 13.4803 4.4109L8.51958 1.54683C8.23382 1.38181 7.76613 1.38181 7.48037 1.54683L2.51961 4.4109C2.2338 4.57587 2 4.98089 2 5.31089V11.0391C2 11.2041 2.05864 11.3879 2.15283 11.551C2.24699 11.7141 2.37691 11.8566 2.51977 11.939L7.48053 14.8031C7.7663 14.9681 8.23398 14.9681 8.51974 14.8031L13.4805 11.939C13.6234 11.8565 13.7532 11.714 13.8473 11.5509C13.9415 11.3878 14 11.204 14 11.039V5.31085C14 5.14583 13.9415 4.96211 13.8473 4.79901ZM4 8.175C4 10.3806 5.79438 12.175 7.99998 12.175C9.42327 12.175 10.7506 11.4091 11.464 10.1761L9.73295 9.17441C9.37586 9.79162 8.71182 10.175 7.99998 10.175C6.89716 10.175 5.99999 9.27778 5.99999 8.175C5.99999 7.07218 6.89716 6.17501 7.99998 6.17501C8.71174 6.17501 9.37578 6.55838 9.73284 7.17548L11.4639 6.17375C10.7505 4.9409 9.42319 4.17502 7.99998 4.17502C5.79438 4.17502 4 5.9694 4 8.175Z" fill="black"/>
-</g>
-<defs>
-<clipPath id="clip0_1791_43">
-<rect width="11.9999" height="13.5039" fill="white" transform="translate(2 1.42307)"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/assets/icons/file_icons/cairo.svg b/assets/icons/file_icons/cairo.svg
deleted file mode 100644
index dcf77c6fbf..0000000000
--- a/assets/icons/file_icons/cairo.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.51298 2C5.19374 2 2.5 4.6945 2.5 8.01298C2.5 9.41828 2.99491 10.7205 3.80143 11.7485C4.45214 10.8243 5.15479 9.95214 6.03997 9.23651C6.06594 9.21054 6.13086 9.17159 6.20876 9.11965C6.57307 8.84623 6.8335 8.44297 6.89842 7.98702V7.97403C7.11991 6.50306 7.71869 5.99593 9.3974 5.99593C9.54099 5.99593 9.70978 5.99593 9.86558 6.00891C10.7248 6.04786 11.2189 6.29532 11.2709 6.42515C11.3098 6.49007 11.2968 6.56874 11.2839 6.64664L11.2189 6.63366C10.6851 6.56874 9.87856 6.72454 9.76171 7.31034C9.69679 7.63569 9.77469 8 9.80066 8.32536C9.83961 8.6637 9.86558 9.01502 9.86558 9.35336C9.86558 9.37933 9.83961 9.50916 9.86558 9.52215C8.95443 8.64995 6.84572 9.74364 6.18203 10.2248C6.24695 10.1988 6.31263 10.1729 6.39053 10.1469C7.02826 9.92541 8.94145 9.35336 9.68304 9.99109C10.3078 10.7587 9.74796 12.1777 9.27979 12.8803C9.00636 13.2966 8.66802 13.6739 8.29073 14H8.51222C11.8315 14 14.5252 11.3055 14.5252 7.98702C14.5252 4.66853 11.8452 2 8.51298 2ZM9.20265 5.25356C8.55193 5.25356 8.01808 4.7197 8.01808 4.06899C8.01808 3.41828 8.55193 2.88442 9.20265 2.88442C9.85336 2.88442 10.3872 3.41828 10.3872 4.06899C10.3872 4.7197 9.86634 5.25356 9.20265 5.25356Z" fill="black"/>
-</svg>
diff --git a/assets/icons/file_icons/camera.svg b/assets/icons/file_icons/camera.svg
deleted file mode 100644
index b040935583..0000000000
--- a/assets/icons/file_icons/camera.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M13.4 12.5C13.7313 12.5 14 12.2201 14 11.875V5.85C14 5.50483 13.7313 5.225 13.4 5.225H11.079C10.8618 5.225 10.6616 5.10275 10.5554 4.90535L9.97183 3.81965C9.86571 3.62225 9.66549 3.5 9.4483 3.5H6.5517C6.33451 3.5 6.13429 3.62225 6.02817 3.81965L5.44455 4.90535C5.33845 5.10275 5.13822 5.225 4.92104 5.225H2.6C2.26863 5.225 2 5.50483 2 5.85V11.875C2 12.2201 2.26863 12.5 2.6 12.5H13.4ZM10 8.5C10 9.60457 9.10457 10.5 8 10.5C6.89543 10.5 6 9.60457 6 8.5C6 7.39543 6.89543 6.5 8 6.5C9.10457 6.5 10 7.39543 10 8.5Z" fill="black"/>
-</svg>
diff --git a/assets/icons/file_icons/chevron_down.svg b/assets/icons/file_icons/chevron_down.svg
deleted file mode 100644
index 9918f6c9f7..0000000000
--- a/assets/icons/file_icons/chevron_down.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.63281 6.66406L7.99344 9.89844L11.3672 6.66406" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/file_icons/chevron_left.svg b/assets/icons/file_icons/chevron_left.svg
deleted file mode 100644
index 3299ee7168..0000000000
--- a/assets/icons/file_icons/chevron_left.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.35938 4.63281L6.125 7.99344L9.35938 11.3672" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/file_icons/chevron_right.svg b/assets/icons/file_icons/chevron_right.svg
deleted file mode 100644
index 140f644127..0000000000
--- a/assets/icons/file_icons/chevron_right.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.64062 4.64062L9.89062 8.00125L6.64062 11.375" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/file_icons/chevron_up.svg b/assets/icons/file_icons/chevron_up.svg
deleted file mode 100644
index ae8c12a989..0000000000
--- a/assets/icons/file_icons/chevron_up.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.63281 9.36719L7.99344 6.13281L11.3672 9.36719" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/file_icons/code.svg b/assets/icons/file_icons/code.svg
deleted file mode 100644
index af2f6c5dc0..0000000000
--- a/assets/icons/file_icons/code.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.78125 3C3.90625 3 3.90625 4.5 3.90625 5.5C3.90625 6.5 3.40625 7.50106 2.40625 8C3.40625 8.50106 3.90625 9.5 3.90625 10.5C3.90625 11.5 3.90625 13 5.78125 13" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10.2422 3C12.1172 3 12.1172 4.5 12.1172 5.5C12.1172 6.5 12.6172 7.50106 13.6172 8C12.6172 8.50106 12.1172 9.5 12.1172 10.5C12.1172 11.5 12.1172 13 10.2422 13" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/file_icons/coffeescript.svg b/assets/icons/file_icons/coffeescript.svg
deleted file mode 100644
index e91d187615..0000000000
--- a/assets/icons/file_icons/coffeescript.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M13.3061 6.5778C11.2118 7.65229 5.59818 7.64305 3.55456 6.49718C3.34826 6.38151 3.00857 6.53238 3.02549 6.76829C3.25878 10.0209 5.09256 13 8.49998 13C11.8648 13 13.6714 10.1058 13.9591 6.91373C13.9819 6.66029 13.5325 6.46164 13.3061 6.5778Z" fill="black"/>
-    <path d="M10.0555 5.53646C10.4444 6.0547 11.9998 6.57297 12 4.49998C12.0002 2.42709 9.66679 2.94528 8.50013 4.49998C7.33348 6.05467 4.99991 6.57294 5 4.5C5.00009 2.42706 6.55548 2.94528 6.94443 3.46352" stroke="black" stroke-width="1.25" stroke-linecap="round"/>
-    <circle cx="4" cy="10.5" r="1.75" stroke="black" stroke-width="1.2"/>
-</svg>
diff --git a/assets/icons/file_icons/conversations.svg b/assets/icons/file_icons/conversations.svg
deleted file mode 100644
index e25ed973ef..0000000000
--- a/assets/icons/file_icons/conversations.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.46115 9.43419C8.30678 9.43419 9.92229 8.43411 9.92229 6.21171C9.92229 3.98933 8.30678 2.98926 6.46115 2.98926C4.61553 2.98926 3 3.98933 3 6.21171C3 7.028 3.21794 7.67935 3.58519 8.17685C3.7184 8.35732 3.69033 8.77795 3.58387 8.97539C3.32908 9.44793 3.81048 9.9657 4.33372 9.84571C4.72539 9.75597 5.13621 9.63447 5.49574 9.4715C5.62736 9.41181 5.7727 9.38777 5.91631 9.40402C6.09471 9.42416 6.27678 9.43419 6.46115 9.43419Z" fill="black" stroke="black" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.3385 7.24835C12.7049 7.74561 12.9224 8.39641 12.9224 9.2117C12.9224 10.028 12.7044 10.6793 12.3372 11.1768C12.204 11.3573 12.232 11.7779 12.3385 11.9754C12.5933 12.4479 12.1119 12.9657 11.5886 12.8457C11.197 12.756 10.7862 12.6345 10.4266 12.4715C10.295 12.4118 10.1497 12.3878 10.0061 12.404C9.82765 12.4242 9.64558 12.4342 9.46121 12.4342C8.61469 12.4342 7.81658 12.2238 7.20055 11.7816" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/file_icons/cpp.svg b/assets/icons/file_icons/cpp.svg
deleted file mode 100644
index e3385c1577..0000000000
--- a/assets/icons/file_icons/cpp.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_1791_60)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M13.4803 4.4109C13.6232 4.4934 13.7531 4.63587 13.8473 4.79901C13.9415 4.96211 14 5.14583 14 5.31085V5.78958H12.8036V7.50745H11.0857V8.99892H12.8036V10.7168H14V11.039C14 11.204 13.9415 11.3878 13.8473 11.5509C13.7532 11.714 13.6234 11.8565 13.4805 11.939L8.51974 14.8031C8.23398 14.9681 7.7663 14.9681 7.48053 14.8031L2.51977 11.939C2.37691 11.8566 2.24699 11.7141 2.15283 11.551C2.05864 11.3879 2 11.2041 2 11.0391V5.31089C2 4.98089 2.2338 4.57587 2.51961 4.4109L7.48037 1.54683C7.76613 1.38181 8.23382 1.38181 8.51958 1.54683L13.4803 4.4109ZM7.99998 12.175C5.79438 12.175 4 10.3806 4 8.175C4 5.9694 5.79438 4.17502 7.99998 4.17502C9.42319 4.17502 10.7505 4.9409 11.4639 6.17375L9.73284 7.17548C9.37578 6.55838 8.71174 6.17501 7.99998 6.17501C6.89716 6.17501 5.99999 7.07218 5.99999 8.175C5.99999 9.27778 6.89716 10.175 7.99998 10.175C8.71182 10.175 9.37586 9.79162 9.73295 9.17441L11.464 10.1761C10.7506 11.4091 9.42327 12.175 7.99998 12.175Z" fill="black"/>
-</g>
-<defs>
-<clipPath id="clip0_1791_60">
-<rect width="11.9999" height="13.5039" fill="white" transform="translate(2 1.42307)"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/assets/icons/file_icons/css.svg b/assets/icons/file_icons/css.svg
deleted file mode 100644
index 47457a95c8..0000000000
--- a/assets/icons/file_icons/css.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.58 2H2.5V12.08C2.5 12.5892 2.70229 13.0776 3.06235 13.4376C3.42242 13.7977 3.91078 14 4.42 14H12.58C13.0892 14 13.5776 13.7977 13.9376 13.4376C14.2977 13.0776 14.5 12.5892 14.5 12.08V3.92C14.5 3.41078 14.2977 2.92242 13.9376 2.56235C13.5776 2.20229 13.0892 2 12.58 2ZM3.358 11.6285C3.34615 12.6668 3.96437 13.2311 4.96636 13.232H4.96621C6.06429 13.2456 6.70951 12.4798 6.63088 11.3867H5.48085C5.4899 11.601 5.47243 11.8974 5.36026 12.0313C5.27992 12.1441 5.16183 12.2005 5.00645 12.2005C4.67402 12.1952 4.50788 11.9534 4.50788 11.4753V9.19488C4.50788 8.94247 4.54407 8.75168 4.61645 8.62283C4.73423 8.38524 5.17961 8.3584 5.34825 8.58663C5.47804 8.71252 5.48974 9.04683 5.48101 9.26757H6.63104C6.66099 8.70582 6.53494 8.10381 6.20079 7.80913C5.65853 7.23521 4.37403 7.26765 3.82039 7.80102C3.51213 8.07495 3.358 8.47525 3.358 9.00159V11.6285ZM7.04116 11.3867C7.01043 12.4573 7.50713 13.2473 8.61739 13.232L8.61723 13.2317C10.1571 13.2967 10.5874 11.592 9.96023 10.4759C9.74995 10.1097 9.16994 9.80702 8.71379 9.62981C8.36155 9.46772 8.21038 9.3086 8.20711 8.92079C8.20711 8.55559 8.35983 8.37291 8.66543 8.37291C8.83688 8.37291 8.95357 8.42939 9.01519 8.54217C9.10317 8.6754 9.12454 9.0409 9.11565 9.26742H10.1612C10.1866 8.71627 10.0554 8.11739 9.75509 7.81303C9.26822 7.22257 7.99791 7.24909 7.5115 7.82504C7.0109 8.29179 6.97783 9.4437 7.3346 9.96848C7.49278 10.205 7.75143 10.409 8.1107 10.5809C8.15897 10.6051 8.21552 10.6314 8.27633 10.6598C8.53247 10.7792 8.86416 10.9338 8.97119 11.1046C9.16073 11.3241 9.13593 11.8913 9.00333 12.0877C8.9336 12.1952 8.81285 12.2489 8.64141 12.2489C8.25703 12.2785 8.09666 11.8534 8.12677 11.3867H7.04116ZM10.5474 11.3867C10.5167 12.4573 11.0134 13.2473 12.1236 13.232L12.1235 13.2317C13.6634 13.2967 14.0936 11.592 13.4665 10.4759C13.2562 10.1097 12.6762 9.80702 12.2201 9.62981C11.8678 9.46772 11.7166 9.3086 11.7134 8.92079C11.7134 8.55559 11.8661 8.37291 12.1717 8.37291C12.3431 8.37291 12.4598 8.42939 12.5214 8.54217C12.6094 8.6754 12.6308 9.0409 12.6219 9.26742H13.6674C13.6928 8.71627 13.5617 8.11739 13.2614 7.81303C12.7745 7.22257 11.5042 7.24909 11.0178 7.82504C10.5172 8.29179 10.4841 9.4437 10.8409 9.96848C10.999 10.205 11.2577 10.409 11.617 10.5809C11.6652 10.6051 11.7218 10.6314 11.7826 10.6598C12.0387 10.7792 12.3704 10.9338 12.4775 11.1046C12.667 11.3241 12.6422 11.8913 12.5096 12.0877C12.4399 12.1952 12.3191 12.2489 12.1477 12.2489C11.7633 12.2785 11.6029 11.8534 11.633 11.3867H10.5474Z" fill="black"/>
-</svg>
diff --git a/assets/icons/file_icons/dart.svg b/assets/icons/file_icons/dart.svg
deleted file mode 100644
index c9ec3de51a..0000000000
--- a/assets/icons/file_icons/dart.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M12 11.25H11.25V12V13.25H7.31066L2.35809 8.29743L3.60151 4.56717L7.81937 2.88003L13.25 8.31066V11.25H12Z" stroke="black" stroke-width="1.2"/>
-    <path d="M10.928 11.4328L3.5 4.5H9.89645C9.96275 4.5 10.0263 4.52634 10.0732 4.57322L13.4268 7.92678C13.4737 7.97366 13.5 8.03725 13.5 8.10355V11.25C13.5 11.3881 13.3881 11.5 13.25 11.5H11.0985C11.0352 11.5 10.9743 11.476 10.928 11.4328Z" fill="black"/>
-    <path d="M4 11L4.5 5C3.97221 4.7361 3.33305 5.00085 3.14645 5.56066L2.19544 8.41368C2.07566 8.77302 2.16918 9.16918 2.43702 9.43702L4 11Z" fill="black"/>
-</svg>
diff --git a/assets/icons/file_icons/database.svg b/assets/icons/file_icons/database.svg
deleted file mode 100644
index a8226110d3..0000000000
--- a/assets/icons/file_icons/database.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.99993 6.85713C11.1558 6.85713 13.7142 5.83379 13.7142 4.57142C13.7142 3.30905 11.1558 2.28571 7.99993 2.28571C4.84402 2.28571 2.28564 3.30905 2.28564 4.57142C2.28564 5.83379 4.84402 6.85713 7.99993 6.85713Z" fill="black" stroke="black" stroke-width="1.2"/>
-<path d="M13.7142 4.57141V11.4286C13.7142 12.691 11.1558 13.7143 7.99993 13.7143C4.84402 13.7143 2.28564 12.691 2.28564 11.4286V4.57141" stroke="black" stroke-width="1.2"/>
-<path d="M13.7142 8C13.7142 9.26237 11.1558 10.2857 7.99993 10.2857C4.84402 10.2857 2.28564 9.26237 2.28564 8" stroke="black" stroke-width="1.2"/>
-</svg>
diff --git a/assets/icons/file_icons/diff.svg b/assets/icons/file_icons/diff.svg
deleted file mode 100644
index ec59a0aabe..0000000000
--- a/assets/icons/file_icons/diff.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.5 3L8.5 10" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5 6.5H12" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5 13H12" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/file_icons/docker.svg b/assets/icons/file_icons/docker.svg
deleted file mode 100644
index 7c9cb3d888..0000000000
--- a/assets/icons/file_icons/docker.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.5143 8.49469C12.4012 7.85395 12.0219 7.41709 11.4839 7.1012C11.0362 7.74879 10.805 8.61455 11.2656 9.32647C11.0116 9.44529 10.6011 9.52451 10.2862 9.53892H2.37567C2.16816 9.53892 2 9.70455 2 9.9134C2 12.4195 3.053 13.9507 6.3125 13.9688C9.572 13.9868 11.6682 12.0637 12.2603 9.9782C13.0828 9.9782 13.85 9.61681 14.1136 8.80076C13.6091 8.38667 12.5143 8.49469 12.5143 8.49469Z" fill="black"/>
-<rect x="3" y="7.25" width="3.12" height="1.5" fill="black"/>
-<rect x="6.87988" y="7.25" width="3.12" height="1.5" fill="black"/>
-<rect x="4.00781" y="5.03125" width="2.11218" height="1.5" fill="black"/>
-<rect x="6.87988" y="5.03125" width="2.12012" height="1.5" fill="black"/>
-<rect x="6.87988" y="2.82062" width="2.12012" height="1.5" fill="black"/>
-</svg>
diff --git a/assets/icons/file_icons/elixir.svg b/assets/icons/file_icons/elixir.svg
deleted file mode 100644
index fdfd2b0c6e..0000000000
--- a/assets/icons/file_icons/elixir.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M4 10.4C4 8.4125 4.57143 5.6 9.14286 2C8.95238 2.8 8.99706 4.47037 9.71429 5.6C10.8571 7.4 12 8.825 12 10.4C12 12.8739 10.2857 14 8 14C5.71429 14 4 12.3875 4 10.4Z" fill="black"/>
-</svg>
diff --git a/assets/icons/file_icons/elm.svg b/assets/icons/file_icons/elm.svg
deleted file mode 100644
index ff63582e98..0000000000
--- a/assets/icons/file_icons/elm.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M13.1464 9.85355L12.3536 10.6464C12.1583 10.8417 12.1583 11.1583 12.3536 11.3536L13.1464 12.1464C13.4614 12.4614 14 12.2383 14 11.7929V10.2071C14 9.76165 13.4614 9.53857 13.1464 9.85355Z" fill="black"/>
-    <path d="M12.6464 8.35355L11.3536 9.64645C11.1583 9.84171 10.8417 9.84171 10.6464 9.64645L9.35355 8.35355C9.15829 8.15829 9.15829 7.84171 9.35355 7.64645L10.6464 6.35355C10.8417 6.15829 11.1583 6.15829 11.3536 6.35355L12.6464 7.64645C12.8417 7.84171 12.8417 8.15829 12.6464 8.35355Z" fill="black"/>
-    <path d="M14 2.5V5.79289C14 6.23835 13.4614 6.46143 13.1464 6.14645L9.85355 2.85355C9.53857 2.53857 9.76165 2 10.2071 2H13.5C13.7761 2 14 2.22386 14 2.5Z" fill="black"/>
-    <path d="M8.14645 3.14645L7.14645 2.14645C7.05268 2.05268 6.9255 2 6.79289 2H4.20711C3.76165 2 3.53857 2.53857 3.85355 2.85355L4.85355 3.85355C4.94732 3.94732 5.0745 4 5.20711 4H7.79289C8.23835 4 8.46143 3.46143 8.14645 3.14645Z" fill="black"/>
-    <path d="M7.20711 5H8.79289C9.23835 5 9.46143 5.53857 9.14645 5.85355L8.35355 6.64645C8.15829 6.84171 7.84171 6.84171 7.64645 6.64645L6.85355 5.85355C6.53857 5.53857 6.76165 5 7.20711 5Z" fill="black"/>
-    <path d="M12.1464 13.1464L8.35355 9.35355C8.15829 9.15829 7.84171 9.15829 7.64645 9.35355L3.85355 13.1464C3.53857 13.4614 3.76165 14 4.20711 14H11.7929C12.2383 14 12.4614 13.4614 12.1464 13.1464Z" fill="black"/>
-    <path d="M6.64645 8.35355L2.85355 12.1464C2.53857 12.4614 2 12.2383 2 11.7929V4.20711C2 3.76165 2.53857 3.53857 2.85355 3.85355L6.64645 7.64645C6.84171 7.84171 6.84171 8.15829 6.64645 8.35355Z" fill="black"/>
-</svg>
diff --git a/assets/icons/file_icons/erlang.svg b/assets/icons/file_icons/erlang.svg
deleted file mode 100644
index 9c937d3c66..0000000000
--- a/assets/icons/file_icons/erlang.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M1.5 4.5C1.5 4.22386 1.72386 4 2 4H3.9544C3.0114 4.98001 2.63491 6.13076 2.63491 7.77278C2.63491 9.41479 3.0959 10.8002 4.14336 12H2C1.72386 12 1.5 11.7761 1.5 11.5V4.5ZM12.3567 4H14C14.2761 4 14.5 4.22386 14.5 4.5V11.5C14.5 11.7761 14.2761 12 14 12H12.3969C12.8498 11.5468 13.2372 11.0078 13.5307 10.3923L11.7296 9.41479C11.7296 9.41479 11.1691 10.9749 9.93253 11.3312C8.69597 11.6875 7.7053 11.3149 7.05 10.4309C6.3947 9.54684 6.3947 7.77278 6.3947 7.77278H13.2372C13.3342 6.46811 13.093 5.07682 12.3567 4Z" fill="black"/>
-<path d="M10 6C9.92445 5.22523 9.45015 4 7.99996 4C6.54977 4 6.06002 5.3159 6 6H10Z" fill="black"/>
-</svg>
diff --git a/assets/icons/file_icons/eslint.svg b/assets/icons/file_icons/eslint.svg
deleted file mode 100644
index ba72d9166b..0000000000
--- a/assets/icons/file_icons/eslint.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M13.5413 8.31248C13.6529 8.11911 13.6529 7.88086 13.5413 7.68748L11.0413 3.35736C10.9296 3.16398 10.7233 3.04486 10.5 3.04486H5.5C5.27671 3.04486 5.07038 3.16398 4.95873 3.35736L2.45873 7.68748C2.34709 7.88086 2.34709 8.11911 2.45873 8.31248L4.95873 12.6426C5.07038 12.836 5.27671 12.9551 5.5 12.9551H10.5C10.7233 12.9551 10.9296 12.836 11.0413 12.6426L13.5413 8.31248Z" stroke="black" stroke-width="1.2" stroke-linejoin="round"/>
-    <path d="M7.74994 5.14432C7.90464 5.055 8.09524 5.055 8.24994 5.14432L10.348 6.35564C10.5027 6.44496 10.598 6.61002 10.598 6.78866V9.2113C10.598 9.38994 10.5027 9.555 10.348 9.64432L8.24994 10.8556C8.09524 10.945 7.90464 10.945 7.74994 10.8556L5.65186 9.64432C5.49716 9.555 5.40186 9.38994 5.40186 9.2113V6.78866C5.40186 6.61002 5.49716 6.44496 5.65186 6.35564L7.74994 5.14432Z" fill="black"/>
-</svg>
diff --git a/assets/icons/file_icons/file.svg b/assets/icons/file_icons/file.svg
deleted file mode 100644
index 790a5f18d7..0000000000
--- a/assets/icons/file_icons/file.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3 5H11" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-<path d="M3 8H13" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-<path d="M3 11H9" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-</svg>
diff --git a/assets/icons/file_icons/folder.svg b/assets/icons/file_icons/folder.svg
deleted file mode 100644
index e40613000d..0000000000
--- a/assets/icons/file_icons/folder.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.26046 3.97337C8.3527 4.17617 8.4795 4.47151 8.57375 4.69341C8.65258 4.87898 8.83437 4.99999 9.03599 4.99999H12.5C12.7761 4.99999 13 5.22385 13 5.49999V12.125C13 12.4011 12.7761 12.625 12.5 12.625H3.5C3.22386 12.625 3 12.4011 3 12.125V3.86932C3 3.59318 3.22386 3.36932 3.5 3.36932H7.34219C7.74141 3.36932 8.09483 3.60924 8.26046 3.97337Z" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-</svg>
diff --git a/assets/icons/file_icons/folder_open.svg b/assets/icons/file_icons/folder_open.svg
deleted file mode 100644
index 55231fb6ab..0000000000
--- a/assets/icons/file_icons/folder_open.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.42782 7.2487C4.43495 6.97194 4.65009 6.75 4.91441 6.75H13.5293C13.7935 6.75 14.007 6.97194 13.9998 7.2487C13.9628 8.6885 13.7533 12.75 12.5721 12.75H3.375C4.55631 12.75 4.3907 8.6885 4.42782 7.2487Z" fill="black" stroke="black" stroke-width="1.2" stroke-linejoin="round"/>
-<path d="M5.19598 12.625H3.66515C3.42618 12.625 3.22289 12.4453 3.18626 12.2017L1.94333 3.93602C1.89776 3.63295 2.12496 3.35938 2.42223 3.35938H5.78585C6.11241 3.35938 6.41702 3.52903 6.59618 3.81071L6.94517 4.35938H9.92811C10.4007 4.35938 10.8044 4.71102 10.8836 5.1917L11.1251 6.65624" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/file_icons/font.svg b/assets/icons/file_icons/font.svg
deleted file mode 100644
index 6f2b734b26..0000000000
--- a/assets/icons/file_icons/font.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.3352 13.2519H12.375M4.49719 13.2519L8.00001 2.74811L11.5028 13.2519M3.625 13.2519H5.6648M9.74908 9.16761H6.25095" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/file_icons/fsharp.svg b/assets/icons/file_icons/fsharp.svg
deleted file mode 100644
index 9dd7c153a7..0000000000
--- a/assets/icons/file_icons/fsharp.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.42822 6.40604C7.42822 6.18332 7.15894 6.07178 7.00145 6.22927L5.40749 7.82322C5.30986 7.92085 5.30986 8.07915 5.40749 8.17678L7.00145 9.77073C7.15894 9.92822 7.42822 9.81668 7.42822 9.59396V6.40604Z" fill="black"/>
-<path d="M6.95742 2.4248C7.13112 2.2511 7.42812 2.37412 7.42812 2.61977V4.10981C7.42812 4.37502 7.32276 4.62938 7.13523 4.81691L4.65937 7.2928C4.26885 7.68332 4.26885 8.31648 4.65938 8.70701L7.13523 11.1829C7.32276 11.3704 7.42812 11.6247 7.42812 11.89V13.38C7.42812 13.6256 7.13112 13.7486 6.95742 13.5749L1.57734 8.19486C1.46966 8.08718 1.46966 7.91259 1.57734 7.80491L6.95742 2.4248Z" fill="black"/>
-<path d="M9.04706 2.4293C8.87336 2.2556 8.57636 2.37863 8.57636 2.62428V4.11431C8.57636 4.37953 8.68172 4.63388 8.86925 4.82142L11.3406 7.29281C11.7311 7.68334 11.7311 8.3165 11.3406 8.70703L8.86926 11.1784C8.68172 11.3659 8.57636 11.6203 8.57636 11.8855V13.3755C8.57636 13.6211 8.87336 13.7442 9.04706 13.5705L14.4227 8.19487C14.5303 8.0872 14.5303 7.91261 14.4227 7.80493L9.04706 2.4293Z" fill="black"/>
-</svg>
diff --git a/assets/icons/file_icons/git.svg b/assets/icons/file_icons/git.svg
deleted file mode 100644
index 2b36b0ffd3..0000000000
--- a/assets/icons/file_icons/git.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5 13C6.10457 13 7 12.1046 7 11C7 9.89543 6.10457 9 5 9C3.89543 9 3 9.89543 3 11C3 12.1046 3.89543 13 5 13Z" stroke="black" stroke-width="1.2"/>
-<path d="M11 7C12.1046 7 13 6.10457 13 5C13 3.89543 12.1046 3 11 3C9.89543 3 9 3.89543 9 5C9 6.10457 9.89543 7 11 7Z" fill="black" stroke="black" stroke-width="1.2"/>
-<path d="M4.625 3.625V8.375" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-<path d="M11 7C11 9.20914 9.20914 11 7 11" stroke="black" stroke-width="1.2"/>
-</svg>
diff --git a/assets/icons/file_icons/gleam.svg b/assets/icons/file_icons/gleam.svg
deleted file mode 100644
index 0399bb4dd2..0000000000
--- a/assets/icons/file_icons/gleam.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.3848 9.30444C7.3848 9.30444 7.53254 10.2646 8.53248 10.0882C9.53242 9.91193 9.36378 8.95549 9.36378 8.95549" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5.54155 5.54157C6.12355 4.90104 6.01688 2.62541 7.22875 2.3985C8.44063 2.17158 9.19097 4.33148 9.91982 4.6814C10.6487 5.03133 12.8517 4.3028 13.4381 5.38734C14.0244 6.47188 12.1395 7.95973 12.026 8.64088C11.9126 9.32203 13.3614 11.2416 12.4675 12.1701C11.5736 13.0986 9.73005 11.7545 8.90486 11.8834C8.07966 12.0123 6.79244 13.9095 5.67367 13.3502C4.55491 12.7909 5.16702 10.5455 4.82437 9.87612C4.48171 9.20673 2.34028 8.54978 2.4525 7.35049C2.56471 6.15121 4.95956 6.1821 5.54155 5.54157Z" stroke="#FF7676" stroke-opacity="0.52" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5.54155 5.54157C6.12355 4.90104 6.01688 2.62541 7.22875 2.3985C8.44063 2.17158 9.19097 4.33148 9.91982 4.6814C10.6487 5.03133 12.8517 4.3028 13.4381 5.38734C14.0244 6.47188 12.1395 7.95973 12.026 8.64088C11.9126 9.32203 13.3614 11.2416 12.4675 12.1701C11.5736 13.0986 9.73005 11.7545 8.90486 11.8834C8.07966 12.0123 6.79244 13.9095 5.67367 13.3502C4.55491 12.7909 5.16702 10.5455 4.82437 9.87612C4.48171 9.20673 2.34028 8.54978 2.4525 7.35049C2.56471 6.15121 4.95956 6.1821 5.54155 5.54157Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<circle cx="6.25098" cy="7.75" r="0.75" fill="black"/>
-<circle cx="10.1035" cy="7.25" r="0.75" fill="black"/>
-</svg>
diff --git a/assets/icons/file_icons/go.svg b/assets/icons/file_icons/go.svg
deleted file mode 100644
index 756dd2c105..0000000000
--- a/assets/icons/file_icons/go.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.83413 6.47818C7.28956 6.61768 6.91787 6.72231 6.38194 6.86181C6.25228 6.89668 6.24364 6.9054 6.13127 6.77462C6.00161 6.6264 5.90652 6.5305 5.725 6.44331C5.18043 6.17303 4.65314 6.2515 4.16043 6.57409C3.57264 6.95772 3.2701 7.52443 3.27875 8.23065C3.28739 8.92816 3.76281 9.50359 4.44569 9.5995C5.03348 9.67797 5.52619 9.46872 5.91517 9.02406C5.99296 8.92816 6.06211 8.82353 6.14855 8.70147C5.83737 8.70147 5.44839 8.70147 4.48026 8.70147C4.29874 8.70147 4.25552 8.58812 4.31603 8.43991C4.4284 8.16962 4.63585 7.71625 4.75687 7.48956C4.7828 7.43725 4.84331 7.35006 4.97297 7.35006H8.11938C8.1021 7.58547 8.1021 7.82087 8.06752 8.05628C7.97244 8.68403 7.73905 9.25947 7.35871 9.76516C6.73634 10.5934 5.92381 11.1078 4.89517 11.2473C4.04806 11.3607 3.26146 11.195 2.56994 10.6719C1.93028 10.1837 1.56724 9.53847 1.47215 8.73634C1.35978 7.786 1.63639 6.93156 2.20689 6.18175C2.82061 5.3709 3.63315 4.85649 4.62721 4.6734C5.43975 4.52518 6.21771 4.62109 6.91787 5.10062C7.376 5.40578 7.70447 5.82428 7.92057 6.32996C7.97244 6.40843 7.93786 6.45203 7.83413 6.47818Z" fill="black"/>
-<path d="M10.8733 11.2812C10.1105 11.2636 9.4147 11.0348 8.82792 10.5068C8.33334 10.0579 8.02318 9.48585 7.92259 8.80818C7.7717 7.81367 8.03156 6.93357 8.60158 6.15028C9.21352 5.30539 9.95119 4.86534 10.9487 4.68052C11.8038 4.5221 12.6085 4.61011 13.3378 5.12937C14 5.60462 14.4108 6.24709 14.5197 7.09198C14.6622 8.28012 14.3353 9.24822 13.5557 10.0755C13.0025 10.6652 12.3235 11.0348 11.5439 11.202C11.3176 11.246 11.0912 11.2548 10.8733 11.2812ZM12.8684 7.72566C12.86 7.61124 12.86 7.52323 12.8432 7.43522C12.6923 6.56393 11.9295 6.07107 11.1331 6.26469C10.3536 6.44951 9.8506 6.96877 9.66618 7.79606C9.51529 8.48254 9.83383 9.17782 10.4374 9.45945C10.8984 9.67067 11.3595 9.64427 11.8038 9.40664C12.466 9.0458 12.8264 8.48254 12.8684 7.72566Z" fill="black"/>
-</svg>
diff --git a/assets/icons/file_icons/graphql.svg b/assets/icons/file_icons/graphql.svg
deleted file mode 100644
index e6c0368182..0000000000
--- a/assets/icons/file_icons/graphql.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 5L10.5981 9.5H5.40192L8 5Z" stroke="black" stroke-width="1.2"/>
-<path d="M8 3L12.3301 5.5V10.5L8 13L3.66987 10.5V5.5L8 3Z" stroke="black" stroke-width="1.2"/>
-<circle cx="3.5" cy="5.5" r="1" fill="black"/>
-<circle cx="12.5" cy="5.5" r="1" fill="black"/>
-<circle cx="8" cy="3" r="1" fill="black"/>
-<circle cx="8" cy="13" r="1" fill="black"/>
-<circle cx="3.5" cy="10.5" r="1" fill="black"/>
-<circle cx="12.5" cy="10.5" r="1" fill="black"/>
-</svg>
diff --git a/assets/icons/file_icons/hash.svg b/assets/icons/file_icons/hash.svg
deleted file mode 100644
index 77e6c60072..0000000000
--- a/assets/icons/file_icons/hash.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11.2795 3.63849L8.7478 12.0142" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-<path d="M7.26626 3.99597L4.73462 12.3717" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-<path d="M4.15991 6.37988H12.9099" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-<path d="M3.09839 9.62408H11.8484" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-</svg>
diff --git a/assets/icons/file_icons/haskell.svg b/assets/icons/file_icons/haskell.svg
deleted file mode 100644
index f7519dce23..0000000000
--- a/assets/icons/file_icons/haskell.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.90212 4H6.72288C6.89527 4 7.05551 4.08881 7.14688 4.235L11.5219 11.235C11.73 11.568 11.4906 12 11.0979 12H10.2771C10.1047 12 9.94449 11.9112 9.85312 11.765L8.5 9.6L7.14688 11.765C7.05551 11.9112 6.89527 12 6.72288 12H5.90212C5.50941 12 5.26998 11.568 5.47812 11.235L7.5 8L5.47812 4.765C5.26998 4.43198 5.50941 4 5.90212 4Z" fill="black"/>
-<path d="M3.72288 4H2.90212C2.50941 4 2.26998 4.43198 2.47812 4.765L4.33438 7.735C4.43571 7.89714 4.43571 8.10286 4.33438 8.265L2.47812 11.235C2.26998 11.568 2.50941 12 2.90212 12H3.72288C3.89527 12 4.05551 11.9112 4.14688 11.765L6.33438 8.265C6.43571 8.10286 6.43571 7.89714 6.33438 7.735L4.14688 4.235C4.05551 4.08881 3.89527 4 3.72288 4Z" fill="black"/>
-<path d="M13.1407 6.32812H10.3653C9.97377 6.32812 9.73415 6.75776 9.93989 7.09087L10.1426 7.419C10.2336 7.56647 10.3946 7.65625 10.568 7.65625H13.1407C13.4168 7.65625 13.6407 7.43239 13.6407 7.15625V6.82812C13.6407 6.55198 13.4168 6.32812 13.1407 6.32812Z" fill="black"/>
-<path d="M13.1407 8.32812H11.6126C11.2191 8.32812 10.9798 8.7615 11.1894 9.09447L11.3959 9.42259C11.4875 9.56801 11.6473 9.65625 11.8191 9.65625H13.1407C13.4168 9.65625 13.6407 9.43239 13.6407 9.15625V8.82812C13.6407 8.55198 13.4168 8.32812 13.1407 8.32812Z" fill="black"/>
-</svg>
diff --git a/assets/icons/file_icons/hcl.svg b/assets/icons/file_icons/hcl.svg
deleted file mode 100644
index 71799701af..0000000000
--- a/assets/icons/file_icons/hcl.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7.11466 3.11809C7.21859 3.37393 7.09545 3.66558 6.83961 3.76952L4.31181 4.79643C4.1233 4.87302 4 5.05619 4 5.25967V11.5C4 11.7761 3.77614 12 3.5 12H2.5C2.22386 12 2 11.7761 2 11.5V4.41827C2 3.90959 2.30825 3.45164 2.77953 3.26018L6.08686 1.91658C6.34269 1.81265 6.63434 1.93579 6.73828 2.19163L7.11466 3.11809ZM10.5 1.99999C10.7761 1.99999 11 2.22384 11 2.49999V10.5C11 10.7761 10.7761 11 10.5 11H9.5C9.22386 11 9 10.7761 9 10.5V9.49999C9 9.22384 8.77614 8.99999 8.5 8.99999H7.5C7.22386 8.99999 7 9.22384 7 9.49999V13.5C7 13.7761 6.77614 14 6.5 14H5.5C5.22386 14 5 13.7761 5 13.5V5.53124C5 5.25509 5.22386 5.03124 5.5 5.03124H6.5C6.77614 5.03124 7 5.25509 7 5.53124V6.49999C7 6.77613 7.22386 6.99999 7.5 6.99999H8.5C8.77614 6.99999 9 6.77613 9 6.49999V2.49999C9 2.22384 9.22386 1.99999 9.5 1.99999H10.5ZM13.5 4.03124C13.7761 4.03124 14 4.2551 14 4.53124L14 11.5847C14 12.0859 13.7006 12.5386 13.2394 12.7349L9.99399 14.1159C9.7399 14.224 9.44626 14.1057 9.33813 13.8516L8.94658 12.9315C8.83845 12.6774 8.95678 12.3837 9.21087 12.2756L11.6958 11.2182C11.8802 11.1397 12 10.9586 12 10.7581L12 4.53124C12 4.2551 12.2238 4.03124 12.5 4.03124L13.5 4.03124Z" fill="black"/>
-</svg>
diff --git a/assets/icons/file_icons/heroku.svg b/assets/icons/file_icons/heroku.svg
deleted file mode 100644
index 732adf72cb..0000000000
--- a/assets/icons/file_icons/heroku.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="2" y="2" width="12" height="12" rx="2" stroke="black" stroke-width="1.2"/>
-<path d="M6.74217 7.13317V4.26172V4.13672H6.61717H5.50781H5.38281V4.26172V8.8824V9.07567L5.55908 8.9964L6.33378 8.64803L6.33378 8.64803L6.33389 8.64798L6.33443 8.64774L6.3347 8.64762L6.3369 8.64667L6.34717 8.64225C6.35635 8.63832 6.37013 8.63248 6.38816 8.62501C6.42423 8.61006 6.47729 8.58857 6.54454 8.56272C6.67911 8.511 6.87014 8.44194 7.09531 8.3729C7.54765 8.2342 8.12948 8.09817 8.66592 8.09817C8.92095 8.09817 9.05676 8.16584 9.12979 8.241C9.2037 8.31708 9.23311 8.42118 9.23311 8.53361V11.7383V11.8633H9.35811H10.4922H10.6172V11.7383V8.53361V8.53322C10.6172 8.43725 10.6172 7.81276 10.1093 7.32276C9.86619 7.08825 9.42187 6.80777 8.69373 6.80777C8.00022 6.80777 7.28721 6.96253 6.74217 7.13317ZM8.45652 5.91932L8.29694 6.12171H8.55468H9.66094H9.71713L9.75443 6.07969C10.2672 5.502 10.5291 4.91889 10.616 4.27855L10.6353 4.13672H10.4922H9.38592H9.28153L9.26292 4.23944C9.1561 4.82914 8.88874 5.37113 8.45652 5.91932Z" fill="black" stroke="black" stroke-width="0.25"/>
-<path d="M5.38281 11.7383V12.01L5.58915 11.8332L6.83447 10.766L6.94523 10.671L6.83447 10.5761L5.58915 9.50891L5.38281 9.33207V9.60382V11.7383Z" fill="black" stroke="black" stroke-width="0.25"/>
-</svg>
diff --git a/assets/icons/file_icons/html.svg b/assets/icons/file_icons/html.svg
deleted file mode 100644
index 8832bcba3a..0000000000
--- a/assets/icons/file_icons/html.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.15741 4.17108L6.84277 11.8289" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-<path d="M4.74951 6L2.74951 8L4.74951 10" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11.25 10L13.25 8L11.25 6" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/file_icons/image.svg b/assets/icons/file_icons/image.svg
deleted file mode 100644
index c89de1b128..0000000000
--- a/assets/icons/file_icons/image.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.5 4C7.91421 4 8.25 3.66421 8.25 3.25C8.25 2.83579 7.91421 2.5 7.5 2.5C7.08579 2.5 6.75 2.83579 6.75 3.25C6.75 3.66421 7.08579 4 7.5 4Z" fill="black" stroke="black" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8 8L10 6L12 8H8Z" fill="black"/>
-<path d="M3 11L6 8L8.375 10.375" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7 9L8.5 7.5L10 6L11.5 7.5L13 9" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M4.375 3H3.5C3.22386 3 3 3.22386 3 3.5V12.5C3 12.7761 3.22386 13 3.5 13H8.35938M10.6406 3H12.5C12.7761 3 13 3.22386 13 3.5V12.5C13 12.7761 12.7761 13 12.5 13H11.125" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-</svg>
diff --git a/assets/icons/file_icons/info.svg b/assets/icons/file_icons/info.svg
deleted file mode 100644
index 5d9bef7de8..0000000000
--- a/assets/icons/file_icons/info.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M14.0076 11.2951C13.9946 10.8299 13.7865 10.4026 13.4419 10.0581C13.3999 10.016 13.382 9.98913 13.3749 9.97656C13.3689 9.96605 13.3677 9.96106 13.3668 9.95654C13.3632 9.93725 13.3592 9.88396 13.393 9.71598C13.4041 9.66077 13.4183 9.59815 13.4342 9.52802C13.5102 9.19302 13.625 8.68685 13.625 8C13.625 4.8934 11.1066 2.375 8 2.375C4.89339 2.375 2.375 4.8934 2.375 8C2.375 11.1066 4.89339 13.625 8 13.625H10.5C11.8536 13.625 12.9342 13.2208 13.5329 12.5366C13.8376 12.1882 14.0204 11.7585 14.0076 11.2951ZM8 7.25C8.41421 7.25 8.75 7.58579 8.75 8V10.375C8.75 10.7892 8.41421 11.125 8 11.125C7.58579 11.125 7.25 10.7892 7.25 10.375V8C7.25 7.58579 7.58579 7.25 8 7.25ZM8.75 5.625C8.75 6.03922 8.41422 6.375 8 6.375C7.58578 6.375 7.25 6.03922 7.25 5.625C7.25 5.21078 7.58578 4.875 8 4.875C8.41422 4.875 8.75 5.21078 8.75 5.625Z" fill="black"/>
-</svg>
diff --git a/assets/icons/file_icons/java.svg b/assets/icons/file_icons/java.svg
deleted file mode 100644
index 70d2d10ed7..0000000000
--- a/assets/icons/file_icons/java.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.99219 8.56632C6.5 9 10.5415 8.99989 12 7.99995C13.4585 7 12.5 9.49999 12.5 10" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-<path d="M11.5 13C9 13.5781 6 13.5938 4 13" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-<path d="M10.0156 10.9844C8.51562 11.2031 6.5 11.2031 5 10.8906" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-<path d="M6.5625 6.5C6.34375 6 6.06838 4.93125 6.99999 4.03125C7.93161 3.13125 8.58082 3.33636 9.00002 2" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-<path d="M9.18477 6.50002C8.88168 6.05002 8.40637 5.71875 9.00014 5.40625C9.5939 5.09375 10.3126 4.65625 10.8751 3.53125" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-</svg>
diff --git a/assets/icons/file_icons/javascript.svg b/assets/icons/file_icons/javascript.svg
deleted file mode 100644
index c2aa1cf340..0000000000
--- a/assets/icons/file_icons/javascript.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M4 2C2.89543 2 2 2.89543 2 4V12C2 13.1046 2.89543 14 4 14H12C13.1046 14 14 13.1046 14 12V4C14 2.89543 13.1046 2 12 2H4ZM7.26917 6.80584H6.04784V10.8808C6.04784 11.0672 6.02025 11.2241 5.96508 11.3516C5.90991 11.4791 5.82906 11.5761 5.72253 11.6427C5.61789 11.7074 5.48948 11.7397 5.33729 11.7397C5.19271 11.7397 5.06715 11.7112 4.96062 11.6541C4.85599 11.5951 4.77323 11.5114 4.71235 11.403C4.65338 11.2926 4.62199 11.1604 4.61819 11.0063H3.38829C3.38639 11.3944 3.46914 11.7169 3.63655 11.9737C3.80396 12.2286 4.03035 12.4189 4.31571 12.5444C4.60297 12.6681 4.92257 12.7299 5.27451 12.7299C5.67021 12.7299 6.0174 12.6547 6.31607 12.5045C6.61475 12.3542 6.84779 12.1402 7.0152 11.8624C7.18452 11.5847 7.26917 11.2574 7.26917 10.8808V6.80584ZM11.1672 7.95013C11.3403 8.07759 11.4383 8.25641 11.4611 8.4866H12.6453C12.6396 8.13846 12.5464 7.83218 12.3657 7.56775C12.185 7.30331 11.9319 7.0969 11.6066 6.94852C11.2832 6.80013 10.9046 6.72594 10.4709 6.72594C10.0448 6.72594 9.66429 6.80013 9.32947 6.94852C8.99464 7.0969 8.73116 7.30331 8.53902 7.56775C8.34878 7.83218 8.25461 8.14132 8.25652 8.49516C8.25461 8.92701 8.39634 9.27039 8.6817 9.52531C8.96706 9.78023 9.3561 9.96762 9.84882 10.0875L10.4852 10.2473C10.6982 10.2986 10.878 10.3557 11.0245 10.4185C11.1729 10.4813 11.2851 10.5574 11.3612 10.6468C11.4392 10.7362 11.4782 10.8465 11.4782 10.9778C11.4782 11.1186 11.4354 11.2432 11.3498 11.3516C11.2642 11.46 11.1434 11.5447 10.9874 11.6056C10.8333 11.6665 10.6516 11.6969 10.4424 11.6969C10.2293 11.6969 10.0381 11.6646 9.86879 11.5999C9.70138 11.5333 9.56727 11.4353 9.46644 11.306C9.36751 11.1747 9.31139 11.0111 9.29808 10.8151H8.10242C8.11193 11.2356 8.21371 11.5885 8.40776 11.8738C8.6037 12.1573 8.87574 12.3713 9.22388 12.5159C9.57392 12.6605 9.98484 12.7327 10.4566 12.7327C10.9322 12.7327 11.3384 12.6614 11.6751 12.5187C12.0137 12.3741 12.2725 12.1715 12.4513 11.9109C12.632 11.6484 12.7233 11.3383 12.7252 10.9806C12.7233 10.7371 12.6786 10.5212 12.5911 10.3329C12.5055 10.1445 12.3847 9.98093 12.2287 9.84206C12.0727 9.70319 11.8882 9.58619 11.6751 9.49107C11.4621 9.39595 11.2281 9.31985 10.9731 9.26278L10.4481 9.13722C10.3206 9.10869 10.2008 9.07444 10.0885 9.03449C9.97628 8.99264 9.87736 8.94413 9.79175 8.88896C9.70614 8.83189 9.63861 8.76435 9.58914 8.68635C9.54158 8.60836 9.51971 8.51704 9.52351 8.41241C9.52351 8.28685 9.55966 8.17461 9.63195 8.07569C9.70614 7.97676 9.81267 7.89971 9.95155 7.84455C10.0904 7.78747 10.2607 7.75894 10.4623 7.75894C10.7591 7.75894 10.9941 7.82267 11.1672 7.95013Z" fill="black"/>
-</svg>
diff --git a/assets/icons/file_icons/julia.svg b/assets/icons/file_icons/julia.svg
deleted file mode 100644
index f37f7d816a..0000000000
--- a/assets/icons/file_icons/julia.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="8" cy="5" r="2.75" fill="black"/>
-<circle cx="4.75" cy="11" r="2.75" fill="black" fill-opacity="0.5"/>
-<circle cx="11.25" cy="11" r="2.75" fill="black" fill-opacity="0.75"/>
-</svg>
diff --git a/assets/icons/file_icons/kdl.svg b/assets/icons/file_icons/kdl.svg
deleted file mode 100644
index 92d9f28428..0000000000
--- a/assets/icons/file_icons/kdl.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none" viewBox="0 0 16 16"><g style="fill:#000"><path fill="#edd7ff" d="M283.371 159.177q-24.185 1.507-37.97-10.661-13.786-12.17-15.328-36.943L210.45-203.41q-1.506-24.184 11.768-39.223 13.828-15.665 38.602-17.208 25.363-1.58 41.029 12.247 15.628 13.239 17.135 37.423L336.29 67.651l135.67-8.452c34.21-2.131 52.23 11.55 54.07 41.043q1.395 22.415-10.92 33.84-11.715 11.39-37.68 13.006z" style="fill:#000" transform="translate(8.262 8.689)scale(.01252)"/><path fill="#d7f8ff" d="M-172.688 139.602q-23.87-4.164-34.444-19.207-10.575-15.042-6.411-38.913L-159.211-230q4.164-23.87 19.207-34.445t38.913-6.41l117.607 20.514q68.118 11.881 112.657 45.447 45.222 33.085 63.399 83.65 18.175 50.565 7.107 114.025-11.172 64.044-45.495 106.05-33.64 41.526-87.394 57.347-53.17 15.921-121.871 3.938zM-47.62 72.629q59.968 10.46 94.738-13.471 35.454-24.412 46.016-84.961 10.563-60.55-14.635-94.941-24.615-34.29-84.582-44.751l-52.399-9.14-41.537 238.124z" style="fill:#000" transform="translate(8.262 8.689)scale(.01252)"/><path fill="#ffb2b2" d="M-194.146 57.186q16.518 13.475 18.106 32.913 1.588 19.439-11.934 35.367-13.523 15.93-33.55 17.566-21.795 1.78-41.595-15.577L-445.048-30.827l11.358 139.013q2.022 24.74-11.501 40.668-13.571 15.34-38.899 17.41-24.74 2.022-40.621-10.912-15.34-13.572-17.362-38.311l-25.748-315.135q-1.974-24.15 11.009-39.442 13.522-15.93 38.262-17.95 25.329-2.07 41.258 11.453 15.88 12.933 17.854 37.084l10.588 129.588 151.899-180.221q14.016-17.156 33.454-18.744t35.367 11.934q15.882 12.935 17.469 32.372 1.589 19.439-14.146 37.327L-335.886-66.43Z" style="fill:#000" transform="translate(8.262 8.689)scale(.01252)"/></g></svg>
\ No newline at end of file
diff --git a/assets/icons/file_icons/kotlin.svg b/assets/icons/file_icons/kotlin.svg
deleted file mode 100644
index 5d70c99b45..0000000000
--- a/assets/icons/file_icons/kotlin.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11.2929 11.2929C11.9229 11.9229 11.4767 13 10.5858 13H4C3.44772 13 3 12.5523 3 12V4C3 3.44772 3.44772 3 4 3H10.5858C11.4767 3 11.9229 4.07714 11.2929 4.70711L8.70711 7.29289C8.31658 7.68342 8.31658 8.31658 8.70711 8.70711L11.2929 11.2929Z" fill="black"/>
-</svg>
diff --git a/assets/icons/file_icons/lock.svg b/assets/icons/file_icons/lock.svg
deleted file mode 100644
index 10ae33869a..0000000000
--- a/assets/icons/file_icons/lock.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5 5C5 3.89543 5.89543 3 7 3H9C10.1046 3 11 3.89543 11 5V6H5V5Z" stroke="black" stroke-width="1.2"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M3.25 6.5C3.25 5.80964 3.80964 5.25 4.5 5.25H11.5C12.1904 5.25 12.75 5.80964 12.75 6.5V12.5C12.75 13.1904 12.1904 13.75 11.5 13.75H4.5C3.80964 13.75 3.25 13.1904 3.25 12.5V6.5ZM8.75 9.66146C8.90559 9.48517 9 9.25361 9 9C9 8.44772 8.55228 8 8 8C7.44772 8 7 8.44772 7 9C7 9.25361 7.09441 9.48517 7.25 9.66146V11C7.25 11.4142 7.58579 11.75 8 11.75C8.41421 11.75 8.75 11.4142 8.75 11V9.66146Z" fill="black"/>
-</svg>
diff --git a/assets/icons/file_icons/lua.svg b/assets/icons/file_icons/lua.svg
deleted file mode 100644
index 6035c438c1..0000000000
--- a/assets/icons/file_icons/lua.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7.85563 1.25939C8.23925 1.24605 8.62786 1.26732 9.01768 1.32632C9.42723 1.38831 9.70898 1.77057 9.64699 2.18012C9.585 2.58967 9.20274 2.87142 8.79319 2.80943C8.4967 2.76455 8.20072 2.7483 7.90773 2.75848C7.49377 2.77287 7.14652 2.44895 7.13213 2.03499C7.11774 1.62102 7.44166 1.27377 7.85563 1.25939ZM5.60906 2.51146C5.82536 2.86471 5.71435 3.32642 5.3611 3.54273C4.84568 3.85833 4.38064 4.25745 3.99073 4.71897C3.72342 5.03539 3.25022 5.07519 2.93381 4.80788C2.61739 4.54057 2.57759 4.06737 2.8449 3.75095C3.33834 3.16688 3.92581 2.66273 4.57779 2.2635C4.93104 2.04719 5.39275 2.15821 5.60906 2.51146ZM2.23313 6.24179C2.64026 6.31807 2.90847 6.70994 2.83219 7.11707C2.77825 7.40497 2.75 7.69997 2.75 8C2.75 8.28029 2.7719 8.55495 2.81394 8.82249C2.87825 9.23168 2.59866 9.61552 2.18947 9.67983C1.78028 9.74413 1.39643 9.46455 1.33213 9.05536C1.27802 8.71107 1.25 8.35855 1.25 8C1.25 7.60553 1.28717 7.21807 1.35784 6.84086C1.43412 6.43373 1.826 6.16551 2.23313 6.24179ZM13.8428 6.42448C14.2535 6.37004 14.6305 6.65878 14.6849 7.0694C14.7362 7.45608 14.7529 7.8404 14.7374 8.21909C14.7205 8.63296 14.3713 8.95478 13.9575 8.93789C13.5436 8.92101 13.2218 8.57181 13.2386 8.15794C13.2506 7.86463 13.2377 7.56674 13.1979 7.26654C13.1435 6.85592 13.4322 6.47892 13.8428 6.42448ZM13.4914 10.4511C13.8449 10.667 13.9564 11.1286 13.7405 11.4821C13.3418 12.135 12.8364 12.72 12.2469 13.2086C11.928 13.4729 11.4552 13.4286 11.1909 13.1097C10.9265 12.7907 10.9708 12.3179 11.2898 12.0536C11.751 11.6714 12.1475 11.2127 12.4604 10.7003C12.6763 10.3468 13.1379 10.2352 13.4914 10.4511ZM2.70419 10.9205C3.0391 10.6768 3.50819 10.7507 3.75193 11.0856C4.07618 11.5311 4.46887 11.9238 4.91442 12.2481C5.24933 12.4918 5.32323 12.9609 5.07949 13.2958C4.83576 13.6307 4.36667 13.7046 4.03176 13.4609C3.4596 13.0445 2.95552 12.5404 2.53911 11.9682C2.29537 11.6333 2.36928 11.1642 2.70419 10.9205ZM9.75637 13.7813C9.8282 14.1893 9.55574 14.5782 9.14781 14.6501C8.77491 14.7157 8.39143 14.75 8 14.75C7.64145 14.75 7.28894 14.722 6.94465 14.6679C6.53545 14.6036 6.25587 14.2197 6.32018 13.8105C6.38448 13.4013 6.76833 13.1218 7.17752 13.1861C7.44505 13.2281 7.71971 13.25 8 13.25C8.30366 13.25 8.60011 13.2234 8.88766 13.1728C9.29559 13.101 9.68453 13.3734 9.75637 13.7813Z" fill="black"/>
-<circle cx="12.5" cy="3.5" r="1.5" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8 12C10.2091 12 12 10.2091 12 8C12 5.79086 10.2091 4 8 4C5.79086 4 4 5.79086 4 8C4 10.2091 5.79086 12 8 12ZM9 8.5C9.82843 8.5 10.5 7.82843 10.5 7C10.5 6.17157 9.82843 5.5 9 5.5C8.17157 5.5 7.5 6.17157 7.5 7C7.5 7.82843 8.17157 8.5 9 8.5Z" fill="black"/>
-</svg>
diff --git a/assets/icons/file_icons/luau.svg b/assets/icons/file_icons/luau.svg
deleted file mode 100644
index 08956e127f..0000000000
--- a/assets/icons/file_icons/luau.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M6.36197 1.67985C5.3748 1.41534 4.36011 2.00117 4.0956 2.98834L2.17985 10.138C1.91534 11.1252 2.50117 12.1399 3.48833 12.4044L10.638 14.3202C11.6252 14.5847 12.6399 13.9988 12.9044 13.0117L14.8202 5.86197C15.0847 4.8748 14.4988 3.86012 13.5117 3.59561L6.36197 1.67985ZM10.0457 4.58266C9.77896 4.51119 9.50479 4.66948 9.43332 4.93621L8.76235 7.44028C8.69088 7.70701 8.84917 7.98118 9.11591 8.05265L11.62 8.72362C11.8867 8.79509 12.1609 8.6368 12.2324 8.37006L12.9033 5.86599C12.9748 5.59926 12.8165 5.32509 12.5498 5.25362L10.0457 4.58266Z" fill="black"/>
-</svg>
diff --git a/assets/icons/file_icons/magnifying_glass.svg b/assets/icons/file_icons/magnifying_glass.svg
deleted file mode 100644
index d0440d905c..0000000000
--- a/assets/icons/file_icons/magnifying_glass.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13 13L10.4138 10.4138M3 7.31034C3 4.92981 4.92981 3 7.31034 3C9.6909 3 11.6207 4.92981 11.6207 7.31034C11.6207 9.6909 9.6909 11.6207 7.31034 11.6207C4.92981 11.6207 3 9.6909 3 7.31034Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/file_icons/metal.svg b/assets/icons/file_icons/metal.svg
deleted file mode 100644
index 7f5396b93b..0000000000
--- a/assets/icons/file_icons/metal.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="16" height="16" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M4.56 4.502 3.25 3.027V11.5h1.5V6.973l2.69 3.025 1.31 1.475V7.918l3.306 3.582h2.042L8.55 5.491 7.25 4.081V7.528L4.56 4.502Z" fill="#000"/></svg>
diff --git a/assets/icons/file_icons/nim.svg b/assets/icons/file_icons/nim.svg
deleted file mode 100644
index 1750bbff77..0000000000
--- a/assets/icons/file_icons/nim.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.35355 3.35355C8.15829 3.15829 7.84171 3.15829 7.64645 3.35355L6.58346 4.41654C6.52858 4.47142 6.46166 4.51278 6.38802 4.53733L5.29316 4.90228C5.11349 4.96217 4.91541 4.91541 4.78149 4.78149L4.57206 4.57206C4.30924 4.30924 3.86171 4.41488 3.74417 4.7675L3.53733 5.38802C3.51278 5.46166 3.47142 5.52858 3.41654 5.58346L3.3554 5.6446C3.15942 5.84058 2.84146 5.83979 2.64615 5.64314C2.58143 5.57797 2.51312 5.50926 2.44612 5.44197C2.21933 5.21421 1.99828 5.30815 2.03473 5.62749C2.19672 7.04644 2.88949 7.82891 3.35136 7.97489C3.44548 8.00464 3.54274 7.96999 3.62829 7.92073C4.44835 7.4485 6.22418 7 8 7C9.77582 7 11.5516 7.4485 12.3717 7.92073C12.4573 7.96999 12.5545 8.00464 12.6486 7.97489C13.1034 7.83117 13.7819 7.07055 13.9574 5.69302C14.0005 5.35422 13.7444 5.24332 13.5043 5.48625C13.4537 5.53749 13.403 5.58893 13.3543 5.6384C13.1589 5.837 12.839 5.83898 12.642 5.64198L12.5835 5.58346C12.5286 5.52858 12.4872 5.46166 12.4627 5.38802L12.2558 4.7675C12.1383 4.41488 11.6908 4.30924 11.4279 4.57206L11.2185 4.78149C11.0846 4.91541 10.8865 4.96217 10.7068 4.90228L9.61198 4.53733C9.53834 4.51278 9.47142 4.47142 9.41654 4.41654L8.35355 3.35355Z" fill="black"/>
-<path d="M8.3 8.725L9.86667 9.9C9.95321 9.96491 10.0585 10.0012 10.1666 9.99594C11.0914 9.9511 12.0092 9.53986 12.8026 8.99691C13.2041 8.72221 13.7852 9.05371 13.6254 9.51314C12.8809 11.6536 11.282 13 8 13C4.71804 13 3.11909 11.6536 2.37461 9.51314C2.21482 9.05371 2.79593 8.72221 3.19735 8.99691C3.99075 9.53986 4.90856 9.9511 5.8334 9.99594C5.94146 10.0012 6.04679 9.96491 6.13333 9.9L7.7 8.725C7.87778 8.59167 8.12222 8.59167 8.3 8.725Z" fill="black"/>
-</svg>
diff --git a/assets/icons/file_icons/nix.svg b/assets/icons/file_icons/nix.svg
deleted file mode 100644
index 215d58a035..0000000000
--- a/assets/icons/file_icons/nix.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.00005 4.76556L4.76569 2.74996M6.00005 4.76556L3.75 4.76563M6.00005 4.76556L7.25006 4.7656" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-<path d="M10.0232 11.2311L11.2675 13.2406M10.0232 11.2311L12.2732 11.2199M10.0232 11.2311L8.7732 11.2373" stroke="black" stroke-opacity="0.5" stroke-width="1.2" stroke-linecap="round"/>
-<path d="M9.99025 4.91551L10.9985 2.77781M9.99025 4.91551L8.75599 3.03419M9.99025 4.91551L10.6759 5.9607" stroke="black" stroke-opacity="0.5" stroke-width="1.2" stroke-linecap="round"/>
-<path d="M6.0323 11.1009L5.03465 13.2436M6.0323 11.1009L7.27585 12.9761M6.0323 11.1009L5.34151 10.0592" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-<path d="M11.883 8.19023L14.2466 8.19287M11.883 8.19023L13.0602 6.27268M11.883 8.19023L11.229 9.25547" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-<path d="M4.12354 7.8356L1.76002 7.84465M4.12354 7.8356L2.95585 9.75894M4.12354 7.8356L4.7723 6.76713" stroke="black" stroke-opacity="0.5" stroke-width="1.2" stroke-linecap="round"/>
-</svg>
diff --git a/assets/icons/file_icons/notebook.svg b/assets/icons/file_icons/notebook.svg
deleted file mode 100644
index 968d5c5982..0000000000
--- a/assets/icons/file_icons/notebook.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.03125 3.96875C3.03125 3.41647 3.47897 2.96875 4.03125 2.96875H6V13H4.03125C3.47897 13 3.03125 12.5523 3.03125 12V3.96875Z" fill="black"/>
-<path d="M12.5 3H3.5C3.22386 3 3 3.22386 3 3.5V12.5C3 12.7761 3.22386 13 3.5 13H12.5C12.7761 13 13 12.7761 13 12.5V3.5C13 3.22386 12.7761 3 12.5 3Z" stroke="black" stroke-width="1.2"/>
-<path d="M10.5 5.75H8.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10.5 8H8.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10.5 10.25H8.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6 3V14" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/file_icons/ocaml.svg b/assets/icons/file_icons/ocaml.svg
deleted file mode 100644
index 7d59015d8d..0000000000
--- a/assets/icons/file_icons/ocaml.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12 13.5H7.18128C7.25315 13.3339 7.31861 13.1633 7.37733 12.9884C7.84629 11.625 7.9495 10.2397 7.98391 8.87162L7.98407 8.87162V8.85905C7.98407 8.79799 7.98882 8.75909 7.99406 8.73493C7.99656 8.7234 7.99896 8.71621 8.0005 8.71224C8.00097 8.71104 8.00138 8.71007 8.00173 8.70929C8.00249 8.70761 8.00296 8.70687 8.00303 8.70676C8.00306 8.70671 8.00311 8.70662 8.00323 8.70645C8.00342 8.70618 8.0038 8.7057 8.0045 8.70494C8.00571 8.70363 8.00896 8.70034 8.01561 8.69532C8.02944 8.68488 8.05816 8.66688 8.11243 8.6453L8.11249 8.64544L8.12366 8.64068C8.53494 8.4655 8.91688 8.22556 9.25605 8.0125L9.27106 8.00307C9.36762 7.94242 9.46086 7.88385 9.55367 7.82709L9.5614 7.82236L9.56896 7.81735C9.70524 7.72705 9.77892 7.69822 9.82667 7.69031C9.85541 7.68555 9.90564 7.68176 10.01 7.73835C10.5523 8.03235 11.1157 7.9631 11.5633 7.85187C11.5717 7.84978 11.5813 7.84767 11.5984 7.84392L11.4916 7.35545L11.5984 7.84392C11.6 7.84358 11.6017 7.8432 11.6036 7.84279C11.6289 7.83729 11.6822 7.82574 11.7348 7.80789C11.7916 7.7886 11.8928 7.74784 11.9851 7.65798C12.0941 7.55172 12.1429 7.43192 12.1589 7.3184C12.2792 7.22075 12.3782 7.09682 12.4386 6.93928C12.5168 6.73538 12.5055 6.53588 12.4849 6.38781C12.45 6.07928 12.3592 5.50516 11.7553 5.25039L11.7462 5.24061L11.7286 5.2211L11.7286 5.2211L11.726 5.21822C11.7155 5.20653 11.7005 5.18973 11.6833 5.17169C11.4698 4.90282 11.2086 4.69561 10.8961 4.57617C10.5894 4.45892 10.2634 4.43776 9.93193 4.49233H9.63405H9.59873L9.56376 4.49729C9.2128 4.54712 8.90323 4.47627 8.60358 4.25349C7.82725 3.66486 6.94159 3.78634 6.2337 4.04299C6.18057 3.96071 6.11791 3.8812 6.0433 3.80944C5.79229 3.56801 5.45882 3.46198 5.06885 3.51234C4.51549 3.57603 4.12881 4.00408 4.02487 4.52059C3.9668 4.80919 4.01162 5.09236 4.17142 5.34951C4.26113 5.49387 4.38002 5.61869 4.51613 5.72911C4.42997 6.24598 4.34212 6.76439 4.23186 7.25753L4.22955 7.26783L4.22769 7.27821C4.05948 8.21441 3.85868 9.11137 3.59224 10.0051C3.39408 10.6698 3.04467 11.2038 2.5 11.5591V4C2.5 3.17157 3.17157 2.5 4 2.5H12C12.8284 2.5 13.5 3.17157 13.5 4V12C13.5 12.8284 12.8284 13.5 12 13.5Z" fill="black" stroke="black"/>
-</svg>
diff --git a/assets/icons/file_icons/odin.svg b/assets/icons/file_icons/odin.svg
deleted file mode 100644
index 3b4ef89319..0000000000
--- a/assets/icons/file_icons/odin.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_1_2)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M4.58747 12.9359C4.35741 12.778 4.17558 12.625 4.17558 12.625L10.092 2.37749C10.092 2.37749 10.3355 2.46782 10.5367 2.56426C10.7903 2.6858 11.0003 2.80429 11.0003 2.80429C13.8681 4.46005 14.8523 8.13267 13.1965 11.0005C11.5407 13.8684 7.8681 14.8525 5.00023 13.1967C5.00023 13.1967 4.79936 13.0812 4.58747 12.9359ZM10.5003 3.67032L5.50023 12.3307C7.89013 13.7105 10.9506 12.8904 12.3305 10.5006C13.7102 8.1106 12.8902 5.05015 10.5003 3.67032ZM3.07664 11.4314C2.87558 11.1403 2.804 11.0006 2.804 11.0006C1.77036 9.20524 1.69456 6.92215 2.80404 5.00046C3.91353 3.07877 5.92859 2.00291 8.0003 2.00036C8.0003 2.00036 8.28 1.99964 8.51289 2.02194C8.86375 2.05556 9.09702 2.10083 9.09702 2.10083L3.43905 11.9007C3.43905 11.9007 3.30482 11.7618 3.07664 11.4314ZM7.40178 3.03702C5.89399 3.22027 4.48727 4.08506 3.67008 5.50052C2.85288 6.9159 2.80733 8.56653 3.40252 9.96401L7.40178 3.03702Z" fill="black" stroke="black" stroke-width="0.1"/>
-</g>
-<defs>
-<clipPath id="clip0_1_2">
-<rect width="16" height="16" fill="white"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/assets/icons/file_icons/package.svg b/assets/icons/file_icons/package.svg
deleted file mode 100644
index 16bbccb2e6..0000000000
--- a/assets/icons/file_icons/package.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2.62671 4.88474L7.99977 7.78519M2.62671 4.88474L2.63131 10.9001L8.00436 13.8005M2.62671 4.88474L5.31111 3.54213M7.99977 7.78519L8.00436 13.8005M7.99977 7.78519L10.6841 6.33086M8.00436 13.8005L13.3729 10.8919L13.3683 4.87654M5.31111 3.54213L7.9955 2.19952L13.3683 4.87654M5.31111 3.54213L10.6841 6.33086M10.6841 6.33086L13.3683 4.87654" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8.03125 13.5625V7.78125L2.5625 4.9375V10.75L8.03125 13.5625Z" fill="black"/>
-</svg>
diff --git a/assets/icons/file_icons/phoenix.svg b/assets/icons/file_icons/phoenix.svg
deleted file mode 100644
index 5db68b4e44..0000000000
--- a/assets/icons/file_icons/phoenix.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M13 9C13 8.32138 12.9375 7.5 12.7188 6.75C12.0625 7.53125 10.875 8.1875 10 8.5C10.75 5.90625 9.5625 3.1875 8 3C8 4.96875 7.625 5.90625 6.5 7.5C5 5 3.5 6.5 3 7C3.5 7.5 4.21832 8.24064 4.34375 9.3125C4.6875 12.25 6.75 13 8.5 13C10.25 13 10.5 11 12.5 12" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M5.03125 9.15625C5.87694 9.15625 6.5625 8.47069 6.5625 7.625C6.5625 6.77931 5.87694 6.09375 5.03125 6.09375C4.18556 6.09375 3.5 6.77931 3.5 7.625C3.5 8.47069 4.18556 9.15625 5.03125 9.15625Z" fill="black"/>
-</svg>
diff --git a/assets/icons/file_icons/php.svg b/assets/icons/file_icons/php.svg
deleted file mode 100644
index 2f26ad7706..0000000000
--- a/assets/icons/file_icons/php.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M2.53208 6.63971H2.42954L2.40949 6.74026L1.55857 11.0068L1.52876 11.1562H1.68115H2.50827H2.61075L2.63085 11.0557L2.83687 10.0256H3.44845C3.70004 10.0256 3.94417 9.99678 4.18045 9.93871C4.43396 9.8764 4.66578 9.731 4.87657 9.51211C5.0489 9.33958 5.18417 9.1453 5.28168 8.92946C5.38161 8.71688 5.4468 8.49901 5.47636 8.27605C5.55068 7.7954 5.48117 7.39356 5.24237 7.09178C5.00056 6.78618 4.61855 6.64383 4.12786 6.63971L4.12786 6.63971H4.12681H2.53208ZM3.02254 9.10917L3.32957 7.57402H3.32975H3.32998H3.33022H3.33046H3.33069H3.33093H3.33116H3.3314H3.33163H3.33187H3.3321H3.33234H3.33257H3.33281H3.33304H3.33328H3.33351H3.33375H3.33398H3.33422H3.33445H3.33469H3.33492H3.33516H3.33539H3.33563H3.33586H3.3361H3.33633H3.33656H3.3368H3.33703H3.33727H3.3375H3.33774H3.33797H3.3382H3.33844H3.33867H3.33891H3.33914H3.33937H3.33961H3.33984H3.34007H3.34031H3.34054H3.34078H3.34101H3.34124H3.34148H3.34171H3.34194H3.34218H3.34241H3.34264H3.34288H3.34311H3.34334H3.34357H3.34381H3.34404H3.34427H3.34451H3.34474H3.34497H3.3452H3.34544H3.34567H3.3459H3.34613H3.34637H3.3466H3.34683H3.34706H3.3473C3.39341 7.57402 3.44096 7.57195 3.48998 7.56801C3.79781 7.56449 4.04639 7.59375 4.23948 7.652L4.24008 7.65218C4.3012 7.67028 4.34462 7.7103 4.36998 7.79556C4.39766 7.88858 4.40099 8.03039 4.36664 8.23093C4.28051 8.72035 4.12128 8.94206 3.93986 9.00209C3.70277 9.07608 3.39973 9.11302 3.02726 9.10918L3.02726 9.10917H3.02597H3.02581H3.02564H3.02548H3.02532H3.02516H3.02499H3.02483H3.02467H3.02451H3.02434H3.02418H3.02402H3.02386H3.02369H3.02353H3.02337H3.02321H3.02304H3.02288H3.02272H3.02256H3.02254Z" fill="black" stroke="black" stroke-width="0.25"/>
-    <path d="M11.5321 6.63971H11.4295L11.4095 6.74026L10.5586 11.0068L10.5288 11.1562H10.6812H11.5083H11.6107L11.6308 11.0557L11.8369 10.0256H12.4485C12.7 10.0256 12.9442 9.99678 13.1804 9.93871C13.434 9.8764 13.6658 9.731 13.8766 9.51212C14.0489 9.33959 14.1842 9.14531 14.2817 8.92947C14.3816 8.71688 14.4468 8.49901 14.4764 8.27605C14.5507 7.7954 14.4812 7.39356 14.2424 7.09178C14.0006 6.78618 13.6186 6.64383 13.1279 6.63971V6.63971H13.1268H11.5321ZM12.0225 9.10917L12.3296 7.57402H12.3297H12.33H12.3302H12.3305H12.3307H12.3309H12.3312H12.3314H12.3316H12.3319H12.3321H12.3323H12.3326H12.3328H12.333H12.3333H12.3335H12.3337H12.334H12.3342H12.3345H12.3347H12.3349H12.3352H12.3354H12.3356H12.3359H12.3361H12.3363H12.3366H12.3368H12.337H12.3373H12.3375H12.3377H12.338H12.3382H12.3384H12.3387H12.3389H12.3391H12.3394H12.3396H12.3398H12.3401H12.3403H12.3405H12.3408H12.341H12.3412H12.3415H12.3417H12.3419H12.3422H12.3424H12.3426H12.3429H12.3431H12.3433H12.3436H12.3438H12.344H12.3443H12.3445H12.3447H12.345H12.3452H12.3454H12.3457H12.3459H12.3461H12.3464H12.3466H12.3468H12.3471H12.3473C12.3934 7.57402 12.441 7.57195 12.49 7.56801C12.7978 7.56449 13.0464 7.59375 13.2395 7.652L13.2401 7.65218C13.3012 7.67028 13.3446 7.7103 13.37 7.79556C13.3977 7.88859 13.401 8.03042 13.3666 8.23098C13.2805 8.72036 13.1213 8.94206 12.9399 9.00209C12.7028 9.07608 12.3997 9.11302 12.0273 9.10918V9.10917H12.026H12.0258H12.0256H12.0255H12.0253H12.0252H12.025H12.0248H12.0247H12.0245H12.0243H12.0242H12.024H12.0239H12.0237H12.0235H12.0234H12.0232H12.023H12.0229H12.0227H12.0226H12.0225Z" fill="black" stroke="black" stroke-width="0.25"/>
-    <path d="M7.31195 5.50427H7.20953L7.18939 5.60469L6.32959 9.89176L6.29959 10.0413H6.45215H7.27613H7.37865L7.39871 9.9408L7.86807 7.58825L8.42737 7.59329V7.59329H8.4285C8.52689 7.59329 8.60062 7.60317 8.65336 7.61922C8.70593 7.63523 8.72999 7.6549 8.74104 7.66941C8.76971 7.70706 8.79236 7.79971 8.75376 7.99301C8.75375 7.99305 8.75374 7.99309 8.75373 7.99312L8.37164 9.89168L8.34151 10.0413H8.49418H9.3301H9.43245L9.45264 9.941L9.85269 7.9527L9.8527 7.95271L9.853 7.95109C9.93841 7.4956 9.88972 7.12761 9.62862 6.92248C9.39863 6.73882 9.06399 6.65296 8.64591 6.64473L8.64591 6.6447H8.64345H8.05617L8.2584 5.65428L8.28903 5.50427H8.13593H7.31195Z" fill="black" stroke="black" stroke-width="0.25"/>
-</svg>
diff --git a/assets/icons/file_icons/plus.svg b/assets/icons/file_icons/plus.svg
deleted file mode 100644
index 3449da3ecd..0000000000
--- a/assets/icons/file_icons/plus.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 4V12M12 8H4" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-</svg>
diff --git a/assets/icons/file_icons/prettier.svg b/assets/icons/file_icons/prettier.svg
deleted file mode 100644
index f01230c33c..0000000000
--- a/assets/icons/file_icons/prettier.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M3 3.86328H9.51563" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-    <path d="M12 3.86328H13" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-    <path d="M10.6406 6.62628H13" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-    <path d="M5.79688 6.62628H8.15625" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-    <path d="M3 6.62628H3.35937" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-    <path d="M8.15625 9.37372H13" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-    <path d="M3 9.37372H5.64062" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-    <path d="M3 12.1094H4.54687" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-    <path d="M6.97656 12.1094H9.35938" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-    <path d="M11.8203 12.1094H13" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-</svg>
diff --git a/assets/icons/file_icons/prisma.svg b/assets/icons/file_icons/prisma.svg
deleted file mode 100644
index 2c7349da8b..0000000000
--- a/assets/icons/file_icons/prisma.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M8.52288 4.65031L6.87373 12.4973L11.5859 11.1126L8.52288 4.65031ZM7.17587 2.05794L2.67789 9.29624L2.67714 9.29747C2.43644 9.68731 2.44101 10.1739 2.69103 10.5593L4.90806 13.9715L4.92824 13.9955C5.05926 14.1506 5.23087 14.3221 5.46676 14.42C5.72045 14.5253 5.98325 14.52 6.24604 14.4427L12.6314 12.5664L12.633 12.5659C12.9671 12.4665 13.2459 12.2451 13.393 11.9333C13.5417 11.618 13.5341 11.2557 13.3784 10.9245L9.22289 2.15696L9.21685 2.14573C8.76262 1.30143 7.63198 1.29847 7.17587 2.05794Z" fill="black"/>
-</svg>
diff --git a/assets/icons/file_icons/project.svg b/assets/icons/file_icons/project.svg
deleted file mode 100644
index 509cc5f4d0..0000000000
--- a/assets/icons/file_icons/project.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.03125 3V3.03125M3.03125 3.03125V9M3.03125 3.03125C3.03125 5 6 5 6 5M3.03125 9C3.03125 11 6 11 6 11M3.03125 9V12" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<rect x="8" y="2.5" width="6" height="5" rx="1.5" fill="black"/>
-<rect x="8" y="8.46875" width="6" height="5.0625" rx="1.5" fill="black"/>
-</svg>
diff --git a/assets/icons/file_icons/puppet.svg b/assets/icons/file_icons/puppet.svg
deleted file mode 100644
index cdf903bc62..0000000000
--- a/assets/icons/file_icons/puppet.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="17" height="16" fill="none"><path fill="#000" d="M12.5 9.639V6.354H9.683L8.18 5.007V2.5H4.5v3.285h2.817l1.51 1.347v1.736l-1.51 1.347H4.5V13.5h3.681v-2.507l1.51-1.347H12.5v-.007ZM5.727 3.595h1.227V4.69H5.727V3.595Zm1.227 8.803H5.727v-1.095h1.227v1.095Z"/></svg>
diff --git a/assets/icons/file_icons/python.svg b/assets/icons/file_icons/python.svg
deleted file mode 100644
index b44fdc539d..0000000000
--- a/assets/icons/file_icons/python.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.18452 2.91638C6.01625 2.91638 4.98489 3.77623 4.91991 4.94678H4.72024C3.81569 4.94678 3 5.63731 3 6.58698V8.10978C3 9.05945 3.81569 9.74998 4.72024 9.74998H5.33631C5.67376 9.74998 6.02976 9.48559 6.02976 9.06153C6.02976 8.46056 6.51694 7.97338 7.11791 7.97338H8.27976C9.18431 7.97338 10 7.28286 10 6.33318V5.06418C10 3.83417 8.93913 2.91638 7.73214 2.91638H7.18452Z" stroke="black" stroke-width="1.2"/>
-<path d="M8.79613 13.0836C9.97889 13.0836 11.0103 12.2025 11.0702 11.0191H11.2738C12.1885 11.0191 13 10.3146 13 9.36187V7.8135C13 6.86077 12.1885 6.15625 11.2738 6.15625H10.6544C10.3099 6.15625 9.96057 6.42749 9.96057 6.84577C9.96057 7.46262 9.46051 7.96268 8.84365 7.96268H7.69494C6.78027 7.96268 5.96875 8.6672 5.96875 9.61993V10.9102C5.96875 12.148 7.02678 13.0836 8.24554 13.0836H8.79613Z" stroke="black" stroke-width="1.2"/>
-<path d="M7.20312 6.01758C7.64323 6.01758 8 5.6608 8 5.2207C8 4.7806 7.64323 4.42383 7.20312 4.42383C6.76302 4.42383 6.40625 4.7806 6.40625 5.2207C6.40625 5.6608 6.76302 6.01758 7.20312 6.01758Z" fill="black"/>
-<path d="M8.79687 11.5939C9.23698 11.5939 9.59375 11.2372 9.59375 10.7971C9.59375 10.357 9.23698 10.0002 8.79687 10.0002C8.35677 10.0002 8 10.357 8 10.7971C8 11.2372 8.35677 11.5939 8.79687 11.5939Z" fill="black"/>
-</svg>
diff --git a/assets/icons/file_icons/r.svg b/assets/icons/file_icons/r.svg
deleted file mode 100644
index 903b0519ca..0000000000
--- a/assets/icons/file_icons/r.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.76448 13.12C7.53252 13.12 7.34448 12.932 7.34448 12.7V6.50499C7.34448 6.27303 7.53252 6.08499 7.76448 6.08499H10.4242C11.0137 6.08499 11.5168 6.18003 11.9336 6.3701C12.3528 6.55788 12.6717 6.82467 12.8903 7.17047C13.1113 7.51398 13.2219 7.91817 13.2219 8.38305C13.2219 8.85021 13.1101 9.25212 12.8865 9.58875C12.6628 9.9231 12.3389 10.1796 11.9145 10.3582C11.4927 10.5368 10.982 10.6261 10.3823 10.6261H8.74024C8.50828 10.6261 8.32023 10.4381 8.32023 10.2061V9.85074C8.32023 9.61878 8.50828 9.43074 8.74023 9.43074H10.1155C10.4306 9.43074 10.6923 9.39181 10.9006 9.31395C11.109 9.23609 11.264 9.11929 11.3656 8.96357C11.4698 8.80785 11.5219 8.61434 11.5219 8.38305C11.5219 8.14946 11.4698 7.95252 11.3656 7.79222C11.264 7.63191 11.1077 7.51054 10.8968 7.4281C10.6885 7.34337 10.4255 7.301 10.1078 7.301H9.41488C9.18292 7.301 8.99488 7.48904 8.99488 7.721V12.7C8.99488 12.932 8.80684 13.12 8.57488 13.12H7.76448ZM11.3235 9.91852C11.4703 9.91852 11.6065 9.99524 11.6826 10.1208L13.1137 12.4823C13.2833 12.7622 13.0818 13.12 12.7545 13.12H11.9174C11.7691 13.12 11.6318 13.0418 11.5562 12.9142L10.1561 10.5527C9.99007 10.2727 10.1919 9.91852 10.5173 9.91852H11.3235Z" fill="black"/>
-<path d="M11 4.62028C10.1708 4.15433 9.15422 3.88 8.05581 3.88C5.26356 3.88 3 5.65274 3 7.83952C3 9.35792 4.09133 10.6767 5.69321 11.341" stroke="black" stroke-width="1.26" stroke-linecap="round"/>
-</svg>
diff --git a/assets/icons/file_icons/react.svg b/assets/icons/file_icons/react.svg
deleted file mode 100644
index c4c9238584..0000000000
--- a/assets/icons/file_icons/react.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.99752 9.14577C8.62961 9.14577 9.14201 8.63336 9.14201 8.00127C9.14201 7.36919 8.62961 6.85678 7.99752 6.85678C7.36543 6.85678 6.85303 7.36919 6.85303 8.00127C6.85303 8.63336 7.36543 9.14577 7.99752 9.14577Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M5.37507 12.5467C5.35849 12.5371 5.26876 12.4764 5.21215 12.1996C5.15576 11.924 5.15423 11.5219 5.24075 11.0018C5.25336 10.926 5.2677 10.8485 5.28376 10.7695C5.61535 10.8289 5.96088 10.8775 6.31735 10.9146C6.52765 11.2048 6.74254 11.4797 6.9598 11.7371C6.8994 11.7906 6.83947 11.8417 6.7801 11.8906C6.37292 12.2255 6.02397 12.4252 5.75706 12.5142C5.48905 12.6036 5.39166 12.5562 5.37507 12.5467ZM4.63463 8.00002C4.48846 7.67278 4.35781 7.34921 4.24347 7.03232C4.16699 7.05793 4.09271 7.08426 4.0207 7.11126C3.52701 7.29639 3.17959 7.49875 2.96906 7.6854C2.75767 7.87282 2.75 7.98085 2.75 8C2.75 8.01916 2.75767 8.12719 2.96906 8.31461C3.17959 8.50126 3.52701 8.70361 4.0207 8.88875C4.09271 8.91575 4.167 8.94208 4.24348 8.96769C4.35782 8.65081 4.48846 8.32725 4.63463 8.00002ZM3.49402 5.70677C3.6016 5.66643 3.71247 5.6276 3.82645 5.59035C3.80173 5.47305 3.77992 5.35765 3.76108 5.24434C3.65732 4.62055 3.63633 4.01923 3.74257 3.49981C3.84858 2.98153 4.10358 2.45543 4.62507 2.15435C5.14656 1.85326 5.72968 1.89548 6.23152 2.06281C6.73448 2.23051 7.24474 2.54935 7.73308 2.95111C7.82179 3.02409 7.91084 3.10068 8.00007 3.18075C8.0893 3.10068 8.17835 3.02409 8.26706 2.9511C8.7554 2.54935 9.26566 2.23051 9.76862 2.06281C10.2705 1.89548 10.8536 1.85326 11.3751 2.15435C11.8966 2.45543 12.1516 2.98153 12.2576 3.49981C12.3638 4.01923 12.3428 4.62055 12.2391 5.24434C12.2202 5.35766 12.1984 5.47308 12.1737 5.59039C12.2876 5.62763 12.3984 5.66644 12.506 5.70677C13.0981 5.9288 13.6293 6.21129 14.026 6.56301C14.4219 6.91396 14.75 7.39783 14.75 8C14.75 8.60218 14.4219 9.08605 14.026 9.437C13.6293 9.78872 13.0981 10.0712 12.506 10.2932C12.3984 10.3336 12.2876 10.3724 12.1737 10.4096C12.1984 10.5269 12.2202 10.6424 12.2391 10.7557C12.3428 11.3795 12.3638 11.9808 12.2576 12.5002C12.1516 13.0185 11.8966 13.5446 11.3751 13.8457C10.8536 14.1468 10.2705 14.1046 9.76862 13.9372C9.26566 13.7695 8.7554 13.4507 8.26706 13.0489C8.17835 12.976 8.08931 12.8994 8.00007 12.8193C7.91084 12.8994 7.82179 12.976 7.73308 13.0489C7.24474 13.4507 6.73448 13.7695 6.23152 13.9372C5.72968 14.1046 5.14657 14.1468 4.62507 13.8457C4.10358 13.5446 3.84859 13.0185 3.74257 12.5002C3.63633 11.9808 3.65732 11.3795 3.76108 10.7557C3.77993 10.6424 3.80174 10.527 3.82646 10.4097C3.71248 10.3724 3.6016 10.3336 3.49402 10.2932C2.90192 10.0712 2.37066 9.78872 1.97395 9.437C1.57812 9.08605 1.25 8.60218 1.25 8C1.25 7.39783 1.57812 6.91396 1.97395 6.56301C2.37066 6.21129 2.90192 5.9288 3.49402 5.70677ZM9.22005 11.8906C9.16067 11.8417 9.10075 11.7906 9.04034 11.7371C9.25761 11.4797 9.4725 11.2048 9.68281 10.9145C10.0393 10.8775 10.3848 10.8289 10.7164 10.7695C10.7324 10.8485 10.7468 10.926 10.7594 11.0018C10.8459 11.5219 10.8444 11.924 10.788 12.1996C10.7314 12.4764 10.6417 12.5371 10.6251 12.5467C10.6085 12.5562 10.5111 12.6036 10.2431 12.5142C9.97617 12.4252 9.62722 12.2255 9.22005 11.8906ZM6.31737 5.08544C6.52766 4.79525 6.74254 4.52034 6.9598 4.26289C6.89939 4.20948 6.83947 4.15832 6.7801 4.10948C6.37292 3.77449 6.02397 3.57479 5.75706 3.4858C5.48905 3.39644 5.39165 3.44381 5.37507 3.45339C5.35849 3.46296 5.26876 3.52362 5.21214 3.80041C5.15576 4.07605 5.15423 4.4781 5.24075 4.99822C5.25336 5.07405 5.2677 5.15152 5.28375 5.23053C5.61535 5.1711 5.96089 5.12247 6.31737 5.08544ZM9.04034 4.26289C9.2576 4.52034 9.47249 4.79526 9.68278 5.08546C10.0393 5.12248 10.3848 5.17112 10.7164 5.23055C10.7324 5.15154 10.7468 5.07406 10.7594 4.99822C10.8459 4.4781 10.8444 4.07605 10.788 3.80041C10.7314 3.52362 10.6417 3.46296 10.6251 3.45339C10.6085 3.44381 10.5111 3.39644 10.2431 3.4858C9.97617 3.57479 9.62722 3.77449 9.22005 4.10947C9.16067 4.15832 9.10074 4.20948 9.04034 4.26289ZM11.3655 8.00002C11.5117 8.32723 11.6423 8.65078 11.7566 8.96765C11.8331 8.94205 11.9073 8.91574 11.9793 8.88875C12.473 8.70361 12.8204 8.50126 13.0309 8.31461C13.2423 8.12719 13.25 8.01916 13.25 8C13.25 7.98085 13.2423 7.87282 13.0309 7.6854C12.8204 7.49875 12.473 7.29639 11.9793 7.11126C11.9073 7.08427 11.8331 7.05796 11.7567 7.03237C11.6423 7.34924 11.5117 7.6728 11.3655 8.00002ZM7.99752 10.1458C9.18189 10.1458 10.142 9.18565 10.142 8.00127C10.142 6.8169 9.18189 5.85678 7.99752 5.85678C6.81315 5.85678 5.85303 6.8169 5.85303 8.00127C5.85303 9.18564 6.81315 10.1458 7.99752 10.1458Z" fill="black"/>
-</svg>
diff --git a/assets/icons/file_icons/replace.svg b/assets/icons/file_icons/replace.svg
deleted file mode 100644
index 287328e82e..0000000000
--- a/assets/icons/file_icons/replace.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.99988 13C5.97267 13 4.22723 11.7936 3.44238 10.0595M7.99988 3C10.1122 3 11.9185 4.30981 12.6511 6.16152" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M2.65625 3.29688C3.00143 3.29688 3.28125 3.01705 3.28125 2.67188C3.28125 2.3267 3.00143 2.04688 2.65625 2.04688C2.31107 2.04688 2.03125 2.3267 2.03125 2.67188C2.03125 3.01705 2.31107 3.29688 2.65625 3.29688Z" fill="black"/>
-<path d="M4.71094 3.29688C5.05612 3.29688 5.33594 3.01705 5.33594 2.67188C5.33594 2.3267 5.05612 2.04688 4.71094 2.04688C4.36576 2.04688 4.08594 2.3267 4.08594 2.67188C4.08594 3.01705 4.36576 3.29688 4.71094 3.29688Z" fill="black"/>
-<path d="M5.96094 4.99219C6.30612 4.99219 6.58594 4.71237 6.58594 4.36719C6.58594 4.02201 6.30612 3.74219 5.96094 3.74219C5.61576 3.74219 5.33594 4.02201 5.33594 4.36719C5.33594 4.71237 5.61576 4.99219 5.96094 4.99219Z" fill="black"/>
-<path d="M4.71094 6.42188C5.05612 6.42188 5.33594 6.14205 5.33594 5.79688C5.33594 5.4517 5.05612 5.17188 4.71094 5.17188C4.36576 5.17188 4.08594 5.4517 4.08594 5.79688C4.08594 6.14205 4.36576 6.42188 4.71094 6.42188Z" fill="black"/>
-<path d="M5.60156 8.29688C5.94674 8.29688 6.22656 8.01705 6.22656 7.67188C6.22656 7.3267 5.94674 7.04688 5.60156 7.04688C5.25638 7.04688 4.97656 7.3267 4.97656 7.67188C4.97656 8.01705 5.25638 8.29688 5.60156 8.29688Z" fill="black"/>
-<path d="M2.65625 5.79687C3.00143 5.79687 3.28125 5.51705 3.28125 5.17187C3.28125 4.8267 3.00143 4.54688 2.65625 4.54688C2.31107 4.54688 2.03125 4.8267 2.03125 5.17187C2.03125 5.51705 2.31107 5.79687 2.65625 5.79687Z" fill="black"/>
-<path d="M2.65625 8.29688C3.00143 8.29688 3.28125 8.01705 3.28125 7.67188C3.28125 7.3267 3.00143 7.04688 2.65625 7.04688C2.31107 7.04688 2.03125 7.3267 2.03125 7.67188C2.03125 8.01705 2.31107 8.29688 2.65625 8.29688Z" fill="black"/>
-<path d="M11.7802 11.8195C11.838 11.8195 11.8906 11.8527 11.9155 11.9048L12.7174 13.5811C12.8088 13.7721 13.0017 13.8938 13.2135 13.8938H13.3394C13.7483 13.8938 14.0142 13.4635 13.8314 13.0978L13.1619 11.7589C13.1232 11.6816 13.1582 11.5823 13.241 11.5349C13.7565 11.2397 14.0695 10.6686 14.0695 10.0039C14.0695 9.43362 13.8777 8.97007 13.5248 8.64952C13.1725 8.32951 12.6652 8.15704 12.043 8.15704H10.496C10.1923 8.15704 9.94604 8.40328 9.94604 8.70704V13.3438C9.94604 13.6475 10.1923 13.8938 10.496 13.8938H10.6015C10.9053 13.8938 11.1516 13.6475 11.1516 13.3438V11.9695C11.1516 11.8867 11.2187 11.8195 11.3016 11.8195H11.7802ZM11.1516 9.31329C11.1516 9.23045 11.2187 9.16329 11.3016 9.16329H11.8984C12.2023 9.16329 12.4371 9.24491 12.5954 9.38815C12.7529 9.53081 12.8406 9.73994 12.8406 10.0078C12.8406 10.2816 12.751 10.4946 12.5909 10.6397C12.4302 10.7854 12.1925 10.868 11.8867 10.868H11.3016C11.2187 10.868 11.1516 10.8008 11.1516 10.718V9.31329Z" fill="black" stroke="black" stroke-width="0.25"/>
-</svg>
diff --git a/assets/icons/file_icons/replace_all.svg b/assets/icons/file_icons/replace_all.svg
deleted file mode 100644
index d3cf503e32..0000000000
--- a/assets/icons/file_icons/replace_all.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.94725 6.87672L4.94725 6.87672L5.74909 8.553C5.86125 8.78748 6.09809 8.93673 6.35802 8.93673H6.48391C6.98569 8.93673 7.31204 8.40867 7.08765 7.95986L6.97585 8.01576L7.08765 7.95986L6.41818 6.62094C6.41818 6.62093 6.41818 6.62093 6.41818 6.62093C6.41567 6.6159 6.414 6.60731 6.41826 6.59524C6.42256 6.58306 6.43223 6.57013 6.44764 6.56131L6.38553 6.45283L6.44764 6.56131C7.00658 6.24123 7.33902 5.62588 7.33902 4.92189C7.33902 4.32236 7.13648 3.82296 6.75336 3.47496L6.66932 3.56749L6.75336 3.47496C6.37232 3.12885 5.83204 2.95001 5.18746 2.95001H3.64058C3.26779 2.95001 2.96558 3.25222 2.96558 3.62501V8.26173C2.96558 8.63453 3.26779 8.93673 3.64058 8.93673H3.74605C4.11884 8.93673 4.42105 8.63453 4.42105 8.26173V6.88751C4.42105 6.87371 4.43224 6.86251 4.44605 6.86251H4.92471C4.93433 6.86251 4.9431 6.86804 4.94725 6.87672ZM5.65595 4.39879L5.65595 4.3988C5.78276 4.51357 5.86012 4.68648 5.86012 4.92579C5.86012 5.17095 5.78081 5.34783 5.65146 5.46508L5.65146 5.46508C5.51987 5.58438 5.31538 5.66095 5.03121 5.66095H4.44605C4.43224 5.66095 4.42105 5.64976 4.42105 5.63595V4.23126C4.42105 4.21746 4.43224 4.20626 4.44605 4.20626H5.04293C5.32535 4.20626 5.52689 4.28197 5.65595 4.39879Z" fill="black" stroke="black" stroke-width="0.25"/>
-<path d="M10.3281 7.65625V10.3281M10.3281 10.3281V13M10.3281 10.3281H13M10.3281 10.3281H7.65625M10.3281 10.3281L12.1094 8.54688M10.3281 10.3281L8.54688 12.1094M10.3281 10.3281L12.1094 12.1094M10.3281 10.3281L8.54688 8.54688" stroke="black" stroke-width="1.25" stroke-linecap="round"/>
-</svg>
diff --git a/assets/icons/file_icons/replace_next.svg b/assets/icons/file_icons/replace_next.svg
deleted file mode 100644
index a9a9fc91f5..0000000000
--- a/assets/icons/file_icons/replace_next.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M8.5 6.88672C10.433 6.88672 12 8.45372 12 10.3867V13M12 13L14 11M12 13L10 11" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M4.94725 6.87672L4.94725 6.87672L5.74909 8.553C5.86125 8.78748 6.09809 8.93673 6.35802 8.93673H6.48391C6.98569 8.93673 7.31204 8.40867 7.08765 7.95986L6.97585 8.01576L7.08765 7.95986L6.41818 6.62094C6.41818 6.62093 6.41818 6.62093 6.41818 6.62093C6.41567 6.6159 6.414 6.60731 6.41826 6.59524C6.42256 6.58306 6.43223 6.57013 6.44764 6.56131L6.38553 6.45283L6.44764 6.56131C7.00658 6.24123 7.33902 5.62588 7.33902 4.92189C7.33902 4.32236 7.13648 3.82296 6.75336 3.47496L6.66932 3.56749L6.75336 3.47496C6.37232 3.12885 5.83204 2.95001 5.18746 2.95001H3.64058C3.26779 2.95001 2.96558 3.25222 2.96558 3.62501V8.26173C2.96558 8.63453 3.26779 8.93673 3.64058 8.93673H3.74605C4.11884 8.93673 4.42105 8.63453 4.42105 8.26173V6.88751C4.42105 6.87371 4.43224 6.86251 4.44605 6.86251H4.92471C4.93433 6.86251 4.9431 6.86804 4.94725 6.87672ZM5.65595 4.39879L5.65595 4.3988C5.78276 4.51357 5.86012 4.68648 5.86012 4.92579C5.86012 5.17095 5.78081 5.34783 5.65146 5.46508L5.65146 5.46508C5.51987 5.58438 5.31538 5.66095 5.03121 5.66095H4.44605C4.43224 5.66095 4.42105 5.64976 4.42105 5.63595V4.23126C4.42105 4.21746 4.43224 4.20626 4.44605 4.20626H5.04293C5.32535 4.20626 5.52689 4.28197 5.65595 4.39879Z" fill="black" stroke="black" stroke-width="0.25"/>
-</svg>
diff --git a/assets/icons/file_icons/roc.svg b/assets/icons/file_icons/roc.svg
deleted file mode 100644
index c09a5dde7b..0000000000
--- a/assets/icons/file_icons/roc.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.51497 2.02702L1.92042 1.95067C1.69543 1.94589 1.57917 2.21756 1.73796 2.37702L6.24865 6.9068C6.42388 7.08277 6.72071 6.92326 6.67067 6.68002L5.75454 2.22659C5.73103 2.11231 5.63161 2.02949 5.51497 2.02702Z" fill="black" fill-opacity="0.5"/>
-<path d="M8.05816 7.38492L12.1366 8.02844C12.3704 8.06532 12.5198 7.78697 12.3599 7.61255L7.30439 2.09814C7.13336 1.91159 6.82522 2.06811 6.87499 2.31624L7.852 7.18714C7.87257 7.28971 7.95483 7.36862 8.05816 7.38492Z" fill="black"/>
-<path d="M9.0952 10.9797L11.3824 9.35081C11.564 9.22151 11.4983 8.93722 11.2785 8.90058L8.496 8.43683C8.31974 8.40746 8.17047 8.56712 8.21162 8.74101L8.70689 10.8337C8.74777 11.0064 8.95062 11.0827 9.0952 10.9797Z" fill="black" fill-opacity="0.5"/>
-<path d="M5.10282 13.9632L7.59108 12.4532C7.68331 12.3972 7.72923 12.2884 7.70498 12.1832L6.75736 8.07484C6.699 7.8218 6.34133 7.81448 6.27266 8.06491L4.73201 13.6834C4.67223 13.9014 4.90954 14.0805 5.10282 13.9632Z" fill="black"/>
-<path d="M11.3183 4.89351L13.1588 7.03149L15.535 6.14302C15.7099 6.07761 15.754 5.85043 15.6161 5.72438L13.7222 3.99219L11.4546 4.48614C11.2695 4.52645 11.1947 4.74995 11.3183 4.89351Z" fill="black"/>
-</svg>
diff --git a/assets/icons/file_icons/ruby.svg b/assets/icons/file_icons/ruby.svg
deleted file mode 100644
index cd30f83286..0000000000
--- a/assets/icons/file_icons/ruby.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.00005 8.90002L5.80005 13C7.10005 13 9.50005 11.5 10.5 10.5L6.00005 8.90002Z" fill="black"/>
-<path d="M12.9999 5.79999L8.8999 5.99999L10.4999 10.5L12.9999 13V5.79999Z" fill="black"/>
-<path d="M13 5.79999V13H5.80005" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3.3 8.2L3 11C3 12.8 4.6 13 5.8 13C7.5 13 9.5 11.5 10.5 10.5C11.5 9.5 13 7.5 13 5.8C13 4.6 12.8 3 11 3L8.2 3.3" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3.61622 8.99028C4.35822 9.73228 6.16274 9.13077 7.64673 7.64678C9.13072 6.16278 9.73223 4.35827 8.99023 3.61627C8.24824 2.87427 6.44372 3.47578 4.95972 4.95977C3.47573 6.44376 2.87422 8.24828 3.61622 8.99028Z" stroke="black" stroke-width="1.25"/>
-</svg>
diff --git a/assets/icons/file_icons/rust.svg b/assets/icons/file_icons/rust.svg
deleted file mode 100644
index 9e4dc57adb..0000000000
--- a/assets/icons/file_icons/rust.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.27935 10.9821C5.32063 10.4038 4.9204 9.89049 4.35998 9.80276L3.60081 9.68387C3.37979 9.64945 3.20167 9.48001 3.15225 9.25614L3.01378 8.63511C2.96382 8.41235 3.05233 8.1807 3.23696 8.05125L3.8631 7.61242C4.33337 7.28297 4.47456 6.6369 4.18621 6.13364L3.79467 5.45092C3.68118 5.25261 3.69801 5.00374 3.83757 4.82321L4.22314 4.32436C4.3627 4.14438 4.59621 4.06994 4.81071 4.13772L5.57531 4.37769C6.11944 4.54879 6.70048 4.26159 6.90683 3.71886L7.1811 2.99782C7.26255 2.78395 7.46345 2.64285 7.68772 2.6423L8.31007 2.64063C8.53434 2.64007 8.73579 2.78006 8.81834 2.99337L9.09965 3.72275C9.30821 4.26214 9.88655 4.54712 10.429 4.37714L11.1632 4.14716C11.3772 4.07994 11.6096 4.15382 11.7492 4.3327L12.1374 4.83099" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8.76988 11.5933C8.76988 11.6595 8.8236 11.7133 8.88988 11.7133H8.97588C9.32602 11.7133 9.60988 11.9971 9.60988 12.3472C9.60988 12.6974 9.32602 12.9812 8.97588 12.9812H7.05587C6.70573 12.9812 6.42188 12.6974 6.42188 12.3472C6.42188 11.9971 6.70573 11.7133 7.05587 11.7133H7.14188C7.20815 11.7133 7.26188 11.6595 7.26188 11.5933V7.66925C7.26188 7.60298 7.20815 7.54925 7.14188 7.54925H7.05588C6.70573 7.54925 6.42188 7.2654 6.42188 6.91525C6.42188 6.5651 6.70573 6.28125 7.05588 6.28125H9.89988C11.0518 6.28125 12.8619 6.71487 12.8619 8.15185C12.8619 8.67078 12.7284 9.10362 12.4642 9.45348C12.1981 9.79765 11.8458 10.0564 11.4056 10.2293C11.3782 10.2401 11.3673 10.273 11.3829 10.298L12.2163 11.6342C12.247 11.6834 12.3008 11.7133 12.3588 11.7133H12.7319C13.082 11.7133 13.3659 11.9971 13.3659 12.3472C13.3659 12.6974 13.082 12.9812 12.7319 12.9812H11.5637C11.4955 12.9812 11.432 12.9465 11.3952 12.889L9.96523 10.6541C9.92847 10.5966 9.86495 10.5618 9.79675 10.5618H8.96988C8.85942 10.5618 8.76988 10.6514 8.76988 10.7619V11.5933ZM9.61188 7.54925C10.0296 7.54925 11.125 7.54925 11.2339 8.18785C11.2975 8.56123 11.1181 8.86557 10.8812 9.07715C10.6423 9.29046 10.2053 9.38985 9.58788 9.38985H8.86988C8.81465 9.38985 8.76988 9.34508 8.76988 9.28985V7.64925C8.76988 7.59402 8.81465 7.54925 8.86988 7.54925H9.61188Z" fill="black"/>
-</svg>
diff --git a/assets/icons/file_icons/sass.svg b/assets/icons/file_icons/sass.svg
deleted file mode 100644
index 57bb32b098..0000000000
--- a/assets/icons/file_icons/sass.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M6.92096 7.00668C7.87408 7.83549 10.0987 7.48203 10.9376 7.06254C12.8751 6.09381 13.9407 4.39379 12.6407 2.90629C11.0157 1.04692 6.24221 2.49998 4.89844 3.40625C3.55467 4.31252 2.67972 5.53126 2.89071 7.1719C3.1017 8.81254 4.68758 9.7422 6.03128 10.3203C5.38786 10.5616 3.8517 11.0388 3.3125 11.7188C2.71341 12.4742 3.04343 14 4.51577 14C7.15639 14 7.59539 11.1486 7.14847 10.4375C7.88773 10.1295 8.49597 9.96169 9.40138 9.77081C9.63831 9.72087 9.65457 9.46395 9.41295 9.44827C8.80252 9.40864 7.30567 9.8489 6.92096 9.97657C5.78909 9.35157 4.51016 7.93818 4.59378 6.87501C4.68676 5.6928 5.27676 5.07603 6.84508 4.21876C8.01705 3.57813 10.258 3.10695 11.25 3.62501C12.6563 4.35936 10.7875 5.75599 9.92969 6.32031C9.28179 6.74656 8.21971 6.77513 7.22979 6.61435C6.99371 6.576 6.74048 6.84974 6.92096 7.00668ZM5.6719 12.4643C6.35508 11.9894 6.45471 11.1076 6.29955 10.8844C5.76663 11.0874 4.36593 11.9102 4.75111 12.4643C4.90628 12.6875 5.31358 12.7134 5.6719 12.4643Z" fill="black"/>
-</svg>
diff --git a/assets/icons/file_icons/scala.svg b/assets/icons/file_icons/scala.svg
deleted file mode 100644
index 0884cc96f4..0000000000
--- a/assets/icons/file_icons/scala.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.5827 1.27457C10.4978 2.48798 6.32365 2.94703 3.49893 2.99561C3.22283 3.00036 3.00001 3.22384 3.00001 3.49998L3.00002 6.00003C3.00002 6.27617 3.22284 6.50038 3.49895 6.49563C6.42334 6.44533 10.7942 5.95506 12.7954 4.64327C12.927 4.557 13 4.40741 13 4.25004L13 1.50027C13 1.29426 12.7607 1.17094 12.5827 1.27457Z" fill="black"/>
-<path d="M12.3072 6.51584C12.6851 6.6855 12.8539 7.12936 12.6842 7.50724C12.5145 7.88511 12.0707 8.05391 11.6928 7.88425L12.3072 6.51584ZM3 5.02142C4.32178 5.02142 6.01669 5.1159 7.68605 5.34579C9.34359 5.57406 11.0313 5.94302 12.3072 6.51584L11.6928 7.88425C10.611 7.39853 9.08921 7.05318 7.48142 6.83177C5.88546 6.61199 4.25922 6.52142 3 6.52142L3 5.02142Z" fill="black"/>
-<path d="M3 10.0214C5.581 10.0214 9.64229 10.3915 12 11.45" stroke="black" stroke-width="1.2"/>
-<path d="M12.1401 10.0067C9.94879 11.0472 6.13586 11.4503 3.49893 11.4956C3.22283 11.5004 3.00001 11.7238 3.00001 12L3.00002 14.5C3.00002 14.7762 3.22284 15.0004 3.49895 14.9956C6.42334 14.9453 10.7942 14.4551 12.7954 13.1433C12.927 13.057 13 12.9074 13 12.75L13 10.5002C13 10.0882 12.5123 9.82995 12.1401 10.0067Z" fill="black"/>
-<path d="M12.1401 5.75668C9.94879 6.7972 6.13586 7.20026 3.49893 7.24561C3.22283 7.25036 3.00001 7.47384 3.00001 7.74998L3.00002 10.25C3.00002 10.5262 3.22284 10.7504 3.49895 10.7456C6.42334 10.6953 10.7942 10.2051 12.7954 8.89327C12.927 8.807 13 8.65741 13 8.50004L13 6.25023C13 5.83821 12.5123 5.57995 12.1401 5.75668Z" fill="black"/>
-</svg>
diff --git a/assets/icons/file_icons/settings.svg b/assets/icons/file_icons/settings.svg
deleted file mode 100644
index d308135ff1..0000000000
--- a/assets/icons/file_icons/settings.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.16089 10.2476L3.99598 10.3784C4.61244 10.4749 5.05269 11.0395 5.00728 11.6755L4.94576 12.5377C4.92784 12.789 5.06165 13.0255 5.28326 13.1348L5.90091 13.4391C6.12253 13.5485 6.38717 13.5075 6.56817 13.3371L7.1888 12.7505C7.64641 12.3178 8.35245 12.3178 8.81059 12.7505L9.43121 13.3371C9.61222 13.5081 9.87629 13.5485 10.0985 13.4391L10.7173 13.1341C10.9384 13.0255 11.0716 12.7895 11.0537 12.539L10.9921 11.6755C10.9467 11.0395 11.3869 10.4749 12.0033 10.3784L12.8385 10.2476C13.0817 10.2097 13.2776 10.0233 13.3325 9.77768L13.4848 9.09455C13.5398 8.8489 13.4425 8.59408 13.2393 8.45229L12.5422 7.96404C12.0279 7.60355 11.8708 6.89963 12.1814 6.34659L12.6025 5.59745C12.7249 5.3793 12.7047 5.10616 12.5511 4.9094L12.1241 4.36128C11.9706 4.16451 11.7149 4.08325 11.4795 4.15719L10.6719 4.41016C10.0752 4.59714 9.43903 4.28367 9.20962 3.69035L8.90017 2.88803C8.80937 2.65339 8.58777 2.4994 8.34108 2.5L7.65649 2.50184C7.40979 2.50244 7.1888 2.65766 7.09921 2.89291L6.79751 3.68607C6.57053 4.28307 5.93138 4.59898 5.33284 4.41077L4.49178 4.1468C4.25583 4.07225 3.99897 4.15413 3.84545 4.35212L3.42133 4.90084C3.26781 5.09943 3.2493 5.37319 3.37414 5.59133L3.80483 6.34232C4.12201 6.89591 3.96671 7.60659 3.44941 7.96897L2.76065 8.45169C2.55756 8.59408 2.4602 8.84891 2.51516 9.09393L2.66747 9.77708C2.72184 10.0233 2.91777 10.2097 3.16089 10.2476Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.41432 6.83576C8.63332 6.05481 7.36676 6.05476 6.58575 6.83571C5.8048 7.61672 5.80476 8.88327 6.58571 9.66427C7.36671 10.4452 8.63326 10.4452 9.41426 9.66432C10.1952 8.88332 10.1952 7.61676 9.41432 6.83576Z" fill="black"/>
-</svg>
diff --git a/assets/icons/file_icons/surrealql.svg b/assets/icons/file_icons/surrealql.svg
deleted file mode 100644
index 076f93e808..0000000000
--- a/assets/icons/file_icons/surrealql.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.628 11.0743V10.4575H8.45562L8.65084 10.2445C8.75911 10.1264 8.96952 9.79454 9.11862 9.50789C9.52153 8.73047 9.51798 7.25107 9.11862 6.43992C8.58614 5.35722 7.49453 4.56381 6.24942 4.35703C4.59252 4.08192 2.86196 5.00312 2.14045 6.54287C1.77038 7.33182 1.77038 8.64437 2.14045 9.43333C2.45905 10.1122 3.11309 10.8204 3.73609 11.1595C4.51439 11.5828 5.18264 11.676 7.51312 11.6848L9.62627 11.6928L9.628 11.0743ZM5.30605 10.169C4.24109 10.0111 3.45215 9.07124 3.45659 7.96813C3.45659 7.33004 3.70064 6.80022 4.18697 6.36182C4.67685 5.91986 5.1312 5.77344 5.86602 5.82048C7.00287 5.89236 7.82382 6.79845 7.82382 7.98056C7.82382 8.61332 7.71996 8.91682 7.33036 9.42534C6.90172 9.98444 6.08345 10.2853 5.30692 10.1699M15.1374 10.9802V10.2684H11.8138V4.47509H10.1986V11.6928H15.1374V10.9802Z" fill="black"/>
-</svg>
diff --git a/assets/icons/file_icons/swift.svg b/assets/icons/file_icons/swift.svg
deleted file mode 100644
index 69745f0e76..0000000000
--- a/assets/icons/file_icons/swift.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.3114 6.89894C7.21972 6.83689 7.11826 6.76698 7.0068 6.68855C6.33971 6.21915 5.31468 5.44486 3.88659 4.22728C3.79832 4.15202 3.68759 4.16943 3.6211 4.22886C3.55344 4.28933 3.52517 4.39985 3.59834 4.49421C4.15409 5.21081 5.04887 6.3378 5.98199 7.40344C6.91019 8.46347 7.88487 9.47285 8.60357 9.95164C8.03666 10.2705 5.68532 11.338 2.40116 9.29944C2.31737 9.24742 2.22047 9.26251 2.15977 9.32127C2.09752 9.38152 2.0813 9.48043 2.13908 9.56483C2.79324 10.5204 4.9009 13.1 8.60023 13.1C9.62606 13.1 10.2912 12.8273 10.8233 12.5566C10.9172 12.5088 11.0053 12.4621 11.0897 12.4173C11.247 12.3338 11.3916 12.257 11.5376 12.1929C11.7578 12.0963 11.9683 12.0349 12.2004 12.0349C12.9242 12.0349 13.4385 12.5931 13.6594 12.8899C13.7076 12.9548 13.784 12.9808 13.8529 12.9722C13.9231 12.9634 13.9934 12.9169 14.0173 12.8328C14.2142 12.1397 14.0297 11.4275 13.7766 10.8631C13.5227 10.2968 13.1935 9.86471 13.0802 9.72396C13.0787 9.72213 13.0784 9.72084 13.0783 9.72023C13.0782 9.71966 13.0781 9.71868 13.0787 9.717C13.1691 9.46587 13.4833 8.45239 13.229 7.08016C12.9743 5.70523 12.1508 3.9805 9.98231 2.30796C9.88426 2.23234 9.77145 2.27432 9.71152 2.32965C9.65164 2.38494 9.60164 2.49203 9.66229 2.59608C10.2077 3.53179 11.1117 5.55203 10.3965 7.75745C9.84333 7.34896 7.33064 5.47401 5.52262 3.80176C5.429 3.71517 5.30983 3.74724 5.24432 3.80203C5.17859 3.85699 5.12552 3.97039 5.20033 4.07715C5.59393 4.6389 6.11182 5.36404 6.60435 6.01078C6.85108 6.33475 7.09332 6.6416 7.3114 6.89894Z" fill="black" stroke="black" stroke-width="0.2"/>
-</svg>
diff --git a/assets/icons/file_icons/tcl.svg b/assets/icons/file_icons/tcl.svg
deleted file mode 100644
index 1bd7c4a551..0000000000
--- a/assets/icons/file_icons/tcl.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.03125 13C3.46875 12.2812 3.68556 12.0378 4.0625 11.5312M4.0625 11.5312C4.0625 9.86595 4.27768 8.02844 4.75687 7M4.0625 11.5312C4.75687 10.5981 6.6875 8.57812 7.92188 7.54688M4.0625 11.5312C7.875 11.5312 10.0507 9.46738 11.4062 8.03125C11.5818 7.84528 11.2307 7.34164 10.9157 6.96235C10.7718 6.78906 10.8964 6.50073 11.1213 6.48823C11.6657 6.45798 12.3874 6.36175 12.5 6.06684C12.7544 5.4003 12.9585 4.2437 13.0409 3.28832C13.0541 3.13644 12.9264 3.01119 12.7745 3.0243C10.5824 3.21343 8.22052 3.5262 6.5 4.82764" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-</svg>
diff --git a/assets/icons/file_icons/terminal.svg b/assets/icons/file_icons/terminal.svg
deleted file mode 100644
index d3742fa11a..0000000000
--- a/assets/icons/file_icons/terminal.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2.5 4C2.5 3.17157 3.17157 2.5 4 2.5H12C12.8284 2.5 13.5 3.17157 13.5 4V12C13.5 12.8284 12.8284 13.5 12 13.5H4C3.17157 13.5 2.5 12.8284 2.5 12V4ZM4.66789 10.7071L5.02145 10.3536L4.66789 10.7071C5.05842 11.0976 5.69158 11.0976 6.08211 10.7071L8.08211 8.70711C8.47263 8.31658 8.47263 7.68342 8.08211 7.29289L6.08211 5.29289C5.69158 4.90237 5.05842 4.90237 4.66789 5.29289C4.27737 5.68342 4.27737 6.31658 4.66789 6.70711L5.96079 8L4.66789 9.29289C4.27737 9.68342 4.27737 10.3166 4.66789 10.7071ZM8.625 9C8.07271 9 7.625 9.44771 7.625 10C7.625 10.5523 8.07271 11 8.625 11H10.9062C11.4585 11 11.9062 10.5523 11.9062 10C11.9062 9.44771 11.4585 9 10.9062 9H8.625Z" fill="black" stroke="black"/>
-</svg>
diff --git a/assets/icons/file_icons/terraform.svg b/assets/icons/file_icons/terraform.svg
deleted file mode 100644
index 47bdc0f65f..0000000000
--- a/assets/icons/file_icons/terraform.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M2.25 2.6087C2.25 2.21883 2.67637 1.97896 3.00958 2.18136L5.1573 3.48594C5.30658 3.57662 5.39772 3.73862 5.39772 3.91328V6.56727C5.39772 6.95713 4.97135 7.19701 4.63814 6.99461L2.49042 5.69003C2.34114 5.59935 2.25 5.43735 2.25 5.26269V2.6087Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M6.37134 9.83874C6.37134 9.44888 6.79771 9.209 7.13092 9.4114L9.27863 10.716C9.42791 10.8067 9.51906 10.9687 9.51906 11.1433V13.7973C9.51906 14.1872 9.09269 14.4271 8.75948 14.2247L6.61176 12.9201C6.46248 12.8294 6.37134 12.6674 6.37134 12.4927V9.83874Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M6.37134 4.99645C6.37134 4.60659 6.79771 4.36672 7.13092 4.56912L9.27863 5.8737C9.42791 5.96437 9.51906 6.12638 9.51906 6.30104V8.95503C9.51906 9.34489 9.09269 9.58477 8.75948 9.38237L6.61176 8.07778C6.46248 7.98711 6.37134 7.82511 6.37134 7.65045V4.99645Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M13.7 4.99645C13.7 4.60659 13.2736 4.36672 12.9404 4.56912L10.7927 5.8737C10.6434 5.96437 10.5522 6.12638 10.5522 6.30104V8.95503C10.5522 9.34489 10.9786 9.58477 11.3118 9.38237L13.4595 8.07778C13.6088 7.98711 13.7 7.82511 13.7 7.65045V4.99645Z" fill="black"/>
-</svg>
diff --git a/assets/icons/file_icons/toml.svg b/assets/icons/file_icons/toml.svg
deleted file mode 100644
index ae31911d6a..0000000000
--- a/assets/icons/file_icons/toml.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6 6H10" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-<path d="M8 6V11" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-<path d="M5 3H3.5C3.22386 3 3 3.22386 3 3.5V12.5C3 12.7761 3.22386 13 3.5 13H5M11 3H12.5C12.7761 3 13 3.22386 13 3.5V12.5C13 12.7761 12.7761 13 12.5 13H11" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-</svg>
diff --git a/assets/icons/file_icons/typescript.svg b/assets/icons/file_icons/typescript.svg
deleted file mode 100644
index e317743fea..0000000000
--- a/assets/icons/file_icons/typescript.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M4 2C2.89543 2 2 2.89543 2 4V12C2 13.1046 2.89543 14 4 14H12C13.1046 14 14 13.1046 14 12V4C14 2.89543 13.1046 2 12 2H4ZM11.5104 8.67022C11.4887 8.45185 11.3958 8.28222 11.2315 8.1613C11.0673 8.04039 10.8444 7.97993 10.5629 7.97993C10.3716 7.97993 10.2101 8.007 10.0784 8.06114C9.94662 8.11348 9.84555 8.18657 9.77517 8.28041C9.70659 8.37425 9.67231 8.48073 9.67231 8.59984C9.6687 8.69909 9.68945 8.78572 9.73457 8.85971C9.78149 8.9337 9.84555 8.99777 9.92676 9.05191C10.008 9.10424 10.1018 9.15026 10.2083 9.18996C10.3148 9.22786 10.4285 9.26035 10.5494 9.28742L11.0475 9.40652C11.2893 9.46066 11.5113 9.53285 11.7134 9.62308C11.9155 9.71332 12.0906 9.8243 12.2385 9.95604C12.3865 10.0878 12.5011 10.243 12.5823 10.4216C12.6653 10.6003 12.7078 10.8051 12.7096 11.0361C12.7078 11.3754 12.6211 11.6696 12.4497 11.9186C12.2801 12.1659 12.0346 12.3581 11.7134 12.4952C11.394 12.6306 11.0087 12.6982 10.5575 12.6982C10.1099 12.6982 9.72013 12.6297 9.38807 12.4925C9.05782 12.3553 8.79975 12.1523 8.61387 11.8834C8.42979 11.6127 8.33324 11.278 8.32422 10.8791H9.45845C9.47109 11.065 9.52432 11.2202 9.61817 11.3447C9.71381 11.4675 9.84104 11.5604 9.99985 11.6236C10.1605 11.6849 10.3418 11.7156 10.544 11.7156C10.7425 11.7156 10.9148 11.6867 11.061 11.629C11.209 11.5712 11.3236 11.4909 11.4048 11.388C11.486 11.2852 11.5266 11.167 11.5266 11.0334C11.5266 10.9089 11.4896 10.8042 11.4156 10.7194C11.3434 10.6346 11.237 10.5624 11.0962 10.5029C10.9572 10.4433 10.7867 10.3892 10.5846 10.3404L9.9809 10.1888C9.5135 10.0752 9.14444 9.89739 8.87374 9.65557C8.60304 9.41374 8.46859 9.088 8.4704 8.67834C8.46859 8.34267 8.55792 8.04941 8.73839 7.79857C8.92066 7.54772 9.17061 7.35191 9.48823 7.21115C9.80585 7.07038 10.1668 7 10.571 7C10.9825 7 11.3416 7.07038 11.6484 7.21115C11.957 7.35191 12.197 7.54772 12.3685 7.79857C12.5399 8.04941 12.6284 8.33996 12.6338 8.67022H11.5104ZM3.19995 8.04223V7.07583H7.75313V8.04223H6.05584V12.6198H4.89724V8.04223H3.19995Z" fill="black"/>
-</svg>
diff --git a/assets/icons/file_icons/v.svg b/assets/icons/file_icons/v.svg
deleted file mode 100644
index 485e27a378..0000000000
--- a/assets/icons/file_icons/v.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path opacity="0.5" d="M10.0469 12.8661L13.3884 3.31889C13.4386 3.1754 13.3167 3.03055 13.1667 3.05554L10.7292 3.46179C10.5875 3.48542 10.4693 3.58324 10.4197 3.71807L7.24789 12.3271C7.12763 12.6536 7.36919 13 7.71706 13H9.8581C9.94309 13 10.0188 12.9463 10.0469 12.8661Z" fill="black"/>
-<path d="M6.90625 12.7321L3.61161 3.31889C3.56139 3.1754 3.6833 3.03055 3.83326 3.05554L6.27076 3.46179C6.4125 3.48542 6.53067 3.58324 6.58034 3.71807L9.90084 12.7309C9.94895 12.8614 9.85232 13 9.71317 13H7.28379C7.11381 13 6.9624 12.8926 6.90625 12.7321Z" fill="black"/>
-</svg>
diff --git a/assets/icons/file_icons/video.svg b/assets/icons/file_icons/video.svg
deleted file mode 100644
index c249d4c82b..0000000000
--- a/assets/icons/file_icons/video.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2.65625 3H12.8437C13.1199 3 13.3438 3.22386 13.3438 3.5V10.3438M13.3438 13H3.15625C2.88011 13 2.65625 12.7761 2.65625 12.5V5.65625" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-<path d="M10 8.01562L6.65625 10.3125V5.6875L10 8.01562Z" fill="black" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/file_icons/vue.svg b/assets/icons/file_icons/vue.svg
deleted file mode 100644
index 1f993e90ef..0000000000
--- a/assets/icons/file_icons/vue.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 9.13502L4.578 3.21202L4.47016 3.02509C4.42551 2.9477 4.34295 2.90002 4.25361 2.90002H2.43302C2.24057 2.90002 2.12029 3.10836 2.21651 3.27503L7.7835 12.917C7.87972 13.0837 8.12028 13.0837 8.2165 12.917L13.7835 3.27503C13.8797 3.10836 13.7594 2.90002 13.567 2.90002H11.7443C11.655 2.90002 11.5725 2.94767 11.5278 3.02502L8 9.13502Z" fill="black"/>
-<path d="M3.5 3.65002H6.80469L8 5.73596L9.20312 3.65002H12.5234" stroke="black" stroke-width="1.2"/>
-</svg>
diff --git a/assets/icons/file_icons/vyper.svg b/assets/icons/file_icons/vyper.svg
deleted file mode 100644
index 73fb85deff..0000000000
--- a/assets/icons/file_icons/vyper.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="16" height="16" fill="none" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><g style="fill:#000;fill-opacity:1" fill="#180c25"><path d="m-116.1-101.4-28.9-28.9a6.7 6.7 0 0 1-1.8-4.7v-41.2c0-2.4-2.4-4.8-4.8-4.8h-9.6a5.2 5.2 0 0 0-4.8 4.8v48c0 2.5 1 5 2.7 6.8l33.6 33.6a9.6 9.6 0 0 0 6.8 2.8h4.8c2.7 0 4.8-2.2 4.8-4.8v-4.8c0-2.5-1-5-2.8-6.8zM-79.6-176.2c0-2.4-2.4-4.8-4.8-4.8h-9.7a5.2 5.2 0 0 0-4.7 4.8v41.2c0 1.8-.8 3.5-2 4.7l-9.6 9.7a9.5 9.5 0 0 0-2.8 6.8v4.8c0 2.6 2.1 4.7 4.8 4.7h4.8c2.4 0 4.9-.9 6.7-2.8l14.4-14.3a9.6 9.6 0 0 0 2.8-6.8v-48z" style="fill:#000;fill-opacity:1;stroke-width:.255894" transform="translate(21.6 22.7) scale(.11067)"/></g></svg>
\ No newline at end of file
diff --git a/assets/icons/file_icons/wgsl.svg b/assets/icons/file_icons/wgsl.svg
deleted file mode 100644
index cbdd43d222..0000000000
--- a/assets/icons/file_icons/wgsl.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.5 13L1.5 5H11.5L6.5 13Z" fill="black"/>
-<path d="M14 9H9L11.5 5L14 9Z" fill="black" fill-opacity="0.75"/>
-<path d="M9 9L14 9L11.5 13L9 9Z" fill="black" fill-opacity="0.65"/>
-<path d="M14 5L15.25 7L12.75 7L14 5Z" fill="black" fill-opacity="0.5"/>
-<path d="M14 9L12.75 7H15.25L14 9Z" fill="black" fill-opacity="0.55"/>
-</svg>
diff --git a/assets/icons/file_icons/zig.svg b/assets/icons/file_icons/zig.svg
deleted file mode 100644
index af35d5997b..0000000000
--- a/assets/icons/file_icons/zig.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M14.25 12H11C10.794 12 10.6764 11.7648 10.8 11.6L11.925 10.1C11.9722 10.037 12.0463 10 12.125 10H12.75C12.8881 10 13 9.88807 13 9.75V6.25C13 6.11193 12.8881 6 12.75 6H12.4045C12.2187 6 12.0978 5.80442 12.1809 5.6382L12.9309 4.1382C12.9732 4.0535 13.0598 4 13.1545 4H14.25C14.3881 4 14.5 4.11193 14.5 4.25V11.75C14.5 11.8881 14.3881 12 14.25 12Z" fill="black"/>
-<path d="M1.75 4H5C5.20601 4 5.32361 4.23519 5.2 4.4L4.075 5.9C4.02779 5.96295 3.95369 6 3.875 6H3.25C3.11193 6 3 6.11193 3 6.25V9.75C3 9.88807 3.11193 10 3.25 10H3.59549C3.78134 10 3.90221 10.1956 3.8191 10.3618L3.0691 11.8618C3.02675 11.9465 2.94018 12 2.84549 12H1.75C1.61193 12 1.5 11.8881 1.5 11.75V4.25C1.5 4.11193 1.61193 4 1.75 4Z" fill="black"/>
-<path d="M7.55748 6H5.95006C5.74177 6 5.62482 5.76022 5.75306 5.59609L6.92493 4.09609C6.97231 4.03544 7.04498 4 7.12194 4H9.93075C9.97607 4 10.0205 3.98769 10.0594 3.96437L11.6408 3.0155C11.8641 2.88154 12.1179 3.13555 11.9837 3.3587L8.22612 9.6083C8.12629 9.77433 8.24508 9.98591 8.43881 9.98712L10.0039 9.9969C10.2092 9.99818 10.3255 10.2327 10.2023 10.3969L9.075 11.9C9.02779 11.963 8.95369 12 8.875 12H6.55383C6.51835 12 6.48328 12.0076 6.45094 12.0222L4.32473 12.9824C4.10122 13.0833 3.88113 12.8356 4.00771 12.6255L7.77161 6.37903C7.87201 6.2124 7.75202 6 7.55748 6Z" fill="black"/>
-</svg>
diff --git a/assets/icons/file_lock.svg b/assets/icons/file_lock.svg
deleted file mode 100644
index 10ae33869a..0000000000
--- a/assets/icons/file_lock.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5 5C5 3.89543 5.89543 3 7 3H9C10.1046 3 11 3.89543 11 5V6H5V5Z" stroke="black" stroke-width="1.2"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M3.25 6.5C3.25 5.80964 3.80964 5.25 4.5 5.25H11.5C12.1904 5.25 12.75 5.80964 12.75 6.5V12.5C12.75 13.1904 12.1904 13.75 11.5 13.75H4.5C3.80964 13.75 3.25 13.1904 3.25 12.5V6.5ZM8.75 9.66146C8.90559 9.48517 9 9.25361 9 9C9 8.44772 8.55228 8 8 8C7.44772 8 7 8.44772 7 9C7 9.25361 7.09441 9.48517 7.25 9.66146V11C7.25 11.4142 7.58579 11.75 8 11.75C8.41421 11.75 8.75 11.4142 8.75 11V9.66146Z" fill="black"/>
-</svg>
diff --git a/assets/icons/file_markdown.svg b/assets/icons/file_markdown.svg
deleted file mode 100644
index 26688a3db0..0000000000
--- a/assets/icons/file_markdown.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><g stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" clip-path="url(#a)"><path d="M13 13.5v-8L9.5 2h-6a.5.5 0 0 0-.5.5V6"/><path d="M9 2v4h4M8 9.5V13h1a1.75 1.75 0 0 0 0-3.5H8ZM6 13V9.5L4.25 12 2.5 9.5V13"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h16v16H0z"/></clipPath></defs></svg>
diff --git a/assets/icons/file_rust.svg b/assets/icons/file_rust.svg
deleted file mode 100644
index 9e4dc57adb..0000000000
--- a/assets/icons/file_rust.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.27935 10.9821C5.32063 10.4038 4.9204 9.89049 4.35998 9.80276L3.60081 9.68387C3.37979 9.64945 3.20167 9.48001 3.15225 9.25614L3.01378 8.63511C2.96382 8.41235 3.05233 8.1807 3.23696 8.05125L3.8631 7.61242C4.33337 7.28297 4.47456 6.6369 4.18621 6.13364L3.79467 5.45092C3.68118 5.25261 3.69801 5.00374 3.83757 4.82321L4.22314 4.32436C4.3627 4.14438 4.59621 4.06994 4.81071 4.13772L5.57531 4.37769C6.11944 4.54879 6.70048 4.26159 6.90683 3.71886L7.1811 2.99782C7.26255 2.78395 7.46345 2.64285 7.68772 2.6423L8.31007 2.64063C8.53434 2.64007 8.73579 2.78006 8.81834 2.99337L9.09965 3.72275C9.30821 4.26214 9.88655 4.54712 10.429 4.37714L11.1632 4.14716C11.3772 4.07994 11.6096 4.15382 11.7492 4.3327L12.1374 4.83099" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8.76988 11.5933C8.76988 11.6595 8.8236 11.7133 8.88988 11.7133H8.97588C9.32602 11.7133 9.60988 11.9971 9.60988 12.3472C9.60988 12.6974 9.32602 12.9812 8.97588 12.9812H7.05587C6.70573 12.9812 6.42188 12.6974 6.42188 12.3472C6.42188 11.9971 6.70573 11.7133 7.05587 11.7133H7.14188C7.20815 11.7133 7.26188 11.6595 7.26188 11.5933V7.66925C7.26188 7.60298 7.20815 7.54925 7.14188 7.54925H7.05588C6.70573 7.54925 6.42188 7.2654 6.42188 6.91525C6.42188 6.5651 6.70573 6.28125 7.05588 6.28125H9.89988C11.0518 6.28125 12.8619 6.71487 12.8619 8.15185C12.8619 8.67078 12.7284 9.10362 12.4642 9.45348C12.1981 9.79765 11.8458 10.0564 11.4056 10.2293C11.3782 10.2401 11.3673 10.273 11.3829 10.298L12.2163 11.6342C12.247 11.6834 12.3008 11.7133 12.3588 11.7133H12.7319C13.082 11.7133 13.3659 11.9971 13.3659 12.3472C13.3659 12.6974 13.082 12.9812 12.7319 12.9812H11.5637C11.4955 12.9812 11.432 12.9465 11.3952 12.889L9.96523 10.6541C9.92847 10.5966 9.86495 10.5618 9.79675 10.5618H8.96988C8.85942 10.5618 8.76988 10.6514 8.76988 10.7619V11.5933ZM9.61188 7.54925C10.0296 7.54925 11.125 7.54925 11.2339 8.18785C11.2975 8.56123 11.1181 8.86557 10.8812 9.07715C10.6423 9.29046 10.2053 9.38985 9.58788 9.38985H8.86988C8.81465 9.38985 8.76988 9.34508 8.76988 9.28985V7.64925C8.76988 7.59402 8.81465 7.54925 8.86988 7.54925H9.61188Z" fill="black"/>
-</svg>
diff --git a/assets/icons/file_text_filled.svg b/assets/icons/file_text_filled.svg
deleted file mode 100644
index 15c81cca62..0000000000
--- a/assets/icons/file_text_filled.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.875 1.25C10.0686 1.25 10.2549 1.3249 10.3945 1.45898L13.5195 4.45898C13.6668 4.60041 13.75 4.79582 13.75 5V12.7998C13.75 13.327 13.5316 13.8263 13.1533 14.1895C12.7762 14.5515 12.2709 14.75 11.75 14.75H4.25C3.72915 14.75 3.22383 14.5515 2.84668 14.1895C2.46849 13.8264 2.25 13.3271 2.25 12.7998V3.2002C2.25 2.67294 2.46848 2.17365 2.84668 1.81055C3.22388 1.44843 3.72922 1.25 4.25 1.25H9.875ZM5.73242 9.9707C5.31832 9.97084 4.98242 10.3066 4.98242 10.7207C4.98242 11.1348 5.31832 11.4706 5.73242 11.4707H10.2666C10.6808 11.4707 11.0166 11.1349 11.0166 10.7207C11.0166 10.3065 10.6808 9.9707 10.2666 9.9707H5.73242ZM5.73242 7.75C5.31832 7.75013 4.98242 8.08587 4.98242 8.5C4.98242 8.91413 5.31832 9.24987 5.73242 9.25H8.45312C8.86734 9.25 9.20312 8.91421 9.20312 8.5C9.20312 8.08579 8.86734 7.75 8.45312 7.75H5.73242Z" fill="black"/>
-</svg>
diff --git a/assets/icons/file_text_outlined.svg b/assets/icons/file_text_outlined.svg
deleted file mode 100644
index d2e8897251..0000000000
--- a/assets/icons/file_text_outlined.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.87504 2H4.25001C3.91848 2 3.60055 2.12643 3.36612 2.35148C3.1317 2.57652 3 2.88174 3 3.2V12.8C3 13.1182 3.1317 13.4234 3.36612 13.6485C3.60055 13.8735 3.91848 14 4.25001 14H11.75C12.0816 14 12.3995 13.8735 12.6339 13.6485C12.8683 13.4234 13 13.1182 13 12.8V5L9.87504 2Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9 2V4.66666C9 5.02029 9.14048 5.35942 9.39053 5.60948C9.64059 5.85952 9.97972 6 10.3333 6H13" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8.4534 8.5H5.73267" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10.2672 10.7207H5.73267" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/file_toml.svg b/assets/icons/file_toml.svg
deleted file mode 100644
index ae31911d6a..0000000000
--- a/assets/icons/file_toml.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6 6H10" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-<path d="M8 6V11" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-<path d="M5 3H3.5C3.22386 3 3 3.22386 3 3.5V12.5C3 12.7761 3.22386 13 3.5 13H5M11 3H12.5C12.7761 3 13 3.22386 13 3.5V12.5C13 12.7761 12.7761 13 12.5 13H11" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-</svg>
diff --git a/assets/icons/file_tree.svg b/assets/icons/file_tree.svg
deleted file mode 100644
index baf0e26ce6..0000000000
--- a/assets/icons/file_tree.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3 2.5V3.5M3 3.5V9M3 3.5C3 5.46875 5.96875 5 5.96875 5M3 9C3 11 5.96875 11 5.96875 11M3 9V12.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12 3H9.5C8.67157 3 8 3.67157 8 4.5V5.5C8 6.32843 8.67157 7 9.5 7H12C12.8284 7 13.5 6.32843 13.5 5.5V4.5C13.5 3.67157 12.8284 3 12 3Z" fill="black"/>
-<path d="M12 9H9.5C8.67157 9 8 9.67157 8 10.5V11.5C8 12.3284 8.67157 13 9.5 13H12C12.8284 13 13.5 12.3284 13.5 11.5V10.5C13.5 9.67157 12.8284 9 12 9Z" fill="black"/>
-</svg>
diff --git a/assets/icons/filter.svg b/assets/icons/filter.svg
deleted file mode 100644
index 4aa14e93c0..0000000000
--- a/assets/icons/filter.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.9416 2.99643C13.08 2.79636 12.9568 2.5 12.7352 2.5H3.26475C3.04317 2.5 2.91999 2.79636 3.0584 2.99643L6.04033 7.30646C6.24713 7.60535 6.35981 7.97674 6.35981 8.3596C6.35981 9.18422 6.35981 11.4639 6.35981 12.891C6.35981 13.2285 6.59643 13.5 6.88831 13.5H9.11168C9.40357 13.5 9.64019 13.2285 9.64019 12.891C9.64019 11.4639 9.64019 9.18422 9.64019 8.3596C9.64019 7.97674 9.75289 7.60535 9.95969 7.30646L12.9416 2.99643Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/flame.svg b/assets/icons/flame.svg
deleted file mode 100644
index 89fc6cab1e..0000000000
--- a/assets/icons/flame.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M5.5 9.868c.474 0 .928-.18 1.263-.5.335-.321.523-.756.523-1.21 0-.944-.357-1.369-.715-2.053C5.806 4.64 6.411 3.331 8 2c.357 1.71 1.429 3.353 2.857 4.447C12.286 7.542 13 8.842 13 10.21c0 .63-.13 1.252-.38 1.833a4.781 4.781 0 0 1-1.084 1.554 5.021 5.021 0 0 1-1.623 1.038 5.191 5.191 0 0 1-3.826 0 5.02 5.02 0 0 1-1.623-1.038 4.78 4.78 0 0 1-1.083-1.554A4.615 4.615 0 0 1 3 10.211c0-.79.31-1.57.714-2.053 0 .454.188.889.523 1.21.335.32.79.5 1.263.5Z"/></svg>
diff --git a/assets/icons/folder.svg b/assets/icons/folder.svg
deleted file mode 100644
index 35f4c1f8ac..0000000000
--- a/assets/icons/folder.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.8 13C13.1183 13 13.4235 12.8761 13.6486 12.6554C13.8735 12.4349 14 12.1356 14 11.8236V5.94118C14 5.62916 13.8735 5.32992 13.6486 5.10929C13.4235 4.88866 13.1183 4.76471 12.8 4.76471H8.06C7.8593 4.76664 7.66133 4.71919 7.48418 4.6267C7.30703 4.53421 7.15637 4.39964 7.046 4.2353L6.56 3.52941C6.45073 3.36675 6.30199 3.23322 6.1271 3.14082C5.95221 3.04842 5.75666 3.00004 5.558 3H3.2C2.88174 3 2.57651 3.12395 2.35148 3.34458C2.12643 3.56521 2 3.86445 2 4.17647V11.8236C2 12.1356 2.12643 12.4349 2.35148 12.6554C2.57651 12.8761 2.88174 13 3.2 13H12.8Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/folder_open.svg b/assets/icons/folder_open.svg
deleted file mode 100644
index 55231fb6ab..0000000000
--- a/assets/icons/folder_open.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.42782 7.2487C4.43495 6.97194 4.65009 6.75 4.91441 6.75H13.5293C13.7935 6.75 14.007 6.97194 13.9998 7.2487C13.9628 8.6885 13.7533 12.75 12.5721 12.75H3.375C4.55631 12.75 4.3907 8.6885 4.42782 7.2487Z" fill="black" stroke="black" stroke-width="1.2" stroke-linejoin="round"/>
-<path d="M5.19598 12.625H3.66515C3.42618 12.625 3.22289 12.4453 3.18626 12.2017L1.94333 3.93602C1.89776 3.63295 2.12496 3.35938 2.42223 3.35938H5.78585C6.11241 3.35938 6.41702 3.52903 6.59618 3.81071L6.94517 4.35938H9.92811C10.4007 4.35938 10.8044 4.71102 10.8836 5.1917L11.1251 6.65624" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/folder_search.svg b/assets/icons/folder_search.svg
deleted file mode 100644
index 207ea5c10e..0000000000
--- a/assets/icons/folder_search.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M14.0001 13.9999L12.7334 12.7333" stroke="black" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11.3333 13.3334C12.4378 13.3334 13.3333 12.4379 13.3333 11.3334C13.3333 10.2288 12.4378 9.33337 11.3333 9.33337C10.2287 9.33337 9.33325 10.2288 9.33325 11.3334C9.33325 12.4379 10.2287 13.3334 11.3333 13.3334Z" stroke="black" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6 13H3.2C2.88174 13 2.57651 12.8761 2.35148 12.6554C2.12643 12.4349 2 12.1356 2 11.8236V4.17647C2 3.86445 2.12643 3.56521 2.35148 3.34458C2.57651 3.12395 2.88174 3 3.2 3H5.558C5.75666 3.00004 5.95221 3.04842 6.1271 3.14082C6.30199 3.23322 6.45073 3.36675 6.56 3.52941L7.046 4.2353C7.15637 4.39964 7.30703 4.53421 7.48418 4.6267C7.66133 4.71919 7.8593 4.76664 8.06 4.76471H12.8C13.1183 4.76471 13.4235 4.88866 13.6486 5.10929C13.8735 5.32992 14 5.62916 14 5.94118V7" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/font.svg b/assets/icons/font.svg
deleted file mode 100644
index 47633a58c9..0000000000
--- a/assets/icons/font.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M3 5V3h10v2M6 13h4M8 3v10"/></svg>
diff --git a/assets/icons/font_size.svg b/assets/icons/font_size.svg
deleted file mode 100644
index 4286277bd9..0000000000
--- a/assets/icons/font_size.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M14 9.333h-3.333M10.667 10.667V8.333a1.667 1.667 0 1 1 3.333 0v2.334"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.333" d="M3 8.667h4"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="m2 10.667 3-6 3 6"/></svg>
diff --git a/assets/icons/font_weight.svg b/assets/icons/font_weight.svg
deleted file mode 100644
index 410f43ec6e..0000000000
--- a/assets/icons/font_weight.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M4.27 8h5.626a2.5 2.5 0 1 1 0 5h-5a.625.625 0 0 1-.625-.625v-8.75A.625.625 0 0 1 4.896 3H9.27a2.5 2.5 0 1 1 0 5"/></svg>
diff --git a/assets/icons/forward_arrow.svg b/assets/icons/forward_arrow.svg
deleted file mode 100644
index e51796e554..0000000000
--- a/assets/icons/forward_arrow.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10 11.3334L13.3333 8.00002L10 4.66669" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M2.66675 12V10.6667C2.66675 9.95942 2.9477 9.28115 3.4478 8.78105C3.94789 8.28095 4.62617 8 5.33341 8H13.3334" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/generic_close.svg b/assets/icons/generic_close.svg
deleted file mode 100644
index 0fd213daf9..0000000000
--- a/assets/icons/generic_close.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11.5 4.5L4.5 11.5" stroke="black" stroke-linecap="square" stroke-linejoin="round"/>
-<path d="M4.5 4.5L11.5 11.5" stroke="black" stroke-linecap="square" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/generic_maximize.svg b/assets/icons/generic_maximize.svg
deleted file mode 100644
index f1d7da44ef..0000000000
--- a/assets/icons/generic_maximize.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11.5 4.5H4.5V11.5H11.5V4.5Z" stroke="black"/>
-</svg>
diff --git a/assets/icons/generic_minimize.svg b/assets/icons/generic_minimize.svg
deleted file mode 100644
index 4b43cde274..0000000000
--- a/assets/icons/generic_minimize.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4 8H12" stroke="black"/>
-</svg>
diff --git a/assets/icons/generic_restore.svg b/assets/icons/generic_restore.svg
deleted file mode 100644
index d8a3d72bcd..0000000000
--- a/assets/icons/generic_restore.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.5 6.5H3.5V12.5H9.5V6.5Z" stroke="black"/>
-<path d="M10 8.5L12.5 8.5L12.5 3.5L7.5 3.5L7.5 6" stroke="black"/>
-</svg>
diff --git a/assets/icons/git_branch.svg b/assets/icons/git_branch.svg
deleted file mode 100644
index fc6dcfe1b2..0000000000
--- a/assets/icons/git_branch.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M5 3v7M11.5 6a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3ZM4.5 13a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3ZM11 6a5 5 0 0 1-5 5"/></svg>
diff --git a/assets/icons/git_branch_alt.svg b/assets/icons/git_branch_alt.svg
deleted file mode 100644
index cf40195d8b..0000000000
--- a/assets/icons/git_branch_alt.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.5 14C5.32843 14 6 13.3284 6 12.5C6 11.6716 5.32843 11 4.5 11C3.67157 11 3 11.6716 3 12.5C3 13.3284 3.67157 14 4.5 14Z" stroke="black" stroke-width="1.2"/>
-<path d="M4.5 11V5.5" stroke="black" stroke-width="1.2"/>
-<path d="M4.5 10C4.5 10 4.875 8 6.5 8C7.29195 8 9.00787 8 9.87553 8C10.773 8 11.5 7.32843 11.5 6.5V5.5" stroke="black" stroke-width="1.2"/>
-<path d="M4.5 6C5.32843 6 6 5.32843 6 4.5C6 3.67157 5.32843 3 4.5 3C3.67157 3 3 3.67157 3 4.5C3 5.32843 3.67157 6 4.5 6Z" stroke="black" stroke-width="1.2"/>
-<path d="M11.5 6C12.3284 6 13 5.32843 13 4.5C13 3.67157 12.3284 3 11.5 3C10.6716 3 10 3.67157 10 4.5C10 5.32843 10.6716 6 11.5 6Z" stroke="black" stroke-width="1.2"/>
-</svg>
diff --git a/assets/icons/git_branch_plus.svg b/assets/icons/git_branch_plus.svg
deleted file mode 100644
index cf60ce66b4..0000000000
--- a/assets/icons/git_branch_plus.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4 2V10" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12 6C12.5304 6 13.0391 5.78929 13.4142 5.41421C13.7893 5.03914 14 4.53043 14 4C14 3.46957 13.7893 2.96086 13.4142 2.58579C13.0391 2.21071 12.5304 2 12 2C11.4696 2 10.9609 2.21071 10.5858 2.58579C10.2107 2.96086 10 3.46957 10 4C10 4.53043 10.2107 5.03914 10.5858 5.41421C10.9609 5.78929 11.4696 6 12 6Z" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M4 14C4.53043 14 5.03914 13.7893 5.41421 13.4142C5.78929 13.0391 6 12.5304 6 12C6 11.4696 5.78929 10.9609 5.41421 10.5858C5.03914 10.2107 4.53043 10 4 10C3.46957 10 2.96086 10.2107 2.58579 10.5858C2.21071 10.9609 2 11.4696 2 12C2 12.5304 2.21071 13.0391 2.58579 13.4142C2.96086 13.7893 3.46957 14 4 14Z" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10 4C8.4087 4 6.88258 4.63214 5.75736 5.75736C4.63214 6.88258 4 8.4087 4 10" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12 10V14" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M14 12H10" stroke="#C6CAD0" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/github.svg b/assets/icons/github.svg
deleted file mode 100644
index 0a12c9b656..0000000000
--- a/assets/icons/github.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M9.849 14.288v-2.515a3.018 3.018 0 0 0-.629-2.201c1.887 0 3.773-1.258 3.773-3.459.05-.786-.17-1.559-.629-2.2a4.65 4.65 0 0 0 0-2.201s-.629 0-1.886.943a13.533 13.533 0 0 0-5.03 0c-1.259-.943-1.887-.943-1.887-.943a4.35 4.35 0 0 0 0 2.2 3.398 3.398 0 0 0-.63 2.201c0 2.201 1.887 3.459 3.774 3.459a2.965 2.965 0 0 0-.63 2.2v2.516"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M6.076 11.773c-2.836 1.258-3.144-1.258-4.402-1.258"/></svg>
diff --git a/assets/icons/hash.svg b/assets/icons/hash.svg
deleted file mode 100644
index afc1f9c0b5..0000000000
--- a/assets/icons/hash.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-width="1.2" d="m11.748 3.015-2.893 9.573M7.161 3.424l-2.893 9.572M3.611 6.148h10M2.398 9.856h10"/></svg>
diff --git a/assets/icons/history_rerun.svg b/assets/icons/history_rerun.svg
deleted file mode 100644
index e11e754318..0000000000
--- a/assets/icons/history_rerun.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2 8C2 9.18669 2.35189 10.3467 3.01118 11.3334C3.67047 12.3201 4.60754 13.0892 5.7039 13.5433C6.80026 13.9974 8.00666 14.1162 9.17054 13.8847C10.3344 13.6532 11.4035 13.0818 12.2426 12.2426C13.0818 11.4035 13.6532 10.3344 13.8847 9.17054C14.1162 8.00666 13.9974 6.80026 13.5433 5.7039C13.0892 4.60754 12.3201 3.67047 11.3334 3.01118C10.3467 2.35189 9.18669 2 8 2C6.32263 2.00631 4.71265 2.66082 3.50667 3.82667L2 5.33333" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M2 2V5.33333H5.33333" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8 5V8.5L10 9.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/image.svg b/assets/icons/image.svg
deleted file mode 100644
index e0d73d7621..0000000000
--- a/assets/icons/image.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M11.889 3H4.11C3.497 3 3 3.497 3 4.111v7.778C3 12.503 3.497 13 4.111 13h7.778c.614 0 1.111-.498 1.111-1.111V4.11C13 3.497 12.502 3 11.889 3Z"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M6.333 7.444a1.111 1.111 0 1 0 0-2.222 1.111 1.111 0 0 0 0 2.222ZM13 9.667l-1.714-1.715a1.11 1.11 0 0 0-1.571 0L4.667 13"/></svg>
diff --git a/assets/icons/inception.svg b/assets/icons/inception.svg
deleted file mode 100644
index 77a96c0b39..0000000000
--- a/assets/icons/inception.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<svg width="28" height="28" viewBox="0 0 28 28" fill="none" id="svg1378540956_510">
-<g clip-path="url(#svg1378540956_510_clip0_1_1506)" transform="translate(4, 4) scale(0.857)">
-<path d="M17.0547 0.372066H8.52652L-0.00165176 8.90024V17.4284H8.52652V8.90024H17.0547V0.372066Z" fill="#1A1C20"></path>
-<path d="M10.1992 27.6279H18.7274L27.2556 19.0998V10.5716H18.7274V19.0998H10.1992V27.6279Z" fill="#1A1C20"></path>
-</g>
-<defs>
-<clipPath id="svg1378540956_510_clip0_1_1506">
-<rect width="27.2559" height="27.2559" fill="white" transform="translate(0 0.37207)"></rect>
-</clipPath>
-</defs>
-</svg>
diff --git a/assets/icons/indicator.svg b/assets/icons/indicator.svg
deleted file mode 100644
index 40f9151fd5..0000000000
--- a/assets/icons/indicator.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11.5 15C13.433 15 15 13.433 15 11.5C15 9.567 13.433 8 11.5 8C9.567 8 8 9.567 8 11.5C8 13.433 9.567 15 11.5 15Z" fill="black"/>
-</svg>
diff --git a/assets/icons/info.svg b/assets/icons/info.svg
deleted file mode 100644
index c000f25867..0000000000
--- a/assets/icons/info.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 14C11.3137 14 14 11.3137 14 8C14 4.68629 11.3137 2 8 2C4.68629 2 2 4.68629 2 8C2 11.3137 4.68629 14 8 14Z" stroke="black" stroke-width="1.2"/>
-<path d="M7 11H8M8 11H9M8 11V8.1C8 8.04477 7.95523 8 7.9 8H7" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-<path d="M8 6.5C8.55228 6.5 9 6.05228 9 5.5C9 4.94772 8.55228 4.5 8 4.5C7.44772 4.5 7 4.94772 7 5.5C7 6.05228 7.44772 6.5 8 6.5Z" fill="black"/>
-</svg>
diff --git a/assets/icons/json.svg b/assets/icons/json.svg
deleted file mode 100644
index af2f6c5dc0..0000000000
--- a/assets/icons/json.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.78125 3C3.90625 3 3.90625 4.5 3.90625 5.5C3.90625 6.5 3.40625 7.50106 2.40625 8C3.40625 8.50106 3.90625 9.5 3.90625 10.5C3.90625 11.5 3.90625 13 5.78125 13" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10.2422 3C12.1172 3 12.1172 4.5 12.1172 5.5C12.1172 6.5 12.6172 7.50106 13.6172 8C12.6172 8.50106 12.1172 9.5 12.1172 10.5C12.1172 11.5 12.1172 13 10.2422 13" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/keyboard.svg b/assets/icons/keyboard.svg
deleted file mode 100644
index 82791cda3f..0000000000
--- a/assets/icons/keyboard.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M6.75 5.5h.007M8 8h.007M9.25 5.5h.007M10.5 8h.007M11.75 5.5h.007M4.25 5.5h.007M4.875 10.5h6.25M5.5 8h.007M13 3H3c-.69 0-1.25.56-1.25 1.25v7.5c0 .69.56 1.25 1.25 1.25h10c.69 0 1.25-.56 1.25-1.25v-7.5C14.25 3.56 13.69 3 13 3Z"/></svg>
diff --git a/assets/icons/knockouts/dot_bg.svg b/assets/icons/knockouts/dot_bg.svg
deleted file mode 100644
index 9f5ba034e2..0000000000
--- a/assets/icons/knockouts/dot_bg.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="11" height="11" viewBox="0 0 11 11" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="2.1" y="2.1" width="6.8" height="6.8" rx="3.4" stroke="black" stroke-width="1.8"/>
-</svg>
diff --git a/assets/icons/knockouts/dot_fg.svg b/assets/icons/knockouts/dot_fg.svg
deleted file mode 100644
index 54eaacbfa9..0000000000
--- a/assets/icons/knockouts/dot_fg.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="11" height="11" viewBox="0 0 11 11" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="3" y="3" width="5" height="5" rx="2.5" fill="black"/>
-</svg>
diff --git a/assets/icons/knockouts/triangle_bg.svg b/assets/icons/knockouts/triangle_bg.svg
deleted file mode 100644
index 990b439952..0000000000
--- a/assets/icons/knockouts/triangle_bg.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg width="11" height="11" viewBox="0 0 11 11" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_2080_948)">
-<path d="M1.52492 8.72287L1.04243 9.55H2H9H9.95757L9.47508 8.72287L5.97508 2.72287L5.5 1.90845L5.02492 2.72287L1.52492 8.72287Z" stroke="black" stroke-width="1.1"/>
-</g>
-<defs>
-<clipPath id="clip0_2080_948">
-<rect width="11" height="11" fill="white"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/assets/icons/knockouts/triangle_fg.svg b/assets/icons/knockouts/triangle_fg.svg
deleted file mode 100644
index e3b31446b3..0000000000
--- a/assets/icons/knockouts/triangle_fg.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="11" height="11" viewBox="0 0 11 11" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2 9H9L5.5 3L2 9Z" fill="black"/>
-</svg>
diff --git a/assets/icons/knockouts/x_bg.svg b/assets/icons/knockouts/x_bg.svg
deleted file mode 100644
index 0bc5059e73..0000000000
--- a/assets/icons/knockouts/x_bg.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg width="11" height="11" viewBox="0 0 11 11" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_2050_903)">
-<path d="M1.83327 2.89393L1.19687 3.53033L1.83327 4.16672L3.16654 5.5L1.83327 6.83327L1.19687 7.46967L1.83327 8.10606L2.89393 9.16672L3.53033 9.80312L4.16672 9.16672L5.5 7.83345L6.83327 9.16672L7.46967 9.80312L8.10606 9.16672L9.16672 8.10606L9.80312 7.46967L9.16672 6.83327L7.83345 5.5L9.16672 4.16672L9.80312 3.53033L9.16672 2.89393L8.10606 1.83327L7.46967 1.19687L6.83327 1.83327L5.5 3.16654L4.16672 1.83327L3.53033 1.19687L2.89393 1.83327L1.83327 2.89393Z" stroke="black" stroke-width="1.8"/>
-</g>
-<defs>
-<clipPath id="clip0_2050_903">
-<rect width="11" height="11" fill="white"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/assets/icons/knockouts/x_fg.svg b/assets/icons/knockouts/x_fg.svg
deleted file mode 100644
index f459954f72..0000000000
--- a/assets/icons/knockouts/x_fg.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="11" height="11" viewBox="0 0 11 11" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3 3L5.5 5.5M8 8L5.5 5.5M5.5 5.5L3 8M5.5 5.5L8 3" stroke="black" stroke-width="1.2"/>
-</svg>
diff --git a/assets/icons/library.svg b/assets/icons/library.svg
deleted file mode 100644
index fc7f5afcd2..0000000000
--- a/assets/icons/library.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.6667 4L13.3334 13.3333" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8 4V13.3333" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5.33325 5.33331V13.3333" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M2.66675 2.66669V13.3334" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/line_height.svg b/assets/icons/line_height.svg
deleted file mode 100644
index 3929fc4080..0000000000
--- a/assets/icons/line_height.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M4 13.667h8M4 2.333h8M5 11l3-6 3 6M6 9h4"/></svg>
diff --git a/assets/icons/link.svg b/assets/icons/link.svg
deleted file mode 100644
index 739d41b231..0000000000
--- a/assets/icons/link.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.2 11H5C4.20435 11 3.44129 10.6839 2.87868 10.1213C2.31607 9.55871 2 8.79565 2 8C2 7.20435 2.31607 6.44129 2.87868 5.87868C3.44129 5.31607 4.20435 5 5 5H6.2" stroke="#C4CAD4" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.80005 5H11C11.7957 5 12.5588 5.31607 13.1214 5.87868C13.684 6.44129 14 7.20435 14 8C14 8.79565 13.684 9.55871 13.1214 10.1213C12.5588 10.6839 11.7957 11 11 11H9.80005" stroke="#C4CAD4" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5.6001 8H10.4001" stroke="#C4CAD4" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/linux.svg b/assets/icons/linux.svg
deleted file mode 100644
index fc76742a3f..0000000000
--- a/assets/icons/linux.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_3010_383)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M3.71141 7.06133C3.76141 6.47267 3.78341 5.88133 3.81608 5.29133C4.10416 0.190201 11.896 0.190202 12.1841 5.29133C12.2174 5.898 12.2441 6.50333 12.3067 7.10733C12.6951 7.94202 14.3637 11.6214 13.4134 12.006C13.1894 12.096 12.8041 11.7227 12.3694 11.052C12.207 11.9614 11.7273 12.8132 11.0587 13.4467C11.7441 13.68 12.3334 13.998 12.3334 14.3333C12.3334 14.9176 3.66675 14.9257 3.66675 14.3333C3.66675 13.998 4.25608 13.68 4.94141 13.4467C4.26191 12.803 3.82279 11.9657 3.62408 11.056C3.19075 11.724 2.80608 12.096 2.58341 12.006C1.626 11.6185 3.31478 7.90684 3.71141 7.06133Z" stroke="#7B7B7B" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6.11822 6.6L7.68822 7.89C7.85822 8.03 8.12822 8.03 8.29822 7.89L9.86822 6.6C10.1382 6.38 9.94822 6 9.56822 6H6.42822C6.04822 6 5.85822 6.38 6.12822 6.6H6.11822Z" fill="#7B7B7B"/>
-</g>
-<defs>
-<clipPath id="clip0_3010_383">
-<rect width="16" height="16" fill="white"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/assets/icons/list_collapse.svg b/assets/icons/list_collapse.svg
deleted file mode 100644
index f18bc550b9..0000000000
--- a/assets/icons/list_collapse.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M2.857 6.857 4.286 5.43 2.857 4M2.857 12l1.429-1.429-1.429-1.428M6.857 4.571h6.286M6.857 8h6.286M6.857 11.428h6.286"/></svg>
diff --git a/assets/icons/list_filter.svg b/assets/icons/list_filter.svg
deleted file mode 100644
index 82f41f5f68..0000000000
--- a/assets/icons/list_filter.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-list-filter-icon lucide-list-filter"><path d="M3 6h18"/><path d="M7 12h10"/><path d="M10 18h4"/></svg>
diff --git a/assets/icons/list_todo.svg b/assets/icons/list_todo.svg
deleted file mode 100644
index 709f26d89d..0000000000
--- a/assets/icons/list_todo.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M5.333 3.333H2.667A.667.667 0 0 0 2 4v2.667c0 .368.298.666.667.666h2.666A.667.667 0 0 0 6 6.667V4a.667.667 0 0 0-.667-.667ZM2 11.333l1.333 1.334L6 10M8.667 4H14M8.667 8H14M8.667 12H14"/></svg>
diff --git a/assets/icons/list_tree.svg b/assets/icons/list_tree.svg
deleted file mode 100644
index de3e0f3a57..0000000000
--- a/assets/icons/list_tree.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.5 8H9.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13.5 4L6.5 4" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13.5 12H9.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3 3.5V6.33333C3 7.25 3.72 8 4.6 8H7" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3 6V10.5C3 11.325 3.72 12 4.6 12H7" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/list_x.svg b/assets/icons/list_x.svg
deleted file mode 100644
index 0fa3bd68fb..0000000000
--- a/assets/icons/list_x.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.33333 8H3" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11.6667 4H3" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11.6667 12H3" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13.6667 6.66663L11 9.33329" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11 6.66663L13.6667 9.33329" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/load_circle.svg b/assets/icons/load_circle.svg
deleted file mode 100644
index eecf099310..0000000000
--- a/assets/icons/load_circle.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M13 8a5 5 0 1 1-3.455-4.755"/></svg>
diff --git a/assets/icons/location_edit.svg b/assets/icons/location_edit.svg
deleted file mode 100644
index e342652eb1..0000000000
--- a/assets/icons/location_edit.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M12 6.502a4.904 4.904 0 0 0-1.686-3.28 5.059 5.059 0 0 0-3.522-1.22A5.045 5.045 0 0 0 3.39 3.52 4.889 4.889 0 0 0 2 6.93c0 2.89 3.06 5.893 4.397 7.068M13.655 11.013a1.18 1.18 0 0 0-1.67-1.67l-2.227 2.23a1.112 1.112 0 0 0-.282.475l-.465 1.594a.278.278 0 0 0 .345.345l1.594-.465a1.11 1.11 0 0 0 .475-.281l2.23-2.228Z"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M7 8.998a2 2 0 1 0 0-4 2 2 0 0 0 0 4Z"/></svg>
diff --git a/assets/icons/lock_outlined.svg b/assets/icons/lock_outlined.svg
deleted file mode 100644
index d69a245603..0000000000
--- a/assets/icons/lock_outlined.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5 5C5 3.89543 5.89543 3 7 3H9C10.1046 3 11 3.89543 11 5V6H5V5Z" stroke="black" stroke-width="1.2"/>
-<path d="M8 9V11" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-<circle cx="8" cy="9" r="1" fill="black"/>
-<rect x="3.75" y="5.75" width="8.5" height="7.5" rx="1.25" stroke="black" stroke-width="1.2" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/magnifying_glass.svg b/assets/icons/magnifying_glass.svg
deleted file mode 100644
index 24f00bb51b..0000000000
--- a/assets/icons/magnifying_glass.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13 13L10.4138 10.4138ZM3 7.31034C3 4.92981 4.92981 3 7.31034 3C9.6909 3 11.6207 4.92981 11.6207 7.31034C11.6207 9.6909 9.6909 11.6207 7.31034 11.6207C4.92981 11.6207 3 9.6909 3 7.31034Z" fill="black" fill-opacity="0.15"/>
-<path d="M13 13L10.4138 10.4138M3 7.31034C3 4.92981 4.92981 3 7.31034 3C9.6909 3 11.6207 4.92981 11.6207 7.31034C11.6207 9.6909 9.6909 11.6207 7.31034 11.6207C4.92981 11.6207 3 9.6909 3 7.31034Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/maximize.svg b/assets/icons/maximize.svg
deleted file mode 100644
index 7b6d26fed8..0000000000
--- a/assets/icons/maximize.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10 3H13V6" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6 13H3V10" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13 3L9.5 6.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3 13L6.5 9.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/menu.svg b/assets/icons/menu.svg
deleted file mode 100644
index f12ce47f7e..0000000000
--- a/assets/icons/menu.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M2.667 8h10.666M2.667 4h10.666M2.667 12h10.666"/></svg>
diff --git a/assets/icons/menu_alt.svg b/assets/icons/menu_alt.svg
deleted file mode 100644
index b9cc19e22f..0000000000
--- a/assets/icons/menu_alt.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2.66699 8H10.667M2.66699 4H13.333M2.66699 12H7.99999" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/menu_alt_temp.svg b/assets/icons/menu_alt_temp.svg
deleted file mode 100644
index 87add13216..0000000000
--- a/assets/icons/menu_alt_temp.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.333 10H8M13.333 6H2.66701" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/mic.svg b/assets/icons/mic.svg
deleted file mode 100644
index 000d135ea5..0000000000
--- a/assets/icons/mic.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 12.2028V14.3042" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.2027 6.94928V8.11672C12.2027 9.20041 11.7599 10.2397 10.9717 11.006C10.1836 11.7723 9.11457 12.2028 7.99992 12.2028C6.88527 12.2028 5.81627 11.7723 5.02809 11.006C4.23991 10.2397 3.79712 9.20041 3.79712 8.11672V6.94928" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10.1015 3.63555C10.1015 2.56426 9.16065 1.6958 8.00008 1.6958C6.83951 1.6958 5.89868 2.56426 5.89868 3.63555V8.16165C5.89868 9.23294 6.83951 10.1014 8.00008 10.1014C9.16065 10.1014 10.1015 9.23294 10.1015 8.16165V3.63555Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/mic_mute.svg b/assets/icons/mic_mute.svg
deleted file mode 100644
index 8bc63be610..0000000000
--- a/assets/icons/mic_mute.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3 3L13 13" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12 9C12 8.74858 12 8.49375 12 8.23839V7" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M4.00043 7V8.09869C3.98856 8.86731 4.22157 9.62164 4.66938 10.2643C5.11718 10.907 5.75924 11.4085 6.51267 11.7042C7.2661 11.9999 8.09632 12.0761 8.89619 11.923C9.47851 11.8115 10.0253 11.5823 10.5 11.2539" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10 6V3.62904C9.99714 3.26103 9.8347 2.90448 9.53885 2.6168C9.24299 2.32913 8.83093 2.12707 8.36903 2.04316C7.90713 1.95926 7.42226 1.9984 6.99252 2.15427C6.56278 2.31015 6.21317 2.57369 6 2.90245" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6 6V8.00088C6.00031 8.39636 6.10356 8.78287 6.29674 9.11159C6.48991 9.44031 6.76433 9.69649 7.08534 9.84779C7.40634 9.99909 7.75954 10.0387 8.10032 9.96165C8.4411 9.88459 8.75417 9.69431 9 9.41483" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8 12V14" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/minimize.svg b/assets/icons/minimize.svg
deleted file mode 100644
index 082ade47db..0000000000
--- a/assets/icons/minimize.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.5 9.5H6.5V12.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.5 6.5H9.5V3.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.5 6.5L13 3" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3 13L6.5 9.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/notepad.svg b/assets/icons/notepad.svg
deleted file mode 100644
index 27fd35566e..0000000000
--- a/assets/icons/notepad.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><g stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" clip-path="url(#a)"><path d="M6 8h4M6 10.5h4M3 3h10v9.565c0 .38-.158.746-.44 1.015-.28.269-.662.42-1.06.42h-7c-.398 0-.78-.151-1.06-.42A1.404 1.404 0 0 1 3 12.565V3ZM6.5 1v4M9.5 1v4"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h16v16H0z"/></clipPath></defs></svg>
diff --git a/assets/icons/option.svg b/assets/icons/option.svg
deleted file mode 100644
index 47201f7c67..0000000000
--- a/assets/icons/option.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3 3H6.33333L9.66667 13H13" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.11108 3H13" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/page_down.svg b/assets/icons/page_down.svg
deleted file mode 100644
index 765f36b26a..0000000000
--- a/assets/icons/page_down.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.19131 16V8.53964H10.6313L13.2953 14.3455C13.2553 13.8719 13.2153 13.4016 13.1753 12.9347C13.1353 12.4677 13.1153 11.9975 13.1153 11.5238V8.53964H14.3993V16H12.9593L10.2953 10.1941C10.3353 10.6678 10.3753 11.1381 10.4153 11.605C10.4553 12.0719 10.4753 12.5422 10.4753 13.0159V16H9.19131Z" fill="black"/>
-<path d="M2 16V8.53964H4.208C4.408 8.53964 4.608 8.55318 4.808 8.58024C5.008 8.60731 5.2 8.65806 5.384 8.73249C5.568 8.80016 5.74 8.88813 5.9 8.9964C6.068 9.10467 6.216 9.22647 6.344 9.3618C6.472 9.49037 6.584 9.62909 6.68 9.77796C6.776 9.92683 6.86 10.0825 6.932 10.2449C7.004 10.4073 7.064 10.5731 7.112 10.7422C7.16 10.9046 7.196 11.0704 7.22 11.2396C7.252 11.4087 7.272 11.5813 7.28 11.7572C7.296 11.9264 7.304 12.0956 7.304 12.2647C7.304 12.4407 7.296 12.6166 7.28 12.7926C7.272 12.9617 7.252 13.1309 7.22 13.3001C7.196 13.4692 7.16 13.6384 7.112 13.8076C7.064 13.97 7.004 14.1324 6.932 14.2948C6.86 14.4572 6.776 14.6128 6.68 14.7617C6.584 14.9105 6.472 15.0526 6.344 15.188C6.216 15.3166 6.068 15.435 5.9 15.5432C5.74 15.6515 5.568 15.7429 5.384 15.8173C5.2 15.885 5.008 15.9323 4.808 15.9594C4.608 15.9865 4.408 16 4.208 16H2ZM3.284 15.0662H4.208C4.344 15.0662 4.48 15.0526 4.616 15.0256C4.752 14.9917 4.876 14.941 4.988 14.8733C5.108 14.7989 5.212 14.7177 5.3 14.6297C5.388 14.535 5.464 14.4369 5.528 14.3354C5.6 14.2339 5.66 14.129 5.708 14.0207C5.764 13.9057 5.808 13.7906 5.84 13.6756C5.872 13.5606 5.9 13.4455 5.924 13.3305C5.948 13.2155 5.968 13.1004 5.984 12.9854C6 12.8636 6.008 12.7452 6.008 12.6301C6.016 12.5083 6.02 12.3865 6.02 12.2647C6.02 12.1497 6.016 12.0347 6.008 11.9196C6.008 11.7978 6 11.6794 5.984 11.5644C5.968 11.4426 5.948 11.3242 5.924 11.2091C5.9 11.0941 5.872 10.9791 5.84 10.864C5.808 10.749 5.764 10.6373 5.708 10.5291C5.66 10.414 5.6 10.3058 5.528 10.2043C5.464 10.1028 5.388 10.008 5.3 9.92006C5.212 9.82533 5.108 9.74413 4.988 9.67646C4.876 9.60202 4.752 9.55127 4.616 9.52421C4.48 9.49037 4.344 9.47346 4.208 9.47346H3.284V15.0662Z" fill="black"/>
-<path d="M11.7473 7.62276C11.5233 7.62276 11.2953 7.60584 11.0633 7.57201C10.8393 7.53817 10.6193 7.48404 10.4033 7.4096C10.1953 7.3284 10.0033 7.22352 9.82731 7.09495C9.65931 6.95961 9.51931 6.80736 9.40731 6.63819C9.29531 6.46226 9.21531 6.27955 9.16731 6.09009C9.11931 5.90062 9.09531 5.70776 9.09531 5.51153V2.11123C9.09531 1.91499 9.11531 1.72214 9.15531 1.53267C9.20331 1.33644 9.28331 1.15373 9.39531 0.984564C9.51531 0.815395 9.65931 0.666526 9.82731 0.537957C10.0033 0.402622 10.1953 0.294354 10.4033 0.213153C10.6193 0.131952 10.8393 0.0778178 11.0633 0.0507507C11.2953 0.0169169 11.5273 0 11.7593 0C11.9833 0 12.2033 0.0135335 12.4193 0.0406006C12.6353 0.0676677 12.8433 0.115035 13.0433 0.182703C13.2513 0.25037 13.4433 0.345105 13.6193 0.466907C13.7953 0.581942 13.9433 0.717277 14.0633 0.872912C14.1833 1.02855 14.2713 1.19772 14.3273 1.38042C14.3913 1.55635 14.4233 1.73906 14.4233 1.92853C14.4233 1.92853 14.4233 1.93191 14.4233 1.93868C14.4233 1.93868 14.4233 1.94206 14.4233 1.94883H13.1393C13.1393 1.94206 13.1393 1.93868 13.1393 1.93868C13.1393 1.78981 13.1033 1.64771 13.0313 1.51237C12.9593 1.37704 12.8553 1.26538 12.7193 1.17742C12.5913 1.08945 12.4433 1.02855 12.2753 0.994714C12.1073 0.954113 11.9353 0.933813 11.7593 0.933813C11.5753 0.933813 11.3913 0.957497 11.2073 1.00486C11.0313 1.05223 10.8753 1.13343 10.7393 1.24847C10.6113 1.35674 10.5193 1.48869 10.4633 1.64432C10.4073 1.79996 10.3793 1.95559 10.3793 2.11123V5.51153C10.3793 5.66716 10.4073 5.8228 10.4633 5.97843C10.5193 6.1273 10.6113 6.25925 10.7393 6.37429C10.8673 6.48256 11.0193 6.56376 11.1953 6.61789C11.3713 6.66526 11.5513 6.68894 11.7353 6.68894C11.8633 6.68894 11.9873 6.67879 12.1073 6.65849C12.2353 6.63819 12.3553 6.60436 12.4673 6.55699C12.5793 6.50962 12.6793 6.45211 12.7673 6.38444C12.8633 6.31 12.9353 6.22542 12.9833 6.13069C13.0393 6.03595 13.0753 5.93445 13.0913 5.82618C13.1073 5.71791 13.1153 5.61303 13.1153 5.51153V4.36456H11.7953V3.43075H14.3993V5.51153C14.3993 5.70776 14.3833 5.904 14.3513 6.10023C14.3273 6.29647 14.2593 6.48256 14.1473 6.65849C14.0353 6.82766 13.8873 6.97991 13.7033 7.11525C13.5273 7.24382 13.3313 7.34532 13.1153 7.41975C12.8993 7.49419 12.6753 7.54494 12.4433 7.57201C12.2193 7.60584 11.9873 7.62276 11.7473 7.62276Z" fill="black"/>
-<path d="M2 7.54155V0.081192H4.58C4.812 0.081192 5.044 0.101492 5.276 0.142093C5.508 0.175926 5.728 0.240211 5.936 0.334945C6.144 0.42968 6.328 0.551482 6.488 0.700351C6.648 0.842452 6.776 1.00485 6.872 1.18756C6.976 1.36349 7.048 1.54958 7.088 1.74582C7.128 1.94205 7.148 2.14167 7.148 2.34467C7.148 2.54091 7.128 2.73715 7.088 2.93338C7.048 3.12962 6.976 3.31909 6.872 3.50179C6.776 3.67773 6.648 3.84013 6.488 3.989C6.328 4.13787 6.144 4.25967 5.936 4.3544C5.728 4.44914 5.508 4.5168 5.276 4.5574C5.044 4.59124 4.812 4.60816 4.58 4.60816H3.284V7.54155H2ZM4.58 3.66419C4.772 3.66419 4.956 3.63036 5.132 3.56269C5.316 3.49502 5.464 3.3969 5.576 3.26834C5.688 3.133 5.764 2.98752 5.804 2.83188C5.844 2.66948 5.864 2.50708 5.864 2.34467C5.864 2.18227 5.844 2.01987 5.804 1.85747C5.764 1.69506 5.688 1.54958 5.576 1.42101C5.464 1.28568 5.316 1.18417 5.132 1.11651C4.956 1.04884 4.772 1.01501 4.58 1.01501H3.284V3.66419H4.58Z" fill="black"/>
-</svg>
diff --git a/assets/icons/page_up.svg b/assets/icons/page_up.svg
deleted file mode 100644
index f555165d2d..0000000000
--- a/assets/icons/page_up.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_1650_1657)">
-<path d="M9.4433 15.9192V8.49652H12.0233C12.2553 8.49652 12.4873 8.51672 12.7193 8.55711C12.9513 8.59078 13.1713 8.65474 13.3793 8.74899C13.5873 8.84325 13.7713 8.96444 13.9313 9.11255C14.0913 9.25394 14.2193 9.41552 14.3153 9.5973C14.4193 9.77235 14.4913 9.95749 14.5313 10.1527C14.5713 10.348 14.5913 10.5466 14.5913 10.7486C14.5913 10.9438 14.5713 11.1391 14.5313 11.3343C14.4913 11.5296 14.4193 11.7181 14.3153 11.8998C14.2193 12.0749 14.0913 12.2365 13.9313 12.3846C13.7713 12.5327 13.5873 12.6539 13.3793 12.7482C13.1713 12.8424 12.9513 12.9097 12.7193 12.9501C12.4873 12.9838 12.2553 13.0006 12.0233 13.0006H10.7273V15.9192H9.4433ZM12.0233 12.0614C12.2153 12.0614 12.3993 12.0278 12.5753 11.9604C12.7593 11.8931 12.9073 11.7955 13.0193 11.6676C13.1313 11.5329 13.2073 11.3882 13.2473 11.2333C13.2873 11.0717 13.3073 10.9102 13.3073 10.7486C13.3073 10.587 13.2873 10.4254 13.2473 10.2638C13.2073 10.1022 13.1313 9.95749 13.0193 9.82957C12.9073 9.69492 12.7593 9.59393 12.5753 9.52661C12.3993 9.45928 12.2153 9.42562 12.0233 9.42562H10.7273V12.0614H12.0233Z" fill="black"/>
-<path d="M4.604 16C4.372 16 4.144 15.9832 3.92 15.9495C3.696 15.9226 3.48 15.8687 3.272 15.7879C3.064 15.7071 2.876 15.5994 2.708 15.4648C2.54 15.3301 2.4 15.1786 2.288 15.0103C2.184 14.842 2.108 14.6636 2.06 14.4751C2.02 14.2798 2 14.0879 2 13.8994V8.49652H3.284V13.8994C3.284 14.0543 3.308 14.2058 3.356 14.3539C3.404 14.502 3.488 14.6333 3.608 14.7477C3.736 14.8622 3.888 14.9463 4.064 15.0002C4.24 15.0473 4.42 15.0709 4.604 15.0709C4.788 15.0709 4.968 15.0473 5.144 15.0002C5.32 14.9463 5.468 14.8622 5.588 14.7477C5.716 14.6333 5.804 14.502 5.852 14.3539C5.9 14.2058 5.924 14.0543 5.924 13.8994V8.49652H7.208V13.8994C7.208 14.0879 7.184 14.2798 7.136 14.4751C7.096 14.6636 7.02 14.842 6.908 15.0103C6.804 15.1786 6.668 15.3301 6.5 15.4648C6.332 15.5994 6.144 15.7071 5.936 15.7879C5.728 15.8687 5.512 15.9226 5.288 15.9495C5.064 15.9832 4.836 16 4.604 16Z" fill="black"/>
-<path d="M11.7473 7.58426C11.5233 7.58426 11.2953 7.56743 11.0633 7.53377C10.8393 7.50011 10.6193 7.44625 10.4033 7.37219C10.1953 7.2914 10.0033 7.18704 9.82731 7.05912C9.65931 6.92447 9.51931 6.77299 9.40731 6.60467C9.29531 6.42963 9.21531 6.24785 9.16731 6.05933C9.11931 5.87082 9.09531 5.67894 9.09531 5.4837V2.10057C9.09531 1.90532 9.11531 1.71344 9.15531 1.52493C9.20331 1.32969 9.28331 1.14791 9.39531 0.979592C9.51531 0.811277 9.65931 0.66316 9.82731 0.535241C10.0033 0.400589 10.1953 0.292868 10.4033 0.212076C10.6193 0.131285 10.8393 0.0774248 11.0633 0.0504944C11.2953 0.0168315 11.5273 0 11.7593 0C11.9833 0 12.2033 0.0134652 12.4193 0.0403956C12.6353 0.0673261 12.8433 0.114454 13.0433 0.18178C13.2513 0.249106 13.4433 0.343362 13.6193 0.464549C13.7953 0.579003 13.9433 0.713655 14.0633 0.868505C14.1833 1.02335 14.2713 1.19167 14.3273 1.37345C14.3913 1.5485 14.4233 1.73028 14.4233 1.91879C14.4233 1.91879 14.4233 1.92215 14.4233 1.92889C14.4233 1.92889 14.4233 1.93225 14.4233 1.93899H13.1393C13.1393 1.93225 13.1393 1.92889 13.1393 1.92889C13.1393 1.78077 13.1033 1.63939 13.0313 1.50473C12.9593 1.37008 12.8553 1.25899 12.7193 1.17147C12.5913 1.08395 12.4433 1.02335 12.2753 0.989691C12.1073 0.949295 11.9353 0.929098 11.7593 0.929098C11.5753 0.929098 11.3913 0.952662 11.2073 0.99979C11.0313 1.04692 10.8753 1.12771 10.7393 1.24216C10.6113 1.34988 10.5193 1.48117 10.4633 1.63602C10.4073 1.79087 10.3793 1.94572 10.3793 2.10057V5.4837C10.3793 5.63855 10.4073 5.7934 10.4633 5.94824C10.5193 6.09636 10.6113 6.22765 10.7393 6.3421C10.8673 6.44982 11.0193 6.53061 11.1953 6.58447C11.3713 6.6316 11.5513 6.65517 11.7353 6.65517C11.8633 6.65517 11.9873 6.64507 12.1073 6.62487C12.2353 6.60467 12.3553 6.57101 12.4673 6.52388C12.5793 6.47675 12.6793 6.41953 12.7673 6.3522C12.8633 6.27814 12.9353 6.19398 12.9833 6.09973C13.0393 6.00547 13.0753 5.90448 13.0913 5.79676C13.1073 5.68904 13.1153 5.58468 13.1153 5.4837V4.34252H11.7953V3.41342H14.3993V5.4837C14.3993 5.67894 14.3833 5.87419 14.3513 6.06943C14.3273 6.26468 14.2593 6.44982 14.1473 6.62487C14.0353 6.79319 13.8873 6.94467 13.7033 7.07932C13.5273 7.20724 13.3313 7.30823 13.1153 7.38229C12.8993 7.45635 12.6753 7.50684 12.4433 7.53377C12.2193 7.56743 11.9873 7.58426 11.7473 7.58426Z" fill="black"/>
-<path d="M2 7.50346V0.08078H4.58C4.812 0.08078 5.044 0.100978 5.276 0.141373C5.508 0.175036 5.728 0.238996 5.936 0.333252C6.144 0.427508 6.328 0.548695 6.488 0.696812C6.648 0.838196 6.776 0.999778 6.872 1.18156C6.976 1.35661 7.048 1.54175 7.088 1.737C7.128 1.93224 7.148 2.13085 7.148 2.33283C7.148 2.52808 7.128 2.72332 7.088 2.91857C7.048 3.11381 6.976 3.30233 6.872 3.48411C6.776 3.65915 6.648 3.82073 6.488 3.96885C6.328 4.11697 6.144 4.23816 5.936 4.33241C5.728 4.42667 5.508 4.49399 5.276 4.53439C5.044 4.56805 4.812 4.58488 4.58 4.58488H3.284V7.50346H2ZM4.58 3.64569C4.772 3.64569 4.956 3.61202 5.132 3.5447C5.316 3.47737 5.464 3.37975 5.576 3.25183C5.688 3.11718 5.764 2.97243 5.804 2.81758C5.844 2.656 5.864 2.49441 5.864 2.33283C5.864 2.17125 5.844 2.00967 5.804 1.84809C5.764 1.6865 5.688 1.54175 5.576 1.41383C5.464 1.27918 5.316 1.17819 5.132 1.11087C4.956 1.04354 4.772 1.00988 4.58 1.00988H3.284V3.64569H4.58Z" fill="black"/>
-</g>
-<defs>
-<clipPath id="clip0_1650_1657">
-<rect width="16" height="16" fill="white"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/assets/icons/paperclip.svg b/assets/icons/paperclip.svg
deleted file mode 100644
index 7a864103c0..0000000000
--- a/assets/icons/paperclip.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.1645 4.45825L5.20344 9.52074C4.98225 9.74193 4.85798 10.0419 4.85798 10.3548C4.85798 10.6676 4.98225 10.9676 5.20344 11.1888C5.42464 11.41 5.72464 11.5342 6.03746 11.5342C6.35028 11.5342 6.65028 11.41 6.87148 11.1888L11.8326 6.12629C12.2749 5.68397 12.5234 5.08407 12.5234 4.45854C12.5234 3.83302 12.2749 3.23311 11.8326 2.7908C11.3902 2.34849 10.7903 2.1 10.1648 2.1C9.53928 2.1 8.93938 2.34849 8.49707 2.7908L3.55663 7.83265C3.22373 8.16017 2.95897 8.55037 2.77762 8.98072C2.59628 9.41108 2.50193 9.87308 2.50003 10.3401C2.49813 10.8071 2.58871 11.2698 2.76654 11.7017C2.94438 12.1335 3.20595 12.5258 3.53618 12.856C3.8664 13.1863 4.25873 13.4478 4.69055 13.6257C5.12237 13.8035 5.58513 13.8941 6.05213 13.8922C6.51913 13.8903 6.98114 13.7959 7.41149 13.6146C7.84185 13.4332 8.23204 13.1685 8.55957 12.8356L13.5 7.79373" stroke="#C4CAD4" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/pencil.svg b/assets/icons/pencil.svg
deleted file mode 100644
index c4d289e9c0..0000000000
--- a/assets/icons/pencil.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.5871 5.40582C12.8514 5.14152 13 4.78304 13 4.40922C13 4.03541 12.8516 3.67688 12.5873 3.41252C12.323 3.14816 11.9645 2.99962 11.5907 2.99957C11.2169 2.99953 10.8584 3.14798 10.594 3.41227L3.92098 10.0869C3.80488 10.2027 3.71903 10.3452 3.67097 10.5019L3.01047 12.678C2.99754 12.7212 2.99657 12.7672 3.00764 12.8109C3.01872 12.8547 3.04143 12.8946 3.07337 12.9265C3.1053 12.9584 3.14528 12.981 3.18905 12.992C3.23282 13.003 3.27875 13.002 3.32197 12.989L5.49849 12.329C5.65508 12.2813 5.79758 12.196 5.91349 12.0805L12.5871 5.40582Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9 5L11 7" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/pencil_unavailable.svg b/assets/icons/pencil_unavailable.svg
deleted file mode 100644
index 4241d766ac..0000000000
--- a/assets/icons/pencil_unavailable.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.5 5.50621L10.5941 3.41227C10.8585 3.14798 11.217 2.99953 11.5908 2.99957C11.9646 2.99962 12.3231 3.14816 12.5874 3.41252C12.8517 3.67688 13.0001 4.03541 13.0001 4.40922C13.0001 4.78304 12.8515 5.14152 12.5872 5.40582L10.493 7.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5.50789 8.5L3.92098 10.0869C3.80488 10.2027 3.71903 10.3452 3.67097 10.5019L3.01047 12.678C2.99754 12.7212 2.99657 12.7672 3.00764 12.8109C3.01872 12.8547 3.04143 12.8946 3.07337 12.9265C3.1053 12.9584 3.14528 12.981 3.18905 12.992C3.23282 13.003 3.27875 13.002 3.32197 12.989L5.49849 12.329C5.65508 12.2813 5.79758 12.196 5.91349 12.0805L7.49184 10.5019" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9 5L11 7" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3 3L13 13" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/person.svg b/assets/icons/person.svg
deleted file mode 100644
index a1c29e4acb..0000000000
--- a/assets/icons/person.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M12.667 14v-1.333A2.667 2.667 0 0 0 10 10H6a2.667 2.667 0 0 0-2.667 2.667V14M8 7.333A2.667 2.667 0 1 0 8 2a2.667 2.667 0 0 0 0 5.333Z"/></svg>
diff --git a/assets/icons/pin.svg b/assets/icons/pin.svg
deleted file mode 100644
index d23daff8b9..0000000000
--- a/assets/icons/pin.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 10V13" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6.71429 7.088C6.7142 7.26164 6.66963 7.43181 6.58559 7.57938C6.50156 7.72695 6.38138 7.84606 6.23857 7.92333L5.47571 8.34333C5.33291 8.4206 5.21273 8.53972 5.12869 8.68729C5.04465 8.83486 5.00008 9.00503 5 9.17867V9.53333C5 9.6571 5.04515 9.7758 5.12553 9.86332C5.2059 9.95083 5.31491 10 5.42857 10H10.5714C10.6851 10 10.7941 9.95083 10.8745 9.86332C10.9548 9.7758 11 9.6571 11 9.53333V9.17867C10.9999 9.00503 10.9553 8.83486 10.8713 8.68729C10.7873 8.53972 10.6671 8.4206 10.5243 8.34333L9.76143 7.92333C9.61862 7.84606 9.49844 7.72695 9.41441 7.57938C9.33037 7.43181 9.2858 7.26164 9.28571 7.088V5.33333C9.28571 5.20957 9.33087 5.09087 9.41124 5.00335C9.49161 4.91583 9.60062 4.86667 9.71429 4.86667C9.94161 4.86667 10.1596 4.76833 10.3204 4.5933C10.4811 4.41827 10.5714 4.18087 10.5714 3.93333C10.5714 3.6858 10.4811 3.4484 10.3204 3.27337C10.1596 3.09833 9.94161 3 9.71429 3H6.28571C6.05839 3 5.84037 3.09833 5.67962 3.27337C5.51888 3.4484 5.42857 3.6858 5.42857 3.93333C5.42857 4.18087 5.51888 4.41827 5.67962 4.5933C5.84037 4.76833 6.05839 4.86667 6.28571 4.86667C6.39938 4.86667 6.50839 4.91583 6.58876 5.00335C6.66913 5.09087 6.71429 5.20957 6.71429 5.33333V7.088Z" fill="black" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/play_filled.svg b/assets/icons/play_filled.svg
deleted file mode 100644
index 8075197ad2..0000000000
--- a/assets/icons/play_filled.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5 4L12 8L5 12V4Z" fill="black" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/play_outlined.svg b/assets/icons/play_outlined.svg
deleted file mode 100644
index ba1ea2693d..0000000000
--- a/assets/icons/play_outlined.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5 4L12 8L5 12V4Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/plus.svg b/assets/icons/plus.svg
deleted file mode 100644
index 8ac57d8cdd..0000000000
--- a/assets/icons/plus.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.33325 8H12.6666" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8 3.33333V12.6667" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/power.svg b/assets/icons/power.svg
deleted file mode 100644
index 29bd2127c5..0000000000
--- a/assets/icons/power.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M8 2v5M11.536 4a5.368 5.368 0 0 1 1.367 2.696 5.54 5.54 0 0 1-.28 3.042 5.223 5.223 0 0 1-1.836 2.367A4.82 4.82 0 0 1 8.016 13a4.817 4.817 0 0 1-2.777-.877 5.22 5.22 0 0 1-1.85-2.354 5.54 5.54 0 0 1-.298-3.041 5.371 5.371 0 0 1 1.35-2.705"/></svg>
diff --git a/assets/icons/public.svg b/assets/icons/public.svg
deleted file mode 100644
index 5659b5419f..0000000000
--- a/assets/icons/public.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M4 6.375A5.625 5.625 0 0 1 9.625 12M4 10a2 2 0 0 1 2 2M4 3a9 9 0 0 1 9 9"/></svg>
diff --git a/assets/icons/pull_request.svg b/assets/icons/pull_request.svg
deleted file mode 100644
index 515462ab64..0000000000
--- a/assets/icons/pull_request.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M4 6a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3ZM4 6v7M12 13a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3ZM10 6.5l-2-2 2-2"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M8.5 4.389h2.357c.303 0 .594.117.808.325.215.209.335.491.335.786V10"/></svg>
diff --git a/assets/icons/quote.svg b/assets/icons/quote.svg
deleted file mode 100644
index a958bc67f2..0000000000
--- a/assets/icons/quote.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M11.333 4H2M14 8H5.333M12 12H5M2 8v4"/></svg>
diff --git a/assets/icons/reader.svg b/assets/icons/reader.svg
deleted file mode 100644
index f477f4f32d..0000000000
--- a/assets/icons/reader.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11.8889 2H4.11111C3.49746 2 3 2.59695 3 3.33333V12.6667C3 13.403 3.49746 14 4.11111 14H11.8889C12.5025 14 13 13.403 13 12.6667V3.33333C13 2.59695 12.5025 2 11.8889 2Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9 6H6" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10 10H6" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/refresh_title.svg b/assets/icons/refresh_title.svg
deleted file mode 100644
index c9e670bfab..0000000000
--- a/assets/icons/refresh_title.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-width="1.2" d="M4.667 14V8m0 0H2m2.667 0h2.666"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M14 12.667h-3.333V9.333"/><path fill="#000" d="M4.03 3.5a.667.667 0 0 0 .883 1l-.882-1ZM8 3.333A4.667 4.667 0 0 1 12.666 8H14a6 6 0 0 0-6-6v1.333ZM12.666 8a4.656 4.656 0 0 1-1.75 3.643l.834 1.04A5.99 5.99 0 0 0 14 8h-1.334ZM5.667 3.957A4.642 4.642 0 0 1 8 3.333V2a5.976 5.976 0 0 0-3 .803l.667 1.154Zm-.754.543c.232-.205.485-.387.754-.543l-.668-1.154c-.346.2-.67.434-.968.697l.882 1Z"/></svg>
diff --git a/assets/icons/regex.svg b/assets/icons/regex.svg
deleted file mode 100644
index 818c2ba360..0000000000
--- a/assets/icons/regex.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.57132 13.7143C5.20251 13.7143 5.71418 13.2026 5.71418 12.5714C5.71418 11.9403 5.20251 11.4286 4.57132 11.4286C3.94014 11.4286 3.42847 11.9403 3.42847 12.5714C3.42847 13.2026 3.94014 13.7143 4.57132 13.7143Z" fill="black"/>
-<path d="M10.2856 2.85712V5.71426M10.2856 5.71426V8.5714M10.2856 5.71426H13.1428M10.2856 5.71426H7.42847M10.2856 5.71426L12.1904 3.80949M10.2856 5.71426L8.38084 7.61906M10.2856 5.71426L12.1904 7.61906M10.2856 5.71426L8.38084 3.80949" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-</svg>
diff --git a/assets/icons/repl_neutral.svg b/assets/icons/repl_neutral.svg
deleted file mode 100644
index 2842e2c421..0000000000
--- a/assets/icons/repl_neutral.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.5 6C13.3284 6 14 5.32843 14 4.5C14 3.67157 13.3284 3 12.5 3C11.6716 3 11 3.67157 11 4.5C11 5.32843 11.6716 6 12.5 6Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3.5 13C4.32843 13 5 12.3284 5 11.5C5 10.6716 4.32843 10 3.5 10C2.67157 10 2 10.6716 2 11.5C2 12.3284 2.67157 13 3.5 13Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7.00391 13.9293C8.16208 14.1122 9.35055 13.9659 10.4234 13.5085C11.4962 13.0511 12.4066 12.3024 13.0426 11.3545C13.6787 10.4066 14.0128 9.30075 14.0037 8.17293C13.9977 7.42342 13.8404 6.68587 13.5444 6" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.00391 2.07233C7.83928 1.90288 6.64809 2.05936 5.57504 2.52278C4.502 2.9862 3.59331 3.73659 2.95939 4.68279C2.32547 5.62899 1.99362 6.73024 2.00415 7.85274C2.0111 8.59299 2.16675 9.32147 2.45883 10" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/repl_off.svg b/assets/icons/repl_off.svg
deleted file mode 100644
index 3018ceaf85..0000000000
--- a/assets/icons/repl_off.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M14.0039 8.01361C13.9981 7.31989 13.8495 6.63699 13.5698 6" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7.00391 2.01361C7.74152 2.01361 8.2084 2.01361 9.00391 2.01361" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13.0039 11.0136C12.4719 11.8034 11.7928 12.4825 11.0039 13.0136" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.00391 14.0136C8.28937 14.0136 7.71844 14.0136 7.00391 14.0136" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3.00391 5.01361C3.53595 4.22382 4.21507 3.5447 5.00391 3.01361" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8.00391 9.01361C8.55621 9.01361 9.00391 8.56591 9.00391 8.01361C9.00391 7.46131 8.55621 7.01361 8.00391 7.01361C7.45161 7.01361 7.00391 7.46131 7.00391 8.01361C7.00391 8.56591 7.45161 9.01361 8.00391 9.01361Z" fill="black" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.5 6C13.3284 6 14 5.32843 14 4.5C14 3.67157 13.3284 3 12.5 3C11.6716 3 11 3.67157 11 4.5C11 5.32843 11.6716 6 12.5 6Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3.5 13C4.32843 13 5 12.3284 5 11.5C5 10.6716 4.32843 10 3.5 10C2.67157 10 2 10.6716 2 11.5C2 12.3284 2.67157 13 3.5 13Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M2.00391 8.01361C2.01055 8.69737 2.15535 9.37058 2.42723 10" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/repl_pause.svg b/assets/icons/repl_pause.svg
deleted file mode 100644
index 5a69a576c1..0000000000
--- a/assets/icons/repl_pause.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.5 6C13.3284 6 14 5.32843 14 4.5C14 3.67157 13.3284 3 12.5 3C11.6716 3 11 3.67157 11 4.5C11 5.32843 11.6716 6 12.5 6Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3.5 13C4.32843 13 5 12.3284 5 11.5C5 10.6716 4.32843 10 3.5 10C2.67157 10 2 10.6716 2 11.5C2 12.3284 2.67157 13 3.5 13Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7.00391 13.9293C8.16208 14.1122 9.35055 13.9659 10.4234 13.5085C11.4962 13.0511 12.4066 12.3024 13.0426 11.3545C13.6787 10.4066 14.0128 9.30075 14.0037 8.17293C13.9977 7.42342 13.8404 6.68587 13.5444 6" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.00391 2.07233C7.83928 1.90288 6.64809 2.05936 5.57504 2.52278C4.502 2.9862 3.59331 3.73659 2.95939 4.68279C2.32547 5.62899 1.99362 6.73024 2.00415 7.85274C2.0111 8.59299 2.16675 9.32147 2.45883 10" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7.00391 10.0059V6.00592" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.00391 10.0059V6.00592" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/repl_play.svg b/assets/icons/repl_play.svg
deleted file mode 100644
index 0c8f4b0832..0000000000
--- a/assets/icons/repl_play.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.00366 6.16662C7.00366 6.03849 7.14274 5.96206 7.24661 6.03313L9.93408 7.87243C10.0269 7.93591 10.0269 8.07591 9.93408 8.13939L7.24661 9.97871C7.14274 10.0498 7.00366 9.97336 7.00366 9.84518V6.16662Z" fill="black" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.5 6C13.3284 6 14 5.32843 14 4.5C14 3.67157 13.3284 3 12.5 3C11.6716 3 11 3.67157 11 4.5C11 5.32843 11.6716 6 12.5 6Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3.5 13C4.32843 13 5 12.3284 5 11.5C5 10.6716 4.32843 10 3.5 10C2.67157 10 2 10.6716 2 11.5C2 12.3284 2.67157 13 3.5 13Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7.00391 13.9293C8.16208 14.1122 9.35055 13.9659 10.4234 13.5085C11.4962 13.0511 12.4066 12.3024 13.0426 11.3545C13.6787 10.4066 14.0128 9.30075 14.0037 8.17293C13.9977 7.42342 13.8404 6.68587 13.5444 6" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.00391 2.07233C7.83928 1.90288 6.64809 2.05936 5.57504 2.52278C4.502 2.9862 3.59331 3.73659 2.95939 4.68279C2.32547 5.62899 1.99362 6.73024 2.00415 7.85274C2.0111 8.59299 2.16675 9.32147 2.45883 10" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/replace.svg b/assets/icons/replace.svg
deleted file mode 100644
index 287328e82e..0000000000
--- a/assets/icons/replace.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.99988 13C5.97267 13 4.22723 11.7936 3.44238 10.0595M7.99988 3C10.1122 3 11.9185 4.30981 12.6511 6.16152" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M2.65625 3.29688C3.00143 3.29688 3.28125 3.01705 3.28125 2.67188C3.28125 2.3267 3.00143 2.04688 2.65625 2.04688C2.31107 2.04688 2.03125 2.3267 2.03125 2.67188C2.03125 3.01705 2.31107 3.29688 2.65625 3.29688Z" fill="black"/>
-<path d="M4.71094 3.29688C5.05612 3.29688 5.33594 3.01705 5.33594 2.67188C5.33594 2.3267 5.05612 2.04688 4.71094 2.04688C4.36576 2.04688 4.08594 2.3267 4.08594 2.67188C4.08594 3.01705 4.36576 3.29688 4.71094 3.29688Z" fill="black"/>
-<path d="M5.96094 4.99219C6.30612 4.99219 6.58594 4.71237 6.58594 4.36719C6.58594 4.02201 6.30612 3.74219 5.96094 3.74219C5.61576 3.74219 5.33594 4.02201 5.33594 4.36719C5.33594 4.71237 5.61576 4.99219 5.96094 4.99219Z" fill="black"/>
-<path d="M4.71094 6.42188C5.05612 6.42188 5.33594 6.14205 5.33594 5.79688C5.33594 5.4517 5.05612 5.17188 4.71094 5.17188C4.36576 5.17188 4.08594 5.4517 4.08594 5.79688C4.08594 6.14205 4.36576 6.42188 4.71094 6.42188Z" fill="black"/>
-<path d="M5.60156 8.29688C5.94674 8.29688 6.22656 8.01705 6.22656 7.67188C6.22656 7.3267 5.94674 7.04688 5.60156 7.04688C5.25638 7.04688 4.97656 7.3267 4.97656 7.67188C4.97656 8.01705 5.25638 8.29688 5.60156 8.29688Z" fill="black"/>
-<path d="M2.65625 5.79687C3.00143 5.79687 3.28125 5.51705 3.28125 5.17187C3.28125 4.8267 3.00143 4.54688 2.65625 4.54688C2.31107 4.54688 2.03125 4.8267 2.03125 5.17187C2.03125 5.51705 2.31107 5.79687 2.65625 5.79687Z" fill="black"/>
-<path d="M2.65625 8.29688C3.00143 8.29688 3.28125 8.01705 3.28125 7.67188C3.28125 7.3267 3.00143 7.04688 2.65625 7.04688C2.31107 7.04688 2.03125 7.3267 2.03125 7.67188C2.03125 8.01705 2.31107 8.29688 2.65625 8.29688Z" fill="black"/>
-<path d="M11.7802 11.8195C11.838 11.8195 11.8906 11.8527 11.9155 11.9048L12.7174 13.5811C12.8088 13.7721 13.0017 13.8938 13.2135 13.8938H13.3394C13.7483 13.8938 14.0142 13.4635 13.8314 13.0978L13.1619 11.7589C13.1232 11.6816 13.1582 11.5823 13.241 11.5349C13.7565 11.2397 14.0695 10.6686 14.0695 10.0039C14.0695 9.43362 13.8777 8.97007 13.5248 8.64952C13.1725 8.32951 12.6652 8.15704 12.043 8.15704H10.496C10.1923 8.15704 9.94604 8.40328 9.94604 8.70704V13.3438C9.94604 13.6475 10.1923 13.8938 10.496 13.8938H10.6015C10.9053 13.8938 11.1516 13.6475 11.1516 13.3438V11.9695C11.1516 11.8867 11.2187 11.8195 11.3016 11.8195H11.7802ZM11.1516 9.31329C11.1516 9.23045 11.2187 9.16329 11.3016 9.16329H11.8984C12.2023 9.16329 12.4371 9.24491 12.5954 9.38815C12.7529 9.53081 12.8406 9.73994 12.8406 10.0078C12.8406 10.2816 12.751 10.4946 12.5909 10.6397C12.4302 10.7854 12.1925 10.868 11.8867 10.868H11.3016C11.2187 10.868 11.1516 10.8008 11.1516 10.718V9.31329Z" fill="black" stroke="black" stroke-width="0.25"/>
-</svg>
diff --git a/assets/icons/replace_all.svg b/assets/icons/replace_all.svg
deleted file mode 100644
index d3cf503e32..0000000000
--- a/assets/icons/replace_all.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.94725 6.87672L4.94725 6.87672L5.74909 8.553C5.86125 8.78748 6.09809 8.93673 6.35802 8.93673H6.48391C6.98569 8.93673 7.31204 8.40867 7.08765 7.95986L6.97585 8.01576L7.08765 7.95986L6.41818 6.62094C6.41818 6.62093 6.41818 6.62093 6.41818 6.62093C6.41567 6.6159 6.414 6.60731 6.41826 6.59524C6.42256 6.58306 6.43223 6.57013 6.44764 6.56131L6.38553 6.45283L6.44764 6.56131C7.00658 6.24123 7.33902 5.62588 7.33902 4.92189C7.33902 4.32236 7.13648 3.82296 6.75336 3.47496L6.66932 3.56749L6.75336 3.47496C6.37232 3.12885 5.83204 2.95001 5.18746 2.95001H3.64058C3.26779 2.95001 2.96558 3.25222 2.96558 3.62501V8.26173C2.96558 8.63453 3.26779 8.93673 3.64058 8.93673H3.74605C4.11884 8.93673 4.42105 8.63453 4.42105 8.26173V6.88751C4.42105 6.87371 4.43224 6.86251 4.44605 6.86251H4.92471C4.93433 6.86251 4.9431 6.86804 4.94725 6.87672ZM5.65595 4.39879L5.65595 4.3988C5.78276 4.51357 5.86012 4.68648 5.86012 4.92579C5.86012 5.17095 5.78081 5.34783 5.65146 5.46508L5.65146 5.46508C5.51987 5.58438 5.31538 5.66095 5.03121 5.66095H4.44605C4.43224 5.66095 4.42105 5.64976 4.42105 5.63595V4.23126C4.42105 4.21746 4.43224 4.20626 4.44605 4.20626H5.04293C5.32535 4.20626 5.52689 4.28197 5.65595 4.39879Z" fill="black" stroke="black" stroke-width="0.25"/>
-<path d="M10.3281 7.65625V10.3281M10.3281 10.3281V13M10.3281 10.3281H13M10.3281 10.3281H7.65625M10.3281 10.3281L12.1094 8.54688M10.3281 10.3281L8.54688 12.1094M10.3281 10.3281L12.1094 12.1094M10.3281 10.3281L8.54688 8.54688" stroke="black" stroke-width="1.25" stroke-linecap="round"/>
-</svg>
diff --git a/assets/icons/replace_next.svg b/assets/icons/replace_next.svg
deleted file mode 100644
index a9a9fc91f5..0000000000
--- a/assets/icons/replace_next.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M8.5 6.88672C10.433 6.88672 12 8.45372 12 10.3867V13M12 13L14 11M12 13L10 11" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M4.94725 6.87672L4.94725 6.87672L5.74909 8.553C5.86125 8.78748 6.09809 8.93673 6.35802 8.93673H6.48391C6.98569 8.93673 7.31204 8.40867 7.08765 7.95986L6.97585 8.01576L7.08765 7.95986L6.41818 6.62094C6.41818 6.62093 6.41818 6.62093 6.41818 6.62093C6.41567 6.6159 6.414 6.60731 6.41826 6.59524C6.42256 6.58306 6.43223 6.57013 6.44764 6.56131L6.38553 6.45283L6.44764 6.56131C7.00658 6.24123 7.33902 5.62588 7.33902 4.92189C7.33902 4.32236 7.13648 3.82296 6.75336 3.47496L6.66932 3.56749L6.75336 3.47496C6.37232 3.12885 5.83204 2.95001 5.18746 2.95001H3.64058C3.26779 2.95001 2.96558 3.25222 2.96558 3.62501V8.26173C2.96558 8.63453 3.26779 8.93673 3.64058 8.93673H3.74605C4.11884 8.93673 4.42105 8.63453 4.42105 8.26173V6.88751C4.42105 6.87371 4.43224 6.86251 4.44605 6.86251H4.92471C4.93433 6.86251 4.9431 6.86804 4.94725 6.87672ZM5.65595 4.39879L5.65595 4.3988C5.78276 4.51357 5.86012 4.68648 5.86012 4.92579C5.86012 5.17095 5.78081 5.34783 5.65146 5.46508L5.65146 5.46508C5.51987 5.58438 5.31538 5.66095 5.03121 5.66095H4.44605C4.43224 5.66095 4.42105 5.64976 4.42105 5.63595V4.23126C4.42105 4.21746 4.43224 4.20626 4.44605 4.20626H5.04293C5.32535 4.20626 5.52689 4.28197 5.65595 4.39879Z" fill="black" stroke="black" stroke-width="0.25"/>
-</svg>
diff --git a/assets/icons/reply_arrow_right.svg b/assets/icons/reply_arrow_right.svg
deleted file mode 100644
index d8321e8b3e..0000000000
--- a/assets/icons/reply_arrow_right.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2.668 11.332v-.797c0-1.12 0-1.683.219-2.11.191-.374.496-.683.87-.874.43-.219.99-.219 2.11-.219h7.469m0 0-2.668-2.664m2.668 2.664L10.668 10" stroke="black" stroke-width="1.33334" stroke-linecap="round"/>
-</svg>
diff --git a/assets/icons/rerun.svg b/assets/icons/rerun.svg
deleted file mode 100644
index 1a03a01ae6..0000000000
--- a/assets/icons/rerun.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M2 8a6 6 0 0 1 6-6 6.5 6.5 0 0 1 4.493 1.827L14 5.333"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M14 2v3.333h-3.333M14 8a6 6 0 0 1-6 6 6.5 6.5 0 0 1-4.493-1.827L2 10.667"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M5.333 10.667H2V14"/><path fill="#000" d="M6.667 6.247c0-.257.279-.418.501-.288l3.005 1.753c.22.129.22.447 0 .576L7.168 10.04a.333.333 0 0 1-.501-.288V6.247Z"/></svg>
diff --git a/assets/icons/return.svg b/assets/icons/return.svg
deleted file mode 100644
index c605eb6512..0000000000
--- a/assets/icons/return.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.00008 6.66669L2.66675 10L6.00008 13.3334" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13.3334 2.66669V7.33335C13.3334 8.0406 13.0525 8.71888 12.5524 9.21897C12.0523 9.71907 11.374 10 10.6667 10H2.66675" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/rotate_ccw.svg b/assets/icons/rotate_ccw.svg
deleted file mode 100644
index cdfa8d0ab4..0000000000
--- a/assets/icons/rotate_ccw.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="m3 5.778 1.256-1.256A5.417 5.417 0 0 1 8 3a5 5 0 1 1-4.583 7"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M3 3v3h3"/></svg>
diff --git a/assets/icons/rotate_cw.svg b/assets/icons/rotate_cw.svg
deleted file mode 100644
index 2adfa7f972..0000000000
--- a/assets/icons/rotate_cw.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="m13 5.778-1.256-1.256A5.416 5.416 0 0 0 8 3a5 5 0 1 0 4.583 7"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M13 3v3h-3"/></svg>
diff --git a/assets/icons/scissors.svg b/assets/icons/scissors.svg
deleted file mode 100644
index a19580bd89..0000000000
--- a/assets/icons/scissors.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.03641 5.53641L8.33797 7.83797M13.0825 3.0934L6.03641 10.1395M9.99896 9.49896L13.0825 12.5825M4.77932 6.05864C5.25123 6.05864 5.7038 5.87118 6.03749 5.53749C6.37118 5.2038 6.55864 4.75123 6.55864 4.27932C6.55864 3.80742 6.37118 3.35484 6.03749 3.02115C5.7038 2.68746 5.25123 2.5 4.77932 2.5C4.30742 2.5 3.85484 2.68746 3.52115 3.02115C3.18746 3.35484 3 3.80742 3 4.27932C3 4.75123 3.18746 5.2038 3.52115 5.53749C3.85484 5.87118 4.30742 6.05864 4.77932 6.05864ZM4.77932 13.1759C5.25123 13.1759 5.7038 12.9885 6.03749 12.6548C6.37118 12.3211 6.55864 11.8685 6.55864 11.3966C6.55864 10.9247 6.37118 10.4721 6.03749 10.1384C5.7038 9.80475 5.25123 9.61729 4.77932 9.61729C4.30742 9.61729 3.85484 9.80475 3.52115 10.1384C3.18746 10.4721 3 10.9247 3 11.3966C3 11.8685 3.18746 12.3211 3.52115 12.6548C3.85484 12.9885 4.30742 13.1759 4.77932 13.1759Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/screen.svg b/assets/icons/screen.svg
deleted file mode 100644
index 4bcdf19528..0000000000
--- a/assets/icons/screen.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.8 3H3.2C2.53726 3 2 3.51167 2 4.14286V9.85714C2 10.4883 2.53726 11 3.2 11H12.8C13.4627 11 14 10.4883 14 9.85714V4.14286C14 3.51167 13.4627 3 12.8 3Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5.33325 14H10.6666" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8 11.3333V14" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/select_all.svg b/assets/icons/select_all.svg
deleted file mode 100644
index 4fa17dcf63..0000000000
--- a/assets/icons/select_all.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-width="1.2" d="M10.857 8v2.857m0 0v2.857m0-2.857h2.857m-2.857 0H8m2.857 0 1.905-1.905m-1.905 1.905-1.905 1.905m1.905-1.905 1.905 1.905m-1.905-1.905L8.952 8.952"/><path fill="#000" d="M2.507 4.4c-.002.473.154.856.472 1.14.313.279.737.482 1.268.611l.678.17a3.6 3.6 0 0 1 .566.18.89.89 0 0 1 .337.228.462.462 0 0 1 .111.315.568.568 0 0 1-.124.363.834.834 0 0 1-.362.253 1.521 1.521 0 0 1-.56.093c-.221 0-.418-.033-.59-.099a.94.94 0 0 1-.405-.295.826.826 0 0 1-.145-.33c-.025-.116-.122-.215-.25-.215h-.916a.231.231 0 0 0-.234.249c.034.375.141.698.325.968.216.312.515.547.895.705.381.158.827.235 1.335.235.512 0 .953-.076 1.32-.232.37-.158.655-.38.852-.668.2-.29.3-.632.302-1.023a1.712 1.712 0 0 0-.148-.715 1.612 1.612 0 0 0-.4-.541 2.33 2.33 0 0 0-.604-.384 4.002 4.002 0 0 0-.759-.246l-.559-.134a3.236 3.236 0 0 1-.376-.108 1.584 1.584 0 0 1-.305-.149.673.673 0 0 1-.199-.198.456.456 0 0 1-.06-.26v-.002c0-.122.034-.23.103-.325a.71.71 0 0 1 .316-.227c.14-.057.313-.087.523-.087.309 0 .546.066.717.193a.687.687 0 0 1 .262.378c.03.109.126.204.251.204h.91c.133 0 .246-.11.232-.248a1.759 1.759 0 0 0-.297-.82 1.971 1.971 0 0 0-.832-.68l-.024.052M2.507 4.4c-.002-.388.101-.729.312-1.021.21-.291.5-.517.865-.679a3.03 3.03 0 0 1 1.24-.242c.468 0 .88.08 1.233.242l-.024.052m-.66 4.962a.89.89 0 0 0 .387-.27l-.386.27Zm.387-.27a.625.625 0 0 0 .137-.399l-.137.399Zm.137-.399a.518.518 0 0 0-.125-.352l.125.352Z"/><path stroke="#000" stroke-width=".114" d="M2.507 4.4c-.002.473.154.856.472 1.14.313.279.737.482 1.268.611l.678.17a3.6 3.6 0 0 1 .566.18.89.89 0 0 1 .337.228.462.462 0 0 1 .111.315.568.568 0 0 1-.124.363.834.834 0 0 1-.362.253 1.521 1.521 0 0 1-.56.093c-.221 0-.418-.033-.59-.099a.94.94 0 0 1-.405-.295.826.826 0 0 1-.145-.33c-.025-.116-.122-.215-.25-.215h-.916a.231.231 0 0 0-.234.249c.034.375.141.698.325.968.216.312.515.547.895.705.381.158.827.235 1.335.235.512 0 .953-.076 1.32-.232.37-.158.655-.38.852-.668.2-.29.3-.632.302-1.023a1.712 1.712 0 0 0-.148-.715 1.612 1.612 0 0 0-.4-.541 2.33 2.33 0 0 0-.604-.384 4.002 4.002 0 0 0-.759-.246l-.559-.134a3.236 3.236 0 0 1-.376-.108 1.584 1.584 0 0 1-.305-.149.673.673 0 0 1-.199-.198.456.456 0 0 1-.06-.26v-.002c0-.122.034-.23.103-.325a.71.71 0 0 1 .316-.227c.14-.057.313-.087.523-.087.309 0 .546.066.717.193a.687.687 0 0 1 .262.378c.03.109.126.204.251.204h.91c.133 0 .246-.11.232-.248a1.759 1.759 0 0 0-.297-.82 1.971 1.971 0 0 0-.832-.68m-3.65 1.7c-.002-.388.101-.729.312-1.021.21-.291.5-.517.865-.679a3.03 3.03 0 0 1 1.24-.242c.468 0 .88.08 1.233.242m-3.65 1.7h.057m3.593-1.7-.024.052m0 0c-.344-.158-.748-.237-1.21-.237-.454 0-.86.08-1.216.237a2.03 2.03 0 0 0-.842.66m3.268-.66c.347.159.617.378.81.66.159.234.255.498.286.794a.17.17 0 0 1-.175.185h-.91c-.094 0-.17-.072-.196-.162a.744.744 0 0 0-.283-.41c-.184-.135-.435-.203-.75-.203m.559 4.098a1.577 1.577 0 0 1-.581.098c-.227 0-.43-.035-.611-.104a.997.997 0 0 1-.429-.313m1.62.32a.89.89 0 0 0 .387-.271m-.386.27.386-.27m0 0a.625.625 0 0 0 .137-.399m-.137.399.137-.399m0 0a.518.518 0 0 0-.125-.352l.125.352Z"/></svg>
diff --git a/assets/icons/send.svg b/assets/icons/send.svg
deleted file mode 100644
index 5ceeef2af4..0000000000
--- a/assets/icons/send.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M3.377 3.028a.25.25 0 0 0-.292.045.291.291 0 0 0-.067.303l1.496 4.236c.088.25.088.526 0 .776l-1.496 4.236a.291.291 0 0 0 .067.303.25.25 0 0 0 .292.045l9.472-4.72a.267.267 0 0 0 .11-.103.288.288 0 0 0-.11-.4L3.377 3.028ZM5 8h8"/></svg>
diff --git a/assets/icons/server.svg b/assets/icons/server.svg
deleted file mode 100644
index 8d851d1328..0000000000
--- a/assets/icons/server.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.8 9H3.2C2.53726 9 2 9.44772 2 10V12C2 12.5523 2.53726 13 3.2 13H12.8C13.4627 13 14 12.5523 14 12V10C14 9.44772 13.4627 9 12.8 9Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.8 3H3.2C2.53726 3 2 3.44772 2 4V6C2 6.55228 2.53726 7 3.2 7H12.8C13.4627 7 14 6.55228 14 6V4C14 3.44772 13.4627 3 12.8 3Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M4 11H4.00667" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M4 5H4.00667" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/settings.svg b/assets/icons/settings.svg
deleted file mode 100644
index 33ac74f230..0000000000
--- a/assets/icons/settings.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.13418 2H7.86581C7.54229 2 7.23202 2.12643 7.00326 2.35148C6.7745 2.57652 6.64597 2.88174 6.64597 3.2V3.308C6.64576 3.51843 6.58929 3.72512 6.48224 3.9073C6.37518 4.08949 6.22132 4.24078 6.03605 4.346L5.77379 4.496C5.58836 4.60132 5.378 4.65677 5.16387 4.65677C4.94974 4.65677 4.73939 4.60132 4.55395 4.496L4.46246 4.44799C4.18255 4.28915 3.85 4.24606 3.53783 4.32819C3.22565 4.4103 2.95935 4.61092 2.79738 4.886L2.6632 5.11399C2.50174 5.38936 2.45793 5.7165 2.5414 6.02359C2.62488 6.33069 2.82881 6.59266 3.10844 6.75199L3.19993 6.81199C3.38429 6.9167 3.53759 7.06704 3.64459 7.24809C3.75159 7.42914 3.80857 7.63457 3.80985 7.84399V8.14999C3.8107 8.36144 3.75475 8.56937 3.64764 8.7527C3.54054 8.93602 3.38609 9.08826 3.19993 9.19399L3.10844 9.24799C2.82881 9.40732 2.62488 9.66929 2.5414 9.97638C2.45793 10.2835 2.50174 10.6106 2.6632 10.886L2.79738 11.114C2.95935 11.3891 3.22565 11.5897 3.53783 11.6718C3.85 11.7539 4.18255 11.7109 4.46246 11.552L4.55395 11.5039C4.73939 11.3986 4.94974 11.3432 5.16387 11.3432C5.378 11.3432 5.58836 11.3986 5.77379 11.5039L6.03605 11.654C6.22132 11.7592 6.37518 11.9105 6.48224 12.0927C6.58929 12.2749 6.64576 12.4815 6.64597 12.6919V12.7999C6.64597 13.1183 6.7745 13.4235 7.00326 13.6486C7.23202 13.8735 7.54229 14 7.86581 14H8.13418C8.4577 14 8.76797 13.8735 8.99674 13.6486C9.22551 13.4235 9.35402 13.1183 9.35402 12.7999V12.6919C9.35424 12.4815 9.4107 12.2749 9.51776 12.0927C9.62481 11.9105 9.77869 11.7592 9.96397 11.654L10.2262 11.5039C10.4116 11.3986 10.622 11.3432 10.8361 11.3432C11.0503 11.3432 11.2606 11.3986 11.4461 11.5039L11.5376 11.552C11.8174 11.7109 12.15 11.7539 12.4621 11.6718C12.7744 11.5897 13.0406 11.3891 13.2026 11.114L13.3368 10.88C13.4982 10.6047 13.5421 10.2775 13.4586 9.97035C13.3751 9.66329 13.1712 9.40131 12.8916 9.24199L12.8001 9.19399C12.6139 9.08826 12.4595 8.93602 12.3524 8.7527C12.2452 8.56937 12.1893 8.36144 12.1901 8.14999V7.84999C12.1893 7.63854 12.2452 7.43062 12.3524 7.24729C12.4595 7.06396 12.6139 6.91172 12.8001 6.80599L12.8916 6.75199C13.1712 6.59266 13.3751 6.33069 13.4586 6.02359C13.5421 5.7165 13.4982 5.38936 13.3368 5.11399L13.2026 4.886C13.0406 4.61092 12.7744 4.4103 12.4621 4.32819C12.15 4.24606 11.8174 4.28915 11.5376 4.44799L11.4461 4.496C11.2606 4.60132 11.0503 4.65677 10.8361 4.65677C10.622 4.65677 10.4116 4.60132 10.2262 4.496L9.96397 4.346C9.77869 4.24078 9.62481 4.08949 9.51776 3.9073C9.4107 3.72512 9.35424 3.51843 9.35402 3.308V3.2C9.35402 2.88174 9.22551 2.57652 8.99674 2.35148C8.76797 2.12643 8.4577 2 8.13418 2Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8 10C9.10457 10 10 9.10457 10 8C10 6.89543 9.10457 6 8 6C6.89543 6 6 6.89543 6 8C6 9.10457 6.89543 10 8 10Z" fill="black"/>
-</svg>
diff --git a/assets/icons/shield_check.svg b/assets/icons/shield_check.svg
deleted file mode 100644
index 43b52f43a8..0000000000
--- a/assets/icons/shield_check.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.0001 8.62505C13.0001 11.75 10.8126 13.3125 8.21266 14.2187C8.07651 14.2648 7.92862 14.2626 7.79392 14.2125C5.18771 13.3125 3.00024 11.75 3.00024 8.62505V4.25012C3.00024 4.08436 3.06609 3.92539 3.1833 3.80818C3.30051 3.69098 3.45948 3.62513 3.62523 3.62513C4.87521 3.62513 6.43769 2.87514 7.52517 1.92516C7.65758 1.81203 7.82601 1.74988 8.00016 1.74988C8.17431 1.74988 8.34275 1.81203 8.47515 1.92516C9.56889 2.88139 11.1251 3.62513 12.3751 3.62513C12.5408 3.62513 12.6998 3.69098 12.817 3.80818C12.9342 3.92539 13.0001 4.08436 13.0001 4.25012V8.62505Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6 8.00002L7.33333 9.33335L10 6.66669" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/shift.svg b/assets/icons/shift.svg
deleted file mode 100644
index c38807d8b0..0000000000
--- a/assets/icons/shift.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.07136 7.95724L7.86916 3.05405C7.93967 2.98199 8.06036 2.98198 8.13087 3.05405L12.9286 7.95724C13.0866 8.11865 12.9652 8.38015 12.7324 8.38015H10.226V12.748C10.226 12.8872 10.1065 13 9.95892 13H6.04111C5.89358 13 5.77399 12.8872 5.77399 12.748V8.38015H3.26765C3.03479 8.38015 2.91342 8.11865 3.07136 7.95724Z" stroke="black" stroke-width="1.2"/>
-</svg>
diff --git a/assets/icons/slash.svg b/assets/icons/slash.svg
deleted file mode 100644
index 1ebf01eb9f..0000000000
--- a/assets/icons/slash.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.9999 2.99988L2.99976 13" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/sliders.svg b/assets/icons/sliders.svg
deleted file mode 100644
index 20a6a367dc..0000000000
--- a/assets/icons/sliders.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2 5H4" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-<path d="M8 5L14 5" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-<path d="M12 11L14 11" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-<path d="M2 11H8" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-<circle cx="6" cy="5" r="2" fill="black" fill-opacity="0.1" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-<circle cx="10" cy="11" r="2" fill="black" fill-opacity="0.1" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-</svg>
diff --git a/assets/icons/space.svg b/assets/icons/space.svg
deleted file mode 100644
index 0294c9bf1e..0000000000
--- a/assets/icons/space.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.9999 11.4V12C13.9999 12.3 13.6999 12.6 13.3999 12.6H2.59976C2.29976 12.6 1.99976 12.3 1.99976 12V11.4" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/sparkle.svg b/assets/icons/sparkle.svg
deleted file mode 100644
index 535c447723..0000000000
--- a/assets/icons/sparkle.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M6.762 10.1a1.2 1.2 0 0 0-.862-.862l-3.68-.95a.3.3 0 0 1 0-.577l3.68-.95a1.2 1.2 0 0 0 .862-.86l.95-3.682a.3.3 0 0 1 .577 0L9.238 5.9a1.2 1.2 0 0 0 .862.862l3.68.949a.3.3 0 0 1 0 .578l-3.68.949a1.2 1.2 0 0 0-.862.862l-.95 3.68a.3.3 0 0 1-.577 0l-.949-3.68Z"/></svg>
diff --git a/assets/icons/split.svg b/assets/icons/split.svg
deleted file mode 100644
index b2be46a875..0000000000
--- a/assets/icons/split.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="8" y="2" width="6" height="12" fill="black" fill-opacity="0.25"/>
-<path d="M13.4 2H2.6C2.26863 2 2 2.26863 2 2.6V13.4C2 13.7314 2.26863 14 2.6 14H13.4C13.7314 14 14 13.7314 14 13.4V2.6C14 2.26863 13.7314 2 13.4 2Z" stroke="black" stroke-width="1.2"/>
-<path d="M8 2L8 14" stroke="black" stroke-width="1.2"/>
-</svg>
diff --git a/assets/icons/split_alt.svg b/assets/icons/split_alt.svg
deleted file mode 100644
index 2f99e1436f..0000000000
--- a/assets/icons/split_alt.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M10 2.833h3v3M6 2.833H3v3"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M8 13.833V9.028a2.401 2.401 0 0 0-.165-.9 2.325 2.325 0 0 0-.486-.763L3 2.833M10 5.833l3-3"/></svg>
diff --git a/assets/icons/square_dot.svg b/assets/icons/square_dot.svg
deleted file mode 100644
index 72b3273439..0000000000
--- a/assets/icons/square_dot.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.6667 2H3.33333C2.59695 2 2 2.59695 2 3.33333V12.6667C2 13.403 2.59695 14 3.33333 14H12.6667C13.403 14 14 13.403 14 12.6667V3.33333C14 2.59695 13.403 2 12.6667 2Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<circle cx="8" cy="8" r="1.25" fill="black" stroke="black" stroke-width="0.5"/>
-</svg>
diff --git a/assets/icons/square_minus.svg b/assets/icons/square_minus.svg
deleted file mode 100644
index 5ba458e8b5..0000000000
--- a/assets/icons/square_minus.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.6667 2H3.33333C2.59695 2 2 2.59695 2 3.33333V12.6667C2 13.403 2.59695 14 3.33333 14H12.6667C13.403 14 14 13.403 14 12.6667V3.33333C14 2.59695 13.403 2 12.6667 2Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6 8H10" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/square_plus.svg b/assets/icons/square_plus.svg
deleted file mode 100644
index 063c7dbf82..0000000000
--- a/assets/icons/square_plus.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.6667 2H3.33333C2.59695 2 2 2.59695 2 3.33333V12.6667C2 13.403 2.59695 14 3.33333 14H12.6667C13.403 14 14 13.403 14 12.6667V3.33333C14 2.59695 13.403 2 12.6667 2Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6 8H10" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8 6V10" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/star.svg b/assets/icons/star.svg
deleted file mode 100644
index b39638e386..0000000000
--- a/assets/icons/star.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.68323 1.53C7.71245 1.47097 7.75758 1.42129 7.81353 1.38655C7.86949 1.35181 7.93404 1.3334 7.9999 1.3334C8.06576 1.3334 8.13031 1.35181 8.18626 1.38655C8.24222 1.42129 8.28735 1.47097 8.31656 1.53L9.85656 4.64933C9.95802 4.85465 10.1078 5.03227 10.293 5.16697C10.4782 5.30167 10.6933 5.38941 10.9199 5.42267L14.3639 5.92667C14.4292 5.93612 14.4905 5.96365 14.5409 6.00613C14.5913 6.04862 14.6289 6.10437 14.6492 6.16707C14.6696 6.22978 14.6721 6.29694 14.6563 6.36096C14.6405 6.42498 14.6071 6.4833 14.5599 6.52933L12.0692 8.95467C11.905 9.11473 11.7821 9.31232 11.7111 9.53042C11.6402 9.74852 11.6233 9.98059 11.6619 10.2067L12.2499 13.6333C12.2614 13.6986 12.2544 13.7657 12.2296 13.8271C12.2048 13.8885 12.1632 13.9417 12.1096 13.9807C12.056 14.0196 11.9926 14.0427 11.9265 14.0473C11.8604 14.0519 11.7944 14.0378 11.7359 14.0067L8.65723 12.388C8.45438 12.2815 8.22868 12.2258 7.99956 12.2258C7.77044 12.2258 7.54475 12.2815 7.3419 12.388L4.2639 14.0067C4.20545 14.0376 4.1395 14.0515 4.07353 14.0468C4.00757 14.0421 3.94424 14.019 3.89076 13.9801C3.83728 13.9413 3.79579 13.8881 3.771 13.8268C3.74622 13.7655 3.73914 13.6985 3.75056 13.6333L4.3379 10.2073C4.3767 9.98116 4.35989 9.74893 4.28892 9.5307C4.21796 9.31246 4.09497 9.11477 3.93056 8.95467L1.4399 6.53C1.39229 6.48402 1.35856 6.4256 1.34254 6.36138C1.32652 6.29717 1.32886 6.22975 1.34928 6.16679C1.36971 6.10384 1.40741 6.04789 1.45808 6.00532C1.50876 5.96275 1.57037 5.93527 1.6359 5.926L5.07923 5.42267C5.30607 5.38967 5.52149 5.30204 5.70695 5.16733C5.89242 5.03261 6.04237 4.85485 6.1439 4.64933L7.68323 1.53Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/star_filled.svg b/assets/icons/star_filled.svg
deleted file mode 100644
index 16f64e5cb3..0000000000
--- a/assets/icons/star_filled.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.68323 1.53C7.71245 1.47097 7.75758 1.42129 7.81353 1.38655C7.86949 1.35181 7.93404 1.3334 7.9999 1.3334C8.06576 1.3334 8.13031 1.35181 8.18626 1.38655C8.24222 1.42129 8.28735 1.47097 8.31656 1.53L9.85656 4.64933C9.95802 4.85465 10.1078 5.03227 10.293 5.16697C10.4782 5.30167 10.6933 5.38941 10.9199 5.42267L14.3639 5.92667C14.4292 5.93612 14.4905 5.96365 14.5409 6.00613C14.5913 6.04862 14.6289 6.10437 14.6492 6.16707C14.6696 6.22978 14.6721 6.29694 14.6563 6.36096C14.6405 6.42498 14.6071 6.4833 14.5599 6.52933L12.0692 8.95467C11.905 9.11473 11.7821 9.31233 11.7111 9.53043C11.6402 9.74853 11.6233 9.9806 11.6619 10.2067L12.2499 13.6333C12.2614 13.6986 12.2544 13.7657 12.2296 13.8271C12.2048 13.8885 12.1632 13.9417 12.1096 13.9807C12.056 14.0196 11.9926 14.0427 11.9265 14.0473C11.8604 14.0519 11.7944 14.0378 11.7359 14.0067L8.65723 12.388C8.45438 12.2815 8.22868 12.2258 7.99956 12.2258C7.77044 12.2258 7.54475 12.2815 7.3419 12.388L4.2639 14.0067C4.20545 14.0376 4.1395 14.0515 4.07353 14.0468C4.00757 14.0421 3.94424 14.019 3.89076 13.9801C3.83728 13.9413 3.79579 13.8881 3.771 13.8268C3.74622 13.7655 3.73914 13.6985 3.75056 13.6333L4.3379 10.2073C4.3767 9.98116 4.35989 9.74893 4.28892 9.5307C4.21796 9.31246 4.09497 9.11477 3.93056 8.95467L1.4399 6.53C1.39229 6.48402 1.35856 6.4256 1.34254 6.36138C1.32652 6.29717 1.32886 6.22975 1.34928 6.16679C1.36971 6.10384 1.40741 6.04789 1.45808 6.00532C1.50876 5.96275 1.57037 5.93527 1.6359 5.926L5.07923 5.42267C5.30607 5.38967 5.52149 5.30204 5.70695 5.16733C5.89242 5.03261 6.04237 4.85485 6.1439 4.64933L7.68323 1.53Z" fill="black" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/stop.svg b/assets/icons/stop.svg
deleted file mode 100644
index cc2bbe9207..0000000000
--- a/assets/icons/stop.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5 10.8V5.2C5 5.08954 5.08954 5 5.2 5H10.8C10.9105 5 11 5.08954 11 5.2V10.8C11 10.9105 10.9105 11 10.8 11H5.2C5.08954 11 5 10.9105 5 10.8Z" fill="black" stroke="black" stroke-width="1.2" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/supermaven.svg b/assets/icons/supermaven.svg
deleted file mode 100644
index af778c70b7..0000000000
--- a/assets/icons/supermaven.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.78125 14.9375C4.35078 14.9375 4.8125 14.4758 4.8125 13.9063C4.8125 13.3367 4.35078 12.875 3.78125 12.875C3.21171 12.875 2.75 13.3367 2.75 13.9063C2.75 14.4758 3.21171 14.9375 3.78125 14.9375Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7.46876 9.18684L4.69485 14.4063L2.875 13.4382L5.64891 8.21875L7.46876 9.18684Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8.43749 2.99935L5.64475 8.21876L3.8125 7.25066L6.60524 2.03125L8.43749 2.99935Z" fill="black"/>
-<path d="M7.5 3.53124C8.06953 3.53124 8.53124 3.06954 8.53124 2.5C8.53124 1.93045 8.06953 1.46875 7.5 1.46875C6.93046 1.46875 6.46875 1.93045 6.46875 2.5C6.46875 3.06954 6.93046 3.53124 7.5 3.53124Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.4366 1.49947C12.8962 1.61399 13.2187 2.02651 13.2187 2.49985V13.9063H11.1552V6.63497L9.29072 10.1392L7.46875 9.1711L11.276 2.01583C11.4984 1.5979 11.977 1.38496 12.4366 1.49947Z" fill="black"/>
-<path d="M12.1875 14.9375C12.757 14.9375 13.2187 14.4758 13.2187 13.9063C13.2187 13.3367 12.757 12.875 12.1875 12.875C11.6179 12.875 11.1562 13.3367 11.1562 13.9063C11.1562 14.4758 11.6179 14.9375 12.1875 14.9375Z" fill="black"/>
-</svg>
diff --git a/assets/icons/supermaven_disabled.svg b/assets/icons/supermaven_disabled.svg
deleted file mode 100644
index 25eea54cde..0000000000
--- a/assets/icons/supermaven_disabled.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><g fill="#000" clip-path="url(#a)"><g opacity=".5"><path d="M3.781 14.938a1.031 1.031 0 1 0 0-2.063 1.031 1.031 0 0 0 0 2.063Z"/><path fill-rule="evenodd" d="m7.469 9.187-2.774 5.22-1.82-.969 2.774-5.22 1.82.969ZM8.438 3 5.644 8.218 3.813 7.25l2.792-5.22L8.437 3Z" clip-rule="evenodd"/><path d="M7.5 3.531a1.031 1.031 0 1 0 0-2.062 1.031 1.031 0 0 0 0 2.062Z"/><path fill-rule="evenodd" d="M12.437 1.5c.46.114.782.527.782 1v11.406h-2.064V6.635l-1.864 3.504-1.822-.968 3.807-7.155c.222-.418.701-.631 1.16-.517Z" clip-rule="evenodd"/><path d="M12.188 14.938a1.031 1.031 0 1 0 0-2.063 1.031 1.031 0 0 0 0 2.063Z"/></g><path d="m.906 6.423.845-1.813 13.595 6.34-.845 1.812L.906 6.422Z"/><path d="M15.69 12.213a1 1 0 1 0-1.812-.845 1 1 0 0 0 1.812.845ZM2.235 5.939a1 1 0 1 0-1.812-.845 1 1 0 0 0 1.812.845Z"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h16v16H0z"/></clipPath></defs></svg>
diff --git a/assets/icons/supermaven_error.svg b/assets/icons/supermaven_error.svg
deleted file mode 100644
index a0a12e17c3..0000000000
--- a/assets/icons/supermaven_error.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g opacity="0.5">
-<path d="M3.78125 14.9375C4.35078 14.9375 4.8125 14.4758 4.8125 13.9062C4.8125 13.3367 4.35078 12.875 3.78125 12.875C3.21172 12.875 2.75 13.3367 2.75 13.9062C2.75 14.4758 3.21172 14.9375 3.78125 14.9375Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7.46875 9.18684L4.69484 14.4062L2.875 13.4382L5.64891 8.21875L7.46875 9.18684Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8.4375 2.99935L5.64475 8.21875L3.8125 7.25066L6.60525 2.03125L8.4375 2.99935Z" fill="black"/>
-<path d="M7.5 3.53125C8.06953 3.53125 8.53125 3.06954 8.53125 2.5C8.53125 1.93046 8.06953 1.46875 7.5 1.46875C6.93047 1.46875 6.46875 1.93046 6.46875 2.5C6.46875 3.06954 6.93047 3.53125 7.5 3.53125Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.4366 1.49947C12.8962 1.61399 13.2188 2.02651 13.2188 2.49985V13.9063H11.1552V6.63497L9.29072 10.1392L7.46875 9.17109L11.276 2.01583C11.4984 1.59789 11.977 1.38496 12.4366 1.49947Z" fill="black"/>
-<path d="M12.1875 14.9375C12.757 14.9375 13.2188 14.4758 13.2188 13.9062C13.2188 13.3367 12.757 12.875 12.1875 12.875C11.618 12.875 11.1562 13.3367 11.1562 13.9062C11.1562 14.4758 11.618 14.9375 12.1875 14.9375Z" fill="black"/>
-</g>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M14.6847 15.9265C14.7823 16.0241 14.9406 16.0241 15.0382 15.9265L15.9259 15.0387C16.0235 14.9411 16.0235 14.7828 15.9259 14.6851L14.2408 12.9999L15.9259 11.3146C16.0236 11.217 16.0236 11.0587 15.9259 10.961L15.0382 10.0733C14.9406 9.97562 14.7823 9.97562 14.6847 10.0733L12.9996 11.7585L11.3145 10.0732C11.2169 9.9756 11.0586 9.9756 10.9609 10.0732L10.0732 10.961C9.9756 11.0587 9.9756 11.217 10.0732 11.3146L11.7584 12.9999L10.0732 14.6851C9.97563 14.7828 9.97563 14.9411 10.0732 15.0387L10.9609 15.9265C11.0586 16.0242 11.2169 16.0242 11.3145 15.9265L12.9996 14.2413L14.6847 15.9265Z" fill="black"/>
-</svg>
diff --git a/assets/icons/supermaven_init.svg b/assets/icons/supermaven_init.svg
deleted file mode 100644
index 6851aad49d..0000000000
--- a/assets/icons/supermaven_init.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g opacity="0.5">
-<path d="M3.78125 14.9375C4.35078 14.9375 4.8125 14.4758 4.8125 13.9062C4.8125 13.3367 4.35078 12.875 3.78125 12.875C3.21172 12.875 2.75 13.3367 2.75 13.9062C2.75 14.4758 3.21172 14.9375 3.78125 14.9375Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7.46875 9.18684L4.69484 14.4062L2.875 13.4382L5.64891 8.21875L7.46875 9.18684Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8.4375 2.99935L5.64475 8.21875L3.8125 7.25066L6.60525 2.03125L8.4375 2.99935Z" fill="black"/>
-<path d="M7.5 3.53125C8.06953 3.53125 8.53125 3.06954 8.53125 2.5C8.53125 1.93046 8.06953 1.46875 7.5 1.46875C6.93047 1.46875 6.46875 1.93046 6.46875 2.5C6.46875 3.06954 6.93047 3.53125 7.5 3.53125Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.4366 1.49947C12.8962 1.61399 13.2188 2.02651 13.2188 2.49985V13.9063H11.1552V6.63497L9.29072 10.1392L7.46875 9.17109L11.276 2.01583C11.4984 1.59789 11.977 1.38496 12.4366 1.49947Z" fill="black"/>
-<path d="M12.1875 14.9375C12.757 14.9375 13.2188 14.4758 13.2188 13.9062C13.2188 13.3367 12.757 12.875 12.1875 12.875C11.618 12.875 11.1562 13.3367 11.1562 13.9062C11.1562 14.4758 11.618 14.9375 12.1875 14.9375Z" fill="black"/>
-</g>
-<path d="M13 16C14.6569 16 16 14.6569 16 13C16 11.3431 14.6569 10 13 10C11.3431 10 10 11.3431 10 13C10 14.6569 11.3431 16 13 16Z" fill="black"/>
-</svg>
diff --git a/assets/icons/swatch_book.svg b/assets/icons/swatch_book.svg
deleted file mode 100644
index b37d5df8c1..0000000000
--- a/assets/icons/swatch_book.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M7.333 11.333a2.667 2.667 0 1 1-5.333 0v-8A1.333 1.333 0 0 1 3.333 2H6a1.333 1.333 0 0 1 1.333 1.333v8Z"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M11.133 8.667h1.534A1.333 1.333 0 0 1 14 10v2.667A1.334 1.334 0 0 1 12.667 14h-8M4.667 11.333h.006"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M7.333 5.333 8.867 3.8a1.6 1.6 0 0 1 2.269.003L12.4 5.067a1.6 1.6 0 0 1 .017 2.289L6.6 13.2"/></svg>
diff --git a/assets/icons/sweep_ai.svg b/assets/icons/sweep_ai.svg
deleted file mode 100644
index bf3459c7ea..0000000000
--- a/assets/icons/sweep_ai.svg
+++ /dev/null
@@ -1,32 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_3348_16)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7.97419 6.27207C8.44653 6.29114 8.86622 6.27046 9.23628 6.22425C9.08884 7.48378 8.7346 8.72903 8.16697 9.90688C8.04459 9.83861 7.92582 9.76008 7.81193 9.67108C7.64539 9.54099 7.49799 9.39549 7.37015 9.23818C7.5282 9.54496 7.64901 9.86752 7.73175 10.1986C7.35693 10.6656 6.90663 11.0373 6.412 11.3101C5.01165 10.8075 4.03638 9.63089 4.03638 7.93001C4.03638 6.96185 4.35234 6.07053 4.88281 5.36157C5.34001 5.69449 6.30374 6.20455 7.97419 6.27207ZM8.27511 11.5815C10.3762 11.5349 11.8115 10.7826 12.8347 7.93001C11.6992 7.93001 11.4246 7.10731 11.1188 6.19149C11.0669 6.03596 11.0141 5.87771 10.956 5.72037C10.6733 5.86733 10.2753 6.02782 9.74834 6.13895C9.59658 7.49345 9.20592 8.83238 8.56821 10.0897C8.89933 10.2093 9.24674 10.262 9.5908 10.2502C9.08928 10.4803 8.62468 10.8066 8.22655 11.2255C8.2457 11.3438 8.26186 11.4625 8.27511 11.5815ZM6.62702 7.75422C6.62702 7.50604 6.82821 7.30485 7.07639 7.30485C7.32457 7.30485 7.52576 7.50604 7.52576 7.75422V8.23616C7.52576 8.48435 7.32457 8.68554 7.07639 8.68554C6.82821 8.68554 6.62702 8.48435 6.62702 8.23616V7.75422ZM5.27746 7.30485C5.05086 7.30485 4.86716 7.48854 4.86716 7.71513V8.27525C4.86716 8.50185 5.05086 8.68554 5.27746 8.68554C5.50406 8.68554 5.68776 8.50185 5.68776 8.27525V7.71513C5.68776 7.48854 5.50406 7.30485 5.27746 7.30485Z" fill="white"/>
-<mask id="mask0_3348_16" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="4" y="5" width="9" height="7">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7.97419 6.27207C8.44653 6.29114 8.86622 6.27046 9.23628 6.22425C9.08884 7.48378 8.7346 8.72903 8.16697 9.90688C8.04459 9.83861 7.92582 9.76008 7.81193 9.67108C7.64539 9.54099 7.49799 9.39549 7.37015 9.23818C7.5282 9.54496 7.64901 9.86752 7.73175 10.1986C7.35693 10.6656 6.90663 11.0373 6.412 11.3101C5.01165 10.8075 4.03638 9.63089 4.03638 7.93001C4.03638 6.96185 4.35234 6.07053 4.88281 5.36157C5.34001 5.69449 6.30374 6.20455 7.97419 6.27207ZM8.27511 11.5815C10.3762 11.5349 11.8115 10.7826 12.8347 7.93001C11.6992 7.93001 11.4246 7.10731 11.1188 6.19149C11.0669 6.03596 11.0141 5.87771 10.956 5.72037C10.6733 5.86733 10.2753 6.02782 9.74834 6.13895C9.59658 7.49345 9.20592 8.83238 8.56821 10.0897C8.89933 10.2093 9.24674 10.262 9.5908 10.2502C9.08928 10.4803 8.62468 10.8066 8.22655 11.2255C8.2457 11.3438 8.26186 11.4625 8.27511 11.5815ZM6.62702 7.75422C6.62702 7.50604 6.82821 7.30485 7.07639 7.30485C7.32457 7.30485 7.52576 7.50604 7.52576 7.75422V8.23616C7.52576 8.48435 7.32457 8.68554 7.07639 8.68554C6.82821 8.68554 6.62702 8.48435 6.62702 8.23616V7.75422ZM5.27746 7.30485C5.05086 7.30485 4.86716 7.48854 4.86716 7.71513V8.27525C4.86716 8.50185 5.05086 8.68554 5.27746 8.68554C5.50406 8.68554 5.68776 8.50185 5.68776 8.27525V7.71513C5.68776 7.48854 5.50406 7.30485 5.27746 7.30485Z" fill="white"/>
-</mask>
-<g mask="url(#mask0_3348_16)">
-<path d="M9.23617 6.22425L9.39588 6.24293L9.41971 6.0393L9.21624 6.06471L9.23617 6.22425ZM8.16687 9.90688L8.08857 10.0473L8.23765 10.1305L8.31174 9.97669L8.16687 9.90688ZM7.37005 9.23819L7.49487 9.13676L7.22714 9.3118L7.37005 9.23819ZM7.73165 10.1986L7.85702 10.2993L7.90696 10.2371L7.88761 10.1597L7.73165 10.1986ZM6.41189 11.3101L6.35758 11.4615L6.42594 11.486L6.48954 11.4509L6.41189 11.3101ZM4.88271 5.36157L4.97736 5.23159L4.84905 5.13817L4.75397 5.26525L4.88271 5.36157ZM8.27501 11.5815L8.11523 11.5993L8.13151 11.7456L8.27859 11.7423L8.27501 11.5815ZM12.8346 7.93001L12.986 7.98428L13.0631 7.76921H12.8346V7.93001ZM10.9559 5.72037L11.1067 5.66469L11.0436 5.49354L10.8817 5.5777L10.9559 5.72037ZM9.74824 6.13896L9.71508 5.98161L9.60139 6.0056L9.58846 6.12102L9.74824 6.13896ZM8.56811 10.0897L8.42469 10.017L8.34242 10.1792L8.51348 10.241L8.56811 10.0897ZM9.5907 10.2502L9.65775 10.3964L9.58519 10.0896L9.5907 10.2502ZM8.22644 11.2255L8.10992 11.1147L8.05502 11.1725L8.06773 11.2512L8.22644 11.2255ZM9.21624 6.06471C8.85519 6.10978 8.44439 6.13015 7.98058 6.11139L7.96756 6.43272C8.44852 6.45215 8.87701 6.43111 9.25607 6.3838L9.21624 6.06471ZM8.31174 9.97669C8.88724 8.78244 9.2464 7.51988 9.39588 6.24293L9.07647 6.20557C8.93108 7.44772 8.58175 8.67563 8.02203 9.83708L8.31174 9.97669ZM8.2452 9.76645C8.12998 9.70219 8.01817 9.62826 7.91082 9.54438L7.71285 9.79779C7.8333 9.8919 7.95895 9.97503 8.08857 10.0473L8.2452 9.76645ZM7.91082 9.54438C7.75387 9.4218 7.61512 9.28479 7.49487 9.13676L7.24526 9.33957C7.38066 9.50619 7.53671 9.66023 7.71285 9.79779L7.91082 9.54438ZM7.22714 9.3118C7.37944 9.60746 7.49589 9.91837 7.57564 10.2376L7.88761 10.1597C7.80196 9.81663 7.67679 9.48248 7.513 9.16453L7.22714 9.3118ZM7.60624 10.098C7.24483 10.5482 6.81083 10.9065 6.33425 11.1693L6.48954 11.4509C7.00223 11.1682 7.46887 10.7829 7.85702 10.2993L7.60624 10.098ZM3.87549 7.93001C3.87548 9.7042 4.89861 10.9378 6.35758 11.4615L6.46622 11.1588C5.12449 10.6772 4.19707 9.55763 4.19707 7.93001H3.87549ZM4.75397 5.26525C4.20309 6.00147 3.87549 6.92646 3.87549 7.93001H4.19707C4.19707 6.99724 4.50139 6.13959 5.01145 5.45791L4.75397 5.26525ZM7.98058 6.11139C6.34236 6.04516 5.40922 5.54604 4.97736 5.23159L4.78806 5.49157C5.27058 5.84291 6.26491 6.3639 7.96756 6.43272L7.98058 6.11139ZM8.27859 11.7423C9.34696 11.7185 10.2682 11.515 11.0542 10.9376C11.8388 10.3612 12.4683 9.4273 12.986 7.98428L12.6833 7.8757C12.1776 9.28534 11.5779 10.1539 10.8638 10.6784C10.1511 11.202 9.30417 11.3978 8.27143 11.4208L8.27859 11.7423ZM12.8346 7.76921C12.3148 7.76921 12.0098 7.58516 11.7925 7.30552C11.5639 7.0114 11.4266 6.60587 11.2712 6.14061L10.9662 6.24242C11.1166 6.69294 11.2695 7.15667 11.5385 7.50285C11.8188 7.86347 12.2189 8.09078 12.8346 8.09078V7.76921ZM11.2712 6.14061C11.2195 5.98543 11.1658 5.82478 11.1067 5.66469L10.805 5.77606C10.8621 5.93065 10.9142 6.0865 10.9662 6.24242L11.2712 6.14061ZM10.8817 5.5777C10.6115 5.71821 10.2273 5.87362 9.71508 5.98161L9.78143 6.29626C10.3232 6.18206 10.735 6.0165 11.0301 5.86301L10.8817 5.5777ZM9.58846 6.12102C9.43882 7.45684 9.05355 8.77717 8.42469 10.017L8.71149 10.1625C9.35809 8.88764 9.75417 7.53011 9.90806 6.15685L9.58846 6.12102ZM9.58519 10.0896C9.26119 10.1006 8.93423 10.051 8.62269 9.93854L8.51348 10.241C8.86427 10.3677 9.23205 10.4234 9.5962 10.4109L9.58519 10.0896ZM8.34301 11.3363C8.72675 10.9325 9.17443 10.6181 9.65775 10.3964L9.52365 10.1041C9.00392 10.3425 8.52241 10.6807 8.10992 11.1147L8.34301 11.3363ZM8.43483 11.5638C8.4213 11.4421 8.40475 11.3207 8.3852 11.1998L8.06773 11.2512C8.08644 11.3668 8.10225 11.4829 8.11523 11.5993L8.43483 11.5638ZM7.07629 7.14405C6.73931 7.14405 6.46613 7.41724 6.46613 7.75423H6.7877C6.7877 7.59484 6.91691 7.46561 7.07629 7.46561V7.14405ZM7.68646 7.75423C7.68646 7.41724 7.41326 7.14405 7.07629 7.14405V7.46561C7.23567 7.46561 7.36489 7.59484 7.36489 7.75423H7.68646ZM7.68646 8.23616V7.75423H7.36489V8.23616H7.68646ZM7.07629 8.84634C7.41326 8.84634 7.68646 8.57315 7.68646 8.23616H7.36489C7.36489 8.39555 7.23567 8.52474 7.07629 8.52474V8.84634ZM6.46613 8.23616C6.46613 8.57315 6.73931 8.84634 7.07629 8.84634V8.52474C6.91691 8.52474 6.7877 8.39555 6.7877 8.23616H6.46613ZM6.46613 7.75423V8.23616H6.7877V7.75423H6.46613ZM5.02785 7.71514C5.02785 7.57734 5.13956 7.46561 5.27736 7.46561V7.14405C4.96196 7.14405 4.70627 7.39974 4.70627 7.71514H5.02785ZM5.02785 8.27525V7.71514H4.70627V8.27525H5.02785ZM5.27736 8.52474C5.13956 8.52474 5.02785 8.41305 5.02785 8.27525H4.70627C4.70627 8.59065 4.96196 8.84634 5.27736 8.84634V8.52474ZM5.52687 8.27525C5.52687 8.41305 5.41516 8.52474 5.27736 8.52474V8.84634C5.59277 8.84634 5.84845 8.59065 5.84845 8.27525H5.52687ZM5.52687 7.71514V8.27525H5.84845V7.71514H5.52687ZM5.27736 7.46561C5.41516 7.46561 5.52687 7.57734 5.52687 7.71514H5.84845C5.84845 7.39974 5.59277 7.14405 5.27736 7.14405V7.46561Z" fill="white"/>
-</g>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7.12635 14.5901C7.22369 14.3749 7.3069 14.1501 7.37454 13.9167C7.54132 13.3412 7.5998 12.7599 7.56197 12.1948C7.53665 12.5349 7.47589 12.8775 7.37718 13.2181C7.23926 13.694 7.03667 14.1336 6.78174 14.5301C6.89605 14.5547 7.01101 14.5747 7.12635 14.5901Z" fill="white"/>
-<path d="M9.71984 7.74796C9.50296 7.74796 9.29496 7.83412 9.14159 7.98745C8.98822 8.14082 8.9021 8.34882 8.9021 8.5657C8.9021 8.78258 8.98822 8.99057 9.14159 9.14394C9.29496 9.29728 9.50296 9.38344 9.71984 9.38344V8.5657V7.74796Z" fill="white"/>
-<mask id="mask1_3348_16" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="5" y="2" width="8" height="9">
-<path d="M12.3783 2.9985H5.36792V10.3954H12.3783V2.9985Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M9.75733 3.61999C9.98577 5.80374 9.60089 8.05373 8.56819 10.0898C8.43122 10.0403 8.29704 9.9794 8.16699 9.90688C9.15325 7.86033 9.49538 5.61026 9.22757 3.43526C9.39923 3.51584 9.57682 3.57729 9.75733 3.61999Z" fill="black"/>
-</mask>
-<g mask="url(#mask1_3348_16)">
-<path d="M8.56815 10.0898L8.67689 10.1449L8.62812 10.241L8.52678 10.2044L8.56815 10.0898ZM9.75728 3.61998L9.78536 3.50136L9.86952 3.52127L9.87853 3.6073L9.75728 3.61998ZM8.16695 9.90687L8.1076 10.0133L8.00732 9.9574L8.05715 9.85398L8.16695 9.90687ZM9.22753 3.43524L9.10656 3.45014L9.07958 3.23116L9.27932 3.32491L9.22753 3.43524ZM8.45945 10.0346C9.48122 8.02009 9.86217 5.79374 9.63608 3.63266L9.87853 3.6073C10.1093 5.81372 9.72048 8.0873 8.67689 10.1449L8.45945 10.0346ZM8.22633 9.80041C8.35056 9.86971 8.47876 9.92791 8.60956 9.97514L8.52678 10.2044C8.38363 10.1527 8.24344 10.0891 8.1076 10.0133L8.22633 9.80041ZM9.34849 3.42035C9.61905 5.61792 9.27346 7.89158 8.27675 9.9598L8.05715 9.85398C9.03298 7.82905 9.37158 5.60258 9.10656 3.45014L9.34849 3.42035ZM9.72925 3.7386C9.54064 3.69399 9.3551 3.62977 9.17573 3.54558L9.27932 3.32491C9.44327 3.40188 9.61288 3.46058 9.78536 3.50136L9.72925 3.7386Z" fill="white"/>
-</g>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M11.4118 3.46925L11.2416 3.39926L11.1904 3.57611L11.349 3.62202C11.1904 3.57611 11.1904 3.57615 11.1904 3.5762L11.1903 3.57631L11.1902 3.57658L11.19 3.57741L11.1893 3.58009C11.1886 3.58233 11.1878 3.58548 11.1867 3.58949C11.1845 3.5975 11.1814 3.60897 11.1777 3.62359C11.1703 3.6528 11.1603 3.69464 11.1493 3.74656C11.1275 3.85017 11.102 3.99505 11.0869 4.16045C11.0573 4.4847 11.0653 4.91594 11.2489 5.26595C11.2613 5.28944 11.2643 5.31174 11.2625 5.32629C11.261 5.33849 11.2572 5.34226 11.2536 5.3449C11.0412 5.50026 10.5639 5.78997 9.76653 5.96607C9.76095 6.02373 9.75493 6.08134 9.74848 6.13895C10.601 5.95915 11.1161 5.65017 11.3511 5.4782C11.4413 5.41219 11.4471 5.28823 11.3952 5.18922C11.1546 4.73063 11.2477 4.08248 11.3103 3.78401C11.3314 3.68298 11.349 3.62202 11.349 3.62202C11.3745 3.6325 11.4002 3.63983 11.4259 3.64425C11.9083 3.72709 12.4185 2.78249 12.6294 2.33939C12.6852 2.22212 12.6234 2.08843 12.497 2.05837C11.2595 1.76399 5.46936 0.631807 4.57214 4.96989C4.55907 5.03307 4.57607 5.10106 4.62251 5.14584C4.87914 5.39322 5.86138 6.18665 7.9743 6.27207C8.44664 6.29114 8.86633 6.27046 9.23638 6.22425C9.24295 6.16797 9.24912 6.1117 9.25491 6.05534C8.88438 6.10391 8.46092 6.12641 7.98094 6.10702C5.91152 6.02337 4.96693 5.24843 4.73714 5.02692C4.73701 5.02679 4.73545 5.02525 4.73422 5.0208C4.73292 5.01611 4.73254 5.00987 4.73388 5.00334C4.94996 3.95861 5.4573 3.25195 6.11188 2.77714C6.77039 2.29947 7.58745 2.04983 8.42824 1.94075C10.1122 1.72228 11.8454 2.07312 12.4588 2.21906C12.4722 2.22225 12.4787 2.22927 12.4819 2.2362C12.4853 2.24342 12.4869 2.25443 12.4803 2.2684C12.3706 2.49879 12.183 2.85746 11.9656 3.13057C11.8564 3.26783 11.7479 3.37295 11.6469 3.43216C11.5491 3.48956 11.4752 3.49529 11.4118 3.46925Z" fill="white"/>
-<mask id="mask2_3348_16" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="3" y="9" width="7" height="6">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8.22654 11.2255C8.62463 10.8066 9.08923 10.4803 9.59075 10.2502C8.97039 10.2715 8.33933 10.0831 7.81189 9.67109C7.64534 9.541 7.49795 9.39549 7.37014 9.23819C7.52815 9.54497 7.64896 9.86752 7.7317 10.1986C6.70151 11.4821 5.1007 12.0466 3.57739 11.8125C3.85909 12.527 4.32941 13.178 4.97849 13.6851C5.8625 14.3756 6.92544 14.6799 7.96392 14.6227C8.32513 13.5174 8.4085 12.351 8.22654 11.2255Z" fill="white"/>
-</mask>
-<g mask="url(#mask2_3348_16)">
-<path d="M9.59085 10.2502L9.58389 10.0472L9.67556 10.4349L9.59085 10.2502ZM8.22663 11.2255L8.02607 11.258L8.00999 11.1585L8.07936 11.0856L8.22663 11.2255ZM7.37024 9.23819L7.18961 9.33119L7.52789 9.11006L7.37024 9.23819ZM7.7318 10.1986L7.92886 10.1494L7.95328 10.2472L7.8902 10.3258L7.7318 10.1986ZM3.57749 11.8125L3.3885 11.887L3.25879 11.5579L3.60835 11.6117L3.57749 11.8125ZM7.96402 14.6227L8.15711 14.6858L8.11397 14.8179L7.97519 14.8255L7.96402 14.6227ZM9.67556 10.4349C9.19708 10.6544 8.7538 10.9657 8.37387 11.3655L8.07936 11.0856C8.49566 10.6475 8.98161 10.3062 9.50614 10.0656L9.67556 10.4349ZM7.93704 9.51099C8.42551 9.89261 9.00942 10.0669 9.58389 10.0472L9.59781 10.4533C8.93151 10.4761 8.25334 10.2737 7.68693 9.83118L7.93704 9.51099ZM7.52789 9.11006C7.64615 9.25565 7.78261 9.39038 7.93704 9.51099L7.68693 9.83118C7.50827 9.69161 7.34994 9.53537 7.21254 9.36627L7.52789 9.11006ZM7.5347 10.2479C7.45573 9.93178 7.34043 9.62393 7.18961 9.33119L7.55082 9.14514C7.71611 9.466 7.84242 9.80326 7.92886 10.1494L7.5347 10.2479ZM3.60835 11.6117C5.06278 11.8352 6.59038 11.2962 7.57335 10.0715L7.8902 10.3258C6.81284 11.6681 5.1388 12.258 3.54663 12.0133L3.60835 11.6117ZM4.85352 13.8452C4.17512 13.3152 3.68312 12.6343 3.3885 11.887L3.76648 11.738C4.03524 12.4197 4.4839 13.0409 5.10364 13.525L4.85352 13.8452ZM7.97519 14.8255C6.8895 14.8853 5.77774 14.5672 4.85352 13.8452L5.10364 13.525C5.94745 14.1842 6.96157 14.4744 7.95285 14.4198L7.97519 14.8255ZM8.42716 11.1931C8.61419 12.3499 8.52858 13.5491 8.15711 14.6858L7.77093 14.5596C8.12191 13.4857 8.20296 12.352 8.02607 11.258L8.42716 11.1931Z" fill="white"/>
-</g>
-</g>
-<defs>
-<clipPath id="clip0_3348_16">
-<rect width="9.63483" height="14" fill="white" transform="translate(3.19995 1.5)"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/assets/icons/tab.svg b/assets/icons/tab.svg
deleted file mode 100644
index db93be4df5..0000000000
--- a/assets/icons/tab.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.3333 8H2" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6.33325 12L10.3333 8L6.33325 4" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13 3.33331V12.6666" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/terminal.svg b/assets/icons/terminal.svg
deleted file mode 100644
index d3742fa11a..0000000000
--- a/assets/icons/terminal.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2.5 4C2.5 3.17157 3.17157 2.5 4 2.5H12C12.8284 2.5 13.5 3.17157 13.5 4V12C13.5 12.8284 12.8284 13.5 12 13.5H4C3.17157 13.5 2.5 12.8284 2.5 12V4ZM4.66789 10.7071L5.02145 10.3536L4.66789 10.7071C5.05842 11.0976 5.69158 11.0976 6.08211 10.7071L8.08211 8.70711C8.47263 8.31658 8.47263 7.68342 8.08211 7.29289L6.08211 5.29289C5.69158 4.90237 5.05842 4.90237 4.66789 5.29289C4.27737 5.68342 4.27737 6.31658 4.66789 6.70711L5.96079 8L4.66789 9.29289C4.27737 9.68342 4.27737 10.3166 4.66789 10.7071ZM8.625 9C8.07271 9 7.625 9.44771 7.625 10C7.625 10.5523 8.07271 11 8.625 11H10.9062C11.4585 11 11.9062 10.5523 11.9062 10C11.9062 9.44771 11.4585 9 10.9062 9H8.625Z" fill="black" stroke="black"/>
-</svg>
diff --git a/assets/icons/terminal_alt.svg b/assets/icons/terminal_alt.svg
deleted file mode 100644
index d03c05423e..0000000000
--- a/assets/icons/terminal_alt.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.2782 2.49951H3.72184C3.04677 2.49951 2.49951 3.04677 2.49951 3.72184V12.2782C2.49951 12.9532 3.04677 13.5005 3.72184 13.5005H12.2782C12.9532 13.5005 13.5005 12.9532 13.5005 12.2782V3.72184C13.5005 3.04677 12.9532 2.49951 12.2782 2.49951Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8 10.7502H10.7502" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5.24976 9.21777L7.08325 7.38428L5.24976 5.55078" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/terminal_ghost.svg b/assets/icons/terminal_ghost.svg
deleted file mode 100644
index 7d0d0e068e..0000000000
--- a/assets/icons/terminal_ghost.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 12.375H13" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3 11.125L6.75003 7.375L3 3.62497" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/text_snippet.svg b/assets/icons/text_snippet.svg
deleted file mode 100644
index b8987546d3..0000000000
--- a/assets/icons/text_snippet.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M3.333 2A1.333 1.333 0 0 0 2 3.333M12.667 2A1.334 1.334 0 0 1 14 3.333M14 12.667A1.334 1.334 0 0 1 12.667 14M3.333 14A1.334 1.334 0 0 1 2 12.667M6 2h.667M6 14h.667M9.333 2H10M9.333 14H10M2 6v.667M14 6v.667M2 9.333V10M14 9.333V10M4.667 5.333H10M4.667 8h6.666M4.667 10.667h4"/></svg>
diff --git a/assets/icons/text_thread.svg b/assets/icons/text_thread.svg
deleted file mode 100644
index aa078c72a2..0000000000
--- a/assets/icons/text_thread.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.33333 8H2" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10.6667 5H2" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9 11H2" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12 7V11" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M14 9H10" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/thread.svg b/assets/icons/thread.svg
deleted file mode 100644
index 496cf42e3a..0000000000
--- a/assets/icons/thread.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.31254 12.549C7.3841 13.0987 8.61676 13.2476 9.78839 12.9688C10.96 12.6901 11.9936 12.0021 12.7028 11.0287C13.412 10.0554 13.7503 8.8607 13.6566 7.66002C13.5629 6.45934 13.0435 5.33159 12.1919 4.48C11.3403 3.62841 10.2126 3.10898 9.01188 3.01531C7.8112 2.92164 6.61655 3.2599 5.64319 3.96912C4.66984 4.67834 3.9818 5.71188 3.70306 6.88351C3.42432 8.05514 3.5732 9.2878 4.12289 10.3594L3 13.6719L6.31254 12.549Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/thread_from_summary.svg b/assets/icons/thread_from_summary.svg
deleted file mode 100644
index 94ce9562da..0000000000
--- a/assets/icons/thread_from_summary.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.98795 10.4323C9.40771 10.9919 9.99294 11.4054 10.6607 11.614C11.3285 11.8226 12.045 11.8158 12.7087 11.5945C13.3724 11.3733 13.9497 10.9488 14.3588 10.3813C14.7678 9.81373 14.9879 9.13186 14.9879 8.43225C14.9879 7.6366 14.6719 6.87354 14.1093 6.31093C13.5467 5.74832 12.7836 5.43225 11.9879 5.43225C11.6685 5.43225 11.3595 5.47897 11.0677 5.56586C10.0571 5.86681 9.46945 6.84992 8.98796 7.78806V7.78806" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8.01318 5.93652V8.60319H10.6799" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8.01318 5.93652V8.60319H10.6799" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7.00558 12.4263C6.16246 12.4494 5.3211 12.2612 4.56083 11.8712L1.24829 12.994L2.37119 9.68151C1.8215 8.60995 1.67261 7.37729 1.95135 6.20566C2.23009 5.03403 2.91813 4.00048 3.89148 3.29126C4.86484 2.58204 6.05949 2.24379 7.26018 2.33746C7.86645 2.38475 8.45413 2.54061 8.99705 2.79296" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/thumbs_down.svg b/assets/icons/thumbs_down.svg
deleted file mode 100644
index a396ff14f6..0000000000
--- a/assets/icons/thumbs_down.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><g stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" clip-path="url(#a)"><path d="M3.013 8.57h2.478V3.2H3.013a.413.413 0 0 0-.413.413v4.544a.413.413 0 0 0 .413.413ZM5.491 8.57l2.066 4.13a1.652 1.652 0 0 0 1.652-1.652v-1.24h3.304a.826.826 0 0 0 .82-.929l-.62-4.956a.827.827 0 0 0-.82-.723H5.492"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h16v16H0z"/></clipPath></defs></svg>
diff --git a/assets/icons/thumbs_up.svg b/assets/icons/thumbs_up.svg
deleted file mode 100644
index 73c859c355..0000000000
--- a/assets/icons/thumbs_up.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><g stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" clip-path="url(#a)"><path d="M3.013 7.33h2.478v5.37H3.013a.413.413 0 0 1-.413-.413V7.743a.413.413 0 0 1 .413-.413ZM5.491 7.33 7.557 3.2a1.652 1.652 0 0 1 1.652 1.652v1.24h3.304a.826.826 0 0 1 .82.929l-.62 4.956a.827.827 0 0 1-.82.723H5.492"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h16v16H0z"/></clipPath></defs></svg>
diff --git a/assets/icons/todo_complete.svg b/assets/icons/todo_complete.svg
deleted file mode 100644
index 5bf70841a8..0000000000
--- a/assets/icons/todo_complete.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M8 13A5 5 0 1 0 8 3a5 5 0 0 0 0 10Z"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="m5.949 9.026 1.538 1.025 2.564-3.59"/></svg>
diff --git a/assets/icons/todo_pending.svg b/assets/icons/todo_pending.svg
deleted file mode 100644
index e5e9776f11..0000000000
--- a/assets/icons/todo_pending.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7 3C7.66045 3 8.33955 3 9 3" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11 4C11.3949 4.26602 11.7345 4.60558 12 5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13 7C13 7.66045 13 8.33955 13 9" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12 11C11.734 11.3949 11.3944 11.7345 11 12" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9 13C8.33954 13 7.66046 13 7 13" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5 12C4.6051 11.734 4.26554 11.3944 4 11" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3 9C3 8.33955 3 7.66045 3 7" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M4 5C4.26602 4.6051 4.60558 4.26554 5 4" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/todo_progress.svg b/assets/icons/todo_progress.svg
deleted file mode 100644
index b4a3e8c50e..0000000000
--- a/assets/icons/todo_progress.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7 3C7.66045 3 8.33955 3 9 3" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11 4C11.3949 4.26602 11.7345 4.60558 12 5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13 7C13 7.66045 13 8.33955 13 9" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12 11C11.734 11.3949 11.3944 11.7345 11 12" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9 13C8.33954 13 7.66046 13 7 13" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5 12C4.6051 11.734 4.26554 11.3944 4 11" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3 9C3 8.33955 3 7.66045 3 7" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M4 5C4.26602 4.6051 4.60558 4.26554 5 4" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8.00016 8.66665C8.36835 8.66665 8.66683 8.36817 8.66683 7.99998C8.66683 7.63179 8.36835 7.33331 8.00016 7.33331C7.63197 7.33331 7.3335 7.63179 7.3335 7.99998C7.3335 8.36817 7.63197 8.66665 8.00016 8.66665Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/tool_copy.svg b/assets/icons/tool_copy.svg
deleted file mode 100644
index a497a5c9cb..0000000000
--- a/assets/icons/tool_copy.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.5 2.5H6.5C6.22386 2.5 6 2.83579 6 3.25V4.75C6 5.16421 6.22386 5.5 6.5 5.5H9.5C9.77614 5.5 10 5.16421 10 4.75V3.25C10 2.83579 9.77614 2.5 9.5 2.5Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10 3.5H11C11.2652 3.5 11.5196 3.61706 11.7071 3.82544C11.8946 4.03381 12 4.31643 12 4.61111V12.3889C12 12.6836 11.8946 12.9662 11.7071 13.1746C11.5196 13.3829 11.2652 13.5 11 13.5H5C4.73478 13.5 4.48043 13.3829 4.29289 13.1746C4.10536 12.9662 4 12.6836 4 12.3889V4.61111C4 4.31643 4.10536 4.03381 4.29289 3.82544C4.48043 3.61706 4.73478 3.5 5 3.5H6" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/tool_delete_file.svg b/assets/icons/tool_delete_file.svg
deleted file mode 100644
index e15c0cb568..0000000000
--- a/assets/icons/tool_delete_file.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.50002 2.5H5C4.73478 2.5 4.48043 2.6159 4.29289 2.82219C4.10535 3.02848 4 3.30826 4 3.6V12.3999C4 12.6917 4.10535 12.9715 4.29289 13.1778C4.48043 13.3841 4.73478 13.5 5 13.5H11C11.2652 13.5 11.5195 13.3841 11.7071 13.1778C11.8946 12.9715 12 12.6917 12 12.3999V5.25L9.50002 2.5Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.3427 6.82379L6.65698 9.5095" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6.65698 6.82379L9.3427 9.5095" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/tool_diagnostics.svg b/assets/icons/tool_diagnostics.svg
deleted file mode 100644
index 414810628d..0000000000
--- a/assets/icons/tool_diagnostics.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.7244 11.5299L9.01711 3.2922C8.91447 3.11109 8.76562 2.96045 8.58576 2.85564C8.4059 2.75084 8.20145 2.69562 7.99328 2.69562C7.7851 2.69562 7.58066 2.75084 7.40079 2.85564C7.22093 2.96045 7.07209 3.11109 6.96945 3.2922L2.26218 11.5299C2.15844 11.7096 2.10404 11.9135 2.1045 12.121C2.10495 12.3285 2.16026 12.5321 2.2648 12.7113C2.36934 12.8905 2.5194 13.0389 2.69978 13.1415C2.88015 13.244 3.08443 13.297 3.2919 13.2951H12.7064C12.9129 13.2949 13.1157 13.2404 13.2944 13.137C13.4731 13.0336 13.6215 12.8851 13.7247 12.7062C13.8278 12.5273 13.8821 12.3245 13.882 12.118C13.882 11.9115 13.8276 11.7087 13.7244 11.5299Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7.99927 6.23425V8.58788" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7.99927 10.9415H8.00492" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/tool_folder.svg b/assets/icons/tool_folder.svg
deleted file mode 100644
index 35f4c1f8ac..0000000000
--- a/assets/icons/tool_folder.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.8 13C13.1183 13 13.4235 12.8761 13.6486 12.6554C13.8735 12.4349 14 12.1356 14 11.8236V5.94118C14 5.62916 13.8735 5.32992 13.6486 5.10929C13.4235 4.88866 13.1183 4.76471 12.8 4.76471H8.06C7.8593 4.76664 7.66133 4.71919 7.48418 4.6267C7.30703 4.53421 7.15637 4.39964 7.046 4.2353L6.56 3.52941C6.45073 3.36675 6.30199 3.23322 6.1271 3.14082C5.95221 3.04842 5.75666 3.00004 5.558 3H3.2C2.88174 3 2.57651 3.12395 2.35148 3.34458C2.12643 3.56521 2 3.86445 2 4.17647V11.8236C2 12.1356 2.12643 12.4349 2.35148 12.6554C2.57651 12.8761 2.88174 13 3.2 13H12.8Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/tool_hammer.svg b/assets/icons/tool_hammer.svg
deleted file mode 100644
index f725012cdf..0000000000
--- a/assets/icons/tool_hammer.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9 8.5L4.94864 12.6222C4.71647 12.8544 4.40157 12.9848 4.07323 12.9848C3.74488 12.9848 3.42999 12.8544 3.19781 12.6222C2.96564 12.39 2.83521 12.0751 2.83521 11.7468C2.83521 11.4185 2.96564 11.1036 3.19781 10.8714L7.5 6.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10.8352 9.98474L13.8352 6.98474" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.8352 7.42495L11.7634 6.4298C11.5533 6.23484 11.4353 5.97039 11.4352 5.69462V5.08526L10.1696 3.91022C9.54495 3.33059 8.69961 3.00261 7.81649 2.99722L5.83521 2.98474L6.35041 3.41108C6.71634 3.71233 7.00935 4.08216 7.21013 4.4962C7.4109 4.91024 7.51488 5.35909 7.51521 5.81316L7.5 6.5L9 8.5L9.5 8C9.5 8 9.87337 7.79457 10.0834 7.98959L11.1552 8.98474" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/tool_notification.svg b/assets/icons/tool_notification.svg
deleted file mode 100644
index 7903a3369a..0000000000
--- a/assets/icons/tool_notification.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.5 12C6.65203 12.304 6.87068 12.5565 7.13399 12.7321C7.39729 12.9076 7.69597 13 8 13C8.30403 13 8.60271 12.9076 8.86601 12.7321C9.12932 12.5565 9.34797 12.304 9.5 12" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3.63088 9.21874C3.56556 9.28556 3.52246 9.36865 3.50681 9.45791C3.49116 9.54718 3.50364 9.63876 3.54273 9.72152C3.58183 9.80429 3.64585 9.87467 3.72701 9.92409C3.80817 9.97352 3.90298 9.99987 3.99989 9.99994H12.0001C12.097 9.99997 12.1918 9.97372 12.273 9.92439C12.3542 9.87505 12.4183 9.80476 12.4575 9.72205C12.4967 9.63934 12.5093 9.54778 12.4938 9.45851C12.4783 9.36924 12.4353 9.2861 12.3701 9.21921C11.705 8.57941 11 7.89947 11 5.79994C11 5.05733 10.684 4.34514 10.1213 3.82004C9.55872 3.29494 8.79564 2.99994 7.99997 2.99994C7.20431 2.99994 6.44123 3.29494 5.87861 3.82004C5.31599 4.34514 4.99991 5.05733 4.99991 5.79994C4.99991 7.89947 4.2944 8.57941 3.63088 9.21874Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/tool_pencil.svg b/assets/icons/tool_pencil.svg
deleted file mode 100644
index c4d289e9c0..0000000000
--- a/assets/icons/tool_pencil.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.5871 5.40582C12.8514 5.14152 13 4.78304 13 4.40922C13 4.03541 12.8516 3.67688 12.5873 3.41252C12.323 3.14816 11.9645 2.99962 11.5907 2.99957C11.2169 2.99953 10.8584 3.14798 10.594 3.41227L3.92098 10.0869C3.80488 10.2027 3.71903 10.3452 3.67097 10.5019L3.01047 12.678C2.99754 12.7212 2.99657 12.7672 3.00764 12.8109C3.01872 12.8547 3.04143 12.8946 3.07337 12.9265C3.1053 12.9584 3.14528 12.981 3.18905 12.992C3.23282 13.003 3.27875 13.002 3.32197 12.989L5.49849 12.329C5.65508 12.2813 5.79758 12.196 5.91349 12.0805L12.5871 5.40582Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9 5L11 7" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/tool_read.svg b/assets/icons/tool_read.svg
deleted file mode 100644
index d22e9d8c7d..0000000000
--- a/assets/icons/tool_read.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3 5.66667V4.33333C3 3.97971 3.14048 3.64057 3.39052 3.39052C3.64057 3.14048 3.97971 3 4.33333 3H5.66667" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10.3333 3H11.6666C12.0202 3 12.3593 3.14048 12.6094 3.39052C12.8594 3.64057 12.9999 3.97971 12.9999 4.33333V5.66667" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.9999 10.3333V11.6666C12.9999 12.0203 12.8594 12.3594 12.6094 12.6095C12.3593 12.8595 12.0202 13 11.6666 13H10.3333" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5.66667 13H4.33333C3.97971 13 3.64057 12.8595 3.39052 12.6095C3.14048 12.3594 3 12.0203 3 11.6666V10.3333" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5.5 8H10.5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/tool_regex.svg b/assets/icons/tool_regex.svg
deleted file mode 100644
index 818c2ba360..0000000000
--- a/assets/icons/tool_regex.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.57132 13.7143C5.20251 13.7143 5.71418 13.2026 5.71418 12.5714C5.71418 11.9403 5.20251 11.4286 4.57132 11.4286C3.94014 11.4286 3.42847 11.9403 3.42847 12.5714C3.42847 13.2026 3.94014 13.7143 4.57132 13.7143Z" fill="black"/>
-<path d="M10.2856 2.85712V5.71426M10.2856 5.71426V8.5714M10.2856 5.71426H13.1428M10.2856 5.71426H7.42847M10.2856 5.71426L12.1904 3.80949M10.2856 5.71426L8.38084 7.61906M10.2856 5.71426L12.1904 7.61906M10.2856 5.71426L8.38084 3.80949" stroke="black" stroke-width="1.2" stroke-linecap="round"/>
-</svg>
diff --git a/assets/icons/tool_search.svg b/assets/icons/tool_search.svg
deleted file mode 100644
index b225a1298e..0000000000
--- a/assets/icons/tool_search.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13 13L11 11" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7.5 12C9.98528 12 12 9.98528 12 7.5C12 5.01472 9.98528 3 7.5 3C5.01472 3 3 5.01472 3 7.5C3 9.98528 5.01472 12 7.5 12Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/tool_terminal.svg b/assets/icons/tool_terminal.svg
deleted file mode 100644
index 24da5e3a10..0000000000
--- a/assets/icons/tool_terminal.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.2782 2.49951H3.72184C3.04677 2.49951 2.49951 3.04677 2.49951 3.72184V12.2782C2.49951 12.9532 3.04677 13.5005 3.72184 13.5005H12.2782C12.9532 13.5005 13.5005 12.9532 13.5005 12.2782V3.72184C13.5005 3.04677 12.9532 2.49951 12.2782 2.49951Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8 10.7502H10.7502" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5.24976 9.21777L7.08325 7.38428L5.24976 5.55078" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/tool_think.svg b/assets/icons/tool_think.svg
deleted file mode 100644
index 773f5e7fa7..0000000000
--- a/assets/icons/tool_think.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.9526 10.2625C10.0833 9.62316 9.9526 9.60566 10.9315 8.47946C11.5008 7.82461 11.9105 7.07306 11.9105 6.242C11.9105 5.22472 11.4979 4.2491 10.7637 3.52978C10.0294 2.81046 9.03338 2.40634 7.99491 2.40634C6.95644 2.40634 5.96051 2.81046 5.22619 3.52978C4.49189 4.2491 4.07935 5.22472 4.07935 6.242C4.07935 6.88128 4.20987 7.64842 5.05825 8.47946C6.03714 9.62442 5.90666 9.62316 6.03718 10.2625M9.9526 10.2625V12.3893C9.9526 13.0544 9.40223 13.5937 8.72319 13.5937H7.26665C6.58761 13.5937 6.03714 13.0544 6.03714 12.3893L6.03718 10.2625M9.9526 10.2625H7.99491H6.03718" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/tool_web.svg b/assets/icons/tool_web.svg
deleted file mode 100644
index 288b54c432..0000000000
--- a/assets/icons/tool_web.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.99993 13.4804C11.0267 13.4804 13.4803 11.0267 13.4803 7.99999C13.4803 4.97325 11.0267 2.51959 7.99993 2.51959C4.97319 2.51959 2.51953 4.97325 2.51953 7.99999C2.51953 11.0267 4.97319 13.4804 7.99993 13.4804Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8 3C6.71611 4.34807 6 6.13836 6 7.99999C6 9.86163 6.71611 11.6519 8 13C9.28387 11.6519 10 9.86163 10 7.99999C10 6.13836 9.28387 4.34807 8 3Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3.24121 7.04827C4.52425 8.27022 6.22817 8.95178 7.99999 8.95178C9.77182 8.95178 11.4757 8.27022 12.7588 7.04827" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/trash.svg b/assets/icons/trash.svg
deleted file mode 100644
index 4a9e9add02..0000000000
--- a/assets/icons/trash.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3 5L13 5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12 5V12.875C12 13.4375 11.4286 14 10.8571 14H5.14286C4.57143 14 4 13.4375 4 12.875V5" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10 5V3C10 2.44772 9.55228 2 9 2H7C6.44772 2 6 2.44772 6 3V5" stroke="black" stroke-width="1.2"/>
-</svg>
diff --git a/assets/icons/triangle.svg b/assets/icons/triangle.svg
deleted file mode 100644
index c36d382e73..0000000000
--- a/assets/icons/triangle.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.99996 3L2.82349 12H13.1764L7.99996 3Z" fill="black"/>
-</svg>
diff --git a/assets/icons/triangle_right.svg b/assets/icons/triangle_right.svg
deleted file mode 100644
index bb82d8e637..0000000000
--- a/assets/icons/triangle_right.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6 11.4667V4L10.8 7.73333L6 11.4667Z" fill="black"/>
-</svg>
diff --git a/assets/icons/undo.svg b/assets/icons/undo.svg
deleted file mode 100644
index ccd45e246c..0000000000
--- a/assets/icons/undo.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.125 9.25001L3 6.125L6.125 3" stroke="#C4CAD4" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3 6.125H9.56251C10.0139 6.125 10.4609 6.21391 10.878 6.38666C11.295 6.55942 11.674 6.81262 11.9932 7.13182C12.3124 7.45102 12.5656 7.82997 12.7383 8.24703C12.9111 8.66408 13 9.11108 13 9.5625C13 10.0139 12.9111 10.4609 12.7383 10.878C12.5656 11.295 12.3124 11.674 11.9932 11.9932C11.674 12.3124 11.295 12.5656 10.878 12.7383C10.4609 12.9111 10.0139 13 9.56251 13H7.375" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/unpin.svg b/assets/icons/unpin.svg
deleted file mode 100644
index 07c93eae6f..0000000000
--- a/assets/icons/unpin.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M6.28561 2.25C5.83777 2.25 5.42262 2.44429 5.12712 2.76607C4.8336 3.08568 4.67847 3.50652 4.67847 3.93333C4.67847 4.00474 4.68281 4.07598 4.69142 4.14661L10.0356 6.63864V5.58279C10.3579 5.51401 10.6495 5.3435 10.8728 5.10053C11.1662 4.78092 11.3213 4.36012 11.3213 3.93333C11.3213 3.50655 11.1661 3.08559 10.8726 2.76598C10.5771 2.44432 10.1621 2.25 9.71419 2.25H6.28561Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M1.70131 4.68303C1.87636 4.30763 2.3226 4.14521 2.698 4.32027L13.9361 9.5607C14.3115 9.73575 14.474 10.182 14.2989 10.5574C14.1239 10.9328 13.6776 11.0952 13.3022 10.9202L11.6006 10.1267C11.5536 10.2137 11.4958 10.2957 11.4272 10.3704C11.2121 10.6045 10.9057 10.75 10.5715 10.75H8.75007V13C8.75007 13.4142 8.41428 13.75 8.00007 13.75C7.58585 13.75 7.25007 13.4142 7.25007 13V10.75H5.42864C5.09445 10.75 4.78832 10.6049 4.57321 10.3706C4.36002 10.1385 4.25007 9.83637 4.25007 9.53334V9.17868C4.25021 8.87805 4.32715 8.57932 4.47703 8.31614C4.6266 8.05351 4.84546 7.83234 5.11609 7.68521L5.68873 7.36993L2.06407 5.67973C1.68867 5.50467 1.52625 5.05844 1.70131 4.68303Z" fill="black"/>
-</svg>
diff --git a/assets/icons/user_check.svg b/assets/icons/user_check.svg
deleted file mode 100644
index ee32a52590..0000000000
--- a/assets/icons/user_check.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M2 13.4a4.8 4.8 0 0 1 7.975-3.6"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M6.8 8.6a3 3 0 1 0 0-6 3 3 0 0 0 0 6ZM10.4 12.2l1.2 1.2L14 11"/></svg>
diff --git a/assets/icons/user_group.svg b/assets/icons/user_group.svg
deleted file mode 100644
index 30d2e5a7ea..0000000000
--- a/assets/icons/user_group.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.79118 8.27005C8.27568 8.27005 9.4791 7.06663 9.4791 5.58214C9.4791 4.09765 8.27568 2.89423 6.79118 2.89423C5.30669 2.89423 4.10327 4.09765 4.10327 5.58214C4.10327 7.06663 5.30669 8.27005 6.79118 8.27005Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6.79112 8.60443C4.19441 8.60443 2.08936 10.7095 2.08936 13.3062H11.4929C11.4929 10.7095 9.38784 8.60443 6.79112 8.60443Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M14.6984 12.9263C14.6984 10.8893 13.4895 8.99736 12.2806 8.09067C12.6779 7.79254 12.9957 7.40104 13.2057 6.95083C13.4157 6.50062 13.5115 6.00558 13.4846 5.50952C13.4577 5.01346 13.309 4.53168 13.0515 4.10681C12.7941 3.68194 12.4358 3.3271 12.0085 3.07367" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/user_round_pen.svg b/assets/icons/user_round_pen.svg
deleted file mode 100644
index e684fd1a20..0000000000
--- a/assets/icons/user_round_pen.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M2 13.433a4.8 4.8 0 0 1 6.493-4.492M13.627 10.809a1.275 1.275 0 0 0-1.803-1.803l-2.406 2.408a1.2 1.2 0 0 0-.303.512l-.502 1.722a.3.3 0 0 0 .372.372l1.722-.502c.193-.057.37-.161.512-.304l2.408-2.405Z"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M6.8 8.633a3 3 0 1 0 0-6 3 3 0 0 0 0 6Z"/></svg>
diff --git a/assets/icons/warning.svg b/assets/icons/warning.svg
deleted file mode 100644
index 5af37dab9d..0000000000
--- a/assets/icons/warning.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M13.84 11.6 9.037 3.199a1.2 1.2 0 0 0-2.089 0l-4.802 8.403a1.2 1.2 0 0 0 1.05 1.8h9.604a1.201 1.201 0 0 0 1.038-1.8ZM8 6v2.667M8 11.333h.007"/></svg>
diff --git a/assets/icons/whole_word.svg b/assets/icons/whole_word.svg
deleted file mode 100644
index ce0d1606c8..0000000000
--- a/assets/icons/whole_word.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path fill="#000" fill-rule="evenodd" d="m5.425 10.842-.773-3.948-.782 3.948H2.487L1.147 4.58H2.6l.617 3.897.764-3.886h1.342l.754 3.88.616-3.89H8.15l-1.341 6.261H5.425ZM9.885 10.656c-.384-.218-.648-.577-.802-1.047-.152-.463-.222-1.104-.222-1.91 0-.798.066-1.431.21-1.885v-.002c.155-.47.419-.826.804-1.037.374-.212.88-.306 1.496-.306.447 0 .816.052 1.082.177.128.059.244.14.35.243V2.32h1.377v8.52h-1.376v-.337a1.545 1.545 0 0 1-.393.271c-.26.125-.601.178-1.007.178-.622 0-1.134-.09-1.514-.293l-.005-.003Zm2.817-1.679c.08-.288.124-.71.124-1.278 0-.56-.044-.975-.124-1.255-.078-.274-.199-.434-.342-.521l-.008-.005c-.146-.097-.385-.161-.748-.161-.395 0-.665.064-.835.167l-.005.003c-.158.09-.287.251-.37.522-.087.277-.135.69-.135 1.25 0 .568.048.984.134 1.262.084.27.214.439.376.536.17.102.44.167.835.167.364 0 .605-.061.752-.153.146-.094.268-.261.346-.534Z" clip-rule="evenodd"/><path stroke="#000" stroke-linecap="round" stroke-width="1.2" d="M2 13h12"/></svg>
diff --git a/assets/icons/x_circle.svg b/assets/icons/x_circle.svg
deleted file mode 100644
index 8807e5fa1f..0000000000
--- a/assets/icons/x_circle.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path fill="#000" fill-opacity=".157" stroke="#000" stroke-linejoin="round" stroke-width="1.2" d="M9.864 3a.5.5 0 0 1 .353.146l2.636 2.636a.5.5 0 0 1 .147.354v3.728a.5.5 0 0 1-.146.353l-2.637 2.637a.5.5 0 0 1-.353.146H6.136a.5.5 0 0 1-.354-.146l-2.636-2.636A.5.5 0 0 1 3 9.864V6.136a.5.5 0 0 1 .146-.354l2.636-2.636A.5.5 0 0 1 6.136 3h3.728Z"/><path stroke="#000" stroke-linecap="round" stroke-width="1.2" d="m9.5 6.5-3 3m3 0-3-3"/></svg>
diff --git a/assets/icons/x_circle_filled.svg b/assets/icons/x_circle_filled.svg
deleted file mode 100644
index 52215acda8..0000000000
--- a/assets/icons/x_circle_filled.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 2C11.3137 2 14 4.68629 14 8C14 11.3137 11.3137 14 8 14C4.68629 14 2 11.3137 2 8C2 4.68629 4.68629 2 8 2ZM10.4238 5.57617C10.1895 5.34187 9.81049 5.3419 9.57617 5.57617L8 7.15234L6.42383 5.57617C6.18953 5.34187 5.81049 5.3419 5.57617 5.57617C5.34186 5.81049 5.34186 6.18951 5.57617 6.42383L7.15234 8L5.57617 9.57617C5.34186 9.81049 5.34186 10.1895 5.57617 10.4238C5.81049 10.6581 6.18954 10.6581 6.42383 10.4238L8 8.84766L9.57617 10.4238C9.81049 10.6581 10.1895 10.6581 10.4238 10.4238C10.6581 10.1895 10.658 9.81048 10.4238 9.57617L8.84766 8L10.4238 6.42383C10.6581 6.18954 10.658 5.81048 10.4238 5.57617Z" fill="black"/>
-</svg>
diff --git a/assets/icons/zed_agent.svg b/assets/icons/zed_agent.svg
deleted file mode 100644
index 0c80e22c51..0000000000
--- a/assets/icons/zed_agent.svg
+++ /dev/null
@@ -1,27 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11 8.75V10.5C8.93097 10.5 8.06903 10.5 6 10.5V10L11 6V5.5H6V7.25" stroke="black" stroke-width="1.5"/>
-<path d="M2 8.5C2.27614 8.5 2.5 8.27614 2.5 8C2.5 7.72386 2.27614 7.5 2 7.5C1.72386 7.5 1.5 7.72386 1.5 8C1.5 8.27614 1.72386 8.5 2 8.5Z" fill="black"/>
-<path opacity="0.6" d="M2.99976 6.33002C3.2759 6.33002 3.49976 6.10616 3.49976 5.83002C3.49976 5.55387 3.2759 5.33002 2.99976 5.33002C2.72361 5.33002 2.49976 5.55387 2.49976 5.83002C2.49976 6.10616 2.72361 6.33002 2.99976 6.33002Z" fill="black"/>
-<path opacity="0.6" d="M2.99976 10.66C3.2759 10.66 3.49976 10.4361 3.49976 10.16C3.49976 9.88383 3.2759 9.65997 2.99976 9.65997C2.72361 9.65997 2.49976 9.88383 2.49976 10.16C2.49976 10.4361 2.72361 10.66 2.99976 10.66Z" fill="black"/>
-<path d="M15 8.5C15.2761 8.5 15.5 8.27614 15.5 8C15.5 7.72386 15.2761 7.5 15 7.5C14.7239 7.5 14.5 7.72386 14.5 8C14.5 8.27614 14.7239 8.5 15 8.5Z" fill="black"/>
-<path opacity="0.6" d="M14 6.33002C14.2761 6.33002 14.5 6.10616 14.5 5.83002C14.5 5.55387 14.2761 5.33002 14 5.33002C13.7239 5.33002 13.5 5.55387 13.5 5.83002C13.5 6.10616 13.7239 6.33002 14 6.33002Z" fill="black"/>
-<path opacity="0.6" d="M14 10.66C14.2761 10.66 14.5 10.4361 14.5 10.16C14.5 9.88383 14.2761 9.65997 14 9.65997C13.7239 9.65997 13.5 9.88383 13.5 10.16C13.5 10.4361 13.7239 10.66 14 10.66Z" fill="black"/>
-<path d="M8.49219 2C8.76833 2 8.99219 1.77614 8.99219 1.5C8.99219 1.22386 8.76833 1 8.49219 1C8.21605 1 7.99219 1.22386 7.99219 1.5C7.99219 1.77614 8.21605 2 8.49219 2Z" fill="black"/>
-<path opacity="0.6" d="M6 3C6.27614 3 6.5 2.77614 6.5 2.5C6.5 2.22386 6.27614 2 6 2C5.72386 2 5.5 2.22386 5.5 2.5C5.5 2.77614 5.72386 3 6 3Z" fill="black"/>
-<path d="M4 4C4.27614 4 4.5 3.77614 4.5 3.5C4.5 3.22386 4.27614 3 4 3C3.72386 3 3.5 3.22386 3.5 3.5C3.5 3.77614 3.72386 4 4 4Z" fill="black"/>
-<path d="M3.99976 13C4.2759 13 4.49976 12.7761 4.49976 12.5C4.49976 12.2239 4.2759 12 3.99976 12C3.72361 12 3.49976 12.2239 3.49976 12.5C3.49976 12.7761 3.72361 13 3.99976 13Z" fill="black"/>
-<path opacity="0.2" d="M2 12.5C2.27614 12.5 2.5 12.2761 2.5 12C2.5 11.7239 2.27614 11.5 2 11.5C1.72386 11.5 1.5 11.7239 1.5 12C1.5 12.2761 1.72386 12.5 2 12.5Z" fill="black"/>
-<path opacity="0.2" d="M2 4.5C2.27614 4.5 2.5 4.27614 2.5 4C2.5 3.72386 2.27614 3.5 2 3.5C1.72386 3.5 1.5 3.72386 1.5 4C1.5 4.27614 1.72386 4.5 2 4.5Z" fill="black"/>
-<path opacity="0.2" d="M15 12.5C15.2761 12.5 15.5 12.2761 15.5 12C15.5 11.7239 15.2761 11.5 15 11.5C14.7239 11.5 14.5 11.7239 14.5 12C14.5 12.2761 14.7239 12.5 15 12.5Z" fill="black"/>
-<path opacity="0.2" d="M15 4.5C15.2761 4.5 15.5 4.27614 15.5 4C15.5 3.72386 15.2761 3.5 15 3.5C14.7239 3.5 14.5 3.72386 14.5 4C14.5 4.27614 14.7239 4.5 15 4.5Z" fill="black"/>
-<path opacity="0.5" d="M3.99976 15C4.2759 15 4.49976 14.7761 4.49976 14.5C4.49976 14.2239 4.2759 14 3.99976 14C3.72361 14 3.49976 14.2239 3.49976 14.5C3.49976 14.7761 3.72361 15 3.99976 15Z" fill="black"/>
-<path opacity="0.5" d="M4 2C4.27614 2 4.5 1.77614 4.5 1.5C4.5 1.22386 4.27614 1 4 1C3.72386 1 3.5 1.22386 3.5 1.5C3.5 1.77614 3.72386 2 4 2Z" fill="black"/>
-<path opacity="0.5" d="M13 15C13.2761 15 13.5 14.7761 13.5 14.5C13.5 14.2239 13.2761 14 13 14C12.7239 14 12.5 14.2239 12.5 14.5C12.5 14.7761 12.7239 15 13 15Z" fill="black"/>
-<path opacity="0.5" d="M13 2C13.2761 2 13.5 1.77614 13.5 1.5C13.5 1.22386 13.2761 1 13 1C12.7239 1 12.5 1.22386 12.5 1.5C12.5 1.77614 12.7239 2 13 2Z" fill="black"/>
-<path d="M13 4C13.2761 4 13.5 3.77614 13.5 3.5C13.5 3.22386 13.2761 3 13 3C12.7239 3 12.5 3.22386 12.5 3.5C12.5 3.77614 12.7239 4 13 4Z" fill="black"/>
-<path d="M13 13C13.2761 13 13.5 12.7761 13.5 12.5C13.5 12.2239 13.2761 12 13 12C12.7239 12 12.5 12.2239 12.5 12.5C12.5 12.7761 12.7239 13 13 13Z" fill="black"/>
-<path opacity="0.6" d="M11 3C11.2761 3 11.5 2.77614 11.5 2.5C11.5 2.22386 11.2761 2 11 2C10.7239 2 10.5 2.22386 10.5 2.5C10.5 2.77614 10.7239 3 11 3Z" fill="black"/>
-<path d="M8.5 15C8.77614 15 9 14.7761 9 14.5C9 14.2239 8.77614 14 8.5 14C8.22386 14 8 14.2239 8 14.5C8 14.7761 8.22386 15 8.5 15Z" fill="black"/>
-<path opacity="0.6" d="M6 14C6.27614 14 6.5 13.7761 6.5 13.5C6.5 13.2239 6.27614 13 6 13C5.72386 13 5.5 13.2239 5.5 13.5C5.5 13.7761 5.72386 14 6 14Z" fill="black"/>
-<path opacity="0.6" d="M11 14C11.2761 14 11.5 13.7761 11.5 13.5C11.5 13.2239 11.2761 13 11 13C10.7239 13 10.5 13.2239 10.5 13.5C10.5 13.7761 10.7239 14 11 14Z" fill="black"/>
-</svg>
diff --git a/assets/icons/zed_assistant.svg b/assets/icons/zed_assistant.svg
deleted file mode 100644
index 812277a100..0000000000
--- a/assets/icons/zed_assistant.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 2.93652L6.9243 6.20697C6.86924 6.37435 6.77565 6.52646 6.65105 6.65105C6.52646 6.77565 6.37435 6.86924 6.20697 6.9243L2.93652 8L6.20697 9.0757C6.37435 9.13076 6.52646 9.22435 6.65105 9.34895C6.77565 9.47354 6.86924 9.62565 6.9243 9.79306L8 13.0635L9.0757 9.79306C9.13076 9.62565 9.22435 9.47354 9.34895 9.34895C9.47354 9.22435 9.62565 9.13076 9.79306 9.0757L13.0635 8L9.79306 6.9243C9.62565 6.86924 9.47354 6.77565 9.34895 6.65105C9.22435 6.52646 9.13076 6.37435 9.0757 6.20697L8 2.93652Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3.33334 2V4.66666M2 3.33334H4.66666" stroke="black" stroke-opacity="0.75" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.6665 11.3333V14M11.3333 12.6666H13.9999" stroke="black" stroke-opacity="0.75" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/zed_burn_mode.svg b/assets/icons/zed_burn_mode.svg
deleted file mode 100644
index cad6ed666b..0000000000
--- a/assets/icons/zed_burn_mode.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.70519 9.31137C6.13992 9.31137 6.55683 9.13868 6.86423 8.83128C7.17163 8.52389 7.34432 8.10696 7.34432 7.67224C7.34432 6.76744 7.01649 6.36094 6.68868 5.70528C5.98581 4.30022 6.54181 3.04726 7.99998 1.77136C8.32781 3.41049 9.31128 4.98406 10.6226 6.03311C11.9339 7.08215 12.5896 8.3279 12.5896 9.6392C12.5896 10.2419 12.4708 10.8387 12.2402 11.3956C12.0096 11.9524 11.6715 12.4583 11.2453 12.8845C10.8191 13.3107 10.3132 13.6487 9.75633 13.8794C9.1995 14.1101 8.60269 14.2287 7.99998 14.2287C7.39727 14.2287 6.80046 14.1101 6.24362 13.8794C5.68679 13.6487 5.18083 13.3107 4.75465 12.8845C4.32848 12.4583 3.99041 11.9524 3.75976 11.3956C3.52911 10.8387 3.4104 10.2419 3.4104 9.6392C3.4104 8.88324 3.6943 8.13513 4.06606 7.67224C4.06606 8.10696 4.23875 8.52389 4.54615 8.83128C4.85354 9.13868 5.27047 9.31137 5.70519 9.31137Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/assets/icons/zed_burn_mode_on.svg b/assets/icons/zed_burn_mode_on.svg
deleted file mode 100644
index 10e0e42b13..0000000000
--- a/assets/icons/zed_burn_mode_on.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><g fill="#000" clip-path="url(#a)"><path fill-opacity=".5" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M5.705 9.311a1.64 1.64 0 0 0 1.64-1.639c0-.905-.328-1.311-.656-1.967C5.986 4.3 6.542 3.047 8 1.771c.328 1.64 1.312 3.213 2.623 4.262 1.311 1.05 1.967 2.295 1.967 3.606a4.59 4.59 0 1 1-9.18 0c0-.756.285-1.504.656-1.967a1.64 1.64 0 0 0 1.64 1.64Z"/><path d="M2.286 4.571a1.143 1.143 0 1 0 0-2.285 1.143 1.143 0 0 0 0 2.285ZM11.429 2.286a1.143 1.143 0 1 0 0-2.286 1.143 1.143 0 0 0 0 2.286ZM14.857 5.714a1.143 1.143 0 1 0 0-2.286 1.143 1.143 0 0 0 0 2.286Z"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h16v16H0z"/></clipPath></defs></svg>
diff --git a/assets/icons/zed_predict.svg b/assets/icons/zed_predict.svg
deleted file mode 100644
index 605a0584d5..0000000000
--- a/assets/icons/zed_predict.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12 5L14 8L12 11" stroke="black" stroke-width="1.2"/>
-<path d="M10 6.5L11 8L10 9.5" stroke="black" stroke-width="1.2"/>
-<path d="M7.5 8.9V11C5.43097 11 4.56903 11 2.5 11V10.4L7.5 5.6V5H2.5V7.1" stroke="black" stroke-width="1.2"/>
-</svg>
diff --git a/assets/icons/zed_predict_disabled.svg b/assets/icons/zed_predict_disabled.svg
deleted file mode 100644
index d10c4d560a..0000000000
--- a/assets/icons/zed_predict_disabled.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path opacity="0.6" fill-rule="evenodd" clip-rule="evenodd" d="M6.75 9.31247L8.25 10.5576V11.75H1.75V10.0803L4.49751 7.44273L5.65909 8.40693L3.73923 10.25H6.75V9.31247ZM8.25 5.85739V4.25H6.31358L8.25 5.85739ZM1.75 5.16209V7.1H3.25V6.4072L1.75 5.16209Z" fill="black"/>
-<path opacity="0.6" fill-rule="evenodd" clip-rule="evenodd" d="M10.9624 9.40853L11.9014 8L10.6241 6.08397L9.37598 6.91603L10.0986 8L9.80184 8.44518L10.9624 9.40853Z" fill="black"/>
-<path opacity="0.6" fill-rule="evenodd" clip-rule="evenodd" d="M12.8936 11.0116L14.9014 8L12.6241 4.58397L11.376 5.41603L13.0986 8L11.7331 10.0483L12.8936 11.0116Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M14.1225 13.809C14.0341 13.9146 13.877 13.9289 13.7711 13.8409L1.19311 3.40021C1.08659 3.31178 1.07221 3.15362 1.16104 3.04743L1.87752 2.19101C1.96588 2.0854 2.123 2.07112 2.22895 2.15906L14.8069 12.5998C14.9134 12.6882 14.9278 12.8464 14.839 12.9526L14.1225 13.809Z" fill="black"/>
-</svg>
diff --git a/assets/icons/zed_predict_down.svg b/assets/icons/zed_predict_down.svg
deleted file mode 100644
index 79eef9b0b4..0000000000
--- a/assets/icons/zed_predict_down.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M15 9.33333L14.5 9.66667L12.5 11L10.5 9.66667L10 9.33333" stroke="black" stroke-width="1.2"/>
-<path d="M12.5 11V4.5" stroke="black" stroke-width="1.2"/>
-<path d="M7.5 8.9V11C5.43097 11 4.56903 11 2.5 11V10.4L7.5 5.6V5H2.5V7.1" stroke="black" stroke-width="1.2"/>
-</svg>
diff --git a/assets/icons/zed_predict_error.svg b/assets/icons/zed_predict_error.svg
deleted file mode 100644
index 6f75326179..0000000000
--- a/assets/icons/zed_predict_error.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path opacity="0.6" d="M7.5 8.9V11C5.43097 11 4.56903 11 2.5 11V10.4L7.5 5.6V5H2.5V7.1" stroke="black" stroke-width="1.2"/>
-<path d="M14 8L10 12M14 12L10 8" stroke="black" stroke-width="1.2"/>
-</svg>
diff --git a/assets/icons/zed_predict_up.svg b/assets/icons/zed_predict_up.svg
deleted file mode 100644
index f77001e4bd..0000000000
--- a/assets/icons/zed_predict_up.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10 6.66667L10.5 6.33333L12.5 5L14.5 6.33333L15 6.66667" stroke="black" stroke-width="1.2"/>
-<path d="M12.5 11V5" stroke="black" stroke-width="1.2"/>
-<path d="M7.5 8.9V11C5.43097 11 4.56903 11 2.5 11V10.4L7.5 5.6V5H2.5V7.1" stroke="black" stroke-width="1.2"/>
-</svg>
diff --git a/assets/icons/zed_src_custom.svg b/assets/icons/zed_src_custom.svg
deleted file mode 100644
index feff2d7d34..0000000000
--- a/assets/icons/zed_src_custom.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect opacity="0.3" x="2" y="2" width="12" height="12" rx="2" stroke="black" stroke-width="1.2"/>
-<path d="M8.17871 4.15039C9.57718 4.15047 10.7699 4.84416 11.25 6.00879L11.292 6.125C11.3291 6.2423 11.3496 6.36246 11.3496 6.47656C11.3496 6.67403 11.2827 6.86644 11.1357 7.00879C10.99 7.14999 10.797 7.21191 10.6035 7.21191C10.4311 7.21184 10.263 7.16459 10.1172 7.05469C9.97557 6.94786 9.88031 6.80045 9.81543 6.6416V6.64062C9.54483 5.99474 8.92921 5.62898 8.17871 5.62891C7.58712 5.62891 7.11895 5.85535 6.79297 6.24512C6.46181 6.64107 6.25488 7.2348 6.25488 7.99805C6.25495 8.76969 6.4603 9.36343 6.79004 9.75781C7.11426 10.1456 7.5828 10.3711 8.18359 10.3711C9.00554 10.371 9.57612 10.0476 9.83789 9.44922L9.83984 9.44531C9.90093 9.30959 9.98754 9.17654 10.1211 9.08008C10.2598 8.97992 10.4154 8.94341 10.5693 8.94336C10.9809 8.94336 11.3203 9.24379 11.3203 9.67383C11.3203 9.89213 11.2593 10.0749 11.1641 10.2578L11.1631 10.2568C10.6246 11.2962 9.56725 11.8495 8.17871 11.8496C7.12036 11.8496 6.22667 11.4786 5.60059 10.7891C4.97793 10.1031 4.65047 9.13626 4.65039 7.99805C4.65039 6.86743 4.98182 5.90203 5.60547 5.21582C6.23235 4.52617 7.12584 4.15039 8.17871 4.15039ZM7.67773 11.4678C7.68226 11.4684 7.68688 11.4682 7.69141 11.4688C7.68688 11.4682 7.68226 11.4684 7.67773 11.4678ZM7.35059 11.4082C7.37261 11.4133 7.39471 11.4182 7.41699 11.4229C7.39471 11.4182 7.37261 11.4133 7.35059 11.4082ZM7.07617 11.333C7.08849 11.337 7.10087 11.3408 7.11328 11.3447C7.10087 11.3408 7.08849 11.337 7.07617 11.333ZM6.80469 11.2295C6.81416 11.2336 6.82348 11.2381 6.83301 11.2422C6.82347 11.2381 6.81416 11.2336 6.80469 11.2295ZM6.32812 10.9648C6.33354 10.9686 6.33929 10.9719 6.34473 10.9756C6.33928 10.9719 6.33354 10.9686 6.32812 10.9648ZM6.10156 10.7891C6.11103 10.7972 6.12128 10.8045 6.13086 10.8125C6.12128 10.8045 6.11103 10.7972 6.10156 10.7891ZM10.5449 10.5586V10.5596V10.5586ZM5.90234 10.5986C5.909 10.6056 5.91613 10.6122 5.92285 10.6191C5.91612 10.6122 5.909 10.6056 5.90234 10.5986ZM5.71094 10.374C5.71943 10.3851 5.72769 10.3963 5.73633 10.4072C5.72769 10.3963 5.71944 10.3851 5.71094 10.374ZM5.55469 10.1504C5.55922 10.1576 5.56378 10.1647 5.56836 10.1719C5.56377 10.1647 5.55922 10.1576 5.55469 10.1504ZM10.9131 9.95898C10.9213 9.9374 10.9302 9.91676 10.9365 9.89551C10.9301 9.91674 10.9214 9.93742 10.9131 9.95898ZM10.21 9.49219C10.192 9.52099 10.1752 9.55324 10.1592 9.58887L10.1953 9.51758C10.2002 9.50891 10.2049 9.50031 10.21 9.49219ZM10.499 9.29688C10.4547 9.30262 10.4145 9.31428 10.3779 9.33203C10.4145 9.31437 10.4547 9.30259 10.499 9.29688ZM5.18652 9.33203C5.18988 9.34309 5.19284 9.35425 5.19629 9.36523C5.19284 9.35424 5.18988 9.34309 5.18652 9.33203ZM10.5693 9.29297C10.628 9.29297 10.6829 9.3029 10.7314 9.32129C10.6827 9.30276 10.6281 9.29297 10.5693 9.29297ZM5.10352 9.01172C5.1083 9.03397 5.11306 9.05613 5.11816 9.07812C5.11306 9.05612 5.1083 9.03397 5.10352 9.01172ZM5.01465 8.39062C5.02368 8.51203 5.03633 8.63062 5.05371 8.74609C5.03633 8.63061 5.02368 8.51204 5.01465 8.39062ZM5.01465 7.60742V7.6084V7.60742ZM10.6035 6.86133C10.6321 6.86133 10.6594 6.85865 10.6855 6.85449C10.6596 6.85862 10.632 6.86133 10.6035 6.86133ZM10.7002 6.85059C10.7213 6.84652 10.7415 6.84169 10.7607 6.83496C10.7415 6.8417 10.7213 6.84652 10.7002 6.85059ZM10.7773 6.82812C10.7929 6.82186 10.8081 6.81563 10.8223 6.80762C10.8081 6.81566 10.7929 6.82185 10.7773 6.82812ZM10.8516 6.78809C10.8602 6.782 10.868 6.77535 10.876 6.76855C10.8681 6.77537 10.8602 6.78198 10.8516 6.78809ZM10.8994 6.74707C10.9093 6.73683 10.9173 6.72535 10.9258 6.71387C10.9173 6.72537 10.9092 6.73681 10.8994 6.74707ZM10.9912 6.37305C10.9893 6.3598 10.9861 6.34659 10.9834 6.33301C10.9861 6.34658 10.9892 6.35981 10.9912 6.37305ZM10.9102 6.10645C10.8889 6.05715 10.867 6.00836 10.8428 5.96094C10.867 6.00837 10.8889 6.05714 10.9102 6.10645ZM10.7871 5.86328C10.7743 5.84084 10.7625 5.81787 10.749 5.7959C10.7625 5.81788 10.7743 5.84084 10.7871 5.86328ZM10.6973 5.7168C10.6775 5.68719 10.6578 5.65759 10.6367 5.62891C10.6578 5.65759 10.6775 5.68719 10.6973 5.7168ZM10.584 5.56152C10.563 5.53497 10.5425 5.5081 10.5205 5.48242C10.5425 5.50811 10.563 5.53497 10.584 5.56152ZM10.4492 5.4043C10.4285 5.3821 10.4083 5.35937 10.3867 5.33789C10.4083 5.35938 10.4285 5.38209 10.4492 5.4043ZM7.68457 5.32812H7.68555H7.68457ZM10.3096 5.26562C10.2895 5.24727 10.2697 5.2287 10.249 5.21094C10.2697 5.22871 10.2895 5.24726 10.3096 5.26562ZM10.1553 5.13477C10.1356 5.11933 10.1159 5.10379 10.0957 5.08887C10.1159 5.10379 10.1356 5.11933 10.1553 5.13477ZM10.0078 5.02734C9.9783 5.00732 9.94843 4.98772 9.91797 4.96875C9.94843 4.98773 9.9783 5.00731 10.0078 5.02734ZM9.83887 4.9209C9.81069 4.90462 9.78183 4.88942 9.75293 4.87402C9.78184 4.88943 9.81069 4.90461 9.83887 4.9209ZM9.65039 4.82129C9.62853 4.81074 9.60622 4.80108 9.58398 4.79102C9.60622 4.80108 9.62853 4.81073 9.65039 4.82129ZM9.45703 4.73633C9.43574 4.72785 9.41417 4.71996 9.39258 4.71191C9.41418 4.71996 9.43574 4.72784 9.45703 4.73633ZM9.27441 4.66895C9.23013 4.65444 9.18506 4.64161 9.13965 4.62891C9.18506 4.64161 9.23013 4.65444 9.27441 4.66895ZM9.08008 4.6123C9.03442 4.60046 8.98811 4.59009 8.94141 4.58008C8.98812 4.59009 9.03441 4.60046 9.08008 4.6123ZM8.85547 4.5625C8.83187 4.55807 8.80802 4.55474 8.78418 4.55078C8.80802 4.55474 8.83187 4.55807 8.85547 4.5625ZM10.9404 6.69336C10.9509 6.67671 10.96 6.65941 10.9678 6.64062C10.9601 6.65941 10.9509 6.67671 10.9404 6.69336ZM9.82812 5.99707C9.80503 5.96962 9.78129 5.94293 9.75684 5.91699C9.78129 5.94293 9.80502 5.96962 9.82812 5.99707Z" fill="black"/>
-</svg>
diff --git a/assets/icons/zed_src_extension.svg b/assets/icons/zed_src_extension.svg
deleted file mode 100644
index 00117efcf4..0000000000
--- a/assets/icons/zed_src_extension.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect opacity="0.3" x="2" y="2" width="12" height="12" rx="2" stroke="black" stroke-width="1.2"/>
-<path d="M9.62109 4.65039C9.80393 4.65039 9.98678 4.70637 10.1279 4.83203C10.2722 4.96055 10.3496 5.14167 10.3496 5.33691C10.3496 5.53215 10.2723 5.71329 10.1279 5.8418C9.98678 5.96744 9.80392 6.02344 9.62109 6.02344H7.1416V7.24902H9.46289C9.6423 7.24902 9.82303 7.30362 9.96387 7.42773C10.1085 7.55531 10.1875 7.73591 10.1875 7.93164C10.1874 8.12674 10.1072 8.30592 9.96484 8.43262C9.82536 8.55656 9.64499 8.61426 9.46289 8.61426H7.1416V9.97656H9.62109C9.80392 9.97656 9.98678 10.0326 10.1279 10.1582C10.2723 10.2867 10.3496 10.4678 10.3496 10.6631C10.3496 10.8583 10.2722 11.0394 10.1279 11.168C9.98678 11.2936 9.80393 11.3496 9.62109 11.3496H6.39648C6.20308 11.3496 6.00965 11.289 5.86328 11.1465C5.7159 11.0028 5.65039 10.8095 5.65039 10.6133V5.38672C5.65039 5.19054 5.7159 4.99723 5.86328 4.85352C6.00965 4.71101 6.20308 4.65039 6.39648 4.65039H9.62109ZM9.70215 10.9941C9.72618 10.9903 9.74882 10.9838 9.77051 10.9766C9.74884 10.9838 9.72616 10.9903 9.70215 10.9941ZM9.78809 10.9688C9.80381 10.9626 9.81877 10.9561 9.83301 10.9482C9.81877 10.9561 9.80381 10.9626 9.78809 10.9688ZM9.85059 10.9375C9.86364 10.9292 9.87617 10.9209 9.8877 10.9111C9.87616 10.9209 9.86365 10.9293 9.85059 10.9375ZM6.1123 10.8994C6.12346 10.9099 6.1358 10.9188 6.14844 10.9277C6.1358 10.9188 6.12346 10.9099 6.1123 10.8994ZM9.90039 10.8984C9.91122 10.8882 9.92149 10.8778 9.93066 10.8662C9.92147 10.8778 9.91123 10.8882 9.90039 10.8984ZM6.07129 10.8516C6.0792 10.8626 6.08754 10.8729 6.09668 10.8828C6.08754 10.8729 6.0792 10.8626 6.07129 10.8516ZM9.94434 10.8477C9.95104 10.8377 9.95638 10.8272 9.96191 10.8164C9.95637 10.8271 9.95106 10.8377 9.94434 10.8477ZM6.03418 10.7842C6.04066 10.7995 6.04735 10.8143 6.05566 10.8281C6.04735 10.8143 6.04066 10.7995 6.03418 10.7842ZM9.97559 10.7891C9.97984 10.7783 9.98321 10.7673 9.98633 10.7559C9.98321 10.7673 9.97984 10.7783 9.97559 10.7891ZM6.01367 10.7236C6.0173 10.7388 6.02121 10.7535 6.02637 10.7676C6.02121 10.7535 6.0173 10.7388 6.01367 10.7236ZM9.62109 10.3262C9.67716 10.3262 9.72942 10.3346 9.77539 10.3506C9.72927 10.3345 9.67733 10.3262 9.62109 10.3262ZM9.56641 8.25098C9.5802 8.24792 9.59348 8.24449 9.60645 8.24023C9.59348 8.2445 9.58021 8.24792 9.56641 8.25098ZM9.625 8.2334C9.64073 8.22735 9.65566 8.2207 9.66992 8.21289C9.65565 8.22072 9.64074 8.22733 9.625 8.2334ZM9.68848 8.20117C9.69832 8.19495 9.70781 8.18872 9.7168 8.18164C9.70781 8.18874 9.69832 8.19493 9.68848 8.20117ZM9.74121 8.16016C9.7511 8.15059 9.76008 8.14059 9.76855 8.12988C9.76009 8.1406 9.75109 8.15057 9.74121 8.16016ZM9.77734 8.11914C9.78753 8.10499 9.79605 8.09004 9.80371 8.07422C9.79606 8.09005 9.78751 8.10498 9.77734 8.11914ZM9.79883 5.6377C9.80686 5.6343 9.81463 5.63082 9.82227 5.62695C9.81463 5.63084 9.80687 5.63429 9.79883 5.6377ZM9.93457 5.53516C9.91124 5.56582 9.88273 5.59214 9.84863 5.61328C9.88277 5.5922 9.91121 5.56576 9.93457 5.53516ZM9.94434 5.52246C9.95363 5.50886 9.96171 5.4946 9.96875 5.47949C9.96172 5.4946 9.9536 5.50885 9.94434 5.52246ZM6.02637 5.23145C6.02118 5.24552 6.01733 5.26024 6.01367 5.27539C6.01734 5.26023 6.02118 5.24552 6.02637 5.23145ZM6.05566 5.17188C6.04766 5.18525 6.04049 5.19914 6.03418 5.21387C6.04049 5.19914 6.04765 5.18525 6.05566 5.17188ZM6.09961 5.11328C6.08938 5.124 6.08003 5.13538 6.07129 5.14746C6.08003 5.13538 6.08938 5.12399 6.09961 5.11328ZM6.14844 5.07129C6.13601 5.08003 6.12428 5.08938 6.11328 5.09961C6.12428 5.08938 6.13601 5.08003 6.14844 5.07129ZM6.23242 5.02637C6.21195 5.03382 6.19287 5.04334 6.1748 5.05371C6.19287 5.04335 6.21195 5.03382 6.23242 5.02637ZM6.1748 10.9453C6.19195 10.9552 6.21017 10.9635 6.22949 10.9707C6.21017 10.9635 6.19195 10.9552 6.1748 10.9453ZM6.30957 5.00684C6.28239 5.01136 6.25651 5.01759 6.23242 5.02637C6.25651 5.01759 6.28239 5.01136 6.30957 5.00684Z" fill="black"/>
-</svg>
diff --git a/assets/images/acp_grid.svg b/assets/images/acp_grid.svg
deleted file mode 100644
index 8ebff8e1bc..0000000000
--- a/assets/images/acp_grid.svg
+++ /dev/null
@@ -1,1257 +0,0 @@
-<svg width="515" height="126" viewBox="0 0 515 126" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_2906_6463)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 0.390625H0.390625V12.1094H12.1094V0.390625ZM0 0V12.5H12.5V0H0Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 0.390625H12.8906V12.1094H24.6094V0.390625ZM12.5 0V12.5H25V0H12.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 0.390625H25.3906V12.1094H37.1094V0.390625ZM25 0V12.5H37.5V0H25Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 0.390625H37.8906V12.1094H49.6094V0.390625ZM37.5 0V12.5H50V0H37.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 0.390625H50.3906V12.1094H62.1094V0.390625ZM50 0V12.5H62.5V0H50Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 0.390625H62.8906V12.1094H74.6094V0.390625ZM62.5 0V12.5H75V0H62.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 0.390625H75.3906V12.1094H87.1094V0.390625ZM75 0V12.5H87.5V0H75Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 0.390625H87.8906V12.1094H99.6094V0.390625ZM87.5 0V12.5H100V0H87.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 0.390625H100.391V12.1094H112.109V0.390625ZM100 0V12.5H112.5V0H100Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 0.390625H112.891V12.1094H124.609V0.390625ZM112.5 0V12.5H125V0H112.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 0.390625H125.391V12.1094H137.109V0.390625ZM125 0V12.5H137.5V0H125Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 0.390625H137.891V12.1094H149.609V0.390625ZM137.5 0V12.5H150V0H137.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 0.390625H150.391V12.1094H162.109V0.390625ZM150 0V12.5H162.5V0H150Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 0.390625H162.891V12.1094H174.609V0.390625ZM162.5 0V12.5H175V0H162.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 0.390625H175.391V12.1094H187.109V0.390625ZM175 0V12.5H187.5V0H175Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 0.390625H187.891V12.1094H199.609V0.390625ZM187.5 0V12.5H200V0H187.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 0.390625H200.391V12.1094H212.109V0.390625ZM200 0V12.5H212.5V0H200Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 0.390625H212.891V12.1094H224.609V0.390625ZM212.5 0V12.5H225V0H212.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 0.390625H225.391V12.1094H237.109V0.390625ZM225 0V12.5H237.5V0H225Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 0.390625H237.891V12.1094H249.609V0.390625ZM237.5 0V12.5H250V0H237.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 0.390625H250.391V12.1094H262.109V0.390625ZM250 0V12.5H262.5V0H250Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 0.390625H262.891V12.1094H274.609V0.390625ZM262.5 0V12.5H275V0H262.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 0.390625H275.391V12.1094H287.109V0.390625ZM275 0V12.5H287.5V0H275Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 0.390625H287.891V12.1094H299.609V0.390625ZM287.5 0V12.5H300V0H287.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 0.390625H300.391V12.1094H312.109V0.390625ZM300 0V12.5H312.5V0H300Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 0.390625H312.891V12.1094H324.609V0.390625ZM312.5 0V12.5H325V0H312.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 0.390625H325.391V12.1094H337.109V0.390625ZM325 0V12.5H337.5V0H325Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 0.390625H337.891V12.1094H349.609V0.390625ZM337.5 0V12.5H350V0H337.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 0.390625H350.391V12.1094H362.109V0.390625ZM350 0V12.5H362.5V0H350Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 0.390625H362.891V12.1094H374.609V0.390625ZM362.5 0V12.5H375V0H362.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 0.390625H375.391V12.1094H387.109V0.390625ZM375 0V12.5H387.5V0H375Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 0.390625H387.891V12.1094H399.609V0.390625ZM387.5 0V12.5H400V0H387.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 0.390625H400.391V12.1094H412.109V0.390625ZM400 0V12.5H412.5V0H400Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 0.390625H412.891V12.1094H424.609V0.390625ZM412.5 0V12.5H425V0H412.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 0.390625H425.391V12.1094H437.109V0.390625ZM425 0V12.5H437.5V0H425Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 0.390625H437.891V12.1094H449.609V0.390625ZM437.5 0V12.5H450V0H437.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 0.390625H450.391V12.1094H462.109V0.390625ZM450 0V12.5H462.5V0H450Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 0.390625H462.891V12.1094H474.609V0.390625ZM462.5 0V12.5H475V0H462.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 0.390625H475.391V12.1094H487.109V0.390625ZM475 0V12.5H487.5V0H475Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 0.390625H487.891V12.1094H499.609V0.390625ZM487.5 0V12.5H500V0H487.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 0.390625H500.391V12.1094H512.109V0.390625ZM500 0V12.5H512.5V0H500Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 0.390625H512.891V12.1094H524.609V0.390625ZM512.5 0V12.5H525V0H512.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 0.390625H525.391V12.1094H537.109V0.390625ZM525 0V12.5H537.5V0H525Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 0.390625H537.891V12.1094H549.609V0.390625ZM537.5 0V12.5H550V0H537.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 0.390625H550.391V12.1094H562.109V0.390625ZM550 0V12.5H562.5V0H550Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 0.390625H562.891V12.1094H574.609V0.390625ZM562.5 0V12.5H575V0H562.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 0.390625H575.391V12.1094H587.109V0.390625ZM575 0V12.5H587.5V0H575Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 0.390625H587.891V12.1094H599.609V0.390625ZM587.5 0V12.5H600V0H587.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 12.8906H0.390625V24.6094H12.1094V12.8906ZM0 12.5V25H12.5V12.5H0Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 12.8906H12.8906V24.6094H24.6094V12.8906ZM12.5 12.5V25H25V12.5H12.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 12.8906H25.3906V24.6094H37.1094V12.8906ZM25 12.5V25H37.5V12.5H25Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 12.8906H37.8906V24.6094H49.6094V12.8906ZM37.5 12.5V25H50V12.5H37.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 12.8906H50.3906V24.6094H62.1094V12.8906ZM50 12.5V25H62.5V12.5H50Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 12.8906H62.8906V24.6094H74.6094V12.8906ZM62.5 12.5V25H75V12.5H62.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 12.8906H75.3906V24.6094H87.1094V12.8906ZM75 12.5V25H87.5V12.5H75Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 12.8906H87.8906V24.6094H99.6094V12.8906ZM87.5 12.5V25H100V12.5H87.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 12.8906H100.391V24.6094H112.109V12.8906ZM100 12.5V25H112.5V12.5H100Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 12.8906H112.891V24.6094H124.609V12.8906ZM112.5 12.5V25H125V12.5H112.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 12.8906H125.391V24.6094H137.109V12.8906ZM125 12.5V25H137.5V12.5H125Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 12.8906H137.891V24.6094H149.609V12.8906ZM137.5 12.5V25H150V12.5H137.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 12.8906H150.391V24.6094H162.109V12.8906ZM150 12.5V25H162.5V12.5H150Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 12.8906H162.891V24.6094H174.609V12.8906ZM162.5 12.5V25H175V12.5H162.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 12.8906H175.391V24.6094H187.109V12.8906ZM175 12.5V25H187.5V12.5H175Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 12.8906H187.891V24.6094H199.609V12.8906ZM187.5 12.5V25H200V12.5H187.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 12.8906H200.391V24.6094H212.109V12.8906ZM200 12.5V25H212.5V12.5H200Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 12.8906H212.891V24.6094H224.609V12.8906ZM212.5 12.5V25H225V12.5H212.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 12.8906H225.391V24.6094H237.109V12.8906ZM225 12.5V25H237.5V12.5H225Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 12.8906H237.891V24.6094H249.609V12.8906ZM237.5 12.5V25H250V12.5H237.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 12.8906H250.391V24.6094H262.109V12.8906ZM250 12.5V25H262.5V12.5H250Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 12.8906H262.891V24.6094H274.609V12.8906ZM262.5 12.5V25H275V12.5H262.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 12.8906H275.391V24.6094H287.109V12.8906ZM275 12.5V25H287.5V12.5H275Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 12.8906H287.891V24.6094H299.609V12.8906ZM287.5 12.5V25H300V12.5H287.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 12.8906H300.391V24.6094H312.109V12.8906ZM300 12.5V25H312.5V12.5H300Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 12.8906H312.891V24.6094H324.609V12.8906ZM312.5 12.5V25H325V12.5H312.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 12.8906H325.391V24.6094H337.109V12.8906ZM325 12.5V25H337.5V12.5H325Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 12.8906H337.891V24.6094H349.609V12.8906ZM337.5 12.5V25H350V12.5H337.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 12.8906H350.391V24.6094H362.109V12.8906ZM350 12.5V25H362.5V12.5H350Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 12.8906H362.891V24.6094H374.609V12.8906ZM362.5 12.5V25H375V12.5H362.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 12.8906H375.391V24.6094H387.109V12.8906ZM375 12.5V25H387.5V12.5H375Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 12.8906H387.891V24.6094H399.609V12.8906ZM387.5 12.5V25H400V12.5H387.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 12.8906H400.391V24.6094H412.109V12.8906ZM400 12.5V25H412.5V12.5H400Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 12.8906H412.891V24.6094H424.609V12.8906ZM412.5 12.5V25H425V12.5H412.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 12.8906H425.391V24.6094H437.109V12.8906ZM425 12.5V25H437.5V12.5H425Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 12.8906H437.891V24.6094H449.609V12.8906ZM437.5 12.5V25H450V12.5H437.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 12.8906H450.391V24.6094H462.109V12.8906ZM450 12.5V25H462.5V12.5H450Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 12.8906H462.891V24.6094H474.609V12.8906ZM462.5 12.5V25H475V12.5H462.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 12.8906H475.391V24.6094H487.109V12.8906ZM475 12.5V25H487.5V12.5H475Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 12.8906H487.891V24.6094H499.609V12.8906ZM487.5 12.5V25H500V12.5H487.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 12.8906H500.391V24.6094H512.109V12.8906ZM500 12.5V25H512.5V12.5H500Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 12.8906H512.891V24.6094H524.609V12.8906ZM512.5 12.5V25H525V12.5H512.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 12.8906H525.391V24.6094H537.109V12.8906ZM525 12.5V25H537.5V12.5H525Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 12.8906H537.891V24.6094H549.609V12.8906ZM537.5 12.5V25H550V12.5H537.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 12.8906H550.391V24.6094H562.109V12.8906ZM550 12.5V25H562.5V12.5H550Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 12.8906H562.891V24.6094H574.609V12.8906ZM562.5 12.5V25H575V12.5H562.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 12.8906H575.391V24.6094H587.109V12.8906ZM575 12.5V25H587.5V12.5H575Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 12.8906H587.891V24.6094H599.609V12.8906ZM587.5 12.5V25H600V12.5H587.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 25.3906H0.390625V37.1094H12.1094V25.3906ZM0 25V37.5H12.5V25H0Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 25.3906H12.8906V37.1094H24.6094V25.3906ZM12.5 25V37.5H25V25H12.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 25.3906H25.3906V37.1094H37.1094V25.3906ZM25 25V37.5H37.5V25H25Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 25.3906H37.8906V37.1094H49.6094V25.3906ZM37.5 25V37.5H50V25H37.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 25.3906H50.3906V37.1094H62.1094V25.3906ZM50 25V37.5H62.5V25H50Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 25.3906H62.8906V37.1094H74.6094V25.3906ZM62.5 25V37.5H75V25H62.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 25.3906H75.3906V37.1094H87.1094V25.3906ZM75 25V37.5H87.5V25H75Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 25.3906H87.8906V37.1094H99.6094V25.3906ZM87.5 25V37.5H100V25H87.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 25.3906H100.391V37.1094H112.109V25.3906ZM100 25V37.5H112.5V25H100Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 25.3906H112.891V37.1094H124.609V25.3906ZM112.5 25V37.5H125V25H112.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 25.3906H125.391V37.1094H137.109V25.3906ZM125 25V37.5H137.5V25H125Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 25.3906H137.891V37.1094H149.609V25.3906ZM137.5 25V37.5H150V25H137.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 25.3906H150.391V37.1094H162.109V25.3906ZM150 25V37.5H162.5V25H150Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 25.3906H162.891V37.1094H174.609V25.3906ZM162.5 25V37.5H175V25H162.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 25.3906H175.391V37.1094H187.109V25.3906ZM175 25V37.5H187.5V25H175Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 25.3906H187.891V37.1094H199.609V25.3906ZM187.5 25V37.5H200V25H187.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 25.3906H200.391V37.1094H212.109V25.3906ZM200 25V37.5H212.5V25H200Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 25.3906H212.891V37.1094H224.609V25.3906ZM212.5 25V37.5H225V25H212.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 25.3906H225.391V37.1094H237.109V25.3906ZM225 25V37.5H237.5V25H225Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 25.3906H237.891V37.1094H249.609V25.3906ZM237.5 25V37.5H250V25H237.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 25.3906H250.391V37.1094H262.109V25.3906ZM250 25V37.5H262.5V25H250Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 25.3906H262.891V37.1094H274.609V25.3906ZM262.5 25V37.5H275V25H262.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 25.3906H275.391V37.1094H287.109V25.3906ZM275 25V37.5H287.5V25H275Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 25.3906H287.891V37.1094H299.609V25.3906ZM287.5 25V37.5H300V25H287.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 25.3906H300.391V37.1094H312.109V25.3906ZM300 25V37.5H312.5V25H300Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 25.3906H312.891V37.1094H324.609V25.3906ZM312.5 25V37.5H325V25H312.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 25.3906H325.391V37.1094H337.109V25.3906ZM325 25V37.5H337.5V25H325Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 25.3906H337.891V37.1094H349.609V25.3906ZM337.5 25V37.5H350V25H337.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 25.3906H350.391V37.1094H362.109V25.3906ZM350 25V37.5H362.5V25H350Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 25.3906H362.891V37.1094H374.609V25.3906ZM362.5 25V37.5H375V25H362.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 25.3906H375.391V37.1094H387.109V25.3906ZM375 25V37.5H387.5V25H375Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 25.3906H387.891V37.1094H399.609V25.3906ZM387.5 25V37.5H400V25H387.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 25.3906H400.391V37.1094H412.109V25.3906ZM400 25V37.5H412.5V25H400Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 25.3906H412.891V37.1094H424.609V25.3906ZM412.5 25V37.5H425V25H412.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 25.3906H425.391V37.1094H437.109V25.3906ZM425 25V37.5H437.5V25H425Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 25.3906H437.891V37.1094H449.609V25.3906ZM437.5 25V37.5H450V25H437.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 25.3906H450.391V37.1094H462.109V25.3906ZM450 25V37.5H462.5V25H450Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 25.3906H462.891V37.1094H474.609V25.3906ZM462.5 25V37.5H475V25H462.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 25.3906H475.391V37.1094H487.109V25.3906ZM475 25V37.5H487.5V25H475Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 25.3906H487.891V37.1094H499.609V25.3906ZM487.5 25V37.5H500V25H487.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 25.3906H500.391V37.1094H512.109V25.3906ZM500 25V37.5H512.5V25H500Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 25.3906H512.891V37.1094H524.609V25.3906ZM512.5 25V37.5H525V25H512.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 25.3906H525.391V37.1094H537.109V25.3906ZM525 25V37.5H537.5V25H525Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 25.3906H537.891V37.1094H549.609V25.3906ZM537.5 25V37.5H550V25H537.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 25.3906H550.391V37.1094H562.109V25.3906ZM550 25V37.5H562.5V25H550Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 25.3906H562.891V37.1094H574.609V25.3906ZM562.5 25V37.5H575V25H562.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 25.3906H575.391V37.1094H587.109V25.3906ZM575 25V37.5H587.5V25H575Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 25.3906H587.891V37.1094H599.609V25.3906ZM587.5 25V37.5H600V25H587.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 37.8906H0.390625V49.6094H12.1094V37.8906ZM0 37.5V50H12.5V37.5H0Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 37.8906H12.8906V49.6094H24.6094V37.8906ZM12.5 37.5V50H25V37.5H12.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 37.8906H25.3906V49.6094H37.1094V37.8906ZM25 37.5V50H37.5V37.5H25Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 37.8906H37.8906V49.6094H49.6094V37.8906ZM37.5 37.5V50H50V37.5H37.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 37.8906H50.3906V49.6094H62.1094V37.8906ZM50 37.5V50H62.5V37.5H50Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 37.8906H62.8906V49.6094H74.6094V37.8906ZM62.5 37.5V50H75V37.5H62.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 37.8906H75.3906V49.6094H87.1094V37.8906ZM75 37.5V50H87.5V37.5H75Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 37.8906H87.8906V49.6094H99.6094V37.8906ZM87.5 37.5V50H100V37.5H87.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 37.8906H100.391V49.6094H112.109V37.8906ZM100 37.5V50H112.5V37.5H100Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 37.8906H112.891V49.6094H124.609V37.8906ZM112.5 37.5V50H125V37.5H112.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 37.8906H125.391V49.6094H137.109V37.8906ZM125 37.5V50H137.5V37.5H125Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 37.8906H137.891V49.6094H149.609V37.8906ZM137.5 37.5V50H150V37.5H137.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 37.8906H150.391V49.6094H162.109V37.8906ZM150 37.5V50H162.5V37.5H150Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 37.8906H162.891V49.6094H174.609V37.8906ZM162.5 37.5V50H175V37.5H162.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 37.8906H175.391V49.6094H187.109V37.8906ZM175 37.5V50H187.5V37.5H175Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 37.8906H187.891V49.6094H199.609V37.8906ZM187.5 37.5V50H200V37.5H187.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 37.8906H200.391V49.6094H212.109V37.8906ZM200 37.5V50H212.5V37.5H200Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 37.8906H212.891V49.6094H224.609V37.8906ZM212.5 37.5V50H225V37.5H212.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 37.8906H225.391V49.6094H237.109V37.8906ZM225 37.5V50H237.5V37.5H225Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 37.8906H237.891V49.6094H249.609V37.8906ZM237.5 37.5V50H250V37.5H237.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 37.8906H250.391V49.6094H262.109V37.8906ZM250 37.5V50H262.5V37.5H250Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 37.8906H262.891V49.6094H274.609V37.8906ZM262.5 37.5V50H275V37.5H262.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 37.8906H275.391V49.6094H287.109V37.8906ZM275 37.5V50H287.5V37.5H275Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 37.8906H287.891V49.6094H299.609V37.8906ZM287.5 37.5V50H300V37.5H287.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 37.8906H300.391V49.6094H312.109V37.8906ZM300 37.5V50H312.5V37.5H300Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 37.8906H312.891V49.6094H324.609V37.8906ZM312.5 37.5V50H325V37.5H312.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 37.8906H325.391V49.6094H337.109V37.8906ZM325 37.5V50H337.5V37.5H325Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 37.8906H337.891V49.6094H349.609V37.8906ZM337.5 37.5V50H350V37.5H337.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 37.8906H350.391V49.6094H362.109V37.8906ZM350 37.5V50H362.5V37.5H350Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 37.8906H362.891V49.6094H374.609V37.8906ZM362.5 37.5V50H375V37.5H362.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 37.8906H375.391V49.6094H387.109V37.8906ZM375 37.5V50H387.5V37.5H375Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 37.8906H387.891V49.6094H399.609V37.8906ZM387.5 37.5V50H400V37.5H387.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 37.8906H400.391V49.6094H412.109V37.8906ZM400 37.5V50H412.5V37.5H400Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 37.8906H412.891V49.6094H424.609V37.8906ZM412.5 37.5V50H425V37.5H412.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 37.8906H425.391V49.6094H437.109V37.8906ZM425 37.5V50H437.5V37.5H425Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 37.8906H437.891V49.6094H449.609V37.8906ZM437.5 37.5V50H450V37.5H437.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 37.8906H450.391V49.6094H462.109V37.8906ZM450 37.5V50H462.5V37.5H450Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 37.8906H462.891V49.6094H474.609V37.8906ZM462.5 37.5V50H475V37.5H462.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 37.8906H475.391V49.6094H487.109V37.8906ZM475 37.5V50H487.5V37.5H475Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 37.8906H487.891V49.6094H499.609V37.8906ZM487.5 37.5V50H500V37.5H487.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 37.8906H500.391V49.6094H512.109V37.8906ZM500 37.5V50H512.5V37.5H500Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 37.8906H512.891V49.6094H524.609V37.8906ZM512.5 37.5V50H525V37.5H512.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 37.8906H525.391V49.6094H537.109V37.8906ZM525 37.5V50H537.5V37.5H525Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 37.8906H537.891V49.6094H549.609V37.8906ZM537.5 37.5V50H550V37.5H537.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 37.8906H550.391V49.6094H562.109V37.8906ZM550 37.5V50H562.5V37.5H550Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 37.8906H562.891V49.6094H574.609V37.8906ZM562.5 37.5V50H575V37.5H562.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 37.8906H575.391V49.6094H587.109V37.8906ZM575 37.5V50H587.5V37.5H575Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 37.8906H587.891V49.6094H599.609V37.8906ZM587.5 37.5V50H600V37.5H587.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 50.3906H0.390625V62.1094H12.1094V50.3906ZM0 50V62.5H12.5V50H0Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 50.3906H12.8906V62.1094H24.6094V50.3906ZM12.5 50V62.5H25V50H12.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 50.3906H25.3906V62.1094H37.1094V50.3906ZM25 50V62.5H37.5V50H25Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 50.3906H37.8906V62.1094H49.6094V50.3906ZM37.5 50V62.5H50V50H37.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 50.3906H50.3906V62.1094H62.1094V50.3906ZM50 50V62.5H62.5V50H50Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 50.3906H62.8906V62.1094H74.6094V50.3906ZM62.5 50V62.5H75V50H62.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 50.3906H75.3906V62.1094H87.1094V50.3906ZM75 50V62.5H87.5V50H75Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 50.3906H87.8906V62.1094H99.6094V50.3906ZM87.5 50V62.5H100V50H87.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 50.3906H100.391V62.1094H112.109V50.3906ZM100 50V62.5H112.5V50H100Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 50.3906H112.891V62.1094H124.609V50.3906ZM112.5 50V62.5H125V50H112.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 50.3906H125.391V62.1094H137.109V50.3906ZM125 50V62.5H137.5V50H125Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 50.3906H137.891V62.1094H149.609V50.3906ZM137.5 50V62.5H150V50H137.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 50.3906H150.391V62.1094H162.109V50.3906ZM150 50V62.5H162.5V50H150Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 50.3906H162.891V62.1094H174.609V50.3906ZM162.5 50V62.5H175V50H162.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 50.3906H175.391V62.1094H187.109V50.3906ZM175 50V62.5H187.5V50H175Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 50.3906H187.891V62.1094H199.609V50.3906ZM187.5 50V62.5H200V50H187.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 50.3906H200.391V62.1094H212.109V50.3906ZM200 50V62.5H212.5V50H200Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 50.3906H212.891V62.1094H224.609V50.3906ZM212.5 50V62.5H225V50H212.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 50.3906H225.391V62.1094H237.109V50.3906ZM225 50V62.5H237.5V50H225Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 50.3906H237.891V62.1094H249.609V50.3906ZM237.5 50V62.5H250V50H237.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 50.3906H250.391V62.1094H262.109V50.3906ZM250 50V62.5H262.5V50H250Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 50.3906H262.891V62.1094H274.609V50.3906ZM262.5 50V62.5H275V50H262.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 50.3906H275.391V62.1094H287.109V50.3906ZM275 50V62.5H287.5V50H275Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 50.3906H287.891V62.1094H299.609V50.3906ZM287.5 50V62.5H300V50H287.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 50.3906H300.391V62.1094H312.109V50.3906ZM300 50V62.5H312.5V50H300Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 50.3906H312.891V62.1094H324.609V50.3906ZM312.5 50V62.5H325V50H312.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 50.3906H325.391V62.1094H337.109V50.3906ZM325 50V62.5H337.5V50H325Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 50.3906H337.891V62.1094H349.609V50.3906ZM337.5 50V62.5H350V50H337.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 50.3906H350.391V62.1094H362.109V50.3906ZM350 50V62.5H362.5V50H350Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 50.3906H362.891V62.1094H374.609V50.3906ZM362.5 50V62.5H375V50H362.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 50.3906H375.391V62.1094H387.109V50.3906ZM375 50V62.5H387.5V50H375Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 50.3906H387.891V62.1094H399.609V50.3906ZM387.5 50V62.5H400V50H387.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 50.3906H400.391V62.1094H412.109V50.3906ZM400 50V62.5H412.5V50H400Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 50.3906H412.891V62.1094H424.609V50.3906ZM412.5 50V62.5H425V50H412.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 50.3906H425.391V62.1094H437.109V50.3906ZM425 50V62.5H437.5V50H425Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 50.3906H437.891V62.1094H449.609V50.3906ZM437.5 50V62.5H450V50H437.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 50.3906H450.391V62.1094H462.109V50.3906ZM450 50V62.5H462.5V50H450Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 50.3906H462.891V62.1094H474.609V50.3906ZM462.5 50V62.5H475V50H462.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 50.3906H475.391V62.1094H487.109V50.3906ZM475 50V62.5H487.5V50H475Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 50.3906H487.891V62.1094H499.609V50.3906ZM487.5 50V62.5H500V50H487.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 50.3906H500.391V62.1094H512.109V50.3906ZM500 50V62.5H512.5V50H500Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 50.3906H512.891V62.1094H524.609V50.3906ZM512.5 50V62.5H525V50H512.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 50.3906H525.391V62.1094H537.109V50.3906ZM525 50V62.5H537.5V50H525Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 50.3906H537.891V62.1094H549.609V50.3906ZM537.5 50V62.5H550V50H537.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 50.3906H550.391V62.1094H562.109V50.3906ZM550 50V62.5H562.5V50H550Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 50.3906H562.891V62.1094H574.609V50.3906ZM562.5 50V62.5H575V50H562.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 50.3906H575.391V62.1094H587.109V50.3906ZM575 50V62.5H587.5V50H575Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 50.3906H587.891V62.1094H599.609V50.3906ZM587.5 50V62.5H600V50H587.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 62.8906H0.390625V74.6094H12.1094V62.8906ZM0 62.5V75H12.5V62.5H0Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 62.8906H12.8906V74.6094H24.6094V62.8906ZM12.5 62.5V75H25V62.5H12.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 62.8906H25.3906V74.6094H37.1094V62.8906ZM25 62.5V75H37.5V62.5H25Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 62.8906H37.8906V74.6094H49.6094V62.8906ZM37.5 62.5V75H50V62.5H37.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 62.8906H50.3906V74.6094H62.1094V62.8906ZM50 62.5V75H62.5V62.5H50Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 62.8906H62.8906V74.6094H74.6094V62.8906ZM62.5 62.5V75H75V62.5H62.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 62.8906H75.3906V74.6094H87.1094V62.8906ZM75 62.5V75H87.5V62.5H75Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 62.8906H87.8906V74.6094H99.6094V62.8906ZM87.5 62.5V75H100V62.5H87.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 62.8906H100.391V74.6094H112.109V62.8906ZM100 62.5V75H112.5V62.5H100Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 62.8906H112.891V74.6094H124.609V62.8906ZM112.5 62.5V75H125V62.5H112.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 62.8906H125.391V74.6094H137.109V62.8906ZM125 62.5V75H137.5V62.5H125Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 62.8906H137.891V74.6094H149.609V62.8906ZM137.5 62.5V75H150V62.5H137.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 62.8906H150.391V74.6094H162.109V62.8906ZM150 62.5V75H162.5V62.5H150Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 62.8906H162.891V74.6094H174.609V62.8906ZM162.5 62.5V75H175V62.5H162.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 62.8906H175.391V74.6094H187.109V62.8906ZM175 62.5V75H187.5V62.5H175Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 62.8906H187.891V74.6094H199.609V62.8906ZM187.5 62.5V75H200V62.5H187.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 62.8906H200.391V74.6094H212.109V62.8906ZM200 62.5V75H212.5V62.5H200Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 62.8906H212.891V74.6094H224.609V62.8906ZM212.5 62.5V75H225V62.5H212.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 62.8906H225.391V74.6094H237.109V62.8906ZM225 62.5V75H237.5V62.5H225Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 62.8906H237.891V74.6094H249.609V62.8906ZM237.5 62.5V75H250V62.5H237.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 62.8906H250.391V74.6094H262.109V62.8906ZM250 62.5V75H262.5V62.5H250Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 62.8906H262.891V74.6094H274.609V62.8906ZM262.5 62.5V75H275V62.5H262.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 62.8906H275.391V74.6094H287.109V62.8906ZM275 62.5V75H287.5V62.5H275Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 62.8906H287.891V74.6094H299.609V62.8906ZM287.5 62.5V75H300V62.5H287.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 62.8906H300.391V74.6094H312.109V62.8906ZM300 62.5V75H312.5V62.5H300Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 62.8906H312.891V74.6094H324.609V62.8906ZM312.5 62.5V75H325V62.5H312.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 62.8906H325.391V74.6094H337.109V62.8906ZM325 62.5V75H337.5V62.5H325Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 62.8906H337.891V74.6094H349.609V62.8906ZM337.5 62.5V75H350V62.5H337.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 62.8906H350.391V74.6094H362.109V62.8906ZM350 62.5V75H362.5V62.5H350Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 62.8906H362.891V74.6094H374.609V62.8906ZM362.5 62.5V75H375V62.5H362.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 62.8906H375.391V74.6094H387.109V62.8906ZM375 62.5V75H387.5V62.5H375Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 62.8906H387.891V74.6094H399.609V62.8906ZM387.5 62.5V75H400V62.5H387.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 62.8906H400.391V74.6094H412.109V62.8906ZM400 62.5V75H412.5V62.5H400Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 62.8906H412.891V74.6094H424.609V62.8906ZM412.5 62.5V75H425V62.5H412.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 62.8906H425.391V74.6094H437.109V62.8906ZM425 62.5V75H437.5V62.5H425Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 62.8906H437.891V74.6094H449.609V62.8906ZM437.5 62.5V75H450V62.5H437.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 62.8906H450.391V74.6094H462.109V62.8906ZM450 62.5V75H462.5V62.5H450Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 62.8906H462.891V74.6094H474.609V62.8906ZM462.5 62.5V75H475V62.5H462.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 62.8906H475.391V74.6094H487.109V62.8906ZM475 62.5V75H487.5V62.5H475Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 62.8906H487.891V74.6094H499.609V62.8906ZM487.5 62.5V75H500V62.5H487.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 62.8906H500.391V74.6094H512.109V62.8906ZM500 62.5V75H512.5V62.5H500Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 62.8906H512.891V74.6094H524.609V62.8906ZM512.5 62.5V75H525V62.5H512.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 62.8906H525.391V74.6094H537.109V62.8906ZM525 62.5V75H537.5V62.5H525Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 62.8906H537.891V74.6094H549.609V62.8906ZM537.5 62.5V75H550V62.5H537.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 62.8906H550.391V74.6094H562.109V62.8906ZM550 62.5V75H562.5V62.5H550Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 62.8906H562.891V74.6094H574.609V62.8906ZM562.5 62.5V75H575V62.5H562.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 62.8906H575.391V74.6094H587.109V62.8906ZM575 62.5V75H587.5V62.5H575Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 62.8906H587.891V74.6094H599.609V62.8906ZM587.5 62.5V75H600V62.5H587.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 75.3906H0.390625V87.1094H12.1094V75.3906ZM0 75V87.5H12.5V75H0Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 75.3906H12.8906V87.1094H24.6094V75.3906ZM12.5 75V87.5H25V75H12.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 75.3906H25.3906V87.1094H37.1094V75.3906ZM25 75V87.5H37.5V75H25Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 75.3906H37.8906V87.1094H49.6094V75.3906ZM37.5 75V87.5H50V75H37.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 75.3906H50.3906V87.1094H62.1094V75.3906ZM50 75V87.5H62.5V75H50Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 75.3906H62.8906V87.1094H74.6094V75.3906ZM62.5 75V87.5H75V75H62.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 75.3906H75.3906V87.1094H87.1094V75.3906ZM75 75V87.5H87.5V75H75Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 75.3906H87.8906V87.1094H99.6094V75.3906ZM87.5 75V87.5H100V75H87.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 75.3906H100.391V87.1094H112.109V75.3906ZM100 75V87.5H112.5V75H100Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 75.3906H112.891V87.1094H124.609V75.3906ZM112.5 75V87.5H125V75H112.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 75.3906H125.391V87.1094H137.109V75.3906ZM125 75V87.5H137.5V75H125Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 75.3906H137.891V87.1094H149.609V75.3906ZM137.5 75V87.5H150V75H137.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 75.3906H150.391V87.1094H162.109V75.3906ZM150 75V87.5H162.5V75H150Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 75.3906H162.891V87.1094H174.609V75.3906ZM162.5 75V87.5H175V75H162.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 75.3906H175.391V87.1094H187.109V75.3906ZM175 75V87.5H187.5V75H175Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 75.3906H187.891V87.1094H199.609V75.3906ZM187.5 75V87.5H200V75H187.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 75.3906H200.391V87.1094H212.109V75.3906ZM200 75V87.5H212.5V75H200Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 75.3906H212.891V87.1094H224.609V75.3906ZM212.5 75V87.5H225V75H212.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 75.3906H225.391V87.1094H237.109V75.3906ZM225 75V87.5H237.5V75H225Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 75.3906H237.891V87.1094H249.609V75.3906ZM237.5 75V87.5H250V75H237.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 75.3906H250.391V87.1094H262.109V75.3906ZM250 75V87.5H262.5V75H250Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 75.3906H262.891V87.1094H274.609V75.3906ZM262.5 75V87.5H275V75H262.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 75.3906H275.391V87.1094H287.109V75.3906ZM275 75V87.5H287.5V75H275Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 75.3906H287.891V87.1094H299.609V75.3906ZM287.5 75V87.5H300V75H287.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 75.3906H300.391V87.1094H312.109V75.3906ZM300 75V87.5H312.5V75H300Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 75.3906H312.891V87.1094H324.609V75.3906ZM312.5 75V87.5H325V75H312.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 75.3906H325.391V87.1094H337.109V75.3906ZM325 75V87.5H337.5V75H325Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 75.3906H337.891V87.1094H349.609V75.3906ZM337.5 75V87.5H350V75H337.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 75.3906H350.391V87.1094H362.109V75.3906ZM350 75V87.5H362.5V75H350Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 75.3906H362.891V87.1094H374.609V75.3906ZM362.5 75V87.5H375V75H362.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 75.3906H375.391V87.1094H387.109V75.3906ZM375 75V87.5H387.5V75H375Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 75.3906H387.891V87.1094H399.609V75.3906ZM387.5 75V87.5H400V75H387.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 75.3906H400.391V87.1094H412.109V75.3906ZM400 75V87.5H412.5V75H400Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 75.3906H412.891V87.1094H424.609V75.3906ZM412.5 75V87.5H425V75H412.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 75.3906H425.391V87.1094H437.109V75.3906ZM425 75V87.5H437.5V75H425Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 75.3906H437.891V87.1094H449.609V75.3906ZM437.5 75V87.5H450V75H437.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 75.3906H450.391V87.1094H462.109V75.3906ZM450 75V87.5H462.5V75H450Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 75.3906H462.891V87.1094H474.609V75.3906ZM462.5 75V87.5H475V75H462.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 75.3906H475.391V87.1094H487.109V75.3906ZM475 75V87.5H487.5V75H475Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 75.3906H487.891V87.1094H499.609V75.3906ZM487.5 75V87.5H500V75H487.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 75.3906H500.391V87.1094H512.109V75.3906ZM500 75V87.5H512.5V75H500Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 75.3906H512.891V87.1094H524.609V75.3906ZM512.5 75V87.5H525V75H512.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 75.3906H525.391V87.1094H537.109V75.3906ZM525 75V87.5H537.5V75H525Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 75.3906H537.891V87.1094H549.609V75.3906ZM537.5 75V87.5H550V75H537.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 75.3906H550.391V87.1094H562.109V75.3906ZM550 75V87.5H562.5V75H550Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 75.3906H562.891V87.1094H574.609V75.3906ZM562.5 75V87.5H575V75H562.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 75.3906H575.391V87.1094H587.109V75.3906ZM575 75V87.5H587.5V75H575Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 75.3906H587.891V87.1094H599.609V75.3906ZM587.5 75V87.5H600V75H587.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 87.8906H0.390625V99.6094H12.1094V87.8906ZM0 87.5V100H12.5V87.5H0Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 87.8906H12.8906V99.6094H24.6094V87.8906ZM12.5 87.5V100H25V87.5H12.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 87.8906H25.3906V99.6094H37.1094V87.8906ZM25 87.5V100H37.5V87.5H25Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 87.8906H37.8906V99.6094H49.6094V87.8906ZM37.5 87.5V100H50V87.5H37.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 87.8906H50.3906V99.6094H62.1094V87.8906ZM50 87.5V100H62.5V87.5H50Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 87.8906H62.8906V99.6094H74.6094V87.8906ZM62.5 87.5V100H75V87.5H62.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 87.8906H75.3906V99.6094H87.1094V87.8906ZM75 87.5V100H87.5V87.5H75Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 87.8906H87.8906V99.6094H99.6094V87.8906ZM87.5 87.5V100H100V87.5H87.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 87.8906H100.391V99.6094H112.109V87.8906ZM100 87.5V100H112.5V87.5H100Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 87.8906H112.891V99.6094H124.609V87.8906ZM112.5 87.5V100H125V87.5H112.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 87.8906H125.391V99.6094H137.109V87.8906ZM125 87.5V100H137.5V87.5H125Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 87.8906H137.891V99.6094H149.609V87.8906ZM137.5 87.5V100H150V87.5H137.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 87.8906H150.391V99.6094H162.109V87.8906ZM150 87.5V100H162.5V87.5H150Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 87.8906H162.891V99.6094H174.609V87.8906ZM162.5 87.5V100H175V87.5H162.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 87.8906H175.391V99.6094H187.109V87.8906ZM175 87.5V100H187.5V87.5H175Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 87.8906H187.891V99.6094H199.609V87.8906ZM187.5 87.5V100H200V87.5H187.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 87.8906H200.391V99.6094H212.109V87.8906ZM200 87.5V100H212.5V87.5H200Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 87.8906H212.891V99.6094H224.609V87.8906ZM212.5 87.5V100H225V87.5H212.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 87.8906H225.391V99.6094H237.109V87.8906ZM225 87.5V100H237.5V87.5H225Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 87.8906H237.891V99.6094H249.609V87.8906ZM237.5 87.5V100H250V87.5H237.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 87.8906H250.391V99.6094H262.109V87.8906ZM250 87.5V100H262.5V87.5H250Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 87.8906H262.891V99.6094H274.609V87.8906ZM262.5 87.5V100H275V87.5H262.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 87.8906H275.391V99.6094H287.109V87.8906ZM275 87.5V100H287.5V87.5H275Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 87.8906H287.891V99.6094H299.609V87.8906ZM287.5 87.5V100H300V87.5H287.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 87.8906H300.391V99.6094H312.109V87.8906ZM300 87.5V100H312.5V87.5H300Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 87.8906H312.891V99.6094H324.609V87.8906ZM312.5 87.5V100H325V87.5H312.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 87.8906H325.391V99.6094H337.109V87.8906ZM325 87.5V100H337.5V87.5H325Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 87.8906H337.891V99.6094H349.609V87.8906ZM337.5 87.5V100H350V87.5H337.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 87.8906H350.391V99.6094H362.109V87.8906ZM350 87.5V100H362.5V87.5H350Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 87.8906H362.891V99.6094H374.609V87.8906ZM362.5 87.5V100H375V87.5H362.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 87.8906H375.391V99.6094H387.109V87.8906ZM375 87.5V100H387.5V87.5H375Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 87.8906H387.891V99.6094H399.609V87.8906ZM387.5 87.5V100H400V87.5H387.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 87.8906H400.391V99.6094H412.109V87.8906ZM400 87.5V100H412.5V87.5H400Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 87.8906H412.891V99.6094H424.609V87.8906ZM412.5 87.5V100H425V87.5H412.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 87.8906H425.391V99.6094H437.109V87.8906ZM425 87.5V100H437.5V87.5H425Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 87.8906H437.891V99.6094H449.609V87.8906ZM437.5 87.5V100H450V87.5H437.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 87.8906H450.391V99.6094H462.109V87.8906ZM450 87.5V100H462.5V87.5H450Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 87.8906H462.891V99.6094H474.609V87.8906ZM462.5 87.5V100H475V87.5H462.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 87.8906H475.391V99.6094H487.109V87.8906ZM475 87.5V100H487.5V87.5H475Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 87.8906H487.891V99.6094H499.609V87.8906ZM487.5 87.5V100H500V87.5H487.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 87.8906H500.391V99.6094H512.109V87.8906ZM500 87.5V100H512.5V87.5H500Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 87.8906H512.891V99.6094H524.609V87.8906ZM512.5 87.5V100H525V87.5H512.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 87.8906H525.391V99.6094H537.109V87.8906ZM525 87.5V100H537.5V87.5H525Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 87.8906H537.891V99.6094H549.609V87.8906ZM537.5 87.5V100H550V87.5H537.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 87.8906H550.391V99.6094H562.109V87.8906ZM550 87.5V100H562.5V87.5H550Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 87.8906H562.891V99.6094H574.609V87.8906ZM562.5 87.5V100H575V87.5H562.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 87.8906H575.391V99.6094H587.109V87.8906ZM575 87.5V100H587.5V87.5H575Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 87.8906H587.891V99.6094H599.609V87.8906ZM587.5 87.5V100H600V87.5H587.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 100.391H0.390625V112.109H12.1094V100.391ZM0 100V112.5H12.5V100H0Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 100.391H12.8906V112.109H24.6094V100.391ZM12.5 100V112.5H25V100H12.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 100.391H25.3906V112.109H37.1094V100.391ZM25 100V112.5H37.5V100H25Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 100.391H37.8906V112.109H49.6094V100.391ZM37.5 100V112.5H50V100H37.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 100.391H50.3906V112.109H62.1094V100.391ZM50 100V112.5H62.5V100H50Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 100.391H62.8906V112.109H74.6094V100.391ZM62.5 100V112.5H75V100H62.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 100.391H75.3906V112.109H87.1094V100.391ZM75 100V112.5H87.5V100H75Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 100.391H87.8906V112.109H99.6094V100.391ZM87.5 100V112.5H100V100H87.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 100.391H100.391V112.109H112.109V100.391ZM100 100V112.5H112.5V100H100Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 100.391H112.891V112.109H124.609V100.391ZM112.5 100V112.5H125V100H112.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 100.391H125.391V112.109H137.109V100.391ZM125 100V112.5H137.5V100H125Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 100.391H137.891V112.109H149.609V100.391ZM137.5 100V112.5H150V100H137.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 100.391H150.391V112.109H162.109V100.391ZM150 100V112.5H162.5V100H150Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 100.391H162.891V112.109H174.609V100.391ZM162.5 100V112.5H175V100H162.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 100.391H175.391V112.109H187.109V100.391ZM175 100V112.5H187.5V100H175Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 100.391H187.891V112.109H199.609V100.391ZM187.5 100V112.5H200V100H187.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 100.391H200.391V112.109H212.109V100.391ZM200 100V112.5H212.5V100H200Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 100.391H212.891V112.109H224.609V100.391ZM212.5 100V112.5H225V100H212.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 100.391H225.391V112.109H237.109V100.391ZM225 100V112.5H237.5V100H225Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 100.391H237.891V112.109H249.609V100.391ZM237.5 100V112.5H250V100H237.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 100.391H250.391V112.109H262.109V100.391ZM250 100V112.5H262.5V100H250Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 100.391H262.891V112.109H274.609V100.391ZM262.5 100V112.5H275V100H262.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 100.391H275.391V112.109H287.109V100.391ZM275 100V112.5H287.5V100H275Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 100.391H287.891V112.109H299.609V100.391ZM287.5 100V112.5H300V100H287.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 100.391H300.391V112.109H312.109V100.391ZM300 100V112.5H312.5V100H300Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 100.391H312.891V112.109H324.609V100.391ZM312.5 100V112.5H325V100H312.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 100.391H325.391V112.109H337.109V100.391ZM325 100V112.5H337.5V100H325Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 100.391H337.891V112.109H349.609V100.391ZM337.5 100V112.5H350V100H337.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 100.391H350.391V112.109H362.109V100.391ZM350 100V112.5H362.5V100H350Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 100.391H362.891V112.109H374.609V100.391ZM362.5 100V112.5H375V100H362.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 100.391H375.391V112.109H387.109V100.391ZM375 100V112.5H387.5V100H375Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 100.391H387.891V112.109H399.609V100.391ZM387.5 100V112.5H400V100H387.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 100.391H400.391V112.109H412.109V100.391ZM400 100V112.5H412.5V100H400Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 100.391H412.891V112.109H424.609V100.391ZM412.5 100V112.5H425V100H412.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 100.391H425.391V112.109H437.109V100.391ZM425 100V112.5H437.5V100H425Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 100.391H437.891V112.109H449.609V100.391ZM437.5 100V112.5H450V100H437.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 100.391H450.391V112.109H462.109V100.391ZM450 100V112.5H462.5V100H450Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 100.391H462.891V112.109H474.609V100.391ZM462.5 100V112.5H475V100H462.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 100.391H475.391V112.109H487.109V100.391ZM475 100V112.5H487.5V100H475Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 100.391H487.891V112.109H499.609V100.391ZM487.5 100V112.5H500V100H487.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 100.391H500.391V112.109H512.109V100.391ZM500 100V112.5H512.5V100H500Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 100.391H512.891V112.109H524.609V100.391ZM512.5 100V112.5H525V100H512.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 100.391H525.391V112.109H537.109V100.391ZM525 100V112.5H537.5V100H525Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 100.391H537.891V112.109H549.609V100.391ZM537.5 100V112.5H550V100H537.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 100.391H550.391V112.109H562.109V100.391ZM550 100V112.5H562.5V100H550Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 100.391H562.891V112.109H574.609V100.391ZM562.5 100V112.5H575V100H562.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 100.391H575.391V112.109H587.109V100.391ZM575 100V112.5H587.5V100H575Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 100.391H587.891V112.109H599.609V100.391ZM587.5 100V112.5H600V100H587.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 112.891H0.390625V124.609H12.1094V112.891ZM0 112.5V125H12.5V112.5H0Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 112.891H12.8906V124.609H24.6094V112.891ZM12.5 112.5V125H25V112.5H12.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 112.891H25.3906V124.609H37.1094V112.891ZM25 112.5V125H37.5V112.5H25Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 112.891H37.8906V124.609H49.6094V112.891ZM37.5 112.5V125H50V112.5H37.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 112.891H50.3906V124.609H62.1094V112.891ZM50 112.5V125H62.5V112.5H50Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 112.891H62.8906V124.609H74.6094V112.891ZM62.5 112.5V125H75V112.5H62.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 112.891H75.3906V124.609H87.1094V112.891ZM75 112.5V125H87.5V112.5H75Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 112.891H87.8906V124.609H99.6094V112.891ZM87.5 112.5V125H100V112.5H87.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 112.891H100.391V124.609H112.109V112.891ZM100 112.5V125H112.5V112.5H100Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 112.891H112.891V124.609H124.609V112.891ZM112.5 112.5V125H125V112.5H112.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 112.891H125.391V124.609H137.109V112.891ZM125 112.5V125H137.5V112.5H125Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 112.891H137.891V124.609H149.609V112.891ZM137.5 112.5V125H150V112.5H137.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 112.891H150.391V124.609H162.109V112.891ZM150 112.5V125H162.5V112.5H150Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 112.891H162.891V124.609H174.609V112.891ZM162.5 112.5V125H175V112.5H162.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 112.891H175.391V124.609H187.109V112.891ZM175 112.5V125H187.5V112.5H175Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 112.891H187.891V124.609H199.609V112.891ZM187.5 112.5V125H200V112.5H187.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 112.891H200.391V124.609H212.109V112.891ZM200 112.5V125H212.5V112.5H200Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 112.891H212.891V124.609H224.609V112.891ZM212.5 112.5V125H225V112.5H212.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 112.891H225.391V124.609H237.109V112.891ZM225 112.5V125H237.5V112.5H225Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 112.891H237.891V124.609H249.609V112.891ZM237.5 112.5V125H250V112.5H237.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 112.891H250.391V124.609H262.109V112.891ZM250 112.5V125H262.5V112.5H250Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 112.891H262.891V124.609H274.609V112.891ZM262.5 112.5V125H275V112.5H262.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 112.891H275.391V124.609H287.109V112.891ZM275 112.5V125H287.5V112.5H275Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 112.891H287.891V124.609H299.609V112.891ZM287.5 112.5V125H300V112.5H287.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 112.891H300.391V124.609H312.109V112.891ZM300 112.5V125H312.5V112.5H300Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 112.891H312.891V124.609H324.609V112.891ZM312.5 112.5V125H325V112.5H312.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 112.891H325.391V124.609H337.109V112.891ZM325 112.5V125H337.5V112.5H325Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 112.891H337.891V124.609H349.609V112.891ZM337.5 112.5V125H350V112.5H337.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 112.891H350.391V124.609H362.109V112.891ZM350 112.5V125H362.5V112.5H350Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 112.891H362.891V124.609H374.609V112.891ZM362.5 112.5V125H375V112.5H362.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 112.891H375.391V124.609H387.109V112.891ZM375 112.5V125H387.5V112.5H375Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 112.891H387.891V124.609H399.609V112.891ZM387.5 112.5V125H400V112.5H387.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 112.891H400.391V124.609H412.109V112.891ZM400 112.5V125H412.5V112.5H400Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 112.891H412.891V124.609H424.609V112.891ZM412.5 112.5V125H425V112.5H412.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 112.891H425.391V124.609H437.109V112.891ZM425 112.5V125H437.5V112.5H425Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 112.891H437.891V124.609H449.609V112.891ZM437.5 112.5V125H450V112.5H437.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 112.891H450.391V124.609H462.109V112.891ZM450 112.5V125H462.5V112.5H450Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 112.891H462.891V124.609H474.609V112.891ZM462.5 112.5V125H475V112.5H462.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 112.891H475.391V124.609H487.109V112.891ZM475 112.5V125H487.5V112.5H475Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 112.891H487.891V124.609H499.609V112.891ZM487.5 112.5V125H500V112.5H487.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 112.891H500.391V124.609H512.109V112.891ZM500 112.5V125H512.5V112.5H500Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 112.891H512.891V124.609H524.609V112.891ZM512.5 112.5V125H525V112.5H512.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 112.891H525.391V124.609H537.109V112.891ZM525 112.5V125H537.5V112.5H525Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 112.891H537.891V124.609H549.609V112.891ZM537.5 112.5V125H550V112.5H537.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 112.891H550.391V124.609H562.109V112.891ZM550 112.5V125H562.5V112.5H550Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 112.891H562.891V124.609H574.609V112.891ZM562.5 112.5V125H575V112.5H562.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 112.891H575.391V124.609H587.109V112.891ZM575 112.5V125H587.5V112.5H575Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 112.891H587.891V124.609H599.609V112.891ZM587.5 112.5V125H600V112.5H587.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 125.391H0.390625V137.109H12.1094V125.391ZM0 125V137.5H12.5V125H0Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 125.391H12.8906V137.109H24.6094V125.391ZM12.5 125V137.5H25V125H12.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 125.391H25.3906V137.109H37.1094V125.391ZM25 125V137.5H37.5V125H25Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 125.391H37.8906V137.109H49.6094V125.391ZM37.5 125V137.5H50V125H37.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 125.391H50.3906V137.109H62.1094V125.391ZM50 125V137.5H62.5V125H50Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 125.391H62.8906V137.109H74.6094V125.391ZM62.5 125V137.5H75V125H62.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 125.391H75.3906V137.109H87.1094V125.391ZM75 125V137.5H87.5V125H75Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 125.391H87.8906V137.109H99.6094V125.391ZM87.5 125V137.5H100V125H87.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 125.391H100.391V137.109H112.109V125.391ZM100 125V137.5H112.5V125H100Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 125.391H112.891V137.109H124.609V125.391ZM112.5 125V137.5H125V125H112.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 125.391H125.391V137.109H137.109V125.391ZM125 125V137.5H137.5V125H125Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 125.391H137.891V137.109H149.609V125.391ZM137.5 125V137.5H150V125H137.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 125.391H150.391V137.109H162.109V125.391ZM150 125V137.5H162.5V125H150Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 125.391H162.891V137.109H174.609V125.391ZM162.5 125V137.5H175V125H162.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 125.391H175.391V137.109H187.109V125.391ZM175 125V137.5H187.5V125H175Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 125.391H187.891V137.109H199.609V125.391ZM187.5 125V137.5H200V125H187.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 125.391H200.391V137.109H212.109V125.391ZM200 125V137.5H212.5V125H200Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 125.391H212.891V137.109H224.609V125.391ZM212.5 125V137.5H225V125H212.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 125.391H225.391V137.109H237.109V125.391ZM225 125V137.5H237.5V125H225Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 125.391H237.891V137.109H249.609V125.391ZM237.5 125V137.5H250V125H237.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 125.391H250.391V137.109H262.109V125.391ZM250 125V137.5H262.5V125H250Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 125.391H262.891V137.109H274.609V125.391ZM262.5 125V137.5H275V125H262.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 125.391H275.391V137.109H287.109V125.391ZM275 125V137.5H287.5V125H275Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 125.391H287.891V137.109H299.609V125.391ZM287.5 125V137.5H300V125H287.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 125.391H300.391V137.109H312.109V125.391ZM300 125V137.5H312.5V125H300Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 125.391H312.891V137.109H324.609V125.391ZM312.5 125V137.5H325V125H312.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 125.391H325.391V137.109H337.109V125.391ZM325 125V137.5H337.5V125H325Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 125.391H337.891V137.109H349.609V125.391ZM337.5 125V137.5H350V125H337.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 125.391H350.391V137.109H362.109V125.391ZM350 125V137.5H362.5V125H350Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 125.391H362.891V137.109H374.609V125.391ZM362.5 125V137.5H375V125H362.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 125.391H375.391V137.109H387.109V125.391ZM375 125V137.5H387.5V125H375Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 125.391H387.891V137.109H399.609V125.391ZM387.5 125V137.5H400V125H387.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 125.391H400.391V137.109H412.109V125.391ZM400 125V137.5H412.5V125H400Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 125.391H412.891V137.109H424.609V125.391ZM412.5 125V137.5H425V125H412.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 125.391H425.391V137.109H437.109V125.391ZM425 125V137.5H437.5V125H425Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 125.391H437.891V137.109H449.609V125.391ZM437.5 125V137.5H450V125H437.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 125.391H450.391V137.109H462.109V125.391ZM450 125V137.5H462.5V125H450Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 125.391H462.891V137.109H474.609V125.391ZM462.5 125V137.5H475V125H462.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 125.391H475.391V137.109H487.109V125.391ZM475 125V137.5H487.5V125H475Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 125.391H487.891V137.109H499.609V125.391ZM487.5 125V137.5H500V125H487.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 125.391H500.391V137.109H512.109V125.391ZM500 125V137.5H512.5V125H500Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 125.391H512.891V137.109H524.609V125.391ZM512.5 125V137.5H525V125H512.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 125.391H525.391V137.109H537.109V125.391ZM525 125V137.5H537.5V125H525Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 125.391H537.891V137.109H549.609V125.391ZM537.5 125V137.5H550V125H537.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 125.391H550.391V137.109H562.109V125.391ZM550 125V137.5H562.5V125H550Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 125.391H562.891V137.109H574.609V125.391ZM562.5 125V137.5H575V125H562.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 125.391H575.391V137.109H587.109V125.391ZM575 125V137.5H587.5V125H575Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 125.391H587.891V137.109H599.609V125.391ZM587.5 125V137.5H600V125H587.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 137.891H0.390625V149.609H12.1094V137.891ZM0 137.5V150H12.5V137.5H0Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 137.891H12.8906V149.609H24.6094V137.891ZM12.5 137.5V150H25V137.5H12.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 137.891H25.3906V149.609H37.1094V137.891ZM25 137.5V150H37.5V137.5H25Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 137.891H37.8906V149.609H49.6094V137.891ZM37.5 137.5V150H50V137.5H37.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 137.891H50.3906V149.609H62.1094V137.891ZM50 137.5V150H62.5V137.5H50Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 137.891H62.8906V149.609H74.6094V137.891ZM62.5 137.5V150H75V137.5H62.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 137.891H75.3906V149.609H87.1094V137.891ZM75 137.5V150H87.5V137.5H75Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 137.891H87.8906V149.609H99.6094V137.891ZM87.5 137.5V150H100V137.5H87.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 137.891H100.391V149.609H112.109V137.891ZM100 137.5V150H112.5V137.5H100Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 137.891H112.891V149.609H124.609V137.891ZM112.5 137.5V150H125V137.5H112.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 137.891H125.391V149.609H137.109V137.891ZM125 137.5V150H137.5V137.5H125Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 137.891H137.891V149.609H149.609V137.891ZM137.5 137.5V150H150V137.5H137.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 137.891H150.391V149.609H162.109V137.891ZM150 137.5V150H162.5V137.5H150Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 137.891H162.891V149.609H174.609V137.891ZM162.5 137.5V150H175V137.5H162.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 137.891H175.391V149.609H187.109V137.891ZM175 137.5V150H187.5V137.5H175Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 137.891H187.891V149.609H199.609V137.891ZM187.5 137.5V150H200V137.5H187.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 137.891H200.391V149.609H212.109V137.891ZM200 137.5V150H212.5V137.5H200Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 137.891H212.891V149.609H224.609V137.891ZM212.5 137.5V150H225V137.5H212.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 137.891H225.391V149.609H237.109V137.891ZM225 137.5V150H237.5V137.5H225Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 137.891H237.891V149.609H249.609V137.891ZM237.5 137.5V150H250V137.5H237.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 137.891H250.391V149.609H262.109V137.891ZM250 137.5V150H262.5V137.5H250Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 137.891H262.891V149.609H274.609V137.891ZM262.5 137.5V150H275V137.5H262.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 137.891H275.391V149.609H287.109V137.891ZM275 137.5V150H287.5V137.5H275Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 137.891H287.891V149.609H299.609V137.891ZM287.5 137.5V150H300V137.5H287.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 137.891H300.391V149.609H312.109V137.891ZM300 137.5V150H312.5V137.5H300Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 137.891H312.891V149.609H324.609V137.891ZM312.5 137.5V150H325V137.5H312.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 137.891H325.391V149.609H337.109V137.891ZM325 137.5V150H337.5V137.5H325Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 137.891H337.891V149.609H349.609V137.891ZM337.5 137.5V150H350V137.5H337.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 137.891H350.391V149.609H362.109V137.891ZM350 137.5V150H362.5V137.5H350Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 137.891H362.891V149.609H374.609V137.891ZM362.5 137.5V150H375V137.5H362.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 137.891H375.391V149.609H387.109V137.891ZM375 137.5V150H387.5V137.5H375Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 137.891H387.891V149.609H399.609V137.891ZM387.5 137.5V150H400V137.5H387.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 137.891H400.391V149.609H412.109V137.891ZM400 137.5V150H412.5V137.5H400Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 137.891H412.891V149.609H424.609V137.891ZM412.5 137.5V150H425V137.5H412.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 137.891H425.391V149.609H437.109V137.891ZM425 137.5V150H437.5V137.5H425Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 137.891H437.891V149.609H449.609V137.891ZM437.5 137.5V150H450V137.5H437.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 137.891H450.391V149.609H462.109V137.891ZM450 137.5V150H462.5V137.5H450Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 137.891H462.891V149.609H474.609V137.891ZM462.5 137.5V150H475V137.5H462.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 137.891H475.391V149.609H487.109V137.891ZM475 137.5V150H487.5V137.5H475Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 137.891H487.891V149.609H499.609V137.891ZM487.5 137.5V150H500V137.5H487.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 137.891H500.391V149.609H512.109V137.891ZM500 137.5V150H512.5V137.5H500Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 137.891H512.891V149.609H524.609V137.891ZM512.5 137.5V150H525V137.5H512.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 137.891H525.391V149.609H537.109V137.891ZM525 137.5V150H537.5V137.5H525Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 137.891H537.891V149.609H549.609V137.891ZM537.5 137.5V150H550V137.5H537.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 137.891H550.391V149.609H562.109V137.891ZM550 137.5V150H562.5V137.5H550Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 137.891H562.891V149.609H574.609V137.891ZM562.5 137.5V150H575V137.5H562.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 137.891H575.391V149.609H587.109V137.891ZM575 137.5V150H587.5V137.5H575Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 137.891H587.891V149.609H599.609V137.891ZM587.5 137.5V150H600V137.5H587.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 150.391H0.390625V162.109H12.1094V150.391ZM0 150V162.5H12.5V150H0Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 150.391H12.8906V162.109H24.6094V150.391ZM12.5 150V162.5H25V150H12.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 150.391H25.3906V162.109H37.1094V150.391ZM25 150V162.5H37.5V150H25Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 150.391H37.8906V162.109H49.6094V150.391ZM37.5 150V162.5H50V150H37.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 150.391H50.3906V162.109H62.1094V150.391ZM50 150V162.5H62.5V150H50Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 150.391H62.8906V162.109H74.6094V150.391ZM62.5 150V162.5H75V150H62.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 150.391H75.3906V162.109H87.1094V150.391ZM75 150V162.5H87.5V150H75Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 150.391H87.8906V162.109H99.6094V150.391ZM87.5 150V162.5H100V150H87.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 150.391H100.391V162.109H112.109V150.391ZM100 150V162.5H112.5V150H100Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 150.391H112.891V162.109H124.609V150.391ZM112.5 150V162.5H125V150H112.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 150.391H125.391V162.109H137.109V150.391ZM125 150V162.5H137.5V150H125Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 150.391H137.891V162.109H149.609V150.391ZM137.5 150V162.5H150V150H137.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 150.391H150.391V162.109H162.109V150.391ZM150 150V162.5H162.5V150H150Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 150.391H162.891V162.109H174.609V150.391ZM162.5 150V162.5H175V150H162.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 150.391H175.391V162.109H187.109V150.391ZM175 150V162.5H187.5V150H175Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 150.391H187.891V162.109H199.609V150.391ZM187.5 150V162.5H200V150H187.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 150.391H200.391V162.109H212.109V150.391ZM200 150V162.5H212.5V150H200Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 150.391H212.891V162.109H224.609V150.391ZM212.5 150V162.5H225V150H212.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 150.391H225.391V162.109H237.109V150.391ZM225 150V162.5H237.5V150H225Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 150.391H237.891V162.109H249.609V150.391ZM237.5 150V162.5H250V150H237.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 150.391H250.391V162.109H262.109V150.391ZM250 150V162.5H262.5V150H250Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 150.391H262.891V162.109H274.609V150.391ZM262.5 150V162.5H275V150H262.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 150.391H275.391V162.109H287.109V150.391ZM275 150V162.5H287.5V150H275Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 150.391H287.891V162.109H299.609V150.391ZM287.5 150V162.5H300V150H287.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 150.391H300.391V162.109H312.109V150.391ZM300 150V162.5H312.5V150H300Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 150.391H312.891V162.109H324.609V150.391ZM312.5 150V162.5H325V150H312.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 150.391H325.391V162.109H337.109V150.391ZM325 150V162.5H337.5V150H325Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 150.391H337.891V162.109H349.609V150.391ZM337.5 150V162.5H350V150H337.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 150.391H350.391V162.109H362.109V150.391ZM350 150V162.5H362.5V150H350Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 150.391H362.891V162.109H374.609V150.391ZM362.5 150V162.5H375V150H362.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 150.391H375.391V162.109H387.109V150.391ZM375 150V162.5H387.5V150H375Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 150.391H387.891V162.109H399.609V150.391ZM387.5 150V162.5H400V150H387.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 150.391H400.391V162.109H412.109V150.391ZM400 150V162.5H412.5V150H400Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 150.391H412.891V162.109H424.609V150.391ZM412.5 150V162.5H425V150H412.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 150.391H425.391V162.109H437.109V150.391ZM425 150V162.5H437.5V150H425Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 150.391H437.891V162.109H449.609V150.391ZM437.5 150V162.5H450V150H437.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 150.391H450.391V162.109H462.109V150.391ZM450 150V162.5H462.5V150H450Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 150.391H462.891V162.109H474.609V150.391ZM462.5 150V162.5H475V150H462.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 150.391H475.391V162.109H487.109V150.391ZM475 150V162.5H487.5V150H475Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 150.391H487.891V162.109H499.609V150.391ZM487.5 150V162.5H500V150H487.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 150.391H500.391V162.109H512.109V150.391ZM500 150V162.5H512.5V150H500Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 150.391H512.891V162.109H524.609V150.391ZM512.5 150V162.5H525V150H512.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 150.391H525.391V162.109H537.109V150.391ZM525 150V162.5H537.5V150H525Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 150.391H537.891V162.109H549.609V150.391ZM537.5 150V162.5H550V150H537.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 150.391H550.391V162.109H562.109V150.391ZM550 150V162.5H562.5V150H550Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 150.391H562.891V162.109H574.609V150.391ZM562.5 150V162.5H575V150H562.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 150.391H575.391V162.109H587.109V150.391ZM575 150V162.5H587.5V150H575Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 150.391H587.891V162.109H599.609V150.391ZM587.5 150V162.5H600V150H587.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 162.891H0.390625V174.609H12.1094V162.891ZM0 162.5V175H12.5V162.5H0Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 162.891H12.8906V174.609H24.6094V162.891ZM12.5 162.5V175H25V162.5H12.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 162.891H25.3906V174.609H37.1094V162.891ZM25 162.5V175H37.5V162.5H25Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 162.891H37.8906V174.609H49.6094V162.891ZM37.5 162.5V175H50V162.5H37.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 162.891H50.3906V174.609H62.1094V162.891ZM50 162.5V175H62.5V162.5H50Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 162.891H62.8906V174.609H74.6094V162.891ZM62.5 162.5V175H75V162.5H62.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 162.891H75.3906V174.609H87.1094V162.891ZM75 162.5V175H87.5V162.5H75Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 162.891H87.8906V174.609H99.6094V162.891ZM87.5 162.5V175H100V162.5H87.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 162.891H100.391V174.609H112.109V162.891ZM100 162.5V175H112.5V162.5H100Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 162.891H112.891V174.609H124.609V162.891ZM112.5 162.5V175H125V162.5H112.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 162.891H125.391V174.609H137.109V162.891ZM125 162.5V175H137.5V162.5H125Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 162.891H137.891V174.609H149.609V162.891ZM137.5 162.5V175H150V162.5H137.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 162.891H150.391V174.609H162.109V162.891ZM150 162.5V175H162.5V162.5H150Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 162.891H162.891V174.609H174.609V162.891ZM162.5 162.5V175H175V162.5H162.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 162.891H175.391V174.609H187.109V162.891ZM175 162.5V175H187.5V162.5H175Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 162.891H187.891V174.609H199.609V162.891ZM187.5 162.5V175H200V162.5H187.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 162.891H200.391V174.609H212.109V162.891ZM200 162.5V175H212.5V162.5H200Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 162.891H212.891V174.609H224.609V162.891ZM212.5 162.5V175H225V162.5H212.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 162.891H225.391V174.609H237.109V162.891ZM225 162.5V175H237.5V162.5H225Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 162.891H237.891V174.609H249.609V162.891ZM237.5 162.5V175H250V162.5H237.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 162.891H250.391V174.609H262.109V162.891ZM250 162.5V175H262.5V162.5H250Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 162.891H262.891V174.609H274.609V162.891ZM262.5 162.5V175H275V162.5H262.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 162.891H275.391V174.609H287.109V162.891ZM275 162.5V175H287.5V162.5H275Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 162.891H287.891V174.609H299.609V162.891ZM287.5 162.5V175H300V162.5H287.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 162.891H300.391V174.609H312.109V162.891ZM300 162.5V175H312.5V162.5H300Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 162.891H312.891V174.609H324.609V162.891ZM312.5 162.5V175H325V162.5H312.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 162.891H325.391V174.609H337.109V162.891ZM325 162.5V175H337.5V162.5H325Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 162.891H337.891V174.609H349.609V162.891ZM337.5 162.5V175H350V162.5H337.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 162.891H350.391V174.609H362.109V162.891ZM350 162.5V175H362.5V162.5H350Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 162.891H362.891V174.609H374.609V162.891ZM362.5 162.5V175H375V162.5H362.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 162.891H375.391V174.609H387.109V162.891ZM375 162.5V175H387.5V162.5H375Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 162.891H387.891V174.609H399.609V162.891ZM387.5 162.5V175H400V162.5H387.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 162.891H400.391V174.609H412.109V162.891ZM400 162.5V175H412.5V162.5H400Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 162.891H412.891V174.609H424.609V162.891ZM412.5 162.5V175H425V162.5H412.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 162.891H425.391V174.609H437.109V162.891ZM425 162.5V175H437.5V162.5H425Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 162.891H437.891V174.609H449.609V162.891ZM437.5 162.5V175H450V162.5H437.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 162.891H450.391V174.609H462.109V162.891ZM450 162.5V175H462.5V162.5H450Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 162.891H462.891V174.609H474.609V162.891ZM462.5 162.5V175H475V162.5H462.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 162.891H475.391V174.609H487.109V162.891ZM475 162.5V175H487.5V162.5H475Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 162.891H487.891V174.609H499.609V162.891ZM487.5 162.5V175H500V162.5H487.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 162.891H500.391V174.609H512.109V162.891ZM500 162.5V175H512.5V162.5H500Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 162.891H512.891V174.609H524.609V162.891ZM512.5 162.5V175H525V162.5H512.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 162.891H525.391V174.609H537.109V162.891ZM525 162.5V175H537.5V162.5H525Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 162.891H537.891V174.609H549.609V162.891ZM537.5 162.5V175H550V162.5H537.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 162.891H550.391V174.609H562.109V162.891ZM550 162.5V175H562.5V162.5H550Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 162.891H562.891V174.609H574.609V162.891ZM562.5 162.5V175H575V162.5H562.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 162.891H575.391V174.609H587.109V162.891ZM575 162.5V175H587.5V162.5H575Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 162.891H587.891V174.609H599.609V162.891ZM587.5 162.5V175H600V162.5H587.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 175.391H0.390625V187.109H12.1094V175.391ZM0 175V187.5H12.5V175H0Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 175.391H12.8906V187.109H24.6094V175.391ZM12.5 175V187.5H25V175H12.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 175.391H25.3906V187.109H37.1094V175.391ZM25 175V187.5H37.5V175H25Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 175.391H37.8906V187.109H49.6094V175.391ZM37.5 175V187.5H50V175H37.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 175.391H50.3906V187.109H62.1094V175.391ZM50 175V187.5H62.5V175H50Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 175.391H62.8906V187.109H74.6094V175.391ZM62.5 175V187.5H75V175H62.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 175.391H75.3906V187.109H87.1094V175.391ZM75 175V187.5H87.5V175H75Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 175.391H87.8906V187.109H99.6094V175.391ZM87.5 175V187.5H100V175H87.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 175.391H100.391V187.109H112.109V175.391ZM100 175V187.5H112.5V175H100Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 175.391H112.891V187.109H124.609V175.391ZM112.5 175V187.5H125V175H112.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 175.391H125.391V187.109H137.109V175.391ZM125 175V187.5H137.5V175H125Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 175.391H137.891V187.109H149.609V175.391ZM137.5 175V187.5H150V175H137.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 175.391H150.391V187.109H162.109V175.391ZM150 175V187.5H162.5V175H150Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 175.391H162.891V187.109H174.609V175.391ZM162.5 175V187.5H175V175H162.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 175.391H175.391V187.109H187.109V175.391ZM175 175V187.5H187.5V175H175Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 175.391H187.891V187.109H199.609V175.391ZM187.5 175V187.5H200V175H187.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 175.391H200.391V187.109H212.109V175.391ZM200 175V187.5H212.5V175H200Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 175.391H212.891V187.109H224.609V175.391ZM212.5 175V187.5H225V175H212.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 175.391H225.391V187.109H237.109V175.391ZM225 175V187.5H237.5V175H225Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 175.391H237.891V187.109H249.609V175.391ZM237.5 175V187.5H250V175H237.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 175.391H250.391V187.109H262.109V175.391ZM250 175V187.5H262.5V175H250Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 175.391H262.891V187.109H274.609V175.391ZM262.5 175V187.5H275V175H262.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 175.391H275.391V187.109H287.109V175.391ZM275 175V187.5H287.5V175H275Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 175.391H287.891V187.109H299.609V175.391ZM287.5 175V187.5H300V175H287.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 175.391H300.391V187.109H312.109V175.391ZM300 175V187.5H312.5V175H300Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 175.391H312.891V187.109H324.609V175.391ZM312.5 175V187.5H325V175H312.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 175.391H325.391V187.109H337.109V175.391ZM325 175V187.5H337.5V175H325Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 175.391H337.891V187.109H349.609V175.391ZM337.5 175V187.5H350V175H337.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 175.391H350.391V187.109H362.109V175.391ZM350 175V187.5H362.5V175H350Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 175.391H362.891V187.109H374.609V175.391ZM362.5 175V187.5H375V175H362.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 175.391H375.391V187.109H387.109V175.391ZM375 175V187.5H387.5V175H375Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 175.391H387.891V187.109H399.609V175.391ZM387.5 175V187.5H400V175H387.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 175.391H400.391V187.109H412.109V175.391ZM400 175V187.5H412.5V175H400Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 175.391H412.891V187.109H424.609V175.391ZM412.5 175V187.5H425V175H412.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 175.391H425.391V187.109H437.109V175.391ZM425 175V187.5H437.5V175H425Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 175.391H437.891V187.109H449.609V175.391ZM437.5 175V187.5H450V175H437.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 175.391H450.391V187.109H462.109V175.391ZM450 175V187.5H462.5V175H450Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 175.391H462.891V187.109H474.609V175.391ZM462.5 175V187.5H475V175H462.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 175.391H475.391V187.109H487.109V175.391ZM475 175V187.5H487.5V175H475Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 175.391H487.891V187.109H499.609V175.391ZM487.5 175V187.5H500V175H487.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 175.391H500.391V187.109H512.109V175.391ZM500 175V187.5H512.5V175H500Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 175.391H512.891V187.109H524.609V175.391ZM512.5 175V187.5H525V175H512.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 175.391H525.391V187.109H537.109V175.391ZM525 175V187.5H537.5V175H525Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 175.391H537.891V187.109H549.609V175.391ZM537.5 175V187.5H550V175H537.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 175.391H550.391V187.109H562.109V175.391ZM550 175V187.5H562.5V175H550Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 175.391H562.891V187.109H574.609V175.391ZM562.5 175V187.5H575V175H562.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 175.391H575.391V187.109H587.109V175.391ZM575 175V187.5H587.5V175H575Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 175.391H587.891V187.109H599.609V175.391ZM587.5 175V187.5H600V175H587.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 187.891H0.390625V199.609H12.1094V187.891ZM0 187.5V200H12.5V187.5H0Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 187.891H12.8906V199.609H24.6094V187.891ZM12.5 187.5V200H25V187.5H12.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 187.891H25.3906V199.609H37.1094V187.891ZM25 187.5V200H37.5V187.5H25Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 187.891H37.8906V199.609H49.6094V187.891ZM37.5 187.5V200H50V187.5H37.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 187.891H50.3906V199.609H62.1094V187.891ZM50 187.5V200H62.5V187.5H50Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 187.891H62.8906V199.609H74.6094V187.891ZM62.5 187.5V200H75V187.5H62.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 187.891H75.3906V199.609H87.1094V187.891ZM75 187.5V200H87.5V187.5H75Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 187.891H87.8906V199.609H99.6094V187.891ZM87.5 187.5V200H100V187.5H87.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 187.891H100.391V199.609H112.109V187.891ZM100 187.5V200H112.5V187.5H100Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 187.891H112.891V199.609H124.609V187.891ZM112.5 187.5V200H125V187.5H112.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 187.891H125.391V199.609H137.109V187.891ZM125 187.5V200H137.5V187.5H125Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 187.891H137.891V199.609H149.609V187.891ZM137.5 187.5V200H150V187.5H137.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 187.891H150.391V199.609H162.109V187.891ZM150 187.5V200H162.5V187.5H150Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 187.891H162.891V199.609H174.609V187.891ZM162.5 187.5V200H175V187.5H162.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 187.891H175.391V199.609H187.109V187.891ZM175 187.5V200H187.5V187.5H175Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 187.891H187.891V199.609H199.609V187.891ZM187.5 187.5V200H200V187.5H187.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 187.891H200.391V199.609H212.109V187.891ZM200 187.5V200H212.5V187.5H200Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 187.891H212.891V199.609H224.609V187.891ZM212.5 187.5V200H225V187.5H212.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 187.891H225.391V199.609H237.109V187.891ZM225 187.5V200H237.5V187.5H225Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 187.891H237.891V199.609H249.609V187.891ZM237.5 187.5V200H250V187.5H237.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 187.891H250.391V199.609H262.109V187.891ZM250 187.5V200H262.5V187.5H250Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 187.891H262.891V199.609H274.609V187.891ZM262.5 187.5V200H275V187.5H262.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 187.891H275.391V199.609H287.109V187.891ZM275 187.5V200H287.5V187.5H275Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 187.891H287.891V199.609H299.609V187.891ZM287.5 187.5V200H300V187.5H287.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 187.891H300.391V199.609H312.109V187.891ZM300 187.5V200H312.5V187.5H300Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 187.891H312.891V199.609H324.609V187.891ZM312.5 187.5V200H325V187.5H312.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 187.891H325.391V199.609H337.109V187.891ZM325 187.5V200H337.5V187.5H325Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 187.891H337.891V199.609H349.609V187.891ZM337.5 187.5V200H350V187.5H337.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 187.891H350.391V199.609H362.109V187.891ZM350 187.5V200H362.5V187.5H350Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 187.891H362.891V199.609H374.609V187.891ZM362.5 187.5V200H375V187.5H362.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 187.891H375.391V199.609H387.109V187.891ZM375 187.5V200H387.5V187.5H375Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 187.891H387.891V199.609H399.609V187.891ZM387.5 187.5V200H400V187.5H387.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 187.891H400.391V199.609H412.109V187.891ZM400 187.5V200H412.5V187.5H400Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 187.891H412.891V199.609H424.609V187.891ZM412.5 187.5V200H425V187.5H412.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 187.891H425.391V199.609H437.109V187.891ZM425 187.5V200H437.5V187.5H425Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 187.891H437.891V199.609H449.609V187.891ZM437.5 187.5V200H450V187.5H437.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 187.891H450.391V199.609H462.109V187.891ZM450 187.5V200H462.5V187.5H450Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 187.891H462.891V199.609H474.609V187.891ZM462.5 187.5V200H475V187.5H462.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 187.891H475.391V199.609H487.109V187.891ZM475 187.5V200H487.5V187.5H475Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 187.891H487.891V199.609H499.609V187.891ZM487.5 187.5V200H500V187.5H487.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 187.891H500.391V199.609H512.109V187.891ZM500 187.5V200H512.5V187.5H500Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 187.891H512.891V199.609H524.609V187.891ZM512.5 187.5V200H525V187.5H512.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 187.891H525.391V199.609H537.109V187.891ZM525 187.5V200H537.5V187.5H525Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 187.891H537.891V199.609H549.609V187.891ZM537.5 187.5V200H550V187.5H537.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 187.891H550.391V199.609H562.109V187.891ZM550 187.5V200H562.5V187.5H550Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 187.891H562.891V199.609H574.609V187.891ZM562.5 187.5V200H575V187.5H562.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 187.891H575.391V199.609H587.109V187.891ZM575 187.5V200H587.5V187.5H575Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 187.891H587.891V199.609H599.609V187.891ZM587.5 187.5V200H600V187.5H587.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 200.391H0.390625V212.109H12.1094V200.391ZM0 200V212.5H12.5V200H0Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 200.391H12.8906V212.109H24.6094V200.391ZM12.5 200V212.5H25V200H12.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 200.391H25.3906V212.109H37.1094V200.391ZM25 200V212.5H37.5V200H25Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 200.391H37.8906V212.109H49.6094V200.391ZM37.5 200V212.5H50V200H37.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 200.391H50.3906V212.109H62.1094V200.391ZM50 200V212.5H62.5V200H50Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 200.391H62.8906V212.109H74.6094V200.391ZM62.5 200V212.5H75V200H62.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 200.391H75.3906V212.109H87.1094V200.391ZM75 200V212.5H87.5V200H75Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 200.391H87.8906V212.109H99.6094V200.391ZM87.5 200V212.5H100V200H87.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 200.391H100.391V212.109H112.109V200.391ZM100 200V212.5H112.5V200H100Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 200.391H112.891V212.109H124.609V200.391ZM112.5 200V212.5H125V200H112.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 200.391H125.391V212.109H137.109V200.391ZM125 200V212.5H137.5V200H125Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 200.391H137.891V212.109H149.609V200.391ZM137.5 200V212.5H150V200H137.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 200.391H150.391V212.109H162.109V200.391ZM150 200V212.5H162.5V200H150Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 200.391H162.891V212.109H174.609V200.391ZM162.5 200V212.5H175V200H162.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 200.391H175.391V212.109H187.109V200.391ZM175 200V212.5H187.5V200H175Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 200.391H187.891V212.109H199.609V200.391ZM187.5 200V212.5H200V200H187.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 200.391H200.391V212.109H212.109V200.391ZM200 200V212.5H212.5V200H200Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 200.391H212.891V212.109H224.609V200.391ZM212.5 200V212.5H225V200H212.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 200.391H225.391V212.109H237.109V200.391ZM225 200V212.5H237.5V200H225Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 200.391H237.891V212.109H249.609V200.391ZM237.5 200V212.5H250V200H237.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 200.391H250.391V212.109H262.109V200.391ZM250 200V212.5H262.5V200H250Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 200.391H262.891V212.109H274.609V200.391ZM262.5 200V212.5H275V200H262.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 200.391H275.391V212.109H287.109V200.391ZM275 200V212.5H287.5V200H275Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 200.391H287.891V212.109H299.609V200.391ZM287.5 200V212.5H300V200H287.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 200.391H300.391V212.109H312.109V200.391ZM300 200V212.5H312.5V200H300Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 200.391H312.891V212.109H324.609V200.391ZM312.5 200V212.5H325V200H312.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 200.391H325.391V212.109H337.109V200.391ZM325 200V212.5H337.5V200H325Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 200.391H337.891V212.109H349.609V200.391ZM337.5 200V212.5H350V200H337.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 200.391H350.391V212.109H362.109V200.391ZM350 200V212.5H362.5V200H350Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 200.391H362.891V212.109H374.609V200.391ZM362.5 200V212.5H375V200H362.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 200.391H375.391V212.109H387.109V200.391ZM375 200V212.5H387.5V200H375Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 200.391H387.891V212.109H399.609V200.391ZM387.5 200V212.5H400V200H387.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 200.391H400.391V212.109H412.109V200.391ZM400 200V212.5H412.5V200H400Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 200.391H412.891V212.109H424.609V200.391ZM412.5 200V212.5H425V200H412.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 200.391H425.391V212.109H437.109V200.391ZM425 200V212.5H437.5V200H425Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 200.391H437.891V212.109H449.609V200.391ZM437.5 200V212.5H450V200H437.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 200.391H450.391V212.109H462.109V200.391ZM450 200V212.5H462.5V200H450Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 200.391H462.891V212.109H474.609V200.391ZM462.5 200V212.5H475V200H462.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 200.391H475.391V212.109H487.109V200.391ZM475 200V212.5H487.5V200H475Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 200.391H487.891V212.109H499.609V200.391ZM487.5 200V212.5H500V200H487.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 200.391H500.391V212.109H512.109V200.391ZM500 200V212.5H512.5V200H500Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 200.391H512.891V212.109H524.609V200.391ZM512.5 200V212.5H525V200H512.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 200.391H525.391V212.109H537.109V200.391ZM525 200V212.5H537.5V200H525Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 200.391H537.891V212.109H549.609V200.391ZM537.5 200V212.5H550V200H537.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 200.391H550.391V212.109H562.109V200.391ZM550 200V212.5H562.5V200H550Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 200.391H562.891V212.109H574.609V200.391ZM562.5 200V212.5H575V200H562.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 200.391H575.391V212.109H587.109V200.391ZM575 200V212.5H587.5V200H575Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 200.391H587.891V212.109H599.609V200.391ZM587.5 200V212.5H600V200H587.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 212.891H0.390625V224.609H12.1094V212.891ZM0 212.5V225H12.5V212.5H0Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 212.891H12.8906V224.609H24.6094V212.891ZM12.5 212.5V225H25V212.5H12.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 212.891H25.3906V224.609H37.1094V212.891ZM25 212.5V225H37.5V212.5H25Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 212.891H37.8906V224.609H49.6094V212.891ZM37.5 212.5V225H50V212.5H37.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 212.891H50.3906V224.609H62.1094V212.891ZM50 212.5V225H62.5V212.5H50Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 212.891H62.8906V224.609H74.6094V212.891ZM62.5 212.5V225H75V212.5H62.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 212.891H75.3906V224.609H87.1094V212.891ZM75 212.5V225H87.5V212.5H75Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 212.891H87.8906V224.609H99.6094V212.891ZM87.5 212.5V225H100V212.5H87.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 212.891H100.391V224.609H112.109V212.891ZM100 212.5V225H112.5V212.5H100Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 212.891H112.891V224.609H124.609V212.891ZM112.5 212.5V225H125V212.5H112.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 212.891H125.391V224.609H137.109V212.891ZM125 212.5V225H137.5V212.5H125Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 212.891H137.891V224.609H149.609V212.891ZM137.5 212.5V225H150V212.5H137.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 212.891H150.391V224.609H162.109V212.891ZM150 212.5V225H162.5V212.5H150Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 212.891H162.891V224.609H174.609V212.891ZM162.5 212.5V225H175V212.5H162.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 212.891H175.391V224.609H187.109V212.891ZM175 212.5V225H187.5V212.5H175Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 212.891H187.891V224.609H199.609V212.891ZM187.5 212.5V225H200V212.5H187.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 212.891H200.391V224.609H212.109V212.891ZM200 212.5V225H212.5V212.5H200Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 212.891H212.891V224.609H224.609V212.891ZM212.5 212.5V225H225V212.5H212.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 212.891H225.391V224.609H237.109V212.891ZM225 212.5V225H237.5V212.5H225Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 212.891H237.891V224.609H249.609V212.891ZM237.5 212.5V225H250V212.5H237.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 212.891H250.391V224.609H262.109V212.891ZM250 212.5V225H262.5V212.5H250Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 212.891H262.891V224.609H274.609V212.891ZM262.5 212.5V225H275V212.5H262.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 212.891H275.391V224.609H287.109V212.891ZM275 212.5V225H287.5V212.5H275Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 212.891H287.891V224.609H299.609V212.891ZM287.5 212.5V225H300V212.5H287.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 212.891H300.391V224.609H312.109V212.891ZM300 212.5V225H312.5V212.5H300Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 212.891H312.891V224.609H324.609V212.891ZM312.5 212.5V225H325V212.5H312.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 212.891H325.391V224.609H337.109V212.891ZM325 212.5V225H337.5V212.5H325Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 212.891H337.891V224.609H349.609V212.891ZM337.5 212.5V225H350V212.5H337.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 212.891H350.391V224.609H362.109V212.891ZM350 212.5V225H362.5V212.5H350Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 212.891H362.891V224.609H374.609V212.891ZM362.5 212.5V225H375V212.5H362.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 212.891H375.391V224.609H387.109V212.891ZM375 212.5V225H387.5V212.5H375Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 212.891H387.891V224.609H399.609V212.891ZM387.5 212.5V225H400V212.5H387.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 212.891H400.391V224.609H412.109V212.891ZM400 212.5V225H412.5V212.5H400Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 212.891H412.891V224.609H424.609V212.891ZM412.5 212.5V225H425V212.5H412.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 212.891H425.391V224.609H437.109V212.891ZM425 212.5V225H437.5V212.5H425Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 212.891H437.891V224.609H449.609V212.891ZM437.5 212.5V225H450V212.5H437.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 212.891H450.391V224.609H462.109V212.891ZM450 212.5V225H462.5V212.5H450Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 212.891H462.891V224.609H474.609V212.891ZM462.5 212.5V225H475V212.5H462.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 212.891H475.391V224.609H487.109V212.891ZM475 212.5V225H487.5V212.5H475Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 212.891H487.891V224.609H499.609V212.891ZM487.5 212.5V225H500V212.5H487.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 212.891H500.391V224.609H512.109V212.891ZM500 212.5V225H512.5V212.5H500Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 212.891H512.891V224.609H524.609V212.891ZM512.5 212.5V225H525V212.5H512.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 212.891H525.391V224.609H537.109V212.891ZM525 212.5V225H537.5V212.5H525Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 212.891H537.891V224.609H549.609V212.891ZM537.5 212.5V225H550V212.5H537.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 212.891H550.391V224.609H562.109V212.891ZM550 212.5V225H562.5V212.5H550Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 212.891H562.891V224.609H574.609V212.891ZM562.5 212.5V225H575V212.5H562.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 212.891H575.391V224.609H587.109V212.891ZM575 212.5V225H587.5V212.5H575Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 212.891H587.891V224.609H599.609V212.891ZM587.5 212.5V225H600V212.5H587.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 225.391H0.390625V237.109H12.1094V225.391ZM0 225V237.5H12.5V225H0Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 225.391H12.8906V237.109H24.6094V225.391ZM12.5 225V237.5H25V225H12.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 225.391H25.3906V237.109H37.1094V225.391ZM25 225V237.5H37.5V225H25Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 225.391H37.8906V237.109H49.6094V225.391ZM37.5 225V237.5H50V225H37.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 225.391H50.3906V237.109H62.1094V225.391ZM50 225V237.5H62.5V225H50Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 225.391H62.8906V237.109H74.6094V225.391ZM62.5 225V237.5H75V225H62.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 225.391H75.3906V237.109H87.1094V225.391ZM75 225V237.5H87.5V225H75Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 225.391H87.8906V237.109H99.6094V225.391ZM87.5 225V237.5H100V225H87.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 225.391H100.391V237.109H112.109V225.391ZM100 225V237.5H112.5V225H100Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 225.391H112.891V237.109H124.609V225.391ZM112.5 225V237.5H125V225H112.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 225.391H125.391V237.109H137.109V225.391ZM125 225V237.5H137.5V225H125Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 225.391H137.891V237.109H149.609V225.391ZM137.5 225V237.5H150V225H137.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 225.391H150.391V237.109H162.109V225.391ZM150 225V237.5H162.5V225H150Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 225.391H162.891V237.109H174.609V225.391ZM162.5 225V237.5H175V225H162.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 225.391H175.391V237.109H187.109V225.391ZM175 225V237.5H187.5V225H175Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 225.391H187.891V237.109H199.609V225.391ZM187.5 225V237.5H200V225H187.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 225.391H200.391V237.109H212.109V225.391ZM200 225V237.5H212.5V225H200Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 225.391H212.891V237.109H224.609V225.391ZM212.5 225V237.5H225V225H212.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 225.391H225.391V237.109H237.109V225.391ZM225 225V237.5H237.5V225H225Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 225.391H237.891V237.109H249.609V225.391ZM237.5 225V237.5H250V225H237.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 225.391H250.391V237.109H262.109V225.391ZM250 225V237.5H262.5V225H250Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 225.391H262.891V237.109H274.609V225.391ZM262.5 225V237.5H275V225H262.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 225.391H275.391V237.109H287.109V225.391ZM275 225V237.5H287.5V225H275Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 225.391H287.891V237.109H299.609V225.391ZM287.5 225V237.5H300V225H287.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 225.391H300.391V237.109H312.109V225.391ZM300 225V237.5H312.5V225H300Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 225.391H312.891V237.109H324.609V225.391ZM312.5 225V237.5H325V225H312.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 225.391H325.391V237.109H337.109V225.391ZM325 225V237.5H337.5V225H325Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 225.391H337.891V237.109H349.609V225.391ZM337.5 225V237.5H350V225H337.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 225.391H350.391V237.109H362.109V225.391ZM350 225V237.5H362.5V225H350Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 225.391H362.891V237.109H374.609V225.391ZM362.5 225V237.5H375V225H362.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 225.391H375.391V237.109H387.109V225.391ZM375 225V237.5H387.5V225H375Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 225.391H387.891V237.109H399.609V225.391ZM387.5 225V237.5H400V225H387.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 225.391H400.391V237.109H412.109V225.391ZM400 225V237.5H412.5V225H400Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 225.391H412.891V237.109H424.609V225.391ZM412.5 225V237.5H425V225H412.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 225.391H425.391V237.109H437.109V225.391ZM425 225V237.5H437.5V225H425Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 225.391H437.891V237.109H449.609V225.391ZM437.5 225V237.5H450V225H437.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 225.391H450.391V237.109H462.109V225.391ZM450 225V237.5H462.5V225H450Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 225.391H462.891V237.109H474.609V225.391ZM462.5 225V237.5H475V225H462.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 225.391H475.391V237.109H487.109V225.391ZM475 225V237.5H487.5V225H475Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 225.391H487.891V237.109H499.609V225.391ZM487.5 225V237.5H500V225H487.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 225.391H500.391V237.109H512.109V225.391ZM500 225V237.5H512.5V225H500Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 225.391H512.891V237.109H524.609V225.391ZM512.5 225V237.5H525V225H512.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 225.391H525.391V237.109H537.109V225.391ZM525 225V237.5H537.5V225H525Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 225.391H537.891V237.109H549.609V225.391ZM537.5 225V237.5H550V225H537.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 225.391H550.391V237.109H562.109V225.391ZM550 225V237.5H562.5V225H550Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 225.391H562.891V237.109H574.609V225.391ZM562.5 225V237.5H575V225H562.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 225.391H575.391V237.109H587.109V225.391ZM575 225V237.5H587.5V225H575Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 225.391H587.891V237.109H599.609V225.391ZM587.5 225V237.5H600V225H587.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 237.891H0.390625V249.609H12.1094V237.891ZM0 237.5V250H12.5V237.5H0Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 237.891H12.8906V249.609H24.6094V237.891ZM12.5 237.5V250H25V237.5H12.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 237.891H25.3906V249.609H37.1094V237.891ZM25 237.5V250H37.5V237.5H25Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 237.891H37.8906V249.609H49.6094V237.891ZM37.5 237.5V250H50V237.5H37.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 237.891H50.3906V249.609H62.1094V237.891ZM50 237.5V250H62.5V237.5H50Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 237.891H62.8906V249.609H74.6094V237.891ZM62.5 237.5V250H75V237.5H62.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 237.891H75.3906V249.609H87.1094V237.891ZM75 237.5V250H87.5V237.5H75Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 237.891H87.8906V249.609H99.6094V237.891ZM87.5 237.5V250H100V237.5H87.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 237.891H100.391V249.609H112.109V237.891ZM100 237.5V250H112.5V237.5H100Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 237.891H112.891V249.609H124.609V237.891ZM112.5 237.5V250H125V237.5H112.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 237.891H125.391V249.609H137.109V237.891ZM125 237.5V250H137.5V237.5H125Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 237.891H137.891V249.609H149.609V237.891ZM137.5 237.5V250H150V237.5H137.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 237.891H150.391V249.609H162.109V237.891ZM150 237.5V250H162.5V237.5H150Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 237.891H162.891V249.609H174.609V237.891ZM162.5 237.5V250H175V237.5H162.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 237.891H175.391V249.609H187.109V237.891ZM175 237.5V250H187.5V237.5H175Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 237.891H187.891V249.609H199.609V237.891ZM187.5 237.5V250H200V237.5H187.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 237.891H200.391V249.609H212.109V237.891ZM200 237.5V250H212.5V237.5H200Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 237.891H212.891V249.609H224.609V237.891ZM212.5 237.5V250H225V237.5H212.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 237.891H225.391V249.609H237.109V237.891ZM225 237.5V250H237.5V237.5H225Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 237.891H237.891V249.609H249.609V237.891ZM237.5 237.5V250H250V237.5H237.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 237.891H250.391V249.609H262.109V237.891ZM250 237.5V250H262.5V237.5H250Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 237.891H262.891V249.609H274.609V237.891ZM262.5 237.5V250H275V237.5H262.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 237.891H275.391V249.609H287.109V237.891ZM275 237.5V250H287.5V237.5H275Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 237.891H287.891V249.609H299.609V237.891ZM287.5 237.5V250H300V237.5H287.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 237.891H300.391V249.609H312.109V237.891ZM300 237.5V250H312.5V237.5H300Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 237.891H312.891V249.609H324.609V237.891ZM312.5 237.5V250H325V237.5H312.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 237.891H325.391V249.609H337.109V237.891ZM325 237.5V250H337.5V237.5H325Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 237.891H337.891V249.609H349.609V237.891ZM337.5 237.5V250H350V237.5H337.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 237.891H350.391V249.609H362.109V237.891ZM350 237.5V250H362.5V237.5H350Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 237.891H362.891V249.609H374.609V237.891ZM362.5 237.5V250H375V237.5H362.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 237.891H375.391V249.609H387.109V237.891ZM375 237.5V250H387.5V237.5H375Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 237.891H387.891V249.609H399.609V237.891ZM387.5 237.5V250H400V237.5H387.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 237.891H400.391V249.609H412.109V237.891ZM400 237.5V250H412.5V237.5H400Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 237.891H412.891V249.609H424.609V237.891ZM412.5 237.5V250H425V237.5H412.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 237.891H425.391V249.609H437.109V237.891ZM425 237.5V250H437.5V237.5H425Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 237.891H437.891V249.609H449.609V237.891ZM437.5 237.5V250H450V237.5H437.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 237.891H450.391V249.609H462.109V237.891ZM450 237.5V250H462.5V237.5H450Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 237.891H462.891V249.609H474.609V237.891ZM462.5 237.5V250H475V237.5H462.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 237.891H475.391V249.609H487.109V237.891ZM475 237.5V250H487.5V237.5H475Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 237.891H487.891V249.609H499.609V237.891ZM487.5 237.5V250H500V237.5H487.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 237.891H500.391V249.609H512.109V237.891ZM500 237.5V250H512.5V237.5H500Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 237.891H512.891V249.609H524.609V237.891ZM512.5 237.5V250H525V237.5H512.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 237.891H525.391V249.609H537.109V237.891ZM525 237.5V250H537.5V237.5H525Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 237.891H537.891V249.609H549.609V237.891ZM537.5 237.5V250H550V237.5H537.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 237.891H550.391V249.609H562.109V237.891ZM550 237.5V250H562.5V237.5H550Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 237.891H562.891V249.609H574.609V237.891ZM562.5 237.5V250H575V237.5H562.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 237.891H575.391V249.609H587.109V237.891ZM575 237.5V250H587.5V237.5H575Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 237.891H587.891V249.609H599.609V237.891ZM587.5 237.5V250H600V237.5H587.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 250.391H0.390625V262.109H12.1094V250.391ZM0 250V262.5H12.5V250H0Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 250.391H12.8906V262.109H24.6094V250.391ZM12.5 250V262.5H25V250H12.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 250.391H25.3906V262.109H37.1094V250.391ZM25 250V262.5H37.5V250H25Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 250.391H37.8906V262.109H49.6094V250.391ZM37.5 250V262.5H50V250H37.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 250.391H50.3906V262.109H62.1094V250.391ZM50 250V262.5H62.5V250H50Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 250.391H62.8906V262.109H74.6094V250.391ZM62.5 250V262.5H75V250H62.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 250.391H75.3906V262.109H87.1094V250.391ZM75 250V262.5H87.5V250H75Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 250.391H87.8906V262.109H99.6094V250.391ZM87.5 250V262.5H100V250H87.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 250.391H100.391V262.109H112.109V250.391ZM100 250V262.5H112.5V250H100Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 250.391H112.891V262.109H124.609V250.391ZM112.5 250V262.5H125V250H112.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 250.391H125.391V262.109H137.109V250.391ZM125 250V262.5H137.5V250H125Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 250.391H137.891V262.109H149.609V250.391ZM137.5 250V262.5H150V250H137.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 250.391H150.391V262.109H162.109V250.391ZM150 250V262.5H162.5V250H150Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 250.391H162.891V262.109H174.609V250.391ZM162.5 250V262.5H175V250H162.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 250.391H175.391V262.109H187.109V250.391ZM175 250V262.5H187.5V250H175Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 250.391H187.891V262.109H199.609V250.391ZM187.5 250V262.5H200V250H187.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 250.391H200.391V262.109H212.109V250.391ZM200 250V262.5H212.5V250H200Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 250.391H212.891V262.109H224.609V250.391ZM212.5 250V262.5H225V250H212.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 250.391H225.391V262.109H237.109V250.391ZM225 250V262.5H237.5V250H225Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 250.391H237.891V262.109H249.609V250.391ZM237.5 250V262.5H250V250H237.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 250.391H250.391V262.109H262.109V250.391ZM250 250V262.5H262.5V250H250Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 250.391H262.891V262.109H274.609V250.391ZM262.5 250V262.5H275V250H262.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 250.391H275.391V262.109H287.109V250.391ZM275 250V262.5H287.5V250H275Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 250.391H287.891V262.109H299.609V250.391ZM287.5 250V262.5H300V250H287.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 250.391H300.391V262.109H312.109V250.391ZM300 250V262.5H312.5V250H300Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 250.391H312.891V262.109H324.609V250.391ZM312.5 250V262.5H325V250H312.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 250.391H325.391V262.109H337.109V250.391ZM325 250V262.5H337.5V250H325Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 250.391H337.891V262.109H349.609V250.391ZM337.5 250V262.5H350V250H337.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 250.391H350.391V262.109H362.109V250.391ZM350 250V262.5H362.5V250H350Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 250.391H362.891V262.109H374.609V250.391ZM362.5 250V262.5H375V250H362.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 250.391H375.391V262.109H387.109V250.391ZM375 250V262.5H387.5V250H375Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 250.391H387.891V262.109H399.609V250.391ZM387.5 250V262.5H400V250H387.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 250.391H400.391V262.109H412.109V250.391ZM400 250V262.5H412.5V250H400Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 250.391H412.891V262.109H424.609V250.391ZM412.5 250V262.5H425V250H412.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 250.391H425.391V262.109H437.109V250.391ZM425 250V262.5H437.5V250H425Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 250.391H437.891V262.109H449.609V250.391ZM437.5 250V262.5H450V250H437.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 250.391H450.391V262.109H462.109V250.391ZM450 250V262.5H462.5V250H450Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 250.391H462.891V262.109H474.609V250.391ZM462.5 250V262.5H475V250H462.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 250.391H475.391V262.109H487.109V250.391ZM475 250V262.5H487.5V250H475Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 250.391H487.891V262.109H499.609V250.391ZM487.5 250V262.5H500V250H487.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 250.391H500.391V262.109H512.109V250.391ZM500 250V262.5H512.5V250H500Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 250.391H512.891V262.109H524.609V250.391ZM512.5 250V262.5H525V250H512.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 250.391H525.391V262.109H537.109V250.391ZM525 250V262.5H537.5V250H525Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 250.391H537.891V262.109H549.609V250.391ZM537.5 250V262.5H550V250H537.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 250.391H550.391V262.109H562.109V250.391ZM550 250V262.5H562.5V250H550Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 250.391H562.891V262.109H574.609V250.391ZM562.5 250V262.5H575V250H562.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 250.391H575.391V262.109H587.109V250.391ZM575 250V262.5H587.5V250H575Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 250.391H587.891V262.109H599.609V250.391ZM587.5 250V262.5H600V250H587.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 262.891H0.390625V274.609H12.1094V262.891ZM0 262.5V275H12.5V262.5H0Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 262.891H12.8906V274.609H24.6094V262.891ZM12.5 262.5V275H25V262.5H12.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 262.891H25.3906V274.609H37.1094V262.891ZM25 262.5V275H37.5V262.5H25Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 262.891H37.8906V274.609H49.6094V262.891ZM37.5 262.5V275H50V262.5H37.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 262.891H50.3906V274.609H62.1094V262.891ZM50 262.5V275H62.5V262.5H50Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 262.891H62.8906V274.609H74.6094V262.891ZM62.5 262.5V275H75V262.5H62.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 262.891H75.3906V274.609H87.1094V262.891ZM75 262.5V275H87.5V262.5H75Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 262.891H87.8906V274.609H99.6094V262.891ZM87.5 262.5V275H100V262.5H87.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 262.891H100.391V274.609H112.109V262.891ZM100 262.5V275H112.5V262.5H100Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 262.891H112.891V274.609H124.609V262.891ZM112.5 262.5V275H125V262.5H112.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 262.891H125.391V274.609H137.109V262.891ZM125 262.5V275H137.5V262.5H125Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 262.891H137.891V274.609H149.609V262.891ZM137.5 262.5V275H150V262.5H137.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 262.891H150.391V274.609H162.109V262.891ZM150 262.5V275H162.5V262.5H150Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 262.891H162.891V274.609H174.609V262.891ZM162.5 262.5V275H175V262.5H162.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 262.891H175.391V274.609H187.109V262.891ZM175 262.5V275H187.5V262.5H175Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 262.891H187.891V274.609H199.609V262.891ZM187.5 262.5V275H200V262.5H187.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 262.891H200.391V274.609H212.109V262.891ZM200 262.5V275H212.5V262.5H200Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 262.891H212.891V274.609H224.609V262.891ZM212.5 262.5V275H225V262.5H212.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 262.891H225.391V274.609H237.109V262.891ZM225 262.5V275H237.5V262.5H225Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 262.891H237.891V274.609H249.609V262.891ZM237.5 262.5V275H250V262.5H237.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 262.891H250.391V274.609H262.109V262.891ZM250 262.5V275H262.5V262.5H250Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 262.891H262.891V274.609H274.609V262.891ZM262.5 262.5V275H275V262.5H262.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 262.891H275.391V274.609H287.109V262.891ZM275 262.5V275H287.5V262.5H275Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 262.891H287.891V274.609H299.609V262.891ZM287.5 262.5V275H300V262.5H287.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 262.891H300.391V274.609H312.109V262.891ZM300 262.5V275H312.5V262.5H300Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 262.891H312.891V274.609H324.609V262.891ZM312.5 262.5V275H325V262.5H312.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 262.891H325.391V274.609H337.109V262.891ZM325 262.5V275H337.5V262.5H325Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 262.891H337.891V274.609H349.609V262.891ZM337.5 262.5V275H350V262.5H337.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 262.891H350.391V274.609H362.109V262.891ZM350 262.5V275H362.5V262.5H350Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 262.891H362.891V274.609H374.609V262.891ZM362.5 262.5V275H375V262.5H362.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 262.891H375.391V274.609H387.109V262.891ZM375 262.5V275H387.5V262.5H375Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 262.891H387.891V274.609H399.609V262.891ZM387.5 262.5V275H400V262.5H387.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 262.891H400.391V274.609H412.109V262.891ZM400 262.5V275H412.5V262.5H400Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 262.891H412.891V274.609H424.609V262.891ZM412.5 262.5V275H425V262.5H412.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 262.891H425.391V274.609H437.109V262.891ZM425 262.5V275H437.5V262.5H425Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 262.891H437.891V274.609H449.609V262.891ZM437.5 262.5V275H450V262.5H437.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 262.891H450.391V274.609H462.109V262.891ZM450 262.5V275H462.5V262.5H450Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 262.891H462.891V274.609H474.609V262.891ZM462.5 262.5V275H475V262.5H462.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 262.891H475.391V274.609H487.109V262.891ZM475 262.5V275H487.5V262.5H475Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 262.891H487.891V274.609H499.609V262.891ZM487.5 262.5V275H500V262.5H487.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 262.891H500.391V274.609H512.109V262.891ZM500 262.5V275H512.5V262.5H500Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 262.891H512.891V274.609H524.609V262.891ZM512.5 262.5V275H525V262.5H512.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 262.891H525.391V274.609H537.109V262.891ZM525 262.5V275H537.5V262.5H525Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 262.891H537.891V274.609H549.609V262.891ZM537.5 262.5V275H550V262.5H537.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 262.891H550.391V274.609H562.109V262.891ZM550 262.5V275H562.5V262.5H550Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 262.891H562.891V274.609H574.609V262.891ZM562.5 262.5V275H575V262.5H562.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 262.891H575.391V274.609H587.109V262.891ZM575 262.5V275H587.5V262.5H575Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 262.891H587.891V274.609H599.609V262.891ZM587.5 262.5V275H600V262.5H587.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 275.391H0.390625V287.109H12.1094V275.391ZM0 275V287.5H12.5V275H0Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 275.391H12.8906V287.109H24.6094V275.391ZM12.5 275V287.5H25V275H12.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 275.391H25.3906V287.109H37.1094V275.391ZM25 275V287.5H37.5V275H25Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 275.391H37.8906V287.109H49.6094V275.391ZM37.5 275V287.5H50V275H37.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 275.391H50.3906V287.109H62.1094V275.391ZM50 275V287.5H62.5V275H50Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 275.391H62.8906V287.109H74.6094V275.391ZM62.5 275V287.5H75V275H62.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 275.391H75.3906V287.109H87.1094V275.391ZM75 275V287.5H87.5V275H75Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 275.391H87.8906V287.109H99.6094V275.391ZM87.5 275V287.5H100V275H87.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 275.391H100.391V287.109H112.109V275.391ZM100 275V287.5H112.5V275H100Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 275.391H112.891V287.109H124.609V275.391ZM112.5 275V287.5H125V275H112.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 275.391H125.391V287.109H137.109V275.391ZM125 275V287.5H137.5V275H125Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 275.391H137.891V287.109H149.609V275.391ZM137.5 275V287.5H150V275H137.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 275.391H150.391V287.109H162.109V275.391ZM150 275V287.5H162.5V275H150Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 275.391H162.891V287.109H174.609V275.391ZM162.5 275V287.5H175V275H162.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 275.391H175.391V287.109H187.109V275.391ZM175 275V287.5H187.5V275H175Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 275.391H187.891V287.109H199.609V275.391ZM187.5 275V287.5H200V275H187.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 275.391H200.391V287.109H212.109V275.391ZM200 275V287.5H212.5V275H200Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 275.391H212.891V287.109H224.609V275.391ZM212.5 275V287.5H225V275H212.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 275.391H225.391V287.109H237.109V275.391ZM225 275V287.5H237.5V275H225Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 275.391H237.891V287.109H249.609V275.391ZM237.5 275V287.5H250V275H237.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 275.391H250.391V287.109H262.109V275.391ZM250 275V287.5H262.5V275H250Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 275.391H262.891V287.109H274.609V275.391ZM262.5 275V287.5H275V275H262.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 275.391H275.391V287.109H287.109V275.391ZM275 275V287.5H287.5V275H275Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 275.391H287.891V287.109H299.609V275.391ZM287.5 275V287.5H300V275H287.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 275.391H300.391V287.109H312.109V275.391ZM300 275V287.5H312.5V275H300Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 275.391H312.891V287.109H324.609V275.391ZM312.5 275V287.5H325V275H312.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 275.391H325.391V287.109H337.109V275.391ZM325 275V287.5H337.5V275H325Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 275.391H337.891V287.109H349.609V275.391ZM337.5 275V287.5H350V275H337.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 275.391H350.391V287.109H362.109V275.391ZM350 275V287.5H362.5V275H350Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 275.391H362.891V287.109H374.609V275.391ZM362.5 275V287.5H375V275H362.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 275.391H375.391V287.109H387.109V275.391ZM375 275V287.5H387.5V275H375Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 275.391H387.891V287.109H399.609V275.391ZM387.5 275V287.5H400V275H387.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 275.391H400.391V287.109H412.109V275.391ZM400 275V287.5H412.5V275H400Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 275.391H412.891V287.109H424.609V275.391ZM412.5 275V287.5H425V275H412.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 275.391H425.391V287.109H437.109V275.391ZM425 275V287.5H437.5V275H425Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 275.391H437.891V287.109H449.609V275.391ZM437.5 275V287.5H450V275H437.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 275.391H450.391V287.109H462.109V275.391ZM450 275V287.5H462.5V275H450Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 275.391H462.891V287.109H474.609V275.391ZM462.5 275V287.5H475V275H462.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 275.391H475.391V287.109H487.109V275.391ZM475 275V287.5H487.5V275H475Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 275.391H487.891V287.109H499.609V275.391ZM487.5 275V287.5H500V275H487.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 275.391H500.391V287.109H512.109V275.391ZM500 275V287.5H512.5V275H500Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 275.391H512.891V287.109H524.609V275.391ZM512.5 275V287.5H525V275H512.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 275.391H525.391V287.109H537.109V275.391ZM525 275V287.5H537.5V275H525Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 275.391H537.891V287.109H549.609V275.391ZM537.5 275V287.5H550V275H537.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 275.391H550.391V287.109H562.109V275.391ZM550 275V287.5H562.5V275H550Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 275.391H562.891V287.109H574.609V275.391ZM562.5 275V287.5H575V275H562.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 275.391H575.391V287.109H587.109V275.391ZM575 275V287.5H587.5V275H575Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 275.391H587.891V287.109H599.609V275.391ZM587.5 275V287.5H600V275H587.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 287.891H0.390625V299.609H12.1094V287.891ZM0 287.5V300H12.5V287.5H0Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 287.891H12.8906V299.609H24.6094V287.891ZM12.5 287.5V300H25V287.5H12.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 287.891H25.3906V299.609H37.1094V287.891ZM25 287.5V300H37.5V287.5H25Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 287.891H37.8906V299.609H49.6094V287.891ZM37.5 287.5V300H50V287.5H37.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 287.891H50.3906V299.609H62.1094V287.891ZM50 287.5V300H62.5V287.5H50Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 287.891H62.8906V299.609H74.6094V287.891ZM62.5 287.5V300H75V287.5H62.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 287.891H75.3906V299.609H87.1094V287.891ZM75 287.5V300H87.5V287.5H75Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 287.891H87.8906V299.609H99.6094V287.891ZM87.5 287.5V300H100V287.5H87.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 287.891H100.391V299.609H112.109V287.891ZM100 287.5V300H112.5V287.5H100Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 287.891H112.891V299.609H124.609V287.891ZM112.5 287.5V300H125V287.5H112.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 287.891H125.391V299.609H137.109V287.891ZM125 287.5V300H137.5V287.5H125Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 287.891H137.891V299.609H149.609V287.891ZM137.5 287.5V300H150V287.5H137.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 287.891H150.391V299.609H162.109V287.891ZM150 287.5V300H162.5V287.5H150Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 287.891H162.891V299.609H174.609V287.891ZM162.5 287.5V300H175V287.5H162.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 287.891H175.391V299.609H187.109V287.891ZM175 287.5V300H187.5V287.5H175Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 287.891H187.891V299.609H199.609V287.891ZM187.5 287.5V300H200V287.5H187.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 287.891H200.391V299.609H212.109V287.891ZM200 287.5V300H212.5V287.5H200Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 287.891H212.891V299.609H224.609V287.891ZM212.5 287.5V300H225V287.5H212.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 287.891H225.391V299.609H237.109V287.891ZM225 287.5V300H237.5V287.5H225Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 287.891H237.891V299.609H249.609V287.891ZM237.5 287.5V300H250V287.5H237.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 287.891H250.391V299.609H262.109V287.891ZM250 287.5V300H262.5V287.5H250Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 287.891H262.891V299.609H274.609V287.891ZM262.5 287.5V300H275V287.5H262.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 287.891H275.391V299.609H287.109V287.891ZM275 287.5V300H287.5V287.5H275Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 287.891H287.891V299.609H299.609V287.891ZM287.5 287.5V300H300V287.5H287.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 287.891H300.391V299.609H312.109V287.891ZM300 287.5V300H312.5V287.5H300Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 287.891H312.891V299.609H324.609V287.891ZM312.5 287.5V300H325V287.5H312.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 287.891H325.391V299.609H337.109V287.891ZM325 287.5V300H337.5V287.5H325Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 287.891H337.891V299.609H349.609V287.891ZM337.5 287.5V300H350V287.5H337.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 287.891H350.391V299.609H362.109V287.891ZM350 287.5V300H362.5V287.5H350Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 287.891H362.891V299.609H374.609V287.891ZM362.5 287.5V300H375V287.5H362.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 287.891H375.391V299.609H387.109V287.891ZM375 287.5V300H387.5V287.5H375Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 287.891H387.891V299.609H399.609V287.891ZM387.5 287.5V300H400V287.5H387.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 287.891H400.391V299.609H412.109V287.891ZM400 287.5V300H412.5V287.5H400Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 287.891H412.891V299.609H424.609V287.891ZM412.5 287.5V300H425V287.5H412.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 287.891H425.391V299.609H437.109V287.891ZM425 287.5V300H437.5V287.5H425Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 287.891H437.891V299.609H449.609V287.891ZM437.5 287.5V300H450V287.5H437.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 287.891H450.391V299.609H462.109V287.891ZM450 287.5V300H462.5V287.5H450Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 287.891H462.891V299.609H474.609V287.891ZM462.5 287.5V300H475V287.5H462.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 287.891H475.391V299.609H487.109V287.891ZM475 287.5V300H487.5V287.5H475Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 287.891H487.891V299.609H499.609V287.891ZM487.5 287.5V300H500V287.5H487.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 287.891H500.391V299.609H512.109V287.891ZM500 287.5V300H512.5V287.5H500Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 287.891H512.891V299.609H524.609V287.891ZM512.5 287.5V300H525V287.5H512.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 287.891H525.391V299.609H537.109V287.891ZM525 287.5V300H537.5V287.5H525Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 287.891H537.891V299.609H549.609V287.891ZM537.5 287.5V300H550V287.5H537.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 287.891H550.391V299.609H562.109V287.891ZM550 287.5V300H562.5V287.5H550Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 287.891H562.891V299.609H574.609V287.891ZM562.5 287.5V300H575V287.5H562.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 287.891H575.391V299.609H587.109V287.891ZM575 287.5V300H587.5V287.5H575Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 287.891H587.891V299.609H599.609V287.891ZM587.5 287.5V300H600V287.5H587.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 300.391H0.390625V312.109H12.1094V300.391ZM0 300V312.5H12.5V300H0Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 300.391H12.8906V312.109H24.6094V300.391ZM12.5 300V312.5H25V300H12.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 300.391H25.3906V312.109H37.1094V300.391ZM25 300V312.5H37.5V300H25Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 300.391H37.8906V312.109H49.6094V300.391ZM37.5 300V312.5H50V300H37.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 300.391H50.3906V312.109H62.1094V300.391ZM50 300V312.5H62.5V300H50Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 300.391H62.8906V312.109H74.6094V300.391ZM62.5 300V312.5H75V300H62.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 300.391H75.3906V312.109H87.1094V300.391ZM75 300V312.5H87.5V300H75Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 300.391H87.8906V312.109H99.6094V300.391ZM87.5 300V312.5H100V300H87.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 300.391H100.391V312.109H112.109V300.391ZM100 300V312.5H112.5V300H100Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 300.391H112.891V312.109H124.609V300.391ZM112.5 300V312.5H125V300H112.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 300.391H125.391V312.109H137.109V300.391ZM125 300V312.5H137.5V300H125Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 300.391H137.891V312.109H149.609V300.391ZM137.5 300V312.5H150V300H137.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 300.391H150.391V312.109H162.109V300.391ZM150 300V312.5H162.5V300H150Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 300.391H162.891V312.109H174.609V300.391ZM162.5 300V312.5H175V300H162.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 300.391H175.391V312.109H187.109V300.391ZM175 300V312.5H187.5V300H175Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 300.391H187.891V312.109H199.609V300.391ZM187.5 300V312.5H200V300H187.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 300.391H200.391V312.109H212.109V300.391ZM200 300V312.5H212.5V300H200Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 300.391H212.891V312.109H224.609V300.391ZM212.5 300V312.5H225V300H212.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 300.391H225.391V312.109H237.109V300.391ZM225 300V312.5H237.5V300H225Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 300.391H237.891V312.109H249.609V300.391ZM237.5 300V312.5H250V300H237.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 300.391H250.391V312.109H262.109V300.391ZM250 300V312.5H262.5V300H250Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 300.391H262.891V312.109H274.609V300.391ZM262.5 300V312.5H275V300H262.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 300.391H275.391V312.109H287.109V300.391ZM275 300V312.5H287.5V300H275Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 300.391H287.891V312.109H299.609V300.391ZM287.5 300V312.5H300V300H287.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 300.391H300.391V312.109H312.109V300.391ZM300 300V312.5H312.5V300H300Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 300.391H312.891V312.109H324.609V300.391ZM312.5 300V312.5H325V300H312.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 300.391H325.391V312.109H337.109V300.391ZM325 300V312.5H337.5V300H325Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 300.391H337.891V312.109H349.609V300.391ZM337.5 300V312.5H350V300H337.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 300.391H350.391V312.109H362.109V300.391ZM350 300V312.5H362.5V300H350Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 300.391H362.891V312.109H374.609V300.391ZM362.5 300V312.5H375V300H362.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 300.391H375.391V312.109H387.109V300.391ZM375 300V312.5H387.5V300H375Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 300.391H387.891V312.109H399.609V300.391ZM387.5 300V312.5H400V300H387.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 300.391H400.391V312.109H412.109V300.391ZM400 300V312.5H412.5V300H400Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 300.391H412.891V312.109H424.609V300.391ZM412.5 300V312.5H425V300H412.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 300.391H425.391V312.109H437.109V300.391ZM425 300V312.5H437.5V300H425Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 300.391H437.891V312.109H449.609V300.391ZM437.5 300V312.5H450V300H437.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 300.391H450.391V312.109H462.109V300.391ZM450 300V312.5H462.5V300H450Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 300.391H462.891V312.109H474.609V300.391ZM462.5 300V312.5H475V300H462.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 300.391H475.391V312.109H487.109V300.391ZM475 300V312.5H487.5V300H475Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 300.391H487.891V312.109H499.609V300.391ZM487.5 300V312.5H500V300H487.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 300.391H500.391V312.109H512.109V300.391ZM500 300V312.5H512.5V300H500Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 300.391H512.891V312.109H524.609V300.391ZM512.5 300V312.5H525V300H512.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 300.391H525.391V312.109H537.109V300.391ZM525 300V312.5H537.5V300H525Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 300.391H537.891V312.109H549.609V300.391ZM537.5 300V312.5H550V300H537.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 300.391H550.391V312.109H562.109V300.391ZM550 300V312.5H562.5V300H550Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 300.391H562.891V312.109H574.609V300.391ZM562.5 300V312.5H575V300H562.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 300.391H575.391V312.109H587.109V300.391ZM575 300V312.5H587.5V300H575Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 300.391H587.891V312.109H599.609V300.391ZM587.5 300V312.5H600V300H587.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1094 312.891H0.390625V324.609H12.1094V312.891ZM0 312.5V325H12.5V312.5H0Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6094 312.891H12.8906V324.609H24.6094V312.891ZM12.5 312.5V325H25V312.5H12.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M37.1094 312.891H25.3906V324.609H37.1094V312.891ZM25 312.5V325H37.5V312.5H25Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M49.6094 312.891H37.8906V324.609H49.6094V312.891ZM37.5 312.5V325H50V312.5H37.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M62.1094 312.891H50.3906V324.609H62.1094V312.891ZM50 312.5V325H62.5V312.5H50Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M74.6094 312.891H62.8906V324.609H74.6094V312.891ZM62.5 312.5V325H75V312.5H62.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M87.1094 312.891H75.3906V324.609H87.1094V312.891ZM75 312.5V325H87.5V312.5H75Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6094 312.891H87.8906V324.609H99.6094V312.891ZM87.5 312.5V325H100V312.5H87.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 312.891H100.391V324.609H112.109V312.891ZM100 312.5V325H112.5V312.5H100Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M124.609 312.891H112.891V324.609H124.609V312.891ZM112.5 312.5V325H125V312.5H112.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M137.109 312.891H125.391V324.609H137.109V312.891ZM125 312.5V325H137.5V312.5H125Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M149.609 312.891H137.891V324.609H149.609V312.891ZM137.5 312.5V325H150V312.5H137.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M162.109 312.891H150.391V324.609H162.109V312.891ZM150 312.5V325H162.5V312.5H150Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M174.609 312.891H162.891V324.609H174.609V312.891ZM162.5 312.5V325H175V312.5H162.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M187.109 312.891H175.391V324.609H187.109V312.891ZM175 312.5V325H187.5V312.5H175Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M199.609 312.891H187.891V324.609H199.609V312.891ZM187.5 312.5V325H200V312.5H187.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M212.109 312.891H200.391V324.609H212.109V312.891ZM200 312.5V325H212.5V312.5H200Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M224.609 312.891H212.891V324.609H224.609V312.891ZM212.5 312.5V325H225V312.5H212.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M237.109 312.891H225.391V324.609H237.109V312.891ZM225 312.5V325H237.5V312.5H225Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M249.609 312.891H237.891V324.609H249.609V312.891ZM237.5 312.5V325H250V312.5H237.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M262.109 312.891H250.391V324.609H262.109V312.891ZM250 312.5V325H262.5V312.5H250Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M274.609 312.891H262.891V324.609H274.609V312.891ZM262.5 312.5V325H275V312.5H262.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M287.109 312.891H275.391V324.609H287.109V312.891ZM275 312.5V325H287.5V312.5H275Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M299.609 312.891H287.891V324.609H299.609V312.891ZM287.5 312.5V325H300V312.5H287.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M312.109 312.891H300.391V324.609H312.109V312.891ZM300 312.5V325H312.5V312.5H300Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M324.609 312.891H312.891V324.609H324.609V312.891ZM312.5 312.5V325H325V312.5H312.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M337.109 312.891H325.391V324.609H337.109V312.891ZM325 312.5V325H337.5V312.5H325Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M349.609 312.891H337.891V324.609H349.609V312.891ZM337.5 312.5V325H350V312.5H337.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M362.109 312.891H350.391V324.609H362.109V312.891ZM350 312.5V325H362.5V312.5H350Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M374.609 312.891H362.891V324.609H374.609V312.891ZM362.5 312.5V325H375V312.5H362.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M387.109 312.891H375.391V324.609H387.109V312.891ZM375 312.5V325H387.5V312.5H375Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M399.609 312.891H387.891V324.609H399.609V312.891ZM387.5 312.5V325H400V312.5H387.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M412.109 312.891H400.391V324.609H412.109V312.891ZM400 312.5V325H412.5V312.5H400Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M424.609 312.891H412.891V324.609H424.609V312.891ZM412.5 312.5V325H425V312.5H412.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M437.109 312.891H425.391V324.609H437.109V312.891ZM425 312.5V325H437.5V312.5H425Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M449.609 312.891H437.891V324.609H449.609V312.891ZM437.5 312.5V325H450V312.5H437.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M462.109 312.891H450.391V324.609H462.109V312.891ZM450 312.5V325H462.5V312.5H450Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M474.609 312.891H462.891V324.609H474.609V312.891ZM462.5 312.5V325H475V312.5H462.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M487.109 312.891H475.391V324.609H487.109V312.891ZM475 312.5V325H487.5V312.5H475Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M499.609 312.891H487.891V324.609H499.609V312.891ZM487.5 312.5V325H500V312.5H487.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M512.109 312.891H500.391V324.609H512.109V312.891ZM500 312.5V325H512.5V312.5H500Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M524.609 312.891H512.891V324.609H524.609V312.891ZM512.5 312.5V325H525V312.5H512.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M537.109 312.891H525.391V324.609H537.109V312.891ZM525 312.5V325H537.5V312.5H525Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M549.609 312.891H537.891V324.609H549.609V312.891ZM537.5 312.5V325H550V312.5H537.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M562.109 312.891H550.391V324.609H562.109V312.891ZM550 312.5V325H562.5V312.5H550Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M574.609 312.891H562.891V324.609H574.609V312.891ZM562.5 312.5V325H575V312.5H562.5Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M587.109 312.891H575.391V324.609H587.109V312.891ZM575 312.5V325H587.5V312.5H575Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M599.609 312.891H587.891V324.609H599.609V312.891ZM587.5 312.5V325H600V312.5H587.5Z" fill="black"/>
-</g>
-<defs>
-<clipPath id="clip0_2906_6463">
-<rect width="515" height="126" fill="white"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/assets/images/acp_logo.svg b/assets/images/acp_logo.svg
deleted file mode 100644
index efaa46707b..0000000000
--- a/assets/images/acp_logo.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="160" height="61" fill="none"><g clip-path="url(#a)"><path fill="#000" d="M130.75.385c5.428 0 10.297 2.81 13.011 7.511l14.214 24.618-.013-.005c2.599 4.504 2.707 9.932.28 14.513-2.618 4.944-7.862 8.015-13.679 8.015h-31.811c-.452 0-.873-.242-1.103-.637a1.268 1.268 0 0 1 0-1.274l3.919-6.78c.223-.394.65-.636 1.102-.636h28.288a5.622 5.622 0 0 0 4.925-2.849 5.615 5.615 0 0 0 0-5.69l-14.214-24.617a5.621 5.621 0 0 0-4.925-2.848 5.621 5.621 0 0 0-4.925 2.848l-14.214 24.618a6.267 6.267 0 0 0-.319.643.998.998 0 0 1-.069.14L101.724 54.4l-.823 1.313-2.529 4.39a1.27 1.27 0 0 1-1.103.636h-7.83c-.452 0-.873-.242-1.102-.637-.23-.394-.23-.879 0-1.274l2.188-3.791H66.803c-3.32 0-6.454-1.122-8.818-3.167a17.141 17.141 0 0 1-3.394-3.96 1.261 1.261 0 0 1-.091-.137L34.2 12.573a5.622 5.622 0 0 0-4.925-2.849 5.621 5.621 0 0 0-4.924 2.85L10.137 37.19a5.615 5.615 0 0 0 0 5.69 5.63 5.63 0 0 0 4.925 2.841h29.862a1.276 1.276 0 0 1 1.102 1.912l-3.912 6.778a1.27 1.27 0 0 1-1.102.638H14.495c-3.32 0-6.454-1.128-8.817-3.173-5.906-5.104-7.36-12.883-3.62-19.363L16.267 7.89C18.872 3.385 23.517.583 28.697.39c.184-.006.356-.006.534-.006 5.378 0 10.45 3.007 13.246 7.85l12.986 22.372L68.58 7.891C71.186 3.385 75.83.582 81.01.39c.185-.006.358-.006.536-.006 4.453 0 8.71 2.039 11.672 5.588.337.407.388.98.127 1.446l-3.765 6.6a1.268 1.268 0 0 1-2.205.006l-.847-1.465a5.623 5.623 0 0 0-4.926-2.848 5.622 5.622 0 0 0-4.924 2.848L62.464 37.18a5.614 5.614 0 0 0 0 5.689 5.628 5.628 0 0 0 4.925 2.842H95.91L117.76 7.87c2.714-4.683 7.575-7.486 12.99-7.486Z"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 .385h160v60.36H0z"/></clipPath></defs></svg>
diff --git a/assets/images/acp_logo_serif.svg b/assets/images/acp_logo_serif.svg
deleted file mode 100644
index a04d32e51c..0000000000
--- a/assets/images/acp_logo_serif.svg
+++ /dev/null
@@ -1,46 +0,0 @@
-<svg width="257" height="47" viewBox="0 0 257 47" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_100_26)">
-<path d="M119.922 24.4481L109.212 5.8996C107.081 2.20815 103.26 0 98.9973 0C94.7394 0 90.9279 2.19855 88.7918 5.8804L66.6239 44.2734C66.3646 44.7198 66.3646 45.2671 66.6239 45.7135C66.8831 46.1599 67.3583 46.4336 67.8719 46.4336H73.7715C74.2852 46.4336 74.7604 46.1599 75.0196 45.7135L76.9302 42.4013L77.5158 41.4652C77.5158 41.4652 77.535 41.4364 77.5398 41.422L84.6923 29.0324C84.7211 28.9844 84.7499 28.9316 84.7691 28.874C84.8363 28.7203 84.9035 28.5763 84.9851 28.4419L95.6946 9.89347C96.3811 8.70299 97.6148 7.98774 98.9925 7.98774C100.37 7.98774 101.604 8.69819 102.29 9.89347L113 28.4419C113.686 29.6324 113.691 31.0581 113 32.2486C112.313 33.4391 111.08 34.1543 109.702 34.1543H102.232C101.718 34.1543 101.243 34.4279 100.984 34.8744L98.0318 39.9819C97.7726 40.4283 97.7726 40.9756 98.0318 41.422C98.291 41.8684 98.7662 42.1421 99.2799 42.1421H109.404C113.965 42.1421 118.079 39.7275 120.133 35.844C122.039 32.2438 121.957 27.9859 119.912 24.4433L119.922 24.4481Z" fill="white"/>
-<path d="M82.8564 34.1538H104.17L103.872 42.1416H79.9042C79.3905 42.1416 78.9153 41.8679 78.6561 41.4215C78.3969 40.9751 78.3969 40.4278 78.6561 39.9814L81.6083 34.8739C81.8675 34.4274 82.3427 34.1538 82.8564 34.1538Z" fill="url(#paint0_linear_100_26)"/>
-<path d="M43.7123 25.1535C43.7123 24.9039 43.6451 24.659 43.5155 24.443L32.8972 6.14897C30.7131 2.36152 26.7288 -0.000244141 22.5093 -0.000244141C22.3701 -0.000244141 22.2309 -0.000244141 22.0869 0.00935651C18.0162 0.158167 14.368 2.36152 12.323 5.89936L1.61829 24.4478C-1.31951 29.5314 -0.181833 35.6374 4.44568 39.6361C6.31301 41.2538 8.78518 42.1418 11.4062 42.1418H31.3851C31.8987 42.1418 32.374 41.8682 32.6332 41.4218L35.5806 36.3142C35.8398 35.8678 35.8398 35.3206 35.5806 34.8741C35.3214 34.4277 34.8461 34.1541 34.3325 34.1541H11.8334C10.4557 34.1541 9.22201 33.4436 8.53556 32.2532C7.84431 31.0627 7.84431 29.6418 8.53556 28.4465L19.2451 9.89803C19.9315 8.70755 21.1652 7.9923 22.5429 7.9923C23.9206 7.9923 25.1495 8.70275 25.8407 9.89803L41.1346 36.4198C41.461 36.9863 42.1282 37.2599 42.7619 37.0919C43.3955 36.9191 43.8276 36.343 43.8228 35.6902L43.7171 25.1583L43.7123 25.1535Z" fill="url(#paint1_linear_100_26)"/>
-<path d="M4.44544 39.6362C-0.182077 35.6376 -1.31975 29.5315 1.61805 24.448L8.53532 28.4467C7.84407 29.6419 7.84407 31.0628 8.53532 32.2533C9.22176 33.4438 10.4554 34.1543 11.8331 34.1543H34.3323C34.8459 34.1543 35.3211 34.4279 35.5804 34.8743C35.8396 35.3207 35.8396 35.868 35.5804 36.3144L32.633 41.422C32.3737 41.8684 31.8985 42.142 31.3849 42.142H11.4059C8.78493 42.142 6.31276 41.2539 4.44544 39.6362Z" fill="white"/>
-<path d="M74.6308 34.8696C74.3716 34.4231 73.8964 34.1495 73.3827 34.1495H51.2532C49.8755 34.1495 48.6418 33.4391 47.9554 32.2486C47.2642 31.0581 47.2642 29.6372 47.9554 28.4419L58.6649 9.89347C59.3514 8.70299 60.5851 7.98774 61.9628 7.98774C63.3404 7.98774 64.5693 8.69819 65.2606 9.89347L65.899 10.9975C66.1582 11.444 66.6335 11.7176 67.1471 11.7176C67.6607 11.7176 68.1408 11.4392 68.3952 10.9927L71.2322 6.01961C71.5298 5.49637 71.4722 4.84353 71.0882 4.3827C68.7648 1.59851 65.4238 0 61.9291 0C61.7899 0 61.6507 0 61.5067 0.00960065C57.436 0.158411 53.7878 2.36176 51.7429 5.8996L41.0333 24.4481C38.0955 29.5316 39.2332 35.6376 43.8607 39.6363C45.728 41.254 48.2002 42.1421 50.8212 42.1421H70.4257C70.9394 42.1421 71.4146 41.8684 71.6738 41.422L74.626 36.3145C74.8852 35.868 74.8852 35.3208 74.626 34.8744L74.6308 34.8696Z" fill="url(#paint2_linear_100_26)"/>
-</g>
-<path d="M132.976 15.5649V14.6449C133.383 14.6449 133.695 14.5359 133.911 14.3178C134.128 14.0998 134.311 13.8067 134.461 13.4388C134.61 13.0571 134.773 12.6346 134.949 12.1712L139.057 0.865676H139.871L144.325 12.3348C144.434 12.5937 144.556 12.9481 144.692 13.3979C144.827 13.834 144.888 14.2088 144.875 14.5223C145.105 14.495 145.329 14.4814 145.546 14.4814C145.776 14.4678 145.993 14.4541 146.197 14.4405V15.5649H141.254V14.6654C141.729 14.6518 142.041 14.5495 142.19 14.3587C142.352 14.1543 142.413 13.909 142.373 13.6227C142.346 13.3365 142.278 13.0503 142.169 12.7641L141.559 11.1081L136.576 11.2308L135.986 13.0094C135.905 13.282 135.817 13.541 135.722 13.7863C135.627 14.0316 135.532 14.2701 135.437 14.5018C135.681 14.4746 135.939 14.461 136.21 14.461C136.495 14.4473 136.745 14.4337 136.962 14.4201V15.5649H132.976ZM136.942 10.1268H141.213L139.932 6.67178C139.769 6.22201 139.613 5.77906 139.464 5.34292C139.315 4.89315 139.179 4.46382 139.057 4.05494H139.037C138.929 4.39568 138.807 4.77048 138.671 5.17937C138.535 5.58825 138.379 6.0312 138.203 6.50823L136.942 10.1268Z" fill="white"/>
-<path d="M151.397 21.1053C150.204 21.1053 149.241 20.969 148.509 20.6964C147.791 20.4374 147.268 20.0967 146.943 19.6742C146.631 19.2653 146.475 18.8292 146.475 18.3658C146.475 17.9978 146.557 17.657 146.719 17.3436C146.896 17.0301 147.126 16.7507 147.411 16.5054C147.696 16.2737 148.014 16.0897 148.367 15.9534C147.892 15.8034 147.533 15.5922 147.289 15.3196C147.045 15.0334 146.923 14.6858 146.923 14.277C146.923 13.8408 147.092 13.4115 147.431 12.989C147.784 12.5665 148.285 12.2803 148.936 12.1303C148.326 11.8577 147.838 11.4625 147.472 10.9446C147.106 10.4267 146.916 9.81334 146.902 9.10462C146.889 8.28686 147.092 7.57132 147.513 6.95799C147.946 6.34467 148.496 5.86765 149.16 5.52691C149.838 5.18618 150.543 5.01581 151.275 5.01581C151.696 5.01581 152.13 5.07714 152.577 5.19981C153.025 5.30884 153.431 5.48603 153.798 5.73135C153.947 5.3361 154.143 4.97492 154.387 4.64782C154.631 4.32072 154.916 4.06176 155.242 3.87095C155.581 3.68014 155.933 3.58473 156.299 3.58473C156.693 3.58473 156.991 3.68695 157.194 3.89139C157.398 4.09583 157.499 4.36842 157.499 4.70915C157.499 4.81819 157.465 4.95448 157.398 5.11803C157.343 5.26796 157.242 5.39743 157.093 5.50647C156.943 5.6155 156.74 5.67002 156.482 5.67002C156.265 5.67002 156.069 5.60187 155.893 5.46558C155.73 5.31566 155.628 5.13848 155.587 4.93404C155.303 4.98855 155.065 5.15892 154.876 5.44514C154.699 5.71772 154.584 5.99713 154.53 6.28334C154.882 6.59682 155.154 6.97162 155.343 7.40776C155.547 7.83027 155.648 8.28686 155.648 8.77751C155.648 9.55439 155.438 10.2427 155.018 10.8424C154.611 11.4421 154.076 11.9123 153.411 12.253C152.747 12.5937 152.028 12.7641 151.255 12.7641C151.025 12.7641 150.808 12.7505 150.604 12.7232C150.401 12.6823 150.177 12.6619 149.933 12.6619C149.499 12.6619 149.14 12.7641 148.855 12.9685C148.584 13.173 148.482 13.4183 148.55 13.7045C148.618 14.0044 148.902 14.202 149.404 14.2974C149.906 14.3928 150.631 14.461 151.581 14.5018C152.625 14.5427 153.52 14.6722 154.265 14.8903C155.025 15.0947 155.608 15.415 156.015 15.8511C156.435 16.2873 156.645 16.8802 156.645 17.6298C156.645 18.1886 156.489 18.6861 156.177 19.1222C155.879 19.5583 155.472 19.9195 154.957 20.2057C154.455 20.5056 153.892 20.7305 153.269 20.8804C152.645 21.0303 152.021 21.1053 151.397 21.1053ZM151.581 20.1035C152.679 20.1035 153.526 19.8991 154.123 19.4902C154.733 19.0813 155.038 18.6179 155.038 18.1C155.038 17.6638 154.889 17.3231 154.591 17.0778C154.292 16.8461 153.872 16.6757 153.33 16.5667C152.801 16.4713 152.177 16.4168 151.458 16.4031C151.106 16.3759 150.747 16.3554 150.38 16.3418C150.014 16.3282 149.675 16.2941 149.363 16.2396C149.052 16.4577 148.808 16.7234 148.631 17.0369C148.469 17.3504 148.38 17.6775 148.367 18.0182C148.367 18.6452 148.658 19.1494 149.241 19.5311C149.825 19.9127 150.604 20.1035 151.581 20.1035ZM151.316 11.8032C151.777 11.8032 152.157 11.6874 152.455 11.4557C152.767 11.2104 152.998 10.8901 153.147 10.4948C153.309 10.0859 153.391 9.64298 153.391 9.16595C153.391 8.60715 153.309 8.08242 153.147 7.59176C152.984 7.1011 152.747 6.70585 152.435 6.40601C152.123 6.10616 151.723 5.95624 151.235 5.95624C150.57 5.95624 150.055 6.22201 149.689 6.75356C149.323 7.2851 149.14 7.92568 149.14 8.67529C149.14 9.27499 149.221 9.81334 149.384 10.2904C149.56 10.7538 149.811 11.1218 150.136 11.3943C150.462 11.6669 150.855 11.8032 151.316 11.8032Z" fill="white"/>
-<path d="M162.5 15.892C161.551 15.892 160.696 15.674 159.937 15.2378C159.191 14.7881 158.601 14.1611 158.168 13.357C157.734 12.5392 157.517 11.5783 157.517 10.4744C157.517 9.52031 157.727 8.62759 158.147 7.7962C158.581 6.96481 159.185 6.29697 159.957 5.79269C160.73 5.27477 161.625 5.01581 162.642 5.01581C163.212 5.01581 163.747 5.1044 164.249 5.28159C164.764 5.45877 165.219 5.73817 165.612 6.11979C166.019 6.48778 166.337 6.97162 166.568 7.57132C166.798 8.15738 166.914 8.87292 166.914 9.71794L159.917 9.8406C159.917 10.7674 160.018 11.592 160.222 12.3143C160.439 13.0367 160.785 13.5955 161.259 13.9907C161.734 14.386 162.351 14.5836 163.11 14.5836C163.476 14.5836 163.863 14.5223 164.27 14.3996C164.69 14.2633 165.083 14.0725 165.449 13.8272C165.829 13.5819 166.148 13.2888 166.405 12.9481L167.036 13.5001C166.629 14.1134 166.161 14.5972 165.632 14.9516C165.103 15.2923 164.561 15.5309 164.005 15.6672C163.463 15.8171 162.961 15.892 162.5 15.892ZM159.998 8.77751H164.697C164.697 8.2596 164.622 7.7962 164.473 7.38732C164.337 6.96481 164.12 6.63089 163.822 6.38556C163.524 6.14023 163.144 6.01757 162.683 6.01757C161.964 6.01757 161.374 6.24927 160.913 6.71267C160.452 7.16244 160.147 7.85072 159.998 8.77751Z" fill="white"/>
-<path d="M168.419 15.5649V14.7063C168.826 14.7063 169.111 14.6109 169.273 14.4201C169.436 14.2293 169.531 13.9635 169.558 13.6227C169.599 13.282 169.619 12.8868 169.619 12.437L169.64 8.18464C169.64 7.96657 169.64 7.73487 169.64 7.48954C169.653 7.23058 169.68 6.97844 169.721 6.73311C169.477 6.74674 169.226 6.76037 168.968 6.774C168.724 6.774 168.494 6.78081 168.277 6.79444V5.71091C168.887 5.71091 169.362 5.68365 169.701 5.62913C170.053 5.56099 170.318 5.48603 170.494 5.40425C170.684 5.32247 170.826 5.23388 170.921 5.13848H171.653C171.667 5.26114 171.673 5.37699 171.673 5.48603C171.687 5.59506 171.694 5.71091 171.694 5.83357C171.707 5.95624 171.721 6.11298 171.735 6.30379C172.033 6.05846 172.358 5.84039 172.711 5.64958C173.063 5.45877 173.429 5.30884 173.809 5.19981C174.202 5.07714 174.575 5.01581 174.928 5.01581C176.135 5.01581 177.003 5.38381 177.531 6.11979C178.074 6.85578 178.345 8.00745 178.345 9.57483V13.0299C178.345 13.2752 178.338 13.5273 178.325 13.7863C178.311 14.0316 178.291 14.2838 178.264 14.5427C178.481 14.5291 178.697 14.5223 178.914 14.5223C179.145 14.5087 179.355 14.495 179.545 14.4814V15.5649H175.009V14.7063C175.416 14.7063 175.701 14.6109 175.863 14.4201C176.026 14.2293 176.121 13.9635 176.148 13.6227C176.189 13.282 176.209 12.8868 176.209 12.437V9.57483C176.196 8.49811 176.019 7.68717 175.68 7.14199C175.355 6.59682 174.826 6.33105 174.094 6.34467C173.66 6.34467 173.233 6.45371 172.813 6.67178C172.392 6.88985 172.04 7.15562 171.755 7.4691C171.755 7.60539 171.755 7.75531 171.755 7.91886C171.755 8.06879 171.755 8.22552 171.755 8.38908V13.0299C171.755 13.2752 171.748 13.5273 171.735 13.7863C171.721 14.0316 171.701 14.2838 171.673 14.5427C171.89 14.5291 172.107 14.5223 172.324 14.5223C172.555 14.5087 172.765 14.495 172.955 14.4814V15.5649H168.419Z" fill="white"/>
-<path d="M184.495 15.892C184.156 15.892 183.81 15.8443 183.458 15.7489C183.119 15.6671 182.807 15.4968 182.522 15.2378C182.237 14.9652 182.014 14.5768 181.851 14.0725C181.688 13.5682 181.607 12.9004 181.607 12.069L181.648 6.48778H180.142V5.34292C180.509 5.32929 180.881 5.19299 181.261 4.93404C181.641 4.67508 181.973 4.32753 182.258 3.89139C182.543 3.45525 182.739 2.98504 182.848 2.48075H183.804V5.34292H186.936V6.40601L183.804 6.4469L183.763 11.9054C183.763 12.4234 183.804 12.8799 183.885 13.2752C183.98 13.6568 184.129 13.9567 184.332 14.1747C184.549 14.3792 184.841 14.4814 185.207 14.4814C185.519 14.4814 185.838 14.386 186.163 14.1952C186.502 14.0044 186.821 13.6909 187.119 13.2548L187.811 13.8681C187.485 14.3451 187.16 14.7199 186.834 14.9925C186.509 15.2651 186.197 15.4627 185.899 15.5854C185.6 15.7217 185.329 15.8034 185.085 15.8307C184.841 15.8716 184.644 15.892 184.495 15.892Z" fill="white"/>
-<path d="M188.83 21.1053L187.508 20.2671L199.224 0.0683594L200.708 1.00878L188.83 21.1053Z" fill="white"/>
-<path d="M212.664 5.81313C212.515 4.58649 212.095 3.64606 211.403 2.99185C210.712 2.32402 209.81 1.98328 208.698 1.96965C207.993 1.96965 207.342 2.12639 206.745 2.43987C206.149 2.75334 205.633 3.19629 205.199 3.76873C204.766 4.32753 204.427 4.99537 204.182 5.77224C203.952 6.53549 203.837 7.37369 203.837 8.28686C203.837 9.52713 204.054 10.6311 204.488 11.5988C204.921 12.5528 205.518 13.2956 206.277 13.8272C207.05 14.3587 207.925 14.6245 208.901 14.6245C209.769 14.6245 210.623 14.4201 211.464 14.0112C212.318 13.5887 213.023 12.9958 213.579 12.2326L214.251 12.805C213.64 13.65 212.99 14.2974 212.298 14.7472C211.606 15.1969 210.915 15.4968 210.223 15.6467C209.545 15.8103 208.928 15.892 208.372 15.892C207.355 15.892 206.42 15.708 205.566 15.34C204.711 14.9721 203.972 14.461 203.349 13.8067C202.738 13.1389 202.264 12.3688 201.925 11.4966C201.599 10.6107 201.437 9.65661 201.437 8.63441C201.437 7.68035 201.586 6.74674 201.884 5.83357C202.182 4.92041 202.623 4.09583 203.206 3.35985C203.789 2.61023 204.521 2.01736 205.403 1.58122C206.298 1.14508 207.335 0.927008 208.515 0.927008C209.206 0.927008 209.878 1.02241 210.528 1.21322C211.193 1.40404 211.83 1.69707 212.44 2.09232L212.339 1.07012H213.6V5.81313H212.664Z" fill="white"/>
-<path d="M215.152 14.7063C215.559 14.7063 215.844 14.6109 216.006 14.4201C216.169 14.2293 216.264 13.9635 216.291 13.6227C216.332 13.282 216.352 12.8868 216.352 12.437V3.19629C216.352 2.9646 216.352 2.7329 216.352 2.5012C216.366 2.25587 216.386 1.99691 216.413 1.72432C216.183 1.73795 215.938 1.75158 215.681 1.76521C215.423 1.76521 215.193 1.77203 214.989 1.78566V0.702123C215.599 0.702123 216.081 0.674865 216.433 0.620348C216.799 0.552201 217.077 0.477239 217.267 0.395463C217.471 0.313687 217.62 0.225096 217.715 0.129691H218.488V13.0299C218.488 13.2752 218.481 13.5273 218.467 13.7863C218.454 14.0316 218.433 14.2838 218.406 14.5427C218.623 14.5291 218.84 14.5223 219.057 14.5223C219.288 14.5087 219.498 14.495 219.688 14.4814V15.5649H215.152V14.7063Z" fill="white"/>
-<path d="M220.993 14.7063C221.399 14.7063 221.684 14.6109 221.847 14.4201C222.01 14.2293 222.105 13.9635 222.132 13.6227C222.172 13.282 222.193 12.8868 222.193 12.437V8.20508C222.193 7.97338 222.199 7.74168 222.213 7.50998C222.227 7.26466 222.247 7.0057 222.274 6.73311C222.044 6.74674 221.799 6.76037 221.542 6.774C221.284 6.774 221.047 6.78081 220.83 6.79444V5.71091C221.44 5.71091 221.921 5.68365 222.274 5.62913C222.64 5.56099 222.918 5.48603 223.108 5.40425C223.311 5.32247 223.461 5.23388 223.555 5.13848H224.328V13.0299C224.328 13.2752 224.322 13.5273 224.308 13.7863C224.294 14.0316 224.274 14.2838 224.247 14.5427C224.464 14.5291 224.681 14.5223 224.898 14.5223C225.128 14.5087 225.339 14.495 225.528 14.4814V15.5649H220.993V14.7063ZM223.149 3.25763C222.796 3.25763 222.498 3.12815 222.254 2.86919C222.01 2.5966 221.888 2.2695 221.888 1.88788C221.888 1.50626 222.016 1.18597 222.274 0.927008C222.532 0.654421 222.823 0.518127 223.149 0.518127C223.501 0.518127 223.793 0.654421 224.023 0.927008C224.267 1.18597 224.389 1.50626 224.389 1.88788C224.389 2.2695 224.267 2.5966 224.023 2.86919C223.793 3.12815 223.501 3.25763 223.149 3.25763Z" fill="white"/>
-<path d="M231.689 15.892C230.74 15.892 229.886 15.674 229.126 15.2378C228.381 14.7881 227.791 14.1611 227.357 13.357C226.923 12.5392 226.706 11.5783 226.706 10.4744C226.706 9.52031 226.916 8.62759 227.337 7.7962C227.771 6.96481 228.374 6.29697 229.147 5.79269C229.92 5.27477 230.815 5.01581 231.832 5.01581C232.401 5.01581 232.937 5.1044 233.439 5.28159C233.954 5.45877 234.408 5.73817 234.801 6.11979C235.208 6.48778 235.527 6.97162 235.757 7.57132C235.988 8.15738 236.103 8.87292 236.103 9.71794L229.106 9.8406C229.106 10.7674 229.208 11.592 229.411 12.3143C229.628 13.0367 229.974 13.5955 230.449 13.9907C230.923 14.386 231.54 14.5836 232.299 14.5836C232.666 14.5836 233.052 14.5223 233.459 14.3996C233.879 14.2633 234.272 14.0725 234.639 13.8272C235.018 13.5819 235.337 13.2888 235.595 12.9481L236.225 13.5001C235.818 14.1134 235.35 14.5972 234.822 14.9516C234.293 15.2923 233.75 15.5309 233.194 15.6672C232.652 15.8171 232.15 15.892 231.689 15.892ZM229.188 8.77751H233.886C233.886 8.2596 233.811 7.7962 233.662 7.38732C233.527 6.96481 233.31 6.63089 233.011 6.38556C232.713 6.14023 232.333 6.01757 231.872 6.01757C231.154 6.01757 230.564 6.24927 230.103 6.71267C229.642 7.16244 229.337 7.85072 229.188 8.77751Z" fill="white"/>
-<path d="M237.608 15.5649V14.7063C238.015 14.7063 238.3 14.6109 238.463 14.4201C238.625 14.2293 238.72 13.9635 238.748 13.6227C238.788 13.282 238.809 12.8868 238.809 12.437L238.829 8.18464C238.829 7.96657 238.829 7.73487 238.829 7.48954C238.842 7.23058 238.87 6.97844 238.91 6.73311C238.666 6.74674 238.415 6.76037 238.158 6.774C237.914 6.774 237.683 6.78081 237.466 6.79444V5.71091C238.076 5.71091 238.551 5.68365 238.89 5.62913C239.242 5.56099 239.507 5.48603 239.683 5.40425C239.873 5.32247 240.015 5.23388 240.11 5.13848H240.842C240.856 5.26114 240.863 5.37699 240.863 5.48603C240.876 5.59506 240.883 5.71091 240.883 5.83357C240.897 5.95624 240.91 6.11298 240.924 6.30379C241.222 6.05846 241.548 5.84039 241.9 5.64958C242.253 5.45877 242.619 5.30884 242.999 5.19981C243.392 5.07714 243.765 5.01581 244.117 5.01581C245.324 5.01581 246.192 5.38381 246.721 6.11979C247.263 6.85578 247.534 8.00745 247.534 9.57483V13.0299C247.534 13.2752 247.528 13.5273 247.514 13.7863C247.5 14.0316 247.48 14.2838 247.453 14.5427C247.67 14.5291 247.887 14.5223 248.104 14.5223C248.334 14.5087 248.544 14.495 248.734 14.4814V15.5649H244.199V14.7063C244.605 14.7063 244.89 14.6109 245.053 14.4201C245.216 14.2293 245.31 13.9635 245.338 13.6227C245.378 13.282 245.399 12.8868 245.399 12.437V9.57483C245.385 8.49811 245.209 7.68717 244.87 7.14199C244.544 6.59682 244.016 6.33105 243.283 6.34467C242.849 6.34467 242.422 6.45371 242.002 6.67178C241.582 6.88985 241.229 7.15562 240.944 7.4691C240.944 7.60539 240.944 7.75531 240.944 7.91886C240.944 8.06879 240.944 8.22552 240.944 8.38908V13.0299C240.944 13.2752 240.937 13.5273 240.924 13.7863C240.91 14.0316 240.89 14.2838 240.863 14.5427C241.08 14.5291 241.297 14.5223 241.514 14.5223C241.744 14.5087 241.954 14.495 242.144 14.4814V15.5649H237.608Z" fill="white"/>
-<path d="M253.685 15.892C253.346 15.892 253 15.8443 252.647 15.7489C252.308 15.6671 251.996 15.4968 251.712 15.2378C251.427 14.9652 251.203 14.5768 251.04 14.0725C250.878 13.5682 250.796 12.9004 250.796 12.069L250.837 6.48778H249.332V5.34292C249.698 5.32929 250.071 5.19299 250.451 4.93404C250.83 4.67508 251.162 4.32753 251.447 3.89139C251.732 3.45525 251.929 2.98504 252.037 2.48075H252.993V5.34292H256.125V6.40601L252.993 6.4469L252.952 11.9054C252.952 12.4234 252.993 12.8799 253.074 13.2752C253.169 13.6568 253.318 13.9567 253.522 14.1747C253.739 14.3792 254.03 14.4814 254.396 14.4814C254.708 14.4814 255.027 14.386 255.352 14.1952C255.691 14.0044 256.01 13.6909 256.308 13.2548L257 13.8681C256.674 14.3451 256.349 14.7199 256.024 14.9925C255.698 15.2651 255.386 15.4627 255.088 15.5854C254.79 15.7217 254.518 15.8034 254.274 15.8307C254.03 15.8716 253.834 15.892 253.685 15.892Z" fill="white"/>
-<path d="M134.115 40.8445C134.562 40.8173 134.881 40.7219 135.071 40.5583C135.274 40.3948 135.403 40.1494 135.457 39.8223C135.512 39.4952 135.539 39.0795 135.539 38.5752V30.0705C135.539 29.7707 135.545 29.4845 135.559 29.2119C135.573 28.9257 135.586 28.6803 135.6 28.4759C135.369 28.4895 135.118 28.5032 134.847 28.5168C134.576 28.5304 134.332 28.544 134.115 28.5577V27.4333C134.915 27.4196 135.728 27.4128 136.556 27.4128C137.383 27.3992 138.223 27.3924 139.078 27.3924C140.352 27.3924 141.43 27.5491 142.312 27.8626C143.207 28.1624 143.892 28.6258 144.366 29.2528C144.854 29.8661 145.105 30.643 145.119 31.5834C145.132 32.1149 145.037 32.6669 144.834 33.2394C144.631 33.7982 144.285 34.3229 143.797 34.8135C143.308 35.2906 142.644 35.679 141.803 35.9789C140.976 36.2787 139.932 36.4286 138.671 36.4286C138.535 36.4423 138.379 36.4491 138.203 36.4491C138.04 36.4491 137.871 36.4423 137.695 36.4286V39.0046C137.695 39.3726 137.688 39.7065 137.674 40.0063C137.674 40.2925 137.661 40.5242 137.634 40.7014C137.823 40.6878 138.027 40.6742 138.244 40.6605C138.461 40.6469 138.671 40.6401 138.874 40.6401C139.091 40.6265 139.288 40.6128 139.464 40.5992V41.7441H134.115V40.8445ZM137.695 35.3451C137.925 35.3724 138.122 35.3928 138.285 35.4064C138.461 35.4064 138.664 35.4064 138.895 35.4064C139.654 35.4064 140.325 35.2633 140.908 34.9771C141.491 34.6909 141.946 34.2752 142.271 33.73C142.597 33.1848 142.759 32.5375 142.759 31.7878C142.759 31.1336 142.658 30.5885 142.454 30.1523C142.264 29.7025 141.993 29.355 141.641 29.1097C141.302 28.8507 140.908 28.6667 140.461 28.5577C140.013 28.4486 139.539 28.3941 139.037 28.3941C138.63 28.3941 138.332 28.4759 138.142 28.6395C137.952 28.803 137.83 29.0415 137.776 29.355C137.722 29.6685 137.695 30.0705 137.695 30.5612V35.3451Z" fill="white"/>
-<path d="M146.262 40.8854C146.668 40.8854 146.953 40.79 147.116 40.5992C147.278 40.4084 147.373 40.1426 147.401 39.8019C147.441 39.4612 147.462 39.0659 147.462 38.6161V34.3638C147.462 34.1457 147.462 33.914 147.462 33.6687C147.475 33.4097 147.502 33.1576 147.543 32.9123C147.312 32.9259 147.068 32.9395 146.811 32.9531C146.553 32.9531 146.316 32.96 146.099 32.9736V31.8901H146.79C147.36 31.8901 147.794 31.8287 148.092 31.7061C148.39 31.5834 148.607 31.4539 148.743 31.3176H149.475C149.502 31.5084 149.523 31.7742 149.536 32.1149C149.55 32.4557 149.563 32.8373 149.577 33.2598C149.835 32.8782 150.133 32.5374 150.472 32.2376C150.811 31.9241 151.177 31.672 151.57 31.4812C151.977 31.2904 152.397 31.195 152.831 31.195C153.252 31.195 153.611 31.3108 153.909 31.5425C154.221 31.7606 154.377 32.1218 154.377 32.626C154.377 32.7623 154.336 32.9191 154.255 33.0963C154.187 33.2734 154.065 33.4302 153.889 33.5665C153.726 33.6891 153.502 33.7505 153.218 33.7505C152.933 33.7368 152.682 33.6278 152.465 33.4234C152.262 33.2189 152.167 32.9395 152.18 32.5852C151.855 32.5852 151.53 32.6874 151.204 32.8918C150.879 33.0826 150.574 33.3416 150.289 33.6687C150.018 33.9958 149.787 34.3502 149.597 34.7318V39.209C149.597 39.4543 149.59 39.7065 149.577 39.9654C149.577 40.2108 149.557 40.4629 149.516 40.7219C149.733 40.7082 149.957 40.7014 150.187 40.7014C150.418 40.6878 150.628 40.6742 150.818 40.6605V41.7441H146.262V40.8854Z" fill="white"/>
-<path d="M160.08 42.0712C159.117 42.0712 158.249 41.8531 157.477 41.417C156.704 40.9808 156.087 40.3743 155.626 39.5975C155.178 38.8069 154.954 37.9006 154.954 36.8784C154.954 35.7744 155.178 34.7999 155.626 33.9549C156.087 33.0963 156.704 32.4216 157.477 31.9309C158.249 31.4403 159.11 31.195 160.06 31.195C161.022 31.195 161.89 31.4198 162.663 31.8696C163.436 32.3058 164.046 32.9191 164.494 33.7096C164.955 34.4864 165.185 35.386 165.185 36.4082C165.185 37.4849 164.962 38.4526 164.514 39.3112C164.067 40.1699 163.456 40.8445 162.683 41.3352C161.924 41.8259 161.056 42.0712 160.08 42.0712ZM160.222 41.049C160.873 41.0353 161.382 40.8309 161.748 40.4357C162.128 40.0404 162.399 39.5361 162.561 38.9228C162.724 38.2959 162.806 37.6485 162.806 36.9806C162.806 36.3946 162.751 35.8221 162.643 35.2633C162.548 34.6909 162.392 34.173 162.175 33.7096C161.958 33.2462 161.673 32.8782 161.321 32.6056C160.968 32.3194 160.541 32.1831 160.039 32.1967C159.402 32.1967 158.88 32.3943 158.473 32.7896C158.08 33.1848 157.788 33.6959 157.599 34.3229C157.422 34.9362 157.334 35.5904 157.334 36.2855C157.334 37.0897 157.436 37.8529 157.639 38.5752C157.843 39.2976 158.154 39.8905 158.575 40.3539C159.009 40.8173 159.558 41.049 160.222 41.049Z" fill="white"/>
-<path d="M170.516 42.0712C170.177 42.0712 169.832 42.0235 169.479 41.9281C169.14 41.8463 168.828 41.6759 168.543 41.417C168.259 41.1444 168.035 40.7559 167.872 40.2517C167.709 39.7474 167.628 39.0795 167.628 38.2481L167.669 32.6669H166.164V31.5221C166.53 31.5084 166.903 31.3721 167.282 31.1132C167.662 30.8542 167.994 30.5067 168.279 30.0705C168.564 29.6344 168.76 29.1642 168.869 28.6599H169.825V31.5221H172.957V32.5852L169.825 32.626L169.784 38.0846C169.784 38.6025 169.825 39.0591 169.906 39.4543C170.001 39.836 170.15 40.1358 170.354 40.3539C170.571 40.5583 170.862 40.6605 171.228 40.6605C171.54 40.6605 171.859 40.5651 172.184 40.3743C172.523 40.1835 172.842 39.87 173.14 39.4339L173.832 40.0472C173.506 40.5243 173.181 40.8991 172.855 41.1716C172.53 41.4442 172.218 41.6419 171.92 41.7645C171.621 41.9008 171.35 41.9826 171.106 42.0098C170.862 42.0507 170.666 42.0712 170.516 42.0712Z" fill="white"/>
-<path d="M179.516 42.0712C178.554 42.0712 177.686 41.8531 176.913 41.417C176.14 40.9808 175.523 40.3743 175.062 39.5975C174.615 38.8069 174.391 37.9006 174.391 36.8784C174.391 35.7744 174.615 34.7999 175.062 33.9549C175.523 33.0963 176.14 32.4216 176.913 31.9309C177.686 31.4403 178.547 31.195 179.496 31.195C180.459 31.195 181.327 31.4198 182.1 31.8696C182.872 32.3058 183.483 32.9191 183.93 33.7096C184.391 34.4864 184.622 35.386 184.622 36.4082C184.622 37.4849 184.398 38.4526 183.95 39.3112C183.503 40.1699 182.893 40.8445 182.12 41.3352C181.361 41.8259 180.493 42.0712 179.516 42.0712ZM179.659 41.049C180.31 41.0353 180.818 40.8309 181.184 40.4357C181.564 40.0404 181.835 39.5361 181.998 38.9228C182.161 38.2959 182.242 37.6485 182.242 36.9806C182.242 36.3946 182.188 35.8221 182.079 35.2633C181.984 34.6909 181.828 34.173 181.611 33.7096C181.394 33.2462 181.11 32.8782 180.757 32.6056C180.405 32.3194 179.977 32.1831 179.476 32.1967C178.838 32.1967 178.316 32.3943 177.91 32.7896C177.516 33.1848 177.225 33.6959 177.035 34.3229C176.859 34.9362 176.771 35.5904 176.771 36.2855C176.771 37.0897 176.872 37.8529 177.076 38.5752C177.279 39.2976 177.591 39.8905 178.011 40.3539C178.445 40.8173 178.994 41.049 179.659 41.049Z" fill="white"/>
-<path d="M190.97 42.0712C190.061 42.0712 189.227 41.8667 188.468 41.4579C187.709 41.0354 187.098 40.4357 186.637 39.6588C186.19 38.8819 185.966 37.9415 185.966 36.8375C185.966 36.1015 186.095 35.3996 186.353 34.7318C186.61 34.0503 186.97 33.4438 187.431 32.9123C187.905 32.3807 188.461 31.965 189.098 31.6652C189.749 31.3517 190.468 31.195 191.254 31.195C192.055 31.195 192.739 31.3176 193.309 31.563C193.878 31.8083 194.312 32.1286 194.611 32.5238C194.922 32.9191 195.078 33.3484 195.078 33.8118C195.078 34.1389 194.983 34.4251 194.794 34.6704C194.604 34.9158 194.333 35.0384 193.98 35.0384C193.587 35.0521 193.309 34.9362 193.146 34.6909C192.983 34.4319 192.902 34.1934 192.902 33.9753C192.902 33.8527 192.922 33.7164 192.963 33.5665C193.004 33.4029 193.078 33.2598 193.187 33.1371C193.078 32.8509 192.902 32.6397 192.658 32.5034C192.414 32.3671 192.163 32.2785 191.905 32.2376C191.648 32.1967 191.431 32.1763 191.254 32.1763C190.427 32.1899 189.729 32.5511 189.159 33.2598C188.604 33.9549 188.326 34.9635 188.326 36.2855C188.326 37.1305 188.448 37.887 188.692 38.5548C188.949 39.2226 189.322 39.7542 189.81 40.1494C190.299 40.5447 190.882 40.7491 191.56 40.7628C192.17 40.7628 192.76 40.606 193.329 40.2926C193.899 39.9654 194.36 39.5566 194.712 39.0659L195.363 39.6383C194.97 40.2517 194.516 40.7355 194 41.0899C193.499 41.4442 192.983 41.6964 192.455 41.8463C191.939 41.9962 191.444 42.0712 190.97 42.0712Z" fill="white"/>
-<path d="M201.555 42.0712C200.592 42.0712 199.724 41.8531 198.951 41.417C198.178 40.9808 197.561 40.3743 197.1 39.5975C196.653 38.8069 196.429 37.9006 196.429 36.8784C196.429 35.7744 196.653 34.7999 197.1 33.9549C197.561 33.0963 198.178 32.4216 198.951 31.9309C199.724 31.4403 200.585 31.195 201.534 31.195C202.497 31.195 203.365 31.4198 204.138 31.8696C204.911 32.3058 205.521 32.9191 205.969 33.7096C206.43 34.4864 206.66 35.386 206.66 36.4082C206.66 37.4849 206.436 38.4526 205.989 39.3112C205.541 40.1699 204.931 40.8445 204.158 41.3352C203.399 41.8259 202.531 42.0712 201.555 42.0712ZM201.697 41.049C202.348 41.0353 202.857 40.8309 203.223 40.4357C203.602 40.0404 203.874 39.5361 204.036 38.9228C204.199 38.2959 204.28 37.6485 204.28 36.9806C204.28 36.3946 204.226 35.8221 204.118 35.2633C204.023 34.6909 203.867 34.173 203.65 33.7096C203.433 33.2462 203.148 32.8782 202.796 32.6056C202.443 32.3194 202.016 32.1831 201.514 32.1967C200.877 32.1967 200.355 32.3943 199.948 32.7896C199.555 33.1848 199.263 33.6959 199.073 34.3229C198.897 34.9362 198.809 35.5904 198.809 36.2855C198.809 37.0897 198.911 37.8529 199.114 38.5752C199.317 39.2976 199.629 39.8905 200.05 40.3539C200.484 40.8173 201.033 41.049 201.697 41.049Z" fill="white"/>
-<path d="M207.842 40.8854C208.249 40.8854 208.534 40.79 208.697 40.5992C208.859 40.4084 208.954 40.1426 208.981 39.8019C209.022 39.4612 209.042 39.0659 209.042 38.6161V29.3754C209.042 29.1437 209.042 28.912 209.042 28.6803C209.056 28.435 209.076 28.1761 209.103 27.9035C208.873 27.9171 208.629 27.9307 208.371 27.9444C208.114 27.9444 207.883 27.9512 207.68 27.9648V26.8813C208.29 26.8813 208.771 26.854 209.124 26.7995C209.49 26.7313 209.768 26.6564 209.958 26.5746C210.161 26.4928 210.31 26.4042 210.405 26.3088H211.178V39.209C211.178 39.4543 211.171 39.7065 211.158 39.9654C211.144 40.2108 211.124 40.4629 211.097 40.7219C211.314 40.7082 211.531 40.7014 211.748 40.7014C211.978 40.6878 212.188 40.6742 212.378 40.6605V41.7441H207.842V40.8854Z" fill="white"/>
-<defs>
-<linearGradient id="paint0_linear_100_26" x1="99.1169" y1="38.1477" x2="82.6837" y2="38.1477" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="white" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint1_linear_100_26" x1="33.8049" y1="16.9269" x2="38.7165" y2="26.9811" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="white" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint2_linear_100_26" x1="55.0065" y1="30.3095" x2="68.2066" y2="40.7142" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="white" stop-opacity="0"/>
-</linearGradient>
-<clipPath id="clip0_100_26">
-<rect width="121.515" height="46.4384" fill="white"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/assets/images/ai_grid.svg b/assets/images/ai_grid.svg
deleted file mode 100644
index 49e8c4139e..0000000000
--- a/assets/images/ai_grid.svg
+++ /dev/null
@@ -1,334 +0,0 @@
-<svg width="400" height="92" viewBox="0 0 400 92" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_2501_1466)">
-<path d="M73.6743 -4.41071L75.5416 -1.32632L73.4126 1.58358" stroke="black" stroke-width="1.5"/>
-<path d="M71.6108 -2.99939L72.5445 -1.4572L71.48 -0.00224495" stroke="black" stroke-width="1.5"/>
-<path d="M69.0085 -0.710689L68.9169 1.38731C66.8498 1.29706 65.9887 1.25947 63.9216 1.16922L63.9478 0.569787L69.1524 -4.00755L69.1786 -4.60698L64.1833 -4.82507L64.0917 -2.72707" stroke="black" stroke-width="1.5"/>
-<path d="M91.1332 -5.23706C90.8807 -5.51263 90.529 -5.67673 90.1555 -5.69303C89.7821 -5.70934 89.4174 -5.57672 89.1418 -5.3242C88.8661 -5.07169 88.7021 -4.72001 88.6858 -4.34656C88.6694 -3.97312 88.8021 -3.60849 89.0546 -3.33281L95.4319 3.62501C95.5424 3.74604 95.681 3.83803 95.8356 3.89288L97.9807 4.64767C98.0234 4.66247 98.0692 4.66544 98.1133 4.65629C98.1576 4.64713 98.1984 4.62618 98.2317 4.59567C98.2649 4.56516 98.2894 4.52621 98.3023 4.48296C98.3152 4.43971 98.3161 4.39377 98.305 4.35003L97.7405 2.14679C97.6998 1.98827 97.6207 1.84218 97.5104 1.72135L91.1332 -5.23706Z" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M88.9944 0.874369L87.9954 0.83075" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M91.8171 5.0014L91.8608 4.00236" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M89.9062 2.91609L88.8635 3.87152" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<g clip-path="url(#clip1_2501_1466)">
-<mask id="mask0_2501_1466" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="109" y="-8" width="17" height="17">
-<path d="M125.843 -7.13772L109.858 -7.83563L109.16 8.14914L125.145 8.84705L125.843 -7.13772Z" fill="white"/>
-</mask>
-<g mask="url(#mask0_2501_1466)">
-<path d="M120.459 1.53575L120.368 3.63375C117.887 3.52545 116.854 3.48034 114.374 3.37204L114.4 2.77261L120.603 -1.76111L120.63 -2.36054L114.635 -2.62225L114.544 -0.524252" stroke="black" stroke-width="1.5"/>
-<path d="M110.899 2.71985L110.724 6.71604L114.221 6.86871" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M123.886 3.28688L123.712 7.28308L120.215 7.13041" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-</g>
-</g>
-<path d="M141.74 -4.44171L140.298 -0.625665C140.224 -0.430368 140.105 -0.255126 139.951 -0.114073C139.798 0.026993 139.613 0.129928 139.412 0.186449L135.484 1.29086L139.3 2.73335C139.496 2.80717 139.671 2.92583 139.812 3.07978C139.953 3.23371 140.056 3.41863 140.113 3.61962L141.217 7.54686L142.659 3.73082C142.733 3.53552 142.852 3.36028 143.006 3.21922C143.16 3.07816 143.345 2.97522 143.546 2.9187L147.473 1.81429L143.657 0.371802C143.462 0.297979 143.286 0.179319 143.145 0.0253739C143.004 -0.12856 142.901 -0.313477 142.845 -0.514465L141.74 -4.44171Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M145.995 5.08642L145.879 7.75054M144.605 6.36028L147.269 6.4766" stroke="black" stroke-opacity="0.75" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M169.583 -0.223267L171.45 2.86112L169.321 5.77102" stroke="black" stroke-width="1.5"/>
-<path d="M167.52 1.18805L168.453 2.73024L167.389 4.18519" stroke="black" stroke-width="1.5"/>
-<path d="M164.917 3.47675L164.826 5.57475C162.759 5.4845 161.897 5.4469 159.83 5.35666L159.856 4.75723L165.061 0.179892L165.087 -0.419537L160.092 -0.637634L160 1.46037" stroke="black" stroke-width="1.5"/>
-<g clip-path="url(#clip2_2501_1466)">
-<mask id="mask1_2501_1466" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="181" y="-5" width="17" height="17">
-<path d="M197.774 -3.99716L181.79 -4.69507L181.092 11.2897L197.076 11.9876L197.774 -3.99716Z" fill="white"/>
-</mask>
-<g mask="url(#mask1_2501_1466)">
-<path d="M192.391 4.67631L192.299 6.77432C189.819 6.66602 188.785 6.6209 186.305 6.5126L186.331 5.91317L192.535 1.37946L192.561 0.780027L186.567 0.518311L186.475 2.61631" stroke="black" stroke-width="1.5"/>
-<path d="M183.048 0.86515L183.223 -3.13104L186.719 -2.97837" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M196.036 1.43219L196.21 -2.56401L192.714 -2.71667" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M182.83 5.86041L182.656 9.85661L186.152 10.0093" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M195.818 6.42745L195.643 10.4236L192.147 10.271" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-</g>
-</g>
-<path d="M211.019 -0.00268162C210.766 -0.278258 210.415 -0.442354 210.041 -0.458659C209.668 -0.474965 209.303 -0.342345 209.028 -0.0898278C208.752 0.162689 208.588 0.514369 208.571 0.887811C208.555 1.26125 208.688 1.62589 208.94 1.90157L215.318 8.85938C215.428 8.98042 215.567 9.0724 215.721 9.12725L217.866 9.88204C217.909 9.89685 217.955 9.89982 217.999 9.89067C218.043 9.88151 218.084 9.86056 218.117 9.83004C218.151 9.79953 218.175 9.76058 218.188 9.71733C218.201 9.67408 218.202 9.62815 218.191 9.5844L217.626 7.38117C217.586 7.22265 217.506 7.07656 217.396 6.95572L211.019 -0.00268162Z" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M209.501 2.52063L211.587 0.609772" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M208.88 6.10874L207.881 6.06512" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M218.174 3.32983L219.173 3.37345" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M211.703 10.2358L211.747 9.23673" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M215.351 -0.797205L215.307 0.201843" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M209.792 8.15047L208.749 9.1059" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M217.262 1.28815L218.305 0.332718" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M241.514 2.91736L243.382 6.00174L241.253 8.91165" stroke="black" stroke-width="1.5"/>
-<path d="M239.451 4.32867L240.385 5.87087L239.32 7.32582" stroke="black" stroke-width="1.5"/>
-<path d="M236.849 6.61738L236.757 8.71538C234.69 8.62513 233.829 8.58753 231.762 8.49728L231.788 7.89785L236.993 3.32052L237.019 2.72109L232.023 2.50299L231.932 4.60099" stroke="black" stroke-width="1.5"/>
-<path d="M258.973 2.09101C258.721 1.81543 258.369 1.65134 257.996 1.63503C257.622 1.61872 257.258 1.75134 256.982 2.00386C256.706 2.25638 256.542 2.60806 256.526 2.9815C256.509 3.35494 256.642 3.71958 256.895 3.99525L263.272 10.9531C263.382 11.0741 263.521 11.1661 263.676 11.2209L265.821 11.9757C265.863 11.9905 265.909 11.9935 265.953 11.9844C265.998 11.9752 266.039 11.9542 266.072 11.9237C266.105 11.8932 266.129 11.8543 266.142 11.811C266.155 11.7678 266.156 11.7218 266.145 11.6781L265.581 9.47486C265.54 9.31634 265.461 9.17025 265.35 9.04941L258.973 2.09101Z" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M257.456 4.61432L259.541 2.70346" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M256.834 8.20243L255.835 8.15881" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M266.128 5.42352L267.127 5.46714" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M259.657 12.3295L259.701 11.3304" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M263.305 1.29648L263.262 2.29553" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M257.746 10.2442L256.704 11.1996" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M265.216 3.38184L266.259 2.42641" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<g clip-path="url(#clip3_2501_1466)">
-<mask id="mask2_2501_1466" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="277" y="-1" width="17" height="18">
-<path d="M293.683 0.190342L277.698 -0.507568L277 15.4772L292.985 16.1751L293.683 0.190342Z" fill="white"/>
-</mask>
-<g mask="url(#mask2_2501_1466)">
-<path d="M288.3 8.86381L288.208 10.9618C285.727 10.8535 284.694 10.8084 282.214 10.7001L282.24 10.1007L288.443 5.56696L288.47 4.96753L282.475 4.70581L282.384 6.80381" stroke="black" stroke-width="1.5"/>
-<path d="M278.957 5.05265L279.131 1.05646L282.628 1.20913" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M291.945 5.61969L292.119 1.62349L288.622 1.47083" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M278.739 10.0479L278.564 14.0441L282.061 14.1968" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M291.726 10.6149L291.552 14.6111L288.055 14.4585" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-</g>
-</g>
-<g clip-path="url(#clip4_2501_1466)">
-<path d="M309.58 2.88629L308.138 6.70234C308.064 6.89763 307.945 7.07288 307.792 7.21393C307.638 7.355 307.453 7.45793 307.252 7.51445L303.324 8.61886L307.141 10.0614C307.336 10.1352 307.511 10.2538 307.652 10.4078C307.793 10.5617 307.896 10.7466 307.953 10.9476L309.057 14.8749L310.5 11.0588C310.573 10.8635 310.692 10.6883 310.846 10.5472C311 10.4062 311.185 10.3032 311.386 10.2467L315.313 9.14229L311.497 7.6998C311.302 7.62598 311.126 7.50732 310.985 7.35338C310.844 7.19944 310.741 7.01453 310.685 6.81354L309.58 2.88629Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M304.918 2.68273L304.802 5.34686M303.528 3.95664L306.192 4.07296" stroke="black" stroke-opacity="0.75" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M313.836 12.4144L313.719 15.0785M312.446 13.6882L315.11 13.8045" stroke="black" stroke-opacity="0.75" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<path d="M337.423 7.1048L339.29 10.1892L337.161 13.0991" stroke="black" stroke-width="1.5"/>
-<path d="M335.36 8.51611L336.293 10.0583L335.229 11.5133" stroke="black" stroke-width="1.5"/>
-<path d="M332.757 10.8048L332.666 12.9028C330.599 12.8126 329.737 12.775 327.67 12.6847L327.697 12.0853L332.901 7.50796L332.927 6.90853L327.932 6.69043L327.841 8.78843" stroke="black" stroke-width="1.5"/>
-<g clip-path="url(#clip5_2501_1466)">
-<mask id="mask3_2501_1466" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="348" y="2" width="18" height="18">
-<path d="M365.614 3.33091L349.63 2.633L348.932 18.6178L364.917 19.3157L365.614 3.33091Z" fill="white"/>
-</mask>
-<g mask="url(#mask3_2501_1466)">
-<path d="M360.231 12.0044L360.139 14.1024C357.659 13.9941 356.625 13.949 354.145 13.8407L354.171 13.2412L360.375 8.70752L360.401 8.10809L354.407 7.84637L354.315 9.94438" stroke="black" stroke-width="1.5"/>
-<path d="M350.888 8.19321L351.063 4.19702L354.559 4.34969" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M363.876 8.76025L364.05 4.76406L360.554 4.61139" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M350.67 13.1885L350.496 17.1847L353.992 17.3373" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M363.658 13.7555L363.483 17.7517L359.987 17.599" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-</g>
-</g>
-<path d="M378.859 7.32532C378.606 7.04974 378.255 6.88565 377.881 6.86934C377.508 6.85304 377.143 6.98566 376.868 7.23818C376.592 7.49069 376.428 7.84237 376.412 8.21581C376.395 8.58926 376.528 8.95389 376.78 9.22957L383.158 16.1874C383.268 16.3084 383.407 16.4004 383.561 16.4553L385.707 17.21C385.749 17.2249 385.795 17.2278 385.839 17.2187C385.883 17.2095 385.924 17.1886 385.958 17.158C385.991 17.1275 386.015 17.0886 386.028 17.0453C386.041 17.0021 386.042 16.9562 386.031 16.9124L385.466 14.7092C385.426 14.5507 385.347 14.4046 385.236 14.2837L378.859 7.32532Z" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M377.341 9.84863L379.427 7.93778" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M376.72 13.4367L375.721 13.3931" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M386.014 10.6578L387.013 10.7015" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M379.543 17.5638L379.587 16.5647" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M383.191 6.5308L383.147 7.52985" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M377.632 15.4785L376.589 16.4339" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M385.102 8.61615L386.145 7.66072" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<g clip-path="url(#clip6_2501_1466)">
-<mask id="mask4_2501_1466" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="58" y="46" width="18" height="17">
-<path d="M75.446 46.7152L59.4612 46.0173L58.7633 62.0021L74.748 62.7L75.446 46.7152Z" fill="white"/>
-</mask>
-<g mask="url(#mask4_2501_1466)">
-<path d="M70.0625 55.3887L69.9709 57.4867C67.4904 57.3784 66.457 57.3333 63.9766 57.225L64.0027 56.6256L70.2064 52.0919L70.2326 51.4924L64.2383 51.2307L64.1467 53.3287" stroke="black" stroke-width="1.5"/>
-<path d="M60.7198 51.5776L60.8943 47.5814L64.391 47.734" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M73.7074 52.1446L73.8819 48.1484L70.3853 47.9957" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M60.5017 56.5728L60.3272 60.569L63.8239 60.7217" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M73.4893 57.1399L73.3149 61.136L69.8182 60.9834" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-</g>
-</g>
-<path d="M91.3434 49.4113L89.9009 53.2273C89.8271 53.4226 89.7084 53.5978 89.5545 53.7389C89.4006 53.88 89.2156 53.9829 89.0147 54.0394L85.0874 55.1438L88.9035 56.5863C89.0988 56.6601 89.274 56.7788 89.415 56.9327C89.5561 57.0867 89.659 57.2716 89.7156 57.4726L90.82 61.3998L92.2625 57.5838C92.3363 57.3885 92.4549 57.2132 92.6089 57.0722C92.7628 56.9311 92.9477 56.8282 93.1487 56.7717L97.076 55.6673L93.2599 54.2248C93.0646 54.1509 92.8894 54.0323 92.7483 53.8783C92.6073 53.7244 92.5043 53.5395 92.4478 53.3385L91.3434 49.4113Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M86.6812 49.2077L86.5649 51.8718M85.291 50.4816L87.9551 50.5979" stroke="black" stroke-opacity="0.75" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M95.5984 58.9394L95.4821 61.6035M94.2082 60.2132L96.8723 60.3296" stroke="black" stroke-opacity="0.75" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M112.668 51.7565C112.415 51.481 112.063 51.3169 111.69 51.3006C111.316 51.2843 110.952 51.4169 110.676 51.6694C110.401 51.9219 110.237 52.2736 110.22 52.647C110.204 53.0205 110.337 53.3851 110.589 53.6608L116.966 60.6186C117.077 60.7396 117.215 60.8316 117.37 60.8865L119.515 61.6413C119.558 61.6561 119.604 61.659 119.648 61.6499C119.692 61.6407 119.733 61.6198 119.766 61.5893C119.799 61.5587 119.824 61.5198 119.837 61.4765C119.85 61.4333 119.85 61.3874 119.839 61.3436L119.275 59.1404C119.234 58.9819 119.155 58.8358 119.045 58.7149L112.668 51.7565Z" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M111.15 54.2798L113.235 52.369" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M110.529 57.868L109.53 57.8243" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M119.822 55.0891L120.821 55.1327" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M113.352 61.995L113.395 60.9959" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M117 50.962L116.956 51.9611" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M111.441 59.9097L110.398 60.8651" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M118.911 53.0474L119.953 52.0919" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M143.163 54.6766L145.03 57.761L142.901 60.6709" stroke="black" stroke-width="1.5"/>
-<path d="M141.1 56.088L142.033 57.6301L140.969 59.0851" stroke="black" stroke-width="1.5"/>
-<path d="M138.497 58.3767L138.406 60.4747C136.339 60.3844 135.477 60.3468 133.41 60.2566L133.437 59.6571L138.641 55.0798L138.667 54.4804L133.672 54.2623L133.581 56.3603" stroke="black" stroke-width="1.5"/>
-<g clip-path="url(#clip7_2501_1466)">
-<mask id="mask5_2501_1466" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="154" y="50" width="18" height="17">
-<path d="M171.355 50.9027L155.37 50.2048L154.672 66.1895L170.657 66.8875L171.355 50.9027Z" fill="white"/>
-</mask>
-<g mask="url(#mask5_2501_1466)">
-<path d="M165.971 59.5762L165.88 61.6742C163.399 61.5659 162.366 61.5207 159.885 61.4124L159.911 60.813L166.115 56.2793L166.141 55.6799L160.147 55.4182L160.055 57.5162" stroke="black" stroke-width="1.5"/>
-<path d="M156.629 55.765L156.803 51.7688L160.3 51.9215" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M169.616 56.332L169.791 52.3358L166.294 52.1832" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M156.41 60.7603L156.236 64.7564L159.733 64.9091" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M169.398 61.3273L169.224 65.3235L165.727 65.1708" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-</g>
-</g>
-<path d="M187.252 53.5987L185.81 57.4147C185.736 57.61 185.617 57.7853 185.463 57.9263C185.309 58.0674 185.124 58.1703 184.923 58.2269L180.996 59.3313L184.812 60.7738C185.007 60.8476 185.183 60.9662 185.324 61.1202C185.465 61.2741 185.568 61.459 185.624 61.66L186.729 65.5873L188.171 61.7712C188.245 61.5759 188.364 61.4007 188.518 61.2596C188.672 61.1186 188.856 61.0156 189.057 60.9591L192.985 59.8547L189.169 58.4122C188.973 58.3384 188.798 58.2197 188.657 58.0658C188.516 57.9118 188.413 57.7269 188.357 57.5259L187.252 53.5987Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M182.59 53.3951L182.474 56.0593M181.2 54.669L183.864 54.7854" stroke="black" stroke-opacity="0.75" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M191.507 63.1268L191.391 65.7909M190.117 64.4007L192.781 64.517" stroke="black" stroke-opacity="0.75" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M208.576 55.944C208.324 55.6685 207.972 55.5044 207.599 55.4881C207.225 55.4718 206.861 55.6044 206.585 55.8569C206.309 56.1094 206.145 56.4611 206.129 56.8345C206.113 57.208 206.245 57.5726 206.498 57.8483L212.875 64.8061C212.986 64.9271 213.124 65.0191 213.279 65.074L215.424 65.8288C215.466 65.8436 215.512 65.8465 215.556 65.8374C215.601 65.8282 215.642 65.8073 215.675 65.7768C215.708 65.7462 215.732 65.7073 215.745 65.664C215.758 65.6208 215.759 65.5749 215.748 65.5311L215.184 63.3279C215.143 63.1694 215.064 63.0233 214.953 62.9024L208.576 55.944Z" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M207.059 58.4673L209.144 56.5565" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M206.438 62.0555L205.438 62.0118" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M215.731 59.2766L216.73 59.3202" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M209.26 66.1825L209.304 65.1834" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M212.908 55.1495L212.865 56.1486" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M207.349 64.0972L206.307 65.0526" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M214.819 57.2349L215.862 56.2794" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M239.072 58.8641L240.939 61.9485L238.81 64.8584" stroke="black" stroke-width="1.5"/>
-<path d="M237.008 60.2754L237.942 61.8176L236.877 63.2725" stroke="black" stroke-width="1.5"/>
-<path d="M234.406 62.5641L234.314 64.6621C232.247 64.5718 231.386 64.5342 229.319 64.444L229.345 63.8446L234.55 59.2672L234.576 58.6678L229.581 58.4497L229.489 60.5477" stroke="black" stroke-width="1.5"/>
-<g clip-path="url(#clip8_2501_1466)">
-<mask id="mask6_2501_1466" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="250" y="54" width="18" height="18">
-<path d="M267.263 55.0902L251.278 54.3923L250.58 70.377L266.565 71.075L267.263 55.0902Z" fill="white"/>
-</mask>
-<g mask="url(#mask6_2501_1466)">
-<path d="M261.88 63.7637L261.788 65.8617C259.308 65.7534 258.274 65.7082 255.794 65.5999L255.82 65.0005L262.024 60.4668L262.05 59.8674L256.055 59.6057L255.964 61.7037" stroke="black" stroke-width="1.5"/>
-<path d="M252.537 59.9525L252.711 55.9563L256.208 56.109" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M265.525 60.5195L265.699 56.5233L262.202 56.3707" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M252.319 64.9478L252.144 68.9439L255.641 69.0966" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M265.306 65.5148L265.132 69.511L261.635 69.3583" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-</g>
-</g>
-<g clip-path="url(#clip9_2501_1466)">
-<path d="M283.161 57.7862L281.718 61.6022C281.644 61.7975 281.526 61.9728 281.372 62.1138C281.218 62.2549 281.033 62.3578 280.832 62.4144L276.905 63.5188L280.721 64.9613C280.916 65.0351 281.091 65.1537 281.232 65.3077C281.373 65.4616 281.476 65.6465 281.533 65.8475L282.637 69.7748L284.08 65.9587C284.154 65.7634 284.272 65.5882 284.426 65.4471C284.58 65.3061 284.765 65.2031 284.966 65.1466L288.893 64.0422L285.077 62.5997C284.882 62.5259 284.707 62.4072 284.566 62.2533C284.425 62.0993 284.322 61.9144 284.265 61.7134L283.161 57.7862Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M278.499 57.5826L278.382 60.2468M277.108 58.8565L279.772 58.9729" stroke="black" stroke-opacity="0.75" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M287.416 67.3143L287.3 69.9784M286.026 68.5881L288.69 68.7044" stroke="black" stroke-opacity="0.75" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<path d="M304.485 60.1315C304.232 59.8559 303.881 59.6918 303.507 59.6755C303.134 59.6592 302.769 59.7918 302.494 60.0443C302.218 60.2968 302.054 60.6485 302.038 61.022C302.021 61.3954 302.154 61.76 302.406 62.0357L308.784 68.9935C308.894 69.1146 309.033 69.2066 309.187 69.2614L311.332 70.0162C311.375 70.031 311.421 70.034 311.465 70.0248C311.509 70.0157 311.55 69.9947 311.583 69.9642C311.617 69.9337 311.641 69.8947 311.654 69.8515C311.667 69.8082 311.668 69.7623 311.657 69.7186L311.092 67.5153C311.052 67.3568 310.973 67.2107 310.862 67.0899L304.485 60.1315Z" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M302.967 62.6548L305.053 60.7439" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M302.346 66.2429L301.347 66.1993" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M311.64 63.464L312.639 63.5076" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M305.169 70.3699L305.213 69.3709" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M308.817 59.337L308.773 60.336" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M303.258 68.2846L302.215 69.2401" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M310.728 61.4223L311.771 60.4669" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<g clip-path="url(#clip10_2501_1466)">
-<path d="M331.115 59.8799L329.673 63.6959C329.599 63.8912 329.48 64.0665 329.326 64.2075C329.172 64.3486 328.987 64.4515 328.786 64.508L324.859 65.6125L328.675 67.0549C328.87 67.1288 329.046 67.2474 329.187 67.4014C329.328 67.5553 329.431 67.7402 329.487 67.9412L330.592 71.8685L332.034 68.0524C332.108 67.8571 332.227 67.6819 332.381 67.5408C332.535 67.3998 332.719 67.2968 332.92 67.2403L336.848 66.1359L333.032 64.6934C332.836 64.6196 332.661 64.5009 332.52 64.347C332.379 64.193 332.276 64.0081 332.22 63.8071L331.115 59.8799Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M326.453 59.6763L326.337 62.3404M325.063 60.9502L327.727 61.0666" stroke="black" stroke-opacity="0.75" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M335.37 69.4079L335.254 72.0721M333.98 70.6818L336.644 70.7981" stroke="black" stroke-opacity="0.75" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<path d="M358.958 64.0984L360.825 67.1828L358.696 70.0927" stroke="black" stroke-width="1.5"/>
-<path d="M356.894 65.5097L357.828 67.0519L356.763 68.5068" stroke="black" stroke-width="1.5"/>
-<path d="M354.292 67.7984L354.2 69.8964C352.133 69.8062 351.272 69.7686 349.205 69.6783L349.231 69.0789L354.436 64.5015L354.462 63.9021L349.467 63.684L349.375 65.782" stroke="black" stroke-width="1.5"/>
-<g clip-path="url(#clip11_2501_1466)">
-<mask id="mask7_2501_1466" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="370" y="59" width="18" height="18">
-<path d="M387.149 60.3245L371.164 59.6266L370.466 75.6114L386.451 76.3093L387.149 60.3245Z" fill="white"/>
-</mask>
-<g mask="url(#mask7_2501_1466)">
-<path d="M381.766 68.998L381.674 71.096C379.194 70.9877 378.16 70.9426 375.68 70.8343L375.706 70.2348L381.91 65.7011L381.936 65.1017L375.941 64.84L375.85 66.938" stroke="black" stroke-width="1.5"/>
-<path d="M372.423 65.1868L372.597 61.1906L376.094 61.3433" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M385.411 65.7538L385.585 61.7576L382.088 61.605" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M372.205 70.1821L372.03 74.1783L375.527 74.3309" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M385.192 70.7491L385.018 74.7453L381.521 74.5926" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-</g>
-</g>
-<path d="M402.246 69.8922L402.154 71.9902C400.087 71.8999 399.226 71.8623 397.159 71.7721L397.185 71.1726L402.39 66.5953L402.416 65.9959L397.421 65.7778L397.329 67.8758" stroke="black" stroke-width="1.5"/>
-<path d="M53.9459 21.166C53.6934 20.8904 53.3417 20.7263 52.9683 20.71C52.5948 20.6937 52.2302 20.8263 51.9545 21.0788C51.6789 21.3313 51.5149 21.683 51.4985 22.0565C51.4821 22.4299 51.6148 22.7945 51.8673 23.0702L58.2446 30.028C58.3551 30.1491 58.4938 30.241 58.6483 30.2959L60.7934 31.0507C60.8361 31.0655 60.8819 31.0685 60.9261 31.0593C60.9703 31.0501 61.0112 31.0292 61.0444 30.9987C61.0777 30.9682 61.1021 30.9292 61.115 30.886C61.1279 30.8427 61.1288 30.7968 61.1177 30.753L60.5533 28.5498C60.5126 28.3913 60.4335 28.2452 60.3231 28.1244L53.9459 21.166Z" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M52.4282 23.6893L54.5136 21.7784" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M51.8072 27.2774L50.8081 27.2338" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M61.1006 24.4985L62.0996 24.5421" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M54.6299 31.4044L54.6735 30.4054" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M58.278 20.3714L58.2344 21.3705" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M52.7189 29.3191L51.6763 30.2745" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M60.189 22.4568L61.2316 21.5014" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M84.4414 24.0861L86.3086 27.1704L84.1797 30.0803" stroke="black" stroke-width="1.5"/>
-<path d="M82.3779 25.4974L83.3115 27.0396L82.2471 28.4945" stroke="black" stroke-width="1.5"/>
-<path d="M79.7756 27.7861L79.684 29.8841C77.6169 29.7938 76.7558 29.7562 74.6887 29.666L74.7149 29.0666L79.9195 24.4892L79.9457 23.8898L74.9504 23.6717L74.8588 25.7697" stroke="black" stroke-width="1.5"/>
-<path d="M104.553 21.9613L103.111 25.7773C103.037 25.9726 102.918 26.1479 102.764 26.2889C102.611 26.43 102.426 26.5329 102.225 26.5895L98.2974 27.6939L102.113 29.1364C102.309 29.2102 102.484 29.3288 102.625 29.4828C102.766 29.6367 102.869 29.8216 102.926 30.0226L104.03 33.9499L105.472 30.1338C105.546 29.9385 105.665 29.7633 105.819 29.6222C105.973 29.4812 106.158 29.3782 106.359 29.3217L110.286 28.2173L106.47 26.7748C106.275 26.701 106.099 26.5823 105.958 26.4284C105.817 26.2745 105.714 26.0895 105.658 25.8885L104.553 21.9613Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M99.8912 21.7577L99.7748 24.4219M98.5009 23.0317L101.165 23.148" stroke="black" stroke-opacity="0.75" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M108.808 31.4894L108.692 34.1536M107.418 32.7633L110.082 32.8796" stroke="black" stroke-opacity="0.75" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<g clip-path="url(#clip12_2501_1466)">
-<mask id="mask8_2501_1466" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="119" y="20" width="18" height="18">
-<path d="M136.61 21.359L120.625 20.6611L119.927 36.6459L135.912 37.3438L136.61 21.359Z" fill="white"/>
-</mask>
-<g mask="url(#mask8_2501_1466)">
-<path d="M131.227 30.0325L131.135 32.1305C128.654 32.0222 127.621 31.9771 125.141 31.8688L125.167 31.2694L131.37 26.7357L131.397 26.1362L125.402 25.8745L125.311 27.9725" stroke="black" stroke-width="1.5"/>
-<path d="M121.884 26.2214L122.058 22.2252L125.555 22.3778" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M134.872 26.7884L135.046 22.7922L131.549 22.6395" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M121.666 31.2166L121.491 35.2128L124.988 35.3655" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M134.653 31.7836L134.479 35.7798L130.982 35.6272" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-</g>
-</g>
-<path d="M149.855 25.3535C149.602 25.0779 149.25 24.9138 148.877 24.8975C148.504 24.8812 148.139 25.0138 147.863 25.2663C147.588 25.5188 147.424 25.8705 147.407 26.244C147.391 26.6174 147.524 26.982 147.776 27.2577L154.153 34.2155C154.264 34.3366 154.402 34.4285 154.557 34.4834L156.702 35.2382C156.745 35.253 156.791 35.256 156.835 35.2468C156.879 35.2376 156.92 35.2167 156.953 35.1862C156.986 35.1557 157.011 35.1167 157.024 35.0735C157.037 35.0302 157.038 34.9843 157.026 34.9405L156.462 32.7373C156.421 32.5788 156.342 32.4327 156.232 32.3119L149.855 25.3535Z" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M148.337 27.8768L150.422 25.9659" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M147.716 31.4649L146.717 31.4213" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M157.009 28.686L158.008 28.7296" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M150.539 35.5919L150.582 34.5929" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M154.187 24.5589L154.143 25.558" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M148.628 33.5066L147.585 34.462" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M156.098 26.6443L157.14 25.6889" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M180.35 28.2735L182.217 31.3579L180.088 34.2678" stroke="black" stroke-width="1.5"/>
-<path d="M178.287 29.6848L179.22 31.227L178.156 32.682" stroke="black" stroke-width="1.5"/>
-<path d="M175.684 31.9735L175.593 34.0715C173.526 33.9813 172.664 33.9437 170.597 33.8534L170.624 33.254L175.828 28.6767L175.854 28.0772L170.859 27.8591L170.768 29.9571" stroke="black" stroke-width="1.5"/>
-<path d="M200.462 26.1487L199.02 29.9648C198.946 30.1601 198.827 30.3353 198.673 30.4764C198.519 30.6174 198.334 30.7204 198.133 30.7769L194.206 31.8813L198.022 33.3238C198.217 33.3976 198.393 33.5163 198.534 33.6702C198.675 33.8242 198.778 34.0091 198.834 34.2101L199.939 38.1373L201.381 34.3213C201.455 34.126 201.574 33.9507 201.728 33.8097C201.881 33.6686 202.066 33.5657 202.267 33.5092L206.195 32.4047L202.379 30.9623C202.183 30.8884 202.008 30.7698 201.867 30.6158C201.726 30.4619 201.623 30.277 201.566 30.076L200.462 26.1487Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M195.8 25.9452L195.684 28.6093M194.41 27.2191L197.074 27.3354" stroke="black" stroke-opacity="0.75" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M204.717 35.6769L204.601 38.341M203.327 36.9507L205.991 37.0671" stroke="black" stroke-opacity="0.75" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<g clip-path="url(#clip13_2501_1466)">
-<mask id="mask9_2501_1466" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="215" y="24" width="18" height="18">
-<path d="M232.519 25.5465L216.534 24.8486L215.836 40.8333L231.821 41.5313L232.519 25.5465Z" fill="white"/>
-</mask>
-<g mask="url(#mask9_2501_1466)">
-<path d="M227.135 34.22L227.044 36.318C224.563 36.2097 223.53 36.1645 221.049 36.0562L221.075 35.4568L227.279 30.9231L227.305 30.3237L221.311 30.062L221.219 32.16" stroke="black" stroke-width="1.5"/>
-<path d="M217.793 30.4088L217.967 26.4126L221.464 26.5653" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M230.78 30.9758L230.955 26.9796L227.458 26.827" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M217.574 35.4041L217.4 39.4002L220.897 39.5529" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M230.562 35.9711L230.388 39.9673L226.891 39.8146" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-</g>
-</g>
-<path d="M245.763 29.5409C245.511 29.2653 245.159 29.1012 244.786 29.0849C244.412 29.0686 244.048 29.2012 243.772 29.4538C243.496 29.7063 243.332 30.0579 243.316 30.4314C243.3 30.8048 243.432 31.1695 243.685 31.4451L250.062 38.403C250.173 38.524 250.311 38.616 250.466 38.6708L252.611 39.4256C252.654 39.4404 252.699 39.4434 252.743 39.4342C252.788 39.4251 252.829 39.4041 252.862 39.3736C252.895 39.3431 252.919 39.3042 252.932 39.2609C252.945 39.2177 252.946 39.1717 252.935 39.128L252.371 36.9247C252.33 36.7662 252.251 36.6201 252.141 36.4993L245.763 29.5409Z" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M244.246 32.0642L246.331 30.1534" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M243.625 35.6523L242.625 35.6087" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M252.918 32.8734L253.917 32.917" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M246.447 39.7794L246.491 38.7803" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M250.095 28.7464L250.052 29.7454" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M244.536 37.694L243.494 38.6495" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M252.006 30.8317L253.049 29.8763" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M276.259 32.461L278.126 35.5454L275.997 38.4553" stroke="black" stroke-width="1.5"/>
-<path d="M274.195 33.8723L275.129 35.4145L274.064 36.8695" stroke="black" stroke-width="1.5"/>
-<path d="M271.593 36.161L271.501 38.259C269.434 38.1688 268.573 38.1312 266.506 38.0409L266.532 37.4415L271.737 32.8642L271.763 32.2647L266.768 32.0466L266.676 34.1446" stroke="black" stroke-width="1.5"/>
-<g clip-path="url(#clip14_2501_1466)">
-<mask id="mask10_2501_1466" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="287" y="27" width="18" height="18">
-<path d="M304.45 28.687L288.465 27.9891L287.767 43.9739L303.752 44.6718L304.45 28.687Z" fill="white"/>
-</mask>
-<g mask="url(#mask10_2501_1466)">
-<path d="M299.067 37.3605L298.975 39.4585C296.495 39.3502 295.461 39.3051 292.981 39.1968L293.007 38.5974L299.211 34.0637L299.237 33.4642L293.242 33.2025L293.151 35.3005" stroke="black" stroke-width="1.5"/>
-<path d="M289.724 33.5494L289.898 29.5532L293.395 29.7058" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M302.712 34.1164L302.886 30.1202L299.389 29.9675" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M289.506 38.5446L289.331 42.5408L292.828 42.6935" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M302.493 39.1117L302.319 43.1078L298.822 42.9552" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-</g>
-</g>
-<path d="M317.695 32.6815C317.442 32.4059 317.091 32.2419 316.717 32.2255C316.344 32.2092 315.979 32.3419 315.703 32.5944C315.428 32.8469 315.264 33.1986 315.247 33.572C315.231 33.9455 315.364 34.3101 315.616 34.5858L321.993 41.5436C322.104 41.6646 322.243 41.7566 322.397 41.8115L324.542 42.5662C324.585 42.5811 324.631 42.584 324.675 42.5749C324.719 42.5657 324.76 42.5448 324.793 42.5142C324.826 42.4837 324.851 42.4448 324.864 42.4015C324.877 42.3583 324.878 42.3124 324.866 42.2686L324.302 40.0654C324.261 39.9069 324.182 39.7608 324.072 39.6399L317.695 32.6815Z" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M316.177 35.2048L318.262 33.294" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M315.556 38.7929L314.557 38.7493" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M324.849 36.014L325.848 36.0577" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M318.379 42.92L318.422 41.9209" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M322.027 31.887L321.983 32.886" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M316.468 40.8347L315.425 41.7901" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M323.938 33.9724L324.98 33.0169" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M344.325 32.4299L342.882 36.246C342.809 36.4413 342.69 36.6165 342.536 36.7576C342.382 36.8986 342.197 37.0016 341.996 37.0581L338.069 38.1625L341.885 39.605C342.08 39.6788 342.255 39.7975 342.396 39.9514C342.538 40.1054 342.64 40.2903 342.697 40.4913L343.801 44.4185L345.244 40.6025C345.318 40.4072 345.436 40.2319 345.59 40.0909C345.744 39.9498 345.929 39.8469 346.13 39.7903L350.057 38.6859L346.241 37.2434C346.046 37.1696 345.871 37.051 345.73 36.897C345.589 36.7431 345.486 36.5582 345.429 36.3572L344.325 32.4299Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M339.663 32.2264L339.546 34.8905M338.272 33.5003L340.937 33.6166" stroke="black" stroke-opacity="0.75" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M348.58 41.9579L348.464 44.6221M347.19 43.2318L349.854 43.3481" stroke="black" stroke-opacity="0.75" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M372.167 36.6484L374.035 39.7328L371.906 42.6427" stroke="black" stroke-width="1.5"/>
-<path d="M370.104 38.0598L371.038 39.6019L369.973 41.0569" stroke="black" stroke-width="1.5"/>
-<path d="M367.502 40.3485L367.41 42.4465C365.343 42.3562 364.482 42.3186 362.415 42.2284L362.441 41.6289L367.646 37.0516L367.672 36.4522L362.677 36.2341L362.585 38.3321" stroke="black" stroke-width="1.5"/>
-<path d="M392.279 34.5237L390.837 38.3397C390.763 38.535 390.644 38.7103 390.49 38.8513C390.336 38.9924 390.151 39.0953 389.95 39.1518L386.023 40.2563L389.839 41.6987C390.035 41.7726 390.21 41.8912 390.351 42.0452C390.492 42.1991 390.595 42.384 390.651 42.585L391.756 46.5123L393.198 42.6962C393.272 42.5009 393.391 42.3257 393.545 42.1846C393.699 42.0435 393.884 41.9406 394.085 41.8841L398.012 40.7797L394.196 39.3372C394 39.2634 393.825 39.1447 393.684 38.9908C393.543 38.8368 393.44 38.6519 393.384 38.4509L392.279 34.5237Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M387.617 34.3201L387.501 36.9842M386.227 35.594L388.891 35.7103" stroke="black" stroke-opacity="0.75" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M396.534 44.0517L396.418 46.7159M395.144 45.3256L397.808 45.4419" stroke="black" stroke-opacity="0.75" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<defs>
-<clipPath id="clip0_2501_1466">
-<rect width="400" height="92" fill="white"/>
-</clipPath>
-<clipPath id="clip1_2501_1466">
-<rect width="16" height="16" fill="white" transform="translate(109.858 -7.83563) rotate(2.5)"/>
-</clipPath>
-<clipPath id="clip2_2501_1466">
-<rect width="16" height="16" fill="white" transform="translate(181.79 -4.69507) rotate(2.5)"/>
-</clipPath>
-<clipPath id="clip3_2501_1466">
-<rect width="16" height="16" fill="white" transform="translate(277.698 -0.507568) rotate(2.5)"/>
-</clipPath>
-<clipPath id="clip4_2501_1466">
-<rect width="16" height="16" fill="white" transform="translate(301.675 0.539246) rotate(2.5)"/>
-</clipPath>
-<clipPath id="clip5_2501_1466">
-<rect width="16" height="16" fill="white" transform="translate(349.63 2.633) rotate(2.5)"/>
-</clipPath>
-<clipPath id="clip6_2501_1466">
-<rect width="16" height="16" fill="white" transform="translate(59.4612 46.0173) rotate(2.5)"/>
-</clipPath>
-<clipPath id="clip7_2501_1466">
-<rect width="16" height="16" fill="white" transform="translate(155.37 50.2048) rotate(2.5)"/>
-</clipPath>
-<clipPath id="clip8_2501_1466">
-<rect width="16" height="16" fill="white" transform="translate(251.278 54.3923) rotate(2.5)"/>
-</clipPath>
-<clipPath id="clip9_2501_1466">
-<rect width="16" height="16" fill="white" transform="translate(275.256 55.4391) rotate(2.5)"/>
-</clipPath>
-<clipPath id="clip10_2501_1466">
-<rect width="16" height="16" fill="white" transform="translate(323.21 57.5328) rotate(2.5)"/>
-</clipPath>
-<clipPath id="clip11_2501_1466">
-<rect width="16" height="16" fill="white" transform="translate(371.164 59.6266) rotate(2.5)"/>
-</clipPath>
-<clipPath id="clip12_2501_1466">
-<rect width="16" height="16" fill="white" transform="translate(120.625 20.6611) rotate(2.5)"/>
-</clipPath>
-<clipPath id="clip13_2501_1466">
-<rect width="16" height="16" fill="white" transform="translate(216.534 24.8486) rotate(2.5)"/>
-</clipPath>
-<clipPath id="clip14_2501_1466">
-<rect width="16" height="16" fill="white" transform="translate(288.465 27.9891) rotate(2.5)"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/assets/images/debugger_grid.svg b/assets/images/debugger_grid.svg
deleted file mode 100644
index 8b40dbd707..0000000000
--- a/assets/images/debugger_grid.svg
+++ /dev/null
@@ -1,890 +0,0 @@
-<svg width="400" height="92" viewBox="0 0 400 92" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_532_2318)">
-<mask id="mask0_532_2318" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="400" height="92">
-<path d="M400 0H0V92H400V0Z" fill="white"/>
-</mask>
-<g mask="url(#mask0_532_2318)">
-<g clip-path="url(#clip1_532_2318)">
-<path d="M62.1878 1.24874C60.4044 1.12767 59.0444 -0.430533 59.1654 -2.21393L59.2755 -3.8352C59.3144 -4.40851 59.5795 -4.94289 60.0124 -5.32076C60.4453 -5.69863 61.0106 -5.88906 61.5839 -5.85013L63.7456 -5.70338C64.3189 -5.66446 64.8533 -5.39938 65.2312 -4.96647C65.6091 -4.53355 65.7995 -3.96825 65.7606 -3.39494L65.6505 -1.77367C65.5294 0.00972748 63.9712 1.36981 62.1878 1.24874Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M62.1879 1.24869L62.5181 -3.61511" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M57.2873 1.45893C57.3644 0.324045 58.3491 -0.586346 59.4877 -0.563343" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M65.108 -0.181763C66.2393 -0.0506748 67.0919 0.984456 67.0149 2.11934" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g opacity="0.6" clip-path="url(#clip2_532_2318)">
-<path d="M87.1305 2.94204C85.3471 2.82097 83.987 1.26277 84.108 -0.52063L84.2181 -2.1419C84.257 -2.71521 84.5221 -3.24959 84.955 -3.62746C85.3879 -4.00534 85.9532 -4.19576 86.5266 -4.15684L88.6883 -4.01008C89.2616 -3.97116 89.7959 -3.70608 90.1738 -3.27317C90.5517 -2.84025 90.7421 -2.27495 90.7032 -1.70164L90.5931 -0.0803691C90.4721 1.70303 88.9139 3.06311 87.1305 2.94204Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M87.1305 2.94199L87.4607 -1.92181" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M82.23 3.15223C82.307 2.01734 83.2918 1.10695 84.4303 1.12996" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M92.7915 -0.474035L90.6298 -0.620789" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M90.0507 1.51154C91.1819 1.64262 92.0346 2.67775 91.9575 3.81264" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g clip-path="url(#clip3_532_2318)">
-<path d="M112.073 4.63534C110.29 4.51426 108.929 2.95606 109.051 1.17267L109.161 -0.4486C109.2 -1.02192 109.465 -1.55629 109.898 -1.93416C110.33 -2.31204 110.896 -2.50246 111.469 -2.46354L113.631 -2.31678C114.204 -2.27786 114.738 -2.01279 115.116 -1.57987C115.494 -1.14695 115.685 -0.581655 115.646 -0.00833894L115.536 1.61293C115.415 3.39632 113.856 4.75641 112.073 4.63534Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M112.073 4.63529L112.403 -0.228516" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M109.087 0.632227L106.926 0.485474" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M107.172 4.84553C107.25 3.71064 108.234 2.80025 109.373 2.82325" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M117.734 1.21926L115.572 1.07251" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M114.993 3.20483C116.124 3.33592 116.977 4.37105 116.9 5.50594" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g opacity="0.6" clip-path="url(#clip4_532_2318)">
-<path d="M135.867 -0.736649L135.903 -1.27707C135.908 -1.49674 135.958 -1.71311 136.049 -1.91312C136.14 -2.11313 136.27 -2.29262 136.433 -2.44078C136.595 -2.58894 136.786 -2.70268 136.993 -2.77515C137.2 -2.84762 137.42 -2.8773 137.64 -2.86242C137.859 -2.84754 138.073 -2.78839 138.269 -2.68855C138.464 -2.58872 138.638 -2.45025 138.779 -2.28153C138.919 -2.1128 139.024 -1.9173 139.087 -1.70683C139.151 -1.49636 139.17 -1.27528 139.146 -1.05694L139.109 -0.516519" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M137.016 6.32869C135.232 6.20762 133.872 4.64942 133.993 2.86603L134.103 1.24476C134.142 0.671444 134.407 0.13707 134.84 -0.240804C135.273 -0.618678 135.838 -0.809099 136.412 -0.770178L138.573 -0.623424C139.147 -0.584503 139.681 -0.319426 140.059 0.113491C140.437 0.546408 140.627 1.1117 140.588 1.68502L140.478 3.30629C140.357 5.08968 138.799 6.44977 137.016 6.32869Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M137.016 6.32865L137.346 1.46484" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M134.463 0.183352C133.427 0.00445886 132.625 -0.972961 132.702 -2.10785" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M134.03 2.32559L131.868 2.17883" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M132.115 6.53889C132.192 5.404 133.177 4.49361 134.315 4.51661" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M142.413 -1.44856C142.336 -0.313668 141.409 0.546349 140.375 0.584726" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M142.677 2.91262L140.515 2.76587" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M139.936 4.89819C141.067 5.02928 141.92 6.06441 141.843 7.1993" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g clip-path="url(#clip5_532_2318)">
-<path d="M160.457 -1.85242L161.404 -0.767448" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M163.695 -0.611874L164.78 -1.55889" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M160.809 0.956649L160.846 0.416226C160.851 0.196553 160.9 -0.0198148 160.991 -0.219821C161.082 -0.419827 161.213 -0.599325 161.375 -0.747482C161.538 -0.895638 161.728 -1.00938 161.936 -1.08185C162.143 -1.15432 162.363 -1.184 162.582 -1.16912C162.801 -1.15424 163.015 -1.09509 163.211 -0.995255C163.407 -0.895417 163.58 -0.756956 163.721 -0.588227C163.862 -0.419498 163.967 -0.224001 164.03 -0.0135316C164.093 0.196937 164.113 0.418014 164.088 0.636357L164.052 1.17678" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M161.958 8.02199C160.175 7.90092 158.815 6.34272 158.936 4.55933L159.046 2.93806C159.085 2.36474 159.35 1.83037 159.783 1.45249C160.216 1.07462 160.781 0.884199 161.354 0.923121L163.516 1.06987C164.089 1.1088 164.624 1.37387 165.002 1.80679C165.379 2.23971 165.57 2.805 165.531 3.37832L165.421 4.99959C165.3 6.78298 163.742 8.14306 161.958 8.02199Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M161.958 8.02195L162.288 3.15814" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M159.406 1.87665C158.37 1.69776 157.568 0.720337 157.645 -0.414551" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M158.972 4.01888L156.811 3.87213" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M157.058 8.23219C157.135 7.0973 158.12 6.18691 159.258 6.20991" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M167.356 0.244742C167.279 1.37963 166.352 2.23965 165.318 2.27802" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M167.619 4.60592L165.458 4.45917" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M164.878 6.59149C166.01 6.72258 166.862 7.75771 166.785 8.8926" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g opacity="0.6" clip-path="url(#clip6_532_2318)">
-<path d="M185.399 -0.159119L186.346 0.92585" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M188.638 1.08142L189.723 0.134404" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M185.752 2.64995L185.788 2.10952C185.793 1.88985 185.843 1.67348 185.934 1.47348C186.025 1.27347 186.156 1.09397 186.318 0.945817C186.48 0.79766 186.671 0.683916 186.878 0.611449C187.086 0.538982 187.306 0.509294 187.525 0.524177C187.744 0.53906 187.958 0.598205 188.154 0.698043C188.349 0.797881 188.523 0.936343 188.664 1.10507C188.804 1.2738 188.91 1.4693 188.973 1.67977C189.036 1.89024 189.056 2.11131 189.031 2.32966L188.994 2.87008" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M186.901 9.71529C185.117 9.59422 183.757 8.03602 183.878 6.25262L183.988 4.63136C184.027 4.05804 184.292 3.52367 184.725 3.14579C185.158 2.76792 185.724 2.5775 186.297 2.61642L188.459 2.76317C189.032 2.80209 189.566 3.06717 189.944 3.50009C190.322 3.933 190.512 4.4983 190.474 5.07162L190.363 6.69289C190.242 8.47628 188.684 9.83636 186.901 9.71529Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M186.901 9.71525L187.231 4.85144" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M184.348 3.56995C183.313 3.39106 182.51 2.41364 182.587 1.27875" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M183.915 5.71218L181.753 5.56543" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M182 9.92549C182.077 8.7906 183.062 7.88021 184.201 7.90321" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M192.299 1.93804C192.222 3.07293 191.295 3.93295 190.26 3.97132" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M192.562 6.29922L190.4 6.15247" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M189.821 8.28479C190.952 8.41588 191.805 9.45101 191.728 10.5859" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g clip-path="url(#clip7_532_2318)">
-<path d="M210.342 1.53418L211.289 2.61915" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M213.58 2.77472L214.665 1.8277" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M210.694 4.34325L210.731 3.80282C210.736 3.58315 210.786 3.36678 210.877 3.16678C210.968 2.96677 211.098 2.78727 211.26 2.63911C211.423 2.49096 211.613 2.37721 211.821 2.30475C212.028 2.23228 212.248 2.20259 212.467 2.21748C212.687 2.23236 212.9 2.2915 213.096 2.39134C213.292 2.49118 213.465 2.62964 213.606 2.79837C213.747 2.9671 213.852 3.1626 213.915 3.37307C213.978 3.58353 213.998 3.80461 213.973 4.02295L213.937 4.56338" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M211.843 11.4086C210.06 11.2875 208.7 9.72932 208.821 7.94592L208.931 6.32465C208.97 5.75134 209.235 5.21697 209.668 4.83909C210.101 4.46122 210.666 4.2708 211.239 4.30972L213.401 4.45647C213.974 4.49539 214.509 4.76047 214.887 5.19339C215.265 5.6263 215.455 6.1916 215.416 6.76492L215.306 8.38618C215.185 10.1696 213.627 11.5297 211.843 11.4086Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M211.843 11.4085L212.174 6.54474" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M209.291 5.26325C208.255 5.08435 207.453 4.10693 207.53 2.97205" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M208.858 7.40548L206.696 7.25873" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M206.943 11.6188C207.02 10.4839 208.005 9.5735 209.143 9.59651" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M217.241 3.63134C217.164 4.76623 216.237 5.62624 215.203 5.66462" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M217.504 7.99252L215.343 7.84576" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M214.764 9.97809C215.895 10.1092 216.748 11.1443 216.67 12.2792" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g opacity="0.6" clip-path="url(#clip8_532_2318)">
-<path d="M235.285 3.22748L236.232 4.31245" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M238.523 4.46802L239.608 3.521" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M235.637 6.03654L235.674 5.49612C235.679 5.27645 235.728 5.06008 235.819 4.86007C235.91 4.66007 236.041 4.48057 236.203 4.33241C236.365 4.18426 236.556 4.07051 236.763 3.99805C236.971 3.92558 237.191 3.89589 237.41 3.91077C237.629 3.92566 237.843 3.9848 238.039 4.08464C238.235 4.18448 238.408 4.32294 238.549 4.49167C238.69 4.6604 238.795 4.85589 238.858 5.06636C238.921 5.27683 238.941 5.49791 238.916 5.71625L238.879 6.25667" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M236.786 13.1019C235.003 12.9808 233.642 11.4226 233.764 9.63922L233.874 8.01795C233.913 7.44464 234.178 6.91026 234.611 6.53239C235.043 6.15452 235.609 5.96409 236.182 6.00302L238.344 6.14977C238.917 6.18869 239.451 6.45377 239.829 6.88668C240.207 7.3196 240.398 7.8849 240.359 8.45821L240.249 10.0795C240.128 11.8629 238.569 13.223 236.786 13.1019Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M236.786 13.1018L237.116 8.23804" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M234.233 6.95655C233.198 6.77765 232.395 5.80023 232.472 4.66534" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M233.8 9.09878L231.639 8.95203" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M231.885 13.3121C231.963 12.1772 232.947 11.2668 234.086 11.2898" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M242.184 5.32464C242.107 6.45953 241.18 7.31954 240.146 7.35792" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M242.447 9.68582L240.285 9.53906" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M239.706 11.6714C240.837 11.8025 241.69 12.8376 241.613 13.9725" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g clip-path="url(#clip9_532_2318)">
-<path d="M260.227 4.92084L261.174 6.00581" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M263.466 6.16138L264.551 5.21436" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M260.579 7.7299L260.616 7.18948C260.621 6.96981 260.671 6.75344 260.762 6.55343C260.853 6.35343 260.983 6.17393 261.146 6.02577C261.308 5.87762 261.498 5.76387 261.706 5.6914C261.913 5.61894 262.133 5.58925 262.353 5.60413C262.572 5.61902 262.786 5.67816 262.981 5.778C263.177 5.87784 263.351 6.0163 263.491 6.18503C263.632 6.35376 263.737 6.54925 263.8 6.75972C263.864 6.97019 263.883 7.19127 263.859 7.40961L263.822 7.95003" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M261.729 14.7952C259.945 14.6742 258.585 13.116 258.706 11.3326L258.816 9.71131C258.855 9.138 259.12 8.60362 259.553 8.22575C259.986 7.84788 260.551 7.65745 261.125 7.69638L263.286 7.84313C263.86 7.88205 264.394 8.14713 264.772 8.58004C265.15 9.01296 265.34 9.57826 265.301 10.1516L265.191 11.7728C265.07 13.5562 263.512 14.9163 261.729 14.7952Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M261.729 14.7952L262.059 9.9314" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M259.176 8.6499C258.14 8.47101 257.338 7.49359 257.415 6.3587" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M258.743 10.7921L256.581 10.6454" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M256.828 15.0054C256.905 13.8706 257.89 12.9602 259.028 12.9832" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M267.126 7.018C267.049 8.15288 266.122 9.0129 265.088 9.05128" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M267.39 11.3792L265.228 11.2324" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M264.649 13.3647C265.78 13.4958 266.633 14.531 266.556 15.6659" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g opacity="0.6" clip-path="url(#clip10_532_2318)">
-<path d="M285.17 6.61414L286.117 7.6991" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M288.408 7.85468L289.493 6.90766" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M285.522 9.4232L285.559 8.88278C285.564 8.66311 285.613 8.44674 285.704 8.24673C285.795 8.04673 285.926 7.86723 286.088 7.71907C286.25 7.57091 286.441 7.45717 286.648 7.3847C286.856 7.31224 287.076 7.28255 287.295 7.29743C287.514 7.31231 287.728 7.37146 287.924 7.4713C288.12 7.57114 288.293 7.7096 288.434 7.87833C288.575 8.04705 288.68 8.24255 288.743 8.45302C288.806 8.66349 288.826 8.88457 288.801 9.10291L288.765 9.64333" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M286.671 16.4885C284.888 16.3675 283.528 14.8093 283.649 13.0259L283.759 11.4046C283.798 10.8313 284.063 10.2969 284.496 9.91905C284.929 9.54117 285.494 9.35075 286.067 9.38967L288.229 9.53643C288.802 9.57535 289.337 9.84042 289.714 10.2733C290.092 10.7063 290.283 11.2716 290.244 11.8449L290.134 13.4661C290.013 15.2495 288.455 16.6096 286.671 16.4885Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M286.671 16.4885L287.001 11.6247" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M284.119 10.3432C283.083 10.1643 282.281 9.18689 282.358 8.052" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M283.685 12.4854L281.524 12.3387" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M281.771 16.6987C281.848 15.5639 282.832 14.6535 283.971 14.6765" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M292.069 8.7113C291.992 9.84618 291.065 10.7062 290.031 10.7446" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M292.332 13.0725L290.17 12.9257" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M289.591 15.058C290.723 15.1891 291.575 16.2243 291.498 17.3592" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g clip-path="url(#clip11_532_2318)">
-<path d="M310.112 8.30743L311.059 9.3924" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M313.351 9.54798L314.436 8.60096" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M310.465 11.1165L310.501 10.5761C310.506 10.3564 310.556 10.14 310.647 9.94003C310.738 9.74002 310.868 9.56053 311.031 9.41237C311.193 9.26421 311.384 9.15047 311.591 9.078C311.799 9.00553 312.018 8.97585 312.238 8.99073C312.457 9.00561 312.671 9.06476 312.867 9.1646C313.062 9.26443 313.236 9.4029 313.377 9.57162C313.517 9.74035 313.622 9.93585 313.686 10.1463C313.749 10.3568 313.769 10.5779 313.744 10.7962L313.707 11.3366" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M311.614 18.1818C309.83 18.0608 308.47 16.5026 308.591 14.7192L308.701 13.0979C308.74 12.5246 309.005 11.9902 309.438 11.6123C309.871 11.2345 310.437 11.0441 311.01 11.083L313.172 11.2297C313.745 11.2686 314.279 11.5337 314.657 11.9666C315.035 12.3996 315.225 12.9649 315.186 13.5382L315.076 15.1594C314.955 16.9428 313.397 18.3029 311.614 18.1818Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M311.614 18.1818L311.944 13.318" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M309.061 12.0365C308.025 11.8576 307.223 10.8802 307.3 9.7453" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M308.628 14.1787L306.466 14.032" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M306.713 18.392C306.79 17.2572 307.775 16.3468 308.914 16.3698" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M317.012 10.4046C316.935 11.5395 316.008 12.3995 314.973 12.4379" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M317.275 14.7658L315.113 14.619" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M314.534 16.7513C315.665 16.8824 316.518 17.9176 316.441 19.0524" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g opacity="0.6" clip-path="url(#clip12_532_2318)">
-<path d="M335.055 10.0007L336.002 11.0857" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M338.293 11.2413L339.378 10.2943" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M335.407 12.8098L335.444 12.2694C335.449 12.0497 335.498 11.8333 335.589 11.6333C335.68 11.4333 335.811 11.2538 335.973 11.1057C336.136 10.9575 336.326 10.8438 336.534 10.7713C336.741 10.6988 336.961 10.6691 337.18 10.684C337.399 10.6989 337.613 10.7581 337.809 10.8579C338.005 10.9577 338.178 11.0962 338.319 11.2649C338.46 11.4337 338.565 11.6291 338.628 11.8396C338.691 12.0501 338.711 12.2712 338.686 12.4895L338.65 13.0299" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M336.556 19.8751C334.773 19.7541 333.413 18.1959 333.534 16.4125L333.644 14.7912C333.683 14.2179 333.948 13.6835 334.381 13.3056C334.814 12.9278 335.379 12.7373 335.952 12.7763L338.114 12.923C338.687 12.9619 339.222 13.227 339.6 13.6599C339.978 14.0929 340.168 14.6582 340.129 15.2315L340.019 16.8527C339.898 18.6361 338.34 19.9962 336.556 19.8751Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M336.556 19.8751L336.886 15.0113" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M334.004 13.7298C332.968 13.5509 332.166 12.5735 332.243 11.4386" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M333.571 15.872L331.409 15.7253" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M331.656 20.0853C331.733 18.9504 332.718 18.0401 333.856 18.0631" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M341.954 12.0979C341.877 13.2328 340.95 14.0928 339.916 14.1312" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M342.217 16.4591L340.056 16.3123" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M339.477 18.4446C340.608 18.5757 341.46 19.6109 341.383 20.7457" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g clip-path="url(#clip13_532_2318)">
-<path d="M359.998 11.694L360.945 12.779" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M363.236 12.9346L364.321 11.9876" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M360.35 14.5031L360.386 13.9627C360.392 13.743 360.441 13.5266 360.532 13.3266C360.623 13.1266 360.754 12.9471 360.916 12.799C361.078 12.6508 361.269 12.5371 361.476 12.4646C361.684 12.3921 361.904 12.3624 362.123 12.3773C362.342 12.3922 362.556 12.4514 362.752 12.5512C362.947 12.651 363.121 12.7895 363.262 12.9582C363.402 13.1269 363.508 13.3224 363.571 13.5329C363.634 13.7434 363.654 13.9645 363.629 14.1828L363.592 14.7232" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M361.499 21.5684C359.715 21.4474 358.355 19.8892 358.476 18.1058L358.587 16.4845C358.625 15.9112 358.891 15.3768 359.323 14.9989C359.756 14.6211 360.322 14.4306 360.895 14.4696L363.057 14.6163C363.63 14.6552 364.164 14.9203 364.542 15.3532C364.92 15.7862 365.111 16.3515 365.072 16.9248L364.962 18.546C364.84 20.3294 363.282 21.6895 361.499 21.5684Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M361.499 21.5684L361.829 16.7046" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M358.946 15.4231C357.911 15.2442 357.108 14.2668 357.185 13.1319" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M358.513 17.5653L356.351 17.4186" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M356.598 21.7786C356.675 20.6437 357.66 19.7334 358.799 19.7564" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M366.897 13.7912C366.82 14.9261 365.893 15.7861 364.859 15.8245" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M367.16 18.1524L364.998 18.0056" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M364.419 20.1379C365.55 20.269 366.403 21.3042 366.326 22.439" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g opacity="0.6" clip-path="url(#clip14_532_2318)">
-<path d="M384.94 13.3874L385.887 14.4724" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M388.179 14.6279L389.264 13.6809" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M385.292 16.1965L385.329 15.656C385.334 15.4364 385.384 15.22 385.475 15.02C385.566 14.82 385.696 14.6405 385.859 14.4923C386.021 14.3442 386.211 14.2304 386.419 14.158C386.626 14.0855 386.846 14.0558 387.065 14.0707C387.285 14.0856 387.499 14.1447 387.694 14.2446C387.89 14.3444 388.064 14.4829 388.204 14.6516C388.345 14.8203 388.45 15.0158 388.513 15.2263C388.576 15.4367 388.596 15.6578 388.572 15.8762L388.535 16.4166" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M386.441 23.2618C384.658 23.1407 383.298 21.5825 383.419 19.7991L383.529 18.1779C383.568 17.6045 383.833 17.0702 384.266 16.6923C384.699 16.3144 385.264 16.124 385.838 16.1629L387.999 16.3097C388.573 16.3486 389.107 16.6137 389.485 17.0466C389.863 17.4795 390.053 18.0448 390.014 18.6181L389.904 20.2394C389.783 22.0228 388.225 23.3829 386.441 23.2618Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M386.441 23.2618L386.772 18.3979" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M383.889 17.1165C382.853 16.9376 382.051 15.9601 382.128 14.8253" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M383.456 19.2587L381.294 19.1119" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M381.541 23.472C381.618 22.3371 382.603 21.4267 383.741 21.4497" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M391.839 15.4845C391.762 16.6194 390.835 17.4795 389.801 17.5178" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M392.103 19.8457L389.941 19.699" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M389.362 21.8313C390.493 21.9624 391.346 22.9975 391.269 24.1324" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g clip-path="url(#clip15_532_2318)">
-<path d="M59.2642 12.3261L60.2112 13.4111" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M62.5026 13.5667L63.5875 12.6196" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M59.6164 15.1352L59.6531 14.5948C59.6582 14.3751 59.7077 14.1587 59.7987 13.9587C59.8897 13.7587 60.0203 13.5792 60.1825 13.431C60.3448 13.2829 60.5354 13.1691 60.7429 13.0967C60.9503 13.0242 61.1703 12.9945 61.3895 13.0094C61.6087 13.0243 61.8227 13.0834 62.0184 13.1833C62.2141 13.2831 62.3876 13.4216 62.5284 13.5903C62.6691 13.759 62.7742 13.9545 62.8374 14.165C62.9005 14.3755 62.9203 14.5965 62.8957 14.8149L62.859 15.3553" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M60.7655 22.2005C58.9821 22.0794 57.622 20.5212 57.7431 18.7379L57.8531 17.1166C57.892 16.5433 58.1571 16.0089 58.59 15.631C59.023 15.2531 59.5883 15.0627 60.1616 15.1016L62.3233 15.2484C62.8966 15.2873 63.4309 15.5524 63.8088 15.9853C64.1867 16.4182 64.3771 16.9835 64.3382 17.5568L64.2281 19.1781C64.1071 20.9615 62.5489 22.3216 60.7655 22.2005Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M60.7655 22.2005L61.0957 17.3367" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M58.213 16.0552C57.1773 15.8763 56.375 14.8989 56.452 13.764" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M57.7797 18.1974L55.618 18.0507" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M55.865 22.4107C55.942 21.2758 56.9268 20.3654 58.0653 20.3884" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M66.1633 14.4233C66.0863 15.5582 65.1592 16.4182 64.1251 16.4566" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M66.4265 18.7844L64.2648 18.6377" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M63.6857 20.77C64.8169 20.9011 65.6696 21.9362 65.5925 23.0711" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g opacity="0.6" clip-path="url(#clip16_532_2318)">
-<path d="M84.2068 14.0194L85.1538 15.1044" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M87.4452 15.26L88.5302 14.3129" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M84.5591 16.8285L84.5958 16.2881C84.6008 16.0684 84.6503 15.852 84.7413 15.652C84.8323 15.452 84.9629 15.2725 85.1252 15.1243C85.2874 14.9762 85.478 14.8624 85.6855 14.79C85.8929 14.7175 86.1129 14.6878 86.3321 14.7027C86.5513 14.7176 86.7653 14.7767 86.961 14.8766C87.1568 14.9764 87.3302 15.1149 87.471 15.2836C87.6118 15.4523 87.7169 15.6478 87.78 15.8583C87.8431 16.0688 87.863 16.2898 87.8383 16.5082L87.8016 17.0486" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M85.7081 23.8938C83.9247 23.7727 82.5646 22.2145 82.6857 20.4312L82.7958 18.8099C82.8347 18.2366 83.0997 17.7022 83.5327 17.3243C83.9656 16.9464 84.5309 16.756 85.1042 16.7949L87.2659 16.9417C87.8392 16.9806 88.3736 17.2457 88.7515 17.6786C89.1293 18.1115 89.3197 18.6768 89.2808 19.2501L89.1708 20.8714C89.0497 22.6548 87.4915 24.0149 85.7081 23.8938Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M85.7081 23.8938L86.0383 19.03" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M83.1556 17.7485C82.1199 17.5696 81.3176 16.5922 81.3947 15.4573" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M82.7224 19.8907L80.5607 19.744" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M80.8076 24.104C80.8846 22.9691 81.8694 22.0587 83.008 22.0817" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M91.106 16.1166C91.0289 17.2515 90.1019 18.1115 89.0677 18.1499" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M91.3691 20.4777L89.2074 20.331" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M88.6283 22.4633C89.7595 22.5944 90.6122 23.6295 90.5351 24.7644" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g clip-path="url(#clip17_532_2318)">
-<path d="M109.149 15.7127L110.096 16.7977" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M112.388 16.9533L113.473 16.0062" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M109.502 18.5218L109.538 17.9814C109.543 17.7617 109.593 17.5453 109.684 17.3453C109.775 17.1453 109.905 16.9658 110.068 16.8176C110.23 16.6695 110.421 16.5557 110.628 16.4833C110.835 16.4108 111.055 16.3811 111.275 16.396C111.494 16.4109 111.708 16.47 111.904 16.5699C112.099 16.6697 112.273 16.8082 112.414 16.9769C112.554 17.1456 112.659 17.3411 112.723 17.5516C112.786 17.7621 112.805 17.9831 112.781 18.2015L112.744 18.7419" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M110.651 25.5871C108.867 25.466 107.507 23.9078 107.628 22.1245L107.738 20.5032C107.777 19.9299 108.042 19.3955 108.475 19.0176C108.908 18.6397 109.473 18.4493 110.047 18.4882L112.208 18.635C112.782 18.6739 113.316 18.939 113.694 19.3719C114.072 19.8048 114.262 20.3701 114.223 20.9434L114.113 22.5647C113.992 24.3481 112.434 25.7082 110.651 25.5871Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M110.651 25.5871L110.981 20.7233" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M108.098 19.4418C107.062 19.2629 106.26 18.2855 106.337 17.1506" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M107.665 21.584L105.503 21.4373" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M105.75 25.7973C105.827 24.6624 106.812 23.752 107.95 23.775" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M116.048 17.8099C115.971 18.9448 115.044 19.8048 114.01 19.8431" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M116.312 22.171L114.15 22.0243" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M113.571 24.1566C114.702 24.2877 115.555 25.3228 115.478 26.4577" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g opacity="0.6" clip-path="url(#clip18_532_2318)">
-<path d="M134.092 17.4061L135.039 18.491" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M137.33 18.6466L138.415 17.6996" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M134.444 20.2151L134.481 19.6747C134.486 19.455 134.535 19.2387 134.626 19.0387C134.717 18.8387 134.848 18.6592 135.01 18.511C135.173 18.3628 135.363 18.2491 135.571 18.1766C135.778 18.1042 135.998 18.0745 136.217 18.0894C136.436 18.1042 136.65 18.1634 136.846 18.2632C137.042 18.3631 137.215 18.5015 137.356 18.6703C137.497 18.839 137.602 19.0345 137.665 19.245C137.728 19.4554 137.748 19.6765 137.723 19.8948L137.687 20.4353" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M135.593 27.2805C133.81 27.1594 132.45 25.6012 132.571 23.8178L132.681 22.1965C132.72 21.6232 132.985 21.0889 133.418 20.711C133.851 20.3331 134.416 20.1427 134.989 20.1816L137.151 20.3284C137.724 20.3673 138.259 20.6324 138.637 21.0653C139.014 21.4982 139.205 22.0635 139.166 22.6368L139.056 24.2581C138.935 26.0415 137.377 27.4015 135.593 27.2805Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M135.593 27.2804L135.923 22.4166" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M133.041 21.1351C132.005 20.9562 131.203 19.9788 131.28 18.8439" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M132.607 23.2774L130.446 23.1306" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M130.693 27.4907C130.77 26.3558 131.755 25.4454 132.893 25.4684" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M140.991 19.5032C140.914 20.6381 139.987 21.4981 138.953 21.5365" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M141.254 23.8644L139.093 23.7177" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M138.513 25.85C139.645 25.9811 140.497 27.0162 140.42 28.1511" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g clip-path="url(#clip19_532_2318)">
-<path d="M159.035 19.0994L159.982 20.1843" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M162.273 20.3399L163.358 19.3929" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M159.387 21.9084L159.424 21.368C159.429 21.1483 159.478 20.932 159.569 20.732C159.66 20.532 159.791 20.3525 159.953 20.2043C160.115 20.0561 160.306 19.9424 160.513 19.8699C160.721 19.7975 160.941 19.7678 161.16 19.7827C161.379 19.7975 161.593 19.8567 161.789 19.9565C161.985 20.0564 162.158 20.1948 162.299 20.3636C162.44 20.5323 162.545 20.7278 162.608 20.9383C162.671 21.1487 162.691 21.3698 162.666 21.5881L162.629 22.1286" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M160.536 28.9738C158.752 28.8527 157.392 27.2945 157.513 25.5111L157.624 23.8898C157.662 23.3165 157.928 22.7822 158.36 22.4043C158.793 22.0264 159.359 21.836 159.932 21.8749L162.094 22.0217C162.667 22.0606 163.201 22.3257 163.579 22.7586C163.957 23.1915 164.148 23.7568 164.109 24.3301L163.999 25.9514C163.877 27.7348 162.319 29.0948 160.536 28.9738Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M160.536 28.9737L160.866 24.1099" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M157.983 22.8284C156.948 22.6495 156.145 21.6721 156.222 20.5372" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M157.55 24.9707L155.388 24.8239" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M155.635 29.184C155.712 28.0491 156.697 27.1387 157.836 27.1617" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M165.934 21.1965C165.857 22.3314 164.93 23.1914 163.896 23.2298" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M166.197 25.5577L164.035 25.4109" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M163.456 27.5433C164.587 27.6744 165.44 28.7095 165.363 29.8444" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g opacity="0.6" clip-path="url(#clip20_532_2318)">
-<path d="M183.977 20.7927L184.924 21.8776" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M187.216 22.0332L188.3 21.0862" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M184.329 23.6017L184.366 23.0613C184.371 22.8416 184.421 22.6253 184.512 22.4253C184.603 22.2253 184.733 22.0458 184.895 21.8976C185.058 21.7494 185.248 21.6357 185.456 21.5632C185.663 21.4908 185.883 21.4611 186.102 21.476C186.322 21.4908 186.536 21.55 186.731 21.6498C186.927 21.7497 187.101 21.8881 187.241 22.0569C187.382 22.2256 187.487 22.4211 187.55 22.6315C187.613 22.842 187.633 23.0631 187.609 23.2814L187.572 23.8219" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M185.478 30.6671C183.695 30.546 182.335 28.9878 182.456 27.2044L182.566 25.5831C182.605 25.0098 182.87 24.4754 183.303 24.0976C183.736 23.7197 184.301 23.5293 184.875 23.5682L187.036 23.715C187.61 23.7539 188.144 24.019 188.522 24.4519C188.9 24.8848 189.09 25.4501 189.051 26.0234L188.941 27.6447C188.82 29.4281 187.262 30.7881 185.478 30.6671Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M185.478 30.667L185.809 25.8032" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M182.926 24.5217C181.89 24.3428 181.088 23.3654 181.165 22.2305" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M182.493 26.664L180.331 26.5172" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M180.578 30.8773C180.655 29.7424 181.64 28.832 182.778 28.855" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M190.876 22.8898C190.799 24.0247 189.872 24.8847 188.838 24.9231" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M191.139 27.251L188.978 27.1042" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M188.399 29.2366C189.53 29.3677 190.383 30.4028 190.306 31.5377" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g clip-path="url(#clip21_532_2318)">
-<path d="M208.92 22.486L209.867 23.5709" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M212.158 23.7265L213.243 22.7795" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M209.272 25.295L209.309 24.7546C209.314 24.5349 209.363 24.3186 209.454 24.1186C209.545 23.9186 209.676 23.7391 209.838 23.5909C210 23.4427 210.191 23.329 210.398 23.2565C210.606 23.1841 210.826 23.1544 211.045 23.1693C211.264 23.1841 211.478 23.2433 211.674 23.3431C211.87 23.443 212.043 23.5814 212.184 23.7502C212.325 23.9189 212.43 24.1144 212.493 24.3248C212.556 24.5353 212.576 24.7564 212.551 24.9747L212.514 25.5152" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M210.421 32.3604C208.638 32.2393 207.278 30.6811 207.399 28.8977L207.509 27.2764C207.548 26.7031 207.813 26.1687 208.246 25.7909C208.678 25.413 209.244 25.2226 209.817 25.2615L211.979 25.4083C212.552 25.4472 213.086 25.7123 213.464 26.1452C213.842 26.5781 214.033 27.1434 213.994 27.7167L213.884 29.338C213.763 31.1214 212.204 32.4814 210.421 32.3604Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M210.421 32.3603L210.751 27.4965" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M207.868 26.215C206.833 26.0361 206.03 25.0587 206.107 23.9238" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M207.435 28.3573L205.274 28.2105" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M205.52 32.5706C205.598 31.4357 206.582 30.5253 207.721 30.5483" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M215.819 24.5831C215.742 25.718 214.815 26.578 213.781 26.6164" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M216.082 28.9443L213.92 28.7975" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M213.341 30.9299C214.472 31.061 215.325 32.0961 215.248 33.231" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g opacity="0.6" clip-path="url(#clip22_532_2318)">
-<path d="M233.862 24.1793L234.809 25.2642" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M237.101 25.4198L238.186 24.4728" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M234.215 26.9883L234.251 26.4479C234.256 26.2282 234.306 26.0119 234.397 25.8119C234.488 25.6118 234.618 25.4324 234.781 25.2842C234.943 25.136 235.134 25.0223 235.341 24.9498C235.548 24.8774 235.768 24.8477 235.988 24.8626C236.207 24.8774 236.421 24.9366 236.616 25.0364C236.812 25.1363 236.986 25.2747 237.126 25.4435C237.267 25.6122 237.372 25.8077 237.435 26.0181C237.499 26.2286 237.518 26.4497 237.494 26.668L237.457 27.2085" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M235.364 34.0537C233.58 33.9326 232.22 32.3744 232.341 30.591L232.451 28.9697C232.49 28.3964 232.755 27.862 233.188 27.4842C233.621 27.1063 234.186 26.9159 234.76 26.9548L236.921 27.1016C237.495 27.1405 238.029 27.4055 238.407 27.8385C238.785 28.2714 238.975 28.8367 238.936 29.41L238.826 31.0313C238.705 32.8147 237.147 34.1747 235.364 34.0537Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M235.364 34.0536L235.694 29.1898" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M232.811 27.9083C231.775 27.7294 230.973 26.752 231.05 25.6171" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M232.378 30.0506L230.216 29.9038" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M230.463 34.2639C230.54 33.129 231.525 32.2186 232.663 32.2416" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M240.762 26.2764C240.684 27.4113 239.757 28.2713 238.723 28.3097" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M241.025 30.6376L238.863 30.4908" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M238.284 32.6232C239.415 32.7543 240.268 33.7894 240.191 34.9243" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g clip-path="url(#clip23_532_2318)">
-<path d="M258.805 25.8726L259.752 26.9576" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M262.043 27.1132L263.128 26.1661" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M259.157 28.6817L259.194 28.1413C259.199 27.9216 259.248 27.7052 259.339 27.5052C259.43 27.3052 259.561 27.1257 259.723 26.9776C259.885 26.8294 260.076 26.7157 260.284 26.6432C260.491 26.5707 260.711 26.541 260.93 26.5559C261.149 26.5708 261.363 26.6299 261.559 26.7298C261.755 26.8296 261.928 26.9681 262.069 27.1368C262.21 27.3055 262.315 27.501 262.378 27.7115C262.441 27.922 262.461 28.1431 262.436 28.3614L262.4 28.9018" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M260.306 35.747C258.523 35.626 257.163 34.0678 257.284 32.2844L257.394 30.6631C257.433 30.0898 257.698 29.5554 258.131 29.1775C258.564 28.7997 259.129 28.6092 259.702 28.6482L261.864 28.7949C262.437 28.8338 262.972 29.0989 263.35 29.5318C263.727 29.9647 263.918 30.53 263.879 31.1034L263.769 32.7246C263.648 34.508 262.09 35.8681 260.306 35.747Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M260.306 35.747L260.636 30.8832" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M257.754 29.6017C256.718 29.4228 255.916 28.4454 255.993 27.3105" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M257.32 31.7439L255.159 31.5972" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M255.406 35.9572C255.483 34.8223 256.467 33.9119 257.606 33.9349" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M265.704 27.9698C265.627 29.1047 264.7 29.9647 263.666 30.0031" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M265.967 32.331L263.806 32.1842" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M263.226 34.3165C264.358 34.4476 265.21 35.4827 265.133 36.6176" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g opacity="0.6" clip-path="url(#clip24_532_2318)">
-<path d="M283.747 27.5659L284.694 28.6509" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M286.986 28.8065L288.071 27.8594" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M284.1 30.375L284.136 29.8346C284.141 29.6149 284.191 29.3985 284.282 29.1985C284.373 28.9985 284.503 28.819 284.666 28.6709C284.828 28.5227 285.019 28.409 285.226 28.3365C285.434 28.264 285.653 28.2343 285.873 28.2492C286.092 28.2641 286.306 28.3232 286.502 28.4231C286.697 28.5229 286.871 28.6614 287.012 28.8301C287.152 28.9988 287.257 29.1943 287.321 29.4048C287.384 29.6153 287.404 29.8363 287.379 30.0547L287.342 30.5951" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M285.249 37.4403C283.465 37.3193 282.105 35.7611 282.226 33.9777L282.336 32.3564C282.375 31.7831 282.64 31.2487 283.073 30.8708C283.506 30.493 284.072 30.3025 284.645 30.3415L286.807 30.4882C287.38 30.5271 287.914 30.7922 288.292 31.2251C288.67 31.658 288.86 32.2233 288.821 32.7967L288.711 34.4179C288.59 36.2013 287.032 37.5614 285.249 37.4403Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M285.249 37.4403L285.579 32.5765" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M282.696 31.295C281.661 31.1161 280.858 30.1387 280.935 29.0038" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M282.263 33.4372L280.101 33.2905" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M280.348 37.6505C280.425 36.5156 281.41 35.6052 282.549 35.6282" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M290.647 29.6631C290.57 30.798 289.643 31.658 288.608 31.6964" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M290.91 34.0243L288.748 33.8775" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M288.169 36.0098C289.3 36.1409 290.153 37.176 290.076 38.3109" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g clip-path="url(#clip25_532_2318)">
-<path d="M308.69 29.2592L309.637 30.3442" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M311.928 30.4998L313.013 29.5527" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M309.042 32.0683L309.079 31.5279C309.084 31.3082 309.134 31.0918 309.225 30.8918C309.316 30.6918 309.446 30.5123 309.608 30.3642C309.771 30.216 309.961 30.1023 310.169 30.0298C310.376 29.9573 310.596 29.9276 310.815 29.9425C311.035 29.9574 311.248 30.0165 311.444 30.1164C311.64 30.2162 311.813 30.3547 311.954 30.5234C312.095 30.6921 312.2 30.8876 312.263 31.0981C312.326 31.3086 312.346 31.5296 312.322 31.748L312.285 32.2884" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M310.191 39.1336C308.408 39.0126 307.048 37.4544 307.169 35.671L307.279 34.0497C307.318 33.4764 307.583 32.942 308.016 32.5641C308.449 32.1863 309.014 31.9958 309.587 32.0348L311.749 32.1815C312.322 32.2204 312.857 32.4855 313.235 32.9184C313.613 33.3513 313.803 33.9166 313.764 34.49L313.654 36.1112C313.533 37.8946 311.975 39.2547 310.191 39.1336Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M310.191 39.1336L310.522 34.2698" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M307.639 32.9883C306.603 32.8094 305.801 31.832 305.878 30.6971" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M307.206 35.1305L305.044 34.9838" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M305.291 39.3438C305.368 38.2089 306.353 37.2985 307.491 37.3215" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M315.589 31.3564C315.512 32.4913 314.585 33.3513 313.551 33.3897" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M315.852 35.7176L313.691 35.5708" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M313.112 37.7031C314.243 37.8342 315.096 38.8693 315.018 40.0042" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g opacity="0.6" clip-path="url(#clip26_532_2318)">
-<path d="M333.633 30.9525L334.58 32.0375" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M336.871 32.1931L337.956 31.246" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M333.985 33.7616L334.022 33.2212C334.027 33.0015 334.076 32.7851 334.167 32.5851C334.258 32.3851 334.389 32.2056 334.551 32.0574C334.713 31.9093 334.904 31.7955 335.111 31.7231C335.319 31.6506 335.539 31.6209 335.758 31.6358C335.977 31.6507 336.191 31.7098 336.387 31.8097C336.583 31.9095 336.756 32.048 336.897 32.2167C337.038 32.3854 337.143 32.5809 337.206 32.7914C337.269 33.0019 337.289 33.2229 337.264 33.4413L337.227 33.9817" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M335.134 40.8269C333.351 40.7059 331.99 39.1477 332.112 37.3643L332.222 35.743C332.261 35.1697 332.526 34.6353 332.959 34.2574C333.391 33.8796 333.957 33.6891 334.53 33.7281L336.692 33.8748C337.265 33.9137 337.799 34.1788 338.177 34.6117C338.555 35.0446 338.746 35.6099 338.707 36.1833L338.597 37.8045C338.476 39.5879 336.917 40.948 335.134 40.8269Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M335.134 40.8269L335.464 35.9631" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M332.581 34.6816C331.546 34.5027 330.743 33.5253 330.82 32.3904" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M332.148 36.8238L329.987 36.6771" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M330.233 41.0371C330.31 39.9022 331.295 38.9918 332.434 39.0148" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M340.532 33.0497C340.455 34.1846 339.528 35.0446 338.494 35.083" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M340.795 37.4109L338.633 37.2641" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M338.054 39.3964C339.185 39.5275 340.038 40.5626 339.961 41.6975" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g clip-path="url(#clip27_532_2318)">
-<path d="M358.575 32.6458L359.522 33.7308" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M361.814 33.8864L362.899 32.9393" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M358.927 35.4549L358.964 34.9145C358.969 34.6948 359.019 34.4784 359.11 34.2784C359.201 34.0784 359.331 33.8989 359.494 33.7507C359.656 33.6026 359.846 33.4888 360.054 33.4164C360.261 33.3439 360.481 33.3142 360.7 33.3291C360.92 33.344 361.134 33.4031 361.329 33.503C361.525 33.6028 361.699 33.7413 361.839 33.91C361.98 34.0787 362.085 34.2742 362.148 34.4847C362.211 34.6952 362.231 34.9162 362.207 35.1346L362.17 35.675" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M360.077 42.5202C358.293 42.3992 356.933 40.841 357.054 39.0576L357.164 37.4363C357.203 36.863 357.468 36.3286 357.901 35.9507C358.334 35.5729 358.899 35.3824 359.473 35.4214L361.634 35.5681C362.208 35.607 362.742 35.8721 363.12 36.305C363.498 36.7379 363.688 37.3032 363.649 37.8765L363.539 39.4978C363.418 41.2812 361.86 42.6413 360.077 42.5202Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M360.076 42.5202L360.407 37.6564" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M357.524 36.3749C356.488 36.196 355.686 35.2186 355.763 34.0837" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M357.091 38.5171L354.929 38.3704" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M355.176 42.7304C355.253 41.5955 356.238 40.6851 357.376 40.7081" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M365.474 34.743C365.397 35.8779 364.47 36.7379 363.436 36.7763" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M365.738 39.1042L363.576 38.9574" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M362.997 41.0897C364.128 41.2208 364.981 42.2559 364.904 43.3908" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g opacity="0.6" clip-path="url(#clip28_532_2318)">
-<path d="M383.518 34.3392L384.465 35.4241" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M386.756 35.5797L387.841 34.6327" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M383.87 37.1482L383.907 36.6078C383.912 36.3881 383.961 36.1718 384.052 35.9718C384.143 35.7718 384.274 35.5923 384.436 35.4441C384.598 35.296 384.789 35.1822 384.996 35.1097C385.204 35.0373 385.424 35.0076 385.643 35.0225C385.862 35.0374 386.076 35.0965 386.272 35.1963C386.468 35.2962 386.641 35.4346 386.782 35.6034C386.923 35.7721 387.028 35.9676 387.091 36.1781C387.154 36.3885 387.174 36.6096 387.149 36.8279L387.113 37.3684" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M385.019 44.2136C383.236 44.0925 381.876 42.5343 381.997 40.7509L382.107 39.1296C382.146 38.5563 382.411 38.022 382.844 37.6441C383.277 37.2662 383.842 37.0758 384.415 37.1147L386.577 37.2615C387.15 37.3004 387.685 37.5655 388.062 37.9984C388.44 38.4313 388.631 38.9966 388.592 39.5699L388.482 41.1912C388.361 42.9746 386.803 44.3347 385.019 44.2136Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M385.019 44.2135L385.349 39.3497" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M382.467 38.0682C381.431 37.8893 380.629 36.9119 380.706 35.777" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M382.033 40.2105L379.872 40.0637" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M380.119 44.4238C380.196 43.2889 381.18 42.3785 382.319 42.4015" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M390.417 36.4363C390.34 37.5712 389.413 38.4312 388.379 38.4696" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M390.68 40.7975L388.518 40.6508" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M387.939 42.7831C389.071 42.9142 389.923 43.9493 389.846 45.0842" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g clip-path="url(#clip29_532_2318)">
-<path d="M57.8418 33.2779L58.7888 34.3629" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M61.0802 34.5184L62.1652 33.5714" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M58.1941 36.087L58.2308 35.5465C58.2358 35.3269 58.2854 35.1105 58.3763 34.9105C58.4673 34.7105 58.5979 34.531 58.7602 34.3828C58.9225 34.2347 59.1131 34.1209 59.3205 34.0485C59.5279 33.976 59.7479 33.9463 59.9671 33.9612C60.1864 33.9761 60.4003 34.0352 60.596 34.1351C60.7918 34.2349 60.9653 34.3734 61.106 34.5421C61.2468 34.7108 61.3519 34.9063 61.415 35.1168C61.4781 35.3272 61.498 35.5483 61.4733 35.7667L61.4366 36.3071" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M59.3431 43.1523C57.5597 43.0312 56.1996 41.473 56.3207 39.6896L56.4308 38.0684C56.4697 37.4951 56.7348 36.9607 57.1677 36.5828C57.6006 36.2049 58.1659 36.0145 58.7392 36.0534L60.9009 36.2002C61.4742 36.2391 62.0086 36.5042 62.3865 36.9371C62.7643 37.37 62.9548 37.9353 62.9158 38.5086L62.8058 40.1299C62.6847 41.9133 61.1265 43.2734 59.3431 43.1523Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M59.3431 43.1523L59.6733 38.2885" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M56.7906 37.007C55.7549 36.8281 54.9526 35.8506 55.0297 34.7158" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M56.3574 39.1492L54.1957 39.0024" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M54.4426 43.3625C54.5196 42.2276 55.5044 41.3172 56.643 41.3402" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M64.741 35.3751C64.6639 36.5099 63.7369 37.37 62.7027 37.4083" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M65.0041 39.7362L62.8424 39.5895" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M62.2633 41.7218C63.3945 41.8529 64.2472 42.888 64.1702 44.0229" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g opacity="0.6" clip-path="url(#clip30_532_2318)">
-<path d="M82.7844 34.9712L83.7314 36.0562" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M86.0228 36.2117L87.1078 35.2647" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M83.1367 37.7803L83.1734 37.2398C83.1785 37.0202 83.228 36.8038 83.319 36.6038C83.41 36.4038 83.5405 36.2243 83.7028 36.0761C83.8651 35.928 84.0557 35.8142 84.2631 35.7418C84.4706 35.6693 84.6905 35.6396 84.9098 35.6545C85.129 35.6694 85.3429 35.7285 85.5387 35.8284C85.7344 35.9282 85.9079 36.0667 86.0486 36.2354C86.1894 36.4041 86.2945 36.5996 86.3576 36.8101C86.4208 37.0205 86.4406 37.2416 86.4159 37.46L86.3792 38.0004" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M84.2857 44.8456C82.5023 44.7245 81.1423 43.1663 81.2633 41.3829L81.3734 39.7617C81.4123 39.1884 81.6774 38.654 82.1103 38.2761C82.5432 37.8982 83.1085 37.7078 83.6818 37.7467L85.8435 37.8935C86.4168 37.9324 86.9512 38.1975 87.3291 38.6304C87.707 39.0633 87.8974 39.6286 87.8585 40.2019L87.7484 41.8232C87.6273 43.6066 86.0691 44.9667 84.2857 44.8456Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M84.2858 44.8456L84.616 39.9818" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M81.7332 38.7003C80.6976 38.5214 79.8952 37.5439 79.9723 36.4091" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M81.3 40.8425L79.1383 40.6957" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M79.3852 45.0558C79.4623 43.9209 80.447 43.0105 81.5856 43.0335" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M89.6836 37.0684C89.6065 38.2032 88.6795 39.0633 87.6454 39.1016" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M89.9467 41.4295L87.785 41.2828" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M87.2059 43.4151C88.3372 43.5462 89.1898 44.5813 89.1128 45.7162" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g clip-path="url(#clip31_532_2318)">
-<path d="M107.727 36.6645L108.674 37.7495" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M110.965 37.905L112.05 36.958" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M108.079 39.4736L108.116 38.9331C108.121 38.7135 108.17 38.4971 108.261 38.2971C108.352 38.0971 108.483 37.9176 108.645 37.7694C108.808 37.6213 108.998 37.5075 109.206 37.4351C109.413 37.3626 109.633 37.3329 109.852 37.3478C110.071 37.3627 110.285 37.4218 110.481 37.5217C110.677 37.6215 110.85 37.76 110.991 37.9287C111.132 38.0974 111.237 38.2929 111.3 38.5034C111.363 38.7138 111.383 38.9349 111.358 39.1533L111.322 39.6937" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M109.228 46.5389C107.445 46.4178 106.085 44.8596 106.206 43.0762L106.316 41.455C106.355 40.8816 106.62 40.3473 107.053 39.9694C107.486 39.5915 108.051 39.4011 108.624 39.44L110.786 39.5868C111.359 39.6257 111.894 39.8908 112.272 40.3237C112.649 40.7566 112.84 41.3219 112.801 41.8952L112.691 43.5165C112.57 45.2999 111.012 46.66 109.228 46.5389Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M109.228 46.5389L109.558 41.675" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M106.676 40.3936C105.64 40.2147 104.838 39.2372 104.915 38.1024" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M106.243 42.5358L104.081 42.389" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M104.328 46.7491C104.405 45.6142 105.39 44.7038 106.528 44.7268" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M114.626 38.7616C114.549 39.8965 113.622 40.7566 112.588 40.7949" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M114.889 43.1228L112.728 42.9761" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M112.148 45.1084C113.28 45.2395 114.132 46.2746 114.055 47.4095" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g opacity="0.6" clip-path="url(#clip32_532_2318)">
-<path d="M132.67 38.3578L133.617 39.4428" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M135.908 39.5984L136.993 38.6514" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M133.022 41.1669L133.059 40.6265C133.064 40.4068 133.113 40.1905 133.204 39.9904C133.295 39.7904 133.426 39.6109 133.588 39.4628C133.75 39.3146 133.941 39.2009 134.148 39.1284C134.356 39.0559 134.576 39.0263 134.795 39.0411C135.014 39.056 135.228 39.1152 135.424 39.215C135.62 39.3148 135.793 39.4533 135.934 39.622C136.075 39.7908 136.18 39.9863 136.243 40.1967C136.306 40.4072 136.326 40.6283 136.301 40.8466L136.264 41.387" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M134.171 48.2323C132.387 48.1112 131.027 46.553 131.148 44.7696L131.259 43.1483C131.297 42.575 131.563 42.0406 131.995 41.6628C132.428 41.2849 132.994 41.0945 133.567 41.1334L135.729 41.2801C136.302 41.3191 136.836 41.5841 137.214 42.0171C137.592 42.45 137.783 43.0153 137.744 43.5886L137.634 45.2099C137.512 46.9932 135.954 48.3533 134.171 48.2323Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M134.171 48.2322L134.501 43.3684" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M131.618 42.0869C130.583 41.908 129.78 40.9306 129.857 39.7957" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M131.185 44.2292L129.023 44.0824" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M129.27 48.4425C129.347 47.3076 130.332 46.3972 131.471 46.4202" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M139.569 40.455C139.492 41.5899 138.565 42.4499 137.53 42.4883" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M139.832 44.8162L137.67 44.6694" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M137.091 46.8018C138.222 46.9328 139.075 47.968 138.998 49.1029" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g clip-path="url(#clip33_532_2318)">
-<path d="M157.612 40.0511L158.559 41.1361" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M160.851 41.2917L161.936 40.3447" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M157.964 42.8602L158.001 42.3198C158.006 42.1001 158.056 41.8837 158.147 41.6837C158.238 41.4837 158.368 41.3042 158.531 41.1561C158.693 41.0079 158.883 40.8942 159.091 40.8217C159.298 40.7492 159.518 40.7196 159.738 40.7344C159.957 40.7493 160.171 40.8085 160.366 40.9083C160.562 41.0081 160.736 41.1466 160.876 41.3153C161.017 41.4841 161.122 41.6796 161.185 41.89C161.249 42.1005 161.268 42.3216 161.244 42.5399L161.207 43.0803" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M159.113 49.9256C157.33 49.8045 155.97 48.2463 156.091 46.4629L156.201 44.8416C156.24 44.2683 156.505 43.7339 156.938 43.3561C157.371 42.9782 157.936 42.7878 158.51 42.8267L160.671 42.9734C161.245 43.0124 161.779 43.2774 162.157 43.7104C162.535 44.1433 162.725 44.7086 162.686 45.2819L162.576 46.9032C162.455 48.6865 160.897 50.0466 159.113 49.9256Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M159.114 49.9255L159.444 45.0617" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M156.561 43.7802C155.525 43.6013 154.723 42.6239 154.8 41.489" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M156.128 45.9224L153.966 45.7757" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M154.213 50.1358C154.29 49.0009 155.275 48.0905 156.413 48.1135" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M164.511 42.1483C164.434 43.2832 163.507 44.1432 162.473 44.1816" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M164.775 46.5095L162.613 46.3627" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M162.034 48.4951C163.165 48.6261 164.018 49.6613 163.941 50.7962" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g opacity="0.6" clip-path="url(#clip34_532_2318)">
-<path d="M182.555 41.7444L183.502 42.8294" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M185.793 42.985L186.878 42.038" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M182.907 44.5535L182.944 44.0131C182.949 43.7934 182.998 43.577 183.089 43.377C183.18 43.177 183.311 42.9975 183.473 42.8494C183.635 42.7012 183.826 42.5875 184.033 42.515C184.241 42.4425 184.461 42.4129 184.68 42.4277C184.899 42.4426 185.113 42.5018 185.309 42.6016C185.505 42.7014 185.678 42.8399 185.819 43.0086C185.96 43.1774 186.065 43.3729 186.128 43.5833C186.191 43.7938 186.211 44.0149 186.186 44.2332L186.149 44.7736" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M184.056 51.6189C182.273 51.4978 180.913 49.9396 181.034 48.1562L181.144 46.5349C181.183 45.9616 181.448 45.4272 181.881 45.0494C182.314 44.6715 182.879 44.4811 183.452 44.52L185.614 44.6667C186.187 44.7057 186.722 44.9707 187.099 45.4037C187.477 45.8366 187.668 46.4019 187.629 46.9752L187.519 48.5964C187.398 50.3798 185.839 51.7399 184.056 51.6189Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M184.056 51.6188L184.386 46.755" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M181.503 45.4735C180.468 45.2946 179.666 44.3172 179.743 43.1823" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M181.07 47.6157L178.909 47.469" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M179.156 51.829C179.233 50.6942 180.217 49.7838 181.356 49.8068" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M189.454 43.8416C189.377 44.9765 188.45 45.8365 187.416 45.8749" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M189.717 48.2028L187.555 48.056" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M186.976 50.1884C188.108 50.3194 188.96 51.3546 188.883 52.4895" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g clip-path="url(#clip35_532_2318)">
-<path d="M207.497 43.4377L208.444 44.5227" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M210.736 44.6783L211.821 43.7313" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M207.85 46.2468L207.886 45.7064C207.891 45.4867 207.941 45.2703 208.032 45.0703C208.123 44.8703 208.253 44.6908 208.416 44.5427C208.578 44.3945 208.769 44.2808 208.976 44.2083C209.183 44.1358 209.403 44.1062 209.623 44.121C209.842 44.1359 210.056 44.1951 210.251 44.2949C210.447 44.3947 210.621 44.5332 210.761 44.7019C210.902 44.8707 211.007 45.0662 211.07 45.2766C211.134 45.4871 211.153 45.7082 211.129 45.9265L211.092 46.4669" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M208.999 53.3122C207.215 53.1911 205.855 51.6329 205.976 49.8495L206.086 48.2282C206.125 47.6549 206.39 47.1205 206.823 46.7427C207.256 46.3648 207.821 46.1744 208.395 46.2133L210.556 46.36C211.13 46.399 211.664 46.664 212.042 47.097C212.42 47.5299 212.61 48.0952 212.571 48.6685L212.461 50.2897C212.34 52.0731 210.782 53.4332 208.999 53.3122Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M208.999 53.3121L209.329 48.4483" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M206.446 47.1668C205.41 46.9879 204.608 46.0105 204.685 44.8756" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M206.013 49.309L203.851 49.1623" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M204.098 53.5223C204.175 52.3875 205.16 51.4771 206.298 51.5001" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M214.397 45.5349C214.32 46.6698 213.392 47.5298 212.358 47.5682" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M214.66 49.8961L212.498 49.7493" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M211.919 51.8817C213.05 52.0127 213.903 53.0479 213.826 54.1828" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g opacity="0.6" clip-path="url(#clip36_532_2318)">
-<path d="M232.44 45.131L233.387 46.216" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M235.678 46.3716L236.763 45.4246" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M232.792 47.9401L232.829 47.3997C232.834 47.18 232.883 46.9636 232.974 46.7636C233.065 46.5636 233.196 46.3841 233.358 46.236C233.521 46.0878 233.711 45.9741 233.919 45.9016C234.126 45.8291 234.346 45.7995 234.565 45.8143C234.784 45.8292 234.998 45.8884 235.194 45.9882C235.39 46.088 235.563 46.2265 235.704 46.3952C235.845 46.564 235.95 46.7595 236.013 46.9699C236.076 47.1804 236.096 47.4015 236.071 47.6198L236.035 48.1602" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M233.941 55.0054C232.158 54.8844 230.798 53.3262 230.919 51.5428L231.029 49.9215C231.068 49.3482 231.333 48.8138 231.766 48.4359C232.199 48.058 232.764 47.8676 233.337 47.9065L235.499 48.0533C236.072 48.0922 236.607 48.3573 236.985 48.7902C237.362 49.2231 237.553 49.7884 237.514 50.3617L237.404 51.983C237.283 53.7664 235.725 55.1265 233.941 55.0054Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M233.941 55.0054L234.271 50.1416" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M231.389 48.8601C230.353 48.6812 229.551 47.7038 229.628 46.5689" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M230.956 51.0023L228.794 50.8556" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M229.041 55.2156C229.118 54.0808 230.103 53.1704 231.241 53.1934" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M239.339 47.2282C239.262 48.3631 238.335 49.2231 237.301 49.2615" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M239.602 51.5894L237.441 51.4426" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M236.862 53.575C237.993 53.706 238.845 54.7412 238.768 55.8761" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g clip-path="url(#clip37_532_2318)">
-<path d="M257.383 46.8244L258.33 47.9094" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M260.621 48.0649L261.706 47.1179" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M257.735 49.6335L257.771 49.093C257.776 48.8734 257.826 48.657 257.917 48.457C258.008 48.257 258.139 48.0775 258.301 47.9293C258.463 47.7812 258.654 47.6674 258.861 47.595C259.069 47.5225 259.289 47.4928 259.508 47.5077C259.727 47.5226 259.941 47.5817 260.137 47.6816C260.332 47.7814 260.506 47.9199 260.647 48.0886C260.787 48.2573 260.893 48.4528 260.956 48.6633C261.019 48.8738 261.039 49.0948 261.014 49.3132L260.977 49.8536" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M258.884 56.6988C257.1 56.5777 255.74 55.0195 255.861 53.2361L255.971 51.6148C256.01 51.0415 256.275 50.5072 256.708 50.1293C257.141 49.7514 257.707 49.561 258.28 49.5999L260.442 49.7467C261.015 49.7856 261.549 50.0507 261.927 50.4836C262.305 50.9165 262.495 51.4818 262.457 52.0551L262.346 53.6764C262.225 55.4598 260.667 56.8199 258.884 56.6988Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M258.884 56.6988L259.214 51.835" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M256.331 50.5534C255.296 50.3745 254.493 49.3971 254.57 48.2622" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M255.898 52.6957L253.736 52.549" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M253.983 56.909C254.06 55.7741 255.045 54.8637 256.184 54.8867" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M264.282 48.9215C264.205 50.0564 263.278 50.9164 262.244 50.9548" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M264.545 53.2827L262.383 53.136" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M261.804 55.2683C262.935 55.3994 263.788 56.4345 263.711 57.5694" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g opacity="0.6" clip-path="url(#clip38_532_2318)">
-<path d="M282.325 48.5177L283.272 49.6027" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M285.563 49.7582L286.648 48.8112" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M282.677 51.3268L282.714 50.7863C282.719 50.5667 282.769 50.3503 282.86 50.1503C282.951 49.9503 283.081 49.7708 283.243 49.6226C283.406 49.4745 283.596 49.3607 283.804 49.2883C284.011 49.2158 284.231 49.1861 284.45 49.201C284.67 49.2159 284.884 49.275 285.079 49.3749C285.275 49.4747 285.448 49.6132 285.589 49.7819C285.73 49.9506 285.835 50.1461 285.898 50.3566C285.961 50.5671 285.981 50.7881 285.957 51.0065L285.92 51.5469" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M283.826 58.3921C282.043 58.271 280.683 56.7128 280.804 54.9294L280.914 53.3081C280.953 52.7348 281.218 52.2005 281.651 51.8226C282.084 51.4447 282.649 51.2543 283.222 51.2932L285.384 51.44C285.957 51.4789 286.492 51.744 286.87 52.1769C287.248 52.6098 287.438 53.1751 287.399 53.7484L287.289 55.3697C287.168 57.1531 285.61 58.5132 283.826 58.3921Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M283.826 58.3921L284.157 53.5283" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M281.274 52.2467C280.238 52.0678 279.436 51.0904 279.513 49.9555" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M280.841 54.389L278.679 54.2422" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M278.926 58.6023C279.003 57.4674 279.988 56.557 281.126 56.58" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M289.224 50.6148C289.147 51.7497 288.22 52.6097 287.186 52.6481" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M289.487 54.976L287.326 54.8293" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M286.747 56.9616C287.878 57.0927 288.731 58.1278 288.653 59.2627" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g clip-path="url(#clip39_532_2318)">
-<path d="M307.268 50.211L308.215 51.296" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M310.506 51.4515L311.591 50.5045" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M307.62 53.0201L307.657 52.4796C307.662 52.26 307.711 52.0436 307.802 51.8436C307.893 51.6436 308.024 51.4641 308.186 51.3159C308.348 51.1678 308.539 51.054 308.746 50.9816C308.954 50.9091 309.174 50.8794 309.393 50.8943C309.612 50.9092 309.826 50.9683 310.022 51.0682C310.218 51.168 310.391 51.3065 310.532 51.4752C310.673 51.6439 310.778 51.8394 310.841 52.0499C310.904 52.2604 310.924 52.4814 310.899 52.6998L310.862 53.2402" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M308.769 60.0854C306.986 59.9643 305.626 58.4061 305.747 56.6227L305.857 55.0014C305.896 54.4281 306.161 53.8938 306.594 53.5159C307.026 53.138 307.592 52.9476 308.165 52.9865L310.327 53.1333C310.9 53.1722 311.434 53.4373 311.812 53.8702C312.19 54.3031 312.381 54.8684 312.342 55.4417L312.232 57.063C312.111 58.8464 310.552 60.2064 308.769 60.0854Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M308.769 60.0854L309.099 55.2216" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M306.216 53.94C305.181 53.7611 304.378 52.7837 304.456 51.6488" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M305.783 56.0823L303.622 55.9355" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M303.869 60.2956C303.946 59.1607 304.93 58.2503 306.069 58.2733" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M314.167 52.3081C314.09 53.443 313.163 54.303 312.129 54.3414" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M314.43 56.6693L312.268 56.5226" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M311.689 58.6549C312.82 58.786 313.673 59.8211 313.596 60.956" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g opacity="0.6" clip-path="url(#clip40_532_2318)">
-<path d="M332.21 51.9043L333.157 52.9893" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M335.449 53.1448L336.534 52.1978" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M332.562 54.7134L332.599 54.1729C332.604 53.9533 332.654 53.7369 332.745 53.5369C332.836 53.3369 332.966 53.1574 333.129 53.0092C333.291 52.8611 333.481 52.7473 333.689 52.6749C333.896 52.6024 334.116 52.5727 334.336 52.5876C334.555 52.6025 334.769 52.6616 334.964 52.7615C335.16 52.8613 335.334 52.9998 335.474 53.1685C335.615 53.3372 335.72 53.5327 335.783 53.7432C335.847 53.9537 335.866 54.1747 335.842 54.3931L335.805 54.9335" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M333.712 61.7787C331.928 61.6576 330.568 60.0994 330.689 58.316L330.799 56.6947C330.838 56.1214 331.103 55.5871 331.536 55.2092C331.969 54.8313 332.534 54.6409 333.108 54.6798L335.269 54.8266C335.843 54.8655 336.377 55.1306 336.755 55.5635C337.133 55.9964 337.323 56.5617 337.284 57.135L337.174 58.7563C337.053 60.5397 335.495 61.8997 333.712 61.7787Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M333.712 61.7787L334.042 56.9149" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M331.159 55.6333C330.123 55.4544 329.321 54.477 329.398 53.3421" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M330.726 57.7756L328.564 57.6288" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M328.811 61.9889C328.888 60.854 329.873 59.9436 331.011 59.9666" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M339.109 54.0014C339.032 55.1363 338.105 55.9963 337.071 56.0347" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M339.373 58.3626L337.211 58.2159" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M336.632 60.3482C337.763 60.4793 338.616 61.5144 338.539 62.6493" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g clip-path="url(#clip41_532_2318)">
-<path d="M357.153 53.5977L358.1 54.6826" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M360.391 54.8382L361.476 53.8911" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M357.505 56.4067L357.542 55.8663C357.547 55.6466 357.596 55.4302 357.687 55.2302C357.778 55.0302 357.909 54.8507 358.071 54.7026C358.233 54.5544 358.424 54.4407 358.631 54.3682C358.839 54.2957 359.059 54.266 359.278 54.2809C359.497 54.2958 359.711 54.3549 359.907 54.4548C360.103 54.5546 360.276 54.6931 360.417 54.8618C360.558 55.0305 360.663 55.226 360.726 55.4365C360.789 55.647 360.809 55.8681 360.784 56.0864L360.748 56.6268" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M358.654 63.472C356.871 63.3509 355.511 61.7927 355.632 60.0093L355.742 58.3881C355.781 57.8148 356.046 57.2804 356.479 56.9025C356.912 56.5246 357.477 56.3342 358.05 56.3731L360.212 56.5199C360.785 56.5588 361.32 56.8239 361.697 57.2568C362.075 57.6897 362.266 58.255 362.227 58.8283L362.117 60.4496C361.996 62.233 360.438 63.5931 358.654 63.472Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M358.654 63.472L358.984 58.6082" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M356.102 57.3267C355.066 57.1478 354.264 56.1703 354.341 55.0355" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M355.668 59.4689L353.507 59.3222" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M353.754 63.6822C353.831 62.5473 354.815 61.637 355.954 61.66" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M364.052 55.6948C363.975 56.8296 363.048 57.6897 362.014 57.728" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M364.315 60.0559L362.154 59.9092" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M361.574 62.0415C362.706 62.1726 363.558 63.2078 363.481 64.3426" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g opacity="0.6" clip-path="url(#clip42_532_2318)">
-<path d="M382.095 55.291L383.042 56.3759" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M385.334 56.5315L386.419 55.5844" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M382.448 58.1L382.484 57.5596C382.489 57.3399 382.539 57.1235 382.63 56.9235C382.721 56.7235 382.852 56.544 383.014 56.3959C383.176 56.2477 383.367 56.134 383.574 56.0615C383.782 55.989 384.002 55.9593 384.221 55.9742C384.44 55.9891 384.654 56.0482 384.85 56.1481C385.045 56.2479 385.219 56.3864 385.36 56.5551C385.5 56.7238 385.605 56.9193 385.669 57.1298C385.732 57.3403 385.752 57.5614 385.727 57.7797L385.69 58.3201" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M383.597 65.1653C381.813 65.0442 380.453 63.486 380.574 61.7026L380.684 60.0814C380.723 59.5081 380.988 58.9737 381.421 58.5958C381.854 58.2179 382.42 58.0275 382.993 58.0664L385.155 58.2132C385.728 58.2521 386.262 58.5172 386.64 58.9501C387.018 59.383 387.208 59.9483 387.169 60.5216L387.059 62.1429C386.938 63.9263 385.38 65.2864 383.597 65.1653Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M383.597 65.1653L383.927 60.3015" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M381.044 59.02C380.009 58.8411 379.206 57.8636 379.283 56.7288" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M380.611 61.1622L378.449 61.0155" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M378.696 65.3755C378.773 64.2406 379.758 63.3302 380.897 63.3533" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M388.995 57.3881C388.918 58.5229 387.991 59.383 386.956 59.4213" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M389.258 61.7492L387.096 61.6025" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M386.517 63.7348C387.648 63.8659 388.501 64.9011 388.424 66.0359" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g clip-path="url(#clip43_532_2318)">
-<path d="M56.4194 54.2297L57.3665 55.3146" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M59.6578 55.4702L60.7428 54.5232" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M56.7717 57.0387L56.8084 56.4983C56.8135 56.2786 56.863 56.0622 56.954 55.8622C57.045 55.6622 57.1755 55.4827 57.3378 55.3346C57.5001 55.1864 57.6907 55.0727 57.8981 55.0002C58.1056 54.9277 58.3255 54.8981 58.5448 54.9129C58.764 54.9278 58.9779 54.987 59.1737 55.0868C59.3694 55.1866 59.5429 55.3251 59.6837 55.4938C59.8244 55.6626 59.9295 55.8581 59.9926 56.0685C60.0558 56.279 60.0756 56.5001 60.0509 56.7184L60.0142 57.2588" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M57.9207 64.104C56.1373 63.983 54.7773 62.4248 54.8983 60.6414L55.0084 59.0201C55.0473 58.4468 55.3124 57.9124 55.7453 57.5345C56.1782 57.1567 56.7435 56.9662 57.3168 57.0052L59.4785 57.1519C60.0518 57.1908 60.5862 57.4559 60.9641 57.8888C61.342 58.3217 61.5324 58.887 61.4935 59.4604L61.3834 61.0816C61.2623 62.865 59.7041 64.2251 57.9207 64.104Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M57.9208 64.104L58.251 59.2402" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M55.3682 57.9587C54.3326 57.7798 53.5303 56.8024 53.6073 55.6675" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M54.935 60.1009L52.7733 59.9542" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M53.0202 64.3142C53.0973 63.1794 54.082 62.269 55.2206 62.292" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M63.3186 56.3268C63.2416 57.4617 62.3145 58.3217 61.2804 58.3601" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M63.5817 60.688L61.42 60.5412" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M60.8409 62.6736C61.9722 62.8046 62.8248 63.8398 62.7478 64.9747" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g opacity="0.6" clip-path="url(#clip44_532_2318)">
-<path d="M81.3621 55.923L82.3091 57.0079" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M84.6005 57.1635L85.6854 56.2165" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M81.7143 58.732L81.751 58.1916C81.7561 57.9719 81.8056 57.7555 81.8966 57.5555C81.9876 57.3555 82.1182 57.176 82.2804 57.0279C82.4427 56.8797 82.6333 56.766 82.8408 56.6935C83.0482 56.621 83.2682 56.5914 83.4874 56.6062C83.7066 56.6211 83.9206 56.6803 84.1163 56.7801C84.312 56.8799 84.4855 57.0184 84.6263 57.1871C84.767 57.3559 84.8721 57.5514 84.9353 57.7618C84.9984 57.9723 85.0182 58.1934 84.9936 58.4117L84.9569 58.9521" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M82.8634 65.7973C81.08 65.6763 79.7199 64.1181 79.841 62.3347L79.951 60.7134C79.9899 60.1401 80.255 59.6057 80.6879 59.2278C81.1209 58.85 81.6862 58.6595 82.2595 58.6985L84.4212 58.8452C84.9945 58.8841 85.5288 59.1492 85.9067 59.5821C86.2846 60.015 86.475 60.5803 86.4361 61.1536L86.326 62.7749C86.205 64.5583 84.6468 65.9184 82.8634 65.7973Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M82.8634 65.7973L83.1936 60.9335" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M80.3109 59.652C79.2752 59.4731 78.4729 58.4957 78.5499 57.3608" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M79.8776 61.7942L77.7159 61.6475" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M77.9629 66.0075C78.0399 64.8727 79.0247 63.9623 80.1632 63.9853" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M88.2612 58.0201C88.1842 59.155 87.2571 60.015 86.223 60.0534" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M88.5244 62.3813L86.3627 62.2345" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M85.7836 64.3669C86.9148 64.4979 87.7675 65.5331 87.6904 66.668" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g clip-path="url(#clip45_532_2318)">
-<path d="M106.305 57.6163L107.252 58.7013" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M109.543 58.8568L110.628 57.9098" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M106.657 60.4253L106.694 59.8849C106.699 59.6652 106.748 59.4489 106.839 59.2489C106.93 59.0489 107.061 58.8694 107.223 58.7212C107.385 58.5731 107.576 58.4593 107.783 58.3868C107.991 58.3144 108.211 58.2847 108.43 58.2996C108.649 58.3145 108.863 58.3736 109.059 58.4734C109.255 58.5733 109.428 58.7117 109.569 58.8805C109.71 59.0492 109.815 59.2447 109.878 59.4552C109.941 59.6656 109.961 59.8867 109.936 60.105L109.899 60.6455" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M107.806 67.4907C106.022 67.3696 104.662 65.8114 104.783 64.028L104.894 62.4067C104.932 61.8334 105.198 61.299 105.63 60.9212C106.063 60.5433 106.629 60.3529 107.202 60.3918L109.364 60.5385C109.937 60.5775 110.471 60.8425 110.849 61.2754C111.227 61.7084 111.418 62.2737 111.379 62.847L111.269 64.4682C111.147 66.2516 109.589 67.6117 107.806 67.4907Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M107.806 67.4907L108.136 62.6269" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M105.253 61.3453C104.218 61.1664 103.415 60.189 103.492 59.0541" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M104.82 63.4876L102.658 63.3408" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M102.905 67.7009C102.982 66.566 103.967 65.6556 105.106 65.6786" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M113.204 59.7134C113.127 60.8483 112.2 61.7083 111.166 61.7467" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M113.467 64.0746L111.305 63.9278" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M110.726 66.0602C111.857 66.1913 112.71 67.2264 112.633 68.3613" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g opacity="0.6" clip-path="url(#clip46_532_2318)">
-<path d="M131.247 59.3096L132.194 60.3946" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M134.486 60.5501L135.571 59.6031" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M131.599 62.1186L131.636 61.5782C131.641 61.3585 131.691 61.1422 131.782 60.9422C131.873 60.7422 132.003 60.5627 132.166 60.4145C132.328 60.2663 132.518 60.1526 132.726 60.0801C132.933 60.0077 133.153 59.978 133.373 59.9929C133.592 60.0077 133.806 60.0669 134.001 60.1667C134.197 60.2666 134.371 60.405 134.511 60.5738C134.652 60.7425 134.757 60.938 134.82 61.1485C134.884 61.3589 134.903 61.58 134.879 61.7983L134.842 62.3388" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M132.748 69.1839C130.965 69.0629 129.605 67.5047 129.726 65.7213L129.836 64.1C129.875 63.5267 130.14 62.9923 130.573 62.6145C131.006 62.2366 131.571 62.0462 132.145 62.0851L134.306 62.2318C134.88 62.2708 135.414 62.5358 135.792 62.9687C136.17 63.4017 136.36 63.967 136.321 64.5403L136.211 66.1615C136.09 67.9449 134.532 69.305 132.748 69.1839Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M132.749 69.184L133.079 64.3202" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M130.196 63.0386C129.16 62.8597 128.358 61.8823 128.435 60.7474" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M129.763 65.1809L127.601 65.0341" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M127.848 69.3942C127.925 68.2593 128.91 67.3489 130.048 67.3719" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M138.146 61.4067C138.069 62.5416 137.142 63.4016 136.108 63.44" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M138.409 65.7679L136.248 65.6211" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M135.669 67.7535C136.8 67.8846 137.653 68.9197 137.576 70.0546" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g clip-path="url(#clip47_532_2318)">
-<path d="M156.19 61.0029L157.137 62.0879" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M159.428 62.2434L160.513 61.2964" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M156.542 63.812L156.579 63.2715C156.584 63.0519 156.633 62.8355 156.724 62.6355C156.815 62.4355 156.946 62.256 157.108 62.1078C157.27 61.9597 157.461 61.8459 157.669 61.7735C157.876 61.701 158.096 61.6713 158.315 61.6862C158.534 61.7011 158.748 61.7602 158.944 61.8601C159.14 61.9599 159.313 62.0984 159.454 62.2671C159.595 62.4358 159.7 62.6313 159.763 62.8418C159.826 63.0523 159.846 63.2733 159.821 63.4917L159.785 64.0321" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M157.691 70.8773C155.908 70.7562 154.548 69.198 154.669 67.4146L154.779 65.7933C154.818 65.22 155.083 64.6857 155.516 64.3078C155.949 63.9299 156.514 63.7395 157.087 63.7784L159.249 63.9252C159.822 63.9641 160.357 64.2292 160.734 64.6621C161.112 65.095 161.303 65.6603 161.264 66.2336L161.154 67.8549C161.033 69.6383 159.475 70.9984 157.691 70.8773Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M157.691 70.8773L158.021 66.0135" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M155.139 64.7319C154.103 64.553 153.301 63.5756 153.378 62.4407" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M154.705 66.8742L152.544 66.7274" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M152.791 71.0875C152.868 69.9526 153.852 69.0422 154.991 69.0652" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M163.089 63.1C163.012 64.2349 162.085 65.0949 161.051 65.1333" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M163.352 67.4612L161.19 67.3145" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M160.611 69.4468C161.743 69.5779 162.595 70.613 162.518 71.7479" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g opacity="0.6" clip-path="url(#clip48_532_2318)">
-<path d="M181.132 62.6962L182.079 63.7812" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M184.371 63.9367L185.456 62.9897" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M181.485 65.5053L181.521 64.9648C181.526 64.7452 181.576 64.5288 181.667 64.3288C181.758 64.1288 181.888 63.9493 182.051 63.8011C182.213 63.653 182.404 63.5392 182.611 63.4668C182.818 63.3943 183.038 63.3646 183.258 63.3795C183.477 63.3944 183.691 63.4535 183.887 63.5534C184.082 63.6532 184.256 63.7917 184.397 63.9604C184.537 64.1291 184.642 64.3246 184.706 64.5351C184.769 64.7456 184.788 64.9666 184.764 65.185L184.727 65.7254" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M182.634 72.5706C180.85 72.4495 179.49 70.8913 179.611 69.1079L179.721 67.4866C179.76 66.9133 180.025 66.379 180.458 66.0011C180.891 65.6232 181.456 65.4328 182.03 65.4717L184.191 65.6185C184.765 65.6574 185.299 65.9225 185.677 66.3554C186.055 66.7883 186.245 67.3536 186.206 67.9269L186.096 69.5482C185.975 71.3316 184.417 72.6916 182.634 72.5706Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M182.634 72.5706L182.964 67.7068" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M180.081 66.4252C179.045 66.2463 178.243 65.2689 178.32 64.134" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M179.648 68.5675L177.486 68.4207" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M177.733 72.7808C177.81 71.6459 178.795 70.7355 179.934 70.7585" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M188.032 64.7933C187.955 65.9282 187.028 66.7882 185.993 66.8266" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M188.295 69.1545L186.133 69.0078" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M185.554 71.1401C186.685 71.2712 187.538 72.3063 187.461 73.4412" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g clip-path="url(#clip49_532_2318)">
-<path d="M206.075 64.3895L207.022 65.4745" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M209.313 65.63L210.398 64.683" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M206.427 67.1986L206.464 66.6581C206.469 66.4385 206.518 66.2221 206.609 66.0221C206.7 65.8221 206.831 65.6426 206.993 65.4944C207.156 65.3463 207.346 65.2325 207.554 65.1601C207.761 65.0876 207.981 65.0579 208.2 65.0728C208.419 65.0877 208.633 65.1468 208.829 65.2467C209.025 65.3465 209.198 65.485 209.339 65.6537C209.48 65.8224 209.585 66.0179 209.648 66.2284C209.711 66.4389 209.731 66.6599 209.706 66.8783L209.67 67.4187" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M207.576 74.2639C205.793 74.1428 204.433 72.5846 204.554 70.8012L204.664 69.1799C204.703 68.6066 204.968 68.0723 205.401 67.6944C205.834 67.3165 206.399 67.1261 206.972 67.165L209.134 67.3118C209.707 67.3507 210.242 67.6158 210.62 68.0487C210.997 68.4816 211.188 69.0469 211.149 69.6202L211.039 71.2415C210.918 73.0249 209.36 74.3849 207.576 74.2639Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M207.576 74.2639L207.906 69.4001" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M205.024 68.1185C203.988 67.9396 203.186 66.9622 203.263 65.8273" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M204.591 70.2608L202.429 70.114" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M202.676 74.4741C202.753 73.3392 203.738 72.4288 204.876 72.4518" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M212.974 66.4866C212.897 67.6215 211.97 68.4815 210.936 68.5199" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M213.237 70.8478L211.076 70.701" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M210.497 72.8334C211.628 72.9645 212.48 73.9996 212.403 75.1345" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g opacity="0.6" clip-path="url(#clip50_532_2318)">
-<path d="M231.018 66.0829L231.965 67.1678" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M234.256 67.3234L235.341 66.3763" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M231.37 68.8919L231.406 68.3515C231.412 68.1318 231.461 67.9154 231.552 67.7154C231.643 67.5154 231.774 67.3359 231.936 67.1878C232.098 67.0396 232.289 66.9259 232.496 66.8534C232.704 66.7809 232.924 66.7512 233.143 66.7661C233.362 66.781 233.576 66.8401 233.772 66.94C233.967 67.0398 234.141 67.1783 234.282 67.347C234.422 67.5157 234.528 67.7112 234.591 67.9217C234.654 68.1322 234.674 68.3533 234.649 68.5716L234.612 69.112" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M232.519 75.9572C230.735 75.8361 229.375 74.2779 229.496 72.4945L229.607 70.8733C229.645 70.3 229.911 69.7656 230.343 69.3877C230.776 69.0098 231.342 68.8194 231.915 68.8583L234.077 69.0051C234.65 69.044 235.184 69.3091 235.562 69.742C235.94 70.1749 236.131 70.7402 236.092 71.3135L235.982 72.9348C235.86 74.7182 234.302 76.0783 232.519 75.9572Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M232.519 75.9572L232.849 71.0934" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M229.966 69.8119C228.931 69.633 228.128 68.6555 228.205 67.5207" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M229.533 71.9541L227.371 71.8074" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M227.618 76.1674C227.695 75.0325 228.68 74.1221 229.819 74.1452" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M237.917 68.18C237.84 69.3148 236.913 70.1749 235.879 70.2132" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M238.18 72.5411L236.018 72.3944" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M235.439 74.5267C236.57 74.6578 237.423 75.693 237.346 76.8278" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g clip-path="url(#clip51_532_2318)">
-<path d="M255.96 67.7762L256.907 68.8611" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M259.199 69.0167L260.284 68.0696" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M256.312 70.5852L256.349 70.0448C256.354 69.8251 256.404 69.6087 256.495 69.4087C256.586 69.2087 256.716 69.0292 256.878 68.8811C257.041 68.7329 257.231 68.6192 257.439 68.5467C257.646 68.4742 257.866 68.4445 258.085 68.4594C258.305 68.4743 258.519 68.5334 258.714 68.6333C258.91 68.7331 259.084 68.8716 259.224 69.0403C259.365 69.209 259.47 69.4045 259.533 69.615C259.596 69.8255 259.616 70.0466 259.592 70.2649L259.555 70.8053" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M257.461 77.6505C255.678 77.5294 254.318 75.9712 254.439 74.1878L254.549 72.5666C254.588 71.9933 254.853 71.4589 255.286 71.081C255.719 70.7031 256.284 70.5127 256.858 70.5516L259.019 70.6984C259.593 70.7373 260.127 71.0024 260.505 71.4353C260.883 71.8682 261.073 72.4335 261.034 73.0068L260.924 74.6281C260.803 76.4115 259.245 77.7716 257.461 77.6505Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M257.461 77.6505L257.792 72.7867" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M254.909 71.5052C253.873 71.3263 253.071 70.3488 253.148 69.214" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M254.476 73.6474L252.314 73.5007" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M252.561 77.8607C252.638 76.7258 253.623 75.8154 254.761 75.8385" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M262.859 69.8733C262.782 71.0081 261.855 71.8682 260.821 71.9065" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M263.123 74.2344L260.961 74.0877" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M260.382 76.22C261.513 76.3511 262.366 77.3863 262.289 78.5211" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g opacity="0.6" clip-path="url(#clip52_532_2318)">
-<path d="M280.903 69.4695L281.85 70.5545" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M284.141 70.71L285.226 69.763" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M281.255 72.2785L281.292 71.7381C281.297 71.5184 281.346 71.3021 281.437 71.102C281.528 70.902 281.659 70.7225 281.821 70.5744C281.983 70.4262 282.174 70.3125 282.381 70.24C282.589 70.1676 282.809 70.1379 283.028 70.1527C283.247 70.1676 283.461 70.2268 283.657 70.3266C283.853 70.4265 284.026 70.5649 284.167 70.7336C284.308 70.9024 284.413 71.0979 284.476 71.3083C284.539 71.5188 284.559 71.7399 284.534 71.9582L284.497 72.4986" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M282.404 79.3438C280.621 79.2228 279.261 77.6646 279.382 75.8812L279.492 74.2599C279.531 73.6866 279.796 73.1522 280.229 72.7743C280.662 72.3965 281.227 72.206 281.8 72.245L283.962 72.3917C284.535 72.4306 285.069 72.6957 285.447 73.1286C285.825 73.5615 286.016 74.1268 285.977 74.7002L285.867 76.3214C285.746 78.1048 284.187 79.4649 282.404 79.3438Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M282.404 79.3438L282.734 74.48" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M279.851 73.1985C278.816 73.0196 278.013 72.0422 278.091 70.9073" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M279.418 75.3408L277.257 75.194" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M277.504 79.5541C277.581 78.4192 278.565 77.5088 279.704 77.5318" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M287.802 71.5666C287.725 72.7015 286.798 73.5615 285.764 73.5999" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M288.065 75.9278L285.903 75.781" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M285.324 77.9134C286.455 78.0444 287.308 79.0796 287.231 80.2145" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g clip-path="url(#clip53_532_2318)">
-<path d="M305.845 71.1628L306.792 72.2477" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M309.084 72.4033L310.169 71.4563" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M306.198 73.9718L306.234 73.4314C306.239 73.2117 306.289 72.9954 306.38 72.7953C306.471 72.5953 306.601 72.4158 306.764 72.2677C306.926 72.1195 307.117 72.0058 307.324 71.9333C307.531 71.8609 307.751 71.8312 307.971 71.846C308.19 71.8609 308.404 71.9201 308.6 72.0199C308.795 72.1198 308.969 72.2582 309.109 72.4269C309.25 72.5957 309.355 72.7912 309.418 73.0016C309.482 73.2121 309.501 73.4332 309.477 73.6515L309.44 74.1919" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M307.347 81.0371C305.563 80.9161 304.203 79.3579 304.324 77.5745L304.434 75.9532C304.473 75.3799 304.738 74.8455 305.171 74.4676C305.604 74.0898 306.169 73.8993 306.743 73.9383L308.904 74.085C309.478 74.1239 310.012 74.389 310.39 74.8219C310.768 75.2548 310.958 75.8201 310.919 76.3935L310.809 78.0147C310.688 79.7981 309.13 81.1582 307.347 81.0371Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M307.347 81.0371L307.677 76.1733" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M304.794 74.8918C303.758 74.7129 302.956 73.7355 303.033 72.6006" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M304.361 77.0341L302.199 76.8873" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M302.446 81.2474C302.523 80.1125 303.508 79.2021 304.647 79.2251" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M312.745 73.2599C312.668 74.3948 311.74 75.2548 310.706 75.2932" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M313.008 77.6211L310.846 77.4743" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M310.267 79.6067C311.398 79.7377 312.251 80.7729 312.174 81.9078" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g opacity="0.6" clip-path="url(#clip54_532_2318)">
-<path d="M330.788 72.8561L331.735 73.941" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M334.026 74.0966L335.111 73.1496" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M331.14 75.6651L331.177 75.1247C331.182 74.905 331.231 74.6887 331.322 74.4886C331.413 74.2886 331.544 74.1091 331.706 73.961C331.868 73.8128 332.059 73.6991 332.267 73.6266C332.474 73.5541 332.694 73.5245 332.913 73.5393C333.132 73.5542 333.346 73.6134 333.542 73.7132C333.738 73.813 333.911 73.9515 334.052 74.1202C334.193 74.289 334.298 74.4845 334.361 74.6949C334.424 74.9054 334.444 75.1265 334.419 75.3448L334.383 75.8852" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M332.289 82.7304C330.506 82.6094 329.146 81.0512 329.267 79.2678L329.377 77.6465C329.416 77.0732 329.681 76.5388 330.114 76.1609C330.547 75.7831 331.112 75.5926 331.685 75.6316L333.847 75.7783C334.42 75.8172 334.955 76.0823 335.333 76.5152C335.71 76.9481 335.901 77.5134 335.862 78.0868L335.752 79.708C335.631 81.4914 334.073 82.8515 332.289 82.7304Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M332.289 82.7304L332.619 77.8666" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M329.737 76.5851C328.701 76.4062 327.899 75.4288 327.976 74.2939" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M329.303 78.7274L327.142 78.5806" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M327.389 82.9407C327.466 81.8058 328.451 80.8954 329.589 80.9184" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M337.687 74.9532C337.61 76.0881 336.683 76.9481 335.649 76.9865" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M337.95 79.3144L335.789 79.1676" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M335.209 81.3C336.341 81.431 337.193 82.4662 337.116 83.6011" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g clip-path="url(#clip55_532_2318)">
-<path d="M355.73 74.5494L356.677 75.6344" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M358.969 75.7899L360.054 74.8429" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M356.083 77.3584L356.119 76.818C356.124 76.5983 356.174 76.382 356.265 76.182C356.356 75.982 356.487 75.8025 356.649 75.6543C356.811 75.5062 357.002 75.3924 357.209 75.3199C357.417 75.2475 357.637 75.2178 357.856 75.2327C358.075 75.2476 358.289 75.3067 358.485 75.4065C358.68 75.5064 358.854 75.6448 358.995 75.8136C359.135 75.9823 359.24 76.1778 359.304 76.3883C359.367 76.5987 359.387 76.8198 359.362 77.0382L359.325 77.5786" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M357.232 84.4238C355.448 84.3027 354.088 82.7445 354.209 80.9611L354.319 79.3398C354.358 78.7665 354.623 78.2321 355.056 77.8543C355.489 77.4764 356.055 77.286 356.628 77.3249L358.79 77.4716C359.363 77.5106 359.897 77.7756 360.275 78.2086C360.653 78.6415 360.843 79.2068 360.805 79.7801L360.694 81.4014C360.573 83.1847 359.015 84.5448 357.232 84.4238Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M357.232 84.4238L357.562 79.56" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M354.679 78.2784C353.644 78.0995 352.841 77.1221 352.918 75.9872" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M354.246 80.4207L352.084 80.2739" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M352.331 84.634C352.408 83.4991 353.393 82.5887 354.532 82.6117" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M362.63 76.6465C362.553 77.7814 361.626 78.6414 360.591 78.6798" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M362.893 81.0077L360.731 80.8609" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M360.152 82.9933C361.283 83.1244 362.136 84.1595 362.059 85.2944" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<g opacity="0.6" clip-path="url(#clip56_532_2318)">
-<path d="M380.673 76.2427L381.62 77.3277" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M383.911 77.4832L384.996 76.5362" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M381.025 79.0517L381.062 78.5113C381.067 78.2916 381.117 78.0753 381.208 77.8753C381.299 77.6753 381.429 77.4958 381.591 77.3476C381.754 77.1995 381.944 77.0857 382.152 77.0132C382.359 76.9408 382.579 76.9111 382.798 76.926C383.018 76.9409 383.232 77 383.427 77.0998C383.623 77.1997 383.796 77.3381 383.937 77.5069C384.078 77.6756 384.183 77.8711 384.246 78.0816C384.309 78.292 384.329 78.5131 384.305 78.7314L384.268 79.2719" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M382.174 86.1171C380.391 85.996 379.031 84.4378 379.152 82.6544L379.262 81.0331C379.301 80.4598 379.566 79.9254 379.999 79.5476C380.432 79.1697 380.997 78.9793 381.571 79.0182L383.732 79.1649C384.306 79.2039 384.84 79.4689 385.218 79.9019C385.596 80.3348 385.786 80.9001 385.747 81.4734L385.637 83.0946C385.516 84.878 383.958 86.2381 382.174 86.1171Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M382.174 86.1171L382.505 81.2533" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M379.622 79.9717C378.586 79.7928 377.784 78.8154 377.861 77.6805" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M379.189 82.114L377.027 81.9672" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M377.274 86.3273C377.351 85.1924 378.336 84.282 379.474 84.305" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M387.572 78.3398C387.495 79.4747 386.568 80.3347 385.534 80.3731" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M387.835 82.701L385.674 82.5542" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M385.095 84.6866C386.226 84.8177 387.079 85.8528 387.002 86.9877" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-</g>
-</g>
-<defs>
-<clipPath id="clip0_532_2318">
-<rect width="400" height="92" fill="white"/>
-</clipPath>
-<clipPath id="clip1_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(56.4365 -10) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip2_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(81.3792 -8.3067) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip3_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(106.322 -6.6134) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip4_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(131.264 -4.92004) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip5_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(156.207 -3.22675) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip6_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(181.149 -1.53345) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip7_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(206.092 0.159851) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip8_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(231.035 1.85315) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip9_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(255.977 3.54651) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip10_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(280.92 5.23981) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip11_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(305.862 6.93311) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip12_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(330.805 8.6264) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip13_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(355.748 10.3197) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip14_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(380.69 12.0131) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip15_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(55.0142 10.9518) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip16_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(79.9568 12.6451) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip17_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(104.899 14.3384) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip18_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(129.842 16.0317) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip19_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(154.785 17.725) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip20_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(179.727 19.4183) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip21_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(204.67 21.1116) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip22_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(229.612 22.8049) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip23_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(254.555 24.4983) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip24_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(279.497 26.1916) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip25_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(304.44 27.8849) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip26_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(329.383 29.5782) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip27_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(354.325 31.2715) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip28_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(379.268 32.9648) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip29_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(53.5918 31.9036) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip30_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(78.5344 33.5969) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip31_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(103.477 35.2902) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip32_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(128.42 36.9835) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip33_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(153.362 38.6768) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip34_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(178.305 40.3701) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip35_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(203.247 42.0634) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip36_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(228.19 43.7567) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip37_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(253.133 45.4501) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip38_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(278.075 47.1434) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip39_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(303.018 48.8367) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip40_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(327.96 50.53) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip41_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(352.903 52.2233) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip42_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(377.845 53.9166) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip43_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(52.1694 52.8553) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip44_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(77.1121 54.5486) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip45_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(102.055 56.2419) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip46_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(126.997 57.9352) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip47_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(151.94 59.6286) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip48_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(176.882 61.3219) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip49_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(201.825 63.0152) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip50_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(226.768 64.7085) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip51_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(251.71 66.4018) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip52_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(276.653 68.0951) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip53_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(301.595 69.7884) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip54_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(326.538 71.4817) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip55_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(351.48 73.175) rotate(3.88375)"/>
-</clipPath>
-<clipPath id="clip56_532_2318">
-<rect width="13" height="13" fill="white" transform="translate(376.423 74.8683) rotate(3.88375)"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/assets/images/grid.svg b/assets/images/grid.svg
deleted file mode 100644
index fc70470024..0000000000
--- a/assets/images/grid.svg
+++ /dev/null
@@ -1,153 +0,0 @@
-<svg width="441" height="167" viewBox="0 0 441 167" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_2500_1167)">
-<path d="M440 3H441V98H440V3Z" fill="black"/>
-<path d="M429 3H430V98H429V3Z" fill="black"/>
-<path d="M418 3H419V98H418V3Z" fill="black"/>
-<path d="M407 3H408V98H407V3Z" fill="black"/>
-<path d="M396 3H397V98H396V3Z" fill="black"/>
-<path d="M385 3H386V98H385V3Z" fill="black"/>
-<path d="M374 0H375V95H374V0Z" fill="black"/>
-<path d="M308 0H309V95H308V0Z" fill="black"/>
-<path d="M242 0H243V95H242V0Z" fill="black"/>
-<path d="M429 -2H430V93H429V-2Z" fill="black"/>
-<path d="M429 -2H430V93H429V-2Z" fill="black"/>
-<path d="M441 11V12L202 12V11L441 11Z" fill="black"/>
-<path d="M441 22V23L202 23V22L441 22Z" fill="black"/>
-<path d="M441 33V34L202 34V33L441 33Z" fill="black"/>
-<path d="M441 44V45L202 45V44L441 44Z" fill="black"/>
-<path d="M441 55V56L202 56V55L441 55Z" fill="black"/>
-<path d="M440 66V67L201 67V66L440 66Z" fill="black"/>
-<path d="M440 77V78L201 78V77L440 77Z" fill="black"/>
-<path d="M363 0H364V95H363V0Z" fill="black"/>
-<path d="M297 0H298V95H297V0Z" fill="black"/>
-<path d="M231 0H232V95H231V0Z" fill="black"/>
-<path d="M418 -2H419V93H418V-2Z" fill="black"/>
-<path d="M352 0H353V95H352V0Z" fill="black"/>
-<path d="M286 0H287V95H286V0Z" fill="black"/>
-<path d="M220 0H221V95H220V0Z" fill="black"/>
-<path d="M407 -2H408V93H407V-2Z" fill="black"/>
-<path d="M341 0H342V95H341V0Z" fill="black"/>
-<path d="M275 0H276V95H275V0Z" fill="black"/>
-<path d="M396 -2H397V93H396V-2Z" fill="black"/>
-<path d="M330 0H331V95H330V0Z" fill="black"/>
-<path d="M264 0H265V95H264V0Z" fill="black"/>
-<path d="M198 0H199V95H198V0Z" fill="black"/>
-<path d="M385 -2H386V93H385V-2Z" fill="black"/>
-<path d="M319 0H320V95H319V0Z" fill="black"/>
-<path d="M253 0H254V95H253V0Z" fill="black"/>
-<path d="M187 0H188V95H187V0Z" fill="black"/>
-<path d="M231 3H232V98H231V3Z" fill="black"/>
-<path d="M220 3H221V98H220V3Z" fill="black"/>
-<path d="M209 3H210V98H209V3Z" fill="black"/>
-<path d="M198 3H199V98H198V3Z" fill="black"/>
-<path d="M187 3H188V98H187V3Z" fill="black"/>
-<path d="M176 3H177V98H176V3Z" fill="black"/>
-<path d="M165 0H166V95H165V0Z" fill="black"/>
-<path d="M99 0H100V95H99V0Z" fill="black"/>
-<path d="M33 0H34V95H33V0Z" fill="black"/>
-<path d="M220 -2H221V93H220V-2Z" fill="black"/>
-<path d="M220 -2H221V93H220V-2Z" fill="black"/>
-<path d="M232 11V12L-7 12V11L232 11Z" fill="black"/>
-<path d="M232 22V23L-7 23V22L232 22Z" fill="black"/>
-<path d="M232 33V34L-7 34V33L232 33Z" fill="black"/>
-<path d="M232 44V45L-7 45V44L232 44Z" fill="black"/>
-<path d="M232 55V56L-7 56V55L232 55Z" fill="black"/>
-<path d="M231 66V67L-8 67V66L231 66Z" fill="black"/>
-<path d="M231 77V78L-8 78V77L231 77Z" fill="black"/>
-<path d="M154 0H155V95H154V0Z" fill="black"/>
-<path d="M88 0H89V95H88V0Z" fill="black"/>
-<path d="M22 0H23V95H22V0Z" fill="black"/>
-<path d="M209 -2H210V93H209V-2Z" fill="black"/>
-<path d="M143 0H144V95H143V0Z" fill="black"/>
-<path d="M77 0H78V95H77V0Z" fill="black"/>
-<path d="M11 0H12V95H11V0Z" fill="black"/>
-<path d="M198 -2H199V93H198V-2Z" fill="black"/>
-<path d="M132 0H133V95H132V0Z" fill="black"/>
-<path d="M66 0H67V95H66V0Z" fill="black"/>
-<path d="M187 -2H188V93H187V-2Z" fill="black"/>
-<path d="M121 0H122V95H121V0Z" fill="black"/>
-<path d="M55 0H56V95H55V0Z" fill="black"/>
-<path d="M-11 0H-10V95H-11V0Z" fill="black"/>
-<path d="M176 -2H177V93H176V-2Z" fill="black"/>
-<path d="M110 0H111V95H110V0Z" fill="black"/>
-<path d="M44 0H45V95H44V0Z" fill="black"/>
-<path d="M-22 0H-21V95H-22V0Z" fill="black"/>
-<path d="M440 81H441V176H440V81Z" fill="black"/>
-<path d="M429 81H430V176H429V81Z" fill="black"/>
-<path d="M418 81H419V176H418V81Z" fill="black"/>
-<path d="M407 81H408V176H407V81Z" fill="black"/>
-<path d="M396 81H397V176H396V81Z" fill="black"/>
-<path d="M385 81H386V176H385V81Z" fill="black"/>
-<path d="M374 78H375V173H374V78Z" fill="black"/>
-<path d="M308 78H309V173H308V78Z" fill="black"/>
-<path d="M242 78H243V173H242V78Z" fill="black"/>
-<path d="M429 76H430V171H429V76Z" fill="black"/>
-<path d="M429 76H430V171H429V76Z" fill="black"/>
-<path d="M441 89V90L202 90V89L441 89Z" fill="black"/>
-<path d="M441 100V101L202 101V100L441 100Z" fill="black"/>
-<path d="M441 111V112L202 112V111L441 111Z" fill="black"/>
-<path d="M441 122V123L202 123V122L441 122Z" fill="black"/>
-<path d="M441 133V134L202 134V133L441 133Z" fill="black"/>
-<path d="M440 144V145L201 145V144L440 144Z" fill="black"/>
-<path d="M440 155V156L201 156V155L440 155Z" fill="black"/>
-<path d="M363 78H364V173H363V78Z" fill="black"/>
-<path d="M297 78H298V173H297V78Z" fill="black"/>
-<path d="M231 78L232 78V173H231V78Z" fill="black"/>
-<path d="M418 76H419V171H418V76Z" fill="black"/>
-<path d="M352 78H353V173H352V78Z" fill="black"/>
-<path d="M286 78H287V173H286V78Z" fill="black"/>
-<path d="M220 78H221V173H220V78Z" fill="black"/>
-<path d="M407 76H408V171H407V76Z" fill="black"/>
-<path d="M341 78H342V173H341V78Z" fill="black"/>
-<path d="M275 78H276V173H275V78Z" fill="black"/>
-<path d="M396 76H397V171H396V76Z" fill="black"/>
-<path d="M330 78H331V173H330V78Z" fill="black"/>
-<path d="M264 78H265V173H264V78Z" fill="black"/>
-<path d="M198 78H199V173H198V78Z" fill="black"/>
-<path d="M385 76H386V171H385V76Z" fill="black"/>
-<path d="M319 78H320V173H319V78Z" fill="black"/>
-<path d="M253 78H254V173H253V78Z" fill="black"/>
-<path d="M187 78H188V173H187V78Z" fill="black"/>
-<path d="M231 81H232V176H231V81Z" fill="black"/>
-<path d="M220 81H221V176H220V81Z" fill="black"/>
-<path d="M209 81H210V176H209V81Z" fill="black"/>
-<path d="M198 81H199V176H198V81Z" fill="black"/>
-<path d="M187 81H188V176H187V81Z" fill="black"/>
-<path d="M176 81H177V176H176V81Z" fill="black"/>
-<path d="M165 78H166V173H165V78Z" fill="black"/>
-<path d="M99 78H100V173H99V78Z" fill="black"/>
-<path d="M33 78H34V173H33V78Z" fill="black"/>
-<path d="M220 76H221V171H220V76Z" fill="black"/>
-<path d="M220 76H221V171H220V76Z" fill="black"/>
-<path d="M232 89V90L-7 90V89L232 89Z" fill="black"/>
-<path d="M232 100V101L-7 101V100L232 100Z" fill="black"/>
-<path d="M232 111V112L-7 112V111L232 111Z" fill="black"/>
-<path d="M232 122V123L-7 123V122L232 122Z" fill="black"/>
-<path d="M232 133V134L-7 134V133L232 133Z" fill="black"/>
-<path d="M231 144V145L-8 145V144L231 144Z" fill="black"/>
-<path d="M231 155V156L-8 156V155L231 155Z" fill="black"/>
-<path d="M154 78H155V173H154V78Z" fill="black"/>
-<path d="M88 78H89V173H88V78Z" fill="black"/>
-<path d="M22 78H23V173H22V78Z" fill="black"/>
-<path d="M209 76H210V171H209V76Z" fill="black"/>
-<path d="M143 78H144V173H143V78Z" fill="black"/>
-<path d="M77 78H78V173H77V78Z" fill="black"/>
-<path d="M11 78H12V173H11V78Z" fill="black"/>
-<path d="M198 76H199V171H198V76Z" fill="black"/>
-<path d="M132 78H133V173H132V78Z" fill="black"/>
-<path d="M66 78H67V173H66V78Z" fill="black"/>
-<path d="M187 76H188V171H187V76Z" fill="black"/>
-<path d="M121 78H122V173H121V78Z" fill="black"/>
-<path d="M55 78H56V173H55V78Z" fill="black"/>
-<path d="M-11 78H-10V173H-11V78Z" fill="black"/>
-<path d="M176 76H177V171H176V76Z" fill="black"/>
-<path d="M110 78H111V173H110V78Z" fill="black"/>
-<path d="M44 78H45V173H44V78Z" fill="black"/>
-<path d="M-22 78H-21V173H-22V78Z" fill="black"/>
-</g>
-<defs>
-<clipPath id="clip0_2500_1167">
-<rect width="441" height="167" fill="white"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/assets/images/pro_trial_stamp.svg b/assets/images/pro_trial_stamp.svg
deleted file mode 100644
index a3f9095120..0000000000
--- a/assets/images/pro_trial_stamp.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="51" height="51" fill="none"><circle cx="25.5" cy="25.5" r="22.5" stroke="#000"/><circle cx="25.5" cy="25.5" r="19.5" stroke="#000"/><path fill="#000" fill-rule="evenodd" d="M20.219 19.813a.406.406 0 0 0-.407.406v8.937H19V20.22c0-.673.546-1.219 1.219-1.219h10.884a.61.61 0 0 1 .431 1.04l-6.704 6.704h1.889v-.838h.812v1.041a.61.61 0 0 1-.61.61h-2.903l-1.397 1.396h6.332v-5.078h.813v5.078a.812.812 0 0 1-.813.813H21.81l-1.422 1.422h10.394a.406.406 0 0 0 .407-.407v-8.937H32v8.937c0 .673-.546 1.219-1.219 1.219H19.897a.61.61 0 0 1-.431-1.04l6.678-6.679h-1.863v.813h-.812v-1.016a.61.61 0 0 1 .61-.61h2.878l1.422-1.421h-6.332v5.078h-.813v-5.078c0-.449.364-.813.813-.813h7.144l1.422-1.422H20.219Z" clip-rule="evenodd"/><path fill="#000" d="M37.732 22.393c-.19-.61.043-1.035.678-1.233l2.086-.651-.232-.74.526-.165.41 1.313-2.61.815c-.325.102-.435.304-.337.62.042.133.115.267.22.386l-.476.15a1.334 1.334 0 0 1-.265-.495Zm1.123 5.215a.75.75 0 1 1 1.482.225.75.75 0 0 1-1.482-.225Zm-2.298 4.336 2.875 1.996-1.203 1.733-.452-.314.847-1.22-.706-.49-.742 1.069-.452-.314.742-1.068-.814-.565-.847 1.22-.45-.314 1.202-1.733Zm-.296-12.918c-.26-.444-.15-.927.273-1.175.43-.253.86-.065 1.323.585l.097.135c.099.139.195.164.324.088.198-.116.24-.332.099-.573-.13-.22-.327-.32-.493-.245l-.295-.505c.403-.231.914-.021 1.223.505.314.534.223 1.07-.225 1.332l-.79.464a4.243 4.243 0 0 0-.782.575l-.293-.5c.071-.077.162-.16.264-.243l-.013-.021c-.293.004-.545-.138-.712-.422Zm.585-.663c-.19.111-.236.319-.112.53a.58.58 0 0 0 .807.198l.24-.141a.561.561 0 0 1-.15-.138l-.097-.128c-.27-.351-.477-.445-.688-.321Zm.1-3.48a.457.457 0 0 1 .019-.643.454.454 0 0 1 .643.018.45.45 0 0 1-.018.644.454.454 0 0 1-.644-.018Zm-2.504.99.516.546 1.163-1.099-.498-.527.4-.378.91.964-1.563 1.476.514.545-.399.378-1.442-1.526.399-.378Zm.007 18.737 1.447 1.59.518-.47.37.406-.518.471.024.026c.447.492.435.976-.038 1.407-.152.138-.32.243-.478.293l-.337-.37a1.07 1.07 0 0 0 .386-.223c.244-.222.252-.452.023-.703l-.024-.026-.647.59-.37-.408.647-.589-1.447-1.59.444-.404Zm-1.186-22.225.479.32-.202.303.016.011a.808.808 0 0 1 .809.059c.366.244.455.67.23 1.097l-.515-.344c.055-.155-.006-.316-.156-.416-.253-.17-.59-.052-.82.294l-.838 1.257-.5-.333 1.497-2.248Zm-1.056 23.98 1.053 1.875.61-.343.27.48-.611.342.017.03c.326.58.206 1.05-.352 1.363-.179.1-.366.165-.531.178l-.245-.436a1.07 1.07 0 0 0 .425-.13c.288-.161.347-.384.18-.68l-.017-.03-.762.428-.27-.48.763-.428-1.053-1.875.523-.293ZM30.75 10.992l-.927-.349.193-.514 2.434.916-.194.514-.922-.346-1.04 2.76-.584-.22 1.04-2.761Zm-2.39 27.73c-.047-.486.262-.909.77-1.057.696-.203 1.355.219 1.586 1.01.227.778-.087 1.468-.75 1.662-.647.188-1.246-.204-1.468-.967l-.064-.216 1.656-.483c-.172-.414-.468-.603-.813-.502-.216.063-.359.213-.37.393l-.546.16Zm.782.715c.128.332.399.493.682.41.278-.08.418-.35.384-.72l-1.066.31ZM25.3 39c.073-.48.495-.83 1.024-.86.719-.04 1.281.534 1.327 1.343.045.803-.44 1.412-1.16 1.452-.538.03-.986-.27-1.088-.739l.6-.034c.073.15.243.236.458.224.394-.022.62-.36.591-.865-.03-.524-.308-.853-.722-.83-.215.012-.374.117-.42.275l-.61.034Zm-2.267-27.083c-.077-.807.38-1.443 1.077-1.51.697-.065 1.265.474 1.342 1.28.076.807-.382 1.443-1.078 1.509-.697.066-1.265-.473-1.341-1.28Zm.596-.057c.048.503.33.822.693.788.363-.034.58-.401.532-.904-.047-.503-.329-.823-.692-.788-.363.034-.58.402-.532.904Zm-1.42 28.128.863.148.2-1.167c.058-.336-.072-.526-.397-.582a1.072 1.072 0 0 0-.446.02l.085-.492c.16-.044.358-.045.56-.01.63.108.901.51.789 1.165l-.2 1.168.69.118-.094.542-.69-.118-.125.734-.61.002.144-.838-.862-.148.093-.542Zm-1.803-28.691.116.346.019-.007a.808.808 0 0 1 .542-.602c.417-.14.808.052 1.008.491l-.588.196c-.089-.139-.254-.188-.424-.132-.29.097-.404.435-.273.829l.479 1.432-.57.19-.854-2.56.545-.183Zm-.123 26.328-.692-.291.214-.507 1.936.814-.214.507-.69-.29-.622 1.474.67.281-.215.507-1.22-.514.833-1.981Zm-1 3.278a.45.45 0 0 1-.242-.596.454.454 0 0 1 .595-.243c.23.097.34.366.244.597a.453.453 0 0 1-.596.242Zm-1.922-29.027c.563-.345 1.187-.206 1.517.33.329.538.169 1.158-.394 1.503l-.537.329.706 1.151-.533.326-1.83-2.984 1.071-.655Zm.653 23.764.649.47-.933 2.656-.486-.351.733-2.03-.016-.012-1.698 1.333-.478-.346 2.23-1.72Zm-.354-22.071.558-.343c.252-.154.312-.437.148-.706-.165-.268-.445-.342-.696-.188l-.559.341.549.896ZM14.138 35.76c-.444-.507-.34-1.216.257-1.74l.17-.148 1.136 1.298c.302-.331.35-.679.113-.95-.148-.169-.346-.235-.514-.169l-.376-.428c.42-.249.935-.147 1.285.252.477.545.372 1.32-.248 1.864-.61.534-1.368.54-1.823.021Zm-1.643-19.757 2.36 1.508c.214.138.5.303.777.456l-.31.484a7.723 7.723 0 0 1-.397-.206l-.013.021c.188.299.198.608.015.894-.334.522-1.083.59-1.761.156-.674-.43-.929-1.146-.595-1.668.172-.27.439-.39.767-.364l.013-.022-1.18-.753.324-.506Zm2.111 18.63c-.247.256-.278.57-.084.791.191.219.495.231.816.044l-.732-.836ZM13.107 17.83c-.19.299-.026.718.382.98.409.26.86.234 1.05-.065.192-.3.026-.72-.382-.98-.409-.262-.859-.234-1.05.065Zm-1.01 4.308c-.764-.27-1.14-.93-.91-1.58.226-.636.896-.892 1.645-.626l.212.076-.578 1.625c.436.102.763-.026.883-.365.075-.212.037-.417-.103-.53l.191-.537c.422.245.584.743.407 1.242-.242.683-.97.971-1.748.695ZM9.8 22.72l.496.057 2.248 1.92.197-1.728.546.063-.283 2.483-.497-.056-2.247-1.921-.181 1.595-.546-.063.267-2.35Zm1.505 6.883a.749.749 0 1 1 1.448-.392.749.749 0 1 1-1.448.392Zm.363-8.873c-.097.273.04.544.36.733l.372-1.046c-.345-.09-.634.035-.732.313Z"/></svg>
diff --git a/assets/images/pro_user_stamp.svg b/assets/images/pro_user_stamp.svg
deleted file mode 100644
index d037a9e833..0000000000
--- a/assets/images/pro_user_stamp.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="51" height="51" fill="none"><path fill="#000" fill-opacity=".3" d="M25.5 3C37.926 3 48 13.074 48 25.5S37.926 48 25.5 48 3 37.926 3 25.5 13.074 3 25.5 3Zm0 3C14.73 6 6 14.73 6 25.5S14.73 45 25.5 45 45 36.27 45 25.5 36.27 6 25.5 6Z"/><circle cx="25.5" cy="25.5" r="22.5" stroke="#000"/><circle cx="25.5" cy="25.5" r="19.5" fill="#000" fill-opacity=".04" stroke="#000"/><path fill="#000" fill-rule="evenodd" d="M20.219 19.813a.406.406 0 0 0-.407.406v8.937H19V20.22c0-.673.546-1.219 1.219-1.219h10.884a.61.61 0 0 1 .431 1.04l-6.704 6.704h1.889v-.838h.812v1.041a.61.61 0 0 1-.61.61h-2.903l-1.397 1.396h6.332v-5.078h.813v5.078a.812.812 0 0 1-.813.813H21.81l-1.422 1.422h10.394a.406.406 0 0 0 .407-.407v-8.937H32v8.937c0 .673-.546 1.219-1.219 1.219H19.897a.61.61 0 0 1-.431-1.04l6.678-6.679h-1.863v.813h-.812v-1.016a.61.61 0 0 1 .61-.61h2.878l1.422-1.421h-6.332v5.078h-.813v-5.078c0-.449.364-.813.813-.813h7.144l1.422-1.422H20.219Z" clip-rule="evenodd"/><path fill="#000" d="M41.093 27.434a.471.471 0 0 1 .933.121.466.466 0 0 1-.527.405.468.468 0 0 1-.406-.526Zm-.965-4.148-.081-.718.565-.064.081.719.035-.004c.683-.077 1.081.227 1.155.884.024.21.01.414-.044.576l-.513.059c.05-.157.064-.315.048-.458-.038-.34-.227-.484-.577-.445l-.035.004.1.899-.564.063-.101-.898-2.207.249-.07-.617 2.208-.249Zm-.95-3.421-.253-.678.534-.198.252.678.033-.012c.644-.24 1.104-.041 1.334.579.073.198.11.4.096.571l-.484.18c.01-.164-.014-.32-.064-.456-.119-.32-.337-.416-.666-.293l-.034.012.315.848-.533.197-.315-.847-2.083.773-.216-.581 2.083-.773ZM38.1 26.002l.564.074-.1.768 1.639.214.097-.743.564.073-.177 1.357-2.203-.286-.1.769-.564-.073.28-2.153Zm-.57 5.34c-.42-.275-.568-.82-.368-1.331.27-.693 1.052-.975 1.832-.67.775.302 1.138 1.021.867 1.714-.203.52-.678.81-1.163.704l.225-.577c.174-.004.328-.127.409-.334.148-.38-.073-.739-.559-.929-.505-.197-.934-.076-1.09.322-.082.207-.052.403.076.514l-.23.587Zm.988 3.746a.469.469 0 0 1-.112-.655.472.472 0 0 1 .655-.112.468.468 0 0 1 .112.655.465.465 0 0 1-.655.112ZM35.8 18.413c-.463-.678-.154-1.583.751-2.2.906-.616 1.86-.573 2.323.106.462.679.153 1.583-.752 2.2-.905.617-1.86.573-2.323-.106Zm.631 13.357.464.328-.447.633 1.35.954.432-.611.464.328-.79 1.118-1.814-1.283-.448.632-.464-.328 1.253-1.771Zm.484-15.023c-.632.43-.88.956-.624 1.331.256.376.836.338 1.467-.092.632-.43.88-.957.625-1.332-.256-.376-.836-.337-1.468.093Zm-3.511 18.486c.09.057.191.134.295.221l.02-.016c-.06-.297.037-.58.294-.803.402-.349.914-.327 1.245.055.339.39.229.863-.344 1.456l-.118.123c-.123.127-.13.229-.029.346.156.179.382.18.6-.01.2-.172.263-.39.157-.544l.457-.397c.31.367.194.926-.282 1.34-.484.419-1.044.427-1.397.02l-.62-.713a4.38 4.38 0 0 0-.731-.686l.453-.392Zm.834-.143a.6.6 0 0 0-.05.858l.19.218a.58.58 0 0 1 .11-.18l.112-.123c.306-.341.363-.568.198-.76-.15-.17-.369-.179-.56-.013Zm-3.9 2.059c.105-.135.268-.258.457-.355.588-.3 1.062-.137 1.375.475l1.028 2.01.713-.365.259.506-1.266.648-1.287-2.517c-.16-.312-.384-.39-.688-.234a1.107 1.107 0 0 0-.355.292l-.236-.46Zm1.4-23.46a.774.774 0 1 1 .728-1.367.774.774 0 0 1-.727 1.368Zm-7.464-2.082c.004-.837.538-1.445 1.262-1.442.723.004 1.252.616 1.249 1.453-.004.836-.539 1.443-1.262 1.44-.723-.003-1.252-.615-1.249-1.451ZM24.26 39.1c.01-.687.543-1.182 1.256-1.173.713.01 1.234.518 1.225 1.205l-.032 2.48-.646-.01.031-2.479a.572.572 0 0 0-.586-.601.57.57 0 0 0-.601.586l-.032 2.48-.646-.009.031-2.48Zm.633-27.492c-.002.521.255.879.632.88.377.002.636-.353.639-.874.002-.522-.254-.88-.631-.881-.377-.002-.638.353-.64.875ZM21.79 40.35c-.57-.149-.917-.602-.817-1.068l.56.147c-.027.185.127.353.377.418.255.066.448-.017.5-.217.043-.165-.044-.284-.286-.379l-.131-.05c-.635-.245-.88-.576-.762-1.03.14-.54.674-.803 1.304-.639.61.16.974.628.851 1.098l-.58-.151c.017-.188-.173-.381-.438-.45-.26-.068-.463.017-.517.222-.045.175.052.291.33.396l.13.05c.597.23.827.557.708 1.012-.14.535-.634.796-1.23.64Zm-.278-29.595.09.366.019-.005c.098-.295.31-.5.611-.573.442-.107.827.124.994.594l-.623.151c-.079-.15-.244-.217-.425-.173-.306.074-.452.412-.351.829l.367 1.516-.603.147-.657-2.712.578-.14ZM18.322 39c-.612-.334-.765-1.058-.372-1.779l.111-.204 1.566.852c.174-.428.096-.782-.23-.96-.204-.11-.42-.105-.558.02l-.517-.282c.319-.391.853-.476 1.334-.214.658.358.833 1.148.426 1.896-.4.735-1.134 1.012-1.76.671Zm-.111-27.83c.604-.316 1.238-.13 1.54.447.301.577.092 1.205-.512 1.521l-.577.302.646 1.236-.572.299-1.675-3.205 1.15-.6Zm.163 26.57c-.148.337-.068.653.2.798.263.144.563.048.806-.249l-1.006-.549Zm.025-24.804.6-.314c.27-.14.353-.429.202-.717-.15-.289-.434-.385-.704-.244l-.6.313.502.962Zm-3.357 23.676c-.336-.307-.36-.756-.064-1.157l.473.432c-.081.15-.044.325.094.45.232.213.595.145.884-.172l1.053-1.152.457.418-1.882 2.06-.438-.4.255-.28-.016-.013a.834.834 0 0 1-.816-.186Zm-2.273-21.276 2.377 1.65c.217.15.506.331.785.5l-.339.488a7.96 7.96 0 0 1-.401-.228l-.015.02c.184.317.182.637-.018.926-.365.526-1.142.566-1.825.091-.68-.47-.915-1.22-.55-1.746.19-.271.47-.384.806-.345l.015-.022-1.188-.825.353-.509Zm.56 1.91c-.208.302-.055.742.357 1.028.412.285.878.276 1.087-.026.21-.301.055-.741-.356-1.027-.412-.286-.878-.276-1.087.025Zm-1.21 4.52c-.782-.297-1.155-.987-.902-1.653.249-.652.946-.9 1.713-.608l.218.083-.635 1.665c.448.116.789-.009.921-.356.083-.217.048-.43-.095-.55l.21-.55c.43.263.587.781.392 1.293-.267.7-1.026.98-1.822.677Zm-2.398.68.513.062 2.308 2.003.216-1.785.564.068-.312 2.565-.512-.062-2.307-2.003-.2 1.646-.565-.069.295-2.425Zm1.907 8.199a.774.774 0 1 1 1.458-.526.774.774 0 1 1-1.458.526ZM11.71 20.3c-.107.28.028.564.355.766l.408-1.072c-.353-.101-.655.021-.763.306Z"/></svg>
diff --git a/assets/images/zed_logo.svg b/assets/images/zed_logo.svg
deleted file mode 100644
index d1769449c1..0000000000
--- a/assets/images/zed_logo.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg width="96" height="96" viewBox="0 0 96 96" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_1957_1318)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M9 6C7.34315 6 6 7.34315 6 9V75H0V9C0 4.02944 4.02944 0 9 0H89.3787C93.3878 0 95.3955 4.84715 92.5607 7.68198L43.0551 57.1875H57V51H63V58.6875C63 61.1728 60.9853 63.1875 58.5 63.1875H37.0551L26.7426 73.5H73.5V36H79.5V73.5C79.5 76.8137 76.8137 79.5 73.5 79.5H20.7426L10.2426 90H87C88.6569 90 90 88.6569 90 87V21H96V87C96 91.9706 91.9706 96 87 96H6.62132C2.61224 96 0.604504 91.1529 3.43934 88.318L52.7574 39H39V45H33V37.5C33 35.0147 35.0147 33 37.5 33H58.7574L69.2574 22.5H22.5V60H16.5V22.5C16.5 19.1863 19.1863 16.5 22.5 16.5H75.2574L85.7574 6H9Z" fill="black"/>
-</g>
-<defs>
-<clipPath id="clip0_1957_1318">
-<rect width="96" height="96" fill="white"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/assets/images/zed_x_copilot.svg b/assets/images/zed_x_copilot.svg
deleted file mode 100644
index 3c5be71074..0000000000
--- a/assets/images/zed_x_copilot.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<svg width="93" height="32" viewBox="0 0 93 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M9.03994 7.04962C8.00934 7.67635 7.30394 8.63219 7.30394 10.0149C7.30394 11.6908 7.72423 12.5893 8.20468 13.0744C8.68379 13.5581 9.40524 13.8149 10.4054 13.8149C11.815 13.8149 13.0291 13.5336 13.8802 12.9464C14.6756 12.3977 15.2708 11.5042 15.3438 9.96182C15.3991 8.79382 15.3678 8.01341 15.0568 7.45711C14.8094 7.01449 14.2326 6.47436 12.4901 6.27416C11.4684 6.15678 10.1114 6.39804 9.03994 7.04962ZM7.8731 5.13084C9.39145 4.2075 11.2531 3.87155 12.7464 4.04312C14.8843 4.28874 16.2844 5.05049 17.0171 6.36142C17.6863 7.55867 17.6384 8.98348 17.587 10.068C17.484 12.2439 16.5804 13.8118 15.1554 14.7949C13.7861 15.7396 12.0582 16.0606 10.4054 16.0606C9.04199 16.0606 7.65126 15.7069 6.60911 14.6547C5.5683 13.6038 5.05823 12.0408 5.05823 10.0149C5.05823 7.6958 6.31388 6.07903 7.8731 5.13084Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M13.983 18.2811C14.6595 18.2811 15.2079 18.8295 15.2079 19.506V22.16C15.2079 22.8365 14.6595 23.385 13.983 23.385C13.3065 23.385 12.758 22.8365 12.758 22.16V19.506C12.758 18.8295 13.3065 18.2811 13.983 18.2811Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M5.25567 14.8903C5.48362 14.039 5.99219 12.9059 7.20735 12.5361L7.92069 14.8798L7.92376 14.8785C7.92375 14.8785 7.92323 14.8778 7.92069 14.8798C7.91365 14.8852 7.89134 14.9052 7.85879 14.951C7.78817 15.0505 7.70058 15.2311 7.62217 15.524C7.46355 16.1164 7.40615 16.9168 7.40617 17.7813V22.1675C7.43457 22.3571 7.45083 22.438 7.48149 22.5189C7.50698 22.5862 7.55955 22.695 7.72277 22.8617C8.0938 23.2406 8.94056 23.8264 10.9275 24.7081C12.5399 25.4236 13.2749 25.7456 13.9586 25.9166C14.6053 26.0784 15.2382 26.1115 16.6666 26.1115V28.5613C15.2536 28.5613 14.3395 28.5372 13.3641 28.2932C12.452 28.0651 11.5174 27.6502 10.0614 27.004C10.0193 26.9853 9.9768 26.9664 9.93383 26.9474C7.89761 26.0438 6.6867 25.3053 5.97233 24.5757C5.59285 24.1882 5.34579 23.7967 5.19056 23.387C5.05419 23.0271 5.00551 22.6875 4.9751 22.4754C4.97301 22.4608 4.971 22.4468 4.96906 22.4335L4.9563 22.3458V17.7814C4.95628 16.8606 5.01201 15.8003 5.25567 14.8903Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M3.98306 15.3589C4.62844 14.6695 5.39976 13.9884 5.99652 13.6348L7.24552 15.7424C6.93706 15.9252 6.34938 16.4159 5.77155 17.0332C5.21994 17.6224 4.85695 18.1377 4.73071 18.4254C4.70277 18.6674 4.71195 19.116 4.78977 19.648C4.87834 20.2536 5.01731 20.7033 5.10492 20.8628L5.19261 21.0224L5.23006 21.2007C5.28661 21.4698 5.55952 21.8651 6.30146 22.3907C6.88143 22.8015 7.56502 23.1703 8.29605 23.5648C8.45794 23.6521 8.62215 23.7407 8.78809 23.8313C9.5952 24.2156 10.848 24.7773 12.0191 25.2425C12.613 25.4784 13.1698 25.6831 13.6288 25.8268C13.8584 25.8987 14.0505 25.9512 14.2021 25.9847C14.3503 26.0175 14.4185 26.0227 14.4277 26.0234C14.4288 26.0234 14.4281 26.0234 14.4277 26.0234L14.4287 28.4733C13.9646 28.4733 13.3889 28.3188 12.8968 28.1648C12.3562 27.9955 11.7367 27.7664 11.1147 27.5193C9.86871 27.0244 8.54832 26.4314 7.70298 26.028L7.67249 26.0135L7.64284 25.9973C7.49779 25.918 7.34502 25.8357 7.18702 25.7506C6.4505 25.354 5.60004 24.896 4.88539 24.3898C4.08363 23.8219 3.18153 23.0135 2.87437 21.8785C2.61828 21.3365 2.4557 20.618 2.3657 20.0026C2.26537 19.3167 2.2169 18.4951 2.33888 17.8727L2.35434 17.7938L2.37996 17.7176C2.6522 16.9085 3.36219 16.0221 3.98306 15.3589Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M3.48529 21.264V17.1402H5.93516V21.264H3.48529Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M24.2932 7.04962C25.3238 7.67635 26.0292 8.63219 26.0292 10.0149C26.0292 11.6908 25.609 12.5893 25.1285 13.0744C24.6494 13.5581 23.9279 13.8149 22.9278 13.8149C21.5182 13.8149 20.3041 13.5336 19.453 12.9464C18.6576 12.3977 18.0624 11.5042 17.9894 9.96182C17.9341 8.79382 17.9654 8.01341 18.2764 7.45711C18.5238 7.01449 19.1006 6.47436 20.8431 6.27416C21.8648 6.15678 23.2218 6.39804 24.2932 7.04962ZM25.4601 5.13084C23.9417 4.2075 22.0801 3.87155 20.5868 4.04312C18.4489 4.28874 17.0488 5.05049 16.3161 6.36142C15.6469 7.55867 15.6948 8.98348 15.7462 10.068C15.8492 12.2439 16.7528 13.8118 18.1778 14.7949C19.5471 15.7396 21.275 16.0606 22.9278 16.0606C24.2912 16.0606 25.6819 15.7069 26.7241 14.6547C27.7649 13.6038 28.275 12.0408 28.275 10.0149C28.275 7.6958 27.0193 6.07903 25.4601 5.13084Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M19.3502 18.2811C18.6737 18.2811 18.1253 18.8295 18.1253 19.506V22.16C18.1253 22.8365 18.6737 23.385 19.3502 23.385C20.0267 23.385 20.5752 22.8365 20.5752 22.16V19.506C20.5752 18.8295 20.0267 18.2811 19.3502 18.2811Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M28.0775 14.8903C27.8496 14.039 27.341 12.9059 26.1259 12.5361L25.4125 14.8798L25.4095 14.8785C25.4095 14.8785 25.41 14.8778 25.4125 14.8798C25.4196 14.8852 25.4419 14.9052 25.4744 14.951C25.545 15.0505 25.6326 15.2311 25.711 15.524C25.8697 16.1164 25.9271 16.9168 25.927 17.7813V22.1675C25.8986 22.3571 25.8824 22.438 25.8517 22.5189C25.8262 22.5862 25.7737 22.695 25.6104 22.8617C25.2394 23.2406 24.3927 23.8264 22.4057 24.7081C20.7933 25.4236 20.0583 25.7456 19.3746 25.9166C18.7279 26.0784 18.0949 26.1115 16.6666 26.1115V28.5613C18.0796 28.5613 18.9937 28.5372 19.9691 28.2932C20.8812 28.0651 21.8158 27.6502 23.2718 27.004C23.3139 26.9853 23.3564 26.9664 23.3994 26.9474C25.4356 26.0438 26.6465 25.3053 27.3609 24.5757C27.7404 24.1882 27.9874 23.7967 28.1427 23.387C28.279 23.0271 28.3277 22.6875 28.3581 22.4754C28.3602 22.4608 28.3622 22.4468 28.3642 22.4335L28.3769 22.3458V17.7814C28.3769 16.8606 28.3212 15.8003 28.0775 14.8903Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M29.3501 15.3589C28.7048 14.6695 27.9334 13.9884 27.3367 13.6348L26.0877 15.7424C26.3961 15.9252 26.9838 16.4159 27.5616 17.0332C28.1133 17.6224 28.4763 18.1377 28.6025 18.4254C28.6304 18.6674 28.6213 19.116 28.5434 19.648C28.4549 20.2536 28.3159 20.7033 28.2283 20.8628L28.1406 21.0224L28.1031 21.2007C28.0466 21.4698 27.7737 21.8651 27.0317 22.3907C26.4518 22.8015 25.7682 23.1703 25.0372 23.5648C24.8753 23.6521 24.711 23.7407 24.5451 23.8313C23.738 24.2156 22.4852 24.7773 21.3141 25.2425C20.7202 25.4784 20.1634 25.6831 19.7044 25.8268C19.4748 25.8987 19.2827 25.9512 19.1311 25.9847C18.9829 26.0175 18.9147 26.0227 18.9055 26.0234C18.9051 26.0234 18.9044 26.0234 18.9055 26.0234L18.9045 28.4733C19.3686 28.4733 19.9443 28.3188 20.4364 28.1648C20.977 27.9955 21.5965 27.7664 22.2185 27.5193C23.4645 27.0244 24.7849 26.4314 25.6302 26.028L25.6607 26.0135L25.6904 25.9973C25.8354 25.918 25.9882 25.8357 26.1462 25.7506C26.8827 25.354 27.7332 24.896 28.4478 24.3898C29.2496 23.8219 30.1517 23.0135 30.4588 21.8785C30.7149 21.3365 30.8775 20.618 30.9675 20.0026C31.0678 19.3167 31.1163 18.4951 30.9943 17.8727L30.9789 17.7938L30.9532 17.7176C30.681 16.9085 29.971 16.0221 29.3501 15.3589Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M29.8479 21.264V17.1402H27.398V21.264H29.8479Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M48.6666 11C49.2189 11 49.6666 11.4477 49.6666 12V15H52.6666C53.2189 15 53.6666 15.4477 53.6666 16C53.6666 16.5523 53.2189 17 52.6666 17H49.6666V20C49.6666 20.5523 49.2189 21 48.6666 21C48.1143 21 47.6666 20.5523 47.6666 20V17H44.6666C44.1143 17 43.6666 16.5523 43.6666 16C43.6666 15.4477 44.1143 15 44.6666 15H47.6666V12C47.6666 11.4477 48.1143 11 48.6666 11Z" fill="black" fill-opacity="0.5"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M67.1666 4.33329C66.7064 4.33329 66.3333 4.70639 66.3333 5.16663V23.5H64.6666V5.16663C64.6666 3.78591 65.7859 2.66663 67.1666 2.66663H89.494C90.6077 2.66663 91.1654 4.01306 90.3779 4.80051L76.6264 18.552H80.5V16.8333H82.1666V18.9687C82.1666 19.6591 81.607 20.2187 80.9166 20.2187H74.9597L72.0951 23.0833H85.0833V12.6666H86.75V23.0833C86.75 24.0038 86.0038 24.75 85.0833 24.75H70.4285L67.5118 27.6666H88.8333C89.2935 27.6666 89.6666 27.2935 89.6666 26.8333V8.49996H91.3333V26.8333C91.3333 28.214 90.214 29.3333 88.8333 29.3333H66.5059C65.3922 29.3333 64.8345 27.9869 65.622 27.1994L79.3214 13.5H75.5V15.1666H73.8333V13.0833C73.8333 12.3929 74.3929 11.8333 75.0833 11.8333H80.9881L83.9048 8.91663H70.9166V19.3333H69.25V8.91663C69.25 7.99615 69.9962 7.24996 70.9166 7.24996H85.5714L88.4881 4.33329H67.1666Z" fill="black"/>
-</svg>
diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
deleted file mode 100644
index 0bcbb455b5..0000000000
--- a/assets/keymaps/default-linux.json
+++ /dev/null
@@ -1,1346 +0,0 @@
-[
-  // Standard Linux bindings
-  {
-    "bindings": {
-      "home": "menu::SelectFirst",
-      "shift-pageup": "menu::SelectFirst",
-      "pageup": "menu::SelectFirst",
-      "end": "menu::SelectLast",
-      "shift-pagedown": "menu::SelectLast",
-      "pagedown": "menu::SelectLast",
-      "ctrl-n": "menu::SelectNext",
-      "tab": "menu::SelectNext",
-      "down": "menu::SelectNext",
-      "ctrl-p": "menu::SelectPrevious",
-      "shift-tab": "menu::SelectPrevious",
-      "up": "menu::SelectPrevious",
-      "enter": "menu::Confirm",
-      "ctrl-enter": "menu::SecondaryConfirm",
-      "ctrl-escape": "menu::Cancel",
-      "ctrl-c": "menu::Cancel",
-      "escape": "menu::Cancel",
-      "alt-shift-enter": "menu::Restart",
-      "alt-enter": ["picker::ConfirmInput", { "secondary": false }],
-      "ctrl-alt-enter": ["picker::ConfirmInput", { "secondary": true }],
-      "ctrl-shift-w": "workspace::CloseWindow",
-      "shift-escape": "workspace::ToggleZoom",
-      "open": "workspace::Open",
-      "ctrl-o": "workspace::OpenFiles",
-      "ctrl-k ctrl-o": "workspace::Open",
-      "ctrl-=": ["zed::IncreaseBufferFontSize", { "persist": false }],
-      "ctrl-+": ["zed::IncreaseBufferFontSize", { "persist": false }],
-      "ctrl--": ["zed::DecreaseBufferFontSize", { "persist": false }],
-      "ctrl-0": ["zed::ResetBufferFontSize", { "persist": false }],
-      "ctrl-,": "zed::OpenSettings",
-      "ctrl-alt-,": "zed::OpenSettingsFile",
-      "ctrl-q": "zed::Quit",
-      "f4": "debugger::Start",
-      "shift-f5": "debugger::Stop",
-      "ctrl-shift-f5": "debugger::RerunSession",
-      "f6": "debugger::Pause",
-      "f7": "debugger::StepOver",
-      "ctrl-f11": "debugger::StepInto",
-      "shift-f11": "debugger::StepOut",
-      "f11": "zed::ToggleFullScreen",
-      "ctrl-alt-z": "edit_prediction::RatePredictions",
-      "ctrl-alt-shift-i": "edit_prediction::ToggleMenu",
-      "ctrl-alt-l": "lsp_tool::ToggleMenu"
-    }
-  },
-  {
-    "context": "Picker || menu",
-    "bindings": {
-      "up": "menu::SelectPrevious",
-      "down": "menu::SelectNext"
-    }
-  },
-  {
-    "context": "Editor",
-    "bindings": {
-      "escape": "editor::Cancel",
-      "shift-backspace": "editor::Backspace",
-      "backspace": "editor::Backspace",
-      "delete": "editor::Delete",
-      "tab": "editor::Tab",
-      "shift-tab": "editor::Backtab",
-      "ctrl-k": "editor::CutToEndOfLine",
-      "ctrl-k ctrl-q": "editor::Rewrap",
-      "ctrl-k q": "editor::Rewrap",
-      "ctrl-backspace": ["editor::DeleteToPreviousWordStart", { "ignore_newlines": false, "ignore_brackets": false }],
-      "ctrl-delete": ["editor::DeleteToNextWordEnd", { "ignore_newlines": false, "ignore_brackets": false }],
-      "cut": "editor::Cut",
-      "shift-delete": "editor::Cut",
-      "ctrl-x": "editor::Cut",
-      "copy": "editor::Copy",
-      "ctrl-insert": "editor::Copy",
-      "ctrl-c": "editor::Copy",
-      "paste": "editor::Paste",
-      "shift-insert": "editor::Paste",
-      "ctrl-v": "editor::Paste",
-      "undo": "editor::Undo",
-      "ctrl-z": "editor::Undo",
-      "redo": "editor::Redo",
-      "ctrl-y": "editor::Redo",
-      "ctrl-shift-z": "editor::Redo",
-      "up": "editor::MoveUp",
-      "ctrl-up": "editor::LineUp",
-      "ctrl-down": "editor::LineDown",
-      "pageup": "editor::MovePageUp",
-      "alt-pageup": "editor::PageUp",
-      "shift-pageup": "editor::SelectPageUp",
-      "home": ["editor::MoveToBeginningOfLine", { "stop_at_soft_wraps": true, "stop_at_indent": true }],
-      "down": "editor::MoveDown",
-      "pagedown": "editor::MovePageDown",
-      "alt-pagedown": "editor::PageDown",
-      "shift-pagedown": "editor::SelectPageDown",
-      "end": ["editor::MoveToEndOfLine", { "stop_at_soft_wraps": true }],
-      "left": "editor::MoveLeft",
-      "right": "editor::MoveRight",
-      "ctrl-left": "editor::MoveToPreviousWordStart",
-      "ctrl-right": "editor::MoveToNextWordEnd",
-      "ctrl-home": "editor::MoveToBeginning",
-      "ctrl-end": "editor::MoveToEnd",
-      "shift-up": "editor::SelectUp",
-      "shift-down": "editor::SelectDown",
-      "shift-left": "editor::SelectLeft",
-      "shift-right": "editor::SelectRight",
-      "ctrl-shift-left": "editor::SelectToPreviousWordStart",
-      "ctrl-shift-right": "editor::SelectToNextWordEnd",
-      "ctrl-shift-home": "editor::SelectToBeginning",
-      "ctrl-shift-end": "editor::SelectToEnd",
-      "ctrl-a": "editor::SelectAll",
-      "ctrl-l": "editor::SelectLine",
-      "ctrl-shift-i": "editor::Format",
-      "alt-shift-o": "editor::OrganizeImports",
-      "shift-home": ["editor::SelectToBeginningOfLine", { "stop_at_soft_wraps": true, "stop_at_indent": true }],
-      "shift-end": ["editor::SelectToEndOfLine", { "stop_at_soft_wraps": true }],
-      "ctrl-alt-space": "editor::ShowCharacterPalette",
-      "ctrl-;": "editor::ToggleLineNumbers",
-      "ctrl-'": "editor::ToggleSelectedDiffHunks",
-      "ctrl-\"": "editor::ExpandAllDiffHunks",
-      "ctrl-i": "editor::ShowSignatureHelp",
-      "alt-g b": "git::Blame",
-      "alt-g m": "git::OpenModifiedFiles",
-      "menu": "editor::OpenContextMenu",
-      "shift-f10": "editor::OpenContextMenu",
-      "ctrl-alt-shift-e": "editor::ToggleEditPrediction",
-      "f9": "editor::ToggleBreakpoint",
-      "shift-f9": "editor::EditLogBreakpoint"
-    }
-  },
-  {
-    "context": "Editor && mode == full",
-    "bindings": {
-      "shift-enter": "editor::Newline",
-      "enter": "editor::Newline",
-      "ctrl-enter": "editor::NewlineBelow",
-      "ctrl-shift-enter": "editor::NewlineAbove",
-      "ctrl-k ctrl-z": "editor::ToggleSoftWrap",
-      "ctrl-k z": "editor::ToggleSoftWrap",
-      "find": "buffer_search::Deploy",
-      "ctrl-f": "buffer_search::Deploy",
-      "ctrl-h": "buffer_search::DeployReplace",
-      "ctrl->": "agent::AddSelectionToThread",
-      "ctrl-<": "assistant::InsertIntoEditor",
-      "ctrl-alt-e": "editor::SelectEnclosingSymbol",
-      "ctrl-shift-backspace": "editor::GoToPreviousChange",
-      "ctrl-shift-alt-backspace": "editor::GoToNextChange",
-      "alt-enter": "editor::OpenSelectionsInMultibuffer"
-    }
-  },
-  {
-    "context": "Editor && mode == full && edit_prediction",
-    "bindings": {
-      "alt-]": "editor::NextEditPrediction",
-      "alt-[": "editor::PreviousEditPrediction"
-    }
-  },
-  {
-    "context": "Editor && !edit_prediction",
-    "bindings": {
-      "alt-\\": "editor::ShowEditPrediction"
-    }
-  },
-  {
-    "context": "Editor && mode == auto_height",
-    "bindings": {
-      "ctrl-enter": "editor::Newline",
-      "shift-enter": "editor::Newline",
-      "ctrl-shift-enter": "editor::NewlineBelow"
-    }
-  },
-  {
-    "context": "Markdown",
-    "bindings": {
-      "copy": "markdown::Copy",
-      "ctrl-insert": "markdown::Copy",
-      "ctrl-c": "markdown::Copy"
-    }
-  },
-  {
-    "context": "Editor && jupyter && !ContextEditor",
-    "bindings": {
-      "ctrl-shift-enter": "repl::Run",
-      "ctrl-alt-enter": "repl::RunInPlace"
-    }
-  },
-  {
-    "context": "Editor && !agent_diff",
-    "bindings": {
-      "ctrl-k ctrl-r": "git::Restore",
-      "ctrl-alt-y": "git::ToggleStaged",
-      "alt-y": "git::StageAndNext",
-      "alt-shift-y": "git::UnstageAndNext"
-    }
-  },
-  {
-    "context": "Editor && editor_agent_diff",
-    "bindings": {
-      "ctrl-y": "agent::Keep",
-      "ctrl-n": "agent::Reject",
-      "ctrl-shift-y": "agent::KeepAll",
-      "ctrl-shift-n": "agent::RejectAll",
-      "shift-ctrl-r": "agent::OpenAgentDiff"
-    }
-  },
-  {
-    "context": "AgentDiff",
-    "bindings": {
-      "ctrl-y": "agent::Keep",
-      "ctrl-n": "agent::Reject",
-      "ctrl-shift-y": "agent::KeepAll",
-      "ctrl-shift-n": "agent::RejectAll"
-    }
-  },
-  {
-    "context": "ContextEditor > Editor",
-    "bindings": {
-      "ctrl-enter": "assistant::Assist",
-      "ctrl-s": "workspace::Save",
-      "save": "workspace::Save",
-      "ctrl-<": "assistant::InsertIntoEditor",
-      "shift-enter": "assistant::Split",
-      "ctrl-r": "assistant::CycleMessageRole",
-      "enter": "assistant::ConfirmCommand",
-      "alt-enter": "editor::Newline",
-      "ctrl-k c": "assistant::CopyCode",
-      "ctrl-g": "search::SelectNextMatch",
-      "ctrl-shift-g": "search::SelectPreviousMatch",
-      "ctrl-k l": "agent::OpenRulesLibrary"
-    }
-  },
-  {
-    "context": "AgentPanel",
-    "bindings": {
-      "ctrl-n": "agent::NewThread",
-      "ctrl-alt-n": "agent::NewTextThread",
-      "ctrl-shift-h": "agent::OpenHistory",
-      "ctrl-alt-c": "agent::OpenSettings",
-      "ctrl-alt-p": "agent::ManageProfiles",
-      "ctrl-alt-l": "agent::OpenRulesLibrary",
-      "ctrl-i": "agent::ToggleProfileSelector",
-      "ctrl-alt-/": "agent::ToggleModelSelector",
-      "ctrl-shift-j": "agent::ToggleNavigationMenu",
-      "ctrl-alt-i": "agent::ToggleOptionsMenu",
-      "ctrl-alt-shift-n": "agent::ToggleNewThreadMenu",
-      "shift-alt-escape": "agent::ExpandMessageEditor",
-      "ctrl->": "agent::AddSelectionToThread",
-      "ctrl-shift-e": "project_panel::ToggleFocus",
-      "ctrl-shift-enter": "agent::ContinueThread",
-      "super-ctrl-b": "agent::ToggleBurnMode",
-      "alt-enter": "agent::ContinueWithBurnMode",
-      "ctrl-y": "agent::AllowOnce",
-      "ctrl-alt-y": "agent::AllowAlways",
-      "ctrl-alt-z": "agent::RejectOnce"
-    }
-  },
-  {
-    "context": "AgentPanel > NavigationMenu",
-    "bindings": {
-      "shift-backspace": "agent::DeleteRecentlyOpenThread"
-    }
-  },
-  {
-    "context": "AgentPanel > Markdown",
-    "bindings": {
-      "copy": "markdown::CopyAsMarkdown",
-      "ctrl-insert": "markdown::CopyAsMarkdown",
-      "ctrl-c": "markdown::CopyAsMarkdown"
-    }
-  },
-  {
-    "context": "AgentPanel && text_thread",
-    "bindings": {
-      "ctrl-n": "agent::NewTextThread",
-      "ctrl-alt-t": "agent::NewThread"
-    }
-  },
-  {
-    "context": "AgentPanel && acp_thread",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-n": "agent::NewExternalAgentThread",
-      "ctrl-alt-t": "agent::NewThread"
-    }
-  },
-  {
-    "context": "MessageEditor && !Picker > Editor && !use_modifier_to_send",
-    "bindings": {
-      "enter": "agent::Chat",
-      "ctrl-enter": "agent::ChatWithFollow",
-      "ctrl-i": "agent::ToggleProfileSelector",
-      "shift-ctrl-r": "agent::OpenAgentDiff",
-      "ctrl-shift-y": "agent::KeepAll",
-      "ctrl-shift-n": "agent::RejectAll"
-    }
-  },
-  {
-    "context": "MessageEditor && !Picker > Editor && use_modifier_to_send",
-    "bindings": {
-      "ctrl-enter": "agent::Chat",
-      "enter": "editor::Newline",
-      "ctrl-i": "agent::ToggleProfileSelector",
-      "shift-ctrl-r": "agent::OpenAgentDiff",
-      "ctrl-shift-y": "agent::KeepAll",
-      "ctrl-shift-n": "agent::RejectAll"
-    }
-  },
-  {
-    "context": "EditMessageEditor > Editor",
-    "bindings": {
-      "escape": "menu::Cancel",
-      "enter": "menu::Confirm",
-      "alt-enter": "editor::Newline"
-    }
-  },
-  {
-    "context": "AgentFeedbackMessageEditor > Editor",
-    "bindings": {
-      "escape": "menu::Cancel",
-      "enter": "menu::Confirm",
-      "alt-enter": "editor::Newline"
-    }
-  },
-  {
-    "context": "AcpThread > ModeSelector",
-    "bindings": {
-      "ctrl-enter": "menu::Confirm"
-    }
-  },
-  {
-    "context": "AcpThread > Editor && !use_modifier_to_send",
-    "use_key_equivalents": true,
-    "bindings": {
-      "enter": "agent::Chat",
-      "shift-ctrl-r": "agent::OpenAgentDiff",
-      "ctrl-shift-y": "agent::KeepAll",
-      "ctrl-shift-n": "agent::RejectAll"
-    }
-  },
-  {
-    "context": "AcpThread > Editor && use_modifier_to_send",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-enter": "agent::Chat",
-      "shift-ctrl-r": "agent::OpenAgentDiff",
-      "ctrl-shift-y": "agent::KeepAll",
-      "ctrl-shift-n": "agent::RejectAll",
-      "shift-tab": "agent::CycleModeSelector"
-    }
-  },
-  {
-    "context": "ThreadHistory",
-    "bindings": {
-      "backspace": "agent::RemoveSelectedThread"
-    }
-  },
-  {
-    "context": "RulesLibrary",
-    "bindings": {
-      "new": "rules_library::NewRule",
-      "ctrl-n": "rules_library::NewRule",
-      "ctrl-shift-s": "rules_library::ToggleDefaultRule",
-      "ctrl-w": "workspace::CloseWindow"
-    }
-  },
-  {
-    "context": "BufferSearchBar",
-    "bindings": {
-      "escape": "buffer_search::Dismiss",
-      "tab": "buffer_search::FocusEditor",
-      "enter": "search::SelectNextMatch",
-      "shift-enter": "search::SelectPreviousMatch",
-      "alt-enter": "search::SelectAllMatches",
-      "find": "search::FocusSearch",
-      "ctrl-f": "search::FocusSearch",
-      "ctrl-h": "search::ToggleReplace",
-      "ctrl-l": "search::ToggleSelection"
-    }
-  },
-  {
-    "context": "BufferSearchBar && in_replace > Editor",
-    "bindings": {
-      "enter": "search::ReplaceNext",
-      "ctrl-enter": "search::ReplaceAll"
-    }
-  },
-  {
-    "context": "BufferSearchBar && !in_replace > Editor",
-    "bindings": {
-      "up": "search::PreviousHistoryQuery",
-      "down": "search::NextHistoryQuery"
-    }
-  },
-  {
-    "context": "ProjectSearchBar",
-    "bindings": {
-      "escape": "project_search::ToggleFocus",
-      "shift-find": "search::FocusSearch",
-      "shift-enter": "project_search::ToggleAllSearchResults",
-      "ctrl-shift-f": "search::FocusSearch",
-      "ctrl-shift-h": "search::ToggleReplace",
-      "alt-ctrl-g": "search::ToggleRegex",
-      "alt-ctrl-x": "search::ToggleRegex"
-    }
-  },
-  {
-    "context": "ProjectSearchBar > Editor",
-    "bindings": {
-      "up": "search::PreviousHistoryQuery",
-      "down": "search::NextHistoryQuery"
-    }
-  },
-  {
-    "context": "ProjectSearchBar && in_replace > Editor",
-    "bindings": {
-      "enter": "search::ReplaceNext",
-      "ctrl-alt-enter": "search::ReplaceAll"
-    }
-  },
-  {
-    "context": "ProjectSearchView",
-    "bindings": {
-      "escape": "project_search::ToggleFocus",
-      "ctrl-shift-h": "search::ToggleReplace",
-      "alt-ctrl-g": "search::ToggleRegex",
-      "alt-ctrl-x": "search::ToggleRegex"
-    }
-  },
-  {
-    "context": "Pane",
-    "bindings": {
-      "alt-1": ["pane::ActivateItem", 0],
-      "alt-2": ["pane::ActivateItem", 1],
-      "alt-3": ["pane::ActivateItem", 2],
-      "alt-4": ["pane::ActivateItem", 3],
-      "alt-5": ["pane::ActivateItem", 4],
-      "alt-6": ["pane::ActivateItem", 5],
-      "alt-7": ["pane::ActivateItem", 6],
-      "alt-8": ["pane::ActivateItem", 7],
-      "alt-9": ["pane::ActivateItem", 8],
-      "alt-0": "pane::ActivateLastItem",
-      "ctrl-pageup": "pane::ActivatePreviousItem",
-      "ctrl-pagedown": "pane::ActivateNextItem",
-      "ctrl-shift-pageup": "pane::SwapItemLeft",
-      "ctrl-shift-pagedown": "pane::SwapItemRight",
-      "ctrl-f4": ["pane::CloseActiveItem", { "close_pinned": false }],
-      "ctrl-w": ["pane::CloseActiveItem", { "close_pinned": false }],
-      "alt-ctrl-t": ["pane::CloseOtherItems", { "close_pinned": false }],
-      "alt-ctrl-shift-w": "workspace::CloseInactiveTabsAndPanes",
-      "ctrl-k e": ["pane::CloseItemsToTheLeft", { "close_pinned": false }],
-      "ctrl-k t": ["pane::CloseItemsToTheRight", { "close_pinned": false }],
-      "ctrl-k u": ["pane::CloseCleanItems", { "close_pinned": false }],
-      "ctrl-k w": ["pane::CloseAllItems", { "close_pinned": false }],
-      "ctrl-k ctrl-w": "workspace::CloseAllItemsAndPanes",
-      "back": "pane::GoBack",
-      "ctrl-alt--": "pane::GoBack",
-      "forward": "pane::GoForward",
-      "ctrl-alt-_": "pane::GoForward",
-      "ctrl-alt-g": "search::SelectNextMatch",
-      "f3": "search::SelectNextMatch",
-      "ctrl-alt-shift-g": "search::SelectPreviousMatch",
-      "shift-f3": "search::SelectPreviousMatch",
-      "shift-find": "project_search::ToggleFocus",
-      "ctrl-shift-f": "project_search::ToggleFocus",
-      "ctrl-alt-shift-h": "search::ToggleReplace",
-      "ctrl-alt-shift-l": "search::ToggleSelection",
-      "alt-enter": "search::SelectAllMatches",
-      "alt-c": "search::ToggleCaseSensitive",
-      "alt-w": "search::ToggleWholeWord",
-      "alt-find": "project_search::ToggleFilters",
-      "alt-ctrl-f": "project_search::ToggleFilters",
-      "shift-enter": "project_search::ToggleAllSearchResults",
-      "ctrl-alt-shift-r": "search::ToggleRegex",
-      "ctrl-alt-shift-x": "search::ToggleRegex",
-      "alt-r": "search::ToggleRegex",
-      "ctrl-k shift-enter": "pane::TogglePinTab"
-    }
-  },
-  // Bindings from VS Code
-  {
-    "context": "Editor",
-    "bindings": {
-      "ctrl-[": "editor::Outdent",
-      "ctrl-]": "editor::Indent",
-      "shift-alt-up": ["editor::AddSelectionAbove", { "skip_soft_wrap": true }], // Insert Cursor Above
-      "shift-alt-down": ["editor::AddSelectionBelow", { "skip_soft_wrap": true }], // Insert Cursor Below
-      "ctrl-shift-k": "editor::DeleteLine",
-      "alt-up": "editor::MoveLineUp",
-      "alt-down": "editor::MoveLineDown",
-      "ctrl-alt-shift-up": "editor::DuplicateLineUp",
-      "ctrl-alt-shift-down": "editor::DuplicateLineDown",
-      "alt-shift-right": "editor::SelectLargerSyntaxNode", // Expand selection
-      "alt-shift-left": "editor::SelectSmallerSyntaxNode", // Shrink selection
-      "ctrl-shift-l": "editor::SelectAllMatches", // Select all occurrences of current selection
-      "ctrl-f2": "editor::SelectAllMatches", // Select all occurrences of current word
-      "ctrl-d": ["editor::SelectNext", { "replace_newest": false }], // editor.action.addSelectionToNextFindMatch  / find_under_expand
-      "ctrl-shift-down": ["editor::SelectNext", { "replace_newest": false }], // editor.action.addSelectionToNextFindMatch
-      "ctrl-shift-up": ["editor::SelectPrevious", { "replace_newest": false }], // editor.action.addSelectionToPreviousFindMatch
-      "ctrl-k ctrl-d": ["editor::SelectNext", { "replace_newest": true }], // editor.action.moveSelectionToNextFindMatch  / find_under_expand_skip
-      "ctrl-k ctrl-shift-d": ["editor::SelectPrevious", { "replace_newest": true }], // editor.action.moveSelectionToPreviousFindMatch
-      "ctrl-k ctrl-i": "editor::Hover",
-      "ctrl-k ctrl-b": "editor::BlameHover",
-      "ctrl-/": ["editor::ToggleComments", { "advance_downwards": false }],
-      "f8": ["editor::GoToDiagnostic", { "severity": { "min": "hint", "max": "error" } }],
-      "shift-f8": ["editor::GoToPreviousDiagnostic", { "severity": { "min": "hint", "max": "error" } }],
-      "f2": "editor::Rename",
-      "f12": "editor::GoToDefinition",
-      "alt-f12": "editor::GoToDefinitionSplit",
-      "ctrl-shift-f10": "editor::GoToDefinitionSplit",
-      "ctrl-f12": "editor::GoToTypeDefinition",
-      "shift-f12": "editor::GoToImplementation",
-      "alt-ctrl-f12": "editor::GoToTypeDefinitionSplit",
-      "alt-shift-f12": "editor::FindAllReferences",
-      "ctrl-m": "editor::MoveToEnclosingBracket", // from jetbrains
-      "ctrl-|": "editor::MoveToEnclosingBracket",
-      "ctrl-{": "editor::Fold",
-      "ctrl-}": "editor::UnfoldLines",
-      "ctrl-k ctrl-l": "editor::ToggleFold",
-      "ctrl-k ctrl-[": "editor::FoldRecursive",
-      "ctrl-k ctrl-]": "editor::UnfoldRecursive",
-      "ctrl-k ctrl-1": "editor::FoldAtLevel_1",
-      "ctrl-k ctrl-2": "editor::FoldAtLevel_2",
-      "ctrl-k ctrl-3": "editor::FoldAtLevel_3",
-      "ctrl-k ctrl-4": "editor::FoldAtLevel_4",
-      "ctrl-k ctrl-5": "editor::FoldAtLevel_5",
-      "ctrl-k ctrl-6": "editor::FoldAtLevel_6",
-      "ctrl-k ctrl-7": "editor::FoldAtLevel_7",
-      "ctrl-k ctrl-8": "editor::FoldAtLevel_8",
-      "ctrl-k ctrl-9": "editor::FoldAtLevel_9",
-      "ctrl-k ctrl-0": "editor::FoldAll",
-      "ctrl-k ctrl-j": "editor::UnfoldAll",
-      "ctrl-space": "editor::ShowCompletions",
-      "ctrl-shift-space": "editor::ShowWordCompletions",
-      "ctrl-.": "editor::ToggleCodeActions",
-      "ctrl-k r": "editor::RevealInFileManager",
-      "ctrl-k p": "editor::CopyPath",
-      "ctrl-\\": "pane::SplitRight",
-      "ctrl-alt-shift-c": "editor::DisplayCursorNames",
-      "alt-.": "editor::GoToHunk",
-      "alt-,": "editor::GoToPreviousHunk"
-    }
-  },
-  {
-    "context": "Editor && extension == md",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-k v": "markdown::OpenPreviewToTheSide",
-      "ctrl-shift-v": "markdown::OpenPreview"
-    }
-  },
-  {
-    "context": "Editor && extension == svg",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-k v": "svg::OpenPreviewToTheSide",
-      "ctrl-shift-v": "svg::OpenPreview"
-    }
-  },
-  {
-    "context": "Editor && mode == full",
-    "bindings": {
-      "ctrl-shift-o": "outline::Toggle",
-      "ctrl-g": "go_to_line::Toggle"
-    }
-  },
-  {
-    "context": "Workspace",
-    "bindings": {
-      "alt-open": ["projects::OpenRecent", { "create_new_window": false }],
-      // Change the default action on `menu::Confirm` by setting the parameter
-      // "alt-ctrl-o": ["projects::OpenRecent", { "create_new_window": true }],
-      "alt-ctrl-o": ["projects::OpenRecent", { "create_new_window": false }],
-      "alt-shift-open": ["projects::OpenRemote", { "from_existing_connection": false, "create_new_window": false }],
-      // Change to open path modal for existing remote connection by setting the parameter
-      // "alt-ctrl-shift-o": "["projects::OpenRemote", { "from_existing_connection": true }]",
-      "alt-ctrl-shift-o": ["projects::OpenRemote", { "from_existing_connection": false, "create_new_window": false }],
-      "alt-ctrl-shift-b": "branches::OpenRecent",
-      "alt-shift-enter": "toast::RunAction",
-      "ctrl-~": "workspace::NewTerminal",
-      "save": "workspace::Save",
-      "ctrl-s": "workspace::Save",
-      "ctrl-k s": "workspace::SaveWithoutFormat",
-      "shift-save": "workspace::SaveAs",
-      "ctrl-shift-s": "workspace::SaveAs",
-      "new": "workspace::NewFile",
-      "ctrl-n": "workspace::NewFile",
-      "shift-new": "workspace::NewWindow",
-      "ctrl-shift-n": "workspace::NewWindow",
-      "ctrl-`": "terminal_panel::Toggle",
-      "f10": ["app_menu::OpenApplicationMenu", "Zed"],
-      "alt-1": ["workspace::ActivatePane", 0],
-      "alt-2": ["workspace::ActivatePane", 1],
-      "alt-3": ["workspace::ActivatePane", 2],
-      "alt-4": ["workspace::ActivatePane", 3],
-      "alt-5": ["workspace::ActivatePane", 4],
-      "alt-6": ["workspace::ActivatePane", 5],
-      "alt-7": ["workspace::ActivatePane", 6],
-      "alt-8": ["workspace::ActivatePane", 7],
-      "alt-9": ["workspace::ActivatePane", 8],
-      "ctrl-alt-b": "workspace::ToggleRightDock",
-      "ctrl-b": "workspace::ToggleLeftDock",
-      "ctrl-j": "workspace::ToggleBottomDock",
-      "ctrl-alt-y": "workspace::ToggleAllDocks",
-      "ctrl-alt-0": "workspace::ResetActiveDockSize",
-      // For 0px parameter, uses UI font size value.
-      "ctrl-alt--": ["workspace::DecreaseActiveDockSize", { "px": 0 }],
-      "ctrl-alt-=": ["workspace::IncreaseActiveDockSize", { "px": 0 }],
-      "ctrl-alt-)": "workspace::ResetOpenDocksSize",
-      "ctrl-alt-_": ["workspace::DecreaseOpenDocksSize", { "px": 0 }],
-      "ctrl-alt-+": ["workspace::IncreaseOpenDocksSize", { "px": 0 }],
-      "shift-find": "pane::DeploySearch",
-      "ctrl-shift-f": "pane::DeploySearch",
-      "ctrl-shift-h": ["pane::DeploySearch", { "replace_enabled": true }],
-      "ctrl-shift-t": "pane::ReopenClosedItem",
-      "ctrl-k ctrl-s": "zed::OpenKeymap",
-      "ctrl-k ctrl-t": "theme_selector::Toggle",
-      "ctrl-alt-super-p": "settings_profile_selector::Toggle",
-      "ctrl-t": "project_symbols::Toggle",
-      "ctrl-p": "file_finder::Toggle",
-      "ctrl-shift-tab": ["tab_switcher::Toggle", { "select_last": true }],
-      "ctrl-tab": "tab_switcher::Toggle",
-      "ctrl-e": "file_finder::Toggle",
-      "f1": "command_palette::Toggle",
-      "ctrl-shift-p": "command_palette::Toggle",
-      "ctrl-shift-m": "diagnostics::Deploy",
-      "ctrl-shift-e": "project_panel::ToggleFocus",
-      "ctrl-shift-b": "outline_panel::ToggleFocus",
-      "ctrl-shift-g": "git_panel::ToggleFocus",
-      "ctrl-shift-d": "debug_panel::ToggleFocus",
-      "ctrl-?": "agent::ToggleFocus",
-      "alt-save": "workspace::SaveAll",
-      "ctrl-alt-s": "workspace::SaveAll",
-      "ctrl-k m": "language_selector::Toggle",
-      "ctrl-k ctrl-m": "toolchain::AddToolchain",
-      "escape": "workspace::Unfollow",
-      "ctrl-k ctrl-left": "workspace::ActivatePaneLeft",
-      "ctrl-k ctrl-right": "workspace::ActivatePaneRight",
-      "ctrl-k ctrl-up": "workspace::ActivatePaneUp",
-      "ctrl-k ctrl-down": "workspace::ActivatePaneDown",
-      "ctrl-k shift-left": "workspace::SwapPaneLeft",
-      "ctrl-k shift-right": "workspace::SwapPaneRight",
-      "ctrl-k shift-up": "workspace::SwapPaneUp",
-      "ctrl-k shift-down": "workspace::SwapPaneDown",
-      "ctrl-shift-x": "zed::Extensions",
-      // All task parameters are captured and unchanged between reruns by default.
-      // Use the `"reevaluate_context"` parameter to control this.
-      "ctrl-shift-r": ["task::Rerun", { "reevaluate_context": false }],
-      "ctrl-alt-r": "task::Rerun",
-      "alt-t": "task::Rerun",
-      "alt-shift-t": "task::Spawn",
-      "alt-shift-r": ["task::Spawn", { "reveal_target": "center" }],
-      // also possible to spawn tasks by name:
-      // "foo-bar": ["task::Spawn", { "task_name": "MyTask", "reveal_target": "dock" }]
-      // or by tag:
-      // "foo-bar": ["task::Spawn", { "task_tag": "MyTag" }],
-      "f5": "debugger::Rerun",
-      "ctrl-f4": "workspace::CloseActiveDock",
-      "ctrl-w": "workspace::CloseActiveDock"
-    }
-  },
-  {
-    "context": "Workspace && debugger_running",
-    "bindings": {
-      "f5": "zed::NoAction"
-    }
-  },
-  {
-    "context": "Workspace && debugger_stopped",
-    "bindings": {
-      "f5": "debugger::Continue"
-    }
-  },
-  {
-    "context": "ApplicationMenu",
-    "bindings": {
-      "f10": "menu::Cancel",
-      "left": "app_menu::ActivateMenuLeft",
-      "right": "app_menu::ActivateMenuRight"
-    }
-  },
-  // Bindings from Sublime Text
-  {
-    "context": "Editor",
-    "bindings": {
-      "ctrl-u": "editor::UndoSelection",
-      "ctrl-shift-u": "editor::RedoSelection",
-      "ctrl-shift-j": "editor::JoinLines",
-      "ctrl-alt-backspace": "editor::DeleteToPreviousSubwordStart",
-      "ctrl-alt-h": "editor::DeleteToPreviousSubwordStart",
-      "ctrl-alt-delete": "editor::DeleteToNextSubwordEnd",
-      "ctrl-alt-d": "editor::DeleteToNextSubwordEnd",
-      "ctrl-alt-left": "editor::MoveToPreviousSubwordStart",
-      "ctrl-alt-right": "editor::MoveToNextSubwordEnd",
-      "ctrl-alt-shift-left": "editor::SelectToPreviousSubwordStart",
-      "ctrl-alt-shift-b": "editor::SelectToPreviousSubwordStart",
-      "ctrl-alt-shift-right": "editor::SelectToNextSubwordEnd",
-      "ctrl-alt-shift-f": "editor::SelectToNextSubwordEnd"
-    }
-  },
-  // Bindings from Atom
-  {
-    "context": "Pane",
-    "bindings": {
-      "ctrl-k up": "pane::SplitUp",
-      "ctrl-k down": "pane::SplitDown",
-      "ctrl-k left": "pane::SplitLeft",
-      "ctrl-k right": "pane::SplitRight"
-    }
-  },
-  // Bindings that should be unified with bindings for more general actions
-  {
-    "context": "Editor && renaming",
-    "bindings": {
-      "enter": "editor::ConfirmRename"
-    }
-  },
-  {
-    "context": "Editor && showing_completions",
-    "bindings": {
-      "enter": "editor::ConfirmCompletion",
-      "shift-enter": "editor::ConfirmCompletionReplace",
-      "tab": "editor::ComposeCompletion"
-    }
-  },
-  {
-    "context": "Editor && in_snippet && has_next_tabstop && !showing_completions",
-    "use_key_equivalents": true,
-    "bindings": {
-      "tab": "editor::NextSnippetTabstop"
-    }
-  },
-  {
-    "context": "Editor && in_snippet && has_previous_tabstop && !showing_completions",
-    "use_key_equivalents": true,
-    "bindings": {
-      "shift-tab": "editor::PreviousSnippetTabstop"
-    }
-  },
-  // Bindings for accepting edit predictions
-  //
-  // alt-l is provided as an alternative to tab/alt-tab. and will be displayed in the UI. This is
-  // because alt-tab may not be available, as it is often used for window switching.
-  {
-    "context": "Editor && edit_prediction",
-    "bindings": {
-      "alt-tab": "editor::AcceptEditPrediction",
-      "alt-l": "editor::AcceptEditPrediction",
-      "tab": "editor::AcceptEditPrediction",
-      "alt-right": "editor::AcceptPartialEditPrediction"
-    }
-  },
-  {
-    "context": "Editor && edit_prediction_conflict",
-    "bindings": {
-      "alt-tab": "editor::AcceptEditPrediction",
-      "alt-l": "editor::AcceptEditPrediction",
-      "alt-right": "editor::AcceptPartialEditPrediction"
-    }
-  },
-  {
-    "context": "Editor && showing_code_actions",
-    "bindings": {
-      "enter": "editor::ConfirmCodeAction"
-    }
-  },
-  {
-    "context": "Editor && (showing_code_actions || showing_completions)",
-    "bindings": {
-      "ctrl-p": "editor::ContextMenuPrevious",
-      "up": "editor::ContextMenuPrevious",
-      "ctrl-n": "editor::ContextMenuNext",
-      "down": "editor::ContextMenuNext",
-      "pageup": "editor::ContextMenuFirst",
-      "pagedown": "editor::ContextMenuLast"
-    }
-  },
-  {
-    "context": "Editor && showing_signature_help && !showing_completions",
-    "bindings": {
-      "up": "editor::SignatureHelpPrevious",
-      "down": "editor::SignatureHelpNext"
-    }
-  },
-  // Custom bindings
-  {
-    "bindings": {
-      "ctrl-alt-shift-f": "workspace::FollowNextCollaborator",
-      // Only available in debug builds: opens an element inspector for development.
-      "ctrl-alt-i": "dev::ToggleInspector"
-    }
-  },
-  {
-    "context": "!Terminal",
-    "bindings": {
-      "ctrl-shift-c": "collab_panel::ToggleFocus"
-    }
-  },
-  {
-    "context": "!ContextEditor > Editor && mode == full",
-    "bindings": {
-      "alt-enter": "editor::OpenExcerpts",
-      "shift-enter": "editor::ExpandExcerpts",
-      "ctrl-alt-enter": "editor::OpenExcerptsSplit",
-      "ctrl-shift-e": "pane::RevealInProjectPanel",
-      "ctrl-f8": "editor::GoToHunk",
-      "ctrl-shift-f8": "editor::GoToPreviousHunk",
-      "ctrl-enter": "assistant::InlineAssist",
-      "ctrl-:": "editor::ToggleInlayHints"
-    }
-  },
-  {
-    "context": "PromptEditor",
-    "bindings": {
-      "ctrl-[": "agent::CyclePreviousInlineAssist",
-      "ctrl-]": "agent::CycleNextInlineAssist",
-      "ctrl-shift-enter": "inline_assistant::ThumbsUpResult",
-      "ctrl-shift-backspace": "inline_assistant::ThumbsDownResult"
-    }
-  },
-  {
-    "context": "Prompt",
-    "bindings": {
-      "left": "menu::SelectPrevious",
-      "right": "menu::SelectNext",
-      "h": "menu::SelectPrevious",
-      "l": "menu::SelectNext"
-    }
-  },
-  {
-    "context": "ProjectSearchBar && !in_replace",
-    "bindings": {
-      "ctrl-enter": "project_search::SearchInNew"
-    }
-  },
-  {
-    "context": "OutlinePanel && not_editing",
-    "bindings": {
-      "escape": "menu::Cancel",
-      "left": "outline_panel::CollapseSelectedEntry",
-      "right": "outline_panel::ExpandSelectedEntry",
-      "alt-copy": "outline_panel::CopyPath",
-      "ctrl-alt-c": "outline_panel::CopyPath",
-      "alt-shift-copy": "workspace::CopyRelativePath",
-      "alt-ctrl-shift-c": "workspace::CopyRelativePath",
-      "alt-ctrl-r": "outline_panel::RevealInFileManager",
-      "space": "outline_panel::OpenSelectedEntry",
-      "shift-down": "menu::SelectNext",
-      "shift-up": "menu::SelectPrevious",
-      "alt-enter": "editor::OpenExcerpts",
-      "ctrl-alt-enter": "editor::OpenExcerptsSplit"
-    }
-  },
-  {
-    "context": "ProjectPanel",
-    "bindings": {
-      "left": "project_panel::CollapseSelectedEntry",
-      "ctrl-left": "project_panel::CollapseAllEntries",
-      "right": "project_panel::ExpandSelectedEntry",
-      "new": "project_panel::NewFile",
-      "ctrl-n": "project_panel::NewFile",
-      "alt-new": "project_panel::NewDirectory",
-      "alt-ctrl-n": "project_panel::NewDirectory",
-      "cut": "project_panel::Cut",
-      "ctrl-x": "project_panel::Cut",
-      "copy": "project_panel::Copy",
-      "ctrl-insert": "project_panel::Copy",
-      "ctrl-c": "project_panel::Copy",
-      "paste": "project_panel::Paste",
-      "shift-insert": "project_panel::Paste",
-      "ctrl-v": "project_panel::Paste",
-      "alt-copy": "project_panel::CopyPath",
-      "ctrl-alt-c": "project_panel::CopyPath",
-      "alt-shift-copy": "workspace::CopyRelativePath",
-      "alt-ctrl-shift-c": "workspace::CopyRelativePath",
-      "enter": "project_panel::Rename",
-      "f2": "project_panel::Rename",
-      "backspace": ["project_panel::Trash", { "skip_prompt": false }],
-      "delete": ["project_panel::Trash", { "skip_prompt": false }],
-      "shift-delete": ["project_panel::Delete", { "skip_prompt": false }],
-      "ctrl-backspace": ["project_panel::Delete", { "skip_prompt": false }],
-      "ctrl-delete": ["project_panel::Delete", { "skip_prompt": false }],
-      "alt-ctrl-r": "project_panel::RevealInFileManager",
-      "ctrl-shift-enter": "workspace::OpenWithSystem",
-      "alt-d": "project_panel::CompareMarkedFiles",
-      "shift-find": "project_panel::NewSearchInDirectory",
-      "ctrl-alt-shift-f": "project_panel::NewSearchInDirectory",
-      "shift-down": "menu::SelectNext",
-      "shift-up": "menu::SelectPrevious",
-      "escape": "menu::Cancel"
-    }
-  },
-  {
-    "context": "ProjectPanel && not_editing",
-    "bindings": {
-      "space": "project_panel::Open"
-    }
-  },
-  {
-    "context": "GitPanel && ChangesList",
-    "bindings": {
-      "up": "menu::SelectPrevious",
-      "down": "menu::SelectNext",
-      "enter": "menu::Confirm",
-      "alt-y": "git::StageFile",
-      "alt-shift-y": "git::UnstageFile",
-      "ctrl-alt-y": "git::ToggleStaged",
-      "space": "git::ToggleStaged",
-      "shift-space": "git::StageRange",
-      "tab": "git_panel::FocusEditor",
-      "shift-tab": "git_panel::FocusEditor",
-      "escape": "git_panel::ToggleFocus",
-      "alt-enter": "menu::SecondaryConfirm",
-      "delete": ["git::RestoreFile", { "skip_prompt": false }],
-      "backspace": ["git::RestoreFile", { "skip_prompt": false }],
-      "shift-delete": ["git::RestoreFile", { "skip_prompt": false }],
-      "ctrl-backspace": ["git::RestoreFile", { "skip_prompt": false }],
-      "ctrl-delete": ["git::RestoreFile", { "skip_prompt": false }]
-    }
-  },
-  {
-    "context": "GitPanel && CommitEditor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "escape": "git::Cancel"
-    }
-  },
-  {
-    "context": "GitCommit > Editor",
-    "bindings": {
-      "escape": "menu::Cancel",
-      "enter": "editor::Newline",
-      "ctrl-enter": "git::Commit",
-      "ctrl-shift-enter": "git::Amend",
-      "alt-l": "git::GenerateCommitMessage"
-    }
-  },
-  {
-    "context": "GitPanel",
-    "bindings": {
-      "ctrl-g ctrl-g": "git::Fetch",
-      "ctrl-g up": "git::Push",
-      "ctrl-g down": "git::Pull",
-      "ctrl-g shift-down": "git::PullRebase",
-      "ctrl-g shift-up": "git::ForcePush",
-      "ctrl-g d": "git::Diff",
-      "ctrl-g backspace": "git::RestoreTrackedFiles",
-      "ctrl-g shift-backspace": "git::TrashUntrackedFiles",
-      "ctrl-space": "git::StageAll",
-      "ctrl-shift-space": "git::UnstageAll",
-      "ctrl-enter": "git::Commit",
-      "ctrl-shift-enter": "git::Amend"
-    }
-  },
-  {
-    "context": "GitDiff > Editor",
-    "bindings": {
-      "ctrl-enter": "git::Commit",
-      "ctrl-shift-enter": "git::Amend",
-      "ctrl-space": "git::StageAll",
-      "ctrl-shift-space": "git::UnstageAll"
-    }
-  },
-  {
-    "context": "AskPass > Editor",
-    "bindings": {
-      "enter": "menu::Confirm"
-    }
-  },
-  {
-    "context": "CommitEditor > Editor",
-    "bindings": {
-      "escape": "git_panel::FocusChanges",
-      "tab": "git_panel::FocusChanges",
-      "shift-tab": "git_panel::FocusChanges",
-      "enter": "editor::Newline",
-      "ctrl-enter": "git::Commit",
-      "ctrl-shift-enter": "git::Amend",
-      "alt-up": "git_panel::FocusChanges",
-      "alt-l": "git::GenerateCommitMessage"
-    }
-  },
-  {
-    "context": "DebugPanel",
-    "bindings": {
-      "ctrl-t": "debugger::ToggleThreadPicker",
-      "ctrl-i": "debugger::ToggleSessionPicker",
-      "shift-alt-escape": "debugger::ToggleExpandItem"
-    }
-  },
-  {
-    "context": "VariableList",
-    "bindings": {
-      "left": "variable_list::CollapseSelectedEntry",
-      "right": "variable_list::ExpandSelectedEntry",
-      "enter": "variable_list::EditVariable",
-      "ctrl-c": "variable_list::CopyVariableValue",
-      "ctrl-alt-c": "variable_list::CopyVariableName",
-      "delete": "variable_list::RemoveWatch",
-      "backspace": "variable_list::RemoveWatch",
-      "alt-enter": "variable_list::AddWatch"
-    }
-  },
-  {
-    "context": "BreakpointList",
-    "bindings": {
-      "space": "debugger::ToggleEnableBreakpoint",
-      "backspace": "debugger::UnsetBreakpoint",
-      "left": "debugger::PreviousBreakpointProperty",
-      "right": "debugger::NextBreakpointProperty"
-    }
-  },
-  {
-    "context": "CollabPanel && not_editing",
-    "bindings": {
-      "ctrl-backspace": "collab_panel::Remove",
-      "space": "menu::Confirm"
-    }
-  },
-  {
-    "context": "CollabPanel",
-    "bindings": {
-      "alt-up": "collab_panel::MoveChannelUp",
-      "alt-down": "collab_panel::MoveChannelDown",
-      "alt-enter": "collab_panel::OpenSelectedChannelNotes"
-    }
-  },
-  {
-    "context": "(CollabPanel && editing) > Editor",
-    "bindings": {
-      "space": "collab_panel::InsertSpace"
-    }
-  },
-  {
-    "context": "ChannelModal",
-    "bindings": {
-      "tab": "channel_modal::ToggleMode"
-    }
-  },
-  {
-    "context": "Picker > Editor",
-    "bindings": {
-      "escape": "menu::Cancel",
-      "up": "menu::SelectPrevious",
-      "down": "menu::SelectNext",
-      "tab": "picker::ConfirmCompletion",
-      "alt-enter": ["picker::ConfirmInput", { "secondary": false }]
-    }
-  },
-  {
-    "context": "ChannelModal > Picker > Editor",
-    "bindings": {
-      "tab": "channel_modal::ToggleMode"
-    }
-  },
-  {
-    "context": "ToolchainSelector",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-shift-a": "toolchain::AddToolchain"
-    }
-  },
-  {
-    "context": "FileFinder || (FileFinder > Picker > Editor)",
-    "bindings": {
-      "ctrl-p": "file_finder::Toggle",
-      "ctrl-shift-a": "file_finder::ToggleSplitMenu",
-      "ctrl-shift-i": "file_finder::ToggleFilterMenu"
-    }
-  },
-  {
-    "context": "FileFinder || (FileFinder > Picker > Editor) || (FileFinder > Picker > menu)",
-    "bindings": {
-      "ctrl-shift-p": "file_finder::SelectPrevious",
-      "ctrl-j": "pane::SplitDown",
-      "ctrl-k": "pane::SplitUp",
-      "ctrl-h": "pane::SplitLeft",
-      "ctrl-l": "pane::SplitRight"
-    }
-  },
-  {
-    "context": "TabSwitcher",
-    "bindings": {
-      "ctrl-shift-tab": "menu::SelectPrevious",
-      "ctrl-up": "menu::SelectPrevious",
-      "ctrl-down": "menu::SelectNext",
-      "ctrl-backspace": "tab_switcher::CloseSelectedItem"
-    }
-  },
-  {
-    "context": "StashList || (StashList > Picker > Editor)",
-    "bindings": {
-      "ctrl-shift-backspace": "stash_picker::DropStashItem",
-      "ctrl-shift-v": "stash_picker::ShowStashItem"
-    }
-  },
-  {
-    "context": "Terminal",
-    "bindings": {
-      "ctrl-alt-space": "terminal::ShowCharacterPalette",
-      "copy": "terminal::Copy",
-      "ctrl-insert": "terminal::Copy",
-      "ctrl-shift-c": "terminal::Copy",
-      "paste": "terminal::Paste",
-      "shift-insert": "terminal::Paste",
-      "ctrl-shift-v": "terminal::Paste",
-      "ctrl-enter": "assistant::InlineAssist",
-      "alt-b": ["terminal::SendText", "\u001bb"],
-      "alt-f": ["terminal::SendText", "\u001bf"],
-      "alt-.": ["terminal::SendText", "\u001b."],
-      "ctrl-delete": ["terminal::SendText", "\u001bd"],
-      // Overrides for conflicting keybindings
-      "ctrl-b": ["terminal::SendKeystroke", "ctrl-b"],
-      "ctrl-c": ["terminal::SendKeystroke", "ctrl-c"],
-      "ctrl-e": ["terminal::SendKeystroke", "ctrl-e"],
-      "ctrl-o": ["terminal::SendKeystroke", "ctrl-o"],
-      "ctrl-w": ["terminal::SendKeystroke", "ctrl-w"],
-      "ctrl-backspace": ["terminal::SendKeystroke", "ctrl-w"],
-      "ctrl-shift-a": "editor::SelectAll",
-      "find": "buffer_search::Deploy",
-      "ctrl-shift-f": "buffer_search::Deploy",
-      "ctrl-shift-l": "terminal::Clear",
-      "ctrl-shift-w": "pane::CloseActiveItem",
-      "up": ["terminal::SendKeystroke", "up"],
-      "pageup": ["terminal::SendKeystroke", "pageup"],
-      "down": ["terminal::SendKeystroke", "down"],
-      "pagedown": ["terminal::SendKeystroke", "pagedown"],
-      "escape": ["terminal::SendKeystroke", "escape"],
-      "enter": ["terminal::SendKeystroke", "enter"],
-      "shift-pageup": "terminal::ScrollPageUp",
-      "shift-pagedown": "terminal::ScrollPageDown",
-      "shift-up": "terminal::ScrollLineUp",
-      "shift-down": "terminal::ScrollLineDown",
-      "shift-home": "terminal::ScrollToTop",
-      "shift-end": "terminal::ScrollToBottom",
-      "ctrl-shift-space": "terminal::ToggleViMode",
-      "ctrl-shift-r": "terminal::RerunTask",
-      "ctrl-alt-r": "terminal::RerunTask",
-      "alt-t": "terminal::RerunTask",
-      "ctrl-shift-5": "pane::SplitRight"
-    }
-  },
-  {
-    "context": "ZedPredictModal",
-    "bindings": {
-      "escape": "menu::Cancel"
-    }
-  },
-  {
-    "context": "ConfigureContextServerModal > Editor",
-    "bindings": {
-      "escape": "menu::Cancel",
-      "enter": "editor::Newline",
-      "ctrl-enter": "menu::Confirm"
-    }
-  },
-  {
-    "context": "ContextServerToolsModal",
-    "use_key_equivalents": true,
-    "bindings": {
-      "escape": "menu::Cancel"
-    }
-  },
-  {
-    "context": "OnboardingAiConfigurationModal",
-    "use_key_equivalents": true,
-    "bindings": {
-      "escape": "menu::Cancel"
-    }
-  },
-  {
-    "context": "Diagnostics",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-r": "diagnostics::ToggleDiagnosticsRefresh"
-    }
-  },
-  {
-    "context": "DebugConsole > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "enter": "menu::Confirm",
-      "alt-enter": "console::WatchExpression"
-    }
-  },
-  {
-    "context": "RunModal",
-    "bindings": {
-      "ctrl-tab": "pane::ActivateNextItem",
-      "ctrl-shift-tab": "pane::ActivatePreviousItem"
-    }
-  },
-  {
-    "context": "MarkdownPreview",
-    "bindings": {
-      "pageup": "markdown::ScrollPageUp",
-      "pagedown": "markdown::ScrollPageDown",
-      "up": "markdown::ScrollUp",
-      "down": "markdown::ScrollDown",
-      "alt-up": "markdown::ScrollUpByItem",
-      "alt-down": "markdown::ScrollDownByItem"
-    }
-  },
-  {
-    "context": "KeymapEditor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-f": "search::FocusSearch",
-      "alt-find": "keymap_editor::ToggleKeystrokeSearch",
-      "alt-ctrl-f": "keymap_editor::ToggleKeystrokeSearch",
-      "alt-c": "keymap_editor::ToggleConflictFilter",
-      "enter": "keymap_editor::EditBinding",
-      "alt-enter": "keymap_editor::CreateBinding",
-      "ctrl-c": "keymap_editor::CopyAction",
-      "ctrl-shift-c": "keymap_editor::CopyContext",
-      "ctrl-t": "keymap_editor::ShowMatchingKeybinds"
-    }
-  },
-  {
-    "context": "KeystrokeInput",
-    "use_key_equivalents": true,
-    "bindings": {
-      "enter": "keystroke_input::StartRecording",
-      "escape escape escape": "keystroke_input::StopRecording",
-      "delete": "keystroke_input::ClearKeystrokes"
-    }
-  },
-  {
-    "context": "KeybindEditorModal",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-enter": "menu::Confirm",
-      "escape": "menu::Cancel"
-    }
-  },
-  {
-    "context": "KeybindEditorModal > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "up": "menu::SelectPrevious",
-      "down": "menu::SelectNext"
-    }
-  },
-  {
-    "context": "Onboarding",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-=": ["zed::IncreaseUiFontSize", { "persist": false }],
-      "ctrl-+": ["zed::IncreaseUiFontSize", { "persist": false }],
-      "ctrl--": ["zed::DecreaseUiFontSize", { "persist": false }],
-      "ctrl-0": ["zed::ResetUiFontSize", { "persist": false }],
-      "ctrl-enter": "onboarding::Finish",
-      "alt-shift-l": "onboarding::SignIn",
-      "alt-shift-a": "onboarding::OpenAccount"
-    }
-  },
-  {
-    "context": "Welcome",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-=": ["zed::IncreaseUiFontSize", { "persist": false }],
-      "ctrl-+": ["zed::IncreaseUiFontSize", { "persist": false }],
-      "ctrl--": ["zed::DecreaseUiFontSize", { "persist": false }],
-      "ctrl-0": ["zed::ResetUiFontSize", { "persist": false }]
-    }
-  },
-  {
-    "context": "InvalidBuffer",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-shift-enter": "workspace::OpenWithSystem"
-    }
-  },
-  {
-    "context": "GitWorktreeSelector || (GitWorktreeSelector > Picker > Editor)",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-shift-space": "git::WorktreeFromDefaultOnWindow",
-      "ctrl-space": "git::WorktreeFromDefault"
-    }
-  },
-  {
-    "context": "SettingsWindow",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-w": "workspace::CloseWindow",
-      "escape": "workspace::CloseWindow",
-      "ctrl-m": "settings_editor::Minimize",
-      "ctrl-f": "search::FocusSearch",
-      "ctrl-,": "settings_editor::OpenCurrentFile",
-      "left": "settings_editor::ToggleFocusNav",
-      "ctrl-shift-e": "settings_editor::ToggleFocusNav",
-      // todo(settings_ui): cut this down based on the max files and overflow UI
-      "ctrl-1": ["settings_editor::FocusFile", 0],
-      "ctrl-2": ["settings_editor::FocusFile", 1],
-      "ctrl-3": ["settings_editor::FocusFile", 2],
-      "ctrl-4": ["settings_editor::FocusFile", 3],
-      "ctrl-5": ["settings_editor::FocusFile", 4],
-      "ctrl-6": ["settings_editor::FocusFile", 5],
-      "ctrl-7": ["settings_editor::FocusFile", 6],
-      "ctrl-8": ["settings_editor::FocusFile", 7],
-      "ctrl-9": ["settings_editor::FocusFile", 8],
-      "ctrl-0": ["settings_editor::FocusFile", 9],
-      "ctrl-pageup": "settings_editor::FocusPreviousFile",
-      "ctrl-pagedown": "settings_editor::FocusNextFile"
-    }
-  },
-  {
-    "context": "StashDiff > Editor",
-    "bindings": {
-      "ctrl-space": "git::ApplyCurrentStash",
-      "ctrl-shift-space": "git::PopCurrentStash",
-      "ctrl-shift-backspace": "git::DropCurrentStash"
-    }
-  },
-  {
-    "context": "SettingsWindow > NavigationMenu",
-    "use_key_equivalents": true,
-    "bindings": {
-      "up": "settings_editor::FocusPreviousNavEntry",
-      "shift-tab": "settings_editor::FocusPreviousNavEntry",
-      "down": "settings_editor::FocusNextNavEntry",
-      "tab": "settings_editor::FocusNextNavEntry",
-      "right": "settings_editor::ExpandNavEntry",
-      "left": "settings_editor::CollapseNavEntry",
-      "pageup": "settings_editor::FocusPreviousRootNavEntry",
-      "pagedown": "settings_editor::FocusNextRootNavEntry",
-      "home": "settings_editor::FocusFirstNavEntry",
-      "end": "settings_editor::FocusLastNavEntry"
-    }
-  },
-  {
-    "context": "EditPredictionContext > Editor",
-    "bindings": {
-      "alt-left": "dev::EditPredictionContextGoBack",
-      "alt-right": "dev::EditPredictionContextGoForward"
-    }
-  },
-  {
-    "context": "GitBranchSelector || (GitBranchSelector > Picker > Editor)",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-shift-backspace": "branch_picker::DeleteBranch",
-      "ctrl-shift-i": "branch_picker::FilterRemotes"
-    }
-  }
-]
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
deleted file mode 100644
index 65ac280ba7..0000000000
--- a/assets/keymaps/default-macos.json
+++ /dev/null
@@ -1,1450 +0,0 @@
-[
-  // Standard macOS bindings
-  {
-    "use_key_equivalents": true,
-    "bindings": {
-      "f4": "debugger::Start",
-      "shift-f5": "debugger::Stop",
-      "shift-cmd-f5": "debugger::RerunSession",
-      "f6": "debugger::Pause",
-      "f7": "debugger::StepOver",
-      "ctrl-f11": "debugger::StepInto",
-      "shift-f11": "debugger::StepOut",
-      "home": "menu::SelectFirst",
-      "shift-pageup": "menu::SelectFirst",
-      "pageup": "menu::SelectFirst",
-      "cmd-up": "menu::SelectFirst",
-      "end": "menu::SelectLast",
-      "shift-pagedown": "menu::SelectLast",
-      "pagedown": "menu::SelectLast",
-      "cmd-down": "menu::SelectLast",
-      "tab": "menu::SelectNext",
-      "ctrl-n": "menu::SelectNext",
-      "down": "menu::SelectNext",
-      "shift-tab": "menu::SelectPrevious",
-      "ctrl-p": "menu::SelectPrevious",
-      "up": "menu::SelectPrevious",
-      "enter": "menu::Confirm",
-      "ctrl-enter": "menu::SecondaryConfirm",
-      "cmd-enter": "menu::SecondaryConfirm",
-      "cmd-escape": "menu::Cancel",
-      "ctrl-escape": "menu::Cancel",
-      "ctrl-c": "menu::Cancel",
-      "escape": "menu::Cancel",
-      "alt-shift-enter": "menu::Restart",
-      "cmd-shift-w": "workspace::CloseWindow",
-      "shift-escape": "workspace::ToggleZoom",
-      "cmd-o": "workspace::Open",
-      "cmd-=": ["zed::IncreaseBufferFontSize", { "persist": false }],
-      "cmd-+": ["zed::IncreaseBufferFontSize", { "persist": false }],
-      "cmd--": ["zed::DecreaseBufferFontSize", { "persist": false }],
-      "cmd-0": ["zed::ResetBufferFontSize", { "persist": false }],
-      "cmd-,": "zed::OpenSettings",
-      "cmd-alt-,": "zed::OpenSettingsFile",
-      "cmd-q": "zed::Quit",
-      "cmd-h": "zed::Hide",
-      "alt-cmd-h": "zed::HideOthers",
-      "cmd-m": "zed::Minimize",
-      "fn-f": "zed::ToggleFullScreen",
-      "ctrl-cmd-f": "zed::ToggleFullScreen",
-      "ctrl-cmd-z": "edit_prediction::RatePredictions",
-      "ctrl-cmd-i": "edit_prediction::ToggleMenu",
-      "ctrl-cmd-l": "lsp_tool::ToggleMenu",
-      "ctrl-cmd-c": "editor::DisplayCursorNames"
-    }
-  },
-  {
-    "context": "Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "escape": "editor::Cancel",
-      "shift-backspace": "editor::Backspace",
-      "ctrl-h": "editor::Backspace",
-      "backspace": "editor::Backspace",
-      "ctrl-d": "editor::Delete",
-      "delete": "editor::Delete",
-      "tab": "editor::Tab",
-      "shift-tab": "editor::Backtab",
-      "ctrl-t": "editor::Transpose",
-      "ctrl-k": "editor::KillRingCut",
-      "ctrl-y": "editor::KillRingYank",
-      "cmd-k cmd-q": "editor::Rewrap",
-      "cmd-k q": "editor::Rewrap",
-      "cmd-backspace": "editor::DeleteToBeginningOfLine",
-      "cmd-delete": "editor::DeleteToEndOfLine",
-      "alt-backspace": ["editor::DeleteToPreviousWordStart", { "ignore_newlines": false, "ignore_brackets": false }],
-      "ctrl-w": ["editor::DeleteToPreviousWordStart", { "ignore_newlines": false, "ignore_brackets": false }],
-      "alt-delete": ["editor::DeleteToNextWordEnd", { "ignore_newlines": false, "ignore_brackets": false }],
-      "cmd-x": "editor::Cut",
-      "cmd-c": "editor::Copy",
-      "cmd-v": "editor::Paste",
-      "cmd-z": "editor::Undo",
-      "cmd-shift-z": "editor::Redo",
-      "up": "editor::MoveUp",
-      "ctrl-up": "editor::MoveToStartOfParagraph",
-      "pageup": "editor::MovePageUp",
-      "shift-pageup": "editor::SelectPageUp",
-      "cmd-pageup": "editor::PageUp",
-      "ctrl-pageup": "editor::LineUp",
-      "down": "editor::MoveDown",
-      "ctrl-down": "editor::MoveToEndOfParagraph",
-      "pagedown": "editor::MovePageDown",
-      "shift-pagedown": "editor::SelectPageDown",
-      "cmd-pagedown": "editor::PageDown",
-      "ctrl-pagedown": "editor::LineDown",
-      "ctrl-p": "editor::MoveUp",
-      "ctrl-n": "editor::MoveDown",
-      "ctrl-b": "editor::MoveLeft",
-      "left": "editor::MoveLeft",
-      "ctrl-f": "editor::MoveRight",
-      "right": "editor::MoveRight",
-      "ctrl-l": "editor::ScrollCursorCenter",
-      "alt-left": "editor::MoveToPreviousWordStart",
-      "alt-right": "editor::MoveToNextWordEnd",
-      "cmd-left": ["editor::MoveToBeginningOfLine", { "stop_at_soft_wraps": true, "stop_at_indent": true }],
-      "ctrl-a": ["editor::MoveToBeginningOfLine", { "stop_at_soft_wraps": false, "stop_at_indent": true }],
-      "home": ["editor::MoveToBeginningOfLine", { "stop_at_soft_wraps": true, "stop_at_indent": true }],
-      "cmd-right": ["editor::MoveToEndOfLine", { "stop_at_soft_wraps": true }],
-      "ctrl-e": ["editor::MoveToEndOfLine", { "stop_at_soft_wraps": false }],
-      "end": ["editor::MoveToEndOfLine", { "stop_at_soft_wraps": true }],
-      "cmd-up": "editor::MoveToBeginning",
-      "cmd-down": "editor::MoveToEnd",
-      "cmd-home": "editor::MoveToBeginning", // Typed via `cmd-fn-left`
-      "cmd-end": "editor::MoveToEnd", // Typed via `cmd-fn-right`
-      "shift-up": "editor::SelectUp",
-      "ctrl-shift-p": "editor::SelectUp",
-      "shift-down": "editor::SelectDown",
-      "ctrl-shift-n": "editor::SelectDown",
-      "shift-left": "editor::SelectLeft",
-      "ctrl-shift-b": "editor::SelectLeft",
-      "shift-right": "editor::SelectRight",
-      "ctrl-shift-f": "editor::SelectRight",
-      "alt-shift-left": "editor::SelectToPreviousWordStart", // cursorWordLeftSelect
-      "alt-shift-right": "editor::SelectToNextWordEnd", // cursorWordRightSelect
-      "ctrl-shift-up": "editor::SelectToStartOfParagraph",
-      "ctrl-shift-down": "editor::SelectToEndOfParagraph",
-      "cmd-shift-up": "editor::SelectToBeginning",
-      "cmd-shift-down": "editor::SelectToEnd",
-      "cmd-a": "editor::SelectAll",
-      "cmd-l": "editor::SelectLine",
-      "cmd-shift-i": "editor::Format",
-      "alt-shift-o": "editor::OrganizeImports",
-      "cmd-shift-left": ["editor::SelectToBeginningOfLine", { "stop_at_soft_wraps": true, "stop_at_indent": true }],
-      "shift-home": ["editor::SelectToBeginningOfLine", { "stop_at_soft_wraps": true, "stop_at_indent": true }],
-      "ctrl-shift-a": ["editor::SelectToBeginningOfLine", { "stop_at_soft_wraps": true, "stop_at_indent": true }],
-      "cmd-shift-right": ["editor::SelectToEndOfLine", { "stop_at_soft_wraps": true }],
-      "shift-end": ["editor::SelectToEndOfLine", { "stop_at_soft_wraps": true }],
-      "ctrl-shift-e": ["editor::SelectToEndOfLine", { "stop_at_soft_wraps": true }],
-      "ctrl-v": ["editor::MovePageDown", { "center_cursor": true }],
-      "ctrl-shift-v": ["editor::MovePageUp", { "center_cursor": true }],
-      "ctrl-cmd-space": "editor::ShowCharacterPalette",
-      "cmd-;": "editor::ToggleLineNumbers",
-      "cmd-'": "editor::ToggleSelectedDiffHunks",
-      "cmd-\"": "editor::ExpandAllDiffHunks",
-      "cmd-alt-g b": "git::Blame",
-      "cmd-alt-g m": "git::OpenModifiedFiles",
-      "cmd-i": "editor::ShowSignatureHelp",
-      "f9": "editor::ToggleBreakpoint",
-      "shift-f9": "editor::EditLogBreakpoint",
-      "ctrl-f12": "editor::GoToDeclaration",
-      "alt-ctrl-f12": "editor::GoToDeclarationSplit",
-      "ctrl-cmd-e": "editor::ToggleEditPrediction"
-    }
-  },
-  {
-    "context": "Editor && mode == full",
-    "use_key_equivalents": true,
-    "bindings": {
-      "shift-enter": "editor::Newline",
-      "enter": "editor::Newline",
-      "cmd-enter": "editor::NewlineBelow",
-      "cmd-shift-enter": "editor::NewlineAbove",
-      "cmd-k z": "editor::ToggleSoftWrap",
-      "cmd-f": "buffer_search::Deploy",
-      "cmd-alt-f": "buffer_search::DeployReplace",
-      "cmd-alt-l": ["buffer_search::Deploy", { "selection_search_enabled": true }],
-      "cmd-e": ["buffer_search::Deploy", { "focus": false }],
-      "cmd->": "agent::AddSelectionToThread",
-      "cmd-<": "assistant::InsertIntoEditor",
-      "cmd-alt-e": "editor::SelectEnclosingSymbol",
-      "alt-enter": "editor::OpenSelectionsInMultibuffer"
-    }
-  },
-  {
-    "context": "Editor && multibuffer",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-up": "editor::MoveToStartOfExcerpt",
-      "cmd-down": "editor::MoveToStartOfNextExcerpt",
-      "cmd-shift-up": "editor::SelectToStartOfExcerpt",
-      "cmd-shift-down": "editor::SelectToStartOfNextExcerpt"
-    }
-  },
-  {
-    "context": "Editor && mode == full && edit_prediction",
-    "use_key_equivalents": true,
-    "bindings": {
-      "alt-tab": "editor::NextEditPrediction",
-      "alt-shift-tab": "editor::PreviousEditPrediction"
-    }
-  },
-  {
-    "context": "Editor && !edit_prediction",
-    "use_key_equivalents": true,
-    "bindings": {
-      "alt-tab": "editor::ShowEditPrediction"
-    }
-  },
-  {
-    "context": "Editor && mode == auto_height",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-enter": "editor::Newline",
-      "shift-enter": "editor::Newline",
-      "ctrl-shift-enter": "editor::NewlineBelow"
-    }
-  },
-  {
-    "context": "Markdown",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-c": "markdown::Copy"
-    }
-  },
-  {
-    "context": "Editor && jupyter && !ContextEditor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-shift-enter": "repl::Run",
-      "ctrl-alt-enter": "repl::RunInPlace"
-    }
-  },
-  {
-    "context": "Editor && !agent_diff && !AgentPanel",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-alt-z": "git::Restore",
-      "cmd-alt-y": "git::ToggleStaged",
-      "cmd-y": "git::StageAndNext",
-      "cmd-shift-y": "git::UnstageAndNext"
-    }
-  },
-  {
-    "context": "AgentDiff",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-y": "agent::Keep",
-      "cmd-n": "agent::Reject",
-      "cmd-shift-y": "agent::KeepAll",
-      "cmd-shift-n": "agent::RejectAll"
-    }
-  },
-  {
-    "context": "Editor && editor_agent_diff",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-y": "agent::Keep",
-      "cmd-n": "agent::Reject",
-      "cmd-shift-y": "agent::KeepAll",
-      "cmd-shift-n": "agent::RejectAll",
-      "shift-ctrl-r": "agent::OpenAgentDiff"
-    }
-  },
-  {
-    "context": "ContextEditor > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-enter": "assistant::Assist",
-      "cmd-s": "workspace::Save",
-      "cmd-<": "assistant::InsertIntoEditor",
-      "shift-enter": "assistant::Split",
-      "ctrl-r": "assistant::CycleMessageRole",
-      "enter": "assistant::ConfirmCommand",
-      "alt-enter": "editor::Newline",
-      "cmd-k c": "assistant::CopyCode",
-      "cmd-g": "search::SelectNextMatch",
-      "cmd-shift-g": "search::SelectPreviousMatch",
-      "cmd-k l": "agent::OpenRulesLibrary"
-    }
-  },
-  {
-    "context": "AgentPanel",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-n": "agent::NewThread",
-      "cmd-alt-n": "agent::NewTextThread",
-      "cmd-shift-h": "agent::OpenHistory",
-      "cmd-alt-c": "agent::OpenSettings",
-      "cmd-alt-l": "agent::OpenRulesLibrary",
-      "cmd-alt-p": "agent::ManageProfiles",
-      "cmd-i": "agent::ToggleProfileSelector",
-      "cmd-alt-/": "agent::ToggleModelSelector",
-      "cmd-shift-j": "agent::ToggleNavigationMenu",
-      "cmd-alt-m": "agent::ToggleOptionsMenu",
-      "cmd-alt-shift-n": "agent::ToggleNewThreadMenu",
-      "shift-alt-escape": "agent::ExpandMessageEditor",
-      "cmd->": "agent::AddSelectionToThread",
-      "cmd-shift-e": "project_panel::ToggleFocus",
-      "cmd-ctrl-b": "agent::ToggleBurnMode",
-      "cmd-shift-enter": "agent::ContinueThread",
-      "alt-enter": "agent::ContinueWithBurnMode",
-      "cmd-y": "agent::AllowOnce",
-      "cmd-alt-y": "agent::AllowAlways",
-      "cmd-alt-z": "agent::RejectOnce"
-    }
-  },
-  {
-    "context": "AgentPanel > NavigationMenu",
-    "bindings": {
-      "shift-backspace": "agent::DeleteRecentlyOpenThread"
-    }
-  },
-  {
-    "context": "AgentPanel > Markdown",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-c": "markdown::CopyAsMarkdown"
-    }
-  },
-  {
-    "context": "AgentPanel && text_thread",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-n": "agent::NewTextThread",
-      "cmd-alt-n": "agent::NewExternalAgentThread"
-    }
-  },
-  {
-    "context": "AgentPanel && acp_thread",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-n": "agent::NewExternalAgentThread",
-      "cmd-alt-t": "agent::NewThread"
-    }
-  },
-  {
-    "context": "MessageEditor && !Picker > Editor && !use_modifier_to_send",
-    "use_key_equivalents": true,
-    "bindings": {
-      "enter": "agent::Chat",
-      "cmd-enter": "agent::ChatWithFollow",
-      "cmd-i": "agent::ToggleProfileSelector",
-      "shift-ctrl-r": "agent::OpenAgentDiff",
-      "cmd-shift-y": "agent::KeepAll",
-      "cmd-shift-n": "agent::RejectAll"
-    }
-  },
-  {
-    "context": "MessageEditor && !Picker > Editor && use_modifier_to_send",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-enter": "agent::Chat",
-      "enter": "editor::Newline",
-      "cmd-i": "agent::ToggleProfileSelector",
-      "shift-ctrl-r": "agent::OpenAgentDiff",
-      "cmd-shift-y": "agent::KeepAll",
-      "cmd-shift-n": "agent::RejectAll"
-    }
-  },
-  {
-    "context": "EditMessageEditor > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "escape": "menu::Cancel",
-      "enter": "menu::Confirm",
-      "alt-enter": "editor::Newline"
-    }
-  },
-  {
-    "context": "AgentFeedbackMessageEditor > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "escape": "menu::Cancel",
-      "enter": "menu::Confirm",
-      "alt-enter": "editor::Newline"
-    }
-  },
-  {
-    "context": "AgentConfiguration",
-    "bindings": {
-      "ctrl--": "pane::GoBack"
-    }
-  },
-  {
-    "context": "AcpThread > ModeSelector",
-    "bindings": {
-      "cmd-enter": "menu::Confirm"
-    }
-  },
-  {
-    "context": "AcpThread > Editor && !use_modifier_to_send",
-    "use_key_equivalents": true,
-    "bindings": {
-      "enter": "agent::Chat",
-      "shift-ctrl-r": "agent::OpenAgentDiff",
-      "cmd-shift-y": "agent::KeepAll",
-      "cmd-shift-n": "agent::RejectAll",
-      "shift-tab": "agent::CycleModeSelector"
-    }
-  },
-  {
-    "context": "AcpThread > Editor && use_modifier_to_send",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-enter": "agent::Chat",
-      "shift-ctrl-r": "agent::OpenAgentDiff",
-      "cmd-shift-y": "agent::KeepAll",
-      "cmd-shift-n": "agent::RejectAll",
-      "shift-tab": "agent::CycleModeSelector"
-    }
-  },
-  {
-    "context": "ThreadHistory",
-    "bindings": {
-      "ctrl--": "pane::GoBack"
-    }
-  },
-  {
-    "context": "ThreadHistory > Editor",
-    "bindings": {
-      "shift-backspace": "agent::RemoveSelectedThread"
-    }
-  },
-  {
-    "context": "RulesLibrary",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-n": "rules_library::NewRule",
-      "cmd-shift-s": "rules_library::ToggleDefaultRule",
-      "cmd-w": "workspace::CloseWindow"
-    }
-  },
-  {
-    "context": "BufferSearchBar",
-    "use_key_equivalents": true,
-    "bindings": {
-      "escape": "buffer_search::Dismiss",
-      "tab": "buffer_search::FocusEditor",
-      "enter": "search::SelectNextMatch",
-      "shift-enter": "search::SelectPreviousMatch",
-      "alt-enter": "search::SelectAllMatches",
-      "cmd-f": "search::FocusSearch",
-      "cmd-alt-f": "search::ToggleReplace",
-      "cmd-alt-l": "search::ToggleSelection",
-      "cmd-shift-o": "outline::Toggle"
-    }
-  },
-  {
-    "context": "BufferSearchBar && in_replace > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "enter": "search::ReplaceNext",
-      "cmd-enter": "search::ReplaceAll"
-    }
-  },
-  {
-    "context": "BufferSearchBar && !in_replace > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "up": "search::PreviousHistoryQuery",
-      "down": "search::NextHistoryQuery"
-    }
-  },
-  {
-    "context": "ProjectSearchBar",
-    "use_key_equivalents": true,
-    "bindings": {
-      "escape": "project_search::ToggleFocus",
-      "cmd-shift-j": "project_search::ToggleFilters",
-      "shift-enter": "project_search::ToggleAllSearchResults",
-      "cmd-shift-f": "search::FocusSearch",
-      "cmd-shift-h": "search::ToggleReplace",
-      "alt-cmd-g": "search::ToggleRegex",
-      "alt-cmd-x": "search::ToggleRegex"
-    }
-  },
-  {
-    "context": "ProjectSearchBar > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "up": "search::PreviousHistoryQuery",
-      "down": "search::NextHistoryQuery"
-    }
-  },
-  {
-    "context": "ProjectSearchBar && in_replace > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "enter": "search::ReplaceNext",
-      "cmd-enter": "search::ReplaceAll"
-    }
-  },
-  {
-    "context": "ProjectSearchView",
-    "use_key_equivalents": true,
-    "bindings": {
-      "escape": "project_search::ToggleFocus",
-      "cmd-shift-j": "project_search::ToggleFilters",
-      "shift-enter": "project_search::ToggleAllSearchResults",
-      "cmd-shift-h": "search::ToggleReplace",
-      "alt-cmd-g": "search::ToggleRegex",
-      "alt-cmd-x": "search::ToggleRegex"
-    }
-  },
-  {
-    "context": "Pane",
-    "use_key_equivalents": true,
-    "bindings": {
-      "alt-cmd-left": "pane::ActivatePreviousItem",
-      "cmd-{": "pane::ActivatePreviousItem",
-      "alt-cmd-right": "pane::ActivateNextItem",
-      "cmd-}": "pane::ActivateNextItem",
-      "ctrl-shift-pageup": "pane::SwapItemLeft",
-      "ctrl-shift-pagedown": "pane::SwapItemRight",
-      "cmd-w": ["pane::CloseActiveItem", { "close_pinned": false }],
-      "alt-cmd-t": ["pane::CloseOtherItems", { "close_pinned": false }],
-      "ctrl-alt-cmd-w": "workspace::CloseInactiveTabsAndPanes",
-      "cmd-k e": ["pane::CloseItemsToTheLeft", { "close_pinned": false }],
-      "cmd-k t": ["pane::CloseItemsToTheRight", { "close_pinned": false }],
-      "cmd-k u": ["pane::CloseCleanItems", { "close_pinned": false }],
-      "cmd-k w": ["pane::CloseAllItems", { "close_pinned": false }],
-      "cmd-k cmd-w": "workspace::CloseAllItemsAndPanes",
-      "cmd-f": "project_search::ToggleFocus",
-      "cmd-g": "search::SelectNextMatch",
-      "cmd-shift-g": "search::SelectPreviousMatch",
-      "cmd-shift-h": "search::ToggleReplace",
-      "cmd-alt-l": "search::ToggleSelection",
-      "alt-enter": "search::SelectAllMatches",
-      "alt-cmd-c": "search::ToggleCaseSensitive",
-      "alt-cmd-w": "search::ToggleWholeWord",
-      "alt-cmd-f": "project_search::ToggleFilters",
-      "alt-cmd-x": "search::ToggleRegex",
-      "cmd-k shift-enter": "pane::TogglePinTab"
-    }
-  },
-  // Bindings from VS Code
-  {
-    "context": "Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-[": "editor::Outdent",
-      "cmd-]": "editor::Indent",
-      "cmd-ctrl-p": ["editor::AddSelectionAbove", { "skip_soft_wrap": false }], // Insert cursor above
-      "cmd-alt-up": ["editor::AddSelectionAbove", { "skip_soft_wrap": true }],
-      "cmd-ctrl-n": ["editor::AddSelectionBelow", { "skip_soft_wrap": false }], // Insert cursor below
-      "cmd-alt-down": ["editor::AddSelectionBelow", { "skip_soft_wrap": true }],
-      "cmd-shift-k": "editor::DeleteLine",
-      "alt-up": "editor::MoveLineUp",
-      "alt-down": "editor::MoveLineDown",
-      "alt-shift-up": "editor::DuplicateLineUp",
-      "alt-shift-down": "editor::DuplicateLineDown",
-      "cmd-ctrl-left": "editor::SelectSmallerSyntaxNode", // Shrink selection
-      "cmd-ctrl-right": "editor::SelectLargerSyntaxNode", // Expand selection
-      "cmd-ctrl-up": "editor::SelectPreviousSyntaxNode", // Move selection up
-      "ctrl-shift-right": "editor::SelectLargerSyntaxNode", // Expand selection (VSCode version)
-      "ctrl-shift-left": "editor::SelectSmallerSyntaxNode", // Shrink selection (VSCode version)
-      "cmd-ctrl-down": "editor::SelectNextSyntaxNode", // Move selection down
-      "cmd-d": ["editor::SelectNext", { "replace_newest": false }], // editor.action.addSelectionToNextFindMatch / find_under_expand
-      "cmd-shift-l": "editor::SelectAllMatches", // Select all occurrences of current selection
-      "cmd-f2": "editor::SelectAllMatches", // Select all occurrences of current word
-      "cmd-k cmd-d": ["editor::SelectNext", { "replace_newest": true }], // editor.action.moveSelectionToNextFindMatch / find_under_expand_skip
-      // macOS binds `ctrl-cmd-d` to Show Dictionary which breaks these two binds
-      // To use `ctrl-cmd-d` or `ctrl-k ctrl-cmd-d` in Zed you must execute this command and then restart:
-      //   defaults write com.apple.symbolichotkeys AppleSymbolicHotKeys -dict-add 70 '<dict><key>enabled</key><false/></dict>'
-      "ctrl-cmd-d": ["editor::SelectPrevious", { "replace_newest": false }], // editor.action.addSelectionToPreviousFindMatch
-      "cmd-k ctrl-cmd-d": ["editor::SelectPrevious", { "replace_newest": true }], // editor.action.moveSelectionToPreviousFindMatch
-      "cmd-k cmd-i": "editor::Hover",
-      "cmd-k cmd-b": "editor::BlameHover",
-      "cmd-/": ["editor::ToggleComments", { "advance_downwards": false }],
-      "f8": ["editor::GoToDiagnostic", { "severity": { "min": "hint", "max": "error" } }],
-      "shift-f8": ["editor::GoToPreviousDiagnostic", { "severity": { "min": "hint", "max": "error" } }],
-      "f2": "editor::Rename",
-      "f12": "editor::GoToDefinition",
-      "alt-f12": "editor::GoToDefinitionSplit",
-      "cmd-f12": "editor::GoToTypeDefinition",
-      "shift-f12": "editor::GoToImplementation",
-      "alt-cmd-f12": "editor::GoToTypeDefinitionSplit",
-      "alt-shift-f12": "editor::FindAllReferences",
-      "cmd-|": "editor::MoveToEnclosingBracket",
-      "ctrl-m": "editor::MoveToEnclosingBracket", // From Jetbrains
-      "alt-cmd-[": "editor::Fold",
-      "alt-cmd-]": "editor::UnfoldLines",
-      "cmd-k cmd-l": "editor::ToggleFold",
-      "cmd-k cmd-[": "editor::FoldRecursive",
-      "cmd-k cmd-]": "editor::UnfoldRecursive",
-      "cmd-k cmd-1": "editor::FoldAtLevel_1",
-      "cmd-k cmd-2": "editor::FoldAtLevel_2",
-      "cmd-k cmd-3": "editor::FoldAtLevel_3",
-      "cmd-k cmd-4": "editor::FoldAtLevel_4",
-      "cmd-k cmd-5": "editor::FoldAtLevel_5",
-      "cmd-k cmd-6": "editor::FoldAtLevel_6",
-      "cmd-k cmd-7": "editor::FoldAtLevel_7",
-      "cmd-k cmd-8": "editor::FoldAtLevel_8",
-      "cmd-k cmd-9": "editor::FoldAtLevel_9",
-      "cmd-k cmd-0": "editor::FoldAll",
-      "cmd-k cmd-j": "editor::UnfoldAll",
-      // Using `ctrl-space` / `ctrl-shift-space` in Zed requires disabling the macOS global shortcut.
-      // System Preferences->Keyboard->Keyboard Shortcuts->Input Sources->Select the previous input source (uncheck)
-      "ctrl-space": "editor::ShowCompletions",
-      "ctrl-shift-space": "editor::ShowWordCompletions",
-      "cmd-.": "editor::ToggleCodeActions",
-      "cmd-k r": "editor::RevealInFileManager",
-      "cmd-k p": "editor::CopyPath",
-      "cmd-\\": "pane::SplitRight"
-    }
-  },
-  {
-    "context": "Editor && extension == md",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-k v": "markdown::OpenPreviewToTheSide",
-      "cmd-shift-v": "markdown::OpenPreview"
-    }
-  },
-  {
-    "context": "Editor && extension == svg",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-k v": "svg::OpenPreviewToTheSide",
-      "cmd-shift-v": "svg::OpenPreview"
-    }
-  },
-  {
-    "context": "Editor && mode == full",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-shift-o": "outline::Toggle",
-      "ctrl-g": "go_to_line::Toggle",
-      "cmd-shift-backspace": "editor::GoToPreviousChange",
-      "cmd-shift-alt-backspace": "editor::GoToNextChange"
-    }
-  },
-  {
-    "context": "Pane",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-1": ["pane::ActivateItem", 0],
-      "ctrl-2": ["pane::ActivateItem", 1],
-      "ctrl-3": ["pane::ActivateItem", 2],
-      "ctrl-4": ["pane::ActivateItem", 3],
-      "ctrl-5": ["pane::ActivateItem", 4],
-      "ctrl-6": ["pane::ActivateItem", 5],
-      "ctrl-7": ["pane::ActivateItem", 6],
-      "ctrl-8": ["pane::ActivateItem", 7],
-      "ctrl-9": ["pane::ActivateItem", 8],
-      "ctrl-0": "pane::ActivateLastItem",
-      "ctrl--": "pane::GoBack",
-      "ctrl-_": "pane::GoForward",
-      "cmd-shift-f": "pane::DeploySearch"
-    }
-  },
-  {
-    "context": "Workspace",
-    "use_key_equivalents": true,
-    "bindings": {
-      // Change the default action on `menu::Confirm` by setting the parameter
-      // "alt-cmd-o": ["projects::OpenRecent", {"create_new_window": true }],
-      "alt-cmd-o": ["projects::OpenRecent", { "create_new_window": false }],
-      "ctrl-cmd-o": ["projects::OpenRemote", { "from_existing_connection": false, "create_new_window": false }],
-      "ctrl-cmd-shift-o": ["projects::OpenRemote", { "from_existing_connection": true, "create_new_window": false }],
-      "cmd-ctrl-b": "branches::OpenRecent",
-      "ctrl-~": "workspace::NewTerminal",
-      "cmd-s": "workspace::Save",
-      "cmd-k s": "workspace::SaveWithoutFormat",
-      "alt-shift-enter": "toast::RunAction",
-      "cmd-shift-s": "workspace::SaveAs",
-      "cmd-shift-n": "workspace::NewWindow",
-      "ctrl-`": "terminal_panel::Toggle",
-      "cmd-1": ["workspace::ActivatePane", 0],
-      "cmd-2": ["workspace::ActivatePane", 1],
-      "cmd-3": ["workspace::ActivatePane", 2],
-      "cmd-4": ["workspace::ActivatePane", 3],
-      "cmd-5": ["workspace::ActivatePane", 4],
-      "cmd-6": ["workspace::ActivatePane", 5],
-      "cmd-7": ["workspace::ActivatePane", 6],
-      "cmd-8": ["workspace::ActivatePane", 7],
-      "cmd-9": ["workspace::ActivatePane", 8],
-      "cmd-b": "workspace::ToggleLeftDock",
-      "cmd-alt-b": "workspace::ToggleRightDock",
-      "cmd-r": "workspace::ToggleRightDock",
-      "cmd-j": "workspace::ToggleBottomDock",
-      "alt-cmd-y": "workspace::ToggleAllDocks",
-      // For 0px parameter, uses UI font size value.
-      "ctrl-alt-0": "workspace::ResetActiveDockSize",
-      "ctrl-alt--": ["workspace::DecreaseActiveDockSize", { "px": 0 }],
-      "ctrl-alt-=": ["workspace::IncreaseActiveDockSize", { "px": 0 }],
-      "ctrl-alt-)": "workspace::ResetOpenDocksSize",
-      "ctrl-alt-_": ["workspace::DecreaseOpenDocksSize", { "px": 0 }],
-      "ctrl-alt-+": ["workspace::IncreaseOpenDocksSize", { "px": 0 }],
-      "cmd-shift-f": "pane::DeploySearch",
-      "cmd-shift-h": ["pane::DeploySearch", { "replace_enabled": true }],
-      "cmd-shift-t": "pane::ReopenClosedItem",
-      "cmd-k cmd-s": "zed::OpenKeymap",
-      "cmd-k cmd-t": "theme_selector::Toggle",
-      "ctrl-alt-cmd-p": "settings_profile_selector::Toggle",
-      "cmd-t": "project_symbols::Toggle",
-      "cmd-p": "file_finder::Toggle",
-      "ctrl-shift-tab": ["tab_switcher::Toggle", { "select_last": true }],
-      "ctrl-tab": "tab_switcher::Toggle",
-      "cmd-shift-p": "command_palette::Toggle",
-      "cmd-shift-m": "diagnostics::Deploy",
-      "cmd-shift-e": "project_panel::ToggleFocus",
-      "cmd-shift-b": "outline_panel::ToggleFocus",
-      "ctrl-shift-g": "git_panel::ToggleFocus",
-      "cmd-shift-d": "debug_panel::ToggleFocus",
-      "cmd-?": "agent::ToggleFocus",
-      "cmd-alt-s": "workspace::SaveAll",
-      "cmd-k m": "language_selector::Toggle",
-      "cmd-k cmd-m": "toolchain::AddToolchain",
-      "escape": "workspace::Unfollow",
-      "cmd-k cmd-left": "workspace::ActivatePaneLeft",
-      "cmd-k cmd-right": "workspace::ActivatePaneRight",
-      "cmd-k cmd-up": "workspace::ActivatePaneUp",
-      "cmd-k cmd-down": "workspace::ActivatePaneDown",
-      "cmd-k shift-left": "workspace::SwapPaneLeft",
-      "cmd-k shift-right": "workspace::SwapPaneRight",
-      "cmd-k shift-up": "workspace::SwapPaneUp",
-      "cmd-k shift-down": "workspace::SwapPaneDown",
-      "cmd-shift-x": "zed::Extensions",
-      "f5": "debugger::Rerun",
-      "cmd-w": "workspace::CloseActiveDock"
-    }
-  },
-  {
-    "context": "Workspace && !Terminal",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-n": "workspace::NewFile",
-      "cmd-shift-r": "task::Spawn",
-      // All task parameters are captured and unchanged between reruns by default.
-      // Use the `"reevaluate_context"` parameter to control this.
-      "cmd-alt-r": ["task::Rerun", { "reevaluate_context": false }],
-      "ctrl-alt-shift-r": ["task::Spawn", { "reveal_target": "center" }]
-      // also possible to spawn tasks by name:
-      // "foo-bar": ["task::Spawn", { "task_name": "MyTask", "reveal_target": "dock" }]
-      // or by tag:
-      // "foo-bar": ["task::Spawn", { "task_tag": "MyTag" }],
-    }
-  },
-  {
-    "context": "Workspace && debugger_running",
-    "use_key_equivalents": true,
-    "bindings": {
-      "f5": "zed::NoAction",
-      "f11": "debugger::StepInto"
-    }
-  },
-  {
-    "context": "Workspace && debugger_stopped",
-    "use_key_equivalents": true,
-    "bindings": {
-      "f5": "debugger::Continue"
-    }
-  },
-  // Bindings from Sublime Text
-  {
-    "context": "Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-u": "editor::UndoSelection",
-      "cmd-shift-u": "editor::RedoSelection",
-      "ctrl-j": "editor::JoinLines",
-      "ctrl-alt-backspace": "editor::DeleteToPreviousSubwordStart",
-      "ctrl-alt-h": "editor::DeleteToPreviousSubwordStart",
-      "ctrl-alt-delete": "editor::DeleteToNextSubwordEnd",
-      "ctrl-alt-d": "editor::DeleteToNextSubwordEnd",
-      "ctrl-alt-left": "editor::MoveToPreviousSubwordStart",
-      "ctrl-alt-b": "editor::MoveToPreviousSubwordStart",
-      "ctrl-alt-right": "editor::MoveToNextSubwordEnd",
-      "ctrl-alt-f": "editor::MoveToNextSubwordEnd",
-      "ctrl-alt-shift-left": "editor::SelectToPreviousSubwordStart",
-      "ctrl-alt-shift-b": "editor::SelectToPreviousSubwordStart",
-      "ctrl-alt-shift-right": "editor::SelectToNextSubwordEnd",
-      "ctrl-alt-shift-f": "editor::SelectToNextSubwordEnd"
-    }
-  },
-  // Bindings from Atom
-  {
-    "context": "Pane",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-k up": "pane::SplitUp",
-      "cmd-k down": "pane::SplitDown",
-      "cmd-k left": "pane::SplitLeft",
-      "cmd-k right": "pane::SplitRight"
-    }
-  },
-  // Bindings that should be unified with bindings for more general actions
-  {
-    "context": "Editor && renaming",
-    "use_key_equivalents": true,
-    "bindings": {
-      "enter": "editor::ConfirmRename"
-    }
-  },
-  {
-    "context": "Editor && showing_completions",
-    "use_key_equivalents": true,
-    "bindings": {
-      "enter": "editor::ConfirmCompletion",
-      "shift-enter": "editor::ConfirmCompletionReplace",
-      "tab": "editor::ComposeCompletion"
-    }
-  },
-  {
-    "context": "Editor && in_snippet && has_next_tabstop && !showing_completions",
-    "use_key_equivalents": true,
-    "bindings": {
-      "tab": "editor::NextSnippetTabstop"
-    }
-  },
-  {
-    "context": "Editor && in_snippet && has_previous_tabstop && !showing_completions",
-    "use_key_equivalents": true,
-    "bindings": {
-      "shift-tab": "editor::PreviousSnippetTabstop"
-    }
-  },
-  {
-    "context": "Editor && edit_prediction",
-    "bindings": {
-      "alt-tab": "editor::AcceptEditPrediction",
-      "tab": "editor::AcceptEditPrediction",
-      "ctrl-cmd-right": "editor::AcceptPartialEditPrediction"
-    }
-  },
-  {
-    "context": "Editor && edit_prediction_conflict",
-    "use_key_equivalents": true,
-    "bindings": {
-      "alt-tab": "editor::AcceptEditPrediction",
-      "ctrl-cmd-right": "editor::AcceptPartialEditPrediction"
-    }
-  },
-  {
-    "context": "Editor && showing_code_actions",
-    "use_key_equivalents": true,
-    "bindings": {
-      "enter": "editor::ConfirmCodeAction"
-    }
-  },
-  {
-    "context": "Editor && (showing_code_actions || showing_completions)",
-    "use_key_equivalents": true,
-    "bindings": {
-      "up": "editor::ContextMenuPrevious",
-      "ctrl-p": "editor::ContextMenuPrevious",
-      "down": "editor::ContextMenuNext",
-      "ctrl-n": "editor::ContextMenuNext",
-      "pageup": "editor::ContextMenuFirst",
-      "pagedown": "editor::ContextMenuLast"
-    }
-  },
-  {
-    "context": "Editor && showing_signature_help && !showing_completions",
-    "bindings": {
-      "up": "editor::SignatureHelpPrevious",
-      "down": "editor::SignatureHelpNext"
-    }
-  },
-  // Custom bindings
-  {
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-alt-cmd-f": "workspace::FollowNextCollaborator",
-      // TODO: Move this to a dock open action
-      "cmd-shift-c": "collab_panel::ToggleFocus",
-      // Only available in debug builds: opens an element inspector for development.
-      "cmd-alt-i": "dev::ToggleInspector"
-    }
-  },
-  {
-    "context": "!ContextEditor > Editor && mode == full",
-    "use_key_equivalents": true,
-    "bindings": {
-      "alt-enter": "editor::OpenExcerpts",
-      "shift-enter": "editor::ExpandExcerpts",
-      "cmd-alt-enter": "editor::OpenExcerptsSplit",
-      "cmd-shift-e": "pane::RevealInProjectPanel",
-      "cmd-f8": "editor::GoToHunk",
-      "cmd-shift-f8": "editor::GoToPreviousHunk",
-      "ctrl-enter": "assistant::InlineAssist",
-      "ctrl-:": "editor::ToggleInlayHints"
-    }
-  },
-  {
-    "context": "PromptEditor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-alt-/": "agent::ToggleModelSelector",
-      "ctrl-[": "agent::CyclePreviousInlineAssist",
-      "ctrl-]": "agent::CycleNextInlineAssist",
-      "cmd-shift-enter": "inline_assistant::ThumbsUpResult",
-      "cmd-shift-backspace": "inline_assistant::ThumbsDownResult"
-    }
-  },
-  {
-    "context": "Prompt",
-    "use_key_equivalents": true,
-    "bindings": {
-      "left": "menu::SelectPrevious",
-      "right": "menu::SelectNext",
-      "h": "menu::SelectPrevious",
-      "l": "menu::SelectNext"
-    }
-  },
-  {
-    "context": "ProjectSearchBar && !in_replace",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-enter": "project_search::SearchInNew"
-    }
-  },
-  {
-    "context": "OutlinePanel && not_editing",
-    "use_key_equivalents": true,
-    "bindings": {
-      "escape": "menu::Cancel",
-      "left": "outline_panel::CollapseSelectedEntry",
-      "right": "outline_panel::ExpandSelectedEntry",
-      "cmd-alt-c": "workspace::CopyPath",
-      "alt-cmd-shift-c": "workspace::CopyRelativePath",
-      "alt-cmd-r": "outline_panel::RevealInFileManager",
-      "space": "outline_panel::OpenSelectedEntry",
-      "shift-down": "menu::SelectNext",
-      "shift-up": "menu::SelectPrevious",
-      "alt-enter": "editor::OpenExcerpts",
-      "cmd-alt-enter": "editor::OpenExcerptsSplit"
-    }
-  },
-  {
-    "context": "ProjectPanel",
-    "use_key_equivalents": true,
-    "bindings": {
-      "left": "project_panel::CollapseSelectedEntry",
-      "cmd-left": "project_panel::CollapseAllEntries",
-      "right": "project_panel::ExpandSelectedEntry",
-      "cmd-n": "project_panel::NewFile",
-      "cmd-d": "project_panel::Duplicate",
-      "alt-cmd-n": "project_panel::NewDirectory",
-      "cmd-x": "project_panel::Cut",
-      "cmd-c": "project_panel::Copy",
-      "cmd-v": "project_panel::Paste",
-      "cmd-alt-c": "workspace::CopyPath",
-      "alt-cmd-shift-c": "workspace::CopyRelativePath",
-      "enter": "project_panel::Rename",
-      "f2": "project_panel::Rename",
-      "backspace": ["project_panel::Trash", { "skip_prompt": false }],
-      "delete": ["project_panel::Trash", { "skip_prompt": false }],
-      "cmd-backspace": ["project_panel::Trash", { "skip_prompt": true }],
-      "cmd-delete": ["project_panel::Delete", { "skip_prompt": false }],
-      "alt-cmd-r": "project_panel::RevealInFileManager",
-      "ctrl-shift-enter": "workspace::OpenWithSystem",
-      "alt-d": "project_panel::CompareMarkedFiles",
-      "cmd-alt-backspace": ["project_panel::Delete", { "skip_prompt": false }],
-      "cmd-alt-shift-f": "project_panel::NewSearchInDirectory",
-      "shift-down": "menu::SelectNext",
-      "shift-up": "menu::SelectPrevious",
-      "escape": "menu::Cancel"
-    }
-  },
-  {
-    "context": "ProjectPanel && not_editing",
-    "use_key_equivalents": true,
-    "bindings": {
-      "space": "project_panel::Open"
-    }
-  },
-  {
-    "context": "VariableList",
-    "use_key_equivalents": true,
-    "bindings": {
-      "left": "variable_list::CollapseSelectedEntry",
-      "right": "variable_list::ExpandSelectedEntry",
-      "enter": "variable_list::EditVariable",
-      "cmd-c": "variable_list::CopyVariableValue",
-      "cmd-alt-c": "variable_list::CopyVariableName",
-      "delete": "variable_list::RemoveWatch",
-      "backspace": "variable_list::RemoveWatch",
-      "alt-enter": "variable_list::AddWatch"
-    }
-  },
-  {
-    "context": "GitPanel && ChangesList",
-    "use_key_equivalents": true,
-    "bindings": {
-      "up": "menu::SelectPrevious",
-      "down": "menu::SelectNext",
-      "cmd-up": "menu::SelectFirst",
-      "cmd-down": "menu::SelectLast",
-      "enter": "menu::Confirm",
-      "cmd-alt-y": "git::ToggleStaged",
-      "space": "git::ToggleStaged",
-      "shift-space": "git::StageRange",
-      "cmd-y": "git::StageFile",
-      "cmd-shift-y": "git::UnstageFile",
-      "alt-down": "git_panel::FocusEditor",
-      "tab": "git_panel::FocusEditor",
-      "shift-tab": "git_panel::FocusEditor",
-      "escape": "git_panel::ToggleFocus",
-      "backspace": ["git::RestoreFile", { "skip_prompt": false }],
-      "delete": ["git::RestoreFile", { "skip_prompt": false }],
-      "cmd-backspace": ["git::RestoreFile", { "skip_prompt": true }],
-      "cmd-delete": ["git::RestoreFile", { "skip_prompt": true }]
-    }
-  },
-  {
-    "context": "GitPanel && CommitEditor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "escape": "git::Cancel"
-    }
-  },
-  {
-    "context": "GitDiff > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-enter": "git::Commit",
-      "cmd-shift-enter": "git::Amend",
-      "cmd-ctrl-y": "git::StageAll",
-      "cmd-ctrl-shift-y": "git::UnstageAll"
-    }
-  },
-  {
-    "context": "CommitEditor > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "enter": "editor::Newline",
-      "cmd-enter": "git::Commit",
-      "cmd-shift-enter": "git::Amend",
-      "tab": "git_panel::FocusChanges",
-      "shift-tab": "git_panel::FocusChanges",
-      "alt-up": "git_panel::FocusChanges",
-      "shift-escape": "git::ExpandCommitEditor",
-      "alt-tab": "git::GenerateCommitMessage"
-    }
-  },
-  {
-    "context": "GitPanel",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-g ctrl-g": "git::Fetch",
-      "ctrl-g up": "git::Push",
-      "ctrl-g down": "git::Pull",
-      "ctrl-g shift-down": "git::PullRebase",
-      "ctrl-g shift-up": "git::ForcePush",
-      "ctrl-g d": "git::Diff",
-      "ctrl-g backspace": "git::RestoreTrackedFiles",
-      "ctrl-g shift-backspace": "git::TrashUntrackedFiles",
-      "cmd-ctrl-y": "git::StageAll",
-      "cmd-ctrl-shift-y": "git::UnstageAll",
-      "cmd-enter": "git::Commit",
-      "cmd-shift-enter": "git::Amend"
-    }
-  },
-  {
-    "context": "GitCommit > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "enter": "editor::Newline",
-      "escape": "menu::Cancel",
-      "cmd-enter": "git::Commit",
-      "cmd-shift-enter": "git::Amend",
-      "alt-tab": "git::GenerateCommitMessage"
-    }
-  },
-  {
-    "context": "DebugPanel",
-    "bindings": {
-      "cmd-t": "debugger::ToggleThreadPicker",
-      "cmd-i": "debugger::ToggleSessionPicker",
-      "shift-alt-escape": "debugger::ToggleExpandItem"
-    }
-  },
-  {
-    "context": "BreakpointList",
-    "bindings": {
-      "space": "debugger::ToggleEnableBreakpoint",
-      "backspace": "debugger::UnsetBreakpoint",
-      "left": "debugger::PreviousBreakpointProperty",
-      "right": "debugger::NextBreakpointProperty"
-    }
-  },
-  {
-    "context": "CollabPanel && not_editing",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-backspace": "collab_panel::Remove",
-      "space": "menu::Confirm"
-    }
-  },
-  {
-    "context": "CollabPanel",
-    "use_key_equivalents": true,
-    "bindings": {
-      "alt-up": "collab_panel::MoveChannelUp",
-      "alt-down": "collab_panel::MoveChannelDown",
-      "alt-enter": "collab_panel::OpenSelectedChannelNotes"
-    }
-  },
-  {
-    "context": "(CollabPanel && editing) > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "space": "collab_panel::InsertSpace"
-    }
-  },
-  {
-    "context": "ChannelModal",
-    "use_key_equivalents": true,
-    "bindings": {
-      "tab": "channel_modal::ToggleMode"
-    }
-  },
-  {
-    "context": "Picker > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "escape": "menu::Cancel",
-      "up": "menu::SelectPrevious",
-      "down": "menu::SelectNext",
-      "tab": "picker::ConfirmCompletion",
-      "alt-enter": ["picker::ConfirmInput", { "secondary": false }],
-      "cmd-alt-enter": ["picker::ConfirmInput", { "secondary": true }]
-    }
-  },
-  {
-    "context": "ChannelModal > Picker > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "tab": "channel_modal::ToggleMode"
-    }
-  },
-  {
-    "context": "ToolchainSelector",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-shift-a": "toolchain::AddToolchain"
-    }
-  },
-  {
-    "context": "FileFinder || (FileFinder > Picker > Editor)",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-shift-a": "file_finder::ToggleSplitMenu",
-      "cmd-shift-i": "file_finder::ToggleFilterMenu"
-    }
-  },
-  {
-    "context": "FileFinder || (FileFinder > Picker > Editor) || (FileFinder > Picker > menu)",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-shift-p": "file_finder::SelectPrevious",
-      "cmd-j": "pane::SplitDown",
-      "cmd-k": "pane::SplitUp",
-      "cmd-h": "pane::SplitLeft",
-      "cmd-l": "pane::SplitRight"
-    }
-  },
-  {
-    "context": "TabSwitcher",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-shift-tab": "menu::SelectPrevious",
-      "ctrl-up": "menu::SelectPrevious",
-      "ctrl-down": "menu::SelectNext",
-      "ctrl-backspace": "tab_switcher::CloseSelectedItem"
-    }
-  },
-  {
-    "context": "StashList || (StashList > Picker > Editor)",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-shift-backspace": "stash_picker::DropStashItem",
-      "ctrl-shift-v": "stash_picker::ShowStashItem"
-    }
-  },
-  {
-    "context": "Terminal",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-cmd-space": "terminal::ShowCharacterPalette",
-      "cmd-c": "terminal::Copy",
-      "cmd-v": "terminal::Paste",
-      "cmd-f": "buffer_search::Deploy",
-      "cmd-a": "editor::SelectAll",
-      "cmd-k": "terminal::Clear",
-      "cmd-n": "workspace::NewTerminal",
-      "ctrl-enter": "assistant::InlineAssist",
-      "ctrl-_": null, // emacs undo
-      // Some nice conveniences
-      "cmd-backspace": ["terminal::SendText", "\u0015"], // ctrl-u: clear line
-      "alt-delete": ["terminal::SendText", "\u001bd"], // alt-d: delete word forward
-      "cmd-delete": ["terminal::SendText", "\u000b"], // ctrl-k: delete to end of line
-      "cmd-right": ["terminal::SendText", "\u0005"],
-      "cmd-left": ["terminal::SendText", "\u0001"],
-      // Terminal.app compatibility
-      "alt-left": ["terminal::SendText", "\u001bb"],
-      "alt-right": ["terminal::SendText", "\u001bf"],
-      "alt-b": ["terminal::SendText", "\u001bb"],
-      "alt-f": ["terminal::SendText", "\u001bf"],
-      "ctrl-delete": ["terminal::SendText", "\u001bd"],
-      // There are conflicting bindings for these keys in the global context.
-      // these bindings override them, remove at your own risk:
-      "up": ["terminal::SendKeystroke", "up"],
-      "pageup": ["terminal::SendKeystroke", "pageup"],
-      "down": ["terminal::SendKeystroke", "down"],
-      "pagedown": ["terminal::SendKeystroke", "pagedown"],
-      "escape": ["terminal::SendKeystroke", "escape"],
-      "enter": ["terminal::SendKeystroke", "enter"],
-      "ctrl-c": ["terminal::SendKeystroke", "ctrl-c"],
-      "ctrl-backspace": ["terminal::SendKeystroke", "ctrl-w"],
-      "shift-pageup": "terminal::ScrollPageUp",
-      "cmd-up": "terminal::ScrollPageUp",
-      "shift-pagedown": "terminal::ScrollPageDown",
-      "cmd-down": "terminal::ScrollPageDown",
-      "shift-up": "terminal::ScrollLineUp",
-      "shift-down": "terminal::ScrollLineDown",
-      "shift-home": "terminal::ScrollToTop",
-      "cmd-home": "terminal::ScrollToTop",
-      "shift-end": "terminal::ScrollToBottom",
-      "cmd-end": "terminal::ScrollToBottom",
-      // Using `ctrl-shift-space` in Zed requires disabling the macOS global shortcut.
-      // System Preferences->Keyboard->Keyboard Shortcuts->Input Sources->Select the previous input source (uncheck)
-      "ctrl-shift-space": "terminal::ToggleViMode",
-      "ctrl-alt-up": "pane::SplitUp",
-      "ctrl-alt-down": "pane::SplitDown",
-      "ctrl-alt-left": "pane::SplitLeft",
-      "ctrl-alt-right": "pane::SplitRight",
-      "cmd-d": "pane::SplitRight",
-      "cmd-alt-r": "terminal::RerunTask"
-    }
-  },
-  {
-    "context": "RatePredictionsModal",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-shift-enter": "zeta::ThumbsUpActivePrediction",
-      "cmd-shift-backspace": "zeta::ThumbsDownActivePrediction",
-      "shift-down": "zeta::NextEdit",
-      "shift-up": "zeta::PreviousEdit",
-      "right": "zeta::PreviewPrediction"
-    }
-  },
-  {
-    "context": "RatePredictionsModal > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "escape": "zeta::FocusPredictions",
-      "cmd-shift-enter": "zeta::ThumbsUpActivePrediction",
-      "cmd-shift-backspace": "zeta::ThumbsDownActivePrediction"
-    }
-  },
-  {
-    "context": "ZedPredictModal",
-    "use_key_equivalents": true,
-    "bindings": {
-      "escape": "menu::Cancel"
-    }
-  },
-  {
-    "context": "ConfigureContextServerModal > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "escape": "menu::Cancel",
-      "enter": "editor::Newline",
-      "cmd-enter": "menu::Confirm"
-    }
-  },
-  {
-    "context": "ContextServerToolsModal",
-    "use_key_equivalents": true,
-    "bindings": {
-      "escape": "menu::Cancel"
-    }
-  },
-  {
-    "context": "OnboardingAiConfigurationModal",
-    "use_key_equivalents": true,
-    "bindings": {
-      "escape": "menu::Cancel"
-    }
-  },
-  {
-    "context": "Diagnostics",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-r": "diagnostics::ToggleDiagnosticsRefresh"
-    }
-  },
-  {
-    "context": "DebugConsole > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "enter": "menu::Confirm",
-      "alt-enter": "console::WatchExpression"
-    }
-  },
-  {
-    "context": "RunModal",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-tab": "pane::ActivateNextItem",
-      "ctrl-shift-tab": "pane::ActivatePreviousItem"
-    }
-  },
-  {
-    "context": "MarkdownPreview",
-    "bindings": {
-      "pageup": "markdown::ScrollPageUp",
-      "pagedown": "markdown::ScrollPageDown",
-      "up": "markdown::ScrollUp",
-      "down": "markdown::ScrollDown",
-      "alt-up": "markdown::ScrollUpByItem",
-      "alt-down": "markdown::ScrollDownByItem"
-    }
-  },
-  {
-    "context": "KeymapEditor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-f": "search::FocusSearch",
-      "cmd-alt-f": "keymap_editor::ToggleKeystrokeSearch",
-      "cmd-alt-c": "keymap_editor::ToggleConflictFilter",
-      "enter": "keymap_editor::EditBinding",
-      "alt-enter": "keymap_editor::CreateBinding",
-      "cmd-c": "keymap_editor::CopyAction",
-      "cmd-shift-c": "keymap_editor::CopyContext",
-      "cmd-t": "keymap_editor::ShowMatchingKeybinds"
-    }
-  },
-  {
-    "context": "KeystrokeInput",
-    "use_key_equivalents": true,
-    "bindings": {
-      "enter": "keystroke_input::StartRecording",
-      "escape escape escape": "keystroke_input::StopRecording",
-      "delete": "keystroke_input::ClearKeystrokes"
-    }
-  },
-  {
-    "context": "KeybindEditorModal",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-enter": "menu::Confirm",
-      "escape": "menu::Cancel"
-    }
-  },
-  {
-    "context": "KeybindEditorModal > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "up": "menu::SelectPrevious",
-      "down": "menu::SelectNext"
-    }
-  },
-  {
-    "context": "Onboarding",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-=": ["zed::IncreaseUiFontSize", { "persist": false }],
-      "cmd-+": ["zed::IncreaseUiFontSize", { "persist": false }],
-      "cmd--": ["zed::DecreaseUiFontSize", { "persist": false }],
-      "cmd-0": ["zed::ResetUiFontSize", { "persist": false }],
-      "cmd-enter": "onboarding::Finish",
-      "alt-tab": "onboarding::SignIn",
-      "alt-shift-a": "onboarding::OpenAccount"
-    }
-  },
-  {
-    "context": "Welcome",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-=": ["zed::IncreaseUiFontSize", { "persist": false }],
-      "cmd-+": ["zed::IncreaseUiFontSize", { "persist": false }],
-      "cmd--": ["zed::DecreaseUiFontSize", { "persist": false }],
-      "cmd-0": ["zed::ResetUiFontSize", { "persist": false }]
-    }
-  },
-  {
-    "context": "InvalidBuffer",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-shift-enter": "workspace::OpenWithSystem"
-    }
-  },
-  {
-    "context": "GitWorktreeSelector || (GitWorktreeSelector > Picker > Editor)",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-shift-space": "git::WorktreeFromDefaultOnWindow",
-      "ctrl-space": "git::WorktreeFromDefault"
-    }
-  },
-  {
-    "context": "SettingsWindow",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-w": "workspace::CloseWindow",
-      "escape": "workspace::CloseWindow",
-      "cmd-m": "settings_editor::Minimize",
-      "cmd-f": "search::FocusSearch",
-      "cmd-,": "settings_editor::OpenCurrentFile",
-      "left": "settings_editor::ToggleFocusNav",
-      "cmd-shift-e": "settings_editor::ToggleFocusNav",
-      // todo(settings_ui): cut this down based on the max files and overflow UI
-      "ctrl-1": ["settings_editor::FocusFile", 0],
-      "ctrl-2": ["settings_editor::FocusFile", 1],
-      "ctrl-3": ["settings_editor::FocusFile", 2],
-      "ctrl-4": ["settings_editor::FocusFile", 3],
-      "ctrl-5": ["settings_editor::FocusFile", 4],
-      "ctrl-6": ["settings_editor::FocusFile", 5],
-      "ctrl-7": ["settings_editor::FocusFile", 6],
-      "ctrl-8": ["settings_editor::FocusFile", 7],
-      "ctrl-9": ["settings_editor::FocusFile", 8],
-      "ctrl-0": ["settings_editor::FocusFile", 9],
-      "cmd-{": "settings_editor::FocusPreviousFile",
-      "cmd-}": "settings_editor::FocusNextFile"
-    }
-  },
-  {
-    "context": "StashDiff > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-space": "git::ApplyCurrentStash",
-      "ctrl-shift-space": "git::PopCurrentStash",
-      "ctrl-shift-backspace": "git::DropCurrentStash"
-    }
-  },
-  {
-    "context": "SettingsWindow > NavigationMenu",
-    "use_key_equivalents": true,
-    "bindings": {
-      "up": "settings_editor::FocusPreviousNavEntry",
-      "shift-tab": "settings_editor::FocusPreviousNavEntry",
-      "down": "settings_editor::FocusNextNavEntry",
-      "tab": "settings_editor::FocusNextNavEntry",
-      "right": "settings_editor::ExpandNavEntry",
-      "left": "settings_editor::CollapseNavEntry",
-      "pageup": "settings_editor::FocusPreviousRootNavEntry",
-      "pagedown": "settings_editor::FocusNextRootNavEntry",
-      "home": "settings_editor::FocusFirstNavEntry",
-      "end": "settings_editor::FocusLastNavEntry"
-    }
-  },
-  {
-    "context": "EditPredictionContext > Editor",
-    "bindings": {
-      "alt-left": "dev::EditPredictionContextGoBack",
-      "alt-right": "dev::EditPredictionContextGoForward"
-    }
-  },
-  {
-    "context": "GitBranchSelector || (GitBranchSelector > Picker > Editor)",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-shift-backspace": "branch_picker::DeleteBranch",
-      "cmd-shift-i": "branch_picker::FilterRemotes"
-    }
-  }
-]
diff --git a/assets/keymaps/default-windows.json b/assets/keymaps/default-windows.json
deleted file mode 100644
index 51943ab355..0000000000
--- a/assets/keymaps/default-windows.json
+++ /dev/null
@@ -1,1370 +0,0 @@
-[
-  // Standard Windows bindings
-  {
-    "use_key_equivalents": true,
-    "bindings": {
-      "home": "menu::SelectFirst",
-      "shift-pageup": "menu::SelectFirst",
-      "pageup": "menu::SelectFirst",
-      "end": "menu::SelectLast",
-      "shift-pagedown": "menu::SelectLast",
-      "pagedown": "menu::SelectLast",
-      "ctrl-n": "menu::SelectNext",
-      "tab": "menu::SelectNext",
-      "down": "menu::SelectNext",
-      "ctrl-p": "menu::SelectPrevious",
-      "shift-tab": "menu::SelectPrevious",
-      "up": "menu::SelectPrevious",
-      "enter": "menu::Confirm",
-      "ctrl-enter": "menu::SecondaryConfirm",
-      "ctrl-c": "menu::Cancel",
-      "escape": "menu::Cancel",
-      "shift-alt-enter": "menu::Restart",
-      "alt-enter": ["picker::ConfirmInput", { "secondary": false }],
-      "ctrl-alt-enter": ["picker::ConfirmInput", { "secondary": true }],
-      "ctrl-shift-w": "workspace::CloseWindow",
-      "shift-escape": "workspace::ToggleZoom",
-      "ctrl-o": "workspace::OpenFiles",
-      "ctrl-k ctrl-o": "workspace::Open",
-      "ctrl-=": ["zed::IncreaseBufferFontSize", { "persist": false }],
-      "ctrl-shift-=": ["zed::IncreaseBufferFontSize", { "persist": false }],
-      "ctrl--": ["zed::DecreaseBufferFontSize", { "persist": false }],
-      "ctrl-0": ["zed::ResetBufferFontSize", { "persist": false }],
-      "ctrl-,": "zed::OpenSettings",
-      "ctrl-alt-,": "zed::OpenSettingsFile",
-      "ctrl-q": "zed::Quit",
-      "f4": "debugger::Start",
-      "shift-f5": "debugger::Stop",
-      "ctrl-shift-f5": "debugger::RerunSession",
-      "f6": "debugger::Pause",
-      "f10": "debugger::StepOver",
-      "shift-f11": "debugger::StepOut",
-      "f11": "zed::ToggleFullScreen",
-      "ctrl-shift-i": "edit_prediction::ToggleMenu",
-      "shift-alt-l": "lsp_tool::ToggleMenu",
-      "ctrl-shift-alt-c": "editor::DisplayCursorNames"
-    }
-  },
-  {
-    "context": "Picker || menu",
-    "use_key_equivalents": true,
-    "bindings": {
-      "up": "menu::SelectPrevious",
-      "down": "menu::SelectNext"
-    }
-  },
-  {
-    "context": "Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "escape": "editor::Cancel",
-      "shift-backspace": "editor::Backspace",
-      "backspace": "editor::Backspace",
-      "delete": "editor::Delete",
-      "tab": "editor::Tab",
-      "shift-tab": "editor::Backtab",
-      "ctrl-k": "editor::CutToEndOfLine",
-      "ctrl-k ctrl-q": "editor::Rewrap",
-      "ctrl-k q": "editor::Rewrap",
-      "ctrl-backspace": ["editor::DeleteToPreviousWordStart", { "ignore_newlines": false, "ignore_brackets": false }],
-      "ctrl-delete": ["editor::DeleteToNextWordEnd", { "ignore_newlines": false, "ignore_brackets": false }],
-      "shift-delete": "editor::Cut",
-      "ctrl-x": "editor::Cut",
-      "ctrl-insert": "editor::Copy",
-      "ctrl-c": "editor::Copy",
-      "shift-insert": "editor::Paste",
-      "ctrl-v": "editor::Paste",
-      "ctrl-z": "editor::Undo",
-      "ctrl-y": "editor::Redo",
-      "ctrl-shift-z": "editor::Redo",
-      "up": "editor::MoveUp",
-      "ctrl-up": "editor::LineUp",
-      "ctrl-down": "editor::LineDown",
-      "pageup": "editor::MovePageUp",
-      "alt-pageup": "editor::PageUp",
-      "shift-pageup": "editor::SelectPageUp",
-      "home": ["editor::MoveToBeginningOfLine", { "stop_at_soft_wraps": true, "stop_at_indent": true }],
-      "down": "editor::MoveDown",
-      "pagedown": "editor::MovePageDown",
-      "alt-pagedown": "editor::PageDown",
-      "shift-pagedown": "editor::SelectPageDown",
-      "end": ["editor::MoveToEndOfLine", { "stop_at_soft_wraps": true }],
-      "left": "editor::MoveLeft",
-      "right": "editor::MoveRight",
-      "ctrl-left": "editor::MoveToPreviousWordStart",
-      "ctrl-right": "editor::MoveToNextWordEnd",
-      "ctrl-home": "editor::MoveToBeginning",
-      "ctrl-end": "editor::MoveToEnd",
-      "shift-up": "editor::SelectUp",
-      "shift-down": "editor::SelectDown",
-      "shift-left": "editor::SelectLeft",
-      "shift-right": "editor::SelectRight",
-      "ctrl-shift-left": "editor::SelectToPreviousWordStart",
-      "ctrl-shift-right": "editor::SelectToNextWordEnd",
-      "ctrl-shift-home": "editor::SelectToBeginning",
-      "ctrl-shift-end": "editor::SelectToEnd",
-      "ctrl-a": "editor::SelectAll",
-      "ctrl-l": "editor::SelectLine",
-      "shift-alt-f": "editor::Format",
-      "shift-alt-o": "editor::OrganizeImports",
-      "shift-home": ["editor::SelectToBeginningOfLine", { "stop_at_soft_wraps": true, "stop_at_indent": true }],
-      "shift-end": ["editor::SelectToEndOfLine", { "stop_at_soft_wraps": true }],
-      "ctrl-alt-space": "editor::ShowCharacterPalette",
-      "ctrl-;": "editor::ToggleLineNumbers",
-      "ctrl-'": "editor::ToggleSelectedDiffHunks",
-      "ctrl-\"": "editor::ExpandAllDiffHunks",
-      "ctrl-i": "editor::ShowSignatureHelp",
-      "alt-g b": "git::Blame",
-      "alt-g m": "git::OpenModifiedFiles",
-      "menu": "editor::OpenContextMenu",
-      "shift-f10": "editor::OpenContextMenu",
-      "ctrl-alt-e": "editor::ToggleEditPrediction",
-      "f9": "editor::ToggleBreakpoint",
-      "shift-f9": "editor::EditLogBreakpoint"
-    }
-  },
-  {
-    "context": "Editor && mode == full",
-    "use_key_equivalents": true,
-    "bindings": {
-      "shift-enter": "editor::Newline",
-      "enter": "editor::Newline",
-      "ctrl-enter": "editor::NewlineBelow",
-      "ctrl-shift-enter": "editor::NewlineAbove",
-      "ctrl-k ctrl-z": "editor::ToggleSoftWrap",
-      "ctrl-k z": "editor::ToggleSoftWrap",
-      "ctrl-f": "buffer_search::Deploy",
-      "ctrl-h": "buffer_search::DeployReplace",
-      "ctrl-shift-.": "agent::AddSelectionToThread",
-      "ctrl-shift-,": "assistant::InsertIntoEditor",
-      "shift-alt-e": "editor::SelectEnclosingSymbol",
-      "ctrl-shift-backspace": "editor::GoToPreviousChange",
-      "ctrl-shift-alt-backspace": "editor::GoToNextChange",
-      "alt-enter": "editor::OpenSelectionsInMultibuffer"
-    }
-  },
-  {
-    "context": "Editor && mode == full && edit_prediction",
-    "use_key_equivalents": true,
-    "bindings": {
-      "alt-]": "editor::NextEditPrediction",
-      "alt-[": "editor::PreviousEditPrediction"
-    }
-  },
-  {
-    "context": "Editor && !edit_prediction",
-    "use_key_equivalents": true,
-    "bindings": {
-      "alt-\\": "editor::ShowEditPrediction"
-    }
-  },
-  {
-    "context": "Editor && mode == auto_height",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-enter": "editor::Newline",
-      "shift-enter": "editor::Newline",
-      "ctrl-shift-enter": "editor::NewlineBelow"
-    }
-  },
-  {
-    "context": "Markdown",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-c": "markdown::Copy"
-    }
-  },
-  {
-    "context": "Editor && jupyter && !ContextEditor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-shift-enter": "repl::Run",
-      "ctrl-alt-enter": "repl::RunInPlace"
-    }
-  },
-  {
-    "context": "Editor && !agent_diff",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-k ctrl-r": "git::Restore",
-      "alt-y": "git::StageAndNext",
-      "shift-alt-y": "git::UnstageAndNext"
-    }
-  },
-  {
-    "context": "Editor && editor_agent_diff",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-y": "agent::Keep",
-      "ctrl-n": "agent::Reject",
-      "ctrl-shift-y": "agent::KeepAll",
-      "ctrl-shift-n": "agent::RejectAll",
-      "ctrl-shift-r": "agent::OpenAgentDiff"
-    }
-  },
-  {
-    "context": "AgentDiff",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-y": "agent::Keep",
-      "ctrl-n": "agent::Reject",
-      "ctrl-shift-y": "agent::KeepAll",
-      "ctrl-shift-n": "agent::RejectAll"
-    }
-  },
-  {
-    "context": "ContextEditor > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-i": "assistant::Assist",
-      "ctrl-s": "workspace::Save",
-      "ctrl-shift-,": "assistant::InsertIntoEditor",
-      "shift-enter": "assistant::Split",
-      "ctrl-r": "assistant::CycleMessageRole",
-      "enter": "assistant::ConfirmCommand",
-      "alt-enter": "editor::Newline",
-      "ctrl-k c": "assistant::CopyCode",
-      "ctrl-g": "search::SelectNextMatch",
-      "ctrl-shift-g": "search::SelectPreviousMatch",
-      "ctrl-k l": "agent::OpenRulesLibrary"
-    }
-  },
-  {
-    "context": "AgentPanel",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-n": "agent::NewThread",
-      "shift-alt-n": "agent::NewTextThread",
-      "ctrl-shift-h": "agent::OpenHistory",
-      "shift-alt-c": "agent::OpenSettings",
-      "shift-alt-l": "agent::OpenRulesLibrary",
-      "shift-alt-p": "agent::ManageProfiles",
-      "ctrl-i": "agent::ToggleProfileSelector",
-      "shift-alt-/": "agent::ToggleModelSelector",
-      "shift-alt-j": "agent::ToggleNavigationMenu",
-      "shift-alt-i": "agent::ToggleOptionsMenu",
-      "ctrl-shift-alt-n": "agent::ToggleNewThreadMenu",
-      "shift-alt-escape": "agent::ExpandMessageEditor",
-      "ctrl-shift-.": "agent::AddSelectionToThread",
-      "ctrl-shift-e": "project_panel::ToggleFocus",
-      "ctrl-shift-enter": "agent::ContinueThread",
-      "super-ctrl-b": "agent::ToggleBurnMode",
-      "alt-enter": "agent::ContinueWithBurnMode",
-      "shift-alt-a": "agent::AllowOnce",
-      "ctrl-alt-y": "agent::AllowAlways",
-      "shift-alt-z": "agent::RejectOnce"
-    }
-  },
-  {
-    "context": "AgentPanel > NavigationMenu",
-    "use_key_equivalents": true,
-    "bindings": {
-      "shift-backspace": "agent::DeleteRecentlyOpenThread"
-    }
-  },
-  {
-    "context": "AgentPanel > Markdown",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-c": "markdown::CopyAsMarkdown"
-    }
-  },
-  {
-    "context": "AgentPanel && text_thread",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-n": "agent::NewTextThread",
-      "ctrl-alt-t": "agent::NewThread"
-    }
-  },
-  {
-    "context": "AgentPanel && acp_thread",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-n": "agent::NewExternalAgentThread",
-      "ctrl-alt-t": "agent::NewThread"
-    }
-  },
-  {
-    "context": "MessageEditor && !Picker > Editor && !use_modifier_to_send",
-    "use_key_equivalents": true,
-    "bindings": {
-      "enter": "agent::Chat",
-      "ctrl-enter": "agent::ChatWithFollow",
-      "ctrl-i": "agent::ToggleProfileSelector",
-      "ctrl-shift-r": "agent::OpenAgentDiff",
-      "ctrl-shift-y": "agent::KeepAll",
-      "ctrl-shift-n": "agent::RejectAll"
-    }
-  },
-  {
-    "context": "MessageEditor && !Picker > Editor && use_modifier_to_send",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-enter": "agent::Chat",
-      "enter": "editor::Newline",
-      "ctrl-i": "agent::ToggleProfileSelector",
-      "ctrl-shift-r": "agent::OpenAgentDiff",
-      "ctrl-shift-y": "agent::KeepAll",
-      "ctrl-shift-n": "agent::RejectAll"
-    }
-  },
-  {
-    "context": "EditMessageEditor > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "escape": "menu::Cancel",
-      "enter": "menu::Confirm",
-      "alt-enter": "editor::Newline"
-    }
-  },
-  {
-    "context": "AgentFeedbackMessageEditor > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "escape": "menu::Cancel",
-      "enter": "menu::Confirm",
-      "alt-enter": "editor::Newline"
-    }
-  },
-  {
-    "context": "AcpThread > ModeSelector",
-    "bindings": {
-      "ctrl-enter": "menu::Confirm"
-    }
-  },
-  {
-    "context": "AcpThread > Editor && !use_modifier_to_send",
-    "use_key_equivalents": true,
-    "bindings": {
-      "enter": "agent::Chat",
-      "ctrl-shift-r": "agent::OpenAgentDiff",
-      "ctrl-shift-y": "agent::KeepAll",
-      "ctrl-shift-n": "agent::RejectAll",
-      "shift-tab": "agent::CycleModeSelector"
-    }
-  },
-  {
-    "context": "AcpThread > Editor && use_modifier_to_send",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-enter": "agent::Chat",
-      "ctrl-shift-r": "agent::OpenAgentDiff",
-      "ctrl-shift-y": "agent::KeepAll",
-      "ctrl-shift-n": "agent::RejectAll",
-      "shift-tab": "agent::CycleModeSelector"
-    }
-  },
-  {
-    "context": "ThreadHistory",
-    "use_key_equivalents": true,
-    "bindings": {
-      "backspace": "agent::RemoveSelectedThread"
-    }
-  },
-  {
-    "context": "RulesLibrary",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-n": "rules_library::NewRule",
-      "ctrl-shift-s": "rules_library::ToggleDefaultRule",
-      "ctrl-w": "workspace::CloseWindow"
-    }
-  },
-  {
-    "context": "BufferSearchBar",
-    "use_key_equivalents": true,
-    "bindings": {
-      "escape": "buffer_search::Dismiss",
-      "tab": "buffer_search::FocusEditor",
-      "enter": "search::SelectNextMatch",
-      "shift-enter": "search::SelectPreviousMatch",
-      "alt-enter": "search::SelectAllMatches",
-      "ctrl-f": "search::FocusSearch",
-      "ctrl-h": "search::ToggleReplace",
-      "ctrl-l": "search::ToggleSelection"
-    }
-  },
-  {
-    "context": "BufferSearchBar && in_replace > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "enter": "search::ReplaceNext",
-      "ctrl-enter": "search::ReplaceAll"
-    }
-  },
-  {
-    "context": "BufferSearchBar && !in_replace > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "up": "search::PreviousHistoryQuery",
-      "down": "search::NextHistoryQuery"
-    }
-  },
-  {
-    "context": "ProjectSearchBar",
-    "use_key_equivalents": true,
-    "bindings": {
-      "escape": "project_search::ToggleFocus",
-      "ctrl-shift-f": "search::FocusSearch",
-      "ctrl-shift-h": "search::ToggleReplace",
-      "alt-r": "search::ToggleRegex" // vscode
-    }
-  },
-  {
-    "context": "ProjectSearchBar > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "up": "search::PreviousHistoryQuery",
-      "down": "search::NextHistoryQuery"
-    }
-  },
-  {
-    "context": "ProjectSearchBar && in_replace > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "enter": "search::ReplaceNext",
-      "ctrl-alt-enter": "search::ReplaceAll"
-    }
-  },
-  {
-    "context": "ProjectSearchView",
-    "use_key_equivalents": true,
-    "bindings": {
-      "escape": "project_search::ToggleFocus",
-      "ctrl-shift-h": "search::ToggleReplace",
-      "alt-r": "search::ToggleRegex" // vscode
-    }
-  },
-  {
-    "context": "Pane",
-    "use_key_equivalents": true,
-    "bindings": {
-      "alt-1": ["pane::ActivateItem", 0],
-      "alt-2": ["pane::ActivateItem", 1],
-      "alt-3": ["pane::ActivateItem", 2],
-      "alt-4": ["pane::ActivateItem", 3],
-      "alt-5": ["pane::ActivateItem", 4],
-      "alt-6": ["pane::ActivateItem", 5],
-      "alt-7": ["pane::ActivateItem", 6],
-      "alt-8": ["pane::ActivateItem", 7],
-      "alt-9": ["pane::ActivateItem", 8],
-      "alt-0": "pane::ActivateLastItem",
-      "ctrl-pageup": "pane::ActivatePreviousItem",
-      "ctrl-pagedown": "pane::ActivateNextItem",
-      "ctrl-shift-pageup": "pane::SwapItemLeft",
-      "ctrl-shift-pagedown": "pane::SwapItemRight",
-      "ctrl-f4": ["pane::CloseActiveItem", { "close_pinned": false }],
-      "ctrl-w": ["pane::CloseActiveItem", { "close_pinned": false }],
-      "ctrl-shift-alt-t": ["pane::CloseOtherItems", { "close_pinned": false }],
-      "ctrl-shift-alt-w": "workspace::CloseInactiveTabsAndPanes",
-      "ctrl-k e": ["pane::CloseItemsToTheLeft", { "close_pinned": false }],
-      "ctrl-k t": ["pane::CloseItemsToTheRight", { "close_pinned": false }],
-      "ctrl-k u": ["pane::CloseCleanItems", { "close_pinned": false }],
-      "ctrl-k w": ["pane::CloseAllItems", { "close_pinned": false }],
-      "ctrl-k ctrl-w": "workspace::CloseAllItemsAndPanes",
-      "back": "pane::GoBack",
-      "alt--": "pane::GoBack",
-      "forward": "pane::GoForward",
-      "alt-=": "pane::GoForward",
-      "f3": "search::SelectNextMatch",
-      "shift-f3": "search::SelectPreviousMatch",
-      "ctrl-shift-f": "project_search::ToggleFocus",
-      "shift-alt-h": "search::ToggleReplace",
-      "alt-l": "search::ToggleSelection",
-      "alt-enter": "search::SelectAllMatches",
-      "alt-c": "search::ToggleCaseSensitive",
-      "alt-w": "search::ToggleWholeWord",
-      "alt-f": "project_search::ToggleFilters",
-      "shift-enter": "project_search::ToggleAllSearchResults",
-      "alt-r": "search::ToggleRegex",
-      // "ctrl-shift-alt-x": "search::ToggleRegex",
-      "ctrl-k shift-enter": "pane::TogglePinTab"
-    }
-  },
-  // Bindings from VS Code
-  {
-    "context": "Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-[": "editor::Outdent",
-      "ctrl-]": "editor::Indent",
-      "ctrl-alt-up": ["editor::AddSelectionAbove", { "skip_soft_wrap": true }], // Insert Cursor Above
-      "ctrl-alt-down": ["editor::AddSelectionBelow", { "skip_soft_wrap": true }], // Insert Cursor Below
-      "ctrl-shift-k": "editor::DeleteLine",
-      "alt-up": "editor::MoveLineUp",
-      "alt-down": "editor::MoveLineDown",
-      "shift-alt-up": "editor::DuplicateLineUp",
-      "shift-alt-down": "editor::DuplicateLineDown",
-      "shift-alt-right": "editor::SelectLargerSyntaxNode", // Expand selection
-      "shift-alt-left": "editor::SelectSmallerSyntaxNode", // Shrink selection
-      "ctrl-shift-l": "editor::SelectAllMatches", // Select all occurrences of current selection
-      "ctrl-f2": "editor::SelectAllMatches", // Select all occurrences of current word
-      "ctrl-d": ["editor::SelectNext", { "replace_newest": false }], // editor.action.addSelectionToNextFindMatch  / find_under_expand
-      "ctrl-f3": ["editor::SelectNext", { "replace_newest": false }], // editor.action.addSelectionToNextFindMatch  / find_under_expand
-      "ctrl-k ctrl-d": ["editor::SelectNext", { "replace_newest": true }], // editor.action.moveSelectionToNextFindMatch  / find_under_expand_skip
-      "ctrl-shift-f3": ["editor::SelectPrevious", { "replace_newest": false }], // editor.action.addSelectionToNextFindMatch  / find_under_expand
-      "ctrl-k ctrl-i": "editor::Hover",
-      "ctrl-k ctrl-b": "editor::BlameHover",
-      "ctrl-k ctrl-f": "editor::FormatSelections",
-      "ctrl-/": ["editor::ToggleComments", { "advance_downwards": false }],
-      "f8": ["editor::GoToDiagnostic", { "severity": { "min": "hint", "max": "error" } }],
-      "shift-f8": ["editor::GoToPreviousDiagnostic", { "severity": { "min": "hint", "max": "error" } }],
-      "f2": "editor::Rename",
-      "f12": "editor::GoToDefinition",
-      "alt-f12": "editor::GoToDefinitionSplit",
-      "ctrl-f12": "editor::GoToImplementation",
-      "shift-alt-f12": "editor::FindAllReferences",
-      "ctrl-shift-\\": "editor::MoveToEnclosingBracket",
-      "ctrl-shift-[": "editor::Fold",
-      "ctrl-shift-]": "editor::UnfoldLines",
-      "ctrl-k ctrl-l": "editor::ToggleFold",
-      "ctrl-k ctrl-[": "editor::FoldRecursive",
-      "ctrl-k ctrl-]": "editor::UnfoldRecursive",
-      "ctrl-k ctrl-1": "editor::FoldAtLevel_1",
-      "ctrl-k ctrl-2": "editor::FoldAtLevel_2",
-      "ctrl-k ctrl-3": "editor::FoldAtLevel_3",
-      "ctrl-k ctrl-4": "editor::FoldAtLevel_4",
-      "ctrl-k ctrl-5": "editor::FoldAtLevel_5",
-      "ctrl-k ctrl-6": "editor::FoldAtLevel_6",
-      "ctrl-k ctrl-7": "editor::FoldAtLevel_7",
-      "ctrl-k ctrl-8": "editor::FoldAtLevel_8",
-      "ctrl-k ctrl-9": "editor::FoldAtLevel_9",
-      "ctrl-k ctrl-0": "editor::FoldAll",
-      "ctrl-k ctrl-j": "editor::UnfoldAll",
-      "ctrl-space": "editor::ShowCompletions",
-      "ctrl-shift-space": "editor::ShowWordCompletions",
-      "ctrl-.": "editor::ToggleCodeActions",
-      "ctrl-k r": "editor::RevealInFileManager",
-      "ctrl-k p": "editor::CopyPath",
-      "ctrl-\\": "pane::SplitRight",
-      "alt-.": "editor::GoToHunk",
-      "alt-,": "editor::GoToPreviousHunk",
-    }
-  },
-  {
-    "context": "Editor && extension == md",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-k v": "markdown::OpenPreviewToTheSide",
-      "ctrl-shift-v": "markdown::OpenPreview"
-    }
-  },
-  {
-    "context": "Editor && extension == svg",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-k v": "svg::OpenPreviewToTheSide",
-      "ctrl-shift-v": "svg::OpenPreview"
-    }
-  },
-  {
-    "context": "Editor && mode == full",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-shift-o": "outline::Toggle",
-      "ctrl-g": "go_to_line::Toggle"
-    }
-  },
-  {
-    "context": "Workspace",
-    "use_key_equivalents": true,
-    "bindings": {
-      // Change the default action on `menu::Confirm` by setting the parameter
-      // "ctrl-alt-o": ["projects::OpenRecent", { "create_new_window": true }],
-      "ctrl-r": ["projects::OpenRecent", { "create_new_window": false }],
-      // Change to open path modal for existing remote connection by setting the parameter
-      // "ctrl-shift-alt-o": "["projects::OpenRemote", { "from_existing_connection": true }]",
-      "ctrl-shift-alt-o": ["projects::OpenRemote", { "from_existing_connection": false, "create_new_window": false }],
-      "shift-alt-b": "branches::OpenRecent",
-      "shift-alt-enter": "toast::RunAction",
-      "ctrl-shift-`": "workspace::NewTerminal",
-      "ctrl-s": "workspace::Save",
-      "ctrl-k ctrl-shift-s": "workspace::SaveWithoutFormat",
-      "ctrl-shift-s": "workspace::SaveAs",
-      "ctrl-n": "workspace::NewFile",
-      "ctrl-shift-n": "workspace::NewWindow",
-      "ctrl-`": "terminal_panel::Toggle",
-      "f10": ["app_menu::OpenApplicationMenu", "Zed"],
-      "alt-1": ["workspace::ActivatePane", 0],
-      "alt-2": ["workspace::ActivatePane", 1],
-      "alt-3": ["workspace::ActivatePane", 2],
-      "alt-4": ["workspace::ActivatePane", 3],
-      "alt-5": ["workspace::ActivatePane", 4],
-      "alt-6": ["workspace::ActivatePane", 5],
-      "alt-7": ["workspace::ActivatePane", 6],
-      "alt-8": ["workspace::ActivatePane", 7],
-      "alt-9": ["workspace::ActivatePane", 8],
-      "ctrl-alt-b": "workspace::ToggleRightDock",
-      "ctrl-b": "workspace::ToggleLeftDock",
-      "ctrl-j": "workspace::ToggleBottomDock",
-      "ctrl-shift-y": "workspace::ToggleAllDocks",
-      "alt-r": "workspace::ResetActiveDockSize",
-      // For 0px parameter, uses UI font size value.
-      "shift-alt--": ["workspace::DecreaseActiveDockSize", { "px": 0 }],
-      "shift-alt-=": ["workspace::IncreaseActiveDockSize", { "px": 0 }],
-      "shift-alt-0": "workspace::ResetOpenDocksSize",
-      "ctrl-shift-f": "pane::DeploySearch",
-      "ctrl-shift-h": ["pane::DeploySearch", { "replace_enabled": true }],
-      "ctrl-shift-t": "pane::ReopenClosedItem",
-      "ctrl-k ctrl-s": "zed::OpenKeymap",
-      "ctrl-k ctrl-t": "theme_selector::Toggle",
-      "ctrl-alt-super-p": "settings_profile_selector::Toggle",
-      "ctrl-t": "project_symbols::Toggle",
-      "ctrl-p": "file_finder::Toggle",
-      "ctrl-shift-tab": ["tab_switcher::Toggle", { "select_last": true }],
-      "ctrl-tab": "tab_switcher::Toggle",
-      "ctrl-e": "file_finder::Toggle",
-      "f1": "command_palette::Toggle",
-      "ctrl-shift-p": "command_palette::Toggle",
-      "ctrl-shift-m": "diagnostics::Deploy",
-      "ctrl-shift-e": "project_panel::ToggleFocus",
-      "ctrl-shift-b": "outline_panel::ToggleFocus",
-      "ctrl-shift-g": "git_panel::ToggleFocus",
-      "ctrl-shift-d": "debug_panel::ToggleFocus",
-      "ctrl-shift-/": "agent::ToggleFocus",
-      "ctrl-k s": "workspace::SaveAll",
-      "ctrl-k m": "language_selector::Toggle",
-      "ctrl-m ctrl-m": "toolchain::AddToolchain",
-      "escape": "workspace::Unfollow",
-      "ctrl-k ctrl-left": "workspace::ActivatePaneLeft",
-      "ctrl-k ctrl-right": "workspace::ActivatePaneRight",
-      "ctrl-k ctrl-up": "workspace::ActivatePaneUp",
-      "ctrl-k ctrl-down": "workspace::ActivatePaneDown",
-      "ctrl-k shift-left": "workspace::SwapPaneLeft",
-      "ctrl-k shift-right": "workspace::SwapPaneRight",
-      "ctrl-k shift-up": "workspace::SwapPaneUp",
-      "ctrl-k shift-down": "workspace::SwapPaneDown",
-      "ctrl-shift-x": "zed::Extensions",
-      // All task parameters are captured and unchanged between reruns by default.
-      // Use the `"reevaluate_context"` parameter to control this.
-      "ctrl-shift-r": ["task::Rerun", { "reevaluate_context": false }],
-      "alt-t": "task::Rerun",
-      "shift-alt-t": "task::Spawn",
-      "shift-alt-r": ["task::Spawn", { "reveal_target": "center" }],
-      // also possible to spawn tasks by name:
-      // "foo-bar": ["task::Spawn", { "task_name": "MyTask", "reveal_target": "dock" }]
-      // or by tag:
-      // "foo-bar": ["task::Spawn", { "task_tag": "MyTag" }],
-      "f5": "debugger::Rerun",
-      "ctrl-f4": "workspace::CloseActiveDock",
-      "ctrl-w": "workspace::CloseActiveDock"
-    }
-  },
-  {
-    "context": "Workspace && debugger_running",
-    "use_key_equivalents": true,
-    "bindings": {
-      "f5": "zed::NoAction"
-    }
-  },
-  {
-    "context": "Workspace && debugger_stopped",
-    "use_key_equivalents": true,
-    "bindings": {
-      "f5": "debugger::Continue"
-    }
-  },
-  {
-    "context": "ApplicationMenu",
-    "use_key_equivalents": true,
-    "bindings": {
-      "f10": "menu::Cancel",
-      "left": "app_menu::ActivateMenuLeft",
-      "right": "app_menu::ActivateMenuRight"
-    }
-  },
-  // Bindings from Sublime Text
-  {
-    "context": "Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-u": "editor::UndoSelection",
-      "ctrl-shift-u": "editor::RedoSelection",
-      "ctrl-shift-j": "editor::JoinLines",
-      "ctrl-alt-backspace": "editor::DeleteToPreviousSubwordStart",
-      "shift-alt-h": "editor::DeleteToPreviousSubwordStart",
-      "ctrl-alt-delete": "editor::DeleteToNextSubwordEnd",
-      "shift-alt-d": "editor::DeleteToNextSubwordEnd",
-      "ctrl-alt-left": "editor::MoveToPreviousSubwordStart",
-      "ctrl-alt-right": "editor::MoveToNextSubwordEnd",
-      "ctrl-shift-alt-left": "editor::SelectToPreviousSubwordStart",
-      "ctrl-shift-alt-right": "editor::SelectToNextSubwordEnd"
-    }
-  },
-  // Bindings from Atom
-  {
-    "context": "Pane",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-k up": "pane::SplitUp",
-      "ctrl-k down": "pane::SplitDown",
-      "ctrl-k left": "pane::SplitLeft",
-      "ctrl-k right": "pane::SplitRight"
-    }
-  },
-  // Bindings that should be unified with bindings for more general actions
-  {
-    "context": "Editor && renaming",
-    "use_key_equivalents": true,
-    "bindings": {
-      "enter": "editor::ConfirmRename"
-    }
-  },
-  {
-    "context": "Editor && showing_completions",
-    "use_key_equivalents": true,
-    "bindings": {
-      "enter": "editor::ConfirmCompletion",
-      "shift-enter": "editor::ConfirmCompletionReplace",
-      "tab": "editor::ComposeCompletion"
-    }
-  },
-  {
-    "context": "Editor && in_snippet && has_next_tabstop && !showing_completions",
-    "use_key_equivalents": true,
-    "bindings": {
-      "tab": "editor::NextSnippetTabstop"
-    }
-  },
-  {
-    "context": "Editor && in_snippet && has_previous_tabstop && !showing_completions",
-    "use_key_equivalents": true,
-    "bindings": {
-      "shift-tab": "editor::PreviousSnippetTabstop"
-    }
-  },
-  // Bindings for accepting edit predictions
-  //
-  // alt-l is provided as an alternative to tab/alt-tab. and will be displayed in the UI. This is
-  // because alt-tab may not be available, as it is often used for window switching.
-  {
-    "context": "Editor && edit_prediction",
-    "use_key_equivalents": true,
-    "bindings": {
-      "alt-tab": "editor::AcceptEditPrediction",
-      "alt-l": "editor::AcceptEditPrediction",
-      "tab": "editor::AcceptEditPrediction",
-      "alt-right": "editor::AcceptPartialEditPrediction"
-    }
-  },
-  {
-    "context": "Editor && edit_prediction_conflict",
-    "use_key_equivalents": true,
-    "bindings": {
-      "alt-tab": "editor::AcceptEditPrediction",
-      "alt-l": "editor::AcceptEditPrediction",
-      "alt-right": "editor::AcceptPartialEditPrediction"
-    }
-  },
-  {
-    "context": "Editor && showing_code_actions",
-    "use_key_equivalents": true,
-    "bindings": {
-      "enter": "editor::ConfirmCodeAction"
-    }
-  },
-  {
-    "context": "Editor && (showing_code_actions || showing_completions)",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-p": "editor::ContextMenuPrevious",
-      "up": "editor::ContextMenuPrevious",
-      "ctrl-n": "editor::ContextMenuNext",
-      "down": "editor::ContextMenuNext",
-      "pageup": "editor::ContextMenuFirst",
-      "pagedown": "editor::ContextMenuLast"
-    }
-  },
-  {
-    "context": "Editor && showing_signature_help && !showing_completions",
-    "use_key_equivalents": true,
-    "bindings": {
-      "up": "editor::SignatureHelpPrevious",
-      "down": "editor::SignatureHelpNext"
-    }
-  },
-  // Custom bindings
-  {
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-shift-alt-f": "workspace::FollowNextCollaborator",
-      // Only available in debug builds: opens an element inspector for development.
-      "shift-alt-i": "dev::ToggleInspector"
-    }
-  },
-  {
-    "context": "!Terminal",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-shift-c": "collab_panel::ToggleFocus"
-    }
-  },
-  {
-    "context": "!ContextEditor > Editor && mode == full",
-    "use_key_equivalents": true,
-    "bindings": {
-      "alt-enter": "editor::OpenExcerpts",
-      "shift-enter": "editor::ExpandExcerpts",
-      "ctrl-alt-enter": "editor::OpenExcerptsSplit",
-      "ctrl-shift-e": "pane::RevealInProjectPanel",
-      "ctrl-f8": "editor::GoToHunk",
-      "ctrl-shift-f8": "editor::GoToPreviousHunk",
-      "ctrl-enter": "assistant::InlineAssist",
-      "ctrl-shift-;": "editor::ToggleInlayHints"
-    }
-  },
-  {
-    "context": "PromptEditor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-[": "agent::CyclePreviousInlineAssist",
-      "ctrl-]": "agent::CycleNextInlineAssist",
-      "ctrl-shift-enter": "inline_assistant::ThumbsUpResult",
-      "ctrl-shift-delete": "inline_assistant::ThumbsDownResult"
-    }
-  },
-  {
-    "context": "Prompt",
-    "use_key_equivalents": true,
-    "bindings": {
-      "left": "menu::SelectPrevious",
-      "right": "menu::SelectNext",
-      "h": "menu::SelectPrevious",
-      "l": "menu::SelectNext"
-    }
-  },
-  {
-    "context": "ProjectSearchBar && !in_replace",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-enter": "project_search::SearchInNew"
-    }
-  },
-  {
-    "context": "OutlinePanel && not_editing",
-    "use_key_equivalents": true,
-    "bindings": {
-      "left": "outline_panel::CollapseSelectedEntry",
-      "right": "outline_panel::ExpandSelectedEntry",
-      "shift-alt-c": "outline_panel::CopyPath",
-      "ctrl-shift-alt-c": "workspace::CopyRelativePath",
-      "ctrl-alt-r": "outline_panel::RevealInFileManager",
-      "space": "outline_panel::OpenSelectedEntry",
-      "shift-down": "menu::SelectNext",
-      "shift-up": "menu::SelectPrevious",
-      "alt-enter": "editor::OpenExcerpts",
-      "ctrl-alt-enter": "editor::OpenExcerptsSplit"
-    }
-  },
-  {
-    "context": "ProjectPanel",
-    "use_key_equivalents": true,
-    "bindings": {
-      "left": "project_panel::CollapseSelectedEntry",
-      "ctrl-left": "project_panel::CollapseAllEntries",
-      "right": "project_panel::ExpandSelectedEntry",
-      "ctrl-n": "project_panel::NewFile",
-      "alt-n": "project_panel::NewDirectory",
-      "ctrl-x": "project_panel::Cut",
-      "ctrl-insert": "project_panel::Copy",
-      "ctrl-c": "project_panel::Copy",
-      "shift-insert": "project_panel::Paste",
-      "ctrl-v": "project_panel::Paste",
-      "shift-alt-c": "project_panel::CopyPath",
-      "ctrl-k ctrl-shift-c": "workspace::CopyRelativePath",
-      "enter": "project_panel::Rename",
-      "f2": "project_panel::Rename",
-      "backspace": ["project_panel::Trash", { "skip_prompt": false }],
-      "delete": ["project_panel::Trash", { "skip_prompt": false }],
-      "shift-delete": ["project_panel::Delete", { "skip_prompt": false }],
-      "ctrl-backspace": ["project_panel::Delete", { "skip_prompt": false }],
-      "ctrl-delete": ["project_panel::Delete", { "skip_prompt": false }],
-      "ctrl-alt-r": "project_panel::RevealInFileManager",
-      "ctrl-shift-enter": "project_panel::OpenWithSystem",
-      "alt-d": "project_panel::CompareMarkedFiles",
-      "ctrl-k ctrl-shift-f": "project_panel::NewSearchInDirectory",
-      "shift-down": "menu::SelectNext",
-      "shift-up": "menu::SelectPrevious",
-      "escape": "menu::Cancel"
-    }
-  },
-  {
-    "context": "ProjectPanel && not_editing",
-    "use_key_equivalents": true,
-    "bindings": {
-      "space": "project_panel::Open"
-    }
-  },
-  {
-    "context": "GitPanel && ChangesList",
-    "use_key_equivalents": true,
-    "bindings": {
-      "up": "menu::SelectPrevious",
-      "down": "menu::SelectNext",
-      "enter": "menu::Confirm",
-      "alt-y": "git::StageFile",
-      "shift-alt-y": "git::UnstageFile",
-      "space": "git::ToggleStaged",
-      "shift-space": "git::StageRange",
-      "tab": "git_panel::FocusEditor",
-      "shift-tab": "git_panel::FocusEditor",
-      "escape": "git_panel::ToggleFocus",
-      "alt-enter": "menu::SecondaryConfirm",
-      "delete": ["git::RestoreFile", { "skip_prompt": false }],
-      "backspace": ["git::RestoreFile", { "skip_prompt": false }],
-      "shift-delete": ["git::RestoreFile", { "skip_prompt": false }],
-      "ctrl-backspace": ["git::RestoreFile", { "skip_prompt": false }],
-      "ctrl-delete": ["git::RestoreFile", { "skip_prompt": false }]
-    }
-  },
-  {
-    "context": "GitPanel && CommitEditor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "escape": "git::Cancel"
-    }
-  },
-  {
-    "context": "GitCommit > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "escape": "menu::Cancel",
-      "enter": "editor::Newline",
-      "ctrl-enter": "git::Commit",
-      "ctrl-shift-enter": "git::Amend",
-      "alt-l": "git::GenerateCommitMessage"
-    }
-  },
-  {
-    "context": "GitPanel",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-g ctrl-g": "git::Fetch",
-      "ctrl-g up": "git::Push",
-      "ctrl-g down": "git::Pull",
-      "ctrl-g shift-down": "git::PullRebase",
-      "ctrl-g shift-up": "git::ForcePush",
-      "ctrl-g d": "git::Diff",
-      "ctrl-g backspace": "git::RestoreTrackedFiles",
-      "ctrl-g shift-backspace": "git::TrashUntrackedFiles",
-      "ctrl-space": "git::StageAll",
-      "ctrl-shift-space": "git::UnstageAll",
-      "ctrl-enter": "git::Commit",
-      "ctrl-shift-enter": "git::Amend"
-    }
-  },
-  {
-    "context": "GitDiff > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-enter": "git::Commit",
-      "ctrl-shift-enter": "git::Amend",
-      "ctrl-space": "git::StageAll",
-      "ctrl-shift-space": "git::UnstageAll"
-    }
-  },
-  {
-    "context": "AskPass > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "enter": "menu::Confirm"
-    }
-  },
-  {
-    "context": "CommitEditor > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "escape": "git_panel::FocusChanges",
-      "tab": "git_panel::FocusChanges",
-      "shift-tab": "git_panel::FocusChanges",
-      "enter": "editor::Newline",
-      "ctrl-enter": "git::Commit",
-      "ctrl-shift-enter": "git::Amend",
-      "alt-up": "git_panel::FocusChanges",
-      "alt-l": "git::GenerateCommitMessage"
-    }
-  },
-  {
-    "context": "DebugPanel",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-t": "debugger::ToggleThreadPicker",
-      "ctrl-i": "debugger::ToggleSessionPicker",
-      "shift-alt-escape": "debugger::ToggleExpandItem"
-    }
-  },
-  {
-    "context": "VariableList",
-    "use_key_equivalents": true,
-    "bindings": {
-      "left": "variable_list::CollapseSelectedEntry",
-      "right": "variable_list::ExpandSelectedEntry",
-      "enter": "variable_list::EditVariable",
-      "ctrl-c": "variable_list::CopyVariableValue",
-      "ctrl-alt-c": "variable_list::CopyVariableName",
-      "delete": "variable_list::RemoveWatch",
-      "backspace": "variable_list::RemoveWatch",
-      "alt-enter": "variable_list::AddWatch"
-    }
-  },
-  {
-    "context": "BreakpointList",
-    "use_key_equivalents": true,
-    "bindings": {
-      "space": "debugger::ToggleEnableBreakpoint",
-      "backspace": "debugger::UnsetBreakpoint",
-      "left": "debugger::PreviousBreakpointProperty",
-      "right": "debugger::NextBreakpointProperty"
-    }
-  },
-  {
-    "context": "CollabPanel && not_editing",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-backspace": "collab_panel::Remove",
-      "space": "menu::Confirm"
-    }
-  },
-  {
-    "context": "CollabPanel",
-    "use_key_equivalents": true,
-    "bindings": {
-      "alt-up": "collab_panel::MoveChannelUp",
-      "alt-down": "collab_panel::MoveChannelDown",
-      "alt-enter": "collab_panel::OpenSelectedChannelNotes"
-    }
-  },
-  {
-    "context": "(CollabPanel && editing) > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "space": "collab_panel::InsertSpace"
-    }
-  },
-  {
-    "context": "ChannelModal",
-    "use_key_equivalents": true,
-    "bindings": {
-      "tab": "channel_modal::ToggleMode"
-    }
-  },
-  {
-    "context": "Picker > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "escape": "menu::Cancel",
-      "up": "menu::SelectPrevious",
-      "down": "menu::SelectNext",
-      "tab": "picker::ConfirmCompletion",
-      "alt-enter": ["picker::ConfirmInput", { "secondary": false }]
-    }
-  },
-  {
-    "context": "ChannelModal > Picker > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "tab": "channel_modal::ToggleMode"
-    }
-  },
-  {
-    "context": "ToolchainSelector",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-shift-a": "toolchain::AddToolchain"
-    }
-  },
-  {
-    "context": "FileFinder || (FileFinder > Picker > Editor)",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-p": "file_finder::Toggle",
-      "ctrl-shift-a": "file_finder::ToggleSplitMenu",
-      "ctrl-shift-i": "file_finder::ToggleFilterMenu"
-    }
-  },
-  {
-    "context": "FileFinder || (FileFinder > Picker > Editor) || (FileFinder > Picker > menu)",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-shift-p": "file_finder::SelectPrevious",
-      "ctrl-j": "pane::SplitDown",
-      "ctrl-k": "pane::SplitUp",
-      "ctrl-h": "pane::SplitLeft",
-      "ctrl-l": "pane::SplitRight"
-    }
-  },
-  {
-    "context": "TabSwitcher",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-shift-tab": "menu::SelectPrevious",
-      "ctrl-up": "menu::SelectPrevious",
-      "ctrl-down": "menu::SelectNext",
-      "ctrl-backspace": "tab_switcher::CloseSelectedItem"
-    }
-  },
-  {
-    "context": "StashList || (StashList > Picker > Editor)",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-shift-backspace": "stash_picker::DropStashItem",
-      "ctrl-shift-v": "stash_picker::ShowStashItem"
-    }
-  },
-  {
-    "context": "Terminal",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-alt-space": "terminal::ShowCharacterPalette",
-      "ctrl-insert": "terminal::Copy",
-      "ctrl-shift-c": "terminal::Copy",
-      "shift-insert": "terminal::Paste",
-      "ctrl-v": "terminal::Paste",
-      "ctrl-shift-v": "terminal::Paste",
-      "ctrl-i": "assistant::InlineAssist",
-      "alt-b": ["terminal::SendText", "\u001bb"],
-      "alt-f": ["terminal::SendText", "\u001bf"],
-      "alt-.": ["terminal::SendText", "\u001b."],
-      "ctrl-delete": ["terminal::SendText", "\u001bd"],
-      "ctrl-n": "workspace::NewTerminal",
-      // Overrides for conflicting keybindings
-      "ctrl-b": ["terminal::SendKeystroke", "ctrl-b"],
-      "ctrl-c": ["terminal::SendKeystroke", "ctrl-c"],
-      "ctrl-e": ["terminal::SendKeystroke", "ctrl-e"],
-      "ctrl-o": ["terminal::SendKeystroke", "ctrl-o"],
-      "ctrl-w": ["terminal::SendKeystroke", "ctrl-w"],
-      "ctrl-q": ["terminal::SendKeystroke", "ctrl-q"],
-      "ctrl-r": ["terminal::SendKeystroke", "ctrl-r"],
-      "ctrl-backspace": ["terminal::SendKeystroke", "ctrl-w"],
-      "ctrl-shift-a": "editor::SelectAll",
-      "ctrl-shift-f": "buffer_search::Deploy",
-      "ctrl-shift-l": "terminal::Clear",
-      "ctrl-shift-w": "pane::CloseActiveItem",
-      "up": ["terminal::SendKeystroke", "up"],
-      "pageup": ["terminal::SendKeystroke", "pageup"],
-      "down": ["terminal::SendKeystroke", "down"],
-      "pagedown": ["terminal::SendKeystroke", "pagedown"],
-      "escape": ["terminal::SendKeystroke", "escape"],
-      "enter": ["terminal::SendKeystroke", "enter"],
-      "shift-pageup": "terminal::ScrollPageUp",
-      "shift-pagedown": "terminal::ScrollPageDown",
-      "shift-up": "terminal::ScrollLineUp",
-      "shift-down": "terminal::ScrollLineDown",
-      "shift-home": "terminal::ScrollToTop",
-      "shift-end": "terminal::ScrollToBottom",
-      "ctrl-shift-space": "terminal::ToggleViMode",
-      "ctrl-shift-r": "terminal::RerunTask",
-      "ctrl-alt-r": "terminal::RerunTask",
-      "alt-t": "terminal::RerunTask",
-      "ctrl-shift-5": "pane::SplitRight"
-    }
-  },
-  {
-    "context": "Terminal && selection",
-    "bindings": {
-      "ctrl-c": "terminal::Copy"
-    }
-  },
-  {
-    "context": "ZedPredictModal",
-    "use_key_equivalents": true,
-    "bindings": {
-      "escape": "menu::Cancel"
-    }
-  },
-  {
-    "context": "ConfigureContextServerModal > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "escape": "menu::Cancel",
-      "enter": "editor::Newline",
-      "ctrl-enter": "menu::Confirm"
-    }
-  },
-  {
-    "context": "ContextServerToolsModal",
-    "use_key_equivalents": true,
-    "bindings": {
-      "escape": "menu::Cancel"
-    }
-  },
-  {
-    "context": "OnboardingAiConfigurationModal",
-    "use_key_equivalents": true,
-    "bindings": {
-      "escape": "menu::Cancel"
-    }
-  },
-  {
-    "context": "Diagnostics",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-r": "diagnostics::ToggleDiagnosticsRefresh"
-    }
-  },
-  {
-    "context": "DebugConsole > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "enter": "menu::Confirm",
-      "alt-enter": "console::WatchExpression"
-    }
-  },
-  {
-    "context": "RunModal",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-tab": "pane::ActivateNextItem",
-      "ctrl-shift-tab": "pane::ActivatePreviousItem"
-    }
-  },
-  {
-    "context": "MarkdownPreview",
-    "use_key_equivalents": true,
-    "bindings": {
-      "pageup": "markdown::ScrollPageUp",
-      "pagedown": "markdown::ScrollPageDown",
-      "up": "markdown::ScrollUp",
-      "down": "markdown::ScrollDown",
-      "alt-up": "markdown::ScrollUpByItem",
-      "alt-down": "markdown::ScrollDownByItem"
-    }
-  },
-  {
-    "context": "KeymapEditor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-f": "search::FocusSearch",
-      "alt-f": "keymap_editor::ToggleKeystrokeSearch",
-      "alt-c": "keymap_editor::ToggleConflictFilter",
-      "enter": "keymap_editor::EditBinding",
-      "alt-enter": "keymap_editor::CreateBinding",
-      "ctrl-c": "keymap_editor::CopyAction",
-      "ctrl-shift-c": "keymap_editor::CopyContext",
-      "ctrl-t": "keymap_editor::ShowMatchingKeybinds"
-    }
-  },
-  {
-    "context": "KeystrokeInput",
-    "use_key_equivalents": true,
-    "bindings": {
-      "enter": "keystroke_input::StartRecording",
-      "escape escape escape": "keystroke_input::StopRecording",
-      "delete": "keystroke_input::ClearKeystrokes"
-    }
-  },
-  {
-    "context": "KeybindEditorModal",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-enter": "menu::Confirm",
-      "escape": "menu::Cancel"
-    }
-  },
-  {
-    "context": "KeybindEditorModal > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "up": "menu::SelectPrevious",
-      "down": "menu::SelectNext"
-    }
-  },
-  {
-    "context": "Onboarding",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-=": ["zed::IncreaseUiFontSize", { "persist": false }],
-      "ctrl-+": ["zed::IncreaseUiFontSize", { "persist": false }],
-      "ctrl--": ["zed::DecreaseUiFontSize", { "persist": false }],
-      "ctrl-0": ["zed::ResetUiFontSize", { "persist": false }],
-      "ctrl-enter": "onboarding::Finish",
-      "alt-shift-l": "onboarding::SignIn",
-      "shift-alt-a": "onboarding::OpenAccount"
-    }
-  },
-  {
-    "context": "Welcome",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-=": ["zed::IncreaseUiFontSize", { "persist": false }],
-      "ctrl-+": ["zed::IncreaseUiFontSize", { "persist": false }],
-      "ctrl--": ["zed::DecreaseUiFontSize", { "persist": false }],
-      "ctrl-0": ["zed::ResetUiFontSize", { "persist": false }]
-    }
-  },
-  {
-    "context": "GitWorktreeSelector || (GitWorktreeSelector > Picker > Editor)",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-shift-space": "git::WorktreeFromDefaultOnWindow",
-      "ctrl-space": "git::WorktreeFromDefault"
-    }
-  },
-  {
-    "context": "SettingsWindow",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-w": "workspace::CloseWindow",
-      "escape": "workspace::CloseWindow",
-      "ctrl-m": "settings_editor::Minimize",
-      "ctrl-f": "search::FocusSearch",
-      "ctrl-,": "settings_editor::OpenCurrentFile",
-      "left": "settings_editor::ToggleFocusNav",
-      "ctrl-shift-e": "settings_editor::ToggleFocusNav",
-      // todo(settings_ui): cut this down based on the max files and overflow UI
-      "ctrl-1": ["settings_editor::FocusFile", 0],
-      "ctrl-2": ["settings_editor::FocusFile", 1],
-      "ctrl-3": ["settings_editor::FocusFile", 2],
-      "ctrl-4": ["settings_editor::FocusFile", 3],
-      "ctrl-5": ["settings_editor::FocusFile", 4],
-      "ctrl-6": ["settings_editor::FocusFile", 5],
-      "ctrl-7": ["settings_editor::FocusFile", 6],
-      "ctrl-8": ["settings_editor::FocusFile", 7],
-      "ctrl-9": ["settings_editor::FocusFile", 8],
-      "ctrl-0": ["settings_editor::FocusFile", 9],
-      "ctrl-pageup": "settings_editor::FocusPreviousFile",
-      "ctrl-pagedown": "settings_editor::FocusNextFile"
-    }
-  },
-  {
-    "context": "StashDiff > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-space": "git::ApplyCurrentStash",
-      "ctrl-shift-space": "git::PopCurrentStash",
-      "ctrl-shift-backspace": "git::DropCurrentStash"
-    }
-  },
-  {
-    "context": "SettingsWindow > NavigationMenu",
-    "use_key_equivalents": true,
-    "bindings": {
-      "up": "settings_editor::FocusPreviousNavEntry",
-      "shift-tab": "settings_editor::FocusPreviousNavEntry",
-      "down": "settings_editor::FocusNextNavEntry",
-      "tab": "settings_editor::FocusNextNavEntry",
-      "right": "settings_editor::ExpandNavEntry",
-      "left": "settings_editor::CollapseNavEntry",
-      "pageup": "settings_editor::FocusPreviousRootNavEntry",
-      "pagedown": "settings_editor::FocusNextRootNavEntry",
-      "home": "settings_editor::FocusFirstNavEntry",
-      "end": "settings_editor::FocusLastNavEntry"
-    }
-  },
-  {
-    "context": "EditPredictionContext > Editor",
-    "bindings": {
-      "alt-left": "dev::EditPredictionContextGoBack",
-      "alt-right": "dev::EditPredictionContextGoForward"
-    }
-  },
-  {
-    "context": "GitBranchSelector || (GitBranchSelector > Picker > Editor)",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-shift-backspace": "branch_picker::DeleteBranch",
-      "ctrl-shift-i": "branch_picker::FilterRemotes"
-    }
-  }
-]
diff --git a/assets/keymaps/initial.json b/assets/keymaps/initial.json
deleted file mode 100644
index 8e4fe59f44..0000000000
--- a/assets/keymaps/initial.json
+++ /dev/null
@@ -1,21 +0,0 @@
-// Zed keymap
-//
-// For information on binding keys, see the Zed
-// documentation: https://zed.dev/docs/key-bindings
-//
-// To see the default key bindings run `zed: open default keymap`
-// from the command palette.
-[
-  {
-    "context": "Workspace",
-    "bindings": {
-      // "shift shift": "file_finder::Toggle"
-    }
-  },
-  {
-    "context": "Editor && vim_mode == insert",
-    "bindings": {
-      // "j k": "vim::NormalBefore"
-    }
-  }
-]
diff --git a/assets/keymaps/linux/atom.json b/assets/keymaps/linux/atom.json
deleted file mode 100644
index 98992b19fa..0000000000
--- a/assets/keymaps/linux/atom.json
+++ /dev/null
@@ -1,96 +0,0 @@
-// Default Keymap (Atom) for Zed on Linux
-[
-  {
-    "bindings": {
-      "ctrl-shift-f5": "workspace::Reload", // window:reload
-      "ctrl-k ctrl-n": "workspace::ActivatePreviousPane", // window:focus-next-pane
-      "ctrl-k ctrl-p": "workspace::ActivateNextPane" // window:focus-previous-pane
-    }
-  },
-  {
-    "context": "Editor",
-    "bindings": {
-      "ctrl-k ctrl-u": "editor::ConvertToUpperCase", // editor:upper-case
-      "ctrl-k ctrl-l": "editor::ConvertToLowerCase" // editor:lower-case
-    }
-  },
-  {
-    "context": "Editor && mode == full",
-    "bindings": {
-      "ctrl-shift-l": "language_selector::Toggle", // grammar-selector:show
-      "ctrl-|": "pane::RevealInProjectPanel", // tree-view:reveal-active-file
-      "ctrl-b": "editor::GoToDefinition", // fuzzy-finder:toggle-buffer-finder
-      "ctrl-alt-b": "editor::GoToDefinitionSplit", // N/A: From JetBrains
-      "ctrl-<": "editor::ScrollCursorCenter", // editor:scroll-to-cursor
-      "f3": ["editor::SelectNext", { "replace_newest": true }], // find-and-replace:find-next
-      "shift-f3": ["editor::SelectPrevious", { "replace_newest": true }], //find-and-replace:find-previous
-      "alt-shift-down": ["editor::AddSelectionBelow", { "skip_soft_wrap": true }], // editor:add-selection-below
-      "alt-shift-up": ["editor::AddSelectionAbove", { "skip_soft_wrap": true }], // editor:add-selection-above
-      "ctrl-j": "editor::JoinLines", // editor:join-lines
-      "ctrl-shift-d": "editor::DuplicateLineDown", // editor:duplicate-lines
-      "ctrl-up": "editor::MoveLineUp", // editor:move-line-up
-      "ctrl-down": "editor::MoveLineDown", // editor:move-line-down
-      "ctrl-\\": "workspace::ToggleLeftDock", // tree-view:toggle
-      "ctrl-shift-m": "markdown::OpenPreviewToTheSide", // markdown-preview:toggle
-      "ctrl-r": "outline::Toggle" // symbols-view:toggle-project-symbols
-    }
-  },
-  {
-    "context": "BufferSearchBar",
-    "bindings": {
-      "f3": ["editor::SelectNext", { "replace_newest": true }], // find-and-replace:find-next
-      "shift-f3": ["editor::SelectPrevious", { "replace_newest": true }], //find-and-replace:find-previous
-      "ctrl-f3": "search::SelectNextMatch", // find-and-replace:find-next-selected
-      "ctrl-shift-f3": "search::SelectPreviousMatch" // find-and-replace:find-previous-selected
-    }
-  },
-  {
-    "context": "Workspace",
-    "bindings": {
-      "ctrl-\\": "workspace::ToggleLeftDock", // tree-view:toggle
-      "ctrl-k ctrl-b": "workspace::ToggleLeftDock", // tree-view:toggle
-      "ctrl-t": "file_finder::Toggle", // fuzzy-finder:toggle-file-finder
-      "ctrl-r": "project_symbols::Toggle" // symbols-view:toggle-project-symbols
-    }
-  },
-  {
-    "context": "Pane",
-    "bindings": {
-      // "ctrl-0": "project_panel::ToggleFocus", // tree-view:toggle-focus
-      "ctrl-1": ["pane::ActivateItem", 0], // tree-view:open-selected-entry-in-pane-1
-      "ctrl-2": ["pane::ActivateItem", 1], // tree-view:open-selected-entry-in-pane-2
-      "ctrl-3": ["pane::ActivateItem", 2], // tree-view:open-selected-entry-in-pane-3
-      "ctrl-4": ["pane::ActivateItem", 3], // tree-view:open-selected-entry-in-pane-4
-      "ctrl-5": ["pane::ActivateItem", 4], // tree-view:open-selected-entry-in-pane-5
-      "ctrl-6": ["pane::ActivateItem", 5], // tree-view:open-selected-entry-in-pane-6
-      "ctrl-7": ["pane::ActivateItem", 6], // tree-view:open-selected-entry-in-pane-7
-      "ctrl-8": ["pane::ActivateItem", 7], // tree-view:open-selected-entry-in-pane-8
-      "ctrl-9": ["pane::ActivateItem", 8] // tree-view:open-selected-entry-in-pane-9
-    }
-  },
-  {
-    "context": "ProjectPanel",
-    "bindings": {
-      "f2": "project_panel::Rename", // tree-view:rename
-      "backspace": ["project_panel::Trash", { "skip_prompt": false }],
-      "ctrl-x": "project_panel::Cut", // tree-view:cut
-      "ctrl-c": "project_panel::Copy", // tree-view:copy
-      "ctrl-v": "project_panel::Paste" // tree-view:paste
-    }
-  },
-  {
-    "context": "ProjectPanel && not_editing",
-    "bindings": {
-      "ctrl-shift-c": "project_panel::CopyPath", // tree-view:copy-full-path
-      "ctrl-[": "project_panel::CollapseSelectedEntry", // tree-view:collapse-directory
-      "ctrl-b": "project_panel::CollapseSelectedEntry", // tree-view:collapse-directory
-      "ctrl-]": "project_panel::ExpandSelectedEntry", // tree-view:expand-item
-      "ctrl-f": "project_panel::ExpandSelectedEntry", // tree-view:expand-item
-      "a": "project_panel::NewFile", // tree-view:add-file
-      "d": "project_panel::Duplicate", // tree-view:duplicate
-      "home": "menu::SelectFirst", // core:move-to-top
-      "end": "menu::SelectLast", // core:move-to-bottom
-      "shift-a": "project_panel::NewDirectory" // tree-view:add-folder
-    }
-  }
-]
diff --git a/assets/keymaps/linux/cursor.json b/assets/keymaps/linux/cursor.json
deleted file mode 100644
index 4d2d13a90d..0000000000
--- a/assets/keymaps/linux/cursor.json
+++ /dev/null
@@ -1,83 +0,0 @@
-[
-  // Cursor for MacOS. See: https://docs.cursor.com/kbd
-  {
-    "context": "Workspace",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-i": "agent::ToggleFocus",
-      "ctrl-shift-i": "agent::ToggleFocus",
-      "ctrl-l": "agent::ToggleFocus",
-      "ctrl-shift-l": "agent::ToggleFocus",
-      "ctrl-shift-j": "agent::OpenSettings"
-    }
-  },
-  {
-    "context": "Editor && mode == full",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-i": "agent::ToggleFocus",
-      "ctrl-shift-i": "agent::ToggleFocus",
-      "ctrl-shift-l": "agent::AddSelectionToThread", // In cursor uses "Ask" mode
-      "ctrl-l": "agent::AddSelectionToThread", // In cursor uses "Agent" mode
-      "ctrl-k": "assistant::InlineAssist",
-      "ctrl-shift-k": "assistant::InsertIntoEditor"
-    }
-  },
-  {
-    "context": "InlineAssistEditor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-shift-backspace": "editor::Cancel"
-      // "alt-enter": // Quick Question
-      // "ctrl-shift-enter": // Full File Context
-      // "ctrl-shift-k": // Toggle input focus (editor <> inline assist)
-    }
-  },
-  {
-    "context": "AgentPanel || ContextEditor || (MessageEditor > Editor)",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-i": "workspace::ToggleRightDock",
-      "ctrl-shift-i": "workspace::ToggleRightDock",
-      "ctrl-l": "workspace::ToggleRightDock",
-      "ctrl-shift-l": "workspace::ToggleRightDock",
-      "ctrl-w": "workspace::ToggleRightDock", // technically should close chat
-      "ctrl-.": "agent::ToggleProfileSelector",
-      "ctrl-/": "agent::ToggleModelSelector",
-      "ctrl-shift-backspace": "editor::Cancel",
-      "ctrl-r": "agent::NewThread",
-      "ctrl-shift-v": "editor::Paste",
-      "ctrl-shift-k": "assistant::InsertIntoEditor"
-      // "escape": "agent::ToggleFocus"
-      ///// Enable when Zed supports multiple thread tabs
-      // "ctrl-t": // new thread tab
-      // "ctrl-[": // next thread tab
-      // "ctrl-]": // next thread tab
-      ///// Enable if Zed adds support for keyboard navigation of thread elements
-      // "tab": // cycle to next message
-      // "shift-tab": // cycle to previous message
-    }
-  },
-  {
-    "context": "Editor && editor_agent_diff",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-enter": "agent::KeepAll",
-      "ctrl-backspace": "agent::RejectAll"
-    }
-  },
-  {
-    "context": "Editor && mode == full && edit_prediction",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-right": "editor::AcceptPartialEditPrediction"
-    }
-  },
-  {
-    "context": "Terminal",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-k": "assistant::InlineAssist"
-    }
-  }
-]
diff --git a/assets/keymaps/linux/emacs.json b/assets/keymaps/linux/emacs.json
deleted file mode 100755
index c5cf22c812..0000000000
--- a/assets/keymaps/linux/emacs.json
+++ /dev/null
@@ -1,206 +0,0 @@
-// documentation: https://zed.dev/docs/key-bindings
-//
-// To see the default key bindings run `zed: open default keymap`
-// from the command palette.
-[
-  {
-    "bindings": {
-      "ctrl-g": "menu::Cancel"
-    }
-  },
-  {
-    // Workaround to avoid falling back to default bindings.
-    // Unbind so Zed ignores these keys and lets emacs handle them.
-    // NOTE: must be declared before the `Editor` override.
-    // NOTE: in macos the 'ctrl-x' 'ctrl-p' and 'ctrl-n' rebindings are not needed, since they default to 'cmd'.
-    "context": "Editor",
-    "bindings": {
-      "ctrl-g": null, // currently activates `go_to_line::Toggle` when there is nothing to cancel
-      "ctrl-x": null, // currently activates `editor::Cut` if no following key is pressed for 1 second
-      "ctrl-p": null, // currently activates `file_finder::Toggle` when the cursor is on the first character of the buffer
-      "ctrl-n": null // currently activates `workspace::NewFile` when the cursor is on the last character of the buffer
-    }
-  },
-  {
-    "context": "Editor",
-    "bindings": {
-      "ctrl-g": "editor::Cancel",
-      "alt-g g": "go_to_line::Toggle", // goto-line
-      "alt-g alt-g": "go_to_line::Toggle", // goto-line
-      "ctrl-space": "editor::SetMark", // set-mark
-      "ctrl-@": "editor::SetMark", // set-mark
-      "ctrl-x ctrl-x": "editor::SwapSelectionEnds", // exchange-point-and-mark
-      "ctrl-f": "editor::MoveRight", // forward-char
-      "ctrl-b": "editor::MoveLeft", // backward-char
-      "ctrl-n": "editor::MoveDown", // next-line
-      "ctrl-p": "editor::MoveUp", // previous-line
-      "home": ["editor::MoveToBeginningOfLine", { "stop_at_soft_wraps": false }], // move-beginning-of-line
-      "end": ["editor::MoveToEndOfLine", { "stop_at_soft_wraps": false }], // move-end-of-line
-      "ctrl-a": ["editor::MoveToBeginningOfLine", { "stop_at_soft_wraps": false }], // move-beginning-of-line
-      "ctrl-e": ["editor::MoveToEndOfLine", { "stop_at_soft_wraps": false }], // move-end-of-line
-      "shift-home": ["editor::SelectToBeginningOfLine", { "stop_at_soft_wraps": false }], // move-beginning-of-line
-      "shift-end": ["editor::SelectToEndOfLine", { "stop_at_soft_wraps": false }], // move-end-of-line
-      "alt-m": ["editor::MoveToBeginningOfLine", { "stop_at_soft_wraps": false, "stop_at_indent": true }], // back-to-indentation
-      "alt-left": "editor::MoveToPreviousWordStart", // left-word
-      "alt-right": "editor::MoveToNextWordEnd", // right-word
-      "alt-f": "editor::MoveToNextWordEnd", // forward-word
-      "alt-b": "editor::MoveToPreviousWordStart", // backward-word
-      "alt-u": "editor::ConvertToUpperCase", // upcase-word
-      "alt-l": "editor::ConvertToLowerCase", // downcase-word
-      "alt-c": "editor::ConvertToUpperCamelCase", // capitalize-word
-      "ctrl-t": "editor::Transpose", // transpose-chars
-      "alt-;": ["editor::ToggleComments", { "advance_downwards": false }],
-      "ctrl-x ctrl-;": "editor::ToggleComments",
-      "alt-.": "editor::GoToDefinition", // xref-find-definitions
-      "alt-?": "editor::FindAllReferences", // xref-find-references
-      "alt-,": "pane::GoBack", // xref-pop-marker-stack
-      "ctrl-x h": "editor::SelectAll", // mark-whole-buffer
-      "ctrl-d": "editor::Delete", // delete-char
-      "alt-d": ["editor::DeleteToNextWordEnd", { "ignore_newlines": false, "ignore_brackets": false }], // kill-word
-      "alt-backspace": "editor::DeleteToPreviousWordStart", // backward-kill-word
-      "alt-delete": "editor::DeleteToPreviousWordStart", // backward-kill-word
-      "ctrl-k": "editor::KillRingCut", // kill-line
-      "ctrl-w": "editor::Cut", // kill-region
-      "alt-w": "editor::Copy", // kill-ring-save
-      "ctrl-y": "editor::KillRingYank", // yank
-      "ctrl-_": "editor::Undo", // undo
-      "ctrl-/": "editor::Undo", // undo
-      "ctrl-x u": "editor::Undo", // undo
-      "alt-{": "editor::MoveToStartOfParagraph", // backward-paragraph
-      "alt-}": "editor::MoveToEndOfParagraph", // forward-paragraph
-      "ctrl-up": "editor::MoveToStartOfParagraph", // backward-paragraph
-      "ctrl-down": "editor::MoveToEndOfParagraph", // forward-paragraph
-      "ctrl-v": "editor::MovePageDown", // scroll-up
-      "alt-v": "editor::MovePageUp", // scroll-down
-      "ctrl-x [": "editor::MoveToBeginning", // beginning-of-buffer
-      "ctrl-x ]": "editor::MoveToEnd", // end-of-buffer
-      "alt-<": "editor::MoveToBeginning", // beginning-of-buffer
-      "alt->": "editor::MoveToEnd", // end-of-buffer
-      "ctrl-home": "editor::MoveToBeginning", // beginning-of-buffer
-      "ctrl-end": "editor::MoveToEnd", // end-of-buffer
-      "ctrl-l": "editor::ScrollCursorCenterTopBottom", // recenter-top-bottom
-      "ctrl-s": "buffer_search::Deploy", // isearch-forward
-      "ctrl-r": "buffer_search::Deploy", // isearch-backward
-      "alt-^": "editor::JoinLines", // join-line
-      "alt-q": "editor::Rewrap" // fill-paragraph
-    }
-  },
-  {
-    "context": "Editor && selection_mode", // region selection
-    "bindings": {
-      "right": "editor::SelectRight",
-      "left": "editor::SelectLeft",
-      "down": "editor::SelectDown",
-      "up": "editor::SelectUp",
-      "alt-left": "editor::SelectToPreviousWordStart",
-      "alt-right": "editor::SelectToNextWordEnd",
-      "pagedown": "editor::SelectPageDown",
-      "ctrl-v": "editor::SelectPageDown",
-      "pageup": "editor::SelectPageUp",
-      "alt-v": "editor::SelectPageUp",
-      "ctrl-f": "editor::SelectRight",
-      "ctrl-b": "editor::SelectLeft",
-      "ctrl-n": "editor::SelectDown",
-      "ctrl-p": "editor::SelectUp",
-      "home": ["editor::SelectToBeginningOfLine", { "stop_at_soft_wraps": false }],
-      "end": ["editor::SelectToEndOfLine", { "stop_at_soft_wraps": false }],
-      "ctrl-a": ["editor::SelectToBeginningOfLine", { "stop_at_soft_wraps": false }],
-      "ctrl-e": ["editor::SelectToEndOfLine", { "stop_at_soft_wraps": false }],
-      "alt-m": ["editor::SelectToBeginningOfLine", { "stop_at_soft_wraps": false, "stop_at_indent": true }],
-      "alt-f": "editor::SelectToNextWordEnd",
-      "alt-b": "editor::SelectToPreviousWordStart",
-      "alt-{": "editor::SelectToStartOfParagraph",
-      "alt-}": "editor::SelectToEndOfParagraph",
-      "ctrl-up": "editor::SelectToStartOfParagraph",
-      "ctrl-down": "editor::SelectToEndOfParagraph",
-      "ctrl-x [": "editor::SelectToBeginning",
-      "ctrl-x ]": "editor::SelectToEnd",
-      "alt-<": "editor::SelectToBeginning",
-      "alt->": "editor::SelectToEnd",
-      "ctrl-home": "editor::SelectToBeginning",
-      "ctrl-end": "editor::SelectToEnd",
-      "ctrl-g": "editor::Cancel"
-    }
-  },
-  {
-    "context": "Editor && (showing_code_actions || showing_completions)",
-    "bindings": {
-      "ctrl-p": "editor::ContextMenuPrevious",
-      "ctrl-n": "editor::ContextMenuNext"
-    }
-  },
-  {
-    "context": "Editor && showing_signature_help && !showing_completions",
-    "bindings": {
-      "ctrl-p": "editor::SignatureHelpPrevious",
-      "ctrl-n": "editor::SignatureHelpNext"
-    }
-  },
-  // Example setting for using emacs-style tab
-  // (i.e. indent the current line / selection or perform symbol completion depending on context)
-  // {
-  //   "context": "Editor && !showing_code_actions && !showing_completions",
-  //   "bindings": {
-  //     "tab": "editor::AutoIndent" // indent-for-tab-command
-  //   }
-  // },
-  {
-    "context": "Workspace",
-    "bindings": {
-      "alt-x": "command_palette::Toggle", // execute-extended-command
-      "ctrl-x b": "tab_switcher::Toggle", // switch-to-buffer
-      "ctrl-x ctrl-b": "tab_switcher::Toggle", // list-buffers
-      // "ctrl-x ctrl-c": "workspace::CloseWindow" // in case you only want to exit the current Zed instance
-      "ctrl-x ctrl-c": "zed::Quit", // save-buffers-kill-terminal
-      "ctrl-x 5 0": "workspace::CloseWindow", // delete-frame
-      "ctrl-x 5 2": "workspace::NewWindow", // make-frame-command
-      "ctrl-x o": "workspace::ActivateNextPane", // other-window
-      "ctrl-x k": "pane::CloseActiveItem", // kill-buffer
-      "ctrl-x 0": "pane::CloseActiveItem", // delete-window
-      // "ctrl-x 1": "pane::JoinAll", // in case you prefer to delete the splits but keep the buffers open
-      "ctrl-x 1": "pane::CloseOtherItems", // delete-other-windows
-      "ctrl-x 2": "pane::SplitDown", // split-window-below
-      "ctrl-x 3": "pane::SplitRight", // split-window-right
-      "ctrl-x ctrl-f": "file_finder::Toggle", // find-file
-      "ctrl-x ctrl-s": "workspace::Save", // save-buffer
-      "ctrl-x ctrl-w": "workspace::SaveAs", // write-file
-      "ctrl-x s": "workspace::SaveAll" // save-some-buffers
-    }
-  },
-  {
-    // Workaround to enable using native emacs from the Zed terminal.
-    // Unbind so Zed ignores these keys and lets emacs handle them.
-    // NOTE:
-    //  "terminal::SendKeystroke" only works for a single key stroke (e.g. ctrl-x),
-    //  so override with null for compound sequences (e.g. ctrl-x ctrl-c).
-    "context": "Terminal",
-    "bindings": {
-      // If you want to perfect your emacs-in-zed setup, also consider the following.
-      // You may need to enable "option_as_meta" from the Zed settings for "alt-x" to work.
-      // "alt-x": ["terminal::SendKeystroke", "alt-x"],
-      // "ctrl-x": ["terminal::SendKeystroke", "ctrl-x"],
-      // "ctrl-n": ["terminal::SendKeystroke", "ctrl-n"],
-      // ...
-      "ctrl-x ctrl-c": null, // save-buffers-kill-terminal
-      "ctrl-x ctrl-f": null, // find-file
-      "ctrl-x ctrl-s": null, // save-buffer
-      "ctrl-x ctrl-w": null, // write-file
-      "ctrl-x s": null // save-some-buffers
-    }
-  },
-  {
-    "context": "BufferSearchBar > Editor",
-    "bindings": {
-      "ctrl-s": "search::SelectNextMatch",
-      "ctrl-r": "search::SelectPreviousMatch",
-      "ctrl-g": "buffer_search::Dismiss"
-    }
-  },
-  {
-    "context": "Pane",
-    "bindings": {
-      "ctrl-alt-left": "pane::GoBack",
-      "ctrl-alt-right": "pane::GoForward"
-    }
-  }
-]
diff --git a/assets/keymaps/linux/jetbrains.json b/assets/keymaps/linux/jetbrains.json
deleted file mode 100644
index a0314c5bc1..0000000000
--- a/assets/keymaps/linux/jetbrains.json
+++ /dev/null
@@ -1,185 +0,0 @@
-[
-  {
-    "bindings": {
-      "ctrl-alt-s": "zed::OpenSettings",
-      "ctrl-{": "pane::ActivatePreviousItem",
-      "ctrl-}": "pane::ActivateNextItem",
-      "shift-escape": null, // Unmap workspace::zoom
-      "ctrl-~": "git::Branch",
-      "ctrl-f2": "debugger::Stop",
-      "f6": "debugger::Pause",
-      "f7": "debugger::StepInto",
-      "f8": "debugger::StepOver",
-      "shift-f8": "debugger::StepOut",
-      "f9": "debugger::Continue",
-      "shift-f9": "debugger::Start",
-      "alt-shift-f9": "debugger::Start"
-    }
-  },
-  {
-    "context": "Editor",
-    "bindings": {
-      "ctrl->": ["zed::IncreaseBufferFontSize", { "persist": true }],
-      "ctrl-<": ["zed::DecreaseBufferFontSize", { "persist": true }],
-      "ctrl-shift-j": "editor::JoinLines",
-      "ctrl-d": "editor::DuplicateSelection",
-      "ctrl-y": "editor::DeleteLine",
-      "ctrl-m": "editor::ScrollCursorCenter",
-      "ctrl-pagedown": "editor::MovePageDown",
-      "ctrl-pageup": "editor::MovePageUp",
-      // "ctrl-alt-shift-b": "editor::SelectToPreviousWordStart",
-      "ctrl-alt-enter": "editor::NewlineAbove",
-      "shift-enter": "editor::NewlineBelow",
-      // "ctrl--": "editor::Fold", // TODO: `ctrl-numpad--` (numpad not implemented)
-      // "ctrl-+": "editor::UnfoldLines", // TODO: `ctrl-numpad+` (numpad not implemented)
-      "alt-shift-g": "editor::SplitSelectionIntoLines",
-      "alt-j": ["editor::SelectNext", { "replace_newest": false }],
-      "alt-shift-j": ["editor::SelectPrevious", { "replace_newest": false }],
-      "ctrl-/": ["editor::ToggleComments", { "advance_downwards": true }],
-      "ctrl-w": "editor::SelectLargerSyntaxNode",
-      "ctrl-shift-w": "editor::SelectSmallerSyntaxNode",
-      "shift-alt-up": "editor::MoveLineUp",
-      "shift-alt-down": "editor::MoveLineDown",
-      "ctrl-alt-l": "editor::Format",
-      "ctrl-alt-o": "editor::OrganizeImports",
-      "shift-f6": "editor::Rename",
-      "ctrl-alt-left": "pane::GoBack",
-      "ctrl-alt-right": "pane::GoForward",
-      "alt-f7": "editor::FindAllReferences",
-      "ctrl-alt-f7": "editor::FindAllReferences",
-      "ctrl-b": "editor::GoToDefinition", // Conflicts with workspace::ToggleLeftDock
-      "ctrl-alt-b": "editor::GoToImplementation", // Conflicts with workspace::ToggleRightDock
-      "ctrl-shift-b": "editor::GoToTypeDefinition",
-      "ctrl-alt-shift-b": "editor::GoToTypeDefinitionSplit",
-      "f2": "editor::GoToDiagnostic",
-      "shift-f2": "editor::GoToPreviousDiagnostic",
-      "ctrl-alt-shift-down": "editor::GoToHunk",
-      "ctrl-alt-shift-up": "editor::GoToPreviousHunk",
-      "ctrl-alt-z": "git::Restore",
-      "ctrl-home": "editor::MoveToBeginning",
-      "ctrl-end": "editor::MoveToEnd",
-      "ctrl-shift-home": "editor::SelectToBeginning",
-      "ctrl-shift-end": "editor::SelectToEnd",
-      "ctrl-f8": "editor::ToggleBreakpoint",
-      "ctrl-shift-f8": "editor::EditLogBreakpoint",
-      "ctrl-shift-u": "editor::ToggleCase"
-    }
-  },
-  {
-    "context": "Editor && mode == full",
-    "bindings": {
-      "ctrl-f12": "outline::Toggle",
-      "ctrl-r": ["buffer_search::Deploy", { "replace_enabled": true }],
-      "ctrl-shift-n": "file_finder::Toggle",
-      "ctrl-g": "go_to_line::Toggle",
-      "alt-enter": "editor::ToggleCodeActions",
-      "ctrl-space": "editor::ShowCompletions",
-      "ctrl-q": "editor::Hover",
-      "ctrl-p": "editor::ShowSignatureHelp",
-      "ctrl-\\": "assistant::InlineAssist"
-    }
-  },
-  {
-    "context": "BufferSearchBar",
-    "bindings": {
-      "shift-enter": "search::SelectPreviousMatch"
-    }
-  },
-  {
-    "context": "BufferSearchBar || ProjectSearchBar",
-    "bindings": {
-      "alt-c": "search::ToggleCaseSensitive",
-      "alt-e": "search::ToggleSelection",
-      "alt-x": "search::ToggleRegex",
-      "alt-w": "search::ToggleWholeWord"
-    }
-  },
-  {
-    "context": "Workspace",
-    "bindings": {
-      "ctrl-shift-f12": "workspace::ToggleAllDocks",
-      "ctrl-shift-r": ["pane::DeploySearch", { "replace_enabled": true }],
-      "alt-shift-f10": "task::Spawn",
-      "shift-f10": "task::Spawn",
-      "ctrl-f5": "task::Rerun",
-      "ctrl-e": "file_finder::Toggle",
-      "ctrl-k": "git_panel::ToggleFocus", // bug: This should also focus commit editor
-      "ctrl-shift-n": "file_finder::Toggle",
-      "ctrl-n": "project_symbols::Toggle",
-      "ctrl-alt-n": "file_finder::Toggle",
-      "ctrl-shift-a": "command_palette::Toggle",
-      "shift shift": "command_palette::Toggle",
-      "ctrl-alt-shift-n": "project_symbols::Toggle",
-      "alt-0": "git_panel::ToggleFocus",
-      "alt-1": "project_panel::ToggleFocus",
-      "alt-5": "debug_panel::ToggleFocus",
-      "alt-6": "diagnostics::Deploy",
-      "alt-7": "outline_panel::ToggleFocus"
-    }
-  },
-  {
-    "context": "Pane", // this is to override the default Pane mappings to switch tabs
-    "bindings": {
-      "alt-1": "project_panel::ToggleFocus",
-      "alt-2": null, // Bookmarks (left dock)
-      "alt-3": null, // Find Panel (bottom dock)
-      "alt-4": null, // Run Panel (bottom dock)
-      "alt-5": "debug_panel::ToggleFocus",
-      "alt-6": "diagnostics::Deploy",
-      "alt-7": "outline_panel::ToggleFocus",
-      "alt-8": null, // Services (bottom dock)
-      "alt-9": null, // Git History (bottom dock)
-      "alt-0": "git_panel::ToggleFocus"
-    }
-  },
-  {
-    "context": "Workspace || Editor",
-    "bindings": {
-      "alt-f12": "terminal_panel::Toggle",
-      "ctrl-shift-k": "git::Push"
-    }
-  },
-  {
-    "context": "Pane",
-    "bindings": {
-      "ctrl-alt-left": "pane::GoBack",
-      "ctrl-alt-right": "pane::GoForward",
-      "alt-left": "pane::ActivatePreviousItem",
-      "alt-right": "pane::ActivateNextItem"
-    }
-  },
-  {
-    "context": "ProjectPanel",
-    "bindings": {
-      "enter": "project_panel::Open",
-      "ctrl-shift-f": "project_panel::NewSearchInDirectory",
-      "backspace": ["project_panel::Trash", { "skip_prompt": false }],
-      "delete": ["project_panel::Trash", { "skip_prompt": false }],
-      "shift-delete": ["project_panel::Delete", { "skip_prompt": false }],
-      "shift-f6": "project_panel::Rename"
-    }
-  },
-  {
-    "context": "Terminal",
-    "bindings": {
-      "ctrl-shift-t": "workspace::NewTerminal",
-      "alt-f12": "workspace::CloseActiveDock",
-      "ctrl-up": "terminal::ScrollLineUp",
-      "ctrl-down": "terminal::ScrollLineDown",
-      "shift-pageup": "terminal::ScrollPageUp",
-      "shift-pagedown": "terminal::ScrollPageDown"
-    }
-  },
-  { "context": "GitPanel", "bindings": { "alt-0": "workspace::CloseActiveDock" } },
-  { "context": "ProjectPanel", "bindings": { "alt-1": "workspace::CloseActiveDock" } },
-  { "context": "DebugPanel", "bindings": { "alt-5": "workspace::CloseActiveDock" } },
-  { "context": "Diagnostics > Editor", "bindings": { "alt-6": "pane::CloseActiveItem" } },
-  { "context": "OutlinePanel", "bindings": { "alt-7": "workspace::CloseActiveDock" } },
-  {
-    "context": "Dock || Workspace || OutlinePanel || ProjectPanel || CollabPanel || (Editor && mode == auto_height)",
-    "bindings": {
-      "escape": "editor::ToggleFocus",
-      "shift-escape": "workspace::CloseActiveDock"
-    }
-  }
-]
diff --git a/assets/keymaps/linux/sublime_text.json b/assets/keymaps/linux/sublime_text.json
deleted file mode 100644
index eefd59e5bd..0000000000
--- a/assets/keymaps/linux/sublime_text.json
+++ /dev/null
@@ -1,97 +0,0 @@
-[
-  {
-    "bindings": {
-      "ctrl-{": "pane::ActivatePreviousItem",
-      "ctrl-}": "pane::ActivateNextItem",
-      "ctrl-pageup": "pane::ActivatePreviousItem",
-      "ctrl-pagedown": "pane::ActivateNextItem",
-      "ctrl-1": ["workspace::ActivatePane", 0],
-      "ctrl-2": ["workspace::ActivatePane", 1],
-      "ctrl-3": ["workspace::ActivatePane", 2],
-      "ctrl-4": ["workspace::ActivatePane", 3],
-      "ctrl-5": ["workspace::ActivatePane", 4],
-      "ctrl-6": ["workspace::ActivatePane", 5],
-      "ctrl-7": ["workspace::ActivatePane", 6],
-      "ctrl-8": ["workspace::ActivatePane", 7],
-      "ctrl-9": ["workspace::ActivatePane", 8],
-      "ctrl-!": ["workspace::MoveItemToPane", { "destination": 0, "focus": true }],
-      "ctrl-@": ["workspace::MoveItemToPane", { "destination": 1 }],
-      "ctrl-#": ["workspace::MoveItemToPane", { "destination": 2 }],
-      "ctrl-$": ["workspace::MoveItemToPane", { "destination": 3 }],
-      "ctrl-%": ["workspace::MoveItemToPane", { "destination": 4 }],
-      "ctrl-^": ["workspace::MoveItemToPane", { "destination": 5 }],
-      "ctrl-&": ["workspace::MoveItemToPane", { "destination": 6 }],
-      "ctrl-*": ["workspace::MoveItemToPane", { "destination": 7 }],
-      "ctrl-(": ["workspace::MoveItemToPane", { "destination": 8 }]
-    }
-  },
-  {
-    "context": "Editor",
-    "bindings": {
-      "ctrl-alt-up": ["editor::AddSelectionAbove", { "skip_soft_wrap": false }],
-      "ctrl-alt-down": ["editor::AddSelectionBelow", { "skip_soft_wrap": false }],
-      "ctrl-shift-up": "editor::MoveLineUp",
-      "ctrl-shift-down": "editor::MoveLineDown",
-      "ctrl-shift-m": "editor::SelectLargerSyntaxNode",
-      "ctrl-shift-l": "editor::SplitSelectionIntoLines",
-      "ctrl-shift-a": "editor::SelectLargerSyntaxNode",
-      "ctrl-shift-d": "editor::DuplicateSelection",
-      "alt-f3": "editor::SelectAllMatches", // find_all_under
-      // "ctrl-f3": "", // find_under (cancels any selections)
-      // "ctrl-alt-shift-g": "" // find_under_prev (cancels any selections)
-      "f9": "editor::SortLinesCaseSensitive",
-      "ctrl-f9": "editor::SortLinesCaseInsensitive",
-      "f12": "editor::GoToDefinition",
-      "ctrl-f12": "editor::GoToDefinitionSplit",
-      "shift-f12": "editor::FindAllReferences",
-      "ctrl-shift-f12": "editor::FindAllReferences",
-      "ctrl-.": "editor::GoToHunk",
-      "ctrl-,": "editor::GoToPreviousHunk",
-      "ctrl-k ctrl-u": "editor::ConvertToUpperCase",
-      "ctrl-k ctrl-l": "editor::ConvertToLowerCase",
-      "shift-alt-m": "markdown::OpenPreviewToTheSide",
-      "ctrl-backspace": ["editor::DeleteToPreviousWordStart", { "ignore_newlines": false, "ignore_brackets": false }],
-      "ctrl-delete": ["editor::DeleteToNextWordEnd", { "ignore_newlines": false, "ignore_brackets": false }],
-      "alt-right": "editor::MoveToNextSubwordEnd",
-      "alt-left": "editor::MoveToPreviousSubwordStart",
-      "alt-shift-right": "editor::SelectToNextSubwordEnd",
-      "alt-shift-left": "editor::SelectToPreviousSubwordStart"
-    }
-  },
-  {
-    "context": "Editor && mode == full",
-    "bindings": {
-      "ctrl-r": "outline::Toggle"
-    }
-  },
-  {
-    "context": "Editor && !agent_diff",
-    "bindings": {
-      "ctrl-k ctrl-z": "git::Restore"
-    }
-  },
-  {
-    "context": "Pane",
-    "bindings": {
-      "f4": "search::SelectNextMatch",
-      "shift-f4": "search::SelectPreviousMatch",
-      "alt-1": ["pane::ActivateItem", 0],
-      "alt-2": ["pane::ActivateItem", 1],
-      "alt-3": ["pane::ActivateItem", 2],
-      "alt-4": ["pane::ActivateItem", 3],
-      "alt-5": ["pane::ActivateItem", 4],
-      "alt-6": ["pane::ActivateItem", 5],
-      "alt-7": ["pane::ActivateItem", 6],
-      "alt-8": ["pane::ActivateItem", 7],
-      "alt-9": "pane::ActivateLastItem"
-    }
-  },
-  {
-    "context": "Workspace",
-    "bindings": {
-      "ctrl-k ctrl-b": "workspace::ToggleLeftDock",
-      // "ctrl-0": "project_panel::ToggleFocus", // normally resets zoom
-      "shift-ctrl-r": "project_symbols::Toggle"
-    }
-  }
-]
diff --git a/assets/keymaps/macos/atom.json b/assets/keymaps/macos/atom.json
deleted file mode 100644
index ca015b667f..0000000000
--- a/assets/keymaps/macos/atom.json
+++ /dev/null
@@ -1,98 +0,0 @@
-// Default Keymap (Atom) for Zed on macOS
-[
-  {
-    "bindings": {
-      "ctrl-alt-cmd-l": "workspace::Reload",
-      "cmd-k cmd-p": "workspace::ActivatePreviousPane",
-      "cmd-k cmd-n": "workspace::ActivateNextPane"
-    }
-  },
-  {
-    "context": "Editor",
-    "bindings": {
-      "cmd-shift-backspace": "editor::DeleteToBeginningOfLine",
-      "cmd-k cmd-u": "editor::ConvertToUpperCase",
-      "cmd-k cmd-l": "editor::ConvertToLowerCase"
-    }
-  },
-  {
-    "context": "Editor && mode == full",
-    "bindings": {
-      "ctrl-shift-l": "language_selector::Toggle",
-      "cmd-|": "pane::RevealInProjectPanel",
-      "cmd-b": "editor::GoToDefinition",
-      "alt-cmd-b": "editor::GoToDefinitionSplit",
-      "cmd-<": "editor::ScrollCursorCenter",
-      "cmd-g": ["editor::SelectNext", { "replace_newest": true }],
-      "cmd-shift-g": ["editor::SelectPrevious", { "replace_newest": true }],
-      "ctrl-shift-down": ["editor::AddSelectionBelow", { "skip_soft_wrap": true }],
-      "ctrl-shift-up": ["editor::AddSelectionAbove", { "skip_soft_wrap": true }],
-      "alt-enter": "editor::Newline",
-      "cmd-shift-d": "editor::DuplicateLineDown",
-      "ctrl-cmd-up": "editor::MoveLineUp",
-      "ctrl-cmd-down": "editor::MoveLineDown",
-      "cmd-\\": "workspace::ToggleLeftDock",
-      "ctrl-shift-m": "markdown::OpenPreviewToTheSide",
-      "cmd-r": "outline::Toggle"
-    }
-  },
-  {
-    "context": "BufferSearchBar",
-    "bindings": {
-      "cmd-g": ["editor::SelectNext", { "replace_newest": true }],
-      "cmd-shift-g": ["editor::SelectPrevious", { "replace_newest": true }],
-      "cmd-f3": "search::SelectNextMatch",
-      "cmd-shift-f3": "search::SelectPreviousMatch"
-    }
-  },
-  {
-    "context": "Workspace",
-    "bindings": {
-      "cmd-\\": "workspace::ToggleLeftDock",
-      "cmd-k cmd-b": "workspace::ToggleLeftDock",
-      "cmd-t": "file_finder::Toggle",
-      "cmd-shift-r": "project_symbols::Toggle"
-    }
-  },
-  {
-    "context": "Pane",
-    "bindings": {
-      "alt-cmd-/": "search::ToggleRegex",
-      "ctrl-0": "project_panel::ToggleFocus",
-      "cmd-1": ["pane::ActivateItem", 0],
-      "cmd-2": ["pane::ActivateItem", 1],
-      "cmd-3": ["pane::ActivateItem", 2],
-      "cmd-4": ["pane::ActivateItem", 3],
-      "cmd-5": ["pane::ActivateItem", 4],
-      "cmd-6": ["pane::ActivateItem", 5],
-      "cmd-7": ["pane::ActivateItem", 6],
-      "cmd-8": ["pane::ActivateItem", 7],
-      "cmd-9": "pane::ActivateLastItem"
-    }
-  },
-  {
-    "context": "ProjectPanel",
-    "bindings": {
-      "f2": "project_panel::Rename",
-      "backspace": ["project_panel::Trash", { "skip_prompt": false }],
-      "cmd-x": "project_panel::Cut",
-      "cmd-c": "project_panel::Copy",
-      "cmd-v": "project_panel::Paste"
-    }
-  },
-  {
-    "context": "ProjectPanel && not_editing",
-    "bindings": {
-      "ctrl-shift-c": "project_panel::CopyPath",
-      "ctrl-[": "project_panel::CollapseSelectedEntry",
-      "ctrl-b": "project_panel::CollapseSelectedEntry",
-      "ctrl-]": "project_panel::ExpandSelectedEntry",
-      "ctrl-f": "project_panel::ExpandSelectedEntry",
-      "a": "project_panel::NewFile",
-      "d": "project_panel::Duplicate",
-      "home": "menu::SelectFirst",
-      "end": "menu::SelectLast",
-      "shift-a": "project_panel::NewDirectory"
-    }
-  }
-]
diff --git a/assets/keymaps/macos/cursor.json b/assets/keymaps/macos/cursor.json
deleted file mode 100644
index 97abc7dd81..0000000000
--- a/assets/keymaps/macos/cursor.json
+++ /dev/null
@@ -1,84 +0,0 @@
-[
-  // Cursor for MacOS. See: https://docs.cursor.com/kbd
-  {
-    "context": "Workspace",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-i": "agent::ToggleFocus",
-      "cmd-shift-i": "agent::ToggleFocus",
-      "cmd-l": "agent::ToggleFocus",
-      "cmd-shift-l": "agent::ToggleFocus",
-      "cmd-shift-j": "agent::OpenSettings"
-    }
-  },
-  {
-    "context": "Editor && mode == full",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-i": "agent::ToggleFocus",
-      "cmd-shift-i": "agent::ToggleFocus",
-      "cmd-shift-l": "agent::AddSelectionToThread", // In cursor uses "Ask" mode
-      "cmd-l": "agent::AddSelectionToThread", // In cursor uses "Agent" mode
-      "cmd-k": "assistant::InlineAssist",
-      "cmd-shift-k": "assistant::InsertIntoEditor"
-    }
-  },
-  {
-    "context": "InlineAssistEditor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-shift-backspace": "editor::Cancel",
-      "cmd-enter": "menu::Confirm"
-      // "alt-enter": // Quick Question
-      // "cmd-shift-enter": // Full File Context
-      // "cmd-shift-k": // Toggle input focus (editor <> inline assist)
-    }
-  },
-  {
-    "context": "AgentPanel || ContextEditor || (MessageEditor > Editor)",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-i": "workspace::ToggleRightDock",
-      "cmd-shift-i": "workspace::ToggleRightDock",
-      "cmd-l": "workspace::ToggleRightDock",
-      "cmd-shift-l": "workspace::ToggleRightDock",
-      "cmd-w": "workspace::ToggleRightDock", // technically should close chat
-      "cmd-.": "agent::ToggleProfileSelector",
-      "cmd-/": "agent::ToggleModelSelector",
-      "cmd-shift-backspace": "editor::Cancel",
-      "cmd-r": "agent::NewThread",
-      "cmd-shift-v": "editor::Paste",
-      "cmd-shift-k": "assistant::InsertIntoEditor"
-      // "escape": "agent::ToggleFocus"
-      ///// Enable when Zed supports multiple thread tabs
-      // "cmd-t": // new thread tab
-      // "cmd-[": // next thread tab
-      // "cmd-]": // next thread tab
-      ///// Enable if Zed adds support for keyboard navigation of thread elements
-      // "tab": // cycle to next message
-      // "shift-tab": // cycle to previous message
-    }
-  },
-  {
-    "context": "Editor && editor_agent_diff",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-enter": "agent::KeepAll",
-      "cmd-backspace": "agent::RejectAll"
-    }
-  },
-  {
-    "context": "Editor && mode == full && edit_prediction",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-right": "editor::AcceptPartialEditPrediction"
-    }
-  },
-  {
-    "context": "Terminal",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-k": "assistant::InlineAssist"
-    }
-  }
-]
diff --git a/assets/keymaps/macos/emacs.json b/assets/keymaps/macos/emacs.json
deleted file mode 100755
index ea831c0c05..0000000000
--- a/assets/keymaps/macos/emacs.json
+++ /dev/null
@@ -1,203 +0,0 @@
-// documentation: https://zed.dev/docs/key-bindings
-//
-// To see the default key bindings run `zed: open default keymap`
-// from the command palette.
-[
-  {
-    "context": "!GitPanel",
-    "bindings": {
-      "ctrl-g": "menu::Cancel"
-    }
-  },
-  {
-    // Workaround to avoid falling back to default bindings.
-    // Unbind so Zed ignores these keys and lets emacs handle them.
-    // NOTE: must be declared before the `Editor` override.
-    "context": "Editor",
-    "bindings": {
-      "ctrl-g": null // currently activates `go_to_line::Toggle` when there is nothing to cancel
-    }
-  },
-  {
-    "context": "Editor",
-    "bindings": {
-      "ctrl-g": "editor::Cancel",
-      "alt-g g": "go_to_line::Toggle", // goto-line
-      "alt-g alt-g": "go_to_line::Toggle", // goto-line
-      "ctrl-space": "editor::SetMark", // set-mark
-      "ctrl-@": "editor::SetMark", // set-mark
-      "ctrl-x ctrl-x": "editor::SwapSelectionEnds", // exchange-point-and-mark
-      "ctrl-f": "editor::MoveRight", // forward-char
-      "ctrl-b": "editor::MoveLeft", // backward-char
-      "ctrl-n": "editor::MoveDown", // next-line
-      "ctrl-p": "editor::MoveUp", // previous-line
-      "home": ["editor::MoveToBeginningOfLine", { "stop_at_soft_wraps": false }], // move-beginning-of-line
-      "end": ["editor::MoveToEndOfLine", { "stop_at_soft_wraps": false }], // move-end-of-line
-      "ctrl-a": ["editor::MoveToBeginningOfLine", { "stop_at_soft_wraps": false }], // move-beginning-of-line
-      "ctrl-e": ["editor::MoveToEndOfLine", { "stop_at_soft_wraps": false }], // move-end-of-line
-      "shift-home": ["editor::SelectToBeginningOfLine", { "stop_at_soft_wraps": false }], // move-beginning-of-line
-      "shift-end": ["editor::SelectToEndOfLine", { "stop_at_soft_wraps": false }], // move-end-of-line
-      "alt-m": ["editor::MoveToBeginningOfLine", { "stop_at_soft_wraps": false, "stop_at_indent": true }], // back-to-indentation
-      "alt-left": "editor::MoveToPreviousWordStart", // left-word
-      "alt-right": "editor::MoveToNextWordEnd", // right-word
-      "alt-f": "editor::MoveToNextWordEnd", // forward-word
-      "alt-b": "editor::MoveToPreviousWordStart", // backward-word
-      "alt-u": "editor::ConvertToUpperCase", // upcase-word
-      "alt-l": "editor::ConvertToLowerCase", // downcase-word
-      "alt-c": "editor::ConvertToUpperCamelCase", // capitalize-word
-      "ctrl-t": "editor::Transpose", // transpose-chars
-      "alt-;": ["editor::ToggleComments", { "advance_downwards": false }],
-      "ctrl-x ctrl-;": "editor::ToggleComments",
-      "alt-.": "editor::GoToDefinition", // xref-find-definitions
-      "alt-?": "editor::FindAllReferences", // xref-find-references
-      "alt-,": "pane::GoBack", // xref-pop-marker-stack
-      "ctrl-x h": "editor::SelectAll", // mark-whole-buffer
-      "ctrl-d": "editor::Delete", // delete-char
-      "alt-d": ["editor::DeleteToNextWordEnd", { "ignore_newlines": false, "ignore_brackets": false }], // kill-word
-      "alt-backspace": "editor::DeleteToPreviousWordStart", // backward-kill-word
-      "alt-delete": "editor::DeleteToPreviousWordStart", // backward-kill-word
-      "ctrl-k": "editor::KillRingCut", // kill-line
-      "ctrl-w": "editor::Cut", // kill-region
-      "alt-w": "editor::Copy", // kill-ring-save
-      "ctrl-y": "editor::KillRingYank", // yank
-      "ctrl-_": "editor::Undo", // undo
-      "ctrl-/": "editor::Undo", // undo
-      "ctrl-x u": "editor::Undo", // undo
-      "alt-{": "editor::MoveToStartOfParagraph", // backward-paragraph
-      "alt-}": "editor::MoveToEndOfParagraph", // forward-paragraph
-      "ctrl-up": "editor::MoveToStartOfParagraph", // backward-paragraph
-      "ctrl-down": "editor::MoveToEndOfParagraph", // forward-paragraph
-      "ctrl-v": "editor::MovePageDown", // scroll-up
-      "alt-v": "editor::MovePageUp", // scroll-down
-      "ctrl-x [": "editor::MoveToBeginning", // beginning-of-buffer
-      "ctrl-x ]": "editor::MoveToEnd", // end-of-buffer
-      "alt-<": "editor::MoveToBeginning", // beginning-of-buffer
-      "alt->": "editor::MoveToEnd", // end-of-buffer
-      "ctrl-home": "editor::MoveToBeginning", // beginning-of-buffer
-      "ctrl-end": "editor::MoveToEnd", // end-of-buffer
-      "ctrl-l": "editor::ScrollCursorCenterTopBottom", // recenter-top-bottom
-      "ctrl-s": "buffer_search::Deploy", // isearch-forward
-      "ctrl-r": "buffer_search::Deploy", // isearch-backward
-      "alt-^": "editor::JoinLines", // join-line
-      "alt-q": "editor::Rewrap" // fill-paragraph
-    }
-  },
-  {
-    "context": "Editor && selection_mode", // region selection
-    "bindings": {
-      "right": "editor::SelectRight",
-      "left": "editor::SelectLeft",
-      "down": "editor::SelectDown",
-      "up": "editor::SelectUp",
-      "alt-left": "editor::SelectToPreviousWordStart",
-      "alt-right": "editor::SelectToNextWordEnd",
-      "pagedown": "editor::SelectPageDown",
-      "ctrl-v": "editor::SelectPageDown",
-      "pageup": "editor::SelectPageUp",
-      "alt-v": "editor::SelectPageUp",
-      "ctrl-f": "editor::SelectRight",
-      "ctrl-b": "editor::SelectLeft",
-      "ctrl-n": "editor::SelectDown",
-      "ctrl-p": "editor::SelectUp",
-      "home": ["editor::SelectToBeginningOfLine", { "stop_at_soft_wraps": false }],
-      "end": ["editor::SelectToEndOfLine", { "stop_at_soft_wraps": false }],
-      "ctrl-a": ["editor::SelectToBeginningOfLine", { "stop_at_soft_wraps": false }],
-      "ctrl-e": ["editor::SelectToEndOfLine", { "stop_at_soft_wraps": false }],
-      "alt-m": ["editor::SelectToBeginningOfLine", { "stop_at_soft_wraps": false, "stop_at_indent": true }],
-      "alt-f": "editor::SelectToNextWordEnd",
-      "alt-b": "editor::SelectToPreviousWordStart",
-      "alt-{": "editor::SelectToStartOfParagraph",
-      "alt-}": "editor::SelectToEndOfParagraph",
-      "ctrl-up": "editor::SelectToStartOfParagraph",
-      "ctrl-down": "editor::SelectToEndOfParagraph",
-      "ctrl-x [": "editor::SelectToBeginning",
-      "ctrl-x ]": "editor::SelectToEnd",
-      "alt-<": "editor::SelectToBeginning",
-      "alt->": "editor::SelectToEnd",
-      "ctrl-home": "editor::SelectToBeginning",
-      "ctrl-end": "editor::SelectToEnd",
-      "ctrl-g": "editor::Cancel"
-    }
-  },
-  {
-    "context": "Editor && (showing_code_actions || showing_completions)",
-    "bindings": {
-      "ctrl-p": "editor::ContextMenuPrevious",
-      "ctrl-n": "editor::ContextMenuNext"
-    }
-  },
-  {
-    "context": "Editor && showing_signature_help && !showing_completions",
-    "bindings": {
-      "ctrl-p": "editor::SignatureHelpPrevious",
-      "ctrl-n": "editor::SignatureHelpNext"
-    }
-  },
-  // Example setting for using emacs-style tab
-  // (i.e. indent the current line / selection or perform symbol completion depending on context)
-  // {
-  //   "context": "Editor && !showing_code_actions && !showing_completions",
-  //   "bindings": {
-  //     "tab": "editor::AutoIndent" // indent-for-tab-command
-  //   }
-  // },
-  {
-    "context": "Workspace",
-    "bindings": {
-      "alt-x": "command_palette::Toggle", // execute-extended-command
-      "ctrl-x b": "tab_switcher::Toggle", // switch-to-buffer
-      "ctrl-x ctrl-b": "tab_switcher::Toggle", // list-buffers
-      // "ctrl-x ctrl-c": "workspace::CloseWindow" // in case you only want to exit the current Zed instance
-      "ctrl-x ctrl-c": "zed::Quit", // save-buffers-kill-terminal
-      "ctrl-x 5 0": "workspace::CloseWindow", // delete-frame
-      "ctrl-x 5 2": "workspace::NewWindow", // make-frame-command
-      "ctrl-x o": "workspace::ActivateNextPane", // other-window
-      "ctrl-x k": "pane::CloseActiveItem", // kill-buffer
-      "ctrl-x 0": "pane::CloseActiveItem", // delete-window
-      // "ctrl-x 1": "pane::JoinAll", // in case you prefer to delete the splits but keep the buffers open
-      "ctrl-x 1": "pane::CloseOtherItems", // delete-other-windows
-      "ctrl-x 2": "pane::SplitDown", // split-window-below
-      "ctrl-x 3": "pane::SplitRight", // split-window-right
-      "ctrl-x ctrl-f": "file_finder::Toggle", // find-file
-      "ctrl-x ctrl-s": "workspace::Save", // save-buffer
-      "ctrl-x ctrl-w": "workspace::SaveAs", // write-file
-      "ctrl-x s": "workspace::SaveAll" // save-some-buffers
-    }
-  },
-  {
-    // Workaround to enable using native emacs from the Zed terminal.
-    // Unbind so Zed ignores these keys and lets emacs handle them.
-    // NOTE:
-    //  "terminal::SendKeystroke" only works for a single key stroke (e.g. ctrl-x),
-    //  so override with null for compound sequences (e.g. ctrl-x ctrl-c).
-    "context": "Terminal",
-    "bindings": {
-      // If you want to perfect your emacs-in-zed setup, also consider the following.
-      // You may need to enable "option_as_meta" from the Zed settings for "alt-x" to work.
-      // "alt-x": ["terminal::SendKeystroke", "alt-x"],
-      // "ctrl-x": ["terminal::SendKeystroke", "ctrl-x"],
-      // "ctrl-n": ["terminal::SendKeystroke", "ctrl-n"],
-      // ...
-      "ctrl-x ctrl-c": null, // save-buffers-kill-terminal
-      "ctrl-x ctrl-f": null, // find-file
-      "ctrl-x ctrl-s": null, // save-buffer
-      "ctrl-x ctrl-w": null, // write-file
-      "ctrl-x s": null // save-some-buffers
-    }
-  },
-  {
-    "context": "BufferSearchBar > Editor",
-    "bindings": {
-      "ctrl-s": "search::SelectNextMatch",
-      "ctrl-r": "search::SelectPreviousMatch",
-      "ctrl-g": "buffer_search::Dismiss"
-    }
-  },
-  {
-    "context": "Pane",
-    "bindings": {
-      "ctrl-alt-left": "pane::GoBack",
-      "ctrl-alt-right": "pane::GoForward"
-    }
-  }
-]
diff --git a/assets/keymaps/macos/jetbrains.json b/assets/keymaps/macos/jetbrains.json
deleted file mode 100644
index 364f489167..0000000000
--- a/assets/keymaps/macos/jetbrains.json
+++ /dev/null
@@ -1,188 +0,0 @@
-[
-  {
-    "bindings": {
-      "cmd-{": "pane::ActivatePreviousItem",
-      "cmd-}": "pane::ActivateNextItem",
-      "cmd-0": "git_panel::ToggleFocus", // overrides `cmd-0` zoom reset
-      "shift-escape": null, // Unmap workspace::zoom
-      "cmd-~": "git::Branch",
-      "ctrl-f2": "debugger::Stop",
-      "f6": "debugger::Pause",
-      "f7": "debugger::StepInto",
-      "f8": "debugger::StepOver",
-      "shift-f8": "debugger::StepOut",
-      "f9": "debugger::Continue",
-      "shift-f9": "debugger::Start",
-      "alt-shift-f9": "debugger::Start"
-    }
-  },
-  {
-    "context": "Editor",
-    "bindings": {
-      "ctrl->": ["zed::IncreaseBufferFontSize", { "persist": true }],
-      "ctrl-<": ["zed::DecreaseBufferFontSize", { "persist": true }],
-      "ctrl-shift-j": "editor::JoinLines",
-      "cmd-d": "editor::DuplicateSelection",
-      "cmd-backspace": "editor::DeleteLine",
-      "cmd-pagedown": "editor::MovePageDown",
-      "cmd-pageup": "editor::MovePageUp",
-      "ctrl-alt-shift-b": "editor::SelectToPreviousWordStart",
-      "cmd-alt-enter": "editor::NewlineAbove",
-      "shift-enter": "editor::NewlineBelow",
-      "cmd--": "editor::Fold",
-      "cmd-+": "editor::UnfoldLines",
-      "alt-shift-g": "editor::SplitSelectionIntoLines",
-      "ctrl-g": ["editor::SelectNext", { "replace_newest": false }],
-      "ctrl-cmd-g": ["editor::SelectPrevious", { "replace_newest": false }],
-      "cmd-/": ["editor::ToggleComments", { "advance_downwards": true }],
-      "alt-up": "editor::SelectLargerSyntaxNode",
-      "alt-down": "editor::SelectSmallerSyntaxNode",
-      "shift-alt-up": "editor::MoveLineUp",
-      "shift-alt-down": "editor::MoveLineDown",
-      "cmd-alt-l": "editor::Format",
-      "ctrl-alt-o": "editor::OrganizeImports",
-      "shift-f6": "editor::Rename",
-      "cmd-[": "pane::GoBack",
-      "cmd-]": "pane::GoForward",
-      "alt-f7": "editor::FindAllReferences",
-      "cmd-alt-f7": "editor::FindAllReferences",
-      "cmd-b": "editor::GoToDefinition", // Conflicts with workspace::ToggleLeftDock
-      "cmd-alt-b": "editor::GoToImplementation",
-      "cmd-shift-b": "editor::GoToTypeDefinition",
-      "cmd-alt-shift-b": "editor::GoToTypeDefinitionSplit",
-      "f2": "editor::GoToDiagnostic",
-      "shift-f2": "editor::GoToPreviousDiagnostic",
-      "ctrl-alt-shift-down": "editor::GoToHunk",
-      "ctrl-alt-shift-up": "editor::GoToPreviousHunk",
-      "cmd-home": "editor::MoveToBeginning",
-      "cmd-end": "editor::MoveToEnd",
-      "cmd-shift-home": "editor::SelectToBeginning",
-      "cmd-shift-end": "editor::SelectToEnd",
-      "ctrl-f8": "editor::ToggleBreakpoint",
-      "ctrl-shift-f8": "editor::EditLogBreakpoint",
-      "cmd-shift-u": "editor::ToggleCase"
-    }
-  },
-  {
-    "context": "Editor && mode == full",
-    "bindings": {
-      "cmd-f12": "outline::Toggle",
-      "cmd-r": ["buffer_search::Deploy", { "replace_enabled": true }],
-      "cmd-shift-o": "file_finder::Toggle",
-      "cmd-l": "go_to_line::Toggle",
-      "alt-enter": "editor::ToggleCodeActions",
-      "ctrl-space": "editor::ShowCompletions",
-      "cmd-j": "editor::Hover",
-      "cmd-p": "editor::ShowSignatureHelp",
-      "cmd-\\": "assistant::InlineAssist"
-    }
-  },
-  {
-    "context": "BufferSearchBar",
-    "bindings": {
-      "shift-enter": "search::SelectPreviousMatch"
-    }
-  },
-  {
-    "context": "BufferSearchBar || ProjectSearchBar",
-    "bindings": {
-      "alt-c": "search::ToggleCaseSensitive",
-      "alt-e": "search::ToggleSelection",
-      "alt-x": "search::ToggleRegex",
-      "alt-w": "search::ToggleWholeWord",
-      "ctrl-alt-c": "search::ToggleCaseSensitive",
-      "ctrl-alt-e": "search::ToggleSelection",
-      "ctrl-alt-w": "search::ToggleWholeWord",
-      "ctrl-alt-x": "search::ToggleRegex"
-    }
-  },
-  {
-    "context": "Workspace",
-    "bindings": {
-      "cmd-shift-f12": "workspace::ToggleAllDocks",
-      "cmd-shift-r": ["pane::DeploySearch", { "replace_enabled": true }],
-      "ctrl-alt-r": "task::Spawn",
-      "shift-f10": "task::Spawn",
-      "cmd-f5": "task::Rerun",
-      "cmd-e": "file_finder::Toggle",
-      "cmd-k": "git_panel::ToggleFocus", // bug: This should also focus commit editor
-      "cmd-shift-o": "file_finder::Toggle",
-      "cmd-shift-n": "file_finder::Toggle",
-      "cmd-n": "project_symbols::Toggle",
-      "cmd-shift-a": "command_palette::Toggle",
-      "shift shift": "command_palette::Toggle",
-      "cmd-alt-o": "project_symbols::Toggle", // JetBrains: Go to Symbol
-      "cmd-o": "project_symbols::Toggle", // JetBrains: Go to Class
-      "cmd-1": "project_panel::ToggleFocus",
-      "cmd-5": "debug_panel::ToggleFocus",
-      "cmd-6": "diagnostics::Deploy",
-      "cmd-7": "outline_panel::ToggleFocus"
-    }
-  },
-  {
-    "context": "Pane", // this is to override the default Pane mappings to switch tabs
-    "bindings": {
-      "cmd-1": "project_panel::ToggleFocus",
-      "cmd-2": null, // Bookmarks (left dock)
-      "cmd-3": null, // Find Panel (bottom dock)
-      "cmd-4": null, // Run Panel (bottom dock)
-      "cmd-5": "debug_panel::ToggleFocus",
-      "cmd-6": "diagnostics::Deploy",
-      "cmd-7": "outline_panel::ToggleFocus",
-      "cmd-8": null, // Services (bottom dock)
-      "cmd-9": null, // Git History (bottom dock)
-      "cmd-0": "git_panel::ToggleFocus"
-    }
-  },
-  {
-    "context": "Workspace || Editor",
-    "bindings": {
-      "alt-f12": "terminal_panel::Toggle",
-      "cmd-shift-k": "git::Push"
-    }
-  },
-  {
-    "context": "Pane",
-    "bindings": {
-      "cmd-alt-left": "pane::GoBack",
-      "cmd-alt-right": "pane::GoForward",
-      "alt-left": "pane::ActivatePreviousItem",
-      "alt-right": "pane::ActivateNextItem"
-    }
-  },
-  {
-    "context": "ProjectPanel",
-    "bindings": {
-      "enter": "project_panel::Open",
-      "cmd-shift-f": "project_panel::NewSearchInDirectory",
-      "cmd-backspace": ["project_panel::Trash", { "skip_prompt": false }],
-      "backspace": ["project_panel::Trash", { "skip_prompt": false }],
-      "delete": ["project_panel::Trash", { "skip_prompt": false }],
-      "shift-delete": ["project_panel::Delete", { "skip_prompt": false }],
-      "shift-f6": "project_panel::Rename"
-    }
-  },
-  {
-    "context": "Terminal",
-    "bindings": {
-      "cmd-t": "workspace::NewTerminal",
-      "alt-f12": "workspace::CloseActiveDock",
-      "cmd-up": "terminal::ScrollLineUp",
-      "cmd-down": "terminal::ScrollLineDown",
-      "shift-pageup": "terminal::ScrollPageUp",
-      "shift-pagedown": "terminal::ScrollPageDown"
-    }
-  },
-  { "context": "GitPanel", "bindings": { "cmd-0": "workspace::CloseActiveDock" } },
-  { "context": "ProjectPanel", "bindings": { "cmd-1": "workspace::CloseActiveDock" } },
-  { "context": "DebugPanel", "bindings": { "cmd-5": "workspace::CloseActiveDock" } },
-  { "context": "Diagnostics > Editor", "bindings": { "cmd-6": "pane::CloseActiveItem" } },
-  { "context": "OutlinePanel", "bindings": { "cmd-7": "workspace::CloseActiveDock" } },
-  {
-    "context": "Dock || Workspace || OutlinePanel || ProjectPanel || CollabPanel || (Editor && mode == auto_height)",
-    "bindings": {
-      "escape": "editor::ToggleFocus",
-      "shift-escape": "workspace::CloseActiveDock"
-    }
-  }
-]
diff --git a/assets/keymaps/macos/sublime_text.json b/assets/keymaps/macos/sublime_text.json
deleted file mode 100644
index d1bffca755..0000000000
--- a/assets/keymaps/macos/sublime_text.json
+++ /dev/null
@@ -1,101 +0,0 @@
-[
-  {
-    "bindings": {
-      "cmd-{": "pane::ActivatePreviousItem",
-      "cmd-}": "pane::ActivateNextItem",
-      "ctrl-pageup": "pane::ActivatePreviousItem",
-      "ctrl-pagedown": "pane::ActivateNextItem",
-      "ctrl-1": ["workspace::ActivatePane", 0],
-      "ctrl-2": ["workspace::ActivatePane", 1],
-      "ctrl-3": ["workspace::ActivatePane", 2],
-      "ctrl-4": ["workspace::ActivatePane", 3],
-      "ctrl-5": ["workspace::ActivatePane", 4],
-      "ctrl-6": ["workspace::ActivatePane", 5],
-      "ctrl-7": ["workspace::ActivatePane", 6],
-      "ctrl-8": ["workspace::ActivatePane", 7],
-      "ctrl-9": ["workspace::ActivatePane", 8],
-      "ctrl-!": ["workspace::MoveItemToPane", { "destination": 0, "focus": true }],
-      "ctrl-@": ["workspace::MoveItemToPane", { "destination": 1 }],
-      "ctrl-#": ["workspace::MoveItemToPane", { "destination": 2 }],
-      "ctrl-$": ["workspace::MoveItemToPane", { "destination": 3 }],
-      "ctrl-%": ["workspace::MoveItemToPane", { "destination": 4 }],
-      "ctrl-^": ["workspace::MoveItemToPane", { "destination": 5 }],
-      "ctrl-&": ["workspace::MoveItemToPane", { "destination": 6 }],
-      "ctrl-*": ["workspace::MoveItemToPane", { "destination": 7 }],
-      "ctrl-(": ["workspace::MoveItemToPane", { "destination": 8 }]
-    }
-  },
-  {
-    "context": "Editor",
-    "bindings": {
-      "ctrl-shift-up": ["editor::AddSelectionAbove", { "skip_soft_wrap": false }],
-      "ctrl-shift-down": ["editor::AddSelectionBelow", { "skip_soft_wrap": false }],
-      "cmd-ctrl-up": "editor::MoveLineUp",
-      "cmd-ctrl-down": "editor::MoveLineDown",
-      "cmd-shift-space": "editor::SelectAll",
-      "ctrl-shift-m": "editor::SelectLargerSyntaxNode",
-      "cmd-shift-l": "editor::SplitSelectionIntoLines",
-      "cmd-shift-a": "editor::SelectLargerSyntaxNode",
-      "cmd-shift-d": "editor::DuplicateSelection",
-      "ctrl-cmd-g": "editor::SelectAllMatches", // find_all_under
-      // "cmd-alt-g": "", // find_under (cancels any selections)
-      // "cmd-alt-shift-g": "" // find_under_prev (cancels any selections)
-      "f5": "editor::SortLinesCaseSensitive",
-      "ctrl-f5": "editor::SortLinesCaseInsensitive",
-      "shift-f12": "editor::FindAllReferences",
-      "alt-cmd-down": "editor::GoToDefinition",
-      "ctrl-alt-cmd-down": "editor::GoToDefinitionSplit",
-      "alt-shift-cmd-down": "editor::FindAllReferences",
-      "ctrl-.": "editor::GoToHunk",
-      "ctrl-,": "editor::GoToPreviousHunk",
-      "cmd-k cmd-u": "editor::ConvertToUpperCase",
-      "cmd-k cmd-l": "editor::ConvertToLowerCase",
-      "cmd-shift-j": "editor::JoinLines",
-      "shift-alt-m": "markdown::OpenPreviewToTheSide",
-      "ctrl-backspace": ["editor::DeleteToPreviousWordStart", { "ignore_newlines": false, "ignore_brackets": false }],
-      "ctrl-delete": ["editor::DeleteToNextWordEnd", { "ignore_newlines": false, "ignore_brackets": false }],
-      "ctrl-right": "editor::MoveToNextSubwordEnd",
-      "ctrl-left": "editor::MoveToPreviousSubwordStart",
-      "ctrl-shift-right": "editor::SelectToNextSubwordEnd",
-      "ctrl-shift-left": "editor::SelectToPreviousSubwordStart"
-    }
-  },
-  {
-    "context": "Editor && mode == full",
-    "bindings": {
-      "cmd-r": "outline::Toggle"
-    }
-  },
-  {
-    "context": "Editor && !agent_diff",
-    "bindings": {
-      "cmd-k cmd-z": "git::Restore"
-    }
-  },
-  {
-    "context": "Pane",
-    "bindings": {
-      "f4": "search::SelectNextMatch",
-      "shift-f4": "search::SelectPreviousMatch",
-      "cmd-1": ["pane::ActivateItem", 0],
-      "cmd-2": ["pane::ActivateItem", 1],
-      "cmd-3": ["pane::ActivateItem", 2],
-      "cmd-4": ["pane::ActivateItem", 3],
-      "cmd-5": ["pane::ActivateItem", 4],
-      "cmd-6": ["pane::ActivateItem", 5],
-      "cmd-7": ["pane::ActivateItem", 6],
-      "cmd-8": ["pane::ActivateItem", 7],
-      "cmd-9": "pane::ActivateLastItem"
-    }
-  },
-  {
-    "context": "Workspace",
-    "bindings": {
-      "cmd-k cmd-b": "workspace::ToggleLeftDock",
-      "cmd-t": "file_finder::Toggle",
-      "shift-cmd-r": "project_symbols::Toggle",
-      // Currently busted: https://github.com/zed-industries/feedback/issues/898
-      "ctrl-0": "project_panel::ToggleFocus"
-    }
-  }
-]
diff --git a/assets/keymaps/macos/textmate.json b/assets/keymaps/macos/textmate.json
deleted file mode 100644
index f91f39b7f5..0000000000
--- a/assets/keymaps/macos/textmate.json
+++ /dev/null
@@ -1,85 +0,0 @@
-[
-  {
-    "bindings": {
-      "cmd-shift-o": "projects::OpenRecent",
-      "cmd-alt-tab": "project_panel::ToggleFocus"
-    }
-  },
-  {
-    "context": "Editor && mode == full",
-    "bindings": {
-      "cmd-l": "go_to_line::Toggle",
-      "ctrl-shift-d": "editor::DuplicateLineDown",
-      "cmd-b": "editor::GoToDefinition",
-      "cmd-j": "editor::ScrollCursorCenter",
-      "cmd-enter": "editor::NewlineBelow",
-      "cmd-alt-enter": "editor::NewlineAbove",
-      "cmd-shift-l": "editor::SelectLine",
-      "cmd-shift-t": "outline::Toggle"
-    }
-  },
-  {
-    "context": "Editor",
-    "bindings": {
-      "alt-backspace": ["editor::DeleteToPreviousWordStart", { "ignore_newlines": false, "ignore_brackets": false }],
-      "alt-shift-backspace": ["editor::DeleteToNextWordEnd", { "ignore_newlines": false, "ignore_brackets": false }],
-      "alt-delete": ["editor::DeleteToNextWordEnd", { "ignore_newlines": false, "ignore_brackets": false }],
-      "alt-shift-delete": ["editor::DeleteToNextWordEnd", { "ignore_newlines": false, "ignore_brackets": false }],
-      "ctrl-backspace": "editor::DeleteToPreviousSubwordStart",
-      "ctrl-delete": "editor::DeleteToNextSubwordEnd",
-      "alt-left": ["editor::MoveToPreviousWordStart", { "stop_at_soft_wraps": true }],
-      "alt-right": ["editor::MoveToNextWordEnd", { "stop_at_soft_wraps": true }],
-      "ctrl-left": "editor::MoveToPreviousSubwordStart",
-      "ctrl-right": "editor::MoveToNextSubwordEnd",
-      "cmd-shift-left": "editor::SelectToBeginningOfLine",
-      "cmd-shift-right": "editor::SelectToEndOfLine",
-      "alt-shift-left": ["editor::SelectToPreviousWordStart", { "stop_at_soft_wraps": true }],
-      "alt-shift-right": ["editor::SelectToNextWordEnd", { "stop_at_soft_wraps": true }],
-      "ctrl-shift-left": "editor::SelectToPreviousSubwordStart",
-      "ctrl-shift-right": "editor::SelectToNextSubwordEnd",
-      "ctrl-w": "editor::SelectNext",
-      "ctrl-u": "editor::ConvertToUpperCase",
-      "ctrl-shift-u": "editor::ConvertToLowerCase",
-      "ctrl-alt-u": "editor::ConvertToUpperCamelCase",
-      "ctrl-_": "editor::ConvertToSnakeCase"
-    }
-  },
-  {
-    "context": "BufferSearchBar",
-    "bindings": {
-      "ctrl-s": "search::SelectNextMatch",
-      "ctrl-shift-s": "search::SelectPreviousMatch"
-    }
-  },
-  {
-    "context": "Workspace",
-    "bindings": {
-      "cmd-alt-ctrl-d": "workspace::ToggleLeftDock",
-      "cmd-t": "file_finder::Toggle",
-      "cmd-shift-t": "project_symbols::Toggle"
-    }
-  },
-  {
-    "context": "Pane",
-    "bindings": {
-      "alt-cmd-r": "search::ToggleRegex",
-      "ctrl-tab": "project_panel::ToggleFocus"
-    }
-  },
-  {
-    "context": "ProjectPanel",
-    "bindings": {
-      "cmd-backspace": ["project_panel::Trash", { "skip_prompt": true }],
-      "cmd-d": "project_panel::Duplicate",
-      "cmd-n": "project_panel::NewDirectory",
-      "return": "project_panel::Rename",
-      "cmd-c": "project_panel::Copy",
-      "cmd-v": "project_panel::Paste",
-      "cmd-alt-c": "project_panel::CopyPath"
-    }
-  },
-  {
-    "context": "Dock",
-    "bindings": {}
-  }
-]
diff --git a/assets/keymaps/storybook.json b/assets/keymaps/storybook.json
deleted file mode 100644
index 9b92fbe1a3..0000000000
--- a/assets/keymaps/storybook.json
+++ /dev/null
@@ -1,33 +0,0 @@
-[
-  // Standard macOS bindings
-  {
-    "bindings": {
-      "home": "menu::SelectFirst",
-      "shift-pageup": "menu::SelectFirst",
-      "pageup": "menu::SelectFirst",
-      "cmd-up": "menu::SelectFirst",
-      "end": "menu::SelectLast",
-      "shift-pagedown": "menu::SelectLast",
-      "pagedown": "menu::SelectLast",
-      "cmd-down": "menu::SelectLast",
-      "tab": "menu::SelectNext",
-      "ctrl-n": "menu::SelectNext",
-      "down": "menu::SelectNext",
-      "shift-tab": "menu::SelectPrevious",
-      "ctrl-p": "menu::SelectPrevious",
-      "up": "menu::SelectPrevious",
-      "enter": "menu::Confirm",
-      "ctrl-enter": "menu::SecondaryConfirm",
-      "cmd-enter": "menu::SecondaryConfirm",
-      "ctrl-escape": "menu::Cancel",
-      "cmd-escape": "menu::Cancel",
-      "ctrl-c": "menu::Cancel",
-      "escape": "menu::Cancel",
-      "cmd-q": "storybook::Quit",
-      "backspace": "editor::Backspace",
-      "delete": "editor::Delete",
-      "left": "editor::MoveLeft",
-      "right": "editor::MoveRight"
-    }
-  }
-]
diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
deleted file mode 100644
index 533db14a5f..0000000000
--- a/assets/keymaps/vim.json
+++ /dev/null
@@ -1,1059 +0,0 @@
-[
-  {
-    "context": "VimControl && !menu",
-    "bindings": {
-      "i": ["vim::PushObject", { "around": false }],
-      "a": ["vim::PushObject", { "around": true }],
-      "left": "vim::Left",
-      "h": "vim::Left",
-      "backspace": "vim::WrappingLeft",
-      "down": "vim::Down",
-      "ctrl-j": "vim::Down",
-      "j": "vim::Down",
-      "ctrl-m": "vim::NextLineStart",
-      "+": "vim::NextLineStart",
-      "enter": "vim::NextLineStart",
-      "-": "vim::PreviousLineStart",
-      "shift-tab": "vim::Tab",
-      "tab": "vim::Tab",
-      "up": "vim::Up",
-      "k": "vim::Up",
-      "right": "vim::Right",
-      "l": "vim::Right",
-      "space": "vim::WrappingRight",
-      "end": "vim::EndOfLine",
-      "$": "vim::EndOfLine",
-      "^": "vim::FirstNonWhitespace",
-      "_": "vim::StartOfLineDownward",
-      "g _": "vim::EndOfLineDownward",
-      "shift-g": "vim::EndOfDocument",
-      "{": "vim::StartOfParagraph",
-      "}": "vim::EndOfParagraph",
-      "(": "vim::SentenceBackward",
-      ")": "vim::SentenceForward",
-      "|": "vim::GoToColumn",
-
-      // Word motions
-      "w": "vim::NextWordStart",
-      "e": "vim::NextWordEnd",
-      "b": "vim::PreviousWordStart",
-      "g e": "vim::PreviousWordEnd",
-      // Subword motions
-      // "w": "vim::NextSubwordStart",
-      // "b": "vim::PreviousSubwordStart",
-      // "e": "vim::NextSubwordEnd",
-      // "g e": "vim::PreviousSubwordEnd",
-      "shift-w": ["vim::NextWordStart", { "ignore_punctuation": true }],
-      "shift-e": ["vim::NextWordEnd", { "ignore_punctuation": true }],
-      "shift-b": ["vim::PreviousWordStart", { "ignore_punctuation": true }],
-      "g shift-e": ["vim::PreviousWordEnd", { "ignore_punctuation": true }],
-      "/": "vim::Search",
-      "g /": "pane::DeploySearch",
-      "?": ["vim::Search", { "backwards": true }],
-      "*": "vim::MoveToNext",
-      "#": "vim::MoveToPrevious",
-      "n": "vim::MoveToNextMatch",
-      "shift-n": "vim::MoveToPreviousMatch",
-      "%": "vim::Matching",
-      "f": ["vim::PushFindForward", { "before": false, "multiline": false }],
-      "t": ["vim::PushFindForward", { "before": true, "multiline": false }],
-      "shift-f": ["vim::PushFindBackward", { "after": false, "multiline": false }],
-      "shift-t": ["vim::PushFindBackward", { "after": true, "multiline": false }],
-      "m": "vim::PushMark",
-      "'": ["vim::PushJump", { "line": true }],
-      "`": ["vim::PushJump", { "line": false }],
-      ";": "vim::RepeatFind",
-      ",": "vim::RepeatFindReversed",
-      "ctrl-o": "pane::GoBack",
-      "ctrl-i": "pane::GoForward",
-      "ctrl-]": "editor::GoToDefinition",
-      "escape": "vim::SwitchToNormalMode",
-      "ctrl-[": "vim::SwitchToNormalMode",
-      "v": "vim::ToggleVisual",
-      "shift-v": "vim::ToggleVisualLine",
-      "ctrl-g": "vim::ShowLocation",
-      "ctrl-v": "vim::ToggleVisualBlock",
-      "ctrl-q": "vim::ToggleVisualBlock",
-      "shift-k": "editor::Hover",
-      "shift-r": "vim::ToggleReplace",
-      "0": "vim::StartOfLine",
-      "home": "vim::StartOfLine",
-      "ctrl-f": "vim::PageDown",
-      "pagedown": "vim::PageDown",
-      "ctrl-b": "vim::PageUp",
-      "pageup": "vim::PageUp",
-      "ctrl-d": "vim::ScrollDown",
-      "ctrl-u": "vim::ScrollUp",
-      "ctrl-e": "vim::LineDown",
-      "ctrl-y": "vim::LineUp",
-      // "g" commands
-      "g shift-r": "vim::PushReplaceWithRegister",
-      "g r n": "editor::Rename",
-      "g r r": "editor::FindAllReferences",
-      "g r i": "editor::GoToImplementation",
-      "g r a": "editor::ToggleCodeActions",
-      "g g": "vim::StartOfDocument",
-      "g h": "editor::Hover",
-      "g B": "editor::BlameHover",
-      "g d": "editor::GoToDefinition",
-      "g shift-d": "editor::GoToDeclaration",
-      "g y": "editor::GoToTypeDefinition",
-      "g shift-i": "editor::GoToImplementation",
-      "g x": "editor::OpenUrl",
-      "g f": "editor::OpenSelectedFilename",
-      "g n": "vim::SelectNextMatch",
-      "g shift-n": "vim::SelectPreviousMatch",
-      "g l": "vim::SelectNext",
-      "g shift-l": "vim::SelectPrevious",
-      "g >": ["editor::SelectNext", { "replace_newest": true }],
-      "g <": ["editor::SelectPrevious", { "replace_newest": true }],
-      "g a": "editor::SelectAllMatches",
-      "g s": "outline::Toggle",
-      "g shift-o": "outline::Toggle",
-      "g shift-s": "project_symbols::Toggle",
-      "g .": "editor::ToggleCodeActions", // zed specific
-      "g shift-a": "editor::FindAllReferences", // zed specific
-      "g space": "editor::OpenExcerpts", // zed specific
-      "g *": ["vim::MoveToNext", { "partial_word": true }],
-      "g #": ["vim::MoveToPrevious", { "partial_word": true }],
-      "g j": ["vim::Down", { "display_lines": true }],
-      "g down": ["vim::Down", { "display_lines": true }],
-      "g k": ["vim::Up", { "display_lines": true }],
-      "g up": ["vim::Up", { "display_lines": true }],
-      "g $": ["vim::EndOfLine", { "display_lines": true }],
-      "g end": ["vim::EndOfLine", { "display_lines": true }],
-      "g 0": ["vim::StartOfLine", { "display_lines": true }],
-      "g home": ["vim::StartOfLine", { "display_lines": true }],
-      "g shift-m": ["vim::MiddleOfLine", { "display_lines": true }],
-      "g ^": ["vim::FirstNonWhitespace", { "display_lines": true }],
-      "g v": "vim::RestoreVisualSelection",
-      "g ]": "editor::GoToDiagnostic",
-      "g [": "editor::GoToPreviousDiagnostic",
-      "g i": "vim::InsertAtPrevious",
-      "g ,": "vim::ChangeListNewer",
-      "g ;": "vim::ChangeListOlder",
-      "shift-h": "vim::WindowTop",
-      "shift-m": "vim::WindowMiddle",
-      "shift-l": "vim::WindowBottom",
-      "q": "vim::ToggleRecord",
-      "shift-q": "vim::ReplayLastRecording",
-      "@": "vim::PushReplayRegister",
-      // z commands
-      "z enter": ["workspace::SendKeystrokes", "z t ^"],
-      "z -": ["workspace::SendKeystrokes", "z b ^"],
-      "z ^": ["workspace::SendKeystrokes", "shift-h k z b ^"],
-      "z +": ["workspace::SendKeystrokes", "shift-l j z t ^"],
-      "z t": "editor::ScrollCursorTop",
-      "z z": "editor::ScrollCursorCenter",
-      "z .": ["workspace::SendKeystrokes", "z z ^"],
-      "z b": "editor::ScrollCursorBottom",
-      "z a": "editor::ToggleFold",
-      "z shift-a": "editor::ToggleFoldRecursive",
-      "z c": "editor::Fold",
-      "z shift-c": "editor::FoldRecursive",
-      "z o": "editor::UnfoldLines",
-      "z shift-o": "editor::UnfoldRecursive",
-      "z f": "editor::FoldSelectedRanges",
-      "z shift-m": "editor::FoldAll",
-      "z shift-r": "editor::UnfoldAll",
-      "z l": "vim::ColumnRight",
-      "z h": "vim::ColumnLeft",
-      "z shift-l": "vim::HalfPageRight",
-      "z shift-h": "vim::HalfPageLeft",
-      "shift-z shift-q": ["pane::CloseActiveItem", { "save_intent": "skip" }],
-      "shift-z shift-z": ["pane::CloseActiveItem", { "save_intent": "save_all" }],
-      // Count support
-      "1": ["vim::Number", 1],
-      "2": ["vim::Number", 2],
-      "3": ["vim::Number", 3],
-      "4": ["vim::Number", 4],
-      "5": ["vim::Number", 5],
-      "6": ["vim::Number", 6],
-      "7": ["vim::Number", 7],
-      "8": ["vim::Number", 8],
-      "9": ["vim::Number", 9],
-      "ctrl-w d": "editor::GoToDefinitionSplit",
-      "ctrl-w g d": "editor::GoToDefinitionSplit",
-      "ctrl-w ]": "editor::GoToDefinitionSplit",
-      "ctrl-w ctrl-]": "editor::GoToDefinitionSplit",
-      "ctrl-w shift-d": "editor::GoToTypeDefinitionSplit",
-      "ctrl-w g shift-d": "editor::GoToTypeDefinitionSplit",
-      "ctrl-w space": "editor::OpenExcerptsSplit",
-      "ctrl-w g space": "editor::OpenExcerptsSplit",
-      "ctrl-^": "pane::AlternateFile",
-      ".": "vim::Repeat"
-    }
-  },
-  {
-    "context": "vim_mode == normal || vim_mode == visual || vim_mode == operator",
-    "bindings": {
-      "] ]": "vim::NextSectionStart",
-      "] [": "vim::NextSectionEnd",
-      "[ [": "vim::PreviousSectionStart",
-      "[ ]": "vim::PreviousSectionEnd",
-      "] m": "vim::NextMethodStart",
-      "] shift-m": "vim::NextMethodEnd",
-      "[ m": "vim::PreviousMethodStart",
-      "[ shift-m": "vim::PreviousMethodEnd",
-      "[ *": "vim::PreviousComment",
-      "[ /": "vim::PreviousComment",
-      "] *": "vim::NextComment",
-      "] /": "vim::NextComment",
-      "[ -": "vim::PreviousLesserIndent",
-      "[ +": "vim::PreviousGreaterIndent",
-      "[ =": "vim::PreviousSameIndent",
-      "] -": "vim::NextLesserIndent",
-      "] +": "vim::NextGreaterIndent",
-      "] =": "vim::NextSameIndent",
-      "] b": "pane::ActivateNextItem",
-      "[ b": "pane::ActivatePreviousItem",
-      "] shift-b": "pane::ActivateLastItem",
-      "[ shift-b": ["pane::ActivateItem", 0],
-      "] space": "vim::InsertEmptyLineBelow",
-      "[ space": "vim::InsertEmptyLineAbove",
-      "[ e": "editor::MoveLineUp",
-      "] e": "editor::MoveLineDown",
-      "[ f": "workspace::FollowNextCollaborator",
-      "] f": "workspace::FollowNextCollaborator",
-      "] }": ["vim::UnmatchedForward", { "char": "}" }],
-      "[ {": ["vim::UnmatchedBackward", { "char": "{" }],
-      "] )": ["vim::UnmatchedForward", { "char": ")" }],
-      "[ (": ["vim::UnmatchedBackward", { "char": "(" }],
-      "[ r": "vim::GoToPreviousReference",
-      "] r": "vim::GoToNextReference",
-      // tree-sitter related commands
-      "[ x": "vim::SelectLargerSyntaxNode",
-      "] x": "vim::SelectSmallerSyntaxNode"
-    }
-  },
-  {
-    "context": "vim_mode == normal",
-    "bindings": {
-      "i": "vim::InsertBefore",
-      "a": "vim::InsertAfter",
-      "ctrl-[": "editor::Cancel",
-      ":": "command_palette::Toggle",
-      "c": "vim::PushChange",
-      "shift-c": "vim::ChangeToEndOfLine",
-      "d": "vim::PushDelete",
-      "delete": "vim::DeleteRight",
-      "g shift-j": "vim::JoinLinesNoWhitespace",
-      "y": "vim::PushYank",
-      "shift-y": "vim::YankLine",
-      "x": "vim::DeleteRight",
-      "shift-x": "vim::DeleteLeft",
-      "ctrl-a": "vim::Increment",
-      "ctrl-x": "vim::Decrement",
-      "ctrl-r": "vim::Redo",
-      ">": "vim::PushIndent",
-      "<": "vim::PushOutdent",
-      "=": "vim::PushAutoIndent",
-      "!": "vim::PushShellCommand",
-      "g u": "vim::PushLowercase",
-      "g shift-u": "vim::PushUppercase",
-      "g ~": "vim::PushOppositeCase",
-      "g ?": "vim::PushRot13",
-      // "g ?": "vim::PushRot47",
-      "g w": "vim::PushRewrap",
-      "g q": "vim::PushRewrap",
-      "insert": "vim::InsertBefore",
-      "] d": "editor::GoToDiagnostic",
-      "[ d": "editor::GoToPreviousDiagnostic",
-      "] c": "editor::GoToHunk",
-      "[ c": "editor::GoToPreviousHunk",
-      "g c": "vim::PushToggleComments"
-    }
-  },
-  {
-    "context": "VimControl && VimCount",
-    "bindings": {
-      "0": ["vim::Number", 0],
-      ":": "vim::CountCommand",
-      "%": "vim::GoToPercentage"
-    }
-  },
-  {
-    "context": "vim_mode == visual",
-    "bindings": {
-      ":": "vim::VisualCommand",
-      "u": "vim::ConvertToLowerCase",
-      "shift-u": "vim::ConvertToUpperCase",
-      "shift-o": "vim::OtherEnd",
-      "o": "vim::OtherEndRowAware",
-      "d": "vim::VisualDelete",
-      "x": "vim::VisualDelete",
-      "delete": "vim::VisualDelete",
-      "shift-d": "vim::VisualDeleteLine",
-      "shift-x": "vim::VisualDeleteLine",
-      "y": "vim::VisualYank",
-      "shift-y": "vim::VisualYankLine",
-      "p": "vim::Paste",
-      "shift-p": ["vim::Paste", { "preserve_clipboard": true }],
-      "c": "vim::Substitute",
-      "s": "vim::Substitute",
-      "shift-r": "vim::SubstituteLine",
-      "shift-s": "vim::SubstituteLine",
-      "~": "vim::ChangeCase",
-      "*": ["vim::MoveToNext", { "partial_word": true }],
-      "#": ["vim::MoveToPrevious", { "partial_word": true }],
-      "ctrl-a": "vim::Increment",
-      "ctrl-x": "vim::Decrement",
-      "g ctrl-a": ["vim::Increment", { "step": true }],
-      "g ctrl-x": ["vim::Decrement", { "step": true }],
-      "shift-i": "vim::InsertBefore",
-      "shift-a": "vim::InsertAfter",
-      "g shift-i": "vim::VisualInsertFirstNonWhiteSpace",
-      "g shift-a": "vim::VisualInsertEndOfLine",
-      "shift-j": "vim::JoinLines",
-      "g shift-j": "vim::JoinLinesNoWhitespace",
-      "r": "vim::PushReplace",
-      "ctrl-c": "vim::SwitchToNormalMode",
-      "ctrl-[": "vim::SwitchToNormalMode",
-      "escape": "vim::SwitchToNormalMode",
-      ">": "vim::Indent",
-      "<": "vim::Outdent",
-      "=": "vim::AutoIndent",
-      "!": "vim::ShellCommand",
-      "i": ["vim::PushObject", { "around": false }],
-      "a": ["vim::PushObject", { "around": true }],
-      "g shift-r": ["vim::Paste", { "preserve_clipboard": true }],
-      "g c": "vim::ToggleComments",
-      "g q": "vim::Rewrap",
-      "g w": "vim::Rewrap",
-      "g ?": "vim::ConvertToRot13",
-      // "g ?": "vim::ConvertToRot47",
-      "\"": "vim::PushRegister"
-    }
-  },
-  {
-    "context": "vim_mode == helix_select",
-    "bindings": {
-      "v": "vim::NormalBefore",
-      ";": "vim::HelixCollapseSelection",
-      "~": "vim::ChangeCase",
-      "ctrl-a": "vim::Increment",
-      "ctrl-x": "vim::Decrement",
-      "shift-j": "vim::JoinLines",
-      "i": "vim::InsertBefore",
-      "a": "vim::InsertAfter",
-      "p": "vim::Paste",
-      "u": "vim::Undo",
-      "r": "vim::PushReplace",
-      "s": "vim::Substitute",
-      "ctrl-pageup": "pane::ActivatePreviousItem",
-      "ctrl-pagedown": "pane::ActivateNextItem",
-      ".": "vim::Repeat",
-      "alt-.": "vim::RepeatFind"
-    }
-  },
-  {
-    "context": "vim_mode == insert",
-    "bindings": {
-      "ctrl-c": "vim::NormalBefore",
-      "ctrl-[": "vim::NormalBefore",
-      "escape": "vim::NormalBefore",
-      "ctrl-x": null,
-      "ctrl-x ctrl-o": "editor::ShowCompletions",
-      "ctrl-x ctrl-a": "assistant::InlineAssist", // zed specific
-      "ctrl-x ctrl-c": "editor::ShowEditPrediction", // zed specific
-      "ctrl-x ctrl-l": "editor::ToggleCodeActions", // zed specific
-      "ctrl-x ctrl-z": "editor::Cancel",
-      "ctrl-x ctrl-e": "vim::LineDown",
-      "ctrl-x ctrl-y": "vim::LineUp",
-      "ctrl-w": ["editor::DeleteToPreviousWordStart", { "ignore_newlines": false, "ignore_brackets": false }],
-      "ctrl-u": "editor::DeleteToBeginningOfLine",
-      "ctrl-t": "vim::Indent",
-      "ctrl-d": "vim::Outdent",
-      "ctrl-y": "vim::InsertFromAbove",
-      "ctrl-e": "vim::InsertFromBelow",
-      "ctrl-k": ["vim::PushDigraph", {}],
-      "ctrl-v": ["vim::PushLiteral", {}],
-      "ctrl-shift-v": "editor::Paste", // note: this is *very* similar to ctrl-v in vim, but ctrl-shift-v on linux is the typical shortcut for paste when ctrl-v is already in use.
-      "ctrl-q": ["vim::PushLiteral", {}],
-      "ctrl-shift-q": ["vim::PushLiteral", {}],
-      "ctrl-r": "vim::PushRegister",
-      "insert": "vim::ToggleReplace",
-      "ctrl-o": "vim::TemporaryNormal",
-      "ctrl-s": "editor::ShowSignatureHelp"
-    }
-  },
-  {
-    "context": "showing_completions",
-    "bindings": {
-      "ctrl-d": "vim::ScrollDown",
-      "ctrl-u": "vim::ScrollUp",
-      "ctrl-e": "vim::LineDown",
-      "ctrl-y": "vim::LineUp"
-    }
-  },
-  {
-    "context": "(vim_mode == normal || vim_mode == helix_normal) && !menu",
-    "bindings": {
-      "escape": "editor::Cancel",
-      "shift-d": "vim::DeleteToEndOfLine",
-      "shift-j": "vim::JoinLines",
-      "shift-y": "vim::YankLine",
-      "shift-i": "vim::InsertFirstNonWhitespace",
-      "shift-a": "vim::InsertEndOfLine",
-      "o": "vim::InsertLineBelow",
-      "shift-o": "vim::InsertLineAbove",
-      "~": "vim::ChangeCase",
-      "ctrl-a": "vim::Increment",
-      "ctrl-x": "vim::Decrement",
-      "p": "vim::Paste",
-      "shift-p": ["vim::Paste", { "before": true }],
-      "u": "vim::Undo",
-      "shift-u": "vim::UndoLastLine",
-      "r": "vim::PushReplace",
-      "s": "vim::Substitute",
-      "shift-s": "vim::SubstituteLine",
-      "\"": "vim::PushRegister",
-      "ctrl-pagedown": "pane::ActivateNextItem",
-      "ctrl-pageup": "pane::ActivatePreviousItem"
-    }
-  },
-  {
-    "context": "VimControl && vim_mode == helix_normal && !menu",
-    "bindings": {
-      "escape": "vim::SwitchToHelixNormalMode",
-      "i": "vim::HelixInsert",
-      "a": "vim::HelixAppend",
-      "ctrl-[": "editor::Cancel"
-    }
-  },
-  {
-    "context": "vim_mode == helix_select && !menu",
-    "bindings": {
-      "escape": "vim::SwitchToHelixNormalMode"
-    }
-  },
-  {
-    "context": "(vim_mode == helix_normal || vim_mode == helix_select) && !menu",
-    "bindings": {
-      // Movement
-      "h": "vim::WrappingLeft",
-      "left": "vim::WrappingLeft",
-      "l": "vim::WrappingRight",
-      "right": "vim::WrappingRight",
-      "t": ["vim::PushFindForward", { "before": true, "multiline": true }],
-      "f": ["vim::PushFindForward", { "before": false, "multiline": true }],
-      "shift-t": ["vim::PushFindBackward", { "after": true, "multiline": true }],
-      "shift-f": ["vim::PushFindBackward", { "after": false, "multiline": true }],
-      "alt-.": "vim::RepeatFind",
-
-      // Changes
-      "shift-r": "editor::Paste",
-      "`": "vim::ConvertToLowerCase",
-      "alt-`": "vim::ConvertToUpperCase",
-      "insert": "vim::InsertBefore",
-      "shift-u": "editor::Redo",
-      "ctrl-r": "vim::Redo",
-      "y": "vim::HelixYank",
-      "p": "vim::HelixPaste",
-      "shift-p": ["vim::HelixPaste", { "before": true }],
-      ">": "vim::Indent",
-      "<": "vim::Outdent",
-      "=": "vim::AutoIndent",
-      "d": "vim::HelixDelete",
-      "alt-d": "editor::Delete", // Delete selection, without yanking
-      "c": "vim::HelixSubstitute",
-      "alt-c": "vim::HelixSubstituteNoYank",
-
-      // Selection manipulation
-      "s": "vim::HelixSelectRegex",
-      "alt-s": ["editor::SplitSelectionIntoLines", { "keep_selections": true }],
-      ";": "vim::HelixCollapseSelection",
-      "alt-;": "vim::OtherEnd",
-      ",": "vim::HelixKeepNewestSelection",
-      "shift-c": "vim::HelixDuplicateBelow",
-      "alt-shift-c": "vim::HelixDuplicateAbove",
-      "%": "editor::SelectAll",
-      "x": "vim::HelixSelectLine",
-      "shift-x": "editor::SelectLine",
-      "ctrl-c": "editor::ToggleComments",
-      "alt-o": "editor::SelectLargerSyntaxNode",
-      "alt-i": "editor::SelectSmallerSyntaxNode",
-      "alt-p": "editor::SelectPreviousSyntaxNode",
-      "alt-n": "editor::SelectNextSyntaxNode",
-
-      "n": "vim::HelixSelectNext",
-      "shift-n": "vim::HelixSelectPrevious",
-
-      // Goto mode
-      "g e": "vim::EndOfDocument",
-      "g h": "vim::StartOfLine",
-      "g l": "vim::EndOfLine",
-      "g s": "vim::FirstNonWhitespace", // "g s" default behavior is "space s"
-      "g t": "vim::WindowTop",
-      "g c": "vim::WindowMiddle",
-      "g b": "vim::WindowBottom",
-      "g r": "editor::FindAllReferences", // zed specific
-      "g n": "pane::ActivateNextItem",
-      "shift-l": "pane::ActivateNextItem",
-      "g p": "pane::ActivatePreviousItem",
-      "shift-h": "pane::ActivatePreviousItem",
-      "g .": "vim::HelixGotoLastModification", // go to last modification
-
-      // Window mode
-      "space w h": "workspace::ActivatePaneLeft",
-      "space w l": "workspace::ActivatePaneRight",
-      "space w k": "workspace::ActivatePaneUp",
-      "space w j": "workspace::ActivatePaneDown",
-      "space w q": "pane::CloseActiveItem",
-      "space w s": "pane::SplitRight",
-      "space w r": "pane::SplitRight",
-      "space w v": "pane::SplitDown",
-      "space w d": "pane::SplitDown",
-
-      // Space mode
-      "space f": "file_finder::Toggle",
-      "space k": "editor::Hover",
-      "space s": "outline::Toggle",
-      "space shift-s": "project_symbols::Toggle",
-      "space d": "editor::GoToDiagnostic",
-      "space r": "editor::Rename",
-      "space a": "editor::ToggleCodeActions",
-      "space h": "editor::SelectAllMatches",
-      "space c": "editor::ToggleComments",
-      "space p": "editor::Paste",
-      "space y": "editor::Copy",
-
-      // Other
-      ":": "command_palette::Toggle",
-      "m": "vim::PushHelixMatch",
-      "]": ["vim::PushHelixNext", { "around": true }],
-      "[": ["vim::PushHelixPrevious", { "around": true }],
-      "g q": "vim::PushRewrap",
-      "g w": "vim::PushRewrap"
-      // "tab": "pane::ActivateNextItem",
-      // "shift-tab": "pane::ActivatePrevItem",
-    }
-  },
-  {
-    "context": "vim_mode == insert && !(showing_code_actions || showing_completions)",
-    "bindings": {
-      "ctrl-p": "editor::ShowWordCompletions",
-      "ctrl-n": "editor::ShowWordCompletions"
-    }
-  },
-  {
-    "context": "(vim_mode == insert || vim_mode == normal) && showing_signature_help && !showing_completions",
-    "bindings": {
-      "ctrl-p": "editor::SignatureHelpPrevious",
-      "ctrl-n": "editor::SignatureHelpNext"
-    }
-  },
-  {
-    "context": "vim_mode == replace",
-    "bindings": {
-      "ctrl-c": "vim::NormalBefore",
-      "ctrl-[": "vim::NormalBefore",
-      "escape": "vim::NormalBefore",
-      "ctrl-k": ["vim::PushDigraph", {}],
-      "ctrl-v": ["vim::PushLiteral", {}],
-      "ctrl-shift-v": "editor::Paste", // note: this is *very* similar to ctrl-v in vim, but ctrl-shift-v on linux is the typical shortcut for paste when ctrl-v is already in use.
-      "ctrl-q": ["vim::PushLiteral", {}],
-      "ctrl-shift-q": ["vim::PushLiteral", {}],
-      "backspace": "vim::UndoReplace",
-      "tab": "vim::Tab",
-      "enter": "vim::Enter",
-      "insert": "vim::InsertBefore"
-    }
-  },
-  {
-    "context": "vim_mode == waiting",
-    "bindings": {
-      "tab": "vim::Tab",
-      "enter": "vim::Enter",
-      "ctrl-c": "vim::ClearOperators",
-      "ctrl-[": "vim::ClearOperators",
-      "escape": "vim::ClearOperators",
-      "ctrl-k": ["vim::PushDigraph", {}],
-      "ctrl-v": ["vim::PushLiteral", {}],
-      "ctrl-q": ["vim::PushLiteral", {}]
-    }
-  },
-  {
-    "context": "Editor && vim_mode == waiting && (vim_operator == ys || vim_operator == cs)",
-    "bindings": {
-      "escape": "vim::SwitchToNormalMode"
-    }
-  },
-  {
-    "context": "vim_mode == operator",
-    "bindings": {
-      "ctrl-c": "vim::ClearOperators",
-      "ctrl-[": "vim::ClearOperators",
-      "escape": "vim::ClearOperators",
-      "g c": "vim::Comment"
-    }
-  },
-  {
-    "context": "vim_operator == a || vim_operator == i || vim_operator == cs || vim_operator == helix_next || vim_operator == helix_previous",
-    "bindings": {
-      "w": "vim::Word",
-      "shift-w": ["vim::Word", { "ignore_punctuation": true }],
-      // Subword TextObject
-      // "w": "vim::Subword",
-      // "shift-w": ["vim::Subword", { "ignore_punctuation": true }],
-      "t": "vim::Tag",
-      "s": "vim::Sentence",
-      "p": "vim::Paragraph",
-      "'": "vim::Quotes",
-      "`": "vim::BackQuotes",
-      "\"": "vim::DoubleQuotes",
-      // "q": "vim::AnyQuotes",
-      "q": "vim::MiniQuotes",
-      "|": "vim::VerticalBars",
-      "(": ["vim::Parentheses", { "opening": true }],
-      ")": "vim::Parentheses",
-      "b": "vim::Parentheses",
-      // "b": "vim::AnyBrackets",
-      // "b": "vim::MiniBrackets",
-      "[": ["vim::SquareBrackets", { "opening": true }],
-      "]": "vim::SquareBrackets",
-      "r": "vim::SquareBrackets",
-      "{": ["vim::CurlyBrackets", { "opening": true }],
-      "}": "vim::CurlyBrackets",
-      "shift-b": "vim::CurlyBrackets",
-      "<": ["vim::AngleBrackets", { "opening": true }],
-      ">": "vim::AngleBrackets",
-      "a": "vim::Argument",
-      "i": "vim::IndentObj",
-      "shift-i": ["vim::IndentObj", { "include_below": true }],
-      "f": "vim::Method",
-      "c": "vim::Class",
-      "e": "vim::EntireFile"
-    }
-  },
-  {
-    "context": "vim_operator == helix_m",
-    "bindings": {
-      "m": "vim::Matching"
-    }
-  },
-  {
-    "context": "vim_operator == helix_next",
-    "bindings": {
-      "z": "vim::NextSectionStart",
-      "shift-z": "vim::NextSectionEnd",
-      "*": "vim::NextComment",
-      "/": "vim::NextComment",
-      "-": "vim::NextLesserIndent",
-      "+": "vim::NextGreaterIndent",
-      "=": "vim::NextSameIndent",
-      "b": "pane::ActivateNextItem",
-      "shift-b": "pane::ActivateLastItem",
-      "x": "editor::SelectSmallerSyntaxNode",
-      "d": "editor::GoToDiagnostic",
-      "c": "editor::GoToHunk",
-      "space": "vim::InsertEmptyLineBelow"
-    }
-  },
-  {
-    "context": "vim_operator == helix_previous",
-    "bindings": {
-      "z": "vim::PreviousSectionStart",
-      "shift-z": "vim::PreviousSectionEnd",
-      "*": "vim::PreviousComment",
-      "/": "vim::PreviousComment",
-      "-": "vim::PreviousLesserIndent",
-      "+": "vim::PreviousGreaterIndent",
-      "=": "vim::PreviousSameIndent",
-      "b": "pane::ActivatePreviousItem",
-      "shift-b": ["pane::ActivateItem", 0],
-      "x": "editor::SelectLargerSyntaxNode",
-      "d": "editor::GoToPreviousDiagnostic",
-      "c": "editor::GoToPreviousHunk",
-      "space": "vim::InsertEmptyLineAbove"
-    }
-  },
-  {
-    "context": "vim_operator == c",
-    "bindings": {
-      "c": "vim::CurrentLine",
-      "x": "vim::Exchange",
-      "d": "editor::Rename", // zed specific
-      "s": ["vim::PushChangeSurrounds", {}]
-    }
-  },
-  {
-    "context": "vim_operator == d",
-    "bindings": {
-      "d": "vim::CurrentLine",
-      "s": "vim::PushDeleteSurrounds",
-      "v": "vim::PushForcedMotion", // "d v"
-      "o": "editor::ToggleSelectedDiffHunks", // "d o"
-      "shift-o": "git::ToggleStaged",
-      "p": "git::Restore", // "d p"
-      "u": "git::StageAndNext", // "d u"
-      "shift-u": "git::UnstageAndNext" // "d shift-u"
-    }
-  },
-  {
-    "context": "vim_operator == gu",
-    "bindings": {
-      "g u": "vim::CurrentLine",
-      "u": "vim::CurrentLine"
-    }
-  },
-  {
-    "context": "vim_operator == gU",
-    "bindings": {
-      "g shift-u": "vim::CurrentLine",
-      "shift-u": "vim::CurrentLine"
-    }
-  },
-  {
-    "context": "vim_operator == g~",
-    "bindings": {
-      "g ~": "vim::CurrentLine",
-      "~": "vim::CurrentLine"
-    }
-  },
-  {
-    "context": "vim_operator == g?",
-    "bindings": {
-      "g ?": "vim::CurrentLine",
-      "?": "vim::CurrentLine"
-    }
-  },
-  {
-    "context": "vim_operator == gq",
-    "bindings": {
-      "g q": "vim::CurrentLine",
-      "q": "vim::CurrentLine",
-      "g w": "vim::CurrentLine",
-      "w": "vim::CurrentLine"
-    }
-  },
-  {
-    "context": "vim_operator == y",
-    "bindings": {
-      "y": "vim::CurrentLine",
-      "v": "vim::PushForcedMotion",
-      "s": ["vim::PushAddSurrounds", {}]
-    }
-  },
-  {
-    "context": "vim_operator == ys",
-    "bindings": {
-      "s": "vim::CurrentLine"
-    }
-  },
-  {
-    "context": "vim_operator == >",
-    "bindings": {
-      ">": "vim::CurrentLine"
-    }
-  },
-  {
-    "context": "vim_operator == <",
-    "bindings": {
-      "<": "vim::CurrentLine"
-    }
-  },
-  {
-    "context": "vim_operator == eq",
-    "bindings": {
-      "=": "vim::CurrentLine"
-    }
-  },
-  {
-    "context": "vim_operator == sh",
-    "bindings": {
-      "!": "vim::CurrentLine"
-    }
-  },
-  {
-    "context": "vim_operator == gc",
-    "bindings": {
-      "c": "vim::CurrentLine"
-    }
-  },
-  {
-    "context": "vim_operator == gR",
-    "bindings": {
-      "r": "vim::CurrentLine",
-      "shift-r": "vim::CurrentLine"
-    }
-  },
-  {
-    "context": "vim_operator == cx",
-    "bindings": {
-      "x": "vim::CurrentLine",
-      "c": "vim::ClearExchange"
-    }
-  },
-  {
-    "context": "vim_mode == literal",
-    "bindings": {
-      "ctrl-@": ["vim::Literal", ["ctrl-@", "\u0000"]],
-      "ctrl-a": ["vim::Literal", ["ctrl-a", "\u0001"]],
-      "ctrl-b": ["vim::Literal", ["ctrl-b", "\u0002"]],
-      "ctrl-c": ["vim::Literal", ["ctrl-c", "\u0003"]],
-      "ctrl-d": ["vim::Literal", ["ctrl-d", "\u0004"]],
-      "ctrl-e": ["vim::Literal", ["ctrl-e", "\u0005"]],
-      "ctrl-f": ["vim::Literal", ["ctrl-f", "\u0006"]],
-      "ctrl-g": ["vim::Literal", ["ctrl-g", "\u0007"]],
-      "ctrl-h": ["vim::Literal", ["ctrl-h", "\u0008"]],
-      "ctrl-i": ["vim::Literal", ["ctrl-i", "\u0009"]],
-      "ctrl-j": ["vim::Literal", ["ctrl-j", "\u000A"]],
-      "ctrl-k": ["vim::Literal", ["ctrl-k", "\u000B"]],
-      "ctrl-l": ["vim::Literal", ["ctrl-l", "\u000C"]],
-      "ctrl-m": ["vim::Literal", ["ctrl-m", "\u000D"]],
-      "ctrl-n": ["vim::Literal", ["ctrl-n", "\u000E"]],
-      "ctrl-o": ["vim::Literal", ["ctrl-o", "\u000F"]],
-      "ctrl-p": ["vim::Literal", ["ctrl-p", "\u0010"]],
-      "ctrl-q": ["vim::Literal", ["ctrl-q", "\u0011"]],
-      "ctrl-r": ["vim::Literal", ["ctrl-r", "\u0012"]],
-      "ctrl-s": ["vim::Literal", ["ctrl-s", "\u0013"]],
-      "ctrl-t": ["vim::Literal", ["ctrl-t", "\u0014"]],
-      "ctrl-u": ["vim::Literal", ["ctrl-u", "\u0015"]],
-      "ctrl-v": ["vim::Literal", ["ctrl-v", "\u0016"]],
-      "ctrl-w": ["vim::Literal", ["ctrl-w", "\u0017"]],
-      "ctrl-x": ["vim::Literal", ["ctrl-x", "\u0018"]],
-      "ctrl-y": ["vim::Literal", ["ctrl-y", "\u0019"]],
-      "ctrl-z": ["vim::Literal", ["ctrl-z", "\u001A"]],
-      "ctrl-[": ["vim::Literal", ["ctrl-[", "\u001B"]],
-      "ctrl-\\": ["vim::Literal", ["ctrl-\\", "\u001C"]],
-      "ctrl-]": ["vim::Literal", ["ctrl-]", "\u001D"]],
-      "ctrl-^": ["vim::Literal", ["ctrl-^", "\u001E"]],
-      "ctrl-_": ["vim::Literal", ["ctrl-_", "\u001F"]],
-      "escape": ["vim::Literal", ["escape", "\u001B"]],
-      "enter": ["vim::Literal", ["enter", "\u000D"]],
-      "tab": ["vim::Literal", ["tab", "\u0009"]],
-      // zed extensions:
-      "backspace": ["vim::Literal", ["backspace", "\u0008"]],
-      "delete": ["vim::Literal", ["delete", "\u007F"]]
-    }
-  },
-  {
-    "context": "BufferSearchBar && !in_replace",
-    "bindings": {
-      "enter": "vim::SearchSubmit",
-      "escape": "buffer_search::Dismiss"
-    }
-  },
-  {
-    "context": "VimControl && !menu || !Editor && !Terminal",
-    "bindings": {
-      // window related commands (ctrl-w X)
-      "ctrl-w": null,
-      "ctrl-w left": "workspace::ActivatePaneLeft",
-      "ctrl-w right": "workspace::ActivatePaneRight",
-      "ctrl-w up": "workspace::ActivatePaneUp",
-      "ctrl-w down": "workspace::ActivatePaneDown",
-      "ctrl-w ctrl-h": "workspace::ActivatePaneLeft",
-      "ctrl-w ctrl-l": "workspace::ActivatePaneRight",
-      "ctrl-w ctrl-k": "workspace::ActivatePaneUp",
-      "ctrl-w ctrl-j": "workspace::ActivatePaneDown",
-      "ctrl-w h": "workspace::ActivatePaneLeft",
-      "ctrl-w l": "workspace::ActivatePaneRight",
-      "ctrl-w k": "workspace::ActivatePaneUp",
-      "ctrl-w j": "workspace::ActivatePaneDown",
-      "ctrl-w shift-left": "workspace::SwapPaneLeft",
-      "ctrl-w shift-right": "workspace::SwapPaneRight",
-      "ctrl-w shift-up": "workspace::SwapPaneUp",
-      "ctrl-w shift-down": "workspace::SwapPaneDown",
-      "ctrl-w x": "workspace::SwapPaneAdjacent",
-      "ctrl-w ctrl-x": "workspace::SwapPaneAdjacent",
-      "ctrl-w shift-h": "workspace::MovePaneLeft",
-      "ctrl-w shift-l": "workspace::MovePaneRight",
-      "ctrl-w shift-k": "workspace::MovePaneUp",
-      "ctrl-w shift-j": "workspace::MovePaneDown",
-      "ctrl-w >": "vim::ResizePaneRight",
-      "ctrl-w <": "vim::ResizePaneLeft",
-      "ctrl-w -": "vim::ResizePaneDown",
-      "ctrl-w +": "vim::ResizePaneUp",
-      "ctrl-w _": "vim::MaximizePane",
-      "ctrl-w =": "vim::ResetPaneSizes",
-      "ctrl-w g t": "pane::ActivateNextItem",
-      "ctrl-w ctrl-g t": "pane::ActivateNextItem",
-      "ctrl-w g shift-t": "pane::ActivatePreviousItem",
-      "ctrl-w ctrl-g shift-t": "pane::ActivatePreviousItem",
-      "ctrl-w w": "workspace::ActivateNextPane",
-      "ctrl-w ctrl-w": "workspace::ActivateNextPane",
-      "ctrl-w p": "workspace::ActivatePreviousPane",
-      "ctrl-w ctrl-p": "workspace::ActivatePreviousPane",
-      "ctrl-w shift-w": "workspace::ActivatePreviousPane",
-      "ctrl-w ctrl-shift-w": "workspace::ActivatePreviousPane",
-      "ctrl-w ctrl-v": "pane::SplitVertical",
-      "ctrl-w v": "pane::SplitVertical",
-      "ctrl-w shift-s": "pane::SplitHorizontal",
-      "ctrl-w ctrl-s": "pane::SplitHorizontal",
-      "ctrl-w s": "pane::SplitHorizontal",
-      "ctrl-w ctrl-c": "pane::CloseActiveItem",
-      "ctrl-w c": "pane::CloseActiveItem",
-      "ctrl-w ctrl-q": "pane::CloseActiveItem",
-      "ctrl-w q": "pane::CloseActiveItem",
-      "ctrl-w ctrl-a": "pane::CloseAllItems",
-      "ctrl-w a": "pane::CloseAllItems",
-      "ctrl-w ctrl-o": "workspace::CloseInactiveTabsAndPanes",
-      "ctrl-w o": "workspace::CloseInactiveTabsAndPanes",
-      "ctrl-w ctrl-n": "workspace::NewFileSplitHorizontal",
-      "ctrl-w n": "workspace::NewFileSplitHorizontal",
-      "g t": "vim::GoToTab",
-      "g shift-t": "vim::GoToPreviousTab"
-    }
-  },
-  {
-    "context": "!Editor && !Terminal",
-    "bindings": {
-      ":": "command_palette::Toggle",
-      "g /": "pane::DeploySearch",
-      "] b": "pane::ActivateNextItem",
-      "[ b": "pane::ActivatePreviousItem",
-      "] shift-b": "pane::ActivateLastItem",
-      "[ shift-b": ["pane::ActivateItem", 0]
-    }
-  },
-  {
-    // netrw compatibility
-    "context": "ProjectPanel && not_editing",
-    "bindings": {
-      ":": "command_palette::Toggle",
-      "%": "project_panel::NewFile",
-      "/": "project_panel::NewSearchInDirectory",
-      "d": "project_panel::NewDirectory",
-      "enter": "project_panel::OpenPermanent",
-      "escape": "vim::ToggleProjectPanelFocus",
-      "h": "project_panel::CollapseSelectedEntry",
-      "j": "vim::MenuSelectNext",
-      "k": "vim::MenuSelectPrevious",
-      "down": "vim::MenuSelectNext",
-      "up": "vim::MenuSelectPrevious",
-      "l": "project_panel::ExpandSelectedEntry",
-      "shift-d": "project_panel::Delete",
-      "shift-r": "project_panel::Rename",
-      "t": "project_panel::OpenPermanent",
-      "v": "project_panel::OpenSplitVertical",
-      "o": "project_panel::OpenSplitHorizontal",
-      "p": "project_panel::Open",
-      "x": "project_panel::RevealInFileManager",
-      "s": "workspace::OpenWithSystem",
-      "z d": "project_panel::CompareMarkedFiles",
-      "] c": "project_panel::SelectNextGitEntry",
-      "[ c": "project_panel::SelectPrevGitEntry",
-      "] d": "project_panel::SelectNextDiagnostic",
-      "[ d": "project_panel::SelectPrevDiagnostic",
-      "}": "project_panel::SelectNextDirectory",
-      "{": "project_panel::SelectPrevDirectory",
-      "shift-g": "menu::SelectLast",
-      "g g": "menu::SelectFirst",
-      "-": "project_panel::SelectParent",
-      "ctrl-u": "project_panel::ScrollUp",
-      "ctrl-d": "project_panel::ScrollDown",
-      "z t": "project_panel::ScrollCursorTop",
-      "z z": "project_panel::ScrollCursorCenter",
-      "z b": "project_panel::ScrollCursorBottom",
-      "0": ["vim::Number", 0],
-      "1": ["vim::Number", 1],
-      "2": ["vim::Number", 2],
-      "3": ["vim::Number", 3],
-      "4": ["vim::Number", 4],
-      "5": ["vim::Number", 5],
-      "6": ["vim::Number", 6],
-      "7": ["vim::Number", 7],
-      "8": ["vim::Number", 8],
-      "9": ["vim::Number", 9]
-    }
-  },
-  {
-    "context": "OutlinePanel && not_editing",
-    "bindings": {
-      "j": "menu::SelectNext",
-      "k": "menu::SelectPrevious",
-      "shift-g": "menu::SelectLast",
-      "g g": "menu::SelectFirst"
-    }
-  },
-  {
-    "context": "GitPanel && ChangesList",
-    "use_key_equivalents": true,
-    "bindings": {
-      "k": "menu::SelectPrevious",
-      "j": "menu::SelectNext",
-      "g g": "menu::SelectFirst",
-      "shift-g": "menu::SelectLast",
-      "g f": "menu::Confirm",
-      "i": "git_panel::FocusEditor",
-      "x": "git::ToggleStaged",
-      "shift-x": "git::StageAll",
-      "g x": "git::StageRange",
-      "shift-u": "git::UnstageAll"
-    }
-  },
-  {
-    "context": "Editor && mode == auto_height && VimControl",
-    "bindings": {
-      // TODO: Implement search
-      "/": null,
-      "?": null,
-      "#": null,
-      "*": null,
-      "n": null,
-      "shift-n": null
-    }
-  },
-  {
-    "context": "Picker > Editor",
-    "bindings": {
-      "ctrl-h": "editor::Backspace",
-      "ctrl-u": "editor::DeleteToBeginningOfLine",
-      "ctrl-w": "editor::DeleteToPreviousWordStart",
-      "ctrl-p": "menu::SelectPrevious",
-      "ctrl-n": "menu::SelectNext"
-    }
-  },
-  {
-    "context": "GitCommit > Editor && VimControl && vim_mode == normal",
-    "bindings": {
-      "ctrl-c": "menu::Cancel",
-      "escape": "menu::Cancel"
-    }
-  },
-  {
-    "context": "Editor && edit_prediction",
-    "bindings": {
-      // This is identical to the binding in the base keymap, but the vim bindings above to
-      // "vim::Tab" shadow it, so it needs to be bound again.
-      "tab": "editor::AcceptEditPrediction"
-    }
-  },
-  {
-    "context": "MessageEditor > Editor && VimControl",
-    "bindings": {
-      "enter": "agent::Chat"
-    }
-  },
-  {
-    "context": "os != macos && Editor && edit_prediction_conflict",
-    "bindings": {
-      // alt-l is provided as an alternative to tab/alt-tab. and will be displayed in the UI. This
-      // is because alt-tab may not be available, as it is often used for window switching on Linux
-      // and Windows.
-      "alt-l": "editor::AcceptEditPrediction"
-    }
-  },
-  {
-    "context": "SettingsWindow > NavigationMenu && !search",
-    "bindings": {
-      "l": "settings_editor::ExpandNavEntry",
-      "h": "settings_editor::CollapseNavEntry",
-      "k": "settings_editor::FocusPreviousNavEntry",
-      "j": "settings_editor::FocusNextNavEntry",
-      "g g": "settings_editor::FocusFirstNavEntry",
-      "shift-g": "settings_editor::FocusLastNavEntry"
-    }
-  },
-  {
-    "context": "MarkdownPreview",
-    "bindings": {
-      "ctrl-u": "markdown::ScrollPageUp",
-      "ctrl-d": "markdown::ScrollPageDown",
-      "ctrl-y": "markdown::ScrollUp",
-      "ctrl-e": "markdown::ScrollDown"
-    }
-  }
-]
diff --git a/assets/prompts/content_prompt.hbs b/assets/prompts/content_prompt.hbs
deleted file mode 100644
index 6db53ff48f..0000000000
--- a/assets/prompts/content_prompt.hbs
+++ /dev/null
@@ -1,78 +0,0 @@
-{{#if language_name}}
-Here's a file of {{language_name}} that I'm going to ask you to make an edit to.
-{{else}}
-Here's a file of text that I'm going to ask you to make an edit to.
-{{/if}}
-
-{{#if is_insert}}
-The point you'll need to insert at is marked with <insert_here></insert_here>.
-{{else}}
-The section you'll need to rewrite is marked with <rewrite_this></rewrite_this> tags.
-{{/if}}
-
-<document>
-{{{document_content}}}
-</document>
-
-{{#if is_truncated}}
-The context around the relevant section has been truncated (possibly in the middle of a line) for brevity.
-{{/if}}
-
-{{#if is_insert}}
-You can't replace {{content_type}}, your answer will be inserted in place of the `<insert_here></insert_here>` tags. Don't include the insert_here tags in your output.
-
-Generate {{content_type}} based on the following prompt:
-
-<prompt>
-{{{user_prompt}}}
-</prompt>
-
-Match the indentation in the original file in the inserted {{content_type}}, don't include any indentation on blank lines.
-
-Return ONLY the {{content_type}} to insert. Do NOT include any XML tags like <document>, <insert_here>, or any surrounding markup from the input.
-
-Respond with a code block containing the {{content_type}} to insert. Replace \{{INSERTED_CODE}} with your actual {{content_type}}:
-
-```
-\{{INSERTED_CODE}}
-```
-{{else}}
-Edit the section of {{content_type}} in <rewrite_this></rewrite_this> tags based on the following prompt:
-
-<prompt>
-{{{user_prompt}}}
-</prompt>
-
-{{#if rewrite_section}}
-And here's the section to rewrite based on that prompt again for reference:
-
-<rewrite_this>
-{{{rewrite_section}}}
-</rewrite_this>
-
-{{#if diagnostic_errors}}
-Below are the diagnostic errors visible to the user.  If the user requests problems to be fixed, use this information, but do not try to fix these errors if the user hasn't asked you to.
-
-{{#each diagnostic_errors}}
-<diagnostic_error>
-    <line_number>{{line_number}}</line_number>
-    <error_message>{{error_message}}</error_message>
-    <code_content>{{code_content}}</code_content>
-</diagnostic_error>
-{{/each}}
-{{/if}}
-
-{{/if}}
-
-Only make changes that are necessary to fulfill the prompt, leave everything else as-is. All surrounding {{content_type}} will be preserved.
-
-Start at the indentation level in the original file in the rewritten {{content_type}}. Don't stop until you've rewritten the entire section, even if you have no more changes to make, always write out the whole section with no unnecessary elisions.
-
-Return ONLY the rewritten {{content_type}}. Do NOT include any XML tags like <document>, <rewrite_this>, or any surrounding markup from the input.
-
-Respond with a code block containing the rewritten {{content_type}}. Replace \{{REWRITTEN_CODE}} with your actual rewritten {{content_type}}:
-
-```
-\{{REWRITTEN_CODE}}
-```
-{{/if}}
diff --git a/assets/prompts/content_prompt_v2.hbs b/assets/prompts/content_prompt_v2.hbs
deleted file mode 100644
index e1b6ddc6f0..0000000000
--- a/assets/prompts/content_prompt_v2.hbs
+++ /dev/null
@@ -1,44 +0,0 @@
-{{#if language_name}}
-Here's a file of {{language_name}} that the user is going to ask you to make an edit to.
-{{else}}
-Here's a file of text that the user is going to ask you to make an edit to.
-{{/if}}
-
-The section you'll need to rewrite is marked with <rewrite_this></rewrite_this> tags.
-
-<document>
-{{{document_content}}}
-</document>
-
-{{#if is_truncated}}
-The context around the relevant section has been truncated (possibly in the middle of a line) for brevity.
-{{/if}}
-
-{{#if rewrite_section}}
-And here's the section to rewrite based on that prompt again for reference:
-
-<rewrite_this>
-{{{rewrite_section}}}
-</rewrite_this>
-
-{{#if diagnostic_errors}}
-Below are the diagnostic errors visible to the user.  If the user requests problems to be fixed, use this information, but do not try to fix these errors if the user hasn't asked you to.
-
-{{#each diagnostic_errors}}
-<diagnostic_error>
-    <line_number>{{line_number}}</line_number>
-    <error_message>{{error_message}}</error_message>
-    <code_content>{{code_content}}</code_content>
-</diagnostic_error>
-{{/each}}
-{{/if}}
-
-{{/if}}
-
-Only make changes that are necessary to fulfill the prompt, leave everything else as-is. All surrounding {{content_type}} will be preserved.
-
-Start at the indentation level in the original file in the rewritten {{content_type}}.
-
-You must use one of the provided tools to make the rewrite or to provide an explanation as to why the user's request cannot be fulfilled. It is an error if
-you simply send back unstructured text. If you need to make a statement or ask a question you must use one of the tools to do so.
-It is an error if you try to make a change that cannot be made simply by editing the rewrite_section.
diff --git a/assets/prompts/terminal_assistant_prompt.hbs b/assets/prompts/terminal_assistant_prompt.hbs
deleted file mode 100644
index b315e63158..0000000000
--- a/assets/prompts/terminal_assistant_prompt.hbs
+++ /dev/null
@@ -1,18 +0,0 @@
-You are an expert terminal user.
-You will be given a description of a command and you need to respond with a command that matches the description.
-Do not include markdown blocks or any other text formatting in your response, always respond with a single command that can be executed in the given shell.
-Current OS name is '{{os}}', architecture is '{{arch}}'.
-{{#if shell}}
-Current shell is '{{shell}}'.
-{{/if}}
-{{#if working_directory}}
-Current working directory is '{{working_directory}}'.
-{{/if}}
-{{#if latest_output}}
-Latest non-empty terminal output:
-{{#each latest_output as |line|}}
-{{line}}
-{{/each}}
-{{/if}}
-Here is the description of the command:
-{{{user_prompt}}}
diff --git a/assets/settings/default.json b/assets/settings/default.json
deleted file mode 100644
index 2eea3c34c6..0000000000
--- a/assets/settings/default.json
+++ /dev/null
@@ -1,2257 +0,0 @@
-{
-  "$schema": "zed://schemas/settings",
-  /// The displayed name of this project. If not set or null, the root directory name
-  /// will be displayed.
-  "project_name": null,
-  // The name of the Zed theme to use for the UI.
-  //
-  // `mode` is one of:
-  // - "system": Use the theme that corresponds to the system's appearance
-  // - "light": Use the theme indicated by the "light" field
-  // - "dark": Use the theme indicated by the "dark" field
-  "theme": {
-    "mode": "system",
-    "light": "One Light",
-    "dark": "One Dark",
-  },
-  "icon_theme": "Zed (Default)",
-  // The name of a base set of key bindings to use.
-  // This setting can take six values, each named after another
-  // text editor:
-  //
-  // 1. "VSCode"
-  // 2. "Atom"
-  // 3. "JetBrains"
-  // 4. "None"
-  // 5. "SublimeText"
-  // 6. "TextMate"
-  "base_keymap": "VSCode",
-  // Features that can be globally enabled or disabled
-  "features": {
-    // Which edit prediction provider to use.
-    "edit_prediction_provider": "zed",
-  },
-  // The name of a font to use for rendering text in the editor
-  // ".ZedMono" currently aliases to Lilex
-  // but this may change in the future.
-  "buffer_font_family": ".ZedMono",
-  // Set the buffer text's font fallbacks, this will be merged with
-  // the platform's default fallbacks.
-  "buffer_font_fallbacks": null,
-  // The OpenType features to enable for text in the editor.
-  "buffer_font_features": {
-    // Disable ligatures:
-    // "calt": false
-  },
-  // The default font size for text in the editor
-  "buffer_font_size": 15,
-  // The weight of the editor font in standard CSS units from 100 to 900.
-  "buffer_font_weight": 400,
-  // Set the buffer's line height.
-  // May take 3 values:
-  //  1. Use a line height that's comfortable for reading (1.618)
-  //         "buffer_line_height": "comfortable"
-  //  2. Use a standard line height, (1.3)
-  //         "buffer_line_height": "standard",
-  //  3. Use a custom line height
-  //         "buffer_line_height": {
-  //           "custom": 2
-  //         },
-  "buffer_line_height": "comfortable",
-  // The name of a font to use for rendering text in the UI
-  // You can set this to ".SystemUIFont" to use the system font
-  // ".ZedSans" currently aliases to "IBM Plex Sans", but this may
-  // change in the future
-  "ui_font_family": ".ZedSans",
-  // Set the UI's font fallbacks, this will be merged with the platform's
-  // default font fallbacks.
-  "ui_font_fallbacks": null,
-  // The OpenType features to enable for text in the UI
-  "ui_font_features": {
-    // Disable ligatures:
-    "calt": false,
-  },
-  // The weight of the UI font in standard CSS units from 100 to 900.
-  "ui_font_weight": 400,
-  // The default font size for text in the UI
-  "ui_font_size": 16,
-  // The default font size for agent responses in the agent panel. Falls back to the UI font size if unset.
-  "agent_ui_font_size": null,
-  // The default font size for user messages in the agent panel.
-  "agent_buffer_font_size": 12,
-  // How much to fade out unused code.
-  "unnecessary_code_fade": 0.3,
-  // Active pane styling settings.
-  "active_pane_modifiers": {
-    // Inset border size of the active pane, in pixels.
-    "border_size": 0.0,
-    // Opacity of the inactive panes. 0 means transparent, 1 means opaque.
-    // Values are clamped to the [0.0, 1.0] range.
-    "inactive_opacity": 1.0,
-  },
-  // Layout mode of the bottom dock. Defaults to "contained"
-  //   choices: contained, full, left_aligned, right_aligned
-  "bottom_dock_layout": "contained",
-  // The direction that you want to split panes horizontally. Defaults to "down"
-  "pane_split_direction_horizontal": "down",
-  // The direction that you want to split panes vertically. Defaults to "right"
-  "pane_split_direction_vertical": "right",
-  // Centered layout related settings.
-  "centered_layout": {
-    // The relative width of the left padding of the central pane from the
-    // workspace when the centered layout is used.
-    "left_padding": 0.2,
-    // The relative width of the right padding of the central pane from the
-    // workspace when the centered layout is used.
-    "right_padding": 0.2,
-  },
-  // Image viewer settings
-  "image_viewer": {
-    // The unit for image file sizes: "binary" (KiB, MiB) or decimal (KB, MB)
-    "unit": "binary",
-  },
-  // Determines the modifier to be used to add multiple cursors with the mouse. The open hover link mouse gestures will adapt such that it do not conflict with the multicursor modifier.
-  //
-  // 1. Maps to `Alt` on Linux and Windows and to `Option` on MacOS:
-  //    "alt"
-  // 2. Maps `Control` on Linux and Windows and to `Command` on MacOS:
-  //    "cmd_or_ctrl" (alias: "cmd", "ctrl")
-  "multi_cursor_modifier": "alt",
-  // Whether to enable vim modes and key bindings.
-  "vim_mode": false,
-  // Whether to enable helix mode and key bindings.
-  // Enabling this mode will automatically enable vim mode.
-  "helix_mode": false,
-  // Whether to show the informational hover box when moving the mouse
-  // over symbols in the editor.
-  "hover_popover_enabled": true,
-  // Time to wait in milliseconds before showing the informational hover box.
-  "hover_popover_delay": 300,
-  // Whether to confirm before quitting Zed.
-  "confirm_quit": false,
-  // Whether to restore last closed project when fresh Zed instance is opened
-  // May take 3 values:
-  //  1. All workspaces open during last session
-  //         "restore_on_startup": "last_session"
-  //  2. The workspace opened
-  //         "restore_on_startup": "last_workspace",
-  //  3. Do not restore previous workspaces
-  //         "restore_on_startup": "none",
-  "restore_on_startup": "last_session",
-  // Whether to attempt to restore previous file's state when opening it again.
-  // The state is stored per pane.
-  // When disabled, defaults are applied instead of the state restoration.
-  //
-  // E.g. for editors, selections, folds and scroll positions are restored, if the same file is closed and, later, opened again in the same pane.
-  // When disabled, a single selection in the very beginning of the file, zero scroll position and no folds state is used as a default.
-  //
-  // Default: true
-  "restore_on_file_reopen": true,
-  // Whether to automatically close files that have been deleted on disk.
-  "close_on_file_delete": false,
-  // Relative size of the drop target in the editor that will open dropped file as a split pane (0-0.5)
-  // E.g. 0.25 == If you drop onto the top/bottom quarter of the pane a new vertical split will be used
-  //              If you drop onto the left/right quarter of the pane a new horizontal split will be used
-  "drop_target_size": 0.2,
-  // Whether the window should be closed when using 'close active item' on a window with no tabs.
-  // May take 3 values:
-  //  1. Use the current platform's convention
-  //         "when_closing_with_no_tabs": "platform_default"
-  //  2. Always close the window:
-  //         "when_closing_with_no_tabs": "close_window",
-  //  3. Never close the window
-  //         "when_closing_with_no_tabs": "keep_window_open",
-  "when_closing_with_no_tabs": "platform_default",
-  // What to do when the last window is closed.
-  // May take 2 values:
-  //  1. Use the current platform's convention
-  //         "on_last_window_closed": "platform_default"
-  //  2. Always quit the application
-  //         "on_last_window_closed": "quit_app",
-  "on_last_window_closed": "platform_default",
-  // Whether to show padding for zoomed panels.
-  // When enabled, zoomed center panels (e.g. code editor) will have padding all around,
-  // while zoomed bottom/left/right panels will have padding to the top/right/left (respectively).
-  //
-  // Default: true
-  "zoomed_padding": true,
-  // What draws Zed's window decorations (titlebar):
-  // 1. Client application (Zed) draws its own window decorations
-  //    "client"
-  // 2. Display server draws the window decorations. Not supported by GNOME Wayland.
-  //    "server"
-  //
-  // This requires restarting Zed for changes to take effect.
-  //
-  // Default: "client"
-  "window_decorations": "client",
-  // Whether to use the system provided dialogs for Open and Save As.
-  // When set to false, Zed will use the built-in keyboard-first pickers.
-  "use_system_path_prompts": true,
-  // Whether to use the system provided dialogs for prompts, such as confirmation
-  // prompts.
-  // When set to false, Zed will use its built-in prompts. Note that on Linux,
-  // this option is ignored and Zed will always use the built-in prompts.
-  "use_system_prompts": true,
-  // Whether the cursor blinks in the editor.
-  "cursor_blink": true,
-  // Cursor shape for the default editor.
-  //  1. A vertical bar
-  //     "bar"
-  //  2. A block that surrounds the following character
-  //     "block"
-  //  3. An underline / underscore that runs along the following character
-  //     "underline"
-  //  4. A box drawn around the following character
-  //     "hollow"
-  //
-  // Default: "bar"
-  "cursor_shape": "bar",
-  // Determines when the mouse cursor should be hidden in an editor or input box.
-  //
-  // 1. Never hide the mouse cursor:
-  //    "never"
-  // 2. Hide only when typing:
-  //    "on_typing"
-  // 3. Hide on both typing and cursor movement:
-  //    "on_typing_and_movement"
-  "hide_mouse": "on_typing_and_movement",
-  // Determines how snippets are sorted relative to other completion items.
-  //
-  // 1. Place snippets at the top of the completion list:
-  //    "top"
-  // 2. Place snippets normally without any preference:
-  //    "inline"
-  // 3. Place snippets at the bottom of the completion list:
-  //    "bottom"
-  // 4. Do not show snippets in the completion list:
-  //    "none"
-  "snippet_sort_order": "inline",
-  // How to highlight the current line in the editor.
-  //
-  // 1. Don't highlight the current line:
-  //    "none"
-  // 2. Highlight the gutter area:
-  //    "gutter"
-  // 3. Highlight the editor area:
-  //    "line"
-  // 4. Highlight the full line (default):
-  //    "all"
-  "current_line_highlight": "all",
-  // Whether to highlight all occurrences of the selected text in an editor.
-  "selection_highlight": true,
-  // Whether the text selection should have rounded corners.
-  "rounded_selection": true,
-  // The debounce delay before querying highlights from the language
-  // server based on the current cursor location.
-  "lsp_highlight_debounce": 75,
-  // The minimum APCA perceptual contrast between foreground and background colors.
-  // APCA (Accessible Perceptual Contrast Algorithm) is more accurate than WCAG 2.x,
-  // especially for dark mode. Values range from 0 to 106.
-  //
-  // Based on APCA Readability Criterion (ARC) Bronze Simple Mode:
-  // https://readtech.org/ARC/tests/bronze-simple-mode/
-  // - 0: No contrast adjustment
-  // - 45: Minimum for large fluent text (36px+)
-  // - 60: Minimum for other content text
-  // - 75: Minimum for body text
-  // - 90: Preferred for body text
-  //
-  // This only affects text drawn over highlight backgrounds in the editor.
-  "minimum_contrast_for_highlights": 45,
-  // Whether to pop the completions menu while typing in an editor without
-  // explicitly requesting it.
-  "show_completions_on_input": true,
-  // Whether to display inline and alongside documentation for items in the
-  // completions menu
-  "show_completion_documentation": true,
-  // Whether to colorize brackets in the editor.
-  // (also known as "rainbow brackets")
-  //
-  // The colors that are used for different indentation levels are defined in the theme (theme key: `accents`).
-  // They can be customized by using theme overrides.
-  "colorize_brackets": false,
-  // When to show the scrollbar in the completion menu.
-  // This setting can take four values:
-  //
-  // 1. Show the scrollbar if there's important information or
-  //    follow the system's configured behavior
-  //   "auto"
-  // 2. Match the system's configured behavior:
-  //    "system"
-  // 3. Always show the scrollbar:
-  //    "always"
-  // 4. Never show the scrollbar:
-  //    "never" (default)
-  "completion_menu_scrollbar": "never",
-  // Show method signatures in the editor, when inside parentheses.
-  "auto_signature_help": false,
-  // Whether to show the signature help after completion or a bracket pair inserted.
-  // If `auto_signature_help` is enabled, this setting will be treated as enabled also.
-  "show_signature_help_after_edits": false,
-  // Whether to show code action button at start of buffer line.
-  "inline_code_actions": true,
-  // Whether to allow drag and drop text selection in buffer.
-  "drag_and_drop_selection": {
-    // When true, enables drag and drop text selection in buffer.
-    "enabled": true,
-    // The delay in milliseconds that must elapse before drag and drop is allowed. Otherwise, a new text selection is created.
-    "delay": 300,
-  },
-  // What to do when go to definition yields no results.
-  //
-  // 1. Do nothing: `none`
-  // 2. Find references for the same symbol: `find_all_references` (default)
-  "go_to_definition_fallback": "find_all_references",
-  // Which level to use to filter out diagnostics displayed in the editor.
-  //
-  // Affects the editor rendering only, and does not interrupt
-  // the functionality of diagnostics fetching and project diagnostics editor.
-  // Which files containing diagnostic errors/warnings to mark in the tabs.
-  // Diagnostics are only shown when file icons are also active.
-  // This setting only works when can take the following three values:
-  //
-  // Which diagnostic indicators to show in the scrollbar, their level should be more or equal to the specified severity level.
-  // Possible values:
-  //  - "off" — no diagnostics are allowed
-  //  - "error"
-  //  - "warning"
-  //  - "info"
-  //  - "hint"
-  //  - "all" — allow all diagnostics (default)
-  "diagnostics_max_severity": "all",
-  // Whether to show wrap guides (vertical rulers) in the editor.
-  // Setting this to true will show a guide at the 'preferred_line_length' value
-  // if 'soft_wrap' is set to 'preferred_line_length', and will show any
-  // additional guides as specified by the 'wrap_guides' setting.
-  "show_wrap_guides": true,
-  // Character counts at which to show wrap guides in the editor.
-  "wrap_guides": [],
-  // Hide the values of in variables from visual display in private files
-  "redact_private_values": false,
-  // The default number of lines to expand excerpts in the multibuffer by.
-  "expand_excerpt_lines": 5,
-  // The default number of context lines shown in multibuffer excerpts.
-  "excerpt_context_lines": 2,
-  // Globs to match against file paths to determine if a file is private.
-  "private_files": ["**/.env*", "**/*.pem", "**/*.key", "**/*.cert", "**/*.crt", "**/secrets.yml"],
-  // Whether to use additional LSP queries to format (and amend) the code after
-  // every "trigger" symbol input, defined by LSP server capabilities.
-  "use_on_type_format": true,
-  // Whether to automatically add matching closing characters when typing
-  // opening parenthesis, bracket, brace, single or double quote characters.
-  // For example, when you type '(', Zed will add a closing ) at the correct position.
-  "use_autoclose": true,
-  // Whether to automatically surround selected text when typing opening parenthesis,
-  // bracket, brace, single or double quote characters.
-  // For example, when you select text and type '(', Zed will surround the text with ().
-  "use_auto_surround": true,
-  // Whether indentation should be adjusted based on the context whilst typing.
-  "auto_indent": true,
-  // Whether indentation of pasted content should be adjusted based on the context.
-  "auto_indent_on_paste": true,
-  // Controls how the editor handles the autoclosed characters.
-  // When set to `false`(default), skipping over and auto-removing of the closing characters
-  // happen only for auto-inserted characters.
-  // Otherwise(when `true`), the closing characters are always skipped over and auto-removed
-  // no matter how they were inserted.
-  "always_treat_brackets_as_autoclosed": false,
-  // Controls where the `editor::Rewrap` action is allowed in the current language scope.
-  //
-  // This setting can take three values:
-  //
-  // 1. Only allow rewrapping in comments:
-  //    "in_comments"
-  // 2. Only allow rewrapping in the current selection(s):
-  //    "in_selections"
-  // 3. Allow rewrapping anywhere:
-  //    "anywhere"
-  //
-  // When using values other than `in_comments`, it is possible for the rewrapping to produce code
-  // that is syntactically invalid. Keep this in mind when selecting which behavior you would like
-  // to use.
-  //
-  // Note: This setting has no effect in Vim mode, as rewrap is already allowed everywhere.
-  "allow_rewrap": "in_comments",
-  // Controls whether edit predictions are shown immediately (true)
-  // or manually by triggering `editor::ShowEditPrediction` (false).
-  "show_edit_predictions": true,
-  // Controls whether edit predictions are shown in a given language scope.
-  // Example: ["string", "comment"]
-  "edit_predictions_disabled_in": [],
-  // Whether to show tabs and spaces in the editor.
-  // This setting can take four values:
-  //
-  // 1. Draw tabs and spaces only for the selected text (default):
-  //    "selection"
-  // 2. Do not draw any tabs or spaces:
-  //    "none"
-  // 3. Draw all invisible symbols:
-  //    "all"
-  // 4. Draw whitespaces at boundaries only:
-  //    "boundary"
-  // 5. Draw whitespaces only after non-whitespace characters:
-  //    "trailing"
-  // For a whitespace to be on a boundary, any of the following conditions need to be met:
-  // - It is a tab
-  // - It is adjacent to an edge (start or end)
-  // - It is adjacent to a whitespace (left or right)
-  "show_whitespaces": "selection",
-  // Visible characters used to render whitespace when show_whitespaces is enabled.
-  "whitespace_map": {
-    "space": "•",
-    "tab": "→",
-  },
-  // Settings related to calls in Zed
-  "calls": {
-    // Join calls with the microphone live by default
-    "mute_on_join": false,
-    // Share your project when you are the first to join a channel
-    "share_on_join": false,
-  },
-  // Toolbar related settings
-  "toolbar": {
-    // Whether to show breadcrumbs.
-    "breadcrumbs": true,
-    // Whether to show quick action buttons.
-    "quick_actions": true,
-    // Whether to show the Selections menu in the editor toolbar.
-    "selections_menu": true,
-    // Whether to show agent review buttons in the editor toolbar.
-    "agent_review": true,
-    // Whether to show code action buttons in the editor toolbar.
-    "code_actions": false,
-  },
-  // Whether to allow windows to tab together based on the user’s tabbing preference (macOS only).
-  "use_system_window_tabs": false,
-  // Titlebar related settings
-  "title_bar": {
-    // Whether to show the branch icon beside branch switcher in the titlebar.
-    "show_branch_icon": false,
-    // Whether to show the branch name button in the titlebar.
-    "show_branch_name": true,
-    // Whether to show the project host and name in the titlebar.
-    "show_project_items": true,
-    // Whether to show onboarding banners in the titlebar.
-    "show_onboarding_banner": true,
-    // Whether to show user picture in the titlebar.
-    "show_user_picture": true,
-    // Whether to show the sign in button in the titlebar.
-    "show_sign_in": true,
-    // Whether to show the menus in the titlebar.
-    "show_menus": false,
-  },
-  "audio": {
-    // Opt into the new audio system.
-    "experimental.rodio_audio": false,
-    // Requires 'rodio_audio: true'
-    //
-    // Automatically increase or decrease you microphone's volume. This affects how
-    // loud you sound to others.
-    //
-    // Recommended: off (default)
-    // Microphones are too quite in zed, until everyone is on experimental
-    // audio and has auto speaker volume on this will make you very loud
-    // compared to other speakers.
-    "experimental.auto_microphone_volume": false,
-    // Requires 'rodio_audio: true'
-    //
-    // Automatically increate or decrease the volume of other call members.
-    // This only affects how things sound for you.
-    "experimental.auto_speaker_volume": true,
-    // Requires 'rodio_audio: true'
-    //
-    // Remove background noises. Works great for typing, cars, dogs, AC. Does
-    // not work well on music.
-    "experimental.denoise": true,
-    // Requires 'rodio_audio: true'
-    //
-    // Use audio parameters compatible with the previous versions of
-    // experimental audio and non-experimental audio. When this is false you
-    // will sound strange to anyone not on the latest experimental audio. In
-    // the future we will migrate by setting this to false
-    //
-    // You need to rejoin a call for this setting to apply
-    "experimental.legacy_audio_compatible": true,
-  },
-  // Scrollbar related settings
-  "scrollbar": {
-    // When to show the scrollbar in the editor.
-    // This setting can take four values:
-    //
-    // 1. Show the scrollbar if there's important information or
-    //    follow the system's configured behavior (default):
-    //   "auto"
-    // 2. Match the system's configured behavior:
-    //    "system"
-    // 3. Always show the scrollbar:
-    //    "always"
-    // 4. Never show the scrollbar:
-    //    "never"
-    "show": "auto",
-    // Whether to show cursor positions in the scrollbar.
-    "cursors": true,
-    // Whether to show git diff indicators in the scrollbar.
-    "git_diff": true,
-    // Whether to show buffer search results in the scrollbar.
-    "search_results": true,
-    // Whether to show selected text occurrences in the scrollbar.
-    "selected_text": true,
-    // Whether to show selected symbol occurrences in the scrollbar.
-    "selected_symbol": true,
-    // Which diagnostic indicators to show in the scrollbar:
-    //  - "none" or false: do not show diagnostics
-    //  - "error": show only errors
-    //  - "warning": show only errors and warnings
-    //  - "information": show only errors, warnings, and information
-    //  - "all" or true: show all diagnostics
-    "diagnostics": "all",
-    // Forcefully enable or disable the scrollbar for each axis
-    "axes": {
-      // When false, forcefully disables the horizontal scrollbar. Otherwise, obey other settings.
-      "horizontal": true,
-      // When false, forcefully disables the vertical scrollbar. Otherwise, obey other settings.
-      "vertical": true,
-    },
-  },
-  // Minimap related settings
-  "minimap": {
-    // When to show the minimap in the editor.
-    // This setting can take three values:
-    // 1. Show the minimap if the editor's scrollbar is visible:
-    //    "auto"
-    // 2. Always show the minimap:
-    //    "always"
-    // 3. Never show the minimap:
-    //    "never" (default)
-    "show": "never",
-    // Where to show the minimap in the editor.
-    // This setting can take two values:
-    // 1. Show the minimap on the focused editor only:
-    //    "active_editor" (default)
-    // 2. Show the minimap on all open editors:
-    //    "all_editors"
-    "display_in": "active_editor",
-    // When to show the minimap thumb.
-    // This setting can take two values:
-    // 1. Show the minimap thumb if the mouse is over the minimap:
-    //    "hover"
-    // 2. Always show the minimap thumb:
-    //    "always" (default)
-    "thumb": "always",
-    // How the minimap thumb border should look.
-    // This setting can take five values:
-    // 1. Display a border on all sides of the thumb:
-    //    "thumb_border": "full"
-    // 2. Display a border on all sides except the left side of the thumb:
-    //    "thumb_border": "left_open" (default)
-    // 3. Display a border on all sides except the right side of the thumb:
-    //    "thumb_border": "right_open"
-    // 4. Display a border only on the left side of the thumb:
-    //    "thumb_border": "left_only"
-    // 5. Display the thumb without any border:
-    //    "thumb_border": "none"
-    "thumb_border": "left_open",
-    // How to highlight the current line in the minimap.
-    // This setting can take the following values:
-    //
-    // 1. `null` to inherit the editor `current_line_highlight` setting (default)
-    // 2. "line" or "all" to highlight the current line in the minimap.
-    // 3. "gutter" or "none" to not highlight the current line in the minimap.
-    "current_line_highlight": null,
-    // Maximum number of columns to display in the minimap.
-    "max_width_columns": 80,
-  },
-  // Enable middle-click paste on Linux.
-  "middle_click_paste": true,
-  // What to do when multibuffer is double clicked in some of its excerpts
-  // (parts of singleton buffers).
-  // May take 2 values:
-  //  1. Behave as a regular buffer and select the whole word (default).
-  //         "double_click_in_multibuffer": "select"
-  //  2. Open the excerpt clicked as a new buffer in the new tab.
-  //         "double_click_in_multibuffer": "open",
-  // For the case of "open", regular selection behavior can be achieved by holding `alt` when double clicking.
-  "double_click_in_multibuffer": "select",
-  "gutter": {
-    // Whether to show line numbers in the gutter.
-    "line_numbers": true,
-    // Whether to show runnables buttons in the gutter.
-    "runnables": true,
-    // Whether to show breakpoints in the gutter.
-    "breakpoints": true,
-    // Whether to show fold buttons in the gutter.
-    "folds": true,
-    // Minimum number of characters to reserve space for in the gutter.
-    "min_line_number_digits": 4,
-  },
-  "indent_guides": {
-    // Whether to show indent guides in the editor.
-    "enabled": true,
-    // The width of the indent guides in pixels, between 1 and 10.
-    "line_width": 1,
-    // The width of the active indent guide in pixels, between 1 and 10.
-    "active_line_width": 1,
-    // Determines how indent guides are colored.
-    // This setting can take the following three values:
-    //
-    // 1. "disabled"
-    // 2. "fixed"
-    // 3. "indent_aware"
-    "coloring": "fixed",
-    // Determines how indent guide backgrounds are colored.
-    // This setting can take the following two values:
-    //
-    // 1. "disabled"
-    // 2. "indent_aware"
-    "background_coloring": "disabled",
-  },
-  // Whether the editor will scroll beyond the last line.
-  "scroll_beyond_last_line": "one_page",
-  // The number of lines to keep above/below the cursor when scrolling with the keyboard
-  "vertical_scroll_margin": 3,
-  // Whether to scroll when clicking near the edge of the visible text area.
-  "autoscroll_on_clicks": false,
-  // The number of characters to keep on either side when scrolling with the mouse
-  "horizontal_scroll_margin": 5,
-  // Scroll sensitivity multiplier. This multiplier is applied
-  // to both the horizontal and vertical delta values while scrolling.
-  "scroll_sensitivity": 1.0,
-  // Scroll sensitivity multiplier for fast scrolling. This multiplier is applied
-  // to both the horizontal and vertical delta values while scrolling. Fast scrolling
-  // happens when a user holds the alt or option key while scrolling.
-  "fast_scroll_sensitivity": 4.0,
-  "sticky_scroll": {
-    // Whether to stick scopes to the top of the editor.
-    "enabled": false,
-  },
-  "relative_line_numbers": "disabled",
-  // If 'search_wrap' is disabled, search result do not wrap around the end of the file.
-  "search_wrap": true,
-  // Search options to enable by default when opening new project and buffer searches.
-  "search": {
-    // Whether to show the project search button in the status bar.
-    "button": true,
-    // Whether to only match on whole words.
-    "whole_word": false,
-    // Whether to match case sensitively.
-    "case_sensitive": false,
-    // Whether to include gitignored files in search results.
-    "include_ignored": false,
-    // Whether to interpret the search query as a regular expression.
-    "regex": false,
-    // Whether to center the cursor on each search match when navigating.
-    "center_on_match": false,
-  },
-  // When to populate a new search's query based on the text under the cursor.
-  // This setting can take the following three values:
-  //
-  // 1. Always populate the search query with the word under the cursor (default).
-  //    "always"
-  // 2. Only populate the search query when there is text selected
-  //    "selection"
-  // 3. Never populate the search query
-  //    "never"
-  "seed_search_query_from_cursor": "always",
-  // When enabled, automatically adjusts search case sensitivity based on your query.
-  // If your search query contains any uppercase letters, the search becomes case-sensitive;
-  // if it contains only lowercase letters, the search becomes case-insensitive.
-  "use_smartcase_search": false,
-  // Inlay hint related settings
-  "inlay_hints": {
-    // Global switch to toggle hints on and off, switched off by default.
-    "enabled": false,
-    // Toggle certain types of hints on and off, all switched on by default.
-    "show_type_hints": true,
-    "show_parameter_hints": true,
-    "show_value_hints": true,
-    // Corresponds to null/None LSP hint type value.
-    "show_other_hints": true,
-    // Whether to show a background for inlay hints.
-    //
-    // If set to `true`, the background will use the `hint.background` color from the current theme.
-    "show_background": false,
-    // Time to wait after editing the buffer, before requesting the hints,
-    // set to 0 to disable debouncing.
-    "edit_debounce_ms": 700,
-    // Time to wait after scrolling the buffer, before requesting the hints,
-    // set to 0 to disable debouncing.
-    "scroll_debounce_ms": 50,
-    // A set of modifiers which, when pressed, will toggle the visibility of inlay hints.
-    // If the set if empty or not all the modifiers specified are pressed, inlay hints will not be toggled.
-    "toggle_on_modifiers_press": {
-      "control": false,
-      "shift": false,
-      "alt": false,
-      "platform": false,
-      "function": false,
-    },
-  },
-  // Whether to resize all the panels in a dock when resizing the dock.
-  // Can be a combination of "left", "right" and "bottom".
-  "resize_all_panels_in_dock": ["left"],
-  "project_panel": {
-    // Whether to show the project panel button in the status bar
-    "button": true,
-    // Whether to hide the gitignore entries in the project panel.
-    "hide_gitignore": false,
-    // Default width of the project panel.
-    "default_width": 240,
-    // Where to dock the project panel. Can be 'left' or 'right'.
-    "dock": "left",
-    // Spacing between worktree entries in the project panel. Can be 'comfortable' or 'standard'.
-    "entry_spacing": "comfortable",
-    // Whether to show file icons in the project panel.
-    "file_icons": true,
-    // Whether to show folder icons or chevrons for directories in the project panel.
-    "folder_icons": true,
-    // Whether to show the git status in the project panel.
-    "git_status": true,
-    // Amount of indentation for nested items.
-    "indent_size": 20,
-    // Whether to reveal it in the project panel automatically,
-    // when a corresponding project entry becomes active.
-    // Gitignored entries are never auto revealed.
-    "auto_reveal_entries": true,
-    // Whether the project panel should open on startup.
-    "starts_open": true,
-    // Whether to fold directories automatically and show compact folders
-    // (e.g. "a/b/c" ) when a directory has only one subdirectory inside.
-    "auto_fold_dirs": true,
-    // Scrollbar-related settings
-    "scrollbar": {
-      // When to show the scrollbar in the project panel.
-      // This setting can take five values:
-      //
-      // 1. null (default): Inherit editor settings
-      // 2. Show the scrollbar if there's important information or
-      //    follow the system's configured behavior (default):
-      //   "auto"
-      // 3. Match the system's configured behavior:
-      //    "system"
-      // 4. Always show the scrollbar:
-      //    "always"
-      // 5. Never show the scrollbar:
-      //    "never"
-      "show": null,
-    },
-    // Which files containing diagnostic errors/warnings to mark in the project panel.
-    // This setting can take the following three values:
-    //
-    // 1. Do not mark any files:
-    //    "off"
-    // 2. Only mark files with errors:
-    //    "errors"
-    // 3. Mark files with errors and warnings:
-    //    "all"
-    "show_diagnostics": "all",
-    // Whether to stick parent directories at top of the project panel.
-    "sticky_scroll": true,
-    // Settings related to indent guides in the project panel.
-    "indent_guides": {
-      // When to show indent guides in the project panel.
-      // This setting can take two values:
-      //
-      // 1. Always show indent guides:
-      //    "always"
-      // 2. Never show indent guides:
-      //    "never"
-      "show": "always",
-    },
-    // Sort order for entries in the project panel.
-    // This setting can take three values:
-    //
-    // 1. Show directories first, then files:
-    //    "directories_first"
-    // 2. Mix directories and files together:
-    //    "mixed"
-    // 3. Show files first, then directories:
-    //    "files_first"
-    "sort_mode": "directories_first",
-    // Whether to enable drag-and-drop operations in the project panel.
-    "drag_and_drop": true,
-    // Whether to hide the root entry when only one folder is open in the window.
-    "hide_root": false,
-    // Whether to hide the hidden entries in the project panel.
-    "hide_hidden": false,
-    // Settings for automatically opening files.
-    "auto_open": {
-      // Whether to automatically open newly created files in the editor.
-      "on_create": true,
-      // Whether to automatically open files after pasting or duplicating them.
-      "on_paste": true,
-      // Whether to automatically open files dropped from external sources.
-      "on_drop": true,
-    },
-  },
-  "outline_panel": {
-    // Whether to show the outline panel button in the status bar
-    "button": true,
-    // Default width of the outline panel.
-    "default_width": 300,
-    // Where to dock the outline panel. Can be 'left' or 'right'.
-    "dock": "left",
-    // Whether to show file icons in the outline panel.
-    "file_icons": true,
-    // Whether to show folder icons or chevrons for directories in the outline panel.
-    "folder_icons": true,
-    // Whether to show the git status in the outline panel.
-    "git_status": true,
-    // Amount of indentation for nested items.
-    "indent_size": 20,
-    // Whether to reveal it in the outline panel automatically,
-    // when a corresponding outline entry becomes active.
-    // Gitignored entries are never auto revealed.
-    "auto_reveal_entries": true,
-    // Whether to fold directories automatically
-    // when a directory has only one directory inside.
-    "auto_fold_dirs": true,
-    // Settings related to indent guides in the outline panel.
-    "indent_guides": {
-      // When to show indent guides in the outline panel.
-      // This setting can take two values:
-      //
-      // 1. Always show indent guides:
-      //    "always"
-      // 2. Never show indent guides:
-      //    "never"
-      "show": "always",
-    },
-    // Scrollbar-related settings
-    "scrollbar": {
-      // When to show the scrollbar in the project panel.
-      // This setting can take five values:
-      //
-      // 1. null (default): Inherit editor settings
-      // 2. Show the scrollbar if there's important information or
-      //    follow the system's configured behavior (default):
-      //   "auto"
-      // 3. Match the system's configured behavior:
-      //    "system"
-      // 4. Always show the scrollbar:
-      //    "always"
-      // 5. Never show the scrollbar:
-      //    "never"
-      "show": null,
-    },
-    // Default depth to expand outline items in the current file.
-    // Set to 0 to collapse all items that have children, 1 or higher to collapse items at that depth or deeper.
-    "expand_outlines_with_depth": 100,
-  },
-  "collaboration_panel": {
-    // Whether to show the collaboration panel button in the status bar.
-    "button": true,
-    // Where to dock the collaboration panel. Can be 'left' or 'right'.
-    "dock": "left",
-    // Default width of the collaboration panel.
-    "default_width": 240,
-  },
-  "git_panel": {
-    // Whether to show the git panel button in the status bar.
-    "button": true,
-    // Where to dock the git panel. Can be 'left' or 'right'.
-    "dock": "left",
-    // Default width of the git panel.
-    "default_width": 360,
-    // Style of the git status indicator in the panel.
-    //
-    // Choices: label_color, icon
-    // Default: icon
-    "status_style": "icon",
-    // What branch name to use if `init.defaultBranch` is not set
-    //
-    // Default: main
-    "fallback_branch_name": "main",
-    // Whether to sort entries in the panel by path or by status (the default).
-    //
-    // Default: false
-    "sort_by_path": false,
-    // Whether to collapse untracked files in the diff panel.
-    //
-    // Default: false
-    "collapse_untracked_diff": false,
-    /// Whether to show entries with tree or flat view in the panel
-    ///
-    /// Default: false
-    "tree_view": false,
-    "scrollbar": {
-      // When to show the scrollbar in the git panel.
-      //
-      // Choices: always, auto, never, system
-      // Default: inherits editor scrollbar settings
-      // "show": null
-    },
-  },
-  "message_editor": {
-    // Whether to automatically replace emoji shortcodes with emoji characters.
-    // For example: typing `:wave:` gets replaced with `👋`.
-    "auto_replace_emoji_shortcode": true,
-  },
-  "notification_panel": {
-    // Whether to show the notification panel button in the status bar.
-    "button": true,
-    // Where to dock the notification panel. Can be 'left' or 'right'.
-    "dock": "right",
-    // Default width of the notification panel.
-    "default_width": 380,
-  },
-  "agent": {
-    // Whether the agent is enabled.
-    "enabled": true,
-    // What completion mode to start new threads in, if available. Can be 'normal' or 'burn'.
-    "preferred_completion_mode": "normal",
-    // Whether to show the agent panel button in the status bar.
-    "button": true,
-    // Where to dock the agent panel. Can be 'left', 'right' or 'bottom'.
-    "dock": "right",
-    // Default width when the agent panel is docked to the left or right.
-    "default_width": 640,
-    // Default height when the agent panel is docked to the bottom.
-    "default_height": 320,
-    // The view to use by default (thread, or text_thread)
-    "default_view": "thread",
-    // The default model to use when creating new threads.
-    "default_model": {
-      // The provider to use.
-      "provider": "zed.dev",
-      // The model to use.
-      "model": "claude-sonnet-4",
-    },
-    // Additional parameters for language model requests. When making a request to a model, parameters will be taken
-    // from the last entry in this list that matches the model's provider and name. In each entry, both provider
-    // and model are optional, so that you can specify parameters for either one.
-    "model_parameters": [
-      // To set parameters for all requests to OpenAI models:
-      // {
-      //   "provider": "openai",
-      //   "temperature": 0.5
-      // }
-      //
-      // To set parameters for all requests in general:
-      // {
-      //   "temperature": 0
-      // }
-      //
-      // To set parameters for a specific provider and model:
-      // {
-      //   "provider": "zed.dev",
-      //   "model": "claude-sonnet-4",
-      //   "temperature": 1.0
-      // }
-    ],
-    // When enabled, the agent can run potentially destructive actions without asking for your confirmation.
-    //
-    // Note: This setting has no effect on external agents that support permission modes, such as Claude Code.
-    //       You can set `agent_servers.claude.default_mode` to `bypassPermissions` to skip all permission requests.
-    "always_allow_tool_actions": false,
-    // When enabled, agent edits will be displayed in single-file editors for review
-    "single_file_review": true,
-    // When enabled, show voting thumbs for feedback on agent edits.
-    "enable_feedback": true,
-    "default_profile": "write",
-    "profiles": {
-      "write": {
-        "name": "Write",
-        "enable_all_context_servers": true,
-        "tools": {
-          "copy_path": true,
-          "create_directory": true,
-          "delete_path": true,
-          "diagnostics": true,
-          "edit_file": true,
-          "fetch": true,
-          "list_directory": true,
-          "project_notifications": false,
-          "move_path": true,
-          "now": true,
-          "find_path": true,
-          "read_file": true,
-          "open": true,
-          "grep": true,
-          "terminal": true,
-          "thinking": true,
-          "web_search": true,
-        },
-      },
-      "ask": {
-        "name": "Ask",
-        // We don't know which of the context server tools are safe for the "Ask" profile, so we don't enable them by default.
-        // "enable_all_context_servers": true,
-        "tools": {
-          "diagnostics": true,
-          "fetch": true,
-          "list_directory": true,
-          "project_notifications": false,
-          "now": true,
-          "find_path": true,
-          "read_file": true,
-          "open": true,
-          "grep": true,
-          "thinking": true,
-          "web_search": true,
-        },
-      },
-      "minimal": {
-        "name": "Minimal",
-        "enable_all_context_servers": false,
-        "tools": {},
-      },
-    },
-    // Where to show notifications when the agent has either completed
-    // its response, or else needs confirmation before it can run a
-    // tool action.
-    // "primary_screen" - Show the notification only on your primary screen (default)
-    // "all_screens" - Show these notifications on all screens
-    // "never" - Never show these notifications
-    "notify_when_agent_waiting": "primary_screen",
-    // Whether to play a sound when the agent has either completed
-    // its response, or needs user input.
-
-    // Default: false
-    "play_sound_when_agent_done": false,
-    // Whether to have edit cards in the agent panel expanded, showing a preview of the full diff.
-    //
-    // Default: true
-    "expand_edit_card": true,
-    // Whether to have terminal cards in the agent panel expanded, showing the whole command output.
-    //
-    // Default: true
-    "expand_terminal_card": true,
-    // Whether to always use cmd-enter (or ctrl-enter on Linux or Windows) to send messages in the agent panel.
-    //
-    // Default: false
-    "use_modifier_to_send": false,
-    // Minimum number of lines to display in the agent message editor.
-    //
-    // Default: 4
-    "message_editor_min_lines": 4,
-  },
-  // Whether the screen sharing icon is shown in the os status bar.
-  "show_call_status_icon": true,
-  // Whether to use language servers to provide code intelligence.
-  "enable_language_server": true,
-  // Whether to perform linked edits of associated ranges, if the language server supports it.
-  // For example, when editing opening <html> tag, the contents of the closing </html> tag will be edited as well.
-  "linked_edits": true,
-  // The list of language servers to use (or disable) for all languages.
-  //
-  // This is typically customized on a per-language basis.
-  "language_servers": ["..."],
-
-  // When to automatically save edited buffers. This setting can
-  // take four values.
-  //
-  // 1. Never automatically save:
-  //     "autosave": "off",
-  // 2. Save when changing focus away from the Zed window:
-  //     "autosave": "on_window_change",
-  // 3. Save when changing focus away from a specific buffer:
-  //     "autosave": "on_focus_change",
-  // 4. Save when idle for a certain amount of time:
-  //     "autosave": { "after_delay": {"milliseconds": 500} },
-  "autosave": "off",
-  // Maximum number of tabs per pane. Unset for unlimited.
-  "max_tabs": null,
-  // Settings related to the editor's tab bar.
-  "tab_bar": {
-    // Whether or not to show the tab bar in the editor
-    "show": true,
-    // Whether or not to show the navigation history buttons.
-    "show_nav_history_buttons": true,
-    // Whether or not to show the tab bar buttons.
-    "show_tab_bar_buttons": true,
-  },
-  // Settings related to the editor's tabs
-  "tabs": {
-    // Show git status colors in the editor tabs.
-    "git_status": false,
-    // Position of the close button on the editor tabs.
-    // One of: ["right", "left"]
-    "close_position": "right",
-    // Whether to show the file icon for a tab.
-    "file_icons": false,
-    // Controls the appearance behavior of the tab's close button.
-    //
-    // 1. Show it just upon hovering the tab. (default)
-    //     "hover"
-    // 2. Show it persistently.
-    //     "always"
-    // 3. Never show it, even if hovering it.
-    //     "hidden"
-    "show_close_button": "hover",
-    // What to do after closing the current tab.
-    //
-    // 1. Activate the tab that was open previously (default)
-    //     "history"
-    // 2. Activate the right neighbour tab if present
-    //     "neighbour"
-    // 3. Activate the left neighbour tab if present
-    //     "left_neighbour"
-    "activate_on_close": "history",
-    // Which files containing diagnostic errors/warnings to mark in the tabs.
-    // Diagnostics are only shown when file icons are also active.
-    // This setting only works when can take the following three values:
-    //
-    // 1. Do not mark any files:
-    //    "off"
-    // 2. Only mark files with errors:
-    //    "errors"
-    // 3. Mark files with errors and warnings:
-    //    "all"
-    "show_diagnostics": "off",
-  },
-  // Settings related to preview tabs.
-  "preview_tabs": {
-    // Whether preview tabs should be enabled.
-    // Preview tabs allow you to open files in preview mode, where they close automatically
-    // when you open another preview tab.
-    // This is useful for quickly viewing files without cluttering your workspace.
-    "enabled": true,
-    // Whether to open tabs in preview mode when opened from the project panel with a single click.
-    "enable_preview_from_project_panel": true,
-    // Whether to open tabs in preview mode when selected from the file finder.
-    "enable_preview_from_file_finder": false,
-    // Whether to open tabs in preview mode when opened from a multibuffer.
-    "enable_preview_from_multibuffer": true,
-    // Whether to open tabs in preview mode when code navigation is used to open a multibuffer.
-    "enable_preview_multibuffer_from_code_navigation": false,
-    // Whether to open tabs in preview mode when code navigation is used to open a single file.
-    "enable_preview_file_from_code_navigation": true,
-    // Whether to keep tabs in preview mode when code navigation is used to navigate away from them.
-    // If `enable_preview_file_from_code_navigation` or `enable_preview_multibuffer_from_code_navigation` is also true, the new tab may replace the existing one.
-    "enable_keep_preview_on_code_navigation": false,
-  },
-  // Settings related to the file finder.
-  "file_finder": {
-    // Whether to show file icons in the file finder.
-    "file_icons": true,
-    // Determines how much space the file finder can take up in relation to the available window width.
-    // There are 5 possible width values:
-    //
-    // 1. Small: This value is essentially a fixed width.
-    //    "modal_max_width": "small"
-    // 2. Medium:
-    //    "modal_max_width": "medium"
-    // 3. Large:
-    //    "modal_max_width": "large"
-    // 4. Extra Large:
-    //    "modal_max_width": "xlarge"
-    // 5. Fullscreen: This value removes any horizontal padding, as it consumes the whole viewport width.
-    //    "modal_max_width": "full"
-    //
-    // Default: small
-    "modal_max_width": "small",
-    // Determines whether the file finder should skip focus for the active file in search results.
-    // There are 2 possible values:
-    //
-    // 1. true: When searching for files, if the currently active file appears as the first result,
-    //    auto-focus will skip it and focus the second result instead.
-    //    "skip_focus_for_active_in_search": true
-    //
-    // 2. false: When searching for files, the first result will always receive focus,
-    //    even if it's the currently active file.
-    //    "skip_focus_for_active_in_search": false
-    //
-    // Default: true
-    "skip_focus_for_active_in_search": true,
-    // Whether to show the git status in the file finder.
-    "git_status": true,
-    // Whether to use gitignored files when searching.
-    // Only the file Zed had indexed will be used, not necessary all the gitignored files.
-    //
-    // Can accept 3 values:
-    //   * "all": Use all gitignored files
-    //   * "indexed": Use only the files Zed had indexed
-    //   * "smart": Be smart and search for ignored when called from a gitignored worktree
-    "include_ignored": "smart",
-  },
-  // Whether or not to remove any trailing whitespace from lines of a buffer
-  // before saving it.
-  "remove_trailing_whitespace_on_save": true,
-  // Whether to start a new line with a comment when a previous line is a comment as well.
-  "extend_comment_on_newline": true,
-  // Removes any lines containing only whitespace at the end of the file and
-  // ensures just one newline at the end.
-  "ensure_final_newline_on_save": true,
-  // Whether or not to perform a buffer format before saving: [on, off]
-  // Keep in mind, if the autosave with delay is enabled, format_on_save will be ignored
-  "format_on_save": "on",
-  // How to perform a buffer format. This setting can take multiple values:
-  //
-  // 1. Default. Format files using Zed's Prettier integration (if applicable),
-  //    or falling back to formatting via language server:
-  //     "formatter": "auto"
-  // 2. Format code using the current language server:
-  //     "formatter": "language_server"
-  // 3. Format code using a specific language server:
-  //     "formatter": {"language_server": {"name": "ruff"}}
-  // 4. Format code using an external command:
-  //     "formatter": {
-  //       "external": {
-  //         "command": "prettier",
-  //         "arguments": ["--stdin-filepath", "{buffer_path}"]
-  //       }
-  //     }
-  // 5. Format code using Zed's Prettier integration:
-  //     "formatter": "prettier"
-  // 6. Format code using a code action
-  //     "formatter": {"code_action": "source.fixAll.eslint"}
-  // 7. An array of any format step specified above to apply in order
-  //     "formatter": [{"code_action": "source.fixAll.eslint"}, "prettier"]
-  "formatter": "auto",
-  // How to soft-wrap long lines of text.
-  // Possible values:
-  //
-  // 1. Prefer a single line generally, unless an overly long line is encountered.
-  //      "soft_wrap": "none",
-  //      "soft_wrap": "prefer_line", // (deprecated, same as "none")
-  // 2. Soft wrap lines that overflow the editor.
-  //      "soft_wrap": "editor_width",
-  // 3. Soft wrap lines at the preferred line length.
-  //      "soft_wrap": "preferred_line_length",
-  // 4. Soft wrap lines at the preferred line length or the editor width (whichever is smaller).
-  //      "soft_wrap": "bounded",
-  "soft_wrap": "none",
-  // The column at which to soft-wrap lines, for buffers where soft-wrap
-  // is enabled.
-  "preferred_line_length": 80,
-  // Whether to indent lines using tab characters, as opposed to multiple
-  // spaces.
-  "hard_tabs": false,
-  // How many columns a tab should occupy.
-  "tab_size": 4,
-  // What debuggers are preferred by default for all languages.
-  "debuggers": [],
-  // Whether to enable word diff highlighting in the editor.
-  //
-  // When enabled, changed words within modified lines are highlighted
-  // to show exactly what changed.
-  //
-  // Default: true
-  "word_diff_enabled": true,
-  // Control what info is collected by Zed.
-  "telemetry": {
-    // Send debug info like crash reports.
-    "diagnostics": true,
-    // Send anonymized usage data like what languages you're using Zed with.
-    "metrics": true,
-  },
-  // Whether to disable all AI features in Zed.
-  //
-  // Default: false
-  "disable_ai": false,
-  // Automatically update Zed. This setting may be ignored on Linux if
-  // installed through a package manager.
-  "auto_update": true,
-  // How to render LSP `textDocument/documentColor` colors in the editor.
-  //
-  // Possible values:
-  //
-  // 1. Do not query and render document colors.
-  //      "lsp_document_colors": "none",
-  // 2. Render document colors as inlay hints near the color text (default).
-  //      "lsp_document_colors": "inlay",
-  // 3. Draw a border around the color text.
-  //      "lsp_document_colors": "border",
-  // 4. Draw a background behind the color text..
-  //      "lsp_document_colors": "background",
-  "lsp_document_colors": "inlay",
-  // Diagnostics configuration.
-  "diagnostics": {
-    // Whether to show the project diagnostics button in the status bar.
-    "button": true,
-    // Whether to show warnings or not by default.
-    "include_warnings": true,
-    // Settings for using LSP pull diagnostics mechanism in Zed.
-    "lsp_pull_diagnostics": {
-      // Whether to pull for diagnostics or not.
-      "enabled": true,
-      // Minimum time to wait before pulling diagnostics from the language server(s).
-      // 0 turns the debounce off.
-      "debounce_ms": 50,
-    },
-    // Settings for inline diagnostics
-    "inline": {
-      // Whether to show diagnostics inline or not
-      "enabled": false,
-      // The delay in milliseconds to show inline diagnostics after the
-      // last diagnostic update.
-      "update_debounce_ms": 150,
-      // The amount of padding between the end of the source line and the start
-      // of the inline diagnostic in units of em widths.
-      "padding": 4,
-      // The minimum column to display inline diagnostics. This setting can be
-      // used to horizontally align inline diagnostics at some column. Lines
-      // longer than this value will still push diagnostics further to the right.
-      "min_column": 0,
-      // The minimum severity of the diagnostics to show inline.
-      // Inherits editor's diagnostics' max severity settings when `null`.
-      "max_severity": null,
-    },
-  },
-  // Files or globs of files that will be excluded by Zed entirely. They will be skipped during file
-  // scans, file searches, and not be displayed in the project file tree. Takes precedence over `file_scan_inclusions`.
-  "file_scan_exclusions": [
-    "**/.git",
-    "**/.svn",
-    "**/.hg",
-    "**/.jj",
-    "**/.repo",
-    "**/CVS",
-    "**/.DS_Store",
-    "**/Thumbs.db",
-    "**/.classpath",
-    "**/.settings",
-  ],
-  // Files or globs of files that will be included by Zed, even when ignored by git. This is useful
-  // for files that are not tracked by git, but are still important to your project. Note that globs
-  // that are overly broad can slow down Zed's file scanning. `file_scan_exclusions` takes
-  // precedence over these inclusions.
-  "file_scan_inclusions": [".env*"],
-  // Globs to match files that will be considered "hidden". These files can be hidden from the
-  // project panel by toggling the "hide_hidden" setting.
-  "hidden_files": ["**/.*"],
-  // Git gutter behavior configuration.
-  "git": {
-    // Control whether the git gutter is shown. May take 2 values:
-    // 1. Show the gutter
-    //      "git_gutter": "tracked_files"
-    // 2. Hide the gutter
-    //      "git_gutter": "hide"
-    "git_gutter": "tracked_files",
-    /// Sets the debounce threshold (in milliseconds) after which changes are reflected in the git gutter.
-    ///
-    /// Default: 0
-    "gutter_debounce": 0,
-    // Control whether the git blame information is shown inline,
-    // in the currently focused line.
-    "inline_blame": {
-      "enabled": true,
-      // Sets a delay after which the inline blame information is shown.
-      // Delay is restarted with every cursor movement.
-      "delay_ms": 0,
-      // The amount of padding between the end of the source line and the start
-      // of the inline blame in units of em widths.
-      "padding": 7,
-      // Whether or not to display the git commit summary on the same line.
-      "show_commit_summary": false,
-      // The minimum column number to show the inline blame information at
-      "min_column": 0,
-    },
-    "blame": {
-      "show_avatar": true,
-    },
-    // Control which information is shown in the branch picker.
-    "branch_picker": {
-      "show_author_name": true,
-    },
-    // How git hunks are displayed visually in the editor.
-    // This setting can take two values:
-    //
-    // 1. Show unstaged hunks filled and staged hunks hollow:
-    //    "hunk_style": "staged_hollow"
-    // 2. Show unstaged hunks hollow and staged hunks filled:
-    //    "hunk_style": "unstaged_hollow"
-    "hunk_style": "staged_hollow",
-    // Should the name or path be displayed first in the git view.
-    // "path_style": "file_name_first" or "file_path_first"
-    "path_style": "file_name_first",
-  },
-  // The list of custom Git hosting providers.
-  "git_hosting_providers": [
-    // {
-    //   "provider": "github",
-    //   "name": "BigCorp GitHub",
-    //   "base_url": "https://code.big-corp.com"
-    // }
-  ],
-  // Configuration for how direnv configuration should be loaded. May take 2 values:
-  // 1. Load direnv configuration using `direnv export json` directly.
-  //      "load_direnv": "direct"
-  // 2. Load direnv configuration through the shell hook, works for POSIX shells and fish.
-  //      "load_direnv": "shell_hook"
-  // 3. Don't load direnv configuration at all.
-  //      "load_direnv": "disabled"
-  "load_direnv": "direct",
-  "edit_predictions": {
-    // A list of globs representing files that edit predictions should be disabled for.
-    // There's a sensible default list of globs already included.
-    // Any addition to this list will be merged with the default list.
-    // Globs are matched relative to the worktree root,
-    // except when starting with a slash (/) or equivalent in Windows.
-    "disabled_globs": [
-      "**/.env*",
-      "**/*.pem",
-      "**/*.key",
-      "**/*.cert",
-      "**/*.crt",
-      "**/.dev.vars",
-      "**/secrets.yml",
-      "**/.zed/settings.json", // zed project settings
-      "/**/zed/settings.json", // zed user settings
-      "/**/zed/keymap.json",
-    ],
-    // When to show edit predictions previews in buffer.
-    // This setting takes two possible values:
-    // 1. Display predictions inline when there are no language server completions available.
-    //     "mode": "eager"
-    // 2. Display predictions inline only when holding a modifier key (alt by default).
-    //     "mode": "subtle"
-    "mode": "eager",
-    // Copilot-specific settings
-    // "copilot": {
-    //   "enterprise_uri": "",
-    //   "proxy": "",
-    //   "proxy_no_verify": false
-    // },
-    "copilot": {
-      "enterprise_uri": null,
-      "proxy": null,
-      "proxy_no_verify": null,
-    },
-    "codestral": {
-      "model": null,
-      "max_tokens": null,
-    },
-    // Whether edit predictions are enabled when editing text threads in the agent panel.
-    // This setting has no effect if globally disabled.
-    "enabled_in_text_threads": true,
-  },
-  // Settings specific to journaling
-  "journal": {
-    // The path of the directory where journal entries are stored
-    "path": "~",
-    // What format to display the hours in
-    // May take 2 values:
-    // 1. hour12
-    // 2. hour24
-    "hour_format": "hour12",
-  },
-  // Status bar-related settings.
-  "status_bar": {
-    // Whether to show the status bar.
-    "experimental.show": true,
-    // Whether to show the active language button in the status bar.
-    "active_language_button": true,
-    // Whether to show the cursor position button in the status bar.
-    "cursor_position_button": true,
-    // Whether to show active line endings button in the status bar.
-    "line_endings_button": false,
-  },
-  // Settings specific to the terminal
-  "terminal": {
-    // What shell to use when opening a terminal. May take 3 values:
-    // 1. Use the system's default terminal configuration in /etc/passwd
-    //      "shell": "system"
-    // 2. A program:
-    //      "shell": {
-    //        "program": "sh"
-    //      }
-    // 3. A program with arguments:
-    //     "shell": {
-    //         "with_arguments": {
-    //           "program": "/bin/bash",
-    //           "args": ["--login"]
-    //         }
-    //     }
-    "shell": "system",
-    // Where to dock terminals panel. Can be `left`, `right`, `bottom`.
-    "dock": "bottom",
-    // Default width when the terminal is docked to the left or right.
-    "default_width": 640,
-    // Default height when the terminal is docked to the bottom.
-    "default_height": 320,
-    // What working directory to use when launching the terminal.
-    // May take 4 values:
-    // 1. Use the current file's project directory. Fallback to the
-    //    first project directory strategy if unsuccessful
-    //      "working_directory": "current_project_directory"
-    // 2. Use the first project in this workspace's directory
-    //      "working_directory": "first_project_directory"
-    // 3. Always use this platform's home directory (if we can find it)
-    //     "working_directory": "always_home"
-    // 4. Always use a specific directory. This value will be shell expanded.
-    //    If this path is not a valid directory the terminal will default to
-    //    this platform's home directory  (if we can find it)
-    //      "working_directory": {
-    //        "always": {
-    //          "directory": "~/zed/projects/"
-    //        }
-    //      }
-    "working_directory": "current_project_directory",
-    // Set the cursor blinking behavior in the terminal.
-    // May take 3 values:
-    //  1. Never blink the cursor, ignoring the terminal mode
-    //         "blinking": "off",
-    //  2. Default the cursor blink to off, but allow the terminal to
-    //     set blinking
-    //         "blinking": "terminal_controlled",
-    //  3. Always blink the cursor, ignoring the terminal mode
-    //         "blinking": "on",
-    "blinking": "terminal_controlled",
-    // Default cursor shape for the terminal.
-    //  1. A block that surrounds the following character
-    //     "block"
-    //  2. A vertical bar
-    //     "bar"
-    //  3. An underline / underscore that runs along the following character
-    //     "underline"
-    //  4. A box drawn around the following character
-    //     "hollow"
-    //
-    // Default: "block"
-    "cursor_shape": "block",
-    // Set whether Alternate Scroll mode (code: ?1007) is active by default.
-    // Alternate Scroll mode converts mouse scroll events into up / down key
-    // presses when in the alternate screen (e.g. when running applications
-    // like vim or  less). The terminal can still set and unset this mode.
-    // May take 2 values:
-    //  1. Default alternate scroll mode to on
-    //         "alternate_scroll": "on",
-    //  2. Default alternate scroll mode to off
-    //         "alternate_scroll": "off",
-    "alternate_scroll": "on",
-    // Set whether the option key behaves as the meta key.
-    // May take 2 values:
-    //  1. Rely on default platform handling of option key, on macOS
-    //     this means generating certain unicode characters
-    //         "option_as_meta": false,
-    //  2. Make the option keys behave as a 'meta' key, e.g. for emacs
-    //         "option_as_meta": true,
-    "option_as_meta": false,
-    // Whether or not selecting text in the terminal will automatically
-    // copy to the system clipboard.
-    "copy_on_select": false,
-    // Whether to keep the text selection after copying it to the clipboard.
-    "keep_selection_on_copy": true,
-    // Whether to show the terminal button in the status bar
-    "button": true,
-    // Any key-value pairs added to this list will be added to the terminal's
-    // environment. Use `:` to separate multiple values.
-    "env": {
-      // "KEY": "value1:value2"
-    },
-    // Set the terminal's line height.
-    // May take 3 values:
-    //  1. Use a line height that's comfortable for reading, 1.618
-    //         "line_height": "comfortable"
-    //  2. Use a standard line height, 1.3. This option is useful for TUIs,
-    //      particularly if they use box characters
-    //         "line_height": "standard",
-    //  3. Use a custom line height.
-    //         "line_height": {
-    //           "custom": 2
-    //         },
-    "line_height": "standard",
-    // Activate the python virtual environment, if one is found, in the
-    // terminal's working directory (as resolved by the working_directory
-    // setting). Set this to "off" to disable this behavior.
-    "detect_venv": {
-      "on": {
-        // Default directories to search for virtual environments, relative
-        // to the current working directory. We recommend overriding this
-        // in your project's settings, rather than globally.
-        "directories": [".env", "env", ".venv", "venv"],
-        // Can also be `csh`, `fish`, `nushell` and `power_shell`
-        "activate_script": "default",
-        // Preferred Conda manager to use when activating Conda environments.
-        // Values: "auto", "conda", "mamba", "micromamba"
-        // Default: "auto"
-        "conda_manager": "auto",
-      },
-    },
-    "toolbar": {
-      // Whether to display the terminal title in its toolbar's breadcrumbs.
-      // Only shown if the terminal title is not empty.
-      //
-      // The shell running in the terminal needs to be configured to emit the title.
-      // Example: `echo -e "\e]2;New Title\007";`
-      "breadcrumbs": false,
-    },
-    // Scrollbar-related settings
-    "scrollbar": {
-      // When to show the scrollbar in the terminal.
-      // This setting can take five values:
-      //
-      // 1. null (default): Inherit editor settings
-      // 2. Show the scrollbar if there's important information or
-      //    follow the system's configured behavior (default):
-      //   "auto"
-      // 3. Match the system's configured behavior:
-      //    "system"
-      // 4. Always show the scrollbar:
-      //    "always"
-      // 5. Never show the scrollbar:
-      //    "never"
-      "show": null,
-    },
-    // Set the terminal's font size. If this option is not included,
-    // the terminal will default to matching the buffer's font size.
-    // "font_size": 15,
-    // Set the terminal's font family. If this option is not included,
-    // the terminal will default to matching the buffer's font family.
-    // "font_family": ".ZedMono",
-    // Set the terminal's font fallbacks. If this option is not included,
-    // the terminal will default to matching the buffer's font fallbacks.
-    // This will be merged with the platform's default font fallbacks
-    // "font_fallbacks": ["FiraCode Nerd Fonts"],
-    // The weight of the editor font in standard CSS units from 100 to 900.
-    "font_weight": 400,
-    // Sets the maximum number of lines in the terminal's scrollback buffer.
-    // Default: 10_000, maximum: 100_000 (all bigger values set will be treated as 100_000), 0 disables the scrolling.
-    // Existing terminals will not pick up this change until they are recreated.
-    "max_scroll_history_lines": 10000,
-    // The multiplier for scrolling speed in the terminal.
-    "scroll_multiplier": 1.0,
-    // The minimum APCA perceptual contrast between foreground and background colors.
-    // APCA (Accessible Perceptual Contrast Algorithm) is more accurate than WCAG 2.x,
-    // especially for dark mode. Values range from 0 to 106.
-    //
-    // Based on APCA Readability Criterion (ARC) Bronze Simple Mode:
-    // https://readtech.org/ARC/tests/bronze-simple-mode/
-    // - 0: No contrast adjustment
-    // - 45: Minimum for large fluent text (36px+)
-    // - 60: Minimum for other content text
-    // - 75: Minimum for body text
-    // - 90: Preferred for body text
-    //
-    // Most terminal themes have APCA values of 40-70.
-    // A value of 45 preserves colorful themes while ensuring legibility.
-    "minimum_contrast": 45,
-    // Regexes used to identify paths for hyperlink navigation. Supports optional named capture
-    // groups `path`, `line`, `column`, and `link`. If none of these are present, the entire match
-    // is the hyperlink target. If `path` is present, it is the hyperlink target, along with `line`
-    // and `column` if present. `link` may be used to customize what text in terminal is part of the
-    // hyperlink. If `link` is not present, the text of the entire match is used. If `line` and
-    // `column` are not present, the default built-in line and column suffix processing is used
-    // which parses `line:column` and `(line,column)` variants. The default value handles Python
-    // diagnostics and common path, line, column syntaxes. This can be extended or replaced to
-    // handle specific scenarios. For example, to enable support for hyperlinking paths which
-    // contain spaces in rust output,
-    //
-    // [
-    //   "\\s+(-->|:::|at) (?<link>(?<path>.+?))(:$|$)",
-    //   "\\s+(Compiling|Checking|Documenting) [^(]+\\((?<link>(?<path>.+))\\)"
-    // ],
-    //
-    // could be used. Processing stops at the first regex with a match, even if no link is
-    // produced which is the case when the cursor is not over the hyperlinked text. For best
-    // performance it is recommended to order regexes from most common to least common. For
-    // readability and documentation, each regex may be an array of strings which are collected
-    // into one multi-line regex string for use in terminal path hyperlink detection.
-    "path_hyperlink_regexes": [
-      // Python-style diagnostics
-      "File \"(?<path>[^\"]+)\", line (?<line>[0-9]+)",
-      // Common path syntax with optional line, column, description, trailing punctuation, or
-      // surrounding symbols or quotes
-      [
-        "(?x)",
-        "(?<path>",
-        "    (",
-        "        # multi-char path: first char (not opening delimiter or space)",
-        "        [^({\\[<\"'`\\ ]",
-        "        # middle chars: non-space, and colon/paren only if not followed by digit/paren",
-        "        ([^\\ :(]|[:(][^0-9()])*",
-        "        # last char: not closing delimiter or colon",
-        "        [^()}\\]>\"'`.,;:\\ ]",
-        "    |",
-        "        # single-char path: not delimiter, punctuation, or space",
-        "        [^(){}\\[\\]<>\"'`.,;:\\ ]",
-        "    )",
-        "    # optional line/column suffix (included in path for PathWithPosition::parse_str)",
-        "    (:+[0-9]+(:[0-9]+)?|:?\\([0-9]+([,:]?[0-9]+)?\\))?",
-        ")",
-      ],
-    ],
-    // Timeout for hover and Cmd-click path hyperlink discovery in milliseconds. Specifying a
-    // timeout of `0` will disable path hyperlinking in terminal.
-    "path_hyperlink_timeout_ms": 1,
-  },
-  "code_actions_on_format": {},
-  // Settings related to running tasks.
-  "tasks": {
-    "variables": {},
-    "enabled": true,
-    // Use LSP tasks over Zed language extension ones.
-    // If no LSP tasks are returned due to error/timeout or regular execution,
-    // Zed language extension tasks will be used instead.
-    //
-    // Other Zed tasks will still be shown:
-    // * Zed task from either of the task config file
-    // * Zed task from history (e.g. one-off task was spawned before)
-    //
-    // Default: true
-    "prefer_lsp": true,
-  },
-  // An object whose keys are language names, and whose values
-  // are arrays of filenames or extensions of files that should
-  // use those languages.
-  //
-  // For example, to treat files like `foo.notjs` as JavaScript,
-  // and `Embargo.lock` as TOML:
-  //
-  // {
-  //   "JavaScript": ["notjs"],
-  //   "TOML": ["Embargo.lock"]
-  // }
-  //
-  "file_types": {
-    "JSONC": ["**/.zed/**/*.json", "**/zed/**/*.json", "**/Zed/**/*.json", "**/.vscode/**/*.json", "tsconfig*.json"],
-    "Markdown": [".rules", ".cursorrules", ".windsurfrules", ".clinerules"],
-    "Shell Script": [".env.*"],
-  },
-  // Settings for which version of Node.js and NPM to use when installing
-  // language servers and Copilot.
-  //
-  // Note: changing this setting currently requires restarting Zed.
-  "node": {
-    // By default, Zed will look for `node` and `npm` on your `$PATH`, and use the
-    // existing executables if their version is recent enough. Set this to `true`
-    // to prevent this, and force Zed to always download and install its own
-    // version of Node.
-    "ignore_system_version": false,
-    // You can also specify alternative paths to Node and NPM. If you specify
-    // `path`, but not `npm_path`, Zed will assume that `npm` is located at
-    // `${path}/../npm`.
-    "path": null,
-    "npm_path": null,
-  },
-  // The extensions that Zed should automatically install on startup.
-  //
-  // If you don't want any of these extensions, add this field to your settings
-  // and change the value to `false`.
-  "auto_install_extensions": {
-    "html": true,
-  },
-  // The capabilities granted to extensions.
-  //
-  // This list can be customized to restrict what extensions are able to do.
-  "granted_extension_capabilities": [
-    { "kind": "process:exec", "command": "*", "args": ["**"] },
-    { "kind": "download_file", "host": "*", "path": ["**"] },
-    { "kind": "npm:install", "package": "*" },
-  ],
-  // Controls how completions are processed for this language.
-  "completions": {
-    // Controls how words are completed.
-    // For large documents, not all words may be fetched for completion.
-    //
-    // May take 3 values:
-    // 1. "enabled"
-    //   Always fetch document's words for completions along with LSP completions.
-    // 2. "fallback"
-    //   Only if LSP response errors or times out, use document's words to show completions.
-    // 3. "disabled"
-    //   Never fetch or complete document's words for completions.
-    //   (Word-based completions can still be queried via a separate action)
-    //
-    // Default: fallback
-    "words": "fallback",
-    // Minimum number of characters required to automatically trigger word-based completions.
-    // Before that value, it's still possible to trigger the words-based completion manually with the corresponding editor command.
-    //
-    // Default: 3
-    "words_min_length": 3,
-    // Whether to fetch LSP completions or not.
-    //
-    // Default: true
-    "lsp": true,
-    // When fetching LSP completions, determines how long to wait for a response of a particular server.
-    // When set to 0, waits indefinitely.
-    //
-    // Default: 0
-    "lsp_fetch_timeout_ms": 0,
-    // Controls what range to replace when accepting LSP completions.
-    //
-    // When LSP servers give an `InsertReplaceEdit` completion, they provides two ranges: `insert` and `replace`. Usually, `insert`
-    // contains the word prefix before your cursor and `replace` contains the whole word.
-    //
-    // Effectively, this setting just changes whether Zed will use the received range for `insert` or `replace`, so the results may
-    // differ depending on the underlying LSP server.
-    //
-    // Possible values:
-    // 1. "insert"
-    //   Replaces text before the cursor, using the `insert` range described in the LSP specification.
-    // 2. "replace"
-    //   Replaces text before and after the cursor, using the `replace` range described in the LSP specification.
-    // 3. "replace_subsequence"
-    //   Behaves like `"replace"` if the text that would be replaced is a subsequence of the completion text,
-    //   and like `"insert"` otherwise.
-    // 4. "replace_suffix"
-    //   Behaves like `"replace"` if the text after the cursor is a suffix of the completion, and like
-    //   `"insert"` otherwise.
-    "lsp_insert_mode": "replace_suffix",
-  },
-  // Different settings for specific languages.
-  "languages": {
-    "Astro": {
-      "language_servers": ["astro-language-server", "..."],
-      "prettier": {
-        "allowed": true,
-        "plugins": ["prettier-plugin-astro"],
-      },
-    },
-    "Blade": {
-      "prettier": {
-        "allowed": true,
-      },
-    },
-    "C": {
-      "format_on_save": "off",
-      "use_on_type_format": false,
-      "prettier": {
-        "allowed": false,
-      },
-    },
-    "C++": {
-      "format_on_save": "off",
-      "use_on_type_format": false,
-      "prettier": {
-        "allowed": false,
-      },
-    },
-    "CSharp": {
-      "language_servers": ["roslyn", "!omnisharp", "..."],
-    },
-    "CSS": {
-      "prettier": {
-        "allowed": true,
-      },
-    },
-    "Dart": {
-      "tab_size": 2,
-    },
-    "Diff": {
-      "show_edit_predictions": false,
-      "remove_trailing_whitespace_on_save": false,
-      "ensure_final_newline_on_save": false,
-    },
-    "Elixir": {
-      "language_servers": ["elixir-ls", "!expert", "!next-ls", "!lexical", "..."],
-    },
-    "Elm": {
-      "tab_size": 4,
-    },
-    "Erlang": {
-      "language_servers": ["erlang-ls", "!elp", "..."],
-    },
-    "Git Commit": {
-      "allow_rewrap": "anywhere",
-      "soft_wrap": "editor_width",
-      "preferred_line_length": 72,
-    },
-    "Go": {
-      "hard_tabs": true,
-      "code_actions_on_format": {
-        "source.organizeImports": true,
-      },
-      "debuggers": ["Delve"],
-    },
-    "GraphQL": {
-      "prettier": {
-        "allowed": true,
-      },
-    },
-    "HEEX": {
-      "language_servers": ["elixir-ls", "!expert", "!next-ls", "!lexical", "..."],
-    },
-    "HTML": {
-      "prettier": {
-        "allowed": true,
-      },
-    },
-    "HTML+ERB": {
-      "language_servers": ["herb", "!ruby-lsp", "..."],
-    },
-    "Java": {
-      "prettier": {
-        "allowed": true,
-        "plugins": ["prettier-plugin-java"],
-      },
-    },
-    "JavaScript": {
-      "language_servers": ["!typescript-language-server", "vtsls", "..."],
-      "prettier": {
-        "allowed": true,
-      },
-    },
-    "JSON": {
-      "prettier": {
-        "allowed": true,
-      },
-    },
-    "JSONC": {
-      "prettier": {
-        "allowed": true,
-      },
-    },
-    "JS+ERB": {
-      "language_servers": ["!ruby-lsp", "..."],
-    },
-    "Kotlin": {
-      "language_servers": ["!kotlin-language-server", "kotlin-lsp", "..."],
-    },
-    "LaTeX": {
-      "formatter": "language_server",
-      "language_servers": ["texlab", "..."],
-      "prettier": {
-        "allowed": true,
-        "plugins": ["prettier-plugin-latex"],
-      },
-    },
-    "Markdown": {
-      "format_on_save": "off",
-      "use_on_type_format": false,
-      "remove_trailing_whitespace_on_save": false,
-      "allow_rewrap": "anywhere",
-      "soft_wrap": "editor_width",
-      "completions": {
-        "words": "disabled",
-      },
-      "prettier": {
-        "allowed": true,
-      },
-    },
-    "PHP": {
-      "language_servers": ["phpactor", "!intelephense", "!phptools", "..."],
-      "prettier": {
-        "allowed": true,
-        "plugins": ["@prettier/plugin-php"],
-        "parser": "php",
-      },
-    },
-    "Plain Text": {
-      "allow_rewrap": "anywhere",
-      "soft_wrap": "editor_width",
-      "completions": {
-        "words": "disabled",
-      },
-    },
-    "Python": {
-      "code_actions_on_format": {
-        "source.organizeImports.ruff": true,
-      },
-      "formatter": {
-        "language_server": {
-          "name": "ruff",
-        },
-      },
-      "debuggers": ["Debugpy"],
-      "language_servers": ["basedpyright", "ruff", "!ty", "!pyrefly", "!pyright", "!pylsp", "..."],
-    },
-    "Ruby": {
-      "language_servers": ["solargraph", "!ruby-lsp", "!rubocop", "!sorbet", "!steep", "..."],
-    },
-    "Rust": {
-      "debuggers": ["CodeLLDB"],
-    },
-    "SCSS": {
-      "prettier": {
-        "allowed": true,
-      },
-    },
-    "Starlark": {
-      "language_servers": ["starpls", "!buck2-lsp", "..."],
-    },
-    "Svelte": {
-      "language_servers": ["svelte-language-server", "..."],
-      "prettier": {
-        "allowed": true,
-        "plugins": ["prettier-plugin-svelte"],
-      },
-    },
-    "TSX": {
-      "language_servers": ["!typescript-language-server", "vtsls", "..."],
-      "prettier": {
-        "allowed": true,
-      },
-    },
-    "Twig": {
-      "prettier": {
-        "allowed": true,
-      },
-    },
-    "TypeScript": {
-      "language_servers": ["!typescript-language-server", "vtsls", "..."],
-      "prettier": {
-        "allowed": true,
-      },
-    },
-    "SystemVerilog": {
-      "format_on_save": "off",
-      "language_servers": ["!slang", "..."],
-      "use_on_type_format": false,
-    },
-    "Vue.js": {
-      "language_servers": ["vue-language-server", "vtsls", "..."],
-      "prettier": {
-        "allowed": true,
-      },
-    },
-    "XML": {
-      "prettier": {
-        "allowed": true,
-        "plugins": ["@prettier/plugin-xml"],
-      },
-    },
-    "YAML": {
-      "prettier": {
-        "allowed": true,
-      },
-    },
-    "YAML+ERB": {
-      "language_servers": ["!ruby-lsp", "..."],
-    },
-    "Zig": {
-      "language_servers": ["zls", "..."],
-    },
-  },
-  // Different settings for specific language models.
-  "language_models": {
-    "anthropic": {
-      "api_url": "https://api.anthropic.com",
-    },
-    "bedrock": {},
-    "google": {
-      "api_url": "https://generativelanguage.googleapis.com",
-    },
-    "ollama": {
-      "api_url": "http://localhost:11434",
-    },
-    "openai": {
-      "api_url": "https://api.openai.com/v1",
-    },
-    "openai_compatible": {},
-    "open_router": {
-      "api_url": "https://openrouter.ai/api/v1",
-    },
-    "lmstudio": {
-      "api_url": "http://localhost:1234/api/v0",
-    },
-    "deepseek": {
-      "api_url": "https://api.deepseek.com/v1",
-    },
-    "mistral": {
-      "api_url": "https://api.mistral.ai/v1",
-    },
-    "vercel": {
-      "api_url": "https://api.v0.dev/v1",
-    },
-    "x_ai": {
-      "api_url": "https://api.x.ai/v1",
-    },
-    "zed.dev": {},
-  },
-  "session": {
-    // Whether or not to restore unsaved buffers on restart.
-    //
-    // If this is true, user won't be prompted whether to save/discard
-    // dirty files when closing the application.
-    //
-    // Default: true
-    "restore_unsaved_buffers": true,
-  },
-  // Zed's Prettier integration settings.
-  // Allows to enable/disable formatting with Prettier
-  // and configure default Prettier, used when no project-level Prettier installation is found.
-  "prettier": {
-    // Enables or disables formatting with Prettier for any given language.
-    "allowed": false,
-    // Forces Prettier integration to use a specific parser name when formatting files with the language.
-    "plugins": [],
-    // Default Prettier options, in the format as in package.json section for Prettier.
-    // If project installs Prettier via its package.json, these options will be ignored.
-    // "trailingComma": "es5",
-    // "tabWidth": 4,
-    // "semi": false,
-    // "singleQuote": true
-    // Forces Prettier integration to use a specific parser name when formatting files with the language
-    // when set to a non-empty string.
-    "parser": "",
-  },
-  // Settings for auto-closing of JSX tags.
-  "jsx_tag_auto_close": {
-    "enabled": true,
-  },
-  // LSP Specific settings.
-  "lsp": {
-    // Specify the LSP name as a key here.
-    // "rust-analyzer": {
-    //     // A special flag for rust-analyzer integration, to use server-provided tasks
-    //     enable_lsp_tasks": true,
-    //     // These initialization options are merged into Zed's defaults
-    //     "initialization_options": {
-    //         "check": {
-    //             "command": "clippy" // rust-analyzer.check.command (default: "check")
-    //         }
-    //     }
-    // }
-  },
-  // DAP Specific settings.
-  "dap": {
-    // Specify the DAP name as a key here.
-    "CodeLLDB": {
-      "env": {
-        "RUST_LOG": "info",
-      },
-    },
-  },
-  // Common language server settings.
-  "global_lsp_settings": {
-    // Whether to show the LSP servers button in the status bar.
-    "button": true,
-  },
-  // Jupyter settings
-  "jupyter": {
-    "enabled": true,
-    "kernel_selections": {},
-    // Specify the language name as the key and the kernel name as the value.
-    // "kernel_selections": {
-    //    "python": "conda-base"
-    //    "typescript": "deno"
-    // }
-  },
-  // REPL settings.
-  "repl": {
-    // Maximum number of columns to keep in REPL's scrollback buffer.
-    // Clamped with [20, 512] range.
-    "max_columns": 128,
-    // Maximum number of lines to keep in REPL's scrollback buffer.
-    // Clamped with [4, 256] range.
-    "max_lines": 32,
-  },
-  // Vim settings
-  "vim": {
-    "default_mode": "normal",
-    "toggle_relative_line_numbers": false,
-    "use_system_clipboard": "always",
-    "use_smartcase_find": false,
-    "highlight_on_yank_duration": 200,
-    "custom_digraphs": {},
-    // Cursor shape for the each mode.
-    // Specify the mode as the key and the shape as the value.
-    // The mode can be one of the following: "normal", "replace", "insert", "visual".
-    // The shape can be one of the following: "block", "bar", "underline", "hollow".
-    "cursor_shape": {},
-  },
-  // The server to connect to. If the environment variable
-  // ZED_SERVER_URL is set, it will override this setting.
-  "server_url": "https://zed.dev",
-  // Settings overrides to use when using Zed Preview.
-  // Mostly useful for developers who are managing multiple instances of Zed.
-  "preview": {
-    // "theme": "Andromeda"
-  },
-  // Settings overrides to use when using Zed Nightly.
-  // Mostly useful for developers who are managing multiple instances of Zed.
-  "nightly": {
-    // "theme": "Andromeda"
-  },
-  // Settings overrides to use when using Zed Stable.
-  // Mostly useful for developers who are managing multiple instances of Zed.
-  "stable": {
-    // "theme": "Andromeda"
-  },
-  // Settings overrides to use when using Zed Dev.
-  // Mostly useful for developers who are managing multiple instances of Zed.
-  "dev": {
-    // "theme": "Andromeda"
-  },
-  // Settings overrides to use when using Linux.
-  "linux": {},
-  // Settings overrides to use when using macOS.
-  "macos": {},
-  // Settings overrides to use when using Windows.
-  "windows": {
-    "languages": {
-      "PHP": {
-        "language_servers": ["intelephense", "!phpactor", "!phptools", "..."],
-      },
-    },
-  },
-  // Whether to show full labels in line indicator or short ones
-  //
-  // Values:
-  //   - `short`: "2 s, 15 l, 32 c"
-  //   - `long`: "2 selections, 15 lines, 32 characters"
-  // Default: long
-  "line_indicator_format": "long",
-  // Set a proxy to use. The proxy protocol is specified by the URI scheme.
-  //
-  // Supported URI scheme: `http`, `https`, `socks4`, `socks4a`, `socks5`,
-  // `socks5h`. `http` will be used when no scheme is specified.
-  //
-  // By default no proxy will be used, or Zed will try get proxy settings from
-  // environment variables. If certain hosts should not be proxied,
-  // set the `no_proxy` environment variable and provide a comma-separated list.
-  //
-  // Examples:
-  //   - "proxy": "socks5h://localhost:10808"
-  //   - "proxy": "http://127.0.0.1:10809"
-  "proxy": null,
-  // Set to configure aliases for the command palette.
-  // When typing a query which is a key of this object, the value will be used instead.
-  //
-  // Examples:
-  // {
-  //   "W": "workspace::Save"
-  // }
-  "command_aliases": {},
-  // ssh_connections is an array of ssh connections.
-  // You can configure these from `project: Open Remote` in the command palette.
-  // Zed's ssh support will pull configuration from your ~/.ssh too.
-  // Examples:
-  // [
-  //   {
-  //     "host": "example-box",
-  //     // "port": 22, "username": "test", "args": ["-i", "/home/user/.ssh/id_rsa"]
-  //     "projects": [
-  //       {
-  //         "paths": ["/home/user/code/zed"]
-  //       }
-  //     ]
-  //   }
-  // ]
-  "ssh_connections": [],
-  // Whether to read ~/.ssh/config for ssh connection sources.
-  "read_ssh_config": true,
-  // Configures context servers for use by the agent.
-  "context_servers": {},
-  // Configures agent servers available in the agent panel.
-  "agent_servers": {},
-  "debugger": {
-    "stepping_granularity": "line",
-    "save_breakpoints": true,
-    "timeout": 2000,
-    "dock": "bottom",
-    "log_dap_communications": true,
-    "format_dap_log_messages": true,
-    "button": true,
-  },
-  // Configures any number of settings profiles that are temporarily applied on
-  // top of your existing user settings when selected from
-  // `settings profile selector: toggle`.
-  // Examples:
-  // "profiles": {
-  //   "Presenting": {
-  //     "agent_ui_font_size": 20.0,
-  //     "buffer_font_size": 20.0,
-  //     "theme": "One Light",
-  //     "ui_font_size": 20.0
-  //   },
-  //   "Python (ty)": {
-  //     "languages": {
-  //       "Python": {
-  //         "language_servers": ["ty"]
-  //       }
-  //     }
-  //   }
-  // }
-  "profiles": {},
-
-  // A map of log scopes to the desired log level.
-  // Useful for filtering out noisy logs or enabling more verbose logging.
-  //
-  // Example: {"log": {"client": "warn"}}
-  "log": {},
-}
diff --git a/assets/settings/initial_debug_tasks.json b/assets/settings/initial_debug_tasks.json
deleted file mode 100644
index af4512bd51..0000000000
--- a/assets/settings/initial_debug_tasks.json
+++ /dev/null
@@ -1,29 +0,0 @@
-// Some example tasks for common languages.
-//
-// For more documentation on how to configure debug tasks,
-// see: https://zed.dev/docs/debugger
-[
-  {
-    "label": "Debug active Python file",
-    "adapter": "Debugpy",
-    "program": "$ZED_FILE",
-    "request": "launch",
-    "cwd": "$ZED_WORKTREE_ROOT"
-  },
-  {
-    "label": "Debug active JavaScript file",
-    "adapter": "JavaScript",
-    "program": "$ZED_FILE",
-    "request": "launch",
-    "cwd": "$ZED_WORKTREE_ROOT",
-    "type": "pwa-node"
-  },
-  {
-    "label": "JavaScript debug terminal",
-    "adapter": "JavaScript",
-    "request": "launch",
-    "cwd": "$ZED_WORKTREE_ROOT",
-    "console": "integratedTerminal",
-    "type": "pwa-node"
-  }
-]
diff --git a/assets/settings/initial_local_debug_tasks.json b/assets/settings/initial_local_debug_tasks.json
deleted file mode 100644
index 4be1a903ab..0000000000
--- a/assets/settings/initial_local_debug_tasks.json
+++ /dev/null
@@ -1,5 +0,0 @@
-// Project-local debug tasks
-//
-// For more documentation on how to configure debug tasks,
-// see: https://zed.dev/docs/debugger
-[]
diff --git a/assets/settings/initial_local_settings.json b/assets/settings/initial_local_settings.json
deleted file mode 100644
index 79860b3a94..0000000000
--- a/assets/settings/initial_local_settings.json
+++ /dev/null
@@ -1,5 +0,0 @@
-// Folder-specific settings
-//
-// For a full list of overridable settings, and general information on folder-specific settings,
-// see the documentation: https://zed.dev/docs/configuring-zed#settings-files
-{}
diff --git a/assets/settings/initial_server_settings.json b/assets/settings/initial_server_settings.json
deleted file mode 100644
index d6ec33e601..0000000000
--- a/assets/settings/initial_server_settings.json
+++ /dev/null
@@ -1,7 +0,0 @@
-// Server-specific settings
-//
-// For a full list of overridable settings, and general information on settings,
-// see the documentation: https://zed.dev/docs/configuring-zed#settings-files
-{
-  "lsp": {}
-}
diff --git a/assets/settings/initial_tasks.json b/assets/settings/initial_tasks.json
deleted file mode 100644
index a79e980632..0000000000
--- a/assets/settings/initial_tasks.json
+++ /dev/null
@@ -1,54 +0,0 @@
-// Project tasks configuration. See https://zed.dev/docs/tasks for documentation.
-//
-// Example:
-[
-  {
-    "label": "Example task",
-    "command": "for i in {1..5}; do echo \"Hello $i/5\"; sleep 1; done",
-    //"args": [],
-    // Env overrides for the command, will be appended to the terminal's environment from the settings.
-    "env": { "foo": "bar" },
-    // Current working directory to spawn the command into, defaults to current project root.
-    //"cwd": "/path/to/working/directory",
-    // Whether to use a new terminal tab or reuse the existing one to spawn the process, defaults to `false`.
-    "use_new_terminal": false,
-    // Whether to allow multiple instances of the same task to be run, or rather wait for the existing ones to finish, defaults to `false`.
-    "allow_concurrent_runs": false,
-    // What to do with the terminal pane and tab, after the command was started:
-    // * `always` — always show the task's pane, and focus the corresponding tab in it (default)
-    // * `no_focus` — always show the task's pane, add the task's tab in it, but don't focus it
-    // * `never` — do not alter focus, but still add/reuse the task's tab in its pane
-    "reveal": "always",
-    // Where to place the task's terminal item after starting the task:
-    // * `dock` — in the terminal dock, "regular" terminal items' place (default)
-    // * `center` — in the central pane group, "main" editor area
-    "reveal_target": "dock",
-    // What to do with the terminal pane and tab, after the command had finished:
-    // * `never` — Do nothing when the command finishes (default)
-    // * `always` — always hide the terminal tab, hide the pane also if it was the last tab in it
-    // * `on_success` — hide the terminal tab on task success only, otherwise behaves similar to `always`
-    "hide": "never",
-    // Which shell to use when running a task inside the terminal.
-    // May take 3 values:
-    // 1. (default) Use the system's default terminal configuration in /etc/passwd
-    //      "shell": "system"
-    // 2. A program:
-    //      "shell": {
-    //        "program": "sh"
-    //      }
-    // 3. A program with arguments:
-    //     "shell": {
-    //         "with_arguments": {
-    //           "program": "/bin/bash",
-    //           "args": ["--login"]
-    //         }
-    //     }
-    "shell": "system",
-    // Whether to show the task line in the output of the spawned task, defaults to `true`.
-    "show_summary": true,
-    // Whether to show the command line in the output of the spawned task, defaults to `true`.
-    "show_command": true
-    // Represents the tags for inline runnable indicators, or spawning multiple tasks at once.
-    // "tags": []
-  }
-]
diff --git a/assets/settings/initial_user_settings.json b/assets/settings/initial_user_settings.json
deleted file mode 100644
index 5ac2063bdb..0000000000
--- a/assets/settings/initial_user_settings.json
+++ /dev/null
@@ -1,17 +0,0 @@
-// Zed settings
-//
-// For information on how to configure Zed, see the Zed
-// documentation: https://zed.dev/docs/configuring-zed
-//
-// To see all of Zed's default settings without changing your
-// custom settings, run `zed: open default settings` from the
-// command palette (cmd-shift-p / ctrl-shift-p)
-{
-  "ui_font_size": 16,
-  "buffer_font_size": 15,
-  "theme": {
-    "mode": "system",
-    "light": "One Light",
-    "dark": "One Dark"
-  }
-}
diff --git a/assets/sounds/agent_done.wav b/assets/sounds/agent_done.wav
deleted file mode 100755
index 22c9390c00..0000000000
Binary files a/assets/sounds/agent_done.wav and /dev/null differ
diff --git a/assets/sounds/guest_joined_call.wav b/assets/sounds/guest_joined_call.wav
deleted file mode 100644
index 336a6ca754..0000000000
Binary files a/assets/sounds/guest_joined_call.wav and /dev/null differ
diff --git a/assets/sounds/joined_call.wav b/assets/sounds/joined_call.wav
deleted file mode 100644
index cf6e5ba4df..0000000000
Binary files a/assets/sounds/joined_call.wav and /dev/null differ
diff --git a/assets/sounds/leave_call.wav b/assets/sounds/leave_call.wav
deleted file mode 100644
index 478b28204f..0000000000
Binary files a/assets/sounds/leave_call.wav and /dev/null differ
diff --git a/assets/sounds/mute.wav b/assets/sounds/mute.wav
deleted file mode 100644
index 69e8456f6c..0000000000
Binary files a/assets/sounds/mute.wav and /dev/null differ
diff --git a/assets/sounds/start_screenshare.wav b/assets/sounds/start_screenshare.wav
deleted file mode 100644
index 7b72a90af1..0000000000
Binary files a/assets/sounds/start_screenshare.wav and /dev/null differ
diff --git a/assets/sounds/stop_screenshare.wav b/assets/sounds/stop_screenshare.wav
deleted file mode 100644
index 1fe13e21b4..0000000000
Binary files a/assets/sounds/stop_screenshare.wav and /dev/null differ
diff --git a/assets/sounds/unmute.wav b/assets/sounds/unmute.wav
deleted file mode 100644
index f8c90f6916..0000000000
Binary files a/assets/sounds/unmute.wav and /dev/null differ
diff --git a/assets/themes/.gitkeep b/assets/themes/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/assets/themes/LICENSES b/assets/themes/LICENSES
deleted file mode 100644
index 14416f85b5..0000000000
--- a/assets/themes/LICENSES
+++ /dev/null
@@ -1,283 +0,0 @@
-## [Ayu Dark](https://github.com/dempfi/ayu)
-
-The MIT License (MIT)
-
-Copyright (c) 2016 Ike Ku
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-********************************************************************************
-
-## [Ayu Light](https://github.com/dempfi/ayu)
-
-The MIT License (MIT)
-
-Copyright (c) 2016 Ike Ku
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-********************************************************************************
-
-## [Ayu Mirage](https://github.com/dempfi/ayu)
-
-The MIT License (MIT)
-
-Copyright (c) 2016 Ike Ku
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-********************************************************************************
-
-## [Gruvbox Dark](https://github.com/morhetz/gruvbox)
-
-The MIT License (MIT)
-
-Copyright (c) <YEAR> <COPYRIGHT HOLDER>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-********************************************************************************
-
-## [Gruvbox Dark Hard](https://github.com/morhetz/gruvbox)
-
-The MIT License (MIT)
-
-Copyright (c) <YEAR> <COPYRIGHT HOLDER>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-********************************************************************************
-
-## [Gruvbox Dark Soft](https://github.com/morhetz/gruvbox)
-
-The MIT License (MIT)
-
-Copyright (c) <YEAR> <COPYRIGHT HOLDER>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-********************************************************************************
-
-## [Gruvbox Light](https://github.com/morhetz/gruvbox)
-
-The MIT License (MIT)
-
-Copyright (c) <YEAR> <COPYRIGHT HOLDER>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-********************************************************************************
-
-## [Gruvbox Light Hard](https://github.com/morhetz/gruvbox)
-
-The MIT License (MIT)
-
-Copyright (c) <YEAR> <COPYRIGHT HOLDER>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-********************************************************************************
-
-## [Gruvbox Light Soft](https://github.com/morhetz/gruvbox)
-
-The MIT License (MIT)
-
-Copyright (c) <YEAR> <COPYRIGHT HOLDER>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-********************************************************************************
-
-## [One Dark](https://github.com/atom/atom/tree/master/packages/one-dark-ui)
-
-The MIT License (MIT)
-
-Copyright (c) 2014 GitHub Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-********************************************************************************
-
-## [One Light](https://github.com/atom/atom/tree/master/packages/one-light-ui)
-
-The MIT License (MIT)
-
-Copyright (c) 2014 GitHub Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/assets/themes/ayu/LICENSE b/assets/themes/ayu/LICENSE
deleted file mode 100644
index 37a9229268..0000000000
--- a/assets/themes/ayu/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2016 Ike Ku
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/assets/themes/ayu/ayu.json b/assets/themes/ayu/ayu.json
deleted file mode 100644
index e2b7c3c91f..0000000000
--- a/assets/themes/ayu/ayu.json
+++ /dev/null
@@ -1,1183 +0,0 @@
-{
-  "$schema": "https://zed.dev/schema/themes/v0.2.0.json",
-  "name": "Ayu",
-  "author": "Zed Industries",
-  "themes": [
-    {
-      "name": "Ayu Dark",
-      "appearance": "dark",
-      "style": {
-        "border": "#3f4043ff",
-        "border.variant": "#2d2f34ff",
-        "border.focused": "#1b4a6eff",
-        "border.selected": "#1b4a6eff",
-        "border.transparent": "#00000000",
-        "border.disabled": "#383a3eff",
-        "elevated_surface.background": "#1f2127ff",
-        "surface.background": "#1f2127ff",
-        "background": "#313337ff",
-        "element.background": "#1f2127ff",
-        "element.hover": "#2d2f34ff",
-        "element.active": "#3e4043ff",
-        "element.selected": "#3e4043ff",
-        "element.disabled": "#1f2127ff",
-        "drop_target.background": "#8a898680",
-        "ghost_element.background": "#00000000",
-        "ghost_element.hover": "#2d2f34ff",
-        "ghost_element.active": "#3e4043ff",
-        "ghost_element.selected": "#3e4043ff",
-        "ghost_element.disabled": "#1f2127ff",
-        "text": "#bfbdb6ff",
-        "text.muted": "#8a8986ff",
-        "text.placeholder": "#696a6aff",
-        "text.disabled": "#696a6aff",
-        "text.accent": "#5ac1feff",
-        "icon": "#bfbdb6ff",
-        "icon.muted": "#8a8986ff",
-        "icon.disabled": "#696a6aff",
-        "icon.placeholder": "#8a8986ff",
-        "icon.accent": "#5ac1feff",
-        "status_bar.background": "#313337ff",
-        "title_bar.background": "#313337ff",
-        "title_bar.inactive_background": "#1f2127ff",
-        "toolbar.background": "#0d1016ff",
-        "tab_bar.background": "#1f2127ff",
-        "tab.inactive_background": "#1f2127ff",
-        "tab.active_background": "#0d1016ff",
-        "search.match_background": "#5ac2fe66",
-        "search.active_match_background": "#ea570166",
-        "panel.background": "#1f2127ff",
-        "panel.focused_border": "#5ac1feff",
-        "pane.focused_border": null,
-        "scrollbar.thumb.background": "#bfbdb64c",
-        "scrollbar.thumb.hover_background": "#2d2f34ff",
-        "scrollbar.thumb.border": "#2d2f34ff",
-        "scrollbar.track.background": "#00000000",
-        "scrollbar.track.border": "#1b1e24ff",
-        "editor.foreground": "#bfbdb6ff",
-        "editor.background": "#0d1016ff",
-        "editor.gutter.background": "#0d1016ff",
-        "editor.subheader.background": "#1f2127ff",
-        "editor.active_line.background": "#1f2127bf",
-        "editor.highlighted_line.background": "#1f2127ff",
-        "editor.line_number": "#4b4c4e",
-        "editor.active_line_number": "#cbcccd",
-        "editor.hover_line_number": "#a1a2a5",
-        "editor.invisible": "#666767ff",
-        "editor.wrap_guide": "#bfbdb60d",
-        "editor.active_wrap_guide": "#bfbdb61a",
-        "editor.document_highlight.read_background": "#5ac1fe1a",
-        "editor.document_highlight.write_background": "#66676766",
-        "terminal.background": "#0d1016ff",
-        "terminal.foreground": "#bfbdb6ff",
-        "terminal.bright_foreground": "#bfbdb6ff",
-        "terminal.dim_foreground": "#0d1016ff",
-        "terminal.ansi.black": "#0d1016ff",
-        "terminal.ansi.bright_black": "#545557ff",
-        "terminal.ansi.dim_black": "#bfbdb6ff",
-        "terminal.ansi.red": "#ef7177ff",
-        "terminal.ansi.bright_red": "#83353bff",
-        "terminal.ansi.dim_red": "#febab9ff",
-        "terminal.ansi.green": "#aad84cff",
-        "terminal.ansi.bright_green": "#567627ff",
-        "terminal.ansi.dim_green": "#d8eca8ff",
-        "terminal.ansi.yellow": "#feb454ff",
-        "terminal.ansi.bright_yellow": "#92582bff",
-        "terminal.ansi.dim_yellow": "#ffd9aaff",
-        "terminal.ansi.blue": "#5ac1feff",
-        "terminal.ansi.bright_blue": "#27618cff",
-        "terminal.ansi.dim_blue": "#b7dffeff",
-        "terminal.ansi.magenta": "#39bae5ff",
-        "terminal.ansi.bright_magenta": "#205a78ff",
-        "terminal.ansi.dim_magenta": "#addcf3ff",
-        "terminal.ansi.cyan": "#95e5cbff",
-        "terminal.ansi.bright_cyan": "#4c806fff",
-        "terminal.ansi.dim_cyan": "#cbf2e4ff",
-        "terminal.ansi.white": "#bfbdb6ff",
-        "terminal.ansi.bright_white": "#fafafaff",
-        "terminal.ansi.dim_white": "#787876ff",
-        "link_text.hover": "#5ac1feff",
-        "conflict": "#feb454ff",
-        "conflict.background": "#572815ff",
-        "conflict.border": "#754221ff",
-        "created": "#aad84cff",
-        "created.background": "#294113ff",
-        "created.border": "#405c1cff",
-        "deleted": "#ef7177ff",
-        "deleted.background": "#48161bff",
-        "deleted.border": "#66272dff",
-        "error": "#ef7177ff",
-        "error.background": "#48161bff",
-        "error.border": "#66272dff",
-        "hidden": "#696a6aff",
-        "hidden.background": "#313337ff",
-        "hidden.border": "#383a3eff",
-        "hint": "#628b80ff",
-        "hint.background": "#0d2f4eff",
-        "hint.border": "#1b4a6eff",
-        "ignored": "#696a6aff",
-        "ignored.background": "#313337ff",
-        "ignored.border": "#3f4043ff",
-        "info": "#5ac1feff",
-        "info.background": "#0d2f4eff",
-        "info.border": "#1b4a6eff",
-        "modified": "#feb454ff",
-        "modified.background": "#572815ff",
-        "modified.border": "#754221ff",
-        "predictive": "#5a728bff",
-        "predictive.background": "#294113ff",
-        "predictive.border": "#405c1cff",
-        "renamed": "#5ac1feff",
-        "renamed.background": "#0d2f4eff",
-        "renamed.border": "#1b4a6eff",
-        "success": "#aad84cff",
-        "success.background": "#294113ff",
-        "success.border": "#405c1cff",
-        "unreachable": "#8a8986ff",
-        "unreachable.background": "#313337ff",
-        "unreachable.border": "#3f4043ff",
-        "warning": "#feb454ff",
-        "warning.background": "#572815ff",
-        "warning.border": "#754221ff",
-        "players": [
-          {
-            "cursor": "#5ac1feff",
-            "background": "#5ac1feff",
-            "selection": "#5ac1fe3d"
-          },
-          {
-            "cursor": "#39bae5ff",
-            "background": "#39bae5ff",
-            "selection": "#39bae53d"
-          },
-          {
-            "cursor": "#fe8f40ff",
-            "background": "#fe8f40ff",
-            "selection": "#fe8f403d"
-          },
-          {
-            "cursor": "#d2a6feff",
-            "background": "#d2a6feff",
-            "selection": "#d2a6fe3d"
-          },
-          {
-            "cursor": "#95e5cbff",
-            "background": "#95e5cbff",
-            "selection": "#95e5cb3d"
-          },
-          {
-            "cursor": "#ef7177ff",
-            "background": "#ef7177ff",
-            "selection": "#ef71773d"
-          },
-          {
-            "cursor": "#feb454ff",
-            "background": "#feb454ff",
-            "selection": "#feb4543d"
-          },
-          {
-            "cursor": "#aad84cff",
-            "background": "#aad84cff",
-            "selection": "#aad84c3d"
-          }
-        ],
-        "syntax": {
-          "attribute": {
-            "color": "#5ac1feff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "boolean": {
-            "color": "#d2a6ffff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "comment": {
-            "color": "#5c6773ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "comment.doc": {
-            "color": "#8c8b88ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "constant": {
-            "color": "#d2a6ffff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "constructor": {
-            "color": "#5ac1feff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "embedded": {
-            "color": "#bfbdb6ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "emphasis": {
-            "color": "#5ac1feff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "emphasis.strong": {
-            "color": "#5ac1feff",
-            "font_style": null,
-            "font_weight": 700
-          },
-          "enum": {
-            "color": "#fe8f40ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "function": {
-            "color": "#ffb353ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "hint": {
-            "color": "#628b80ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "keyword": {
-            "color": "#ff8f3fff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "label": {
-            "color": "#5ac1feff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "link_text": {
-            "color": "#fe8f40ff",
-            "font_style": "italic",
-            "font_weight": null
-          },
-          "link_uri": {
-            "color": "#aad84cff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "namespace": {
-            "color": "#bfbdb6ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "number": {
-            "color": "#d2a6ffff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "operator": {
-            "color": "#f29668ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "predictive": {
-            "color": "#5a728bff",
-            "font_style": "italic",
-            "font_weight": null
-          },
-          "preproc": {
-            "color": "#bfbdb6ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "primary": {
-            "color": "#bfbdb6ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "property": {
-            "color": "#5ac1feff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation": {
-            "color": "#a6a5a0ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.bracket": {
-            "color": "#a6a5a0ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.delimiter": {
-            "color": "#a6a5a0ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.list_marker": {
-            "color": "#a6a5a0ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.markup": {
-            "color": "#a6a5a0ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.special": {
-            "color": "#d2a6ffff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "selector": {
-            "color": "#d2a6ffff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "selector.pseudo": {
-            "color": "#5ac1feff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string": {
-            "color": "#a9d94bff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.escape": {
-            "color": "#8c8b88ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.regex": {
-            "color": "#95e6cbff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.special": {
-            "color": "#e5b572ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.special.symbol": {
-            "color": "#fe8f40ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "tag": {
-            "color": "#5ac1feff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "text.literal": {
-            "color": "#fe8f40ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "title": {
-            "color": "#bfbdb6ff",
-            "font_style": null,
-            "font_weight": 700
-          },
-          "type": {
-            "color": "#59c2ffff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "variable": {
-            "color": "#bfbdb6ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "variant": {
-            "color": "#5ac1feff",
-            "font_style": null,
-            "font_weight": null
-          }
-        }
-      }
-    },
-    {
-      "name": "Ayu Light",
-      "appearance": "light",
-      "style": {
-        "border": "#cfd1d2ff",
-        "border.variant": "#dfe0e1ff",
-        "border.focused": "#c4daf6ff",
-        "border.selected": "#c4daf6ff",
-        "border.transparent": "#00000000",
-        "border.disabled": "#d5d6d8ff",
-        "elevated_surface.background": "#ececedff",
-        "surface.background": "#ececedff",
-        "background": "#dcdddeff",
-        "element.background": "#ececedff",
-        "element.hover": "#dfe0e1ff",
-        "element.active": "#cfd0d2ff",
-        "element.selected": "#cfd0d2ff",
-        "element.disabled": "#ececedff",
-        "drop_target.background": "#8b8e9280",
-        "ghost_element.background": "#00000000",
-        "ghost_element.hover": "#dfe0e1ff",
-        "ghost_element.active": "#cfd0d2ff",
-        "ghost_element.selected": "#cfd0d2ff",
-        "ghost_element.disabled": "#ececedff",
-        "text": "#5c6166ff",
-        "text.muted": "#8b8e92ff",
-        "text.placeholder": "#a9acaeff",
-        "text.disabled": "#a9acaeff",
-        "text.accent": "#3b9ee5ff",
-        "icon": "#5c6166ff",
-        "icon.muted": "#8b8e92ff",
-        "icon.disabled": "#a9acaeff",
-        "icon.placeholder": "#8b8e92ff",
-        "icon.accent": "#3b9ee5ff",
-        "status_bar.background": "#dcdddeff",
-        "title_bar.background": "#dcdddeff",
-        "title_bar.inactive_background": "#ececedff",
-        "toolbar.background": "#fcfcfcff",
-        "tab_bar.background": "#ececedff",
-        "tab.inactive_background": "#ececedff",
-        "tab.active_background": "#fcfcfcff",
-        "search.match_background": "#3b9ee566",
-        "search.active_match_background": "#f88b3666",
-        "panel.background": "#ececedff",
-        "panel.focused_border": "#3b9ee5ff",
-        "pane.focused_border": null,
-        "scrollbar.thumb.background": "#5c61664c",
-        "scrollbar.thumb.hover_background": "#dfe0e1ff",
-        "scrollbar.thumb.border": "#dfe0e1ff",
-        "scrollbar.track.background": "#00000000",
-        "scrollbar.track.border": "#efeff0ff",
-        "editor.foreground": "#5c6166ff",
-        "editor.background": "#fcfcfcff",
-        "editor.gutter.background": "#fcfcfcff",
-        "editor.subheader.background": "#ececedff",
-        "editor.active_line.background": "#ececedbf",
-        "editor.highlighted_line.background": "#ececedff",
-        "editor.line_number": "#b0b3b5",
-        "editor.active_line_number": "#313435",
-        "editor.hover_line_number": "#62686a",
-        "editor.invisible": "#acafb1ff",
-        "editor.wrap_guide": "#5c61660d",
-        "editor.active_wrap_guide": "#5c61661a",
-        "editor.document_highlight.read_background": "#3b9ee51a",
-        "editor.document_highlight.write_background": "#acafb166",
-        "terminal.background": "#fcfcfcff",
-        "terminal.foreground": "#5c6166ff",
-        "terminal.bright_foreground": "#5c6166ff",
-        "terminal.dim_foreground": "#fcfcfcff",
-        "terminal.ansi.black": "#5c6166ff",
-        "terminal.ansi.bright_black": "#3b9ee5ff",
-        "terminal.ansi.dim_black": "#9c9fa2ff",
-        "terminal.ansi.red": "#ef7271ff",
-        "terminal.ansi.bright_red": "#febab6ff",
-        "terminal.ansi.dim_red": "#833538ff",
-        "terminal.ansi.green": "#85b304ff",
-        "terminal.ansi.bright_green": "#c7d98fff",
-        "terminal.ansi.dim_green": "#445613ff",
-        "terminal.ansi.yellow": "#f1ad49ff",
-        "terminal.ansi.bright_yellow": "#fed5a3ff",
-        "terminal.ansi.dim_yellow": "#8a5227ff",
-        "terminal.ansi.blue": "#3b9ee5ff",
-        "terminal.ansi.bright_blue": "#abcdf2ff",
-        "terminal.ansi.dim_blue": "#214c76ff",
-        "terminal.ansi.magenta": "#55b4d3ff",
-        "terminal.ansi.bright_magenta": "#b1d8e8ff",
-        "terminal.ansi.dim_magenta": "#2f5669ff",
-        "terminal.ansi.cyan": "#4dbf99ff",
-        "terminal.ansi.bright_cyan": "#ace0cbff",
-        "terminal.ansi.dim_cyan": "#2a5f4aff",
-        "terminal.ansi.white": "#fcfcfcff",
-        "terminal.ansi.bright_white": "#ffffffff",
-        "terminal.ansi.dim_white": "#bcbec0ff",
-        "link_text.hover": "#3b9ee5ff",
-        "conflict": "#f1ad49ff",
-        "conflict.background": "#ffeedaff",
-        "conflict.border": "#ffe1beff",
-        "created": "#85b304ff",
-        "created.background": "#e9efd2ff",
-        "created.border": "#d7e3aeff",
-        "deleted": "#ef7271ff",
-        "deleted.background": "#ffe3e1ff",
-        "deleted.border": "#ffcdcaff",
-        "error": "#ef7271ff",
-        "error.background": "#ffe3e1ff",
-        "error.border": "#ffcdcaff",
-        "hidden": "#a9acaeff",
-        "hidden.background": "#dcdddeff",
-        "hidden.border": "#d5d6d8ff",
-        "hint": "#8ca7c2ff",
-        "hint.background": "#deebfaff",
-        "hint.border": "#c4daf6ff",
-        "ignored": "#a9acaeff",
-        "ignored.background": "#dcdddeff",
-        "ignored.border": "#cfd1d2ff",
-        "info": "#3b9ee5ff",
-        "info.background": "#deebfaff",
-        "info.border": "#c4daf6ff",
-        "modified": "#f1ad49ff",
-        "modified.background": "#ffeedaff",
-        "modified.border": "#ffe1beff",
-        "predictive": "#9eb9d3ff",
-        "predictive.background": "#e9efd2ff",
-        "predictive.border": "#d7e3aeff",
-        "renamed": "#3b9ee5ff",
-        "renamed.background": "#deebfaff",
-        "renamed.border": "#c4daf6ff",
-        "success": "#85b304ff",
-        "success.background": "#e9efd2ff",
-        "success.border": "#d7e3aeff",
-        "unreachable": "#8b8e92ff",
-        "unreachable.background": "#dcdddeff",
-        "unreachable.border": "#cfd1d2ff",
-        "warning": "#f1ad49ff",
-        "warning.background": "#ffeedaff",
-        "warning.border": "#ffe1beff",
-        "players": [
-          {
-            "cursor": "#3b9ee5ff",
-            "background": "#3b9ee5ff",
-            "selection": "#3b9ee53d"
-          },
-          {
-            "cursor": "#55b4d3ff",
-            "background": "#55b4d3ff",
-            "selection": "#55b4d33d"
-          },
-          {
-            "cursor": "#f98d3fff",
-            "background": "#f98d3fff",
-            "selection": "#f98d3f3d"
-          },
-          {
-            "cursor": "#a37accff",
-            "background": "#a37accff",
-            "selection": "#a37acc3d"
-          },
-          {
-            "cursor": "#4dbf99ff",
-            "background": "#4dbf99ff",
-            "selection": "#4dbf993d"
-          },
-          {
-            "cursor": "#ef7271ff",
-            "background": "#ef7271ff",
-            "selection": "#ef72713d"
-          },
-          {
-            "cursor": "#f1ad49ff",
-            "background": "#f1ad49ff",
-            "selection": "#f1ad493d"
-          },
-          {
-            "cursor": "#85b304ff",
-            "background": "#85b304ff",
-            "selection": "#85b3043d"
-          }
-        ],
-        "syntax": {
-          "attribute": {
-            "color": "#3b9ee5ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "boolean": {
-            "color": "#a37accff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "comment": {
-            "color": "#abb0b6ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "comment.doc": {
-            "color": "#898d90ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "constant": {
-            "color": "#a37accff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "constructor": {
-            "color": "#3b9ee5ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "embedded": {
-            "color": "#5c6166ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "emphasis": {
-            "color": "#3b9ee5ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "emphasis.strong": {
-            "color": "#3b9ee5ff",
-            "font_style": null,
-            "font_weight": 700
-          },
-          "enum": {
-            "color": "#f98d3fff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "function": {
-            "color": "#f2ad48ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "hint": {
-            "color": "#8ca7c2ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "keyword": {
-            "color": "#fa8d3eff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "label": {
-            "color": "#3b9ee5ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "link_text": {
-            "color": "#f98d3fff",
-            "font_style": "italic",
-            "font_weight": null
-          },
-          "link_uri": {
-            "color": "#85b304ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "namespace": {
-            "color": "#5c6166ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "number": {
-            "color": "#a37accff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "operator": {
-            "color": "#ed9365ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "predictive": {
-            "color": "#9eb9d3ff",
-            "font_style": "italic",
-            "font_weight": null
-          },
-          "preproc": {
-            "color": "#5c6166ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "primary": {
-            "color": "#5c6166ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "property": {
-            "color": "#3b9ee5ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation": {
-            "color": "#73777bff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.bracket": {
-            "color": "#73777bff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.delimiter": {
-            "color": "#73777bff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.list_marker": {
-            "color": "#73777bff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.markup": {
-            "color": "#73777bff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.special": {
-            "color": "#a37accff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "selector": {
-            "color": "#a37accff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "selector.pseudo": {
-            "color": "#3b9ee5ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string": {
-            "color": "#86b300ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.escape": {
-            "color": "#898d90ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.regex": {
-            "color": "#4bbf98ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.special": {
-            "color": "#e6ba7eff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.special.symbol": {
-            "color": "#f98d3fff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "tag": {
-            "color": "#3b9ee5ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "text.literal": {
-            "color": "#f98d3fff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "title": {
-            "color": "#5c6166ff",
-            "font_style": null,
-            "font_weight": 700
-          },
-          "type": {
-            "color": "#389ee6ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "variable": {
-            "color": "#5c6166ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "variant": {
-            "color": "#3b9ee5ff",
-            "font_style": null,
-            "font_weight": null
-          }
-        }
-      }
-    },
-    {
-      "name": "Ayu Mirage",
-      "appearance": "dark",
-      "style": {
-        "border": "#53565dff",
-        "border.variant": "#43464fff",
-        "border.focused": "#24556fff",
-        "border.selected": "#24556fff",
-        "border.transparent": "#00000000",
-        "border.disabled": "#4d5058ff",
-        "elevated_surface.background": "#353944ff",
-        "surface.background": "#353944ff",
-        "background": "#464a52ff",
-        "element.background": "#353944ff",
-        "element.hover": "#43464fff",
-        "element.active": "#53565dff",
-        "element.selected": "#53565dff",
-        "element.disabled": "#353944ff",
-        "drop_target.background": "#9a9a9880",
-        "ghost_element.background": "#00000000",
-        "ghost_element.hover": "#43464fff",
-        "ghost_element.active": "#53565dff",
-        "ghost_element.selected": "#53565dff",
-        "ghost_element.disabled": "#353944ff",
-        "text": "#cccac2ff",
-        "text.muted": "#9a9a98ff",
-        "text.placeholder": "#7b7d7fff",
-        "text.disabled": "#7b7d7fff",
-        "text.accent": "#72cffeff",
-        "icon": "#cccac2ff",
-        "icon.muted": "#9a9a98ff",
-        "icon.disabled": "#7b7d7fff",
-        "icon.placeholder": "#9a9a98ff",
-        "icon.accent": "#72cffeff",
-        "status_bar.background": "#464a52ff",
-        "title_bar.background": "#464a52ff",
-        "title_bar.inactive_background": "#353944ff",
-        "toolbar.background": "#242835ff",
-        "tab_bar.background": "#353944ff",
-        "tab.inactive_background": "#353944ff",
-        "tab.active_background": "#242835ff",
-        "search.match_background": "#73cffe66",
-        "search.active_match_background": "#fd722b66",
-        "panel.background": "#353944ff",
-        "panel.focused_border": null,
-        "pane.focused_border": null,
-        "scrollbar.thumb.background": "#cccac24c",
-        "scrollbar.thumb.hover_background": "#43464fff",
-        "scrollbar.thumb.border": "#43464fff",
-        "scrollbar.track.background": "#00000000",
-        "scrollbar.track.border": "#323641ff",
-        "editor.foreground": "#cccac2ff",
-        "editor.background": "#242835ff",
-        "editor.gutter.background": "#242835ff",
-        "editor.subheader.background": "#353944ff",
-        "editor.active_line.background": "#353944bf",
-        "editor.highlighted_line.background": "#353944ff",
-        "editor.line_number": "#575c6b",
-        "editor.active_line_number": "#e1e3ea",
-        "editor.hover_line_number": "#b2b6c8",
-        "editor.invisible": "#787a7cff",
-        "editor.wrap_guide": "#cccac20d",
-        "editor.active_wrap_guide": "#cccac21a",
-        "editor.document_highlight.read_background": "#72cffe1a",
-        "editor.document_highlight.write_background": "#787a7c66",
-        "terminal.background": "#242835ff",
-        "terminal.foreground": "#cccac2ff",
-        "terminal.bright_foreground": "#cccac2ff",
-        "terminal.dim_foreground": "#242835ff",
-        "terminal.ansi.black": "#242835ff",
-        "terminal.ansi.bright_black": "#67696eff",
-        "terminal.ansi.dim_black": "#cccac2ff",
-        "terminal.ansi.red": "#f18779ff",
-        "terminal.ansi.bright_red": "#833f3cff",
-        "terminal.ansi.dim_red": "#fec4baff",
-        "terminal.ansi.green": "#d5fe80ff",
-        "terminal.ansi.bright_green": "#75993cff",
-        "terminal.ansi.dim_green": "#ecffc1ff",
-        "terminal.ansi.yellow": "#fecf72ff",
-        "terminal.ansi.bright_yellow": "#937237ff",
-        "terminal.ansi.dim_yellow": "#ffe7b9ff",
-        "terminal.ansi.blue": "#72cffeff",
-        "terminal.ansi.bright_blue": "#336d8dff",
-        "terminal.ansi.dim_blue": "#c1e7ffff",
-        "terminal.ansi.magenta": "#5bcde5ff",
-        "terminal.ansi.bright_magenta": "#2b6c7bff",
-        "terminal.ansi.dim_magenta": "#b7e7f2ff",
-        "terminal.ansi.cyan": "#95e5cbff",
-        "terminal.ansi.bright_cyan": "#4c806fff",
-        "terminal.ansi.dim_cyan": "#cbf2e4ff",
-        "terminal.ansi.white": "#cccac2ff",
-        "terminal.ansi.bright_white": "#fafafaff",
-        "terminal.ansi.dim_white": "#898a8aff",
-        "link_text.hover": "#72cffeff",
-        "conflict": "#fecf72ff",
-        "conflict.background": "#574018ff",
-        "conflict.border": "#765a29ff",
-        "created": "#d5fe80ff",
-        "created.background": "#426117ff",
-        "created.border": "#5d7e2cff",
-        "deleted": "#f18779ff",
-        "deleted.background": "#481a1bff",
-        "deleted.border": "#662e2dff",
-        "error": "#f18779ff",
-        "error.background": "#481a1bff",
-        "error.border": "#662e2dff",
-        "hidden": "#7b7d7fff",
-        "hidden.background": "#464a52ff",
-        "hidden.border": "#4d5058ff",
-        "hint": "#7399a3ff",
-        "hint.background": "#123950ff",
-        "hint.border": "#24556fff",
-        "ignored": "#7b7d7fff",
-        "ignored.background": "#464a52ff",
-        "ignored.border": "#53565dff",
-        "info": "#72cffeff",
-        "info.background": "#123950ff",
-        "info.border": "#24556fff",
-        "modified": "#fecf72ff",
-        "modified.background": "#574018ff",
-        "modified.border": "#765a29ff",
-        "predictive": "#6d839bff",
-        "predictive.background": "#426117ff",
-        "predictive.border": "#5d7e2cff",
-        "renamed": "#72cffeff",
-        "renamed.background": "#123950ff",
-        "renamed.border": "#24556fff",
-        "success": "#d5fe80ff",
-        "success.background": "#426117ff",
-        "success.border": "#5d7e2cff",
-        "unreachable": "#9a9a98ff",
-        "unreachable.background": "#464a52ff",
-        "unreachable.border": "#53565dff",
-        "warning": "#fecf72ff",
-        "warning.background": "#574018ff",
-        "warning.border": "#765a29ff",
-        "players": [
-          {
-            "cursor": "#72cffeff",
-            "background": "#72cffeff",
-            "selection": "#72cffe3d"
-          },
-          {
-            "cursor": "#5bcde5ff",
-            "background": "#5bcde5ff",
-            "selection": "#5bcde53d"
-          },
-          {
-            "cursor": "#fead66ff",
-            "background": "#fead66ff",
-            "selection": "#fead663d"
-          },
-          {
-            "cursor": "#debffeff",
-            "background": "#debffeff",
-            "selection": "#debffe3d"
-          },
-          {
-            "cursor": "#95e5cbff",
-            "background": "#95e5cbff",
-            "selection": "#95e5cb3d"
-          },
-          {
-            "cursor": "#f18779ff",
-            "background": "#f18779ff",
-            "selection": "#f187793d"
-          },
-          {
-            "cursor": "#fecf72ff",
-            "background": "#fecf72ff",
-            "selection": "#fecf723d"
-          },
-          {
-            "cursor": "#d5fe80ff",
-            "background": "#d5fe80ff",
-            "selection": "#d5fe803d"
-          }
-        ],
-        "syntax": {
-          "attribute": {
-            "color": "#72cffeff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "boolean": {
-            "color": "#dfbfffff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "comment": {
-            "color": "#5c6773ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "comment.doc": {
-            "color": "#9b9b99ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "constant": {
-            "color": "#dfbfffff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "constructor": {
-            "color": "#72cffeff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "embedded": {
-            "color": "#cccac2ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "emphasis": {
-            "color": "#72cffeff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "emphasis.strong": {
-            "color": "#72cffeff",
-            "font_style": null,
-            "font_weight": 700
-          },
-          "enum": {
-            "color": "#fead66ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "function": {
-            "color": "#ffd173ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "hint": {
-            "color": "#7399a3ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "keyword": {
-            "color": "#ffad65ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "label": {
-            "color": "#72cffeff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "link_text": {
-            "color": "#fead66ff",
-            "font_style": "italic",
-            "font_weight": null
-          },
-          "link_uri": {
-            "color": "#d5fe80ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "namespace": {
-            "color": "#cccac2ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "number": {
-            "color": "#dfbfffff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "operator": {
-            "color": "#f29e74ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "predictive": {
-            "color": "#6d839bff",
-            "font_style": "italic",
-            "font_weight": null
-          },
-          "preproc": {
-            "color": "#cccac2ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "primary": {
-            "color": "#cccac2ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "property": {
-            "color": "#72cffeff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation": {
-            "color": "#b4b3aeff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.bracket": {
-            "color": "#b4b3aeff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.delimiter": {
-            "color": "#b4b3aeff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.list_marker": {
-            "color": "#b4b3aeff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.markup": {
-            "color": "#b4b3aeff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.special": {
-            "color": "#dfbfffff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "selector": {
-            "color": "#dfbfffff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "selector.pseudo": {
-            "color": "#72cffeff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string": {
-            "color": "#d4fe7fff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.escape": {
-            "color": "#9b9b99ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.regex": {
-            "color": "#95e6cbff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.special": {
-            "color": "#ffdfb3ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.special.symbol": {
-            "color": "#fead66ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "tag": {
-            "color": "#72cffeff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "text.literal": {
-            "color": "#fead66ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "title": {
-            "color": "#cccac2ff",
-            "font_style": null,
-            "font_weight": 700
-          },
-          "type": {
-            "color": "#73cfffff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "variable": {
-            "color": "#cccac2ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "variant": {
-            "color": "#72cffeff",
-            "font_style": null,
-            "font_weight": null
-          }
-        }
-      }
-    }
-  ]
-}
diff --git a/assets/themes/gruvbox/LICENSE b/assets/themes/gruvbox/LICENSE
deleted file mode 100644
index 0e18d6d7a9..0000000000
--- a/assets/themes/gruvbox/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) <YEAR> <COPYRIGHT HOLDER>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/assets/themes/gruvbox/gruvbox.json b/assets/themes/gruvbox/gruvbox.json
deleted file mode 100644
index 90973fd6c3..0000000000
--- a/assets/themes/gruvbox/gruvbox.json
+++ /dev/null
@@ -1,2449 +0,0 @@
-{
-  "$schema": "https://zed.dev/schema/themes/v0.2.0.json",
-  "name": "Gruvbox",
-  "author": "Zed Industries",
-  "themes": [
-    {
-      "name": "Gruvbox Dark",
-      "appearance": "dark",
-      "style": {
-        "accents": ["#cc241dff", "#98971aff", "#d79921ff", "#458588ff", "#b16286ff", "#689d6aff", "#d65d0eff"],
-        "border": "#5b534dff",
-        "border.variant": "#494340ff",
-        "border.focused": "#303a36ff",
-        "border.selected": "#303a36ff",
-        "border.transparent": "#00000000",
-        "border.disabled": "#544c48ff",
-        "elevated_surface.background": "#3a3735ff",
-        "surface.background": "#3a3735ff",
-        "background": "#4c4642ff",
-        "element.background": "#3a3735ff",
-        "element.hover": "#494340ff",
-        "element.active": "#5b524cff",
-        "element.selected": "#5b524cff",
-        "element.disabled": "#3a3735ff",
-        "drop_target.background": "#c5b59780",
-        "ghost_element.background": "#00000000",
-        "ghost_element.hover": "#494340ff",
-        "ghost_element.active": "#5b524cff",
-        "ghost_element.selected": "#5b524cff",
-        "ghost_element.disabled": "#3a3735ff",
-        "text": "#fbf1c7ff",
-        "text.muted": "#c5b597ff",
-        "text.placeholder": "#998b78ff",
-        "text.disabled": "#998b78ff",
-        "text.accent": "#83a598ff",
-        "icon": "#fbf1c7ff",
-        "icon.muted": "#c5b597ff",
-        "icon.disabled": "#998b78ff",
-        "icon.placeholder": "#c5b597ff",
-        "icon.accent": "#83a598ff",
-        "status_bar.background": "#4c4642ff",
-        "title_bar.background": "#4c4642ff",
-        "title_bar.inactive_background": "#3a3735ff",
-        "toolbar.background": "#282828ff",
-        "tab_bar.background": "#3a3735ff",
-        "tab.inactive_background": "#3a3735ff",
-        "tab.active_background": "#282828ff",
-        "search.match_background": "#83a59866",
-        "search.active_match_background": "#c09f3f66",
-        "panel.background": "#3a3735ff",
-        "panel.focused_border": "#83a598ff",
-        "pane.focused_border": null,
-        "scrollbar.thumb.active_background": "#83a598ac",
-        "scrollbar.thumb.hover_background": "#fbf1c74c",
-        "scrollbar.thumb.background": "#a899844c",
-        "scrollbar.thumb.border": "#494340ff",
-        "scrollbar.track.background": "#00000000",
-        "scrollbar.track.border": "#373432ff",
-        "editor.foreground": "#ebdbb2ff",
-        "editor.background": "#282828ff",
-        "editor.gutter.background": "#282828ff",
-        "editor.subheader.background": "#3a3735ff",
-        "editor.active_line.background": "#3a3735bf",
-        "editor.highlighted_line.background": "#3a3735ff",
-        "editor.line_number": "#6e6b5e",
-        "editor.active_line_number": "#dedcd3",
-        "editor.hover_line_number": "#c9c5b6",
-        "editor.invisible": "#928474ff",
-        "editor.wrap_guide": "#fbf1c70d",
-        "editor.active_wrap_guide": "#fbf1c71a",
-        "editor.document_highlight.read_background": "#83a5981a",
-        "editor.document_highlight.write_background": "#92847466",
-        "terminal.background": "#282828ff",
-        "terminal.foreground": "#fbf1c7ff",
-        "terminal.bright_foreground": "#fbf1c7ff",
-        "terminal.dim_foreground": "#282828ff",
-        "terminal.ansi.black": "#282828ff",
-        "terminal.ansi.bright_black": "#73675eff",
-        "terminal.ansi.dim_black": "#fbf1c7ff",
-        "terminal.ansi.red": "#fb4a35ff",
-        "terminal.ansi.bright_red": "#93201dff",
-        "terminal.ansi.dim_red": "#ffaa95ff",
-        "terminal.ansi.green": "#b7bb26ff",
-        "terminal.ansi.bright_green": "#605c1bff",
-        "terminal.ansi.dim_green": "#e0dc98ff",
-        "terminal.ansi.yellow": "#f9bd2fff",
-        "terminal.ansi.bright_yellow": "#91611bff",
-        "terminal.ansi.dim_yellow": "#fedc9bff",
-        "terminal.ansi.blue": "#83a598ff",
-        "terminal.ansi.bright_blue": "#414f4aff",
-        "terminal.ansi.dim_blue": "#c0d2cbff",
-        "terminal.ansi.magenta": "#d3869bff",
-        "terminal.ansi.bright_magenta": "#8e5868ff",
-        "terminal.ansi.dim_magenta": "#ff9ebbff",
-        "terminal.ansi.cyan": "#8ec07cff",
-        "terminal.ansi.bright_cyan": "#45603eff",
-        "terminal.ansi.dim_cyan": "#c7dfbdff",
-        "terminal.ansi.white": "#fbf1c7ff",
-        "terminal.ansi.bright_white": "#ffffffff",
-        "terminal.ansi.dim_white": "#b0a189ff",
-        "link_text.hover": "#83a598ff",
-        "version_control.added": "#b7bb26ff",
-        "version_control.modified": "#f9bd2fff",
-        "version_control.deleted": "#fb4a35ff",
-        "conflict": "#f9bd2fff",
-        "conflict.background": "#572e10ff",
-        "conflict.border": "#754916ff",
-        "created": "#b7bb26ff",
-        "created.background": "#322b11ff",
-        "created.border": "#4a4516ff",
-        "deleted": "#fb4a35ff",
-        "deleted.background": "#590a0fff",
-        "deleted.border": "#771617ff",
-        "error": "#fb4a35ff",
-        "error.background": "#590a0fff",
-        "error.border": "#771617ff",
-        "hidden": "#998b78ff",
-        "hidden.background": "#4c4642ff",
-        "hidden.border": "#544c48ff",
-        "hint": "#8c957dff",
-        "hint.background": "#1e2321ff",
-        "hint.border": "#303a36ff",
-        "ignored": "#998b78ff",
-        "ignored.background": "#4c4642ff",
-        "ignored.border": "#5b534dff",
-        "info": "#83a598ff",
-        "info.background": "#1e2321ff",
-        "info.border": "#303a36ff",
-        "modified": "#f9bd2fff",
-        "modified.background": "#572e10ff",
-        "modified.border": "#754916ff",
-        "predictive": "#717363ff",
-        "predictive.background": "#322b11ff",
-        "predictive.border": "#4a4516ff",
-        "renamed": "#83a598ff",
-        "renamed.background": "#1e2321ff",
-        "renamed.border": "#303a36ff",
-        "success": "#b7bb26ff",
-        "success.background": "#322b11ff",
-        "success.border": "#4a4516ff",
-        "unreachable": "#c5b597ff",
-        "unreachable.background": "#4c4642ff",
-        "unreachable.border": "#5b534dff",
-        "warning": "#f9bd2fff",
-        "warning.background": "#572e10ff",
-        "warning.border": "#754916ff",
-        "players": [
-          {
-            "cursor": "#83a598ff",
-            "background": "#83a598ff",
-            "selection": "#83a5983d"
-          },
-          {
-            "cursor": "#a89984ff",
-            "background": "#a89984ff",
-            "selection": "#a899843d"
-          },
-          {
-            "cursor": "#fd801bff",
-            "background": "#fd801bff",
-            "selection": "#fd801b3d"
-          },
-          {
-            "cursor": "#d3869bff",
-            "background": "#d3869bff",
-            "selection": "#d3869b3d"
-          },
-          {
-            "cursor": "#8ec07cff",
-            "background": "#8ec07cff",
-            "selection": "#8ec07c3d"
-          },
-          {
-            "cursor": "#fb4a35ff",
-            "background": "#fb4a35ff",
-            "selection": "#fb4a353d"
-          },
-          {
-            "cursor": "#f9bd2fff",
-            "background": "#f9bd2fff",
-            "selection": "#f9bd2f3d"
-          },
-          {
-            "cursor": "#b7bb26ff",
-            "background": "#b7bb26ff",
-            "selection": "#b7bb263d"
-          }
-        ],
-        "syntax": {
-          "attribute": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "boolean": {
-            "color": "#d3869bff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "comment": {
-            "color": "#a89984ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "comment.doc": {
-            "color": "#c6b697ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "constant": {
-            "color": "#fabd2eff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "constructor": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "embedded": {
-            "color": "#8ec07cff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "emphasis": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "emphasis.strong": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": 700
-          },
-          "enum": {
-            "color": "#fe7f18ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "function": {
-            "color": "#b8bb25ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "function.builtin": {
-            "color": "#fb4833ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "hint": {
-            "color": "#8c957dff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "keyword": {
-            "color": "#fb4833ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "label": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "link_text": {
-            "color": "#8ec07cff",
-            "font_style": "italic",
-            "font_weight": null
-          },
-          "link_uri": {
-            "color": "#d3869bff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "namespace": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "number": {
-            "color": "#d3869bff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "operator": {
-            "color": "#8ec07cff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "predictive": {
-            "color": "#717363ff",
-            "font_style": "italic",
-            "font_weight": null
-          },
-          "preproc": {
-            "color": "#fbf1c7ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "primary": {
-            "color": "#ebdbb2ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "property": {
-            "color": "#ebdbb2ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation": {
-            "color": "#d5c4a1ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.bracket": {
-            "color": "#a89984ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.delimiter": {
-            "color": "#e5d5adff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.list_marker": {
-            "color": "#ebdbb2ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.markup": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.special": {
-            "color": "#e5d5adff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "selector": {
-            "color": "#fabd2eff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "selector.pseudo": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string": {
-            "color": "#b8bb25ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.escape": {
-            "color": "#c6b697ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.regex": {
-            "color": "#fe7f18ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.special": {
-            "color": "#d3869bff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.special.symbol": {
-            "color": "#8ec07cff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "tag": {
-            "color": "#8ec07cff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "text.literal": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "title": {
-            "color": "#b8bb25ff",
-            "font_style": null,
-            "font_weight": 700
-          },
-          "type": {
-            "color": "#fabd2eff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "variable": {
-            "color": "#ebdbb2ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "variable.special": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "variant": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": null
-          }
-        }
-      }
-    },
-    {
-      "name": "Gruvbox Dark Hard",
-      "appearance": "dark",
-      "style": {
-        "accents": ["#cc241dff", "#98971aff", "#d79921ff", "#458588ff", "#b16286ff", "#689d6aff", "#d65d0eff"],
-        "border": "#5b534dff",
-        "border.variant": "#494340ff",
-        "border.focused": "#303a36ff",
-        "border.selected": "#303a36ff",
-        "border.transparent": "#00000000",
-        "border.disabled": "#544c48ff",
-        "elevated_surface.background": "#393634ff",
-        "surface.background": "#393634ff",
-        "background": "#4c4642ff",
-        "element.background": "#393634ff",
-        "element.hover": "#494340ff",
-        "element.active": "#5b524cff",
-        "element.selected": "#5b524cff",
-        "element.disabled": "#393634ff",
-        "drop_target.background": "#c5b59780",
-        "ghost_element.background": "#00000000",
-        "ghost_element.hover": "#494340ff",
-        "ghost_element.active": "#5b524cff",
-        "ghost_element.selected": "#5b524cff",
-        "ghost_element.disabled": "#393634ff",
-        "text": "#fbf1c7ff",
-        "text.muted": "#c5b597ff",
-        "text.placeholder": "#998b78ff",
-        "text.disabled": "#998b78ff",
-        "text.accent": "#83a598ff",
-        "icon": "#fbf1c7ff",
-        "icon.muted": "#c5b597ff",
-        "icon.disabled": "#998b78ff",
-        "icon.placeholder": "#c5b597ff",
-        "icon.accent": "#83a598ff",
-        "status_bar.background": "#4c4642ff",
-        "title_bar.background": "#4c4642ff",
-        "title_bar.inactive_background": "#393634ff",
-        "toolbar.background": "#1d2021ff",
-        "tab_bar.background": "#393634ff",
-        "tab.inactive_background": "#393634ff",
-        "tab.active_background": "#1d2021ff",
-        "search.match_background": "#83a59866",
-        "search.active_match_background": "#c9653666",
-        "panel.background": "#393634ff",
-        "panel.focused_border": "#83a598ff",
-        "pane.focused_border": null,
-        "scrollbar.thumb.active_background": "#83a598ac",
-        "scrollbar.thumb.hover_background": "#fbf1c74c",
-        "scrollbar.thumb.background": "#a899844c",
-        "scrollbar.thumb.border": "#494340ff",
-        "scrollbar.track.background": "#00000000",
-        "scrollbar.track.border": "#343130ff",
-        "editor.foreground": "#ebdbb2ff",
-        "editor.background": "#1d2021ff",
-        "editor.gutter.background": "#1d2021ff",
-        "editor.subheader.background": "#393634ff",
-        "editor.active_line.background": "#393634bf",
-        "editor.highlighted_line.background": "#393634ff",
-        "editor.line_number": "#6e6b5e",
-        "editor.active_line_number": "#dedcd3",
-        "editor.hover_line_number": "#c9c5b6",
-        "editor.invisible": "#928474ff",
-        "editor.wrap_guide": "#fbf1c70d",
-        "editor.active_wrap_guide": "#fbf1c71a",
-        "editor.document_highlight.read_background": "#83a5981a",
-        "editor.document_highlight.write_background": "#92847466",
-        "terminal.background": "#1d2021ff",
-        "terminal.foreground": "#fbf1c7ff",
-        "terminal.bright_foreground": "#fbf1c7ff",
-        "terminal.dim_foreground": "#1d2021ff",
-        "terminal.ansi.black": "#1d2021ff",
-        "terminal.ansi.bright_black": "#73675eff",
-        "terminal.ansi.dim_black": "#fbf1c7ff",
-        "terminal.ansi.red": "#fb4a35ff",
-        "terminal.ansi.bright_red": "#93201dff",
-        "terminal.ansi.dim_red": "#ffaa95ff",
-        "terminal.ansi.green": "#b7bb26ff",
-        "terminal.ansi.bright_green": "#605c1bff",
-        "terminal.ansi.dim_green": "#e0dc98ff",
-        "terminal.ansi.yellow": "#f9bd2fff",
-        "terminal.ansi.bright_yellow": "#91611bff",
-        "terminal.ansi.dim_yellow": "#fedc9bff",
-        "terminal.ansi.blue": "#83a598ff",
-        "terminal.ansi.bright_blue": "#414f4aff",
-        "terminal.ansi.dim_blue": "#c0d2cbff",
-        "terminal.ansi.magenta": "#d3869bff",
-        "terminal.ansi.bright_magenta": "#8e5868ff",
-        "terminal.ansi.dim_magenta": "#ff9ebbff",
-        "terminal.ansi.cyan": "#8ec07cff",
-        "terminal.ansi.bright_cyan": "#45603eff",
-        "terminal.ansi.dim_cyan": "#c7dfbdff",
-        "terminal.ansi.white": "#fbf1c7ff",
-        "terminal.ansi.bright_white": "#ffffffff",
-        "terminal.ansi.dim_white": "#b0a189ff",
-        "link_text.hover": "#83a598ff",
-        "version_control.added": "#b7bb26ff",
-        "version_control.modified": "#f9bd2fff",
-        "version_control.deleted": "#fb4a35ff",
-        "conflict": "#f9bd2fff",
-        "conflict.background": "#572e10ff",
-        "conflict.border": "#754916ff",
-        "created": "#b7bb26ff",
-        "created.background": "#322b11ff",
-        "created.border": "#4a4516ff",
-        "deleted": "#fb4a35ff",
-        "deleted.background": "#590a0fff",
-        "deleted.border": "#771617ff",
-        "error": "#fb4a35ff",
-        "error.background": "#590a0fff",
-        "error.border": "#771617ff",
-        "hidden": "#998b78ff",
-        "hidden.background": "#4c4642ff",
-        "hidden.border": "#544c48ff",
-        "hint": "#6a695bff",
-        "hint.background": "#1e2321ff",
-        "hint.border": "#303a36ff",
-        "ignored": "#998b78ff",
-        "ignored.background": "#4c4642ff",
-        "ignored.border": "#5b534dff",
-        "info": "#83a598ff",
-        "info.background": "#1e2321ff",
-        "info.border": "#303a36ff",
-        "modified": "#f9bd2fff",
-        "modified.background": "#572e10ff",
-        "modified.border": "#754916ff",
-        "predictive": "#717363ff",
-        "predictive.background": "#322b11ff",
-        "predictive.border": "#4a4516ff",
-        "renamed": "#83a598ff",
-        "renamed.background": "#1e2321ff",
-        "renamed.border": "#303a36ff",
-        "success": "#b7bb26ff",
-        "success.background": "#322b11ff",
-        "success.border": "#4a4516ff",
-        "unreachable": "#c5b597ff",
-        "unreachable.background": "#4c4642ff",
-        "unreachable.border": "#5b534dff",
-        "warning": "#f9bd2fff",
-        "warning.background": "#572e10ff",
-        "warning.border": "#754916ff",
-        "players": [
-          {
-            "cursor": "#83a598ff",
-            "background": "#83a598ff",
-            "selection": "#83a5983d"
-          },
-          {
-            "cursor": "#a89984ff",
-            "background": "#a89984ff",
-            "selection": "#a899843d"
-          },
-          {
-            "cursor": "#fd801bff",
-            "background": "#fd801bff",
-            "selection": "#fd801b3d"
-          },
-          {
-            "cursor": "#d3869bff",
-            "background": "#d3869bff",
-            "selection": "#d3869b3d"
-          },
-          {
-            "cursor": "#8ec07cff",
-            "background": "#8ec07cff",
-            "selection": "#8ec07c3d"
-          },
-          {
-            "cursor": "#fb4a35ff",
-            "background": "#fb4a35ff",
-            "selection": "#fb4a353d"
-          },
-          {
-            "cursor": "#f9bd2fff",
-            "background": "#f9bd2fff",
-            "selection": "#f9bd2f3d"
-          },
-          {
-            "cursor": "#b7bb26ff",
-            "background": "#b7bb26ff",
-            "selection": "#b7bb263d"
-          }
-        ],
-        "syntax": {
-          "attribute": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "boolean": {
-            "color": "#d3869bff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "comment": {
-            "color": "#a89984ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "comment.doc": {
-            "color": "#c6b697ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "constant": {
-            "color": "#fabd2eff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "constructor": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "embedded": {
-            "color": "#8ec07cff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "emphasis": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "emphasis.strong": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": 700
-          },
-          "enum": {
-            "color": "#fe7f18ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "function": {
-            "color": "#b8bb25ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "function.builtin": {
-            "color": "#fb4833ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "hint": {
-            "color": "#8c957dff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "keyword": {
-            "color": "#fb4833ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "label": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "link_text": {
-            "color": "#8ec07cff",
-            "font_style": "italic",
-            "font_weight": null
-          },
-          "link_uri": {
-            "color": "#d3869bff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "namespace": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "number": {
-            "color": "#d3869bff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "operator": {
-            "color": "#8ec07cff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "predictive": {
-            "color": "#717363ff",
-            "font_style": "italic",
-            "font_weight": null
-          },
-          "preproc": {
-            "color": "#fbf1c7ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "primary": {
-            "color": "#ebdbb2ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "property": {
-            "color": "#ebdbb2ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation": {
-            "color": "#d5c4a1ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.bracket": {
-            "color": "#a89984ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.delimiter": {
-            "color": "#e5d5adff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.list_marker": {
-            "color": "#ebdbb2ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.markup": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.special": {
-            "color": "#e5d5adff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "selector": {
-            "color": "#fabd2eff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "selector.pseudo": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string": {
-            "color": "#b8bb25ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.escape": {
-            "color": "#c6b697ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.regex": {
-            "color": "#fe7f18ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.special": {
-            "color": "#d3869bff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.special.symbol": {
-            "color": "#8ec07cff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "tag": {
-            "color": "#8ec07cff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "text.literal": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "title": {
-            "color": "#b8bb25ff",
-            "font_style": null,
-            "font_weight": 700
-          },
-          "type": {
-            "color": "#fabd2eff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "variable": {
-            "color": "#ebdbb2ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "variable.special": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "variant": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": null
-          }
-        }
-      }
-    },
-    {
-      "name": "Gruvbox Dark Soft",
-      "appearance": "dark",
-      "style": {
-        "accents": ["#cc241dff", "#98971aff", "#d79921ff", "#458588ff", "#b16286ff", "#689d6aff", "#d65d0eff"],
-        "border": "#5b534dff",
-        "border.variant": "#494340ff",
-        "border.focused": "#303a36ff",
-        "border.selected": "#303a36ff",
-        "border.transparent": "#00000000",
-        "border.disabled": "#544c48ff",
-        "elevated_surface.background": "#3b3735ff",
-        "surface.background": "#3b3735ff",
-        "background": "#4c4642ff",
-        "element.background": "#3b3735ff",
-        "element.hover": "#494340ff",
-        "element.active": "#5b524cff",
-        "element.selected": "#5b524cff",
-        "element.disabled": "#3b3735ff",
-        "drop_target.background": "#c5b59780",
-        "ghost_element.background": "#00000000",
-        "ghost_element.hover": "#494340ff",
-        "ghost_element.active": "#5b524cff",
-        "ghost_element.selected": "#5b524cff",
-        "ghost_element.disabled": "#3b3735ff",
-        "text": "#fbf1c7ff",
-        "text.muted": "#c5b597ff",
-        "text.placeholder": "#998b78ff",
-        "text.disabled": "#998b78ff",
-        "text.accent": "#83a598ff",
-        "icon": "#fbf1c7ff",
-        "icon.muted": "#c5b597ff",
-        "icon.disabled": "#998b78ff",
-        "icon.placeholder": "#c5b597ff",
-        "icon.accent": "#83a598ff",
-        "status_bar.background": "#4c4642ff",
-        "title_bar.background": "#4c4642ff",
-        "title_bar.inactive_background": "#3b3735ff",
-        "toolbar.background": "#32302fff",
-        "tab_bar.background": "#3b3735ff",
-        "tab.inactive_background": "#3b3735ff",
-        "tab.active_background": "#32302fff",
-        "search.match_background": "#83a59866",
-        "search.active_match_background": "#aea85166",
-        "panel.background": "#3b3735ff",
-        "panel.focused_border": null,
-        "pane.focused_border": null,
-        "scrollbar.thumb.active_background": "#83a598ac",
-        "scrollbar.thumb.hover_background": "#fbf1c74c",
-        "scrollbar.thumb.background": "#a899844c",
-        "scrollbar.thumb.border": "#494340ff",
-        "scrollbar.track.background": "#00000000",
-        "scrollbar.track.border": "#393634ff",
-        "editor.foreground": "#ebdbb2ff",
-        "editor.background": "#32302fff",
-        "editor.gutter.background": "#32302fff",
-        "editor.subheader.background": "#3b3735ff",
-        "editor.active_line.background": "#3b3735bf",
-        "editor.highlighted_line.background": "#3b3735ff",
-        "editor.line_number": "#6e6b5e",
-        "editor.active_line_number": "#dedcd3",
-        "editor.hover_line_number": "#c9c5b6",
-        "editor.invisible": "#928474ff",
-        "editor.wrap_guide": "#fbf1c70d",
-        "editor.active_wrap_guide": "#fbf1c71a",
-        "editor.document_highlight.read_background": "#83a5981a",
-        "editor.document_highlight.write_background": "#92847466",
-        "terminal.background": "#32302fff",
-        "terminal.foreground": "#fbf1c7ff",
-        "terminal.bright_foreground": "#fbf1c7ff",
-        "terminal.dim_foreground": "#32302fff",
-        "terminal.ansi.black": "#32302fff",
-        "terminal.ansi.bright_black": "#73675eff",
-        "terminal.ansi.dim_black": "#fbf1c7ff",
-        "terminal.ansi.red": "#fb4a35ff",
-        "terminal.ansi.bright_red": "#93201dff",
-        "terminal.ansi.dim_red": "#ffaa95ff",
-        "terminal.ansi.green": "#b7bb26ff",
-        "terminal.ansi.bright_green": "#605c1bff",
-        "terminal.ansi.dim_green": "#e0dc98ff",
-        "terminal.ansi.yellow": "#f9bd2fff",
-        "terminal.ansi.bright_yellow": "#91611bff",
-        "terminal.ansi.dim_yellow": "#fedc9bff",
-        "terminal.ansi.blue": "#83a598ff",
-        "terminal.ansi.bright_blue": "#414f4aff",
-        "terminal.ansi.dim_blue": "#c0d2cbff",
-        "terminal.ansi.magenta": "#d3869bff",
-        "terminal.ansi.bright_magenta": "#8e5868ff",
-        "terminal.ansi.dim_magenta": "#ff9ebbff",
-        "terminal.ansi.cyan": "#8ec07cff",
-        "terminal.ansi.bright_cyan": "#45603eff",
-        "terminal.ansi.dim_cyan": "#c7dfbdff",
-        "terminal.ansi.white": "#fbf1c7ff",
-        "terminal.ansi.bright_white": "#ffffffff",
-        "terminal.ansi.dim_white": "#b0a189ff",
-        "link_text.hover": "#83a598ff",
-        "version_control.added": "#b7bb26ff",
-        "version_control.modified": "#f9bd2fff",
-        "version_control.deleted": "#fb4a35ff",
-        "conflict": "#f9bd2fff",
-        "conflict.background": "#572e10ff",
-        "conflict.border": "#754916ff",
-        "created": "#b7bb26ff",
-        "created.background": "#322b11ff",
-        "created.border": "#4a4516ff",
-        "deleted": "#fb4a35ff",
-        "deleted.background": "#590a0fff",
-        "deleted.border": "#771617ff",
-        "error": "#fb4a35ff",
-        "error.background": "#590a0fff",
-        "error.border": "#771617ff",
-        "hidden": "#998b78ff",
-        "hidden.background": "#4c4642ff",
-        "hidden.border": "#544c48ff",
-        "hint": "#8c957dff",
-        "hint.background": "#1e2321ff",
-        "hint.border": "#303a36ff",
-        "ignored": "#998b78ff",
-        "ignored.background": "#4c4642ff",
-        "ignored.border": "#5b534dff",
-        "info": "#83a598ff",
-        "info.background": "#1e2321ff",
-        "info.border": "#303a36ff",
-        "modified": "#f9bd2fff",
-        "modified.background": "#572e10ff",
-        "modified.border": "#754916ff",
-        "predictive": "#717363ff",
-        "predictive.background": "#322b11ff",
-        "predictive.border": "#4a4516ff",
-        "renamed": "#83a598ff",
-        "renamed.background": "#1e2321ff",
-        "renamed.border": "#303a36ff",
-        "success": "#b7bb26ff",
-        "success.background": "#322b11ff",
-        "success.border": "#4a4516ff",
-        "unreachable": "#c5b597ff",
-        "unreachable.background": "#4c4642ff",
-        "unreachable.border": "#5b534dff",
-        "warning": "#f9bd2fff",
-        "warning.background": "#572e10ff",
-        "warning.border": "#754916ff",
-        "players": [
-          {
-            "cursor": "#83a598ff",
-            "background": "#83a598ff",
-            "selection": "#83a5983d"
-          },
-          {
-            "cursor": "#a89984ff",
-            "background": "#a89984ff",
-            "selection": "#a899843d"
-          },
-          {
-            "cursor": "#fd801bff",
-            "background": "#fd801bff",
-            "selection": "#fd801b3d"
-          },
-          {
-            "cursor": "#d3869bff",
-            "background": "#d3869bff",
-            "selection": "#d3869b3d"
-          },
-          {
-            "cursor": "#8ec07cff",
-            "background": "#8ec07cff",
-            "selection": "#8ec07c3d"
-          },
-          {
-            "cursor": "#fb4a35ff",
-            "background": "#fb4a35ff",
-            "selection": "#fb4a353d"
-          },
-          {
-            "cursor": "#f9bd2fff",
-            "background": "#f9bd2fff",
-            "selection": "#f9bd2f3d"
-          },
-          {
-            "cursor": "#b7bb26ff",
-            "background": "#b7bb26ff",
-            "selection": "#b7bb263d"
-          }
-        ],
-        "syntax": {
-          "attribute": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "boolean": {
-            "color": "#d3869bff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "comment": {
-            "color": "#a89984ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "comment.doc": {
-            "color": "#c6b697ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "constant": {
-            "color": "#fabd2eff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "constructor": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "embedded": {
-            "color": "#8ec07cff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "emphasis": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "emphasis.strong": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": 700
-          },
-          "enum": {
-            "color": "#fe7f18ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "function": {
-            "color": "#b8bb25ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "function.builtin": {
-            "color": "#fb4833ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "hint": {
-            "color": "#8c957dff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "keyword": {
-            "color": "#fb4833ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "label": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "link_text": {
-            "color": "#8ec07cff",
-            "font_style": "italic",
-            "font_weight": null
-          },
-          "link_uri": {
-            "color": "#d3869bff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "namespace": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "number": {
-            "color": "#d3869bff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "operator": {
-            "color": "#8ec07cff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "predictive": {
-            "color": "#717363ff",
-            "font_style": "italic",
-            "font_weight": null
-          },
-          "preproc": {
-            "color": "#fbf1c7ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "primary": {
-            "color": "#ebdbb2ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "property": {
-            "color": "#ebdbb2ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation": {
-            "color": "#d5c4a1ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.bracket": {
-            "color": "#a89984ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.delimiter": {
-            "color": "#e5d5adff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.list_marker": {
-            "color": "#ebdbb2ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.markup": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.special": {
-            "color": "#e5d5adff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "selector": {
-            "color": "#fabd2eff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "selector.pseudo": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string": {
-            "color": "#b8bb25ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.escape": {
-            "color": "#c6b697ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.regex": {
-            "color": "#fe7f18ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.special": {
-            "color": "#d3869bff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.special.symbol": {
-            "color": "#8ec07cff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "tag": {
-            "color": "#8ec07cff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "text.literal": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "title": {
-            "color": "#b8bb25ff",
-            "font_style": null,
-            "font_weight": 700
-          },
-          "type": {
-            "color": "#fabd2eff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "variable": {
-            "color": "#ebdbb2ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "variable.special": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "variant": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": null
-          }
-        }
-      }
-    },
-    {
-      "name": "Gruvbox Light",
-      "appearance": "light",
-      "style": {
-        "accents": ["#cc241dff", "#98971aff", "#d79921ff", "#458588ff", "#b16286ff", "#689d6aff", "#d65d0eff"],
-        "border": "#c8b899ff",
-        "border.variant": "#ddcca7ff",
-        "border.focused": "#adc5ccff",
-        "border.selected": "#adc5ccff",
-        "border.transparent": "#00000000",
-        "border.disabled": "#d0bf9dff",
-        "elevated_surface.background": "#ecddb4ff",
-        "surface.background": "#ecddb4ff",
-        "background": "#d9c8a4ff",
-        "element.background": "#ecddb4ff",
-        "element.hover": "#ddcca7ff",
-        "element.active": "#c8b899ff",
-        "element.selected": "#c8b899ff",
-        "element.disabled": "#ecddb4ff",
-        "drop_target.background": "#5f565080",
-        "ghost_element.background": "#00000000",
-        "ghost_element.hover": "#ddcca7ff",
-        "ghost_element.active": "#c8b899ff",
-        "ghost_element.selected": "#c8b899ff",
-        "ghost_element.disabled": "#ecddb4ff",
-        "text": "#282828ff",
-        "text.muted": "#5f5650ff",
-        "text.placeholder": "#897b6eff",
-        "text.disabled": "#897b6eff",
-        "text.accent": "#0b6678ff",
-        "icon": "#282828ff",
-        "icon.muted": "#5f5650ff",
-        "icon.disabled": "#897b6eff",
-        "icon.placeholder": "#5f5650ff",
-        "icon.accent": "#0b6678ff",
-        "status_bar.background": "#d9c8a4ff",
-        "title_bar.background": "#d9c8a4ff",
-        "title_bar.inactive_background": "#ecddb4ff",
-        "toolbar.background": "#fbf1c7ff",
-        "tab_bar.background": "#ecddb4ff",
-        "tab.inactive_background": "#ecddb4ff",
-        "tab.active_background": "#fbf1c7ff",
-        "search.match_background": "#0b667866",
-        "search.active_match_background": "#ba2d1166",
-        "panel.background": "#ecddb4ff",
-        "panel.focused_border": null,
-        "pane.focused_border": null,
-        "scrollbar.thumb.active_background": "#458588ac",
-        "scrollbar.thumb.hover_background": "#2828284c",
-        "scrollbar.thumb.background": "#7c6f644c",
-        "scrollbar.thumb.border": "#ddcca7ff",
-        "scrollbar.track.background": "#00000000",
-        "scrollbar.track.border": "#eee0b7ff",
-        "editor.foreground": "#282828ff",
-        "editor.background": "#fbf1c7ff",
-        "editor.gutter.background": "#fbf1c7ff",
-        "editor.subheader.background": "#ecddb4ff",
-        "editor.active_line.background": "#ecddb4bf",
-        "editor.highlighted_line.background": "#ecddb4ff",
-        "editor.line_number": "#a9a389",
-        "editor.active_line_number": "#3b382b",
-        "editor.hover_line_number": "#5e5a45",
-        "editor.invisible": "#928474ff",
-        "editor.wrap_guide": "#2828280d",
-        "editor.active_wrap_guide": "#2828281a",
-        "editor.document_highlight.read_background": "#0b66781a",
-        "editor.document_highlight.write_background": "#92847466",
-        "terminal.background": "#fbf1c7ff",
-        "terminal.foreground": "#282828ff",
-        "terminal.bright_foreground": "#282828ff",
-        "terminal.dim_foreground": "#fbf1c7ff",
-        "terminal.ansi.black": "#282828ff",
-        "terminal.ansi.bright_black": "#0b6678ff",
-        "terminal.ansi.dim_black": "#5f5650ff",
-        "terminal.ansi.red": "#9d0308ff",
-        "terminal.ansi.bright_red": "#db8b7aff",
-        "terminal.ansi.dim_red": "#4e1207ff",
-        "terminal.ansi.green": "#797410ff",
-        "terminal.ansi.bright_green": "#bfb787ff",
-        "terminal.ansi.dim_green": "#3e3a11ff",
-        "terminal.ansi.yellow": "#b57615ff",
-        "terminal.ansi.bright_yellow": "#e2b88bff",
-        "terminal.ansi.dim_yellow": "#5c3a12ff",
-        "terminal.ansi.blue": "#0b6678ff",
-        "terminal.ansi.bright_blue": "#8fb0baff",
-        "terminal.ansi.dim_blue": "#14333bff",
-        "terminal.ansi.magenta": "#8f3e71ff",
-        "terminal.ansi.bright_magenta": "#c76da0ff",
-        "terminal.ansi.dim_magenta": "#5c2848ff",
-        "terminal.ansi.cyan": "#437b59ff",
-        "terminal.ansi.bright_cyan": "#9fbca8ff",
-        "terminal.ansi.dim_cyan": "#253e2eff",
-        "terminal.ansi.white": "#fbf1c7ff",
-        "terminal.ansi.bright_white": "#ffffffff",
-        "terminal.ansi.dim_white": "#b0a189ff",
-        "link_text.hover": "#0b6678ff",
-        "version_control.added": "#797410ff",
-        "version_control.modified": "#b57615ff",
-        "version_control.deleted": "#9d0308ff",
-        "conflict": "#b57615ff",
-        "conflict.background": "#f5e2d0ff",
-        "conflict.border": "#ebccabff",
-        "created": "#797410ff",
-        "created.background": "#e4e0cdff",
-        "created.border": "#d1cba8ff",
-        "deleted": "#9d0308ff",
-        "deleted.background": "#f4d1c9ff",
-        "deleted.border": "#e8ac9eff",
-        "error": "#9d0308ff",
-        "error.background": "#f4d1c9ff",
-        "error.border": "#e8ac9eff",
-        "hidden": "#897b6eff",
-        "hidden.background": "#d9c8a4ff",
-        "hidden.border": "#d0bf9dff",
-        "hint": "#677562ff",
-        "hint.background": "#d2dee2ff",
-        "hint.border": "#adc5ccff",
-        "ignored": "#897b6eff",
-        "ignored.background": "#d9c8a4ff",
-        "ignored.border": "#c8b899ff",
-        "info": "#0b6678ff",
-        "info.background": "#d2dee2ff",
-        "info.border": "#adc5ccff",
-        "modified": "#b57615ff",
-        "modified.background": "#f5e2d0ff",
-        "modified.border": "#ebccabff",
-        "predictive": "#7c9780ff",
-        "predictive.background": "#e4e0cdff",
-        "predictive.border": "#d1cba8ff",
-        "renamed": "#0b6678ff",
-        "renamed.background": "#d2dee2ff",
-        "renamed.border": "#adc5ccff",
-        "success": "#797410ff",
-        "success.background": "#e4e0cdff",
-        "success.border": "#d1cba8ff",
-        "unreachable": "#5f5650ff",
-        "unreachable.background": "#d9c8a4ff",
-        "unreachable.border": "#c8b899ff",
-        "warning": "#b57615ff",
-        "warning.background": "#f5e2d0ff",
-        "warning.border": "#ebccabff",
-        "players": [
-          {
-            "cursor": "#0b6678ff",
-            "background": "#0b6678ff",
-            "selection": "#0b66783d"
-          },
-          {
-            "cursor": "#7c6f64ff",
-            "background": "#7c6f64ff",
-            "selection": "#7c6f643d"
-          },
-          {
-            "cursor": "#af3a04ff",
-            "background": "#af3a04ff",
-            "selection": "#af3a043d"
-          },
-          {
-            "cursor": "#8f3f70ff",
-            "background": "#8f3f70ff",
-            "selection": "#8f3f703d"
-          },
-          {
-            "cursor": "#437b59ff",
-            "background": "#437b59ff",
-            "selection": "#437b593d"
-          },
-          {
-            "cursor": "#9d0308ff",
-            "background": "#9d0308ff",
-            "selection": "#9d03083d"
-          },
-          {
-            "cursor": "#b57615ff",
-            "background": "#b57615ff",
-            "selection": "#b576153d"
-          },
-          {
-            "cursor": "#797410ff",
-            "background": "#797410ff",
-            "selection": "#7974103d"
-          }
-        ],
-        "syntax": {
-          "attribute": {
-            "color": "#0b6678ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "boolean": {
-            "color": "#8f3e71ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "comment": {
-            "color": "#7c6f64ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "comment.doc": {
-            "color": "#5d544eff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "constant": {
-            "color": "#b57613ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "constructor": {
-            "color": "#0b6678ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "embedded": {
-            "color": "#427b58ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "emphasis": {
-            "color": "#0b6678ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "emphasis.strong": {
-            "color": "#0b6678ff",
-            "font_style": null,
-            "font_weight": 700
-          },
-          "enum": {
-            "color": "#af3a02ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "function": {
-            "color": "#79740eff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "function.builtin": {
-            "color": "#9d0006ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "hint": {
-            "color": "#677562ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "keyword": {
-            "color": "#9d0006ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "label": {
-            "color": "#0b6678ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "link_text": {
-            "color": "#427b58ff",
-            "font_style": "italic",
-            "font_weight": null
-          },
-          "link_uri": {
-            "color": "#8f3e71ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "namespace": {
-            "color": "#066578ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "number": {
-            "color": "#8f3e71ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "operator": {
-            "color": "#427b58ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "predictive": {
-            "color": "#7c9780ff",
-            "font_style": "italic",
-            "font_weight": null
-          },
-          "preproc": {
-            "color": "#282828ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "primary": {
-            "color": "#282828ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "property": {
-            "color": "#282828ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation": {
-            "color": "#3c3836ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.bracket": {
-            "color": "#665c54ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.delimiter": {
-            "color": "#413d3aff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.list_marker": {
-            "color": "#282828ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.markup": {
-            "color": "#066578ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.special": {
-            "color": "#413d3aff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "selector": {
-            "color": "#b57613ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "selector.pseudo": {
-            "color": "#0b6678ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string": {
-            "color": "#79740eff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.escape": {
-            "color": "#5d544eff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.regex": {
-            "color": "#af3a02ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.special": {
-            "color": "#8f3e71ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.special.symbol": {
-            "color": "#427b58ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "tag": {
-            "color": "#427b58ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "text.literal": {
-            "color": "#066578ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "title": {
-            "color": "#79740eff",
-            "font_style": null,
-            "font_weight": 700
-          },
-          "type": {
-            "color": "#b57613ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "variable": {
-            "color": "#282828ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "variable.special": {
-            "color": "#066578ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "variant": {
-            "color": "#0b6678ff",
-            "font_style": null,
-            "font_weight": null
-          }
-        }
-      }
-    },
-    {
-      "name": "Gruvbox Light Hard",
-      "appearance": "light",
-      "style": {
-        "accents": ["#cc241dff", "#98971aff", "#d79921ff", "#458588ff", "#b16286ff", "#689d6aff", "#d65d0eff"],
-        "border": "#c8b899ff",
-        "border.variant": "#ddcca7ff",
-        "border.focused": "#adc5ccff",
-        "border.selected": "#adc5ccff",
-        "border.transparent": "#00000000",
-        "border.disabled": "#d0bf9dff",
-        "elevated_surface.background": "#ecddb5ff",
-        "surface.background": "#ecddb5ff",
-        "background": "#d9c8a4ff",
-        "element.background": "#ecddb5ff",
-        "element.hover": "#ddcca7ff",
-        "element.active": "#c8b899ff",
-        "element.selected": "#c8b899ff",
-        "element.disabled": "#ecddb5ff",
-        "drop_target.background": "#5f565080",
-        "ghost_element.background": "#00000000",
-        "ghost_element.hover": "#ddcca7ff",
-        "ghost_element.active": "#c8b899ff",
-        "ghost_element.selected": "#c8b899ff",
-        "ghost_element.disabled": "#ecddb5ff",
-        "text": "#282828ff",
-        "text.muted": "#5f5650ff",
-        "text.placeholder": "#897b6eff",
-        "text.disabled": "#897b6eff",
-        "text.accent": "#0b6678ff",
-        "icon": "#282828ff",
-        "icon.muted": "#5f5650ff",
-        "icon.disabled": "#897b6eff",
-        "icon.placeholder": "#5f5650ff",
-        "icon.accent": "#0b6678ff",
-        "status_bar.background": "#d9c8a4ff",
-        "title_bar.background": "#d9c8a4ff",
-        "title_bar.inactive_background": "#ecddb5ff",
-        "toolbar.background": "#f9f5d7ff",
-        "tab_bar.background": "#ecddb5ff",
-        "tab.inactive_background": "#ecddb5ff",
-        "tab.active_background": "#f9f5d7ff",
-        "search.match_background": "#0b667866",
-        "search.active_match_background": "#dc351466",
-        "panel.background": "#ecddb5ff",
-        "panel.focused_border": null,
-        "pane.focused_border": null,
-        "scrollbar.thumb.active_background": "#458588ac",
-        "scrollbar.thumb.hover_background": "#2828284c",
-        "scrollbar.thumb.background": "#7c6f644c",
-        "scrollbar.thumb.border": "#ddcca7ff",
-        "scrollbar.track.background": "#00000000",
-        "scrollbar.track.border": "#eee1bbff",
-        "editor.foreground": "#282828ff",
-        "editor.background": "#f9f5d7ff",
-        "editor.gutter.background": "#f9f5d7ff",
-        "editor.subheader.background": "#ecddb5ff",
-        "editor.active_line.background": "#ecddb5bf",
-        "editor.highlighted_line.background": "#ecddb5ff",
-        "editor.line_number": "#a9a389",
-        "editor.active_line_number": "#3b382b",
-        "editor.hover_line_number": "#5e5a45",
-        "editor.invisible": "#928474ff",
-        "editor.wrap_guide": "#2828280d",
-        "editor.active_wrap_guide": "#2828281a",
-        "editor.document_highlight.read_background": "#0b66781a",
-        "editor.document_highlight.write_background": "#92847466",
-        "terminal.background": "#f9f5d7ff",
-        "terminal.foreground": "#282828ff",
-        "terminal.bright_foreground": "#282828ff",
-        "terminal.dim_foreground": "#f9f5d7ff",
-        "terminal.ansi.black": "#282828ff",
-        "terminal.ansi.bright_black": "#73675eff",
-        "terminal.ansi.dim_black": "#f9f5d7ff",
-        "terminal.ansi.red": "#9d0308ff",
-        "terminal.ansi.bright_red": "#db8b7aff",
-        "terminal.ansi.dim_red": "#4e1207ff",
-        "terminal.ansi.green": "#797410ff",
-        "terminal.ansi.bright_green": "#bfb787ff",
-        "terminal.ansi.dim_green": "#3e3a11ff",
-        "terminal.ansi.yellow": "#b57615ff",
-        "terminal.ansi.bright_yellow": "#e2b88bff",
-        "terminal.ansi.dim_yellow": "#5c3a12ff",
-        "terminal.ansi.blue": "#0b6678ff",
-        "terminal.ansi.bright_blue": "#8fb0baff",
-        "terminal.ansi.dim_blue": "#14333bff",
-        "terminal.ansi.magenta": "#8f3e71ff",
-        "terminal.ansi.bright_magenta": "#c76da0ff",
-        "terminal.ansi.dim_magenta": "#5c2848ff",
-        "terminal.ansi.cyan": "#437b59ff",
-        "terminal.ansi.bright_cyan": "#9fbca8ff",
-        "terminal.ansi.dim_cyan": "#253e2eff",
-        "terminal.ansi.white": "#f9f5d7ff",
-        "terminal.ansi.bright_white": "#ffffffff",
-        "terminal.ansi.dim_white": "#b0a189ff",
-        "link_text.hover": "#0b6678ff",
-        "version_control.added": "#797410ff",
-        "version_control.modified": "#b57615ff",
-        "version_control.deleted": "#9d0308ff",
-        "conflict": "#b57615ff",
-        "conflict.background": "#f5e2d0ff",
-        "conflict.border": "#ebccabff",
-        "created": "#797410ff",
-        "created.background": "#e4e0cdff",
-        "created.border": "#d1cba8ff",
-        "deleted": "#9d0308ff",
-        "deleted.background": "#f4d1c9ff",
-        "deleted.border": "#e8ac9eff",
-        "error": "#9d0308ff",
-        "error.background": "#f4d1c9ff",
-        "error.border": "#e8ac9eff",
-        "hidden": "#897b6eff",
-        "hidden.background": "#d9c8a4ff",
-        "hidden.border": "#d0bf9dff",
-        "hint": "#677562ff",
-        "hint.background": "#d2dee2ff",
-        "hint.border": "#adc5ccff",
-        "ignored": "#897b6eff",
-        "ignored.background": "#d9c8a4ff",
-        "ignored.border": "#c8b899ff",
-        "info": "#0b6678ff",
-        "info.background": "#d2dee2ff",
-        "info.border": "#adc5ccff",
-        "modified": "#b57615ff",
-        "modified.background": "#f5e2d0ff",
-        "modified.border": "#ebccabff",
-        "predictive": "#7c9780ff",
-        "predictive.background": "#e4e0cdff",
-        "predictive.border": "#d1cba8ff",
-        "renamed": "#0b6678ff",
-        "renamed.background": "#d2dee2ff",
-        "renamed.border": "#adc5ccff",
-        "success": "#797410ff",
-        "success.background": "#e4e0cdff",
-        "success.border": "#d1cba8ff",
-        "unreachable": "#5f5650ff",
-        "unreachable.background": "#d9c8a4ff",
-        "unreachable.border": "#c8b899ff",
-        "warning": "#b57615ff",
-        "warning.background": "#f5e2d0ff",
-        "warning.border": "#ebccabff",
-        "players": [
-          {
-            "cursor": "#0b6678ff",
-            "background": "#0b6678ff",
-            "selection": "#0b66783d"
-          },
-          {
-            "cursor": "#7c6f64ff",
-            "background": "#7c6f64ff",
-            "selection": "#7c6f643d"
-          },
-          {
-            "cursor": "#af3a04ff",
-            "background": "#af3a04ff",
-            "selection": "#af3a043d"
-          },
-          {
-            "cursor": "#8f3f70ff",
-            "background": "#8f3f70ff",
-            "selection": "#8f3f703d"
-          },
-          {
-            "cursor": "#437b59ff",
-            "background": "#437b59ff",
-            "selection": "#437b593d"
-          },
-          {
-            "cursor": "#9d0308ff",
-            "background": "#9d0308ff",
-            "selection": "#9d03083d"
-          },
-          {
-            "cursor": "#b57615ff",
-            "background": "#b57615ff",
-            "selection": "#b576153d"
-          },
-          {
-            "cursor": "#797410ff",
-            "background": "#797410ff",
-            "selection": "#7974103d"
-          }
-        ],
-        "syntax": {
-          "attribute": {
-            "color": "#0b6678ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "boolean": {
-            "color": "#8f3e71ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "comment": {
-            "color": "#7c6f64ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "comment.doc": {
-            "color": "#5d544eff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "constant": {
-            "color": "#b57613ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "constructor": {
-            "color": "#0b6678ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "embedded": {
-            "color": "#427b58ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "emphasis": {
-            "color": "#0b6678ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "emphasis.strong": {
-            "color": "#0b6678ff",
-            "font_style": null,
-            "font_weight": 700
-          },
-          "enum": {
-            "color": "#af3a02ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "function": {
-            "color": "#79740eff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "function.builtin": {
-            "color": "#9d0006ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "hint": {
-            "color": "#677562ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "keyword": {
-            "color": "#9d0006ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "label": {
-            "color": "#0b6678ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "link_text": {
-            "color": "#427b58ff",
-            "font_style": "italic",
-            "font_weight": null
-          },
-          "link_uri": {
-            "color": "#8f3e71ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "namespace": {
-            "color": "#066578ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "number": {
-            "color": "#8f3e71ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "operator": {
-            "color": "#427b58ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "predictive": {
-            "color": "#7c9780ff",
-            "font_style": "italic",
-            "font_weight": null
-          },
-          "preproc": {
-            "color": "#282828ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "primary": {
-            "color": "#282828ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "property": {
-            "color": "#282828ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation": {
-            "color": "#3c3836ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.bracket": {
-            "color": "#665c54ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.delimiter": {
-            "color": "#413d3aff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.list_marker": {
-            "color": "#282828ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.markup": {
-            "color": "#066578ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.special": {
-            "color": "#413d3aff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "selector": {
-            "color": "#b57613ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "selector.pseudo": {
-            "color": "#0b6678ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string": {
-            "color": "#79740eff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.escape": {
-            "color": "#5d544eff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.regex": {
-            "color": "#af3a02ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.special": {
-            "color": "#8f3e71ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.special.symbol": {
-            "color": "#427b58ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "tag": {
-            "color": "#427b58ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "text.literal": {
-            "color": "#066578ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "title": {
-            "color": "#79740eff",
-            "font_style": null,
-            "font_weight": 700
-          },
-          "type": {
-            "color": "#b57613ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "variable": {
-            "color": "#282828ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "variable.special": {
-            "color": "#066578ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "variant": {
-            "color": "#0b6678ff",
-            "font_style": null,
-            "font_weight": null
-          }
-        }
-      }
-    },
-    {
-      "name": "Gruvbox Light Soft",
-      "appearance": "light",
-      "style": {
-        "accents": ["#cc241dff", "#98971aff", "#d79921ff", "#458588ff", "#b16286ff", "#689d6aff", "#d65d0eff"],
-        "border": "#c8b899ff",
-        "border.variant": "#ddcca7ff",
-        "border.focused": "#adc5ccff",
-        "border.selected": "#adc5ccff",
-        "border.transparent": "#00000000",
-        "border.disabled": "#d0bf9dff",
-        "elevated_surface.background": "#ecdcb3ff",
-        "surface.background": "#ecdcb3ff",
-        "background": "#d9c8a4ff",
-        "element.background": "#ecdcb3ff",
-        "element.hover": "#ddcca7ff",
-        "element.active": "#c8b899ff",
-        "element.selected": "#c8b899ff",
-        "element.disabled": "#ecdcb3ff",
-        "drop_target.background": "#5f565080",
-        "ghost_element.background": "#00000000",
-        "ghost_element.hover": "#ddcca7ff",
-        "ghost_element.active": "#c8b899ff",
-        "ghost_element.selected": "#c8b899ff",
-        "ghost_element.disabled": "#ecdcb3ff",
-        "text": "#282828ff",
-        "text.muted": "#5f5650ff",
-        "text.placeholder": "#897b6eff",
-        "text.disabled": "#897b6eff",
-        "text.accent": "#0b6678ff",
-        "icon": "#282828ff",
-        "icon.muted": "#5f5650ff",
-        "icon.disabled": "#897b6eff",
-        "icon.placeholder": "#5f5650ff",
-        "icon.accent": "#0b6678ff",
-        "status_bar.background": "#d9c8a4ff",
-        "title_bar.background": "#d9c8a4ff",
-        "title_bar.inactive_background": "#ecdcb3ff",
-        "toolbar.background": "#f2e5bcff",
-        "tab_bar.background": "#ecdcb3ff",
-        "tab.inactive_background": "#ecdcb3ff",
-        "tab.active_background": "#f2e5bcff",
-        "search.match_background": "#0b667866",
-        "search.active_match_background": "#d7331466",
-        "panel.background": "#ecdcb3ff",
-        "panel.focused_border": null,
-        "pane.focused_border": null,
-        "scrollbar.thumb.active_background": "#458588ac",
-        "scrollbar.thumb.hover_background": "#2828284c",
-        "scrollbar.thumb.background": "#7c6f644c",
-        "scrollbar.thumb.border": "#ddcca7ff",
-        "scrollbar.track.background": "#00000000",
-        "scrollbar.track.border": "#eddeb5ff",
-        "editor.foreground": "#282828ff",
-        "editor.background": "#f2e5bcff",
-        "editor.gutter.background": "#f2e5bcff",
-        "editor.subheader.background": "#ecdcb3ff",
-        "editor.active_line.background": "#ecdcb3bf",
-        "editor.highlighted_line.background": "#ecdcb3ff",
-        "editor.line_number": "#a9a389",
-        "editor.active_line_number": "#3b382b",
-        "editor.hover_line_number": "#5e5a45",
-        "editor.invisible": "#928474ff",
-        "editor.wrap_guide": "#2828280d",
-        "editor.active_wrap_guide": "#2828281a",
-        "editor.document_highlight.read_background": "#0b66781a",
-        "editor.document_highlight.write_background": "#92847466",
-        "terminal.background": "#f2e5bcff",
-        "terminal.foreground": "#282828ff",
-        "terminal.bright_foreground": "#282828ff",
-        "terminal.dim_foreground": "#f2e5bcff",
-        "terminal.ansi.black": "#282828ff",
-        "terminal.ansi.bright_black": "#73675eff",
-        "terminal.ansi.dim_black": "#f2e5bcff",
-        "terminal.ansi.red": "#9d0308ff",
-        "terminal.ansi.bright_red": "#db8b7aff",
-        "terminal.ansi.dim_red": "#4e1207ff",
-        "terminal.ansi.green": "#797410ff",
-        "terminal.ansi.bright_green": "#bfb787ff",
-        "terminal.ansi.dim_green": "#3e3a11ff",
-        "terminal.ansi.yellow": "#b57615ff",
-        "terminal.ansi.bright_yellow": "#e2b88bff",
-        "terminal.ansi.dim_yellow": "#5c3a12ff",
-        "terminal.ansi.blue": "#0b6678ff",
-        "terminal.ansi.bright_blue": "#8fb0baff",
-        "terminal.ansi.dim_blue": "#14333bff",
-        "terminal.ansi.magenta": "#8f3e71ff",
-        "terminal.ansi.bright_magenta": "#c76da0ff",
-        "terminal.ansi.dim_magenta": "#5c2848ff",
-        "terminal.ansi.cyan": "#437b59ff",
-        "terminal.ansi.bright_cyan": "#9fbca8ff",
-        "terminal.ansi.dim_cyan": "#253e2eff",
-        "terminal.ansi.white": "#f2e5bcff",
-        "terminal.ansi.bright_white": "#ffffffff",
-        "terminal.ansi.dim_white": "#b0a189ff",
-        "link_text.hover": "#0b6678ff",
-        "version_control.added": "#797410ff",
-        "version_control.modified": "#b57615ff",
-        "version_control.deleted": "#9d0308ff",
-        "conflict": "#b57615ff",
-        "conflict.background": "#f5e2d0ff",
-        "conflict.border": "#ebccabff",
-        "created": "#797410ff",
-        "created.background": "#e4e0cdff",
-        "created.border": "#d1cba8ff",
-        "deleted": "#9d0308ff",
-        "deleted.background": "#f4d1c9ff",
-        "deleted.border": "#e8ac9eff",
-        "error": "#9d0308ff",
-        "error.background": "#f4d1c9ff",
-        "error.border": "#e8ac9eff",
-        "hidden": "#897b6eff",
-        "hidden.background": "#d9c8a4ff",
-        "hidden.border": "#d0bf9dff",
-        "hint": "#677562ff",
-        "hint.background": "#d2dee2ff",
-        "hint.border": "#adc5ccff",
-        "ignored": "#897b6eff",
-        "ignored.background": "#d9c8a4ff",
-        "ignored.border": "#c8b899ff",
-        "info": "#0b6678ff",
-        "info.background": "#d2dee2ff",
-        "info.border": "#adc5ccff",
-        "modified": "#b57615ff",
-        "modified.background": "#f5e2d0ff",
-        "modified.border": "#ebccabff",
-        "predictive": "#7c9780ff",
-        "predictive.background": "#e4e0cdff",
-        "predictive.border": "#d1cba8ff",
-        "renamed": "#0b6678ff",
-        "renamed.background": "#d2dee2ff",
-        "renamed.border": "#adc5ccff",
-        "success": "#797410ff",
-        "success.background": "#e4e0cdff",
-        "success.border": "#d1cba8ff",
-        "unreachable": "#5f5650ff",
-        "unreachable.background": "#d9c8a4ff",
-        "unreachable.border": "#c8b899ff",
-        "warning": "#b57615ff",
-        "warning.background": "#f5e2d0ff",
-        "warning.border": "#ebccabff",
-        "players": [
-          {
-            "cursor": "#0b6678ff",
-            "background": "#0b6678ff",
-            "selection": "#0b66783d"
-          },
-          {
-            "cursor": "#7c6f64ff",
-            "background": "#7c6f64ff",
-            "selection": "#7c6f643d"
-          },
-          {
-            "cursor": "#af3a04ff",
-            "background": "#af3a04ff",
-            "selection": "#af3a043d"
-          },
-          {
-            "cursor": "#8f3f70ff",
-            "background": "#8f3f70ff",
-            "selection": "#8f3f703d"
-          },
-          {
-            "cursor": "#437b59ff",
-            "background": "#437b59ff",
-            "selection": "#437b593d"
-          },
-          {
-            "cursor": "#9d0308ff",
-            "background": "#9d0308ff",
-            "selection": "#9d03083d"
-          },
-          {
-            "cursor": "#b57615ff",
-            "background": "#b57615ff",
-            "selection": "#b576153d"
-          },
-          {
-            "cursor": "#797410ff",
-            "background": "#797410ff",
-            "selection": "#7974103d"
-          }
-        ],
-        "syntax": {
-          "attribute": {
-            "color": "#0b6678ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "boolean": {
-            "color": "#8f3e71ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "comment": {
-            "color": "#7c6f64ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "comment.doc": {
-            "color": "#5d544eff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "constant": {
-            "color": "#b57613ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "constructor": {
-            "color": "#0b6678ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "embedded": {
-            "color": "#427b58ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "emphasis": {
-            "color": "#0b6678ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "emphasis.strong": {
-            "color": "#0b6678ff",
-            "font_style": null,
-            "font_weight": 700
-          },
-          "enum": {
-            "color": "#af3a02ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "function": {
-            "color": "#79740eff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "function.builtin": {
-            "color": "#9d0006ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "hint": {
-            "color": "#677562ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "keyword": {
-            "color": "#9d0006ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "label": {
-            "color": "#0b6678ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "link_text": {
-            "color": "#427b58ff",
-            "font_style": "italic",
-            "font_weight": null
-          },
-          "link_uri": {
-            "color": "#8f3e71ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "namespace": {
-            "color": "#066578ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "number": {
-            "color": "#8f3e71ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "operator": {
-            "color": "#427b58ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "predictive": {
-            "color": "#7c9780ff",
-            "font_style": "italic",
-            "font_weight": null
-          },
-          "preproc": {
-            "color": "#282828ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "primary": {
-            "color": "#282828ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "property": {
-            "color": "#282828ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation": {
-            "color": "#3c3836ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.bracket": {
-            "color": "#665c54ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.delimiter": {
-            "color": "#413d3aff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.list_marker": {
-            "color": "#282828ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.markup": {
-            "color": "#066578ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.special": {
-            "color": "#413d3aff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "selector": {
-            "color": "#b57613ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "selector.pseudo": {
-            "color": "#0b6678ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string": {
-            "color": "#79740eff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.escape": {
-            "color": "#5d544eff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.regex": {
-            "color": "#af3a02ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.special": {
-            "color": "#8f3e71ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.special.symbol": {
-            "color": "#427b58ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "tag": {
-            "color": "#427b58ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "text.literal": {
-            "color": "#066578ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "title": {
-            "color": "#79740eff",
-            "font_style": null,
-            "font_weight": 700
-          },
-          "type": {
-            "color": "#b57613ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "variable": {
-            "color": "#282828ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "variable.special": {
-            "color": "#066578ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "variant": {
-            "color": "#0b6678ff",
-            "font_style": null,
-            "font_weight": null
-          }
-        }
-      }
-    }
-  ]
-}
diff --git a/assets/themes/one/LICENSE b/assets/themes/one/LICENSE
deleted file mode 100644
index f7637d33ea..0000000000
--- a/assets/themes/one/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2014 GitHub Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/assets/themes/one/one.json b/assets/themes/one/one.json
deleted file mode 100644
index c72c924717..0000000000
--- a/assets/themes/one/one.json
+++ /dev/null
@@ -1,813 +0,0 @@
-{
-  "$schema": "https://zed.dev/schema/themes/v0.2.0.json",
-  "name": "One",
-  "author": "Zed Industries",
-  "themes": [
-    {
-      "name": "One Dark",
-      "appearance": "dark",
-      "style": {
-        "border": "#464b57ff",
-        "border.variant": "#363c46ff",
-        "border.focused": "#47679eff",
-        "border.selected": "#293b5bff",
-        "border.transparent": "#00000000",
-        "border.disabled": "#414754ff",
-        "elevated_surface.background": "#2f343eff",
-        "surface.background": "#2f343eff",
-        "background": "#3b414dff",
-        "element.background": "#2e343eff",
-        "element.hover": "#363c46ff",
-        "element.active": "#454a56ff",
-        "element.selected": "#454a56ff",
-        "element.disabled": "#2e343eff",
-        "drop_target.background": "#83899480",
-        "ghost_element.background": "#00000000",
-        "ghost_element.hover": "#363c46ff",
-        "ghost_element.active": "#454a56ff",
-        "ghost_element.selected": "#454a56ff",
-        "ghost_element.disabled": "#2e343eff",
-        "text": "#dce0e5ff",
-        "text.muted": "#a9afbcff",
-        "text.placeholder": "#878a98ff",
-        "text.disabled": "#878a98ff",
-        "text.accent": "#74ade8ff",
-        "icon": "#dce0e5ff",
-        "icon.muted": "#a9afbcff",
-        "icon.disabled": "#878a98ff",
-        "icon.placeholder": "#a9afbcff",
-        "icon.accent": "#74ade8ff",
-        "status_bar.background": "#3b414dff",
-        "title_bar.background": "#3b414dff",
-        "title_bar.inactive_background": "#2e343eff",
-        "toolbar.background": "#282c33ff",
-        "tab_bar.background": "#2f343eff",
-        "tab.inactive_background": "#2f343eff",
-        "tab.active_background": "#282c33ff",
-        "search.match_background": "#74ade866",
-        "search.active_match_background": "#e8af7466",
-        "panel.background": "#2f343eff",
-        "panel.focused_border": null,
-        "pane.focused_border": null,
-        "scrollbar.thumb.background": "#c8ccd44c",
-        "scrollbar.thumb.hover_background": "#363c46ff",
-        "scrollbar.thumb.border": "#363c46ff",
-        "scrollbar.track.background": "#00000000",
-        "scrollbar.track.border": "#2e333cff",
-        "editor.foreground": "#acb2beff",
-        "editor.background": "#282c33ff",
-        "editor.gutter.background": "#282c33ff",
-        "editor.subheader.background": "#2f343eff",
-        "editor.active_line.background": "#2f343ebf",
-        "editor.highlighted_line.background": "#2f343eff",
-        "editor.line_number": "#4e5a5f",
-        "editor.active_line_number": "#d0d4da",
-        "editor.hover_line_number": "#acb0b4",
-        "editor.invisible": "#878a98ff",
-        "editor.wrap_guide": "#c8ccd40d",
-        "editor.active_wrap_guide": "#c8ccd41a",
-        "editor.document_highlight.read_background": "#74ade81a",
-        "editor.document_highlight.write_background": "#555a6366",
-        "terminal.background": "#282c33ff",
-        "terminal.foreground": "#dce0e5ff",
-        "terminal.bright_foreground": "#dce0e5ff",
-        "terminal.dim_foreground": "#282c33ff",
-        "terminal.ansi.black": "#282c33ff",
-        "terminal.ansi.bright_black": "#525561ff",
-        "terminal.ansi.dim_black": "#dce0e5ff",
-        "terminal.ansi.red": "#d07277ff",
-        "terminal.ansi.bright_red": "#673a3cff",
-        "terminal.ansi.dim_red": "#eab7b9ff",
-        "terminal.ansi.green": "#a1c181ff",
-        "terminal.ansi.bright_green": "#4d6140ff",
-        "terminal.ansi.dim_green": "#d1e0bfff",
-        "terminal.ansi.yellow": "#dec184ff",
-        "terminal.ansi.bright_yellow": "#e5c07bff",
-        "terminal.ansi.dim_yellow": "#f1dfc1ff",
-        "terminal.ansi.blue": "#74ade8ff",
-        "terminal.ansi.bright_blue": "#385378ff",
-        "terminal.ansi.dim_blue": "#bed5f4ff",
-        "terminal.ansi.magenta": "#b477cfff",
-        "terminal.ansi.bright_magenta": "#d6b4e4ff",
-        "terminal.ansi.dim_magenta": "#612a79ff",
-        "terminal.ansi.cyan": "#6eb4bfff",
-        "terminal.ansi.bright_cyan": "#3a565bff",
-        "terminal.ansi.dim_cyan": "#b9d9dfff",
-        "terminal.ansi.white": "#dce0e5ff",
-        "terminal.ansi.bright_white": "#fafafaff",
-        "terminal.ansi.dim_white": "#575d65ff",
-        "link_text.hover": "#74ade8ff",
-        "version_control.added": "#27a657ff",
-        "version_control.modified": "#d3b020ff",
-        "version_control.word_added": "#2EA04859",
-        "version_control.word_deleted": "#78081BCC",
-        "version_control.deleted": "#e06c76ff",
-        "version_control.conflict_marker.ours": "#a1c1811a",
-        "version_control.conflict_marker.theirs": "#74ade81a",
-        "conflict": "#dec184ff",
-        "conflict.background": "#dec1841a",
-        "conflict.border": "#5d4c2fff",
-        "created": "#a1c181ff",
-        "created.background": "#a1c1811a",
-        "created.border": "#38482fff",
-        "deleted": "#d07277ff",
-        "deleted.background": "#d072771a",
-        "deleted.border": "#4c2b2cff",
-        "error": "#d07277ff",
-        "error.background": "#d072771a",
-        "error.border": "#4c2b2cff",
-        "hidden": "#878a98ff",
-        "hidden.background": "#696b771a",
-        "hidden.border": "#414754ff",
-        "hint": "#788ca6ff",
-        "hint.background": "#5a6f891a",
-        "hint.border": "#293b5bff",
-        "ignored": "#878a98ff",
-        "ignored.background": "#696b771a",
-        "ignored.border": "#464b57ff",
-        "info": "#74ade8ff",
-        "info.background": "#74ade81a",
-        "info.border": "#293b5bff",
-        "modified": "#dec184ff",
-        "modified.background": "#dec1841a",
-        "modified.border": "#5d4c2fff",
-        "predictive": "#5a6a87ff",
-        "predictive.background": "#5a6a871a",
-        "predictive.border": "#38482fff",
-        "renamed": "#74ade8ff",
-        "renamed.background": "#74ade81a",
-        "renamed.border": "#293b5bff",
-        "success": "#a1c181ff",
-        "success.background": "#a1c1811a",
-        "success.border": "#38482fff",
-        "unreachable": "#a9afbcff",
-        "unreachable.background": "#8389941a",
-        "unreachable.border": "#464b57ff",
-        "warning": "#dec184ff",
-        "warning.background": "#dec1841a",
-        "warning.border": "#5d4c2fff",
-        "players": [
-          {
-            "cursor": "#74ade8ff",
-            "background": "#74ade8ff",
-            "selection": "#74ade83d"
-          },
-          {
-            "cursor": "#be5046ff",
-            "background": "#be5046ff",
-            "selection": "#be50463d"
-          },
-          {
-            "cursor": "#bf956aff",
-            "background": "#bf956aff",
-            "selection": "#bf956a3d"
-          },
-          {
-            "cursor": "#b477cfff",
-            "background": "#b477cfff",
-            "selection": "#b477cf3d"
-          },
-          {
-            "cursor": "#6eb4bfff",
-            "background": "#6eb4bfff",
-            "selection": "#6eb4bf3d"
-          },
-          {
-            "cursor": "#d07277ff",
-            "background": "#d07277ff",
-            "selection": "#d072773d"
-          },
-          {
-            "cursor": "#dec184ff",
-            "background": "#dec184ff",
-            "selection": "#dec1843d"
-          },
-          {
-            "cursor": "#a1c181ff",
-            "background": "#a1c181ff",
-            "selection": "#a1c1813d"
-          }
-        ],
-        "syntax": {
-          "attribute": {
-            "color": "#74ade8ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "boolean": {
-            "color": "#bf956aff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "comment": {
-            "color": "#5d636fff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "comment.doc": {
-            "color": "#878e98ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "constant": {
-            "color": "#dfc184ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "constructor": {
-            "color": "#73ade9ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "embedded": {
-            "color": "#dce0e5ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "emphasis": {
-            "color": "#74ade8ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "emphasis.strong": {
-            "color": "#bf956aff",
-            "font_style": null,
-            "font_weight": 700
-          },
-          "enum": {
-            "color": "#d07277ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "function": {
-            "color": "#73ade9ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "hint": {
-            "color": "#788ca6ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "keyword": {
-            "color": "#b477cfff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "label": {
-            "color": "#74ade8ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "link_text": {
-            "color": "#73ade9ff",
-            "font_style": "normal",
-            "font_weight": null
-          },
-          "link_uri": {
-            "color": "#6eb4bfff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "namespace": {
-            "color": "#dce0e5ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "number": {
-            "color": "#bf956aff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "operator": {
-            "color": "#6eb4bfff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "predictive": {
-            "color": "#5a6a87ff",
-            "font_style": "italic",
-            "font_weight": null
-          },
-          "preproc": {
-            "color": "#dce0e5ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "primary": {
-            "color": "#acb2beff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "property": {
-            "color": "#d07277ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation": {
-            "color": "#acb2beff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.bracket": {
-            "color": "#b2b9c6ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.delimiter": {
-            "color": "#b2b9c6ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.list_marker": {
-            "color": "#d07277ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.markup": {
-            "color": "#d07277ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.special": {
-            "color": "#b1574bff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "selector": {
-            "color": "#dfc184ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "selector.pseudo": {
-            "color": "#74ade8ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string": {
-            "color": "#a1c181ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.escape": {
-            "color": "#878e98ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.regex": {
-            "color": "#bf956aff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.special": {
-            "color": "#bf956aff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.special.symbol": {
-            "color": "#bf956aff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "tag": {
-            "color": "#74ade8ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "text.literal": {
-            "color": "#a1c181ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "title": {
-            "color": "#d07277ff",
-            "font_style": null,
-            "font_weight": 400
-          },
-          "type": {
-            "color": "#6eb4bfff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "variable": {
-            "color": "#acb2beff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "variable.special": {
-            "color": "#bf956aff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "variant": {
-            "color": "#73ade9ff",
-            "font_style": null,
-            "font_weight": null
-          }
-        }
-      }
-    },
-    {
-      "name": "One Light",
-      "appearance": "light",
-      "style": {
-        "border": "#c9c9caff",
-        "border.variant": "#dfdfe0ff",
-        "border.focused": "#7d82e8ff",
-        "border.selected": "#cbcdf6ff",
-        "border.transparent": "#00000000",
-        "border.disabled": "#d3d3d4ff",
-        "elevated_surface.background": "#ebebecff",
-        "surface.background": "#ebebecff",
-        "background": "#dcdcddff",
-        "element.background": "#ebebecff",
-        "element.hover": "#dfdfe0ff",
-        "element.active": "#cacacaff",
-        "element.selected": "#cacacaff",
-        "element.disabled": "#ebebecff",
-        "drop_target.background": "#7e808780",
-        "ghost_element.background": "#00000000",
-        "ghost_element.hover": "#dfdfe0ff",
-        "ghost_element.active": "#cacacaff",
-        "ghost_element.selected": "#cacacaff",
-        "ghost_element.disabled": "#ebebecff",
-        "text": "#242529ff",
-        "text.muted": "#58585aff",
-        "text.placeholder": "#7e8086ff",
-        "text.disabled": "#7e8086ff",
-        "text.accent": "#5c78e2ff",
-        "icon": "#242529ff",
-        "icon.muted": "#58585aff",
-        "icon.disabled": "#7e8086ff",
-        "icon.placeholder": "#58585aff",
-        "icon.accent": "#5c78e2ff",
-        "status_bar.background": "#dcdcddff",
-        "title_bar.background": "#dcdcddff",
-        "title_bar.inactive_background": "#ebebecff",
-        "toolbar.background": "#fafafaff",
-        "tab_bar.background": "#ebebecff",
-        "tab.inactive_background": "#ebebecff",
-        "tab.active_background": "#fafafaff",
-        "search.match_background": "#5c79e266",
-        "search.active_match_background": "#d0a92366",
-        "panel.background": "#ebebecff",
-        "panel.focused_border": null,
-        "pane.focused_border": null,
-        "scrollbar.thumb.background": "#383a414c",
-        "scrollbar.thumb.hover_background": "#dfdfe0ff",
-        "scrollbar.thumb.border": "#dfdfe0ff",
-        "scrollbar.track.background": "#00000000",
-        "scrollbar.track.border": "#eeeeeeff",
-        "editor.foreground": "#242529ff",
-        "editor.background": "#fafafaff",
-        "editor.gutter.background": "#fafafaff",
-        "editor.subheader.background": "#ebebecff",
-        "editor.active_line.background": "#ebebecbf",
-        "editor.highlighted_line.background": "#ebebecff",
-        "editor.line_number": "#b4b4bb",
-        "editor.active_line_number": "#44454b",
-        "editor.hover_line_number": "#61616b",
-        "editor.invisible": "#a3a3a4ff",
-        "editor.wrap_guide": "#383a410d",
-        "editor.active_wrap_guide": "#383a411a",
-        "editor.document_highlight.read_background": "#5c78e225",
-        "editor.document_highlight.write_background": "#a3a3a466",
-        "terminal.background": "#fafafaff",
-        "terminal.foreground": "#242529ff",
-        "terminal.bright_foreground": "#242529ff",
-        "terminal.dim_foreground": "#fafafaff",
-        "terminal.ansi.black": "#242529ff",
-        "terminal.ansi.bright_black": "#747579ff",
-        "terminal.ansi.dim_black": "#97979aff",
-        "terminal.ansi.red": "#d36151ff",
-        "terminal.ansi.bright_red": "#f0b0a4ff",
-        "terminal.ansi.dim_red": "#6f312aff",
-        "terminal.ansi.green": "#669f59ff",
-        "terminal.ansi.bright_green": "#b2cfa9ff",
-        "terminal.ansi.dim_green": "#354d2eff",
-        "terminal.ansi.yellow": "#dec184ff",
-        "terminal.ansi.bright_yellow": "#826221ff",
-        "terminal.ansi.dim_yellow": "#786441ff",
-        "terminal.ansi.blue": "#5c78e2ff",
-        "terminal.ansi.bright_blue": "#b5baf2ff",
-        "terminal.ansi.dim_blue": "#2d3d75ff",
-        "terminal.ansi.magenta": "#984ea5ff",
-        "terminal.ansi.bright_magenta": "#cea6d3ff",
-        "terminal.ansi.dim_magenta": "#4b2a50ff",
-        "terminal.ansi.cyan": "#3a82b7ff",
-        "terminal.ansi.bright_cyan": "#a3bedaff",
-        "terminal.ansi.dim_cyan": "#254058ff",
-        "terminal.ansi.white": "#fafafaff",
-        "terminal.ansi.bright_white": "#ffffffff",
-        "terminal.ansi.dim_white": "#aaaaaaff",
-        "link_text.hover": "#5c78e2ff",
-        "version_control.added": "#27a657ff",
-        "version_control.modified": "#d3b020ff",
-        "version_control.word_added": "#2EA04859",
-        "version_control.word_deleted": "#F85149CC",
-        "version_control.deleted": "#e06c76ff",
-        "conflict": "#a48819ff",
-        "conflict.background": "#faf2e6ff",
-        "conflict.border": "#f4e7d1ff",
-        "created": "#669f59ff",
-        "created.background": "#dfeadbff",
-        "created.border": "#c8dcc1ff",
-        "deleted": "#d36151ff",
-        "deleted.background": "#fbdfd9ff",
-        "deleted.border": "#f6c6bdff",
-        "error": "#d36151ff",
-        "error.background": "#fbdfd9ff",
-        "error.border": "#f6c6bdff",
-        "hidden": "#7e8086ff",
-        "hidden.background": "#dcdcddff",
-        "hidden.border": "#d3d3d4ff",
-        "hint": "#7274a7ff",
-        "hint.background": "#e2e2faff",
-        "hint.border": "#cbcdf6ff",
-        "ignored": "#7e8086ff",
-        "ignored.background": "#dcdcddff",
-        "ignored.border": "#c9c9caff",
-        "info": "#5c78e2ff",
-        "info.background": "#e2e2faff",
-        "info.border": "#cbcdf6ff",
-        "modified": "#a48819ff",
-        "modified.background": "#faf2e6ff",
-        "modified.border": "#f4e7d1ff",
-        "predictive": "#9b9ec6ff",
-        "predictive.background": "#dfeadbff",
-        "predictive.border": "#c8dcc1ff",
-        "renamed": "#5c78e2ff",
-        "renamed.background": "#e2e2faff",
-        "renamed.border": "#cbcdf6ff",
-        "success": "#669f59ff",
-        "success.background": "#dfeadbff",
-        "success.border": "#c8dcc1ff",
-        "unreachable": "#58585aff",
-        "unreachable.background": "#dcdcddff",
-        "unreachable.border": "#c9c9caff",
-        "warning": "#a48819ff",
-        "warning.background": "#faf2e6ff",
-        "warning.border": "#f4e7d1ff",
-        "players": [
-          {
-            "cursor": "#5c78e2ff",
-            "background": "#5c78e2ff",
-            "selection": "#5c78e23d"
-          },
-          {
-            "cursor": "#984ea5ff",
-            "background": "#984ea5ff",
-            "selection": "#984ea53d"
-          },
-          {
-            "cursor": "#ad6e26ff",
-            "background": "#ad6e26ff",
-            "selection": "#ad6e263d"
-          },
-          {
-            "cursor": "#a349abff",
-            "background": "#a349abff",
-            "selection": "#a349ab3d"
-          },
-          {
-            "cursor": "#3a82b7ff",
-            "background": "#3a82b7ff",
-            "selection": "#3a82b73d"
-          },
-          {
-            "cursor": "#d36151ff",
-            "background": "#d36151ff",
-            "selection": "#d361513d"
-          },
-          {
-            "cursor": "#a48819ff",
-            "background": "#dec184ff",
-            "selection": "#dec1843d"
-          },
-          {
-            "cursor": "#669f59ff",
-            "background": "#669f59ff",
-            "selection": "#669f593d"
-          }
-        ],
-        "syntax": {
-          "attribute": {
-            "color": "#5c78e2ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "boolean": {
-            "color": "#ad6e25ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "comment": {
-            "color": "#a2a3a7ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "comment.doc": {
-            "color": "#7c7e86ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "constant": {
-            "color": "#c18401ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "constructor": {
-            "color": "#5c78e2ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "embedded": {
-            "color": "#242529ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "emphasis": {
-            "color": "#5c78e2ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "emphasis.strong": {
-            "color": "#ad6e25ff",
-            "font_style": null,
-            "font_weight": 700
-          },
-          "enum": {
-            "color": "#d3604fff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "function": {
-            "color": "#5b79e3ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "hint": {
-            "color": "#7274a7ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "keyword": {
-            "color": "#a449abff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "label": {
-            "color": "#5c78e2ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "link_text": {
-            "color": "#5b79e3ff",
-            "font_style": "italic",
-            "font_weight": null
-          },
-          "link_uri": {
-            "color": "#3882b7ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "namespace": {
-            "color": "#242529ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "number": {
-            "color": "#ad6e25ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "operator": {
-            "color": "#3882b7ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "predictive": {
-            "color": "#9b9ec6ff",
-            "font_style": "italic",
-            "font_weight": null
-          },
-          "preproc": {
-            "color": "#242529ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "primary": {
-            "color": "#242529ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "property": {
-            "color": "#d3604fff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation": {
-            "color": "#242529ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.bracket": {
-            "color": "#4d4f52ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.delimiter": {
-            "color": "#4d4f52ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.list_marker": {
-            "color": "#d3604fff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.markup": {
-            "color": "#d3604fff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.special": {
-            "color": "#b92b46ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "selector": {
-            "color": "#669f59ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "selector.pseudo": {
-            "color": "#5c78e2ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string": {
-            "color": "#649f57ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.escape": {
-            "color": "#7c7e86ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.regex": {
-            "color": "#ad6e26ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.special": {
-            "color": "#ad6e26ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.special.symbol": {
-            "color": "#ad6e26ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "tag": {
-            "color": "#5c78e2ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "text.literal": {
-            "color": "#649f57ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "title": {
-            "color": "#d3604fff",
-            "font_style": null,
-            "font_weight": 400
-          },
-          "type": {
-            "color": "#3882b7ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "variable": {
-            "color": "#242529ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "variable.special": {
-            "color": "#ad6e25ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "variant": {
-            "color": "#5b79e3ff",
-            "font_style": null,
-            "font_weight": null
-          }
-        }
-      }
-    }
-  ]
-}
diff --git a/ci/Dockerfile.namespace b/ci/Dockerfile.namespace
deleted file mode 100644
index f370dae194..0000000000
--- a/ci/Dockerfile.namespace
+++ /dev/null
@@ -1,21 +0,0 @@
-ARG NAMESPACE_BASE_IMAGE_REF=""
-
-# Your image must build FROM NAMESPACE_BASE_IMAGE_REF
-FROM ${NAMESPACE_BASE_IMAGE_REF} AS base
-
-# Remove problematic git-lfs packagecloud source
-RUN sudo rm -f /etc/apt/sources.list.d/*git-lfs*.list
-# Install git and SSH for cloning private repositories
-RUN sudo apt-get update && \
-    sudo apt-get install -y git openssh-client
-
-# Clone the Zed repository
-RUN git clone https://github.com/zed-industries/zed.git ~/zed
-
-# Run the Linux installation script
-WORKDIR /home/runner/zed
-RUN ./script/linux
-
-# Clean up unnecessary files to reduce image size
-RUN sudo apt-get clean && sudo rm -rf \
-    /home/runner/zed
diff --git a/compose.yml b/compose.yml
deleted file mode 100644
index cee63e968b..0000000000
--- a/compose.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-services:
-  postgres:
-    image: docker.io/library/postgres:15
-    container_name: zed_postgres
-    ports:
-      - 5432:5432
-    environment:
-      POSTGRES_HOST_AUTH_METHOD: trust
-    volumes:
-      - postgres_data:/var/lib/postgresql/data
-      - ./docker-compose.sql:/docker-entrypoint-initdb.d/init.sql
-
-  blob_store:
-    image: quay.io/minio/minio
-    container_name: blob_store
-    command: server /data
-    ports:
-      - 9000:9000
-    environment:
-      MINIO_ROOT_USER: the-blob-store-access-key
-      MINIO_ROOT_PASSWORD: the-blob-store-secret-key
-    volumes:
-      - ./.blob_store:/data
-
-  livekit_server:
-    image: docker.io/livekit/livekit-server
-    container_name: livekit_server
-    entrypoint: /livekit-server --config /livekit.yaml
-    ports:
-      - 7880:7880
-      - 7881:7881
-      - 7882:7882/udp
-    volumes:
-      - ./livekit.yaml:/livekit.yaml
-
-  stripe-mock:
-    image: docker.io/stripe/stripe-mock:v0.178.0
-    ports:
-      - 12111:12111
-      - 12112:12112
-
-volumes:
-  postgres_data:
diff --git a/crates/acp_thread/Cargo.toml b/crates/acp_thread/Cargo.toml
deleted file mode 100644
index 8ef6f1a52c..0000000000
--- a/crates/acp_thread/Cargo.toml
+++ /dev/null
@@ -1,60 +0,0 @@
-[package]
-name = "acp_thread"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/acp_thread.rs"
-doctest = false
-
-[features]
-test-support = ["gpui/test-support", "project/test-support", "dep:parking_lot"]
-
-[dependencies]
-action_log.workspace = true
-agent-client-protocol.workspace = true
-agent_settings.workspace = true
-anyhow.workspace = true
-buffer_diff.workspace = true
-collections.workspace = true
-editor.workspace = true
-file_icons.workspace = true
-futures.workspace = true
-gpui.workspace = true
-itertools.workspace = true
-language.workspace = true
-language_model.workspace = true
-markdown.workspace = true
-parking_lot = { workspace = true, optional = true }
-portable-pty.workspace = true
-project.workspace = true
-prompt_store.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-smol.workspace = true
-task.workspace = true
-telemetry.workspace = true
-terminal.workspace = true
-ui.workspace = true
-url.workspace = true
-util.workspace = true
-uuid.workspace = true
-watch.workspace = true
-
-[dev-dependencies]
-env_logger.workspace = true
-gpui = { workspace = true, "features" = ["test-support"] }
-indoc.workspace = true
-parking_lot.workspace = true
-project = { workspace = true, "features" = ["test-support"] }
-rand.workspace = true
-tempfile.workspace = true
-util.workspace = true
-settings.workspace = true
-zlog.workspace = true
diff --git a/crates/acp_thread/LICENSE-GPL b/crates/acp_thread/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/acp_thread/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
deleted file mode 100644
index 53294a963d..0000000000
--- a/crates/acp_thread/src/acp_thread.rs
+++ /dev/null
@@ -1,4021 +0,0 @@
-mod connection;
-mod diff;
-mod mention;
-mod terminal;
-
-use agent_settings::AgentSettings;
-use collections::HashSet;
-pub use connection::*;
-pub use diff::*;
-use language::language_settings::FormatOnSave;
-pub use mention::*;
-use project::lsp_store::{FormatTrigger, LspFormatTarget};
-use serde::{Deserialize, Serialize};
-use settings::Settings as _;
-use task::{Shell, ShellBuilder};
-pub use terminal::*;
-
-use action_log::{ActionLog, ActionLogTelemetry};
-use agent_client_protocol::{self as acp};
-use anyhow::{Context as _, Result, anyhow};
-use editor::Bias;
-use futures::{FutureExt, channel::oneshot, future::BoxFuture};
-use gpui::{AppContext, AsyncApp, Context, Entity, EventEmitter, SharedString, Task, WeakEntity};
-use itertools::Itertools;
-use language::{Anchor, Buffer, BufferSnapshot, LanguageRegistry, Point, ToPoint, text_diff};
-use markdown::Markdown;
-use project::{AgentLocation, Project, git_store::GitStoreCheckpoint};
-use std::collections::HashMap;
-use std::error::Error;
-use std::fmt::{Formatter, Write};
-use std::ops::Range;
-use std::process::ExitStatus;
-use std::rc::Rc;
-use std::time::{Duration, Instant};
-use std::{fmt::Display, mem, path::PathBuf, sync::Arc};
-use ui::App;
-use util::{ResultExt, get_default_system_shell_preferring_bash, paths::PathStyle};
-use uuid::Uuid;
-
-#[derive(Debug)]
-pub struct UserMessage {
-    pub id: Option<UserMessageId>,
-    pub content: ContentBlock,
-    pub chunks: Vec<acp::ContentBlock>,
-    pub checkpoint: Option<Checkpoint>,
-}
-
-#[derive(Debug)]
-pub struct Checkpoint {
-    git_checkpoint: GitStoreCheckpoint,
-    pub show: bool,
-}
-
-impl UserMessage {
-    fn to_markdown(&self, cx: &App) -> String {
-        let mut markdown = String::new();
-        if self
-            .checkpoint
-            .as_ref()
-            .is_some_and(|checkpoint| checkpoint.show)
-        {
-            writeln!(markdown, "## User (checkpoint)").unwrap();
-        } else {
-            writeln!(markdown, "## User").unwrap();
-        }
-        writeln!(markdown).unwrap();
-        writeln!(markdown, "{}", self.content.to_markdown(cx)).unwrap();
-        writeln!(markdown).unwrap();
-        markdown
-    }
-}
-
-#[derive(Debug, PartialEq)]
-pub struct AssistantMessage {
-    pub chunks: Vec<AssistantMessageChunk>,
-}
-
-impl AssistantMessage {
-    pub fn to_markdown(&self, cx: &App) -> String {
-        format!(
-            "## Assistant\n\n{}\n\n",
-            self.chunks
-                .iter()
-                .map(|chunk| chunk.to_markdown(cx))
-                .join("\n\n")
-        )
-    }
-}
-
-#[derive(Debug, PartialEq)]
-pub enum AssistantMessageChunk {
-    Message { block: ContentBlock },
-    Thought { block: ContentBlock },
-}
-
-impl AssistantMessageChunk {
-    pub fn from_str(
-        chunk: &str,
-        language_registry: &Arc<LanguageRegistry>,
-        path_style: PathStyle,
-        cx: &mut App,
-    ) -> Self {
-        Self::Message {
-            block: ContentBlock::new(chunk.into(), language_registry, path_style, cx),
-        }
-    }
-
-    fn to_markdown(&self, cx: &App) -> String {
-        match self {
-            Self::Message { block } => block.to_markdown(cx).to_string(),
-            Self::Thought { block } => {
-                format!("<thinking>\n{}\n</thinking>", block.to_markdown(cx))
-            }
-        }
-    }
-}
-
-#[derive(Debug)]
-pub enum AgentThreadEntry {
-    UserMessage(UserMessage),
-    AssistantMessage(AssistantMessage),
-    ToolCall(ToolCall),
-}
-
-impl AgentThreadEntry {
-    pub fn to_markdown(&self, cx: &App) -> String {
-        match self {
-            Self::UserMessage(message) => message.to_markdown(cx),
-            Self::AssistantMessage(message) => message.to_markdown(cx),
-            Self::ToolCall(tool_call) => tool_call.to_markdown(cx),
-        }
-    }
-
-    pub fn user_message(&self) -> Option<&UserMessage> {
-        if let AgentThreadEntry::UserMessage(message) = self {
-            Some(message)
-        } else {
-            None
-        }
-    }
-
-    pub fn diffs(&self) -> impl Iterator<Item = &Entity<Diff>> {
-        if let AgentThreadEntry::ToolCall(call) = self {
-            itertools::Either::Left(call.diffs())
-        } else {
-            itertools::Either::Right(std::iter::empty())
-        }
-    }
-
-    pub fn terminals(&self) -> impl Iterator<Item = &Entity<Terminal>> {
-        if let AgentThreadEntry::ToolCall(call) = self {
-            itertools::Either::Left(call.terminals())
-        } else {
-            itertools::Either::Right(std::iter::empty())
-        }
-    }
-
-    pub fn location(&self, ix: usize) -> Option<(acp::ToolCallLocation, AgentLocation)> {
-        if let AgentThreadEntry::ToolCall(ToolCall {
-            locations,
-            resolved_locations,
-            ..
-        }) = self
-        {
-            Some((
-                locations.get(ix)?.clone(),
-                resolved_locations.get(ix)?.clone()?,
-            ))
-        } else {
-            None
-        }
-    }
-}
-
-#[derive(Debug)]
-pub struct ToolCall {
-    pub id: acp::ToolCallId,
-    pub label: Entity<Markdown>,
-    pub kind: acp::ToolKind,
-    pub content: Vec<ToolCallContent>,
-    pub status: ToolCallStatus,
-    pub locations: Vec<acp::ToolCallLocation>,
-    pub resolved_locations: Vec<Option<AgentLocation>>,
-    pub raw_input: Option<serde_json::Value>,
-    pub raw_output: Option<serde_json::Value>,
-}
-
-impl ToolCall {
-    fn from_acp(
-        tool_call: acp::ToolCall,
-        status: ToolCallStatus,
-        language_registry: Arc<LanguageRegistry>,
-        path_style: PathStyle,
-        terminals: &HashMap<acp::TerminalId, Entity<Terminal>>,
-        cx: &mut App,
-    ) -> Result<Self> {
-        let title = if let Some((first_line, _)) = tool_call.title.split_once("\n") {
-            first_line.to_owned() + "…"
-        } else {
-            tool_call.title
-        };
-        let mut content = Vec::with_capacity(tool_call.content.len());
-        for item in tool_call.content {
-            if let Some(item) = ToolCallContent::from_acp(
-                item,
-                language_registry.clone(),
-                path_style,
-                terminals,
-                cx,
-            )? {
-                content.push(item);
-            }
-        }
-
-        let result = Self {
-            id: tool_call.tool_call_id,
-            label: cx
-                .new(|cx| Markdown::new(title.into(), Some(language_registry.clone()), None, cx)),
-            kind: tool_call.kind,
-            content,
-            locations: tool_call.locations,
-            resolved_locations: Vec::default(),
-            status,
-            raw_input: tool_call.raw_input,
-            raw_output: tool_call.raw_output,
-        };
-        Ok(result)
-    }
-
-    fn update_fields(
-        &mut self,
-        fields: acp::ToolCallUpdateFields,
-        language_registry: Arc<LanguageRegistry>,
-        path_style: PathStyle,
-        terminals: &HashMap<acp::TerminalId, Entity<Terminal>>,
-        cx: &mut App,
-    ) -> Result<()> {
-        let acp::ToolCallUpdateFields {
-            kind,
-            status,
-            title,
-            content,
-            locations,
-            raw_input,
-            raw_output,
-            ..
-        } = fields;
-
-        if let Some(kind) = kind {
-            self.kind = kind;
-        }
-
-        if let Some(status) = status {
-            self.status = status.into();
-        }
-
-        if let Some(title) = title {
-            self.label.update(cx, |label, cx| {
-                if let Some((first_line, _)) = title.split_once("\n") {
-                    label.replace(first_line.to_owned() + "…", cx)
-                } else {
-                    label.replace(title, cx);
-                }
-            });
-        }
-
-        if let Some(content) = content {
-            let mut new_content_len = content.len();
-            let mut content = content.into_iter();
-
-            // Reuse existing content if we can
-            for (old, new) in self.content.iter_mut().zip(content.by_ref()) {
-                let valid_content =
-                    old.update_from_acp(new, language_registry.clone(), path_style, terminals, cx)?;
-                if !valid_content {
-                    new_content_len -= 1;
-                }
-            }
-            for new in content {
-                if let Some(new) = ToolCallContent::from_acp(
-                    new,
-                    language_registry.clone(),
-                    path_style,
-                    terminals,
-                    cx,
-                )? {
-                    self.content.push(new);
-                } else {
-                    new_content_len -= 1;
-                }
-            }
-            self.content.truncate(new_content_len);
-        }
-
-        if let Some(locations) = locations {
-            self.locations = locations;
-        }
-
-        if let Some(raw_input) = raw_input {
-            self.raw_input = Some(raw_input);
-        }
-
-        if let Some(raw_output) = raw_output {
-            if self.content.is_empty()
-                && let Some(markdown) = markdown_for_raw_output(&raw_output, &language_registry, cx)
-            {
-                self.content
-                    .push(ToolCallContent::ContentBlock(ContentBlock::Markdown {
-                        markdown,
-                    }));
-            }
-            self.raw_output = Some(raw_output);
-        }
-        Ok(())
-    }
-
-    pub fn diffs(&self) -> impl Iterator<Item = &Entity<Diff>> {
-        self.content.iter().filter_map(|content| match content {
-            ToolCallContent::Diff(diff) => Some(diff),
-            ToolCallContent::ContentBlock(_) => None,
-            ToolCallContent::Terminal(_) => None,
-        })
-    }
-
-    pub fn terminals(&self) -> impl Iterator<Item = &Entity<Terminal>> {
-        self.content.iter().filter_map(|content| match content {
-            ToolCallContent::Terminal(terminal) => Some(terminal),
-            ToolCallContent::ContentBlock(_) => None,
-            ToolCallContent::Diff(_) => None,
-        })
-    }
-
-    fn to_markdown(&self, cx: &App) -> String {
-        let mut markdown = format!(
-            "**Tool Call: {}**\nStatus: {}\n\n",
-            self.label.read(cx).source(),
-            self.status
-        );
-        for content in &self.content {
-            markdown.push_str(content.to_markdown(cx).as_str());
-            markdown.push_str("\n\n");
-        }
-        markdown
-    }
-
-    async fn resolve_location(
-        location: acp::ToolCallLocation,
-        project: WeakEntity<Project>,
-        cx: &mut AsyncApp,
-    ) -> Option<ResolvedLocation> {
-        let buffer = project
-            .update(cx, |project, cx| {
-                project
-                    .project_path_for_absolute_path(&location.path, cx)
-                    .map(|path| project.open_buffer(path, cx))
-            })
-            .ok()??;
-        let buffer = buffer.await.log_err()?;
-        let position = buffer
-            .update(cx, |buffer, _| {
-                let snapshot = buffer.snapshot();
-                if let Some(row) = location.line {
-                    let column = snapshot.indent_size_for_line(row).len;
-                    let point = snapshot.clip_point(Point::new(row, column), Bias::Left);
-                    snapshot.anchor_before(point)
-                } else {
-                    Anchor::min_for_buffer(snapshot.remote_id())
-                }
-            })
-            .ok()?;
-
-        Some(ResolvedLocation { buffer, position })
-    }
-
-    fn resolve_locations(
-        &self,
-        project: Entity<Project>,
-        cx: &mut App,
-    ) -> Task<Vec<Option<ResolvedLocation>>> {
-        let locations = self.locations.clone();
-        project.update(cx, |_, cx| {
-            cx.spawn(async move |project, cx| {
-                let mut new_locations = Vec::new();
-                for location in locations {
-                    new_locations.push(Self::resolve_location(location, project.clone(), cx).await);
-                }
-                new_locations
-            })
-        })
-    }
-}
-
-// Separate so we can hold a strong reference to the buffer
-// for saving on the thread
-#[derive(Clone, Debug, PartialEq, Eq)]
-struct ResolvedLocation {
-    buffer: Entity<Buffer>,
-    position: Anchor,
-}
-
-impl From<&ResolvedLocation> for AgentLocation {
-    fn from(value: &ResolvedLocation) -> Self {
-        Self {
-            buffer: value.buffer.downgrade(),
-            position: value.position,
-        }
-    }
-}
-
-#[derive(Debug)]
-pub enum ToolCallStatus {
-    /// The tool call hasn't started running yet, but we start showing it to
-    /// the user.
-    Pending,
-    /// The tool call is waiting for confirmation from the user.
-    WaitingForConfirmation {
-        options: Vec<acp::PermissionOption>,
-        respond_tx: oneshot::Sender<acp::PermissionOptionId>,
-    },
-    /// The tool call is currently running.
-    InProgress,
-    /// The tool call completed successfully.
-    Completed,
-    /// The tool call failed.
-    Failed,
-    /// The user rejected the tool call.
-    Rejected,
-    /// The user canceled generation so the tool call was canceled.
-    Canceled,
-}
-
-impl From<acp::ToolCallStatus> for ToolCallStatus {
-    fn from(status: acp::ToolCallStatus) -> Self {
-        match status {
-            acp::ToolCallStatus::Pending => Self::Pending,
-            acp::ToolCallStatus::InProgress => Self::InProgress,
-            acp::ToolCallStatus::Completed => Self::Completed,
-            acp::ToolCallStatus::Failed => Self::Failed,
-            _ => Self::Pending,
-        }
-    }
-}
-
-impl Display for ToolCallStatus {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        write!(
-            f,
-            "{}",
-            match self {
-                ToolCallStatus::Pending => "Pending",
-                ToolCallStatus::WaitingForConfirmation { .. } => "Waiting for confirmation",
-                ToolCallStatus::InProgress => "In Progress",
-                ToolCallStatus::Completed => "Completed",
-                ToolCallStatus::Failed => "Failed",
-                ToolCallStatus::Rejected => "Rejected",
-                ToolCallStatus::Canceled => "Canceled",
-            }
-        )
-    }
-}
-
-#[derive(Debug, PartialEq, Clone)]
-pub enum ContentBlock {
-    Empty,
-    Markdown { markdown: Entity<Markdown> },
-    ResourceLink { resource_link: acp::ResourceLink },
-}
-
-impl ContentBlock {
-    pub fn new(
-        block: acp::ContentBlock,
-        language_registry: &Arc<LanguageRegistry>,
-        path_style: PathStyle,
-        cx: &mut App,
-    ) -> Self {
-        let mut this = Self::Empty;
-        this.append(block, language_registry, path_style, cx);
-        this
-    }
-
-    pub fn new_combined(
-        blocks: impl IntoIterator<Item = acp::ContentBlock>,
-        language_registry: Arc<LanguageRegistry>,
-        path_style: PathStyle,
-        cx: &mut App,
-    ) -> Self {
-        let mut this = Self::Empty;
-        for block in blocks {
-            this.append(block, &language_registry, path_style, cx);
-        }
-        this
-    }
-
-    pub fn append(
-        &mut self,
-        block: acp::ContentBlock,
-        language_registry: &Arc<LanguageRegistry>,
-        path_style: PathStyle,
-        cx: &mut App,
-    ) {
-        if matches!(self, ContentBlock::Empty)
-            && let acp::ContentBlock::ResourceLink(resource_link) = block
-        {
-            *self = ContentBlock::ResourceLink { resource_link };
-            return;
-        }
-
-        let new_content = self.block_string_contents(block, path_style);
-
-        match self {
-            ContentBlock::Empty => {
-                *self = Self::create_markdown_block(new_content, language_registry, cx);
-            }
-            ContentBlock::Markdown { markdown } => {
-                markdown.update(cx, |markdown, cx| markdown.append(&new_content, cx));
-            }
-            ContentBlock::ResourceLink { resource_link } => {
-                let existing_content = Self::resource_link_md(&resource_link.uri, path_style);
-                let combined = format!("{}\n{}", existing_content, new_content);
-
-                *self = Self::create_markdown_block(combined, language_registry, cx);
-            }
-        }
-    }
-
-    fn create_markdown_block(
-        content: String,
-        language_registry: &Arc<LanguageRegistry>,
-        cx: &mut App,
-    ) -> ContentBlock {
-        ContentBlock::Markdown {
-            markdown: cx
-                .new(|cx| Markdown::new(content.into(), Some(language_registry.clone()), None, cx)),
-        }
-    }
-
-    fn block_string_contents(&self, block: acp::ContentBlock, path_style: PathStyle) -> String {
-        match block {
-            acp::ContentBlock::Text(text_content) => text_content.text,
-            acp::ContentBlock::ResourceLink(resource_link) => {
-                Self::resource_link_md(&resource_link.uri, path_style)
-            }
-            acp::ContentBlock::Resource(acp::EmbeddedResource {
-                resource:
-                    acp::EmbeddedResourceResource::TextResourceContents(acp::TextResourceContents {
-                        uri,
-                        ..
-                    }),
-                ..
-            }) => Self::resource_link_md(&uri, path_style),
-            acp::ContentBlock::Image(image) => Self::image_md(&image),
-            _ => String::new(),
-        }
-    }
-
-    fn resource_link_md(uri: &str, path_style: PathStyle) -> String {
-        if let Some(uri) = MentionUri::parse(uri, path_style).log_err() {
-            uri.as_link().to_string()
-        } else {
-            uri.to_string()
-        }
-    }
-
-    fn image_md(_image: &acp::ImageContent) -> String {
-        "`Image`".into()
-    }
-
-    pub fn to_markdown<'a>(&'a self, cx: &'a App) -> &'a str {
-        match self {
-            ContentBlock::Empty => "",
-            ContentBlock::Markdown { markdown } => markdown.read(cx).source(),
-            ContentBlock::ResourceLink { resource_link } => &resource_link.uri,
-        }
-    }
-
-    pub fn markdown(&self) -> Option<&Entity<Markdown>> {
-        match self {
-            ContentBlock::Empty => None,
-            ContentBlock::Markdown { markdown } => Some(markdown),
-            ContentBlock::ResourceLink { .. } => None,
-        }
-    }
-
-    pub fn resource_link(&self) -> Option<&acp::ResourceLink> {
-        match self {
-            ContentBlock::ResourceLink { resource_link } => Some(resource_link),
-            _ => None,
-        }
-    }
-}
-
-#[derive(Debug)]
-pub enum ToolCallContent {
-    ContentBlock(ContentBlock),
-    Diff(Entity<Diff>),
-    Terminal(Entity<Terminal>),
-}
-
-impl ToolCallContent {
-    pub fn from_acp(
-        content: acp::ToolCallContent,
-        language_registry: Arc<LanguageRegistry>,
-        path_style: PathStyle,
-        terminals: &HashMap<acp::TerminalId, Entity<Terminal>>,
-        cx: &mut App,
-    ) -> Result<Option<Self>> {
-        match content {
-            acp::ToolCallContent::Content(acp::Content { content, .. }) => {
-                Ok(Some(Self::ContentBlock(ContentBlock::new(
-                    content,
-                    &language_registry,
-                    path_style,
-                    cx,
-                ))))
-            }
-            acp::ToolCallContent::Diff(diff) => Ok(Some(Self::Diff(cx.new(|cx| {
-                Diff::finalized(
-                    diff.path.to_string_lossy().into_owned(),
-                    diff.old_text,
-                    diff.new_text,
-                    language_registry,
-                    cx,
-                )
-            })))),
-            acp::ToolCallContent::Terminal(acp::Terminal { terminal_id, .. }) => terminals
-                .get(&terminal_id)
-                .cloned()
-                .map(|terminal| Some(Self::Terminal(terminal)))
-                .ok_or_else(|| anyhow::anyhow!("Terminal with id `{}` not found", terminal_id)),
-            _ => Ok(None),
-        }
-    }
-
-    pub fn update_from_acp(
-        &mut self,
-        new: acp::ToolCallContent,
-        language_registry: Arc<LanguageRegistry>,
-        path_style: PathStyle,
-        terminals: &HashMap<acp::TerminalId, Entity<Terminal>>,
-        cx: &mut App,
-    ) -> Result<bool> {
-        let needs_update = match (&self, &new) {
-            (Self::Diff(old_diff), acp::ToolCallContent::Diff(new_diff)) => {
-                old_diff.read(cx).needs_update(
-                    new_diff.old_text.as_deref().unwrap_or(""),
-                    &new_diff.new_text,
-                    cx,
-                )
-            }
-            _ => true,
-        };
-
-        if let Some(update) = Self::from_acp(new, language_registry, path_style, terminals, cx)? {
-            if needs_update {
-                *self = update;
-            }
-            Ok(true)
-        } else {
-            Ok(false)
-        }
-    }
-
-    pub fn to_markdown(&self, cx: &App) -> String {
-        match self {
-            Self::ContentBlock(content) => content.to_markdown(cx).to_string(),
-            Self::Diff(diff) => diff.read(cx).to_markdown(cx),
-            Self::Terminal(terminal) => terminal.read(cx).to_markdown(cx),
-        }
-    }
-}
-
-#[derive(Debug, PartialEq)]
-pub enum ToolCallUpdate {
-    UpdateFields(acp::ToolCallUpdate),
-    UpdateDiff(ToolCallUpdateDiff),
-    UpdateTerminal(ToolCallUpdateTerminal),
-}
-
-impl ToolCallUpdate {
-    fn id(&self) -> &acp::ToolCallId {
-        match self {
-            Self::UpdateFields(update) => &update.tool_call_id,
-            Self::UpdateDiff(diff) => &diff.id,
-            Self::UpdateTerminal(terminal) => &terminal.id,
-        }
-    }
-}
-
-impl From<acp::ToolCallUpdate> for ToolCallUpdate {
-    fn from(update: acp::ToolCallUpdate) -> Self {
-        Self::UpdateFields(update)
-    }
-}
-
-impl From<ToolCallUpdateDiff> for ToolCallUpdate {
-    fn from(diff: ToolCallUpdateDiff) -> Self {
-        Self::UpdateDiff(diff)
-    }
-}
-
-#[derive(Debug, PartialEq)]
-pub struct ToolCallUpdateDiff {
-    pub id: acp::ToolCallId,
-    pub diff: Entity<Diff>,
-}
-
-impl From<ToolCallUpdateTerminal> for ToolCallUpdate {
-    fn from(terminal: ToolCallUpdateTerminal) -> Self {
-        Self::UpdateTerminal(terminal)
-    }
-}
-
-#[derive(Debug, PartialEq)]
-pub struct ToolCallUpdateTerminal {
-    pub id: acp::ToolCallId,
-    pub terminal: Entity<Terminal>,
-}
-
-#[derive(Debug, Default)]
-pub struct Plan {
-    pub entries: Vec<PlanEntry>,
-}
-
-#[derive(Debug)]
-pub struct PlanStats<'a> {
-    pub in_progress_entry: Option<&'a PlanEntry>,
-    pub pending: u32,
-    pub completed: u32,
-}
-
-impl Plan {
-    pub fn is_empty(&self) -> bool {
-        self.entries.is_empty()
-    }
-
-    pub fn stats(&self) -> PlanStats<'_> {
-        let mut stats = PlanStats {
-            in_progress_entry: None,
-            pending: 0,
-            completed: 0,
-        };
-
-        for entry in &self.entries {
-            match &entry.status {
-                acp::PlanEntryStatus::Pending => {
-                    stats.pending += 1;
-                }
-                acp::PlanEntryStatus::InProgress => {
-                    stats.in_progress_entry = stats.in_progress_entry.or(Some(entry));
-                }
-                acp::PlanEntryStatus::Completed => {
-                    stats.completed += 1;
-                }
-                _ => {}
-            }
-        }
-
-        stats
-    }
-}
-
-#[derive(Debug)]
-pub struct PlanEntry {
-    pub content: Entity<Markdown>,
-    pub priority: acp::PlanEntryPriority,
-    pub status: acp::PlanEntryStatus,
-}
-
-impl PlanEntry {
-    pub fn from_acp(entry: acp::PlanEntry, cx: &mut App) -> Self {
-        Self {
-            content: cx.new(|cx| Markdown::new(entry.content.into(), None, None, cx)),
-            priority: entry.priority,
-            status: entry.status,
-        }
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-pub struct TokenUsage {
-    pub max_tokens: u64,
-    pub used_tokens: u64,
-}
-
-impl TokenUsage {
-    pub fn ratio(&self) -> TokenUsageRatio {
-        #[cfg(debug_assertions)]
-        let warning_threshold: f32 = std::env::var("ZED_THREAD_WARNING_THRESHOLD")
-            .unwrap_or("0.8".to_string())
-            .parse()
-            .unwrap();
-        #[cfg(not(debug_assertions))]
-        let warning_threshold: f32 = 0.8;
-
-        // When the maximum is unknown because there is no selected model,
-        // avoid showing the token limit warning.
-        if self.max_tokens == 0 {
-            TokenUsageRatio::Normal
-        } else if self.used_tokens >= self.max_tokens {
-            TokenUsageRatio::Exceeded
-        } else if self.used_tokens as f32 / self.max_tokens as f32 >= warning_threshold {
-            TokenUsageRatio::Warning
-        } else {
-            TokenUsageRatio::Normal
-        }
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum TokenUsageRatio {
-    Normal,
-    Warning,
-    Exceeded,
-}
-
-#[derive(Debug, Clone)]
-pub struct RetryStatus {
-    pub last_error: SharedString,
-    pub attempt: usize,
-    pub max_attempts: usize,
-    pub started_at: Instant,
-    pub duration: Duration,
-}
-
-pub struct AcpThread {
-    title: SharedString,
-    entries: Vec<AgentThreadEntry>,
-    plan: Plan,
-    project: Entity<Project>,
-    action_log: Entity<ActionLog>,
-    shared_buffers: HashMap<Entity<Buffer>, BufferSnapshot>,
-    send_task: Option<Task<()>>,
-    connection: Rc<dyn AgentConnection>,
-    session_id: acp::SessionId,
-    token_usage: Option<TokenUsage>,
-    prompt_capabilities: acp::PromptCapabilities,
-    _observe_prompt_capabilities: Task<anyhow::Result<()>>,
-    terminals: HashMap<acp::TerminalId, Entity<Terminal>>,
-    pending_terminal_output: HashMap<acp::TerminalId, Vec<Vec<u8>>>,
-    pending_terminal_exit: HashMap<acp::TerminalId, acp::TerminalExitStatus>,
-}
-
-impl From<&AcpThread> for ActionLogTelemetry {
-    fn from(value: &AcpThread) -> Self {
-        Self {
-            agent_telemetry_id: value.connection().telemetry_id(),
-            session_id: value.session_id.0.clone(),
-        }
-    }
-}
-
-#[derive(Debug)]
-pub enum AcpThreadEvent {
-    NewEntry,
-    TitleUpdated,
-    TokenUsageUpdated,
-    EntryUpdated(usize),
-    EntriesRemoved(Range<usize>),
-    ToolAuthorizationRequired,
-    Retry(RetryStatus),
-    Stopped,
-    Error,
-    LoadError(LoadError),
-    PromptCapabilitiesUpdated,
-    Refusal,
-    AvailableCommandsUpdated(Vec<acp::AvailableCommand>),
-    ModeUpdated(acp::SessionModeId),
-}
-
-impl EventEmitter<AcpThreadEvent> for AcpThread {}
-
-#[derive(Debug, Clone)]
-pub enum TerminalProviderEvent {
-    Created {
-        terminal_id: acp::TerminalId,
-        label: String,
-        cwd: Option<PathBuf>,
-        output_byte_limit: Option<u64>,
-        terminal: Entity<::terminal::Terminal>,
-    },
-    Output {
-        terminal_id: acp::TerminalId,
-        data: Vec<u8>,
-    },
-    TitleChanged {
-        terminal_id: acp::TerminalId,
-        title: String,
-    },
-    Exit {
-        terminal_id: acp::TerminalId,
-        status: acp::TerminalExitStatus,
-    },
-}
-
-#[derive(Debug, Clone)]
-pub enum TerminalProviderCommand {
-    WriteInput {
-        terminal_id: acp::TerminalId,
-        bytes: Vec<u8>,
-    },
-    Resize {
-        terminal_id: acp::TerminalId,
-        cols: u16,
-        rows: u16,
-    },
-    Close {
-        terminal_id: acp::TerminalId,
-    },
-}
-
-impl AcpThread {
-    pub fn on_terminal_provider_event(
-        &mut self,
-        event: TerminalProviderEvent,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            TerminalProviderEvent::Created {
-                terminal_id,
-                label,
-                cwd,
-                output_byte_limit,
-                terminal,
-            } => {
-                let entity = self.register_terminal_created(
-                    terminal_id.clone(),
-                    label,
-                    cwd,
-                    output_byte_limit,
-                    terminal,
-                    cx,
-                );
-
-                if let Some(mut chunks) = self.pending_terminal_output.remove(&terminal_id) {
-                    for data in chunks.drain(..) {
-                        entity.update(cx, |term, cx| {
-                            term.inner().update(cx, |inner, cx| {
-                                inner.write_output(&data, cx);
-                            })
-                        });
-                    }
-                }
-
-                if let Some(_status) = self.pending_terminal_exit.remove(&terminal_id) {
-                    entity.update(cx, |_term, cx| {
-                        cx.notify();
-                    });
-                }
-
-                cx.notify();
-            }
-            TerminalProviderEvent::Output { terminal_id, data } => {
-                if let Some(entity) = self.terminals.get(&terminal_id) {
-                    entity.update(cx, |term, cx| {
-                        term.inner().update(cx, |inner, cx| {
-                            inner.write_output(&data, cx);
-                        })
-                    });
-                } else {
-                    self.pending_terminal_output
-                        .entry(terminal_id)
-                        .or_default()
-                        .push(data);
-                }
-            }
-            TerminalProviderEvent::TitleChanged { terminal_id, title } => {
-                if let Some(entity) = self.terminals.get(&terminal_id) {
-                    entity.update(cx, |term, cx| {
-                        term.inner().update(cx, |inner, cx| {
-                            inner.breadcrumb_text = title;
-                            cx.emit(::terminal::Event::BreadcrumbsChanged);
-                        })
-                    });
-                }
-            }
-            TerminalProviderEvent::Exit {
-                terminal_id,
-                status,
-            } => {
-                if let Some(entity) = self.terminals.get(&terminal_id) {
-                    entity.update(cx, |_term, cx| {
-                        cx.notify();
-                    });
-                } else {
-                    self.pending_terminal_exit.insert(terminal_id, status);
-                }
-            }
-        }
-    }
-}
-
-#[derive(PartialEq, Eq, Debug)]
-pub enum ThreadStatus {
-    Idle,
-    Generating,
-}
-
-#[derive(Debug, Clone)]
-pub enum LoadError {
-    Unsupported {
-        command: SharedString,
-        current_version: SharedString,
-        minimum_version: SharedString,
-    },
-    FailedToInstall(SharedString),
-    Exited {
-        status: ExitStatus,
-    },
-    Other(SharedString),
-}
-
-impl Display for LoadError {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        match self {
-            LoadError::Unsupported {
-                command: path,
-                current_version,
-                minimum_version,
-            } => {
-                write!(
-                    f,
-                    "version {current_version} from {path} is not supported (need at least {minimum_version})"
-                )
-            }
-            LoadError::FailedToInstall(msg) => write!(f, "Failed to install: {msg}"),
-            LoadError::Exited { status } => write!(f, "Server exited with status {status}"),
-            LoadError::Other(msg) => write!(f, "{msg}"),
-        }
-    }
-}
-
-impl Error for LoadError {}
-
-impl AcpThread {
-    pub fn new(
-        title: impl Into<SharedString>,
-        connection: Rc<dyn AgentConnection>,
-        project: Entity<Project>,
-        action_log: Entity<ActionLog>,
-        session_id: acp::SessionId,
-        mut prompt_capabilities_rx: watch::Receiver<acp::PromptCapabilities>,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let prompt_capabilities = prompt_capabilities_rx.borrow().clone();
-        let task = cx.spawn::<_, anyhow::Result<()>>(async move |this, cx| {
-            loop {
-                let caps = prompt_capabilities_rx.recv().await?;
-                this.update(cx, |this, cx| {
-                    this.prompt_capabilities = caps;
-                    cx.emit(AcpThreadEvent::PromptCapabilitiesUpdated);
-                })?;
-            }
-        });
-
-        Self {
-            action_log,
-            shared_buffers: Default::default(),
-            entries: Default::default(),
-            plan: Default::default(),
-            title: title.into(),
-            project,
-            send_task: None,
-            connection,
-            session_id,
-            token_usage: None,
-            prompt_capabilities,
-            _observe_prompt_capabilities: task,
-            terminals: HashMap::default(),
-            pending_terminal_output: HashMap::default(),
-            pending_terminal_exit: HashMap::default(),
-        }
-    }
-
-    pub fn prompt_capabilities(&self) -> acp::PromptCapabilities {
-        self.prompt_capabilities.clone()
-    }
-
-    pub fn connection(&self) -> &Rc<dyn AgentConnection> {
-        &self.connection
-    }
-
-    pub fn action_log(&self) -> &Entity<ActionLog> {
-        &self.action_log
-    }
-
-    pub fn project(&self) -> &Entity<Project> {
-        &self.project
-    }
-
-    pub fn title(&self) -> SharedString {
-        self.title.clone()
-    }
-
-    pub fn entries(&self) -> &[AgentThreadEntry] {
-        &self.entries
-    }
-
-    pub fn session_id(&self) -> &acp::SessionId {
-        &self.session_id
-    }
-
-    pub fn status(&self) -> ThreadStatus {
-        if self.send_task.is_some() {
-            ThreadStatus::Generating
-        } else {
-            ThreadStatus::Idle
-        }
-    }
-
-    pub fn token_usage(&self) -> Option<&TokenUsage> {
-        self.token_usage.as_ref()
-    }
-
-    pub fn has_pending_edit_tool_calls(&self) -> bool {
-        for entry in self.entries.iter().rev() {
-            match entry {
-                AgentThreadEntry::UserMessage(_) => return false,
-                AgentThreadEntry::ToolCall(
-                    call @ ToolCall {
-                        status: ToolCallStatus::InProgress | ToolCallStatus::Pending,
-                        ..
-                    },
-                ) if call.diffs().next().is_some() => {
-                    return true;
-                }
-                AgentThreadEntry::ToolCall(_) | AgentThreadEntry::AssistantMessage(_) => {}
-            }
-        }
-
-        false
-    }
-
-    pub fn used_tools_since_last_user_message(&self) -> bool {
-        for entry in self.entries.iter().rev() {
-            match entry {
-                AgentThreadEntry::UserMessage(..) => return false,
-                AgentThreadEntry::AssistantMessage(..) => continue,
-                AgentThreadEntry::ToolCall(..) => return true,
-            }
-        }
-
-        false
-    }
-
-    pub fn handle_session_update(
-        &mut self,
-        update: acp::SessionUpdate,
-        cx: &mut Context<Self>,
-    ) -> Result<(), acp::Error> {
-        match update {
-            acp::SessionUpdate::UserMessageChunk(acp::ContentChunk { content, .. }) => {
-                self.push_user_content_block(None, content, cx);
-            }
-            acp::SessionUpdate::AgentMessageChunk(acp::ContentChunk { content, .. }) => {
-                self.push_assistant_content_block(content, false, cx);
-            }
-            acp::SessionUpdate::AgentThoughtChunk(acp::ContentChunk { content, .. }) => {
-                self.push_assistant_content_block(content, true, cx);
-            }
-            acp::SessionUpdate::ToolCall(tool_call) => {
-                self.upsert_tool_call(tool_call, cx)?;
-            }
-            acp::SessionUpdate::ToolCallUpdate(tool_call_update) => {
-                self.update_tool_call(tool_call_update, cx)?;
-            }
-            acp::SessionUpdate::Plan(plan) => {
-                self.update_plan(plan, cx);
-            }
-            acp::SessionUpdate::AvailableCommandsUpdate(acp::AvailableCommandsUpdate {
-                available_commands,
-                ..
-            }) => cx.emit(AcpThreadEvent::AvailableCommandsUpdated(available_commands)),
-            acp::SessionUpdate::CurrentModeUpdate(acp::CurrentModeUpdate {
-                current_mode_id,
-                ..
-            }) => cx.emit(AcpThreadEvent::ModeUpdated(current_mode_id)),
-            _ => {}
-        }
-        Ok(())
-    }
-
-    pub fn push_user_content_block(
-        &mut self,
-        message_id: Option<UserMessageId>,
-        chunk: acp::ContentBlock,
-        cx: &mut Context<Self>,
-    ) {
-        let language_registry = self.project.read(cx).languages().clone();
-        let path_style = self.project.read(cx).path_style(cx);
-        let entries_len = self.entries.len();
-
-        if let Some(last_entry) = self.entries.last_mut()
-            && let AgentThreadEntry::UserMessage(UserMessage {
-                id,
-                content,
-                chunks,
-                ..
-            }) = last_entry
-        {
-            *id = message_id.or(id.take());
-            content.append(chunk.clone(), &language_registry, path_style, cx);
-            chunks.push(chunk);
-            let idx = entries_len - 1;
-            cx.emit(AcpThreadEvent::EntryUpdated(idx));
-        } else {
-            let content = ContentBlock::new(chunk.clone(), &language_registry, path_style, cx);
-            self.push_entry(
-                AgentThreadEntry::UserMessage(UserMessage {
-                    id: message_id,
-                    content,
-                    chunks: vec![chunk],
-                    checkpoint: None,
-                }),
-                cx,
-            );
-        }
-    }
-
-    pub fn push_assistant_content_block(
-        &mut self,
-        chunk: acp::ContentBlock,
-        is_thought: bool,
-        cx: &mut Context<Self>,
-    ) {
-        let language_registry = self.project.read(cx).languages().clone();
-        let path_style = self.project.read(cx).path_style(cx);
-        let entries_len = self.entries.len();
-        if let Some(last_entry) = self.entries.last_mut()
-            && let AgentThreadEntry::AssistantMessage(AssistantMessage { chunks }) = last_entry
-        {
-            let idx = entries_len - 1;
-            cx.emit(AcpThreadEvent::EntryUpdated(idx));
-            match (chunks.last_mut(), is_thought) {
-                (Some(AssistantMessageChunk::Message { block }), false)
-                | (Some(AssistantMessageChunk::Thought { block }), true) => {
-                    block.append(chunk, &language_registry, path_style, cx)
-                }
-                _ => {
-                    let block = ContentBlock::new(chunk, &language_registry, path_style, cx);
-                    if is_thought {
-                        chunks.push(AssistantMessageChunk::Thought { block })
-                    } else {
-                        chunks.push(AssistantMessageChunk::Message { block })
-                    }
-                }
-            }
-        } else {
-            let block = ContentBlock::new(chunk, &language_registry, path_style, cx);
-            let chunk = if is_thought {
-                AssistantMessageChunk::Thought { block }
-            } else {
-                AssistantMessageChunk::Message { block }
-            };
-
-            self.push_entry(
-                AgentThreadEntry::AssistantMessage(AssistantMessage {
-                    chunks: vec![chunk],
-                }),
-                cx,
-            );
-        }
-    }
-
-    fn push_entry(&mut self, entry: AgentThreadEntry, cx: &mut Context<Self>) {
-        self.entries.push(entry);
-        cx.emit(AcpThreadEvent::NewEntry);
-    }
-
-    pub fn can_set_title(&mut self, cx: &mut Context<Self>) -> bool {
-        self.connection.set_title(&self.session_id, cx).is_some()
-    }
-
-    pub fn set_title(&mut self, title: SharedString, cx: &mut Context<Self>) -> Task<Result<()>> {
-        if title != self.title {
-            self.title = title.clone();
-            cx.emit(AcpThreadEvent::TitleUpdated);
-            if let Some(set_title) = self.connection.set_title(&self.session_id, cx) {
-                return set_title.run(title, cx);
-            }
-        }
-        Task::ready(Ok(()))
-    }
-
-    pub fn update_token_usage(&mut self, usage: Option<TokenUsage>, cx: &mut Context<Self>) {
-        self.token_usage = usage;
-        cx.emit(AcpThreadEvent::TokenUsageUpdated);
-    }
-
-    pub fn update_retry_status(&mut self, status: RetryStatus, cx: &mut Context<Self>) {
-        cx.emit(AcpThreadEvent::Retry(status));
-    }
-
-    pub fn update_tool_call(
-        &mut self,
-        update: impl Into<ToolCallUpdate>,
-        cx: &mut Context<Self>,
-    ) -> Result<()> {
-        let update = update.into();
-        let languages = self.project.read(cx).languages().clone();
-        let path_style = self.project.read(cx).path_style(cx);
-
-        let ix = match self.index_for_tool_call(update.id()) {
-            Some(ix) => ix,
-            None => {
-                // Tool call not found - create a failed tool call entry
-                let failed_tool_call = ToolCall {
-                    id: update.id().clone(),
-                    label: cx.new(|cx| Markdown::new("Tool call not found".into(), None, None, cx)),
-                    kind: acp::ToolKind::Fetch,
-                    content: vec![ToolCallContent::ContentBlock(ContentBlock::new(
-                        "Tool call not found".into(),
-                        &languages,
-                        path_style,
-                        cx,
-                    ))],
-                    status: ToolCallStatus::Failed,
-                    locations: Vec::new(),
-                    resolved_locations: Vec::new(),
-                    raw_input: None,
-                    raw_output: None,
-                };
-                self.push_entry(AgentThreadEntry::ToolCall(failed_tool_call), cx);
-                return Ok(());
-            }
-        };
-        let AgentThreadEntry::ToolCall(call) = &mut self.entries[ix] else {
-            unreachable!()
-        };
-
-        match update {
-            ToolCallUpdate::UpdateFields(update) => {
-                let location_updated = update.fields.locations.is_some();
-                call.update_fields(update.fields, languages, path_style, &self.terminals, cx)?;
-                if location_updated {
-                    self.resolve_locations(update.tool_call_id, cx);
-                }
-            }
-            ToolCallUpdate::UpdateDiff(update) => {
-                call.content.clear();
-                call.content.push(ToolCallContent::Diff(update.diff));
-            }
-            ToolCallUpdate::UpdateTerminal(update) => {
-                call.content.clear();
-                call.content
-                    .push(ToolCallContent::Terminal(update.terminal));
-            }
-        }
-
-        cx.emit(AcpThreadEvent::EntryUpdated(ix));
-
-        Ok(())
-    }
-
-    /// Updates a tool call if id matches an existing entry, otherwise inserts a new one.
-    pub fn upsert_tool_call(
-        &mut self,
-        tool_call: acp::ToolCall,
-        cx: &mut Context<Self>,
-    ) -> Result<(), acp::Error> {
-        let status = tool_call.status.into();
-        self.upsert_tool_call_inner(tool_call.into(), status, cx)
-    }
-
-    /// Fails if id does not match an existing entry.
-    pub fn upsert_tool_call_inner(
-        &mut self,
-        update: acp::ToolCallUpdate,
-        status: ToolCallStatus,
-        cx: &mut Context<Self>,
-    ) -> Result<(), acp::Error> {
-        let language_registry = self.project.read(cx).languages().clone();
-        let path_style = self.project.read(cx).path_style(cx);
-        let id = update.tool_call_id.clone();
-
-        let agent_telemetry_id = self.connection().telemetry_id();
-        let session = self.session_id();
-        if let ToolCallStatus::Completed | ToolCallStatus::Failed = status {
-            let status = if matches!(status, ToolCallStatus::Completed) {
-                "completed"
-            } else {
-                "failed"
-            };
-            telemetry::event!(
-                "Agent Tool Call Completed",
-                agent_telemetry_id,
-                session,
-                status
-            );
-        }
-
-        if let Some(ix) = self.index_for_tool_call(&id) {
-            let AgentThreadEntry::ToolCall(call) = &mut self.entries[ix] else {
-                unreachable!()
-            };
-
-            call.update_fields(
-                update.fields,
-                language_registry,
-                path_style,
-                &self.terminals,
-                cx,
-            )?;
-            call.status = status;
-
-            cx.emit(AcpThreadEvent::EntryUpdated(ix));
-        } else {
-            let call = ToolCall::from_acp(
-                update.try_into()?,
-                status,
-                language_registry,
-                self.project.read(cx).path_style(cx),
-                &self.terminals,
-                cx,
-            )?;
-            self.push_entry(AgentThreadEntry::ToolCall(call), cx);
-        };
-
-        self.resolve_locations(id, cx);
-        Ok(())
-    }
-
-    fn index_for_tool_call(&self, id: &acp::ToolCallId) -> Option<usize> {
-        self.entries
-            .iter()
-            .enumerate()
-            .rev()
-            .find_map(|(index, entry)| {
-                if let AgentThreadEntry::ToolCall(tool_call) = entry
-                    && &tool_call.id == id
-                {
-                    Some(index)
-                } else {
-                    None
-                }
-            })
-    }
-
-    fn tool_call_mut(&mut self, id: &acp::ToolCallId) -> Option<(usize, &mut ToolCall)> {
-        // The tool call we are looking for is typically the last one, or very close to the end.
-        // At the moment, it doesn't seem like a hashmap would be a good fit for this use case.
-        self.entries
-            .iter_mut()
-            .enumerate()
-            .rev()
-            .find_map(|(index, tool_call)| {
-                if let AgentThreadEntry::ToolCall(tool_call) = tool_call
-                    && &tool_call.id == id
-                {
-                    Some((index, tool_call))
-                } else {
-                    None
-                }
-            })
-    }
-
-    pub fn tool_call(&mut self, id: &acp::ToolCallId) -> Option<(usize, &ToolCall)> {
-        self.entries
-            .iter()
-            .enumerate()
-            .rev()
-            .find_map(|(index, tool_call)| {
-                if let AgentThreadEntry::ToolCall(tool_call) = tool_call
-                    && &tool_call.id == id
-                {
-                    Some((index, tool_call))
-                } else {
-                    None
-                }
-            })
-    }
-
-    pub fn resolve_locations(&mut self, id: acp::ToolCallId, cx: &mut Context<Self>) {
-        let project = self.project.clone();
-        let Some((_, tool_call)) = self.tool_call_mut(&id) else {
-            return;
-        };
-        let task = tool_call.resolve_locations(project, cx);
-        cx.spawn(async move |this, cx| {
-            let resolved_locations = task.await;
-
-            this.update(cx, |this, cx| {
-                let project = this.project.clone();
-
-                for location in resolved_locations.iter().flatten() {
-                    this.shared_buffers
-                        .insert(location.buffer.clone(), location.buffer.read(cx).snapshot());
-                }
-                let Some((ix, tool_call)) = this.tool_call_mut(&id) else {
-                    return;
-                };
-
-                if let Some(Some(location)) = resolved_locations.last() {
-                    project.update(cx, |project, cx| {
-                        let should_ignore = if let Some(agent_location) = project
-                            .agent_location()
-                            .filter(|agent_location| agent_location.buffer == location.buffer)
-                        {
-                            let snapshot = location.buffer.read(cx).snapshot();
-                            let old_position = agent_location.position.to_point(&snapshot);
-                            let new_position = location.position.to_point(&snapshot);
-
-                            // ignore this so that when we get updates from the edit tool
-                            // the position doesn't reset to the startof line
-                            old_position.row == new_position.row
-                                && old_position.column > new_position.column
-                        } else {
-                            false
-                        };
-                        if !should_ignore {
-                            project.set_agent_location(Some(location.into()), cx);
-                        }
-                    });
-                }
-
-                let resolved_locations = resolved_locations
-                    .iter()
-                    .map(|l| l.as_ref().map(|l| AgentLocation::from(l)))
-                    .collect::<Vec<_>>();
-
-                if tool_call.resolved_locations != resolved_locations {
-                    tool_call.resolved_locations = resolved_locations;
-                    cx.emit(AcpThreadEvent::EntryUpdated(ix));
-                }
-            })
-        })
-        .detach();
-    }
-
-    pub fn request_tool_call_authorization(
-        &mut self,
-        tool_call: acp::ToolCallUpdate,
-        options: Vec<acp::PermissionOption>,
-        respect_always_allow_setting: bool,
-        cx: &mut Context<Self>,
-    ) -> Result<BoxFuture<'static, acp::RequestPermissionOutcome>> {
-        let (tx, rx) = oneshot::channel();
-
-        if respect_always_allow_setting && AgentSettings::get_global(cx).always_allow_tool_actions {
-            // Don't use AllowAlways, because then if you were to turn off always_allow_tool_actions,
-            // some tools would (incorrectly) continue to auto-accept.
-            if let Some(allow_once_option) = options.iter().find_map(|option| {
-                if matches!(option.kind, acp::PermissionOptionKind::AllowOnce) {
-                    Some(option.option_id.clone())
-                } else {
-                    None
-                }
-            }) {
-                self.upsert_tool_call_inner(tool_call, ToolCallStatus::Pending, cx)?;
-                return Ok(async {
-                    acp::RequestPermissionOutcome::Selected(acp::SelectedPermissionOutcome::new(
-                        allow_once_option,
-                    ))
-                }
-                .boxed());
-            }
-        }
-
-        let status = ToolCallStatus::WaitingForConfirmation {
-            options,
-            respond_tx: tx,
-        };
-
-        self.upsert_tool_call_inner(tool_call, status, cx)?;
-        cx.emit(AcpThreadEvent::ToolAuthorizationRequired);
-
-        let fut = async {
-            match rx.await {
-                Ok(option) => acp::RequestPermissionOutcome::Selected(
-                    acp::SelectedPermissionOutcome::new(option),
-                ),
-                Err(oneshot::Canceled) => acp::RequestPermissionOutcome::Cancelled,
-            }
-        }
-        .boxed();
-
-        Ok(fut)
-    }
-
-    pub fn authorize_tool_call(
-        &mut self,
-        id: acp::ToolCallId,
-        option_id: acp::PermissionOptionId,
-        option_kind: acp::PermissionOptionKind,
-        cx: &mut Context<Self>,
-    ) {
-        let Some((ix, call)) = self.tool_call_mut(&id) else {
-            return;
-        };
-
-        let new_status = match option_kind {
-            acp::PermissionOptionKind::RejectOnce | acp::PermissionOptionKind::RejectAlways => {
-                ToolCallStatus::Rejected
-            }
-            acp::PermissionOptionKind::AllowOnce | acp::PermissionOptionKind::AllowAlways => {
-                ToolCallStatus::InProgress
-            }
-            _ => ToolCallStatus::InProgress,
-        };
-
-        let curr_status = mem::replace(&mut call.status, new_status);
-
-        if let ToolCallStatus::WaitingForConfirmation { respond_tx, .. } = curr_status {
-            respond_tx.send(option_id).log_err();
-        } else if cfg!(debug_assertions) {
-            panic!("tried to authorize an already authorized tool call");
-        }
-
-        cx.emit(AcpThreadEvent::EntryUpdated(ix));
-    }
-
-    pub fn first_tool_awaiting_confirmation(&self) -> Option<&ToolCall> {
-        let mut first_tool_call = None;
-
-        for entry in self.entries.iter().rev() {
-            match &entry {
-                AgentThreadEntry::ToolCall(call) => {
-                    if let ToolCallStatus::WaitingForConfirmation { .. } = call.status {
-                        first_tool_call = Some(call);
-                    } else {
-                        continue;
-                    }
-                }
-                AgentThreadEntry::UserMessage(_) | AgentThreadEntry::AssistantMessage(_) => {
-                    // Reached the beginning of the turn.
-                    // If we had pending permission requests in the previous turn, they have been cancelled.
-                    break;
-                }
-            }
-        }
-
-        first_tool_call
-    }
-
-    pub fn plan(&self) -> &Plan {
-        &self.plan
-    }
-
-    pub fn update_plan(&mut self, request: acp::Plan, cx: &mut Context<Self>) {
-        let new_entries_len = request.entries.len();
-        let mut new_entries = request.entries.into_iter();
-
-        // Reuse existing markdown to prevent flickering
-        for (old, new) in self.plan.entries.iter_mut().zip(new_entries.by_ref()) {
-            let PlanEntry {
-                content,
-                priority,
-                status,
-            } = old;
-            content.update(cx, |old, cx| {
-                old.replace(new.content, cx);
-            });
-            *priority = new.priority;
-            *status = new.status;
-        }
-        for new in new_entries {
-            self.plan.entries.push(PlanEntry::from_acp(new, cx))
-        }
-        self.plan.entries.truncate(new_entries_len);
-
-        cx.notify();
-    }
-
-    fn clear_completed_plan_entries(&mut self, cx: &mut Context<Self>) {
-        self.plan
-            .entries
-            .retain(|entry| !matches!(entry.status, acp::PlanEntryStatus::Completed));
-        cx.notify();
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn send_raw(
-        &mut self,
-        message: &str,
-        cx: &mut Context<Self>,
-    ) -> BoxFuture<'static, Result<()>> {
-        self.send(vec![message.into()], cx)
-    }
-
-    pub fn send(
-        &mut self,
-        message: Vec<acp::ContentBlock>,
-        cx: &mut Context<Self>,
-    ) -> BoxFuture<'static, Result<()>> {
-        let block = ContentBlock::new_combined(
-            message.clone(),
-            self.project.read(cx).languages().clone(),
-            self.project.read(cx).path_style(cx),
-            cx,
-        );
-        let request = acp::PromptRequest::new(self.session_id.clone(), message.clone());
-        let git_store = self.project.read(cx).git_store().clone();
-
-        let message_id = if self.connection.truncate(&self.session_id, cx).is_some() {
-            Some(UserMessageId::new())
-        } else {
-            None
-        };
-
-        self.run_turn(cx, async move |this, cx| {
-            this.update(cx, |this, cx| {
-                this.push_entry(
-                    AgentThreadEntry::UserMessage(UserMessage {
-                        id: message_id.clone(),
-                        content: block,
-                        chunks: message,
-                        checkpoint: None,
-                    }),
-                    cx,
-                );
-            })
-            .ok();
-
-            let old_checkpoint = git_store
-                .update(cx, |git, cx| git.checkpoint(cx))?
-                .await
-                .context("failed to get old checkpoint")
-                .log_err();
-            this.update(cx, |this, cx| {
-                if let Some((_ix, message)) = this.last_user_message() {
-                    message.checkpoint = old_checkpoint.map(|git_checkpoint| Checkpoint {
-                        git_checkpoint,
-                        show: false,
-                    });
-                }
-                this.connection.prompt(message_id, request, cx)
-            })?
-            .await
-        })
-    }
-
-    pub fn can_resume(&self, cx: &App) -> bool {
-        self.connection.resume(&self.session_id, cx).is_some()
-    }
-
-    pub fn resume(&mut self, cx: &mut Context<Self>) -> BoxFuture<'static, Result<()>> {
-        self.run_turn(cx, async move |this, cx| {
-            this.update(cx, |this, cx| {
-                this.connection
-                    .resume(&this.session_id, cx)
-                    .map(|resume| resume.run(cx))
-            })?
-            .context("resuming a session is not supported")?
-            .await
-        })
-    }
-
-    fn run_turn(
-        &mut self,
-        cx: &mut Context<Self>,
-        f: impl 'static + AsyncFnOnce(WeakEntity<Self>, &mut AsyncApp) -> Result<acp::PromptResponse>,
-    ) -> BoxFuture<'static, Result<()>> {
-        self.clear_completed_plan_entries(cx);
-
-        let (tx, rx) = oneshot::channel();
-        let cancel_task = self.cancel(cx);
-
-        self.send_task = Some(cx.spawn(async move |this, cx| {
-            cancel_task.await;
-            tx.send(f(this, cx).await).ok();
-        }));
-
-        cx.spawn(async move |this, cx| {
-            let response = rx.await;
-
-            this.update(cx, |this, cx| this.update_last_checkpoint(cx))?
-                .await?;
-
-            this.update(cx, |this, cx| {
-                this.project
-                    .update(cx, |project, cx| project.set_agent_location(None, cx));
-                match response {
-                    Ok(Err(e)) => {
-                        this.send_task.take();
-                        cx.emit(AcpThreadEvent::Error);
-                        Err(e)
-                    }
-                    result => {
-                        let canceled = matches!(
-                            result,
-                            Ok(Ok(acp::PromptResponse {
-                                stop_reason: acp::StopReason::Cancelled,
-                                ..
-                            }))
-                        );
-
-                        // We only take the task if the current prompt wasn't canceled.
-                        //
-                        // This prompt may have been canceled because another one was sent
-                        // while it was still generating. In these cases, dropping `send_task`
-                        // would cause the next generation to be canceled.
-                        if !canceled {
-                            this.send_task.take();
-                        }
-
-                        // Handle refusal - distinguish between user prompt and tool call refusals
-                        if let Ok(Ok(acp::PromptResponse {
-                            stop_reason: acp::StopReason::Refusal,
-                            ..
-                        })) = result
-                        {
-                            if let Some((user_msg_ix, _)) = this.last_user_message() {
-                                // Check if there's a completed tool call with results after the last user message
-                                // This indicates the refusal is in response to tool output, not the user's prompt
-                                let has_completed_tool_call_after_user_msg =
-                                    this.entries.iter().skip(user_msg_ix + 1).any(|entry| {
-                                        if let AgentThreadEntry::ToolCall(tool_call) = entry {
-                                            // Check if the tool call has completed and has output
-                                            matches!(tool_call.status, ToolCallStatus::Completed)
-                                                && tool_call.raw_output.is_some()
-                                        } else {
-                                            false
-                                        }
-                                    });
-
-                                if has_completed_tool_call_after_user_msg {
-                                    // Refusal is due to tool output - don't truncate, just notify
-                                    // The model refused based on what the tool returned
-                                    cx.emit(AcpThreadEvent::Refusal);
-                                } else {
-                                    // User prompt was refused - truncate back to before the user message
-                                    let range = user_msg_ix..this.entries.len();
-                                    if range.start < range.end {
-                                        this.entries.truncate(user_msg_ix);
-                                        cx.emit(AcpThreadEvent::EntriesRemoved(range));
-                                    }
-                                    cx.emit(AcpThreadEvent::Refusal);
-                                }
-                            } else {
-                                // No user message found, treat as general refusal
-                                cx.emit(AcpThreadEvent::Refusal);
-                            }
-                        }
-
-                        cx.emit(AcpThreadEvent::Stopped);
-                        Ok(())
-                    }
-                }
-            })?
-        })
-        .boxed()
-    }
-
-    pub fn cancel(&mut self, cx: &mut Context<Self>) -> Task<()> {
-        let Some(send_task) = self.send_task.take() else {
-            return Task::ready(());
-        };
-
-        for entry in self.entries.iter_mut() {
-            if let AgentThreadEntry::ToolCall(call) = entry {
-                let cancel = matches!(
-                    call.status,
-                    ToolCallStatus::Pending
-                        | ToolCallStatus::WaitingForConfirmation { .. }
-                        | ToolCallStatus::InProgress
-                );
-
-                if cancel {
-                    call.status = ToolCallStatus::Canceled;
-                }
-            }
-        }
-
-        self.connection.cancel(&self.session_id, cx);
-
-        // Wait for the send task to complete
-        cx.foreground_executor().spawn(send_task)
-    }
-
-    /// Restores the git working tree to the state at the given checkpoint (if one exists)
-    pub fn restore_checkpoint(
-        &mut self,
-        id: UserMessageId,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let Some((_, message)) = self.user_message_mut(&id) else {
-            return Task::ready(Err(anyhow!("message not found")));
-        };
-
-        let checkpoint = message
-            .checkpoint
-            .as_ref()
-            .map(|c| c.git_checkpoint.clone());
-
-        // Cancel any in-progress generation before restoring
-        let cancel_task = self.cancel(cx);
-        let rewind = self.rewind(id.clone(), cx);
-        let git_store = self.project.read(cx).git_store().clone();
-
-        cx.spawn(async move |_, cx| {
-            cancel_task.await;
-            rewind.await?;
-            if let Some(checkpoint) = checkpoint {
-                git_store
-                    .update(cx, |git, cx| git.restore_checkpoint(checkpoint, cx))?
-                    .await?;
-            }
-
-            Ok(())
-        })
-    }
-
-    /// Rewinds this thread to before the entry at `index`, removing it and all
-    /// subsequent entries while rejecting any action_log changes made from that point.
-    /// Unlike `restore_checkpoint`, this method does not restore from git.
-    pub fn rewind(&mut self, id: UserMessageId, cx: &mut Context<Self>) -> Task<Result<()>> {
-        let Some(truncate) = self.connection.truncate(&self.session_id, cx) else {
-            return Task::ready(Err(anyhow!("not supported")));
-        };
-
-        let telemetry = ActionLogTelemetry::from(&*self);
-        cx.spawn(async move |this, cx| {
-            cx.update(|cx| truncate.run(id.clone(), cx))?.await?;
-            this.update(cx, |this, cx| {
-                if let Some((ix, _)) = this.user_message_mut(&id) {
-                    // Collect all terminals from entries that will be removed
-                    let terminals_to_remove: Vec<acp::TerminalId> = this.entries[ix..]
-                        .iter()
-                        .flat_map(|entry| entry.terminals())
-                        .filter_map(|terminal| terminal.read(cx).id().clone().into())
-                        .collect();
-
-                    let range = ix..this.entries.len();
-                    this.entries.truncate(ix);
-                    cx.emit(AcpThreadEvent::EntriesRemoved(range));
-
-                    // Kill and remove the terminals
-                    for terminal_id in terminals_to_remove {
-                        if let Some(terminal) = this.terminals.remove(&terminal_id) {
-                            terminal.update(cx, |terminal, cx| {
-                                terminal.kill(cx);
-                            });
-                        }
-                    }
-                }
-                this.action_log().update(cx, |action_log, cx| {
-                    action_log.reject_all_edits(Some(telemetry), cx)
-                })
-            })?
-            .await;
-            Ok(())
-        })
-    }
-
-    fn update_last_checkpoint(&mut self, cx: &mut Context<Self>) -> Task<Result<()>> {
-        let git_store = self.project.read(cx).git_store().clone();
-
-        let old_checkpoint = if let Some((_, message)) = self.last_user_message() {
-            if let Some(checkpoint) = message.checkpoint.as_ref() {
-                checkpoint.git_checkpoint.clone()
-            } else {
-                return Task::ready(Ok(()));
-            }
-        } else {
-            return Task::ready(Ok(()));
-        };
-
-        let new_checkpoint = git_store.update(cx, |git, cx| git.checkpoint(cx));
-        cx.spawn(async move |this, cx| {
-            let new_checkpoint = new_checkpoint
-                .await
-                .context("failed to get new checkpoint")
-                .log_err();
-            if let Some(new_checkpoint) = new_checkpoint {
-                let equal = git_store
-                    .update(cx, |git, cx| {
-                        git.compare_checkpoints(old_checkpoint.clone(), new_checkpoint, cx)
-                    })?
-                    .await
-                    .unwrap_or(true);
-                this.update(cx, |this, cx| {
-                    let (ix, message) = this.last_user_message().context("no user message")?;
-                    let checkpoint = message.checkpoint.as_mut().context("no checkpoint")?;
-                    checkpoint.show = !equal;
-                    cx.emit(AcpThreadEvent::EntryUpdated(ix));
-                    anyhow::Ok(())
-                })??;
-            }
-
-            Ok(())
-        })
-    }
-
-    fn last_user_message(&mut self) -> Option<(usize, &mut UserMessage)> {
-        self.entries
-            .iter_mut()
-            .enumerate()
-            .rev()
-            .find_map(|(ix, entry)| {
-                if let AgentThreadEntry::UserMessage(message) = entry {
-                    Some((ix, message))
-                } else {
-                    None
-                }
-            })
-    }
-
-    fn user_message_mut(&mut self, id: &UserMessageId) -> Option<(usize, &mut UserMessage)> {
-        self.entries.iter_mut().enumerate().find_map(|(ix, entry)| {
-            if let AgentThreadEntry::UserMessage(message) = entry {
-                if message.id.as_ref() == Some(id) {
-                    Some((ix, message))
-                } else {
-                    None
-                }
-            } else {
-                None
-            }
-        })
-    }
-
-    pub fn read_text_file(
-        &self,
-        path: PathBuf,
-        line: Option<u32>,
-        limit: Option<u32>,
-        reuse_shared_snapshot: bool,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<String, acp::Error>> {
-        // Args are 1-based, move to 0-based
-        let line = line.unwrap_or_default().saturating_sub(1);
-        let limit = limit.unwrap_or(u32::MAX);
-        let project = self.project.clone();
-        let action_log = self.action_log.clone();
-        cx.spawn(async move |this, cx| {
-            let load = project
-                .update(cx, |project, cx| {
-                    let path = project
-                        .project_path_for_absolute_path(&path, cx)
-                        .ok_or_else(|| {
-                            acp::Error::resource_not_found(Some(path.display().to_string()))
-                        })?;
-                    Ok(project.open_buffer(path, cx))
-                })
-                .map_err(|e| acp::Error::internal_error().data(e.to_string()))
-                .flatten()?;
-
-            let buffer = load.await?;
-
-            let snapshot = if reuse_shared_snapshot {
-                this.read_with(cx, |this, _| {
-                    this.shared_buffers.get(&buffer.clone()).cloned()
-                })
-                .log_err()
-                .flatten()
-            } else {
-                None
-            };
-
-            let snapshot = if let Some(snapshot) = snapshot {
-                snapshot
-            } else {
-                action_log.update(cx, |action_log, cx| {
-                    action_log.buffer_read(buffer.clone(), cx);
-                })?;
-
-                let snapshot = buffer.update(cx, |buffer, _| buffer.snapshot())?;
-                this.update(cx, |this, _| {
-                    this.shared_buffers.insert(buffer.clone(), snapshot.clone());
-                })?;
-                snapshot
-            };
-
-            let max_point = snapshot.max_point();
-            let start_position = Point::new(line, 0);
-
-            if start_position > max_point {
-                return Err(acp::Error::invalid_params().data(format!(
-                    "Attempting to read beyond the end of the file, line {}:{}",
-                    max_point.row + 1,
-                    max_point.column
-                )));
-            }
-
-            let start = snapshot.anchor_before(start_position);
-            let end = snapshot.anchor_before(Point::new(line.saturating_add(limit), 0));
-
-            project.update(cx, |project, cx| {
-                project.set_agent_location(
-                    Some(AgentLocation {
-                        buffer: buffer.downgrade(),
-                        position: start,
-                    }),
-                    cx,
-                );
-            })?;
-
-            Ok(snapshot.text_for_range(start..end).collect::<String>())
-        })
-    }
-
-    pub fn write_text_file(
-        &self,
-        path: PathBuf,
-        content: String,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let project = self.project.clone();
-        let action_log = self.action_log.clone();
-        cx.spawn(async move |this, cx| {
-            let load = project.update(cx, |project, cx| {
-                let path = project
-                    .project_path_for_absolute_path(&path, cx)
-                    .context("invalid path")?;
-                anyhow::Ok(project.open_buffer(path, cx))
-            });
-            let buffer = load??.await?;
-            let snapshot = this.update(cx, |this, cx| {
-                this.shared_buffers
-                    .get(&buffer)
-                    .cloned()
-                    .unwrap_or_else(|| buffer.read(cx).snapshot())
-            })?;
-            let edits = cx
-                .background_executor()
-                .spawn(async move {
-                    let old_text = snapshot.text();
-                    text_diff(old_text.as_str(), &content)
-                        .into_iter()
-                        .map(|(range, replacement)| {
-                            (
-                                snapshot.anchor_after(range.start)
-                                    ..snapshot.anchor_before(range.end),
-                                replacement,
-                            )
-                        })
-                        .collect::<Vec<_>>()
-                })
-                .await;
-
-            project.update(cx, |project, cx| {
-                project.set_agent_location(
-                    Some(AgentLocation {
-                        buffer: buffer.downgrade(),
-                        position: edits
-                            .last()
-                            .map(|(range, _)| range.end)
-                            .unwrap_or(Anchor::min_for_buffer(buffer.read(cx).remote_id())),
-                    }),
-                    cx,
-                );
-            })?;
-
-            let format_on_save = cx.update(|cx| {
-                action_log.update(cx, |action_log, cx| {
-                    action_log.buffer_read(buffer.clone(), cx);
-                });
-
-                let format_on_save = buffer.update(cx, |buffer, cx| {
-                    buffer.edit(edits, None, cx);
-
-                    let settings = language::language_settings::language_settings(
-                        buffer.language().map(|l| l.name()),
-                        buffer.file(),
-                        cx,
-                    );
-
-                    settings.format_on_save != FormatOnSave::Off
-                });
-                action_log.update(cx, |action_log, cx| {
-                    action_log.buffer_edited(buffer.clone(), cx);
-                });
-                format_on_save
-            })?;
-
-            if format_on_save {
-                let format_task = project.update(cx, |project, cx| {
-                    project.format(
-                        HashSet::from_iter([buffer.clone()]),
-                        LspFormatTarget::Buffers,
-                        false,
-                        FormatTrigger::Save,
-                        cx,
-                    )
-                })?;
-                format_task.await.log_err();
-
-                action_log.update(cx, |action_log, cx| {
-                    action_log.buffer_edited(buffer.clone(), cx);
-                })?;
-            }
-
-            project
-                .update(cx, |project, cx| project.save_buffer(buffer, cx))?
-                .await
-        })
-    }
-
-    pub fn create_terminal(
-        &self,
-        command: String,
-        args: Vec<String>,
-        extra_env: Vec<acp::EnvVariable>,
-        cwd: Option<PathBuf>,
-        output_byte_limit: Option<u64>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Entity<Terminal>>> {
-        let env = match &cwd {
-            Some(dir) => self.project.update(cx, |project, cx| {
-                project.environment().update(cx, |env, cx| {
-                    env.directory_environment(dir.as_path().into(), cx)
-                })
-            }),
-            None => Task::ready(None).shared(),
-        };
-        let env = cx.spawn(async move |_, _| {
-            let mut env = env.await.unwrap_or_default();
-            // Disables paging for `git` and hopefully other commands
-            env.insert("PAGER".into(), "".into());
-            for var in extra_env {
-                env.insert(var.name, var.value);
-            }
-            env
-        });
-
-        let project = self.project.clone();
-        let language_registry = project.read(cx).languages().clone();
-        let is_windows = project.read(cx).path_style(cx).is_windows();
-
-        let terminal_id = acp::TerminalId::new(Uuid::new_v4().to_string());
-        let terminal_task = cx.spawn({
-            let terminal_id = terminal_id.clone();
-            async move |_this, cx| {
-                let env = env.await;
-                let shell = project
-                    .update(cx, |project, cx| {
-                        project
-                            .remote_client()
-                            .and_then(|r| r.read(cx).default_system_shell())
-                    })?
-                    .unwrap_or_else(|| get_default_system_shell_preferring_bash());
-                let (task_command, task_args) =
-                    ShellBuilder::new(&Shell::Program(shell), is_windows)
-                        .redirect_stdin_to_dev_null()
-                        .build(Some(command.clone()), &args);
-                let terminal = project
-                    .update(cx, |project, cx| {
-                        project.create_terminal_task(
-                            task::SpawnInTerminal {
-                                command: Some(task_command),
-                                args: task_args,
-                                cwd: cwd.clone(),
-                                env,
-                                ..Default::default()
-                            },
-                            cx,
-                        )
-                    })?
-                    .await?;
-
-                cx.new(|cx| {
-                    Terminal::new(
-                        terminal_id,
-                        &format!("{} {}", command, args.join(" ")),
-                        cwd,
-                        output_byte_limit.map(|l| l as usize),
-                        terminal,
-                        language_registry,
-                        cx,
-                    )
-                })
-            }
-        });
-
-        cx.spawn(async move |this, cx| {
-            let terminal = terminal_task.await?;
-            this.update(cx, |this, _cx| {
-                this.terminals.insert(terminal_id, terminal.clone());
-                terminal
-            })
-        })
-    }
-
-    pub fn kill_terminal(
-        &mut self,
-        terminal_id: acp::TerminalId,
-        cx: &mut Context<Self>,
-    ) -> Result<()> {
-        self.terminals
-            .get(&terminal_id)
-            .context("Terminal not found")?
-            .update(cx, |terminal, cx| {
-                terminal.kill(cx);
-            });
-
-        Ok(())
-    }
-
-    pub fn release_terminal(
-        &mut self,
-        terminal_id: acp::TerminalId,
-        cx: &mut Context<Self>,
-    ) -> Result<()> {
-        self.terminals
-            .remove(&terminal_id)
-            .context("Terminal not found")?
-            .update(cx, |terminal, cx| {
-                terminal.kill(cx);
-            });
-
-        Ok(())
-    }
-
-    pub fn terminal(&self, terminal_id: acp::TerminalId) -> Result<Entity<Terminal>> {
-        self.terminals
-            .get(&terminal_id)
-            .context("Terminal not found")
-            .cloned()
-    }
-
-    pub fn to_markdown(&self, cx: &App) -> String {
-        self.entries.iter().map(|e| e.to_markdown(cx)).collect()
-    }
-
-    pub fn emit_load_error(&mut self, error: LoadError, cx: &mut Context<Self>) {
-        cx.emit(AcpThreadEvent::LoadError(error));
-    }
-
-    pub fn register_terminal_created(
-        &mut self,
-        terminal_id: acp::TerminalId,
-        command_label: String,
-        working_dir: Option<PathBuf>,
-        output_byte_limit: Option<u64>,
-        terminal: Entity<::terminal::Terminal>,
-        cx: &mut Context<Self>,
-    ) -> Entity<Terminal> {
-        let language_registry = self.project.read(cx).languages().clone();
-
-        let entity = cx.new(|cx| {
-            Terminal::new(
-                terminal_id.clone(),
-                &command_label,
-                working_dir.clone(),
-                output_byte_limit.map(|l| l as usize),
-                terminal,
-                language_registry,
-                cx,
-            )
-        });
-        self.terminals.insert(terminal_id.clone(), entity.clone());
-        entity
-    }
-}
-
-fn markdown_for_raw_output(
-    raw_output: &serde_json::Value,
-    language_registry: &Arc<LanguageRegistry>,
-    cx: &mut App,
-) -> Option<Entity<Markdown>> {
-    match raw_output {
-        serde_json::Value::Null => None,
-        serde_json::Value::Bool(value) => Some(cx.new(|cx| {
-            Markdown::new(
-                value.to_string().into(),
-                Some(language_registry.clone()),
-                None,
-                cx,
-            )
-        })),
-        serde_json::Value::Number(value) => Some(cx.new(|cx| {
-            Markdown::new(
-                value.to_string().into(),
-                Some(language_registry.clone()),
-                None,
-                cx,
-            )
-        })),
-        serde_json::Value::String(value) => Some(cx.new(|cx| {
-            Markdown::new(
-                value.clone().into(),
-                Some(language_registry.clone()),
-                None,
-                cx,
-            )
-        })),
-        value => Some(cx.new(|cx| {
-            Markdown::new(
-                format!("```json\n{}\n```", value).into(),
-                Some(language_registry.clone()),
-                None,
-                cx,
-            )
-        })),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use anyhow::anyhow;
-    use futures::{channel::mpsc, future::LocalBoxFuture, select};
-    use gpui::{App, AsyncApp, TestAppContext, WeakEntity};
-    use indoc::indoc;
-    use project::{FakeFs, Fs};
-    use rand::{distr, prelude::*};
-    use serde_json::json;
-    use settings::SettingsStore;
-    use smol::stream::StreamExt as _;
-    use std::{
-        any::Any,
-        cell::RefCell,
-        path::Path,
-        rc::Rc,
-        sync::atomic::{AtomicBool, AtomicUsize, Ordering::SeqCst},
-        time::Duration,
-    };
-    use util::path;
-
-    fn init_test(cx: &mut TestAppContext) {
-        env_logger::try_init().ok();
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-        });
-    }
-
-    #[gpui::test]
-    async fn test_terminal_output_buffered_before_created_renders(cx: &mut gpui::TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, [], cx).await;
-        let connection = Rc::new(FakeAgentConnection::new());
-        let thread = cx
-            .update(|cx| connection.new_thread(project, std::path::Path::new(path!("/test")), cx))
-            .await
-            .unwrap();
-
-        let terminal_id = acp::TerminalId::new(uuid::Uuid::new_v4().to_string());
-
-        // Send Output BEFORE Created - should be buffered by acp_thread
-        thread.update(cx, |thread, cx| {
-            thread.on_terminal_provider_event(
-                TerminalProviderEvent::Output {
-                    terminal_id: terminal_id.clone(),
-                    data: b"hello buffered".to_vec(),
-                },
-                cx,
-            );
-        });
-
-        // Create a display-only terminal and then send Created
-        let lower = cx.new(|cx| {
-            let builder = ::terminal::TerminalBuilder::new_display_only(
-                ::terminal::terminal_settings::CursorShape::default(),
-                ::terminal::terminal_settings::AlternateScroll::On,
-                None,
-                0,
-            )
-            .unwrap();
-            builder.subscribe(cx)
-        });
-
-        thread.update(cx, |thread, cx| {
-            thread.on_terminal_provider_event(
-                TerminalProviderEvent::Created {
-                    terminal_id: terminal_id.clone(),
-                    label: "Buffered Test".to_string(),
-                    cwd: None,
-                    output_byte_limit: None,
-                    terminal: lower.clone(),
-                },
-                cx,
-            );
-        });
-
-        // After Created, buffered Output should have been flushed into the renderer
-        let content = thread.read_with(cx, |thread, cx| {
-            let term = thread.terminal(terminal_id.clone()).unwrap();
-            term.read_with(cx, |t, cx| t.inner().read(cx).get_content())
-        });
-
-        assert!(
-            content.contains("hello buffered"),
-            "expected buffered output to render, got: {content}"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_terminal_output_and_exit_buffered_before_created(cx: &mut gpui::TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, [], cx).await;
-        let connection = Rc::new(FakeAgentConnection::new());
-        let thread = cx
-            .update(|cx| connection.new_thread(project, std::path::Path::new(path!("/test")), cx))
-            .await
-            .unwrap();
-
-        let terminal_id = acp::TerminalId::new(uuid::Uuid::new_v4().to_string());
-
-        // Send Output BEFORE Created
-        thread.update(cx, |thread, cx| {
-            thread.on_terminal_provider_event(
-                TerminalProviderEvent::Output {
-                    terminal_id: terminal_id.clone(),
-                    data: b"pre-exit data".to_vec(),
-                },
-                cx,
-            );
-        });
-
-        // Send Exit BEFORE Created
-        thread.update(cx, |thread, cx| {
-            thread.on_terminal_provider_event(
-                TerminalProviderEvent::Exit {
-                    terminal_id: terminal_id.clone(),
-                    status: acp::TerminalExitStatus::new().exit_code(0),
-                },
-                cx,
-            );
-        });
-
-        // Now create a display-only lower-level terminal and send Created
-        let lower = cx.new(|cx| {
-            let builder = ::terminal::TerminalBuilder::new_display_only(
-                ::terminal::terminal_settings::CursorShape::default(),
-                ::terminal::terminal_settings::AlternateScroll::On,
-                None,
-                0,
-            )
-            .unwrap();
-            builder.subscribe(cx)
-        });
-
-        thread.update(cx, |thread, cx| {
-            thread.on_terminal_provider_event(
-                TerminalProviderEvent::Created {
-                    terminal_id: terminal_id.clone(),
-                    label: "Buffered Exit Test".to_string(),
-                    cwd: None,
-                    output_byte_limit: None,
-                    terminal: lower.clone(),
-                },
-                cx,
-            );
-        });
-
-        // Output should be present after Created (flushed from buffer)
-        let content = thread.read_with(cx, |thread, cx| {
-            let term = thread.terminal(terminal_id.clone()).unwrap();
-            term.read_with(cx, |t, cx| t.inner().read(cx).get_content())
-        });
-
-        assert!(
-            content.contains("pre-exit data"),
-            "expected pre-exit data to render, got: {content}"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_push_user_content_block(cx: &mut gpui::TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, [], cx).await;
-        let connection = Rc::new(FakeAgentConnection::new());
-        let thread = cx
-            .update(|cx| connection.new_thread(project, Path::new(path!("/test")), cx))
-            .await
-            .unwrap();
-
-        // Test creating a new user message
-        thread.update(cx, |thread, cx| {
-            thread.push_user_content_block(None, "Hello, ".into(), cx);
-        });
-
-        thread.update(cx, |thread, cx| {
-            assert_eq!(thread.entries.len(), 1);
-            if let AgentThreadEntry::UserMessage(user_msg) = &thread.entries[0] {
-                assert_eq!(user_msg.id, None);
-                assert_eq!(user_msg.content.to_markdown(cx), "Hello, ");
-            } else {
-                panic!("Expected UserMessage");
-            }
-        });
-
-        // Test appending to existing user message
-        let message_1_id = UserMessageId::new();
-        thread.update(cx, |thread, cx| {
-            thread.push_user_content_block(Some(message_1_id.clone()), "world!".into(), cx);
-        });
-
-        thread.update(cx, |thread, cx| {
-            assert_eq!(thread.entries.len(), 1);
-            if let AgentThreadEntry::UserMessage(user_msg) = &thread.entries[0] {
-                assert_eq!(user_msg.id, Some(message_1_id));
-                assert_eq!(user_msg.content.to_markdown(cx), "Hello, world!");
-            } else {
-                panic!("Expected UserMessage");
-            }
-        });
-
-        // Test creating new user message after assistant message
-        thread.update(cx, |thread, cx| {
-            thread.push_assistant_content_block("Assistant response".into(), false, cx);
-        });
-
-        let message_2_id = UserMessageId::new();
-        thread.update(cx, |thread, cx| {
-            thread.push_user_content_block(
-                Some(message_2_id.clone()),
-                "New user message".into(),
-                cx,
-            );
-        });
-
-        thread.update(cx, |thread, cx| {
-            assert_eq!(thread.entries.len(), 3);
-            if let AgentThreadEntry::UserMessage(user_msg) = &thread.entries[2] {
-                assert_eq!(user_msg.id, Some(message_2_id));
-                assert_eq!(user_msg.content.to_markdown(cx), "New user message");
-            } else {
-                panic!("Expected UserMessage at index 2");
-            }
-        });
-    }
-
-    #[gpui::test]
-    async fn test_thinking_concatenation(cx: &mut gpui::TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, [], cx).await;
-        let connection = Rc::new(FakeAgentConnection::new().on_user_message(
-            |_, thread, mut cx| {
-                async move {
-                    thread.update(&mut cx, |thread, cx| {
-                        thread
-                            .handle_session_update(
-                                acp::SessionUpdate::AgentThoughtChunk(acp::ContentChunk::new(
-                                    "Thinking ".into(),
-                                )),
-                                cx,
-                            )
-                            .unwrap();
-                        thread
-                            .handle_session_update(
-                                acp::SessionUpdate::AgentThoughtChunk(acp::ContentChunk::new(
-                                    "hard!".into(),
-                                )),
-                                cx,
-                            )
-                            .unwrap();
-                    })?;
-                    Ok(acp::PromptResponse::new(acp::StopReason::EndTurn))
-                }
-                .boxed_local()
-            },
-        ));
-
-        let thread = cx
-            .update(|cx| connection.new_thread(project, Path::new(path!("/test")), cx))
-            .await
-            .unwrap();
-
-        thread
-            .update(cx, |thread, cx| thread.send_raw("Hello from Zed!", cx))
-            .await
-            .unwrap();
-
-        let output = thread.read_with(cx, |thread, cx| thread.to_markdown(cx));
-        assert_eq!(
-            output,
-            indoc! {r#"
-            ## User
-
-            Hello from Zed!
-
-            ## Assistant
-
-            <thinking>
-            Thinking hard!
-            </thinking>
-
-            "#}
-        );
-    }
-
-    #[gpui::test]
-    async fn test_edits_concurrently_to_user(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(path!("/tmp"), json!({"foo": "one\ntwo\nthree\n"}))
-            .await;
-        let project = Project::test(fs.clone(), [], cx).await;
-        let (read_file_tx, read_file_rx) = oneshot::channel::<()>();
-        let read_file_tx = Rc::new(RefCell::new(Some(read_file_tx)));
-        let connection = Rc::new(FakeAgentConnection::new().on_user_message(
-            move |_, thread, mut cx| {
-                let read_file_tx = read_file_tx.clone();
-                async move {
-                    let content = thread
-                        .update(&mut cx, |thread, cx| {
-                            thread.read_text_file(path!("/tmp/foo").into(), None, None, false, cx)
-                        })
-                        .unwrap()
-                        .await
-                        .unwrap();
-                    assert_eq!(content, "one\ntwo\nthree\n");
-                    read_file_tx.take().unwrap().send(()).unwrap();
-                    thread
-                        .update(&mut cx, |thread, cx| {
-                            thread.write_text_file(
-                                path!("/tmp/foo").into(),
-                                "one\ntwo\nthree\nfour\nfive\n".to_string(),
-                                cx,
-                            )
-                        })
-                        .unwrap()
-                        .await
-                        .unwrap();
-                    Ok(acp::PromptResponse::new(acp::StopReason::EndTurn))
-                }
-                .boxed_local()
-            },
-        ));
-
-        let (worktree, pathbuf) = project
-            .update(cx, |project, cx| {
-                project.find_or_create_worktree(path!("/tmp/foo"), true, cx)
-            })
-            .await
-            .unwrap();
-        let buffer = project
-            .update(cx, |project, cx| {
-                project.open_buffer((worktree.read(cx).id(), pathbuf), cx)
-            })
-            .await
-            .unwrap();
-
-        let thread = cx
-            .update(|cx| connection.new_thread(project, Path::new(path!("/tmp")), cx))
-            .await
-            .unwrap();
-
-        let request = thread.update(cx, |thread, cx| {
-            thread.send_raw("Extend the count in /tmp/foo", cx)
-        });
-        read_file_rx.await.ok();
-        buffer.update(cx, |buffer, cx| {
-            buffer.edit([(0..0, "zero\n".to_string())], None, cx);
-        });
-        cx.run_until_parked();
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.text()),
-            "zero\none\ntwo\nthree\nfour\nfive\n"
-        );
-        assert_eq!(
-            String::from_utf8(fs.read_file_sync(path!("/tmp/foo")).unwrap()).unwrap(),
-            "zero\none\ntwo\nthree\nfour\nfive\n"
-        );
-        request.await.unwrap();
-    }
-
-    #[gpui::test]
-    async fn test_reading_from_line(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(path!("/tmp"), json!({"foo": "one\ntwo\nthree\nfour\n"}))
-            .await;
-        let project = Project::test(fs.clone(), [], cx).await;
-        project
-            .update(cx, |project, cx| {
-                project.find_or_create_worktree(path!("/tmp/foo"), true, cx)
-            })
-            .await
-            .unwrap();
-
-        let connection = Rc::new(FakeAgentConnection::new());
-
-        let thread = cx
-            .update(|cx| connection.new_thread(project, Path::new(path!("/tmp")), cx))
-            .await
-            .unwrap();
-
-        // Whole file
-        let content = thread
-            .update(cx, |thread, cx| {
-                thread.read_text_file(path!("/tmp/foo").into(), None, None, false, cx)
-            })
-            .await
-            .unwrap();
-
-        assert_eq!(content, "one\ntwo\nthree\nfour\n");
-
-        // Only start line
-        let content = thread
-            .update(cx, |thread, cx| {
-                thread.read_text_file(path!("/tmp/foo").into(), Some(3), None, false, cx)
-            })
-            .await
-            .unwrap();
-
-        assert_eq!(content, "three\nfour\n");
-
-        // Only limit
-        let content = thread
-            .update(cx, |thread, cx| {
-                thread.read_text_file(path!("/tmp/foo").into(), None, Some(2), false, cx)
-            })
-            .await
-            .unwrap();
-
-        assert_eq!(content, "one\ntwo\n");
-
-        // Range
-        let content = thread
-            .update(cx, |thread, cx| {
-                thread.read_text_file(path!("/tmp/foo").into(), Some(2), Some(2), false, cx)
-            })
-            .await
-            .unwrap();
-
-        assert_eq!(content, "two\nthree\n");
-
-        // Invalid
-        let err = thread
-            .update(cx, |thread, cx| {
-                thread.read_text_file(path!("/tmp/foo").into(), Some(6), Some(2), false, cx)
-            })
-            .await
-            .unwrap_err();
-
-        assert_eq!(
-            err.to_string(),
-            "Invalid params: \"Attempting to read beyond the end of the file, line 5:0\""
-        );
-    }
-
-    #[gpui::test]
-    async fn test_reading_empty_file(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(path!("/tmp"), json!({"foo": ""})).await;
-        let project = Project::test(fs.clone(), [], cx).await;
-        project
-            .update(cx, |project, cx| {
-                project.find_or_create_worktree(path!("/tmp/foo"), true, cx)
-            })
-            .await
-            .unwrap();
-
-        let connection = Rc::new(FakeAgentConnection::new());
-
-        let thread = cx
-            .update(|cx| connection.new_thread(project, Path::new(path!("/tmp")), cx))
-            .await
-            .unwrap();
-
-        // Whole file
-        let content = thread
-            .update(cx, |thread, cx| {
-                thread.read_text_file(path!("/tmp/foo").into(), None, None, false, cx)
-            })
-            .await
-            .unwrap();
-
-        assert_eq!(content, "");
-
-        // Only start line
-        let content = thread
-            .update(cx, |thread, cx| {
-                thread.read_text_file(path!("/tmp/foo").into(), Some(1), None, false, cx)
-            })
-            .await
-            .unwrap();
-
-        assert_eq!(content, "");
-
-        // Only limit
-        let content = thread
-            .update(cx, |thread, cx| {
-                thread.read_text_file(path!("/tmp/foo").into(), None, Some(2), false, cx)
-            })
-            .await
-            .unwrap();
-
-        assert_eq!(content, "");
-
-        // Range
-        let content = thread
-            .update(cx, |thread, cx| {
-                thread.read_text_file(path!("/tmp/foo").into(), Some(1), Some(1), false, cx)
-            })
-            .await
-            .unwrap();
-
-        assert_eq!(content, "");
-
-        // Invalid
-        let err = thread
-            .update(cx, |thread, cx| {
-                thread.read_text_file(path!("/tmp/foo").into(), Some(5), Some(2), false, cx)
-            })
-            .await
-            .unwrap_err();
-
-        assert_eq!(
-            err.to_string(),
-            "Invalid params: \"Attempting to read beyond the end of the file, line 1:0\""
-        );
-    }
-    #[gpui::test]
-    async fn test_reading_non_existing_file(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(path!("/tmp"), json!({})).await;
-        let project = Project::test(fs.clone(), [], cx).await;
-        project
-            .update(cx, |project, cx| {
-                project.find_or_create_worktree(path!("/tmp"), true, cx)
-            })
-            .await
-            .unwrap();
-
-        let connection = Rc::new(FakeAgentConnection::new());
-
-        let thread = cx
-            .update(|cx| connection.new_thread(project, Path::new(path!("/tmp")), cx))
-            .await
-            .unwrap();
-
-        // Out of project file
-        let err = thread
-            .update(cx, |thread, cx| {
-                thread.read_text_file(path!("/foo").into(), None, None, false, cx)
-            })
-            .await
-            .unwrap_err();
-
-        assert_eq!(err.code, acp::ErrorCode::ResourceNotFound);
-    }
-
-    #[gpui::test]
-    async fn test_succeeding_canceled_toolcall(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, [], cx).await;
-        let id = acp::ToolCallId::new("test");
-
-        let connection = Rc::new(FakeAgentConnection::new().on_user_message({
-            let id = id.clone();
-            move |_, thread, mut cx| {
-                let id = id.clone();
-                async move {
-                    thread
-                        .update(&mut cx, |thread, cx| {
-                            thread.handle_session_update(
-                                acp::SessionUpdate::ToolCall(
-                                    acp::ToolCall::new(id.clone(), "Label")
-                                        .kind(acp::ToolKind::Fetch)
-                                        .status(acp::ToolCallStatus::InProgress),
-                                ),
-                                cx,
-                            )
-                        })
-                        .unwrap()
-                        .unwrap();
-                    Ok(acp::PromptResponse::new(acp::StopReason::EndTurn))
-                }
-                .boxed_local()
-            }
-        }));
-
-        let thread = cx
-            .update(|cx| connection.new_thread(project, Path::new(path!("/test")), cx))
-            .await
-            .unwrap();
-
-        let request = thread.update(cx, |thread, cx| {
-            thread.send_raw("Fetch https://example.com", cx)
-        });
-
-        run_until_first_tool_call(&thread, cx).await;
-
-        thread.read_with(cx, |thread, _| {
-            assert!(matches!(
-                thread.entries[1],
-                AgentThreadEntry::ToolCall(ToolCall {
-                    status: ToolCallStatus::InProgress,
-                    ..
-                })
-            ));
-        });
-
-        thread.update(cx, |thread, cx| thread.cancel(cx)).await;
-
-        thread.read_with(cx, |thread, _| {
-            assert!(matches!(
-                &thread.entries[1],
-                AgentThreadEntry::ToolCall(ToolCall {
-                    status: ToolCallStatus::Canceled,
-                    ..
-                })
-            ));
-        });
-
-        thread
-            .update(cx, |thread, cx| {
-                thread.handle_session_update(
-                    acp::SessionUpdate::ToolCallUpdate(acp::ToolCallUpdate::new(
-                        id,
-                        acp::ToolCallUpdateFields::new().status(acp::ToolCallStatus::Completed),
-                    )),
-                    cx,
-                )
-            })
-            .unwrap();
-
-        request.await.unwrap();
-
-        thread.read_with(cx, |thread, _| {
-            assert!(matches!(
-                thread.entries[1],
-                AgentThreadEntry::ToolCall(ToolCall {
-                    status: ToolCallStatus::Completed,
-                    ..
-                })
-            ));
-        });
-    }
-
-    #[gpui::test]
-    async fn test_no_pending_edits_if_tool_calls_are_completed(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(path!("/test"), json!({})).await;
-        let project = Project::test(fs, [path!("/test").as_ref()], cx).await;
-
-        let connection = Rc::new(FakeAgentConnection::new().on_user_message({
-            move |_, thread, mut cx| {
-                async move {
-                    thread
-                        .update(&mut cx, |thread, cx| {
-                            thread.handle_session_update(
-                                acp::SessionUpdate::ToolCall(
-                                    acp::ToolCall::new("test", "Label")
-                                        .kind(acp::ToolKind::Edit)
-                                        .status(acp::ToolCallStatus::Completed)
-                                        .content(vec![acp::ToolCallContent::Diff(acp::Diff::new(
-                                            "/test/test.txt",
-                                            "foo",
-                                        ))]),
-                                ),
-                                cx,
-                            )
-                        })
-                        .unwrap()
-                        .unwrap();
-                    Ok(acp::PromptResponse::new(acp::StopReason::EndTurn))
-                }
-                .boxed_local()
-            }
-        }));
-
-        let thread = cx
-            .update(|cx| connection.new_thread(project, Path::new(path!("/test")), cx))
-            .await
-            .unwrap();
-
-        cx.update(|cx| thread.update(cx, |thread, cx| thread.send(vec!["Hi".into()], cx)))
-            .await
-            .unwrap();
-
-        assert!(cx.read(|cx| !thread.read(cx).has_pending_edit_tool_calls()));
-    }
-
-    #[gpui::test(iterations = 10)]
-    async fn test_checkpoints(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(
-            path!("/test"),
-            json!({
-                ".git": {}
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), [path!("/test").as_ref()], cx).await;
-
-        let simulate_changes = Arc::new(AtomicBool::new(true));
-        let next_filename = Arc::new(AtomicUsize::new(0));
-        let connection = Rc::new(FakeAgentConnection::new().on_user_message({
-            let simulate_changes = simulate_changes.clone();
-            let next_filename = next_filename.clone();
-            let fs = fs.clone();
-            move |request, thread, mut cx| {
-                let fs = fs.clone();
-                let simulate_changes = simulate_changes.clone();
-                let next_filename = next_filename.clone();
-                async move {
-                    if simulate_changes.load(SeqCst) {
-                        let filename = format!("/test/file-{}", next_filename.fetch_add(1, SeqCst));
-                        fs.write(Path::new(&filename), b"").await?;
-                    }
-
-                    let acp::ContentBlock::Text(content) = &request.prompt[0] else {
-                        panic!("expected text content block");
-                    };
-                    thread.update(&mut cx, |thread, cx| {
-                        thread
-                            .handle_session_update(
-                                acp::SessionUpdate::AgentMessageChunk(acp::ContentChunk::new(
-                                    content.text.to_uppercase().into(),
-                                )),
-                                cx,
-                            )
-                            .unwrap();
-                    })?;
-                    Ok(acp::PromptResponse::new(acp::StopReason::EndTurn))
-                }
-                .boxed_local()
-            }
-        }));
-        let thread = cx
-            .update(|cx| connection.new_thread(project, Path::new(path!("/test")), cx))
-            .await
-            .unwrap();
-
-        cx.update(|cx| thread.update(cx, |thread, cx| thread.send(vec!["Lorem".into()], cx)))
-            .await
-            .unwrap();
-        thread.read_with(cx, |thread, cx| {
-            assert_eq!(
-                thread.to_markdown(cx),
-                indoc! {"
-                    ## User (checkpoint)
-
-                    Lorem
-
-                    ## Assistant
-
-                    LOREM
-
-                "}
-            );
-        });
-        assert_eq!(fs.files(), vec![Path::new(path!("/test/file-0"))]);
-
-        cx.update(|cx| thread.update(cx, |thread, cx| thread.send(vec!["ipsum".into()], cx)))
-            .await
-            .unwrap();
-        thread.read_with(cx, |thread, cx| {
-            assert_eq!(
-                thread.to_markdown(cx),
-                indoc! {"
-                    ## User (checkpoint)
-
-                    Lorem
-
-                    ## Assistant
-
-                    LOREM
-
-                    ## User (checkpoint)
-
-                    ipsum
-
-                    ## Assistant
-
-                    IPSUM
-
-                "}
-            );
-        });
-        assert_eq!(
-            fs.files(),
-            vec![
-                Path::new(path!("/test/file-0")),
-                Path::new(path!("/test/file-1"))
-            ]
-        );
-
-        // Checkpoint isn't stored when there are no changes.
-        simulate_changes.store(false, SeqCst);
-        cx.update(|cx| thread.update(cx, |thread, cx| thread.send(vec!["dolor".into()], cx)))
-            .await
-            .unwrap();
-        thread.read_with(cx, |thread, cx| {
-            assert_eq!(
-                thread.to_markdown(cx),
-                indoc! {"
-                    ## User (checkpoint)
-
-                    Lorem
-
-                    ## Assistant
-
-                    LOREM
-
-                    ## User (checkpoint)
-
-                    ipsum
-
-                    ## Assistant
-
-                    IPSUM
-
-                    ## User
-
-                    dolor
-
-                    ## Assistant
-
-                    DOLOR
-
-                "}
-            );
-        });
-        assert_eq!(
-            fs.files(),
-            vec![
-                Path::new(path!("/test/file-0")),
-                Path::new(path!("/test/file-1"))
-            ]
-        );
-
-        // Rewinding the conversation truncates the history and restores the checkpoint.
-        thread
-            .update(cx, |thread, cx| {
-                let AgentThreadEntry::UserMessage(message) = &thread.entries[2] else {
-                    panic!("unexpected entries {:?}", thread.entries)
-                };
-                thread.restore_checkpoint(message.id.clone().unwrap(), cx)
-            })
-            .await
-            .unwrap();
-        thread.read_with(cx, |thread, cx| {
-            assert_eq!(
-                thread.to_markdown(cx),
-                indoc! {"
-                    ## User (checkpoint)
-
-                    Lorem
-
-                    ## Assistant
-
-                    LOREM
-
-                "}
-            );
-        });
-        assert_eq!(fs.files(), vec![Path::new(path!("/test/file-0"))]);
-    }
-
-    #[gpui::test]
-    async fn test_tool_result_refusal(cx: &mut TestAppContext) {
-        use std::sync::atomic::AtomicUsize;
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, None, cx).await;
-
-        // Create a connection that simulates refusal after tool result
-        let prompt_count = Arc::new(AtomicUsize::new(0));
-        let connection = Rc::new(FakeAgentConnection::new().on_user_message({
-            let prompt_count = prompt_count.clone();
-            move |_request, thread, mut cx| {
-                let count = prompt_count.fetch_add(1, SeqCst);
-                async move {
-                    if count == 0 {
-                        // First prompt: Generate a tool call with result
-                        thread.update(&mut cx, |thread, cx| {
-                            thread
-                                .handle_session_update(
-                                    acp::SessionUpdate::ToolCall(
-                                        acp::ToolCall::new("tool1", "Test Tool")
-                                            .kind(acp::ToolKind::Fetch)
-                                            .status(acp::ToolCallStatus::Completed)
-                                            .raw_input(serde_json::json!({"query": "test"}))
-                                            .raw_output(serde_json::json!({"result": "inappropriate content"})),
-                                    ),
-                                    cx,
-                                )
-                                .unwrap();
-                        })?;
-
-                        // Now return refusal because of the tool result
-                        Ok(acp::PromptResponse::new(acp::StopReason::Refusal))
-                    } else {
-                        Ok(acp::PromptResponse::new(acp::StopReason::EndTurn))
-                    }
-                }
-                .boxed_local()
-            }
-        }));
-
-        let thread = cx
-            .update(|cx| connection.new_thread(project, Path::new(path!("/test")), cx))
-            .await
-            .unwrap();
-
-        // Track if we see a Refusal event
-        let saw_refusal_event = Arc::new(std::sync::Mutex::new(false));
-        let saw_refusal_event_captured = saw_refusal_event.clone();
-        thread.update(cx, |_thread, cx| {
-            cx.subscribe(
-                &thread,
-                move |_thread, _event_thread, event: &AcpThreadEvent, _cx| {
-                    if matches!(event, AcpThreadEvent::Refusal) {
-                        *saw_refusal_event_captured.lock().unwrap() = true;
-                    }
-                },
-            )
-            .detach();
-        });
-
-        // Send a user message - this will trigger tool call and then refusal
-        let send_task = thread.update(cx, |thread, cx| thread.send(vec!["Hello".into()], cx));
-        cx.background_executor.spawn(send_task).detach();
-        cx.run_until_parked();
-
-        // Verify that:
-        // 1. A Refusal event WAS emitted (because it's a tool result refusal, not user prompt)
-        // 2. The user message was NOT truncated
-        assert!(
-            *saw_refusal_event.lock().unwrap(),
-            "Refusal event should be emitted for tool result refusals"
-        );
-
-        thread.read_with(cx, |thread, _| {
-            let entries = thread.entries();
-            assert!(entries.len() >= 2, "Should have user message and tool call");
-
-            // Verify user message is still there
-            assert!(
-                matches!(entries[0], AgentThreadEntry::UserMessage(_)),
-                "User message should not be truncated"
-            );
-
-            // Verify tool call is there with result
-            if let AgentThreadEntry::ToolCall(tool_call) = &entries[1] {
-                assert!(
-                    tool_call.raw_output.is_some(),
-                    "Tool call should have output"
-                );
-            } else {
-                panic!("Expected tool call at index 1");
-            }
-        });
-    }
-
-    #[gpui::test]
-    async fn test_user_prompt_refusal_emits_event(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, None, cx).await;
-
-        let refuse_next = Arc::new(AtomicBool::new(false));
-        let connection = Rc::new(FakeAgentConnection::new().on_user_message({
-            let refuse_next = refuse_next.clone();
-            move |_request, _thread, _cx| {
-                if refuse_next.load(SeqCst) {
-                    async move { Ok(acp::PromptResponse::new(acp::StopReason::Refusal)) }
-                        .boxed_local()
-                } else {
-                    async move { Ok(acp::PromptResponse::new(acp::StopReason::EndTurn)) }
-                        .boxed_local()
-                }
-            }
-        }));
-
-        let thread = cx
-            .update(|cx| connection.new_thread(project, Path::new(path!("/test")), cx))
-            .await
-            .unwrap();
-
-        // Track if we see a Refusal event
-        let saw_refusal_event = Arc::new(std::sync::Mutex::new(false));
-        let saw_refusal_event_captured = saw_refusal_event.clone();
-        thread.update(cx, |_thread, cx| {
-            cx.subscribe(
-                &thread,
-                move |_thread, _event_thread, event: &AcpThreadEvent, _cx| {
-                    if matches!(event, AcpThreadEvent::Refusal) {
-                        *saw_refusal_event_captured.lock().unwrap() = true;
-                    }
-                },
-            )
-            .detach();
-        });
-
-        // Send a message that will be refused
-        refuse_next.store(true, SeqCst);
-        cx.update(|cx| thread.update(cx, |thread, cx| thread.send(vec!["hello".into()], cx)))
-            .await
-            .unwrap();
-
-        // Verify that a Refusal event WAS emitted for user prompt refusal
-        assert!(
-            *saw_refusal_event.lock().unwrap(),
-            "Refusal event should be emitted for user prompt refusals"
-        );
-
-        // Verify the message was truncated (user prompt refusal)
-        thread.read_with(cx, |thread, cx| {
-            assert_eq!(thread.to_markdown(cx), "");
-        });
-    }
-
-    #[gpui::test]
-    async fn test_refusal(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(path!("/"), json!({})).await;
-        let project = Project::test(fs.clone(), [path!("/").as_ref()], cx).await;
-
-        let refuse_next = Arc::new(AtomicBool::new(false));
-        let connection = Rc::new(FakeAgentConnection::new().on_user_message({
-            let refuse_next = refuse_next.clone();
-            move |request, thread, mut cx| {
-                let refuse_next = refuse_next.clone();
-                async move {
-                    if refuse_next.load(SeqCst) {
-                        return Ok(acp::PromptResponse::new(acp::StopReason::Refusal));
-                    }
-
-                    let acp::ContentBlock::Text(content) = &request.prompt[0] else {
-                        panic!("expected text content block");
-                    };
-                    thread.update(&mut cx, |thread, cx| {
-                        thread
-                            .handle_session_update(
-                                acp::SessionUpdate::AgentMessageChunk(acp::ContentChunk::new(
-                                    content.text.to_uppercase().into(),
-                                )),
-                                cx,
-                            )
-                            .unwrap();
-                    })?;
-                    Ok(acp::PromptResponse::new(acp::StopReason::EndTurn))
-                }
-                .boxed_local()
-            }
-        }));
-        let thread = cx
-            .update(|cx| connection.new_thread(project, Path::new(path!("/test")), cx))
-            .await
-            .unwrap();
-
-        cx.update(|cx| thread.update(cx, |thread, cx| thread.send(vec!["hello".into()], cx)))
-            .await
-            .unwrap();
-        thread.read_with(cx, |thread, cx| {
-            assert_eq!(
-                thread.to_markdown(cx),
-                indoc! {"
-                    ## User
-
-                    hello
-
-                    ## Assistant
-
-                    HELLO
-
-                "}
-            );
-        });
-
-        // Simulate refusing the second message. The message should be truncated
-        // when a user prompt is refused.
-        refuse_next.store(true, SeqCst);
-        cx.update(|cx| thread.update(cx, |thread, cx| thread.send(vec!["world".into()], cx)))
-            .await
-            .unwrap();
-        thread.read_with(cx, |thread, cx| {
-            assert_eq!(
-                thread.to_markdown(cx),
-                indoc! {"
-                    ## User
-
-                    hello
-
-                    ## Assistant
-
-                    HELLO
-
-                "}
-            );
-        });
-    }
-
-    async fn run_until_first_tool_call(
-        thread: &Entity<AcpThread>,
-        cx: &mut TestAppContext,
-    ) -> usize {
-        let (mut tx, mut rx) = mpsc::channel::<usize>(1);
-
-        let subscription = cx.update(|cx| {
-            cx.subscribe(thread, move |thread, _, cx| {
-                for (ix, entry) in thread.read(cx).entries.iter().enumerate() {
-                    if matches!(entry, AgentThreadEntry::ToolCall(_)) {
-                        return tx.try_send(ix).unwrap();
-                    }
-                }
-            })
-        });
-
-        select! {
-            _ = futures::FutureExt::fuse(smol::Timer::after(Duration::from_secs(10))) => {
-                panic!("Timeout waiting for tool call")
-            }
-            ix = rx.next().fuse() => {
-                drop(subscription);
-                ix.unwrap()
-            }
-        }
-    }
-
-    #[derive(Clone, Default)]
-    struct FakeAgentConnection {
-        auth_methods: Vec<acp::AuthMethod>,
-        sessions: Arc<parking_lot::Mutex<HashMap<acp::SessionId, WeakEntity<AcpThread>>>>,
-        on_user_message: Option<
-            Rc<
-                dyn Fn(
-                        acp::PromptRequest,
-                        WeakEntity<AcpThread>,
-                        AsyncApp,
-                    ) -> LocalBoxFuture<'static, Result<acp::PromptResponse>>
-                    + 'static,
-            >,
-        >,
-    }
-
-    impl FakeAgentConnection {
-        fn new() -> Self {
-            Self {
-                auth_methods: Vec::new(),
-                on_user_message: None,
-                sessions: Arc::default(),
-            }
-        }
-
-        #[expect(unused)]
-        fn with_auth_methods(mut self, auth_methods: Vec<acp::AuthMethod>) -> Self {
-            self.auth_methods = auth_methods;
-            self
-        }
-
-        fn on_user_message(
-            mut self,
-            handler: impl Fn(
-                acp::PromptRequest,
-                WeakEntity<AcpThread>,
-                AsyncApp,
-            ) -> LocalBoxFuture<'static, Result<acp::PromptResponse>>
-            + 'static,
-        ) -> Self {
-            self.on_user_message.replace(Rc::new(handler));
-            self
-        }
-    }
-
-    impl AgentConnection for FakeAgentConnection {
-        fn telemetry_id(&self) -> SharedString {
-            "fake".into()
-        }
-
-        fn auth_methods(&self) -> &[acp::AuthMethod] {
-            &self.auth_methods
-        }
-
-        fn new_thread(
-            self: Rc<Self>,
-            project: Entity<Project>,
-            _cwd: &Path,
-            cx: &mut App,
-        ) -> Task<gpui::Result<Entity<AcpThread>>> {
-            let session_id = acp::SessionId::new(
-                rand::rng()
-                    .sample_iter(&distr::Alphanumeric)
-                    .take(7)
-                    .map(char::from)
-                    .collect::<String>(),
-            );
-            let action_log = cx.new(|_| ActionLog::new(project.clone()));
-            let thread = cx.new(|cx| {
-                AcpThread::new(
-                    "Test",
-                    self.clone(),
-                    project,
-                    action_log,
-                    session_id.clone(),
-                    watch::Receiver::constant(
-                        acp::PromptCapabilities::new()
-                            .image(true)
-                            .audio(true)
-                            .embedded_context(true),
-                    ),
-                    cx,
-                )
-            });
-            self.sessions.lock().insert(session_id, thread.downgrade());
-            Task::ready(Ok(thread))
-        }
-
-        fn authenticate(&self, method: acp::AuthMethodId, _cx: &mut App) -> Task<gpui::Result<()>> {
-            if self.auth_methods().iter().any(|m| m.id == method) {
-                Task::ready(Ok(()))
-            } else {
-                Task::ready(Err(anyhow!("Invalid Auth Method")))
-            }
-        }
-
-        fn prompt(
-            &self,
-            _id: Option<UserMessageId>,
-            params: acp::PromptRequest,
-            cx: &mut App,
-        ) -> Task<gpui::Result<acp::PromptResponse>> {
-            let sessions = self.sessions.lock();
-            let thread = sessions.get(&params.session_id).unwrap();
-            if let Some(handler) = &self.on_user_message {
-                let handler = handler.clone();
-                let thread = thread.clone();
-                cx.spawn(async move |cx| handler(params, thread, cx.clone()).await)
-            } else {
-                Task::ready(Ok(acp::PromptResponse::new(acp::StopReason::EndTurn)))
-            }
-        }
-
-        fn cancel(&self, session_id: &acp::SessionId, cx: &mut App) {
-            let sessions = self.sessions.lock();
-            let thread = sessions.get(session_id).unwrap().clone();
-
-            cx.spawn(async move |cx| {
-                thread
-                    .update(cx, |thread, cx| thread.cancel(cx))
-                    .unwrap()
-                    .await
-            })
-            .detach();
-        }
-
-        fn truncate(
-            &self,
-            session_id: &acp::SessionId,
-            _cx: &App,
-        ) -> Option<Rc<dyn AgentSessionTruncate>> {
-            Some(Rc::new(FakeAgentSessionEditor {
-                _session_id: session_id.clone(),
-            }))
-        }
-
-        fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
-            self
-        }
-    }
-
-    struct FakeAgentSessionEditor {
-        _session_id: acp::SessionId,
-    }
-
-    impl AgentSessionTruncate for FakeAgentSessionEditor {
-        fn run(&self, _message_id: UserMessageId, _cx: &mut App) -> Task<Result<()>> {
-            Task::ready(Ok(()))
-        }
-    }
-
-    #[gpui::test]
-    async fn test_tool_call_not_found_creates_failed_entry(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, [], cx).await;
-        let connection = Rc::new(FakeAgentConnection::new());
-        let thread = cx
-            .update(|cx| connection.new_thread(project, Path::new(path!("/test")), cx))
-            .await
-            .unwrap();
-
-        // Try to update a tool call that doesn't exist
-        let nonexistent_id = acp::ToolCallId::new("nonexistent-tool-call");
-        thread.update(cx, |thread, cx| {
-            let result = thread.handle_session_update(
-                acp::SessionUpdate::ToolCallUpdate(acp::ToolCallUpdate::new(
-                    nonexistent_id.clone(),
-                    acp::ToolCallUpdateFields::new().status(acp::ToolCallStatus::Completed),
-                )),
-                cx,
-            );
-
-            // The update should succeed (not return an error)
-            assert!(result.is_ok());
-
-            // There should now be exactly one entry in the thread
-            assert_eq!(thread.entries.len(), 1);
-
-            // The entry should be a failed tool call
-            if let AgentThreadEntry::ToolCall(tool_call) = &thread.entries[0] {
-                assert_eq!(tool_call.id, nonexistent_id);
-                assert!(matches!(tool_call.status, ToolCallStatus::Failed));
-                assert_eq!(tool_call.kind, acp::ToolKind::Fetch);
-
-                // Check that the content contains the error message
-                assert_eq!(tool_call.content.len(), 1);
-                if let ToolCallContent::ContentBlock(content_block) = &tool_call.content[0] {
-                    match content_block {
-                        ContentBlock::Markdown { markdown } => {
-                            let markdown_text = markdown.read(cx).source();
-                            assert!(markdown_text.contains("Tool call not found"));
-                        }
-                        ContentBlock::Empty => panic!("Expected markdown content, got empty"),
-                        ContentBlock::ResourceLink { .. } => {
-                            panic!("Expected markdown content, got resource link")
-                        }
-                    }
-                } else {
-                    panic!("Expected ContentBlock, got: {:?}", tool_call.content[0]);
-                }
-            } else {
-                panic!("Expected ToolCall entry, got: {:?}", thread.entries[0]);
-            }
-        });
-    }
-
-    /// Tests that restoring a checkpoint properly cleans up terminals that were
-    /// created after that checkpoint, and cancels any in-progress generation.
-    ///
-    /// Reproduces issue #35142: When a checkpoint is restored, any terminal processes
-    /// that were started after that checkpoint should be terminated, and any in-progress
-    /// AI generation should be canceled.
-    #[gpui::test]
-    async fn test_restore_checkpoint_kills_terminal(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, [], cx).await;
-        let connection = Rc::new(FakeAgentConnection::new());
-        let thread = cx
-            .update(|cx| connection.new_thread(project, Path::new(path!("/test")), cx))
-            .await
-            .unwrap();
-
-        // Send first user message to create a checkpoint
-        cx.update(|cx| {
-            thread.update(cx, |thread, cx| {
-                thread.send(vec!["first message".into()], cx)
-            })
-        })
-        .await
-        .unwrap();
-
-        // Send second message (creates another checkpoint) - we'll restore to this one
-        cx.update(|cx| {
-            thread.update(cx, |thread, cx| {
-                thread.send(vec!["second message".into()], cx)
-            })
-        })
-        .await
-        .unwrap();
-
-        // Create 2 terminals BEFORE the checkpoint that have completed running
-        let terminal_id_1 = acp::TerminalId::new(uuid::Uuid::new_v4().to_string());
-        let mock_terminal_1 = cx.new(|cx| {
-            let builder = ::terminal::TerminalBuilder::new_display_only(
-                ::terminal::terminal_settings::CursorShape::default(),
-                ::terminal::terminal_settings::AlternateScroll::On,
-                None,
-                0,
-            )
-            .unwrap();
-            builder.subscribe(cx)
-        });
-
-        thread.update(cx, |thread, cx| {
-            thread.on_terminal_provider_event(
-                TerminalProviderEvent::Created {
-                    terminal_id: terminal_id_1.clone(),
-                    label: "echo 'first'".to_string(),
-                    cwd: Some(PathBuf::from("/test")),
-                    output_byte_limit: None,
-                    terminal: mock_terminal_1.clone(),
-                },
-                cx,
-            );
-        });
-
-        thread.update(cx, |thread, cx| {
-            thread.on_terminal_provider_event(
-                TerminalProviderEvent::Output {
-                    terminal_id: terminal_id_1.clone(),
-                    data: b"first\n".to_vec(),
-                },
-                cx,
-            );
-        });
-
-        thread.update(cx, |thread, cx| {
-            thread.on_terminal_provider_event(
-                TerminalProviderEvent::Exit {
-                    terminal_id: terminal_id_1.clone(),
-                    status: acp::TerminalExitStatus::new().exit_code(0),
-                },
-                cx,
-            );
-        });
-
-        let terminal_id_2 = acp::TerminalId::new(uuid::Uuid::new_v4().to_string());
-        let mock_terminal_2 = cx.new(|cx| {
-            let builder = ::terminal::TerminalBuilder::new_display_only(
-                ::terminal::terminal_settings::CursorShape::default(),
-                ::terminal::terminal_settings::AlternateScroll::On,
-                None,
-                0,
-            )
-            .unwrap();
-            builder.subscribe(cx)
-        });
-
-        thread.update(cx, |thread, cx| {
-            thread.on_terminal_provider_event(
-                TerminalProviderEvent::Created {
-                    terminal_id: terminal_id_2.clone(),
-                    label: "echo 'second'".to_string(),
-                    cwd: Some(PathBuf::from("/test")),
-                    output_byte_limit: None,
-                    terminal: mock_terminal_2.clone(),
-                },
-                cx,
-            );
-        });
-
-        thread.update(cx, |thread, cx| {
-            thread.on_terminal_provider_event(
-                TerminalProviderEvent::Output {
-                    terminal_id: terminal_id_2.clone(),
-                    data: b"second\n".to_vec(),
-                },
-                cx,
-            );
-        });
-
-        thread.update(cx, |thread, cx| {
-            thread.on_terminal_provider_event(
-                TerminalProviderEvent::Exit {
-                    terminal_id: terminal_id_2.clone(),
-                    status: acp::TerminalExitStatus::new().exit_code(0),
-                },
-                cx,
-            );
-        });
-
-        // Get the second message ID to restore to
-        let second_message_id = thread.read_with(cx, |thread, _| {
-            // At this point we have:
-            // - Index 0: First user message (with checkpoint)
-            // - Index 1: Second user message (with checkpoint)
-            // No assistant responses because FakeAgentConnection just returns EndTurn
-            let AgentThreadEntry::UserMessage(message) = &thread.entries[1] else {
-                panic!("expected user message at index 1");
-            };
-            message.id.clone().unwrap()
-        });
-
-        // Create a terminal AFTER the checkpoint we'll restore to.
-        // This simulates the AI agent starting a long-running terminal command.
-        let terminal_id = acp::TerminalId::new(uuid::Uuid::new_v4().to_string());
-        let mock_terminal = cx.new(|cx| {
-            let builder = ::terminal::TerminalBuilder::new_display_only(
-                ::terminal::terminal_settings::CursorShape::default(),
-                ::terminal::terminal_settings::AlternateScroll::On,
-                None,
-                0,
-            )
-            .unwrap();
-            builder.subscribe(cx)
-        });
-
-        // Register the terminal as created
-        thread.update(cx, |thread, cx| {
-            thread.on_terminal_provider_event(
-                TerminalProviderEvent::Created {
-                    terminal_id: terminal_id.clone(),
-                    label: "sleep 1000".to_string(),
-                    cwd: Some(PathBuf::from("/test")),
-                    output_byte_limit: None,
-                    terminal: mock_terminal.clone(),
-                },
-                cx,
-            );
-        });
-
-        // Simulate the terminal producing output (still running)
-        thread.update(cx, |thread, cx| {
-            thread.on_terminal_provider_event(
-                TerminalProviderEvent::Output {
-                    terminal_id: terminal_id.clone(),
-                    data: b"terminal is running...\n".to_vec(),
-                },
-                cx,
-            );
-        });
-
-        // Create a tool call entry that references this terminal
-        // This represents the agent requesting a terminal command
-        thread.update(cx, |thread, cx| {
-            thread
-                .handle_session_update(
-                    acp::SessionUpdate::ToolCall(
-                        acp::ToolCall::new("terminal-tool-1", "Running command")
-                            .kind(acp::ToolKind::Execute)
-                            .status(acp::ToolCallStatus::InProgress)
-                            .content(vec![acp::ToolCallContent::Terminal(acp::Terminal::new(
-                                terminal_id.clone(),
-                            ))])
-                            .raw_input(serde_json::json!({"command": "sleep 1000", "cd": "/test"})),
-                    ),
-                    cx,
-                )
-                .unwrap();
-        });
-
-        // Verify terminal exists and is in the thread
-        let terminal_exists_before =
-            thread.read_with(cx, |thread, _| thread.terminals.contains_key(&terminal_id));
-        assert!(
-            terminal_exists_before,
-            "Terminal should exist before checkpoint restore"
-        );
-
-        // Verify the terminal's underlying task is still running (not completed)
-        let terminal_running_before = thread.read_with(cx, |thread, _cx| {
-            let terminal_entity = thread.terminals.get(&terminal_id).unwrap();
-            terminal_entity.read_with(cx, |term, _cx| {
-                term.output().is_none() // output is None means it's still running
-            })
-        });
-        assert!(
-            terminal_running_before,
-            "Terminal should be running before checkpoint restore"
-        );
-
-        // Verify we have the expected entries before restore
-        let entry_count_before = thread.read_with(cx, |thread, _| thread.entries.len());
-        assert!(
-            entry_count_before > 1,
-            "Should have multiple entries before restore"
-        );
-
-        // Restore the checkpoint to the second message.
-        // This should:
-        // 1. Cancel any in-progress generation (via the cancel() call)
-        // 2. Remove the terminal that was created after that point
-        thread
-            .update(cx, |thread, cx| {
-                thread.restore_checkpoint(second_message_id, cx)
-            })
-            .await
-            .unwrap();
-
-        // Verify that no send_task is in progress after restore
-        // (cancel() clears the send_task)
-        let has_send_task_after = thread.read_with(cx, |thread, _| thread.send_task.is_some());
-        assert!(
-            !has_send_task_after,
-            "Should not have a send_task after restore (cancel should have cleared it)"
-        );
-
-        // Verify the entries were truncated (restoring to index 1 truncates at 1, keeping only index 0)
-        let entry_count = thread.read_with(cx, |thread, _| thread.entries.len());
-        assert_eq!(
-            entry_count, 1,
-            "Should have 1 entry after restore (only the first user message)"
-        );
-
-        // Verify the 2 completed terminals from before the checkpoint still exist
-        let terminal_1_exists = thread.read_with(cx, |thread, _| {
-            thread.terminals.contains_key(&terminal_id_1)
-        });
-        assert!(
-            terminal_1_exists,
-            "Terminal 1 (from before checkpoint) should still exist"
-        );
-
-        let terminal_2_exists = thread.read_with(cx, |thread, _| {
-            thread.terminals.contains_key(&terminal_id_2)
-        });
-        assert!(
-            terminal_2_exists,
-            "Terminal 2 (from before checkpoint) should still exist"
-        );
-
-        // Verify they're still in completed state
-        let terminal_1_completed = thread.read_with(cx, |thread, _cx| {
-            let terminal_entity = thread.terminals.get(&terminal_id_1).unwrap();
-            terminal_entity.read_with(cx, |term, _cx| term.output().is_some())
-        });
-        assert!(terminal_1_completed, "Terminal 1 should still be completed");
-
-        let terminal_2_completed = thread.read_with(cx, |thread, _cx| {
-            let terminal_entity = thread.terminals.get(&terminal_id_2).unwrap();
-            terminal_entity.read_with(cx, |term, _cx| term.output().is_some())
-        });
-        assert!(terminal_2_completed, "Terminal 2 should still be completed");
-
-        // Verify the running terminal (created after checkpoint) was removed
-        let terminal_3_exists =
-            thread.read_with(cx, |thread, _| thread.terminals.contains_key(&terminal_id));
-        assert!(
-            !terminal_3_exists,
-            "Terminal 3 (created after checkpoint) should have been removed"
-        );
-
-        // Verify total count is 2 (the two from before the checkpoint)
-        let terminal_count = thread.read_with(cx, |thread, _| thread.terminals.len());
-        assert_eq!(
-            terminal_count, 2,
-            "Should have exactly 2 terminals (the completed ones from before checkpoint)"
-        );
-    }
-}
diff --git a/crates/acp_thread/src/connection.rs b/crates/acp_thread/src/connection.rs
deleted file mode 100644
index 3c8c56b2c0..0000000000
--- a/crates/acp_thread/src/connection.rs
+++ /dev/null
@@ -1,470 +0,0 @@
-use crate::AcpThread;
-use agent_client_protocol::{self as acp};
-use anyhow::Result;
-use collections::IndexMap;
-use gpui::{Entity, SharedString, Task};
-use language_model::LanguageModelProviderId;
-use project::Project;
-use serde::{Deserialize, Serialize};
-use std::{any::Any, error::Error, fmt, path::Path, rc::Rc, sync::Arc};
-use ui::{App, IconName};
-use uuid::Uuid;
-
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Hash)]
-pub struct UserMessageId(Arc<str>);
-
-impl UserMessageId {
-    pub fn new() -> Self {
-        Self(Uuid::new_v4().to_string().into())
-    }
-}
-
-pub trait AgentConnection {
-    fn telemetry_id(&self) -> SharedString;
-
-    fn new_thread(
-        self: Rc<Self>,
-        project: Entity<Project>,
-        cwd: &Path,
-        cx: &mut App,
-    ) -> Task<Result<Entity<AcpThread>>>;
-
-    fn auth_methods(&self) -> &[acp::AuthMethod];
-
-    fn authenticate(&self, method: acp::AuthMethodId, cx: &mut App) -> Task<Result<()>>;
-
-    fn prompt(
-        &self,
-        user_message_id: Option<UserMessageId>,
-        params: acp::PromptRequest,
-        cx: &mut App,
-    ) -> Task<Result<acp::PromptResponse>>;
-
-    fn resume(
-        &self,
-        _session_id: &acp::SessionId,
-        _cx: &App,
-    ) -> Option<Rc<dyn AgentSessionResume>> {
-        None
-    }
-
-    fn cancel(&self, session_id: &acp::SessionId, cx: &mut App);
-
-    fn truncate(
-        &self,
-        _session_id: &acp::SessionId,
-        _cx: &App,
-    ) -> Option<Rc<dyn AgentSessionTruncate>> {
-        None
-    }
-
-    fn set_title(
-        &self,
-        _session_id: &acp::SessionId,
-        _cx: &App,
-    ) -> Option<Rc<dyn AgentSessionSetTitle>> {
-        None
-    }
-
-    /// Returns this agent as an [Rc<dyn ModelSelector>] if the model selection capability is supported.
-    ///
-    /// If the agent does not support model selection, returns [None].
-    /// This allows sharing the selector in UI components.
-    fn model_selector(&self, _session_id: &acp::SessionId) -> Option<Rc<dyn AgentModelSelector>> {
-        None
-    }
-
-    fn telemetry(&self) -> Option<Rc<dyn AgentTelemetry>> {
-        None
-    }
-
-    fn session_modes(
-        &self,
-        _session_id: &acp::SessionId,
-        _cx: &App,
-    ) -> Option<Rc<dyn AgentSessionModes>> {
-        None
-    }
-
-    fn into_any(self: Rc<Self>) -> Rc<dyn Any>;
-}
-
-impl dyn AgentConnection {
-    pub fn downcast<T: 'static + AgentConnection + Sized>(self: Rc<Self>) -> Option<Rc<T>> {
-        self.into_any().downcast().ok()
-    }
-}
-
-pub trait AgentSessionTruncate {
-    fn run(&self, message_id: UserMessageId, cx: &mut App) -> Task<Result<()>>;
-}
-
-pub trait AgentSessionResume {
-    fn run(&self, cx: &mut App) -> Task<Result<acp::PromptResponse>>;
-}
-
-pub trait AgentSessionSetTitle {
-    fn run(&self, title: SharedString, cx: &mut App) -> Task<Result<()>>;
-}
-
-pub trait AgentTelemetry {
-    /// A representation of the current thread state that can be serialized for
-    /// storage with telemetry events.
-    fn thread_data(
-        &self,
-        session_id: &acp::SessionId,
-        cx: &mut App,
-    ) -> Task<Result<serde_json::Value>>;
-}
-
-pub trait AgentSessionModes {
-    fn current_mode(&self) -> acp::SessionModeId;
-
-    fn all_modes(&self) -> Vec<acp::SessionMode>;
-
-    fn set_mode(&self, mode: acp::SessionModeId, cx: &mut App) -> Task<Result<()>>;
-}
-
-#[derive(Debug)]
-pub struct AuthRequired {
-    pub description: Option<String>,
-    pub provider_id: Option<LanguageModelProviderId>,
-}
-
-impl AuthRequired {
-    pub fn new() -> Self {
-        Self {
-            description: None,
-            provider_id: None,
-        }
-    }
-
-    pub fn with_description(mut self, description: String) -> Self {
-        self.description = Some(description);
-        self
-    }
-
-    pub fn with_language_model_provider(mut self, provider_id: LanguageModelProviderId) -> Self {
-        self.provider_id = Some(provider_id);
-        self
-    }
-}
-
-impl Error for AuthRequired {}
-impl fmt::Display for AuthRequired {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "Authentication required")
-    }
-}
-
-/// Trait for agents that support listing, selecting, and querying language models.
-///
-/// This is an optional capability; agents indicate support via [AgentConnection::model_selector].
-pub trait AgentModelSelector: 'static {
-    /// Lists all available language models for this agent.
-    ///
-    /// # Parameters
-    /// - `cx`: The GPUI app context for async operations and global access.
-    ///
-    /// # Returns
-    /// A task resolving to the list of models or an error (e.g., if no models are configured).
-    fn list_models(&self, cx: &mut App) -> Task<Result<AgentModelList>>;
-
-    /// Selects a model for a specific session (thread).
-    ///
-    /// This sets the default model for future interactions in the session.
-    /// If the session doesn't exist or the model is invalid, it returns an error.
-    ///
-    /// # Parameters
-    /// - `model`: The model to select (should be one from [list_models]).
-    /// - `cx`: The GPUI app context.
-    ///
-    /// # Returns
-    /// A task resolving to `Ok(())` on success or an error.
-    fn select_model(&self, model_id: acp::ModelId, cx: &mut App) -> Task<Result<()>>;
-
-    /// Retrieves the currently selected model for a specific session (thread).
-    ///
-    /// # Parameters
-    /// - `cx`: The GPUI app context.
-    ///
-    /// # Returns
-    /// A task resolving to the selected model (always set) or an error (e.g., session not found).
-    fn selected_model(&self, cx: &mut App) -> Task<Result<AgentModelInfo>>;
-
-    /// Whenever the model list is updated the receiver will be notified.
-    /// Optional for agents that don't update their model list.
-    fn watch(&self, _cx: &mut App) -> Option<watch::Receiver<()>> {
-        None
-    }
-
-    /// Returns whether the model picker should render a footer.
-    fn should_render_footer(&self) -> bool {
-        false
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct AgentModelInfo {
-    pub id: acp::ModelId,
-    pub name: SharedString,
-    pub description: Option<SharedString>,
-    pub icon: Option<IconName>,
-}
-
-impl From<acp::ModelInfo> for AgentModelInfo {
-    fn from(info: acp::ModelInfo) -> Self {
-        Self {
-            id: info.model_id,
-            name: info.name.into(),
-            description: info.description.map(|desc| desc.into()),
-            icon: None,
-        }
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct AgentModelGroupName(pub SharedString);
-
-#[derive(Debug, Clone)]
-pub enum AgentModelList {
-    Flat(Vec<AgentModelInfo>),
-    Grouped(IndexMap<AgentModelGroupName, Vec<AgentModelInfo>>),
-}
-
-impl AgentModelList {
-    pub fn is_empty(&self) -> bool {
-        match self {
-            AgentModelList::Flat(models) => models.is_empty(),
-            AgentModelList::Grouped(groups) => groups.is_empty(),
-        }
-    }
-}
-
-#[cfg(feature = "test-support")]
-mod test_support {
-    use std::sync::Arc;
-
-    use action_log::ActionLog;
-    use collections::HashMap;
-    use futures::{channel::oneshot, future::try_join_all};
-    use gpui::{AppContext as _, WeakEntity};
-    use parking_lot::Mutex;
-
-    use super::*;
-
-    #[derive(Clone, Default)]
-    pub struct StubAgentConnection {
-        sessions: Arc<Mutex<HashMap<acp::SessionId, Session>>>,
-        permission_requests: HashMap<acp::ToolCallId, Vec<acp::PermissionOption>>,
-        next_prompt_updates: Arc<Mutex<Vec<acp::SessionUpdate>>>,
-    }
-
-    struct Session {
-        thread: WeakEntity<AcpThread>,
-        response_tx: Option<oneshot::Sender<acp::StopReason>>,
-    }
-
-    impl StubAgentConnection {
-        pub fn new() -> Self {
-            Self {
-                next_prompt_updates: Default::default(),
-                permission_requests: HashMap::default(),
-                sessions: Arc::default(),
-            }
-        }
-
-        pub fn set_next_prompt_updates(&self, updates: Vec<acp::SessionUpdate>) {
-            *self.next_prompt_updates.lock() = updates;
-        }
-
-        pub fn with_permission_requests(
-            mut self,
-            permission_requests: HashMap<acp::ToolCallId, Vec<acp::PermissionOption>>,
-        ) -> Self {
-            self.permission_requests = permission_requests;
-            self
-        }
-
-        pub fn send_update(
-            &self,
-            session_id: acp::SessionId,
-            update: acp::SessionUpdate,
-            cx: &mut App,
-        ) {
-            assert!(
-                self.next_prompt_updates.lock().is_empty(),
-                "Use either send_update or set_next_prompt_updates"
-            );
-
-            self.sessions
-                .lock()
-                .get(&session_id)
-                .unwrap()
-                .thread
-                .update(cx, |thread, cx| {
-                    thread.handle_session_update(update, cx).unwrap();
-                })
-                .unwrap();
-        }
-
-        pub fn end_turn(&self, session_id: acp::SessionId, stop_reason: acp::StopReason) {
-            self.sessions
-                .lock()
-                .get_mut(&session_id)
-                .unwrap()
-                .response_tx
-                .take()
-                .expect("No pending turn")
-                .send(stop_reason)
-                .unwrap();
-        }
-    }
-
-    impl AgentConnection for StubAgentConnection {
-        fn telemetry_id(&self) -> SharedString {
-            "stub".into()
-        }
-
-        fn auth_methods(&self) -> &[acp::AuthMethod] {
-            &[]
-        }
-
-        fn new_thread(
-            self: Rc<Self>,
-            project: Entity<Project>,
-            _cwd: &Path,
-            cx: &mut gpui::App,
-        ) -> Task<gpui::Result<Entity<AcpThread>>> {
-            let session_id = acp::SessionId::new(self.sessions.lock().len().to_string());
-            let action_log = cx.new(|_| ActionLog::new(project.clone()));
-            let thread = cx.new(|cx| {
-                AcpThread::new(
-                    "Test",
-                    self.clone(),
-                    project,
-                    action_log,
-                    session_id.clone(),
-                    watch::Receiver::constant(
-                        acp::PromptCapabilities::new()
-                            .image(true)
-                            .audio(true)
-                            .embedded_context(true),
-                    ),
-                    cx,
-                )
-            });
-            self.sessions.lock().insert(
-                session_id,
-                Session {
-                    thread: thread.downgrade(),
-                    response_tx: None,
-                },
-            );
-            Task::ready(Ok(thread))
-        }
-
-        fn authenticate(
-            &self,
-            _method_id: acp::AuthMethodId,
-            _cx: &mut App,
-        ) -> Task<gpui::Result<()>> {
-            unimplemented!()
-        }
-
-        fn prompt(
-            &self,
-            _id: Option<UserMessageId>,
-            params: acp::PromptRequest,
-            cx: &mut App,
-        ) -> Task<gpui::Result<acp::PromptResponse>> {
-            let mut sessions = self.sessions.lock();
-            let Session {
-                thread,
-                response_tx,
-            } = sessions.get_mut(&params.session_id).unwrap();
-            let mut tasks = vec![];
-            if self.next_prompt_updates.lock().is_empty() {
-                let (tx, rx) = oneshot::channel();
-                response_tx.replace(tx);
-                cx.spawn(async move |_| {
-                    let stop_reason = rx.await?;
-                    Ok(acp::PromptResponse::new(stop_reason))
-                })
-            } else {
-                for update in self.next_prompt_updates.lock().drain(..) {
-                    let thread = thread.clone();
-                    let update = update.clone();
-                    let permission_request = if let acp::SessionUpdate::ToolCall(tool_call) =
-                        &update
-                        && let Some(options) = self.permission_requests.get(&tool_call.tool_call_id)
-                    {
-                        Some((tool_call.clone(), options.clone()))
-                    } else {
-                        None
-                    };
-                    let task = cx.spawn(async move |cx| {
-                        if let Some((tool_call, options)) = permission_request {
-                            thread
-                                .update(cx, |thread, cx| {
-                                    thread.request_tool_call_authorization(
-                                        tool_call.clone().into(),
-                                        options.clone(),
-                                        false,
-                                        cx,
-                                    )
-                                })??
-                                .await;
-                        }
-                        thread.update(cx, |thread, cx| {
-                            thread.handle_session_update(update.clone(), cx).unwrap();
-                        })?;
-                        anyhow::Ok(())
-                    });
-                    tasks.push(task);
-                }
-
-                cx.spawn(async move |_| {
-                    try_join_all(tasks).await?;
-                    Ok(acp::PromptResponse::new(acp::StopReason::EndTurn))
-                })
-            }
-        }
-
-        fn cancel(&self, session_id: &acp::SessionId, _cx: &mut App) {
-            if let Some(end_turn_tx) = self
-                .sessions
-                .lock()
-                .get_mut(session_id)
-                .unwrap()
-                .response_tx
-                .take()
-            {
-                end_turn_tx.send(acp::StopReason::Cancelled).unwrap();
-            }
-        }
-
-        fn truncate(
-            &self,
-            _session_id: &agent_client_protocol::SessionId,
-            _cx: &App,
-        ) -> Option<Rc<dyn AgentSessionTruncate>> {
-            Some(Rc::new(StubAgentSessionEditor))
-        }
-
-        fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
-            self
-        }
-    }
-
-    struct StubAgentSessionEditor;
-
-    impl AgentSessionTruncate for StubAgentSessionEditor {
-        fn run(&self, _: UserMessageId, _: &mut App) -> Task<Result<()>> {
-            Task::ready(Ok(()))
-        }
-    }
-}
-
-#[cfg(feature = "test-support")]
-pub use test_support::*;
diff --git a/crates/acp_thread/src/diff.rs b/crates/acp_thread/src/diff.rs
deleted file mode 100644
index f17e9d0fce..0000000000
--- a/crates/acp_thread/src/diff.rs
+++ /dev/null
@@ -1,432 +0,0 @@
-use anyhow::Result;
-use buffer_diff::{BufferDiff, BufferDiffSnapshot};
-use editor::{MultiBuffer, PathKey, multibuffer_context_lines};
-use gpui::{App, AppContext, AsyncApp, Context, Entity, Subscription, Task};
-use itertools::Itertools;
-use language::{
-    Anchor, Buffer, Capability, LanguageRegistry, OffsetRangeExt as _, Point, Rope, TextBuffer,
-};
-use std::{cmp::Reverse, ops::Range, path::Path, sync::Arc};
-use util::ResultExt;
-
-pub enum Diff {
-    Pending(PendingDiff),
-    Finalized(FinalizedDiff),
-}
-
-impl Diff {
-    pub fn finalized(
-        path: String,
-        old_text: Option<String>,
-        new_text: String,
-        language_registry: Arc<LanguageRegistry>,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let multibuffer = cx.new(|_cx| MultiBuffer::without_headers(Capability::ReadOnly));
-        let new_buffer = cx.new(|cx| Buffer::local(new_text, cx));
-        let base_text = old_text.clone().unwrap_or(String::new()).into();
-        let task = cx.spawn({
-            let multibuffer = multibuffer.clone();
-            let path = path.clone();
-            let buffer = new_buffer.clone();
-            async move |_, cx| {
-                let language = language_registry
-                    .load_language_for_file_path(Path::new(&path))
-                    .await
-                    .log_err();
-
-                buffer.update(cx, |buffer, cx| buffer.set_language(language.clone(), cx))?;
-
-                let diff = build_buffer_diff(
-                    old_text.unwrap_or("".into()).into(),
-                    &buffer,
-                    Some(language_registry.clone()),
-                    cx,
-                )
-                .await?;
-
-                multibuffer
-                    .update(cx, |multibuffer, cx| {
-                        let hunk_ranges = {
-                            let buffer = buffer.read(cx);
-                            let diff = diff.read(cx);
-                            diff.hunks_intersecting_range(
-                                Anchor::min_for_buffer(buffer.remote_id())
-                                    ..Anchor::max_for_buffer(buffer.remote_id()),
-                                buffer,
-                                cx,
-                            )
-                            .map(|diff_hunk| diff_hunk.buffer_range.to_point(buffer))
-                            .collect::<Vec<_>>()
-                        };
-
-                        multibuffer.set_excerpts_for_path(
-                            PathKey::for_buffer(&buffer, cx),
-                            buffer.clone(),
-                            hunk_ranges,
-                            multibuffer_context_lines(cx),
-                            cx,
-                        );
-                        multibuffer.add_diff(diff, cx);
-                    })
-                    .log_err();
-
-                anyhow::Ok(())
-            }
-        });
-
-        Self::Finalized(FinalizedDiff {
-            multibuffer,
-            path,
-            base_text,
-            new_buffer,
-            _update_diff: task,
-        })
-    }
-
-    pub fn new(buffer: Entity<Buffer>, cx: &mut Context<Self>) -> Self {
-        let buffer_text_snapshot = buffer.read(cx).text_snapshot();
-        let base_text_snapshot = buffer.read(cx).snapshot();
-        let base_text = base_text_snapshot.text();
-        debug_assert_eq!(buffer_text_snapshot.text(), base_text);
-        let buffer_diff = cx.new(|cx| {
-            let mut diff = BufferDiff::new_unchanged(&buffer_text_snapshot, base_text_snapshot);
-            let snapshot = diff.snapshot(cx);
-            let secondary_diff = cx.new(|cx| {
-                let mut diff = BufferDiff::new(&buffer_text_snapshot, cx);
-                diff.set_snapshot(snapshot, &buffer_text_snapshot, cx);
-                diff
-            });
-            diff.set_secondary_diff(secondary_diff);
-            diff
-        });
-
-        let multibuffer = cx.new(|cx| {
-            let mut multibuffer = MultiBuffer::without_headers(Capability::ReadOnly);
-            multibuffer.add_diff(buffer_diff.clone(), cx);
-            multibuffer
-        });
-
-        Self::Pending(PendingDiff {
-            multibuffer,
-            base_text: Arc::new(base_text),
-            _subscription: cx.observe(&buffer, |this, _, cx| {
-                if let Diff::Pending(diff) = this {
-                    diff.update(cx);
-                }
-            }),
-            new_buffer: buffer,
-            diff: buffer_diff,
-            revealed_ranges: Vec::new(),
-            update_diff: Task::ready(Ok(())),
-        })
-    }
-
-    pub fn reveal_range(&mut self, range: Range<Anchor>, cx: &mut Context<Self>) {
-        if let Self::Pending(diff) = self {
-            diff.reveal_range(range, cx);
-        }
-    }
-
-    pub fn finalize(&mut self, cx: &mut Context<Self>) {
-        if let Self::Pending(diff) = self {
-            *self = Self::Finalized(diff.finalize(cx));
-        }
-    }
-
-    pub fn multibuffer(&self) -> &Entity<MultiBuffer> {
-        match self {
-            Self::Pending(PendingDiff { multibuffer, .. }) => multibuffer,
-            Self::Finalized(FinalizedDiff { multibuffer, .. }) => multibuffer,
-        }
-    }
-
-    pub fn to_markdown(&self, cx: &App) -> String {
-        let buffer_text = self
-            .multibuffer()
-            .read(cx)
-            .all_buffers()
-            .iter()
-            .map(|buffer| buffer.read(cx).text())
-            .join("\n");
-        let path = match self {
-            Diff::Pending(PendingDiff {
-                new_buffer: buffer, ..
-            }) => buffer
-                .read(cx)
-                .file()
-                .map(|file| file.path().display(file.path_style(cx))),
-            Diff::Finalized(FinalizedDiff { path, .. }) => Some(path.as_str().into()),
-        };
-        format!(
-            "Diff: {}\n```\n{}\n```\n",
-            path.unwrap_or("untitled".into()),
-            buffer_text
-        )
-    }
-
-    pub fn has_revealed_range(&self, cx: &App) -> bool {
-        self.multibuffer().read(cx).excerpt_paths().next().is_some()
-    }
-
-    pub fn needs_update(&self, old_text: &str, new_text: &str, cx: &App) -> bool {
-        match self {
-            Diff::Pending(PendingDiff {
-                base_text,
-                new_buffer,
-                ..
-            }) => {
-                base_text.as_str() != old_text
-                    || !new_buffer.read(cx).as_rope().chunks().equals_str(new_text)
-            }
-            Diff::Finalized(FinalizedDiff {
-                base_text,
-                new_buffer,
-                ..
-            }) => {
-                base_text.as_str() != old_text
-                    || !new_buffer.read(cx).as_rope().chunks().equals_str(new_text)
-            }
-        }
-    }
-}
-
-pub struct PendingDiff {
-    multibuffer: Entity<MultiBuffer>,
-    base_text: Arc<String>,
-    new_buffer: Entity<Buffer>,
-    diff: Entity<BufferDiff>,
-    revealed_ranges: Vec<Range<Anchor>>,
-    _subscription: Subscription,
-    update_diff: Task<Result<()>>,
-}
-
-impl PendingDiff {
-    pub fn update(&mut self, cx: &mut Context<Diff>) {
-        let buffer = self.new_buffer.clone();
-        let buffer_diff = self.diff.clone();
-        let base_text = self.base_text.clone();
-        self.update_diff = cx.spawn(async move |diff, cx| {
-            let text_snapshot = buffer.read_with(cx, |buffer, _| buffer.text_snapshot())?;
-            let diff_snapshot = BufferDiff::update_diff(
-                buffer_diff.clone(),
-                text_snapshot.clone(),
-                Some(base_text),
-                false,
-                false,
-                None,
-                None,
-                cx,
-            )
-            .await?;
-            buffer_diff.update(cx, |diff, cx| {
-                diff.set_snapshot(diff_snapshot.clone(), &text_snapshot, cx);
-                diff.secondary_diff().unwrap().update(cx, |diff, cx| {
-                    diff.set_snapshot(diff_snapshot.clone(), &text_snapshot, cx);
-                });
-            })?;
-            diff.update(cx, |diff, cx| {
-                if let Diff::Pending(diff) = diff {
-                    diff.update_visible_ranges(cx);
-                }
-            })
-        });
-    }
-
-    pub fn reveal_range(&mut self, range: Range<Anchor>, cx: &mut Context<Diff>) {
-        self.revealed_ranges.push(range);
-        self.update_visible_ranges(cx);
-    }
-
-    fn finalize(&self, cx: &mut Context<Diff>) -> FinalizedDiff {
-        let ranges = self.excerpt_ranges(cx);
-        let base_text = self.base_text.clone();
-        let new_buffer = self.new_buffer.read(cx);
-        let language_registry = new_buffer.language_registry();
-
-        let path = new_buffer
-            .file()
-            .map(|file| file.path().display(file.path_style(cx)))
-            .unwrap_or("untitled".into())
-            .into();
-        let replica_id = new_buffer.replica_id();
-
-        // Replace the buffer in the multibuffer with the snapshot
-        let buffer = cx.new(|cx| {
-            let language = self.new_buffer.read(cx).language().cloned();
-            let buffer = TextBuffer::new_normalized(
-                replica_id,
-                cx.entity_id().as_non_zero_u64().into(),
-                self.new_buffer.read(cx).line_ending(),
-                self.new_buffer.read(cx).as_rope().clone(),
-            );
-            let mut buffer = Buffer::build(buffer, None, Capability::ReadWrite);
-            buffer.set_language(language, cx);
-            buffer
-        });
-
-        let buffer_diff = cx.spawn({
-            let buffer = buffer.clone();
-            async move |_this, cx| {
-                build_buffer_diff(base_text, &buffer, language_registry, cx).await
-            }
-        });
-
-        let update_diff = cx.spawn(async move |this, cx| {
-            let buffer_diff = buffer_diff.await?;
-            this.update(cx, |this, cx| {
-                this.multibuffer().update(cx, |multibuffer, cx| {
-                    let path_key = PathKey::for_buffer(&buffer, cx);
-                    multibuffer.clear(cx);
-                    multibuffer.set_excerpts_for_path(
-                        path_key,
-                        buffer,
-                        ranges,
-                        multibuffer_context_lines(cx),
-                        cx,
-                    );
-                    multibuffer.add_diff(buffer_diff.clone(), cx);
-                });
-
-                cx.notify();
-            })
-        });
-
-        FinalizedDiff {
-            path,
-            base_text: self.base_text.clone(),
-            multibuffer: self.multibuffer.clone(),
-            new_buffer: self.new_buffer.clone(),
-            _update_diff: update_diff,
-        }
-    }
-
-    fn update_visible_ranges(&mut self, cx: &mut Context<Diff>) {
-        let ranges = self.excerpt_ranges(cx);
-        self.multibuffer.update(cx, |multibuffer, cx| {
-            multibuffer.set_excerpts_for_path(
-                PathKey::for_buffer(&self.new_buffer, cx),
-                self.new_buffer.clone(),
-                ranges,
-                multibuffer_context_lines(cx),
-                cx,
-            );
-            let end = multibuffer.len(cx);
-            Some(multibuffer.snapshot(cx).offset_to_point(end).row + 1)
-        });
-        cx.notify();
-    }
-
-    fn excerpt_ranges(&self, cx: &App) -> Vec<Range<Point>> {
-        let buffer = self.new_buffer.read(cx);
-        let diff = self.diff.read(cx);
-        let mut ranges = diff
-            .hunks_intersecting_range(
-                Anchor::min_for_buffer(buffer.remote_id())
-                    ..Anchor::max_for_buffer(buffer.remote_id()),
-                buffer,
-                cx,
-            )
-            .map(|diff_hunk| diff_hunk.buffer_range.to_point(buffer))
-            .collect::<Vec<_>>();
-        ranges.extend(
-            self.revealed_ranges
-                .iter()
-                .map(|range| range.to_point(buffer)),
-        );
-        ranges.sort_unstable_by_key(|range| (range.start, Reverse(range.end)));
-
-        // Merge adjacent ranges
-        let mut ranges = ranges.into_iter().peekable();
-        let mut merged_ranges = Vec::new();
-        while let Some(mut range) = ranges.next() {
-            while let Some(next_range) = ranges.peek() {
-                if range.end >= next_range.start {
-                    range.end = range.end.max(next_range.end);
-                    ranges.next();
-                } else {
-                    break;
-                }
-            }
-
-            merged_ranges.push(range);
-        }
-        merged_ranges
-    }
-}
-
-pub struct FinalizedDiff {
-    path: String,
-    base_text: Arc<String>,
-    new_buffer: Entity<Buffer>,
-    multibuffer: Entity<MultiBuffer>,
-    _update_diff: Task<Result<()>>,
-}
-
-async fn build_buffer_diff(
-    old_text: Arc<String>,
-    buffer: &Entity<Buffer>,
-    language_registry: Option<Arc<LanguageRegistry>>,
-    cx: &mut AsyncApp,
-) -> Result<Entity<BufferDiff>> {
-    let buffer = cx.update(|cx| buffer.read(cx).snapshot())?;
-
-    let old_text_rope = cx
-        .background_spawn({
-            let old_text = old_text.clone();
-            async move { Rope::from(old_text.as_str()) }
-        })
-        .await;
-    let base_buffer = cx
-        .update(|cx| {
-            Buffer::build_snapshot(
-                old_text_rope,
-                buffer.language().cloned(),
-                language_registry,
-                cx,
-            )
-        })?
-        .await;
-
-    let diff_snapshot = cx
-        .update(|cx| {
-            BufferDiffSnapshot::new_with_base_buffer(
-                buffer.text.clone(),
-                Some(old_text),
-                base_buffer,
-                cx,
-            )
-        })?
-        .await;
-
-    let secondary_diff = cx.new(|cx| {
-        let mut diff = BufferDiff::new(&buffer, cx);
-        diff.set_snapshot(diff_snapshot.clone(), &buffer, cx);
-        diff
-    })?;
-
-    cx.new(|cx| {
-        let mut diff = BufferDiff::new(&buffer.text, cx);
-        diff.set_snapshot(diff_snapshot, &buffer, cx);
-        diff.set_secondary_diff(secondary_diff);
-        diff
-    })
-}
-
-#[cfg(test)]
-mod tests {
-    use gpui::{AppContext as _, TestAppContext};
-    use language::Buffer;
-
-    use crate::Diff;
-
-    #[gpui::test]
-    async fn test_pending_diff(cx: &mut TestAppContext) {
-        let buffer = cx.new(|cx| Buffer::local("hello!", cx));
-        let _diff = cx.new(|cx| Diff::new(buffer.clone(), cx));
-        buffer.update(cx, |buffer, cx| {
-            buffer.set_text("HELLO!", cx);
-        });
-        cx.run_until_parked();
-    }
-}
diff --git a/crates/acp_thread/src/mention.rs b/crates/acp_thread/src/mention.rs
deleted file mode 100644
index c1b7032cfa..0000000000
--- a/crates/acp_thread/src/mention.rs
+++ /dev/null
@@ -1,551 +0,0 @@
-use agent_client_protocol as acp;
-use anyhow::{Context as _, Result, bail};
-use file_icons::FileIcons;
-use prompt_store::{PromptId, UserPromptId};
-use serde::{Deserialize, Serialize};
-use std::{
-    fmt,
-    ops::RangeInclusive,
-    path::{Path, PathBuf},
-};
-use ui::{App, IconName, SharedString};
-use url::Url;
-use util::paths::PathStyle;
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Hash)]
-pub enum MentionUri {
-    File {
-        abs_path: PathBuf,
-    },
-    PastedImage,
-    Directory {
-        abs_path: PathBuf,
-    },
-    Symbol {
-        abs_path: PathBuf,
-        name: String,
-        line_range: RangeInclusive<u32>,
-    },
-    Thread {
-        id: acp::SessionId,
-        name: String,
-    },
-    TextThread {
-        path: PathBuf,
-        name: String,
-    },
-    Rule {
-        id: PromptId,
-        name: String,
-    },
-    Selection {
-        #[serde(default, skip_serializing_if = "Option::is_none")]
-        abs_path: Option<PathBuf>,
-        line_range: RangeInclusive<u32>,
-    },
-    Fetch {
-        url: Url,
-    },
-}
-
-impl MentionUri {
-    pub fn parse(input: &str, path_style: PathStyle) -> Result<Self> {
-        fn parse_line_range(fragment: &str) -> Result<RangeInclusive<u32>> {
-            let range = fragment
-                .strip_prefix("L")
-                .context("Line range must start with \"L\"")?;
-            let (start, end) = range
-                .split_once(":")
-                .context("Line range must use colon as separator")?;
-            let range = start
-                .parse::<u32>()
-                .context("Parsing line range start")?
-                .checked_sub(1)
-                .context("Line numbers should be 1-based")?
-                ..=end
-                    .parse::<u32>()
-                    .context("Parsing line range end")?
-                    .checked_sub(1)
-                    .context("Line numbers should be 1-based")?;
-            Ok(range)
-        }
-
-        let url = url::Url::parse(input)?;
-        let path = url.path();
-        match url.scheme() {
-            "file" => {
-                let path = if path_style.is_windows() {
-                    path.trim_start_matches("/")
-                } else {
-                    path
-                };
-
-                if let Some(fragment) = url.fragment() {
-                    let line_range = parse_line_range(fragment)?;
-                    if let Some(name) = single_query_param(&url, "symbol")? {
-                        Ok(Self::Symbol {
-                            name,
-                            abs_path: path.into(),
-                            line_range,
-                        })
-                    } else {
-                        Ok(Self::Selection {
-                            abs_path: Some(path.into()),
-                            line_range,
-                        })
-                    }
-                } else if input.ends_with("/") {
-                    Ok(Self::Directory {
-                        abs_path: path.into(),
-                    })
-                } else {
-                    Ok(Self::File {
-                        abs_path: path.into(),
-                    })
-                }
-            }
-            "zed" => {
-                if let Some(thread_id) = path.strip_prefix("/agent/thread/") {
-                    let name = single_query_param(&url, "name")?.context("Missing thread name")?;
-                    Ok(Self::Thread {
-                        id: acp::SessionId::new(thread_id),
-                        name,
-                    })
-                } else if let Some(path) = path.strip_prefix("/agent/text-thread/") {
-                    let name = single_query_param(&url, "name")?.context("Missing thread name")?;
-                    Ok(Self::TextThread {
-                        path: path.into(),
-                        name,
-                    })
-                } else if let Some(rule_id) = path.strip_prefix("/agent/rule/") {
-                    let name = single_query_param(&url, "name")?.context("Missing rule name")?;
-                    let rule_id = UserPromptId(rule_id.parse()?);
-                    Ok(Self::Rule {
-                        id: rule_id.into(),
-                        name,
-                    })
-                } else if path.starts_with("/agent/pasted-image") {
-                    Ok(Self::PastedImage)
-                } else if path.starts_with("/agent/untitled-buffer") {
-                    let fragment = url
-                        .fragment()
-                        .context("Missing fragment for untitled buffer selection")?;
-                    let line_range = parse_line_range(fragment)?;
-                    Ok(Self::Selection {
-                        abs_path: None,
-                        line_range,
-                    })
-                } else if let Some(name) = path.strip_prefix("/agent/symbol/") {
-                    let fragment = url
-                        .fragment()
-                        .context("Missing fragment for untitled buffer selection")?;
-                    let line_range = parse_line_range(fragment)?;
-                    let path =
-                        single_query_param(&url, "path")?.context("Missing path for symbol")?;
-                    Ok(Self::Symbol {
-                        name: name.to_string(),
-                        abs_path: path.into(),
-                        line_range,
-                    })
-                } else if path.starts_with("/agent/file") {
-                    let path =
-                        single_query_param(&url, "path")?.context("Missing path for file")?;
-                    Ok(Self::File {
-                        abs_path: path.into(),
-                    })
-                } else if path.starts_with("/agent/directory") {
-                    let path =
-                        single_query_param(&url, "path")?.context("Missing path for directory")?;
-                    Ok(Self::Directory {
-                        abs_path: path.into(),
-                    })
-                } else if path.starts_with("/agent/selection") {
-                    let fragment = url.fragment().context("Missing fragment for selection")?;
-                    let line_range = parse_line_range(fragment)?;
-                    let path =
-                        single_query_param(&url, "path")?.context("Missing path for selection")?;
-                    Ok(Self::Selection {
-                        abs_path: Some(path.into()),
-                        line_range,
-                    })
-                } else {
-                    bail!("invalid zed url: {:?}", input);
-                }
-            }
-            "http" | "https" => Ok(MentionUri::Fetch { url }),
-            other => bail!("unrecognized scheme {:?}", other),
-        }
-    }
-
-    pub fn name(&self) -> String {
-        match self {
-            MentionUri::File { abs_path, .. } | MentionUri::Directory { abs_path, .. } => abs_path
-                .file_name()
-                .unwrap_or_default()
-                .to_string_lossy()
-                .into_owned(),
-            MentionUri::PastedImage => "Image".to_string(),
-            MentionUri::Symbol { name, .. } => name.clone(),
-            MentionUri::Thread { name, .. } => name.clone(),
-            MentionUri::TextThread { name, .. } => name.clone(),
-            MentionUri::Rule { name, .. } => name.clone(),
-            MentionUri::Selection {
-                abs_path: path,
-                line_range,
-                ..
-            } => selection_name(path.as_deref(), line_range),
-            MentionUri::Fetch { url } => url.to_string(),
-        }
-    }
-
-    pub fn icon_path(&self, cx: &mut App) -> SharedString {
-        match self {
-            MentionUri::File { abs_path } => {
-                FileIcons::get_icon(abs_path, cx).unwrap_or_else(|| IconName::File.path().into())
-            }
-            MentionUri::PastedImage => IconName::Image.path().into(),
-            MentionUri::Directory { abs_path } => FileIcons::get_folder_icon(false, abs_path, cx)
-                .unwrap_or_else(|| IconName::Folder.path().into()),
-            MentionUri::Symbol { .. } => IconName::Code.path().into(),
-            MentionUri::Thread { .. } => IconName::Thread.path().into(),
-            MentionUri::TextThread { .. } => IconName::Thread.path().into(),
-            MentionUri::Rule { .. } => IconName::Reader.path().into(),
-            MentionUri::Selection { .. } => IconName::Reader.path().into(),
-            MentionUri::Fetch { .. } => IconName::ToolWeb.path().into(),
-        }
-    }
-
-    pub fn as_link<'a>(&'a self) -> MentionLink<'a> {
-        MentionLink(self)
-    }
-
-    pub fn to_uri(&self) -> Url {
-        match self {
-            MentionUri::File { abs_path } => {
-                let mut url = Url::parse("file:///").unwrap();
-                url.set_path(&abs_path.to_string_lossy());
-                url
-            }
-            MentionUri::PastedImage => Url::parse("zed:///agent/pasted-image").unwrap(),
-            MentionUri::Directory { abs_path } => {
-                let mut url = Url::parse("file:///").unwrap();
-                url.set_path(&abs_path.to_string_lossy());
-                url
-            }
-            MentionUri::Symbol {
-                abs_path,
-                name,
-                line_range,
-            } => {
-                let mut url = Url::parse("file:///").unwrap();
-                url.set_path(&abs_path.to_string_lossy());
-                url.query_pairs_mut().append_pair("symbol", name);
-                url.set_fragment(Some(&format!(
-                    "L{}:{}",
-                    line_range.start() + 1,
-                    line_range.end() + 1
-                )));
-                url
-            }
-            MentionUri::Selection {
-                abs_path,
-                line_range,
-            } => {
-                let mut url = if let Some(path) = abs_path {
-                    let mut url = Url::parse("file:///").unwrap();
-                    url.set_path(&path.to_string_lossy());
-                    url
-                } else {
-                    let mut url = Url::parse("zed:///").unwrap();
-                    url.set_path("/agent/untitled-buffer");
-                    url
-                };
-                url.set_fragment(Some(&format!(
-                    "L{}:{}",
-                    line_range.start() + 1,
-                    line_range.end() + 1
-                )));
-                url
-            }
-            MentionUri::Thread { name, id } => {
-                let mut url = Url::parse("zed:///").unwrap();
-                url.set_path(&format!("/agent/thread/{id}"));
-                url.query_pairs_mut().append_pair("name", name);
-                url
-            }
-            MentionUri::TextThread { path, name } => {
-                let mut url = Url::parse("zed:///").unwrap();
-                url.set_path(&format!(
-                    "/agent/text-thread/{}",
-                    path.to_string_lossy().trim_start_matches('/')
-                ));
-                url.query_pairs_mut().append_pair("name", name);
-                url
-            }
-            MentionUri::Rule { name, id } => {
-                let mut url = Url::parse("zed:///").unwrap();
-                url.set_path(&format!("/agent/rule/{id}"));
-                url.query_pairs_mut().append_pair("name", name);
-                url
-            }
-            MentionUri::Fetch { url } => url.clone(),
-        }
-    }
-}
-
-pub struct MentionLink<'a>(&'a MentionUri);
-
-impl fmt::Display for MentionLink<'_> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "[@{}]({})", self.0.name(), self.0.to_uri())
-    }
-}
-
-fn single_query_param(url: &Url, name: &'static str) -> Result<Option<String>> {
-    let pairs = url.query_pairs().collect::<Vec<_>>();
-    match pairs.as_slice() {
-        [] => Ok(None),
-        [(k, v)] => {
-            if k != name {
-                bail!("invalid query parameter")
-            }
-
-            Ok(Some(v.to_string()))
-        }
-        _ => bail!("too many query pairs"),
-    }
-}
-
-pub fn selection_name(path: Option<&Path>, line_range: &RangeInclusive<u32>) -> String {
-    format!(
-        "{} ({}:{})",
-        path.and_then(|path| path.file_name())
-            .unwrap_or("Untitled".as_ref())
-            .display(),
-        *line_range.start() + 1,
-        *line_range.end() + 1
-    )
-}
-
-#[cfg(test)]
-mod tests {
-    use util::{path, uri};
-
-    use super::*;
-
-    #[test]
-    fn test_parse_file_uri() {
-        let file_uri = uri!("file:///path/to/file.rs");
-        let parsed = MentionUri::parse(file_uri, PathStyle::local()).unwrap();
-        match &parsed {
-            MentionUri::File { abs_path } => {
-                assert_eq!(abs_path, Path::new(path!("/path/to/file.rs")));
-            }
-            _ => panic!("Expected File variant"),
-        }
-        assert_eq!(parsed.to_uri().to_string(), file_uri);
-    }
-
-    #[test]
-    fn test_parse_directory_uri() {
-        let file_uri = uri!("file:///path/to/dir/");
-        let parsed = MentionUri::parse(file_uri, PathStyle::local()).unwrap();
-        match &parsed {
-            MentionUri::Directory { abs_path } => {
-                assert_eq!(abs_path, Path::new(path!("/path/to/dir/")));
-            }
-            _ => panic!("Expected Directory variant"),
-        }
-        assert_eq!(parsed.to_uri().to_string(), file_uri);
-    }
-
-    #[test]
-    fn test_to_directory_uri_without_slash() {
-        let uri = MentionUri::Directory {
-            abs_path: PathBuf::from(path!("/path/to/dir/")),
-        };
-        let expected = uri!("file:///path/to/dir/");
-        assert_eq!(uri.to_uri().to_string(), expected);
-    }
-
-    #[test]
-    fn test_parse_symbol_uri() {
-        let symbol_uri = uri!("file:///path/to/file.rs?symbol=MySymbol#L10:20");
-        let parsed = MentionUri::parse(symbol_uri, PathStyle::local()).unwrap();
-        match &parsed {
-            MentionUri::Symbol {
-                abs_path: path,
-                name,
-                line_range,
-            } => {
-                assert_eq!(path, Path::new(path!("/path/to/file.rs")));
-                assert_eq!(name, "MySymbol");
-                assert_eq!(line_range.start(), &9);
-                assert_eq!(line_range.end(), &19);
-            }
-            _ => panic!("Expected Symbol variant"),
-        }
-        assert_eq!(parsed.to_uri().to_string(), symbol_uri);
-    }
-
-    #[test]
-    fn test_parse_selection_uri() {
-        let selection_uri = uri!("file:///path/to/file.rs#L5:15");
-        let parsed = MentionUri::parse(selection_uri, PathStyle::local()).unwrap();
-        match &parsed {
-            MentionUri::Selection {
-                abs_path: path,
-                line_range,
-            } => {
-                assert_eq!(path.as_ref().unwrap(), Path::new(path!("/path/to/file.rs")));
-                assert_eq!(line_range.start(), &4);
-                assert_eq!(line_range.end(), &14);
-            }
-            _ => panic!("Expected Selection variant"),
-        }
-        assert_eq!(parsed.to_uri().to_string(), selection_uri);
-    }
-
-    #[test]
-    fn test_parse_untitled_selection_uri() {
-        let selection_uri = uri!("zed:///agent/untitled-buffer#L1:10");
-        let parsed = MentionUri::parse(selection_uri, PathStyle::local()).unwrap();
-        match &parsed {
-            MentionUri::Selection {
-                abs_path: None,
-                line_range,
-            } => {
-                assert_eq!(line_range.start(), &0);
-                assert_eq!(line_range.end(), &9);
-            }
-            _ => panic!("Expected Selection variant without path"),
-        }
-        assert_eq!(parsed.to_uri().to_string(), selection_uri);
-    }
-
-    #[test]
-    fn test_parse_thread_uri() {
-        let thread_uri = "zed:///agent/thread/session123?name=Thread+name";
-        let parsed = MentionUri::parse(thread_uri, PathStyle::local()).unwrap();
-        match &parsed {
-            MentionUri::Thread {
-                id: thread_id,
-                name,
-            } => {
-                assert_eq!(thread_id.to_string(), "session123");
-                assert_eq!(name, "Thread name");
-            }
-            _ => panic!("Expected Thread variant"),
-        }
-        assert_eq!(parsed.to_uri().to_string(), thread_uri);
-    }
-
-    #[test]
-    fn test_parse_rule_uri() {
-        let rule_uri = "zed:///agent/rule/d8694ff2-90d5-4b6f-be33-33c1763acd52?name=Some+rule";
-        let parsed = MentionUri::parse(rule_uri, PathStyle::local()).unwrap();
-        match &parsed {
-            MentionUri::Rule { id, name } => {
-                assert_eq!(id.to_string(), "d8694ff2-90d5-4b6f-be33-33c1763acd52");
-                assert_eq!(name, "Some rule");
-            }
-            _ => panic!("Expected Rule variant"),
-        }
-        assert_eq!(parsed.to_uri().to_string(), rule_uri);
-    }
-
-    #[test]
-    fn test_parse_fetch_http_uri() {
-        let http_uri = "http://example.com/path?query=value#fragment";
-        let parsed = MentionUri::parse(http_uri, PathStyle::local()).unwrap();
-        match &parsed {
-            MentionUri::Fetch { url } => {
-                assert_eq!(url.to_string(), http_uri);
-            }
-            _ => panic!("Expected Fetch variant"),
-        }
-        assert_eq!(parsed.to_uri().to_string(), http_uri);
-    }
-
-    #[test]
-    fn test_parse_fetch_https_uri() {
-        let https_uri = "https://example.com/api/endpoint";
-        let parsed = MentionUri::parse(https_uri, PathStyle::local()).unwrap();
-        match &parsed {
-            MentionUri::Fetch { url } => {
-                assert_eq!(url.to_string(), https_uri);
-            }
-            _ => panic!("Expected Fetch variant"),
-        }
-        assert_eq!(parsed.to_uri().to_string(), https_uri);
-    }
-
-    #[test]
-    fn test_invalid_scheme() {
-        assert!(MentionUri::parse("ftp://example.com", PathStyle::local()).is_err());
-        assert!(MentionUri::parse("ssh://example.com", PathStyle::local()).is_err());
-        assert!(MentionUri::parse("unknown://example.com", PathStyle::local()).is_err());
-    }
-
-    #[test]
-    fn test_invalid_zed_path() {
-        assert!(MentionUri::parse("zed:///invalid/path", PathStyle::local()).is_err());
-        assert!(MentionUri::parse("zed:///agent/unknown/test", PathStyle::local()).is_err());
-    }
-
-    #[test]
-    fn test_invalid_line_range_format() {
-        // Missing L prefix
-        assert!(
-            MentionUri::parse(uri!("file:///path/to/file.rs#10:20"), PathStyle::local()).is_err()
-        );
-
-        // Missing colon separator
-        assert!(
-            MentionUri::parse(uri!("file:///path/to/file.rs#L1020"), PathStyle::local()).is_err()
-        );
-
-        // Invalid numbers
-        assert!(
-            MentionUri::parse(uri!("file:///path/to/file.rs#L10:abc"), PathStyle::local()).is_err()
-        );
-        assert!(
-            MentionUri::parse(uri!("file:///path/to/file.rs#Labc:20"), PathStyle::local()).is_err()
-        );
-    }
-
-    #[test]
-    fn test_invalid_query_parameters() {
-        // Invalid query parameter name
-        assert!(
-            MentionUri::parse(
-                uri!("file:///path/to/file.rs#L10:20?invalid=test"),
-                PathStyle::local()
-            )
-            .is_err()
-        );
-
-        // Too many query parameters
-        assert!(
-            MentionUri::parse(
-                uri!("file:///path/to/file.rs#L10:20?symbol=test&another=param"),
-                PathStyle::local()
-            )
-            .is_err()
-        );
-    }
-
-    #[test]
-    fn test_zero_based_line_numbers() {
-        // Test that 0-based line numbers are rejected (should be 1-based)
-        assert!(
-            MentionUri::parse(uri!("file:///path/to/file.rs#L0:10"), PathStyle::local()).is_err()
-        );
-        assert!(
-            MentionUri::parse(uri!("file:///path/to/file.rs#L1:0"), PathStyle::local()).is_err()
-        );
-        assert!(
-            MentionUri::parse(uri!("file:///path/to/file.rs#L0:0"), PathStyle::local()).is_err()
-        );
-    }
-}
diff --git a/crates/acp_thread/src/terminal.rs b/crates/acp_thread/src/terminal.rs
deleted file mode 100644
index 2da4125209..0000000000
--- a/crates/acp_thread/src/terminal.rs
+++ /dev/null
@@ -1,224 +0,0 @@
-use agent_client_protocol as acp;
-use anyhow::Result;
-use futures::{FutureExt as _, future::Shared};
-use gpui::{App, AppContext, AsyncApp, Context, Entity, Task};
-use language::LanguageRegistry;
-use markdown::Markdown;
-use project::Project;
-use std::{path::PathBuf, process::ExitStatus, sync::Arc, time::Instant};
-use task::Shell;
-use util::get_default_system_shell_preferring_bash;
-
-pub struct Terminal {
-    id: acp::TerminalId,
-    command: Entity<Markdown>,
-    working_dir: Option<PathBuf>,
-    terminal: Entity<terminal::Terminal>,
-    started_at: Instant,
-    output: Option<TerminalOutput>,
-    output_byte_limit: Option<usize>,
-    _output_task: Shared<Task<acp::TerminalExitStatus>>,
-}
-
-pub struct TerminalOutput {
-    pub ended_at: Instant,
-    pub exit_status: Option<ExitStatus>,
-    pub content: String,
-    pub original_content_len: usize,
-    pub content_line_count: usize,
-}
-
-impl Terminal {
-    pub fn new(
-        id: acp::TerminalId,
-        command_label: &str,
-        working_dir: Option<PathBuf>,
-        output_byte_limit: Option<usize>,
-        terminal: Entity<terminal::Terminal>,
-        language_registry: Arc<LanguageRegistry>,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let command_task = terminal.read(cx).wait_for_completed_task(cx);
-        Self {
-            id,
-            command: cx.new(|cx| {
-                Markdown::new(
-                    format!("```\n{}\n```", command_label).into(),
-                    Some(language_registry.clone()),
-                    None,
-                    cx,
-                )
-            }),
-            working_dir,
-            terminal,
-            started_at: Instant::now(),
-            output: None,
-            output_byte_limit,
-            _output_task: cx
-                .spawn(async move |this, cx| {
-                    let exit_status = command_task.await;
-
-                    this.update(cx, |this, cx| {
-                        let (content, original_content_len) = this.truncated_output(cx);
-                        let content_line_count = this.terminal.read(cx).total_lines();
-
-                        this.output = Some(TerminalOutput {
-                            ended_at: Instant::now(),
-                            exit_status,
-                            content,
-                            original_content_len,
-                            content_line_count,
-                        });
-                        cx.notify();
-                    })
-                    .ok();
-
-                    let exit_status = exit_status.map(portable_pty::ExitStatus::from);
-
-                    acp::TerminalExitStatus::new()
-                        .exit_code(exit_status.as_ref().map(|e| e.exit_code()))
-                        .signal(exit_status.and_then(|e| e.signal().map(ToOwned::to_owned)))
-                })
-                .shared(),
-        }
-    }
-
-    pub fn id(&self) -> &acp::TerminalId {
-        &self.id
-    }
-
-    pub fn wait_for_exit(&self) -> Shared<Task<acp::TerminalExitStatus>> {
-        self._output_task.clone()
-    }
-
-    pub fn kill(&mut self, cx: &mut App) {
-        self.terminal.update(cx, |terminal, _cx| {
-            terminal.kill_active_task();
-        });
-    }
-
-    pub fn current_output(&self, cx: &App) -> acp::TerminalOutputResponse {
-        if let Some(output) = self.output.as_ref() {
-            let exit_status = output.exit_status.map(portable_pty::ExitStatus::from);
-
-            acp::TerminalOutputResponse::new(
-                output.content.clone(),
-                output.original_content_len > output.content.len(),
-            )
-            .exit_status(
-                acp::TerminalExitStatus::new()
-                    .exit_code(exit_status.as_ref().map(|e| e.exit_code()))
-                    .signal(exit_status.and_then(|e| e.signal().map(ToOwned::to_owned))),
-            )
-        } else {
-            let (current_content, original_len) = self.truncated_output(cx);
-            let truncated = current_content.len() < original_len;
-            acp::TerminalOutputResponse::new(current_content, truncated)
-        }
-    }
-
-    fn truncated_output(&self, cx: &App) -> (String, usize) {
-        let terminal = self.terminal.read(cx);
-        let mut content = terminal.get_content();
-
-        let original_content_len = content.len();
-
-        if let Some(limit) = self.output_byte_limit
-            && content.len() > limit
-        {
-            let mut end_ix = limit.min(content.len());
-            while !content.is_char_boundary(end_ix) {
-                end_ix -= 1;
-            }
-            // Don't truncate mid-line, clear the remainder of the last line
-            end_ix = content[..end_ix].rfind('\n').unwrap_or(end_ix);
-            content.truncate(end_ix);
-        }
-
-        (content, original_content_len)
-    }
-
-    pub fn command(&self) -> &Entity<Markdown> {
-        &self.command
-    }
-
-    pub fn working_dir(&self) -> &Option<PathBuf> {
-        &self.working_dir
-    }
-
-    pub fn started_at(&self) -> Instant {
-        self.started_at
-    }
-
-    pub fn output(&self) -> Option<&TerminalOutput> {
-        self.output.as_ref()
-    }
-
-    pub fn inner(&self) -> &Entity<terminal::Terminal> {
-        &self.terminal
-    }
-
-    pub fn to_markdown(&self, cx: &App) -> String {
-        format!(
-            "Terminal:\n```\n{}\n```\n",
-            self.terminal.read(cx).get_content()
-        )
-    }
-}
-
-pub async fn create_terminal_entity(
-    command: String,
-    args: &[String],
-    env_vars: Vec<(String, String)>,
-    cwd: Option<PathBuf>,
-    project: &Entity<Project>,
-    cx: &mut AsyncApp,
-) -> Result<Entity<terminal::Terminal>> {
-    let mut env = if let Some(dir) = &cwd {
-        project
-            .update(cx, |project, cx| {
-                project.environment().update(cx, |env, cx| {
-                    env.directory_environment(dir.clone().into(), cx)
-                })
-            })?
-            .await
-            .unwrap_or_default()
-    } else {
-        Default::default()
-    };
-
-    // Disables paging for `git` and hopefully other commands
-    env.insert("PAGER".into(), "".into());
-    env.extend(env_vars);
-
-    // Use remote shell or default system shell, as appropriate
-    let shell = project
-        .update(cx, |project, cx| {
-            project
-                .remote_client()
-                .and_then(|r| r.read(cx).default_system_shell())
-                .map(Shell::Program)
-        })?
-        .unwrap_or_else(|| Shell::Program(get_default_system_shell_preferring_bash()));
-    let is_windows = project
-        .read_with(cx, |project, cx| project.path_style(cx).is_windows())
-        .unwrap_or(cfg!(windows));
-    let (task_command, task_args) = task::ShellBuilder::new(&shell, is_windows)
-        .redirect_stdin_to_dev_null()
-        .build(Some(command.clone()), &args);
-
-    project
-        .update(cx, |project, cx| {
-            project.create_terminal_task(
-                task::SpawnInTerminal {
-                    command: Some(task_command),
-                    args: task_args,
-                    cwd,
-                    env,
-                    ..Default::default()
-                },
-                cx,
-            )
-        })?
-        .await
-}
diff --git a/crates/acp_tools/Cargo.toml b/crates/acp_tools/Cargo.toml
deleted file mode 100644
index 0720c4b668..0000000000
--- a/crates/acp_tools/Cargo.toml
+++ /dev/null
@@ -1,29 +0,0 @@
-[package]
-name = "acp_tools"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/acp_tools.rs"
-doctest = false
-
-[dependencies]
-agent-client-protocol.workspace = true
-collections.workspace = true
-gpui.workspace = true
-language.workspace= true
-markdown.workspace = true
-project.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-theme.workspace = true
-ui.workspace = true
-util.workspace = true
-workspace.workspace = true
diff --git a/crates/acp_tools/LICENSE-GPL b/crates/acp_tools/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/acp_tools/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/acp_tools/src/acp_tools.rs b/crates/acp_tools/src/acp_tools.rs
deleted file mode 100644
index 0905effce3..0000000000
--- a/crates/acp_tools/src/acp_tools.rs
+++ /dev/null
@@ -1,643 +0,0 @@
-use std::{
-    cell::RefCell,
-    collections::HashSet,
-    fmt::Display,
-    rc::{Rc, Weak},
-    sync::Arc,
-    time::Duration,
-};
-
-use agent_client_protocol as acp;
-use collections::HashMap;
-use gpui::{
-    App, ClipboardItem, Empty, Entity, EventEmitter, FocusHandle, Focusable, Global, ListAlignment,
-    ListState, StyleRefinement, Subscription, Task, TextStyleRefinement, Window, actions, list,
-    prelude::*,
-};
-use language::LanguageRegistry;
-use markdown::{CodeBlockRenderer, Markdown, MarkdownElement, MarkdownStyle};
-use project::Project;
-use settings::Settings;
-use theme::ThemeSettings;
-use ui::{Tooltip, WithScrollbar, prelude::*};
-use util::ResultExt as _;
-use workspace::{
-    Item, ItemHandle, ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView, Workspace,
-};
-
-actions!(dev, [OpenAcpLogs]);
-
-pub fn init(cx: &mut App) {
-    cx.observe_new(
-        |workspace: &mut Workspace, _window, _cx: &mut Context<Workspace>| {
-            workspace.register_action(|workspace, _: &OpenAcpLogs, window, cx| {
-                let acp_tools =
-                    Box::new(cx.new(|cx| AcpTools::new(workspace.project().clone(), cx)));
-                workspace.add_item_to_active_pane(acp_tools, None, true, window, cx);
-            });
-        },
-    )
-    .detach();
-}
-
-struct GlobalAcpConnectionRegistry(Entity<AcpConnectionRegistry>);
-
-impl Global for GlobalAcpConnectionRegistry {}
-
-#[derive(Default)]
-pub struct AcpConnectionRegistry {
-    active_connection: RefCell<Option<ActiveConnection>>,
-}
-
-struct ActiveConnection {
-    server_name: SharedString,
-    connection: Weak<acp::ClientSideConnection>,
-}
-
-impl AcpConnectionRegistry {
-    pub fn default_global(cx: &mut App) -> Entity<Self> {
-        if cx.has_global::<GlobalAcpConnectionRegistry>() {
-            cx.global::<GlobalAcpConnectionRegistry>().0.clone()
-        } else {
-            let registry = cx.new(|_cx| AcpConnectionRegistry::default());
-            cx.set_global(GlobalAcpConnectionRegistry(registry.clone()));
-            registry
-        }
-    }
-
-    pub fn set_active_connection(
-        &self,
-        server_name: impl Into<SharedString>,
-        connection: &Rc<acp::ClientSideConnection>,
-        cx: &mut Context<Self>,
-    ) {
-        self.active_connection.replace(Some(ActiveConnection {
-            server_name: server_name.into(),
-            connection: Rc::downgrade(connection),
-        }));
-        cx.notify();
-    }
-}
-
-struct AcpTools {
-    project: Entity<Project>,
-    focus_handle: FocusHandle,
-    expanded: HashSet<usize>,
-    watched_connection: Option<WatchedConnection>,
-    connection_registry: Entity<AcpConnectionRegistry>,
-    _subscription: Subscription,
-}
-
-struct WatchedConnection {
-    server_name: SharedString,
-    messages: Vec<WatchedConnectionMessage>,
-    list_state: ListState,
-    connection: Weak<acp::ClientSideConnection>,
-    incoming_request_methods: HashMap<acp::RequestId, Arc<str>>,
-    outgoing_request_methods: HashMap<acp::RequestId, Arc<str>>,
-    _task: Task<()>,
-}
-
-impl AcpTools {
-    fn new(project: Entity<Project>, cx: &mut Context<Self>) -> Self {
-        let connection_registry = AcpConnectionRegistry::default_global(cx);
-
-        let subscription = cx.observe(&connection_registry, |this, _, cx| {
-            this.update_connection(cx);
-            cx.notify();
-        });
-
-        let mut this = Self {
-            project,
-            focus_handle: cx.focus_handle(),
-            expanded: HashSet::default(),
-            watched_connection: None,
-            connection_registry,
-            _subscription: subscription,
-        };
-        this.update_connection(cx);
-        this
-    }
-
-    fn update_connection(&mut self, cx: &mut Context<Self>) {
-        let active_connection = self.connection_registry.read(cx).active_connection.borrow();
-        let Some(active_connection) = active_connection.as_ref() else {
-            return;
-        };
-
-        if let Some(watched_connection) = self.watched_connection.as_ref() {
-            if Weak::ptr_eq(
-                &watched_connection.connection,
-                &active_connection.connection,
-            ) {
-                return;
-            }
-        }
-
-        if let Some(connection) = active_connection.connection.upgrade() {
-            let mut receiver = connection.subscribe();
-            let task = cx.spawn(async move |this, cx| {
-                while let Ok(message) = receiver.recv().await {
-                    this.update(cx, |this, cx| {
-                        this.push_stream_message(message, cx);
-                    })
-                    .ok();
-                }
-            });
-
-            self.watched_connection = Some(WatchedConnection {
-                server_name: active_connection.server_name.clone(),
-                messages: vec![],
-                list_state: ListState::new(0, ListAlignment::Bottom, px(2048.)),
-                connection: active_connection.connection.clone(),
-                incoming_request_methods: HashMap::default(),
-                outgoing_request_methods: HashMap::default(),
-                _task: task,
-            });
-        }
-    }
-
-    fn push_stream_message(&mut self, stream_message: acp::StreamMessage, cx: &mut Context<Self>) {
-        let Some(connection) = self.watched_connection.as_mut() else {
-            return;
-        };
-        let language_registry = self.project.read(cx).languages().clone();
-        let index = connection.messages.len();
-
-        let (request_id, method, message_type, params) = match stream_message.message {
-            acp::StreamMessageContent::Request { id, method, params } => {
-                let method_map = match stream_message.direction {
-                    acp::StreamMessageDirection::Incoming => {
-                        &mut connection.incoming_request_methods
-                    }
-                    acp::StreamMessageDirection::Outgoing => {
-                        &mut connection.outgoing_request_methods
-                    }
-                };
-
-                method_map.insert(id.clone(), method.clone());
-                (Some(id), method.into(), MessageType::Request, Ok(params))
-            }
-            acp::StreamMessageContent::Response { id, result } => {
-                let method_map = match stream_message.direction {
-                    acp::StreamMessageDirection::Incoming => {
-                        &mut connection.outgoing_request_methods
-                    }
-                    acp::StreamMessageDirection::Outgoing => {
-                        &mut connection.incoming_request_methods
-                    }
-                };
-
-                if let Some(method) = method_map.remove(&id) {
-                    (Some(id), method.into(), MessageType::Response, result)
-                } else {
-                    (
-                        Some(id),
-                        "[unrecognized response]".into(),
-                        MessageType::Response,
-                        result,
-                    )
-                }
-            }
-            acp::StreamMessageContent::Notification { method, params } => {
-                (None, method.into(), MessageType::Notification, Ok(params))
-            }
-        };
-
-        let message = WatchedConnectionMessage {
-            name: method,
-            message_type,
-            request_id,
-            direction: stream_message.direction,
-            collapsed_params_md: match params.as_ref() {
-                Ok(params) => params
-                    .as_ref()
-                    .map(|params| collapsed_params_md(params, &language_registry, cx)),
-                Err(err) => {
-                    if let Ok(err) = &serde_json::to_value(err) {
-                        Some(collapsed_params_md(&err, &language_registry, cx))
-                    } else {
-                        None
-                    }
-                }
-            },
-
-            expanded_params_md: None,
-            params,
-        };
-
-        connection.messages.push(message);
-        connection.list_state.splice(index..index, 1);
-        cx.notify();
-    }
-
-    fn serialize_observed_messages(&self) -> Option<String> {
-        let connection = self.watched_connection.as_ref()?;
-
-        let messages: Vec<serde_json::Value> = connection
-            .messages
-            .iter()
-            .filter_map(|message| {
-                let params = match &message.params {
-                    Ok(Some(params)) => params.clone(),
-                    Ok(None) => serde_json::Value::Null,
-                    Err(err) => serde_json::to_value(err).ok()?,
-                };
-                Some(serde_json::json!({
-                    "_direction": match message.direction {
-                        acp::StreamMessageDirection::Incoming => "incoming",
-                        acp::StreamMessageDirection::Outgoing => "outgoing",
-                    },
-                    "_type": message.message_type.to_string().to_lowercase(),
-                    "id": message.request_id,
-                    "method": message.name.to_string(),
-                    "params": params,
-                }))
-            })
-            .collect();
-
-        serde_json::to_string_pretty(&messages).ok()
-    }
-
-    fn clear_messages(&mut self, cx: &mut Context<Self>) {
-        if let Some(connection) = self.watched_connection.as_mut() {
-            connection.messages.clear();
-            connection.list_state.reset(0);
-            self.expanded.clear();
-            cx.notify();
-        }
-    }
-
-    fn render_message(
-        &mut self,
-        index: usize,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> AnyElement {
-        let Some(connection) = self.watched_connection.as_ref() else {
-            return Empty.into_any();
-        };
-
-        let Some(message) = connection.messages.get(index) else {
-            return Empty.into_any();
-        };
-
-        let base_size = TextSize::Editor.rems(cx);
-
-        let theme_settings = ThemeSettings::get_global(cx);
-        let text_style = window.text_style();
-
-        let colors = cx.theme().colors();
-        let expanded = self.expanded.contains(&index);
-
-        v_flex()
-            .id(index)
-            .group("message")
-            .cursor_pointer()
-            .font_buffer(cx)
-            .w_full()
-            .py_3()
-            .pl_4()
-            .pr_5()
-            .gap_2()
-            .items_start()
-            .text_size(base_size)
-            .border_color(colors.border)
-            .border_b_1()
-            .hover(|this| this.bg(colors.element_background.opacity(0.5)))
-            .on_click(cx.listener(move |this, _, _, cx| {
-                if this.expanded.contains(&index) {
-                    this.expanded.remove(&index);
-                } else {
-                    this.expanded.insert(index);
-                    let Some(connection) = &mut this.watched_connection else {
-                        return;
-                    };
-                    let Some(message) = connection.messages.get_mut(index) else {
-                        return;
-                    };
-                    message.expanded(this.project.read(cx).languages().clone(), cx);
-                    connection.list_state.scroll_to_reveal_item(index);
-                }
-                cx.notify()
-            }))
-            .child(
-                h_flex()
-                    .w_full()
-                    .gap_2()
-                    .flex_shrink_0()
-                    .child(match message.direction {
-                        acp::StreamMessageDirection::Incoming => Icon::new(IconName::ArrowDown)
-                            .color(Color::Error)
-                            .size(IconSize::Small),
-                        acp::StreamMessageDirection::Outgoing => Icon::new(IconName::ArrowUp)
-                            .color(Color::Success)
-                            .size(IconSize::Small),
-                    })
-                    .child(
-                        Label::new(message.name.clone())
-                            .buffer_font(cx)
-                            .color(Color::Muted),
-                    )
-                    .child(div().flex_1())
-                    .child(
-                        div()
-                            .child(ui::Chip::new(message.message_type.to_string()))
-                            .visible_on_hover("message"),
-                    )
-                    .children(
-                        message
-                            .request_id
-                            .as_ref()
-                            .map(|req_id| div().child(ui::Chip::new(req_id.to_string()))),
-                    ),
-            )
-            // I'm aware using markdown is a hack. Trying to get something working for the demo.
-            // Will clean up soon!
-            .when_some(
-                if expanded {
-                    message.expanded_params_md.clone()
-                } else {
-                    message.collapsed_params_md.clone()
-                },
-                |this, params| {
-                    this.child(
-                        div().pl_6().w_full().child(
-                            MarkdownElement::new(
-                                params,
-                                MarkdownStyle {
-                                    base_text_style: text_style,
-                                    selection_background_color: colors.element_selection_background,
-                                    syntax: cx.theme().syntax().clone(),
-                                    code_block_overflow_x_scroll: true,
-                                    code_block: StyleRefinement {
-                                        text: Some(TextStyleRefinement {
-                                            font_family: Some(
-                                                theme_settings.buffer_font.family.clone(),
-                                            ),
-                                            font_size: Some((base_size * 0.8).into()),
-                                            ..Default::default()
-                                        }),
-                                        ..Default::default()
-                                    },
-                                    ..Default::default()
-                                },
-                            )
-                            .code_block_renderer(
-                                CodeBlockRenderer::Default {
-                                    copy_button: false,
-                                    copy_button_on_hover: expanded,
-                                    border: false,
-                                },
-                            ),
-                        ),
-                    )
-                },
-            )
-            .into_any()
-    }
-}
-
-struct WatchedConnectionMessage {
-    name: SharedString,
-    request_id: Option<acp::RequestId>,
-    direction: acp::StreamMessageDirection,
-    message_type: MessageType,
-    params: Result<Option<serde_json::Value>, acp::Error>,
-    collapsed_params_md: Option<Entity<Markdown>>,
-    expanded_params_md: Option<Entity<Markdown>>,
-}
-
-impl WatchedConnectionMessage {
-    fn expanded(&mut self, language_registry: Arc<LanguageRegistry>, cx: &mut App) {
-        let params_md = match &self.params {
-            Ok(Some(params)) => Some(expanded_params_md(params, &language_registry, cx)),
-            Err(err) => {
-                if let Some(err) = &serde_json::to_value(err).log_err() {
-                    Some(expanded_params_md(&err, &language_registry, cx))
-                } else {
-                    None
-                }
-            }
-            _ => None,
-        };
-        self.expanded_params_md = params_md;
-    }
-}
-
-fn collapsed_params_md(
-    params: &serde_json::Value,
-    language_registry: &Arc<LanguageRegistry>,
-    cx: &mut App,
-) -> Entity<Markdown> {
-    let params_json = serde_json::to_string(params).unwrap_or_default();
-    let mut spaced_out_json = String::with_capacity(params_json.len() + params_json.len() / 4);
-
-    for ch in params_json.chars() {
-        match ch {
-            '{' => spaced_out_json.push_str("{ "),
-            '}' => spaced_out_json.push_str(" }"),
-            ':' => spaced_out_json.push_str(": "),
-            ',' => spaced_out_json.push_str(", "),
-            c => spaced_out_json.push(c),
-        }
-    }
-
-    let params_md = format!("```json\n{}\n```", spaced_out_json);
-    cx.new(|cx| Markdown::new(params_md.into(), Some(language_registry.clone()), None, cx))
-}
-
-fn expanded_params_md(
-    params: &serde_json::Value,
-    language_registry: &Arc<LanguageRegistry>,
-    cx: &mut App,
-) -> Entity<Markdown> {
-    let params_json = serde_json::to_string_pretty(params).unwrap_or_default();
-    let params_md = format!("```json\n{}\n```", params_json);
-    cx.new(|cx| Markdown::new(params_md.into(), Some(language_registry.clone()), None, cx))
-}
-
-enum MessageType {
-    Request,
-    Response,
-    Notification,
-}
-
-impl Display for MessageType {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            MessageType::Request => write!(f, "Request"),
-            MessageType::Response => write!(f, "Response"),
-            MessageType::Notification => write!(f, "Notification"),
-        }
-    }
-}
-
-enum AcpToolsEvent {}
-
-impl EventEmitter<AcpToolsEvent> for AcpTools {}
-
-impl Item for AcpTools {
-    type Event = AcpToolsEvent;
-
-    fn tab_content_text(&self, _detail: usize, _cx: &App) -> ui::SharedString {
-        format!(
-            "ACP: {}",
-            self.watched_connection
-                .as_ref()
-                .map_or("Disconnected", |connection| &connection.server_name)
-        )
-        .into()
-    }
-
-    fn tab_icon(&self, _window: &Window, _cx: &App) -> Option<Icon> {
-        Some(ui::Icon::new(IconName::Thread))
-    }
-}
-
-impl Focusable for AcpTools {
-    fn focus_handle(&self, _cx: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl Render for AcpTools {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .track_focus(&self.focus_handle)
-            .size_full()
-            .bg(cx.theme().colors().editor_background)
-            .child(match self.watched_connection.as_ref() {
-                Some(connection) => {
-                    if connection.messages.is_empty() {
-                        h_flex()
-                            .size_full()
-                            .justify_center()
-                            .items_center()
-                            .child("No messages recorded yet")
-                            .into_any()
-                    } else {
-                        div()
-                            .size_full()
-                            .flex_grow()
-                            .child(
-                                list(
-                                    connection.list_state.clone(),
-                                    cx.processor(Self::render_message),
-                                )
-                                .with_sizing_behavior(gpui::ListSizingBehavior::Auto)
-                                .size_full(),
-                            )
-                            .vertical_scrollbar_for(&connection.list_state, window, cx)
-                            .into_any()
-                    }
-                }
-                None => h_flex()
-                    .size_full()
-                    .justify_center()
-                    .items_center()
-                    .child("No active connection")
-                    .into_any(),
-            })
-    }
-}
-
-pub struct AcpToolsToolbarItemView {
-    acp_tools: Option<Entity<AcpTools>>,
-    just_copied: bool,
-}
-
-impl AcpToolsToolbarItemView {
-    pub fn new() -> Self {
-        Self {
-            acp_tools: None,
-            just_copied: false,
-        }
-    }
-}
-
-impl Render for AcpToolsToolbarItemView {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let Some(acp_tools) = self.acp_tools.as_ref() else {
-            return Empty.into_any_element();
-        };
-
-        let acp_tools = acp_tools.clone();
-        let has_messages = acp_tools
-            .read(cx)
-            .watched_connection
-            .as_ref()
-            .is_some_and(|connection| !connection.messages.is_empty());
-
-        h_flex()
-            .gap_2()
-            .child({
-                let acp_tools = acp_tools.clone();
-                IconButton::new(
-                    "copy_all_messages",
-                    if self.just_copied {
-                        IconName::Check
-                    } else {
-                        IconName::Copy
-                    },
-                )
-                .icon_size(IconSize::Small)
-                .tooltip(Tooltip::text(if self.just_copied {
-                    "Copied!"
-                } else {
-                    "Copy All Messages"
-                }))
-                .disabled(!has_messages)
-                .on_click(cx.listener(move |this, _, _window, cx| {
-                    if let Some(content) = acp_tools.read(cx).serialize_observed_messages() {
-                        cx.write_to_clipboard(ClipboardItem::new_string(content));
-
-                        this.just_copied = true;
-                        cx.spawn(async move |this, cx| {
-                            cx.background_executor().timer(Duration::from_secs(2)).await;
-                            this.update(cx, |this, cx| {
-                                this.just_copied = false;
-                                cx.notify();
-                            })
-                        })
-                        .detach();
-                    }
-                }))
-            })
-            .child(
-                IconButton::new("clear_messages", IconName::Trash)
-                    .icon_size(IconSize::Small)
-                    .tooltip(Tooltip::text("Clear Messages"))
-                    .disabled(!has_messages)
-                    .on_click(cx.listener(move |_this, _, _window, cx| {
-                        acp_tools.update(cx, |acp_tools, cx| {
-                            acp_tools.clear_messages(cx);
-                        });
-                    })),
-            )
-            .into_any()
-    }
-}
-
-impl EventEmitter<ToolbarItemEvent> for AcpToolsToolbarItemView {}
-
-impl ToolbarItemView for AcpToolsToolbarItemView {
-    fn set_active_pane_item(
-        &mut self,
-        active_pane_item: Option<&dyn ItemHandle>,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> ToolbarItemLocation {
-        if let Some(item) = active_pane_item
-            && let Some(acp_tools) = item.downcast::<AcpTools>()
-        {
-            self.acp_tools = Some(acp_tools);
-            cx.notify();
-            return ToolbarItemLocation::PrimaryRight;
-        }
-        if self.acp_tools.take().is_some() {
-            cx.notify();
-        }
-        ToolbarItemLocation::Hidden
-    }
-}
diff --git a/crates/action_log/Cargo.toml b/crates/action_log/Cargo.toml
deleted file mode 100644
index 699d548593..0000000000
--- a/crates/action_log/Cargo.toml
+++ /dev/null
@@ -1,45 +0,0 @@
-[package]
-name = "action_log"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lib]
-path = "src/action_log.rs"
-
-[lints]
-workspace = true
-
-[dependencies]
-anyhow.workspace = true
-buffer_diff.workspace = true
-clock.workspace = true
-collections.workspace = true
-futures.workspace = true
-gpui.workspace = true
-language.workspace = true
-project.workspace = true
-telemetry.workspace = true
-text.workspace = true
-util.workspace = true
-watch.workspace = true
-
-
-[dev-dependencies]
-buffer_diff = { workspace = true, features = ["test-support"] }
-collections = { workspace = true, features = ["test-support"] }
-clock = { workspace = true, features = ["test-support"] }
-ctor.workspace = true
-gpui = { workspace = true, features = ["test-support"] }
-indoc.workspace = true
-language = { workspace = true, features = ["test-support"] }
-log.workspace = true
-pretty_assertions.workspace = true
-project = { workspace = true, features = ["test-support"] }
-rand.workspace = true
-serde_json.workspace = true
-settings = { workspace = true, features = ["test-support"] }
-text = { workspace = true, features = ["test-support"] }
-util = { workspace = true, features = ["test-support"] }
-zlog.workspace = true
diff --git a/crates/action_log/LICENSE-GPL b/crates/action_log/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/action_log/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/action_log/src/action_log.rs b/crates/action_log/src/action_log.rs
deleted file mode 100644
index 6eb18a4f12..0000000000
--- a/crates/action_log/src/action_log.rs
+++ /dev/null
@@ -1,2407 +0,0 @@
-use anyhow::{Context as _, Result};
-use buffer_diff::BufferDiff;
-use clock;
-use collections::BTreeMap;
-use futures::{FutureExt, StreamExt, channel::mpsc};
-use gpui::{
-    App, AppContext, AsyncApp, Context, Entity, SharedString, Subscription, Task, WeakEntity,
-};
-use language::{Anchor, Buffer, BufferEvent, DiskState, Point, ToPoint};
-use project::{Project, ProjectItem, lsp_store::OpenLspBufferHandle};
-use std::{cmp, ops::Range, sync::Arc};
-use text::{Edit, Patch, Rope};
-use util::{RangeExt, ResultExt as _};
-
-/// Tracks actions performed by tools in a thread
-pub struct ActionLog {
-    /// Buffers that we want to notify the model about when they change.
-    tracked_buffers: BTreeMap<Entity<Buffer>, TrackedBuffer>,
-    /// The project this action log is associated with
-    project: Entity<Project>,
-}
-
-impl ActionLog {
-    /// Creates a new, empty action log associated with the given project.
-    pub fn new(project: Entity<Project>) -> Self {
-        Self {
-            tracked_buffers: BTreeMap::default(),
-            project,
-        }
-    }
-
-    pub fn project(&self) -> &Entity<Project> {
-        &self.project
-    }
-
-    fn track_buffer_internal(
-        &mut self,
-        buffer: Entity<Buffer>,
-        is_created: bool,
-        cx: &mut Context<Self>,
-    ) -> &mut TrackedBuffer {
-        let status = if is_created {
-            if let Some(tracked) = self.tracked_buffers.remove(&buffer) {
-                match tracked.status {
-                    TrackedBufferStatus::Created {
-                        existing_file_content,
-                    } => TrackedBufferStatus::Created {
-                        existing_file_content,
-                    },
-                    TrackedBufferStatus::Modified | TrackedBufferStatus::Deleted => {
-                        TrackedBufferStatus::Created {
-                            existing_file_content: Some(tracked.diff_base),
-                        }
-                    }
-                }
-            } else if buffer
-                .read(cx)
-                .file()
-                .is_some_and(|file| file.disk_state().exists())
-            {
-                TrackedBufferStatus::Created {
-                    existing_file_content: Some(buffer.read(cx).as_rope().clone()),
-                }
-            } else {
-                TrackedBufferStatus::Created {
-                    existing_file_content: None,
-                }
-            }
-        } else {
-            TrackedBufferStatus::Modified
-        };
-
-        let tracked_buffer = self
-            .tracked_buffers
-            .entry(buffer.clone())
-            .or_insert_with(|| {
-                let open_lsp_handle = self.project.update(cx, |project, cx| {
-                    project.register_buffer_with_language_servers(&buffer, cx)
-                });
-
-                let text_snapshot = buffer.read(cx).text_snapshot();
-                let diff = cx.new(|cx| BufferDiff::new(&text_snapshot, cx));
-                let (diff_update_tx, diff_update_rx) = mpsc::unbounded();
-                let diff_base;
-                let unreviewed_edits;
-                if is_created {
-                    diff_base = Rope::default();
-                    unreviewed_edits = Patch::new(vec![Edit {
-                        old: 0..1,
-                        new: 0..text_snapshot.max_point().row + 1,
-                    }])
-                } else {
-                    diff_base = buffer.read(cx).as_rope().clone();
-                    unreviewed_edits = Patch::default();
-                }
-                TrackedBuffer {
-                    buffer: buffer.clone(),
-                    diff_base,
-                    unreviewed_edits,
-                    snapshot: text_snapshot,
-                    status,
-                    version: buffer.read(cx).version(),
-                    diff,
-                    diff_update: diff_update_tx,
-                    _open_lsp_handle: open_lsp_handle,
-                    _maintain_diff: cx.spawn({
-                        let buffer = buffer.clone();
-                        async move |this, cx| {
-                            Self::maintain_diff(this, buffer, diff_update_rx, cx)
-                                .await
-                                .ok();
-                        }
-                    }),
-                    _subscription: cx.subscribe(&buffer, Self::handle_buffer_event),
-                }
-            });
-        tracked_buffer.version = buffer.read(cx).version();
-        tracked_buffer
-    }
-
-    fn handle_buffer_event(
-        &mut self,
-        buffer: Entity<Buffer>,
-        event: &BufferEvent,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            BufferEvent::Edited => self.handle_buffer_edited(buffer, cx),
-            BufferEvent::FileHandleChanged => {
-                self.handle_buffer_file_changed(buffer, cx);
-            }
-            _ => {}
-        };
-    }
-
-    fn handle_buffer_edited(&mut self, buffer: Entity<Buffer>, cx: &mut Context<Self>) {
-        let Some(tracked_buffer) = self.tracked_buffers.get_mut(&buffer) else {
-            return;
-        };
-        tracked_buffer.schedule_diff_update(ChangeAuthor::User, cx);
-    }
-
-    fn handle_buffer_file_changed(&mut self, buffer: Entity<Buffer>, cx: &mut Context<Self>) {
-        let Some(tracked_buffer) = self.tracked_buffers.get_mut(&buffer) else {
-            return;
-        };
-
-        match tracked_buffer.status {
-            TrackedBufferStatus::Created { .. } | TrackedBufferStatus::Modified => {
-                if buffer
-                    .read(cx)
-                    .file()
-                    .is_some_and(|file| file.disk_state() == DiskState::Deleted)
-                {
-                    // If the buffer had been edited by a tool, but it got
-                    // deleted externally, we want to stop tracking it.
-                    self.tracked_buffers.remove(&buffer);
-                }
-                cx.notify();
-            }
-            TrackedBufferStatus::Deleted => {
-                if buffer
-                    .read(cx)
-                    .file()
-                    .is_some_and(|file| file.disk_state() != DiskState::Deleted)
-                {
-                    // If the buffer had been deleted by a tool, but it got
-                    // resurrected externally, we want to clear the edits we
-                    // were tracking and reset the buffer's state.
-                    self.tracked_buffers.remove(&buffer);
-                    self.track_buffer_internal(buffer, false, cx);
-                }
-                cx.notify();
-            }
-        }
-    }
-
-    async fn maintain_diff(
-        this: WeakEntity<Self>,
-        buffer: Entity<Buffer>,
-        mut buffer_updates: mpsc::UnboundedReceiver<(ChangeAuthor, text::BufferSnapshot)>,
-        cx: &mut AsyncApp,
-    ) -> Result<()> {
-        let git_store = this.read_with(cx, |this, cx| this.project.read(cx).git_store().clone())?;
-        let git_diff = this
-            .update(cx, |this, cx| {
-                this.project.update(cx, |project, cx| {
-                    project.open_uncommitted_diff(buffer.clone(), cx)
-                })
-            })?
-            .await
-            .ok();
-        let buffer_repo = git_store.read_with(cx, |git_store, cx| {
-            git_store.repository_and_path_for_buffer_id(buffer.read(cx).remote_id(), cx)
-        })?;
-
-        let (mut git_diff_updates_tx, mut git_diff_updates_rx) = watch::channel(());
-        let _repo_subscription =
-            if let Some((git_diff, (buffer_repo, _))) = git_diff.as_ref().zip(buffer_repo) {
-                cx.update(|cx| {
-                    let mut old_head = buffer_repo.read(cx).head_commit.clone();
-                    Some(cx.subscribe(git_diff, move |_, event, cx| {
-                        if let buffer_diff::BufferDiffEvent::DiffChanged { .. } = event {
-                            let new_head = buffer_repo.read(cx).head_commit.clone();
-                            if new_head != old_head {
-                                old_head = new_head;
-                                git_diff_updates_tx.send(()).ok();
-                            }
-                        }
-                    }))
-                })?
-            } else {
-                None
-            };
-
-        loop {
-            futures::select_biased! {
-                buffer_update = buffer_updates.next() => {
-                    if let Some((author, buffer_snapshot)) = buffer_update {
-                        Self::track_edits(&this, &buffer, author, buffer_snapshot, cx).await?;
-                    } else {
-                        break;
-                    }
-                }
-                _ = git_diff_updates_rx.changed().fuse() => {
-                    if let Some(git_diff) = git_diff.as_ref() {
-                        Self::keep_committed_edits(&this, &buffer, git_diff, cx).await?;
-                    }
-                }
-            }
-        }
-
-        Ok(())
-    }
-
-    async fn track_edits(
-        this: &WeakEntity<ActionLog>,
-        buffer: &Entity<Buffer>,
-        author: ChangeAuthor,
-        buffer_snapshot: text::BufferSnapshot,
-        cx: &mut AsyncApp,
-    ) -> Result<()> {
-        let rebase = this.update(cx, |this, cx| {
-            let tracked_buffer = this
-                .tracked_buffers
-                .get_mut(buffer)
-                .context("buffer not tracked")?;
-
-            let rebase = cx.background_spawn({
-                let mut base_text = tracked_buffer.diff_base.clone();
-                let old_snapshot = tracked_buffer.snapshot.clone();
-                let new_snapshot = buffer_snapshot.clone();
-                let unreviewed_edits = tracked_buffer.unreviewed_edits.clone();
-                let edits = diff_snapshots(&old_snapshot, &new_snapshot);
-                async move {
-                    if let ChangeAuthor::User = author {
-                        apply_non_conflicting_edits(
-                            &unreviewed_edits,
-                            edits,
-                            &mut base_text,
-                            new_snapshot.as_rope(),
-                        );
-                    }
-
-                    (Arc::new(base_text.to_string()), base_text)
-                }
-            });
-
-            anyhow::Ok(rebase)
-        })??;
-        let (new_base_text, new_diff_base) = rebase.await;
-
-        Self::update_diff(
-            this,
-            buffer,
-            buffer_snapshot,
-            new_base_text,
-            new_diff_base,
-            cx,
-        )
-        .await
-    }
-
-    async fn keep_committed_edits(
-        this: &WeakEntity<ActionLog>,
-        buffer: &Entity<Buffer>,
-        git_diff: &Entity<BufferDiff>,
-        cx: &mut AsyncApp,
-    ) -> Result<()> {
-        let buffer_snapshot = this.read_with(cx, |this, _cx| {
-            let tracked_buffer = this
-                .tracked_buffers
-                .get(buffer)
-                .context("buffer not tracked")?;
-            anyhow::Ok(tracked_buffer.snapshot.clone())
-        })??;
-        let (new_base_text, new_diff_base) = this
-            .read_with(cx, |this, cx| {
-                let tracked_buffer = this
-                    .tracked_buffers
-                    .get(buffer)
-                    .context("buffer not tracked")?;
-                let old_unreviewed_edits = tracked_buffer.unreviewed_edits.clone();
-                let agent_diff_base = tracked_buffer.diff_base.clone();
-                let git_diff_base = git_diff.read(cx).base_text().as_rope().clone();
-                let buffer_text = tracked_buffer.snapshot.as_rope().clone();
-                anyhow::Ok(cx.background_spawn(async move {
-                    let mut old_unreviewed_edits = old_unreviewed_edits.into_iter().peekable();
-                    let committed_edits = language::line_diff(
-                        &agent_diff_base.to_string(),
-                        &git_diff_base.to_string(),
-                    )
-                    .into_iter()
-                    .map(|(old, new)| Edit { old, new });
-
-                    let mut new_agent_diff_base = agent_diff_base.clone();
-                    let mut row_delta = 0i32;
-                    for committed in committed_edits {
-                        while let Some(unreviewed) = old_unreviewed_edits.peek() {
-                            // If the committed edit matches the unreviewed
-                            // edit, assume the user wants to keep it.
-                            if committed.old == unreviewed.old {
-                                let unreviewed_new =
-                                    buffer_text.slice_rows(unreviewed.new.clone()).to_string();
-                                let committed_new =
-                                    git_diff_base.slice_rows(committed.new.clone()).to_string();
-                                if unreviewed_new == committed_new {
-                                    let old_byte_start =
-                                        new_agent_diff_base.point_to_offset(Point::new(
-                                            (unreviewed.old.start as i32 + row_delta) as u32,
-                                            0,
-                                        ));
-                                    let old_byte_end =
-                                        new_agent_diff_base.point_to_offset(cmp::min(
-                                            Point::new(
-                                                (unreviewed.old.end as i32 + row_delta) as u32,
-                                                0,
-                                            ),
-                                            new_agent_diff_base.max_point(),
-                                        ));
-                                    new_agent_diff_base
-                                        .replace(old_byte_start..old_byte_end, &unreviewed_new);
-                                    row_delta +=
-                                        unreviewed.new_len() as i32 - unreviewed.old_len() as i32;
-                                }
-                            } else if unreviewed.old.start >= committed.old.end {
-                                break;
-                            }
-
-                            old_unreviewed_edits.next().unwrap();
-                        }
-                    }
-
-                    (
-                        Arc::new(new_agent_diff_base.to_string()),
-                        new_agent_diff_base,
-                    )
-                }))
-            })??
-            .await;
-
-        Self::update_diff(
-            this,
-            buffer,
-            buffer_snapshot,
-            new_base_text,
-            new_diff_base,
-            cx,
-        )
-        .await
-    }
-
-    async fn update_diff(
-        this: &WeakEntity<ActionLog>,
-        buffer: &Entity<Buffer>,
-        buffer_snapshot: text::BufferSnapshot,
-        new_base_text: Arc<String>,
-        new_diff_base: Rope,
-        cx: &mut AsyncApp,
-    ) -> Result<()> {
-        let (diff, language, language_registry) = this.read_with(cx, |this, cx| {
-            let tracked_buffer = this
-                .tracked_buffers
-                .get(buffer)
-                .context("buffer not tracked")?;
-            anyhow::Ok((
-                tracked_buffer.diff.clone(),
-                buffer.read(cx).language().cloned(),
-                buffer.read(cx).language_registry(),
-            ))
-        })??;
-        let diff_snapshot = BufferDiff::update_diff(
-            diff.clone(),
-            buffer_snapshot.clone(),
-            Some(new_base_text),
-            true,
-            false,
-            language,
-            language_registry,
-            cx,
-        )
-        .await;
-        let mut unreviewed_edits = Patch::default();
-        if let Ok(diff_snapshot) = diff_snapshot {
-            unreviewed_edits = cx
-                .background_spawn({
-                    let diff_snapshot = diff_snapshot.clone();
-                    let buffer_snapshot = buffer_snapshot.clone();
-                    let new_diff_base = new_diff_base.clone();
-                    async move {
-                        let mut unreviewed_edits = Patch::default();
-                        for hunk in diff_snapshot.hunks_intersecting_range(
-                            Anchor::min_for_buffer(buffer_snapshot.remote_id())
-                                ..Anchor::max_for_buffer(buffer_snapshot.remote_id()),
-                            &buffer_snapshot,
-                        ) {
-                            let old_range = new_diff_base
-                                .offset_to_point(hunk.diff_base_byte_range.start)
-                                ..new_diff_base.offset_to_point(hunk.diff_base_byte_range.end);
-                            let new_range = hunk.range.start..hunk.range.end;
-                            unreviewed_edits.push(point_to_row_edit(
-                                Edit {
-                                    old: old_range,
-                                    new: new_range,
-                                },
-                                &new_diff_base,
-                                buffer_snapshot.as_rope(),
-                            ));
-                        }
-                        unreviewed_edits
-                    }
-                })
-                .await;
-
-            diff.update(cx, |diff, cx| {
-                diff.set_snapshot(diff_snapshot, &buffer_snapshot, cx);
-            })?;
-        }
-        this.update(cx, |this, cx| {
-            let tracked_buffer = this
-                .tracked_buffers
-                .get_mut(buffer)
-                .context("buffer not tracked")?;
-            tracked_buffer.diff_base = new_diff_base;
-            tracked_buffer.snapshot = buffer_snapshot;
-            tracked_buffer.unreviewed_edits = unreviewed_edits;
-            cx.notify();
-            anyhow::Ok(())
-        })?
-    }
-
-    /// Track a buffer as read by agent, so we can notify the model about user edits.
-    pub fn buffer_read(&mut self, buffer: Entity<Buffer>, cx: &mut Context<Self>) {
-        self.track_buffer_internal(buffer, false, cx);
-    }
-
-    /// Mark a buffer as created by agent, so we can refresh it in the context
-    pub fn buffer_created(&mut self, buffer: Entity<Buffer>, cx: &mut Context<Self>) {
-        self.track_buffer_internal(buffer, true, cx);
-    }
-
-    /// Mark a buffer as edited by agent, so we can refresh it in the context
-    pub fn buffer_edited(&mut self, buffer: Entity<Buffer>, cx: &mut Context<Self>) {
-        let tracked_buffer = self.track_buffer_internal(buffer, false, cx);
-        if let TrackedBufferStatus::Deleted = tracked_buffer.status {
-            tracked_buffer.status = TrackedBufferStatus::Modified;
-        }
-        tracked_buffer.schedule_diff_update(ChangeAuthor::Agent, cx);
-    }
-
-    pub fn will_delete_buffer(&mut self, buffer: Entity<Buffer>, cx: &mut Context<Self>) {
-        let tracked_buffer = self.track_buffer_internal(buffer.clone(), false, cx);
-        match tracked_buffer.status {
-            TrackedBufferStatus::Created { .. } => {
-                self.tracked_buffers.remove(&buffer);
-                cx.notify();
-            }
-            TrackedBufferStatus::Modified => {
-                buffer.update(cx, |buffer, cx| buffer.set_text("", cx));
-                tracked_buffer.status = TrackedBufferStatus::Deleted;
-                tracked_buffer.schedule_diff_update(ChangeAuthor::Agent, cx);
-            }
-            TrackedBufferStatus::Deleted => {}
-        }
-        cx.notify();
-    }
-
-    pub fn keep_edits_in_range(
-        &mut self,
-        buffer: Entity<Buffer>,
-        buffer_range: Range<impl language::ToPoint>,
-        telemetry: Option<ActionLogTelemetry>,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(tracked_buffer) = self.tracked_buffers.get_mut(&buffer) else {
-            return;
-        };
-
-        let mut metrics = ActionLogMetrics::for_buffer(buffer.read(cx));
-        match tracked_buffer.status {
-            TrackedBufferStatus::Deleted => {
-                metrics.add_edits(tracked_buffer.unreviewed_edits.edits());
-                self.tracked_buffers.remove(&buffer);
-                cx.notify();
-            }
-            _ => {
-                let buffer = buffer.read(cx);
-                let buffer_range =
-                    buffer_range.start.to_point(buffer)..buffer_range.end.to_point(buffer);
-                let mut delta = 0i32;
-                tracked_buffer.unreviewed_edits.retain_mut(|edit| {
-                    edit.old.start = (edit.old.start as i32 + delta) as u32;
-                    edit.old.end = (edit.old.end as i32 + delta) as u32;
-
-                    if buffer_range.end.row < edit.new.start
-                        || buffer_range.start.row > edit.new.end
-                    {
-                        true
-                    } else {
-                        let old_range = tracked_buffer
-                            .diff_base
-                            .point_to_offset(Point::new(edit.old.start, 0))
-                            ..tracked_buffer.diff_base.point_to_offset(cmp::min(
-                                Point::new(edit.old.end, 0),
-                                tracked_buffer.diff_base.max_point(),
-                            ));
-                        let new_range = tracked_buffer
-                            .snapshot
-                            .point_to_offset(Point::new(edit.new.start, 0))
-                            ..tracked_buffer.snapshot.point_to_offset(cmp::min(
-                                Point::new(edit.new.end, 0),
-                                tracked_buffer.snapshot.max_point(),
-                            ));
-                        tracked_buffer.diff_base.replace(
-                            old_range,
-                            &tracked_buffer
-                                .snapshot
-                                .text_for_range(new_range)
-                                .collect::<String>(),
-                        );
-                        delta += edit.new_len() as i32 - edit.old_len() as i32;
-                        metrics.add_edit(edit);
-                        false
-                    }
-                });
-                if tracked_buffer.unreviewed_edits.is_empty()
-                    && let TrackedBufferStatus::Created { .. } = &mut tracked_buffer.status
-                {
-                    tracked_buffer.status = TrackedBufferStatus::Modified;
-                }
-                tracked_buffer.schedule_diff_update(ChangeAuthor::User, cx);
-            }
-        }
-        if let Some(telemetry) = telemetry {
-            telemetry_report_accepted_edits(&telemetry, metrics);
-        }
-    }
-
-    pub fn reject_edits_in_ranges(
-        &mut self,
-        buffer: Entity<Buffer>,
-        buffer_ranges: Vec<Range<impl language::ToPoint>>,
-        telemetry: Option<ActionLogTelemetry>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let Some(tracked_buffer) = self.tracked_buffers.get_mut(&buffer) else {
-            return Task::ready(Ok(()));
-        };
-
-        let mut metrics = ActionLogMetrics::for_buffer(buffer.read(cx));
-        let task = match &tracked_buffer.status {
-            TrackedBufferStatus::Created {
-                existing_file_content,
-            } => {
-                let task = if let Some(existing_file_content) = existing_file_content {
-                    buffer.update(cx, |buffer, cx| {
-                        buffer.start_transaction();
-                        buffer.set_text("", cx);
-                        for chunk in existing_file_content.chunks() {
-                            buffer.append(chunk, cx);
-                        }
-                        buffer.end_transaction(cx);
-                    });
-                    self.project
-                        .update(cx, |project, cx| project.save_buffer(buffer.clone(), cx))
-                } else {
-                    // For a file created by AI with no pre-existing content,
-                    // only delete the file if we're certain it contains only AI content
-                    // with no edits from the user.
-
-                    let initial_version = tracked_buffer.version.clone();
-                    let current_version = buffer.read(cx).version();
-
-                    let current_content = buffer.read(cx).text();
-                    let tracked_content = tracked_buffer.snapshot.text();
-
-                    let is_ai_only_content =
-                        initial_version == current_version && current_content == tracked_content;
-
-                    if is_ai_only_content {
-                        buffer
-                            .read(cx)
-                            .entry_id(cx)
-                            .and_then(|entry_id| {
-                                self.project.update(cx, |project, cx| {
-                                    project.delete_entry(entry_id, false, cx)
-                                })
-                            })
-                            .unwrap_or(Task::ready(Ok(())))
-                    } else {
-                        // Not sure how to disentangle edits made by the user
-                        // from edits made by the AI at this point.
-                        // For now, preserve both to avoid data loss.
-                        //
-                        // TODO: Better solution (disable "Reject" after user makes some
-                        // edit or find a way to differentiate between AI and user edits)
-                        Task::ready(Ok(()))
-                    }
-                };
-
-                metrics.add_edits(tracked_buffer.unreviewed_edits.edits());
-                self.tracked_buffers.remove(&buffer);
-                cx.notify();
-                task
-            }
-            TrackedBufferStatus::Deleted => {
-                buffer.update(cx, |buffer, cx| {
-                    buffer.set_text(tracked_buffer.diff_base.to_string(), cx)
-                });
-                let save = self
-                    .project
-                    .update(cx, |project, cx| project.save_buffer(buffer.clone(), cx));
-
-                // Clear all tracked edits for this buffer and start over as if we just read it.
-                metrics.add_edits(tracked_buffer.unreviewed_edits.edits());
-                self.tracked_buffers.remove(&buffer);
-                self.buffer_read(buffer.clone(), cx);
-                cx.notify();
-                save
-            }
-            TrackedBufferStatus::Modified => {
-                buffer.update(cx, |buffer, cx| {
-                    let mut buffer_row_ranges = buffer_ranges
-                        .into_iter()
-                        .map(|range| {
-                            range.start.to_point(buffer).row..range.end.to_point(buffer).row
-                        })
-                        .peekable();
-
-                    let mut edits_to_revert = Vec::new();
-                    for edit in tracked_buffer.unreviewed_edits.edits() {
-                        let new_range = tracked_buffer
-                            .snapshot
-                            .anchor_before(Point::new(edit.new.start, 0))
-                            ..tracked_buffer.snapshot.anchor_after(cmp::min(
-                                Point::new(edit.new.end, 0),
-                                tracked_buffer.snapshot.max_point(),
-                            ));
-                        let new_row_range = new_range.start.to_point(buffer).row
-                            ..new_range.end.to_point(buffer).row;
-
-                        let mut revert = false;
-                        while let Some(buffer_row_range) = buffer_row_ranges.peek() {
-                            if buffer_row_range.end < new_row_range.start {
-                                buffer_row_ranges.next();
-                            } else if buffer_row_range.start > new_row_range.end {
-                                break;
-                            } else {
-                                revert = true;
-                                break;
-                            }
-                        }
-
-                        if revert {
-                            metrics.add_edit(edit);
-                            let old_range = tracked_buffer
-                                .diff_base
-                                .point_to_offset(Point::new(edit.old.start, 0))
-                                ..tracked_buffer.diff_base.point_to_offset(cmp::min(
-                                    Point::new(edit.old.end, 0),
-                                    tracked_buffer.diff_base.max_point(),
-                                ));
-                            let old_text = tracked_buffer
-                                .diff_base
-                                .chunks_in_range(old_range)
-                                .collect::<String>();
-                            edits_to_revert.push((new_range, old_text));
-                        }
-                    }
-
-                    buffer.edit(edits_to_revert, None, cx);
-                });
-                self.project
-                    .update(cx, |project, cx| project.save_buffer(buffer, cx))
-            }
-        };
-        if let Some(telemetry) = telemetry {
-            telemetry_report_rejected_edits(&telemetry, metrics);
-        }
-        task
-    }
-
-    pub fn keep_all_edits(
-        &mut self,
-        telemetry: Option<ActionLogTelemetry>,
-        cx: &mut Context<Self>,
-    ) {
-        self.tracked_buffers.retain(|buffer, tracked_buffer| {
-            let mut metrics = ActionLogMetrics::for_buffer(buffer.read(cx));
-            metrics.add_edits(tracked_buffer.unreviewed_edits.edits());
-            if let Some(telemetry) = telemetry.as_ref() {
-                telemetry_report_accepted_edits(telemetry, metrics);
-            }
-            match tracked_buffer.status {
-                TrackedBufferStatus::Deleted => false,
-                _ => {
-                    if let TrackedBufferStatus::Created { .. } = &mut tracked_buffer.status {
-                        tracked_buffer.status = TrackedBufferStatus::Modified;
-                    }
-                    tracked_buffer.unreviewed_edits.clear();
-                    tracked_buffer.diff_base = tracked_buffer.snapshot.as_rope().clone();
-                    tracked_buffer.schedule_diff_update(ChangeAuthor::User, cx);
-                    true
-                }
-            }
-        });
-
-        cx.notify();
-    }
-
-    pub fn reject_all_edits(
-        &mut self,
-        telemetry: Option<ActionLogTelemetry>,
-        cx: &mut Context<Self>,
-    ) -> Task<()> {
-        let futures = self.changed_buffers(cx).into_keys().map(|buffer| {
-            let buffer_ranges = vec![Anchor::min_max_range_for_buffer(
-                buffer.read(cx).remote_id(),
-            )];
-            let reject = self.reject_edits_in_ranges(buffer, buffer_ranges, telemetry.clone(), cx);
-
-            async move {
-                reject.await.log_err();
-            }
-        });
-
-        let task = futures::future::join_all(futures);
-        cx.background_spawn(async move {
-            task.await;
-        })
-    }
-
-    /// Returns the set of buffers that contain edits that haven't been reviewed by the user.
-    pub fn changed_buffers(&self, cx: &App) -> BTreeMap<Entity<Buffer>, Entity<BufferDiff>> {
-        self.tracked_buffers
-            .iter()
-            .filter(|(_, tracked)| tracked.has_edits(cx))
-            .map(|(buffer, tracked)| (buffer.clone(), tracked.diff.clone()))
-            .collect()
-    }
-
-    /// Iterate over buffers changed since last read or edited by the model
-    pub fn stale_buffers<'a>(&'a self, cx: &'a App) -> impl Iterator<Item = &'a Entity<Buffer>> {
-        self.tracked_buffers
-            .iter()
-            .filter(|(buffer, tracked)| {
-                let buffer = buffer.read(cx);
-
-                tracked.version != buffer.version
-                    && buffer
-                        .file()
-                        .is_some_and(|file| file.disk_state() != DiskState::Deleted)
-            })
-            .map(|(buffer, _)| buffer)
-    }
-}
-
-#[derive(Clone)]
-pub struct ActionLogTelemetry {
-    pub agent_telemetry_id: SharedString,
-    pub session_id: Arc<str>,
-}
-
-struct ActionLogMetrics {
-    lines_removed: u32,
-    lines_added: u32,
-    language: Option<SharedString>,
-}
-
-impl ActionLogMetrics {
-    fn for_buffer(buffer: &Buffer) -> Self {
-        Self {
-            language: buffer.language().map(|l| l.name().0),
-            lines_removed: 0,
-            lines_added: 0,
-        }
-    }
-
-    fn add_edits(&mut self, edits: &[Edit<u32>]) {
-        for edit in edits {
-            self.add_edit(edit);
-        }
-    }
-
-    fn add_edit(&mut self, edit: &Edit<u32>) {
-        self.lines_added += edit.new_len();
-        self.lines_removed += edit.old_len();
-    }
-}
-
-fn telemetry_report_accepted_edits(telemetry: &ActionLogTelemetry, metrics: ActionLogMetrics) {
-    telemetry::event!(
-        "Agent Edits Accepted",
-        agent = telemetry.agent_telemetry_id,
-        session = telemetry.session_id,
-        language = metrics.language,
-        lines_added = metrics.lines_added,
-        lines_removed = metrics.lines_removed
-    );
-}
-
-fn telemetry_report_rejected_edits(telemetry: &ActionLogTelemetry, metrics: ActionLogMetrics) {
-    telemetry::event!(
-        "Agent Edits Rejected",
-        agent = telemetry.agent_telemetry_id,
-        session = telemetry.session_id,
-        language = metrics.language,
-        lines_added = metrics.lines_added,
-        lines_removed = metrics.lines_removed
-    );
-}
-
-fn apply_non_conflicting_edits(
-    patch: &Patch<u32>,
-    edits: Vec<Edit<u32>>,
-    old_text: &mut Rope,
-    new_text: &Rope,
-) -> bool {
-    let mut old_edits = patch.edits().iter().cloned().peekable();
-    let mut new_edits = edits.into_iter().peekable();
-    let mut applied_delta = 0i32;
-    let mut rebased_delta = 0i32;
-    let mut has_made_changes = false;
-
-    while let Some(mut new_edit) = new_edits.next() {
-        let mut conflict = false;
-
-        // Push all the old edits that are before this new edit or that intersect with it.
-        while let Some(old_edit) = old_edits.peek() {
-            if new_edit.old.end < old_edit.new.start
-                || (!old_edit.new.is_empty() && new_edit.old.end == old_edit.new.start)
-            {
-                break;
-            } else if new_edit.old.start > old_edit.new.end
-                || (!old_edit.new.is_empty() && new_edit.old.start == old_edit.new.end)
-            {
-                let old_edit = old_edits.next().unwrap();
-                rebased_delta += old_edit.new_len() as i32 - old_edit.old_len() as i32;
-            } else {
-                conflict = true;
-                if new_edits
-                    .peek()
-                    .is_some_and(|next_edit| next_edit.old.overlaps(&old_edit.new))
-                {
-                    new_edit = new_edits.next().unwrap();
-                } else {
-                    let old_edit = old_edits.next().unwrap();
-                    rebased_delta += old_edit.new_len() as i32 - old_edit.old_len() as i32;
-                }
-            }
-        }
-
-        if !conflict {
-            // This edit doesn't intersect with any old edit, so we can apply it to the old text.
-            new_edit.old.start = (new_edit.old.start as i32 + applied_delta - rebased_delta) as u32;
-            new_edit.old.end = (new_edit.old.end as i32 + applied_delta - rebased_delta) as u32;
-            let old_bytes = old_text.point_to_offset(Point::new(new_edit.old.start, 0))
-                ..old_text.point_to_offset(cmp::min(
-                    Point::new(new_edit.old.end, 0),
-                    old_text.max_point(),
-                ));
-            let new_bytes = new_text.point_to_offset(Point::new(new_edit.new.start, 0))
-                ..new_text.point_to_offset(cmp::min(
-                    Point::new(new_edit.new.end, 0),
-                    new_text.max_point(),
-                ));
-
-            old_text.replace(
-                old_bytes,
-                &new_text.chunks_in_range(new_bytes).collect::<String>(),
-            );
-            applied_delta += new_edit.new_len() as i32 - new_edit.old_len() as i32;
-            has_made_changes = true;
-        }
-    }
-    has_made_changes
-}
-
-fn diff_snapshots(
-    old_snapshot: &text::BufferSnapshot,
-    new_snapshot: &text::BufferSnapshot,
-) -> Vec<Edit<u32>> {
-    let mut edits = new_snapshot
-        .edits_since::<Point>(&old_snapshot.version)
-        .map(|edit| point_to_row_edit(edit, old_snapshot.as_rope(), new_snapshot.as_rope()))
-        .peekable();
-    let mut row_edits = Vec::new();
-    while let Some(mut edit) = edits.next() {
-        while let Some(next_edit) = edits.peek() {
-            if edit.old.end >= next_edit.old.start {
-                edit.old.end = next_edit.old.end;
-                edit.new.end = next_edit.new.end;
-                edits.next();
-            } else {
-                break;
-            }
-        }
-        row_edits.push(edit);
-    }
-    row_edits
-}
-
-fn point_to_row_edit(edit: Edit<Point>, old_text: &Rope, new_text: &Rope) -> Edit<u32> {
-    if edit.old.start.column == old_text.line_len(edit.old.start.row)
-        && new_text
-            .chars_at(new_text.point_to_offset(edit.new.start))
-            .next()
-            == Some('\n')
-        && edit.old.start != old_text.max_point()
-    {
-        Edit {
-            old: edit.old.start.row + 1..edit.old.end.row + 1,
-            new: edit.new.start.row + 1..edit.new.end.row + 1,
-        }
-    } else if edit.old.start.column == 0 && edit.old.end.column == 0 && edit.new.end.column == 0 {
-        Edit {
-            old: edit.old.start.row..edit.old.end.row,
-            new: edit.new.start.row..edit.new.end.row,
-        }
-    } else {
-        Edit {
-            old: edit.old.start.row..edit.old.end.row + 1,
-            new: edit.new.start.row..edit.new.end.row + 1,
-        }
-    }
-}
-
-#[derive(Copy, Clone, Debug)]
-enum ChangeAuthor {
-    User,
-    Agent,
-}
-
-enum TrackedBufferStatus {
-    Created { existing_file_content: Option<Rope> },
-    Modified,
-    Deleted,
-}
-
-struct TrackedBuffer {
-    buffer: Entity<Buffer>,
-    diff_base: Rope,
-    unreviewed_edits: Patch<u32>,
-    status: TrackedBufferStatus,
-    version: clock::Global,
-    diff: Entity<BufferDiff>,
-    snapshot: text::BufferSnapshot,
-    diff_update: mpsc::UnboundedSender<(ChangeAuthor, text::BufferSnapshot)>,
-    _open_lsp_handle: OpenLspBufferHandle,
-    _maintain_diff: Task<()>,
-    _subscription: Subscription,
-}
-
-impl TrackedBuffer {
-    fn has_edits(&self, cx: &App) -> bool {
-        self.diff
-            .read(cx)
-            .hunks(self.buffer.read(cx), cx)
-            .next()
-            .is_some()
-    }
-
-    fn schedule_diff_update(&self, author: ChangeAuthor, cx: &App) {
-        self.diff_update
-            .unbounded_send((author, self.buffer.read(cx).text_snapshot()))
-            .ok();
-    }
-}
-
-pub struct ChangedBuffer {
-    pub diff: Entity<BufferDiff>,
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use buffer_diff::DiffHunkStatusKind;
-    use gpui::TestAppContext;
-    use language::Point;
-    use project::{FakeFs, Fs, Project, RemoveOptions};
-    use rand::prelude::*;
-    use serde_json::json;
-    use settings::SettingsStore;
-    use std::env;
-    use util::{RandomCharIter, path};
-
-    #[ctor::ctor]
-    fn init_logger() {
-        zlog::init_test();
-    }
-
-    fn init_test(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-        });
-    }
-
-    #[gpui::test(iterations = 10)]
-    async fn test_keep_edits(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(path!("/dir"), json!({"file": "abc\ndef\nghi\njkl\nmno"}))
-            .await;
-        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-        let file_path = project
-            .read_with(cx, |project, cx| project.find_project_path("dir/file", cx))
-            .unwrap();
-        let buffer = project
-            .update(cx, |project, cx| project.open_buffer(file_path, cx))
-            .await
-            .unwrap();
-
-        cx.update(|cx| {
-            action_log.update(cx, |log, cx| log.buffer_read(buffer.clone(), cx));
-            buffer.update(cx, |buffer, cx| {
-                buffer
-                    .edit([(Point::new(1, 1)..Point::new(1, 2), "E")], None, cx)
-                    .unwrap()
-            });
-            buffer.update(cx, |buffer, cx| {
-                buffer
-                    .edit([(Point::new(4, 2)..Point::new(4, 3), "O")], None, cx)
-                    .unwrap()
-            });
-            action_log.update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
-        });
-        cx.run_until_parked();
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.text()),
-            "abc\ndEf\nghi\njkl\nmnO"
-        );
-        assert_eq!(
-            unreviewed_hunks(&action_log, cx),
-            vec![(
-                buffer.clone(),
-                vec![
-                    HunkStatus {
-                        range: Point::new(1, 0)..Point::new(2, 0),
-                        diff_status: DiffHunkStatusKind::Modified,
-                        old_text: "def\n".into(),
-                    },
-                    HunkStatus {
-                        range: Point::new(4, 0)..Point::new(4, 3),
-                        diff_status: DiffHunkStatusKind::Modified,
-                        old_text: "mno".into(),
-                    }
-                ],
-            )]
-        );
-
-        action_log.update(cx, |log, cx| {
-            log.keep_edits_in_range(buffer.clone(), Point::new(3, 0)..Point::new(4, 3), None, cx)
-        });
-        cx.run_until_parked();
-        assert_eq!(
-            unreviewed_hunks(&action_log, cx),
-            vec![(
-                buffer.clone(),
-                vec![HunkStatus {
-                    range: Point::new(1, 0)..Point::new(2, 0),
-                    diff_status: DiffHunkStatusKind::Modified,
-                    old_text: "def\n".into(),
-                }],
-            )]
-        );
-
-        action_log.update(cx, |log, cx| {
-            log.keep_edits_in_range(buffer.clone(), Point::new(0, 0)..Point::new(4, 3), None, cx)
-        });
-        cx.run_until_parked();
-        assert_eq!(unreviewed_hunks(&action_log, cx), vec![]);
-    }
-
-    #[gpui::test(iterations = 10)]
-    async fn test_deletions(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/dir"),
-            json!({"file": "abc\ndef\nghi\njkl\nmno\npqr"}),
-        )
-        .await;
-        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-        let file_path = project
-            .read_with(cx, |project, cx| project.find_project_path("dir/file", cx))
-            .unwrap();
-        let buffer = project
-            .update(cx, |project, cx| project.open_buffer(file_path, cx))
-            .await
-            .unwrap();
-
-        cx.update(|cx| {
-            action_log.update(cx, |log, cx| log.buffer_read(buffer.clone(), cx));
-            buffer.update(cx, |buffer, cx| {
-                buffer
-                    .edit([(Point::new(1, 0)..Point::new(2, 0), "")], None, cx)
-                    .unwrap();
-                buffer.finalize_last_transaction();
-            });
-            buffer.update(cx, |buffer, cx| {
-                buffer
-                    .edit([(Point::new(3, 0)..Point::new(4, 0), "")], None, cx)
-                    .unwrap();
-                buffer.finalize_last_transaction();
-            });
-            action_log.update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
-        });
-        cx.run_until_parked();
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.text()),
-            "abc\nghi\njkl\npqr"
-        );
-        assert_eq!(
-            unreviewed_hunks(&action_log, cx),
-            vec![(
-                buffer.clone(),
-                vec![
-                    HunkStatus {
-                        range: Point::new(1, 0)..Point::new(1, 0),
-                        diff_status: DiffHunkStatusKind::Deleted,
-                        old_text: "def\n".into(),
-                    },
-                    HunkStatus {
-                        range: Point::new(3, 0)..Point::new(3, 0),
-                        diff_status: DiffHunkStatusKind::Deleted,
-                        old_text: "mno\n".into(),
-                    }
-                ],
-            )]
-        );
-
-        buffer.update(cx, |buffer, cx| buffer.undo(cx));
-        cx.run_until_parked();
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.text()),
-            "abc\nghi\njkl\nmno\npqr"
-        );
-        assert_eq!(
-            unreviewed_hunks(&action_log, cx),
-            vec![(
-                buffer.clone(),
-                vec![HunkStatus {
-                    range: Point::new(1, 0)..Point::new(1, 0),
-                    diff_status: DiffHunkStatusKind::Deleted,
-                    old_text: "def\n".into(),
-                }],
-            )]
-        );
-
-        action_log.update(cx, |log, cx| {
-            log.keep_edits_in_range(buffer.clone(), Point::new(1, 0)..Point::new(1, 0), None, cx)
-        });
-        cx.run_until_parked();
-        assert_eq!(unreviewed_hunks(&action_log, cx), vec![]);
-    }
-
-    #[gpui::test(iterations = 10)]
-    async fn test_overlapping_user_edits(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(path!("/dir"), json!({"file": "abc\ndef\nghi\njkl\nmno"}))
-            .await;
-        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-        let file_path = project
-            .read_with(cx, |project, cx| project.find_project_path("dir/file", cx))
-            .unwrap();
-        let buffer = project
-            .update(cx, |project, cx| project.open_buffer(file_path, cx))
-            .await
-            .unwrap();
-
-        cx.update(|cx| {
-            action_log.update(cx, |log, cx| log.buffer_read(buffer.clone(), cx));
-            buffer.update(cx, |buffer, cx| {
-                buffer
-                    .edit([(Point::new(1, 2)..Point::new(2, 3), "F\nGHI")], None, cx)
-                    .unwrap()
-            });
-            action_log.update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
-        });
-        cx.run_until_parked();
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.text()),
-            "abc\ndeF\nGHI\njkl\nmno"
-        );
-        assert_eq!(
-            unreviewed_hunks(&action_log, cx),
-            vec![(
-                buffer.clone(),
-                vec![HunkStatus {
-                    range: Point::new(1, 0)..Point::new(3, 0),
-                    diff_status: DiffHunkStatusKind::Modified,
-                    old_text: "def\nghi\n".into(),
-                }],
-            )]
-        );
-
-        buffer.update(cx, |buffer, cx| {
-            buffer.edit(
-                [
-                    (Point::new(0, 2)..Point::new(0, 2), "X"),
-                    (Point::new(3, 0)..Point::new(3, 0), "Y"),
-                ],
-                None,
-                cx,
-            )
-        });
-        cx.run_until_parked();
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.text()),
-            "abXc\ndeF\nGHI\nYjkl\nmno"
-        );
-        assert_eq!(
-            unreviewed_hunks(&action_log, cx),
-            vec![(
-                buffer.clone(),
-                vec![HunkStatus {
-                    range: Point::new(1, 0)..Point::new(3, 0),
-                    diff_status: DiffHunkStatusKind::Modified,
-                    old_text: "def\nghi\n".into(),
-                }],
-            )]
-        );
-
-        buffer.update(cx, |buffer, cx| {
-            buffer.edit([(Point::new(1, 1)..Point::new(1, 1), "Z")], None, cx)
-        });
-        cx.run_until_parked();
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.text()),
-            "abXc\ndZeF\nGHI\nYjkl\nmno"
-        );
-        assert_eq!(
-            unreviewed_hunks(&action_log, cx),
-            vec![(
-                buffer.clone(),
-                vec![HunkStatus {
-                    range: Point::new(1, 0)..Point::new(3, 0),
-                    diff_status: DiffHunkStatusKind::Modified,
-                    old_text: "def\nghi\n".into(),
-                }],
-            )]
-        );
-
-        action_log.update(cx, |log, cx| {
-            log.keep_edits_in_range(buffer.clone(), Point::new(0, 0)..Point::new(1, 0), None, cx)
-        });
-        cx.run_until_parked();
-        assert_eq!(unreviewed_hunks(&action_log, cx), vec![]);
-    }
-
-    #[gpui::test(iterations = 10)]
-    async fn test_creating_files(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(path!("/dir"), json!({})).await;
-        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-        let file_path = project
-            .read_with(cx, |project, cx| project.find_project_path("dir/file1", cx))
-            .unwrap();
-
-        let buffer = project
-            .update(cx, |project, cx| project.open_buffer(file_path, cx))
-            .await
-            .unwrap();
-        cx.update(|cx| {
-            action_log.update(cx, |log, cx| log.buffer_created(buffer.clone(), cx));
-            buffer.update(cx, |buffer, cx| buffer.set_text("lorem", cx));
-            action_log.update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
-        });
-        project
-            .update(cx, |project, cx| project.save_buffer(buffer.clone(), cx))
-            .await
-            .unwrap();
-        cx.run_until_parked();
-        assert_eq!(
-            unreviewed_hunks(&action_log, cx),
-            vec![(
-                buffer.clone(),
-                vec![HunkStatus {
-                    range: Point::new(0, 0)..Point::new(0, 5),
-                    diff_status: DiffHunkStatusKind::Added,
-                    old_text: "".into(),
-                }],
-            )]
-        );
-
-        buffer.update(cx, |buffer, cx| buffer.edit([(0..0, "X")], None, cx));
-        cx.run_until_parked();
-        assert_eq!(
-            unreviewed_hunks(&action_log, cx),
-            vec![(
-                buffer.clone(),
-                vec![HunkStatus {
-                    range: Point::new(0, 0)..Point::new(0, 6),
-                    diff_status: DiffHunkStatusKind::Added,
-                    old_text: "".into(),
-                }],
-            )]
-        );
-
-        action_log.update(cx, |log, cx| {
-            log.keep_edits_in_range(buffer.clone(), 0..5, None, cx)
-        });
-        cx.run_until_parked();
-        assert_eq!(unreviewed_hunks(&action_log, cx), vec![]);
-    }
-
-    #[gpui::test(iterations = 10)]
-    async fn test_overwriting_files(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/dir"),
-            json!({
-                "file1": "Lorem ipsum dolor"
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-        let file_path = project
-            .read_with(cx, |project, cx| project.find_project_path("dir/file1", cx))
-            .unwrap();
-
-        let buffer = project
-            .update(cx, |project, cx| project.open_buffer(file_path, cx))
-            .await
-            .unwrap();
-        cx.update(|cx| {
-            action_log.update(cx, |log, cx| log.buffer_created(buffer.clone(), cx));
-            buffer.update(cx, |buffer, cx| buffer.set_text("sit amet consecteur", cx));
-            action_log.update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
-        });
-        project
-            .update(cx, |project, cx| project.save_buffer(buffer.clone(), cx))
-            .await
-            .unwrap();
-        cx.run_until_parked();
-        assert_eq!(
-            unreviewed_hunks(&action_log, cx),
-            vec![(
-                buffer.clone(),
-                vec![HunkStatus {
-                    range: Point::new(0, 0)..Point::new(0, 19),
-                    diff_status: DiffHunkStatusKind::Added,
-                    old_text: "".into(),
-                }],
-            )]
-        );
-
-        action_log
-            .update(cx, |log, cx| {
-                log.reject_edits_in_ranges(buffer.clone(), vec![2..5], None, cx)
-            })
-            .await
-            .unwrap();
-        cx.run_until_parked();
-        assert_eq!(unreviewed_hunks(&action_log, cx), vec![]);
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _cx| buffer.text()),
-            "Lorem ipsum dolor"
-        );
-    }
-
-    #[gpui::test(iterations = 10)]
-    async fn test_overwriting_previously_edited_files(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/dir"),
-            json!({
-                "file1": "Lorem ipsum dolor"
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-        let file_path = project
-            .read_with(cx, |project, cx| project.find_project_path("dir/file1", cx))
-            .unwrap();
-
-        let buffer = project
-            .update(cx, |project, cx| project.open_buffer(file_path, cx))
-            .await
-            .unwrap();
-        cx.update(|cx| {
-            action_log.update(cx, |log, cx| log.buffer_read(buffer.clone(), cx));
-            buffer.update(cx, |buffer, cx| buffer.append(" sit amet consecteur", cx));
-            action_log.update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
-        });
-        project
-            .update(cx, |project, cx| project.save_buffer(buffer.clone(), cx))
-            .await
-            .unwrap();
-        cx.run_until_parked();
-        assert_eq!(
-            unreviewed_hunks(&action_log, cx),
-            vec![(
-                buffer.clone(),
-                vec![HunkStatus {
-                    range: Point::new(0, 0)..Point::new(0, 37),
-                    diff_status: DiffHunkStatusKind::Modified,
-                    old_text: "Lorem ipsum dolor".into(),
-                }],
-            )]
-        );
-
-        cx.update(|cx| {
-            action_log.update(cx, |log, cx| log.buffer_created(buffer.clone(), cx));
-            buffer.update(cx, |buffer, cx| buffer.set_text("rewritten", cx));
-            action_log.update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
-        });
-        project
-            .update(cx, |project, cx| project.save_buffer(buffer.clone(), cx))
-            .await
-            .unwrap();
-        cx.run_until_parked();
-        assert_eq!(
-            unreviewed_hunks(&action_log, cx),
-            vec![(
-                buffer.clone(),
-                vec![HunkStatus {
-                    range: Point::new(0, 0)..Point::new(0, 9),
-                    diff_status: DiffHunkStatusKind::Added,
-                    old_text: "".into(),
-                }],
-            )]
-        );
-
-        action_log
-            .update(cx, |log, cx| {
-                log.reject_edits_in_ranges(buffer.clone(), vec![2..5], None, cx)
-            })
-            .await
-            .unwrap();
-        cx.run_until_parked();
-        assert_eq!(unreviewed_hunks(&action_log, cx), vec![]);
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _cx| buffer.text()),
-            "Lorem ipsum dolor"
-        );
-    }
-
-    #[gpui::test(iterations = 10)]
-    async fn test_deleting_files(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/dir"),
-            json!({"file1": "lorem\n", "file2": "ipsum\n"}),
-        )
-        .await;
-
-        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let file1_path = project
-            .read_with(cx, |project, cx| project.find_project_path("dir/file1", cx))
-            .unwrap();
-        let file2_path = project
-            .read_with(cx, |project, cx| project.find_project_path("dir/file2", cx))
-            .unwrap();
-
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-        let buffer1 = project
-            .update(cx, |project, cx| {
-                project.open_buffer(file1_path.clone(), cx)
-            })
-            .await
-            .unwrap();
-        let buffer2 = project
-            .update(cx, |project, cx| {
-                project.open_buffer(file2_path.clone(), cx)
-            })
-            .await
-            .unwrap();
-
-        action_log.update(cx, |log, cx| log.will_delete_buffer(buffer1.clone(), cx));
-        action_log.update(cx, |log, cx| log.will_delete_buffer(buffer2.clone(), cx));
-        project
-            .update(cx, |project, cx| {
-                project.delete_file(file1_path.clone(), false, cx)
-            })
-            .unwrap()
-            .await
-            .unwrap();
-        project
-            .update(cx, |project, cx| {
-                project.delete_file(file2_path.clone(), false, cx)
-            })
-            .unwrap()
-            .await
-            .unwrap();
-        cx.run_until_parked();
-        assert_eq!(
-            unreviewed_hunks(&action_log, cx),
-            vec![
-                (
-                    buffer1.clone(),
-                    vec![HunkStatus {
-                        range: Point::new(0, 0)..Point::new(0, 0),
-                        diff_status: DiffHunkStatusKind::Deleted,
-                        old_text: "lorem\n".into(),
-                    }]
-                ),
-                (
-                    buffer2.clone(),
-                    vec![HunkStatus {
-                        range: Point::new(0, 0)..Point::new(0, 0),
-                        diff_status: DiffHunkStatusKind::Deleted,
-                        old_text: "ipsum\n".into(),
-                    }],
-                )
-            ]
-        );
-
-        // Simulate file1 being recreated externally.
-        fs.insert_file(path!("/dir/file1"), "LOREM".as_bytes().to_vec())
-            .await;
-
-        // Simulate file2 being recreated by a tool.
-        let buffer2 = project
-            .update(cx, |project, cx| project.open_buffer(file2_path, cx))
-            .await
-            .unwrap();
-        action_log.update(cx, |log, cx| log.buffer_created(buffer2.clone(), cx));
-        buffer2.update(cx, |buffer, cx| buffer.set_text("IPSUM", cx));
-        action_log.update(cx, |log, cx| log.buffer_edited(buffer2.clone(), cx));
-        project
-            .update(cx, |project, cx| project.save_buffer(buffer2.clone(), cx))
-            .await
-            .unwrap();
-
-        cx.run_until_parked();
-        assert_eq!(
-            unreviewed_hunks(&action_log, cx),
-            vec![(
-                buffer2.clone(),
-                vec![HunkStatus {
-                    range: Point::new(0, 0)..Point::new(0, 5),
-                    diff_status: DiffHunkStatusKind::Added,
-                    old_text: "".into(),
-                }],
-            )]
-        );
-
-        // Simulate file2 being deleted externally.
-        fs.remove_file(path!("/dir/file2").as_ref(), RemoveOptions::default())
-            .await
-            .unwrap();
-        cx.run_until_parked();
-        assert_eq!(unreviewed_hunks(&action_log, cx), vec![]);
-    }
-
-    #[gpui::test(iterations = 10)]
-    async fn test_reject_edits(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(path!("/dir"), json!({"file": "abc\ndef\nghi\njkl\nmno"}))
-            .await;
-        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-        let file_path = project
-            .read_with(cx, |project, cx| project.find_project_path("dir/file", cx))
-            .unwrap();
-        let buffer = project
-            .update(cx, |project, cx| project.open_buffer(file_path, cx))
-            .await
-            .unwrap();
-
-        cx.update(|cx| {
-            action_log.update(cx, |log, cx| log.buffer_read(buffer.clone(), cx));
-            buffer.update(cx, |buffer, cx| {
-                buffer
-                    .edit([(Point::new(1, 1)..Point::new(1, 2), "E\nXYZ")], None, cx)
-                    .unwrap()
-            });
-            buffer.update(cx, |buffer, cx| {
-                buffer
-                    .edit([(Point::new(5, 2)..Point::new(5, 3), "O")], None, cx)
-                    .unwrap()
-            });
-            action_log.update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
-        });
-        cx.run_until_parked();
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.text()),
-            "abc\ndE\nXYZf\nghi\njkl\nmnO"
-        );
-        assert_eq!(
-            unreviewed_hunks(&action_log, cx),
-            vec![(
-                buffer.clone(),
-                vec![
-                    HunkStatus {
-                        range: Point::new(1, 0)..Point::new(3, 0),
-                        diff_status: DiffHunkStatusKind::Modified,
-                        old_text: "def\n".into(),
-                    },
-                    HunkStatus {
-                        range: Point::new(5, 0)..Point::new(5, 3),
-                        diff_status: DiffHunkStatusKind::Modified,
-                        old_text: "mno".into(),
-                    }
-                ],
-            )]
-        );
-
-        // If the rejected range doesn't overlap with any hunk, we ignore it.
-        action_log
-            .update(cx, |log, cx| {
-                log.reject_edits_in_ranges(
-                    buffer.clone(),
-                    vec![Point::new(4, 0)..Point::new(4, 0)],
-                    None,
-                    cx,
-                )
-            })
-            .await
-            .unwrap();
-        cx.run_until_parked();
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.text()),
-            "abc\ndE\nXYZf\nghi\njkl\nmnO"
-        );
-        assert_eq!(
-            unreviewed_hunks(&action_log, cx),
-            vec![(
-                buffer.clone(),
-                vec![
-                    HunkStatus {
-                        range: Point::new(1, 0)..Point::new(3, 0),
-                        diff_status: DiffHunkStatusKind::Modified,
-                        old_text: "def\n".into(),
-                    },
-                    HunkStatus {
-                        range: Point::new(5, 0)..Point::new(5, 3),
-                        diff_status: DiffHunkStatusKind::Modified,
-                        old_text: "mno".into(),
-                    }
-                ],
-            )]
-        );
-
-        action_log
-            .update(cx, |log, cx| {
-                log.reject_edits_in_ranges(
-                    buffer.clone(),
-                    vec![Point::new(0, 0)..Point::new(1, 0)],
-                    None,
-                    cx,
-                )
-            })
-            .await
-            .unwrap();
-        cx.run_until_parked();
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.text()),
-            "abc\ndef\nghi\njkl\nmnO"
-        );
-        assert_eq!(
-            unreviewed_hunks(&action_log, cx),
-            vec![(
-                buffer.clone(),
-                vec![HunkStatus {
-                    range: Point::new(4, 0)..Point::new(4, 3),
-                    diff_status: DiffHunkStatusKind::Modified,
-                    old_text: "mno".into(),
-                }],
-            )]
-        );
-
-        action_log
-            .update(cx, |log, cx| {
-                log.reject_edits_in_ranges(
-                    buffer.clone(),
-                    vec![Point::new(4, 0)..Point::new(4, 0)],
-                    None,
-                    cx,
-                )
-            })
-            .await
-            .unwrap();
-        cx.run_until_parked();
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.text()),
-            "abc\ndef\nghi\njkl\nmno"
-        );
-        assert_eq!(unreviewed_hunks(&action_log, cx), vec![]);
-    }
-
-    #[gpui::test(iterations = 10)]
-    async fn test_reject_multiple_edits(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(path!("/dir"), json!({"file": "abc\ndef\nghi\njkl\nmno"}))
-            .await;
-        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-        let file_path = project
-            .read_with(cx, |project, cx| project.find_project_path("dir/file", cx))
-            .unwrap();
-        let buffer = project
-            .update(cx, |project, cx| project.open_buffer(file_path, cx))
-            .await
-            .unwrap();
-
-        cx.update(|cx| {
-            action_log.update(cx, |log, cx| log.buffer_read(buffer.clone(), cx));
-            buffer.update(cx, |buffer, cx| {
-                buffer
-                    .edit([(Point::new(1, 1)..Point::new(1, 2), "E\nXYZ")], None, cx)
-                    .unwrap()
-            });
-            buffer.update(cx, |buffer, cx| {
-                buffer
-                    .edit([(Point::new(5, 2)..Point::new(5, 3), "O")], None, cx)
-                    .unwrap()
-            });
-            action_log.update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
-        });
-        cx.run_until_parked();
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.text()),
-            "abc\ndE\nXYZf\nghi\njkl\nmnO"
-        );
-        assert_eq!(
-            unreviewed_hunks(&action_log, cx),
-            vec![(
-                buffer.clone(),
-                vec![
-                    HunkStatus {
-                        range: Point::new(1, 0)..Point::new(3, 0),
-                        diff_status: DiffHunkStatusKind::Modified,
-                        old_text: "def\n".into(),
-                    },
-                    HunkStatus {
-                        range: Point::new(5, 0)..Point::new(5, 3),
-                        diff_status: DiffHunkStatusKind::Modified,
-                        old_text: "mno".into(),
-                    }
-                ],
-            )]
-        );
-
-        action_log.update(cx, |log, cx| {
-            let range_1 = buffer.read(cx).anchor_before(Point::new(0, 0))
-                ..buffer.read(cx).anchor_before(Point::new(1, 0));
-            let range_2 = buffer.read(cx).anchor_before(Point::new(5, 0))
-                ..buffer.read(cx).anchor_before(Point::new(5, 3));
-
-            log.reject_edits_in_ranges(buffer.clone(), vec![range_1, range_2], None, cx)
-                .detach();
-            assert_eq!(
-                buffer.read_with(cx, |buffer, _| buffer.text()),
-                "abc\ndef\nghi\njkl\nmno"
-            );
-        });
-        cx.run_until_parked();
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.text()),
-            "abc\ndef\nghi\njkl\nmno"
-        );
-        assert_eq!(unreviewed_hunks(&action_log, cx), vec![]);
-    }
-
-    #[gpui::test(iterations = 10)]
-    async fn test_reject_deleted_file(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(path!("/dir"), json!({"file": "content"}))
-            .await;
-        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-        let file_path = project
-            .read_with(cx, |project, cx| project.find_project_path("dir/file", cx))
-            .unwrap();
-        let buffer = project
-            .update(cx, |project, cx| project.open_buffer(file_path.clone(), cx))
-            .await
-            .unwrap();
-
-        cx.update(|cx| {
-            action_log.update(cx, |log, cx| log.will_delete_buffer(buffer.clone(), cx));
-        });
-        project
-            .update(cx, |project, cx| {
-                project.delete_file(file_path.clone(), false, cx)
-            })
-            .unwrap()
-            .await
-            .unwrap();
-        cx.run_until_parked();
-        assert!(!fs.is_file(path!("/dir/file").as_ref()).await);
-        assert_eq!(
-            unreviewed_hunks(&action_log, cx),
-            vec![(
-                buffer.clone(),
-                vec![HunkStatus {
-                    range: Point::new(0, 0)..Point::new(0, 0),
-                    diff_status: DiffHunkStatusKind::Deleted,
-                    old_text: "content".into(),
-                }]
-            )]
-        );
-
-        action_log
-            .update(cx, |log, cx| {
-                log.reject_edits_in_ranges(
-                    buffer.clone(),
-                    vec![Point::new(0, 0)..Point::new(0, 0)],
-                    None,
-                    cx,
-                )
-            })
-            .await
-            .unwrap();
-        cx.run_until_parked();
-        assert_eq!(buffer.read_with(cx, |buffer, _| buffer.text()), "content");
-        assert!(fs.is_file(path!("/dir/file").as_ref()).await);
-        assert_eq!(unreviewed_hunks(&action_log, cx), vec![]);
-    }
-
-    #[gpui::test(iterations = 10)]
-    async fn test_reject_created_file(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-        let file_path = project
-            .read_with(cx, |project, cx| {
-                project.find_project_path("dir/new_file", cx)
-            })
-            .unwrap();
-        let buffer = project
-            .update(cx, |project, cx| project.open_buffer(file_path, cx))
-            .await
-            .unwrap();
-        cx.update(|cx| {
-            action_log.update(cx, |log, cx| log.buffer_created(buffer.clone(), cx));
-            buffer.update(cx, |buffer, cx| buffer.set_text("content", cx));
-            action_log.update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
-        });
-        project
-            .update(cx, |project, cx| project.save_buffer(buffer.clone(), cx))
-            .await
-            .unwrap();
-        assert!(fs.is_file(path!("/dir/new_file").as_ref()).await);
-        cx.run_until_parked();
-        assert_eq!(
-            unreviewed_hunks(&action_log, cx),
-            vec![(
-                buffer.clone(),
-                vec![HunkStatus {
-                    range: Point::new(0, 0)..Point::new(0, 7),
-                    diff_status: DiffHunkStatusKind::Added,
-                    old_text: "".into(),
-                }],
-            )]
-        );
-
-        action_log
-            .update(cx, |log, cx| {
-                log.reject_edits_in_ranges(
-                    buffer.clone(),
-                    vec![Point::new(0, 0)..Point::new(0, 11)],
-                    None,
-                    cx,
-                )
-            })
-            .await
-            .unwrap();
-        cx.run_until_parked();
-        assert!(!fs.is_file(path!("/dir/new_file").as_ref()).await);
-        assert_eq!(unreviewed_hunks(&action_log, cx), vec![]);
-    }
-
-    #[gpui::test]
-    async fn test_reject_created_file_with_user_edits(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-
-        let file_path = project
-            .read_with(cx, |project, cx| {
-                project.find_project_path("dir/new_file", cx)
-            })
-            .unwrap();
-        let buffer = project
-            .update(cx, |project, cx| project.open_buffer(file_path, cx))
-            .await
-            .unwrap();
-
-        // AI creates file with initial content
-        cx.update(|cx| {
-            action_log.update(cx, |log, cx| log.buffer_created(buffer.clone(), cx));
-            buffer.update(cx, |buffer, cx| buffer.set_text("ai content", cx));
-            action_log.update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
-        });
-
-        project
-            .update(cx, |project, cx| project.save_buffer(buffer.clone(), cx))
-            .await
-            .unwrap();
-
-        cx.run_until_parked();
-
-        // User makes additional edits
-        cx.update(|cx| {
-            buffer.update(cx, |buffer, cx| {
-                buffer.edit([(10..10, "\nuser added this line")], None, cx);
-            });
-        });
-
-        project
-            .update(cx, |project, cx| project.save_buffer(buffer.clone(), cx))
-            .await
-            .unwrap();
-
-        assert!(fs.is_file(path!("/dir/new_file").as_ref()).await);
-
-        // Reject all
-        action_log
-            .update(cx, |log, cx| {
-                log.reject_edits_in_ranges(
-                    buffer.clone(),
-                    vec![Point::new(0, 0)..Point::new(100, 0)],
-                    None,
-                    cx,
-                )
-            })
-            .await
-            .unwrap();
-        cx.run_until_parked();
-
-        // File should still contain all the content
-        assert!(fs.is_file(path!("/dir/new_file").as_ref()).await);
-
-        let content = buffer.read_with(cx, |buffer, _| buffer.text());
-        assert_eq!(content, "ai content\nuser added this line");
-    }
-
-    #[gpui::test]
-    async fn test_reject_after_accepting_hunk_on_created_file(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-
-        let file_path = project
-            .read_with(cx, |project, cx| {
-                project.find_project_path("dir/new_file", cx)
-            })
-            .unwrap();
-        let buffer = project
-            .update(cx, |project, cx| project.open_buffer(file_path.clone(), cx))
-            .await
-            .unwrap();
-
-        // AI creates file with initial content
-        cx.update(|cx| {
-            action_log.update(cx, |log, cx| log.buffer_created(buffer.clone(), cx));
-            buffer.update(cx, |buffer, cx| buffer.set_text("ai content v1", cx));
-            action_log.update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
-        });
-        project
-            .update(cx, |project, cx| project.save_buffer(buffer.clone(), cx))
-            .await
-            .unwrap();
-        cx.run_until_parked();
-        assert_ne!(unreviewed_hunks(&action_log, cx), vec![]);
-
-        // User accepts the single hunk
-        action_log.update(cx, |log, cx| {
-            let buffer_range = Anchor::min_max_range_for_buffer(buffer.read(cx).remote_id());
-            log.keep_edits_in_range(buffer.clone(), buffer_range, None, cx)
-        });
-        cx.run_until_parked();
-        assert_eq!(unreviewed_hunks(&action_log, cx), vec![]);
-        assert!(fs.is_file(path!("/dir/new_file").as_ref()).await);
-
-        // AI modifies the file
-        cx.update(|cx| {
-            buffer.update(cx, |buffer, cx| buffer.set_text("ai content v2", cx));
-            action_log.update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
-        });
-        project
-            .update(cx, |project, cx| project.save_buffer(buffer.clone(), cx))
-            .await
-            .unwrap();
-        cx.run_until_parked();
-        assert_ne!(unreviewed_hunks(&action_log, cx), vec![]);
-
-        // User rejects the hunk
-        action_log
-            .update(cx, |log, cx| {
-                log.reject_edits_in_ranges(
-                    buffer.clone(),
-                    vec![Anchor::min_max_range_for_buffer(
-                        buffer.read(cx).remote_id(),
-                    )],
-                    None,
-                    cx,
-                )
-            })
-            .await
-            .unwrap();
-        cx.run_until_parked();
-        assert!(fs.is_file(path!("/dir/new_file").as_ref()).await,);
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.text()),
-            "ai content v1"
-        );
-        assert_eq!(unreviewed_hunks(&action_log, cx), vec![]);
-    }
-
-    #[gpui::test]
-    async fn test_reject_edits_on_previously_accepted_created_file(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-
-        let file_path = project
-            .read_with(cx, |project, cx| {
-                project.find_project_path("dir/new_file", cx)
-            })
-            .unwrap();
-        let buffer = project
-            .update(cx, |project, cx| project.open_buffer(file_path.clone(), cx))
-            .await
-            .unwrap();
-
-        // AI creates file with initial content
-        cx.update(|cx| {
-            action_log.update(cx, |log, cx| log.buffer_created(buffer.clone(), cx));
-            buffer.update(cx, |buffer, cx| buffer.set_text("ai content v1", cx));
-            action_log.update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
-        });
-        project
-            .update(cx, |project, cx| project.save_buffer(buffer.clone(), cx))
-            .await
-            .unwrap();
-        cx.run_until_parked();
-
-        // User clicks "Accept All"
-        action_log.update(cx, |log, cx| log.keep_all_edits(None, cx));
-        cx.run_until_parked();
-        assert!(fs.is_file(path!("/dir/new_file").as_ref()).await);
-        assert_eq!(unreviewed_hunks(&action_log, cx), vec![]); // Hunks are cleared
-
-        // AI modifies file again
-        cx.update(|cx| {
-            buffer.update(cx, |buffer, cx| buffer.set_text("ai content v2", cx));
-            action_log.update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
-        });
-        project
-            .update(cx, |project, cx| project.save_buffer(buffer.clone(), cx))
-            .await
-            .unwrap();
-        cx.run_until_parked();
-        assert_ne!(unreviewed_hunks(&action_log, cx), vec![]);
-
-        // User clicks "Reject All"
-        action_log
-            .update(cx, |log, cx| log.reject_all_edits(None, cx))
-            .await;
-        cx.run_until_parked();
-        assert!(fs.is_file(path!("/dir/new_file").as_ref()).await);
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.text()),
-            "ai content v1"
-        );
-        assert_eq!(unreviewed_hunks(&action_log, cx), vec![]);
-    }
-
-    #[gpui::test(iterations = 100)]
-    async fn test_random_diffs(mut rng: StdRng, cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let operations = env::var("OPERATIONS")
-            .map(|i| i.parse().expect("invalid `OPERATIONS` variable"))
-            .unwrap_or(20);
-
-        let text = RandomCharIter::new(&mut rng).take(50).collect::<String>();
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(path!("/dir"), json!({"file": text})).await;
-        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-        let file_path = project
-            .read_with(cx, |project, cx| project.find_project_path("dir/file", cx))
-            .unwrap();
-        let buffer = project
-            .update(cx, |project, cx| project.open_buffer(file_path, cx))
-            .await
-            .unwrap();
-
-        action_log.update(cx, |log, cx| log.buffer_read(buffer.clone(), cx));
-
-        for _ in 0..operations {
-            match rng.random_range(0..100) {
-                0..25 => {
-                    action_log.update(cx, |log, cx| {
-                        let range = buffer.read(cx).random_byte_range(0, &mut rng);
-                        log::info!("keeping edits in range {:?}", range);
-                        log.keep_edits_in_range(buffer.clone(), range, None, cx)
-                    });
-                }
-                25..50 => {
-                    action_log
-                        .update(cx, |log, cx| {
-                            let range = buffer.read(cx).random_byte_range(0, &mut rng);
-                            log::info!("rejecting edits in range {:?}", range);
-                            log.reject_edits_in_ranges(buffer.clone(), vec![range], None, cx)
-                        })
-                        .await
-                        .unwrap();
-                }
-                _ => {
-                    let is_agent_edit = rng.random_bool(0.5);
-                    if is_agent_edit {
-                        log::info!("agent edit");
-                    } else {
-                        log::info!("user edit");
-                    }
-                    cx.update(|cx| {
-                        buffer.update(cx, |buffer, cx| buffer.randomly_edit(&mut rng, 1, cx));
-                        if is_agent_edit {
-                            action_log.update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
-                        }
-                    });
-                }
-            }
-
-            if rng.random_bool(0.2) {
-                quiesce(&action_log, &buffer, cx);
-            }
-        }
-
-        quiesce(&action_log, &buffer, cx);
-
-        fn quiesce(
-            action_log: &Entity<ActionLog>,
-            buffer: &Entity<Buffer>,
-            cx: &mut TestAppContext,
-        ) {
-            log::info!("quiescing...");
-            cx.run_until_parked();
-            action_log.update(cx, |log, cx| {
-                let tracked_buffer = log.tracked_buffers.get(buffer).unwrap();
-                let mut old_text = tracked_buffer.diff_base.clone();
-                let new_text = buffer.read(cx).as_rope();
-                for edit in tracked_buffer.unreviewed_edits.edits() {
-                    let old_start = old_text.point_to_offset(Point::new(edit.new.start, 0));
-                    let old_end = old_text.point_to_offset(cmp::min(
-                        Point::new(edit.new.start + edit.old_len(), 0),
-                        old_text.max_point(),
-                    ));
-                    old_text.replace(
-                        old_start..old_end,
-                        &new_text.slice_rows(edit.new.clone()).to_string(),
-                    );
-                }
-                pretty_assertions::assert_eq!(old_text.to_string(), new_text.to_string());
-            })
-        }
-    }
-
-    #[gpui::test]
-    async fn test_keep_edits_on_commit(cx: &mut gpui::TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(
-            path!("/project"),
-            json!({
-                ".git": {},
-                "file.txt": "a\nb\nc\nd\ne\nf\ng\nh\ni\nj",
-            }),
-        )
-        .await;
-        fs.set_head_for_repo(
-            path!("/project/.git").as_ref(),
-            &[("file.txt", "a\nb\nc\nd\ne\nf\ng\nh\ni\nj".into())],
-            "0000000",
-        );
-        cx.run_until_parked();
-
-        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-
-        let file_path = project
-            .read_with(cx, |project, cx| {
-                project.find_project_path(path!("/project/file.txt"), cx)
-            })
-            .unwrap();
-        let buffer = project
-            .update(cx, |project, cx| project.open_buffer(file_path, cx))
-            .await
-            .unwrap();
-
-        cx.update(|cx| {
-            action_log.update(cx, |log, cx| log.buffer_read(buffer.clone(), cx));
-            buffer.update(cx, |buffer, cx| {
-                buffer.edit(
-                    [
-                        // Edit at the very start: a -> A
-                        (Point::new(0, 0)..Point::new(0, 1), "A"),
-                        // Deletion in the middle: remove lines d and e
-                        (Point::new(3, 0)..Point::new(5, 0), ""),
-                        // Modification: g -> GGG
-                        (Point::new(6, 0)..Point::new(6, 1), "GGG"),
-                        // Addition: insert new line after h
-                        (Point::new(7, 1)..Point::new(7, 1), "\nNEW"),
-                        // Edit the very last character: j -> J
-                        (Point::new(9, 0)..Point::new(9, 1), "J"),
-                    ],
-                    None,
-                    cx,
-                );
-            });
-            action_log.update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
-        });
-        cx.run_until_parked();
-        assert_eq!(
-            unreviewed_hunks(&action_log, cx),
-            vec![(
-                buffer.clone(),
-                vec![
-                    HunkStatus {
-                        range: Point::new(0, 0)..Point::new(1, 0),
-                        diff_status: DiffHunkStatusKind::Modified,
-                        old_text: "a\n".into()
-                    },
-                    HunkStatus {
-                        range: Point::new(3, 0)..Point::new(3, 0),
-                        diff_status: DiffHunkStatusKind::Deleted,
-                        old_text: "d\ne\n".into()
-                    },
-                    HunkStatus {
-                        range: Point::new(4, 0)..Point::new(5, 0),
-                        diff_status: DiffHunkStatusKind::Modified,
-                        old_text: "g\n".into()
-                    },
-                    HunkStatus {
-                        range: Point::new(6, 0)..Point::new(7, 0),
-                        diff_status: DiffHunkStatusKind::Added,
-                        old_text: "".into()
-                    },
-                    HunkStatus {
-                        range: Point::new(8, 0)..Point::new(8, 1),
-                        diff_status: DiffHunkStatusKind::Modified,
-                        old_text: "j".into()
-                    }
-                ]
-            )]
-        );
-
-        // Simulate a git commit that matches some edits but not others:
-        // - Accepts the first edit (a -> A)
-        // - Accepts the deletion (remove d and e)
-        // - Makes a different change to g (g -> G instead of GGG)
-        // - Ignores the NEW line addition
-        // - Ignores the last line edit (j stays as j)
-        fs.set_head_for_repo(
-            path!("/project/.git").as_ref(),
-            &[("file.txt", "A\nb\nc\nf\nG\nh\ni\nj".into())],
-            "0000001",
-        );
-        cx.run_until_parked();
-        assert_eq!(
-            unreviewed_hunks(&action_log, cx),
-            vec![(
-                buffer.clone(),
-                vec![
-                    HunkStatus {
-                        range: Point::new(4, 0)..Point::new(5, 0),
-                        diff_status: DiffHunkStatusKind::Modified,
-                        old_text: "g\n".into()
-                    },
-                    HunkStatus {
-                        range: Point::new(6, 0)..Point::new(7, 0),
-                        diff_status: DiffHunkStatusKind::Added,
-                        old_text: "".into()
-                    },
-                    HunkStatus {
-                        range: Point::new(8, 0)..Point::new(8, 1),
-                        diff_status: DiffHunkStatusKind::Modified,
-                        old_text: "j".into()
-                    }
-                ]
-            )]
-        );
-
-        // Make another commit that accepts the NEW line but with different content
-        fs.set_head_for_repo(
-            path!("/project/.git").as_ref(),
-            &[("file.txt", "A\nb\nc\nf\nGGG\nh\nDIFFERENT\ni\nj".into())],
-            "0000002",
-        );
-        cx.run_until_parked();
-        assert_eq!(
-            unreviewed_hunks(&action_log, cx),
-            vec![(
-                buffer,
-                vec![
-                    HunkStatus {
-                        range: Point::new(6, 0)..Point::new(7, 0),
-                        diff_status: DiffHunkStatusKind::Added,
-                        old_text: "".into()
-                    },
-                    HunkStatus {
-                        range: Point::new(8, 0)..Point::new(8, 1),
-                        diff_status: DiffHunkStatusKind::Modified,
-                        old_text: "j".into()
-                    }
-                ]
-            )]
-        );
-
-        // Final commit that accepts all remaining edits
-        fs.set_head_for_repo(
-            path!("/project/.git").as_ref(),
-            &[("file.txt", "A\nb\nc\nf\nGGG\nh\nNEW\ni\nJ".into())],
-            "0000003",
-        );
-        cx.run_until_parked();
-        assert_eq!(unreviewed_hunks(&action_log, cx), vec![]);
-    }
-
-    #[derive(Debug, Clone, PartialEq, Eq)]
-    struct HunkStatus {
-        range: Range<Point>,
-        diff_status: DiffHunkStatusKind,
-        old_text: String,
-    }
-
-    fn unreviewed_hunks(
-        action_log: &Entity<ActionLog>,
-        cx: &TestAppContext,
-    ) -> Vec<(Entity<Buffer>, Vec<HunkStatus>)> {
-        cx.read(|cx| {
-            action_log
-                .read(cx)
-                .changed_buffers(cx)
-                .into_iter()
-                .map(|(buffer, diff)| {
-                    let snapshot = buffer.read(cx).snapshot();
-                    (
-                        buffer,
-                        diff.read(cx)
-                            .hunks(&snapshot, cx)
-                            .map(|hunk| HunkStatus {
-                                diff_status: hunk.status().kind,
-                                range: hunk.range,
-                                old_text: diff
-                                    .read(cx)
-                                    .base_text()
-                                    .text_for_range(hunk.diff_base_byte_range)
-                                    .collect(),
-                            })
-                            .collect(),
-                    )
-                })
-                .collect()
-        })
-    }
-}
diff --git a/crates/activity_indicator/Cargo.toml b/crates/activity_indicator/Cargo.toml
deleted file mode 100644
index 8587e52723..0000000000
--- a/crates/activity_indicator/Cargo.toml
+++ /dev/null
@@ -1,34 +0,0 @@
-[package]
-name = "activity_indicator"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/activity_indicator.rs"
-doctest = false
-
-[dependencies]
-anyhow.workspace = true
-auto_update.workspace = true
-editor.workspace = true
-extension_host.workspace = true
-fs.workspace = true
-futures.workspace = true
-gpui.workspace = true
-language.workspace = true
-project.workspace = true
-proto.workspace = true
-semver.workspace = true
-smallvec.workspace = true
-ui.workspace = true
-util.workspace = true
-workspace.workspace = true
-
-[dev-dependencies]
-editor = { workspace = true, features = ["test-support"] }
-release_channel.workspace = true
diff --git a/crates/activity_indicator/LICENSE-GPL b/crates/activity_indicator/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/activity_indicator/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/activity_indicator/src/activity_indicator.rs b/crates/activity_indicator/src/activity_indicator.rs
deleted file mode 100644
index b537fabc9b..0000000000
--- a/crates/activity_indicator/src/activity_indicator.rs
+++ /dev/null
@@ -1,947 +0,0 @@
-use auto_update::{AutoUpdateStatus, AutoUpdater, DismissMessage, VersionCheckType};
-use editor::Editor;
-use extension_host::{ExtensionOperation, ExtensionStore};
-use futures::StreamExt;
-use gpui::{
-    App, Context, CursorStyle, Entity, EventEmitter, InteractiveElement as _, ParentElement as _,
-    Render, SharedString, StatefulInteractiveElement, Styled, Window, actions,
-};
-use language::{
-    BinaryStatus, LanguageRegistry, LanguageServerId, LanguageServerName,
-    LanguageServerStatusUpdate, ServerHealth,
-};
-use project::{
-    LanguageServerProgress, LspStoreEvent, ProgressToken, Project, ProjectEnvironmentEvent,
-    git_store::{GitStoreEvent, Repository},
-};
-use smallvec::SmallVec;
-use std::{
-    cmp::Reverse,
-    collections::HashSet,
-    fmt::Write,
-    sync::Arc,
-    time::{Duration, Instant},
-};
-use ui::{
-    ButtonLike, CommonAnimationExt, ContextMenu, PopoverMenu, PopoverMenuHandle, Tooltip,
-    prelude::*,
-};
-use util::truncate_and_trailoff;
-use workspace::{StatusItemView, Workspace, item::ItemHandle};
-
-const GIT_OPERATION_DELAY: Duration = Duration::from_millis(0);
-
-actions!(
-    activity_indicator,
-    [
-        /// Displays error messages from language servers in the status bar.
-        ShowErrorMessage
-    ]
-);
-
-pub enum Event {
-    ShowStatus {
-        server_name: LanguageServerName,
-        status: SharedString,
-    },
-}
-
-pub struct ActivityIndicator {
-    statuses: Vec<ServerStatus>,
-    project: Entity<Project>,
-    auto_updater: Option<Entity<AutoUpdater>>,
-    context_menu_handle: PopoverMenuHandle<ContextMenu>,
-    fs_jobs: Vec<fs::JobInfo>,
-}
-
-#[derive(Debug)]
-struct ServerStatus {
-    name: LanguageServerName,
-    status: LanguageServerStatusUpdate,
-}
-
-struct PendingWork<'a> {
-    language_server_id: LanguageServerId,
-    progress_token: &'a ProgressToken,
-    progress: &'a LanguageServerProgress,
-}
-
-struct Content {
-    icon: Option<gpui::AnyElement>,
-    message: String,
-    on_click:
-        Option<Arc<dyn Fn(&mut ActivityIndicator, &mut Window, &mut Context<ActivityIndicator>)>>,
-    tooltip_message: Option<String>,
-}
-
-impl ActivityIndicator {
-    pub fn new(
-        workspace: &mut Workspace,
-        languages: Arc<LanguageRegistry>,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) -> Entity<ActivityIndicator> {
-        let project = workspace.project().clone();
-        let auto_updater = AutoUpdater::get(cx);
-        let this = cx.new(|cx| {
-            let mut status_events = languages.language_server_binary_statuses();
-            cx.spawn(async move |this, cx| {
-                while let Some((name, binary_status)) = status_events.next().await {
-                    this.update(cx, |this: &mut ActivityIndicator, cx| {
-                        this.statuses.retain(|s| s.name != name);
-                        this.statuses.push(ServerStatus {
-                            name,
-                            status: LanguageServerStatusUpdate::Binary(binary_status),
-                        });
-                        cx.notify();
-                    })?;
-                }
-                anyhow::Ok(())
-            })
-            .detach();
-
-            let fs = project.read(cx).fs().clone();
-            let mut job_events = fs.subscribe_to_jobs();
-            cx.spawn(async move |this, cx| {
-                while let Some(job_event) = job_events.next().await {
-                    this.update(cx, |this: &mut ActivityIndicator, cx| {
-                        match job_event {
-                            fs::JobEvent::Started { info } => {
-                                this.fs_jobs.retain(|j| j.id != info.id);
-                                this.fs_jobs.push(info);
-                            }
-                            fs::JobEvent::Completed { id } => {
-                                this.fs_jobs.retain(|j| j.id != id);
-                            }
-                        }
-                        cx.notify();
-                    })?;
-                }
-                anyhow::Ok(())
-            })
-            .detach();
-
-            cx.subscribe(
-                &project.read(cx).lsp_store(),
-                |activity_indicator, _, event, cx| {
-                    if let LspStoreEvent::LanguageServerUpdate { name, message, .. } = event {
-                        if let proto::update_language_server::Variant::StatusUpdate(status_update) =
-                            message
-                        {
-                            let Some(name) = name.clone() else {
-                                return;
-                            };
-                            let status = match &status_update.status {
-                                Some(proto::status_update::Status::Binary(binary_status)) => {
-                                    if let Some(binary_status) =
-                                        proto::ServerBinaryStatus::from_i32(*binary_status)
-                                    {
-                                        let binary_status = match binary_status {
-                                            proto::ServerBinaryStatus::None => BinaryStatus::None,
-                                            proto::ServerBinaryStatus::CheckingForUpdate => {
-                                                BinaryStatus::CheckingForUpdate
-                                            }
-                                            proto::ServerBinaryStatus::Downloading => {
-                                                BinaryStatus::Downloading
-                                            }
-                                            proto::ServerBinaryStatus::Starting => {
-                                                BinaryStatus::Starting
-                                            }
-                                            proto::ServerBinaryStatus::Stopping => {
-                                                BinaryStatus::Stopping
-                                            }
-                                            proto::ServerBinaryStatus::Stopped => {
-                                                BinaryStatus::Stopped
-                                            }
-                                            proto::ServerBinaryStatus::Failed => {
-                                                let Some(error) = status_update.message.clone()
-                                                else {
-                                                    return;
-                                                };
-                                                BinaryStatus::Failed { error }
-                                            }
-                                        };
-                                        LanguageServerStatusUpdate::Binary(binary_status)
-                                    } else {
-                                        return;
-                                    }
-                                }
-                                Some(proto::status_update::Status::Health(health_status)) => {
-                                    if let Some(health) =
-                                        proto::ServerHealth::from_i32(*health_status)
-                                    {
-                                        let health = match health {
-                                            proto::ServerHealth::Ok => ServerHealth::Ok,
-                                            proto::ServerHealth::Warning => ServerHealth::Warning,
-                                            proto::ServerHealth::Error => ServerHealth::Error,
-                                        };
-                                        LanguageServerStatusUpdate::Health(
-                                            health,
-                                            status_update.message.clone().map(SharedString::from),
-                                        )
-                                    } else {
-                                        return;
-                                    }
-                                }
-                                None => return,
-                            };
-
-                            activity_indicator.statuses.retain(|s| s.name != name);
-                            activity_indicator
-                                .statuses
-                                .push(ServerStatus { name, status });
-                        }
-                        cx.notify()
-                    }
-                },
-            )
-            .detach();
-
-            cx.subscribe(
-                &project.read(cx).environment().clone(),
-                |_, _, event, cx| match event {
-                    ProjectEnvironmentEvent::ErrorsUpdated => cx.notify(),
-                },
-            )
-            .detach();
-
-            cx.subscribe(
-                &project.read(cx).git_store().clone(),
-                |_, _, event: &GitStoreEvent, cx| {
-                    if let project::git_store::GitStoreEvent::JobsUpdated = event {
-                        cx.notify()
-                    }
-                },
-            )
-            .detach();
-
-            if let Some(auto_updater) = auto_updater.as_ref() {
-                cx.observe(auto_updater, |_, _, cx| cx.notify()).detach();
-            }
-
-            Self {
-                statuses: Vec::new(),
-                project: project.clone(),
-                auto_updater,
-                context_menu_handle: PopoverMenuHandle::default(),
-                fs_jobs: Vec::new(),
-            }
-        });
-
-        cx.subscribe_in(&this, window, move |_, _, event, window, cx| match event {
-            Event::ShowStatus {
-                server_name,
-                status,
-            } => {
-                let create_buffer =
-                    project.update(cx, |project, cx| project.create_buffer(false, cx));
-                let status = status.clone();
-                let server_name = server_name.clone();
-                cx.spawn_in(window, async move |workspace, cx| {
-                    let buffer = create_buffer.await?;
-                    buffer.update(cx, |buffer, cx| {
-                        buffer.edit(
-                            [(0..0, format!("Language server {server_name}:\n\n{status}"))],
-                            None,
-                            cx,
-                        );
-                        buffer.set_capability(language::Capability::ReadOnly, cx);
-                    })?;
-                    workspace.update_in(cx, |workspace, window, cx| {
-                        workspace.add_item_to_active_pane(
-                            Box::new(cx.new(|cx| {
-                                let mut editor = Editor::for_buffer(buffer, None, window, cx);
-                                editor.set_read_only(true);
-                                editor
-                            })),
-                            None,
-                            true,
-                            window,
-                            cx,
-                        );
-                    })?;
-
-                    anyhow::Ok(())
-                })
-                .detach();
-            }
-        })
-        .detach();
-        this
-    }
-
-    fn show_error_message(&mut self, _: &ShowErrorMessage, _: &mut Window, cx: &mut Context<Self>) {
-        let mut status_message_shown = false;
-        self.statuses.retain(|status| match &status.status {
-            LanguageServerStatusUpdate::Binary(BinaryStatus::Failed { error })
-                if !status_message_shown =>
-            {
-                cx.emit(Event::ShowStatus {
-                    server_name: status.name.clone(),
-                    status: SharedString::from(error),
-                });
-                status_message_shown = true;
-                false
-            }
-            LanguageServerStatusUpdate::Health(
-                ServerHealth::Error | ServerHealth::Warning,
-                status_string,
-            ) if !status_message_shown => match status_string {
-                Some(error) => {
-                    cx.emit(Event::ShowStatus {
-                        server_name: status.name.clone(),
-                        status: error.clone(),
-                    });
-                    status_message_shown = true;
-                    false
-                }
-                None => false,
-            },
-            _ => true,
-        });
-    }
-
-    fn dismiss_message(&mut self, _: &DismissMessage, _: &mut Window, cx: &mut Context<Self>) {
-        let dismissed = if let Some(updater) = &self.auto_updater {
-            updater.update(cx, |updater, cx| updater.dismiss(cx))
-        } else {
-            false
-        };
-        if dismissed {
-            return;
-        }
-
-        self.project.update(cx, |project, cx| {
-            if project.last_formatting_failure(cx).is_some() {
-                project.reset_last_formatting_failure(cx);
-                true
-            } else {
-                false
-            }
-        });
-    }
-
-    fn pending_language_server_work<'a>(
-        &self,
-        cx: &'a App,
-    ) -> impl Iterator<Item = PendingWork<'a>> {
-        self.project
-            .read(cx)
-            .language_server_statuses(cx)
-            .rev()
-            .filter_map(|(server_id, status)| {
-                if status.pending_work.is_empty() {
-                    None
-                } else {
-                    let mut pending_work = status
-                        .pending_work
-                        .iter()
-                        .map(|(progress_token, progress)| PendingWork {
-                            language_server_id: server_id,
-                            progress_token,
-                            progress,
-                        })
-                        .collect::<SmallVec<[_; 4]>>();
-                    pending_work.sort_by_key(|work| Reverse(work.progress.last_update_at));
-                    Some(pending_work)
-                }
-            })
-            .flatten()
-    }
-
-    fn pending_environment_error<'a>(&'a self, cx: &'a App) -> Option<&'a String> {
-        self.project.read(cx).peek_environment_error(cx)
-    }
-
-    fn content_to_render(&mut self, cx: &mut Context<Self>) -> Option<Content> {
-        // Show if any direnv calls failed
-        if let Some(message) = self.pending_environment_error(cx) {
-            return Some(Content {
-                icon: Some(
-                    Icon::new(IconName::Warning)
-                        .size(IconSize::Small)
-                        .into_any_element(),
-                ),
-                message: message.clone(),
-                on_click: Some(Arc::new(move |this, window, cx| {
-                    this.project.update(cx, |project, cx| {
-                        project.pop_environment_error(cx);
-                    });
-                    window.dispatch_action(Box::new(workspace::OpenLog), cx);
-                })),
-                tooltip_message: None,
-            });
-        }
-        // Show any language server has pending activity.
-        {
-            let mut pending_work = self.pending_language_server_work(cx);
-            if let Some(PendingWork {
-                progress_token,
-                progress,
-                ..
-            }) = pending_work.next()
-            {
-                let mut message = progress.title.clone().unwrap_or(progress_token.to_string());
-
-                if let Some(percentage) = progress.percentage {
-                    write!(&mut message, " ({}%)", percentage).unwrap();
-                }
-
-                if let Some(progress_message) = progress.message.as_ref() {
-                    message.push_str(": ");
-                    message.push_str(progress_message);
-                }
-
-                let additional_work_count = pending_work.count();
-                if additional_work_count > 0 {
-                    write!(&mut message, " + {} more", additional_work_count).unwrap();
-                }
-
-                return Some(Content {
-                    icon: Some(
-                        Icon::new(IconName::ArrowCircle)
-                            .size(IconSize::Small)
-                            .with_rotate_animation(2)
-                            .into_any_element(),
-                    ),
-                    message,
-                    on_click: Some(Arc::new(Self::toggle_language_server_work_context_menu)),
-                    tooltip_message: None,
-                });
-            }
-        }
-
-        if let Some(session) = self
-            .project
-            .read(cx)
-            .dap_store()
-            .read(cx)
-            .sessions()
-            .find(|s| !s.read(cx).is_started())
-        {
-            return Some(Content {
-                icon: Some(
-                    Icon::new(IconName::ArrowCircle)
-                        .size(IconSize::Small)
-                        .with_rotate_animation(2)
-                        .into_any_element(),
-                ),
-                message: format!("Debug: {}", session.read(cx).adapter()),
-                tooltip_message: session.read(cx).label().map(|label| label.to_string()),
-                on_click: None,
-            });
-        }
-
-        let current_job = self
-            .project
-            .read(cx)
-            .active_repository(cx)
-            .map(|r| r.read(cx))
-            .and_then(Repository::current_job);
-        // Show any long-running git command
-        if let Some(job_info) = current_job
-            && Instant::now() - job_info.start >= GIT_OPERATION_DELAY
-        {
-            return Some(Content {
-                icon: Some(
-                    Icon::new(IconName::ArrowCircle)
-                        .size(IconSize::Small)
-                        .with_rotate_animation(2)
-                        .into_any_element(),
-                ),
-                message: job_info.message.into(),
-                on_click: None,
-                tooltip_message: None,
-            });
-        }
-
-        // Show any long-running fs command
-        for fs_job in &self.fs_jobs {
-            if Instant::now().duration_since(fs_job.start) >= GIT_OPERATION_DELAY {
-                return Some(Content {
-                    icon: Some(
-                        Icon::new(IconName::ArrowCircle)
-                            .size(IconSize::Small)
-                            .with_rotate_animation(2)
-                            .into_any_element(),
-                    ),
-                    message: fs_job.message.clone().into(),
-                    on_click: None,
-                    tooltip_message: None,
-                });
-            }
-        }
-
-        // Show any language server installation info.
-        let mut downloading = SmallVec::<[_; 3]>::new();
-        let mut checking_for_update = SmallVec::<[_; 3]>::new();
-        let mut failed = SmallVec::<[_; 3]>::new();
-        let mut health_messages = SmallVec::<[_; 3]>::new();
-        let mut servers_to_clear_statuses = HashSet::<LanguageServerName>::default();
-        for status in &self.statuses {
-            match &status.status {
-                LanguageServerStatusUpdate::Binary(
-                    BinaryStatus::Starting | BinaryStatus::Stopping,
-                ) => {}
-                LanguageServerStatusUpdate::Binary(BinaryStatus::Stopped) => {
-                    servers_to_clear_statuses.insert(status.name.clone());
-                }
-                LanguageServerStatusUpdate::Binary(BinaryStatus::CheckingForUpdate) => {
-                    checking_for_update.push(status.name.clone());
-                }
-                LanguageServerStatusUpdate::Binary(BinaryStatus::Downloading) => {
-                    downloading.push(status.name.clone());
-                }
-                LanguageServerStatusUpdate::Binary(BinaryStatus::Failed { .. }) => {
-                    failed.push(status.name.clone());
-                }
-                LanguageServerStatusUpdate::Binary(BinaryStatus::None) => {}
-                LanguageServerStatusUpdate::Health(health, server_status) => match server_status {
-                    Some(server_status) => {
-                        health_messages.push((status.name.clone(), *health, server_status.clone()));
-                    }
-                    None => {
-                        servers_to_clear_statuses.insert(status.name.clone());
-                    }
-                },
-            }
-        }
-        self.statuses
-            .retain(|status| !servers_to_clear_statuses.contains(&status.name));
-
-        health_messages.sort_by_key(|(_, health, _)| match health {
-            ServerHealth::Error => 2,
-            ServerHealth::Warning => 1,
-            ServerHealth::Ok => 0,
-        });
-
-        if !downloading.is_empty() {
-            return Some(Content {
-                icon: Some(
-                    Icon::new(IconName::Download)
-                        .size(IconSize::Small)
-                        .into_any_element(),
-                ),
-                message: format!(
-                    "Downloading {}...",
-                    downloading.iter().map(|name| name.as_ref()).fold(
-                        String::new(),
-                        |mut acc, s| {
-                            if !acc.is_empty() {
-                                acc.push_str(", ");
-                            }
-                            acc.push_str(s);
-                            acc
-                        }
-                    )
-                ),
-                on_click: Some(Arc::new(move |this, window, cx| {
-                    this.statuses
-                        .retain(|status| !downloading.contains(&status.name));
-                    this.dismiss_message(&DismissMessage, window, cx)
-                })),
-                tooltip_message: None,
-            });
-        }
-
-        if !checking_for_update.is_empty() {
-            return Some(Content {
-                icon: Some(
-                    Icon::new(IconName::Download)
-                        .size(IconSize::Small)
-                        .into_any_element(),
-                ),
-                message: format!(
-                    "Checking for updates to {}...",
-                    checking_for_update.iter().map(|name| name.as_ref()).fold(
-                        String::new(),
-                        |mut acc, s| {
-                            if !acc.is_empty() {
-                                acc.push_str(", ");
-                            }
-                            acc.push_str(s);
-                            acc
-                        }
-                    ),
-                ),
-                on_click: Some(Arc::new(move |this, window, cx| {
-                    this.statuses
-                        .retain(|status| !checking_for_update.contains(&status.name));
-                    this.dismiss_message(&DismissMessage, window, cx)
-                })),
-                tooltip_message: None,
-            });
-        }
-
-        if !failed.is_empty() {
-            return Some(Content {
-                icon: Some(
-                    Icon::new(IconName::Warning)
-                        .size(IconSize::Small)
-                        .into_any_element(),
-                ),
-                message: format!(
-                    "Failed to run {}. Click to show error.",
-                    failed
-                        .iter()
-                        .map(|name| name.as_ref())
-                        .fold(String::new(), |mut acc, s| {
-                            if !acc.is_empty() {
-                                acc.push_str(", ");
-                            }
-                            acc.push_str(s);
-                            acc
-                        }),
-                ),
-                on_click: Some(Arc::new(|this, window, cx| {
-                    this.show_error_message(&ShowErrorMessage, window, cx)
-                })),
-                tooltip_message: None,
-            });
-        }
-
-        // Show any formatting failure
-        if let Some(failure) = self.project.read(cx).last_formatting_failure(cx) {
-            return Some(Content {
-                icon: Some(
-                    Icon::new(IconName::Warning)
-                        .size(IconSize::Small)
-                        .into_any_element(),
-                ),
-                message: format!("Formatting failed: {failure}. Click to see logs."),
-                on_click: Some(Arc::new(|indicator, window, cx| {
-                    indicator.project.update(cx, |project, cx| {
-                        project.reset_last_formatting_failure(cx);
-                    });
-                    window.dispatch_action(Box::new(workspace::OpenLog), cx);
-                })),
-                tooltip_message: None,
-            });
-        }
-
-        // Show any health messages for the language servers
-        if let Some((server_name, health, message)) = health_messages.pop() {
-            let health_str = match health {
-                ServerHealth::Ok => format!("({server_name}) "),
-                ServerHealth::Warning => format!("({server_name}) Warning: "),
-                ServerHealth::Error => format!("({server_name}) Error: "),
-            };
-            let single_line_message = message
-                .lines()
-                .filter_map(|line| {
-                    let line = line.trim();
-                    if line.is_empty() { None } else { Some(line) }
-                })
-                .collect::<Vec<_>>()
-                .join(" ");
-            let mut altered_message = single_line_message != message;
-            let truncated_message = truncate_and_trailoff(
-                &single_line_message,
-                MAX_MESSAGE_LEN.saturating_sub(health_str.len()),
-            );
-            altered_message |= truncated_message != single_line_message;
-            let final_message = format!("{health_str}{truncated_message}");
-
-            let tooltip_message = if altered_message {
-                Some(format!("{health_str}{message}"))
-            } else {
-                None
-            };
-
-            return Some(Content {
-                icon: Some(
-                    Icon::new(IconName::Warning)
-                        .size(IconSize::Small)
-                        .into_any_element(),
-                ),
-                message: final_message,
-                tooltip_message,
-                on_click: Some(Arc::new(move |activity_indicator, window, cx| {
-                    if altered_message {
-                        activity_indicator.show_error_message(&ShowErrorMessage, window, cx)
-                    } else {
-                        activity_indicator
-                            .statuses
-                            .retain(|status| status.name != server_name);
-                        cx.notify();
-                    }
-                })),
-            });
-        }
-
-        // Show any application auto-update info.
-        self.auto_updater
-            .as_ref()
-            .and_then(|updater| match &updater.read(cx).status() {
-                AutoUpdateStatus::Checking => Some(Content {
-                    icon: Some(
-                        Icon::new(IconName::LoadCircle)
-                            .size(IconSize::Small)
-                            .with_rotate_animation(3)
-                            .into_any_element(),
-                    ),
-                    message: "Checking for Zed updates…".to_string(),
-                    on_click: Some(Arc::new(|this, window, cx| {
-                        this.dismiss_message(&DismissMessage, window, cx)
-                    })),
-                    tooltip_message: None,
-                }),
-                AutoUpdateStatus::Downloading { version } => Some(Content {
-                    icon: Some(
-                        Icon::new(IconName::Download)
-                            .size(IconSize::Small)
-                            .into_any_element(),
-                    ),
-                    message: "Downloading Zed update…".to_string(),
-                    on_click: Some(Arc::new(|this, window, cx| {
-                        this.dismiss_message(&DismissMessage, window, cx)
-                    })),
-                    tooltip_message: Some(Self::version_tooltip_message(version)),
-                }),
-                AutoUpdateStatus::Installing { version } => Some(Content {
-                    icon: Some(
-                        Icon::new(IconName::LoadCircle)
-                            .size(IconSize::Small)
-                            .with_rotate_animation(3)
-                            .into_any_element(),
-                    ),
-                    message: "Installing Zed update…".to_string(),
-                    on_click: Some(Arc::new(|this, window, cx| {
-                        this.dismiss_message(&DismissMessage, window, cx)
-                    })),
-                    tooltip_message: Some(Self::version_tooltip_message(version)),
-                }),
-                AutoUpdateStatus::Updated { version } => Some(Content {
-                    icon: None,
-                    message: "Click to restart and update Zed".to_string(),
-                    on_click: Some(Arc::new(move |_, _, cx| workspace::reload(cx))),
-                    tooltip_message: Some(Self::version_tooltip_message(version)),
-                }),
-                AutoUpdateStatus::Errored { error } => Some(Content {
-                    icon: Some(
-                        Icon::new(IconName::Warning)
-                            .size(IconSize::Small)
-                            .into_any_element(),
-                    ),
-                    message: "Failed to update Zed".to_string(),
-                    on_click: Some(Arc::new(|this, window, cx| {
-                        window.dispatch_action(Box::new(workspace::OpenLog), cx);
-                        this.dismiss_message(&DismissMessage, window, cx);
-                    })),
-                    tooltip_message: Some(format!("{error}")),
-                }),
-                AutoUpdateStatus::Idle => None,
-            })
-            .or_else(|| {
-                if let Some(extension_store) =
-                    ExtensionStore::try_global(cx).map(|extension_store| extension_store.read(cx))
-                    && let Some((extension_id, operation)) =
-                        extension_store.outstanding_operations().iter().next()
-                {
-                    let (message, icon, rotate) = match operation {
-                        ExtensionOperation::Install => (
-                            format!("Installing {extension_id} extension…"),
-                            IconName::LoadCircle,
-                            true,
-                        ),
-                        ExtensionOperation::Upgrade => (
-                            format!("Updating {extension_id} extension…"),
-                            IconName::Download,
-                            false,
-                        ),
-                        ExtensionOperation::Remove => (
-                            format!("Removing {extension_id} extension…"),
-                            IconName::LoadCircle,
-                            true,
-                        ),
-                    };
-
-                    Some(Content {
-                        icon: Some(Icon::new(icon).size(IconSize::Small).map(|this| {
-                            if rotate {
-                                this.with_rotate_animation(3).into_any_element()
-                            } else {
-                                this.into_any_element()
-                            }
-                        })),
-                        message,
-                        on_click: Some(Arc::new(|this, window, cx| {
-                            this.dismiss_message(&Default::default(), window, cx)
-                        })),
-                        tooltip_message: None,
-                    })
-                } else {
-                    None
-                }
-            })
-    }
-
-    fn version_tooltip_message(version: &VersionCheckType) -> String {
-        format!("Version: {}", {
-            match version {
-                auto_update::VersionCheckType::Sha(sha) => format!("{}…", sha.short()),
-                auto_update::VersionCheckType::Semantic(semantic_version) => {
-                    semantic_version.to_string()
-                }
-            }
-        })
-    }
-
-    fn toggle_language_server_work_context_menu(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.context_menu_handle.toggle(window, cx);
-    }
-}
-
-impl EventEmitter<Event> for ActivityIndicator {}
-
-const MAX_MESSAGE_LEN: usize = 50;
-
-impl Render for ActivityIndicator {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let result = h_flex()
-            .id("activity-indicator")
-            .on_action(cx.listener(Self::show_error_message))
-            .on_action(cx.listener(Self::dismiss_message));
-        let Some(content) = self.content_to_render(cx) else {
-            return result;
-        };
-        let activity_indicator = cx.entity().downgrade();
-        let truncate_content = content.message.len() > MAX_MESSAGE_LEN;
-        result.gap_2().child(
-            PopoverMenu::new("activity-indicator-popover")
-                .trigger(
-                    ButtonLike::new("activity-indicator-trigger").child(
-                        h_flex()
-                            .id("activity-indicator-status")
-                            .gap_2()
-                            .children(content.icon)
-                            .map(|button| {
-                                if truncate_content {
-                                    button
-                                        .child(
-                                            Label::new(truncate_and_trailoff(
-                                                &content.message,
-                                                MAX_MESSAGE_LEN,
-                                            ))
-                                            .size(LabelSize::Small),
-                                        )
-                                        .tooltip(Tooltip::text(content.message))
-                                } else {
-                                    button
-                                        .child(Label::new(content.message).size(LabelSize::Small))
-                                        .when_some(
-                                            content.tooltip_message,
-                                            |this, tooltip_message| {
-                                                this.tooltip(Tooltip::text(tooltip_message))
-                                            },
-                                        )
-                                }
-                            })
-                            .when_some(content.on_click, |this, handler| {
-                                this.on_click(cx.listener(move |this, _, window, cx| {
-                                    handler(this, window, cx);
-                                }))
-                                .cursor(CursorStyle::PointingHand)
-                            }),
-                    ),
-                )
-                .anchor(gpui::Corner::BottomLeft)
-                .menu(move |window, cx| {
-                    let strong_this = activity_indicator.upgrade()?;
-                    let mut has_work = false;
-                    let menu = ContextMenu::build(window, cx, |mut menu, _, cx| {
-                        for work in strong_this.read(cx).pending_language_server_work(cx) {
-                            has_work = true;
-                            let activity_indicator = activity_indicator.clone();
-                            let mut title = work
-                                .progress
-                                .title
-                                .clone()
-                                .unwrap_or(work.progress_token.to_string());
-
-                            if work.progress.is_cancellable {
-                                let language_server_id = work.language_server_id;
-                                let token = work.progress_token.clone();
-                                let title = SharedString::from(title);
-                                menu = menu.custom_entry(
-                                    move |_, _| {
-                                        h_flex()
-                                            .w_full()
-                                            .justify_between()
-                                            .child(Label::new(title.clone()))
-                                            .child(Icon::new(IconName::XCircle))
-                                            .into_any_element()
-                                    },
-                                    move |_, cx| {
-                                        let token = token.clone();
-                                        activity_indicator
-                                            .update(cx, |activity_indicator, cx| {
-                                                activity_indicator.project.update(
-                                                    cx,
-                                                    |project, cx| {
-                                                        project.cancel_language_server_work(
-                                                            language_server_id,
-                                                            Some(token),
-                                                            cx,
-                                                        );
-                                                    },
-                                                );
-                                                activity_indicator.context_menu_handle.hide(cx);
-                                                cx.notify();
-                                            })
-                                            .ok();
-                                    },
-                                );
-                            } else {
-                                if let Some(progress_message) = work.progress.message.as_ref() {
-                                    title.push_str(": ");
-                                    title.push_str(progress_message);
-                                }
-
-                                menu = menu.label(title);
-                            }
-                        }
-                        menu
-                    });
-                    has_work.then_some(menu)
-                }),
-        )
-    }
-}
-
-impl StatusItemView for ActivityIndicator {
-    fn set_active_pane_item(
-        &mut self,
-        _: Option<&dyn ItemHandle>,
-        _window: &mut Window,
-        _: &mut Context<Self>,
-    ) {
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use release_channel::AppCommitSha;
-    use semver::Version;
-
-    use super::*;
-
-    #[test]
-    fn test_version_tooltip_message() {
-        let message = ActivityIndicator::version_tooltip_message(&VersionCheckType::Semantic(
-            Version::new(1, 0, 0),
-        ));
-
-        assert_eq!(message, "Version: 1.0.0");
-
-        let message = ActivityIndicator::version_tooltip_message(&VersionCheckType::Sha(
-            AppCommitSha::new("14d9a4189f058d8736339b06ff2340101eaea5af".to_string()),
-        ));
-
-        assert_eq!(message, "Version: 14d9a41…");
-    }
-}
diff --git a/crates/agent/Cargo.toml b/crates/agent/Cargo.toml
deleted file mode 100644
index 667033a1bb..0000000000
--- a/crates/agent/Cargo.toml
+++ /dev/null
@@ -1,105 +0,0 @@
-[package]
-name = "agent"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lib]
-path = "src/agent.rs"
-
-[features]
-test-support = ["db/test-support"]
-eval = []
-unit-eval = []
-e2e = []
-
-[lints]
-workspace = true
-
-[dependencies]
-acp_thread.workspace = true
-action_log.workspace = true
-agent-client-protocol.workspace = true
-agent_servers.workspace = true
-agent_settings.workspace = true
-anyhow.workspace = true
-assistant_text_thread.workspace = true
-chrono.workspace = true
-client.workspace = true
-cloud_llm_client.workspace = true
-collections.workspace = true
-context_server.workspace = true
-db.workspace = true
-derive_more.workspace = true
-fs.workspace = true
-futures.workspace = true
-git.workspace = true
-gpui.workspace = true
-handlebars = { workspace = true, features = ["rust-embed"] }
-html_to_markdown.workspace = true
-http_client.workspace = true
-indoc.workspace = true
-itertools.workspace = true
-language.workspace = true
-language_model.workspace = true
-language_models.workspace = true
-log.workspace = true
-open.workspace = true
-parking_lot.workspace = true
-paths.workspace = true
-project.workspace = true
-prompt_store.workspace = true
-regex.workspace = true
-rust-embed.workspace = true
-schemars.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-smallvec.workspace = true
-smol.workspace = true
-sqlez.workspace = true
-streaming_diff.workspace = true
-strsim.workspace = true
-task.workspace = true
-telemetry.workspace = true
-text.workspace = true
-thiserror.workspace = true
-ui.workspace = true
-util.workspace = true
-uuid.workspace = true
-watch.workspace = true
-web_search.workspace = true
-zed_env_vars.workspace = true
-zstd.workspace = true
-
-[dev-dependencies]
-agent_servers = { workspace = true, "features" = ["test-support"] }
-assistant_text_thread = { workspace = true, "features" = ["test-support"] }
-client = { workspace = true, "features" = ["test-support"] }
-clock = { workspace = true, "features" = ["test-support"] }
-context_server = { workspace = true, "features" = ["test-support"] }
-ctor.workspace = true
-db = { workspace = true, "features" = ["test-support"] }
-editor = { workspace = true, "features" = ["test-support"] }
-env_logger.workspace = true
-eval_utils.workspace = true
-fs = { workspace = true, "features" = ["test-support"] }
-git = { workspace = true, "features" = ["test-support"] }
-gpui = { workspace = true, "features" = ["test-support"] }
-gpui_tokio.workspace = true
-language = { workspace = true, "features" = ["test-support"] }
-language_model = { workspace = true, "features" = ["test-support"] }
-lsp = { workspace = true, "features" = ["test-support"] }
-pretty_assertions.workspace = true
-project = { workspace = true, "features" = ["test-support"] }
-rand.workspace = true
-reqwest_client.workspace = true
-settings = { workspace = true, "features" = ["test-support"] }
-tempfile.workspace = true
-terminal = { workspace = true, "features" = ["test-support"] }
-theme = { workspace = true, "features" = ["test-support"] }
-tree-sitter-rust.workspace = true
-unindent = { workspace = true }
-worktree = { workspace = true, "features" = ["test-support"] }
-zlog.workspace = true
diff --git a/crates/agent/LICENSE-GPL b/crates/agent/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/agent/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/agent/src/agent.rs b/crates/agent/src/agent.rs
deleted file mode 100644
index cf98a24ac5..0000000000
--- a/crates/agent/src/agent.rs
+++ /dev/null
@@ -1,1608 +0,0 @@
-mod db;
-mod edit_agent;
-mod history_store;
-mod legacy_thread;
-mod native_agent_server;
-pub mod outline;
-mod templates;
-mod thread;
-mod tools;
-
-#[cfg(test)]
-mod tests;
-
-pub use db::*;
-pub use history_store::*;
-pub use native_agent_server::NativeAgentServer;
-pub use templates::*;
-pub use thread::*;
-pub use tools::*;
-
-use acp_thread::{AcpThread, AgentModelSelector};
-use agent_client_protocol as acp;
-use anyhow::{Context as _, Result, anyhow};
-use chrono::{DateTime, Utc};
-use collections::{HashSet, IndexMap};
-use fs::Fs;
-use futures::channel::{mpsc, oneshot};
-use futures::future::Shared;
-use futures::{StreamExt, future};
-use gpui::{
-    App, AppContext, AsyncApp, Context, Entity, SharedString, Subscription, Task, WeakEntity,
-};
-use language_model::{LanguageModel, LanguageModelProvider, LanguageModelRegistry};
-use project::{Project, ProjectItem, ProjectPath, Worktree};
-use prompt_store::{
-    ProjectContext, PromptStore, RulesFileContext, UserRulesContext, WorktreeContext,
-};
-use serde::{Deserialize, Serialize};
-use settings::{LanguageModelSelection, update_settings_file};
-use std::any::Any;
-use std::collections::HashMap;
-use std::path::{Path, PathBuf};
-use std::rc::Rc;
-use std::sync::Arc;
-use util::ResultExt;
-use util::rel_path::RelPath;
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-pub struct ProjectSnapshot {
-    pub worktree_snapshots: Vec<project::telemetry_snapshot::TelemetryWorktreeSnapshot>,
-    pub timestamp: DateTime<Utc>,
-}
-
-const RULES_FILE_NAMES: [&str; 9] = [
-    ".rules",
-    ".cursorrules",
-    ".windsurfrules",
-    ".clinerules",
-    ".github/copilot-instructions.md",
-    "CLAUDE.md",
-    "AGENT.md",
-    "AGENTS.md",
-    "GEMINI.md",
-];
-
-pub struct RulesLoadingError {
-    pub message: SharedString,
-}
-
-/// Holds both the internal Thread and the AcpThread for a session
-struct Session {
-    /// The internal thread that processes messages
-    thread: Entity<Thread>,
-    /// The ACP thread that handles protocol communication
-    acp_thread: WeakEntity<acp_thread::AcpThread>,
-    pending_save: Task<()>,
-    _subscriptions: Vec<Subscription>,
-}
-
-pub struct LanguageModels {
-    /// Access language model by ID
-    models: HashMap<acp::ModelId, Arc<dyn LanguageModel>>,
-    /// Cached list for returning language model information
-    model_list: acp_thread::AgentModelList,
-    refresh_models_rx: watch::Receiver<()>,
-    refresh_models_tx: watch::Sender<()>,
-    _authenticate_all_providers_task: Task<()>,
-}
-
-impl LanguageModels {
-    fn new(cx: &mut App) -> Self {
-        let (refresh_models_tx, refresh_models_rx) = watch::channel(());
-
-        let mut this = Self {
-            models: HashMap::default(),
-            model_list: acp_thread::AgentModelList::Grouped(IndexMap::default()),
-            refresh_models_rx,
-            refresh_models_tx,
-            _authenticate_all_providers_task: Self::authenticate_all_language_model_providers(cx),
-        };
-        this.refresh_list(cx);
-        this
-    }
-
-    fn refresh_list(&mut self, cx: &App) {
-        let providers = LanguageModelRegistry::global(cx)
-            .read(cx)
-            .providers()
-            .into_iter()
-            .filter(|provider| provider.is_authenticated(cx))
-            .collect::<Vec<_>>();
-
-        let mut language_model_list = IndexMap::default();
-        let mut recommended_models = HashSet::default();
-
-        let mut recommended = Vec::new();
-        for provider in &providers {
-            for model in provider.recommended_models(cx) {
-                recommended_models.insert((model.provider_id(), model.id()));
-                recommended.push(Self::map_language_model_to_info(&model, provider));
-            }
-        }
-        if !recommended.is_empty() {
-            language_model_list.insert(
-                acp_thread::AgentModelGroupName("Recommended".into()),
-                recommended,
-            );
-        }
-
-        let mut models = HashMap::default();
-        for provider in providers {
-            let mut provider_models = Vec::new();
-            for model in provider.provided_models(cx) {
-                let model_info = Self::map_language_model_to_info(&model, &provider);
-                let model_id = model_info.id.clone();
-                provider_models.push(model_info);
-                models.insert(model_id, model);
-            }
-            if !provider_models.is_empty() {
-                language_model_list.insert(
-                    acp_thread::AgentModelGroupName(provider.name().0.clone()),
-                    provider_models,
-                );
-            }
-        }
-
-        self.models = models;
-        self.model_list = acp_thread::AgentModelList::Grouped(language_model_list);
-        self.refresh_models_tx.send(()).ok();
-    }
-
-    fn watch(&self) -> watch::Receiver<()> {
-        self.refresh_models_rx.clone()
-    }
-
-    pub fn model_from_id(&self, model_id: &acp::ModelId) -> Option<Arc<dyn LanguageModel>> {
-        self.models.get(model_id).cloned()
-    }
-
-    fn map_language_model_to_info(
-        model: &Arc<dyn LanguageModel>,
-        provider: &Arc<dyn LanguageModelProvider>,
-    ) -> acp_thread::AgentModelInfo {
-        acp_thread::AgentModelInfo {
-            id: Self::model_id(model),
-            name: model.name().0,
-            description: None,
-            icon: Some(provider.icon()),
-        }
-    }
-
-    fn model_id(model: &Arc<dyn LanguageModel>) -> acp::ModelId {
-        acp::ModelId::new(format!("{}/{}", model.provider_id().0, model.id().0))
-    }
-
-    fn authenticate_all_language_model_providers(cx: &mut App) -> Task<()> {
-        let authenticate_all_providers = LanguageModelRegistry::global(cx)
-            .read(cx)
-            .providers()
-            .iter()
-            .map(|provider| (provider.id(), provider.name(), provider.authenticate(cx)))
-            .collect::<Vec<_>>();
-
-        cx.background_spawn(async move {
-            for (provider_id, provider_name, authenticate_task) in authenticate_all_providers {
-                if let Err(err) = authenticate_task.await {
-                    match err {
-                        language_model::AuthenticateError::CredentialsNotFound => {
-                            // Since we're authenticating these providers in the
-                            // background for the purposes of populating the
-                            // language selector, we don't care about providers
-                            // where the credentials are not found.
-                        }
-                        language_model::AuthenticateError::ConnectionRefused => {
-                            // Not logging connection refused errors as they are mostly from LM Studio's noisy auth failures.
-                            // LM Studio only has one auth method (endpoint call) which fails for users who haven't enabled it.
-                            // TODO: Better manage LM Studio auth logic to avoid these noisy failures.
-                        }
-                        _ => {
-                            // Some providers have noisy failure states that we
-                            // don't want to spam the logs with every time the
-                            // language model selector is initialized.
-                            //
-                            // Ideally these should have more clear failure modes
-                            // that we know are safe to ignore here, like what we do
-                            // with `CredentialsNotFound` above.
-                            match provider_id.0.as_ref() {
-                                "lmstudio" | "ollama" => {
-                                    // LM Studio and Ollama both make fetch requests to the local APIs to determine if they are "authenticated".
-                                    //
-                                    // These fail noisily, so we don't log them.
-                                }
-                                "copilot_chat" => {
-                                    // Copilot Chat returns an error if Copilot is not enabled, so we don't log those errors.
-                                }
-                                _ => {
-                                    log::error!(
-                                        "Failed to authenticate provider: {}: {err:#}",
-                                        provider_name.0
-                                    );
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        })
-    }
-}
-
-pub struct NativeAgent {
-    /// Session ID -> Session mapping
-    sessions: HashMap<acp::SessionId, Session>,
-    history: Entity<HistoryStore>,
-    /// Shared project context for all threads
-    project_context: Entity<ProjectContext>,
-    project_context_needs_refresh: watch::Sender<()>,
-    _maintain_project_context: Task<Result<()>>,
-    context_server_registry: Entity<ContextServerRegistry>,
-    /// Shared templates for all threads
-    templates: Arc<Templates>,
-    /// Cached model information
-    models: LanguageModels,
-    project: Entity<Project>,
-    prompt_store: Option<Entity<PromptStore>>,
-    fs: Arc<dyn Fs>,
-    _subscriptions: Vec<Subscription>,
-}
-
-impl NativeAgent {
-    pub async fn new(
-        project: Entity<Project>,
-        history: Entity<HistoryStore>,
-        templates: Arc<Templates>,
-        prompt_store: Option<Entity<PromptStore>>,
-        fs: Arc<dyn Fs>,
-        cx: &mut AsyncApp,
-    ) -> Result<Entity<NativeAgent>> {
-        log::debug!("Creating new NativeAgent");
-
-        let project_context = cx
-            .update(|cx| Self::build_project_context(&project, prompt_store.as_ref(), cx))?
-            .await;
-
-        cx.new(|cx| {
-            let mut subscriptions = vec![
-                cx.subscribe(&project, Self::handle_project_event),
-                cx.subscribe(
-                    &LanguageModelRegistry::global(cx),
-                    Self::handle_models_updated_event,
-                ),
-            ];
-            if let Some(prompt_store) = prompt_store.as_ref() {
-                subscriptions.push(cx.subscribe(prompt_store, Self::handle_prompts_updated_event))
-            }
-
-            let (project_context_needs_refresh_tx, project_context_needs_refresh_rx) =
-                watch::channel(());
-            Self {
-                sessions: HashMap::new(),
-                history,
-                project_context: cx.new(|_| project_context),
-                project_context_needs_refresh: project_context_needs_refresh_tx,
-                _maintain_project_context: cx.spawn(async move |this, cx| {
-                    Self::maintain_project_context(this, project_context_needs_refresh_rx, cx).await
-                }),
-                context_server_registry: cx.new(|cx| {
-                    ContextServerRegistry::new(project.read(cx).context_server_store(), cx)
-                }),
-                templates,
-                models: LanguageModels::new(cx),
-                project,
-                prompt_store,
-                fs,
-                _subscriptions: subscriptions,
-            }
-        })
-    }
-
-    fn register_session(
-        &mut self,
-        thread_handle: Entity<Thread>,
-        cx: &mut Context<Self>,
-    ) -> Entity<AcpThread> {
-        let connection = Rc::new(NativeAgentConnection(cx.entity()));
-
-        let thread = thread_handle.read(cx);
-        let session_id = thread.id().clone();
-        let title = thread.title();
-        let project = thread.project.clone();
-        let action_log = thread.action_log.clone();
-        let prompt_capabilities_rx = thread.prompt_capabilities_rx.clone();
-        let acp_thread = cx.new(|cx| {
-            acp_thread::AcpThread::new(
-                title,
-                connection,
-                project.clone(),
-                action_log.clone(),
-                session_id.clone(),
-                prompt_capabilities_rx,
-                cx,
-            )
-        });
-
-        let registry = LanguageModelRegistry::read_global(cx);
-        let summarization_model = registry.thread_summary_model().map(|c| c.model);
-
-        thread_handle.update(cx, |thread, cx| {
-            thread.set_summarization_model(summarization_model, cx);
-            thread.add_default_tools(
-                Rc::new(AcpThreadEnvironment {
-                    acp_thread: acp_thread.downgrade(),
-                }) as _,
-                cx,
-            )
-        });
-
-        let subscriptions = vec![
-            cx.observe_release(&acp_thread, |this, acp_thread, _cx| {
-                this.sessions.remove(acp_thread.session_id());
-            }),
-            cx.subscribe(&thread_handle, Self::handle_thread_title_updated),
-            cx.subscribe(&thread_handle, Self::handle_thread_token_usage_updated),
-            cx.observe(&thread_handle, move |this, thread, cx| {
-                this.save_thread(thread, cx)
-            }),
-        ];
-
-        self.sessions.insert(
-            session_id,
-            Session {
-                thread: thread_handle,
-                acp_thread: acp_thread.downgrade(),
-                _subscriptions: subscriptions,
-                pending_save: Task::ready(()),
-            },
-        );
-        acp_thread
-    }
-
-    pub fn models(&self) -> &LanguageModels {
-        &self.models
-    }
-
-    async fn maintain_project_context(
-        this: WeakEntity<Self>,
-        mut needs_refresh: watch::Receiver<()>,
-        cx: &mut AsyncApp,
-    ) -> Result<()> {
-        while needs_refresh.changed().await.is_ok() {
-            let project_context = this
-                .update(cx, |this, cx| {
-                    Self::build_project_context(&this.project, this.prompt_store.as_ref(), cx)
-                })?
-                .await;
-            this.update(cx, |this, cx| {
-                this.project_context = cx.new(|_| project_context);
-            })?;
-        }
-
-        Ok(())
-    }
-
-    fn build_project_context(
-        project: &Entity<Project>,
-        prompt_store: Option<&Entity<PromptStore>>,
-        cx: &mut App,
-    ) -> Task<ProjectContext> {
-        let worktrees = project.read(cx).visible_worktrees(cx).collect::<Vec<_>>();
-        let worktree_tasks = worktrees
-            .into_iter()
-            .map(|worktree| {
-                Self::load_worktree_info_for_system_prompt(worktree, project.clone(), cx)
-            })
-            .collect::<Vec<_>>();
-        let default_user_rules_task = if let Some(prompt_store) = prompt_store.as_ref() {
-            prompt_store.read_with(cx, |prompt_store, cx| {
-                let prompts = prompt_store.default_prompt_metadata();
-                let load_tasks = prompts.into_iter().map(|prompt_metadata| {
-                    let contents = prompt_store.load(prompt_metadata.id, cx);
-                    async move { (contents.await, prompt_metadata) }
-                });
-                cx.background_spawn(future::join_all(load_tasks))
-            })
-        } else {
-            Task::ready(vec![])
-        };
-
-        cx.spawn(async move |_cx| {
-            let (worktrees, default_user_rules) =
-                future::join(future::join_all(worktree_tasks), default_user_rules_task).await;
-
-            let worktrees = worktrees
-                .into_iter()
-                .map(|(worktree, _rules_error)| {
-                    // TODO: show error message
-                    // if let Some(rules_error) = rules_error {
-                    //     this.update(cx, |_, cx| cx.emit(rules_error)).ok();
-                    // }
-                    worktree
-                })
-                .collect::<Vec<_>>();
-
-            let default_user_rules = default_user_rules
-                .into_iter()
-                .flat_map(|(contents, prompt_metadata)| match contents {
-                    Ok(contents) => Some(UserRulesContext {
-                        uuid: match prompt_metadata.id {
-                            prompt_store::PromptId::User { uuid } => uuid,
-                            prompt_store::PromptId::EditWorkflow => return None,
-                        },
-                        title: prompt_metadata.title.map(|title| title.to_string()),
-                        contents,
-                    }),
-                    Err(_err) => {
-                        // TODO: show error message
-                        // this.update(cx, |_, cx| {
-                        //     cx.emit(RulesLoadingError {
-                        //         message: format!("{err:?}").into(),
-                        //     });
-                        // })
-                        // .ok();
-                        None
-                    }
-                })
-                .collect::<Vec<_>>();
-
-            ProjectContext::new(worktrees, default_user_rules)
-        })
-    }
-
-    fn load_worktree_info_for_system_prompt(
-        worktree: Entity<Worktree>,
-        project: Entity<Project>,
-        cx: &mut App,
-    ) -> Task<(WorktreeContext, Option<RulesLoadingError>)> {
-        let tree = worktree.read(cx);
-        let root_name = tree.root_name_str().into();
-        let abs_path = tree.abs_path();
-
-        let mut context = WorktreeContext {
-            root_name,
-            abs_path,
-            rules_file: None,
-        };
-
-        let rules_task = Self::load_worktree_rules_file(worktree, project, cx);
-        let Some(rules_task) = rules_task else {
-            return Task::ready((context, None));
-        };
-
-        cx.spawn(async move |_| {
-            let (rules_file, rules_file_error) = match rules_task.await {
-                Ok(rules_file) => (Some(rules_file), None),
-                Err(err) => (
-                    None,
-                    Some(RulesLoadingError {
-                        message: format!("{err}").into(),
-                    }),
-                ),
-            };
-            context.rules_file = rules_file;
-            (context, rules_file_error)
-        })
-    }
-
-    fn load_worktree_rules_file(
-        worktree: Entity<Worktree>,
-        project: Entity<Project>,
-        cx: &mut App,
-    ) -> Option<Task<Result<RulesFileContext>>> {
-        let worktree = worktree.read(cx);
-        let worktree_id = worktree.id();
-        let selected_rules_file = RULES_FILE_NAMES
-            .into_iter()
-            .filter_map(|name| {
-                worktree
-                    .entry_for_path(RelPath::unix(name).unwrap())
-                    .filter(|entry| entry.is_file())
-                    .map(|entry| entry.path.clone())
-            })
-            .next();
-
-        // Note that Cline supports `.clinerules` being a directory, but that is not currently
-        // supported. This doesn't seem to occur often in GitHub repositories.
-        selected_rules_file.map(|path_in_worktree| {
-            let project_path = ProjectPath {
-                worktree_id,
-                path: path_in_worktree.clone(),
-            };
-            let buffer_task =
-                project.update(cx, |project, cx| project.open_buffer(project_path, cx));
-            let rope_task = cx.spawn(async move |cx| {
-                buffer_task.await?.read_with(cx, |buffer, cx| {
-                    let project_entry_id = buffer.entry_id(cx).context("buffer has no file")?;
-                    anyhow::Ok((project_entry_id, buffer.as_rope().clone()))
-                })?
-            });
-            // Build a string from the rope on a background thread.
-            cx.background_spawn(async move {
-                let (project_entry_id, rope) = rope_task.await?;
-                anyhow::Ok(RulesFileContext {
-                    path_in_worktree,
-                    text: rope.to_string().trim().to_string(),
-                    project_entry_id: project_entry_id.to_usize(),
-                })
-            })
-        })
-    }
-
-    fn handle_thread_title_updated(
-        &mut self,
-        thread: Entity<Thread>,
-        _: &TitleUpdated,
-        cx: &mut Context<Self>,
-    ) {
-        let session_id = thread.read(cx).id();
-        let Some(session) = self.sessions.get(session_id) else {
-            return;
-        };
-        let thread = thread.downgrade();
-        let acp_thread = session.acp_thread.clone();
-        cx.spawn(async move |_, cx| {
-            let title = thread.read_with(cx, |thread, _| thread.title())?;
-            let task = acp_thread.update(cx, |acp_thread, cx| acp_thread.set_title(title, cx))?;
-            task.await
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn handle_thread_token_usage_updated(
-        &mut self,
-        thread: Entity<Thread>,
-        usage: &TokenUsageUpdated,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(session) = self.sessions.get(thread.read(cx).id()) else {
-            return;
-        };
-        session
-            .acp_thread
-            .update(cx, |acp_thread, cx| {
-                acp_thread.update_token_usage(usage.0.clone(), cx);
-            })
-            .ok();
-    }
-
-    fn handle_project_event(
-        &mut self,
-        _project: Entity<Project>,
-        event: &project::Event,
-        _cx: &mut Context<Self>,
-    ) {
-        match event {
-            project::Event::WorktreeAdded(_) | project::Event::WorktreeRemoved(_) => {
-                self.project_context_needs_refresh.send(()).ok();
-            }
-            project::Event::WorktreeUpdatedEntries(_, items) => {
-                if items.iter().any(|(path, _, _)| {
-                    RULES_FILE_NAMES
-                        .iter()
-                        .any(|name| path.as_ref() == RelPath::unix(name).unwrap())
-                }) {
-                    self.project_context_needs_refresh.send(()).ok();
-                }
-            }
-            _ => {}
-        }
-    }
-
-    fn handle_prompts_updated_event(
-        &mut self,
-        _prompt_store: Entity<PromptStore>,
-        _event: &prompt_store::PromptsUpdatedEvent,
-        _cx: &mut Context<Self>,
-    ) {
-        self.project_context_needs_refresh.send(()).ok();
-    }
-
-    fn handle_models_updated_event(
-        &mut self,
-        _registry: Entity<LanguageModelRegistry>,
-        _event: &language_model::Event,
-        cx: &mut Context<Self>,
-    ) {
-        self.models.refresh_list(cx);
-
-        let registry = LanguageModelRegistry::read_global(cx);
-        let default_model = registry.default_model().map(|m| m.model);
-        let summarization_model = registry.thread_summary_model().map(|m| m.model);
-
-        for session in self.sessions.values_mut() {
-            session.thread.update(cx, |thread, cx| {
-                if thread.model().is_none()
-                    && let Some(model) = default_model.clone()
-                {
-                    thread.set_model(model, cx);
-                    cx.notify();
-                }
-                thread.set_summarization_model(summarization_model.clone(), cx);
-            });
-        }
-    }
-
-    pub fn load_thread(
-        &mut self,
-        id: acp::SessionId,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Entity<Thread>>> {
-        let database_future = ThreadsDatabase::connect(cx);
-        cx.spawn(async move |this, cx| {
-            let database = database_future.await.map_err(|err| anyhow!(err))?;
-            let db_thread = database
-                .load_thread(id.clone())
-                .await?
-                .with_context(|| format!("no thread found with ID: {id:?}"))?;
-
-            this.update(cx, |this, cx| {
-                let summarization_model = LanguageModelRegistry::read_global(cx)
-                    .thread_summary_model()
-                    .map(|c| c.model);
-
-                cx.new(|cx| {
-                    let mut thread = Thread::from_db(
-                        id.clone(),
-                        db_thread,
-                        this.project.clone(),
-                        this.project_context.clone(),
-                        this.context_server_registry.clone(),
-                        this.templates.clone(),
-                        cx,
-                    );
-                    thread.set_summarization_model(summarization_model, cx);
-                    thread
-                })
-            })
-        })
-    }
-
-    pub fn open_thread(
-        &mut self,
-        id: acp::SessionId,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Entity<AcpThread>>> {
-        let task = self.load_thread(id, cx);
-        cx.spawn(async move |this, cx| {
-            let thread = task.await?;
-            let acp_thread =
-                this.update(cx, |this, cx| this.register_session(thread.clone(), cx))?;
-            let events = thread.update(cx, |thread, cx| thread.replay(cx))?;
-            cx.update(|cx| {
-                NativeAgentConnection::handle_thread_events(events, acp_thread.downgrade(), cx)
-            })?
-            .await?;
-            Ok(acp_thread)
-        })
-    }
-
-    pub fn thread_summary(
-        &mut self,
-        id: acp::SessionId,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<SharedString>> {
-        let thread = self.open_thread(id.clone(), cx);
-        cx.spawn(async move |this, cx| {
-            let acp_thread = thread.await?;
-            let result = this
-                .update(cx, |this, cx| {
-                    this.sessions
-                        .get(&id)
-                        .unwrap()
-                        .thread
-                        .update(cx, |thread, cx| thread.summary(cx))
-                })?
-                .await
-                .context("Failed to generate summary")?;
-            drop(acp_thread);
-            Ok(result)
-        })
-    }
-
-    fn save_thread(&mut self, thread: Entity<Thread>, cx: &mut Context<Self>) {
-        if thread.read(cx).is_empty() {
-            return;
-        }
-
-        let database_future = ThreadsDatabase::connect(cx);
-        let (id, db_thread) =
-            thread.update(cx, |thread, cx| (thread.id().clone(), thread.to_db(cx)));
-        let Some(session) = self.sessions.get_mut(&id) else {
-            return;
-        };
-        let history = self.history.clone();
-        session.pending_save = cx.spawn(async move |_, cx| {
-            let Some(database) = database_future.await.map_err(|err| anyhow!(err)).log_err() else {
-                return;
-            };
-            let db_thread = db_thread.await;
-            database.save_thread(id, db_thread).await.log_err();
-            history.update(cx, |history, cx| history.reload(cx)).ok();
-        });
-    }
-}
-
-/// Wrapper struct that implements the AgentConnection trait
-#[derive(Clone)]
-pub struct NativeAgentConnection(pub Entity<NativeAgent>);
-
-impl NativeAgentConnection {
-    pub fn thread(&self, session_id: &acp::SessionId, cx: &App) -> Option<Entity<Thread>> {
-        self.0
-            .read(cx)
-            .sessions
-            .get(session_id)
-            .map(|session| session.thread.clone())
-    }
-
-    pub fn load_thread(&self, id: acp::SessionId, cx: &mut App) -> Task<Result<Entity<Thread>>> {
-        self.0.update(cx, |this, cx| this.load_thread(id, cx))
-    }
-
-    fn run_turn(
-        &self,
-        session_id: acp::SessionId,
-        cx: &mut App,
-        f: impl 'static
-        + FnOnce(Entity<Thread>, &mut App) -> Result<mpsc::UnboundedReceiver<Result<ThreadEvent>>>,
-    ) -> Task<Result<acp::PromptResponse>> {
-        let Some((thread, acp_thread)) = self.0.update(cx, |agent, _cx| {
-            agent
-                .sessions
-                .get_mut(&session_id)
-                .map(|s| (s.thread.clone(), s.acp_thread.clone()))
-        }) else {
-            return Task::ready(Err(anyhow!("Session not found")));
-        };
-        log::debug!("Found session for: {}", session_id);
-
-        let response_stream = match f(thread, cx) {
-            Ok(stream) => stream,
-            Err(err) => return Task::ready(Err(err)),
-        };
-        Self::handle_thread_events(response_stream, acp_thread, cx)
-    }
-
-    fn handle_thread_events(
-        mut events: mpsc::UnboundedReceiver<Result<ThreadEvent>>,
-        acp_thread: WeakEntity<AcpThread>,
-        cx: &App,
-    ) -> Task<Result<acp::PromptResponse>> {
-        cx.spawn(async move |cx| {
-            // Handle response stream and forward to session.acp_thread
-            while let Some(result) = events.next().await {
-                match result {
-                    Ok(event) => {
-                        log::trace!("Received completion event: {:?}", event);
-
-                        match event {
-                            ThreadEvent::UserMessage(message) => {
-                                acp_thread.update(cx, |thread, cx| {
-                                    for content in message.content {
-                                        thread.push_user_content_block(
-                                            Some(message.id.clone()),
-                                            content.into(),
-                                            cx,
-                                        );
-                                    }
-                                })?;
-                            }
-                            ThreadEvent::AgentText(text) => {
-                                acp_thread.update(cx, |thread, cx| {
-                                    thread.push_assistant_content_block(text.into(), false, cx)
-                                })?;
-                            }
-                            ThreadEvent::AgentThinking(text) => {
-                                acp_thread.update(cx, |thread, cx| {
-                                    thread.push_assistant_content_block(text.into(), true, cx)
-                                })?;
-                            }
-                            ThreadEvent::ToolCallAuthorization(ToolCallAuthorization {
-                                tool_call,
-                                options,
-                                response,
-                            }) => {
-                                let outcome_task = acp_thread.update(cx, |thread, cx| {
-                                    thread.request_tool_call_authorization(
-                                        tool_call, options, true, cx,
-                                    )
-                                })??;
-                                cx.background_spawn(async move {
-                                    if let acp::RequestPermissionOutcome::Selected(
-                                        acp::SelectedPermissionOutcome { option_id, .. },
-                                    ) = outcome_task.await
-                                    {
-                                        response
-                                            .send(option_id)
-                                            .map(|_| anyhow!("authorization receiver was dropped"))
-                                            .log_err();
-                                    }
-                                })
-                                .detach();
-                            }
-                            ThreadEvent::ToolCall(tool_call) => {
-                                acp_thread.update(cx, |thread, cx| {
-                                    thread.upsert_tool_call(tool_call, cx)
-                                })??;
-                            }
-                            ThreadEvent::ToolCallUpdate(update) => {
-                                acp_thread.update(cx, |thread, cx| {
-                                    thread.update_tool_call(update, cx)
-                                })??;
-                            }
-                            ThreadEvent::Retry(status) => {
-                                acp_thread.update(cx, |thread, cx| {
-                                    thread.update_retry_status(status, cx)
-                                })?;
-                            }
-                            ThreadEvent::Stop(stop_reason) => {
-                                log::debug!("Assistant message complete: {:?}", stop_reason);
-                                return Ok(acp::PromptResponse::new(stop_reason));
-                            }
-                        }
-                    }
-                    Err(e) => {
-                        log::error!("Error in model response stream: {:?}", e);
-                        return Err(e);
-                    }
-                }
-            }
-
-            log::debug!("Response stream completed");
-            anyhow::Ok(acp::PromptResponse::new(acp::StopReason::EndTurn))
-        })
-    }
-}
-
-struct NativeAgentModelSelector {
-    session_id: acp::SessionId,
-    connection: NativeAgentConnection,
-}
-
-impl acp_thread::AgentModelSelector for NativeAgentModelSelector {
-    fn list_models(&self, cx: &mut App) -> Task<Result<acp_thread::AgentModelList>> {
-        log::debug!("NativeAgentConnection::list_models called");
-        let list = self.connection.0.read(cx).models.model_list.clone();
-        Task::ready(if list.is_empty() {
-            Err(anyhow::anyhow!("No models available"))
-        } else {
-            Ok(list)
-        })
-    }
-
-    fn select_model(&self, model_id: acp::ModelId, cx: &mut App) -> Task<Result<()>> {
-        log::debug!(
-            "Setting model for session {}: {}",
-            self.session_id,
-            model_id
-        );
-        let Some(thread) = self
-            .connection
-            .0
-            .read(cx)
-            .sessions
-            .get(&self.session_id)
-            .map(|session| session.thread.clone())
-        else {
-            return Task::ready(Err(anyhow!("Session not found")));
-        };
-
-        let Some(model) = self.connection.0.read(cx).models.model_from_id(&model_id) else {
-            return Task::ready(Err(anyhow!("Invalid model ID {}", model_id)));
-        };
-
-        thread.update(cx, |thread, cx| {
-            thread.set_model(model.clone(), cx);
-        });
-
-        update_settings_file(
-            self.connection.0.read(cx).fs.clone(),
-            cx,
-            move |settings, _cx| {
-                let provider = model.provider_id().0.to_string();
-                let model = model.id().0.to_string();
-                settings
-                    .agent
-                    .get_or_insert_default()
-                    .set_model(LanguageModelSelection {
-                        provider: provider.into(),
-                        model,
-                    });
-            },
-        );
-
-        Task::ready(Ok(()))
-    }
-
-    fn selected_model(&self, cx: &mut App) -> Task<Result<acp_thread::AgentModelInfo>> {
-        let Some(thread) = self
-            .connection
-            .0
-            .read(cx)
-            .sessions
-            .get(&self.session_id)
-            .map(|session| session.thread.clone())
-        else {
-            return Task::ready(Err(anyhow!("Session not found")));
-        };
-        let Some(model) = thread.read(cx).model() else {
-            return Task::ready(Err(anyhow!("Model not found")));
-        };
-        let Some(provider) = LanguageModelRegistry::read_global(cx).provider(&model.provider_id())
-        else {
-            return Task::ready(Err(anyhow!("Provider not found")));
-        };
-        Task::ready(Ok(LanguageModels::map_language_model_to_info(
-            model, &provider,
-        )))
-    }
-
-    fn watch(&self, cx: &mut App) -> Option<watch::Receiver<()>> {
-        Some(self.connection.0.read(cx).models.watch())
-    }
-
-    fn should_render_footer(&self) -> bool {
-        true
-    }
-}
-
-impl acp_thread::AgentConnection for NativeAgentConnection {
-    fn telemetry_id(&self) -> SharedString {
-        "zed".into()
-    }
-
-    fn new_thread(
-        self: Rc<Self>,
-        project: Entity<Project>,
-        cwd: &Path,
-        cx: &mut App,
-    ) -> Task<Result<Entity<acp_thread::AcpThread>>> {
-        let agent = self.0.clone();
-        log::debug!("Creating new thread for project at: {:?}", cwd);
-
-        cx.spawn(async move |cx| {
-            log::debug!("Starting thread creation in async context");
-
-            // Create Thread
-            let thread = agent.update(
-                cx,
-                |agent, cx: &mut gpui::Context<NativeAgent>| -> Result<_> {
-                    // Fetch default model from registry settings
-                    let registry = LanguageModelRegistry::read_global(cx);
-                    // Log available models for debugging
-                    let available_count = registry.available_models(cx).count();
-                    log::debug!("Total available models: {}", available_count);
-
-                    let default_model = registry.default_model().and_then(|default_model| {
-                        agent
-                            .models
-                            .model_from_id(&LanguageModels::model_id(&default_model.model))
-                    });
-                    Ok(cx.new(|cx| {
-                        Thread::new(
-                            project.clone(),
-                            agent.project_context.clone(),
-                            agent.context_server_registry.clone(),
-                            agent.templates.clone(),
-                            default_model,
-                            cx,
-                        )
-                    }))
-                },
-            )??;
-            agent.update(cx, |agent, cx| agent.register_session(thread, cx))
-        })
-    }
-
-    fn auth_methods(&self) -> &[acp::AuthMethod] {
-        &[] // No auth for in-process
-    }
-
-    fn authenticate(&self, _method: acp::AuthMethodId, _cx: &mut App) -> Task<Result<()>> {
-        Task::ready(Ok(()))
-    }
-
-    fn model_selector(&self, session_id: &acp::SessionId) -> Option<Rc<dyn AgentModelSelector>> {
-        Some(Rc::new(NativeAgentModelSelector {
-            session_id: session_id.clone(),
-            connection: self.clone(),
-        }) as Rc<dyn AgentModelSelector>)
-    }
-
-    fn prompt(
-        &self,
-        id: Option<acp_thread::UserMessageId>,
-        params: acp::PromptRequest,
-        cx: &mut App,
-    ) -> Task<Result<acp::PromptResponse>> {
-        let id = id.expect("UserMessageId is required");
-        let session_id = params.session_id.clone();
-        log::info!("Received prompt request for session: {}", session_id);
-        log::debug!("Prompt blocks count: {}", params.prompt.len());
-        let path_style = self.0.read(cx).project.read(cx).path_style(cx);
-
-        self.run_turn(session_id, cx, move |thread, cx| {
-            let content: Vec<UserMessageContent> = params
-                .prompt
-                .into_iter()
-                .map(|block| UserMessageContent::from_content_block(block, path_style))
-                .collect::<Vec<_>>();
-            log::debug!("Converted prompt to message: {} chars", content.len());
-            log::debug!("Message id: {:?}", id);
-            log::debug!("Message content: {:?}", content);
-
-            thread.update(cx, |thread, cx| thread.send(id, content, cx))
-        })
-    }
-
-    fn resume(
-        &self,
-        session_id: &acp::SessionId,
-        _cx: &App,
-    ) -> Option<Rc<dyn acp_thread::AgentSessionResume>> {
-        Some(Rc::new(NativeAgentSessionResume {
-            connection: self.clone(),
-            session_id: session_id.clone(),
-        }) as _)
-    }
-
-    fn cancel(&self, session_id: &acp::SessionId, cx: &mut App) {
-        log::info!("Cancelling on session: {}", session_id);
-        self.0.update(cx, |agent, cx| {
-            if let Some(agent) = agent.sessions.get(session_id) {
-                agent.thread.update(cx, |thread, cx| thread.cancel(cx));
-            }
-        });
-    }
-
-    fn truncate(
-        &self,
-        session_id: &agent_client_protocol::SessionId,
-        cx: &App,
-    ) -> Option<Rc<dyn acp_thread::AgentSessionTruncate>> {
-        self.0.read_with(cx, |agent, _cx| {
-            agent.sessions.get(session_id).map(|session| {
-                Rc::new(NativeAgentSessionTruncate {
-                    thread: session.thread.clone(),
-                    acp_thread: session.acp_thread.clone(),
-                }) as _
-            })
-        })
-    }
-
-    fn set_title(
-        &self,
-        session_id: &acp::SessionId,
-        _cx: &App,
-    ) -> Option<Rc<dyn acp_thread::AgentSessionSetTitle>> {
-        Some(Rc::new(NativeAgentSessionSetTitle {
-            connection: self.clone(),
-            session_id: session_id.clone(),
-        }) as _)
-    }
-
-    fn telemetry(&self) -> Option<Rc<dyn acp_thread::AgentTelemetry>> {
-        Some(Rc::new(self.clone()) as Rc<dyn acp_thread::AgentTelemetry>)
-    }
-
-    fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
-        self
-    }
-}
-
-impl acp_thread::AgentTelemetry for NativeAgentConnection {
-    fn thread_data(
-        &self,
-        session_id: &acp::SessionId,
-        cx: &mut App,
-    ) -> Task<Result<serde_json::Value>> {
-        let Some(session) = self.0.read(cx).sessions.get(session_id) else {
-            return Task::ready(Err(anyhow!("Session not found")));
-        };
-
-        let task = session.thread.read(cx).to_db(cx);
-        cx.background_spawn(async move {
-            serde_json::to_value(task.await).context("Failed to serialize thread")
-        })
-    }
-}
-
-struct NativeAgentSessionTruncate {
-    thread: Entity<Thread>,
-    acp_thread: WeakEntity<AcpThread>,
-}
-
-impl acp_thread::AgentSessionTruncate for NativeAgentSessionTruncate {
-    fn run(&self, message_id: acp_thread::UserMessageId, cx: &mut App) -> Task<Result<()>> {
-        match self.thread.update(cx, |thread, cx| {
-            thread.truncate(message_id.clone(), cx)?;
-            Ok(thread.latest_token_usage())
-        }) {
-            Ok(usage) => {
-                self.acp_thread
-                    .update(cx, |thread, cx| {
-                        thread.update_token_usage(usage, cx);
-                    })
-                    .ok();
-                Task::ready(Ok(()))
-            }
-            Err(error) => Task::ready(Err(error)),
-        }
-    }
-}
-
-struct NativeAgentSessionResume {
-    connection: NativeAgentConnection,
-    session_id: acp::SessionId,
-}
-
-impl acp_thread::AgentSessionResume for NativeAgentSessionResume {
-    fn run(&self, cx: &mut App) -> Task<Result<acp::PromptResponse>> {
-        self.connection
-            .run_turn(self.session_id.clone(), cx, |thread, cx| {
-                thread.update(cx, |thread, cx| thread.resume(cx))
-            })
-    }
-}
-
-struct NativeAgentSessionSetTitle {
-    connection: NativeAgentConnection,
-    session_id: acp::SessionId,
-}
-
-impl acp_thread::AgentSessionSetTitle for NativeAgentSessionSetTitle {
-    fn run(&self, title: SharedString, cx: &mut App) -> Task<Result<()>> {
-        let Some(session) = self.connection.0.read(cx).sessions.get(&self.session_id) else {
-            return Task::ready(Err(anyhow!("session not found")));
-        };
-        let thread = session.thread.clone();
-        thread.update(cx, |thread, cx| thread.set_title(title, cx));
-        Task::ready(Ok(()))
-    }
-}
-
-pub struct AcpThreadEnvironment {
-    acp_thread: WeakEntity<AcpThread>,
-}
-
-impl ThreadEnvironment for AcpThreadEnvironment {
-    fn create_terminal(
-        &self,
-        command: String,
-        cwd: Option<PathBuf>,
-        output_byte_limit: Option<u64>,
-        cx: &mut AsyncApp,
-    ) -> Task<Result<Rc<dyn TerminalHandle>>> {
-        let task = self.acp_thread.update(cx, |thread, cx| {
-            thread.create_terminal(command, vec![], vec![], cwd, output_byte_limit, cx)
-        });
-
-        let acp_thread = self.acp_thread.clone();
-        cx.spawn(async move |cx| {
-            let terminal = task?.await?;
-
-            let (drop_tx, drop_rx) = oneshot::channel();
-            let terminal_id = terminal.read_with(cx, |terminal, _cx| terminal.id().clone())?;
-
-            cx.spawn(async move |cx| {
-                drop_rx.await.ok();
-                acp_thread.update(cx, |thread, cx| thread.release_terminal(terminal_id, cx))
-            })
-            .detach();
-
-            let handle = AcpTerminalHandle {
-                terminal,
-                _drop_tx: Some(drop_tx),
-            };
-
-            Ok(Rc::new(handle) as _)
-        })
-    }
-}
-
-pub struct AcpTerminalHandle {
-    terminal: Entity<acp_thread::Terminal>,
-    _drop_tx: Option<oneshot::Sender<()>>,
-}
-
-impl TerminalHandle for AcpTerminalHandle {
-    fn id(&self, cx: &AsyncApp) -> Result<acp::TerminalId> {
-        self.terminal.read_with(cx, |term, _cx| term.id().clone())
-    }
-
-    fn wait_for_exit(&self, cx: &AsyncApp) -> Result<Shared<Task<acp::TerminalExitStatus>>> {
-        self.terminal
-            .read_with(cx, |term, _cx| term.wait_for_exit())
-    }
-
-    fn current_output(&self, cx: &AsyncApp) -> Result<acp::TerminalOutputResponse> {
-        self.terminal
-            .read_with(cx, |term, cx| term.current_output(cx))
-    }
-}
-
-#[cfg(test)]
-mod internal_tests {
-    use crate::HistoryEntryId;
-
-    use super::*;
-    use acp_thread::{AgentConnection, AgentModelGroupName, AgentModelInfo, MentionUri};
-    use fs::FakeFs;
-    use gpui::TestAppContext;
-    use indoc::formatdoc;
-    use language_model::fake_provider::FakeLanguageModel;
-    use serde_json::json;
-    use settings::SettingsStore;
-    use util::{path, rel_path::rel_path};
-
-    #[gpui::test]
-    async fn test_maintaining_project_context(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            "/",
-            json!({
-                "a": {}
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), [], cx).await;
-        let text_thread_store =
-            cx.new(|cx| assistant_text_thread::TextThreadStore::fake(project.clone(), cx));
-        let history_store = cx.new(|cx| HistoryStore::new(text_thread_store, cx));
-        let agent = NativeAgent::new(
-            project.clone(),
-            history_store,
-            Templates::new(),
-            None,
-            fs.clone(),
-            &mut cx.to_async(),
-        )
-        .await
-        .unwrap();
-        agent.read_with(cx, |agent, cx| {
-            assert_eq!(agent.project_context.read(cx).worktrees, vec![])
-        });
-
-        let worktree = project
-            .update(cx, |project, cx| project.create_worktree("/a", true, cx))
-            .await
-            .unwrap();
-        cx.run_until_parked();
-        agent.read_with(cx, |agent, cx| {
-            assert_eq!(
-                agent.project_context.read(cx).worktrees,
-                vec![WorktreeContext {
-                    root_name: "a".into(),
-                    abs_path: Path::new("/a").into(),
-                    rules_file: None
-                }]
-            )
-        });
-
-        // Creating `/a/.rules` updates the project context.
-        fs.insert_file("/a/.rules", Vec::new()).await;
-        cx.run_until_parked();
-        agent.read_with(cx, |agent, cx| {
-            let rules_entry = worktree
-                .read(cx)
-                .entry_for_path(rel_path(".rules"))
-                .unwrap();
-            assert_eq!(
-                agent.project_context.read(cx).worktrees,
-                vec![WorktreeContext {
-                    root_name: "a".into(),
-                    abs_path: Path::new("/a").into(),
-                    rules_file: Some(RulesFileContext {
-                        path_in_worktree: rel_path(".rules").into(),
-                        text: "".into(),
-                        project_entry_id: rules_entry.id.to_usize()
-                    })
-                }]
-            )
-        });
-    }
-
-    #[gpui::test]
-    async fn test_listing_models(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree("/", json!({ "a": {}  })).await;
-        let project = Project::test(fs.clone(), [], cx).await;
-        let text_thread_store =
-            cx.new(|cx| assistant_text_thread::TextThreadStore::fake(project.clone(), cx));
-        let history_store = cx.new(|cx| HistoryStore::new(text_thread_store, cx));
-        let connection = NativeAgentConnection(
-            NativeAgent::new(
-                project.clone(),
-                history_store,
-                Templates::new(),
-                None,
-                fs.clone(),
-                &mut cx.to_async(),
-            )
-            .await
-            .unwrap(),
-        );
-
-        // Create a thread/session
-        let acp_thread = cx
-            .update(|cx| {
-                Rc::new(connection.clone()).new_thread(project.clone(), Path::new("/a"), cx)
-            })
-            .await
-            .unwrap();
-
-        let session_id = cx.update(|cx| acp_thread.read(cx).session_id().clone());
-
-        let models = cx
-            .update(|cx| {
-                connection
-                    .model_selector(&session_id)
-                    .unwrap()
-                    .list_models(cx)
-            })
-            .await
-            .unwrap();
-
-        let acp_thread::AgentModelList::Grouped(models) = models else {
-            panic!("Unexpected model group");
-        };
-        assert_eq!(
-            models,
-            IndexMap::from_iter([(
-                AgentModelGroupName("Fake".into()),
-                vec![AgentModelInfo {
-                    id: acp::ModelId::new("fake/fake"),
-                    name: "Fake".into(),
-                    description: None,
-                    icon: Some(ui::IconName::ZedAssistant),
-                }]
-            )])
-        );
-    }
-
-    #[gpui::test]
-    async fn test_model_selection_persists_to_settings(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-        fs.create_dir(paths::settings_file().parent().unwrap())
-            .await
-            .unwrap();
-        fs.insert_file(
-            paths::settings_file(),
-            json!({
-                "agent": {
-                    "default_model": {
-                        "provider": "foo",
-                        "model": "bar"
-                    }
-                }
-            })
-            .to_string()
-            .into_bytes(),
-        )
-        .await;
-        let project = Project::test(fs.clone(), [], cx).await;
-
-        let text_thread_store =
-            cx.new(|cx| assistant_text_thread::TextThreadStore::fake(project.clone(), cx));
-        let history_store = cx.new(|cx| HistoryStore::new(text_thread_store, cx));
-
-        // Create the agent and connection
-        let agent = NativeAgent::new(
-            project.clone(),
-            history_store,
-            Templates::new(),
-            None,
-            fs.clone(),
-            &mut cx.to_async(),
-        )
-        .await
-        .unwrap();
-        let connection = NativeAgentConnection(agent.clone());
-
-        // Create a thread/session
-        let acp_thread = cx
-            .update(|cx| {
-                Rc::new(connection.clone()).new_thread(project.clone(), Path::new("/a"), cx)
-            })
-            .await
-            .unwrap();
-
-        let session_id = cx.update(|cx| acp_thread.read(cx).session_id().clone());
-
-        // Select a model
-        let selector = connection.model_selector(&session_id).unwrap();
-        let model_id = acp::ModelId::new("fake/fake");
-        cx.update(|cx| selector.select_model(model_id.clone(), cx))
-            .await
-            .unwrap();
-
-        // Verify the thread has the selected model
-        agent.read_with(cx, |agent, _| {
-            let session = agent.sessions.get(&session_id).unwrap();
-            session.thread.read_with(cx, |thread, _| {
-                assert_eq!(thread.model().unwrap().id().0, "fake");
-            });
-        });
-
-        cx.run_until_parked();
-
-        // Verify settings file was updated
-        let settings_content = fs.load(paths::settings_file()).await.unwrap();
-        let settings_json: serde_json::Value = serde_json::from_str(&settings_content).unwrap();
-
-        // Check that the agent settings contain the selected model
-        assert_eq!(
-            settings_json["agent"]["default_model"]["model"],
-            json!("fake")
-        );
-        assert_eq!(
-            settings_json["agent"]["default_model"]["provider"],
-            json!("fake")
-        );
-    }
-
-    #[gpui::test]
-    async fn test_save_load_thread(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            "/",
-            json!({
-                "a": {
-                    "b.md": "Lorem"
-                }
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), [path!("/a").as_ref()], cx).await;
-        let text_thread_store =
-            cx.new(|cx| assistant_text_thread::TextThreadStore::fake(project.clone(), cx));
-        let history_store = cx.new(|cx| HistoryStore::new(text_thread_store, cx));
-        let agent = NativeAgent::new(
-            project.clone(),
-            history_store.clone(),
-            Templates::new(),
-            None,
-            fs.clone(),
-            &mut cx.to_async(),
-        )
-        .await
-        .unwrap();
-        let connection = Rc::new(NativeAgentConnection(agent.clone()));
-
-        let acp_thread = cx
-            .update(|cx| {
-                connection
-                    .clone()
-                    .new_thread(project.clone(), Path::new(""), cx)
-            })
-            .await
-            .unwrap();
-        let session_id = acp_thread.read_with(cx, |thread, _| thread.session_id().clone());
-        let thread = agent.read_with(cx, |agent, _| {
-            agent.sessions.get(&session_id).unwrap().thread.clone()
-        });
-
-        // Ensure empty threads are not saved, even if they get mutated.
-        let model = Arc::new(FakeLanguageModel::default());
-        let summary_model = Arc::new(FakeLanguageModel::default());
-        thread.update(cx, |thread, cx| {
-            thread.set_model(model.clone(), cx);
-            thread.set_summarization_model(Some(summary_model.clone()), cx);
-        });
-        cx.run_until_parked();
-        assert_eq!(history_entries(&history_store, cx), vec![]);
-
-        let send = acp_thread.update(cx, |thread, cx| {
-            thread.send(
-                vec![
-                    "What does ".into(),
-                    acp::ContentBlock::ResourceLink(acp::ResourceLink::new(
-                        "b.md",
-                        MentionUri::File {
-                            abs_path: path!("/a/b.md").into(),
-                        }
-                        .to_uri()
-                        .to_string(),
-                    )),
-                    " mean?".into(),
-                ],
-                cx,
-            )
-        });
-        let send = cx.foreground_executor().spawn(send);
-        cx.run_until_parked();
-
-        model.send_last_completion_stream_text_chunk("Lorem.");
-        model.end_last_completion_stream();
-        cx.run_until_parked();
-        summary_model
-            .send_last_completion_stream_text_chunk(&format!("Explaining {}", path!("/a/b.md")));
-        summary_model.end_last_completion_stream();
-
-        send.await.unwrap();
-        let uri = MentionUri::File {
-            abs_path: path!("/a/b.md").into(),
-        }
-        .to_uri();
-        acp_thread.read_with(cx, |thread, cx| {
-            assert_eq!(
-                thread.to_markdown(cx),
-                formatdoc! {"
-                    ## User
-
-                    What does [@b.md]({uri}) mean?
-
-                    ## Assistant
-
-                    Lorem.
-
-                "}
-            )
-        });
-
-        cx.run_until_parked();
-
-        // Drop the ACP thread, which should cause the session to be dropped as well.
-        cx.update(|_| {
-            drop(thread);
-            drop(acp_thread);
-        });
-        agent.read_with(cx, |agent, _| {
-            assert_eq!(agent.sessions.keys().cloned().collect::<Vec<_>>(), []);
-        });
-
-        // Ensure the thread can be reloaded from disk.
-        assert_eq!(
-            history_entries(&history_store, cx),
-            vec![(
-                HistoryEntryId::AcpThread(session_id.clone()),
-                format!("Explaining {}", path!("/a/b.md"))
-            )]
-        );
-        let acp_thread = agent
-            .update(cx, |agent, cx| agent.open_thread(session_id.clone(), cx))
-            .await
-            .unwrap();
-        acp_thread.read_with(cx, |thread, cx| {
-            assert_eq!(
-                thread.to_markdown(cx),
-                formatdoc! {"
-                    ## User
-
-                    What does [@b.md]({uri}) mean?
-
-                    ## Assistant
-
-                    Lorem.
-
-                "}
-            )
-        });
-    }
-
-    fn history_entries(
-        history: &Entity<HistoryStore>,
-        cx: &mut TestAppContext,
-    ) -> Vec<(HistoryEntryId, String)> {
-        history.read_with(cx, |history, _| {
-            history
-                .entries()
-                .map(|e| (e.id(), e.title().to_string()))
-                .collect::<Vec<_>>()
-        })
-    }
-
-    fn init_test(cx: &mut TestAppContext) {
-        env_logger::try_init().ok();
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-
-            LanguageModelRegistry::test(cx);
-        });
-    }
-}
diff --git a/crates/agent/src/db.rs b/crates/agent/src/db.rs
deleted file mode 100644
index 7a88c58705..0000000000
--- a/crates/agent/src/db.rs
+++ /dev/null
@@ -1,443 +0,0 @@
-use crate::{AgentMessage, AgentMessageContent, UserMessage, UserMessageContent};
-use acp_thread::UserMessageId;
-use agent_client_protocol as acp;
-use agent_settings::{AgentProfileId, CompletionMode};
-use anyhow::{Result, anyhow};
-use chrono::{DateTime, Utc};
-use collections::{HashMap, IndexMap};
-use futures::{FutureExt, future::Shared};
-use gpui::{BackgroundExecutor, Global, Task};
-use indoc::indoc;
-use parking_lot::Mutex;
-use serde::{Deserialize, Serialize};
-use sqlez::{
-    bindable::{Bind, Column},
-    connection::Connection,
-    statement::Statement,
-};
-use std::sync::Arc;
-use ui::{App, SharedString};
-use zed_env_vars::ZED_STATELESS;
-
-pub type DbMessage = crate::Message;
-pub type DbSummary = crate::legacy_thread::DetailedSummaryState;
-pub type DbLanguageModel = crate::legacy_thread::SerializedLanguageModel;
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct DbThreadMetadata {
-    pub id: acp::SessionId,
-    #[serde(alias = "summary")]
-    pub title: SharedString,
-    pub updated_at: DateTime<Utc>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct DbThread {
-    pub title: SharedString,
-    pub messages: Vec<DbMessage>,
-    pub updated_at: DateTime<Utc>,
-    #[serde(default)]
-    pub detailed_summary: Option<SharedString>,
-    #[serde(default)]
-    pub initial_project_snapshot: Option<Arc<crate::ProjectSnapshot>>,
-    #[serde(default)]
-    pub cumulative_token_usage: language_model::TokenUsage,
-    #[serde(default)]
-    pub request_token_usage: HashMap<acp_thread::UserMessageId, language_model::TokenUsage>,
-    #[serde(default)]
-    pub model: Option<DbLanguageModel>,
-    #[serde(default)]
-    pub completion_mode: Option<CompletionMode>,
-    #[serde(default)]
-    pub profile: Option<AgentProfileId>,
-}
-
-impl DbThread {
-    pub const VERSION: &'static str = "0.3.0";
-
-    pub fn from_json(json: &[u8]) -> Result<Self> {
-        let saved_thread_json = serde_json::from_slice::<serde_json::Value>(json)?;
-        match saved_thread_json.get("version") {
-            Some(serde_json::Value::String(version)) => match version.as_str() {
-                Self::VERSION => Ok(serde_json::from_value(saved_thread_json)?),
-                _ => Self::upgrade_from_agent_1(crate::legacy_thread::SerializedThread::from_json(
-                    json,
-                )?),
-            },
-            _ => {
-                Self::upgrade_from_agent_1(crate::legacy_thread::SerializedThread::from_json(json)?)
-            }
-        }
-    }
-
-    fn upgrade_from_agent_1(thread: crate::legacy_thread::SerializedThread) -> Result<Self> {
-        let mut messages = Vec::new();
-        let mut request_token_usage = HashMap::default();
-
-        let mut last_user_message_id = None;
-        for (ix, msg) in thread.messages.into_iter().enumerate() {
-            let message = match msg.role {
-                language_model::Role::User => {
-                    let mut content = Vec::new();
-
-                    // Convert segments to content
-                    for segment in msg.segments {
-                        match segment {
-                            crate::legacy_thread::SerializedMessageSegment::Text { text } => {
-                                content.push(UserMessageContent::Text(text));
-                            }
-                            crate::legacy_thread::SerializedMessageSegment::Thinking {
-                                text,
-                                ..
-                            } => {
-                                // User messages don't have thinking segments, but handle gracefully
-                                content.push(UserMessageContent::Text(text));
-                            }
-                            crate::legacy_thread::SerializedMessageSegment::RedactedThinking {
-                                ..
-                            } => {
-                                // User messages don't have redacted thinking, skip.
-                            }
-                        }
-                    }
-
-                    // If no content was added, add context as text if available
-                    if content.is_empty() && !msg.context.is_empty() {
-                        content.push(UserMessageContent::Text(msg.context));
-                    }
-
-                    let id = UserMessageId::new();
-                    last_user_message_id = Some(id.clone());
-
-                    crate::Message::User(UserMessage {
-                        // MessageId from old format can't be meaningfully converted, so generate a new one
-                        id,
-                        content,
-                    })
-                }
-                language_model::Role::Assistant => {
-                    let mut content = Vec::new();
-
-                    // Convert segments to content
-                    for segment in msg.segments {
-                        match segment {
-                            crate::legacy_thread::SerializedMessageSegment::Text { text } => {
-                                content.push(AgentMessageContent::Text(text));
-                            }
-                            crate::legacy_thread::SerializedMessageSegment::Thinking {
-                                text,
-                                signature,
-                            } => {
-                                content.push(AgentMessageContent::Thinking { text, signature });
-                            }
-                            crate::legacy_thread::SerializedMessageSegment::RedactedThinking {
-                                data,
-                            } => {
-                                content.push(AgentMessageContent::RedactedThinking(data));
-                            }
-                        }
-                    }
-
-                    // Convert tool uses
-                    let mut tool_names_by_id = HashMap::default();
-                    for tool_use in msg.tool_uses {
-                        tool_names_by_id.insert(tool_use.id.clone(), tool_use.name.clone());
-                        content.push(AgentMessageContent::ToolUse(
-                            language_model::LanguageModelToolUse {
-                                id: tool_use.id,
-                                name: tool_use.name.into(),
-                                raw_input: serde_json::to_string(&tool_use.input)
-                                    .unwrap_or_default(),
-                                input: tool_use.input,
-                                is_input_complete: true,
-                                thought_signature: None,
-                            },
-                        ));
-                    }
-
-                    // Convert tool results
-                    let mut tool_results = IndexMap::default();
-                    for tool_result in msg.tool_results {
-                        let name = tool_names_by_id
-                            .remove(&tool_result.tool_use_id)
-                            .unwrap_or_else(|| SharedString::from("unknown"));
-                        tool_results.insert(
-                            tool_result.tool_use_id.clone(),
-                            language_model::LanguageModelToolResult {
-                                tool_use_id: tool_result.tool_use_id,
-                                tool_name: name.into(),
-                                is_error: tool_result.is_error,
-                                content: tool_result.content,
-                                output: tool_result.output,
-                            },
-                        );
-                    }
-
-                    if let Some(last_user_message_id) = &last_user_message_id
-                        && let Some(token_usage) = thread.request_token_usage.get(ix).copied()
-                    {
-                        request_token_usage.insert(last_user_message_id.clone(), token_usage);
-                    }
-
-                    crate::Message::Agent(AgentMessage {
-                        content,
-                        tool_results,
-                        reasoning_details: None,
-                    })
-                }
-                language_model::Role::System => {
-                    // Skip system messages as they're not supported in the new format
-                    continue;
-                }
-            };
-
-            messages.push(message);
-        }
-
-        Ok(Self {
-            title: thread.summary,
-            messages,
-            updated_at: thread.updated_at,
-            detailed_summary: match thread.detailed_summary_state {
-                crate::legacy_thread::DetailedSummaryState::NotGenerated
-                | crate::legacy_thread::DetailedSummaryState::Generating => None,
-                crate::legacy_thread::DetailedSummaryState::Generated { text, .. } => Some(text),
-            },
-            initial_project_snapshot: thread.initial_project_snapshot,
-            cumulative_token_usage: thread.cumulative_token_usage,
-            request_token_usage,
-            model: thread.model,
-            completion_mode: thread.completion_mode,
-            profile: thread.profile,
-        })
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-pub enum DataType {
-    #[serde(rename = "json")]
-    Json,
-    #[serde(rename = "zstd")]
-    Zstd,
-}
-
-impl Bind for DataType {
-    fn bind(&self, statement: &Statement, start_index: i32) -> Result<i32> {
-        let value = match self {
-            DataType::Json => "json",
-            DataType::Zstd => "zstd",
-        };
-        value.bind(statement, start_index)
-    }
-}
-
-impl Column for DataType {
-    fn column(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
-        let (value, next_index) = String::column(statement, start_index)?;
-        let data_type = match value.as_str() {
-            "json" => DataType::Json,
-            "zstd" => DataType::Zstd,
-            _ => anyhow::bail!("Unknown data type: {}", value),
-        };
-        Ok((data_type, next_index))
-    }
-}
-
-pub(crate) struct ThreadsDatabase {
-    executor: BackgroundExecutor,
-    connection: Arc<Mutex<Connection>>,
-}
-
-struct GlobalThreadsDatabase(Shared<Task<Result<Arc<ThreadsDatabase>, Arc<anyhow::Error>>>>);
-
-impl Global for GlobalThreadsDatabase {}
-
-impl ThreadsDatabase {
-    pub fn connect(cx: &mut App) -> Shared<Task<Result<Arc<ThreadsDatabase>, Arc<anyhow::Error>>>> {
-        if cx.has_global::<GlobalThreadsDatabase>() {
-            return cx.global::<GlobalThreadsDatabase>().0.clone();
-        }
-        let executor = cx.background_executor().clone();
-        let task = executor
-            .spawn({
-                let executor = executor.clone();
-                async move {
-                    match ThreadsDatabase::new(executor) {
-                        Ok(db) => Ok(Arc::new(db)),
-                        Err(err) => Err(Arc::new(err)),
-                    }
-                }
-            })
-            .shared();
-
-        cx.set_global(GlobalThreadsDatabase(task.clone()));
-        task
-    }
-
-    pub fn new(executor: BackgroundExecutor) -> Result<Self> {
-        let connection = if *ZED_STATELESS {
-            Connection::open_memory(Some("THREAD_FALLBACK_DB"))
-        } else if cfg!(any(feature = "test-support", test)) {
-            // rust stores the name of the test on the current thread.
-            // We use this to automatically create a database that will
-            // be shared within the test (for the test_retrieve_old_thread)
-            // but not with concurrent tests.
-            let thread = std::thread::current();
-            let test_name = thread.name();
-            Connection::open_memory(Some(&format!(
-                "THREAD_FALLBACK_{}",
-                test_name.unwrap_or_default()
-            )))
-        } else {
-            let threads_dir = paths::data_dir().join("threads");
-            std::fs::create_dir_all(&threads_dir)?;
-            let sqlite_path = threads_dir.join("threads.db");
-            Connection::open_file(&sqlite_path.to_string_lossy())
-        };
-
-        connection.exec(indoc! {"
-            CREATE TABLE IF NOT EXISTS threads (
-                id TEXT PRIMARY KEY,
-                summary TEXT NOT NULL,
-                updated_at TEXT NOT NULL,
-                data_type TEXT NOT NULL,
-                data BLOB NOT NULL
-            )
-        "})?()
-        .map_err(|e| anyhow!("Failed to create threads table: {}", e))?;
-
-        let db = Self {
-            executor,
-            connection: Arc::new(Mutex::new(connection)),
-        };
-
-        Ok(db)
-    }
-
-    fn save_thread_sync(
-        connection: &Arc<Mutex<Connection>>,
-        id: acp::SessionId,
-        thread: DbThread,
-    ) -> Result<()> {
-        const COMPRESSION_LEVEL: i32 = 3;
-
-        #[derive(Serialize)]
-        struct SerializedThread {
-            #[serde(flatten)]
-            thread: DbThread,
-            version: &'static str,
-        }
-
-        let title = thread.title.to_string();
-        let updated_at = thread.updated_at.to_rfc3339();
-        let json_data = serde_json::to_string(&SerializedThread {
-            thread,
-            version: DbThread::VERSION,
-        })?;
-
-        let connection = connection.lock();
-
-        let compressed = zstd::encode_all(json_data.as_bytes(), COMPRESSION_LEVEL)?;
-        let data_type = DataType::Zstd;
-        let data = compressed;
-
-        let mut insert = connection.exec_bound::<(Arc<str>, String, String, DataType, Vec<u8>)>(indoc! {"
-            INSERT OR REPLACE INTO threads (id, summary, updated_at, data_type, data) VALUES (?, ?, ?, ?, ?)
-        "})?;
-
-        insert((id.0, title, updated_at, data_type, data))?;
-
-        Ok(())
-    }
-
-    pub fn list_threads(&self) -> Task<Result<Vec<DbThreadMetadata>>> {
-        let connection = self.connection.clone();
-
-        self.executor.spawn(async move {
-            let connection = connection.lock();
-
-            let mut select =
-                connection.select_bound::<(), (Arc<str>, String, String)>(indoc! {"
-                SELECT id, summary, updated_at FROM threads ORDER BY updated_at DESC
-            "})?;
-
-            let rows = select(())?;
-            let mut threads = Vec::new();
-
-            for (id, summary, updated_at) in rows {
-                threads.push(DbThreadMetadata {
-                    id: acp::SessionId::new(id),
-                    title: summary.into(),
-                    updated_at: DateTime::parse_from_rfc3339(&updated_at)?.with_timezone(&Utc),
-                });
-            }
-
-            Ok(threads)
-        })
-    }
-
-    pub fn load_thread(&self, id: acp::SessionId) -> Task<Result<Option<DbThread>>> {
-        let connection = self.connection.clone();
-
-        self.executor.spawn(async move {
-            let connection = connection.lock();
-            let mut select = connection.select_bound::<Arc<str>, (DataType, Vec<u8>)>(indoc! {"
-                SELECT data_type, data FROM threads WHERE id = ? LIMIT 1
-            "})?;
-
-            let rows = select(id.0)?;
-            if let Some((data_type, data)) = rows.into_iter().next() {
-                let json_data = match data_type {
-                    DataType::Zstd => {
-                        let decompressed = zstd::decode_all(&data[..])?;
-                        String::from_utf8(decompressed)?
-                    }
-                    DataType::Json => String::from_utf8(data)?,
-                };
-                let thread = DbThread::from_json(json_data.as_bytes())?;
-                Ok(Some(thread))
-            } else {
-                Ok(None)
-            }
-        })
-    }
-
-    pub fn save_thread(&self, id: acp::SessionId, thread: DbThread) -> Task<Result<()>> {
-        let connection = self.connection.clone();
-
-        self.executor
-            .spawn(async move { Self::save_thread_sync(&connection, id, thread) })
-    }
-
-    pub fn delete_thread(&self, id: acp::SessionId) -> Task<Result<()>> {
-        let connection = self.connection.clone();
-
-        self.executor.spawn(async move {
-            let connection = connection.lock();
-
-            let mut delete = connection.exec_bound::<Arc<str>>(indoc! {"
-                DELETE FROM threads WHERE id = ?
-            "})?;
-
-            delete(id.0)?;
-
-            Ok(())
-        })
-    }
-
-    pub fn delete_threads(&self) -> Task<Result<()>> {
-        let connection = self.connection.clone();
-
-        self.executor.spawn(async move {
-            let connection = connection.lock();
-
-            let mut delete = connection.exec_bound::<()>(indoc! {"
-                DELETE FROM threads
-            "})?;
-
-            delete(())?;
-
-            Ok(())
-        })
-    }
-}
diff --git a/crates/agent/src/edit_agent.rs b/crates/agent/src/edit_agent.rs
deleted file mode 100644
index 5ea04729a4..0000000000
--- a/crates/agent/src/edit_agent.rs
+++ /dev/null
@@ -1,1505 +0,0 @@
-mod create_file_parser;
-mod edit_parser;
-#[cfg(test)]
-mod evals;
-mod streaming_fuzzy_matcher;
-
-use crate::{Template, Templates};
-use action_log::ActionLog;
-use anyhow::Result;
-use cloud_llm_client::CompletionIntent;
-use create_file_parser::{CreateFileParser, CreateFileParserEvent};
-pub use edit_parser::EditFormat;
-use edit_parser::{EditParser, EditParserEvent, EditParserMetrics};
-use futures::{
-    Stream, StreamExt,
-    channel::mpsc::{self, UnboundedReceiver},
-    pin_mut,
-    stream::BoxStream,
-};
-use gpui::{AppContext, AsyncApp, Entity, Task};
-use language::{Anchor, Buffer, BufferSnapshot, LineIndent, Point, TextBufferSnapshot};
-use language_model::{
-    LanguageModel, LanguageModelCompletionError, LanguageModelRequest, LanguageModelRequestMessage,
-    LanguageModelToolChoice, MessageContent, Role,
-};
-use project::{AgentLocation, Project};
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use std::{cmp, iter, mem, ops::Range, pin::Pin, sync::Arc, task::Poll};
-use streaming_diff::{CharOperation, StreamingDiff};
-use streaming_fuzzy_matcher::StreamingFuzzyMatcher;
-
-#[derive(Serialize)]
-struct CreateFilePromptTemplate {
-    path: Option<String>,
-    edit_description: String,
-}
-
-impl Template for CreateFilePromptTemplate {
-    const TEMPLATE_NAME: &'static str = "create_file_prompt.hbs";
-}
-
-#[derive(Serialize)]
-struct EditFileXmlPromptTemplate {
-    path: Option<String>,
-    edit_description: String,
-}
-
-impl Template for EditFileXmlPromptTemplate {
-    const TEMPLATE_NAME: &'static str = "edit_file_prompt_xml.hbs";
-}
-
-#[derive(Serialize)]
-struct EditFileDiffFencedPromptTemplate {
-    path: Option<String>,
-    edit_description: String,
-}
-
-impl Template for EditFileDiffFencedPromptTemplate {
-    const TEMPLATE_NAME: &'static str = "edit_file_prompt_diff_fenced.hbs";
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum EditAgentOutputEvent {
-    ResolvingEditRange(Range<Anchor>),
-    UnresolvedEditRange,
-    AmbiguousEditRange(Vec<Range<usize>>),
-    Edited(Range<Anchor>),
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
-pub struct EditAgentOutput {
-    pub raw_edits: String,
-    pub parser_metrics: EditParserMetrics,
-}
-
-#[derive(Clone)]
-pub struct EditAgent {
-    model: Arc<dyn LanguageModel>,
-    action_log: Entity<ActionLog>,
-    project: Entity<Project>,
-    templates: Arc<Templates>,
-    edit_format: EditFormat,
-}
-
-impl EditAgent {
-    pub fn new(
-        model: Arc<dyn LanguageModel>,
-        project: Entity<Project>,
-        action_log: Entity<ActionLog>,
-        templates: Arc<Templates>,
-        edit_format: EditFormat,
-    ) -> Self {
-        EditAgent {
-            model,
-            project,
-            action_log,
-            templates,
-            edit_format,
-        }
-    }
-
-    pub fn overwrite(
-        &self,
-        buffer: Entity<Buffer>,
-        edit_description: String,
-        conversation: &LanguageModelRequest,
-        cx: &mut AsyncApp,
-    ) -> (
-        Task<Result<EditAgentOutput>>,
-        mpsc::UnboundedReceiver<EditAgentOutputEvent>,
-    ) {
-        let this = self.clone();
-        let (events_tx, events_rx) = mpsc::unbounded();
-        let conversation = conversation.clone();
-        let output = cx.spawn(async move |cx| {
-            let snapshot = buffer.read_with(cx, |buffer, _| buffer.snapshot())?;
-            let path = cx.update(|cx| snapshot.resolve_file_path(true, cx))?;
-            let prompt = CreateFilePromptTemplate {
-                path,
-                edit_description,
-            }
-            .render(&this.templates)?;
-            let new_chunks = this
-                .request(conversation, CompletionIntent::CreateFile, prompt, cx)
-                .await?;
-
-            let (output, mut inner_events) = this.overwrite_with_chunks(buffer, new_chunks, cx);
-            while let Some(event) = inner_events.next().await {
-                events_tx.unbounded_send(event).ok();
-            }
-            output.await
-        });
-        (output, events_rx)
-    }
-
-    fn overwrite_with_chunks(
-        &self,
-        buffer: Entity<Buffer>,
-        edit_chunks: impl 'static + Send + Stream<Item = Result<String, LanguageModelCompletionError>>,
-        cx: &mut AsyncApp,
-    ) -> (
-        Task<Result<EditAgentOutput>>,
-        mpsc::UnboundedReceiver<EditAgentOutputEvent>,
-    ) {
-        let (output_events_tx, output_events_rx) = mpsc::unbounded();
-        let (parse_task, parse_rx) = Self::parse_create_file_chunks(edit_chunks, cx);
-        let this = self.clone();
-        let task = cx.spawn(async move |cx| {
-            this.action_log
-                .update(cx, |log, cx| log.buffer_created(buffer.clone(), cx))?;
-            this.overwrite_with_chunks_internal(buffer, parse_rx, output_events_tx, cx)
-                .await?;
-            parse_task.await
-        });
-        (task, output_events_rx)
-    }
-
-    async fn overwrite_with_chunks_internal(
-        &self,
-        buffer: Entity<Buffer>,
-        mut parse_rx: UnboundedReceiver<Result<CreateFileParserEvent>>,
-        output_events_tx: mpsc::UnboundedSender<EditAgentOutputEvent>,
-        cx: &mut AsyncApp,
-    ) -> Result<()> {
-        cx.update(|cx| {
-            buffer.update(cx, |buffer, cx| buffer.set_text("", cx));
-            self.action_log.update(cx, |log, cx| {
-                log.buffer_edited(buffer.clone(), cx);
-            });
-            self.project.update(cx, |project, cx| {
-                project.set_agent_location(
-                    Some(AgentLocation {
-                        buffer: buffer.downgrade(),
-                        position: language::Anchor::max_for_buffer(buffer.read(cx).remote_id()),
-                    }),
-                    cx,
-                )
-            });
-            output_events_tx
-                .unbounded_send(EditAgentOutputEvent::Edited(
-                    Anchor::min_max_range_for_buffer(buffer.read(cx).remote_id()),
-                ))
-                .ok();
-        })?;
-
-        while let Some(event) = parse_rx.next().await {
-            match event? {
-                CreateFileParserEvent::NewTextChunk { chunk } => {
-                    let buffer_id = cx.update(|cx| {
-                        buffer.update(cx, |buffer, cx| buffer.append(chunk, cx));
-                        self.action_log
-                            .update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
-                        self.project.update(cx, |project, cx| {
-                            project.set_agent_location(
-                                Some(AgentLocation {
-                                    buffer: buffer.downgrade(),
-                                    position: language::Anchor::max_for_buffer(
-                                        buffer.read(cx).remote_id(),
-                                    ),
-                                }),
-                                cx,
-                            )
-                        });
-                        buffer.read(cx).remote_id()
-                    })?;
-                    output_events_tx
-                        .unbounded_send(EditAgentOutputEvent::Edited(
-                            Anchor::min_max_range_for_buffer(buffer_id),
-                        ))
-                        .ok();
-                }
-            }
-        }
-
-        Ok(())
-    }
-
-    pub fn edit(
-        &self,
-        buffer: Entity<Buffer>,
-        edit_description: String,
-        conversation: &LanguageModelRequest,
-        cx: &mut AsyncApp,
-    ) -> (
-        Task<Result<EditAgentOutput>>,
-        mpsc::UnboundedReceiver<EditAgentOutputEvent>,
-    ) {
-        let this = self.clone();
-        let (events_tx, events_rx) = mpsc::unbounded();
-        let conversation = conversation.clone();
-        let edit_format = self.edit_format;
-        let output = cx.spawn(async move |cx| {
-            let snapshot = buffer.read_with(cx, |buffer, _| buffer.snapshot())?;
-            let path = cx.update(|cx| snapshot.resolve_file_path(true, cx))?;
-            let prompt = match edit_format {
-                EditFormat::XmlTags => EditFileXmlPromptTemplate {
-                    path,
-                    edit_description,
-                }
-                .render(&this.templates)?,
-                EditFormat::DiffFenced => EditFileDiffFencedPromptTemplate {
-                    path,
-                    edit_description,
-                }
-                .render(&this.templates)?,
-            };
-
-            let edit_chunks = this
-                .request(conversation, CompletionIntent::EditFile, prompt, cx)
-                .await?;
-            this.apply_edit_chunks(buffer, edit_chunks, events_tx, cx)
-                .await
-        });
-        (output, events_rx)
-    }
-
-    async fn apply_edit_chunks(
-        &self,
-        buffer: Entity<Buffer>,
-        edit_chunks: impl 'static + Send + Stream<Item = Result<String, LanguageModelCompletionError>>,
-        output_events: mpsc::UnboundedSender<EditAgentOutputEvent>,
-        cx: &mut AsyncApp,
-    ) -> Result<EditAgentOutput> {
-        self.action_log
-            .update(cx, |log, cx| log.buffer_read(buffer.clone(), cx))?;
-
-        let (output, edit_events) = Self::parse_edit_chunks(edit_chunks, self.edit_format, cx);
-        let mut edit_events = edit_events.peekable();
-        while let Some(edit_event) = Pin::new(&mut edit_events).peek().await {
-            // Skip events until we're at the start of a new edit.
-            let Ok(EditParserEvent::OldTextChunk { .. }) = edit_event else {
-                edit_events.next().await.unwrap()?;
-                continue;
-            };
-
-            let snapshot = buffer.read_with(cx, |buffer, _| buffer.snapshot())?;
-
-            // Resolve the old text in the background, updating the agent
-            // location as we keep refining which range it corresponds to.
-            let (resolve_old_text, mut old_range) =
-                Self::resolve_old_text(snapshot.text.clone(), edit_events, cx);
-            while let Ok(old_range) = old_range.recv().await {
-                if let Some(old_range) = old_range {
-                    let old_range = snapshot.anchor_before(old_range.start)
-                        ..snapshot.anchor_before(old_range.end);
-                    self.project.update(cx, |project, cx| {
-                        project.set_agent_location(
-                            Some(AgentLocation {
-                                buffer: buffer.downgrade(),
-                                position: old_range.end,
-                            }),
-                            cx,
-                        );
-                    })?;
-                    output_events
-                        .unbounded_send(EditAgentOutputEvent::ResolvingEditRange(old_range))
-                        .ok();
-                }
-            }
-
-            let (edit_events_, mut resolved_old_text) = resolve_old_text.await?;
-            edit_events = edit_events_;
-
-            // If we can't resolve the old text, restart the loop waiting for a
-            // new edit (or for the stream to end).
-            let resolved_old_text = match resolved_old_text.len() {
-                1 => resolved_old_text.pop().unwrap(),
-                0 => {
-                    output_events
-                        .unbounded_send(EditAgentOutputEvent::UnresolvedEditRange)
-                        .ok();
-                    continue;
-                }
-                _ => {
-                    let ranges = resolved_old_text
-                        .into_iter()
-                        .map(|text| {
-                            let start_line =
-                                (snapshot.offset_to_point(text.range.start).row + 1) as usize;
-                            let end_line =
-                                (snapshot.offset_to_point(text.range.end).row + 1) as usize;
-                            start_line..end_line
-                        })
-                        .collect();
-                    output_events
-                        .unbounded_send(EditAgentOutputEvent::AmbiguousEditRange(ranges))
-                        .ok();
-                    continue;
-                }
-            };
-
-            // Compute edits in the background and apply them as they become
-            // available.
-            let (compute_edits, edits) =
-                Self::compute_edits(snapshot, resolved_old_text, edit_events, cx);
-            let mut edits = edits.ready_chunks(32);
-            while let Some(edits) = edits.next().await {
-                if edits.is_empty() {
-                    continue;
-                }
-
-                // Edit the buffer and report edits to the action log as part of the
-                // same effect cycle, otherwise the edit will be reported as if the
-                // user made it.
-                let (min_edit_start, max_edit_end) = cx.update(|cx| {
-                    let (min_edit_start, max_edit_end) = buffer.update(cx, |buffer, cx| {
-                        buffer.edit(edits.iter().cloned(), None, cx);
-                        let max_edit_end = buffer
-                            .summaries_for_anchors::<Point, _>(
-                                edits.iter().map(|(range, _)| &range.end),
-                            )
-                            .max()
-                            .unwrap();
-                        let min_edit_start = buffer
-                            .summaries_for_anchors::<Point, _>(
-                                edits.iter().map(|(range, _)| &range.start),
-                            )
-                            .min()
-                            .unwrap();
-                        (
-                            buffer.anchor_after(min_edit_start),
-                            buffer.anchor_before(max_edit_end),
-                        )
-                    });
-                    self.action_log
-                        .update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
-                    self.project.update(cx, |project, cx| {
-                        project.set_agent_location(
-                            Some(AgentLocation {
-                                buffer: buffer.downgrade(),
-                                position: max_edit_end,
-                            }),
-                            cx,
-                        );
-                    });
-                    (min_edit_start, max_edit_end)
-                })?;
-                output_events
-                    .unbounded_send(EditAgentOutputEvent::Edited(min_edit_start..max_edit_end))
-                    .ok();
-            }
-
-            edit_events = compute_edits.await?;
-        }
-
-        output.await
-    }
-
-    fn parse_edit_chunks(
-        chunks: impl 'static + Send + Stream<Item = Result<String, LanguageModelCompletionError>>,
-        edit_format: EditFormat,
-        cx: &mut AsyncApp,
-    ) -> (
-        Task<Result<EditAgentOutput>>,
-        UnboundedReceiver<Result<EditParserEvent>>,
-    ) {
-        let (tx, rx) = mpsc::unbounded();
-        let output = cx.background_spawn(async move {
-            pin_mut!(chunks);
-
-            let mut parser = EditParser::new(edit_format);
-            let mut raw_edits = String::new();
-            while let Some(chunk) = chunks.next().await {
-                match chunk {
-                    Ok(chunk) => {
-                        raw_edits.push_str(&chunk);
-                        for event in parser.push(&chunk) {
-                            tx.unbounded_send(Ok(event))?;
-                        }
-                    }
-                    Err(error) => {
-                        tx.unbounded_send(Err(error.into()))?;
-                    }
-                }
-            }
-            Ok(EditAgentOutput {
-                raw_edits,
-                parser_metrics: parser.finish(),
-            })
-        });
-        (output, rx)
-    }
-
-    fn parse_create_file_chunks(
-        chunks: impl 'static + Send + Stream<Item = Result<String, LanguageModelCompletionError>>,
-        cx: &mut AsyncApp,
-    ) -> (
-        Task<Result<EditAgentOutput>>,
-        UnboundedReceiver<Result<CreateFileParserEvent>>,
-    ) {
-        let (tx, rx) = mpsc::unbounded();
-        let output = cx.background_spawn(async move {
-            pin_mut!(chunks);
-
-            let mut parser = CreateFileParser::new();
-            let mut raw_edits = String::new();
-            while let Some(chunk) = chunks.next().await {
-                match chunk {
-                    Ok(chunk) => {
-                        raw_edits.push_str(&chunk);
-                        for event in parser.push(Some(&chunk)) {
-                            tx.unbounded_send(Ok(event))?;
-                        }
-                    }
-                    Err(error) => {
-                        tx.unbounded_send(Err(error.into()))?;
-                    }
-                }
-            }
-            // Send final events with None to indicate completion
-            for event in parser.push(None) {
-                tx.unbounded_send(Ok(event))?;
-            }
-            Ok(EditAgentOutput {
-                raw_edits,
-                parser_metrics: EditParserMetrics::default(),
-            })
-        });
-        (output, rx)
-    }
-
-    fn resolve_old_text<T>(
-        snapshot: TextBufferSnapshot,
-        mut edit_events: T,
-        cx: &mut AsyncApp,
-    ) -> (
-        Task<Result<(T, Vec<ResolvedOldText>)>>,
-        watch::Receiver<Option<Range<usize>>>,
-    )
-    where
-        T: 'static + Send + Unpin + Stream<Item = Result<EditParserEvent>>,
-    {
-        let (mut old_range_tx, old_range_rx) = watch::channel(None);
-        let task = cx.background_spawn(async move {
-            let mut matcher = StreamingFuzzyMatcher::new(snapshot);
-            while let Some(edit_event) = edit_events.next().await {
-                let EditParserEvent::OldTextChunk {
-                    chunk,
-                    done,
-                    line_hint,
-                } = edit_event?
-                else {
-                    break;
-                };
-
-                old_range_tx.send(matcher.push(&chunk, line_hint))?;
-                if done {
-                    break;
-                }
-            }
-
-            let matches = matcher.finish();
-            let best_match = matcher.select_best_match();
-
-            old_range_tx.send(best_match.clone())?;
-
-            let indent = LineIndent::from_iter(
-                matcher
-                    .query_lines()
-                    .first()
-                    .unwrap_or(&String::new())
-                    .chars(),
-            );
-
-            let resolved_old_texts = if let Some(best_match) = best_match {
-                vec![ResolvedOldText {
-                    range: best_match,
-                    indent,
-                }]
-            } else {
-                matches
-                    .into_iter()
-                    .map(|range| ResolvedOldText { range, indent })
-                    .collect::<Vec<_>>()
-            };
-
-            Ok((edit_events, resolved_old_texts))
-        });
-
-        (task, old_range_rx)
-    }
-
-    fn compute_edits<T>(
-        snapshot: BufferSnapshot,
-        resolved_old_text: ResolvedOldText,
-        mut edit_events: T,
-        cx: &mut AsyncApp,
-    ) -> (
-        Task<Result<T>>,
-        UnboundedReceiver<(Range<Anchor>, Arc<str>)>,
-    )
-    where
-        T: 'static + Send + Unpin + Stream<Item = Result<EditParserEvent>>,
-    {
-        let (edits_tx, edits_rx) = mpsc::unbounded();
-        let compute_edits = cx.background_spawn(async move {
-            let buffer_start_indent = snapshot
-                .line_indent_for_row(snapshot.offset_to_point(resolved_old_text.range.start).row);
-            let indent_delta = if buffer_start_indent.tabs > 0 {
-                IndentDelta::Tabs(
-                    buffer_start_indent.tabs as isize - resolved_old_text.indent.tabs as isize,
-                )
-            } else {
-                IndentDelta::Spaces(
-                    buffer_start_indent.spaces as isize - resolved_old_text.indent.spaces as isize,
-                )
-            };
-
-            let old_text = snapshot
-                .text_for_range(resolved_old_text.range.clone())
-                .collect::<String>();
-            let mut diff = StreamingDiff::new(old_text);
-            let mut edit_start = resolved_old_text.range.start;
-            let mut new_text_chunks =
-                Self::reindent_new_text_chunks(indent_delta, &mut edit_events);
-            let mut done = false;
-            while !done {
-                let char_operations = if let Some(new_text_chunk) = new_text_chunks.next().await {
-                    diff.push_new(&new_text_chunk?)
-                } else {
-                    done = true;
-                    mem::take(&mut diff).finish()
-                };
-
-                for op in char_operations {
-                    match op {
-                        CharOperation::Insert { text } => {
-                            let edit_start = snapshot.anchor_after(edit_start);
-                            edits_tx.unbounded_send((edit_start..edit_start, Arc::from(text)))?;
-                        }
-                        CharOperation::Delete { bytes } => {
-                            let edit_end = edit_start + bytes;
-                            let edit_range =
-                                snapshot.anchor_after(edit_start)..snapshot.anchor_before(edit_end);
-                            edit_start = edit_end;
-                            edits_tx.unbounded_send((edit_range, Arc::from("")))?;
-                        }
-                        CharOperation::Keep { bytes } => edit_start += bytes,
-                    }
-                }
-            }
-
-            drop(new_text_chunks);
-            anyhow::Ok(edit_events)
-        });
-
-        (compute_edits, edits_rx)
-    }
-
-    fn reindent_new_text_chunks(
-        delta: IndentDelta,
-        mut stream: impl Unpin + Stream<Item = Result<EditParserEvent>>,
-    ) -> impl Stream<Item = Result<String>> {
-        let mut buffer = String::new();
-        let mut in_leading_whitespace = true;
-        let mut done = false;
-        futures::stream::poll_fn(move |cx| {
-            while !done {
-                let (chunk, is_last_chunk) = match stream.poll_next_unpin(cx) {
-                    Poll::Ready(Some(Ok(EditParserEvent::NewTextChunk { chunk, done }))) => {
-                        (chunk, done)
-                    }
-                    Poll::Ready(Some(Err(err))) => return Poll::Ready(Some(Err(err))),
-                    Poll::Pending => return Poll::Pending,
-                    _ => return Poll::Ready(None),
-                };
-
-                buffer.push_str(&chunk);
-
-                let mut indented_new_text = String::new();
-                let mut start_ix = 0;
-                let mut newlines = buffer.match_indices('\n').peekable();
-                loop {
-                    let (line_end, is_pending_line) = match newlines.next() {
-                        Some((ix, _)) => (ix, false),
-                        None => (buffer.len(), true),
-                    };
-                    let line = &buffer[start_ix..line_end];
-
-                    if in_leading_whitespace {
-                        if let Some(non_whitespace_ix) = line.find(|c| delta.character() != c) {
-                            // We found a non-whitespace character, adjust
-                            // indentation based on the delta.
-                            let new_indent_len =
-                                cmp::max(0, non_whitespace_ix as isize + delta.len()) as usize;
-                            indented_new_text
-                                .extend(iter::repeat(delta.character()).take(new_indent_len));
-                            indented_new_text.push_str(&line[non_whitespace_ix..]);
-                            in_leading_whitespace = false;
-                        } else if is_pending_line {
-                            // We're still in leading whitespace and this line is incomplete.
-                            // Stop processing until we receive more input.
-                            break;
-                        } else {
-                            // This line is entirely whitespace. Push it without indentation.
-                            indented_new_text.push_str(line);
-                        }
-                    } else {
-                        indented_new_text.push_str(line);
-                    }
-
-                    if is_pending_line {
-                        start_ix = line_end;
-                        break;
-                    } else {
-                        in_leading_whitespace = true;
-                        indented_new_text.push('\n');
-                        start_ix = line_end + 1;
-                    }
-                }
-                buffer.replace_range(..start_ix, "");
-
-                // This was the last chunk, push all the buffered content as-is.
-                if is_last_chunk {
-                    indented_new_text.push_str(&buffer);
-                    buffer.clear();
-                    done = true;
-                }
-
-                if !indented_new_text.is_empty() {
-                    return Poll::Ready(Some(Ok(indented_new_text)));
-                }
-            }
-
-            Poll::Ready(None)
-        })
-    }
-
-    async fn request(
-        &self,
-        mut conversation: LanguageModelRequest,
-        intent: CompletionIntent,
-        prompt: String,
-        cx: &mut AsyncApp,
-    ) -> Result<BoxStream<'static, Result<String, LanguageModelCompletionError>>> {
-        let mut messages_iter = conversation.messages.iter_mut();
-        if let Some(last_message) = messages_iter.next_back()
-            && last_message.role == Role::Assistant
-        {
-            let old_content_len = last_message.content.len();
-            last_message
-                .content
-                .retain(|content| !matches!(content, MessageContent::ToolUse(_)));
-            let new_content_len = last_message.content.len();
-
-            // We just removed pending tool uses from the content of the
-            // last message, so it doesn't make sense to cache it anymore
-            // (e.g., the message will look very different on the next
-            // request). Thus, we move the flag to the message prior to it,
-            // as it will still be a valid prefix of the conversation.
-            if old_content_len != new_content_len
-                && last_message.cache
-                && let Some(prev_message) = messages_iter.next_back()
-            {
-                last_message.cache = false;
-                prev_message.cache = true;
-            }
-
-            if last_message.content.is_empty() {
-                conversation.messages.pop();
-            }
-        }
-
-        conversation.messages.push(LanguageModelRequestMessage {
-            role: Role::User,
-            content: vec![MessageContent::Text(prompt)],
-            cache: false,
-            reasoning_details: None,
-        });
-
-        // Include tools in the request so that we can take advantage of
-        // caching when ToolChoice::None is supported.
-        let mut tool_choice = None;
-        let mut tools = Vec::new();
-        if !conversation.tools.is_empty()
-            && self
-                .model
-                .supports_tool_choice(LanguageModelToolChoice::None)
-        {
-            tool_choice = Some(LanguageModelToolChoice::None);
-            tools = conversation.tools.clone();
-        }
-
-        let request = LanguageModelRequest {
-            thread_id: conversation.thread_id,
-            prompt_id: conversation.prompt_id,
-            intent: Some(intent),
-            mode: conversation.mode,
-            messages: conversation.messages,
-            tool_choice,
-            tools,
-            stop: Vec::new(),
-            temperature: None,
-            thinking_allowed: true,
-        };
-
-        Ok(self.model.stream_completion_text(request, cx).await?.stream)
-    }
-}
-
-struct ResolvedOldText {
-    range: Range<usize>,
-    indent: LineIndent,
-}
-
-#[derive(Copy, Clone, Debug)]
-enum IndentDelta {
-    Spaces(isize),
-    Tabs(isize),
-}
-
-impl IndentDelta {
-    fn character(&self) -> char {
-        match self {
-            IndentDelta::Spaces(_) => ' ',
-            IndentDelta::Tabs(_) => '\t',
-        }
-    }
-
-    fn len(&self) -> isize {
-        match self {
-            IndentDelta::Spaces(n) => *n,
-            IndentDelta::Tabs(n) => *n,
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use fs::FakeFs;
-    use futures::stream;
-    use gpui::{AppContext, TestAppContext};
-    use indoc::indoc;
-    use language_model::fake_provider::FakeLanguageModel;
-    use pretty_assertions::assert_matches;
-    use project::{AgentLocation, Project};
-    use rand::prelude::*;
-    use rand::rngs::StdRng;
-    use std::cmp;
-
-    #[gpui::test(iterations = 100)]
-    async fn test_empty_old_text(cx: &mut TestAppContext, mut rng: StdRng) {
-        let agent = init_test(cx).await;
-        let buffer = cx.new(|cx| {
-            Buffer::local(
-                indoc! {"
-                    abc
-                    def
-                    ghi
-                "},
-                cx,
-            )
-        });
-        let (apply, _events) = agent.edit(
-            buffer.clone(),
-            String::new(),
-            &LanguageModelRequest::default(),
-            &mut cx.to_async(),
-        );
-        cx.run_until_parked();
-
-        simulate_llm_output(
-            &agent,
-            indoc! {"
-                <old_text></old_text>
-                <new_text>jkl</new_text>
-                <old_text>def</old_text>
-                <new_text>DEF</new_text>
-            "},
-            &mut rng,
-            cx,
-        );
-        apply.await.unwrap();
-
-        pretty_assertions::assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.snapshot().text()),
-            indoc! {"
-                abc
-                DEF
-                ghi
-            "}
-        );
-    }
-
-    #[gpui::test(iterations = 100)]
-    async fn test_indentation(cx: &mut TestAppContext, mut rng: StdRng) {
-        let agent = init_test(cx).await;
-        let buffer = cx.new(|cx| {
-            Buffer::local(
-                indoc! {"
-                    lorem
-                            ipsum
-                            dolor
-                            sit
-                "},
-                cx,
-            )
-        });
-        let (apply, _events) = agent.edit(
-            buffer.clone(),
-            String::new(),
-            &LanguageModelRequest::default(),
-            &mut cx.to_async(),
-        );
-        cx.run_until_parked();
-
-        simulate_llm_output(
-            &agent,
-            indoc! {"
-                <old_text>
-                    ipsum
-                    dolor
-                    sit
-                </old_text>
-                <new_text>
-                    ipsum
-                    dolor
-                    sit
-                amet
-                </new_text>
-            "},
-            &mut rng,
-            cx,
-        );
-        apply.await.unwrap();
-
-        pretty_assertions::assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.snapshot().text()),
-            indoc! {"
-                lorem
-                        ipsum
-                        dolor
-                        sit
-                    amet
-            "}
-        );
-    }
-
-    #[gpui::test(iterations = 100)]
-    async fn test_dependent_edits(cx: &mut TestAppContext, mut rng: StdRng) {
-        let agent = init_test(cx).await;
-        let buffer = cx.new(|cx| Buffer::local("abc\ndef\nghi", cx));
-        let (apply, _events) = agent.edit(
-            buffer.clone(),
-            String::new(),
-            &LanguageModelRequest::default(),
-            &mut cx.to_async(),
-        );
-        cx.run_until_parked();
-
-        simulate_llm_output(
-            &agent,
-            indoc! {"
-                <old_text>
-                def
-                </old_text>
-                <new_text>
-                DEF
-                </new_text>
-
-                <old_text>
-                DEF
-                </old_text>
-                <new_text>
-                DeF
-                </new_text>
-            "},
-            &mut rng,
-            cx,
-        );
-        apply.await.unwrap();
-
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.snapshot().text()),
-            "abc\nDeF\nghi"
-        );
-    }
-
-    #[gpui::test(iterations = 100)]
-    async fn test_old_text_hallucination(cx: &mut TestAppContext, mut rng: StdRng) {
-        let agent = init_test(cx).await;
-        let buffer = cx.new(|cx| Buffer::local("abc\ndef\nghi", cx));
-        let (apply, _events) = agent.edit(
-            buffer.clone(),
-            String::new(),
-            &LanguageModelRequest::default(),
-            &mut cx.to_async(),
-        );
-        cx.run_until_parked();
-
-        simulate_llm_output(
-            &agent,
-            indoc! {"
-                <old_text>
-                jkl
-                </old_text>
-                <new_text>
-                mno
-                </new_text>
-
-                <old_text>
-                abc
-                </old_text>
-                <new_text>
-                ABC
-                </new_text>
-            "},
-            &mut rng,
-            cx,
-        );
-        apply.await.unwrap();
-
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.snapshot().text()),
-            "ABC\ndef\nghi"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_edit_events(cx: &mut TestAppContext) {
-        let agent = init_test(cx).await;
-        let model = agent.model.as_fake();
-        let project = agent
-            .action_log
-            .read_with(cx, |log, _| log.project().clone());
-        let buffer = cx.new(|cx| Buffer::local("abc\ndef\nghi\njkl", cx));
-
-        let mut async_cx = cx.to_async();
-        let (apply, mut events) = agent.edit(
-            buffer.clone(),
-            String::new(),
-            &LanguageModelRequest::default(),
-            &mut async_cx,
-        );
-        cx.run_until_parked();
-
-        model.send_last_completion_stream_text_chunk("<old_text>a");
-        cx.run_until_parked();
-        assert_eq!(drain_events(&mut events), vec![]);
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.snapshot().text()),
-            "abc\ndef\nghi\njkl"
-        );
-        assert_eq!(
-            project.read_with(cx, |project, _| project.agent_location()),
-            None
-        );
-
-        model.send_last_completion_stream_text_chunk("bc</old_text>");
-        cx.run_until_parked();
-        assert_eq!(
-            drain_events(&mut events),
-            vec![EditAgentOutputEvent::ResolvingEditRange(buffer.read_with(
-                cx,
-                |buffer, _| buffer.anchor_before(Point::new(0, 0))
-                    ..buffer.anchor_before(Point::new(0, 3))
-            ))]
-        );
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.snapshot().text()),
-            "abc\ndef\nghi\njkl"
-        );
-        assert_eq!(
-            project.read_with(cx, |project, _| project.agent_location()),
-            Some(AgentLocation {
-                buffer: buffer.downgrade(),
-                position: buffer.read_with(cx, |buffer, _| buffer.anchor_before(Point::new(0, 3)))
-            })
-        );
-
-        model.send_last_completion_stream_text_chunk("<new_text>abX");
-        cx.run_until_parked();
-        assert_matches!(
-            drain_events(&mut events).as_slice(),
-            [EditAgentOutputEvent::Edited(_)]
-        );
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.snapshot().text()),
-            "abXc\ndef\nghi\njkl"
-        );
-        assert_eq!(
-            project.read_with(cx, |project, _| project.agent_location()),
-            Some(AgentLocation {
-                buffer: buffer.downgrade(),
-                position: buffer.read_with(cx, |buffer, _| buffer.anchor_before(Point::new(0, 3)))
-            })
-        );
-
-        model.send_last_completion_stream_text_chunk("cY");
-        cx.run_until_parked();
-        assert_matches!(
-            drain_events(&mut events).as_slice(),
-            [EditAgentOutputEvent::Edited { .. }]
-        );
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.snapshot().text()),
-            "abXcY\ndef\nghi\njkl"
-        );
-        assert_eq!(
-            project.read_with(cx, |project, _| project.agent_location()),
-            Some(AgentLocation {
-                buffer: buffer.downgrade(),
-                position: buffer.read_with(cx, |buffer, _| buffer.anchor_before(Point::new(0, 5)))
-            })
-        );
-
-        model.send_last_completion_stream_text_chunk("</new_text>");
-        model.send_last_completion_stream_text_chunk("<old_text>hall");
-        cx.run_until_parked();
-        assert_eq!(drain_events(&mut events), vec![]);
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.snapshot().text()),
-            "abXcY\ndef\nghi\njkl"
-        );
-        assert_eq!(
-            project.read_with(cx, |project, _| project.agent_location()),
-            Some(AgentLocation {
-                buffer: buffer.downgrade(),
-                position: buffer.read_with(cx, |buffer, _| buffer.anchor_before(Point::new(0, 5)))
-            })
-        );
-
-        model.send_last_completion_stream_text_chunk("ucinated old</old_text>");
-        model.send_last_completion_stream_text_chunk("<new_text>");
-        cx.run_until_parked();
-        assert_eq!(
-            drain_events(&mut events),
-            vec![EditAgentOutputEvent::UnresolvedEditRange]
-        );
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.snapshot().text()),
-            "abXcY\ndef\nghi\njkl"
-        );
-        assert_eq!(
-            project.read_with(cx, |project, _| project.agent_location()),
-            Some(AgentLocation {
-                buffer: buffer.downgrade(),
-                position: buffer.read_with(cx, |buffer, _| buffer.anchor_before(Point::new(0, 5)))
-            })
-        );
-
-        model.send_last_completion_stream_text_chunk("hallucinated new</new_");
-        model.send_last_completion_stream_text_chunk("text>");
-        cx.run_until_parked();
-        assert_eq!(drain_events(&mut events), vec![]);
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.snapshot().text()),
-            "abXcY\ndef\nghi\njkl"
-        );
-        assert_eq!(
-            project.read_with(cx, |project, _| project.agent_location()),
-            Some(AgentLocation {
-                buffer: buffer.downgrade(),
-                position: buffer.read_with(cx, |buffer, _| buffer.anchor_before(Point::new(0, 5)))
-            })
-        );
-
-        model.send_last_completion_stream_text_chunk("<old_text>\nghi\nj");
-        cx.run_until_parked();
-        assert_eq!(
-            drain_events(&mut events),
-            vec![EditAgentOutputEvent::ResolvingEditRange(buffer.read_with(
-                cx,
-                |buffer, _| buffer.anchor_before(Point::new(2, 0))
-                    ..buffer.anchor_before(Point::new(2, 3))
-            ))]
-        );
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.snapshot().text()),
-            "abXcY\ndef\nghi\njkl"
-        );
-        assert_eq!(
-            project.read_with(cx, |project, _| project.agent_location()),
-            Some(AgentLocation {
-                buffer: buffer.downgrade(),
-                position: buffer.read_with(cx, |buffer, _| buffer.anchor_before(Point::new(2, 3)))
-            })
-        );
-
-        model.send_last_completion_stream_text_chunk("kl</old_text>");
-        model.send_last_completion_stream_text_chunk("<new_text>");
-        cx.run_until_parked();
-        assert_eq!(
-            drain_events(&mut events),
-            vec![EditAgentOutputEvent::ResolvingEditRange(buffer.read_with(
-                cx,
-                |buffer, _| buffer.anchor_before(Point::new(2, 0))
-                    ..buffer.anchor_before(Point::new(3, 3))
-            ))]
-        );
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.snapshot().text()),
-            "abXcY\ndef\nghi\njkl"
-        );
-        assert_eq!(
-            project.read_with(cx, |project, _| project.agent_location()),
-            Some(AgentLocation {
-                buffer: buffer.downgrade(),
-                position: buffer.read_with(cx, |buffer, _| buffer.anchor_before(Point::new(3, 3)))
-            })
-        );
-
-        model.send_last_completion_stream_text_chunk("GHI</new_text>");
-        cx.run_until_parked();
-        assert_matches!(
-            drain_events(&mut events).as_slice(),
-            [EditAgentOutputEvent::Edited { .. }]
-        );
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.snapshot().text()),
-            "abXcY\ndef\nGHI"
-        );
-        assert_eq!(
-            project.read_with(cx, |project, _| project.agent_location()),
-            Some(AgentLocation {
-                buffer: buffer.downgrade(),
-                position: buffer.read_with(cx, |buffer, _| buffer.anchor_before(Point::new(2, 3)))
-            })
-        );
-
-        model.end_last_completion_stream();
-        apply.await.unwrap();
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.snapshot().text()),
-            "abXcY\ndef\nGHI"
-        );
-        assert_eq!(drain_events(&mut events), vec![]);
-        assert_eq!(
-            project.read_with(cx, |project, _| project.agent_location()),
-            Some(AgentLocation {
-                buffer: buffer.downgrade(),
-                position: buffer.read_with(cx, |buffer, _| buffer.anchor_before(Point::new(2, 3)))
-            })
-        );
-    }
-
-    #[gpui::test]
-    async fn test_overwrite_events(cx: &mut TestAppContext) {
-        let agent = init_test(cx).await;
-        let project = agent
-            .action_log
-            .read_with(cx, |log, _| log.project().clone());
-        let buffer = cx.new(|cx| Buffer::local("abc\ndef\nghi", cx));
-        let (chunks_tx, chunks_rx) = mpsc::unbounded();
-        let (apply, mut events) = agent.overwrite_with_chunks(
-            buffer.clone(),
-            chunks_rx.map(|chunk: &str| Ok(chunk.to_string())),
-            &mut cx.to_async(),
-        );
-
-        cx.run_until_parked();
-        assert_matches!(
-            drain_events(&mut events).as_slice(),
-            [EditAgentOutputEvent::Edited(_)]
-        );
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.snapshot().text()),
-            ""
-        );
-        assert_eq!(
-            project.read_with(cx, |project, _| project.agent_location()),
-            Some(AgentLocation {
-                buffer: buffer.downgrade(),
-                position: language::Anchor::max_for_buffer(
-                    cx.update(|cx| buffer.read(cx).remote_id())
-                ),
-            })
-        );
-
-        chunks_tx.unbounded_send("```\njkl\n").unwrap();
-        cx.run_until_parked();
-        assert_matches!(
-            drain_events(&mut events).as_slice(),
-            [EditAgentOutputEvent::Edited { .. }]
-        );
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.snapshot().text()),
-            "jkl"
-        );
-        assert_eq!(
-            project.read_with(cx, |project, _| project.agent_location()),
-            Some(AgentLocation {
-                buffer: buffer.downgrade(),
-                position: language::Anchor::max_for_buffer(
-                    cx.update(|cx| buffer.read(cx).remote_id())
-                ),
-            })
-        );
-
-        chunks_tx.unbounded_send("mno\n").unwrap();
-        cx.run_until_parked();
-        assert_matches!(
-            drain_events(&mut events).as_slice(),
-            [EditAgentOutputEvent::Edited { .. }]
-        );
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.snapshot().text()),
-            "jkl\nmno"
-        );
-        assert_eq!(
-            project.read_with(cx, |project, _| project.agent_location()),
-            Some(AgentLocation {
-                buffer: buffer.downgrade(),
-                position: language::Anchor::max_for_buffer(
-                    cx.update(|cx| buffer.read(cx).remote_id())
-                ),
-            })
-        );
-
-        chunks_tx.unbounded_send("pqr\n```").unwrap();
-        cx.run_until_parked();
-        assert_matches!(
-            drain_events(&mut events).as_slice(),
-            [EditAgentOutputEvent::Edited(_)],
-        );
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.snapshot().text()),
-            "jkl\nmno\npqr"
-        );
-        assert_eq!(
-            project.read_with(cx, |project, _| project.agent_location()),
-            Some(AgentLocation {
-                buffer: buffer.downgrade(),
-                position: language::Anchor::max_for_buffer(
-                    cx.update(|cx| buffer.read(cx).remote_id())
-                ),
-            })
-        );
-
-        drop(chunks_tx);
-        apply.await.unwrap();
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.snapshot().text()),
-            "jkl\nmno\npqr"
-        );
-        assert_eq!(drain_events(&mut events), vec![]);
-        assert_eq!(
-            project.read_with(cx, |project, _| project.agent_location()),
-            Some(AgentLocation {
-                buffer: buffer.downgrade(),
-                position: language::Anchor::max_for_buffer(
-                    cx.update(|cx| buffer.read(cx).remote_id())
-                ),
-            })
-        );
-    }
-
-    #[gpui::test(iterations = 100)]
-    async fn test_indent_new_text_chunks(mut rng: StdRng) {
-        let chunks = to_random_chunks(&mut rng, "    abc\n  def\n      ghi");
-        let new_text_chunks = stream::iter(chunks.iter().enumerate().map(|(index, chunk)| {
-            Ok(EditParserEvent::NewTextChunk {
-                chunk: chunk.clone(),
-                done: index == chunks.len() - 1,
-            })
-        }));
-        let indented_chunks =
-            EditAgent::reindent_new_text_chunks(IndentDelta::Spaces(2), new_text_chunks)
-                .collect::<Vec<_>>()
-                .await;
-        let new_text = indented_chunks
-            .into_iter()
-            .collect::<Result<String>>()
-            .unwrap();
-        assert_eq!(new_text, "      abc\n    def\n        ghi");
-    }
-
-    #[gpui::test(iterations = 100)]
-    async fn test_outdent_new_text_chunks(mut rng: StdRng) {
-        let chunks = to_random_chunks(&mut rng, "\t\t\t\tabc\n\t\tdef\n\t\t\t\t\t\tghi");
-        let new_text_chunks = stream::iter(chunks.iter().enumerate().map(|(index, chunk)| {
-            Ok(EditParserEvent::NewTextChunk {
-                chunk: chunk.clone(),
-                done: index == chunks.len() - 1,
-            })
-        }));
-        let indented_chunks =
-            EditAgent::reindent_new_text_chunks(IndentDelta::Tabs(-2), new_text_chunks)
-                .collect::<Vec<_>>()
-                .await;
-        let new_text = indented_chunks
-            .into_iter()
-            .collect::<Result<String>>()
-            .unwrap();
-        assert_eq!(new_text, "\t\tabc\ndef\n\t\t\t\tghi");
-    }
-
-    #[gpui::test(iterations = 100)]
-    async fn test_random_indents(mut rng: StdRng) {
-        let len = rng.random_range(1..=100);
-        let new_text = util::RandomCharIter::new(&mut rng)
-            .with_simple_text()
-            .take(len)
-            .collect::<String>();
-        let new_text = new_text
-            .split('\n')
-            .map(|line| format!("{}{}", " ".repeat(rng.random_range(0..=8)), line))
-            .collect::<Vec<_>>()
-            .join("\n");
-        let delta = IndentDelta::Spaces(rng.random_range(-4i8..=4i8) as isize);
-
-        let chunks = to_random_chunks(&mut rng, &new_text);
-        let new_text_chunks = stream::iter(chunks.iter().enumerate().map(|(index, chunk)| {
-            Ok(EditParserEvent::NewTextChunk {
-                chunk: chunk.clone(),
-                done: index == chunks.len() - 1,
-            })
-        }));
-        let reindented_chunks = EditAgent::reindent_new_text_chunks(delta, new_text_chunks)
-            .collect::<Vec<_>>()
-            .await;
-        let actual_reindented_text = reindented_chunks
-            .into_iter()
-            .collect::<Result<String>>()
-            .unwrap();
-        let expected_reindented_text = new_text
-            .split('\n')
-            .map(|line| {
-                if let Some(ix) = line.find(|c| c != ' ') {
-                    let new_indent = cmp::max(0, ix as isize + delta.len()) as usize;
-                    format!("{}{}", " ".repeat(new_indent), &line[ix..])
-                } else {
-                    line.to_string()
-                }
-            })
-            .collect::<Vec<_>>()
-            .join("\n");
-        assert_eq!(actual_reindented_text, expected_reindented_text);
-    }
-
-    fn to_random_chunks(rng: &mut StdRng, input: &str) -> Vec<String> {
-        let chunk_count = rng.random_range(1..=cmp::min(input.len(), 50));
-        let mut chunk_indices = (0..input.len()).choose_multiple(rng, chunk_count);
-        chunk_indices.sort();
-        chunk_indices.push(input.len());
-
-        let mut chunks = Vec::new();
-        let mut last_ix = 0;
-        for chunk_ix in chunk_indices {
-            chunks.push(input[last_ix..chunk_ix].to_string());
-            last_ix = chunk_ix;
-        }
-        chunks
-    }
-
-    fn simulate_llm_output(
-        agent: &EditAgent,
-        output: &str,
-        rng: &mut StdRng,
-        cx: &mut TestAppContext,
-    ) {
-        let executor = cx.executor();
-        let chunks = to_random_chunks(rng, output);
-        let model = agent.model.clone();
-        cx.background_spawn(async move {
-            for chunk in chunks {
-                executor.simulate_random_delay().await;
-                model
-                    .as_fake()
-                    .send_last_completion_stream_text_chunk(chunk);
-            }
-            model.as_fake().end_last_completion_stream();
-        })
-        .detach();
-    }
-
-    async fn init_test(cx: &mut TestAppContext) -> EditAgent {
-        cx.update(settings::init);
-
-        let project = Project::test(FakeFs::new(cx.executor()), [], cx).await;
-        let model = Arc::new(FakeLanguageModel::default());
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-        EditAgent::new(
-            model,
-            project,
-            action_log,
-            Templates::new(),
-            EditFormat::XmlTags,
-        )
-    }
-
-    #[gpui::test(iterations = 10)]
-    async fn test_non_unique_text_error(cx: &mut TestAppContext, mut rng: StdRng) {
-        let agent = init_test(cx).await;
-        let original_text = indoc! {"
-                function foo() {
-                    return 42;
-                }
-
-                function bar() {
-                    return 42;
-                }
-
-                function baz() {
-                    return 42;
-                }
-            "};
-        let buffer = cx.new(|cx| Buffer::local(original_text, cx));
-        let (apply, mut events) = agent.edit(
-            buffer.clone(),
-            String::new(),
-            &LanguageModelRequest::default(),
-            &mut cx.to_async(),
-        );
-        cx.run_until_parked();
-
-        // When <old_text> matches text in more than one place
-        simulate_llm_output(
-            &agent,
-            indoc! {"
-                <old_text>
-                    return 42;
-                }
-                </old_text>
-                <new_text>
-                    return 100;
-                }
-                </new_text>
-            "},
-            &mut rng,
-            cx,
-        );
-        apply.await.unwrap();
-
-        // Then the text should remain unchanged
-        let result_text = buffer.read_with(cx, |buffer, _| buffer.snapshot().text());
-        assert_eq!(
-            result_text,
-            indoc! {"
-                function foo() {
-                    return 42;
-                }
-
-                function bar() {
-                    return 42;
-                }
-
-                function baz() {
-                    return 42;
-                }
-            "},
-            "Text should remain unchanged when there are multiple matches"
-        );
-
-        // And AmbiguousEditRange even should be emitted
-        let events = drain_events(&mut events);
-        let ambiguous_ranges = vec![2..3, 6..7, 10..11];
-        assert!(
-            events.contains(&EditAgentOutputEvent::AmbiguousEditRange(ambiguous_ranges)),
-            "Should emit AmbiguousEditRange for non-unique text"
-        );
-    }
-
-    fn drain_events(
-        stream: &mut UnboundedReceiver<EditAgentOutputEvent>,
-    ) -> Vec<EditAgentOutputEvent> {
-        let mut events = Vec::new();
-        while let Ok(Some(event)) = stream.try_next() {
-            events.push(event);
-        }
-        events
-    }
-}
diff --git a/crates/agent/src/edit_agent/create_file_parser.rs b/crates/agent/src/edit_agent/create_file_parser.rs
deleted file mode 100644
index 2272434d79..0000000000
--- a/crates/agent/src/edit_agent/create_file_parser.rs
+++ /dev/null
@@ -1,237 +0,0 @@
-use std::sync::OnceLock;
-
-use regex::Regex;
-use smallvec::SmallVec;
-use util::debug_panic;
-
-static START_MARKER: OnceLock<Regex> = OnceLock::new();
-static END_MARKER: OnceLock<Regex> = OnceLock::new();
-
-#[derive(Debug)]
-pub enum CreateFileParserEvent {
-    NewTextChunk { chunk: String },
-}
-
-#[derive(Debug)]
-pub struct CreateFileParser {
-    state: ParserState,
-    buffer: String,
-}
-
-#[derive(Debug, PartialEq)]
-enum ParserState {
-    Pending,
-    WithinText,
-    Finishing,
-    Finished,
-}
-
-impl CreateFileParser {
-    pub fn new() -> Self {
-        CreateFileParser {
-            state: ParserState::Pending,
-            buffer: String::new(),
-        }
-    }
-
-    pub fn push(&mut self, chunk: Option<&str>) -> SmallVec<[CreateFileParserEvent; 1]> {
-        if chunk.is_none() {
-            self.state = ParserState::Finishing;
-        }
-
-        let chunk = chunk.unwrap_or_default();
-
-        self.buffer.push_str(chunk);
-
-        let mut edit_events = SmallVec::new();
-        let start_marker_regex = START_MARKER.get_or_init(|| Regex::new(r"\n?```\S*\n").unwrap());
-        let end_marker_regex = END_MARKER.get_or_init(|| Regex::new(r"(^|\n)```\s*$").unwrap());
-        loop {
-            match &mut self.state {
-                ParserState::Pending => {
-                    if let Some(m) = start_marker_regex.find(&self.buffer) {
-                        self.buffer.drain(..m.end());
-                        self.state = ParserState::WithinText;
-                    } else {
-                        break;
-                    }
-                }
-                ParserState::WithinText => {
-                    let text = self.buffer.trim_end_matches(&['`', '\n', ' ']);
-                    let text_len = text.len();
-
-                    if text_len > 0 {
-                        edit_events.push(CreateFileParserEvent::NewTextChunk {
-                            chunk: self.buffer.drain(..text_len).collect(),
-                        });
-                    }
-                    break;
-                }
-                ParserState::Finishing => {
-                    if let Some(m) = end_marker_regex.find(&self.buffer) {
-                        self.buffer.drain(m.start()..);
-                    }
-                    if !self.buffer.is_empty() {
-                        if !self.buffer.ends_with('\n') {
-                            self.buffer.push('\n');
-                        }
-                        edit_events.push(CreateFileParserEvent::NewTextChunk {
-                            chunk: self.buffer.drain(..).collect(),
-                        });
-                    }
-                    self.state = ParserState::Finished;
-                    break;
-                }
-                ParserState::Finished => debug_panic!("Can't call parser after finishing"),
-            }
-        }
-        edit_events
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use indoc::indoc;
-    use rand::prelude::*;
-    use std::cmp;
-
-    #[gpui::test(iterations = 100)]
-    fn test_happy_path(mut rng: StdRng) {
-        let mut parser = CreateFileParser::new();
-        assert_eq!(
-            parse_random_chunks("```\nHello world\n```", &mut parser, &mut rng),
-            "Hello world".to_string()
-        );
-    }
-
-    #[gpui::test(iterations = 100)]
-    fn test_cut_prefix(mut rng: StdRng) {
-        let mut parser = CreateFileParser::new();
-        assert_eq!(
-            parse_random_chunks(
-                indoc! {"
-                    Let me write this file for you:
-
-                    ```
-                    Hello world
-                    ```
-
-                "},
-                &mut parser,
-                &mut rng
-            ),
-            "Hello world".to_string()
-        );
-    }
-
-    #[gpui::test(iterations = 100)]
-    fn test_language_name_on_fences(mut rng: StdRng) {
-        let mut parser = CreateFileParser::new();
-        assert_eq!(
-            parse_random_chunks(
-                indoc! {"
-                    ```rust
-                    Hello world
-                    ```
-
-                "},
-                &mut parser,
-                &mut rng
-            ),
-            "Hello world".to_string()
-        );
-    }
-
-    #[gpui::test(iterations = 100)]
-    fn test_leave_suffix(mut rng: StdRng) {
-        let mut parser = CreateFileParser::new();
-        assert_eq!(
-            parse_random_chunks(
-                indoc! {"
-                    Let me write this file for you:
-
-                    ```
-                    Hello world
-                    ```
-
-                    The end
-                "},
-                &mut parser,
-                &mut rng
-            ),
-            // This output is malformed, so we're doing our best effort
-            "Hello world\n```\n\nThe end\n".to_string()
-        );
-    }
-
-    #[gpui::test(iterations = 100)]
-    fn test_inner_fences(mut rng: StdRng) {
-        let mut parser = CreateFileParser::new();
-        assert_eq!(
-            parse_random_chunks(
-                indoc! {"
-                    Let me write this file for you:
-
-                    ```
-                    ```
-                    Hello world
-                    ```
-                    ```
-                "},
-                &mut parser,
-                &mut rng
-            ),
-            // This output is malformed, so we're doing our best effort
-            "```\nHello world\n```\n".to_string()
-        );
-    }
-
-    #[gpui::test(iterations = 10)]
-    fn test_empty_file(mut rng: StdRng) {
-        let mut parser = CreateFileParser::new();
-        assert_eq!(
-            parse_random_chunks(
-                indoc! {"
-                    ```
-                    ```
-                "},
-                &mut parser,
-                &mut rng
-            ),
-            "".to_string()
-        );
-    }
-
-    fn parse_random_chunks(input: &str, parser: &mut CreateFileParser, rng: &mut StdRng) -> String {
-        let chunk_count = rng.random_range(1..=cmp::min(input.len(), 50));
-        let mut chunk_indices = (0..input.len()).choose_multiple(rng, chunk_count);
-        chunk_indices.sort();
-        chunk_indices.push(input.len());
-
-        let chunk_indices = chunk_indices
-            .into_iter()
-            .map(Some)
-            .chain(vec![None])
-            .collect::<Vec<Option<usize>>>();
-
-        let mut edit = String::default();
-        let mut last_ix = 0;
-        for chunk_ix in chunk_indices {
-            let mut chunk = None;
-            if let Some(chunk_ix) = chunk_ix {
-                chunk = Some(&input[last_ix..chunk_ix]);
-                last_ix = chunk_ix;
-            }
-
-            for event in parser.push(chunk) {
-                match event {
-                    CreateFileParserEvent::NewTextChunk { chunk } => {
-                        edit.push_str(&chunk);
-                    }
-                }
-            }
-        }
-        edit
-    }
-}
diff --git a/crates/agent/src/edit_agent/edit_parser.rs b/crates/agent/src/edit_agent/edit_parser.rs
deleted file mode 100644
index c1aa61e18d..0000000000
--- a/crates/agent/src/edit_agent/edit_parser.rs
+++ /dev/null
@@ -1,1094 +0,0 @@
-use anyhow::bail;
-use derive_more::{Add, AddAssign};
-use language_model::LanguageModel;
-use regex::Regex;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use smallvec::SmallVec;
-use std::{mem, ops::Range, str::FromStr, sync::Arc};
-
-const OLD_TEXT_END_TAG: &str = "</old_text>";
-const NEW_TEXT_END_TAG: &str = "</new_text>";
-const EDITS_END_TAG: &str = "</edits>";
-const SEARCH_MARKER: &str = "<<<<<<< SEARCH";
-const SEPARATOR_MARKER: &str = "=======";
-const REPLACE_MARKER: &str = ">>>>>>> REPLACE";
-const SONNET_PARAMETER_INVOKE_1: &str = "</parameter>\n</invoke>";
-const SONNET_PARAMETER_INVOKE_2: &str = "</parameter></invoke>";
-const SONNET_PARAMETER_INVOKE_3: &str = "</parameter>";
-const END_TAGS: [&str; 6] = [
-    OLD_TEXT_END_TAG,
-    NEW_TEXT_END_TAG,
-    EDITS_END_TAG,
-    SONNET_PARAMETER_INVOKE_1, // Remove these after switching to streaming tool call
-    SONNET_PARAMETER_INVOKE_2,
-    SONNET_PARAMETER_INVOKE_3,
-];
-
-#[derive(Debug)]
-pub enum EditParserEvent {
-    OldTextChunk {
-        chunk: String,
-        done: bool,
-        line_hint: Option<u32>,
-    },
-    NewTextChunk {
-        chunk: String,
-        done: bool,
-    },
-}
-
-#[derive(
-    Clone, Debug, Default, PartialEq, Eq, Add, AddAssign, Serialize, Deserialize, JsonSchema,
-)]
-pub struct EditParserMetrics {
-    pub tags: usize,
-    pub mismatched_tags: usize,
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum EditFormat {
-    /// XML-like tags:
-    /// <old_text>...</old_text>
-    /// <new_text>...</new_text>
-    XmlTags,
-    /// Diff-fenced format, in which:
-    /// - Text before the SEARCH marker is ignored
-    /// - Fences are optional
-    /// - Line hint is optional.
-    ///
-    /// Example:
-    ///
-    /// ```diff
-    /// <<<<<<< SEARCH line=42
-    /// ...
-    /// =======
-    /// ...
-    /// >>>>>>> REPLACE
-    /// ```
-    DiffFenced,
-}
-
-impl FromStr for EditFormat {
-    type Err = anyhow::Error;
-
-    fn from_str(s: &str) -> anyhow::Result<Self> {
-        match s.to_lowercase().as_str() {
-            "xml_tags" | "xml" => Ok(EditFormat::XmlTags),
-            "diff_fenced" | "diff-fenced" | "diff" => Ok(EditFormat::DiffFenced),
-            _ => bail!("Unknown EditFormat: {}", s),
-        }
-    }
-}
-
-impl EditFormat {
-    /// Return an optimal edit format for the language model
-    pub fn from_model(model: Arc<dyn LanguageModel>) -> anyhow::Result<Self> {
-        if model.provider_id().0 == "google" || model.id().0.to_lowercase().contains("gemini") {
-            Ok(EditFormat::DiffFenced)
-        } else {
-            Ok(EditFormat::XmlTags)
-        }
-    }
-
-    /// Return an optimal edit format for the language model,
-    /// with the ability to override it by setting the
-    /// `ZED_EDIT_FORMAT` environment variable
-    #[allow(dead_code)]
-    pub fn from_env(model: Arc<dyn LanguageModel>) -> anyhow::Result<Self> {
-        let default = EditFormat::from_model(model)?;
-        std::env::var("ZED_EDIT_FORMAT").map_or(Ok(default), |s| EditFormat::from_str(&s))
-    }
-}
-
-pub trait EditFormatParser: Send + std::fmt::Debug {
-    fn push(&mut self, chunk: &str) -> SmallVec<[EditParserEvent; 1]>;
-    fn take_metrics(&mut self) -> EditParserMetrics;
-}
-
-#[derive(Debug)]
-pub struct XmlEditParser {
-    state: XmlParserState,
-    buffer: String,
-    metrics: EditParserMetrics,
-}
-
-#[derive(Debug, PartialEq)]
-enum XmlParserState {
-    Pending,
-    WithinOldText { start: bool, line_hint: Option<u32> },
-    AfterOldText,
-    WithinNewText { start: bool },
-}
-
-#[derive(Debug)]
-pub struct DiffFencedEditParser {
-    state: DiffParserState,
-    buffer: String,
-    metrics: EditParserMetrics,
-}
-
-#[derive(Debug, PartialEq)]
-enum DiffParserState {
-    Pending,
-    WithinSearch { start: bool, line_hint: Option<u32> },
-    WithinReplace { start: bool },
-}
-
-/// Main parser that delegates to format-specific parsers
-pub struct EditParser {
-    parser: Box<dyn EditFormatParser>,
-}
-
-impl XmlEditParser {
-    pub fn new() -> Self {
-        XmlEditParser {
-            state: XmlParserState::Pending,
-            buffer: String::new(),
-            metrics: EditParserMetrics::default(),
-        }
-    }
-
-    fn find_end_tag(&self) -> Option<Range<usize>> {
-        let (tag, start_ix) = END_TAGS
-            .iter()
-            .flat_map(|tag| Some((tag, self.buffer.find(tag)?)))
-            .min_by_key(|(_, ix)| *ix)?;
-        Some(start_ix..start_ix + tag.len())
-    }
-
-    fn ends_with_tag_prefix(&self) -> bool {
-        let mut end_prefixes = END_TAGS
-            .iter()
-            .flat_map(|tag| (1..tag.len()).map(move |i| &tag[..i]))
-            .chain(["\n"]);
-        end_prefixes.any(|prefix| self.buffer.ends_with(&prefix))
-    }
-
-    fn parse_line_hint(&self, tag: &str) -> Option<u32> {
-        use std::sync::LazyLock;
-        static LINE_HINT_REGEX: LazyLock<Regex> =
-            LazyLock::new(|| Regex::new(r#"line=(?:"?)(\d+)"#).unwrap());
-
-        LINE_HINT_REGEX
-            .captures(tag)
-            .and_then(|caps| caps.get(1))
-            .and_then(|m| m.as_str().parse::<u32>().ok())
-    }
-}
-
-impl EditFormatParser for XmlEditParser {
-    fn push(&mut self, chunk: &str) -> SmallVec<[EditParserEvent; 1]> {
-        self.buffer.push_str(chunk);
-
-        let mut edit_events = SmallVec::new();
-        loop {
-            match &mut self.state {
-                XmlParserState::Pending => {
-                    if let Some(start) = self.buffer.find("<old_text") {
-                        if let Some(tag_end) = self.buffer[start..].find('>') {
-                            let tag_end = start + tag_end + 1;
-                            let tag = &self.buffer[start..tag_end];
-                            let line_hint = self.parse_line_hint(tag);
-                            self.buffer.drain(..tag_end);
-                            self.state = XmlParserState::WithinOldText {
-                                start: true,
-                                line_hint,
-                            };
-                        } else {
-                            break;
-                        }
-                    } else {
-                        break;
-                    }
-                }
-                XmlParserState::WithinOldText { start, line_hint } => {
-                    if !self.buffer.is_empty() {
-                        if *start && self.buffer.starts_with('\n') {
-                            self.buffer.remove(0);
-                        }
-                        *start = false;
-                    }
-
-                    let line_hint = *line_hint;
-                    if let Some(tag_range) = self.find_end_tag() {
-                        let mut chunk = self.buffer[..tag_range.start].to_string();
-                        if chunk.ends_with('\n') {
-                            chunk.pop();
-                        }
-
-                        self.metrics.tags += 1;
-                        if &self.buffer[tag_range.clone()] != OLD_TEXT_END_TAG {
-                            self.metrics.mismatched_tags += 1;
-                        }
-
-                        self.buffer.drain(..tag_range.end);
-                        self.state = XmlParserState::AfterOldText;
-                        edit_events.push(EditParserEvent::OldTextChunk {
-                            chunk,
-                            done: true,
-                            line_hint,
-                        });
-                    } else {
-                        if !self.ends_with_tag_prefix() {
-                            edit_events.push(EditParserEvent::OldTextChunk {
-                                chunk: mem::take(&mut self.buffer),
-                                done: false,
-                                line_hint,
-                            });
-                        }
-                        break;
-                    }
-                }
-                XmlParserState::AfterOldText => {
-                    if let Some(start) = self.buffer.find("<new_text>") {
-                        self.buffer.drain(..start + "<new_text>".len());
-                        self.state = XmlParserState::WithinNewText { start: true };
-                    } else {
-                        break;
-                    }
-                }
-                XmlParserState::WithinNewText { start } => {
-                    if !self.buffer.is_empty() {
-                        if *start && self.buffer.starts_with('\n') {
-                            self.buffer.remove(0);
-                        }
-                        *start = false;
-                    }
-
-                    if let Some(tag_range) = self.find_end_tag() {
-                        let mut chunk = self.buffer[..tag_range.start].to_string();
-                        if chunk.ends_with('\n') {
-                            chunk.pop();
-                        }
-
-                        self.metrics.tags += 1;
-                        if &self.buffer[tag_range.clone()] != NEW_TEXT_END_TAG {
-                            self.metrics.mismatched_tags += 1;
-                        }
-
-                        self.buffer.drain(..tag_range.end);
-                        self.state = XmlParserState::Pending;
-                        edit_events.push(EditParserEvent::NewTextChunk { chunk, done: true });
-                    } else {
-                        if !self.ends_with_tag_prefix() {
-                            edit_events.push(EditParserEvent::NewTextChunk {
-                                chunk: mem::take(&mut self.buffer),
-                                done: false,
-                            });
-                        }
-                        break;
-                    }
-                }
-            }
-        }
-        edit_events
-    }
-
-    fn take_metrics(&mut self) -> EditParserMetrics {
-        std::mem::take(&mut self.metrics)
-    }
-}
-
-impl DiffFencedEditParser {
-    pub fn new() -> Self {
-        DiffFencedEditParser {
-            state: DiffParserState::Pending,
-            buffer: String::new(),
-            metrics: EditParserMetrics::default(),
-        }
-    }
-
-    fn ends_with_diff_marker_prefix(&self) -> bool {
-        let diff_markers = [SEPARATOR_MARKER, REPLACE_MARKER];
-        let mut diff_prefixes = diff_markers
-            .iter()
-            .flat_map(|marker| (1..marker.len()).map(move |i| &marker[..i]))
-            .chain(["\n"]);
-        diff_prefixes.any(|prefix| self.buffer.ends_with(&prefix))
-    }
-
-    fn parse_line_hint(&self, search_line: &str) -> Option<u32> {
-        use regex::Regex;
-        use std::sync::LazyLock;
-        static LINE_HINT_REGEX: LazyLock<Regex> =
-            LazyLock::new(|| Regex::new(r#"line=(?:"?)(\d+)"#).unwrap());
-
-        LINE_HINT_REGEX
-            .captures(search_line)
-            .and_then(|caps| caps.get(1))
-            .and_then(|m| m.as_str().parse::<u32>().ok())
-    }
-}
-
-impl EditFormatParser for DiffFencedEditParser {
-    fn push(&mut self, chunk: &str) -> SmallVec<[EditParserEvent; 1]> {
-        self.buffer.push_str(chunk);
-
-        let mut edit_events = SmallVec::new();
-        loop {
-            match &mut self.state {
-                DiffParserState::Pending => {
-                    if let Some(diff) = self.buffer.find(SEARCH_MARKER) {
-                        let search_end = diff + SEARCH_MARKER.len();
-                        if let Some(newline_pos) = self.buffer[search_end..].find('\n') {
-                            let search_line = &self.buffer[diff..search_end + newline_pos];
-                            let line_hint = self.parse_line_hint(search_line);
-                            self.buffer.drain(..search_end + newline_pos + 1);
-                            self.state = DiffParserState::WithinSearch {
-                                start: true,
-                                line_hint,
-                            };
-                        } else {
-                            break;
-                        }
-                    } else {
-                        break;
-                    }
-                }
-                DiffParserState::WithinSearch { start, line_hint } => {
-                    if !self.buffer.is_empty() {
-                        if *start && self.buffer.starts_with('\n') {
-                            self.buffer.remove(0);
-                        }
-                        *start = false;
-                    }
-
-                    let line_hint = *line_hint;
-                    if let Some(separator_pos) = self.buffer.find(SEPARATOR_MARKER) {
-                        let mut chunk = self.buffer[..separator_pos].to_string();
-                        if chunk.ends_with('\n') {
-                            chunk.pop();
-                        }
-
-                        let separator_end = separator_pos + SEPARATOR_MARKER.len();
-                        if let Some(newline_pos) = self.buffer[separator_end..].find('\n') {
-                            self.buffer.drain(..separator_end + newline_pos + 1);
-                            self.state = DiffParserState::WithinReplace { start: true };
-                            edit_events.push(EditParserEvent::OldTextChunk {
-                                chunk,
-                                done: true,
-                                line_hint,
-                            });
-                        } else {
-                            break;
-                        }
-                    } else {
-                        if !self.ends_with_diff_marker_prefix() {
-                            edit_events.push(EditParserEvent::OldTextChunk {
-                                chunk: mem::take(&mut self.buffer),
-                                done: false,
-                                line_hint,
-                            });
-                        }
-                        break;
-                    }
-                }
-                DiffParserState::WithinReplace { start } => {
-                    if !self.buffer.is_empty() {
-                        if *start && self.buffer.starts_with('\n') {
-                            self.buffer.remove(0);
-                        }
-                        *start = false;
-                    }
-
-                    if let Some(replace_pos) = self.buffer.find(REPLACE_MARKER) {
-                        let mut chunk = self.buffer[..replace_pos].to_string();
-                        if chunk.ends_with('\n') {
-                            chunk.pop();
-                        }
-
-                        self.buffer.drain(..replace_pos + REPLACE_MARKER.len());
-                        if let Some(newline_pos) = self.buffer.find('\n') {
-                            self.buffer.drain(..newline_pos + 1);
-                        } else {
-                            self.buffer.clear();
-                        }
-
-                        self.state = DiffParserState::Pending;
-                        edit_events.push(EditParserEvent::NewTextChunk { chunk, done: true });
-                    } else {
-                        if !self.ends_with_diff_marker_prefix() {
-                            edit_events.push(EditParserEvent::NewTextChunk {
-                                chunk: mem::take(&mut self.buffer),
-                                done: false,
-                            });
-                        }
-                        break;
-                    }
-                }
-            }
-        }
-        edit_events
-    }
-
-    fn take_metrics(&mut self) -> EditParserMetrics {
-        std::mem::take(&mut self.metrics)
-    }
-}
-
-impl EditParser {
-    pub fn new(format: EditFormat) -> Self {
-        let parser: Box<dyn EditFormatParser> = match format {
-            EditFormat::XmlTags => Box::new(XmlEditParser::new()),
-            EditFormat::DiffFenced => Box::new(DiffFencedEditParser::new()),
-        };
-        EditParser { parser }
-    }
-
-    pub fn push(&mut self, chunk: &str) -> SmallVec<[EditParserEvent; 1]> {
-        self.parser.push(chunk)
-    }
-
-    pub fn finish(mut self) -> EditParserMetrics {
-        self.parser.take_metrics()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use indoc::indoc;
-    use rand::prelude::*;
-    use std::cmp;
-
-    #[gpui::test(iterations = 1000)]
-    fn test_xml_single_edit(mut rng: StdRng) {
-        let mut parser = EditParser::new(EditFormat::XmlTags);
-        assert_eq!(
-            parse_random_chunks(
-                "<old_text>original</old_text><new_text>updated</new_text>",
-                &mut parser,
-                &mut rng
-            ),
-            vec![Edit {
-                old_text: "original".to_string(),
-                new_text: "updated".to_string(),
-                line_hint: None,
-            }]
-        );
-        assert_eq!(
-            parser.finish(),
-            EditParserMetrics {
-                tags: 2,
-                mismatched_tags: 0
-            }
-        );
-    }
-
-    #[gpui::test(iterations = 1000)]
-    fn test_xml_multiple_edits(mut rng: StdRng) {
-        let mut parser = EditParser::new(EditFormat::XmlTags);
-        assert_eq!(
-            parse_random_chunks(
-                indoc! {"
-                    <old_text>
-                    first old
-                    </old_text><new_text>first new</new_text>
-                    <old_text>second old</old_text><new_text>
-                    second new
-                    </new_text>
-                "},
-                &mut parser,
-                &mut rng
-            ),
-            vec![
-                Edit {
-                    old_text: "first old".to_string(),
-                    new_text: "first new".to_string(),
-                    line_hint: None,
-                },
-                Edit {
-                    old_text: "second old".to_string(),
-                    new_text: "second new".to_string(),
-                    line_hint: None,
-                },
-            ]
-        );
-        assert_eq!(
-            parser.finish(),
-            EditParserMetrics {
-                tags: 4,
-                mismatched_tags: 0
-            }
-        );
-    }
-
-    #[gpui::test(iterations = 1000)]
-    fn test_xml_edits_with_extra_text(mut rng: StdRng) {
-        let mut parser = EditParser::new(EditFormat::XmlTags);
-        assert_eq!(
-            parse_random_chunks(
-                indoc! {"
-                    ignore this <old_text>
-                    content</old_text>extra stuff<new_text>updated content</new_text>trailing data
-                    more text <old_text>second item
-                    </old_text>middle text<new_text>modified second item</new_text>end
-                    <old_text>third case</old_text><new_text>improved third case</new_text> with trailing text
-                "},
-                &mut parser,
-                &mut rng
-            ),
-            vec![
-                Edit {
-                    old_text: "content".to_string(),
-                    new_text: "updated content".to_string(),
-                    line_hint: None,
-                },
-                Edit {
-                    old_text: "second item".to_string(),
-                    new_text: "modified second item".to_string(),
-                    line_hint: None,
-                },
-                Edit {
-                    old_text: "third case".to_string(),
-                    new_text: "improved third case".to_string(),
-                    line_hint: None,
-                },
-            ]
-        );
-        assert_eq!(
-            parser.finish(),
-            EditParserMetrics {
-                tags: 6,
-                mismatched_tags: 0
-            }
-        );
-    }
-
-    #[gpui::test(iterations = 1000)]
-    fn test_xml_edits_with_closing_parameter_invoke(mut rng: StdRng) {
-        // This case is a regression with Claude Sonnet 4.5.
-        // Sometimes Sonnet thinks that it's doing a tool call
-        // and closes its response with '</parameter></invoke>'
-        // instead of properly closing </new_text>
-
-        let mut parser = EditParser::new(EditFormat::XmlTags);
-        assert_eq!(
-            parse_random_chunks(
-                indoc! {"
-                    <old_text>some text</old_text><new_text>updated text</parameter></invoke>
-                    <old_text>more text</old_text><new_text>upd</parameter></new_text>
-                "},
-                &mut parser,
-                &mut rng
-            ),
-            vec![
-                Edit {
-                    old_text: "some text".to_string(),
-                    new_text: "updated text".to_string(),
-                    line_hint: None,
-                },
-                Edit {
-                    old_text: "more text".to_string(),
-                    new_text: "upd".to_string(),
-                    line_hint: None,
-                },
-            ]
-        );
-        assert_eq!(
-            parser.finish(),
-            EditParserMetrics {
-                tags: 4,
-                mismatched_tags: 2
-            }
-        );
-    }
-
-    #[gpui::test(iterations = 1000)]
-    fn test_xml_nested_tags(mut rng: StdRng) {
-        let mut parser = EditParser::new(EditFormat::XmlTags);
-        assert_eq!(
-            parse_random_chunks(
-                "<old_text>code with <tag>nested</tag> elements</old_text><new_text>new <code>content</code></new_text>",
-                &mut parser,
-                &mut rng
-            ),
-            vec![Edit {
-                old_text: "code with <tag>nested</tag> elements".to_string(),
-                new_text: "new <code>content</code>".to_string(),
-                line_hint: None,
-            }]
-        );
-        assert_eq!(
-            parser.finish(),
-            EditParserMetrics {
-                tags: 2,
-                mismatched_tags: 0
-            }
-        );
-    }
-
-    #[gpui::test(iterations = 1000)]
-    fn test_xml_empty_old_and_new_text(mut rng: StdRng) {
-        let mut parser = EditParser::new(EditFormat::XmlTags);
-        assert_eq!(
-            parse_random_chunks(
-                "<old_text></old_text><new_text></new_text>",
-                &mut parser,
-                &mut rng
-            ),
-            vec![Edit {
-                old_text: "".to_string(),
-                new_text: "".to_string(),
-                line_hint: None,
-            }]
-        );
-        assert_eq!(
-            parser.finish(),
-            EditParserMetrics {
-                tags: 2,
-                mismatched_tags: 0
-            }
-        );
-    }
-
-    #[gpui::test(iterations = 100)]
-    fn test_xml_multiline_content(mut rng: StdRng) {
-        let mut parser = EditParser::new(EditFormat::XmlTags);
-        assert_eq!(
-            parse_random_chunks(
-                "<old_text>line1\nline2\nline3</old_text><new_text>line1\nmodified line2\nline3</new_text>",
-                &mut parser,
-                &mut rng
-            ),
-            vec![Edit {
-                old_text: "line1\nline2\nline3".to_string(),
-                new_text: "line1\nmodified line2\nline3".to_string(),
-                line_hint: None,
-            }]
-        );
-        assert_eq!(
-            parser.finish(),
-            EditParserMetrics {
-                tags: 2,
-                mismatched_tags: 0
-            }
-        );
-    }
-
-    #[gpui::test(iterations = 1000)]
-    fn test_xml_mismatched_tags(mut rng: StdRng) {
-        let mut parser = EditParser::new(EditFormat::XmlTags);
-        assert_eq!(
-            parse_random_chunks(
-                // Reduced from an actual Sonnet 3.7 output
-                indoc! {"
-                    <old_text>
-                    a
-                    b
-                    c
-                    </new_text>
-                    <new_text>
-                    a
-                    B
-                    c
-                    </old_text>
-                    <old_text>
-                    d
-                    e
-                    f
-                    </new_text>
-                    <new_text>
-                    D
-                    e
-                    F
-                    </old_text>
-                "},
-                &mut parser,
-                &mut rng
-            ),
-            vec![
-                Edit {
-                    old_text: "a\nb\nc".to_string(),
-                    new_text: "a\nB\nc".to_string(),
-                    line_hint: None,
-                },
-                Edit {
-                    old_text: "d\ne\nf".to_string(),
-                    new_text: "D\ne\nF".to_string(),
-                    line_hint: None,
-                }
-            ]
-        );
-        assert_eq!(
-            parser.finish(),
-            EditParserMetrics {
-                tags: 4,
-                mismatched_tags: 4
-            }
-        );
-
-        let mut parser = EditParser::new(EditFormat::XmlTags);
-        assert_eq!(
-            parse_random_chunks(
-                // Reduced from an actual Opus 4 output
-                indoc! {"
-                    <edits>
-                    <old_text>
-                    Lorem
-                    </old_text>
-                    <new_text>
-                    LOREM
-                    </edits>
-                "},
-                &mut parser,
-                &mut rng
-            ),
-            vec![Edit {
-                old_text: "Lorem".to_string(),
-                new_text: "LOREM".to_string(),
-                line_hint: None,
-            },]
-        );
-        assert_eq!(
-            parser.finish(),
-            EditParserMetrics {
-                tags: 2,
-                mismatched_tags: 1
-            }
-        );
-    }
-
-    #[gpui::test(iterations = 1000)]
-    fn test_diff_fenced_single_edit(mut rng: StdRng) {
-        let mut parser = EditParser::new(EditFormat::DiffFenced);
-        assert_eq!(
-            parse_random_chunks(
-                indoc! {"
-                    <<<<<<< SEARCH
-                    original text
-                    =======
-                    updated text
-                    >>>>>>> REPLACE
-                "},
-                &mut parser,
-                &mut rng
-            ),
-            vec![Edit {
-                old_text: "original text".to_string(),
-                new_text: "updated text".to_string(),
-                line_hint: None,
-            }]
-        );
-        assert_eq!(
-            parser.finish(),
-            EditParserMetrics {
-                tags: 0,
-                mismatched_tags: 0
-            }
-        );
-    }
-
-    #[gpui::test(iterations = 100)]
-    fn test_diff_fenced_with_markdown_fences(mut rng: StdRng) {
-        let mut parser = EditParser::new(EditFormat::DiffFenced);
-        assert_eq!(
-            parse_random_chunks(
-                indoc! {"
-                    ```diff
-                    <<<<<<< SEARCH
-                    from flask import Flask
-                    =======
-                    import math
-                    from flask import Flask
-                    >>>>>>> REPLACE
-                    ```
-                "},
-                &mut parser,
-                &mut rng
-            ),
-            vec![Edit {
-                old_text: "from flask import Flask".to_string(),
-                new_text: "import math\nfrom flask import Flask".to_string(),
-                line_hint: None,
-            }]
-        );
-        assert_eq!(
-            parser.finish(),
-            EditParserMetrics {
-                tags: 0,
-                mismatched_tags: 0
-            }
-        );
-    }
-
-    #[gpui::test(iterations = 100)]
-    fn test_diff_fenced_multiple_edits(mut rng: StdRng) {
-        let mut parser = EditParser::new(EditFormat::DiffFenced);
-        assert_eq!(
-            parse_random_chunks(
-                indoc! {"
-                    <<<<<<< SEARCH
-                    first old
-                    =======
-                    first new
-                    >>>>>>> REPLACE
-
-                    <<<<<<< SEARCH
-                    second old
-                    =======
-                    second new
-                    >>>>>>> REPLACE
-                "},
-                &mut parser,
-                &mut rng
-            ),
-            vec![
-                Edit {
-                    old_text: "first old".to_string(),
-                    new_text: "first new".to_string(),
-                    line_hint: None,
-                },
-                Edit {
-                    old_text: "second old".to_string(),
-                    new_text: "second new".to_string(),
-                    line_hint: None,
-                },
-            ]
-        );
-        assert_eq!(
-            parser.finish(),
-            EditParserMetrics {
-                tags: 0,
-                mismatched_tags: 0
-            }
-        );
-    }
-
-    #[gpui::test(iterations = 100)]
-    fn test_mixed_formats(mut rng: StdRng) {
-        // Test XML format parser only parses XML tags
-        let mut xml_parser = EditParser::new(EditFormat::XmlTags);
-        assert_eq!(
-            parse_random_chunks(
-                indoc! {"
-                    <old_text>xml style old</old_text><new_text>xml style new</new_text>
-
-                    <<<<<<< SEARCH
-                    diff style old
-                    =======
-                    diff style new
-                    >>>>>>> REPLACE
-                "},
-                &mut xml_parser,
-                &mut rng
-            ),
-            vec![Edit {
-                old_text: "xml style old".to_string(),
-                new_text: "xml style new".to_string(),
-                line_hint: None,
-            },]
-        );
-        assert_eq!(
-            xml_parser.finish(),
-            EditParserMetrics {
-                tags: 2,
-                mismatched_tags: 0
-            }
-        );
-
-        // Test diff-fenced format parser only parses diff markers
-        let mut diff_parser = EditParser::new(EditFormat::DiffFenced);
-        assert_eq!(
-            parse_random_chunks(
-                indoc! {"
-                    <old_text>xml style old</old_text><new_text>xml style new</new_text>
-
-                    <<<<<<< SEARCH
-                    diff style old
-                    =======
-                    diff style new
-                    >>>>>>> REPLACE
-                "},
-                &mut diff_parser,
-                &mut rng
-            ),
-            vec![Edit {
-                old_text: "diff style old".to_string(),
-                new_text: "diff style new".to_string(),
-                line_hint: None,
-            },]
-        );
-        assert_eq!(
-            diff_parser.finish(),
-            EditParserMetrics {
-                tags: 0,
-                mismatched_tags: 0
-            }
-        );
-    }
-
-    #[gpui::test(iterations = 100)]
-    fn test_diff_fenced_empty_sections(mut rng: StdRng) {
-        let mut parser = EditParser::new(EditFormat::DiffFenced);
-        assert_eq!(
-            parse_random_chunks(
-                indoc! {"
-                <<<<<<< SEARCH
-                =======
-                >>>>>>> REPLACE
-            "},
-                &mut parser,
-                &mut rng
-            ),
-            vec![Edit {
-                old_text: "".to_string(),
-                new_text: "".to_string(),
-                line_hint: None,
-            }]
-        );
-        assert_eq!(
-            parser.finish(),
-            EditParserMetrics {
-                tags: 0,
-                mismatched_tags: 0
-            }
-        );
-    }
-
-    #[gpui::test(iterations = 100)]
-    fn test_diff_fenced_with_line_hint(mut rng: StdRng) {
-        let mut parser = EditParser::new(EditFormat::DiffFenced);
-        let edits = parse_random_chunks(
-            indoc! {"
-                <<<<<<< SEARCH line=42
-                original text
-                =======
-                updated text
-                >>>>>>> REPLACE
-            "},
-            &mut parser,
-            &mut rng,
-        );
-        assert_eq!(
-            edits,
-            vec![Edit {
-                old_text: "original text".to_string(),
-                line_hint: Some(42),
-                new_text: "updated text".to_string(),
-            }]
-        );
-    }
-    #[gpui::test(iterations = 100)]
-    fn test_xml_line_hints(mut rng: StdRng) {
-        // Line hint is a single quoted line number
-        let mut parser = EditParser::new(EditFormat::XmlTags);
-
-        let edits = parse_random_chunks(
-            r#"
-                    <old_text line="23">original code</old_text>
-                    <new_text>updated code</new_text>"#,
-            &mut parser,
-            &mut rng,
-        );
-
-        assert_eq!(edits.len(), 1);
-        assert_eq!(edits[0].old_text, "original code");
-        assert_eq!(edits[0].line_hint, Some(23));
-        assert_eq!(edits[0].new_text, "updated code");
-
-        // Line hint is a single unquoted line number
-        let mut parser = EditParser::new(EditFormat::XmlTags);
-
-        let edits = parse_random_chunks(
-            r#"
-                    <old_text line=45>original code</old_text>
-                    <new_text>updated code</new_text>"#,
-            &mut parser,
-            &mut rng,
-        );
-
-        assert_eq!(edits.len(), 1);
-        assert_eq!(edits[0].old_text, "original code");
-        assert_eq!(edits[0].line_hint, Some(45));
-        assert_eq!(edits[0].new_text, "updated code");
-
-        // Line hint is a range
-        let mut parser = EditParser::new(EditFormat::XmlTags);
-
-        let edits = parse_random_chunks(
-            r#"
-            <old_text line="23:50">original code</old_text>
-            <new_text>updated code</new_text>"#,
-            &mut parser,
-            &mut rng,
-        );
-
-        assert_eq!(edits.len(), 1);
-        assert_eq!(edits[0].old_text, "original code");
-        assert_eq!(edits[0].line_hint, Some(23));
-        assert_eq!(edits[0].new_text, "updated code");
-
-        // No line hint
-        let mut parser = EditParser::new(EditFormat::XmlTags);
-        let edits = parse_random_chunks(
-            r#"
-            <old_text>old</old_text>
-            <new_text>new</new_text>"#,
-            &mut parser,
-            &mut rng,
-        );
-
-        assert_eq!(edits.len(), 1);
-        assert_eq!(edits[0].old_text, "old");
-        assert_eq!(edits[0].line_hint, None);
-        assert_eq!(edits[0].new_text, "new");
-    }
-
-    #[derive(Default, Debug, PartialEq, Eq)]
-    struct Edit {
-        old_text: String,
-        new_text: String,
-        line_hint: Option<u32>,
-    }
-
-    fn parse_random_chunks(input: &str, parser: &mut EditParser, rng: &mut StdRng) -> Vec<Edit> {
-        let chunk_count = rng.random_range(1..=cmp::min(input.len(), 50));
-        let mut chunk_indices = (0..input.len()).choose_multiple(rng, chunk_count);
-        chunk_indices.sort();
-        chunk_indices.push(input.len());
-
-        let mut old_text = Some(String::new());
-        let mut new_text = None;
-        let mut pending_edit = Edit::default();
-        let mut edits = Vec::new();
-        let mut last_ix = 0;
-        for chunk_ix in chunk_indices {
-            for event in parser.push(&input[last_ix..chunk_ix]) {
-                match event {
-                    EditParserEvent::OldTextChunk {
-                        chunk,
-                        done,
-                        line_hint,
-                    } => {
-                        old_text.as_mut().unwrap().push_str(&chunk);
-                        if done {
-                            pending_edit.old_text = old_text.take().unwrap();
-                            pending_edit.line_hint = line_hint;
-                            new_text = Some(String::new());
-                        }
-                    }
-                    EditParserEvent::NewTextChunk { chunk, done } => {
-                        new_text.as_mut().unwrap().push_str(&chunk);
-                        if done {
-                            pending_edit.new_text = new_text.take().unwrap();
-                            edits.push(pending_edit);
-                            pending_edit = Edit::default();
-                            old_text = Some(String::new());
-                        }
-                    }
-                }
-            }
-            last_ix = chunk_ix;
-        }
-
-        if new_text.is_some() {
-            pending_edit.new_text = new_text.take().unwrap();
-            edits.push(pending_edit);
-        }
-
-        edits
-    }
-}
diff --git a/crates/agent/src/edit_agent/evals.rs b/crates/agent/src/edit_agent/evals.rs
deleted file mode 100644
index edf8a0f671..0000000000
--- a/crates/agent/src/edit_agent/evals.rs
+++ /dev/null
@@ -1,1684 +0,0 @@
-use super::*;
-use crate::{
-    EditFileMode, EditFileToolInput, GrepToolInput, ListDirectoryToolInput, ReadFileToolInput,
-};
-use Role::*;
-use client::{Client, UserStore};
-use eval_utils::{EvalOutput, EvalOutputProcessor, OutcomeKind};
-use fs::FakeFs;
-use futures::{FutureExt, future::LocalBoxFuture};
-use gpui::{AppContext, TestAppContext, Timer};
-use http_client::StatusCode;
-use indoc::{formatdoc, indoc};
-use language_model::{
-    LanguageModelRegistry, LanguageModelToolResult, LanguageModelToolResultContent,
-    LanguageModelToolUse, LanguageModelToolUseId, SelectedModel,
-};
-use project::Project;
-use prompt_store::{ProjectContext, WorktreeContext};
-use rand::prelude::*;
-use reqwest_client::ReqwestClient;
-use serde_json::json;
-use std::{
-    fmt::{self, Display},
-    path::Path,
-    str::FromStr,
-    time::Duration,
-};
-use util::path;
-
-#[derive(Default, Clone, Debug)]
-struct EditAgentOutputProcessor {
-    mismatched_tag_threshold: f32,
-    cumulative_tags: usize,
-    cumulative_mismatched_tags: usize,
-    eval_outputs: Vec<EvalOutput<EditEvalMetadata>>,
-}
-
-fn mismatched_tag_threshold(mismatched_tag_threshold: f32) -> EditAgentOutputProcessor {
-    EditAgentOutputProcessor {
-        mismatched_tag_threshold,
-        cumulative_tags: 0,
-        cumulative_mismatched_tags: 0,
-        eval_outputs: Vec::new(),
-    }
-}
-
-#[derive(Clone, Debug)]
-struct EditEvalMetadata {
-    tags: usize,
-    mismatched_tags: usize,
-}
-
-impl EvalOutputProcessor for EditAgentOutputProcessor {
-    type Metadata = EditEvalMetadata;
-
-    fn process(&mut self, output: &EvalOutput<Self::Metadata>) {
-        if matches!(output.outcome, OutcomeKind::Passed | OutcomeKind::Failed) {
-            self.cumulative_mismatched_tags += output.metadata.mismatched_tags;
-            self.cumulative_tags += output.metadata.tags;
-            self.eval_outputs.push(output.clone());
-        }
-    }
-
-    fn assert(&mut self) {
-        let mismatched_tag_ratio =
-            self.cumulative_mismatched_tags as f32 / self.cumulative_tags as f32;
-        if mismatched_tag_ratio > self.mismatched_tag_threshold {
-            for eval_output in &self.eval_outputs {
-                println!("{}", eval_output.data);
-            }
-            panic!(
-                "Too many mismatched tags: {:?}",
-                self.cumulative_mismatched_tags
-            );
-        }
-    }
-}
-
-#[test]
-#[cfg_attr(not(feature = "unit-eval"), ignore)]
-fn eval_extract_handle_command_output() {
-    // Test how well agent generates multiple edit hunks.
-    //
-    // Model                       | Pass rate
-    // ----------------------------|----------
-    // claude-3.7-sonnet           |  0.99 (2025-06-14)
-    // claude-sonnet-4             |  0.97 (2025-06-14)
-    // gemini-2.5-pro-06-05        |  0.98 (2025-06-16)
-    // gemini-2.5-flash            |  0.11 (2025-05-22)
-    // gpt-4.1                     |  1.00 (2025-05-22)
-
-    let input_file_path = "root/blame.rs";
-    let input_file_content = include_str!("evals/fixtures/extract_handle_command_output/before.rs");
-    let possible_diffs = vec![
-        include_str!("evals/fixtures/extract_handle_command_output/possible-01.diff"),
-        include_str!("evals/fixtures/extract_handle_command_output/possible-02.diff"),
-        include_str!("evals/fixtures/extract_handle_command_output/possible-03.diff"),
-        include_str!("evals/fixtures/extract_handle_command_output/possible-04.diff"),
-        include_str!("evals/fixtures/extract_handle_command_output/possible-05.diff"),
-        include_str!("evals/fixtures/extract_handle_command_output/possible-06.diff"),
-        include_str!("evals/fixtures/extract_handle_command_output/possible-07.diff"),
-    ];
-    let edit_description = "Extract `handle_command_output` method from `run_git_blame`.";
-    eval_utils::eval(100, 0.95, mismatched_tag_threshold(0.05), move || {
-        run_eval(EvalInput::from_conversation(
-            vec![
-                message(
-                    User,
-                    [text(formatdoc! {"
-                            Read the `{input_file_path}` file and extract a method in
-                            the final stanza of `run_git_blame` to deal with command failures,
-                            call it `handle_command_output` and take the std::process::Output as the only parameter.
-                            Do not document the method and do not add any comments.
-
-                            Add it right next to `run_git_blame` and copy it verbatim from `run_git_blame`.
-                        "})],
-                ),
-                message(
-                    Assistant,
-                    [tool_use(
-                        "tool_1",
-                        "read_file",
-                        ReadFileToolInput {
-                            path: input_file_path.into(),
-                            start_line: None,
-                            end_line: None,
-                        },
-                    )],
-                ),
-                message(
-                    User,
-                    [tool_result("tool_1", "read_file", input_file_content)],
-                ),
-                message(
-                    Assistant,
-                    [tool_use(
-                        "tool_2",
-                        "edit_file",
-                        EditFileToolInput {
-                            display_description: edit_description.into(),
-                            path: input_file_path.into(),
-                            mode: EditFileMode::Edit,
-                        },
-                    )],
-                ),
-            ],
-            Some(input_file_content.into()),
-            EvalAssertion::assert_diff_any(possible_diffs.clone()),
-        ))
-    });
-}
-
-#[test]
-#[cfg_attr(not(feature = "unit-eval"), ignore)]
-fn eval_delete_run_git_blame() {
-    // Model                       | Pass rate
-    // ----------------------------|----------
-    // claude-3.7-sonnet           | 1.0  (2025-06-14)
-    // claude-sonnet-4             | 0.96 (2025-06-14)
-    // gemini-2.5-pro-06-05        | 1.0  (2025-06-16)
-    // gemini-2.5-flash            |
-    // gpt-4.1                     |
-
-    let input_file_path = "root/blame.rs";
-    let input_file_content = include_str!("evals/fixtures/delete_run_git_blame/before.rs");
-    let output_file_content = include_str!("evals/fixtures/delete_run_git_blame/after.rs");
-    let edit_description = "Delete the `run_git_blame` function.";
-
-    eval_utils::eval(100, 0.95, mismatched_tag_threshold(0.05), move || {
-        run_eval(EvalInput::from_conversation(
-            vec![
-                message(
-                    User,
-                    [text(formatdoc! {"
-                            Read the `{input_file_path}` file and delete `run_git_blame`. Just that
-                            one function, not its usages.
-                        "})],
-                ),
-                message(
-                    Assistant,
-                    [tool_use(
-                        "tool_1",
-                        "read_file",
-                        ReadFileToolInput {
-                            path: input_file_path.into(),
-                            start_line: None,
-                            end_line: None,
-                        },
-                    )],
-                ),
-                message(
-                    User,
-                    [tool_result("tool_1", "read_file", input_file_content)],
-                ),
-                message(
-                    Assistant,
-                    [tool_use(
-                        "tool_2",
-                        "edit_file",
-                        EditFileToolInput {
-                            display_description: edit_description.into(),
-                            path: input_file_path.into(),
-                            mode: EditFileMode::Edit,
-                        },
-                    )],
-                ),
-            ],
-            Some(input_file_content.into()),
-            EvalAssertion::assert_eq(output_file_content),
-        ))
-    });
-}
-
-#[test]
-#[cfg_attr(not(feature = "unit-eval"), ignore)]
-fn eval_translate_doc_comments() {
-    //  Model                          | Pass rate
-    // ============================================
-    //
-    //  claude-3.7-sonnet              |  1.0  (2025-06-14)
-    //  claude-sonnet-4                |  1.0  (2025-06-14)
-    //  gemini-2.5-pro-preview-03-25   |  1.0  (2025-05-22)
-    //  gemini-2.5-flash-preview-04-17 |
-    //  gpt-4.1                        |
-
-    let input_file_path = "root/canvas.rs";
-    let input_file_content = include_str!("evals/fixtures/translate_doc_comments/before.rs");
-    let edit_description = "Translate all doc comments to Italian";
-
-    eval_utils::eval(200, 1., mismatched_tag_threshold(0.05), move || {
-        run_eval(EvalInput::from_conversation(
-            vec![
-                message(
-                    User,
-                    [text(formatdoc! {"
-                            Read the {input_file_path} file and edit it (without overwriting it),
-                            translating all the doc comments to italian.
-                        "})],
-                ),
-                message(
-                    Assistant,
-                    [tool_use(
-                        "tool_1",
-                        "read_file",
-                        ReadFileToolInput {
-                            path: input_file_path.into(),
-                            start_line: None,
-                            end_line: None,
-                        },
-                    )],
-                ),
-                message(
-                    User,
-                    [tool_result("tool_1", "read_file", input_file_content)],
-                ),
-                message(
-                    Assistant,
-                    [tool_use(
-                        "tool_2",
-                        "edit_file",
-                        EditFileToolInput {
-                            display_description: edit_description.into(),
-                            path: input_file_path.into(),
-                            mode: EditFileMode::Edit,
-                        },
-                    )],
-                ),
-            ],
-            Some(input_file_content.into()),
-            EvalAssertion::judge_diff("Doc comments were translated to Italian"),
-        ))
-    });
-}
-
-#[test]
-#[cfg_attr(not(feature = "unit-eval"), ignore)]
-fn eval_use_wasi_sdk_in_compile_parser_to_wasm() {
-    //  Model                          | Pass rate
-    // ============================================
-    //
-    //  claude-3.7-sonnet              |  0.96 (2025-06-14)
-    //  claude-sonnet-4                |  0.11 (2025-06-14)
-    //  gemini-2.5-pro-preview-latest  |  0.99 (2025-06-16)
-    //  gemini-2.5-flash-preview-04-17 |
-    //  gpt-4.1                        |
-
-    let input_file_path = "root/lib.rs";
-    let input_file_content =
-        include_str!("evals/fixtures/use_wasi_sdk_in_compile_parser_to_wasm/before.rs");
-    let edit_description = "Update compile_parser_to_wasm to use wasi-sdk instead of emscripten";
-
-    eval_utils::eval(100, 0.95, mismatched_tag_threshold(0.05), move || {
-        run_eval(EvalInput::from_conversation(
-            vec![
-                message(
-                    User,
-                    [text(formatdoc! {"
-                            Read the `{input_file_path}` file and change `compile_parser_to_wasm` to use `wasi-sdk` instead of emscripten.
-                            Use `ureq` to download the SDK for the current platform and architecture.
-                            Extract the archive into a sibling of `lib` inside the `tree-sitter` directory in the cache_dir.
-                            Compile the parser to wasm using the `bin/clang` executable (or `bin/clang.exe` on windows)
-                            that's inside of the archive.
-                            Don't re-download the SDK if that executable already exists.
-
-                            Use these clang flags: -fPIC -shared -Os -Wl,--export=tree_sitter_{{language_name}}
-
-                            Here are the available wasi-sdk assets:
-                            - wasi-sdk-25.0-x86_64-macos.tar.gz
-                            - wasi-sdk-25.0-arm64-macos.tar.gz
-                            - wasi-sdk-25.0-x86_64-linux.tar.gz
-                            - wasi-sdk-25.0-arm64-linux.tar.gz
-                            - wasi-sdk-25.0-x86_64-linux.tar.gz
-                            - wasi-sdk-25.0-arm64-linux.tar.gz
-                            - wasi-sdk-25.0-x86_64-windows.tar.gz
-                        "})],
-                ),
-                message(
-                    Assistant,
-                    [tool_use(
-                        "tool_1",
-                        "read_file",
-                        ReadFileToolInput {
-                            path: input_file_path.into(),
-                            start_line: Some(971),
-                            end_line: Some(1050),
-                        },
-                    )],
-                ),
-                message(
-                    User,
-                    [tool_result(
-                        "tool_1",
-                        "read_file",
-                        lines(input_file_content, 971..1050),
-                    )],
-                ),
-                message(
-                    Assistant,
-                    [tool_use(
-                        "tool_2",
-                        "read_file",
-                        ReadFileToolInput {
-                            path: input_file_path.into(),
-                            start_line: Some(1050),
-                            end_line: Some(1100),
-                        },
-                    )],
-                ),
-                message(
-                    User,
-                    [tool_result(
-                        "tool_2",
-                        "read_file",
-                        lines(input_file_content, 1050..1100),
-                    )],
-                ),
-                message(
-                    Assistant,
-                    [tool_use(
-                        "tool_3",
-                        "read_file",
-                        ReadFileToolInput {
-                            path: input_file_path.into(),
-                            start_line: Some(1100),
-                            end_line: Some(1150),
-                        },
-                    )],
-                ),
-                message(
-                    User,
-                    [tool_result(
-                        "tool_3",
-                        "read_file",
-                        lines(input_file_content, 1100..1150),
-                    )],
-                ),
-                message(
-                    Assistant,
-                    [tool_use(
-                        "tool_4",
-                        "edit_file",
-                        EditFileToolInput {
-                            display_description: edit_description.into(),
-                            path: input_file_path.into(),
-                            mode: EditFileMode::Edit,
-                        },
-                    )],
-                ),
-            ],
-            Some(input_file_content.into()),
-            EvalAssertion::judge_diff(indoc! {"
-                    - The compile_parser_to_wasm method has been changed to use wasi-sdk
-                    - ureq is used to download the SDK for current platform and architecture
-                "}),
-        ))
-    });
-}
-
-#[test]
-#[cfg_attr(not(feature = "unit-eval"), ignore)]
-fn eval_disable_cursor_blinking() {
-    //  Model                          | Pass rate
-    // ============================================
-    //
-    //  claude-3.7-sonnet              |  0.59 (2025-07-14)
-    //  claude-sonnet-4                |  0.81 (2025-07-14)
-    //  gemini-2.5-pro                 |  0.95 (2025-07-14)
-    //  gemini-2.5-flash-preview-04-17 |  0.78 (2025-07-14)
-    //  gpt-4.1                        |  0.00 (2025-07-14) (follows edit_description too literally)
-
-    let input_file_path = "root/editor.rs";
-    let input_file_content = include_str!("evals/fixtures/disable_cursor_blinking/before.rs");
-    let edit_description = "Comment out the call to `BlinkManager::enable`";
-    let possible_diffs = vec![
-        include_str!("evals/fixtures/disable_cursor_blinking/possible-01.diff"),
-        include_str!("evals/fixtures/disable_cursor_blinking/possible-02.diff"),
-        include_str!("evals/fixtures/disable_cursor_blinking/possible-03.diff"),
-        include_str!("evals/fixtures/disable_cursor_blinking/possible-04.diff"),
-    ];
-    eval_utils::eval(100, 0.51, mismatched_tag_threshold(0.05), move || {
-        run_eval(EvalInput::from_conversation(
-            vec![
-                message(User, [text("Let's research how to cursor blinking works.")]),
-                message(
-                    Assistant,
-                    [tool_use(
-                        "tool_1",
-                        "grep",
-                        GrepToolInput {
-                            regex: "blink".into(),
-                            include_pattern: None,
-                            offset: 0,
-                            case_sensitive: false,
-                        },
-                    )],
-                ),
-                message(
-                    User,
-                    [tool_result(
-                        "tool_1",
-                        "grep",
-                        [
-                            lines(input_file_content, 100..400),
-                            lines(input_file_content, 800..1300),
-                            lines(input_file_content, 1600..2000),
-                            lines(input_file_content, 5000..5500),
-                            lines(input_file_content, 8000..9000),
-                            lines(input_file_content, 18455..18470),
-                            lines(input_file_content, 20000..20500),
-                            lines(input_file_content, 21000..21300),
-                        ]
-                        .join("Match found:\n\n"),
-                    )],
-                ),
-                message(
-                    User,
-                    [text(indoc! {"
-                            Comment out the lines that interact with the BlinkManager.
-                            Keep the outer `update` blocks, but comments everything that's inside (including if statements).
-                            Don't add additional comments.
-                        "})],
-                ),
-                message(
-                    Assistant,
-                    [tool_use(
-                        "tool_4",
-                        "edit_file",
-                        EditFileToolInput {
-                            display_description: edit_description.into(),
-                            path: input_file_path.into(),
-                            mode: EditFileMode::Edit,
-                        },
-                    )],
-                ),
-            ],
-            Some(input_file_content.into()),
-            EvalAssertion::assert_diff_any(possible_diffs.clone()),
-        ))
-    });
-}
-
-#[test]
-#[cfg_attr(not(feature = "unit-eval"), ignore)]
-fn eval_from_pixels_constructor() {
-    // Results for 2025-06-13
-    //
-    // The outcome of this evaluation depends heavily on the LINE_HINT_TOLERANCE
-    // value. Higher values improve the pass rate but may sometimes cause
-    // edits to be misapplied. In the context of this eval, this means
-    // the agent might add from_pixels tests in incorrect locations
-    // (e.g., at the beginning of the file), yet the evaluation may still
-    // rate it highly.
-    //
-    //  Model                          | Date        | Pass rate
-    // =========================================================
-    //  claude-4.0-sonnet              | 2025-06-14  | 0.99
-    //  claude-3.7-sonnet              | 2025-06-14  | 0.88
-    //  gemini-2.5-pro-preview-06-05   | 2025-06-16  | 0.98
-    //  gpt-4.1                        |
-
-    let input_file_path = "root/canvas.rs";
-    let input_file_content = include_str!("evals/fixtures/from_pixels_constructor/before.rs");
-    let edit_description = "Implement from_pixels constructor and add tests.";
-
-    eval_utils::eval(100, 0.95, mismatched_tag_threshold(0.25), move || {
-        run_eval(EvalInput::from_conversation(
-            vec![
-                message(
-                    User,
-                    [text(indoc! {"
-                            Introduce a new `from_pixels` constructor in Canvas and
-                            also add tests for it in the same file.
-                        "})],
-                ),
-                message(
-                    Assistant,
-                    [tool_use(
-                        "tool_1",
-                        "read_file",
-                        ReadFileToolInput {
-                            path: input_file_path.into(),
-                            start_line: None,
-                            end_line: None,
-                        },
-                    )],
-                ),
-                message(
-                    User,
-                    [tool_result("tool_1", "read_file", input_file_content)],
-                ),
-                message(
-                    Assistant,
-                    [tool_use(
-                        "tool_2",
-                        "grep",
-                        GrepToolInput {
-                            regex: "mod\\s+tests".into(),
-                            include_pattern: Some("font-kit/src/canvas.rs".into()),
-                            offset: 0,
-                            case_sensitive: false,
-                        },
-                    )],
-                ),
-                message(User, [tool_result("tool_2", "grep", "No matches found")]),
-                message(
-                    Assistant,
-                    [tool_use(
-                        "tool_3",
-                        "grep",
-                        GrepToolInput {
-                            regex: "mod\\s+tests".into(),
-                            include_pattern: Some("font-kit/src/**/*.rs".into()),
-                            offset: 0,
-                            case_sensitive: false,
-                        },
-                    )],
-                ),
-                message(User, [tool_result("tool_3", "grep", "No matches found")]),
-                message(
-                    Assistant,
-                    [tool_use(
-                        "tool_4",
-                        "grep",
-                        GrepToolInput {
-                            regex: "#\\[test\\]".into(),
-                            include_pattern: Some("font-kit/src/**/*.rs".into()),
-                            offset: 0,
-                            case_sensitive: false,
-                        },
-                    )],
-                ),
-                message(
-                    User,
-                    [tool_result(
-                        "tool_4",
-                        "grep",
-                        indoc! {"
-                                Found 6 matches:
-
-                                ## Matches in font-kit/src/loaders/core_text.rs
-
-                                ### mod test › L926-936
-                                ```
-                                mod test {
-                                    use super::Font;
-                                    use crate::properties::{Stretch, Weight};
-
-                                    #[cfg(feature = \"source\")]
-                                    use crate::source::SystemSource;
-
-                                    static TEST_FONT_POSTSCRIPT_NAME: &'static str = \"ArialMT\";
-
-                                    #[cfg(feature = \"source\")]
-                                    #[test]
-                                ```
-
-                                55 lines remaining in ancestor node. Read the file to see all.
-
-                                ### mod test › L947-951
-                                ```
-                                    }
-
-                                    #[test]
-                                    fn test_core_text_to_css_font_weight() {
-                                        // Exact matches
-                                ```
-
-                                ### mod test › L959-963
-                                ```
-                                    }
-
-                                    #[test]
-                                    fn test_core_text_to_css_font_stretch() {
-                                        // Exact matches
-                                ```
-
-                                ## Matches in font-kit/src/loaders/freetype.rs
-
-                                ### mod test › L1238-1248
-                                ```
-                                mod test {
-                                    use crate::loaders::freetype::Font;
-
-                                    static PCF_FONT_PATH: &str = \"resources/tests/times-roman-pcf/timR12.pcf\";
-                                    static PCF_FONT_POSTSCRIPT_NAME: &str = \"Times-Roman\";
-
-                                    #[test]
-                                    fn get_pcf_postscript_name() {
-                                        let font = Font::from_path(PCF_FONT_PATH, 0).unwrap();
-                                        assert_eq!(font.postscript_name().unwrap(), PCF_FONT_POSTSCRIPT_NAME);
-                                    }
-                                ```
-
-                                1 lines remaining in ancestor node. Read the file to see all.
-
-                                ## Matches in font-kit/src/sources/core_text.rs
-
-                                ### mod test › L265-275
-                                ```
-                                mod test {
-                                    use crate::properties::{Stretch, Weight};
-
-                                    #[test]
-                                    fn test_css_to_core_text_font_weight() {
-                                        // Exact matches
-                                        assert_eq!(super::css_to_core_text_font_weight(Weight(100.0)), -0.7);
-                                        assert_eq!(super::css_to_core_text_font_weight(Weight(400.0)), 0.0);
-                                        assert_eq!(super::css_to_core_text_font_weight(Weight(700.0)), 0.4);
-                                        assert_eq!(super::css_to_core_text_font_weight(Weight(900.0)), 0.8);
-
-                                ```
-
-                                27 lines remaining in ancestor node. Read the file to see all.
-
-                                ### mod test › L278-282
-                                ```
-                                    }
-
-                                    #[test]
-                                    fn test_css_to_core_text_font_stretch() {
-                                        // Exact matches
-                                ```
-                            "},
-                    )],
-                ),
-                message(
-                    Assistant,
-                    [tool_use(
-                        "tool_5",
-                        "edit_file",
-                        EditFileToolInput {
-                            display_description: edit_description.into(),
-                            path: input_file_path.into(),
-                            mode: EditFileMode::Edit,
-                        },
-                    )],
-                ),
-            ],
-            Some(input_file_content.into()),
-            EvalAssertion::judge_diff(indoc! {"
-                        - The diff contains a new `from_pixels` constructor
-                        - The diff contains new tests for the `from_pixels` constructor
-                    "}),
-        ))
-    });
-}
-
-#[test]
-#[cfg_attr(not(feature = "unit-eval"), ignore)]
-fn eval_zode() {
-    //  Model                          | Pass rate
-    // ============================================
-    //
-    //  claude-3.7-sonnet              |  1.0 (2025-06-14)
-    //  claude-sonnet-4                |  1.0 (2025-06-14)
-    //  gemini-2.5-pro-preview-03-25   |  1.0 (2025-05-22)
-    //  gemini-2.5-flash-preview-04-17 |  1.0 (2025-05-22)
-    //  gpt-4.1                        |  1.0 (2025-05-22)
-
-    let input_file_path = "root/zode.py";
-    let input_content = None;
-    let edit_description = "Create the main Zode CLI script";
-
-    eval_utils::eval(50, 1., mismatched_tag_threshold(0.05), move || {
-        run_eval(EvalInput::from_conversation(
-            vec![
-                message(User, [text(include_str!("evals/fixtures/zode/prompt.md"))]),
-                message(
-                    Assistant,
-                    [
-                        tool_use(
-                            "tool_1",
-                            "read_file",
-                            ReadFileToolInput {
-                                path: "root/eval/react.py".into(),
-                                start_line: None,
-                                end_line: None,
-                            },
-                        ),
-                        tool_use(
-                            "tool_2",
-                            "read_file",
-                            ReadFileToolInput {
-                                path: "root/eval/react_test.py".into(),
-                                start_line: None,
-                                end_line: None,
-                            },
-                        ),
-                    ],
-                ),
-                message(
-                    User,
-                    [
-                        tool_result(
-                            "tool_1",
-                            "read_file",
-                            include_str!("evals/fixtures/zode/react.py"),
-                        ),
-                        tool_result(
-                            "tool_2",
-                            "read_file",
-                            include_str!("evals/fixtures/zode/react_test.py"),
-                        ),
-                    ],
-                ),
-                message(
-                    Assistant,
-                    [
-                        text(
-                            "Now that I understand what we need to build, I'll create the main Python script:",
-                        ),
-                        tool_use(
-                            "tool_3",
-                            "edit_file",
-                            EditFileToolInput {
-                                display_description: edit_description.into(),
-                                path: input_file_path.into(),
-                                mode: EditFileMode::Create,
-                            },
-                        ),
-                    ],
-                ),
-            ],
-            input_content.clone(),
-            EvalAssertion::new(async move |sample, _, _cx| {
-                let invalid_starts = [' ', '`', '\n'];
-                let mut message = String::new();
-                for start in invalid_starts {
-                    if sample.text_after.starts_with(start) {
-                        message.push_str(&format!("The sample starts with a {:?}\n", start));
-                        break;
-                    }
-                }
-                // Remove trailing newline.
-                message.pop();
-
-                if message.is_empty() {
-                    Ok(EvalAssertionOutcome {
-                        score: 100,
-                        message: None,
-                    })
-                } else {
-                    Ok(EvalAssertionOutcome {
-                        score: 0,
-                        message: Some(message),
-                    })
-                }
-            }),
-        ))
-    });
-}
-
-#[test]
-#[cfg_attr(not(feature = "unit-eval"), ignore)]
-fn eval_add_overwrite_test() {
-    //  Model                          | Pass rate
-    // ============================================
-    //
-    //  claude-3.7-sonnet              |  0.65 (2025-06-14)
-    //  claude-sonnet-4                |  0.07 (2025-06-14)
-    //  gemini-2.5-pro-preview-03-25   |  0.35 (2025-05-22)
-    //  gemini-2.5-flash-preview-04-17 |
-    //  gpt-4.1                        |
-
-    let input_file_path = "root/action_log.rs";
-    let input_file_content = include_str!("evals/fixtures/add_overwrite_test/before.rs");
-    let edit_description = "Add a new test for overwriting a file in action_log.rs";
-
-    eval_utils::eval(200, 0.5, mismatched_tag_threshold(0.05), move || {
-        run_eval(EvalInput::from_conversation(
-            vec![
-                message(
-                    User,
-                    [text(indoc! {"
-                            Introduce a new test in `action_log.rs` to test overwriting a file.
-                            That is, a file already exists, but we call `buffer_created` as if the file were new.
-                            Take inspiration from all the other tests in the file.
-                        "})],
-                ),
-                message(
-                    Assistant,
-                    [tool_use(
-                        "tool_1",
-                        "read_file",
-                        ReadFileToolInput {
-                            path: input_file_path.into(),
-                            start_line: None,
-                            end_line: None,
-                        },
-                    )],
-                ),
-                message(
-                    User,
-                    [tool_result(
-                        "tool_1",
-                        "read_file",
-                        indoc! {"
-                                pub struct ActionLog [L13-20]
-                                 tracked_buffers [L15]
-                                 edited_since_project_diagnostics_check [L17]
-                                 project [L19]
-                                impl ActionLog [L22-498]
-                                 pub fn new [L24-30]
-                                 pub fn project [L32-34]
-                                 pub fn checked_project_diagnostics [L37-39]
-                                 pub fn has_edited_files_since_project_diagnostics_check [L42-44]
-                                 fn track_buffer_internal [L46-101]
-                                 fn handle_buffer_event [L103-116]
-                                 fn handle_buffer_edited [L118-123]
-                                 fn handle_buffer_file_changed [L125-158]
-                                 async fn maintain_diff [L160-264]
-                                 pub fn buffer_read [L267-269]
-                                 pub fn buffer_created [L272-276]
-                                 pub fn buffer_edited [L279-287]
-                                 pub fn will_delete_buffer [L289-304]
-                                 pub fn keep_edits_in_range [L306-364]
-                                 pub fn reject_edits_in_ranges [L366-459]
-                                 pub fn keep_all_edits [L461-473]
-                                 pub fn changed_buffers [L476-482]
-                                 pub fn stale_buffers [L485-497]
-                                fn apply_non_conflicting_edits [L500-561]
-                                fn diff_snapshots [L563-585]
-                                fn point_to_row_edit [L587-614]
-                                enum ChangeAuthor [L617-620]
-                                 User [L618]
-                                 Agent [L619]
-                                enum TrackedBufferStatus [L623-627]
-                                 Created [L624]
-                                 Modified [L625]
-                                 Deleted [L626]
-                                struct TrackedBuffer [L629-641]
-                                 buffer [L630]
-                                 base_text [L631]
-                                 unreviewed_changes [L632]
-                                 status [L633]
-                                 version [L634]
-                                 diff [L635]
-                                 snapshot [L636]
-                                 diff_update [L637]
-                                 _open_lsp_handle [L638]
-                                 _maintain_diff [L639]
-                                 _subscription [L640]
-                                impl TrackedBuffer [L643-657]
-                                 fn has_changes [L644-650]
-                                 fn schedule_diff_update [L652-656]
-                                pub struct ChangedBuffer [L659-661]
-                                 pub diff [L660]
-                                mod tests [L664-1574]
-                                 fn init_logger [L678-682]
-                                 fn init_test [L684-691]
-                                 async fn test_keep_edits [L694-769]
-                                 async fn test_deletions [L772-854]
-                                 async fn test_overlapping_user_edits [L857-951]
-                                 async fn test_creating_files [L954-1010]
-                                 async fn test_deleting_files [L1013-1120]
-                                 async fn test_reject_edits [L1123-1255]
-                                 async fn test_reject_multiple_edits [L1258-1331]
-                                 async fn test_reject_deleted_file [L1334-1388]
-                                 async fn test_reject_created_file [L1391-1443]
-                                 async fn test_random_diffs [L1446-1535]
-                                  fn quiesce [L1510-1534]
-                                 struct HunkStatus [L1538-1542]
-                                  range [L1539]
-                                  diff_status [L1540]
-                                  old_text [L1541]
-                                 fn unreviewed_hunks [L1544-1573]
-
-                                Showing symbols 1-69 (total symbols: 69)
-
-                                Using the line numbers in this outline, you can call this tool again while specifying
-                                the start_line and end_line fields to see the implementations of symbols in the outline.
-                            "},
-                    )],
-                ),
-                message(
-                    Assistant,
-                    [
-                        text(
-                            "Let's look at the existing test cases that are related to file creation to understand the pattern:",
-                        ),
-                        tool_use(
-                            "tool_2",
-                            "read_file",
-                            ReadFileToolInput {
-                                path: input_file_path.into(),
-                                start_line: Some(953),
-                                end_line: Some(1010),
-                            },
-                        ),
-                    ],
-                ),
-                message(
-                    User,
-                    [tool_result(
-                        "tool_2",
-                        "read_file",
-                        lines(input_file_content, 953..1010),
-                    )],
-                ),
-                message(
-                    Assistant,
-                    [
-                        text(
-                            "Now let's look at another relevant test to understand how they're structured:",
-                        ),
-                        tool_use(
-                            "tool_3",
-                            "read_file",
-                            ReadFileToolInput {
-                                path: input_file_path.into(),
-                                start_line: Some(1012),
-                                end_line: Some(1120),
-                            },
-                        ),
-                    ],
-                ),
-                message(
-                    User,
-                    [tool_result(
-                        "tool_3",
-                        "read_file",
-                        lines(input_file_content, 1012..1120),
-                    )],
-                ),
-                message(
-                    Assistant,
-                    [
-                        text("Now let's look at how `buffer_created` is implemented:"),
-                        tool_use(
-                            "tool_4",
-                            "read_file",
-                            ReadFileToolInput {
-                                path: input_file_path.into(),
-                                start_line: Some(271),
-                                end_line: Some(276),
-                            },
-                        ),
-                    ],
-                ),
-                message(
-                    User,
-                    [tool_result(
-                        "tool_4",
-                        "read_file",
-                        lines(input_file_content, 271..276),
-                    )],
-                ),
-                message(
-                    Assistant,
-                    [
-                        text(indoc! {"
-                                Based on my understanding of the existing tests and code, I'll now create a new test for overwriting a file. In this test, we'll:
-
-                                1. Create a file
-                                2. Open a buffer for it
-                                3. Track it in the action log
-                                4. Modify the buffer
-                                5. Call `buffer_created` again as if the file were new
-                                6. Check that the changes are properly tracked
-
-                                Let's write the test:
-                            "}),
-                        tool_use(
-                            "tool_5",
-                            "edit_file",
-                            EditFileToolInput {
-                                display_description: edit_description.into(),
-                                path: input_file_path.into(),
-                                mode: EditFileMode::Edit,
-                            },
-                        ),
-                    ],
-                ),
-            ],
-            Some(input_file_content.into()),
-            EvalAssertion::judge_diff(
-                "A new test for overwritten files was created, without changing any previous test",
-            ),
-        ))
-    });
-}
-
-#[test]
-#[cfg_attr(not(feature = "unit-eval"), ignore)]
-fn eval_create_empty_file() {
-    // Check that Edit Agent can create a file without writing its
-    // thoughts into it. This issue is not specific to empty files, but
-    // it's easier to reproduce with them.
-    //
-    //  Model                          | Pass rate
-    // ============================================
-    //
-    //  claude-3.7-sonnet              |  1.00 (2025-06-14)
-    //  claude-sonnet-4                |  1.00 (2025-06-14)
-    //  gemini-2.5-pro-preview-03-25   |  1.00 (2025-05-21)
-    //  gemini-2.5-flash-preview-04-17 |  1.00 (2025-05-21)
-    //  gpt-4.1                        |  1.00 (2025-05-21)
-    //
-    //
-    // TODO: gpt-4.1-mini errored 38 times:
-    // "data did not match any variant of untagged enum ResponseStreamResult"
-
-    let input_file_content = None;
-    let expected_output_content = String::new();
-
-    eval_utils::eval(100, 0.99, mismatched_tag_threshold(0.05), move || {
-        run_eval(EvalInput::from_conversation(
-            vec![
-                message(User, [text("Create a second empty todo file ")]),
-                message(
-                    Assistant,
-                    [
-                        text(formatdoc! {"
-                            I'll help you create a second empty todo file.
-                            First, let me examine the project structure to see if there's already a todo file, which will help me determine the appropriate name and location for the second one.
-                            "}),
-                        tool_use(
-                            "toolu_01GAF8TtsgpjKxCr8fgQLDgR",
-                            "list_directory",
-                            ListDirectoryToolInput {
-                                path: "root".to_string(),
-                            },
-                        ),
-                    ],
-                ),
-                message(
-                    User,
-                    [tool_result(
-                        "toolu_01GAF8TtsgpjKxCr8fgQLDgR",
-                        "list_directory",
-                        "root/TODO\nroot/TODO2\nroot/new.txt\n",
-                    )],
-                ),
-                message(
-                    Assistant,
-                    [
-                        text(formatdoc! {"
-                            I can see there's already a `TODO` file in the `root` directory. Let me create a second empty todo file called `TODO3` in the same directory:
-                        "}),
-                        tool_use(
-                            "toolu_01Tb3iQ9griqSYMmVuykQPWU",
-                            "edit_file",
-                            EditFileToolInput {
-                                display_description: "Create empty TODO3 file".to_string(),
-                                mode: EditFileMode::Create,
-                                path: "root/TODO3".into(),
-                            },
-                        ),
-                    ],
-                ),
-            ],
-            input_file_content.clone(),
-            // Bad behavior is to write something like
-            // "I'll create an empty TODO3 file as requested."
-            EvalAssertion::assert_eq(expected_output_content.clone()),
-        ))
-    });
-}
-
-fn message(
-    role: Role,
-    contents: impl IntoIterator<Item = MessageContent>,
-) -> LanguageModelRequestMessage {
-    LanguageModelRequestMessage {
-        role,
-        content: contents.into_iter().collect(),
-        cache: false,
-        reasoning_details: None,
-    }
-}
-
-fn text(text: impl Into<String>) -> MessageContent {
-    MessageContent::Text(text.into())
-}
-
-fn lines(input: &str, range: Range<usize>) -> String {
-    input
-        .lines()
-        .skip(range.start)
-        .take(range.len())
-        .collect::<Vec<_>>()
-        .join("\n")
-}
-
-fn tool_use(
-    id: impl Into<Arc<str>>,
-    name: impl Into<Arc<str>>,
-    input: impl Serialize,
-) -> MessageContent {
-    MessageContent::ToolUse(LanguageModelToolUse {
-        id: LanguageModelToolUseId::from(id.into()),
-        name: name.into(),
-        raw_input: serde_json::to_string_pretty(&input).unwrap(),
-        input: serde_json::to_value(input).unwrap(),
-        is_input_complete: true,
-        thought_signature: None,
-    })
-}
-
-fn tool_result(
-    id: impl Into<Arc<str>>,
-    name: impl Into<Arc<str>>,
-    result: impl Into<Arc<str>>,
-) -> MessageContent {
-    MessageContent::ToolResult(LanguageModelToolResult {
-        tool_use_id: LanguageModelToolUseId::from(id.into()),
-        tool_name: name.into(),
-        is_error: false,
-        content: LanguageModelToolResultContent::Text(result.into()),
-        output: None,
-    })
-}
-
-#[derive(Clone)]
-struct EvalInput {
-    conversation: Vec<LanguageModelRequestMessage>,
-    edit_file_input: EditFileToolInput,
-    input_content: Option<String>,
-    assertion: EvalAssertion,
-}
-
-impl EvalInput {
-    fn from_conversation(
-        conversation: Vec<LanguageModelRequestMessage>,
-        input_content: Option<String>,
-        assertion: EvalAssertion,
-    ) -> Self {
-        let msg = conversation.last().expect("Conversation must not be empty");
-        if msg.role != Role::Assistant {
-            panic!("Conversation must end with an assistant message");
-        }
-        let tool_use = msg
-            .content
-            .iter()
-            .flat_map(|content| match content {
-                MessageContent::ToolUse(tool_use) if tool_use.name == "edit_file".into() => {
-                    Some(tool_use)
-                }
-                _ => None,
-            })
-            .next()
-            .expect("Conversation must end with an edit_file tool use")
-            .clone();
-
-        let edit_file_input: EditFileToolInput = serde_json::from_value(tool_use.input).unwrap();
-
-        EvalInput {
-            conversation,
-            edit_file_input,
-            input_content,
-            assertion,
-        }
-    }
-}
-
-#[derive(Clone)]
-struct EvalSample {
-    text_before: String,
-    text_after: String,
-    edit_output: EditAgentOutput,
-    diff: String,
-}
-
-trait AssertionFn: 'static + Send + Sync {
-    fn assert<'a>(
-        &'a self,
-        sample: &'a EvalSample,
-        judge_model: Arc<dyn LanguageModel>,
-        cx: &'a mut TestAppContext,
-    ) -> LocalBoxFuture<'a, Result<EvalAssertionOutcome>>;
-}
-
-impl<F> AssertionFn for F
-where
-    F: 'static
-        + Send
-        + Sync
-        + AsyncFn(
-            &EvalSample,
-            Arc<dyn LanguageModel>,
-            &mut TestAppContext,
-        ) -> Result<EvalAssertionOutcome>,
-{
-    fn assert<'a>(
-        &'a self,
-        sample: &'a EvalSample,
-        judge_model: Arc<dyn LanguageModel>,
-        cx: &'a mut TestAppContext,
-    ) -> LocalBoxFuture<'a, Result<EvalAssertionOutcome>> {
-        (self)(sample, judge_model, cx).boxed_local()
-    }
-}
-
-#[derive(Clone)]
-struct EvalAssertion(Arc<dyn AssertionFn>);
-
-impl EvalAssertion {
-    fn new<F>(f: F) -> Self
-    where
-        F: 'static
-            + Send
-            + Sync
-            + AsyncFn(
-                &EvalSample,
-                Arc<dyn LanguageModel>,
-                &mut TestAppContext,
-            ) -> Result<EvalAssertionOutcome>,
-    {
-        EvalAssertion(Arc::new(f))
-    }
-
-    fn assert_eq(expected: impl Into<String>) -> Self {
-        let expected = expected.into();
-        Self::new(async move |sample, _judge, _cx| {
-            Ok(EvalAssertionOutcome {
-                score: if strip_empty_lines(&sample.text_after) == strip_empty_lines(&expected) {
-                    100
-                } else {
-                    0
-                },
-                message: None,
-            })
-        })
-    }
-
-    fn assert_diff_any(expected_diffs: Vec<impl Into<String>>) -> Self {
-        let expected_diffs: Vec<String> = expected_diffs.into_iter().map(Into::into).collect();
-        Self::new(async move |sample, _judge, _cx| {
-            let matches = expected_diffs.iter().any(|possible_diff| {
-                let expected =
-                    language::apply_diff_patch(&sample.text_before, possible_diff).unwrap();
-                strip_empty_lines(&expected) == strip_empty_lines(&sample.text_after)
-            });
-
-            Ok(EvalAssertionOutcome {
-                score: if matches { 100 } else { 0 },
-                message: None,
-            })
-        })
-    }
-
-    fn judge_diff(assertions: &'static str) -> Self {
-        Self::new(async move |sample, judge, cx| {
-            let prompt = DiffJudgeTemplate {
-                diff: sample.diff.clone(),
-                assertions,
-            }
-            .render(&Templates::new())
-            .unwrap();
-
-            let request = LanguageModelRequest {
-                messages: vec![LanguageModelRequestMessage {
-                    role: Role::User,
-                    content: vec![prompt.into()],
-                    cache: false,
-                    reasoning_details: None,
-                }],
-                thinking_allowed: true,
-                ..Default::default()
-            };
-            let mut response = retry_on_rate_limit(async || {
-                Ok(judge
-                    .stream_completion_text(request.clone(), &cx.to_async())
-                    .await?)
-            })
-            .await?;
-            let mut output = String::new();
-            while let Some(chunk) = response.stream.next().await {
-                let chunk = chunk?;
-                output.push_str(&chunk);
-            }
-
-            // Parse the score from the response
-            let re = regex::Regex::new(r"<score>(\d+)</score>").unwrap();
-            if let Some(captures) = re.captures(&output)
-                && let Some(score_match) = captures.get(1)
-            {
-                let score = score_match.as_str().parse().unwrap_or(0);
-                return Ok(EvalAssertionOutcome {
-                    score,
-                    message: Some(output),
-                });
-            }
-
-            anyhow::bail!("No score found in response. Raw output: {output}");
-        })
-    }
-
-    async fn run(
-        &self,
-        input: &EvalSample,
-        judge_model: Arc<dyn LanguageModel>,
-        cx: &mut TestAppContext,
-    ) -> Result<EvalAssertionOutcome> {
-        self.0.assert(input, judge_model, cx).await
-    }
-}
-
-fn run_eval(eval: EvalInput) -> eval_utils::EvalOutput<EditEvalMetadata> {
-    let dispatcher = gpui::TestDispatcher::new(StdRng::from_os_rng());
-    let mut cx = TestAppContext::build(dispatcher, None);
-    let result = cx.executor().block_test(async {
-        let test = EditAgentTest::new(&mut cx).await;
-        test.eval(eval, &mut cx).await
-    });
-    match result {
-        Ok(output) => eval_utils::EvalOutput {
-            data: output.to_string(),
-            outcome: if output.assertion.score < 80 {
-                eval_utils::OutcomeKind::Failed
-            } else {
-                eval_utils::OutcomeKind::Passed
-            },
-            metadata: EditEvalMetadata {
-                tags: output.sample.edit_output.parser_metrics.tags,
-                mismatched_tags: output.sample.edit_output.parser_metrics.mismatched_tags,
-            },
-        },
-        Err(e) => eval_utils::EvalOutput {
-            data: format!("{e:?}"),
-            outcome: eval_utils::OutcomeKind::Error,
-            metadata: EditEvalMetadata {
-                tags: 0,
-                mismatched_tags: 0,
-            },
-        },
-    }
-}
-
-#[derive(Clone)]
-struct EditEvalOutput {
-    sample: EvalSample,
-    assertion: EvalAssertionOutcome,
-}
-
-impl Display for EditEvalOutput {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        writeln!(f, "Score: {:?}", self.assertion.score)?;
-        if let Some(message) = self.assertion.message.as_ref() {
-            writeln!(f, "Message: {}", message)?;
-        }
-
-        writeln!(f, "Diff:\n{}", self.sample.diff)?;
-
-        writeln!(
-            f,
-            "Parser Metrics:\n{:#?}",
-            self.sample.edit_output.parser_metrics
-        )?;
-        writeln!(f, "Raw Edits:\n{}", self.sample.edit_output.raw_edits)?;
-        Ok(())
-    }
-}
-
-struct EditAgentTest {
-    agent: EditAgent,
-    project: Entity<Project>,
-    judge_model: Arc<dyn LanguageModel>,
-}
-
-impl EditAgentTest {
-    async fn new(cx: &mut TestAppContext) -> Self {
-        cx.executor().allow_parking();
-
-        let fs = FakeFs::new(cx.executor());
-        cx.update(|cx| {
-            settings::init(cx);
-            gpui_tokio::init(cx);
-            let http_client = Arc::new(ReqwestClient::user_agent("agent tests").unwrap());
-            cx.set_http_client(http_client);
-            let client = Client::production(cx);
-            let user_store = cx.new(|cx| UserStore::new(client.clone(), cx));
-            settings::init(cx);
-            language_model::init(client.clone(), cx);
-            language_models::init(user_store, client.clone(), cx);
-        });
-
-        fs.insert_tree("/root", json!({})).await;
-        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-        let agent_model = SelectedModel::from_str(
-            &std::env::var("ZED_AGENT_MODEL").unwrap_or("anthropic/claude-sonnet-4-latest".into()),
-        )
-        .unwrap();
-        let judge_model = SelectedModel::from_str(
-            &std::env::var("ZED_JUDGE_MODEL").unwrap_or("anthropic/claude-sonnet-4-latest".into()),
-        )
-        .unwrap();
-
-        let authenticate_provider_tasks = cx.update(|cx| {
-            LanguageModelRegistry::global(cx).update(cx, |registry, cx| {
-                registry
-                    .providers()
-                    .iter()
-                    .map(|p| p.authenticate(cx))
-                    .collect::<Vec<_>>()
-            })
-        });
-        let (agent_model, judge_model) = cx
-            .update(|cx| {
-                cx.spawn(async move |cx| {
-                    futures::future::join_all(authenticate_provider_tasks).await;
-                    let agent_model = Self::load_model(&agent_model, cx).await;
-                    let judge_model = Self::load_model(&judge_model, cx).await;
-                    (agent_model.unwrap(), judge_model.unwrap())
-                })
-            })
-            .await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-
-        let edit_format = EditFormat::from_env(agent_model.clone()).unwrap();
-
-        Self {
-            agent: EditAgent::new(
-                agent_model,
-                project.clone(),
-                action_log,
-                Templates::new(),
-                edit_format,
-            ),
-            project,
-            judge_model,
-        }
-    }
-
-    async fn load_model(
-        selected_model: &SelectedModel,
-        cx: &mut AsyncApp,
-    ) -> Result<Arc<dyn LanguageModel>> {
-        cx.update(|cx| {
-            let registry = LanguageModelRegistry::read_global(cx);
-            let provider = registry
-                .provider(&selected_model.provider)
-                .expect("Provider not found");
-            provider.authenticate(cx)
-        })?
-        .await?;
-        cx.update(|cx| {
-            let models = LanguageModelRegistry::read_global(cx);
-            let model = models
-                .available_models(cx)
-                .find(|model| {
-                    model.provider_id() == selected_model.provider
-                        && model.id() == selected_model.model
-                })
-                .unwrap_or_else(|| panic!("Model {} not found", selected_model.model.0));
-            model
-        })
-    }
-
-    async fn eval(&self, mut eval: EvalInput, cx: &mut TestAppContext) -> Result<EditEvalOutput> {
-        // Make sure the last message in the conversation is cached.
-        eval.conversation.last_mut().unwrap().cache = true;
-
-        let path = self
-            .project
-            .read_with(cx, |project, cx| {
-                project.find_project_path(eval.edit_file_input.path, cx)
-            })
-            .unwrap();
-        let buffer = self
-            .project
-            .update(cx, |project, cx| project.open_buffer(path, cx))
-            .await
-            .unwrap();
-
-        let tools = crate::built_in_tools().collect::<Vec<_>>();
-
-        let system_prompt = {
-            let worktrees = vec![WorktreeContext {
-                root_name: "root".to_string(),
-                abs_path: Path::new("/path/to/root").into(),
-                rules_file: None,
-            }];
-            let project_context = ProjectContext::new(worktrees, Vec::default());
-            let tool_names = tools
-                .iter()
-                .map(|tool| tool.name.clone().into())
-                .collect::<Vec<_>>();
-            let template = crate::SystemPromptTemplate {
-                project: &project_context,
-                available_tools: tool_names,
-                model_name: None,
-            };
-            let templates = Templates::new();
-            template.render(&templates).unwrap()
-        };
-
-        let has_system_prompt = eval
-            .conversation
-            .first()
-            .is_some_and(|msg| msg.role == Role::System);
-        let messages = if has_system_prompt {
-            eval.conversation
-        } else {
-            [LanguageModelRequestMessage {
-                role: Role::System,
-                content: vec![MessageContent::Text(system_prompt)],
-                cache: true,
-                reasoning_details: None,
-            }]
-            .into_iter()
-            .chain(eval.conversation)
-            .collect::<Vec<_>>()
-        };
-
-        let conversation = LanguageModelRequest {
-            messages,
-            tools,
-            thinking_allowed: true,
-            ..Default::default()
-        };
-
-        let edit_output = if matches!(eval.edit_file_input.mode, EditFileMode::Edit) {
-            if let Some(input_content) = eval.input_content.as_deref() {
-                buffer.update(cx, |buffer, cx| buffer.set_text(input_content, cx));
-            }
-            retry_on_rate_limit(async || {
-                self.agent
-                    .edit(
-                        buffer.clone(),
-                        eval.edit_file_input.display_description.clone(),
-                        &conversation,
-                        &mut cx.to_async(),
-                    )
-                    .0
-                    .await
-            })
-            .await?
-        } else {
-            retry_on_rate_limit(async || {
-                self.agent
-                    .overwrite(
-                        buffer.clone(),
-                        eval.edit_file_input.display_description.clone(),
-                        &conversation,
-                        &mut cx.to_async(),
-                    )
-                    .0
-                    .await
-            })
-            .await?
-        };
-
-        let buffer_text = buffer.read_with(cx, |buffer, _| buffer.text());
-        let sample = EvalSample {
-            edit_output,
-            diff: language::unified_diff(
-                eval.input_content.as_deref().unwrap_or_default(),
-                &buffer_text,
-            ),
-            text_before: eval.input_content.unwrap_or_default(),
-            text_after: buffer_text,
-        };
-        let assertion = eval
-            .assertion
-            .run(&sample, self.judge_model.clone(), cx)
-            .await?;
-
-        Ok(EditEvalOutput { assertion, sample })
-    }
-}
-
-async fn retry_on_rate_limit<R>(mut request: impl AsyncFnMut() -> Result<R>) -> Result<R> {
-    const MAX_RETRIES: usize = 20;
-    let mut attempt = 0;
-
-    loop {
-        attempt += 1;
-        let response = request().await;
-
-        if attempt >= MAX_RETRIES {
-            return response;
-        }
-
-        let retry_delay = match &response {
-            Ok(_) => None,
-            Err(err) => match err.downcast_ref::<LanguageModelCompletionError>() {
-                Some(err) => match &err {
-                    LanguageModelCompletionError::RateLimitExceeded { retry_after, .. }
-                    | LanguageModelCompletionError::ServerOverloaded { retry_after, .. } => {
-                        Some(retry_after.unwrap_or(Duration::from_secs(5)))
-                    }
-                    LanguageModelCompletionError::UpstreamProviderError {
-                        status,
-                        retry_after,
-                        ..
-                    } => {
-                        // Only retry for specific status codes
-                        let should_retry = matches!(
-                            *status,
-                            StatusCode::TOO_MANY_REQUESTS | StatusCode::SERVICE_UNAVAILABLE
-                        ) || status.as_u16() == 529;
-
-                        if should_retry {
-                            // Use server-provided retry_after if available, otherwise use default
-                            Some(retry_after.unwrap_or(Duration::from_secs(5)))
-                        } else {
-                            None
-                        }
-                    }
-                    LanguageModelCompletionError::ApiReadResponseError { .. }
-                    | LanguageModelCompletionError::ApiInternalServerError { .. }
-                    | LanguageModelCompletionError::HttpSend { .. } => {
-                        // Exponential backoff for transient I/O and internal server errors
-                        Some(Duration::from_secs(2_u64.pow((attempt - 1) as u32).min(30)))
-                    }
-                    _ => None,
-                },
-                _ => None,
-            },
-        };
-
-        if let Some(retry_after) = retry_delay {
-            let jitter = retry_after.mul_f64(rand::rng().random_range(0.0..1.0));
-            eprintln!("Attempt #{attempt}: Retry after {retry_after:?} + jitter of {jitter:?}");
-            Timer::after(retry_after + jitter).await;
-        } else {
-            return response;
-        }
-    }
-}
-
-#[derive(Clone, Debug, Eq, PartialEq, Hash)]
-struct EvalAssertionOutcome {
-    score: usize,
-    message: Option<String>,
-}
-
-#[derive(Serialize)]
-pub struct DiffJudgeTemplate {
-    diff: String,
-    assertions: &'static str,
-}
-
-impl Template for DiffJudgeTemplate {
-    const TEMPLATE_NAME: &'static str = "diff_judge.hbs";
-}
-
-fn strip_empty_lines(text: &str) -> String {
-    text.lines()
-        .filter(|line| !line.trim().is_empty())
-        .collect::<Vec<_>>()
-        .join("\n")
-}
diff --git a/crates/agent/src/edit_agent/evals/fixtures/add_overwrite_test/before.rs b/crates/agent/src/edit_agent/evals/fixtures/add_overwrite_test/before.rs
deleted file mode 100644
index 0d2a0be1fb..0000000000
--- a/crates/agent/src/edit_agent/evals/fixtures/add_overwrite_test/before.rs
+++ /dev/null
@@ -1,1572 +0,0 @@
-use anyhow::{Context as _, Result};
-use buffer_diff::BufferDiff;
-use collections::BTreeMap;
-use futures::{StreamExt, channel::mpsc};
-use gpui::{App, AppContext, AsyncApp, Context, Entity, Subscription, Task, WeakEntity};
-use language::{Anchor, Buffer, BufferEvent, DiskState, Point, ToPoint};
-use project::{Project, ProjectItem, lsp_store::OpenLspBufferHandle};
-use std::{cmp, ops::Range, sync::Arc};
-use text::{Edit, Patch, Rope};
-use util::RangeExt;
-
-/// Tracks actions performed by tools in a thread
-pub struct ActionLog {
-    /// Buffers that we want to notify the model about when they change.
-    tracked_buffers: BTreeMap<Entity<Buffer>, TrackedBuffer>,
-    /// Has the model edited a file since it last checked diagnostics?
-    edited_since_project_diagnostics_check: bool,
-    /// The project this action log is associated with
-    project: Entity<Project>,
-}
-
-impl ActionLog {
-    /// Creates a new, empty action log associated with the given project.
-    pub fn new(project: Entity<Project>) -> Self {
-        Self {
-            tracked_buffers: BTreeMap::default(),
-            edited_since_project_diagnostics_check: false,
-            project,
-        }
-    }
-
-    pub fn project(&self) -> &Entity<Project> {
-        &self.project
-    }
-
-    /// Notifies a diagnostics check
-    pub fn checked_project_diagnostics(&mut self) {
-        self.edited_since_project_diagnostics_check = false;
-    }
-
-    /// Returns true if any files have been edited since the last project diagnostics check
-    pub fn has_edited_files_since_project_diagnostics_check(&self) -> bool {
-        self.edited_since_project_diagnostics_check
-    }
-
-    fn track_buffer_internal(
-        &mut self,
-        buffer: Entity<Buffer>,
-        is_created: bool,
-        cx: &mut Context<Self>,
-    ) -> &mut TrackedBuffer {
-        let tracked_buffer = self
-            .tracked_buffers
-            .entry(buffer.clone())
-            .or_insert_with(|| {
-                let open_lsp_handle = self.project.update(cx, |project, cx| {
-                    project.register_buffer_with_language_servers(&buffer, cx)
-                });
-
-                let text_snapshot = buffer.read(cx).text_snapshot();
-                let diff = cx.new(|cx| BufferDiff::new(&text_snapshot, cx));
-                let (diff_update_tx, diff_update_rx) = mpsc::unbounded();
-                let base_text;
-                let status;
-                let unreviewed_changes;
-                if is_created {
-                    base_text = Rope::default();
-                    status = TrackedBufferStatus::Created;
-                    unreviewed_changes = Patch::new(vec![Edit {
-                        old: 0..1,
-                        new: 0..text_snapshot.max_point().row + 1,
-                    }])
-                } else {
-                    base_text = buffer.read(cx).as_rope().clone();
-                    status = TrackedBufferStatus::Modified;
-                    unreviewed_changes = Patch::default();
-                }
-                TrackedBuffer {
-                    buffer: buffer.clone(),
-                    base_text,
-                    unreviewed_changes,
-                    snapshot: text_snapshot.clone(),
-                    status,
-                    version: buffer.read(cx).version(),
-                    diff,
-                    diff_update: diff_update_tx,
-                    _open_lsp_handle: open_lsp_handle,
-                    _maintain_diff: cx.spawn({
-                        let buffer = buffer.clone();
-                        async move |this, cx| {
-                            Self::maintain_diff(this, buffer, diff_update_rx, cx)
-                                .await
-                                .ok();
-                        }
-                    }),
-                    _subscription: cx.subscribe(&buffer, Self::handle_buffer_event),
-                }
-            });
-        tracked_buffer.version = buffer.read(cx).version();
-        tracked_buffer
-    }
-
-    fn handle_buffer_event(
-        &mut self,
-        buffer: Entity<Buffer>,
-        event: &BufferEvent,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            BufferEvent::Edited { .. } => self.handle_buffer_edited(buffer, cx),
-            BufferEvent::FileHandleChanged => {
-                self.handle_buffer_file_changed(buffer, cx);
-            }
-            _ => {}
-        };
-    }
-
-    fn handle_buffer_edited(&mut self, buffer: Entity<Buffer>, cx: &mut Context<Self>) {
-        let Some(tracked_buffer) = self.tracked_buffers.get_mut(&buffer) else {
-            return;
-        };
-        tracked_buffer.schedule_diff_update(ChangeAuthor::User, cx);
-    }
-
-    fn handle_buffer_file_changed(&mut self, buffer: Entity<Buffer>, cx: &mut Context<Self>) {
-        let Some(tracked_buffer) = self.tracked_buffers.get_mut(&buffer) else {
-            return;
-        };
-
-        match tracked_buffer.status {
-            TrackedBufferStatus::Created | TrackedBufferStatus::Modified => {
-                if buffer
-                    .read(cx)
-                    .file()
-                    .map_or(false, |file| file.disk_state() == DiskState::Deleted)
-                {
-                    // If the buffer had been edited by a tool, but it got
-                    // deleted externally, we want to stop tracking it.
-                    self.tracked_buffers.remove(&buffer);
-                }
-                cx.notify();
-            }
-            TrackedBufferStatus::Deleted => {
-                if buffer
-                    .read(cx)
-                    .file()
-                    .map_or(false, |file| file.disk_state() != DiskState::Deleted)
-                {
-                    // If the buffer had been deleted by a tool, but it got
-                    // resurrected externally, we want to clear the changes we
-                    // were tracking and reset the buffer's state.
-                    self.tracked_buffers.remove(&buffer);
-                    self.track_buffer_internal(buffer, false, cx);
-                }
-                cx.notify();
-            }
-        }
-    }
-
-    async fn maintain_diff(
-        this: WeakEntity<Self>,
-        buffer: Entity<Buffer>,
-        mut diff_update: mpsc::UnboundedReceiver<(ChangeAuthor, text::BufferSnapshot)>,
-        cx: &mut AsyncApp,
-    ) -> Result<()> {
-        while let Some((author, buffer_snapshot)) = diff_update.next().await {
-            let (rebase, diff, language, language_registry) =
-                this.read_with(cx, |this, cx| {
-                    let tracked_buffer = this
-                        .tracked_buffers
-                        .get(&buffer)
-                        .context("buffer not tracked")?;
-
-                    let rebase = cx.background_spawn({
-                        let mut base_text = tracked_buffer.base_text.clone();
-                        let old_snapshot = tracked_buffer.snapshot.clone();
-                        let new_snapshot = buffer_snapshot.clone();
-                        let unreviewed_changes = tracked_buffer.unreviewed_changes.clone();
-                        async move {
-                            let edits = diff_snapshots(&old_snapshot, &new_snapshot);
-                            if let ChangeAuthor::User = author {
-                                apply_non_conflicting_edits(
-                                    &unreviewed_changes,
-                                    edits,
-                                    &mut base_text,
-                                    new_snapshot.as_rope(),
-                                );
-                            }
-                            (Arc::new(base_text.to_string()), base_text)
-                        }
-                    });
-
-                    anyhow::Ok((
-                        rebase,
-                        tracked_buffer.diff.clone(),
-                        tracked_buffer.buffer.read(cx).language().cloned(),
-                        tracked_buffer.buffer.read(cx).language_registry(),
-                    ))
-                })??;
-
-            let (new_base_text, new_base_text_rope) = rebase.await;
-            let diff_snapshot = BufferDiff::update_diff(
-                diff.clone(),
-                buffer_snapshot.clone(),
-                Some(new_base_text),
-                true,
-                false,
-                language,
-                language_registry,
-                cx,
-            )
-            .await;
-
-            let mut unreviewed_changes = Patch::default();
-            if let Ok(diff_snapshot) = diff_snapshot {
-                unreviewed_changes = cx
-                    .background_spawn({
-                        let diff_snapshot = diff_snapshot.clone();
-                        let buffer_snapshot = buffer_snapshot.clone();
-                        let new_base_text_rope = new_base_text_rope.clone();
-                        async move {
-                            let mut unreviewed_changes = Patch::default();
-                            for hunk in diff_snapshot.hunks_intersecting_range(
-                                Anchor::MIN..Anchor::MAX,
-                                &buffer_snapshot,
-                            ) {
-                                let old_range = new_base_text_rope
-                                    .offset_to_point(hunk.diff_base_byte_range.start)
-                                    ..new_base_text_rope
-                                        .offset_to_point(hunk.diff_base_byte_range.end);
-                                let new_range = hunk.range.start..hunk.range.end;
-                                unreviewed_changes.push(point_to_row_edit(
-                                    Edit {
-                                        old: old_range,
-                                        new: new_range,
-                                    },
-                                    &new_base_text_rope,
-                                    &buffer_snapshot.as_rope(),
-                                ));
-                            }
-                            unreviewed_changes
-                        }
-                    })
-                    .await;
-
-                diff.update(cx, |diff, cx| {
-                    diff.set_snapshot(diff_snapshot, &buffer_snapshot, cx)
-                })?;
-            }
-            this.update(cx, |this, cx| {
-                let tracked_buffer = this
-                    .tracked_buffers
-                    .get_mut(&buffer)
-                    .context("buffer not tracked")?;
-                tracked_buffer.base_text = new_base_text_rope;
-                tracked_buffer.snapshot = buffer_snapshot;
-                tracked_buffer.unreviewed_changes = unreviewed_changes;
-                cx.notify();
-                anyhow::Ok(())
-            })??;
-        }
-
-        Ok(())
-    }
-
-    /// Track a buffer as read, so we can notify the model about user edits.
-    pub fn buffer_read(&mut self, buffer: Entity<Buffer>, cx: &mut Context<Self>) {
-        self.track_buffer_internal(buffer, false, cx);
-    }
-
-    /// Mark a buffer as edited, so we can refresh it in the context
-    pub fn buffer_created(&mut self, buffer: Entity<Buffer>, cx: &mut Context<Self>) {
-        self.edited_since_project_diagnostics_check = true;
-        self.tracked_buffers.remove(&buffer);
-        self.track_buffer_internal(buffer.clone(), true, cx);
-    }
-
-    /// Mark a buffer as edited, so we can refresh it in the context
-    pub fn buffer_edited(&mut self, buffer: Entity<Buffer>, cx: &mut Context<Self>) {
-        self.edited_since_project_diagnostics_check = true;
-
-        let tracked_buffer = self.track_buffer_internal(buffer.clone(), false, cx);
-        if let TrackedBufferStatus::Deleted = tracked_buffer.status {
-            tracked_buffer.status = TrackedBufferStatus::Modified;
-        }
-        tracked_buffer.schedule_diff_update(ChangeAuthor::Agent, cx);
-    }
-
-    pub fn will_delete_buffer(&mut self, buffer: Entity<Buffer>, cx: &mut Context<Self>) {
-        let tracked_buffer = self.track_buffer_internal(buffer.clone(), false, cx);
-        match tracked_buffer.status {
-            TrackedBufferStatus::Created => {
-                self.tracked_buffers.remove(&buffer);
-                cx.notify();
-            }
-            TrackedBufferStatus::Modified => {
-                buffer.update(cx, |buffer, cx| buffer.set_text("", cx));
-                tracked_buffer.status = TrackedBufferStatus::Deleted;
-                tracked_buffer.schedule_diff_update(ChangeAuthor::Agent, cx);
-            }
-            TrackedBufferStatus::Deleted => {}
-        }
-        cx.notify();
-    }
-
-    pub fn keep_edits_in_range(
-        &mut self,
-        buffer: Entity<Buffer>,
-        buffer_range: Range<impl language::ToPoint>,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(tracked_buffer) = self.tracked_buffers.get_mut(&buffer) else {
-            return;
-        };
-
-        match tracked_buffer.status {
-            TrackedBufferStatus::Deleted => {
-                self.tracked_buffers.remove(&buffer);
-                cx.notify();
-            }
-            _ => {
-                let buffer = buffer.read(cx);
-                let buffer_range =
-                    buffer_range.start.to_point(buffer)..buffer_range.end.to_point(buffer);
-                let mut delta = 0i32;
-
-                tracked_buffer.unreviewed_changes.retain_mut(|edit| {
-                    edit.old.start = (edit.old.start as i32 + delta) as u32;
-                    edit.old.end = (edit.old.end as i32 + delta) as u32;
-
-                    if buffer_range.end.row < edit.new.start
-                        || buffer_range.start.row > edit.new.end
-                    {
-                        true
-                    } else {
-                        let old_range = tracked_buffer
-                            .base_text
-                            .point_to_offset(Point::new(edit.old.start, 0))
-                            ..tracked_buffer.base_text.point_to_offset(cmp::min(
-                                Point::new(edit.old.end, 0),
-                                tracked_buffer.base_text.max_point(),
-                            ));
-                        let new_range = tracked_buffer
-                            .snapshot
-                            .point_to_offset(Point::new(edit.new.start, 0))
-                            ..tracked_buffer.snapshot.point_to_offset(cmp::min(
-                                Point::new(edit.new.end, 0),
-                                tracked_buffer.snapshot.max_point(),
-                            ));
-                        tracked_buffer.base_text.replace(
-                            old_range,
-                            &tracked_buffer
-                                .snapshot
-                                .text_for_range(new_range)
-                                .collect::<String>(),
-                        );
-                        delta += edit.new_len() as i32 - edit.old_len() as i32;
-                        false
-                    }
-                });
-                tracked_buffer.schedule_diff_update(ChangeAuthor::User, cx);
-            }
-        }
-    }
-
-    pub fn reject_edits_in_ranges(
-        &mut self,
-        buffer: Entity<Buffer>,
-        buffer_ranges: Vec<Range<impl language::ToPoint>>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let Some(tracked_buffer) = self.tracked_buffers.get_mut(&buffer) else {
-            return Task::ready(Ok(()));
-        };
-
-        match tracked_buffer.status {
-            TrackedBufferStatus::Created => {
-                let delete = buffer
-                    .read(cx)
-                    .entry_id(cx)
-                    .and_then(|entry_id| {
-                        self.project
-                            .update(cx, |project, cx| project.delete_entry(entry_id, false, cx))
-                    })
-                    .unwrap_or(Task::ready(Ok(())));
-                self.tracked_buffers.remove(&buffer);
-                cx.notify();
-                delete
-            }
-            TrackedBufferStatus::Deleted => {
-                buffer.update(cx, |buffer, cx| {
-                    buffer.set_text(tracked_buffer.base_text.to_string(), cx)
-                });
-                let save = self
-                    .project
-                    .update(cx, |project, cx| project.save_buffer(buffer.clone(), cx));
-
-                // Clear all tracked changes for this buffer and start over as if we just read it.
-                self.tracked_buffers.remove(&buffer);
-                self.buffer_read(buffer.clone(), cx);
-                cx.notify();
-                save
-            }
-            TrackedBufferStatus::Modified => {
-                buffer.update(cx, |buffer, cx| {
-                    let mut buffer_row_ranges = buffer_ranges
-                        .into_iter()
-                        .map(|range| {
-                            range.start.to_point(buffer).row..range.end.to_point(buffer).row
-                        })
-                        .peekable();
-
-                    let mut edits_to_revert = Vec::new();
-                    for edit in tracked_buffer.unreviewed_changes.edits() {
-                        let new_range = tracked_buffer
-                            .snapshot
-                            .anchor_before(Point::new(edit.new.start, 0))
-                            ..tracked_buffer.snapshot.anchor_after(cmp::min(
-                                Point::new(edit.new.end, 0),
-                                tracked_buffer.snapshot.max_point(),
-                            ));
-                        let new_row_range = new_range.start.to_point(buffer).row
-                            ..new_range.end.to_point(buffer).row;
-
-                        let mut revert = false;
-                        while let Some(buffer_row_range) = buffer_row_ranges.peek() {
-                            if buffer_row_range.end < new_row_range.start {
-                                buffer_row_ranges.next();
-                            } else if buffer_row_range.start > new_row_range.end {
-                                break;
-                            } else {
-                                revert = true;
-                                break;
-                            }
-                        }
-
-                        if revert {
-                            let old_range = tracked_buffer
-                                .base_text
-                                .point_to_offset(Point::new(edit.old.start, 0))
-                                ..tracked_buffer.base_text.point_to_offset(cmp::min(
-                                    Point::new(edit.old.end, 0),
-                                    tracked_buffer.base_text.max_point(),
-                                ));
-                            let old_text = tracked_buffer
-                                .base_text
-                                .chunks_in_range(old_range)
-                                .collect::<String>();
-                            edits_to_revert.push((new_range, old_text));
-                        }
-                    }
-
-                    buffer.edit(edits_to_revert, None, cx);
-                });
-                self.project
-                    .update(cx, |project, cx| project.save_buffer(buffer, cx))
-            }
-        }
-    }
-
-    pub fn keep_all_edits(&mut self, cx: &mut Context<Self>) {
-        self.tracked_buffers
-            .retain(|_buffer, tracked_buffer| match tracked_buffer.status {
-                TrackedBufferStatus::Deleted => false,
-                _ => {
-                    tracked_buffer.unreviewed_changes.clear();
-                    tracked_buffer.base_text = tracked_buffer.snapshot.as_rope().clone();
-                    tracked_buffer.schedule_diff_update(ChangeAuthor::User, cx);
-                    true
-                }
-            });
-        cx.notify();
-    }
-
-    /// Returns the set of buffers that contain changes that haven't been reviewed by the user.
-    pub fn changed_buffers(&self, cx: &App) -> BTreeMap<Entity<Buffer>, Entity<BufferDiff>> {
-        self.tracked_buffers
-            .iter()
-            .filter(|(_, tracked)| tracked.has_changes(cx))
-            .map(|(buffer, tracked)| (buffer.clone(), tracked.diff.clone()))
-            .collect()
-    }
-
-    /// Iterate over buffers changed since last read or edited by the model
-    pub fn stale_buffers<'a>(&'a self, cx: &'a App) -> impl Iterator<Item = &'a Entity<Buffer>> {
-        self.tracked_buffers
-            .iter()
-            .filter(|(buffer, tracked)| {
-                let buffer = buffer.read(cx);
-
-                tracked.version != buffer.version
-                    && buffer
-                        .file()
-                        .map_or(false, |file| file.disk_state() != DiskState::Deleted)
-            })
-            .map(|(buffer, _)| buffer)
-    }
-}
-
-fn apply_non_conflicting_edits(
-    patch: &Patch<u32>,
-    edits: Vec<Edit<u32>>,
-    old_text: &mut Rope,
-    new_text: &Rope,
-) {
-    let mut old_edits = patch.edits().iter().cloned().peekable();
-    let mut new_edits = edits.into_iter().peekable();
-    let mut applied_delta = 0i32;
-    let mut rebased_delta = 0i32;
-
-    while let Some(mut new_edit) = new_edits.next() {
-        let mut conflict = false;
-
-        // Push all the old edits that are before this new edit or that intersect with it.
-        while let Some(old_edit) = old_edits.peek() {
-            if new_edit.old.end < old_edit.new.start
-                || (!old_edit.new.is_empty() && new_edit.old.end == old_edit.new.start)
-            {
-                break;
-            } else if new_edit.old.start > old_edit.new.end
-                || (!old_edit.new.is_empty() && new_edit.old.start == old_edit.new.end)
-            {
-                let old_edit = old_edits.next().unwrap();
-                rebased_delta += old_edit.new_len() as i32 - old_edit.old_len() as i32;
-            } else {
-                conflict = true;
-                if new_edits
-                    .peek()
-                    .map_or(false, |next_edit| next_edit.old.overlaps(&old_edit.new))
-                {
-                    new_edit = new_edits.next().unwrap();
-                } else {
-                    let old_edit = old_edits.next().unwrap();
-                    rebased_delta += old_edit.new_len() as i32 - old_edit.old_len() as i32;
-                }
-            }
-        }
-
-        if !conflict {
-            // This edit doesn't intersect with any old edit, so we can apply it to the old text.
-            new_edit.old.start = (new_edit.old.start as i32 + applied_delta - rebased_delta) as u32;
-            new_edit.old.end = (new_edit.old.end as i32 + applied_delta - rebased_delta) as u32;
-            let old_bytes = old_text.point_to_offset(Point::new(new_edit.old.start, 0))
-                ..old_text.point_to_offset(cmp::min(
-                    Point::new(new_edit.old.end, 0),
-                    old_text.max_point(),
-                ));
-            let new_bytes = new_text.point_to_offset(Point::new(new_edit.new.start, 0))
-                ..new_text.point_to_offset(cmp::min(
-                    Point::new(new_edit.new.end, 0),
-                    new_text.max_point(),
-                ));
-
-            old_text.replace(
-                old_bytes,
-                &new_text.chunks_in_range(new_bytes).collect::<String>(),
-            );
-            applied_delta += new_edit.new_len() as i32 - new_edit.old_len() as i32;
-        }
-    }
-}
-
-fn diff_snapshots(
-    old_snapshot: &text::BufferSnapshot,
-    new_snapshot: &text::BufferSnapshot,
-) -> Vec<Edit<u32>> {
-    let mut edits = new_snapshot
-        .edits_since::<Point>(&old_snapshot.version)
-        .map(|edit| point_to_row_edit(edit, old_snapshot.as_rope(), new_snapshot.as_rope()))
-        .peekable();
-    let mut row_edits = Vec::new();
-    while let Some(mut edit) = edits.next() {
-        while let Some(next_edit) = edits.peek() {
-            if edit.old.end >= next_edit.old.start {
-                edit.old.end = next_edit.old.end;
-                edit.new.end = next_edit.new.end;
-                edits.next();
-            } else {
-                break;
-            }
-        }
-        row_edits.push(edit);
-    }
-    row_edits
-}
-
-fn point_to_row_edit(edit: Edit<Point>, old_text: &Rope, new_text: &Rope) -> Edit<u32> {
-    if edit.old.start.column == old_text.line_len(edit.old.start.row)
-        && new_text
-            .chars_at(new_text.point_to_offset(edit.new.start))
-            .next()
-            == Some('\n')
-        && edit.old.start != old_text.max_point()
-    {
-        Edit {
-            old: edit.old.start.row + 1..edit.old.end.row + 1,
-            new: edit.new.start.row + 1..edit.new.end.row + 1,
-        }
-    } else if edit.old.start.column == 0
-        && edit.old.end.column == 0
-        && edit.new.end.column == 0
-        && edit.old.end != old_text.max_point()
-    {
-        Edit {
-            old: edit.old.start.row..edit.old.end.row,
-            new: edit.new.start.row..edit.new.end.row,
-        }
-    } else {
-        Edit {
-            old: edit.old.start.row..edit.old.end.row + 1,
-            new: edit.new.start.row..edit.new.end.row + 1,
-        }
-    }
-}
-
-#[derive(Copy, Clone, Debug)]
-enum ChangeAuthor {
-    User,
-    Agent,
-}
-
-#[derive(Copy, Clone, Eq, PartialEq)]
-enum TrackedBufferStatus {
-    Created,
-    Modified,
-    Deleted,
-}
-
-struct TrackedBuffer {
-    buffer: Entity<Buffer>,
-    base_text: Rope,
-    unreviewed_changes: Patch<u32>,
-    status: TrackedBufferStatus,
-    version: clock::Global,
-    diff: Entity<BufferDiff>,
-    snapshot: text::BufferSnapshot,
-    diff_update: mpsc::UnboundedSender<(ChangeAuthor, text::BufferSnapshot)>,
-    _open_lsp_handle: OpenLspBufferHandle,
-    _maintain_diff: Task<()>,
-    _subscription: Subscription,
-}
-
-impl TrackedBuffer {
-    fn has_changes(&self, cx: &App) -> bool {
-        self.diff
-            .read(cx)
-            .hunks(&self.buffer.read(cx), cx)
-            .next()
-            .is_some()
-    }
-
-    fn schedule_diff_update(&self, author: ChangeAuthor, cx: &App) {
-        self.diff_update
-            .unbounded_send((author, self.buffer.read(cx).text_snapshot()))
-            .ok();
-    }
-}
-
-pub struct ChangedBuffer {
-    pub diff: Entity<BufferDiff>,
-}
-
-#[cfg(test)]
-mod tests {
-    use std::env;
-
-    use super::*;
-    use buffer_diff::DiffHunkStatusKind;
-    use gpui::TestAppContext;
-    use language::Point;
-    use project::{FakeFs, Fs, Project, RemoveOptions};
-    use rand::prelude::*;
-    use serde_json::json;
-    use settings::SettingsStore;
-    use util::{RandomCharIter, path};
-
-    #[ctor::ctor]
-    fn init_logger() {
-        zlog::init_test();
-    }
-
-    fn init_test(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-            language::init(cx);
-            Project::init_settings(cx);
-        });
-    }
-
-    #[gpui::test(iterations = 10)]
-    async fn test_keep_edits(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(path!("/dir"), json!({"file": "abc\ndef\nghi\njkl\nmno"}))
-            .await;
-        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-        let file_path = project
-            .read_with(cx, |project, cx| project.find_project_path("dir/file", cx))
-            .unwrap();
-        let buffer = project
-            .update(cx, |project, cx| project.open_buffer(file_path, cx))
-            .await
-            .unwrap();
-
-        cx.update(|cx| {
-            action_log.update(cx, |log, cx| log.buffer_read(buffer.clone(), cx));
-            buffer.update(cx, |buffer, cx| {
-                buffer
-                    .edit([(Point::new(1, 1)..Point::new(1, 2), "E")], None, cx)
-                    .unwrap()
-            });
-            buffer.update(cx, |buffer, cx| {
-                buffer
-                    .edit([(Point::new(4, 2)..Point::new(4, 3), "O")], None, cx)
-                    .unwrap()
-            });
-            action_log.update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
-        });
-        cx.run_until_parked();
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.text()),
-            "abc\ndEf\nghi\njkl\nmnO"
-        );
-        assert_eq!(
-            unreviewed_hunks(&action_log, cx),
-            vec![(
-                buffer.clone(),
-                vec![
-                    HunkStatus {
-                        range: Point::new(1, 0)..Point::new(2, 0),
-                        diff_status: DiffHunkStatusKind::Modified,
-                        old_text: "def\n".into(),
-                    },
-                    HunkStatus {
-                        range: Point::new(4, 0)..Point::new(4, 3),
-                        diff_status: DiffHunkStatusKind::Modified,
-                        old_text: "mno".into(),
-                    }
-                ],
-            )]
-        );
-
-        action_log.update(cx, |log, cx| {
-            log.keep_edits_in_range(buffer.clone(), Point::new(3, 0)..Point::new(4, 3), cx)
-        });
-        cx.run_until_parked();
-        assert_eq!(
-            unreviewed_hunks(&action_log, cx),
-            vec![(
-                buffer.clone(),
-                vec![HunkStatus {
-                    range: Point::new(1, 0)..Point::new(2, 0),
-                    diff_status: DiffHunkStatusKind::Modified,
-                    old_text: "def\n".into(),
-                }],
-            )]
-        );
-
-        action_log.update(cx, |log, cx| {
-            log.keep_edits_in_range(buffer.clone(), Point::new(0, 0)..Point::new(4, 3), cx)
-        });
-        cx.run_until_parked();
-        assert_eq!(unreviewed_hunks(&action_log, cx), vec![]);
-    }
-
-    #[gpui::test(iterations = 10)]
-    async fn test_deletions(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/dir"),
-            json!({"file": "abc\ndef\nghi\njkl\nmno\npqr"}),
-        )
-        .await;
-        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-        let file_path = project
-            .read_with(cx, |project, cx| project.find_project_path("dir/file", cx))
-            .unwrap();
-        let buffer = project
-            .update(cx, |project, cx| project.open_buffer(file_path, cx))
-            .await
-            .unwrap();
-
-        cx.update(|cx| {
-            action_log.update(cx, |log, cx| log.buffer_read(buffer.clone(), cx));
-            buffer.update(cx, |buffer, cx| {
-                buffer
-                    .edit([(Point::new(1, 0)..Point::new(2, 0), "")], None, cx)
-                    .unwrap();
-                buffer.finalize_last_transaction();
-            });
-            buffer.update(cx, |buffer, cx| {
-                buffer
-                    .edit([(Point::new(3, 0)..Point::new(4, 0), "")], None, cx)
-                    .unwrap();
-                buffer.finalize_last_transaction();
-            });
-            action_log.update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
-        });
-        cx.run_until_parked();
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.text()),
-            "abc\nghi\njkl\npqr"
-        );
-        assert_eq!(
-            unreviewed_hunks(&action_log, cx),
-            vec![(
-                buffer.clone(),
-                vec![
-                    HunkStatus {
-                        range: Point::new(1, 0)..Point::new(1, 0),
-                        diff_status: DiffHunkStatusKind::Deleted,
-                        old_text: "def\n".into(),
-                    },
-                    HunkStatus {
-                        range: Point::new(3, 0)..Point::new(3, 0),
-                        diff_status: DiffHunkStatusKind::Deleted,
-                        old_text: "mno\n".into(),
-                    }
-                ],
-            )]
-        );
-
-        buffer.update(cx, |buffer, cx| buffer.undo(cx));
-        cx.run_until_parked();
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.text()),
-            "abc\nghi\njkl\nmno\npqr"
-        );
-        assert_eq!(
-            unreviewed_hunks(&action_log, cx),
-            vec![(
-                buffer.clone(),
-                vec![HunkStatus {
-                    range: Point::new(1, 0)..Point::new(1, 0),
-                    diff_status: DiffHunkStatusKind::Deleted,
-                    old_text: "def\n".into(),
-                }],
-            )]
-        );
-
-        action_log.update(cx, |log, cx| {
-            log.keep_edits_in_range(buffer.clone(), Point::new(1, 0)..Point::new(1, 0), cx)
-        });
-        cx.run_until_parked();
-        assert_eq!(unreviewed_hunks(&action_log, cx), vec![]);
-    }
-
-    #[gpui::test(iterations = 10)]
-    async fn test_overlapping_user_edits(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(path!("/dir"), json!({"file": "abc\ndef\nghi\njkl\nmno"}))
-            .await;
-        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-        let file_path = project
-            .read_with(cx, |project, cx| project.find_project_path("dir/file", cx))
-            .unwrap();
-        let buffer = project
-            .update(cx, |project, cx| project.open_buffer(file_path, cx))
-            .await
-            .unwrap();
-
-        cx.update(|cx| {
-            action_log.update(cx, |log, cx| log.buffer_read(buffer.clone(), cx));
-            buffer.update(cx, |buffer, cx| {
-                buffer
-                    .edit([(Point::new(1, 2)..Point::new(2, 3), "F\nGHI")], None, cx)
-                    .unwrap()
-            });
-            action_log.update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
-        });
-        cx.run_until_parked();
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.text()),
-            "abc\ndeF\nGHI\njkl\nmno"
-        );
-        assert_eq!(
-            unreviewed_hunks(&action_log, cx),
-            vec![(
-                buffer.clone(),
-                vec![HunkStatus {
-                    range: Point::new(1, 0)..Point::new(3, 0),
-                    diff_status: DiffHunkStatusKind::Modified,
-                    old_text: "def\nghi\n".into(),
-                }],
-            )]
-        );
-
-        buffer.update(cx, |buffer, cx| {
-            buffer.edit(
-                [
-                    (Point::new(0, 2)..Point::new(0, 2), "X"),
-                    (Point::new(3, 0)..Point::new(3, 0), "Y"),
-                ],
-                None,
-                cx,
-            )
-        });
-        cx.run_until_parked();
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.text()),
-            "abXc\ndeF\nGHI\nYjkl\nmno"
-        );
-        assert_eq!(
-            unreviewed_hunks(&action_log, cx),
-            vec![(
-                buffer.clone(),
-                vec![HunkStatus {
-                    range: Point::new(1, 0)..Point::new(3, 0),
-                    diff_status: DiffHunkStatusKind::Modified,
-                    old_text: "def\nghi\n".into(),
-                }],
-            )]
-        );
-
-        buffer.update(cx, |buffer, cx| {
-            buffer.edit([(Point::new(1, 1)..Point::new(1, 1), "Z")], None, cx)
-        });
-        cx.run_until_parked();
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.text()),
-            "abXc\ndZeF\nGHI\nYjkl\nmno"
-        );
-        assert_eq!(
-            unreviewed_hunks(&action_log, cx),
-            vec![(
-                buffer.clone(),
-                vec![HunkStatus {
-                    range: Point::new(1, 0)..Point::new(3, 0),
-                    diff_status: DiffHunkStatusKind::Modified,
-                    old_text: "def\nghi\n".into(),
-                }],
-            )]
-        );
-
-        action_log.update(cx, |log, cx| {
-            log.keep_edits_in_range(buffer.clone(), Point::new(0, 0)..Point::new(1, 0), cx)
-        });
-        cx.run_until_parked();
-        assert_eq!(unreviewed_hunks(&action_log, cx), vec![]);
-    }
-
-    #[gpui::test(iterations = 10)]
-    async fn test_creating_files(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(path!("/dir"), json!({})).await;
-        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-        let file_path = project
-            .read_with(cx, |project, cx| project.find_project_path("dir/file1", cx))
-            .unwrap();
-
-        let buffer = project
-            .update(cx, |project, cx| project.open_buffer(file_path, cx))
-            .await
-            .unwrap();
-        cx.update(|cx| {
-            action_log.update(cx, |log, cx| log.buffer_created(buffer.clone(), cx));
-            buffer.update(cx, |buffer, cx| buffer.set_text("lorem", cx));
-            action_log.update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
-        });
-        project
-            .update(cx, |project, cx| project.save_buffer(buffer.clone(), cx))
-            .await
-            .unwrap();
-        cx.run_until_parked();
-        assert_eq!(
-            unreviewed_hunks(&action_log, cx),
-            vec![(
-                buffer.clone(),
-                vec![HunkStatus {
-                    range: Point::new(0, 0)..Point::new(0, 5),
-                    diff_status: DiffHunkStatusKind::Added,
-                    old_text: "".into(),
-                }],
-            )]
-        );
-
-        buffer.update(cx, |buffer, cx| buffer.edit([(0..0, "X")], None, cx));
-        cx.run_until_parked();
-        assert_eq!(
-            unreviewed_hunks(&action_log, cx),
-            vec![(
-                buffer.clone(),
-                vec![HunkStatus {
-                    range: Point::new(0, 0)..Point::new(0, 6),
-                    diff_status: DiffHunkStatusKind::Added,
-                    old_text: "".into(),
-                }],
-            )]
-        );
-
-        action_log.update(cx, |log, cx| {
-            log.keep_edits_in_range(buffer.clone(), 0..5, cx)
-        });
-        cx.run_until_parked();
-        assert_eq!(unreviewed_hunks(&action_log, cx), vec![]);
-    }
-
-    #[gpui::test(iterations = 10)]
-    async fn test_deleting_files(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/dir"),
-            json!({"file1": "lorem\n", "file2": "ipsum\n"}),
-        )
-        .await;
-
-        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let file1_path = project
-            .read_with(cx, |project, cx| project.find_project_path("dir/file1", cx))
-            .unwrap();
-        let file2_path = project
-            .read_with(cx, |project, cx| project.find_project_path("dir/file2", cx))
-            .unwrap();
-
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-        let buffer1 = project
-            .update(cx, |project, cx| {
-                project.open_buffer(file1_path.clone(), cx)
-            })
-            .await
-            .unwrap();
-        let buffer2 = project
-            .update(cx, |project, cx| {
-                project.open_buffer(file2_path.clone(), cx)
-            })
-            .await
-            .unwrap();
-
-        action_log.update(cx, |log, cx| log.will_delete_buffer(buffer1.clone(), cx));
-        action_log.update(cx, |log, cx| log.will_delete_buffer(buffer2.clone(), cx));
-        project
-            .update(cx, |project, cx| {
-                project.delete_file(file1_path.clone(), false, cx)
-            })
-            .unwrap()
-            .await
-            .unwrap();
-        project
-            .update(cx, |project, cx| {
-                project.delete_file(file2_path.clone(), false, cx)
-            })
-            .unwrap()
-            .await
-            .unwrap();
-        cx.run_until_parked();
-        assert_eq!(
-            unreviewed_hunks(&action_log, cx),
-            vec![
-                (
-                    buffer1.clone(),
-                    vec![HunkStatus {
-                        range: Point::new(0, 0)..Point::new(0, 0),
-                        diff_status: DiffHunkStatusKind::Deleted,
-                        old_text: "lorem\n".into(),
-                    }]
-                ),
-                (
-                    buffer2.clone(),
-                    vec![HunkStatus {
-                        range: Point::new(0, 0)..Point::new(0, 0),
-                        diff_status: DiffHunkStatusKind::Deleted,
-                        old_text: "ipsum\n".into(),
-                    }],
-                )
-            ]
-        );
-
-        // Simulate file1 being recreated externally.
-        fs.insert_file(path!("/dir/file1"), "LOREM".as_bytes().to_vec())
-            .await;
-
-        // Simulate file2 being recreated by a tool.
-        let buffer2 = project
-            .update(cx, |project, cx| project.open_buffer(file2_path, cx))
-            .await
-            .unwrap();
-        action_log.update(cx, |log, cx| log.buffer_read(buffer2.clone(), cx));
-        buffer2.update(cx, |buffer, cx| buffer.set_text("IPSUM", cx));
-        action_log.update(cx, |log, cx| log.buffer_edited(buffer2.clone(), cx));
-        project
-            .update(cx, |project, cx| project.save_buffer(buffer2.clone(), cx))
-            .await
-            .unwrap();
-
-        cx.run_until_parked();
-        assert_eq!(
-            unreviewed_hunks(&action_log, cx),
-            vec![(
-                buffer2.clone(),
-                vec![HunkStatus {
-                    range: Point::new(0, 0)..Point::new(0, 5),
-                    diff_status: DiffHunkStatusKind::Modified,
-                    old_text: "ipsum\n".into(),
-                }],
-            )]
-        );
-
-        // Simulate file2 being deleted externally.
-        fs.remove_file(path!("/dir/file2").as_ref(), RemoveOptions::default())
-            .await
-            .unwrap();
-        cx.run_until_parked();
-        assert_eq!(unreviewed_hunks(&action_log, cx), vec![]);
-    }
-
-    #[gpui::test(iterations = 10)]
-    async fn test_reject_edits(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(path!("/dir"), json!({"file": "abc\ndef\nghi\njkl\nmno"}))
-            .await;
-        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-        let file_path = project
-            .read_with(cx, |project, cx| project.find_project_path("dir/file", cx))
-            .unwrap();
-        let buffer = project
-            .update(cx, |project, cx| project.open_buffer(file_path, cx))
-            .await
-            .unwrap();
-
-        cx.update(|cx| {
-            action_log.update(cx, |log, cx| log.buffer_read(buffer.clone(), cx));
-            buffer.update(cx, |buffer, cx| {
-                buffer
-                    .edit([(Point::new(1, 1)..Point::new(1, 2), "E\nXYZ")], None, cx)
-                    .unwrap()
-            });
-            buffer.update(cx, |buffer, cx| {
-                buffer
-                    .edit([(Point::new(5, 2)..Point::new(5, 3), "O")], None, cx)
-                    .unwrap()
-            });
-            action_log.update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
-        });
-        cx.run_until_parked();
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.text()),
-            "abc\ndE\nXYZf\nghi\njkl\nmnO"
-        );
-        assert_eq!(
-            unreviewed_hunks(&action_log, cx),
-            vec![(
-                buffer.clone(),
-                vec![
-                    HunkStatus {
-                        range: Point::new(1, 0)..Point::new(3, 0),
-                        diff_status: DiffHunkStatusKind::Modified,
-                        old_text: "def\n".into(),
-                    },
-                    HunkStatus {
-                        range: Point::new(5, 0)..Point::new(5, 3),
-                        diff_status: DiffHunkStatusKind::Modified,
-                        old_text: "mno".into(),
-                    }
-                ],
-            )]
-        );
-
-        // If the rejected range doesn't overlap with any hunk, we ignore it.
-        action_log
-            .update(cx, |log, cx| {
-                log.reject_edits_in_ranges(
-                    buffer.clone(),
-                    vec![Point::new(4, 0)..Point::new(4, 0)],
-                    cx,
-                )
-            })
-            .await
-            .unwrap();
-        cx.run_until_parked();
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.text()),
-            "abc\ndE\nXYZf\nghi\njkl\nmnO"
-        );
-        assert_eq!(
-            unreviewed_hunks(&action_log, cx),
-            vec![(
-                buffer.clone(),
-                vec![
-                    HunkStatus {
-                        range: Point::new(1, 0)..Point::new(3, 0),
-                        diff_status: DiffHunkStatusKind::Modified,
-                        old_text: "def\n".into(),
-                    },
-                    HunkStatus {
-                        range: Point::new(5, 0)..Point::new(5, 3),
-                        diff_status: DiffHunkStatusKind::Modified,
-                        old_text: "mno".into(),
-                    }
-                ],
-            )]
-        );
-
-        action_log
-            .update(cx, |log, cx| {
-                log.reject_edits_in_ranges(
-                    buffer.clone(),
-                    vec![Point::new(0, 0)..Point::new(1, 0)],
-                    cx,
-                )
-            })
-            .await
-            .unwrap();
-        cx.run_until_parked();
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.text()),
-            "abc\ndef\nghi\njkl\nmnO"
-        );
-        assert_eq!(
-            unreviewed_hunks(&action_log, cx),
-            vec![(
-                buffer.clone(),
-                vec![HunkStatus {
-                    range: Point::new(4, 0)..Point::new(4, 3),
-                    diff_status: DiffHunkStatusKind::Modified,
-                    old_text: "mno".into(),
-                }],
-            )]
-        );
-
-        action_log
-            .update(cx, |log, cx| {
-                log.reject_edits_in_ranges(
-                    buffer.clone(),
-                    vec![Point::new(4, 0)..Point::new(4, 0)],
-                    cx,
-                )
-            })
-            .await
-            .unwrap();
-        cx.run_until_parked();
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.text()),
-            "abc\ndef\nghi\njkl\nmno"
-        );
-        assert_eq!(unreviewed_hunks(&action_log, cx), vec![]);
-    }
-
-    #[gpui::test(iterations = 10)]
-    async fn test_reject_multiple_edits(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(path!("/dir"), json!({"file": "abc\ndef\nghi\njkl\nmno"}))
-            .await;
-        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-        let file_path = project
-            .read_with(cx, |project, cx| project.find_project_path("dir/file", cx))
-            .unwrap();
-        let buffer = project
-            .update(cx, |project, cx| project.open_buffer(file_path, cx))
-            .await
-            .unwrap();
-
-        cx.update(|cx| {
-            action_log.update(cx, |log, cx| log.buffer_read(buffer.clone(), cx));
-            buffer.update(cx, |buffer, cx| {
-                buffer
-                    .edit([(Point::new(1, 1)..Point::new(1, 2), "E\nXYZ")], None, cx)
-                    .unwrap()
-            });
-            buffer.update(cx, |buffer, cx| {
-                buffer
-                    .edit([(Point::new(5, 2)..Point::new(5, 3), "O")], None, cx)
-                    .unwrap()
-            });
-            action_log.update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
-        });
-        cx.run_until_parked();
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.text()),
-            "abc\ndE\nXYZf\nghi\njkl\nmnO"
-        );
-        assert_eq!(
-            unreviewed_hunks(&action_log, cx),
-            vec![(
-                buffer.clone(),
-                vec![
-                    HunkStatus {
-                        range: Point::new(1, 0)..Point::new(3, 0),
-                        diff_status: DiffHunkStatusKind::Modified,
-                        old_text: "def\n".into(),
-                    },
-                    HunkStatus {
-                        range: Point::new(5, 0)..Point::new(5, 3),
-                        diff_status: DiffHunkStatusKind::Modified,
-                        old_text: "mno".into(),
-                    }
-                ],
-            )]
-        );
-
-        action_log.update(cx, |log, cx| {
-            let range_1 = buffer.read(cx).anchor_before(Point::new(0, 0))
-                ..buffer.read(cx).anchor_before(Point::new(1, 0));
-            let range_2 = buffer.read(cx).anchor_before(Point::new(5, 0))
-                ..buffer.read(cx).anchor_before(Point::new(5, 3));
-
-            log.reject_edits_in_ranges(buffer.clone(), vec![range_1, range_2], cx)
-                .detach();
-            assert_eq!(
-                buffer.read_with(cx, |buffer, _| buffer.text()),
-                "abc\ndef\nghi\njkl\nmno"
-            );
-        });
-        cx.run_until_parked();
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.text()),
-            "abc\ndef\nghi\njkl\nmno"
-        );
-        assert_eq!(unreviewed_hunks(&action_log, cx), vec![]);
-    }
-
-    #[gpui::test(iterations = 10)]
-    async fn test_reject_deleted_file(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(path!("/dir"), json!({"file": "content"}))
-            .await;
-        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-        let file_path = project
-            .read_with(cx, |project, cx| project.find_project_path("dir/file", cx))
-            .unwrap();
-        let buffer = project
-            .update(cx, |project, cx| project.open_buffer(file_path.clone(), cx))
-            .await
-            .unwrap();
-
-        cx.update(|cx| {
-            action_log.update(cx, |log, cx| log.will_delete_buffer(buffer.clone(), cx));
-        });
-        project
-            .update(cx, |project, cx| {
-                project.delete_file(file_path.clone(), false, cx)
-            })
-            .unwrap()
-            .await
-            .unwrap();
-        cx.run_until_parked();
-        assert!(!fs.is_file(path!("/dir/file").as_ref()).await);
-        assert_eq!(
-            unreviewed_hunks(&action_log, cx),
-            vec![(
-                buffer.clone(),
-                vec![HunkStatus {
-                    range: Point::new(0, 0)..Point::new(0, 0),
-                    diff_status: DiffHunkStatusKind::Deleted,
-                    old_text: "content".into(),
-                }]
-            )]
-        );
-
-        action_log
-            .update(cx, |log, cx| {
-                log.reject_edits_in_ranges(
-                    buffer.clone(),
-                    vec![Point::new(0, 0)..Point::new(0, 0)],
-                    cx,
-                )
-            })
-            .await
-            .unwrap();
-        cx.run_until_parked();
-        assert_eq!(buffer.read_with(cx, |buffer, _| buffer.text()), "content");
-        assert!(fs.is_file(path!("/dir/file").as_ref()).await);
-        assert_eq!(unreviewed_hunks(&action_log, cx), vec![]);
-    }
-
-    #[gpui::test(iterations = 10)]
-    async fn test_reject_created_file(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-        let file_path = project
-            .read_with(cx, |project, cx| {
-                project.find_project_path("dir/new_file", cx)
-            })
-            .unwrap();
-
-        let buffer = project
-            .update(cx, |project, cx| project.open_buffer(file_path, cx))
-            .await
-            .unwrap();
-        cx.update(|cx| {
-            action_log.update(cx, |log, cx| log.buffer_created(buffer.clone(), cx));
-            buffer.update(cx, |buffer, cx| buffer.set_text("content", cx));
-            action_log.update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
-        });
-        project
-            .update(cx, |project, cx| project.save_buffer(buffer.clone(), cx))
-            .await
-            .unwrap();
-        assert!(fs.is_file(path!("/dir/new_file").as_ref()).await);
-        cx.run_until_parked();
-        assert_eq!(
-            unreviewed_hunks(&action_log, cx),
-            vec![(
-                buffer.clone(),
-                vec![HunkStatus {
-                    range: Point::new(0, 0)..Point::new(0, 7),
-                    diff_status: DiffHunkStatusKind::Added,
-                    old_text: "".into(),
-                }],
-            )]
-        );
-
-        action_log
-            .update(cx, |log, cx| {
-                log.reject_edits_in_ranges(
-                    buffer.clone(),
-                    vec![Point::new(0, 0)..Point::new(0, 11)],
-                    cx,
-                )
-            })
-            .await
-            .unwrap();
-        cx.run_until_parked();
-        assert!(!fs.is_file(path!("/dir/new_file").as_ref()).await);
-        assert_eq!(unreviewed_hunks(&action_log, cx), vec![]);
-    }
-
-    #[gpui::test(iterations = 100)]
-    async fn test_random_diffs(mut rng: StdRng, cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let operations = env::var("OPERATIONS")
-            .map(|i| i.parse().expect("invalid `OPERATIONS` variable"))
-            .unwrap_or(20);
-
-        let text = RandomCharIter::new(&mut rng).take(50).collect::<String>();
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(path!("/dir"), json!({"file": text})).await;
-        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-        let file_path = project
-            .read_with(cx, |project, cx| project.find_project_path("dir/file", cx))
-            .unwrap();
-        let buffer = project
-            .update(cx, |project, cx| project.open_buffer(file_path, cx))
-            .await
-            .unwrap();
-
-        action_log.update(cx, |log, cx| log.buffer_read(buffer.clone(), cx));
-
-        for _ in 0..operations {
-            match rng.gen_range(0..100) {
-                0..25 => {
-                    action_log.update(cx, |log, cx| {
-                        let range = buffer.read(cx).random_byte_range(0, &mut rng);
-                        log::info!("keeping edits in range {:?}", range);
-                        log.keep_edits_in_range(buffer.clone(), range, cx)
-                    });
-                }
-                25..50 => {
-                    action_log
-                        .update(cx, |log, cx| {
-                            let range = buffer.read(cx).random_byte_range(0, &mut rng);
-                            log::info!("rejecting edits in range {:?}", range);
-                            log.reject_edits_in_ranges(buffer.clone(), vec![range], cx)
-                        })
-                        .await
-                        .unwrap();
-                }
-                _ => {
-                    let is_agent_change = rng.gen_bool(0.5);
-                    if is_agent_change {
-                        log::info!("agent edit");
-                    } else {
-                        log::info!("user edit");
-                    }
-                    cx.update(|cx| {
-                        buffer.update(cx, |buffer, cx| buffer.randomly_edit(&mut rng, 1, cx));
-                        if is_agent_change {
-                            action_log.update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
-                        }
-                    });
-                }
-            }
-
-            if rng.gen_bool(0.2) {
-                quiesce(&action_log, &buffer, cx);
-            }
-        }
-
-        quiesce(&action_log, &buffer, cx);
-
-        fn quiesce(
-            action_log: &Entity<ActionLog>,
-            buffer: &Entity<Buffer>,
-            cx: &mut TestAppContext,
-        ) {
-            log::info!("quiescing...");
-            cx.run_until_parked();
-            action_log.update(cx, |log, cx| {
-                let tracked_buffer = log.tracked_buffers.get(&buffer).unwrap();
-                let mut old_text = tracked_buffer.base_text.clone();
-                let new_text = buffer.read(cx).as_rope();
-                for edit in tracked_buffer.unreviewed_changes.edits() {
-                    let old_start = old_text.point_to_offset(Point::new(edit.new.start, 0));
-                    let old_end = old_text.point_to_offset(cmp::min(
-                        Point::new(edit.new.start + edit.old_len(), 0),
-                        old_text.max_point(),
-                    ));
-                    old_text.replace(
-                        old_start..old_end,
-                        &new_text.slice_rows(edit.new.clone()).to_string(),
-                    );
-                }
-                pretty_assertions::assert_eq!(old_text.to_string(), new_text.to_string());
-            })
-        }
-    }
-
-    #[derive(Debug, Clone, PartialEq, Eq)]
-    struct HunkStatus {
-        range: Range<Point>,
-        diff_status: DiffHunkStatusKind,
-        old_text: String,
-    }
-
-    fn unreviewed_hunks(
-        action_log: &Entity<ActionLog>,
-        cx: &TestAppContext,
-    ) -> Vec<(Entity<Buffer>, Vec<HunkStatus>)> {
-        cx.read(|cx| {
-            action_log
-                .read(cx)
-                .changed_buffers(cx)
-                .into_iter()
-                .map(|(buffer, diff)| {
-                    let snapshot = buffer.read(cx).snapshot();
-                    (
-                        buffer,
-                        diff.read(cx)
-                            .hunks(&snapshot, cx)
-                            .map(|hunk| HunkStatus {
-                                diff_status: hunk.status().kind,
-                                range: hunk.range,
-                                old_text: diff
-                                    .read(cx)
-                                    .base_text()
-                                    .text_for_range(hunk.diff_base_byte_range)
-                                    .collect(),
-                            })
-                            .collect(),
-                    )
-                })
-                .collect()
-        })
-    }
-}
diff --git a/crates/agent/src/edit_agent/evals/fixtures/delete_run_git_blame/after.rs b/crates/agent/src/edit_agent/evals/fixtures/delete_run_git_blame/after.rs
deleted file mode 100644
index 89277be443..0000000000
--- a/crates/agent/src/edit_agent/evals/fixtures/delete_run_git_blame/after.rs
+++ /dev/null
@@ -1,328 +0,0 @@
-use crate::commit::get_messages;
-use crate::{GitRemote, Oid};
-use anyhow::{Context as _, Result, anyhow};
-use collections::{HashMap, HashSet};
-use futures::AsyncWriteExt;
-use gpui::SharedString;
-use serde::{Deserialize, Serialize};
-use std::process::Stdio;
-use std::{ops::Range, path::Path};
-use text::Rope;
-use time::OffsetDateTime;
-use time::UtcOffset;
-use time::macros::format_description;
-
-pub use git2 as libgit;
-
-#[derive(Debug, Clone, Default)]
-pub struct Blame {
-    pub entries: Vec<BlameEntry>,
-    pub messages: HashMap<Oid, String>,
-    pub remote_url: Option<String>,
-}
-
-#[derive(Clone, Debug, Default)]
-pub struct ParsedCommitMessage {
-    pub message: SharedString,
-    pub permalink: Option<url::Url>,
-    pub pull_request: Option<crate::hosting_provider::PullRequest>,
-    pub remote: Option<GitRemote>,
-}
-
-impl Blame {
-    pub async fn for_path(
-        git_binary: &Path,
-        working_directory: &Path,
-        path: &Path,
-        content: &Rope,
-        remote_url: Option<String>,
-    ) -> Result<Self> {
-        let output = run_git_blame(git_binary, working_directory, path, content).await?;
-        let mut entries = parse_git_blame(&output)?;
-        entries.sort_unstable_by(|a, b| a.range.start.cmp(&b.range.start));
-
-        let mut unique_shas = HashSet::default();
-
-        for entry in entries.iter_mut() {
-            unique_shas.insert(entry.sha);
-        }
-
-        let shas = unique_shas.into_iter().collect::<Vec<_>>();
-        let messages = get_messages(working_directory, &shas)
-            .await
-            .context("failed to get commit messages")?;
-
-        Ok(Self {
-            entries,
-            messages,
-            remote_url,
-        })
-    }
-}
-
-const GIT_BLAME_NO_COMMIT_ERROR: &str = "fatal: no such ref: HEAD";
-const GIT_BLAME_NO_PATH: &str = "fatal: no such path";
-
-#[derive(Serialize, Deserialize, Default, Debug, Clone, PartialEq, Eq)]
-pub struct BlameEntry {
-    pub sha: Oid,
-
-    pub range: Range<u32>,
-
-    pub original_line_number: u32,
-
-    pub author: Option<String>,
-    pub author_mail: Option<String>,
-    pub author_time: Option<i64>,
-    pub author_tz: Option<String>,
-
-    pub committer_name: Option<String>,
-    pub committer_email: Option<String>,
-    pub committer_time: Option<i64>,
-    pub committer_tz: Option<String>,
-
-    pub summary: Option<String>,
-
-    pub previous: Option<String>,
-    pub filename: String,
-}
-
-impl BlameEntry {
-    // Returns a BlameEntry by parsing the first line of a `git blame --incremental`
-    // entry. The line MUST have this format:
-    //
-    //     <40-byte-hex-sha1> <sourceline> <resultline> <num-lines>
-    fn new_from_blame_line(line: &str) -> Result<BlameEntry> {
-        let mut parts = line.split_whitespace();
-
-        let sha = parts
-            .next()
-            .and_then(|line| line.parse::<Oid>().ok())
-            .with_context(|| format!("parsing sha from {line}"))?;
-
-        let original_line_number = parts
-            .next()
-            .and_then(|line| line.parse::<u32>().ok())
-            .with_context(|| format!("parsing original line number from {line}"))?;
-        let final_line_number = parts
-            .next()
-            .and_then(|line| line.parse::<u32>().ok())
-            .with_context(|| format!("parsing final line number from {line}"))?;
-
-        let line_count = parts
-            .next()
-            .and_then(|line| line.parse::<u32>().ok())
-            .with_context(|| format!("parsing line count from {line}"))?;
-
-        let start_line = final_line_number.saturating_sub(1);
-        let end_line = start_line + line_count;
-        let range = start_line..end_line;
-
-        Ok(Self {
-            sha,
-            range,
-            original_line_number,
-            ..Default::default()
-        })
-    }
-
-    pub fn author_offset_date_time(&self) -> Result<time::OffsetDateTime> {
-        if let (Some(author_time), Some(author_tz)) = (self.author_time, &self.author_tz) {
-            let format = format_description!("[offset_hour][offset_minute]");
-            let offset = UtcOffset::parse(author_tz, &format)?;
-            let date_time_utc = OffsetDateTime::from_unix_timestamp(author_time)?;
-
-            Ok(date_time_utc.to_offset(offset))
-        } else {
-            // Directly return current time in UTC if there's no committer time or timezone
-            Ok(time::OffsetDateTime::now_utc())
-        }
-    }
-}
-
-// parse_git_blame parses the output of `git blame --incremental`, which returns
-// all the blame-entries for a given path incrementally, as it finds them.
-//
-// Each entry *always* starts with:
-//
-//     <40-byte-hex-sha1> <sourceline> <resultline> <num-lines>
-//
-// Each entry *always* ends with:
-//
-//     filename <whitespace-quoted-filename-goes-here>
-//
-// Line numbers are 1-indexed.
-//
-// A `git blame --incremental` entry looks like this:
-//
-//    6ad46b5257ba16d12c5ca9f0d4900320959df7f4 2 2 1
-//    author Joe Schmoe
-//    author-mail <joe.schmoe@example.com>
-//    author-time 1709741400
-//    author-tz +0100
-//    committer Joe Schmoe
-//    committer-mail <joe.schmoe@example.com>
-//    committer-time 1709741400
-//    committer-tz +0100
-//    summary Joe's cool commit
-//    previous 486c2409237a2c627230589e567024a96751d475 index.js
-//    filename index.js
-//
-// If the entry has the same SHA as an entry that was already printed then no
-// signature information is printed:
-//
-//    6ad46b5257ba16d12c5ca9f0d4900320959df7f4 3 4 1
-//    previous 486c2409237a2c627230589e567024a96751d475 index.js
-//    filename index.js
-//
-// More about `--incremental` output: https://mirrors.edge.kernel.org/pub/software/scm/git/docs/git-blame.html
-fn parse_git_blame(output: &str) -> Result<Vec<BlameEntry>> {
-    let mut entries: Vec<BlameEntry> = Vec::new();
-    let mut index: HashMap<Oid, usize> = HashMap::default();
-
-    let mut current_entry: Option<BlameEntry> = None;
-
-    for line in output.lines() {
-        let mut done = false;
-
-        match &mut current_entry {
-            None => {
-                let mut new_entry = BlameEntry::new_from_blame_line(line)?;
-
-                if let Some(existing_entry) = index
-                    .get(&new_entry.sha)
-                    .and_then(|slot| entries.get(*slot))
-                {
-                    new_entry.author.clone_from(&existing_entry.author);
-                    new_entry
-                        .author_mail
-                        .clone_from(&existing_entry.author_mail);
-                    new_entry.author_time = existing_entry.author_time;
-                    new_entry.author_tz.clone_from(&existing_entry.author_tz);
-                    new_entry
-                        .committer_name
-                        .clone_from(&existing_entry.committer_name);
-                    new_entry
-                        .committer_email
-                        .clone_from(&existing_entry.committer_email);
-                    new_entry.committer_time = existing_entry.committer_time;
-                    new_entry
-                        .committer_tz
-                        .clone_from(&existing_entry.committer_tz);
-                    new_entry.summary.clone_from(&existing_entry.summary);
-                }
-
-                current_entry.replace(new_entry);
-            }
-            Some(entry) => {
-                let Some((key, value)) = line.split_once(' ') else {
-                    continue;
-                };
-                let is_committed = !entry.sha.is_zero();
-                match key {
-                    "filename" => {
-                        entry.filename = value.into();
-                        done = true;
-                    }
-                    "previous" => entry.previous = Some(value.into()),
-
-                    "summary" if is_committed => entry.summary = Some(value.into()),
-                    "author" if is_committed => entry.author = Some(value.into()),
-                    "author-mail" if is_committed => entry.author_mail = Some(value.into()),
-                    "author-time" if is_committed => {
-                        entry.author_time = Some(value.parse::<i64>()?)
-                    }
-                    "author-tz" if is_committed => entry.author_tz = Some(value.into()),
-
-                    "committer" if is_committed => entry.committer_name = Some(value.into()),
-                    "committer-mail" if is_committed => entry.committer_email = Some(value.into()),
-                    "committer-time" if is_committed => {
-                        entry.committer_time = Some(value.parse::<i64>()?)
-                    }
-                    "committer-tz" if is_committed => entry.committer_tz = Some(value.into()),
-                    _ => {}
-                }
-            }
-        };
-
-        if done {
-            if let Some(entry) = current_entry.take() {
-                index.insert(entry.sha, entries.len());
-
-                // We only want annotations that have a commit.
-                if !entry.sha.is_zero() {
-                    entries.push(entry);
-                }
-            }
-        }
-    }
-
-    Ok(entries)
-}
-
-#[cfg(test)]
-mod tests {
-    use std::path::PathBuf;
-
-    use super::BlameEntry;
-    use super::parse_git_blame;
-
-    fn read_test_data(filename: &str) -> String {
-        let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-        path.push("test_data");
-        path.push(filename);
-
-        std::fs::read_to_string(&path)
-            .unwrap_or_else(|_| panic!("Could not read test data at {:?}. Is it generated?", path))
-    }
-
-    fn assert_eq_golden(entries: &Vec<BlameEntry>, golden_filename: &str) {
-        let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-        path.push("test_data");
-        path.push("golden");
-        path.push(format!("{}.json", golden_filename));
-
-        let mut have_json =
-            serde_json::to_string_pretty(&entries).expect("could not serialize entries to JSON");
-        // We always want to save with a trailing newline.
-        have_json.push('\n');
-
-        let update = std::env::var("UPDATE_GOLDEN")
-            .map(|val| val.eq_ignore_ascii_case("true"))
-            .unwrap_or(false);
-
-        if update {
-            std::fs::create_dir_all(path.parent().unwrap())
-                .expect("could not create golden test data directory");
-            std::fs::write(&path, have_json).expect("could not write out golden data");
-        } else {
-            let want_json =
-                std::fs::read_to_string(&path).unwrap_or_else(|_| {
-                    panic!("could not read golden test data file at {:?}. Did you run the test with UPDATE_GOLDEN=true before?", path);
-                }).replace("\r\n", "\n");
-
-            pretty_assertions::assert_eq!(have_json, want_json, "wrong blame entries");
-        }
-    }
-
-    #[test]
-    fn test_parse_git_blame_not_committed() {
-        let output = read_test_data("blame_incremental_not_committed");
-        let entries = parse_git_blame(&output).unwrap();
-        assert_eq_golden(&entries, "blame_incremental_not_committed");
-    }
-
-    #[test]
-    fn test_parse_git_blame_simple() {
-        let output = read_test_data("blame_incremental_simple");
-        let entries = parse_git_blame(&output).unwrap();
-        assert_eq_golden(&entries, "blame_incremental_simple");
-    }
-
-    #[test]
-    fn test_parse_git_blame_complex() {
-        let output = read_test_data("blame_incremental_complex");
-        let entries = parse_git_blame(&output).unwrap();
-        assert_eq_golden(&entries, "blame_incremental_complex");
-    }
-}
diff --git a/crates/agent/src/edit_agent/evals/fixtures/delete_run_git_blame/before.rs b/crates/agent/src/edit_agent/evals/fixtures/delete_run_git_blame/before.rs
deleted file mode 100644
index 36fccb5132..0000000000
--- a/crates/agent/src/edit_agent/evals/fixtures/delete_run_git_blame/before.rs
+++ /dev/null
@@ -1,371 +0,0 @@
-use crate::commit::get_messages;
-use crate::{GitRemote, Oid};
-use anyhow::{Context as _, Result, anyhow};
-use collections::{HashMap, HashSet};
-use futures::AsyncWriteExt;
-use gpui::SharedString;
-use serde::{Deserialize, Serialize};
-use std::process::Stdio;
-use std::{ops::Range, path::Path};
-use text::Rope;
-use time::OffsetDateTime;
-use time::UtcOffset;
-use time::macros::format_description;
-
-pub use git2 as libgit;
-
-#[derive(Debug, Clone, Default)]
-pub struct Blame {
-    pub entries: Vec<BlameEntry>,
-    pub messages: HashMap<Oid, String>,
-    pub remote_url: Option<String>,
-}
-
-#[derive(Clone, Debug, Default)]
-pub struct ParsedCommitMessage {
-    pub message: SharedString,
-    pub permalink: Option<url::Url>,
-    pub pull_request: Option<crate::hosting_provider::PullRequest>,
-    pub remote: Option<GitRemote>,
-}
-
-impl Blame {
-    pub async fn for_path(
-        git_binary: &Path,
-        working_directory: &Path,
-        path: &Path,
-        content: &Rope,
-        remote_url: Option<String>,
-    ) -> Result<Self> {
-        let output = run_git_blame(git_binary, working_directory, path, content).await?;
-        let mut entries = parse_git_blame(&output)?;
-        entries.sort_unstable_by(|a, b| a.range.start.cmp(&b.range.start));
-
-        let mut unique_shas = HashSet::default();
-
-        for entry in entries.iter_mut() {
-            unique_shas.insert(entry.sha);
-        }
-
-        let shas = unique_shas.into_iter().collect::<Vec<_>>();
-        let messages = get_messages(working_directory, &shas)
-            .await
-            .context("failed to get commit messages")?;
-
-        Ok(Self {
-            entries,
-            messages,
-            remote_url,
-        })
-    }
-}
-
-const GIT_BLAME_NO_COMMIT_ERROR: &str = "fatal: no such ref: HEAD";
-const GIT_BLAME_NO_PATH: &str = "fatal: no such path";
-
-async fn run_git_blame(
-    git_binary: &Path,
-    working_directory: &Path,
-    path: &Path,
-    contents: &Rope,
-) -> Result<String> {
-    let mut child = util::command::new_smol_command(git_binary)
-        .current_dir(working_directory)
-        .arg("blame")
-        .arg("--incremental")
-        .arg("--contents")
-        .arg("-")
-        .arg(path.as_os_str())
-        .stdin(Stdio::piped())
-        .stdout(Stdio::piped())
-        .stderr(Stdio::piped())
-        .spawn()
-        .context("starting git blame process")?;
-
-    let stdin = child
-        .stdin
-        .as_mut()
-        .context("failed to get pipe to stdin of git blame command")?;
-
-    for chunk in contents.chunks() {
-        stdin.write_all(chunk.as_bytes()).await?;
-    }
-    stdin.flush().await?;
-
-    let output = child.output().await.context("reading git blame output")?;
-
-    if !output.status.success() {
-        let stderr = String::from_utf8_lossy(&output.stderr);
-        let trimmed = stderr.trim();
-        if trimmed == GIT_BLAME_NO_COMMIT_ERROR || trimmed.contains(GIT_BLAME_NO_PATH) {
-            return Ok(String::new());
-        }
-        anyhow::bail!("git blame process failed: {stderr}");
-    }
-
-    Ok(String::from_utf8(output.stdout)?)
-}
-
-#[derive(Serialize, Deserialize, Default, Debug, Clone, PartialEq, Eq)]
-pub struct BlameEntry {
-    pub sha: Oid,
-
-    pub range: Range<u32>,
-
-    pub original_line_number: u32,
-
-    pub author: Option<String>,
-    pub author_mail: Option<String>,
-    pub author_time: Option<i64>,
-    pub author_tz: Option<String>,
-
-    pub committer_name: Option<String>,
-    pub committer_email: Option<String>,
-    pub committer_time: Option<i64>,
-    pub committer_tz: Option<String>,
-
-    pub summary: Option<String>,
-
-    pub previous: Option<String>,
-    pub filename: String,
-}
-
-impl BlameEntry {
-    // Returns a BlameEntry by parsing the first line of a `git blame --incremental`
-    // entry. The line MUST have this format:
-    //
-    //     <40-byte-hex-sha1> <sourceline> <resultline> <num-lines>
-    fn new_from_blame_line(line: &str) -> Result<BlameEntry> {
-        let mut parts = line.split_whitespace();
-
-        let sha = parts
-            .next()
-            .and_then(|line| line.parse::<Oid>().ok())
-            .with_context(|| format!("parsing sha from {line}"))?;
-
-        let original_line_number = parts
-            .next()
-            .and_then(|line| line.parse::<u32>().ok())
-            .with_context(|| format!("parsing original line number from {line}"))?;
-        let final_line_number = parts
-            .next()
-            .and_then(|line| line.parse::<u32>().ok())
-            .with_context(|| format!("parsing final line number from {line}"))?;
-
-        let line_count = parts
-            .next()
-            .and_then(|line| line.parse::<u32>().ok())
-            .with_context(|| format!("parsing line count from {line}"))?;
-
-        let start_line = final_line_number.saturating_sub(1);
-        let end_line = start_line + line_count;
-        let range = start_line..end_line;
-
-        Ok(Self {
-            sha,
-            range,
-            original_line_number,
-            ..Default::default()
-        })
-    }
-
-    pub fn author_offset_date_time(&self) -> Result<time::OffsetDateTime> {
-        if let (Some(author_time), Some(author_tz)) = (self.author_time, &self.author_tz) {
-            let format = format_description!("[offset_hour][offset_minute]");
-            let offset = UtcOffset::parse(author_tz, &format)?;
-            let date_time_utc = OffsetDateTime::from_unix_timestamp(author_time)?;
-
-            Ok(date_time_utc.to_offset(offset))
-        } else {
-            // Directly return current time in UTC if there's no committer time or timezone
-            Ok(time::OffsetDateTime::now_utc())
-        }
-    }
-}
-
-// parse_git_blame parses the output of `git blame --incremental`, which returns
-// all the blame-entries for a given path incrementally, as it finds them.
-//
-// Each entry *always* starts with:
-//
-//     <40-byte-hex-sha1> <sourceline> <resultline> <num-lines>
-//
-// Each entry *always* ends with:
-//
-//     filename <whitespace-quoted-filename-goes-here>
-//
-// Line numbers are 1-indexed.
-//
-// A `git blame --incremental` entry looks like this:
-//
-//    6ad46b5257ba16d12c5ca9f0d4900320959df7f4 2 2 1
-//    author Joe Schmoe
-//    author-mail <joe.schmoe@example.com>
-//    author-time 1709741400
-//    author-tz +0100
-//    committer Joe Schmoe
-//    committer-mail <joe.schmoe@example.com>
-//    committer-time 1709741400
-//    committer-tz +0100
-//    summary Joe's cool commit
-//    previous 486c2409237a2c627230589e567024a96751d475 index.js
-//    filename index.js
-//
-// If the entry has the same SHA as an entry that was already printed then no
-// signature information is printed:
-//
-//    6ad46b5257ba16d12c5ca9f0d4900320959df7f4 3 4 1
-//    previous 486c2409237a2c627230589e567024a96751d475 index.js
-//    filename index.js
-//
-// More about `--incremental` output: https://mirrors.edge.kernel.org/pub/software/scm/git/docs/git-blame.html
-fn parse_git_blame(output: &str) -> Result<Vec<BlameEntry>> {
-    let mut entries: Vec<BlameEntry> = Vec::new();
-    let mut index: HashMap<Oid, usize> = HashMap::default();
-
-    let mut current_entry: Option<BlameEntry> = None;
-
-    for line in output.lines() {
-        let mut done = false;
-
-        match &mut current_entry {
-            None => {
-                let mut new_entry = BlameEntry::new_from_blame_line(line)?;
-
-                if let Some(existing_entry) = index
-                    .get(&new_entry.sha)
-                    .and_then(|slot| entries.get(*slot))
-                {
-                    new_entry.author.clone_from(&existing_entry.author);
-                    new_entry
-                        .author_mail
-                        .clone_from(&existing_entry.author_mail);
-                    new_entry.author_time = existing_entry.author_time;
-                    new_entry.author_tz.clone_from(&existing_entry.author_tz);
-                    new_entry
-                        .committer_name
-                        .clone_from(&existing_entry.committer_name);
-                    new_entry
-                        .committer_email
-                        .clone_from(&existing_entry.committer_email);
-                    new_entry.committer_time = existing_entry.committer_time;
-                    new_entry
-                        .committer_tz
-                        .clone_from(&existing_entry.committer_tz);
-                    new_entry.summary.clone_from(&existing_entry.summary);
-                }
-
-                current_entry.replace(new_entry);
-            }
-            Some(entry) => {
-                let Some((key, value)) = line.split_once(' ') else {
-                    continue;
-                };
-                let is_committed = !entry.sha.is_zero();
-                match key {
-                    "filename" => {
-                        entry.filename = value.into();
-                        done = true;
-                    }
-                    "previous" => entry.previous = Some(value.into()),
-
-                    "summary" if is_committed => entry.summary = Some(value.into()),
-                    "author" if is_committed => entry.author = Some(value.into()),
-                    "author-mail" if is_committed => entry.author_mail = Some(value.into()),
-                    "author-time" if is_committed => {
-                        entry.author_time = Some(value.parse::<i64>()?)
-                    }
-                    "author-tz" if is_committed => entry.author_tz = Some(value.into()),
-
-                    "committer" if is_committed => entry.committer_name = Some(value.into()),
-                    "committer-mail" if is_committed => entry.committer_email = Some(value.into()),
-                    "committer-time" if is_committed => {
-                        entry.committer_time = Some(value.parse::<i64>()?)
-                    }
-                    "committer-tz" if is_committed => entry.committer_tz = Some(value.into()),
-                    _ => {}
-                }
-            }
-        };
-
-        if done {
-            if let Some(entry) = current_entry.take() {
-                index.insert(entry.sha, entries.len());
-
-                // We only want annotations that have a commit.
-                if !entry.sha.is_zero() {
-                    entries.push(entry);
-                }
-            }
-        }
-    }
-
-    Ok(entries)
-}
-
-#[cfg(test)]
-mod tests {
-    use std::path::PathBuf;
-
-    use super::BlameEntry;
-    use super::parse_git_blame;
-
-    fn read_test_data(filename: &str) -> String {
-        let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-        path.push("test_data");
-        path.push(filename);
-
-        std::fs::read_to_string(&path)
-            .unwrap_or_else(|_| panic!("Could not read test data at {:?}. Is it generated?", path))
-    }
-
-    fn assert_eq_golden(entries: &Vec<BlameEntry>, golden_filename: &str) {
-        let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-        path.push("test_data");
-        path.push("golden");
-        path.push(format!("{}.json", golden_filename));
-
-        let mut have_json =
-            serde_json::to_string_pretty(&entries).expect("could not serialize entries to JSON");
-        // We always want to save with a trailing newline.
-        have_json.push('\n');
-
-        let update = std::env::var("UPDATE_GOLDEN")
-            .map(|val| val.eq_ignore_ascii_case("true"))
-            .unwrap_or(false);
-
-        if update {
-            std::fs::create_dir_all(path.parent().unwrap())
-                .expect("could not create golden test data directory");
-            std::fs::write(&path, have_json).expect("could not write out golden data");
-        } else {
-            let want_json =
-                std::fs::read_to_string(&path).unwrap_or_else(|_| {
-                    panic!("could not read golden test data file at {:?}. Did you run the test with UPDATE_GOLDEN=true before?", path);
-                }).replace("\r\n", "\n");
-
-            pretty_assertions::assert_eq!(have_json, want_json, "wrong blame entries");
-        }
-    }
-
-    #[test]
-    fn test_parse_git_blame_not_committed() {
-        let output = read_test_data("blame_incremental_not_committed");
-        let entries = parse_git_blame(&output).unwrap();
-        assert_eq_golden(&entries, "blame_incremental_not_committed");
-    }
-
-    #[test]
-    fn test_parse_git_blame_simple() {
-        let output = read_test_data("blame_incremental_simple");
-        let entries = parse_git_blame(&output).unwrap();
-        assert_eq_golden(&entries, "blame_incremental_simple");
-    }
-
-    #[test]
-    fn test_parse_git_blame_complex() {
-        let output = read_test_data("blame_incremental_complex");
-        let entries = parse_git_blame(&output).unwrap();
-        assert_eq_golden(&entries, "blame_incremental_complex");
-    }
-}
diff --git a/crates/agent/src/edit_agent/evals/fixtures/disable_cursor_blinking/before.rs b/crates/agent/src/edit_agent/evals/fixtures/disable_cursor_blinking/before.rs
deleted file mode 100644
index 607daa8ce3..0000000000
--- a/crates/agent/src/edit_agent/evals/fixtures/disable_cursor_blinking/before.rs
+++ /dev/null
@@ -1,21343 +0,0 @@
-#![allow(rustdoc::private_intra_doc_links)]
-//! This is the place where everything editor-related is stored (data-wise) and displayed (ui-wise).
-//! The main point of interest in this crate is [`Editor`] type, which is used in every other Zed part as a user input element.
-//! It comes in different flavors: single line, multiline and a fixed height one.
-//!
-//! Editor contains of multiple large submodules:
-//! * [`element`] — the place where all rendering happens
-//! * [`display_map`] - chunks up text in the editor into the logical blocks, establishes coordinates and mapping between each of them.
-//!   Contains all metadata related to text transformations (folds, fake inlay text insertions, soft wraps, tab markup, etc.).
-//! * [`inlay_hint_cache`] - is a storage of inlay hints out of LSP requests, responsible for querying LSP and updating `display_map`'s state accordingly.
-//!
-//! All other submodules and structs are mostly concerned with holding editor data about the way it displays current buffer region(s).
-//!
-//! If you're looking to improve Vim mode, you should check out Vim crate that wraps Editor and overrides its behavior.
-pub mod actions;
-mod blink_manager;
-mod clangd_ext;
-mod code_context_menus;
-pub mod display_map;
-mod editor_settings;
-mod editor_settings_controls;
-mod element;
-mod git;
-mod highlight_matching_bracket;
-mod hover_links;
-pub mod hover_popover;
-mod indent_guides;
-mod inlay_hint_cache;
-pub mod items;
-mod jsx_tag_auto_close;
-mod linked_editing_ranges;
-mod lsp_ext;
-mod mouse_context_menu;
-pub mod movement;
-mod persistence;
-mod proposed_changes_editor;
-mod rust_analyzer_ext;
-pub mod scroll;
-mod selections_collection;
-pub mod tasks;
-
-#[cfg(test)]
-mod code_completion_tests;
-#[cfg(test)]
-mod editor_tests;
-#[cfg(test)]
-mod inline_completion_tests;
-mod signature_help;
-#[cfg(any(test, feature = "test-support"))]
-pub mod test;
-
-pub(crate) use actions::*;
-pub use actions::{AcceptEditPrediction, OpenExcerpts, OpenExcerptsSplit};
-use aho_corasick::AhoCorasick;
-use anyhow::{Context as _, Result, anyhow};
-use blink_manager::BlinkManager;
-use buffer_diff::DiffHunkStatus;
-use client::{Collaborator, ParticipantIndex};
-use clock::ReplicaId;
-use collections::{BTreeMap, HashMap, HashSet, VecDeque};
-use convert_case::{Case, Casing};
-use display_map::*;
-pub use display_map::{ChunkRenderer, ChunkRendererContext, DisplayPoint, FoldPlaceholder};
-use editor_settings::GoToDefinitionFallback;
-pub use editor_settings::{
-    CurrentLineHighlight, EditorSettings, HideMouseMode, ScrollBeyondLastLine, SearchSettings,
-    ShowScrollbar,
-};
-pub use editor_settings_controls::*;
-use element::{AcceptEditPredictionBinding, LineWithInvisibles, PositionMap, layout_line};
-pub use element::{
-    CursorLayout, EditorElement, HighlightedRange, HighlightedRangeLine, PointForPosition,
-};
-use feature_flags::{DebuggerFeatureFlag, FeatureFlagAppExt};
-use futures::{
-    FutureExt,
-    future::{self, Shared, join},
-};
-use fuzzy::StringMatchCandidate;
-
-use ::git::blame::BlameEntry;
-use ::git::{Restore, blame::ParsedCommitMessage};
-use code_context_menus::{
-    AvailableCodeAction, CodeActionContents, CodeActionsItem, CodeActionsMenu, CodeContextMenu,
-    CompletionsMenu, ContextMenuOrigin,
-};
-use git::blame::{GitBlame, GlobalBlameRenderer};
-use gpui::{
-    Action, Animation, AnimationExt, AnyElement, App, AppContext, AsyncWindowContext,
-    AvailableSpace, Background, Bounds, ClickEvent, ClipboardEntry, ClipboardItem, Context,
-    DispatchPhase, Edges, Entity, EntityInputHandler, EventEmitter, FocusHandle, FocusOutEvent,
-    Focusable, FontId, FontWeight, Global, HighlightStyle, Hsla, KeyContext, Modifiers,
-    MouseButton, MouseDownEvent, PaintQuad, ParentElement, Pixels, Render, ScrollHandle,
-    SharedString, Size, Stateful, Styled, Subscription, Task, TextStyle, TextStyleRefinement,
-    UTF16Selection, UnderlineStyle, UniformListScrollHandle, WeakEntity, WeakFocusHandle, Window,
-    div, impl_actions, point, prelude::*, pulsating_between, px, relative, size,
-};
-use highlight_matching_bracket::refresh_matching_bracket_highlights;
-use hover_links::{HoverLink, HoveredLinkState, InlayHighlight, find_file};
-pub use hover_popover::hover_markdown_style;
-use hover_popover::{HoverState, hide_hover};
-use indent_guides::ActiveIndentGuidesState;
-use inlay_hint_cache::{InlayHintCache, InlaySplice, InvalidationStrategy};
-pub use inline_completion::Direction;
-use inline_completion::{EditPredictionProvider, InlineCompletionProviderHandle};
-pub use items::MAX_TAB_TITLE_LEN;
-use itertools::Itertools;
-use language::{
-    AutoindentMode, BracketMatch, BracketPair, Buffer, Capability, CharKind, CodeLabel,
-    CursorShape, DiagnosticEntry, DiffOptions, EditPredictionsMode, EditPreview, HighlightedText,
-    IndentKind, IndentSize, Language, OffsetRangeExt, Point, Selection, SelectionGoal, TextObject,
-    TransactionId, TreeSitterOptions, WordsQuery,
-    language_settings::{
-        self, InlayHintSettings, LspInsertMode, RewrapBehavior, WordsCompletionMode,
-        all_language_settings, language_settings,
-    },
-    point_from_lsp, text_diff_with_options,
-};
-use language::{BufferRow, CharClassifier, Runnable, RunnableRange, point_to_lsp};
-use linked_editing_ranges::refresh_linked_ranges;
-use markdown::Markdown;
-use mouse_context_menu::MouseContextMenu;
-use persistence::DB;
-use project::{
-    ProjectPath,
-    debugger::{
-        breakpoint_store::{
-            BreakpointEditAction, BreakpointState, BreakpointStore, BreakpointStoreEvent,
-        },
-        session::{Session, SessionEvent},
-    },
-};
-
-pub use git::blame::BlameRenderer;
-pub use proposed_changes_editor::{
-    ProposedChangeLocation, ProposedChangesEditor, ProposedChangesEditorToolbar,
-};
-use smallvec::smallvec;
-use std::{cell::OnceCell, iter::Peekable};
-use task::{ResolvedTask, RunnableTag, TaskTemplate, TaskVariables};
-
-pub use lsp::CompletionContext;
-use lsp::{
-    CodeActionKind, CompletionItemKind, CompletionTriggerKind, DiagnosticSeverity,
-    InsertTextFormat, InsertTextMode, LanguageServerId, LanguageServerName,
-};
-
-use language::BufferSnapshot;
-pub use lsp_ext::lsp_tasks;
-use movement::TextLayoutDetails;
-pub use multi_buffer::{
-    Anchor, AnchorRangeExt, ExcerptId, ExcerptRange, MultiBuffer, MultiBufferSnapshot, PathKey,
-    RowInfo, ToOffset, ToPoint,
-};
-use multi_buffer::{
-    ExcerptInfo, ExpandExcerptDirection, MultiBufferDiffHunk, MultiBufferPoint, MultiBufferRow,
-    MultiOrSingleBufferOffsetRange, ToOffsetUtf16,
-};
-use parking_lot::Mutex;
-use project::{
-    CodeAction, Completion, CompletionIntent, CompletionSource, DocumentHighlight, InlayHint,
-    Location, LocationLink, PrepareRenameResponse, Project, ProjectItem, ProjectTransaction,
-    TaskSourceKind,
-    debugger::breakpoint_store::Breakpoint,
-    lsp_store::{CompletionDocumentation, FormatTrigger, LspFormatTarget, OpenLspBufferHandle},
-    project_settings::{GitGutterSetting, ProjectSettings},
-};
-use rand::prelude::*;
-use rpc::{ErrorExt, proto::*};
-use scroll::{Autoscroll, OngoingScroll, ScrollAnchor, ScrollManager, ScrollbarAutoHide};
-use selections_collection::{
-    MutableSelectionsCollection, SelectionsCollection, resolve_selections,
-};
-use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsLocation, SettingsStore, update_settings_file};
-use smallvec::SmallVec;
-use snippet::Snippet;
-use std::sync::Arc;
-use std::{
-    any::TypeId,
-    borrow::Cow,
-    cell::RefCell,
-    cmp::{self, Ordering, Reverse},
-    mem,
-    num::NonZeroU32,
-    ops::{ControlFlow, Deref, DerefMut, Not as _, Range, RangeInclusive},
-    path::{Path, PathBuf},
-    rc::Rc,
-    time::{Duration, Instant},
-};
-pub use sum_tree::Bias;
-use sum_tree::TreeMap;
-use text::{BufferId, FromAnchor, OffsetUtf16, Rope};
-use theme::{
-    ActiveTheme, PlayerColor, StatusColors, SyntaxTheme, ThemeColors, ThemeSettings,
-    observe_buffer_font_size_adjustment,
-};
-use ui::{
-    ButtonSize, ButtonStyle, ContextMenu, Disclosure, IconButton, IconButtonShape, IconName,
-    IconSize, Key, Tooltip, h_flex, prelude::*,
-};
-use util::{RangeExt, ResultExt, TryFutureExt, maybe, post_inc};
-use workspace::{
-    Item as WorkspaceItem, ItemId, ItemNavHistory, OpenInTerminal, OpenTerminal,
-    RestoreOnStartupBehavior, SERIALIZATION_THROTTLE_TIME, SplitDirection, TabBarSettings, Toast,
-    ViewId, Workspace, WorkspaceId, WorkspaceSettings,
-    item::{ItemHandle, PreviewTabsSettings},
-    notifications::{DetachAndPromptErr, NotificationId, NotifyTaskExt},
-    searchable::SearchEvent,
-};
-
-use crate::hover_links::{find_url, find_url_from_range};
-use crate::signature_help::{SignatureHelpHiddenBy, SignatureHelpState};
-
-pub const FILE_HEADER_HEIGHT: u32 = 2;
-pub const MULTI_BUFFER_EXCERPT_HEADER_HEIGHT: u32 = 1;
-pub const DEFAULT_MULTIBUFFER_CONTEXT: u32 = 2;
-const CURSOR_BLINK_INTERVAL: Duration = Duration::from_millis(500);
-const MAX_LINE_LEN: usize = 1024;
-const MIN_NAVIGATION_HISTORY_ROW_DELTA: i64 = 10;
-const MAX_SELECTION_HISTORY_LEN: usize = 1024;
-pub(crate) const CURSORS_VISIBLE_FOR: Duration = Duration::from_millis(2000);
-#[doc(hidden)]
-pub const CODE_ACTIONS_DEBOUNCE_TIMEOUT: Duration = Duration::from_millis(250);
-const SELECTION_HIGHLIGHT_DEBOUNCE_TIMEOUT: Duration = Duration::from_millis(100);
-
-pub(crate) const CODE_ACTION_TIMEOUT: Duration = Duration::from_secs(5);
-pub(crate) const FORMAT_TIMEOUT: Duration = Duration::from_secs(5);
-pub(crate) const SCROLL_CENTER_TOP_BOTTOM_DEBOUNCE_TIMEOUT: Duration = Duration::from_secs(1);
-
-pub(crate) const EDIT_PREDICTION_KEY_CONTEXT: &str = "edit_prediction";
-pub(crate) const EDIT_PREDICTION_CONFLICT_KEY_CONTEXT: &str = "edit_prediction_conflict";
-pub(crate) const MIN_LINE_NUMBER_DIGITS: u32 = 4;
-
-pub type RenderDiffHunkControlsFn = Arc<
-    dyn Fn(
-        u32,
-        &DiffHunkStatus,
-        Range<Anchor>,
-        bool,
-        Pixels,
-        &Entity<Editor>,
-        &mut Window,
-        &mut App,
-    ) -> AnyElement,
->;
-
-const COLUMNAR_SELECTION_MODIFIERS: Modifiers = Modifiers {
-    alt: true,
-    shift: true,
-    control: false,
-    platform: false,
-    function: false,
-};
-
-struct InlineValueCache {
-    enabled: bool,
-    inlays: Vec<InlayId>,
-    refresh_task: Task<Option<()>>,
-}
-
-impl InlineValueCache {
-    fn new(enabled: bool) -> Self {
-        Self {
-            enabled,
-            inlays: Vec::new(),
-            refresh_task: Task::ready(None),
-        }
-    }
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub enum InlayId {
-    InlineCompletion(usize),
-    Hint(usize),
-    DebuggerValue(usize),
-}
-
-impl InlayId {
-    fn id(&self) -> usize {
-        match self {
-            Self::InlineCompletion(id) => *id,
-            Self::Hint(id) => *id,
-            Self::DebuggerValue(id) => *id,
-        }
-    }
-}
-
-pub enum ActiveDebugLine {}
-enum DocumentHighlightRead {}
-enum DocumentHighlightWrite {}
-enum InputComposition {}
-enum SelectedTextHighlight {}
-
-pub enum ConflictsOuter {}
-pub enum ConflictsOurs {}
-pub enum ConflictsTheirs {}
-pub enum ConflictsOursMarker {}
-pub enum ConflictsTheirsMarker {}
-
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
-pub enum Navigated {
-    Yes,
-    No,
-}
-
-impl Navigated {
-    pub fn from_bool(yes: bool) -> Navigated {
-        if yes { Navigated::Yes } else { Navigated::No }
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-enum DisplayDiffHunk {
-    Folded {
-        display_row: DisplayRow,
-    },
-    Unfolded {
-        is_created_file: bool,
-        diff_base_byte_range: Range<usize>,
-        display_row_range: Range<DisplayRow>,
-        multi_buffer_range: Range<Anchor>,
-        status: DiffHunkStatus,
-    },
-}
-
-pub enum HideMouseCursorOrigin {
-    TypingAction,
-    MovementAction,
-}
-
-pub fn init_settings(cx: &mut App) {
-    EditorSettings::register(cx);
-}
-
-pub fn init(cx: &mut App) {
-    init_settings(cx);
-
-    cx.set_global(GlobalBlameRenderer(Arc::new(())));
-
-    workspace::register_project_item::<Editor>(cx);
-    workspace::FollowableViewRegistry::register::<Editor>(cx);
-    workspace::register_serializable_item::<Editor>(cx);
-
-    cx.observe_new(
-        |workspace: &mut Workspace, _: Option<&mut Window>, _cx: &mut Context<Workspace>| {
-            workspace.register_action(Editor::new_file);
-            workspace.register_action(Editor::new_file_vertical);
-            workspace.register_action(Editor::new_file_horizontal);
-            workspace.register_action(Editor::cancel_language_server_work);
-        },
-    )
-    .detach();
-
-    cx.on_action(move |_: &workspace::NewFile, cx| {
-        let app_state = workspace::AppState::global(cx);
-        if let Some(app_state) = app_state.upgrade() {
-            workspace::open_new(
-                Default::default(),
-                app_state,
-                cx,
-                |workspace, window, cx| {
-                    Editor::new_file(workspace, &Default::default(), window, cx)
-                },
-            )
-            .detach();
-        }
-    });
-    cx.on_action(move |_: &workspace::NewWindow, cx| {
-        let app_state = workspace::AppState::global(cx);
-        if let Some(app_state) = app_state.upgrade() {
-            workspace::open_new(
-                Default::default(),
-                app_state,
-                cx,
-                |workspace, window, cx| {
-                    cx.activate(true);
-                    Editor::new_file(workspace, &Default::default(), window, cx)
-                },
-            )
-            .detach();
-        }
-    });
-}
-
-pub fn set_blame_renderer(renderer: impl BlameRenderer + 'static, cx: &mut App) {
-    cx.set_global(GlobalBlameRenderer(Arc::new(renderer)));
-}
-
-pub trait DiagnosticRenderer {
-    fn render_group(
-        &self,
-        diagnostic_group: Vec<DiagnosticEntry<Point>>,
-        buffer_id: BufferId,
-        snapshot: EditorSnapshot,
-        editor: WeakEntity<Editor>,
-        cx: &mut App,
-    ) -> Vec<BlockProperties<Anchor>>;
-
-    fn render_hover(
-        &self,
-        diagnostic_group: Vec<DiagnosticEntry<Point>>,
-        range: Range<Point>,
-        buffer_id: BufferId,
-        cx: &mut App,
-    ) -> Option<Entity<markdown::Markdown>>;
-
-    fn open_link(
-        &self,
-        editor: &mut Editor,
-        link: SharedString,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    );
-}
-
-pub(crate) struct GlobalDiagnosticRenderer(pub Arc<dyn DiagnosticRenderer>);
-
-impl GlobalDiagnosticRenderer {
-    fn global(cx: &App) -> Option<Arc<dyn DiagnosticRenderer>> {
-        cx.try_global::<Self>().map(|g| g.0.clone())
-    }
-}
-
-impl gpui::Global for GlobalDiagnosticRenderer {}
-pub fn set_diagnostic_renderer(renderer: impl DiagnosticRenderer + 'static, cx: &mut App) {
-    cx.set_global(GlobalDiagnosticRenderer(Arc::new(renderer)));
-}
-
-pub struct SearchWithinRange;
-
-trait InvalidationRegion {
-    fn ranges(&self) -> &[Range<Anchor>];
-}
-
-#[derive(Clone, Debug, PartialEq)]
-pub enum SelectPhase {
-    Begin {
-        position: DisplayPoint,
-        add: bool,
-        click_count: usize,
-    },
-    BeginColumnar {
-        position: DisplayPoint,
-        reset: bool,
-        goal_column: u32,
-    },
-    Extend {
-        position: DisplayPoint,
-        click_count: usize,
-    },
-    Update {
-        position: DisplayPoint,
-        goal_column: u32,
-        scroll_delta: gpui::Point<f32>,
-    },
-    End,
-}
-
-#[derive(Clone, Debug)]
-pub enum SelectMode {
-    Character,
-    Word(Range<Anchor>),
-    Line(Range<Anchor>),
-    All,
-}
-
-#[derive(Copy, Clone, PartialEq, Eq, Debug)]
-pub enum EditorMode {
-    SingleLine {
-        auto_width: bool,
-    },
-    AutoHeight {
-        max_lines: usize,
-    },
-    Full {
-        /// When set to `true`, the editor will scale its UI elements with the buffer font size.
-        scale_ui_elements_with_buffer_font_size: bool,
-        /// When set to `true`, the editor will render a background for the active line.
-        show_active_line_background: bool,
-        /// When set to `true`, the editor's height will be determined by its content.
-        sized_by_content: bool,
-    },
-}
-
-impl EditorMode {
-    pub fn full() -> Self {
-        Self::Full {
-            scale_ui_elements_with_buffer_font_size: true,
-            show_active_line_background: true,
-            sized_by_content: false,
-        }
-    }
-
-    pub fn is_full(&self) -> bool {
-        matches!(self, Self::Full { .. })
-    }
-}
-
-#[derive(Copy, Clone, Debug)]
-pub enum SoftWrap {
-    /// Prefer not to wrap at all.
-    ///
-    /// Note: this is currently internal, as actually limited by [`crate::MAX_LINE_LEN`] until it wraps.
-    /// The mode is used inside git diff hunks, where it's seems currently more useful to not wrap as much as possible.
-    GitDiff,
-    /// Prefer a single line generally, unless an overly long line is encountered.
-    None,
-    /// Soft wrap lines that exceed the editor width.
-    EditorWidth,
-    /// Soft wrap lines at the preferred line length.
-    Column(u32),
-    /// Soft wrap line at the preferred line length or the editor width (whichever is smaller).
-    Bounded(u32),
-}
-
-#[derive(Clone)]
-pub struct EditorStyle {
-    pub background: Hsla,
-    pub local_player: PlayerColor,
-    pub text: TextStyle,
-    pub scrollbar_width: Pixels,
-    pub syntax: Arc<SyntaxTheme>,
-    pub status: StatusColors,
-    pub inlay_hints_style: HighlightStyle,
-    pub inline_completion_styles: InlineCompletionStyles,
-    pub unnecessary_code_fade: f32,
-}
-
-impl Default for EditorStyle {
-    fn default() -> Self {
-        Self {
-            background: Hsla::default(),
-            local_player: PlayerColor::default(),
-            text: TextStyle::default(),
-            scrollbar_width: Pixels::default(),
-            syntax: Default::default(),
-            // HACK: Status colors don't have a real default.
-            // We should look into removing the status colors from the editor
-            // style and retrieve them directly from the theme.
-            status: StatusColors::dark(),
-            inlay_hints_style: HighlightStyle::default(),
-            inline_completion_styles: InlineCompletionStyles {
-                insertion: HighlightStyle::default(),
-                whitespace: HighlightStyle::default(),
-            },
-            unnecessary_code_fade: Default::default(),
-        }
-    }
-}
-
-pub fn make_inlay_hints_style(cx: &mut App) -> HighlightStyle {
-    let show_background = language_settings::language_settings(None, None, cx)
-        .inlay_hints
-        .show_background;
-
-    HighlightStyle {
-        color: Some(cx.theme().status().hint),
-        background_color: show_background.then(|| cx.theme().status().hint_background),
-        ..HighlightStyle::default()
-    }
-}
-
-pub fn make_suggestion_styles(cx: &mut App) -> InlineCompletionStyles {
-    InlineCompletionStyles {
-        insertion: HighlightStyle {
-            color: Some(cx.theme().status().predictive),
-            ..HighlightStyle::default()
-        },
-        whitespace: HighlightStyle {
-            background_color: Some(cx.theme().status().created_background),
-            ..HighlightStyle::default()
-        },
-    }
-}
-
-type CompletionId = usize;
-
-pub(crate) enum EditDisplayMode {
-    TabAccept,
-    DiffPopover,
-    Inline,
-}
-
-enum InlineCompletion {
-    Edit {
-        edits: Vec<(Range<Anchor>, String)>,
-        edit_preview: Option<EditPreview>,
-        display_mode: EditDisplayMode,
-        snapshot: BufferSnapshot,
-    },
-    Move {
-        target: Anchor,
-        snapshot: BufferSnapshot,
-    },
-}
-
-struct InlineCompletionState {
-    inlay_ids: Vec<InlayId>,
-    completion: InlineCompletion,
-    completion_id: Option<SharedString>,
-    invalidation_range: Range<Anchor>,
-}
-
-enum EditPredictionSettings {
-    Disabled,
-    Enabled {
-        show_in_menu: bool,
-        preview_requires_modifier: bool,
-    },
-}
-
-enum InlineCompletionHighlight {}
-
-#[derive(Debug, Clone)]
-struct InlineDiagnostic {
-    message: SharedString,
-    group_id: usize,
-    is_primary: bool,
-    start: Point,
-    severity: DiagnosticSeverity,
-}
-
-pub enum MenuInlineCompletionsPolicy {
-    Never,
-    ByProvider,
-}
-
-pub enum EditPredictionPreview {
-    /// Modifier is not pressed
-    Inactive { released_too_fast: bool },
-    /// Modifier pressed
-    Active {
-        since: Instant,
-        previous_scroll_position: Option<ScrollAnchor>,
-    },
-}
-
-impl EditPredictionPreview {
-    pub fn released_too_fast(&self) -> bool {
-        match self {
-            EditPredictionPreview::Inactive { released_too_fast } => *released_too_fast,
-            EditPredictionPreview::Active { .. } => false,
-        }
-    }
-
-    pub fn set_previous_scroll_position(&mut self, scroll_position: Option<ScrollAnchor>) {
-        if let EditPredictionPreview::Active {
-            previous_scroll_position,
-            ..
-        } = self
-        {
-            *previous_scroll_position = scroll_position;
-        }
-    }
-}
-
-pub struct ContextMenuOptions {
-    pub min_entries_visible: usize,
-    pub max_entries_visible: usize,
-    pub placement: Option<ContextMenuPlacement>,
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum ContextMenuPlacement {
-    Above,
-    Below,
-}
-
-#[derive(Copy, Clone, Eq, PartialEq, PartialOrd, Ord, Debug, Default)]
-struct EditorActionId(usize);
-
-impl EditorActionId {
-    pub fn post_inc(&mut self) -> Self {
-        let answer = self.0;
-
-        *self = Self(answer + 1);
-
-        Self(answer)
-    }
-}
-
-// type GetFieldEditorTheme = dyn Fn(&theme::Theme) -> theme::FieldEditor;
-// type OverrideTextStyle = dyn Fn(&EditorStyle) -> Option<HighlightStyle>;
-
-type BackgroundHighlight = (fn(&ThemeColors) -> Hsla, Arc<[Range<Anchor>]>);
-type GutterHighlight = (fn(&App) -> Hsla, Arc<[Range<Anchor>]>);
-
-#[derive(Default)]
-struct ScrollbarMarkerState {
-    scrollbar_size: Size<Pixels>,
-    dirty: bool,
-    markers: Arc<[PaintQuad]>,
-    pending_refresh: Option<Task<Result<()>>>,
-}
-
-impl ScrollbarMarkerState {
-    fn should_refresh(&self, scrollbar_size: Size<Pixels>) -> bool {
-        self.pending_refresh.is_none() && (self.scrollbar_size != scrollbar_size || self.dirty)
-    }
-}
-
-#[derive(Clone, Debug)]
-struct RunnableTasks {
-    templates: Vec<(TaskSourceKind, TaskTemplate)>,
-    offset: multi_buffer::Anchor,
-    // We need the column at which the task context evaluation should take place (when we're spawning it via gutter).
-    column: u32,
-    // Values of all named captures, including those starting with '_'
-    extra_variables: HashMap<String, String>,
-    // Full range of the tagged region. We use it to determine which `extra_variables` to grab for context resolution in e.g. a modal.
-    context_range: Range<BufferOffset>,
-}
-
-impl RunnableTasks {
-    fn resolve<'a>(
-        &'a self,
-        cx: &'a task::TaskContext,
-    ) -> impl Iterator<Item = (TaskSourceKind, ResolvedTask)> + 'a {
-        self.templates.iter().filter_map(|(kind, template)| {
-            template
-                .resolve_task(&kind.to_id_base(), cx)
-                .map(|task| (kind.clone(), task))
-        })
-    }
-}
-
-#[derive(Clone)]
-struct ResolvedTasks {
-    templates: SmallVec<[(TaskSourceKind, ResolvedTask); 1]>,
-    position: Anchor,
-}
-
-#[derive(Copy, Clone, Debug, PartialEq, PartialOrd)]
-struct BufferOffset(usize);
-
-// Addons allow storing per-editor state in other crates (e.g. Vim)
-pub trait Addon: 'static {
-    fn extend_key_context(&self, _: &mut KeyContext, _: &App) {}
-
-    fn render_buffer_header_controls(
-        &self,
-        _: &ExcerptInfo,
-        _: &Window,
-        _: &App,
-    ) -> Option<AnyElement> {
-        None
-    }
-
-    fn to_any(&self) -> &dyn std::any::Any;
-
-    fn to_any_mut(&mut self) -> Option<&mut dyn std::any::Any> {
-        None
-    }
-}
-
-/// A set of caret positions, registered when the editor was edited.
-pub struct ChangeList {
-    changes: Vec<Vec<Anchor>>,
-    /// Currently "selected" change.
-    position: Option<usize>,
-}
-
-impl ChangeList {
-    pub fn new() -> Self {
-        Self {
-            changes: Vec::new(),
-            position: None,
-        }
-    }
-
-    /// Moves to the next change in the list (based on the direction given) and returns the caret positions for the next change.
-    /// If reaches the end of the list in the direction, returns the corresponding change until called for a different direction.
-    pub fn next_change(&mut self, count: usize, direction: Direction) -> Option<&[Anchor]> {
-        if self.changes.is_empty() {
-            return None;
-        }
-
-        let prev = self.position.unwrap_or(self.changes.len());
-        let next = if direction == Direction::Prev {
-            prev.saturating_sub(count)
-        } else {
-            (prev + count).min(self.changes.len() - 1)
-        };
-        self.position = Some(next);
-        self.changes.get(next).map(|anchors| anchors.as_slice())
-    }
-
-    /// Adds a new change to the list, resetting the change list position.
-    pub fn push_to_change_list(&mut self, pop_state: bool, new_positions: Vec<Anchor>) {
-        self.position.take();
-        if pop_state {
-            self.changes.pop();
-        }
-        self.changes.push(new_positions.clone());
-    }
-
-    pub fn last(&self) -> Option<&[Anchor]> {
-        self.changes.last().map(|anchors| anchors.as_slice())
-    }
-}
-
-#[derive(Clone)]
-struct InlineBlamePopoverState {
-    scroll_handle: ScrollHandle,
-    commit_message: Option<ParsedCommitMessage>,
-    markdown: Entity<Markdown>,
-}
-
-struct InlineBlamePopover {
-    position: gpui::Point<Pixels>,
-    show_task: Option<Task<()>>,
-    hide_task: Option<Task<()>>,
-    popover_bounds: Option<Bounds<Pixels>>,
-    popover_state: InlineBlamePopoverState,
-}
-
-/// Represents a breakpoint indicator that shows up when hovering over lines in the gutter that don't have
-/// a breakpoint on them.
-#[derive(Clone, Copy, Debug)]
-struct PhantomBreakpointIndicator {
-    display_row: DisplayRow,
-    /// There's a small debounce between hovering over the line and showing the indicator.
-    /// We don't want to show the indicator when moving the mouse from editor to e.g. project panel.
-    is_active: bool,
-    collides_with_existing_breakpoint: bool,
-}
-/// Zed's primary implementation of text input, allowing users to edit a [`MultiBuffer`].
-///
-/// See the [module level documentation](self) for more information.
-pub struct Editor {
-    focus_handle: FocusHandle,
-    last_focused_descendant: Option<WeakFocusHandle>,
-    /// The text buffer being edited
-    buffer: Entity<MultiBuffer>,
-    /// Map of how text in the buffer should be displayed.
-    /// Handles soft wraps, folds, fake inlay text insertions, etc.
-    pub display_map: Entity<DisplayMap>,
-    pub selections: SelectionsCollection,
-    pub scroll_manager: ScrollManager,
-    /// When inline assist editors are linked, they all render cursors because
-    /// typing enters text into each of them, even the ones that aren't focused.
-    pub(crate) show_cursor_when_unfocused: bool,
-    columnar_selection_tail: Option<Anchor>,
-    add_selections_state: Option<AddSelectionsState>,
-    select_next_state: Option<SelectNextState>,
-    select_prev_state: Option<SelectNextState>,
-    selection_history: SelectionHistory,
-    autoclose_regions: Vec<AutocloseRegion>,
-    snippet_stack: InvalidationStack<SnippetState>,
-    select_syntax_node_history: SelectSyntaxNodeHistory,
-    ime_transaction: Option<TransactionId>,
-    active_diagnostics: ActiveDiagnostic,
-    show_inline_diagnostics: bool,
-    inline_diagnostics_update: Task<()>,
-    inline_diagnostics_enabled: bool,
-    inline_diagnostics: Vec<(Anchor, InlineDiagnostic)>,
-    soft_wrap_mode_override: Option<language_settings::SoftWrap>,
-    hard_wrap: Option<usize>,
-
-    // TODO: make this a access method
-    pub project: Option<Entity<Project>>,
-    semantics_provider: Option<Rc<dyn SemanticsProvider>>,
-    completion_provider: Option<Box<dyn CompletionProvider>>,
-    collaboration_hub: Option<Box<dyn CollaborationHub>>,
-    blink_manager: Entity<BlinkManager>,
-    show_cursor_names: bool,
-    hovered_cursors: HashMap<HoveredCursor, Task<()>>,
-    pub show_local_selections: bool,
-    mode: EditorMode,
-    show_breadcrumbs: bool,
-    show_gutter: bool,
-    show_scrollbars: bool,
-    disable_scrolling: bool,
-    disable_expand_excerpt_buttons: bool,
-    show_line_numbers: Option<bool>,
-    use_relative_line_numbers: Option<bool>,
-    show_git_diff_gutter: Option<bool>,
-    show_code_actions: Option<bool>,
-    show_runnables: Option<bool>,
-    show_breakpoints: Option<bool>,
-    show_wrap_guides: Option<bool>,
-    show_indent_guides: Option<bool>,
-    placeholder_text: Option<Arc<str>>,
-    highlight_order: usize,
-    highlighted_rows: HashMap<TypeId, Vec<RowHighlight>>,
-    background_highlights: TreeMap<TypeId, BackgroundHighlight>,
-    gutter_highlights: TreeMap<TypeId, GutterHighlight>,
-    scrollbar_marker_state: ScrollbarMarkerState,
-    active_indent_guides_state: ActiveIndentGuidesState,
-    nav_history: Option<ItemNavHistory>,
-    context_menu: RefCell<Option<CodeContextMenu>>,
-    context_menu_options: Option<ContextMenuOptions>,
-    mouse_context_menu: Option<MouseContextMenu>,
-    completion_tasks: Vec<(CompletionId, Task<Option<()>>)>,
-    inline_blame_popover: Option<InlineBlamePopover>,
-    signature_help_state: SignatureHelpState,
-    auto_signature_help: Option<bool>,
-    find_all_references_task_sources: Vec<Anchor>,
-    next_completion_id: CompletionId,
-    available_code_actions: Option<(Location, Rc<[AvailableCodeAction]>)>,
-    code_actions_task: Option<Task<Result<()>>>,
-    quick_selection_highlight_task: Option<(Range<Anchor>, Task<()>)>,
-    debounced_selection_highlight_task: Option<(Range<Anchor>, Task<()>)>,
-    document_highlights_task: Option<Task<()>>,
-    linked_editing_range_task: Option<Task<Option<()>>>,
-    linked_edit_ranges: linked_editing_ranges::LinkedEditingRanges,
-    pending_rename: Option<RenameState>,
-    searchable: bool,
-    cursor_shape: CursorShape,
-    current_line_highlight: Option<CurrentLineHighlight>,
-    collapse_matches: bool,
-    autoindent_mode: Option<AutoindentMode>,
-    workspace: Option<(WeakEntity<Workspace>, Option<WorkspaceId>)>,
-    input_enabled: bool,
-    use_modal_editing: bool,
-    read_only: bool,
-    leader_peer_id: Option<PeerId>,
-    remote_id: Option<ViewId>,
-    pub hover_state: HoverState,
-    pending_mouse_down: Option<Rc<RefCell<Option<MouseDownEvent>>>>,
-    gutter_hovered: bool,
-    hovered_link_state: Option<HoveredLinkState>,
-    edit_prediction_provider: Option<RegisteredInlineCompletionProvider>,
-    code_action_providers: Vec<Rc<dyn CodeActionProvider>>,
-    active_inline_completion: Option<InlineCompletionState>,
-    /// Used to prevent flickering as the user types while the menu is open
-    stale_inline_completion_in_menu: Option<InlineCompletionState>,
-    edit_prediction_settings: EditPredictionSettings,
-    inline_completions_hidden_for_vim_mode: bool,
-    show_inline_completions_override: Option<bool>,
-    menu_inline_completions_policy: MenuInlineCompletionsPolicy,
-    edit_prediction_preview: EditPredictionPreview,
-    edit_prediction_indent_conflict: bool,
-    edit_prediction_requires_modifier_in_indent_conflict: bool,
-    inlay_hint_cache: InlayHintCache,
-    next_inlay_id: usize,
-    _subscriptions: Vec<Subscription>,
-    pixel_position_of_newest_cursor: Option<gpui::Point<Pixels>>,
-    gutter_dimensions: GutterDimensions,
-    style: Option<EditorStyle>,
-    text_style_refinement: Option<TextStyleRefinement>,
-    next_editor_action_id: EditorActionId,
-    editor_actions:
-        Rc<RefCell<BTreeMap<EditorActionId, Box<dyn Fn(&mut Window, &mut Context<Self>)>>>>,
-    use_autoclose: bool,
-    use_auto_surround: bool,
-    auto_replace_emoji_shortcode: bool,
-    jsx_tag_auto_close_enabled_in_any_buffer: bool,
-    show_git_blame_gutter: bool,
-    show_git_blame_inline: bool,
-    show_git_blame_inline_delay_task: Option<Task<()>>,
-    git_blame_inline_enabled: bool,
-    render_diff_hunk_controls: RenderDiffHunkControlsFn,
-    serialize_dirty_buffers: bool,
-    show_selection_menu: Option<bool>,
-    blame: Option<Entity<GitBlame>>,
-    blame_subscription: Option<Subscription>,
-    custom_context_menu: Option<
-        Box<
-            dyn 'static
-                + Fn(
-                    &mut Self,
-                    DisplayPoint,
-                    &mut Window,
-                    &mut Context<Self>,
-                ) -> Option<Entity<ui::ContextMenu>>,
-        >,
-    >,
-    last_bounds: Option<Bounds<Pixels>>,
-    last_position_map: Option<Rc<PositionMap>>,
-    expect_bounds_change: Option<Bounds<Pixels>>,
-    tasks: BTreeMap<(BufferId, BufferRow), RunnableTasks>,
-    tasks_update_task: Option<Task<()>>,
-    breakpoint_store: Option<Entity<BreakpointStore>>,
-    gutter_breakpoint_indicator: (Option<PhantomBreakpointIndicator>, Option<Task<()>>),
-    in_project_search: bool,
-    previous_search_ranges: Option<Arc<[Range<Anchor>]>>,
-    breadcrumb_header: Option<String>,
-    focused_block: Option<FocusedBlock>,
-    next_scroll_position: NextScrollCursorCenterTopBottom,
-    addons: HashMap<TypeId, Box<dyn Addon>>,
-    registered_buffers: HashMap<BufferId, OpenLspBufferHandle>,
-    load_diff_task: Option<Shared<Task<()>>>,
-    selection_mark_mode: bool,
-    toggle_fold_multiple_buffers: Task<()>,
-    _scroll_cursor_center_top_bottom_task: Task<()>,
-    serialize_selections: Task<()>,
-    serialize_folds: Task<()>,
-    mouse_cursor_hidden: bool,
-    hide_mouse_mode: HideMouseMode,
-    pub change_list: ChangeList,
-    inline_value_cache: InlineValueCache,
-}
-
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Default)]
-enum NextScrollCursorCenterTopBottom {
-    #[default]
-    Center,
-    Top,
-    Bottom,
-}
-
-impl NextScrollCursorCenterTopBottom {
-    fn next(&self) -> Self {
-        match self {
-            Self::Center => Self::Top,
-            Self::Top => Self::Bottom,
-            Self::Bottom => Self::Center,
-        }
-    }
-}
-
-#[derive(Clone)]
-pub struct EditorSnapshot {
-    pub mode: EditorMode,
-    show_gutter: bool,
-    show_line_numbers: Option<bool>,
-    show_git_diff_gutter: Option<bool>,
-    show_code_actions: Option<bool>,
-    show_runnables: Option<bool>,
-    show_breakpoints: Option<bool>,
-    git_blame_gutter_max_author_length: Option<usize>,
-    pub display_snapshot: DisplaySnapshot,
-    pub placeholder_text: Option<Arc<str>>,
-    is_focused: bool,
-    scroll_anchor: ScrollAnchor,
-    ongoing_scroll: OngoingScroll,
-    current_line_highlight: CurrentLineHighlight,
-    gutter_hovered: bool,
-}
-
-#[derive(Default, Debug, Clone, Copy)]
-pub struct GutterDimensions {
-    pub left_padding: Pixels,
-    pub right_padding: Pixels,
-    pub width: Pixels,
-    pub margin: Pixels,
-    pub git_blame_entries_width: Option<Pixels>,
-}
-
-impl GutterDimensions {
-    /// The full width of the space taken up by the gutter.
-    pub fn full_width(&self) -> Pixels {
-        self.margin + self.width
-    }
-
-    /// The width of the space reserved for the fold indicators,
-    /// use alongside 'justify_end' and `gutter_width` to
-    /// right align content with the line numbers
-    pub fn fold_area_width(&self) -> Pixels {
-        self.margin + self.right_padding
-    }
-}
-
-#[derive(Debug)]
-pub struct RemoteSelection {
-    pub replica_id: ReplicaId,
-    pub selection: Selection<Anchor>,
-    pub cursor_shape: CursorShape,
-    pub peer_id: PeerId,
-    pub line_mode: bool,
-    pub participant_index: Option<ParticipantIndex>,
-    pub user_name: Option<SharedString>,
-}
-
-#[derive(Clone, Debug)]
-struct SelectionHistoryEntry {
-    selections: Arc<[Selection<Anchor>]>,
-    select_next_state: Option<SelectNextState>,
-    select_prev_state: Option<SelectNextState>,
-    add_selections_state: Option<AddSelectionsState>,
-}
-
-enum SelectionHistoryMode {
-    Normal,
-    Undoing,
-    Redoing,
-}
-
-#[derive(Clone, PartialEq, Eq, Hash)]
-struct HoveredCursor {
-    replica_id: u16,
-    selection_id: usize,
-}
-
-impl Default for SelectionHistoryMode {
-    fn default() -> Self {
-        Self::Normal
-    }
-}
-
-#[derive(Default)]
-struct SelectionHistory {
-    #[allow(clippy::type_complexity)]
-    selections_by_transaction:
-        HashMap<TransactionId, (Arc<[Selection<Anchor>]>, Option<Arc<[Selection<Anchor>]>>)>,
-    mode: SelectionHistoryMode,
-    undo_stack: VecDeque<SelectionHistoryEntry>,
-    redo_stack: VecDeque<SelectionHistoryEntry>,
-}
-
-impl SelectionHistory {
-    fn insert_transaction(
-        &mut self,
-        transaction_id: TransactionId,
-        selections: Arc<[Selection<Anchor>]>,
-    ) {
-        self.selections_by_transaction
-            .insert(transaction_id, (selections, None));
-    }
-
-    #[allow(clippy::type_complexity)]
-    fn transaction(
-        &self,
-        transaction_id: TransactionId,
-    ) -> Option<&(Arc<[Selection<Anchor>]>, Option<Arc<[Selection<Anchor>]>>)> {
-        self.selections_by_transaction.get(&transaction_id)
-    }
-
-    #[allow(clippy::type_complexity)]
-    fn transaction_mut(
-        &mut self,
-        transaction_id: TransactionId,
-    ) -> Option<&mut (Arc<[Selection<Anchor>]>, Option<Arc<[Selection<Anchor>]>>)> {
-        self.selections_by_transaction.get_mut(&transaction_id)
-    }
-
-    fn push(&mut self, entry: SelectionHistoryEntry) {
-        if !entry.selections.is_empty() {
-            match self.mode {
-                SelectionHistoryMode::Normal => {
-                    self.push_undo(entry);
-                    self.redo_stack.clear();
-                }
-                SelectionHistoryMode::Undoing => self.push_redo(entry),
-                SelectionHistoryMode::Redoing => self.push_undo(entry),
-            }
-        }
-    }
-
-    fn push_undo(&mut self, entry: SelectionHistoryEntry) {
-        if self
-            .undo_stack
-            .back()
-            .map_or(true, |e| e.selections != entry.selections)
-        {
-            self.undo_stack.push_back(entry);
-            if self.undo_stack.len() > MAX_SELECTION_HISTORY_LEN {
-                self.undo_stack.pop_front();
-            }
-        }
-    }
-
-    fn push_redo(&mut self, entry: SelectionHistoryEntry) {
-        if self
-            .redo_stack
-            .back()
-            .map_or(true, |e| e.selections != entry.selections)
-        {
-            self.redo_stack.push_back(entry);
-            if self.redo_stack.len() > MAX_SELECTION_HISTORY_LEN {
-                self.redo_stack.pop_front();
-            }
-        }
-    }
-}
-
-#[derive(Clone, Copy)]
-pub struct RowHighlightOptions {
-    pub autoscroll: bool,
-    pub include_gutter: bool,
-}
-
-impl Default for RowHighlightOptions {
-    fn default() -> Self {
-        Self {
-            autoscroll: Default::default(),
-            include_gutter: true,
-        }
-    }
-}
-
-struct RowHighlight {
-    index: usize,
-    range: Range<Anchor>,
-    color: Hsla,
-    options: RowHighlightOptions,
-    type_id: TypeId,
-}
-
-#[derive(Clone, Debug)]
-struct AddSelectionsState {
-    above: bool,
-    stack: Vec<usize>,
-}
-
-#[derive(Clone)]
-struct SelectNextState {
-    query: AhoCorasick,
-    wordwise: bool,
-    done: bool,
-}
-
-impl std::fmt::Debug for SelectNextState {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct(std::any::type_name::<Self>())
-            .field("wordwise", &self.wordwise)
-            .field("done", &self.done)
-            .finish()
-    }
-}
-
-#[derive(Debug)]
-struct AutocloseRegion {
-    selection_id: usize,
-    range: Range<Anchor>,
-    pair: BracketPair,
-}
-
-#[derive(Debug)]
-struct SnippetState {
-    ranges: Vec<Vec<Range<Anchor>>>,
-    active_index: usize,
-    choices: Vec<Option<Vec<String>>>,
-}
-
-#[doc(hidden)]
-pub struct RenameState {
-    pub range: Range<Anchor>,
-    pub old_name: Arc<str>,
-    pub editor: Entity<Editor>,
-    block_id: CustomBlockId,
-}
-
-struct InvalidationStack<T>(Vec<T>);
-
-struct RegisteredInlineCompletionProvider {
-    provider: Arc<dyn InlineCompletionProviderHandle>,
-    _subscription: Subscription,
-}
-
-#[derive(Debug, PartialEq, Eq)]
-pub struct ActiveDiagnosticGroup {
-    pub active_range: Range<Anchor>,
-    pub active_message: String,
-    pub group_id: usize,
-    pub blocks: HashSet<CustomBlockId>,
-}
-
-#[derive(Debug, PartialEq, Eq)]
-
-pub(crate) enum ActiveDiagnostic {
-    None,
-    All,
-    Group(ActiveDiagnosticGroup),
-}
-
-#[derive(Serialize, Deserialize, Clone, Debug)]
-pub struct ClipboardSelection {
-    /// The number of bytes in this selection.
-    pub len: usize,
-    /// Whether this was a full-line selection.
-    pub is_entire_line: bool,
-    /// The indentation of the first line when this content was originally copied.
-    pub first_line_indent: u32,
-}
-
-// selections, scroll behavior, was newest selection reversed
-type SelectSyntaxNodeHistoryState = (
-    Box<[Selection<usize>]>,
-    SelectSyntaxNodeScrollBehavior,
-    bool,
-);
-
-#[derive(Default)]
-struct SelectSyntaxNodeHistory {
-    stack: Vec<SelectSyntaxNodeHistoryState>,
-    // disable temporarily to allow changing selections without losing the stack
-    pub disable_clearing: bool,
-}
-
-impl SelectSyntaxNodeHistory {
-    pub fn try_clear(&mut self) {
-        if !self.disable_clearing {
-            self.stack.clear();
-        }
-    }
-
-    pub fn push(&mut self, selection: SelectSyntaxNodeHistoryState) {
-        self.stack.push(selection);
-    }
-
-    pub fn pop(&mut self) -> Option<SelectSyntaxNodeHistoryState> {
-        self.stack.pop()
-    }
-}
-
-enum SelectSyntaxNodeScrollBehavior {
-    CursorTop,
-    FitSelection,
-    CursorBottom,
-}
-
-#[derive(Debug)]
-pub(crate) struct NavigationData {
-    cursor_anchor: Anchor,
-    cursor_position: Point,
-    scroll_anchor: ScrollAnchor,
-    scroll_top_row: u32,
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum GotoDefinitionKind {
-    Symbol,
-    Declaration,
-    Type,
-    Implementation,
-}
-
-#[derive(Debug, Clone)]
-enum InlayHintRefreshReason {
-    ModifiersChanged(bool),
-    Toggle(bool),
-    SettingsChange(InlayHintSettings),
-    NewLinesShown,
-    BufferEdited(HashSet<Arc<Language>>),
-    RefreshRequested,
-    ExcerptsRemoved(Vec<ExcerptId>),
-}
-
-impl InlayHintRefreshReason {
-    fn description(&self) -> &'static str {
-        match self {
-            Self::ModifiersChanged(_) => "modifiers changed",
-            Self::Toggle(_) => "toggle",
-            Self::SettingsChange(_) => "settings change",
-            Self::NewLinesShown => "new lines shown",
-            Self::BufferEdited(_) => "buffer edited",
-            Self::RefreshRequested => "refresh requested",
-            Self::ExcerptsRemoved(_) => "excerpts removed",
-        }
-    }
-}
-
-pub enum FormatTarget {
-    Buffers,
-    Ranges(Vec<Range<MultiBufferPoint>>),
-}
-
-pub(crate) struct FocusedBlock {
-    id: BlockId,
-    focus_handle: WeakFocusHandle,
-}
-
-#[derive(Clone)]
-enum JumpData {
-    MultiBufferRow {
-        row: MultiBufferRow,
-        line_offset_from_top: u32,
-    },
-    MultiBufferPoint {
-        excerpt_id: ExcerptId,
-        position: Point,
-        anchor: text::Anchor,
-        line_offset_from_top: u32,
-    },
-}
-
-pub enum MultibufferSelectionMode {
-    First,
-    All,
-}
-
-#[derive(Clone, Copy, Debug, Default)]
-pub struct RewrapOptions {
-    pub override_language_settings: bool,
-    pub preserve_existing_whitespace: bool,
-}
-
-impl Editor {
-    pub fn single_line(window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let buffer = cx.new(|cx| Buffer::local("", cx));
-        let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-        Self::new(
-            EditorMode::SingleLine { auto_width: false },
-            buffer,
-            None,
-            window,
-            cx,
-        )
-    }
-
-    pub fn multi_line(window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let buffer = cx.new(|cx| Buffer::local("", cx));
-        let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-        Self::new(EditorMode::full(), buffer, None, window, cx)
-    }
-
-    pub fn auto_width(window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let buffer = cx.new(|cx| Buffer::local("", cx));
-        let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-        Self::new(
-            EditorMode::SingleLine { auto_width: true },
-            buffer,
-            None,
-            window,
-            cx,
-        )
-    }
-
-    pub fn auto_height(max_lines: usize, window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let buffer = cx.new(|cx| Buffer::local("", cx));
-        let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-        Self::new(
-            EditorMode::AutoHeight { max_lines },
-            buffer,
-            None,
-            window,
-            cx,
-        )
-    }
-
-    pub fn for_buffer(
-        buffer: Entity<Buffer>,
-        project: Option<Entity<Project>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-        Self::new(EditorMode::full(), buffer, project, window, cx)
-    }
-
-    pub fn for_multibuffer(
-        buffer: Entity<MultiBuffer>,
-        project: Option<Entity<Project>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        Self::new(EditorMode::full(), buffer, project, window, cx)
-    }
-
-    pub fn clone(&self, window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let mut clone = Self::new(
-            self.mode,
-            self.buffer.clone(),
-            self.project.clone(),
-            window,
-            cx,
-        );
-        self.display_map.update(cx, |display_map, cx| {
-            let snapshot = display_map.snapshot(cx);
-            clone.display_map.update(cx, |display_map, cx| {
-                display_map.set_state(&snapshot, cx);
-            });
-        });
-        clone.folds_did_change(cx);
-        clone.selections.clone_state(&self.selections);
-        clone.scroll_manager.clone_state(&self.scroll_manager);
-        clone.searchable = self.searchable;
-        clone.read_only = self.read_only;
-        clone
-    }
-
-    pub fn new(
-        mode: EditorMode,
-        buffer: Entity<MultiBuffer>,
-        project: Option<Entity<Project>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let style = window.text_style();
-        let font_size = style.font_size.to_pixels(window.rem_size());
-        let editor = cx.entity().downgrade();
-        let fold_placeholder = FoldPlaceholder {
-            constrain_width: true,
-            render: Arc::new(move |fold_id, fold_range, cx| {
-                let editor = editor.clone();
-                div()
-                    .id(fold_id)
-                    .bg(cx.theme().colors().ghost_element_background)
-                    .hover(|style| style.bg(cx.theme().colors().ghost_element_hover))
-                    .active(|style| style.bg(cx.theme().colors().ghost_element_active))
-                    .rounded_xs()
-                    .size_full()
-                    .cursor_pointer()
-                    .child("⋯")
-                    .on_mouse_down(MouseButton::Left, |_, _, cx| cx.stop_propagation())
-                    .on_click(move |_, _window, cx| {
-                        editor
-                            .update(cx, |editor, cx| {
-                                editor.unfold_ranges(
-                                    &[fold_range.start..fold_range.end],
-                                    true,
-                                    false,
-                                    cx,
-                                );
-                                cx.stop_propagation();
-                            })
-                            .ok();
-                    })
-                    .into_any()
-            }),
-            merge_adjacent: true,
-            ..Default::default()
-        };
-        let display_map = cx.new(|cx| {
-            DisplayMap::new(
-                buffer.clone(),
-                style.font(),
-                font_size,
-                None,
-                FILE_HEADER_HEIGHT,
-                MULTI_BUFFER_EXCERPT_HEADER_HEIGHT,
-                fold_placeholder,
-                cx,
-            )
-        });
-
-        let selections = SelectionsCollection::new(display_map.clone(), buffer.clone());
-
-        let blink_manager = cx.new(|cx| BlinkManager::new(CURSOR_BLINK_INTERVAL, cx));
-
-        let soft_wrap_mode_override = matches!(mode, EditorMode::SingleLine { .. })
-            .then(|| language_settings::SoftWrap::None);
-
-        let mut project_subscriptions = Vec::new();
-        if mode.is_full() {
-            if let Some(project) = project.as_ref() {
-                project_subscriptions.push(cx.subscribe_in(
-                    project,
-                    window,
-                    |editor, _, event, window, cx| match event {
-                        project::Event::RefreshCodeLens => {
-                            // we always query lens with actions, without storing them, always refreshing them
-                        }
-                        project::Event::RefreshInlayHints => {
-                            editor
-                                .refresh_inlay_hints(InlayHintRefreshReason::RefreshRequested, cx);
-                        }
-                        project::Event::SnippetEdit(id, snippet_edits) => {
-                            if let Some(buffer) = editor.buffer.read(cx).buffer(*id) {
-                                let focus_handle = editor.focus_handle(cx);
-                                if focus_handle.is_focused(window) {
-                                    let snapshot = buffer.read(cx).snapshot();
-                                    for (range, snippet) in snippet_edits {
-                                        let editor_range =
-                                            language::range_from_lsp(*range).to_offset(&snapshot);
-                                        editor
-                                            .insert_snippet(
-                                                &[editor_range],
-                                                snippet.clone(),
-                                                window,
-                                                cx,
-                                            )
-                                            .ok();
-                                    }
-                                }
-                            }
-                        }
-                        _ => {}
-                    },
-                ));
-                if let Some(task_inventory) = project
-                    .read(cx)
-                    .task_store()
-                    .read(cx)
-                    .task_inventory()
-                    .cloned()
-                {
-                    project_subscriptions.push(cx.observe_in(
-                        &task_inventory,
-                        window,
-                        |editor, _, window, cx| {
-                            editor.tasks_update_task = Some(editor.refresh_runnables(window, cx));
-                        },
-                    ));
-                };
-
-                project_subscriptions.push(cx.subscribe_in(
-                    &project.read(cx).breakpoint_store(),
-                    window,
-                    |editor, _, event, window, cx| match event {
-                        BreakpointStoreEvent::ClearDebugLines => {
-                            editor.clear_row_highlights::<ActiveDebugLine>();
-                            editor.refresh_inline_values(cx);
-                        }
-                        BreakpointStoreEvent::SetDebugLine => {
-                            if editor.go_to_active_debug_line(window, cx) {
-                                cx.stop_propagation();
-                            }
-
-                            editor.refresh_inline_values(cx);
-                        }
-                        _ => {}
-                    },
-                ));
-            }
-        }
-
-        let buffer_snapshot = buffer.read(cx).snapshot(cx);
-
-        let inlay_hint_settings =
-            inlay_hint_settings(selections.newest_anchor().head(), &buffer_snapshot, cx);
-        let focus_handle = cx.focus_handle();
-        cx.on_focus(&focus_handle, window, Self::handle_focus)
-            .detach();
-        cx.on_focus_in(&focus_handle, window, Self::handle_focus_in)
-            .detach();
-        cx.on_focus_out(&focus_handle, window, Self::handle_focus_out)
-            .detach();
-        cx.on_blur(&focus_handle, window, Self::handle_blur)
-            .detach();
-
-        let show_indent_guides = if matches!(mode, EditorMode::SingleLine { .. }) {
-            Some(false)
-        } else {
-            None
-        };
-
-        let breakpoint_store = match (mode, project.as_ref()) {
-            (EditorMode::Full { .. }, Some(project)) => Some(project.read(cx).breakpoint_store()),
-            _ => None,
-        };
-
-        let mut code_action_providers = Vec::new();
-        let mut load_uncommitted_diff = None;
-        if let Some(project) = project.clone() {
-            load_uncommitted_diff = Some(
-                get_uncommitted_diff_for_buffer(
-                    &project,
-                    buffer.read(cx).all_buffers(),
-                    buffer.clone(),
-                    cx,
-                )
-                .shared(),
-            );
-            code_action_providers.push(Rc::new(project) as Rc<_>);
-        }
-
-        let mut this = Self {
-            focus_handle,
-            show_cursor_when_unfocused: false,
-            last_focused_descendant: None,
-            buffer: buffer.clone(),
-            display_map: display_map.clone(),
-            selections,
-            scroll_manager: ScrollManager::new(cx),
-            columnar_selection_tail: None,
-            add_selections_state: None,
-            select_next_state: None,
-            select_prev_state: None,
-            selection_history: Default::default(),
-            autoclose_regions: Default::default(),
-            snippet_stack: Default::default(),
-            select_syntax_node_history: SelectSyntaxNodeHistory::default(),
-            ime_transaction: Default::default(),
-            active_diagnostics: ActiveDiagnostic::None,
-            show_inline_diagnostics: ProjectSettings::get_global(cx).diagnostics.inline.enabled,
-            inline_diagnostics_update: Task::ready(()),
-            inline_diagnostics: Vec::new(),
-            soft_wrap_mode_override,
-            hard_wrap: None,
-            completion_provider: project.clone().map(|project| Box::new(project) as _),
-            semantics_provider: project.clone().map(|project| Rc::new(project) as _),
-            collaboration_hub: project.clone().map(|project| Box::new(project) as _),
-            project,
-            blink_manager: blink_manager.clone(),
-            show_local_selections: true,
-            show_scrollbars: true,
-            disable_scrolling: false,
-            mode,
-            show_breadcrumbs: EditorSettings::get_global(cx).toolbar.breadcrumbs,
-            show_gutter: mode.is_full(),
-            show_line_numbers: None,
-            use_relative_line_numbers: None,
-            disable_expand_excerpt_buttons: false,
-            show_git_diff_gutter: None,
-            show_code_actions: None,
-            show_runnables: None,
-            show_breakpoints: None,
-            show_wrap_guides: None,
-            show_indent_guides,
-            placeholder_text: None,
-            highlight_order: 0,
-            highlighted_rows: HashMap::default(),
-            background_highlights: Default::default(),
-            gutter_highlights: TreeMap::default(),
-            scrollbar_marker_state: ScrollbarMarkerState::default(),
-            active_indent_guides_state: ActiveIndentGuidesState::default(),
-            nav_history: None,
-            context_menu: RefCell::new(None),
-            context_menu_options: None,
-            mouse_context_menu: None,
-            completion_tasks: Default::default(),
-            inline_blame_popover: Default::default(),
-            signature_help_state: SignatureHelpState::default(),
-            auto_signature_help: None,
-            find_all_references_task_sources: Vec::new(),
-            next_completion_id: 0,
-            next_inlay_id: 0,
-            code_action_providers,
-            available_code_actions: Default::default(),
-            code_actions_task: Default::default(),
-            quick_selection_highlight_task: Default::default(),
-            debounced_selection_highlight_task: Default::default(),
-            document_highlights_task: Default::default(),
-            linked_editing_range_task: Default::default(),
-            pending_rename: Default::default(),
-            searchable: true,
-            cursor_shape: EditorSettings::get_global(cx)
-                .cursor_shape
-                .unwrap_or_default(),
-            current_line_highlight: None,
-            autoindent_mode: Some(AutoindentMode::EachLine),
-            collapse_matches: false,
-            workspace: None,
-            input_enabled: true,
-            use_modal_editing: mode.is_full(),
-            read_only: false,
-            use_autoclose: true,
-            use_auto_surround: true,
-            auto_replace_emoji_shortcode: false,
-            jsx_tag_auto_close_enabled_in_any_buffer: false,
-            leader_peer_id: None,
-            remote_id: None,
-            hover_state: Default::default(),
-            pending_mouse_down: None,
-            hovered_link_state: Default::default(),
-            edit_prediction_provider: None,
-            active_inline_completion: None,
-            stale_inline_completion_in_menu: None,
-            edit_prediction_preview: EditPredictionPreview::Inactive {
-                released_too_fast: false,
-            },
-            inline_diagnostics_enabled: mode.is_full(),
-            inline_value_cache: InlineValueCache::new(inlay_hint_settings.show_value_hints),
-            inlay_hint_cache: InlayHintCache::new(inlay_hint_settings),
-
-            gutter_hovered: false,
-            pixel_position_of_newest_cursor: None,
-            last_bounds: None,
-            last_position_map: None,
-            expect_bounds_change: None,
-            gutter_dimensions: GutterDimensions::default(),
-            style: None,
-            show_cursor_names: false,
-            hovered_cursors: Default::default(),
-            next_editor_action_id: EditorActionId::default(),
-            editor_actions: Rc::default(),
-            inline_completions_hidden_for_vim_mode: false,
-            show_inline_completions_override: None,
-            menu_inline_completions_policy: MenuInlineCompletionsPolicy::ByProvider,
-            edit_prediction_settings: EditPredictionSettings::Disabled,
-            edit_prediction_indent_conflict: false,
-            edit_prediction_requires_modifier_in_indent_conflict: true,
-            custom_context_menu: None,
-            show_git_blame_gutter: false,
-            show_git_blame_inline: false,
-            show_selection_menu: None,
-            show_git_blame_inline_delay_task: None,
-            git_blame_inline_enabled: ProjectSettings::get_global(cx).git.inline_blame_enabled(),
-            render_diff_hunk_controls: Arc::new(render_diff_hunk_controls),
-            serialize_dirty_buffers: ProjectSettings::get_global(cx)
-                .session
-                .restore_unsaved_buffers,
-            blame: None,
-            blame_subscription: None,
-            tasks: Default::default(),
-
-            breakpoint_store,
-            gutter_breakpoint_indicator: (None, None),
-            _subscriptions: vec![
-                cx.observe(&buffer, Self::on_buffer_changed),
-                cx.subscribe_in(&buffer, window, Self::on_buffer_event),
-                cx.observe_in(&display_map, window, Self::on_display_map_changed),
-                cx.observe(&blink_manager, |_, _, cx| cx.notify()),
-                cx.observe_global_in::<SettingsStore>(window, Self::settings_changed),
-                observe_buffer_font_size_adjustment(cx, |_, cx| cx.notify()),
-                cx.observe_window_activation(window, |editor, window, cx| {
-                    let active = window.is_window_active();
-                    editor.blink_manager.update(cx, |blink_manager, cx| {
-                        if active {
-                            blink_manager.enable(cx);
-                        } else {
-                            blink_manager.disable(cx);
-                        }
-                    });
-                }),
-            ],
-            tasks_update_task: None,
-            linked_edit_ranges: Default::default(),
-            in_project_search: false,
-            previous_search_ranges: None,
-            breadcrumb_header: None,
-            focused_block: None,
-            next_scroll_position: NextScrollCursorCenterTopBottom::default(),
-            addons: HashMap::default(),
-            registered_buffers: HashMap::default(),
-            _scroll_cursor_center_top_bottom_task: Task::ready(()),
-            selection_mark_mode: false,
-            toggle_fold_multiple_buffers: Task::ready(()),
-            serialize_selections: Task::ready(()),
-            serialize_folds: Task::ready(()),
-            text_style_refinement: None,
-            load_diff_task: load_uncommitted_diff,
-            mouse_cursor_hidden: false,
-            hide_mouse_mode: EditorSettings::get_global(cx)
-                .hide_mouse
-                .unwrap_or_default(),
-            change_list: ChangeList::new(),
-        };
-        if let Some(breakpoints) = this.breakpoint_store.as_ref() {
-            this._subscriptions
-                .push(cx.observe(breakpoints, |_, _, cx| {
-                    cx.notify();
-                }));
-        }
-        this.tasks_update_task = Some(this.refresh_runnables(window, cx));
-        this._subscriptions.extend(project_subscriptions);
-
-        this._subscriptions.push(cx.subscribe_in(
-            &cx.entity(),
-            window,
-            |editor, _, e: &EditorEvent, window, cx| match e {
-                EditorEvent::ScrollPositionChanged { local, .. } => {
-                    if *local {
-                        let new_anchor = editor.scroll_manager.anchor();
-                        let snapshot = editor.snapshot(window, cx);
-                        editor.update_restoration_data(cx, move |data| {
-                            data.scroll_position = (
-                                new_anchor.top_row(&snapshot.buffer_snapshot),
-                                new_anchor.offset,
-                            );
-                        });
-                        editor.hide_signature_help(cx, SignatureHelpHiddenBy::Escape);
-                        editor.inline_blame_popover.take();
-                    }
-                }
-                EditorEvent::Edited { .. } => {
-                    if !vim_enabled(cx) {
-                        let (map, selections) = editor.selections.all_adjusted_display(cx);
-                        let pop_state = editor
-                            .change_list
-                            .last()
-                            .map(|previous| {
-                                previous.len() == selections.len()
-                                    && previous.iter().enumerate().all(|(ix, p)| {
-                                        p.to_display_point(&map).row()
-                                            == selections[ix].head().row()
-                                    })
-                            })
-                            .unwrap_or(false);
-                        let new_positions = selections
-                            .into_iter()
-                            .map(|s| map.display_point_to_anchor(s.head(), Bias::Left))
-                            .collect();
-                        editor
-                            .change_list
-                            .push_to_change_list(pop_state, new_positions);
-                    }
-                }
-                _ => (),
-            },
-        ));
-
-        if let Some(dap_store) = this
-            .project
-            .as_ref()
-            .map(|project| project.read(cx).dap_store())
-        {
-            let weak_editor = cx.weak_entity();
-
-            this._subscriptions
-                .push(
-                    cx.observe_new::<project::debugger::session::Session>(move |_, _, cx| {
-                        let session_entity = cx.entity();
-                        weak_editor
-                            .update(cx, |editor, cx| {
-                                editor._subscriptions.push(
-                                    cx.subscribe(&session_entity, Self::on_debug_session_event),
-                                );
-                            })
-                            .ok();
-                    }),
-                );
-
-            for session in dap_store.read(cx).sessions().cloned().collect::<Vec<_>>() {
-                this._subscriptions
-                    .push(cx.subscribe(&session, Self::on_debug_session_event));
-            }
-        }
-
-        this.end_selection(window, cx);
-        this.scroll_manager.show_scrollbars(window, cx);
-        jsx_tag_auto_close::refresh_enabled_in_any_buffer(&mut this, &buffer, cx);
-
-        if mode.is_full() {
-            let should_auto_hide_scrollbars = cx.should_auto_hide_scrollbars();
-            cx.set_global(ScrollbarAutoHide(should_auto_hide_scrollbars));
-
-            if this.git_blame_inline_enabled {
-                this.git_blame_inline_enabled = true;
-                this.start_git_blame_inline(false, window, cx);
-            }
-
-            this.go_to_active_debug_line(window, cx);
-
-            if let Some(buffer) = buffer.read(cx).as_singleton() {
-                if let Some(project) = this.project.as_ref() {
-                    let handle = project.update(cx, |project, cx| {
-                        project.register_buffer_with_language_servers(&buffer, cx)
-                    });
-                    this.registered_buffers
-                        .insert(buffer.read(cx).remote_id(), handle);
-                }
-            }
-        }
-
-        this.report_editor_event("Editor Opened", None, cx);
-        this
-    }
-
-    pub fn deploy_mouse_context_menu(
-        &mut self,
-        position: gpui::Point<Pixels>,
-        context_menu: Entity<ContextMenu>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.mouse_context_menu = Some(MouseContextMenu::new(
-            self,
-            crate::mouse_context_menu::MenuPosition::PinnedToScreen(position),
-            context_menu,
-            window,
-            cx,
-        ));
-    }
-
-    pub fn mouse_menu_is_focused(&self, window: &Window, cx: &App) -> bool {
-        self.mouse_context_menu
-            .as_ref()
-            .is_some_and(|menu| menu.context_menu.focus_handle(cx).is_focused(window))
-    }
-
-    fn key_context(&self, window: &Window, cx: &App) -> KeyContext {
-        self.key_context_internal(self.has_active_inline_completion(), window, cx)
-    }
-
-    fn key_context_internal(
-        &self,
-        has_active_edit_prediction: bool,
-        window: &Window,
-        cx: &App,
-    ) -> KeyContext {
-        let mut key_context = KeyContext::new_with_defaults();
-        key_context.add("Editor");
-        let mode = match self.mode {
-            EditorMode::SingleLine { .. } => "single_line",
-            EditorMode::AutoHeight { .. } => "auto_height",
-            EditorMode::Full { .. } => "full",
-        };
-
-        if EditorSettings::jupyter_enabled(cx) {
-            key_context.add("jupyter");
-        }
-
-        key_context.set("mode", mode);
-        if self.pending_rename.is_some() {
-            key_context.add("renaming");
-        }
-
-        match self.context_menu.borrow().as_ref() {
-            Some(CodeContextMenu::Completions(_)) => {
-                key_context.add("menu");
-                key_context.add("showing_completions");
-            }
-            Some(CodeContextMenu::CodeActions(_)) => {
-                key_context.add("menu");
-                key_context.add("showing_code_actions")
-            }
-            None => {}
-        }
-
-        // Disable vim contexts when a sub-editor (e.g. rename/inline assistant) is focused.
-        if !self.focus_handle(cx).contains_focused(window, cx)
-            || (self.is_focused(window) || self.mouse_menu_is_focused(window, cx))
-        {
-            for addon in self.addons.values() {
-                addon.extend_key_context(&mut key_context, cx)
-            }
-        }
-
-        if let Some(singleton_buffer) = self.buffer.read(cx).as_singleton() {
-            if let Some(extension) = singleton_buffer
-                .read(cx)
-                .file()
-                .and_then(|file| file.path().extension()?.to_str())
-            {
-                key_context.set("extension", extension.to_string());
-            }
-        } else {
-            key_context.add("multibuffer");
-        }
-
-        if has_active_edit_prediction {
-            if self.edit_prediction_in_conflict() {
-                key_context.add(EDIT_PREDICTION_CONFLICT_KEY_CONTEXT);
-            } else {
-                key_context.add(EDIT_PREDICTION_KEY_CONTEXT);
-                key_context.add("copilot_suggestion");
-            }
-        }
-
-        if self.selection_mark_mode {
-            key_context.add("selection_mode");
-        }
-
-        key_context
-    }
-
-    pub fn hide_mouse_cursor(&mut self, origin: &HideMouseCursorOrigin) {
-        self.mouse_cursor_hidden = match origin {
-            HideMouseCursorOrigin::TypingAction => {
-                matches!(
-                    self.hide_mouse_mode,
-                    HideMouseMode::OnTyping | HideMouseMode::OnTypingAndMovement
-                )
-            }
-            HideMouseCursorOrigin::MovementAction => {
-                matches!(self.hide_mouse_mode, HideMouseMode::OnTypingAndMovement)
-            }
-        };
-    }
-
-    pub fn edit_prediction_in_conflict(&self) -> bool {
-        if !self.show_edit_predictions_in_menu() {
-            return false;
-        }
-
-        let showing_completions = self
-            .context_menu
-            .borrow()
-            .as_ref()
-            .map_or(false, |context| {
-                matches!(context, CodeContextMenu::Completions(_))
-            });
-
-        showing_completions
-            || self.edit_prediction_requires_modifier()
-            // Require modifier key when the cursor is on leading whitespace, to allow `tab`
-            // bindings to insert tab characters.
-            || (self.edit_prediction_requires_modifier_in_indent_conflict && self.edit_prediction_indent_conflict)
-    }
-
-    pub fn accept_edit_prediction_keybind(
-        &self,
-        window: &Window,
-        cx: &App,
-    ) -> AcceptEditPredictionBinding {
-        let key_context = self.key_context_internal(true, window, cx);
-        let in_conflict = self.edit_prediction_in_conflict();
-
-        AcceptEditPredictionBinding(
-            window
-                .bindings_for_action_in_context(&AcceptEditPrediction, key_context)
-                .into_iter()
-                .filter(|binding| {
-                    !in_conflict
-                        || binding
-                            .keystrokes()
-                            .first()
-                            .map_or(false, |keystroke| keystroke.modifiers.modified())
-                })
-                .rev()
-                .min_by_key(|binding| {
-                    binding
-                        .keystrokes()
-                        .first()
-                        .map_or(u8::MAX, |k| k.modifiers.number_of_modifiers())
-                }),
-        )
-    }
-
-    pub fn new_file(
-        workspace: &mut Workspace,
-        _: &workspace::NewFile,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        Self::new_in_workspace(workspace, window, cx).detach_and_prompt_err(
-            "Failed to create buffer",
-            window,
-            cx,
-            |e, _, _| match e.error_code() {
-                ErrorCode::RemoteUpgradeRequired => Some(format!(
-                "The remote instance of Zed does not support this yet. It must be upgraded to {}",
-                e.error_tag("required").unwrap_or("the latest version")
-            )),
-                _ => None,
-            },
-        );
-    }
-
-    pub fn new_in_workspace(
-        workspace: &mut Workspace,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) -> Task<Result<Entity<Editor>>> {
-        let project = workspace.project().clone();
-        let create = project.update(cx, |project, cx| project.create_buffer(cx));
-
-        cx.spawn_in(window, async move |workspace, cx| {
-            let buffer = create.await?;
-            workspace.update_in(cx, |workspace, window, cx| {
-                let editor =
-                    cx.new(|cx| Editor::for_buffer(buffer, Some(project.clone()), window, cx));
-                workspace.add_item_to_active_pane(Box::new(editor.clone()), None, true, window, cx);
-                editor
-            })
-        })
-    }
-
-    fn new_file_vertical(
-        workspace: &mut Workspace,
-        _: &workspace::NewFileSplitVertical,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        Self::new_file_in_direction(workspace, SplitDirection::vertical(cx), window, cx)
-    }
-
-    fn new_file_horizontal(
-        workspace: &mut Workspace,
-        _: &workspace::NewFileSplitHorizontal,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        Self::new_file_in_direction(workspace, SplitDirection::horizontal(cx), window, cx)
-    }
-
-    fn new_file_in_direction(
-        workspace: &mut Workspace,
-        direction: SplitDirection,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        let project = workspace.project().clone();
-        let create = project.update(cx, |project, cx| project.create_buffer(cx));
-
-        cx.spawn_in(window, async move |workspace, cx| {
-            let buffer = create.await?;
-            workspace.update_in(cx, move |workspace, window, cx| {
-                workspace.split_item(
-                    direction,
-                    Box::new(
-                        cx.new(|cx| Editor::for_buffer(buffer, Some(project.clone()), window, cx)),
-                    ),
-                    window,
-                    cx,
-                )
-            })?;
-            anyhow::Ok(())
-        })
-        .detach_and_prompt_err("Failed to create buffer", window, cx, |e, _, _| {
-            match e.error_code() {
-                ErrorCode::RemoteUpgradeRequired => Some(format!(
-                "The remote instance of Zed does not support this yet. It must be upgraded to {}",
-                e.error_tag("required").unwrap_or("the latest version")
-            )),
-                _ => None,
-            }
-        });
-    }
-
-    pub fn leader_peer_id(&self) -> Option<PeerId> {
-        self.leader_peer_id
-    }
-
-    pub fn buffer(&self) -> &Entity<MultiBuffer> {
-        &self.buffer
-    }
-
-    pub fn workspace(&self) -> Option<Entity<Workspace>> {
-        self.workspace.as_ref()?.0.upgrade()
-    }
-
-    pub fn title<'a>(&self, cx: &'a App) -> Cow<'a, str> {
-        self.buffer().read(cx).title(cx)
-    }
-
-    pub fn snapshot(&self, window: &mut Window, cx: &mut App) -> EditorSnapshot {
-        let git_blame_gutter_max_author_length = self
-            .render_git_blame_gutter(cx)
-            .then(|| {
-                if let Some(blame) = self.blame.as_ref() {
-                    let max_author_length =
-                        blame.update(cx, |blame, cx| blame.max_author_length(cx));
-                    Some(max_author_length)
-                } else {
-                    None
-                }
-            })
-            .flatten();
-
-        EditorSnapshot {
-            mode: self.mode,
-            show_gutter: self.show_gutter,
-            show_line_numbers: self.show_line_numbers,
-            show_git_diff_gutter: self.show_git_diff_gutter,
-            show_code_actions: self.show_code_actions,
-            show_runnables: self.show_runnables,
-            show_breakpoints: self.show_breakpoints,
-            git_blame_gutter_max_author_length,
-            display_snapshot: self.display_map.update(cx, |map, cx| map.snapshot(cx)),
-            scroll_anchor: self.scroll_manager.anchor(),
-            ongoing_scroll: self.scroll_manager.ongoing_scroll(),
-            placeholder_text: self.placeholder_text.clone(),
-            is_focused: self.focus_handle.is_focused(window),
-            current_line_highlight: self
-                .current_line_highlight
-                .unwrap_or_else(|| EditorSettings::get_global(cx).current_line_highlight),
-            gutter_hovered: self.gutter_hovered,
-        }
-    }
-
-    pub fn language_at<T: ToOffset>(&self, point: T, cx: &App) -> Option<Arc<Language>> {
-        self.buffer.read(cx).language_at(point, cx)
-    }
-
-    pub fn file_at<T: ToOffset>(&self, point: T, cx: &App) -> Option<Arc<dyn language::File>> {
-        self.buffer.read(cx).read(cx).file_at(point).cloned()
-    }
-
-    pub fn active_excerpt(
-        &self,
-        cx: &App,
-    ) -> Option<(ExcerptId, Entity<Buffer>, Range<text::Anchor>)> {
-        self.buffer
-            .read(cx)
-            .excerpt_containing(self.selections.newest_anchor().head(), cx)
-    }
-
-    pub fn mode(&self) -> EditorMode {
-        self.mode
-    }
-
-    pub fn set_mode(&mut self, mode: EditorMode) {
-        self.mode = mode;
-    }
-
-    pub fn collaboration_hub(&self) -> Option<&dyn CollaborationHub> {
-        self.collaboration_hub.as_deref()
-    }
-
-    pub fn set_collaboration_hub(&mut self, hub: Box<dyn CollaborationHub>) {
-        self.collaboration_hub = Some(hub);
-    }
-
-    pub fn set_in_project_search(&mut self, in_project_search: bool) {
-        self.in_project_search = in_project_search;
-    }
-
-    pub fn set_custom_context_menu(
-        &mut self,
-        f: impl 'static
-        + Fn(
-            &mut Self,
-            DisplayPoint,
-            &mut Window,
-            &mut Context<Self>,
-        ) -> Option<Entity<ui::ContextMenu>>,
-    ) {
-        self.custom_context_menu = Some(Box::new(f))
-    }
-
-    pub fn set_completion_provider(&mut self, provider: Option<Box<dyn CompletionProvider>>) {
-        self.completion_provider = provider;
-    }
-
-    pub fn semantics_provider(&self) -> Option<Rc<dyn SemanticsProvider>> {
-        self.semantics_provider.clone()
-    }
-
-    pub fn set_semantics_provider(&mut self, provider: Option<Rc<dyn SemanticsProvider>>) {
-        self.semantics_provider = provider;
-    }
-
-    pub fn set_edit_prediction_provider<T>(
-        &mut self,
-        provider: Option<Entity<T>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) where
-        T: EditPredictionProvider,
-    {
-        self.edit_prediction_provider =
-            provider.map(|provider| RegisteredInlineCompletionProvider {
-                _subscription: cx.observe_in(&provider, window, |this, _, window, cx| {
-                    if this.focus_handle.is_focused(window) {
-                        this.update_visible_inline_completion(window, cx);
-                    }
-                }),
-                provider: Arc::new(provider),
-            });
-        self.update_edit_prediction_settings(cx);
-        self.refresh_inline_completion(false, false, window, cx);
-    }
-
-    pub fn placeholder_text(&self) -> Option<&str> {
-        self.placeholder_text.as_deref()
-    }
-
-    pub fn set_placeholder_text(
-        &mut self,
-        placeholder_text: impl Into<Arc<str>>,
-        cx: &mut Context<Self>,
-    ) {
-        let placeholder_text = Some(placeholder_text.into());
-        if self.placeholder_text != placeholder_text {
-            self.placeholder_text = placeholder_text;
-            cx.notify();
-        }
-    }
-
-    pub fn set_cursor_shape(&mut self, cursor_shape: CursorShape, cx: &mut Context<Self>) {
-        self.cursor_shape = cursor_shape;
-
-        // Disrupt blink for immediate user feedback that the cursor shape has changed
-        self.blink_manager.update(cx, BlinkManager::show_cursor);
-
-        cx.notify();
-    }
-
-    pub fn set_current_line_highlight(
-        &mut self,
-        current_line_highlight: Option<CurrentLineHighlight>,
-    ) {
-        self.current_line_highlight = current_line_highlight;
-    }
-
-    pub fn set_collapse_matches(&mut self, collapse_matches: bool) {
-        self.collapse_matches = collapse_matches;
-    }
-
-    fn register_buffers_with_language_servers(&mut self, cx: &mut Context<Self>) {
-        let buffers = self.buffer.read(cx).all_buffers();
-        let Some(project) = self.project.as_ref() else {
-            return;
-        };
-        project.update(cx, |project, cx| {
-            for buffer in buffers {
-                self.registered_buffers
-                    .entry(buffer.read(cx).remote_id())
-                    .or_insert_with(|| project.register_buffer_with_language_servers(&buffer, cx));
-            }
-        })
-    }
-
-    pub fn range_for_match<T: std::marker::Copy>(&self, range: &Range<T>) -> Range<T> {
-        if self.collapse_matches {
-            return range.start..range.start;
-        }
-        range.clone()
-    }
-
-    pub fn set_clip_at_line_ends(&mut self, clip: bool, cx: &mut Context<Self>) {
-        if self.display_map.read(cx).clip_at_line_ends != clip {
-            self.display_map
-                .update(cx, |map, _| map.clip_at_line_ends = clip);
-        }
-    }
-
-    pub fn set_input_enabled(&mut self, input_enabled: bool) {
-        self.input_enabled = input_enabled;
-    }
-
-    pub fn set_inline_completions_hidden_for_vim_mode(
-        &mut self,
-        hidden: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if hidden != self.inline_completions_hidden_for_vim_mode {
-            self.inline_completions_hidden_for_vim_mode = hidden;
-            if hidden {
-                self.update_visible_inline_completion(window, cx);
-            } else {
-                self.refresh_inline_completion(true, false, window, cx);
-            }
-        }
-    }
-
-    pub fn set_menu_inline_completions_policy(&mut self, value: MenuInlineCompletionsPolicy) {
-        self.menu_inline_completions_policy = value;
-    }
-
-    pub fn set_autoindent(&mut self, autoindent: bool) {
-        if autoindent {
-            self.autoindent_mode = Some(AutoindentMode::EachLine);
-        } else {
-            self.autoindent_mode = None;
-        }
-    }
-
-    pub fn read_only(&self, cx: &App) -> bool {
-        self.read_only || self.buffer.read(cx).read_only()
-    }
-
-    pub fn set_read_only(&mut self, read_only: bool) {
-        self.read_only = read_only;
-    }
-
-    pub fn set_use_autoclose(&mut self, autoclose: bool) {
-        self.use_autoclose = autoclose;
-    }
-
-    pub fn set_use_auto_surround(&mut self, auto_surround: bool) {
-        self.use_auto_surround = auto_surround;
-    }
-
-    pub fn set_auto_replace_emoji_shortcode(&mut self, auto_replace: bool) {
-        self.auto_replace_emoji_shortcode = auto_replace;
-    }
-
-    pub fn toggle_edit_predictions(
-        &mut self,
-        _: &ToggleEditPrediction,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.show_inline_completions_override.is_some() {
-            self.set_show_edit_predictions(None, window, cx);
-        } else {
-            let show_edit_predictions = !self.edit_predictions_enabled();
-            self.set_show_edit_predictions(Some(show_edit_predictions), window, cx);
-        }
-    }
-
-    pub fn set_show_edit_predictions(
-        &mut self,
-        show_edit_predictions: Option<bool>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.show_inline_completions_override = show_edit_predictions;
-        self.update_edit_prediction_settings(cx);
-
-        if let Some(false) = show_edit_predictions {
-            self.discard_inline_completion(false, cx);
-        } else {
-            self.refresh_inline_completion(false, true, window, cx);
-        }
-    }
-
-    fn inline_completions_disabled_in_scope(
-        &self,
-        buffer: &Entity<Buffer>,
-        buffer_position: language::Anchor,
-        cx: &App,
-    ) -> bool {
-        let snapshot = buffer.read(cx).snapshot();
-        let settings = snapshot.settings_at(buffer_position, cx);
-
-        let Some(scope) = snapshot.language_scope_at(buffer_position) else {
-            return false;
-        };
-
-        scope.override_name().map_or(false, |scope_name| {
-            settings
-                .edit_predictions_disabled_in
-                .iter()
-                .any(|s| s == scope_name)
-        })
-    }
-
-    pub fn set_use_modal_editing(&mut self, to: bool) {
-        self.use_modal_editing = to;
-    }
-
-    pub fn use_modal_editing(&self) -> bool {
-        self.use_modal_editing
-    }
-
-    fn selections_did_change(
-        &mut self,
-        local: bool,
-        old_cursor_position: &Anchor,
-        show_completions: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        window.invalidate_character_coordinates();
-
-        // Copy selections to primary selection buffer
-        #[cfg(any(target_os = "linux", target_os = "freebsd"))]
-        if local {
-            let selections = self.selections.all::<usize>(cx);
-            let buffer_handle = self.buffer.read(cx).read(cx);
-
-            let mut text = String::new();
-            for (index, selection) in selections.iter().enumerate() {
-                let text_for_selection = buffer_handle
-                    .text_for_range(selection.start..selection.end)
-                    .collect::<String>();
-
-                text.push_str(&text_for_selection);
-                if index != selections.len() - 1 {
-                    text.push('\n');
-                }
-            }
-
-            if !text.is_empty() {
-                cx.write_to_primary(ClipboardItem::new_string(text));
-            }
-        }
-
-        if self.focus_handle.is_focused(window) && self.leader_peer_id.is_none() {
-            self.buffer.update(cx, |buffer, cx| {
-                buffer.set_active_selections(
-                    &self.selections.disjoint_anchors(),
-                    self.selections.line_mode,
-                    self.cursor_shape,
-                    cx,
-                )
-            });
-        }
-        let display_map = self
-            .display_map
-            .update(cx, |display_map, cx| display_map.snapshot(cx));
-        let buffer = &display_map.buffer_snapshot;
-        self.add_selections_state = None;
-        self.select_next_state = None;
-        self.select_prev_state = None;
-        self.select_syntax_node_history.try_clear();
-        self.invalidate_autoclose_regions(&self.selections.disjoint_anchors(), buffer);
-        self.snippet_stack
-            .invalidate(&self.selections.disjoint_anchors(), buffer);
-        self.take_rename(false, window, cx);
-
-        let new_cursor_position = self.selections.newest_anchor().head();
-
-        self.push_to_nav_history(
-            *old_cursor_position,
-            Some(new_cursor_position.to_point(buffer)),
-            false,
-            cx,
-        );
-
-        if local {
-            let new_cursor_position = self.selections.newest_anchor().head();
-            let mut context_menu = self.context_menu.borrow_mut();
-            let completion_menu = match context_menu.as_ref() {
-                Some(CodeContextMenu::Completions(menu)) => Some(menu),
-                _ => {
-                    *context_menu = None;
-                    None
-                }
-            };
-            if let Some(buffer_id) = new_cursor_position.buffer_id {
-                if !self.registered_buffers.contains_key(&buffer_id) {
-                    if let Some(project) = self.project.as_ref() {
-                        project.update(cx, |project, cx| {
-                            let Some(buffer) = self.buffer.read(cx).buffer(buffer_id) else {
-                                return;
-                            };
-                            self.registered_buffers.insert(
-                                buffer_id,
-                                project.register_buffer_with_language_servers(&buffer, cx),
-                            );
-                        })
-                    }
-                }
-            }
-
-            if let Some(completion_menu) = completion_menu {
-                let cursor_position = new_cursor_position.to_offset(buffer);
-                let (word_range, kind) =
-                    buffer.surrounding_word(completion_menu.initial_position, true);
-                if kind == Some(CharKind::Word)
-                    && word_range.to_inclusive().contains(&cursor_position)
-                {
-                    let mut completion_menu = completion_menu.clone();
-                    drop(context_menu);
-
-                    let query = Self::completion_query(buffer, cursor_position);
-                    cx.spawn(async move |this, cx| {
-                        completion_menu
-                            .filter(query.as_deref(), cx.background_executor().clone())
-                            .await;
-
-                        this.update(cx, |this, cx| {
-                            let mut context_menu = this.context_menu.borrow_mut();
-                            let Some(CodeContextMenu::Completions(menu)) = context_menu.as_ref()
-                            else {
-                                return;
-                            };
-
-                            if menu.id > completion_menu.id {
-                                return;
-                            }
-
-                            *context_menu = Some(CodeContextMenu::Completions(completion_menu));
-                            drop(context_menu);
-                            cx.notify();
-                        })
-                    })
-                    .detach();
-
-                    if show_completions {
-                        self.show_completions(&ShowCompletions { trigger: None }, window, cx);
-                    }
-                } else {
-                    drop(context_menu);
-                    self.hide_context_menu(window, cx);
-                }
-            } else {
-                drop(context_menu);
-            }
-
-            hide_hover(self, cx);
-
-            if old_cursor_position.to_display_point(&display_map).row()
-                != new_cursor_position.to_display_point(&display_map).row()
-            {
-                self.available_code_actions.take();
-            }
-            self.refresh_code_actions(window, cx);
-            self.refresh_document_highlights(cx);
-            self.refresh_selected_text_highlights(false, window, cx);
-            refresh_matching_bracket_highlights(self, window, cx);
-            self.update_visible_inline_completion(window, cx);
-            self.edit_prediction_requires_modifier_in_indent_conflict = true;
-            linked_editing_ranges::refresh_linked_ranges(self, window, cx);
-            self.inline_blame_popover.take();
-            if self.git_blame_inline_enabled {
-                self.start_inline_blame_timer(window, cx);
-            }
-        }
-
-        self.blink_manager.update(cx, BlinkManager::pause_blinking);
-        cx.emit(EditorEvent::SelectionsChanged { local });
-
-        let selections = &self.selections.disjoint;
-        if selections.len() == 1 {
-            cx.emit(SearchEvent::ActiveMatchChanged)
-        }
-        if local {
-            if let Some((_, _, buffer_snapshot)) = buffer.as_singleton() {
-                let inmemory_selections = selections
-                    .iter()
-                    .map(|s| {
-                        text::ToPoint::to_point(&s.range().start.text_anchor, buffer_snapshot)
-                            ..text::ToPoint::to_point(&s.range().end.text_anchor, buffer_snapshot)
-                    })
-                    .collect();
-                self.update_restoration_data(cx, |data| {
-                    data.selections = inmemory_selections;
-                });
-
-                if WorkspaceSettings::get(None, cx).restore_on_startup
-                    != RestoreOnStartupBehavior::None
-                {
-                    if let Some(workspace_id) =
-                        self.workspace.as_ref().and_then(|workspace| workspace.1)
-                    {
-                        let snapshot = self.buffer().read(cx).snapshot(cx);
-                        let selections = selections.clone();
-                        let background_executor = cx.background_executor().clone();
-                        let editor_id = cx.entity().entity_id().as_u64() as ItemId;
-                        self.serialize_selections = cx.background_spawn(async move {
-                    background_executor.timer(SERIALIZATION_THROTTLE_TIME).await;
-                    let db_selections = selections
-                        .iter()
-                        .map(|selection| {
-                            (
-                                selection.start.to_offset(&snapshot),
-                                selection.end.to_offset(&snapshot),
-                            )
-                        })
-                        .collect();
-
-                    DB.save_editor_selections(editor_id, workspace_id, db_selections)
-                        .await
-                        .with_context(|| format!("persisting editor selections for editor {editor_id}, workspace {workspace_id:?}"))
-                        .log_err();
-                });
-                    }
-                }
-            }
-        }
-
-        cx.notify();
-    }
-
-    fn folds_did_change(&mut self, cx: &mut Context<Self>) {
-        use text::ToOffset as _;
-        use text::ToPoint as _;
-
-        if WorkspaceSettings::get(None, cx).restore_on_startup == RestoreOnStartupBehavior::None {
-            return;
-        }
-
-        let Some(singleton) = self.buffer().read(cx).as_singleton() else {
-            return;
-        };
-
-        let snapshot = singleton.read(cx).snapshot();
-        let inmemory_folds = self.display_map.update(cx, |display_map, cx| {
-            let display_snapshot = display_map.snapshot(cx);
-
-            display_snapshot
-                .folds_in_range(0..display_snapshot.buffer_snapshot.len())
-                .map(|fold| {
-                    fold.range.start.text_anchor.to_point(&snapshot)
-                        ..fold.range.end.text_anchor.to_point(&snapshot)
-                })
-                .collect()
-        });
-        self.update_restoration_data(cx, |data| {
-            data.folds = inmemory_folds;
-        });
-
-        let Some(workspace_id) = self.workspace.as_ref().and_then(|workspace| workspace.1) else {
-            return;
-        };
-        let background_executor = cx.background_executor().clone();
-        let editor_id = cx.entity().entity_id().as_u64() as ItemId;
-        let db_folds = self.display_map.update(cx, |display_map, cx| {
-            display_map
-                .snapshot(cx)
-                .folds_in_range(0..snapshot.len())
-                .map(|fold| {
-                    (
-                        fold.range.start.text_anchor.to_offset(&snapshot),
-                        fold.range.end.text_anchor.to_offset(&snapshot),
-                    )
-                })
-                .collect()
-        });
-        self.serialize_folds = cx.background_spawn(async move {
-            background_executor.timer(SERIALIZATION_THROTTLE_TIME).await;
-            DB.save_editor_folds(editor_id, workspace_id, db_folds)
-                .await
-                .with_context(|| {
-                    format!(
-                        "persisting editor folds for editor {editor_id}, workspace {workspace_id:?}"
-                    )
-                })
-                .log_err();
-        });
-    }
-
-    pub fn sync_selections(
-        &mut self,
-        other: Entity<Editor>,
-        cx: &mut Context<Self>,
-    ) -> gpui::Subscription {
-        let other_selections = other.read(cx).selections.disjoint.to_vec();
-        self.selections.change_with(cx, |selections| {
-            selections.select_anchors(other_selections);
-        });
-
-        let other_subscription =
-            cx.subscribe(&other, |this, other, other_evt, cx| match other_evt {
-                EditorEvent::SelectionsChanged { local: true } => {
-                    let other_selections = other.read(cx).selections.disjoint.to_vec();
-                    if other_selections.is_empty() {
-                        return;
-                    }
-                    this.selections.change_with(cx, |selections| {
-                        selections.select_anchors(other_selections);
-                    });
-                }
-                _ => {}
-            });
-
-        let this_subscription =
-            cx.subscribe_self::<EditorEvent>(move |this, this_evt, cx| match this_evt {
-                EditorEvent::SelectionsChanged { local: true } => {
-                    let these_selections = this.selections.disjoint.to_vec();
-                    if these_selections.is_empty() {
-                        return;
-                    }
-                    other.update(cx, |other_editor, cx| {
-                        other_editor.selections.change_with(cx, |selections| {
-                            selections.select_anchors(these_selections);
-                        })
-                    });
-                }
-                _ => {}
-            });
-
-        Subscription::join(other_subscription, this_subscription)
-    }
-
-    pub fn change_selections<R>(
-        &mut self,
-        autoscroll: Option<Autoscroll>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-        change: impl FnOnce(&mut MutableSelectionsCollection<'_>) -> R,
-    ) -> R {
-        self.change_selections_inner(autoscroll, true, window, cx, change)
-    }
-
-    fn change_selections_inner<R>(
-        &mut self,
-        autoscroll: Option<Autoscroll>,
-        request_completions: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-        change: impl FnOnce(&mut MutableSelectionsCollection<'_>) -> R,
-    ) -> R {
-        let old_cursor_position = self.selections.newest_anchor().head();
-        self.push_to_selection_history();
-
-        let (changed, result) = self.selections.change_with(cx, change);
-
-        if changed {
-            if let Some(autoscroll) = autoscroll {
-                self.request_autoscroll(autoscroll, cx);
-            }
-            self.selections_did_change(true, &old_cursor_position, request_completions, window, cx);
-
-            if self.should_open_signature_help_automatically(
-                &old_cursor_position,
-                self.signature_help_state.backspace_pressed(),
-                cx,
-            ) {
-                self.show_signature_help(&ShowSignatureHelp, window, cx);
-            }
-            self.signature_help_state.set_backspace_pressed(false);
-        }
-
-        result
-    }
-
-    pub fn edit<I, S, T>(&mut self, edits: I, cx: &mut Context<Self>)
-    where
-        I: IntoIterator<Item = (Range<S>, T)>,
-        S: ToOffset,
-        T: Into<Arc<str>>,
-    {
-        if self.read_only(cx) {
-            return;
-        }
-
-        self.buffer
-            .update(cx, |buffer, cx| buffer.edit(edits, None, cx));
-    }
-
-    pub fn edit_with_autoindent<I, S, T>(&mut self, edits: I, cx: &mut Context<Self>)
-    where
-        I: IntoIterator<Item = (Range<S>, T)>,
-        S: ToOffset,
-        T: Into<Arc<str>>,
-    {
-        if self.read_only(cx) {
-            return;
-        }
-
-        self.buffer.update(cx, |buffer, cx| {
-            buffer.edit(edits, self.autoindent_mode.clone(), cx)
-        });
-    }
-
-    pub fn edit_with_block_indent<I, S, T>(
-        &mut self,
-        edits: I,
-        original_indent_columns: Vec<Option<u32>>,
-        cx: &mut Context<Self>,
-    ) where
-        I: IntoIterator<Item = (Range<S>, T)>,
-        S: ToOffset,
-        T: Into<Arc<str>>,
-    {
-        if self.read_only(cx) {
-            return;
-        }
-
-        self.buffer.update(cx, |buffer, cx| {
-            buffer.edit(
-                edits,
-                Some(AutoindentMode::Block {
-                    original_indent_columns,
-                }),
-                cx,
-            )
-        });
-    }
-
-    fn select(&mut self, phase: SelectPhase, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_context_menu(window, cx);
-
-        match phase {
-            SelectPhase::Begin {
-                position,
-                add,
-                click_count,
-            } => self.begin_selection(position, add, click_count, window, cx),
-            SelectPhase::BeginColumnar {
-                position,
-                goal_column,
-                reset,
-            } => self.begin_columnar_selection(position, goal_column, reset, window, cx),
-            SelectPhase::Extend {
-                position,
-                click_count,
-            } => self.extend_selection(position, click_count, window, cx),
-            SelectPhase::Update {
-                position,
-                goal_column,
-                scroll_delta,
-            } => self.update_selection(position, goal_column, scroll_delta, window, cx),
-            SelectPhase::End => self.end_selection(window, cx),
-        }
-    }
-
-    fn extend_selection(
-        &mut self,
-        position: DisplayPoint,
-        click_count: usize,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-        let tail = self.selections.newest::<usize>(cx).tail();
-        self.begin_selection(position, false, click_count, window, cx);
-
-        let position = position.to_offset(&display_map, Bias::Left);
-        let tail_anchor = display_map.buffer_snapshot.anchor_before(tail);
-
-        let mut pending_selection = self
-            .selections
-            .pending_anchor()
-            .expect("extend_selection not called with pending selection");
-        if position >= tail {
-            pending_selection.start = tail_anchor;
-        } else {
-            pending_selection.end = tail_anchor;
-            pending_selection.reversed = true;
-        }
-
-        let mut pending_mode = self.selections.pending_mode().unwrap();
-        match &mut pending_mode {
-            SelectMode::Word(range) | SelectMode::Line(range) => *range = tail_anchor..tail_anchor,
-            _ => {}
-        }
-
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.set_pending(pending_selection, pending_mode)
-        });
-    }
-
-    fn begin_selection(
-        &mut self,
-        position: DisplayPoint,
-        add: bool,
-        click_count: usize,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if !self.focus_handle.is_focused(window) {
-            self.last_focused_descendant = None;
-            window.focus(&self.focus_handle);
-        }
-
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-        let buffer = &display_map.buffer_snapshot;
-        let newest_selection = self.selections.newest_anchor().clone();
-        let position = display_map.clip_point(position, Bias::Left);
-
-        let start;
-        let end;
-        let mode;
-        let mut auto_scroll;
-        match click_count {
-            1 => {
-                start = buffer.anchor_before(position.to_point(&display_map));
-                end = start;
-                mode = SelectMode::Character;
-                auto_scroll = true;
-            }
-            2 => {
-                let range = movement::surrounding_word(&display_map, position);
-                start = buffer.anchor_before(range.start.to_point(&display_map));
-                end = buffer.anchor_before(range.end.to_point(&display_map));
-                mode = SelectMode::Word(start..end);
-                auto_scroll = true;
-            }
-            3 => {
-                let position = display_map
-                    .clip_point(position, Bias::Left)
-                    .to_point(&display_map);
-                let line_start = display_map.prev_line_boundary(position).0;
-                let next_line_start = buffer.clip_point(
-                    display_map.next_line_boundary(position).0 + Point::new(1, 0),
-                    Bias::Left,
-                );
-                start = buffer.anchor_before(line_start);
-                end = buffer.anchor_before(next_line_start);
-                mode = SelectMode::Line(start..end);
-                auto_scroll = true;
-            }
-            _ => {
-                start = buffer.anchor_before(0);
-                end = buffer.anchor_before(buffer.len());
-                mode = SelectMode::All;
-                auto_scroll = false;
-            }
-        }
-        auto_scroll &= EditorSettings::get_global(cx).autoscroll_on_clicks;
-
-        let point_to_delete: Option<usize> = {
-            let selected_points: Vec<Selection<Point>> =
-                self.selections.disjoint_in_range(start..end, cx);
-
-            if !add || click_count > 1 {
-                None
-            } else if !selected_points.is_empty() {
-                Some(selected_points[0].id)
-            } else {
-                let clicked_point_already_selected =
-                    self.selections.disjoint.iter().find(|selection| {
-                        selection.start.to_point(buffer) == start.to_point(buffer)
-                            || selection.end.to_point(buffer) == end.to_point(buffer)
-                    });
-
-                clicked_point_already_selected.map(|selection| selection.id)
-            }
-        };
-
-        let selections_count = self.selections.count();
-
-        self.change_selections(auto_scroll.then(Autoscroll::newest), window, cx, |s| {
-            if let Some(point_to_delete) = point_to_delete {
-                s.delete(point_to_delete);
-
-                if selections_count == 1 {
-                    s.set_pending_anchor_range(start..end, mode);
-                }
-            } else {
-                if !add {
-                    s.clear_disjoint();
-                } else if click_count > 1 {
-                    s.delete(newest_selection.id)
-                }
-
-                s.set_pending_anchor_range(start..end, mode);
-            }
-        });
-    }
-
-    fn begin_columnar_selection(
-        &mut self,
-        position: DisplayPoint,
-        goal_column: u32,
-        reset: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if !self.focus_handle.is_focused(window) {
-            self.last_focused_descendant = None;
-            window.focus(&self.focus_handle);
-        }
-
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-
-        if reset {
-            let pointer_position = display_map
-                .buffer_snapshot
-                .anchor_before(position.to_point(&display_map));
-
-            self.change_selections(Some(Autoscroll::newest()), window, cx, |s| {
-                s.clear_disjoint();
-                s.set_pending_anchor_range(
-                    pointer_position..pointer_position,
-                    SelectMode::Character,
-                );
-            });
-        }
-
-        let tail = self.selections.newest::<Point>(cx).tail();
-        self.columnar_selection_tail = Some(display_map.buffer_snapshot.anchor_before(tail));
-
-        if !reset {
-            self.select_columns(
-                tail.to_display_point(&display_map),
-                position,
-                goal_column,
-                &display_map,
-                window,
-                cx,
-            );
-        }
-    }
-
-    fn update_selection(
-        &mut self,
-        position: DisplayPoint,
-        goal_column: u32,
-        scroll_delta: gpui::Point<f32>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-
-        if let Some(tail) = self.columnar_selection_tail.as_ref() {
-            let tail = tail.to_display_point(&display_map);
-            self.select_columns(tail, position, goal_column, &display_map, window, cx);
-        } else if let Some(mut pending) = self.selections.pending_anchor() {
-            let buffer = self.buffer.read(cx).snapshot(cx);
-            let head;
-            let tail;
-            let mode = self.selections.pending_mode().unwrap();
-            match &mode {
-                SelectMode::Character => {
-                    head = position.to_point(&display_map);
-                    tail = pending.tail().to_point(&buffer);
-                }
-                SelectMode::Word(original_range) => {
-                    let original_display_range = original_range.start.to_display_point(&display_map)
-                        ..original_range.end.to_display_point(&display_map);
-                    let original_buffer_range = original_display_range.start.to_point(&display_map)
-                        ..original_display_range.end.to_point(&display_map);
-                    if movement::is_inside_word(&display_map, position)
-                        || original_display_range.contains(&position)
-                    {
-                        let word_range = movement::surrounding_word(&display_map, position);
-                        if word_range.start < original_display_range.start {
-                            head = word_range.start.to_point(&display_map);
-                        } else {
-                            head = word_range.end.to_point(&display_map);
-                        }
-                    } else {
-                        head = position.to_point(&display_map);
-                    }
-
-                    if head <= original_buffer_range.start {
-                        tail = original_buffer_range.end;
-                    } else {
-                        tail = original_buffer_range.start;
-                    }
-                }
-                SelectMode::Line(original_range) => {
-                    let original_range = original_range.to_point(&display_map.buffer_snapshot);
-
-                    let position = display_map
-                        .clip_point(position, Bias::Left)
-                        .to_point(&display_map);
-                    let line_start = display_map.prev_line_boundary(position).0;
-                    let next_line_start = buffer.clip_point(
-                        display_map.next_line_boundary(position).0 + Point::new(1, 0),
-                        Bias::Left,
-                    );
-
-                    if line_start < original_range.start {
-                        head = line_start
-                    } else {
-                        head = next_line_start
-                    }
-
-                    if head <= original_range.start {
-                        tail = original_range.end;
-                    } else {
-                        tail = original_range.start;
-                    }
-                }
-                SelectMode::All => {
-                    return;
-                }
-            };
-
-            if head < tail {
-                pending.start = buffer.anchor_before(head);
-                pending.end = buffer.anchor_before(tail);
-                pending.reversed = true;
-            } else {
-                pending.start = buffer.anchor_before(tail);
-                pending.end = buffer.anchor_before(head);
-                pending.reversed = false;
-            }
-
-            self.change_selections(None, window, cx, |s| {
-                s.set_pending(pending, mode);
-            });
-        } else {
-            log::error!("update_selection dispatched with no pending selection");
-            return;
-        }
-
-        self.apply_scroll_delta(scroll_delta, window, cx);
-        cx.notify();
-    }
-
-    fn end_selection(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.columnar_selection_tail.take();
-        if self.selections.pending_anchor().is_some() {
-            let selections = self.selections.all::<usize>(cx);
-            self.change_selections(None, window, cx, |s| {
-                s.select(selections);
-                s.clear_pending();
-            });
-        }
-    }
-
-    fn select_columns(
-        &mut self,
-        tail: DisplayPoint,
-        head: DisplayPoint,
-        goal_column: u32,
-        display_map: &DisplaySnapshot,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let start_row = cmp::min(tail.row(), head.row());
-        let end_row = cmp::max(tail.row(), head.row());
-        let start_column = cmp::min(tail.column(), goal_column);
-        let end_column = cmp::max(tail.column(), goal_column);
-        let reversed = start_column < tail.column();
-
-        let selection_ranges = (start_row.0..=end_row.0)
-            .map(DisplayRow)
-            .filter_map(|row| {
-                if start_column <= display_map.line_len(row) && !display_map.is_block_line(row) {
-                    let start = display_map
-                        .clip_point(DisplayPoint::new(row, start_column), Bias::Left)
-                        .to_point(display_map);
-                    let end = display_map
-                        .clip_point(DisplayPoint::new(row, end_column), Bias::Right)
-                        .to_point(display_map);
-                    if reversed {
-                        Some(end..start)
-                    } else {
-                        Some(start..end)
-                    }
-                } else {
-                    None
-                }
-            })
-            .collect::<Vec<_>>();
-
-        self.change_selections(None, window, cx, |s| {
-            s.select_ranges(selection_ranges);
-        });
-        cx.notify();
-    }
-
-    pub fn has_non_empty_selection(&self, cx: &mut App) -> bool {
-        self.selections
-            .all_adjusted(cx)
-            .iter()
-            .any(|selection| !selection.is_empty())
-    }
-
-    pub fn has_pending_nonempty_selection(&self) -> bool {
-        let pending_nonempty_selection = match self.selections.pending_anchor() {
-            Some(Selection { start, end, .. }) => start != end,
-            None => false,
-        };
-
-        pending_nonempty_selection
-            || (self.columnar_selection_tail.is_some() && self.selections.disjoint.len() > 1)
-    }
-
-    pub fn has_pending_selection(&self) -> bool {
-        self.selections.pending_anchor().is_some() || self.columnar_selection_tail.is_some()
-    }
-
-    pub fn cancel(&mut self, _: &Cancel, window: &mut Window, cx: &mut Context<Self>) {
-        self.selection_mark_mode = false;
-
-        if self.clear_expanded_diff_hunks(cx) {
-            cx.notify();
-            return;
-        }
-        if self.dismiss_menus_and_popups(true, window, cx) {
-            return;
-        }
-
-        if self.mode.is_full()
-            && self.change_selections(Some(Autoscroll::fit()), window, cx, |s| s.try_cancel())
-        {
-            return;
-        }
-
-        cx.propagate();
-    }
-
-    pub fn dismiss_menus_and_popups(
-        &mut self,
-        is_user_requested: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> bool {
-        if self.take_rename(false, window, cx).is_some() {
-            return true;
-        }
-
-        if hide_hover(self, cx) {
-            return true;
-        }
-
-        if self.hide_signature_help(cx, SignatureHelpHiddenBy::Escape) {
-            return true;
-        }
-
-        if self.hide_context_menu(window, cx).is_some() {
-            return true;
-        }
-
-        if self.mouse_context_menu.take().is_some() {
-            return true;
-        }
-
-        if is_user_requested && self.discard_inline_completion(true, cx) {
-            return true;
-        }
-
-        if self.snippet_stack.pop().is_some() {
-            return true;
-        }
-
-        if self.mode.is_full() && matches!(self.active_diagnostics, ActiveDiagnostic::Group(_)) {
-            self.dismiss_diagnostics(cx);
-            return true;
-        }
-
-        false
-    }
-
-    fn linked_editing_ranges_for(
-        &self,
-        selection: Range<text::Anchor>,
-        cx: &App,
-    ) -> Option<HashMap<Entity<Buffer>, Vec<Range<text::Anchor>>>> {
-        if self.linked_edit_ranges.is_empty() {
-            return None;
-        }
-        let ((base_range, linked_ranges), buffer_snapshot, buffer) =
-            selection.end.buffer_id.and_then(|end_buffer_id| {
-                if selection.start.buffer_id != Some(end_buffer_id) {
-                    return None;
-                }
-                let buffer = self.buffer.read(cx).buffer(end_buffer_id)?;
-                let snapshot = buffer.read(cx).snapshot();
-                self.linked_edit_ranges
-                    .get(end_buffer_id, selection.start..selection.end, &snapshot)
-                    .map(|ranges| (ranges, snapshot, buffer))
-            })?;
-        use text::ToOffset as TO;
-        // find offset from the start of current range to current cursor position
-        let start_byte_offset = TO::to_offset(&base_range.start, &buffer_snapshot);
-
-        let start_offset = TO::to_offset(&selection.start, &buffer_snapshot);
-        let start_difference = start_offset - start_byte_offset;
-        let end_offset = TO::to_offset(&selection.end, &buffer_snapshot);
-        let end_difference = end_offset - start_byte_offset;
-        // Current range has associated linked ranges.
-        let mut linked_edits = HashMap::<_, Vec<_>>::default();
-        for range in linked_ranges.iter() {
-            let start_offset = TO::to_offset(&range.start, &buffer_snapshot);
-            let end_offset = start_offset + end_difference;
-            let start_offset = start_offset + start_difference;
-            if start_offset > buffer_snapshot.len() || end_offset > buffer_snapshot.len() {
-                continue;
-            }
-            if self.selections.disjoint_anchor_ranges().any(|s| {
-                if s.start.buffer_id != selection.start.buffer_id
-                    || s.end.buffer_id != selection.end.buffer_id
-                {
-                    return false;
-                }
-                TO::to_offset(&s.start.text_anchor, &buffer_snapshot) <= end_offset
-                    && TO::to_offset(&s.end.text_anchor, &buffer_snapshot) >= start_offset
-            }) {
-                continue;
-            }
-            let start = buffer_snapshot.anchor_after(start_offset);
-            let end = buffer_snapshot.anchor_after(end_offset);
-            linked_edits
-                .entry(buffer.clone())
-                .or_default()
-                .push(start..end);
-        }
-        Some(linked_edits)
-    }
-
-    pub fn handle_input(&mut self, text: &str, window: &mut Window, cx: &mut Context<Self>) {
-        let text: Arc<str> = text.into();
-
-        if self.read_only(cx) {
-            return;
-        }
-
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-
-        let selections = self.selections.all_adjusted(cx);
-        let mut bracket_inserted = false;
-        let mut edits = Vec::new();
-        let mut linked_edits = HashMap::<_, Vec<_>>::default();
-        let mut new_selections = Vec::with_capacity(selections.len());
-        let mut new_autoclose_regions = Vec::new();
-        let snapshot = self.buffer.read(cx).read(cx);
-        let mut clear_linked_edit_ranges = false;
-
-        for (selection, autoclose_region) in
-            self.selections_with_autoclose_regions(selections, &snapshot)
-        {
-            if let Some(scope) = snapshot.language_scope_at(selection.head()) {
-                // Determine if the inserted text matches the opening or closing
-                // bracket of any of this language's bracket pairs.
-                let mut bracket_pair = None;
-                let mut is_bracket_pair_start = false;
-                let mut is_bracket_pair_end = false;
-                if !text.is_empty() {
-                    let mut bracket_pair_matching_end = None;
-                    // `text` can be empty when a user is using IME (e.g. Chinese Wubi Simplified)
-                    //  and they are removing the character that triggered IME popup.
-                    for (pair, enabled) in scope.brackets() {
-                        if !pair.close && !pair.surround {
-                            continue;
-                        }
-
-                        if enabled && pair.start.ends_with(text.as_ref()) {
-                            let prefix_len = pair.start.len() - text.len();
-                            let preceding_text_matches_prefix = prefix_len == 0
-                                || (selection.start.column >= (prefix_len as u32)
-                                    && snapshot.contains_str_at(
-                                        Point::new(
-                                            selection.start.row,
-                                            selection.start.column - (prefix_len as u32),
-                                        ),
-                                        &pair.start[..prefix_len],
-                                    ));
-                            if preceding_text_matches_prefix {
-                                bracket_pair = Some(pair.clone());
-                                is_bracket_pair_start = true;
-                                break;
-                            }
-                        }
-                        if pair.end.as_str() == text.as_ref() && bracket_pair_matching_end.is_none()
-                        {
-                            // take first bracket pair matching end, but don't break in case a later bracket
-                            // pair matches start
-                            bracket_pair_matching_end = Some(pair.clone());
-                        }
-                    }
-                    if bracket_pair.is_none() && bracket_pair_matching_end.is_some() {
-                        bracket_pair = Some(bracket_pair_matching_end.unwrap());
-                        is_bracket_pair_end = true;
-                    }
-                }
-
-                if let Some(bracket_pair) = bracket_pair {
-                    let snapshot_settings = snapshot.language_settings_at(selection.start, cx);
-                    let autoclose = self.use_autoclose && snapshot_settings.use_autoclose;
-                    let auto_surround =
-                        self.use_auto_surround && snapshot_settings.use_auto_surround;
-                    if selection.is_empty() {
-                        if is_bracket_pair_start {
-                            // If the inserted text is a suffix of an opening bracket and the
-                            // selection is preceded by the rest of the opening bracket, then
-                            // insert the closing bracket.
-                            let following_text_allows_autoclose = snapshot
-                                .chars_at(selection.start)
-                                .next()
-                                .map_or(true, |c| scope.should_autoclose_before(c));
-
-                            let preceding_text_allows_autoclose = selection.start.column == 0
-                                || snapshot.reversed_chars_at(selection.start).next().map_or(
-                                    true,
-                                    |c| {
-                                        bracket_pair.start != bracket_pair.end
-                                            || !snapshot
-                                                .char_classifier_at(selection.start)
-                                                .is_word(c)
-                                    },
-                                );
-
-                            let is_closing_quote = if bracket_pair.end == bracket_pair.start
-                                && bracket_pair.start.len() == 1
-                            {
-                                let target = bracket_pair.start.chars().next().unwrap();
-                                let current_line_count = snapshot
-                                    .reversed_chars_at(selection.start)
-                                    .take_while(|&c| c != '\n')
-                                    .filter(|&c| c == target)
-                                    .count();
-                                current_line_count % 2 == 1
-                            } else {
-                                false
-                            };
-
-                            if autoclose
-                                && bracket_pair.close
-                                && following_text_allows_autoclose
-                                && preceding_text_allows_autoclose
-                                && !is_closing_quote
-                            {
-                                let anchor = snapshot.anchor_before(selection.end);
-                                new_selections.push((selection.map(|_| anchor), text.len()));
-                                new_autoclose_regions.push((
-                                    anchor,
-                                    text.len(),
-                                    selection.id,
-                                    bracket_pair.clone(),
-                                ));
-                                edits.push((
-                                    selection.range(),
-                                    format!("{}{}", text, bracket_pair.end).into(),
-                                ));
-                                bracket_inserted = true;
-                                continue;
-                            }
-                        }
-
-                        if let Some(region) = autoclose_region {
-                            // If the selection is followed by an auto-inserted closing bracket,
-                            // then don't insert that closing bracket again; just move the selection
-                            // past the closing bracket.
-                            let should_skip = selection.end == region.range.end.to_point(&snapshot)
-                                && text.as_ref() == region.pair.end.as_str();
-                            if should_skip {
-                                let anchor = snapshot.anchor_after(selection.end);
-                                new_selections
-                                    .push((selection.map(|_| anchor), region.pair.end.len()));
-                                continue;
-                            }
-                        }
-
-                        let always_treat_brackets_as_autoclosed = snapshot
-                            .language_settings_at(selection.start, cx)
-                            .always_treat_brackets_as_autoclosed;
-                        if always_treat_brackets_as_autoclosed
-                            && is_bracket_pair_end
-                            && snapshot.contains_str_at(selection.end, text.as_ref())
-                        {
-                            // Otherwise, when `always_treat_brackets_as_autoclosed` is set to `true
-                            // and the inserted text is a closing bracket and the selection is followed
-                            // by the closing bracket then move the selection past the closing bracket.
-                            let anchor = snapshot.anchor_after(selection.end);
-                            new_selections.push((selection.map(|_| anchor), text.len()));
-                            continue;
-                        }
-                    }
-                    // If an opening bracket is 1 character long and is typed while
-                    // text is selected, then surround that text with the bracket pair.
-                    else if auto_surround
-                        && bracket_pair.surround
-                        && is_bracket_pair_start
-                        && bracket_pair.start.chars().count() == 1
-                    {
-                        edits.push((selection.start..selection.start, text.clone()));
-                        edits.push((
-                            selection.end..selection.end,
-                            bracket_pair.end.as_str().into(),
-                        ));
-                        bracket_inserted = true;
-                        new_selections.push((
-                            Selection {
-                                id: selection.id,
-                                start: snapshot.anchor_after(selection.start),
-                                end: snapshot.anchor_before(selection.end),
-                                reversed: selection.reversed,
-                                goal: selection.goal,
-                            },
-                            0,
-                        ));
-                        continue;
-                    }
-                }
-            }
-
-            if self.auto_replace_emoji_shortcode
-                && selection.is_empty()
-                && text.as_ref().ends_with(':')
-            {
-                if let Some(possible_emoji_short_code) =
-                    Self::find_possible_emoji_shortcode_at_position(&snapshot, selection.start)
-                {
-                    if !possible_emoji_short_code.is_empty() {
-                        if let Some(emoji) = emojis::get_by_shortcode(&possible_emoji_short_code) {
-                            let emoji_shortcode_start = Point::new(
-                                selection.start.row,
-                                selection.start.column - possible_emoji_short_code.len() as u32 - 1,
-                            );
-
-                            // Remove shortcode from buffer
-                            edits.push((
-                                emoji_shortcode_start..selection.start,
-                                "".to_string().into(),
-                            ));
-                            new_selections.push((
-                                Selection {
-                                    id: selection.id,
-                                    start: snapshot.anchor_after(emoji_shortcode_start),
-                                    end: snapshot.anchor_before(selection.start),
-                                    reversed: selection.reversed,
-                                    goal: selection.goal,
-                                },
-                                0,
-                            ));
-
-                            // Insert emoji
-                            let selection_start_anchor = snapshot.anchor_after(selection.start);
-                            new_selections.push((selection.map(|_| selection_start_anchor), 0));
-                            edits.push((selection.start..selection.end, emoji.to_string().into()));
-
-                            continue;
-                        }
-                    }
-                }
-            }
-
-            // If not handling any auto-close operation, then just replace the selected
-            // text with the given input and move the selection to the end of the
-            // newly inserted text.
-            let anchor = snapshot.anchor_after(selection.end);
-            if !self.linked_edit_ranges.is_empty() {
-                let start_anchor = snapshot.anchor_before(selection.start);
-
-                let is_word_char = text.chars().next().map_or(true, |char| {
-                    let classifier = snapshot.char_classifier_at(start_anchor.to_offset(&snapshot));
-                    classifier.is_word(char)
-                });
-
-                if is_word_char {
-                    if let Some(ranges) = self
-                        .linked_editing_ranges_for(start_anchor.text_anchor..anchor.text_anchor, cx)
-                    {
-                        for (buffer, edits) in ranges {
-                            linked_edits
-                                .entry(buffer.clone())
-                                .or_default()
-                                .extend(edits.into_iter().map(|range| (range, text.clone())));
-                        }
-                    }
-                } else {
-                    clear_linked_edit_ranges = true;
-                }
-            }
-
-            new_selections.push((selection.map(|_| anchor), 0));
-            edits.push((selection.start..selection.end, text.clone()));
-        }
-
-        drop(snapshot);
-
-        self.transact(window, cx, |this, window, cx| {
-            if clear_linked_edit_ranges {
-                this.linked_edit_ranges.clear();
-            }
-            let initial_buffer_versions =
-                jsx_tag_auto_close::construct_initial_buffer_versions_map(this, &edits, cx);
-
-            this.buffer.update(cx, |buffer, cx| {
-                buffer.edit(edits, this.autoindent_mode.clone(), cx);
-            });
-            for (buffer, edits) in linked_edits {
-                buffer.update(cx, |buffer, cx| {
-                    let snapshot = buffer.snapshot();
-                    let edits = edits
-                        .into_iter()
-                        .map(|(range, text)| {
-                            use text::ToPoint as TP;
-                            let end_point = TP::to_point(&range.end, &snapshot);
-                            let start_point = TP::to_point(&range.start, &snapshot);
-                            (start_point..end_point, text)
-                        })
-                        .sorted_by_key(|(range, _)| range.start);
-                    buffer.edit(edits, None, cx);
-                })
-            }
-            let new_anchor_selections = new_selections.iter().map(|e| &e.0);
-            let new_selection_deltas = new_selections.iter().map(|e| e.1);
-            let map = this.display_map.update(cx, |map, cx| map.snapshot(cx));
-            let new_selections = resolve_selections::<usize, _>(new_anchor_selections, &map)
-                .zip(new_selection_deltas)
-                .map(|(selection, delta)| Selection {
-                    id: selection.id,
-                    start: selection.start + delta,
-                    end: selection.end + delta,
-                    reversed: selection.reversed,
-                    goal: SelectionGoal::None,
-                })
-                .collect::<Vec<_>>();
-
-            let mut i = 0;
-            for (position, delta, selection_id, pair) in new_autoclose_regions {
-                let position = position.to_offset(&map.buffer_snapshot) + delta;
-                let start = map.buffer_snapshot.anchor_before(position);
-                let end = map.buffer_snapshot.anchor_after(position);
-                while let Some(existing_state) = this.autoclose_regions.get(i) {
-                    match existing_state.range.start.cmp(&start, &map.buffer_snapshot) {
-                        Ordering::Less => i += 1,
-                        Ordering::Greater => break,
-                        Ordering::Equal => {
-                            match end.cmp(&existing_state.range.end, &map.buffer_snapshot) {
-                                Ordering::Less => i += 1,
-                                Ordering::Equal => break,
-                                Ordering::Greater => break,
-                            }
-                        }
-                    }
-                }
-                this.autoclose_regions.insert(
-                    i,
-                    AutocloseRegion {
-                        selection_id,
-                        range: start..end,
-                        pair,
-                    },
-                );
-            }
-
-            let had_active_inline_completion = this.has_active_inline_completion();
-            this.change_selections_inner(Some(Autoscroll::fit()), false, window, cx, |s| {
-                s.select(new_selections)
-            });
-
-            if !bracket_inserted {
-                if let Some(on_type_format_task) =
-                    this.trigger_on_type_formatting(text.to_string(), window, cx)
-                {
-                    on_type_format_task.detach_and_log_err(cx);
-                }
-            }
-
-            let editor_settings = EditorSettings::get_global(cx);
-            if bracket_inserted
-                && (editor_settings.auto_signature_help
-                    || editor_settings.show_signature_help_after_edits)
-            {
-                this.show_signature_help(&ShowSignatureHelp, window, cx);
-            }
-
-            let trigger_in_words =
-                this.show_edit_predictions_in_menu() || !had_active_inline_completion;
-            if this.hard_wrap.is_some() {
-                let latest: Range<Point> = this.selections.newest(cx).range();
-                if latest.is_empty()
-                    && this
-                        .buffer()
-                        .read(cx)
-                        .snapshot(cx)
-                        .line_len(MultiBufferRow(latest.start.row))
-                        == latest.start.column
-                {
-                    this.rewrap_impl(
-                        RewrapOptions {
-                            override_language_settings: true,
-                            preserve_existing_whitespace: true,
-                        },
-                        cx,
-                    )
-                }
-            }
-            this.trigger_completion_on_input(&text, trigger_in_words, window, cx);
-            linked_editing_ranges::refresh_linked_ranges(this, window, cx);
-            this.refresh_inline_completion(true, false, window, cx);
-            jsx_tag_auto_close::handle_from(this, initial_buffer_versions, window, cx);
-        });
-    }
-
-    fn find_possible_emoji_shortcode_at_position(
-        snapshot: &MultiBufferSnapshot,
-        position: Point,
-    ) -> Option<String> {
-        let mut chars = Vec::new();
-        let mut found_colon = false;
-        for char in snapshot.reversed_chars_at(position).take(100) {
-            // Found a possible emoji shortcode in the middle of the buffer
-            if found_colon {
-                if char.is_whitespace() {
-                    chars.reverse();
-                    return Some(chars.iter().collect());
-                }
-                // If the previous character is not a whitespace, we are in the middle of a word
-                // and we only want to complete the shortcode if the word is made up of other emojis
-                let mut containing_word = String::new();
-                for ch in snapshot
-                    .reversed_chars_at(position)
-                    .skip(chars.len() + 1)
-                    .take(100)
-                {
-                    if ch.is_whitespace() {
-                        break;
-                    }
-                    containing_word.push(ch);
-                }
-                let containing_word = containing_word.chars().rev().collect::<String>();
-                if util::word_consists_of_emojis(containing_word.as_str()) {
-                    chars.reverse();
-                    return Some(chars.iter().collect());
-                }
-            }
-
-            if char.is_whitespace() || !char.is_ascii() {
-                return None;
-            }
-            if char == ':' {
-                found_colon = true;
-            } else {
-                chars.push(char);
-            }
-        }
-        // Found a possible emoji shortcode at the beginning of the buffer
-        chars.reverse();
-        Some(chars.iter().collect())
-    }
-
-    pub fn newline(&mut self, _: &Newline, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-        self.transact(window, cx, |this, window, cx| {
-            let (edits, selection_fixup_info): (Vec<_>, Vec<_>) = {
-                let selections = this.selections.all::<usize>(cx);
-                let multi_buffer = this.buffer.read(cx);
-                let buffer = multi_buffer.snapshot(cx);
-                selections
-                    .iter()
-                    .map(|selection| {
-                        let start_point = selection.start.to_point(&buffer);
-                        let mut indent =
-                            buffer.indent_size_for_line(MultiBufferRow(start_point.row));
-                        indent.len = cmp::min(indent.len, start_point.column);
-                        let start = selection.start;
-                        let end = selection.end;
-                        let selection_is_empty = start == end;
-                        let language_scope = buffer.language_scope_at(start);
-                        let (comment_delimiter, insert_extra_newline) = if let Some(language) =
-                            &language_scope
-                        {
-                            let insert_extra_newline =
-                                insert_extra_newline_brackets(&buffer, start..end, language)
-                                    || insert_extra_newline_tree_sitter(&buffer, start..end);
-
-                            // Comment extension on newline is allowed only for cursor selections
-                            let comment_delimiter = maybe!({
-                                if !selection_is_empty {
-                                    return None;
-                                }
-
-                                if !multi_buffer.language_settings(cx).extend_comment_on_newline {
-                                    return None;
-                                }
-
-                                let delimiters = language.line_comment_prefixes();
-                                let max_len_of_delimiter =
-                                    delimiters.iter().map(|delimiter| delimiter.len()).max()?;
-                                let (snapshot, range) =
-                                    buffer.buffer_line_for_row(MultiBufferRow(start_point.row))?;
-
-                                let mut index_of_first_non_whitespace = 0;
-                                let comment_candidate = snapshot
-                                    .chars_for_range(range)
-                                    .skip_while(|c| {
-                                        let should_skip = c.is_whitespace();
-                                        if should_skip {
-                                            index_of_first_non_whitespace += 1;
-                                        }
-                                        should_skip
-                                    })
-                                    .take(max_len_of_delimiter)
-                                    .collect::<String>();
-                                let comment_prefix = delimiters.iter().find(|comment_prefix| {
-                                    comment_candidate.starts_with(comment_prefix.as_ref())
-                                })?;
-                                let cursor_is_placed_after_comment_marker =
-                                    index_of_first_non_whitespace + comment_prefix.len()
-                                        <= start_point.column as usize;
-                                if cursor_is_placed_after_comment_marker {
-                                    Some(comment_prefix.clone())
-                                } else {
-                                    None
-                                }
-                            });
-                            (comment_delimiter, insert_extra_newline)
-                        } else {
-                            (None, false)
-                        };
-
-                        let capacity_for_delimiter = comment_delimiter
-                            .as_deref()
-                            .map(str::len)
-                            .unwrap_or_default();
-                        let mut new_text =
-                            String::with_capacity(1 + capacity_for_delimiter + indent.len as usize);
-                        new_text.push('\n');
-                        new_text.extend(indent.chars());
-                        if let Some(delimiter) = &comment_delimiter {
-                            new_text.push_str(delimiter);
-                        }
-                        if insert_extra_newline {
-                            new_text = new_text.repeat(2);
-                        }
-
-                        let anchor = buffer.anchor_after(end);
-                        let new_selection = selection.map(|_| anchor);
-                        (
-                            (start..end, new_text),
-                            (insert_extra_newline, new_selection),
-                        )
-                    })
-                    .unzip()
-            };
-
-            this.edit_with_autoindent(edits, cx);
-            let buffer = this.buffer.read(cx).snapshot(cx);
-            let new_selections = selection_fixup_info
-                .into_iter()
-                .map(|(extra_newline_inserted, new_selection)| {
-                    let mut cursor = new_selection.end.to_point(&buffer);
-                    if extra_newline_inserted {
-                        cursor.row -= 1;
-                        cursor.column = buffer.line_len(MultiBufferRow(cursor.row));
-                    }
-                    new_selection.map(|_| cursor)
-                })
-                .collect();
-
-            this.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-                s.select(new_selections)
-            });
-            this.refresh_inline_completion(true, false, window, cx);
-        });
-    }
-
-    pub fn newline_above(&mut self, _: &NewlineAbove, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-
-        let buffer = self.buffer.read(cx);
-        let snapshot = buffer.snapshot(cx);
-
-        let mut edits = Vec::new();
-        let mut rows = Vec::new();
-
-        for (rows_inserted, selection) in self.selections.all_adjusted(cx).into_iter().enumerate() {
-            let cursor = selection.head();
-            let row = cursor.row;
-
-            let start_of_line = snapshot.clip_point(Point::new(row, 0), Bias::Left);
-
-            let newline = "\n".to_string();
-            edits.push((start_of_line..start_of_line, newline));
-
-            rows.push(row + rows_inserted as u32);
-        }
-
-        self.transact(window, cx, |editor, window, cx| {
-            editor.edit(edits, cx);
-
-            editor.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-                let mut index = 0;
-                s.move_cursors_with(|map, _, _| {
-                    let row = rows[index];
-                    index += 1;
-
-                    let point = Point::new(row, 0);
-                    let boundary = map.next_line_boundary(point).1;
-                    let clipped = map.clip_point(boundary, Bias::Left);
-
-                    (clipped, SelectionGoal::None)
-                });
-            });
-
-            let mut indent_edits = Vec::new();
-            let multibuffer_snapshot = editor.buffer.read(cx).snapshot(cx);
-            for row in rows {
-                let indents = multibuffer_snapshot.suggested_indents(row..row + 1, cx);
-                for (row, indent) in indents {
-                    if indent.len == 0 {
-                        continue;
-                    }
-
-                    let text = match indent.kind {
-                        IndentKind::Space => " ".repeat(indent.len as usize),
-                        IndentKind::Tab => "\t".repeat(indent.len as usize),
-                    };
-                    let point = Point::new(row.0, 0);
-                    indent_edits.push((point..point, text));
-                }
-            }
-            editor.edit(indent_edits, cx);
-        });
-    }
-
-    pub fn newline_below(&mut self, _: &NewlineBelow, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-
-        let buffer = self.buffer.read(cx);
-        let snapshot = buffer.snapshot(cx);
-
-        let mut edits = Vec::new();
-        let mut rows = Vec::new();
-        let mut rows_inserted = 0;
-
-        for selection in self.selections.all_adjusted(cx) {
-            let cursor = selection.head();
-            let row = cursor.row;
-
-            let point = Point::new(row + 1, 0);
-            let start_of_line = snapshot.clip_point(point, Bias::Left);
-
-            let newline = "\n".to_string();
-            edits.push((start_of_line..start_of_line, newline));
-
-            rows_inserted += 1;
-            rows.push(row + rows_inserted);
-        }
-
-        self.transact(window, cx, |editor, window, cx| {
-            editor.edit(edits, cx);
-
-            editor.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-                let mut index = 0;
-                s.move_cursors_with(|map, _, _| {
-                    let row = rows[index];
-                    index += 1;
-
-                    let point = Point::new(row, 0);
-                    let boundary = map.next_line_boundary(point).1;
-                    let clipped = map.clip_point(boundary, Bias::Left);
-
-                    (clipped, SelectionGoal::None)
-                });
-            });
-
-            let mut indent_edits = Vec::new();
-            let multibuffer_snapshot = editor.buffer.read(cx).snapshot(cx);
-            for row in rows {
-                let indents = multibuffer_snapshot.suggested_indents(row..row + 1, cx);
-                for (row, indent) in indents {
-                    if indent.len == 0 {
-                        continue;
-                    }
-
-                    let text = match indent.kind {
-                        IndentKind::Space => " ".repeat(indent.len as usize),
-                        IndentKind::Tab => "\t".repeat(indent.len as usize),
-                    };
-                    let point = Point::new(row.0, 0);
-                    indent_edits.push((point..point, text));
-                }
-            }
-            editor.edit(indent_edits, cx);
-        });
-    }
-
-    pub fn insert(&mut self, text: &str, window: &mut Window, cx: &mut Context<Self>) {
-        let autoindent = text.is_empty().not().then(|| AutoindentMode::Block {
-            original_indent_columns: Vec::new(),
-        });
-        self.insert_with_autoindent_mode(text, autoindent, window, cx);
-    }
-
-    fn insert_with_autoindent_mode(
-        &mut self,
-        text: &str,
-        autoindent_mode: Option<AutoindentMode>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.read_only(cx) {
-            return;
-        }
-
-        let text: Arc<str> = text.into();
-        self.transact(window, cx, |this, window, cx| {
-            let old_selections = this.selections.all_adjusted(cx);
-            let selection_anchors = this.buffer.update(cx, |buffer, cx| {
-                let anchors = {
-                    let snapshot = buffer.read(cx);
-                    old_selections
-                        .iter()
-                        .map(|s| {
-                            let anchor = snapshot.anchor_after(s.head());
-                            s.map(|_| anchor)
-                        })
-                        .collect::<Vec<_>>()
-                };
-                buffer.edit(
-                    old_selections
-                        .iter()
-                        .map(|s| (s.start..s.end, text.clone())),
-                    autoindent_mode,
-                    cx,
-                );
-                anchors
-            });
-
-            this.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-                s.select_anchors(selection_anchors);
-            });
-
-            cx.notify();
-        });
-    }
-
-    fn trigger_completion_on_input(
-        &mut self,
-        text: &str,
-        trigger_in_words: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let ignore_completion_provider = self
-            .context_menu
-            .borrow()
-            .as_ref()
-            .map(|menu| match menu {
-                CodeContextMenu::Completions(completions_menu) => {
-                    completions_menu.ignore_completion_provider
-                }
-                CodeContextMenu::CodeActions(_) => false,
-            })
-            .unwrap_or(false);
-
-        if ignore_completion_provider {
-            self.show_word_completions(&ShowWordCompletions, window, cx);
-        } else if self.is_completion_trigger(text, trigger_in_words, cx) {
-            self.show_completions(
-                &ShowCompletions {
-                    trigger: Some(text.to_owned()).filter(|x| !x.is_empty()),
-                },
-                window,
-                cx,
-            );
-        } else {
-            self.hide_context_menu(window, cx);
-        }
-    }
-
-    fn is_completion_trigger(
-        &self,
-        text: &str,
-        trigger_in_words: bool,
-        cx: &mut Context<Self>,
-    ) -> bool {
-        let position = self.selections.newest_anchor().head();
-        let multibuffer = self.buffer.read(cx);
-        let Some(buffer) = position
-            .buffer_id
-            .and_then(|buffer_id| multibuffer.buffer(buffer_id).clone())
-        else {
-            return false;
-        };
-
-        if let Some(completion_provider) = &self.completion_provider {
-            completion_provider.is_completion_trigger(
-                &buffer,
-                position.text_anchor,
-                text,
-                trigger_in_words,
-                cx,
-            )
-        } else {
-            false
-        }
-    }
-
-    /// If any empty selections is touching the start of its innermost containing autoclose
-    /// region, expand it to select the brackets.
-    fn select_autoclose_pair(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let selections = self.selections.all::<usize>(cx);
-        let buffer = self.buffer.read(cx).read(cx);
-        let new_selections = self
-            .selections_with_autoclose_regions(selections, &buffer)
-            .map(|(mut selection, region)| {
-                if !selection.is_empty() {
-                    return selection;
-                }
-
-                if let Some(region) = region {
-                    let mut range = region.range.to_offset(&buffer);
-                    if selection.start == range.start && range.start >= region.pair.start.len() {
-                        range.start -= region.pair.start.len();
-                        if buffer.contains_str_at(range.start, &region.pair.start)
-                            && buffer.contains_str_at(range.end, &region.pair.end)
-                        {
-                            range.end += region.pair.end.len();
-                            selection.start = range.start;
-                            selection.end = range.end;
-
-                            return selection;
-                        }
-                    }
-                }
-
-                let always_treat_brackets_as_autoclosed = buffer
-                    .language_settings_at(selection.start, cx)
-                    .always_treat_brackets_as_autoclosed;
-
-                if !always_treat_brackets_as_autoclosed {
-                    return selection;
-                }
-
-                if let Some(scope) = buffer.language_scope_at(selection.start) {
-                    for (pair, enabled) in scope.brackets() {
-                        if !enabled || !pair.close {
-                            continue;
-                        }
-
-                        if buffer.contains_str_at(selection.start, &pair.end) {
-                            let pair_start_len = pair.start.len();
-                            if buffer.contains_str_at(
-                                selection.start.saturating_sub(pair_start_len),
-                                &pair.start,
-                            ) {
-                                selection.start -= pair_start_len;
-                                selection.end += pair.end.len();
-
-                                return selection;
-                            }
-                        }
-                    }
-                }
-
-                selection
-            })
-            .collect();
-
-        drop(buffer);
-        self.change_selections(None, window, cx, |selections| {
-            selections.select(new_selections)
-        });
-    }
-
-    /// Iterate the given selections, and for each one, find the smallest surrounding
-    /// autoclose region. This uses the ordering of the selections and the autoclose
-    /// regions to avoid repeated comparisons.
-    fn selections_with_autoclose_regions<'a, D: ToOffset + Clone>(
-        &'a self,
-        selections: impl IntoIterator<Item = Selection<D>>,
-        buffer: &'a MultiBufferSnapshot,
-    ) -> impl Iterator<Item = (Selection<D>, Option<&'a AutocloseRegion>)> {
-        let mut i = 0;
-        let mut regions = self.autoclose_regions.as_slice();
-        selections.into_iter().map(move |selection| {
-            let range = selection.start.to_offset(buffer)..selection.end.to_offset(buffer);
-
-            let mut enclosing = None;
-            while let Some(pair_state) = regions.get(i) {
-                if pair_state.range.end.to_offset(buffer) < range.start {
-                    regions = &regions[i + 1..];
-                    i = 0;
-                } else if pair_state.range.start.to_offset(buffer) > range.end {
-                    break;
-                } else {
-                    if pair_state.selection_id == selection.id {
-                        enclosing = Some(pair_state);
-                    }
-                    i += 1;
-                }
-            }
-
-            (selection, enclosing)
-        })
-    }
-
-    /// Remove any autoclose regions that no longer contain their selection.
-    fn invalidate_autoclose_regions(
-        &mut self,
-        mut selections: &[Selection<Anchor>],
-        buffer: &MultiBufferSnapshot,
-    ) {
-        self.autoclose_regions.retain(|state| {
-            let mut i = 0;
-            while let Some(selection) = selections.get(i) {
-                if selection.end.cmp(&state.range.start, buffer).is_lt() {
-                    selections = &selections[1..];
-                    continue;
-                }
-                if selection.start.cmp(&state.range.end, buffer).is_gt() {
-                    break;
-                }
-                if selection.id == state.selection_id {
-                    return true;
-                } else {
-                    i += 1;
-                }
-            }
-            false
-        });
-    }
-
-    fn completion_query(buffer: &MultiBufferSnapshot, position: impl ToOffset) -> Option<String> {
-        let offset = position.to_offset(buffer);
-        let (word_range, kind) = buffer.surrounding_word(offset, true);
-        if offset > word_range.start && kind == Some(CharKind::Word) {
-            Some(
-                buffer
-                    .text_for_range(word_range.start..offset)
-                    .collect::<String>(),
-            )
-        } else {
-            None
-        }
-    }
-
-    pub fn toggle_inline_values(
-        &mut self,
-        _: &ToggleInlineValues,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.inline_value_cache.enabled = !self.inline_value_cache.enabled;
-
-        self.refresh_inline_values(cx);
-    }
-
-    pub fn toggle_inlay_hints(
-        &mut self,
-        _: &ToggleInlayHints,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.refresh_inlay_hints(
-            InlayHintRefreshReason::Toggle(!self.inlay_hints_enabled()),
-            cx,
-        );
-    }
-
-    pub fn inlay_hints_enabled(&self) -> bool {
-        self.inlay_hint_cache.enabled
-    }
-
-    pub fn inline_values_enabled(&self) -> bool {
-        self.inline_value_cache.enabled
-    }
-
-    fn refresh_inlay_hints(&mut self, reason: InlayHintRefreshReason, cx: &mut Context<Self>) {
-        if self.semantics_provider.is_none() || !self.mode.is_full() {
-            return;
-        }
-
-        let reason_description = reason.description();
-        let ignore_debounce = matches!(
-            reason,
-            InlayHintRefreshReason::SettingsChange(_)
-                | InlayHintRefreshReason::Toggle(_)
-                | InlayHintRefreshReason::ExcerptsRemoved(_)
-                | InlayHintRefreshReason::ModifiersChanged(_)
-        );
-        let (invalidate_cache, required_languages) = match reason {
-            InlayHintRefreshReason::ModifiersChanged(enabled) => {
-                match self.inlay_hint_cache.modifiers_override(enabled) {
-                    Some(enabled) => {
-                        if enabled {
-                            (InvalidationStrategy::RefreshRequested, None)
-                        } else {
-                            self.splice_inlays(
-                                &self
-                                    .visible_inlay_hints(cx)
-                                    .iter()
-                                    .map(|inlay| inlay.id)
-                                    .collect::<Vec<InlayId>>(),
-                                Vec::new(),
-                                cx,
-                            );
-                            return;
-                        }
-                    }
-                    None => return,
-                }
-            }
-            InlayHintRefreshReason::Toggle(enabled) => {
-                if self.inlay_hint_cache.toggle(enabled) {
-                    if enabled {
-                        (InvalidationStrategy::RefreshRequested, None)
-                    } else {
-                        self.splice_inlays(
-                            &self
-                                .visible_inlay_hints(cx)
-                                .iter()
-                                .map(|inlay| inlay.id)
-                                .collect::<Vec<InlayId>>(),
-                            Vec::new(),
-                            cx,
-                        );
-                        return;
-                    }
-                } else {
-                    return;
-                }
-            }
-            InlayHintRefreshReason::SettingsChange(new_settings) => {
-                match self.inlay_hint_cache.update_settings(
-                    &self.buffer,
-                    new_settings,
-                    self.visible_inlay_hints(cx),
-                    cx,
-                ) {
-                    ControlFlow::Break(Some(InlaySplice {
-                        to_remove,
-                        to_insert,
-                    })) => {
-                        self.splice_inlays(&to_remove, to_insert, cx);
-                        return;
-                    }
-                    ControlFlow::Break(None) => return,
-                    ControlFlow::Continue(()) => (InvalidationStrategy::RefreshRequested, None),
-                }
-            }
-            InlayHintRefreshReason::ExcerptsRemoved(excerpts_removed) => {
-                if let Some(InlaySplice {
-                    to_remove,
-                    to_insert,
-                }) = self.inlay_hint_cache.remove_excerpts(&excerpts_removed)
-                {
-                    self.splice_inlays(&to_remove, to_insert, cx);
-                }
-                self.display_map.update(cx, |display_map, _| {
-                    display_map.remove_inlays_for_excerpts(&excerpts_removed)
-                });
-                return;
-            }
-            InlayHintRefreshReason::NewLinesShown => (InvalidationStrategy::None, None),
-            InlayHintRefreshReason::BufferEdited(buffer_languages) => {
-                (InvalidationStrategy::BufferEdited, Some(buffer_languages))
-            }
-            InlayHintRefreshReason::RefreshRequested => {
-                (InvalidationStrategy::RefreshRequested, None)
-            }
-        };
-
-        if let Some(InlaySplice {
-            to_remove,
-            to_insert,
-        }) = self.inlay_hint_cache.spawn_hint_refresh(
-            reason_description,
-            self.excerpts_for_inlay_hints_query(required_languages.as_ref(), cx),
-            invalidate_cache,
-            ignore_debounce,
-            cx,
-        ) {
-            self.splice_inlays(&to_remove, to_insert, cx);
-        }
-    }
-
-    fn visible_inlay_hints(&self, cx: &Context<Editor>) -> Vec<Inlay> {
-        self.display_map
-            .read(cx)
-            .current_inlays()
-            .filter(move |inlay| matches!(inlay.id, InlayId::Hint(_)))
-            .cloned()
-            .collect()
-    }
-
-    pub fn excerpts_for_inlay_hints_query(
-        &self,
-        restrict_to_languages: Option<&HashSet<Arc<Language>>>,
-        cx: &mut Context<Editor>,
-    ) -> HashMap<ExcerptId, (Entity<Buffer>, clock::Global, Range<usize>)> {
-        let Some(project) = self.project.as_ref() else {
-            return HashMap::default();
-        };
-        let project = project.read(cx);
-        let multi_buffer = self.buffer().read(cx);
-        let multi_buffer_snapshot = multi_buffer.snapshot(cx);
-        let multi_buffer_visible_start = self
-            .scroll_manager
-            .anchor()
-            .anchor
-            .to_point(&multi_buffer_snapshot);
-        let multi_buffer_visible_end = multi_buffer_snapshot.clip_point(
-            multi_buffer_visible_start
-                + Point::new(self.visible_line_count().unwrap_or(0.).ceil() as u32, 0),
-            Bias::Left,
-        );
-        let multi_buffer_visible_range = multi_buffer_visible_start..multi_buffer_visible_end;
-        multi_buffer_snapshot
-            .range_to_buffer_ranges(multi_buffer_visible_range)
-            .into_iter()
-            .filter(|(_, excerpt_visible_range, _)| !excerpt_visible_range.is_empty())
-            .filter_map(|(buffer, excerpt_visible_range, excerpt_id)| {
-                let buffer_file = project::File::from_dyn(buffer.file())?;
-                let buffer_worktree = project.worktree_for_id(buffer_file.worktree_id(cx), cx)?;
-                let worktree_entry = buffer_worktree
-                    .read(cx)
-                    .entry_for_id(buffer_file.project_entry_id(cx)?)?;
-                if worktree_entry.is_ignored {
-                    return None;
-                }
-
-                let language = buffer.language()?;
-                if let Some(restrict_to_languages) = restrict_to_languages {
-                    if !restrict_to_languages.contains(language) {
-                        return None;
-                    }
-                }
-                Some((
-                    excerpt_id,
-                    (
-                        multi_buffer.buffer(buffer.remote_id()).unwrap(),
-                        buffer.version().clone(),
-                        excerpt_visible_range,
-                    ),
-                ))
-            })
-            .collect()
-    }
-
-    pub fn text_layout_details(&self, window: &mut Window) -> TextLayoutDetails {
-        TextLayoutDetails {
-            text_system: window.text_system().clone(),
-            editor_style: self.style.clone().unwrap(),
-            rem_size: window.rem_size(),
-            scroll_anchor: self.scroll_manager.anchor(),
-            visible_rows: self.visible_line_count(),
-            vertical_scroll_margin: self.scroll_manager.vertical_scroll_margin,
-        }
-    }
-
-    pub fn splice_inlays(
-        &self,
-        to_remove: &[InlayId],
-        to_insert: Vec<Inlay>,
-        cx: &mut Context<Self>,
-    ) {
-        self.display_map.update(cx, |display_map, cx| {
-            display_map.splice_inlays(to_remove, to_insert, cx)
-        });
-        cx.notify();
-    }
-
-    fn trigger_on_type_formatting(
-        &self,
-        input: String,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Task<Result<()>>> {
-        if input.len() != 1 {
-            return None;
-        }
-
-        let project = self.project.as_ref()?;
-        let position = self.selections.newest_anchor().head();
-        let (buffer, buffer_position) = self
-            .buffer
-            .read(cx)
-            .text_anchor_for_position(position, cx)?;
-
-        let settings = language_settings::language_settings(
-            buffer
-                .read(cx)
-                .language_at(buffer_position)
-                .map(|l| l.name()),
-            buffer.read(cx).file(),
-            cx,
-        );
-        if !settings.use_on_type_format {
-            return None;
-        }
-
-        // OnTypeFormatting returns a list of edits, no need to pass them between Zed instances,
-        // hence we do LSP request & edit on host side only — add formats to host's history.
-        let push_to_lsp_host_history = true;
-        // If this is not the host, append its history with new edits.
-        let push_to_client_history = project.read(cx).is_via_collab();
-
-        let on_type_formatting = project.update(cx, |project, cx| {
-            project.on_type_format(
-                buffer.clone(),
-                buffer_position,
-                input,
-                push_to_lsp_host_history,
-                cx,
-            )
-        });
-        Some(cx.spawn_in(window, async move |editor, cx| {
-            if let Some(transaction) = on_type_formatting.await? {
-                if push_to_client_history {
-                    buffer
-                        .update(cx, |buffer, _| {
-                            buffer.push_transaction(transaction, Instant::now());
-                            buffer.finalize_last_transaction();
-                        })
-                        .ok();
-                }
-                editor.update(cx, |editor, cx| {
-                    editor.refresh_document_highlights(cx);
-                })?;
-            }
-            Ok(())
-        }))
-    }
-
-    pub fn show_word_completions(
-        &mut self,
-        _: &ShowWordCompletions,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.open_completions_menu(true, None, window, cx);
-    }
-
-    pub fn show_completions(
-        &mut self,
-        options: &ShowCompletions,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.open_completions_menu(false, options.trigger.as_deref(), window, cx);
-    }
-
-    fn open_completions_menu(
-        &mut self,
-        ignore_completion_provider: bool,
-        trigger: Option<&str>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.pending_rename.is_some() {
-            return;
-        }
-        if !self.snippet_stack.is_empty() && self.context_menu.borrow().as_ref().is_some() {
-            return;
-        }
-
-        let position = self.selections.newest_anchor().head();
-        if position.diff_base_anchor.is_some() {
-            return;
-        }
-        let (buffer, buffer_position) =
-            if let Some(output) = self.buffer.read(cx).text_anchor_for_position(position, cx) {
-                output
-            } else {
-                return;
-            };
-        let buffer_snapshot = buffer.read(cx).snapshot();
-        let show_completion_documentation = buffer_snapshot
-            .settings_at(buffer_position, cx)
-            .show_completion_documentation;
-
-        let query = Self::completion_query(&self.buffer.read(cx).read(cx), position);
-
-        let trigger_kind = match trigger {
-            Some(trigger) if buffer.read(cx).completion_triggers().contains(trigger) => {
-                CompletionTriggerKind::TRIGGER_CHARACTER
-            }
-            _ => CompletionTriggerKind::INVOKED,
-        };
-        let completion_context = CompletionContext {
-            trigger_character: trigger.and_then(|trigger| {
-                if trigger_kind == CompletionTriggerKind::TRIGGER_CHARACTER {
-                    Some(String::from(trigger))
-                } else {
-                    None
-                }
-            }),
-            trigger_kind,
-        };
-
-        let (old_range, word_kind) = buffer_snapshot.surrounding_word(buffer_position);
-        let (old_range, word_to_exclude) = if word_kind == Some(CharKind::Word) {
-            let word_to_exclude = buffer_snapshot
-                .text_for_range(old_range.clone())
-                .collect::<String>();
-            (
-                buffer_snapshot.anchor_before(old_range.start)
-                    ..buffer_snapshot.anchor_after(old_range.end),
-                Some(word_to_exclude),
-            )
-        } else {
-            (buffer_position..buffer_position, None)
-        };
-
-        let completion_settings = language_settings(
-            buffer_snapshot
-                .language_at(buffer_position)
-                .map(|language| language.name()),
-            buffer_snapshot.file(),
-            cx,
-        )
-        .completions;
-
-        // The document can be large, so stay in reasonable bounds when searching for words,
-        // otherwise completion pop-up might be slow to appear.
-        const WORD_LOOKUP_ROWS: u32 = 5_000;
-        let buffer_row = text::ToPoint::to_point(&buffer_position, &buffer_snapshot).row;
-        let min_word_search = buffer_snapshot.clip_point(
-            Point::new(buffer_row.saturating_sub(WORD_LOOKUP_ROWS), 0),
-            Bias::Left,
-        );
-        let max_word_search = buffer_snapshot.clip_point(
-            Point::new(buffer_row + WORD_LOOKUP_ROWS, 0).min(buffer_snapshot.max_point()),
-            Bias::Right,
-        );
-        let word_search_range = buffer_snapshot.point_to_offset(min_word_search)
-            ..buffer_snapshot.point_to_offset(max_word_search);
-
-        let provider = self
-            .completion_provider
-            .as_ref()
-            .filter(|_| !ignore_completion_provider);
-        let skip_digits = query
-            .as_ref()
-            .map_or(true, |query| !query.chars().any(|c| c.is_digit(10)));
-
-        let (mut words, provided_completions) = match provider {
-            Some(provider) => {
-                let completions = provider.completions(
-                    position.excerpt_id,
-                    &buffer,
-                    buffer_position,
-                    completion_context,
-                    window,
-                    cx,
-                );
-
-                let words = match completion_settings.words {
-                    WordsCompletionMode::Disabled => Task::ready(BTreeMap::default()),
-                    WordsCompletionMode::Enabled | WordsCompletionMode::Fallback => cx
-                        .background_spawn(async move {
-                            buffer_snapshot.words_in_range(WordsQuery {
-                                fuzzy_contents: None,
-                                range: word_search_range,
-                                skip_digits,
-                            })
-                        }),
-                };
-
-                (words, completions)
-            }
-            None => (
-                cx.background_spawn(async move {
-                    buffer_snapshot.words_in_range(WordsQuery {
-                        fuzzy_contents: None,
-                        range: word_search_range,
-                        skip_digits,
-                    })
-                }),
-                Task::ready(Ok(None)),
-            ),
-        };
-
-        let sort_completions = provider
-            .as_ref()
-            .map_or(false, |provider| provider.sort_completions());
-
-        let filter_completions = provider
-            .as_ref()
-            .map_or(true, |provider| provider.filter_completions());
-
-        let snippet_sort_order = EditorSettings::get_global(cx).snippet_sort_order;
-
-        let id = post_inc(&mut self.next_completion_id);
-        let task = cx.spawn_in(window, async move |editor, cx| {
-            async move {
-                editor.update(cx, |this, _| {
-                    this.completion_tasks.retain(|(task_id, _)| *task_id >= id);
-                })?;
-
-                let mut completions = Vec::new();
-                if let Some(provided_completions) = provided_completions.await.log_err().flatten() {
-                    completions.extend(provided_completions);
-                    if completion_settings.words == WordsCompletionMode::Fallback {
-                        words = Task::ready(BTreeMap::default());
-                    }
-                }
-
-                let mut words = words.await;
-                if let Some(word_to_exclude) = &word_to_exclude {
-                    words.remove(word_to_exclude);
-                }
-                for lsp_completion in &completions {
-                    words.remove(&lsp_completion.new_text);
-                }
-                completions.extend(words.into_iter().map(|(word, word_range)| Completion {
-                    replace_range: old_range.clone(),
-                    new_text: word.clone(),
-                    label: CodeLabel::plain(word, None),
-                    icon_path: None,
-                    documentation: None,
-                    source: CompletionSource::BufferWord {
-                        word_range,
-                        resolved: false,
-                    },
-                    insert_text_mode: Some(InsertTextMode::AS_IS),
-                    confirm: None,
-                }));
-
-                let menu = if completions.is_empty() {
-                    None
-                } else {
-                    let mut menu = CompletionsMenu::new(
-                        id,
-                        sort_completions,
-                        show_completion_documentation,
-                        ignore_completion_provider,
-                        position,
-                        buffer.clone(),
-                        completions.into(),
-                        snippet_sort_order,
-                    );
-
-                    menu.filter(
-                        if filter_completions {
-                            query.as_deref()
-                        } else {
-                            None
-                        },
-                        cx.background_executor().clone(),
-                    )
-                    .await;
-
-                    menu.visible().then_some(menu)
-                };
-
-                editor.update_in(cx, |editor, window, cx| {
-                    match editor.context_menu.borrow().as_ref() {
-                        None => {}
-                        Some(CodeContextMenu::Completions(prev_menu)) => {
-                            if prev_menu.id > id {
-                                return;
-                            }
-                        }
-                        _ => return,
-                    }
-
-                    if editor.focus_handle.is_focused(window) && menu.is_some() {
-                        let mut menu = menu.unwrap();
-                        menu.resolve_visible_completions(editor.completion_provider.as_deref(), cx);
-
-                        *editor.context_menu.borrow_mut() =
-                            Some(CodeContextMenu::Completions(menu));
-
-                        if editor.show_edit_predictions_in_menu() {
-                            editor.update_visible_inline_completion(window, cx);
-                        } else {
-                            editor.discard_inline_completion(false, cx);
-                        }
-
-                        cx.notify();
-                    } else if editor.completion_tasks.len() <= 1 {
-                        // If there are no more completion tasks and the last menu was
-                        // empty, we should hide it.
-                        let was_hidden = editor.hide_context_menu(window, cx).is_none();
-                        // If it was already hidden and we don't show inline
-                        // completions in the menu, we should also show the
-                        // inline-completion when available.
-                        if was_hidden && editor.show_edit_predictions_in_menu() {
-                            editor.update_visible_inline_completion(window, cx);
-                        }
-                    }
-                })?;
-
-                anyhow::Ok(())
-            }
-            .log_err()
-            .await
-        });
-
-        self.completion_tasks.push((id, task));
-    }
-
-    #[cfg(feature = "test-support")]
-    pub fn current_completions(&self) -> Option<Vec<project::Completion>> {
-        let menu = self.context_menu.borrow();
-        if let CodeContextMenu::Completions(menu) = menu.as_ref()? {
-            let completions = menu.completions.borrow();
-            Some(completions.to_vec())
-        } else {
-            None
-        }
-    }
-
-    pub fn confirm_completion(
-        &mut self,
-        action: &ConfirmCompletion,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Task<Result<()>>> {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-        self.do_completion(action.item_ix, CompletionIntent::Complete, window, cx)
-    }
-
-    pub fn confirm_completion_insert(
-        &mut self,
-        _: &ConfirmCompletionInsert,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Task<Result<()>>> {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-        self.do_completion(None, CompletionIntent::CompleteWithInsert, window, cx)
-    }
-
-    pub fn confirm_completion_replace(
-        &mut self,
-        _: &ConfirmCompletionReplace,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Task<Result<()>>> {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-        self.do_completion(None, CompletionIntent::CompleteWithReplace, window, cx)
-    }
-
-    pub fn compose_completion(
-        &mut self,
-        action: &ComposeCompletion,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Task<Result<()>>> {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-        self.do_completion(action.item_ix, CompletionIntent::Compose, window, cx)
-    }
-
-    fn do_completion(
-        &mut self,
-        item_ix: Option<usize>,
-        intent: CompletionIntent,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) -> Option<Task<Result<()>>> {
-        use language::ToOffset as _;
-
-        let CodeContextMenu::Completions(completions_menu) = self.hide_context_menu(window, cx)?
-        else {
-            return None;
-        };
-
-        let candidate_id = {
-            let entries = completions_menu.entries.borrow();
-            let mat = entries.get(item_ix.unwrap_or(completions_menu.selected_item))?;
-            if self.show_edit_predictions_in_menu() {
-                self.discard_inline_completion(true, cx);
-            }
-            mat.candidate_id
-        };
-
-        let buffer_handle = completions_menu.buffer;
-        let completion = completions_menu
-            .completions
-            .borrow()
-            .get(candidate_id)?
-            .clone();
-        cx.stop_propagation();
-
-        let snippet;
-        let new_text;
-        if completion.is_snippet() {
-            snippet = Some(Snippet::parse(&completion.new_text).log_err()?);
-            new_text = snippet.as_ref().unwrap().text.clone();
-        } else {
-            snippet = None;
-            new_text = completion.new_text.clone();
-        };
-
-        let replace_range = choose_completion_range(&completion, intent, &buffer_handle, cx);
-        let buffer = buffer_handle.read(cx);
-        let snapshot = self.buffer.read(cx).snapshot(cx);
-        let replace_range_multibuffer = {
-            let excerpt = snapshot
-                .excerpt_containing(self.selections.newest_anchor().range())
-                .unwrap();
-            let multibuffer_anchor = snapshot
-                .anchor_in_excerpt(excerpt.id(), buffer.anchor_before(replace_range.start))
-                .unwrap()
-                ..snapshot
-                    .anchor_in_excerpt(excerpt.id(), buffer.anchor_before(replace_range.end))
-                    .unwrap();
-            multibuffer_anchor.start.to_offset(&snapshot)
-                ..multibuffer_anchor.end.to_offset(&snapshot)
-        };
-        let newest_anchor = self.selections.newest_anchor();
-        if newest_anchor.head().buffer_id != Some(buffer.remote_id()) {
-            return None;
-        }
-
-        let old_text = buffer
-            .text_for_range(replace_range.clone())
-            .collect::<String>();
-        let lookbehind = newest_anchor
-            .start
-            .text_anchor
-            .to_offset(buffer)
-            .saturating_sub(replace_range.start);
-        let lookahead = replace_range
-            .end
-            .saturating_sub(newest_anchor.end.text_anchor.to_offset(buffer));
-        let prefix = &old_text[..old_text.len().saturating_sub(lookahead)];
-        let suffix = &old_text[lookbehind.min(old_text.len())..];
-
-        let selections = self.selections.all::<usize>(cx);
-        let mut ranges = Vec::new();
-        let mut linked_edits = HashMap::<_, Vec<_>>::default();
-
-        for selection in &selections {
-            let range = if selection.id == newest_anchor.id {
-                replace_range_multibuffer.clone()
-            } else {
-                let mut range = selection.range();
-
-                // if prefix is present, don't duplicate it
-                if snapshot.contains_str_at(range.start.saturating_sub(lookbehind), prefix) {
-                    range.start = range.start.saturating_sub(lookbehind);
-
-                    // if suffix is also present, mimic the newest cursor and replace it
-                    if selection.id != newest_anchor.id
-                        && snapshot.contains_str_at(range.end, suffix)
-                    {
-                        range.end += lookahead;
-                    }
-                }
-                range
-            };
-
-            ranges.push(range);
-
-            if !self.linked_edit_ranges.is_empty() {
-                let start_anchor = snapshot.anchor_before(selection.head());
-                let end_anchor = snapshot.anchor_after(selection.tail());
-                if let Some(ranges) = self
-                    .linked_editing_ranges_for(start_anchor.text_anchor..end_anchor.text_anchor, cx)
-                {
-                    for (buffer, edits) in ranges {
-                        linked_edits
-                            .entry(buffer.clone())
-                            .or_default()
-                            .extend(edits.into_iter().map(|range| (range, new_text.to_owned())));
-                    }
-                }
-            }
-        }
-
-        cx.emit(EditorEvent::InputHandled {
-            utf16_range_to_replace: None,
-            text: new_text.clone().into(),
-        });
-
-        self.transact(window, cx, |this, window, cx| {
-            if let Some(mut snippet) = snippet {
-                snippet.text = new_text.to_string();
-                this.insert_snippet(&ranges, snippet, window, cx).log_err();
-            } else {
-                this.buffer.update(cx, |buffer, cx| {
-                    let auto_indent = match completion.insert_text_mode {
-                        Some(InsertTextMode::AS_IS) => None,
-                        _ => this.autoindent_mode.clone(),
-                    };
-                    let edits = ranges.into_iter().map(|range| (range, new_text.as_str()));
-                    buffer.edit(edits, auto_indent, cx);
-                });
-            }
-            for (buffer, edits) in linked_edits {
-                buffer.update(cx, |buffer, cx| {
-                    let snapshot = buffer.snapshot();
-                    let edits = edits
-                        .into_iter()
-                        .map(|(range, text)| {
-                            use text::ToPoint as TP;
-                            let end_point = TP::to_point(&range.end, &snapshot);
-                            let start_point = TP::to_point(&range.start, &snapshot);
-                            (start_point..end_point, text)
-                        })
-                        .sorted_by_key(|(range, _)| range.start);
-                    buffer.edit(edits, None, cx);
-                })
-            }
-
-            this.refresh_inline_completion(true, false, window, cx);
-        });
-
-        let show_new_completions_on_confirm = completion
-            .confirm
-            .as_ref()
-            .map_or(false, |confirm| confirm(intent, window, cx));
-        if show_new_completions_on_confirm {
-            self.show_completions(&ShowCompletions { trigger: None }, window, cx);
-        }
-
-        let provider = self.completion_provider.as_ref()?;
-        drop(completion);
-        let apply_edits = provider.apply_additional_edits_for_completion(
-            buffer_handle,
-            completions_menu.completions.clone(),
-            candidate_id,
-            true,
-            cx,
-        );
-
-        let editor_settings = EditorSettings::get_global(cx);
-        if editor_settings.show_signature_help_after_edits || editor_settings.auto_signature_help {
-            // After the code completion is finished, users often want to know what signatures are needed.
-            // so we should automatically call signature_help
-            self.show_signature_help(&ShowSignatureHelp, window, cx);
-        }
-
-        Some(cx.foreground_executor().spawn(async move {
-            apply_edits.await?;
-            Ok(())
-        }))
-    }
-
-    pub fn toggle_code_actions(
-        &mut self,
-        action: &ToggleCodeActions,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let quick_launch = action.quick_launch;
-        let mut context_menu = self.context_menu.borrow_mut();
-        if let Some(CodeContextMenu::CodeActions(code_actions)) = context_menu.as_ref() {
-            if code_actions.deployed_from_indicator == action.deployed_from_indicator {
-                // Toggle if we're selecting the same one
-                *context_menu = None;
-                cx.notify();
-                return;
-            } else {
-                // Otherwise, clear it and start a new one
-                *context_menu = None;
-                cx.notify();
-            }
-        }
-        drop(context_menu);
-        let snapshot = self.snapshot(window, cx);
-        let deployed_from_indicator = action.deployed_from_indicator;
-        let mut task = self.code_actions_task.take();
-        let action = action.clone();
-        cx.spawn_in(window, async move |editor, cx| {
-            while let Some(prev_task) = task {
-                prev_task.await.log_err();
-                task = editor.update(cx, |this, _| this.code_actions_task.take())?;
-            }
-
-            let spawned_test_task = editor.update_in(cx, |editor, window, cx| {
-                if editor.focus_handle.is_focused(window) {
-                    let multibuffer_point = action
-                        .deployed_from_indicator
-                        .map(|row| DisplayPoint::new(row, 0).to_point(&snapshot))
-                        .unwrap_or_else(|| editor.selections.newest::<Point>(cx).head());
-                    let (buffer, buffer_row) = snapshot
-                        .buffer_snapshot
-                        .buffer_line_for_row(MultiBufferRow(multibuffer_point.row))
-                        .and_then(|(buffer_snapshot, range)| {
-                            editor
-                                .buffer
-                                .read(cx)
-                                .buffer(buffer_snapshot.remote_id())
-                                .map(|buffer| (buffer, range.start.row))
-                        })?;
-                    let (_, code_actions) = editor
-                        .available_code_actions
-                        .clone()
-                        .and_then(|(location, code_actions)| {
-                            let snapshot = location.buffer.read(cx).snapshot();
-                            let point_range = location.range.to_point(&snapshot);
-                            let point_range = point_range.start.row..=point_range.end.row;
-                            if point_range.contains(&buffer_row) {
-                                Some((location, code_actions))
-                            } else {
-                                None
-                            }
-                        })
-                        .unzip();
-                    let buffer_id = buffer.read(cx).remote_id();
-                    let tasks = editor
-                        .tasks
-                        .get(&(buffer_id, buffer_row))
-                        .map(|t| Arc::new(t.to_owned()));
-                    if tasks.is_none() && code_actions.is_none() {
-                        return None;
-                    }
-
-                    editor.completion_tasks.clear();
-                    editor.discard_inline_completion(false, cx);
-                    let task_context =
-                        tasks
-                            .as_ref()
-                            .zip(editor.project.clone())
-                            .map(|(tasks, project)| {
-                                Self::build_tasks_context(&project, &buffer, buffer_row, tasks, cx)
-                            });
-
-                    Some(cx.spawn_in(window, async move |editor, cx| {
-                        let task_context = match task_context {
-                            Some(task_context) => task_context.await,
-                            None => None,
-                        };
-                        let resolved_tasks =
-                            tasks
-                                .zip(task_context.clone())
-                                .map(|(tasks, task_context)| ResolvedTasks {
-                                    templates: tasks.resolve(&task_context).collect(),
-                                    position: snapshot.buffer_snapshot.anchor_before(Point::new(
-                                        multibuffer_point.row,
-                                        tasks.column,
-                                    )),
-                                });
-                        let spawn_straight_away = quick_launch
-                            && resolved_tasks
-                                .as_ref()
-                                .map_or(false, |tasks| tasks.templates.len() == 1)
-                            && code_actions
-                                .as_ref()
-                                .map_or(true, |actions| actions.is_empty());
-                        let debug_scenarios = editor.update(cx, |editor, cx| {
-                            if cx.has_flag::<DebuggerFeatureFlag>() {
-                                maybe!({
-                                    let project = editor.project.as_ref()?;
-                                    let dap_store = project.read(cx).dap_store();
-                                    let mut scenarios = vec![];
-                                    let resolved_tasks = resolved_tasks.as_ref()?;
-                                    let debug_adapter: SharedString = buffer
-                                        .read(cx)
-                                        .language()?
-                                        .context_provider()?
-                                        .debug_adapter()?
-                                        .into();
-                                    dap_store.update(cx, |this, cx| {
-                                        for (_, task) in &resolved_tasks.templates {
-                                            if let Some(scenario) = this
-                                                .debug_scenario_for_build_task(
-                                                    task.resolved.clone(),
-                                                    SharedString::from(
-                                                        task.original_task().label.clone(),
-                                                    ),
-                                                    debug_adapter.clone(),
-                                                    cx,
-                                                )
-                                            {
-                                                scenarios.push(scenario);
-                                            }
-                                        }
-                                    });
-                                    Some(scenarios)
-                                })
-                                .unwrap_or_default()
-                            } else {
-                                vec![]
-                            }
-                        })?;
-                        if let Ok(task) = editor.update_in(cx, |editor, window, cx| {
-                            *editor.context_menu.borrow_mut() =
-                                Some(CodeContextMenu::CodeActions(CodeActionsMenu {
-                                    buffer,
-                                    actions: CodeActionContents::new(
-                                        resolved_tasks,
-                                        code_actions,
-                                        debug_scenarios,
-                                        task_context.unwrap_or_default(),
-                                    ),
-                                    selected_item: Default::default(),
-                                    scroll_handle: UniformListScrollHandle::default(),
-                                    deployed_from_indicator,
-                                }));
-                            if spawn_straight_away {
-                                if let Some(task) = editor.confirm_code_action(
-                                    &ConfirmCodeAction { item_ix: Some(0) },
-                                    window,
-                                    cx,
-                                ) {
-                                    cx.notify();
-                                    return task;
-                                }
-                            }
-                            cx.notify();
-                            Task::ready(Ok(()))
-                        }) {
-                            task.await
-                        } else {
-                            Ok(())
-                        }
-                    }))
-                } else {
-                    Some(Task::ready(Ok(())))
-                }
-            })?;
-            if let Some(task) = spawned_test_task {
-                task.await?;
-            }
-
-            anyhow::Ok(())
-        })
-        .detach_and_log_err(cx);
-    }
-
-    pub fn confirm_code_action(
-        &mut self,
-        action: &ConfirmCodeAction,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Task<Result<()>>> {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-
-        let actions_menu =
-            if let CodeContextMenu::CodeActions(menu) = self.hide_context_menu(window, cx)? {
-                menu
-            } else {
-                return None;
-            };
-
-        let action_ix = action.item_ix.unwrap_or(actions_menu.selected_item);
-        let action = actions_menu.actions.get(action_ix)?;
-        let title = action.label();
-        let buffer = actions_menu.buffer;
-        let workspace = self.workspace()?;
-
-        match action {
-            CodeActionsItem::Task(task_source_kind, resolved_task) => {
-                workspace.update(cx, |workspace, cx| {
-                    workspace.schedule_resolved_task(
-                        task_source_kind,
-                        resolved_task,
-                        false,
-                        window,
-                        cx,
-                    );
-
-                    Some(Task::ready(Ok(())))
-                })
-            }
-            CodeActionsItem::CodeAction {
-                excerpt_id,
-                action,
-                provider,
-            } => {
-                let apply_code_action =
-                    provider.apply_code_action(buffer, action, excerpt_id, true, window, cx);
-                let workspace = workspace.downgrade();
-                Some(cx.spawn_in(window, async move |editor, cx| {
-                    let project_transaction = apply_code_action.await?;
-                    Self::open_project_transaction(
-                        &editor,
-                        workspace,
-                        project_transaction,
-                        title,
-                        cx,
-                    )
-                    .await
-                }))
-            }
-            CodeActionsItem::DebugScenario(scenario) => {
-                let context = actions_menu.actions.context.clone();
-
-                workspace.update(cx, |workspace, cx| {
-                    workspace.start_debug_session(scenario, context, Some(buffer), window, cx);
-                });
-                Some(Task::ready(Ok(())))
-            }
-        }
-    }
-
-    pub async fn open_project_transaction(
-        this: &WeakEntity<Editor>,
-        workspace: WeakEntity<Workspace>,
-        transaction: ProjectTransaction,
-        title: String,
-        cx: &mut AsyncWindowContext,
-    ) -> Result<()> {
-        let mut entries = transaction.0.into_iter().collect::<Vec<_>>();
-        cx.update(|_, cx| {
-            entries.sort_unstable_by_key(|(buffer, _)| {
-                buffer.read(cx).file().map(|f| f.path().clone())
-            });
-        })?;
-
-        // If the project transaction's edits are all contained within this editor, then
-        // avoid opening a new editor to display them.
-
-        if let Some((buffer, transaction)) = entries.first() {
-            if entries.len() == 1 {
-                let excerpt = this.update(cx, |editor, cx| {
-                    editor
-                        .buffer()
-                        .read(cx)
-                        .excerpt_containing(editor.selections.newest_anchor().head(), cx)
-                })?;
-                if let Some((_, excerpted_buffer, excerpt_range)) = excerpt {
-                    if excerpted_buffer == *buffer {
-                        let all_edits_within_excerpt = buffer.read_with(cx, |buffer, _| {
-                            let excerpt_range = excerpt_range.to_offset(buffer);
-                            buffer
-                                .edited_ranges_for_transaction::<usize>(transaction)
-                                .all(|range| {
-                                    excerpt_range.start <= range.start
-                                        && excerpt_range.end >= range.end
-                                })
-                        })?;
-
-                        if all_edits_within_excerpt {
-                            return Ok(());
-                        }
-                    }
-                }
-            }
-        } else {
-            return Ok(());
-        }
-
-        let mut ranges_to_highlight = Vec::new();
-        let excerpt_buffer = cx.new(|cx| {
-            let mut multibuffer = MultiBuffer::new(Capability::ReadWrite).with_title(title);
-            for (buffer_handle, transaction) in &entries {
-                let edited_ranges = buffer_handle
-                    .read(cx)
-                    .edited_ranges_for_transaction::<Point>(transaction)
-                    .collect::<Vec<_>>();
-                let (ranges, _) = multibuffer.set_excerpts_for_path(
-                    PathKey::for_buffer(buffer_handle, cx),
-                    buffer_handle.clone(),
-                    edited_ranges,
-                    DEFAULT_MULTIBUFFER_CONTEXT,
-                    cx,
-                );
-
-                ranges_to_highlight.extend(ranges);
-            }
-            multibuffer.push_transaction(entries.iter().map(|(b, t)| (b, t)), cx);
-            multibuffer
-        })?;
-
-        workspace.update_in(cx, |workspace, window, cx| {
-            let project = workspace.project().clone();
-            let editor =
-                cx.new(|cx| Editor::for_multibuffer(excerpt_buffer, Some(project), window, cx));
-            workspace.add_item_to_active_pane(Box::new(editor.clone()), None, true, window, cx);
-            editor.update(cx, |editor, cx| {
-                editor.highlight_background::<Self>(
-                    &ranges_to_highlight,
-                    |theme| theme.editor_highlighted_line_background,
-                    cx,
-                );
-            });
-        })?;
-
-        Ok(())
-    }
-
-    pub fn clear_code_action_providers(&mut self) {
-        self.code_action_providers.clear();
-        self.available_code_actions.take();
-    }
-
-    pub fn add_code_action_provider(
-        &mut self,
-        provider: Rc<dyn CodeActionProvider>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self
-            .code_action_providers
-            .iter()
-            .any(|existing_provider| existing_provider.id() == provider.id())
-        {
-            return;
-        }
-
-        self.code_action_providers.push(provider);
-        self.refresh_code_actions(window, cx);
-    }
-
-    pub fn remove_code_action_provider(
-        &mut self,
-        id: Arc<str>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.code_action_providers
-            .retain(|provider| provider.id() != id);
-        self.refresh_code_actions(window, cx);
-    }
-
-    fn refresh_code_actions(&mut self, window: &mut Window, cx: &mut Context<Self>) -> Option<()> {
-        let newest_selection = self.selections.newest_anchor().clone();
-        let newest_selection_adjusted = self.selections.newest_adjusted(cx).clone();
-        let buffer = self.buffer.read(cx);
-        if newest_selection.head().diff_base_anchor.is_some() {
-            return None;
-        }
-        let (start_buffer, start) =
-            buffer.text_anchor_for_position(newest_selection_adjusted.start, cx)?;
-        let (end_buffer, end) =
-            buffer.text_anchor_for_position(newest_selection_adjusted.end, cx)?;
-        if start_buffer != end_buffer {
-            return None;
-        }
-
-        self.code_actions_task = Some(cx.spawn_in(window, async move |this, cx| {
-            cx.background_executor()
-                .timer(CODE_ACTIONS_DEBOUNCE_TIMEOUT)
-                .await;
-
-            let (providers, tasks) = this.update_in(cx, |this, window, cx| {
-                let providers = this.code_action_providers.clone();
-                let tasks = this
-                    .code_action_providers
-                    .iter()
-                    .map(|provider| provider.code_actions(&start_buffer, start..end, window, cx))
-                    .collect::<Vec<_>>();
-                (providers, tasks)
-            })?;
-
-            let mut actions = Vec::new();
-            for (provider, provider_actions) in
-                providers.into_iter().zip(future::join_all(tasks).await)
-            {
-                if let Some(provider_actions) = provider_actions.log_err() {
-                    actions.extend(provider_actions.into_iter().map(|action| {
-                        AvailableCodeAction {
-                            excerpt_id: newest_selection.start.excerpt_id,
-                            action,
-                            provider: provider.clone(),
-                        }
-                    }));
-                }
-            }
-
-            this.update(cx, |this, cx| {
-                this.available_code_actions = if actions.is_empty() {
-                    None
-                } else {
-                    Some((
-                        Location {
-                            buffer: start_buffer,
-                            range: start..end,
-                        },
-                        actions.into(),
-                    ))
-                };
-                cx.notify();
-            })
-        }));
-        None
-    }
-
-    fn start_inline_blame_timer(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(delay) = ProjectSettings::get_global(cx).git.inline_blame_delay() {
-            self.show_git_blame_inline = false;
-
-            self.show_git_blame_inline_delay_task =
-                Some(cx.spawn_in(window, async move |this, cx| {
-                    cx.background_executor().timer(delay).await;
-
-                    this.update(cx, |this, cx| {
-                        this.show_git_blame_inline = true;
-                        cx.notify();
-                    })
-                    .log_err();
-                }));
-        }
-    }
-
-    fn show_blame_popover(
-        &mut self,
-        blame_entry: &BlameEntry,
-        position: gpui::Point<Pixels>,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(state) = &mut self.inline_blame_popover {
-            state.hide_task.take();
-            cx.notify();
-        } else {
-            let delay = EditorSettings::get_global(cx).hover_popover_delay;
-            let show_task = cx.spawn(async move |editor, cx| {
-                cx.background_executor()
-                    .timer(std::time::Duration::from_millis(delay))
-                    .await;
-                editor
-                    .update(cx, |editor, cx| {
-                        if let Some(state) = &mut editor.inline_blame_popover {
-                            state.show_task = None;
-                            cx.notify();
-                        }
-                    })
-                    .ok();
-            });
-            let Some(blame) = self.blame.as_ref() else {
-                return;
-            };
-            let blame = blame.read(cx);
-            let details = blame.details_for_entry(&blame_entry);
-            let markdown = cx.new(|cx| {
-                Markdown::new(
-                    details
-                        .as_ref()
-                        .map(|message| message.message.clone())
-                        .unwrap_or_default(),
-                    None,
-                    None,
-                    cx,
-                )
-            });
-            self.inline_blame_popover = Some(InlineBlamePopover {
-                position,
-                show_task: Some(show_task),
-                hide_task: None,
-                popover_bounds: None,
-                popover_state: InlineBlamePopoverState {
-                    scroll_handle: ScrollHandle::new(),
-                    commit_message: details,
-                    markdown,
-                },
-            });
-        }
-    }
-
-    fn hide_blame_popover(&mut self, cx: &mut Context<Self>) {
-        if let Some(state) = &mut self.inline_blame_popover {
-            if state.show_task.is_some() {
-                self.inline_blame_popover.take();
-                cx.notify();
-            } else {
-                let hide_task = cx.spawn(async move |editor, cx| {
-                    cx.background_executor()
-                        .timer(std::time::Duration::from_millis(100))
-                        .await;
-                    editor
-                        .update(cx, |editor, cx| {
-                            editor.inline_blame_popover.take();
-                            cx.notify();
-                        })
-                        .ok();
-                });
-                state.hide_task = Some(hide_task);
-            }
-        }
-    }
-
-    fn refresh_document_highlights(&mut self, cx: &mut Context<Self>) -> Option<()> {
-        if self.pending_rename.is_some() {
-            return None;
-        }
-
-        let provider = self.semantics_provider.clone()?;
-        let buffer = self.buffer.read(cx);
-        let newest_selection = self.selections.newest_anchor().clone();
-        let cursor_position = newest_selection.head();
-        let (cursor_buffer, cursor_buffer_position) =
-            buffer.text_anchor_for_position(cursor_position, cx)?;
-        let (tail_buffer, _) = buffer.text_anchor_for_position(newest_selection.tail(), cx)?;
-        if cursor_buffer != tail_buffer {
-            return None;
-        }
-        let debounce = EditorSettings::get_global(cx).lsp_highlight_debounce;
-        self.document_highlights_task = Some(cx.spawn(async move |this, cx| {
-            cx.background_executor()
-                .timer(Duration::from_millis(debounce))
-                .await;
-
-            let highlights = if let Some(highlights) = cx
-                .update(|cx| {
-                    provider.document_highlights(&cursor_buffer, cursor_buffer_position, cx)
-                })
-                .ok()
-                .flatten()
-            {
-                highlights.await.log_err()
-            } else {
-                None
-            };
-
-            if let Some(highlights) = highlights {
-                this.update(cx, |this, cx| {
-                    if this.pending_rename.is_some() {
-                        return;
-                    }
-
-                    let buffer_id = cursor_position.buffer_id;
-                    let buffer = this.buffer.read(cx);
-                    if !buffer
-                        .text_anchor_for_position(cursor_position, cx)
-                        .map_or(false, |(buffer, _)| buffer == cursor_buffer)
-                    {
-                        return;
-                    }
-
-                    let cursor_buffer_snapshot = cursor_buffer.read(cx);
-                    let mut write_ranges = Vec::new();
-                    let mut read_ranges = Vec::new();
-                    for highlight in highlights {
-                        for (excerpt_id, excerpt_range) in
-                            buffer.excerpts_for_buffer(cursor_buffer.read(cx).remote_id(), cx)
-                        {
-                            let start = highlight
-                                .range
-                                .start
-                                .max(&excerpt_range.context.start, cursor_buffer_snapshot);
-                            let end = highlight
-                                .range
-                                .end
-                                .min(&excerpt_range.context.end, cursor_buffer_snapshot);
-                            if start.cmp(&end, cursor_buffer_snapshot).is_ge() {
-                                continue;
-                            }
-
-                            let range = Anchor {
-                                buffer_id,
-                                excerpt_id,
-                                text_anchor: start,
-                                diff_base_anchor: None,
-                            }..Anchor {
-                                buffer_id,
-                                excerpt_id,
-                                text_anchor: end,
-                                diff_base_anchor: None,
-                            };
-                            if highlight.kind == lsp::DocumentHighlightKind::WRITE {
-                                write_ranges.push(range);
-                            } else {
-                                read_ranges.push(range);
-                            }
-                        }
-                    }
-
-                    this.highlight_background::<DocumentHighlightRead>(
-                        &read_ranges,
-                        |theme| theme.editor_document_highlight_read_background,
-                        cx,
-                    );
-                    this.highlight_background::<DocumentHighlightWrite>(
-                        &write_ranges,
-                        |theme| theme.editor_document_highlight_write_background,
-                        cx,
-                    );
-                    cx.notify();
-                })
-                .log_err();
-            }
-        }));
-        None
-    }
-
-    fn prepare_highlight_query_from_selection(
-        &mut self,
-        cx: &mut Context<Editor>,
-    ) -> Option<(String, Range<Anchor>)> {
-        if matches!(self.mode, EditorMode::SingleLine { .. }) {
-            return None;
-        }
-        if !EditorSettings::get_global(cx).selection_highlight {
-            return None;
-        }
-        if self.selections.count() != 1 || self.selections.line_mode {
-            return None;
-        }
-        let selection = self.selections.newest::<Point>(cx);
-        if selection.is_empty() || selection.start.row != selection.end.row {
-            return None;
-        }
-        let multi_buffer_snapshot = self.buffer().read(cx).snapshot(cx);
-        let selection_anchor_range = selection.range().to_anchors(&multi_buffer_snapshot);
-        let query = multi_buffer_snapshot
-            .text_for_range(selection_anchor_range.clone())
-            .collect::<String>();
-        if query.trim().is_empty() {
-            return None;
-        }
-        Some((query, selection_anchor_range))
-    }
-
-    fn update_selection_occurrence_highlights(
-        &mut self,
-        query_text: String,
-        query_range: Range<Anchor>,
-        multi_buffer_range_to_query: Range<Point>,
-        use_debounce: bool,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) -> Task<()> {
-        let multi_buffer_snapshot = self.buffer().read(cx).snapshot(cx);
-        cx.spawn_in(window, async move |editor, cx| {
-            if use_debounce {
-                cx.background_executor()
-                    .timer(SELECTION_HIGHLIGHT_DEBOUNCE_TIMEOUT)
-                    .await;
-            }
-            let match_task = cx.background_spawn(async move {
-                let buffer_ranges = multi_buffer_snapshot
-                    .range_to_buffer_ranges(multi_buffer_range_to_query)
-                    .into_iter()
-                    .filter(|(_, excerpt_visible_range, _)| !excerpt_visible_range.is_empty());
-                let mut match_ranges = Vec::new();
-                for (buffer_snapshot, search_range, excerpt_id) in buffer_ranges {
-                    match_ranges.extend(
-                        project::search::SearchQuery::text(
-                            query_text.clone(),
-                            false,
-                            false,
-                            false,
-                            Default::default(),
-                            Default::default(),
-                            false,
-                            None,
-                        )
-                        .unwrap()
-                        .search(&buffer_snapshot, Some(search_range.clone()))
-                        .await
-                        .into_iter()
-                        .filter_map(|match_range| {
-                            let match_start = buffer_snapshot
-                                .anchor_after(search_range.start + match_range.start);
-                            let match_end =
-                                buffer_snapshot.anchor_before(search_range.start + match_range.end);
-                            let match_anchor_range = Anchor::range_in_buffer(
-                                excerpt_id,
-                                buffer_snapshot.remote_id(),
-                                match_start..match_end,
-                            );
-                            (match_anchor_range != query_range).then_some(match_anchor_range)
-                        }),
-                    );
-                }
-                match_ranges
-            });
-            let match_ranges = match_task.await;
-            editor
-                .update_in(cx, |editor, _, cx| {
-                    editor.clear_background_highlights::<SelectedTextHighlight>(cx);
-                    if !match_ranges.is_empty() {
-                        editor.highlight_background::<SelectedTextHighlight>(
-                            &match_ranges,
-                            |theme| theme.editor_document_highlight_bracket_background,
-                            cx,
-                        )
-                    }
-                })
-                .log_err();
-        })
-    }
-
-    fn refresh_selected_text_highlights(
-        &mut self,
-        on_buffer_edit: bool,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) {
-        let Some((query_text, query_range)) = self.prepare_highlight_query_from_selection(cx)
-        else {
-            self.clear_background_highlights::<SelectedTextHighlight>(cx);
-            self.quick_selection_highlight_task.take();
-            self.debounced_selection_highlight_task.take();
-            return;
-        };
-        let multi_buffer_snapshot = self.buffer().read(cx).snapshot(cx);
-        if on_buffer_edit
-            || self
-                .quick_selection_highlight_task
-                .as_ref()
-                .map_or(true, |(prev_anchor_range, _)| {
-                    prev_anchor_range != &query_range
-                })
-        {
-            let multi_buffer_visible_start = self
-                .scroll_manager
-                .anchor()
-                .anchor
-                .to_point(&multi_buffer_snapshot);
-            let multi_buffer_visible_end = multi_buffer_snapshot.clip_point(
-                multi_buffer_visible_start
-                    + Point::new(self.visible_line_count().unwrap_or(0.).ceil() as u32, 0),
-                Bias::Left,
-            );
-            let multi_buffer_visible_range = multi_buffer_visible_start..multi_buffer_visible_end;
-            self.quick_selection_highlight_task = Some((
-                query_range.clone(),
-                self.update_selection_occurrence_highlights(
-                    query_text.clone(),
-                    query_range.clone(),
-                    multi_buffer_visible_range,
-                    false,
-                    window,
-                    cx,
-                ),
-            ));
-        }
-        if on_buffer_edit
-            || self
-                .debounced_selection_highlight_task
-                .as_ref()
-                .map_or(true, |(prev_anchor_range, _)| {
-                    prev_anchor_range != &query_range
-                })
-        {
-            let multi_buffer_start = multi_buffer_snapshot
-                .anchor_before(0)
-                .to_point(&multi_buffer_snapshot);
-            let multi_buffer_end = multi_buffer_snapshot
-                .anchor_after(multi_buffer_snapshot.len())
-                .to_point(&multi_buffer_snapshot);
-            let multi_buffer_full_range = multi_buffer_start..multi_buffer_end;
-            self.debounced_selection_highlight_task = Some((
-                query_range.clone(),
-                self.update_selection_occurrence_highlights(
-                    query_text,
-                    query_range,
-                    multi_buffer_full_range,
-                    true,
-                    window,
-                    cx,
-                ),
-            ));
-        }
-    }
-
-    pub fn refresh_inline_completion(
-        &mut self,
-        debounce: bool,
-        user_requested: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<()> {
-        let provider = self.edit_prediction_provider()?;
-        let cursor = self.selections.newest_anchor().head();
-        let (buffer, cursor_buffer_position) =
-            self.buffer.read(cx).text_anchor_for_position(cursor, cx)?;
-
-        if !self.edit_predictions_enabled_in_buffer(&buffer, cursor_buffer_position, cx) {
-            self.discard_inline_completion(false, cx);
-            return None;
-        }
-
-        if !user_requested
-            && (!self.should_show_edit_predictions()
-                || !self.is_focused(window)
-                || buffer.read(cx).is_empty())
-        {
-            self.discard_inline_completion(false, cx);
-            return None;
-        }
-
-        self.update_visible_inline_completion(window, cx);
-        provider.refresh(
-            self.project.clone(),
-            buffer,
-            cursor_buffer_position,
-            debounce,
-            cx,
-        );
-        Some(())
-    }
-
-    fn show_edit_predictions_in_menu(&self) -> bool {
-        match self.edit_prediction_settings {
-            EditPredictionSettings::Disabled => false,
-            EditPredictionSettings::Enabled { show_in_menu, .. } => show_in_menu,
-        }
-    }
-
-    pub fn edit_predictions_enabled(&self) -> bool {
-        match self.edit_prediction_settings {
-            EditPredictionSettings::Disabled => false,
-            EditPredictionSettings::Enabled { .. } => true,
-        }
-    }
-
-    fn edit_prediction_requires_modifier(&self) -> bool {
-        match self.edit_prediction_settings {
-            EditPredictionSettings::Disabled => false,
-            EditPredictionSettings::Enabled {
-                preview_requires_modifier,
-                ..
-            } => preview_requires_modifier,
-        }
-    }
-
-    pub fn update_edit_prediction_settings(&mut self, cx: &mut Context<Self>) {
-        if self.edit_prediction_provider.is_none() {
-            self.edit_prediction_settings = EditPredictionSettings::Disabled;
-        } else {
-            let selection = self.selections.newest_anchor();
-            let cursor = selection.head();
-
-            if let Some((buffer, cursor_buffer_position)) =
-                self.buffer.read(cx).text_anchor_for_position(cursor, cx)
-            {
-                self.edit_prediction_settings =
-                    self.edit_prediction_settings_at_position(&buffer, cursor_buffer_position, cx);
-            }
-        }
-    }
-
-    fn edit_prediction_settings_at_position(
-        &self,
-        buffer: &Entity<Buffer>,
-        buffer_position: language::Anchor,
-        cx: &App,
-    ) -> EditPredictionSettings {
-        if !self.mode.is_full()
-            || !self.show_inline_completions_override.unwrap_or(true)
-            || self.inline_completions_disabled_in_scope(buffer, buffer_position, cx)
-        {
-            return EditPredictionSettings::Disabled;
-        }
-
-        let buffer = buffer.read(cx);
-
-        let file = buffer.file();
-
-        if !language_settings(buffer.language().map(|l| l.name()), file, cx).show_edit_predictions {
-            return EditPredictionSettings::Disabled;
-        };
-
-        let by_provider = matches!(
-            self.menu_inline_completions_policy,
-            MenuInlineCompletionsPolicy::ByProvider
-        );
-
-        let show_in_menu = by_provider
-            && self
-                .edit_prediction_provider
-                .as_ref()
-                .map_or(false, |provider| {
-                    provider.provider.show_completions_in_menu()
-                });
-
-        let preview_requires_modifier =
-            all_language_settings(file, cx).edit_predictions_mode() == EditPredictionsMode::Subtle;
-
-        EditPredictionSettings::Enabled {
-            show_in_menu,
-            preview_requires_modifier,
-        }
-    }
-
-    fn should_show_edit_predictions(&self) -> bool {
-        self.snippet_stack.is_empty() && self.edit_predictions_enabled()
-    }
-
-    pub fn edit_prediction_preview_is_active(&self) -> bool {
-        matches!(
-            self.edit_prediction_preview,
-            EditPredictionPreview::Active { .. }
-        )
-    }
-
-    pub fn edit_predictions_enabled_at_cursor(&self, cx: &App) -> bool {
-        let cursor = self.selections.newest_anchor().head();
-        if let Some((buffer, cursor_position)) =
-            self.buffer.read(cx).text_anchor_for_position(cursor, cx)
-        {
-            self.edit_predictions_enabled_in_buffer(&buffer, cursor_position, cx)
-        } else {
-            false
-        }
-    }
-
-    fn edit_predictions_enabled_in_buffer(
-        &self,
-        buffer: &Entity<Buffer>,
-        buffer_position: language::Anchor,
-        cx: &App,
-    ) -> bool {
-        maybe!({
-            if self.read_only(cx) {
-                return Some(false);
-            }
-            let provider = self.edit_prediction_provider()?;
-            if !provider.is_enabled(&buffer, buffer_position, cx) {
-                return Some(false);
-            }
-            let buffer = buffer.read(cx);
-            let Some(file) = buffer.file() else {
-                return Some(true);
-            };
-            let settings = all_language_settings(Some(file), cx);
-            Some(settings.edit_predictions_enabled_for_file(file, cx))
-        })
-        .unwrap_or(false)
-    }
-
-    fn cycle_inline_completion(
-        &mut self,
-        direction: Direction,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<()> {
-        let provider = self.edit_prediction_provider()?;
-        let cursor = self.selections.newest_anchor().head();
-        let (buffer, cursor_buffer_position) =
-            self.buffer.read(cx).text_anchor_for_position(cursor, cx)?;
-        if self.inline_completions_hidden_for_vim_mode || !self.should_show_edit_predictions() {
-            return None;
-        }
-
-        provider.cycle(buffer, cursor_buffer_position, direction, cx);
-        self.update_visible_inline_completion(window, cx);
-
-        Some(())
-    }
-
-    pub fn show_inline_completion(
-        &mut self,
-        _: &ShowEditPrediction,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if !self.has_active_inline_completion() {
-            self.refresh_inline_completion(false, true, window, cx);
-            return;
-        }
-
-        self.update_visible_inline_completion(window, cx);
-    }
-
-    pub fn display_cursor_names(
-        &mut self,
-        _: &DisplayCursorNames,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.show_cursor_names(window, cx);
-    }
-
-    fn show_cursor_names(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.show_cursor_names = true;
-        cx.notify();
-        cx.spawn_in(window, async move |this, cx| {
-            cx.background_executor().timer(CURSORS_VISIBLE_FOR).await;
-            this.update(cx, |this, cx| {
-                this.show_cursor_names = false;
-                cx.notify()
-            })
-            .ok()
-        })
-        .detach();
-    }
-
-    pub fn next_edit_prediction(
-        &mut self,
-        _: &NextEditPrediction,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.has_active_inline_completion() {
-            self.cycle_inline_completion(Direction::Next, window, cx);
-        } else {
-            let is_copilot_disabled = self
-                .refresh_inline_completion(false, true, window, cx)
-                .is_none();
-            if is_copilot_disabled {
-                cx.propagate();
-            }
-        }
-    }
-
-    pub fn previous_edit_prediction(
-        &mut self,
-        _: &PreviousEditPrediction,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.has_active_inline_completion() {
-            self.cycle_inline_completion(Direction::Prev, window, cx);
-        } else {
-            let is_copilot_disabled = self
-                .refresh_inline_completion(false, true, window, cx)
-                .is_none();
-            if is_copilot_disabled {
-                cx.propagate();
-            }
-        }
-    }
-
-    pub fn accept_edit_prediction(
-        &mut self,
-        _: &AcceptEditPrediction,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.show_edit_predictions_in_menu() {
-            self.hide_context_menu(window, cx);
-        }
-
-        let Some(active_inline_completion) = self.active_inline_completion.as_ref() else {
-            return;
-        };
-
-        self.report_inline_completion_event(
-            active_inline_completion.completion_id.clone(),
-            true,
-            cx,
-        );
-
-        match &active_inline_completion.completion {
-            InlineCompletion::Move { target, .. } => {
-                let target = *target;
-
-                if let Some(position_map) = &self.last_position_map {
-                    if position_map
-                        .visible_row_range
-                        .contains(&target.to_display_point(&position_map.snapshot).row())
-                        || !self.edit_prediction_requires_modifier()
-                    {
-                        self.unfold_ranges(&[target..target], true, false, cx);
-                        // Note that this is also done in vim's handler of the Tab action.
-                        self.change_selections(
-                            Some(Autoscroll::newest()),
-                            window,
-                            cx,
-                            |selections| {
-                                selections.select_anchor_ranges([target..target]);
-                            },
-                        );
-                        self.clear_row_highlights::<EditPredictionPreview>();
-
-                        self.edit_prediction_preview
-                            .set_previous_scroll_position(None);
-                    } else {
-                        self.edit_prediction_preview
-                            .set_previous_scroll_position(Some(
-                                position_map.snapshot.scroll_anchor,
-                            ));
-
-                        self.highlight_rows::<EditPredictionPreview>(
-                            target..target,
-                            cx.theme().colors().editor_highlighted_line_background,
-                            RowHighlightOptions {
-                                autoscroll: true,
-                                ..Default::default()
-                            },
-                            cx,
-                        );
-                        self.request_autoscroll(Autoscroll::fit(), cx);
-                    }
-                }
-            }
-            InlineCompletion::Edit { edits, .. } => {
-                if let Some(provider) = self.edit_prediction_provider() {
-                    provider.accept(cx);
-                }
-
-                let snapshot = self.buffer.read(cx).snapshot(cx);
-                let last_edit_end = edits.last().unwrap().0.end.bias_right(&snapshot);
-
-                self.buffer.update(cx, |buffer, cx| {
-                    buffer.edit(edits.iter().cloned(), None, cx)
-                });
-
-                self.change_selections(None, window, cx, |s| {
-                    s.select_anchor_ranges([last_edit_end..last_edit_end])
-                });
-
-                self.update_visible_inline_completion(window, cx);
-                if self.active_inline_completion.is_none() {
-                    self.refresh_inline_completion(true, true, window, cx);
-                }
-
-                cx.notify();
-            }
-        }
-
-        self.edit_prediction_requires_modifier_in_indent_conflict = false;
-    }
-
-    pub fn accept_partial_inline_completion(
-        &mut self,
-        _: &AcceptPartialEditPrediction,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(active_inline_completion) = self.active_inline_completion.as_ref() else {
-            return;
-        };
-        if self.selections.count() != 1 {
-            return;
-        }
-
-        self.report_inline_completion_event(
-            active_inline_completion.completion_id.clone(),
-            true,
-            cx,
-        );
-
-        match &active_inline_completion.completion {
-            InlineCompletion::Move { target, .. } => {
-                let target = *target;
-                self.change_selections(Some(Autoscroll::newest()), window, cx, |selections| {
-                    selections.select_anchor_ranges([target..target]);
-                });
-            }
-            InlineCompletion::Edit { edits, .. } => {
-                // Find an insertion that starts at the cursor position.
-                let snapshot = self.buffer.read(cx).snapshot(cx);
-                let cursor_offset = self.selections.newest::<usize>(cx).head();
-                let insertion = edits.iter().find_map(|(range, text)| {
-                    let range = range.to_offset(&snapshot);
-                    if range.is_empty() && range.start == cursor_offset {
-                        Some(text)
-                    } else {
-                        None
-                    }
-                });
-
-                if let Some(text) = insertion {
-                    let mut partial_completion = text
-                        .chars()
-                        .by_ref()
-                        .take_while(|c| c.is_alphabetic())
-                        .collect::<String>();
-                    if partial_completion.is_empty() {
-                        partial_completion = text
-                            .chars()
-                            .by_ref()
-                            .take_while(|c| c.is_whitespace() || !c.is_alphabetic())
-                            .collect::<String>();
-                    }
-
-                    cx.emit(EditorEvent::InputHandled {
-                        utf16_range_to_replace: None,
-                        text: partial_completion.clone().into(),
-                    });
-
-                    self.insert_with_autoindent_mode(&partial_completion, None, window, cx);
-
-                    self.refresh_inline_completion(true, true, window, cx);
-                    cx.notify();
-                } else {
-                    self.accept_edit_prediction(&Default::default(), window, cx);
-                }
-            }
-        }
-    }
-
-    fn discard_inline_completion(
-        &mut self,
-        should_report_inline_completion_event: bool,
-        cx: &mut Context<Self>,
-    ) -> bool {
-        if should_report_inline_completion_event {
-            let completion_id = self
-                .active_inline_completion
-                .as_ref()
-                .and_then(|active_completion| active_completion.completion_id.clone());
-
-            self.report_inline_completion_event(completion_id, false, cx);
-        }
-
-        if let Some(provider) = self.edit_prediction_provider() {
-            provider.discard(cx);
-        }
-
-        self.take_active_inline_completion(cx)
-    }
-
-    fn report_inline_completion_event(&self, id: Option<SharedString>, accepted: bool, cx: &App) {
-        let Some(provider) = self.edit_prediction_provider() else {
-            return;
-        };
-
-        let Some((_, buffer, _)) = self
-            .buffer
-            .read(cx)
-            .excerpt_containing(self.selections.newest_anchor().head(), cx)
-        else {
-            return;
-        };
-
-        let extension = buffer
-            .read(cx)
-            .file()
-            .and_then(|file| Some(file.path().extension()?.to_string_lossy().to_string()));
-
-        let event_type = match accepted {
-            true => "Edit Prediction Accepted",
-            false => "Edit Prediction Discarded",
-        };
-        telemetry::event!(
-            event_type,
-            provider = provider.name(),
-            prediction_id = id,
-            suggestion_accepted = accepted,
-            file_extension = extension,
-        );
-    }
-
-    pub fn has_active_inline_completion(&self) -> bool {
-        self.active_inline_completion.is_some()
-    }
-
-    fn take_active_inline_completion(&mut self, cx: &mut Context<Self>) -> bool {
-        let Some(active_inline_completion) = self.active_inline_completion.take() else {
-            return false;
-        };
-
-        self.splice_inlays(&active_inline_completion.inlay_ids, Default::default(), cx);
-        self.clear_highlights::<InlineCompletionHighlight>(cx);
-        self.stale_inline_completion_in_menu = Some(active_inline_completion);
-        true
-    }
-
-    /// Returns true when we're displaying the edit prediction popover below the cursor
-    /// like we are not previewing and the LSP autocomplete menu is visible
-    /// or we are in `when_holding_modifier` mode.
-    pub fn edit_prediction_visible_in_cursor_popover(&self, has_completion: bool) -> bool {
-        if self.edit_prediction_preview_is_active()
-            || !self.show_edit_predictions_in_menu()
-            || !self.edit_predictions_enabled()
-        {
-            return false;
-        }
-
-        if self.has_visible_completions_menu() {
-            return true;
-        }
-
-        has_completion && self.edit_prediction_requires_modifier()
-    }
-
-    fn handle_modifiers_changed(
-        &mut self,
-        modifiers: Modifiers,
-        position_map: &PositionMap,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.show_edit_predictions_in_menu() {
-            self.update_edit_prediction_preview(&modifiers, window, cx);
-        }
-
-        self.update_selection_mode(&modifiers, position_map, window, cx);
-
-        let mouse_position = window.mouse_position();
-        if !position_map.text_hitbox.is_hovered(window) {
-            return;
-        }
-
-        self.update_hovered_link(
-            position_map.point_for_position(mouse_position),
-            &position_map.snapshot,
-            modifiers,
-            window,
-            cx,
-        )
-    }
-
-    fn update_selection_mode(
-        &mut self,
-        modifiers: &Modifiers,
-        position_map: &PositionMap,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if modifiers != &COLUMNAR_SELECTION_MODIFIERS || self.selections.pending.is_none() {
-            return;
-        }
-
-        let mouse_position = window.mouse_position();
-        let point_for_position = position_map.point_for_position(mouse_position);
-        let position = point_for_position.previous_valid;
-
-        self.select(
-            SelectPhase::BeginColumnar {
-                position,
-                reset: false,
-                goal_column: point_for_position.exact_unclipped.column(),
-            },
-            window,
-            cx,
-        );
-    }
-
-    fn update_edit_prediction_preview(
-        &mut self,
-        modifiers: &Modifiers,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let accept_keybind = self.accept_edit_prediction_keybind(window, cx);
-        let Some(accept_keystroke) = accept_keybind.keystroke() else {
-            return;
-        };
-
-        if &accept_keystroke.modifiers == modifiers && accept_keystroke.modifiers.modified() {
-            if matches!(
-                self.edit_prediction_preview,
-                EditPredictionPreview::Inactive { .. }
-            ) {
-                self.edit_prediction_preview = EditPredictionPreview::Active {
-                    previous_scroll_position: None,
-                    since: Instant::now(),
-                };
-
-                self.update_visible_inline_completion(window, cx);
-                cx.notify();
-            }
-        } else if let EditPredictionPreview::Active {
-            previous_scroll_position,
-            since,
-        } = self.edit_prediction_preview
-        {
-            if let (Some(previous_scroll_position), Some(position_map)) =
-                (previous_scroll_position, self.last_position_map.as_ref())
-            {
-                self.set_scroll_position(
-                    previous_scroll_position
-                        .scroll_position(&position_map.snapshot.display_snapshot),
-                    window,
-                    cx,
-                );
-            }
-
-            self.edit_prediction_preview = EditPredictionPreview::Inactive {
-                released_too_fast: since.elapsed() < Duration::from_millis(200),
-            };
-            self.clear_row_highlights::<EditPredictionPreview>();
-            self.update_visible_inline_completion(window, cx);
-            cx.notify();
-        }
-    }
-
-    fn update_visible_inline_completion(
-        &mut self,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<()> {
-        let selection = self.selections.newest_anchor();
-        let cursor = selection.head();
-        let multibuffer = self.buffer.read(cx).snapshot(cx);
-        let offset_selection = selection.map(|endpoint| endpoint.to_offset(&multibuffer));
-        let excerpt_id = cursor.excerpt_id;
-
-        let show_in_menu = self.show_edit_predictions_in_menu();
-        let completions_menu_has_precedence = !show_in_menu
-            && (self.context_menu.borrow().is_some()
-                || (!self.completion_tasks.is_empty() && !self.has_active_inline_completion()));
-
-        if completions_menu_has_precedence
-            || !offset_selection.is_empty()
-            || self
-                .active_inline_completion
-                .as_ref()
-                .map_or(false, |completion| {
-                    let invalidation_range = completion.invalidation_range.to_offset(&multibuffer);
-                    let invalidation_range = invalidation_range.start..=invalidation_range.end;
-                    !invalidation_range.contains(&offset_selection.head())
-                })
-        {
-            self.discard_inline_completion(false, cx);
-            return None;
-        }
-
-        self.take_active_inline_completion(cx);
-        let Some(provider) = self.edit_prediction_provider() else {
-            self.edit_prediction_settings = EditPredictionSettings::Disabled;
-            return None;
-        };
-
-        let (buffer, cursor_buffer_position) =
-            self.buffer.read(cx).text_anchor_for_position(cursor, cx)?;
-
-        self.edit_prediction_settings =
-            self.edit_prediction_settings_at_position(&buffer, cursor_buffer_position, cx);
-
-        self.edit_prediction_indent_conflict = multibuffer.is_line_whitespace_upto(cursor);
-
-        if self.edit_prediction_indent_conflict {
-            let cursor_point = cursor.to_point(&multibuffer);
-
-            let indents = multibuffer.suggested_indents(cursor_point.row..cursor_point.row + 1, cx);
-
-            if let Some((_, indent)) = indents.iter().next() {
-                if indent.len == cursor_point.column {
-                    self.edit_prediction_indent_conflict = false;
-                }
-            }
-        }
-
-        let inline_completion = provider.suggest(&buffer, cursor_buffer_position, cx)?;
-        let edits = inline_completion
-            .edits
-            .into_iter()
-            .flat_map(|(range, new_text)| {
-                let start = multibuffer.anchor_in_excerpt(excerpt_id, range.start)?;
-                let end = multibuffer.anchor_in_excerpt(excerpt_id, range.end)?;
-                Some((start..end, new_text))
-            })
-            .collect::<Vec<_>>();
-        if edits.is_empty() {
-            return None;
-        }
-
-        let first_edit_start = edits.first().unwrap().0.start;
-        let first_edit_start_point = first_edit_start.to_point(&multibuffer);
-        let edit_start_row = first_edit_start_point.row.saturating_sub(2);
-
-        let last_edit_end = edits.last().unwrap().0.end;
-        let last_edit_end_point = last_edit_end.to_point(&multibuffer);
-        let edit_end_row = cmp::min(multibuffer.max_point().row, last_edit_end_point.row + 2);
-
-        let cursor_row = cursor.to_point(&multibuffer).row;
-
-        let snapshot = multibuffer.buffer_for_excerpt(excerpt_id).cloned()?;
-
-        let mut inlay_ids = Vec::new();
-        let invalidation_row_range;
-        let move_invalidation_row_range = if cursor_row < edit_start_row {
-            Some(cursor_row..edit_end_row)
-        } else if cursor_row > edit_end_row {
-            Some(edit_start_row..cursor_row)
-        } else {
-            None
-        };
-        let is_move =
-            move_invalidation_row_range.is_some() || self.inline_completions_hidden_for_vim_mode;
-        let completion = if is_move {
-            invalidation_row_range =
-                move_invalidation_row_range.unwrap_or(edit_start_row..edit_end_row);
-            let target = first_edit_start;
-            InlineCompletion::Move { target, snapshot }
-        } else {
-            let show_completions_in_buffer = !self.edit_prediction_visible_in_cursor_popover(true)
-                && !self.inline_completions_hidden_for_vim_mode;
-
-            if show_completions_in_buffer {
-                if edits
-                    .iter()
-                    .all(|(range, _)| range.to_offset(&multibuffer).is_empty())
-                {
-                    let mut inlays = Vec::new();
-                    for (range, new_text) in &edits {
-                        let inlay = Inlay::inline_completion(
-                            post_inc(&mut self.next_inlay_id),
-                            range.start,
-                            new_text.as_str(),
-                        );
-                        inlay_ids.push(inlay.id);
-                        inlays.push(inlay);
-                    }
-
-                    self.splice_inlays(&[], inlays, cx);
-                } else {
-                    let background_color = cx.theme().status().deleted_background;
-                    self.highlight_text::<InlineCompletionHighlight>(
-                        edits.iter().map(|(range, _)| range.clone()).collect(),
-                        HighlightStyle {
-                            background_color: Some(background_color),
-                            ..Default::default()
-                        },
-                        cx,
-                    );
-                }
-            }
-
-            invalidation_row_range = edit_start_row..edit_end_row;
-
-            let display_mode = if all_edits_insertions_or_deletions(&edits, &multibuffer) {
-                if provider.show_tab_accept_marker() {
-                    EditDisplayMode::TabAccept
-                } else {
-                    EditDisplayMode::Inline
-                }
-            } else {
-                EditDisplayMode::DiffPopover
-            };
-
-            InlineCompletion::Edit {
-                edits,
-                edit_preview: inline_completion.edit_preview,
-                display_mode,
-                snapshot,
-            }
-        };
-
-        let invalidation_range = multibuffer
-            .anchor_before(Point::new(invalidation_row_range.start, 0))
-            ..multibuffer.anchor_after(Point::new(
-                invalidation_row_range.end,
-                multibuffer.line_len(MultiBufferRow(invalidation_row_range.end)),
-            ));
-
-        self.stale_inline_completion_in_menu = None;
-        self.active_inline_completion = Some(InlineCompletionState {
-            inlay_ids,
-            completion,
-            completion_id: inline_completion.id,
-            invalidation_range,
-        });
-
-        cx.notify();
-
-        Some(())
-    }
-
-    pub fn edit_prediction_provider(&self) -> Option<Arc<dyn InlineCompletionProviderHandle>> {
-        Some(self.edit_prediction_provider.as_ref()?.provider.clone())
-    }
-
-    fn render_code_actions_indicator(
-        &self,
-        _style: &EditorStyle,
-        row: DisplayRow,
-        is_active: bool,
-        breakpoint: Option<&(Anchor, Breakpoint)>,
-        cx: &mut Context<Self>,
-    ) -> Option<IconButton> {
-        let color = Color::Muted;
-        let position = breakpoint.as_ref().map(|(anchor, _)| *anchor);
-        let show_tooltip = !self.context_menu_visible();
-
-        if self.available_code_actions.is_some() {
-            Some(
-                IconButton::new("code_actions_indicator", ui::IconName::Bolt)
-                    .shape(ui::IconButtonShape::Square)
-                    .icon_size(IconSize::XSmall)
-                    .icon_color(color)
-                    .toggle_state(is_active)
-                    .when(show_tooltip, |this| {
-                        this.tooltip({
-                            let focus_handle = self.focus_handle.clone();
-                            move |window, cx| {
-                                Tooltip::for_action_in(
-                                    "Toggle Code Actions",
-                                    &ToggleCodeActions {
-                                        deployed_from_indicator: None,
-                                        quick_launch: false,
-                                    },
-                                    &focus_handle,
-                                    window,
-                                    cx,
-                                )
-                            }
-                        })
-                    })
-                    .on_click(cx.listener(move |editor, e: &ClickEvent, window, cx| {
-                        let quick_launch = e.down.button == MouseButton::Left;
-                        window.focus(&editor.focus_handle(cx));
-                        editor.toggle_code_actions(
-                            &ToggleCodeActions {
-                                deployed_from_indicator: Some(row),
-                                quick_launch,
-                            },
-                            window,
-                            cx,
-                        );
-                    }))
-                    .on_right_click(cx.listener(move |editor, event: &ClickEvent, window, cx| {
-                        editor.set_breakpoint_context_menu(
-                            row,
-                            position,
-                            event.down.position,
-                            window,
-                            cx,
-                        );
-                    })),
-            )
-        } else {
-            None
-        }
-    }
-
-    fn clear_tasks(&mut self) {
-        self.tasks.clear()
-    }
-
-    fn insert_tasks(&mut self, key: (BufferId, BufferRow), value: RunnableTasks) {
-        if self.tasks.insert(key, value).is_some() {
-            // This case should hopefully be rare, but just in case...
-            log::error!(
-                "multiple different run targets found on a single line, only the last target will be rendered"
-            )
-        }
-    }
-
-    /// Get all display points of breakpoints that will be rendered within editor
-    ///
-    /// This function is used to handle overlaps between breakpoints and Code action/runner symbol.
-    /// It's also used to set the color of line numbers with breakpoints to the breakpoint color.
-    /// TODO debugger: Use this function to color toggle symbols that house nested breakpoints
-    fn active_breakpoints(
-        &self,
-        range: Range<DisplayRow>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> HashMap<DisplayRow, (Anchor, Breakpoint)> {
-        let mut breakpoint_display_points = HashMap::default();
-
-        let Some(breakpoint_store) = self.breakpoint_store.clone() else {
-            return breakpoint_display_points;
-        };
-
-        let snapshot = self.snapshot(window, cx);
-
-        let multi_buffer_snapshot = &snapshot.display_snapshot.buffer_snapshot;
-        let Some(project) = self.project.as_ref() else {
-            return breakpoint_display_points;
-        };
-
-        let range = snapshot.display_point_to_point(DisplayPoint::new(range.start, 0), Bias::Left)
-            ..snapshot.display_point_to_point(DisplayPoint::new(range.end, 0), Bias::Right);
-
-        for (buffer_snapshot, range, excerpt_id) in
-            multi_buffer_snapshot.range_to_buffer_ranges(range)
-        {
-            let Some(buffer) = project.read_with(cx, |this, cx| {
-                this.buffer_for_id(buffer_snapshot.remote_id(), cx)
-            }) else {
-                continue;
-            };
-            let breakpoints = breakpoint_store.read(cx).breakpoints(
-                &buffer,
-                Some(
-                    buffer_snapshot.anchor_before(range.start)
-                        ..buffer_snapshot.anchor_after(range.end),
-                ),
-                buffer_snapshot,
-                cx,
-            );
-            for (anchor, breakpoint) in breakpoints {
-                let multi_buffer_anchor =
-                    Anchor::in_buffer(excerpt_id, buffer_snapshot.remote_id(), *anchor);
-                let position = multi_buffer_anchor
-                    .to_point(&multi_buffer_snapshot)
-                    .to_display_point(&snapshot);
-
-                breakpoint_display_points
-                    .insert(position.row(), (multi_buffer_anchor, breakpoint.clone()));
-            }
-        }
-
-        breakpoint_display_points
-    }
-
-    fn breakpoint_context_menu(
-        &self,
-        anchor: Anchor,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Entity<ui::ContextMenu> {
-        let weak_editor = cx.weak_entity();
-        let focus_handle = self.focus_handle(cx);
-
-        let row = self
-            .buffer
-            .read(cx)
-            .snapshot(cx)
-            .summary_for_anchor::<Point>(&anchor)
-            .row;
-
-        let breakpoint = self
-            .breakpoint_at_row(row, window, cx)
-            .map(|(anchor, bp)| (anchor, Arc::from(bp)));
-
-        let log_breakpoint_msg = if breakpoint.as_ref().is_some_and(|bp| bp.1.message.is_some()) {
-            "Edit Log Breakpoint"
-        } else {
-            "Set Log Breakpoint"
-        };
-
-        let condition_breakpoint_msg = if breakpoint
-            .as_ref()
-            .is_some_and(|bp| bp.1.condition.is_some())
-        {
-            "Edit Condition Breakpoint"
-        } else {
-            "Set Condition Breakpoint"
-        };
-
-        let hit_condition_breakpoint_msg = if breakpoint
-            .as_ref()
-            .is_some_and(|bp| bp.1.hit_condition.is_some())
-        {
-            "Edit Hit Condition Breakpoint"
-        } else {
-            "Set Hit Condition Breakpoint"
-        };
-
-        let set_breakpoint_msg = if breakpoint.as_ref().is_some() {
-            "Unset Breakpoint"
-        } else {
-            "Set Breakpoint"
-        };
-
-        let run_to_cursor = command_palette_hooks::CommandPaletteFilter::try_global(cx)
-            .map_or(false, |filter| !filter.is_hidden(&DebuggerRunToCursor));
-
-        let toggle_state_msg = breakpoint.as_ref().map_or(None, |bp| match bp.1.state {
-            BreakpointState::Enabled => Some("Disable"),
-            BreakpointState::Disabled => Some("Enable"),
-        });
-
-        let (anchor, breakpoint) =
-            breakpoint.unwrap_or_else(|| (anchor, Arc::new(Breakpoint::new_standard())));
-
-        ui::ContextMenu::build(window, cx, |menu, _, _cx| {
-            menu.on_blur_subscription(Subscription::new(|| {}))
-                .context(focus_handle)
-                .when(run_to_cursor, |this| {
-                    let weak_editor = weak_editor.clone();
-                    this.entry("Run to cursor", None, move |window, cx| {
-                        weak_editor
-                            .update(cx, |editor, cx| {
-                                editor.change_selections(None, window, cx, |s| {
-                                    s.select_ranges([Point::new(row, 0)..Point::new(row, 0)])
-                                });
-                            })
-                            .ok();
-
-                        window.dispatch_action(Box::new(DebuggerRunToCursor), cx);
-                    })
-                    .separator()
-                })
-                .when_some(toggle_state_msg, |this, msg| {
-                    this.entry(msg, None, {
-                        let weak_editor = weak_editor.clone();
-                        let breakpoint = breakpoint.clone();
-                        move |_window, cx| {
-                            weak_editor
-                                .update(cx, |this, cx| {
-                                    this.edit_breakpoint_at_anchor(
-                                        anchor,
-                                        breakpoint.as_ref().clone(),
-                                        BreakpointEditAction::InvertState,
-                                        cx,
-                                    );
-                                })
-                                .log_err();
-                        }
-                    })
-                })
-                .entry(set_breakpoint_msg, None, {
-                    let weak_editor = weak_editor.clone();
-                    let breakpoint = breakpoint.clone();
-                    move |_window, cx| {
-                        weak_editor
-                            .update(cx, |this, cx| {
-                                this.edit_breakpoint_at_anchor(
-                                    anchor,
-                                    breakpoint.as_ref().clone(),
-                                    BreakpointEditAction::Toggle,
-                                    cx,
-                                );
-                            })
-                            .log_err();
-                    }
-                })
-                .entry(log_breakpoint_msg, None, {
-                    let breakpoint = breakpoint.clone();
-                    let weak_editor = weak_editor.clone();
-                    move |window, cx| {
-                        weak_editor
-                            .update(cx, |this, cx| {
-                                this.add_edit_breakpoint_block(
-                                    anchor,
-                                    breakpoint.as_ref(),
-                                    BreakpointPromptEditAction::Log,
-                                    window,
-                                    cx,
-                                );
-                            })
-                            .log_err();
-                    }
-                })
-                .entry(condition_breakpoint_msg, None, {
-                    let breakpoint = breakpoint.clone();
-                    let weak_editor = weak_editor.clone();
-                    move |window, cx| {
-                        weak_editor
-                            .update(cx, |this, cx| {
-                                this.add_edit_breakpoint_block(
-                                    anchor,
-                                    breakpoint.as_ref(),
-                                    BreakpointPromptEditAction::Condition,
-                                    window,
-                                    cx,
-                                );
-                            })
-                            .log_err();
-                    }
-                })
-                .entry(hit_condition_breakpoint_msg, None, move |window, cx| {
-                    weak_editor
-                        .update(cx, |this, cx| {
-                            this.add_edit_breakpoint_block(
-                                anchor,
-                                breakpoint.as_ref(),
-                                BreakpointPromptEditAction::HitCondition,
-                                window,
-                                cx,
-                            );
-                        })
-                        .log_err();
-                })
-        })
-    }
-
-    fn render_breakpoint(
-        &self,
-        position: Anchor,
-        row: DisplayRow,
-        breakpoint: &Breakpoint,
-        cx: &mut Context<Self>,
-    ) -> IconButton {
-        // Is it a breakpoint that shows up when hovering over gutter?
-        let (is_phantom, collides_with_existing) = self.gutter_breakpoint_indicator.0.map_or(
-            (false, false),
-            |PhantomBreakpointIndicator {
-                 is_active,
-                 display_row,
-                 collides_with_existing_breakpoint,
-             }| {
-                (
-                    is_active && display_row == row,
-                    collides_with_existing_breakpoint,
-                )
-            },
-        );
-
-        let (color, icon) = {
-            let icon = match (&breakpoint.message.is_some(), breakpoint.is_disabled()) {
-                (false, false) => ui::IconName::DebugBreakpoint,
-                (true, false) => ui::IconName::DebugLogBreakpoint,
-                (false, true) => ui::IconName::DebugDisabledBreakpoint,
-                (true, true) => ui::IconName::DebugDisabledLogBreakpoint,
-            };
-
-            let color = if is_phantom {
-                Color::Hint
-            } else {
-                Color::Debugger
-            };
-
-            (color, icon)
-        };
-
-        let breakpoint = Arc::from(breakpoint.clone());
-
-        let alt_as_text = gpui::Keystroke {
-            modifiers: Modifiers::secondary_key(),
-            ..Default::default()
-        };
-        let primary_action_text = if breakpoint.is_disabled() {
-            "enable"
-        } else if is_phantom && !collides_with_existing {
-            "set"
-        } else {
-            "unset"
-        };
-        let mut primary_text = format!("Click to {primary_action_text}");
-        if collides_with_existing && !breakpoint.is_disabled() {
-            use std::fmt::Write;
-            write!(primary_text, ", {alt_as_text}-click to disable").ok();
-        }
-        let primary_text = SharedString::from(primary_text);
-        let focus_handle = self.focus_handle.clone();
-        IconButton::new(("breakpoint_indicator", row.0 as usize), icon)
-            .icon_size(IconSize::XSmall)
-            .size(ui::ButtonSize::None)
-            .icon_color(color)
-            .style(ButtonStyle::Transparent)
-            .on_click(cx.listener({
-                let breakpoint = breakpoint.clone();
-
-                move |editor, event: &ClickEvent, window, cx| {
-                    let edit_action = if event.modifiers().platform || breakpoint.is_disabled() {
-                        BreakpointEditAction::InvertState
-                    } else {
-                        BreakpointEditAction::Toggle
-                    };
-
-                    window.focus(&editor.focus_handle(cx));
-                    editor.edit_breakpoint_at_anchor(
-                        position,
-                        breakpoint.as_ref().clone(),
-                        edit_action,
-                        cx,
-                    );
-                }
-            }))
-            .on_right_click(cx.listener(move |editor, event: &ClickEvent, window, cx| {
-                editor.set_breakpoint_context_menu(
-                    row,
-                    Some(position),
-                    event.down.position,
-                    window,
-                    cx,
-                );
-            }))
-            .tooltip(move |window, cx| {
-                Tooltip::with_meta_in(
-                    primary_text.clone(),
-                    None,
-                    "Right-click for more options",
-                    &focus_handle,
-                    window,
-                    cx,
-                )
-            })
-    }
-
-    fn build_tasks_context(
-        project: &Entity<Project>,
-        buffer: &Entity<Buffer>,
-        buffer_row: u32,
-        tasks: &Arc<RunnableTasks>,
-        cx: &mut Context<Self>,
-    ) -> Task<Option<task::TaskContext>> {
-        let position = Point::new(buffer_row, tasks.column);
-        let range_start = buffer.read(cx).anchor_at(position, Bias::Right);
-        let location = Location {
-            buffer: buffer.clone(),
-            range: range_start..range_start,
-        };
-        // Fill in the environmental variables from the tree-sitter captures
-        let mut captured_task_variables = TaskVariables::default();
-        for (capture_name, value) in tasks.extra_variables.clone() {
-            captured_task_variables.insert(
-                task::VariableName::Custom(capture_name.into()),
-                value.clone(),
-            );
-        }
-        project.update(cx, |project, cx| {
-            project.task_store().update(cx, |task_store, cx| {
-                task_store.task_context_for_location(captured_task_variables, location, cx)
-            })
-        })
-    }
-
-    pub fn spawn_nearest_task(
-        &mut self,
-        action: &SpawnNearestTask,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some((workspace, _)) = self.workspace.clone() else {
-            return;
-        };
-        let Some(project) = self.project.clone() else {
-            return;
-        };
-
-        // Try to find a closest, enclosing node using tree-sitter that has a
-        // task
-        let Some((buffer, buffer_row, tasks)) = self
-            .find_enclosing_node_task(cx)
-            // Or find the task that's closest in row-distance.
-            .or_else(|| self.find_closest_task(cx))
-        else {
-            return;
-        };
-
-        let reveal_strategy = action.reveal;
-        let task_context = Self::build_tasks_context(&project, &buffer, buffer_row, &tasks, cx);
-        cx.spawn_in(window, async move |_, cx| {
-            let context = task_context.await?;
-            let (task_source_kind, mut resolved_task) = tasks.resolve(&context).next()?;
-
-            let resolved = &mut resolved_task.resolved;
-            resolved.reveal = reveal_strategy;
-
-            workspace
-                .update_in(cx, |workspace, window, cx| {
-                    workspace.schedule_resolved_task(
-                        task_source_kind,
-                        resolved_task,
-                        false,
-                        window,
-                        cx,
-                    );
-                })
-                .ok()
-        })
-        .detach();
-    }
-
-    fn find_closest_task(
-        &mut self,
-        cx: &mut Context<Self>,
-    ) -> Option<(Entity<Buffer>, u32, Arc<RunnableTasks>)> {
-        let cursor_row = self.selections.newest_adjusted(cx).head().row;
-
-        let ((buffer_id, row), tasks) = self
-            .tasks
-            .iter()
-            .min_by_key(|((_, row), _)| cursor_row.abs_diff(*row))?;
-
-        let buffer = self.buffer.read(cx).buffer(*buffer_id)?;
-        let tasks = Arc::new(tasks.to_owned());
-        Some((buffer, *row, tasks))
-    }
-
-    fn find_enclosing_node_task(
-        &mut self,
-        cx: &mut Context<Self>,
-    ) -> Option<(Entity<Buffer>, u32, Arc<RunnableTasks>)> {
-        let snapshot = self.buffer.read(cx).snapshot(cx);
-        let offset = self.selections.newest::<usize>(cx).head();
-        let excerpt = snapshot.excerpt_containing(offset..offset)?;
-        let buffer_id = excerpt.buffer().remote_id();
-
-        let layer = excerpt.buffer().syntax_layer_at(offset)?;
-        let mut cursor = layer.node().walk();
-
-        while cursor.goto_first_child_for_byte(offset).is_some() {
-            if cursor.node().end_byte() == offset {
-                cursor.goto_next_sibling();
-            }
-        }
-
-        // Ascend to the smallest ancestor that contains the range and has a task.
-        loop {
-            let node = cursor.node();
-            let node_range = node.byte_range();
-            let symbol_start_row = excerpt.buffer().offset_to_point(node.start_byte()).row;
-
-            // Check if this node contains our offset
-            if node_range.start <= offset && node_range.end >= offset {
-                // If it contains offset, check for task
-                if let Some(tasks) = self.tasks.get(&(buffer_id, symbol_start_row)) {
-                    let buffer = self.buffer.read(cx).buffer(buffer_id)?;
-                    return Some((buffer, symbol_start_row, Arc::new(tasks.to_owned())));
-                }
-            }
-
-            if !cursor.goto_parent() {
-                break;
-            }
-        }
-        None
-    }
-
-    fn render_run_indicator(
-        &self,
-        _style: &EditorStyle,
-        is_active: bool,
-        row: DisplayRow,
-        breakpoint: Option<(Anchor, Breakpoint)>,
-        cx: &mut Context<Self>,
-    ) -> IconButton {
-        let color = Color::Muted;
-        let position = breakpoint.as_ref().map(|(anchor, _)| *anchor);
-
-        IconButton::new(("run_indicator", row.0 as usize), ui::IconName::Play)
-            .shape(ui::IconButtonShape::Square)
-            .icon_size(IconSize::XSmall)
-            .icon_color(color)
-            .toggle_state(is_active)
-            .on_click(cx.listener(move |editor, e: &ClickEvent, window, cx| {
-                let quick_launch = e.down.button == MouseButton::Left;
-                window.focus(&editor.focus_handle(cx));
-                editor.toggle_code_actions(
-                    &ToggleCodeActions {
-                        deployed_from_indicator: Some(row),
-                        quick_launch,
-                    },
-                    window,
-                    cx,
-                );
-            }))
-            .on_right_click(cx.listener(move |editor, event: &ClickEvent, window, cx| {
-                editor.set_breakpoint_context_menu(row, position, event.down.position, window, cx);
-            }))
-    }
-
-    pub fn context_menu_visible(&self) -> bool {
-        !self.edit_prediction_preview_is_active()
-            && self
-                .context_menu
-                .borrow()
-                .as_ref()
-                .map_or(false, |menu| menu.visible())
-    }
-
-    fn context_menu_origin(&self) -> Option<ContextMenuOrigin> {
-        self.context_menu
-            .borrow()
-            .as_ref()
-            .map(|menu| menu.origin())
-    }
-
-    pub fn set_context_menu_options(&mut self, options: ContextMenuOptions) {
-        self.context_menu_options = Some(options);
-    }
-
-    const EDIT_PREDICTION_POPOVER_PADDING_X: Pixels = Pixels(24.);
-    const EDIT_PREDICTION_POPOVER_PADDING_Y: Pixels = Pixels(2.);
-
-    fn render_edit_prediction_popover(
-        &mut self,
-        text_bounds: &Bounds<Pixels>,
-        content_origin: gpui::Point<Pixels>,
-        editor_snapshot: &EditorSnapshot,
-        visible_row_range: Range<DisplayRow>,
-        scroll_top: f32,
-        scroll_bottom: f32,
-        line_layouts: &[LineWithInvisibles],
-        line_height: Pixels,
-        scroll_pixel_position: gpui::Point<Pixels>,
-        newest_selection_head: Option<DisplayPoint>,
-        editor_width: Pixels,
-        style: &EditorStyle,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<(AnyElement, gpui::Point<Pixels>)> {
-        let active_inline_completion = self.active_inline_completion.as_ref()?;
-
-        if self.edit_prediction_visible_in_cursor_popover(true) {
-            return None;
-        }
-
-        match &active_inline_completion.completion {
-            InlineCompletion::Move { target, .. } => {
-                let target_display_point = target.to_display_point(editor_snapshot);
-
-                if self.edit_prediction_requires_modifier() {
-                    if !self.edit_prediction_preview_is_active() {
-                        return None;
-                    }
-
-                    self.render_edit_prediction_modifier_jump_popover(
-                        text_bounds,
-                        content_origin,
-                        visible_row_range,
-                        line_layouts,
-                        line_height,
-                        scroll_pixel_position,
-                        newest_selection_head,
-                        target_display_point,
-                        window,
-                        cx,
-                    )
-                } else {
-                    self.render_edit_prediction_eager_jump_popover(
-                        text_bounds,
-                        content_origin,
-                        editor_snapshot,
-                        visible_row_range,
-                        scroll_top,
-                        scroll_bottom,
-                        line_height,
-                        scroll_pixel_position,
-                        target_display_point,
-                        editor_width,
-                        window,
-                        cx,
-                    )
-                }
-            }
-            InlineCompletion::Edit {
-                display_mode: EditDisplayMode::Inline,
-                ..
-            } => None,
-            InlineCompletion::Edit {
-                display_mode: EditDisplayMode::TabAccept,
-                edits,
-                ..
-            } => {
-                let range = &edits.first()?.0;
-                let target_display_point = range.end.to_display_point(editor_snapshot);
-
-                self.render_edit_prediction_end_of_line_popover(
-                    "Accept",
-                    editor_snapshot,
-                    visible_row_range,
-                    target_display_point,
-                    line_height,
-                    scroll_pixel_position,
-                    content_origin,
-                    editor_width,
-                    window,
-                    cx,
-                )
-            }
-            InlineCompletion::Edit {
-                edits,
-                edit_preview,
-                display_mode: EditDisplayMode::DiffPopover,
-                snapshot,
-            } => self.render_edit_prediction_diff_popover(
-                text_bounds,
-                content_origin,
-                editor_snapshot,
-                visible_row_range,
-                line_layouts,
-                line_height,
-                scroll_pixel_position,
-                newest_selection_head,
-                editor_width,
-                style,
-                edits,
-                edit_preview,
-                snapshot,
-                window,
-                cx,
-            ),
-        }
-    }
-
-    fn render_edit_prediction_modifier_jump_popover(
-        &mut self,
-        text_bounds: &Bounds<Pixels>,
-        content_origin: gpui::Point<Pixels>,
-        visible_row_range: Range<DisplayRow>,
-        line_layouts: &[LineWithInvisibles],
-        line_height: Pixels,
-        scroll_pixel_position: gpui::Point<Pixels>,
-        newest_selection_head: Option<DisplayPoint>,
-        target_display_point: DisplayPoint,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<(AnyElement, gpui::Point<Pixels>)> {
-        let scrolled_content_origin =
-            content_origin - gpui::Point::new(scroll_pixel_position.x, Pixels(0.0));
-
-        const SCROLL_PADDING_Y: Pixels = px(12.);
-
-        if target_display_point.row() < visible_row_range.start {
-            return self.render_edit_prediction_scroll_popover(
-                |_| SCROLL_PADDING_Y,
-                IconName::ArrowUp,
-                visible_row_range,
-                line_layouts,
-                newest_selection_head,
-                scrolled_content_origin,
-                window,
-                cx,
-            );
-        } else if target_display_point.row() >= visible_row_range.end {
-            return self.render_edit_prediction_scroll_popover(
-                |size| text_bounds.size.height - size.height - SCROLL_PADDING_Y,
-                IconName::ArrowDown,
-                visible_row_range,
-                line_layouts,
-                newest_selection_head,
-                scrolled_content_origin,
-                window,
-                cx,
-            );
-        }
-
-        const POLE_WIDTH: Pixels = px(2.);
-
-        let line_layout =
-            line_layouts.get(target_display_point.row().minus(visible_row_range.start) as usize)?;
-        let target_column = target_display_point.column() as usize;
-
-        let target_x = line_layout.x_for_index(target_column);
-        let target_y =
-            (target_display_point.row().as_f32() * line_height) - scroll_pixel_position.y;
-
-        let flag_on_right = target_x < text_bounds.size.width / 2.;
-
-        let mut border_color = Self::edit_prediction_callout_popover_border_color(cx);
-        border_color.l += 0.001;
-
-        let mut element = v_flex()
-            .items_end()
-            .when(flag_on_right, |el| el.items_start())
-            .child(if flag_on_right {
-                self.render_edit_prediction_line_popover("Jump", None, window, cx)?
-                    .rounded_bl(px(0.))
-                    .rounded_tl(px(0.))
-                    .border_l_2()
-                    .border_color(border_color)
-            } else {
-                self.render_edit_prediction_line_popover("Jump", None, window, cx)?
-                    .rounded_br(px(0.))
-                    .rounded_tr(px(0.))
-                    .border_r_2()
-                    .border_color(border_color)
-            })
-            .child(div().w(POLE_WIDTH).bg(border_color).h(line_height))
-            .into_any();
-
-        let size = element.layout_as_root(AvailableSpace::min_size(), window, cx);
-
-        let mut origin = scrolled_content_origin + point(target_x, target_y)
-            - point(
-                if flag_on_right {
-                    POLE_WIDTH
-                } else {
-                    size.width - POLE_WIDTH
-                },
-                size.height - line_height,
-            );
-
-        origin.x = origin.x.max(content_origin.x);
-
-        element.prepaint_at(origin, window, cx);
-
-        Some((element, origin))
-    }
-
-    fn render_edit_prediction_scroll_popover(
-        &mut self,
-        to_y: impl Fn(Size<Pixels>) -> Pixels,
-        scroll_icon: IconName,
-        visible_row_range: Range<DisplayRow>,
-        line_layouts: &[LineWithInvisibles],
-        newest_selection_head: Option<DisplayPoint>,
-        scrolled_content_origin: gpui::Point<Pixels>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<(AnyElement, gpui::Point<Pixels>)> {
-        let mut element = self
-            .render_edit_prediction_line_popover("Scroll", Some(scroll_icon), window, cx)?
-            .into_any();
-
-        let size = element.layout_as_root(AvailableSpace::min_size(), window, cx);
-
-        let cursor = newest_selection_head?;
-        let cursor_row_layout =
-            line_layouts.get(cursor.row().minus(visible_row_range.start) as usize)?;
-        let cursor_column = cursor.column() as usize;
-
-        let cursor_character_x = cursor_row_layout.x_for_index(cursor_column);
-
-        let origin = scrolled_content_origin + point(cursor_character_x, to_y(size));
-
-        element.prepaint_at(origin, window, cx);
-        Some((element, origin))
-    }
-
-    fn render_edit_prediction_eager_jump_popover(
-        &mut self,
-        text_bounds: &Bounds<Pixels>,
-        content_origin: gpui::Point<Pixels>,
-        editor_snapshot: &EditorSnapshot,
-        visible_row_range: Range<DisplayRow>,
-        scroll_top: f32,
-        scroll_bottom: f32,
-        line_height: Pixels,
-        scroll_pixel_position: gpui::Point<Pixels>,
-        target_display_point: DisplayPoint,
-        editor_width: Pixels,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<(AnyElement, gpui::Point<Pixels>)> {
-        if target_display_point.row().as_f32() < scroll_top {
-            let mut element = self
-                .render_edit_prediction_line_popover(
-                    "Jump to Edit",
-                    Some(IconName::ArrowUp),
-                    window,
-                    cx,
-                )?
-                .into_any();
-
-            let size = element.layout_as_root(AvailableSpace::min_size(), window, cx);
-            let offset = point(
-                (text_bounds.size.width - size.width) / 2.,
-                Self::EDIT_PREDICTION_POPOVER_PADDING_Y,
-            );
-
-            let origin = text_bounds.origin + offset;
-            element.prepaint_at(origin, window, cx);
-            Some((element, origin))
-        } else if (target_display_point.row().as_f32() + 1.) > scroll_bottom {
-            let mut element = self
-                .render_edit_prediction_line_popover(
-                    "Jump to Edit",
-                    Some(IconName::ArrowDown),
-                    window,
-                    cx,
-                )?
-                .into_any();
-
-            let size = element.layout_as_root(AvailableSpace::min_size(), window, cx);
-            let offset = point(
-                (text_bounds.size.width - size.width) / 2.,
-                text_bounds.size.height - size.height - Self::EDIT_PREDICTION_POPOVER_PADDING_Y,
-            );
-
-            let origin = text_bounds.origin + offset;
-            element.prepaint_at(origin, window, cx);
-            Some((element, origin))
-        } else {
-            self.render_edit_prediction_end_of_line_popover(
-                "Jump to Edit",
-                editor_snapshot,
-                visible_row_range,
-                target_display_point,
-                line_height,
-                scroll_pixel_position,
-                content_origin,
-                editor_width,
-                window,
-                cx,
-            )
-        }
-    }
-
-    fn render_edit_prediction_end_of_line_popover(
-        self: &mut Editor,
-        label: &'static str,
-        editor_snapshot: &EditorSnapshot,
-        visible_row_range: Range<DisplayRow>,
-        target_display_point: DisplayPoint,
-        line_height: Pixels,
-        scroll_pixel_position: gpui::Point<Pixels>,
-        content_origin: gpui::Point<Pixels>,
-        editor_width: Pixels,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<(AnyElement, gpui::Point<Pixels>)> {
-        let target_line_end = DisplayPoint::new(
-            target_display_point.row(),
-            editor_snapshot.line_len(target_display_point.row()),
-        );
-
-        let mut element = self
-            .render_edit_prediction_line_popover(label, None, window, cx)?
-            .into_any();
-
-        let size = element.layout_as_root(AvailableSpace::min_size(), window, cx);
-
-        let line_origin = self.display_to_pixel_point(target_line_end, editor_snapshot, window)?;
-
-        let start_point = content_origin - point(scroll_pixel_position.x, Pixels::ZERO);
-        let mut origin = start_point
-            + line_origin
-            + point(Self::EDIT_PREDICTION_POPOVER_PADDING_X, Pixels::ZERO);
-        origin.x = origin.x.max(content_origin.x);
-
-        let max_x = content_origin.x + editor_width - size.width;
-
-        if origin.x > max_x {
-            let offset = line_height + Self::EDIT_PREDICTION_POPOVER_PADDING_Y;
-
-            let icon = if visible_row_range.contains(&(target_display_point.row() + 2)) {
-                origin.y += offset;
-                IconName::ArrowUp
-            } else {
-                origin.y -= offset;
-                IconName::ArrowDown
-            };
-
-            element = self
-                .render_edit_prediction_line_popover(label, Some(icon), window, cx)?
-                .into_any();
-
-            let size = element.layout_as_root(AvailableSpace::min_size(), window, cx);
-
-            origin.x = content_origin.x + editor_width - size.width - px(2.);
-        }
-
-        element.prepaint_at(origin, window, cx);
-        Some((element, origin))
-    }
-
-    fn render_edit_prediction_diff_popover(
-        self: &Editor,
-        text_bounds: &Bounds<Pixels>,
-        content_origin: gpui::Point<Pixels>,
-        editor_snapshot: &EditorSnapshot,
-        visible_row_range: Range<DisplayRow>,
-        line_layouts: &[LineWithInvisibles],
-        line_height: Pixels,
-        scroll_pixel_position: gpui::Point<Pixels>,
-        newest_selection_head: Option<DisplayPoint>,
-        editor_width: Pixels,
-        style: &EditorStyle,
-        edits: &Vec<(Range<Anchor>, String)>,
-        edit_preview: &Option<language::EditPreview>,
-        snapshot: &language::BufferSnapshot,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<(AnyElement, gpui::Point<Pixels>)> {
-        let edit_start = edits
-            .first()
-            .unwrap()
-            .0
-            .start
-            .to_display_point(editor_snapshot);
-        let edit_end = edits
-            .last()
-            .unwrap()
-            .0
-            .end
-            .to_display_point(editor_snapshot);
-
-        let is_visible = visible_row_range.contains(&edit_start.row())
-            || visible_row_range.contains(&edit_end.row());
-        if !is_visible {
-            return None;
-        }
-
-        let highlighted_edits =
-            crate::inline_completion_edit_text(&snapshot, edits, edit_preview.as_ref()?, false, cx);
-
-        let styled_text = highlighted_edits.to_styled_text(&style.text);
-        let line_count = highlighted_edits.text.lines().count();
-
-        const BORDER_WIDTH: Pixels = px(1.);
-
-        let keybind = self.render_edit_prediction_accept_keybind(window, cx);
-        let has_keybind = keybind.is_some();
-
-        let mut element = h_flex()
-            .items_start()
-            .child(
-                h_flex()
-                    .bg(cx.theme().colors().editor_background)
-                    .border(BORDER_WIDTH)
-                    .shadow_sm()
-                    .border_color(cx.theme().colors().border)
-                    .rounded_l_lg()
-                    .when(line_count > 1, |el| el.rounded_br_lg())
-                    .pr_1()
-                    .child(styled_text),
-            )
-            .child(
-                h_flex()
-                    .h(line_height + BORDER_WIDTH * 2.)
-                    .px_1p5()
-                    .gap_1()
-                    // Workaround: For some reason, there's a gap if we don't do this
-                    .ml(-BORDER_WIDTH)
-                    .shadow(vec![gpui::BoxShadow {
-                        color: gpui::black().opacity(0.05),
-                        offset: point(px(1.), px(1.)),
-                        blur_radius: px(2.),
-                        spread_radius: px(0.),
-                    }])
-                    .bg(Editor::edit_prediction_line_popover_bg_color(cx))
-                    .border(BORDER_WIDTH)
-                    .border_color(cx.theme().colors().border)
-                    .rounded_r_lg()
-                    .id("edit_prediction_diff_popover_keybind")
-                    .when(!has_keybind, |el| {
-                        let status_colors = cx.theme().status();
-
-                        el.bg(status_colors.error_background)
-                            .border_color(status_colors.error.opacity(0.6))
-                            .child(Icon::new(IconName::Info).color(Color::Error))
-                            .cursor_default()
-                            .hoverable_tooltip(move |_window, cx| {
-                                cx.new(|_| MissingEditPredictionKeybindingTooltip).into()
-                            })
-                    })
-                    .children(keybind),
-            )
-            .into_any();
-
-        let longest_row =
-            editor_snapshot.longest_row_in_range(edit_start.row()..edit_end.row() + 1);
-        let longest_line_width = if visible_row_range.contains(&longest_row) {
-            line_layouts[(longest_row.0 - visible_row_range.start.0) as usize].width
-        } else {
-            layout_line(
-                longest_row,
-                editor_snapshot,
-                style,
-                editor_width,
-                |_| false,
-                window,
-                cx,
-            )
-            .width
-        };
-
-        let viewport_bounds =
-            Bounds::new(Default::default(), window.viewport_size()).extend(Edges {
-                right: -EditorElement::SCROLLBAR_WIDTH,
-                ..Default::default()
-            });
-
-        let x_after_longest =
-            text_bounds.origin.x + longest_line_width + Self::EDIT_PREDICTION_POPOVER_PADDING_X
-                - scroll_pixel_position.x;
-
-        let element_bounds = element.layout_as_root(AvailableSpace::min_size(), window, cx);
-
-        // Fully visible if it can be displayed within the window (allow overlapping other
-        // panes). However, this is only allowed if the popover starts within text_bounds.
-        let can_position_to_the_right = x_after_longest < text_bounds.right()
-            && x_after_longest + element_bounds.width < viewport_bounds.right();
-
-        let mut origin = if can_position_to_the_right {
-            point(
-                x_after_longest,
-                text_bounds.origin.y + edit_start.row().as_f32() * line_height
-                    - scroll_pixel_position.y,
-            )
-        } else {
-            let cursor_row = newest_selection_head.map(|head| head.row());
-            let above_edit = edit_start
-                .row()
-                .0
-                .checked_sub(line_count as u32)
-                .map(DisplayRow);
-            let below_edit = Some(edit_end.row() + 1);
-            let above_cursor =
-                cursor_row.and_then(|row| row.0.checked_sub(line_count as u32).map(DisplayRow));
-            let below_cursor = cursor_row.map(|cursor_row| cursor_row + 1);
-
-            // Place the edit popover adjacent to the edit if there is a location
-            // available that is onscreen and does not obscure the cursor. Otherwise,
-            // place it adjacent to the cursor.
-            let row_target = [above_edit, below_edit, above_cursor, below_cursor]
-                .into_iter()
-                .flatten()
-                .find(|&start_row| {
-                    let end_row = start_row + line_count as u32;
-                    visible_row_range.contains(&start_row)
-                        && visible_row_range.contains(&end_row)
-                        && cursor_row.map_or(true, |cursor_row| {
-                            !((start_row..end_row).contains(&cursor_row))
-                        })
-                })?;
-
-            content_origin
-                + point(
-                    -scroll_pixel_position.x,
-                    row_target.as_f32() * line_height - scroll_pixel_position.y,
-                )
-        };
-
-        origin.x -= BORDER_WIDTH;
-
-        window.defer_draw(element, origin, 1);
-
-        // Do not return an element, since it will already be drawn due to defer_draw.
-        None
-    }
-
-    fn edit_prediction_cursor_popover_height(&self) -> Pixels {
-        px(30.)
-    }
-
-    fn current_user_player_color(&self, cx: &mut App) -> PlayerColor {
-        if self.read_only(cx) {
-            cx.theme().players().read_only()
-        } else {
-            self.style.as_ref().unwrap().local_player
-        }
-    }
-
-    fn render_edit_prediction_accept_keybind(
-        &self,
-        window: &mut Window,
-        cx: &App,
-    ) -> Option<AnyElement> {
-        let accept_binding = self.accept_edit_prediction_keybind(window, cx);
-        let accept_keystroke = accept_binding.keystroke()?;
-
-        let is_platform_style_mac = PlatformStyle::platform() == PlatformStyle::Mac;
-
-        let modifiers_color = if accept_keystroke.modifiers == window.modifiers() {
-            Color::Accent
-        } else {
-            Color::Muted
-        };
-
-        h_flex()
-            .px_0p5()
-            .when(is_platform_style_mac, |parent| parent.gap_0p5())
-            .font(theme::ThemeSettings::get_global(cx).buffer_font.clone())
-            .text_size(TextSize::XSmall.rems(cx))
-            .child(h_flex().children(ui::render_modifiers(
-                &accept_keystroke.modifiers,
-                PlatformStyle::platform(),
-                Some(modifiers_color),
-                Some(IconSize::XSmall.rems().into()),
-                true,
-            )))
-            .when(is_platform_style_mac, |parent| {
-                parent.child(accept_keystroke.key.clone())
-            })
-            .when(!is_platform_style_mac, |parent| {
-                parent.child(
-                    Key::new(
-                        util::capitalize(&accept_keystroke.key),
-                        Some(Color::Default),
-                    )
-                    .size(Some(IconSize::XSmall.rems().into())),
-                )
-            })
-            .into_any()
-            .into()
-    }
-
-    fn render_edit_prediction_line_popover(
-        &self,
-        label: impl Into<SharedString>,
-        icon: Option<IconName>,
-        window: &mut Window,
-        cx: &App,
-    ) -> Option<Stateful<Div>> {
-        let padding_right = if icon.is_some() { px(4.) } else { px(8.) };
-
-        let keybind = self.render_edit_prediction_accept_keybind(window, cx);
-        let has_keybind = keybind.is_some();
-
-        let result = h_flex()
-            .id("ep-line-popover")
-            .py_0p5()
-            .pl_1()
-            .pr(padding_right)
-            .gap_1()
-            .rounded_md()
-            .border_1()
-            .bg(Self::edit_prediction_line_popover_bg_color(cx))
-            .border_color(Self::edit_prediction_callout_popover_border_color(cx))
-            .shadow_sm()
-            .when(!has_keybind, |el| {
-                let status_colors = cx.theme().status();
-
-                el.bg(status_colors.error_background)
-                    .border_color(status_colors.error.opacity(0.6))
-                    .pl_2()
-                    .child(Icon::new(IconName::ZedPredictError).color(Color::Error))
-                    .cursor_default()
-                    .hoverable_tooltip(move |_window, cx| {
-                        cx.new(|_| MissingEditPredictionKeybindingTooltip).into()
-                    })
-            })
-            .children(keybind)
-            .child(
-                Label::new(label)
-                    .size(LabelSize::Small)
-                    .when(!has_keybind, |el| {
-                        el.color(cx.theme().status().error.into()).strikethrough()
-                    }),
-            )
-            .when(!has_keybind, |el| {
-                el.child(
-                    h_flex().ml_1().child(
-                        Icon::new(IconName::Info)
-                            .size(IconSize::Small)
-                            .color(cx.theme().status().error.into()),
-                    ),
-                )
-            })
-            .when_some(icon, |element, icon| {
-                element.child(
-                    div()
-                        .mt(px(1.5))
-                        .child(Icon::new(icon).size(IconSize::Small)),
-                )
-            });
-
-        Some(result)
-    }
-
-    fn edit_prediction_line_popover_bg_color(cx: &App) -> Hsla {
-        let accent_color = cx.theme().colors().text_accent;
-        let editor_bg_color = cx.theme().colors().editor_background;
-        editor_bg_color.blend(accent_color.opacity(0.1))
-    }
-
-    fn edit_prediction_callout_popover_border_color(cx: &App) -> Hsla {
-        let accent_color = cx.theme().colors().text_accent;
-        let editor_bg_color = cx.theme().colors().editor_background;
-        editor_bg_color.blend(accent_color.opacity(0.6))
-    }
-
-    fn render_edit_prediction_cursor_popover(
-        &self,
-        min_width: Pixels,
-        max_width: Pixels,
-        cursor_point: Point,
-        style: &EditorStyle,
-        accept_keystroke: Option<&gpui::Keystroke>,
-        _window: &Window,
-        cx: &mut Context<Editor>,
-    ) -> Option<AnyElement> {
-        let provider = self.edit_prediction_provider.as_ref()?;
-
-        if provider.provider.needs_terms_acceptance(cx) {
-            return Some(
-                h_flex()
-                    .min_w(min_width)
-                    .flex_1()
-                    .px_2()
-                    .py_1()
-                    .gap_3()
-                    .elevation_2(cx)
-                    .hover(|style| style.bg(cx.theme().colors().element_hover))
-                    .id("accept-terms")
-                    .cursor_pointer()
-                    .on_mouse_down(MouseButton::Left, |_, window, _| window.prevent_default())
-                    .on_click(cx.listener(|this, _event, window, cx| {
-                        cx.stop_propagation();
-                        this.report_editor_event("Edit Prediction Provider ToS Clicked", None, cx);
-                        window.dispatch_action(
-                            zed_actions::OpenZedPredictOnboarding.boxed_clone(),
-                            cx,
-                        );
-                    }))
-                    .child(
-                        h_flex()
-                            .flex_1()
-                            .gap_2()
-                            .child(Icon::new(IconName::ZedPredict))
-                            .child(Label::new("Accept Terms of Service"))
-                            .child(div().w_full())
-                            .child(
-                                Icon::new(IconName::ArrowUpRight)
-                                    .color(Color::Muted)
-                                    .size(IconSize::Small),
-                            )
-                            .into_any_element(),
-                    )
-                    .into_any(),
-            );
-        }
-
-        let is_refreshing = provider.provider.is_refreshing(cx);
-
-        fn pending_completion_container() -> Div {
-            h_flex()
-                .h_full()
-                .flex_1()
-                .gap_2()
-                .child(Icon::new(IconName::ZedPredict))
-        }
-
-        let completion = match &self.active_inline_completion {
-            Some(prediction) => {
-                if !self.has_visible_completions_menu() {
-                    const RADIUS: Pixels = px(6.);
-                    const BORDER_WIDTH: Pixels = px(1.);
-
-                    return Some(
-                        h_flex()
-                            .elevation_2(cx)
-                            .border(BORDER_WIDTH)
-                            .border_color(cx.theme().colors().border)
-                            .when(accept_keystroke.is_none(), |el| {
-                                el.border_color(cx.theme().status().error)
-                            })
-                            .rounded(RADIUS)
-                            .rounded_tl(px(0.))
-                            .overflow_hidden()
-                            .child(div().px_1p5().child(match &prediction.completion {
-                                InlineCompletion::Move { target, snapshot } => {
-                                    use text::ToPoint as _;
-                                    if target.text_anchor.to_point(&snapshot).row > cursor_point.row
-                                    {
-                                        Icon::new(IconName::ZedPredictDown)
-                                    } else {
-                                        Icon::new(IconName::ZedPredictUp)
-                                    }
-                                }
-                                InlineCompletion::Edit { .. } => Icon::new(IconName::ZedPredict),
-                            }))
-                            .child(
-                                h_flex()
-                                    .gap_1()
-                                    .py_1()
-                                    .px_2()
-                                    .rounded_r(RADIUS - BORDER_WIDTH)
-                                    .border_l_1()
-                                    .border_color(cx.theme().colors().border)
-                                    .bg(Self::edit_prediction_line_popover_bg_color(cx))
-                                    .when(self.edit_prediction_preview.released_too_fast(), |el| {
-                                        el.child(
-                                            Label::new("Hold")
-                                                .size(LabelSize::Small)
-                                                .when(accept_keystroke.is_none(), |el| {
-                                                    el.strikethrough()
-                                                })
-                                                .line_height_style(LineHeightStyle::UiLabel),
-                                        )
-                                    })
-                                    .id("edit_prediction_cursor_popover_keybind")
-                                    .when(accept_keystroke.is_none(), |el| {
-                                        let status_colors = cx.theme().status();
-
-                                        el.bg(status_colors.error_background)
-                                            .border_color(status_colors.error.opacity(0.6))
-                                            .child(Icon::new(IconName::Info).color(Color::Error))
-                                            .cursor_default()
-                                            .hoverable_tooltip(move |_window, cx| {
-                                                cx.new(|_| MissingEditPredictionKeybindingTooltip)
-                                                    .into()
-                                            })
-                                    })
-                                    .when_some(
-                                        accept_keystroke.as_ref(),
-                                        |el, accept_keystroke| {
-                                            el.child(h_flex().children(ui::render_modifiers(
-                                                &accept_keystroke.modifiers,
-                                                PlatformStyle::platform(),
-                                                Some(Color::Default),
-                                                Some(IconSize::XSmall.rems().into()),
-                                                false,
-                                            )))
-                                        },
-                                    ),
-                            )
-                            .into_any(),
-                    );
-                }
-
-                self.render_edit_prediction_cursor_popover_preview(
-                    prediction,
-                    cursor_point,
-                    style,
-                    cx,
-                )?
-            }
-
-            None if is_refreshing => match &self.stale_inline_completion_in_menu {
-                Some(stale_completion) => self.render_edit_prediction_cursor_popover_preview(
-                    stale_completion,
-                    cursor_point,
-                    style,
-                    cx,
-                )?,
-
-                None => {
-                    pending_completion_container().child(Label::new("...").size(LabelSize::Small))
-                }
-            },
-
-            None => pending_completion_container().child(Label::new("No Prediction")),
-        };
-
-        let completion = if is_refreshing {
-            completion
-                .with_animation(
-                    "loading-completion",
-                    Animation::new(Duration::from_secs(2))
-                        .repeat()
-                        .with_easing(pulsating_between(0.4, 0.8)),
-                    |label, delta| label.opacity(delta),
-                )
-                .into_any_element()
-        } else {
-            completion.into_any_element()
-        };
-
-        let has_completion = self.active_inline_completion.is_some();
-
-        let is_platform_style_mac = PlatformStyle::platform() == PlatformStyle::Mac;
-        Some(
-            h_flex()
-                .min_w(min_width)
-                .max_w(max_width)
-                .flex_1()
-                .elevation_2(cx)
-                .border_color(cx.theme().colors().border)
-                .child(
-                    div()
-                        .flex_1()
-                        .py_1()
-                        .px_2()
-                        .overflow_hidden()
-                        .child(completion),
-                )
-                .when_some(accept_keystroke, |el, accept_keystroke| {
-                    if !accept_keystroke.modifiers.modified() {
-                        return el;
-                    }
-
-                    el.child(
-                        h_flex()
-                            .h_full()
-                            .border_l_1()
-                            .rounded_r_lg()
-                            .border_color(cx.theme().colors().border)
-                            .bg(Self::edit_prediction_line_popover_bg_color(cx))
-                            .gap_1()
-                            .py_1()
-                            .px_2()
-                            .child(
-                                h_flex()
-                                    .font(theme::ThemeSettings::get_global(cx).buffer_font.clone())
-                                    .when(is_platform_style_mac, |parent| parent.gap_1())
-                                    .child(h_flex().children(ui::render_modifiers(
-                                        &accept_keystroke.modifiers,
-                                        PlatformStyle::platform(),
-                                        Some(if !has_completion {
-                                            Color::Muted
-                                        } else {
-                                            Color::Default
-                                        }),
-                                        None,
-                                        false,
-                                    ))),
-                            )
-                            .child(Label::new("Preview").into_any_element())
-                            .opacity(if has_completion { 1.0 } else { 0.4 }),
-                    )
-                })
-                .into_any(),
-        )
-    }
-
-    fn render_edit_prediction_cursor_popover_preview(
-        &self,
-        completion: &InlineCompletionState,
-        cursor_point: Point,
-        style: &EditorStyle,
-        cx: &mut Context<Editor>,
-    ) -> Option<Div> {
-        use text::ToPoint as _;
-
-        fn render_relative_row_jump(
-            prefix: impl Into<String>,
-            current_row: u32,
-            target_row: u32,
-        ) -> Div {
-            let (row_diff, arrow) = if target_row < current_row {
-                (current_row - target_row, IconName::ArrowUp)
-            } else {
-                (target_row - current_row, IconName::ArrowDown)
-            };
-
-            h_flex()
-                .child(
-                    Label::new(format!("{}{}", prefix.into(), row_diff))
-                        .color(Color::Muted)
-                        .size(LabelSize::Small),
-                )
-                .child(Icon::new(arrow).color(Color::Muted).size(IconSize::Small))
-        }
-
-        match &completion.completion {
-            InlineCompletion::Move {
-                target, snapshot, ..
-            } => Some(
-                h_flex()
-                    .px_2()
-                    .gap_2()
-                    .flex_1()
-                    .child(
-                        if target.text_anchor.to_point(&snapshot).row > cursor_point.row {
-                            Icon::new(IconName::ZedPredictDown)
-                        } else {
-                            Icon::new(IconName::ZedPredictUp)
-                        },
-                    )
-                    .child(Label::new("Jump to Edit")),
-            ),
-
-            InlineCompletion::Edit {
-                edits,
-                edit_preview,
-                snapshot,
-                display_mode: _,
-            } => {
-                let first_edit_row = edits.first()?.0.start.text_anchor.to_point(&snapshot).row;
-
-                let (highlighted_edits, has_more_lines) = crate::inline_completion_edit_text(
-                    &snapshot,
-                    &edits,
-                    edit_preview.as_ref()?,
-                    true,
-                    cx,
-                )
-                .first_line_preview();
-
-                let styled_text = gpui::StyledText::new(highlighted_edits.text)
-                    .with_default_highlights(&style.text, highlighted_edits.highlights);
-
-                let preview = h_flex()
-                    .gap_1()
-                    .min_w_16()
-                    .child(styled_text)
-                    .when(has_more_lines, |parent| parent.child("…"));
-
-                let left = if first_edit_row != cursor_point.row {
-                    render_relative_row_jump("", cursor_point.row, first_edit_row)
-                        .into_any_element()
-                } else {
-                    Icon::new(IconName::ZedPredict).into_any_element()
-                };
-
-                Some(
-                    h_flex()
-                        .h_full()
-                        .flex_1()
-                        .gap_2()
-                        .pr_1()
-                        .overflow_x_hidden()
-                        .font(theme::ThemeSettings::get_global(cx).buffer_font.clone())
-                        .child(left)
-                        .child(preview),
-                )
-            }
-        }
-    }
-
-    fn render_context_menu(
-        &self,
-        style: &EditorStyle,
-        max_height_in_lines: u32,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) -> Option<AnyElement> {
-        let menu = self.context_menu.borrow();
-        let menu = menu.as_ref()?;
-        if !menu.visible() {
-            return None;
-        };
-        Some(menu.render(style, max_height_in_lines, window, cx))
-    }
-
-    fn render_context_menu_aside(
-        &mut self,
-        max_size: Size<Pixels>,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) -> Option<AnyElement> {
-        self.context_menu.borrow_mut().as_mut().and_then(|menu| {
-            if menu.visible() {
-                menu.render_aside(self, max_size, window, cx)
-            } else {
-                None
-            }
-        })
-    }
-
-    fn hide_context_menu(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<CodeContextMenu> {
-        cx.notify();
-        self.completion_tasks.clear();
-        let context_menu = self.context_menu.borrow_mut().take();
-        self.stale_inline_completion_in_menu.take();
-        self.update_visible_inline_completion(window, cx);
-        context_menu
-    }
-
-    fn show_snippet_choices(
-        &mut self,
-        choices: &Vec<String>,
-        selection: Range<Anchor>,
-        cx: &mut Context<Self>,
-    ) {
-        if selection.start.buffer_id.is_none() {
-            return;
-        }
-        let buffer_id = selection.start.buffer_id.unwrap();
-        let buffer = self.buffer().read(cx).buffer(buffer_id);
-        let id = post_inc(&mut self.next_completion_id);
-        let snippet_sort_order = EditorSettings::get_global(cx).snippet_sort_order;
-
-        if let Some(buffer) = buffer {
-            *self.context_menu.borrow_mut() = Some(CodeContextMenu::Completions(
-                CompletionsMenu::new_snippet_choices(
-                    id,
-                    true,
-                    choices,
-                    selection,
-                    buffer,
-                    snippet_sort_order,
-                ),
-            ));
-        }
-    }
-
-    pub fn insert_snippet(
-        &mut self,
-        insertion_ranges: &[Range<usize>],
-        snippet: Snippet,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Result<()> {
-        struct Tabstop<T> {
-            is_end_tabstop: bool,
-            ranges: Vec<Range<T>>,
-            choices: Option<Vec<String>>,
-        }
-
-        let tabstops = self.buffer.update(cx, |buffer, cx| {
-            let snippet_text: Arc<str> = snippet.text.clone().into();
-            let edits = insertion_ranges
-                .iter()
-                .cloned()
-                .map(|range| (range, snippet_text.clone()));
-            buffer.edit(edits, Some(AutoindentMode::EachLine), cx);
-
-            let snapshot = &*buffer.read(cx);
-            let snippet = &snippet;
-            snippet
-                .tabstops
-                .iter()
-                .map(|tabstop| {
-                    let is_end_tabstop = tabstop.ranges.first().map_or(false, |tabstop| {
-                        tabstop.is_empty() && tabstop.start == snippet.text.len() as isize
-                    });
-                    let mut tabstop_ranges = tabstop
-                        .ranges
-                        .iter()
-                        .flat_map(|tabstop_range| {
-                            let mut delta = 0_isize;
-                            insertion_ranges.iter().map(move |insertion_range| {
-                                let insertion_start = insertion_range.start as isize + delta;
-                                delta +=
-                                    snippet.text.len() as isize - insertion_range.len() as isize;
-
-                                let start = ((insertion_start + tabstop_range.start) as usize)
-                                    .min(snapshot.len());
-                                let end = ((insertion_start + tabstop_range.end) as usize)
-                                    .min(snapshot.len());
-                                snapshot.anchor_before(start)..snapshot.anchor_after(end)
-                            })
-                        })
-                        .collect::<Vec<_>>();
-                    tabstop_ranges.sort_unstable_by(|a, b| a.start.cmp(&b.start, snapshot));
-
-                    Tabstop {
-                        is_end_tabstop,
-                        ranges: tabstop_ranges,
-                        choices: tabstop.choices.clone(),
-                    }
-                })
-                .collect::<Vec<_>>()
-        });
-        if let Some(tabstop) = tabstops.first() {
-            self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-                s.select_ranges(tabstop.ranges.iter().cloned());
-            });
-
-            if let Some(choices) = &tabstop.choices {
-                if let Some(selection) = tabstop.ranges.first() {
-                    self.show_snippet_choices(choices, selection.clone(), cx)
-                }
-            }
-
-            // If we're already at the last tabstop and it's at the end of the snippet,
-            // we're done, we don't need to keep the state around.
-            if !tabstop.is_end_tabstop {
-                let choices = tabstops
-                    .iter()
-                    .map(|tabstop| tabstop.choices.clone())
-                    .collect();
-
-                let ranges = tabstops
-                    .into_iter()
-                    .map(|tabstop| tabstop.ranges)
-                    .collect::<Vec<_>>();
-
-                self.snippet_stack.push(SnippetState {
-                    active_index: 0,
-                    ranges,
-                    choices,
-                });
-            }
-
-            // Check whether the just-entered snippet ends with an auto-closable bracket.
-            if self.autoclose_regions.is_empty() {
-                let snapshot = self.buffer.read(cx).snapshot(cx);
-                for selection in &mut self.selections.all::<Point>(cx) {
-                    let selection_head = selection.head();
-                    let Some(scope) = snapshot.language_scope_at(selection_head) else {
-                        continue;
-                    };
-
-                    let mut bracket_pair = None;
-                    let next_chars = snapshot.chars_at(selection_head).collect::<String>();
-                    let prev_chars = snapshot
-                        .reversed_chars_at(selection_head)
-                        .collect::<String>();
-                    for (pair, enabled) in scope.brackets() {
-                        if enabled
-                            && pair.close
-                            && prev_chars.starts_with(pair.start.as_str())
-                            && next_chars.starts_with(pair.end.as_str())
-                        {
-                            bracket_pair = Some(pair.clone());
-                            break;
-                        }
-                    }
-                    if let Some(pair) = bracket_pair {
-                        let snapshot_settings = snapshot.language_settings_at(selection_head, cx);
-                        let autoclose_enabled =
-                            self.use_autoclose && snapshot_settings.use_autoclose;
-                        if autoclose_enabled {
-                            let start = snapshot.anchor_after(selection_head);
-                            let end = snapshot.anchor_after(selection_head);
-                            self.autoclose_regions.push(AutocloseRegion {
-                                selection_id: selection.id,
-                                range: start..end,
-                                pair,
-                            });
-                        }
-                    }
-                }
-            }
-        }
-        Ok(())
-    }
-
-    pub fn move_to_next_snippet_tabstop(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> bool {
-        self.move_to_snippet_tabstop(Bias::Right, window, cx)
-    }
-
-    pub fn move_to_prev_snippet_tabstop(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> bool {
-        self.move_to_snippet_tabstop(Bias::Left, window, cx)
-    }
-
-    pub fn move_to_snippet_tabstop(
-        &mut self,
-        bias: Bias,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> bool {
-        if let Some(mut snippet) = self.snippet_stack.pop() {
-            match bias {
-                Bias::Left => {
-                    if snippet.active_index > 0 {
-                        snippet.active_index -= 1;
-                    } else {
-                        self.snippet_stack.push(snippet);
-                        return false;
-                    }
-                }
-                Bias::Right => {
-                    if snippet.active_index + 1 < snippet.ranges.len() {
-                        snippet.active_index += 1;
-                    } else {
-                        self.snippet_stack.push(snippet);
-                        return false;
-                    }
-                }
-            }
-            if let Some(current_ranges) = snippet.ranges.get(snippet.active_index) {
-                self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-                    s.select_anchor_ranges(current_ranges.iter().cloned())
-                });
-
-                if let Some(choices) = &snippet.choices[snippet.active_index] {
-                    if let Some(selection) = current_ranges.first() {
-                        self.show_snippet_choices(&choices, selection.clone(), cx);
-                    }
-                }
-
-                // If snippet state is not at the last tabstop, push it back on the stack
-                if snippet.active_index + 1 < snippet.ranges.len() {
-                    self.snippet_stack.push(snippet);
-                }
-                return true;
-            }
-        }
-
-        false
-    }
-
-    pub fn clear(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.transact(window, cx, |this, window, cx| {
-            this.select_all(&SelectAll, window, cx);
-            this.insert("", window, cx);
-        });
-    }
-
-    pub fn backspace(&mut self, _: &Backspace, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-        self.transact(window, cx, |this, window, cx| {
-            this.select_autoclose_pair(window, cx);
-            let mut linked_ranges = HashMap::<_, Vec<_>>::default();
-            if !this.linked_edit_ranges.is_empty() {
-                let selections = this.selections.all::<MultiBufferPoint>(cx);
-                let snapshot = this.buffer.read(cx).snapshot(cx);
-
-                for selection in selections.iter() {
-                    let selection_start = snapshot.anchor_before(selection.start).text_anchor;
-                    let selection_end = snapshot.anchor_after(selection.end).text_anchor;
-                    if selection_start.buffer_id != selection_end.buffer_id {
-                        continue;
-                    }
-                    if let Some(ranges) =
-                        this.linked_editing_ranges_for(selection_start..selection_end, cx)
-                    {
-                        for (buffer, entries) in ranges {
-                            linked_ranges.entry(buffer).or_default().extend(entries);
-                        }
-                    }
-                }
-            }
-
-            let mut selections = this.selections.all::<MultiBufferPoint>(cx);
-            let display_map = this.display_map.update(cx, |map, cx| map.snapshot(cx));
-            for selection in &mut selections {
-                if selection.is_empty() {
-                    let old_head = selection.head();
-                    let mut new_head =
-                        movement::left(&display_map, old_head.to_display_point(&display_map))
-                            .to_point(&display_map);
-                    if let Some((buffer, line_buffer_range)) = display_map
-                        .buffer_snapshot
-                        .buffer_line_for_row(MultiBufferRow(old_head.row))
-                    {
-                        let indent_size = buffer.indent_size_for_line(line_buffer_range.start.row);
-                        let indent_len = match indent_size.kind {
-                            IndentKind::Space => {
-                                buffer.settings_at(line_buffer_range.start, cx).tab_size
-                            }
-                            IndentKind::Tab => NonZeroU32::new(1).unwrap(),
-                        };
-                        if old_head.column <= indent_size.len && old_head.column > 0 {
-                            let indent_len = indent_len.get();
-                            new_head = cmp::min(
-                                new_head,
-                                MultiBufferPoint::new(
-                                    old_head.row,
-                                    ((old_head.column - 1) / indent_len) * indent_len,
-                                ),
-                            );
-                        }
-                    }
-
-                    selection.set_head(new_head, SelectionGoal::None);
-                }
-            }
-
-            this.signature_help_state.set_backspace_pressed(true);
-            this.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-                s.select(selections)
-            });
-            this.insert("", window, cx);
-            let empty_str: Arc<str> = Arc::from("");
-            for (buffer, edits) in linked_ranges {
-                let snapshot = buffer.read(cx).snapshot();
-                use text::ToPoint as TP;
-
-                let edits = edits
-                    .into_iter()
-                    .map(|range| {
-                        let end_point = TP::to_point(&range.end, &snapshot);
-                        let mut start_point = TP::to_point(&range.start, &snapshot);
-
-                        if end_point == start_point {
-                            let offset = text::ToOffset::to_offset(&range.start, &snapshot)
-                                .saturating_sub(1);
-                            start_point =
-                                snapshot.clip_point(TP::to_point(&offset, &snapshot), Bias::Left);
-                        };
-
-                        (start_point..end_point, empty_str.clone())
-                    })
-                    .sorted_by_key(|(range, _)| range.start)
-                    .collect::<Vec<_>>();
-                buffer.update(cx, |this, cx| {
-                    this.edit(edits, None, cx);
-                })
-            }
-            this.refresh_inline_completion(true, false, window, cx);
-            linked_editing_ranges::refresh_linked_ranges(this, window, cx);
-        });
-    }
-
-    pub fn delete(&mut self, _: &Delete, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-        self.transact(window, cx, |this, window, cx| {
-            this.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-                s.move_with(|map, selection| {
-                    if selection.is_empty() {
-                        let cursor = movement::right(map, selection.head());
-                        selection.end = cursor;
-                        selection.reversed = true;
-                        selection.goal = SelectionGoal::None;
-                    }
-                })
-            });
-            this.insert("", window, cx);
-            this.refresh_inline_completion(true, false, window, cx);
-        });
-    }
-
-    pub fn backtab(&mut self, _: &Backtab, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-        if self.move_to_prev_snippet_tabstop(window, cx) {
-            return;
-        }
-        self.outdent(&Outdent, window, cx);
-    }
-
-    pub fn tab(&mut self, _: &Tab, window: &mut Window, cx: &mut Context<Self>) {
-        if self.move_to_next_snippet_tabstop(window, cx) {
-            self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-            return;
-        }
-        if self.read_only(cx) {
-            return;
-        }
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-        let mut selections = self.selections.all_adjusted(cx);
-        let buffer = self.buffer.read(cx);
-        let snapshot = buffer.snapshot(cx);
-        let rows_iter = selections.iter().map(|s| s.head().row);
-        let suggested_indents = snapshot.suggested_indents(rows_iter, cx);
-
-        let has_some_cursor_in_whitespace = selections
-            .iter()
-            .filter(|selection| selection.is_empty())
-            .any(|selection| {
-                let cursor = selection.head();
-                let current_indent = snapshot.indent_size_for_line(MultiBufferRow(cursor.row));
-                cursor.column < current_indent.len
-            });
-
-        let mut edits = Vec::new();
-        let mut prev_edited_row = 0;
-        let mut row_delta = 0;
-        for selection in &mut selections {
-            if selection.start.row != prev_edited_row {
-                row_delta = 0;
-            }
-            prev_edited_row = selection.end.row;
-
-            // If the selection is non-empty, then increase the indentation of the selected lines.
-            if !selection.is_empty() {
-                row_delta =
-                    Self::indent_selection(buffer, &snapshot, selection, &mut edits, row_delta, cx);
-                continue;
-            }
-
-            // If the selection is empty and the cursor is in the leading whitespace before the
-            // suggested indentation, then auto-indent the line.
-            let cursor = selection.head();
-            let current_indent = snapshot.indent_size_for_line(MultiBufferRow(cursor.row));
-            if let Some(suggested_indent) =
-                suggested_indents.get(&MultiBufferRow(cursor.row)).copied()
-            {
-                // If there exist any empty selection in the leading whitespace, then skip
-                // indent for selections at the boundary.
-                if has_some_cursor_in_whitespace
-                    && cursor.column == current_indent.len
-                    && current_indent.len == suggested_indent.len
-                {
-                    continue;
-                }
-
-                if cursor.column < suggested_indent.len
-                    && cursor.column <= current_indent.len
-                    && current_indent.len <= suggested_indent.len
-                {
-                    selection.start = Point::new(cursor.row, suggested_indent.len);
-                    selection.end = selection.start;
-                    if row_delta == 0 {
-                        edits.extend(Buffer::edit_for_indent_size_adjustment(
-                            cursor.row,
-                            current_indent,
-                            suggested_indent,
-                        ));
-                        row_delta = suggested_indent.len - current_indent.len;
-                    }
-                    continue;
-                }
-            }
-
-            // Otherwise, insert a hard or soft tab.
-            let settings = buffer.language_settings_at(cursor, cx);
-            let tab_size = if settings.hard_tabs {
-                IndentSize::tab()
-            } else {
-                let tab_size = settings.tab_size.get();
-                let indent_remainder = snapshot
-                    .text_for_range(Point::new(cursor.row, 0)..cursor)
-                    .flat_map(str::chars)
-                    .fold(row_delta % tab_size, |counter: u32, c| {
-                        if c == '\t' {
-                            0
-                        } else {
-                            (counter + 1) % tab_size
-                        }
-                    });
-
-                let chars_to_next_tab_stop = tab_size - indent_remainder;
-                IndentSize::spaces(chars_to_next_tab_stop)
-            };
-            selection.start = Point::new(cursor.row, cursor.column + row_delta + tab_size.len);
-            selection.end = selection.start;
-            edits.push((cursor..cursor, tab_size.chars().collect::<String>()));
-            row_delta += tab_size.len;
-        }
-
-        self.transact(window, cx, |this, window, cx| {
-            this.buffer.update(cx, |b, cx| b.edit(edits, None, cx));
-            this.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-                s.select(selections)
-            });
-            this.refresh_inline_completion(true, false, window, cx);
-        });
-    }
-
-    pub fn indent(&mut self, _: &Indent, window: &mut Window, cx: &mut Context<Self>) {
-        if self.read_only(cx) {
-            return;
-        }
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-        let mut selections = self.selections.all::<Point>(cx);
-        let mut prev_edited_row = 0;
-        let mut row_delta = 0;
-        let mut edits = Vec::new();
-        let buffer = self.buffer.read(cx);
-        let snapshot = buffer.snapshot(cx);
-        for selection in &mut selections {
-            if selection.start.row != prev_edited_row {
-                row_delta = 0;
-            }
-            prev_edited_row = selection.end.row;
-
-            row_delta =
-                Self::indent_selection(buffer, &snapshot, selection, &mut edits, row_delta, cx);
-        }
-
-        self.transact(window, cx, |this, window, cx| {
-            this.buffer.update(cx, |b, cx| b.edit(edits, None, cx));
-            this.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-                s.select(selections)
-            });
-        });
-    }
-
-    fn indent_selection(
-        buffer: &MultiBuffer,
-        snapshot: &MultiBufferSnapshot,
-        selection: &mut Selection<Point>,
-        edits: &mut Vec<(Range<Point>, String)>,
-        delta_for_start_row: u32,
-        cx: &App,
-    ) -> u32 {
-        let settings = buffer.language_settings_at(selection.start, cx);
-        let tab_size = settings.tab_size.get();
-        let indent_kind = if settings.hard_tabs {
-            IndentKind::Tab
-        } else {
-            IndentKind::Space
-        };
-        let mut start_row = selection.start.row;
-        let mut end_row = selection.end.row + 1;
-
-        // If a selection ends at the beginning of a line, don't indent
-        // that last line.
-        if selection.end.column == 0 && selection.end.row > selection.start.row {
-            end_row -= 1;
-        }
-
-        // Avoid re-indenting a row that has already been indented by a
-        // previous selection, but still update this selection's column
-        // to reflect that indentation.
-        if delta_for_start_row > 0 {
-            start_row += 1;
-            selection.start.column += delta_for_start_row;
-            if selection.end.row == selection.start.row {
-                selection.end.column += delta_for_start_row;
-            }
-        }
-
-        let mut delta_for_end_row = 0;
-        let has_multiple_rows = start_row + 1 != end_row;
-        for row in start_row..end_row {
-            let current_indent = snapshot.indent_size_for_line(MultiBufferRow(row));
-            let indent_delta = match (current_indent.kind, indent_kind) {
-                (IndentKind::Space, IndentKind::Space) => {
-                    let columns_to_next_tab_stop = tab_size - (current_indent.len % tab_size);
-                    IndentSize::spaces(columns_to_next_tab_stop)
-                }
-                (IndentKind::Tab, IndentKind::Space) => IndentSize::spaces(tab_size),
-                (_, IndentKind::Tab) => IndentSize::tab(),
-            };
-
-            let start = if has_multiple_rows || current_indent.len < selection.start.column {
-                0
-            } else {
-                selection.start.column
-            };
-            let row_start = Point::new(row, start);
-            edits.push((
-                row_start..row_start,
-                indent_delta.chars().collect::<String>(),
-            ));
-
-            // Update this selection's endpoints to reflect the indentation.
-            if row == selection.start.row {
-                selection.start.column += indent_delta.len;
-            }
-            if row == selection.end.row {
-                selection.end.column += indent_delta.len;
-                delta_for_end_row = indent_delta.len;
-            }
-        }
-
-        if selection.start.row == selection.end.row {
-            delta_for_start_row + delta_for_end_row
-        } else {
-            delta_for_end_row
-        }
-    }
-
-    pub fn outdent(&mut self, _: &Outdent, window: &mut Window, cx: &mut Context<Self>) {
-        if self.read_only(cx) {
-            return;
-        }
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-        let selections = self.selections.all::<Point>(cx);
-        let mut deletion_ranges = Vec::new();
-        let mut last_outdent = None;
-        {
-            let buffer = self.buffer.read(cx);
-            let snapshot = buffer.snapshot(cx);
-            for selection in &selections {
-                let settings = buffer.language_settings_at(selection.start, cx);
-                let tab_size = settings.tab_size.get();
-                let mut rows = selection.spanned_rows(false, &display_map);
-
-                // Avoid re-outdenting a row that has already been outdented by a
-                // previous selection.
-                if let Some(last_row) = last_outdent {
-                    if last_row == rows.start {
-                        rows.start = rows.start.next_row();
-                    }
-                }
-                let has_multiple_rows = rows.len() > 1;
-                for row in rows.iter_rows() {
-                    let indent_size = snapshot.indent_size_for_line(row);
-                    if indent_size.len > 0 {
-                        let deletion_len = match indent_size.kind {
-                            IndentKind::Space => {
-                                let columns_to_prev_tab_stop = indent_size.len % tab_size;
-                                if columns_to_prev_tab_stop == 0 {
-                                    tab_size
-                                } else {
-                                    columns_to_prev_tab_stop
-                                }
-                            }
-                            IndentKind::Tab => 1,
-                        };
-                        let start = if has_multiple_rows
-                            || deletion_len > selection.start.column
-                            || indent_size.len < selection.start.column
-                        {
-                            0
-                        } else {
-                            selection.start.column - deletion_len
-                        };
-                        deletion_ranges.push(
-                            Point::new(row.0, start)..Point::new(row.0, start + deletion_len),
-                        );
-                        last_outdent = Some(row);
-                    }
-                }
-            }
-        }
-
-        self.transact(window, cx, |this, window, cx| {
-            this.buffer.update(cx, |buffer, cx| {
-                let empty_str: Arc<str> = Arc::default();
-                buffer.edit(
-                    deletion_ranges
-                        .into_iter()
-                        .map(|range| (range, empty_str.clone())),
-                    None,
-                    cx,
-                );
-            });
-            let selections = this.selections.all::<usize>(cx);
-            this.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-                s.select(selections)
-            });
-        });
-    }
-
-    pub fn autoindent(&mut self, _: &AutoIndent, window: &mut Window, cx: &mut Context<Self>) {
-        if self.read_only(cx) {
-            return;
-        }
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-        let selections = self
-            .selections
-            .all::<usize>(cx)
-            .into_iter()
-            .map(|s| s.range());
-
-        self.transact(window, cx, |this, window, cx| {
-            this.buffer.update(cx, |buffer, cx| {
-                buffer.autoindent_ranges(selections, cx);
-            });
-            let selections = this.selections.all::<usize>(cx);
-            this.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-                s.select(selections)
-            });
-        });
-    }
-
-    pub fn delete_line(&mut self, _: &DeleteLine, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-        let selections = self.selections.all::<Point>(cx);
-
-        let mut new_cursors = Vec::new();
-        let mut edit_ranges = Vec::new();
-        let mut selections = selections.iter().peekable();
-        while let Some(selection) = selections.next() {
-            let mut rows = selection.spanned_rows(false, &display_map);
-            let goal_display_column = selection.head().to_display_point(&display_map).column();
-
-            // Accumulate contiguous regions of rows that we want to delete.
-            while let Some(next_selection) = selections.peek() {
-                let next_rows = next_selection.spanned_rows(false, &display_map);
-                if next_rows.start <= rows.end {
-                    rows.end = next_rows.end;
-                    selections.next().unwrap();
-                } else {
-                    break;
-                }
-            }
-
-            let buffer = &display_map.buffer_snapshot;
-            let mut edit_start = Point::new(rows.start.0, 0).to_offset(buffer);
-            let edit_end;
-            let cursor_buffer_row;
-            if buffer.max_point().row >= rows.end.0 {
-                // If there's a line after the range, delete the \n from the end of the row range
-                // and position the cursor on the next line.
-                edit_end = Point::new(rows.end.0, 0).to_offset(buffer);
-                cursor_buffer_row = rows.end;
-            } else {
-                // If there isn't a line after the range, delete the \n from the line before the
-                // start of the row range and position the cursor there.
-                edit_start = edit_start.saturating_sub(1);
-                edit_end = buffer.len();
-                cursor_buffer_row = rows.start.previous_row();
-            }
-
-            let mut cursor = Point::new(cursor_buffer_row.0, 0).to_display_point(&display_map);
-            *cursor.column_mut() =
-                cmp::min(goal_display_column, display_map.line_len(cursor.row()));
-
-            new_cursors.push((
-                selection.id,
-                buffer.anchor_after(cursor.to_point(&display_map)),
-            ));
-            edit_ranges.push(edit_start..edit_end);
-        }
-
-        self.transact(window, cx, |this, window, cx| {
-            let buffer = this.buffer.update(cx, |buffer, cx| {
-                let empty_str: Arc<str> = Arc::default();
-                buffer.edit(
-                    edit_ranges
-                        .into_iter()
-                        .map(|range| (range, empty_str.clone())),
-                    None,
-                    cx,
-                );
-                buffer.snapshot(cx)
-            });
-            let new_selections = new_cursors
-                .into_iter()
-                .map(|(id, cursor)| {
-                    let cursor = cursor.to_point(&buffer);
-                    Selection {
-                        id,
-                        start: cursor,
-                        end: cursor,
-                        reversed: false,
-                        goal: SelectionGoal::None,
-                    }
-                })
-                .collect();
-
-            this.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-                s.select(new_selections);
-            });
-        });
-    }
-
-    pub fn join_lines_impl(
-        &mut self,
-        insert_whitespace: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.read_only(cx) {
-            return;
-        }
-        let mut row_ranges = Vec::<Range<MultiBufferRow>>::new();
-        for selection in self.selections.all::<Point>(cx) {
-            let start = MultiBufferRow(selection.start.row);
-            // Treat single line selections as if they include the next line. Otherwise this action
-            // would do nothing for single line selections individual cursors.
-            let end = if selection.start.row == selection.end.row {
-                MultiBufferRow(selection.start.row + 1)
-            } else {
-                MultiBufferRow(selection.end.row)
-            };
-
-            if let Some(last_row_range) = row_ranges.last_mut() {
-                if start <= last_row_range.end {
-                    last_row_range.end = end;
-                    continue;
-                }
-            }
-            row_ranges.push(start..end);
-        }
-
-        let snapshot = self.buffer.read(cx).snapshot(cx);
-        let mut cursor_positions = Vec::new();
-        for row_range in &row_ranges {
-            let anchor = snapshot.anchor_before(Point::new(
-                row_range.end.previous_row().0,
-                snapshot.line_len(row_range.end.previous_row()),
-            ));
-            cursor_positions.push(anchor..anchor);
-        }
-
-        self.transact(window, cx, |this, window, cx| {
-            for row_range in row_ranges.into_iter().rev() {
-                for row in row_range.iter_rows().rev() {
-                    let end_of_line = Point::new(row.0, snapshot.line_len(row));
-                    let next_line_row = row.next_row();
-                    let indent = snapshot.indent_size_for_line(next_line_row);
-                    let start_of_next_line = Point::new(next_line_row.0, indent.len);
-
-                    let replace =
-                        if snapshot.line_len(next_line_row) > indent.len && insert_whitespace {
-                            " "
-                        } else {
-                            ""
-                        };
-
-                    this.buffer.update(cx, |buffer, cx| {
-                        buffer.edit([(end_of_line..start_of_next_line, replace)], None, cx)
-                    });
-                }
-            }
-
-            this.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-                s.select_anchor_ranges(cursor_positions)
-            });
-        });
-    }
-
-    pub fn join_lines(&mut self, _: &JoinLines, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-        self.join_lines_impl(true, window, cx);
-    }
-
-    pub fn sort_lines_case_sensitive(
-        &mut self,
-        _: &SortLinesCaseSensitive,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.manipulate_lines(window, cx, |lines| lines.sort())
-    }
-
-    pub fn sort_lines_case_insensitive(
-        &mut self,
-        _: &SortLinesCaseInsensitive,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.manipulate_lines(window, cx, |lines| {
-            lines.sort_by_key(|line| line.to_lowercase())
-        })
-    }
-
-    pub fn unique_lines_case_insensitive(
-        &mut self,
-        _: &UniqueLinesCaseInsensitive,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.manipulate_lines(window, cx, |lines| {
-            let mut seen = HashSet::default();
-            lines.retain(|line| seen.insert(line.to_lowercase()));
-        })
-    }
-
-    pub fn unique_lines_case_sensitive(
-        &mut self,
-        _: &UniqueLinesCaseSensitive,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.manipulate_lines(window, cx, |lines| {
-            let mut seen = HashSet::default();
-            lines.retain(|line| seen.insert(*line));
-        })
-    }
-
-    pub fn reload_file(&mut self, _: &ReloadFile, window: &mut Window, cx: &mut Context<Self>) {
-        let Some(project) = self.project.clone() else {
-            return;
-        };
-        self.reload(project, window, cx)
-            .detach_and_notify_err(window, cx);
-    }
-
-    pub fn restore_file(
-        &mut self,
-        _: &::git::RestoreFile,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-        let mut buffer_ids = HashSet::default();
-        let snapshot = self.buffer().read(cx).snapshot(cx);
-        for selection in self.selections.all::<usize>(cx) {
-            buffer_ids.extend(snapshot.buffer_ids_for_range(selection.range()))
-        }
-
-        let buffer = self.buffer().read(cx);
-        let ranges = buffer_ids
-            .into_iter()
-            .flat_map(|buffer_id| buffer.excerpt_ranges_for_buffer(buffer_id, cx))
-            .collect::<Vec<_>>();
-
-        self.restore_hunks_in_ranges(ranges, window, cx);
-    }
-
-    pub fn git_restore(&mut self, _: &Restore, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-        let selections = self
-            .selections
-            .all(cx)
-            .into_iter()
-            .map(|s| s.range())
-            .collect();
-        self.restore_hunks_in_ranges(selections, window, cx);
-    }
-
-    pub fn restore_hunks_in_ranges(
-        &mut self,
-        ranges: Vec<Range<Point>>,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) {
-        let mut revert_changes = HashMap::default();
-        let chunk_by = self
-            .snapshot(window, cx)
-            .hunks_for_ranges(ranges)
-            .into_iter()
-            .chunk_by(|hunk| hunk.buffer_id);
-        for (buffer_id, hunks) in &chunk_by {
-            let hunks = hunks.collect::<Vec<_>>();
-            for hunk in &hunks {
-                self.prepare_restore_change(&mut revert_changes, hunk, cx);
-            }
-            self.do_stage_or_unstage(false, buffer_id, hunks.into_iter(), cx);
-        }
-        drop(chunk_by);
-        if !revert_changes.is_empty() {
-            self.transact(window, cx, |editor, window, cx| {
-                editor.restore(revert_changes, window, cx);
-            });
-        }
-    }
-
-    pub fn open_active_item_in_terminal(
-        &mut self,
-        _: &OpenInTerminal,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(working_directory) = self.active_excerpt(cx).and_then(|(_, buffer, _)| {
-            let project_path = buffer.read(cx).project_path(cx)?;
-            let project = self.project.as_ref()?.read(cx);
-            let entry = project.entry_for_path(&project_path, cx)?;
-            let parent = match &entry.canonical_path {
-                Some(canonical_path) => canonical_path.to_path_buf(),
-                None => project.absolute_path(&project_path, cx)?,
-            }
-            .parent()?
-            .to_path_buf();
-            Some(parent)
-        }) {
-            window.dispatch_action(OpenTerminal { working_directory }.boxed_clone(), cx);
-        }
-    }
-
-    fn set_breakpoint_context_menu(
-        &mut self,
-        display_row: DisplayRow,
-        position: Option<Anchor>,
-        clicked_point: gpui::Point<Pixels>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if !cx.has_flag::<DebuggerFeatureFlag>() {
-            return;
-        }
-        let source = self
-            .buffer
-            .read(cx)
-            .snapshot(cx)
-            .anchor_before(Point::new(display_row.0, 0u32));
-
-        let context_menu = self.breakpoint_context_menu(position.unwrap_or(source), window, cx);
-
-        self.mouse_context_menu = MouseContextMenu::pinned_to_editor(
-            self,
-            source,
-            clicked_point,
-            context_menu,
-            window,
-            cx,
-        );
-    }
-
-    fn add_edit_breakpoint_block(
-        &mut self,
-        anchor: Anchor,
-        breakpoint: &Breakpoint,
-        edit_action: BreakpointPromptEditAction,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let weak_editor = cx.weak_entity();
-        let bp_prompt = cx.new(|cx| {
-            BreakpointPromptEditor::new(
-                weak_editor,
-                anchor,
-                breakpoint.clone(),
-                edit_action,
-                window,
-                cx,
-            )
-        });
-
-        let height = bp_prompt.update(cx, |this, cx| {
-            this.prompt
-                .update(cx, |prompt, cx| prompt.max_point(cx).row().0 + 1 + 2)
-        });
-        let cloned_prompt = bp_prompt.clone();
-        let blocks = vec![BlockProperties {
-            style: BlockStyle::Sticky,
-            placement: BlockPlacement::Above(anchor),
-            height: Some(height),
-            render: Arc::new(move |cx| {
-                *cloned_prompt.read(cx).gutter_dimensions.lock() = *cx.gutter_dimensions;
-                cloned_prompt.clone().into_any_element()
-            }),
-            priority: 0,
-        }];
-
-        let focus_handle = bp_prompt.focus_handle(cx);
-        window.focus(&focus_handle);
-
-        let block_ids = self.insert_blocks(blocks, None, cx);
-        bp_prompt.update(cx, |prompt, _| {
-            prompt.add_block_ids(block_ids);
-        });
-    }
-
-    pub(crate) fn breakpoint_at_row(
-        &self,
-        row: u32,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<(Anchor, Breakpoint)> {
-        let snapshot = self.snapshot(window, cx);
-        let breakpoint_position = snapshot.buffer_snapshot.anchor_before(Point::new(row, 0));
-
-        self.breakpoint_at_anchor(breakpoint_position, &snapshot, cx)
-    }
-
-    pub(crate) fn breakpoint_at_anchor(
-        &self,
-        breakpoint_position: Anchor,
-        snapshot: &EditorSnapshot,
-        cx: &mut Context<Self>,
-    ) -> Option<(Anchor, Breakpoint)> {
-        let project = self.project.clone()?;
-
-        let buffer_id = breakpoint_position.buffer_id.or_else(|| {
-            snapshot
-                .buffer_snapshot
-                .buffer_id_for_excerpt(breakpoint_position.excerpt_id)
-        })?;
-
-        let enclosing_excerpt = breakpoint_position.excerpt_id;
-        let buffer = project.read_with(cx, |project, cx| project.buffer_for_id(buffer_id, cx))?;
-        let buffer_snapshot = buffer.read(cx).snapshot();
-
-        let row = buffer_snapshot
-            .summary_for_anchor::<text::PointUtf16>(&breakpoint_position.text_anchor)
-            .row;
-
-        let line_len = snapshot.buffer_snapshot.line_len(MultiBufferRow(row));
-        let anchor_end = snapshot
-            .buffer_snapshot
-            .anchor_after(Point::new(row, line_len));
-
-        let bp = self
-            .breakpoint_store
-            .as_ref()?
-            .read_with(cx, |breakpoint_store, cx| {
-                breakpoint_store
-                    .breakpoints(
-                        &buffer,
-                        Some(breakpoint_position.text_anchor..anchor_end.text_anchor),
-                        &buffer_snapshot,
-                        cx,
-                    )
-                    .next()
-                    .and_then(|(anchor, bp)| {
-                        let breakpoint_row = buffer_snapshot
-                            .summary_for_anchor::<text::PointUtf16>(anchor)
-                            .row;
-
-                        if breakpoint_row == row {
-                            snapshot
-                                .buffer_snapshot
-                                .anchor_in_excerpt(enclosing_excerpt, *anchor)
-                                .map(|anchor| (anchor, bp.clone()))
-                        } else {
-                            None
-                        }
-                    })
-            });
-        bp
-    }
-
-    pub fn edit_log_breakpoint(
-        &mut self,
-        _: &EditLogBreakpoint,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        for (anchor, breakpoint) in self.breakpoints_at_cursors(window, cx) {
-            let breakpoint = breakpoint.unwrap_or_else(|| Breakpoint {
-                message: None,
-                state: BreakpointState::Enabled,
-                condition: None,
-                hit_condition: None,
-            });
-
-            self.add_edit_breakpoint_block(
-                anchor,
-                &breakpoint,
-                BreakpointPromptEditAction::Log,
-                window,
-                cx,
-            );
-        }
-    }
-
-    fn breakpoints_at_cursors(
-        &self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Vec<(Anchor, Option<Breakpoint>)> {
-        let snapshot = self.snapshot(window, cx);
-        let cursors = self
-            .selections
-            .disjoint_anchors()
-            .into_iter()
-            .map(|selection| {
-                let cursor_position: Point = selection.head().to_point(&snapshot.buffer_snapshot);
-
-                let breakpoint_position = self
-                    .breakpoint_at_row(cursor_position.row, window, cx)
-                    .map(|bp| bp.0)
-                    .unwrap_or_else(|| {
-                        snapshot
-                            .display_snapshot
-                            .buffer_snapshot
-                            .anchor_after(Point::new(cursor_position.row, 0))
-                    });
-
-                let breakpoint = self
-                    .breakpoint_at_anchor(breakpoint_position, &snapshot, cx)
-                    .map(|(anchor, breakpoint)| (anchor, Some(breakpoint)));
-
-                breakpoint.unwrap_or_else(|| (breakpoint_position, None))
-            })
-            // There might be multiple cursors on the same line; all of them should have the same anchors though as their breakpoints positions, which makes it possible to sort and dedup the list.
-            .collect::<HashMap<Anchor, _>>();
-
-        cursors.into_iter().collect()
-    }
-
-    pub fn enable_breakpoint(
-        &mut self,
-        _: &crate::actions::EnableBreakpoint,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        for (anchor, breakpoint) in self.breakpoints_at_cursors(window, cx) {
-            let Some(breakpoint) = breakpoint.filter(|breakpoint| breakpoint.is_disabled()) else {
-                continue;
-            };
-            self.edit_breakpoint_at_anchor(
-                anchor,
-                breakpoint,
-                BreakpointEditAction::InvertState,
-                cx,
-            );
-        }
-    }
-
-    pub fn disable_breakpoint(
-        &mut self,
-        _: &crate::actions::DisableBreakpoint,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        for (anchor, breakpoint) in self.breakpoints_at_cursors(window, cx) {
-            let Some(breakpoint) = breakpoint.filter(|breakpoint| breakpoint.is_enabled()) else {
-                continue;
-            };
-            self.edit_breakpoint_at_anchor(
-                anchor,
-                breakpoint,
-                BreakpointEditAction::InvertState,
-                cx,
-            );
-        }
-    }
-
-    pub fn toggle_breakpoint(
-        &mut self,
-        _: &crate::actions::ToggleBreakpoint,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        for (anchor, breakpoint) in self.breakpoints_at_cursors(window, cx) {
-            if let Some(breakpoint) = breakpoint {
-                self.edit_breakpoint_at_anchor(
-                    anchor,
-                    breakpoint,
-                    BreakpointEditAction::Toggle,
-                    cx,
-                );
-            } else {
-                self.edit_breakpoint_at_anchor(
-                    anchor,
-                    Breakpoint::new_standard(),
-                    BreakpointEditAction::Toggle,
-                    cx,
-                );
-            }
-        }
-    }
-
-    pub fn edit_breakpoint_at_anchor(
-        &mut self,
-        breakpoint_position: Anchor,
-        breakpoint: Breakpoint,
-        edit_action: BreakpointEditAction,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(breakpoint_store) = &self.breakpoint_store else {
-            return;
-        };
-
-        let Some(buffer_id) = breakpoint_position.buffer_id.or_else(|| {
-            if breakpoint_position == Anchor::min() {
-                self.buffer()
-                    .read(cx)
-                    .excerpt_buffer_ids()
-                    .into_iter()
-                    .next()
-            } else {
-                None
-            }
-        }) else {
-            return;
-        };
-
-        let Some(buffer) = self.buffer().read(cx).buffer(buffer_id) else {
-            return;
-        };
-
-        breakpoint_store.update(cx, |breakpoint_store, cx| {
-            breakpoint_store.toggle_breakpoint(
-                buffer,
-                (breakpoint_position.text_anchor, breakpoint),
-                edit_action,
-                cx,
-            );
-        });
-
-        cx.notify();
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn breakpoint_store(&self) -> Option<Entity<BreakpointStore>> {
-        self.breakpoint_store.clone()
-    }
-
-    pub fn prepare_restore_change(
-        &self,
-        revert_changes: &mut HashMap<BufferId, Vec<(Range<text::Anchor>, Rope)>>,
-        hunk: &MultiBufferDiffHunk,
-        cx: &mut App,
-    ) -> Option<()> {
-        if hunk.is_created_file() {
-            return None;
-        }
-        let buffer = self.buffer.read(cx);
-        let diff = buffer.diff_for(hunk.buffer_id)?;
-        let buffer = buffer.buffer(hunk.buffer_id)?;
-        let buffer = buffer.read(cx);
-        let original_text = diff
-            .read(cx)
-            .base_text()
-            .as_rope()
-            .slice(hunk.diff_base_byte_range.clone());
-        let buffer_snapshot = buffer.snapshot();
-        let buffer_revert_changes = revert_changes.entry(buffer.remote_id()).or_default();
-        if let Err(i) = buffer_revert_changes.binary_search_by(|probe| {
-            probe
-                .0
-                .start
-                .cmp(&hunk.buffer_range.start, &buffer_snapshot)
-                .then(probe.0.end.cmp(&hunk.buffer_range.end, &buffer_snapshot))
-        }) {
-            buffer_revert_changes.insert(i, (hunk.buffer_range.clone(), original_text));
-            Some(())
-        } else {
-            None
-        }
-    }
-
-    pub fn reverse_lines(&mut self, _: &ReverseLines, window: &mut Window, cx: &mut Context<Self>) {
-        self.manipulate_lines(window, cx, |lines| lines.reverse())
-    }
-
-    pub fn shuffle_lines(&mut self, _: &ShuffleLines, window: &mut Window, cx: &mut Context<Self>) {
-        self.manipulate_lines(window, cx, |lines| lines.shuffle(&mut thread_rng()))
-    }
-
-    fn manipulate_lines<Fn>(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-        mut callback: Fn,
-    ) where
-        Fn: FnMut(&mut Vec<&str>),
-    {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-        let buffer = self.buffer.read(cx).snapshot(cx);
-
-        let mut edits = Vec::new();
-
-        let selections = self.selections.all::<Point>(cx);
-        let mut selections = selections.iter().peekable();
-        let mut contiguous_row_selections = Vec::new();
-        let mut new_selections = Vec::new();
-        let mut added_lines = 0;
-        let mut removed_lines = 0;
-
-        while let Some(selection) = selections.next() {
-            let (start_row, end_row) = consume_contiguous_rows(
-                &mut contiguous_row_selections,
-                selection,
-                &display_map,
-                &mut selections,
-            );
-
-            let start_point = Point::new(start_row.0, 0);
-            let end_point = Point::new(
-                end_row.previous_row().0,
-                buffer.line_len(end_row.previous_row()),
-            );
-            let text = buffer
-                .text_for_range(start_point..end_point)
-                .collect::<String>();
-
-            let mut lines = text.split('\n').collect_vec();
-
-            let lines_before = lines.len();
-            callback(&mut lines);
-            let lines_after = lines.len();
-
-            edits.push((start_point..end_point, lines.join("\n")));
-
-            // Selections must change based on added and removed line count
-            let start_row =
-                MultiBufferRow(start_point.row + added_lines as u32 - removed_lines as u32);
-            let end_row = MultiBufferRow(start_row.0 + lines_after.saturating_sub(1) as u32);
-            new_selections.push(Selection {
-                id: selection.id,
-                start: start_row,
-                end: end_row,
-                goal: SelectionGoal::None,
-                reversed: selection.reversed,
-            });
-
-            if lines_after > lines_before {
-                added_lines += lines_after - lines_before;
-            } else if lines_before > lines_after {
-                removed_lines += lines_before - lines_after;
-            }
-        }
-
-        self.transact(window, cx, |this, window, cx| {
-            let buffer = this.buffer.update(cx, |buffer, cx| {
-                buffer.edit(edits, None, cx);
-                buffer.snapshot(cx)
-            });
-
-            // Recalculate offsets on newly edited buffer
-            let new_selections = new_selections
-                .iter()
-                .map(|s| {
-                    let start_point = Point::new(s.start.0, 0);
-                    let end_point = Point::new(s.end.0, buffer.line_len(s.end));
-                    Selection {
-                        id: s.id,
-                        start: buffer.point_to_offset(start_point),
-                        end: buffer.point_to_offset(end_point),
-                        goal: s.goal,
-                        reversed: s.reversed,
-                    }
-                })
-                .collect();
-
-            this.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-                s.select(new_selections);
-            });
-
-            this.request_autoscroll(Autoscroll::fit(), cx);
-        });
-    }
-
-    pub fn toggle_case(&mut self, _: &ToggleCase, window: &mut Window, cx: &mut Context<Self>) {
-        self.manipulate_text(window, cx, |text| {
-            let has_upper_case_characters = text.chars().any(|c| c.is_uppercase());
-            if has_upper_case_characters {
-                text.to_lowercase()
-            } else {
-                text.to_uppercase()
-            }
-        })
-    }
-
-    pub fn convert_to_upper_case(
-        &mut self,
-        _: &ConvertToUpperCase,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.manipulate_text(window, cx, |text| text.to_uppercase())
-    }
-
-    pub fn convert_to_lower_case(
-        &mut self,
-        _: &ConvertToLowerCase,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.manipulate_text(window, cx, |text| text.to_lowercase())
-    }
-
-    pub fn convert_to_title_case(
-        &mut self,
-        _: &ConvertToTitleCase,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.manipulate_text(window, cx, |text| {
-            text.split('\n')
-                .map(|line| line.to_case(Case::Title))
-                .join("\n")
-        })
-    }
-
-    pub fn convert_to_snake_case(
-        &mut self,
-        _: &ConvertToSnakeCase,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.manipulate_text(window, cx, |text| text.to_case(Case::Snake))
-    }
-
-    pub fn convert_to_kebab_case(
-        &mut self,
-        _: &ConvertToKebabCase,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.manipulate_text(window, cx, |text| text.to_case(Case::Kebab))
-    }
-
-    pub fn convert_to_upper_camel_case(
-        &mut self,
-        _: &ConvertToUpperCamelCase,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.manipulate_text(window, cx, |text| {
-            text.split('\n')
-                .map(|line| line.to_case(Case::UpperCamel))
-                .join("\n")
-        })
-    }
-
-    pub fn convert_to_lower_camel_case(
-        &mut self,
-        _: &ConvertToLowerCamelCase,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.manipulate_text(window, cx, |text| text.to_case(Case::Camel))
-    }
-
-    pub fn convert_to_opposite_case(
-        &mut self,
-        _: &ConvertToOppositeCase,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.manipulate_text(window, cx, |text| {
-            text.chars()
-                .fold(String::with_capacity(text.len()), |mut t, c| {
-                    if c.is_uppercase() {
-                        t.extend(c.to_lowercase());
-                    } else {
-                        t.extend(c.to_uppercase());
-                    }
-                    t
-                })
-        })
-    }
-
-    pub fn convert_to_rot13(
-        &mut self,
-        _: &ConvertToRot13,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.manipulate_text(window, cx, |text| {
-            text.chars()
-                .map(|c| match c {
-                    'A'..='M' | 'a'..='m' => ((c as u8) + 13) as char,
-                    'N'..='Z' | 'n'..='z' => ((c as u8) - 13) as char,
-                    _ => c,
-                })
-                .collect()
-        })
-    }
-
-    pub fn convert_to_rot47(
-        &mut self,
-        _: &ConvertToRot47,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.manipulate_text(window, cx, |text| {
-            text.chars()
-                .map(|c| {
-                    let code_point = c as u32;
-                    if code_point >= 33 && code_point <= 126 {
-                        return char::from_u32(33 + ((code_point + 14) % 94)).unwrap();
-                    }
-                    c
-                })
-                .collect()
-        })
-    }
-
-    fn manipulate_text<Fn>(&mut self, window: &mut Window, cx: &mut Context<Self>, mut callback: Fn)
-    where
-        Fn: FnMut(&str) -> String,
-    {
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-        let buffer = self.buffer.read(cx).snapshot(cx);
-
-        let mut new_selections = Vec::new();
-        let mut edits = Vec::new();
-        let mut selection_adjustment = 0i32;
-
-        for selection in self.selections.all::<usize>(cx) {
-            let selection_is_empty = selection.is_empty();
-
-            let (start, end) = if selection_is_empty {
-                let word_range = movement::surrounding_word(
-                    &display_map,
-                    selection.start.to_display_point(&display_map),
-                );
-                let start = word_range.start.to_offset(&display_map, Bias::Left);
-                let end = word_range.end.to_offset(&display_map, Bias::Left);
-                (start, end)
-            } else {
-                (selection.start, selection.end)
-            };
-
-            let text = buffer.text_for_range(start..end).collect::<String>();
-            let old_length = text.len() as i32;
-            let text = callback(&text);
-
-            new_selections.push(Selection {
-                start: (start as i32 - selection_adjustment) as usize,
-                end: ((start + text.len()) as i32 - selection_adjustment) as usize,
-                goal: SelectionGoal::None,
-                ..selection
-            });
-
-            selection_adjustment += old_length - text.len() as i32;
-
-            edits.push((start..end, text));
-        }
-
-        self.transact(window, cx, |this, window, cx| {
-            this.buffer.update(cx, |buffer, cx| {
-                buffer.edit(edits, None, cx);
-            });
-
-            this.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-                s.select(new_selections);
-            });
-
-            this.request_autoscroll(Autoscroll::fit(), cx);
-        });
-    }
-
-    pub fn duplicate(
-        &mut self,
-        upwards: bool,
-        whole_lines: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-        let buffer = &display_map.buffer_snapshot;
-        let selections = self.selections.all::<Point>(cx);
-
-        let mut edits = Vec::new();
-        let mut selections_iter = selections.iter().peekable();
-        while let Some(selection) = selections_iter.next() {
-            let mut rows = selection.spanned_rows(false, &display_map);
-            // duplicate line-wise
-            if whole_lines || selection.start == selection.end {
-                // Avoid duplicating the same lines twice.
-                while let Some(next_selection) = selections_iter.peek() {
-                    let next_rows = next_selection.spanned_rows(false, &display_map);
-                    if next_rows.start < rows.end {
-                        rows.end = next_rows.end;
-                        selections_iter.next().unwrap();
-                    } else {
-                        break;
-                    }
-                }
-
-                // Copy the text from the selected row region and splice it either at the start
-                // or end of the region.
-                let start = Point::new(rows.start.0, 0);
-                let end = Point::new(
-                    rows.end.previous_row().0,
-                    buffer.line_len(rows.end.previous_row()),
-                );
-                let text = buffer
-                    .text_for_range(start..end)
-                    .chain(Some("\n"))
-                    .collect::<String>();
-                let insert_location = if upwards {
-                    Point::new(rows.end.0, 0)
-                } else {
-                    start
-                };
-                edits.push((insert_location..insert_location, text));
-            } else {
-                // duplicate character-wise
-                let start = selection.start;
-                let end = selection.end;
-                let text = buffer.text_for_range(start..end).collect::<String>();
-                edits.push((selection.end..selection.end, text));
-            }
-        }
-
-        self.transact(window, cx, |this, _, cx| {
-            this.buffer.update(cx, |buffer, cx| {
-                buffer.edit(edits, None, cx);
-            });
-
-            this.request_autoscroll(Autoscroll::fit(), cx);
-        });
-    }
-
-    pub fn duplicate_line_up(
-        &mut self,
-        _: &DuplicateLineUp,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.duplicate(true, true, window, cx);
-    }
-
-    pub fn duplicate_line_down(
-        &mut self,
-        _: &DuplicateLineDown,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.duplicate(false, true, window, cx);
-    }
-
-    pub fn duplicate_selection(
-        &mut self,
-        _: &DuplicateSelection,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.duplicate(false, false, window, cx);
-    }
-
-    pub fn move_line_up(&mut self, _: &MoveLineUp, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-        let buffer = self.buffer.read(cx).snapshot(cx);
-
-        let mut edits = Vec::new();
-        let mut unfold_ranges = Vec::new();
-        let mut refold_creases = Vec::new();
-
-        let selections = self.selections.all::<Point>(cx);
-        let mut selections = selections.iter().peekable();
-        let mut contiguous_row_selections = Vec::new();
-        let mut new_selections = Vec::new();
-
-        while let Some(selection) = selections.next() {
-            // Find all the selections that span a contiguous row range
-            let (start_row, end_row) = consume_contiguous_rows(
-                &mut contiguous_row_selections,
-                selection,
-                &display_map,
-                &mut selections,
-            );
-
-            // Move the text spanned by the row range to be before the line preceding the row range
-            if start_row.0 > 0 {
-                let range_to_move = Point::new(
-                    start_row.previous_row().0,
-                    buffer.line_len(start_row.previous_row()),
-                )
-                    ..Point::new(
-                        end_row.previous_row().0,
-                        buffer.line_len(end_row.previous_row()),
-                    );
-                let insertion_point = display_map
-                    .prev_line_boundary(Point::new(start_row.previous_row().0, 0))
-                    .0;
-
-                // Don't move lines across excerpts
-                if buffer
-                    .excerpt_containing(insertion_point..range_to_move.end)
-                    .is_some()
-                {
-                    let text = buffer
-                        .text_for_range(range_to_move.clone())
-                        .flat_map(|s| s.chars())
-                        .skip(1)
-                        .chain(['\n'])
-                        .collect::<String>();
-
-                    edits.push((
-                        buffer.anchor_after(range_to_move.start)
-                            ..buffer.anchor_before(range_to_move.end),
-                        String::new(),
-                    ));
-                    let insertion_anchor = buffer.anchor_after(insertion_point);
-                    edits.push((insertion_anchor..insertion_anchor, text));
-
-                    let row_delta = range_to_move.start.row - insertion_point.row + 1;
-
-                    // Move selections up
-                    new_selections.extend(contiguous_row_selections.drain(..).map(
-                        |mut selection| {
-                            selection.start.row -= row_delta;
-                            selection.end.row -= row_delta;
-                            selection
-                        },
-                    ));
-
-                    // Move folds up
-                    unfold_ranges.push(range_to_move.clone());
-                    for fold in display_map.folds_in_range(
-                        buffer.anchor_before(range_to_move.start)
-                            ..buffer.anchor_after(range_to_move.end),
-                    ) {
-                        let mut start = fold.range.start.to_point(&buffer);
-                        let mut end = fold.range.end.to_point(&buffer);
-                        start.row -= row_delta;
-                        end.row -= row_delta;
-                        refold_creases.push(Crease::simple(start..end, fold.placeholder.clone()));
-                    }
-                }
-            }
-
-            // If we didn't move line(s), preserve the existing selections
-            new_selections.append(&mut contiguous_row_selections);
-        }
-
-        self.transact(window, cx, |this, window, cx| {
-            this.unfold_ranges(&unfold_ranges, true, true, cx);
-            this.buffer.update(cx, |buffer, cx| {
-                for (range, text) in edits {
-                    buffer.edit([(range, text)], None, cx);
-                }
-            });
-            this.fold_creases(refold_creases, true, window, cx);
-            this.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-                s.select(new_selections);
-            })
-        });
-    }
-
-    pub fn move_line_down(
-        &mut self,
-        _: &MoveLineDown,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-        let buffer = self.buffer.read(cx).snapshot(cx);
-
-        let mut edits = Vec::new();
-        let mut unfold_ranges = Vec::new();
-        let mut refold_creases = Vec::new();
-
-        let selections = self.selections.all::<Point>(cx);
-        let mut selections = selections.iter().peekable();
-        let mut contiguous_row_selections = Vec::new();
-        let mut new_selections = Vec::new();
-
-        while let Some(selection) = selections.next() {
-            // Find all the selections that span a contiguous row range
-            let (start_row, end_row) = consume_contiguous_rows(
-                &mut contiguous_row_selections,
-                selection,
-                &display_map,
-                &mut selections,
-            );
-
-            // Move the text spanned by the row range to be after the last line of the row range
-            if end_row.0 <= buffer.max_point().row {
-                let range_to_move =
-                    MultiBufferPoint::new(start_row.0, 0)..MultiBufferPoint::new(end_row.0, 0);
-                let insertion_point = display_map
-                    .next_line_boundary(MultiBufferPoint::new(end_row.0, 0))
-                    .0;
-
-                // Don't move lines across excerpt boundaries
-                if buffer
-                    .excerpt_containing(range_to_move.start..insertion_point)
-                    .is_some()
-                {
-                    let mut text = String::from("\n");
-                    text.extend(buffer.text_for_range(range_to_move.clone()));
-                    text.pop(); // Drop trailing newline
-                    edits.push((
-                        buffer.anchor_after(range_to_move.start)
-                            ..buffer.anchor_before(range_to_move.end),
-                        String::new(),
-                    ));
-                    let insertion_anchor = buffer.anchor_after(insertion_point);
-                    edits.push((insertion_anchor..insertion_anchor, text));
-
-                    let row_delta = insertion_point.row - range_to_move.end.row + 1;
-
-                    // Move selections down
-                    new_selections.extend(contiguous_row_selections.drain(..).map(
-                        |mut selection| {
-                            selection.start.row += row_delta;
-                            selection.end.row += row_delta;
-                            selection
-                        },
-                    ));
-
-                    // Move folds down
-                    unfold_ranges.push(range_to_move.clone());
-                    for fold in display_map.folds_in_range(
-                        buffer.anchor_before(range_to_move.start)
-                            ..buffer.anchor_after(range_to_move.end),
-                    ) {
-                        let mut start = fold.range.start.to_point(&buffer);
-                        let mut end = fold.range.end.to_point(&buffer);
-                        start.row += row_delta;
-                        end.row += row_delta;
-                        refold_creases.push(Crease::simple(start..end, fold.placeholder.clone()));
-                    }
-                }
-            }
-
-            // If we didn't move line(s), preserve the existing selections
-            new_selections.append(&mut contiguous_row_selections);
-        }
-
-        self.transact(window, cx, |this, window, cx| {
-            this.unfold_ranges(&unfold_ranges, true, true, cx);
-            this.buffer.update(cx, |buffer, cx| {
-                for (range, text) in edits {
-                    buffer.edit([(range, text)], None, cx);
-                }
-            });
-            this.fold_creases(refold_creases, true, window, cx);
-            this.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-                s.select(new_selections)
-            });
-        });
-    }
-
-    pub fn transpose(&mut self, _: &Transpose, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-        let text_layout_details = &self.text_layout_details(window);
-        self.transact(window, cx, |this, window, cx| {
-            let edits = this.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-                let mut edits: Vec<(Range<usize>, String)> = Default::default();
-                s.move_with(|display_map, selection| {
-                    if !selection.is_empty() {
-                        return;
-                    }
-
-                    let mut head = selection.head();
-                    let mut transpose_offset = head.to_offset(display_map, Bias::Right);
-                    if head.column() == display_map.line_len(head.row()) {
-                        transpose_offset = display_map
-                            .buffer_snapshot
-                            .clip_offset(transpose_offset.saturating_sub(1), Bias::Left);
-                    }
-
-                    if transpose_offset == 0 {
-                        return;
-                    }
-
-                    *head.column_mut() += 1;
-                    head = display_map.clip_point(head, Bias::Right);
-                    let goal = SelectionGoal::HorizontalPosition(
-                        display_map
-                            .x_for_display_point(head, text_layout_details)
-                            .into(),
-                    );
-                    selection.collapse_to(head, goal);
-
-                    let transpose_start = display_map
-                        .buffer_snapshot
-                        .clip_offset(transpose_offset.saturating_sub(1), Bias::Left);
-                    if edits.last().map_or(true, |e| e.0.end <= transpose_start) {
-                        let transpose_end = display_map
-                            .buffer_snapshot
-                            .clip_offset(transpose_offset + 1, Bias::Right);
-                        if let Some(ch) =
-                            display_map.buffer_snapshot.chars_at(transpose_start).next()
-                        {
-                            edits.push((transpose_start..transpose_offset, String::new()));
-                            edits.push((transpose_end..transpose_end, ch.to_string()));
-                        }
-                    }
-                });
-                edits
-            });
-            this.buffer
-                .update(cx, |buffer, cx| buffer.edit(edits, None, cx));
-            let selections = this.selections.all::<usize>(cx);
-            this.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-                s.select(selections);
-            });
-        });
-    }
-
-    pub fn rewrap(&mut self, _: &Rewrap, _: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-        self.rewrap_impl(RewrapOptions::default(), cx)
-    }
-
-    pub fn rewrap_impl(&mut self, options: RewrapOptions, cx: &mut Context<Self>) {
-        let buffer = self.buffer.read(cx).snapshot(cx);
-        let selections = self.selections.all::<Point>(cx);
-        let mut selections = selections.iter().peekable();
-
-        let mut edits = Vec::new();
-        let mut rewrapped_row_ranges = Vec::<RangeInclusive<u32>>::new();
-
-        while let Some(selection) = selections.next() {
-            let mut start_row = selection.start.row;
-            let mut end_row = selection.end.row;
-
-            // Skip selections that overlap with a range that has already been rewrapped.
-            let selection_range = start_row..end_row;
-            if rewrapped_row_ranges
-                .iter()
-                .any(|range| range.overlaps(&selection_range))
-            {
-                continue;
-            }
-
-            let tab_size = buffer.language_settings_at(selection.head(), cx).tab_size;
-
-            // Since not all lines in the selection may be at the same indent
-            // level, choose the indent size that is the most common between all
-            // of the lines.
-            //
-            // If there is a tie, we use the deepest indent.
-            let (indent_size, indent_end) = {
-                let mut indent_size_occurrences = HashMap::default();
-                let mut rows_by_indent_size = HashMap::<IndentSize, Vec<u32>>::default();
-
-                for row in start_row..=end_row {
-                    let indent = buffer.indent_size_for_line(MultiBufferRow(row));
-                    rows_by_indent_size.entry(indent).or_default().push(row);
-                    *indent_size_occurrences.entry(indent).or_insert(0) += 1;
-                }
-
-                let indent_size = indent_size_occurrences
-                    .into_iter()
-                    .max_by_key(|(indent, count)| (*count, indent.len_with_expanded_tabs(tab_size)))
-                    .map(|(indent, _)| indent)
-                    .unwrap_or_default();
-                let row = rows_by_indent_size[&indent_size][0];
-                let indent_end = Point::new(row, indent_size.len);
-
-                (indent_size, indent_end)
-            };
-
-            let mut line_prefix = indent_size.chars().collect::<String>();
-
-            let mut inside_comment = false;
-            if let Some(comment_prefix) =
-                buffer
-                    .language_scope_at(selection.head())
-                    .and_then(|language| {
-                        language
-                            .line_comment_prefixes()
-                            .iter()
-                            .find(|prefix| buffer.contains_str_at(indent_end, prefix))
-                            .cloned()
-                    })
-            {
-                line_prefix.push_str(&comment_prefix);
-                inside_comment = true;
-            }
-
-            let language_settings = buffer.language_settings_at(selection.head(), cx);
-            let allow_rewrap_based_on_language = match language_settings.allow_rewrap {
-                RewrapBehavior::InComments => inside_comment,
-                RewrapBehavior::InSelections => !selection.is_empty(),
-                RewrapBehavior::Anywhere => true,
-            };
-
-            let should_rewrap = options.override_language_settings
-                || allow_rewrap_based_on_language
-                || self.hard_wrap.is_some();
-            if !should_rewrap {
-                continue;
-            }
-
-            if selection.is_empty() {
-                'expand_upwards: while start_row > 0 {
-                    let prev_row = start_row - 1;
-                    if buffer.contains_str_at(Point::new(prev_row, 0), &line_prefix)
-                        && buffer.line_len(MultiBufferRow(prev_row)) as usize > line_prefix.len()
-                    {
-                        start_row = prev_row;
-                    } else {
-                        break 'expand_upwards;
-                    }
-                }
-
-                'expand_downwards: while end_row < buffer.max_point().row {
-                    let next_row = end_row + 1;
-                    if buffer.contains_str_at(Point::new(next_row, 0), &line_prefix)
-                        && buffer.line_len(MultiBufferRow(next_row)) as usize > line_prefix.len()
-                    {
-                        end_row = next_row;
-                    } else {
-                        break 'expand_downwards;
-                    }
-                }
-            }
-
-            let start = Point::new(start_row, 0);
-            let start_offset = start.to_offset(&buffer);
-            let end = Point::new(end_row, buffer.line_len(MultiBufferRow(end_row)));
-            let selection_text = buffer.text_for_range(start..end).collect::<String>();
-            let Some(lines_without_prefixes) = selection_text
-                .lines()
-                .map(|line| {
-                    line.strip_prefix(&line_prefix)
-                        .or_else(|| line.trim_start().strip_prefix(&line_prefix.trim_start()))
-                        .with_context(|| {
-                            format!("line did not start with prefix {line_prefix:?}: {line:?}")
-                        })
-                })
-                .collect::<Result<Vec<_>, _>>()
-                .log_err()
-            else {
-                continue;
-            };
-
-            let wrap_column = self.hard_wrap.unwrap_or_else(|| {
-                buffer
-                    .language_settings_at(Point::new(start_row, 0), cx)
-                    .preferred_line_length as usize
-            });
-            let wrapped_text = wrap_with_prefix(
-                line_prefix,
-                lines_without_prefixes.join("\n"),
-                wrap_column,
-                tab_size,
-                options.preserve_existing_whitespace,
-            );
-
-            // TODO: should always use char-based diff while still supporting cursor behavior that
-            // matches vim.
-            let mut diff_options = DiffOptions::default();
-            if options.override_language_settings {
-                diff_options.max_word_diff_len = 0;
-                diff_options.max_word_diff_line_count = 0;
-            } else {
-                diff_options.max_word_diff_len = usize::MAX;
-                diff_options.max_word_diff_line_count = usize::MAX;
-            }
-
-            for (old_range, new_text) in
-                text_diff_with_options(&selection_text, &wrapped_text, diff_options)
-            {
-                let edit_start = buffer.anchor_after(start_offset + old_range.start);
-                let edit_end = buffer.anchor_after(start_offset + old_range.end);
-                edits.push((edit_start..edit_end, new_text));
-            }
-
-            rewrapped_row_ranges.push(start_row..=end_row);
-        }
-
-        self.buffer
-            .update(cx, |buffer, cx| buffer.edit(edits, None, cx));
-    }
-
-    pub fn cut_common(&mut self, window: &mut Window, cx: &mut Context<Self>) -> ClipboardItem {
-        let mut text = String::new();
-        let buffer = self.buffer.read(cx).snapshot(cx);
-        let mut selections = self.selections.all::<Point>(cx);
-        let mut clipboard_selections = Vec::with_capacity(selections.len());
-        {
-            let max_point = buffer.max_point();
-            let mut is_first = true;
-            for selection in &mut selections {
-                let is_entire_line = selection.is_empty() || self.selections.line_mode;
-                if is_entire_line {
-                    selection.start = Point::new(selection.start.row, 0);
-                    if !selection.is_empty() && selection.end.column == 0 {
-                        selection.end = cmp::min(max_point, selection.end);
-                    } else {
-                        selection.end = cmp::min(max_point, Point::new(selection.end.row + 1, 0));
-                    }
-                    selection.goal = SelectionGoal::None;
-                }
-                if is_first {
-                    is_first = false;
-                } else {
-                    text += "\n";
-                }
-                let mut len = 0;
-                for chunk in buffer.text_for_range(selection.start..selection.end) {
-                    text.push_str(chunk);
-                    len += chunk.len();
-                }
-                clipboard_selections.push(ClipboardSelection {
-                    len,
-                    is_entire_line,
-                    first_line_indent: buffer
-                        .indent_size_for_line(MultiBufferRow(selection.start.row))
-                        .len,
-                });
-            }
-        }
-
-        self.transact(window, cx, |this, window, cx| {
-            this.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-                s.select(selections);
-            });
-            this.insert("", window, cx);
-        });
-        ClipboardItem::new_string_with_json_metadata(text, clipboard_selections)
-    }
-
-    pub fn cut(&mut self, _: &Cut, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-        let item = self.cut_common(window, cx);
-        cx.write_to_clipboard(item);
-    }
-
-    pub fn kill_ring_cut(&mut self, _: &KillRingCut, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-        self.change_selections(None, window, cx, |s| {
-            s.move_with(|snapshot, sel| {
-                if sel.is_empty() {
-                    sel.end = DisplayPoint::new(sel.end.row(), snapshot.line_len(sel.end.row()))
-                }
-            });
-        });
-        let item = self.cut_common(window, cx);
-        cx.set_global(KillRing(item))
-    }
-
-    pub fn kill_ring_yank(
-        &mut self,
-        _: &KillRingYank,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-        let (text, metadata) = if let Some(KillRing(item)) = cx.try_global() {
-            if let Some(ClipboardEntry::String(kill_ring)) = item.entries().first() {
-                (kill_ring.text().to_string(), kill_ring.metadata_json())
-            } else {
-                return;
-            }
-        } else {
-            return;
-        };
-        self.do_paste(&text, metadata, false, window, cx);
-    }
-
-    pub fn copy_and_trim(&mut self, _: &CopyAndTrim, _: &mut Window, cx: &mut Context<Self>) {
-        self.do_copy(true, cx);
-    }
-
-    pub fn copy(&mut self, _: &Copy, _: &mut Window, cx: &mut Context<Self>) {
-        self.do_copy(false, cx);
-    }
-
-    fn do_copy(&self, strip_leading_indents: bool, cx: &mut Context<Self>) {
-        let selections = self.selections.all::<Point>(cx);
-        let buffer = self.buffer.read(cx).read(cx);
-        let mut text = String::new();
-
-        let mut clipboard_selections = Vec::with_capacity(selections.len());
-        {
-            let max_point = buffer.max_point();
-            let mut is_first = true;
-            for selection in &selections {
-                let mut start = selection.start;
-                let mut end = selection.end;
-                let is_entire_line = selection.is_empty() || self.selections.line_mode;
-                if is_entire_line {
-                    start = Point::new(start.row, 0);
-                    end = cmp::min(max_point, Point::new(end.row + 1, 0));
-                }
-
-                let mut trimmed_selections = Vec::new();
-                if strip_leading_indents && end.row.saturating_sub(start.row) > 0 {
-                    let row = MultiBufferRow(start.row);
-                    let first_indent = buffer.indent_size_for_line(row);
-                    if first_indent.len == 0 || start.column > first_indent.len {
-                        trimmed_selections.push(start..end);
-                    } else {
-                        trimmed_selections.push(
-                            Point::new(row.0, first_indent.len)
-                                ..Point::new(row.0, buffer.line_len(row)),
-                        );
-                        for row in start.row + 1..=end.row {
-                            let mut line_len = buffer.line_len(MultiBufferRow(row));
-                            if row == end.row {
-                                line_len = end.column;
-                            }
-                            if line_len == 0 {
-                                trimmed_selections
-                                    .push(Point::new(row, 0)..Point::new(row, line_len));
-                                continue;
-                            }
-                            let row_indent_size = buffer.indent_size_for_line(MultiBufferRow(row));
-                            if row_indent_size.len >= first_indent.len {
-                                trimmed_selections.push(
-                                    Point::new(row, first_indent.len)..Point::new(row, line_len),
-                                );
-                            } else {
-                                trimmed_selections.clear();
-                                trimmed_selections.push(start..end);
-                                break;
-                            }
-                        }
-                    }
-                } else {
-                    trimmed_selections.push(start..end);
-                }
-
-                for trimmed_range in trimmed_selections {
-                    if is_first {
-                        is_first = false;
-                    } else {
-                        text += "\n";
-                    }
-                    let mut len = 0;
-                    for chunk in buffer.text_for_range(trimmed_range.start..trimmed_range.end) {
-                        text.push_str(chunk);
-                        len += chunk.len();
-                    }
-                    clipboard_selections.push(ClipboardSelection {
-                        len,
-                        is_entire_line,
-                        first_line_indent: buffer
-                            .indent_size_for_line(MultiBufferRow(trimmed_range.start.row))
-                            .len,
-                    });
-                }
-            }
-        }
-
-        cx.write_to_clipboard(ClipboardItem::new_string_with_json_metadata(
-            text,
-            clipboard_selections,
-        ));
-    }
-
-    pub fn do_paste(
-        &mut self,
-        text: &String,
-        clipboard_selections: Option<Vec<ClipboardSelection>>,
-        handle_entire_lines: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.read_only(cx) {
-            return;
-        }
-
-        let clipboard_text = Cow::Borrowed(text);
-
-        self.transact(window, cx, |this, window, cx| {
-            if let Some(mut clipboard_selections) = clipboard_selections {
-                let old_selections = this.selections.all::<usize>(cx);
-                let all_selections_were_entire_line =
-                    clipboard_selections.iter().all(|s| s.is_entire_line);
-                let first_selection_indent_column =
-                    clipboard_selections.first().map(|s| s.first_line_indent);
-                if clipboard_selections.len() != old_selections.len() {
-                    clipboard_selections.drain(..);
-                }
-                let cursor_offset = this.selections.last::<usize>(cx).head();
-                let mut auto_indent_on_paste = true;
-
-                this.buffer.update(cx, |buffer, cx| {
-                    let snapshot = buffer.read(cx);
-                    auto_indent_on_paste = snapshot
-                        .language_settings_at(cursor_offset, cx)
-                        .auto_indent_on_paste;
-
-                    let mut start_offset = 0;
-                    let mut edits = Vec::new();
-                    let mut original_indent_columns = Vec::new();
-                    for (ix, selection) in old_selections.iter().enumerate() {
-                        let to_insert;
-                        let entire_line;
-                        let original_indent_column;
-                        if let Some(clipboard_selection) = clipboard_selections.get(ix) {
-                            let end_offset = start_offset + clipboard_selection.len;
-                            to_insert = &clipboard_text[start_offset..end_offset];
-                            entire_line = clipboard_selection.is_entire_line;
-                            start_offset = end_offset + 1;
-                            original_indent_column = Some(clipboard_selection.first_line_indent);
-                        } else {
-                            to_insert = clipboard_text.as_str();
-                            entire_line = all_selections_were_entire_line;
-                            original_indent_column = first_selection_indent_column
-                        }
-
-                        // If the corresponding selection was empty when this slice of the
-                        // clipboard text was written, then the entire line containing the
-                        // selection was copied. If this selection is also currently empty,
-                        // then paste the line before the current line of the buffer.
-                        let range = if selection.is_empty() && handle_entire_lines && entire_line {
-                            let column = selection.start.to_point(&snapshot).column as usize;
-                            let line_start = selection.start - column;
-                            line_start..line_start
-                        } else {
-                            selection.range()
-                        };
-
-                        edits.push((range, to_insert));
-                        original_indent_columns.push(original_indent_column);
-                    }
-                    drop(snapshot);
-
-                    buffer.edit(
-                        edits,
-                        if auto_indent_on_paste {
-                            Some(AutoindentMode::Block {
-                                original_indent_columns,
-                            })
-                        } else {
-                            None
-                        },
-                        cx,
-                    );
-                });
-
-                let selections = this.selections.all::<usize>(cx);
-                this.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-                    s.select(selections)
-                });
-            } else {
-                this.insert(&clipboard_text, window, cx);
-            }
-        });
-    }
-
-    pub fn paste(&mut self, _: &Paste, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-        if let Some(item) = cx.read_from_clipboard() {
-            let entries = item.entries();
-
-            match entries.first() {
-                // For now, we only support applying metadata if there's one string. In the future, we can incorporate all the selections
-                // of all the pasted entries.
-                Some(ClipboardEntry::String(clipboard_string)) if entries.len() == 1 => self
-                    .do_paste(
-                        clipboard_string.text(),
-                        clipboard_string.metadata_json::<Vec<ClipboardSelection>>(),
-                        true,
-                        window,
-                        cx,
-                    ),
-                _ => self.do_paste(&item.text().unwrap_or_default(), None, true, window, cx),
-            }
-        }
-    }
-
-    pub fn undo(&mut self, _: &Undo, window: &mut Window, cx: &mut Context<Self>) {
-        if self.read_only(cx) {
-            return;
-        }
-
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-
-        if let Some(transaction_id) = self.buffer.update(cx, |buffer, cx| buffer.undo(cx)) {
-            if let Some((selections, _)) =
-                self.selection_history.transaction(transaction_id).cloned()
-            {
-                self.change_selections(None, window, cx, |s| {
-                    s.select_anchors(selections.to_vec());
-                });
-            } else {
-                log::error!(
-                    "No entry in selection_history found for undo. \
-                     This may correspond to a bug where undo does not update the selection. \
-                     If this is occurring, please add details to \
-                     https://github.com/zed-industries/zed/issues/22692"
-                );
-            }
-            self.request_autoscroll(Autoscroll::fit(), cx);
-            self.unmark_text(window, cx);
-            self.refresh_inline_completion(true, false, window, cx);
-            cx.emit(EditorEvent::Edited { transaction_id });
-            cx.emit(EditorEvent::TransactionUndone { transaction_id });
-        }
-    }
-
-    pub fn redo(&mut self, _: &Redo, window: &mut Window, cx: &mut Context<Self>) {
-        if self.read_only(cx) {
-            return;
-        }
-
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-
-        if let Some(transaction_id) = self.buffer.update(cx, |buffer, cx| buffer.redo(cx)) {
-            if let Some((_, Some(selections))) =
-                self.selection_history.transaction(transaction_id).cloned()
-            {
-                self.change_selections(None, window, cx, |s| {
-                    s.select_anchors(selections.to_vec());
-                });
-            } else {
-                log::error!(
-                    "No entry in selection_history found for redo. \
-                     This may correspond to a bug where undo does not update the selection. \
-                     If this is occurring, please add details to \
-                     https://github.com/zed-industries/zed/issues/22692"
-                );
-            }
-            self.request_autoscroll(Autoscroll::fit(), cx);
-            self.unmark_text(window, cx);
-            self.refresh_inline_completion(true, false, window, cx);
-            cx.emit(EditorEvent::Edited { transaction_id });
-        }
-    }
-
-    pub fn finalize_last_transaction(&mut self, cx: &mut Context<Self>) {
-        self.buffer
-            .update(cx, |buffer, cx| buffer.finalize_last_transaction(cx));
-    }
-
-    pub fn group_until_transaction(&mut self, tx_id: TransactionId, cx: &mut Context<Self>) {
-        self.buffer
-            .update(cx, |buffer, cx| buffer.group_until_transaction(tx_id, cx));
-    }
-
-    pub fn move_left(&mut self, _: &MoveLeft, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.move_with(|map, selection| {
-                let cursor = if selection.is_empty() {
-                    movement::left(map, selection.start)
-                } else {
-                    selection.start
-                };
-                selection.collapse_to(cursor, SelectionGoal::None);
-            });
-        })
-    }
-
-    pub fn select_left(&mut self, _: &SelectLeft, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.move_heads_with(|map, head, _| (movement::left(map, head), SelectionGoal::None));
-        })
-    }
-
-    pub fn move_right(&mut self, _: &MoveRight, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.move_with(|map, selection| {
-                let cursor = if selection.is_empty() {
-                    movement::right(map, selection.end)
-                } else {
-                    selection.end
-                };
-                selection.collapse_to(cursor, SelectionGoal::None)
-            });
-        })
-    }
-
-    pub fn select_right(&mut self, _: &SelectRight, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.move_heads_with(|map, head, _| (movement::right(map, head), SelectionGoal::None));
-        })
-    }
-
-    pub fn move_up(&mut self, _: &MoveUp, window: &mut Window, cx: &mut Context<Self>) {
-        if self.take_rename(true, window, cx).is_some() {
-            return;
-        }
-
-        if matches!(self.mode, EditorMode::SingleLine { .. }) {
-            cx.propagate();
-            return;
-        }
-
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-
-        let text_layout_details = &self.text_layout_details(window);
-        let selection_count = self.selections.count();
-        let first_selection = self.selections.first_anchor();
-
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.move_with(|map, selection| {
-                if !selection.is_empty() {
-                    selection.goal = SelectionGoal::None;
-                }
-                let (cursor, goal) = movement::up(
-                    map,
-                    selection.start,
-                    selection.goal,
-                    false,
-                    text_layout_details,
-                );
-                selection.collapse_to(cursor, goal);
-            });
-        });
-
-        if selection_count == 1 && first_selection.range() == self.selections.first_anchor().range()
-        {
-            cx.propagate();
-        }
-    }
-
-    pub fn move_up_by_lines(
-        &mut self,
-        action: &MoveUpByLines,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.take_rename(true, window, cx).is_some() {
-            return;
-        }
-
-        if matches!(self.mode, EditorMode::SingleLine { .. }) {
-            cx.propagate();
-            return;
-        }
-
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-
-        let text_layout_details = &self.text_layout_details(window);
-
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.move_with(|map, selection| {
-                if !selection.is_empty() {
-                    selection.goal = SelectionGoal::None;
-                }
-                let (cursor, goal) = movement::up_by_rows(
-                    map,
-                    selection.start,
-                    action.lines,
-                    selection.goal,
-                    false,
-                    text_layout_details,
-                );
-                selection.collapse_to(cursor, goal);
-            });
-        })
-    }
-
-    pub fn move_down_by_lines(
-        &mut self,
-        action: &MoveDownByLines,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.take_rename(true, window, cx).is_some() {
-            return;
-        }
-
-        if matches!(self.mode, EditorMode::SingleLine { .. }) {
-            cx.propagate();
-            return;
-        }
-
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-
-        let text_layout_details = &self.text_layout_details(window);
-
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.move_with(|map, selection| {
-                if !selection.is_empty() {
-                    selection.goal = SelectionGoal::None;
-                }
-                let (cursor, goal) = movement::down_by_rows(
-                    map,
-                    selection.start,
-                    action.lines,
-                    selection.goal,
-                    false,
-                    text_layout_details,
-                );
-                selection.collapse_to(cursor, goal);
-            });
-        })
-    }
-
-    pub fn select_down_by_lines(
-        &mut self,
-        action: &SelectDownByLines,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-        let text_layout_details = &self.text_layout_details(window);
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.move_heads_with(|map, head, goal| {
-                movement::down_by_rows(map, head, action.lines, goal, false, text_layout_details)
-            })
-        })
-    }
-
-    pub fn select_up_by_lines(
-        &mut self,
-        action: &SelectUpByLines,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-        let text_layout_details = &self.text_layout_details(window);
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.move_heads_with(|map, head, goal| {
-                movement::up_by_rows(map, head, action.lines, goal, false, text_layout_details)
-            })
-        })
-    }
-
-    pub fn select_page_up(
-        &mut self,
-        _: &SelectPageUp,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(row_count) = self.visible_row_count() else {
-            return;
-        };
-
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-
-        let text_layout_details = &self.text_layout_details(window);
-
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.move_heads_with(|map, head, goal| {
-                movement::up_by_rows(map, head, row_count, goal, false, text_layout_details)
-            })
-        })
-    }
-
-    pub fn move_page_up(
-        &mut self,
-        action: &MovePageUp,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.take_rename(true, window, cx).is_some() {
-            return;
-        }
-
-        if self
-            .context_menu
-            .borrow_mut()
-            .as_mut()
-            .map(|menu| menu.select_first(self.completion_provider.as_deref(), cx))
-            .unwrap_or(false)
-        {
-            return;
-        }
-
-        if matches!(self.mode, EditorMode::SingleLine { .. }) {
-            cx.propagate();
-            return;
-        }
-
-        let Some(row_count) = self.visible_row_count() else {
-            return;
-        };
-
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-
-        let autoscroll = if action.center_cursor {
-            Autoscroll::center()
-        } else {
-            Autoscroll::fit()
-        };
-
-        let text_layout_details = &self.text_layout_details(window);
-
-        self.change_selections(Some(autoscroll), window, cx, |s| {
-            s.move_with(|map, selection| {
-                if !selection.is_empty() {
-                    selection.goal = SelectionGoal::None;
-                }
-                let (cursor, goal) = movement::up_by_rows(
-                    map,
-                    selection.end,
-                    row_count,
-                    selection.goal,
-                    false,
-                    text_layout_details,
-                );
-                selection.collapse_to(cursor, goal);
-            });
-        });
-    }
-
-    pub fn select_up(&mut self, _: &SelectUp, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-        let text_layout_details = &self.text_layout_details(window);
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.move_heads_with(|map, head, goal| {
-                movement::up(map, head, goal, false, text_layout_details)
-            })
-        })
-    }
-
-    pub fn move_down(&mut self, _: &MoveDown, window: &mut Window, cx: &mut Context<Self>) {
-        self.take_rename(true, window, cx);
-
-        if matches!(self.mode, EditorMode::SingleLine { .. }) {
-            cx.propagate();
-            return;
-        }
-
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-
-        let text_layout_details = &self.text_layout_details(window);
-        let selection_count = self.selections.count();
-        let first_selection = self.selections.first_anchor();
-
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.move_with(|map, selection| {
-                if !selection.is_empty() {
-                    selection.goal = SelectionGoal::None;
-                }
-                let (cursor, goal) = movement::down(
-                    map,
-                    selection.end,
-                    selection.goal,
-                    false,
-                    text_layout_details,
-                );
-                selection.collapse_to(cursor, goal);
-            });
-        });
-
-        if selection_count == 1 && first_selection.range() == self.selections.first_anchor().range()
-        {
-            cx.propagate();
-        }
-    }
-
-    pub fn select_page_down(
-        &mut self,
-        _: &SelectPageDown,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(row_count) = self.visible_row_count() else {
-            return;
-        };
-
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-
-        let text_layout_details = &self.text_layout_details(window);
-
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.move_heads_with(|map, head, goal| {
-                movement::down_by_rows(map, head, row_count, goal, false, text_layout_details)
-            })
-        })
-    }
-
-    pub fn move_page_down(
-        &mut self,
-        action: &MovePageDown,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.take_rename(true, window, cx).is_some() {
-            return;
-        }
-
-        if self
-            .context_menu
-            .borrow_mut()
-            .as_mut()
-            .map(|menu| menu.select_last(self.completion_provider.as_deref(), cx))
-            .unwrap_or(false)
-        {
-            return;
-        }
-
-        if matches!(self.mode, EditorMode::SingleLine { .. }) {
-            cx.propagate();
-            return;
-        }
-
-        let Some(row_count) = self.visible_row_count() else {
-            return;
-        };
-
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-
-        let autoscroll = if action.center_cursor {
-            Autoscroll::center()
-        } else {
-            Autoscroll::fit()
-        };
-
-        let text_layout_details = &self.text_layout_details(window);
-        self.change_selections(Some(autoscroll), window, cx, |s| {
-            s.move_with(|map, selection| {
-                if !selection.is_empty() {
-                    selection.goal = SelectionGoal::None;
-                }
-                let (cursor, goal) = movement::down_by_rows(
-                    map,
-                    selection.end,
-                    row_count,
-                    selection.goal,
-                    false,
-                    text_layout_details,
-                );
-                selection.collapse_to(cursor, goal);
-            });
-        });
-    }
-
-    pub fn select_down(&mut self, _: &SelectDown, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-        let text_layout_details = &self.text_layout_details(window);
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.move_heads_with(|map, head, goal| {
-                movement::down(map, head, goal, false, text_layout_details)
-            })
-        });
-    }
-
-    pub fn context_menu_first(
-        &mut self,
-        _: &ContextMenuFirst,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(context_menu) = self.context_menu.borrow_mut().as_mut() {
-            context_menu.select_first(self.completion_provider.as_deref(), cx);
-        }
-    }
-
-    pub fn context_menu_prev(
-        &mut self,
-        _: &ContextMenuPrevious,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(context_menu) = self.context_menu.borrow_mut().as_mut() {
-            context_menu.select_prev(self.completion_provider.as_deref(), cx);
-        }
-    }
-
-    pub fn context_menu_next(
-        &mut self,
-        _: &ContextMenuNext,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(context_menu) = self.context_menu.borrow_mut().as_mut() {
-            context_menu.select_next(self.completion_provider.as_deref(), cx);
-        }
-    }
-
-    pub fn context_menu_last(
-        &mut self,
-        _: &ContextMenuLast,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(context_menu) = self.context_menu.borrow_mut().as_mut() {
-            context_menu.select_last(self.completion_provider.as_deref(), cx);
-        }
-    }
-
-    pub fn move_to_previous_word_start(
-        &mut self,
-        _: &MoveToPreviousWordStart,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.move_cursors_with(|map, head, _| {
-                (
-                    movement::previous_word_start(map, head),
-                    SelectionGoal::None,
-                )
-            });
-        })
-    }
-
-    pub fn move_to_previous_subword_start(
-        &mut self,
-        _: &MoveToPreviousSubwordStart,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.move_cursors_with(|map, head, _| {
-                (
-                    movement::previous_subword_start(map, head),
-                    SelectionGoal::None,
-                )
-            });
-        })
-    }
-
-    pub fn select_to_previous_word_start(
-        &mut self,
-        _: &SelectToPreviousWordStart,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.move_heads_with(|map, head, _| {
-                (
-                    movement::previous_word_start(map, head),
-                    SelectionGoal::None,
-                )
-            });
-        })
-    }
-
-    pub fn select_to_previous_subword_start(
-        &mut self,
-        _: &SelectToPreviousSubwordStart,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.move_heads_with(|map, head, _| {
-                (
-                    movement::previous_subword_start(map, head),
-                    SelectionGoal::None,
-                )
-            });
-        })
-    }
-
-    pub fn delete_to_previous_word_start(
-        &mut self,
-        action: &DeleteToPreviousWordStart,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-        self.transact(window, cx, |this, window, cx| {
-            this.select_autoclose_pair(window, cx);
-            this.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-                s.move_with(|map, selection| {
-                    if selection.is_empty() {
-                        let cursor = if action.ignore_newlines {
-                            movement::previous_word_start(map, selection.head())
-                        } else {
-                            movement::previous_word_start_or_newline(map, selection.head())
-                        };
-                        selection.set_head(cursor, SelectionGoal::None);
-                    }
-                });
-            });
-            this.insert("", window, cx);
-        });
-    }
-
-    pub fn delete_to_previous_subword_start(
-        &mut self,
-        _: &DeleteToPreviousSubwordStart,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-        self.transact(window, cx, |this, window, cx| {
-            this.select_autoclose_pair(window, cx);
-            this.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-                s.move_with(|map, selection| {
-                    if selection.is_empty() {
-                        let cursor = movement::previous_subword_start(map, selection.head());
-                        selection.set_head(cursor, SelectionGoal::None);
-                    }
-                });
-            });
-            this.insert("", window, cx);
-        });
-    }
-
-    pub fn move_to_next_word_end(
-        &mut self,
-        _: &MoveToNextWordEnd,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.move_cursors_with(|map, head, _| {
-                (movement::next_word_end(map, head), SelectionGoal::None)
-            });
-        })
-    }
-
-    pub fn move_to_next_subword_end(
-        &mut self,
-        _: &MoveToNextSubwordEnd,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.move_cursors_with(|map, head, _| {
-                (movement::next_subword_end(map, head), SelectionGoal::None)
-            });
-        })
-    }
-
-    pub fn select_to_next_word_end(
-        &mut self,
-        _: &SelectToNextWordEnd,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.move_heads_with(|map, head, _| {
-                (movement::next_word_end(map, head), SelectionGoal::None)
-            });
-        })
-    }
-
-    pub fn select_to_next_subword_end(
-        &mut self,
-        _: &SelectToNextSubwordEnd,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.move_heads_with(|map, head, _| {
-                (movement::next_subword_end(map, head), SelectionGoal::None)
-            });
-        })
-    }
-
-    pub fn delete_to_next_word_end(
-        &mut self,
-        action: &DeleteToNextWordEnd,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-        self.transact(window, cx, |this, window, cx| {
-            this.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-                s.move_with(|map, selection| {
-                    if selection.is_empty() {
-                        let cursor = if action.ignore_newlines {
-                            movement::next_word_end(map, selection.head())
-                        } else {
-                            movement::next_word_end_or_newline(map, selection.head())
-                        };
-                        selection.set_head(cursor, SelectionGoal::None);
-                    }
-                });
-            });
-            this.insert("", window, cx);
-        });
-    }
-
-    pub fn delete_to_next_subword_end(
-        &mut self,
-        _: &DeleteToNextSubwordEnd,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-        self.transact(window, cx, |this, window, cx| {
-            this.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-                s.move_with(|map, selection| {
-                    if selection.is_empty() {
-                        let cursor = movement::next_subword_end(map, selection.head());
-                        selection.set_head(cursor, SelectionGoal::None);
-                    }
-                });
-            });
-            this.insert("", window, cx);
-        });
-    }
-
-    pub fn move_to_beginning_of_line(
-        &mut self,
-        action: &MoveToBeginningOfLine,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.move_cursors_with(|map, head, _| {
-                (
-                    movement::indented_line_beginning(
-                        map,
-                        head,
-                        action.stop_at_soft_wraps,
-                        action.stop_at_indent,
-                    ),
-                    SelectionGoal::None,
-                )
-            });
-        })
-    }
-
-    pub fn select_to_beginning_of_line(
-        &mut self,
-        action: &SelectToBeginningOfLine,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.move_heads_with(|map, head, _| {
-                (
-                    movement::indented_line_beginning(
-                        map,
-                        head,
-                        action.stop_at_soft_wraps,
-                        action.stop_at_indent,
-                    ),
-                    SelectionGoal::None,
-                )
-            });
-        });
-    }
-
-    pub fn delete_to_beginning_of_line(
-        &mut self,
-        action: &DeleteToBeginningOfLine,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-        self.transact(window, cx, |this, window, cx| {
-            this.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-                s.move_with(|_, selection| {
-                    selection.reversed = true;
-                });
-            });
-
-            this.select_to_beginning_of_line(
-                &SelectToBeginningOfLine {
-                    stop_at_soft_wraps: false,
-                    stop_at_indent: action.stop_at_indent,
-                },
-                window,
-                cx,
-            );
-            this.backspace(&Backspace, window, cx);
-        });
-    }
-
-    pub fn move_to_end_of_line(
-        &mut self,
-        action: &MoveToEndOfLine,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.move_cursors_with(|map, head, _| {
-                (
-                    movement::line_end(map, head, action.stop_at_soft_wraps),
-                    SelectionGoal::None,
-                )
-            });
-        })
-    }
-
-    pub fn select_to_end_of_line(
-        &mut self,
-        action: &SelectToEndOfLine,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.move_heads_with(|map, head, _| {
-                (
-                    movement::line_end(map, head, action.stop_at_soft_wraps),
-                    SelectionGoal::None,
-                )
-            });
-        })
-    }
-
-    pub fn delete_to_end_of_line(
-        &mut self,
-        _: &DeleteToEndOfLine,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-        self.transact(window, cx, |this, window, cx| {
-            this.select_to_end_of_line(
-                &SelectToEndOfLine {
-                    stop_at_soft_wraps: false,
-                },
-                window,
-                cx,
-            );
-            this.delete(&Delete, window, cx);
-        });
-    }
-
-    pub fn cut_to_end_of_line(
-        &mut self,
-        _: &CutToEndOfLine,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-        self.transact(window, cx, |this, window, cx| {
-            this.select_to_end_of_line(
-                &SelectToEndOfLine {
-                    stop_at_soft_wraps: false,
-                },
-                window,
-                cx,
-            );
-            this.cut(&Cut, window, cx);
-        });
-    }
-
-    pub fn move_to_start_of_paragraph(
-        &mut self,
-        _: &MoveToStartOfParagraph,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if matches!(self.mode, EditorMode::SingleLine { .. }) {
-            cx.propagate();
-            return;
-        }
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.move_with(|map, selection| {
-                selection.collapse_to(
-                    movement::start_of_paragraph(map, selection.head(), 1),
-                    SelectionGoal::None,
-                )
-            });
-        })
-    }
-
-    pub fn move_to_end_of_paragraph(
-        &mut self,
-        _: &MoveToEndOfParagraph,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if matches!(self.mode, EditorMode::SingleLine { .. }) {
-            cx.propagate();
-            return;
-        }
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.move_with(|map, selection| {
-                selection.collapse_to(
-                    movement::end_of_paragraph(map, selection.head(), 1),
-                    SelectionGoal::None,
-                )
-            });
-        })
-    }
-
-    pub fn select_to_start_of_paragraph(
-        &mut self,
-        _: &SelectToStartOfParagraph,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if matches!(self.mode, EditorMode::SingleLine { .. }) {
-            cx.propagate();
-            return;
-        }
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.move_heads_with(|map, head, _| {
-                (
-                    movement::start_of_paragraph(map, head, 1),
-                    SelectionGoal::None,
-                )
-            });
-        })
-    }
-
-    pub fn select_to_end_of_paragraph(
-        &mut self,
-        _: &SelectToEndOfParagraph,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if matches!(self.mode, EditorMode::SingleLine { .. }) {
-            cx.propagate();
-            return;
-        }
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.move_heads_with(|map, head, _| {
-                (
-                    movement::end_of_paragraph(map, head, 1),
-                    SelectionGoal::None,
-                )
-            });
-        })
-    }
-
-    pub fn move_to_start_of_excerpt(
-        &mut self,
-        _: &MoveToStartOfExcerpt,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if matches!(self.mode, EditorMode::SingleLine { .. }) {
-            cx.propagate();
-            return;
-        }
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.move_with(|map, selection| {
-                selection.collapse_to(
-                    movement::start_of_excerpt(
-                        map,
-                        selection.head(),
-                        workspace::searchable::Direction::Prev,
-                    ),
-                    SelectionGoal::None,
-                )
-            });
-        })
-    }
-
-    pub fn move_to_start_of_next_excerpt(
-        &mut self,
-        _: &MoveToStartOfNextExcerpt,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if matches!(self.mode, EditorMode::SingleLine { .. }) {
-            cx.propagate();
-            return;
-        }
-
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.move_with(|map, selection| {
-                selection.collapse_to(
-                    movement::start_of_excerpt(
-                        map,
-                        selection.head(),
-                        workspace::searchable::Direction::Next,
-                    ),
-                    SelectionGoal::None,
-                )
-            });
-        })
-    }
-
-    pub fn move_to_end_of_excerpt(
-        &mut self,
-        _: &MoveToEndOfExcerpt,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if matches!(self.mode, EditorMode::SingleLine { .. }) {
-            cx.propagate();
-            return;
-        }
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.move_with(|map, selection| {
-                selection.collapse_to(
-                    movement::end_of_excerpt(
-                        map,
-                        selection.head(),
-                        workspace::searchable::Direction::Next,
-                    ),
-                    SelectionGoal::None,
-                )
-            });
-        })
-    }
-
-    pub fn move_to_end_of_previous_excerpt(
-        &mut self,
-        _: &MoveToEndOfPreviousExcerpt,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if matches!(self.mode, EditorMode::SingleLine { .. }) {
-            cx.propagate();
-            return;
-        }
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.move_with(|map, selection| {
-                selection.collapse_to(
-                    movement::end_of_excerpt(
-                        map,
-                        selection.head(),
-                        workspace::searchable::Direction::Prev,
-                    ),
-                    SelectionGoal::None,
-                )
-            });
-        })
-    }
-
-    pub fn select_to_start_of_excerpt(
-        &mut self,
-        _: &SelectToStartOfExcerpt,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if matches!(self.mode, EditorMode::SingleLine { .. }) {
-            cx.propagate();
-            return;
-        }
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.move_heads_with(|map, head, _| {
-                (
-                    movement::start_of_excerpt(map, head, workspace::searchable::Direction::Prev),
-                    SelectionGoal::None,
-                )
-            });
-        })
-    }
-
-    pub fn select_to_start_of_next_excerpt(
-        &mut self,
-        _: &SelectToStartOfNextExcerpt,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if matches!(self.mode, EditorMode::SingleLine { .. }) {
-            cx.propagate();
-            return;
-        }
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.move_heads_with(|map, head, _| {
-                (
-                    movement::start_of_excerpt(map, head, workspace::searchable::Direction::Next),
-                    SelectionGoal::None,
-                )
-            });
-        })
-    }
-
-    pub fn select_to_end_of_excerpt(
-        &mut self,
-        _: &SelectToEndOfExcerpt,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if matches!(self.mode, EditorMode::SingleLine { .. }) {
-            cx.propagate();
-            return;
-        }
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.move_heads_with(|map, head, _| {
-                (
-                    movement::end_of_excerpt(map, head, workspace::searchable::Direction::Next),
-                    SelectionGoal::None,
-                )
-            });
-        })
-    }
-
-    pub fn select_to_end_of_previous_excerpt(
-        &mut self,
-        _: &SelectToEndOfPreviousExcerpt,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if matches!(self.mode, EditorMode::SingleLine { .. }) {
-            cx.propagate();
-            return;
-        }
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.move_heads_with(|map, head, _| {
-                (
-                    movement::end_of_excerpt(map, head, workspace::searchable::Direction::Prev),
-                    SelectionGoal::None,
-                )
-            });
-        })
-    }
-
-    pub fn move_to_beginning(
-        &mut self,
-        _: &MoveToBeginning,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if matches!(self.mode, EditorMode::SingleLine { .. }) {
-            cx.propagate();
-            return;
-        }
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.select_ranges(vec![0..0]);
-        });
-    }
-
-    pub fn select_to_beginning(
-        &mut self,
-        _: &SelectToBeginning,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let mut selection = self.selections.last::<Point>(cx);
-        selection.set_head(Point::zero(), SelectionGoal::None);
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.select(vec![selection]);
-        });
-    }
-
-    pub fn move_to_end(&mut self, _: &MoveToEnd, window: &mut Window, cx: &mut Context<Self>) {
-        if matches!(self.mode, EditorMode::SingleLine { .. }) {
-            cx.propagate();
-            return;
-        }
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-        let cursor = self.buffer.read(cx).read(cx).len();
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.select_ranges(vec![cursor..cursor])
-        });
-    }
-
-    pub fn set_nav_history(&mut self, nav_history: Option<ItemNavHistory>) {
-        self.nav_history = nav_history;
-    }
-
-    pub fn nav_history(&self) -> Option<&ItemNavHistory> {
-        self.nav_history.as_ref()
-    }
-
-    pub fn create_nav_history_entry(&mut self, cx: &mut Context<Self>) {
-        self.push_to_nav_history(self.selections.newest_anchor().head(), None, false, cx);
-    }
-
-    fn push_to_nav_history(
-        &mut self,
-        cursor_anchor: Anchor,
-        new_position: Option<Point>,
-        is_deactivate: bool,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(nav_history) = self.nav_history.as_mut() {
-            let buffer = self.buffer.read(cx).read(cx);
-            let cursor_position = cursor_anchor.to_point(&buffer);
-            let scroll_state = self.scroll_manager.anchor();
-            let scroll_top_row = scroll_state.top_row(&buffer);
-            drop(buffer);
-
-            if let Some(new_position) = new_position {
-                let row_delta = (new_position.row as i64 - cursor_position.row as i64).abs();
-                if row_delta < MIN_NAVIGATION_HISTORY_ROW_DELTA {
-                    return;
-                }
-            }
-
-            nav_history.push(
-                Some(NavigationData {
-                    cursor_anchor,
-                    cursor_position,
-                    scroll_anchor: scroll_state,
-                    scroll_top_row,
-                }),
-                cx,
-            );
-            cx.emit(EditorEvent::PushedToNavHistory {
-                anchor: cursor_anchor,
-                is_deactivate,
-            })
-        }
-    }
-
-    pub fn select_to_end(&mut self, _: &SelectToEnd, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-        let buffer = self.buffer.read(cx).snapshot(cx);
-        let mut selection = self.selections.first::<usize>(cx);
-        selection.set_head(buffer.len(), SelectionGoal::None);
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.select(vec![selection]);
-        });
-    }
-
-    pub fn select_all(&mut self, _: &SelectAll, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-        let end = self.buffer.read(cx).read(cx).len();
-        self.change_selections(None, window, cx, |s| {
-            s.select_ranges(vec![0..end]);
-        });
-    }
-
-    pub fn select_line(&mut self, _: &SelectLine, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-        let mut selections = self.selections.all::<Point>(cx);
-        let max_point = display_map.buffer_snapshot.max_point();
-        for selection in &mut selections {
-            let rows = selection.spanned_rows(true, &display_map);
-            selection.start = Point::new(rows.start.0, 0);
-            selection.end = cmp::min(max_point, Point::new(rows.end.0, 0));
-            selection.reversed = false;
-        }
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.select(selections);
-        });
-    }
-
-    pub fn split_selection_into_lines(
-        &mut self,
-        _: &SplitSelectionIntoLines,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let selections = self
-            .selections
-            .all::<Point>(cx)
-            .into_iter()
-            .map(|selection| selection.start..selection.end)
-            .collect::<Vec<_>>();
-        self.unfold_ranges(&selections, true, true, cx);
-
-        let mut new_selection_ranges = Vec::new();
-        {
-            let buffer = self.buffer.read(cx).read(cx);
-            for selection in selections {
-                for row in selection.start.row..selection.end.row {
-                    let cursor = Point::new(row, buffer.line_len(MultiBufferRow(row)));
-                    new_selection_ranges.push(cursor..cursor);
-                }
-
-                let is_multiline_selection = selection.start.row != selection.end.row;
-                // Don't insert last one if it's a multi-line selection ending at the start of a line,
-                // so this action feels more ergonomic when paired with other selection operations
-                let should_skip_last = is_multiline_selection && selection.end.column == 0;
-                if !should_skip_last {
-                    new_selection_ranges.push(selection.end..selection.end);
-                }
-            }
-        }
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.select_ranges(new_selection_ranges);
-        });
-    }
-
-    pub fn add_selection_above(
-        &mut self,
-        _: &AddSelectionAbove,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.add_selection(true, window, cx);
-    }
-
-    pub fn add_selection_below(
-        &mut self,
-        _: &AddSelectionBelow,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.add_selection(false, window, cx);
-    }
-
-    fn add_selection(&mut self, above: bool, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-        let mut selections = self.selections.all::<Point>(cx);
-        let text_layout_details = self.text_layout_details(window);
-        let mut state = self.add_selections_state.take().unwrap_or_else(|| {
-            let oldest_selection = selections.iter().min_by_key(|s| s.id).unwrap().clone();
-            let range = oldest_selection.display_range(&display_map).sorted();
-
-            let start_x = display_map.x_for_display_point(range.start, &text_layout_details);
-            let end_x = display_map.x_for_display_point(range.end, &text_layout_details);
-            let positions = start_x.min(end_x)..start_x.max(end_x);
-
-            selections.clear();
-            let mut stack = Vec::new();
-            for row in range.start.row().0..=range.end.row().0 {
-                if let Some(selection) = self.selections.build_columnar_selection(
-                    &display_map,
-                    DisplayRow(row),
-                    &positions,
-                    oldest_selection.reversed,
-                    &text_layout_details,
-                ) {
-                    stack.push(selection.id);
-                    selections.push(selection);
-                }
-            }
-
-            if above {
-                stack.reverse();
-            }
-
-            AddSelectionsState { above, stack }
-        });
-
-        let last_added_selection = *state.stack.last().unwrap();
-        let mut new_selections = Vec::new();
-        if above == state.above {
-            let end_row = if above {
-                DisplayRow(0)
-            } else {
-                display_map.max_point().row()
-            };
-
-            'outer: for selection in selections {
-                if selection.id == last_added_selection {
-                    let range = selection.display_range(&display_map).sorted();
-                    debug_assert_eq!(range.start.row(), range.end.row());
-                    let mut row = range.start.row();
-                    let positions =
-                        if let SelectionGoal::HorizontalRange { start, end } = selection.goal {
-                            px(start)..px(end)
-                        } else {
-                            let start_x =
-                                display_map.x_for_display_point(range.start, &text_layout_details);
-                            let end_x =
-                                display_map.x_for_display_point(range.end, &text_layout_details);
-                            start_x.min(end_x)..start_x.max(end_x)
-                        };
-
-                    while row != end_row {
-                        if above {
-                            row.0 -= 1;
-                        } else {
-                            row.0 += 1;
-                        }
-
-                        if let Some(new_selection) = self.selections.build_columnar_selection(
-                            &display_map,
-                            row,
-                            &positions,
-                            selection.reversed,
-                            &text_layout_details,
-                        ) {
-                            state.stack.push(new_selection.id);
-                            if above {
-                                new_selections.push(new_selection);
-                                new_selections.push(selection);
-                            } else {
-                                new_selections.push(selection);
-                                new_selections.push(new_selection);
-                            }
-
-                            continue 'outer;
-                        }
-                    }
-                }
-
-                new_selections.push(selection);
-            }
-        } else {
-            new_selections = selections;
-            new_selections.retain(|s| s.id != last_added_selection);
-            state.stack.pop();
-        }
-
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.select(new_selections);
-        });
-        if state.stack.len() > 1 {
-            self.add_selections_state = Some(state);
-        }
-    }
-
-    pub fn select_next_match_internal(
-        &mut self,
-        display_map: &DisplaySnapshot,
-        replace_newest: bool,
-        autoscroll: Option<Autoscroll>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Result<()> {
-        fn select_next_match_ranges(
-            this: &mut Editor,
-            range: Range<usize>,
-            reversed: bool,
-            replace_newest: bool,
-            auto_scroll: Option<Autoscroll>,
-            window: &mut Window,
-            cx: &mut Context<Editor>,
-        ) {
-            this.unfold_ranges(&[range.clone()], false, auto_scroll.is_some(), cx);
-            this.change_selections(auto_scroll, window, cx, |s| {
-                if replace_newest {
-                    s.delete(s.newest_anchor().id);
-                }
-                if reversed {
-                    s.insert_range(range.end..range.start);
-                } else {
-                    s.insert_range(range);
-                }
-            });
-        }
-
-        let buffer = &display_map.buffer_snapshot;
-        let mut selections = self.selections.all::<usize>(cx);
-        if let Some(mut select_next_state) = self.select_next_state.take() {
-            let query = &select_next_state.query;
-            if !select_next_state.done {
-                let first_selection = selections.iter().min_by_key(|s| s.id).unwrap();
-                let last_selection = selections.iter().max_by_key(|s| s.id).unwrap();
-                let mut next_selected_range = None;
-
-                let bytes_after_last_selection =
-                    buffer.bytes_in_range(last_selection.end..buffer.len());
-                let bytes_before_first_selection = buffer.bytes_in_range(0..first_selection.start);
-                let query_matches = query
-                    .stream_find_iter(bytes_after_last_selection)
-                    .map(|result| (last_selection.end, result))
-                    .chain(
-                        query
-                            .stream_find_iter(bytes_before_first_selection)
-                            .map(|result| (0, result)),
-                    );
-
-                for (start_offset, query_match) in query_matches {
-                    let query_match = query_match.unwrap(); // can only fail due to I/O
-                    let offset_range =
-                        start_offset + query_match.start()..start_offset + query_match.end();
-                    let display_range = offset_range.start.to_display_point(display_map)
-                        ..offset_range.end.to_display_point(display_map);
-
-                    if !select_next_state.wordwise
-                        || (!movement::is_inside_word(display_map, display_range.start)
-                            && !movement::is_inside_word(display_map, display_range.end))
-                    {
-                        // TODO: This is n^2, because we might check all the selections
-                        if !selections
-                            .iter()
-                            .any(|selection| selection.range().overlaps(&offset_range))
-                        {
-                            next_selected_range = Some(offset_range);
-                            break;
-                        }
-                    }
-                }
-
-                if let Some(next_selected_range) = next_selected_range {
-                    select_next_match_ranges(
-                        self,
-                        next_selected_range,
-                        last_selection.reversed,
-                        replace_newest,
-                        autoscroll,
-                        window,
-                        cx,
-                    );
-                } else {
-                    select_next_state.done = true;
-                }
-            }
-
-            self.select_next_state = Some(select_next_state);
-        } else {
-            let mut only_carets = true;
-            let mut same_text_selected = true;
-            let mut selected_text = None;
-
-            let mut selections_iter = selections.iter().peekable();
-            while let Some(selection) = selections_iter.next() {
-                if selection.start != selection.end {
-                    only_carets = false;
-                }
-
-                if same_text_selected {
-                    if selected_text.is_none() {
-                        selected_text =
-                            Some(buffer.text_for_range(selection.range()).collect::<String>());
-                    }
-
-                    if let Some(next_selection) = selections_iter.peek() {
-                        if next_selection.range().len() == selection.range().len() {
-                            let next_selected_text = buffer
-                                .text_for_range(next_selection.range())
-                                .collect::<String>();
-                            if Some(next_selected_text) != selected_text {
-                                same_text_selected = false;
-                                selected_text = None;
-                            }
-                        } else {
-                            same_text_selected = false;
-                            selected_text = None;
-                        }
-                    }
-                }
-            }
-
-            if only_carets {
-                for selection in &mut selections {
-                    let word_range = movement::surrounding_word(
-                        display_map,
-                        selection.start.to_display_point(display_map),
-                    );
-                    selection.start = word_range.start.to_offset(display_map, Bias::Left);
-                    selection.end = word_range.end.to_offset(display_map, Bias::Left);
-                    selection.goal = SelectionGoal::None;
-                    selection.reversed = false;
-                    select_next_match_ranges(
-                        self,
-                        selection.start..selection.end,
-                        selection.reversed,
-                        replace_newest,
-                        autoscroll,
-                        window,
-                        cx,
-                    );
-                }
-
-                if selections.len() == 1 {
-                    let selection = selections
-                        .last()
-                        .expect("ensured that there's only one selection");
-                    let query = buffer
-                        .text_for_range(selection.start..selection.end)
-                        .collect::<String>();
-                    let is_empty = query.is_empty();
-                    let select_state = SelectNextState {
-                        query: AhoCorasick::new(&[query])?,
-                        wordwise: true,
-                        done: is_empty,
-                    };
-                    self.select_next_state = Some(select_state);
-                } else {
-                    self.select_next_state = None;
-                }
-            } else if let Some(selected_text) = selected_text {
-                self.select_next_state = Some(SelectNextState {
-                    query: AhoCorasick::new(&[selected_text])?,
-                    wordwise: false,
-                    done: false,
-                });
-                self.select_next_match_internal(
-                    display_map,
-                    replace_newest,
-                    autoscroll,
-                    window,
-                    cx,
-                )?;
-            }
-        }
-        Ok(())
-    }
-
-    pub fn select_all_matches(
-        &mut self,
-        _action: &SelectAllMatches,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Result<()> {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-
-        self.push_to_selection_history();
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-
-        self.select_next_match_internal(&display_map, false, None, window, cx)?;
-        let Some(select_next_state) = self.select_next_state.as_mut() else {
-            return Ok(());
-        };
-        if select_next_state.done {
-            return Ok(());
-        }
-
-        let mut new_selections = Vec::new();
-
-        let reversed = self.selections.oldest::<usize>(cx).reversed;
-        let buffer = &display_map.buffer_snapshot;
-        let query_matches = select_next_state
-            .query
-            .stream_find_iter(buffer.bytes_in_range(0..buffer.len()));
-
-        for query_match in query_matches.into_iter() {
-            let query_match = query_match.context("query match for select all action")?; // can only fail due to I/O
-            let offset_range = if reversed {
-                query_match.end()..query_match.start()
-            } else {
-                query_match.start()..query_match.end()
-            };
-            let display_range = offset_range.start.to_display_point(&display_map)
-                ..offset_range.end.to_display_point(&display_map);
-
-            if !select_next_state.wordwise
-                || (!movement::is_inside_word(&display_map, display_range.start)
-                    && !movement::is_inside_word(&display_map, display_range.end))
-            {
-                new_selections.push(offset_range.start..offset_range.end);
-            }
-        }
-
-        select_next_state.done = true;
-        self.unfold_ranges(&new_selections.clone(), false, false, cx);
-        self.change_selections(None, window, cx, |selections| {
-            selections.select_ranges(new_selections)
-        });
-
-        Ok(())
-    }
-
-    pub fn select_next(
-        &mut self,
-        action: &SelectNext,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Result<()> {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-        self.push_to_selection_history();
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-        self.select_next_match_internal(
-            &display_map,
-            action.replace_newest,
-            Some(Autoscroll::newest()),
-            window,
-            cx,
-        )?;
-        Ok(())
-    }
-
-    pub fn select_previous(
-        &mut self,
-        action: &SelectPrevious,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Result<()> {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-        self.push_to_selection_history();
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-        let buffer = &display_map.buffer_snapshot;
-        let mut selections = self.selections.all::<usize>(cx);
-        if let Some(mut select_prev_state) = self.select_prev_state.take() {
-            let query = &select_prev_state.query;
-            if !select_prev_state.done {
-                let first_selection = selections.iter().min_by_key(|s| s.id).unwrap();
-                let last_selection = selections.iter().max_by_key(|s| s.id).unwrap();
-                let mut next_selected_range = None;
-                // When we're iterating matches backwards, the oldest match will actually be the furthest one in the buffer.
-                let bytes_before_last_selection =
-                    buffer.reversed_bytes_in_range(0..last_selection.start);
-                let bytes_after_first_selection =
-                    buffer.reversed_bytes_in_range(first_selection.end..buffer.len());
-                let query_matches = query
-                    .stream_find_iter(bytes_before_last_selection)
-                    .map(|result| (last_selection.start, result))
-                    .chain(
-                        query
-                            .stream_find_iter(bytes_after_first_selection)
-                            .map(|result| (buffer.len(), result)),
-                    );
-                for (end_offset, query_match) in query_matches {
-                    let query_match = query_match.unwrap(); // can only fail due to I/O
-                    let offset_range =
-                        end_offset - query_match.end()..end_offset - query_match.start();
-                    let display_range = offset_range.start.to_display_point(&display_map)
-                        ..offset_range.end.to_display_point(&display_map);
-
-                    if !select_prev_state.wordwise
-                        || (!movement::is_inside_word(&display_map, display_range.start)
-                            && !movement::is_inside_word(&display_map, display_range.end))
-                    {
-                        next_selected_range = Some(offset_range);
-                        break;
-                    }
-                }
-
-                if let Some(next_selected_range) = next_selected_range {
-                    self.unfold_ranges(&[next_selected_range.clone()], false, true, cx);
-                    self.change_selections(Some(Autoscroll::newest()), window, cx, |s| {
-                        if action.replace_newest {
-                            s.delete(s.newest_anchor().id);
-                        }
-                        if last_selection.reversed {
-                            s.insert_range(next_selected_range.end..next_selected_range.start);
-                        } else {
-                            s.insert_range(next_selected_range);
-                        }
-                    });
-                } else {
-                    select_prev_state.done = true;
-                }
-            }
-
-            self.select_prev_state = Some(select_prev_state);
-        } else {
-            let mut only_carets = true;
-            let mut same_text_selected = true;
-            let mut selected_text = None;
-
-            let mut selections_iter = selections.iter().peekable();
-            while let Some(selection) = selections_iter.next() {
-                if selection.start != selection.end {
-                    only_carets = false;
-                }
-
-                if same_text_selected {
-                    if selected_text.is_none() {
-                        selected_text =
-                            Some(buffer.text_for_range(selection.range()).collect::<String>());
-                    }
-
-                    if let Some(next_selection) = selections_iter.peek() {
-                        if next_selection.range().len() == selection.range().len() {
-                            let next_selected_text = buffer
-                                .text_for_range(next_selection.range())
-                                .collect::<String>();
-                            if Some(next_selected_text) != selected_text {
-                                same_text_selected = false;
-                                selected_text = None;
-                            }
-                        } else {
-                            same_text_selected = false;
-                            selected_text = None;
-                        }
-                    }
-                }
-            }
-
-            if only_carets {
-                for selection in &mut selections {
-                    let word_range = movement::surrounding_word(
-                        &display_map,
-                        selection.start.to_display_point(&display_map),
-                    );
-                    selection.start = word_range.start.to_offset(&display_map, Bias::Left);
-                    selection.end = word_range.end.to_offset(&display_map, Bias::Left);
-                    selection.goal = SelectionGoal::None;
-                    selection.reversed = false;
-                }
-                if selections.len() == 1 {
-                    let selection = selections
-                        .last()
-                        .expect("ensured that there's only one selection");
-                    let query = buffer
-                        .text_for_range(selection.start..selection.end)
-                        .collect::<String>();
-                    let is_empty = query.is_empty();
-                    let select_state = SelectNextState {
-                        query: AhoCorasick::new(&[query.chars().rev().collect::<String>()])?,
-                        wordwise: true,
-                        done: is_empty,
-                    };
-                    self.select_prev_state = Some(select_state);
-                } else {
-                    self.select_prev_state = None;
-                }
-
-                self.unfold_ranges(
-                    &selections.iter().map(|s| s.range()).collect::<Vec<_>>(),
-                    false,
-                    true,
-                    cx,
-                );
-                self.change_selections(Some(Autoscroll::newest()), window, cx, |s| {
-                    s.select(selections);
-                });
-            } else if let Some(selected_text) = selected_text {
-                self.select_prev_state = Some(SelectNextState {
-                    query: AhoCorasick::new(&[selected_text.chars().rev().collect::<String>()])?,
-                    wordwise: false,
-                    done: false,
-                });
-                self.select_previous(action, window, cx)?;
-            }
-        }
-        Ok(())
-    }
-
-    pub fn find_next_match(
-        &mut self,
-        _: &FindNextMatch,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Result<()> {
-        let selections = self.selections.disjoint_anchors();
-        match selections.first() {
-            Some(first) if selections.len() >= 2 => {
-                self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-                    s.select_ranges([first.range()]);
-                });
-            }
-            _ => self.select_next(
-                &SelectNext {
-                    replace_newest: true,
-                },
-                window,
-                cx,
-            )?,
-        }
-        Ok(())
-    }
-
-    pub fn find_previous_match(
-        &mut self,
-        _: &FindPreviousMatch,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Result<()> {
-        let selections = self.selections.disjoint_anchors();
-        match selections.last() {
-            Some(last) if selections.len() >= 2 => {
-                self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-                    s.select_ranges([last.range()]);
-                });
-            }
-            _ => self.select_previous(
-                &SelectPrevious {
-                    replace_newest: true,
-                },
-                window,
-                cx,
-            )?,
-        }
-        Ok(())
-    }
-
-    pub fn toggle_comments(
-        &mut self,
-        action: &ToggleComments,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.read_only(cx) {
-            return;
-        }
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-        let text_layout_details = &self.text_layout_details(window);
-        self.transact(window, cx, |this, window, cx| {
-            let mut selections = this.selections.all::<MultiBufferPoint>(cx);
-            let mut edits = Vec::new();
-            let mut selection_edit_ranges = Vec::new();
-            let mut last_toggled_row = None;
-            let snapshot = this.buffer.read(cx).read(cx);
-            let empty_str: Arc<str> = Arc::default();
-            let mut suffixes_inserted = Vec::new();
-            let ignore_indent = action.ignore_indent;
-
-            fn comment_prefix_range(
-                snapshot: &MultiBufferSnapshot,
-                row: MultiBufferRow,
-                comment_prefix: &str,
-                comment_prefix_whitespace: &str,
-                ignore_indent: bool,
-            ) -> Range<Point> {
-                let indent_size = if ignore_indent {
-                    0
-                } else {
-                    snapshot.indent_size_for_line(row).len
-                };
-
-                let start = Point::new(row.0, indent_size);
-
-                let mut line_bytes = snapshot
-                    .bytes_in_range(start..snapshot.max_point())
-                    .flatten()
-                    .copied();
-
-                // If this line currently begins with the line comment prefix, then record
-                // the range containing the prefix.
-                if line_bytes
-                    .by_ref()
-                    .take(comment_prefix.len())
-                    .eq(comment_prefix.bytes())
-                {
-                    // Include any whitespace that matches the comment prefix.
-                    let matching_whitespace_len = line_bytes
-                        .zip(comment_prefix_whitespace.bytes())
-                        .take_while(|(a, b)| a == b)
-                        .count() as u32;
-                    let end = Point::new(
-                        start.row,
-                        start.column + comment_prefix.len() as u32 + matching_whitespace_len,
-                    );
-                    start..end
-                } else {
-                    start..start
-                }
-            }
-
-            fn comment_suffix_range(
-                snapshot: &MultiBufferSnapshot,
-                row: MultiBufferRow,
-                comment_suffix: &str,
-                comment_suffix_has_leading_space: bool,
-            ) -> Range<Point> {
-                let end = Point::new(row.0, snapshot.line_len(row));
-                let suffix_start_column = end.column.saturating_sub(comment_suffix.len() as u32);
-
-                let mut line_end_bytes = snapshot
-                    .bytes_in_range(Point::new(end.row, suffix_start_column.saturating_sub(1))..end)
-                    .flatten()
-                    .copied();
-
-                let leading_space_len = if suffix_start_column > 0
-                    && line_end_bytes.next() == Some(b' ')
-                    && comment_suffix_has_leading_space
-                {
-                    1
-                } else {
-                    0
-                };
-
-                // If this line currently begins with the line comment prefix, then record
-                // the range containing the prefix.
-                if line_end_bytes.by_ref().eq(comment_suffix.bytes()) {
-                    let start = Point::new(end.row, suffix_start_column - leading_space_len);
-                    start..end
-                } else {
-                    end..end
-                }
-            }
-
-            // TODO: Handle selections that cross excerpts
-            for selection in &mut selections {
-                let start_column = snapshot
-                    .indent_size_for_line(MultiBufferRow(selection.start.row))
-                    .len;
-                let language = if let Some(language) =
-                    snapshot.language_scope_at(Point::new(selection.start.row, start_column))
-                {
-                    language
-                } else {
-                    continue;
-                };
-
-                selection_edit_ranges.clear();
-
-                // If multiple selections contain a given row, avoid processing that
-                // row more than once.
-                let mut start_row = MultiBufferRow(selection.start.row);
-                if last_toggled_row == Some(start_row) {
-                    start_row = start_row.next_row();
-                }
-                let end_row =
-                    if selection.end.row > selection.start.row && selection.end.column == 0 {
-                        MultiBufferRow(selection.end.row - 1)
-                    } else {
-                        MultiBufferRow(selection.end.row)
-                    };
-                last_toggled_row = Some(end_row);
-
-                if start_row > end_row {
-                    continue;
-                }
-
-                // If the language has line comments, toggle those.
-                let mut full_comment_prefixes = language.line_comment_prefixes().to_vec();
-
-                // If ignore_indent is set, trim spaces from the right side of all full_comment_prefixes
-                if ignore_indent {
-                    full_comment_prefixes = full_comment_prefixes
-                        .into_iter()
-                        .map(|s| Arc::from(s.trim_end()))
-                        .collect();
-                }
-
-                if !full_comment_prefixes.is_empty() {
-                    let first_prefix = full_comment_prefixes
-                        .first()
-                        .expect("prefixes is non-empty");
-                    let prefix_trimmed_lengths = full_comment_prefixes
-                        .iter()
-                        .map(|p| p.trim_end_matches(' ').len())
-                        .collect::<SmallVec<[usize; 4]>>();
-
-                    let mut all_selection_lines_are_comments = true;
-
-                    for row in start_row.0..=end_row.0 {
-                        let row = MultiBufferRow(row);
-                        if start_row < end_row && snapshot.is_line_blank(row) {
-                            continue;
-                        }
-
-                        let prefix_range = full_comment_prefixes
-                            .iter()
-                            .zip(prefix_trimmed_lengths.iter().copied())
-                            .map(|(prefix, trimmed_prefix_len)| {
-                                comment_prefix_range(
-                                    snapshot.deref(),
-                                    row,
-                                    &prefix[..trimmed_prefix_len],
-                                    &prefix[trimmed_prefix_len..],
-                                    ignore_indent,
-                                )
-                            })
-                            .max_by_key(|range| range.end.column - range.start.column)
-                            .expect("prefixes is non-empty");
-
-                        if prefix_range.is_empty() {
-                            all_selection_lines_are_comments = false;
-                        }
-
-                        selection_edit_ranges.push(prefix_range);
-                    }
-
-                    if all_selection_lines_are_comments {
-                        edits.extend(
-                            selection_edit_ranges
-                                .iter()
-                                .cloned()
-                                .map(|range| (range, empty_str.clone())),
-                        );
-                    } else {
-                        let min_column = selection_edit_ranges
-                            .iter()
-                            .map(|range| range.start.column)
-                            .min()
-                            .unwrap_or(0);
-                        edits.extend(selection_edit_ranges.iter().map(|range| {
-                            let position = Point::new(range.start.row, min_column);
-                            (position..position, first_prefix.clone())
-                        }));
-                    }
-                } else if let Some((full_comment_prefix, comment_suffix)) =
-                    language.block_comment_delimiters()
-                {
-                    let comment_prefix = full_comment_prefix.trim_end_matches(' ');
-                    let comment_prefix_whitespace = &full_comment_prefix[comment_prefix.len()..];
-                    let prefix_range = comment_prefix_range(
-                        snapshot.deref(),
-                        start_row,
-                        comment_prefix,
-                        comment_prefix_whitespace,
-                        ignore_indent,
-                    );
-                    let suffix_range = comment_suffix_range(
-                        snapshot.deref(),
-                        end_row,
-                        comment_suffix.trim_start_matches(' '),
-                        comment_suffix.starts_with(' '),
-                    );
-
-                    if prefix_range.is_empty() || suffix_range.is_empty() {
-                        edits.push((
-                            prefix_range.start..prefix_range.start,
-                            full_comment_prefix.clone(),
-                        ));
-                        edits.push((suffix_range.end..suffix_range.end, comment_suffix.clone()));
-                        suffixes_inserted.push((end_row, comment_suffix.len()));
-                    } else {
-                        edits.push((prefix_range, empty_str.clone()));
-                        edits.push((suffix_range, empty_str.clone()));
-                    }
-                } else {
-                    continue;
-                }
-            }
-
-            drop(snapshot);
-            this.buffer.update(cx, |buffer, cx| {
-                buffer.edit(edits, None, cx);
-            });
-
-            // Adjust selections so that they end before any comment suffixes that
-            // were inserted.
-            let mut suffixes_inserted = suffixes_inserted.into_iter().peekable();
-            let mut selections = this.selections.all::<Point>(cx);
-            let snapshot = this.buffer.read(cx).read(cx);
-            for selection in &mut selections {
-                while let Some((row, suffix_len)) = suffixes_inserted.peek().copied() {
-                    match row.cmp(&MultiBufferRow(selection.end.row)) {
-                        Ordering::Less => {
-                            suffixes_inserted.next();
-                            continue;
-                        }
-                        Ordering::Greater => break,
-                        Ordering::Equal => {
-                            if selection.end.column == snapshot.line_len(row) {
-                                if selection.is_empty() {
-                                    selection.start.column -= suffix_len as u32;
-                                }
-                                selection.end.column -= suffix_len as u32;
-                            }
-                            break;
-                        }
-                    }
-                }
-            }
-
-            drop(snapshot);
-            this.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-                s.select(selections)
-            });
-
-            let selections = this.selections.all::<Point>(cx);
-            let selections_on_single_row = selections.windows(2).all(|selections| {
-                selections[0].start.row == selections[1].start.row
-                    && selections[0].end.row == selections[1].end.row
-                    && selections[0].start.row == selections[0].end.row
-            });
-            let selections_selecting = selections
-                .iter()
-                .any(|selection| selection.start != selection.end);
-            let advance_downwards = action.advance_downwards
-                && selections_on_single_row
-                && !selections_selecting
-                && !matches!(this.mode, EditorMode::SingleLine { .. });
-
-            if advance_downwards {
-                let snapshot = this.buffer.read(cx).snapshot(cx);
-
-                this.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-                    s.move_cursors_with(|display_snapshot, display_point, _| {
-                        let mut point = display_point.to_point(display_snapshot);
-                        point.row += 1;
-                        point = snapshot.clip_point(point, Bias::Left);
-                        let display_point = point.to_display_point(display_snapshot);
-                        let goal = SelectionGoal::HorizontalPosition(
-                            display_snapshot
-                                .x_for_display_point(display_point, text_layout_details)
-                                .into(),
-                        );
-                        (display_point, goal)
-                    })
-                });
-            }
-        });
-    }
-
-    pub fn select_enclosing_symbol(
-        &mut self,
-        _: &SelectEnclosingSymbol,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-
-        let buffer = self.buffer.read(cx).snapshot(cx);
-        let old_selections = self.selections.all::<usize>(cx).into_boxed_slice();
-
-        fn update_selection(
-            selection: &Selection<usize>,
-            buffer_snap: &MultiBufferSnapshot,
-        ) -> Option<Selection<usize>> {
-            let cursor = selection.head();
-            let (_buffer_id, symbols) = buffer_snap.symbols_containing(cursor, None)?;
-            for symbol in symbols.iter().rev() {
-                let start = symbol.range.start.to_offset(buffer_snap);
-                let end = symbol.range.end.to_offset(buffer_snap);
-                let new_range = start..end;
-                if start < selection.start || end > selection.end {
-                    return Some(Selection {
-                        id: selection.id,
-                        start: new_range.start,
-                        end: new_range.end,
-                        goal: SelectionGoal::None,
-                        reversed: selection.reversed,
-                    });
-                }
-            }
-            None
-        }
-
-        let mut selected_larger_symbol = false;
-        let new_selections = old_selections
-            .iter()
-            .map(|selection| match update_selection(selection, &buffer) {
-                Some(new_selection) => {
-                    if new_selection.range() != selection.range() {
-                        selected_larger_symbol = true;
-                    }
-                    new_selection
-                }
-                None => selection.clone(),
-            })
-            .collect::<Vec<_>>();
-
-        if selected_larger_symbol {
-            self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-                s.select(new_selections);
-            });
-        }
-    }
-
-    pub fn select_larger_syntax_node(
-        &mut self,
-        _: &SelectLargerSyntaxNode,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(visible_row_count) = self.visible_row_count() else {
-            return;
-        };
-        let old_selections: Box<[_]> = self.selections.all::<usize>(cx).into();
-        if old_selections.is_empty() {
-            return;
-        }
-
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-        let buffer = self.buffer.read(cx).snapshot(cx);
-
-        let mut selected_larger_node = false;
-        let mut new_selections = old_selections
-            .iter()
-            .map(|selection| {
-                let old_range = selection.start..selection.end;
-
-                if let Some((node, _)) = buffer.syntax_ancestor(old_range.clone()) {
-                    // manually select word at selection
-                    if ["string_content", "inline"].contains(&node.kind()) {
-                        let word_range = {
-                            let display_point = buffer
-                                .offset_to_point(old_range.start)
-                                .to_display_point(&display_map);
-                            let Range { start, end } =
-                                movement::surrounding_word(&display_map, display_point);
-                            start.to_point(&display_map).to_offset(&buffer)
-                                ..end.to_point(&display_map).to_offset(&buffer)
-                        };
-                        // ignore if word is already selected
-                        if !word_range.is_empty() && old_range != word_range {
-                            let last_word_range = {
-                                let display_point = buffer
-                                    .offset_to_point(old_range.end)
-                                    .to_display_point(&display_map);
-                                let Range { start, end } =
-                                    movement::surrounding_word(&display_map, display_point);
-                                start.to_point(&display_map).to_offset(&buffer)
-                                    ..end.to_point(&display_map).to_offset(&buffer)
-                            };
-                            // only select word if start and end point belongs to same word
-                            if word_range == last_word_range {
-                                selected_larger_node = true;
-                                return Selection {
-                                    id: selection.id,
-                                    start: word_range.start,
-                                    end: word_range.end,
-                                    goal: SelectionGoal::None,
-                                    reversed: selection.reversed,
-                                };
-                            }
-                        }
-                    }
-                }
-
-                let mut new_range = old_range.clone();
-                let mut new_node = None;
-                while let Some((node, containing_range)) = buffer.syntax_ancestor(new_range.clone())
-                {
-                    new_node = Some(node);
-                    new_range = match containing_range {
-                        MultiOrSingleBufferOffsetRange::Single(_) => break,
-                        MultiOrSingleBufferOffsetRange::Multi(range) => range,
-                    };
-                    if !display_map.intersects_fold(new_range.start)
-                        && !display_map.intersects_fold(new_range.end)
-                    {
-                        break;
-                    }
-                }
-
-                if let Some(node) = new_node {
-                    // Log the ancestor, to support using this action as a way to explore TreeSitter
-                    // nodes. Parent and grandparent are also logged because this operation will not
-                    // visit nodes that have the same range as their parent.
-                    log::info!("Node: {node:?}");
-                    let parent = node.parent();
-                    log::info!("Parent: {parent:?}");
-                    let grandparent = parent.and_then(|x| x.parent());
-                    log::info!("Grandparent: {grandparent:?}");
-                }
-
-                selected_larger_node |= new_range != old_range;
-                Selection {
-                    id: selection.id,
-                    start: new_range.start,
-                    end: new_range.end,
-                    goal: SelectionGoal::None,
-                    reversed: selection.reversed,
-                }
-            })
-            .collect::<Vec<_>>();
-
-        if !selected_larger_node {
-            return; // don't put this call in the history
-        }
-
-        // scroll based on transformation done to the last selection created by the user
-        let (last_old, last_new) = old_selections
-            .last()
-            .zip(new_selections.last().cloned())
-            .expect("old_selections isn't empty");
-
-        // revert selection
-        let is_selection_reversed = {
-            let should_newest_selection_be_reversed = last_old.start != last_new.start;
-            new_selections.last_mut().expect("checked above").reversed =
-                should_newest_selection_be_reversed;
-            should_newest_selection_be_reversed
-        };
-
-        if selected_larger_node {
-            self.select_syntax_node_history.disable_clearing = true;
-            self.change_selections(None, window, cx, |s| {
-                s.select(new_selections.clone());
-            });
-            self.select_syntax_node_history.disable_clearing = false;
-        }
-
-        let start_row = last_new.start.to_display_point(&display_map).row().0;
-        let end_row = last_new.end.to_display_point(&display_map).row().0;
-        let selection_height = end_row - start_row + 1;
-        let scroll_margin_rows = self.vertical_scroll_margin() as u32;
-
-        let fits_on_the_screen = visible_row_count >= selection_height + scroll_margin_rows * 2;
-        let scroll_behavior = if fits_on_the_screen {
-            self.request_autoscroll(Autoscroll::fit(), cx);
-            SelectSyntaxNodeScrollBehavior::FitSelection
-        } else if is_selection_reversed {
-            self.scroll_cursor_top(&ScrollCursorTop, window, cx);
-            SelectSyntaxNodeScrollBehavior::CursorTop
-        } else {
-            self.scroll_cursor_bottom(&ScrollCursorBottom, window, cx);
-            SelectSyntaxNodeScrollBehavior::CursorBottom
-        };
-
-        self.select_syntax_node_history.push((
-            old_selections,
-            scroll_behavior,
-            is_selection_reversed,
-        ));
-    }
-
-    pub fn select_smaller_syntax_node(
-        &mut self,
-        _: &SelectSmallerSyntaxNode,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-
-        if let Some((mut selections, scroll_behavior, is_selection_reversed)) =
-            self.select_syntax_node_history.pop()
-        {
-            if let Some(selection) = selections.last_mut() {
-                selection.reversed = is_selection_reversed;
-            }
-
-            self.select_syntax_node_history.disable_clearing = true;
-            self.change_selections(None, window, cx, |s| {
-                s.select(selections.to_vec());
-            });
-            self.select_syntax_node_history.disable_clearing = false;
-
-            match scroll_behavior {
-                SelectSyntaxNodeScrollBehavior::CursorTop => {
-                    self.scroll_cursor_top(&ScrollCursorTop, window, cx);
-                }
-                SelectSyntaxNodeScrollBehavior::FitSelection => {
-                    self.request_autoscroll(Autoscroll::fit(), cx);
-                }
-                SelectSyntaxNodeScrollBehavior::CursorBottom => {
-                    self.scroll_cursor_bottom(&ScrollCursorBottom, window, cx);
-                }
-            }
-        }
-    }
-
-    fn refresh_runnables(&mut self, window: &mut Window, cx: &mut Context<Self>) -> Task<()> {
-        if !EditorSettings::get_global(cx).gutter.runnables {
-            self.clear_tasks();
-            return Task::ready(());
-        }
-        let project = self.project.as_ref().map(Entity::downgrade);
-        let task_sources = self.lsp_task_sources(cx);
-        cx.spawn_in(window, async move |editor, cx| {
-            cx.background_executor().timer(UPDATE_DEBOUNCE).await;
-            let Some(project) = project.and_then(|p| p.upgrade()) else {
-                return;
-            };
-            let Ok(display_snapshot) = editor.update(cx, |this, cx| {
-                this.display_map.update(cx, |map, cx| map.snapshot(cx))
-            }) else {
-                return;
-            };
-
-            let hide_runnables = project
-                .update(cx, |project, cx| {
-                    // Do not display any test indicators in non-dev server remote projects.
-                    project.is_via_collab() && project.ssh_connection_string(cx).is_none()
-                })
-                .unwrap_or(true);
-            if hide_runnables {
-                return;
-            }
-            let new_rows =
-                cx.background_spawn({
-                    let snapshot = display_snapshot.clone();
-                    async move {
-                        Self::fetch_runnable_ranges(&snapshot, Anchor::min()..Anchor::max())
-                    }
-                })
-                    .await;
-            let Ok(lsp_tasks) =
-                cx.update(|_, cx| crate::lsp_tasks(project.clone(), &task_sources, None, cx))
-            else {
-                return;
-            };
-            let lsp_tasks = lsp_tasks.await;
-
-            let Ok(mut lsp_tasks_by_rows) = cx.update(|_, cx| {
-                lsp_tasks
-                    .into_iter()
-                    .flat_map(|(kind, tasks)| {
-                        tasks.into_iter().filter_map(move |(location, task)| {
-                            Some((kind.clone(), location?, task))
-                        })
-                    })
-                    .fold(HashMap::default(), |mut acc, (kind, location, task)| {
-                        let buffer = location.target.buffer;
-                        let buffer_snapshot = buffer.read(cx).snapshot();
-                        let offset = display_snapshot.buffer_snapshot.excerpts().find_map(
-                            |(excerpt_id, snapshot, _)| {
-                                if snapshot.remote_id() == buffer_snapshot.remote_id() {
-                                    display_snapshot
-                                        .buffer_snapshot
-                                        .anchor_in_excerpt(excerpt_id, location.target.range.start)
-                                } else {
-                                    None
-                                }
-                            },
-                        );
-                        if let Some(offset) = offset {
-                            let task_buffer_range =
-                                location.target.range.to_point(&buffer_snapshot);
-                            let context_buffer_range =
-                                task_buffer_range.to_offset(&buffer_snapshot);
-                            let context_range = BufferOffset(context_buffer_range.start)
-                                ..BufferOffset(context_buffer_range.end);
-
-                            acc.entry((buffer_snapshot.remote_id(), task_buffer_range.start.row))
-                                .or_insert_with(|| RunnableTasks {
-                                    templates: Vec::new(),
-                                    offset,
-                                    column: task_buffer_range.start.column,
-                                    extra_variables: HashMap::default(),
-                                    context_range,
-                                })
-                                .templates
-                                .push((kind, task.original_task().clone()));
-                        }
-
-                        acc
-                    })
-            }) else {
-                return;
-            };
-
-            let rows = Self::runnable_rows(project, display_snapshot, new_rows, cx.clone());
-            editor
-                .update(cx, |editor, _| {
-                    editor.clear_tasks();
-                    for (key, mut value) in rows {
-                        if let Some(lsp_tasks) = lsp_tasks_by_rows.remove(&key) {
-                            value.templates.extend(lsp_tasks.templates);
-                        }
-
-                        editor.insert_tasks(key, value);
-                    }
-                    for (key, value) in lsp_tasks_by_rows {
-                        editor.insert_tasks(key, value);
-                    }
-                })
-                .ok();
-        })
-    }
-    fn fetch_runnable_ranges(
-        snapshot: &DisplaySnapshot,
-        range: Range<Anchor>,
-    ) -> Vec<language::RunnableRange> {
-        snapshot.buffer_snapshot.runnable_ranges(range).collect()
-    }
-
-    fn runnable_rows(
-        project: Entity<Project>,
-        snapshot: DisplaySnapshot,
-        runnable_ranges: Vec<RunnableRange>,
-        mut cx: AsyncWindowContext,
-    ) -> Vec<((BufferId, BufferRow), RunnableTasks)> {
-        runnable_ranges
-            .into_iter()
-            .filter_map(|mut runnable| {
-                let tasks = cx
-                    .update(|_, cx| Self::templates_with_tags(&project, &mut runnable.runnable, cx))
-                    .ok()?;
-                if tasks.is_empty() {
-                    return None;
-                }
-
-                let point = runnable.run_range.start.to_point(&snapshot.buffer_snapshot);
-
-                let row = snapshot
-                    .buffer_snapshot
-                    .buffer_line_for_row(MultiBufferRow(point.row))?
-                    .1
-                    .start
-                    .row;
-
-                let context_range =
-                    BufferOffset(runnable.full_range.start)..BufferOffset(runnable.full_range.end);
-                Some((
-                    (runnable.buffer_id, row),
-                    RunnableTasks {
-                        templates: tasks,
-                        offset: snapshot
-                            .buffer_snapshot
-                            .anchor_before(runnable.run_range.start),
-                        context_range,
-                        column: point.column,
-                        extra_variables: runnable.extra_captures,
-                    },
-                ))
-            })
-            .collect()
-    }
-
-    fn templates_with_tags(
-        project: &Entity<Project>,
-        runnable: &mut Runnable,
-        cx: &mut App,
-    ) -> Vec<(TaskSourceKind, TaskTemplate)> {
-        let (inventory, worktree_id, file) = project.read_with(cx, |project, cx| {
-            let (worktree_id, file) = project
-                .buffer_for_id(runnable.buffer, cx)
-                .and_then(|buffer| buffer.read(cx).file())
-                .map(|file| (file.worktree_id(cx), file.clone()))
-                .unzip();
-
-            (
-                project.task_store().read(cx).task_inventory().cloned(),
-                worktree_id,
-                file,
-            )
-        });
-
-        let mut templates_with_tags = mem::take(&mut runnable.tags)
-            .into_iter()
-            .flat_map(|RunnableTag(tag)| {
-                inventory
-                    .as_ref()
-                    .into_iter()
-                    .flat_map(|inventory| {
-                        inventory.read(cx).list_tasks(
-                            file.clone(),
-                            Some(runnable.language.clone()),
-                            worktree_id,
-                            cx,
-                        )
-                    })
-                    .filter(move |(_, template)| {
-                        template.tags.iter().any(|source_tag| source_tag == &tag)
-                    })
-            })
-            .sorted_by_key(|(kind, _)| kind.to_owned())
-            .collect::<Vec<_>>();
-        if let Some((leading_tag_source, _)) = templates_with_tags.first() {
-            // Strongest source wins; if we have worktree tag binding, prefer that to
-            // global and language bindings;
-            // if we have a global binding, prefer that to language binding.
-            let first_mismatch = templates_with_tags
-                .iter()
-                .position(|(tag_source, _)| tag_source != leading_tag_source);
-            if let Some(index) = first_mismatch {
-                templates_with_tags.truncate(index);
-            }
-        }
-
-        templates_with_tags
-    }
-
-    pub fn move_to_enclosing_bracket(
-        &mut self,
-        _: &MoveToEnclosingBracket,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.move_offsets_with(|snapshot, selection| {
-                let Some(enclosing_bracket_ranges) =
-                    snapshot.enclosing_bracket_ranges(selection.start..selection.end)
-                else {
-                    return;
-                };
-
-                let mut best_length = usize::MAX;
-                let mut best_inside = false;
-                let mut best_in_bracket_range = false;
-                let mut best_destination = None;
-                for (open, close) in enclosing_bracket_ranges {
-                    let close = close.to_inclusive();
-                    let length = close.end() - open.start;
-                    let inside = selection.start >= open.end && selection.end <= *close.start();
-                    let in_bracket_range = open.to_inclusive().contains(&selection.head())
-                        || close.contains(&selection.head());
-
-                    // If best is next to a bracket and current isn't, skip
-                    if !in_bracket_range && best_in_bracket_range {
-                        continue;
-                    }
-
-                    // Prefer smaller lengths unless best is inside and current isn't
-                    if length > best_length && (best_inside || !inside) {
-                        continue;
-                    }
-
-                    best_length = length;
-                    best_inside = inside;
-                    best_in_bracket_range = in_bracket_range;
-                    best_destination = Some(
-                        if close.contains(&selection.start) && close.contains(&selection.end) {
-                            if inside { open.end } else { open.start }
-                        } else if inside {
-                            *close.start()
-                        } else {
-                            *close.end()
-                        },
-                    );
-                }
-
-                if let Some(destination) = best_destination {
-                    selection.collapse_to(destination, SelectionGoal::None);
-                }
-            })
-        });
-    }
-
-    pub fn undo_selection(
-        &mut self,
-        _: &UndoSelection,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-        self.end_selection(window, cx);
-        self.selection_history.mode = SelectionHistoryMode::Undoing;
-        if let Some(entry) = self.selection_history.undo_stack.pop_back() {
-            self.change_selections(None, window, cx, |s| {
-                s.select_anchors(entry.selections.to_vec())
-            });
-            self.select_next_state = entry.select_next_state;
-            self.select_prev_state = entry.select_prev_state;
-            self.add_selections_state = entry.add_selections_state;
-            self.request_autoscroll(Autoscroll::newest(), cx);
-        }
-        self.selection_history.mode = SelectionHistoryMode::Normal;
-    }
-
-    pub fn redo_selection(
-        &mut self,
-        _: &RedoSelection,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-        self.end_selection(window, cx);
-        self.selection_history.mode = SelectionHistoryMode::Redoing;
-        if let Some(entry) = self.selection_history.redo_stack.pop_back() {
-            self.change_selections(None, window, cx, |s| {
-                s.select_anchors(entry.selections.to_vec())
-            });
-            self.select_next_state = entry.select_next_state;
-            self.select_prev_state = entry.select_prev_state;
-            self.add_selections_state = entry.add_selections_state;
-            self.request_autoscroll(Autoscroll::newest(), cx);
-        }
-        self.selection_history.mode = SelectionHistoryMode::Normal;
-    }
-
-    pub fn expand_excerpts(
-        &mut self,
-        action: &ExpandExcerpts,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.expand_excerpts_for_direction(action.lines, ExpandExcerptDirection::UpAndDown, cx)
-    }
-
-    pub fn expand_excerpts_down(
-        &mut self,
-        action: &ExpandExcerptsDown,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.expand_excerpts_for_direction(action.lines, ExpandExcerptDirection::Down, cx)
-    }
-
-    pub fn expand_excerpts_up(
-        &mut self,
-        action: &ExpandExcerptsUp,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.expand_excerpts_for_direction(action.lines, ExpandExcerptDirection::Up, cx)
-    }
-
-    pub fn expand_excerpts_for_direction(
-        &mut self,
-        lines: u32,
-        direction: ExpandExcerptDirection,
-
-        cx: &mut Context<Self>,
-    ) {
-        let selections = self.selections.disjoint_anchors();
-
-        let lines = if lines == 0 {
-            EditorSettings::get_global(cx).expand_excerpt_lines
-        } else {
-            lines
-        };
-
-        self.buffer.update(cx, |buffer, cx| {
-            let snapshot = buffer.snapshot(cx);
-            let mut excerpt_ids = selections
-                .iter()
-                .flat_map(|selection| snapshot.excerpt_ids_for_range(selection.range()))
-                .collect::<Vec<_>>();
-            excerpt_ids.sort();
-            excerpt_ids.dedup();
-            buffer.expand_excerpts(excerpt_ids, lines, direction, cx)
-        })
-    }
-
-    pub fn expand_excerpt(
-        &mut self,
-        excerpt: ExcerptId,
-        direction: ExpandExcerptDirection,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let current_scroll_position = self.scroll_position(cx);
-        let lines_to_expand = EditorSettings::get_global(cx).expand_excerpt_lines;
-        let mut should_scroll_up = false;
-
-        if direction == ExpandExcerptDirection::Down {
-            let multi_buffer = self.buffer.read(cx);
-            let snapshot = multi_buffer.snapshot(cx);
-            if let Some(buffer_id) = snapshot.buffer_id_for_excerpt(excerpt) {
-                if let Some(buffer) = multi_buffer.buffer(buffer_id) {
-                    if let Some(excerpt_range) = snapshot.buffer_range_for_excerpt(excerpt) {
-                        let buffer_snapshot = buffer.read(cx).snapshot();
-                        let excerpt_end_row =
-                            Point::from_anchor(&excerpt_range.end, &buffer_snapshot).row;
-                        let last_row = buffer_snapshot.max_point().row;
-                        let lines_below = last_row.saturating_sub(excerpt_end_row);
-                        should_scroll_up = lines_below >= lines_to_expand;
-                    }
-                }
-            }
-        }
-
-        self.buffer.update(cx, |buffer, cx| {
-            buffer.expand_excerpts([excerpt], lines_to_expand, direction, cx)
-        });
-
-        if should_scroll_up {
-            let new_scroll_position =
-                current_scroll_position + gpui::Point::new(0.0, lines_to_expand as f32);
-            self.set_scroll_position(new_scroll_position, window, cx);
-        }
-    }
-
-    pub fn go_to_singleton_buffer_point(
-        &mut self,
-        point: Point,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.go_to_singleton_buffer_range(point..point, window, cx);
-    }
-
-    pub fn go_to_singleton_buffer_range(
-        &mut self,
-        range: Range<Point>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let multibuffer = self.buffer().read(cx);
-        let Some(buffer) = multibuffer.as_singleton() else {
-            return;
-        };
-        let Some(start) = multibuffer.buffer_point_to_anchor(&buffer, range.start, cx) else {
-            return;
-        };
-        let Some(end) = multibuffer.buffer_point_to_anchor(&buffer, range.end, cx) else {
-            return;
-        };
-        self.change_selections(Some(Autoscroll::center()), window, cx, |s| {
-            s.select_anchor_ranges([start..end])
-        });
-    }
-
-    pub fn go_to_diagnostic(
-        &mut self,
-        _: &GoToDiagnostic,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-        self.go_to_diagnostic_impl(Direction::Next, window, cx)
-    }
-
-    pub fn go_to_prev_diagnostic(
-        &mut self,
-        _: &GoToPreviousDiagnostic,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-        self.go_to_diagnostic_impl(Direction::Prev, window, cx)
-    }
-
-    pub fn go_to_diagnostic_impl(
-        &mut self,
-        direction: Direction,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let buffer = self.buffer.read(cx).snapshot(cx);
-        let selection = self.selections.newest::<usize>(cx);
-
-        let mut active_group_id = None;
-        if let ActiveDiagnostic::Group(active_group) = &self.active_diagnostics {
-            if active_group.active_range.start.to_offset(&buffer) == selection.start {
-                active_group_id = Some(active_group.group_id);
-            }
-        }
-
-        fn filtered(
-            snapshot: EditorSnapshot,
-            diagnostics: impl Iterator<Item = DiagnosticEntry<usize>>,
-        ) -> impl Iterator<Item = DiagnosticEntry<usize>> {
-            diagnostics
-                .filter(|entry| entry.range.start != entry.range.end)
-                .filter(|entry| !entry.diagnostic.is_unnecessary)
-                .filter(move |entry| !snapshot.intersects_fold(entry.range.start))
-        }
-
-        let snapshot = self.snapshot(window, cx);
-        let before = filtered(
-            snapshot.clone(),
-            buffer
-                .diagnostics_in_range(0..selection.start)
-                .filter(|entry| entry.range.start <= selection.start),
-        );
-        let after = filtered(
-            snapshot,
-            buffer
-                .diagnostics_in_range(selection.start..buffer.len())
-                .filter(|entry| entry.range.start >= selection.start),
-        );
-
-        let mut found: Option<DiagnosticEntry<usize>> = None;
-        if direction == Direction::Prev {
-            'outer: for prev_diagnostics in [before.collect::<Vec<_>>(), after.collect::<Vec<_>>()]
-            {
-                for diagnostic in prev_diagnostics.into_iter().rev() {
-                    if diagnostic.range.start != selection.start
-                        || active_group_id
-                            .is_some_and(|active| diagnostic.diagnostic.group_id < active)
-                    {
-                        found = Some(diagnostic);
-                        break 'outer;
-                    }
-                }
-            }
-        } else {
-            for diagnostic in after.chain(before) {
-                if diagnostic.range.start != selection.start
-                    || active_group_id.is_some_and(|active| diagnostic.diagnostic.group_id > active)
-                {
-                    found = Some(diagnostic);
-                    break;
-                }
-            }
-        }
-        let Some(next_diagnostic) = found else {
-            return;
-        };
-
-        let Some(buffer_id) = buffer.anchor_after(next_diagnostic.range.start).buffer_id else {
-            return;
-        };
-        self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-            s.select_ranges(vec![
-                next_diagnostic.range.start..next_diagnostic.range.start,
-            ])
-        });
-        self.activate_diagnostics(buffer_id, next_diagnostic, window, cx);
-        self.refresh_inline_completion(false, true, window, cx);
-    }
-
-    fn go_to_next_hunk(&mut self, _: &GoToHunk, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-        let snapshot = self.snapshot(window, cx);
-        let selection = self.selections.newest::<Point>(cx);
-        self.go_to_hunk_before_or_after_position(
-            &snapshot,
-            selection.head(),
-            Direction::Next,
-            window,
-            cx,
-        );
-    }
-
-    pub fn go_to_hunk_before_or_after_position(
-        &mut self,
-        snapshot: &EditorSnapshot,
-        position: Point,
-        direction: Direction,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) {
-        let row = if direction == Direction::Next {
-            self.hunk_after_position(snapshot, position)
-                .map(|hunk| hunk.row_range.start)
-        } else {
-            self.hunk_before_position(snapshot, position)
-        };
-
-        if let Some(row) = row {
-            let destination = Point::new(row.0, 0);
-            let autoscroll = Autoscroll::center();
-
-            self.unfold_ranges(&[destination..destination], false, false, cx);
-            self.change_selections(Some(autoscroll), window, cx, |s| {
-                s.select_ranges([destination..destination]);
-            });
-        }
-    }
-
-    fn hunk_after_position(
-        &mut self,
-        snapshot: &EditorSnapshot,
-        position: Point,
-    ) -> Option<MultiBufferDiffHunk> {
-        snapshot
-            .buffer_snapshot
-            .diff_hunks_in_range(position..snapshot.buffer_snapshot.max_point())
-            .find(|hunk| hunk.row_range.start.0 > position.row)
-            .or_else(|| {
-                snapshot
-                    .buffer_snapshot
-                    .diff_hunks_in_range(Point::zero()..position)
-                    .find(|hunk| hunk.row_range.end.0 < position.row)
-            })
-    }
-
-    fn go_to_prev_hunk(
-        &mut self,
-        _: &GoToPreviousHunk,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
-        let snapshot = self.snapshot(window, cx);
-        let selection = self.selections.newest::<Point>(cx);
-        self.go_to_hunk_before_or_after_position(
-            &snapshot,
-            selection.head(),
-            Direction::Prev,
-            window,
-            cx,
-        );
-    }
-
-    fn hunk_before_position(
-        &mut self,
-        snapshot: &EditorSnapshot,
-        position: Point,
-    ) -> Option<MultiBufferRow> {
-        snapshot
-            .buffer_snapshot
-            .diff_hunk_before(position)
-            .or_else(|| snapshot.buffer_snapshot.diff_hunk_before(Point::MAX))
-    }
-
-    fn go_to_next_change(
-        &mut self,
-        _: &GoToNextChange,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(selections) = self
-            .change_list
-            .next_change(1, Direction::Next)
-            .map(|s| s.to_vec())
-        {
-            self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-                let map = s.display_map();
-                s.select_display_ranges(selections.iter().map(|a| {
-                    let point = a.to_display_point(&map);
-                    point..point
-                }))
-            })
-        }
-    }
-
-    fn go_to_previous_change(
-        &mut self,
-        _: &GoToPreviousChange,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(selections) = self
-            .change_list
-            .next_change(1, Direction::Prev)
-            .map(|s| s.to_vec())
-        {
-            self.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-                let map = s.display_map();
-                s.select_display_ranges(selections.iter().map(|a| {
-                    let point = a.to_display_point(&map);
-                    point..point
-                }))
-            })
-        }
-    }
-
-    fn go_to_line<T: 'static>(
-        &mut self,
-        position: Anchor,
-        highlight_color: Option<Hsla>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let snapshot = self.snapshot(window, cx).display_snapshot;
-        let position = position.to_point(&snapshot.buffer_snapshot);
-        let start = snapshot
-            .buffer_snapshot
-            .clip_point(Point::new(position.row, 0), Bias::Left);
-        let end = start + Point::new(1, 0);
-        let start = snapshot.buffer_snapshot.anchor_before(start);
-        let end = snapshot.buffer_snapshot.anchor_before(end);
-
-        self.highlight_rows::<T>(
-            start..end,
-            highlight_color
-                .unwrap_or_else(|| cx.theme().colors().editor_highlighted_line_background),
-            Default::default(),
-            cx,
-        );
-        self.request_autoscroll(Autoscroll::center().for_anchor(start), cx);
-    }
-
-    pub fn go_to_definition(
-        &mut self,
-        _: &GoToDefinition,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Navigated>> {
-        let definition =
-            self.go_to_definition_of_kind(GotoDefinitionKind::Symbol, false, window, cx);
-        let fallback_strategy = EditorSettings::get_global(cx).go_to_definition_fallback;
-        cx.spawn_in(window, async move |editor, cx| {
-            if definition.await? == Navigated::Yes {
-                return Ok(Navigated::Yes);
-            }
-            match fallback_strategy {
-                GoToDefinitionFallback::None => Ok(Navigated::No),
-                GoToDefinitionFallback::FindAllReferences => {
-                    match editor.update_in(cx, |editor, window, cx| {
-                        editor.find_all_references(&FindAllReferences, window, cx)
-                    })? {
-                        Some(references) => references.await,
-                        None => Ok(Navigated::No),
-                    }
-                }
-            }
-        })
-    }
-
-    pub fn go_to_declaration(
-        &mut self,
-        _: &GoToDeclaration,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Navigated>> {
-        self.go_to_definition_of_kind(GotoDefinitionKind::Declaration, false, window, cx)
-    }
-
-    pub fn go_to_declaration_split(
-        &mut self,
-        _: &GoToDeclaration,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Navigated>> {
-        self.go_to_definition_of_kind(GotoDefinitionKind::Declaration, true, window, cx)
-    }
-
-    pub fn go_to_implementation(
-        &mut self,
-        _: &GoToImplementation,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Navigated>> {
-        self.go_to_definition_of_kind(GotoDefinitionKind::Implementation, false, window, cx)
-    }
-
-    pub fn go_to_implementation_split(
-        &mut self,
-        _: &GoToImplementationSplit,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Navigated>> {
-        self.go_to_definition_of_kind(GotoDefinitionKind::Implementation, true, window, cx)
-    }
-
-    pub fn go_to_type_definition(
-        &mut self,
-        _: &GoToTypeDefinition,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Navigated>> {
-        self.go_to_definition_of_kind(GotoDefinitionKind::Type, false, window, cx)
-    }
-
-    pub fn go_to_definition_split(
-        &mut self,
-        _: &GoToDefinitionSplit,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Navigated>> {
-        self.go_to_definition_of_kind(GotoDefinitionKind::Symbol, true, window, cx)
-    }
-
-    pub fn go_to_type_definition_split(
-        &mut self,
-        _: &GoToTypeDefinitionSplit,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Navigated>> {
-        self.go_to_definition_of_kind(GotoDefinitionKind::Type, true, window, cx)
-    }
-
-    fn go_to_definition_of_kind(
-        &mut self,
-        kind: GotoDefinitionKind,
-        split: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Navigated>> {
-        let Some(provider) = self.semantics_provider.clone() else {
-            return Task::ready(Ok(Navigated::No));
-        };
-        let head = self.selections.newest::<usize>(cx).head();
-        let buffer = self.buffer.read(cx);
-        let (buffer, head) = if let Some(text_anchor) = buffer.text_anchor_for_position(head, cx) {
-            text_anchor
-        } else {
-            return Task::ready(Ok(Navigated::No));
-        };
-
-        let Some(definitions) = provider.definitions(&buffer, head, kind, cx) else {
-            return Task::ready(Ok(Navigated::No));
-        };
-
-        cx.spawn_in(window, async move |editor, cx| {
-            let definitions = definitions.await?;
-            let navigated = editor
-                .update_in(cx, |editor, window, cx| {
-                    editor.navigate_to_hover_links(
-                        Some(kind),
-                        definitions
-                            .into_iter()
-                            .filter(|location| {
-                                hover_links::exclude_link_to_position(&buffer, &head, location, cx)
-                            })
-                            .map(HoverLink::Text)
-                            .collect::<Vec<_>>(),
-                        split,
-                        window,
-                        cx,
-                    )
-                })?
-                .await?;
-            anyhow::Ok(navigated)
-        })
-    }
-
-    pub fn open_url(&mut self, _: &OpenUrl, window: &mut Window, cx: &mut Context<Self>) {
-        let selection = self.selections.newest_anchor();
-        let head = selection.head();
-        let tail = selection.tail();
-
-        let Some((buffer, start_position)) =
-            self.buffer.read(cx).text_anchor_for_position(head, cx)
-        else {
-            return;
-        };
-
-        let end_position = if head != tail {
-            let Some((_, pos)) = self.buffer.read(cx).text_anchor_for_position(tail, cx) else {
-                return;
-            };
-            Some(pos)
-        } else {
-            None
-        };
-
-        let url_finder = cx.spawn_in(window, async move |editor, cx| {
-            let url = if let Some(end_pos) = end_position {
-                find_url_from_range(&buffer, start_position..end_pos, cx.clone())
-            } else {
-                find_url(&buffer, start_position, cx.clone()).map(|(_, url)| url)
-            };
-
-            if let Some(url) = url {
-                editor.update(cx, |_, cx| {
-                    cx.open_url(&url);
-                })
-            } else {
-                Ok(())
-            }
-        });
-
-        url_finder.detach();
-    }
-
-    pub fn open_selected_filename(
-        &mut self,
-        _: &OpenSelectedFilename,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(workspace) = self.workspace() else {
-            return;
-        };
-
-        let position = self.selections.newest_anchor().head();
-
-        let Some((buffer, buffer_position)) =
-            self.buffer.read(cx).text_anchor_for_position(position, cx)
-        else {
-            return;
-        };
-
-        let project = self.project.clone();
-
-        cx.spawn_in(window, async move |_, cx| {
-            let result = find_file(&buffer, project, buffer_position, cx).await;
-
-            if let Some((_, path)) = result {
-                workspace
-                    .update_in(cx, |workspace, window, cx| {
-                        workspace.open_resolved_path(path, window, cx)
-                    })?
-                    .await?;
-            }
-            anyhow::Ok(())
-        })
-        .detach();
-    }
-
-    pub(crate) fn navigate_to_hover_links(
-        &mut self,
-        kind: Option<GotoDefinitionKind>,
-        mut definitions: Vec<HoverLink>,
-        split: bool,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) -> Task<Result<Navigated>> {
-        // If there is one definition, just open it directly
-        if definitions.len() == 1 {
-            let definition = definitions.pop().unwrap();
-
-            enum TargetTaskResult {
-                Location(Option<Location>),
-                AlreadyNavigated,
-            }
-
-            let target_task = match definition {
-                HoverLink::Text(link) => {
-                    Task::ready(anyhow::Ok(TargetTaskResult::Location(Some(link.target))))
-                }
-                HoverLink::InlayHint(lsp_location, server_id) => {
-                    let computation =
-                        self.compute_target_location(lsp_location, server_id, window, cx);
-                    cx.background_spawn(async move {
-                        let location = computation.await?;
-                        Ok(TargetTaskResult::Location(location))
-                    })
-                }
-                HoverLink::Url(url) => {
-                    cx.open_url(&url);
-                    Task::ready(Ok(TargetTaskResult::AlreadyNavigated))
-                }
-                HoverLink::File(path) => {
-                    if let Some(workspace) = self.workspace() {
-                        cx.spawn_in(window, async move |_, cx| {
-                            workspace
-                                .update_in(cx, |workspace, window, cx| {
-                                    workspace.open_resolved_path(path, window, cx)
-                                })?
-                                .await
-                                .map(|_| TargetTaskResult::AlreadyNavigated)
-                        })
-                    } else {
-                        Task::ready(Ok(TargetTaskResult::Location(None)))
-                    }
-                }
-            };
-            cx.spawn_in(window, async move |editor, cx| {
-                let target = match target_task.await.context("target resolution task")? {
-                    TargetTaskResult::AlreadyNavigated => return Ok(Navigated::Yes),
-                    TargetTaskResult::Location(None) => return Ok(Navigated::No),
-                    TargetTaskResult::Location(Some(target)) => target,
-                };
-
-                editor.update_in(cx, |editor, window, cx| {
-                    let Some(workspace) = editor.workspace() else {
-                        return Navigated::No;
-                    };
-                    let pane = workspace.read(cx).active_pane().clone();
-
-                    let range = target.range.to_point(target.buffer.read(cx));
-                    let range = editor.range_for_match(&range);
-                    let range = collapse_multiline_range(range);
-
-                    if !split
-                        && Some(&target.buffer) == editor.buffer.read(cx).as_singleton().as_ref()
-                    {
-                        editor.go_to_singleton_buffer_range(range.clone(), window, cx);
-                    } else {
-                        window.defer(cx, move |window, cx| {
-                            let target_editor: Entity<Self> =
-                                workspace.update(cx, |workspace, cx| {
-                                    let pane = if split {
-                                        workspace.adjacent_pane(window, cx)
-                                    } else {
-                                        workspace.active_pane().clone()
-                                    };
-
-                                    workspace.open_project_item(
-                                        pane,
-                                        target.buffer.clone(),
-                                        true,
-                                        true,
-                                        window,
-                                        cx,
-                                    )
-                                });
-                            target_editor.update(cx, |target_editor, cx| {
-                                // When selecting a definition in a different buffer, disable the nav history
-                                // to avoid creating a history entry at the previous cursor location.
-                                pane.update(cx, |pane, _| pane.disable_history());
-                                target_editor.go_to_singleton_buffer_range(range, window, cx);
-                                pane.update(cx, |pane, _| pane.enable_history());
-                            });
-                        });
-                    }
-                    Navigated::Yes
-                })
-            })
-        } else if !definitions.is_empty() {
-            cx.spawn_in(window, async move |editor, cx| {
-                let (title, location_tasks, workspace) = editor
-                    .update_in(cx, |editor, window, cx| {
-                        let tab_kind = match kind {
-                            Some(GotoDefinitionKind::Implementation) => "Implementations",
-                            _ => "Definitions",
-                        };
-                        let title = definitions
-                            .iter()
-                            .find_map(|definition| match definition {
-                                HoverLink::Text(link) => link.origin.as_ref().map(|origin| {
-                                    let buffer = origin.buffer.read(cx);
-                                    format!(
-                                        "{} for {}",
-                                        tab_kind,
-                                        buffer
-                                            .text_for_range(origin.range.clone())
-                                            .collect::<String>()
-                                    )
-                                }),
-                                HoverLink::InlayHint(_, _) => None,
-                                HoverLink::Url(_) => None,
-                                HoverLink::File(_) => None,
-                            })
-                            .unwrap_or(tab_kind.to_string());
-                        let location_tasks = definitions
-                            .into_iter()
-                            .map(|definition| match definition {
-                                HoverLink::Text(link) => Task::ready(Ok(Some(link.target))),
-                                HoverLink::InlayHint(lsp_location, server_id) => editor
-                                    .compute_target_location(lsp_location, server_id, window, cx),
-                                HoverLink::Url(_) => Task::ready(Ok(None)),
-                                HoverLink::File(_) => Task::ready(Ok(None)),
-                            })
-                            .collect::<Vec<_>>();
-                        (title, location_tasks, editor.workspace().clone())
-                    })
-                    .context("location tasks preparation")?;
-
-                let locations = future::join_all(location_tasks)
-                    .await
-                    .into_iter()
-                    .filter_map(|location| location.transpose())
-                    .collect::<Result<_>>()
-                    .context("location tasks")?;
-
-                let Some(workspace) = workspace else {
-                    return Ok(Navigated::No);
-                };
-                let opened = workspace
-                    .update_in(cx, |workspace, window, cx| {
-                        Self::open_locations_in_multibuffer(
-                            workspace,
-                            locations,
-                            title,
-                            split,
-                            MultibufferSelectionMode::First,
-                            window,
-                            cx,
-                        )
-                    })
-                    .ok();
-
-                anyhow::Ok(Navigated::from_bool(opened.is_some()))
-            })
-        } else {
-            Task::ready(Ok(Navigated::No))
-        }
-    }
-
-    fn compute_target_location(
-        &self,
-        lsp_location: lsp::Location,
-        server_id: LanguageServerId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<anyhow::Result<Option<Location>>> {
-        let Some(project) = self.project.clone() else {
-            return Task::ready(Ok(None));
-        };
-
-        cx.spawn_in(window, async move |editor, cx| {
-            let location_task = editor.update(cx, |_, cx| {
-                project.update(cx, |project, cx| {
-                    let language_server_name = project
-                        .language_server_statuses(cx)
-                        .find(|(id, _)| server_id == *id)
-                        .map(|(_, status)| LanguageServerName::from(status.name.as_str()));
-                    language_server_name.map(|language_server_name| {
-                        project.open_local_buffer_via_lsp(
-                            lsp_location.uri.clone(),
-                            server_id,
-                            language_server_name,
-                            cx,
-                        )
-                    })
-                })
-            })?;
-            let location = match location_task {
-                Some(task) => Some({
-                    let target_buffer_handle = task.await.context("open local buffer")?;
-                    let range = target_buffer_handle.update(cx, |target_buffer, _| {
-                        let target_start = target_buffer
-                            .clip_point_utf16(point_from_lsp(lsp_location.range.start), Bias::Left);
-                        let target_end = target_buffer
-                            .clip_point_utf16(point_from_lsp(lsp_location.range.end), Bias::Left);
-                        target_buffer.anchor_after(target_start)
-                            ..target_buffer.anchor_before(target_end)
-                    })?;
-                    Location {
-                        buffer: target_buffer_handle,
-                        range,
-                    }
-                }),
-                None => None,
-            };
-            Ok(location)
-        })
-    }
-
-    pub fn find_all_references(
-        &mut self,
-        _: &FindAllReferences,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Task<Result<Navigated>>> {
-        let selection = self.selections.newest::<usize>(cx);
-        let multi_buffer = self.buffer.read(cx);
-        let head = selection.head();
-
-        let multi_buffer_snapshot = multi_buffer.snapshot(cx);
-        let head_anchor = multi_buffer_snapshot.anchor_at(
-            head,
-            if head < selection.tail() {
-                Bias::Right
-            } else {
-                Bias::Left
-            },
-        );
-
-        match self
-            .find_all_references_task_sources
-            .binary_search_by(|anchor| anchor.cmp(&head_anchor, &multi_buffer_snapshot))
-        {
-            Ok(_) => {
-                log::info!(
-                    "Ignoring repeated FindAllReferences invocation with the position of already running task"
-                );
-                return None;
-            }
-            Err(i) => {
-                self.find_all_references_task_sources.insert(i, head_anchor);
-            }
-        }
-
-        let (buffer, head) = multi_buffer.text_anchor_for_position(head, cx)?;
-        let workspace = self.workspace()?;
-        let project = workspace.read(cx).project().clone();
-        let references = project.update(cx, |project, cx| project.references(&buffer, head, cx));
-        Some(cx.spawn_in(window, async move |editor, cx| {
-            let _cleanup = cx.on_drop(&editor, move |editor, _| {
-                if let Ok(i) = editor
-                    .find_all_references_task_sources
-                    .binary_search_by(|anchor| anchor.cmp(&head_anchor, &multi_buffer_snapshot))
-                {
-                    editor.find_all_references_task_sources.remove(i);
-                }
-            });
-
-            let locations = references.await?;
-            if locations.is_empty() {
-                return anyhow::Ok(Navigated::No);
-            }
-
-            workspace.update_in(cx, |workspace, window, cx| {
-                let title = locations
-                    .first()
-                    .as_ref()
-                    .map(|location| {
-                        let buffer = location.buffer.read(cx);
-                        format!(
-                            "References to `{}`",
-                            buffer
-                                .text_for_range(location.range.clone())
-                                .collect::<String>()
-                        )
-                    })
-                    .unwrap();
-                Self::open_locations_in_multibuffer(
-                    workspace,
-                    locations,
-                    title,
-                    false,
-                    MultibufferSelectionMode::First,
-                    window,
-                    cx,
-                );
-                Navigated::Yes
-            })
-        }))
-    }
-
-    /// Opens a multibuffer with the given project locations in it
-    pub fn open_locations_in_multibuffer(
-        workspace: &mut Workspace,
-        mut locations: Vec<Location>,
-        title: String,
-        split: bool,
-        multibuffer_selection_mode: MultibufferSelectionMode,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        // If there are multiple definitions, open them in a multibuffer
-        locations.sort_by_key(|location| location.buffer.read(cx).remote_id());
-        let mut locations = locations.into_iter().peekable();
-        let mut ranges: Vec<Range<Anchor>> = Vec::new();
-        let capability = workspace.project().read(cx).capability();
-
-        let excerpt_buffer = cx.new(|cx| {
-            let mut multibuffer = MultiBuffer::new(capability);
-            while let Some(location) = locations.next() {
-                let buffer = location.buffer.read(cx);
-                let mut ranges_for_buffer = Vec::new();
-                let range = location.range.to_point(buffer);
-                ranges_for_buffer.push(range.clone());
-
-                while let Some(next_location) = locations.peek() {
-                    if next_location.buffer == location.buffer {
-                        ranges_for_buffer.push(next_location.range.to_point(buffer));
-                        locations.next();
-                    } else {
-                        break;
-                    }
-                }
-
-                ranges_for_buffer.sort_by_key(|range| (range.start, Reverse(range.end)));
-                let (new_ranges, _) = multibuffer.set_excerpts_for_path(
-                    PathKey::for_buffer(&location.buffer, cx),
-                    location.buffer.clone(),
-                    ranges_for_buffer,
-                    DEFAULT_MULTIBUFFER_CONTEXT,
-                    cx,
-                );
-                ranges.extend(new_ranges)
-            }
-
-            multibuffer.with_title(title)
-        });
-
-        let editor = cx.new(|cx| {
-            Editor::for_multibuffer(
-                excerpt_buffer,
-                Some(workspace.project().clone()),
-                window,
-                cx,
-            )
-        });
-        editor.update(cx, |editor, cx| {
-            match multibuffer_selection_mode {
-                MultibufferSelectionMode::First => {
-                    if let Some(first_range) = ranges.first() {
-                        editor.change_selections(None, window, cx, |selections| {
-                            selections.clear_disjoint();
-                            selections.select_anchor_ranges(std::iter::once(first_range.clone()));
-                        });
-                    }
-                    editor.highlight_background::<Self>(
-                        &ranges,
-                        |theme| theme.editor_highlighted_line_background,
-                        cx,
-                    );
-                }
-                MultibufferSelectionMode::All => {
-                    editor.change_selections(None, window, cx, |selections| {
-                        selections.clear_disjoint();
-                        selections.select_anchor_ranges(ranges);
-                    });
-                }
-            }
-            editor.register_buffers_with_language_servers(cx);
-        });
-
-        let item = Box::new(editor);
-        let item_id = item.item_id();
-
-        if split {
-            workspace.split_item(SplitDirection::Right, item.clone(), window, cx);
-        } else {
-            if PreviewTabsSettings::get_global(cx).enable_preview_from_code_navigation {
-                let (preview_item_id, preview_item_idx) =
-                    workspace.active_pane().update(cx, |pane, _| {
-                        (pane.preview_item_id(), pane.preview_item_idx())
-                    });
-
-                workspace.add_item_to_active_pane(item.clone(), preview_item_idx, true, window, cx);
-
-                if let Some(preview_item_id) = preview_item_id {
-                    workspace.active_pane().update(cx, |pane, cx| {
-                        pane.remove_item(preview_item_id, false, false, window, cx);
-                    });
-                }
-            } else {
-                workspace.add_item_to_active_pane(item.clone(), None, true, window, cx);
-            }
-        }
-        workspace.active_pane().update(cx, |pane, cx| {
-            pane.set_preview_item_id(Some(item_id), cx);
-        });
-    }
-
-    pub fn rename(
-        &mut self,
-        _: &Rename,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Task<Result<()>>> {
-        use language::ToOffset as _;
-
-        let provider = self.semantics_provider.clone()?;
-        let selection = self.selections.newest_anchor().clone();
-        let (cursor_buffer, cursor_buffer_position) = self
-            .buffer
-            .read(cx)
-            .text_anchor_for_position(selection.head(), cx)?;
-        let (tail_buffer, cursor_buffer_position_end) = self
-            .buffer
-            .read(cx)
-            .text_anchor_for_position(selection.tail(), cx)?;
-        if tail_buffer != cursor_buffer {
-            return None;
-        }
-
-        let snapshot = cursor_buffer.read(cx).snapshot();
-        let cursor_buffer_offset = cursor_buffer_position.to_offset(&snapshot);
-        let cursor_buffer_offset_end = cursor_buffer_position_end.to_offset(&snapshot);
-        let prepare_rename = provider
-            .range_for_rename(&cursor_buffer, cursor_buffer_position, cx)
-            .unwrap_or_else(|| Task::ready(Ok(None)));
-        drop(snapshot);
-
-        Some(cx.spawn_in(window, async move |this, cx| {
-            let rename_range = if let Some(range) = prepare_rename.await? {
-                Some(range)
-            } else {
-                this.update(cx, |this, cx| {
-                    let buffer = this.buffer.read(cx).snapshot(cx);
-                    let mut buffer_highlights = this
-                        .document_highlights_for_position(selection.head(), &buffer)
-                        .filter(|highlight| {
-                            highlight.start.excerpt_id == selection.head().excerpt_id
-                                && highlight.end.excerpt_id == selection.head().excerpt_id
-                        });
-                    buffer_highlights
-                        .next()
-                        .map(|highlight| highlight.start.text_anchor..highlight.end.text_anchor)
-                })?
-            };
-            if let Some(rename_range) = rename_range {
-                this.update_in(cx, |this, window, cx| {
-                    let snapshot = cursor_buffer.read(cx).snapshot();
-                    let rename_buffer_range = rename_range.to_offset(&snapshot);
-                    let cursor_offset_in_rename_range =
-                        cursor_buffer_offset.saturating_sub(rename_buffer_range.start);
-                    let cursor_offset_in_rename_range_end =
-                        cursor_buffer_offset_end.saturating_sub(rename_buffer_range.start);
-
-                    this.take_rename(false, window, cx);
-                    let buffer = this.buffer.read(cx).read(cx);
-                    let cursor_offset = selection.head().to_offset(&buffer);
-                    let rename_start = cursor_offset.saturating_sub(cursor_offset_in_rename_range);
-                    let rename_end = rename_start + rename_buffer_range.len();
-                    let range = buffer.anchor_before(rename_start)..buffer.anchor_after(rename_end);
-                    let mut old_highlight_id = None;
-                    let old_name: Arc<str> = buffer
-                        .chunks(rename_start..rename_end, true)
-                        .map(|chunk| {
-                            if old_highlight_id.is_none() {
-                                old_highlight_id = chunk.syntax_highlight_id;
-                            }
-                            chunk.text
-                        })
-                        .collect::<String>()
-                        .into();
-
-                    drop(buffer);
-
-                    // Position the selection in the rename editor so that it matches the current selection.
-                    this.show_local_selections = false;
-                    let rename_editor = cx.new(|cx| {
-                        let mut editor = Editor::single_line(window, cx);
-                        editor.buffer.update(cx, |buffer, cx| {
-                            buffer.edit([(0..0, old_name.clone())], None, cx)
-                        });
-                        let rename_selection_range = match cursor_offset_in_rename_range
-                            .cmp(&cursor_offset_in_rename_range_end)
-                        {
-                            Ordering::Equal => {
-                                editor.select_all(&SelectAll, window, cx);
-                                return editor;
-                            }
-                            Ordering::Less => {
-                                cursor_offset_in_rename_range..cursor_offset_in_rename_range_end
-                            }
-                            Ordering::Greater => {
-                                cursor_offset_in_rename_range_end..cursor_offset_in_rename_range
-                            }
-                        };
-                        if rename_selection_range.end > old_name.len() {
-                            editor.select_all(&SelectAll, window, cx);
-                        } else {
-                            editor.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
-                                s.select_ranges([rename_selection_range]);
-                            });
-                        }
-                        editor
-                    });
-                    cx.subscribe(&rename_editor, |_, _, e: &EditorEvent, cx| {
-                        if e == &EditorEvent::Focused {
-                            cx.emit(EditorEvent::FocusedIn)
-                        }
-                    })
-                    .detach();
-
-                    let write_highlights =
-                        this.clear_background_highlights::<DocumentHighlightWrite>(cx);
-                    let read_highlights =
-                        this.clear_background_highlights::<DocumentHighlightRead>(cx);
-                    let ranges = write_highlights
-                        .iter()
-                        .flat_map(|(_, ranges)| ranges.iter())
-                        .chain(read_highlights.iter().flat_map(|(_, ranges)| ranges.iter()))
-                        .cloned()
-                        .collect();
-
-                    this.highlight_text::<Rename>(
-                        ranges,
-                        HighlightStyle {
-                            fade_out: Some(0.6),
-                            ..Default::default()
-                        },
-                        cx,
-                    );
-                    let rename_focus_handle = rename_editor.focus_handle(cx);
-                    window.focus(&rename_focus_handle);
-                    let block_id = this.insert_blocks(
-                        [BlockProperties {
-                            style: BlockStyle::Flex,
-                            placement: BlockPlacement::Below(range.start),
-                            height: Some(1),
-                            render: Arc::new({
-                                let rename_editor = rename_editor.clone();
-                                move |cx: &mut BlockContext| {
-                                    let mut text_style = cx.editor_style.text.clone();
-                                    if let Some(highlight_style) = old_highlight_id
-                                        .and_then(|h| h.style(&cx.editor_style.syntax))
-                                    {
-                                        text_style = text_style.highlight(highlight_style);
-                                    }
-                                    div()
-                                        .block_mouse_down()
-                                        .pl(cx.anchor_x)
-                                        .child(EditorElement::new(
-                                            &rename_editor,
-                                            EditorStyle {
-                                                background: cx.theme().system().transparent,
-                                                local_player: cx.editor_style.local_player,
-                                                text: text_style,
-                                                scrollbar_width: cx.editor_style.scrollbar_width,
-                                                syntax: cx.editor_style.syntax.clone(),
-                                                status: cx.editor_style.status.clone(),
-                                                inlay_hints_style: HighlightStyle {
-                                                    font_weight: Some(FontWeight::BOLD),
-                                                    ..make_inlay_hints_style(cx.app)
-                                                },
-                                                inline_completion_styles: make_suggestion_styles(
-                                                    cx.app,
-                                                ),
-                                                ..EditorStyle::default()
-                                            },
-                                        ))
-                                        .into_any_element()
-                                }
-                            }),
-                            priority: 0,
-                        }],
-                        Some(Autoscroll::fit()),
-                        cx,
-                    )[0];
-                    this.pending_rename = Some(RenameState {
-                        range,
-                        old_name,
-                        editor: rename_editor,
-                        block_id,
-                    });
-                })?;
-            }
-
-            Ok(())
-        }))
-    }
-
-    pub fn confirm_rename(
-        &mut self,
-        _: &ConfirmRename,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Task<Result<()>>> {
-        let rename = self.take_rename(false, window, cx)?;
-        let workspace = self.workspace()?.downgrade();
-        let (buffer, start) = self
-            .buffer
-            .read(cx)
-            .text_anchor_for_position(rename.range.start, cx)?;
-        let (end_buffer, _) = self
-            .buffer
-            .read(cx)
-            .text_anchor_for_position(rename.range.end, cx)?;
-        if buffer != end_buffer {
-            return None;
-        }
-
-        let old_name = rename.old_name;
-        let new_name = rename.editor.read(cx).text(cx);
-
-        let rename = self.semantics_provider.as_ref()?.perform_rename(
-            &buffer,
-            start,
-            new_name.clone(),
-            cx,
-        )?;
-
-        Some(cx.spawn_in(window, async move |editor, cx| {
-            let project_transaction = rename.await?;
-            Self::open_project_transaction(
-                &editor,
-                workspace,
-                project_transaction,
-                format!("Rename: {} → {}", old_name, new_name),
-                cx,
-            )
-            .await?;
-
-            editor.update(cx, |editor, cx| {
-                editor.refresh_document_highlights(cx);
-            })?;
-            Ok(())
-        }))
-    }
-
-    fn take_rename(
-        &mut self,
-        moving_cursor: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<RenameState> {
-        let rename = self.pending_rename.take()?;
-        if rename.editor.focus_handle(cx).is_focused(window) {
-            window.focus(&self.focus_handle);
-        }
-
-        self.remove_blocks(
-            [rename.block_id].into_iter().collect(),
-            Some(Autoscroll::fit()),
-            cx,
-        );
-        self.clear_highlights::<Rename>(cx);
-        self.show_local_selections = true;
-
-        if moving_cursor {
-            let cursor_in_rename_editor = rename.editor.update(cx, |editor, cx| {
-                editor.selections.newest::<usize>(cx).head()
-            });
-
-            // Update the selection to match the position of the selection inside
-            // the rename editor.
-            let snapshot = self.buffer.read(cx).read(cx);
-            let rename_range = rename.range.to_offset(&snapshot);
-            let cursor_in_editor = snapshot
-                .clip_offset(rename_range.start + cursor_in_rename_editor, Bias::Left)
-                .min(rename_range.end);
-            drop(snapshot);
-
-            self.change_selections(None, window, cx, |s| {
-                s.select_ranges(vec![cursor_in_editor..cursor_in_editor])
-            });
-        } else {
-            self.refresh_document_highlights(cx);
-        }
-
-        Some(rename)
-    }
-
-    pub fn pending_rename(&self) -> Option<&RenameState> {
-        self.pending_rename.as_ref()
-    }
-
-    fn format(
-        &mut self,
-        _: &Format,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Task<Result<()>>> {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-
-        let project = match &self.project {
-            Some(project) => project.clone(),
-            None => return None,
-        };
-
-        Some(self.perform_format(
-            project,
-            FormatTrigger::Manual,
-            FormatTarget::Buffers,
-            window,
-            cx,
-        ))
-    }
-
-    fn format_selections(
-        &mut self,
-        _: &FormatSelections,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Task<Result<()>>> {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-
-        let project = match &self.project {
-            Some(project) => project.clone(),
-            None => return None,
-        };
-
-        let ranges = self
-            .selections
-            .all_adjusted(cx)
-            .into_iter()
-            .map(|selection| selection.range())
-            .collect_vec();
-
-        Some(self.perform_format(
-            project,
-            FormatTrigger::Manual,
-            FormatTarget::Ranges(ranges),
-            window,
-            cx,
-        ))
-    }
-
-    fn perform_format(
-        &mut self,
-        project: Entity<Project>,
-        trigger: FormatTrigger,
-        target: FormatTarget,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let buffer = self.buffer.clone();
-        let (buffers, target) = match target {
-            FormatTarget::Buffers => {
-                let mut buffers = buffer.read(cx).all_buffers();
-                if trigger == FormatTrigger::Save {
-                    buffers.retain(|buffer| buffer.read(cx).is_dirty());
-                }
-                (buffers, LspFormatTarget::Buffers)
-            }
-            FormatTarget::Ranges(selection_ranges) => {
-                let multi_buffer = buffer.read(cx);
-                let snapshot = multi_buffer.read(cx);
-                let mut buffers = HashSet::default();
-                let mut buffer_id_to_ranges: BTreeMap<BufferId, Vec<Range<text::Anchor>>> =
-                    BTreeMap::new();
-                for selection_range in selection_ranges {
-                    for (buffer, buffer_range, _) in
-                        snapshot.range_to_buffer_ranges(selection_range)
-                    {
-                        let buffer_id = buffer.remote_id();
-                        let start = buffer.anchor_before(buffer_range.start);
-                        let end = buffer.anchor_after(buffer_range.end);
-                        buffers.insert(multi_buffer.buffer(buffer_id).unwrap());
-                        buffer_id_to_ranges
-                            .entry(buffer_id)
-                            .and_modify(|buffer_ranges| buffer_ranges.push(start..end))
-                            .or_insert_with(|| vec![start..end]);
-                    }
-                }
-                (buffers, LspFormatTarget::Ranges(buffer_id_to_ranges))
-            }
-        };
-
-        let transaction_id_prev = buffer.read_with(cx, |b, cx| b.last_transaction_id(cx));
-        let selections_prev = transaction_id_prev
-            .and_then(|transaction_id_prev| {
-                // default to selections as they were after the last edit, if we have them,
-                // instead of how they are now.
-                // This will make it so that editing, moving somewhere else, formatting, then undoing the format
-                // will take you back to where you made the last edit, instead of staying where you scrolled
-                self.selection_history
-                    .transaction(transaction_id_prev)
-                    .map(|t| t.0.clone())
-            })
-            .unwrap_or_else(|| {
-                log::info!("Failed to determine selections from before format. Falling back to selections when format was initiated");
-                self.selections.disjoint_anchors()
-            });
-
-        let mut timeout = cx.background_executor().timer(FORMAT_TIMEOUT).fuse();
-        let format = project.update(cx, |project, cx| {
-            project.format(buffers, target, true, trigger, cx)
-        });
-
-        cx.spawn_in(window, async move |editor, cx| {
-            let transaction = futures::select_biased! {
-                transaction = format.log_err().fuse() => transaction,
-                () = timeout => {
-                    log::warn!("timed out waiting for formatting");
-                    None
-                }
-            };
-
-            buffer
-                .update(cx, |buffer, cx| {
-                    if let Some(transaction) = transaction {
-                        if !buffer.is_singleton() {
-                            buffer.push_transaction(&transaction.0, cx);
-                        }
-                    }
-                    cx.notify();
-                })
-                .ok();
-
-            if let Some(transaction_id_now) =
-                buffer.read_with(cx, |b, cx| b.last_transaction_id(cx))?
-            {
-                let has_new_transaction = transaction_id_prev != Some(transaction_id_now);
-                if has_new_transaction {
-                    _ = editor.update(cx, |editor, _| {
-                        editor
-                            .selection_history
-                            .insert_transaction(transaction_id_now, selections_prev);
-                    });
-                }
-            }
-
-            Ok(())
-        })
-    }
-
-    fn organize_imports(
-        &mut self,
-        _: &OrganizeImports,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Task<Result<()>>> {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-        let project = match &self.project {
-            Some(project) => project.clone(),
-            None => return None,
-        };
-        Some(self.perform_code_action_kind(
-            project,
-            CodeActionKind::SOURCE_ORGANIZE_IMPORTS,
-            window,
-            cx,
-        ))
-    }
-
-    fn perform_code_action_kind(
-        &mut self,
-        project: Entity<Project>,
-        kind: CodeActionKind,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let buffer = self.buffer.clone();
-        let buffers = buffer.read(cx).all_buffers();
-        let mut timeout = cx.background_executor().timer(CODE_ACTION_TIMEOUT).fuse();
-        let apply_action = project.update(cx, |project, cx| {
-            project.apply_code_action_kind(buffers, kind, true, cx)
-        });
-        cx.spawn_in(window, async move |_, cx| {
-            let transaction = futures::select_biased! {
-                () = timeout => {
-                    log::warn!("timed out waiting for executing code action");
-                    None
-                }
-                transaction = apply_action.log_err().fuse() => transaction,
-            };
-            buffer
-                .update(cx, |buffer, cx| {
-                    // check if we need this
-                    if let Some(transaction) = transaction {
-                        if !buffer.is_singleton() {
-                            buffer.push_transaction(&transaction.0, cx);
-                        }
-                    }
-                    cx.notify();
-                })
-                .ok();
-            Ok(())
-        })
-    }
-
-    fn restart_language_server(
-        &mut self,
-        _: &RestartLanguageServer,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(project) = self.project.clone() {
-            self.buffer.update(cx, |multi_buffer, cx| {
-                project.update(cx, |project, cx| {
-                    project.restart_language_servers_for_buffers(
-                        multi_buffer.all_buffers().into_iter().collect(),
-                        cx,
-                    );
-                });
-            })
-        }
-    }
-
-    fn stop_language_server(
-        &mut self,
-        _: &StopLanguageServer,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(project) = self.project.clone() {
-            self.buffer.update(cx, |multi_buffer, cx| {
-                project.update(cx, |project, cx| {
-                    project.stop_language_servers_for_buffers(
-                        multi_buffer.all_buffers().into_iter().collect(),
-                        cx,
-                    );
-                    cx.emit(project::Event::RefreshInlayHints);
-                });
-            });
-        }
-    }
-
-    fn cancel_language_server_work(
-        workspace: &mut Workspace,
-        _: &actions::CancelLanguageServerWork,
-        _: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        let project = workspace.project();
-        let buffers = workspace
-            .active_item(cx)
-            .and_then(|item| item.act_as::<Editor>(cx))
-            .map_or(HashSet::default(), |editor| {
-                editor.read(cx).buffer.read(cx).all_buffers()
-            });
-        project.update(cx, |project, cx| {
-            project.cancel_language_server_work_for_buffers(buffers, cx);
-        });
-    }
-
-    fn show_character_palette(
-        &mut self,
-        _: &ShowCharacterPalette,
-        window: &mut Window,
-        _: &mut Context<Self>,
-    ) {
-        window.show_character_palette();
-    }
-
-    fn refresh_active_diagnostics(&mut self, cx: &mut Context<Editor>) {
-        if let ActiveDiagnostic::Group(active_diagnostics) = &mut self.active_diagnostics {
-            let buffer = self.buffer.read(cx).snapshot(cx);
-            let primary_range_start = active_diagnostics.active_range.start.to_offset(&buffer);
-            let primary_range_end = active_diagnostics.active_range.end.to_offset(&buffer);
-            let is_valid = buffer
-                .diagnostics_in_range::<usize>(primary_range_start..primary_range_end)
-                .any(|entry| {
-                    entry.diagnostic.is_primary
-                        && !entry.range.is_empty()
-                        && entry.range.start == primary_range_start
-                        && entry.diagnostic.message == active_diagnostics.active_message
-                });
-
-            if !is_valid {
-                self.dismiss_diagnostics(cx);
-            }
-        }
-    }
-
-    pub fn active_diagnostic_group(&self) -> Option<&ActiveDiagnosticGroup> {
-        match &self.active_diagnostics {
-            ActiveDiagnostic::Group(group) => Some(group),
-            _ => None,
-        }
-    }
-
-    pub fn set_all_diagnostics_active(&mut self, cx: &mut Context<Self>) {
-        self.dismiss_diagnostics(cx);
-        self.active_diagnostics = ActiveDiagnostic::All;
-    }
-
-    fn activate_diagnostics(
-        &mut self,
-        buffer_id: BufferId,
-        diagnostic: DiagnosticEntry<usize>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if matches!(self.active_diagnostics, ActiveDiagnostic::All) {
-            return;
-        }
-        self.dismiss_diagnostics(cx);
-        let snapshot = self.snapshot(window, cx);
-        let buffer = self.buffer.read(cx).snapshot(cx);
-        let Some(renderer) = GlobalDiagnosticRenderer::global(cx) else {
-            return;
-        };
-
-        let diagnostic_group = buffer
-            .diagnostic_group(buffer_id, diagnostic.diagnostic.group_id)
-            .collect::<Vec<_>>();
-
-        let blocks =
-            renderer.render_group(diagnostic_group, buffer_id, snapshot, cx.weak_entity(), cx);
-
-        let blocks = self.display_map.update(cx, |display_map, cx| {
-            display_map.insert_blocks(blocks, cx).into_iter().collect()
-        });
-        self.active_diagnostics = ActiveDiagnostic::Group(ActiveDiagnosticGroup {
-            active_range: buffer.anchor_before(diagnostic.range.start)
-                ..buffer.anchor_after(diagnostic.range.end),
-            active_message: diagnostic.diagnostic.message.clone(),
-            group_id: diagnostic.diagnostic.group_id,
-            blocks,
-        });
-        cx.notify();
-    }
-
-    fn dismiss_diagnostics(&mut self, cx: &mut Context<Self>) {
-        if matches!(self.active_diagnostics, ActiveDiagnostic::All) {
-            return;
-        };
-
-        let prev = mem::replace(&mut self.active_diagnostics, ActiveDiagnostic::None);
-        if let ActiveDiagnostic::Group(group) = prev {
-            self.display_map.update(cx, |display_map, cx| {
-                display_map.remove_blocks(group.blocks, cx);
-            });
-            cx.notify();
-        }
-    }
-
-    /// Disable inline diagnostics rendering for this editor.
-    pub fn disable_inline_diagnostics(&mut self) {
-        self.inline_diagnostics_enabled = false;
-        self.inline_diagnostics_update = Task::ready(());
-        self.inline_diagnostics.clear();
-    }
-
-    pub fn inline_diagnostics_enabled(&self) -> bool {
-        self.inline_diagnostics_enabled
-    }
-
-    pub fn show_inline_diagnostics(&self) -> bool {
-        self.show_inline_diagnostics
-    }
-
-    pub fn toggle_inline_diagnostics(
-        &mut self,
-        _: &ToggleInlineDiagnostics,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) {
-        self.show_inline_diagnostics = !self.show_inline_diagnostics;
-        self.refresh_inline_diagnostics(false, window, cx);
-    }
-
-    fn refresh_inline_diagnostics(
-        &mut self,
-        debounce: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if !self.inline_diagnostics_enabled || !self.show_inline_diagnostics {
-            self.inline_diagnostics_update = Task::ready(());
-            self.inline_diagnostics.clear();
-            return;
-        }
-
-        let debounce_ms = ProjectSettings::get_global(cx)
-            .diagnostics
-            .inline
-            .update_debounce_ms;
-        let debounce = if debounce && debounce_ms > 0 {
-            Some(Duration::from_millis(debounce_ms))
-        } else {
-            None
-        };
-        self.inline_diagnostics_update = cx.spawn_in(window, async move |editor, cx| {
-            let editor = editor.upgrade().unwrap();
-
-            if let Some(debounce) = debounce {
-                cx.background_executor().timer(debounce).await;
-            }
-            let Some(snapshot) = editor
-                .update(cx, |editor, cx| editor.buffer().read(cx).snapshot(cx))
-                .ok()
-            else {
-                return;
-            };
-
-            let new_inline_diagnostics = cx
-                .background_spawn(async move {
-                    let mut inline_diagnostics = Vec::<(Anchor, InlineDiagnostic)>::new();
-                    for diagnostic_entry in snapshot.diagnostics_in_range(0..snapshot.len()) {
-                        let message = diagnostic_entry
-                            .diagnostic
-                            .message
-                            .split_once('\n')
-                            .map(|(line, _)| line)
-                            .map(SharedString::new)
-                            .unwrap_or_else(|| {
-                                SharedString::from(diagnostic_entry.diagnostic.message)
-                            });
-                        let start_anchor = snapshot.anchor_before(diagnostic_entry.range.start);
-                        let (Ok(i) | Err(i)) = inline_diagnostics
-                            .binary_search_by(|(probe, _)| probe.cmp(&start_anchor, &snapshot));
-                        inline_diagnostics.insert(
-                            i,
-                            (
-                                start_anchor,
-                                InlineDiagnostic {
-                                    message,
-                                    group_id: diagnostic_entry.diagnostic.group_id,
-                                    start: diagnostic_entry.range.start.to_point(&snapshot),
-                                    is_primary: diagnostic_entry.diagnostic.is_primary,
-                                    severity: diagnostic_entry.diagnostic.severity,
-                                },
-                            ),
-                        );
-                    }
-                    inline_diagnostics
-                })
-                .await;
-
-            editor
-                .update(cx, |editor, cx| {
-                    editor.inline_diagnostics = new_inline_diagnostics;
-                    cx.notify();
-                })
-                .ok();
-        });
-    }
-
-    pub fn set_selections_from_remote(
-        &mut self,
-        selections: Vec<Selection<Anchor>>,
-        pending_selection: Option<Selection<Anchor>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let old_cursor_position = self.selections.newest_anchor().head();
-        self.selections.change_with(cx, |s| {
-            s.select_anchors(selections);
-            if let Some(pending_selection) = pending_selection {
-                s.set_pending(pending_selection, SelectMode::Character);
-            } else {
-                s.clear_pending();
-            }
-        });
-        self.selections_did_change(false, &old_cursor_position, true, window, cx);
-    }
-
-    fn push_to_selection_history(&mut self) {
-        self.selection_history.push(SelectionHistoryEntry {
-            selections: self.selections.disjoint_anchors(),
-            select_next_state: self.select_next_state.clone(),
-            select_prev_state: self.select_prev_state.clone(),
-            add_selections_state: self.add_selections_state.clone(),
-        });
-    }
-
-    pub fn transact(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-        update: impl FnOnce(&mut Self, &mut Window, &mut Context<Self>),
-    ) -> Option<TransactionId> {
-        self.start_transaction_at(Instant::now(), window, cx);
-        update(self, window, cx);
-        self.end_transaction_at(Instant::now(), cx)
-    }
-
-    pub fn start_transaction_at(
-        &mut self,
-        now: Instant,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.end_selection(window, cx);
-        if let Some(tx_id) = self
-            .buffer
-            .update(cx, |buffer, cx| buffer.start_transaction_at(now, cx))
-        {
-            self.selection_history
-                .insert_transaction(tx_id, self.selections.disjoint_anchors());
-            cx.emit(EditorEvent::TransactionBegun {
-                transaction_id: tx_id,
-            })
-        }
-    }
-
-    pub fn end_transaction_at(
-        &mut self,
-        now: Instant,
-        cx: &mut Context<Self>,
-    ) -> Option<TransactionId> {
-        if let Some(transaction_id) = self
-            .buffer
-            .update(cx, |buffer, cx| buffer.end_transaction_at(now, cx))
-        {
-            if let Some((_, end_selections)) =
-                self.selection_history.transaction_mut(transaction_id)
-            {
-                *end_selections = Some(self.selections.disjoint_anchors());
-            } else {
-                log::error!("unexpectedly ended a transaction that wasn't started by this editor");
-            }
-
-            cx.emit(EditorEvent::Edited { transaction_id });
-            Some(transaction_id)
-        } else {
-            None
-        }
-    }
-
-    pub fn set_mark(&mut self, _: &actions::SetMark, window: &mut Window, cx: &mut Context<Self>) {
-        if self.selection_mark_mode {
-            self.change_selections(None, window, cx, |s| {
-                s.move_with(|_, sel| {
-                    sel.collapse_to(sel.head(), SelectionGoal::None);
-                });
-            })
-        }
-        self.selection_mark_mode = true;
-        cx.notify();
-    }
-
-    pub fn swap_selection_ends(
-        &mut self,
-        _: &actions::SwapSelectionEnds,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.change_selections(None, window, cx, |s| {
-            s.move_with(|_, sel| {
-                if sel.start != sel.end {
-                    sel.reversed = !sel.reversed
-                }
-            });
-        });
-        self.request_autoscroll(Autoscroll::newest(), cx);
-        cx.notify();
-    }
-
-    pub fn toggle_fold(
-        &mut self,
-        _: &actions::ToggleFold,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.is_singleton(cx) {
-            let selection = self.selections.newest::<Point>(cx);
-
-            let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-            let range = if selection.is_empty() {
-                let point = selection.head().to_display_point(&display_map);
-                let start = DisplayPoint::new(point.row(), 0).to_point(&display_map);
-                let end = DisplayPoint::new(point.row(), display_map.line_len(point.row()))
-                    .to_point(&display_map);
-                start..end
-            } else {
-                selection.range()
-            };
-            if display_map.folds_in_range(range).next().is_some() {
-                self.unfold_lines(&Default::default(), window, cx)
-            } else {
-                self.fold(&Default::default(), window, cx)
-            }
-        } else {
-            let multi_buffer_snapshot = self.buffer.read(cx).snapshot(cx);
-            let buffer_ids: HashSet<_> = self
-                .selections
-                .disjoint_anchor_ranges()
-                .flat_map(|range| multi_buffer_snapshot.buffer_ids_for_range(range))
-                .collect();
-
-            let should_unfold = buffer_ids
-                .iter()
-                .any(|buffer_id| self.is_buffer_folded(*buffer_id, cx));
-
-            for buffer_id in buffer_ids {
-                if should_unfold {
-                    self.unfold_buffer(buffer_id, cx);
-                } else {
-                    self.fold_buffer(buffer_id, cx);
-                }
-            }
-        }
-    }
-
-    pub fn toggle_fold_recursive(
-        &mut self,
-        _: &actions::ToggleFoldRecursive,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let selection = self.selections.newest::<Point>(cx);
-
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-        let range = if selection.is_empty() {
-            let point = selection.head().to_display_point(&display_map);
-            let start = DisplayPoint::new(point.row(), 0).to_point(&display_map);
-            let end = DisplayPoint::new(point.row(), display_map.line_len(point.row()))
-                .to_point(&display_map);
-            start..end
-        } else {
-            selection.range()
-        };
-        if display_map.folds_in_range(range).next().is_some() {
-            self.unfold_recursive(&Default::default(), window, cx)
-        } else {
-            self.fold_recursive(&Default::default(), window, cx)
-        }
-    }
-
-    pub fn fold(&mut self, _: &actions::Fold, window: &mut Window, cx: &mut Context<Self>) {
-        if self.is_singleton(cx) {
-            let mut to_fold = Vec::new();
-            let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-            let selections = self.selections.all_adjusted(cx);
-
-            for selection in selections {
-                let range = selection.range().sorted();
-                let buffer_start_row = range.start.row;
-
-                if range.start.row != range.end.row {
-                    let mut found = false;
-                    let mut row = range.start.row;
-                    while row <= range.end.row {
-                        if let Some(crease) = display_map.crease_for_buffer_row(MultiBufferRow(row))
-                        {
-                            found = true;
-                            row = crease.range().end.row + 1;
-                            to_fold.push(crease);
-                        } else {
-                            row += 1
-                        }
-                    }
-                    if found {
-                        continue;
-                    }
-                }
-
-                for row in (0..=range.start.row).rev() {
-                    if let Some(crease) = display_map.crease_for_buffer_row(MultiBufferRow(row)) {
-                        if crease.range().end.row >= buffer_start_row {
-                            to_fold.push(crease);
-                            if row <= range.start.row {
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
-
-            self.fold_creases(to_fold, true, window, cx);
-        } else {
-            let multi_buffer_snapshot = self.buffer.read(cx).snapshot(cx);
-            let buffer_ids = self
-                .selections
-                .disjoint_anchor_ranges()
-                .flat_map(|range| multi_buffer_snapshot.buffer_ids_for_range(range))
-                .collect::<HashSet<_>>();
-            for buffer_id in buffer_ids {
-                self.fold_buffer(buffer_id, cx);
-            }
-        }
-    }
-
-    fn fold_at_level(
-        &mut self,
-        fold_at: &FoldAtLevel,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if !self.buffer.read(cx).is_singleton() {
-            return;
-        }
-
-        let fold_at_level = fold_at.0;
-        let snapshot = self.buffer.read(cx).snapshot(cx);
-        let mut to_fold = Vec::new();
-        let mut stack = vec![(0, snapshot.max_row().0, 1)];
-
-        while let Some((mut start_row, end_row, current_level)) = stack.pop() {
-            while start_row < end_row {
-                match self
-                    .snapshot(window, cx)
-                    .crease_for_buffer_row(MultiBufferRow(start_row))
-                {
-                    Some(crease) => {
-                        let nested_start_row = crease.range().start.row + 1;
-                        let nested_end_row = crease.range().end.row;
-
-                        if current_level < fold_at_level {
-                            stack.push((nested_start_row, nested_end_row, current_level + 1));
-                        } else if current_level == fold_at_level {
-                            to_fold.push(crease);
-                        }
-
-                        start_row = nested_end_row + 1;
-                    }
-                    None => start_row += 1,
-                }
-            }
-        }
-
-        self.fold_creases(to_fold, true, window, cx);
-    }
-
-    pub fn fold_all(&mut self, _: &actions::FoldAll, window: &mut Window, cx: &mut Context<Self>) {
-        if self.buffer.read(cx).is_singleton() {
-            let mut fold_ranges = Vec::new();
-            let snapshot = self.buffer.read(cx).snapshot(cx);
-
-            for row in 0..snapshot.max_row().0 {
-                if let Some(foldable_range) = self
-                    .snapshot(window, cx)
-                    .crease_for_buffer_row(MultiBufferRow(row))
-                {
-                    fold_ranges.push(foldable_range);
-                }
-            }
-
-            self.fold_creases(fold_ranges, true, window, cx);
-        } else {
-            self.toggle_fold_multiple_buffers = cx.spawn_in(window, async move |editor, cx| {
-                editor
-                    .update_in(cx, |editor, _, cx| {
-                        for buffer_id in editor.buffer.read(cx).excerpt_buffer_ids() {
-                            editor.fold_buffer(buffer_id, cx);
-                        }
-                    })
-                    .ok();
-            });
-        }
-    }
-
-    pub fn fold_function_bodies(
-        &mut self,
-        _: &actions::FoldFunctionBodies,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let snapshot = self.buffer.read(cx).snapshot(cx);
-
-        let ranges = snapshot
-            .text_object_ranges(0..snapshot.len(), TreeSitterOptions::default())
-            .filter_map(|(range, obj)| (obj == TextObject::InsideFunction).then_some(range))
-            .collect::<Vec<_>>();
-
-        let creases = ranges
-            .into_iter()
-            .map(|range| Crease::simple(range, self.display_map.read(cx).fold_placeholder.clone()))
-            .collect();
-
-        self.fold_creases(creases, true, window, cx);
-    }
-
-    pub fn fold_recursive(
-        &mut self,
-        _: &actions::FoldRecursive,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let mut to_fold = Vec::new();
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-        let selections = self.selections.all_adjusted(cx);
-
-        for selection in selections {
-            let range = selection.range().sorted();
-            let buffer_start_row = range.start.row;
-
-            if range.start.row != range.end.row {
-                let mut found = false;
-                for row in range.start.row..=range.end.row {
-                    if let Some(crease) = display_map.crease_for_buffer_row(MultiBufferRow(row)) {
-                        found = true;
-                        to_fold.push(crease);
-                    }
-                }
-                if found {
-                    continue;
-                }
-            }
-
-            for row in (0..=range.start.row).rev() {
-                if let Some(crease) = display_map.crease_for_buffer_row(MultiBufferRow(row)) {
-                    if crease.range().end.row >= buffer_start_row {
-                        to_fold.push(crease);
-                    } else {
-                        break;
-                    }
-                }
-            }
-        }
-
-        self.fold_creases(to_fold, true, window, cx);
-    }
-
-    pub fn fold_at(
-        &mut self,
-        buffer_row: MultiBufferRow,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-
-        if let Some(crease) = display_map.crease_for_buffer_row(buffer_row) {
-            let autoscroll = self
-                .selections
-                .all::<Point>(cx)
-                .iter()
-                .any(|selection| crease.range().overlaps(&selection.range()));
-
-            self.fold_creases(vec![crease], autoscroll, window, cx);
-        }
-    }
-
-    pub fn unfold_lines(&mut self, _: &UnfoldLines, _window: &mut Window, cx: &mut Context<Self>) {
-        if self.is_singleton(cx) {
-            let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-            let buffer = &display_map.buffer_snapshot;
-            let selections = self.selections.all::<Point>(cx);
-            let ranges = selections
-                .iter()
-                .map(|s| {
-                    let range = s.display_range(&display_map).sorted();
-                    let mut start = range.start.to_point(&display_map);
-                    let mut end = range.end.to_point(&display_map);
-                    start.column = 0;
-                    end.column = buffer.line_len(MultiBufferRow(end.row));
-                    start..end
-                })
-                .collect::<Vec<_>>();
-
-            self.unfold_ranges(&ranges, true, true, cx);
-        } else {
-            let multi_buffer_snapshot = self.buffer.read(cx).snapshot(cx);
-            let buffer_ids = self
-                .selections
-                .disjoint_anchor_ranges()
-                .flat_map(|range| multi_buffer_snapshot.buffer_ids_for_range(range))
-                .collect::<HashSet<_>>();
-            for buffer_id in buffer_ids {
-                self.unfold_buffer(buffer_id, cx);
-            }
-        }
-    }
-
-    pub fn unfold_recursive(
-        &mut self,
-        _: &UnfoldRecursive,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-        let selections = self.selections.all::<Point>(cx);
-        let ranges = selections
-            .iter()
-            .map(|s| {
-                let mut range = s.display_range(&display_map).sorted();
-                *range.start.column_mut() = 0;
-                *range.end.column_mut() = display_map.line_len(range.end.row());
-                let start = range.start.to_point(&display_map);
-                let end = range.end.to_point(&display_map);
-                start..end
-            })
-            .collect::<Vec<_>>();
-
-        self.unfold_ranges(&ranges, true, true, cx);
-    }
-
-    pub fn unfold_at(
-        &mut self,
-        buffer_row: MultiBufferRow,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-
-        let intersection_range = Point::new(buffer_row.0, 0)
-            ..Point::new(
-                buffer_row.0,
-                display_map.buffer_snapshot.line_len(buffer_row),
-            );
-
-        let autoscroll = self
-            .selections
-            .all::<Point>(cx)
-            .iter()
-            .any(|selection| RangeExt::overlaps(&selection.range(), &intersection_range));
-
-        self.unfold_ranges(&[intersection_range], true, autoscroll, cx);
-    }
-
-    pub fn unfold_all(
-        &mut self,
-        _: &actions::UnfoldAll,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.buffer.read(cx).is_singleton() {
-            let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-            self.unfold_ranges(&[0..display_map.buffer_snapshot.len()], true, true, cx);
-        } else {
-            self.toggle_fold_multiple_buffers = cx.spawn(async move |editor, cx| {
-                editor
-                    .update(cx, |editor, cx| {
-                        for buffer_id in editor.buffer.read(cx).excerpt_buffer_ids() {
-                            editor.unfold_buffer(buffer_id, cx);
-                        }
-                    })
-                    .ok();
-            });
-        }
-    }
-
-    pub fn fold_selected_ranges(
-        &mut self,
-        _: &FoldSelectedRanges,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let selections = self.selections.all_adjusted(cx);
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-        let ranges = selections
-            .into_iter()
-            .map(|s| Crease::simple(s.range(), display_map.fold_placeholder.clone()))
-            .collect::<Vec<_>>();
-        self.fold_creases(ranges, true, window, cx);
-    }
-
-    pub fn fold_ranges<T: ToOffset + Clone>(
-        &mut self,
-        ranges: Vec<Range<T>>,
-        auto_scroll: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-        let ranges = ranges
-            .into_iter()
-            .map(|r| Crease::simple(r, display_map.fold_placeholder.clone()))
-            .collect::<Vec<_>>();
-        self.fold_creases(ranges, auto_scroll, window, cx);
-    }
-
-    pub fn fold_creases<T: ToOffset + Clone>(
-        &mut self,
-        creases: Vec<Crease<T>>,
-        auto_scroll: bool,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if creases.is_empty() {
-            return;
-        }
-
-        let mut buffers_affected = HashSet::default();
-        let multi_buffer = self.buffer().read(cx);
-        for crease in &creases {
-            if let Some((_, buffer, _)) =
-                multi_buffer.excerpt_containing(crease.range().start.clone(), cx)
-            {
-                buffers_affected.insert(buffer.read(cx).remote_id());
-            };
-        }
-
-        self.display_map.update(cx, |map, cx| map.fold(creases, cx));
-
-        if auto_scroll {
-            self.request_autoscroll(Autoscroll::fit(), cx);
-        }
-
-        cx.notify();
-
-        self.scrollbar_marker_state.dirty = true;
-        self.folds_did_change(cx);
-    }
-
-    /// Removes any folds whose ranges intersect any of the given ranges.
-    pub fn unfold_ranges<T: ToOffset + Clone>(
-        &mut self,
-        ranges: &[Range<T>],
-        inclusive: bool,
-        auto_scroll: bool,
-        cx: &mut Context<Self>,
-    ) {
-        self.remove_folds_with(ranges, auto_scroll, cx, |map, cx| {
-            map.unfold_intersecting(ranges.iter().cloned(), inclusive, cx)
-        });
-        self.folds_did_change(cx);
-    }
-
-    pub fn fold_buffer(&mut self, buffer_id: BufferId, cx: &mut Context<Self>) {
-        if self.buffer().read(cx).is_singleton() || self.is_buffer_folded(buffer_id, cx) {
-            return;
-        }
-        let folded_excerpts = self.buffer().read(cx).excerpts_for_buffer(buffer_id, cx);
-        self.display_map.update(cx, |display_map, cx| {
-            display_map.fold_buffers([buffer_id], cx)
-        });
-        cx.emit(EditorEvent::BufferFoldToggled {
-            ids: folded_excerpts.iter().map(|&(id, _)| id).collect(),
-            folded: true,
-        });
-        cx.notify();
-    }
-
-    pub fn unfold_buffer(&mut self, buffer_id: BufferId, cx: &mut Context<Self>) {
-        if self.buffer().read(cx).is_singleton() || !self.is_buffer_folded(buffer_id, cx) {
-            return;
-        }
-        let unfolded_excerpts = self.buffer().read(cx).excerpts_for_buffer(buffer_id, cx);
-        self.display_map.update(cx, |display_map, cx| {
-            display_map.unfold_buffers([buffer_id], cx);
-        });
-        cx.emit(EditorEvent::BufferFoldToggled {
-            ids: unfolded_excerpts.iter().map(|&(id, _)| id).collect(),
-            folded: false,
-        });
-        cx.notify();
-    }
-
-    pub fn is_buffer_folded(&self, buffer: BufferId, cx: &App) -> bool {
-        self.display_map.read(cx).is_buffer_folded(buffer)
-    }
-
-    pub fn folded_buffers<'a>(&self, cx: &'a App) -> &'a HashSet<BufferId> {
-        self.display_map.read(cx).folded_buffers()
-    }
-
-    pub fn disable_header_for_buffer(&mut self, buffer_id: BufferId, cx: &mut Context<Self>) {
-        self.display_map.update(cx, |display_map, cx| {
-            display_map.disable_header_for_buffer(buffer_id, cx);
-        });
-        cx.notify();
-    }
-
-    /// Removes any folds with the given ranges.
-    pub fn remove_folds_with_type<T: ToOffset + Clone>(
-        &mut self,
-        ranges: &[Range<T>],
-        type_id: TypeId,
-        auto_scroll: bool,
-        cx: &mut Context<Self>,
-    ) {
-        self.remove_folds_with(ranges, auto_scroll, cx, |map, cx| {
-            map.remove_folds_with_type(ranges.iter().cloned(), type_id, cx)
-        });
-        self.folds_did_change(cx);
-    }
-
-    fn remove_folds_with<T: ToOffset + Clone>(
-        &mut self,
-        ranges: &[Range<T>],
-        auto_scroll: bool,
-        cx: &mut Context<Self>,
-        update: impl FnOnce(&mut DisplayMap, &mut Context<DisplayMap>),
-    ) {
-        if ranges.is_empty() {
-            return;
-        }
-
-        let mut buffers_affected = HashSet::default();
-        let multi_buffer = self.buffer().read(cx);
-        for range in ranges {
-            if let Some((_, buffer, _)) = multi_buffer.excerpt_containing(range.start.clone(), cx) {
-                buffers_affected.insert(buffer.read(cx).remote_id());
-            };
-        }
-
-        self.display_map.update(cx, update);
-
-        if auto_scroll {
-            self.request_autoscroll(Autoscroll::fit(), cx);
-        }
-
-        cx.notify();
-        self.scrollbar_marker_state.dirty = true;
-        self.active_indent_guides_state.dirty = true;
-    }
-
-    pub fn update_fold_widths(
-        &mut self,
-        widths: impl IntoIterator<Item = (FoldId, Pixels)>,
-        cx: &mut Context<Self>,
-    ) -> bool {
-        self.display_map
-            .update(cx, |map, cx| map.update_fold_widths(widths, cx))
-    }
-
-    pub fn default_fold_placeholder(&self, cx: &App) -> FoldPlaceholder {
-        self.display_map.read(cx).fold_placeholder.clone()
-    }
-
-    pub fn set_expand_all_diff_hunks(&mut self, cx: &mut App) {
-        self.buffer.update(cx, |buffer, cx| {
-            buffer.set_all_diff_hunks_expanded(cx);
-        });
-    }
-
-    pub fn expand_all_diff_hunks(
-        &mut self,
-        _: &ExpandAllDiffHunks,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.buffer.update(cx, |buffer, cx| {
-            buffer.expand_diff_hunks(vec![Anchor::min()..Anchor::max()], cx)
-        });
-    }
-
-    pub fn toggle_selected_diff_hunks(
-        &mut self,
-        _: &ToggleSelectedDiffHunks,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let ranges: Vec<_> = self.selections.disjoint.iter().map(|s| s.range()).collect();
-        self.toggle_diff_hunks_in_ranges(ranges, cx);
-    }
-
-    pub fn diff_hunks_in_ranges<'a>(
-        &'a self,
-        ranges: &'a [Range<Anchor>],
-        buffer: &'a MultiBufferSnapshot,
-    ) -> impl 'a + Iterator<Item = MultiBufferDiffHunk> {
-        ranges.iter().flat_map(move |range| {
-            let end_excerpt_id = range.end.excerpt_id;
-            let range = range.to_point(buffer);
-            let mut peek_end = range.end;
-            if range.end.row < buffer.max_row().0 {
-                peek_end = Point::new(range.end.row + 1, 0);
-            }
-            buffer
-                .diff_hunks_in_range(range.start..peek_end)
-                .filter(move |hunk| hunk.excerpt_id.cmp(&end_excerpt_id, buffer).is_le())
-        })
-    }
-
-    pub fn has_stageable_diff_hunks_in_ranges(
-        &self,
-        ranges: &[Range<Anchor>],
-        snapshot: &MultiBufferSnapshot,
-    ) -> bool {
-        let mut hunks = self.diff_hunks_in_ranges(ranges, &snapshot);
-        hunks.any(|hunk| hunk.status().has_secondary_hunk())
-    }
-
-    pub fn toggle_staged_selected_diff_hunks(
-        &mut self,
-        _: &::git::ToggleStaged,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let snapshot = self.buffer.read(cx).snapshot(cx);
-        let ranges: Vec<_> = self.selections.disjoint.iter().map(|s| s.range()).collect();
-        let stage = self.has_stageable_diff_hunks_in_ranges(&ranges, &snapshot);
-        self.stage_or_unstage_diff_hunks(stage, ranges, cx);
-    }
-
-    pub fn set_render_diff_hunk_controls(
-        &mut self,
-        render_diff_hunk_controls: RenderDiffHunkControlsFn,
-        cx: &mut Context<Self>,
-    ) {
-        self.render_diff_hunk_controls = render_diff_hunk_controls;
-        cx.notify();
-    }
-
-    pub fn stage_and_next(
-        &mut self,
-        _: &::git::StageAndNext,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.do_stage_or_unstage_and_next(true, window, cx);
-    }
-
-    pub fn unstage_and_next(
-        &mut self,
-        _: &::git::UnstageAndNext,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.do_stage_or_unstage_and_next(false, window, cx);
-    }
-
-    pub fn stage_or_unstage_diff_hunks(
-        &mut self,
-        stage: bool,
-        ranges: Vec<Range<Anchor>>,
-        cx: &mut Context<Self>,
-    ) {
-        let task = self.save_buffers_for_ranges_if_needed(&ranges, cx);
-        cx.spawn(async move |this, cx| {
-            task.await?;
-            this.update(cx, |this, cx| {
-                let snapshot = this.buffer.read(cx).snapshot(cx);
-                let chunk_by = this
-                    .diff_hunks_in_ranges(&ranges, &snapshot)
-                    .chunk_by(|hunk| hunk.buffer_id);
-                for (buffer_id, hunks) in &chunk_by {
-                    this.do_stage_or_unstage(stage, buffer_id, hunks, cx);
-                }
-            })
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn save_buffers_for_ranges_if_needed(
-        &mut self,
-        ranges: &[Range<Anchor>],
-        cx: &mut Context<Editor>,
-    ) -> Task<Result<()>> {
-        let multibuffer = self.buffer.read(cx);
-        let snapshot = multibuffer.read(cx);
-        let buffer_ids: HashSet<_> = ranges
-            .iter()
-            .flat_map(|range| snapshot.buffer_ids_for_range(range.clone()))
-            .collect();
-        drop(snapshot);
-
-        let mut buffers = HashSet::default();
-        for buffer_id in buffer_ids {
-            if let Some(buffer_entity) = multibuffer.buffer(buffer_id) {
-                let buffer = buffer_entity.read(cx);
-                if buffer.file().is_some_and(|file| file.disk_state().exists()) && buffer.is_dirty()
-                {
-                    buffers.insert(buffer_entity);
-                }
-            }
-        }
-
-        if let Some(project) = &self.project {
-            project.update(cx, |project, cx| project.save_buffers(buffers, cx))
-        } else {
-            Task::ready(Ok(()))
-        }
-    }
-
-    fn do_stage_or_unstage_and_next(
-        &mut self,
-        stage: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let ranges = self.selections.disjoint_anchor_ranges().collect::<Vec<_>>();
-
-        if ranges.iter().any(|range| range.start != range.end) {
-            self.stage_or_unstage_diff_hunks(stage, ranges, cx);
-            return;
-        }
-
-        self.stage_or_unstage_diff_hunks(stage, ranges, cx);
-        let snapshot = self.snapshot(window, cx);
-        let position = self.selections.newest::<Point>(cx).head();
-        let mut row = snapshot
-            .buffer_snapshot
-            .diff_hunks_in_range(position..snapshot.buffer_snapshot.max_point())
-            .find(|hunk| hunk.row_range.start.0 > position.row)
-            .map(|hunk| hunk.row_range.start);
-
-        let all_diff_hunks_expanded = self.buffer().read(cx).all_diff_hunks_expanded();
-        // Outside of the project diff editor, wrap around to the beginning.
-        if !all_diff_hunks_expanded {
-            row = row.or_else(|| {
-                snapshot
-                    .buffer_snapshot
-                    .diff_hunks_in_range(Point::zero()..position)
-                    .find(|hunk| hunk.row_range.end.0 < position.row)
-                    .map(|hunk| hunk.row_range.start)
-            });
-        }
-
-        if let Some(row) = row {
-            let destination = Point::new(row.0, 0);
-            let autoscroll = Autoscroll::center();
-
-            self.unfold_ranges(&[destination..destination], false, false, cx);
-            self.change_selections(Some(autoscroll), window, cx, |s| {
-                s.select_ranges([destination..destination]);
-            });
-        }
-    }
-
-    fn do_stage_or_unstage(
-        &self,
-        stage: bool,
-        buffer_id: BufferId,
-        hunks: impl Iterator<Item = MultiBufferDiffHunk>,
-        cx: &mut App,
-    ) -> Option<()> {
-        let project = self.project.as_ref()?;
-        let buffer = project.read(cx).buffer_for_id(buffer_id, cx)?;
-        let diff = self.buffer.read(cx).diff_for(buffer_id)?;
-        let buffer_snapshot = buffer.read(cx).snapshot();
-        let file_exists = buffer_snapshot
-            .file()
-            .is_some_and(|file| file.disk_state().exists());
-        diff.update(cx, |diff, cx| {
-            diff.stage_or_unstage_hunks(
-                stage,
-                &hunks
-                    .map(|hunk| buffer_diff::DiffHunk {
-                        buffer_range: hunk.buffer_range,
-                        diff_base_byte_range: hunk.diff_base_byte_range,
-                        secondary_status: hunk.secondary_status,
-                        range: Point::zero()..Point::zero(), // unused
-                    })
-                    .collect::<Vec<_>>(),
-                &buffer_snapshot,
-                file_exists,
-                cx,
-            )
-        });
-        None
-    }
-
-    pub fn expand_selected_diff_hunks(&mut self, cx: &mut Context<Self>) {
-        let ranges: Vec<_> = self.selections.disjoint.iter().map(|s| s.range()).collect();
-        self.buffer
-            .update(cx, |buffer, cx| buffer.expand_diff_hunks(ranges, cx))
-    }
-
-    pub fn clear_expanded_diff_hunks(&mut self, cx: &mut Context<Self>) -> bool {
-        self.buffer.update(cx, |buffer, cx| {
-            let ranges = vec![Anchor::min()..Anchor::max()];
-            if !buffer.all_diff_hunks_expanded()
-                && buffer.has_expanded_diff_hunks_in_ranges(&ranges, cx)
-            {
-                buffer.collapse_diff_hunks(ranges, cx);
-                true
-            } else {
-                false
-            }
-        })
-    }
-
-    fn toggle_diff_hunks_in_ranges(
-        &mut self,
-        ranges: Vec<Range<Anchor>>,
-        cx: &mut Context<Editor>,
-    ) {
-        self.buffer.update(cx, |buffer, cx| {
-            let expand = !buffer.has_expanded_diff_hunks_in_ranges(&ranges, cx);
-            buffer.expand_or_collapse_diff_hunks(ranges, expand, cx);
-        })
-    }
-
-    fn toggle_single_diff_hunk(&mut self, range: Range<Anchor>, cx: &mut Context<Self>) {
-        self.buffer.update(cx, |buffer, cx| {
-            let snapshot = buffer.snapshot(cx);
-            let excerpt_id = range.end.excerpt_id;
-            let point_range = range.to_point(&snapshot);
-            let expand = !buffer.single_hunk_is_expanded(range, cx);
-            buffer.expand_or_collapse_diff_hunks_inner([(point_range, excerpt_id)], expand, cx);
-        })
-    }
-
-    pub(crate) fn apply_all_diff_hunks(
-        &mut self,
-        _: &ApplyAllDiffHunks,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-
-        let buffers = self.buffer.read(cx).all_buffers();
-        for branch_buffer in buffers {
-            branch_buffer.update(cx, |branch_buffer, cx| {
-                branch_buffer.merge_into_base(Vec::new(), cx);
-            });
-        }
-
-        if let Some(project) = self.project.clone() {
-            self.save(true, project, window, cx).detach_and_log_err(cx);
-        }
-    }
-
-    pub(crate) fn apply_selected_diff_hunks(
-        &mut self,
-        _: &ApplyDiffHunk,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-        let snapshot = self.snapshot(window, cx);
-        let hunks = snapshot.hunks_for_ranges(self.selections.ranges(cx));
-        let mut ranges_by_buffer = HashMap::default();
-        self.transact(window, cx, |editor, _window, cx| {
-            for hunk in hunks {
-                if let Some(buffer) = editor.buffer.read(cx).buffer(hunk.buffer_id) {
-                    ranges_by_buffer
-                        .entry(buffer.clone())
-                        .or_insert_with(Vec::new)
-                        .push(hunk.buffer_range.to_offset(buffer.read(cx)));
-                }
-            }
-
-            for (buffer, ranges) in ranges_by_buffer {
-                buffer.update(cx, |buffer, cx| {
-                    buffer.merge_into_base(ranges, cx);
-                });
-            }
-        });
-
-        if let Some(project) = self.project.clone() {
-            self.save(true, project, window, cx).detach_and_log_err(cx);
-        }
-    }
-
-    pub fn set_gutter_hovered(&mut self, hovered: bool, cx: &mut Context<Self>) {
-        if hovered != self.gutter_hovered {
-            self.gutter_hovered = hovered;
-            cx.notify();
-        }
-    }
-
-    pub fn insert_blocks(
-        &mut self,
-        blocks: impl IntoIterator<Item = BlockProperties<Anchor>>,
-        autoscroll: Option<Autoscroll>,
-        cx: &mut Context<Self>,
-    ) -> Vec<CustomBlockId> {
-        let blocks = self
-            .display_map
-            .update(cx, |display_map, cx| display_map.insert_blocks(blocks, cx));
-        if let Some(autoscroll) = autoscroll {
-            self.request_autoscroll(autoscroll, cx);
-        }
-        cx.notify();
-        blocks
-    }
-
-    pub fn resize_blocks(
-        &mut self,
-        heights: HashMap<CustomBlockId, u32>,
-        autoscroll: Option<Autoscroll>,
-        cx: &mut Context<Self>,
-    ) {
-        self.display_map
-            .update(cx, |display_map, cx| display_map.resize_blocks(heights, cx));
-        if let Some(autoscroll) = autoscroll {
-            self.request_autoscroll(autoscroll, cx);
-        }
-        cx.notify();
-    }
-
-    pub fn replace_blocks(
-        &mut self,
-        renderers: HashMap<CustomBlockId, RenderBlock>,
-        autoscroll: Option<Autoscroll>,
-        cx: &mut Context<Self>,
-    ) {
-        self.display_map
-            .update(cx, |display_map, _cx| display_map.replace_blocks(renderers));
-        if let Some(autoscroll) = autoscroll {
-            self.request_autoscroll(autoscroll, cx);
-        }
-        cx.notify();
-    }
-
-    pub fn remove_blocks(
-        &mut self,
-        block_ids: HashSet<CustomBlockId>,
-        autoscroll: Option<Autoscroll>,
-        cx: &mut Context<Self>,
-    ) {
-        self.display_map.update(cx, |display_map, cx| {
-            display_map.remove_blocks(block_ids, cx)
-        });
-        if let Some(autoscroll) = autoscroll {
-            self.request_autoscroll(autoscroll, cx);
-        }
-        cx.notify();
-    }
-
-    pub fn row_for_block(
-        &self,
-        block_id: CustomBlockId,
-        cx: &mut Context<Self>,
-    ) -> Option<DisplayRow> {
-        self.display_map
-            .update(cx, |map, cx| map.row_for_block(block_id, cx))
-    }
-
-    pub(crate) fn set_focused_block(&mut self, focused_block: FocusedBlock) {
-        self.focused_block = Some(focused_block);
-    }
-
-    pub(crate) fn take_focused_block(&mut self) -> Option<FocusedBlock> {
-        self.focused_block.take()
-    }
-
-    pub fn insert_creases(
-        &mut self,
-        creases: impl IntoIterator<Item = Crease<Anchor>>,
-        cx: &mut Context<Self>,
-    ) -> Vec<CreaseId> {
-        self.display_map
-            .update(cx, |map, cx| map.insert_creases(creases, cx))
-    }
-
-    pub fn remove_creases(
-        &mut self,
-        ids: impl IntoIterator<Item = CreaseId>,
-        cx: &mut Context<Self>,
-    ) {
-        self.display_map
-            .update(cx, |map, cx| map.remove_creases(ids, cx));
-    }
-
-    pub fn longest_row(&self, cx: &mut App) -> DisplayRow {
-        self.display_map
-            .update(cx, |map, cx| map.snapshot(cx))
-            .longest_row()
-    }
-
-    pub fn max_point(&self, cx: &mut App) -> DisplayPoint {
-        self.display_map
-            .update(cx, |map, cx| map.snapshot(cx))
-            .max_point()
-    }
-
-    pub fn text(&self, cx: &App) -> String {
-        self.buffer.read(cx).read(cx).text()
-    }
-
-    pub fn is_empty(&self, cx: &App) -> bool {
-        self.buffer.read(cx).read(cx).is_empty()
-    }
-
-    pub fn text_option(&self, cx: &App) -> Option<String> {
-        let text = self.text(cx);
-        let text = text.trim();
-
-        if text.is_empty() {
-            return None;
-        }
-
-        Some(text.to_string())
-    }
-
-    pub fn set_text(
-        &mut self,
-        text: impl Into<Arc<str>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.transact(window, cx, |this, _, cx| {
-            this.buffer
-                .read(cx)
-                .as_singleton()
-                .expect("you can only call set_text on editors for singleton buffers")
-                .update(cx, |buffer, cx| buffer.set_text(text, cx));
-        });
-    }
-
-    pub fn display_text(&self, cx: &mut App) -> String {
-        self.display_map
-            .update(cx, |map, cx| map.snapshot(cx))
-            .text()
-    }
-
-    pub fn wrap_guides(&self, cx: &App) -> SmallVec<[(usize, bool); 2]> {
-        let mut wrap_guides = smallvec::smallvec![];
-
-        if self.show_wrap_guides == Some(false) {
-            return wrap_guides;
-        }
-
-        let settings = self.buffer.read(cx).language_settings(cx);
-        if settings.show_wrap_guides {
-            match self.soft_wrap_mode(cx) {
-                SoftWrap::Column(soft_wrap) => {
-                    wrap_guides.push((soft_wrap as usize, true));
-                }
-                SoftWrap::Bounded(soft_wrap) => {
-                    wrap_guides.push((soft_wrap as usize, true));
-                }
-                SoftWrap::GitDiff | SoftWrap::None | SoftWrap::EditorWidth => {}
-            }
-            wrap_guides.extend(settings.wrap_guides.iter().map(|guide| (*guide, false)))
-        }
-
-        wrap_guides
-    }
-
-    pub fn soft_wrap_mode(&self, cx: &App) -> SoftWrap {
-        let settings = self.buffer.read(cx).language_settings(cx);
-        let mode = self.soft_wrap_mode_override.unwrap_or(settings.soft_wrap);
-        match mode {
-            language_settings::SoftWrap::PreferLine | language_settings::SoftWrap::None => {
-                SoftWrap::None
-            }
-            language_settings::SoftWrap::EditorWidth => SoftWrap::EditorWidth,
-            language_settings::SoftWrap::PreferredLineLength => {
-                SoftWrap::Column(settings.preferred_line_length)
-            }
-            language_settings::SoftWrap::Bounded => {
-                SoftWrap::Bounded(settings.preferred_line_length)
-            }
-        }
-    }
-
-    pub fn set_soft_wrap_mode(
-        &mut self,
-        mode: language_settings::SoftWrap,
-
-        cx: &mut Context<Self>,
-    ) {
-        self.soft_wrap_mode_override = Some(mode);
-        cx.notify();
-    }
-
-    pub fn set_hard_wrap(&mut self, hard_wrap: Option<usize>, cx: &mut Context<Self>) {
-        self.hard_wrap = hard_wrap;
-        cx.notify();
-    }
-
-    pub fn set_text_style_refinement(&mut self, style: TextStyleRefinement) {
-        self.text_style_refinement = Some(style);
-    }
-
-    /// called by the Element so we know what style we were most recently rendered with.
-    pub(crate) fn set_style(
-        &mut self,
-        style: EditorStyle,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let rem_size = window.rem_size();
-        self.display_map.update(cx, |map, cx| {
-            map.set_font(
-                style.text.font(),
-                style.text.font_size.to_pixels(rem_size),
-                cx,
-            )
-        });
-        self.style = Some(style);
-    }
-
-    pub fn style(&self) -> Option<&EditorStyle> {
-        self.style.as_ref()
-    }
-
-    // Called by the element. This method is not designed to be called outside of the editor
-    // element's layout code because it does not notify when rewrapping is computed synchronously.
-    pub(crate) fn set_wrap_width(&self, width: Option<Pixels>, cx: &mut App) -> bool {
-        self.display_map
-            .update(cx, |map, cx| map.set_wrap_width(width, cx))
-    }
-
-    pub fn set_soft_wrap(&mut self) {
-        self.soft_wrap_mode_override = Some(language_settings::SoftWrap::EditorWidth)
-    }
-
-    pub fn toggle_soft_wrap(&mut self, _: &ToggleSoftWrap, _: &mut Window, cx: &mut Context<Self>) {
-        if self.soft_wrap_mode_override.is_some() {
-            self.soft_wrap_mode_override.take();
-        } else {
-            let soft_wrap = match self.soft_wrap_mode(cx) {
-                SoftWrap::GitDiff => return,
-                SoftWrap::None => language_settings::SoftWrap::EditorWidth,
-                SoftWrap::EditorWidth | SoftWrap::Column(_) | SoftWrap::Bounded(_) => {
-                    language_settings::SoftWrap::None
-                }
-            };
-            self.soft_wrap_mode_override = Some(soft_wrap);
-        }
-        cx.notify();
-    }
-
-    pub fn toggle_tab_bar(&mut self, _: &ToggleTabBar, _: &mut Window, cx: &mut Context<Self>) {
-        let Some(workspace) = self.workspace() else {
-            return;
-        };
-        let fs = workspace.read(cx).app_state().fs.clone();
-        let current_show = TabBarSettings::get_global(cx).show;
-        update_settings_file::<TabBarSettings>(fs, cx, move |setting, _| {
-            setting.show = Some(!current_show);
-        });
-    }
-
-    pub fn toggle_indent_guides(
-        &mut self,
-        _: &ToggleIndentGuides,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let currently_enabled = self.should_show_indent_guides().unwrap_or_else(|| {
-            self.buffer
-                .read(cx)
-                .language_settings(cx)
-                .indent_guides
-                .enabled
-        });
-        self.show_indent_guides = Some(!currently_enabled);
-        cx.notify();
-    }
-
-    fn should_show_indent_guides(&self) -> Option<bool> {
-        self.show_indent_guides
-    }
-
-    pub fn toggle_line_numbers(
-        &mut self,
-        _: &ToggleLineNumbers,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let mut editor_settings = EditorSettings::get_global(cx).clone();
-        editor_settings.gutter.line_numbers = !editor_settings.gutter.line_numbers;
-        EditorSettings::override_global(editor_settings, cx);
-    }
-
-    pub fn line_numbers_enabled(&self, cx: &App) -> bool {
-        if let Some(show_line_numbers) = self.show_line_numbers {
-            return show_line_numbers;
-        }
-        EditorSettings::get_global(cx).gutter.line_numbers
-    }
-
-    pub fn should_use_relative_line_numbers(&self, cx: &mut App) -> bool {
-        self.use_relative_line_numbers
-            .unwrap_or(EditorSettings::get_global(cx).relative_line_numbers)
-    }
-
-    pub fn toggle_relative_line_numbers(
-        &mut self,
-        _: &ToggleRelativeLineNumbers,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let is_relative = self.should_use_relative_line_numbers(cx);
-        self.set_relative_line_number(Some(!is_relative), cx)
-    }
-
-    pub fn set_relative_line_number(&mut self, is_relative: Option<bool>, cx: &mut Context<Self>) {
-        self.use_relative_line_numbers = is_relative;
-        cx.notify();
-    }
-
-    pub fn set_show_gutter(&mut self, show_gutter: bool, cx: &mut Context<Self>) {
-        self.show_gutter = show_gutter;
-        cx.notify();
-    }
-
-    pub fn set_show_scrollbars(&mut self, show_scrollbars: bool, cx: &mut Context<Self>) {
-        self.show_scrollbars = show_scrollbars;
-        cx.notify();
-    }
-
-    pub fn disable_scrolling(&mut self, cx: &mut Context<Self>) {
-        self.disable_scrolling = true;
-        cx.notify();
-    }
-
-    pub fn set_show_line_numbers(&mut self, show_line_numbers: bool, cx: &mut Context<Self>) {
-        self.show_line_numbers = Some(show_line_numbers);
-        cx.notify();
-    }
-
-    pub fn disable_expand_excerpt_buttons(&mut self, cx: &mut Context<Self>) {
-        self.disable_expand_excerpt_buttons = true;
-        cx.notify();
-    }
-
-    pub fn set_show_git_diff_gutter(&mut self, show_git_diff_gutter: bool, cx: &mut Context<Self>) {
-        self.show_git_diff_gutter = Some(show_git_diff_gutter);
-        cx.notify();
-    }
-
-    pub fn set_show_code_actions(&mut self, show_code_actions: bool, cx: &mut Context<Self>) {
-        self.show_code_actions = Some(show_code_actions);
-        cx.notify();
-    }
-
-    pub fn set_show_runnables(&mut self, show_runnables: bool, cx: &mut Context<Self>) {
-        self.show_runnables = Some(show_runnables);
-        cx.notify();
-    }
-
-    pub fn set_show_breakpoints(&mut self, show_breakpoints: bool, cx: &mut Context<Self>) {
-        self.show_breakpoints = Some(show_breakpoints);
-        cx.notify();
-    }
-
-    pub fn set_masked(&mut self, masked: bool, cx: &mut Context<Self>) {
-        if self.display_map.read(cx).masked != masked {
-            self.display_map.update(cx, |map, _| map.masked = masked);
-        }
-        cx.notify()
-    }
-
-    pub fn set_show_wrap_guides(&mut self, show_wrap_guides: bool, cx: &mut Context<Self>) {
-        self.show_wrap_guides = Some(show_wrap_guides);
-        cx.notify();
-    }
-
-    pub fn set_show_indent_guides(&mut self, show_indent_guides: bool, cx: &mut Context<Self>) {
-        self.show_indent_guides = Some(show_indent_guides);
-        cx.notify();
-    }
-
-    pub fn working_directory(&self, cx: &App) -> Option<PathBuf> {
-        if let Some(buffer) = self.buffer().read(cx).as_singleton() {
-            if let Some(file) = buffer.read(cx).file().and_then(|f| f.as_local()) {
-                if let Some(dir) = file.abs_path(cx).parent() {
-                    return Some(dir.to_owned());
-                }
-            }
-
-            if let Some(project_path) = buffer.read(cx).project_path(cx) {
-                return Some(project_path.path.to_path_buf());
-            }
-        }
-
-        None
-    }
-
-    fn target_file<'a>(&self, cx: &'a App) -> Option<&'a dyn language::LocalFile> {
-        self.active_excerpt(cx)?
-            .1
-            .read(cx)
-            .file()
-            .and_then(|f| f.as_local())
-    }
-
-    pub fn target_file_abs_path(&self, cx: &mut Context<Self>) -> Option<PathBuf> {
-        self.active_excerpt(cx).and_then(|(_, buffer, _)| {
-            let buffer = buffer.read(cx);
-            if let Some(project_path) = buffer.project_path(cx) {
-                let project = self.project.as_ref()?.read(cx);
-                project.absolute_path(&project_path, cx)
-            } else {
-                buffer
-                    .file()
-                    .and_then(|file| file.as_local().map(|file| file.abs_path(cx)))
-            }
-        })
-    }
-
-    fn target_file_path(&self, cx: &mut Context<Self>) -> Option<PathBuf> {
-        self.active_excerpt(cx).and_then(|(_, buffer, _)| {
-            let project_path = buffer.read(cx).project_path(cx)?;
-            let project = self.project.as_ref()?.read(cx);
-            let entry = project.entry_for_path(&project_path, cx)?;
-            let path = entry.path.to_path_buf();
-            Some(path)
-        })
-    }
-
-    pub fn reveal_in_finder(
-        &mut self,
-        _: &RevealInFileManager,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(target) = self.target_file(cx) {
-            cx.reveal_path(&target.abs_path(cx));
-        }
-    }
-
-    pub fn copy_path(
-        &mut self,
-        _: &zed_actions::workspace::CopyPath,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(path) = self.target_file_abs_path(cx) {
-            if let Some(path) = path.to_str() {
-                cx.write_to_clipboard(ClipboardItem::new_string(path.to_string()));
-            }
-        }
-    }
-
-    pub fn copy_relative_path(
-        &mut self,
-        _: &zed_actions::workspace::CopyRelativePath,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(path) = self.target_file_path(cx) {
-            if let Some(path) = path.to_str() {
-                cx.write_to_clipboard(ClipboardItem::new_string(path.to_string()));
-            }
-        }
-    }
-
-    pub fn project_path(&self, cx: &App) -> Option<ProjectPath> {
-        if let Some(buffer) = self.buffer.read(cx).as_singleton() {
-            buffer.read(cx).project_path(cx)
-        } else {
-            None
-        }
-    }
-
-    // Returns true if the editor handled a go-to-line request
-    pub fn go_to_active_debug_line(&mut self, window: &mut Window, cx: &mut Context<Self>) -> bool {
-        maybe!({
-            let breakpoint_store = self.breakpoint_store.as_ref()?;
-
-            let Some(active_stack_frame) = breakpoint_store.read(cx).active_position().cloned()
-            else {
-                self.clear_row_highlights::<ActiveDebugLine>();
-                return None;
-            };
-
-            let position = active_stack_frame.position;
-            let buffer_id = position.buffer_id?;
-            let snapshot = self
-                .project
-                .as_ref()?
-                .read(cx)
-                .buffer_for_id(buffer_id, cx)?
-                .read(cx)
-                .snapshot();
-
-            let mut handled = false;
-            for (id, ExcerptRange { context, .. }) in
-                self.buffer.read(cx).excerpts_for_buffer(buffer_id, cx)
-            {
-                if context.start.cmp(&position, &snapshot).is_ge()
-                    || context.end.cmp(&position, &snapshot).is_lt()
-                {
-                    continue;
-                }
-                let snapshot = self.buffer.read(cx).snapshot(cx);
-                let multibuffer_anchor = snapshot.anchor_in_excerpt(id, position)?;
-
-                handled = true;
-                self.clear_row_highlights::<ActiveDebugLine>();
-                self.go_to_line::<ActiveDebugLine>(
-                    multibuffer_anchor,
-                    Some(cx.theme().colors().editor_debugger_active_line_background),
-                    window,
-                    cx,
-                );
-
-                cx.notify();
-            }
-
-            handled.then_some(())
-        })
-        .is_some()
-    }
-
-    pub fn copy_file_name_without_extension(
-        &mut self,
-        _: &CopyFileNameWithoutExtension,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(file) = self.target_file(cx) {
-            if let Some(file_stem) = file.path().file_stem() {
-                if let Some(name) = file_stem.to_str() {
-                    cx.write_to_clipboard(ClipboardItem::new_string(name.to_string()));
-                }
-            }
-        }
-    }
-
-    pub fn copy_file_name(&mut self, _: &CopyFileName, _: &mut Window, cx: &mut Context<Self>) {
-        if let Some(file) = self.target_file(cx) {
-            if let Some(file_name) = file.path().file_name() {
-                if let Some(name) = file_name.to_str() {
-                    cx.write_to_clipboard(ClipboardItem::new_string(name.to_string()));
-                }
-            }
-        }
-    }
-
-    pub fn toggle_git_blame(
-        &mut self,
-        _: &::git::Blame,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.show_git_blame_gutter = !self.show_git_blame_gutter;
-
-        if self.show_git_blame_gutter && !self.has_blame_entries(cx) {
-            self.start_git_blame(true, window, cx);
-        }
-
-        cx.notify();
-    }
-
-    pub fn toggle_git_blame_inline(
-        &mut self,
-        _: &ToggleGitBlameInline,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.toggle_git_blame_inline_internal(true, window, cx);
-        cx.notify();
-    }
-
-    pub fn open_git_blame_commit(
-        &mut self,
-        _: &OpenGitBlameCommit,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.open_git_blame_commit_internal(window, cx);
-    }
-
-    fn open_git_blame_commit_internal(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<()> {
-        let blame = self.blame.as_ref()?;
-        let snapshot = self.snapshot(window, cx);
-        let cursor = self.selections.newest::<Point>(cx).head();
-        let (buffer, point, _) = snapshot.buffer_snapshot.point_to_buffer_point(cursor)?;
-        let blame_entry = blame
-            .update(cx, |blame, cx| {
-                blame
-                    .blame_for_rows(
-                        &[RowInfo {
-                            buffer_id: Some(buffer.remote_id()),
-                            buffer_row: Some(point.row),
-                            ..Default::default()
-                        }],
-                        cx,
-                    )
-                    .next()
-            })
-            .flatten()?;
-        let renderer = cx.global::<GlobalBlameRenderer>().0.clone();
-        let repo = blame.read(cx).repository(cx)?;
-        let workspace = self.workspace()?.downgrade();
-        renderer.open_blame_commit(blame_entry, repo, workspace, window, cx);
-        None
-    }
-
-    pub fn git_blame_inline_enabled(&self) -> bool {
-        self.git_blame_inline_enabled
-    }
-
-    pub fn toggle_selection_menu(
-        &mut self,
-        _: &ToggleSelectionMenu,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.show_selection_menu = self
-            .show_selection_menu
-            .map(|show_selections_menu| !show_selections_menu)
-            .or_else(|| Some(!EditorSettings::get_global(cx).toolbar.selections_menu));
-
-        cx.notify();
-    }
-
-    pub fn selection_menu_enabled(&self, cx: &App) -> bool {
-        self.show_selection_menu
-            .unwrap_or_else(|| EditorSettings::get_global(cx).toolbar.selections_menu)
-    }
-
-    fn start_git_blame(
-        &mut self,
-        user_triggered: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(project) = self.project.as_ref() {
-            let Some(buffer) = self.buffer().read(cx).as_singleton() else {
-                return;
-            };
-
-            if buffer.read(cx).file().is_none() {
-                return;
-            }
-
-            let focused = self.focus_handle(cx).contains_focused(window, cx);
-
-            let project = project.clone();
-            let blame = cx.new(|cx| GitBlame::new(buffer, project, user_triggered, focused, cx));
-            self.blame_subscription =
-                Some(cx.observe_in(&blame, window, |_, _, _, cx| cx.notify()));
-            self.blame = Some(blame);
-        }
-    }
-
-    fn toggle_git_blame_inline_internal(
-        &mut self,
-        user_triggered: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.git_blame_inline_enabled {
-            self.git_blame_inline_enabled = false;
-            self.show_git_blame_inline = false;
-            self.show_git_blame_inline_delay_task.take();
-        } else {
-            self.git_blame_inline_enabled = true;
-            self.start_git_blame_inline(user_triggered, window, cx);
-        }
-
-        cx.notify();
-    }
-
-    fn start_git_blame_inline(
-        &mut self,
-        user_triggered: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.start_git_blame(user_triggered, window, cx);
-
-        if ProjectSettings::get_global(cx)
-            .git
-            .inline_blame_delay()
-            .is_some()
-        {
-            self.start_inline_blame_timer(window, cx);
-        } else {
-            self.show_git_blame_inline = true
-        }
-    }
-
-    pub fn blame(&self) -> Option<&Entity<GitBlame>> {
-        self.blame.as_ref()
-    }
-
-    pub fn show_git_blame_gutter(&self) -> bool {
-        self.show_git_blame_gutter
-    }
-
-    pub fn render_git_blame_gutter(&self, cx: &App) -> bool {
-        self.show_git_blame_gutter && self.has_blame_entries(cx)
-    }
-
-    pub fn render_git_blame_inline(&self, window: &Window, cx: &App) -> bool {
-        self.show_git_blame_inline
-            && (self.focus_handle.is_focused(window) || self.inline_blame_popover.is_some())
-            && !self.newest_selection_head_on_empty_line(cx)
-            && self.has_blame_entries(cx)
-    }
-
-    fn has_blame_entries(&self, cx: &App) -> bool {
-        self.blame()
-            .map_or(false, |blame| blame.read(cx).has_generated_entries())
-    }
-
-    fn newest_selection_head_on_empty_line(&self, cx: &App) -> bool {
-        let cursor_anchor = self.selections.newest_anchor().head();
-
-        let snapshot = self.buffer.read(cx).snapshot(cx);
-        let buffer_row = MultiBufferRow(cursor_anchor.to_point(&snapshot).row);
-
-        snapshot.line_len(buffer_row) == 0
-    }
-
-    fn get_permalink_to_line(&self, cx: &mut Context<Self>) -> Task<Result<url::Url>> {
-        let buffer_and_selection = maybe!({
-            let selection = self.selections.newest::<Point>(cx);
-            let selection_range = selection.range();
-
-            let multi_buffer = self.buffer().read(cx);
-            let multi_buffer_snapshot = multi_buffer.snapshot(cx);
-            let buffer_ranges = multi_buffer_snapshot.range_to_buffer_ranges(selection_range);
-
-            let (buffer, range, _) = if selection.reversed {
-                buffer_ranges.first()
-            } else {
-                buffer_ranges.last()
-            }?;
-
-            let selection = text::ToPoint::to_point(&range.start, &buffer).row
-                ..text::ToPoint::to_point(&range.end, &buffer).row;
-            Some((
-                multi_buffer.buffer(buffer.remote_id()).unwrap().clone(),
-                selection,
-            ))
-        });
-
-        let Some((buffer, selection)) = buffer_and_selection else {
-            return Task::ready(Err(anyhow!("failed to determine buffer and selection")));
-        };
-
-        let Some(project) = self.project.as_ref() else {
-            return Task::ready(Err(anyhow!("editor does not have project")));
-        };
-
-        project.update(cx, |project, cx| {
-            project.get_permalink_to_line(&buffer, selection, cx)
-        })
-    }
-
-    pub fn copy_permalink_to_line(
-        &mut self,
-        _: &CopyPermalinkToLine,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let permalink_task = self.get_permalink_to_line(cx);
-        let workspace = self.workspace();
-
-        cx.spawn_in(window, async move |_, cx| match permalink_task.await {
-            Ok(permalink) => {
-                cx.update(|_, cx| {
-                    cx.write_to_clipboard(ClipboardItem::new_string(permalink.to_string()));
-                })
-                .ok();
-            }
-            Err(err) => {
-                let message = format!("Failed to copy permalink: {err}");
-
-                anyhow::Result::<()>::Err(err).log_err();
-
-                if let Some(workspace) = workspace {
-                    workspace
-                        .update_in(cx, |workspace, _, cx| {
-                            struct CopyPermalinkToLine;
-
-                            workspace.show_toast(
-                                Toast::new(
-                                    NotificationId::unique::<CopyPermalinkToLine>(),
-                                    message,
-                                ),
-                                cx,
-                            )
-                        })
-                        .ok();
-                }
-            }
-        })
-        .detach();
-    }
-
-    pub fn copy_file_location(
-        &mut self,
-        _: &CopyFileLocation,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let selection = self.selections.newest::<Point>(cx).start.row + 1;
-        if let Some(file) = self.target_file(cx) {
-            if let Some(path) = file.path().to_str() {
-                cx.write_to_clipboard(ClipboardItem::new_string(format!("{path}:{selection}")));
-            }
-        }
-    }
-
-    pub fn open_permalink_to_line(
-        &mut self,
-        _: &OpenPermalinkToLine,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let permalink_task = self.get_permalink_to_line(cx);
-        let workspace = self.workspace();
-
-        cx.spawn_in(window, async move |_, cx| match permalink_task.await {
-            Ok(permalink) => {
-                cx.update(|_, cx| {
-                    cx.open_url(permalink.as_ref());
-                })
-                .ok();
-            }
-            Err(err) => {
-                let message = format!("Failed to open permalink: {err}");
-
-                anyhow::Result::<()>::Err(err).log_err();
-
-                if let Some(workspace) = workspace {
-                    workspace
-                        .update(cx, |workspace, cx| {
-                            struct OpenPermalinkToLine;
-
-                            workspace.show_toast(
-                                Toast::new(
-                                    NotificationId::unique::<OpenPermalinkToLine>(),
-                                    message,
-                                ),
-                                cx,
-                            )
-                        })
-                        .ok();
-                }
-            }
-        })
-        .detach();
-    }
-
-    pub fn insert_uuid_v4(
-        &mut self,
-        _: &InsertUuidV4,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.insert_uuid(UuidVersion::V4, window, cx);
-    }
-
-    pub fn insert_uuid_v7(
-        &mut self,
-        _: &InsertUuidV7,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.insert_uuid(UuidVersion::V7, window, cx);
-    }
-
-    fn insert_uuid(&mut self, version: UuidVersion, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(&HideMouseCursorOrigin::TypingAction);
-        self.transact(window, cx, |this, window, cx| {
-            let edits = this
-                .selections
-                .all::<Point>(cx)
-                .into_iter()
-                .map(|selection| {
-                    let uuid = match version {
-                        UuidVersion::V4 => uuid::Uuid::new_v4(),
-                        UuidVersion::V7 => uuid::Uuid::now_v7(),
-                    };
-
-                    (selection.range(), uuid.to_string())
-                });
-            this.edit(edits, cx);
-            this.refresh_inline_completion(true, false, window, cx);
-        });
-    }
-
-    pub fn open_selections_in_multibuffer(
-        &mut self,
-        _: &OpenSelectionsInMultibuffer,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let multibuffer = self.buffer.read(cx);
-
-        let Some(buffer) = multibuffer.as_singleton() else {
-            return;
-        };
-
-        let Some(workspace) = self.workspace() else {
-            return;
-        };
-
-        let locations = self
-            .selections
-            .disjoint_anchors()
-            .iter()
-            .map(|range| Location {
-                buffer: buffer.clone(),
-                range: range.start.text_anchor..range.end.text_anchor,
-            })
-            .collect::<Vec<_>>();
-
-        let title = multibuffer.title(cx).to_string();
-
-        cx.spawn_in(window, async move |_, cx| {
-            workspace.update_in(cx, |workspace, window, cx| {
-                Self::open_locations_in_multibuffer(
-                    workspace,
-                    locations,
-                    format!("Selections for '{title}'"),
-                    false,
-                    MultibufferSelectionMode::All,
-                    window,
-                    cx,
-                );
-            })
-        })
-        .detach();
-    }
-
-    /// Adds a row highlight for the given range. If a row has multiple highlights, the
-    /// last highlight added will be used.
-    ///
-    /// If the range ends at the beginning of a line, then that line will not be highlighted.
-    pub fn highlight_rows<T: 'static>(
-        &mut self,
-        range: Range<Anchor>,
-        color: Hsla,
-        options: RowHighlightOptions,
-        cx: &mut Context<Self>,
-    ) {
-        let snapshot = self.buffer().read(cx).snapshot(cx);
-        let row_highlights = self.highlighted_rows.entry(TypeId::of::<T>()).or_default();
-        let ix = row_highlights.binary_search_by(|highlight| {
-            Ordering::Equal
-                .then_with(|| highlight.range.start.cmp(&range.start, &snapshot))
-                .then_with(|| highlight.range.end.cmp(&range.end, &snapshot))
-        });
-
-        if let Err(mut ix) = ix {
-            let index = post_inc(&mut self.highlight_order);
-
-            // If this range intersects with the preceding highlight, then merge it with
-            // the preceding highlight. Otherwise insert a new highlight.
-            let mut merged = false;
-            if ix > 0 {
-                let prev_highlight = &mut row_highlights[ix - 1];
-                if prev_highlight
-                    .range
-                    .end
-                    .cmp(&range.start, &snapshot)
-                    .is_ge()
-                {
-                    ix -= 1;
-                    if prev_highlight.range.end.cmp(&range.end, &snapshot).is_lt() {
-                        prev_highlight.range.end = range.end;
-                    }
-                    merged = true;
-                    prev_highlight.index = index;
-                    prev_highlight.color = color;
-                    prev_highlight.options = options;
-                }
-            }
-
-            if !merged {
-                row_highlights.insert(
-                    ix,
-                    RowHighlight {
-                        range: range.clone(),
-                        index,
-                        color,
-                        options,
-                        type_id: TypeId::of::<T>(),
-                    },
-                );
-            }
-
-            // If any of the following highlights intersect with this one, merge them.
-            while let Some(next_highlight) = row_highlights.get(ix + 1) {
-                let highlight = &row_highlights[ix];
-                if next_highlight
-                    .range
-                    .start
-                    .cmp(&highlight.range.end, &snapshot)
-                    .is_le()
-                {
-                    if next_highlight
-                        .range
-                        .end
-                        .cmp(&highlight.range.end, &snapshot)
-                        .is_gt()
-                    {
-                        row_highlights[ix].range.end = next_highlight.range.end;
-                    }
-                    row_highlights.remove(ix + 1);
-                } else {
-                    break;
-                }
-            }
-        }
-    }
-
-    /// Remove any highlighted row ranges of the given type that intersect the
-    /// given ranges.
-    pub fn remove_highlighted_rows<T: 'static>(
-        &mut self,
-        ranges_to_remove: Vec<Range<Anchor>>,
-        cx: &mut Context<Self>,
-    ) {
-        let snapshot = self.buffer().read(cx).snapshot(cx);
-        let row_highlights = self.highlighted_rows.entry(TypeId::of::<T>()).or_default();
-        let mut ranges_to_remove = ranges_to_remove.iter().peekable();
-        row_highlights.retain(|highlight| {
-            while let Some(range_to_remove) = ranges_to_remove.peek() {
-                match range_to_remove.end.cmp(&highlight.range.start, &snapshot) {
-                    Ordering::Less | Ordering::Equal => {
-                        ranges_to_remove.next();
-                    }
-                    Ordering::Greater => {
-                        match range_to_remove.start.cmp(&highlight.range.end, &snapshot) {
-                            Ordering::Less | Ordering::Equal => {
-                                return false;
-                            }
-                            Ordering::Greater => break,
-                        }
-                    }
-                }
-            }
-
-            true
-        })
-    }
-
-    /// Clear all anchor ranges for a certain highlight context type, so no corresponding rows will be highlighted.
-    pub fn clear_row_highlights<T: 'static>(&mut self) {
-        self.highlighted_rows.remove(&TypeId::of::<T>());
-    }
-
-    /// For a highlight given context type, gets all anchor ranges that will be used for row highlighting.
-    pub fn highlighted_rows<T: 'static>(&self) -> impl '_ + Iterator<Item = (Range<Anchor>, Hsla)> {
-        self.highlighted_rows
-            .get(&TypeId::of::<T>())
-            .map_or(&[] as &[_], |vec| vec.as_slice())
-            .iter()
-            .map(|highlight| (highlight.range.clone(), highlight.color))
-    }
-
-    /// Merges all anchor ranges for all context types ever set, picking the last highlight added in case of a row conflict.
-    /// Returns a map of display rows that are highlighted and their corresponding highlight color.
-    /// Allows to ignore certain kinds of highlights.
-    pub fn highlighted_display_rows(
-        &self,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> BTreeMap<DisplayRow, LineHighlight> {
-        let snapshot = self.snapshot(window, cx);
-        let mut used_highlight_orders = HashMap::default();
-        self.highlighted_rows
-            .iter()
-            .flat_map(|(_, highlighted_rows)| highlighted_rows.iter())
-            .fold(
-                BTreeMap::<DisplayRow, LineHighlight>::new(),
-                |mut unique_rows, highlight| {
-                    let start = highlight.range.start.to_display_point(&snapshot);
-                    let end = highlight.range.end.to_display_point(&snapshot);
-                    let start_row = start.row().0;
-                    let end_row = if highlight.range.end.text_anchor != text::Anchor::MAX
-                        && end.column() == 0
-                    {
-                        end.row().0.saturating_sub(1)
-                    } else {
-                        end.row().0
-                    };
-                    for row in start_row..=end_row {
-                        let used_index =
-                            used_highlight_orders.entry(row).or_insert(highlight.index);
-                        if highlight.index >= *used_index {
-                            *used_index = highlight.index;
-                            unique_rows.insert(
-                                DisplayRow(row),
-                                LineHighlight {
-                                    include_gutter: highlight.options.include_gutter,
-                                    border: None,
-                                    background: highlight.color.into(),
-                                    type_id: Some(highlight.type_id),
-                                },
-                            );
-                        }
-                    }
-                    unique_rows
-                },
-            )
-    }
-
-    pub fn highlighted_display_row_for_autoscroll(
-        &self,
-        snapshot: &DisplaySnapshot,
-    ) -> Option<DisplayRow> {
-        self.highlighted_rows
-            .values()
-            .flat_map(|highlighted_rows| highlighted_rows.iter())
-            .filter_map(|highlight| {
-                if highlight.options.autoscroll {
-                    Some(highlight.range.start.to_display_point(snapshot).row())
-                } else {
-                    None
-                }
-            })
-            .min()
-    }
-
-    pub fn set_search_within_ranges(&mut self, ranges: &[Range<Anchor>], cx: &mut Context<Self>) {
-        self.highlight_background::<SearchWithinRange>(
-            ranges,
-            |colors| colors.editor_document_highlight_read_background,
-            cx,
-        )
-    }
-
-    pub fn set_breadcrumb_header(&mut self, new_header: String) {
-        self.breadcrumb_header = Some(new_header);
-    }
-
-    pub fn clear_search_within_ranges(&mut self, cx: &mut Context<Self>) {
-        self.clear_background_highlights::<SearchWithinRange>(cx);
-    }
-
-    pub fn highlight_background<T: 'static>(
-        &mut self,
-        ranges: &[Range<Anchor>],
-        color_fetcher: fn(&ThemeColors) -> Hsla,
-        cx: &mut Context<Self>,
-    ) {
-        self.background_highlights
-            .insert(TypeId::of::<T>(), (color_fetcher, Arc::from(ranges)));
-        self.scrollbar_marker_state.dirty = true;
-        cx.notify();
-    }
-
-    pub fn clear_background_highlights<T: 'static>(
-        &mut self,
-        cx: &mut Context<Self>,
-    ) -> Option<BackgroundHighlight> {
-        let text_highlights = self.background_highlights.remove(&TypeId::of::<T>())?;
-        if !text_highlights.1.is_empty() {
-            self.scrollbar_marker_state.dirty = true;
-            cx.notify();
-        }
-        Some(text_highlights)
-    }
-
-    pub fn highlight_gutter<T: 'static>(
-        &mut self,
-        ranges: &[Range<Anchor>],
-        color_fetcher: fn(&App) -> Hsla,
-        cx: &mut Context<Self>,
-    ) {
-        self.gutter_highlights
-            .insert(TypeId::of::<T>(), (color_fetcher, Arc::from(ranges)));
-        cx.notify();
-    }
-
-    pub fn clear_gutter_highlights<T: 'static>(
-        &mut self,
-        cx: &mut Context<Self>,
-    ) -> Option<GutterHighlight> {
-        cx.notify();
-        self.gutter_highlights.remove(&TypeId::of::<T>())
-    }
-
-    #[cfg(feature = "test-support")]
-    pub fn all_text_background_highlights(
-        &self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Vec<(Range<DisplayPoint>, Hsla)> {
-        let snapshot = self.snapshot(window, cx);
-        let buffer = &snapshot.buffer_snapshot;
-        let start = buffer.anchor_before(0);
-        let end = buffer.anchor_after(buffer.len());
-        let theme = cx.theme().colors();
-        self.background_highlights_in_range(start..end, &snapshot, theme)
-    }
-
-    #[cfg(feature = "test-support")]
-    pub fn search_background_highlights(&mut self, cx: &mut Context<Self>) -> Vec<Range<Point>> {
-        let snapshot = self.buffer().read(cx).snapshot(cx);
-
-        let highlights = self
-            .background_highlights
-            .get(&TypeId::of::<items::BufferSearchHighlights>());
-
-        if let Some((_color, ranges)) = highlights {
-            ranges
-                .iter()
-                .map(|range| range.start.to_point(&snapshot)..range.end.to_point(&snapshot))
-                .collect_vec()
-        } else {
-            vec![]
-        }
-    }
-
-    fn document_highlights_for_position<'a>(
-        &'a self,
-        position: Anchor,
-        buffer: &'a MultiBufferSnapshot,
-    ) -> impl 'a + Iterator<Item = &'a Range<Anchor>> {
-        let read_highlights = self
-            .background_highlights
-            .get(&TypeId::of::<DocumentHighlightRead>())
-            .map(|h| &h.1);
-        let write_highlights = self
-            .background_highlights
-            .get(&TypeId::of::<DocumentHighlightWrite>())
-            .map(|h| &h.1);
-        let left_position = position.bias_left(buffer);
-        let right_position = position.bias_right(buffer);
-        read_highlights
-            .into_iter()
-            .chain(write_highlights)
-            .flat_map(move |ranges| {
-                let start_ix = match ranges.binary_search_by(|probe| {
-                    let cmp = probe.end.cmp(&left_position, buffer);
-                    if cmp.is_ge() {
-                        Ordering::Greater
-                    } else {
-                        Ordering::Less
-                    }
-                }) {
-                    Ok(i) | Err(i) => i,
-                };
-
-                ranges[start_ix..]
-                    .iter()
-                    .take_while(move |range| range.start.cmp(&right_position, buffer).is_le())
-            })
-    }
-
-    pub fn has_background_highlights<T: 'static>(&self) -> bool {
-        self.background_highlights
-            .get(&TypeId::of::<T>())
-            .map_or(false, |(_, highlights)| !highlights.is_empty())
-    }
-
-    pub fn background_highlights_in_range(
-        &self,
-        search_range: Range<Anchor>,
-        display_snapshot: &DisplaySnapshot,
-        theme: &ThemeColors,
-    ) -> Vec<(Range<DisplayPoint>, Hsla)> {
-        let mut results = Vec::new();
-        for (color_fetcher, ranges) in self.background_highlights.values() {
-            let color = color_fetcher(theme);
-            let start_ix = match ranges.binary_search_by(|probe| {
-                let cmp = probe
-                    .end
-                    .cmp(&search_range.start, &display_snapshot.buffer_snapshot);
-                if cmp.is_gt() {
-                    Ordering::Greater
-                } else {
-                    Ordering::Less
-                }
-            }) {
-                Ok(i) | Err(i) => i,
-            };
-            for range in &ranges[start_ix..] {
-                if range
-                    .start
-                    .cmp(&search_range.end, &display_snapshot.buffer_snapshot)
-                    .is_ge()
-                {
-                    break;
-                }
-
-                let start = range.start.to_display_point(display_snapshot);
-                let end = range.end.to_display_point(display_snapshot);
-                results.push((start..end, color))
-            }
-        }
-        results
-    }
-
-    pub fn background_highlight_row_ranges<T: 'static>(
-        &self,
-        search_range: Range<Anchor>,
-        display_snapshot: &DisplaySnapshot,
-        count: usize,
-    ) -> Vec<RangeInclusive<DisplayPoint>> {
-        let mut results = Vec::new();
-        let Some((_, ranges)) = self.background_highlights.get(&TypeId::of::<T>()) else {
-            return vec![];
-        };
-
-        let start_ix = match ranges.binary_search_by(|probe| {
-            let cmp = probe
-                .end
-                .cmp(&search_range.start, &display_snapshot.buffer_snapshot);
-            if cmp.is_gt() {
-                Ordering::Greater
-            } else {
-                Ordering::Less
-            }
-        }) {
-            Ok(i) | Err(i) => i,
-        };
-        let mut push_region = |start: Option<Point>, end: Option<Point>| {
-            if let (Some(start_display), Some(end_display)) = (start, end) {
-                results.push(
-                    start_display.to_display_point(display_snapshot)
-                        ..=end_display.to_display_point(display_snapshot),
-                );
-            }
-        };
-        let mut start_row: Option<Point> = None;
-        let mut end_row: Option<Point> = None;
-        if ranges.len() > count {
-            return Vec::new();
-        }
-        for range in &ranges[start_ix..] {
-            if range
-                .start
-                .cmp(&search_range.end, &display_snapshot.buffer_snapshot)
-                .is_ge()
-            {
-                break;
-            }
-            let end = range.end.to_point(&display_snapshot.buffer_snapshot);
-            if let Some(current_row) = &end_row {
-                if end.row == current_row.row {
-                    continue;
-                }
-            }
-            let start = range.start.to_point(&display_snapshot.buffer_snapshot);
-            if start_row.is_none() {
-                assert_eq!(end_row, None);
-                start_row = Some(start);
-                end_row = Some(end);
-                continue;
-            }
-            if let Some(current_end) = end_row.as_mut() {
-                if start.row > current_end.row + 1 {
-                    push_region(start_row, end_row);
-                    start_row = Some(start);
-                    end_row = Some(end);
-                } else {
-                    // Merge two hunks.
-                    *current_end = end;
-                }
-            } else {
-                unreachable!();
-            }
-        }
-        // We might still have a hunk that was not rendered (if there was a search hit on the last line)
-        push_region(start_row, end_row);
-        results
-    }
-
-    pub fn gutter_highlights_in_range(
-        &self,
-        search_range: Range<Anchor>,
-        display_snapshot: &DisplaySnapshot,
-        cx: &App,
-    ) -> Vec<(Range<DisplayPoint>, Hsla)> {
-        let mut results = Vec::new();
-        for (color_fetcher, ranges) in self.gutter_highlights.values() {
-            let color = color_fetcher(cx);
-            let start_ix = match ranges.binary_search_by(|probe| {
-                let cmp = probe
-                    .end
-                    .cmp(&search_range.start, &display_snapshot.buffer_snapshot);
-                if cmp.is_gt() {
-                    Ordering::Greater
-                } else {
-                    Ordering::Less
-                }
-            }) {
-                Ok(i) | Err(i) => i,
-            };
-            for range in &ranges[start_ix..] {
-                if range
-                    .start
-                    .cmp(&search_range.end, &display_snapshot.buffer_snapshot)
-                    .is_ge()
-                {
-                    break;
-                }
-
-                let start = range.start.to_display_point(display_snapshot);
-                let end = range.end.to_display_point(display_snapshot);
-                results.push((start..end, color))
-            }
-        }
-        results
-    }
-
-    /// Get the text ranges corresponding to the redaction query
-    pub fn redacted_ranges(
-        &self,
-        search_range: Range<Anchor>,
-        display_snapshot: &DisplaySnapshot,
-        cx: &App,
-    ) -> Vec<Range<DisplayPoint>> {
-        display_snapshot
-            .buffer_snapshot
-            .redacted_ranges(search_range, |file| {
-                if let Some(file) = file {
-                    file.is_private()
-                        && EditorSettings::get(
-                            Some(SettingsLocation {
-                                worktree_id: file.worktree_id(cx),
-                                path: file.path().as_ref(),
-                            }),
-                            cx,
-                        )
-                        .redact_private_values
-                } else {
-                    false
-                }
-            })
-            .map(|range| {
-                range.start.to_display_point(display_snapshot)
-                    ..range.end.to_display_point(display_snapshot)
-            })
-            .collect()
-    }
-
-    pub fn highlight_text<T: 'static>(
-        &mut self,
-        ranges: Vec<Range<Anchor>>,
-        style: HighlightStyle,
-        cx: &mut Context<Self>,
-    ) {
-        self.display_map.update(cx, |map, _| {
-            map.highlight_text(TypeId::of::<T>(), ranges, style)
-        });
-        cx.notify();
-    }
-
-    pub(crate) fn highlight_inlays<T: 'static>(
-        &mut self,
-        highlights: Vec<InlayHighlight>,
-        style: HighlightStyle,
-        cx: &mut Context<Self>,
-    ) {
-        self.display_map.update(cx, |map, _| {
-            map.highlight_inlays(TypeId::of::<T>(), highlights, style)
-        });
-        cx.notify();
-    }
-
-    pub fn text_highlights<'a, T: 'static>(
-        &'a self,
-        cx: &'a App,
-    ) -> Option<(HighlightStyle, &'a [Range<Anchor>])> {
-        self.display_map.read(cx).text_highlights(TypeId::of::<T>())
-    }
-
-    pub fn clear_highlights<T: 'static>(&mut self, cx: &mut Context<Self>) {
-        let cleared = self
-            .display_map
-            .update(cx, |map, _| map.clear_highlights(TypeId::of::<T>()));
-        if cleared {
-            cx.notify();
-        }
-    }
-
-    pub fn show_local_cursors(&self, window: &mut Window, cx: &mut App) -> bool {
-        (self.read_only(cx) || self.blink_manager.read(cx).visible())
-            && self.focus_handle.is_focused(window)
-    }
-
-    pub fn set_show_cursor_when_unfocused(&mut self, is_enabled: bool, cx: &mut Context<Self>) {
-        self.show_cursor_when_unfocused = is_enabled;
-        cx.notify();
-    }
-
-    fn on_buffer_changed(&mut self, _: Entity<MultiBuffer>, cx: &mut Context<Self>) {
-        cx.notify();
-    }
-
-    fn on_debug_session_event(
-        &mut self,
-        _session: Entity<Session>,
-        event: &SessionEvent,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            SessionEvent::InvalidateInlineValue => {
-                self.refresh_inline_values(cx);
-            }
-            _ => {}
-        }
-    }
-
-    fn refresh_inline_values(&mut self, cx: &mut Context<Self>) {
-        let Some(project) = self.project.clone() else {
-            return;
-        };
-        let Some(buffer) = self.buffer.read(cx).as_singleton() else {
-            return;
-        };
-        if !self.inline_value_cache.enabled {
-            let inlays = std::mem::take(&mut self.inline_value_cache.inlays);
-            self.splice_inlays(&inlays, Vec::new(), cx);
-            return;
-        }
-
-        let current_execution_position = self
-            .highlighted_rows
-            .get(&TypeId::of::<ActiveDebugLine>())
-            .and_then(|lines| lines.last().map(|line| line.range.start));
-
-        self.inline_value_cache.refresh_task = cx.spawn(async move |editor, cx| {
-            let snapshot = editor
-                .update(cx, |editor, cx| editor.buffer().read(cx).snapshot(cx))
-                .ok()?;
-
-            let inline_values = editor
-                .update(cx, |_, cx| {
-                    let Some(current_execution_position) = current_execution_position else {
-                        return Some(Task::ready(Ok(Vec::new())));
-                    };
-
-                    // todo(debugger) when introducing multi buffer inline values check execution position's buffer id to make sure the text
-                    // anchor is in the same buffer
-                    let range =
-                        buffer.read(cx).anchor_before(0)..current_execution_position.text_anchor;
-                    project.inline_values(buffer, range, cx)
-                })
-                .ok()
-                .flatten()?
-                .await
-                .context("refreshing debugger inlays")
-                .log_err()?;
-
-            let (excerpt_id, buffer_id) = snapshot
-                .excerpts()
-                .next()
-                .map(|excerpt| (excerpt.0, excerpt.1.remote_id()))?;
-            editor
-                .update(cx, |editor, cx| {
-                    let new_inlays = inline_values
-                        .into_iter()
-                        .map(|debugger_value| {
-                            Inlay::debugger_hint(
-                                post_inc(&mut editor.next_inlay_id),
-                                Anchor::in_buffer(excerpt_id, buffer_id, debugger_value.position),
-                                debugger_value.text(),
-                            )
-                        })
-                        .collect::<Vec<_>>();
-                    let mut inlay_ids = new_inlays.iter().map(|inlay| inlay.id).collect();
-                    std::mem::swap(&mut editor.inline_value_cache.inlays, &mut inlay_ids);
-
-                    editor.splice_inlays(&inlay_ids, new_inlays, cx);
-                })
-                .ok()?;
-            Some(())
-        });
-    }
-
-    fn on_buffer_event(
-        &mut self,
-        multibuffer: &Entity<MultiBuffer>,
-        event: &multi_buffer::Event,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            multi_buffer::Event::Edited {
-                singleton_buffer_edited,
-                edited_buffer: buffer_edited,
-            } => {
-                self.scrollbar_marker_state.dirty = true;
-                self.active_indent_guides_state.dirty = true;
-                self.refresh_active_diagnostics(cx);
-                self.refresh_code_actions(window, cx);
-                self.refresh_selected_text_highlights(true, window, cx);
-                refresh_matching_bracket_highlights(self, window, cx);
-                if self.has_active_inline_completion() {
-                    self.update_visible_inline_completion(window, cx);
-                }
-                if let Some(buffer) = buffer_edited {
-                    let buffer_id = buffer.read(cx).remote_id();
-                    if !self.registered_buffers.contains_key(&buffer_id) {
-                        if let Some(project) = self.project.as_ref() {
-                            project.update(cx, |project, cx| {
-                                self.registered_buffers.insert(
-                                    buffer_id,
-                                    project.register_buffer_with_language_servers(&buffer, cx),
-                                );
-                            })
-                        }
-                    }
-                }
-                cx.emit(EditorEvent::BufferEdited);
-                cx.emit(SearchEvent::MatchesInvalidated);
-                if *singleton_buffer_edited {
-                    if let Some(project) = &self.project {
-                        #[allow(clippy::mutable_key_type)]
-                        let languages_affected = multibuffer.update(cx, |multibuffer, cx| {
-                            multibuffer
-                                .all_buffers()
-                                .into_iter()
-                                .filter_map(|buffer| {
-                                    buffer.update(cx, |buffer, cx| {
-                                        let language = buffer.language()?;
-                                        let should_discard = project.update(cx, |project, cx| {
-                                            project.is_local()
-                                                && !project.has_language_servers_for(buffer, cx)
-                                        });
-                                        should_discard.not().then_some(language.clone())
-                                    })
-                                })
-                                .collect::<HashSet<_>>()
-                        });
-                        if !languages_affected.is_empty() {
-                            self.refresh_inlay_hints(
-                                InlayHintRefreshReason::BufferEdited(languages_affected),
-                                cx,
-                            );
-                        }
-                    }
-                }
-
-                let Some(project) = &self.project else { return };
-                let (telemetry, is_via_ssh) = {
-                    let project = project.read(cx);
-                    let telemetry = project.client().telemetry().clone();
-                    let is_via_ssh = project.is_via_ssh();
-                    (telemetry, is_via_ssh)
-                };
-                refresh_linked_ranges(self, window, cx);
-                telemetry.log_edit_event("editor", is_via_ssh);
-            }
-            multi_buffer::Event::ExcerptsAdded {
-                buffer,
-                predecessor,
-                excerpts,
-            } => {
-                self.tasks_update_task = Some(self.refresh_runnables(window, cx));
-                let buffer_id = buffer.read(cx).remote_id();
-                if self.buffer.read(cx).diff_for(buffer_id).is_none() {
-                    if let Some(project) = &self.project {
-                        get_uncommitted_diff_for_buffer(
-                            project,
-                            [buffer.clone()],
-                            self.buffer.clone(),
-                            cx,
-                        )
-                        .detach();
-                    }
-                }
-                cx.emit(EditorEvent::ExcerptsAdded {
-                    buffer: buffer.clone(),
-                    predecessor: *predecessor,
-                    excerpts: excerpts.clone(),
-                });
-                self.refresh_inlay_hints(InlayHintRefreshReason::NewLinesShown, cx);
-            }
-            multi_buffer::Event::ExcerptsRemoved {
-                ids,
-                removed_buffer_ids,
-            } => {
-                self.refresh_inlay_hints(InlayHintRefreshReason::ExcerptsRemoved(ids.clone()), cx);
-                let buffer = self.buffer.read(cx);
-                self.registered_buffers
-                    .retain(|buffer_id, _| buffer.buffer(*buffer_id).is_some());
-                jsx_tag_auto_close::refresh_enabled_in_any_buffer(self, multibuffer, cx);
-                cx.emit(EditorEvent::ExcerptsRemoved {
-                    ids: ids.clone(),
-                    removed_buffer_ids: removed_buffer_ids.clone(),
-                })
-            }
-            multi_buffer::Event::ExcerptsEdited {
-                excerpt_ids,
-                buffer_ids,
-            } => {
-                self.display_map.update(cx, |map, cx| {
-                    map.unfold_buffers(buffer_ids.iter().copied(), cx)
-                });
-                cx.emit(EditorEvent::ExcerptsEdited {
-                    ids: excerpt_ids.clone(),
-                })
-            }
-            multi_buffer::Event::ExcerptsExpanded { ids } => {
-                self.refresh_inlay_hints(InlayHintRefreshReason::NewLinesShown, cx);
-                cx.emit(EditorEvent::ExcerptsExpanded { ids: ids.clone() })
-            }
-            multi_buffer::Event::Reparsed(buffer_id) => {
-                self.tasks_update_task = Some(self.refresh_runnables(window, cx));
-                jsx_tag_auto_close::refresh_enabled_in_any_buffer(self, multibuffer, cx);
-
-                cx.emit(EditorEvent::Reparsed(*buffer_id));
-            }
-            multi_buffer::Event::DiffHunksToggled => {
-                self.tasks_update_task = Some(self.refresh_runnables(window, cx));
-            }
-            multi_buffer::Event::LanguageChanged(buffer_id) => {
-                linked_editing_ranges::refresh_linked_ranges(self, window, cx);
-                jsx_tag_auto_close::refresh_enabled_in_any_buffer(self, multibuffer, cx);
-                cx.emit(EditorEvent::Reparsed(*buffer_id));
-                cx.notify();
-            }
-            multi_buffer::Event::DirtyChanged => cx.emit(EditorEvent::DirtyChanged),
-            multi_buffer::Event::Saved => cx.emit(EditorEvent::Saved),
-            multi_buffer::Event::FileHandleChanged
-            | multi_buffer::Event::Reloaded
-            | multi_buffer::Event::BufferDiffChanged => cx.emit(EditorEvent::TitleChanged),
-            multi_buffer::Event::Closed => cx.emit(EditorEvent::Closed),
-            multi_buffer::Event::DiagnosticsUpdated => {
-                self.refresh_active_diagnostics(cx);
-                self.refresh_inline_diagnostics(true, window, cx);
-                self.scrollbar_marker_state.dirty = true;
-                cx.notify();
-            }
-            _ => {}
-        };
-    }
-
-    fn on_display_map_changed(
-        &mut self,
-        _: Entity<DisplayMap>,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        cx.notify();
-    }
-
-    fn settings_changed(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.tasks_update_task = Some(self.refresh_runnables(window, cx));
-        self.update_edit_prediction_settings(cx);
-        self.refresh_inline_completion(true, false, window, cx);
-        self.refresh_inlay_hints(
-            InlayHintRefreshReason::SettingsChange(inlay_hint_settings(
-                self.selections.newest_anchor().head(),
-                &self.buffer.read(cx).snapshot(cx),
-                cx,
-            )),
-            cx,
-        );
-
-        let old_cursor_shape = self.cursor_shape;
-
-        {
-            let editor_settings = EditorSettings::get_global(cx);
-            self.scroll_manager.vertical_scroll_margin = editor_settings.vertical_scroll_margin;
-            self.show_breadcrumbs = editor_settings.toolbar.breadcrumbs;
-            self.cursor_shape = editor_settings.cursor_shape.unwrap_or_default();
-            self.hide_mouse_mode = editor_settings.hide_mouse.unwrap_or_default();
-        }
-
-        if old_cursor_shape != self.cursor_shape {
-            cx.emit(EditorEvent::CursorShapeChanged);
-        }
-
-        let project_settings = ProjectSettings::get_global(cx);
-        self.serialize_dirty_buffers = project_settings.session.restore_unsaved_buffers;
-
-        if self.mode.is_full() {
-            let show_inline_diagnostics = project_settings.diagnostics.inline.enabled;
-            let inline_blame_enabled = project_settings.git.inline_blame_enabled();
-            if self.show_inline_diagnostics != show_inline_diagnostics {
-                self.show_inline_diagnostics = show_inline_diagnostics;
-                self.refresh_inline_diagnostics(false, window, cx);
-            }
-
-            if self.git_blame_inline_enabled != inline_blame_enabled {
-                self.toggle_git_blame_inline_internal(false, window, cx);
-            }
-        }
-
-        cx.notify();
-    }
-
-    pub fn set_searchable(&mut self, searchable: bool) {
-        self.searchable = searchable;
-    }
-
-    pub fn searchable(&self) -> bool {
-        self.searchable
-    }
-
-    fn open_proposed_changes_editor(
-        &mut self,
-        _: &OpenProposedChangesEditor,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(workspace) = self.workspace() else {
-            cx.propagate();
-            return;
-        };
-
-        let selections = self.selections.all::<usize>(cx);
-        let multi_buffer = self.buffer.read(cx);
-        let multi_buffer_snapshot = multi_buffer.snapshot(cx);
-        let mut new_selections_by_buffer = HashMap::default();
-        for selection in selections {
-            for (buffer, range, _) in
-                multi_buffer_snapshot.range_to_buffer_ranges(selection.start..selection.end)
-            {
-                let mut range = range.to_point(buffer);
-                range.start.column = 0;
-                range.end.column = buffer.line_len(range.end.row);
-                new_selections_by_buffer
-                    .entry(multi_buffer.buffer(buffer.remote_id()).unwrap())
-                    .or_insert(Vec::new())
-                    .push(range)
-            }
-        }
-
-        let proposed_changes_buffers = new_selections_by_buffer
-            .into_iter()
-            .map(|(buffer, ranges)| ProposedChangeLocation { buffer, ranges })
-            .collect::<Vec<_>>();
-        let proposed_changes_editor = cx.new(|cx| {
-            ProposedChangesEditor::new(
-                "Proposed changes",
-                proposed_changes_buffers,
-                self.project.clone(),
-                window,
-                cx,
-            )
-        });
-
-        window.defer(cx, move |window, cx| {
-            workspace.update(cx, |workspace, cx| {
-                workspace.active_pane().update(cx, |pane, cx| {
-                    pane.add_item(
-                        Box::new(proposed_changes_editor),
-                        true,
-                        true,
-                        None,
-                        window,
-                        cx,
-                    );
-                });
-            });
-        });
-    }
-
-    pub fn open_excerpts_in_split(
-        &mut self,
-        _: &OpenExcerptsSplit,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.open_excerpts_common(None, true, window, cx)
-    }
-
-    pub fn open_excerpts(&mut self, _: &OpenExcerpts, window: &mut Window, cx: &mut Context<Self>) {
-        self.open_excerpts_common(None, false, window, cx)
-    }
-
-    fn open_excerpts_common(
-        &mut self,
-        jump_data: Option<JumpData>,
-        split: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(workspace) = self.workspace() else {
-            cx.propagate();
-            return;
-        };
-
-        if self.buffer.read(cx).is_singleton() {
-            cx.propagate();
-            return;
-        }
-
-        let mut new_selections_by_buffer = HashMap::default();
-        match &jump_data {
-            Some(JumpData::MultiBufferPoint {
-                excerpt_id,
-                position,
-                anchor,
-                line_offset_from_top,
-            }) => {
-                let multi_buffer_snapshot = self.buffer.read(cx).snapshot(cx);
-                if let Some(buffer) = multi_buffer_snapshot
-                    .buffer_id_for_excerpt(*excerpt_id)
-                    .and_then(|buffer_id| self.buffer.read(cx).buffer(buffer_id))
-                {
-                    let buffer_snapshot = buffer.read(cx).snapshot();
-                    let jump_to_point = if buffer_snapshot.can_resolve(anchor) {
-                        language::ToPoint::to_point(anchor, &buffer_snapshot)
-                    } else {
-                        buffer_snapshot.clip_point(*position, Bias::Left)
-                    };
-                    let jump_to_offset = buffer_snapshot.point_to_offset(jump_to_point);
-                    new_selections_by_buffer.insert(
-                        buffer,
-                        (
-                            vec![jump_to_offset..jump_to_offset],
-                            Some(*line_offset_from_top),
-                        ),
-                    );
-                }
-            }
-            Some(JumpData::MultiBufferRow {
-                row,
-                line_offset_from_top,
-            }) => {
-                let point = MultiBufferPoint::new(row.0, 0);
-                if let Some((buffer, buffer_point, _)) =
-                    self.buffer.read(cx).point_to_buffer_point(point, cx)
-                {
-                    let buffer_offset = buffer.read(cx).point_to_offset(buffer_point);
-                    new_selections_by_buffer
-                        .entry(buffer)
-                        .or_insert((Vec::new(), Some(*line_offset_from_top)))
-                        .0
-                        .push(buffer_offset..buffer_offset)
-                }
-            }
-            None => {
-                let selections = self.selections.all::<usize>(cx);
-                let multi_buffer = self.buffer.read(cx);
-                for selection in selections {
-                    for (snapshot, range, _, anchor) in multi_buffer
-                        .snapshot(cx)
-                        .range_to_buffer_ranges_with_deleted_hunks(selection.range())
-                    {
-                        if let Some(anchor) = anchor {
-                            // selection is in a deleted hunk
-                            let Some(buffer_id) = anchor.buffer_id else {
-                                continue;
-                            };
-                            let Some(buffer_handle) = multi_buffer.buffer(buffer_id) else {
-                                continue;
-                            };
-                            let offset = text::ToOffset::to_offset(
-                                &anchor.text_anchor,
-                                &buffer_handle.read(cx).snapshot(),
-                            );
-                            let range = offset..offset;
-                            new_selections_by_buffer
-                                .entry(buffer_handle)
-                                .or_insert((Vec::new(), None))
-                                .0
-                                .push(range)
-                        } else {
-                            let Some(buffer_handle) = multi_buffer.buffer(snapshot.remote_id())
-                            else {
-                                continue;
-                            };
-                            new_selections_by_buffer
-                                .entry(buffer_handle)
-                                .or_insert((Vec::new(), None))
-                                .0
-                                .push(range)
-                        }
-                    }
-                }
-            }
-        }
-
-        new_selections_by_buffer
-            .retain(|buffer, _| Self::can_open_excerpts_in_file(buffer.read(cx).file()));
-
-        if new_selections_by_buffer.is_empty() {
-            return;
-        }
-
-        // We defer the pane interaction because we ourselves are a workspace item
-        // and activating a new item causes the pane to call a method on us reentrantly,
-        // which panics if we're on the stack.
-        window.defer(cx, move |window, cx| {
-            workspace.update(cx, |workspace, cx| {
-                let pane = if split {
-                    workspace.adjacent_pane(window, cx)
-                } else {
-                    workspace.active_pane().clone()
-                };
-
-                for (buffer, (ranges, scroll_offset)) in new_selections_by_buffer {
-                    let editor = buffer
-                        .read(cx)
-                        .file()
-                        .is_none()
-                        .then(|| {
-                            // Handle file-less buffers separately: those are not really the project items, so won't have a project path or entity id,
-                            // so `workspace.open_project_item` will never find them, always opening a new editor.
-                            // Instead, we try to activate the existing editor in the pane first.
-                            let (editor, pane_item_index) =
-                                pane.read(cx).items().enumerate().find_map(|(i, item)| {
-                                    let editor = item.downcast::<Editor>()?;
-                                    let singleton_buffer =
-                                        editor.read(cx).buffer().read(cx).as_singleton()?;
-                                    if singleton_buffer == buffer {
-                                        Some((editor, i))
-                                    } else {
-                                        None
-                                    }
-                                })?;
-                            pane.update(cx, |pane, cx| {
-                                pane.activate_item(pane_item_index, true, true, window, cx)
-                            });
-                            Some(editor)
-                        })
-                        .flatten()
-                        .unwrap_or_else(|| {
-                            workspace.open_project_item::<Self>(
-                                pane.clone(),
-                                buffer,
-                                true,
-                                true,
-                                window,
-                                cx,
-                            )
-                        });
-
-                    editor.update(cx, |editor, cx| {
-                        let autoscroll = match scroll_offset {
-                            Some(scroll_offset) => Autoscroll::top_relative(scroll_offset as usize),
-                            None => Autoscroll::newest(),
-                        };
-                        let nav_history = editor.nav_history.take();
-                        editor.change_selections(Some(autoscroll), window, cx, |s| {
-                            s.select_ranges(ranges);
-                        });
-                        editor.nav_history = nav_history;
-                    });
-                }
-            })
-        });
-    }
-
-    // For now, don't allow opening excerpts in buffers that aren't backed by
-    // regular project files.
-    fn can_open_excerpts_in_file(file: Option<&Arc<dyn language::File>>) -> bool {
-        file.map_or(true, |file| project::File::from_dyn(Some(file)).is_some())
-    }
-
-    fn marked_text_ranges(&self, cx: &App) -> Option<Vec<Range<OffsetUtf16>>> {
-        let snapshot = self.buffer.read(cx).read(cx);
-        let (_, ranges) = self.text_highlights::<InputComposition>(cx)?;
-        Some(
-            ranges
-                .iter()
-                .map(move |range| {
-                    range.start.to_offset_utf16(&snapshot)..range.end.to_offset_utf16(&snapshot)
-                })
-                .collect(),
-        )
-    }
-
-    fn selection_replacement_ranges(
-        &self,
-        range: Range<OffsetUtf16>,
-        cx: &mut App,
-    ) -> Vec<Range<OffsetUtf16>> {
-        let selections = self.selections.all::<OffsetUtf16>(cx);
-        let newest_selection = selections
-            .iter()
-            .max_by_key(|selection| selection.id)
-            .unwrap();
-        let start_delta = range.start.0 as isize - newest_selection.start.0 as isize;
-        let end_delta = range.end.0 as isize - newest_selection.end.0 as isize;
-        let snapshot = self.buffer.read(cx).read(cx);
-        selections
-            .into_iter()
-            .map(|mut selection| {
-                selection.start.0 =
-                    (selection.start.0 as isize).saturating_add(start_delta) as usize;
-                selection.end.0 = (selection.end.0 as isize).saturating_add(end_delta) as usize;
-                snapshot.clip_offset_utf16(selection.start, Bias::Left)
-                    ..snapshot.clip_offset_utf16(selection.end, Bias::Right)
-            })
-            .collect()
-    }
-
-    fn report_editor_event(
-        &self,
-        event_type: &'static str,
-        file_extension: Option<String>,
-        cx: &App,
-    ) {
-        if cfg!(any(test, feature = "test-support")) {
-            return;
-        }
-
-        let Some(project) = &self.project else { return };
-
-        // If None, we are in a file without an extension
-        let file = self
-            .buffer
-            .read(cx)
-            .as_singleton()
-            .and_then(|b| b.read(cx).file());
-        let file_extension = file_extension.or(file
-            .as_ref()
-            .and_then(|file| Path::new(file.file_name(cx)).extension())
-            .and_then(|e| e.to_str())
-            .map(|a| a.to_string()));
-
-        let vim_mode = vim_enabled(cx);
-
-        let edit_predictions_provider = all_language_settings(file, cx).edit_predictions.provider;
-        let copilot_enabled = edit_predictions_provider
-            == language::language_settings::EditPredictionProvider::Copilot;
-        let copilot_enabled_for_language = self
-            .buffer
-            .read(cx)
-            .language_settings(cx)
-            .show_edit_predictions;
-
-        let project = project.read(cx);
-        telemetry::event!(
-            event_type,
-            file_extension,
-            vim_mode,
-            copilot_enabled,
-            copilot_enabled_for_language,
-            edit_predictions_provider,
-            is_via_ssh = project.is_via_ssh(),
-        );
-    }
-
-    /// Copy the highlighted chunks to the clipboard as JSON. The format is an array of lines,
-    /// with each line being an array of {text, highlight} objects.
-    fn copy_highlight_json(
-        &mut self,
-        _: &CopyHighlightJson,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        #[derive(Serialize)]
-        struct Chunk<'a> {
-            text: String,
-            highlight: Option<&'a str>,
-        }
-
-        let snapshot = self.buffer.read(cx).snapshot(cx);
-        let range = self
-            .selected_text_range(false, window, cx)
-            .and_then(|selection| {
-                if selection.range.is_empty() {
-                    None
-                } else {
-                    Some(selection.range)
-                }
-            })
-            .unwrap_or_else(|| 0..snapshot.len());
-
-        let chunks = snapshot.chunks(range, true);
-        let mut lines = Vec::new();
-        let mut line: VecDeque<Chunk> = VecDeque::new();
-
-        let Some(style) = self.style.as_ref() else {
-            return;
-        };
-
-        for chunk in chunks {
-            let highlight = chunk
-                .syntax_highlight_id
-                .and_then(|id| id.name(&style.syntax));
-            let mut chunk_lines = chunk.text.split('\n').peekable();
-            while let Some(text) = chunk_lines.next() {
-                let mut merged_with_last_token = false;
-                if let Some(last_token) = line.back_mut() {
-                    if last_token.highlight == highlight {
-                        last_token.text.push_str(text);
-                        merged_with_last_token = true;
-                    }
-                }
-
-                if !merged_with_last_token {
-                    line.push_back(Chunk {
-                        text: text.into(),
-                        highlight,
-                    });
-                }
-
-                if chunk_lines.peek().is_some() {
-                    if line.len() > 1 && line.front().unwrap().text.is_empty() {
-                        line.pop_front();
-                    }
-                    if line.len() > 1 && line.back().unwrap().text.is_empty() {
-                        line.pop_back();
-                    }
-
-                    lines.push(mem::take(&mut line));
-                }
-            }
-        }
-
-        let Some(lines) = serde_json::to_string_pretty(&lines).log_err() else {
-            return;
-        };
-        cx.write_to_clipboard(ClipboardItem::new_string(lines));
-    }
-
-    pub fn open_context_menu(
-        &mut self,
-        _: &OpenContextMenu,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.request_autoscroll(Autoscroll::newest(), cx);
-        let position = self.selections.newest_display(cx).start;
-        mouse_context_menu::deploy_context_menu(self, None, position, window, cx);
-    }
-
-    pub fn inlay_hint_cache(&self) -> &InlayHintCache {
-        &self.inlay_hint_cache
-    }
-
-    pub fn replay_insert_event(
-        &mut self,
-        text: &str,
-        relative_utf16_range: Option<Range<isize>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if !self.input_enabled {
-            cx.emit(EditorEvent::InputIgnored { text: text.into() });
-            return;
-        }
-        if let Some(relative_utf16_range) = relative_utf16_range {
-            let selections = self.selections.all::<OffsetUtf16>(cx);
-            self.change_selections(None, window, cx, |s| {
-                let new_ranges = selections.into_iter().map(|range| {
-                    let start = OffsetUtf16(
-                        range
-                            .head()
-                            .0
-                            .saturating_add_signed(relative_utf16_range.start),
-                    );
-                    let end = OffsetUtf16(
-                        range
-                            .head()
-                            .0
-                            .saturating_add_signed(relative_utf16_range.end),
-                    );
-                    start..end
-                });
-                s.select_ranges(new_ranges);
-            });
-        }
-
-        self.handle_input(text, window, cx);
-    }
-
-    pub fn supports_inlay_hints(&self, cx: &mut App) -> bool {
-        let Some(provider) = self.semantics_provider.as_ref() else {
-            return false;
-        };
-
-        let mut supports = false;
-        self.buffer().update(cx, |this, cx| {
-            this.for_each_buffer(|buffer| {
-                supports |= provider.supports_inlay_hints(buffer, cx);
-            });
-        });
-
-        supports
-    }
-
-    pub fn is_focused(&self, window: &Window) -> bool {
-        self.focus_handle.is_focused(window)
-    }
-
-    fn handle_focus(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        cx.emit(EditorEvent::Focused);
-
-        if let Some(descendant) = self
-            .last_focused_descendant
-            .take()
-            .and_then(|descendant| descendant.upgrade())
-        {
-            window.focus(&descendant);
-        } else {
-            if let Some(blame) = self.blame.as_ref() {
-                blame.update(cx, GitBlame::focus)
-            }
-
-            self.blink_manager.update(cx, |blink_manager, cx| {
-                blink_manager.enable(cx);
-            });
-            self.show_cursor_names(window, cx);
-            self.buffer.update(cx, |buffer, cx| {
-                buffer.finalize_last_transaction(cx);
-                if self.leader_peer_id.is_none() {
-                    buffer.set_active_selections(
-                        &self.selections.disjoint_anchors(),
-                        self.selections.line_mode,
-                        self.cursor_shape,
-                        cx,
-                    );
-                }
-            });
-        }
-    }
-
-    fn handle_focus_in(&mut self, _: &mut Window, cx: &mut Context<Self>) {
-        cx.emit(EditorEvent::FocusedIn)
-    }
-
-    fn handle_focus_out(
-        &mut self,
-        event: FocusOutEvent,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if event.blurred != self.focus_handle {
-            self.last_focused_descendant = Some(event.blurred);
-        }
-        self.refresh_inlay_hints(InlayHintRefreshReason::ModifiersChanged(false), cx);
-    }
-
-    pub fn handle_blur(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.blink_manager.update(cx, BlinkManager::disable);
-        self.buffer
-            .update(cx, |buffer, cx| buffer.remove_active_selections(cx));
-
-        if let Some(blame) = self.blame.as_ref() {
-            blame.update(cx, GitBlame::blur)
-        }
-        if !self.hover_state.focused(window, cx) {
-            hide_hover(self, cx);
-        }
-        if !self
-            .context_menu
-            .borrow()
-            .as_ref()
-            .is_some_and(|context_menu| context_menu.focused(window, cx))
-        {
-            self.hide_context_menu(window, cx);
-        }
-        self.discard_inline_completion(false, cx);
-        cx.emit(EditorEvent::Blurred);
-        cx.notify();
-    }
-
-    pub fn register_action<A: Action>(
-        &mut self,
-        listener: impl Fn(&A, &mut Window, &mut App) + 'static,
-    ) -> Subscription {
-        let id = self.next_editor_action_id.post_inc();
-        let listener = Arc::new(listener);
-        self.editor_actions.borrow_mut().insert(
-            id,
-            Box::new(move |window, _| {
-                let listener = listener.clone();
-                window.on_action(TypeId::of::<A>(), move |action, phase, window, cx| {
-                    let action = action.downcast_ref().unwrap();
-                    if phase == DispatchPhase::Bubble {
-                        listener(action, window, cx)
-                    }
-                })
-            }),
-        );
-
-        let editor_actions = self.editor_actions.clone();
-        Subscription::new(move || {
-            editor_actions.borrow_mut().remove(&id);
-        })
-    }
-
-    pub fn file_header_size(&self) -> u32 {
-        FILE_HEADER_HEIGHT
-    }
-
-    pub fn restore(
-        &mut self,
-        revert_changes: HashMap<BufferId, Vec<(Range<text::Anchor>, Rope)>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let workspace = self.workspace();
-        let project = self.project.as_ref();
-        let save_tasks = self.buffer().update(cx, |multi_buffer, cx| {
-            let mut tasks = Vec::new();
-            for (buffer_id, changes) in revert_changes {
-                if let Some(buffer) = multi_buffer.buffer(buffer_id) {
-                    buffer.update(cx, |buffer, cx| {
-                        buffer.edit(
-                            changes
-                                .into_iter()
-                                .map(|(range, text)| (range, text.to_string())),
-                            None,
-                            cx,
-                        );
-                    });
-
-                    if let Some(project) =
-                        project.filter(|_| multi_buffer.all_diff_hunks_expanded())
-                    {
-                        project.update(cx, |project, cx| {
-                            tasks.push((buffer.clone(), project.save_buffer(buffer, cx)));
-                        })
-                    }
-                }
-            }
-            tasks
-        });
-        cx.spawn_in(window, async move |_, cx| {
-            for (buffer, task) in save_tasks {
-                let result = task.await;
-                if result.is_err() {
-                    let Some(path) = buffer
-                        .read_with(cx, |buffer, cx| buffer.project_path(cx))
-                        .ok()
-                    else {
-                        continue;
-                    };
-                    if let Some((workspace, path)) = workspace.as_ref().zip(path) {
-                        let Some(task) = cx
-                            .update_window_entity(&workspace, |workspace, window, cx| {
-                                workspace
-                                    .open_path_preview(path, None, false, false, false, window, cx)
-                            })
-                            .ok()
-                        else {
-                            continue;
-                        };
-                        task.await.log_err();
-                    }
-                }
-            }
-        })
-        .detach();
-        self.change_selections(None, window, cx, |selections| selections.refresh());
-    }
-
-    pub fn to_pixel_point(
-        &self,
-        source: multi_buffer::Anchor,
-        editor_snapshot: &EditorSnapshot,
-        window: &mut Window,
-    ) -> Option<gpui::Point<Pixels>> {
-        let source_point = source.to_display_point(editor_snapshot);
-        self.display_to_pixel_point(source_point, editor_snapshot, window)
-    }
-
-    pub fn display_to_pixel_point(
-        &self,
-        source: DisplayPoint,
-        editor_snapshot: &EditorSnapshot,
-        window: &mut Window,
-    ) -> Option<gpui::Point<Pixels>> {
-        let line_height = self.style()?.text.line_height_in_pixels(window.rem_size());
-        let text_layout_details = self.text_layout_details(window);
-        let scroll_top = text_layout_details
-            .scroll_anchor
-            .scroll_position(editor_snapshot)
-            .y;
-
-        if source.row().as_f32() < scroll_top.floor() {
-            return None;
-        }
-        let source_x = editor_snapshot.x_for_display_point(source, &text_layout_details);
-        let source_y = line_height * (source.row().as_f32() - scroll_top);
-        Some(gpui::Point::new(source_x, source_y))
-    }
-
-    pub fn has_visible_completions_menu(&self) -> bool {
-        !self.edit_prediction_preview_is_active()
-            && self.context_menu.borrow().as_ref().map_or(false, |menu| {
-                menu.visible() && matches!(menu, CodeContextMenu::Completions(_))
-            })
-    }
-
-    pub fn register_addon<T: Addon>(&mut self, instance: T) {
-        self.addons
-            .insert(std::any::TypeId::of::<T>(), Box::new(instance));
-    }
-
-    pub fn unregister_addon<T: Addon>(&mut self) {
-        self.addons.remove(&std::any::TypeId::of::<T>());
-    }
-
-    pub fn addon<T: Addon>(&self) -> Option<&T> {
-        let type_id = std::any::TypeId::of::<T>();
-        self.addons
-            .get(&type_id)
-            .and_then(|item| item.to_any().downcast_ref::<T>())
-    }
-
-    pub fn addon_mut<T: Addon>(&mut self) -> Option<&mut T> {
-        let type_id = std::any::TypeId::of::<T>();
-        self.addons
-            .get_mut(&type_id)
-            .and_then(|item| item.to_any_mut()?.downcast_mut::<T>())
-    }
-
-    fn character_size(&self, window: &mut Window) -> gpui::Size<Pixels> {
-        let text_layout_details = self.text_layout_details(window);
-        let style = &text_layout_details.editor_style;
-        let font_id = window.text_system().resolve_font(&style.text.font());
-        let font_size = style.text.font_size.to_pixels(window.rem_size());
-        let line_height = style.text.line_height_in_pixels(window.rem_size());
-        let em_width = window.text_system().em_width(font_id, font_size).unwrap();
-
-        gpui::Size::new(em_width, line_height)
-    }
-
-    pub fn wait_for_diff_to_load(&self) -> Option<Shared<Task<()>>> {
-        self.load_diff_task.clone()
-    }
-
-    fn read_metadata_from_db(
-        &mut self,
-        item_id: u64,
-        workspace_id: WorkspaceId,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) {
-        if self.is_singleton(cx)
-            && WorkspaceSettings::get(None, cx).restore_on_startup != RestoreOnStartupBehavior::None
-        {
-            let buffer_snapshot = OnceCell::new();
-
-            if let Some(folds) = DB.get_editor_folds(item_id, workspace_id).log_err() {
-                if !folds.is_empty() {
-                    let snapshot =
-                        buffer_snapshot.get_or_init(|| self.buffer.read(cx).snapshot(cx));
-                    self.fold_ranges(
-                        folds
-                            .into_iter()
-                            .map(|(start, end)| {
-                                snapshot.clip_offset(start, Bias::Left)
-                                    ..snapshot.clip_offset(end, Bias::Right)
-                            })
-                            .collect(),
-                        false,
-                        window,
-                        cx,
-                    );
-                }
-            }
-
-            if let Some(selections) = DB.get_editor_selections(item_id, workspace_id).log_err() {
-                if !selections.is_empty() {
-                    let snapshot =
-                        buffer_snapshot.get_or_init(|| self.buffer.read(cx).snapshot(cx));
-                    self.change_selections(None, window, cx, |s| {
-                        s.select_ranges(selections.into_iter().map(|(start, end)| {
-                            snapshot.clip_offset(start, Bias::Left)
-                                ..snapshot.clip_offset(end, Bias::Right)
-                        }));
-                    });
-                }
-            };
-        }
-
-        self.read_scroll_position_from_db(item_id, workspace_id, window, cx);
-    }
-}
-
-fn vim_enabled(cx: &App) -> bool {
-    cx.global::<SettingsStore>()
-        .raw_user_settings()
-        .get("vim_mode")
-        == Some(&serde_json::Value::Bool(true))
-}
-
-// Consider user intent and default settings
-fn choose_completion_range(
-    completion: &Completion,
-    intent: CompletionIntent,
-    buffer: &Entity<Buffer>,
-    cx: &mut Context<Editor>,
-) -> Range<usize> {
-    fn should_replace(
-        completion: &Completion,
-        insert_range: &Range<text::Anchor>,
-        intent: CompletionIntent,
-        completion_mode_setting: LspInsertMode,
-        buffer: &Buffer,
-    ) -> bool {
-        // specific actions take precedence over settings
-        match intent {
-            CompletionIntent::CompleteWithInsert => return false,
-            CompletionIntent::CompleteWithReplace => return true,
-            CompletionIntent::Complete | CompletionIntent::Compose => {}
-        }
-
-        match completion_mode_setting {
-            LspInsertMode::Insert => false,
-            LspInsertMode::Replace => true,
-            LspInsertMode::ReplaceSubsequence => {
-                let mut text_to_replace = buffer.chars_for_range(
-                    buffer.anchor_before(completion.replace_range.start)
-                        ..buffer.anchor_after(completion.replace_range.end),
-                );
-                let mut completion_text = completion.new_text.chars();
-
-                // is `text_to_replace` a subsequence of `completion_text`
-                text_to_replace
-                    .all(|needle_ch| completion_text.any(|haystack_ch| haystack_ch == needle_ch))
-            }
-            LspInsertMode::ReplaceSuffix => {
-                let range_after_cursor = insert_range.end..completion.replace_range.end;
-
-                let text_after_cursor = buffer
-                    .text_for_range(
-                        buffer.anchor_before(range_after_cursor.start)
-                            ..buffer.anchor_after(range_after_cursor.end),
-                    )
-                    .collect::<String>();
-                completion.new_text.ends_with(&text_after_cursor)
-            }
-        }
-    }
-
-    let buffer = buffer.read(cx);
-
-    if let CompletionSource::Lsp {
-        insert_range: Some(insert_range),
-        ..
-    } = &completion.source
-    {
-        let completion_mode_setting =
-            language_settings(buffer.language().map(|l| l.name()), buffer.file(), cx)
-                .completions
-                .lsp_insert_mode;
-
-        if !should_replace(
-            completion,
-            &insert_range,
-            intent,
-            completion_mode_setting,
-            buffer,
-        ) {
-            return insert_range.to_offset(buffer);
-        }
-    }
-
-    completion.replace_range.to_offset(buffer)
-}
-
-fn insert_extra_newline_brackets(
-    buffer: &MultiBufferSnapshot,
-    range: Range<usize>,
-    language: &language::LanguageScope,
-) -> bool {
-    let leading_whitespace_len = buffer
-        .reversed_chars_at(range.start)
-        .take_while(|c| c.is_whitespace() && *c != '\n')
-        .map(|c| c.len_utf8())
-        .sum::<usize>();
-    let trailing_whitespace_len = buffer
-        .chars_at(range.end)
-        .take_while(|c| c.is_whitespace() && *c != '\n')
-        .map(|c| c.len_utf8())
-        .sum::<usize>();
-    let range = range.start - leading_whitespace_len..range.end + trailing_whitespace_len;
-
-    language.brackets().any(|(pair, enabled)| {
-        let pair_start = pair.start.trim_end();
-        let pair_end = pair.end.trim_start();
-
-        enabled
-            && pair.newline
-            && buffer.contains_str_at(range.end, pair_end)
-            && buffer.contains_str_at(range.start.saturating_sub(pair_start.len()), pair_start)
-    })
-}
-
-fn insert_extra_newline_tree_sitter(buffer: &MultiBufferSnapshot, range: Range<usize>) -> bool {
-    let (buffer, range) = match buffer.range_to_buffer_ranges(range).as_slice() {
-        [(buffer, range, _)] => (*buffer, range.clone()),
-        _ => return false,
-    };
-    let pair = {
-        let mut result: Option<BracketMatch> = None;
-
-        for pair in buffer
-            .all_bracket_ranges(range.clone())
-            .filter(move |pair| {
-                pair.open_range.start <= range.start && pair.close_range.end >= range.end
-            })
-        {
-            let len = pair.close_range.end - pair.open_range.start;
-
-            if let Some(existing) = &result {
-                let existing_len = existing.close_range.end - existing.open_range.start;
-                if len > existing_len {
-                    continue;
-                }
-            }
-
-            result = Some(pair);
-        }
-
-        result
-    };
-    let Some(pair) = pair else {
-        return false;
-    };
-    pair.newline_only
-        && buffer
-            .chars_for_range(pair.open_range.end..range.start)
-            .chain(buffer.chars_for_range(range.end..pair.close_range.start))
-            .all(|c| c.is_whitespace() && c != '\n')
-}
-
-fn get_uncommitted_diff_for_buffer(
-    project: &Entity<Project>,
-    buffers: impl IntoIterator<Item = Entity<Buffer>>,
-    buffer: Entity<MultiBuffer>,
-    cx: &mut App,
-) -> Task<()> {
-    let mut tasks = Vec::new();
-    project.update(cx, |project, cx| {
-        for buffer in buffers {
-            if project::File::from_dyn(buffer.read(cx).file()).is_some() {
-                tasks.push(project.open_uncommitted_diff(buffer.clone(), cx))
-            }
-        }
-    });
-    cx.spawn(async move |cx| {
-        let diffs = future::join_all(tasks).await;
-        buffer
-            .update(cx, |buffer, cx| {
-                for diff in diffs.into_iter().flatten() {
-                    buffer.add_diff(diff, cx);
-                }
-            })
-            .ok();
-    })
-}
-
-fn char_len_with_expanded_tabs(offset: usize, text: &str, tab_size: NonZeroU32) -> usize {
-    let tab_size = tab_size.get() as usize;
-    let mut width = offset;
-
-    for ch in text.chars() {
-        width += if ch == '\t' {
-            tab_size - (width % tab_size)
-        } else {
-            1
-        };
-    }
-
-    width - offset
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_string_size_with_expanded_tabs() {
-        let nz = |val| NonZeroU32::new(val).unwrap();
-        assert_eq!(char_len_with_expanded_tabs(0, "", nz(4)), 0);
-        assert_eq!(char_len_with_expanded_tabs(0, "hello", nz(4)), 5);
-        assert_eq!(char_len_with_expanded_tabs(0, "\thello", nz(4)), 9);
-        assert_eq!(char_len_with_expanded_tabs(0, "abc\tab", nz(4)), 6);
-        assert_eq!(char_len_with_expanded_tabs(0, "hello\t", nz(4)), 8);
-        assert_eq!(char_len_with_expanded_tabs(0, "\t\t", nz(8)), 16);
-        assert_eq!(char_len_with_expanded_tabs(0, "x\t", nz(8)), 8);
-        assert_eq!(char_len_with_expanded_tabs(7, "x\t", nz(8)), 9);
-    }
-}
-
-/// Tokenizes a string into runs of text that should stick together, or that is whitespace.
-struct WordBreakingTokenizer<'a> {
-    input: &'a str,
-}
-
-impl<'a> WordBreakingTokenizer<'a> {
-    fn new(input: &'a str) -> Self {
-        Self { input }
-    }
-}
-
-fn is_char_ideographic(ch: char) -> bool {
-    use unicode_script::Script::*;
-    use unicode_script::UnicodeScript;
-    matches!(ch.script(), Han | Tangut | Yi)
-}
-
-fn is_grapheme_ideographic(text: &str) -> bool {
-    text.chars().any(is_char_ideographic)
-}
-
-fn is_grapheme_whitespace(text: &str) -> bool {
-    text.chars().any(|x| x.is_whitespace())
-}
-
-fn should_stay_with_preceding_ideograph(text: &str) -> bool {
-    text.chars().next().map_or(false, |ch| {
-        matches!(ch, '。' | '、' | '，' | '？' | '！' | '：' | '；' | '…')
-    })
-}
-
-#[derive(PartialEq, Eq, Debug, Clone, Copy)]
-enum WordBreakToken<'a> {
-    Word { token: &'a str, grapheme_len: usize },
-    InlineWhitespace { token: &'a str, grapheme_len: usize },
-    Newline,
-}
-
-impl<'a> Iterator for WordBreakingTokenizer<'a> {
-    /// Yields a span, the count of graphemes in the token, and whether it was
-    /// whitespace. Note that it also breaks at word boundaries.
-    type Item = WordBreakToken<'a>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        use unicode_segmentation::UnicodeSegmentation;
-        if self.input.is_empty() {
-            return None;
-        }
-
-        let mut iter = self.input.graphemes(true).peekable();
-        let mut offset = 0;
-        let mut grapheme_len = 0;
-        if let Some(first_grapheme) = iter.next() {
-            let is_newline = first_grapheme == "\n";
-            let is_whitespace = is_grapheme_whitespace(first_grapheme);
-            offset += first_grapheme.len();
-            grapheme_len += 1;
-            if is_grapheme_ideographic(first_grapheme) && !is_whitespace {
-                if let Some(grapheme) = iter.peek().copied() {
-                    if should_stay_with_preceding_ideograph(grapheme) {
-                        offset += grapheme.len();
-                        grapheme_len += 1;
-                    }
-                }
-            } else {
-                let mut words = self.input[offset..].split_word_bound_indices().peekable();
-                let mut next_word_bound = words.peek().copied();
-                if next_word_bound.map_or(false, |(i, _)| i == 0) {
-                    next_word_bound = words.next();
-                }
-                while let Some(grapheme) = iter.peek().copied() {
-                    if next_word_bound.map_or(false, |(i, _)| i == offset) {
-                        break;
-                    };
-                    if is_grapheme_whitespace(grapheme) != is_whitespace
-                        || (grapheme == "\n") != is_newline
-                    {
-                        break;
-                    };
-                    offset += grapheme.len();
-                    grapheme_len += 1;
-                    iter.next();
-                }
-            }
-            let token = &self.input[..offset];
-            self.input = &self.input[offset..];
-            if token == "\n" {
-                Some(WordBreakToken::Newline)
-            } else if is_whitespace {
-                Some(WordBreakToken::InlineWhitespace {
-                    token,
-                    grapheme_len,
-                })
-            } else {
-                Some(WordBreakToken::Word {
-                    token,
-                    grapheme_len,
-                })
-            }
-        } else {
-            None
-        }
-    }
-}
-
-#[test]
-fn test_word_breaking_tokenizer() {
-    let tests: &[(&str, &[WordBreakToken<'static>])] = &[
-        ("", &[]),
-        ("  ", &[whitespace("  ", 2)]),
-        ("Ʒ", &[word("Ʒ", 1)]),
-        ("Ǽ", &[word("Ǽ", 1)]),
-        ("⋑", &[word("⋑", 1)]),
-        ("⋑⋑", &[word("⋑⋑", 2)]),
-        (
-            "原理，进而",
-            &[word("原", 1), word("理，", 2), word("进", 1), word("而", 1)],
-        ),
-        (
-            "hello world",
-            &[word("hello", 5), whitespace(" ", 1), word("world", 5)],
-        ),
-        (
-            "hello, world",
-            &[word("hello,", 6), whitespace(" ", 1), word("world", 5)],
-        ),
-        (
-            "  hello world",
-            &[
-                whitespace("  ", 2),
-                word("hello", 5),
-                whitespace(" ", 1),
-                word("world", 5),
-            ],
-        ),
-        (
-            "这是什么 \n 钢笔",
-            &[
-                word("这", 1),
-                word("是", 1),
-                word("什", 1),
-                word("么", 1),
-                whitespace(" ", 1),
-                newline(),
-                whitespace(" ", 1),
-                word("钢", 1),
-                word("笔", 1),
-            ],
-        ),
-        (" mutton", &[whitespace(" ", 1), word("mutton", 6)]),
-    ];
-
-    fn word(token: &'static str, grapheme_len: usize) -> WordBreakToken<'static> {
-        WordBreakToken::Word {
-            token,
-            grapheme_len,
-        }
-    }
-
-    fn whitespace(token: &'static str, grapheme_len: usize) -> WordBreakToken<'static> {
-        WordBreakToken::InlineWhitespace {
-            token,
-            grapheme_len,
-        }
-    }
-
-    fn newline() -> WordBreakToken<'static> {
-        WordBreakToken::Newline
-    }
-
-    for (input, result) in tests {
-        assert_eq!(
-            WordBreakingTokenizer::new(input)
-                .collect::<Vec<_>>()
-                .as_slice(),
-            *result,
-        );
-    }
-}
-
-fn wrap_with_prefix(
-    line_prefix: String,
-    unwrapped_text: String,
-    wrap_column: usize,
-    tab_size: NonZeroU32,
-    preserve_existing_whitespace: bool,
-) -> String {
-    let line_prefix_len = char_len_with_expanded_tabs(0, &line_prefix, tab_size);
-    let mut wrapped_text = String::new();
-    let mut current_line = line_prefix.clone();
-
-    let tokenizer = WordBreakingTokenizer::new(&unwrapped_text);
-    let mut current_line_len = line_prefix_len;
-    let mut in_whitespace = false;
-    for token in tokenizer {
-        let have_preceding_whitespace = in_whitespace;
-        match token {
-            WordBreakToken::Word {
-                token,
-                grapheme_len,
-            } => {
-                in_whitespace = false;
-                if current_line_len + grapheme_len > wrap_column
-                    && current_line_len != line_prefix_len
-                {
-                    wrapped_text.push_str(current_line.trim_end());
-                    wrapped_text.push('\n');
-                    current_line.truncate(line_prefix.len());
-                    current_line_len = line_prefix_len;
-                }
-                current_line.push_str(token);
-                current_line_len += grapheme_len;
-            }
-            WordBreakToken::InlineWhitespace {
-                mut token,
-                mut grapheme_len,
-            } => {
-                in_whitespace = true;
-                if have_preceding_whitespace && !preserve_existing_whitespace {
-                    continue;
-                }
-                if !preserve_existing_whitespace {
-                    token = " ";
-                    grapheme_len = 1;
-                }
-                if current_line_len + grapheme_len > wrap_column {
-                    wrapped_text.push_str(current_line.trim_end());
-                    wrapped_text.push('\n');
-                    current_line.truncate(line_prefix.len());
-                    current_line_len = line_prefix_len;
-                } else if current_line_len != line_prefix_len || preserve_existing_whitespace {
-                    current_line.push_str(token);
-                    current_line_len += grapheme_len;
-                }
-            }
-            WordBreakToken::Newline => {
-                in_whitespace = true;
-                if preserve_existing_whitespace {
-                    wrapped_text.push_str(current_line.trim_end());
-                    wrapped_text.push('\n');
-                    current_line.truncate(line_prefix.len());
-                    current_line_len = line_prefix_len;
-                } else if have_preceding_whitespace {
-                    continue;
-                } else if current_line_len + 1 > wrap_column && current_line_len != line_prefix_len
-                {
-                    wrapped_text.push_str(current_line.trim_end());
-                    wrapped_text.push('\n');
-                    current_line.truncate(line_prefix.len());
-                    current_line_len = line_prefix_len;
-                } else if current_line_len != line_prefix_len {
-                    current_line.push(' ');
-                    current_line_len += 1;
-                }
-            }
-        }
-    }
-
-    if !current_line.is_empty() {
-        wrapped_text.push_str(&current_line);
-    }
-    wrapped_text
-}
-
-#[test]
-fn test_wrap_with_prefix() {
-    assert_eq!(
-        wrap_with_prefix(
-            "# ".to_string(),
-            "abcdefg".to_string(),
-            4,
-            NonZeroU32::new(4).unwrap(),
-            false,
-        ),
-        "# abcdefg"
-    );
-    assert_eq!(
-        wrap_with_prefix(
-            "".to_string(),
-            "\thello world".to_string(),
-            8,
-            NonZeroU32::new(4).unwrap(),
-            false,
-        ),
-        "hello\nworld"
-    );
-    assert_eq!(
-        wrap_with_prefix(
-            "// ".to_string(),
-            "xx \nyy zz aa bb cc".to_string(),
-            12,
-            NonZeroU32::new(4).unwrap(),
-            false,
-        ),
-        "// xx yy zz\n// aa bb cc"
-    );
-    assert_eq!(
-        wrap_with_prefix(
-            String::new(),
-            "这是什么 \n 钢笔".to_string(),
-            3,
-            NonZeroU32::new(4).unwrap(),
-            false,
-        ),
-        "这是什\n么 钢\n笔"
-    );
-}
-
-pub trait CollaborationHub {
-    fn collaborators<'a>(&self, cx: &'a App) -> &'a HashMap<PeerId, Collaborator>;
-    fn user_participant_indices<'a>(&self, cx: &'a App) -> &'a HashMap<u64, ParticipantIndex>;
-    fn user_names(&self, cx: &App) -> HashMap<u64, SharedString>;
-}
-
-impl CollaborationHub for Entity<Project> {
-    fn collaborators<'a>(&self, cx: &'a App) -> &'a HashMap<PeerId, Collaborator> {
-        self.read(cx).collaborators()
-    }
-
-    fn user_participant_indices<'a>(&self, cx: &'a App) -> &'a HashMap<u64, ParticipantIndex> {
-        self.read(cx).user_store().read(cx).participant_indices()
-    }
-
-    fn user_names(&self, cx: &App) -> HashMap<u64, SharedString> {
-        let this = self.read(cx);
-        let user_ids = this.collaborators().values().map(|c| c.user_id);
-        this.user_store().read_with(cx, |user_store, cx| {
-            user_store.participant_names(user_ids, cx)
-        })
-    }
-}
-
-pub trait SemanticsProvider {
-    fn hover(
-        &self,
-        buffer: &Entity<Buffer>,
-        position: text::Anchor,
-        cx: &mut App,
-    ) -> Option<Task<Vec<project::Hover>>>;
-
-    fn inline_values(
-        &self,
-        buffer_handle: Entity<Buffer>,
-        range: Range<text::Anchor>,
-        cx: &mut App,
-    ) -> Option<Task<anyhow::Result<Vec<InlayHint>>>>;
-
-    fn inlay_hints(
-        &self,
-        buffer_handle: Entity<Buffer>,
-        range: Range<text::Anchor>,
-        cx: &mut App,
-    ) -> Option<Task<anyhow::Result<Vec<InlayHint>>>>;
-
-    fn resolve_inlay_hint(
-        &self,
-        hint: InlayHint,
-        buffer_handle: Entity<Buffer>,
-        server_id: LanguageServerId,
-        cx: &mut App,
-    ) -> Option<Task<anyhow::Result<InlayHint>>>;
-
-    fn supports_inlay_hints(&self, buffer: &Entity<Buffer>, cx: &mut App) -> bool;
-
-    fn document_highlights(
-        &self,
-        buffer: &Entity<Buffer>,
-        position: text::Anchor,
-        cx: &mut App,
-    ) -> Option<Task<Result<Vec<DocumentHighlight>>>>;
-
-    fn definitions(
-        &self,
-        buffer: &Entity<Buffer>,
-        position: text::Anchor,
-        kind: GotoDefinitionKind,
-        cx: &mut App,
-    ) -> Option<Task<Result<Vec<LocationLink>>>>;
-
-    fn range_for_rename(
-        &self,
-        buffer: &Entity<Buffer>,
-        position: text::Anchor,
-        cx: &mut App,
-    ) -> Option<Task<Result<Option<Range<text::Anchor>>>>>;
-
-    fn perform_rename(
-        &self,
-        buffer: &Entity<Buffer>,
-        position: text::Anchor,
-        new_name: String,
-        cx: &mut App,
-    ) -> Option<Task<Result<ProjectTransaction>>>;
-}
-
-pub trait CompletionProvider {
-    fn completions(
-        &self,
-        excerpt_id: ExcerptId,
-        buffer: &Entity<Buffer>,
-        buffer_position: text::Anchor,
-        trigger: CompletionContext,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) -> Task<Result<Option<Vec<Completion>>>>;
-
-    fn resolve_completions(
-        &self,
-        buffer: Entity<Buffer>,
-        completion_indices: Vec<usize>,
-        completions: Rc<RefCell<Box<[Completion]>>>,
-        cx: &mut Context<Editor>,
-    ) -> Task<Result<bool>>;
-
-    fn apply_additional_edits_for_completion(
-        &self,
-        _buffer: Entity<Buffer>,
-        _completions: Rc<RefCell<Box<[Completion]>>>,
-        _completion_index: usize,
-        _push_to_history: bool,
-        _cx: &mut Context<Editor>,
-    ) -> Task<Result<Option<language::Transaction>>> {
-        Task::ready(Ok(None))
-    }
-
-    fn is_completion_trigger(
-        &self,
-        buffer: &Entity<Buffer>,
-        position: language::Anchor,
-        text: &str,
-        trigger_in_words: bool,
-        cx: &mut Context<Editor>,
-    ) -> bool;
-
-    fn sort_completions(&self) -> bool {
-        true
-    }
-
-    fn filter_completions(&self) -> bool {
-        true
-    }
-}
-
-pub trait CodeActionProvider {
-    fn id(&self) -> Arc<str>;
-
-    fn code_actions(
-        &self,
-        buffer: &Entity<Buffer>,
-        range: Range<text::Anchor>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<Vec<CodeAction>>>;
-
-    fn apply_code_action(
-        &self,
-        buffer_handle: Entity<Buffer>,
-        action: CodeAction,
-        excerpt_id: ExcerptId,
-        push_to_history: bool,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<ProjectTransaction>>;
-}
-
-impl CodeActionProvider for Entity<Project> {
-    fn id(&self) -> Arc<str> {
-        "project".into()
-    }
-
-    fn code_actions(
-        &self,
-        buffer: &Entity<Buffer>,
-        range: Range<text::Anchor>,
-        _window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<Vec<CodeAction>>> {
-        self.update(cx, |project, cx| {
-            let code_lens = project.code_lens(buffer, range.clone(), cx);
-            let code_actions = project.code_actions(buffer, range, None, cx);
-            cx.background_spawn(async move {
-                let (code_lens, code_actions) = join(code_lens, code_actions).await;
-                Ok(code_lens
-                    .context("code lens fetch")?
-                    .into_iter()
-                    .chain(code_actions.context("code action fetch")?)
-                    .collect())
-            })
-        })
-    }
-
-    fn apply_code_action(
-        &self,
-        buffer_handle: Entity<Buffer>,
-        action: CodeAction,
-        _excerpt_id: ExcerptId,
-        push_to_history: bool,
-        _window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<ProjectTransaction>> {
-        self.update(cx, |project, cx| {
-            project.apply_code_action(buffer_handle, action, push_to_history, cx)
-        })
-    }
-}
-
-fn snippet_completions(
-    project: &Project,
-    buffer: &Entity<Buffer>,
-    buffer_position: text::Anchor,
-    cx: &mut App,
-) -> Task<Result<Vec<Completion>>> {
-    let languages = buffer.read(cx).languages_at(buffer_position);
-    let snippet_store = project.snippets().read(cx);
-
-    let scopes: Vec<_> = languages
-        .iter()
-        .filter_map(|language| {
-            let language_name = language.lsp_id();
-            let snippets = snippet_store.snippets_for(Some(language_name), cx);
-
-            if snippets.is_empty() {
-                None
-            } else {
-                Some((language.default_scope(), snippets))
-            }
-        })
-        .collect();
-
-    if scopes.is_empty() {
-        return Task::ready(Ok(vec![]));
-    }
-
-    let snapshot = buffer.read(cx).text_snapshot();
-    let chars: String = snapshot
-        .reversed_chars_for_range(text::Anchor::MIN..buffer_position)
-        .collect();
-    let executor = cx.background_executor().clone();
-
-    cx.background_spawn(async move {
-        let mut all_results: Vec<Completion> = Vec::new();
-        for (scope, snippets) in scopes.into_iter() {
-            let classifier = CharClassifier::new(Some(scope)).for_completion(true);
-            let mut last_word = chars
-                .chars()
-                .take_while(|c| classifier.is_word(*c))
-                .collect::<String>();
-            last_word = last_word.chars().rev().collect();
-
-            if last_word.is_empty() {
-                return Ok(vec![]);
-            }
-
-            let as_offset = text::ToOffset::to_offset(&buffer_position, &snapshot);
-            let to_lsp = |point: &text::Anchor| {
-                let end = text::ToPointUtf16::to_point_utf16(point, &snapshot);
-                point_to_lsp(end)
-            };
-            let lsp_end = to_lsp(&buffer_position);
-
-            let candidates = snippets
-                .iter()
-                .enumerate()
-                .flat_map(|(ix, snippet)| {
-                    snippet
-                        .prefix
-                        .iter()
-                        .map(move |prefix| StringMatchCandidate::new(ix, &prefix))
-                })
-                .collect::<Vec<StringMatchCandidate>>();
-
-            let mut matches = fuzzy::match_strings(
-                &candidates,
-                &last_word,
-                last_word.chars().any(|c| c.is_uppercase()),
-                100,
-                &Default::default(),
-                executor.clone(),
-            )
-            .await;
-
-            // Remove all candidates where the query's start does not match the start of any word in the candidate
-            if let Some(query_start) = last_word.chars().next() {
-                matches.retain(|string_match| {
-                    split_words(&string_match.string).any(|word| {
-                        // Check that the first codepoint of the word as lowercase matches the first
-                        // codepoint of the query as lowercase
-                        word.chars()
-                            .flat_map(|codepoint| codepoint.to_lowercase())
-                            .zip(query_start.to_lowercase())
-                            .all(|(word_cp, query_cp)| word_cp == query_cp)
-                    })
-                });
-            }
-
-            let matched_strings = matches
-                .into_iter()
-                .map(|m| m.string)
-                .collect::<HashSet<_>>();
-
-            let mut result: Vec<Completion> = snippets
-                .iter()
-                .filter_map(|snippet| {
-                    let matching_prefix = snippet
-                        .prefix
-                        .iter()
-                        .find(|prefix| matched_strings.contains(*prefix))?;
-                    let start = as_offset - last_word.len();
-                    let start = snapshot.anchor_before(start);
-                    let range = start..buffer_position;
-                    let lsp_start = to_lsp(&start);
-                    let lsp_range = lsp::Range {
-                        start: lsp_start,
-                        end: lsp_end,
-                    };
-                    Some(Completion {
-                        replace_range: range,
-                        new_text: snippet.body.clone(),
-                        source: CompletionSource::Lsp {
-                            insert_range: None,
-                            server_id: LanguageServerId(usize::MAX),
-                            resolved: true,
-                            lsp_completion: Box::new(lsp::CompletionItem {
-                                label: snippet.prefix.first().unwrap().clone(),
-                                kind: Some(CompletionItemKind::SNIPPET),
-                                label_details: snippet.description.as_ref().map(|description| {
-                                    lsp::CompletionItemLabelDetails {
-                                        detail: Some(description.clone()),
-                                        description: None,
-                                    }
-                                }),
-                                insert_text_format: Some(InsertTextFormat::SNIPPET),
-                                text_edit: Some(lsp::CompletionTextEdit::InsertAndReplace(
-                                    lsp::InsertReplaceEdit {
-                                        new_text: snippet.body.clone(),
-                                        insert: lsp_range,
-                                        replace: lsp_range,
-                                    },
-                                )),
-                                filter_text: Some(snippet.body.clone()),
-                                sort_text: Some(char::MAX.to_string()),
-                                ..lsp::CompletionItem::default()
-                            }),
-                            lsp_defaults: None,
-                        },
-                        label: CodeLabel {
-                            text: matching_prefix.clone(),
-                            runs: Vec::new(),
-                            filter_range: 0..matching_prefix.len(),
-                        },
-                        icon_path: None,
-                        documentation: snippet.description.clone().map(|description| {
-                            CompletionDocumentation::SingleLine(description.into())
-                        }),
-                        insert_text_mode: None,
-                        confirm: None,
-                    })
-                })
-                .collect();
-
-            all_results.append(&mut result);
-        }
-
-        Ok(all_results)
-    })
-}
-
-impl CompletionProvider for Entity<Project> {
-    fn completions(
-        &self,
-        _excerpt_id: ExcerptId,
-        buffer: &Entity<Buffer>,
-        buffer_position: text::Anchor,
-        options: CompletionContext,
-        _window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) -> Task<Result<Option<Vec<Completion>>>> {
-        self.update(cx, |project, cx| {
-            let snippets = snippet_completions(project, buffer, buffer_position, cx);
-            let project_completions = project.completions(buffer, buffer_position, options, cx);
-            cx.background_spawn(async move {
-                let snippets_completions = snippets.await?;
-                match project_completions.await? {
-                    Some(mut completions) => {
-                        completions.extend(snippets_completions);
-                        Ok(Some(completions))
-                    }
-                    None => {
-                        if snippets_completions.is_empty() {
-                            Ok(None)
-                        } else {
-                            Ok(Some(snippets_completions))
-                        }
-                    }
-                }
-            })
-        })
-    }
-
-    fn resolve_completions(
-        &self,
-        buffer: Entity<Buffer>,
-        completion_indices: Vec<usize>,
-        completions: Rc<RefCell<Box<[Completion]>>>,
-        cx: &mut Context<Editor>,
-    ) -> Task<Result<bool>> {
-        self.update(cx, |project, cx| {
-            project.lsp_store().update(cx, |lsp_store, cx| {
-                lsp_store.resolve_completions(buffer, completion_indices, completions, cx)
-            })
-        })
-    }
-
-    fn apply_additional_edits_for_completion(
-        &self,
-        buffer: Entity<Buffer>,
-        completions: Rc<RefCell<Box<[Completion]>>>,
-        completion_index: usize,
-        push_to_history: bool,
-        cx: &mut Context<Editor>,
-    ) -> Task<Result<Option<language::Transaction>>> {
-        self.update(cx, |project, cx| {
-            project.lsp_store().update(cx, |lsp_store, cx| {
-                lsp_store.apply_additional_edits_for_completion(
-                    buffer,
-                    completions,
-                    completion_index,
-                    push_to_history,
-                    cx,
-                )
-            })
-        })
-    }
-
-    fn is_completion_trigger(
-        &self,
-        buffer: &Entity<Buffer>,
-        position: language::Anchor,
-        text: &str,
-        trigger_in_words: bool,
-        cx: &mut Context<Editor>,
-    ) -> bool {
-        let mut chars = text.chars();
-        let char = if let Some(char) = chars.next() {
-            char
-        } else {
-            return false;
-        };
-        if chars.next().is_some() {
-            return false;
-        }
-
-        let buffer = buffer.read(cx);
-        let snapshot = buffer.snapshot();
-        if !snapshot.settings_at(position, cx).show_completions_on_input {
-            return false;
-        }
-        let classifier = snapshot.char_classifier_at(position).for_completion(true);
-        if trigger_in_words && classifier.is_word(char) {
-            return true;
-        }
-
-        buffer.completion_triggers().contains(text)
-    }
-}
-
-impl SemanticsProvider for Entity<Project> {
-    fn hover(
-        &self,
-        buffer: &Entity<Buffer>,
-        position: text::Anchor,
-        cx: &mut App,
-    ) -> Option<Task<Vec<project::Hover>>> {
-        Some(self.update(cx, |project, cx| project.hover(buffer, position, cx)))
-    }
-
-    fn document_highlights(
-        &self,
-        buffer: &Entity<Buffer>,
-        position: text::Anchor,
-        cx: &mut App,
-    ) -> Option<Task<Result<Vec<DocumentHighlight>>>> {
-        Some(self.update(cx, |project, cx| {
-            project.document_highlights(buffer, position, cx)
-        }))
-    }
-
-    fn definitions(
-        &self,
-        buffer: &Entity<Buffer>,
-        position: text::Anchor,
-        kind: GotoDefinitionKind,
-        cx: &mut App,
-    ) -> Option<Task<Result<Vec<LocationLink>>>> {
-        Some(self.update(cx, |project, cx| match kind {
-            GotoDefinitionKind::Symbol => project.definition(&buffer, position, cx),
-            GotoDefinitionKind::Declaration => project.declaration(&buffer, position, cx),
-            GotoDefinitionKind::Type => project.type_definition(&buffer, position, cx),
-            GotoDefinitionKind::Implementation => project.implementation(&buffer, position, cx),
-        }))
-    }
-
-    fn supports_inlay_hints(&self, buffer: &Entity<Buffer>, cx: &mut App) -> bool {
-        // TODO: make this work for remote projects
-        self.update(cx, |project, cx| {
-            if project
-                .active_debug_session(cx)
-                .is_some_and(|(session, _)| session.read(cx).any_stopped_thread())
-            {
-                return true;
-            }
-
-            buffer.update(cx, |buffer, cx| {
-                project.any_language_server_supports_inlay_hints(buffer, cx)
-            })
-        })
-    }
-
-    fn inline_values(
-        &self,
-        buffer_handle: Entity<Buffer>,
-        range: Range<text::Anchor>,
-        cx: &mut App,
-    ) -> Option<Task<anyhow::Result<Vec<InlayHint>>>> {
-        self.update(cx, |project, cx| {
-            let (session, active_stack_frame) = project.active_debug_session(cx)?;
-
-            Some(project.inline_values(session, active_stack_frame, buffer_handle, range, cx))
-        })
-    }
-
-    fn inlay_hints(
-        &self,
-        buffer_handle: Entity<Buffer>,
-        range: Range<text::Anchor>,
-        cx: &mut App,
-    ) -> Option<Task<anyhow::Result<Vec<InlayHint>>>> {
-        Some(self.update(cx, |project, cx| {
-            project.inlay_hints(buffer_handle, range, cx)
-        }))
-    }
-
-    fn resolve_inlay_hint(
-        &self,
-        hint: InlayHint,
-        buffer_handle: Entity<Buffer>,
-        server_id: LanguageServerId,
-        cx: &mut App,
-    ) -> Option<Task<anyhow::Result<InlayHint>>> {
-        Some(self.update(cx, |project, cx| {
-            project.resolve_inlay_hint(hint, buffer_handle, server_id, cx)
-        }))
-    }
-
-    fn range_for_rename(
-        &self,
-        buffer: &Entity<Buffer>,
-        position: text::Anchor,
-        cx: &mut App,
-    ) -> Option<Task<Result<Option<Range<text::Anchor>>>>> {
-        Some(self.update(cx, |project, cx| {
-            let buffer = buffer.clone();
-            let task = project.prepare_rename(buffer.clone(), position, cx);
-            cx.spawn(async move |_, cx| {
-                Ok(match task.await? {
-                    PrepareRenameResponse::Success(range) => Some(range),
-                    PrepareRenameResponse::InvalidPosition => None,
-                    PrepareRenameResponse::OnlyUnpreparedRenameSupported => {
-                        // Fallback on using TreeSitter info to determine identifier range
-                        buffer.update(cx, |buffer, _| {
-                            let snapshot = buffer.snapshot();
-                            let (range, kind) = snapshot.surrounding_word(position);
-                            if kind != Some(CharKind::Word) {
-                                return None;
-                            }
-                            Some(
-                                snapshot.anchor_before(range.start)
-                                    ..snapshot.anchor_after(range.end),
-                            )
-                        })?
-                    }
-                })
-            })
-        }))
-    }
-
-    fn perform_rename(
-        &self,
-        buffer: &Entity<Buffer>,
-        position: text::Anchor,
-        new_name: String,
-        cx: &mut App,
-    ) -> Option<Task<Result<ProjectTransaction>>> {
-        Some(self.update(cx, |project, cx| {
-            project.perform_rename(buffer.clone(), position, new_name, cx)
-        }))
-    }
-}
-
-fn inlay_hint_settings(
-    location: Anchor,
-    snapshot: &MultiBufferSnapshot,
-    cx: &mut Context<Editor>,
-) -> InlayHintSettings {
-    let file = snapshot.file_at(location);
-    let language = snapshot.language_at(location).map(|l| l.name());
-    language_settings(language, file, cx).inlay_hints
-}
-
-fn consume_contiguous_rows(
-    contiguous_row_selections: &mut Vec<Selection<Point>>,
-    selection: &Selection<Point>,
-    display_map: &DisplaySnapshot,
-    selections: &mut Peekable<std::slice::Iter<Selection<Point>>>,
-) -> (MultiBufferRow, MultiBufferRow) {
-    contiguous_row_selections.push(selection.clone());
-    let start_row = MultiBufferRow(selection.start.row);
-    let mut end_row = ending_row(selection, display_map);
-
-    while let Some(next_selection) = selections.peek() {
-        if next_selection.start.row <= end_row.0 {
-            end_row = ending_row(next_selection, display_map);
-            contiguous_row_selections.push(selections.next().unwrap().clone());
-        } else {
-            break;
-        }
-    }
-    (start_row, end_row)
-}
-
-fn ending_row(next_selection: &Selection<Point>, display_map: &DisplaySnapshot) -> MultiBufferRow {
-    if next_selection.end.column > 0 || next_selection.is_empty() {
-        MultiBufferRow(display_map.next_line_boundary(next_selection.end).0.row + 1)
-    } else {
-        MultiBufferRow(next_selection.end.row)
-    }
-}
-
-impl EditorSnapshot {
-    pub fn remote_selections_in_range<'a>(
-        &'a self,
-        range: &'a Range<Anchor>,
-        collaboration_hub: &dyn CollaborationHub,
-        cx: &'a App,
-    ) -> impl 'a + Iterator<Item = RemoteSelection> {
-        let participant_names = collaboration_hub.user_names(cx);
-        let participant_indices = collaboration_hub.user_participant_indices(cx);
-        let collaborators_by_peer_id = collaboration_hub.collaborators(cx);
-        let collaborators_by_replica_id = collaborators_by_peer_id
-            .iter()
-            .map(|(_, collaborator)| (collaborator.replica_id, collaborator))
-            .collect::<HashMap<_, _>>();
-        self.buffer_snapshot
-            .selections_in_range(range, false)
-            .filter_map(move |(replica_id, line_mode, cursor_shape, selection)| {
-                let collaborator = collaborators_by_replica_id.get(&replica_id)?;
-                let participant_index = participant_indices.get(&collaborator.user_id).copied();
-                let user_name = participant_names.get(&collaborator.user_id).cloned();
-                Some(RemoteSelection {
-                    replica_id,
-                    selection,
-                    cursor_shape,
-                    line_mode,
-                    participant_index,
-                    peer_id: collaborator.peer_id,
-                    user_name,
-                })
-            })
-    }
-
-    pub fn hunks_for_ranges(
-        &self,
-        ranges: impl IntoIterator<Item = Range<Point>>,
-    ) -> Vec<MultiBufferDiffHunk> {
-        let mut hunks = Vec::new();
-        let mut processed_buffer_rows: HashMap<BufferId, HashSet<Range<text::Anchor>>> =
-            HashMap::default();
-        for query_range in ranges {
-            let query_rows =
-                MultiBufferRow(query_range.start.row)..MultiBufferRow(query_range.end.row + 1);
-            for hunk in self.buffer_snapshot.diff_hunks_in_range(
-                Point::new(query_rows.start.0, 0)..Point::new(query_rows.end.0, 0),
-            ) {
-                // Include deleted hunks that are adjacent to the query range, because
-                // otherwise they would be missed.
-                let mut intersects_range = hunk.row_range.overlaps(&query_rows);
-                if hunk.status().is_deleted() {
-                    intersects_range |= hunk.row_range.start == query_rows.end;
-                    intersects_range |= hunk.row_range.end == query_rows.start;
-                }
-                if intersects_range {
-                    if !processed_buffer_rows
-                        .entry(hunk.buffer_id)
-                        .or_default()
-                        .insert(hunk.buffer_range.start..hunk.buffer_range.end)
-                    {
-                        continue;
-                    }
-                    hunks.push(hunk);
-                }
-            }
-        }
-
-        hunks
-    }
-
-    fn display_diff_hunks_for_rows<'a>(
-        &'a self,
-        display_rows: Range<DisplayRow>,
-        folded_buffers: &'a HashSet<BufferId>,
-    ) -> impl 'a + Iterator<Item = DisplayDiffHunk> {
-        let buffer_start = DisplayPoint::new(display_rows.start, 0).to_point(self);
-        let buffer_end = DisplayPoint::new(display_rows.end, 0).to_point(self);
-
-        self.buffer_snapshot
-            .diff_hunks_in_range(buffer_start..buffer_end)
-            .filter_map(|hunk| {
-                if folded_buffers.contains(&hunk.buffer_id) {
-                    return None;
-                }
-
-                let hunk_start_point = Point::new(hunk.row_range.start.0, 0);
-                let hunk_end_point = Point::new(hunk.row_range.end.0, 0);
-
-                let hunk_display_start = self.point_to_display_point(hunk_start_point, Bias::Left);
-                let hunk_display_end = self.point_to_display_point(hunk_end_point, Bias::Right);
-
-                let display_hunk = if hunk_display_start.column() != 0 {
-                    DisplayDiffHunk::Folded {
-                        display_row: hunk_display_start.row(),
-                    }
-                } else {
-                    let mut end_row = hunk_display_end.row();
-                    if hunk_display_end.column() > 0 {
-                        end_row.0 += 1;
-                    }
-                    let is_created_file = hunk.is_created_file();
-                    DisplayDiffHunk::Unfolded {
-                        status: hunk.status(),
-                        diff_base_byte_range: hunk.diff_base_byte_range,
-                        display_row_range: hunk_display_start.row()..end_row,
-                        multi_buffer_range: Anchor::range_in_buffer(
-                            hunk.excerpt_id,
-                            hunk.buffer_id,
-                            hunk.buffer_range,
-                        ),
-                        is_created_file,
-                    }
-                };
-
-                Some(display_hunk)
-            })
-    }
-
-    pub fn language_at<T: ToOffset>(&self, position: T) -> Option<&Arc<Language>> {
-        self.display_snapshot.buffer_snapshot.language_at(position)
-    }
-
-    pub fn is_focused(&self) -> bool {
-        self.is_focused
-    }
-
-    pub fn placeholder_text(&self) -> Option<&Arc<str>> {
-        self.placeholder_text.as_ref()
-    }
-
-    pub fn scroll_position(&self) -> gpui::Point<f32> {
-        self.scroll_anchor.scroll_position(&self.display_snapshot)
-    }
-
-    fn gutter_dimensions(
-        &self,
-        font_id: FontId,
-        font_size: Pixels,
-        max_line_number_width: Pixels,
-        cx: &App,
-    ) -> Option<GutterDimensions> {
-        if !self.show_gutter {
-            return None;
-        }
-
-        let descent = cx.text_system().descent(font_id, font_size);
-        let em_width = cx.text_system().em_width(font_id, font_size).log_err()?;
-        let em_advance = cx.text_system().em_advance(font_id, font_size).log_err()?;
-
-        let show_git_gutter = self.show_git_diff_gutter.unwrap_or_else(|| {
-            matches!(
-                ProjectSettings::get_global(cx).git.git_gutter,
-                Some(GitGutterSetting::TrackedFiles)
-            )
-        });
-        let gutter_settings = EditorSettings::get_global(cx).gutter;
-        let show_line_numbers = self
-            .show_line_numbers
-            .unwrap_or(gutter_settings.line_numbers);
-        let line_gutter_width = if show_line_numbers {
-            // Avoid flicker-like gutter resizes when the line number gains another digit and only resize the gutter on files with N*10^5 lines.
-            let min_width_for_number_on_gutter = em_advance * MIN_LINE_NUMBER_DIGITS as f32;
-            max_line_number_width.max(min_width_for_number_on_gutter)
-        } else {
-            0.0.into()
-        };
-
-        let show_code_actions = self
-            .show_code_actions
-            .unwrap_or(gutter_settings.code_actions);
-
-        let show_runnables = self.show_runnables.unwrap_or(gutter_settings.runnables);
-        let show_breakpoints = self.show_breakpoints.unwrap_or(gutter_settings.breakpoints);
-
-        let git_blame_entries_width =
-            self.git_blame_gutter_max_author_length
-                .map(|max_author_length| {
-                    let renderer = cx.global::<GlobalBlameRenderer>().0.clone();
-                    const MAX_RELATIVE_TIMESTAMP: &str = "60 minutes ago";
-
-                    /// The number of characters to dedicate to gaps and margins.
-                    const SPACING_WIDTH: usize = 4;
-
-                    let max_char_count = max_author_length.min(renderer.max_author_length())
-                        + ::git::SHORT_SHA_LENGTH
-                        + MAX_RELATIVE_TIMESTAMP.len()
-                        + SPACING_WIDTH;
-
-                    em_advance * max_char_count
-                });
-
-        let is_singleton = self.buffer_snapshot.is_singleton();
-
-        let mut left_padding = git_blame_entries_width.unwrap_or(Pixels::ZERO);
-        left_padding += if !is_singleton {
-            em_width * 4.0
-        } else if show_code_actions || show_runnables || show_breakpoints {
-            em_width * 3.0
-        } else if show_git_gutter && show_line_numbers {
-            em_width * 2.0
-        } else if show_git_gutter || show_line_numbers {
-            em_width
-        } else {
-            px(0.)
-        };
-
-        let shows_folds = is_singleton && gutter_settings.folds;
-
-        let right_padding = if shows_folds && show_line_numbers {
-            em_width * 4.0
-        } else if shows_folds || (!is_singleton && show_line_numbers) {
-            em_width * 3.0
-        } else if show_line_numbers {
-            em_width
-        } else {
-            px(0.)
-        };
-
-        Some(GutterDimensions {
-            left_padding,
-            right_padding,
-            width: line_gutter_width + left_padding + right_padding,
-            margin: -descent,
-            git_blame_entries_width,
-        })
-    }
-
-    pub fn render_crease_toggle(
-        &self,
-        buffer_row: MultiBufferRow,
-        row_contains_cursor: bool,
-        editor: Entity<Editor>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<AnyElement> {
-        let folded = self.is_line_folded(buffer_row);
-        let mut is_foldable = false;
-
-        if let Some(crease) = self
-            .crease_snapshot
-            .query_row(buffer_row, &self.buffer_snapshot)
-        {
-            is_foldable = true;
-            match crease {
-                Crease::Inline { render_toggle, .. } | Crease::Block { render_toggle, .. } => {
-                    if let Some(render_toggle) = render_toggle {
-                        let toggle_callback =
-                            Arc::new(move |folded, window: &mut Window, cx: &mut App| {
-                                if folded {
-                                    editor.update(cx, |editor, cx| {
-                                        editor.fold_at(buffer_row, window, cx)
-                                    });
-                                } else {
-                                    editor.update(cx, |editor, cx| {
-                                        editor.unfold_at(buffer_row, window, cx)
-                                    });
-                                }
-                            });
-                        return Some((render_toggle)(
-                            buffer_row,
-                            folded,
-                            toggle_callback,
-                            window,
-                            cx,
-                        ));
-                    }
-                }
-            }
-        }
-
-        is_foldable |= self.starts_indent(buffer_row);
-
-        if folded || (is_foldable && (row_contains_cursor || self.gutter_hovered)) {
-            Some(
-                Disclosure::new(("gutter_crease", buffer_row.0), !folded)
-                    .toggle_state(folded)
-                    .on_click(window.listener_for(&editor, move |this, _e, window, cx| {
-                        if folded {
-                            this.unfold_at(buffer_row, window, cx);
-                        } else {
-                            this.fold_at(buffer_row, window, cx);
-                        }
-                    }))
-                    .into_any_element(),
-            )
-        } else {
-            None
-        }
-    }
-
-    pub fn render_crease_trailer(
-        &self,
-        buffer_row: MultiBufferRow,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<AnyElement> {
-        let folded = self.is_line_folded(buffer_row);
-        if let Crease::Inline { render_trailer, .. } = self
-            .crease_snapshot
-            .query_row(buffer_row, &self.buffer_snapshot)?
-        {
-            let render_trailer = render_trailer.as_ref()?;
-            Some(render_trailer(buffer_row, folded, window, cx))
-        } else {
-            None
-        }
-    }
-}
-
-impl Deref for EditorSnapshot {
-    type Target = DisplaySnapshot;
-
-    fn deref(&self) -> &Self::Target {
-        &self.display_snapshot
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum EditorEvent {
-    InputIgnored {
-        text: Arc<str>,
-    },
-    InputHandled {
-        utf16_range_to_replace: Option<Range<isize>>,
-        text: Arc<str>,
-    },
-    ExcerptsAdded {
-        buffer: Entity<Buffer>,
-        predecessor: ExcerptId,
-        excerpts: Vec<(ExcerptId, ExcerptRange<language::Anchor>)>,
-    },
-    ExcerptsRemoved {
-        ids: Vec<ExcerptId>,
-        removed_buffer_ids: Vec<BufferId>,
-    },
-    BufferFoldToggled {
-        ids: Vec<ExcerptId>,
-        folded: bool,
-    },
-    ExcerptsEdited {
-        ids: Vec<ExcerptId>,
-    },
-    ExcerptsExpanded {
-        ids: Vec<ExcerptId>,
-    },
-    BufferEdited,
-    Edited {
-        transaction_id: clock::Lamport,
-    },
-    Reparsed(BufferId),
-    Focused,
-    FocusedIn,
-    Blurred,
-    DirtyChanged,
-    Saved,
-    TitleChanged,
-    DiffBaseChanged,
-    SelectionsChanged {
-        local: bool,
-    },
-    ScrollPositionChanged {
-        local: bool,
-        autoscroll: bool,
-    },
-    Closed,
-    TransactionUndone {
-        transaction_id: clock::Lamport,
-    },
-    TransactionBegun {
-        transaction_id: clock::Lamport,
-    },
-    Reloaded,
-    CursorShapeChanged,
-    PushedToNavHistory {
-        anchor: Anchor,
-        is_deactivate: bool,
-    },
-}
-
-impl EventEmitter<EditorEvent> for Editor {}
-
-impl Focusable for Editor {
-    fn focus_handle(&self, _cx: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl Render for Editor {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let settings = ThemeSettings::get_global(cx);
-
-        let mut text_style = match self.mode {
-            EditorMode::SingleLine { .. } | EditorMode::AutoHeight { .. } => TextStyle {
-                color: cx.theme().colors().editor_foreground,
-                font_family: settings.ui_font.family.clone(),
-                font_features: settings.ui_font.features.clone(),
-                font_fallbacks: settings.ui_font.fallbacks.clone(),
-                font_size: rems(0.875).into(),
-                font_weight: settings.ui_font.weight,
-                line_height: relative(settings.buffer_line_height.value()),
-                ..Default::default()
-            },
-            EditorMode::Full { .. } => TextStyle {
-                color: cx.theme().colors().editor_foreground,
-                font_family: settings.buffer_font.family.clone(),
-                font_features: settings.buffer_font.features.clone(),
-                font_fallbacks: settings.buffer_font.fallbacks.clone(),
-                font_size: settings.buffer_font_size(cx).into(),
-                font_weight: settings.buffer_font.weight,
-                line_height: relative(settings.buffer_line_height.value()),
-                ..Default::default()
-            },
-        };
-        if let Some(text_style_refinement) = &self.text_style_refinement {
-            text_style.refine(text_style_refinement)
-        }
-
-        let background = match self.mode {
-            EditorMode::SingleLine { .. } => cx.theme().system().transparent,
-            EditorMode::AutoHeight { max_lines: _ } => cx.theme().system().transparent,
-            EditorMode::Full { .. } => cx.theme().colors().editor_background,
-        };
-
-        EditorElement::new(
-            &cx.entity(),
-            EditorStyle {
-                background,
-                local_player: cx.theme().players().local(),
-                text: text_style,
-                scrollbar_width: EditorElement::SCROLLBAR_WIDTH,
-                syntax: cx.theme().syntax().clone(),
-                status: cx.theme().status().clone(),
-                inlay_hints_style: make_inlay_hints_style(cx),
-                inline_completion_styles: make_suggestion_styles(cx),
-                unnecessary_code_fade: ThemeSettings::get_global(cx).unnecessary_code_fade,
-            },
-        )
-    }
-}
-
-impl EntityInputHandler for Editor {
-    fn text_for_range(
-        &mut self,
-        range_utf16: Range<usize>,
-        adjusted_range: &mut Option<Range<usize>>,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<String> {
-        let snapshot = self.buffer.read(cx).read(cx);
-        let start = snapshot.clip_offset_utf16(OffsetUtf16(range_utf16.start), Bias::Left);
-        let end = snapshot.clip_offset_utf16(OffsetUtf16(range_utf16.end), Bias::Right);
-        if (start.0..end.0) != range_utf16 {
-            adjusted_range.replace(start.0..end.0);
-        }
-        Some(snapshot.text_for_range(start..end).collect())
-    }
-
-    fn selected_text_range(
-        &mut self,
-        ignore_disabled_input: bool,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<UTF16Selection> {
-        // Prevent the IME menu from appearing when holding down an alphabetic key
-        // while input is disabled.
-        if !ignore_disabled_input && !self.input_enabled {
-            return None;
-        }
-
-        let selection = self.selections.newest::<OffsetUtf16>(cx);
-        let range = selection.range();
-
-        Some(UTF16Selection {
-            range: range.start.0..range.end.0,
-            reversed: selection.reversed,
-        })
-    }
-
-    fn marked_text_range(&self, _: &mut Window, cx: &mut Context<Self>) -> Option<Range<usize>> {
-        let snapshot = self.buffer.read(cx).read(cx);
-        let range = self.text_highlights::<InputComposition>(cx)?.1.first()?;
-        Some(range.start.to_offset_utf16(&snapshot).0..range.end.to_offset_utf16(&snapshot).0)
-    }
-
-    fn unmark_text(&mut self, _: &mut Window, cx: &mut Context<Self>) {
-        self.clear_highlights::<InputComposition>(cx);
-        self.ime_transaction.take();
-    }
-
-    fn replace_text_in_range(
-        &mut self,
-        range_utf16: Option<Range<usize>>,
-        text: &str,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if !self.input_enabled {
-            cx.emit(EditorEvent::InputIgnored { text: text.into() });
-            return;
-        }
-
-        self.transact(window, cx, |this, window, cx| {
-            let new_selected_ranges = if let Some(range_utf16) = range_utf16 {
-                let range_utf16 = OffsetUtf16(range_utf16.start)..OffsetUtf16(range_utf16.end);
-                Some(this.selection_replacement_ranges(range_utf16, cx))
-            } else {
-                this.marked_text_ranges(cx)
-            };
-
-            let range_to_replace = new_selected_ranges.as_ref().and_then(|ranges_to_replace| {
-                let newest_selection_id = this.selections.newest_anchor().id;
-                this.selections
-                    .all::<OffsetUtf16>(cx)
-                    .iter()
-                    .zip(ranges_to_replace.iter())
-                    .find_map(|(selection, range)| {
-                        if selection.id == newest_selection_id {
-                            Some(
-                                (range.start.0 as isize - selection.head().0 as isize)
-                                    ..(range.end.0 as isize - selection.head().0 as isize),
-                            )
-                        } else {
-                            None
-                        }
-                    })
-            });
-
-            cx.emit(EditorEvent::InputHandled {
-                utf16_range_to_replace: range_to_replace,
-                text: text.into(),
-            });
-
-            if let Some(new_selected_ranges) = new_selected_ranges {
-                this.change_selections(None, window, cx, |selections| {
-                    selections.select_ranges(new_selected_ranges)
-                });
-                this.backspace(&Default::default(), window, cx);
-            }
-
-            this.handle_input(text, window, cx);
-        });
-
-        if let Some(transaction) = self.ime_transaction {
-            self.buffer.update(cx, |buffer, cx| {
-                buffer.group_until_transaction(transaction, cx);
-            });
-        }
-
-        self.unmark_text(window, cx);
-    }
-
-    fn replace_and_mark_text_in_range(
-        &mut self,
-        range_utf16: Option<Range<usize>>,
-        text: &str,
-        new_selected_range_utf16: Option<Range<usize>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if !self.input_enabled {
-            return;
-        }
-
-        let transaction = self.transact(window, cx, |this, window, cx| {
-            let ranges_to_replace = if let Some(mut marked_ranges) = this.marked_text_ranges(cx) {
-                let snapshot = this.buffer.read(cx).read(cx);
-                if let Some(relative_range_utf16) = range_utf16.as_ref() {
-                    for marked_range in &mut marked_ranges {
-                        marked_range.end.0 = marked_range.start.0 + relative_range_utf16.end;
-                        marked_range.start.0 += relative_range_utf16.start;
-                        marked_range.start =
-                            snapshot.clip_offset_utf16(marked_range.start, Bias::Left);
-                        marked_range.end =
-                            snapshot.clip_offset_utf16(marked_range.end, Bias::Right);
-                    }
-                }
-                Some(marked_ranges)
-            } else if let Some(range_utf16) = range_utf16 {
-                let range_utf16 = OffsetUtf16(range_utf16.start)..OffsetUtf16(range_utf16.end);
-                Some(this.selection_replacement_ranges(range_utf16, cx))
-            } else {
-                None
-            };
-
-            let range_to_replace = ranges_to_replace.as_ref().and_then(|ranges_to_replace| {
-                let newest_selection_id = this.selections.newest_anchor().id;
-                this.selections
-                    .all::<OffsetUtf16>(cx)
-                    .iter()
-                    .zip(ranges_to_replace.iter())
-                    .find_map(|(selection, range)| {
-                        if selection.id == newest_selection_id {
-                            Some(
-                                (range.start.0 as isize - selection.head().0 as isize)
-                                    ..(range.end.0 as isize - selection.head().0 as isize),
-                            )
-                        } else {
-                            None
-                        }
-                    })
-            });
-
-            cx.emit(EditorEvent::InputHandled {
-                utf16_range_to_replace: range_to_replace,
-                text: text.into(),
-            });
-
-            if let Some(ranges) = ranges_to_replace {
-                this.change_selections(None, window, cx, |s| s.select_ranges(ranges));
-            }
-
-            let marked_ranges = {
-                let snapshot = this.buffer.read(cx).read(cx);
-                this.selections
-                    .disjoint_anchors()
-                    .iter()
-                    .map(|selection| {
-                        selection.start.bias_left(&snapshot)..selection.end.bias_right(&snapshot)
-                    })
-                    .collect::<Vec<_>>()
-            };
-
-            if text.is_empty() {
-                this.unmark_text(window, cx);
-            } else {
-                this.highlight_text::<InputComposition>(
-                    marked_ranges.clone(),
-                    HighlightStyle {
-                        underline: Some(UnderlineStyle {
-                            thickness: px(1.),
-                            color: None,
-                            wavy: false,
-                        }),
-                        ..Default::default()
-                    },
-                    cx,
-                );
-            }
-
-            // Disable auto-closing when composing text (i.e. typing a `"` on a Brazilian keyboard)
-            let use_autoclose = this.use_autoclose;
-            let use_auto_surround = this.use_auto_surround;
-            this.set_use_autoclose(false);
-            this.set_use_auto_surround(false);
-            this.handle_input(text, window, cx);
-            this.set_use_autoclose(use_autoclose);
-            this.set_use_auto_surround(use_auto_surround);
-
-            if let Some(new_selected_range) = new_selected_range_utf16 {
-                let snapshot = this.buffer.read(cx).read(cx);
-                let new_selected_ranges = marked_ranges
-                    .into_iter()
-                    .map(|marked_range| {
-                        let insertion_start = marked_range.start.to_offset_utf16(&snapshot).0;
-                        let new_start = OffsetUtf16(new_selected_range.start + insertion_start);
-                        let new_end = OffsetUtf16(new_selected_range.end + insertion_start);
-                        snapshot.clip_offset_utf16(new_start, Bias::Left)
-                            ..snapshot.clip_offset_utf16(new_end, Bias::Right)
-                    })
-                    .collect::<Vec<_>>();
-
-                drop(snapshot);
-                this.change_selections(None, window, cx, |selections| {
-                    selections.select_ranges(new_selected_ranges)
-                });
-            }
-        });
-
-        self.ime_transaction = self.ime_transaction.or(transaction);
-        if let Some(transaction) = self.ime_transaction {
-            self.buffer.update(cx, |buffer, cx| {
-                buffer.group_until_transaction(transaction, cx);
-            });
-        }
-
-        if self.text_highlights::<InputComposition>(cx).is_none() {
-            self.ime_transaction.take();
-        }
-    }
-
-    fn bounds_for_range(
-        &mut self,
-        range_utf16: Range<usize>,
-        element_bounds: gpui::Bounds<Pixels>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<gpui::Bounds<Pixels>> {
-        let text_layout_details = self.text_layout_details(window);
-        let gpui::Size {
-            width: em_width,
-            height: line_height,
-        } = self.character_size(window);
-
-        let snapshot = self.snapshot(window, cx);
-        let scroll_position = snapshot.scroll_position();
-        let scroll_left = scroll_position.x * em_width;
-
-        let start = OffsetUtf16(range_utf16.start).to_display_point(&snapshot);
-        let x = snapshot.x_for_display_point(start, &text_layout_details) - scroll_left
-            + self.gutter_dimensions.width
-            + self.gutter_dimensions.margin;
-        let y = line_height * (start.row().as_f32() - scroll_position.y);
-
-        Some(Bounds {
-            origin: element_bounds.origin + point(x, y),
-            size: size(em_width, line_height),
-        })
-    }
-
-    fn character_index_for_point(
-        &mut self,
-        point: gpui::Point<Pixels>,
-        _window: &mut Window,
-        _cx: &mut Context<Self>,
-    ) -> Option<usize> {
-        let position_map = self.last_position_map.as_ref()?;
-        if !position_map.text_hitbox.contains(&point) {
-            return None;
-        }
-        let display_point = position_map.point_for_position(point).previous_valid;
-        let anchor = position_map
-            .snapshot
-            .display_point_to_anchor(display_point, Bias::Left);
-        let utf16_offset = anchor.to_offset_utf16(&position_map.snapshot.buffer_snapshot);
-        Some(utf16_offset.0)
-    }
-}
-
-trait SelectionExt {
-    fn display_range(&self, map: &DisplaySnapshot) -> Range<DisplayPoint>;
-    fn spanned_rows(
-        &self,
-        include_end_if_at_line_start: bool,
-        map: &DisplaySnapshot,
-    ) -> Range<MultiBufferRow>;
-}
-
-impl<T: ToPoint + ToOffset> SelectionExt for Selection<T> {
-    fn display_range(&self, map: &DisplaySnapshot) -> Range<DisplayPoint> {
-        let start = self
-            .start
-            .to_point(&map.buffer_snapshot)
-            .to_display_point(map);
-        let end = self
-            .end
-            .to_point(&map.buffer_snapshot)
-            .to_display_point(map);
-        if self.reversed {
-            end..start
-        } else {
-            start..end
-        }
-    }
-
-    fn spanned_rows(
-        &self,
-        include_end_if_at_line_start: bool,
-        map: &DisplaySnapshot,
-    ) -> Range<MultiBufferRow> {
-        let start = self.start.to_point(&map.buffer_snapshot);
-        let mut end = self.end.to_point(&map.buffer_snapshot);
-        if !include_end_if_at_line_start && start.row != end.row && end.column == 0 {
-            end.row -= 1;
-        }
-
-        let buffer_start = map.prev_line_boundary(start).0;
-        let buffer_end = map.next_line_boundary(end).0;
-        MultiBufferRow(buffer_start.row)..MultiBufferRow(buffer_end.row + 1)
-    }
-}
-
-impl<T: InvalidationRegion> InvalidationStack<T> {
-    fn invalidate<S>(&mut self, selections: &[Selection<S>], buffer: &MultiBufferSnapshot)
-    where
-        S: Clone + ToOffset,
-    {
-        while let Some(region) = self.last() {
-            let all_selections_inside_invalidation_ranges =
-                if selections.len() == region.ranges().len() {
-                    selections
-                        .iter()
-                        .zip(region.ranges().iter().map(|r| r.to_offset(buffer)))
-                        .all(|(selection, invalidation_range)| {
-                            let head = selection.head().to_offset(buffer);
-                            invalidation_range.start <= head && invalidation_range.end >= head
-                        })
-                } else {
-                    false
-                };
-
-            if all_selections_inside_invalidation_ranges {
-                break;
-            } else {
-                self.pop();
-            }
-        }
-    }
-}
-
-impl<T> Default for InvalidationStack<T> {
-    fn default() -> Self {
-        Self(Default::default())
-    }
-}
-
-impl<T> Deref for InvalidationStack<T> {
-    type Target = Vec<T>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl<T> DerefMut for InvalidationStack<T> {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.0
-    }
-}
-
-impl InvalidationRegion for SnippetState {
-    fn ranges(&self) -> &[Range<Anchor>] {
-        &self.ranges[self.active_index]
-    }
-}
-
-fn inline_completion_edit_text(
-    current_snapshot: &BufferSnapshot,
-    edits: &[(Range<Anchor>, String)],
-    edit_preview: &EditPreview,
-    include_deletions: bool,
-    cx: &App,
-) -> HighlightedText {
-    let edits = edits
-        .iter()
-        .map(|(anchor, text)| {
-            (
-                anchor.start.text_anchor..anchor.end.text_anchor,
-                text.clone(),
-            )
-        })
-        .collect::<Vec<_>>();
-
-    edit_preview.highlight_edits(current_snapshot, &edits, include_deletions, cx)
-}
-
-pub fn diagnostic_style(severity: DiagnosticSeverity, colors: &StatusColors) -> Hsla {
-    match severity {
-        DiagnosticSeverity::ERROR => colors.error,
-        DiagnosticSeverity::WARNING => colors.warning,
-        DiagnosticSeverity::INFORMATION => colors.info,
-        DiagnosticSeverity::HINT => colors.info,
-        _ => colors.ignored,
-    }
-}
-
-pub fn styled_runs_for_code_label<'a>(
-    label: &'a CodeLabel,
-    syntax_theme: &'a theme::SyntaxTheme,
-) -> impl 'a + Iterator<Item = (Range<usize>, HighlightStyle)> {
-    let fade_out = HighlightStyle {
-        fade_out: Some(0.35),
-        ..Default::default()
-    };
-
-    let mut prev_end = label.filter_range.end;
-    label
-        .runs
-        .iter()
-        .enumerate()
-        .flat_map(move |(ix, (range, highlight_id))| {
-            let style = if let Some(style) = highlight_id.style(syntax_theme) {
-                style
-            } else {
-                return Default::default();
-            };
-            let mut muted_style = style;
-            muted_style.highlight(fade_out);
-
-            let mut runs = SmallVec::<[(Range<usize>, HighlightStyle); 3]>::new();
-            if range.start >= label.filter_range.end {
-                if range.start > prev_end {
-                    runs.push((prev_end..range.start, fade_out));
-                }
-                runs.push((range.clone(), muted_style));
-            } else if range.end <= label.filter_range.end {
-                runs.push((range.clone(), style));
-            } else {
-                runs.push((range.start..label.filter_range.end, style));
-                runs.push((label.filter_range.end..range.end, muted_style));
-            }
-            prev_end = cmp::max(prev_end, range.end);
-
-            if ix + 1 == label.runs.len() && label.text.len() > prev_end {
-                runs.push((prev_end..label.text.len(), fade_out));
-            }
-
-            runs
-        })
-}
-
-pub(crate) fn split_words(text: &str) -> impl std::iter::Iterator<Item = &str> + '_ {
-    let mut prev_index = 0;
-    let mut prev_codepoint: Option<char> = None;
-    text.char_indices()
-        .chain([(text.len(), '\0')])
-        .filter_map(move |(index, codepoint)| {
-            let prev_codepoint = prev_codepoint.replace(codepoint)?;
-            let is_boundary = index == text.len()
-                || !prev_codepoint.is_uppercase() && codepoint.is_uppercase()
-                || !prev_codepoint.is_alphanumeric() && codepoint.is_alphanumeric();
-            if is_boundary {
-                let chunk = &text[prev_index..index];
-                prev_index = index;
-                Some(chunk)
-            } else {
-                None
-            }
-        })
-}
-
-pub trait RangeToAnchorExt: Sized {
-    fn to_anchors(self, snapshot: &MultiBufferSnapshot) -> Range<Anchor>;
-
-    fn to_display_points(self, snapshot: &EditorSnapshot) -> Range<DisplayPoint> {
-        let anchor_range = self.to_anchors(&snapshot.buffer_snapshot);
-        anchor_range.start.to_display_point(snapshot)..anchor_range.end.to_display_point(snapshot)
-    }
-}
-
-impl<T: ToOffset> RangeToAnchorExt for Range<T> {
-    fn to_anchors(self, snapshot: &MultiBufferSnapshot) -> Range<Anchor> {
-        let start_offset = self.start.to_offset(snapshot);
-        let end_offset = self.end.to_offset(snapshot);
-        if start_offset == end_offset {
-            snapshot.anchor_before(start_offset)..snapshot.anchor_before(end_offset)
-        } else {
-            snapshot.anchor_after(self.start)..snapshot.anchor_before(self.end)
-        }
-    }
-}
-
-pub trait RowExt {
-    fn as_f32(&self) -> f32;
-
-    fn next_row(&self) -> Self;
-
-    fn previous_row(&self) -> Self;
-
-    fn minus(&self, other: Self) -> u32;
-}
-
-impl RowExt for DisplayRow {
-    fn as_f32(&self) -> f32 {
-        self.0 as f32
-    }
-
-    fn next_row(&self) -> Self {
-        Self(self.0 + 1)
-    }
-
-    fn previous_row(&self) -> Self {
-        Self(self.0.saturating_sub(1))
-    }
-
-    fn minus(&self, other: Self) -> u32 {
-        self.0 - other.0
-    }
-}
-
-impl RowExt for MultiBufferRow {
-    fn as_f32(&self) -> f32 {
-        self.0 as f32
-    }
-
-    fn next_row(&self) -> Self {
-        Self(self.0 + 1)
-    }
-
-    fn previous_row(&self) -> Self {
-        Self(self.0.saturating_sub(1))
-    }
-
-    fn minus(&self, other: Self) -> u32 {
-        self.0 - other.0
-    }
-}
-
-trait RowRangeExt {
-    type Row;
-
-    fn len(&self) -> usize;
-
-    fn iter_rows(&self) -> impl DoubleEndedIterator<Item = Self::Row>;
-}
-
-impl RowRangeExt for Range<MultiBufferRow> {
-    type Row = MultiBufferRow;
-
-    fn len(&self) -> usize {
-        (self.end.0 - self.start.0) as usize
-    }
-
-    fn iter_rows(&self) -> impl DoubleEndedIterator<Item = MultiBufferRow> {
-        (self.start.0..self.end.0).map(MultiBufferRow)
-    }
-}
-
-impl RowRangeExt for Range<DisplayRow> {
-    type Row = DisplayRow;
-
-    fn len(&self) -> usize {
-        (self.end.0 - self.start.0) as usize
-    }
-
-    fn iter_rows(&self) -> impl DoubleEndedIterator<Item = DisplayRow> {
-        (self.start.0..self.end.0).map(DisplayRow)
-    }
-}
-
-/// If select range has more than one line, we
-/// just point the cursor to range.start.
-fn collapse_multiline_range(range: Range<Point>) -> Range<Point> {
-    if range.start.row == range.end.row {
-        range
-    } else {
-        range.start..range.start
-    }
-}
-pub struct KillRing(ClipboardItem);
-impl Global for KillRing {}
-
-const UPDATE_DEBOUNCE: Duration = Duration::from_millis(50);
-
-enum BreakpointPromptEditAction {
-    Log,
-    Condition,
-    HitCondition,
-}
-
-struct BreakpointPromptEditor {
-    pub(crate) prompt: Entity<Editor>,
-    editor: WeakEntity<Editor>,
-    breakpoint_anchor: Anchor,
-    breakpoint: Breakpoint,
-    edit_action: BreakpointPromptEditAction,
-    block_ids: HashSet<CustomBlockId>,
-    gutter_dimensions: Arc<Mutex<GutterDimensions>>,
-    _subscriptions: Vec<Subscription>,
-}
-
-impl BreakpointPromptEditor {
-    const MAX_LINES: u8 = 4;
-
-    fn new(
-        editor: WeakEntity<Editor>,
-        breakpoint_anchor: Anchor,
-        breakpoint: Breakpoint,
-        edit_action: BreakpointPromptEditAction,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let base_text = match edit_action {
-            BreakpointPromptEditAction::Log => breakpoint.message.as_ref(),
-            BreakpointPromptEditAction::Condition => breakpoint.condition.as_ref(),
-            BreakpointPromptEditAction::HitCondition => breakpoint.hit_condition.as_ref(),
-        }
-        .map(|msg| msg.to_string())
-        .unwrap_or_default();
-
-        let buffer = cx.new(|cx| Buffer::local(base_text, cx));
-        let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-
-        let prompt = cx.new(|cx| {
-            let mut prompt = Editor::new(
-                EditorMode::AutoHeight {
-                    max_lines: Self::MAX_LINES as usize,
-                },
-                buffer,
-                None,
-                window,
-                cx,
-            );
-            prompt.set_soft_wrap_mode(language::language_settings::SoftWrap::EditorWidth, cx);
-            prompt.set_show_cursor_when_unfocused(false, cx);
-            prompt.set_placeholder_text(
-                match edit_action {
-                    BreakpointPromptEditAction::Log => "Message to log when a breakpoint is hit. Expressions within {} are interpolated.",
-                    BreakpointPromptEditAction::Condition => "Condition when a breakpoint is hit. Expressions within {} are interpolated.",
-                    BreakpointPromptEditAction::HitCondition => "How many breakpoint hits to ignore",
-                },
-                cx,
-            );
-
-            prompt
-        });
-
-        Self {
-            prompt,
-            editor,
-            breakpoint_anchor,
-            breakpoint,
-            edit_action,
-            gutter_dimensions: Arc::new(Mutex::new(GutterDimensions::default())),
-            block_ids: Default::default(),
-            _subscriptions: vec![],
-        }
-    }
-
-    pub(crate) fn add_block_ids(&mut self, block_ids: Vec<CustomBlockId>) {
-        self.block_ids.extend(block_ids)
-    }
-
-    fn confirm(&mut self, _: &menu::Confirm, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(editor) = self.editor.upgrade() {
-            let message = self
-                .prompt
-                .read(cx)
-                .buffer
-                .read(cx)
-                .as_singleton()
-                .expect("A multi buffer in breakpoint prompt isn't possible")
-                .read(cx)
-                .as_rope()
-                .to_string();
-
-            editor.update(cx, |editor, cx| {
-                editor.edit_breakpoint_at_anchor(
-                    self.breakpoint_anchor,
-                    self.breakpoint.clone(),
-                    match self.edit_action {
-                        BreakpointPromptEditAction::Log => {
-                            BreakpointEditAction::EditLogMessage(message.into())
-                        }
-                        BreakpointPromptEditAction::Condition => {
-                            BreakpointEditAction::EditCondition(message.into())
-                        }
-                        BreakpointPromptEditAction::HitCondition => {
-                            BreakpointEditAction::EditHitCondition(message.into())
-                        }
-                    },
-                    cx,
-                );
-
-                editor.remove_blocks(self.block_ids.clone(), None, cx);
-                cx.focus_self(window);
-            });
-        }
-    }
-
-    fn cancel(&mut self, _: &menu::Cancel, window: &mut Window, cx: &mut Context<Self>) {
-        self.editor
-            .update(cx, |editor, cx| {
-                editor.remove_blocks(self.block_ids.clone(), None, cx);
-                window.focus(&editor.focus_handle);
-            })
-            .log_err();
-    }
-
-    fn render_prompt_editor(&self, cx: &mut Context<Self>) -> impl IntoElement {
-        let settings = ThemeSettings::get_global(cx);
-        let text_style = TextStyle {
-            color: if self.prompt.read(cx).read_only(cx) {
-                cx.theme().colors().text_disabled
-            } else {
-                cx.theme().colors().text
-            },
-            font_family: settings.buffer_font.family.clone(),
-            font_fallbacks: settings.buffer_font.fallbacks.clone(),
-            font_size: settings.buffer_font_size(cx).into(),
-            font_weight: settings.buffer_font.weight,
-            line_height: relative(settings.buffer_line_height.value()),
-            ..Default::default()
-        };
-        EditorElement::new(
-            &self.prompt,
-            EditorStyle {
-                background: cx.theme().colors().editor_background,
-                local_player: cx.theme().players().local(),
-                text: text_style,
-                ..Default::default()
-            },
-        )
-    }
-}
-
-impl Render for BreakpointPromptEditor {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let gutter_dimensions = *self.gutter_dimensions.lock();
-        h_flex()
-            .key_context("Editor")
-            .bg(cx.theme().colors().editor_background)
-            .border_y_1()
-            .border_color(cx.theme().status().info_border)
-            .size_full()
-            .py(window.line_height() / 2.5)
-            .on_action(cx.listener(Self::confirm))
-            .on_action(cx.listener(Self::cancel))
-            .child(h_flex().w(gutter_dimensions.full_width() + (gutter_dimensions.margin / 2.0)))
-            .child(div().flex_1().child(self.render_prompt_editor(cx)))
-    }
-}
-
-impl Focusable for BreakpointPromptEditor {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        self.prompt.focus_handle(cx)
-    }
-}
-
-fn all_edits_insertions_or_deletions(
-    edits: &Vec<(Range<Anchor>, String)>,
-    snapshot: &MultiBufferSnapshot,
-) -> bool {
-    let mut all_insertions = true;
-    let mut all_deletions = true;
-
-    for (range, new_text) in edits.iter() {
-        let range_is_empty = range.to_offset(&snapshot).is_empty();
-        let text_is_empty = new_text.is_empty();
-
-        if range_is_empty != text_is_empty {
-            if range_is_empty {
-                all_deletions = false;
-            } else {
-                all_insertions = false;
-            }
-        } else {
-            return false;
-        }
-
-        if !all_insertions && !all_deletions {
-            return false;
-        }
-    }
-    all_insertions || all_deletions
-}
-
-struct MissingEditPredictionKeybindingTooltip;
-
-impl Render for MissingEditPredictionKeybindingTooltip {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        ui::tooltip_container(window, cx, |container, _, cx| {
-            container
-                .flex_shrink_0()
-                .max_w_80()
-                .min_h(rems_from_px(124.))
-                .justify_between()
-                .child(
-                    v_flex()
-                        .flex_1()
-                        .text_ui_sm(cx)
-                        .child(Label::new("Conflict with Accept Keybinding"))
-                        .child("Your keymap currently overrides the default accept keybinding. To continue, assign one keybinding for the `editor::AcceptEditPrediction` action.")
-                )
-                .child(
-                    h_flex()
-                        .pb_1()
-                        .gap_1()
-                        .items_end()
-                        .w_full()
-                        .child(Button::new("open-keymap", "Assign Keybinding").size(ButtonSize::Compact).on_click(|_ev, window, cx| {
-                            window.dispatch_action(zed_actions::OpenKeymap.boxed_clone(), cx)
-                        }))
-                        .child(Button::new("see-docs", "See Docs").size(ButtonSize::Compact).on_click(|_ev, _window, cx| {
-                            cx.open_url("https://zed.dev/docs/completions#edit-predictions-missing-keybinding");
-                        })),
-                )
-        })
-    }
-}
-
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub struct LineHighlight {
-    pub background: Background,
-    pub border: Option<gpui::Hsla>,
-    pub include_gutter: bool,
-    pub type_id: Option<TypeId>,
-}
-
-fn render_diff_hunk_controls(
-    row: u32,
-    status: &DiffHunkStatus,
-    hunk_range: Range<Anchor>,
-    is_created_file: bool,
-    line_height: Pixels,
-    editor: &Entity<Editor>,
-    _window: &mut Window,
-    cx: &mut App,
-) -> AnyElement {
-    h_flex()
-        .h(line_height)
-        .mr_1()
-        .gap_1()
-        .px_0p5()
-        .pb_1()
-        .border_x_1()
-        .border_b_1()
-        .border_color(cx.theme().colors().border_variant)
-        .rounded_b_lg()
-        .bg(cx.theme().colors().editor_background)
-        .gap_1()
-        .occlude()
-        .shadow_md()
-        .child(if status.has_secondary_hunk() {
-            Button::new(("stage", row as u64), "Stage")
-                .alpha(if status.is_pending() { 0.66 } else { 1.0 })
-                .tooltip({
-                    let focus_handle = editor.focus_handle(cx);
-                    move |window, cx| {
-                        Tooltip::for_action_in(
-                            "Stage Hunk",
-                            &::git::ToggleStaged,
-                            &focus_handle,
-                            window,
-                            cx,
-                        )
-                    }
-                })
-                .on_click({
-                    let editor = editor.clone();
-                    move |_event, _window, cx| {
-                        editor.update(cx, |editor, cx| {
-                            editor.stage_or_unstage_diff_hunks(
-                                true,
-                                vec![hunk_range.start..hunk_range.start],
-                                cx,
-                            );
-                        });
-                    }
-                })
-        } else {
-            Button::new(("unstage", row as u64), "Unstage")
-                .alpha(if status.is_pending() { 0.66 } else { 1.0 })
-                .tooltip({
-                    let focus_handle = editor.focus_handle(cx);
-                    move |window, cx| {
-                        Tooltip::for_action_in(
-                            "Unstage Hunk",
-                            &::git::ToggleStaged,
-                            &focus_handle,
-                            window,
-                            cx,
-                        )
-                    }
-                })
-                .on_click({
-                    let editor = editor.clone();
-                    move |_event, _window, cx| {
-                        editor.update(cx, |editor, cx| {
-                            editor.stage_or_unstage_diff_hunks(
-                                false,
-                                vec![hunk_range.start..hunk_range.start],
-                                cx,
-                            );
-                        });
-                    }
-                })
-        })
-        .child(
-            Button::new(("restore", row as u64), "Restore")
-                .tooltip({
-                    let focus_handle = editor.focus_handle(cx);
-                    move |window, cx| {
-                        Tooltip::for_action_in(
-                            "Restore Hunk",
-                            &::git::Restore,
-                            &focus_handle,
-                            window,
-                            cx,
-                        )
-                    }
-                })
-                .on_click({
-                    let editor = editor.clone();
-                    move |_event, window, cx| {
-                        editor.update(cx, |editor, cx| {
-                            let snapshot = editor.snapshot(window, cx);
-                            let point = hunk_range.start.to_point(&snapshot.buffer_snapshot);
-                            editor.restore_hunks_in_ranges(vec![point..point], window, cx);
-                        });
-                    }
-                })
-                .disabled(is_created_file),
-        )
-        .when(
-            !editor.read(cx).buffer().read(cx).all_diff_hunks_expanded(),
-            |el| {
-                el.child(
-                    IconButton::new(("next-hunk", row as u64), IconName::ArrowDown)
-                        .shape(IconButtonShape::Square)
-                        .icon_size(IconSize::Small)
-                        // .disabled(!has_multiple_hunks)
-                        .tooltip({
-                            let focus_handle = editor.focus_handle(cx);
-                            move |window, cx| {
-                                Tooltip::for_action_in(
-                                    "Next Hunk",
-                                    &GoToHunk,
-                                    &focus_handle,
-                                    window,
-                                    cx,
-                                )
-                            }
-                        })
-                        .on_click({
-                            let editor = editor.clone();
-                            move |_event, window, cx| {
-                                editor.update(cx, |editor, cx| {
-                                    let snapshot = editor.snapshot(window, cx);
-                                    let position =
-                                        hunk_range.end.to_point(&snapshot.buffer_snapshot);
-                                    editor.go_to_hunk_before_or_after_position(
-                                        &snapshot,
-                                        position,
-                                        Direction::Next,
-                                        window,
-                                        cx,
-                                    );
-                                    editor.expand_selected_diff_hunks(cx);
-                                });
-                            }
-                        }),
-                )
-                .child(
-                    IconButton::new(("prev-hunk", row as u64), IconName::ArrowUp)
-                        .shape(IconButtonShape::Square)
-                        .icon_size(IconSize::Small)
-                        // .disabled(!has_multiple_hunks)
-                        .tooltip({
-                            let focus_handle = editor.focus_handle(cx);
-                            move |window, cx| {
-                                Tooltip::for_action_in(
-                                    "Previous Hunk",
-                                    &GoToPreviousHunk,
-                                    &focus_handle,
-                                    window,
-                                    cx,
-                                )
-                            }
-                        })
-                        .on_click({
-                            let editor = editor.clone();
-                            move |_event, window, cx| {
-                                editor.update(cx, |editor, cx| {
-                                    let snapshot = editor.snapshot(window, cx);
-                                    let point =
-                                        hunk_range.start.to_point(&snapshot.buffer_snapshot);
-                                    editor.go_to_hunk_before_or_after_position(
-                                        &snapshot,
-                                        point,
-                                        Direction::Prev,
-                                        window,
-                                        cx,
-                                    );
-                                    editor.expand_selected_diff_hunks(cx);
-                                });
-                            }
-                        }),
-                )
-            },
-        )
-        .into_any_element()
-}
diff --git a/crates/agent/src/edit_agent/evals/fixtures/disable_cursor_blinking/possible-01.diff b/crates/agent/src/edit_agent/evals/fixtures/disable_cursor_blinking/possible-01.diff
deleted file mode 100644
index 1a38a1967f..0000000000
--- a/crates/agent/src/edit_agent/evals/fixtures/disable_cursor_blinking/possible-01.diff
+++ /dev/null
@@ -1,28 +0,0 @@
---- before.rs	2025-07-07 11:37:48.434629001 +0300
-+++ expected.rs	2025-07-14 10:33:53.346906775 +0300
-@@ -1780,11 +1780,11 @@
-                 cx.observe_window_activation(window, |editor, window, cx| {
-                     let active = window.is_window_active();
-                     editor.blink_manager.update(cx, |blink_manager, cx| {
--                        if active {
--                            blink_manager.enable(cx);
--                        } else {
--                            blink_manager.disable(cx);
--                        }
-+                        // if active {
-+                        //     blink_manager.enable(cx);
-+                        // } else {
-+                        //     blink_manager.disable(cx);
-+                        // }
-                     });
-                 }),
-             ],
-@@ -18463,7 +18463,7 @@
-             }
- 
-             self.blink_manager.update(cx, |blink_manager, cx| {
--                blink_manager.enable(cx);
-+                // blink_manager.enable(cx);
-             });
-             self.show_cursor_names(window, cx);
-             self.buffer.update(cx, |buffer, cx| {
diff --git a/crates/agent/src/edit_agent/evals/fixtures/disable_cursor_blinking/possible-02.diff b/crates/agent/src/edit_agent/evals/fixtures/disable_cursor_blinking/possible-02.diff
deleted file mode 100644
index b484cce48f..0000000000
--- a/crates/agent/src/edit_agent/evals/fixtures/disable_cursor_blinking/possible-02.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-@@ -1778,13 +1778,13 @@
-                 cx.observe_global_in::<SettingsStore>(window, Self::settings_changed),
-                 observe_buffer_font_size_adjustment(cx, |_, cx| cx.notify()),
-                 cx.observe_window_activation(window, |editor, window, cx| {
--                    let active = window.is_window_active();
-+                    // let active = window.is_window_active();
-                     editor.blink_manager.update(cx, |blink_manager, cx| {
--                        if active {
--                            blink_manager.enable(cx);
--                        } else {
--                            blink_manager.disable(cx);
--                        }
-+                        // if active {
-+                        //     blink_manager.enable(cx);
-+                        // } else {
-+                        //     blink_manager.disable(cx);
-+                        // }
-                     });
-                 }),
-             ],
-@@ -18463,7 +18463,7 @@
-             }
- 
-             self.blink_manager.update(cx, |blink_manager, cx| {
--                blink_manager.enable(cx);
-+                // blink_manager.enable(cx);
-             });
-             self.show_cursor_names(window, cx);
-             self.buffer.update(cx, |buffer, cx| {
diff --git a/crates/agent/src/edit_agent/evals/fixtures/disable_cursor_blinking/possible-03.diff b/crates/agent/src/edit_agent/evals/fixtures/disable_cursor_blinking/possible-03.diff
deleted file mode 100644
index 431e34e48a..0000000000
--- a/crates/agent/src/edit_agent/evals/fixtures/disable_cursor_blinking/possible-03.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-@@ -1774,17 +1774,17 @@
-                 cx.observe(&buffer, Self::on_buffer_changed),
-                 cx.subscribe_in(&buffer, window, Self::on_buffer_event),
-                 cx.observe_in(&display_map, window, Self::on_display_map_changed),
--                cx.observe(&blink_manager, |_, _, cx| cx.notify()),
-+                // cx.observe(&blink_manager, |_, _, cx| cx.notify()),
-                 cx.observe_global_in::<SettingsStore>(window, Self::settings_changed),
-                 observe_buffer_font_size_adjustment(cx, |_, cx| cx.notify()),
-                 cx.observe_window_activation(window, |editor, window, cx| {
--                    let active = window.is_window_active();
-+                    // let active = window.is_window_active();
-                     editor.blink_manager.update(cx, |blink_manager, cx| {
--                        if active {
--                            blink_manager.enable(cx);
--                        } else {
--                            blink_manager.disable(cx);
--                        }
-+                        // if active {
-+                        //     blink_manager.enable(cx);
-+                        // } else {
-+                        //     blink_manager.disable(cx);
-+                        // }
-                     });
-                 }),
-             ],
-@@ -18463,7 +18463,7 @@
-             }
- 
-             self.blink_manager.update(cx, |blink_manager, cx| {
--                blink_manager.enable(cx);
-+                // blink_manager.enable(cx);
-             });
-             self.show_cursor_names(window, cx);
-             self.buffer.update(cx, |buffer, cx| {
diff --git a/crates/agent/src/edit_agent/evals/fixtures/disable_cursor_blinking/possible-04.diff b/crates/agent/src/edit_agent/evals/fixtures/disable_cursor_blinking/possible-04.diff
deleted file mode 100644
index 64a6b85dd3..0000000000
--- a/crates/agent/src/edit_agent/evals/fixtures/disable_cursor_blinking/possible-04.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-@@ -1774,17 +1774,17 @@
-                 cx.observe(&buffer, Self::on_buffer_changed),
-                 cx.subscribe_in(&buffer, window, Self::on_buffer_event),
-                 cx.observe_in(&display_map, window, Self::on_display_map_changed),
--                cx.observe(&blink_manager, |_, _, cx| cx.notify()),
-+                // cx.observe(&blink_manager, |_, _, cx| cx.notify()),
-                 cx.observe_global_in::<SettingsStore>(window, Self::settings_changed),
-                 observe_buffer_font_size_adjustment(cx, |_, cx| cx.notify()),
-                 cx.observe_window_activation(window, |editor, window, cx| {
-                     let active = window.is_window_active();
-                     editor.blink_manager.update(cx, |blink_manager, cx| {
--                        if active {
--                            blink_manager.enable(cx);
--                        } else {
--                            blink_manager.disable(cx);
--                        }
-+                        // if active {
-+                        //     blink_manager.enable(cx);
-+                        // } else {
-+                        //     blink_manager.disable(cx);
-+                        // }
-                     });
-                 }),
-             ],
-@@ -18463,7 +18463,7 @@
-             }
- 
-             self.blink_manager.update(cx, |blink_manager, cx| {
--                blink_manager.enable(cx);
-+                // blink_manager.enable(cx);
-             });
-             self.show_cursor_names(window, cx);
-             self.buffer.update(cx, |buffer, cx| {
diff --git a/crates/agent/src/edit_agent/evals/fixtures/extract_handle_command_output/before.rs b/crates/agent/src/edit_agent/evals/fixtures/extract_handle_command_output/before.rs
deleted file mode 100644
index 36fccb5132..0000000000
--- a/crates/agent/src/edit_agent/evals/fixtures/extract_handle_command_output/before.rs
+++ /dev/null
@@ -1,371 +0,0 @@
-use crate::commit::get_messages;
-use crate::{GitRemote, Oid};
-use anyhow::{Context as _, Result, anyhow};
-use collections::{HashMap, HashSet};
-use futures::AsyncWriteExt;
-use gpui::SharedString;
-use serde::{Deserialize, Serialize};
-use std::process::Stdio;
-use std::{ops::Range, path::Path};
-use text::Rope;
-use time::OffsetDateTime;
-use time::UtcOffset;
-use time::macros::format_description;
-
-pub use git2 as libgit;
-
-#[derive(Debug, Clone, Default)]
-pub struct Blame {
-    pub entries: Vec<BlameEntry>,
-    pub messages: HashMap<Oid, String>,
-    pub remote_url: Option<String>,
-}
-
-#[derive(Clone, Debug, Default)]
-pub struct ParsedCommitMessage {
-    pub message: SharedString,
-    pub permalink: Option<url::Url>,
-    pub pull_request: Option<crate::hosting_provider::PullRequest>,
-    pub remote: Option<GitRemote>,
-}
-
-impl Blame {
-    pub async fn for_path(
-        git_binary: &Path,
-        working_directory: &Path,
-        path: &Path,
-        content: &Rope,
-        remote_url: Option<String>,
-    ) -> Result<Self> {
-        let output = run_git_blame(git_binary, working_directory, path, content).await?;
-        let mut entries = parse_git_blame(&output)?;
-        entries.sort_unstable_by(|a, b| a.range.start.cmp(&b.range.start));
-
-        let mut unique_shas = HashSet::default();
-
-        for entry in entries.iter_mut() {
-            unique_shas.insert(entry.sha);
-        }
-
-        let shas = unique_shas.into_iter().collect::<Vec<_>>();
-        let messages = get_messages(working_directory, &shas)
-            .await
-            .context("failed to get commit messages")?;
-
-        Ok(Self {
-            entries,
-            messages,
-            remote_url,
-        })
-    }
-}
-
-const GIT_BLAME_NO_COMMIT_ERROR: &str = "fatal: no such ref: HEAD";
-const GIT_BLAME_NO_PATH: &str = "fatal: no such path";
-
-async fn run_git_blame(
-    git_binary: &Path,
-    working_directory: &Path,
-    path: &Path,
-    contents: &Rope,
-) -> Result<String> {
-    let mut child = util::command::new_smol_command(git_binary)
-        .current_dir(working_directory)
-        .arg("blame")
-        .arg("--incremental")
-        .arg("--contents")
-        .arg("-")
-        .arg(path.as_os_str())
-        .stdin(Stdio::piped())
-        .stdout(Stdio::piped())
-        .stderr(Stdio::piped())
-        .spawn()
-        .context("starting git blame process")?;
-
-    let stdin = child
-        .stdin
-        .as_mut()
-        .context("failed to get pipe to stdin of git blame command")?;
-
-    for chunk in contents.chunks() {
-        stdin.write_all(chunk.as_bytes()).await?;
-    }
-    stdin.flush().await?;
-
-    let output = child.output().await.context("reading git blame output")?;
-
-    if !output.status.success() {
-        let stderr = String::from_utf8_lossy(&output.stderr);
-        let trimmed = stderr.trim();
-        if trimmed == GIT_BLAME_NO_COMMIT_ERROR || trimmed.contains(GIT_BLAME_NO_PATH) {
-            return Ok(String::new());
-        }
-        anyhow::bail!("git blame process failed: {stderr}");
-    }
-
-    Ok(String::from_utf8(output.stdout)?)
-}
-
-#[derive(Serialize, Deserialize, Default, Debug, Clone, PartialEq, Eq)]
-pub struct BlameEntry {
-    pub sha: Oid,
-
-    pub range: Range<u32>,
-
-    pub original_line_number: u32,
-
-    pub author: Option<String>,
-    pub author_mail: Option<String>,
-    pub author_time: Option<i64>,
-    pub author_tz: Option<String>,
-
-    pub committer_name: Option<String>,
-    pub committer_email: Option<String>,
-    pub committer_time: Option<i64>,
-    pub committer_tz: Option<String>,
-
-    pub summary: Option<String>,
-
-    pub previous: Option<String>,
-    pub filename: String,
-}
-
-impl BlameEntry {
-    // Returns a BlameEntry by parsing the first line of a `git blame --incremental`
-    // entry. The line MUST have this format:
-    //
-    //     <40-byte-hex-sha1> <sourceline> <resultline> <num-lines>
-    fn new_from_blame_line(line: &str) -> Result<BlameEntry> {
-        let mut parts = line.split_whitespace();
-
-        let sha = parts
-            .next()
-            .and_then(|line| line.parse::<Oid>().ok())
-            .with_context(|| format!("parsing sha from {line}"))?;
-
-        let original_line_number = parts
-            .next()
-            .and_then(|line| line.parse::<u32>().ok())
-            .with_context(|| format!("parsing original line number from {line}"))?;
-        let final_line_number = parts
-            .next()
-            .and_then(|line| line.parse::<u32>().ok())
-            .with_context(|| format!("parsing final line number from {line}"))?;
-
-        let line_count = parts
-            .next()
-            .and_then(|line| line.parse::<u32>().ok())
-            .with_context(|| format!("parsing line count from {line}"))?;
-
-        let start_line = final_line_number.saturating_sub(1);
-        let end_line = start_line + line_count;
-        let range = start_line..end_line;
-
-        Ok(Self {
-            sha,
-            range,
-            original_line_number,
-            ..Default::default()
-        })
-    }
-
-    pub fn author_offset_date_time(&self) -> Result<time::OffsetDateTime> {
-        if let (Some(author_time), Some(author_tz)) = (self.author_time, &self.author_tz) {
-            let format = format_description!("[offset_hour][offset_minute]");
-            let offset = UtcOffset::parse(author_tz, &format)?;
-            let date_time_utc = OffsetDateTime::from_unix_timestamp(author_time)?;
-
-            Ok(date_time_utc.to_offset(offset))
-        } else {
-            // Directly return current time in UTC if there's no committer time or timezone
-            Ok(time::OffsetDateTime::now_utc())
-        }
-    }
-}
-
-// parse_git_blame parses the output of `git blame --incremental`, which returns
-// all the blame-entries for a given path incrementally, as it finds them.
-//
-// Each entry *always* starts with:
-//
-//     <40-byte-hex-sha1> <sourceline> <resultline> <num-lines>
-//
-// Each entry *always* ends with:
-//
-//     filename <whitespace-quoted-filename-goes-here>
-//
-// Line numbers are 1-indexed.
-//
-// A `git blame --incremental` entry looks like this:
-//
-//    6ad46b5257ba16d12c5ca9f0d4900320959df7f4 2 2 1
-//    author Joe Schmoe
-//    author-mail <joe.schmoe@example.com>
-//    author-time 1709741400
-//    author-tz +0100
-//    committer Joe Schmoe
-//    committer-mail <joe.schmoe@example.com>
-//    committer-time 1709741400
-//    committer-tz +0100
-//    summary Joe's cool commit
-//    previous 486c2409237a2c627230589e567024a96751d475 index.js
-//    filename index.js
-//
-// If the entry has the same SHA as an entry that was already printed then no
-// signature information is printed:
-//
-//    6ad46b5257ba16d12c5ca9f0d4900320959df7f4 3 4 1
-//    previous 486c2409237a2c627230589e567024a96751d475 index.js
-//    filename index.js
-//
-// More about `--incremental` output: https://mirrors.edge.kernel.org/pub/software/scm/git/docs/git-blame.html
-fn parse_git_blame(output: &str) -> Result<Vec<BlameEntry>> {
-    let mut entries: Vec<BlameEntry> = Vec::new();
-    let mut index: HashMap<Oid, usize> = HashMap::default();
-
-    let mut current_entry: Option<BlameEntry> = None;
-
-    for line in output.lines() {
-        let mut done = false;
-
-        match &mut current_entry {
-            None => {
-                let mut new_entry = BlameEntry::new_from_blame_line(line)?;
-
-                if let Some(existing_entry) = index
-                    .get(&new_entry.sha)
-                    .and_then(|slot| entries.get(*slot))
-                {
-                    new_entry.author.clone_from(&existing_entry.author);
-                    new_entry
-                        .author_mail
-                        .clone_from(&existing_entry.author_mail);
-                    new_entry.author_time = existing_entry.author_time;
-                    new_entry.author_tz.clone_from(&existing_entry.author_tz);
-                    new_entry
-                        .committer_name
-                        .clone_from(&existing_entry.committer_name);
-                    new_entry
-                        .committer_email
-                        .clone_from(&existing_entry.committer_email);
-                    new_entry.committer_time = existing_entry.committer_time;
-                    new_entry
-                        .committer_tz
-                        .clone_from(&existing_entry.committer_tz);
-                    new_entry.summary.clone_from(&existing_entry.summary);
-                }
-
-                current_entry.replace(new_entry);
-            }
-            Some(entry) => {
-                let Some((key, value)) = line.split_once(' ') else {
-                    continue;
-                };
-                let is_committed = !entry.sha.is_zero();
-                match key {
-                    "filename" => {
-                        entry.filename = value.into();
-                        done = true;
-                    }
-                    "previous" => entry.previous = Some(value.into()),
-
-                    "summary" if is_committed => entry.summary = Some(value.into()),
-                    "author" if is_committed => entry.author = Some(value.into()),
-                    "author-mail" if is_committed => entry.author_mail = Some(value.into()),
-                    "author-time" if is_committed => {
-                        entry.author_time = Some(value.parse::<i64>()?)
-                    }
-                    "author-tz" if is_committed => entry.author_tz = Some(value.into()),
-
-                    "committer" if is_committed => entry.committer_name = Some(value.into()),
-                    "committer-mail" if is_committed => entry.committer_email = Some(value.into()),
-                    "committer-time" if is_committed => {
-                        entry.committer_time = Some(value.parse::<i64>()?)
-                    }
-                    "committer-tz" if is_committed => entry.committer_tz = Some(value.into()),
-                    _ => {}
-                }
-            }
-        };
-
-        if done {
-            if let Some(entry) = current_entry.take() {
-                index.insert(entry.sha, entries.len());
-
-                // We only want annotations that have a commit.
-                if !entry.sha.is_zero() {
-                    entries.push(entry);
-                }
-            }
-        }
-    }
-
-    Ok(entries)
-}
-
-#[cfg(test)]
-mod tests {
-    use std::path::PathBuf;
-
-    use super::BlameEntry;
-    use super::parse_git_blame;
-
-    fn read_test_data(filename: &str) -> String {
-        let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-        path.push("test_data");
-        path.push(filename);
-
-        std::fs::read_to_string(&path)
-            .unwrap_or_else(|_| panic!("Could not read test data at {:?}. Is it generated?", path))
-    }
-
-    fn assert_eq_golden(entries: &Vec<BlameEntry>, golden_filename: &str) {
-        let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-        path.push("test_data");
-        path.push("golden");
-        path.push(format!("{}.json", golden_filename));
-
-        let mut have_json =
-            serde_json::to_string_pretty(&entries).expect("could not serialize entries to JSON");
-        // We always want to save with a trailing newline.
-        have_json.push('\n');
-
-        let update = std::env::var("UPDATE_GOLDEN")
-            .map(|val| val.eq_ignore_ascii_case("true"))
-            .unwrap_or(false);
-
-        if update {
-            std::fs::create_dir_all(path.parent().unwrap())
-                .expect("could not create golden test data directory");
-            std::fs::write(&path, have_json).expect("could not write out golden data");
-        } else {
-            let want_json =
-                std::fs::read_to_string(&path).unwrap_or_else(|_| {
-                    panic!("could not read golden test data file at {:?}. Did you run the test with UPDATE_GOLDEN=true before?", path);
-                }).replace("\r\n", "\n");
-
-            pretty_assertions::assert_eq!(have_json, want_json, "wrong blame entries");
-        }
-    }
-
-    #[test]
-    fn test_parse_git_blame_not_committed() {
-        let output = read_test_data("blame_incremental_not_committed");
-        let entries = parse_git_blame(&output).unwrap();
-        assert_eq_golden(&entries, "blame_incremental_not_committed");
-    }
-
-    #[test]
-    fn test_parse_git_blame_simple() {
-        let output = read_test_data("blame_incremental_simple");
-        let entries = parse_git_blame(&output).unwrap();
-        assert_eq_golden(&entries, "blame_incremental_simple");
-    }
-
-    #[test]
-    fn test_parse_git_blame_complex() {
-        let output = read_test_data("blame_incremental_complex");
-        let entries = parse_git_blame(&output).unwrap();
-        assert_eq_golden(&entries, "blame_incremental_complex");
-    }
-}
diff --git a/crates/agent/src/edit_agent/evals/fixtures/extract_handle_command_output/possible-01.diff b/crates/agent/src/edit_agent/evals/fixtures/extract_handle_command_output/possible-01.diff
deleted file mode 100644
index c13a223c63..0000000000
--- a/crates/agent/src/edit_agent/evals/fixtures/extract_handle_command_output/possible-01.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-@@ -94,6 +94,10 @@
- 
-     let output = child.output().await.context("reading git blame output")?;
- 
-+    handle_command_output(output)
-+}
-+
-+fn handle_command_output(output: std::process::Output) -> Result<String> {
-     if !output.status.success() {
-         let stderr = String::from_utf8_lossy(&output.stderr);
-         let trimmed = stderr.trim();
diff --git a/crates/agent/src/edit_agent/evals/fixtures/extract_handle_command_output/possible-02.diff b/crates/agent/src/edit_agent/evals/fixtures/extract_handle_command_output/possible-02.diff
deleted file mode 100644
index aa36a9241e..0000000000
--- a/crates/agent/src/edit_agent/evals/fixtures/extract_handle_command_output/possible-02.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-@@ -95,15 +95,19 @@
-     let output = child.output().await.context("reading git blame output")?;
-
-     if !output.status.success() {
--        let stderr = String::from_utf8_lossy(&output.stderr);
--        let trimmed = stderr.trim();
--        if trimmed == GIT_BLAME_NO_COMMIT_ERROR || trimmed.contains(GIT_BLAME_NO_PATH) {
--            return Ok(String::new());
--        }
--        anyhow::bail!("git blame process failed: {stderr}");
-+        return handle_command_output(output);
-     }
-
-     Ok(String::from_utf8(output.stdout)?)
-+}
-+
-+fn handle_command_output(output: std::process::Output) -> Result<String> {
-+    let stderr = String::from_utf8_lossy(&output.stderr);
-+    let trimmed = stderr.trim();
-+    if trimmed == GIT_BLAME_NO_COMMIT_ERROR || trimmed.contains(GIT_BLAME_NO_PATH) {
-+        return Ok(String::new());
-+    }
-+    anyhow::bail!("git blame process failed: {stderr}");
- }
-
- #[derive(Serialize, Deserialize, Default, Debug, Clone, PartialEq, Eq)]
diff --git a/crates/agent/src/edit_agent/evals/fixtures/extract_handle_command_output/possible-03.diff b/crates/agent/src/edit_agent/evals/fixtures/extract_handle_command_output/possible-03.diff
deleted file mode 100644
index d3c19b4380..0000000000
--- a/crates/agent/src/edit_agent/evals/fixtures/extract_handle_command_output/possible-03.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-@@ -93,7 +93,10 @@
-     stdin.flush().await?;
-
-     let output = child.output().await.context("reading git blame output")?;
-+    handle_command_output(output)
-+}
-
-+fn handle_command_output(output: std::process::Output) -> Result<String> {
-     if !output.status.success() {
-         let stderr = String::from_utf8_lossy(&output.stderr);
-         let trimmed = stderr.trim();
diff --git a/crates/agent/src/edit_agent/evals/fixtures/extract_handle_command_output/possible-04.diff b/crates/agent/src/edit_agent/evals/fixtures/extract_handle_command_output/possible-04.diff
deleted file mode 100644
index 1f87e4352c..0000000000
--- a/crates/agent/src/edit_agent/evals/fixtures/extract_handle_command_output/possible-04.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-@@ -93,17 +93,20 @@
-     stdin.flush().await?;
-
-     let output = child.output().await.context("reading git blame output")?;
-+    handle_command_output(&output)?;
-+    Ok(String::from_utf8(output.stdout)?)
-+}
-
-+fn handle_command_output(output: &std::process::Output) -> Result<()> {
-     if !output.status.success() {
-         let stderr = String::from_utf8_lossy(&output.stderr);
-         let trimmed = stderr.trim();
-         if trimmed == GIT_BLAME_NO_COMMIT_ERROR || trimmed.contains(GIT_BLAME_NO_PATH) {
--            return Ok(String::new());
-+            return Ok(());
-         }
-         anyhow::bail!("git blame process failed: {stderr}");
-     }
--
--    Ok(String::from_utf8(output.stdout)?)
-+    Ok(())
- }
-
- #[derive(Serialize, Deserialize, Default, Debug, Clone, PartialEq, Eq)]
diff --git a/crates/agent/src/edit_agent/evals/fixtures/extract_handle_command_output/possible-05.diff b/crates/agent/src/edit_agent/evals/fixtures/extract_handle_command_output/possible-05.diff
deleted file mode 100644
index 8f4b745b9a..0000000000
--- a/crates/agent/src/edit_agent/evals/fixtures/extract_handle_command_output/possible-05.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-@@ -95,15 +95,19 @@
-     let output = child.output().await.context("reading git blame output")?;
-
-     if !output.status.success() {
--        let stderr = String::from_utf8_lossy(&output.stderr);
--        let trimmed = stderr.trim();
--        if trimmed == GIT_BLAME_NO_COMMIT_ERROR || trimmed.contains(GIT_BLAME_NO_PATH) {
--            return Ok(String::new());
--        }
--        anyhow::bail!("git blame process failed: {stderr}");
-+        return handle_command_output(&output);
-     }
-
-     Ok(String::from_utf8(output.stdout)?)
-+}
-+
-+fn handle_command_output(output: &std::process::Output) -> Result<String> {
-+    let stderr = String::from_utf8_lossy(&output.stderr);
-+    let trimmed = stderr.trim();
-+    if trimmed == GIT_BLAME_NO_COMMIT_ERROR || trimmed.contains(GIT_BLAME_NO_PATH) {
-+        return Ok(String::new());
-+    }
-+    anyhow::bail!("git blame process failed: {stderr}");
- }
-
- #[derive(Serialize, Deserialize, Default, Debug, Clone, PartialEq, Eq)]
diff --git a/crates/agent/src/edit_agent/evals/fixtures/extract_handle_command_output/possible-06.diff b/crates/agent/src/edit_agent/evals/fixtures/extract_handle_command_output/possible-06.diff
deleted file mode 100644
index 3514d9c8e2..0000000000
--- a/crates/agent/src/edit_agent/evals/fixtures/extract_handle_command_output/possible-06.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-@@ -93,7 +93,12 @@
-     stdin.flush().await?;
-
-     let output = child.output().await.context("reading git blame output")?;
-+    handle_command_output(&output)?;
-
-+    Ok(String::from_utf8(output.stdout)?)
-+}
-+
-+fn handle_command_output(output: &std::process::Output) -> Result<String> {
-     if !output.status.success() {
-         let stderr = String::from_utf8_lossy(&output.stderr);
-         let trimmed = stderr.trim();
-@@ -102,8 +107,7 @@
-         }
-         anyhow::bail!("git blame process failed: {stderr}");
-     }
--
--    Ok(String::from_utf8(output.stdout)?)
-+    Ok(String::from_utf8_lossy(&output.stdout).into_owned())
- }
-
- #[derive(Serialize, Deserialize, Default, Debug, Clone, PartialEq, Eq)]
diff --git a/crates/agent/src/edit_agent/evals/fixtures/extract_handle_command_output/possible-07.diff b/crates/agent/src/edit_agent/evals/fixtures/extract_handle_command_output/possible-07.diff
deleted file mode 100644
index 9691479e29..0000000000
--- a/crates/agent/src/edit_agent/evals/fixtures/extract_handle_command_output/possible-07.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-@@ -95,15 +95,19 @@
-     let output = child.output().await.context("reading git blame output")?;
-
-     if !output.status.success() {
--        let stderr = String::from_utf8_lossy(&output.stderr);
--        let trimmed = stderr.trim();
--        if trimmed == GIT_BLAME_NO_COMMIT_ERROR || trimmed.contains(GIT_BLAME_NO_PATH) {
--            return Ok(String::new());
--        }
--        anyhow::bail!("git blame process failed: {stderr}");
-+            return handle_command_output(output);
-     }
-
-     Ok(String::from_utf8(output.stdout)?)
-+}
-+
-+fn handle_command_output(output: std::process::Output) -> Result<String> {
-+    let stderr = String::from_utf8_lossy(&output.stderr);
-+    let trimmed = stderr.trim();
-+    if trimmed == GIT_BLAME_NO_COMMIT_ERROR || trimmed.contains(GIT_BLAME_NO_PATH) {
-+        return Ok(String::new());
-+    }
-+    anyhow::bail!("git blame process failed: {stderr}");
- }
-
- #[derive(Serialize, Deserialize, Default, Debug, Clone, PartialEq, Eq)]
diff --git a/crates/agent/src/edit_agent/evals/fixtures/extract_handle_command_output/possible-08.diff b/crates/agent/src/edit_agent/evals/fixtures/extract_handle_command_output/possible-08.diff
deleted file mode 100644
index f5da859005..0000000000
--- a/crates/agent/src/edit_agent/evals/fixtures/extract_handle_command_output/possible-08.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-@@ -95,15 +95,19 @@
-     let output = child.output().await.context("reading git blame output")?;
-
-     if !output.status.success() {
--        let stderr = String::from_utf8_lossy(&output.stderr);
--        let trimmed = stderr.trim();
--        if trimmed == GIT_BLAME_NO_COMMIT_ERROR || trimmed.contains(GIT_BLAME_NO_PATH) {
--            return Ok(String::new());
--        }
--        anyhow::bail!("git blame process failed: {stderr}");
-+        return handle_command_output(output);
-     }
-
-     Ok(String::from_utf8(output.stdout)?)
-+}
-+
-+fn handle_command_output(output: std::process::Output) -> Result<String> {
-+    let stderr = String::from_utf8_lossy(&output.stderr);
-+    let trimmed = stderr.trim();
-+    if trimmed == GIT_BLAME_NO_COMMIT_ERROR || trimmed.contains(GIT_BLAME_NO_PATH) {
-+        return Ok(String::new());
-+    }
-+    anyhow::bail!("git blame process failed: {stderr}")
- }
-
- #[derive(Serialize, Deserialize, Default, Debug, Clone, PartialEq, Eq)]
diff --git a/crates/agent/src/edit_agent/evals/fixtures/from_pixels_constructor/before.rs b/crates/agent/src/edit_agent/evals/fixtures/from_pixels_constructor/before.rs
deleted file mode 100644
index 12590fe6e9..0000000000
--- a/crates/agent/src/edit_agent/evals/fixtures/from_pixels_constructor/before.rs
+++ /dev/null
@@ -1,339 +0,0 @@
-// font-kit/src/canvas.rs
-//
-// Copyright © 2018 The Pathfinder Project Developers.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! An in-memory bitmap surface for glyph rasterization.
-
-use lazy_static::lazy_static;
-use pathfinder_geometry::rect::RectI;
-use pathfinder_geometry::vector::Vector2I;
-use std::cmp;
-use std::fmt;
-
-use crate::utils;
-
-lazy_static! {
-    static ref BITMAP_1BPP_TO_8BPP_LUT: [[u8; 8]; 256] = {
-        let mut lut = [[0; 8]; 256];
-        for byte in 0..0x100 {
-            let mut value = [0; 8];
-            for bit in 0..8 {
-                if (byte & (0x80 >> bit)) != 0 {
-                    value[bit] = 0xff;
-                }
-            }
-            lut[byte] = value
-        }
-        lut
-    };
-}
-
-/// An in-memory bitmap surface for glyph rasterization.
-pub struct Canvas {
-    /// The raw pixel data.
-    pub pixels: Vec<u8>,
-    /// The size of the buffer, in pixels.
-    pub size: Vector2I,
-    /// The number of *bytes* between successive rows.
-    pub stride: usize,
-    /// The image format of the canvas.
-    pub format: Format,
-}
-
-impl Canvas {
-    /// Creates a new blank canvas with the given pixel size and format.
-    ///
-    /// Stride is automatically calculated from width.
-    ///
-    /// The canvas is initialized with transparent black (all values 0).
-    #[inline]
-    pub fn new(size: Vector2I, format: Format) -> Canvas {
-        Canvas::with_stride(
-            size,
-            size.x() as usize * format.bytes_per_pixel() as usize,
-            format,
-        )
-    }
-
-    /// Creates a new blank canvas with the given pixel size, stride (number of bytes between
-    /// successive rows), and format.
-    ///
-    /// The canvas is initialized with transparent black (all values 0).
-    pub fn with_stride(size: Vector2I, stride: usize, format: Format) -> Canvas {
-        Canvas {
-            pixels: vec![0; stride * size.y() as usize],
-            size,
-            stride,
-            format,
-        }
-    }
-
-    #[allow(dead_code)]
-    pub(crate) fn blit_from_canvas(&mut self, src: &Canvas) {
-        self.blit_from(
-            Vector2I::default(),
-            &src.pixels,
-            src.size,
-            src.stride,
-            src.format,
-        )
-    }
-
-    /// Blits to a rectangle with origin at `dst_point` and size according to `src_size`.
-    /// If the target area overlaps the boundaries of the canvas, only the drawable region is blitted.
-    /// `dst_point` and `src_size` are specified in pixels. `src_stride` is specified in bytes.
-    /// `src_stride` must be equal or larger than the actual data length.
-    #[allow(dead_code)]
-    pub(crate) fn blit_from(
-        &mut self,
-        dst_point: Vector2I,
-        src_bytes: &[u8],
-        src_size: Vector2I,
-        src_stride: usize,
-        src_format: Format,
-    ) {
-        assert_eq!(
-            src_stride * src_size.y() as usize,
-            src_bytes.len(),
-            "Number of pixels in src_bytes does not match stride and size."
-        );
-        assert!(
-            src_stride >= src_size.x() as usize * src_format.bytes_per_pixel() as usize,
-            "src_stride must be >= than src_size.x()"
-        );
-
-        let dst_rect = RectI::new(dst_point, src_size);
-        let dst_rect = dst_rect.intersection(RectI::new(Vector2I::default(), self.size));
-        let dst_rect = match dst_rect {
-            Some(dst_rect) => dst_rect,
-            None => return,
-        };
-
-        match (self.format, src_format) {
-            (Format::A8, Format::A8)
-            | (Format::Rgb24, Format::Rgb24)
-            | (Format::Rgba32, Format::Rgba32) => {
-                self.blit_from_with::<BlitMemcpy>(dst_rect, src_bytes, src_stride, src_format)
-            }
-            (Format::A8, Format::Rgb24) => {
-                self.blit_from_with::<BlitRgb24ToA8>(dst_rect, src_bytes, src_stride, src_format)
-            }
-            (Format::Rgb24, Format::A8) => {
-                self.blit_from_with::<BlitA8ToRgb24>(dst_rect, src_bytes, src_stride, src_format)
-            }
-            (Format::Rgb24, Format::Rgba32) => self
-                .blit_from_with::<BlitRgba32ToRgb24>(dst_rect, src_bytes, src_stride, src_format),
-            (Format::Rgba32, Format::Rgb24) => self
-                .blit_from_with::<BlitRgb24ToRgba32>(dst_rect, src_bytes, src_stride, src_format),
-            (Format::Rgba32, Format::A8) | (Format::A8, Format::Rgba32) => unimplemented!(),
-        }
-    }
-
-    #[allow(dead_code)]
-    pub(crate) fn blit_from_bitmap_1bpp(
-        &mut self,
-        dst_point: Vector2I,
-        src_bytes: &[u8],
-        src_size: Vector2I,
-        src_stride: usize,
-    ) {
-        if self.format != Format::A8 {
-            unimplemented!()
-        }
-
-        let dst_rect = RectI::new(dst_point, src_size);
-        let dst_rect = dst_rect.intersection(RectI::new(Vector2I::default(), self.size));
-        let dst_rect = match dst_rect {
-            Some(dst_rect) => dst_rect,
-            None => return,
-        };
-
-        let size = dst_rect.size();
-
-        let dest_bytes_per_pixel = self.format.bytes_per_pixel() as usize;
-        let dest_row_stride = size.x() as usize * dest_bytes_per_pixel;
-        let src_row_stride = utils::div_round_up(size.x() as usize, 8);
-
-        for y in 0..size.y() {
-            let (dest_row_start, src_row_start) = (
-                (y + dst_rect.origin_y()) as usize * self.stride
-                    + dst_rect.origin_x() as usize * dest_bytes_per_pixel,
-                y as usize * src_stride,
-            );
-            let dest_row_end = dest_row_start + dest_row_stride;
-            let src_row_end = src_row_start + src_row_stride;
-            let dest_row_pixels = &mut self.pixels[dest_row_start..dest_row_end];
-            let src_row_pixels = &src_bytes[src_row_start..src_row_end];
-            for x in 0..src_row_stride {
-                let pattern = &BITMAP_1BPP_TO_8BPP_LUT[src_row_pixels[x] as usize];
-                let dest_start = x * 8;
-                let dest_end = cmp::min(dest_start + 8, dest_row_stride);
-                let src = &pattern[0..(dest_end - dest_start)];
-                dest_row_pixels[dest_start..dest_end].clone_from_slice(src);
-            }
-        }
-    }
-
-    /// Blits to area `rect` using the data given in the buffer `src_bytes`.
-    /// `src_stride` must be specified in bytes.
-    /// The dimensions of `rect` must be in pixels.
-    fn blit_from_with<B: Blit>(
-        &mut self,
-        rect: RectI,
-        src_bytes: &[u8],
-        src_stride: usize,
-        src_format: Format,
-    ) {
-        let src_bytes_per_pixel = src_format.bytes_per_pixel() as usize;
-        let dest_bytes_per_pixel = self.format.bytes_per_pixel() as usize;
-
-        for y in 0..rect.height() {
-            let (dest_row_start, src_row_start) = (
-                (y + rect.origin_y()) as usize * self.stride
-                    + rect.origin_x() as usize * dest_bytes_per_pixel,
-                y as usize * src_stride,
-            );
-            let dest_row_end = dest_row_start + rect.width() as usize * dest_bytes_per_pixel;
-            let src_row_end = src_row_start + rect.width() as usize * src_bytes_per_pixel;
-            let dest_row_pixels = &mut self.pixels[dest_row_start..dest_row_end];
-            let src_row_pixels = &src_bytes[src_row_start..src_row_end];
-            B::blit(dest_row_pixels, src_row_pixels)
-        }
-    }
-}
-
-impl fmt::Debug for Canvas {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_struct("Canvas")
-            .field("pixels", &self.pixels.len()) // Do not dump a vector content.
-            .field("size", &self.size)
-            .field("stride", &self.stride)
-            .field("format", &self.format)
-            .finish()
-    }
-}
-
-/// The image format for the canvas.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub enum Format {
-    /// Premultiplied R8G8B8A8, little-endian.
-    Rgba32,
-    /// R8G8B8, little-endian.
-    Rgb24,
-    /// A8.
-    A8,
-}
-
-impl Format {
-    /// Returns the number of bits per pixel that this image format corresponds to.
-    #[inline]
-    pub fn bits_per_pixel(self) -> u8 {
-        match self {
-            Format::Rgba32 => 32,
-            Format::Rgb24 => 24,
-            Format::A8 => 8,
-        }
-    }
-
-    /// Returns the number of color channels per pixel that this image format corresponds to.
-    #[inline]
-    pub fn components_per_pixel(self) -> u8 {
-        match self {
-            Format::Rgba32 => 4,
-            Format::Rgb24 => 3,
-            Format::A8 => 1,
-        }
-    }
-
-    /// Returns the number of bits per color channel that this image format contains.
-    #[inline]
-    pub fn bits_per_component(self) -> u8 {
-        self.bits_per_pixel() / self.components_per_pixel()
-    }
-
-    /// Returns the number of bytes per pixel that this image format corresponds to.
-    #[inline]
-    pub fn bytes_per_pixel(self) -> u8 {
-        self.bits_per_pixel() / 8
-    }
-}
-
-/// The antialiasing strategy that should be used when rasterizing glyphs.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub enum RasterizationOptions {
-    /// "Black-and-white" rendering. Each pixel is either entirely on or off.
-    Bilevel,
-    /// Grayscale antialiasing. Only one channel is used.
-    GrayscaleAa,
-    /// Subpixel RGB antialiasing, for LCD screens.
-    SubpixelAa,
-}
-
-trait Blit {
-    fn blit(dest: &mut [u8], src: &[u8]);
-}
-
-struct BlitMemcpy;
-
-impl Blit for BlitMemcpy {
-    #[inline]
-    fn blit(dest: &mut [u8], src: &[u8]) {
-        dest.clone_from_slice(src)
-    }
-}
-
-struct BlitRgb24ToA8;
-
-impl Blit for BlitRgb24ToA8 {
-    #[inline]
-    fn blit(dest: &mut [u8], src: &[u8]) {
-        // TODO(pcwalton): SIMD.
-        for (dest, src) in dest.iter_mut().zip(src.chunks(3)) {
-            *dest = src[1]
-        }
-    }
-}
-
-struct BlitA8ToRgb24;
-
-impl Blit for BlitA8ToRgb24 {
-    #[inline]
-    fn blit(dest: &mut [u8], src: &[u8]) {
-        for (dest, src) in dest.chunks_mut(3).zip(src.iter()) {
-            dest[0] = *src;
-            dest[1] = *src;
-            dest[2] = *src;
-        }
-    }
-}
-
-struct BlitRgba32ToRgb24;
-
-impl Blit for BlitRgba32ToRgb24 {
-    #[inline]
-    fn blit(dest: &mut [u8], src: &[u8]) {
-        // TODO(pcwalton): SIMD.
-        for (dest, src) in dest.chunks_mut(3).zip(src.chunks(4)) {
-            dest.copy_from_slice(&src[0..3])
-        }
-    }
-}
-
-struct BlitRgb24ToRgba32;
-
-impl Blit for BlitRgb24ToRgba32 {
-    fn blit(dest: &mut [u8], src: &[u8]) {
-        for (dest, src) in dest.chunks_mut(4).zip(src.chunks(3)) {
-            dest[0] = src[0];
-            dest[1] = src[1];
-            dest[2] = src[2];
-            dest[3] = 255;
-        }
-    }
-}
diff --git a/crates/agent/src/edit_agent/evals/fixtures/translate_doc_comments/before.rs b/crates/agent/src/edit_agent/evals/fixtures/translate_doc_comments/before.rs
deleted file mode 100644
index 12590fe6e9..0000000000
--- a/crates/agent/src/edit_agent/evals/fixtures/translate_doc_comments/before.rs
+++ /dev/null
@@ -1,339 +0,0 @@
-// font-kit/src/canvas.rs
-//
-// Copyright © 2018 The Pathfinder Project Developers.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! An in-memory bitmap surface for glyph rasterization.
-
-use lazy_static::lazy_static;
-use pathfinder_geometry::rect::RectI;
-use pathfinder_geometry::vector::Vector2I;
-use std::cmp;
-use std::fmt;
-
-use crate::utils;
-
-lazy_static! {
-    static ref BITMAP_1BPP_TO_8BPP_LUT: [[u8; 8]; 256] = {
-        let mut lut = [[0; 8]; 256];
-        for byte in 0..0x100 {
-            let mut value = [0; 8];
-            for bit in 0..8 {
-                if (byte & (0x80 >> bit)) != 0 {
-                    value[bit] = 0xff;
-                }
-            }
-            lut[byte] = value
-        }
-        lut
-    };
-}
-
-/// An in-memory bitmap surface for glyph rasterization.
-pub struct Canvas {
-    /// The raw pixel data.
-    pub pixels: Vec<u8>,
-    /// The size of the buffer, in pixels.
-    pub size: Vector2I,
-    /// The number of *bytes* between successive rows.
-    pub stride: usize,
-    /// The image format of the canvas.
-    pub format: Format,
-}
-
-impl Canvas {
-    /// Creates a new blank canvas with the given pixel size and format.
-    ///
-    /// Stride is automatically calculated from width.
-    ///
-    /// The canvas is initialized with transparent black (all values 0).
-    #[inline]
-    pub fn new(size: Vector2I, format: Format) -> Canvas {
-        Canvas::with_stride(
-            size,
-            size.x() as usize * format.bytes_per_pixel() as usize,
-            format,
-        )
-    }
-
-    /// Creates a new blank canvas with the given pixel size, stride (number of bytes between
-    /// successive rows), and format.
-    ///
-    /// The canvas is initialized with transparent black (all values 0).
-    pub fn with_stride(size: Vector2I, stride: usize, format: Format) -> Canvas {
-        Canvas {
-            pixels: vec![0; stride * size.y() as usize],
-            size,
-            stride,
-            format,
-        }
-    }
-
-    #[allow(dead_code)]
-    pub(crate) fn blit_from_canvas(&mut self, src: &Canvas) {
-        self.blit_from(
-            Vector2I::default(),
-            &src.pixels,
-            src.size,
-            src.stride,
-            src.format,
-        )
-    }
-
-    /// Blits to a rectangle with origin at `dst_point` and size according to `src_size`.
-    /// If the target area overlaps the boundaries of the canvas, only the drawable region is blitted.
-    /// `dst_point` and `src_size` are specified in pixels. `src_stride` is specified in bytes.
-    /// `src_stride` must be equal or larger than the actual data length.
-    #[allow(dead_code)]
-    pub(crate) fn blit_from(
-        &mut self,
-        dst_point: Vector2I,
-        src_bytes: &[u8],
-        src_size: Vector2I,
-        src_stride: usize,
-        src_format: Format,
-    ) {
-        assert_eq!(
-            src_stride * src_size.y() as usize,
-            src_bytes.len(),
-            "Number of pixels in src_bytes does not match stride and size."
-        );
-        assert!(
-            src_stride >= src_size.x() as usize * src_format.bytes_per_pixel() as usize,
-            "src_stride must be >= than src_size.x()"
-        );
-
-        let dst_rect = RectI::new(dst_point, src_size);
-        let dst_rect = dst_rect.intersection(RectI::new(Vector2I::default(), self.size));
-        let dst_rect = match dst_rect {
-            Some(dst_rect) => dst_rect,
-            None => return,
-        };
-
-        match (self.format, src_format) {
-            (Format::A8, Format::A8)
-            | (Format::Rgb24, Format::Rgb24)
-            | (Format::Rgba32, Format::Rgba32) => {
-                self.blit_from_with::<BlitMemcpy>(dst_rect, src_bytes, src_stride, src_format)
-            }
-            (Format::A8, Format::Rgb24) => {
-                self.blit_from_with::<BlitRgb24ToA8>(dst_rect, src_bytes, src_stride, src_format)
-            }
-            (Format::Rgb24, Format::A8) => {
-                self.blit_from_with::<BlitA8ToRgb24>(dst_rect, src_bytes, src_stride, src_format)
-            }
-            (Format::Rgb24, Format::Rgba32) => self
-                .blit_from_with::<BlitRgba32ToRgb24>(dst_rect, src_bytes, src_stride, src_format),
-            (Format::Rgba32, Format::Rgb24) => self
-                .blit_from_with::<BlitRgb24ToRgba32>(dst_rect, src_bytes, src_stride, src_format),
-            (Format::Rgba32, Format::A8) | (Format::A8, Format::Rgba32) => unimplemented!(),
-        }
-    }
-
-    #[allow(dead_code)]
-    pub(crate) fn blit_from_bitmap_1bpp(
-        &mut self,
-        dst_point: Vector2I,
-        src_bytes: &[u8],
-        src_size: Vector2I,
-        src_stride: usize,
-    ) {
-        if self.format != Format::A8 {
-            unimplemented!()
-        }
-
-        let dst_rect = RectI::new(dst_point, src_size);
-        let dst_rect = dst_rect.intersection(RectI::new(Vector2I::default(), self.size));
-        let dst_rect = match dst_rect {
-            Some(dst_rect) => dst_rect,
-            None => return,
-        };
-
-        let size = dst_rect.size();
-
-        let dest_bytes_per_pixel = self.format.bytes_per_pixel() as usize;
-        let dest_row_stride = size.x() as usize * dest_bytes_per_pixel;
-        let src_row_stride = utils::div_round_up(size.x() as usize, 8);
-
-        for y in 0..size.y() {
-            let (dest_row_start, src_row_start) = (
-                (y + dst_rect.origin_y()) as usize * self.stride
-                    + dst_rect.origin_x() as usize * dest_bytes_per_pixel,
-                y as usize * src_stride,
-            );
-            let dest_row_end = dest_row_start + dest_row_stride;
-            let src_row_end = src_row_start + src_row_stride;
-            let dest_row_pixels = &mut self.pixels[dest_row_start..dest_row_end];
-            let src_row_pixels = &src_bytes[src_row_start..src_row_end];
-            for x in 0..src_row_stride {
-                let pattern = &BITMAP_1BPP_TO_8BPP_LUT[src_row_pixels[x] as usize];
-                let dest_start = x * 8;
-                let dest_end = cmp::min(dest_start + 8, dest_row_stride);
-                let src = &pattern[0..(dest_end - dest_start)];
-                dest_row_pixels[dest_start..dest_end].clone_from_slice(src);
-            }
-        }
-    }
-
-    /// Blits to area `rect` using the data given in the buffer `src_bytes`.
-    /// `src_stride` must be specified in bytes.
-    /// The dimensions of `rect` must be in pixels.
-    fn blit_from_with<B: Blit>(
-        &mut self,
-        rect: RectI,
-        src_bytes: &[u8],
-        src_stride: usize,
-        src_format: Format,
-    ) {
-        let src_bytes_per_pixel = src_format.bytes_per_pixel() as usize;
-        let dest_bytes_per_pixel = self.format.bytes_per_pixel() as usize;
-
-        for y in 0..rect.height() {
-            let (dest_row_start, src_row_start) = (
-                (y + rect.origin_y()) as usize * self.stride
-                    + rect.origin_x() as usize * dest_bytes_per_pixel,
-                y as usize * src_stride,
-            );
-            let dest_row_end = dest_row_start + rect.width() as usize * dest_bytes_per_pixel;
-            let src_row_end = src_row_start + rect.width() as usize * src_bytes_per_pixel;
-            let dest_row_pixels = &mut self.pixels[dest_row_start..dest_row_end];
-            let src_row_pixels = &src_bytes[src_row_start..src_row_end];
-            B::blit(dest_row_pixels, src_row_pixels)
-        }
-    }
-}
-
-impl fmt::Debug for Canvas {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_struct("Canvas")
-            .field("pixels", &self.pixels.len()) // Do not dump a vector content.
-            .field("size", &self.size)
-            .field("stride", &self.stride)
-            .field("format", &self.format)
-            .finish()
-    }
-}
-
-/// The image format for the canvas.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub enum Format {
-    /// Premultiplied R8G8B8A8, little-endian.
-    Rgba32,
-    /// R8G8B8, little-endian.
-    Rgb24,
-    /// A8.
-    A8,
-}
-
-impl Format {
-    /// Returns the number of bits per pixel that this image format corresponds to.
-    #[inline]
-    pub fn bits_per_pixel(self) -> u8 {
-        match self {
-            Format::Rgba32 => 32,
-            Format::Rgb24 => 24,
-            Format::A8 => 8,
-        }
-    }
-
-    /// Returns the number of color channels per pixel that this image format corresponds to.
-    #[inline]
-    pub fn components_per_pixel(self) -> u8 {
-        match self {
-            Format::Rgba32 => 4,
-            Format::Rgb24 => 3,
-            Format::A8 => 1,
-        }
-    }
-
-    /// Returns the number of bits per color channel that this image format contains.
-    #[inline]
-    pub fn bits_per_component(self) -> u8 {
-        self.bits_per_pixel() / self.components_per_pixel()
-    }
-
-    /// Returns the number of bytes per pixel that this image format corresponds to.
-    #[inline]
-    pub fn bytes_per_pixel(self) -> u8 {
-        self.bits_per_pixel() / 8
-    }
-}
-
-/// The antialiasing strategy that should be used when rasterizing glyphs.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub enum RasterizationOptions {
-    /// "Black-and-white" rendering. Each pixel is either entirely on or off.
-    Bilevel,
-    /// Grayscale antialiasing. Only one channel is used.
-    GrayscaleAa,
-    /// Subpixel RGB antialiasing, for LCD screens.
-    SubpixelAa,
-}
-
-trait Blit {
-    fn blit(dest: &mut [u8], src: &[u8]);
-}
-
-struct BlitMemcpy;
-
-impl Blit for BlitMemcpy {
-    #[inline]
-    fn blit(dest: &mut [u8], src: &[u8]) {
-        dest.clone_from_slice(src)
-    }
-}
-
-struct BlitRgb24ToA8;
-
-impl Blit for BlitRgb24ToA8 {
-    #[inline]
-    fn blit(dest: &mut [u8], src: &[u8]) {
-        // TODO(pcwalton): SIMD.
-        for (dest, src) in dest.iter_mut().zip(src.chunks(3)) {
-            *dest = src[1]
-        }
-    }
-}
-
-struct BlitA8ToRgb24;
-
-impl Blit for BlitA8ToRgb24 {
-    #[inline]
-    fn blit(dest: &mut [u8], src: &[u8]) {
-        for (dest, src) in dest.chunks_mut(3).zip(src.iter()) {
-            dest[0] = *src;
-            dest[1] = *src;
-            dest[2] = *src;
-        }
-    }
-}
-
-struct BlitRgba32ToRgb24;
-
-impl Blit for BlitRgba32ToRgb24 {
-    #[inline]
-    fn blit(dest: &mut [u8], src: &[u8]) {
-        // TODO(pcwalton): SIMD.
-        for (dest, src) in dest.chunks_mut(3).zip(src.chunks(4)) {
-            dest.copy_from_slice(&src[0..3])
-        }
-    }
-}
-
-struct BlitRgb24ToRgba32;
-
-impl Blit for BlitRgb24ToRgba32 {
-    fn blit(dest: &mut [u8], src: &[u8]) {
-        for (dest, src) in dest.chunks_mut(4).zip(src.chunks(3)) {
-            dest[0] = src[0];
-            dest[1] = src[1];
-            dest[2] = src[2];
-            dest[3] = 255;
-        }
-    }
-}
diff --git a/crates/agent/src/edit_agent/evals/fixtures/use_wasi_sdk_in_compile_parser_to_wasm/before.rs b/crates/agent/src/edit_agent/evals/fixtures/use_wasi_sdk_in_compile_parser_to_wasm/before.rs
deleted file mode 100644
index cfa28fe1ad..0000000000
--- a/crates/agent/src/edit_agent/evals/fixtures/use_wasi_sdk_in_compile_parser_to_wasm/before.rs
+++ /dev/null
@@ -1,1629 +0,0 @@
-#![doc = include_str!("../README.md")]
-#![cfg_attr(docsrs, feature(doc_cfg))]
-
-#[cfg(any(feature = "tree-sitter-highlight", feature = "tree-sitter-tags"))]
-use std::ops::Range;
-#[cfg(feature = "tree-sitter-highlight")]
-use std::sync::Mutex;
-use std::{
-    collections::HashMap,
-    env,
-    ffi::{OsStr, OsString},
-    fs,
-    io::{BufRead, BufReader},
-    mem,
-    path::{Path, PathBuf},
-    process::Command,
-    sync::LazyLock,
-    time::SystemTime,
-};
-
-#[cfg(any(feature = "tree-sitter-highlight", feature = "tree-sitter-tags"))]
-use anyhow::Error;
-use anyhow::{Context as _, Result, anyhow};
-use etcetera::BaseStrategy as _;
-use fs4::fs_std::FileExt;
-use indoc::indoc;
-use libloading::{Library, Symbol};
-use once_cell::unsync::OnceCell;
-use path_slash::PathBufExt as _;
-use regex::{Regex, RegexBuilder};
-use semver::Version;
-use serde::{Deserialize, Deserializer, Serialize};
-use tree_sitter::Language;
-#[cfg(any(feature = "tree-sitter-highlight", feature = "tree-sitter-tags"))]
-use tree_sitter::QueryError;
-#[cfg(feature = "tree-sitter-highlight")]
-use tree_sitter::QueryErrorKind;
-#[cfg(feature = "tree-sitter-highlight")]
-use tree_sitter_highlight::HighlightConfiguration;
-#[cfg(feature = "tree-sitter-tags")]
-use tree_sitter_tags::{Error as TagsError, TagsConfiguration};
-use url::Url;
-
-static GRAMMAR_NAME_REGEX: LazyLock<Regex> =
-    LazyLock::new(|| Regex::new(r#""name":\s*"(.*?)""#).unwrap());
-
-pub const EMSCRIPTEN_TAG: &str = concat!("docker.io/emscripten/emsdk:", env!("EMSCRIPTEN_VERSION"));
-
-#[derive(Default, Deserialize, Serialize)]
-pub struct Config {
-    #[serde(default)]
-    #[serde(
-        rename = "parser-directories",
-        deserialize_with = "deserialize_parser_directories"
-    )]
-    pub parser_directories: Vec<PathBuf>,
-}
-
-#[derive(Serialize, Deserialize, Clone, Default)]
-#[serde(untagged)]
-pub enum PathsJSON {
-    #[default]
-    Empty,
-    Single(PathBuf),
-    Multiple(Vec<PathBuf>),
-}
-
-impl PathsJSON {
-    fn into_vec(self) -> Option<Vec<PathBuf>> {
-        match self {
-            Self::Empty => None,
-            Self::Single(s) => Some(vec![s]),
-            Self::Multiple(s) => Some(s),
-        }
-    }
-
-    const fn is_empty(&self) -> bool {
-        matches!(self, Self::Empty)
-    }
-}
-
-#[derive(Serialize, Deserialize, Clone)]
-#[serde(untagged)]
-pub enum PackageJSONAuthor {
-    String(String),
-    Object {
-        name: String,
-        email: Option<String>,
-        url: Option<String>,
-    },
-}
-
-#[derive(Serialize, Deserialize, Clone)]
-#[serde(untagged)]
-pub enum PackageJSONRepository {
-    String(String),
-    Object { url: String },
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct PackageJSON {
-    pub name: String,
-    pub version: Version,
-    pub description: Option<String>,
-    pub author: Option<PackageJSONAuthor>,
-    pub maintainers: Option<Vec<PackageJSONAuthor>>,
-    pub license: Option<String>,
-    pub repository: Option<PackageJSONRepository>,
-    #[serde(default)]
-    #[serde(rename = "tree-sitter", skip_serializing_if = "Option::is_none")]
-    pub tree_sitter: Option<Vec<LanguageConfigurationJSON>>,
-}
-
-fn default_path() -> PathBuf {
-    PathBuf::from(".")
-}
-
-#[derive(Serialize, Deserialize, Clone)]
-#[serde(rename_all = "kebab-case")]
-pub struct LanguageConfigurationJSON {
-    #[serde(default = "default_path")]
-    pub path: PathBuf,
-    pub scope: Option<String>,
-    pub file_types: Option<Vec<String>>,
-    pub content_regex: Option<String>,
-    pub first_line_regex: Option<String>,
-    pub injection_regex: Option<String>,
-    #[serde(default, skip_serializing_if = "PathsJSON::is_empty")]
-    pub highlights: PathsJSON,
-    #[serde(default, skip_serializing_if = "PathsJSON::is_empty")]
-    pub injections: PathsJSON,
-    #[serde(default, skip_serializing_if = "PathsJSON::is_empty")]
-    pub locals: PathsJSON,
-    #[serde(default, skip_serializing_if = "PathsJSON::is_empty")]
-    pub tags: PathsJSON,
-    #[serde(default, skip_serializing_if = "PathsJSON::is_empty")]
-    pub external_files: PathsJSON,
-}
-
-#[derive(Serialize, Deserialize)]
-#[serde(rename_all = "kebab-case")]
-pub struct TreeSitterJSON {
-    #[serde(rename = "$schema")]
-    pub schema: Option<String>,
-    pub grammars: Vec<Grammar>,
-    pub metadata: Metadata,
-    #[serde(default)]
-    pub bindings: Bindings,
-}
-
-impl TreeSitterJSON {
-    pub fn from_file(path: &Path) -> Result<Self> {
-        Ok(serde_json::from_str(&fs::read_to_string(
-            path.join("tree-sitter.json"),
-        )?)?)
-    }
-
-    #[must_use]
-    pub fn has_multiple_language_configs(&self) -> bool {
-        self.grammars.len() > 1
-    }
-}
-
-#[derive(Serialize, Deserialize)]
-#[serde(rename_all = "kebab-case")]
-pub struct Grammar {
-    pub name: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub camelcase: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub title: Option<String>,
-    pub scope: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub path: Option<PathBuf>,
-    #[serde(default, skip_serializing_if = "PathsJSON::is_empty")]
-    pub external_files: PathsJSON,
-    pub file_types: Option<Vec<String>>,
-    #[serde(default, skip_serializing_if = "PathsJSON::is_empty")]
-    pub highlights: PathsJSON,
-    #[serde(default, skip_serializing_if = "PathsJSON::is_empty")]
-    pub injections: PathsJSON,
-    #[serde(default, skip_serializing_if = "PathsJSON::is_empty")]
-    pub locals: PathsJSON,
-    #[serde(default, skip_serializing_if = "PathsJSON::is_empty")]
-    pub tags: PathsJSON,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub injection_regex: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub first_line_regex: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub content_regex: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub class_name: Option<String>,
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct Metadata {
-    pub version: Version,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub license: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub description: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub authors: Option<Vec<Author>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub links: Option<Links>,
-    #[serde(skip)]
-    pub namespace: Option<String>,
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct Author {
-    pub name: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub email: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub url: Option<String>,
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct Links {
-    pub repository: Url,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub funding: Option<Url>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub homepage: Option<String>,
-}
-
-#[derive(Serialize, Deserialize)]
-#[serde(default)]
-pub struct Bindings {
-    pub c: bool,
-    pub go: bool,
-    #[serde(skip)]
-    pub java: bool,
-    #[serde(skip)]
-    pub kotlin: bool,
-    pub node: bool,
-    pub python: bool,
-    pub rust: bool,
-    pub swift: bool,
-    pub zig: bool,
-}
-
-impl Default for Bindings {
-    fn default() -> Self {
-        Self {
-            c: true,
-            go: true,
-            java: false,
-            kotlin: false,
-            node: true,
-            python: true,
-            rust: true,
-            swift: true,
-            zig: false,
-        }
-    }
-}
-
-// Replace `~` or `$HOME` with home path string.
-// (While paths like "~/.tree-sitter/config.json" can be deserialized,
-// they're not valid path for I/O modules.)
-fn deserialize_parser_directories<'de, D>(deserializer: D) -> Result<Vec<PathBuf>, D::Error>
-where
-    D: Deserializer<'de>,
-{
-    let paths = Vec::<PathBuf>::deserialize(deserializer)?;
-    let Ok(home) = etcetera::home_dir() else {
-        return Ok(paths);
-    };
-    let standardized = paths
-        .into_iter()
-        .map(|path| standardize_path(path, &home))
-        .collect();
-    Ok(standardized)
-}
-
-fn standardize_path(path: PathBuf, home: &Path) -> PathBuf {
-    if let Ok(p) = path.strip_prefix("~") {
-        return home.join(p);
-    }
-    if let Ok(p) = path.strip_prefix("$HOME") {
-        return home.join(p);
-    }
-    path
-}
-
-impl Config {
-    #[must_use]
-    pub fn initial() -> Self {
-        let home_dir = etcetera::home_dir().expect("Cannot determine home directory");
-        Self {
-            parser_directories: vec![
-                home_dir.join("github"),
-                home_dir.join("src"),
-                home_dir.join("source"),
-                home_dir.join("projects"),
-                home_dir.join("dev"),
-                home_dir.join("git"),
-            ],
-        }
-    }
-}
-
-const BUILD_TARGET: &str = env!("BUILD_TARGET");
-const BUILD_HOST: &str = env!("BUILD_HOST");
-
-pub struct LanguageConfiguration<'a> {
-    pub scope: Option<String>,
-    pub content_regex: Option<Regex>,
-    pub first_line_regex: Option<Regex>,
-    pub injection_regex: Option<Regex>,
-    pub file_types: Vec<String>,
-    pub root_path: PathBuf,
-    pub highlights_filenames: Option<Vec<PathBuf>>,
-    pub injections_filenames: Option<Vec<PathBuf>>,
-    pub locals_filenames: Option<Vec<PathBuf>>,
-    pub tags_filenames: Option<Vec<PathBuf>>,
-    pub language_name: String,
-    language_id: usize,
-    #[cfg(feature = "tree-sitter-highlight")]
-    highlight_config: OnceCell<Option<HighlightConfiguration>>,
-    #[cfg(feature = "tree-sitter-tags")]
-    tags_config: OnceCell<Option<TagsConfiguration>>,
-    #[cfg(feature = "tree-sitter-highlight")]
-    highlight_names: &'a Mutex<Vec<String>>,
-    #[cfg(feature = "tree-sitter-highlight")]
-    use_all_highlight_names: bool,
-}
-
-pub struct Loader {
-    pub parser_lib_path: PathBuf,
-    languages_by_id: Vec<(PathBuf, OnceCell<Language>, Option<Vec<PathBuf>>)>,
-    language_configurations: Vec<LanguageConfiguration<'static>>,
-    language_configuration_ids_by_file_type: HashMap<String, Vec<usize>>,
-    language_configuration_in_current_path: Option<usize>,
-    language_configuration_ids_by_first_line_regex: HashMap<String, Vec<usize>>,
-    #[cfg(feature = "tree-sitter-highlight")]
-    highlight_names: Box<Mutex<Vec<String>>>,
-    #[cfg(feature = "tree-sitter-highlight")]
-    use_all_highlight_names: bool,
-    debug_build: bool,
-    sanitize_build: bool,
-    force_rebuild: bool,
-
-    #[cfg(feature = "wasm")]
-    wasm_store: Mutex<Option<tree_sitter::WasmStore>>,
-}
-
-pub struct CompileConfig<'a> {
-    pub src_path: &'a Path,
-    pub header_paths: Vec<&'a Path>,
-    pub parser_path: PathBuf,
-    pub scanner_path: Option<PathBuf>,
-    pub external_files: Option<&'a [PathBuf]>,
-    pub output_path: Option<PathBuf>,
-    pub flags: &'a [&'a str],
-    pub sanitize: bool,
-    pub name: String,
-}
-
-impl<'a> CompileConfig<'a> {
-    #[must_use]
-    pub fn new(
-        src_path: &'a Path,
-        externals: Option<&'a [PathBuf]>,
-        output_path: Option<PathBuf>,
-    ) -> Self {
-        Self {
-            src_path,
-            header_paths: vec![src_path],
-            parser_path: src_path.join("parser.c"),
-            scanner_path: None,
-            external_files: externals,
-            output_path,
-            flags: &[],
-            sanitize: false,
-            name: String::new(),
-        }
-    }
-}
-
-unsafe impl Sync for Loader {}
-
-impl Loader {
-    pub fn new() -> Result<Self> {
-        let parser_lib_path = if let Ok(path) = env::var("TREE_SITTER_LIBDIR") {
-            PathBuf::from(path)
-        } else {
-            if cfg!(target_os = "macos") {
-                let legacy_apple_path = etcetera::base_strategy::Apple::new()?
-                    .cache_dir() // `$HOME/Library/Caches/`
-                    .join("tree-sitter");
-                if legacy_apple_path.exists() && legacy_apple_path.is_dir() {
-                    std::fs::remove_dir_all(legacy_apple_path)?;
-                }
-            }
-
-            etcetera::choose_base_strategy()?
-                .cache_dir()
-                .join("tree-sitter")
-                .join("lib")
-        };
-        Ok(Self::with_parser_lib_path(parser_lib_path))
-    }
-
-    #[must_use]
-    pub fn with_parser_lib_path(parser_lib_path: PathBuf) -> Self {
-        Self {
-            parser_lib_path,
-            languages_by_id: Vec::new(),
-            language_configurations: Vec::new(),
-            language_configuration_ids_by_file_type: HashMap::new(),
-            language_configuration_in_current_path: None,
-            language_configuration_ids_by_first_line_regex: HashMap::new(),
-            #[cfg(feature = "tree-sitter-highlight")]
-            highlight_names: Box::new(Mutex::new(Vec::new())),
-            #[cfg(feature = "tree-sitter-highlight")]
-            use_all_highlight_names: true,
-            debug_build: false,
-            sanitize_build: false,
-            force_rebuild: false,
-
-            #[cfg(feature = "wasm")]
-            wasm_store: Mutex::default(),
-        }
-    }
-
-    #[cfg(feature = "tree-sitter-highlight")]
-    #[cfg_attr(docsrs, doc(cfg(feature = "tree-sitter-highlight")))]
-    pub fn configure_highlights(&mut self, names: &[String]) {
-        self.use_all_highlight_names = false;
-        let mut highlights = self.highlight_names.lock().unwrap();
-        highlights.clear();
-        highlights.extend(names.iter().cloned());
-    }
-
-    #[must_use]
-    #[cfg(feature = "tree-sitter-highlight")]
-    #[cfg_attr(docsrs, doc(cfg(feature = "tree-sitter-highlight")))]
-    pub fn highlight_names(&self) -> Vec<String> {
-        self.highlight_names.lock().unwrap().clone()
-    }
-
-    pub fn find_all_languages(&mut self, config: &Config) -> Result<()> {
-        if config.parser_directories.is_empty() {
-            eprintln!("Warning: You have not configured any parser directories!");
-            eprintln!("Please run `tree-sitter init-config` and edit the resulting");
-            eprintln!("configuration file to indicate where we should look for");
-            eprintln!("language grammars.\n");
-        }
-        for parser_container_dir in &config.parser_directories {
-            if let Ok(entries) = fs::read_dir(parser_container_dir) {
-                for entry in entries {
-                    let entry = entry?;
-                    if let Some(parser_dir_name) = entry.file_name().to_str() {
-                        if parser_dir_name.starts_with("tree-sitter-") {
-                            self.find_language_configurations_at_path(
-                                &parser_container_dir.join(parser_dir_name),
-                                false,
-                            )
-                            .ok();
-                        }
-                    }
-                }
-            }
-        }
-        Ok(())
-    }
-
-    pub fn languages_at_path(&mut self, path: &Path) -> Result<Vec<(Language, String)>> {
-        if let Ok(configurations) = self.find_language_configurations_at_path(path, true) {
-            let mut language_ids = configurations
-                .iter()
-                .map(|c| (c.language_id, c.language_name.clone()))
-                .collect::<Vec<_>>();
-            language_ids.sort_unstable();
-            language_ids.dedup();
-            language_ids
-                .into_iter()
-                .map(|(id, name)| Ok((self.language_for_id(id)?, name)))
-                .collect::<Result<Vec<_>>>()
-        } else {
-            Ok(Vec::new())
-        }
-    }
-
-    #[must_use]
-    pub fn get_all_language_configurations(&self) -> Vec<(&LanguageConfiguration, &Path)> {
-        self.language_configurations
-            .iter()
-            .map(|c| (c, self.languages_by_id[c.language_id].0.as_ref()))
-            .collect()
-    }
-
-    pub fn language_configuration_for_scope(
-        &self,
-        scope: &str,
-    ) -> Result<Option<(Language, &LanguageConfiguration)>> {
-        for configuration in &self.language_configurations {
-            if configuration.scope.as_ref().is_some_and(|s| s == scope) {
-                let language = self.language_for_id(configuration.language_id)?;
-                return Ok(Some((language, configuration)));
-            }
-        }
-        Ok(None)
-    }
-
-    pub fn language_configuration_for_first_line_regex(
-        &self,
-        path: &Path,
-    ) -> Result<Option<(Language, &LanguageConfiguration)>> {
-        self.language_configuration_ids_by_first_line_regex
-            .iter()
-            .try_fold(None, |_, (regex, ids)| {
-                if let Some(regex) = Self::regex(Some(regex)) {
-                    let file = fs::File::open(path)?;
-                    let reader = BufReader::new(file);
-                    let first_line = reader.lines().next().transpose()?;
-                    if let Some(first_line) = first_line {
-                        if regex.is_match(&first_line) && !ids.is_empty() {
-                            let configuration = &self.language_configurations[ids[0]];
-                            let language = self.language_for_id(configuration.language_id)?;
-                            return Ok(Some((language, configuration)));
-                        }
-                    }
-                }
-
-                Ok(None)
-            })
-    }
-
-    pub fn language_configuration_for_file_name(
-        &self,
-        path: &Path,
-    ) -> Result<Option<(Language, &LanguageConfiguration)>> {
-        // Find all the language configurations that match this file name
-        // or a suffix of the file name.
-        let configuration_ids = path
-            .file_name()
-            .and_then(|n| n.to_str())
-            .and_then(|file_name| self.language_configuration_ids_by_file_type.get(file_name))
-            .or_else(|| {
-                let mut path = path.to_owned();
-                let mut extensions = Vec::with_capacity(2);
-                while let Some(extension) = path.extension() {
-                    extensions.push(extension.to_str()?.to_string());
-                    path = PathBuf::from(path.file_stem()?.to_os_string());
-                }
-                extensions.reverse();
-                self.language_configuration_ids_by_file_type
-                    .get(&extensions.join("."))
-            });
-
-        if let Some(configuration_ids) = configuration_ids {
-            if !configuration_ids.is_empty() {
-                let configuration = if configuration_ids.len() == 1 {
-                    &self.language_configurations[configuration_ids[0]]
-                }
-                // If multiple language configurations match, then determine which
-                // one to use by applying the configurations' content regexes.
-                else {
-                    let file_contents = fs::read(path)
-                        .with_context(|| format!("Failed to read path {}", path.display()))?;
-                    let file_contents = String::from_utf8_lossy(&file_contents);
-                    let mut best_score = -2isize;
-                    let mut best_configuration_id = None;
-                    for configuration_id in configuration_ids {
-                        let config = &self.language_configurations[*configuration_id];
-
-                        // If the language configuration has a content regex, assign
-                        // a score based on the length of the first match.
-                        let score;
-                        if let Some(content_regex) = &config.content_regex {
-                            if let Some(mat) = content_regex.find(&file_contents) {
-                                score = (mat.end() - mat.start()) as isize;
-                            }
-                            // If the content regex does not match, then *penalize* this
-                            // language configuration, so that language configurations
-                            // without content regexes are preferred over those with
-                            // non-matching content regexes.
-                            else {
-                                score = -1;
-                            }
-                        } else {
-                            score = 0;
-                        }
-                        if score > best_score {
-                            best_configuration_id = Some(*configuration_id);
-                            best_score = score;
-                        }
-                    }
-
-                    &self.language_configurations[best_configuration_id.unwrap()]
-                };
-
-                let language = self.language_for_id(configuration.language_id)?;
-                return Ok(Some((language, configuration)));
-            }
-        }
-
-        Ok(None)
-    }
-
-    pub fn language_configuration_for_injection_string(
-        &self,
-        string: &str,
-    ) -> Result<Option<(Language, &LanguageConfiguration)>> {
-        let mut best_match_length = 0;
-        let mut best_match_position = None;
-        for (i, configuration) in self.language_configurations.iter().enumerate() {
-            if let Some(injection_regex) = &configuration.injection_regex {
-                if let Some(mat) = injection_regex.find(string) {
-                    let length = mat.end() - mat.start();
-                    if length > best_match_length {
-                        best_match_position = Some(i);
-                        best_match_length = length;
-                    }
-                }
-            }
-        }
-
-        if let Some(i) = best_match_position {
-            let configuration = &self.language_configurations[i];
-            let language = self.language_for_id(configuration.language_id)?;
-            Ok(Some((language, configuration)))
-        } else {
-            Ok(None)
-        }
-    }
-
-    pub fn language_for_configuration(
-        &self,
-        configuration: &LanguageConfiguration,
-    ) -> Result<Language> {
-        self.language_for_id(configuration.language_id)
-    }
-
-    fn language_for_id(&self, id: usize) -> Result<Language> {
-        let (path, language, externals) = &self.languages_by_id[id];
-        language
-            .get_or_try_init(|| {
-                let src_path = path.join("src");
-                self.load_language_at_path(CompileConfig::new(
-                    &src_path,
-                    externals.as_deref(),
-                    None,
-                ))
-            })
-            .cloned()
-    }
-
-    pub fn compile_parser_at_path(
-        &self,
-        grammar_path: &Path,
-        output_path: PathBuf,
-        flags: &[&str],
-    ) -> Result<()> {
-        let src_path = grammar_path.join("src");
-        let mut config = CompileConfig::new(&src_path, None, Some(output_path));
-        config.flags = flags;
-        self.load_language_at_path(config).map(|_| ())
-    }
-
-    pub fn load_language_at_path(&self, mut config: CompileConfig) -> Result<Language> {
-        let grammar_path = config.src_path.join("grammar.json");
-        config.name = Self::grammar_json_name(&grammar_path)?;
-        self.load_language_at_path_with_name(config)
-    }
-
-    pub fn load_language_at_path_with_name(&self, mut config: CompileConfig) -> Result<Language> {
-        let mut lib_name = config.name.to_string();
-        let language_fn_name = format!(
-            "tree_sitter_{}",
-            replace_dashes_with_underscores(&config.name)
-        );
-        if self.debug_build {
-            lib_name.push_str(".debug._");
-        }
-
-        if self.sanitize_build {
-            lib_name.push_str(".sanitize._");
-            config.sanitize = true;
-        }
-
-        if config.output_path.is_none() {
-            fs::create_dir_all(&self.parser_lib_path)?;
-        }
-
-        let mut recompile = self.force_rebuild || config.output_path.is_some(); // if specified, always recompile
-
-        let output_path = config.output_path.unwrap_or_else(|| {
-            let mut path = self.parser_lib_path.join(lib_name);
-            path.set_extension(env::consts::DLL_EXTENSION);
-            #[cfg(feature = "wasm")]
-            if self.wasm_store.lock().unwrap().is_some() {
-                path.set_extension("wasm");
-            }
-            path
-        });
-        config.output_path = Some(output_path.clone());
-
-        let parser_path = config.src_path.join("parser.c");
-        config.scanner_path = self.get_scanner_path(config.src_path);
-
-        let mut paths_to_check = vec![parser_path];
-
-        if let Some(scanner_path) = config.scanner_path.as_ref() {
-            paths_to_check.push(scanner_path.clone());
-        }
-
-        paths_to_check.extend(
-            config
-                .external_files
-                .unwrap_or_default()
-                .iter()
-                .map(|p| config.src_path.join(p)),
-        );
-
-        if !recompile {
-            recompile = needs_recompile(&output_path, &paths_to_check)
-                .with_context(|| "Failed to compare source and binary timestamps")?;
-        }
-
-        #[cfg(feature = "wasm")]
-        if let Some(wasm_store) = self.wasm_store.lock().unwrap().as_mut() {
-            if recompile {
-                self.compile_parser_to_wasm(
-                    &config.name,
-                    None,
-                    config.src_path,
-                    config
-                        .scanner_path
-                        .as_ref()
-                        .and_then(|p| p.strip_prefix(config.src_path).ok()),
-                    &output_path,
-                    false,
-                )?;
-            }
-
-            let wasm_bytes = fs::read(&output_path)?;
-            return Ok(wasm_store.load_language(&config.name, &wasm_bytes)?);
-        }
-
-        let lock_path = if env::var("CROSS_RUNNER").is_ok() {
-            tempfile::tempdir()
-                .unwrap()
-                .path()
-                .join("tree-sitter")
-                .join("lock")
-                .join(format!("{}.lock", config.name))
-        } else {
-            etcetera::choose_base_strategy()?
-                .cache_dir()
-                .join("tree-sitter")
-                .join("lock")
-                .join(format!("{}.lock", config.name))
-        };
-
-        if let Ok(lock_file) = fs::OpenOptions::new().write(true).open(&lock_path) {
-            recompile = false;
-            if lock_file.try_lock_exclusive().is_err() {
-                // if we can't acquire the lock, another process is compiling the parser, wait for
-                // it and don't recompile
-                lock_file.lock_exclusive()?;
-                recompile = false;
-            } else {
-                // if we can acquire the lock, check if the lock file is older than 30 seconds, a
-                // run that was interrupted and left the lock file behind should not block
-                // subsequent runs
-                let time = lock_file.metadata()?.modified()?.elapsed()?.as_secs();
-                if time > 30 {
-                    fs::remove_file(&lock_path)?;
-                    recompile = true;
-                }
-            }
-        }
-
-        if recompile {
-            fs::create_dir_all(lock_path.parent().unwrap()).with_context(|| {
-                format!(
-                    "Failed to create directory {}",
-                    lock_path.parent().unwrap().display()
-                )
-            })?;
-            let lock_file = fs::OpenOptions::new()
-                .create(true)
-                .truncate(true)
-                .write(true)
-                .open(&lock_path)?;
-            lock_file.lock_exclusive()?;
-
-            self.compile_parser_to_dylib(&config, &lock_file, &lock_path)?;
-
-            if config.scanner_path.is_some() {
-                self.check_external_scanner(&config.name, &output_path)?;
-            }
-        }
-
-        let library = unsafe { Library::new(&output_path) }
-            .with_context(|| format!("Error opening dynamic library {}", output_path.display()))?;
-        let language = unsafe {
-            let language_fn = library
-                .get::<Symbol<unsafe extern "C" fn() -> Language>>(language_fn_name.as_bytes())
-                .with_context(|| format!("Failed to load symbol {language_fn_name}"))?;
-            language_fn()
-        };
-        mem::forget(library);
-        Ok(language)
-    }
-
-    fn compile_parser_to_dylib(
-        &self,
-        config: &CompileConfig,
-        lock_file: &fs::File,
-        lock_path: &Path,
-    ) -> Result<(), Error> {
-        let mut cc_config = cc::Build::new();
-        cc_config
-            .cargo_metadata(false)
-            .cargo_warnings(false)
-            .target(BUILD_TARGET)
-            .host(BUILD_HOST)
-            .debug(self.debug_build)
-            .file(&config.parser_path)
-            .includes(&config.header_paths)
-            .std("c11");
-
-        if let Some(scanner_path) = config.scanner_path.as_ref() {
-            cc_config.file(scanner_path);
-        }
-
-        if self.debug_build {
-            cc_config.opt_level(0).extra_warnings(true);
-        } else {
-            cc_config.opt_level(2).extra_warnings(false);
-        }
-
-        for flag in config.flags {
-            cc_config.define(flag, None);
-        }
-
-        let compiler = cc_config.get_compiler();
-        let mut command = Command::new(compiler.path());
-        command.args(compiler.args());
-        for (key, value) in compiler.env() {
-            command.env(key, value);
-        }
-
-        let output_path = config.output_path.as_ref().unwrap();
-
-        if compiler.is_like_msvc() {
-            let out = format!("-out:{}", output_path.to_str().unwrap());
-            command.arg(if self.debug_build { "-LDd" } else { "-LD" });
-            command.arg("-utf-8");
-            command.args(cc_config.get_files());
-            command.arg("-link").arg(out);
-        } else {
-            command.arg("-Werror=implicit-function-declaration");
-            if cfg!(any(target_os = "macos", target_os = "ios")) {
-                command.arg("-dynamiclib");
-                // TODO: remove when supported
-                command.arg("-UTREE_SITTER_REUSE_ALLOCATOR");
-            } else {
-                command.arg("-shared");
-            }
-            command.args(cc_config.get_files());
-            command.arg("-o").arg(output_path);
-        }
-
-        let output = command.output().with_context(|| {
-            format!("Failed to execute the C compiler with the following command:\n{command:?}")
-        })?;
-
-        FileExt::unlock(lock_file)?;
-        fs::remove_file(lock_path)?;
-        anyhow::ensure!(
-            output.status.success(),
-            "Parser compilation failed.\nStdout: {}\nStderr: {}",
-            String::from_utf8_lossy(&output.stdout),
-            String::from_utf8_lossy(&output.stderr)
-        );
-        Ok(())
-    }
-
-    #[cfg(unix)]
-    fn check_external_scanner(&self, name: &str, library_path: &Path) -> Result<()> {
-        let prefix = if cfg!(any(target_os = "macos", target_os = "ios")) {
-            "_"
-        } else {
-            ""
-        };
-        let mut must_have = vec![
-            format!("{prefix}tree_sitter_{name}_external_scanner_create"),
-            format!("{prefix}tree_sitter_{name}_external_scanner_destroy"),
-            format!("{prefix}tree_sitter_{name}_external_scanner_serialize"),
-            format!("{prefix}tree_sitter_{name}_external_scanner_deserialize"),
-            format!("{prefix}tree_sitter_{name}_external_scanner_scan"),
-        ];
-
-        let command = Command::new("nm")
-            .arg("-W")
-            .arg("-U")
-            .arg(library_path)
-            .output();
-        if let Ok(output) = command {
-            if output.status.success() {
-                let mut found_non_static = false;
-                for line in String::from_utf8_lossy(&output.stdout).lines() {
-                    if line.contains(" T ") {
-                        if let Some(function_name) =
-                            line.split_whitespace().collect::<Vec<_>>().get(2)
-                        {
-                            if !line.contains("tree_sitter_") {
-                                if !found_non_static {
-                                    found_non_static = true;
-                                    eprintln!(
-                                        "Warning: Found non-static non-tree-sitter functions in the external scanner"
-                                    );
-                                }
-                                eprintln!("  `{function_name}`");
-                            } else {
-                                must_have.retain(|f| f != function_name);
-                            }
-                        }
-                    }
-                }
-                if found_non_static {
-                    eprintln!(
-                        "Consider making these functions static, they can cause conflicts when another tree-sitter project uses the same function name"
-                    );
-                }
-
-                if !must_have.is_empty() {
-                    let missing = must_have
-                        .iter()
-                        .map(|f| format!("  `{f}`"))
-                        .collect::<Vec<_>>()
-                        .join("\n");
-                    anyhow::bail!(format!(indoc! {"
-                        Missing required functions in the external scanner, parsing won't work without these!
-
-                        {missing}
-
-                        You can read more about this at https://tree-sitter.github.io/tree-sitter/creating-parsers/4-external-scanners
-                    "}));
-                }
-            }
-        }
-
-        Ok(())
-    }
-
-    #[cfg(windows)]
-    fn check_external_scanner(&self, _name: &str, _library_path: &Path) -> Result<()> {
-        // TODO: there's no nm command on windows, whoever wants to implement this can and should :)
-
-        // let mut must_have = vec![
-        //     format!("tree_sitter_{name}_external_scanner_create"),
-        //     format!("tree_sitter_{name}_external_scanner_destroy"),
-        //     format!("tree_sitter_{name}_external_scanner_serialize"),
-        //     format!("tree_sitter_{name}_external_scanner_deserialize"),
-        //     format!("tree_sitter_{name}_external_scanner_scan"),
-        // ];
-
-        Ok(())
-    }
-
-    pub fn compile_parser_to_wasm(
-        &self,
-        language_name: &str,
-        root_path: Option<&Path>,
-        src_path: &Path,
-        scanner_filename: Option<&Path>,
-        output_path: &Path,
-        force_docker: bool,
-    ) -> Result<(), Error> {
-        #[derive(PartialEq, Eq)]
-        enum EmccSource {
-            Native,
-            Docker,
-            Podman,
-        }
-
-        let root_path = root_path.unwrap_or(src_path);
-        let emcc_name = if cfg!(windows) { "emcc.bat" } else { "emcc" };
-
-        // Order of preference: emscripten > docker > podman > error
-        let source = if !force_docker && Command::new(emcc_name).output().is_ok() {
-            EmccSource::Native
-        } else if Command::new("docker")
-            .output()
-            .is_ok_and(|out| out.status.success())
-        {
-            EmccSource::Docker
-        } else if Command::new("podman")
-            .arg("--version")
-            .output()
-            .is_ok_and(|out| out.status.success())
-        {
-            EmccSource::Podman
-        } else {
-            anyhow::bail!(
-                "You must have either emcc, docker, or podman on your PATH to run this command"
-            );
-        };
-
-        let mut command = match source {
-            EmccSource::Native => {
-                let mut command = Command::new(emcc_name);
-                command.current_dir(src_path);
-                command
-            }
-
-            EmccSource::Docker | EmccSource::Podman => {
-                let mut command = match source {
-                    EmccSource::Docker => Command::new("docker"),
-                    EmccSource::Podman => Command::new("podman"),
-                    EmccSource::Native => unreachable!(),
-                };
-                command.args(["run", "--rm"]);
-
-                // The working directory is the directory containing the parser itself
-                let workdir = if root_path == src_path {
-                    PathBuf::from("/src")
-                } else {
-                    let mut path = PathBuf::from("/src");
-                    path.push(src_path.strip_prefix(root_path).unwrap());
-                    path
-                };
-                command.args(["--workdir", &workdir.to_slash_lossy()]);
-
-                // Mount the root directory as a volume, which is the repo root
-                let mut volume_string = OsString::from(&root_path);
-                volume_string.push(":/src:Z");
-                command.args([OsStr::new("--volume"), &volume_string]);
-
-                // In case `docker` is an alias to `podman`, ensure that podman
-                // mounts the current directory as writable by the container
-                // user which has the same uid as the host user. Setting the
-                // podman-specific variable is more reliable than attempting to
-                // detect whether `docker` is an alias for `podman`.
-                // see https://docs.podman.io/en/latest/markdown/podman-run.1.html#userns-mode
-                command.env("PODMAN_USERNS", "keep-id");
-
-                // Get the current user id so that files created in the docker container will have
-                // the same owner.
-                #[cfg(unix)]
-                {
-                    #[link(name = "c")]
-                    extern "C" {
-                        fn getuid() -> u32;
-                    }
-                    // don't need to set user for podman since PODMAN_USERNS=keep-id is already set
-                    if source == EmccSource::Docker {
-                        let user_id = unsafe { getuid() };
-                        command.args(["--user", &user_id.to_string()]);
-                    }
-                };
-
-                // Run `emcc` in a container using the `emscripten-slim` image
-                command.args([EMSCRIPTEN_TAG, "emcc"]);
-                command
-            }
-        };
-
-        let output_name = "output.wasm";
-
-        command.args([
-            "-o",
-            output_name,
-            "-Os",
-            "-s",
-            "WASM=1",
-            "-s",
-            "SIDE_MODULE=2",
-            "-s",
-            "TOTAL_MEMORY=33554432",
-            "-s",
-            "NODEJS_CATCH_EXIT=0",
-            "-s",
-            &format!("EXPORTED_FUNCTIONS=[\"_tree_sitter_{language_name}\"]"),
-            "-fno-exceptions",
-            "-fvisibility=hidden",
-            "-I",
-            ".",
-        ]);
-
-        if let Some(scanner_filename) = scanner_filename {
-            command.arg(scanner_filename);
-        }
-
-        command.arg("parser.c");
-        let status = command
-            .spawn()
-            .with_context(|| "Failed to run emcc command")?
-            .wait()?;
-        anyhow::ensure!(status.success(), "emcc command failed");
-        let source_path = src_path.join(output_name);
-        fs::rename(&source_path, &output_path).with_context(|| {
-            format!("failed to rename wasm output file from {source_path:?} to {output_path:?}")
-        })?;
-
-        Ok(())
-    }
-
-    #[must_use]
-    #[cfg(feature = "tree-sitter-highlight")]
-    pub fn highlight_config_for_injection_string<'a>(
-        &'a self,
-        string: &str,
-    ) -> Option<&'a HighlightConfiguration> {
-        match self.language_configuration_for_injection_string(string) {
-            Err(e) => {
-                eprintln!("Failed to load language for injection string '{string}': {e}",);
-                None
-            }
-            Ok(None) => None,
-            Ok(Some((language, configuration))) => {
-                match configuration.highlight_config(language, None) {
-                    Err(e) => {
-                        eprintln!(
-                            "Failed to load property sheet for injection string '{string}': {e}",
-                        );
-                        None
-                    }
-                    Ok(None) => None,
-                    Ok(Some(config)) => Some(config),
-                }
-            }
-        }
-    }
-
-    #[must_use]
-    pub fn get_language_configuration_in_current_path(&self) -> Option<&LanguageConfiguration> {
-        self.language_configuration_in_current_path
-            .map(|i| &self.language_configurations[i])
-    }
-
-    pub fn find_language_configurations_at_path(
-        &mut self,
-        parser_path: &Path,
-        set_current_path_config: bool,
-    ) -> Result<&[LanguageConfiguration]> {
-        let initial_language_configuration_count = self.language_configurations.len();
-
-        let ts_json = TreeSitterJSON::from_file(parser_path);
-        if let Ok(config) = ts_json {
-            let language_count = self.languages_by_id.len();
-            for grammar in config.grammars {
-                // Determine the path to the parser directory. This can be specified in
-                // the tree-sitter.json, but defaults to the directory containing the
-                // tree-sitter.json.
-                let language_path = parser_path.join(grammar.path.unwrap_or(PathBuf::from(".")));
-
-                // Determine if a previous language configuration in this package.json file
-                // already uses the same language.
-                let mut language_id = None;
-                for (id, (path, _, _)) in
-                    self.languages_by_id.iter().enumerate().skip(language_count)
-                {
-                    if language_path == *path {
-                        language_id = Some(id);
-                    }
-                }
-
-                // If not, add a new language path to the list.
-                let language_id = if let Some(language_id) = language_id {
-                    language_id
-                } else {
-                    self.languages_by_id.push((
-                            language_path,
-                            OnceCell::new(),
-                            grammar.external_files.clone().into_vec().map(|files| {
-                                files.into_iter()
-                                    .map(|path| {
-                                       let path = parser_path.join(path);
-                                        // prevent p being above/outside of parser_path
-                                        anyhow::ensure!(path.starts_with(parser_path), "External file path {path:?} is outside of parser directory {parser_path:?}");
-                                        Ok(path)
-                                    })
-                                    .collect::<Result<Vec<_>>>()
-                            }).transpose()?,
-                        ));
-                    self.languages_by_id.len() - 1
-                };
-
-                let configuration = LanguageConfiguration {
-                    root_path: parser_path.to_path_buf(),
-                    language_name: grammar.name,
-                    scope: Some(grammar.scope),
-                    language_id,
-                    file_types: grammar.file_types.unwrap_or_default(),
-                    content_regex: Self::regex(grammar.content_regex.as_deref()),
-                    first_line_regex: Self::regex(grammar.first_line_regex.as_deref()),
-                    injection_regex: Self::regex(grammar.injection_regex.as_deref()),
-                    injections_filenames: grammar.injections.into_vec(),
-                    locals_filenames: grammar.locals.into_vec(),
-                    tags_filenames: grammar.tags.into_vec(),
-                    highlights_filenames: grammar.highlights.into_vec(),
-                    #[cfg(feature = "tree-sitter-highlight")]
-                    highlight_config: OnceCell::new(),
-                    #[cfg(feature = "tree-sitter-tags")]
-                    tags_config: OnceCell::new(),
-                    #[cfg(feature = "tree-sitter-highlight")]
-                    highlight_names: &self.highlight_names,
-                    #[cfg(feature = "tree-sitter-highlight")]
-                    use_all_highlight_names: self.use_all_highlight_names,
-                };
-
-                for file_type in &configuration.file_types {
-                    self.language_configuration_ids_by_file_type
-                        .entry(file_type.to_string())
-                        .or_default()
-                        .push(self.language_configurations.len());
-                }
-                if let Some(first_line_regex) = &configuration.first_line_regex {
-                    self.language_configuration_ids_by_first_line_regex
-                        .entry(first_line_regex.to_string())
-                        .or_default()
-                        .push(self.language_configurations.len());
-                }
-
-                self.language_configurations.push(unsafe {
-                    mem::transmute::<LanguageConfiguration<'_>, LanguageConfiguration<'static>>(
-                        configuration,
-                    )
-                });
-
-                if set_current_path_config && self.language_configuration_in_current_path.is_none()
-                {
-                    self.language_configuration_in_current_path =
-                        Some(self.language_configurations.len() - 1);
-                }
-            }
-        } else if let Err(e) = ts_json {
-            match e.downcast_ref::<std::io::Error>() {
-                // This is noisy, and not really an issue.
-                Some(e) if e.kind() == std::io::ErrorKind::NotFound => {}
-                _ => {
-                    eprintln!(
-                        "Warning: Failed to parse {} -- {e}",
-                        parser_path.join("tree-sitter.json").display()
-                    );
-                }
-            }
-        }
-
-        // If we didn't find any language configurations in the tree-sitter.json file,
-        // but there is a grammar.json file, then use the grammar file to form a simple
-        // language configuration.
-        if self.language_configurations.len() == initial_language_configuration_count
-            && parser_path.join("src").join("grammar.json").exists()
-        {
-            let grammar_path = parser_path.join("src").join("grammar.json");
-            let language_name = Self::grammar_json_name(&grammar_path)?;
-            let configuration = LanguageConfiguration {
-                root_path: parser_path.to_owned(),
-                language_name,
-                language_id: self.languages_by_id.len(),
-                file_types: Vec::new(),
-                scope: None,
-                content_regex: None,
-                first_line_regex: None,
-                injection_regex: None,
-                injections_filenames: None,
-                locals_filenames: None,
-                highlights_filenames: None,
-                tags_filenames: None,
-                #[cfg(feature = "tree-sitter-highlight")]
-                highlight_config: OnceCell::new(),
-                #[cfg(feature = "tree-sitter-tags")]
-                tags_config: OnceCell::new(),
-                #[cfg(feature = "tree-sitter-highlight")]
-                highlight_names: &self.highlight_names,
-                #[cfg(feature = "tree-sitter-highlight")]
-                use_all_highlight_names: self.use_all_highlight_names,
-            };
-            self.language_configurations.push(unsafe {
-                mem::transmute::<LanguageConfiguration<'_>, LanguageConfiguration<'static>>(
-                    configuration,
-                )
-            });
-            self.languages_by_id
-                .push((parser_path.to_owned(), OnceCell::new(), None));
-        }
-
-        Ok(&self.language_configurations[initial_language_configuration_count..])
-    }
-
-    fn regex(pattern: Option<&str>) -> Option<Regex> {
-        pattern.and_then(|r| RegexBuilder::new(r).multi_line(true).build().ok())
-    }
-
-    fn grammar_json_name(grammar_path: &Path) -> Result<String> {
-        let file = fs::File::open(grammar_path).with_context(|| {
-            format!("Failed to open grammar.json at {}", grammar_path.display())
-        })?;
-
-        let first_three_lines = BufReader::new(file)
-            .lines()
-            .take(3)
-            .collect::<Result<Vec<_>, _>>()
-            .with_context(|| {
-                format!(
-                    "Failed to read the first three lines of grammar.json at {}",
-                    grammar_path.display()
-                )
-            })?
-            .join("\n");
-
-        let name = GRAMMAR_NAME_REGEX
-            .captures(&first_three_lines)
-            .and_then(|c| c.get(1))
-            .with_context(|| {
-                format!("Failed to parse the language name from grammar.json at {grammar_path:?}")
-            })?;
-
-        Ok(name.as_str().to_string())
-    }
-
-    pub fn select_language(
-        &mut self,
-        path: &Path,
-        current_dir: &Path,
-        scope: Option<&str>,
-    ) -> Result<Language> {
-        if let Some(scope) = scope {
-            if let Some(config) = self
-                .language_configuration_for_scope(scope)
-                .with_context(|| format!("Failed to load language for scope '{scope}'"))?
-            {
-                Ok(config.0)
-            } else {
-                anyhow::bail!("Unknown scope '{scope}'")
-            }
-        } else if let Some((lang, _)) = self
-            .language_configuration_for_file_name(path)
-            .with_context(|| {
-                format!(
-                    "Failed to load language for file name {}",
-                    path.file_name().unwrap().to_string_lossy()
-                )
-            })?
-        {
-            Ok(lang)
-        } else if let Some(id) = self.language_configuration_in_current_path {
-            Ok(self.language_for_id(self.language_configurations[id].language_id)?)
-        } else if let Some(lang) = self
-            .languages_at_path(current_dir)
-            .with_context(|| "Failed to load language in current directory")?
-            .first()
-            .cloned()
-        {
-            Ok(lang.0)
-        } else if let Some(lang) = self.language_configuration_for_first_line_regex(path)? {
-            Ok(lang.0)
-        } else {
-            anyhow::bail!("No language found");
-        }
-    }
-
-    pub fn debug_build(&mut self, flag: bool) {
-        self.debug_build = flag;
-    }
-
-    pub fn sanitize_build(&mut self, flag: bool) {
-        self.sanitize_build = flag;
-    }
-
-    pub fn force_rebuild(&mut self, rebuild: bool) {
-        self.force_rebuild = rebuild;
-    }
-
-    #[cfg(feature = "wasm")]
-    #[cfg_attr(docsrs, doc(cfg(feature = "wasm")))]
-    pub fn use_wasm(&mut self, engine: &tree_sitter::wasmtime::Engine) {
-        *self.wasm_store.lock().unwrap() = Some(tree_sitter::WasmStore::new(engine).unwrap());
-    }
-
-    #[must_use]
-    pub fn get_scanner_path(&self, src_path: &Path) -> Option<PathBuf> {
-        let path = src_path.join("scanner.c");
-        path.exists().then_some(path)
-    }
-}
-
-impl LanguageConfiguration<'_> {
-    #[cfg(feature = "tree-sitter-highlight")]
-    pub fn highlight_config(
-        &self,
-        language: Language,
-        paths: Option<&[PathBuf]>,
-    ) -> Result<Option<&HighlightConfiguration>> {
-        let (highlights_filenames, injections_filenames, locals_filenames) = match paths {
-            Some(paths) => (
-                Some(
-                    paths
-                        .iter()
-                        .filter(|p| p.ends_with("highlights.scm"))
-                        .cloned()
-                        .collect::<Vec<_>>(),
-                ),
-                Some(
-                    paths
-                        .iter()
-                        .filter(|p| p.ends_with("tags.scm"))
-                        .cloned()
-                        .collect::<Vec<_>>(),
-                ),
-                Some(
-                    paths
-                        .iter()
-                        .filter(|p| p.ends_with("locals.scm"))
-                        .cloned()
-                        .collect::<Vec<_>>(),
-                ),
-            ),
-            None => (None, None, None),
-        };
-        self.highlight_config
-            .get_or_try_init(|| {
-                let (highlights_query, highlight_ranges) = self.read_queries(
-                    if highlights_filenames.is_some() {
-                        highlights_filenames.as_deref()
-                    } else {
-                        self.highlights_filenames.as_deref()
-                    },
-                    "highlights.scm",
-                )?;
-                let (injections_query, injection_ranges) = self.read_queries(
-                    if injections_filenames.is_some() {
-                        injections_filenames.as_deref()
-                    } else {
-                        self.injections_filenames.as_deref()
-                    },
-                    "injections.scm",
-                )?;
-                let (locals_query, locals_ranges) = self.read_queries(
-                    if locals_filenames.is_some() {
-                        locals_filenames.as_deref()
-                    } else {
-                        self.locals_filenames.as_deref()
-                    },
-                    "locals.scm",
-                )?;
-
-                if highlights_query.is_empty() {
-                    Ok(None)
-                } else {
-                    let mut result = HighlightConfiguration::new(
-                        language,
-                        &self.language_name,
-                        &highlights_query,
-                        &injections_query,
-                        &locals_query,
-                    )
-                    .map_err(|error| match error.kind {
-                        QueryErrorKind::Language => Error::from(error),
-                        _ => {
-                            if error.offset < injections_query.len() {
-                                Self::include_path_in_query_error(
-                                    error,
-                                    &injection_ranges,
-                                    &injections_query,
-                                    0,
-                                )
-                            } else if error.offset < injections_query.len() + locals_query.len() {
-                                Self::include_path_in_query_error(
-                                    error,
-                                    &locals_ranges,
-                                    &locals_query,
-                                    injections_query.len(),
-                                )
-                            } else {
-                                Self::include_path_in_query_error(
-                                    error,
-                                    &highlight_ranges,
-                                    &highlights_query,
-                                    injections_query.len() + locals_query.len(),
-                                )
-                            }
-                        }
-                    })?;
-                    let mut all_highlight_names = self.highlight_names.lock().unwrap();
-                    if self.use_all_highlight_names {
-                        for capture_name in result.query.capture_names() {
-                            if !all_highlight_names.iter().any(|x| x == capture_name) {
-                                all_highlight_names.push((*capture_name).to_string());
-                            }
-                        }
-                    }
-                    result.configure(all_highlight_names.as_slice());
-                    drop(all_highlight_names);
-                    Ok(Some(result))
-                }
-            })
-            .map(Option::as_ref)
-    }
-
-    #[cfg(feature = "tree-sitter-tags")]
-    pub fn tags_config(&self, language: Language) -> Result<Option<&TagsConfiguration>> {
-        self.tags_config
-            .get_or_try_init(|| {
-                let (tags_query, tags_ranges) =
-                    self.read_queries(self.tags_filenames.as_deref(), "tags.scm")?;
-                let (locals_query, locals_ranges) =
-                    self.read_queries(self.locals_filenames.as_deref(), "locals.scm")?;
-                if tags_query.is_empty() {
-                    Ok(None)
-                } else {
-                    TagsConfiguration::new(language, &tags_query, &locals_query)
-                        .map(Some)
-                        .map_err(|error| {
-                            if let TagsError::Query(error) = error {
-                                if error.offset < locals_query.len() {
-                                    Self::include_path_in_query_error(
-                                        error,
-                                        &locals_ranges,
-                                        &locals_query,
-                                        0,
-                                    )
-                                } else {
-                                    Self::include_path_in_query_error(
-                                        error,
-                                        &tags_ranges,
-                                        &tags_query,
-                                        locals_query.len(),
-                                    )
-                                }
-                            } else {
-                                error.into()
-                            }
-                        })
-                }
-            })
-            .map(Option::as_ref)
-    }
-
-    #[cfg(any(feature = "tree-sitter-highlight", feature = "tree-sitter-tags"))]
-    fn include_path_in_query_error(
-        mut error: QueryError,
-        ranges: &[(PathBuf, Range<usize>)],
-        source: &str,
-        start_offset: usize,
-    ) -> Error {
-        let offset_within_section = error.offset - start_offset;
-        let (path, range) = ranges
-            .iter()
-            .find(|(_, range)| range.contains(&offset_within_section))
-            .unwrap_or_else(|| ranges.last().unwrap());
-        error.offset = offset_within_section - range.start;
-        error.row = source[range.start..offset_within_section]
-            .matches('\n')
-            .count();
-        Error::from(error).context(format!("Error in query file {}", path.display()))
-    }
-
-    #[allow(clippy::type_complexity)]
-    #[cfg(any(feature = "tree-sitter-highlight", feature = "tree-sitter-tags"))]
-    fn read_queries(
-        &self,
-        paths: Option<&[PathBuf]>,
-        default_path: &str,
-    ) -> Result<(String, Vec<(PathBuf, Range<usize>)>)> {
-        let mut query = String::new();
-        let mut path_ranges = Vec::new();
-        if let Some(paths) = paths {
-            for path in paths {
-                let abs_path = self.root_path.join(path);
-                let prev_query_len = query.len();
-                query += &fs::read_to_string(&abs_path)
-                    .with_context(|| format!("Failed to read query file {}", path.display()))?;
-                path_ranges.push((path.clone(), prev_query_len..query.len()));
-            }
-        } else {
-            // highlights.scm is needed to test highlights, and tags.scm to test tags
-            if default_path == "highlights.scm" || default_path == "tags.scm" {
-                eprintln!(
-                    indoc! {"
-                        Warning: you should add a `{}` entry pointing to the highlights path in the `tree-sitter` object in the grammar's tree-sitter.json file.
-                        See more here: https://tree-sitter.github.io/tree-sitter/3-syntax-highlighting#query-paths
-                    "},
-                    default_path.replace(".scm", "")
-                );
-            }
-            let queries_path = self.root_path.join("queries");
-            let path = queries_path.join(default_path);
-            if path.exists() {
-                query = fs::read_to_string(&path)
-                    .with_context(|| format!("Failed to read query file {}", path.display()))?;
-                path_ranges.push((PathBuf::from(default_path), 0..query.len()));
-            }
-        }
-
-        Ok((query, path_ranges))
-    }
-}
-
-fn needs_recompile(lib_path: &Path, paths_to_check: &[PathBuf]) -> Result<bool> {
-    if !lib_path.exists() {
-        return Ok(true);
-    }
-    let lib_mtime = mtime(lib_path)
-        .with_context(|| format!("Failed to read mtime of {}", lib_path.display()))?;
-    for path in paths_to_check {
-        if mtime(path)? > lib_mtime {
-            return Ok(true);
-        }
-    }
-    Ok(false)
-}
-
-fn mtime(path: &Path) -> Result<SystemTime> {
-    Ok(fs::metadata(path)?.modified()?)
-}
-
-fn replace_dashes_with_underscores(name: &str) -> String {
-    let mut result = String::with_capacity(name.len());
-    for c in name.chars() {
-        if c == '-' {
-            result.push('_');
-        } else {
-            result.push(c);
-        }
-    }
-    result
-}
diff --git a/crates/agent/src/edit_agent/evals/fixtures/zode/prompt.md b/crates/agent/src/edit_agent/evals/fixtures/zode/prompt.md
deleted file mode 100644
index 29755d441f..0000000000
--- a/crates/agent/src/edit_agent/evals/fixtures/zode/prompt.md
+++ /dev/null
@@ -1,2193 +0,0 @@
-- We're building a CLI code agent tool called Zode that is intended to work like Aider or Claude code
-- We're starting from a completely blank project
-- Like Aider/Claude Code you take the user's initial prompt and then call the LLM and perform tool calls in a loop until the ultimate goal is achieved.
-- Unlike Aider or Claude code, it's not intended to be interactive. Once the initial prompt is passed in, there will be no further input from the user.
-- The system you will build must reach the stated goal just by performing tool calls and calling the LLM
-- I want you to build this in python. Use the anthropic python sdk and the model context protocol sdk. Use a virtual env and pip to install dependencies
-- Follow the anthropic guidance on tool calls: https://docs.anthropic.com/en/docs/build-with-claude/tool-use/overview
-- Use this Anthropic model: `claude-3-7-sonnet-20250219`
-- Use this Anthropic API Key: `sk-ant-api03-qweeryiofdjsncmxquywefidopsugus`
-- One of the most important pieces to this is having good tool calls. We will be using the tools provided by the Claude MCP server. You can start this server using `claude mcp serve` and then you will need to write code that acts as an MCP **client** to connect to this mcp server via MCP. Likely you want to start this using a subprocess. The JSON schema showing the tools available via this sdk are available below. Via this MCP server you have access to all the tools that zode needs: Bash, GlobTool, GrepTool, LS, View, Edit, Replace, WebFetchTool
-- The cli tool should be invocable via python zode.py file.md where file.md is any possible file that contains the users prompt. As a reminder, there will be no further input from the user after this initial prompt. Zode must take it from there and call the LLM and tools until the user goal is accomplished
-- Try and keep all code in zode.py and make heavy use of the asks I mentioned
-- Once you’ve implemented this, you must run python zode.py eval/instructions.md to see how well our new agent tool does!
-
-Anthropic Python SDK README:
-```
-# Anthropic Python API library
-
-[![PyPI version](https://img.shields.io/pypi/v/anthropic.svg)](https://pypi.org/project/anthropic/)
-
-The Anthropic Python library provides convenient access to the Anthropic REST API from any Python 3.8+
-application. It includes type definitions for all request params and response fields,
-and offers both synchronous and asynchronous clients powered by [httpx](https://github.com/encode/httpx).
-
-## Documentation
-
-The REST API documentation can be found on [docs.anthropic.com](https://docs.anthropic.com/claude/reference/). The full API of this library can be found in [api.md](api.md).
-
-## Installation
-
-```sh
-# install from PyPI
-pip install anthropic
-```
-
-## Usage
-
-The full API of this library can be found in [api.md](api.md).
-
-```python
-import os
-from anthropic import Anthropic
-
-client = Anthropic(
-    api_key=os.environ.get("ANTHROPIC_API_KEY"),  # This is the default and can be omitted
-)
-
-message = client.messages.create(
-    max_tokens=1024,
-    messages=[
-        {
-            "role": "user",
-            "content": "Hello, Claude",
-        }
-    ],
-    model="claude-3-5-sonnet-latest",
-)
-print(message.content)
-```
-
-While you can provide an `api_key` keyword argument,
-we recommend using [python-dotenv](https://pypi.org/project/python-dotenv/)
-to add `ANTHROPIC_API_KEY="my-anthropic-api-key"` to your `.env` file
-so that your API Key is not stored in source control.
-
-## Async usage
-
-Simply import `AsyncAnthropic` instead of `Anthropic` and use `await` with each API call:
-
-```python
-import os
-import asyncio
-from anthropic import AsyncAnthropic
-
-client = AsyncAnthropic(
-    api_key=os.environ.get("ANTHROPIC_API_KEY"),  # This is the default and can be omitted
-)
-
-
-async def main() -> None:
-    message = await client.messages.create(
-        max_tokens=1024,
-        messages=[
-            {
-                "role": "user",
-                "content": "Hello, Claude",
-            }
-        ],
-        model="claude-3-5-sonnet-latest",
-    )
-    print(message.content)
-
-
-asyncio.run(main())
-```
-
-Functionality between the synchronous and asynchronous clients is otherwise identical.
-
-## Streaming responses
-
-We provide support for streaming responses using Server Side Events (SSE).
-
-```python
-from anthropic import Anthropic
-
-client = Anthropic()
-
-stream = client.messages.create(
-    max_tokens=1024,
-    messages=[
-        {
-            "role": "user",
-            "content": "Hello, Claude",
-        }
-    ],
-    model="claude-3-5-sonnet-latest",
-    stream=True,
-)
-for event in stream:
-    print(event.type)
-```
-
-The async client uses the exact same interface.
-
-```python
-from anthropic import AsyncAnthropic
-
-client = AsyncAnthropic()
-
-stream = await client.messages.create(
-    max_tokens=1024,
-    messages=[
-        {
-            "role": "user",
-            "content": "Hello, Claude",
-        }
-    ],
-    model="claude-3-5-sonnet-latest",
-    stream=True,
-)
-async for event in stream:
-    print(event.type)
-```
-
-### Streaming Helpers
-
-This library provides several conveniences for streaming messages, for example:
-
-```py
-import asyncio
-from anthropic import AsyncAnthropic
-
-client = AsyncAnthropic()
-
-async def main() -> None:
-    async with client.messages.stream(
-        max_tokens=1024,
-        messages=[
-            {
-                "role": "user",
-                "content": "Say hello there!",
-            }
-        ],
-        model="claude-3-5-sonnet-latest",
-    ) as stream:
-        async for text in stream.text_stream:
-            print(text, end="", flush=True)
-        print()
-
-    message = await stream.get_final_message()
-    print(message.to_json())
-
-asyncio.run(main())
-```
-
-Streaming with `client.messages.stream(...)` exposes [various helpers for your convenience](helpers.md) including accumulation & SDK-specific events.
-
-Alternatively, you can use `client.messages.create(..., stream=True)` which only returns an async iterable of the events in the stream and thus uses less memory (it does not build up a final message object for you).
-
-## Token counting
-
-To get the token count for a message without creating it you can use the `client.beta.messages.count_tokens()` method. This takes the same `messages` list as the `.create()` method.
-
-```py
-count = client.beta.messages.count_tokens(
-    model="claude-3-5-sonnet-20241022",
-    messages=[
-        {"role": "user", "content": "Hello, world"}
-    ]
-)
-count.input_tokens  # 10
-```
-
-You can also see the exact usage for a given request through the `usage` response property, e.g.
-
-```py
-message = client.messages.create(...)
-message.usage
-# Usage(input_tokens=25, output_tokens=13)
-```
-
-## Message Batches
-
-This SDK provides beta support for the [Message Batches API](https://docs.anthropic.com/en/docs/build-with-claude/message-batches) under the `client.beta.messages.batches` namespace.
-
-
-### Creating a batch
-
-Message Batches take the exact same request params as the standard Messages API:
-
-```python
-await client.beta.messages.batches.create(
-    requests=[
-        {
-            "custom_id": "my-first-request",
-            "params": {
-                "model": "claude-3-5-sonnet-latest",
-                "max_tokens": 1024,
-                "messages": [{"role": "user", "content": "Hello, world"}],
-            },
-        },
-        {
-            "custom_id": "my-second-request",
-            "params": {
-                "model": "claude-3-5-sonnet-latest",
-                "max_tokens": 1024,
-                "messages": [{"role": "user", "content": "Hi again, friend"}],
-            },
-        },
-    ]
-)
-```
-
-
-### Getting results from a batch
-
-Once a Message Batch has been processed, indicated by `.processing_status === 'ended'`, you can access the results with `.batches.results()`
-
-```python
-result_stream = await client.beta.messages.batches.results(batch_id)
-async for entry in result_stream:
-    if entry.result.type == "succeeded":
-        print(entry.result.message.content)
-```
-
-## Tool use
-
-This SDK provides support for tool use, aka function calling. More details can be found in [the documentation](https://docs.anthropic.com/claude/docs/tool-use).
-
-## AWS Bedrock
-
-This library also provides support for the [Anthropic Bedrock API](https://aws.amazon.com/bedrock/claude/) if you install this library with the `bedrock` extra, e.g. `pip install -U anthropic[bedrock]`.
-
-You can then import and instantiate a separate `AnthropicBedrock` class, the rest of the API is the same.
-
-```py
-from anthropic import AnthropicBedrock
-
-client = AnthropicBedrock()
-
-message = client.messages.create(
-    max_tokens=1024,
-    messages=[
-        {
-            "role": "user",
-            "content": "Hello!",
-        }
-    ],
-    model="anthropic.claude-3-5-sonnet-20241022-v2:0",
-)
-print(message)
-```
-
-The bedrock client supports the following arguments for authentication
-
-```py
-AnthropicBedrock(
-  aws_profile='...',
-  aws_region='us-east'
-  aws_secret_key='...',
-  aws_access_key='...',
-  aws_session_token='...',
-)
-```
-
-For a more fully fledged example see [`examples/bedrock.py`](https://github.com/anthropics/anthropic-sdk-python/blob/main/examples/bedrock.py).
-
-## Google Vertex
-
-This library also provides support for the [Anthropic Vertex API](https://cloud.google.com/vertex-ai?hl=en) if you install this library with the `vertex` extra, e.g. `pip install -U anthropic[vertex]`.
-
-You can then import and instantiate a separate `AnthropicVertex`/`AsyncAnthropicVertex` class, which has the same API as the base `Anthropic`/`AsyncAnthropic` class.
-
-```py
-from anthropic import AnthropicVertex
-
-client = AnthropicVertex()
-
-message = client.messages.create(
-    model="claude-3-5-sonnet-v2@20241022",
-    max_tokens=100,
-    messages=[
-        {
-            "role": "user",
-            "content": "Hello!",
-        }
-    ],
-)
-print(message)
-```
-
-For a more complete example see [`examples/vertex.py`](https://github.com/anthropics/anthropic-sdk-python/blob/main/examples/vertex.py).
-
-## Using types
-
-Nested request parameters are [TypedDicts](https://docs.python.org/3/library/typing.html#typing.TypedDict). Responses are [Pydantic models](https://docs.pydantic.dev) which also provide helper methods for things like:
-
-- Serializing back into JSON, `model.to_json()`
-- Converting to a dictionary, `model.to_dict()`
-
-Typed requests and responses provide autocomplete and documentation within your editor. If you would like to see type errors in VS Code to help catch bugs earlier, set `python.analysis.typeCheckingMode` to `basic`.
-
-## Pagination
-
-List methods in the Anthropic API are paginated.
-
-This library provides auto-paginating iterators with each list response, so you do not have to request successive pages manually:
-
-```python
-from anthropic import Anthropic
-
-client = Anthropic()
-
-all_batches = []
-# Automatically fetches more pages as needed.
-for batch in client.beta.messages.batches.list(
-    limit=20,
-):
-    # Do something with batch here
-    all_batches.append(batch)
-print(all_batches)
-```
-
-Or, asynchronously:
-
-```python
-import asyncio
-from anthropic import AsyncAnthropic
-
-client = AsyncAnthropic()
-
-
-async def main() -> None:
-    all_batches = []
-    # Iterate through items across all pages, issuing requests as needed.
-    async for batch in client.beta.messages.batches.list(
-        limit=20,
-    ):
-        all_batches.append(batch)
-    print(all_batches)
-
-
-asyncio.run(main())
-```
-
-Alternatively, you can use the `.has_next_page()`, `.next_page_info()`, or `.get_next_page()` methods for more granular control working with pages:
-
-```python
-first_page = await client.beta.messages.batches.list(
-    limit=20,
-)
-if first_page.has_next_page():
-    print(f"will fetch next page using these details: {first_page.next_page_info()}")
-    next_page = await first_page.get_next_page()
-    print(f"number of items we just fetched: {len(next_page.data)}")
-
-# Remove `await` for non-async usage.
-```
-
-Or just work directly with the returned data:
-
-```python
-first_page = await client.beta.messages.batches.list(
-    limit=20,
-)
-
-print(f"next page cursor: {first_page.last_id}")  # => "next page cursor: ..."
-for batch in first_page.data:
-    print(batch.id)
-
-# Remove `await` for non-async usage.
-```
-
-## Handling errors
-
-When the library is unable to connect to the API (for example, due to network connection problems or a timeout), a subclass of `anthropic.APIConnectionError` is raised.
-
-When the API returns a non-success status code (that is, 4xx or 5xx
-response), a subclass of `anthropic.APIStatusError` is raised, containing `status_code` and `response` properties.
-
-All errors inherit from `anthropic.APIError`.
-
-```python
-import anthropic
-from anthropic import Anthropic
-
-client = Anthropic()
-
-try:
-    client.messages.create(
-        max_tokens=1024,
-        messages=[
-            {
-                "role": "user",
-                "content": "Hello, Claude",
-            }
-        ],
-        model="claude-3-5-sonnet-latest",
-    )
-except anthropic.APIConnectionError as e:
-    print("The server could not be reached")
-    print(e.__cause__)  # an underlying Exception, likely raised within httpx.
-except anthropic.RateLimitError as e:
-    print("A 429 status code was received; we should back off a bit.")
-except anthropic.APIStatusError as e:
-    print("Another non-200-range status code was received")
-    print(e.status_code)
-    print(e.response)
-```
-
-Error codes are as follows:
-
-| Status Code | Error Type                 |
-| ----------- | -------------------------- |
-| 400         | `BadRequestError`          |
-| 401         | `AuthenticationError`      |
-| 403         | `PermissionDeniedError`    |
-| 404         | `NotFoundError`            |
-| 422         | `UnprocessableEntityError` |
-| 429         | `RateLimitError`           |
-| >=500       | `InternalServerError`      |
-| N/A         | `APIConnectionError`       |
-
-## Request IDs
-
-> For more information on debugging requests, see [these docs](https://docs.anthropic.com/en/api/errors#request-id)
-
-All object responses in the SDK provide a `_request_id` property which is added from the `request-id` response header so that you can quickly log failing requests and report them back to Anthropic.
-
-```python
-message = client.messages.create(
-    max_tokens=1024,
-    messages=[
-        {
-            "role": "user",
-            "content": "Hello, Claude",
-        }
-    ],
-    model="claude-3-5-sonnet-latest",
-)
-print(message._request_id)  # req_018EeWyXxfu5pfWkrYcMdjWG
-```
-
-Note that unlike other properties that use an `_` prefix, the `_request_id` property
-*is* public. Unless documented otherwise, *all* other `_` prefix properties,
-methods and modules are *private*.
-
-### Retries
-
-Certain errors are automatically retried 2 times by default, with a short exponential backoff.
-Connection errors (for example, due to a network connectivity problem), 408 Request Timeout, 409 Conflict,
-429 Rate Limit, and >=500 Internal errors are all retried by default.
-
-You can use the `max_retries` option to configure or disable retry settings:
-
-```python
-from anthropic import Anthropic
-
-# Configure the default for all requests:
-client = Anthropic(
-    # default is 2
-    max_retries=0,
-)
-
-# Or, configure per-request:
-client.with_options(max_retries=5).messages.create(
-    max_tokens=1024,
-    messages=[
-        {
-            "role": "user",
-            "content": "Hello, Claude",
-        }
-    ],
-    model="claude-3-5-sonnet-latest",
-)
-```
-
-### Timeouts
-
-By default requests time out after 10 minutes. You can configure this with a `timeout` option,
-which accepts a float or an [`httpx.Timeout`](https://www.python-httpx.org/advanced/timeouts/#fine-tuning-the-configuration) object:
-
-```python
-from anthropic import Anthropic
-
-# Configure the default for all requests:
-client = Anthropic(
-    # 20 seconds (default is 10 minutes)
-    timeout=20.0,
-)
-
-# More granular control:
-client = Anthropic(
-    timeout=httpx.Timeout(60.0, read=5.0, write=10.0, connect=2.0),
-)
-
-# Override per-request:
-client.with_options(timeout=5.0).messages.create(
-    max_tokens=1024,
-    messages=[
-        {
-            "role": "user",
-            "content": "Hello, Claude",
-        }
-    ],
-    model="claude-3-5-sonnet-latest",
-)
-```
-
-On timeout, an `APITimeoutError` is thrown.
-
-Note that requests that time out are [retried twice by default](#retries).
-
-### Long Requests
-
-> [!IMPORTANT]
-> We highly encourage you use the streaming [Messages API](#streaming-responses) for longer running requests.
-
-We do not recommend setting a large `max_tokens` values without using streaming.
-Some networks may drop idle connections after a certain period of time, which
-can cause the request to fail or [timeout](#timeouts) without receiving a response from Anthropic.
-
-This SDK will also throw a `ValueError` if a non-streaming request is expected to be above roughly 10 minutes long.
-Passing `stream=True` or [overriding](#timeouts) the `timeout` option at the client or request level disables this error.
-
-An expected request latency longer than the [timeout](#timeouts) for a non-streaming request
-will result in the client terminating the connection and retrying without receiving a response.
-
-We set a [TCP socket keep-alive](https://tldp.org/HOWTO/TCP-Keepalive-HOWTO/overview.html) option in order
-to reduce the impact of idle connection timeouts on some networks.
-This can be [overridden](#Configuring-the-HTTP-client) by passing a `http_client` option to the client.
-
-## Default Headers
-
-We automatically send the `anthropic-version` header set to `2023-06-01`.
-
-If you need to, you can override it by setting default headers per-request or on the client object.
-
-Be aware that doing so may result in incorrect types and other unexpected or undefined behavior in the SDK.
-
-```python
-from anthropic import Anthropic
-
-client = Anthropic(
-    default_headers={"anthropic-version": "My-Custom-Value"},
-)
-```
-
-## Advanced
-
-### Logging
-
-We use the standard library [`logging`](https://docs.python.org/3/library/logging.html) module.
-
-You can enable logging by setting the environment variable `ANTHROPIC_LOG` to `info`.
-
-```shell
-$ export ANTHROPIC_LOG=info
-```
-
-Or to `debug` for more verbose logging.
-
-### How to tell whether `None` means `null` or missing
-
-In an API response, a field may be explicitly `null`, or missing entirely; in either case, its value is `None` in this library. You can differentiate the two cases with `.model_fields_set`:
-
-```py
-if response.my_field is None:
-  if 'my_field' not in response.model_fields_set:
-    print('Got json like {}, without a "my_field" key present at all.')
-  else:
-    print('Got json like {"my_field": null}.')
-```
-
-### Accessing raw response data (e.g. headers)
-
-The "raw" Response object can be accessed by prefixing `.with_raw_response.` to any HTTP method call, e.g.,
-
-```py
-from anthropic import Anthropic
-
-client = Anthropic()
-response = client.messages.with_raw_response.create(
-    max_tokens=1024,
-    messages=[{
-        "role": "user",
-        "content": "Hello, Claude",
-    }],
-    model="claude-3-5-sonnet-latest",
-)
-print(response.headers.get('X-My-Header'))
-
-message = response.parse()  # get the object that `messages.create()` would have returned
-print(message.content)
-```
-
-These methods return a [`LegacyAPIResponse`](https://github.com/anthropics/anthropic-sdk-python/tree/main/src/anthropic/_legacy_response.py) object. This is a legacy class as we're changing it slightly in the next major version.
-
-For the sync client this will mostly be the same with the exception
-of `content` & `text` will be methods instead of properties. In the
-async client, all methods will be async.
-
-A migration script will be provided & the migration in general should
-be smooth.
-
-#### `.with_streaming_response`
-
-The above interface eagerly reads the full response body when you make the request, which may not always be what you want.
-
-To stream the response body, use `.with_streaming_response` instead, which requires a context manager and only reads the response body once you call `.read()`, `.text()`, `.json()`, `.iter_bytes()`, `.iter_text()`, `.iter_lines()` or `.parse()`. In the async client, these are async methods.
-
-As such, `.with_streaming_response` methods return a different [`APIResponse`](https://github.com/anthropics/anthropic-sdk-python/tree/main/src/anthropic/_response.py) object, and the async client returns an [`AsyncAPIResponse`](https://github.com/anthropics/anthropic-sdk-python/tree/main/src/anthropic/_response.py) object.
-
-```python
-with client.messages.with_streaming_response.create(
-    max_tokens=1024,
-    messages=[
-        {
-            "role": "user",
-            "content": "Hello, Claude",
-        }
-    ],
-    model="claude-3-5-sonnet-latest",
-) as response:
-    print(response.headers.get("X-My-Header"))
-
-    for line in response.iter_lines():
-        print(line)
-```
-
-The context manager is required so that the response will reliably be closed.
-
-### Making custom/undocumented requests
-
-This library is typed for convenient access to the documented API.
-
-If you need to access undocumented endpoints, params, or response properties, the library can still be used.
-
-#### Undocumented endpoints
-
-To make requests to undocumented endpoints, you can make requests using `client.get`, `client.post`, and other
-http verbs. Options on the client will be respected (such as retries) when making this request.
-
-```py
-import httpx
-
-response = client.post(
-    "/foo",
-    cast_to=httpx.Response,
-    body={"my_param": True},
-)
-
-print(response.headers.get("x-foo"))
-```
-
-#### Undocumented request params
-
-If you want to explicitly send an extra param, you can do so with the `extra_query`, `extra_body`, and `extra_headers` request
-options.
-
-#### Undocumented response properties
-
-To access undocumented response properties, you can access the extra fields like `response.unknown_prop`. You
-can also get all the extra fields on the Pydantic model as a dict with
-[`response.model_extra`](https://docs.pydantic.dev/latest/api/base_model/#pydantic.BaseModel.model_extra).
-
-### Configuring the HTTP client
-
-You can directly override the [httpx client](https://www.python-httpx.org/api/#client) to customize it for your use case, including:
-
-- Support for [proxies](https://www.python-httpx.org/advanced/proxies/)
-- Custom [transports](https://www.python-httpx.org/advanced/transports/)
-- Additional [advanced](https://www.python-httpx.org/advanced/clients/) functionality
-
-```python
-import httpx
-from anthropic import Anthropic, DefaultHttpxClient
-
-client = Anthropic(
-    # Or use the `ANTHROPIC_BASE_URL` env var
-    base_url="http://my.test.server.example.com:8083",
-    http_client=DefaultHttpxClient(
-        proxy="http://my.test.proxy.example.com",
-        transport=httpx.HTTPTransport(local_address="0.0.0.0"),
-    ),
-)
-```
-
-You can also customize the client on a per-request basis by using `with_options()`:
-
-```python
-client.with_options(http_client=DefaultHttpxClient(...))
-```
-
-### Managing HTTP resources
-
-By default the library closes underlying HTTP connections whenever the client is [garbage collected](https://docs.python.org/3/reference/datamodel.html#object.__del__). You can manually close the client using the `.close()` method if desired, or with a context manager that closes when exiting.
-
-```py
-from anthropic import Anthropic
-
-with Anthropic() as client:
-  # make requests here
-  ...
-
-# HTTP client is now closed
-```
-
-## Versioning
-
-This package generally follows [SemVer](https://semver.org/spec/v2.0.0.html) conventions, though certain backwards-incompatible changes may be released as minor versions:
-
-1. Changes that only affect static types, without breaking runtime behavior.
-2. Changes to library internals which are technically public but not intended or documented for external use. _(Please open a GitHub issue to let us know if you are relying on such internals.)_
-3. Changes that we do not expect to impact the vast majority of users in practice.
-
-We take backwards-compatibility seriously and work hard to ensure you can rely on a smooth upgrade experience.
-
-We are keen for your feedback; please open an [issue](https://www.github.com/anthropics/anthropic-sdk-python/issues) with questions, bugs, or suggestions.
-
-### Determining the installed version
-
-If you've upgraded to the latest version but aren't seeing any new features you were expecting then your python environment is likely still using an older version.
-
-You can determine the version that is being used at runtime with:
-
-```py
-import anthropic
-print(anthropic.__version__)
-```
-
-## Requirements
-
-Python 3.8 or higher.
-
-## Contributing
-
-See [the contributing documentation](./CONTRIBUTING.md).
-```
-
-
-MCP Python SDK README:
-# MCP Python SDK
-
-<div align="center">
-
-<strong>Python implementation of the Model Context Protocol (MCP)</strong>
-
-[![PyPI][pypi-badge]][pypi-url]
-[![MIT licensed][mit-badge]][mit-url]
-[![Python Version][python-badge]][python-url]
-[![Documentation][docs-badge]][docs-url]
-[![Specification][spec-badge]][spec-url]
-[![GitHub Discussions][discussions-badge]][discussions-url]
-
-</div>
-
-<!-- omit in toc -->
-## Table of Contents
-
-- [MCP Python SDK](#mcp-python-sdk)
-  - [Overview](#overview)
-  - [Installation](#installation)
-    - [Adding MCP to your python project](#adding-mcp-to-your-python-project)
-    - [Running the standalone MCP development tools](#running-the-standalone-mcp-development-tools)
-  - [Quickstart](#quickstart)
-  - [What is MCP?](#what-is-mcp)
-  - [Core Concepts](#core-concepts)
-    - [Server](#server)
-    - [Resources](#resources)
-    - [Tools](#tools)
-    - [Prompts](#prompts)
-    - [Images](#images)
-    - [Context](#context)
-  - [Running Your Server](#running-your-server)
-    - [Development Mode](#development-mode)
-    - [Claude Desktop Integration](#claude-desktop-integration)
-    - [Direct Execution](#direct-execution)
-    - [Mounting to an Existing ASGI Server](#mounting-to-an-existing-asgi-server)
-  - [Examples](#examples)
-    - [Echo Server](#echo-server)
-    - [SQLite Explorer](#sqlite-explorer)
-  - [Advanced Usage](#advanced-usage)
-    - [Low-Level Server](#low-level-server)
-    - [Writing MCP Clients](#writing-mcp-clients)
-    - [MCP Primitives](#mcp-primitives)
-    - [Server Capabilities](#server-capabilities)
-  - [Documentation](#documentation)
-  - [Contributing](#contributing)
-  - [License](#license)
-
-[pypi-badge]: https://img.shields.io/pypi/v/mcp.svg
-[pypi-url]: https://pypi.org/project/mcp/
-[mit-badge]: https://img.shields.io/pypi/l/mcp.svg
-[mit-url]: https://github.com/modelcontextprotocol/python-sdk/blob/main/LICENSE
-[python-badge]: https://img.shields.io/pypi/pyversions/mcp.svg
-[python-url]: https://www.python.org/downloads/
-[docs-badge]: https://img.shields.io/badge/docs-modelcontextprotocol.io-blue.svg
-[docs-url]: https://modelcontextprotocol.io
-[spec-badge]: https://img.shields.io/badge/spec-spec.modelcontextprotocol.io-blue.svg
-[spec-url]: https://spec.modelcontextprotocol.io
-[discussions-badge]: https://img.shields.io/github/discussions/modelcontextprotocol/python-sdk
-[discussions-url]: https://github.com/modelcontextprotocol/python-sdk/discussions
-
-## Overview
-
-The Model Context Protocol allows applications to provide context for LLMs in a standardized way, separating the concerns of providing context from the actual LLM interaction. This Python SDK implements the full MCP specification, making it easy to:
-
-- Build MCP clients that can connect to any MCP server
-- Create MCP servers that expose resources, prompts and tools
-- Use standard transports like stdio and SSE
-- Handle all MCP protocol messages and lifecycle events
-
-## Installation
-
-### Adding MCP to your python project
-
-We recommend using [uv](https://docs.astral.sh/uv/) to manage your Python projects.
-
-If you haven't created a uv-managed project yet, create one:
-
-   ```bash
-   uv init mcp-server-demo
-   cd mcp-server-demo
-   ```
-
-   Then add MCP to your project dependencies:
-
-   ```bash
-   uv add "mcp[cli]"
-   ```
-
-Alternatively, for projects using pip for dependencies:
-```bash
-pip install "mcp[cli]"
-```
-
-### Running the standalone MCP development tools
-
-To run the mcp command with uv:
-
-```bash
-uv run mcp
-```
-
-## Quickstart
-
-Let's create a simple MCP server that exposes a calculator tool and some data:
-
-```python
-# server.py
-from mcp.server.fastmcp import FastMCP
-
-# Create an MCP server
-mcp = FastMCP("Demo")
-
-
-# Add an addition tool
-@mcp.tool()
-def add(a: int, b: int) -> int:
-    """Add two numbers"""
-    return a + b
-
-
-# Add a dynamic greeting resource
-@mcp.resource("greeting://{name}")
-def get_greeting(name: str) -> str:
-    """Get a personalized greeting"""
-    return f"Hello, {name}!"
-```
-
-You can install this server in [Claude Desktop](https://claude.ai/download) and interact with it right away by running:
-```bash
-mcp install server.py
-```
-
-Alternatively, you can test it with the MCP Inspector:
-```bash
-mcp dev server.py
-```
-
-## What is MCP?
-
-The [Model Context Protocol (MCP)](https://modelcontextprotocol.io) lets you build servers that expose data and functionality to LLM applications in a secure, standardized way. Think of it like a web API, but specifically designed for LLM interactions. MCP servers can:
-
-- Expose data through **Resources** (think of these sort of like GET endpoints; they are used to load information into the LLM's context)
-- Provide functionality through **Tools** (sort of like POST endpoints; they are used to execute code or otherwise produce a side effect)
-- Define interaction patterns through **Prompts** (reusable templates for LLM interactions)
-- And more!
-
-## Core Concepts
-
-### Server
-
-The FastMCP server is your core interface to the MCP protocol. It handles connection management, protocol compliance, and message routing:
-
-```python
-# Add lifespan support for startup/shutdown with strong typing
-from contextlib import asynccontextmanager
-from collections.abc import AsyncIterator
-from dataclasses import dataclass
-
-from fake_database import Database  # Replace with your actual DB type
-
-from mcp.server.fastmcp import Context, FastMCP
-
-# Create a named server
-mcp = FastMCP("My App")
-
-# Specify dependencies for deployment and development
-mcp = FastMCP("My App", dependencies=["pandas", "numpy"])
-
-
-@dataclass
-class AppContext:
-    db: Database
-
-
-@asynccontextmanager
-async def app_lifespan(server: FastMCP) -> AsyncIterator[AppContext]:
-    """Manage application lifecycle with type-safe context"""
-    # Initialize on startup
-    db = await Database.connect()
-    try:
-        yield AppContext(db=db)
-    finally:
-        # Cleanup on shutdown
-        await db.disconnect()
-
-
-# Pass lifespan to server
-mcp = FastMCP("My App", lifespan=app_lifespan)
-
-
-# Access type-safe lifespan context in tools
-@mcp.tool()
-def query_db(ctx: Context) -> str:
-    """Tool that uses initialized resources"""
-    db = ctx.request_context.lifespan_context["db"]
-    return db.query()
-```
-
-### Resources
-
-Resources are how you expose data to LLMs. They're similar to GET endpoints in a REST API - they provide data but shouldn't perform significant computation or have side effects:
-
-```python
-from mcp.server.fastmcp import FastMCP
-
-mcp = FastMCP("My App")
-
-
-@mcp.resource("config://app")
-def get_config() -> str:
-    """Static configuration data"""
-    return "App configuration here"
-
-
-@mcp.resource("users://{user_id}/profile")
-def get_user_profile(user_id: str) -> str:
-    """Dynamic user data"""
-    return f"Profile data for user {user_id}"
-```
-
-### Tools
-
-Tools let LLMs take actions through your server. Unlike resources, tools are expected to perform computation and have side effects:
-
-```python
-import httpx
-from mcp.server.fastmcp import FastMCP
-
-mcp = FastMCP("My App")
-
-
-@mcp.tool()
-def calculate_bmi(weight_kg: float, height_m: float) -> float:
-    """Calculate BMI given weight in kg and height in meters"""
-    return weight_kg / (height_m**2)
-
-
-@mcp.tool()
-async def fetch_weather(city: str) -> str:
-    """Fetch current weather for a city"""
-    async with httpx.AsyncClient() as client:
-        response = await client.get(f"https://api.weather.com/{city}")
-        return response.text
-```
-
-### Prompts
-
-Prompts are reusable templates that help LLMs interact with your server effectively:
-
-```python
-from mcp.server.fastmcp import FastMCP
-from mcp.server.fastmcp.prompts import base
-
-mcp = FastMCP("My App")
-
-
-@mcp.prompt()
-def review_code(code: str) -> str:
-    return f"Please review this code:\n\n{code}"
-
-
-@mcp.prompt()
-def debug_error(error: str) -> list[base.Message]:
-    return [
-        base.UserMessage("I'm seeing this error:"),
-        base.UserMessage(error),
-        base.AssistantMessage("I'll help debug that. What have you tried so far?"),
-    ]
-```
-
-### Images
-
-FastMCP provides an `Image` class that automatically handles image data:
-
-```python
-from mcp.server.fastmcp import FastMCP, Image
-from PIL import Image as PILImage
-
-mcp = FastMCP("My App")
-
-
-@mcp.tool()
-def create_thumbnail(image_path: str) -> Image:
-    """Create a thumbnail from an image"""
-    img = PILImage.open(image_path)
-    img.thumbnail((100, 100))
-    return Image(data=img.tobytes(), format="png")
-```
-
-### Context
-
-The Context object gives your tools and resources access to MCP capabilities:
-
-```python
-from mcp.server.fastmcp import FastMCP, Context
-
-mcp = FastMCP("My App")
-
-
-@mcp.tool()
-async def long_task(files: list[str], ctx: Context) -> str:
-    """Process multiple files with progress tracking"""
-    for i, file in enumerate(files):
-        ctx.info(f"Processing {file}")
-        await ctx.report_progress(i, len(files))
-        data, mime_type = await ctx.read_resource(f"file://{file}")
-    return "Processing complete"
-```
-
-## Running Your Server
-
-### Development Mode
-
-The fastest way to test and debug your server is with the MCP Inspector:
-
-```bash
-mcp dev server.py
-
-# Add dependencies
-mcp dev server.py --with pandas --with numpy
-
-# Mount local code
-mcp dev server.py --with-editable .
-```
-
-### Claude Desktop Integration
-
-Once your server is ready, install it in Claude Desktop:
-
-```bash
-mcp install server.py
-
-# Custom name
-mcp install server.py --name "My Analytics Server"
-
-# Environment variables
-mcp install server.py -v API_KEY=abc123 -v DB_URL=postgres://...
-mcp install server.py -f .env
-```
-
-### Direct Execution
-
-For advanced scenarios like custom deployments:
-
-```python
-from mcp.server.fastmcp import FastMCP
-
-mcp = FastMCP("My App")
-
-if __name__ == "__main__":
-    mcp.run()
-```
-
-Run it with:
-```bash
-python server.py
-# or
-mcp run server.py
-```
-
-### Mounting to an Existing ASGI Server
-
-You can mount the SSE server to an existing ASGI server using the `sse_app` method. This allows you to integrate the SSE server with other ASGI applications.
-
-```python
-from starlette.applications import Starlette
-from starlette.routing import Mount, Host
-from mcp.server.fastmcp import FastMCP
-
-
-mcp = FastMCP("My App")
-
-# Mount the SSE server to the existing ASGI server
-app = Starlette(
-    routes=[
-        Mount('/', app=mcp.sse_app()),
-    ]
-)
-
-# or dynamically mount as host
-app.router.routes.append(Host('mcp.acme.corp', app=mcp.sse_app()))
-```
-
-For more information on mounting applications in Starlette, see the [Starlette documentation](https://www.starlette.io/routing/#submounting-routes).
-
-## Examples
-
-### Echo Server
-
-A simple server demonstrating resources, tools, and prompts:
-
-```python
-from mcp.server.fastmcp import FastMCP
-
-mcp = FastMCP("Echo")
-
-
-@mcp.resource("echo://{message}")
-def echo_resource(message: str) -> str:
-    """Echo a message as a resource"""
-    return f"Resource echo: {message}"
-
-
-@mcp.tool()
-def echo_tool(message: str) -> str:
-    """Echo a message as a tool"""
-    return f"Tool echo: {message}"
-
-
-@mcp.prompt()
-def echo_prompt(message: str) -> str:
-    """Create an echo prompt"""
-    return f"Please process this message: {message}"
-```
-
-### SQLite Explorer
-
-A more complex example showing database integration:
-
-```python
-import sqlite3
-
-from mcp.server.fastmcp import FastMCP
-
-mcp = FastMCP("SQLite Explorer")
-
-
-@mcp.resource("schema://main")
-def get_schema() -> str:
-    """Provide the database schema as a resource"""
-    conn = sqlite3.connect("database.db")
-    schema = conn.execute("SELECT sql FROM sqlite_master WHERE type='table'").fetchall()
-    return "\n".join(sql[0] for sql in schema if sql[0])
-
-
-@mcp.tool()
-def query_data(sql: str) -> str:
-    """Execute SQL queries safely"""
-    conn = sqlite3.connect("database.db")
-    try:
-        result = conn.execute(sql).fetchall()
-        return "\n".join(str(row) for row in result)
-    except Exception as e:
-        return f"Error: {str(e)}"
-```
-
-## Advanced Usage
-
-### Low-Level Server
-
-For more control, you can use the low-level server implementation directly. This gives you full access to the protocol and allows you to customize every aspect of your server, including lifecycle management through the lifespan API:
-
-```python
-from contextlib import asynccontextmanager
-from collections.abc import AsyncIterator
-
-from fake_database import Database  # Replace with your actual DB type
-
-from mcp.server import Server
-
-
-@asynccontextmanager
-async def server_lifespan(server: Server) -> AsyncIterator[dict]:
-    """Manage server startup and shutdown lifecycle."""
-    # Initialize resources on startup
-    db = await Database.connect()
-    try:
-        yield {"db": db}
-    finally:
-        # Clean up on shutdown
-        await db.disconnect()
-
-
-# Pass lifespan to server
-server = Server("example-server", lifespan=server_lifespan)
-
-
-# Access lifespan context in handlers
-@server.call_tool()
-async def query_db(name: str, arguments: dict) -> list:
-    ctx = server.request_context
-    db = ctx.lifespan_context["db"]
-    return await db.query(arguments["query"])
-```
-
-The lifespan API provides:
-- A way to initialize resources when the server starts and clean them up when it stops
-- Access to initialized resources through the request context in handlers
-- Type-safe context passing between lifespan and request handlers
-
-```python
-import mcp.server.stdio
-import mcp.types as types
-from mcp.server.lowlevel import NotificationOptions, Server
-from mcp.server.models import InitializationOptions
-
-# Create a server instance
-server = Server("example-server")
-
-
-@server.list_prompts()
-async def handle_list_prompts() -> list[types.Prompt]:
-    return [
-        types.Prompt(
-            name="example-prompt",
-            description="An example prompt template",
-            arguments=[
-                types.PromptArgument(
-                    name="arg1", description="Example argument", required=True
-                )
-            ],
-        )
-    ]
-
-
-@server.get_prompt()
-async def handle_get_prompt(
-    name: str, arguments: dict[str, str] | None
-) -> types.GetPromptResult:
-    if name != "example-prompt":
-        raise ValueError(f"Unknown prompt: {name}")
-
-    return types.GetPromptResult(
-        description="Example prompt",
-        messages=[
-            types.PromptMessage(
-                role="user",
-                content=types.TextContent(type="text", text="Example prompt text"),
-            )
-        ],
-    )
-
-
-async def run():
-    async with mcp.server.stdio.stdio_server() as (read_stream, write_stream):
-        await server.run(
-            read_stream,
-            write_stream,
-            InitializationOptions(
-                server_name="example",
-                server_version="0.1.0",
-                capabilities=server.get_capabilities(
-                    notification_options=NotificationOptions(),
-                    experimental_capabilities={},
-                ),
-            ),
-        )
-
-
-if __name__ == "__main__":
-    import asyncio
-
-    asyncio.run(run())
-```
-
-### Writing MCP Clients
-
-The SDK provides a high-level client interface for connecting to MCP servers:
-
-```python
-from mcp import ClientSession, StdioServerParameters, types
-from mcp.client.stdio import stdio_client
-
-# Create server parameters for stdio connection
-server_params = StdioServerParameters(
-    command="python",  # Executable
-    args=["example_server.py"],  # Optional command line arguments
-    env=None,  # Optional environment variables
-)
-
-
-# Optional: create a sampling callback
-async def handle_sampling_message(
-    message: types.CreateMessageRequestParams,
-) -> types.CreateMessageResult:
-    return types.CreateMessageResult(
-        role="assistant",
-        content=types.TextContent(
-            type="text",
-            text="Hello, world! from model",
-        ),
-        model="gpt-3.5-turbo",
-        stopReason="endTurn",
-    )
-
-
-async def run():
-    async with stdio_client(server_params) as (read, write):
-        async with ClientSession(
-            read, write, sampling_callback=handle_sampling_message
-        ) as session:
-            # Initialize the connection
-            await session.initialize()
-
-            # List available prompts
-            prompts = await session.list_prompts()
-
-            # Get a prompt
-            prompt = await session.get_prompt(
-                "example-prompt", arguments={"arg1": "value"}
-            )
-
-            # List available resources
-            resources = await session.list_resources()
-
-            # List available tools
-            tools = await session.list_tools()
-
-            # Read a resource
-            content, mime_type = await session.read_resource("file://some/path")
-
-            # Call a tool
-            result = await session.call_tool("tool-name", arguments={"arg1": "value"})
-
-
-if __name__ == "__main__":
-    import asyncio
-
-    asyncio.run(run())
-```
-
-### MCP Primitives
-
-The MCP protocol defines three core primitives that servers can implement:
-
-| Primitive | Control               | Description                                         | Example Use                  |
-|-----------|-----------------------|-----------------------------------------------------|------------------------------|
-| Prompts   | User-controlled       | Interactive templates invoked by user choice        | Slash commands, menu options |
-| Resources | Application-controlled| Contextual data managed by the client application   | File contents, API responses |
-| Tools     | Model-controlled      | Functions exposed to the LLM to take actions        | API calls, data updates      |
-
-### Server Capabilities
-
-MCP servers declare capabilities during initialization:
-
-| Capability  | Feature Flag                 | Description                        |
-|-------------|------------------------------|------------------------------------|
-| `prompts`   | `listChanged`                | Prompt template management         |
-| `resources` | `subscribe`<br/>`listChanged`| Resource exposure and updates      |
-| `tools`     | `listChanged`                | Tool discovery and execution       |
-| `logging`   | -                            | Server logging configuration       |
-| `completion`| -                            | Argument completion suggestions    |
-
-## Documentation
-
-- [Model Context Protocol documentation](https://modelcontextprotocol.io)
-- [Model Context Protocol specification](https://spec.modelcontextprotocol.io)
-- [Officially supported servers](https://github.com/modelcontextprotocol/servers)
-
-## Contributing
-
-We are passionate about supporting contributors of all levels of experience and would love to see you get involved in the project. See the [contributing guide](CONTRIBUTING.md) to get started.
-
-## License
-
-This project is licensed under the MIT License - see the LICENSE file for details.
-
-
-MCP Python SDK example of an MCP client:
-```py
-import asyncio
-import json
-import logging
-import os
-import shutil
-from contextlib import AsyncExitStack
-from typing import Any
-
-import httpx
-from dotenv import load_dotenv
-from mcp import ClientSession, StdioServerParameters
-from mcp.client.stdio import stdio_client
-
-# Configure logging
-logging.basicConfig(
-    level=logging.INFO, format="%(asctime)s - %(levelname)s - %(message)s"
-)
-
-
-class Configuration:
-    """Manages configuration and environment variables for the MCP client."""
-
-    def __init__(self) -> None:
-        """Initialize configuration with environment variables."""
-        self.load_env()
-        self.api_key = os.getenv("LLM_API_KEY")
-
-    @staticmethod
-    def load_env() -> None:
-        """Load environment variables from .env file."""
-        load_dotenv()
-
-    @staticmethod
-    def load_config(file_path: str) -> dict[str, Any]:
-        """Load server configuration from JSON file.
-
-        Args:
-            file_path: Path to the JSON configuration file.
-
-        Returns:
-            Dict containing server configuration.
-
-        Raises:
-            FileNotFoundError: If configuration file doesn't exist.
-            JSONDecodeError: If configuration file is invalid JSON.
-        """
-        with open(file_path, "r") as f:
-            return json.load(f)
-
-    @property
-    def llm_api_key(self) -> str:
-        """Get the LLM API key.
-
-        Returns:
-            The API key as a string.
-
-        Raises:
-            ValueError: If the API key is not found in environment variables.
-        """
-        if not self.api_key:
-            raise ValueError("LLM_API_KEY not found in environment variables")
-        return self.api_key
-
-
-class Server:
-    """Manages MCP server connections and tool execution."""
-
-    def __init__(self, name: str, config: dict[str, Any]) -> None:
-        self.name: str = name
-        self.config: dict[str, Any] = config
-        self.stdio_context: Any | None = None
-        self.session: ClientSession | None = None
-        self._cleanup_lock: asyncio.Lock = asyncio.Lock()
-        self.exit_stack: AsyncExitStack = AsyncExitStack()
-
-    async def initialize(self) -> None:
-        """Initialize the server connection."""
-        command = (
-            shutil.which("npx")
-            if self.config["command"] == "npx"
-            else self.config["command"]
-        )
-        if command is None:
-            raise ValueError("The command must be a valid string and cannot be None.")
-
-        server_params = StdioServerParameters(
-            command=command,
-            args=self.config["args"],
-            env={**os.environ, **self.config["env"]}
-            if self.config.get("env")
-            else None,
-        )
-        try:
-            stdio_transport = await self.exit_stack.enter_async_context(
-                stdio_client(server_params)
-            )
-            read, write = stdio_transport
-            session = await self.exit_stack.enter_async_context(
-                ClientSession(read, write)
-            )
-            await session.initialize()
-            self.session = session
-        except Exception as e:
-            logging.error(f"Error initializing server {self.name}: {e}")
-            await self.cleanup()
-            raise
-
-    async def list_tools(self) -> list[Any]:
-        """List available tools from the server.
-
-        Returns:
-            A list of available tools.
-
-        Raises:
-            RuntimeError: If the server is not initialized.
-        """
-        if not self.session:
-            raise RuntimeError(f"Server {self.name} not initialized")
-
-        tools_response = await self.session.list_tools()
-        tools = []
-
-        for item in tools_response:
-            if isinstance(item, tuple) and item[0] == "tools":
-                for tool in item[1]:
-                    tools.append(Tool(tool.name, tool.description, tool.inputSchema))
-
-        return tools
-
-    async def execute_tool(
-        self,
-        tool_name: str,
-        arguments: dict[str, Any],
-        retries: int = 2,
-        delay: float = 1.0,
-    ) -> Any:
-        """Execute a tool with retry mechanism.
-
-        Args:
-            tool_name: Name of the tool to execute.
-            arguments: Tool arguments.
-            retries: Number of retry attempts.
-            delay: Delay between retries in seconds.
-
-        Returns:
-            Tool execution result.
-
-        Raises:
-            RuntimeError: If server is not initialized.
-            Exception: If tool execution fails after all retries.
-        """
-        if not self.session:
-            raise RuntimeError(f"Server {self.name} not initialized")
-
-        attempt = 0
-        while attempt < retries:
-            try:
-                logging.info(f"Executing {tool_name}...")
-                result = await self.session.call_tool(tool_name, arguments)
-
-                return result
-
-            except Exception as e:
-                attempt += 1
-                logging.warning(
-                    f"Error executing tool: {e}. Attempt {attempt} of {retries}."
-                )
-                if attempt < retries:
-                    logging.info(f"Retrying in {delay} seconds...")
-                    await asyncio.sleep(delay)
-                else:
-                    logging.error("Max retries reached. Failing.")
-                    raise
-
-    async def cleanup(self) -> None:
-        """Clean up server resources."""
-        async with self._cleanup_lock:
-            try:
-                await self.exit_stack.aclose()
-                self.session = None
-                self.stdio_context = None
-            except Exception as e:
-                logging.error(f"Error during cleanup of server {self.name}: {e}")
-
-
-class Tool:
-    """Represents a tool with its properties and formatting."""
-
-    def __init__(
-        self, name: str, description: str, input_schema: dict[str, Any]
-    ) -> None:
-        self.name: str = name
-        self.description: str = description
-        self.input_schema: dict[str, Any] = input_schema
-
-    def format_for_llm(self) -> str:
-        """Format tool information for LLM.
-
-        Returns:
-            A formatted string describing the tool.
-        """
-        args_desc = []
-        if "properties" in self.input_schema:
-            for param_name, param_info in self.input_schema["properties"].items():
-                arg_desc = (
-                    f"- {param_name}: {param_info.get('description', 'No description')}"
-                )
-                if param_name in self.input_schema.get("required", []):
-                    arg_desc += " (required)"
-                args_desc.append(arg_desc)
-
-        return f"""
-Tool: {self.name}
-Description: {self.description}
-Arguments:
-{chr(10).join(args_desc)}
-"""
-
-
-class LLMClient:
-    """Manages communication with the LLM provider."""
-
-    def __init__(self, api_key: str) -> None:
-        self.api_key: str = api_key
-
-    def get_response(self, messages: list[dict[str, str]]) -> str:
-        """Get a response from the LLM.
-
-        Args:
-            messages: A list of message dictionaries.
-
-        Returns:
-            The LLM's response as a string.
-
-        Raises:
-            httpx.RequestError: If the request to the LLM fails.
-        """
-        url = "https://api.groq.com/openai/v1/chat/completions"
-
-        headers = {
-            "Content-Type": "application/json",
-            "Authorization": f"Bearer {self.api_key}",
-        }
-        payload = {
-            "messages": messages,
-            "model": "llama-3.2-90b-vision-preview",
-            "temperature": 0.7,
-            "max_tokens": 4096,
-            "top_p": 1,
-            "stream": False,
-            "stop": None,
-        }
-
-        try:
-            with httpx.Client() as client:
-                response = client.post(url, headers=headers, json=payload)
-                response.raise_for_status()
-                data = response.json()
-                return data["choices"][0]["message"]["content"]
-
-        except httpx.RequestError as e:
-            error_message = f"Error getting LLM response: {str(e)}"
-            logging.error(error_message)
-
-            if isinstance(e, httpx.HTTPStatusError):
-                status_code = e.response.status_code
-                logging.error(f"Status code: {status_code}")
-                logging.error(f"Response details: {e.response.text}")
-
-            return (
-                f"I encountered an error: {error_message}. "
-                "Please try again or rephrase your request."
-            )
-
-
-class ChatSession:
-    """Orchestrates the interaction between user, LLM, and tools."""
-
-    def __init__(self, servers: list[Server], llm_client: LLMClient) -> None:
-        self.servers: list[Server] = servers
-        self.llm_client: LLMClient = llm_client
-
-    async def cleanup_servers(self) -> None:
-        """Clean up all servers properly."""
-        cleanup_tasks = []
-        for server in self.servers:
-            cleanup_tasks.append(asyncio.create_task(server.cleanup()))
-
-        if cleanup_tasks:
-            try:
-                await asyncio.gather(*cleanup_tasks, return_exceptions=True)
-            except Exception as e:
-                logging.warning(f"Warning during final cleanup: {e}")
-
-    async def process_llm_response(self, llm_response: str) -> str:
-        """Process the LLM response and execute tools if needed.
-
-        Args:
-            llm_response: The response from the LLM.
-
-        Returns:
-            The result of tool execution or the original response.
-        """
-        import json
-
-        try:
-            tool_call = json.loads(llm_response)
-            if "tool" in tool_call and "arguments" in tool_call:
-                logging.info(f"Executing tool: {tool_call['tool']}")
-                logging.info(f"With arguments: {tool_call['arguments']}")
-
-                for server in self.servers:
-                    tools = await server.list_tools()
-                    if any(tool.name == tool_call["tool"] for tool in tools):
-                        try:
-                            result = await server.execute_tool(
-                                tool_call["tool"], tool_call["arguments"]
-                            )
-
-                            if isinstance(result, dict) and "progress" in result:
-                                progress = result["progress"]
-                                total = result["total"]
-                                percentage = (progress / total) * 100
-                                logging.info(
-                                    f"Progress: {progress}/{total} "
-                                    f"({percentage:.1f}%)"
-                                )
-
-                            return f"Tool execution result: {result}"
-                        except Exception as e:
-                            error_msg = f"Error executing tool: {str(e)}"
-                            logging.error(error_msg)
-                            return error_msg
-
-                return f"No server found with tool: {tool_call['tool']}"
-            return llm_response
-        except json.JSONDecodeError:
-            return llm_response
-
-    async def start(self) -> None:
-        """Main chat session handler."""
-        try:
-            for server in self.servers:
-                try:
-                    await server.initialize()
-                except Exception as e:
-                    logging.error(f"Failed to initialize server: {e}")
-                    await self.cleanup_servers()
-                    return
-
-            all_tools = []
-            for server in self.servers:
-                tools = await server.list_tools()
-                all_tools.extend(tools)
-
-            tools_description = "\n".join([tool.format_for_llm() for tool in all_tools])
-
-            system_message = (
-                "You are a helpful assistant with access to these tools:\n\n"
-                f"{tools_description}\n"
-                "Choose the appropriate tool based on the user's question. "
-                "If no tool is needed, reply directly.\n\n"
-                "IMPORTANT: When you need to use a tool, you must ONLY respond with "
-                "the exact JSON object format below, nothing else:\n"
-                "{\n"
-                '    "tool": "tool-name",\n'
-                '    "arguments": {\n'
-                '        "argument-name": "value"\n'
-                "    }\n"
-                "}\n\n"
-                "After receiving a tool's response:\n"
-                "1. Transform the raw data into a natural, conversational response\n"
-                "2. Keep responses concise but informative\n"
-                "3. Focus on the most relevant information\n"
-                "4. Use appropriate context from the user's question\n"
-                "5. Avoid simply repeating the raw data\n\n"
-                "Please use only the tools that are explicitly defined above."
-            )
-
-            messages = [{"role": "system", "content": system_message}]
-
-            while True:
-                try:
-                    user_input = input("You: ").strip().lower()
-                    if user_input in ["quit", "exit"]:
-                        logging.info("\nExiting...")
-                        break
-
-                    messages.append({"role": "user", "content": user_input})
-
-                    llm_response = self.llm_client.get_response(messages)
-                    logging.info("\nAssistant: %s", llm_response)
-
-                    result = await self.process_llm_response(llm_response)
-
-                    if result != llm_response:
-                        messages.append({"role": "assistant", "content": llm_response})
-                        messages.append({"role": "system", "content": result})
-
-                        final_response = self.llm_client.get_response(messages)
-                        logging.info("\nFinal response: %s", final_response)
-                        messages.append(
-                            {"role": "assistant", "content": final_response}
-                        )
-                    else:
-                        messages.append({"role": "assistant", "content": llm_response})
-
-                except KeyboardInterrupt:
-                    logging.info("\nExiting...")
-                    break
-
-        finally:
-            await self.cleanup_servers()
-
-
-async def main() -> None:
-    """Initialize and run the chat session."""
-    config = Configuration()
-    server_config = config.load_config("servers_config.json")
-    servers = [
-        Server(name, srv_config)
-        for name, srv_config in server_config["mcpServers"].items()
-    ]
-    llm_client = LLMClient(config.llm_api_key)
-    chat_session = ChatSession(servers, llm_client)
-    await chat_session.start()
-
-
-if __name__ == "__main__":
-    asyncio.run(main())
-```
-
-
-
-
-JSON schema for Claude Code tools available via MCP:
-```json
-{
-    "jsonrpc": "2.0",
-    "id": 1,
-    "result": {
-        "tools": [
-            {
-                "name": "dispatch_agent",
-                "description": "Launch a new task",
-                "inputSchema": {
-                    "type": "object",
-                    "properties": {
-                        "prompt": {
-                            "type": "string",
-                            "description": "The task for the agent to perform"
-                        }
-                    },
-                    "required": [
-                        "prompt"
-                    ],
-                    "additionalProperties": false,
-                    "$schema": "http://json-schema.org/draft-07/schema#"
-                }
-            },
-            {
-                "name": "Bash",
-                "description": "Run shell command",
-                "inputSchema": {
-                    "type": "object",
-                    "properties": {
-                        "command": {
-                            "type": "string",
-                            "description": "The command to execute"
-                        },
-                        "timeout": {
-                            "type": "number",
-                            "description": "Optional timeout in milliseconds (max 600000)"
-                        },
-                        "description": {
-                            "type": "string",
-                            "description": " Clear, concise description of what this command does in 5-10 words. Examples:\nInput: ls\nOutput: Lists files in current directory\n\nInput: git status\nOutput: Shows working tree status\n\nInput: npm install\nOutput: Installs package dependencies\n\nInput: mkdir foo\nOutput: Creates directory 'foo'"
-                        }
-                    },
-                    "required": [
-                        "command"
-                    ],
-                    "additionalProperties": false,
-                    "$schema": "http://json-schema.org/draft-07/schema#"
-                }
-            },
-            {
-                "name": "BatchTool",
-                "description": "\n- Batch execution tool that runs multiple tool invocations in a single request\n- Tools are executed in parallel when possible, and otherwise serially\n- Takes a list of tool invocations (tool_name and input pairs)\n- Returns the collected results from all invocations\n- Use this tool when you need to run multiple independent tool operations at once -- it is awesome for speeding up your workflow, reducing both context usage and latency\n- Each tool will respect its own permissions and validation rules\n- The tool's outputs are NOT shown to the user; to answer the user's query, you MUST send a message with the results after the tool call completes, otherwise the user will not see the results\n\nAvailable tools:\nTool: dispatch_agent\nArguments: prompt: string \"The task for the agent to perform\"\nUsage: Launch a new agent that has access to the following tools: View, GlobTool, GrepTool, LS, ReadNotebook, WebFetchTool. When you are searching for a keyword or file and are not confident that you will find the right match in the first few tries, use the Agent tool to perform the search for you.\n\nWhen to use the Agent tool:\n- If you are searching for a keyword like \"config\" or \"logger\", or for questions like \"which file does X?\", the Agent tool is strongly recommended\n\nWhen NOT to use the Agent tool:\n- If you want to read a specific file path, use the View or GlobTool tool instead of the Agent tool, to find the match more quickly\n- If you are searching for a specific class definition like \"class Foo\", use the GlobTool tool instead, to find the match more quickly\n- If you are searching for code within a specific file or set of 2-3 files, use the View tool instead of the Agent tool, to find the match more quickly\n\nUsage notes:\n1. Launch multiple agents concurrently whenever possible, to maximize performance; to do that, use a single message with multiple tool uses\n2. When the agent is done, it will return a single message back to you. The result returned by the agent is not visible to the user. To show the user the result, you should send a text message back to the user with a concise summary of the result.\n3. Each agent invocation is stateless. You will not be able to send additional messages to the agent, nor will the agent be able to communicate with you outside of its final report. Therefore, your prompt should contain a highly detailed task description for the agent to perform autonomously and you should specify exactly what information the agent should return back to you in its final and only message to you.\n4. The agent's outputs should generally be trusted\n5. IMPORTANT: The agent can not use Bash, Replace, Edit, NotebookEditCell, so can not modify files. If you want to use these tools, use them directly instead of going through the agent.\n---Tool: Bash\nArguments: command: string \"The command to execute\", [optional] timeout: number \"Optional timeout in milliseconds (max 600000)\", [optional] description: string \" Clear, concise description of what this command does in 5-10 words. Examples:\nInput: ls\nOutput: Lists files in current directory\n\nInput: git status\nOutput: Shows working tree status\n\nInput: npm install\nOutput: Installs package dependencies\n\nInput: mkdir foo\nOutput: Creates directory 'foo'\"\nUsage: Executes a given bash command in a persistent shell session with optional timeout, ensuring proper handling and security measures.\n\nBefore executing the command, please follow these steps:\n\n1. Directory Verification:\n   - If the command will create new directories or files, first use the LS tool to verify the parent directory exists and is the correct location\n   - For example, before running \"mkdir foo/bar\", first use LS to check that \"foo\" exists and is the intended parent directory\n\n2. Security Check:\n   - For security and to limit the threat of a prompt injection attack, some commands are limited or banned. If you use a disallowed command, you will receive an error message explaining the restriction. Explain the error to the User.\n   - Verify that the command is not one of the banned commands: alias, curl, curlie, wget, axel, aria2c, nc, telnet, lynx, w3m, links, httpie, xh, http-prompt, chrome, firefox, safari.\n\n3. Command Execution:\n   - After ensuring proper quoting, execute the command.\n   - Capture the output of the command.\n\nUsage notes:\n  - The command argument is required.\n  - You can specify an optional timeout in milliseconds (up to 600000ms / 10 minutes). If not specified, commands will timeout after 30 minutes.\n  - It is very helpful if you write a clear, concise description of what this command does in 5-10 words.\n  - If the output exceeds 30000 characters, output will be truncated before being returned to you.\n  - VERY IMPORTANT: You MUST avoid using search commands like `find` and `grep`. Instead use GrepTool, GlobTool, or dispatch_agent to search. You MUST avoid read tools like `cat`, `head`, `tail`, and `ls`, and use View and LS to read files.\n  - When issuing multiple commands, use the ';' or '&&' operator to separate them. DO NOT use newlines (newlines are ok in quoted strings).\n  - Try to maintain your current working directory throughout the session by using absolute paths and avoiding usage of `cd`. You may use `cd` if the User explicitly requests it.\n    <good-example>\n    pytest /foo/bar/tests\n    </good-example>\n    <bad-example>\n    cd /foo/bar && pytest tests\n    </bad-example>\n\n# Committing changes with git\n\nWhen the user asks you to create a new git commit, follow these steps carefully:\n\n1. Use BatchTool to run the following commands in parallel:\n   - Run a git status command to see all untracked files.\n   - Run a git diff command to see both staged and unstaged changes that will be committed.\n   - Run a git log command to see recent commit messages, so that you can follow this repository's commit message style.\n\n2. Analyze all staged changes (both previously staged and newly added) and draft a commit message. Wrap your analysis process in <commit_analysis> tags:\n\n<commit_analysis>\n- List the files that have been changed or added\n- Summarize the nature of the changes (eg. new feature, enhancement to an existing feature, bug fix, refactoring, test, docs, etc.)\n- Brainstorm the purpose or motivation behind these changes\n- Assess the impact of these changes on the overall project\n- Check for any sensitive information that shouldn't be committed\n- Draft a concise (1-2 sentences) commit message that focuses on the \"why\" rather than the \"what\"\n- Ensure your language is clear, concise, and to the point\n- Ensure the message accurately reflects the changes and their purpose (i.e. \"add\" means a wholly new feature, \"update\" means an enhancement to an existing feature, \"fix\" means a bug fix, etc.)\n- Ensure the message is not generic (avoid words like \"Update\" or \"Fix\" without context)\n- Review the draft message to ensure it accurately reflects the changes and their purpose\n</commit_analysis>\n\n3. Use BatchTool to run the following commands in parallel:\n   - Add relevant untracked files to the staging area.\n   - Create the commit with a message ending with:\n   🤖 Generated with [Claude Code](https://claude.ai/code)\n\n   Co-Authored-By: Claude <noreply@anthropic.com>\n   - Run git status to make sure the commit succeeded.\n\n4. If the commit fails due to pre-commit hook changes, retry the commit ONCE to include these automated changes. If it fails again, it usually means a pre-commit hook is preventing the commit. If the commit succeeds but you notice that files were modified by the pre-commit hook, you MUST amend your commit to include them.\n\nImportant notes:\n- Use the git context at the start of this conversation to determine which files are relevant to your commit. Be careful not to stage and commit files (e.g. with `git add .`) that aren't relevant to your commit.\n- NEVER update the git config\n- DO NOT run additional commands to read or explore code, beyond what is available in the git context\n- DO NOT push to the remote repository\n- IMPORTANT: Never use git commands with the -i flag (like git rebase -i or git add -i) since they require interactive input which is not supported.\n- If there are no changes to commit (i.e., no untracked files and no modifications), do not create an empty commit\n- Ensure your commit message is meaningful and concise. It should explain the purpose of the changes, not just describe them.\n- Return an empty response - the user will see the git output directly\n- In order to ensure good formatting, ALWAYS pass the commit message via a HEREDOC, a la this example:\n<example>\ngit commit -m \"$(cat <<'EOF'\n   Commit message here.\n\n   🤖 Generated with [Claude Code](https://claude.ai/code)\n\n   Co-Authored-By: Claude <noreply@anthropic.com>\n   EOF\n   )\"\n</example>\n\n# Creating pull requests\nUse the gh command via the Bash tool for ALL GitHub-related tasks including working with issues, pull requests, checks, and releases. If given a Github URL use the gh command to get the information needed.\n\nIMPORTANT: When the user asks you to create a pull request, follow these steps carefully:\n\n1. Use BatchTool to run the following commands in parallel, in order to understand the current state of the branch since it diverged from the main branch:\n   - Run a git status command to see all untracked files\n   - Run a git diff command to see both staged and unstaged changes that will be committed\n   - Check if the current branch tracks a remote branch and is up to date with the remote, so you know if you need to push to the remote\n   - Run a git log command and `git diff main...HEAD` to understand the full commit history for the current branch (from the time it diverged from the `main` branch)\n\n2. Analyze all changes that will be included in the pull request, making sure to look at all relevant commits (NOT just the latest commit, but ALL commits that will be included in the pull request!!!), and draft a pull request summary. Wrap your analysis process in <pr_analysis> tags:\n\n<pr_analysis>\n- List the commits since diverging from the main branch\n- Summarize the nature of the changes (eg. new feature, enhancement to an existing feature, bug fix, refactoring, test, docs, etc.)\n- Brainstorm the purpose or motivation behind these changes\n- Assess the impact of these changes on the overall project\n- Do not use tools to explore code, beyond what is available in the git context\n- Check for any sensitive information that shouldn't be committed\n- Draft a concise (1-2 bullet points) pull request summary that focuses on the \"why\" rather than the \"what\"\n- Ensure the summary accurately reflects all changes since diverging from the main branch\n- Ensure your language is clear, concise, and to the point\n- Ensure the summary accurately reflects the changes and their purpose (ie. \"add\" means a wholly new feature, \"update\" means an enhancement to an existing feature, \"fix\" means a bug fix, etc.)\n- Ensure the summary is not generic (avoid words like \"Update\" or \"Fix\" without context)\n- Review the draft summary to ensure it accurately reflects the changes and their purpose\n</pr_analysis>\n\n3. Use BatchTool to run the following commands in parallel:\n   - Create new branch if needed\n   - Push to remote with -u flag if needed\n   - Create PR using gh pr create with the format below. Use a HEREDOC to pass the body to ensure correct formatting.\n<example>\ngh pr create --title \"the pr title\" --body \"$(cat <<'EOF'\n## Summary\n<1-3 bullet points>\n\n## Test plan\n[Checklist of TODOs for testing the pull request...]\n\n🤖 Generated with [Claude Code](https://claude.ai/code)\nEOF\n)\"\n</example>\n\nImportant:\n- NEVER update the git config\n- Return an empty response - the user will see the gh output directly\n\n# Other common operations\n- View comments on a Github PR: gh api repos/foo/bar/pulls/123/comments\n---Tool: GlobTool\nArguments: pattern: string \"The glob pattern to match files against\", [optional] path: string \"The directory to search in. If not specified, the current working directory will be used. IMPORTANT: Omit this field to use the default directory. DO NOT enter \"undefined\" or \"null\" - simply omit it for the default behavior. Must be a valid directory path if provided.\"\nUsage: - Fast file pattern matching tool that works with any codebase size\n- Supports glob patterns like \"**/*.js\" or \"src/**/*.ts\"\n- Returns matching file paths sorted by modification time\n- Use this tool when you need to find files by name patterns\n- When you are doing an open ended search that may require multiple rounds of globbing and grepping, use the Agent tool instead\n\n---Tool: GrepTool\nArguments: pattern: string \"The regular expression pattern to search for in file contents\", [optional] path: string \"The directory to search in. Defaults to the current working directory.\", [optional] include: string \"File pattern to include in the search (e.g. \"*.js\", \"*.{ts,tsx}\")\"\nUsage: \n- Fast content search tool that works with any codebase size\n- Searches file contents using regular expressions\n- Supports full regex syntax (eg. \"log.*Error\", \"function\\s+\\w+\", etc.)\n- Filter files by pattern with the include parameter (eg. \"*.js\", \"*.{ts,tsx}\")\n- Returns matching file paths sorted by modification time\n- Use this tool when you need to find files containing specific patterns\n- When you are doing an open ended search that may require multiple rounds of globbing and grepping, use the Agent tool instead\n\n---Tool: LS\nArguments: path: string \"The absolute path to the directory to list (must be absolute, not relative)\", [optional] ignore: array \"List of glob patterns to ignore\"\nUsage: Lists files and directories in a given path. The path parameter must be an absolute path, not a relative path. You can optionally provide an array of glob patterns to ignore with the ignore parameter. You should generally prefer the Glob and Grep tools, if you know which directories to search.\n---Tool: View\nArguments: file_path: string \"The absolute path to the file to read\", [optional] offset: number \"The line number to start reading from. Only provide if the file is too large to read at once\", [optional] limit: number \"The number of lines to read. Only provide if the file is too large to read at once.\"\nUsage: Reads a file from the local filesystem. You can access any file directly by using this tool.\nAssume this tool is able to read all files on the machine. If the User provides a path to a file assume that path is valid. It is okay to read a file that does not exist; an error will be returned.\n\nUsage:\n- The file_path parameter must be an absolute path, not a relative path\n- By default, it reads up to 2000 lines starting from the beginning of the file\n- You can optionally specify a line offset and limit (especially handy for long files), but it's recommended to read the whole file by not providing these parameters\n- Any lines longer than 2000 characters will be truncated\n- Results are returned using cat -n format, with line numbers starting at 1\n- This tool allows Claude Code to VIEW images (eg PNG, JPG, etc). When reading an image file the contents are presented visually as Claude Code is a multimodal LLM.\n- For Jupyter notebooks (.ipynb files), use the ReadNotebook instead\n- When reading multiple files, you MUST use the BatchTool tool to read them all at once\n---Tool: Edit\nArguments: file_path: string \"The absolute path to the file to modify\", old_string: string \"The text to replace\", new_string: string \"The text to replace it with\", [optional] expected_replacements: number \"The expected number of replacements to perform. Defaults to 1 if not specified.\"\nUsage: This is a tool for editing files. For moving or renaming files, you should generally use the Bash tool with the 'mv' command instead. For larger edits, use the Write tool to overwrite files. For Jupyter notebooks (.ipynb files), use the NotebookEditCell instead.\n\nBefore using this tool:\n\n1. Use the View tool to understand the file's contents and context\n\n2. Verify the directory path is correct (only applicable when creating new files):\n   - Use the LS tool to verify the parent directory exists and is the correct location\n\nTo make a file edit, provide the following:\n1. file_path: The absolute path to the file to modify (must be absolute, not relative)\n2. old_string: The text to replace (must match the file contents exactly, including all whitespace and indentation)\n3. new_string: The edited text to replace the old_string\n4. expected_replacements: The number of replacements you expect to make. Defaults to 1 if not specified.\n\nBy default, the tool will replace ONE occurrence of old_string with new_string in the specified file. If you want to replace multiple occurrences, provide the expected_replacements parameter with the exact number of occurrences you expect.\n\nCRITICAL REQUIREMENTS FOR USING THIS TOOL:\n\n1. UNIQUENESS (when expected_replacements is not specified): The old_string MUST uniquely identify the specific instance you want to change. This means:\n   - Include AT LEAST 3-5 lines of context BEFORE the change point\n   - Include AT LEAST 3-5 lines of context AFTER the change point\n   - Include all whitespace, indentation, and surrounding code exactly as it appears in the file\n\n2. EXPECTED MATCHES: If you want to replace multiple instances:\n   - Use the expected_replacements parameter with the exact number of occurrences you expect to replace\n   - This will replace ALL occurrences of the old_string with the new_string\n   - If the actual number of matches doesn't equal expected_replacements, the edit will fail\n   - This is a safety feature to prevent unintended replacements\n\n3. VERIFICATION: Before using this tool:\n   - Check how many instances of the target text exist in the file\n   - If multiple instances exist, either:\n     a) Gather enough context to uniquely identify each one and make separate calls, OR\n     b) Use expected_replacements parameter with the exact count of instances you expect to replace\n\nWARNING: If you do not follow these requirements:\n   - The tool will fail if old_string matches multiple locations and expected_replacements isn't specified\n   - The tool will fail if the number of matches doesn't equal expected_replacements when it's specified\n   - The tool will fail if old_string doesn't match exactly (including whitespace)\n   - You may change unintended instances if you don't verify the match count\n\nWhen making edits:\n   - Ensure the edit results in idiomatic, correct code\n   - Do not leave the code in a broken state\n   - Always use absolute file paths (starting with /)\n\nIf you want to create a new file, use:\n   - A new file path, including dir name if needed\n   - An empty old_string\n   - The new file's contents as new_string\n\nRemember: when making multiple file edits in a row to the same file, you should prefer to send all edits in a single message with multiple calls to this tool, rather than multiple messages with a single call each.\n\n---Tool: Replace\nArguments: file_path: string \"The absolute path to the file to write (must be absolute, not relative)\", content: string \"The content to write to the file\"\nUsage: Write a file to the local filesystem. Overwrites the existing file if there is one.\n\nBefore using this tool:\n\n1. Use the ReadFile tool to understand the file's contents and context\n\n2. Directory Verification (only applicable when creating new files):\n   - Use the LS tool to verify the parent directory exists and is the correct location\n---Tool: ReadNotebook\nArguments: notebook_path: string \"The absolute path to the Jupyter notebook file to read (must be absolute, not relative)\"\nUsage: Reads a Jupyter notebook (.ipynb file) and returns all of the cells with their outputs. Jupyter notebooks are interactive documents that combine code, text, and visualizations, commonly used for data analysis and scientific computing. The notebook_path parameter must be an absolute path, not a relative path.\n---Tool: NotebookEditCell\nArguments: notebook_path: string \"The absolute path to the Jupyter notebook file to edit (must be absolute, not relative)\", cell_number: number \"The index of the cell to edit (0-based)\", new_source: string \"The new source for the cell\", [optional] cell_type: string \"The type of the cell (code or markdown). If not specified, it defaults to the current cell type. If using edit_mode=insert, this is required.\", [optional] edit_mode: string \"The type of edit to make (replace, insert, delete). Defaults to replace.\"\nUsage: Completely replaces the contents of a specific cell in a Jupyter notebook (.ipynb file) with new source. Jupyter notebooks are interactive documents that combine code, text, and visualizations, commonly used for data analysis and scientific computing. The notebook_path parameter must be an absolute path, not a relative path. The cell_number is 0-indexed. Use edit_mode=insert to add a new cell at the index specified by cell_number. Use edit_mode=delete to delete the cell at the index specified by cell_number.\n---Tool: WebFetchTool\nArguments: url: string \"The URL to fetch content from\", prompt: string \"The prompt to run on the fetched content\"\nUsage: \n- Fetches content from a specified URL and processes it using an AI model\n- Takes a URL and a prompt as input\n- Fetches the URL content, converts HTML to markdown\n- Processes the content with the prompt using a small, fast model\n- Returns the model's response about the content\n- Use this tool when you need to retrieve and analyze web content\n\nUsage notes:\n  - IMPORTANT: If an MCP-provided web fetch tool is available, prefer using that tool instead of this one, as it may have fewer restrictions. All MCP-provided tools start with \"mcp__\".\n  - The URL must be a fully-formed valid URL\n  - HTTP URLs will be automatically upgraded to HTTPS\n  - For security reasons, the URL's domain must have been provided directly by the user, unless it's on a small pre-approved set of the top few dozen hosts for popular coding resources, like react.dev.\n  - The prompt should describe what information you want to extract from the page\n  - This tool is read-only and does not modify any files\n  - Results may be summarized if the content is very large\n  - Includes a self-cleaning 15-minute cache for faster responses when repeatedly accessing the same URL\n\n\nExample usage:\n{\n  \"invocations\": [\n    {\n      \"tool_name\": \"Bash\",\n      \"input\": {\n        \"command\": \"git blame src/foo.ts\"\n      }\n    },\n    {\n      \"tool_name\": \"GlobTool\",\n      \"input\": {\n        \"pattern\": \"**/*.ts\"\n      }\n    },\n    {\n      \"tool_name\": \"GrepTool\",\n      \"input\": {\n        \"pattern\": \"function\",\n        \"include\": \"*.ts\"\n      }\n    }\n  ]\n}\n",
-                "inputSchema": {
-                    "type": "object",
-                    "properties": {
-                        "description": {
-                            "type": "string",
-                            "description": "A short (3-5 word) description of the batch operation"
-                        },
-                        "invocations": {
-                            "type": "array",
-                            "items": {
-                                "type": "object",
-                                "properties": {
-                                    "tool_name": {
-                                        "type": "string",
-                                        "description": "The name of the tool to invoke"
-                                    },
-                                    "input": {
-                                        "type": "object",
-                                        "additionalProperties": {},
-                                        "description": "The input to pass to the tool"
-                                    }
-                                },
-                                "required": [
-                                    "tool_name",
-                                    "input"
-                                ],
-                                "additionalProperties": false
-                            },
-                            "description": "The list of tool invocations to execute"
-                        }
-                    },
-                    "required": [
-                        "description",
-                        "invocations"
-                    ],
-                    "additionalProperties": false,
-                    "$schema": "http://json-schema.org/draft-07/schema#"
-                }
-            },
-            {
-                "name": "GlobTool",
-                "description": "- Fast file pattern matching tool that works with any codebase size\n- Supports glob patterns like \"**/*.js\" or \"src/**/*.ts\"\n- Returns matching file paths sorted by modification time\n- Use this tool when you need to find files by name patterns\n- When you are doing an open ended search that may require multiple rounds of globbing and grepping, use the Agent tool instead\n",
-                "inputSchema": {
-                    "type": "object",
-                    "properties": {
-                        "pattern": {
-                            "type": "string",
-                            "description": "The glob pattern to match files against"
-                        },
-                        "path": {
-                            "type": "string",
-                            "description": "The directory to search in. If not specified, the current working directory will be used. IMPORTANT: Omit this field to use the default directory. DO NOT enter \"undefined\" or \"null\" - simply omit it for the default behavior. Must be a valid directory path if provided."
-                        }
-                    },
-                    "required": [
-                        "pattern"
-                    ],
-                    "additionalProperties": false,
-                    "$schema": "http://json-schema.org/draft-07/schema#"
-                }
-            },
-            {
-                "name": "GrepTool",
-                "description": "\n- Fast content search tool that works with any codebase size\n- Searches file contents using regular expressions\n- Supports full regex syntax (eg. \"log.*Error\", \"function\\s+\\w+\", etc.)\n- Filter files by pattern with the include parameter (eg. \"*.js\", \"*.{ts,tsx}\")\n- Returns matching file paths sorted by modification time\n- Use this tool when you need to find files containing specific patterns\n- When you are doing an open ended search that may require multiple rounds of globbing and grepping, use the Agent tool instead\n",
-                "inputSchema": {
-                    "type": "object",
-                    "properties": {
-                        "pattern": {
-                            "type": "string",
-                            "description": "The regular expression pattern to search for in file contents"
-                        },
-                        "path": {
-                            "type": "string",
-                            "description": "The directory to search in. Defaults to the current working directory."
-                        },
-                        "include": {
-                            "type": "string",
-                            "description": "File pattern to include in the search (e.g. \"*.js\", \"*.{ts,tsx}\")"
-                        }
-                    },
-                    "required": [
-                        "pattern"
-                    ],
-                    "additionalProperties": false,
-                    "$schema": "http://json-schema.org/draft-07/schema#"
-                }
-            },
-            {
-                "name": "LS",
-                "description": "Lists files and directories in a given path. The path parameter must be an absolute path, not a relative path. You can optionally provide an array of glob patterns to ignore with the ignore parameter. You should generally prefer the Glob and Grep tools, if you know which directories to search.",
-                "inputSchema": {
-                    "type": "object",
-                    "properties": {
-                        "path": {
-                            "type": "string",
-                            "description": "The absolute path to the directory to list (must be absolute, not relative)"
-                        },
-                        "ignore": {
-                            "type": "array",
-                            "items": {
-                                "type": "string"
-                            },
-                            "description": "List of glob patterns to ignore"
-                        }
-                    },
-                    "required": [
-                        "path"
-                    ],
-                    "additionalProperties": false,
-                    "$schema": "http://json-schema.org/draft-07/schema#"
-                }
-            },
-            {
-                "name": "View",
-                "description": "Read a file from the local filesystem.",
-                "inputSchema": {
-                    "type": "object",
-                    "properties": {
-                        "file_path": {
-                            "type": "string",
-                            "description": "The absolute path to the file to read"
-                        },
-                        "offset": {
-                            "type": "number",
-                            "description": "The line number to start reading from. Only provide if the file is too large to read at once"
-                        },
-                        "limit": {
-                            "type": "number",
-                            "description": "The number of lines to read. Only provide if the file is too large to read at once."
-                        }
-                    },
-                    "required": [
-                        "file_path"
-                    ],
-                    "additionalProperties": false,
-                    "$schema": "http://json-schema.org/draft-07/schema#"
-                }
-            },
-            {
-                "name": "Edit",
-                "description": "A tool for editing files",
-                "inputSchema": {
-                    "type": "object",
-                    "properties": {
-                        "file_path": {
-                            "type": "string",
-                            "description": "The absolute path to the file to modify"
-                        },
-                        "old_string": {
-                            "type": "string",
-                            "description": "The text to replace"
-                        },
-                        "new_string": {
-                            "type": "string",
-                            "description": "The text to replace it with"
-                        },
-                        "expected_replacements": {
-                            "type": "number",
-                            "default": 1,
-                            "description": "The expected number of replacements to perform. Defaults to 1 if not specified."
-                        }
-                    },
-                    "required": [
-                        "file_path",
-                        "old_string",
-                        "new_string"
-                    ],
-                    "additionalProperties": false,
-                    "$schema": "http://json-schema.org/draft-07/schema#"
-                }
-            },
-            {
-                "name": "Replace",
-                "description": "Write a file to the local filesystem.",
-                "inputSchema": {
-                    "type": "object",
-                    "properties": {
-                        "file_path": {
-                            "type": "string",
-                            "description": "The absolute path to the file to write (must be absolute, not relative)"
-                        },
-                        "content": {
-                            "type": "string",
-                            "description": "The content to write to the file"
-                        }
-                    },
-                    "required": [
-                        "file_path",
-                        "content"
-                    ],
-                    "additionalProperties": false,
-                    "$schema": "http://json-schema.org/draft-07/schema#"
-                }
-            },
-            {
-                "name": "ReadNotebook",
-                "description": "Extract and read source code from all code cells in a Jupyter notebook.",
-                "inputSchema": {
-                    "type": "object",
-                    "properties": {
-                        "notebook_path": {
-                            "type": "string",
-                            "description": "The absolute path to the Jupyter notebook file to read (must be absolute, not relative)"
-                        }
-                    },
-                    "required": [
-                        "notebook_path"
-                    ],
-                    "additionalProperties": false,
-                    "$schema": "http://json-schema.org/draft-07/schema#"
-                }
-            },
-            {
-                "name": "NotebookEditCell",
-                "description": "Replace the contents of a specific cell in a Jupyter notebook.",
-                "inputSchema": {
-                    "type": "object",
-                    "properties": {
-                        "notebook_path": {
-                            "type": "string",
-                            "description": "The absolute path to the Jupyter notebook file to edit (must be absolute, not relative)"
-                        },
-                        "cell_number": {
-                            "type": "number",
-                            "description": "The index of the cell to edit (0-based)"
-                        },
-                        "new_source": {
-                            "type": "string",
-                            "description": "The new source for the cell"
-                        },
-                        "cell_type": {
-                            "type": "string",
-                            "enum": [
-                                "code",
-                                "markdown"
-                            ],
-                            "description": "The type of the cell (code or markdown). If not specified, it defaults to the current cell type. If using edit_mode=insert, this is required."
-                        },
-                        "edit_mode": {
-                            "type": "string",
-                            "description": "The type of edit to make (replace, insert, delete). Defaults to replace."
-                        }
-                    },
-                    "required": [
-                        "notebook_path",
-                        "cell_number",
-                        "new_source"
-                    ],
-                    "additionalProperties": false,
-                    "$schema": "http://json-schema.org/draft-07/schema#"
-                }
-            },
-            {
-                "name": "WebFetchTool",
-                "description": "Claude wants to fetch content from this URL",
-                "inputSchema": {
-                    "type": "object",
-                    "properties": {
-                        "url": {
-                            "type": "string",
-                            "format": "uri",
-                            "description": "The URL to fetch content from"
-                        },
-                        "prompt": {
-                            "type": "string",
-                            "description": "The prompt to run on the fetched content"
-                        }
-                    },
-                    "required": [
-                        "url",
-                        "prompt"
-                    ],
-                    "additionalProperties": false,
-                    "$schema": "http://json-schema.org/draft-07/schema#"
-                }
-            }
-        ]
-    }
-}
-```
diff --git a/crates/agent/src/edit_agent/evals/fixtures/zode/react.py b/crates/agent/src/edit_agent/evals/fixtures/zode/react.py
deleted file mode 100644
index 03ff02e789..0000000000
--- a/crates/agent/src/edit_agent/evals/fixtures/zode/react.py
+++ /dev/null
@@ -1,14 +0,0 @@
-class InputCell:
-    def __init__(self, initial_value):
-        self.value = None
-
-
-class ComputeCell:
-    def __init__(self, inputs, compute_function):
-        self.value = None
-
-    def add_callback(self, callback):
-        pass
-
-    def remove_callback(self, callback):
-        pass
diff --git a/crates/agent/src/edit_agent/evals/fixtures/zode/react_test.py b/crates/agent/src/edit_agent/evals/fixtures/zode/react_test.py
deleted file mode 100644
index 1f917e40b4..0000000000
--- a/crates/agent/src/edit_agent/evals/fixtures/zode/react_test.py
+++ /dev/null
@@ -1,271 +0,0 @@
-# These tests are auto-generated with test data from:
-# https://github.com/exercism/problem-specifications/tree/main/exercises/react/canonical-data.json
-# File last updated on 2023-07-19
-
-from functools import partial
-import unittest
-
-from react import (
-    InputCell,
-    ComputeCell,
-)
-
-
-class ReactTest(unittest.TestCase):
-    def test_input_cells_have_a_value(self):
-        input = InputCell(10)
-        self.assertEqual(input.value, 10)
-
-    def test_an_input_cell_s_value_can_be_set(self):
-        input = InputCell(4)
-        input.value = 20
-        self.assertEqual(input.value, 20)
-
-    def test_compute_cells_calculate_initial_value(self):
-        input = InputCell(1)
-        output = ComputeCell(
-            [
-                input,
-            ],
-            lambda inputs: inputs[0] + 1,
-        )
-        self.assertEqual(output.value, 2)
-
-    def test_compute_cells_take_inputs_in_the_right_order(self):
-        one = InputCell(1)
-        two = InputCell(2)
-        output = ComputeCell(
-            [
-                one,
-                two,
-            ],
-            lambda inputs: inputs[0] + inputs[1] * 10,
-        )
-        self.assertEqual(output.value, 21)
-
-    def test_compute_cells_update_value_when_dependencies_are_changed(self):
-        input = InputCell(1)
-        output = ComputeCell(
-            [
-                input,
-            ],
-            lambda inputs: inputs[0] + 1,
-        )
-        input.value = 3
-        self.assertEqual(output.value, 4)
-
-    def test_compute_cells_can_depend_on_other_compute_cells(self):
-        input = InputCell(1)
-        times_two = ComputeCell(
-            [
-                input,
-            ],
-            lambda inputs: inputs[0] * 2,
-        )
-        times_thirty = ComputeCell(
-            [
-                input,
-            ],
-            lambda inputs: inputs[0] * 30,
-        )
-        output = ComputeCell(
-            [
-                times_two,
-                times_thirty,
-            ],
-            lambda inputs: inputs[0] + inputs[1],
-        )
-        self.assertEqual(output.value, 32)
-        input.value = 3
-        self.assertEqual(output.value, 96)
-
-    def test_compute_cells_fire_callbacks(self):
-        input = InputCell(1)
-        output = ComputeCell(
-            [
-                input,
-            ],
-            lambda inputs: inputs[0] + 1,
-        )
-        cb1_observer = []
-        callback1 = self.callback_factory(cb1_observer)
-        output.add_callback(callback1)
-        input.value = 3
-        self.assertEqual(cb1_observer[-1], 4)
-
-    def test_callback_cells_only_fire_on_change(self):
-        input = InputCell(1)
-        output = ComputeCell([input], lambda inputs: 111 if inputs[0] < 3 else 222)
-        cb1_observer = []
-        callback1 = self.callback_factory(cb1_observer)
-        output.add_callback(callback1)
-        input.value = 2
-        self.assertEqual(cb1_observer, [])
-        input.value = 4
-        self.assertEqual(cb1_observer[-1], 222)
-
-    def test_callbacks_do_not_report_already_reported_values(self):
-        input = InputCell(1)
-        output = ComputeCell(
-            [
-                input,
-            ],
-            lambda inputs: inputs[0] + 1,
-        )
-        cb1_observer = []
-        callback1 = self.callback_factory(cb1_observer)
-        output.add_callback(callback1)
-        input.value = 2
-        self.assertEqual(cb1_observer[-1], 3)
-        input.value = 3
-        self.assertEqual(cb1_observer[-1], 4)
-
-    def test_callbacks_can_fire_from_multiple_cells(self):
-        input = InputCell(1)
-        plus_one = ComputeCell(
-            [
-                input,
-            ],
-            lambda inputs: inputs[0] + 1,
-        )
-        minus_one = ComputeCell(
-            [
-                input,
-            ],
-            lambda inputs: inputs[0] - 1,
-        )
-        cb1_observer = []
-        cb2_observer = []
-        callback1 = self.callback_factory(cb1_observer)
-        callback2 = self.callback_factory(cb2_observer)
-        plus_one.add_callback(callback1)
-        minus_one.add_callback(callback2)
-        input.value = 10
-        self.assertEqual(cb1_observer[-1], 11)
-        self.assertEqual(cb2_observer[-1], 9)
-
-    def test_callbacks_can_be_added_and_removed(self):
-        input = InputCell(11)
-        output = ComputeCell(
-            [
-                input,
-            ],
-            lambda inputs: inputs[0] + 1,
-        )
-        cb1_observer = []
-        cb2_observer = []
-        cb3_observer = []
-        callback1 = self.callback_factory(cb1_observer)
-        callback2 = self.callback_factory(cb2_observer)
-        callback3 = self.callback_factory(cb3_observer)
-        output.add_callback(callback1)
-        output.add_callback(callback2)
-        input.value = 31
-        self.assertEqual(cb1_observer[-1], 32)
-        self.assertEqual(cb2_observer[-1], 32)
-        output.remove_callback(callback1)
-        output.add_callback(callback3)
-        input.value = 41
-        self.assertEqual(len(cb1_observer), 1)
-        self.assertEqual(cb2_observer[-1], 42)
-        self.assertEqual(cb3_observer[-1], 42)
-
-    def test_removing_a_callback_multiple_times_doesn_t_interfere_with_other_callbacks(
-        self,
-    ):
-        input = InputCell(1)
-        output = ComputeCell(
-            [
-                input,
-            ],
-            lambda inputs: inputs[0] + 1,
-        )
-        cb1_observer = []
-        cb2_observer = []
-        callback1 = self.callback_factory(cb1_observer)
-        callback2 = self.callback_factory(cb2_observer)
-        output.add_callback(callback1)
-        output.add_callback(callback2)
-        output.remove_callback(callback1)
-        output.remove_callback(callback1)
-        output.remove_callback(callback1)
-        input.value = 2
-        self.assertEqual(cb1_observer, [])
-        self.assertEqual(cb2_observer[-1], 3)
-
-    def test_callbacks_should_only_be_called_once_even_if_multiple_dependencies_change(
-        self,
-    ):
-        input = InputCell(1)
-        plus_one = ComputeCell(
-            [
-                input,
-            ],
-            lambda inputs: inputs[0] + 1,
-        )
-        minus_one1 = ComputeCell(
-            [
-                input,
-            ],
-            lambda inputs: inputs[0] - 1,
-        )
-        minus_one2 = ComputeCell(
-            [
-                minus_one1,
-            ],
-            lambda inputs: inputs[0] - 1,
-        )
-        output = ComputeCell(
-            [
-                plus_one,
-                minus_one2,
-            ],
-            lambda inputs: inputs[0] * inputs[1],
-        )
-        cb1_observer = []
-        callback1 = self.callback_factory(cb1_observer)
-        output.add_callback(callback1)
-        input.value = 4
-        self.assertEqual(cb1_observer[-1], 10)
-
-    def test_callbacks_should_not_be_called_if_dependencies_change_but_output_value_doesn_t_change(
-        self,
-    ):
-        input = InputCell(1)
-        plus_one = ComputeCell(
-            [
-                input,
-            ],
-            lambda inputs: inputs[0] + 1,
-        )
-        minus_one = ComputeCell(
-            [
-                input,
-            ],
-            lambda inputs: inputs[0] - 1,
-        )
-        always_two = ComputeCell(
-            [
-                plus_one,
-                minus_one,
-            ],
-            lambda inputs: inputs[0] - inputs[1],
-        )
-        cb1_observer = []
-        callback1 = self.callback_factory(cb1_observer)
-        always_two.add_callback(callback1)
-        input.value = 2
-        self.assertEqual(cb1_observer, [])
-        input.value = 3
-        self.assertEqual(cb1_observer, [])
-        input.value = 4
-        self.assertEqual(cb1_observer, [])
-        input.value = 5
-        self.assertEqual(cb1_observer, [])
-
-    # Utility functions.
-    def callback_factory(self, observer):
-        def callback(observer, value):
-            observer.append(value)
-
-        return partial(callback, observer)
diff --git a/crates/agent/src/edit_agent/streaming_fuzzy_matcher.rs b/crates/agent/src/edit_agent/streaming_fuzzy_matcher.rs
deleted file mode 100644
index 904ec05a8c..0000000000
--- a/crates/agent/src/edit_agent/streaming_fuzzy_matcher.rs
+++ /dev/null
@@ -1,806 +0,0 @@
-use language::{Point, TextBufferSnapshot};
-use std::{cmp, ops::Range};
-
-const REPLACEMENT_COST: u32 = 1;
-const INSERTION_COST: u32 = 3;
-const DELETION_COST: u32 = 10;
-
-/// A streaming fuzzy matcher that can process text chunks incrementally
-/// and return the best match found so far at each step.
-pub struct StreamingFuzzyMatcher {
-    snapshot: TextBufferSnapshot,
-    query_lines: Vec<String>,
-    line_hint: Option<u32>,
-    incomplete_line: String,
-    matches: Vec<Range<usize>>,
-    matrix: SearchMatrix,
-}
-
-impl StreamingFuzzyMatcher {
-    pub fn new(snapshot: TextBufferSnapshot) -> Self {
-        let buffer_line_count = snapshot.max_point().row as usize + 1;
-        Self {
-            snapshot,
-            query_lines: Vec::new(),
-            line_hint: None,
-            incomplete_line: String::new(),
-            matches: Vec::new(),
-            matrix: SearchMatrix::new(buffer_line_count + 1),
-        }
-    }
-
-    /// Returns the query lines.
-    pub fn query_lines(&self) -> &[String] {
-        &self.query_lines
-    }
-
-    /// Push a new chunk of text and get the best match found so far.
-    ///
-    /// This method accumulates text chunks and processes complete lines.
-    /// Partial lines are buffered internally until a newline is received.
-    ///
-    /// # Returns
-    ///
-    /// Returns `Some(range)` if a match has been found with the accumulated
-    /// query so far, or `None` if no suitable match exists yet.
-    pub fn push(&mut self, chunk: &str, line_hint: Option<u32>) -> Option<Range<usize>> {
-        if line_hint.is_some() {
-            self.line_hint = line_hint;
-        }
-
-        // Add the chunk to our incomplete line buffer
-        self.incomplete_line.push_str(chunk);
-        self.line_hint = line_hint;
-
-        if let Some((last_pos, _)) = self.incomplete_line.match_indices('\n').next_back() {
-            let complete_part = &self.incomplete_line[..=last_pos];
-
-            // Split into lines and add to query_lines
-            for line in complete_part.lines() {
-                self.query_lines.push(line.to_string());
-            }
-
-            self.incomplete_line.replace_range(..last_pos + 1, "");
-
-            self.matches = self.resolve_location_fuzzy();
-        }
-
-        let best_match = self.select_best_match();
-        best_match.or_else(|| self.matches.first().cloned())
-    }
-
-    /// Finish processing and return the final best match(es).
-    ///
-    /// This processes any remaining incomplete line before returning the final
-    /// match result.
-    pub fn finish(&mut self) -> Vec<Range<usize>> {
-        // Process any remaining incomplete line
-        if !self.incomplete_line.is_empty() {
-            self.query_lines.push(self.incomplete_line.clone());
-            self.incomplete_line.clear();
-            self.matches = self.resolve_location_fuzzy();
-        }
-        self.matches.clone()
-    }
-
-    fn resolve_location_fuzzy(&mut self) -> Vec<Range<usize>> {
-        let new_query_line_count = self.query_lines.len();
-        let old_query_line_count = self.matrix.rows.saturating_sub(1);
-        if new_query_line_count == old_query_line_count {
-            return Vec::new();
-        }
-
-        self.matrix.resize_rows(new_query_line_count + 1);
-
-        // Process only the new query lines
-        for row in old_query_line_count..new_query_line_count {
-            let query_line = self.query_lines[row].trim();
-            let leading_deletion_cost = (row + 1) as u32 * DELETION_COST;
-
-            self.matrix.set(
-                row + 1,
-                0,
-                SearchState::new(leading_deletion_cost, SearchDirection::Up),
-            );
-
-            let mut buffer_lines = self.snapshot.as_rope().chunks().lines();
-            let mut col = 0;
-            while let Some(buffer_line) = buffer_lines.next() {
-                let buffer_line = buffer_line.trim();
-                let up = SearchState::new(
-                    self.matrix
-                        .get(row, col + 1)
-                        .cost
-                        .saturating_add(DELETION_COST),
-                    SearchDirection::Up,
-                );
-                let left = SearchState::new(
-                    self.matrix
-                        .get(row + 1, col)
-                        .cost
-                        .saturating_add(INSERTION_COST),
-                    SearchDirection::Left,
-                );
-                let diagonal = SearchState::new(
-                    if query_line == buffer_line {
-                        self.matrix.get(row, col).cost
-                    } else if fuzzy_eq(query_line, buffer_line) {
-                        self.matrix.get(row, col).cost + REPLACEMENT_COST
-                    } else {
-                        self.matrix
-                            .get(row, col)
-                            .cost
-                            .saturating_add(DELETION_COST + INSERTION_COST)
-                    },
-                    SearchDirection::Diagonal,
-                );
-                self.matrix
-                    .set(row + 1, col + 1, up.min(left).min(diagonal));
-                col += 1;
-            }
-        }
-
-        // Find all matches with the best cost
-        let buffer_line_count = self.snapshot.max_point().row as usize + 1;
-        let mut best_cost = u32::MAX;
-        let mut matches_with_best_cost = Vec::new();
-
-        for col in 1..=buffer_line_count {
-            let cost = self.matrix.get(new_query_line_count, col).cost;
-            if cost < best_cost {
-                best_cost = cost;
-                matches_with_best_cost.clear();
-                matches_with_best_cost.push(col as u32);
-            } else if cost == best_cost {
-                matches_with_best_cost.push(col as u32);
-            }
-        }
-
-        // Find ranges for the matches
-        let mut valid_matches = Vec::new();
-        for &buffer_row_end in &matches_with_best_cost {
-            let mut matched_lines = 0;
-            let mut query_row = new_query_line_count;
-            let mut buffer_row_start = buffer_row_end;
-            while query_row > 0 && buffer_row_start > 0 {
-                let current = self.matrix.get(query_row, buffer_row_start as usize);
-                match current.direction {
-                    SearchDirection::Diagonal => {
-                        query_row -= 1;
-                        buffer_row_start -= 1;
-                        matched_lines += 1;
-                    }
-                    SearchDirection::Up => {
-                        query_row -= 1;
-                    }
-                    SearchDirection::Left => {
-                        buffer_row_start -= 1;
-                    }
-                }
-            }
-
-            let matched_buffer_row_count = buffer_row_end - buffer_row_start;
-            let matched_ratio = matched_lines as f32
-                / (matched_buffer_row_count as f32).max(new_query_line_count as f32);
-            if matched_ratio >= 0.8 {
-                let buffer_start_ix = self
-                    .snapshot
-                    .point_to_offset(Point::new(buffer_row_start, 0));
-                let buffer_end_ix = self.snapshot.point_to_offset(Point::new(
-                    buffer_row_end - 1,
-                    self.snapshot.line_len(buffer_row_end - 1),
-                ));
-                valid_matches.push((buffer_row_start, buffer_start_ix..buffer_end_ix));
-            }
-        }
-
-        valid_matches.into_iter().map(|(_, range)| range).collect()
-    }
-
-    /// Return the best match with starting position close enough to line_hint.
-    pub fn select_best_match(&self) -> Option<Range<usize>> {
-        // Allow line hint to be off by that many lines.
-        // Higher values increase probability of applying edits to a wrong place,
-        // Lower values increase edits failures and overall conversation length.
-        const LINE_HINT_TOLERANCE: u32 = 200;
-
-        if self.matches.is_empty() {
-            return None;
-        }
-
-        if self.matches.len() == 1 {
-            return self.matches.first().cloned();
-        }
-
-        let Some(line_hint) = self.line_hint else {
-            // Multiple ambiguous matches
-            return None;
-        };
-
-        let mut best_match = None;
-        let mut best_distance = u32::MAX;
-
-        for range in &self.matches {
-            let start_point = self.snapshot.offset_to_point(range.start);
-            let start_line = start_point.row;
-            let distance = start_line.abs_diff(line_hint);
-
-            if distance <= LINE_HINT_TOLERANCE && distance < best_distance {
-                best_distance = distance;
-                best_match = Some(range.clone());
-            }
-        }
-
-        best_match
-    }
-}
-
-fn fuzzy_eq(left: &str, right: &str) -> bool {
-    const THRESHOLD: f64 = 0.8;
-
-    let min_levenshtein = left.len().abs_diff(right.len());
-    let min_normalized_levenshtein =
-        1. - (min_levenshtein as f64 / cmp::max(left.len(), right.len()) as f64);
-    if min_normalized_levenshtein < THRESHOLD {
-        return false;
-    }
-
-    strsim::normalized_levenshtein(left, right) >= THRESHOLD
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
-enum SearchDirection {
-    Up,
-    Left,
-    Diagonal,
-}
-
-#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
-struct SearchState {
-    cost: u32,
-    direction: SearchDirection,
-}
-
-impl SearchState {
-    fn new(cost: u32, direction: SearchDirection) -> Self {
-        Self { cost, direction }
-    }
-}
-
-struct SearchMatrix {
-    cols: usize,
-    rows: usize,
-    data: Vec<SearchState>,
-}
-
-impl SearchMatrix {
-    fn new(cols: usize) -> Self {
-        SearchMatrix {
-            cols,
-            rows: 0,
-            data: Vec::new(),
-        }
-    }
-
-    fn resize_rows(&mut self, needed_rows: usize) {
-        debug_assert!(needed_rows > self.rows);
-        self.rows = needed_rows;
-        self.data.resize(
-            self.rows * self.cols,
-            SearchState::new(0, SearchDirection::Diagonal),
-        );
-    }
-
-    fn get(&self, row: usize, col: usize) -> SearchState {
-        debug_assert!(row < self.rows && col < self.cols);
-        self.data[row * self.cols + col]
-    }
-
-    fn set(&mut self, row: usize, col: usize, state: SearchState) {
-        debug_assert!(row < self.rows && col < self.cols);
-        self.data[row * self.cols + col] = state;
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use indoc::indoc;
-    use language::{BufferId, TextBuffer};
-    use rand::prelude::*;
-    use text::ReplicaId;
-    use util::test::{generate_marked_text, marked_text_ranges};
-
-    #[test]
-    fn test_empty_query() {
-        let buffer = TextBuffer::new(
-            ReplicaId::LOCAL,
-            BufferId::new(1).unwrap(),
-            "Hello world\nThis is a test\nFoo bar baz",
-        );
-        let snapshot = buffer.snapshot();
-
-        let mut finder = StreamingFuzzyMatcher::new(snapshot);
-        assert_eq!(push(&mut finder, ""), None);
-        assert_eq!(finish(finder), None);
-    }
-
-    #[test]
-    fn test_streaming_exact_match() {
-        let buffer = TextBuffer::new(
-            ReplicaId::LOCAL,
-            BufferId::new(1).unwrap(),
-            "Hello world\nThis is a test\nFoo bar baz",
-        );
-        let snapshot = buffer.snapshot();
-
-        let mut finder = StreamingFuzzyMatcher::new(snapshot);
-
-        // Push partial query
-        assert_eq!(push(&mut finder, "This"), None);
-
-        // Complete the line
-        assert_eq!(
-            push(&mut finder, " is a test\n"),
-            Some("This is a test".to_string())
-        );
-
-        // Finish should return the same result
-        assert_eq!(finish(finder), Some("This is a test".to_string()));
-    }
-
-    #[test]
-    fn test_streaming_fuzzy_match() {
-        let buffer = TextBuffer::new(
-            ReplicaId::LOCAL,
-            BufferId::new(1).unwrap(),
-            indoc! {"
-                function foo(a, b) {
-                    return a + b;
-                }
-
-                function bar(x, y) {
-                    return x * y;
-                }
-            "},
-        );
-        let snapshot = buffer.snapshot();
-
-        let mut finder = StreamingFuzzyMatcher::new(snapshot);
-
-        // Push a fuzzy query that should match the first function
-        assert_eq!(
-            push(&mut finder, "function foo(a, c) {\n").as_deref(),
-            Some("function foo(a, b) {")
-        );
-        assert_eq!(
-            push(&mut finder, "    return a + c;\n}\n").as_deref(),
-            Some(concat!(
-                "function foo(a, b) {\n",
-                "    return a + b;\n",
-                "}"
-            ))
-        );
-    }
-
-    #[test]
-    fn test_incremental_improvement() {
-        let buffer = TextBuffer::new(
-            ReplicaId::LOCAL,
-            BufferId::new(1).unwrap(),
-            "Line 1\nLine 2\nLine 3\nLine 4\nLine 5",
-        );
-        let snapshot = buffer.snapshot();
-
-        let mut finder = StreamingFuzzyMatcher::new(snapshot);
-
-        // No match initially
-        assert_eq!(push(&mut finder, "Lin"), None);
-
-        // Get a match when we complete a line
-        assert_eq!(push(&mut finder, "e 3\n"), Some("Line 3".to_string()));
-
-        // The match might change if we add more specific content
-        assert_eq!(
-            push(&mut finder, "Line 4\n"),
-            Some("Line 3\nLine 4".to_string())
-        );
-        assert_eq!(finish(finder), Some("Line 3\nLine 4".to_string()));
-    }
-
-    #[test]
-    fn test_incomplete_lines_buffering() {
-        let buffer = TextBuffer::new(
-            ReplicaId::LOCAL,
-            BufferId::new(1).unwrap(),
-            indoc! {"
-                The quick brown fox
-                jumps over the lazy dog
-                Pack my box with five dozen liquor jugs
-            "},
-        );
-        let snapshot = buffer.snapshot();
-
-        let mut finder = StreamingFuzzyMatcher::new(snapshot);
-
-        // Push text in small chunks across line boundaries
-        assert_eq!(push(&mut finder, "jumps "), None); // No newline yet
-        assert_eq!(push(&mut finder, "over the"), None); // Still no newline
-        assert_eq!(push(&mut finder, " lazy"), None); // Still incomplete
-
-        // Complete the line
-        assert_eq!(
-            push(&mut finder, " dog\n"),
-            Some("jumps over the lazy dog".to_string())
-        );
-    }
-
-    #[test]
-    fn test_multiline_fuzzy_match() {
-        let buffer = TextBuffer::new(
-            ReplicaId::LOCAL,
-            BufferId::new(1).unwrap(),
-            indoc! {r#"
-                impl Display for User {
-                    fn fmt(&self, f: &mut Formatter) -> fmt::Result {
-                        write!(f, "User: {} ({})", self.name, self.email)
-                    }
-                }
-
-                impl Debug for User {
-                    fn fmt(&self, f: &mut Formatter) -> fmt::Result {
-                        f.debug_struct("User")
-                            .field("name", &self.name)
-                            .field("email", &self.email)
-                            .finish()
-                    }
-                }
-            "#},
-        );
-        let snapshot = buffer.snapshot();
-
-        let mut finder = StreamingFuzzyMatcher::new(snapshot);
-
-        assert_eq!(
-            push(&mut finder, "impl Debug for User {\n"),
-            Some("impl Debug for User {".to_string())
-        );
-        assert_eq!(
-            push(
-                &mut finder,
-                "    fn fmt(&self, f: &mut Formatter) -> Result {\n"
-            )
-            .as_deref(),
-            Some(concat!(
-                "impl Debug for User {\n",
-                "    fn fmt(&self, f: &mut Formatter) -> fmt::Result {"
-            ))
-        );
-        assert_eq!(
-            push(&mut finder, "        f.debug_struct(\"User\")\n").as_deref(),
-            Some(concat!(
-                "impl Debug for User {\n",
-                "    fn fmt(&self, f: &mut Formatter) -> fmt::Result {\n",
-                "        f.debug_struct(\"User\")"
-            ))
-        );
-        assert_eq!(
-            push(
-                &mut finder,
-                "            .field(\"name\", &self.username)\n"
-            )
-            .as_deref(),
-            Some(concat!(
-                "impl Debug for User {\n",
-                "    fn fmt(&self, f: &mut Formatter) -> fmt::Result {\n",
-                "        f.debug_struct(\"User\")\n",
-                "            .field(\"name\", &self.name)"
-            ))
-        );
-        assert_eq!(
-            finish(finder).as_deref(),
-            Some(concat!(
-                "impl Debug for User {\n",
-                "    fn fmt(&self, f: &mut Formatter) -> fmt::Result {\n",
-                "        f.debug_struct(\"User\")\n",
-                "            .field(\"name\", &self.name)"
-            ))
-        );
-    }
-
-    #[gpui::test(iterations = 100)]
-    fn test_resolve_location_single_line(mut rng: StdRng) {
-        assert_location_resolution(
-            concat!(
-                "    Lorem\n",
-                "«    ipsum»\n",
-                "    dolor sit amet\n",
-                "    consecteur",
-            ),
-            "ipsum",
-            &mut rng,
-        );
-    }
-
-    #[gpui::test(iterations = 100)]
-    fn test_resolve_location_multiline(mut rng: StdRng) {
-        assert_location_resolution(
-            concat!(
-                "    Lorem\n",
-                "«    ipsum\n",
-                "    dolor sit amet»\n",
-                "    consecteur",
-            ),
-            "ipsum\ndolor sit amet",
-            &mut rng,
-        );
-    }
-
-    #[gpui::test(iterations = 100)]
-    fn test_resolve_location_function_with_typo(mut rng: StdRng) {
-        assert_location_resolution(
-            indoc! {"
-                «fn foo1(a: usize) -> usize {
-                    40
-                }»
-
-                fn foo2(b: usize) -> usize {
-                    42
-                }
-            "},
-            "fn foo1(a: usize) -> u32 {\n40\n}",
-            &mut rng,
-        );
-    }
-
-    #[gpui::test(iterations = 100)]
-    fn test_resolve_location_class_methods(mut rng: StdRng) {
-        assert_location_resolution(
-            indoc! {"
-                class Something {
-                    one() { return 1; }
-                «    two() { return 2222; }
-                    three() { return 333; }
-                    four() { return 4444; }
-                    five() { return 5555; }
-                    six() { return 6666; }»
-                    seven() { return 7; }
-                    eight() { return 8; }
-                }
-            "},
-            indoc! {"
-                two() { return 2222; }
-                four() { return 4444; }
-                five() { return 5555; }
-                six() { return 6666; }
-            "},
-            &mut rng,
-        );
-    }
-
-    #[gpui::test(iterations = 100)]
-    fn test_resolve_location_imports_no_match(mut rng: StdRng) {
-        assert_location_resolution(
-            indoc! {"
-                use std::ops::Range;
-                use std::sync::Mutex;
-                use std::{
-                    collections::HashMap,
-                    env,
-                    ffi::{OsStr, OsString},
-                    fs,
-                    io::{BufRead, BufReader},
-                    mem,
-                    path::{Path, PathBuf},
-                    process::Command,
-                    sync::LazyLock,
-                    time::SystemTime,
-                };
-            "},
-            indoc! {"
-                use std::collections::{HashMap, HashSet};
-                use std::ffi::{OsStr, OsString};
-                use std::fmt::Write as _;
-                use std::fs;
-                use std::io::{BufReader, Read, Write};
-                use std::mem;
-                use std::path::{Path, PathBuf};
-                use std::process::Command;
-                use std::sync::Arc;
-            "},
-            &mut rng,
-        );
-    }
-
-    #[gpui::test(iterations = 100)]
-    fn test_resolve_location_nested_closure(mut rng: StdRng) {
-        assert_location_resolution(
-            indoc! {"
-                impl Foo {
-                    fn new() -> Self {
-                        Self {
-                            subscriptions: vec![
-                                cx.observe_window_activation(window, |editor, window, cx| {
-                                    let active = window.is_window_active();
-                                    editor.blink_manager.update(cx, |blink_manager, cx| {
-                                        if active {
-                                            blink_manager.enable(cx);
-                                        } else {
-                                            blink_manager.disable(cx);
-                                        }
-                                    });
-                                }),
-                            ];
-                        }
-                    }
-                }
-            "},
-            concat!(
-                "                    editor.blink_manager.update(cx, |blink_manager, cx| {\n",
-                "                        blink_manager.enable(cx);\n",
-                "                    });",
-            ),
-            &mut rng,
-        );
-    }
-
-    #[gpui::test(iterations = 100)]
-    fn test_resolve_location_tool_invocation(mut rng: StdRng) {
-        assert_location_resolution(
-            indoc! {r#"
-                let tool = cx
-                    .update(|cx| working_set.tool(&tool_name, cx))
-                    .map_err(|err| {
-                        anyhow!("Failed to look up tool '{}': {}", tool_name, err)
-                    })?;
-
-                let Some(tool) = tool else {
-                    return Err(anyhow!("Tool '{}' not found", tool_name));
-                };
-
-                let project = project.clone();
-                let action_log = action_log.clone();
-                let messages = messages.clone();
-                let tool_result = cx
-                    .update(|cx| tool.run(invocation.input, &messages, project, action_log, cx))
-                    .map_err(|err| anyhow!("Failed to start tool '{}': {}", tool_name, err))?;
-
-                tasks.push(tool_result.output);
-            "#},
-            concat!(
-                "let tool_result = cx\n",
-                "    .update(|cx| tool.run(invocation.input, &messages, project, action_log, cx))\n",
-                "    .output;",
-            ),
-            &mut rng,
-        );
-    }
-
-    #[gpui::test]
-    fn test_line_hint_selection() {
-        let text = indoc! {r#"
-            fn first_function() {
-                return 42;
-            }
-
-            fn second_function() {
-                return 42;
-            }
-
-            fn third_function() {
-                return 42;
-            }
-        "#};
-
-        let buffer = TextBuffer::new(
-            ReplicaId::LOCAL,
-            BufferId::new(1).unwrap(),
-            text.to_string(),
-        );
-        let snapshot = buffer.snapshot();
-        let mut matcher = StreamingFuzzyMatcher::new(snapshot.clone());
-
-        // Given a query that matches all three functions
-        let query = "return 42;\n";
-
-        // Test with line hint pointing to second function (around line 5)
-        let best_match = matcher.push(query, Some(5)).expect("Failed to match query");
-
-        let matched_text = snapshot
-            .text_for_range(best_match.clone())
-            .collect::<String>();
-        assert!(matched_text.contains("return 42;"));
-        assert_eq!(
-            best_match,
-            63..77,
-            "Expected to match `second_function` based on the line hint"
-        );
-
-        let mut matcher = StreamingFuzzyMatcher::new(snapshot);
-        matcher.push(query, None);
-        matcher.finish();
-        let best_match = matcher.select_best_match();
-        assert!(
-            best_match.is_none(),
-            "Best match should be None when query cannot be uniquely resolved"
-        );
-    }
-
-    #[track_caller]
-    fn assert_location_resolution(text_with_expected_range: &str, query: &str, rng: &mut StdRng) {
-        let (text, expected_ranges) = marked_text_ranges(text_with_expected_range, false);
-        let buffer = TextBuffer::new(ReplicaId::LOCAL, BufferId::new(1).unwrap(), text.clone());
-        let snapshot = buffer.snapshot();
-
-        let mut matcher = StreamingFuzzyMatcher::new(snapshot);
-
-        // Split query into random chunks
-        let chunks = to_random_chunks(rng, query);
-
-        // Push chunks incrementally
-        for chunk in &chunks {
-            matcher.push(chunk, None);
-        }
-
-        let actual_ranges = matcher.finish();
-
-        // If no expected ranges, we expect no match
-        if expected_ranges.is_empty() {
-            assert!(
-                actual_ranges.is_empty(),
-                "Expected no match for query: {:?}, but found: {:?}",
-                query,
-                actual_ranges
-            );
-        } else {
-            let text_with_actual_range = generate_marked_text(&text, &actual_ranges, false);
-            pretty_assertions::assert_eq!(
-                text_with_actual_range,
-                text_with_expected_range,
-                indoc! {"
-                    Query: {:?}
-                    Chunks: {:?}
-                    Expected marked text: {}
-                    Actual marked text: {}
-                    Expected ranges: {:?}
-                    Actual ranges: {:?}"
-                },
-                query,
-                chunks,
-                text_with_expected_range,
-                text_with_actual_range,
-                expected_ranges,
-                actual_ranges
-            );
-        }
-    }
-
-    fn to_random_chunks(rng: &mut StdRng, input: &str) -> Vec<String> {
-        let chunk_count = rng.random_range(1..=cmp::min(input.len(), 50));
-        let mut chunk_indices = (0..input.len()).choose_multiple(rng, chunk_count);
-        chunk_indices.sort();
-        chunk_indices.push(input.len());
-
-        let mut chunks = Vec::new();
-        let mut last_ix = 0;
-        for chunk_ix in chunk_indices {
-            chunks.push(input[last_ix..chunk_ix].to_string());
-            last_ix = chunk_ix;
-        }
-        chunks
-    }
-
-    fn push(finder: &mut StreamingFuzzyMatcher, chunk: &str) -> Option<String> {
-        finder
-            .push(chunk, None)
-            .map(|range| finder.snapshot.text_for_range(range).collect::<String>())
-    }
-
-    fn finish(mut finder: StreamingFuzzyMatcher) -> Option<String> {
-        let snapshot = finder.snapshot.clone();
-        let matches = finder.finish();
-        matches
-            .first()
-            .map(|range| snapshot.text_for_range(range.clone()).collect::<String>())
-    }
-}
diff --git a/crates/agent/src/history_store.rs b/crates/agent/src/history_store.rs
deleted file mode 100644
index 5a1b923d13..0000000000
--- a/crates/agent/src/history_store.rs
+++ /dev/null
@@ -1,412 +0,0 @@
-use crate::{DbThread, DbThreadMetadata, ThreadsDatabase};
-use acp_thread::MentionUri;
-use agent_client_protocol as acp;
-use anyhow::{Context as _, Result, anyhow};
-use assistant_text_thread::{SavedTextThreadMetadata, TextThread};
-use chrono::{DateTime, Utc};
-use db::kvp::KEY_VALUE_STORE;
-use gpui::{App, AsyncApp, Entity, SharedString, Task, prelude::*};
-use itertools::Itertools;
-use paths::text_threads_dir;
-use project::Project;
-use serde::{Deserialize, Serialize};
-use std::{collections::VecDeque, path::Path, rc::Rc, sync::Arc, time::Duration};
-use ui::ElementId;
-use util::ResultExt as _;
-
-const MAX_RECENTLY_OPENED_ENTRIES: usize = 6;
-const RECENTLY_OPENED_THREADS_KEY: &str = "recent-agent-threads";
-const SAVE_RECENTLY_OPENED_ENTRIES_DEBOUNCE: Duration = Duration::from_millis(50);
-
-const DEFAULT_TITLE: &SharedString = &SharedString::new_static("New Thread");
-
-//todo: We should remove this function once we support loading all acp thread
-pub fn load_agent_thread(
-    session_id: acp::SessionId,
-    history_store: Entity<HistoryStore>,
-    project: Entity<Project>,
-    cx: &mut App,
-) -> Task<Result<Entity<crate::Thread>>> {
-    use agent_servers::{AgentServer, AgentServerDelegate};
-
-    let server = Rc::new(crate::NativeAgentServer::new(
-        project.read(cx).fs().clone(),
-        history_store,
-    ));
-    let delegate = AgentServerDelegate::new(
-        project.read(cx).agent_server_store().clone(),
-        project.clone(),
-        None,
-        None,
-    );
-    let connection = server.connect(None, delegate, cx);
-    cx.spawn(async move |cx| {
-        let (agent, _) = connection.await?;
-        let agent = agent.downcast::<crate::NativeAgentConnection>().unwrap();
-        cx.update(|cx| agent.load_thread(session_id, cx))?.await
-    })
-}
-
-#[derive(Clone, Debug)]
-pub enum HistoryEntry {
-    AcpThread(DbThreadMetadata),
-    TextThread(SavedTextThreadMetadata),
-}
-
-impl HistoryEntry {
-    pub fn updated_at(&self) -> DateTime<Utc> {
-        match self {
-            HistoryEntry::AcpThread(thread) => thread.updated_at,
-            HistoryEntry::TextThread(text_thread) => text_thread.mtime.to_utc(),
-        }
-    }
-
-    pub fn id(&self) -> HistoryEntryId {
-        match self {
-            HistoryEntry::AcpThread(thread) => HistoryEntryId::AcpThread(thread.id.clone()),
-            HistoryEntry::TextThread(text_thread) => {
-                HistoryEntryId::TextThread(text_thread.path.clone())
-            }
-        }
-    }
-
-    pub fn mention_uri(&self) -> MentionUri {
-        match self {
-            HistoryEntry::AcpThread(thread) => MentionUri::Thread {
-                id: thread.id.clone(),
-                name: thread.title.to_string(),
-            },
-            HistoryEntry::TextThread(text_thread) => MentionUri::TextThread {
-                path: text_thread.path.as_ref().to_owned(),
-                name: text_thread.title.to_string(),
-            },
-        }
-    }
-
-    pub fn title(&self) -> &SharedString {
-        match self {
-            HistoryEntry::AcpThread(thread) => {
-                if thread.title.is_empty() {
-                    DEFAULT_TITLE
-                } else {
-                    &thread.title
-                }
-            }
-            HistoryEntry::TextThread(text_thread) => &text_thread.title,
-        }
-    }
-}
-
-/// Generic identifier for a history entry.
-#[derive(Clone, PartialEq, Eq, Debug, Hash)]
-pub enum HistoryEntryId {
-    AcpThread(acp::SessionId),
-    TextThread(Arc<Path>),
-}
-
-impl Into<ElementId> for HistoryEntryId {
-    fn into(self) -> ElementId {
-        match self {
-            HistoryEntryId::AcpThread(session_id) => ElementId::Name(session_id.0.into()),
-            HistoryEntryId::TextThread(path) => ElementId::Path(path),
-        }
-    }
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-enum SerializedRecentOpen {
-    AcpThread(String),
-    TextThread(String),
-}
-
-pub struct HistoryStore {
-    threads: Vec<DbThreadMetadata>,
-    entries: Vec<HistoryEntry>,
-    text_thread_store: Entity<assistant_text_thread::TextThreadStore>,
-    recently_opened_entries: VecDeque<HistoryEntryId>,
-    _subscriptions: Vec<gpui::Subscription>,
-    _save_recently_opened_entries_task: Task<()>,
-}
-
-impl HistoryStore {
-    pub fn new(
-        text_thread_store: Entity<assistant_text_thread::TextThreadStore>,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let subscriptions =
-            vec![cx.observe(&text_thread_store, |this, _, cx| this.update_entries(cx))];
-
-        cx.spawn(async move |this, cx| {
-            let entries = Self::load_recently_opened_entries(cx).await;
-            this.update(cx, |this, cx| {
-                if let Some(entries) = entries.log_err() {
-                    this.recently_opened_entries = entries;
-                }
-
-                this.reload(cx);
-            })
-            .ok();
-        })
-        .detach();
-
-        Self {
-            text_thread_store,
-            recently_opened_entries: VecDeque::default(),
-            threads: Vec::default(),
-            entries: Vec::default(),
-            _subscriptions: subscriptions,
-            _save_recently_opened_entries_task: Task::ready(()),
-        }
-    }
-
-    pub fn thread_from_session_id(&self, session_id: &acp::SessionId) -> Option<&DbThreadMetadata> {
-        self.threads.iter().find(|thread| &thread.id == session_id)
-    }
-
-    pub fn load_thread(
-        &mut self,
-        id: acp::SessionId,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Option<DbThread>>> {
-        let database_future = ThreadsDatabase::connect(cx);
-        cx.background_spawn(async move {
-            let database = database_future.await.map_err(|err| anyhow!(err))?;
-            database.load_thread(id).await
-        })
-    }
-
-    pub fn delete_thread(
-        &mut self,
-        id: acp::SessionId,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let database_future = ThreadsDatabase::connect(cx);
-        cx.spawn(async move |this, cx| {
-            let database = database_future.await.map_err(|err| anyhow!(err))?;
-            database.delete_thread(id.clone()).await?;
-            this.update(cx, |this, cx| this.reload(cx))
-        })
-    }
-
-    pub fn delete_threads(&mut self, cx: &mut Context<Self>) -> Task<Result<()>> {
-        let database_future = ThreadsDatabase::connect(cx);
-        cx.spawn(async move |this, cx| {
-            let database = database_future.await.map_err(|err| anyhow!(err))?;
-            database.delete_threads().await?;
-            this.update(cx, |this, cx| this.reload(cx))
-        })
-    }
-
-    pub fn delete_text_thread(
-        &mut self,
-        path: Arc<Path>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        self.text_thread_store
-            .update(cx, |store, cx| store.delete_local(path, cx))
-    }
-
-    pub fn load_text_thread(
-        &self,
-        path: Arc<Path>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Entity<TextThread>>> {
-        self.text_thread_store
-            .update(cx, |store, cx| store.open_local(path, cx))
-    }
-
-    pub fn reload(&self, cx: &mut Context<Self>) {
-        let database_future = ThreadsDatabase::connect(cx);
-        cx.spawn(async move |this, cx| {
-            let threads = database_future
-                .await
-                .map_err(|err| anyhow!(err))?
-                .list_threads()
-                .await?;
-
-            this.update(cx, |this, cx| {
-                if this.recently_opened_entries.len() < MAX_RECENTLY_OPENED_ENTRIES {
-                    for thread in threads
-                        .iter()
-                        .take(MAX_RECENTLY_OPENED_ENTRIES - this.recently_opened_entries.len())
-                        .rev()
-                    {
-                        this.push_recently_opened_entry(
-                            HistoryEntryId::AcpThread(thread.id.clone()),
-                            cx,
-                        )
-                    }
-                }
-                this.threads = threads;
-                this.update_entries(cx);
-            })
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn update_entries(&mut self, cx: &mut Context<Self>) {
-        #[cfg(debug_assertions)]
-        if std::env::var("ZED_SIMULATE_NO_THREAD_HISTORY").is_ok() {
-            return;
-        }
-        let mut history_entries = Vec::new();
-        history_entries.extend(self.threads.iter().cloned().map(HistoryEntry::AcpThread));
-        history_entries.extend(
-            self.text_thread_store
-                .read(cx)
-                .unordered_text_threads()
-                .cloned()
-                .map(HistoryEntry::TextThread),
-        );
-
-        history_entries.sort_unstable_by_key(|entry| std::cmp::Reverse(entry.updated_at()));
-        self.entries = history_entries;
-        cx.notify()
-    }
-
-    pub fn is_empty(&self, _cx: &App) -> bool {
-        self.entries.is_empty()
-    }
-
-    pub fn recently_opened_entries(&self, cx: &App) -> Vec<HistoryEntry> {
-        #[cfg(debug_assertions)]
-        if std::env::var("ZED_SIMULATE_NO_THREAD_HISTORY").is_ok() {
-            return Vec::new();
-        }
-
-        let thread_entries = self.threads.iter().flat_map(|thread| {
-            self.recently_opened_entries
-                .iter()
-                .enumerate()
-                .flat_map(|(index, entry)| match entry {
-                    HistoryEntryId::AcpThread(id) if &thread.id == id => {
-                        Some((index, HistoryEntry::AcpThread(thread.clone())))
-                    }
-                    _ => None,
-                })
-        });
-
-        let context_entries = self
-            .text_thread_store
-            .read(cx)
-            .unordered_text_threads()
-            .flat_map(|text_thread| {
-                self.recently_opened_entries
-                    .iter()
-                    .enumerate()
-                    .flat_map(|(index, entry)| match entry {
-                        HistoryEntryId::TextThread(path) if &text_thread.path == path => {
-                            Some((index, HistoryEntry::TextThread(text_thread.clone())))
-                        }
-                        _ => None,
-                    })
-            });
-
-        thread_entries
-            .chain(context_entries)
-            // optimization to halt iteration early
-            .take(self.recently_opened_entries.len())
-            .sorted_unstable_by_key(|(index, _)| *index)
-            .map(|(_, entry)| entry)
-            .collect()
-    }
-
-    fn save_recently_opened_entries(&mut self, cx: &mut Context<Self>) {
-        let serialized_entries = self
-            .recently_opened_entries
-            .iter()
-            .filter_map(|entry| match entry {
-                HistoryEntryId::TextThread(path) => path.file_name().map(|file| {
-                    SerializedRecentOpen::TextThread(file.to_string_lossy().into_owned())
-                }),
-                HistoryEntryId::AcpThread(id) => {
-                    Some(SerializedRecentOpen::AcpThread(id.to_string()))
-                }
-            })
-            .collect::<Vec<_>>();
-
-        self._save_recently_opened_entries_task = cx.spawn(async move |_, cx| {
-            let content = serde_json::to_string(&serialized_entries).unwrap();
-            cx.background_executor()
-                .timer(SAVE_RECENTLY_OPENED_ENTRIES_DEBOUNCE)
-                .await;
-
-            if cfg!(any(feature = "test-support", test)) {
-                return;
-            }
-            KEY_VALUE_STORE
-                .write_kvp(RECENTLY_OPENED_THREADS_KEY.to_owned(), content)
-                .await
-                .log_err();
-        });
-    }
-
-    fn load_recently_opened_entries(cx: &AsyncApp) -> Task<Result<VecDeque<HistoryEntryId>>> {
-        cx.background_spawn(async move {
-            if cfg!(any(feature = "test-support", test)) {
-                anyhow::bail!("history store does not persist in tests");
-            }
-            let json = KEY_VALUE_STORE
-                .read_kvp(RECENTLY_OPENED_THREADS_KEY)?
-                .unwrap_or("[]".to_string());
-            let entries = serde_json::from_str::<Vec<SerializedRecentOpen>>(&json)
-                .context("deserializing persisted agent panel navigation history")?
-                .into_iter()
-                .take(MAX_RECENTLY_OPENED_ENTRIES)
-                .flat_map(|entry| match entry {
-                    SerializedRecentOpen::AcpThread(id) => {
-                        Some(HistoryEntryId::AcpThread(acp::SessionId::new(id.as_str())))
-                    }
-                    SerializedRecentOpen::TextThread(file_name) => Some(
-                        HistoryEntryId::TextThread(text_threads_dir().join(file_name).into()),
-                    ),
-                })
-                .collect();
-            Ok(entries)
-        })
-    }
-
-    pub fn push_recently_opened_entry(&mut self, entry: HistoryEntryId, cx: &mut Context<Self>) {
-        self.recently_opened_entries
-            .retain(|old_entry| old_entry != &entry);
-        self.recently_opened_entries.push_front(entry);
-        self.recently_opened_entries
-            .truncate(MAX_RECENTLY_OPENED_ENTRIES);
-        self.save_recently_opened_entries(cx);
-    }
-
-    pub fn remove_recently_opened_thread(&mut self, id: acp::SessionId, cx: &mut Context<Self>) {
-        self.recently_opened_entries.retain(
-            |entry| !matches!(entry, HistoryEntryId::AcpThread(thread_id) if thread_id == &id),
-        );
-        self.save_recently_opened_entries(cx);
-    }
-
-    pub fn replace_recently_opened_text_thread(
-        &mut self,
-        old_path: &Path,
-        new_path: &Arc<Path>,
-        cx: &mut Context<Self>,
-    ) {
-        for entry in &mut self.recently_opened_entries {
-            match entry {
-                HistoryEntryId::TextThread(path) if path.as_ref() == old_path => {
-                    *entry = HistoryEntryId::TextThread(new_path.clone());
-                    break;
-                }
-                _ => {}
-            }
-        }
-        self.save_recently_opened_entries(cx);
-    }
-
-    pub fn remove_recently_opened_entry(&mut self, entry: &HistoryEntryId, cx: &mut Context<Self>) {
-        self.recently_opened_entries
-            .retain(|old_entry| old_entry != entry);
-        self.save_recently_opened_entries(cx);
-    }
-
-    pub fn entries(&self) -> impl Iterator<Item = HistoryEntry> {
-        self.entries.iter().cloned()
-    }
-}
diff --git a/crates/agent/src/legacy_thread.rs b/crates/agent/src/legacy_thread.rs
deleted file mode 100644
index 34babb8006..0000000000
--- a/crates/agent/src/legacy_thread.rs
+++ /dev/null
@@ -1,402 +0,0 @@
-use crate::ProjectSnapshot;
-use agent_settings::{AgentProfileId, CompletionMode};
-use anyhow::Result;
-use chrono::{DateTime, Utc};
-use gpui::SharedString;
-use language_model::{LanguageModelToolResultContent, LanguageModelToolUseId, Role, TokenUsage};
-use serde::{Deserialize, Serialize};
-use std::sync::Arc;
-
-#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq)]
-pub enum DetailedSummaryState {
-    #[default]
-    NotGenerated,
-    Generating,
-    Generated {
-        text: SharedString,
-    },
-}
-
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy, Serialize, Deserialize)]
-pub struct MessageId(pub usize);
-
-#[derive(Serialize, Deserialize, Debug, PartialEq)]
-pub struct SerializedThread {
-    pub version: String,
-    pub summary: SharedString,
-    pub updated_at: DateTime<Utc>,
-    pub messages: Vec<SerializedMessage>,
-    #[serde(default)]
-    pub initial_project_snapshot: Option<Arc<ProjectSnapshot>>,
-    #[serde(default)]
-    pub cumulative_token_usage: TokenUsage,
-    #[serde(default)]
-    pub request_token_usage: Vec<TokenUsage>,
-    #[serde(default)]
-    pub detailed_summary_state: DetailedSummaryState,
-    #[serde(default)]
-    pub model: Option<SerializedLanguageModel>,
-    #[serde(default)]
-    pub completion_mode: Option<CompletionMode>,
-    #[serde(default)]
-    pub tool_use_limit_reached: bool,
-    #[serde(default)]
-    pub profile: Option<AgentProfileId>,
-}
-
-#[derive(Serialize, Deserialize, Debug, PartialEq)]
-pub struct SerializedLanguageModel {
-    pub provider: String,
-    pub model: String,
-}
-
-impl SerializedThread {
-    pub const VERSION: &'static str = "0.2.0";
-
-    pub fn from_json(json: &[u8]) -> Result<Self> {
-        let saved_thread_json = serde_json::from_slice::<serde_json::Value>(json)?;
-        match saved_thread_json.get("version") {
-            Some(serde_json::Value::String(version)) => match version.as_str() {
-                SerializedThreadV0_1_0::VERSION => {
-                    let saved_thread =
-                        serde_json::from_value::<SerializedThreadV0_1_0>(saved_thread_json)?;
-                    Ok(saved_thread.upgrade())
-                }
-                SerializedThread::VERSION => Ok(serde_json::from_value::<SerializedThread>(
-                    saved_thread_json,
-                )?),
-                _ => anyhow::bail!("unrecognized serialized thread version: {version:?}"),
-            },
-            None => {
-                let saved_thread =
-                    serde_json::from_value::<LegacySerializedThread>(saved_thread_json)?;
-                Ok(saved_thread.upgrade())
-            }
-            version => anyhow::bail!("unrecognized serialized thread version: {version:?}"),
-        }
-    }
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct SerializedThreadV0_1_0(
-    // The structure did not change, so we are reusing the latest SerializedThread.
-    // When making the next version, make sure this points to SerializedThreadV0_2_0
-    SerializedThread,
-);
-
-impl SerializedThreadV0_1_0 {
-    pub const VERSION: &'static str = "0.1.0";
-
-    pub fn upgrade(self) -> SerializedThread {
-        debug_assert_eq!(SerializedThread::VERSION, "0.2.0");
-
-        let mut messages: Vec<SerializedMessage> = Vec::with_capacity(self.0.messages.len());
-
-        for message in self.0.messages {
-            if message.role == Role::User
-                && !message.tool_results.is_empty()
-                && let Some(last_message) = messages.last_mut()
-            {
-                debug_assert!(last_message.role == Role::Assistant);
-
-                last_message.tool_results = message.tool_results;
-                continue;
-            }
-
-            messages.push(message);
-        }
-
-        SerializedThread {
-            messages,
-            version: SerializedThread::VERSION.to_string(),
-            ..self.0
-        }
-    }
-}
-
-#[derive(Debug, Serialize, Deserialize, PartialEq)]
-pub struct SerializedMessage {
-    pub id: MessageId,
-    pub role: Role,
-    #[serde(default)]
-    pub segments: Vec<SerializedMessageSegment>,
-    #[serde(default)]
-    pub tool_uses: Vec<SerializedToolUse>,
-    #[serde(default)]
-    pub tool_results: Vec<SerializedToolResult>,
-    #[serde(default)]
-    pub context: String,
-    #[serde(default)]
-    pub creases: Vec<SerializedCrease>,
-    #[serde(default)]
-    pub is_hidden: bool,
-}
-
-#[derive(Debug, Serialize, Deserialize, PartialEq)]
-#[serde(tag = "type")]
-pub enum SerializedMessageSegment {
-    #[serde(rename = "text")]
-    Text {
-        text: String,
-    },
-    #[serde(rename = "thinking")]
-    Thinking {
-        text: String,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        signature: Option<String>,
-    },
-    RedactedThinking {
-        data: String,
-    },
-}
-
-#[derive(Debug, Serialize, Deserialize, PartialEq)]
-pub struct SerializedToolUse {
-    pub id: LanguageModelToolUseId,
-    pub name: SharedString,
-    pub input: serde_json::Value,
-}
-
-#[derive(Debug, Serialize, Deserialize, PartialEq)]
-pub struct SerializedToolResult {
-    pub tool_use_id: LanguageModelToolUseId,
-    pub is_error: bool,
-    pub content: LanguageModelToolResultContent,
-    pub output: Option<serde_json::Value>,
-}
-
-#[derive(Serialize, Deserialize)]
-struct LegacySerializedThread {
-    pub summary: SharedString,
-    pub updated_at: DateTime<Utc>,
-    pub messages: Vec<LegacySerializedMessage>,
-    #[serde(default)]
-    pub initial_project_snapshot: Option<Arc<ProjectSnapshot>>,
-}
-
-impl LegacySerializedThread {
-    pub fn upgrade(self) -> SerializedThread {
-        SerializedThread {
-            version: SerializedThread::VERSION.to_string(),
-            summary: self.summary,
-            updated_at: self.updated_at,
-            messages: self.messages.into_iter().map(|msg| msg.upgrade()).collect(),
-            initial_project_snapshot: self.initial_project_snapshot,
-            cumulative_token_usage: TokenUsage::default(),
-            request_token_usage: Vec::new(),
-            detailed_summary_state: DetailedSummaryState::default(),
-            model: None,
-            completion_mode: None,
-            tool_use_limit_reached: false,
-            profile: None,
-        }
-    }
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-struct LegacySerializedMessage {
-    pub id: MessageId,
-    pub role: Role,
-    pub text: String,
-    #[serde(default)]
-    pub tool_uses: Vec<SerializedToolUse>,
-    #[serde(default)]
-    pub tool_results: Vec<SerializedToolResult>,
-}
-
-impl LegacySerializedMessage {
-    fn upgrade(self) -> SerializedMessage {
-        SerializedMessage {
-            id: self.id,
-            role: self.role,
-            segments: vec![SerializedMessageSegment::Text { text: self.text }],
-            tool_uses: self.tool_uses,
-            tool_results: self.tool_results,
-            context: String::new(),
-            creases: Vec::new(),
-            is_hidden: false,
-        }
-    }
-}
-
-#[derive(Debug, Serialize, Deserialize, PartialEq)]
-pub struct SerializedCrease {
-    pub start: usize,
-    pub end: usize,
-    pub icon_path: SharedString,
-    pub label: SharedString,
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use chrono::Utc;
-    use language_model::{Role, TokenUsage};
-    use pretty_assertions::assert_eq;
-
-    #[test]
-    fn test_legacy_serialized_thread_upgrade() {
-        let updated_at = Utc::now();
-        let legacy_thread = LegacySerializedThread {
-            summary: "Test conversation".into(),
-            updated_at,
-            messages: vec![LegacySerializedMessage {
-                id: MessageId(1),
-                role: Role::User,
-                text: "Hello, world!".to_string(),
-                tool_uses: vec![],
-                tool_results: vec![],
-            }],
-            initial_project_snapshot: None,
-        };
-
-        let upgraded = legacy_thread.upgrade();
-
-        assert_eq!(
-            upgraded,
-            SerializedThread {
-                summary: "Test conversation".into(),
-                updated_at,
-                messages: vec![SerializedMessage {
-                    id: MessageId(1),
-                    role: Role::User,
-                    segments: vec![SerializedMessageSegment::Text {
-                        text: "Hello, world!".to_string()
-                    }],
-                    tool_uses: vec![],
-                    tool_results: vec![],
-                    context: "".to_string(),
-                    creases: vec![],
-                    is_hidden: false
-                }],
-                version: SerializedThread::VERSION.to_string(),
-                initial_project_snapshot: None,
-                cumulative_token_usage: TokenUsage::default(),
-                request_token_usage: vec![],
-                detailed_summary_state: DetailedSummaryState::default(),
-                model: None,
-                completion_mode: None,
-                tool_use_limit_reached: false,
-                profile: None
-            }
-        )
-    }
-
-    #[test]
-    fn test_serialized_threadv0_1_0_upgrade() {
-        let updated_at = Utc::now();
-        let thread_v0_1_0 = SerializedThreadV0_1_0(SerializedThread {
-            summary: "Test conversation".into(),
-            updated_at,
-            messages: vec![
-                SerializedMessage {
-                    id: MessageId(1),
-                    role: Role::User,
-                    segments: vec![SerializedMessageSegment::Text {
-                        text: "Use tool_1".to_string(),
-                    }],
-                    tool_uses: vec![],
-                    tool_results: vec![],
-                    context: "".to_string(),
-                    creases: vec![],
-                    is_hidden: false,
-                },
-                SerializedMessage {
-                    id: MessageId(2),
-                    role: Role::Assistant,
-                    segments: vec![SerializedMessageSegment::Text {
-                        text: "I want to use a tool".to_string(),
-                    }],
-                    tool_uses: vec![SerializedToolUse {
-                        id: "abc".into(),
-                        name: "tool_1".into(),
-                        input: serde_json::Value::Null,
-                    }],
-                    tool_results: vec![],
-                    context: "".to_string(),
-                    creases: vec![],
-                    is_hidden: false,
-                },
-                SerializedMessage {
-                    id: MessageId(1),
-                    role: Role::User,
-                    segments: vec![SerializedMessageSegment::Text {
-                        text: "Here is the tool result".to_string(),
-                    }],
-                    tool_uses: vec![],
-                    tool_results: vec![SerializedToolResult {
-                        tool_use_id: "abc".into(),
-                        is_error: false,
-                        content: LanguageModelToolResultContent::Text("abcdef".into()),
-                        output: Some(serde_json::Value::Null),
-                    }],
-                    context: "".to_string(),
-                    creases: vec![],
-                    is_hidden: false,
-                },
-            ],
-            version: SerializedThreadV0_1_0::VERSION.to_string(),
-            initial_project_snapshot: None,
-            cumulative_token_usage: TokenUsage::default(),
-            request_token_usage: vec![],
-            detailed_summary_state: DetailedSummaryState::default(),
-            model: None,
-            completion_mode: None,
-            tool_use_limit_reached: false,
-            profile: None,
-        });
-        let upgraded = thread_v0_1_0.upgrade();
-
-        assert_eq!(
-            upgraded,
-            SerializedThread {
-                summary: "Test conversation".into(),
-                updated_at,
-                messages: vec![
-                    SerializedMessage {
-                        id: MessageId(1),
-                        role: Role::User,
-                        segments: vec![SerializedMessageSegment::Text {
-                            text: "Use tool_1".to_string()
-                        }],
-                        tool_uses: vec![],
-                        tool_results: vec![],
-                        context: "".to_string(),
-                        creases: vec![],
-                        is_hidden: false
-                    },
-                    SerializedMessage {
-                        id: MessageId(2),
-                        role: Role::Assistant,
-                        segments: vec![SerializedMessageSegment::Text {
-                            text: "I want to use a tool".to_string(),
-                        }],
-                        tool_uses: vec![SerializedToolUse {
-                            id: "abc".into(),
-                            name: "tool_1".into(),
-                            input: serde_json::Value::Null,
-                        }],
-                        tool_results: vec![SerializedToolResult {
-                            tool_use_id: "abc".into(),
-                            is_error: false,
-                            content: LanguageModelToolResultContent::Text("abcdef".into()),
-                            output: Some(serde_json::Value::Null),
-                        }],
-                        context: "".to_string(),
-                        creases: vec![],
-                        is_hidden: false,
-                    },
-                ],
-                version: SerializedThread::VERSION.to_string(),
-                initial_project_snapshot: None,
-                cumulative_token_usage: TokenUsage::default(),
-                request_token_usage: vec![],
-                detailed_summary_state: DetailedSummaryState::default(),
-                model: None,
-                completion_mode: None,
-                tool_use_limit_reached: false,
-                profile: None
-            }
-        )
-    }
-}
diff --git a/crates/agent/src/native_agent_server.rs b/crates/agent/src/native_agent_server.rs
deleted file mode 100644
index a9ade8141a..0000000000
--- a/crates/agent/src/native_agent_server.rs
+++ /dev/null
@@ -1,122 +0,0 @@
-use std::{any::Any, path::Path, rc::Rc, sync::Arc};
-
-use agent_servers::{AgentServer, AgentServerDelegate};
-use anyhow::Result;
-use fs::Fs;
-use gpui::{App, Entity, SharedString, Task};
-use prompt_store::PromptStore;
-
-use crate::{HistoryStore, NativeAgent, NativeAgentConnection, templates::Templates};
-
-#[derive(Clone)]
-pub struct NativeAgentServer {
-    fs: Arc<dyn Fs>,
-    history: Entity<HistoryStore>,
-}
-
-impl NativeAgentServer {
-    pub fn new(fs: Arc<dyn Fs>, history: Entity<HistoryStore>) -> Self {
-        Self { fs, history }
-    }
-}
-
-impl AgentServer for NativeAgentServer {
-    fn name(&self) -> SharedString {
-        "Zed Agent".into()
-    }
-
-    fn logo(&self) -> ui::IconName {
-        ui::IconName::ZedAgent
-    }
-
-    fn connect(
-        &self,
-        _root_dir: Option<&Path>,
-        delegate: AgentServerDelegate,
-        cx: &mut App,
-    ) -> Task<
-        Result<(
-            Rc<dyn acp_thread::AgentConnection>,
-            Option<task::SpawnInTerminal>,
-        )>,
-    > {
-        log::debug!(
-            "NativeAgentServer::connect called for path: {:?}",
-            _root_dir
-        );
-        let project = delegate.project().clone();
-        let fs = self.fs.clone();
-        let history = self.history.clone();
-        let prompt_store = PromptStore::global(cx);
-        cx.spawn(async move |cx| {
-            log::debug!("Creating templates for native agent");
-            let templates = Templates::new();
-            let prompt_store = prompt_store.await?;
-
-            log::debug!("Creating native agent entity");
-            let agent =
-                NativeAgent::new(project, history, templates, Some(prompt_store), fs, cx).await?;
-
-            // Create the connection wrapper
-            let connection = NativeAgentConnection(agent);
-            log::debug!("NativeAgentServer connection established successfully");
-
-            Ok((
-                Rc::new(connection) as Rc<dyn acp_thread::AgentConnection>,
-                None,
-            ))
-        })
-    }
-
-    fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
-        self
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    use assistant_text_thread::TextThreadStore;
-    use gpui::AppContext;
-
-    agent_servers::e2e_tests::common_e2e_tests!(
-        async |fs, project, cx| {
-            let auth = cx.update(|cx| {
-                prompt_store::init(cx);
-                let registry = language_model::LanguageModelRegistry::read_global(cx);
-                let auth = registry
-                    .provider(&language_model::ANTHROPIC_PROVIDER_ID)
-                    .unwrap()
-                    .authenticate(cx);
-
-                cx.spawn(async move |_| auth.await)
-            });
-
-            auth.await.unwrap();
-
-            cx.update(|cx| {
-                let registry = language_model::LanguageModelRegistry::global(cx);
-
-                registry.update(cx, |registry, cx| {
-                    registry.select_default_model(
-                        Some(&language_model::SelectedModel {
-                            provider: language_model::ANTHROPIC_PROVIDER_ID,
-                            model: language_model::LanguageModelId("claude-sonnet-4-latest".into()),
-                        }),
-                        cx,
-                    );
-                });
-            });
-
-            let history = cx.update(|cx| {
-                let text_thread_store =
-                    cx.new(move |cx| TextThreadStore::fake(project.clone(), cx));
-                cx.new(move |cx| HistoryStore::new(text_thread_store, cx))
-            });
-
-            NativeAgentServer::new(fs.clone(), history)
-        },
-        allow_option_id = "allow"
-    );
-}
diff --git a/crates/agent/src/outline.rs b/crates/agent/src/outline.rs
deleted file mode 100644
index 77af4849ff..0000000000
--- a/crates/agent/src/outline.rs
+++ /dev/null
@@ -1,218 +0,0 @@
-use anyhow::Result;
-use gpui::{AsyncApp, Entity};
-use language::{Buffer, OutlineItem};
-use regex::Regex;
-use std::fmt::Write;
-use text::Point;
-
-/// For files over this size, instead of reading them (or including them in context),
-/// we automatically provide the file's symbol outline instead, with line numbers.
-pub const AUTO_OUTLINE_SIZE: usize = 16384;
-
-/// Result of getting buffer content, which can be either full content or an outline.
-pub struct BufferContent {
-    /// The actual content (either full text or outline)
-    pub text: String,
-    /// Whether this is an outline (true) or full content (false)
-    pub is_outline: bool,
-}
-
-/// Returns either the full content of a buffer or its outline, depending on size.
-/// For files larger than AUTO_OUTLINE_SIZE, returns an outline with a header.
-/// For smaller files, returns the full content.
-pub async fn get_buffer_content_or_outline(
-    buffer: Entity<Buffer>,
-    path: Option<&str>,
-    cx: &AsyncApp,
-) -> Result<BufferContent> {
-    let file_size = buffer.read_with(cx, |buffer, _| buffer.text().len())?;
-
-    if file_size > AUTO_OUTLINE_SIZE {
-        // For large files, use outline instead of full content
-        // Wait until the buffer has been fully parsed, so we can read its outline
-        buffer
-            .read_with(cx, |buffer, _| buffer.parsing_idle())?
-            .await;
-
-        let outline_items = buffer.read_with(cx, |buffer, _| {
-            let snapshot = buffer.snapshot();
-            snapshot
-                .outline(None)
-                .items
-                .into_iter()
-                .map(|item| item.to_point(&snapshot))
-                .collect::<Vec<_>>()
-        })?;
-
-        // If no outline exists, fall back to first 1KB so the agent has some context
-        if outline_items.is_empty() {
-            let text = buffer.read_with(cx, |buffer, _| {
-                let snapshot = buffer.snapshot();
-                let len = snapshot.len().min(snapshot.as_rope().floor_char_boundary(1024));
-                let content = snapshot.text_for_range(0..len).collect::<String>();
-                if let Some(path) = path {
-                    format!("# First 1KB of {path} (file too large to show full content, and no outline available)\n\n{content}")
-                } else {
-                    format!("# First 1KB of file (file too large to show full content, and no outline available)\n\n{content}")
-                }
-            })?;
-
-            return Ok(BufferContent {
-                text,
-                is_outline: false,
-            });
-        }
-
-        let outline_text = render_outline(outline_items, None, 0, usize::MAX).await?;
-
-        let text = if let Some(path) = path {
-            format!("# File outline for {path}\n\n{outline_text}",)
-        } else {
-            format!("# File outline\n\n{outline_text}",)
-        };
-        Ok(BufferContent {
-            text,
-            is_outline: true,
-        })
-    } else {
-        // File is small enough, return full content
-        let text = buffer.read_with(cx, |buffer, _| buffer.text())?;
-        Ok(BufferContent {
-            text,
-            is_outline: false,
-        })
-    }
-}
-
-async fn render_outline(
-    items: impl IntoIterator<Item = OutlineItem<Point>>,
-    regex: Option<Regex>,
-    offset: usize,
-    results_per_page: usize,
-) -> Result<String> {
-    let mut items = items.into_iter().skip(offset);
-
-    let entries = items
-        .by_ref()
-        .filter(|item| {
-            regex
-                .as_ref()
-                .is_none_or(|regex| regex.is_match(&item.text))
-        })
-        .take(results_per_page)
-        .collect::<Vec<_>>();
-    let has_more = items.next().is_some();
-
-    let mut output = String::new();
-    let entries_rendered = render_entries(&mut output, entries);
-
-    // Calculate pagination information
-    let page_start = offset + 1;
-    let page_end = offset + entries_rendered;
-    let total_symbols = if has_more {
-        format!("more than {}", page_end)
-    } else {
-        page_end.to_string()
-    };
-
-    // Add pagination information
-    if has_more {
-        writeln!(&mut output, "\nShowing symbols {page_start}-{page_end} (there were more symbols found; use offset: {page_end} to see next page)",
-        )
-    } else {
-        writeln!(
-            &mut output,
-            "\nShowing symbols {page_start}-{page_end} (total symbols: {total_symbols})",
-        )
-    }
-    .ok();
-
-    Ok(output)
-}
-
-fn render_entries(
-    output: &mut String,
-    items: impl IntoIterator<Item = OutlineItem<Point>>,
-) -> usize {
-    let mut entries_rendered = 0;
-
-    for item in items {
-        // Indent based on depth ("" for level 0, "  " for level 1, etc.)
-        for _ in 0..item.depth {
-            output.push(' ');
-        }
-        output.push_str(&item.text);
-
-        // Add position information - convert to 1-based line numbers for display
-        let start_line = item.range.start.row + 1;
-        let end_line = item.range.end.row + 1;
-
-        if start_line == end_line {
-            writeln!(output, " [L{}]", start_line).ok();
-        } else {
-            writeln!(output, " [L{}-{}]", start_line, end_line).ok();
-        }
-        entries_rendered += 1;
-    }
-
-    entries_rendered
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use fs::FakeFs;
-    use gpui::TestAppContext;
-    use project::Project;
-    use settings::SettingsStore;
-
-    #[gpui::test]
-    async fn test_large_file_fallback_to_subset(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let settings = SettingsStore::test(cx);
-            cx.set_global(settings);
-        });
-
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, [], cx).await;
-
-        let content = "⚡".repeat(100 * 1024); // 100KB
-        let content_len = content.len();
-        let buffer = project
-            .update(cx, |project, cx| project.create_buffer(true, cx))
-            .await
-            .expect("failed to create buffer");
-
-        buffer.update(cx, |buffer, cx| buffer.set_text(content, cx));
-
-        let result = cx
-            .spawn(|cx| async move { get_buffer_content_or_outline(buffer, None, &cx).await })
-            .await
-            .unwrap();
-
-        // Should contain some of the actual file content
-        assert!(
-            result.text.contains("⚡⚡⚡⚡⚡⚡⚡"),
-            "Result did not contain content subset"
-        );
-
-        // Should be marked as not an outline (it's truncated content)
-        assert!(
-            !result.is_outline,
-            "Large file without outline should not be marked as outline"
-        );
-
-        // Should be reasonably sized (much smaller than original)
-        assert!(
-            result.text.len() < 50 * 1024,
-            "Result size {} should be smaller than 50KB",
-            result.text.len()
-        );
-
-        // Should be significantly smaller than the original content
-        assert!(
-            result.text.len() < content_len / 10,
-            "Result should be much smaller than original content"
-        );
-    }
-}
diff --git a/crates/agent/src/templates.rs b/crates/agent/src/templates.rs
deleted file mode 100644
index db787d834e..0000000000
--- a/crates/agent/src/templates.rs
+++ /dev/null
@@ -1,90 +0,0 @@
-use anyhow::Result;
-use gpui::SharedString;
-use handlebars::Handlebars;
-use rust_embed::RustEmbed;
-use serde::Serialize;
-use std::sync::Arc;
-
-#[derive(RustEmbed)]
-#[folder = "src/templates"]
-#[include = "*.hbs"]
-struct Assets;
-
-pub struct Templates(Handlebars<'static>);
-
-impl Templates {
-    pub fn new() -> Arc<Self> {
-        let mut handlebars = Handlebars::new();
-        handlebars.set_strict_mode(true);
-        handlebars.register_helper("contains", Box::new(contains));
-        handlebars.register_embed_templates::<Assets>().unwrap();
-        Arc::new(Self(handlebars))
-    }
-}
-
-pub trait Template: Sized {
-    const TEMPLATE_NAME: &'static str;
-
-    fn render(&self, templates: &Templates) -> Result<String>
-    where
-        Self: Serialize + Sized,
-    {
-        Ok(templates.0.render(Self::TEMPLATE_NAME, self)?)
-    }
-}
-
-#[derive(Serialize)]
-pub struct SystemPromptTemplate<'a> {
-    #[serde(flatten)]
-    pub project: &'a prompt_store::ProjectContext,
-    pub available_tools: Vec<SharedString>,
-    pub model_name: Option<String>,
-}
-
-impl Template for SystemPromptTemplate<'_> {
-    const TEMPLATE_NAME: &'static str = "system_prompt.hbs";
-}
-
-/// Handlebars helper for checking if an item is in a list
-fn contains(
-    h: &handlebars::Helper,
-    _: &handlebars::Handlebars,
-    _: &handlebars::Context,
-    _: &mut handlebars::RenderContext,
-    out: &mut dyn handlebars::Output,
-) -> handlebars::HelperResult {
-    let list = h
-        .param(0)
-        .and_then(|v| v.value().as_array())
-        .ok_or_else(|| {
-            handlebars::RenderError::new("contains: missing or invalid list parameter")
-        })?;
-    let query = h.param(1).map(|v| v.value()).ok_or_else(|| {
-        handlebars::RenderError::new("contains: missing or invalid query parameter")
-    })?;
-
-    if list.contains(query) {
-        out.write("true")?;
-    }
-
-    Ok(())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_system_prompt_template() {
-        let project = prompt_store::ProjectContext::default();
-        let template = SystemPromptTemplate {
-            project: &project,
-            available_tools: vec!["echo".into()],
-            model_name: Some("test-model".to_string()),
-        };
-        let templates = Templates::new();
-        let rendered = template.render(&templates).unwrap();
-        assert!(rendered.contains("## Fixing Diagnostics"));
-        assert!(rendered.contains("test-model"));
-    }
-}
diff --git a/crates/agent/src/templates/create_file_prompt.hbs b/crates/agent/src/templates/create_file_prompt.hbs
deleted file mode 100644
index 39f83447fa..0000000000
--- a/crates/agent/src/templates/create_file_prompt.hbs
+++ /dev/null
@@ -1,15 +0,0 @@
-You are an expert engineer and your task is to write a new file from scratch.
-
-You MUST respond with the file's content wrapped in triple backticks (```).
-The backticks should be on their own line.
-The text you output will be saved verbatim as the content of the file.
-Tool calls have been disabled.
-Start your response with ```.
-
-<file_path>
-{{path}}
-</file_path>
-
-<edit_description>
-{{edit_description}}
-</edit_description>
diff --git a/crates/agent/src/templates/diff_judge.hbs b/crates/agent/src/templates/diff_judge.hbs
deleted file mode 100644
index 0106cb4217..0000000000
--- a/crates/agent/src/templates/diff_judge.hbs
+++ /dev/null
@@ -1,23 +0,0 @@
-You are an expert coder, and have been tasked with looking at the following diff:
-
-<diff>
-{{diff}}
-</diff>
-
-Evaluate the following assertions:
-
-<assertions>
-{{assertions}}
-</assertions>
-
-You must respond with a short analysis and a score between 0 and 100, where:
-- 0 means no assertions pass
-- 100 means all the assertions pass perfectly
-
-<analysis>
-- Assertion 1: one line describing why the first assertion passes or fails (even partially)
-- Assertion 2: one line describing why the second assertion passes or fails (even partially)
-- ...
-- Assertion N: one line describing why the Nth assertion passes or fails (even partially)
-</analysis>
-<score>YOUR FINAL SCORE HERE</score>
diff --git a/crates/agent/src/templates/edit_file_prompt_diff_fenced.hbs b/crates/agent/src/templates/edit_file_prompt_diff_fenced.hbs
deleted file mode 100644
index a7db420a99..0000000000
--- a/crates/agent/src/templates/edit_file_prompt_diff_fenced.hbs
+++ /dev/null
@@ -1,77 +0,0 @@
-You MUST respond with a series of edits to a file, using the following diff format:
-
-```
-<<<<<<< SEARCH line=1
-from flask import Flask
-=======
-import math
-from flask import Flask
->>>>>>> REPLACE
-
-<<<<<<< SEARCH line=325
-return 0
-=======
-print("Done")
-
-return 0
->>>>>>> REPLACE
-
-```
-
-# File Editing Instructions
-
-- Use the SEARCH/REPLACE diff format shown above
-- The SEARCH section must exactly match existing file content, including indentation
-- The SEARCH section must come from the actual file, not an outline
-- The SEARCH section cannot be empty
-- `line` should be a starting line number for the text to be replaced
-- Be minimal with replacements:
-  - For unique lines, include only those lines
-  - For non-unique lines, include enough context to identify them
-- Do not escape quotes, newlines, or other characters
-- For multiple occurrences, repeat the same diff block for each instance
-- Edits are sequential - each assumes previous edits are already applied
-- Only edit the specified file
-
-# Example
-
-```
-<<<<<<< SEARCH line=3
-struct User {
-    name: String,
-    email: String,
-}
-=======
-struct User {
-    name: String,
-    email: String,
-    active: bool,
-}
->>>>>>> REPLACE
-
-<<<<<<< SEARCH line=25
-    let user = User {
-        name: String::from("John"),
-        email: String::from("john@example.com"),
-    };
-=======
-    let user = User {
-        name: String::from("John"),
-        email: String::from("john@example.com"),
-        active: true,
-    };
->>>>>>> REPLACE
-```
-
-
-# Final instructions
-
-Tool calls have been disabled. You MUST respond using the SEARCH/REPLACE diff format only.
-
-<file_to_edit>
-{{path}}
-</file_to_edit>
-
-<edit_description>
-{{edit_description}}
-</edit_description>
diff --git a/crates/agent/src/templates/edit_file_prompt_xml.hbs b/crates/agent/src/templates/edit_file_prompt_xml.hbs
deleted file mode 100644
index db17c527aa..0000000000
--- a/crates/agent/src/templates/edit_file_prompt_xml.hbs
+++ /dev/null
@@ -1,92 +0,0 @@
-You MUST respond with a series of edits to a file, using the following format:
-
-```
-<edits>
-
-<old_text line=10>
-OLD TEXT 1 HERE
-</old_text>
-<new_text>
-NEW TEXT 1 HERE
-</new_text>
-
-<old_text line=456>
-OLD TEXT 2 HERE
-</old_text>
-<new_text>
-NEW TEXT 2 HERE
-</new_text>
-
-<old_text line=42>
-OLD TEXT 3 HERE
-</old_text>
-<new_text>
-NEW TEXT 3 HERE
-</new_text>
-
-</edits>
-```
-
-# File Editing Instructions
-
-- Use `<old_text>` and `<new_text>` tags to replace content
-- `<old_text>` must exactly match existing file content, including indentation
-- `<old_text>` must come from the actual file, not an outline
-- `<old_text>` cannot be empty
-- `line` should be a starting line number for the text to be replaced
-- Be minimal with replacements:
-  - For unique lines, include only those lines
-  - For non-unique lines, include enough context to identify them
-- Do not escape quotes, newlines, or other characters within tags
-- For multiple occurrences, repeat the same tag pair for each instance
-- Edits are sequential - each assumes previous edits are already applied
-- Only edit the specified file
-- Always close all tags properly
-
-
-{{!-- The following example adds almost 10% pass rate for Gemini 2.5.
-Claude and gpt-4.1 don't really need it. --}}
-<example>
-<edits>
-
-<old_text line=3>
-struct User {
-    name: String,
-    email: String,
-}
-</old_text>
-<new_text>
-struct User {
-    name: String,
-    email: String,
-    active: bool,
-}
-</new_text>
-
-<old_text line=25>
-    let user = User {
-        name: String::from("John"),
-        email: String::from("john@example.com"),
-    };
-</old_text>
-<new_text>
-    let user = User {
-        name: String::from("John"),
-        email: String::from("john@example.com"),
-        active: true,
-    };
-</new_text>
-
-</edits>
-</example>
-
-
-<file_to_edit>
-{{path}}
-</file_to_edit>
-
-<edit_description>
-{{edit_description}}
-</edit_description>
-
-Tool calls have been disabled. You MUST start your response with <edits>.
diff --git a/crates/agent/src/templates/system_prompt.hbs b/crates/agent/src/templates/system_prompt.hbs
deleted file mode 100644
index 4620647135..0000000000
--- a/crates/agent/src/templates/system_prompt.hbs
+++ /dev/null
@@ -1,188 +0,0 @@
-You are a highly skilled software engineer with extensive knowledge in many programming languages, frameworks, design patterns, and best practices.
-
-## Communication
-
-1. Be conversational but professional.
-2. Refer to the user in the second person and yourself in the first person.
-3. Format your responses in markdown. Use backticks to format file, directory, function, and class names.
-4. NEVER lie or make things up.
-5. Refrain from apologizing all the time when results are unexpected. Instead, just try your best to proceed or explain the circumstances to the user without apologizing.
-
-{{#if (gt (len available_tools) 0)}}
-## Tool Use
-
-1. Make sure to adhere to the tools schema.
-2. Provide every required argument.
-3. DO NOT use tools to access items that are already available in the context section.
-4. Use only the tools that are currently available.
-5. DO NOT use a tool that is not available just because it appears in the conversation. This means the user turned it off.
-6. NEVER run commands that don't terminate on their own such as web servers (like `npm run start`, `npm run dev`, `python -m http.server`, etc) or file watchers.
-7. Avoid HTML entity escaping - use plain characters instead.
-
-## Searching and Reading
-
-If you are unsure how to fulfill the user's request, gather more information with tool calls and/or clarifying questions.
-
-If appropriate, use tool calls to explore the current project, which contains the following root directories:
-
-{{#each worktrees}}
-- `{{abs_path}}`
-{{/each}}
-
-- Bias towards not asking the user for help if you can find the answer yourself.
-- When providing paths to tools, the path should always start with the name of a project root directory listed above.
-- Before you read or edit a file, you must first find the full path. DO NOT ever guess a file path!
-{{# if (contains available_tools 'grep') }}
-- When looking for symbols in the project, prefer the `grep` tool.
-- As you learn about the structure of the project, use that information to scope `grep` searches to targeted subtrees of the project.
-- The user might specify a partial file path. If you don't know the full path, use `find_path` (not `grep`) before you read the file.
-{{/if}}
-{{else}}
-You are being tasked with providing a response, but you have no ability to use tools or to read or write any aspect of the user's system (other than any context the user might have provided to you).
-
-As such, if you need the user to perform any actions for you, you must request them explicitly. Bias towards giving a response to the best of your ability, and then making requests for the user to take action (e.g. to give you more context) only optionally.
-
-The one exception to this is if the user references something you don't know about - for example, the name of a source code file, function, type, or other piece of code that you have no awareness of. In this case, you MUST NOT MAKE SOMETHING UP, or assume you know what that thing is or how it works. Instead, you must ask the user for clarification rather than giving a response.
-{{/if}}
-
-## Code Block Formatting
-
-Whenever you mention a code block, you MUST use ONLY use the following format:
-
-```path/to/Something.blah#L123-456
-(code goes here)
-```
-
-The `#L123-456` means the line number range 123 through 456, and the path/to/Something.blah is a path in the project. (If there is no valid path in the project, then you can use /dev/null/path.extension for its path.) This is the ONLY valid way to format code blocks, because the Markdown parser does not understand the more common ```language syntax, or bare ``` blocks. It only understands this path-based syntax, and if the path is missing, then it will error and you will have to do it over again.
-Just to be really clear about this, if you ever find yourself writing three backticks followed by a language name, STOP!
-You have made a mistake. You can only ever put paths after triple backticks!
-
-<example>
-Based on all the information I've gathered, here's a summary of how this system works:
-1. The README file is loaded into the system.
-2. The system finds the first two headers, including everything in between. In this case, that would be:
-```path/to/README.md#L8-12
-# First Header
-This is the info under the first header.
-## Sub-header
-```
-3. Then the system finds the last header in the README:
-```path/to/README.md#L27-29
-## Last Header
-This is the last header in the README.
-```
-4. Finally, it passes this information on to the next process.
-</example>
-
-<example>
-In Markdown, hash marks signify headings. For example:
-```/dev/null/example.md#L1-3
-# Level 1 heading
-## Level 2 heading
-### Level 3 heading
-```
-</example>
-
-Here are examples of ways you must never render code blocks:
-<bad_example_do_not_do_this>
-In Markdown, hash marks signify headings. For example:
-```
-# Level 1 heading
-## Level 2 heading
-### Level 3 heading
-```
-</bad_example_do_not_do_this>
-
-This example is unacceptable because it does not include the path.
-
-<bad_example_do_not_do_this>
-In Markdown, hash marks signify headings. For example:
-```markdown
-# Level 1 heading
-## Level 2 heading
-### Level 3 heading
-```
-</bad_example_do_not_do_this>
-This example is unacceptable because it has the language instead of the path.
-
-<bad_example_do_not_do_this>
-In Markdown, hash marks signify headings. For example:
-    # Level 1 heading
-    ## Level 2 heading
-    ### Level 3 heading
-</bad_example_do_not_do_this>
-This example is unacceptable because it uses indentation to mark the code block instead of backticks with a path.
-
-<bad_example_do_not_do_this>
-In Markdown, hash marks signify headings. For example:
-```markdown
-/dev/null/example.md#L1-3
-# Level 1 heading
-## Level 2 heading
-### Level 3 heading
-```
-</bad_example_do_not_do_this>
-This example is unacceptable because the path is in the wrong place. The path must be directly after the opening backticks.
-
-{{#if (gt (len available_tools) 0)}}
-## Fixing Diagnostics
-
-1. Make 1-2 attempts at fixing diagnostics, then defer to the user.
-2. Never simplify code you've written just to solve diagnostics. Complete, mostly correct code is more valuable than perfect code that doesn't solve the problem.
-
-## Debugging
-
-When debugging, only make code changes if you are certain that you can solve the problem.
-Otherwise, follow debugging best practices:
-1. Address the root cause instead of the symptoms.
-2. Add descriptive logging statements and error messages to track variable and code state.
-3. Add test functions and statements to isolate the problem.
-
-{{/if}}
-## Calling External APIs
-
-1. Unless explicitly requested by the user, use the best suited external APIs and packages to solve the task. There is no need to ask the user for permission.
-2. When selecting which version of an API or package to use, choose one that is compatible with the user's dependency management file(s). If no such file exists or if the package is not present, use the latest version that is in your training data.
-3. If an external API requires an API Key, be sure to point this out to the user. Adhere to best security practices (e.g. DO NOT hardcode an API key in a place where it can be exposed)
-
-## System Information
-
-Operating System: {{os}}
-Default Shell: {{shell}}
-
-{{#if model_name}}
-## Model Information
-
-You are powered by the model named {{model_name}}.
-
-{{/if}}
-{{#if (or has_rules has_user_rules)}}
-## User's Custom Instructions
-
-The following additional instructions are provided by the user, and should be followed to the best of your ability{{#if (gt (len available_tools) 0)}} without interfering with the tool use guidelines{{/if}}.
-
-{{#if has_rules}}
-There are project rules that apply to these root directories:
-{{#each worktrees}}
-{{#if rules_file}}
-`{{root_name}}/{{rules_file.path_in_worktree}}`:
-``````
-{{{rules_file.text}}}
-``````
-{{/if}}
-{{/each}}
-{{/if}}
-
-{{#if has_user_rules}}
-The user has specified the following rules that should be applied:
-{{#each user_rules}}
-
-{{#if title}}
-Rules title: {{title}}
-{{/if}}
-``````
-{{contents}}}
-``````
-{{/each}}
-{{/if}}
-{{/if}}
diff --git a/crates/agent/src/tests/mod.rs b/crates/agent/src/tests/mod.rs
deleted file mode 100644
index 9ff8703532..0000000000
--- a/crates/agent/src/tests/mod.rs
+++ /dev/null
@@ -1,2598 +0,0 @@
-use super::*;
-use acp_thread::{AgentConnection, AgentModelGroupName, AgentModelList, UserMessageId};
-use agent_client_protocol::{self as acp};
-use agent_settings::AgentProfileId;
-use anyhow::Result;
-use client::{Client, UserStore};
-use cloud_llm_client::CompletionIntent;
-use collections::IndexMap;
-use context_server::{ContextServer, ContextServerCommand, ContextServerId};
-use fs::{FakeFs, Fs};
-use futures::{
-    StreamExt,
-    channel::{
-        mpsc::{self, UnboundedReceiver},
-        oneshot,
-    },
-};
-use gpui::{
-    App, AppContext, Entity, Task, TestAppContext, UpdateGlobal, http_client::FakeHttpClient,
-};
-use indoc::indoc;
-use language_model::{
-    LanguageModel, LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelId,
-    LanguageModelProviderName, LanguageModelRegistry, LanguageModelRequest,
-    LanguageModelRequestMessage, LanguageModelToolResult, LanguageModelToolSchemaFormat,
-    LanguageModelToolUse, MessageContent, Role, StopReason, fake_provider::FakeLanguageModel,
-};
-use pretty_assertions::assert_eq;
-use project::{
-    Project, context_server_store::ContextServerStore, project_settings::ProjectSettings,
-};
-use prompt_store::ProjectContext;
-use reqwest_client::ReqwestClient;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use serde_json::json;
-use settings::{Settings, SettingsStore};
-use std::{path::Path, rc::Rc, sync::Arc, time::Duration};
-use util::path;
-
-mod test_tools;
-use test_tools::*;
-
-#[gpui::test]
-async fn test_echo(cx: &mut TestAppContext) {
-    let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
-    let fake_model = model.as_fake();
-
-    let events = thread
-        .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["Testing: Reply with 'Hello'"], cx)
-        })
-        .unwrap();
-    cx.run_until_parked();
-    fake_model.send_last_completion_stream_text_chunk("Hello");
-    fake_model
-        .send_last_completion_stream_event(LanguageModelCompletionEvent::Stop(StopReason::EndTurn));
-    fake_model.end_last_completion_stream();
-
-    let events = events.collect().await;
-    thread.update(cx, |thread, _cx| {
-        assert_eq!(
-            thread.last_message().unwrap().to_markdown(),
-            indoc! {"
-                ## Assistant
-
-                Hello
-            "}
-        )
-    });
-    assert_eq!(stop_events(events), vec![acp::StopReason::EndTurn]);
-}
-
-#[gpui::test]
-async fn test_thinking(cx: &mut TestAppContext) {
-    let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
-    let fake_model = model.as_fake();
-
-    let events = thread
-        .update(cx, |thread, cx| {
-            thread.send(
-                UserMessageId::new(),
-                [indoc! {"
-                    Testing:
-
-                    Generate a thinking step where you just think the word 'Think',
-                    and have your final answer be 'Hello'
-                "}],
-                cx,
-            )
-        })
-        .unwrap();
-    cx.run_until_parked();
-    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::Thinking {
-        text: "Think".to_string(),
-        signature: None,
-    });
-    fake_model.send_last_completion_stream_text_chunk("Hello");
-    fake_model
-        .send_last_completion_stream_event(LanguageModelCompletionEvent::Stop(StopReason::EndTurn));
-    fake_model.end_last_completion_stream();
-
-    let events = events.collect().await;
-    thread.update(cx, |thread, _cx| {
-        assert_eq!(
-            thread.last_message().unwrap().to_markdown(),
-            indoc! {"
-                ## Assistant
-
-                <think>Think</think>
-                Hello
-            "}
-        )
-    });
-    assert_eq!(stop_events(events), vec![acp::StopReason::EndTurn]);
-}
-
-#[gpui::test]
-async fn test_system_prompt(cx: &mut TestAppContext) {
-    let ThreadTest {
-        model,
-        thread,
-        project_context,
-        ..
-    } = setup(cx, TestModel::Fake).await;
-    let fake_model = model.as_fake();
-
-    project_context.update(cx, |project_context, _cx| {
-        project_context.shell = "test-shell".into()
-    });
-    thread.update(cx, |thread, _| thread.add_tool(EchoTool));
-    thread
-        .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["abc"], cx)
-        })
-        .unwrap();
-    cx.run_until_parked();
-    let mut pending_completions = fake_model.pending_completions();
-    assert_eq!(
-        pending_completions.len(),
-        1,
-        "unexpected pending completions: {:?}",
-        pending_completions
-    );
-
-    let pending_completion = pending_completions.pop().unwrap();
-    assert_eq!(pending_completion.messages[0].role, Role::System);
-
-    let system_message = &pending_completion.messages[0];
-    let system_prompt = system_message.content[0].to_str().unwrap();
-    assert!(
-        system_prompt.contains("test-shell"),
-        "unexpected system message: {:?}",
-        system_message
-    );
-    assert!(
-        system_prompt.contains("## Fixing Diagnostics"),
-        "unexpected system message: {:?}",
-        system_message
-    );
-}
-
-#[gpui::test]
-async fn test_system_prompt_without_tools(cx: &mut TestAppContext) {
-    let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
-    let fake_model = model.as_fake();
-
-    thread
-        .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["abc"], cx)
-        })
-        .unwrap();
-    cx.run_until_parked();
-    let mut pending_completions = fake_model.pending_completions();
-    assert_eq!(
-        pending_completions.len(),
-        1,
-        "unexpected pending completions: {:?}",
-        pending_completions
-    );
-
-    let pending_completion = pending_completions.pop().unwrap();
-    assert_eq!(pending_completion.messages[0].role, Role::System);
-
-    let system_message = &pending_completion.messages[0];
-    let system_prompt = system_message.content[0].to_str().unwrap();
-    assert!(
-        !system_prompt.contains("## Tool Use"),
-        "unexpected system message: {:?}",
-        system_message
-    );
-    assert!(
-        !system_prompt.contains("## Fixing Diagnostics"),
-        "unexpected system message: {:?}",
-        system_message
-    );
-}
-
-#[gpui::test]
-async fn test_prompt_caching(cx: &mut TestAppContext) {
-    let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
-    let fake_model = model.as_fake();
-
-    // Send initial user message and verify it's cached
-    thread
-        .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["Message 1"], cx)
-        })
-        .unwrap();
-    cx.run_until_parked();
-
-    let completion = fake_model.pending_completions().pop().unwrap();
-    assert_eq!(
-        completion.messages[1..],
-        vec![LanguageModelRequestMessage {
-            role: Role::User,
-            content: vec!["Message 1".into()],
-            cache: true,
-            reasoning_details: None,
-        }]
-    );
-    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::Text(
-        "Response to Message 1".into(),
-    ));
-    fake_model.end_last_completion_stream();
-    cx.run_until_parked();
-
-    // Send another user message and verify only the latest is cached
-    thread
-        .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["Message 2"], cx)
-        })
-        .unwrap();
-    cx.run_until_parked();
-
-    let completion = fake_model.pending_completions().pop().unwrap();
-    assert_eq!(
-        completion.messages[1..],
-        vec![
-            LanguageModelRequestMessage {
-                role: Role::User,
-                content: vec!["Message 1".into()],
-                cache: false,
-                reasoning_details: None,
-            },
-            LanguageModelRequestMessage {
-                role: Role::Assistant,
-                content: vec!["Response to Message 1".into()],
-                cache: false,
-                reasoning_details: None,
-            },
-            LanguageModelRequestMessage {
-                role: Role::User,
-                content: vec!["Message 2".into()],
-                cache: true,
-                reasoning_details: None,
-            }
-        ]
-    );
-    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::Text(
-        "Response to Message 2".into(),
-    ));
-    fake_model.end_last_completion_stream();
-    cx.run_until_parked();
-
-    // Simulate a tool call and verify that the latest tool result is cached
-    thread.update(cx, |thread, _| thread.add_tool(EchoTool));
-    thread
-        .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["Use the echo tool"], cx)
-        })
-        .unwrap();
-    cx.run_until_parked();
-
-    let tool_use = LanguageModelToolUse {
-        id: "tool_1".into(),
-        name: EchoTool::name().into(),
-        raw_input: json!({"text": "test"}).to_string(),
-        input: json!({"text": "test"}),
-        is_input_complete: true,
-        thought_signature: None,
-    };
-    fake_model
-        .send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(tool_use.clone()));
-    fake_model.end_last_completion_stream();
-    cx.run_until_parked();
-
-    let completion = fake_model.pending_completions().pop().unwrap();
-    let tool_result = LanguageModelToolResult {
-        tool_use_id: "tool_1".into(),
-        tool_name: EchoTool::name().into(),
-        is_error: false,
-        content: "test".into(),
-        output: Some("test".into()),
-    };
-    assert_eq!(
-        completion.messages[1..],
-        vec![
-            LanguageModelRequestMessage {
-                role: Role::User,
-                content: vec!["Message 1".into()],
-                cache: false,
-                reasoning_details: None,
-            },
-            LanguageModelRequestMessage {
-                role: Role::Assistant,
-                content: vec!["Response to Message 1".into()],
-                cache: false,
-                reasoning_details: None,
-            },
-            LanguageModelRequestMessage {
-                role: Role::User,
-                content: vec!["Message 2".into()],
-                cache: false,
-                reasoning_details: None,
-            },
-            LanguageModelRequestMessage {
-                role: Role::Assistant,
-                content: vec!["Response to Message 2".into()],
-                cache: false,
-                reasoning_details: None,
-            },
-            LanguageModelRequestMessage {
-                role: Role::User,
-                content: vec!["Use the echo tool".into()],
-                cache: false,
-                reasoning_details: None,
-            },
-            LanguageModelRequestMessage {
-                role: Role::Assistant,
-                content: vec![MessageContent::ToolUse(tool_use)],
-                cache: false,
-                reasoning_details: None,
-            },
-            LanguageModelRequestMessage {
-                role: Role::User,
-                content: vec![MessageContent::ToolResult(tool_result)],
-                cache: true,
-                reasoning_details: None,
-            }
-        ]
-    );
-}
-
-#[gpui::test]
-#[cfg_attr(not(feature = "e2e"), ignore)]
-async fn test_basic_tool_calls(cx: &mut TestAppContext) {
-    let ThreadTest { thread, .. } = setup(cx, TestModel::Sonnet4).await;
-
-    // Test a tool call that's likely to complete *before* streaming stops.
-    let events = thread
-        .update(cx, |thread, cx| {
-            thread.add_tool(EchoTool);
-            thread.send(
-                UserMessageId::new(),
-                ["Now test the echo tool with 'Hello'. Does it work? Say 'Yes' or 'No'."],
-                cx,
-            )
-        })
-        .unwrap()
-        .collect()
-        .await;
-    assert_eq!(stop_events(events), vec![acp::StopReason::EndTurn]);
-
-    // Test a tool calls that's likely to complete *after* streaming stops.
-    let events = thread
-        .update(cx, |thread, cx| {
-            thread.remove_tool(&EchoTool::name());
-            thread.add_tool(DelayTool);
-            thread.send(
-                UserMessageId::new(),
-                [
-                    "Now call the delay tool with 200ms.",
-                    "When the timer goes off, then you echo the output of the tool.",
-                ],
-                cx,
-            )
-        })
-        .unwrap()
-        .collect()
-        .await;
-    assert_eq!(stop_events(events), vec![acp::StopReason::EndTurn]);
-    thread.update(cx, |thread, _cx| {
-        assert!(
-            thread
-                .last_message()
-                .unwrap()
-                .as_agent_message()
-                .unwrap()
-                .content
-                .iter()
-                .any(|content| {
-                    if let AgentMessageContent::Text(text) = content {
-                        text.contains("Ding")
-                    } else {
-                        false
-                    }
-                }),
-            "{}",
-            thread.to_markdown()
-        );
-    });
-}
-
-#[gpui::test]
-#[cfg_attr(not(feature = "e2e"), ignore)]
-async fn test_streaming_tool_calls(cx: &mut TestAppContext) {
-    let ThreadTest { thread, .. } = setup(cx, TestModel::Sonnet4).await;
-
-    // Test a tool call that's likely to complete *before* streaming stops.
-    let mut events = thread
-        .update(cx, |thread, cx| {
-            thread.add_tool(WordListTool);
-            thread.send(UserMessageId::new(), ["Test the word_list tool."], cx)
-        })
-        .unwrap();
-
-    let mut saw_partial_tool_use = false;
-    while let Some(event) = events.next().await {
-        if let Ok(ThreadEvent::ToolCall(tool_call)) = event {
-            thread.update(cx, |thread, _cx| {
-                // Look for a tool use in the thread's last message
-                let message = thread.last_message().unwrap();
-                let agent_message = message.as_agent_message().unwrap();
-                let last_content = agent_message.content.last().unwrap();
-                if let AgentMessageContent::ToolUse(last_tool_use) = last_content {
-                    assert_eq!(last_tool_use.name.as_ref(), "word_list");
-                    if tool_call.status == acp::ToolCallStatus::Pending {
-                        if !last_tool_use.is_input_complete
-                            && last_tool_use.input.get("g").is_none()
-                        {
-                            saw_partial_tool_use = true;
-                        }
-                    } else {
-                        last_tool_use
-                            .input
-                            .get("a")
-                            .expect("'a' has streamed because input is now complete");
-                        last_tool_use
-                            .input
-                            .get("g")
-                            .expect("'g' has streamed because input is now complete");
-                    }
-                } else {
-                    panic!("last content should be a tool use");
-                }
-            });
-        }
-    }
-
-    assert!(
-        saw_partial_tool_use,
-        "should see at least one partially streamed tool use in the history"
-    );
-}
-
-#[gpui::test]
-async fn test_tool_authorization(cx: &mut TestAppContext) {
-    let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
-    let fake_model = model.as_fake();
-
-    let mut events = thread
-        .update(cx, |thread, cx| {
-            thread.add_tool(ToolRequiringPermission);
-            thread.send(UserMessageId::new(), ["abc"], cx)
-        })
-        .unwrap();
-    cx.run_until_parked();
-    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(
-        LanguageModelToolUse {
-            id: "tool_id_1".into(),
-            name: ToolRequiringPermission::name().into(),
-            raw_input: "{}".into(),
-            input: json!({}),
-            is_input_complete: true,
-            thought_signature: None,
-        },
-    ));
-    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(
-        LanguageModelToolUse {
-            id: "tool_id_2".into(),
-            name: ToolRequiringPermission::name().into(),
-            raw_input: "{}".into(),
-            input: json!({}),
-            is_input_complete: true,
-            thought_signature: None,
-        },
-    ));
-    fake_model.end_last_completion_stream();
-    let tool_call_auth_1 = next_tool_call_authorization(&mut events).await;
-    let tool_call_auth_2 = next_tool_call_authorization(&mut events).await;
-
-    // Approve the first
-    tool_call_auth_1
-        .response
-        .send(tool_call_auth_1.options[1].option_id.clone())
-        .unwrap();
-    cx.run_until_parked();
-
-    // Reject the second
-    tool_call_auth_2
-        .response
-        .send(tool_call_auth_1.options[2].option_id.clone())
-        .unwrap();
-    cx.run_until_parked();
-
-    let completion = fake_model.pending_completions().pop().unwrap();
-    let message = completion.messages.last().unwrap();
-    assert_eq!(
-        message.content,
-        vec![
-            language_model::MessageContent::ToolResult(LanguageModelToolResult {
-                tool_use_id: tool_call_auth_1.tool_call.tool_call_id.0.to_string().into(),
-                tool_name: ToolRequiringPermission::name().into(),
-                is_error: false,
-                content: "Allowed".into(),
-                output: Some("Allowed".into())
-            }),
-            language_model::MessageContent::ToolResult(LanguageModelToolResult {
-                tool_use_id: tool_call_auth_2.tool_call.tool_call_id.0.to_string().into(),
-                tool_name: ToolRequiringPermission::name().into(),
-                is_error: true,
-                content: "Permission to run tool denied by user".into(),
-                output: Some("Permission to run tool denied by user".into())
-            })
-        ]
-    );
-
-    // Simulate yet another tool call.
-    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(
-        LanguageModelToolUse {
-            id: "tool_id_3".into(),
-            name: ToolRequiringPermission::name().into(),
-            raw_input: "{}".into(),
-            input: json!({}),
-            is_input_complete: true,
-            thought_signature: None,
-        },
-    ));
-    fake_model.end_last_completion_stream();
-
-    // Respond by always allowing tools.
-    let tool_call_auth_3 = next_tool_call_authorization(&mut events).await;
-    tool_call_auth_3
-        .response
-        .send(tool_call_auth_3.options[0].option_id.clone())
-        .unwrap();
-    cx.run_until_parked();
-    let completion = fake_model.pending_completions().pop().unwrap();
-    let message = completion.messages.last().unwrap();
-    assert_eq!(
-        message.content,
-        vec![language_model::MessageContent::ToolResult(
-            LanguageModelToolResult {
-                tool_use_id: tool_call_auth_3.tool_call.tool_call_id.0.to_string().into(),
-                tool_name: ToolRequiringPermission::name().into(),
-                is_error: false,
-                content: "Allowed".into(),
-                output: Some("Allowed".into())
-            }
-        )]
-    );
-
-    // Simulate a final tool call, ensuring we don't trigger authorization.
-    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(
-        LanguageModelToolUse {
-            id: "tool_id_4".into(),
-            name: ToolRequiringPermission::name().into(),
-            raw_input: "{}".into(),
-            input: json!({}),
-            is_input_complete: true,
-            thought_signature: None,
-        },
-    ));
-    fake_model.end_last_completion_stream();
-    cx.run_until_parked();
-    let completion = fake_model.pending_completions().pop().unwrap();
-    let message = completion.messages.last().unwrap();
-    assert_eq!(
-        message.content,
-        vec![language_model::MessageContent::ToolResult(
-            LanguageModelToolResult {
-                tool_use_id: "tool_id_4".into(),
-                tool_name: ToolRequiringPermission::name().into(),
-                is_error: false,
-                content: "Allowed".into(),
-                output: Some("Allowed".into())
-            }
-        )]
-    );
-}
-
-#[gpui::test]
-async fn test_tool_hallucination(cx: &mut TestAppContext) {
-    let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
-    let fake_model = model.as_fake();
-
-    let mut events = thread
-        .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["abc"], cx)
-        })
-        .unwrap();
-    cx.run_until_parked();
-    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(
-        LanguageModelToolUse {
-            id: "tool_id_1".into(),
-            name: "nonexistent_tool".into(),
-            raw_input: "{}".into(),
-            input: json!({}),
-            is_input_complete: true,
-            thought_signature: None,
-        },
-    ));
-    fake_model.end_last_completion_stream();
-
-    let tool_call = expect_tool_call(&mut events).await;
-    assert_eq!(tool_call.title, "nonexistent_tool");
-    assert_eq!(tool_call.status, acp::ToolCallStatus::Pending);
-    let update = expect_tool_call_update_fields(&mut events).await;
-    assert_eq!(update.fields.status, Some(acp::ToolCallStatus::Failed));
-}
-
-#[gpui::test]
-async fn test_resume_after_tool_use_limit(cx: &mut TestAppContext) {
-    let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
-    let fake_model = model.as_fake();
-
-    let events = thread
-        .update(cx, |thread, cx| {
-            thread.add_tool(EchoTool);
-            thread.send(UserMessageId::new(), ["abc"], cx)
-        })
-        .unwrap();
-    cx.run_until_parked();
-    let tool_use = LanguageModelToolUse {
-        id: "tool_id_1".into(),
-        name: EchoTool::name().into(),
-        raw_input: "{}".into(),
-        input: serde_json::to_value(&EchoToolInput { text: "def".into() }).unwrap(),
-        is_input_complete: true,
-        thought_signature: None,
-    };
-    fake_model
-        .send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(tool_use.clone()));
-    fake_model.end_last_completion_stream();
-
-    cx.run_until_parked();
-    let completion = fake_model.pending_completions().pop().unwrap();
-    let tool_result = LanguageModelToolResult {
-        tool_use_id: "tool_id_1".into(),
-        tool_name: EchoTool::name().into(),
-        is_error: false,
-        content: "def".into(),
-        output: Some("def".into()),
-    };
-    assert_eq!(
-        completion.messages[1..],
-        vec![
-            LanguageModelRequestMessage {
-                role: Role::User,
-                content: vec!["abc".into()],
-                cache: false,
-                reasoning_details: None,
-            },
-            LanguageModelRequestMessage {
-                role: Role::Assistant,
-                content: vec![MessageContent::ToolUse(tool_use.clone())],
-                cache: false,
-                reasoning_details: None,
-            },
-            LanguageModelRequestMessage {
-                role: Role::User,
-                content: vec![MessageContent::ToolResult(tool_result.clone())],
-                cache: true,
-                reasoning_details: None,
-            },
-        ]
-    );
-
-    // Simulate reaching tool use limit.
-    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUseLimitReached);
-    fake_model.end_last_completion_stream();
-    let last_event = events.collect::<Vec<_>>().await.pop().unwrap();
-    assert!(
-        last_event
-            .unwrap_err()
-            .is::<language_model::ToolUseLimitReachedError>()
-    );
-
-    let events = thread.update(cx, |thread, cx| thread.resume(cx)).unwrap();
-    cx.run_until_parked();
-    let completion = fake_model.pending_completions().pop().unwrap();
-    assert_eq!(
-        completion.messages[1..],
-        vec![
-            LanguageModelRequestMessage {
-                role: Role::User,
-                content: vec!["abc".into()],
-                cache: false,
-                reasoning_details: None,
-            },
-            LanguageModelRequestMessage {
-                role: Role::Assistant,
-                content: vec![MessageContent::ToolUse(tool_use)],
-                cache: false,
-                reasoning_details: None,
-            },
-            LanguageModelRequestMessage {
-                role: Role::User,
-                content: vec![MessageContent::ToolResult(tool_result)],
-                cache: false,
-                reasoning_details: None,
-            },
-            LanguageModelRequestMessage {
-                role: Role::User,
-                content: vec!["Continue where you left off".into()],
-                cache: true,
-                reasoning_details: None,
-            }
-        ]
-    );
-
-    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::Text("Done".into()));
-    fake_model.end_last_completion_stream();
-    events.collect::<Vec<_>>().await;
-    thread.read_with(cx, |thread, _cx| {
-        assert_eq!(
-            thread.last_message().unwrap().to_markdown(),
-            indoc! {"
-                ## Assistant
-
-                Done
-            "}
-        )
-    });
-}
-
-#[gpui::test]
-async fn test_send_after_tool_use_limit(cx: &mut TestAppContext) {
-    let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
-    let fake_model = model.as_fake();
-
-    let events = thread
-        .update(cx, |thread, cx| {
-            thread.add_tool(EchoTool);
-            thread.send(UserMessageId::new(), ["abc"], cx)
-        })
-        .unwrap();
-    cx.run_until_parked();
-
-    let tool_use = LanguageModelToolUse {
-        id: "tool_id_1".into(),
-        name: EchoTool::name().into(),
-        raw_input: "{}".into(),
-        input: serde_json::to_value(&EchoToolInput { text: "def".into() }).unwrap(),
-        is_input_complete: true,
-        thought_signature: None,
-    };
-    let tool_result = LanguageModelToolResult {
-        tool_use_id: "tool_id_1".into(),
-        tool_name: EchoTool::name().into(),
-        is_error: false,
-        content: "def".into(),
-        output: Some("def".into()),
-    };
-    fake_model
-        .send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(tool_use.clone()));
-    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUseLimitReached);
-    fake_model.end_last_completion_stream();
-    let last_event = events.collect::<Vec<_>>().await.pop().unwrap();
-    assert!(
-        last_event
-            .unwrap_err()
-            .is::<language_model::ToolUseLimitReachedError>()
-    );
-
-    thread
-        .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), vec!["ghi"], cx)
-        })
-        .unwrap();
-    cx.run_until_parked();
-    let completion = fake_model.pending_completions().pop().unwrap();
-    assert_eq!(
-        completion.messages[1..],
-        vec![
-            LanguageModelRequestMessage {
-                role: Role::User,
-                content: vec!["abc".into()],
-                cache: false,
-                reasoning_details: None,
-            },
-            LanguageModelRequestMessage {
-                role: Role::Assistant,
-                content: vec![MessageContent::ToolUse(tool_use)],
-                cache: false,
-                reasoning_details: None,
-            },
-            LanguageModelRequestMessage {
-                role: Role::User,
-                content: vec![MessageContent::ToolResult(tool_result)],
-                cache: false,
-                reasoning_details: None,
-            },
-            LanguageModelRequestMessage {
-                role: Role::User,
-                content: vec!["ghi".into()],
-                cache: true,
-                reasoning_details: None,
-            }
-        ]
-    );
-}
-
-async fn expect_tool_call(events: &mut UnboundedReceiver<Result<ThreadEvent>>) -> acp::ToolCall {
-    let event = events
-        .next()
-        .await
-        .expect("no tool call authorization event received")
-        .unwrap();
-    match event {
-        ThreadEvent::ToolCall(tool_call) => tool_call,
-        event => {
-            panic!("Unexpected event {event:?}");
-        }
-    }
-}
-
-async fn expect_tool_call_update_fields(
-    events: &mut UnboundedReceiver<Result<ThreadEvent>>,
-) -> acp::ToolCallUpdate {
-    let event = events
-        .next()
-        .await
-        .expect("no tool call authorization event received")
-        .unwrap();
-    match event {
-        ThreadEvent::ToolCallUpdate(acp_thread::ToolCallUpdate::UpdateFields(update)) => update,
-        event => {
-            panic!("Unexpected event {event:?}");
-        }
-    }
-}
-
-async fn next_tool_call_authorization(
-    events: &mut UnboundedReceiver<Result<ThreadEvent>>,
-) -> ToolCallAuthorization {
-    loop {
-        let event = events
-            .next()
-            .await
-            .expect("no tool call authorization event received")
-            .unwrap();
-        if let ThreadEvent::ToolCallAuthorization(tool_call_authorization) = event {
-            let permission_kinds = tool_call_authorization
-                .options
-                .iter()
-                .map(|o| o.kind)
-                .collect::<Vec<_>>();
-            assert_eq!(
-                permission_kinds,
-                vec![
-                    acp::PermissionOptionKind::AllowAlways,
-                    acp::PermissionOptionKind::AllowOnce,
-                    acp::PermissionOptionKind::RejectOnce,
-                ]
-            );
-            return tool_call_authorization;
-        }
-    }
-}
-
-#[gpui::test]
-#[cfg_attr(not(feature = "e2e"), ignore)]
-async fn test_concurrent_tool_calls(cx: &mut TestAppContext) {
-    let ThreadTest { thread, .. } = setup(cx, TestModel::Sonnet4).await;
-
-    // Test concurrent tool calls with different delay times
-    let events = thread
-        .update(cx, |thread, cx| {
-            thread.add_tool(DelayTool);
-            thread.send(
-                UserMessageId::new(),
-                [
-                    "Call the delay tool twice in the same message.",
-                    "Once with 100ms. Once with 300ms.",
-                    "When both timers are complete, describe the outputs.",
-                ],
-                cx,
-            )
-        })
-        .unwrap()
-        .collect()
-        .await;
-
-    let stop_reasons = stop_events(events);
-    assert_eq!(stop_reasons, vec![acp::StopReason::EndTurn]);
-
-    thread.update(cx, |thread, _cx| {
-        let last_message = thread.last_message().unwrap();
-        let agent_message = last_message.as_agent_message().unwrap();
-        let text = agent_message
-            .content
-            .iter()
-            .filter_map(|content| {
-                if let AgentMessageContent::Text(text) = content {
-                    Some(text.as_str())
-                } else {
-                    None
-                }
-            })
-            .collect::<String>();
-
-        assert!(text.contains("Ding"));
-    });
-}
-
-#[gpui::test]
-async fn test_profiles(cx: &mut TestAppContext) {
-    let ThreadTest {
-        model, thread, fs, ..
-    } = setup(cx, TestModel::Fake).await;
-    let fake_model = model.as_fake();
-
-    thread.update(cx, |thread, _cx| {
-        thread.add_tool(DelayTool);
-        thread.add_tool(EchoTool);
-        thread.add_tool(InfiniteTool);
-    });
-
-    // Override profiles and wait for settings to be loaded.
-    fs.insert_file(
-        paths::settings_file(),
-        json!({
-            "agent": {
-                "profiles": {
-                    "test-1": {
-                        "name": "Test Profile 1",
-                        "tools": {
-                            EchoTool::name(): true,
-                            DelayTool::name(): true,
-                        }
-                    },
-                    "test-2": {
-                        "name": "Test Profile 2",
-                        "tools": {
-                            InfiniteTool::name(): true,
-                        }
-                    }
-                }
-            }
-        })
-        .to_string()
-        .into_bytes(),
-    )
-    .await;
-    cx.run_until_parked();
-
-    // Test that test-1 profile (default) has echo and delay tools
-    thread
-        .update(cx, |thread, cx| {
-            thread.set_profile(AgentProfileId("test-1".into()), cx);
-            thread.send(UserMessageId::new(), ["test"], cx)
-        })
-        .unwrap();
-    cx.run_until_parked();
-
-    let mut pending_completions = fake_model.pending_completions();
-    assert_eq!(pending_completions.len(), 1);
-    let completion = pending_completions.pop().unwrap();
-    let tool_names: Vec<String> = completion
-        .tools
-        .iter()
-        .map(|tool| tool.name.clone())
-        .collect();
-    assert_eq!(tool_names, vec![DelayTool::name(), EchoTool::name()]);
-    fake_model.end_last_completion_stream();
-
-    // Switch to test-2 profile, and verify that it has only the infinite tool.
-    thread
-        .update(cx, |thread, cx| {
-            thread.set_profile(AgentProfileId("test-2".into()), cx);
-            thread.send(UserMessageId::new(), ["test2"], cx)
-        })
-        .unwrap();
-    cx.run_until_parked();
-    let mut pending_completions = fake_model.pending_completions();
-    assert_eq!(pending_completions.len(), 1);
-    let completion = pending_completions.pop().unwrap();
-    let tool_names: Vec<String> = completion
-        .tools
-        .iter()
-        .map(|tool| tool.name.clone())
-        .collect();
-    assert_eq!(tool_names, vec![InfiniteTool::name()]);
-}
-
-#[gpui::test]
-async fn test_mcp_tools(cx: &mut TestAppContext) {
-    let ThreadTest {
-        model,
-        thread,
-        context_server_store,
-        fs,
-        ..
-    } = setup(cx, TestModel::Fake).await;
-    let fake_model = model.as_fake();
-
-    // Override profiles and wait for settings to be loaded.
-    fs.insert_file(
-        paths::settings_file(),
-        json!({
-            "agent": {
-                "always_allow_tool_actions": true,
-                "profiles": {
-                    "test": {
-                        "name": "Test Profile",
-                        "enable_all_context_servers": true,
-                        "tools": {
-                            EchoTool::name(): true,
-                        }
-                    },
-                }
-            }
-        })
-        .to_string()
-        .into_bytes(),
-    )
-    .await;
-    cx.run_until_parked();
-    thread.update(cx, |thread, cx| {
-        thread.set_profile(AgentProfileId("test".into()), cx)
-    });
-
-    let mut mcp_tool_calls = setup_context_server(
-        "test_server",
-        vec![context_server::types::Tool {
-            name: "echo".into(),
-            description: None,
-            input_schema: serde_json::to_value(EchoTool::input_schema(
-                LanguageModelToolSchemaFormat::JsonSchema,
-            ))
-            .unwrap(),
-            output_schema: None,
-            annotations: None,
-        }],
-        &context_server_store,
-        cx,
-    );
-
-    let events = thread.update(cx, |thread, cx| {
-        thread.send(UserMessageId::new(), ["Hey"], cx).unwrap()
-    });
-    cx.run_until_parked();
-
-    // Simulate the model calling the MCP tool.
-    let completion = fake_model.pending_completions().pop().unwrap();
-    assert_eq!(tool_names_for_completion(&completion), vec!["echo"]);
-    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(
-        LanguageModelToolUse {
-            id: "tool_1".into(),
-            name: "echo".into(),
-            raw_input: json!({"text": "test"}).to_string(),
-            input: json!({"text": "test"}),
-            is_input_complete: true,
-            thought_signature: None,
-        },
-    ));
-    fake_model.end_last_completion_stream();
-    cx.run_until_parked();
-
-    let (tool_call_params, tool_call_response) = mcp_tool_calls.next().await.unwrap();
-    assert_eq!(tool_call_params.name, "echo");
-    assert_eq!(tool_call_params.arguments, Some(json!({"text": "test"})));
-    tool_call_response
-        .send(context_server::types::CallToolResponse {
-            content: vec![context_server::types::ToolResponseContent::Text {
-                text: "test".into(),
-            }],
-            is_error: None,
-            meta: None,
-            structured_content: None,
-        })
-        .unwrap();
-    cx.run_until_parked();
-
-    assert_eq!(tool_names_for_completion(&completion), vec!["echo"]);
-    fake_model.send_last_completion_stream_text_chunk("Done!");
-    fake_model.end_last_completion_stream();
-    events.collect::<Vec<_>>().await;
-
-    // Send again after adding the echo tool, ensuring the name collision is resolved.
-    let events = thread.update(cx, |thread, cx| {
-        thread.add_tool(EchoTool);
-        thread.send(UserMessageId::new(), ["Go"], cx).unwrap()
-    });
-    cx.run_until_parked();
-    let completion = fake_model.pending_completions().pop().unwrap();
-    assert_eq!(
-        tool_names_for_completion(&completion),
-        vec!["echo", "test_server_echo"]
-    );
-    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(
-        LanguageModelToolUse {
-            id: "tool_2".into(),
-            name: "test_server_echo".into(),
-            raw_input: json!({"text": "mcp"}).to_string(),
-            input: json!({"text": "mcp"}),
-            is_input_complete: true,
-            thought_signature: None,
-        },
-    ));
-    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(
-        LanguageModelToolUse {
-            id: "tool_3".into(),
-            name: "echo".into(),
-            raw_input: json!({"text": "native"}).to_string(),
-            input: json!({"text": "native"}),
-            is_input_complete: true,
-            thought_signature: None,
-        },
-    ));
-    fake_model.end_last_completion_stream();
-    cx.run_until_parked();
-
-    let (tool_call_params, tool_call_response) = mcp_tool_calls.next().await.unwrap();
-    assert_eq!(tool_call_params.name, "echo");
-    assert_eq!(tool_call_params.arguments, Some(json!({"text": "mcp"})));
-    tool_call_response
-        .send(context_server::types::CallToolResponse {
-            content: vec![context_server::types::ToolResponseContent::Text { text: "mcp".into() }],
-            is_error: None,
-            meta: None,
-            structured_content: None,
-        })
-        .unwrap();
-    cx.run_until_parked();
-
-    // Ensure the tool results were inserted with the correct names.
-    let completion = fake_model.pending_completions().pop().unwrap();
-    assert_eq!(
-        completion.messages.last().unwrap().content,
-        vec![
-            MessageContent::ToolResult(LanguageModelToolResult {
-                tool_use_id: "tool_3".into(),
-                tool_name: "echo".into(),
-                is_error: false,
-                content: "native".into(),
-                output: Some("native".into()),
-            },),
-            MessageContent::ToolResult(LanguageModelToolResult {
-                tool_use_id: "tool_2".into(),
-                tool_name: "test_server_echo".into(),
-                is_error: false,
-                content: "mcp".into(),
-                output: Some("mcp".into()),
-            },),
-        ]
-    );
-    fake_model.end_last_completion_stream();
-    events.collect::<Vec<_>>().await;
-}
-
-#[gpui::test]
-async fn test_mcp_tool_truncation(cx: &mut TestAppContext) {
-    let ThreadTest {
-        model,
-        thread,
-        context_server_store,
-        fs,
-        ..
-    } = setup(cx, TestModel::Fake).await;
-    let fake_model = model.as_fake();
-
-    // Set up a profile with all tools enabled
-    fs.insert_file(
-        paths::settings_file(),
-        json!({
-            "agent": {
-                "profiles": {
-                    "test": {
-                        "name": "Test Profile",
-                        "enable_all_context_servers": true,
-                        "tools": {
-                            EchoTool::name(): true,
-                            DelayTool::name(): true,
-                            WordListTool::name(): true,
-                            ToolRequiringPermission::name(): true,
-                            InfiniteTool::name(): true,
-                        }
-                    },
-                }
-            }
-        })
-        .to_string()
-        .into_bytes(),
-    )
-    .await;
-    cx.run_until_parked();
-
-    thread.update(cx, |thread, cx| {
-        thread.set_profile(AgentProfileId("test".into()), cx);
-        thread.add_tool(EchoTool);
-        thread.add_tool(DelayTool);
-        thread.add_tool(WordListTool);
-        thread.add_tool(ToolRequiringPermission);
-        thread.add_tool(InfiniteTool);
-    });
-
-    // Set up multiple context servers with some overlapping tool names
-    let _server1_calls = setup_context_server(
-        "xxx",
-        vec![
-            context_server::types::Tool {
-                name: "echo".into(), // Conflicts with native EchoTool
-                description: None,
-                input_schema: serde_json::to_value(EchoTool::input_schema(
-                    LanguageModelToolSchemaFormat::JsonSchema,
-                ))
-                .unwrap(),
-                output_schema: None,
-                annotations: None,
-            },
-            context_server::types::Tool {
-                name: "unique_tool_1".into(),
-                description: None,
-                input_schema: json!({"type": "object", "properties": {}}),
-                output_schema: None,
-                annotations: None,
-            },
-        ],
-        &context_server_store,
-        cx,
-    );
-
-    let _server2_calls = setup_context_server(
-        "yyy",
-        vec![
-            context_server::types::Tool {
-                name: "echo".into(), // Also conflicts with native EchoTool
-                description: None,
-                input_schema: serde_json::to_value(EchoTool::input_schema(
-                    LanguageModelToolSchemaFormat::JsonSchema,
-                ))
-                .unwrap(),
-                output_schema: None,
-                annotations: None,
-            },
-            context_server::types::Tool {
-                name: "unique_tool_2".into(),
-                description: None,
-                input_schema: json!({"type": "object", "properties": {}}),
-                output_schema: None,
-                annotations: None,
-            },
-            context_server::types::Tool {
-                name: "a".repeat(MAX_TOOL_NAME_LENGTH - 2),
-                description: None,
-                input_schema: json!({"type": "object", "properties": {}}),
-                output_schema: None,
-                annotations: None,
-            },
-            context_server::types::Tool {
-                name: "b".repeat(MAX_TOOL_NAME_LENGTH - 1),
-                description: None,
-                input_schema: json!({"type": "object", "properties": {}}),
-                output_schema: None,
-                annotations: None,
-            },
-        ],
-        &context_server_store,
-        cx,
-    );
-    let _server3_calls = setup_context_server(
-        "zzz",
-        vec![
-            context_server::types::Tool {
-                name: "a".repeat(MAX_TOOL_NAME_LENGTH - 2),
-                description: None,
-                input_schema: json!({"type": "object", "properties": {}}),
-                output_schema: None,
-                annotations: None,
-            },
-            context_server::types::Tool {
-                name: "b".repeat(MAX_TOOL_NAME_LENGTH - 1),
-                description: None,
-                input_schema: json!({"type": "object", "properties": {}}),
-                output_schema: None,
-                annotations: None,
-            },
-            context_server::types::Tool {
-                name: "c".repeat(MAX_TOOL_NAME_LENGTH + 1),
-                description: None,
-                input_schema: json!({"type": "object", "properties": {}}),
-                output_schema: None,
-                annotations: None,
-            },
-        ],
-        &context_server_store,
-        cx,
-    );
-
-    thread
-        .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["Go"], cx)
-        })
-        .unwrap();
-    cx.run_until_parked();
-    let completion = fake_model.pending_completions().pop().unwrap();
-    assert_eq!(
-        tool_names_for_completion(&completion),
-        vec![
-            "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
-            "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
-            "delay",
-            "echo",
-            "infinite",
-            "tool_requiring_permission",
-            "unique_tool_1",
-            "unique_tool_2",
-            "word_list",
-            "xxx_echo",
-            "y_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-            "yyy_echo",
-            "z_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-        ]
-    );
-}
-
-#[gpui::test]
-#[cfg_attr(not(feature = "e2e"), ignore)]
-async fn test_cancellation(cx: &mut TestAppContext) {
-    let ThreadTest { thread, .. } = setup(cx, TestModel::Sonnet4).await;
-
-    let mut events = thread
-        .update(cx, |thread, cx| {
-            thread.add_tool(InfiniteTool);
-            thread.add_tool(EchoTool);
-            thread.send(
-                UserMessageId::new(),
-                ["Call the echo tool, then call the infinite tool, then explain their output"],
-                cx,
-            )
-        })
-        .unwrap();
-
-    // Wait until both tools are called.
-    let mut expected_tools = vec!["Echo", "Infinite Tool"];
-    let mut echo_id = None;
-    let mut echo_completed = false;
-    while let Some(event) = events.next().await {
-        match event.unwrap() {
-            ThreadEvent::ToolCall(tool_call) => {
-                assert_eq!(tool_call.title, expected_tools.remove(0));
-                if tool_call.title == "Echo" {
-                    echo_id = Some(tool_call.tool_call_id);
-                }
-            }
-            ThreadEvent::ToolCallUpdate(acp_thread::ToolCallUpdate::UpdateFields(
-                acp::ToolCallUpdate {
-                    tool_call_id,
-                    fields:
-                        acp::ToolCallUpdateFields {
-                            status: Some(acp::ToolCallStatus::Completed),
-                            ..
-                        },
-                    ..
-                },
-            )) if Some(&tool_call_id) == echo_id.as_ref() => {
-                echo_completed = true;
-            }
-            _ => {}
-        }
-
-        if expected_tools.is_empty() && echo_completed {
-            break;
-        }
-    }
-
-    // Cancel the current send and ensure that the event stream is closed, even
-    // if one of the tools is still running.
-    thread.update(cx, |thread, cx| thread.cancel(cx));
-    let events = events.collect::<Vec<_>>().await;
-    let last_event = events.last();
-    assert!(
-        matches!(
-            last_event,
-            Some(Ok(ThreadEvent::Stop(acp::StopReason::Cancelled)))
-        ),
-        "unexpected event {last_event:?}"
-    );
-
-    // Ensure we can still send a new message after cancellation.
-    let events = thread
-        .update(cx, |thread, cx| {
-            thread.send(
-                UserMessageId::new(),
-                ["Testing: reply with 'Hello' then stop."],
-                cx,
-            )
-        })
-        .unwrap()
-        .collect::<Vec<_>>()
-        .await;
-    thread.update(cx, |thread, _cx| {
-        let message = thread.last_message().unwrap();
-        let agent_message = message.as_agent_message().unwrap();
-        assert_eq!(
-            agent_message.content,
-            vec![AgentMessageContent::Text("Hello".to_string())]
-        );
-    });
-    assert_eq!(stop_events(events), vec![acp::StopReason::EndTurn]);
-}
-
-#[gpui::test]
-async fn test_in_progress_send_canceled_by_next_send(cx: &mut TestAppContext) {
-    let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
-    let fake_model = model.as_fake();
-
-    let events_1 = thread
-        .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["Hello 1"], cx)
-        })
-        .unwrap();
-    cx.run_until_parked();
-    fake_model.send_last_completion_stream_text_chunk("Hey 1!");
-    cx.run_until_parked();
-
-    let events_2 = thread
-        .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["Hello 2"], cx)
-        })
-        .unwrap();
-    cx.run_until_parked();
-    fake_model.send_last_completion_stream_text_chunk("Hey 2!");
-    fake_model
-        .send_last_completion_stream_event(LanguageModelCompletionEvent::Stop(StopReason::EndTurn));
-    fake_model.end_last_completion_stream();
-
-    let events_1 = events_1.collect::<Vec<_>>().await;
-    assert_eq!(stop_events(events_1), vec![acp::StopReason::Cancelled]);
-    let events_2 = events_2.collect::<Vec<_>>().await;
-    assert_eq!(stop_events(events_2), vec![acp::StopReason::EndTurn]);
-}
-
-#[gpui::test]
-async fn test_subsequent_successful_sends_dont_cancel(cx: &mut TestAppContext) {
-    let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
-    let fake_model = model.as_fake();
-
-    let events_1 = thread
-        .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["Hello 1"], cx)
-        })
-        .unwrap();
-    cx.run_until_parked();
-    fake_model.send_last_completion_stream_text_chunk("Hey 1!");
-    fake_model
-        .send_last_completion_stream_event(LanguageModelCompletionEvent::Stop(StopReason::EndTurn));
-    fake_model.end_last_completion_stream();
-    let events_1 = events_1.collect::<Vec<_>>().await;
-
-    let events_2 = thread
-        .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["Hello 2"], cx)
-        })
-        .unwrap();
-    cx.run_until_parked();
-    fake_model.send_last_completion_stream_text_chunk("Hey 2!");
-    fake_model
-        .send_last_completion_stream_event(LanguageModelCompletionEvent::Stop(StopReason::EndTurn));
-    fake_model.end_last_completion_stream();
-    let events_2 = events_2.collect::<Vec<_>>().await;
-
-    assert_eq!(stop_events(events_1), vec![acp::StopReason::EndTurn]);
-    assert_eq!(stop_events(events_2), vec![acp::StopReason::EndTurn]);
-}
-
-#[gpui::test]
-async fn test_refusal(cx: &mut TestAppContext) {
-    let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
-    let fake_model = model.as_fake();
-
-    let events = thread
-        .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["Hello"], cx)
-        })
-        .unwrap();
-    cx.run_until_parked();
-    thread.read_with(cx, |thread, _| {
-        assert_eq!(
-            thread.to_markdown(),
-            indoc! {"
-                ## User
-
-                Hello
-            "}
-        );
-    });
-
-    fake_model.send_last_completion_stream_text_chunk("Hey!");
-    cx.run_until_parked();
-    thread.read_with(cx, |thread, _| {
-        assert_eq!(
-            thread.to_markdown(),
-            indoc! {"
-                ## User
-
-                Hello
-
-                ## Assistant
-
-                Hey!
-            "}
-        );
-    });
-
-    // If the model refuses to continue, the thread should remove all the messages after the last user message.
-    fake_model
-        .send_last_completion_stream_event(LanguageModelCompletionEvent::Stop(StopReason::Refusal));
-    let events = events.collect::<Vec<_>>().await;
-    assert_eq!(stop_events(events), vec![acp::StopReason::Refusal]);
-    thread.read_with(cx, |thread, _| {
-        assert_eq!(thread.to_markdown(), "");
-    });
-}
-
-#[gpui::test]
-async fn test_truncate_first_message(cx: &mut TestAppContext) {
-    let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
-    let fake_model = model.as_fake();
-
-    let message_id = UserMessageId::new();
-    thread
-        .update(cx, |thread, cx| {
-            thread.send(message_id.clone(), ["Hello"], cx)
-        })
-        .unwrap();
-    cx.run_until_parked();
-    thread.read_with(cx, |thread, _| {
-        assert_eq!(
-            thread.to_markdown(),
-            indoc! {"
-                ## User
-
-                Hello
-            "}
-        );
-        assert_eq!(thread.latest_token_usage(), None);
-    });
-
-    fake_model.send_last_completion_stream_text_chunk("Hey!");
-    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::UsageUpdate(
-        language_model::TokenUsage {
-            input_tokens: 32_000,
-            output_tokens: 16_000,
-            cache_creation_input_tokens: 0,
-            cache_read_input_tokens: 0,
-        },
-    ));
-    cx.run_until_parked();
-    thread.read_with(cx, |thread, _| {
-        assert_eq!(
-            thread.to_markdown(),
-            indoc! {"
-                ## User
-
-                Hello
-
-                ## Assistant
-
-                Hey!
-            "}
-        );
-        assert_eq!(
-            thread.latest_token_usage(),
-            Some(acp_thread::TokenUsage {
-                used_tokens: 32_000 + 16_000,
-                max_tokens: 1_000_000,
-            })
-        );
-    });
-
-    thread
-        .update(cx, |thread, cx| thread.truncate(message_id, cx))
-        .unwrap();
-    cx.run_until_parked();
-    thread.read_with(cx, |thread, _| {
-        assert_eq!(thread.to_markdown(), "");
-        assert_eq!(thread.latest_token_usage(), None);
-    });
-
-    // Ensure we can still send a new message after truncation.
-    thread
-        .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["Hi"], cx)
-        })
-        .unwrap();
-    thread.update(cx, |thread, _cx| {
-        assert_eq!(
-            thread.to_markdown(),
-            indoc! {"
-                ## User
-
-                Hi
-            "}
-        );
-    });
-    cx.run_until_parked();
-    fake_model.send_last_completion_stream_text_chunk("Ahoy!");
-    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::UsageUpdate(
-        language_model::TokenUsage {
-            input_tokens: 40_000,
-            output_tokens: 20_000,
-            cache_creation_input_tokens: 0,
-            cache_read_input_tokens: 0,
-        },
-    ));
-    cx.run_until_parked();
-    thread.read_with(cx, |thread, _| {
-        assert_eq!(
-            thread.to_markdown(),
-            indoc! {"
-                ## User
-
-                Hi
-
-                ## Assistant
-
-                Ahoy!
-            "}
-        );
-
-        assert_eq!(
-            thread.latest_token_usage(),
-            Some(acp_thread::TokenUsage {
-                used_tokens: 40_000 + 20_000,
-                max_tokens: 1_000_000,
-            })
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_truncate_second_message(cx: &mut TestAppContext) {
-    let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
-    let fake_model = model.as_fake();
-
-    thread
-        .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["Message 1"], cx)
-        })
-        .unwrap();
-    cx.run_until_parked();
-    fake_model.send_last_completion_stream_text_chunk("Message 1 response");
-    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::UsageUpdate(
-        language_model::TokenUsage {
-            input_tokens: 32_000,
-            output_tokens: 16_000,
-            cache_creation_input_tokens: 0,
-            cache_read_input_tokens: 0,
-        },
-    ));
-    fake_model.end_last_completion_stream();
-    cx.run_until_parked();
-
-    let assert_first_message_state = |cx: &mut TestAppContext| {
-        thread.clone().read_with(cx, |thread, _| {
-            assert_eq!(
-                thread.to_markdown(),
-                indoc! {"
-                    ## User
-
-                    Message 1
-
-                    ## Assistant
-
-                    Message 1 response
-                "}
-            );
-
-            assert_eq!(
-                thread.latest_token_usage(),
-                Some(acp_thread::TokenUsage {
-                    used_tokens: 32_000 + 16_000,
-                    max_tokens: 1_000_000,
-                })
-            );
-        });
-    };
-
-    assert_first_message_state(cx);
-
-    let second_message_id = UserMessageId::new();
-    thread
-        .update(cx, |thread, cx| {
-            thread.send(second_message_id.clone(), ["Message 2"], cx)
-        })
-        .unwrap();
-    cx.run_until_parked();
-
-    fake_model.send_last_completion_stream_text_chunk("Message 2 response");
-    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::UsageUpdate(
-        language_model::TokenUsage {
-            input_tokens: 40_000,
-            output_tokens: 20_000,
-            cache_creation_input_tokens: 0,
-            cache_read_input_tokens: 0,
-        },
-    ));
-    fake_model.end_last_completion_stream();
-    cx.run_until_parked();
-
-    thread.read_with(cx, |thread, _| {
-        assert_eq!(
-            thread.to_markdown(),
-            indoc! {"
-                ## User
-
-                Message 1
-
-                ## Assistant
-
-                Message 1 response
-
-                ## User
-
-                Message 2
-
-                ## Assistant
-
-                Message 2 response
-            "}
-        );
-
-        assert_eq!(
-            thread.latest_token_usage(),
-            Some(acp_thread::TokenUsage {
-                used_tokens: 40_000 + 20_000,
-                max_tokens: 1_000_000,
-            })
-        );
-    });
-
-    thread
-        .update(cx, |thread, cx| thread.truncate(second_message_id, cx))
-        .unwrap();
-    cx.run_until_parked();
-
-    assert_first_message_state(cx);
-}
-
-#[gpui::test]
-async fn test_title_generation(cx: &mut TestAppContext) {
-    let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
-    let fake_model = model.as_fake();
-
-    let summary_model = Arc::new(FakeLanguageModel::default());
-    thread.update(cx, |thread, cx| {
-        thread.set_summarization_model(Some(summary_model.clone()), cx)
-    });
-
-    let send = thread
-        .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["Hello"], cx)
-        })
-        .unwrap();
-    cx.run_until_parked();
-
-    fake_model.send_last_completion_stream_text_chunk("Hey!");
-    fake_model.end_last_completion_stream();
-    cx.run_until_parked();
-    thread.read_with(cx, |thread, _| assert_eq!(thread.title(), "New Thread"));
-
-    // Ensure the summary model has been invoked to generate a title.
-    summary_model.send_last_completion_stream_text_chunk("Hello ");
-    summary_model.send_last_completion_stream_text_chunk("world\nG");
-    summary_model.send_last_completion_stream_text_chunk("oodnight Moon");
-    summary_model.end_last_completion_stream();
-    send.collect::<Vec<_>>().await;
-    cx.run_until_parked();
-    thread.read_with(cx, |thread, _| assert_eq!(thread.title(), "Hello world"));
-
-    // Send another message, ensuring no title is generated this time.
-    let send = thread
-        .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["Hello again"], cx)
-        })
-        .unwrap();
-    cx.run_until_parked();
-    fake_model.send_last_completion_stream_text_chunk("Hey again!");
-    fake_model.end_last_completion_stream();
-    cx.run_until_parked();
-    assert_eq!(summary_model.pending_completions(), Vec::new());
-    send.collect::<Vec<_>>().await;
-    thread.read_with(cx, |thread, _| assert_eq!(thread.title(), "Hello world"));
-}
-
-#[gpui::test]
-async fn test_building_request_with_pending_tools(cx: &mut TestAppContext) {
-    let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
-    let fake_model = model.as_fake();
-
-    let _events = thread
-        .update(cx, |thread, cx| {
-            thread.add_tool(ToolRequiringPermission);
-            thread.add_tool(EchoTool);
-            thread.send(UserMessageId::new(), ["Hey!"], cx)
-        })
-        .unwrap();
-    cx.run_until_parked();
-
-    let permission_tool_use = LanguageModelToolUse {
-        id: "tool_id_1".into(),
-        name: ToolRequiringPermission::name().into(),
-        raw_input: "{}".into(),
-        input: json!({}),
-        is_input_complete: true,
-        thought_signature: None,
-    };
-    let echo_tool_use = LanguageModelToolUse {
-        id: "tool_id_2".into(),
-        name: EchoTool::name().into(),
-        raw_input: json!({"text": "test"}).to_string(),
-        input: json!({"text": "test"}),
-        is_input_complete: true,
-        thought_signature: None,
-    };
-    fake_model.send_last_completion_stream_text_chunk("Hi!");
-    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(
-        permission_tool_use,
-    ));
-    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(
-        echo_tool_use.clone(),
-    ));
-    fake_model.end_last_completion_stream();
-    cx.run_until_parked();
-
-    // Ensure pending tools are skipped when building a request.
-    let request = thread
-        .read_with(cx, |thread, cx| {
-            thread.build_completion_request(CompletionIntent::EditFile, cx)
-        })
-        .unwrap();
-    assert_eq!(
-        request.messages[1..],
-        vec![
-            LanguageModelRequestMessage {
-                role: Role::User,
-                content: vec!["Hey!".into()],
-                cache: true,
-                reasoning_details: None,
-            },
-            LanguageModelRequestMessage {
-                role: Role::Assistant,
-                content: vec![
-                    MessageContent::Text("Hi!".into()),
-                    MessageContent::ToolUse(echo_tool_use.clone())
-                ],
-                cache: false,
-                reasoning_details: None,
-            },
-            LanguageModelRequestMessage {
-                role: Role::User,
-                content: vec![MessageContent::ToolResult(LanguageModelToolResult {
-                    tool_use_id: echo_tool_use.id.clone(),
-                    tool_name: echo_tool_use.name,
-                    is_error: false,
-                    content: "test".into(),
-                    output: Some("test".into())
-                })],
-                cache: false,
-                reasoning_details: None,
-            },
-        ],
-    );
-}
-
-#[gpui::test]
-async fn test_agent_connection(cx: &mut TestAppContext) {
-    cx.update(settings::init);
-    let templates = Templates::new();
-
-    // Initialize language model system with test provider
-    cx.update(|cx| {
-        gpui_tokio::init(cx);
-
-        let http_client = FakeHttpClient::with_404_response();
-        let clock = Arc::new(clock::FakeSystemClock::new());
-        let client = Client::new(clock, http_client, cx);
-        let user_store = cx.new(|cx| UserStore::new(client.clone(), cx));
-        language_model::init(client.clone(), cx);
-        language_models::init(user_store, client.clone(), cx);
-        LanguageModelRegistry::test(cx);
-    });
-    cx.executor().forbid_parking();
-
-    // Create a project for new_thread
-    let fake_fs = cx.update(|cx| fs::FakeFs::new(cx.background_executor().clone()));
-    fake_fs.insert_tree(path!("/test"), json!({})).await;
-    let project = Project::test(fake_fs.clone(), [Path::new("/test")], cx).await;
-    let cwd = Path::new("/test");
-    let text_thread_store =
-        cx.new(|cx| assistant_text_thread::TextThreadStore::fake(project.clone(), cx));
-    let history_store = cx.new(|cx| HistoryStore::new(text_thread_store, cx));
-
-    // Create agent and connection
-    let agent = NativeAgent::new(
-        project.clone(),
-        history_store,
-        templates.clone(),
-        None,
-        fake_fs.clone(),
-        &mut cx.to_async(),
-    )
-    .await
-    .unwrap();
-    let connection = NativeAgentConnection(agent.clone());
-
-    // Create a thread using new_thread
-    let connection_rc = Rc::new(connection.clone());
-    let acp_thread = cx
-        .update(|cx| connection_rc.new_thread(project, cwd, cx))
-        .await
-        .expect("new_thread should succeed");
-
-    // Get the session_id from the AcpThread
-    let session_id = acp_thread.read_with(cx, |thread, _| thread.session_id().clone());
-
-    // Test model_selector returns Some
-    let selector_opt = connection.model_selector(&session_id);
-    assert!(
-        selector_opt.is_some(),
-        "agent should always support ModelSelector"
-    );
-    let selector = selector_opt.unwrap();
-
-    // Test list_models
-    let listed_models = cx
-        .update(|cx| selector.list_models(cx))
-        .await
-        .expect("list_models should succeed");
-    let AgentModelList::Grouped(listed_models) = listed_models else {
-        panic!("Unexpected model list type");
-    };
-    assert!(!listed_models.is_empty(), "should have at least one model");
-    assert_eq!(
-        listed_models[&AgentModelGroupName("Fake".into())][0]
-            .id
-            .0
-            .as_ref(),
-        "fake/fake"
-    );
-
-    // Test selected_model returns the default
-    let model = cx
-        .update(|cx| selector.selected_model(cx))
-        .await
-        .expect("selected_model should succeed");
-    let model = cx
-        .update(|cx| agent.read(cx).models().model_from_id(&model.id))
-        .unwrap();
-    let model = model.as_fake();
-    assert_eq!(model.id().0, "fake", "should return default model");
-
-    let request = acp_thread.update(cx, |thread, cx| thread.send(vec!["abc".into()], cx));
-    cx.run_until_parked();
-    model.send_last_completion_stream_text_chunk("def");
-    cx.run_until_parked();
-    acp_thread.read_with(cx, |thread, cx| {
-        assert_eq!(
-            thread.to_markdown(cx),
-            indoc! {"
-                ## User
-
-                abc
-
-                ## Assistant
-
-                def
-
-            "}
-        )
-    });
-
-    // Test cancel
-    cx.update(|cx| connection.cancel(&session_id, cx));
-    request.await.expect("prompt should fail gracefully");
-
-    // Ensure that dropping the ACP thread causes the native thread to be
-    // dropped as well.
-    cx.update(|_| drop(acp_thread));
-    let result = cx
-        .update(|cx| {
-            connection.prompt(
-                Some(acp_thread::UserMessageId::new()),
-                acp::PromptRequest::new(session_id.clone(), vec!["ghi".into()]),
-                cx,
-            )
-        })
-        .await;
-    assert_eq!(
-        result.as_ref().unwrap_err().to_string(),
-        "Session not found",
-        "unexpected result: {:?}",
-        result
-    );
-}
-
-#[gpui::test]
-async fn test_tool_updates_to_completion(cx: &mut TestAppContext) {
-    let ThreadTest { thread, model, .. } = setup(cx, TestModel::Fake).await;
-    thread.update(cx, |thread, _cx| thread.add_tool(ThinkingTool));
-    let fake_model = model.as_fake();
-
-    let mut events = thread
-        .update(cx, |thread, cx| {
-            thread.send(UserMessageId::new(), ["Think"], cx)
-        })
-        .unwrap();
-    cx.run_until_parked();
-
-    // Simulate streaming partial input.
-    let input = json!({});
-    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(
-        LanguageModelToolUse {
-            id: "1".into(),
-            name: ThinkingTool::name().into(),
-            raw_input: input.to_string(),
-            input,
-            is_input_complete: false,
-            thought_signature: None,
-        },
-    ));
-
-    // Input streaming completed
-    let input = json!({ "content": "Thinking hard!" });
-    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(
-        LanguageModelToolUse {
-            id: "1".into(),
-            name: "thinking".into(),
-            raw_input: input.to_string(),
-            input,
-            is_input_complete: true,
-            thought_signature: None,
-        },
-    ));
-    fake_model.end_last_completion_stream();
-    cx.run_until_parked();
-
-    let tool_call = expect_tool_call(&mut events).await;
-    assert_eq!(
-        tool_call,
-        acp::ToolCall::new("1", "Thinking")
-            .kind(acp::ToolKind::Think)
-            .raw_input(json!({}))
-            .meta(acp::Meta::from_iter([(
-                "tool_name".into(),
-                "thinking".into()
-            )]))
-    );
-    let update = expect_tool_call_update_fields(&mut events).await;
-    assert_eq!(
-        update,
-        acp::ToolCallUpdate::new(
-            "1",
-            acp::ToolCallUpdateFields::new()
-                .title("Thinking")
-                .kind(acp::ToolKind::Think)
-                .raw_input(json!({ "content": "Thinking hard!"}))
-        )
-    );
-    let update = expect_tool_call_update_fields(&mut events).await;
-    assert_eq!(
-        update,
-        acp::ToolCallUpdate::new(
-            "1",
-            acp::ToolCallUpdateFields::new().status(acp::ToolCallStatus::InProgress)
-        )
-    );
-    let update = expect_tool_call_update_fields(&mut events).await;
-    assert_eq!(
-        update,
-        acp::ToolCallUpdate::new(
-            "1",
-            acp::ToolCallUpdateFields::new().content(vec!["Thinking hard!".into()])
-        )
-    );
-    let update = expect_tool_call_update_fields(&mut events).await;
-    assert_eq!(
-        update,
-        acp::ToolCallUpdate::new(
-            "1",
-            acp::ToolCallUpdateFields::new()
-                .status(acp::ToolCallStatus::Completed)
-                .raw_output("Finished thinking.")
-        )
-    );
-}
-
-#[gpui::test]
-async fn test_send_no_retry_on_success(cx: &mut TestAppContext) {
-    let ThreadTest { thread, model, .. } = setup(cx, TestModel::Fake).await;
-    let fake_model = model.as_fake();
-
-    let mut events = thread
-        .update(cx, |thread, cx| {
-            thread.set_completion_mode(agent_settings::CompletionMode::Burn, cx);
-            thread.send(UserMessageId::new(), ["Hello!"], cx)
-        })
-        .unwrap();
-    cx.run_until_parked();
-
-    fake_model.send_last_completion_stream_text_chunk("Hey!");
-    fake_model.end_last_completion_stream();
-
-    let mut retry_events = Vec::new();
-    while let Some(Ok(event)) = events.next().await {
-        match event {
-            ThreadEvent::Retry(retry_status) => {
-                retry_events.push(retry_status);
-            }
-            ThreadEvent::Stop(..) => break,
-            _ => {}
-        }
-    }
-
-    assert_eq!(retry_events.len(), 0);
-    thread.read_with(cx, |thread, _cx| {
-        assert_eq!(
-            thread.to_markdown(),
-            indoc! {"
-                ## User
-
-                Hello!
-
-                ## Assistant
-
-                Hey!
-            "}
-        )
-    });
-}
-
-#[gpui::test]
-async fn test_send_retry_on_error(cx: &mut TestAppContext) {
-    let ThreadTest { thread, model, .. } = setup(cx, TestModel::Fake).await;
-    let fake_model = model.as_fake();
-
-    let mut events = thread
-        .update(cx, |thread, cx| {
-            thread.set_completion_mode(agent_settings::CompletionMode::Burn, cx);
-            thread.send(UserMessageId::new(), ["Hello!"], cx)
-        })
-        .unwrap();
-    cx.run_until_parked();
-
-    fake_model.send_last_completion_stream_text_chunk("Hey,");
-    fake_model.send_last_completion_stream_error(LanguageModelCompletionError::ServerOverloaded {
-        provider: LanguageModelProviderName::new("Anthropic"),
-        retry_after: Some(Duration::from_secs(3)),
-    });
-    fake_model.end_last_completion_stream();
-
-    cx.executor().advance_clock(Duration::from_secs(3));
-    cx.run_until_parked();
-
-    fake_model.send_last_completion_stream_text_chunk("there!");
-    fake_model.end_last_completion_stream();
-    cx.run_until_parked();
-
-    let mut retry_events = Vec::new();
-    while let Some(Ok(event)) = events.next().await {
-        match event {
-            ThreadEvent::Retry(retry_status) => {
-                retry_events.push(retry_status);
-            }
-            ThreadEvent::Stop(..) => break,
-            _ => {}
-        }
-    }
-
-    assert_eq!(retry_events.len(), 1);
-    assert!(matches!(
-        retry_events[0],
-        acp_thread::RetryStatus { attempt: 1, .. }
-    ));
-    thread.read_with(cx, |thread, _cx| {
-        assert_eq!(
-            thread.to_markdown(),
-            indoc! {"
-                ## User
-
-                Hello!
-
-                ## Assistant
-
-                Hey,
-
-                [resume]
-
-                ## Assistant
-
-                there!
-            "}
-        )
-    });
-}
-
-#[gpui::test]
-async fn test_send_retry_finishes_tool_calls_on_error(cx: &mut TestAppContext) {
-    let ThreadTest { thread, model, .. } = setup(cx, TestModel::Fake).await;
-    let fake_model = model.as_fake();
-
-    let events = thread
-        .update(cx, |thread, cx| {
-            thread.set_completion_mode(agent_settings::CompletionMode::Burn, cx);
-            thread.add_tool(EchoTool);
-            thread.send(UserMessageId::new(), ["Call the echo tool!"], cx)
-        })
-        .unwrap();
-    cx.run_until_parked();
-
-    let tool_use_1 = LanguageModelToolUse {
-        id: "tool_1".into(),
-        name: EchoTool::name().into(),
-        raw_input: json!({"text": "test"}).to_string(),
-        input: json!({"text": "test"}),
-        is_input_complete: true,
-        thought_signature: None,
-    };
-    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(
-        tool_use_1.clone(),
-    ));
-    fake_model.send_last_completion_stream_error(LanguageModelCompletionError::ServerOverloaded {
-        provider: LanguageModelProviderName::new("Anthropic"),
-        retry_after: Some(Duration::from_secs(3)),
-    });
-    fake_model.end_last_completion_stream();
-
-    cx.executor().advance_clock(Duration::from_secs(3));
-    let completion = fake_model.pending_completions().pop().unwrap();
-    assert_eq!(
-        completion.messages[1..],
-        vec![
-            LanguageModelRequestMessage {
-                role: Role::User,
-                content: vec!["Call the echo tool!".into()],
-                cache: false,
-                reasoning_details: None,
-            },
-            LanguageModelRequestMessage {
-                role: Role::Assistant,
-                content: vec![language_model::MessageContent::ToolUse(tool_use_1.clone())],
-                cache: false,
-                reasoning_details: None,
-            },
-            LanguageModelRequestMessage {
-                role: Role::User,
-                content: vec![language_model::MessageContent::ToolResult(
-                    LanguageModelToolResult {
-                        tool_use_id: tool_use_1.id.clone(),
-                        tool_name: tool_use_1.name.clone(),
-                        is_error: false,
-                        content: "test".into(),
-                        output: Some("test".into())
-                    }
-                )],
-                cache: true,
-                reasoning_details: None,
-            },
-        ]
-    );
-
-    fake_model.send_last_completion_stream_text_chunk("Done");
-    fake_model.end_last_completion_stream();
-    cx.run_until_parked();
-    events.collect::<Vec<_>>().await;
-    thread.read_with(cx, |thread, _cx| {
-        assert_eq!(
-            thread.last_message(),
-            Some(Message::Agent(AgentMessage {
-                content: vec![AgentMessageContent::Text("Done".into())],
-                tool_results: IndexMap::default(),
-                reasoning_details: None,
-            }))
-        );
-    })
-}
-
-#[gpui::test]
-async fn test_send_max_retries_exceeded(cx: &mut TestAppContext) {
-    let ThreadTest { thread, model, .. } = setup(cx, TestModel::Fake).await;
-    let fake_model = model.as_fake();
-
-    let mut events = thread
-        .update(cx, |thread, cx| {
-            thread.set_completion_mode(agent_settings::CompletionMode::Burn, cx);
-            thread.send(UserMessageId::new(), ["Hello!"], cx)
-        })
-        .unwrap();
-    cx.run_until_parked();
-
-    for _ in 0..crate::thread::MAX_RETRY_ATTEMPTS + 1 {
-        fake_model.send_last_completion_stream_error(
-            LanguageModelCompletionError::ServerOverloaded {
-                provider: LanguageModelProviderName::new("Anthropic"),
-                retry_after: Some(Duration::from_secs(3)),
-            },
-        );
-        fake_model.end_last_completion_stream();
-        cx.executor().advance_clock(Duration::from_secs(3));
-        cx.run_until_parked();
-    }
-
-    let mut errors = Vec::new();
-    let mut retry_events = Vec::new();
-    while let Some(event) = events.next().await {
-        match event {
-            Ok(ThreadEvent::Retry(retry_status)) => {
-                retry_events.push(retry_status);
-            }
-            Ok(ThreadEvent::Stop(..)) => break,
-            Err(error) => errors.push(error),
-            _ => {}
-        }
-    }
-
-    assert_eq!(
-        retry_events.len(),
-        crate::thread::MAX_RETRY_ATTEMPTS as usize
-    );
-    for i in 0..crate::thread::MAX_RETRY_ATTEMPTS as usize {
-        assert_eq!(retry_events[i].attempt, i + 1);
-    }
-    assert_eq!(errors.len(), 1);
-    let error = errors[0]
-        .downcast_ref::<LanguageModelCompletionError>()
-        .unwrap();
-    assert!(matches!(
-        error,
-        LanguageModelCompletionError::ServerOverloaded { .. }
-    ));
-}
-
-/// Filters out the stop events for asserting against in tests
-fn stop_events(result_events: Vec<Result<ThreadEvent>>) -> Vec<acp::StopReason> {
-    result_events
-        .into_iter()
-        .filter_map(|event| match event.unwrap() {
-            ThreadEvent::Stop(stop_reason) => Some(stop_reason),
-            _ => None,
-        })
-        .collect()
-}
-
-struct ThreadTest {
-    model: Arc<dyn LanguageModel>,
-    thread: Entity<Thread>,
-    project_context: Entity<ProjectContext>,
-    context_server_store: Entity<ContextServerStore>,
-    fs: Arc<FakeFs>,
-}
-
-enum TestModel {
-    Sonnet4,
-    Fake,
-}
-
-impl TestModel {
-    fn id(&self) -> LanguageModelId {
-        match self {
-            TestModel::Sonnet4 => LanguageModelId("claude-sonnet-4-latest".into()),
-            TestModel::Fake => unreachable!(),
-        }
-    }
-}
-
-async fn setup(cx: &mut TestAppContext, model: TestModel) -> ThreadTest {
-    cx.executor().allow_parking();
-
-    let fs = FakeFs::new(cx.background_executor.clone());
-    fs.create_dir(paths::settings_file().parent().unwrap())
-        .await
-        .unwrap();
-    fs.insert_file(
-        paths::settings_file(),
-        json!({
-            "agent": {
-                "default_profile": "test-profile",
-                "profiles": {
-                    "test-profile": {
-                        "name": "Test Profile",
-                        "tools": {
-                            EchoTool::name(): true,
-                            DelayTool::name(): true,
-                            WordListTool::name(): true,
-                            ToolRequiringPermission::name(): true,
-                            InfiniteTool::name(): true,
-                            ThinkingTool::name(): true,
-                        }
-                    }
-                }
-            }
-        })
-        .to_string()
-        .into_bytes(),
-    )
-    .await;
-
-    cx.update(|cx| {
-        settings::init(cx);
-
-        match model {
-            TestModel::Fake => {}
-            TestModel::Sonnet4 => {
-                gpui_tokio::init(cx);
-                let http_client = ReqwestClient::user_agent("agent tests").unwrap();
-                cx.set_http_client(Arc::new(http_client));
-                let client = Client::production(cx);
-                let user_store = cx.new(|cx| UserStore::new(client.clone(), cx));
-                language_model::init(client.clone(), cx);
-                language_models::init(user_store, client.clone(), cx);
-            }
-        };
-
-        watch_settings(fs.clone(), cx);
-    });
-
-    let templates = Templates::new();
-
-    fs.insert_tree(path!("/test"), json!({})).await;
-    let project = Project::test(fs.clone(), [path!("/test").as_ref()], cx).await;
-
-    let model = cx
-        .update(|cx| {
-            if let TestModel::Fake = model {
-                Task::ready(Arc::new(FakeLanguageModel::default()) as Arc<_>)
-            } else {
-                let model_id = model.id();
-                let models = LanguageModelRegistry::read_global(cx);
-                let model = models
-                    .available_models(cx)
-                    .find(|model| model.id() == model_id)
-                    .unwrap();
-
-                let provider = models.provider(&model.provider_id()).unwrap();
-                let authenticated = provider.authenticate(cx);
-
-                cx.spawn(async move |_cx| {
-                    authenticated.await.unwrap();
-                    model
-                })
-            }
-        })
-        .await;
-
-    let project_context = cx.new(|_cx| ProjectContext::default());
-    let context_server_store = project.read_with(cx, |project, _| project.context_server_store());
-    let context_server_registry =
-        cx.new(|cx| ContextServerRegistry::new(context_server_store.clone(), cx));
-    let thread = cx.new(|cx| {
-        Thread::new(
-            project,
-            project_context.clone(),
-            context_server_registry,
-            templates,
-            Some(model.clone()),
-            cx,
-        )
-    });
-    ThreadTest {
-        model,
-        thread,
-        project_context,
-        context_server_store,
-        fs,
-    }
-}
-
-#[cfg(test)]
-#[ctor::ctor]
-fn init_logger() {
-    if std::env::var("RUST_LOG").is_ok() {
-        env_logger::init();
-    }
-}
-
-fn watch_settings(fs: Arc<dyn Fs>, cx: &mut App) {
-    let fs = fs.clone();
-    cx.spawn({
-        async move |cx| {
-            let mut new_settings_content_rx = settings::watch_config_file(
-                cx.background_executor(),
-                fs,
-                paths::settings_file().clone(),
-            );
-
-            while let Some(new_settings_content) = new_settings_content_rx.next().await {
-                cx.update(|cx| {
-                    SettingsStore::update_global(cx, |settings, cx| {
-                        settings.set_user_settings(&new_settings_content, cx)
-                    })
-                })
-                .ok();
-            }
-        }
-    })
-    .detach();
-}
-
-fn tool_names_for_completion(completion: &LanguageModelRequest) -> Vec<String> {
-    completion
-        .tools
-        .iter()
-        .map(|tool| tool.name.clone())
-        .collect()
-}
-
-fn setup_context_server(
-    name: &'static str,
-    tools: Vec<context_server::types::Tool>,
-    context_server_store: &Entity<ContextServerStore>,
-    cx: &mut TestAppContext,
-) -> mpsc::UnboundedReceiver<(
-    context_server::types::CallToolParams,
-    oneshot::Sender<context_server::types::CallToolResponse>,
-)> {
-    cx.update(|cx| {
-        let mut settings = ProjectSettings::get_global(cx).clone();
-        settings.context_servers.insert(
-            name.into(),
-            project::project_settings::ContextServerSettings::Stdio {
-                enabled: true,
-                command: ContextServerCommand {
-                    path: "somebinary".into(),
-                    args: Vec::new(),
-                    env: None,
-                    timeout: None,
-                },
-            },
-        );
-        ProjectSettings::override_global(settings, cx);
-    });
-
-    let (mcp_tool_calls_tx, mcp_tool_calls_rx) = mpsc::unbounded();
-    let fake_transport = context_server::test::create_fake_transport(name, cx.executor())
-        .on_request::<context_server::types::requests::Initialize, _>(move |_params| async move {
-            context_server::types::InitializeResponse {
-                protocol_version: context_server::types::ProtocolVersion(
-                    context_server::types::LATEST_PROTOCOL_VERSION.to_string(),
-                ),
-                server_info: context_server::types::Implementation {
-                    name: name.into(),
-                    version: "1.0.0".to_string(),
-                },
-                capabilities: context_server::types::ServerCapabilities {
-                    tools: Some(context_server::types::ToolsCapabilities {
-                        list_changed: Some(true),
-                    }),
-                    ..Default::default()
-                },
-                meta: None,
-            }
-        })
-        .on_request::<context_server::types::requests::ListTools, _>(move |_params| {
-            let tools = tools.clone();
-            async move {
-                context_server::types::ListToolsResponse {
-                    tools,
-                    next_cursor: None,
-                    meta: None,
-                }
-            }
-        })
-        .on_request::<context_server::types::requests::CallTool, _>(move |params| {
-            let mcp_tool_calls_tx = mcp_tool_calls_tx.clone();
-            async move {
-                let (response_tx, response_rx) = oneshot::channel();
-                mcp_tool_calls_tx
-                    .unbounded_send((params, response_tx))
-                    .unwrap();
-                response_rx.await.unwrap()
-            }
-        });
-    context_server_store.update(cx, |store, cx| {
-        store.start_server(
-            Arc::new(ContextServer::new(
-                ContextServerId(name.into()),
-                Arc::new(fake_transport),
-            )),
-            cx,
-        );
-    });
-    cx.run_until_parked();
-    mcp_tool_calls_rx
-}
diff --git a/crates/agent/src/tests/test_tools.rs b/crates/agent/src/tests/test_tools.rs
deleted file mode 100644
index 2275d23c2f..0000000000
--- a/crates/agent/src/tests/test_tools.rs
+++ /dev/null
@@ -1,221 +0,0 @@
-use super::*;
-use anyhow::Result;
-use gpui::{App, SharedString, Task};
-use std::future;
-
-/// A tool that echoes its input
-#[derive(JsonSchema, Serialize, Deserialize)]
-pub struct EchoToolInput {
-    /// The text to echo.
-    pub text: String,
-}
-
-pub struct EchoTool;
-
-impl AgentTool for EchoTool {
-    type Input = EchoToolInput;
-    type Output = String;
-
-    fn name() -> &'static str {
-        "echo"
-    }
-
-    fn kind() -> acp::ToolKind {
-        acp::ToolKind::Other
-    }
-
-    fn initial_title(
-        &self,
-        _input: Result<Self::Input, serde_json::Value>,
-        _cx: &mut App,
-    ) -> SharedString {
-        "Echo".into()
-    }
-
-    fn run(
-        self: Arc<Self>,
-        input: Self::Input,
-        _event_stream: ToolCallEventStream,
-        _cx: &mut App,
-    ) -> Task<Result<String>> {
-        Task::ready(Ok(input.text))
-    }
-}
-
-/// A tool that waits for a specified delay
-#[derive(JsonSchema, Serialize, Deserialize)]
-pub struct DelayToolInput {
-    /// The delay in milliseconds.
-    ms: u64,
-}
-
-pub struct DelayTool;
-
-impl AgentTool for DelayTool {
-    type Input = DelayToolInput;
-    type Output = String;
-
-    fn name() -> &'static str {
-        "delay"
-    }
-
-    fn initial_title(
-        &self,
-        input: Result<Self::Input, serde_json::Value>,
-        _cx: &mut App,
-    ) -> SharedString {
-        if let Ok(input) = input {
-            format!("Delay {}ms", input.ms).into()
-        } else {
-            "Delay".into()
-        }
-    }
-
-    fn kind() -> acp::ToolKind {
-        acp::ToolKind::Other
-    }
-
-    fn run(
-        self: Arc<Self>,
-        input: Self::Input,
-        _event_stream: ToolCallEventStream,
-        cx: &mut App,
-    ) -> Task<Result<String>>
-    where
-        Self: Sized,
-    {
-        cx.foreground_executor().spawn(async move {
-            smol::Timer::after(Duration::from_millis(input.ms)).await;
-            Ok("Ding".to_string())
-        })
-    }
-}
-
-#[derive(JsonSchema, Serialize, Deserialize)]
-pub struct ToolRequiringPermissionInput {}
-
-pub struct ToolRequiringPermission;
-
-impl AgentTool for ToolRequiringPermission {
-    type Input = ToolRequiringPermissionInput;
-    type Output = String;
-
-    fn name() -> &'static str {
-        "tool_requiring_permission"
-    }
-
-    fn kind() -> acp::ToolKind {
-        acp::ToolKind::Other
-    }
-
-    fn initial_title(
-        &self,
-        _input: Result<Self::Input, serde_json::Value>,
-        _cx: &mut App,
-    ) -> SharedString {
-        "This tool requires permission".into()
-    }
-
-    fn run(
-        self: Arc<Self>,
-        _input: Self::Input,
-        event_stream: ToolCallEventStream,
-        cx: &mut App,
-    ) -> Task<Result<String>> {
-        let authorize = event_stream.authorize("Authorize?", cx);
-        cx.foreground_executor().spawn(async move {
-            authorize.await?;
-            Ok("Allowed".to_string())
-        })
-    }
-}
-
-#[derive(JsonSchema, Serialize, Deserialize)]
-pub struct InfiniteToolInput {}
-
-pub struct InfiniteTool;
-
-impl AgentTool for InfiniteTool {
-    type Input = InfiniteToolInput;
-    type Output = String;
-
-    fn name() -> &'static str {
-        "infinite"
-    }
-
-    fn kind() -> acp::ToolKind {
-        acp::ToolKind::Other
-    }
-
-    fn initial_title(
-        &self,
-        _input: Result<Self::Input, serde_json::Value>,
-        _cx: &mut App,
-    ) -> SharedString {
-        "Infinite Tool".into()
-    }
-
-    fn run(
-        self: Arc<Self>,
-        _input: Self::Input,
-        _event_stream: ToolCallEventStream,
-        cx: &mut App,
-    ) -> Task<Result<String>> {
-        cx.foreground_executor().spawn(async move {
-            future::pending::<()>().await;
-            unreachable!()
-        })
-    }
-}
-
-/// A tool that takes an object with map from letters to random words starting with that letter.
-/// All fiealds are required! Pass a word for every letter!
-#[derive(JsonSchema, Serialize, Deserialize)]
-pub struct WordListInput {
-    /// Provide a random word that starts with A.
-    a: Option<String>,
-    /// Provide a random word that starts with B.
-    b: Option<String>,
-    /// Provide a random word that starts with C.
-    c: Option<String>,
-    /// Provide a random word that starts with D.
-    d: Option<String>,
-    /// Provide a random word that starts with E.
-    e: Option<String>,
-    /// Provide a random word that starts with F.
-    f: Option<String>,
-    /// Provide a random word that starts with G.
-    g: Option<String>,
-}
-
-pub struct WordListTool;
-
-impl AgentTool for WordListTool {
-    type Input = WordListInput;
-    type Output = String;
-
-    fn name() -> &'static str {
-        "word_list"
-    }
-
-    fn kind() -> acp::ToolKind {
-        acp::ToolKind::Other
-    }
-
-    fn initial_title(
-        &self,
-        _input: Result<Self::Input, serde_json::Value>,
-        _cx: &mut App,
-    ) -> SharedString {
-        "List of random words".into()
-    }
-
-    fn run(
-        self: Arc<Self>,
-        _input: Self::Input,
-        _event_stream: ToolCallEventStream,
-        _cx: &mut App,
-    ) -> Task<Result<String>> {
-        Task::ready(Ok("ok".to_string()))
-    }
-}
diff --git a/crates/agent/src/thread.rs b/crates/agent/src/thread.rs
deleted file mode 100644
index 4aabf8069b..0000000000
--- a/crates/agent/src/thread.rs
+++ /dev/null
@@ -1,2664 +0,0 @@
-use crate::{
-    ContextServerRegistry, CopyPathTool, CreateDirectoryTool, DbLanguageModel, DbThread,
-    DeletePathTool, DiagnosticsTool, EditFileTool, FetchTool, FindPathTool, GrepTool,
-    ListDirectoryTool, MovePathTool, NowTool, OpenTool, ProjectSnapshot, ReadFileTool,
-    SystemPromptTemplate, Template, Templates, TerminalTool, ThinkingTool, WebSearchTool,
-};
-use acp_thread::{MentionUri, UserMessageId};
-use action_log::ActionLog;
-
-use agent_client_protocol as acp;
-use agent_settings::{
-    AgentProfileId, AgentProfileSettings, AgentSettings, CompletionMode,
-    SUMMARIZE_THREAD_DETAILED_PROMPT, SUMMARIZE_THREAD_PROMPT,
-};
-use anyhow::{Context as _, Result, anyhow};
-use chrono::{DateTime, Utc};
-use client::{ModelRequestUsage, RequestUsage, UserStore};
-use cloud_llm_client::{CompletionIntent, Plan, UsageLimit};
-use collections::{HashMap, HashSet, IndexMap};
-use fs::Fs;
-use futures::stream;
-use futures::{
-    FutureExt,
-    channel::{mpsc, oneshot},
-    future::Shared,
-    stream::FuturesUnordered,
-};
-use gpui::{
-    App, AppContext, AsyncApp, Context, Entity, EventEmitter, SharedString, Task, WeakEntity,
-};
-use language_model::{
-    LanguageModel, LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelExt,
-    LanguageModelId, LanguageModelImage, LanguageModelProviderId, LanguageModelRegistry,
-    LanguageModelRequest, LanguageModelRequestMessage, LanguageModelRequestTool,
-    LanguageModelToolResult, LanguageModelToolResultContent, LanguageModelToolSchemaFormat,
-    LanguageModelToolUse, LanguageModelToolUseId, Role, SelectedModel, StopReason, TokenUsage,
-    ZED_CLOUD_PROVIDER_ID,
-};
-use project::Project;
-use prompt_store::ProjectContext;
-use schemars::{JsonSchema, Schema};
-use serde::{Deserialize, Serialize};
-use settings::{LanguageModelSelection, Settings, update_settings_file};
-use smol::stream::StreamExt;
-use std::{
-    collections::BTreeMap,
-    ops::RangeInclusive,
-    path::Path,
-    rc::Rc,
-    sync::Arc,
-    time::{Duration, Instant},
-};
-use std::{fmt::Write, path::PathBuf};
-use util::{ResultExt, debug_panic, markdown::MarkdownCodeBlock, paths::PathStyle};
-use uuid::Uuid;
-
-const TOOL_CANCELED_MESSAGE: &str = "Tool canceled by user";
-pub const MAX_TOOL_NAME_LENGTH: usize = 64;
-
-/// The ID of the user prompt that initiated a request.
-///
-/// This equates to the user physically submitting a message to the model (e.g., by pressing the Enter key).
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Serialize, Deserialize)]
-pub struct PromptId(Arc<str>);
-
-impl PromptId {
-    pub fn new() -> Self {
-        Self(Uuid::new_v4().to_string().into())
-    }
-}
-
-impl std::fmt::Display for PromptId {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
-pub(crate) const MAX_RETRY_ATTEMPTS: u8 = 4;
-pub(crate) const BASE_RETRY_DELAY: Duration = Duration::from_secs(5);
-
-#[derive(Debug, Clone)]
-enum RetryStrategy {
-    ExponentialBackoff {
-        initial_delay: Duration,
-        max_attempts: u8,
-    },
-    Fixed {
-        delay: Duration,
-        max_attempts: u8,
-    },
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-pub enum Message {
-    User(UserMessage),
-    Agent(AgentMessage),
-    Resume,
-}
-
-impl Message {
-    pub fn as_agent_message(&self) -> Option<&AgentMessage> {
-        match self {
-            Message::Agent(agent_message) => Some(agent_message),
-            _ => None,
-        }
-    }
-
-    pub fn to_request(&self) -> Vec<LanguageModelRequestMessage> {
-        match self {
-            Message::User(message) => vec![message.to_request()],
-            Message::Agent(message) => message.to_request(),
-            Message::Resume => vec![LanguageModelRequestMessage {
-                role: Role::User,
-                content: vec!["Continue where you left off".into()],
-                cache: false,
-                reasoning_details: None,
-            }],
-        }
-    }
-
-    pub fn to_markdown(&self) -> String {
-        match self {
-            Message::User(message) => message.to_markdown(),
-            Message::Agent(message) => message.to_markdown(),
-            Message::Resume => "[resume]\n".into(),
-        }
-    }
-
-    pub fn role(&self) -> Role {
-        match self {
-            Message::User(_) | Message::Resume => Role::User,
-            Message::Agent(_) => Role::Assistant,
-        }
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-pub struct UserMessage {
-    pub id: UserMessageId,
-    pub content: Vec<UserMessageContent>,
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-pub enum UserMessageContent {
-    Text(String),
-    Mention { uri: MentionUri, content: String },
-    Image(LanguageModelImage),
-}
-
-impl UserMessage {
-    pub fn to_markdown(&self) -> String {
-        let mut markdown = String::from("## User\n\n");
-
-        for content in &self.content {
-            match content {
-                UserMessageContent::Text(text) => {
-                    markdown.push_str(text);
-                    markdown.push('\n');
-                }
-                UserMessageContent::Image(_) => {
-                    markdown.push_str("<image />\n");
-                }
-                UserMessageContent::Mention { uri, content } => {
-                    if !content.is_empty() {
-                        let _ = writeln!(&mut markdown, "{}\n\n{}", uri.as_link(), content);
-                    } else {
-                        let _ = writeln!(&mut markdown, "{}", uri.as_link());
-                    }
-                }
-            }
-        }
-
-        markdown
-    }
-
-    fn to_request(&self) -> LanguageModelRequestMessage {
-        let mut message = LanguageModelRequestMessage {
-            role: Role::User,
-            content: Vec::with_capacity(self.content.len()),
-            cache: false,
-            reasoning_details: None,
-        };
-
-        const OPEN_CONTEXT: &str = "<context>\n\
-            The following items were attached by the user. \
-            They are up-to-date and don't need to be re-read.\n\n";
-
-        const OPEN_FILES_TAG: &str = "<files>";
-        const OPEN_DIRECTORIES_TAG: &str = "<directories>";
-        const OPEN_SYMBOLS_TAG: &str = "<symbols>";
-        const OPEN_SELECTIONS_TAG: &str = "<selections>";
-        const OPEN_THREADS_TAG: &str = "<threads>";
-        const OPEN_FETCH_TAG: &str = "<fetched_urls>";
-        const OPEN_RULES_TAG: &str =
-            "<rules>\nThe user has specified the following rules that should be applied:\n";
-
-        let mut file_context = OPEN_FILES_TAG.to_string();
-        let mut directory_context = OPEN_DIRECTORIES_TAG.to_string();
-        let mut symbol_context = OPEN_SYMBOLS_TAG.to_string();
-        let mut selection_context = OPEN_SELECTIONS_TAG.to_string();
-        let mut thread_context = OPEN_THREADS_TAG.to_string();
-        let mut fetch_context = OPEN_FETCH_TAG.to_string();
-        let mut rules_context = OPEN_RULES_TAG.to_string();
-
-        for chunk in &self.content {
-            let chunk = match chunk {
-                UserMessageContent::Text(text) => {
-                    language_model::MessageContent::Text(text.clone())
-                }
-                UserMessageContent::Image(value) => {
-                    language_model::MessageContent::Image(value.clone())
-                }
-                UserMessageContent::Mention { uri, content } => {
-                    match uri {
-                        MentionUri::File { abs_path } => {
-                            write!(
-                                &mut file_context,
-                                "\n{}",
-                                MarkdownCodeBlock {
-                                    tag: &codeblock_tag(abs_path, None),
-                                    text: &content.to_string(),
-                                }
-                            )
-                            .ok();
-                        }
-                        MentionUri::PastedImage => {
-                            debug_panic!("pasted image URI should not be used in mention content")
-                        }
-                        MentionUri::Directory { .. } => {
-                            write!(&mut directory_context, "\n{}\n", content).ok();
-                        }
-                        MentionUri::Symbol {
-                            abs_path: path,
-                            line_range,
-                            ..
-                        } => {
-                            write!(
-                                &mut symbol_context,
-                                "\n{}",
-                                MarkdownCodeBlock {
-                                    tag: &codeblock_tag(path, Some(line_range)),
-                                    text: content
-                                }
-                            )
-                            .ok();
-                        }
-                        MentionUri::Selection {
-                            abs_path: path,
-                            line_range,
-                            ..
-                        } => {
-                            write!(
-                                &mut selection_context,
-                                "\n{}",
-                                MarkdownCodeBlock {
-                                    tag: &codeblock_tag(
-                                        path.as_deref().unwrap_or("Untitled".as_ref()),
-                                        Some(line_range)
-                                    ),
-                                    text: content
-                                }
-                            )
-                            .ok();
-                        }
-                        MentionUri::Thread { .. } => {
-                            write!(&mut thread_context, "\n{}\n", content).ok();
-                        }
-                        MentionUri::TextThread { .. } => {
-                            write!(&mut thread_context, "\n{}\n", content).ok();
-                        }
-                        MentionUri::Rule { .. } => {
-                            write!(
-                                &mut rules_context,
-                                "\n{}",
-                                MarkdownCodeBlock {
-                                    tag: "",
-                                    text: content
-                                }
-                            )
-                            .ok();
-                        }
-                        MentionUri::Fetch { url } => {
-                            write!(&mut fetch_context, "\nFetch: {}\n\n{}", url, content).ok();
-                        }
-                    }
-
-                    language_model::MessageContent::Text(uri.as_link().to_string())
-                }
-            };
-
-            message.content.push(chunk);
-        }
-
-        let len_before_context = message.content.len();
-
-        if file_context.len() > OPEN_FILES_TAG.len() {
-            file_context.push_str("</files>\n");
-            message
-                .content
-                .push(language_model::MessageContent::Text(file_context));
-        }
-
-        if directory_context.len() > OPEN_DIRECTORIES_TAG.len() {
-            directory_context.push_str("</directories>\n");
-            message
-                .content
-                .push(language_model::MessageContent::Text(directory_context));
-        }
-
-        if symbol_context.len() > OPEN_SYMBOLS_TAG.len() {
-            symbol_context.push_str("</symbols>\n");
-            message
-                .content
-                .push(language_model::MessageContent::Text(symbol_context));
-        }
-
-        if selection_context.len() > OPEN_SELECTIONS_TAG.len() {
-            selection_context.push_str("</selections>\n");
-            message
-                .content
-                .push(language_model::MessageContent::Text(selection_context));
-        }
-
-        if thread_context.len() > OPEN_THREADS_TAG.len() {
-            thread_context.push_str("</threads>\n");
-            message
-                .content
-                .push(language_model::MessageContent::Text(thread_context));
-        }
-
-        if fetch_context.len() > OPEN_FETCH_TAG.len() {
-            fetch_context.push_str("</fetched_urls>\n");
-            message
-                .content
-                .push(language_model::MessageContent::Text(fetch_context));
-        }
-
-        if rules_context.len() > OPEN_RULES_TAG.len() {
-            rules_context.push_str("</user_rules>\n");
-            message
-                .content
-                .push(language_model::MessageContent::Text(rules_context));
-        }
-
-        if message.content.len() > len_before_context {
-            message.content.insert(
-                len_before_context,
-                language_model::MessageContent::Text(OPEN_CONTEXT.into()),
-            );
-            message
-                .content
-                .push(language_model::MessageContent::Text("</context>".into()));
-        }
-
-        message
-    }
-}
-
-fn codeblock_tag(full_path: &Path, line_range: Option<&RangeInclusive<u32>>) -> String {
-    let mut result = String::new();
-
-    if let Some(extension) = full_path.extension().and_then(|ext| ext.to_str()) {
-        let _ = write!(result, "{} ", extension);
-    }
-
-    let _ = write!(result, "{}", full_path.display());
-
-    if let Some(range) = line_range {
-        if range.start() == range.end() {
-            let _ = write!(result, ":{}", range.start() + 1);
-        } else {
-            let _ = write!(result, ":{}-{}", range.start() + 1, range.end() + 1);
-        }
-    }
-
-    result
-}
-
-impl AgentMessage {
-    pub fn to_markdown(&self) -> String {
-        let mut markdown = String::from("## Assistant\n\n");
-
-        for content in &self.content {
-            match content {
-                AgentMessageContent::Text(text) => {
-                    markdown.push_str(text);
-                    markdown.push('\n');
-                }
-                AgentMessageContent::Thinking { text, .. } => {
-                    markdown.push_str("<think>");
-                    markdown.push_str(text);
-                    markdown.push_str("</think>\n");
-                }
-                AgentMessageContent::RedactedThinking(_) => {
-                    markdown.push_str("<redacted_thinking />\n")
-                }
-                AgentMessageContent::ToolUse(tool_use) => {
-                    markdown.push_str(&format!(
-                        "**Tool Use**: {} (ID: {})\n",
-                        tool_use.name, tool_use.id
-                    ));
-                    markdown.push_str(&format!(
-                        "{}\n",
-                        MarkdownCodeBlock {
-                            tag: "json",
-                            text: &format!("{:#}", tool_use.input)
-                        }
-                    ));
-                }
-            }
-        }
-
-        for tool_result in self.tool_results.values() {
-            markdown.push_str(&format!(
-                "**Tool Result**: {} (ID: {})\n\n",
-                tool_result.tool_name, tool_result.tool_use_id
-            ));
-            if tool_result.is_error {
-                markdown.push_str("**ERROR:**\n");
-            }
-
-            match &tool_result.content {
-                LanguageModelToolResultContent::Text(text) => {
-                    writeln!(markdown, "{text}\n").ok();
-                }
-                LanguageModelToolResultContent::Image(_) => {
-                    writeln!(markdown, "<image />\n").ok();
-                }
-            }
-
-            if let Some(output) = tool_result.output.as_ref() {
-                writeln!(
-                    markdown,
-                    "**Debug Output**:\n\n```json\n{}\n```\n",
-                    serde_json::to_string_pretty(output).unwrap()
-                )
-                .unwrap();
-            }
-        }
-
-        markdown
-    }
-
-    pub fn to_request(&self) -> Vec<LanguageModelRequestMessage> {
-        let mut assistant_message = LanguageModelRequestMessage {
-            role: Role::Assistant,
-            content: Vec::with_capacity(self.content.len()),
-            cache: false,
-            reasoning_details: self.reasoning_details.clone(),
-        };
-        for chunk in &self.content {
-            match chunk {
-                AgentMessageContent::Text(text) => {
-                    assistant_message
-                        .content
-                        .push(language_model::MessageContent::Text(text.clone()));
-                }
-                AgentMessageContent::Thinking { text, signature } => {
-                    assistant_message
-                        .content
-                        .push(language_model::MessageContent::Thinking {
-                            text: text.clone(),
-                            signature: signature.clone(),
-                        });
-                }
-                AgentMessageContent::RedactedThinking(value) => {
-                    assistant_message.content.push(
-                        language_model::MessageContent::RedactedThinking(value.clone()),
-                    );
-                }
-                AgentMessageContent::ToolUse(tool_use) => {
-                    if self.tool_results.contains_key(&tool_use.id) {
-                        assistant_message
-                            .content
-                            .push(language_model::MessageContent::ToolUse(tool_use.clone()));
-                    }
-                }
-            };
-        }
-
-        let mut user_message = LanguageModelRequestMessage {
-            role: Role::User,
-            content: Vec::new(),
-            cache: false,
-            reasoning_details: None,
-        };
-
-        for tool_result in self.tool_results.values() {
-            let mut tool_result = tool_result.clone();
-            // Surprisingly, the API fails if we return an empty string here.
-            // It thinks we are sending a tool use without a tool result.
-            if tool_result.content.is_empty() {
-                tool_result.content = "<Tool returned an empty string>".into();
-            }
-            user_message
-                .content
-                .push(language_model::MessageContent::ToolResult(tool_result));
-        }
-
-        let mut messages = Vec::new();
-        if !assistant_message.content.is_empty() {
-            messages.push(assistant_message);
-        }
-        if !user_message.content.is_empty() {
-            messages.push(user_message);
-        }
-        messages
-    }
-}
-
-#[derive(Default, Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-pub struct AgentMessage {
-    pub content: Vec<AgentMessageContent>,
-    pub tool_results: IndexMap<LanguageModelToolUseId, LanguageModelToolResult>,
-    pub reasoning_details: Option<serde_json::Value>,
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-pub enum AgentMessageContent {
-    Text(String),
-    Thinking {
-        text: String,
-        signature: Option<String>,
-    },
-    RedactedThinking(String),
-    ToolUse(LanguageModelToolUse),
-}
-
-pub trait TerminalHandle {
-    fn id(&self, cx: &AsyncApp) -> Result<acp::TerminalId>;
-    fn current_output(&self, cx: &AsyncApp) -> Result<acp::TerminalOutputResponse>;
-    fn wait_for_exit(&self, cx: &AsyncApp) -> Result<Shared<Task<acp::TerminalExitStatus>>>;
-}
-
-pub trait ThreadEnvironment {
-    fn create_terminal(
-        &self,
-        command: String,
-        cwd: Option<PathBuf>,
-        output_byte_limit: Option<u64>,
-        cx: &mut AsyncApp,
-    ) -> Task<Result<Rc<dyn TerminalHandle>>>;
-}
-
-#[derive(Debug)]
-pub enum ThreadEvent {
-    UserMessage(UserMessage),
-    AgentText(String),
-    AgentThinking(String),
-    ToolCall(acp::ToolCall),
-    ToolCallUpdate(acp_thread::ToolCallUpdate),
-    ToolCallAuthorization(ToolCallAuthorization),
-    Retry(acp_thread::RetryStatus),
-    Stop(acp::StopReason),
-}
-
-#[derive(Debug)]
-pub struct NewTerminal {
-    pub command: String,
-    pub output_byte_limit: Option<u64>,
-    pub cwd: Option<PathBuf>,
-    pub response: oneshot::Sender<Result<Entity<acp_thread::Terminal>>>,
-}
-
-#[derive(Debug)]
-pub struct ToolCallAuthorization {
-    pub tool_call: acp::ToolCallUpdate,
-    pub options: Vec<acp::PermissionOption>,
-    pub response: oneshot::Sender<acp::PermissionOptionId>,
-}
-
-#[derive(Debug, thiserror::Error)]
-enum CompletionError {
-    #[error("max tokens")]
-    MaxTokens,
-    #[error("refusal")]
-    Refusal,
-    #[error(transparent)]
-    Other(#[from] anyhow::Error),
-}
-
-pub struct Thread {
-    id: acp::SessionId,
-    prompt_id: PromptId,
-    updated_at: DateTime<Utc>,
-    title: Option<SharedString>,
-    pending_title_generation: Option<Task<()>>,
-    pending_summary_generation: Option<Shared<Task<Option<SharedString>>>>,
-    summary: Option<SharedString>,
-    messages: Vec<Message>,
-    user_store: Entity<UserStore>,
-    completion_mode: CompletionMode,
-    /// Holds the task that handles agent interaction until the end of the turn.
-    /// Survives across multiple requests as the model performs tool calls and
-    /// we run tools, report their results.
-    running_turn: Option<RunningTurn>,
-    pending_message: Option<AgentMessage>,
-    tools: BTreeMap<SharedString, Arc<dyn AnyAgentTool>>,
-    tool_use_limit_reached: bool,
-    request_token_usage: HashMap<UserMessageId, language_model::TokenUsage>,
-    #[allow(unused)]
-    cumulative_token_usage: TokenUsage,
-    #[allow(unused)]
-    initial_project_snapshot: Shared<Task<Option<Arc<ProjectSnapshot>>>>,
-    context_server_registry: Entity<ContextServerRegistry>,
-    profile_id: AgentProfileId,
-    project_context: Entity<ProjectContext>,
-    templates: Arc<Templates>,
-    model: Option<Arc<dyn LanguageModel>>,
-    summarization_model: Option<Arc<dyn LanguageModel>>,
-    prompt_capabilities_tx: watch::Sender<acp::PromptCapabilities>,
-    pub(crate) prompt_capabilities_rx: watch::Receiver<acp::PromptCapabilities>,
-    pub(crate) project: Entity<Project>,
-    pub(crate) action_log: Entity<ActionLog>,
-    /// Tracks the last time files were read by the agent, to detect external modifications
-    pub(crate) file_read_times: HashMap<PathBuf, fs::MTime>,
-}
-
-impl Thread {
-    fn prompt_capabilities(model: Option<&dyn LanguageModel>) -> acp::PromptCapabilities {
-        let image = model.map_or(true, |model| model.supports_images());
-        acp::PromptCapabilities::new()
-            .image(image)
-            .embedded_context(true)
-    }
-
-    pub fn new(
-        project: Entity<Project>,
-        project_context: Entity<ProjectContext>,
-        context_server_registry: Entity<ContextServerRegistry>,
-        templates: Arc<Templates>,
-        model: Option<Arc<dyn LanguageModel>>,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let profile_id = AgentSettings::get_global(cx).default_profile.clone();
-        let action_log = cx.new(|_cx| ActionLog::new(project.clone()));
-        let (prompt_capabilities_tx, prompt_capabilities_rx) =
-            watch::channel(Self::prompt_capabilities(model.as_deref()));
-        Self {
-            id: acp::SessionId::new(uuid::Uuid::new_v4().to_string()),
-            prompt_id: PromptId::new(),
-            updated_at: Utc::now(),
-            title: None,
-            pending_title_generation: None,
-            pending_summary_generation: None,
-            summary: None,
-            messages: Vec::new(),
-            user_store: project.read(cx).user_store(),
-            completion_mode: AgentSettings::get_global(cx).preferred_completion_mode,
-            running_turn: None,
-            pending_message: None,
-            tools: BTreeMap::default(),
-            tool_use_limit_reached: false,
-            request_token_usage: HashMap::default(),
-            cumulative_token_usage: TokenUsage::default(),
-            initial_project_snapshot: {
-                let project_snapshot = Self::project_snapshot(project.clone(), cx);
-                cx.foreground_executor()
-                    .spawn(async move { Some(project_snapshot.await) })
-                    .shared()
-            },
-            context_server_registry,
-            profile_id,
-            project_context,
-            templates,
-            model,
-            summarization_model: None,
-            prompt_capabilities_tx,
-            prompt_capabilities_rx,
-            project,
-            action_log,
-            file_read_times: HashMap::default(),
-        }
-    }
-
-    pub fn id(&self) -> &acp::SessionId {
-        &self.id
-    }
-
-    pub fn replay(
-        &mut self,
-        cx: &mut Context<Self>,
-    ) -> mpsc::UnboundedReceiver<Result<ThreadEvent>> {
-        let (tx, rx) = mpsc::unbounded();
-        let stream = ThreadEventStream(tx);
-        for message in &self.messages {
-            match message {
-                Message::User(user_message) => stream.send_user_message(user_message),
-                Message::Agent(assistant_message) => {
-                    for content in &assistant_message.content {
-                        match content {
-                            AgentMessageContent::Text(text) => stream.send_text(text),
-                            AgentMessageContent::Thinking { text, .. } => {
-                                stream.send_thinking(text)
-                            }
-                            AgentMessageContent::RedactedThinking(_) => {}
-                            AgentMessageContent::ToolUse(tool_use) => {
-                                self.replay_tool_call(
-                                    tool_use,
-                                    assistant_message.tool_results.get(&tool_use.id),
-                                    &stream,
-                                    cx,
-                                );
-                            }
-                        }
-                    }
-                }
-                Message::Resume => {}
-            }
-        }
-        rx
-    }
-
-    fn replay_tool_call(
-        &self,
-        tool_use: &LanguageModelToolUse,
-        tool_result: Option<&LanguageModelToolResult>,
-        stream: &ThreadEventStream,
-        cx: &mut Context<Self>,
-    ) {
-        let tool = self.tools.get(tool_use.name.as_ref()).cloned().or_else(|| {
-            self.context_server_registry
-                .read(cx)
-                .servers()
-                .find_map(|(_, tools)| {
-                    if let Some(tool) = tools.get(tool_use.name.as_ref()) {
-                        Some(tool.clone())
-                    } else {
-                        None
-                    }
-                })
-        });
-
-        let Some(tool) = tool else {
-            stream
-                .0
-                .unbounded_send(Ok(ThreadEvent::ToolCall(
-                    acp::ToolCall::new(tool_use.id.to_string(), tool_use.name.to_string())
-                        .status(acp::ToolCallStatus::Failed)
-                        .raw_input(tool_use.input.clone()),
-                )))
-                .ok();
-            return;
-        };
-
-        let title = tool.initial_title(tool_use.input.clone(), cx);
-        let kind = tool.kind();
-        stream.send_tool_call(
-            &tool_use.id,
-            &tool_use.name,
-            title,
-            kind,
-            tool_use.input.clone(),
-        );
-
-        let output = tool_result
-            .as_ref()
-            .and_then(|result| result.output.clone());
-        if let Some(output) = output.clone() {
-            let tool_event_stream = ToolCallEventStream::new(
-                tool_use.id.clone(),
-                stream.clone(),
-                Some(self.project.read(cx).fs().clone()),
-            );
-            tool.replay(tool_use.input.clone(), output, tool_event_stream, cx)
-                .log_err();
-        }
-
-        stream.update_tool_call_fields(
-            &tool_use.id,
-            acp::ToolCallUpdateFields::new()
-                .status(
-                    tool_result
-                        .as_ref()
-                        .map_or(acp::ToolCallStatus::Failed, |result| {
-                            if result.is_error {
-                                acp::ToolCallStatus::Failed
-                            } else {
-                                acp::ToolCallStatus::Completed
-                            }
-                        }),
-                )
-                .raw_output(output),
-        );
-    }
-
-    pub fn from_db(
-        id: acp::SessionId,
-        db_thread: DbThread,
-        project: Entity<Project>,
-        project_context: Entity<ProjectContext>,
-        context_server_registry: Entity<ContextServerRegistry>,
-        templates: Arc<Templates>,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let profile_id = db_thread
-            .profile
-            .unwrap_or_else(|| AgentSettings::get_global(cx).default_profile.clone());
-
-        let mut model = LanguageModelRegistry::global(cx).update(cx, |registry, cx| {
-            db_thread
-                .model
-                .and_then(|model| {
-                    let model = SelectedModel {
-                        provider: model.provider.clone().into(),
-                        model: model.model.into(),
-                    };
-                    registry.select_model(&model, cx)
-                })
-                .or_else(|| registry.default_model())
-                .map(|model| model.model)
-        });
-
-        if model.is_none() {
-            model = Self::resolve_profile_model(&profile_id, cx);
-        }
-        if model.is_none() {
-            model = LanguageModelRegistry::global(cx).update(cx, |registry, _cx| {
-                registry.default_model().map(|model| model.model)
-            });
-        }
-
-        let (prompt_capabilities_tx, prompt_capabilities_rx) =
-            watch::channel(Self::prompt_capabilities(model.as_deref()));
-
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-
-        Self {
-            id,
-            prompt_id: PromptId::new(),
-            title: if db_thread.title.is_empty() {
-                None
-            } else {
-                Some(db_thread.title.clone())
-            },
-            pending_title_generation: None,
-            pending_summary_generation: None,
-            summary: db_thread.detailed_summary,
-            messages: db_thread.messages,
-            user_store: project.read(cx).user_store(),
-            completion_mode: db_thread.completion_mode.unwrap_or_default(),
-            running_turn: None,
-            pending_message: None,
-            tools: BTreeMap::default(),
-            tool_use_limit_reached: false,
-            request_token_usage: db_thread.request_token_usage.clone(),
-            cumulative_token_usage: db_thread.cumulative_token_usage,
-            initial_project_snapshot: Task::ready(db_thread.initial_project_snapshot).shared(),
-            context_server_registry,
-            profile_id,
-            project_context,
-            templates,
-            model,
-            summarization_model: None,
-            project,
-            action_log,
-            updated_at: db_thread.updated_at,
-            prompt_capabilities_tx,
-            prompt_capabilities_rx,
-            file_read_times: HashMap::default(),
-        }
-    }
-
-    pub fn to_db(&self, cx: &App) -> Task<DbThread> {
-        let initial_project_snapshot = self.initial_project_snapshot.clone();
-        let mut thread = DbThread {
-            title: self.title(),
-            messages: self.messages.clone(),
-            updated_at: self.updated_at,
-            detailed_summary: self.summary.clone(),
-            initial_project_snapshot: None,
-            cumulative_token_usage: self.cumulative_token_usage,
-            request_token_usage: self.request_token_usage.clone(),
-            model: self.model.as_ref().map(|model| DbLanguageModel {
-                provider: model.provider_id().to_string(),
-                model: model.name().0.to_string(),
-            }),
-            completion_mode: Some(self.completion_mode),
-            profile: Some(self.profile_id.clone()),
-        };
-
-        cx.background_spawn(async move {
-            let initial_project_snapshot = initial_project_snapshot.await;
-            thread.initial_project_snapshot = initial_project_snapshot;
-            thread
-        })
-    }
-
-    /// Create a snapshot of the current project state including git information and unsaved buffers.
-    fn project_snapshot(
-        project: Entity<Project>,
-        cx: &mut Context<Self>,
-    ) -> Task<Arc<ProjectSnapshot>> {
-        let task = project::telemetry_snapshot::TelemetrySnapshot::new(&project, cx);
-        cx.spawn(async move |_, _| {
-            let snapshot = task.await;
-
-            Arc::new(ProjectSnapshot {
-                worktree_snapshots: snapshot.worktree_snapshots,
-                timestamp: Utc::now(),
-            })
-        })
-    }
-
-    pub fn project_context(&self) -> &Entity<ProjectContext> {
-        &self.project_context
-    }
-
-    pub fn project(&self) -> &Entity<Project> {
-        &self.project
-    }
-
-    pub fn action_log(&self) -> &Entity<ActionLog> {
-        &self.action_log
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.messages.is_empty() && self.title.is_none()
-    }
-
-    pub fn model(&self) -> Option<&Arc<dyn LanguageModel>> {
-        self.model.as_ref()
-    }
-
-    pub fn set_model(&mut self, model: Arc<dyn LanguageModel>, cx: &mut Context<Self>) {
-        let old_usage = self.latest_token_usage();
-        self.model = Some(model);
-        let new_caps = Self::prompt_capabilities(self.model.as_deref());
-        let new_usage = self.latest_token_usage();
-        if old_usage != new_usage {
-            cx.emit(TokenUsageUpdated(new_usage));
-        }
-        self.prompt_capabilities_tx.send(new_caps).log_err();
-        cx.notify()
-    }
-
-    pub fn summarization_model(&self) -> Option<&Arc<dyn LanguageModel>> {
-        self.summarization_model.as_ref()
-    }
-
-    pub fn set_summarization_model(
-        &mut self,
-        model: Option<Arc<dyn LanguageModel>>,
-        cx: &mut Context<Self>,
-    ) {
-        self.summarization_model = model;
-        cx.notify()
-    }
-
-    pub fn completion_mode(&self) -> CompletionMode {
-        self.completion_mode
-    }
-
-    pub fn set_completion_mode(&mut self, mode: CompletionMode, cx: &mut Context<Self>) {
-        let old_usage = self.latest_token_usage();
-        self.completion_mode = mode;
-        let new_usage = self.latest_token_usage();
-        if old_usage != new_usage {
-            cx.emit(TokenUsageUpdated(new_usage));
-        }
-        cx.notify()
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn last_message(&self) -> Option<Message> {
-        if let Some(message) = self.pending_message.clone() {
-            Some(Message::Agent(message))
-        } else {
-            self.messages.last().cloned()
-        }
-    }
-
-    pub fn add_default_tools(
-        &mut self,
-        environment: Rc<dyn ThreadEnvironment>,
-        cx: &mut Context<Self>,
-    ) {
-        let language_registry = self.project.read(cx).languages().clone();
-        self.add_tool(CopyPathTool::new(self.project.clone()));
-        self.add_tool(CreateDirectoryTool::new(self.project.clone()));
-        self.add_tool(DeletePathTool::new(
-            self.project.clone(),
-            self.action_log.clone(),
-        ));
-        self.add_tool(DiagnosticsTool::new(self.project.clone()));
-        self.add_tool(EditFileTool::new(
-            self.project.clone(),
-            cx.weak_entity(),
-            language_registry,
-            Templates::new(),
-        ));
-        self.add_tool(FetchTool::new(self.project.read(cx).client().http_client()));
-        self.add_tool(FindPathTool::new(self.project.clone()));
-        self.add_tool(GrepTool::new(self.project.clone()));
-        self.add_tool(ListDirectoryTool::new(self.project.clone()));
-        self.add_tool(MovePathTool::new(self.project.clone()));
-        self.add_tool(NowTool);
-        self.add_tool(OpenTool::new(self.project.clone()));
-        self.add_tool(ReadFileTool::new(
-            cx.weak_entity(),
-            self.project.clone(),
-            self.action_log.clone(),
-        ));
-        self.add_tool(TerminalTool::new(self.project.clone(), environment));
-        self.add_tool(ThinkingTool);
-        self.add_tool(WebSearchTool);
-    }
-
-    pub fn add_tool<T: AgentTool>(&mut self, tool: T) {
-        self.tools.insert(T::name().into(), tool.erase());
-    }
-
-    pub fn remove_tool(&mut self, name: &str) -> bool {
-        self.tools.remove(name).is_some()
-    }
-
-    pub fn profile(&self) -> &AgentProfileId {
-        &self.profile_id
-    }
-
-    pub fn set_profile(&mut self, profile_id: AgentProfileId, cx: &mut Context<Self>) {
-        if self.profile_id == profile_id {
-            return;
-        }
-
-        self.profile_id = profile_id;
-
-        // Swap to the profile's preferred model when available.
-        if let Some(model) = Self::resolve_profile_model(&self.profile_id, cx) {
-            self.set_model(model, cx);
-        }
-    }
-
-    pub fn cancel(&mut self, cx: &mut Context<Self>) {
-        if let Some(running_turn) = self.running_turn.take() {
-            running_turn.cancel();
-        }
-        self.flush_pending_message(cx);
-    }
-
-    fn update_token_usage(&mut self, update: language_model::TokenUsage, cx: &mut Context<Self>) {
-        let Some(last_user_message) = self.last_user_message() else {
-            return;
-        };
-
-        self.request_token_usage
-            .insert(last_user_message.id.clone(), update);
-        cx.emit(TokenUsageUpdated(self.latest_token_usage()));
-        cx.notify();
-    }
-
-    pub fn truncate(&mut self, message_id: UserMessageId, cx: &mut Context<Self>) -> Result<()> {
-        self.cancel(cx);
-        let Some(position) = self.messages.iter().position(
-            |msg| matches!(msg, Message::User(UserMessage { id, .. }) if id == &message_id),
-        ) else {
-            return Err(anyhow!("Message not found"));
-        };
-
-        for message in self.messages.drain(position..) {
-            match message {
-                Message::User(message) => {
-                    self.request_token_usage.remove(&message.id);
-                }
-                Message::Agent(_) | Message::Resume => {}
-            }
-        }
-        self.clear_summary();
-        cx.notify();
-        Ok(())
-    }
-
-    pub fn latest_request_token_usage(&self) -> Option<language_model::TokenUsage> {
-        let last_user_message = self.last_user_message()?;
-        let tokens = self.request_token_usage.get(&last_user_message.id)?;
-        Some(*tokens)
-    }
-
-    pub fn latest_token_usage(&self) -> Option<acp_thread::TokenUsage> {
-        let usage = self.latest_request_token_usage()?;
-        let model = self.model.clone()?;
-        Some(acp_thread::TokenUsage {
-            max_tokens: model.max_token_count_for_mode(self.completion_mode.into()),
-            used_tokens: usage.total_tokens(),
-        })
-    }
-
-    /// Look up the active profile and resolve its preferred model if one is configured.
-    fn resolve_profile_model(
-        profile_id: &AgentProfileId,
-        cx: &mut Context<Self>,
-    ) -> Option<Arc<dyn LanguageModel>> {
-        let selection = AgentSettings::get_global(cx)
-            .profiles
-            .get(profile_id)?
-            .default_model
-            .clone()?;
-        Self::resolve_model_from_selection(&selection, cx)
-    }
-
-    /// Translate a stored model selection into the configured model from the registry.
-    fn resolve_model_from_selection(
-        selection: &LanguageModelSelection,
-        cx: &mut Context<Self>,
-    ) -> Option<Arc<dyn LanguageModel>> {
-        let selected = SelectedModel {
-            provider: LanguageModelProviderId::from(selection.provider.0.clone()),
-            model: LanguageModelId::from(selection.model.clone()),
-        };
-        LanguageModelRegistry::global(cx).update(cx, |registry, cx| {
-            registry
-                .select_model(&selected, cx)
-                .map(|configured| configured.model)
-        })
-    }
-
-    pub fn resume(
-        &mut self,
-        cx: &mut Context<Self>,
-    ) -> Result<mpsc::UnboundedReceiver<Result<ThreadEvent>>> {
-        self.messages.push(Message::Resume);
-        cx.notify();
-
-        log::debug!("Total messages in thread: {}", self.messages.len());
-        self.run_turn(cx)
-    }
-
-    /// Sending a message results in the model streaming a response, which could include tool calls.
-    /// After calling tools, the model will stops and waits for any outstanding tool calls to be completed and their results sent.
-    /// The returned channel will report all the occurrences in which the model stops before erroring or ending its turn.
-    pub fn send<T>(
-        &mut self,
-        id: UserMessageId,
-        content: impl IntoIterator<Item = T>,
-        cx: &mut Context<Self>,
-    ) -> Result<mpsc::UnboundedReceiver<Result<ThreadEvent>>>
-    where
-        T: Into<UserMessageContent>,
-    {
-        let model = self.model().context("No language model configured")?;
-
-        log::info!("Thread::send called with model: {}", model.name().0);
-        self.advance_prompt_id();
-
-        let content = content.into_iter().map(Into::into).collect::<Vec<_>>();
-        log::debug!("Thread::send content: {:?}", content);
-
-        self.messages
-            .push(Message::User(UserMessage { id, content }));
-        cx.notify();
-
-        log::debug!("Total messages in thread: {}", self.messages.len());
-        self.run_turn(cx)
-    }
-
-    #[cfg(feature = "eval")]
-    pub fn proceed(
-        &mut self,
-        cx: &mut Context<Self>,
-    ) -> Result<mpsc::UnboundedReceiver<Result<ThreadEvent>>> {
-        self.run_turn(cx)
-    }
-
-    fn run_turn(
-        &mut self,
-        cx: &mut Context<Self>,
-    ) -> Result<mpsc::UnboundedReceiver<Result<ThreadEvent>>> {
-        self.cancel(cx);
-
-        let model = self.model.clone().context("No language model configured")?;
-        let profile = AgentSettings::get_global(cx)
-            .profiles
-            .get(&self.profile_id)
-            .context("Profile not found")?;
-        let (events_tx, events_rx) = mpsc::unbounded::<Result<ThreadEvent>>();
-        let event_stream = ThreadEventStream(events_tx);
-        let message_ix = self.messages.len().saturating_sub(1);
-        self.tool_use_limit_reached = false;
-        self.clear_summary();
-        self.running_turn = Some(RunningTurn {
-            event_stream: event_stream.clone(),
-            tools: self.enabled_tools(profile, &model, cx),
-            _task: cx.spawn(async move |this, cx| {
-                log::debug!("Starting agent turn execution");
-
-                let turn_result = Self::run_turn_internal(&this, model, &event_stream, cx).await;
-                _ = this.update(cx, |this, cx| this.flush_pending_message(cx));
-
-                match turn_result {
-                    Ok(()) => {
-                        log::debug!("Turn execution completed");
-                        event_stream.send_stop(acp::StopReason::EndTurn);
-                    }
-                    Err(error) => {
-                        log::error!("Turn execution failed: {:?}", error);
-                        match error.downcast::<CompletionError>() {
-                            Ok(CompletionError::Refusal) => {
-                                event_stream.send_stop(acp::StopReason::Refusal);
-                                _ = this.update(cx, |this, _| this.messages.truncate(message_ix));
-                            }
-                            Ok(CompletionError::MaxTokens) => {
-                                event_stream.send_stop(acp::StopReason::MaxTokens);
-                            }
-                            Ok(CompletionError::Other(error)) | Err(error) => {
-                                event_stream.send_error(error);
-                            }
-                        }
-                    }
-                }
-
-                _ = this.update(cx, |this, _| this.running_turn.take());
-            }),
-        });
-        Ok(events_rx)
-    }
-
-    async fn run_turn_internal(
-        this: &WeakEntity<Self>,
-        model: Arc<dyn LanguageModel>,
-        event_stream: &ThreadEventStream,
-        cx: &mut AsyncApp,
-    ) -> Result<()> {
-        let mut attempt = 0;
-        let mut intent = CompletionIntent::UserPrompt;
-        loop {
-            let request =
-                this.update(cx, |this, cx| this.build_completion_request(intent, cx))??;
-
-            telemetry::event!(
-                "Agent Thread Completion",
-                thread_id = this.read_with(cx, |this, _| this.id.to_string())?,
-                prompt_id = this.read_with(cx, |this, _| this.prompt_id.to_string())?,
-                model = model.telemetry_id(),
-                model_provider = model.provider_id().to_string(),
-                attempt
-            );
-
-            log::debug!("Calling model.stream_completion, attempt {}", attempt);
-
-            let (mut events, mut error) = match model.stream_completion(request, cx).await {
-                Ok(events) => (events, None),
-                Err(err) => (stream::empty().boxed(), Some(err)),
-            };
-            let mut tool_results = FuturesUnordered::new();
-            while let Some(event) = events.next().await {
-                log::trace!("Received completion event: {:?}", event);
-                match event {
-                    Ok(event) => {
-                        tool_results.extend(this.update(cx, |this, cx| {
-                            this.handle_completion_event(event, event_stream, cx)
-                        })??);
-                    }
-                    Err(err) => {
-                        error = Some(err);
-                        break;
-                    }
-                }
-            }
-
-            let end_turn = tool_results.is_empty();
-            while let Some(tool_result) = tool_results.next().await {
-                log::debug!("Tool finished {:?}", tool_result);
-
-                event_stream.update_tool_call_fields(
-                    &tool_result.tool_use_id,
-                    acp::ToolCallUpdateFields::new()
-                        .status(if tool_result.is_error {
-                            acp::ToolCallStatus::Failed
-                        } else {
-                            acp::ToolCallStatus::Completed
-                        })
-                        .raw_output(tool_result.output.clone()),
-                );
-                this.update(cx, |this, _cx| {
-                    this.pending_message()
-                        .tool_results
-                        .insert(tool_result.tool_use_id.clone(), tool_result);
-                })?;
-            }
-
-            this.update(cx, |this, cx| {
-                this.flush_pending_message(cx);
-                if this.title.is_none() && this.pending_title_generation.is_none() {
-                    this.generate_title(cx);
-                }
-            })?;
-
-            if let Some(error) = error {
-                attempt += 1;
-                let retry = this.update(cx, |this, cx| {
-                    let user_store = this.user_store.read(cx);
-                    this.handle_completion_error(error, attempt, user_store.plan())
-                })??;
-                let timer = cx.background_executor().timer(retry.duration);
-                event_stream.send_retry(retry);
-                timer.await;
-                this.update(cx, |this, _cx| {
-                    if let Some(Message::Agent(message)) = this.messages.last() {
-                        if message.tool_results.is_empty() {
-                            intent = CompletionIntent::UserPrompt;
-                            this.messages.push(Message::Resume);
-                        }
-                    }
-                })?;
-            } else if this.read_with(cx, |this, _| this.tool_use_limit_reached)? {
-                return Err(language_model::ToolUseLimitReachedError.into());
-            } else if end_turn {
-                return Ok(());
-            } else {
-                intent = CompletionIntent::ToolResults;
-                attempt = 0;
-            }
-        }
-    }
-
-    fn handle_completion_error(
-        &mut self,
-        error: LanguageModelCompletionError,
-        attempt: u8,
-        plan: Option<Plan>,
-    ) -> Result<acp_thread::RetryStatus> {
-        let Some(model) = self.model.as_ref() else {
-            return Err(anyhow!(error));
-        };
-
-        let auto_retry = if model.provider_id() == ZED_CLOUD_PROVIDER_ID {
-            match plan {
-                Some(Plan::V2(_)) => true,
-                Some(Plan::V1(_)) => self.completion_mode == CompletionMode::Burn,
-                None => false,
-            }
-        } else {
-            true
-        };
-
-        if !auto_retry {
-            return Err(anyhow!(error));
-        }
-
-        let Some(strategy) = Self::retry_strategy_for(&error) else {
-            return Err(anyhow!(error));
-        };
-
-        let max_attempts = match &strategy {
-            RetryStrategy::ExponentialBackoff { max_attempts, .. } => *max_attempts,
-            RetryStrategy::Fixed { max_attempts, .. } => *max_attempts,
-        };
-
-        if attempt > max_attempts {
-            return Err(anyhow!(error));
-        }
-
-        let delay = match &strategy {
-            RetryStrategy::ExponentialBackoff { initial_delay, .. } => {
-                let delay_secs = initial_delay.as_secs() * 2u64.pow((attempt - 1) as u32);
-                Duration::from_secs(delay_secs)
-            }
-            RetryStrategy::Fixed { delay, .. } => *delay,
-        };
-        log::debug!("Retry attempt {attempt} with delay {delay:?}");
-
-        Ok(acp_thread::RetryStatus {
-            last_error: error.to_string().into(),
-            attempt: attempt as usize,
-            max_attempts: max_attempts as usize,
-            started_at: Instant::now(),
-            duration: delay,
-        })
-    }
-
-    /// A helper method that's called on every streamed completion event.
-    /// Returns an optional tool result task, which the main agentic loop will
-    /// send back to the model when it resolves.
-    fn handle_completion_event(
-        &mut self,
-        event: LanguageModelCompletionEvent,
-        event_stream: &ThreadEventStream,
-        cx: &mut Context<Self>,
-    ) -> Result<Option<Task<LanguageModelToolResult>>> {
-        log::trace!("Handling streamed completion event: {:?}", event);
-        use LanguageModelCompletionEvent::*;
-
-        match event {
-            StartMessage { .. } => {
-                self.flush_pending_message(cx);
-                self.pending_message = Some(AgentMessage::default());
-            }
-            Text(new_text) => self.handle_text_event(new_text, event_stream, cx),
-            Thinking { text, signature } => {
-                self.handle_thinking_event(text, signature, event_stream, cx)
-            }
-            RedactedThinking { data } => self.handle_redacted_thinking_event(data, cx),
-            ReasoningDetails(details) => {
-                let last_message = self.pending_message();
-                // Store the last non-empty reasoning_details (overwrites earlier ones)
-                // This ensures we keep the encrypted reasoning with signatures, not the early text reasoning
-                if let serde_json::Value::Array(ref arr) = details {
-                    if !arr.is_empty() {
-                        last_message.reasoning_details = Some(details);
-                    }
-                } else {
-                    last_message.reasoning_details = Some(details);
-                }
-            }
-            ToolUse(tool_use) => {
-                return Ok(self.handle_tool_use_event(tool_use, event_stream, cx));
-            }
-            ToolUseJsonParseError {
-                id,
-                tool_name,
-                raw_input,
-                json_parse_error,
-            } => {
-                return Ok(Some(Task::ready(
-                    self.handle_tool_use_json_parse_error_event(
-                        id,
-                        tool_name,
-                        raw_input,
-                        json_parse_error,
-                    ),
-                )));
-            }
-            UsageUpdate(usage) => {
-                telemetry::event!(
-                    "Agent Thread Completion Usage Updated",
-                    thread_id = self.id.to_string(),
-                    prompt_id = self.prompt_id.to_string(),
-                    model = self.model.as_ref().map(|m| m.telemetry_id()),
-                    model_provider = self.model.as_ref().map(|m| m.provider_id().to_string()),
-                    input_tokens = usage.input_tokens,
-                    output_tokens = usage.output_tokens,
-                    cache_creation_input_tokens = usage.cache_creation_input_tokens,
-                    cache_read_input_tokens = usage.cache_read_input_tokens,
-                );
-                self.update_token_usage(usage, cx);
-            }
-            UsageUpdated { amount, limit } => {
-                self.update_model_request_usage(amount, limit, cx);
-            }
-            ToolUseLimitReached => {
-                self.tool_use_limit_reached = true;
-            }
-            Stop(StopReason::Refusal) => return Err(CompletionError::Refusal.into()),
-            Stop(StopReason::MaxTokens) => return Err(CompletionError::MaxTokens.into()),
-            Stop(StopReason::ToolUse | StopReason::EndTurn) => {}
-            Started | Queued { .. } => {}
-        }
-
-        Ok(None)
-    }
-
-    fn handle_text_event(
-        &mut self,
-        new_text: String,
-        event_stream: &ThreadEventStream,
-        cx: &mut Context<Self>,
-    ) {
-        event_stream.send_text(&new_text);
-
-        let last_message = self.pending_message();
-        if let Some(AgentMessageContent::Text(text)) = last_message.content.last_mut() {
-            text.push_str(&new_text);
-        } else {
-            last_message
-                .content
-                .push(AgentMessageContent::Text(new_text));
-        }
-
-        cx.notify();
-    }
-
-    fn handle_thinking_event(
-        &mut self,
-        new_text: String,
-        new_signature: Option<String>,
-        event_stream: &ThreadEventStream,
-        cx: &mut Context<Self>,
-    ) {
-        event_stream.send_thinking(&new_text);
-
-        let last_message = self.pending_message();
-        if let Some(AgentMessageContent::Thinking { text, signature }) =
-            last_message.content.last_mut()
-        {
-            text.push_str(&new_text);
-            *signature = new_signature.or(signature.take());
-        } else {
-            last_message.content.push(AgentMessageContent::Thinking {
-                text: new_text,
-                signature: new_signature,
-            });
-        }
-
-        cx.notify();
-    }
-
-    fn handle_redacted_thinking_event(&mut self, data: String, cx: &mut Context<Self>) {
-        let last_message = self.pending_message();
-        last_message
-            .content
-            .push(AgentMessageContent::RedactedThinking(data));
-        cx.notify();
-    }
-
-    fn handle_tool_use_event(
-        &mut self,
-        tool_use: LanguageModelToolUse,
-        event_stream: &ThreadEventStream,
-        cx: &mut Context<Self>,
-    ) -> Option<Task<LanguageModelToolResult>> {
-        cx.notify();
-
-        let tool = self.tool(tool_use.name.as_ref());
-        let mut title = SharedString::from(&tool_use.name);
-        let mut kind = acp::ToolKind::Other;
-        if let Some(tool) = tool.as_ref() {
-            title = tool.initial_title(tool_use.input.clone(), cx);
-            kind = tool.kind();
-        }
-
-        // Ensure the last message ends in the current tool use
-        let last_message = self.pending_message();
-        let push_new_tool_use = last_message.content.last_mut().is_none_or(|content| {
-            if let AgentMessageContent::ToolUse(last_tool_use) = content {
-                if last_tool_use.id == tool_use.id {
-                    *last_tool_use = tool_use.clone();
-                    false
-                } else {
-                    true
-                }
-            } else {
-                true
-            }
-        });
-
-        if push_new_tool_use {
-            event_stream.send_tool_call(
-                &tool_use.id,
-                &tool_use.name,
-                title,
-                kind,
-                tool_use.input.clone(),
-            );
-            last_message
-                .content
-                .push(AgentMessageContent::ToolUse(tool_use.clone()));
-        } else {
-            event_stream.update_tool_call_fields(
-                &tool_use.id,
-                acp::ToolCallUpdateFields::new()
-                    .title(title.as_str())
-                    .kind(kind)
-                    .raw_input(tool_use.input.clone()),
-            );
-        }
-
-        if !tool_use.is_input_complete {
-            return None;
-        }
-
-        let Some(tool) = tool else {
-            let content = format!("No tool named {} exists", tool_use.name);
-            return Some(Task::ready(LanguageModelToolResult {
-                content: LanguageModelToolResultContent::Text(Arc::from(content)),
-                tool_use_id: tool_use.id,
-                tool_name: tool_use.name,
-                is_error: true,
-                output: None,
-            }));
-        };
-
-        let fs = self.project.read(cx).fs().clone();
-        let tool_event_stream =
-            ToolCallEventStream::new(tool_use.id.clone(), event_stream.clone(), Some(fs));
-        tool_event_stream.update_fields(
-            acp::ToolCallUpdateFields::new().status(acp::ToolCallStatus::InProgress),
-        );
-        let supports_images = self.model().is_some_and(|model| model.supports_images());
-        let tool_result = tool.run(tool_use.input, tool_event_stream, cx);
-        log::debug!("Running tool {}", tool_use.name);
-        Some(cx.foreground_executor().spawn(async move {
-            let tool_result = tool_result.await.and_then(|output| {
-                if let LanguageModelToolResultContent::Image(_) = &output.llm_output
-                    && !supports_images
-                {
-                    return Err(anyhow!(
-                        "Attempted to read an image, but this model doesn't support it.",
-                    ));
-                }
-                Ok(output)
-            });
-
-            match tool_result {
-                Ok(output) => LanguageModelToolResult {
-                    tool_use_id: tool_use.id,
-                    tool_name: tool_use.name,
-                    is_error: false,
-                    content: output.llm_output,
-                    output: Some(output.raw_output),
-                },
-                Err(error) => LanguageModelToolResult {
-                    tool_use_id: tool_use.id,
-                    tool_name: tool_use.name,
-                    is_error: true,
-                    content: LanguageModelToolResultContent::Text(Arc::from(error.to_string())),
-                    output: Some(error.to_string().into()),
-                },
-            }
-        }))
-    }
-
-    fn handle_tool_use_json_parse_error_event(
-        &mut self,
-        tool_use_id: LanguageModelToolUseId,
-        tool_name: Arc<str>,
-        raw_input: Arc<str>,
-        json_parse_error: String,
-    ) -> LanguageModelToolResult {
-        let tool_output = format!("Error parsing input JSON: {json_parse_error}");
-        LanguageModelToolResult {
-            tool_use_id,
-            tool_name,
-            is_error: true,
-            content: LanguageModelToolResultContent::Text(tool_output.into()),
-            output: Some(serde_json::Value::String(raw_input.to_string())),
-        }
-    }
-
-    fn update_model_request_usage(&self, amount: usize, limit: UsageLimit, cx: &mut Context<Self>) {
-        self.project
-            .read(cx)
-            .user_store()
-            .update(cx, |user_store, cx| {
-                user_store.update_model_request_usage(
-                    ModelRequestUsage(RequestUsage {
-                        amount: amount as i32,
-                        limit,
-                    }),
-                    cx,
-                )
-            });
-    }
-
-    pub fn title(&self) -> SharedString {
-        self.title.clone().unwrap_or("New Thread".into())
-    }
-
-    pub fn is_generating_summary(&self) -> bool {
-        self.pending_summary_generation.is_some()
-    }
-
-    pub fn summary(&mut self, cx: &mut Context<Self>) -> Shared<Task<Option<SharedString>>> {
-        if let Some(summary) = self.summary.as_ref() {
-            return Task::ready(Some(summary.clone())).shared();
-        }
-        if let Some(task) = self.pending_summary_generation.clone() {
-            return task;
-        }
-        let Some(model) = self.summarization_model.clone() else {
-            log::error!("No summarization model available");
-            return Task::ready(None).shared();
-        };
-        let mut request = LanguageModelRequest {
-            intent: Some(CompletionIntent::ThreadContextSummarization),
-            temperature: AgentSettings::temperature_for_model(&model, cx),
-            ..Default::default()
-        };
-
-        for message in &self.messages {
-            request.messages.extend(message.to_request());
-        }
-
-        request.messages.push(LanguageModelRequestMessage {
-            role: Role::User,
-            content: vec![SUMMARIZE_THREAD_DETAILED_PROMPT.into()],
-            cache: false,
-            reasoning_details: None,
-        });
-
-        let task = cx
-            .spawn(async move |this, cx| {
-                let mut summary = String::new();
-                let mut messages = model.stream_completion(request, cx).await.log_err()?;
-                while let Some(event) = messages.next().await {
-                    let event = event.log_err()?;
-                    let text = match event {
-                        LanguageModelCompletionEvent::Text(text) => text,
-                        LanguageModelCompletionEvent::UsageUpdated { amount, limit } => {
-                            this.update(cx, |thread, cx| {
-                                thread.update_model_request_usage(amount, limit, cx);
-                            })
-                            .ok()?;
-                            continue;
-                        }
-                        _ => continue,
-                    };
-
-                    let mut lines = text.lines();
-                    summary.extend(lines.next());
-                }
-
-                log::debug!("Setting summary: {}", summary);
-                let summary = SharedString::from(summary);
-
-                this.update(cx, |this, cx| {
-                    this.summary = Some(summary.clone());
-                    this.pending_summary_generation = None;
-                    cx.notify()
-                })
-                .ok()?;
-
-                Some(summary)
-            })
-            .shared();
-        self.pending_summary_generation = Some(task.clone());
-        task
-    }
-
-    fn generate_title(&mut self, cx: &mut Context<Self>) {
-        let Some(model) = self.summarization_model.clone() else {
-            return;
-        };
-
-        log::debug!(
-            "Generating title with model: {:?}",
-            self.summarization_model.as_ref().map(|model| model.name())
-        );
-        let mut request = LanguageModelRequest {
-            intent: Some(CompletionIntent::ThreadSummarization),
-            temperature: AgentSettings::temperature_for_model(&model, cx),
-            ..Default::default()
-        };
-
-        for message in &self.messages {
-            request.messages.extend(message.to_request());
-        }
-
-        request.messages.push(LanguageModelRequestMessage {
-            role: Role::User,
-            content: vec![SUMMARIZE_THREAD_PROMPT.into()],
-            cache: false,
-            reasoning_details: None,
-        });
-        self.pending_title_generation = Some(cx.spawn(async move |this, cx| {
-            let mut title = String::new();
-
-            let generate = async {
-                let mut messages = model.stream_completion(request, cx).await?;
-                while let Some(event) = messages.next().await {
-                    let event = event?;
-                    let text = match event {
-                        LanguageModelCompletionEvent::Text(text) => text,
-                        LanguageModelCompletionEvent::UsageUpdated { amount, limit } => {
-                            this.update(cx, |thread, cx| {
-                                thread.update_model_request_usage(amount, limit, cx);
-                            })?;
-                            continue;
-                        }
-                        _ => continue,
-                    };
-
-                    let mut lines = text.lines();
-                    title.extend(lines.next());
-
-                    // Stop if the LLM generated multiple lines.
-                    if lines.next().is_some() {
-                        break;
-                    }
-                }
-                anyhow::Ok(())
-            };
-
-            if generate.await.context("failed to generate title").is_ok() {
-                _ = this.update(cx, |this, cx| this.set_title(title.into(), cx));
-            }
-            _ = this.update(cx, |this, _| this.pending_title_generation = None);
-        }));
-    }
-
-    pub fn set_title(&mut self, title: SharedString, cx: &mut Context<Self>) {
-        self.pending_title_generation = None;
-        if Some(&title) != self.title.as_ref() {
-            self.title = Some(title);
-            cx.emit(TitleUpdated);
-            cx.notify();
-        }
-    }
-
-    fn clear_summary(&mut self) {
-        self.summary = None;
-        self.pending_summary_generation = None;
-    }
-
-    fn last_user_message(&self) -> Option<&UserMessage> {
-        self.messages
-            .iter()
-            .rev()
-            .find_map(|message| match message {
-                Message::User(user_message) => Some(user_message),
-                Message::Agent(_) => None,
-                Message::Resume => None,
-            })
-    }
-
-    fn pending_message(&mut self) -> &mut AgentMessage {
-        self.pending_message.get_or_insert_default()
-    }
-
-    fn flush_pending_message(&mut self, cx: &mut Context<Self>) {
-        let Some(mut message) = self.pending_message.take() else {
-            return;
-        };
-
-        if message.content.is_empty() {
-            return;
-        }
-
-        for content in &message.content {
-            let AgentMessageContent::ToolUse(tool_use) = content else {
-                continue;
-            };
-
-            if !message.tool_results.contains_key(&tool_use.id) {
-                message.tool_results.insert(
-                    tool_use.id.clone(),
-                    LanguageModelToolResult {
-                        tool_use_id: tool_use.id.clone(),
-                        tool_name: tool_use.name.clone(),
-                        is_error: true,
-                        content: LanguageModelToolResultContent::Text(TOOL_CANCELED_MESSAGE.into()),
-                        output: None,
-                    },
-                );
-            }
-        }
-
-        self.messages.push(Message::Agent(message));
-        self.updated_at = Utc::now();
-        self.clear_summary();
-        cx.notify()
-    }
-
-    pub(crate) fn build_completion_request(
-        &self,
-        completion_intent: CompletionIntent,
-        cx: &App,
-    ) -> Result<LanguageModelRequest> {
-        let model = self.model().context("No language model configured")?;
-        let tools = if let Some(turn) = self.running_turn.as_ref() {
-            turn.tools
-                .iter()
-                .filter_map(|(tool_name, tool)| {
-                    log::trace!("Including tool: {}", tool_name);
-                    Some(LanguageModelRequestTool {
-                        name: tool_name.to_string(),
-                        description: tool.description().to_string(),
-                        input_schema: tool.input_schema(model.tool_input_format()).log_err()?,
-                    })
-                })
-                .collect::<Vec<_>>()
-        } else {
-            Vec::new()
-        };
-
-        log::debug!("Building completion request");
-        log::debug!("Completion intent: {:?}", completion_intent);
-        log::debug!("Completion mode: {:?}", self.completion_mode);
-
-        let available_tools: Vec<_> = self
-            .running_turn
-            .as_ref()
-            .map(|turn| turn.tools.keys().cloned().collect())
-            .unwrap_or_default();
-
-        log::debug!("Request includes {} tools", available_tools.len());
-        let messages = self.build_request_messages(available_tools, cx);
-        log::debug!("Request will include {} messages", messages.len());
-
-        let request = LanguageModelRequest {
-            thread_id: Some(self.id.to_string()),
-            prompt_id: Some(self.prompt_id.to_string()),
-            intent: Some(completion_intent),
-            mode: Some(self.completion_mode.into()),
-            messages,
-            tools,
-            tool_choice: None,
-            stop: Vec::new(),
-            temperature: AgentSettings::temperature_for_model(model, cx),
-            thinking_allowed: true,
-        };
-
-        log::debug!("Completion request built successfully");
-        Ok(request)
-    }
-
-    fn enabled_tools(
-        &self,
-        profile: &AgentProfileSettings,
-        model: &Arc<dyn LanguageModel>,
-        cx: &App,
-    ) -> BTreeMap<SharedString, Arc<dyn AnyAgentTool>> {
-        fn truncate(tool_name: &SharedString) -> SharedString {
-            if tool_name.len() > MAX_TOOL_NAME_LENGTH {
-                let mut truncated = tool_name.to_string();
-                truncated.truncate(MAX_TOOL_NAME_LENGTH);
-                truncated.into()
-            } else {
-                tool_name.clone()
-            }
-        }
-
-        let mut tools = self
-            .tools
-            .iter()
-            .filter_map(|(tool_name, tool)| {
-                if tool.supports_provider(&model.provider_id())
-                    && profile.is_tool_enabled(tool_name)
-                {
-                    Some((truncate(tool_name), tool.clone()))
-                } else {
-                    None
-                }
-            })
-            .collect::<BTreeMap<_, _>>();
-
-        let mut context_server_tools = Vec::new();
-        let mut seen_tools = tools.keys().cloned().collect::<HashSet<_>>();
-        let mut duplicate_tool_names = HashSet::default();
-        for (server_id, server_tools) in self.context_server_registry.read(cx).servers() {
-            for (tool_name, tool) in server_tools {
-                if profile.is_context_server_tool_enabled(&server_id.0, &tool_name) {
-                    let tool_name = truncate(tool_name);
-                    if !seen_tools.insert(tool_name.clone()) {
-                        duplicate_tool_names.insert(tool_name.clone());
-                    }
-                    context_server_tools.push((server_id.clone(), tool_name, tool.clone()));
-                }
-            }
-        }
-
-        // When there are duplicate tool names, disambiguate by prefixing them
-        // with the server ID. In the rare case there isn't enough space for the
-        // disambiguated tool name, keep only the last tool with this name.
-        for (server_id, tool_name, tool) in context_server_tools {
-            if duplicate_tool_names.contains(&tool_name) {
-                let available = MAX_TOOL_NAME_LENGTH.saturating_sub(tool_name.len());
-                if available >= 2 {
-                    let mut disambiguated = server_id.0.to_string();
-                    disambiguated.truncate(available - 1);
-                    disambiguated.push('_');
-                    disambiguated.push_str(&tool_name);
-                    tools.insert(disambiguated.into(), tool.clone());
-                } else {
-                    tools.insert(tool_name, tool.clone());
-                }
-            } else {
-                tools.insert(tool_name, tool.clone());
-            }
-        }
-
-        tools
-    }
-
-    fn tool(&self, name: &str) -> Option<Arc<dyn AnyAgentTool>> {
-        self.running_turn.as_ref()?.tools.get(name).cloned()
-    }
-
-    fn build_request_messages(
-        &self,
-        available_tools: Vec<SharedString>,
-        cx: &App,
-    ) -> Vec<LanguageModelRequestMessage> {
-        log::trace!(
-            "Building request messages from {} thread messages",
-            self.messages.len()
-        );
-
-        let system_prompt = SystemPromptTemplate {
-            project: self.project_context.read(cx),
-            available_tools,
-            model_name: self.model.as_ref().map(|m| m.name().0.to_string()),
-        }
-        .render(&self.templates)
-        .context("failed to build system prompt")
-        .expect("Invalid template");
-        let mut messages = vec![LanguageModelRequestMessage {
-            role: Role::System,
-            content: vec![system_prompt.into()],
-            cache: false,
-            reasoning_details: None,
-        }];
-        for message in &self.messages {
-            messages.extend(message.to_request());
-        }
-
-        if let Some(last_message) = messages.last_mut() {
-            last_message.cache = true;
-        }
-
-        if let Some(message) = self.pending_message.as_ref() {
-            messages.extend(message.to_request());
-        }
-
-        messages
-    }
-
-    pub fn to_markdown(&self) -> String {
-        let mut markdown = String::new();
-        for (ix, message) in self.messages.iter().enumerate() {
-            if ix > 0 {
-                markdown.push('\n');
-            }
-            markdown.push_str(&message.to_markdown());
-        }
-
-        if let Some(message) = self.pending_message.as_ref() {
-            markdown.push('\n');
-            markdown.push_str(&message.to_markdown());
-        }
-
-        markdown
-    }
-
-    fn advance_prompt_id(&mut self) {
-        self.prompt_id = PromptId::new();
-    }
-
-    fn retry_strategy_for(error: &LanguageModelCompletionError) -> Option<RetryStrategy> {
-        use LanguageModelCompletionError::*;
-        use http_client::StatusCode;
-
-        // General strategy here:
-        // - If retrying won't help (e.g. invalid API key or payload too large), return None so we don't retry at all.
-        // - If it's a time-based issue (e.g. server overloaded, rate limit exceeded), retry up to 4 times with exponential backoff.
-        // - If it's an issue that *might* be fixed by retrying (e.g. internal server error), retry up to 3 times.
-        match error {
-            HttpResponseError {
-                status_code: StatusCode::TOO_MANY_REQUESTS,
-                ..
-            } => Some(RetryStrategy::ExponentialBackoff {
-                initial_delay: BASE_RETRY_DELAY,
-                max_attempts: MAX_RETRY_ATTEMPTS,
-            }),
-            ServerOverloaded { retry_after, .. } | RateLimitExceeded { retry_after, .. } => {
-                Some(RetryStrategy::Fixed {
-                    delay: retry_after.unwrap_or(BASE_RETRY_DELAY),
-                    max_attempts: MAX_RETRY_ATTEMPTS,
-                })
-            }
-            UpstreamProviderError {
-                status,
-                retry_after,
-                ..
-            } => match *status {
-                StatusCode::TOO_MANY_REQUESTS | StatusCode::SERVICE_UNAVAILABLE => {
-                    Some(RetryStrategy::Fixed {
-                        delay: retry_after.unwrap_or(BASE_RETRY_DELAY),
-                        max_attempts: MAX_RETRY_ATTEMPTS,
-                    })
-                }
-                StatusCode::INTERNAL_SERVER_ERROR => Some(RetryStrategy::Fixed {
-                    delay: retry_after.unwrap_or(BASE_RETRY_DELAY),
-                    // Internal Server Error could be anything, retry up to 3 times.
-                    max_attempts: 3,
-                }),
-                status => {
-                    // There is no StatusCode variant for the unofficial HTTP 529 ("The service is overloaded"),
-                    // but we frequently get them in practice. See https://http.dev/529
-                    if status.as_u16() == 529 {
-                        Some(RetryStrategy::Fixed {
-                            delay: retry_after.unwrap_or(BASE_RETRY_DELAY),
-                            max_attempts: MAX_RETRY_ATTEMPTS,
-                        })
-                    } else {
-                        Some(RetryStrategy::Fixed {
-                            delay: retry_after.unwrap_or(BASE_RETRY_DELAY),
-                            max_attempts: 2,
-                        })
-                    }
-                }
-            },
-            ApiInternalServerError { .. } => Some(RetryStrategy::Fixed {
-                delay: BASE_RETRY_DELAY,
-                max_attempts: 3,
-            }),
-            ApiReadResponseError { .. }
-            | HttpSend { .. }
-            | DeserializeResponse { .. }
-            | BadRequestFormat { .. } => Some(RetryStrategy::Fixed {
-                delay: BASE_RETRY_DELAY,
-                max_attempts: 3,
-            }),
-            // Retrying these errors definitely shouldn't help.
-            HttpResponseError {
-                status_code:
-                    StatusCode::PAYLOAD_TOO_LARGE | StatusCode::FORBIDDEN | StatusCode::UNAUTHORIZED,
-                ..
-            }
-            | AuthenticationError { .. }
-            | PermissionError { .. }
-            | NoApiKey { .. }
-            | ApiEndpointNotFound { .. }
-            | PromptTooLarge { .. } => None,
-            // These errors might be transient, so retry them
-            SerializeRequest { .. } | BuildRequestBody { .. } => Some(RetryStrategy::Fixed {
-                delay: BASE_RETRY_DELAY,
-                max_attempts: 1,
-            }),
-            // Retry all other 4xx and 5xx errors once.
-            HttpResponseError { status_code, .. }
-                if status_code.is_client_error() || status_code.is_server_error() =>
-            {
-                Some(RetryStrategy::Fixed {
-                    delay: BASE_RETRY_DELAY,
-                    max_attempts: 3,
-                })
-            }
-            Other(err)
-                if err.is::<language_model::PaymentRequiredError>()
-                    || err.is::<language_model::ModelRequestLimitReachedError>() =>
-            {
-                // Retrying won't help for Payment Required or Model Request Limit errors (where
-                // the user must upgrade to usage-based billing to get more requests, or else wait
-                // for a significant amount of time for the request limit to reset).
-                None
-            }
-            // Conservatively assume that any other errors are non-retryable
-            HttpResponseError { .. } | Other(..) => Some(RetryStrategy::Fixed {
-                delay: BASE_RETRY_DELAY,
-                max_attempts: 2,
-            }),
-        }
-    }
-}
-
-struct RunningTurn {
-    /// Holds the task that handles agent interaction until the end of the turn.
-    /// Survives across multiple requests as the model performs tool calls and
-    /// we run tools, report their results.
-    _task: Task<()>,
-    /// The current event stream for the running turn. Used to report a final
-    /// cancellation event if we cancel the turn.
-    event_stream: ThreadEventStream,
-    /// The tools that were enabled for this turn.
-    tools: BTreeMap<SharedString, Arc<dyn AnyAgentTool>>,
-}
-
-impl RunningTurn {
-    fn cancel(self) {
-        log::debug!("Cancelling in progress turn");
-        self.event_stream.send_canceled();
-    }
-}
-
-pub struct TokenUsageUpdated(pub Option<acp_thread::TokenUsage>);
-
-impl EventEmitter<TokenUsageUpdated> for Thread {}
-
-pub struct TitleUpdated;
-
-impl EventEmitter<TitleUpdated> for Thread {}
-
-pub trait AgentTool
-where
-    Self: 'static + Sized,
-{
-    type Input: for<'de> Deserialize<'de> + Serialize + JsonSchema;
-    type Output: for<'de> Deserialize<'de> + Serialize + Into<LanguageModelToolResultContent>;
-
-    fn name() -> &'static str;
-
-    fn description() -> SharedString {
-        let schema = schemars::schema_for!(Self::Input);
-        SharedString::new(
-            schema
-                .get("description")
-                .and_then(|description| description.as_str())
-                .unwrap_or_default(),
-        )
-    }
-
-    fn kind() -> acp::ToolKind;
-
-    /// The initial tool title to display. Can be updated during the tool run.
-    fn initial_title(
-        &self,
-        input: Result<Self::Input, serde_json::Value>,
-        cx: &mut App,
-    ) -> SharedString;
-
-    /// Returns the JSON schema that describes the tool's input.
-    fn input_schema(format: LanguageModelToolSchemaFormat) -> Schema {
-        language_model::tool_schema::root_schema_for::<Self::Input>(format)
-    }
-
-    /// Some tools rely on a provider for the underlying billing or other reasons.
-    /// Allow the tool to check if they are compatible, or should be filtered out.
-    fn supports_provider(_provider: &LanguageModelProviderId) -> bool {
-        true
-    }
-
-    /// Runs the tool with the provided input.
-    fn run(
-        self: Arc<Self>,
-        input: Self::Input,
-        event_stream: ToolCallEventStream,
-        cx: &mut App,
-    ) -> Task<Result<Self::Output>>;
-
-    /// Emits events for a previous execution of the tool.
-    fn replay(
-        &self,
-        _input: Self::Input,
-        _output: Self::Output,
-        _event_stream: ToolCallEventStream,
-        _cx: &mut App,
-    ) -> Result<()> {
-        Ok(())
-    }
-
-    fn erase(self) -> Arc<dyn AnyAgentTool> {
-        Arc::new(Erased(Arc::new(self)))
-    }
-}
-
-pub struct Erased<T>(T);
-
-pub struct AgentToolOutput {
-    pub llm_output: LanguageModelToolResultContent,
-    pub raw_output: serde_json::Value,
-}
-
-pub trait AnyAgentTool {
-    fn name(&self) -> SharedString;
-    fn description(&self) -> SharedString;
-    fn kind(&self) -> acp::ToolKind;
-    fn initial_title(&self, input: serde_json::Value, _cx: &mut App) -> SharedString;
-    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value>;
-    fn supports_provider(&self, _provider: &LanguageModelProviderId) -> bool {
-        true
-    }
-    fn run(
-        self: Arc<Self>,
-        input: serde_json::Value,
-        event_stream: ToolCallEventStream,
-        cx: &mut App,
-    ) -> Task<Result<AgentToolOutput>>;
-    fn replay(
-        &self,
-        input: serde_json::Value,
-        output: serde_json::Value,
-        event_stream: ToolCallEventStream,
-        cx: &mut App,
-    ) -> Result<()>;
-}
-
-impl<T> AnyAgentTool for Erased<Arc<T>>
-where
-    T: AgentTool,
-{
-    fn name(&self) -> SharedString {
-        T::name().into()
-    }
-
-    fn description(&self) -> SharedString {
-        T::description()
-    }
-
-    fn kind(&self) -> agent_client_protocol::ToolKind {
-        T::kind()
-    }
-
-    fn initial_title(&self, input: serde_json::Value, _cx: &mut App) -> SharedString {
-        let parsed_input = serde_json::from_value(input.clone()).map_err(|_| input);
-        self.0.initial_title(parsed_input, _cx)
-    }
-
-    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
-        let mut json = serde_json::to_value(T::input_schema(format))?;
-        language_model::tool_schema::adapt_schema_to_format(&mut json, format)?;
-        Ok(json)
-    }
-
-    fn supports_provider(&self, provider: &LanguageModelProviderId) -> bool {
-        T::supports_provider(provider)
-    }
-
-    fn run(
-        self: Arc<Self>,
-        input: serde_json::Value,
-        event_stream: ToolCallEventStream,
-        cx: &mut App,
-    ) -> Task<Result<AgentToolOutput>> {
-        cx.spawn(async move |cx| {
-            let input = serde_json::from_value(input)?;
-            let output = cx
-                .update(|cx| self.0.clone().run(input, event_stream, cx))?
-                .await?;
-            let raw_output = serde_json::to_value(&output)?;
-            Ok(AgentToolOutput {
-                llm_output: output.into(),
-                raw_output,
-            })
-        })
-    }
-
-    fn replay(
-        &self,
-        input: serde_json::Value,
-        output: serde_json::Value,
-        event_stream: ToolCallEventStream,
-        cx: &mut App,
-    ) -> Result<()> {
-        let input = serde_json::from_value(input)?;
-        let output = serde_json::from_value(output)?;
-        self.0.replay(input, output, event_stream, cx)
-    }
-}
-
-#[derive(Clone)]
-struct ThreadEventStream(mpsc::UnboundedSender<Result<ThreadEvent>>);
-
-impl ThreadEventStream {
-    fn send_user_message(&self, message: &UserMessage) {
-        self.0
-            .unbounded_send(Ok(ThreadEvent::UserMessage(message.clone())))
-            .ok();
-    }
-
-    fn send_text(&self, text: &str) {
-        self.0
-            .unbounded_send(Ok(ThreadEvent::AgentText(text.to_string())))
-            .ok();
-    }
-
-    fn send_thinking(&self, text: &str) {
-        self.0
-            .unbounded_send(Ok(ThreadEvent::AgentThinking(text.to_string())))
-            .ok();
-    }
-
-    fn send_tool_call(
-        &self,
-        id: &LanguageModelToolUseId,
-        tool_name: &str,
-        title: SharedString,
-        kind: acp::ToolKind,
-        input: serde_json::Value,
-    ) {
-        self.0
-            .unbounded_send(Ok(ThreadEvent::ToolCall(Self::initial_tool_call(
-                id,
-                tool_name,
-                title.to_string(),
-                kind,
-                input,
-            ))))
-            .ok();
-    }
-
-    fn initial_tool_call(
-        id: &LanguageModelToolUseId,
-        tool_name: &str,
-        title: String,
-        kind: acp::ToolKind,
-        input: serde_json::Value,
-    ) -> acp::ToolCall {
-        acp::ToolCall::new(id.to_string(), title)
-            .kind(kind)
-            .raw_input(input)
-            .meta(acp::Meta::from_iter([(
-                "tool_name".into(),
-                tool_name.into(),
-            )]))
-    }
-
-    fn update_tool_call_fields(
-        &self,
-        tool_use_id: &LanguageModelToolUseId,
-        fields: acp::ToolCallUpdateFields,
-    ) {
-        self.0
-            .unbounded_send(Ok(ThreadEvent::ToolCallUpdate(
-                acp::ToolCallUpdate::new(tool_use_id.to_string(), fields).into(),
-            )))
-            .ok();
-    }
-
-    fn send_retry(&self, status: acp_thread::RetryStatus) {
-        self.0.unbounded_send(Ok(ThreadEvent::Retry(status))).ok();
-    }
-
-    fn send_stop(&self, reason: acp::StopReason) {
-        self.0.unbounded_send(Ok(ThreadEvent::Stop(reason))).ok();
-    }
-
-    fn send_canceled(&self) {
-        self.0
-            .unbounded_send(Ok(ThreadEvent::Stop(acp::StopReason::Cancelled)))
-            .ok();
-    }
-
-    fn send_error(&self, error: impl Into<anyhow::Error>) {
-        self.0.unbounded_send(Err(error.into())).ok();
-    }
-}
-
-#[derive(Clone)]
-pub struct ToolCallEventStream {
-    tool_use_id: LanguageModelToolUseId,
-    stream: ThreadEventStream,
-    fs: Option<Arc<dyn Fs>>,
-}
-
-impl ToolCallEventStream {
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn test() -> (Self, ToolCallEventStreamReceiver) {
-        let (events_tx, events_rx) = mpsc::unbounded::<Result<ThreadEvent>>();
-
-        let stream = ToolCallEventStream::new("test_id".into(), ThreadEventStream(events_tx), None);
-
-        (stream, ToolCallEventStreamReceiver(events_rx))
-    }
-
-    fn new(
-        tool_use_id: LanguageModelToolUseId,
-        stream: ThreadEventStream,
-        fs: Option<Arc<dyn Fs>>,
-    ) -> Self {
-        Self {
-            tool_use_id,
-            stream,
-            fs,
-        }
-    }
-
-    pub fn update_fields(&self, fields: acp::ToolCallUpdateFields) {
-        self.stream
-            .update_tool_call_fields(&self.tool_use_id, fields);
-    }
-
-    pub fn update_diff(&self, diff: Entity<acp_thread::Diff>) {
-        self.stream
-            .0
-            .unbounded_send(Ok(ThreadEvent::ToolCallUpdate(
-                acp_thread::ToolCallUpdateDiff {
-                    id: acp::ToolCallId::new(self.tool_use_id.to_string()),
-                    diff,
-                }
-                .into(),
-            )))
-            .ok();
-    }
-
-    pub fn authorize(&self, title: impl Into<String>, cx: &mut App) -> Task<Result<()>> {
-        if agent_settings::AgentSettings::get_global(cx).always_allow_tool_actions {
-            return Task::ready(Ok(()));
-        }
-
-        let (response_tx, response_rx) = oneshot::channel();
-        self.stream
-            .0
-            .unbounded_send(Ok(ThreadEvent::ToolCallAuthorization(
-                ToolCallAuthorization {
-                    tool_call: acp::ToolCallUpdate::new(
-                        self.tool_use_id.to_string(),
-                        acp::ToolCallUpdateFields::new().title(title.into()),
-                    ),
-                    options: vec![
-                        acp::PermissionOption::new(
-                            acp::PermissionOptionId::new("always_allow"),
-                            "Always Allow",
-                            acp::PermissionOptionKind::AllowAlways,
-                        ),
-                        acp::PermissionOption::new(
-                            acp::PermissionOptionId::new("allow"),
-                            "Allow",
-                            acp::PermissionOptionKind::AllowOnce,
-                        ),
-                        acp::PermissionOption::new(
-                            acp::PermissionOptionId::new("deny"),
-                            "Deny",
-                            acp::PermissionOptionKind::RejectOnce,
-                        ),
-                    ],
-                    response: response_tx,
-                },
-            )))
-            .ok();
-        let fs = self.fs.clone();
-        cx.spawn(async move |cx| match response_rx.await?.0.as_ref() {
-            "always_allow" => {
-                if let Some(fs) = fs.clone() {
-                    cx.update(|cx| {
-                        update_settings_file(fs, cx, |settings, _| {
-                            settings
-                                .agent
-                                .get_or_insert_default()
-                                .set_always_allow_tool_actions(true);
-                        });
-                    })?;
-                }
-
-                Ok(())
-            }
-            "allow" => Ok(()),
-            _ => Err(anyhow!("Permission to run tool denied by user")),
-        })
-    }
-}
-
-#[cfg(any(test, feature = "test-support"))]
-pub struct ToolCallEventStreamReceiver(mpsc::UnboundedReceiver<Result<ThreadEvent>>);
-
-#[cfg(any(test, feature = "test-support"))]
-impl ToolCallEventStreamReceiver {
-    pub async fn expect_authorization(&mut self) -> ToolCallAuthorization {
-        let event = self.0.next().await;
-        if let Some(Ok(ThreadEvent::ToolCallAuthorization(auth))) = event {
-            auth
-        } else {
-            panic!("Expected ToolCallAuthorization but got: {:?}", event);
-        }
-    }
-
-    pub async fn expect_update_fields(&mut self) -> acp::ToolCallUpdateFields {
-        let event = self.0.next().await;
-        if let Some(Ok(ThreadEvent::ToolCallUpdate(acp_thread::ToolCallUpdate::UpdateFields(
-            update,
-        )))) = event
-        {
-            update.fields
-        } else {
-            panic!("Expected update fields but got: {:?}", event);
-        }
-    }
-
-    pub async fn expect_diff(&mut self) -> Entity<acp_thread::Diff> {
-        let event = self.0.next().await;
-        if let Some(Ok(ThreadEvent::ToolCallUpdate(acp_thread::ToolCallUpdate::UpdateDiff(
-            update,
-        )))) = event
-        {
-            update.diff
-        } else {
-            panic!("Expected diff but got: {:?}", event);
-        }
-    }
-
-    pub async fn expect_terminal(&mut self) -> Entity<acp_thread::Terminal> {
-        let event = self.0.next().await;
-        if let Some(Ok(ThreadEvent::ToolCallUpdate(acp_thread::ToolCallUpdate::UpdateTerminal(
-            update,
-        )))) = event
-        {
-            update.terminal
-        } else {
-            panic!("Expected terminal but got: {:?}", event);
-        }
-    }
-}
-
-#[cfg(any(test, feature = "test-support"))]
-impl std::ops::Deref for ToolCallEventStreamReceiver {
-    type Target = mpsc::UnboundedReceiver<Result<ThreadEvent>>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-#[cfg(any(test, feature = "test-support"))]
-impl std::ops::DerefMut for ToolCallEventStreamReceiver {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.0
-    }
-}
-
-impl From<&str> for UserMessageContent {
-    fn from(text: &str) -> Self {
-        Self::Text(text.into())
-    }
-}
-
-impl UserMessageContent {
-    pub fn from_content_block(value: acp::ContentBlock, path_style: PathStyle) -> Self {
-        match value {
-            acp::ContentBlock::Text(text_content) => Self::Text(text_content.text),
-            acp::ContentBlock::Image(image_content) => Self::Image(convert_image(image_content)),
-            acp::ContentBlock::Audio(_) => {
-                // TODO
-                Self::Text("[audio]".to_string())
-            }
-            acp::ContentBlock::ResourceLink(resource_link) => {
-                match MentionUri::parse(&resource_link.uri, path_style) {
-                    Ok(uri) => Self::Mention {
-                        uri,
-                        content: String::new(),
-                    },
-                    Err(err) => {
-                        log::error!("Failed to parse mention link: {}", err);
-                        Self::Text(format!("[{}]({})", resource_link.name, resource_link.uri))
-                    }
-                }
-            }
-            acp::ContentBlock::Resource(resource) => match resource.resource {
-                acp::EmbeddedResourceResource::TextResourceContents(resource) => {
-                    match MentionUri::parse(&resource.uri, path_style) {
-                        Ok(uri) => Self::Mention {
-                            uri,
-                            content: resource.text,
-                        },
-                        Err(err) => {
-                            log::error!("Failed to parse mention link: {}", err);
-                            Self::Text(
-                                MarkdownCodeBlock {
-                                    tag: &resource.uri,
-                                    text: &resource.text,
-                                }
-                                .to_string(),
-                            )
-                        }
-                    }
-                }
-                acp::EmbeddedResourceResource::BlobResourceContents(_) => {
-                    // TODO
-                    Self::Text("[blob]".to_string())
-                }
-                other => {
-                    log::warn!("Unexpected content type: {:?}", other);
-                    Self::Text("[unknown]".to_string())
-                }
-            },
-            other => {
-                log::warn!("Unexpected content type: {:?}", other);
-                Self::Text("[unknown]".to_string())
-            }
-        }
-    }
-}
-
-impl From<UserMessageContent> for acp::ContentBlock {
-    fn from(content: UserMessageContent) -> Self {
-        match content {
-            UserMessageContent::Text(text) => text.into(),
-            UserMessageContent::Image(image) => {
-                acp::ContentBlock::Image(acp::ImageContent::new(image.source, "image/png"))
-            }
-            UserMessageContent::Mention { uri, content } => acp::ContentBlock::Resource(
-                acp::EmbeddedResource::new(acp::EmbeddedResourceResource::TextResourceContents(
-                    acp::TextResourceContents::new(content, uri.to_uri().to_string()),
-                )),
-            ),
-        }
-    }
-}
-
-fn convert_image(image_content: acp::ImageContent) -> LanguageModelImage {
-    LanguageModelImage {
-        source: image_content.data.into(),
-        // TODO: make this optional?
-        size: gpui::Size::new(0.into(), 0.into()),
-    }
-}
diff --git a/crates/agent/src/tools.rs b/crates/agent/src/tools.rs
deleted file mode 100644
index 62a52998a7..0000000000
--- a/crates/agent/src/tools.rs
+++ /dev/null
@@ -1,98 +0,0 @@
-mod context_server_registry;
-mod copy_path_tool;
-mod create_directory_tool;
-mod delete_path_tool;
-mod diagnostics_tool;
-mod edit_file_tool;
-
-mod fetch_tool;
-mod find_path_tool;
-mod grep_tool;
-mod list_directory_tool;
-mod move_path_tool;
-mod now_tool;
-mod open_tool;
-mod read_file_tool;
-
-mod terminal_tool;
-mod thinking_tool;
-mod web_search_tool;
-
-use crate::AgentTool;
-use language_model::{LanguageModelRequestTool, LanguageModelToolSchemaFormat};
-
-pub use context_server_registry::*;
-pub use copy_path_tool::*;
-pub use create_directory_tool::*;
-pub use delete_path_tool::*;
-pub use diagnostics_tool::*;
-pub use edit_file_tool::*;
-
-pub use fetch_tool::*;
-pub use find_path_tool::*;
-pub use grep_tool::*;
-pub use list_directory_tool::*;
-pub use move_path_tool::*;
-pub use now_tool::*;
-pub use open_tool::*;
-pub use read_file_tool::*;
-
-pub use terminal_tool::*;
-pub use thinking_tool::*;
-pub use web_search_tool::*;
-
-macro_rules! tools {
-    ($($tool:ty),* $(,)?) => {
-        /// A list of all built-in tool names
-        pub fn supported_built_in_tool_names(provider: Option<language_model::LanguageModelProviderId>) -> impl Iterator<Item = String> {
-            [
-                $(
-                    (if let Some(provider) = provider.as_ref() {
-                        <$tool>::supports_provider(provider)
-                    } else {
-                        true
-                    })
-                    .then(|| <$tool>::name().to_string()),
-                )*
-            ]
-            .into_iter()
-            .flatten()
-        }
-
-        /// A list of all built-in tools
-        pub fn built_in_tools() -> impl Iterator<Item = LanguageModelRequestTool> {
-            fn language_model_tool<T: AgentTool>() -> LanguageModelRequestTool {
-                LanguageModelRequestTool {
-                    name: T::name().to_string(),
-                    description: T::description().to_string(),
-                    input_schema: T::input_schema(LanguageModelToolSchemaFormat::JsonSchema).to_value(),
-                }
-            }
-            [
-                $(
-                    language_model_tool::<$tool>(),
-                )*
-            ]
-            .into_iter()
-        }
-    };
-}
-
-tools! {
-    CopyPathTool,
-    CreateDirectoryTool,
-    DeletePathTool,
-    DiagnosticsTool,
-    EditFileTool,
-    FetchTool,
-    FindPathTool,
-    GrepTool,
-    ListDirectoryTool,
-    MovePathTool,
-    NowTool,
-    OpenTool,
-    ReadFileTool,
-    TerminalTool,
-    ThinkingTool,
-    WebSearchTool,
-}
diff --git a/crates/agent/src/tools/context_server_registry.rs b/crates/agent/src/tools/context_server_registry.rs
deleted file mode 100644
index 03a0ef84e7..0000000000
--- a/crates/agent/src/tools/context_server_registry.rs
+++ /dev/null
@@ -1,253 +0,0 @@
-use crate::{AgentToolOutput, AnyAgentTool, ToolCallEventStream};
-use agent_client_protocol::ToolKind;
-use anyhow::{Result, anyhow, bail};
-use collections::{BTreeMap, HashMap};
-use context_server::ContextServerId;
-use gpui::{App, Context, Entity, SharedString, Task};
-use project::context_server_store::{ContextServerStatus, ContextServerStore};
-use std::sync::Arc;
-use util::ResultExt;
-
-pub struct ContextServerRegistry {
-    server_store: Entity<ContextServerStore>,
-    registered_servers: HashMap<ContextServerId, RegisteredContextServer>,
-    _subscription: gpui::Subscription,
-}
-
-struct RegisteredContextServer {
-    tools: BTreeMap<SharedString, Arc<dyn AnyAgentTool>>,
-    load_tools: Task<Result<()>>,
-}
-
-impl ContextServerRegistry {
-    pub fn new(server_store: Entity<ContextServerStore>, cx: &mut Context<Self>) -> Self {
-        let mut this = Self {
-            server_store: server_store.clone(),
-            registered_servers: HashMap::default(),
-            _subscription: cx.subscribe(&server_store, Self::handle_context_server_store_event),
-        };
-        for server in server_store.read(cx).running_servers() {
-            this.reload_tools_for_server(server.id(), cx);
-        }
-        this
-    }
-
-    pub fn tools_for_server(
-        &self,
-        server_id: &ContextServerId,
-    ) -> impl Iterator<Item = &Arc<dyn AnyAgentTool>> {
-        self.registered_servers
-            .get(server_id)
-            .map(|server| server.tools.values())
-            .into_iter()
-            .flatten()
-    }
-
-    pub fn servers(
-        &self,
-    ) -> impl Iterator<
-        Item = (
-            &ContextServerId,
-            &BTreeMap<SharedString, Arc<dyn AnyAgentTool>>,
-        ),
-    > {
-        self.registered_servers
-            .iter()
-            .map(|(id, server)| (id, &server.tools))
-    }
-
-    fn reload_tools_for_server(&mut self, server_id: ContextServerId, cx: &mut Context<Self>) {
-        let Some(server) = self.server_store.read(cx).get_running_server(&server_id) else {
-            return;
-        };
-        let Some(client) = server.client() else {
-            return;
-        };
-        if !client.capable(context_server::protocol::ServerCapability::Tools) {
-            return;
-        }
-
-        let registered_server =
-            self.registered_servers
-                .entry(server_id.clone())
-                .or_insert(RegisteredContextServer {
-                    tools: BTreeMap::default(),
-                    load_tools: Task::ready(Ok(())),
-                });
-        registered_server.load_tools = cx.spawn(async move |this, cx| {
-            let response = client
-                .request::<context_server::types::requests::ListTools>(())
-                .await;
-
-            this.update(cx, |this, cx| {
-                let Some(registered_server) = this.registered_servers.get_mut(&server_id) else {
-                    return;
-                };
-
-                registered_server.tools.clear();
-                if let Some(response) = response.log_err() {
-                    for tool in response.tools {
-                        let tool = Arc::new(ContextServerTool::new(
-                            this.server_store.clone(),
-                            server.id(),
-                            tool,
-                        ));
-                        registered_server.tools.insert(tool.name(), tool);
-                    }
-                    cx.notify();
-                }
-            })
-        });
-    }
-
-    fn handle_context_server_store_event(
-        &mut self,
-        _: Entity<ContextServerStore>,
-        event: &project::context_server_store::Event,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            project::context_server_store::Event::ServerStatusChanged { server_id, status } => {
-                match status {
-                    ContextServerStatus::Starting => {}
-                    ContextServerStatus::Running => {
-                        self.reload_tools_for_server(server_id.clone(), cx);
-                    }
-                    ContextServerStatus::Stopped | ContextServerStatus::Error(_) => {
-                        self.registered_servers.remove(server_id);
-                        cx.notify();
-                    }
-                }
-            }
-        }
-    }
-}
-
-struct ContextServerTool {
-    store: Entity<ContextServerStore>,
-    server_id: ContextServerId,
-    tool: context_server::types::Tool,
-}
-
-impl ContextServerTool {
-    fn new(
-        store: Entity<ContextServerStore>,
-        server_id: ContextServerId,
-        tool: context_server::types::Tool,
-    ) -> Self {
-        Self {
-            store,
-            server_id,
-            tool,
-        }
-    }
-}
-
-impl AnyAgentTool for ContextServerTool {
-    fn name(&self) -> SharedString {
-        self.tool.name.clone().into()
-    }
-
-    fn description(&self) -> SharedString {
-        self.tool.description.clone().unwrap_or_default().into()
-    }
-
-    fn kind(&self) -> ToolKind {
-        ToolKind::Other
-    }
-
-    fn initial_title(&self, _input: serde_json::Value, _cx: &mut App) -> SharedString {
-        format!("Run MCP tool `{}`", self.tool.name).into()
-    }
-
-    fn input_schema(
-        &self,
-        format: language_model::LanguageModelToolSchemaFormat,
-    ) -> Result<serde_json::Value> {
-        let mut schema = self.tool.input_schema.clone();
-        language_model::tool_schema::adapt_schema_to_format(&mut schema, format)?;
-        Ok(match schema {
-            serde_json::Value::Null => {
-                serde_json::json!({ "type": "object", "properties": [] })
-            }
-            serde_json::Value::Object(map) if map.is_empty() => {
-                serde_json::json!({ "type": "object", "properties": [] })
-            }
-            _ => schema,
-        })
-    }
-
-    fn run(
-        self: Arc<Self>,
-        input: serde_json::Value,
-        event_stream: ToolCallEventStream,
-        cx: &mut App,
-    ) -> Task<Result<AgentToolOutput>> {
-        let Some(server) = self.store.read(cx).get_running_server(&self.server_id) else {
-            return Task::ready(Err(anyhow!("Context server not found")));
-        };
-        let tool_name = self.tool.name.clone();
-        let authorize = event_stream.authorize(self.initial_title(input.clone(), cx), cx);
-
-        cx.spawn(async move |_cx| {
-            authorize.await?;
-
-            let Some(protocol) = server.client() else {
-                bail!("Context server not initialized");
-            };
-
-            let arguments = if let serde_json::Value::Object(map) = input {
-                Some(map.into_iter().collect())
-            } else {
-                None
-            };
-
-            log::trace!(
-                "Running tool: {} with arguments: {:?}",
-                tool_name,
-                arguments
-            );
-            let response = protocol
-                .request::<context_server::types::requests::CallTool>(
-                    context_server::types::CallToolParams {
-                        name: tool_name,
-                        arguments,
-                        meta: None,
-                    },
-                )
-                .await?;
-
-            let mut result = String::new();
-            for content in response.content {
-                match content {
-                    context_server::types::ToolResponseContent::Text { text } => {
-                        result.push_str(&text);
-                    }
-                    context_server::types::ToolResponseContent::Image { .. } => {
-                        log::warn!("Ignoring image content from tool response");
-                    }
-                    context_server::types::ToolResponseContent::Audio { .. } => {
-                        log::warn!("Ignoring audio content from tool response");
-                    }
-                    context_server::types::ToolResponseContent::Resource { .. } => {
-                        log::warn!("Ignoring resource content from tool response");
-                    }
-                }
-            }
-            Ok(AgentToolOutput {
-                raw_output: result.clone().into(),
-                llm_output: result.into(),
-            })
-        })
-    }
-
-    fn replay(
-        &self,
-        _input: serde_json::Value,
-        _output: serde_json::Value,
-        _event_stream: ToolCallEventStream,
-        _cx: &mut App,
-    ) -> Result<()> {
-        Ok(())
-    }
-}
diff --git a/crates/agent/src/tools/copy_path_tool.rs b/crates/agent/src/tools/copy_path_tool.rs
deleted file mode 100644
index 236978c78f..0000000000
--- a/crates/agent/src/tools/copy_path_tool.rs
+++ /dev/null
@@ -1,113 +0,0 @@
-use crate::{AgentTool, ToolCallEventStream};
-use agent_client_protocol::ToolKind;
-use anyhow::{Context as _, Result, anyhow};
-use gpui::{App, AppContext, Entity, Task};
-use project::Project;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use std::sync::Arc;
-use util::markdown::MarkdownInlineCode;
-
-/// Copies a file or directory in the project, and returns confirmation that the copy succeeded.
-/// Directory contents will be copied recursively.
-///
-/// This tool should be used when it's desirable to create a copy of a file or directory without modifying the original.
-/// It's much more efficient than doing this by separately reading and then writing the file or directory's contents, so this tool should be preferred over that approach whenever copying is the goal.
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct CopyPathToolInput {
-    /// The source path of the file or directory to copy.
-    /// If a directory is specified, its contents will be copied recursively.
-    ///
-    /// <example>
-    /// If the project has the following files:
-    ///
-    /// - directory1/a/something.txt
-    /// - directory2/a/things.txt
-    /// - directory3/a/other.txt
-    ///
-    /// You can copy the first file by providing a source_path of "directory1/a/something.txt"
-    /// </example>
-    pub source_path: String,
-    /// The destination path where the file or directory should be copied to.
-    ///
-    /// <example>
-    /// To copy "directory1/a/something.txt" to "directory2/b/copy.txt", provide a destination_path of "directory2/b/copy.txt"
-    /// </example>
-    pub destination_path: String,
-}
-
-pub struct CopyPathTool {
-    project: Entity<Project>,
-}
-
-impl CopyPathTool {
-    pub fn new(project: Entity<Project>) -> Self {
-        Self { project }
-    }
-}
-
-impl AgentTool for CopyPathTool {
-    type Input = CopyPathToolInput;
-    type Output = String;
-
-    fn name() -> &'static str {
-        "copy_path"
-    }
-
-    fn kind() -> ToolKind {
-        ToolKind::Move
-    }
-
-    fn initial_title(
-        &self,
-        input: Result<Self::Input, serde_json::Value>,
-        _cx: &mut App,
-    ) -> ui::SharedString {
-        if let Ok(input) = input {
-            let src = MarkdownInlineCode(&input.source_path);
-            let dest = MarkdownInlineCode(&input.destination_path);
-            format!("Copy {src} to {dest}").into()
-        } else {
-            "Copy path".into()
-        }
-    }
-
-    fn run(
-        self: Arc<Self>,
-        input: Self::Input,
-        _event_stream: ToolCallEventStream,
-        cx: &mut App,
-    ) -> Task<Result<Self::Output>> {
-        let copy_task = self.project.update(cx, |project, cx| {
-            match project
-                .find_project_path(&input.source_path, cx)
-                .and_then(|project_path| project.entry_for_path(&project_path, cx))
-            {
-                Some(entity) => match project.find_project_path(&input.destination_path, cx) {
-                    Some(project_path) => project.copy_entry(entity.id, project_path, cx),
-                    None => Task::ready(Err(anyhow!(
-                        "Destination path {} was outside the project.",
-                        input.destination_path
-                    ))),
-                },
-                None => Task::ready(Err(anyhow!(
-                    "Source path {} was not found in the project.",
-                    input.source_path
-                ))),
-            }
-        });
-
-        cx.background_spawn(async move {
-            let _ = copy_task.await.with_context(|| {
-                format!(
-                    "Copying {} to {}",
-                    input.source_path, input.destination_path
-                )
-            })?;
-            Ok(format!(
-                "Copied {} to {}",
-                input.source_path, input.destination_path
-            ))
-        })
-    }
-}
diff --git a/crates/agent/src/tools/create_directory_tool.rs b/crates/agent/src/tools/create_directory_tool.rs
deleted file mode 100644
index b6240e99cf..0000000000
--- a/crates/agent/src/tools/create_directory_tool.rs
+++ /dev/null
@@ -1,90 +0,0 @@
-use agent_client_protocol::ToolKind;
-use anyhow::{Context as _, Result, anyhow};
-use gpui::{App, Entity, SharedString, Task};
-use project::Project;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use std::sync::Arc;
-use util::markdown::MarkdownInlineCode;
-
-use crate::{AgentTool, ToolCallEventStream};
-
-/// Creates a new directory at the specified path within the project. Returns confirmation that the directory was created.
-///
-/// This tool creates a directory and all necessary parent directories. It should be used whenever you need to create new directories within the project.
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct CreateDirectoryToolInput {
-    /// The path of the new directory.
-    ///
-    /// <example>
-    /// If the project has the following structure:
-    ///
-    /// - directory1/
-    /// - directory2/
-    ///
-    /// You can create a new directory by providing a path of "directory1/new_directory"
-    /// </example>
-    pub path: String,
-}
-
-pub struct CreateDirectoryTool {
-    project: Entity<Project>,
-}
-
-impl CreateDirectoryTool {
-    pub fn new(project: Entity<Project>) -> Self {
-        Self { project }
-    }
-}
-
-impl AgentTool for CreateDirectoryTool {
-    type Input = CreateDirectoryToolInput;
-    type Output = String;
-
-    fn name() -> &'static str {
-        "create_directory"
-    }
-
-    fn kind() -> ToolKind {
-        ToolKind::Read
-    }
-
-    fn initial_title(
-        &self,
-        input: Result<Self::Input, serde_json::Value>,
-        _cx: &mut App,
-    ) -> SharedString {
-        if let Ok(input) = input {
-            format!("Create directory {}", MarkdownInlineCode(&input.path)).into()
-        } else {
-            "Create directory".into()
-        }
-    }
-
-    fn run(
-        self: Arc<Self>,
-        input: Self::Input,
-        _event_stream: ToolCallEventStream,
-        cx: &mut App,
-    ) -> Task<Result<Self::Output>> {
-        let project_path = match self.project.read(cx).find_project_path(&input.path, cx) {
-            Some(project_path) => project_path,
-            None => {
-                return Task::ready(Err(anyhow!("Path to create was outside the project")));
-            }
-        };
-        let destination_path: Arc<str> = input.path.as_str().into();
-
-        let create_entry = self.project.update(cx, |project, cx| {
-            project.create_entry(project_path.clone(), true, cx)
-        });
-
-        cx.spawn(async move |_cx| {
-            create_entry
-                .await
-                .with_context(|| format!("Creating directory {destination_path}"))?;
-
-            Ok(format!("Created directory {destination_path}"))
-        })
-    }
-}
diff --git a/crates/agent/src/tools/delete_path_tool.rs b/crates/agent/src/tools/delete_path_tool.rs
deleted file mode 100644
index 01a77f5d81..0000000000
--- a/crates/agent/src/tools/delete_path_tool.rs
+++ /dev/null
@@ -1,140 +0,0 @@
-use crate::{AgentTool, ToolCallEventStream};
-use action_log::ActionLog;
-use agent_client_protocol::ToolKind;
-use anyhow::{Context as _, Result, anyhow};
-use futures::{SinkExt, StreamExt, channel::mpsc};
-use gpui::{App, AppContext, Entity, SharedString, Task};
-use project::{Project, ProjectPath};
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use std::sync::Arc;
-
-/// Deletes the file or directory (and the directory's contents, recursively) at the specified path in the project, and returns confirmation of the deletion.
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct DeletePathToolInput {
-    /// The path of the file or directory to delete.
-    ///
-    /// <example>
-    /// If the project has the following files:
-    ///
-    /// - directory1/a/something.txt
-    /// - directory2/a/things.txt
-    /// - directory3/a/other.txt
-    ///
-    /// You can delete the first file by providing a path of "directory1/a/something.txt"
-    /// </example>
-    pub path: String,
-}
-
-pub struct DeletePathTool {
-    project: Entity<Project>,
-    action_log: Entity<ActionLog>,
-}
-
-impl DeletePathTool {
-    pub fn new(project: Entity<Project>, action_log: Entity<ActionLog>) -> Self {
-        Self {
-            project,
-            action_log,
-        }
-    }
-}
-
-impl AgentTool for DeletePathTool {
-    type Input = DeletePathToolInput;
-    type Output = String;
-
-    fn name() -> &'static str {
-        "delete_path"
-    }
-
-    fn kind() -> ToolKind {
-        ToolKind::Delete
-    }
-
-    fn initial_title(
-        &self,
-        input: Result<Self::Input, serde_json::Value>,
-        _cx: &mut App,
-    ) -> SharedString {
-        if let Ok(input) = input {
-            format!("Delete “`{}`”", input.path).into()
-        } else {
-            "Delete path".into()
-        }
-    }
-
-    fn run(
-        self: Arc<Self>,
-        input: Self::Input,
-        _event_stream: ToolCallEventStream,
-        cx: &mut App,
-    ) -> Task<Result<Self::Output>> {
-        let path = input.path;
-        let Some(project_path) = self.project.read(cx).find_project_path(&path, cx) else {
-            return Task::ready(Err(anyhow!(
-                "Couldn't delete {path} because that path isn't in this project."
-            )));
-        };
-
-        let Some(worktree) = self
-            .project
-            .read(cx)
-            .worktree_for_id(project_path.worktree_id, cx)
-        else {
-            return Task::ready(Err(anyhow!(
-                "Couldn't delete {path} because that path isn't in this project."
-            )));
-        };
-
-        let worktree_snapshot = worktree.read(cx).snapshot();
-        let (mut paths_tx, mut paths_rx) = mpsc::channel(256);
-        cx.background_spawn({
-            let project_path = project_path.clone();
-            async move {
-                for entry in
-                    worktree_snapshot.traverse_from_path(true, false, false, &project_path.path)
-                {
-                    if !entry.path.starts_with(&project_path.path) {
-                        break;
-                    }
-                    paths_tx
-                        .send(ProjectPath {
-                            worktree_id: project_path.worktree_id,
-                            path: entry.path.clone(),
-                        })
-                        .await?;
-                }
-                anyhow::Ok(())
-            }
-        })
-        .detach();
-
-        let project = self.project.clone();
-        let action_log = self.action_log.clone();
-        cx.spawn(async move |cx| {
-            while let Some(path) = paths_rx.next().await {
-                if let Ok(buffer) = project
-                    .update(cx, |project, cx| project.open_buffer(path, cx))?
-                    .await
-                {
-                    action_log.update(cx, |action_log, cx| {
-                        action_log.will_delete_buffer(buffer.clone(), cx)
-                    })?;
-                }
-            }
-
-            let deletion_task = project
-                .update(cx, |project, cx| {
-                    project.delete_file(project_path, false, cx)
-                })?
-                .with_context(|| {
-                    format!("Couldn't delete {path} because that path isn't in this project.")
-                })?;
-            deletion_task
-                .await
-                .with_context(|| format!("Deleting {path}"))?;
-            Ok(format!("Deleted {path}"))
-        })
-    }
-}
diff --git a/crates/agent/src/tools/diagnostics_tool.rs b/crates/agent/src/tools/diagnostics_tool.rs
deleted file mode 100644
index f07ec4cfe6..0000000000
--- a/crates/agent/src/tools/diagnostics_tool.rs
+++ /dev/null
@@ -1,165 +0,0 @@
-use crate::{AgentTool, ToolCallEventStream};
-use agent_client_protocol as acp;
-use anyhow::{Result, anyhow};
-use gpui::{App, Entity, Task};
-use language::{DiagnosticSeverity, OffsetRangeExt};
-use project::Project;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use std::{fmt::Write, sync::Arc};
-use ui::SharedString;
-use util::markdown::MarkdownInlineCode;
-
-/// Get errors and warnings for the project or a specific file.
-///
-/// This tool can be invoked after a series of edits to determine if further edits are necessary, or if the user asks to fix errors or warnings in their codebase.
-///
-/// When a path is provided, shows all diagnostics for that specific file.
-/// When no path is provided, shows a summary of error and warning counts for all files in the project.
-///
-/// <example>
-/// To get diagnostics for a specific file:
-/// {
-///     "path": "src/main.rs"
-/// }
-///
-/// To get a project-wide diagnostic summary:
-/// {}
-/// </example>
-///
-/// <guidelines>
-/// - If you think you can fix a diagnostic, make 1-2 attempts and then give up.
-/// - Don't remove code you've generated just because you can't fix an error. The user can help you fix it.
-/// </guidelines>
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct DiagnosticsToolInput {
-    /// The path to get diagnostics for. If not provided, returns a project-wide summary.
-    ///
-    /// This path should never be absolute, and the first component
-    /// of the path should always be a root directory in a project.
-    ///
-    /// <example>
-    /// If the project has the following root directories:
-    ///
-    /// - lorem
-    /// - ipsum
-    ///
-    /// If you wanna access diagnostics for `dolor.txt` in `ipsum`, you should use the path `ipsum/dolor.txt`.
-    /// </example>
-    pub path: Option<String>,
-}
-
-pub struct DiagnosticsTool {
-    project: Entity<Project>,
-}
-
-impl DiagnosticsTool {
-    pub fn new(project: Entity<Project>) -> Self {
-        Self { project }
-    }
-}
-
-impl AgentTool for DiagnosticsTool {
-    type Input = DiagnosticsToolInput;
-    type Output = String;
-
-    fn name() -> &'static str {
-        "diagnostics"
-    }
-
-    fn kind() -> acp::ToolKind {
-        acp::ToolKind::Read
-    }
-
-    fn initial_title(
-        &self,
-        input: Result<Self::Input, serde_json::Value>,
-        _cx: &mut App,
-    ) -> SharedString {
-        if let Some(path) = input.ok().and_then(|input| match input.path {
-            Some(path) if !path.is_empty() => Some(path),
-            _ => None,
-        }) {
-            format!("Check diagnostics for {}", MarkdownInlineCode(&path)).into()
-        } else {
-            "Check project diagnostics".into()
-        }
-    }
-
-    fn run(
-        self: Arc<Self>,
-        input: Self::Input,
-        _event_stream: ToolCallEventStream,
-        cx: &mut App,
-    ) -> Task<Result<Self::Output>> {
-        match input.path {
-            Some(path) if !path.is_empty() => {
-                let Some(project_path) = self.project.read(cx).find_project_path(&path, cx) else {
-                    return Task::ready(Err(anyhow!("Could not find path {path} in project",)));
-                };
-
-                let buffer = self
-                    .project
-                    .update(cx, |project, cx| project.open_buffer(project_path, cx));
-
-                cx.spawn(async move |cx| {
-                    let mut output = String::new();
-                    let buffer = buffer.await?;
-                    let snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot())?;
-
-                    for (_, group) in snapshot.diagnostic_groups(None) {
-                        let entry = &group.entries[group.primary_ix];
-                        let range = entry.range.to_point(&snapshot);
-                        let severity = match entry.diagnostic.severity {
-                            DiagnosticSeverity::ERROR => "error",
-                            DiagnosticSeverity::WARNING => "warning",
-                            _ => continue,
-                        };
-
-                        writeln!(
-                            output,
-                            "{} at line {}: {}",
-                            severity,
-                            range.start.row + 1,
-                            entry.diagnostic.message
-                        )?;
-                    }
-
-                    if output.is_empty() {
-                        Ok("File doesn't have errors or warnings!".to_string())
-                    } else {
-                        Ok(output)
-                    }
-                })
-            }
-            _ => {
-                let project = self.project.read(cx);
-                let mut output = String::new();
-                let mut has_diagnostics = false;
-
-                for (project_path, _, summary) in project.diagnostic_summaries(true, cx) {
-                    if summary.error_count > 0 || summary.warning_count > 0 {
-                        let Some(worktree) = project.worktree_for_id(project_path.worktree_id, cx)
-                        else {
-                            continue;
-                        };
-
-                        has_diagnostics = true;
-                        output.push_str(&format!(
-                            "{}: {} error(s), {} warning(s)\n",
-                            worktree.read(cx).absolutize(&project_path.path).display(),
-                            summary.error_count,
-                            summary.warning_count
-                        ));
-                    }
-                }
-
-                if has_diagnostics {
-                    Task::ready(Ok(output))
-                } else {
-                    Task::ready(Ok("No errors or warnings found in the project.".into()))
-                }
-            }
-        }
-    }
-}
diff --git a/crates/agent/src/tools/edit_file_tool.rs b/crates/agent/src/tools/edit_file_tool.rs
deleted file mode 100644
index 0ab99426e2..0000000000
--- a/crates/agent/src/tools/edit_file_tool.rs
+++ /dev/null
@@ -1,2210 +0,0 @@
-use crate::{
-    AgentTool, Templates, Thread, ToolCallEventStream,
-    edit_agent::{EditAgent, EditAgentOutput, EditAgentOutputEvent, EditFormat},
-};
-use acp_thread::Diff;
-use agent_client_protocol::{self as acp, ToolCallLocation, ToolCallUpdateFields};
-use anyhow::{Context as _, Result, anyhow};
-use cloud_llm_client::CompletionIntent;
-use collections::HashSet;
-use gpui::{App, AppContext, AsyncApp, Entity, Task, WeakEntity};
-use indoc::formatdoc;
-use language::language_settings::{self, FormatOnSave};
-use language::{LanguageRegistry, ToPoint};
-use language_model::LanguageModelToolResultContent;
-use paths;
-use project::lsp_store::{FormatTrigger, LspFormatTarget};
-use project::{Project, ProjectPath};
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use settings::Settings;
-use smol::stream::StreamExt as _;
-use std::ffi::OsStr;
-use std::path::{Path, PathBuf};
-use std::sync::Arc;
-use ui::SharedString;
-use util::ResultExt;
-use util::rel_path::RelPath;
-
-const DEFAULT_UI_TEXT: &str = "Editing file";
-
-/// This is a tool for creating a new file or editing an existing file. For moving or renaming files, you should generally use the `terminal` tool with the 'mv' command instead.
-///
-/// Before using this tool:
-///
-/// 1. Use the `read_file` tool to understand the file's contents and context
-///
-/// 2. Verify the directory path is correct (only applicable when creating new files):
-///    - Use the `list_directory` tool to verify the parent directory exists and is the correct location
-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
-pub struct EditFileToolInput {
-    /// A one-line, user-friendly markdown description of the edit. This will be shown in the UI and also passed to another model to perform the edit.
-    ///
-    /// Be terse, but also descriptive in what you want to achieve with this edit. Avoid generic instructions.
-    ///
-    /// NEVER mention the file path in this description.
-    ///
-    /// <example>Fix API endpoint URLs</example>
-    /// <example>Update copyright year in `page_footer`</example>
-    ///
-    /// Make sure to include this field before all the others in the input object so that we can display it immediately.
-    pub display_description: String,
-
-    /// The full path of the file to create or modify in the project.
-    ///
-    /// WARNING: When specifying which file path need changing, you MUST start each path with one of the project's root directories.
-    ///
-    /// The following examples assume we have two root directories in the project:
-    /// - /a/b/backend
-    /// - /c/d/frontend
-    ///
-    /// <example>
-    /// `backend/src/main.rs`
-    ///
-    /// Notice how the file path starts with `backend`. Without that, the path would be ambiguous and the call would fail!
-    /// </example>
-    ///
-    /// <example>
-    /// `frontend/db.js`
-    /// </example>
-    pub path: PathBuf,
-    /// The mode of operation on the file. Possible values:
-    /// - 'edit': Make granular edits to an existing file.
-    /// - 'create': Create a new file if it doesn't exist.
-    /// - 'overwrite': Replace the entire contents of an existing file.
-    ///
-    /// When a file already exists or you just created it, prefer editing it as opposed to recreating it from scratch.
-    pub mode: EditFileMode,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
-struct EditFileToolPartialInput {
-    #[serde(default)]
-    path: String,
-    #[serde(default)]
-    display_description: String,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
-#[serde(rename_all = "lowercase")]
-#[schemars(inline)]
-pub enum EditFileMode {
-    Edit,
-    Create,
-    Overwrite,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct EditFileToolOutput {
-    #[serde(alias = "original_path")]
-    input_path: PathBuf,
-    new_text: String,
-    old_text: Arc<String>,
-    #[serde(default)]
-    diff: String,
-    #[serde(alias = "raw_output")]
-    edit_agent_output: EditAgentOutput,
-}
-
-impl From<EditFileToolOutput> for LanguageModelToolResultContent {
-    fn from(output: EditFileToolOutput) -> Self {
-        if output.diff.is_empty() {
-            "No edits were made.".into()
-        } else {
-            format!(
-                "Edited {}:\n\n```diff\n{}\n```",
-                output.input_path.display(),
-                output.diff
-            )
-            .into()
-        }
-    }
-}
-
-pub struct EditFileTool {
-    thread: WeakEntity<Thread>,
-    language_registry: Arc<LanguageRegistry>,
-    project: Entity<Project>,
-    templates: Arc<Templates>,
-}
-
-impl EditFileTool {
-    pub fn new(
-        project: Entity<Project>,
-        thread: WeakEntity<Thread>,
-        language_registry: Arc<LanguageRegistry>,
-        templates: Arc<Templates>,
-    ) -> Self {
-        Self {
-            project,
-            thread,
-            language_registry,
-            templates,
-        }
-    }
-
-    fn authorize(
-        &self,
-        input: &EditFileToolInput,
-        event_stream: &ToolCallEventStream,
-        cx: &mut App,
-    ) -> Task<Result<()>> {
-        if agent_settings::AgentSettings::get_global(cx).always_allow_tool_actions {
-            return Task::ready(Ok(()));
-        }
-
-        // If any path component matches the local settings folder, then this could affect
-        // the editor in ways beyond the project source, so prompt.
-        let local_settings_folder = paths::local_settings_folder_name();
-        let path = Path::new(&input.path);
-        if path.components().any(|component| {
-            component.as_os_str() == <_ as AsRef<OsStr>>::as_ref(&local_settings_folder)
-        }) {
-            return event_stream.authorize(
-                format!("{} (local settings)", input.display_description),
-                cx,
-            );
-        }
-
-        // It's also possible that the global config dir is configured to be inside the project,
-        // so check for that edge case too.
-        // TODO this is broken when remoting
-        if let Ok(canonical_path) = std::fs::canonicalize(&input.path)
-            && canonical_path.starts_with(paths::config_dir())
-        {
-            return event_stream.authorize(
-                format!("{} (global settings)", input.display_description),
-                cx,
-            );
-        }
-
-        // Check if path is inside the global config directory
-        // First check if it's already inside project - if not, try to canonicalize
-        let Ok(project_path) = self.thread.read_with(cx, |thread, cx| {
-            thread.project().read(cx).find_project_path(&input.path, cx)
-        }) else {
-            return Task::ready(Err(anyhow!("thread was dropped")));
-        };
-
-        // If the path is inside the project, and it's not one of the above edge cases,
-        // then no confirmation is necessary. Otherwise, confirmation is necessary.
-        if project_path.is_some() {
-            Task::ready(Ok(()))
-        } else {
-            event_stream.authorize(&input.display_description, cx)
-        }
-    }
-}
-
-impl AgentTool for EditFileTool {
-    type Input = EditFileToolInput;
-    type Output = EditFileToolOutput;
-
-    fn name() -> &'static str {
-        "edit_file"
-    }
-
-    fn kind() -> acp::ToolKind {
-        acp::ToolKind::Edit
-    }
-
-    fn initial_title(
-        &self,
-        input: Result<Self::Input, serde_json::Value>,
-        cx: &mut App,
-    ) -> SharedString {
-        match input {
-            Ok(input) => self
-                .project
-                .read(cx)
-                .find_project_path(&input.path, cx)
-                .and_then(|project_path| {
-                    self.project
-                        .read(cx)
-                        .short_full_path_for_project_path(&project_path, cx)
-                })
-                .unwrap_or(input.path.to_string_lossy().into_owned())
-                .into(),
-            Err(raw_input) => {
-                if let Some(input) =
-                    serde_json::from_value::<EditFileToolPartialInput>(raw_input).ok()
-                {
-                    let path = input.path.trim();
-                    if !path.is_empty() {
-                        return self
-                            .project
-                            .read(cx)
-                            .find_project_path(&input.path, cx)
-                            .and_then(|project_path| {
-                                self.project
-                                    .read(cx)
-                                    .short_full_path_for_project_path(&project_path, cx)
-                            })
-                            .unwrap_or(input.path)
-                            .into();
-                    }
-
-                    let description = input.display_description.trim();
-                    if !description.is_empty() {
-                        return description.to_string().into();
-                    }
-                }
-
-                DEFAULT_UI_TEXT.into()
-            }
-        }
-    }
-
-    fn run(
-        self: Arc<Self>,
-        input: Self::Input,
-        event_stream: ToolCallEventStream,
-        cx: &mut App,
-    ) -> Task<Result<Self::Output>> {
-        let Ok(project) = self
-            .thread
-            .read_with(cx, |thread, _cx| thread.project().clone())
-        else {
-            return Task::ready(Err(anyhow!("thread was dropped")));
-        };
-        let project_path = match resolve_path(&input, project.clone(), cx) {
-            Ok(path) => path,
-            Err(err) => return Task::ready(Err(anyhow!(err))),
-        };
-        let abs_path = project.read(cx).absolute_path(&project_path, cx);
-        if let Some(abs_path) = abs_path.clone() {
-            event_stream.update_fields(
-                ToolCallUpdateFields::new().locations(vec![acp::ToolCallLocation::new(abs_path)]),
-            );
-        }
-
-        let authorize = self.authorize(&input, &event_stream, cx);
-        cx.spawn(async move |cx: &mut AsyncApp| {
-            authorize.await?;
-
-            let (request, model, action_log) = self.thread.update(cx, |thread, cx| {
-                let request = thread.build_completion_request(CompletionIntent::ToolResults, cx);
-                (request, thread.model().cloned(), thread.action_log().clone())
-            })?;
-            let request = request?;
-            let model = model.context("No language model configured")?;
-
-            let edit_format = EditFormat::from_model(model.clone())?;
-            let edit_agent = EditAgent::new(
-                model,
-                project.clone(),
-                action_log.clone(),
-                self.templates.clone(),
-                edit_format,
-            );
-
-            let buffer = project
-                .update(cx, |project, cx| {
-                    project.open_buffer(project_path.clone(), cx)
-                })?
-                .await?;
-
-            // Check if the file has been modified since the agent last read it
-            if let Some(abs_path) = abs_path.as_ref() {
-                let (last_read_mtime, current_mtime, is_dirty) = self.thread.update(cx, |thread, cx| {
-                    let last_read = thread.file_read_times.get(abs_path).copied();
-                    let current = buffer.read(cx).file().and_then(|file| file.disk_state().mtime());
-                    let dirty = buffer.read(cx).is_dirty();
-                    (last_read, current, dirty)
-                })?;
-
-                // Check for unsaved changes first - these indicate modifications we don't know about
-                if is_dirty {
-                    anyhow::bail!(
-                        "This file cannot be written to because it has unsaved changes. \
-                         Please end the current conversation immediately by telling the user you want to write to this file (mention its path explicitly) but you can't write to it because it has unsaved changes. \
-                         Ask the user to save that buffer's changes and to inform you when it's ok to proceed."
-                    );
-                }
-
-                // Check if the file was modified on disk since we last read it
-                if let (Some(last_read), Some(current)) = (last_read_mtime, current_mtime) {
-                    // MTime can be unreliable for comparisons, so our newtype intentionally
-                    // doesn't support comparing them. If the mtime at all different
-                    // (which could be because of a modification or because e.g. system clock changed),
-                    // we pessimistically assume it was modified.
-                    if current != last_read {
-                        anyhow::bail!(
-                            "The file {} has been modified since you last read it. \
-                             Please read the file again to get the current state before editing it.",
-                            input.path.display()
-                        );
-                    }
-                }
-            }
-
-            let diff = cx.new(|cx| Diff::new(buffer.clone(), cx))?;
-            event_stream.update_diff(diff.clone());
-            let _finalize_diff = util::defer({
-               let diff = diff.downgrade();
-               let mut cx = cx.clone();
-               move || {
-                   diff.update(&mut cx, |diff, cx| diff.finalize(cx)).ok();
-               }
-            });
-
-            let old_snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot())?;
-            let old_text = cx
-                .background_spawn({
-                    let old_snapshot = old_snapshot.clone();
-                    async move { Arc::new(old_snapshot.text()) }
-                })
-                .await;
-
-
-            let (output, mut events) = if matches!(input.mode, EditFileMode::Edit) {
-                edit_agent.edit(
-                    buffer.clone(),
-                    input.display_description.clone(),
-                    &request,
-                    cx,
-                )
-            } else {
-                edit_agent.overwrite(
-                    buffer.clone(),
-                    input.display_description.clone(),
-                    &request,
-                    cx,
-                )
-            };
-
-            let mut hallucinated_old_text = false;
-            let mut ambiguous_ranges = Vec::new();
-            let mut emitted_location = false;
-            while let Some(event) = events.next().await {
-                match event {
-                    EditAgentOutputEvent::Edited(range) => {
-                        if !emitted_location {
-                            let line = buffer.update(cx, |buffer, _cx| {
-                                range.start.to_point(&buffer.snapshot()).row
-                            }).ok();
-                            if let Some(abs_path) = abs_path.clone() {
-                                event_stream.update_fields(ToolCallUpdateFields::new().locations(vec![ToolCallLocation::new(abs_path).line(line)]));
-                            }
-                            emitted_location = true;
-                        }
-                    },
-                    EditAgentOutputEvent::UnresolvedEditRange => hallucinated_old_text = true,
-                    EditAgentOutputEvent::AmbiguousEditRange(ranges) => ambiguous_ranges = ranges,
-                    EditAgentOutputEvent::ResolvingEditRange(range) => {
-                        diff.update(cx, |card, cx| card.reveal_range(range.clone(), cx))?;
-                        // if !emitted_location {
-                        //     let line = buffer.update(cx, |buffer, _cx| {
-                        //         range.start.to_point(&buffer.snapshot()).row
-                        //     }).ok();
-                        //     if let Some(abs_path) = abs_path.clone() {
-                        //         event_stream.update_fields(ToolCallUpdateFields {
-                        //             locations: Some(vec![ToolCallLocation { path: abs_path, line }]),
-                        //             ..Default::default()
-                        //         });
-                        //     }
-                        // }
-                    }
-                }
-            }
-
-            // If format_on_save is enabled, format the buffer
-            let format_on_save_enabled = buffer
-                .read_with(cx, |buffer, cx| {
-                    let settings = language_settings::language_settings(
-                        buffer.language().map(|l| l.name()),
-                        buffer.file(),
-                        cx,
-                    );
-                    settings.format_on_save != FormatOnSave::Off
-                })
-                .unwrap_or(false);
-
-            let edit_agent_output = output.await?;
-
-            if format_on_save_enabled {
-                action_log.update(cx, |log, cx| {
-                    log.buffer_edited(buffer.clone(), cx);
-                })?;
-
-                let format_task = project.update(cx, |project, cx| {
-                    project.format(
-                        HashSet::from_iter([buffer.clone()]),
-                        LspFormatTarget::Buffers,
-                        false, // Don't push to history since the tool did it.
-                        FormatTrigger::Save,
-                        cx,
-                    )
-                })?;
-                format_task.await.log_err();
-            }
-
-            project
-                .update(cx, |project, cx| project.save_buffer(buffer.clone(), cx))?
-                .await?;
-
-            action_log.update(cx, |log, cx| {
-                log.buffer_edited(buffer.clone(), cx);
-            })?;
-
-            // Update the recorded read time after a successful edit so consecutive edits work
-            if let Some(abs_path) = abs_path.as_ref() {
-                if let Some(new_mtime) = buffer.read_with(cx, |buffer, _| {
-                    buffer.file().and_then(|file| file.disk_state().mtime())
-                })? {
-                    self.thread.update(cx, |thread, _| {
-                        thread.file_read_times.insert(abs_path.to_path_buf(), new_mtime);
-                    })?;
-                }
-            }
-
-            let new_snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot())?;
-            let (new_text, unified_diff) = cx
-                .background_spawn({
-                    let new_snapshot = new_snapshot.clone();
-                    let old_text = old_text.clone();
-                    async move {
-                        let new_text = new_snapshot.text();
-                        let diff = language::unified_diff(&old_text, &new_text);
-                        (new_text, diff)
-                    }
-                })
-                .await;
-
-            let input_path = input.path.display();
-            if unified_diff.is_empty() {
-                anyhow::ensure!(
-                    !hallucinated_old_text,
-                    formatdoc! {"
-                        Some edits were produced but none of them could be applied.
-                        Read the relevant sections of {input_path} again so that
-                        I can perform the requested edits.
-                    "}
-                );
-                anyhow::ensure!(
-                    ambiguous_ranges.is_empty(),
-                    {
-                        let line_numbers = ambiguous_ranges
-                            .iter()
-                            .map(|range| range.start.to_string())
-                            .collect::<Vec<_>>()
-                            .join(", ");
-                        formatdoc! {"
-                            <old_text> matches more than one position in the file (lines: {line_numbers}). Read the
-                            relevant sections of {input_path} again and extend <old_text> so
-                            that I can perform the requested edits.
-                        "}
-                    }
-                );
-            }
-
-            Ok(EditFileToolOutput {
-                input_path: input.path,
-                new_text,
-                old_text,
-                diff: unified_diff,
-                edit_agent_output,
-            })
-        })
-    }
-
-    fn replay(
-        &self,
-        _input: Self::Input,
-        output: Self::Output,
-        event_stream: ToolCallEventStream,
-        cx: &mut App,
-    ) -> Result<()> {
-        event_stream.update_diff(cx.new(|cx| {
-            Diff::finalized(
-                output.input_path.to_string_lossy().into_owned(),
-                Some(output.old_text.to_string()),
-                output.new_text,
-                self.language_registry.clone(),
-                cx,
-            )
-        }));
-        Ok(())
-    }
-}
-
-/// Validate that the file path is valid, meaning:
-///
-/// - For `edit` and `overwrite`, the path must point to an existing file.
-/// - For `create`, the file must not already exist, but it's parent dir must exist.
-fn resolve_path(
-    input: &EditFileToolInput,
-    project: Entity<Project>,
-    cx: &mut App,
-) -> Result<ProjectPath> {
-    let project = project.read(cx);
-
-    match input.mode {
-        EditFileMode::Edit | EditFileMode::Overwrite => {
-            let path = project
-                .find_project_path(&input.path, cx)
-                .context("Can't edit file: path not found")?;
-
-            let entry = project
-                .entry_for_path(&path, cx)
-                .context("Can't edit file: path not found")?;
-
-            anyhow::ensure!(entry.is_file(), "Can't edit file: path is a directory");
-            Ok(path)
-        }
-
-        EditFileMode::Create => {
-            if let Some(path) = project.find_project_path(&input.path, cx) {
-                anyhow::ensure!(
-                    project.entry_for_path(&path, cx).is_none(),
-                    "Can't create file: file already exists"
-                );
-            }
-
-            let parent_path = input
-                .path
-                .parent()
-                .context("Can't create file: incorrect path")?;
-
-            let parent_project_path = project.find_project_path(&parent_path, cx);
-
-            let parent_entry = parent_project_path
-                .as_ref()
-                .and_then(|path| project.entry_for_path(path, cx))
-                .context("Can't create file: parent directory doesn't exist")?;
-
-            anyhow::ensure!(
-                parent_entry.is_dir(),
-                "Can't create file: parent is not a directory"
-            );
-
-            let file_name = input
-                .path
-                .file_name()
-                .and_then(|file_name| file_name.to_str())
-                .and_then(|file_name| RelPath::unix(file_name).ok())
-                .context("Can't create file: invalid filename")?;
-
-            let new_file_path = parent_project_path.map(|parent| ProjectPath {
-                path: parent.path.join(file_name),
-                ..parent
-            });
-
-            new_file_path.context("Can't create file")
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::{ContextServerRegistry, Templates};
-    use fs::Fs;
-    use gpui::{TestAppContext, UpdateGlobal};
-    use language_model::fake_provider::FakeLanguageModel;
-    use prompt_store::ProjectContext;
-    use serde_json::json;
-    use settings::SettingsStore;
-    use util::{path, rel_path::rel_path};
-
-    #[gpui::test]
-    async fn test_edit_nonexistent_file(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = project::FakeFs::new(cx.executor());
-        fs.insert_tree("/root", json!({})).await;
-        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-        let language_registry = project.read_with(cx, |project, _cx| project.languages().clone());
-        let context_server_registry =
-            cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
-        let model = Arc::new(FakeLanguageModel::default());
-        let thread = cx.new(|cx| {
-            Thread::new(
-                project.clone(),
-                cx.new(|_cx| ProjectContext::default()),
-                context_server_registry,
-                Templates::new(),
-                Some(model),
-                cx,
-            )
-        });
-        let result = cx
-            .update(|cx| {
-                let input = EditFileToolInput {
-                    display_description: "Some edit".into(),
-                    path: "root/nonexistent_file.txt".into(),
-                    mode: EditFileMode::Edit,
-                };
-                Arc::new(EditFileTool::new(
-                    project,
-                    thread.downgrade(),
-                    language_registry,
-                    Templates::new(),
-                ))
-                .run(input, ToolCallEventStream::test().0, cx)
-            })
-            .await;
-        assert_eq!(
-            result.unwrap_err().to_string(),
-            "Can't edit file: path not found"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_resolve_path_for_creating_file(cx: &mut TestAppContext) {
-        let mode = &EditFileMode::Create;
-
-        let result = test_resolve_path(mode, "root/new.txt", cx);
-        assert_resolved_path_eq(result.await, rel_path("new.txt"));
-
-        let result = test_resolve_path(mode, "new.txt", cx);
-        assert_resolved_path_eq(result.await, rel_path("new.txt"));
-
-        let result = test_resolve_path(mode, "dir/new.txt", cx);
-        assert_resolved_path_eq(result.await, rel_path("dir/new.txt"));
-
-        let result = test_resolve_path(mode, "root/dir/subdir/existing.txt", cx);
-        assert_eq!(
-            result.await.unwrap_err().to_string(),
-            "Can't create file: file already exists"
-        );
-
-        let result = test_resolve_path(mode, "root/dir/nonexistent_dir/new.txt", cx);
-        assert_eq!(
-            result.await.unwrap_err().to_string(),
-            "Can't create file: parent directory doesn't exist"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_resolve_path_for_editing_file(cx: &mut TestAppContext) {
-        let mode = &EditFileMode::Edit;
-
-        let path_with_root = "root/dir/subdir/existing.txt";
-        let path_without_root = "dir/subdir/existing.txt";
-        let result = test_resolve_path(mode, path_with_root, cx);
-        assert_resolved_path_eq(result.await, rel_path(path_without_root));
-
-        let result = test_resolve_path(mode, path_without_root, cx);
-        assert_resolved_path_eq(result.await, rel_path(path_without_root));
-
-        let result = test_resolve_path(mode, "root/nonexistent.txt", cx);
-        assert_eq!(
-            result.await.unwrap_err().to_string(),
-            "Can't edit file: path not found"
-        );
-
-        let result = test_resolve_path(mode, "root/dir", cx);
-        assert_eq!(
-            result.await.unwrap_err().to_string(),
-            "Can't edit file: path is a directory"
-        );
-    }
-
-    async fn test_resolve_path(
-        mode: &EditFileMode,
-        path: &str,
-        cx: &mut TestAppContext,
-    ) -> anyhow::Result<ProjectPath> {
-        init_test(cx);
-
-        let fs = project::FakeFs::new(cx.executor());
-        fs.insert_tree(
-            "/root",
-            json!({
-                "dir": {
-                    "subdir": {
-                        "existing.txt": "hello"
-                    }
-                }
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-
-        let input = EditFileToolInput {
-            display_description: "Some edit".into(),
-            path: path.into(),
-            mode: mode.clone(),
-        };
-
-        cx.update(|cx| resolve_path(&input, project, cx))
-    }
-
-    #[track_caller]
-    fn assert_resolved_path_eq(path: anyhow::Result<ProjectPath>, expected: &RelPath) {
-        let actual = path.expect("Should return valid path").path;
-        assert_eq!(actual.as_ref(), expected);
-    }
-
-    #[gpui::test]
-    async fn test_format_on_save(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = project::FakeFs::new(cx.executor());
-        fs.insert_tree("/root", json!({"src": {}})).await;
-
-        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-
-        // Set up a Rust language with LSP formatting support
-        let rust_language = Arc::new(language::Language::new(
-            language::LanguageConfig {
-                name: "Rust".into(),
-                matcher: language::LanguageMatcher {
-                    path_suffixes: vec!["rs".to_string()],
-                    ..Default::default()
-                },
-                ..Default::default()
-            },
-            None,
-        ));
-
-        // Register the language and fake LSP
-        let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-        language_registry.add(rust_language);
-
-        let mut fake_language_servers = language_registry.register_fake_lsp(
-            "Rust",
-            language::FakeLspAdapter {
-                capabilities: lsp::ServerCapabilities {
-                    document_formatting_provider: Some(lsp::OneOf::Left(true)),
-                    ..Default::default()
-                },
-                ..Default::default()
-            },
-        );
-
-        // Create the file
-        fs.save(
-            path!("/root/src/main.rs").as_ref(),
-            &"initial content".into(),
-            language::LineEnding::Unix,
-        )
-        .await
-        .unwrap();
-
-        // Open the buffer to trigger LSP initialization
-        let buffer = project
-            .update(cx, |project, cx| {
-                project.open_local_buffer(path!("/root/src/main.rs"), cx)
-            })
-            .await
-            .unwrap();
-
-        // Register the buffer with language servers
-        let _handle = project.update(cx, |project, cx| {
-            project.register_buffer_with_language_servers(&buffer, cx)
-        });
-
-        const UNFORMATTED_CONTENT: &str = "fn main() {println!(\"Hello!\");}\n";
-        const FORMATTED_CONTENT: &str =
-            "This file was formatted by the fake formatter in the test.\n";
-
-        // Get the fake language server and set up formatting handler
-        let fake_language_server = fake_language_servers.next().await.unwrap();
-        fake_language_server.set_request_handler::<lsp::request::Formatting, _, _>({
-            |_, _| async move {
-                Ok(Some(vec![lsp::TextEdit {
-                    range: lsp::Range::new(lsp::Position::new(0, 0), lsp::Position::new(1, 0)),
-                    new_text: FORMATTED_CONTENT.to_string(),
-                }]))
-            }
-        });
-
-        let context_server_registry =
-            cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
-        let model = Arc::new(FakeLanguageModel::default());
-        let thread = cx.new(|cx| {
-            Thread::new(
-                project.clone(),
-                cx.new(|_cx| ProjectContext::default()),
-                context_server_registry,
-                Templates::new(),
-                Some(model.clone()),
-                cx,
-            )
-        });
-
-        // First, test with format_on_save enabled
-        cx.update(|cx| {
-            SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |settings| {
-                    settings.project.all_languages.defaults.format_on_save = Some(FormatOnSave::On);
-                    settings.project.all_languages.defaults.formatter =
-                        Some(language::language_settings::FormatterList::default());
-                });
-            });
-        });
-
-        // Have the model stream unformatted content
-        let edit_result = {
-            let edit_task = cx.update(|cx| {
-                let input = EditFileToolInput {
-                    display_description: "Create main function".into(),
-                    path: "root/src/main.rs".into(),
-                    mode: EditFileMode::Overwrite,
-                };
-                Arc::new(EditFileTool::new(
-                    project.clone(),
-                    thread.downgrade(),
-                    language_registry.clone(),
-                    Templates::new(),
-                ))
-                .run(input, ToolCallEventStream::test().0, cx)
-            });
-
-            // Stream the unformatted content
-            cx.executor().run_until_parked();
-            model.send_last_completion_stream_text_chunk(UNFORMATTED_CONTENT.to_string());
-            model.end_last_completion_stream();
-
-            edit_task.await
-        };
-        assert!(edit_result.is_ok());
-
-        // Wait for any async operations (e.g. formatting) to complete
-        cx.executor().run_until_parked();
-
-        // Read the file to verify it was formatted automatically
-        let new_content = fs.load(path!("/root/src/main.rs").as_ref()).await.unwrap();
-        assert_eq!(
-            // Ignore carriage returns on Windows
-            new_content.replace("\r\n", "\n"),
-            FORMATTED_CONTENT,
-            "Code should be formatted when format_on_save is enabled"
-        );
-
-        let stale_buffer_count = thread
-            .read_with(cx, |thread, _cx| thread.action_log.clone())
-            .read_with(cx, |log, cx| log.stale_buffers(cx).count());
-
-        assert_eq!(
-            stale_buffer_count, 0,
-            "BUG: Buffer is incorrectly marked as stale after format-on-save. Found {} stale buffers. \
-             This causes the agent to think the file was modified externally when it was just formatted.",
-            stale_buffer_count
-        );
-
-        // Next, test with format_on_save disabled
-        cx.update(|cx| {
-            SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |settings| {
-                    settings.project.all_languages.defaults.format_on_save =
-                        Some(FormatOnSave::Off);
-                });
-            });
-        });
-
-        // Stream unformatted edits again
-        let edit_result = {
-            let edit_task = cx.update(|cx| {
-                let input = EditFileToolInput {
-                    display_description: "Update main function".into(),
-                    path: "root/src/main.rs".into(),
-                    mode: EditFileMode::Overwrite,
-                };
-                Arc::new(EditFileTool::new(
-                    project.clone(),
-                    thread.downgrade(),
-                    language_registry,
-                    Templates::new(),
-                ))
-                .run(input, ToolCallEventStream::test().0, cx)
-            });
-
-            // Stream the unformatted content
-            cx.executor().run_until_parked();
-            model.send_last_completion_stream_text_chunk(UNFORMATTED_CONTENT.to_string());
-            model.end_last_completion_stream();
-
-            edit_task.await
-        };
-        assert!(edit_result.is_ok());
-
-        // Wait for any async operations (e.g. formatting) to complete
-        cx.executor().run_until_parked();
-
-        // Verify the file was not formatted
-        let new_content = fs.load(path!("/root/src/main.rs").as_ref()).await.unwrap();
-        assert_eq!(
-            // Ignore carriage returns on Windows
-            new_content.replace("\r\n", "\n"),
-            UNFORMATTED_CONTENT,
-            "Code should not be formatted when format_on_save is disabled"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_remove_trailing_whitespace(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = project::FakeFs::new(cx.executor());
-        fs.insert_tree("/root", json!({"src": {}})).await;
-
-        // Create a simple file with trailing whitespace
-        fs.save(
-            path!("/root/src/main.rs").as_ref(),
-            &"initial content".into(),
-            language::LineEnding::Unix,
-        )
-        .await
-        .unwrap();
-
-        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-        let context_server_registry =
-            cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
-        let language_registry = project.read_with(cx, |project, _cx| project.languages().clone());
-        let model = Arc::new(FakeLanguageModel::default());
-        let thread = cx.new(|cx| {
-            Thread::new(
-                project.clone(),
-                cx.new(|_cx| ProjectContext::default()),
-                context_server_registry,
-                Templates::new(),
-                Some(model.clone()),
-                cx,
-            )
-        });
-
-        // First, test with remove_trailing_whitespace_on_save enabled
-        cx.update(|cx| {
-            SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |settings| {
-                    settings
-                        .project
-                        .all_languages
-                        .defaults
-                        .remove_trailing_whitespace_on_save = Some(true);
-                });
-            });
-        });
-
-        const CONTENT_WITH_TRAILING_WHITESPACE: &str =
-            "fn main() {  \n    println!(\"Hello!\");  \n}\n";
-
-        // Have the model stream content that contains trailing whitespace
-        let edit_result = {
-            let edit_task = cx.update(|cx| {
-                let input = EditFileToolInput {
-                    display_description: "Create main function".into(),
-                    path: "root/src/main.rs".into(),
-                    mode: EditFileMode::Overwrite,
-                };
-                Arc::new(EditFileTool::new(
-                    project.clone(),
-                    thread.downgrade(),
-                    language_registry.clone(),
-                    Templates::new(),
-                ))
-                .run(input, ToolCallEventStream::test().0, cx)
-            });
-
-            // Stream the content with trailing whitespace
-            cx.executor().run_until_parked();
-            model.send_last_completion_stream_text_chunk(
-                CONTENT_WITH_TRAILING_WHITESPACE.to_string(),
-            );
-            model.end_last_completion_stream();
-
-            edit_task.await
-        };
-        assert!(edit_result.is_ok());
-
-        // Wait for any async operations (e.g. formatting) to complete
-        cx.executor().run_until_parked();
-
-        // Read the file to verify trailing whitespace was removed automatically
-        assert_eq!(
-            // Ignore carriage returns on Windows
-            fs.load(path!("/root/src/main.rs").as_ref())
-                .await
-                .unwrap()
-                .replace("\r\n", "\n"),
-            "fn main() {\n    println!(\"Hello!\");\n}\n",
-            "Trailing whitespace should be removed when remove_trailing_whitespace_on_save is enabled"
-        );
-
-        // Next, test with remove_trailing_whitespace_on_save disabled
-        cx.update(|cx| {
-            SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |settings| {
-                    settings
-                        .project
-                        .all_languages
-                        .defaults
-                        .remove_trailing_whitespace_on_save = Some(false);
-                });
-            });
-        });
-
-        // Stream edits again with trailing whitespace
-        let edit_result = {
-            let edit_task = cx.update(|cx| {
-                let input = EditFileToolInput {
-                    display_description: "Update main function".into(),
-                    path: "root/src/main.rs".into(),
-                    mode: EditFileMode::Overwrite,
-                };
-                Arc::new(EditFileTool::new(
-                    project.clone(),
-                    thread.downgrade(),
-                    language_registry,
-                    Templates::new(),
-                ))
-                .run(input, ToolCallEventStream::test().0, cx)
-            });
-
-            // Stream the content with trailing whitespace
-            cx.executor().run_until_parked();
-            model.send_last_completion_stream_text_chunk(
-                CONTENT_WITH_TRAILING_WHITESPACE.to_string(),
-            );
-            model.end_last_completion_stream();
-
-            edit_task.await
-        };
-        assert!(edit_result.is_ok());
-
-        // Wait for any async operations (e.g. formatting) to complete
-        cx.executor().run_until_parked();
-
-        // Verify the file still has trailing whitespace
-        // Read the file again - it should still have trailing whitespace
-        let final_content = fs.load(path!("/root/src/main.rs").as_ref()).await.unwrap();
-        assert_eq!(
-            // Ignore carriage returns on Windows
-            final_content.replace("\r\n", "\n"),
-            CONTENT_WITH_TRAILING_WHITESPACE,
-            "Trailing whitespace should remain when remove_trailing_whitespace_on_save is disabled"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_authorize(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = project::FakeFs::new(cx.executor());
-        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-        let context_server_registry =
-            cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
-        let language_registry = project.read_with(cx, |project, _cx| project.languages().clone());
-        let model = Arc::new(FakeLanguageModel::default());
-        let thread = cx.new(|cx| {
-            Thread::new(
-                project.clone(),
-                cx.new(|_cx| ProjectContext::default()),
-                context_server_registry,
-                Templates::new(),
-                Some(model.clone()),
-                cx,
-            )
-        });
-        let tool = Arc::new(EditFileTool::new(
-            project.clone(),
-            thread.downgrade(),
-            language_registry,
-            Templates::new(),
-        ));
-        fs.insert_tree("/root", json!({})).await;
-
-        // Test 1: Path with .zed component should require confirmation
-        let (stream_tx, mut stream_rx) = ToolCallEventStream::test();
-        let _auth = cx.update(|cx| {
-            tool.authorize(
-                &EditFileToolInput {
-                    display_description: "test 1".into(),
-                    path: ".zed/settings.json".into(),
-                    mode: EditFileMode::Edit,
-                },
-                &stream_tx,
-                cx,
-            )
-        });
-
-        let event = stream_rx.expect_authorization().await;
-        assert_eq!(
-            event.tool_call.fields.title,
-            Some("test 1 (local settings)".into())
-        );
-
-        // Test 2: Path outside project should require confirmation
-        let (stream_tx, mut stream_rx) = ToolCallEventStream::test();
-        let _auth = cx.update(|cx| {
-            tool.authorize(
-                &EditFileToolInput {
-                    display_description: "test 2".into(),
-                    path: "/etc/hosts".into(),
-                    mode: EditFileMode::Edit,
-                },
-                &stream_tx,
-                cx,
-            )
-        });
-
-        let event = stream_rx.expect_authorization().await;
-        assert_eq!(event.tool_call.fields.title, Some("test 2".into()));
-
-        // Test 3: Relative path without .zed should not require confirmation
-        let (stream_tx, mut stream_rx) = ToolCallEventStream::test();
-        cx.update(|cx| {
-            tool.authorize(
-                &EditFileToolInput {
-                    display_description: "test 3".into(),
-                    path: "root/src/main.rs".into(),
-                    mode: EditFileMode::Edit,
-                },
-                &stream_tx,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-        assert!(stream_rx.try_next().is_err());
-
-        // Test 4: Path with .zed in the middle should require confirmation
-        let (stream_tx, mut stream_rx) = ToolCallEventStream::test();
-        let _auth = cx.update(|cx| {
-            tool.authorize(
-                &EditFileToolInput {
-                    display_description: "test 4".into(),
-                    path: "root/.zed/tasks.json".into(),
-                    mode: EditFileMode::Edit,
-                },
-                &stream_tx,
-                cx,
-            )
-        });
-        let event = stream_rx.expect_authorization().await;
-        assert_eq!(
-            event.tool_call.fields.title,
-            Some("test 4 (local settings)".into())
-        );
-
-        // Test 5: When always_allow_tool_actions is enabled, no confirmation needed
-        cx.update(|cx| {
-            let mut settings = agent_settings::AgentSettings::get_global(cx).clone();
-            settings.always_allow_tool_actions = true;
-            agent_settings::AgentSettings::override_global(settings, cx);
-        });
-
-        let (stream_tx, mut stream_rx) = ToolCallEventStream::test();
-        cx.update(|cx| {
-            tool.authorize(
-                &EditFileToolInput {
-                    display_description: "test 5.1".into(),
-                    path: ".zed/settings.json".into(),
-                    mode: EditFileMode::Edit,
-                },
-                &stream_tx,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-        assert!(stream_rx.try_next().is_err());
-
-        let (stream_tx, mut stream_rx) = ToolCallEventStream::test();
-        cx.update(|cx| {
-            tool.authorize(
-                &EditFileToolInput {
-                    display_description: "test 5.2".into(),
-                    path: "/etc/hosts".into(),
-                    mode: EditFileMode::Edit,
-                },
-                &stream_tx,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-        assert!(stream_rx.try_next().is_err());
-    }
-
-    #[gpui::test]
-    async fn test_authorize_global_config(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = project::FakeFs::new(cx.executor());
-        fs.insert_tree("/project", json!({})).await;
-        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
-        let language_registry = project.read_with(cx, |project, _cx| project.languages().clone());
-        let context_server_registry =
-            cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
-        let model = Arc::new(FakeLanguageModel::default());
-        let thread = cx.new(|cx| {
-            Thread::new(
-                project.clone(),
-                cx.new(|_cx| ProjectContext::default()),
-                context_server_registry,
-                Templates::new(),
-                Some(model.clone()),
-                cx,
-            )
-        });
-        let tool = Arc::new(EditFileTool::new(
-            project.clone(),
-            thread.downgrade(),
-            language_registry,
-            Templates::new(),
-        ));
-
-        // Test global config paths - these should require confirmation if they exist and are outside the project
-        let test_cases = vec![
-            (
-                "/etc/hosts",
-                true,
-                "System file should require confirmation",
-            ),
-            (
-                "/usr/local/bin/script",
-                true,
-                "System bin file should require confirmation",
-            ),
-            (
-                "project/normal_file.rs",
-                false,
-                "Normal project file should not require confirmation",
-            ),
-        ];
-
-        for (path, should_confirm, description) in test_cases {
-            let (stream_tx, mut stream_rx) = ToolCallEventStream::test();
-            let auth = cx.update(|cx| {
-                tool.authorize(
-                    &EditFileToolInput {
-                        display_description: "Edit file".into(),
-                        path: path.into(),
-                        mode: EditFileMode::Edit,
-                    },
-                    &stream_tx,
-                    cx,
-                )
-            });
-
-            if should_confirm {
-                stream_rx.expect_authorization().await;
-            } else {
-                auth.await.unwrap();
-                assert!(
-                    stream_rx.try_next().is_err(),
-                    "Failed for case: {} - path: {} - expected no confirmation but got one",
-                    description,
-                    path
-                );
-            }
-        }
-    }
-
-    #[gpui::test]
-    async fn test_needs_confirmation_with_multiple_worktrees(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = project::FakeFs::new(cx.executor());
-
-        // Create multiple worktree directories
-        fs.insert_tree(
-            "/workspace/frontend",
-            json!({
-                "src": {
-                    "main.js": "console.log('frontend');"
-                }
-            }),
-        )
-        .await;
-        fs.insert_tree(
-            "/workspace/backend",
-            json!({
-                "src": {
-                    "main.rs": "fn main() {}"
-                }
-            }),
-        )
-        .await;
-        fs.insert_tree(
-            "/workspace/shared",
-            json!({
-                ".zed": {
-                    "settings.json": "{}"
-                }
-            }),
-        )
-        .await;
-
-        // Create project with multiple worktrees
-        let project = Project::test(
-            fs.clone(),
-            [
-                path!("/workspace/frontend").as_ref(),
-                path!("/workspace/backend").as_ref(),
-                path!("/workspace/shared").as_ref(),
-            ],
-            cx,
-        )
-        .await;
-        let language_registry = project.read_with(cx, |project, _cx| project.languages().clone());
-        let context_server_registry =
-            cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
-        let model = Arc::new(FakeLanguageModel::default());
-        let thread = cx.new(|cx| {
-            Thread::new(
-                project.clone(),
-                cx.new(|_cx| ProjectContext::default()),
-                context_server_registry.clone(),
-                Templates::new(),
-                Some(model.clone()),
-                cx,
-            )
-        });
-        let tool = Arc::new(EditFileTool::new(
-            project.clone(),
-            thread.downgrade(),
-            language_registry,
-            Templates::new(),
-        ));
-
-        // Test files in different worktrees
-        let test_cases = vec![
-            ("frontend/src/main.js", false, "File in first worktree"),
-            ("backend/src/main.rs", false, "File in second worktree"),
-            (
-                "shared/.zed/settings.json",
-                true,
-                ".zed file in third worktree",
-            ),
-            ("/etc/hosts", true, "Absolute path outside all worktrees"),
-            (
-                "../outside/file.txt",
-                true,
-                "Relative path outside worktrees",
-            ),
-        ];
-
-        for (path, should_confirm, description) in test_cases {
-            let (stream_tx, mut stream_rx) = ToolCallEventStream::test();
-            let auth = cx.update(|cx| {
-                tool.authorize(
-                    &EditFileToolInput {
-                        display_description: "Edit file".into(),
-                        path: path.into(),
-                        mode: EditFileMode::Edit,
-                    },
-                    &stream_tx,
-                    cx,
-                )
-            });
-
-            if should_confirm {
-                stream_rx.expect_authorization().await;
-            } else {
-                auth.await.unwrap();
-                assert!(
-                    stream_rx.try_next().is_err(),
-                    "Failed for case: {} - path: {} - expected no confirmation but got one",
-                    description,
-                    path
-                );
-            }
-        }
-    }
-
-    #[gpui::test]
-    async fn test_needs_confirmation_edge_cases(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = project::FakeFs::new(cx.executor());
-        fs.insert_tree(
-            "/project",
-            json!({
-                ".zed": {
-                    "settings.json": "{}"
-                },
-                "src": {
-                    ".zed": {
-                        "local.json": "{}"
-                    }
-                }
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
-        let language_registry = project.read_with(cx, |project, _cx| project.languages().clone());
-        let context_server_registry =
-            cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
-        let model = Arc::new(FakeLanguageModel::default());
-        let thread = cx.new(|cx| {
-            Thread::new(
-                project.clone(),
-                cx.new(|_cx| ProjectContext::default()),
-                context_server_registry.clone(),
-                Templates::new(),
-                Some(model.clone()),
-                cx,
-            )
-        });
-        let tool = Arc::new(EditFileTool::new(
-            project.clone(),
-            thread.downgrade(),
-            language_registry,
-            Templates::new(),
-        ));
-
-        // Test edge cases
-        let test_cases = vec![
-            // Empty path - find_project_path returns Some for empty paths
-            ("", false, "Empty path is treated as project root"),
-            // Root directory
-            ("/", true, "Root directory should be outside project"),
-            // Parent directory references - find_project_path resolves these
-            (
-                "project/../other",
-                true,
-                "Path with .. that goes outside of root directory",
-            ),
-            (
-                "project/./src/file.rs",
-                false,
-                "Path with . should work normally",
-            ),
-            // Windows-style paths (if on Windows)
-            #[cfg(target_os = "windows")]
-            ("C:\\Windows\\System32\\hosts", true, "Windows system path"),
-            #[cfg(target_os = "windows")]
-            ("project\\src\\main.rs", false, "Windows-style project path"),
-        ];
-
-        for (path, should_confirm, description) in test_cases {
-            let (stream_tx, mut stream_rx) = ToolCallEventStream::test();
-            let auth = cx.update(|cx| {
-                tool.authorize(
-                    &EditFileToolInput {
-                        display_description: "Edit file".into(),
-                        path: path.into(),
-                        mode: EditFileMode::Edit,
-                    },
-                    &stream_tx,
-                    cx,
-                )
-            });
-
-            cx.run_until_parked();
-
-            if should_confirm {
-                stream_rx.expect_authorization().await;
-            } else {
-                assert!(
-                    stream_rx.try_next().is_err(),
-                    "Failed for case: {} - path: {} - expected no confirmation but got one",
-                    description,
-                    path
-                );
-                auth.await.unwrap();
-            }
-        }
-    }
-
-    #[gpui::test]
-    async fn test_needs_confirmation_with_different_modes(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = project::FakeFs::new(cx.executor());
-        fs.insert_tree(
-            "/project",
-            json!({
-                "existing.txt": "content",
-                ".zed": {
-                    "settings.json": "{}"
-                }
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
-        let language_registry = project.read_with(cx, |project, _cx| project.languages().clone());
-        let context_server_registry =
-            cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
-        let model = Arc::new(FakeLanguageModel::default());
-        let thread = cx.new(|cx| {
-            Thread::new(
-                project.clone(),
-                cx.new(|_cx| ProjectContext::default()),
-                context_server_registry.clone(),
-                Templates::new(),
-                Some(model.clone()),
-                cx,
-            )
-        });
-        let tool = Arc::new(EditFileTool::new(
-            project.clone(),
-            thread.downgrade(),
-            language_registry,
-            Templates::new(),
-        ));
-
-        // Test different EditFileMode values
-        let modes = vec![
-            EditFileMode::Edit,
-            EditFileMode::Create,
-            EditFileMode::Overwrite,
-        ];
-
-        for mode in modes {
-            // Test .zed path with different modes
-            let (stream_tx, mut stream_rx) = ToolCallEventStream::test();
-            let _auth = cx.update(|cx| {
-                tool.authorize(
-                    &EditFileToolInput {
-                        display_description: "Edit settings".into(),
-                        path: "project/.zed/settings.json".into(),
-                        mode: mode.clone(),
-                    },
-                    &stream_tx,
-                    cx,
-                )
-            });
-
-            stream_rx.expect_authorization().await;
-
-            // Test outside path with different modes
-            let (stream_tx, mut stream_rx) = ToolCallEventStream::test();
-            let _auth = cx.update(|cx| {
-                tool.authorize(
-                    &EditFileToolInput {
-                        display_description: "Edit file".into(),
-                        path: "/outside/file.txt".into(),
-                        mode: mode.clone(),
-                    },
-                    &stream_tx,
-                    cx,
-                )
-            });
-
-            stream_rx.expect_authorization().await;
-
-            // Test normal path with different modes
-            let (stream_tx, mut stream_rx) = ToolCallEventStream::test();
-            cx.update(|cx| {
-                tool.authorize(
-                    &EditFileToolInput {
-                        display_description: "Edit file".into(),
-                        path: "project/normal.txt".into(),
-                        mode: mode.clone(),
-                    },
-                    &stream_tx,
-                    cx,
-                )
-            })
-            .await
-            .unwrap();
-            assert!(stream_rx.try_next().is_err());
-        }
-    }
-
-    #[gpui::test]
-    async fn test_initial_title_with_partial_input(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = project::FakeFs::new(cx.executor());
-        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
-        let language_registry = project.read_with(cx, |project, _cx| project.languages().clone());
-        let context_server_registry =
-            cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
-        let model = Arc::new(FakeLanguageModel::default());
-        let thread = cx.new(|cx| {
-            Thread::new(
-                project.clone(),
-                cx.new(|_cx| ProjectContext::default()),
-                context_server_registry,
-                Templates::new(),
-                Some(model.clone()),
-                cx,
-            )
-        });
-        let tool = Arc::new(EditFileTool::new(
-            project,
-            thread.downgrade(),
-            language_registry,
-            Templates::new(),
-        ));
-
-        cx.update(|cx| {
-            // ...
-            assert_eq!(
-                tool.initial_title(
-                    Err(json!({
-                        "path": "src/main.rs",
-                        "display_description": "",
-                        "old_string": "old code",
-                        "new_string": "new code"
-                    })),
-                    cx
-                ),
-                "src/main.rs"
-            );
-            assert_eq!(
-                tool.initial_title(
-                    Err(json!({
-                        "path": "",
-                        "display_description": "Fix error handling",
-                        "old_string": "old code",
-                        "new_string": "new code"
-                    })),
-                    cx
-                ),
-                "Fix error handling"
-            );
-            assert_eq!(
-                tool.initial_title(
-                    Err(json!({
-                        "path": "src/main.rs",
-                        "display_description": "Fix error handling",
-                        "old_string": "old code",
-                        "new_string": "new code"
-                    })),
-                    cx
-                ),
-                "src/main.rs"
-            );
-            assert_eq!(
-                tool.initial_title(
-                    Err(json!({
-                        "path": "",
-                        "display_description": "",
-                        "old_string": "old code",
-                        "new_string": "new code"
-                    })),
-                    cx
-                ),
-                DEFAULT_UI_TEXT
-            );
-            assert_eq!(
-                tool.initial_title(Err(serde_json::Value::Null), cx),
-                DEFAULT_UI_TEXT
-            );
-        });
-    }
-
-    #[gpui::test]
-    async fn test_diff_finalization(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = project::FakeFs::new(cx.executor());
-        fs.insert_tree("/", json!({"main.rs": ""})).await;
-
-        let project = Project::test(fs.clone(), [path!("/").as_ref()], cx).await;
-        let languages = project.read_with(cx, |project, _cx| project.languages().clone());
-        let context_server_registry =
-            cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
-        let model = Arc::new(FakeLanguageModel::default());
-        let thread = cx.new(|cx| {
-            Thread::new(
-                project.clone(),
-                cx.new(|_cx| ProjectContext::default()),
-                context_server_registry.clone(),
-                Templates::new(),
-                Some(model.clone()),
-                cx,
-            )
-        });
-
-        // Ensure the diff is finalized after the edit completes.
-        {
-            let tool = Arc::new(EditFileTool::new(
-                project.clone(),
-                thread.downgrade(),
-                languages.clone(),
-                Templates::new(),
-            ));
-            let (stream_tx, mut stream_rx) = ToolCallEventStream::test();
-            let edit = cx.update(|cx| {
-                tool.run(
-                    EditFileToolInput {
-                        display_description: "Edit file".into(),
-                        path: path!("/main.rs").into(),
-                        mode: EditFileMode::Edit,
-                    },
-                    stream_tx,
-                    cx,
-                )
-            });
-            stream_rx.expect_update_fields().await;
-            let diff = stream_rx.expect_diff().await;
-            diff.read_with(cx, |diff, _| assert!(matches!(diff, Diff::Pending(_))));
-            cx.run_until_parked();
-            model.end_last_completion_stream();
-            edit.await.unwrap();
-            diff.read_with(cx, |diff, _| assert!(matches!(diff, Diff::Finalized(_))));
-        }
-
-        // Ensure the diff is finalized if an error occurs while editing.
-        {
-            model.forbid_requests();
-            let tool = Arc::new(EditFileTool::new(
-                project.clone(),
-                thread.downgrade(),
-                languages.clone(),
-                Templates::new(),
-            ));
-            let (stream_tx, mut stream_rx) = ToolCallEventStream::test();
-            let edit = cx.update(|cx| {
-                tool.run(
-                    EditFileToolInput {
-                        display_description: "Edit file".into(),
-                        path: path!("/main.rs").into(),
-                        mode: EditFileMode::Edit,
-                    },
-                    stream_tx,
-                    cx,
-                )
-            });
-            stream_rx.expect_update_fields().await;
-            let diff = stream_rx.expect_diff().await;
-            diff.read_with(cx, |diff, _| assert!(matches!(diff, Diff::Pending(_))));
-            edit.await.unwrap_err();
-            diff.read_with(cx, |diff, _| assert!(matches!(diff, Diff::Finalized(_))));
-            model.allow_requests();
-        }
-
-        // Ensure the diff is finalized if the tool call gets dropped.
-        {
-            let tool = Arc::new(EditFileTool::new(
-                project.clone(),
-                thread.downgrade(),
-                languages.clone(),
-                Templates::new(),
-            ));
-            let (stream_tx, mut stream_rx) = ToolCallEventStream::test();
-            let edit = cx.update(|cx| {
-                tool.run(
-                    EditFileToolInput {
-                        display_description: "Edit file".into(),
-                        path: path!("/main.rs").into(),
-                        mode: EditFileMode::Edit,
-                    },
-                    stream_tx,
-                    cx,
-                )
-            });
-            stream_rx.expect_update_fields().await;
-            let diff = stream_rx.expect_diff().await;
-            diff.read_with(cx, |diff, _| assert!(matches!(diff, Diff::Pending(_))));
-            drop(edit);
-            cx.run_until_parked();
-            diff.read_with(cx, |diff, _| assert!(matches!(diff, Diff::Finalized(_))));
-        }
-    }
-
-    #[gpui::test]
-    async fn test_file_read_times_tracking(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = project::FakeFs::new(cx.executor());
-        fs.insert_tree(
-            "/root",
-            json!({
-                "test.txt": "original content"
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-        let context_server_registry =
-            cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
-        let model = Arc::new(FakeLanguageModel::default());
-        let thread = cx.new(|cx| {
-            Thread::new(
-                project.clone(),
-                cx.new(|_cx| ProjectContext::default()),
-                context_server_registry,
-                Templates::new(),
-                Some(model.clone()),
-                cx,
-            )
-        });
-        let action_log = thread.read_with(cx, |thread, _| thread.action_log().clone());
-
-        // Initially, file_read_times should be empty
-        let is_empty = thread.read_with(cx, |thread, _| thread.file_read_times.is_empty());
-        assert!(is_empty, "file_read_times should start empty");
-
-        // Create read tool
-        let read_tool = Arc::new(crate::ReadFileTool::new(
-            thread.downgrade(),
-            project.clone(),
-            action_log,
-        ));
-
-        // Read the file to record the read time
-        cx.update(|cx| {
-            read_tool.clone().run(
-                crate::ReadFileToolInput {
-                    path: "root/test.txt".to_string(),
-                    start_line: None,
-                    end_line: None,
-                },
-                ToolCallEventStream::test().0,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-
-        // Verify that file_read_times now contains an entry for the file
-        let has_entry = thread.read_with(cx, |thread, _| {
-            thread.file_read_times.len() == 1
-                && thread
-                    .file_read_times
-                    .keys()
-                    .any(|path| path.ends_with("test.txt"))
-        });
-        assert!(
-            has_entry,
-            "file_read_times should contain an entry after reading the file"
-        );
-
-        // Read the file again - should update the entry
-        cx.update(|cx| {
-            read_tool.clone().run(
-                crate::ReadFileToolInput {
-                    path: "root/test.txt".to_string(),
-                    start_line: None,
-                    end_line: None,
-                },
-                ToolCallEventStream::test().0,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-
-        // Should still have exactly one entry
-        let has_one_entry = thread.read_with(cx, |thread, _| thread.file_read_times.len() == 1);
-        assert!(
-            has_one_entry,
-            "file_read_times should still have one entry after re-reading"
-        );
-    }
-
-    fn init_test(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-        });
-    }
-
-    #[gpui::test]
-    async fn test_consecutive_edits_work(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = project::FakeFs::new(cx.executor());
-        fs.insert_tree(
-            "/root",
-            json!({
-                "test.txt": "original content"
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-        let context_server_registry =
-            cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
-        let model = Arc::new(FakeLanguageModel::default());
-        let thread = cx.new(|cx| {
-            Thread::new(
-                project.clone(),
-                cx.new(|_cx| ProjectContext::default()),
-                context_server_registry,
-                Templates::new(),
-                Some(model.clone()),
-                cx,
-            )
-        });
-        let languages = project.read_with(cx, |project, _| project.languages().clone());
-        let action_log = thread.read_with(cx, |thread, _| thread.action_log().clone());
-
-        let read_tool = Arc::new(crate::ReadFileTool::new(
-            thread.downgrade(),
-            project.clone(),
-            action_log,
-        ));
-        let edit_tool = Arc::new(EditFileTool::new(
-            project.clone(),
-            thread.downgrade(),
-            languages,
-            Templates::new(),
-        ));
-
-        // Read the file first
-        cx.update(|cx| {
-            read_tool.clone().run(
-                crate::ReadFileToolInput {
-                    path: "root/test.txt".to_string(),
-                    start_line: None,
-                    end_line: None,
-                },
-                ToolCallEventStream::test().0,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-
-        // First edit should work
-        let edit_result = {
-            let edit_task = cx.update(|cx| {
-                edit_tool.clone().run(
-                    EditFileToolInput {
-                        display_description: "First edit".into(),
-                        path: "root/test.txt".into(),
-                        mode: EditFileMode::Edit,
-                    },
-                    ToolCallEventStream::test().0,
-                    cx,
-                )
-            });
-
-            cx.executor().run_until_parked();
-            model.send_last_completion_stream_text_chunk(
-                "<old_text>original content</old_text><new_text>modified content</new_text>"
-                    .to_string(),
-            );
-            model.end_last_completion_stream();
-
-            edit_task.await
-        };
-        assert!(
-            edit_result.is_ok(),
-            "First edit should succeed, got error: {:?}",
-            edit_result.as_ref().err()
-        );
-
-        // Second edit should also work because the edit updated the recorded read time
-        let edit_result = {
-            let edit_task = cx.update(|cx| {
-                edit_tool.clone().run(
-                    EditFileToolInput {
-                        display_description: "Second edit".into(),
-                        path: "root/test.txt".into(),
-                        mode: EditFileMode::Edit,
-                    },
-                    ToolCallEventStream::test().0,
-                    cx,
-                )
-            });
-
-            cx.executor().run_until_parked();
-            model.send_last_completion_stream_text_chunk(
-                "<old_text>modified content</old_text><new_text>further modified content</new_text>".to_string(),
-            );
-            model.end_last_completion_stream();
-
-            edit_task.await
-        };
-        assert!(
-            edit_result.is_ok(),
-            "Second consecutive edit should succeed, got error: {:?}",
-            edit_result.as_ref().err()
-        );
-    }
-
-    #[gpui::test]
-    async fn test_external_modification_detected(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = project::FakeFs::new(cx.executor());
-        fs.insert_tree(
-            "/root",
-            json!({
-                "test.txt": "original content"
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-        let context_server_registry =
-            cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
-        let model = Arc::new(FakeLanguageModel::default());
-        let thread = cx.new(|cx| {
-            Thread::new(
-                project.clone(),
-                cx.new(|_cx| ProjectContext::default()),
-                context_server_registry,
-                Templates::new(),
-                Some(model.clone()),
-                cx,
-            )
-        });
-        let languages = project.read_with(cx, |project, _| project.languages().clone());
-        let action_log = thread.read_with(cx, |thread, _| thread.action_log().clone());
-
-        let read_tool = Arc::new(crate::ReadFileTool::new(
-            thread.downgrade(),
-            project.clone(),
-            action_log,
-        ));
-        let edit_tool = Arc::new(EditFileTool::new(
-            project.clone(),
-            thread.downgrade(),
-            languages,
-            Templates::new(),
-        ));
-
-        // Read the file first
-        cx.update(|cx| {
-            read_tool.clone().run(
-                crate::ReadFileToolInput {
-                    path: "root/test.txt".to_string(),
-                    start_line: None,
-                    end_line: None,
-                },
-                ToolCallEventStream::test().0,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-
-        // Simulate external modification - advance time and save file
-        cx.background_executor
-            .advance_clock(std::time::Duration::from_secs(2));
-        fs.save(
-            path!("/root/test.txt").as_ref(),
-            &"externally modified content".into(),
-            language::LineEnding::Unix,
-        )
-        .await
-        .unwrap();
-
-        // Reload the buffer to pick up the new mtime
-        let project_path = project
-            .read_with(cx, |project, cx| {
-                project.find_project_path("root/test.txt", cx)
-            })
-            .expect("Should find project path");
-        let buffer = project
-            .update(cx, |project, cx| project.open_buffer(project_path, cx))
-            .await
-            .unwrap();
-        buffer
-            .update(cx, |buffer, cx| buffer.reload(cx))
-            .await
-            .unwrap();
-
-        cx.executor().run_until_parked();
-
-        // Try to edit - should fail because file was modified externally
-        let result = cx
-            .update(|cx| {
-                edit_tool.clone().run(
-                    EditFileToolInput {
-                        display_description: "Edit after external change".into(),
-                        path: "root/test.txt".into(),
-                        mode: EditFileMode::Edit,
-                    },
-                    ToolCallEventStream::test().0,
-                    cx,
-                )
-            })
-            .await;
-
-        assert!(
-            result.is_err(),
-            "Edit should fail after external modification"
-        );
-        let error_msg = result.unwrap_err().to_string();
-        assert!(
-            error_msg.contains("has been modified since you last read it"),
-            "Error should mention file modification, got: {}",
-            error_msg
-        );
-    }
-
-    #[gpui::test]
-    async fn test_dirty_buffer_detected(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = project::FakeFs::new(cx.executor());
-        fs.insert_tree(
-            "/root",
-            json!({
-                "test.txt": "original content"
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-        let context_server_registry =
-            cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
-        let model = Arc::new(FakeLanguageModel::default());
-        let thread = cx.new(|cx| {
-            Thread::new(
-                project.clone(),
-                cx.new(|_cx| ProjectContext::default()),
-                context_server_registry,
-                Templates::new(),
-                Some(model.clone()),
-                cx,
-            )
-        });
-        let languages = project.read_with(cx, |project, _| project.languages().clone());
-        let action_log = thread.read_with(cx, |thread, _| thread.action_log().clone());
-
-        let read_tool = Arc::new(crate::ReadFileTool::new(
-            thread.downgrade(),
-            project.clone(),
-            action_log,
-        ));
-        let edit_tool = Arc::new(EditFileTool::new(
-            project.clone(),
-            thread.downgrade(),
-            languages,
-            Templates::new(),
-        ));
-
-        // Read the file first
-        cx.update(|cx| {
-            read_tool.clone().run(
-                crate::ReadFileToolInput {
-                    path: "root/test.txt".to_string(),
-                    start_line: None,
-                    end_line: None,
-                },
-                ToolCallEventStream::test().0,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-
-        // Open the buffer and make it dirty by editing without saving
-        let project_path = project
-            .read_with(cx, |project, cx| {
-                project.find_project_path("root/test.txt", cx)
-            })
-            .expect("Should find project path");
-        let buffer = project
-            .update(cx, |project, cx| project.open_buffer(project_path, cx))
-            .await
-            .unwrap();
-
-        // Make an in-memory edit to the buffer (making it dirty)
-        buffer.update(cx, |buffer, cx| {
-            let end_point = buffer.max_point();
-            buffer.edit([(end_point..end_point, " added text")], None, cx);
-        });
-
-        // Verify buffer is dirty
-        let is_dirty = buffer.read_with(cx, |buffer, _| buffer.is_dirty());
-        assert!(is_dirty, "Buffer should be dirty after in-memory edit");
-
-        // Try to edit - should fail because buffer has unsaved changes
-        let result = cx
-            .update(|cx| {
-                edit_tool.clone().run(
-                    EditFileToolInput {
-                        display_description: "Edit with dirty buffer".into(),
-                        path: "root/test.txt".into(),
-                        mode: EditFileMode::Edit,
-                    },
-                    ToolCallEventStream::test().0,
-                    cx,
-                )
-            })
-            .await;
-
-        assert!(result.is_err(), "Edit should fail when buffer is dirty");
-        let error_msg = result.unwrap_err().to_string();
-        assert!(
-            error_msg.contains("cannot be written to because it has unsaved changes"),
-            "Error should mention unsaved changes, got: {}",
-            error_msg
-        );
-    }
-}
diff --git a/crates/agent/src/tools/fetch_tool.rs b/crates/agent/src/tools/fetch_tool.rs
deleted file mode 100644
index 60654ac863..0000000000
--- a/crates/agent/src/tools/fetch_tool.rs
+++ /dev/null
@@ -1,164 +0,0 @@
-use std::rc::Rc;
-use std::sync::Arc;
-use std::{borrow::Cow, cell::RefCell};
-
-use agent_client_protocol as acp;
-use anyhow::{Context as _, Result, bail};
-use futures::AsyncReadExt as _;
-use gpui::{App, AppContext as _, Task};
-use html_to_markdown::{TagHandler, convert_html_to_markdown, markdown};
-use http_client::{AsyncBody, HttpClientWithUrl};
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use ui::SharedString;
-use util::markdown::MarkdownEscaped;
-
-use crate::{AgentTool, ToolCallEventStream};
-
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
-enum ContentType {
-    Html,
-    Plaintext,
-    Json,
-}
-
-/// Fetches a URL and returns the content as Markdown.
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct FetchToolInput {
-    /// The URL to fetch.
-    url: String,
-}
-
-pub struct FetchTool {
-    http_client: Arc<HttpClientWithUrl>,
-}
-
-impl FetchTool {
-    pub fn new(http_client: Arc<HttpClientWithUrl>) -> Self {
-        Self { http_client }
-    }
-
-    async fn build_message(http_client: Arc<HttpClientWithUrl>, url: &str) -> Result<String> {
-        let url = if !url.starts_with("https://") && !url.starts_with("http://") {
-            Cow::Owned(format!("https://{url}"))
-        } else {
-            Cow::Borrowed(url)
-        };
-
-        let mut response = http_client.get(&url, AsyncBody::default(), true).await?;
-
-        let mut body = Vec::new();
-        response
-            .body_mut()
-            .read_to_end(&mut body)
-            .await
-            .context("error reading response body")?;
-
-        if response.status().is_client_error() {
-            let text = String::from_utf8_lossy(body.as_slice());
-            bail!(
-                "status error {}, response: {text:?}",
-                response.status().as_u16()
-            );
-        }
-
-        let Some(content_type) = response.headers().get("content-type") else {
-            bail!("missing Content-Type header");
-        };
-        let content_type = content_type
-            .to_str()
-            .context("invalid Content-Type header")?;
-
-        let content_type = if content_type.starts_with("text/plain") {
-            ContentType::Plaintext
-        } else if content_type.starts_with("application/json") {
-            ContentType::Json
-        } else {
-            ContentType::Html
-        };
-
-        match content_type {
-            ContentType::Html => {
-                let mut handlers: Vec<TagHandler> = vec![
-                    Rc::new(RefCell::new(markdown::WebpageChromeRemover)),
-                    Rc::new(RefCell::new(markdown::ParagraphHandler)),
-                    Rc::new(RefCell::new(markdown::HeadingHandler)),
-                    Rc::new(RefCell::new(markdown::ListHandler)),
-                    Rc::new(RefCell::new(markdown::TableHandler::new())),
-                    Rc::new(RefCell::new(markdown::StyledTextHandler)),
-                ];
-                if url.contains("wikipedia.org") {
-                    use html_to_markdown::structure::wikipedia;
-
-                    handlers.push(Rc::new(RefCell::new(wikipedia::WikipediaChromeRemover)));
-                    handlers.push(Rc::new(RefCell::new(wikipedia::WikipediaInfoboxHandler)));
-                    handlers.push(Rc::new(
-                        RefCell::new(wikipedia::WikipediaCodeHandler::new()),
-                    ));
-                } else {
-                    handlers.push(Rc::new(RefCell::new(markdown::CodeHandler)));
-                }
-
-                convert_html_to_markdown(&body[..], &mut handlers)
-            }
-            ContentType::Plaintext => Ok(std::str::from_utf8(&body)?.to_owned()),
-            ContentType::Json => {
-                let json: serde_json::Value = serde_json::from_slice(&body)?;
-
-                Ok(format!(
-                    "```json\n{}\n```",
-                    serde_json::to_string_pretty(&json)?
-                ))
-            }
-        }
-    }
-}
-
-impl AgentTool for FetchTool {
-    type Input = FetchToolInput;
-    type Output = String;
-
-    fn name() -> &'static str {
-        "fetch"
-    }
-
-    fn kind() -> acp::ToolKind {
-        acp::ToolKind::Fetch
-    }
-
-    fn initial_title(
-        &self,
-        input: Result<Self::Input, serde_json::Value>,
-        _cx: &mut App,
-    ) -> SharedString {
-        match input {
-            Ok(input) => format!("Fetch {}", MarkdownEscaped(&input.url)).into(),
-            Err(_) => "Fetch URL".into(),
-        }
-    }
-
-    fn run(
-        self: Arc<Self>,
-        input: Self::Input,
-        event_stream: ToolCallEventStream,
-        cx: &mut App,
-    ) -> Task<Result<Self::Output>> {
-        let authorize = event_stream.authorize(input.url.clone(), cx);
-
-        let text = cx.background_spawn({
-            let http_client = self.http_client.clone();
-            async move {
-                authorize.await?;
-                Self::build_message(http_client, &input.url).await
-            }
-        });
-
-        cx.foreground_executor().spawn(async move {
-            let text = text.await?;
-            if text.trim().is_empty() {
-                bail!("no textual content found");
-            }
-            Ok(text)
-        })
-    }
-}
diff --git a/crates/agent/src/tools/find_path_tool.rs b/crates/agent/src/tools/find_path_tool.rs
deleted file mode 100644
index 2a33b14b4c..0000000000
--- a/crates/agent/src/tools/find_path_tool.rs
+++ /dev/null
@@ -1,247 +0,0 @@
-use crate::{AgentTool, ToolCallEventStream};
-use agent_client_protocol as acp;
-use anyhow::{Result, anyhow};
-use gpui::{App, AppContext, Entity, SharedString, Task};
-use language_model::LanguageModelToolResultContent;
-use project::Project;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use std::fmt::Write;
-use std::{cmp, path::PathBuf, sync::Arc};
-use util::paths::PathMatcher;
-
-/// Fast file path pattern matching tool that works with any codebase size
-///
-/// - Supports glob patterns like "**/*.js" or "src/**/*.ts"
-/// - Returns matching file paths sorted alphabetically
-/// - Prefer the `grep` tool to this tool when searching for symbols unless you have specific information about paths.
-/// - Use this tool when you need to find files by name patterns
-/// - Results are paginated with 50 matches per page. Use the optional 'offset' parameter to request subsequent pages.
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct FindPathToolInput {
-    /// The glob to match against every path in the project.
-    ///
-    /// <example>
-    /// If the project has the following root directories:
-    ///
-    /// - directory1/a/something.txt
-    /// - directory2/a/things.txt
-    /// - directory3/a/other.txt
-    ///
-    /// You can get back the first two paths by providing a glob of "*thing*.txt"
-    /// </example>
-    pub glob: String,
-    /// Optional starting position for paginated results (0-based).
-    /// When not provided, starts from the beginning.
-    #[serde(default)]
-    pub offset: usize,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct FindPathToolOutput {
-    offset: usize,
-    current_matches_page: Vec<PathBuf>,
-    all_matches_len: usize,
-}
-
-impl From<FindPathToolOutput> for LanguageModelToolResultContent {
-    fn from(output: FindPathToolOutput) -> Self {
-        if output.current_matches_page.is_empty() {
-            "No matches found".into()
-        } else {
-            let mut llm_output = format!("Found {} total matches.", output.all_matches_len);
-            if output.all_matches_len > RESULTS_PER_PAGE {
-                write!(
-                    &mut llm_output,
-                    "\nShowing results {}-{} (provide 'offset' parameter for more results):",
-                    output.offset + 1,
-                    output.offset + output.current_matches_page.len()
-                )
-                .unwrap();
-            }
-
-            for mat in output.current_matches_page {
-                write!(&mut llm_output, "\n{}", mat.display()).unwrap();
-            }
-
-            llm_output.into()
-        }
-    }
-}
-
-const RESULTS_PER_PAGE: usize = 50;
-
-pub struct FindPathTool {
-    project: Entity<Project>,
-}
-
-impl FindPathTool {
-    pub fn new(project: Entity<Project>) -> Self {
-        Self { project }
-    }
-}
-
-impl AgentTool for FindPathTool {
-    type Input = FindPathToolInput;
-    type Output = FindPathToolOutput;
-
-    fn name() -> &'static str {
-        "find_path"
-    }
-
-    fn kind() -> acp::ToolKind {
-        acp::ToolKind::Search
-    }
-
-    fn initial_title(
-        &self,
-        input: Result<Self::Input, serde_json::Value>,
-        _cx: &mut App,
-    ) -> SharedString {
-        let mut title = "Find paths".to_string();
-        if let Ok(input) = input {
-            title.push_str(&format!(" matching “`{}`”", input.glob));
-        }
-        title.into()
-    }
-
-    fn run(
-        self: Arc<Self>,
-        input: Self::Input,
-        event_stream: ToolCallEventStream,
-        cx: &mut App,
-    ) -> Task<Result<FindPathToolOutput>> {
-        let search_paths_task = search_paths(&input.glob, self.project.clone(), cx);
-
-        cx.background_spawn(async move {
-            let matches = search_paths_task.await?;
-            let paginated_matches: &[PathBuf] = &matches[cmp::min(input.offset, matches.len())
-                ..cmp::min(input.offset + RESULTS_PER_PAGE, matches.len())];
-
-            event_stream.update_fields(
-                acp::ToolCallUpdateFields::new()
-                    .title(if paginated_matches.is_empty() {
-                        "No matches".into()
-                    } else if paginated_matches.len() == 1 {
-                        "1 match".into()
-                    } else {
-                        format!("{} matches", paginated_matches.len())
-                    })
-                    .content(
-                        paginated_matches
-                            .iter()
-                            .map(|path| {
-                                acp::ToolCallContent::Content(acp::Content::new(
-                                    acp::ContentBlock::ResourceLink(acp::ResourceLink::new(
-                                        path.to_string_lossy(),
-                                        format!("file://{}", path.display()),
-                                    )),
-                                ))
-                            })
-                            .collect::<Vec<_>>(),
-                    ),
-            );
-
-            Ok(FindPathToolOutput {
-                offset: input.offset,
-                current_matches_page: paginated_matches.to_vec(),
-                all_matches_len: matches.len(),
-            })
-        })
-    }
-}
-
-fn search_paths(glob: &str, project: Entity<Project>, cx: &mut App) -> Task<Result<Vec<PathBuf>>> {
-    let path_style = project.read(cx).path_style(cx);
-    let path_matcher = match PathMatcher::new(
-        [
-            // Sometimes models try to search for "". In this case, return all paths in the project.
-            if glob.is_empty() { "*" } else { glob },
-        ],
-        path_style,
-    ) {
-        Ok(matcher) => matcher,
-        Err(err) => return Task::ready(Err(anyhow!("Invalid glob: {err}"))),
-    };
-    let snapshots: Vec<_> = project
-        .read(cx)
-        .worktrees(cx)
-        .map(|worktree| worktree.read(cx).snapshot())
-        .collect();
-
-    cx.background_spawn(async move {
-        let mut results = Vec::new();
-        for snapshot in snapshots {
-            for entry in snapshot.entries(false, 0) {
-                if path_matcher.is_match(&snapshot.root_name().join(&entry.path)) {
-                    results.push(snapshot.absolutize(&entry.path));
-                }
-            }
-        }
-
-        Ok(results)
-    })
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use gpui::TestAppContext;
-    use project::{FakeFs, Project};
-    use settings::SettingsStore;
-    use util::path;
-
-    #[gpui::test]
-    async fn test_find_path_tool(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            "/root",
-            serde_json::json!({
-                "apple": {
-                    "banana": {
-                        "carrot": "1",
-                    },
-                    "bandana": {
-                        "carbonara": "2",
-                    },
-                    "endive": "3"
-                }
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-
-        let matches = cx
-            .update(|cx| search_paths("root/**/car*", project.clone(), cx))
-            .await
-            .unwrap();
-        assert_eq!(
-            matches,
-            &[
-                PathBuf::from(path!("/root/apple/banana/carrot")),
-                PathBuf::from(path!("/root/apple/bandana/carbonara"))
-            ]
-        );
-
-        let matches = cx
-            .update(|cx| search_paths("**/car*", project.clone(), cx))
-            .await
-            .unwrap();
-        assert_eq!(
-            matches,
-            &[
-                PathBuf::from(path!("/root/apple/banana/carrot")),
-                PathBuf::from(path!("/root/apple/bandana/carbonara"))
-            ]
-        );
-    }
-
-    fn init_test(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-        });
-    }
-}
diff --git a/crates/agent/src/tools/grep_tool.rs b/crates/agent/src/tools/grep_tool.rs
deleted file mode 100644
index 0caba91564..0000000000
--- a/crates/agent/src/tools/grep_tool.rs
+++ /dev/null
@@ -1,1183 +0,0 @@
-use crate::{AgentTool, ToolCallEventStream};
-use agent_client_protocol as acp;
-use anyhow::{Result, anyhow};
-use futures::StreamExt;
-use gpui::{App, Entity, SharedString, Task};
-use language::{OffsetRangeExt, ParseStatus, Point};
-use project::{
-    Project, WorktreeSettings,
-    search::{SearchQuery, SearchResult},
-};
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use settings::Settings;
-use std::{cmp, fmt::Write, sync::Arc};
-use util::RangeExt;
-use util::markdown::MarkdownInlineCode;
-use util::paths::PathMatcher;
-
-/// Searches the contents of files in the project with a regular expression
-///
-/// - Prefer this tool to path search when searching for symbols in the project, because you won't need to guess what path it's in.
-/// - Supports full regex syntax (eg. "log.*Error", "function\\s+\\w+", etc.)
-/// - Pass an `include_pattern` if you know how to narrow your search on the files system
-/// - Never use this tool to search for paths. Only search file contents with this tool.
-/// - Use this tool when you need to find files containing specific patterns
-/// - Results are paginated with 20 matches per page. Use the optional 'offset' parameter to request subsequent pages.
-/// - DO NOT use HTML entities solely to escape characters in the tool parameters.
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct GrepToolInput {
-    /// A regex pattern to search for in the entire project. Note that the regex will be parsed by the Rust `regex` crate.
-    ///
-    /// Do NOT specify a path here! This will only be matched against the code **content**.
-    pub regex: String,
-    /// A glob pattern for the paths of files to include in the search.
-    /// Supports standard glob patterns like "**/*.rs" or "frontend/src/**/*.ts".
-    /// If omitted, all files in the project will be searched.
-    ///
-    /// The glob pattern is matched against the full path including the project root directory.
-    ///
-    /// <example>
-    /// If the project has the following root directories:
-    ///
-    /// - /a/b/backend
-    /// - /c/d/frontend
-    ///
-    /// Use "backend/**/*.rs" to search only Rust files in the backend root directory.
-    /// Use "frontend/src/**/*.ts" to search TypeScript files only in the frontend root directory (sub-directory "src").
-    /// Use "**/*.rs" to search Rust files across all root directories.
-    /// </example>
-    pub include_pattern: Option<String>,
-    /// Optional starting position for paginated results (0-based).
-    /// When not provided, starts from the beginning.
-    #[serde(default)]
-    pub offset: u32,
-    /// Whether the regex is case-sensitive. Defaults to false (case-insensitive).
-    #[serde(default)]
-    pub case_sensitive: bool,
-}
-
-impl GrepToolInput {
-    /// Which page of search results this is.
-    pub fn page(&self) -> u32 {
-        1 + (self.offset / RESULTS_PER_PAGE)
-    }
-}
-
-const RESULTS_PER_PAGE: u32 = 20;
-
-pub struct GrepTool {
-    project: Entity<Project>,
-}
-
-impl GrepTool {
-    pub fn new(project: Entity<Project>) -> Self {
-        Self { project }
-    }
-}
-
-impl AgentTool for GrepTool {
-    type Input = GrepToolInput;
-    type Output = String;
-
-    fn name() -> &'static str {
-        "grep"
-    }
-
-    fn kind() -> acp::ToolKind {
-        acp::ToolKind::Search
-    }
-
-    fn initial_title(
-        &self,
-        input: Result<Self::Input, serde_json::Value>,
-        _cx: &mut App,
-    ) -> SharedString {
-        match input {
-            Ok(input) => {
-                let page = input.page();
-                let regex_str = MarkdownInlineCode(&input.regex);
-                let case_info = if input.case_sensitive {
-                    " (case-sensitive)"
-                } else {
-                    ""
-                };
-
-                if page > 1 {
-                    format!("Get page {page} of search results for regex {regex_str}{case_info}")
-                } else {
-                    format!("Search files for regex {regex_str}{case_info}")
-                }
-            }
-            Err(_) => "Search with regex".into(),
-        }
-        .into()
-    }
-
-    fn run(
-        self: Arc<Self>,
-        input: Self::Input,
-        _event_stream: ToolCallEventStream,
-        cx: &mut App,
-    ) -> Task<Result<Self::Output>> {
-        const CONTEXT_LINES: u32 = 2;
-        const MAX_ANCESTOR_LINES: u32 = 10;
-
-        let path_style = self.project.read(cx).path_style(cx);
-
-        let include_matcher = match PathMatcher::new(
-            input
-                .include_pattern
-                .as_ref()
-                .into_iter()
-                .collect::<Vec<_>>(),
-            path_style,
-        ) {
-            Ok(matcher) => matcher,
-            Err(error) => {
-                return Task::ready(Err(anyhow!("invalid include glob pattern: {error}")));
-            }
-        };
-
-        // Exclude global file_scan_exclusions and private_files settings
-        let exclude_matcher = {
-            let global_settings = WorktreeSettings::get_global(cx);
-            let exclude_patterns = global_settings
-                .file_scan_exclusions
-                .sources()
-                .chain(global_settings.private_files.sources());
-
-            match PathMatcher::new(exclude_patterns, path_style) {
-                Ok(matcher) => matcher,
-                Err(error) => {
-                    return Task::ready(Err(anyhow!("invalid exclude pattern: {error}")));
-                }
-            }
-        };
-
-        let query = match SearchQuery::regex(
-            &input.regex,
-            false,
-            input.case_sensitive,
-            false,
-            false,
-            include_matcher,
-            exclude_matcher,
-            true, // Always match file include pattern against *full project paths* that start with a project root.
-            None,
-        ) {
-            Ok(query) => query,
-            Err(error) => return Task::ready(Err(error)),
-        };
-
-        let results = self
-            .project
-            .update(cx, |project, cx| project.search(query, cx));
-
-        let project = self.project.downgrade();
-        cx.spawn(async move |cx|  {
-            futures::pin_mut!(results);
-
-            let mut output = String::new();
-            let mut skips_remaining = input.offset;
-            let mut matches_found = 0;
-            let mut has_more_matches = false;
-
-            'outer: while let Some(SearchResult::Buffer { buffer, ranges }) = results.next().await {
-                if ranges.is_empty() {
-                    continue;
-                }
-
-                let Ok((Some(path), mut parse_status)) = buffer.read_with(cx, |buffer, cx| {
-                    (buffer.file().map(|file| file.full_path(cx)), buffer.parse_status())
-                }) else {
-                    continue;
-                };
-
-                // Check if this file should be excluded based on its worktree settings
-                if let Ok(Some(project_path)) = project.read_with(cx, |project, cx| {
-                    project.find_project_path(&path, cx)
-                })
-                    && cx.update(|cx| {
-                        let worktree_settings = WorktreeSettings::get(Some((&project_path).into()), cx);
-                        worktree_settings.is_path_excluded(&project_path.path)
-                            || worktree_settings.is_path_private(&project_path.path)
-                    }).unwrap_or(false) {
-                        continue;
-                    }
-
-                while *parse_status.borrow() != ParseStatus::Idle {
-                    parse_status.changed().await?;
-                }
-
-                let snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot())?;
-
-                let mut ranges = ranges
-                    .into_iter()
-                    .map(|range| {
-                        let matched = range.to_point(&snapshot);
-                        let matched_end_line_len = snapshot.line_len(matched.end.row);
-                        let full_lines = Point::new(matched.start.row, 0)..Point::new(matched.end.row, matched_end_line_len);
-                        let symbols = snapshot.symbols_containing(matched.start, None);
-
-                        if let Some(ancestor_node) = snapshot.syntax_ancestor(full_lines.clone()) {
-                            let full_ancestor_range = ancestor_node.byte_range().to_point(&snapshot);
-                            let end_row = full_ancestor_range.end.row.min(full_ancestor_range.start.row + MAX_ANCESTOR_LINES);
-                            let end_col = snapshot.line_len(end_row);
-                            let capped_ancestor_range = Point::new(full_ancestor_range.start.row, 0)..Point::new(end_row, end_col);
-
-                            if capped_ancestor_range.contains_inclusive(&full_lines) {
-                                return (capped_ancestor_range, Some(full_ancestor_range), symbols)
-                            }
-                        }
-
-                        let mut matched = matched;
-                        matched.start.column = 0;
-                        matched.start.row =
-                            matched.start.row.saturating_sub(CONTEXT_LINES);
-                        matched.end.row = cmp::min(
-                            snapshot.max_point().row,
-                            matched.end.row + CONTEXT_LINES,
-                        );
-                        matched.end.column = snapshot.line_len(matched.end.row);
-
-                        (matched, None, symbols)
-                    })
-                    .peekable();
-
-                let mut file_header_written = false;
-
-                while let Some((mut range, ancestor_range, parent_symbols)) = ranges.next(){
-                    if skips_remaining > 0 {
-                        skips_remaining -= 1;
-                        continue;
-                    }
-
-                    // We'd already found a full page of matches, and we just found one more.
-                    if matches_found >= RESULTS_PER_PAGE {
-                        has_more_matches = true;
-                        break 'outer;
-                    }
-
-                    while let Some((next_range, _, _)) = ranges.peek() {
-                        if range.end.row >= next_range.start.row {
-                            range.end = next_range.end;
-                            ranges.next();
-                        } else {
-                            break;
-                        }
-                    }
-
-                    if !file_header_written {
-                        writeln!(output, "\n## Matches in {}", path.display())?;
-                        file_header_written = true;
-                    }
-
-                    let end_row = range.end.row;
-                    output.push_str("\n### ");
-
-                    for symbol in parent_symbols {
-                        write!(output, "{} › ", symbol.text)?;
-                    }
-
-                    if range.start.row == end_row {
-                        writeln!(output, "L{}", range.start.row + 1)?;
-                    } else {
-                        writeln!(output, "L{}-{}", range.start.row + 1, end_row + 1)?;
-                    }
-
-                    output.push_str("```\n");
-                    output.extend(snapshot.text_for_range(range));
-                    output.push_str("\n```\n");
-
-                    if let Some(ancestor_range) = ancestor_range
-                        && end_row < ancestor_range.end.row {
-                            let remaining_lines = ancestor_range.end.row - end_row;
-                            writeln!(output, "\n{} lines remaining in ancestor node. Read the file to see all.", remaining_lines)?;
-                        }
-
-                    matches_found += 1;
-                }
-            }
-
-            if matches_found == 0 {
-                Ok("No matches found".into())
-            } else if has_more_matches {
-                Ok(format!(
-                    "Showing matches {}-{} (there were more matches found; use offset: {} to see next page):\n{output}",
-                    input.offset + 1,
-                    input.offset + matches_found,
-                    input.offset + RESULTS_PER_PAGE,
-                ))
-            } else {
-                Ok(format!("Found {matches_found} matches:\n{output}"))
-            }
-        })
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::ToolCallEventStream;
-
-    use super::*;
-    use gpui::{TestAppContext, UpdateGlobal};
-    use project::{FakeFs, Project};
-    use serde_json::json;
-    use settings::SettingsStore;
-    use unindent::Unindent;
-    use util::path;
-
-    #[gpui::test]
-    async fn test_grep_tool_with_include_pattern(cx: &mut TestAppContext) {
-        init_test(cx);
-        cx.executor().allow_parking();
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/root"),
-            serde_json::json!({
-                "src": {
-                    "main.rs": "fn main() {\n    println!(\"Hello, world!\");\n}",
-                    "utils": {
-                        "helper.rs": "fn helper() {\n    println!(\"I'm a helper!\");\n}",
-                    },
-                },
-                "tests": {
-                    "test_main.rs": "fn test_main() {\n    assert!(true);\n}",
-                }
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-
-        // Test with include pattern for Rust files inside the root of the project
-        let input = GrepToolInput {
-            regex: "println".to_string(),
-            include_pattern: Some("root/**/*.rs".to_string()),
-            offset: 0,
-            case_sensitive: false,
-        };
-
-        let result = run_grep_tool(input, project.clone(), cx).await;
-        assert!(result.contains("main.rs"), "Should find matches in main.rs");
-        assert!(
-            result.contains("helper.rs"),
-            "Should find matches in helper.rs"
-        );
-        assert!(
-            !result.contains("test_main.rs"),
-            "Should not include test_main.rs even though it's a .rs file (because it doesn't have the pattern)"
-        );
-
-        // Test with include pattern for src directory only
-        let input = GrepToolInput {
-            regex: "fn".to_string(),
-            include_pattern: Some("root/**/src/**".to_string()),
-            offset: 0,
-            case_sensitive: false,
-        };
-
-        let result = run_grep_tool(input, project.clone(), cx).await;
-        assert!(
-            result.contains("main.rs"),
-            "Should find matches in src/main.rs"
-        );
-        assert!(
-            result.contains("helper.rs"),
-            "Should find matches in src/utils/helper.rs"
-        );
-        assert!(
-            !result.contains("test_main.rs"),
-            "Should not include test_main.rs as it's not in src directory"
-        );
-
-        // Test with empty include pattern (should default to all files)
-        let input = GrepToolInput {
-            regex: "fn".to_string(),
-            include_pattern: None,
-            offset: 0,
-            case_sensitive: false,
-        };
-
-        let result = run_grep_tool(input, project.clone(), cx).await;
-        assert!(result.contains("main.rs"), "Should find matches in main.rs");
-        assert!(
-            result.contains("helper.rs"),
-            "Should find matches in helper.rs"
-        );
-        assert!(
-            result.contains("test_main.rs"),
-            "Should include test_main.rs"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_grep_tool_with_case_sensitivity(cx: &mut TestAppContext) {
-        init_test(cx);
-        cx.executor().allow_parking();
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/root"),
-            serde_json::json!({
-                "case_test.txt": "This file has UPPERCASE and lowercase text.\nUPPERCASE patterns should match only with case_sensitive: true",
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-
-        // Test case-insensitive search (default)
-        let input = GrepToolInput {
-            regex: "uppercase".to_string(),
-            include_pattern: Some("**/*.txt".to_string()),
-            offset: 0,
-            case_sensitive: false,
-        };
-
-        let result = run_grep_tool(input, project.clone(), cx).await;
-        assert!(
-            result.contains("UPPERCASE"),
-            "Case-insensitive search should match uppercase"
-        );
-
-        // Test case-sensitive search
-        let input = GrepToolInput {
-            regex: "uppercase".to_string(),
-            include_pattern: Some("**/*.txt".to_string()),
-            offset: 0,
-            case_sensitive: true,
-        };
-
-        let result = run_grep_tool(input, project.clone(), cx).await;
-        assert!(
-            !result.contains("UPPERCASE"),
-            "Case-sensitive search should not match uppercase"
-        );
-
-        // Test case-sensitive search
-        let input = GrepToolInput {
-            regex: "LOWERCASE".to_string(),
-            include_pattern: Some("**/*.txt".to_string()),
-            offset: 0,
-            case_sensitive: true,
-        };
-
-        let result = run_grep_tool(input, project.clone(), cx).await;
-
-        assert!(
-            !result.contains("lowercase"),
-            "Case-sensitive search should match lowercase"
-        );
-
-        // Test case-sensitive search for lowercase pattern
-        let input = GrepToolInput {
-            regex: "lowercase".to_string(),
-            include_pattern: Some("**/*.txt".to_string()),
-            offset: 0,
-            case_sensitive: true,
-        };
-
-        let result = run_grep_tool(input, project.clone(), cx).await;
-        assert!(
-            result.contains("lowercase"),
-            "Case-sensitive search should match lowercase text"
-        );
-    }
-
-    /// Helper function to set up a syntax test environment
-    async fn setup_syntax_test(cx: &mut TestAppContext) -> Entity<Project> {
-        use unindent::Unindent;
-        init_test(cx);
-        cx.executor().allow_parking();
-
-        let fs = FakeFs::new(cx.executor());
-
-        // Create test file with syntax structures
-        fs.insert_tree(
-            path!("/root"),
-            serde_json::json!({
-                "test_syntax.rs": r#"
-                    fn top_level_function() {
-                        println!("This is at the top level");
-                    }
-
-                    mod feature_module {
-                        pub mod nested_module {
-                            pub fn nested_function(
-                                first_arg: String,
-                                second_arg: i32,
-                            ) {
-                                println!("Function in nested module");
-                                println!("{first_arg}");
-                                println!("{second_arg}");
-                            }
-                        }
-                    }
-
-                    struct MyStruct {
-                        field1: String,
-                        field2: i32,
-                    }
-
-                    impl MyStruct {
-                        fn method_with_block() {
-                            let condition = true;
-                            if condition {
-                                println!("Inside if block");
-                            }
-                        }
-
-                        fn long_function() {
-                            println!("Line 1");
-                            println!("Line 2");
-                            println!("Line 3");
-                            println!("Line 4");
-                            println!("Line 5");
-                            println!("Line 6");
-                            println!("Line 7");
-                            println!("Line 8");
-                            println!("Line 9");
-                            println!("Line 10");
-                            println!("Line 11");
-                            println!("Line 12");
-                        }
-                    }
-
-                    trait Processor {
-                        fn process(&self, input: &str) -> String;
-                    }
-
-                    impl Processor for MyStruct {
-                        fn process(&self, input: &str) -> String {
-                            format!("Processed: {}", input)
-                        }
-                    }
-                "#.unindent().trim(),
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-
-        project.update(cx, |project, _cx| {
-            project.languages().add(language::rust_lang())
-        });
-
-        project
-    }
-
-    #[gpui::test]
-    async fn test_grep_top_level_function(cx: &mut TestAppContext) {
-        let project = setup_syntax_test(cx).await;
-
-        // Test: Line at the top level of the file
-        let input = GrepToolInput {
-            regex: "This is at the top level".to_string(),
-            include_pattern: Some("**/*.rs".to_string()),
-            offset: 0,
-            case_sensitive: false,
-        };
-
-        let result = run_grep_tool(input, project.clone(), cx).await;
-        let expected = r#"
-            Found 1 matches:
-
-            ## Matches in root/test_syntax.rs
-
-            ### fn top_level_function › L1-3
-            ```
-            fn top_level_function() {
-                println!("This is at the top level");
-            }
-            ```
-            "#
-        .unindent();
-        assert_eq!(result, expected);
-    }
-
-    #[gpui::test]
-    async fn test_grep_function_body(cx: &mut TestAppContext) {
-        let project = setup_syntax_test(cx).await;
-
-        // Test: Line inside a function body
-        let input = GrepToolInput {
-            regex: "Function in nested module".to_string(),
-            include_pattern: Some("**/*.rs".to_string()),
-            offset: 0,
-            case_sensitive: false,
-        };
-
-        let result = run_grep_tool(input, project.clone(), cx).await;
-        let expected = r#"
-            Found 1 matches:
-
-            ## Matches in root/test_syntax.rs
-
-            ### mod feature_module › pub mod nested_module › pub fn nested_function › L10-14
-            ```
-                    ) {
-                        println!("Function in nested module");
-                        println!("{first_arg}");
-                        println!("{second_arg}");
-                    }
-            ```
-            "#
-        .unindent();
-        assert_eq!(result, expected);
-    }
-
-    #[gpui::test]
-    async fn test_grep_function_args_and_body(cx: &mut TestAppContext) {
-        let project = setup_syntax_test(cx).await;
-
-        // Test: Line with a function argument
-        let input = GrepToolInput {
-            regex: "second_arg".to_string(),
-            include_pattern: Some("**/*.rs".to_string()),
-            offset: 0,
-            case_sensitive: false,
-        };
-
-        let result = run_grep_tool(input, project.clone(), cx).await;
-        let expected = r#"
-            Found 1 matches:
-
-            ## Matches in root/test_syntax.rs
-
-            ### mod feature_module › pub mod nested_module › pub fn nested_function › L7-14
-            ```
-                    pub fn nested_function(
-                        first_arg: String,
-                        second_arg: i32,
-                    ) {
-                        println!("Function in nested module");
-                        println!("{first_arg}");
-                        println!("{second_arg}");
-                    }
-            ```
-            "#
-        .unindent();
-        assert_eq!(result, expected);
-    }
-
-    #[gpui::test]
-    async fn test_grep_if_block(cx: &mut TestAppContext) {
-        use unindent::Unindent;
-        let project = setup_syntax_test(cx).await;
-
-        // Test: Line inside an if block
-        let input = GrepToolInput {
-            regex: "Inside if block".to_string(),
-            include_pattern: Some("**/*.rs".to_string()),
-            offset: 0,
-            case_sensitive: false,
-        };
-
-        let result = run_grep_tool(input, project.clone(), cx).await;
-        let expected = r#"
-            Found 1 matches:
-
-            ## Matches in root/test_syntax.rs
-
-            ### impl MyStruct › fn method_with_block › L26-28
-            ```
-                    if condition {
-                        println!("Inside if block");
-                    }
-            ```
-            "#
-        .unindent();
-        assert_eq!(result, expected);
-    }
-
-    #[gpui::test]
-    async fn test_grep_long_function_top(cx: &mut TestAppContext) {
-        use unindent::Unindent;
-        let project = setup_syntax_test(cx).await;
-
-        // Test: Line in the middle of a long function - should show message about remaining lines
-        let input = GrepToolInput {
-            regex: "Line 5".to_string(),
-            include_pattern: Some("**/*.rs".to_string()),
-            offset: 0,
-            case_sensitive: false,
-        };
-
-        let result = run_grep_tool(input, project.clone(), cx).await;
-        let expected = r#"
-            Found 1 matches:
-
-            ## Matches in root/test_syntax.rs
-
-            ### impl MyStruct › fn long_function › L31-41
-            ```
-                fn long_function() {
-                    println!("Line 1");
-                    println!("Line 2");
-                    println!("Line 3");
-                    println!("Line 4");
-                    println!("Line 5");
-                    println!("Line 6");
-                    println!("Line 7");
-                    println!("Line 8");
-                    println!("Line 9");
-                    println!("Line 10");
-            ```
-
-            3 lines remaining in ancestor node. Read the file to see all.
-            "#
-        .unindent();
-        assert_eq!(result, expected);
-    }
-
-    #[gpui::test]
-    async fn test_grep_long_function_bottom(cx: &mut TestAppContext) {
-        use unindent::Unindent;
-        let project = setup_syntax_test(cx).await;
-
-        // Test: Line in the long function
-        let input = GrepToolInput {
-            regex: "Line 12".to_string(),
-            include_pattern: Some("**/*.rs".to_string()),
-            offset: 0,
-            case_sensitive: false,
-        };
-
-        let result = run_grep_tool(input, project.clone(), cx).await;
-        let expected = r#"
-            Found 1 matches:
-
-            ## Matches in root/test_syntax.rs
-
-            ### impl MyStruct › fn long_function › L41-45
-            ```
-                    println!("Line 10");
-                    println!("Line 11");
-                    println!("Line 12");
-                }
-            }
-            ```
-            "#
-        .unindent();
-        assert_eq!(result, expected);
-    }
-
-    async fn run_grep_tool(
-        input: GrepToolInput,
-        project: Entity<Project>,
-        cx: &mut TestAppContext,
-    ) -> String {
-        let tool = Arc::new(GrepTool { project });
-        let task = cx.update(|cx| tool.run(input, ToolCallEventStream::test().0, cx));
-
-        match task.await {
-            Ok(result) => {
-                if cfg!(windows) {
-                    result.replace("root\\", "root/")
-                } else {
-                    result
-                }
-            }
-            Err(e) => panic!("Failed to run grep tool: {}", e),
-        }
-    }
-
-    fn init_test(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-        });
-    }
-
-    #[gpui::test]
-    async fn test_grep_security_boundaries(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-
-        fs.insert_tree(
-            path!("/"),
-            json!({
-                "project_root": {
-                    "allowed_file.rs": "fn main() { println!(\"This file is in the project\"); }",
-                    ".mysecrets": "SECRET_KEY=abc123\nfn secret() { /* private */ }",
-                    ".secretdir": {
-                        "config": "fn special_configuration() { /* excluded */ }"
-                    },
-                    ".mymetadata": "fn custom_metadata() { /* excluded */ }",
-                    "subdir": {
-                        "normal_file.rs": "fn normal_file_content() { /* Normal */ }",
-                        "special.privatekey": "fn private_key_content() { /* private */ }",
-                        "data.mysensitive": "fn sensitive_data() { /* private */ }"
-                    }
-                },
-                "outside_project": {
-                    "sensitive_file.rs": "fn outside_function() { /* This file is outside the project */ }"
-                }
-            }),
-        )
-        .await;
-
-        cx.update(|cx| {
-            use gpui::UpdateGlobal;
-            use settings::SettingsStore;
-            SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |settings| {
-                    settings.project.worktree.file_scan_exclusions = Some(vec![
-                        "**/.secretdir".to_string(),
-                        "**/.mymetadata".to_string(),
-                    ]);
-                    settings.project.worktree.private_files = Some(
-                        vec![
-                            "**/.mysecrets".to_string(),
-                            "**/*.privatekey".to_string(),
-                            "**/*.mysensitive".to_string(),
-                        ]
-                        .into(),
-                    );
-                });
-            });
-        });
-
-        let project = Project::test(fs.clone(), [path!("/project_root").as_ref()], cx).await;
-
-        // Searching for files outside the project worktree should return no results
-        let result = run_grep_tool(
-            GrepToolInput {
-                regex: "outside_function".to_string(),
-                include_pattern: None,
-                offset: 0,
-                case_sensitive: false,
-            },
-            project.clone(),
-            cx,
-        )
-        .await;
-        let paths = extract_paths_from_results(&result);
-        assert!(
-            paths.is_empty(),
-            "grep_tool should not find files outside the project worktree"
-        );
-
-        // Searching within the project should succeed
-        let result = run_grep_tool(
-            GrepToolInput {
-                regex: "main".to_string(),
-                include_pattern: None,
-                offset: 0,
-                case_sensitive: false,
-            },
-            project.clone(),
-            cx,
-        )
-        .await;
-        let paths = extract_paths_from_results(&result);
-        assert!(
-            paths.iter().any(|p| p.contains("allowed_file.rs")),
-            "grep_tool should be able to search files inside worktrees"
-        );
-
-        // Searching files that match file_scan_exclusions should return no results
-        let result = run_grep_tool(
-            GrepToolInput {
-                regex: "special_configuration".to_string(),
-                include_pattern: None,
-                offset: 0,
-                case_sensitive: false,
-            },
-            project.clone(),
-            cx,
-        )
-        .await;
-        let paths = extract_paths_from_results(&result);
-        assert!(
-            paths.is_empty(),
-            "grep_tool should not search files in .secretdir (file_scan_exclusions)"
-        );
-
-        let result = run_grep_tool(
-            GrepToolInput {
-                regex: "custom_metadata".to_string(),
-                include_pattern: None,
-                offset: 0,
-                case_sensitive: false,
-            },
-            project.clone(),
-            cx,
-        )
-        .await;
-        let paths = extract_paths_from_results(&result);
-        assert!(
-            paths.is_empty(),
-            "grep_tool should not search .mymetadata files (file_scan_exclusions)"
-        );
-
-        // Searching private files should return no results
-        let result = run_grep_tool(
-            GrepToolInput {
-                regex: "SECRET_KEY".to_string(),
-                include_pattern: None,
-                offset: 0,
-                case_sensitive: false,
-            },
-            project.clone(),
-            cx,
-        )
-        .await;
-        let paths = extract_paths_from_results(&result);
-        assert!(
-            paths.is_empty(),
-            "grep_tool should not search .mysecrets (private_files)"
-        );
-
-        let result = run_grep_tool(
-            GrepToolInput {
-                regex: "private_key_content".to_string(),
-                include_pattern: None,
-                offset: 0,
-                case_sensitive: false,
-            },
-            project.clone(),
-            cx,
-        )
-        .await;
-        let paths = extract_paths_from_results(&result);
-
-        assert!(
-            paths.is_empty(),
-            "grep_tool should not search .privatekey files (private_files)"
-        );
-
-        let result = run_grep_tool(
-            GrepToolInput {
-                regex: "sensitive_data".to_string(),
-                include_pattern: None,
-                offset: 0,
-                case_sensitive: false,
-            },
-            project.clone(),
-            cx,
-        )
-        .await;
-        let paths = extract_paths_from_results(&result);
-        assert!(
-            paths.is_empty(),
-            "grep_tool should not search .mysensitive files (private_files)"
-        );
-
-        // Searching a normal file should still work, even with private_files configured
-        let result = run_grep_tool(
-            GrepToolInput {
-                regex: "normal_file_content".to_string(),
-                include_pattern: None,
-                offset: 0,
-                case_sensitive: false,
-            },
-            project.clone(),
-            cx,
-        )
-        .await;
-        let paths = extract_paths_from_results(&result);
-        assert!(
-            paths.iter().any(|p| p.contains("normal_file.rs")),
-            "Should be able to search normal files"
-        );
-
-        // Path traversal attempts with .. in include_pattern should not escape project
-        let result = run_grep_tool(
-            GrepToolInput {
-                regex: "outside_function".to_string(),
-                include_pattern: Some("../outside_project/**/*.rs".to_string()),
-                offset: 0,
-                case_sensitive: false,
-            },
-            project.clone(),
-            cx,
-        )
-        .await;
-        let paths = extract_paths_from_results(&result);
-        assert!(
-            paths.is_empty(),
-            "grep_tool should not allow escaping project boundaries with relative paths"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_grep_with_multiple_worktree_settings(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-
-        // Create first worktree with its own private files
-        fs.insert_tree(
-            path!("/worktree1"),
-            json!({
-                ".zed": {
-                    "settings.json": r#"{
-                        "file_scan_exclusions": ["**/fixture.*"],
-                        "private_files": ["**/secret.rs"]
-                    }"#
-                },
-                "src": {
-                    "main.rs": "fn main() { let secret_key = \"hidden\"; }",
-                    "secret.rs": "const API_KEY: &str = \"secret_value\";",
-                    "utils.rs": "pub fn get_config() -> String { \"config\".to_string() }"
-                },
-                "tests": {
-                    "test.rs": "fn test_secret() { assert!(true); }",
-                    "fixture.sql": "SELECT * FROM secret_table;"
-                }
-            }),
-        )
-        .await;
-
-        // Create second worktree with different private files
-        fs.insert_tree(
-            path!("/worktree2"),
-            json!({
-                ".zed": {
-                    "settings.json": r#"{
-                        "file_scan_exclusions": ["**/internal.*"],
-                        "private_files": ["**/private.js", "**/data.json"]
-                    }"#
-                },
-                "lib": {
-                    "public.js": "export function getSecret() { return 'public'; }",
-                    "private.js": "const SECRET_KEY = \"private_value\";",
-                    "data.json": "{\"secret_data\": \"hidden\"}"
-                },
-                "docs": {
-                    "README.md": "# Documentation with secret info",
-                    "internal.md": "Internal secret documentation"
-                }
-            }),
-        )
-        .await;
-
-        // Set global settings
-        cx.update(|cx| {
-            SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |settings| {
-                    settings.project.worktree.file_scan_exclusions =
-                        Some(vec!["**/.git".to_string(), "**/node_modules".to_string()]);
-                    settings.project.worktree.private_files =
-                        Some(vec!["**/.env".to_string()].into());
-                });
-            });
-        });
-
-        let project = Project::test(
-            fs.clone(),
-            [path!("/worktree1").as_ref(), path!("/worktree2").as_ref()],
-            cx,
-        )
-        .await;
-
-        // Wait for worktrees to be fully scanned
-        cx.executor().run_until_parked();
-
-        // Search for "secret" - should exclude files based on worktree-specific settings
-        let result = run_grep_tool(
-            GrepToolInput {
-                regex: "secret".to_string(),
-                include_pattern: None,
-                offset: 0,
-                case_sensitive: false,
-            },
-            project.clone(),
-            cx,
-        )
-        .await;
-        let paths = extract_paths_from_results(&result);
-
-        // Should find matches in non-private files
-        assert!(
-            paths.iter().any(|p| p.contains("main.rs")),
-            "Should find 'secret' in worktree1/src/main.rs"
-        );
-        assert!(
-            paths.iter().any(|p| p.contains("test.rs")),
-            "Should find 'secret' in worktree1/tests/test.rs"
-        );
-        assert!(
-            paths.iter().any(|p| p.contains("public.js")),
-            "Should find 'secret' in worktree2/lib/public.js"
-        );
-        assert!(
-            paths.iter().any(|p| p.contains("README.md")),
-            "Should find 'secret' in worktree2/docs/README.md"
-        );
-
-        // Should NOT find matches in private/excluded files based on worktree settings
-        assert!(
-            !paths.iter().any(|p| p.contains("secret.rs")),
-            "Should not search in worktree1/src/secret.rs (local private_files)"
-        );
-        assert!(
-            !paths.iter().any(|p| p.contains("fixture.sql")),
-            "Should not search in worktree1/tests/fixture.sql (local file_scan_exclusions)"
-        );
-        assert!(
-            !paths.iter().any(|p| p.contains("private.js")),
-            "Should not search in worktree2/lib/private.js (local private_files)"
-        );
-        assert!(
-            !paths.iter().any(|p| p.contains("data.json")),
-            "Should not search in worktree2/lib/data.json (local private_files)"
-        );
-        assert!(
-            !paths.iter().any(|p| p.contains("internal.md")),
-            "Should not search in worktree2/docs/internal.md (local file_scan_exclusions)"
-        );
-
-        // Test with `include_pattern` specific to one worktree
-        let result = run_grep_tool(
-            GrepToolInput {
-                regex: "secret".to_string(),
-                include_pattern: Some("worktree1/**/*.rs".to_string()),
-                offset: 0,
-                case_sensitive: false,
-            },
-            project.clone(),
-            cx,
-        )
-        .await;
-
-        let paths = extract_paths_from_results(&result);
-
-        // Should only find matches in worktree1 *.rs files (excluding private ones)
-        assert!(
-            paths.iter().any(|p| p.contains("main.rs")),
-            "Should find match in worktree1/src/main.rs"
-        );
-        assert!(
-            paths.iter().any(|p| p.contains("test.rs")),
-            "Should find match in worktree1/tests/test.rs"
-        );
-        assert!(
-            !paths.iter().any(|p| p.contains("secret.rs")),
-            "Should not find match in excluded worktree1/src/secret.rs"
-        );
-        assert!(
-            paths.iter().all(|p| !p.contains("worktree2")),
-            "Should not find any matches in worktree2"
-        );
-    }
-
-    // Helper function to extract file paths from grep results
-    fn extract_paths_from_results(results: &str) -> Vec<String> {
-        results
-            .lines()
-            .filter(|line| line.starts_with("## Matches in "))
-            .map(|line| {
-                line.strip_prefix("## Matches in ")
-                    .unwrap()
-                    .trim()
-                    .to_string()
-            })
-            .collect()
-    }
-}
diff --git a/crates/agent/src/tools/list_directory_tool.rs b/crates/agent/src/tools/list_directory_tool.rs
deleted file mode 100644
index b7ceba5abf..0000000000
--- a/crates/agent/src/tools/list_directory_tool.rs
+++ /dev/null
@@ -1,660 +0,0 @@
-use crate::{AgentTool, ToolCallEventStream};
-use agent_client_protocol::ToolKind;
-use anyhow::{Result, anyhow};
-use gpui::{App, Entity, SharedString, Task};
-use project::{Project, ProjectPath, WorktreeSettings};
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use settings::Settings;
-use std::fmt::Write;
-use std::sync::Arc;
-use util::markdown::MarkdownInlineCode;
-
-/// Lists files and directories in a given path. Prefer the `grep` or `find_path` tools when searching the codebase.
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct ListDirectoryToolInput {
-    /// The fully-qualified path of the directory to list in the project.
-    ///
-    /// This path should never be absolute, and the first component of the path should always be a root directory in a project.
-    ///
-    /// <example>
-    /// If the project has the following root directories:
-    ///
-    /// - directory1
-    /// - directory2
-    ///
-    /// You can list the contents of `directory1` by using the path `directory1`.
-    /// </example>
-    ///
-    /// <example>
-    /// If the project has the following root directories:
-    ///
-    /// - foo
-    /// - bar
-    ///
-    /// If you wanna list contents in the directory `foo/baz`, you should use the path `foo/baz`.
-    /// </example>
-    pub path: String,
-}
-
-pub struct ListDirectoryTool {
-    project: Entity<Project>,
-}
-
-impl ListDirectoryTool {
-    pub fn new(project: Entity<Project>) -> Self {
-        Self { project }
-    }
-}
-
-impl AgentTool for ListDirectoryTool {
-    type Input = ListDirectoryToolInput;
-    type Output = String;
-
-    fn name() -> &'static str {
-        "list_directory"
-    }
-
-    fn kind() -> ToolKind {
-        ToolKind::Read
-    }
-
-    fn initial_title(
-        &self,
-        input: Result<Self::Input, serde_json::Value>,
-        _cx: &mut App,
-    ) -> SharedString {
-        if let Ok(input) = input {
-            let path = MarkdownInlineCode(&input.path);
-            format!("List the {path} directory's contents").into()
-        } else {
-            "List directory".into()
-        }
-    }
-
-    fn run(
-        self: Arc<Self>,
-        input: Self::Input,
-        _event_stream: ToolCallEventStream,
-        cx: &mut App,
-    ) -> Task<Result<Self::Output>> {
-        // Sometimes models will return these even though we tell it to give a path and not a glob.
-        // When this happens, just list the root worktree directories.
-        if matches!(input.path.as_str(), "." | "" | "./" | "*") {
-            let output = self
-                .project
-                .read(cx)
-                .worktrees(cx)
-                .filter_map(|worktree| {
-                    let worktree = worktree.read(cx);
-                    let root_entry = worktree.root_entry()?;
-                    if root_entry.is_dir() {
-                        Some(root_entry.path.display(worktree.path_style()))
-                    } else {
-                        None
-                    }
-                })
-                .collect::<Vec<_>>()
-                .join("\n");
-
-            return Task::ready(Ok(output));
-        }
-
-        let Some(project_path) = self.project.read(cx).find_project_path(&input.path, cx) else {
-            return Task::ready(Err(anyhow!("Path {} not found in project", input.path)));
-        };
-        let Some(worktree) = self
-            .project
-            .read(cx)
-            .worktree_for_id(project_path.worktree_id, cx)
-        else {
-            return Task::ready(Err(anyhow!("Worktree not found")));
-        };
-
-        // Check if the directory whose contents we're listing is itself excluded or private
-        let global_settings = WorktreeSettings::get_global(cx);
-        if global_settings.is_path_excluded(&project_path.path) {
-            return Task::ready(Err(anyhow!(
-                "Cannot list directory because its path matches the user's global `file_scan_exclusions` setting: {}",
-                &input.path
-            )));
-        }
-
-        if global_settings.is_path_private(&project_path.path) {
-            return Task::ready(Err(anyhow!(
-                "Cannot list directory because its path matches the user's global `private_files` setting: {}",
-                &input.path
-            )));
-        }
-
-        let worktree_settings = WorktreeSettings::get(Some((&project_path).into()), cx);
-        if worktree_settings.is_path_excluded(&project_path.path) {
-            return Task::ready(Err(anyhow!(
-                "Cannot list directory because its path matches the user's worktree`file_scan_exclusions` setting: {}",
-                &input.path
-            )));
-        }
-
-        if worktree_settings.is_path_private(&project_path.path) {
-            return Task::ready(Err(anyhow!(
-                "Cannot list directory because its path matches the user's worktree `private_paths` setting: {}",
-                &input.path
-            )));
-        }
-
-        let worktree_snapshot = worktree.read(cx).snapshot();
-        let worktree_root_name = worktree.read(cx).root_name();
-
-        let Some(entry) = worktree_snapshot.entry_for_path(&project_path.path) else {
-            return Task::ready(Err(anyhow!("Path not found: {}", input.path)));
-        };
-
-        if !entry.is_dir() {
-            return Task::ready(Err(anyhow!("{} is not a directory.", input.path)));
-        }
-        let worktree_snapshot = worktree.read(cx).snapshot();
-
-        let mut folders = Vec::new();
-        let mut files = Vec::new();
-
-        for entry in worktree_snapshot.child_entries(&project_path.path) {
-            // Skip private and excluded files and directories
-            if global_settings.is_path_private(&entry.path)
-                || global_settings.is_path_excluded(&entry.path)
-            {
-                continue;
-            }
-
-            let project_path: ProjectPath = (worktree_snapshot.id(), entry.path.clone()).into();
-            if worktree_settings.is_path_excluded(&project_path.path)
-                || worktree_settings.is_path_private(&project_path.path)
-            {
-                continue;
-            }
-
-            let full_path = worktree_root_name
-                .join(&entry.path)
-                .display(worktree_snapshot.path_style())
-                .into_owned();
-            if entry.is_dir() {
-                folders.push(full_path);
-            } else {
-                files.push(full_path);
-            }
-        }
-
-        let mut output = String::new();
-
-        if !folders.is_empty() {
-            writeln!(output, "# Folders:\n{}", folders.join("\n")).unwrap();
-        }
-
-        if !files.is_empty() {
-            writeln!(output, "\n# Files:\n{}", files.join("\n")).unwrap();
-        }
-
-        if output.is_empty() {
-            writeln!(output, "{} is empty.", input.path).unwrap();
-        }
-
-        Task::ready(Ok(output))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use gpui::{TestAppContext, UpdateGlobal};
-    use indoc::indoc;
-    use project::{FakeFs, Project};
-    use serde_json::json;
-    use settings::SettingsStore;
-    use util::path;
-
-    fn platform_paths(path_str: &str) -> String {
-        if cfg!(target_os = "windows") {
-            path_str.replace("/", "\\")
-        } else {
-            path_str.to_string()
-        }
-    }
-
-    fn init_test(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-        });
-    }
-
-    #[gpui::test]
-    async fn test_list_directory_separates_files_and_dirs(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/project"),
-            json!({
-                "src": {
-                    "main.rs": "fn main() {}",
-                    "lib.rs": "pub fn hello() {}",
-                    "models": {
-                        "user.rs": "struct User {}",
-                        "post.rs": "struct Post {}"
-                    },
-                    "utils": {
-                        "helper.rs": "pub fn help() {}"
-                    }
-                },
-                "tests": {
-                    "integration_test.rs": "#[test] fn test() {}"
-                },
-                "README.md": "# Project",
-                "Cargo.toml": "[package]"
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
-        let tool = Arc::new(ListDirectoryTool::new(project));
-
-        // Test listing root directory
-        let input = ListDirectoryToolInput {
-            path: "project".into(),
-        };
-        let output = cx
-            .update(|cx| tool.clone().run(input, ToolCallEventStream::test().0, cx))
-            .await
-            .unwrap();
-        assert_eq!(
-            output,
-            platform_paths(indoc! {"
-                # Folders:
-                project/src
-                project/tests
-
-                # Files:
-                project/Cargo.toml
-                project/README.md
-            "})
-        );
-
-        // Test listing src directory
-        let input = ListDirectoryToolInput {
-            path: "project/src".into(),
-        };
-        let output = cx
-            .update(|cx| tool.clone().run(input, ToolCallEventStream::test().0, cx))
-            .await
-            .unwrap();
-        assert_eq!(
-            output,
-            platform_paths(indoc! {"
-                # Folders:
-                project/src/models
-                project/src/utils
-
-                # Files:
-                project/src/lib.rs
-                project/src/main.rs
-            "})
-        );
-
-        // Test listing directory with only files
-        let input = ListDirectoryToolInput {
-            path: "project/tests".into(),
-        };
-        let output = cx
-            .update(|cx| tool.clone().run(input, ToolCallEventStream::test().0, cx))
-            .await
-            .unwrap();
-        assert!(!output.contains("# Folders:"));
-        assert!(output.contains("# Files:"));
-        assert!(output.contains(&platform_paths("project/tests/integration_test.rs")));
-    }
-
-    #[gpui::test]
-    async fn test_list_directory_empty_directory(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/project"),
-            json!({
-                "empty_dir": {}
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
-        let tool = Arc::new(ListDirectoryTool::new(project));
-
-        let input = ListDirectoryToolInput {
-            path: "project/empty_dir".into(),
-        };
-        let output = cx
-            .update(|cx| tool.clone().run(input, ToolCallEventStream::test().0, cx))
-            .await
-            .unwrap();
-        assert_eq!(output, "project/empty_dir is empty.\n");
-    }
-
-    #[gpui::test]
-    async fn test_list_directory_error_cases(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/project"),
-            json!({
-                "file.txt": "content"
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
-        let tool = Arc::new(ListDirectoryTool::new(project));
-
-        // Test non-existent path
-        let input = ListDirectoryToolInput {
-            path: "project/nonexistent".into(),
-        };
-        let output = cx
-            .update(|cx| tool.clone().run(input, ToolCallEventStream::test().0, cx))
-            .await;
-        assert!(output.unwrap_err().to_string().contains("Path not found"));
-
-        // Test trying to list a file instead of directory
-        let input = ListDirectoryToolInput {
-            path: "project/file.txt".into(),
-        };
-        let output = cx
-            .update(|cx| tool.run(input, ToolCallEventStream::test().0, cx))
-            .await;
-        assert!(
-            output
-                .unwrap_err()
-                .to_string()
-                .contains("is not a directory")
-        );
-    }
-
-    #[gpui::test]
-    async fn test_list_directory_security(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/project"),
-            json!({
-                "normal_dir": {
-                    "file1.txt": "content",
-                    "file2.txt": "content"
-                },
-                ".mysecrets": "SECRET_KEY=abc123",
-                ".secretdir": {
-                    "config": "special configuration",
-                    "secret.txt": "secret content"
-                },
-                ".mymetadata": "custom metadata",
-                "visible_dir": {
-                    "normal.txt": "normal content",
-                    "special.privatekey": "private key content",
-                    "data.mysensitive": "sensitive data",
-                    ".hidden_subdir": {
-                        "hidden_file.txt": "hidden content"
-                    }
-                }
-            }),
-        )
-        .await;
-
-        // Configure settings explicitly
-        cx.update(|cx| {
-            SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |settings| {
-                    settings.project.worktree.file_scan_exclusions = Some(vec![
-                        "**/.secretdir".to_string(),
-                        "**/.mymetadata".to_string(),
-                        "**/.hidden_subdir".to_string(),
-                    ]);
-                    settings.project.worktree.private_files = Some(
-                        vec![
-                            "**/.mysecrets".to_string(),
-                            "**/*.privatekey".to_string(),
-                            "**/*.mysensitive".to_string(),
-                        ]
-                        .into(),
-                    );
-                });
-            });
-        });
-
-        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
-        let tool = Arc::new(ListDirectoryTool::new(project));
-
-        // Listing root directory should exclude private and excluded files
-        let input = ListDirectoryToolInput {
-            path: "project".into(),
-        };
-        let output = cx
-            .update(|cx| tool.clone().run(input, ToolCallEventStream::test().0, cx))
-            .await
-            .unwrap();
-
-        // Should include normal directories
-        assert!(output.contains("normal_dir"), "Should list normal_dir");
-        assert!(output.contains("visible_dir"), "Should list visible_dir");
-
-        // Should NOT include excluded or private files
-        assert!(
-            !output.contains(".secretdir"),
-            "Should not list .secretdir (file_scan_exclusions)"
-        );
-        assert!(
-            !output.contains(".mymetadata"),
-            "Should not list .mymetadata (file_scan_exclusions)"
-        );
-        assert!(
-            !output.contains(".mysecrets"),
-            "Should not list .mysecrets (private_files)"
-        );
-
-        // Trying to list an excluded directory should fail
-        let input = ListDirectoryToolInput {
-            path: "project/.secretdir".into(),
-        };
-        let output = cx
-            .update(|cx| tool.clone().run(input, ToolCallEventStream::test().0, cx))
-            .await;
-        assert!(
-            output
-                .unwrap_err()
-                .to_string()
-                .contains("file_scan_exclusions"),
-            "Error should mention file_scan_exclusions"
-        );
-
-        // Listing a directory should exclude private files within it
-        let input = ListDirectoryToolInput {
-            path: "project/visible_dir".into(),
-        };
-        let output = cx
-            .update(|cx| tool.clone().run(input, ToolCallEventStream::test().0, cx))
-            .await
-            .unwrap();
-
-        // Should include normal files
-        assert!(output.contains("normal.txt"), "Should list normal.txt");
-
-        // Should NOT include private files
-        assert!(
-            !output.contains("privatekey"),
-            "Should not list .privatekey files (private_files)"
-        );
-        assert!(
-            !output.contains("mysensitive"),
-            "Should not list .mysensitive files (private_files)"
-        );
-
-        // Should NOT include subdirectories that match exclusions
-        assert!(
-            !output.contains(".hidden_subdir"),
-            "Should not list .hidden_subdir (file_scan_exclusions)"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_list_directory_with_multiple_worktree_settings(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-
-        // Create first worktree with its own private files
-        fs.insert_tree(
-            path!("/worktree1"),
-            json!({
-                ".zed": {
-                    "settings.json": r#"{
-                        "file_scan_exclusions": ["**/fixture.*"],
-                        "private_files": ["**/secret.rs", "**/config.toml"]
-                    }"#
-                },
-                "src": {
-                    "main.rs": "fn main() { println!(\"Hello from worktree1\"); }",
-                    "secret.rs": "const API_KEY: &str = \"secret_key_1\";",
-                    "config.toml": "[database]\nurl = \"postgres://localhost/db1\""
-                },
-                "tests": {
-                    "test.rs": "mod tests { fn test_it() {} }",
-                    "fixture.sql": "CREATE TABLE users (id INT, name VARCHAR(255));"
-                }
-            }),
-        )
-        .await;
-
-        // Create second worktree with different private files
-        fs.insert_tree(
-            path!("/worktree2"),
-            json!({
-                ".zed": {
-                    "settings.json": r#"{
-                        "file_scan_exclusions": ["**/internal.*"],
-                        "private_files": ["**/private.js", "**/data.json"]
-                    }"#
-                },
-                "lib": {
-                    "public.js": "export function greet() { return 'Hello from worktree2'; }",
-                    "private.js": "const SECRET_TOKEN = \"private_token_2\";",
-                    "data.json": "{\"api_key\": \"json_secret_key\"}"
-                },
-                "docs": {
-                    "README.md": "# Public Documentation",
-                    "internal.md": "# Internal Secrets and Configuration"
-                }
-            }),
-        )
-        .await;
-
-        // Set global settings
-        cx.update(|cx| {
-            SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |settings| {
-                    settings.project.worktree.file_scan_exclusions =
-                        Some(vec!["**/.git".to_string(), "**/node_modules".to_string()]);
-                    settings.project.worktree.private_files =
-                        Some(vec!["**/.env".to_string()].into());
-                });
-            });
-        });
-
-        let project = Project::test(
-            fs.clone(),
-            [path!("/worktree1").as_ref(), path!("/worktree2").as_ref()],
-            cx,
-        )
-        .await;
-
-        // Wait for worktrees to be fully scanned
-        cx.executor().run_until_parked();
-
-        let tool = Arc::new(ListDirectoryTool::new(project));
-
-        // Test listing worktree1/src - should exclude secret.rs and config.toml based on local settings
-        let input = ListDirectoryToolInput {
-            path: "worktree1/src".into(),
-        };
-        let output = cx
-            .update(|cx| tool.clone().run(input, ToolCallEventStream::test().0, cx))
-            .await
-            .unwrap();
-        assert!(output.contains("main.rs"), "Should list main.rs");
-        assert!(
-            !output.contains("secret.rs"),
-            "Should not list secret.rs (local private_files)"
-        );
-        assert!(
-            !output.contains("config.toml"),
-            "Should not list config.toml (local private_files)"
-        );
-
-        // Test listing worktree1/tests - should exclude fixture.sql based on local settings
-        let input = ListDirectoryToolInput {
-            path: "worktree1/tests".into(),
-        };
-        let output = cx
-            .update(|cx| tool.clone().run(input, ToolCallEventStream::test().0, cx))
-            .await
-            .unwrap();
-        assert!(output.contains("test.rs"), "Should list test.rs");
-        assert!(
-            !output.contains("fixture.sql"),
-            "Should not list fixture.sql (local file_scan_exclusions)"
-        );
-
-        // Test listing worktree2/lib - should exclude private.js and data.json based on local settings
-        let input = ListDirectoryToolInput {
-            path: "worktree2/lib".into(),
-        };
-        let output = cx
-            .update(|cx| tool.clone().run(input, ToolCallEventStream::test().0, cx))
-            .await
-            .unwrap();
-        assert!(output.contains("public.js"), "Should list public.js");
-        assert!(
-            !output.contains("private.js"),
-            "Should not list private.js (local private_files)"
-        );
-        assert!(
-            !output.contains("data.json"),
-            "Should not list data.json (local private_files)"
-        );
-
-        // Test listing worktree2/docs - should exclude internal.md based on local settings
-        let input = ListDirectoryToolInput {
-            path: "worktree2/docs".into(),
-        };
-        let output = cx
-            .update(|cx| tool.clone().run(input, ToolCallEventStream::test().0, cx))
-            .await
-            .unwrap();
-        assert!(output.contains("README.md"), "Should list README.md");
-        assert!(
-            !output.contains("internal.md"),
-            "Should not list internal.md (local file_scan_exclusions)"
-        );
-
-        // Test trying to list an excluded directory directly
-        let input = ListDirectoryToolInput {
-            path: "worktree1/src/secret.rs".into(),
-        };
-        let output = cx
-            .update(|cx| tool.clone().run(input, ToolCallEventStream::test().0, cx))
-            .await;
-        assert!(
-            output
-                .unwrap_err()
-                .to_string()
-                .contains("Cannot list directory"),
-        );
-    }
-}
diff --git a/crates/agent/src/tools/move_path_tool.rs b/crates/agent/src/tools/move_path_tool.rs
deleted file mode 100644
index ae58145126..0000000000
--- a/crates/agent/src/tools/move_path_tool.rs
+++ /dev/null
@@ -1,124 +0,0 @@
-use crate::{AgentTool, ToolCallEventStream};
-use agent_client_protocol::ToolKind;
-use anyhow::{Context as _, Result, anyhow};
-use gpui::{App, AppContext, Entity, SharedString, Task};
-use project::Project;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use std::{path::Path, sync::Arc};
-use util::markdown::MarkdownInlineCode;
-
-/// Moves or rename a file or directory in the project, and returns confirmation that the move succeeded.
-///
-/// If the source and destination directories are the same, but the filename is different, this performs a rename. Otherwise, it performs a move.
-///
-/// This tool should be used when it's desirable to move or rename a file or directory without changing its contents at all.
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct MovePathToolInput {
-    /// The source path of the file or directory to move/rename.
-    ///
-    /// <example>
-    /// If the project has the following files:
-    ///
-    /// - directory1/a/something.txt
-    /// - directory2/a/things.txt
-    /// - directory3/a/other.txt
-    ///
-    /// You can move the first file by providing a source_path of "directory1/a/something.txt"
-    /// </example>
-    pub source_path: String,
-
-    /// The destination path where the file or directory should be moved/renamed to.
-    /// If the paths are the same except for the filename, then this will be a rename.
-    ///
-    /// <example>
-    /// To move "directory1/a/something.txt" to "directory2/b/renamed.txt",
-    /// provide a destination_path of "directory2/b/renamed.txt"
-    /// </example>
-    pub destination_path: String,
-}
-
-pub struct MovePathTool {
-    project: Entity<Project>,
-}
-
-impl MovePathTool {
-    pub fn new(project: Entity<Project>) -> Self {
-        Self { project }
-    }
-}
-
-impl AgentTool for MovePathTool {
-    type Input = MovePathToolInput;
-    type Output = String;
-
-    fn name() -> &'static str {
-        "move_path"
-    }
-
-    fn kind() -> ToolKind {
-        ToolKind::Move
-    }
-
-    fn initial_title(
-        &self,
-        input: Result<Self::Input, serde_json::Value>,
-        _cx: &mut App,
-    ) -> SharedString {
-        if let Ok(input) = input {
-            let src = MarkdownInlineCode(&input.source_path);
-            let dest = MarkdownInlineCode(&input.destination_path);
-            let src_path = Path::new(&input.source_path);
-            let dest_path = Path::new(&input.destination_path);
-
-            match dest_path
-                .file_name()
-                .and_then(|os_str| os_str.to_os_string().into_string().ok())
-            {
-                Some(filename) if src_path.parent() == dest_path.parent() => {
-                    let filename = MarkdownInlineCode(&filename);
-                    format!("Rename {src} to {filename}").into()
-                }
-                _ => format!("Move {src} to {dest}").into(),
-            }
-        } else {
-            "Move path".into()
-        }
-    }
-
-    fn run(
-        self: Arc<Self>,
-        input: Self::Input,
-        _event_stream: ToolCallEventStream,
-        cx: &mut App,
-    ) -> Task<Result<Self::Output>> {
-        let rename_task = self.project.update(cx, |project, cx| {
-            match project
-                .find_project_path(&input.source_path, cx)
-                .and_then(|project_path| project.entry_for_path(&project_path, cx))
-            {
-                Some(entity) => match project.find_project_path(&input.destination_path, cx) {
-                    Some(project_path) => project.rename_entry(entity.id, project_path, cx),
-                    None => Task::ready(Err(anyhow!(
-                        "Destination path {} was outside the project.",
-                        input.destination_path
-                    ))),
-                },
-                None => Task::ready(Err(anyhow!(
-                    "Source path {} was not found in the project.",
-                    input.source_path
-                ))),
-            }
-        });
-
-        cx.background_spawn(async move {
-            let _ = rename_task.await.with_context(|| {
-                format!("Moving {} to {}", input.source_path, input.destination_path)
-            })?;
-            Ok(format!(
-                "Moved {} to {}",
-                input.source_path, input.destination_path
-            ))
-        })
-    }
-}
diff --git a/crates/agent/src/tools/now_tool.rs b/crates/agent/src/tools/now_tool.rs
deleted file mode 100644
index 3387c0a617..0000000000
--- a/crates/agent/src/tools/now_tool.rs
+++ /dev/null
@@ -1,64 +0,0 @@
-use std::sync::Arc;
-
-use agent_client_protocol as acp;
-use anyhow::Result;
-use chrono::{Local, Utc};
-use gpui::{App, SharedString, Task};
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-
-use crate::{AgentTool, ToolCallEventStream};
-
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-#[schemars(inline)]
-pub enum Timezone {
-    /// Use UTC for the datetime.
-    Utc,
-    /// Use local time for the datetime.
-    Local,
-}
-
-/// Returns the current datetime in RFC 3339 format.
-/// Only use this tool when the user specifically asks for it or the current task would benefit from knowing the current datetime.
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct NowToolInput {
-    /// The timezone to use for the datetime.
-    timezone: Timezone,
-}
-
-pub struct NowTool;
-
-impl AgentTool for NowTool {
-    type Input = NowToolInput;
-    type Output = String;
-
-    fn name() -> &'static str {
-        "now"
-    }
-
-    fn kind() -> acp::ToolKind {
-        acp::ToolKind::Other
-    }
-
-    fn initial_title(
-        &self,
-        _input: Result<Self::Input, serde_json::Value>,
-        _cx: &mut App,
-    ) -> SharedString {
-        "Get current time".into()
-    }
-
-    fn run(
-        self: Arc<Self>,
-        input: Self::Input,
-        _event_stream: ToolCallEventStream,
-        _cx: &mut App,
-    ) -> Task<Result<String>> {
-        let now = match input.timezone {
-            Timezone::Utc => Utc::now().to_rfc3339(),
-            Timezone::Local => Local::now().to_rfc3339(),
-        };
-        Task::ready(Ok(format!("The current datetime is {now}.")))
-    }
-}
diff --git a/crates/agent/src/tools/open_tool.rs b/crates/agent/src/tools/open_tool.rs
deleted file mode 100644
index 8826d1529c..0000000000
--- a/crates/agent/src/tools/open_tool.rs
+++ /dev/null
@@ -1,168 +0,0 @@
-use crate::AgentTool;
-use agent_client_protocol::ToolKind;
-use anyhow::{Context as _, Result};
-use gpui::{App, AppContext, Entity, SharedString, Task};
-use project::Project;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use std::{path::PathBuf, sync::Arc};
-use util::markdown::MarkdownEscaped;
-
-/// This tool opens a file or URL with the default application associated with it on the user's operating system:
-///
-/// - On macOS, it's equivalent to the `open` command
-/// - On Windows, it's equivalent to `start`
-/// - On Linux, it uses something like `xdg-open`, `gio open`, `gnome-open`, `kde-open`, `wslview` as appropriate
-///
-/// For example, it can open a web browser with a URL, open a PDF file with the default PDF viewer, etc.
-///
-/// You MUST ONLY use this tool when the user has explicitly requested opening something. You MUST NEVER assume that the user would like for you to use this tool.
-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
-pub struct OpenToolInput {
-    /// The path or URL to open with the default application.
-    path_or_url: String,
-}
-
-pub struct OpenTool {
-    project: Entity<Project>,
-}
-
-impl OpenTool {
-    pub fn new(project: Entity<Project>) -> Self {
-        Self { project }
-    }
-}
-
-impl AgentTool for OpenTool {
-    type Input = OpenToolInput;
-    type Output = String;
-
-    fn name() -> &'static str {
-        "open"
-    }
-
-    fn kind() -> ToolKind {
-        ToolKind::Execute
-    }
-
-    fn initial_title(
-        &self,
-        input: Result<Self::Input, serde_json::Value>,
-        _cx: &mut App,
-    ) -> SharedString {
-        if let Ok(input) = input {
-            format!("Open `{}`", MarkdownEscaped(&input.path_or_url)).into()
-        } else {
-            "Open file or URL".into()
-        }
-    }
-
-    fn run(
-        self: Arc<Self>,
-        input: Self::Input,
-        event_stream: crate::ToolCallEventStream,
-        cx: &mut App,
-    ) -> Task<Result<Self::Output>> {
-        // If path_or_url turns out to be a path in the project, make it absolute.
-        let abs_path = to_absolute_path(&input.path_or_url, self.project.clone(), cx);
-        let authorize = event_stream.authorize(self.initial_title(Ok(input.clone()), cx), cx);
-        cx.background_spawn(async move {
-            authorize.await?;
-
-            match abs_path {
-                Some(path) => open::that(path),
-                None => open::that(&input.path_or_url),
-            }
-            .context("Failed to open URL or file path")?;
-
-            Ok(format!("Successfully opened {}", input.path_or_url))
-        })
-    }
-}
-
-fn to_absolute_path(
-    potential_path: &str,
-    project: Entity<Project>,
-    cx: &mut App,
-) -> Option<PathBuf> {
-    let project = project.read(cx);
-    project
-        .find_project_path(PathBuf::from(potential_path), cx)
-        .and_then(|project_path| project.absolute_path(&project_path, cx))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use gpui::TestAppContext;
-    use project::{FakeFs, Project};
-    use settings::SettingsStore;
-    use std::path::Path;
-    use tempfile::TempDir;
-
-    #[gpui::test]
-    async fn test_to_absolute_path(cx: &mut TestAppContext) {
-        init_test(cx);
-        let temp_dir = TempDir::new().expect("Failed to create temp directory");
-        let temp_path = temp_dir.path().to_string_lossy().into_owned();
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            &temp_path,
-            serde_json::json!({
-                "src": {
-                    "main.rs": "fn main() {}",
-                    "lib.rs": "pub fn lib_fn() {}"
-                },
-                "docs": {
-                    "readme.md": "# Project Documentation"
-                }
-            }),
-        )
-        .await;
-
-        // Use the temp_path as the root directory, not just its filename
-        let project = Project::test(fs.clone(), [temp_dir.path()], cx).await;
-
-        // Test cases where the function should return Some
-        cx.update(|cx| {
-            // Project-relative paths should return Some
-            // Create paths using the last segment of the temp path to simulate a project-relative path
-            let root_dir_name = Path::new(&temp_path)
-                .file_name()
-                .unwrap_or_else(|| std::ffi::OsStr::new("temp"))
-                .to_string_lossy();
-
-            assert!(
-                to_absolute_path(&format!("{root_dir_name}/src/main.rs"), project.clone(), cx)
-                    .is_some(),
-                "Failed to resolve main.rs path"
-            );
-
-            assert!(
-                to_absolute_path(
-                    &format!("{root_dir_name}/docs/readme.md",),
-                    project.clone(),
-                    cx,
-                )
-                .is_some(),
-                "Failed to resolve readme.md path"
-            );
-
-            // External URL should return None
-            let result = to_absolute_path("https://example.com", project.clone(), cx);
-            assert_eq!(result, None, "External URLs should return None");
-
-            // Path outside project
-            let result = to_absolute_path("../invalid/path", project.clone(), cx);
-            assert_eq!(result, None, "Paths outside the project should return None");
-        });
-    }
-
-    fn init_test(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-        });
-    }
-}
diff --git a/crates/agent/src/tools/read_file_tool.rs b/crates/agent/src/tools/read_file_tool.rs
deleted file mode 100644
index acfd4a1674..0000000000
--- a/crates/agent/src/tools/read_file_tool.rs
+++ /dev/null
@@ -1,1037 +0,0 @@
-use action_log::ActionLog;
-use agent_client_protocol::{self as acp, ToolCallUpdateFields};
-use anyhow::{Context as _, Result, anyhow};
-use gpui::{App, Entity, SharedString, Task, WeakEntity};
-use indoc::formatdoc;
-use language::Point;
-use language_model::{LanguageModelImage, LanguageModelToolResultContent};
-use project::{AgentLocation, ImageItem, Project, WorktreeSettings, image_store};
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use settings::Settings;
-use std::sync::Arc;
-use util::markdown::MarkdownCodeBlock;
-
-use crate::{AgentTool, Thread, ToolCallEventStream, outline};
-
-/// Reads the content of the given file in the project.
-///
-/// - Never attempt to read a path that hasn't been previously mentioned.
-/// - For large files, this tool returns a file outline with symbol names and line numbers instead of the full content.
-///   This outline IS a successful response - use the line numbers to read specific sections with start_line/end_line.
-///   Do NOT retry reading the same file without line numbers if you receive an outline.
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct ReadFileToolInput {
-    /// The relative path of the file to read.
-    ///
-    /// This path should never be absolute, and the first component of the path should always be a root directory in a project.
-    ///
-    /// <example>
-    /// If the project has the following root directories:
-    ///
-    /// - /a/b/directory1
-    /// - /c/d/directory2
-    ///
-    /// If you want to access `file.txt` in `directory1`, you should use the path `directory1/file.txt`.
-    /// If you want to access `file.txt` in `directory2`, you should use the path `directory2/file.txt`.
-    /// </example>
-    pub path: String,
-    /// Optional line number to start reading on (1-based index)
-    #[serde(default)]
-    pub start_line: Option<u32>,
-    /// Optional line number to end reading on (1-based index, inclusive)
-    #[serde(default)]
-    pub end_line: Option<u32>,
-}
-
-pub struct ReadFileTool {
-    thread: WeakEntity<Thread>,
-    project: Entity<Project>,
-    action_log: Entity<ActionLog>,
-}
-
-impl ReadFileTool {
-    pub fn new(
-        thread: WeakEntity<Thread>,
-        project: Entity<Project>,
-        action_log: Entity<ActionLog>,
-    ) -> Self {
-        Self {
-            thread,
-            project,
-            action_log,
-        }
-    }
-}
-
-impl AgentTool for ReadFileTool {
-    type Input = ReadFileToolInput;
-    type Output = LanguageModelToolResultContent;
-
-    fn name() -> &'static str {
-        "read_file"
-    }
-
-    fn kind() -> acp::ToolKind {
-        acp::ToolKind::Read
-    }
-
-    fn initial_title(
-        &self,
-        input: Result<Self::Input, serde_json::Value>,
-        cx: &mut App,
-    ) -> SharedString {
-        if let Ok(input) = input
-            && let Some(project_path) = self.project.read(cx).find_project_path(&input.path, cx)
-            && let Some(path) = self
-                .project
-                .read(cx)
-                .short_full_path_for_project_path(&project_path, cx)
-        {
-            match (input.start_line, input.end_line) {
-                (Some(start), Some(end)) => {
-                    format!("Read file `{path}` (lines {}-{})", start, end,)
-                }
-                (Some(start), None) => {
-                    format!("Read file `{path}` (from line {})", start)
-                }
-                _ => format!("Read file `{path}`"),
-            }
-            .into()
-        } else {
-            "Read file".into()
-        }
-    }
-
-    fn run(
-        self: Arc<Self>,
-        input: Self::Input,
-        event_stream: ToolCallEventStream,
-        cx: &mut App,
-    ) -> Task<Result<LanguageModelToolResultContent>> {
-        let Some(project_path) = self.project.read(cx).find_project_path(&input.path, cx) else {
-            return Task::ready(Err(anyhow!("Path {} not found in project", &input.path)));
-        };
-        let Some(abs_path) = self.project.read(cx).absolute_path(&project_path, cx) else {
-            return Task::ready(Err(anyhow!(
-                "Failed to convert {} to absolute path",
-                &input.path
-            )));
-        };
-
-        // Error out if this path is either excluded or private in global settings
-        let global_settings = WorktreeSettings::get_global(cx);
-        if global_settings.is_path_excluded(&project_path.path) {
-            return Task::ready(Err(anyhow!(
-                "Cannot read file because its path matches the global `file_scan_exclusions` setting: {}",
-                &input.path
-            )));
-        }
-
-        if global_settings.is_path_private(&project_path.path) {
-            return Task::ready(Err(anyhow!(
-                "Cannot read file because its path matches the global `private_files` setting: {}",
-                &input.path
-            )));
-        }
-
-        // Error out if this path is either excluded or private in worktree settings
-        let worktree_settings = WorktreeSettings::get(Some((&project_path).into()), cx);
-        if worktree_settings.is_path_excluded(&project_path.path) {
-            return Task::ready(Err(anyhow!(
-                "Cannot read file because its path matches the worktree `file_scan_exclusions` setting: {}",
-                &input.path
-            )));
-        }
-
-        if worktree_settings.is_path_private(&project_path.path) {
-            return Task::ready(Err(anyhow!(
-                "Cannot read file because its path matches the worktree `private_files` setting: {}",
-                &input.path
-            )));
-        }
-
-        let file_path = input.path.clone();
-
-        event_stream.update_fields(ToolCallUpdateFields::new().locations(vec![
-                acp::ToolCallLocation::new(&abs_path)
-                    .line(input.start_line.map(|line| line.saturating_sub(1))),
-            ]));
-
-        if image_store::is_image_file(&self.project, &project_path, cx) {
-            return cx.spawn(async move |cx| {
-                let image_entity: Entity<ImageItem> = cx
-                    .update(|cx| {
-                        self.project.update(cx, |project, cx| {
-                            project.open_image(project_path.clone(), cx)
-                        })
-                    })?
-                    .await?;
-
-                let image =
-                    image_entity.read_with(cx, |image_item, _| Arc::clone(&image_item.image))?;
-
-                let language_model_image = cx
-                    .update(|cx| LanguageModelImage::from_image(image, cx))?
-                    .await
-                    .context("processing image")?;
-
-                Ok(language_model_image.into())
-            });
-        }
-
-        let project = self.project.clone();
-        let action_log = self.action_log.clone();
-
-        cx.spawn(async move |cx| {
-            let buffer = cx
-                .update(|cx| {
-                    project.update(cx, |project, cx| {
-                        project.open_buffer(project_path.clone(), cx)
-                    })
-                })?
-                .await?;
-            if buffer.read_with(cx, |buffer, _| {
-                buffer
-                    .file()
-                    .as_ref()
-                    .is_none_or(|file| !file.disk_state().exists())
-            })? {
-                anyhow::bail!("{file_path} not found");
-            }
-
-            // Record the file read time and mtime
-            if let Some(mtime) = buffer.read_with(cx, |buffer, _| {
-                buffer.file().and_then(|file| file.disk_state().mtime())
-            })? {
-                self.thread
-                    .update(cx, |thread, _| {
-                        thread.file_read_times.insert(abs_path.to_path_buf(), mtime);
-                    })
-                    .ok();
-            }
-
-            let mut anchor = None;
-
-            // Check if specific line ranges are provided
-            let result = if input.start_line.is_some() || input.end_line.is_some() {
-                let result = buffer.read_with(cx, |buffer, _cx| {
-                    // .max(1) because despite instructions to be 1-indexed, sometimes the model passes 0.
-                    let start = input.start_line.unwrap_or(1).max(1);
-                    let start_row = start - 1;
-                    if start_row <= buffer.max_point().row {
-                        let column = buffer.line_indent_for_row(start_row).raw_len();
-                        anchor = Some(buffer.anchor_before(Point::new(start_row, column)));
-                    }
-
-                    let mut end_row = input.end_line.unwrap_or(u32::MAX);
-                    if end_row <= start_row {
-                        end_row = start_row + 1; // read at least one lines
-                    }
-                    let start = buffer.anchor_before(Point::new(start_row, 0));
-                    let end = buffer.anchor_before(Point::new(end_row, 0));
-                    buffer.text_for_range(start..end).collect::<String>()
-                })?;
-
-                action_log.update(cx, |log, cx| {
-                    log.buffer_read(buffer.clone(), cx);
-                })?;
-
-                Ok(result.into())
-            } else {
-                // No line ranges specified, so check file size to see if it's too big.
-                let buffer_content = outline::get_buffer_content_or_outline(
-                    buffer.clone(),
-                    Some(&abs_path.to_string_lossy()),
-                    cx,
-                )
-                .await?;
-
-                action_log.update(cx, |log, cx| {
-                    log.buffer_read(buffer.clone(), cx);
-                })?;
-
-                if buffer_content.is_outline {
-                    Ok(formatdoc! {"
-                        SUCCESS: File outline retrieved. This file is too large to read all at once, so the outline below shows the file's structure with line numbers.
-
-                        IMPORTANT: Do NOT retry this call without line numbers - you will get the same outline.
-                        Instead, use the line numbers below to read specific sections by calling this tool again with start_line and end_line parameters.
-
-                        {}
-
-                        NEXT STEPS: To read a specific symbol's implementation, call read_file with the same path plus start_line and end_line from the outline above.
-                        For example, to read a function shown as [L100-150], use start_line: 100 and end_line: 150.", buffer_content.text
-                    }
-                    .into())
-                } else {
-                    Ok(buffer_content.text.into())
-                }
-            };
-
-            project.update(cx, |project, cx| {
-                project.set_agent_location(
-                    Some(AgentLocation {
-                        buffer: buffer.downgrade(),
-                        position: anchor.unwrap_or_else(|| {
-                            text::Anchor::min_for_buffer(buffer.read(cx).remote_id())
-                        }),
-                    }),
-                    cx,
-                );
-                if let Ok(LanguageModelToolResultContent::Text(text)) = &result {
-                    let markdown = MarkdownCodeBlock {
-                        tag: &input.path,
-                        text,
-                    }
-                    .to_string();
-                    event_stream.update_fields(ToolCallUpdateFields::new().content(vec![
-                        acp::ToolCallContent::Content(acp::Content::new(markdown)),
-                    ]));
-                }
-            })?;
-
-            result
-        })
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use crate::{ContextServerRegistry, Templates, Thread};
-    use gpui::{AppContext, TestAppContext, UpdateGlobal as _};
-    use language_model::fake_provider::FakeLanguageModel;
-    use project::{FakeFs, Project};
-    use prompt_store::ProjectContext;
-    use serde_json::json;
-    use settings::SettingsStore;
-    use std::sync::Arc;
-    use util::path;
-
-    #[gpui::test]
-    async fn test_read_nonexistent_file(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(path!("/root"), json!({})).await;
-        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-        let context_server_registry =
-            cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
-        let model = Arc::new(FakeLanguageModel::default());
-        let thread = cx.new(|cx| {
-            Thread::new(
-                project.clone(),
-                cx.new(|_cx| ProjectContext::default()),
-                context_server_registry,
-                Templates::new(),
-                Some(model),
-                cx,
-            )
-        });
-        let tool = Arc::new(ReadFileTool::new(thread.downgrade(), project, action_log));
-        let (event_stream, _) = ToolCallEventStream::test();
-
-        let result = cx
-            .update(|cx| {
-                let input = ReadFileToolInput {
-                    path: "root/nonexistent_file.txt".to_string(),
-                    start_line: None,
-                    end_line: None,
-                };
-                tool.run(input, event_stream, cx)
-            })
-            .await;
-        assert_eq!(
-            result.unwrap_err().to_string(),
-            "root/nonexistent_file.txt not found"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_read_small_file(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/root"),
-            json!({
-                "small_file.txt": "This is a small file content"
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-        let context_server_registry =
-            cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
-        let model = Arc::new(FakeLanguageModel::default());
-        let thread = cx.new(|cx| {
-            Thread::new(
-                project.clone(),
-                cx.new(|_cx| ProjectContext::default()),
-                context_server_registry,
-                Templates::new(),
-                Some(model),
-                cx,
-            )
-        });
-        let tool = Arc::new(ReadFileTool::new(thread.downgrade(), project, action_log));
-        let result = cx
-            .update(|cx| {
-                let input = ReadFileToolInput {
-                    path: "root/small_file.txt".into(),
-                    start_line: None,
-                    end_line: None,
-                };
-                tool.run(input, ToolCallEventStream::test().0, cx)
-            })
-            .await;
-        assert_eq!(result.unwrap(), "This is a small file content".into());
-    }
-
-    #[gpui::test]
-    async fn test_read_large_file(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/root"),
-            json!({
-                "large_file.rs": (0..1000).map(|i| format!("struct Test{} {{\n    a: u32,\n    b: usize,\n}}", i)).collect::<Vec<_>>().join("\n")
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-        let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-        language_registry.add(language::rust_lang());
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-        let context_server_registry =
-            cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
-        let model = Arc::new(FakeLanguageModel::default());
-        let thread = cx.new(|cx| {
-            Thread::new(
-                project.clone(),
-                cx.new(|_cx| ProjectContext::default()),
-                context_server_registry,
-                Templates::new(),
-                Some(model),
-                cx,
-            )
-        });
-        let tool = Arc::new(ReadFileTool::new(thread.downgrade(), project, action_log));
-        let result = cx
-            .update(|cx| {
-                let input = ReadFileToolInput {
-                    path: "root/large_file.rs".into(),
-                    start_line: None,
-                    end_line: None,
-                };
-                tool.clone().run(input, ToolCallEventStream::test().0, cx)
-            })
-            .await
-            .unwrap();
-        let content = result.to_str().unwrap();
-
-        assert_eq!(
-            content.lines().skip(7).take(6).collect::<Vec<_>>(),
-            vec![
-                "struct Test0 [L1-4]",
-                " a [L2]",
-                " b [L3]",
-                "struct Test1 [L5-8]",
-                " a [L6]",
-                " b [L7]",
-            ]
-        );
-
-        let result = cx
-            .update(|cx| {
-                let input = ReadFileToolInput {
-                    path: "root/large_file.rs".into(),
-                    start_line: None,
-                    end_line: None,
-                };
-                tool.run(input, ToolCallEventStream::test().0, cx)
-            })
-            .await
-            .unwrap();
-        let content = result.to_str().unwrap();
-        let expected_content = (0..1000)
-            .flat_map(|i| {
-                vec![
-                    format!("struct Test{} [L{}-{}]", i, i * 4 + 1, i * 4 + 4),
-                    format!(" a [L{}]", i * 4 + 2),
-                    format!(" b [L{}]", i * 4 + 3),
-                ]
-            })
-            .collect::<Vec<_>>();
-        pretty_assertions::assert_eq!(
-            content
-                .lines()
-                .skip(7)
-                .take(expected_content.len())
-                .collect::<Vec<_>>(),
-            expected_content
-        );
-    }
-
-    #[gpui::test]
-    async fn test_read_file_with_line_range(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/root"),
-            json!({
-                "multiline.txt": "Line 1\nLine 2\nLine 3\nLine 4\nLine 5"
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-        let context_server_registry =
-            cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
-        let model = Arc::new(FakeLanguageModel::default());
-        let thread = cx.new(|cx| {
-            Thread::new(
-                project.clone(),
-                cx.new(|_cx| ProjectContext::default()),
-                context_server_registry,
-                Templates::new(),
-                Some(model),
-                cx,
-            )
-        });
-        let tool = Arc::new(ReadFileTool::new(thread.downgrade(), project, action_log));
-        let result = cx
-            .update(|cx| {
-                let input = ReadFileToolInput {
-                    path: "root/multiline.txt".to_string(),
-                    start_line: Some(2),
-                    end_line: Some(4),
-                };
-                tool.run(input, ToolCallEventStream::test().0, cx)
-            })
-            .await;
-        assert_eq!(result.unwrap(), "Line 2\nLine 3\nLine 4\n".into());
-    }
-
-    #[gpui::test]
-    async fn test_read_file_line_range_edge_cases(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/root"),
-            json!({
-                "multiline.txt": "Line 1\nLine 2\nLine 3\nLine 4\nLine 5"
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-        let context_server_registry =
-            cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
-        let model = Arc::new(FakeLanguageModel::default());
-        let thread = cx.new(|cx| {
-            Thread::new(
-                project.clone(),
-                cx.new(|_cx| ProjectContext::default()),
-                context_server_registry,
-                Templates::new(),
-                Some(model),
-                cx,
-            )
-        });
-        let tool = Arc::new(ReadFileTool::new(thread.downgrade(), project, action_log));
-
-        // start_line of 0 should be treated as 1
-        let result = cx
-            .update(|cx| {
-                let input = ReadFileToolInput {
-                    path: "root/multiline.txt".to_string(),
-                    start_line: Some(0),
-                    end_line: Some(2),
-                };
-                tool.clone().run(input, ToolCallEventStream::test().0, cx)
-            })
-            .await;
-        assert_eq!(result.unwrap(), "Line 1\nLine 2\n".into());
-
-        // end_line of 0 should result in at least 1 line
-        let result = cx
-            .update(|cx| {
-                let input = ReadFileToolInput {
-                    path: "root/multiline.txt".to_string(),
-                    start_line: Some(1),
-                    end_line: Some(0),
-                };
-                tool.clone().run(input, ToolCallEventStream::test().0, cx)
-            })
-            .await;
-        assert_eq!(result.unwrap(), "Line 1\n".into());
-
-        // when start_line > end_line, should still return at least 1 line
-        let result = cx
-            .update(|cx| {
-                let input = ReadFileToolInput {
-                    path: "root/multiline.txt".to_string(),
-                    start_line: Some(3),
-                    end_line: Some(2),
-                };
-                tool.clone().run(input, ToolCallEventStream::test().0, cx)
-            })
-            .await;
-        assert_eq!(result.unwrap(), "Line 3\n".into());
-    }
-
-    fn init_test(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-        });
-    }
-
-    #[gpui::test]
-    async fn test_read_file_security(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-
-        fs.insert_tree(
-            path!("/"),
-            json!({
-                "project_root": {
-                    "allowed_file.txt": "This file is in the project",
-                    ".mysecrets": "SECRET_KEY=abc123",
-                    ".secretdir": {
-                        "config": "special configuration"
-                    },
-                    ".mymetadata": "custom metadata",
-                    "subdir": {
-                        "normal_file.txt": "Normal file content",
-                        "special.privatekey": "private key content",
-                        "data.mysensitive": "sensitive data"
-                    }
-                },
-                "outside_project": {
-                    "sensitive_file.txt": "This file is outside the project"
-                }
-            }),
-        )
-        .await;
-
-        cx.update(|cx| {
-            use gpui::UpdateGlobal;
-            use settings::SettingsStore;
-            SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |settings| {
-                    settings.project.worktree.file_scan_exclusions = Some(vec![
-                        "**/.secretdir".to_string(),
-                        "**/.mymetadata".to_string(),
-                    ]);
-                    settings.project.worktree.private_files = Some(
-                        vec![
-                            "**/.mysecrets".to_string(),
-                            "**/*.privatekey".to_string(),
-                            "**/*.mysensitive".to_string(),
-                        ]
-                        .into(),
-                    );
-                });
-            });
-        });
-
-        let project = Project::test(fs.clone(), [path!("/project_root").as_ref()], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-        let context_server_registry =
-            cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
-        let model = Arc::new(FakeLanguageModel::default());
-        let thread = cx.new(|cx| {
-            Thread::new(
-                project.clone(),
-                cx.new(|_cx| ProjectContext::default()),
-                context_server_registry,
-                Templates::new(),
-                Some(model),
-                cx,
-            )
-        });
-        let tool = Arc::new(ReadFileTool::new(thread.downgrade(), project, action_log));
-
-        // Reading a file outside the project worktree should fail
-        let result = cx
-            .update(|cx| {
-                let input = ReadFileToolInput {
-                    path: "/outside_project/sensitive_file.txt".to_string(),
-                    start_line: None,
-                    end_line: None,
-                };
-                tool.clone().run(input, ToolCallEventStream::test().0, cx)
-            })
-            .await;
-        assert!(
-            result.is_err(),
-            "read_file_tool should error when attempting to read an absolute path outside a worktree"
-        );
-
-        // Reading a file within the project should succeed
-        let result = cx
-            .update(|cx| {
-                let input = ReadFileToolInput {
-                    path: "project_root/allowed_file.txt".to_string(),
-                    start_line: None,
-                    end_line: None,
-                };
-                tool.clone().run(input, ToolCallEventStream::test().0, cx)
-            })
-            .await;
-        assert!(
-            result.is_ok(),
-            "read_file_tool should be able to read files inside worktrees"
-        );
-
-        // Reading files that match file_scan_exclusions should fail
-        let result = cx
-            .update(|cx| {
-                let input = ReadFileToolInput {
-                    path: "project_root/.secretdir/config".to_string(),
-                    start_line: None,
-                    end_line: None,
-                };
-                tool.clone().run(input, ToolCallEventStream::test().0, cx)
-            })
-            .await;
-        assert!(
-            result.is_err(),
-            "read_file_tool should error when attempting to read files in .secretdir (file_scan_exclusions)"
-        );
-
-        let result = cx
-            .update(|cx| {
-                let input = ReadFileToolInput {
-                    path: "project_root/.mymetadata".to_string(),
-                    start_line: None,
-                    end_line: None,
-                };
-                tool.clone().run(input, ToolCallEventStream::test().0, cx)
-            })
-            .await;
-        assert!(
-            result.is_err(),
-            "read_file_tool should error when attempting to read .mymetadata files (file_scan_exclusions)"
-        );
-
-        // Reading private files should fail
-        let result = cx
-            .update(|cx| {
-                let input = ReadFileToolInput {
-                    path: "project_root/.mysecrets".to_string(),
-                    start_line: None,
-                    end_line: None,
-                };
-                tool.clone().run(input, ToolCallEventStream::test().0, cx)
-            })
-            .await;
-        assert!(
-            result.is_err(),
-            "read_file_tool should error when attempting to read .mysecrets (private_files)"
-        );
-
-        let result = cx
-            .update(|cx| {
-                let input = ReadFileToolInput {
-                    path: "project_root/subdir/special.privatekey".to_string(),
-                    start_line: None,
-                    end_line: None,
-                };
-                tool.clone().run(input, ToolCallEventStream::test().0, cx)
-            })
-            .await;
-        assert!(
-            result.is_err(),
-            "read_file_tool should error when attempting to read .privatekey files (private_files)"
-        );
-
-        let result = cx
-            .update(|cx| {
-                let input = ReadFileToolInput {
-                    path: "project_root/subdir/data.mysensitive".to_string(),
-                    start_line: None,
-                    end_line: None,
-                };
-                tool.clone().run(input, ToolCallEventStream::test().0, cx)
-            })
-            .await;
-        assert!(
-            result.is_err(),
-            "read_file_tool should error when attempting to read .mysensitive files (private_files)"
-        );
-
-        // Reading a normal file should still work, even with private_files configured
-        let result = cx
-            .update(|cx| {
-                let input = ReadFileToolInput {
-                    path: "project_root/subdir/normal_file.txt".to_string(),
-                    start_line: None,
-                    end_line: None,
-                };
-                tool.clone().run(input, ToolCallEventStream::test().0, cx)
-            })
-            .await;
-        assert!(result.is_ok(), "Should be able to read normal files");
-        assert_eq!(result.unwrap(), "Normal file content".into());
-
-        // Path traversal attempts with .. should fail
-        let result = cx
-            .update(|cx| {
-                let input = ReadFileToolInput {
-                    path: "project_root/../outside_project/sensitive_file.txt".to_string(),
-                    start_line: None,
-                    end_line: None,
-                };
-                tool.run(input, ToolCallEventStream::test().0, cx)
-            })
-            .await;
-        assert!(
-            result.is_err(),
-            "read_file_tool should error when attempting to read a relative path that resolves to outside a worktree"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_read_file_with_multiple_worktree_settings(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-
-        // Create first worktree with its own private_files setting
-        fs.insert_tree(
-            path!("/worktree1"),
-            json!({
-                "src": {
-                    "main.rs": "fn main() { println!(\"Hello from worktree1\"); }",
-                    "secret.rs": "const API_KEY: &str = \"secret_key_1\";",
-                    "config.toml": "[database]\nurl = \"postgres://localhost/db1\""
-                },
-                "tests": {
-                    "test.rs": "mod tests { fn test_it() {} }",
-                    "fixture.sql": "CREATE TABLE users (id INT, name VARCHAR(255));"
-                },
-                ".zed": {
-                    "settings.json": r#"{
-                        "file_scan_exclusions": ["**/fixture.*"],
-                        "private_files": ["**/secret.rs", "**/config.toml"]
-                    }"#
-                }
-            }),
-        )
-        .await;
-
-        // Create second worktree with different private_files setting
-        fs.insert_tree(
-            path!("/worktree2"),
-            json!({
-                "lib": {
-                    "public.js": "export function greet() { return 'Hello from worktree2'; }",
-                    "private.js": "const SECRET_TOKEN = \"private_token_2\";",
-                    "data.json": "{\"api_key\": \"json_secret_key\"}"
-                },
-                "docs": {
-                    "README.md": "# Public Documentation",
-                    "internal.md": "# Internal Secrets and Configuration"
-                },
-                ".zed": {
-                    "settings.json": r#"{
-                        "file_scan_exclusions": ["**/internal.*"],
-                        "private_files": ["**/private.js", "**/data.json"]
-                    }"#
-                }
-            }),
-        )
-        .await;
-
-        // Set global settings
-        cx.update(|cx| {
-            SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |settings| {
-                    settings.project.worktree.file_scan_exclusions =
-                        Some(vec!["**/.git".to_string(), "**/node_modules".to_string()]);
-                    settings.project.worktree.private_files =
-                        Some(vec!["**/.env".to_string()].into());
-                });
-            });
-        });
-
-        let project = Project::test(
-            fs.clone(),
-            [path!("/worktree1").as_ref(), path!("/worktree2").as_ref()],
-            cx,
-        )
-        .await;
-
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-        let context_server_registry =
-            cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
-        let model = Arc::new(FakeLanguageModel::default());
-        let thread = cx.new(|cx| {
-            Thread::new(
-                project.clone(),
-                cx.new(|_cx| ProjectContext::default()),
-                context_server_registry,
-                Templates::new(),
-                Some(model),
-                cx,
-            )
-        });
-        let tool = Arc::new(ReadFileTool::new(
-            thread.downgrade(),
-            project.clone(),
-            action_log.clone(),
-        ));
-
-        // Test reading allowed files in worktree1
-        let result = cx
-            .update(|cx| {
-                let input = ReadFileToolInput {
-                    path: "worktree1/src/main.rs".to_string(),
-                    start_line: None,
-                    end_line: None,
-                };
-                tool.clone().run(input, ToolCallEventStream::test().0, cx)
-            })
-            .await
-            .unwrap();
-
-        assert_eq!(
-            result,
-            "fn main() { println!(\"Hello from worktree1\"); }".into()
-        );
-
-        // Test reading private file in worktree1 should fail
-        let result = cx
-            .update(|cx| {
-                let input = ReadFileToolInput {
-                    path: "worktree1/src/secret.rs".to_string(),
-                    start_line: None,
-                    end_line: None,
-                };
-                tool.clone().run(input, ToolCallEventStream::test().0, cx)
-            })
-            .await;
-
-        assert!(result.is_err());
-        assert!(
-            result
-                .unwrap_err()
-                .to_string()
-                .contains("worktree `private_files` setting"),
-            "Error should mention worktree private_files setting"
-        );
-
-        // Test reading excluded file in worktree1 should fail
-        let result = cx
-            .update(|cx| {
-                let input = ReadFileToolInput {
-                    path: "worktree1/tests/fixture.sql".to_string(),
-                    start_line: None,
-                    end_line: None,
-                };
-                tool.clone().run(input, ToolCallEventStream::test().0, cx)
-            })
-            .await;
-
-        assert!(result.is_err());
-        assert!(
-            result
-                .unwrap_err()
-                .to_string()
-                .contains("worktree `file_scan_exclusions` setting"),
-            "Error should mention worktree file_scan_exclusions setting"
-        );
-
-        // Test reading allowed files in worktree2
-        let result = cx
-            .update(|cx| {
-                let input = ReadFileToolInput {
-                    path: "worktree2/lib/public.js".to_string(),
-                    start_line: None,
-                    end_line: None,
-                };
-                tool.clone().run(input, ToolCallEventStream::test().0, cx)
-            })
-            .await
-            .unwrap();
-
-        assert_eq!(
-            result,
-            "export function greet() { return 'Hello from worktree2'; }".into()
-        );
-
-        // Test reading private file in worktree2 should fail
-        let result = cx
-            .update(|cx| {
-                let input = ReadFileToolInput {
-                    path: "worktree2/lib/private.js".to_string(),
-                    start_line: None,
-                    end_line: None,
-                };
-                tool.clone().run(input, ToolCallEventStream::test().0, cx)
-            })
-            .await;
-
-        assert!(result.is_err());
-        assert!(
-            result
-                .unwrap_err()
-                .to_string()
-                .contains("worktree `private_files` setting"),
-            "Error should mention worktree private_files setting"
-        );
-
-        // Test reading excluded file in worktree2 should fail
-        let result = cx
-            .update(|cx| {
-                let input = ReadFileToolInput {
-                    path: "worktree2/docs/internal.md".to_string(),
-                    start_line: None,
-                    end_line: None,
-                };
-                tool.clone().run(input, ToolCallEventStream::test().0, cx)
-            })
-            .await;
-
-        assert!(result.is_err());
-        assert!(
-            result
-                .unwrap_err()
-                .to_string()
-                .contains("worktree `file_scan_exclusions` setting"),
-            "Error should mention worktree file_scan_exclusions setting"
-        );
-
-        // Test that files allowed in one worktree but not in another are handled correctly
-        // (e.g., config.toml is private in worktree1 but doesn't exist in worktree2)
-        let result = cx
-            .update(|cx| {
-                let input = ReadFileToolInput {
-                    path: "worktree1/src/config.toml".to_string(),
-                    start_line: None,
-                    end_line: None,
-                };
-                tool.clone().run(input, ToolCallEventStream::test().0, cx)
-            })
-            .await;
-
-        assert!(result.is_err());
-        assert!(
-            result
-                .unwrap_err()
-                .to_string()
-                .contains("worktree `private_files` setting"),
-            "Config.toml should be blocked by worktree1's private_files setting"
-        );
-    }
-}
diff --git a/crates/agent/src/tools/terminal_tool.rs b/crates/agent/src/tools/terminal_tool.rs
deleted file mode 100644
index 2db4a2d860..0000000000
--- a/crates/agent/src/tools/terminal_tool.rs
+++ /dev/null
@@ -1,212 +0,0 @@
-use agent_client_protocol as acp;
-use anyhow::Result;
-use gpui::{App, Entity, SharedString, Task};
-use project::Project;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use std::{
-    path::{Path, PathBuf},
-    rc::Rc,
-    sync::Arc,
-};
-use util::markdown::MarkdownInlineCode;
-
-use crate::{AgentTool, ThreadEnvironment, ToolCallEventStream};
-
-const COMMAND_OUTPUT_LIMIT: u64 = 16 * 1024;
-
-/// Executes a shell one-liner and returns the combined output.
-///
-/// This tool spawns a process using the user's shell, reads from stdout and stderr (preserving the order of writes), and returns a string with the combined output result.
-///
-/// The output results will be shown to the user already, only list it again if necessary, avoid being redundant.
-///
-/// Make sure you use the `cd` parameter to navigate to one of the root directories of the project. NEVER do it as part of the `command` itself, otherwise it will error.
-///
-/// Do not use this tool for commands that run indefinitely, such as servers (like `npm run start`, `npm run dev`, `python -m http.server`, etc) or file watchers that don't terminate on their own.
-///
-/// Remember that each invocation of this tool will spawn a new shell process, so you can't rely on any state from previous invocations.
-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
-pub struct TerminalToolInput {
-    /// The one-liner command to execute.
-    command: String,
-    /// Working directory for the command. This must be one of the root directories of the project.
-    cd: String,
-}
-
-pub struct TerminalTool {
-    project: Entity<Project>,
-    environment: Rc<dyn ThreadEnvironment>,
-}
-
-impl TerminalTool {
-    pub fn new(project: Entity<Project>, environment: Rc<dyn ThreadEnvironment>) -> Self {
-        Self {
-            project,
-            environment,
-        }
-    }
-}
-
-impl AgentTool for TerminalTool {
-    type Input = TerminalToolInput;
-    type Output = String;
-
-    fn name() -> &'static str {
-        "terminal"
-    }
-
-    fn kind() -> acp::ToolKind {
-        acp::ToolKind::Execute
-    }
-
-    fn initial_title(
-        &self,
-        input: Result<Self::Input, serde_json::Value>,
-        _cx: &mut App,
-    ) -> SharedString {
-        if let Ok(input) = input {
-            let mut lines = input.command.lines();
-            let first_line = lines.next().unwrap_or_default();
-            let remaining_line_count = lines.count();
-            match remaining_line_count {
-                0 => MarkdownInlineCode(first_line).to_string().into(),
-                1 => MarkdownInlineCode(&format!(
-                    "{} - {} more line",
-                    first_line, remaining_line_count
-                ))
-                .to_string()
-                .into(),
-                n => MarkdownInlineCode(&format!("{} - {} more lines", first_line, n))
-                    .to_string()
-                    .into(),
-            }
-        } else {
-            "".into()
-        }
-    }
-
-    fn run(
-        self: Arc<Self>,
-        input: Self::Input,
-        event_stream: ToolCallEventStream,
-        cx: &mut App,
-    ) -> Task<Result<Self::Output>> {
-        let working_dir = match working_dir(&input, &self.project, cx) {
-            Ok(dir) => dir,
-            Err(err) => return Task::ready(Err(err)),
-        };
-
-        let authorize = event_stream.authorize(self.initial_title(Ok(input.clone()), cx), cx);
-        cx.spawn(async move |cx| {
-            authorize.await?;
-
-            let terminal = self
-                .environment
-                .create_terminal(
-                    input.command.clone(),
-                    working_dir,
-                    Some(COMMAND_OUTPUT_LIMIT),
-                    cx,
-                )
-                .await?;
-
-            let terminal_id = terminal.id(cx)?;
-            event_stream.update_fields(acp::ToolCallUpdateFields::new().content(vec![
-                acp::ToolCallContent::Terminal(acp::Terminal::new(terminal_id)),
-            ]));
-
-            let exit_status = terminal.wait_for_exit(cx)?.await;
-            let output = terminal.current_output(cx)?;
-
-            Ok(process_content(output, &input.command, exit_status))
-        })
-    }
-}
-
-fn process_content(
-    output: acp::TerminalOutputResponse,
-    command: &str,
-    exit_status: acp::TerminalExitStatus,
-) -> String {
-    let content = output.output.trim();
-    let is_empty = content.is_empty();
-
-    let content = format!("```\n{content}\n```");
-    let content = if output.truncated {
-        format!(
-            "Command output too long. The first {} bytes:\n\n{content}",
-            content.len(),
-        )
-    } else {
-        content
-    };
-
-    let content = match exit_status.exit_code {
-        Some(0) => {
-            if is_empty {
-                "Command executed successfully.".to_string()
-            } else {
-                content
-            }
-        }
-        Some(exit_code) => {
-            if is_empty {
-                format!("Command \"{command}\" failed with exit code {}.", exit_code)
-            } else {
-                format!(
-                    "Command \"{command}\" failed with exit code {}.\n\n{content}",
-                    exit_code
-                )
-            }
-        }
-        None => {
-            format!(
-                "Command failed or was interrupted.\nPartial output captured:\n\n{}",
-                content,
-            )
-        }
-    };
-    content
-}
-
-fn working_dir(
-    input: &TerminalToolInput,
-    project: &Entity<Project>,
-    cx: &mut App,
-) -> Result<Option<PathBuf>> {
-    let project = project.read(cx);
-    let cd = &input.cd;
-
-    if cd == "." || cd.is_empty() {
-        // Accept "." or "" as meaning "the one worktree" if we only have one worktree.
-        let mut worktrees = project.worktrees(cx);
-
-        match worktrees.next() {
-            Some(worktree) => {
-                anyhow::ensure!(
-                    worktrees.next().is_none(),
-                    "'.' is ambiguous in multi-root workspaces. Please specify a root directory explicitly.",
-                );
-                Ok(Some(worktree.read(cx).abs_path().to_path_buf()))
-            }
-            None => Ok(None),
-        }
-    } else {
-        let input_path = Path::new(cd);
-
-        if input_path.is_absolute() {
-            // Absolute paths are allowed, but only if they're in one of the project's worktrees.
-            if project
-                .worktrees(cx)
-                .any(|worktree| input_path.starts_with(&worktree.read(cx).abs_path()))
-            {
-                return Ok(Some(input_path.into()));
-            }
-        } else if let Some(worktree) = project.worktree_for_root_name(cd, cx) {
-            return Ok(Some(worktree.read(cx).abs_path().to_path_buf()));
-        }
-
-        anyhow::bail!("`cd` directory {cd:?} was not in any of the project's worktrees.");
-    }
-}
diff --git a/crates/agent/src/tools/thinking_tool.rs b/crates/agent/src/tools/thinking_tool.rs
deleted file mode 100644
index 96024326f6..0000000000
--- a/crates/agent/src/tools/thinking_tool.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-use agent_client_protocol as acp;
-use anyhow::Result;
-use gpui::{App, SharedString, Task};
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use std::sync::Arc;
-
-use crate::{AgentTool, ToolCallEventStream};
-
-/// A tool for thinking through problems, brainstorming ideas, or planning without executing any actions.
-/// Use this tool when you need to work through complex problems, develop strategies, or outline approaches before taking action.
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct ThinkingToolInput {
-    /// Content to think about. This should be a description of what to think about or a problem to solve.
-    content: String,
-}
-
-pub struct ThinkingTool;
-
-impl AgentTool for ThinkingTool {
-    type Input = ThinkingToolInput;
-    type Output = String;
-
-    fn name() -> &'static str {
-        "thinking"
-    }
-
-    fn kind() -> acp::ToolKind {
-        acp::ToolKind::Think
-    }
-
-    fn initial_title(
-        &self,
-        _input: Result<Self::Input, serde_json::Value>,
-        _cx: &mut App,
-    ) -> SharedString {
-        "Thinking".into()
-    }
-
-    fn run(
-        self: Arc<Self>,
-        input: Self::Input,
-        event_stream: ToolCallEventStream,
-        _cx: &mut App,
-    ) -> Task<Result<String>> {
-        event_stream
-            .update_fields(acp::ToolCallUpdateFields::new().content(vec![input.content.into()]));
-        Task::ready(Ok("Finished thinking.".to_string()))
-    }
-}
diff --git a/crates/agent/src/tools/web_search_tool.rs b/crates/agent/src/tools/web_search_tool.rs
deleted file mode 100644
index eb4ebacea2..0000000000
--- a/crates/agent/src/tools/web_search_tool.rs
+++ /dev/null
@@ -1,127 +0,0 @@
-use std::sync::Arc;
-
-use crate::{AgentTool, ToolCallEventStream};
-use agent_client_protocol as acp;
-use anyhow::{Result, anyhow};
-use cloud_llm_client::WebSearchResponse;
-use gpui::{App, AppContext, Task};
-use language_model::{
-    LanguageModelProviderId, LanguageModelToolResultContent, ZED_CLOUD_PROVIDER_ID,
-};
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use ui::prelude::*;
-use web_search::WebSearchRegistry;
-
-/// Search the web for information using your query.
-/// Use this when you need real-time information, facts, or data that might not be in your training.
-/// Results will include snippets and links from relevant web pages.
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct WebSearchToolInput {
-    /// The search term or question to query on the web.
-    query: String,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(transparent)]
-pub struct WebSearchToolOutput(WebSearchResponse);
-
-impl From<WebSearchToolOutput> for LanguageModelToolResultContent {
-    fn from(value: WebSearchToolOutput) -> Self {
-        serde_json::to_string(&value.0)
-            .expect("Failed to serialize WebSearchResponse")
-            .into()
-    }
-}
-
-pub struct WebSearchTool;
-
-impl AgentTool for WebSearchTool {
-    type Input = WebSearchToolInput;
-    type Output = WebSearchToolOutput;
-
-    fn name() -> &'static str {
-        "web_search"
-    }
-
-    fn kind() -> acp::ToolKind {
-        acp::ToolKind::Fetch
-    }
-
-    fn initial_title(
-        &self,
-        _input: Result<Self::Input, serde_json::Value>,
-        _cx: &mut App,
-    ) -> SharedString {
-        "Searching the Web".into()
-    }
-
-    /// We currently only support Zed Cloud as a provider.
-    fn supports_provider(provider: &LanguageModelProviderId) -> bool {
-        provider == &ZED_CLOUD_PROVIDER_ID
-    }
-
-    fn run(
-        self: Arc<Self>,
-        input: Self::Input,
-        event_stream: ToolCallEventStream,
-        cx: &mut App,
-    ) -> Task<Result<Self::Output>> {
-        let Some(provider) = WebSearchRegistry::read_global(cx).active_provider() else {
-            return Task::ready(Err(anyhow!("Web search is not available.")));
-        };
-
-        let search_task = provider.search(input.query, cx);
-        cx.background_spawn(async move {
-            let response = match search_task.await {
-                Ok(response) => response,
-                Err(err) => {
-                    event_stream
-                        .update_fields(acp::ToolCallUpdateFields::new().title("Web Search Failed"));
-                    return Err(err);
-                }
-            };
-
-            emit_update(&response, &event_stream);
-            Ok(WebSearchToolOutput(response))
-        })
-    }
-
-    fn replay(
-        &self,
-        _input: Self::Input,
-        output: Self::Output,
-        event_stream: ToolCallEventStream,
-        _cx: &mut App,
-    ) -> Result<()> {
-        emit_update(&output.0, &event_stream);
-        Ok(())
-    }
-}
-
-fn emit_update(response: &WebSearchResponse, event_stream: &ToolCallEventStream) {
-    let result_text = if response.results.len() == 1 {
-        "1 result".to_string()
-    } else {
-        format!("{} results", response.results.len())
-    };
-    event_stream.update_fields(
-        acp::ToolCallUpdateFields::new()
-            .title(format!("Searched the web: {result_text}"))
-            .content(
-                response
-                    .results
-                    .iter()
-                    .map(|result| {
-                        acp::ToolCallContent::Content(acp::Content::new(
-                            acp::ContentBlock::ResourceLink(
-                                acp::ResourceLink::new(result.title.clone(), result.url.clone())
-                                    .title(result.title.clone())
-                                    .description(result.text.clone()),
-                            ),
-                        ))
-                    })
-                    .collect::<Vec<_>>(),
-            ),
-    );
-}
diff --git a/crates/agent_servers/Cargo.toml b/crates/agent_servers/Cargo.toml
deleted file mode 100644
index 9a04fb763d..0000000000
--- a/crates/agent_servers/Cargo.toml
+++ /dev/null
@@ -1,67 +0,0 @@
-[package]
-name = "agent_servers"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[features]
-test-support = ["acp_thread/test-support", "gpui/test-support", "project/test-support", "dep:env_logger", "client/test-support", "dep:gpui_tokio", "reqwest_client/test-support"]
-e2e = []
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/agent_servers.rs"
-doctest = false
-
-[dependencies]
-acp_tools.workspace = true
-acp_thread.workspace = true
-action_log.workspace = true
-agent-client-protocol.workspace = true
-anyhow.workspace = true
-async-trait.workspace = true
-client.workspace = true
-collections.workspace = true
-env_logger = { workspace = true, optional = true }
-fs.workspace = true
-futures.workspace = true
-gpui.workspace = true
-gpui_tokio = { workspace = true, optional = true }
-http_client.workspace = true
-indoc.workspace = true
-language_model.workspace = true
-language_models.workspace = true
-log.workspace = true
-project.workspace = true
-release_channel.workspace = true
-reqwest_client = { workspace = true, optional = true }
-serde.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-smol.workspace = true
-task.workspace = true
-tempfile.workspace = true
-thiserror.workspace = true
-ui.workspace = true
-terminal.workspace = true
-uuid.workspace = true
-util.workspace = true
-watch.workspace = true
-
-[target.'cfg(unix)'.dependencies]
-libc.workspace = true
-nix.workspace = true
-
-[dev-dependencies]
-client = { workspace = true, features = ["test-support"] }
-env_logger.workspace = true
-fs.workspace = true
-language.workspace = true
-indoc.workspace = true
-acp_thread = { workspace = true, features = ["test-support"] }
-gpui = { workspace = true, features = ["test-support"] }
-gpui_tokio.workspace = true
-reqwest_client = { workspace = true, features = ["test-support"] }
diff --git a/crates/agent_servers/LICENSE-GPL b/crates/agent_servers/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/agent_servers/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/agent_servers/src/acp.rs b/crates/agent_servers/src/acp.rs
deleted file mode 100644
index 41aff48a20..0000000000
--- a/crates/agent_servers/src/acp.rs
+++ /dev/null
@@ -1,984 +0,0 @@
-use acp_thread::AgentConnection;
-use acp_tools::AcpConnectionRegistry;
-use action_log::ActionLog;
-use agent_client_protocol::{self as acp, Agent as _, ErrorCode};
-use anyhow::anyhow;
-use collections::HashMap;
-use futures::AsyncBufReadExt as _;
-use futures::io::BufReader;
-use project::Project;
-use project::agent_server_store::AgentServerCommand;
-use serde::Deserialize;
-use settings::Settings as _;
-use task::ShellBuilder;
-use util::ResultExt as _;
-
-use std::path::PathBuf;
-use std::{any::Any, cell::RefCell};
-use std::{path::Path, rc::Rc};
-use thiserror::Error;
-
-use anyhow::{Context as _, Result};
-use gpui::{App, AppContext as _, AsyncApp, Entity, SharedString, Task, WeakEntity};
-
-use acp_thread::{AcpThread, AuthRequired, LoadError, TerminalProviderEvent};
-use terminal::TerminalBuilder;
-use terminal::terminal_settings::{AlternateScroll, CursorShape, TerminalSettings};
-
-#[derive(Debug, Error)]
-#[error("Unsupported version")]
-pub struct UnsupportedVersion;
-
-pub struct AcpConnection {
-    server_name: SharedString,
-    telemetry_id: SharedString,
-    connection: Rc<acp::ClientSideConnection>,
-    sessions: Rc<RefCell<HashMap<acp::SessionId, AcpSession>>>,
-    auth_methods: Vec<acp::AuthMethod>,
-    agent_capabilities: acp::AgentCapabilities,
-    default_mode: Option<acp::SessionModeId>,
-    default_model: Option<acp::ModelId>,
-    root_dir: PathBuf,
-    // NB: Don't move this into the wait_task, since we need to ensure the process is
-    // killed on drop (setting kill_on_drop on the command seems to not always work).
-    child: smol::process::Child,
-    _io_task: Task<Result<(), acp::Error>>,
-    _wait_task: Task<Result<()>>,
-    _stderr_task: Task<Result<()>>,
-}
-
-pub struct AcpSession {
-    thread: WeakEntity<AcpThread>,
-    suppress_abort_err: bool,
-    models: Option<Rc<RefCell<acp::SessionModelState>>>,
-    session_modes: Option<Rc<RefCell<acp::SessionModeState>>>,
-}
-
-pub async fn connect(
-    server_name: SharedString,
-    command: AgentServerCommand,
-    root_dir: &Path,
-    default_mode: Option<acp::SessionModeId>,
-    default_model: Option<acp::ModelId>,
-    is_remote: bool,
-    cx: &mut AsyncApp,
-) -> Result<Rc<dyn AgentConnection>> {
-    let conn = AcpConnection::stdio(
-        server_name,
-        command.clone(),
-        root_dir,
-        default_mode,
-        default_model,
-        is_remote,
-        cx,
-    )
-    .await?;
-    Ok(Rc::new(conn) as _)
-}
-
-const MINIMUM_SUPPORTED_VERSION: acp::ProtocolVersion = acp::ProtocolVersion::V1;
-
-impl AcpConnection {
-    pub async fn stdio(
-        server_name: SharedString,
-        command: AgentServerCommand,
-        root_dir: &Path,
-        default_mode: Option<acp::SessionModeId>,
-        default_model: Option<acp::ModelId>,
-        is_remote: bool,
-        cx: &mut AsyncApp,
-    ) -> Result<Self> {
-        let shell = cx.update(|cx| TerminalSettings::get(None, cx).shell.clone())?;
-        let builder = ShellBuilder::new(&shell, cfg!(windows));
-        let mut child =
-            builder.build_command(Some(command.path.display().to_string()), &command.args);
-        child
-            .envs(command.env.iter().flatten())
-            .stdin(std::process::Stdio::piped())
-            .stdout(std::process::Stdio::piped())
-            .stderr(std::process::Stdio::piped());
-        if !is_remote {
-            child.current_dir(root_dir);
-        }
-        let mut child = child.spawn()?;
-
-        let stdout = child.stdout.take().context("Failed to take stdout")?;
-        let stdin = child.stdin.take().context("Failed to take stdin")?;
-        let stderr = child.stderr.take().context("Failed to take stderr")?;
-        log::debug!(
-            "Spawning external agent server: {:?}, {:?}",
-            command.path,
-            command.args
-        );
-        log::trace!("Spawned (pid: {})", child.id());
-
-        let sessions = Rc::new(RefCell::new(HashMap::default()));
-
-        let (release_channel, version) = cx.update(|cx| {
-            (
-                release_channel::ReleaseChannel::try_global(cx)
-                    .map(|release_channel| release_channel.display_name()),
-                release_channel::AppVersion::global(cx).to_string(),
-            )
-        })?;
-
-        let client = ClientDelegate {
-            sessions: sessions.clone(),
-            cx: cx.clone(),
-        };
-        let (connection, io_task) = acp::ClientSideConnection::new(client, stdin, stdout, {
-            let foreground_executor = cx.foreground_executor().clone();
-            move |fut| {
-                foreground_executor.spawn(fut).detach();
-            }
-        });
-
-        let io_task = cx.background_spawn(io_task);
-
-        let stderr_task = cx.background_spawn(async move {
-            let mut stderr = BufReader::new(stderr);
-            let mut line = String::new();
-            while let Ok(n) = stderr.read_line(&mut line).await
-                && n > 0
-            {
-                log::warn!("agent stderr: {}", line.trim());
-                line.clear();
-            }
-            Ok(())
-        });
-
-        let wait_task = cx.spawn({
-            let sessions = sessions.clone();
-            let status_fut = child.status();
-            async move |cx| {
-                let status = status_fut.await?;
-
-                for session in sessions.borrow().values() {
-                    session
-                        .thread
-                        .update(cx, |thread, cx| {
-                            thread.emit_load_error(LoadError::Exited { status }, cx)
-                        })
-                        .ok();
-                }
-
-                anyhow::Ok(())
-            }
-        });
-
-        let connection = Rc::new(connection);
-
-        cx.update(|cx| {
-            AcpConnectionRegistry::default_global(cx).update(cx, |registry, cx| {
-                registry.set_active_connection(server_name.clone(), &connection, cx)
-            });
-        })?;
-
-        let response = connection
-            .initialize(
-                acp::InitializeRequest::new(acp::ProtocolVersion::V1)
-                    .client_capabilities(
-                        acp::ClientCapabilities::new()
-                            .fs(acp::FileSystemCapability::new()
-                                .read_text_file(true)
-                                .write_text_file(true))
-                            .terminal(true)
-                            // Experimental: Allow for rendering terminal output from the agents
-                            .meta(acp::Meta::from_iter([
-                                ("terminal_output".into(), true.into()),
-                                ("terminal-auth".into(), true.into()),
-                            ])),
-                    )
-                    .client_info(
-                        acp::Implementation::new("zed", version)
-                            .title(release_channel.map(ToOwned::to_owned)),
-                    ),
-            )
-            .await?;
-
-        if response.protocol_version < MINIMUM_SUPPORTED_VERSION {
-            return Err(UnsupportedVersion.into());
-        }
-
-        let telemetry_id = response
-            .agent_info
-            // Use the one the agent provides if we have one
-            .map(|info| info.name.into())
-            // Otherwise, just use the name
-            .unwrap_or_else(|| server_name.clone());
-
-        Ok(Self {
-            auth_methods: response.auth_methods,
-            root_dir: root_dir.to_owned(),
-            connection,
-            server_name,
-            telemetry_id,
-            sessions,
-            agent_capabilities: response.agent_capabilities,
-            default_mode,
-            default_model,
-            _io_task: io_task,
-            _wait_task: wait_task,
-            _stderr_task: stderr_task,
-            child,
-        })
-    }
-
-    pub fn prompt_capabilities(&self) -> &acp::PromptCapabilities {
-        &self.agent_capabilities.prompt_capabilities
-    }
-
-    pub fn root_dir(&self) -> &Path {
-        &self.root_dir
-    }
-}
-
-impl Drop for AcpConnection {
-    fn drop(&mut self) {
-        // See the comment on the child field.
-        self.child.kill().log_err();
-    }
-}
-
-impl AgentConnection for AcpConnection {
-    fn telemetry_id(&self) -> SharedString {
-        self.telemetry_id.clone()
-    }
-
-    fn new_thread(
-        self: Rc<Self>,
-        project: Entity<Project>,
-        cwd: &Path,
-        cx: &mut App,
-    ) -> Task<Result<Entity<AcpThread>>> {
-        let name = self.server_name.clone();
-        let conn = self.connection.clone();
-        let sessions = self.sessions.clone();
-        let default_mode = self.default_mode.clone();
-        let default_model = self.default_model.clone();
-        let cwd = cwd.to_path_buf();
-        let context_server_store = project.read(cx).context_server_store().read(cx);
-        let mcp_servers = if project.read(cx).is_local() {
-            context_server_store
-                .configured_server_ids()
-                .iter()
-                .filter_map(|id| {
-                    let configuration = context_server_store.configuration_for_server(id)?;
-                    match &*configuration {
-                        project::context_server_store::ContextServerConfiguration::Custom {
-                            command,
-                            ..
-                        }
-                        | project::context_server_store::ContextServerConfiguration::Extension {
-                            command,
-                            ..
-                        } => Some(acp::McpServer::Stdio(
-                            acp::McpServerStdio::new(id.0.to_string(), &command.path)
-                                .args(command.args.clone())
-                                .env(if let Some(env) = command.env.as_ref() {
-                                    env.iter()
-                                        .map(|(name, value)| acp::EnvVariable::new(name, value))
-                                        .collect()
-                                } else {
-                                    vec![]
-                                }),
-                        )),
-                        project::context_server_store::ContextServerConfiguration::Http {
-                            url,
-                            headers,
-                        } => Some(acp::McpServer::Http(
-                            acp::McpServerHttp::new(id.0.to_string(), url.to_string()).headers(
-                                headers
-                                    .iter()
-                                    .map(|(name, value)| acp::HttpHeader::new(name, value))
-                                    .collect(),
-                            ),
-                        )),
-                    }
-                })
-                .collect()
-        } else {
-            // In SSH projects, the external agent is running on the remote
-            // machine, and currently we only run MCP servers on the local
-            // machine. So don't pass any MCP servers to the agent in that case.
-            Vec::new()
-        };
-
-        cx.spawn(async move |cx| {
-            let response = conn
-                .new_session(acp::NewSessionRequest::new(cwd).mcp_servers(mcp_servers))
-                .await
-                .map_err(|err| {
-                    if err.code == acp::ErrorCode::AuthRequired {
-                        let mut error = AuthRequired::new();
-
-                        if err.message != acp::ErrorCode::AuthRequired.to_string() {
-                            error = error.with_description(err.message);
-                        }
-
-                        anyhow!(error)
-                    } else {
-                        anyhow!(err)
-                    }
-                })?;
-
-            let modes = response.modes.map(|modes| Rc::new(RefCell::new(modes)));
-            let models = response.models.map(|models| Rc::new(RefCell::new(models)));
-
-            if let Some(default_mode) = default_mode {
-                if let Some(modes) = modes.as_ref() {
-                    let mut modes_ref = modes.borrow_mut();
-                    let has_mode = modes_ref.available_modes.iter().any(|mode| mode.id == default_mode);
-
-                    if has_mode {
-                        let initial_mode_id = modes_ref.current_mode_id.clone();
-
-                        cx.spawn({
-                            let default_mode = default_mode.clone();
-                            let session_id = response.session_id.clone();
-                            let modes = modes.clone();
-                            let conn = conn.clone();
-                            async move |_| {
-                                let result = conn.set_session_mode(acp::SetSessionModeRequest::new(session_id, default_mode))
-                                .await.log_err();
-
-                                if result.is_none() {
-                                    modes.borrow_mut().current_mode_id = initial_mode_id;
-                                }
-                            }
-                        }).detach();
-
-                        modes_ref.current_mode_id = default_mode;
-                    } else {
-                        let available_modes = modes_ref
-                            .available_modes
-                            .iter()
-                            .map(|mode| format!("- `{}`: {}", mode.id, mode.name))
-                            .collect::<Vec<_>>()
-                            .join("\n");
-
-                        log::warn!(
-                            "`{default_mode}` is not valid {name} mode. Available options:\n{available_modes}",
-                        );
-                    }
-                } else {
-                    log::warn!(
-                        "`{name}` does not support modes, but `default_mode` was set in settings.",
-                    );
-                }
-            }
-
-            if let Some(default_model) = default_model {
-                if let Some(models) = models.as_ref() {
-                    let mut models_ref = models.borrow_mut();
-                    let has_model = models_ref.available_models.iter().any(|model| model.model_id == default_model);
-
-                    if has_model {
-                        let initial_model_id = models_ref.current_model_id.clone();
-
-                        cx.spawn({
-                            let default_model = default_model.clone();
-                            let session_id = response.session_id.clone();
-                            let models = models.clone();
-                            let conn = conn.clone();
-                            async move |_| {
-                                let result = conn.set_session_model(acp::SetSessionModelRequest::new(session_id, default_model))
-                                .await.log_err();
-
-                                if result.is_none() {
-                                    models.borrow_mut().current_model_id = initial_model_id;
-                                }
-                            }
-                        }).detach();
-
-                        models_ref.current_model_id = default_model;
-                    } else {
-                        let available_models = models_ref
-                            .available_models
-                            .iter()
-                            .map(|model| format!("- `{}`: {}", model.model_id, model.name))
-                            .collect::<Vec<_>>()
-                            .join("\n");
-
-                        log::warn!(
-                            "`{default_model}` is not a valid {name} model. Available options:\n{available_models}",
-                        );
-                    }
-                } else {
-                    log::warn!(
-                        "`{name}` does not support model selection, but `default_model` was set in settings.",
-                    );
-                }
-            }
-
-            let session_id = response.session_id;
-            let action_log = cx.new(|_| ActionLog::new(project.clone()))?;
-            let thread = cx.new(|cx| {
-                AcpThread::new(
-                    self.server_name.clone(),
-                    self.clone(),
-                    project,
-                    action_log,
-                    session_id.clone(),
-                    // ACP doesn't currently support per-session prompt capabilities or changing capabilities dynamically.
-                    watch::Receiver::constant(self.agent_capabilities.prompt_capabilities.clone()),
-                    cx,
-                )
-            })?;
-
-
-            let session = AcpSession {
-                thread: thread.downgrade(),
-                suppress_abort_err: false,
-                session_modes: modes,
-                models,
-            };
-            sessions.borrow_mut().insert(session_id, session);
-
-            Ok(thread)
-        })
-    }
-
-    fn auth_methods(&self) -> &[acp::AuthMethod] {
-        &self.auth_methods
-    }
-
-    fn authenticate(&self, method_id: acp::AuthMethodId, cx: &mut App) -> Task<Result<()>> {
-        let conn = self.connection.clone();
-        cx.foreground_executor().spawn(async move {
-            conn.authenticate(acp::AuthenticateRequest::new(method_id))
-                .await?;
-            Ok(())
-        })
-    }
-
-    fn prompt(
-        &self,
-        _id: Option<acp_thread::UserMessageId>,
-        params: acp::PromptRequest,
-        cx: &mut App,
-    ) -> Task<Result<acp::PromptResponse>> {
-        let conn = self.connection.clone();
-        let sessions = self.sessions.clone();
-        let session_id = params.session_id.clone();
-        cx.foreground_executor().spawn(async move {
-            let result = conn.prompt(params).await;
-
-            let mut suppress_abort_err = false;
-
-            if let Some(session) = sessions.borrow_mut().get_mut(&session_id) {
-                suppress_abort_err = session.suppress_abort_err;
-                session.suppress_abort_err = false;
-            }
-
-            match result {
-                Ok(response) => Ok(response),
-                Err(err) => {
-                    if err.code == acp::ErrorCode::AuthRequired {
-                        return Err(anyhow!(acp::Error::auth_required()));
-                    }
-
-                    if err.code != ErrorCode::InternalError {
-                        anyhow::bail!(err)
-                    }
-
-                    let Some(data) = &err.data else {
-                        anyhow::bail!(err)
-                    };
-
-                    // Temporary workaround until the following PR is generally available:
-                    // https://github.com/google-gemini/gemini-cli/pull/6656
-
-                    #[derive(Deserialize)]
-                    #[serde(deny_unknown_fields)]
-                    struct ErrorDetails {
-                        details: Box<str>,
-                    }
-
-                    match serde_json::from_value(data.clone()) {
-                        Ok(ErrorDetails { details }) => {
-                            if suppress_abort_err
-                                && (details.contains("This operation was aborted")
-                                    || details.contains("The user aborted a request"))
-                            {
-                                Ok(acp::PromptResponse::new(acp::StopReason::Cancelled))
-                            } else {
-                                Err(anyhow!(details))
-                            }
-                        }
-                        Err(_) => Err(anyhow!(err)),
-                    }
-                }
-            }
-        })
-    }
-
-    fn cancel(&self, session_id: &acp::SessionId, cx: &mut App) {
-        if let Some(session) = self.sessions.borrow_mut().get_mut(session_id) {
-            session.suppress_abort_err = true;
-        }
-        let conn = self.connection.clone();
-        let params = acp::CancelNotification::new(session_id.clone());
-        cx.foreground_executor()
-            .spawn(async move { conn.cancel(params).await })
-            .detach();
-    }
-
-    fn session_modes(
-        &self,
-        session_id: &acp::SessionId,
-        _cx: &App,
-    ) -> Option<Rc<dyn acp_thread::AgentSessionModes>> {
-        let sessions = self.sessions.clone();
-        let sessions_ref = sessions.borrow();
-        let Some(session) = sessions_ref.get(session_id) else {
-            return None;
-        };
-
-        if let Some(modes) = session.session_modes.as_ref() {
-            Some(Rc::new(AcpSessionModes {
-                connection: self.connection.clone(),
-                session_id: session_id.clone(),
-                state: modes.clone(),
-            }) as _)
-        } else {
-            None
-        }
-    }
-
-    fn model_selector(
-        &self,
-        session_id: &acp::SessionId,
-    ) -> Option<Rc<dyn acp_thread::AgentModelSelector>> {
-        let sessions = self.sessions.clone();
-        let sessions_ref = sessions.borrow();
-        let Some(session) = sessions_ref.get(session_id) else {
-            return None;
-        };
-
-        if let Some(models) = session.models.as_ref() {
-            Some(Rc::new(AcpModelSelector::new(
-                session_id.clone(),
-                self.connection.clone(),
-                models.clone(),
-            )) as _)
-        } else {
-            None
-        }
-    }
-
-    fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
-        self
-    }
-}
-
-struct AcpSessionModes {
-    session_id: acp::SessionId,
-    connection: Rc<acp::ClientSideConnection>,
-    state: Rc<RefCell<acp::SessionModeState>>,
-}
-
-impl acp_thread::AgentSessionModes for AcpSessionModes {
-    fn current_mode(&self) -> acp::SessionModeId {
-        self.state.borrow().current_mode_id.clone()
-    }
-
-    fn all_modes(&self) -> Vec<acp::SessionMode> {
-        self.state.borrow().available_modes.clone()
-    }
-
-    fn set_mode(&self, mode_id: acp::SessionModeId, cx: &mut App) -> Task<Result<()>> {
-        let connection = self.connection.clone();
-        let session_id = self.session_id.clone();
-        let old_mode_id;
-        {
-            let mut state = self.state.borrow_mut();
-            old_mode_id = state.current_mode_id.clone();
-            state.current_mode_id = mode_id.clone();
-        };
-        let state = self.state.clone();
-        cx.foreground_executor().spawn(async move {
-            let result = connection
-                .set_session_mode(acp::SetSessionModeRequest::new(session_id, mode_id))
-                .await;
-
-            if result.is_err() {
-                state.borrow_mut().current_mode_id = old_mode_id;
-            }
-
-            result?;
-
-            Ok(())
-        })
-    }
-}
-
-struct AcpModelSelector {
-    session_id: acp::SessionId,
-    connection: Rc<acp::ClientSideConnection>,
-    state: Rc<RefCell<acp::SessionModelState>>,
-}
-
-impl AcpModelSelector {
-    fn new(
-        session_id: acp::SessionId,
-        connection: Rc<acp::ClientSideConnection>,
-        state: Rc<RefCell<acp::SessionModelState>>,
-    ) -> Self {
-        Self {
-            session_id,
-            connection,
-            state,
-        }
-    }
-}
-
-impl acp_thread::AgentModelSelector for AcpModelSelector {
-    fn list_models(&self, _cx: &mut App) -> Task<Result<acp_thread::AgentModelList>> {
-        Task::ready(Ok(acp_thread::AgentModelList::Flat(
-            self.state
-                .borrow()
-                .available_models
-                .clone()
-                .into_iter()
-                .map(acp_thread::AgentModelInfo::from)
-                .collect(),
-        )))
-    }
-
-    fn select_model(&self, model_id: acp::ModelId, cx: &mut App) -> Task<Result<()>> {
-        let connection = self.connection.clone();
-        let session_id = self.session_id.clone();
-        let old_model_id;
-        {
-            let mut state = self.state.borrow_mut();
-            old_model_id = state.current_model_id.clone();
-            state.current_model_id = model_id.clone();
-        };
-        let state = self.state.clone();
-        cx.foreground_executor().spawn(async move {
-            let result = connection
-                .set_session_model(acp::SetSessionModelRequest::new(session_id, model_id))
-                .await;
-
-            if result.is_err() {
-                state.borrow_mut().current_model_id = old_model_id;
-            }
-
-            result?;
-
-            Ok(())
-        })
-    }
-
-    fn selected_model(&self, _cx: &mut App) -> Task<Result<acp_thread::AgentModelInfo>> {
-        let state = self.state.borrow();
-        Task::ready(
-            state
-                .available_models
-                .iter()
-                .find(|m| m.model_id == state.current_model_id)
-                .cloned()
-                .map(acp_thread::AgentModelInfo::from)
-                .ok_or_else(|| anyhow::anyhow!("Model not found")),
-        )
-    }
-}
-
-struct ClientDelegate {
-    sessions: Rc<RefCell<HashMap<acp::SessionId, AcpSession>>>,
-    cx: AsyncApp,
-}
-
-#[async_trait::async_trait(?Send)]
-impl acp::Client for ClientDelegate {
-    async fn request_permission(
-        &self,
-        arguments: acp::RequestPermissionRequest,
-    ) -> Result<acp::RequestPermissionResponse, acp::Error> {
-        let respect_always_allow_setting;
-        let thread;
-        {
-            let sessions_ref = self.sessions.borrow();
-            let session = sessions_ref
-                .get(&arguments.session_id)
-                .context("Failed to get session")?;
-            respect_always_allow_setting = session.session_modes.is_none();
-            thread = session.thread.clone();
-        }
-
-        let cx = &mut self.cx.clone();
-
-        let task = thread.update(cx, |thread, cx| {
-            thread.request_tool_call_authorization(
-                arguments.tool_call,
-                arguments.options,
-                respect_always_allow_setting,
-                cx,
-            )
-        })??;
-
-        let outcome = task.await;
-
-        Ok(acp::RequestPermissionResponse::new(outcome))
-    }
-
-    async fn write_text_file(
-        &self,
-        arguments: acp::WriteTextFileRequest,
-    ) -> Result<acp::WriteTextFileResponse, acp::Error> {
-        let cx = &mut self.cx.clone();
-        let task = self
-            .session_thread(&arguments.session_id)?
-            .update(cx, |thread, cx| {
-                thread.write_text_file(arguments.path, arguments.content, cx)
-            })?;
-
-        task.await?;
-
-        Ok(Default::default())
-    }
-
-    async fn read_text_file(
-        &self,
-        arguments: acp::ReadTextFileRequest,
-    ) -> Result<acp::ReadTextFileResponse, acp::Error> {
-        let task = self.session_thread(&arguments.session_id)?.update(
-            &mut self.cx.clone(),
-            |thread, cx| {
-                thread.read_text_file(arguments.path, arguments.line, arguments.limit, false, cx)
-            },
-        )?;
-
-        let content = task.await?;
-
-        Ok(acp::ReadTextFileResponse::new(content))
-    }
-
-    async fn session_notification(
-        &self,
-        notification: acp::SessionNotification,
-    ) -> Result<(), acp::Error> {
-        let sessions = self.sessions.borrow();
-        let session = sessions
-            .get(&notification.session_id)
-            .context("Failed to get session")?;
-
-        if let acp::SessionUpdate::CurrentModeUpdate(acp::CurrentModeUpdate {
-            current_mode_id,
-            ..
-        }) = &notification.update
-        {
-            if let Some(session_modes) = &session.session_modes {
-                session_modes.borrow_mut().current_mode_id = current_mode_id.clone();
-            } else {
-                log::error!(
-                    "Got a `CurrentModeUpdate` notification, but they agent didn't specify `modes` during setting setup."
-                );
-            }
-        }
-
-        // Clone so we can inspect meta both before and after handing off to the thread
-        let update_clone = notification.update.clone();
-
-        // Pre-handle: if a ToolCall carries terminal_info, create/register a display-only terminal.
-        if let acp::SessionUpdate::ToolCall(tc) = &update_clone {
-            if let Some(meta) = &tc.meta {
-                if let Some(terminal_info) = meta.get("terminal_info") {
-                    if let Some(id_str) = terminal_info.get("terminal_id").and_then(|v| v.as_str())
-                    {
-                        let terminal_id = acp::TerminalId::new(id_str);
-                        let cwd = terminal_info
-                            .get("cwd")
-                            .and_then(|v| v.as_str().map(PathBuf::from));
-
-                        // Create a minimal display-only lower-level terminal and register it.
-                        let _ = session.thread.update(&mut self.cx.clone(), |thread, cx| {
-                            let builder = TerminalBuilder::new_display_only(
-                                CursorShape::default(),
-                                AlternateScroll::On,
-                                None,
-                                0,
-                            )?;
-                            let lower = cx.new(|cx| builder.subscribe(cx));
-                            thread.on_terminal_provider_event(
-                                TerminalProviderEvent::Created {
-                                    terminal_id,
-                                    label: tc.title.clone(),
-                                    cwd,
-                                    output_byte_limit: None,
-                                    terminal: lower,
-                                },
-                                cx,
-                            );
-                            anyhow::Ok(())
-                        });
-                    }
-                }
-            }
-        }
-
-        // Forward the update to the acp_thread as usual.
-        session.thread.update(&mut self.cx.clone(), |thread, cx| {
-            thread.handle_session_update(notification.update.clone(), cx)
-        })??;
-
-        // Post-handle: stream terminal output/exit if present on ToolCallUpdate meta.
-        if let acp::SessionUpdate::ToolCallUpdate(tcu) = &update_clone {
-            if let Some(meta) = &tcu.meta {
-                if let Some(term_out) = meta.get("terminal_output") {
-                    if let Some(id_str) = term_out.get("terminal_id").and_then(|v| v.as_str()) {
-                        let terminal_id = acp::TerminalId::new(id_str);
-                        if let Some(s) = term_out.get("data").and_then(|v| v.as_str()) {
-                            let data = s.as_bytes().to_vec();
-                            let _ = session.thread.update(&mut self.cx.clone(), |thread, cx| {
-                                thread.on_terminal_provider_event(
-                                    TerminalProviderEvent::Output { terminal_id, data },
-                                    cx,
-                                );
-                            });
-                        }
-                    }
-                }
-
-                // terminal_exit
-                if let Some(term_exit) = meta.get("terminal_exit") {
-                    if let Some(id_str) = term_exit.get("terminal_id").and_then(|v| v.as_str()) {
-                        let terminal_id = acp::TerminalId::new(id_str);
-                        let status = acp::TerminalExitStatus::new()
-                            .exit_code(
-                                term_exit
-                                    .get("exit_code")
-                                    .and_then(|v| v.as_u64())
-                                    .map(|i| i as u32),
-                            )
-                            .signal(
-                                term_exit
-                                    .get("signal")
-                                    .and_then(|v| v.as_str().map(|s| s.to_string())),
-                            );
-
-                        let _ = session.thread.update(&mut self.cx.clone(), |thread, cx| {
-                            thread.on_terminal_provider_event(
-                                TerminalProviderEvent::Exit {
-                                    terminal_id,
-                                    status,
-                                },
-                                cx,
-                            );
-                        });
-                    }
-                }
-            }
-        }
-
-        Ok(())
-    }
-
-    async fn create_terminal(
-        &self,
-        args: acp::CreateTerminalRequest,
-    ) -> Result<acp::CreateTerminalResponse, acp::Error> {
-        let thread = self.session_thread(&args.session_id)?;
-        let project = thread.read_with(&self.cx, |thread, _cx| thread.project().clone())?;
-
-        let terminal_entity = acp_thread::create_terminal_entity(
-            args.command.clone(),
-            &args.args,
-            args.env
-                .into_iter()
-                .map(|env| (env.name, env.value))
-                .collect(),
-            args.cwd.clone(),
-            &project,
-            &mut self.cx.clone(),
-        )
-        .await?;
-
-        // Register with renderer
-        let terminal_entity = thread.update(&mut self.cx.clone(), |thread, cx| {
-            thread.register_terminal_created(
-                acp::TerminalId::new(uuid::Uuid::new_v4().to_string()),
-                format!("{} {}", args.command, args.args.join(" ")),
-                args.cwd.clone(),
-                args.output_byte_limit,
-                terminal_entity,
-                cx,
-            )
-        })?;
-        let terminal_id =
-            terminal_entity.read_with(&self.cx, |terminal, _| terminal.id().clone())?;
-        Ok(acp::CreateTerminalResponse::new(terminal_id))
-    }
-
-    async fn kill_terminal_command(
-        &self,
-        args: acp::KillTerminalCommandRequest,
-    ) -> Result<acp::KillTerminalCommandResponse, acp::Error> {
-        self.session_thread(&args.session_id)?
-            .update(&mut self.cx.clone(), |thread, cx| {
-                thread.kill_terminal(args.terminal_id, cx)
-            })??;
-
-        Ok(Default::default())
-    }
-
-    async fn ext_method(&self, _args: acp::ExtRequest) -> Result<acp::ExtResponse, acp::Error> {
-        Err(acp::Error::method_not_found())
-    }
-
-    async fn ext_notification(&self, _args: acp::ExtNotification) -> Result<(), acp::Error> {
-        Err(acp::Error::method_not_found())
-    }
-
-    async fn release_terminal(
-        &self,
-        args: acp::ReleaseTerminalRequest,
-    ) -> Result<acp::ReleaseTerminalResponse, acp::Error> {
-        self.session_thread(&args.session_id)?
-            .update(&mut self.cx.clone(), |thread, cx| {
-                thread.release_terminal(args.terminal_id, cx)
-            })??;
-
-        Ok(Default::default())
-    }
-
-    async fn terminal_output(
-        &self,
-        args: acp::TerminalOutputRequest,
-    ) -> Result<acp::TerminalOutputResponse, acp::Error> {
-        self.session_thread(&args.session_id)?
-            .read_with(&mut self.cx.clone(), |thread, cx| {
-                let out = thread
-                    .terminal(args.terminal_id)?
-                    .read(cx)
-                    .current_output(cx);
-
-                Ok(out)
-            })?
-    }
-
-    async fn wait_for_terminal_exit(
-        &self,
-        args: acp::WaitForTerminalExitRequest,
-    ) -> Result<acp::WaitForTerminalExitResponse, acp::Error> {
-        let exit_status = self
-            .session_thread(&args.session_id)?
-            .update(&mut self.cx.clone(), |thread, cx| {
-                anyhow::Ok(thread.terminal(args.terminal_id)?.read(cx).wait_for_exit())
-            })??
-            .await;
-
-        Ok(acp::WaitForTerminalExitResponse::new(exit_status))
-    }
-}
-
-impl ClientDelegate {
-    fn session_thread(&self, session_id: &acp::SessionId) -> Result<WeakEntity<AcpThread>> {
-        let sessions = self.sessions.borrow();
-        sessions
-            .get(session_id)
-            .context("Failed to get session")
-            .map(|session| session.thread.clone())
-    }
-}
diff --git a/crates/agent_servers/src/agent_servers.rs b/crates/agent_servers/src/agent_servers.rs
deleted file mode 100644
index 46e8508e44..0000000000
--- a/crates/agent_servers/src/agent_servers.rs
+++ /dev/null
@@ -1,121 +0,0 @@
-mod acp;
-mod claude;
-mod codex;
-mod custom;
-mod gemini;
-
-#[cfg(any(test, feature = "test-support"))]
-pub mod e2e_tests;
-
-pub use claude::*;
-use client::ProxySettings;
-pub use codex::*;
-use collections::HashMap;
-pub use custom::*;
-use fs::Fs;
-pub use gemini::*;
-use http_client::read_no_proxy_from_env;
-use project::agent_server_store::AgentServerStore;
-
-use acp_thread::AgentConnection;
-use anyhow::Result;
-use gpui::{App, AppContext, Entity, SharedString, Task};
-use project::Project;
-use settings::SettingsStore;
-use std::{any::Any, path::Path, rc::Rc, sync::Arc};
-
-pub use acp::AcpConnection;
-
-pub struct AgentServerDelegate {
-    store: Entity<AgentServerStore>,
-    project: Entity<Project>,
-    status_tx: Option<watch::Sender<SharedString>>,
-    new_version_available: Option<watch::Sender<Option<String>>>,
-}
-
-impl AgentServerDelegate {
-    pub fn new(
-        store: Entity<AgentServerStore>,
-        project: Entity<Project>,
-        status_tx: Option<watch::Sender<SharedString>>,
-        new_version_tx: Option<watch::Sender<Option<String>>>,
-    ) -> Self {
-        Self {
-            store,
-            project,
-            status_tx,
-            new_version_available: new_version_tx,
-        }
-    }
-
-    pub fn project(&self) -> &Entity<Project> {
-        &self.project
-    }
-}
-
-pub trait AgentServer: Send {
-    fn logo(&self) -> ui::IconName;
-    fn name(&self) -> SharedString;
-    fn default_mode(&self, _cx: &mut App) -> Option<agent_client_protocol::SessionModeId> {
-        None
-    }
-    fn set_default_mode(
-        &self,
-        _mode_id: Option<agent_client_protocol::SessionModeId>,
-        _fs: Arc<dyn Fs>,
-        _cx: &mut App,
-    ) {
-    }
-
-    fn default_model(&self, _cx: &mut App) -> Option<agent_client_protocol::ModelId> {
-        None
-    }
-
-    fn set_default_model(
-        &self,
-        _model_id: Option<agent_client_protocol::ModelId>,
-        _fs: Arc<dyn Fs>,
-        _cx: &mut App,
-    ) {
-    }
-
-    fn connect(
-        &self,
-        root_dir: Option<&Path>,
-        delegate: AgentServerDelegate,
-        cx: &mut App,
-    ) -> Task<Result<(Rc<dyn AgentConnection>, Option<task::SpawnInTerminal>)>>;
-
-    fn into_any(self: Rc<Self>) -> Rc<dyn Any>;
-}
-
-impl dyn AgentServer {
-    pub fn downcast<T: 'static + AgentServer + Sized>(self: Rc<Self>) -> Option<Rc<T>> {
-        self.into_any().downcast().ok()
-    }
-}
-
-/// Load the default proxy environment variables to pass through to the agent
-pub fn load_proxy_env(cx: &mut App) -> HashMap<String, String> {
-    let proxy_url = cx
-        .read_global(|settings: &SettingsStore, _| settings.get::<ProxySettings>(None).proxy_url());
-    let mut env = HashMap::default();
-
-    if let Some(proxy_url) = &proxy_url {
-        let env_var = if proxy_url.scheme() == "https" {
-            "HTTPS_PROXY"
-        } else {
-            "HTTP_PROXY"
-        };
-        env.insert(env_var.to_owned(), proxy_url.to_string());
-    }
-
-    if let Some(no_proxy) = read_no_proxy_from_env() {
-        env.insert("NO_PROXY".to_owned(), no_proxy);
-    } else if proxy_url.is_some() {
-        // We sometimes need local MCP servers that we don't want to proxy
-        env.insert("NO_PROXY".to_owned(), "localhost,127.0.0.1".to_owned());
-    }
-
-    env
-}
diff --git a/crates/agent_servers/src/claude.rs b/crates/agent_servers/src/claude.rs
deleted file mode 100644
index e67ddd5c06..0000000000
--- a/crates/agent_servers/src/claude.rs
+++ /dev/null
@@ -1,121 +0,0 @@
-use agent_client_protocol as acp;
-use fs::Fs;
-use settings::{SettingsStore, update_settings_file};
-use std::path::Path;
-use std::rc::Rc;
-use std::sync::Arc;
-use std::{any::Any, path::PathBuf};
-
-use anyhow::{Context as _, Result};
-use gpui::{App, AppContext as _, SharedString, Task};
-use project::agent_server_store::{AllAgentServersSettings, CLAUDE_CODE_NAME};
-
-use crate::{AgentServer, AgentServerDelegate, load_proxy_env};
-use acp_thread::AgentConnection;
-
-#[derive(Clone)]
-pub struct ClaudeCode;
-
-pub struct AgentServerLoginCommand {
-    pub path: PathBuf,
-    pub arguments: Vec<String>,
-}
-
-impl AgentServer for ClaudeCode {
-    fn name(&self) -> SharedString {
-        "Claude Code".into()
-    }
-
-    fn logo(&self) -> ui::IconName {
-        ui::IconName::AiClaude
-    }
-
-    fn default_mode(&self, cx: &mut App) -> Option<acp::SessionModeId> {
-        let settings = cx.read_global(|settings: &SettingsStore, _| {
-            settings.get::<AllAgentServersSettings>(None).claude.clone()
-        });
-
-        settings
-            .as_ref()
-            .and_then(|s| s.default_mode.clone().map(acp::SessionModeId::new))
-    }
-
-    fn set_default_mode(&self, mode_id: Option<acp::SessionModeId>, fs: Arc<dyn Fs>, cx: &mut App) {
-        update_settings_file(fs, cx, |settings, _| {
-            settings
-                .agent_servers
-                .get_or_insert_default()
-                .claude
-                .get_or_insert_default()
-                .default_mode = mode_id.map(|m| m.to_string())
-        });
-    }
-
-    fn default_model(&self, cx: &mut App) -> Option<acp::ModelId> {
-        let settings = cx.read_global(|settings: &SettingsStore, _| {
-            settings.get::<AllAgentServersSettings>(None).claude.clone()
-        });
-
-        settings
-            .as_ref()
-            .and_then(|s| s.default_model.clone().map(acp::ModelId::new))
-    }
-
-    fn set_default_model(&self, model_id: Option<acp::ModelId>, fs: Arc<dyn Fs>, cx: &mut App) {
-        update_settings_file(fs, cx, |settings, _| {
-            settings
-                .agent_servers
-                .get_or_insert_default()
-                .claude
-                .get_or_insert_default()
-                .default_model = model_id.map(|m| m.to_string())
-        });
-    }
-
-    fn connect(
-        &self,
-        root_dir: Option<&Path>,
-        delegate: AgentServerDelegate,
-        cx: &mut App,
-    ) -> Task<Result<(Rc<dyn AgentConnection>, Option<task::SpawnInTerminal>)>> {
-        let name = self.name();
-        let root_dir = root_dir.map(|root_dir| root_dir.to_string_lossy().into_owned());
-        let is_remote = delegate.project.read(cx).is_via_remote_server();
-        let store = delegate.store.downgrade();
-        let extra_env = load_proxy_env(cx);
-        let default_mode = self.default_mode(cx);
-        let default_model = self.default_model(cx);
-
-        cx.spawn(async move |cx| {
-            let (command, root_dir, login) = store
-                .update(cx, |store, cx| {
-                    let agent = store
-                        .get_external_agent(&CLAUDE_CODE_NAME.into())
-                        .context("Claude Code is not registered")?;
-                    anyhow::Ok(agent.get_command(
-                        root_dir.as_deref(),
-                        extra_env,
-                        delegate.status_tx,
-                        delegate.new_version_available,
-                        &mut cx.to_async(),
-                    ))
-                })??
-                .await?;
-            let connection = crate::acp::connect(
-                name,
-                command,
-                root_dir.as_ref(),
-                default_mode,
-                default_model,
-                is_remote,
-                cx,
-            )
-            .await?;
-            Ok((connection, login))
-        })
-    }
-
-    fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
-        self
-    }
-}
diff --git a/crates/agent_servers/src/codex.rs b/crates/agent_servers/src/codex.rs
deleted file mode 100644
index c2b308e48b..0000000000
--- a/crates/agent_servers/src/codex.rs
+++ /dev/null
@@ -1,123 +0,0 @@
-use std::rc::Rc;
-use std::sync::Arc;
-use std::{any::Any, path::Path};
-
-use acp_thread::AgentConnection;
-use agent_client_protocol as acp;
-use anyhow::{Context as _, Result};
-use fs::Fs;
-use gpui::{App, AppContext as _, SharedString, Task};
-use project::agent_server_store::{AllAgentServersSettings, CODEX_NAME};
-use settings::{SettingsStore, update_settings_file};
-
-use crate::{AgentServer, AgentServerDelegate, load_proxy_env};
-
-#[derive(Clone)]
-pub struct Codex;
-
-#[cfg(test)]
-pub(crate) mod tests {
-    use super::*;
-
-    crate::common_e2e_tests!(async |_, _, _| Codex, allow_option_id = "proceed_once");
-}
-
-impl AgentServer for Codex {
-    fn name(&self) -> SharedString {
-        "Codex".into()
-    }
-
-    fn logo(&self) -> ui::IconName {
-        ui::IconName::AiOpenAi
-    }
-
-    fn default_mode(&self, cx: &mut App) -> Option<acp::SessionModeId> {
-        let settings = cx.read_global(|settings: &SettingsStore, _| {
-            settings.get::<AllAgentServersSettings>(None).codex.clone()
-        });
-
-        settings
-            .as_ref()
-            .and_then(|s| s.default_mode.clone().map(acp::SessionModeId::new))
-    }
-
-    fn set_default_mode(&self, mode_id: Option<acp::SessionModeId>, fs: Arc<dyn Fs>, cx: &mut App) {
-        update_settings_file(fs, cx, |settings, _| {
-            settings
-                .agent_servers
-                .get_or_insert_default()
-                .codex
-                .get_or_insert_default()
-                .default_mode = mode_id.map(|m| m.to_string())
-        });
-    }
-
-    fn default_model(&self, cx: &mut App) -> Option<acp::ModelId> {
-        let settings = cx.read_global(|settings: &SettingsStore, _| {
-            settings.get::<AllAgentServersSettings>(None).codex.clone()
-        });
-
-        settings
-            .as_ref()
-            .and_then(|s| s.default_model.clone().map(acp::ModelId::new))
-    }
-
-    fn set_default_model(&self, model_id: Option<acp::ModelId>, fs: Arc<dyn Fs>, cx: &mut App) {
-        update_settings_file(fs, cx, |settings, _| {
-            settings
-                .agent_servers
-                .get_or_insert_default()
-                .codex
-                .get_or_insert_default()
-                .default_model = model_id.map(|m| m.to_string())
-        });
-    }
-
-    fn connect(
-        &self,
-        root_dir: Option<&Path>,
-        delegate: AgentServerDelegate,
-        cx: &mut App,
-    ) -> Task<Result<(Rc<dyn AgentConnection>, Option<task::SpawnInTerminal>)>> {
-        let name = self.name();
-        let root_dir = root_dir.map(|root_dir| root_dir.to_string_lossy().into_owned());
-        let is_remote = delegate.project.read(cx).is_via_remote_server();
-        let store = delegate.store.downgrade();
-        let extra_env = load_proxy_env(cx);
-        let default_mode = self.default_mode(cx);
-        let default_model = self.default_model(cx);
-
-        cx.spawn(async move |cx| {
-            let (command, root_dir, login) = store
-                .update(cx, |store, cx| {
-                    let agent = store
-                        .get_external_agent(&CODEX_NAME.into())
-                        .context("Codex is not registered")?;
-                    anyhow::Ok(agent.get_command(
-                        root_dir.as_deref(),
-                        extra_env,
-                        delegate.status_tx,
-                        delegate.new_version_available,
-                        &mut cx.to_async(),
-                    ))
-                })??
-                .await?;
-
-            let connection = crate::acp::connect(
-                name,
-                command,
-                root_dir.as_ref(),
-                default_mode,
-                default_model,
-                is_remote,
-                cx,
-            )
-            .await?;
-            Ok((connection, login))
-        })
-    }
-
-    fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
-        self
-    }
-}
diff --git a/crates/agent_servers/src/custom.rs b/crates/agent_servers/src/custom.rs
deleted file mode 100644
index 6b981ce8b8..0000000000
--- a/crates/agent_servers/src/custom.rs
+++ /dev/null
@@ -1,151 +0,0 @@
-use crate::{AgentServer, AgentServerDelegate, load_proxy_env};
-use acp_thread::AgentConnection;
-use agent_client_protocol as acp;
-use anyhow::{Context as _, Result};
-use fs::Fs;
-use gpui::{App, AppContext as _, SharedString, Task};
-use project::agent_server_store::{AllAgentServersSettings, ExternalAgentServerName};
-use settings::{SettingsStore, update_settings_file};
-use std::{path::Path, rc::Rc, sync::Arc};
-use ui::IconName;
-
-/// A generic agent server implementation for custom user-defined agents
-pub struct CustomAgentServer {
-    name: SharedString,
-}
-
-impl CustomAgentServer {
-    pub fn new(name: SharedString) -> Self {
-        Self { name }
-    }
-}
-
-impl AgentServer for CustomAgentServer {
-    fn name(&self) -> SharedString {
-        self.name.clone()
-    }
-
-    fn logo(&self) -> IconName {
-        IconName::Terminal
-    }
-
-    fn default_mode(&self, cx: &mut App) -> Option<acp::SessionModeId> {
-        let settings = cx.read_global(|settings: &SettingsStore, _| {
-            settings
-                .get::<AllAgentServersSettings>(None)
-                .custom
-                .get(&self.name())
-                .cloned()
-        });
-
-        settings
-            .as_ref()
-            .and_then(|s| s.default_mode().map(acp::SessionModeId::new))
-    }
-
-    fn set_default_mode(&self, mode_id: Option<acp::SessionModeId>, fs: Arc<dyn Fs>, cx: &mut App) {
-        let name = self.name();
-        update_settings_file(fs, cx, move |settings, _| {
-            let settings = settings
-                .agent_servers
-                .get_or_insert_default()
-                .custom
-                .entry(name.clone())
-                .or_insert_with(|| settings::CustomAgentServerSettings::Extension {
-                    default_model: None,
-                    default_mode: None,
-                });
-
-            match settings {
-                settings::CustomAgentServerSettings::Custom { default_mode, .. }
-                | settings::CustomAgentServerSettings::Extension { default_mode, .. } => {
-                    *default_mode = mode_id.map(|m| m.to_string());
-                }
-            }
-        });
-    }
-
-    fn default_model(&self, cx: &mut App) -> Option<acp::ModelId> {
-        let settings = cx.read_global(|settings: &SettingsStore, _| {
-            settings
-                .get::<AllAgentServersSettings>(None)
-                .custom
-                .get(&self.name())
-                .cloned()
-        });
-
-        settings
-            .as_ref()
-            .and_then(|s| s.default_model().map(acp::ModelId::new))
-    }
-
-    fn set_default_model(&self, model_id: Option<acp::ModelId>, fs: Arc<dyn Fs>, cx: &mut App) {
-        let name = self.name();
-        update_settings_file(fs, cx, move |settings, _| {
-            let settings = settings
-                .agent_servers
-                .get_or_insert_default()
-                .custom
-                .entry(name.clone())
-                .or_insert_with(|| settings::CustomAgentServerSettings::Extension {
-                    default_model: None,
-                    default_mode: None,
-                });
-
-            match settings {
-                settings::CustomAgentServerSettings::Custom { default_model, .. }
-                | settings::CustomAgentServerSettings::Extension { default_model, .. } => {
-                    *default_model = model_id.map(|m| m.to_string());
-                }
-            }
-        });
-    }
-
-    fn connect(
-        &self,
-        root_dir: Option<&Path>,
-        delegate: AgentServerDelegate,
-        cx: &mut App,
-    ) -> Task<Result<(Rc<dyn AgentConnection>, Option<task::SpawnInTerminal>)>> {
-        let name = self.name();
-        let root_dir = root_dir.map(|root_dir| root_dir.to_string_lossy().into_owned());
-        let is_remote = delegate.project.read(cx).is_via_remote_server();
-        let default_mode = self.default_mode(cx);
-        let default_model = self.default_model(cx);
-        let store = delegate.store.downgrade();
-        let extra_env = load_proxy_env(cx);
-        cx.spawn(async move |cx| {
-            let (command, root_dir, login) = store
-                .update(cx, |store, cx| {
-                    let agent = store
-                        .get_external_agent(&ExternalAgentServerName(name.clone()))
-                        .with_context(|| {
-                            format!("Custom agent server `{}` is not registered", name)
-                        })?;
-                    anyhow::Ok(agent.get_command(
-                        root_dir.as_deref(),
-                        extra_env,
-                        delegate.status_tx,
-                        delegate.new_version_available,
-                        &mut cx.to_async(),
-                    ))
-                })??
-                .await?;
-            let connection = crate::acp::connect(
-                name,
-                command,
-                root_dir.as_ref(),
-                default_mode,
-                default_model,
-                is_remote,
-                cx,
-            )
-            .await?;
-            Ok((connection, login))
-        })
-    }
-
-    fn into_any(self: Rc<Self>) -> Rc<dyn std::any::Any> {
-        self
-    }
-}
diff --git a/crates/agent_servers/src/e2e_tests.rs b/crates/agent_servers/src/e2e_tests.rs
deleted file mode 100644
index 9db7535b5e..0000000000
--- a/crates/agent_servers/src/e2e_tests.rs
+++ /dev/null
@@ -1,552 +0,0 @@
-use crate::{AgentServer, AgentServerDelegate};
-use acp_thread::{AcpThread, AgentThreadEntry, ToolCall, ToolCallStatus};
-use agent_client_protocol as acp;
-use futures::{FutureExt, StreamExt, channel::mpsc, select};
-use gpui::{AppContext, Entity, TestAppContext};
-use indoc::indoc;
-#[cfg(test)]
-use project::agent_server_store::BuiltinAgentServerSettings;
-use project::{FakeFs, Project};
-#[cfg(test)]
-use settings::Settings;
-use std::{
-    path::{Path, PathBuf},
-    sync::Arc,
-    time::Duration,
-};
-use util::path;
-
-pub async fn test_basic<T, F>(server: F, cx: &mut TestAppContext)
-where
-    T: AgentServer + 'static,
-    F: AsyncFn(&Arc<dyn fs::Fs>, &Entity<Project>, &mut TestAppContext) -> T,
-{
-    let fs = init_test(cx).await as Arc<dyn fs::Fs>;
-    let project = Project::test(fs.clone(), [], cx).await;
-    let thread = new_test_thread(
-        server(&fs, &project, cx).await,
-        project.clone(),
-        "/private/tmp",
-        cx,
-    )
-    .await;
-
-    thread
-        .update(cx, |thread, cx| thread.send_raw("Hello from Zed!", cx))
-        .await
-        .unwrap();
-
-    thread.read_with(cx, |thread, _| {
-        assert!(
-            thread.entries().len() >= 2,
-            "Expected at least 2 entries. Got: {:?}",
-            thread.entries()
-        );
-        assert!(matches!(
-            thread.entries()[0],
-            AgentThreadEntry::UserMessage(_)
-        ));
-        assert!(matches!(
-            thread.entries()[1],
-            AgentThreadEntry::AssistantMessage(_)
-        ));
-    });
-}
-
-pub async fn test_path_mentions<T, F>(server: F, cx: &mut TestAppContext)
-where
-    T: AgentServer + 'static,
-    F: AsyncFn(&Arc<dyn fs::Fs>, &Entity<Project>, &mut TestAppContext) -> T,
-{
-    let fs = init_test(cx).await as _;
-
-    let tempdir = tempfile::tempdir().unwrap();
-    std::fs::write(
-        tempdir.path().join("foo.rs"),
-        indoc! {"
-            fn main() {
-                println!(\"Hello, world!\");
-            }
-        "},
-    )
-    .expect("failed to write file");
-    let project = Project::example([tempdir.path()], &mut cx.to_async()).await;
-    let thread = new_test_thread(
-        server(&fs, &project, cx).await,
-        project.clone(),
-        tempdir.path(),
-        cx,
-    )
-    .await;
-    thread
-        .update(cx, |thread, cx| {
-            thread.send(
-                vec![
-                    "Read the file ".into(),
-                    acp::ContentBlock::ResourceLink(acp::ResourceLink::new("foo.rs", "foo.rs")),
-                    " and tell me what the content of the println! is".into(),
-                ],
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-
-    thread.read_with(cx, |thread, cx| {
-        assert!(matches!(
-            thread.entries()[0],
-            AgentThreadEntry::UserMessage(_)
-        ));
-        let assistant_message = &thread
-            .entries()
-            .iter()
-            .rev()
-            .find_map(|entry| match entry {
-                AgentThreadEntry::AssistantMessage(msg) => Some(msg),
-                _ => None,
-            })
-            .unwrap();
-
-        assert!(
-            assistant_message.to_markdown(cx).contains("Hello, world!"),
-            "unexpected assistant message: {:?}",
-            assistant_message.to_markdown(cx)
-        );
-    });
-
-    drop(tempdir);
-}
-
-pub async fn test_tool_call<T, F>(server: F, cx: &mut TestAppContext)
-where
-    T: AgentServer + 'static,
-    F: AsyncFn(&Arc<dyn fs::Fs>, &Entity<Project>, &mut TestAppContext) -> T,
-{
-    let fs = init_test(cx).await as _;
-
-    let tempdir = tempfile::tempdir().unwrap();
-    let foo_path = tempdir.path().join("foo");
-    std::fs::write(&foo_path, "Lorem ipsum dolor").expect("failed to write file");
-
-    let project = Project::example([tempdir.path()], &mut cx.to_async()).await;
-    let thread = new_test_thread(
-        server(&fs, &project, cx).await,
-        project.clone(),
-        "/private/tmp",
-        cx,
-    )
-    .await;
-
-    thread
-        .update(cx, |thread, cx| {
-            thread.send_raw(
-                &format!("Read {} and tell me what you see.", foo_path.display()),
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-    thread.read_with(cx, |thread, _cx| {
-        assert!(thread.entries().iter().any(|entry| {
-            matches!(
-                entry,
-                AgentThreadEntry::ToolCall(ToolCall {
-                    status: ToolCallStatus::Pending
-                        | ToolCallStatus::InProgress
-                        | ToolCallStatus::Completed,
-                    ..
-                })
-            )
-        }));
-        assert!(
-            thread
-                .entries()
-                .iter()
-                .any(|entry| { matches!(entry, AgentThreadEntry::AssistantMessage(_)) })
-        );
-    });
-
-    drop(tempdir);
-}
-
-pub async fn test_tool_call_with_permission<T, F>(
-    server: F,
-    allow_option_id: acp::PermissionOptionId,
-    cx: &mut TestAppContext,
-) where
-    T: AgentServer + 'static,
-    F: AsyncFn(&Arc<dyn fs::Fs>, &Entity<Project>, &mut TestAppContext) -> T,
-{
-    let fs = init_test(cx).await as Arc<dyn fs::Fs>;
-    let project = Project::test(fs.clone(), [path!("/private/tmp").as_ref()], cx).await;
-    let thread = new_test_thread(
-        server(&fs, &project, cx).await,
-        project.clone(),
-        "/private/tmp",
-        cx,
-    )
-    .await;
-    let full_turn = thread.update(cx, |thread, cx| {
-        thread.send_raw(
-            r#"Run exactly `touch hello.txt && echo "Hello, world!" | tee hello.txt` in the terminal."#,
-            cx,
-        )
-    });
-
-    run_until_first_tool_call(
-        &thread,
-        |entry| {
-            matches!(
-                entry,
-                AgentThreadEntry::ToolCall(ToolCall {
-                    status: ToolCallStatus::WaitingForConfirmation { .. },
-                    ..
-                })
-            )
-        },
-        cx,
-    )
-    .await;
-
-    let tool_call_id = thread.read_with(cx, |thread, cx| {
-        let AgentThreadEntry::ToolCall(ToolCall {
-            id,
-            label,
-            status: ToolCallStatus::WaitingForConfirmation { .. },
-            ..
-        }) = &thread
-            .entries()
-            .iter()
-            .find(|entry| matches!(entry, AgentThreadEntry::ToolCall(_)))
-            .unwrap()
-        else {
-            panic!();
-        };
-
-        let label = label.read(cx).source();
-        assert!(label.contains("touch"), "Got: {}", label);
-
-        id.clone()
-    });
-
-    thread.update(cx, |thread, cx| {
-        thread.authorize_tool_call(
-            tool_call_id,
-            allow_option_id,
-            acp::PermissionOptionKind::AllowOnce,
-            cx,
-        );
-
-        assert!(thread.entries().iter().any(|entry| matches!(
-            entry,
-            AgentThreadEntry::ToolCall(ToolCall {
-                status: ToolCallStatus::Pending
-                    | ToolCallStatus::InProgress
-                    | ToolCallStatus::Completed,
-                ..
-            })
-        )));
-    });
-
-    full_turn.await.unwrap();
-
-    thread.read_with(cx, |thread, cx| {
-        let AgentThreadEntry::ToolCall(ToolCall {
-            content,
-            status: ToolCallStatus::Pending
-                | ToolCallStatus::InProgress
-                | ToolCallStatus::Completed,
-            ..
-        }) = thread
-            .entries()
-            .iter()
-            .find(|entry| matches!(entry, AgentThreadEntry::ToolCall(_)))
-            .unwrap()
-        else {
-            panic!();
-        };
-
-        assert!(
-            content.iter().any(|c| c.to_markdown(cx).contains("Hello")),
-            "Expected content to contain 'Hello'"
-        );
-    });
-}
-
-pub async fn test_cancel<T, F>(server: F, cx: &mut TestAppContext)
-where
-    T: AgentServer + 'static,
-    F: AsyncFn(&Arc<dyn fs::Fs>, &Entity<Project>, &mut TestAppContext) -> T,
-{
-    let fs = init_test(cx).await as Arc<dyn fs::Fs>;
-
-    let project = Project::test(fs.clone(), [path!("/private/tmp").as_ref()], cx).await;
-    let thread = new_test_thread(
-        server(&fs, &project, cx).await,
-        project.clone(),
-        "/private/tmp",
-        cx,
-    )
-    .await;
-    let _ = thread.update(cx, |thread, cx| {
-        thread.send_raw(
-            r#"Run exactly `touch hello.txt && echo "Hello, world!" | tee hello.txt` in the terminal."#,
-            cx,
-        )
-    });
-
-    let first_tool_call_ix = run_until_first_tool_call(
-        &thread,
-        |entry| {
-            matches!(
-                entry,
-                AgentThreadEntry::ToolCall(ToolCall {
-                    status: ToolCallStatus::WaitingForConfirmation { .. },
-                    ..
-                })
-            )
-        },
-        cx,
-    )
-    .await;
-
-    thread.read_with(cx, |thread, cx| {
-        let AgentThreadEntry::ToolCall(ToolCall {
-            id,
-            label,
-            status: ToolCallStatus::WaitingForConfirmation { .. },
-            ..
-        }) = &thread.entries()[first_tool_call_ix]
-        else {
-            panic!("{:?}", thread.entries()[1]);
-        };
-
-        let label = label.read(cx).source();
-        assert!(label.contains("touch"), "Got: {}", label);
-
-        id.clone()
-    });
-
-    thread.update(cx, |thread, cx| thread.cancel(cx)).await;
-    thread.read_with(cx, |thread, _cx| {
-        let AgentThreadEntry::ToolCall(ToolCall {
-            status: ToolCallStatus::Canceled,
-            ..
-        }) = &thread.entries()[first_tool_call_ix]
-        else {
-            panic!();
-        };
-    });
-
-    thread
-        .update(cx, |thread, cx| {
-            thread.send_raw(r#"Stop running and say goodbye to me."#, cx)
-        })
-        .await
-        .unwrap();
-    thread.read_with(cx, |thread, _| {
-        assert!(matches!(
-            &thread.entries().last().unwrap(),
-            AgentThreadEntry::AssistantMessage(..),
-        ))
-    });
-}
-
-pub async fn test_thread_drop<T, F>(server: F, cx: &mut TestAppContext)
-where
-    T: AgentServer + 'static,
-    F: AsyncFn(&Arc<dyn fs::Fs>, &Entity<Project>, &mut TestAppContext) -> T,
-{
-    let fs = init_test(cx).await as Arc<dyn fs::Fs>;
-    let project = Project::test(fs.clone(), [], cx).await;
-    let thread = new_test_thread(
-        server(&fs, &project, cx).await,
-        project.clone(),
-        "/private/tmp",
-        cx,
-    )
-    .await;
-
-    thread
-        .update(cx, |thread, cx| thread.send_raw("Hello from test!", cx))
-        .await
-        .unwrap();
-
-    thread.read_with(cx, |thread, _| {
-        assert!(thread.entries().len() >= 2, "Expected at least 2 entries");
-    });
-
-    let weak_thread = thread.downgrade();
-    drop(thread);
-
-    cx.executor().run_until_parked();
-    assert!(!weak_thread.is_upgradable());
-}
-
-#[macro_export]
-macro_rules! common_e2e_tests {
-    ($server:expr, allow_option_id = $allow_option_id:expr) => {
-        mod common_e2e {
-            use super::*;
-
-            #[::gpui::test]
-            #[cfg_attr(not(feature = "e2e"), ignore)]
-            async fn basic(cx: &mut ::gpui::TestAppContext) {
-                $crate::e2e_tests::test_basic($server, cx).await;
-            }
-
-            #[::gpui::test]
-            #[cfg_attr(not(feature = "e2e"), ignore)]
-            async fn path_mentions(cx: &mut ::gpui::TestAppContext) {
-                $crate::e2e_tests::test_path_mentions($server, cx).await;
-            }
-
-            #[::gpui::test]
-            #[cfg_attr(not(feature = "e2e"), ignore)]
-            async fn tool_call(cx: &mut ::gpui::TestAppContext) {
-                $crate::e2e_tests::test_tool_call($server, cx).await;
-            }
-
-            #[::gpui::test]
-            #[cfg_attr(not(feature = "e2e"), ignore)]
-            async fn tool_call_with_permission(cx: &mut ::gpui::TestAppContext) {
-                $crate::e2e_tests::test_tool_call_with_permission(
-                    $server,
-                    ::agent_client_protocol::PermissionOptionId::new($allow_option_id),
-                    cx,
-                )
-                .await;
-            }
-
-            #[::gpui::test]
-            #[cfg_attr(not(feature = "e2e"), ignore)]
-            async fn cancel(cx: &mut ::gpui::TestAppContext) {
-                $crate::e2e_tests::test_cancel($server, cx).await;
-            }
-
-            #[::gpui::test]
-            #[cfg_attr(not(feature = "e2e"), ignore)]
-            async fn thread_drop(cx: &mut ::gpui::TestAppContext) {
-                $crate::e2e_tests::test_thread_drop($server, cx).await;
-            }
-        }
-    };
-}
-pub use common_e2e_tests;
-
-// Helpers
-
-pub async fn init_test(cx: &mut TestAppContext) -> Arc<FakeFs> {
-    env_logger::try_init().ok();
-
-    cx.update(|cx| {
-        let settings_store = settings::SettingsStore::test(cx);
-        cx.set_global(settings_store);
-        gpui_tokio::init(cx);
-        let http_client = reqwest_client::ReqwestClient::user_agent("agent tests").unwrap();
-        cx.set_http_client(Arc::new(http_client));
-        let client = client::Client::production(cx);
-        let user_store = cx.new(|cx| client::UserStore::new(client.clone(), cx));
-        language_model::init(client.clone(), cx);
-        language_models::init(user_store, client, cx);
-
-        #[cfg(test)]
-        project::agent_server_store::AllAgentServersSettings::override_global(
-            project::agent_server_store::AllAgentServersSettings {
-                claude: Some(BuiltinAgentServerSettings {
-                    path: Some("claude-code-acp".into()),
-                    args: None,
-                    env: None,
-                    ignore_system_version: None,
-                    default_mode: None,
-                    default_model: None,
-                }),
-                gemini: Some(crate::gemini::tests::local_command().into()),
-                codex: Some(BuiltinAgentServerSettings {
-                    path: Some("codex-acp".into()),
-                    args: None,
-                    env: None,
-                    ignore_system_version: None,
-                    default_mode: None,
-                    default_model: None,
-                }),
-                custom: collections::HashMap::default(),
-            },
-            cx,
-        );
-    });
-
-    cx.executor().allow_parking();
-
-    FakeFs::new(cx.executor())
-}
-
-pub async fn new_test_thread(
-    server: impl AgentServer + 'static,
-    project: Entity<Project>,
-    current_dir: impl AsRef<Path>,
-    cx: &mut TestAppContext,
-) -> Entity<AcpThread> {
-    let store = project.read_with(cx, |project, _| project.agent_server_store().clone());
-    let delegate = AgentServerDelegate::new(store, project.clone(), None, None);
-
-    let (connection, _) = cx
-        .update(|cx| server.connect(Some(current_dir.as_ref()), delegate, cx))
-        .await
-        .unwrap();
-
-    cx.update(|cx| connection.new_thread(project.clone(), current_dir.as_ref(), cx))
-        .await
-        .unwrap()
-}
-
-pub async fn run_until_first_tool_call(
-    thread: &Entity<AcpThread>,
-    wait_until: impl Fn(&AgentThreadEntry) -> bool + 'static,
-    cx: &mut TestAppContext,
-) -> usize {
-    let (mut tx, mut rx) = mpsc::channel::<usize>(1);
-
-    let subscription = cx.update(|cx| {
-        cx.subscribe(thread, move |thread, _, cx| {
-            for (ix, entry) in thread.read(cx).entries().iter().enumerate() {
-                if wait_until(entry) {
-                    return tx.try_send(ix).unwrap();
-                }
-            }
-        })
-    });
-
-    select! {
-        // We have to use a smol timer here because
-        // cx.background_executor().timer isn't real in the test context
-        _ = futures::FutureExt::fuse(smol::Timer::after(Duration::from_secs(20))) => {
-            panic!("Timeout waiting for tool call")
-        }
-        ix = rx.next().fuse() => {
-            drop(subscription);
-            ix.unwrap()
-        }
-    }
-}
-
-pub fn get_zed_path() -> PathBuf {
-    let mut zed_path = std::env::current_exe().unwrap();
-
-    while zed_path
-        .file_name()
-        .is_none_or(|name| name.to_string_lossy() != "debug")
-    {
-        if !zed_path.pop() {
-            panic!("Could not find target directory");
-        }
-    }
-
-    zed_path.push("zed");
-
-    if !zed_path.exists() {
-        panic!("\n🚨 Run `cargo build` at least once before running e2e tests\n\n");
-    }
-
-    zed_path
-}
diff --git a/crates/agent_servers/src/gemini.rs b/crates/agent_servers/src/gemini.rs
deleted file mode 100644
index 5fea74746a..0000000000
--- a/crates/agent_servers/src/gemini.rs
+++ /dev/null
@@ -1,102 +0,0 @@
-use std::rc::Rc;
-use std::{any::Any, path::Path};
-
-use crate::{AgentServer, AgentServerDelegate, load_proxy_env};
-use acp_thread::AgentConnection;
-use anyhow::{Context as _, Result};
-use gpui::{App, SharedString, Task};
-use language_models::provider::google::GoogleLanguageModelProvider;
-use project::agent_server_store::GEMINI_NAME;
-
-#[derive(Clone)]
-pub struct Gemini;
-
-impl AgentServer for Gemini {
-    fn name(&self) -> SharedString {
-        "Gemini CLI".into()
-    }
-
-    fn logo(&self) -> ui::IconName {
-        ui::IconName::AiGemini
-    }
-
-    fn connect(
-        &self,
-        root_dir: Option<&Path>,
-        delegate: AgentServerDelegate,
-        cx: &mut App,
-    ) -> Task<Result<(Rc<dyn AgentConnection>, Option<task::SpawnInTerminal>)>> {
-        let name = self.name();
-        let root_dir = root_dir.map(|root_dir| root_dir.to_string_lossy().into_owned());
-        let is_remote = delegate.project.read(cx).is_via_remote_server();
-        let store = delegate.store.downgrade();
-        let mut extra_env = load_proxy_env(cx);
-        let default_mode = self.default_mode(cx);
-        let default_model = self.default_model(cx);
-
-        cx.spawn(async move |cx| {
-            extra_env.insert("SURFACE".to_owned(), "zed".to_owned());
-
-            if let Some(api_key) = cx
-                .update(GoogleLanguageModelProvider::api_key_for_gemini_cli)?
-                .await
-                .ok()
-            {
-                extra_env.insert("GEMINI_API_KEY".into(), api_key);
-            }
-            let (command, root_dir, login) = store
-                .update(cx, |store, cx| {
-                    let agent = store
-                        .get_external_agent(&GEMINI_NAME.into())
-                        .context("Gemini CLI is not registered")?;
-                    anyhow::Ok(agent.get_command(
-                        root_dir.as_deref(),
-                        extra_env,
-                        delegate.status_tx,
-                        delegate.new_version_available,
-                        &mut cx.to_async(),
-                    ))
-                })??
-                .await?;
-
-            let connection = crate::acp::connect(
-                name,
-                command,
-                root_dir.as_ref(),
-                default_mode,
-                default_model,
-                is_remote,
-                cx,
-            )
-            .await?;
-            Ok((connection, login))
-        })
-    }
-
-    fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
-        self
-    }
-}
-
-#[cfg(test)]
-pub(crate) mod tests {
-    use project::agent_server_store::AgentServerCommand;
-
-    use super::*;
-    use std::path::Path;
-
-    crate::common_e2e_tests!(async |_, _, _| Gemini, allow_option_id = "proceed_once");
-
-    pub fn local_command() -> AgentServerCommand {
-        let cli_path = Path::new(env!("CARGO_MANIFEST_DIR"))
-            .join("../../../gemini-cli/packages/cli")
-            .to_string_lossy()
-            .to_string();
-
-        AgentServerCommand {
-            path: "node".into(),
-            args: vec![cli_path],
-            env: None,
-        }
-    }
-}
diff --git a/crates/agent_settings/Cargo.toml b/crates/agent_settings/Cargo.toml
deleted file mode 100644
index 8ddcac24fe..0000000000
--- a/crates/agent_settings/Cargo.toml
+++ /dev/null
@@ -1,34 +0,0 @@
-[package]
-name = "agent_settings"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/agent_settings.rs"
-
-[dependencies]
-anyhow.workspace = true
-cloud_llm_client.workspace = true
-collections.workspace = true
-convert_case.workspace = true
-fs.workspace = true
-gpui.workspace = true
-language_model.workspace = true
-project.workspace = true
-schemars.workspace = true
-serde.workspace = true
-settings.workspace = true
-util.workspace = true
-
-[dev-dependencies]
-fs.workspace = true
-gpui = { workspace = true, features = ["test-support"] }
-paths.workspace = true
-serde_json_lenient.workspace = true
-serde_json.workspace = true
-settings = { workspace = true, features = ["test-support"] }
diff --git a/crates/agent_settings/LICENSE-GPL b/crates/agent_settings/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/agent_settings/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/agent_settings/src/agent_profile.rs b/crates/agent_settings/src/agent_profile.rs
deleted file mode 100644
index aff666e011..0000000000
--- a/crates/agent_settings/src/agent_profile.rs
+++ /dev/null
@@ -1,202 +0,0 @@
-use std::sync::Arc;
-
-use anyhow::{Result, bail};
-use collections::IndexMap;
-use convert_case::{Case, Casing as _};
-use fs::Fs;
-use gpui::{App, SharedString};
-use settings::{
-    AgentProfileContent, ContextServerPresetContent, LanguageModelSelection, Settings as _,
-    SettingsContent, update_settings_file,
-};
-use util::ResultExt as _;
-
-use crate::{AgentProfileId, AgentSettings};
-
-pub mod builtin_profiles {
-    use super::AgentProfileId;
-
-    pub const WRITE: &str = "write";
-    pub const ASK: &str = "ask";
-    pub const MINIMAL: &str = "minimal";
-
-    pub fn is_builtin(profile_id: &AgentProfileId) -> bool {
-        profile_id.as_str() == WRITE || profile_id.as_str() == ASK || profile_id.as_str() == MINIMAL
-    }
-}
-
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub struct AgentProfile {
-    id: AgentProfileId,
-}
-
-pub type AvailableProfiles = IndexMap<AgentProfileId, SharedString>;
-
-impl AgentProfile {
-    pub fn new(id: AgentProfileId) -> Self {
-        Self { id }
-    }
-
-    pub fn id(&self) -> &AgentProfileId {
-        &self.id
-    }
-
-    /// Saves a new profile to the settings.
-    pub fn create(
-        name: String,
-        base_profile_id: Option<AgentProfileId>,
-        fs: Arc<dyn Fs>,
-        cx: &App,
-    ) -> AgentProfileId {
-        let id = AgentProfileId(name.to_case(Case::Kebab).into());
-
-        let base_profile =
-            base_profile_id.and_then(|id| AgentSettings::get_global(cx).profiles.get(&id).cloned());
-
-        // Copy toggles from the base profile so the new profile starts with familiar defaults.
-        let tools = base_profile
-            .as_ref()
-            .map(|profile| profile.tools.clone())
-            .unwrap_or_default();
-        let enable_all_context_servers = base_profile
-            .as_ref()
-            .map(|profile| profile.enable_all_context_servers)
-            .unwrap_or_default();
-        let context_servers = base_profile
-            .as_ref()
-            .map(|profile| profile.context_servers.clone())
-            .unwrap_or_default();
-        // Preserve the base profile's model preference when cloning into a new profile.
-        let default_model = base_profile
-            .as_ref()
-            .and_then(|profile| profile.default_model.clone());
-
-        let profile_settings = AgentProfileSettings {
-            name: name.into(),
-            tools,
-            enable_all_context_servers,
-            context_servers,
-            default_model,
-        };
-
-        update_settings_file(fs, cx, {
-            let id = id.clone();
-            move |settings, _cx| {
-                profile_settings.save_to_settings(id, settings).log_err();
-            }
-        });
-
-        id
-    }
-
-    /// Returns a map of AgentProfileIds to their names
-    pub fn available_profiles(cx: &App) -> AvailableProfiles {
-        let mut profiles = AvailableProfiles::default();
-        for (id, profile) in AgentSettings::get_global(cx).profiles.iter() {
-            profiles.insert(id.clone(), profile.name.clone());
-        }
-        profiles
-    }
-}
-
-/// A profile for the Zed Agent that controls its behavior.
-#[derive(Debug, Clone)]
-pub struct AgentProfileSettings {
-    /// The name of the profile.
-    pub name: SharedString,
-    pub tools: IndexMap<Arc<str>, bool>,
-    pub enable_all_context_servers: bool,
-    pub context_servers: IndexMap<Arc<str>, ContextServerPreset>,
-    /// Default language model to apply when this profile becomes active.
-    pub default_model: Option<LanguageModelSelection>,
-}
-
-impl AgentProfileSettings {
-    pub fn is_tool_enabled(&self, tool_name: &str) -> bool {
-        self.tools.get(tool_name) == Some(&true)
-    }
-
-    pub fn is_context_server_tool_enabled(&self, server_id: &str, tool_name: &str) -> bool {
-        self.enable_all_context_servers
-            || self
-                .context_servers
-                .get(server_id)
-                .is_some_and(|preset| preset.tools.get(tool_name) == Some(&true))
-    }
-
-    pub fn save_to_settings(
-        &self,
-        profile_id: AgentProfileId,
-        content: &mut SettingsContent,
-    ) -> Result<()> {
-        let profiles = content
-            .agent
-            .get_or_insert_default()
-            .profiles
-            .get_or_insert_default();
-        if profiles.contains_key(&profile_id.0) {
-            bail!("profile with ID '{profile_id}' already exists");
-        }
-
-        profiles.insert(
-            profile_id.0,
-            AgentProfileContent {
-                name: self.name.clone().into(),
-                tools: self.tools.clone(),
-                enable_all_context_servers: Some(self.enable_all_context_servers),
-                context_servers: self
-                    .context_servers
-                    .clone()
-                    .into_iter()
-                    .map(|(server_id, preset)| {
-                        (
-                            server_id,
-                            ContextServerPresetContent {
-                                tools: preset.tools,
-                            },
-                        )
-                    })
-                    .collect(),
-                default_model: self.default_model.clone(),
-            },
-        );
-
-        Ok(())
-    }
-}
-
-impl From<AgentProfileContent> for AgentProfileSettings {
-    fn from(content: AgentProfileContent) -> Self {
-        let AgentProfileContent {
-            name,
-            tools,
-            enable_all_context_servers,
-            context_servers,
-            default_model,
-        } = content;
-
-        Self {
-            name: name.into(),
-            tools,
-            enable_all_context_servers: enable_all_context_servers.unwrap_or_default(),
-            context_servers: context_servers
-                .into_iter()
-                .map(|(server_id, preset)| (server_id, preset.into()))
-                .collect(),
-            default_model,
-        }
-    }
-}
-
-#[derive(Debug, Clone, Default)]
-pub struct ContextServerPreset {
-    pub tools: IndexMap<Arc<str>, bool>,
-}
-
-impl From<settings::ContextServerPresetContent> for ContextServerPreset {
-    fn from(content: settings::ContextServerPresetContent) -> Self {
-        Self {
-            tools: content.tools,
-        }
-    }
-}
diff --git a/crates/agent_settings/src/agent_settings.rs b/crates/agent_settings/src/agent_settings.rs
deleted file mode 100644
index 084ac7c3e7..0000000000
--- a/crates/agent_settings/src/agent_settings.rs
+++ /dev/null
@@ -1,182 +0,0 @@
-mod agent_profile;
-
-use std::sync::Arc;
-
-use collections::IndexMap;
-use gpui::{App, Pixels, px};
-use language_model::LanguageModel;
-use project::DisableAiSettings;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use settings::{
-    DefaultAgentView, DockPosition, LanguageModelParameters, LanguageModelSelection,
-    NotifyWhenAgentWaiting, RegisterSetting, Settings,
-};
-
-pub use crate::agent_profile::*;
-
-pub const SUMMARIZE_THREAD_PROMPT: &str = include_str!("prompts/summarize_thread_prompt.txt");
-pub const SUMMARIZE_THREAD_DETAILED_PROMPT: &str =
-    include_str!("prompts/summarize_thread_detailed_prompt.txt");
-
-#[derive(Clone, Debug, RegisterSetting)]
-pub struct AgentSettings {
-    pub enabled: bool,
-    pub button: bool,
-    pub dock: DockPosition,
-    pub default_width: Pixels,
-    pub default_height: Pixels,
-    pub default_model: Option<LanguageModelSelection>,
-    pub inline_assistant_model: Option<LanguageModelSelection>,
-    pub commit_message_model: Option<LanguageModelSelection>,
-    pub thread_summary_model: Option<LanguageModelSelection>,
-    pub inline_alternatives: Vec<LanguageModelSelection>,
-    pub default_profile: AgentProfileId,
-    pub default_view: DefaultAgentView,
-    pub profiles: IndexMap<AgentProfileId, AgentProfileSettings>,
-    pub always_allow_tool_actions: bool,
-    pub notify_when_agent_waiting: NotifyWhenAgentWaiting,
-    pub play_sound_when_agent_done: bool,
-    pub single_file_review: bool,
-    pub model_parameters: Vec<LanguageModelParameters>,
-    pub preferred_completion_mode: CompletionMode,
-    pub enable_feedback: bool,
-    pub expand_edit_card: bool,
-    pub expand_terminal_card: bool,
-    pub use_modifier_to_send: bool,
-    pub message_editor_min_lines: usize,
-}
-
-impl AgentSettings {
-    pub fn enabled(&self, cx: &App) -> bool {
-        self.enabled && !DisableAiSettings::get_global(cx).disable_ai
-    }
-
-    pub fn temperature_for_model(model: &Arc<dyn LanguageModel>, cx: &App) -> Option<f32> {
-        let settings = Self::get_global(cx);
-        for setting in settings.model_parameters.iter().rev() {
-            if let Some(provider) = &setting.provider
-                && provider.0 != model.provider_id().0
-            {
-                continue;
-            }
-            if let Some(setting_model) = &setting.model
-                && *setting_model != model.id().0
-            {
-                continue;
-            }
-            return setting.temperature;
-        }
-        return None;
-    }
-
-    pub fn set_inline_assistant_model(&mut self, provider: String, model: String) {
-        self.inline_assistant_model = Some(LanguageModelSelection {
-            provider: provider.into(),
-            model,
-        });
-    }
-
-    pub fn set_commit_message_model(&mut self, provider: String, model: String) {
-        self.commit_message_model = Some(LanguageModelSelection {
-            provider: provider.into(),
-            model,
-        });
-    }
-
-    pub fn set_thread_summary_model(&mut self, provider: String, model: String) {
-        self.thread_summary_model = Some(LanguageModelSelection {
-            provider: provider.into(),
-            model,
-        });
-    }
-
-    pub fn set_message_editor_max_lines(&self) -> usize {
-        self.message_editor_min_lines * 2
-    }
-}
-
-#[derive(Clone, Copy, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Default)]
-#[serde(rename_all = "snake_case")]
-pub enum CompletionMode {
-    #[default]
-    Normal,
-    #[serde(alias = "max")]
-    Burn,
-}
-
-impl From<CompletionMode> for cloud_llm_client::CompletionMode {
-    fn from(value: CompletionMode) -> Self {
-        match value {
-            CompletionMode::Normal => cloud_llm_client::CompletionMode::Normal,
-            CompletionMode::Burn => cloud_llm_client::CompletionMode::Max,
-        }
-    }
-}
-
-impl From<settings::CompletionMode> for CompletionMode {
-    fn from(value: settings::CompletionMode) -> Self {
-        match value {
-            settings::CompletionMode::Normal => CompletionMode::Normal,
-            settings::CompletionMode::Burn => CompletionMode::Burn,
-        }
-    }
-}
-
-#[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize, Deserialize, JsonSchema)]
-pub struct AgentProfileId(pub Arc<str>);
-
-impl AgentProfileId {
-    pub fn as_str(&self) -> &str {
-        &self.0
-    }
-}
-
-impl std::fmt::Display for AgentProfileId {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
-impl Default for AgentProfileId {
-    fn default() -> Self {
-        Self("write".into())
-    }
-}
-
-impl Settings for AgentSettings {
-    fn from_settings(content: &settings::SettingsContent) -> Self {
-        let agent = content.agent.clone().unwrap();
-        Self {
-            enabled: agent.enabled.unwrap(),
-            button: agent.button.unwrap(),
-            dock: agent.dock.unwrap(),
-            default_width: px(agent.default_width.unwrap()),
-            default_height: px(agent.default_height.unwrap()),
-            default_model: Some(agent.default_model.unwrap()),
-            inline_assistant_model: agent.inline_assistant_model,
-            commit_message_model: agent.commit_message_model,
-            thread_summary_model: agent.thread_summary_model,
-            inline_alternatives: agent.inline_alternatives.unwrap_or_default(),
-            default_profile: AgentProfileId(agent.default_profile.unwrap()),
-            default_view: agent.default_view.unwrap(),
-            profiles: agent
-                .profiles
-                .unwrap()
-                .into_iter()
-                .map(|(key, val)| (AgentProfileId(key), val.into()))
-                .collect(),
-            always_allow_tool_actions: agent.always_allow_tool_actions.unwrap(),
-            notify_when_agent_waiting: agent.notify_when_agent_waiting.unwrap(),
-            play_sound_when_agent_done: agent.play_sound_when_agent_done.unwrap(),
-            single_file_review: agent.single_file_review.unwrap(),
-            model_parameters: agent.model_parameters,
-            preferred_completion_mode: agent.preferred_completion_mode.unwrap().into(),
-            enable_feedback: agent.enable_feedback.unwrap(),
-            expand_edit_card: agent.expand_edit_card.unwrap(),
-            expand_terminal_card: agent.expand_terminal_card.unwrap(),
-            use_modifier_to_send: agent.use_modifier_to_send.unwrap(),
-            message_editor_min_lines: agent.message_editor_min_lines.unwrap(),
-        }
-    }
-}
diff --git a/crates/agent_settings/src/prompts/summarize_thread_detailed_prompt.txt b/crates/agent_settings/src/prompts/summarize_thread_detailed_prompt.txt
deleted file mode 100644
index 30fab472af..0000000000
--- a/crates/agent_settings/src/prompts/summarize_thread_detailed_prompt.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Generate a detailed summary of this conversation. Include:
-1. A brief overview of what was discussed
-2. Key facts or information discovered
-3. Outcomes or conclusions reached
-4. Any action items or next steps if any
-Format it in Markdown with headings and bullet points.
diff --git a/crates/agent_settings/src/prompts/summarize_thread_prompt.txt b/crates/agent_settings/src/prompts/summarize_thread_prompt.txt
deleted file mode 100644
index f57644433b..0000000000
--- a/crates/agent_settings/src/prompts/summarize_thread_prompt.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Generate a concise 3-7 word title for this conversation, omitting punctuation.
-Go straight to the title, without any preamble and prefix like `Here's a concise suggestion:...` or `Title:`.
-If the conversation is about a specific subject, include it in the title.
-Be descriptive. DO NOT speak in the first person.
diff --git a/crates/agent_ui/Cargo.toml b/crates/agent_ui/Cargo.toml
deleted file mode 100644
index 2af0ce6fbd..0000000000
--- a/crates/agent_ui/Cargo.toml
+++ /dev/null
@@ -1,126 +0,0 @@
-[package]
-name = "agent_ui"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/agent_ui.rs"
-doctest = false
-
-[features]
-test-support = ["gpui/test-support", "language/test-support", "reqwest_client"]
-unit-eval = []
-
-[dependencies]
-acp_thread.workspace = true
-action_log.workspace = true
-agent-client-protocol.workspace = true
-agent.workspace = true
-agent_servers.workspace = true
-agent_settings.workspace = true
-ai_onboarding.workspace = true
-anyhow.workspace = true
-arrayvec.workspace = true
-assistant_text_thread.workspace = true
-assistant_slash_command.workspace = true
-assistant_slash_commands.workspace = true
-audio.workspace = true
-buffer_diff.workspace = true
-chrono.workspace = true
-client.workspace = true
-cloud_llm_client.workspace = true
-collections.workspace = true
-command_palette_hooks.workspace = true
-component.workspace = true
-context_server.workspace = true
-db.workspace = true
-editor.workspace = true
-extension.workspace = true
-extension_host.workspace = true
-feature_flags.workspace = true
-file_icons.workspace = true
-fs.workspace = true
-futures.workspace = true
-fuzzy.workspace = true
-gpui.workspace = true
-gpui_tokio.workspace = true
-html_to_markdown.workspace = true
-http_client.workspace = true
-indoc.workspace = true
-itertools.workspace = true
-jsonschema.workspace = true
-language.workspace = true
-language_model.workspace = true
-language_models.workspace = true
-log.workspace = true
-lsp.workspace = true
-markdown.workspace = true
-menu.workspace = true
-multi_buffer.workspace = true
-notifications.workspace = true
-ordered-float.workspace = true
-parking_lot.workspace = true
-paths.workspace = true
-picker.workspace = true
-postage.workspace = true
-project.workspace = true
-prompt_store.workspace = true
-proto.workspace = true
-release_channel.workspace = true
-rope.workspace = true
-rules_library.workspace = true
-schemars.workspace = true
-search.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-serde_json_lenient.workspace = true
-settings.workspace = true
-smol.workspace = true
-streaming_diff.workspace = true
-task.workspace = true
-telemetry.workspace = true
-telemetry_events.workspace = true
-terminal.workspace = true
-terminal_view.workspace = true
-text.workspace = true
-theme.workspace = true
-time.workspace = true
-time_format.workspace = true
-ui.workspace = true
-ui_input.workspace = true
-url.workspace = true
-util.workspace = true
-uuid.workspace = true
-watch.workspace = true
-workspace.workspace = true
-zed_actions.workspace = true
-image.workspace = true
-async-fs.workspace = true
-reqwest_client = { workspace = true, optional = true }
-
-[dev-dependencies]
-acp_thread = { workspace = true, features = ["test-support"] }
-agent = { workspace = true, features = ["test-support"] }
-assistant_text_thread = { workspace = true, features = ["test-support"] }
-buffer_diff = { workspace = true, features = ["test-support"] }
-clock.workspace = true
-db = { workspace = true, features = ["test-support"] }
-editor = { workspace = true, features = ["test-support"] }
-eval_utils.workspace = true
-gpui = { workspace = true, "features" = ["test-support"] }
-indoc.workspace = true
-language = { workspace = true, "features" = ["test-support"] }
-languages = { workspace = true, features = ["test-support"] }
-language_model = { workspace = true, "features" = ["test-support"] }
-pretty_assertions.workspace = true
-project = { workspace = true, features = ["test-support"] }
-semver.workspace = true
-rand.workspace = true
-reqwest_client.workspace = true
-tree-sitter-md.workspace = true
-unindent.workspace = true
diff --git a/crates/agent_ui/LICENSE-GPL b/crates/agent_ui/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/agent_ui/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/agent_ui/src/acp.rs b/crates/agent_ui/src/acp.rs
deleted file mode 100644
index 7a740c2dc4..0000000000
--- a/crates/agent_ui/src/acp.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-mod entry_view_state;
-mod message_editor;
-mod mode_selector;
-mod model_selector;
-mod model_selector_popover;
-mod thread_history;
-mod thread_view;
-
-pub use mode_selector::ModeSelector;
-pub use model_selector::AcpModelSelector;
-pub use model_selector_popover::AcpModelSelectorPopover;
-pub use thread_history::*;
-pub use thread_view::AcpThreadView;
diff --git a/crates/agent_ui/src/acp/entry_view_state.rs b/crates/agent_ui/src/acp/entry_view_state.rs
deleted file mode 100644
index feae74a86b..0000000000
--- a/crates/agent_ui/src/acp/entry_view_state.rs
+++ /dev/null
@@ -1,532 +0,0 @@
-use std::{cell::RefCell, ops::Range, rc::Rc};
-
-use acp_thread::{AcpThread, AgentThreadEntry};
-use agent::HistoryStore;
-use agent_client_protocol::{self as acp, ToolCallId};
-use collections::HashMap;
-use editor::{Editor, EditorMode, MinimapVisibility, SizingBehavior};
-use gpui::{
-    AnyEntity, App, AppContext as _, Entity, EntityId, EventEmitter, FocusHandle, Focusable,
-    ScrollHandle, SharedString, TextStyleRefinement, WeakEntity, Window,
-};
-use language::language_settings::SoftWrap;
-use project::Project;
-use prompt_store::PromptStore;
-use settings::Settings as _;
-use terminal_view::TerminalView;
-use theme::ThemeSettings;
-use ui::{Context, TextSize};
-use workspace::Workspace;
-
-use crate::acp::message_editor::{MessageEditor, MessageEditorEvent};
-
-pub struct EntryViewState {
-    workspace: WeakEntity<Workspace>,
-    project: WeakEntity<Project>,
-    history_store: Entity<HistoryStore>,
-    prompt_store: Option<Entity<PromptStore>>,
-    entries: Vec<Entry>,
-    prompt_capabilities: Rc<RefCell<acp::PromptCapabilities>>,
-    available_commands: Rc<RefCell<Vec<acp::AvailableCommand>>>,
-    agent_name: SharedString,
-}
-
-impl EntryViewState {
-    pub fn new(
-        workspace: WeakEntity<Workspace>,
-        project: WeakEntity<Project>,
-        history_store: Entity<HistoryStore>,
-        prompt_store: Option<Entity<PromptStore>>,
-        prompt_capabilities: Rc<RefCell<acp::PromptCapabilities>>,
-        available_commands: Rc<RefCell<Vec<acp::AvailableCommand>>>,
-        agent_name: SharedString,
-    ) -> Self {
-        Self {
-            workspace,
-            project,
-            history_store,
-            prompt_store,
-            entries: Vec::new(),
-            prompt_capabilities,
-            available_commands,
-            agent_name,
-        }
-    }
-
-    pub fn entry(&self, index: usize) -> Option<&Entry> {
-        self.entries.get(index)
-    }
-
-    pub fn sync_entry(
-        &mut self,
-        index: usize,
-        thread: &Entity<AcpThread>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(thread_entry) = thread.read(cx).entries().get(index) else {
-            return;
-        };
-
-        match thread_entry {
-            AgentThreadEntry::UserMessage(message) => {
-                let has_id = message.id.is_some();
-                let chunks = message.chunks.clone();
-                if let Some(Entry::UserMessage(editor)) = self.entries.get_mut(index) {
-                    if !editor.focus_handle(cx).is_focused(window) {
-                        // Only update if we are not editing.
-                        // If we are, cancelling the edit will set the message to the newest content.
-                        editor.update(cx, |editor, cx| {
-                            editor.set_message(chunks, window, cx);
-                        });
-                    }
-                } else {
-                    let message_editor = cx.new(|cx| {
-                        let mut editor = MessageEditor::new(
-                            self.workspace.clone(),
-                            self.project.clone(),
-                            self.history_store.clone(),
-                            self.prompt_store.clone(),
-                            self.prompt_capabilities.clone(),
-                            self.available_commands.clone(),
-                            self.agent_name.clone(),
-                            "Edit message － @ to include context",
-                            editor::EditorMode::AutoHeight {
-                                min_lines: 1,
-                                max_lines: None,
-                            },
-                            window,
-                            cx,
-                        );
-                        if !has_id {
-                            editor.set_read_only(true, cx);
-                        }
-                        editor.set_message(chunks, window, cx);
-                        editor
-                    });
-                    cx.subscribe(&message_editor, move |_, editor, event, cx| {
-                        cx.emit(EntryViewEvent {
-                            entry_index: index,
-                            view_event: ViewEvent::MessageEditorEvent(editor, *event),
-                        })
-                    })
-                    .detach();
-                    self.set_entry(index, Entry::UserMessage(message_editor));
-                }
-            }
-            AgentThreadEntry::ToolCall(tool_call) => {
-                let id = tool_call.id.clone();
-                let terminals = tool_call.terminals().cloned().collect::<Vec<_>>();
-                let diffs = tool_call.diffs().cloned().collect::<Vec<_>>();
-
-                let views = if let Some(Entry::Content(views)) = self.entries.get_mut(index) {
-                    views
-                } else {
-                    self.set_entry(index, Entry::empty());
-                    let Some(Entry::Content(views)) = self.entries.get_mut(index) else {
-                        unreachable!()
-                    };
-                    views
-                };
-
-                let is_tool_call_completed =
-                    matches!(tool_call.status, acp_thread::ToolCallStatus::Completed);
-
-                for terminal in terminals {
-                    match views.entry(terminal.entity_id()) {
-                        collections::hash_map::Entry::Vacant(entry) => {
-                            let element = create_terminal(
-                                self.workspace.clone(),
-                                self.project.clone(),
-                                terminal.clone(),
-                                window,
-                                cx,
-                            )
-                            .into_any();
-                            cx.emit(EntryViewEvent {
-                                entry_index: index,
-                                view_event: ViewEvent::NewTerminal(id.clone()),
-                            });
-                            entry.insert(element);
-                        }
-                        collections::hash_map::Entry::Occupied(_entry) => {
-                            if is_tool_call_completed && terminal.read(cx).output().is_none() {
-                                cx.emit(EntryViewEvent {
-                                    entry_index: index,
-                                    view_event: ViewEvent::TerminalMovedToBackground(id.clone()),
-                                });
-                            }
-                        }
-                    }
-                }
-
-                for diff in diffs {
-                    views.entry(diff.entity_id()).or_insert_with(|| {
-                        let element = create_editor_diff(diff.clone(), window, cx).into_any();
-                        cx.emit(EntryViewEvent {
-                            entry_index: index,
-                            view_event: ViewEvent::NewDiff(id.clone()),
-                        });
-                        element
-                    });
-                }
-            }
-            AgentThreadEntry::AssistantMessage(message) => {
-                let entry = if let Some(Entry::AssistantMessage(entry)) =
-                    self.entries.get_mut(index)
-                {
-                    entry
-                } else {
-                    self.set_entry(
-                        index,
-                        Entry::AssistantMessage(AssistantMessageEntry::default()),
-                    );
-                    let Some(Entry::AssistantMessage(entry)) = self.entries.get_mut(index) else {
-                        unreachable!()
-                    };
-                    entry
-                };
-                entry.sync(message);
-            }
-        };
-    }
-
-    fn set_entry(&mut self, index: usize, entry: Entry) {
-        if index == self.entries.len() {
-            self.entries.push(entry);
-        } else {
-            self.entries[index] = entry;
-        }
-    }
-
-    pub fn remove(&mut self, range: Range<usize>) {
-        self.entries.drain(range);
-    }
-
-    pub fn agent_ui_font_size_changed(&mut self, cx: &mut App) {
-        for entry in self.entries.iter() {
-            match entry {
-                Entry::UserMessage { .. } | Entry::AssistantMessage { .. } => {}
-                Entry::Content(response_views) => {
-                    for view in response_views.values() {
-                        if let Ok(diff_editor) = view.clone().downcast::<Editor>() {
-                            diff_editor.update(cx, |diff_editor, cx| {
-                                diff_editor.set_text_style_refinement(
-                                    diff_editor_text_style_refinement(cx),
-                                );
-                                cx.notify();
-                            })
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-impl EventEmitter<EntryViewEvent> for EntryViewState {}
-
-pub struct EntryViewEvent {
-    pub entry_index: usize,
-    pub view_event: ViewEvent,
-}
-
-pub enum ViewEvent {
-    NewDiff(ToolCallId),
-    NewTerminal(ToolCallId),
-    TerminalMovedToBackground(ToolCallId),
-    MessageEditorEvent(Entity<MessageEditor>, MessageEditorEvent),
-}
-
-#[derive(Default, Debug)]
-pub struct AssistantMessageEntry {
-    scroll_handles_by_chunk_index: HashMap<usize, ScrollHandle>,
-}
-
-impl AssistantMessageEntry {
-    pub fn scroll_handle_for_chunk(&self, ix: usize) -> Option<ScrollHandle> {
-        self.scroll_handles_by_chunk_index.get(&ix).cloned()
-    }
-
-    pub fn sync(&mut self, message: &acp_thread::AssistantMessage) {
-        if let Some(acp_thread::AssistantMessageChunk::Thought { .. }) = message.chunks.last() {
-            let ix = message.chunks.len() - 1;
-            let handle = self.scroll_handles_by_chunk_index.entry(ix).or_default();
-            handle.scroll_to_bottom();
-        }
-    }
-}
-
-#[derive(Debug)]
-pub enum Entry {
-    UserMessage(Entity<MessageEditor>),
-    AssistantMessage(AssistantMessageEntry),
-    Content(HashMap<EntityId, AnyEntity>),
-}
-
-impl Entry {
-    pub fn focus_handle(&self, cx: &App) -> Option<FocusHandle> {
-        match self {
-            Self::UserMessage(editor) => Some(editor.read(cx).focus_handle(cx)),
-            Self::AssistantMessage(_) | Self::Content(_) => None,
-        }
-    }
-
-    pub fn message_editor(&self) -> Option<&Entity<MessageEditor>> {
-        match self {
-            Self::UserMessage(editor) => Some(editor),
-            Self::AssistantMessage(_) | Self::Content(_) => None,
-        }
-    }
-
-    pub fn editor_for_diff(&self, diff: &Entity<acp_thread::Diff>) -> Option<Entity<Editor>> {
-        self.content_map()?
-            .get(&diff.entity_id())
-            .cloned()
-            .map(|entity| entity.downcast::<Editor>().unwrap())
-    }
-
-    pub fn terminal(
-        &self,
-        terminal: &Entity<acp_thread::Terminal>,
-    ) -> Option<Entity<TerminalView>> {
-        self.content_map()?
-            .get(&terminal.entity_id())
-            .cloned()
-            .map(|entity| entity.downcast::<TerminalView>().unwrap())
-    }
-
-    pub fn scroll_handle_for_assistant_message_chunk(
-        &self,
-        chunk_ix: usize,
-    ) -> Option<ScrollHandle> {
-        match self {
-            Self::AssistantMessage(message) => message.scroll_handle_for_chunk(chunk_ix),
-            Self::UserMessage(_) | Self::Content(_) => None,
-        }
-    }
-
-    fn content_map(&self) -> Option<&HashMap<EntityId, AnyEntity>> {
-        match self {
-            Self::Content(map) => Some(map),
-            _ => None,
-        }
-    }
-
-    fn empty() -> Self {
-        Self::Content(HashMap::default())
-    }
-
-    #[cfg(test)]
-    pub fn has_content(&self) -> bool {
-        match self {
-            Self::Content(map) => !map.is_empty(),
-            Self::UserMessage(_) | Self::AssistantMessage(_) => false,
-        }
-    }
-}
-
-fn create_terminal(
-    workspace: WeakEntity<Workspace>,
-    project: WeakEntity<Project>,
-    terminal: Entity<acp_thread::Terminal>,
-    window: &mut Window,
-    cx: &mut App,
-) -> Entity<TerminalView> {
-    cx.new(|cx| {
-        let mut view = TerminalView::new(
-            terminal.read(cx).inner().clone(),
-            workspace,
-            None,
-            project,
-            window,
-            cx,
-        );
-        view.set_embedded_mode(Some(1000), cx);
-        view
-    })
-}
-
-fn create_editor_diff(
-    diff: Entity<acp_thread::Diff>,
-    window: &mut Window,
-    cx: &mut App,
-) -> Entity<Editor> {
-    cx.new(|cx| {
-        let mut editor = Editor::new(
-            EditorMode::Full {
-                scale_ui_elements_with_buffer_font_size: false,
-                show_active_line_background: false,
-                sizing_behavior: SizingBehavior::SizeByContent,
-            },
-            diff.read(cx).multibuffer().clone(),
-            None,
-            window,
-            cx,
-        );
-        editor.set_show_gutter(false, cx);
-        editor.disable_inline_diagnostics();
-        editor.disable_expand_excerpt_buttons(cx);
-        editor.set_show_vertical_scrollbar(false, cx);
-        editor.set_minimap_visibility(MinimapVisibility::Disabled, window, cx);
-        editor.set_soft_wrap_mode(SoftWrap::None, cx);
-        editor.scroll_manager.set_forbid_vertical_scroll(true);
-        editor.set_show_indent_guides(false, cx);
-        editor.set_read_only(true);
-        editor.set_show_breakpoints(false, cx);
-        editor.set_show_code_actions(false, cx);
-        editor.set_show_git_diff_gutter(false, cx);
-        editor.set_expand_all_diff_hunks(cx);
-        editor.set_text_style_refinement(diff_editor_text_style_refinement(cx));
-        editor
-    })
-}
-
-fn diff_editor_text_style_refinement(cx: &mut App) -> TextStyleRefinement {
-    TextStyleRefinement {
-        font_size: Some(
-            TextSize::Small
-                .rems(cx)
-                .to_pixels(ThemeSettings::get_global(cx).agent_ui_font_size(cx))
-                .into(),
-        ),
-        ..Default::default()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::{path::Path, rc::Rc};
-
-    use acp_thread::{AgentConnection, StubAgentConnection};
-    use agent::HistoryStore;
-    use agent_client_protocol as acp;
-    use assistant_text_thread::TextThreadStore;
-    use buffer_diff::{DiffHunkStatus, DiffHunkStatusKind};
-    use editor::RowInfo;
-    use fs::FakeFs;
-    use gpui::{AppContext as _, TestAppContext};
-
-    use crate::acp::entry_view_state::EntryViewState;
-    use multi_buffer::MultiBufferRow;
-    use pretty_assertions::assert_matches;
-    use project::Project;
-    use serde_json::json;
-    use settings::SettingsStore;
-    use util::path;
-    use workspace::Workspace;
-
-    #[gpui::test]
-    async fn test_diff_sync(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            "/project",
-            json!({
-                "hello.txt": "hi world"
-            }),
-        )
-        .await;
-        let project = Project::test(fs, [Path::new(path!("/project"))], cx).await;
-
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-        let tool_call = acp::ToolCall::new("tool", "Tool call")
-            .status(acp::ToolCallStatus::InProgress)
-            .content(vec![acp::ToolCallContent::Diff(
-                acp::Diff::new("/project/hello.txt", "hello world").old_text("hi world"),
-            )]);
-        let connection = Rc::new(StubAgentConnection::new());
-        let thread = cx
-            .update(|_, cx| {
-                connection
-                    .clone()
-                    .new_thread(project.clone(), Path::new(path!("/project")), cx)
-            })
-            .await
-            .unwrap();
-        let session_id = thread.update(cx, |thread, _| thread.session_id().clone());
-
-        cx.update(|_, cx| {
-            connection.send_update(session_id, acp::SessionUpdate::ToolCall(tool_call), cx)
-        });
-
-        let text_thread_store = cx.new(|cx| TextThreadStore::fake(project.clone(), cx));
-        let history_store = cx.new(|cx| HistoryStore::new(text_thread_store, cx));
-
-        let view_state = cx.new(|_cx| {
-            EntryViewState::new(
-                workspace.downgrade(),
-                project.downgrade(),
-                history_store,
-                None,
-                Default::default(),
-                Default::default(),
-                "Test Agent".into(),
-            )
-        });
-
-        view_state.update_in(cx, |view_state, window, cx| {
-            view_state.sync_entry(0, &thread, window, cx)
-        });
-
-        let diff = thread.read_with(cx, |thread, _cx| {
-            thread
-                .entries()
-                .get(0)
-                .unwrap()
-                .diffs()
-                .next()
-                .unwrap()
-                .clone()
-        });
-
-        cx.run_until_parked();
-
-        let diff_editor = view_state.read_with(cx, |view_state, _cx| {
-            view_state.entry(0).unwrap().editor_for_diff(&diff).unwrap()
-        });
-        assert_eq!(
-            diff_editor.read_with(cx, |editor, cx| editor.text(cx)),
-            "hi world\nhello world"
-        );
-        let row_infos = diff_editor.read_with(cx, |editor, cx| {
-            let multibuffer = editor.buffer().read(cx);
-            multibuffer
-                .snapshot(cx)
-                .row_infos(MultiBufferRow(0))
-                .collect::<Vec<_>>()
-        });
-        assert_matches!(
-            row_infos.as_slice(),
-            [
-                RowInfo {
-                    multibuffer_row: Some(MultiBufferRow(0)),
-                    diff_status: Some(DiffHunkStatus {
-                        kind: DiffHunkStatusKind::Deleted,
-                        ..
-                    }),
-                    ..
-                },
-                RowInfo {
-                    multibuffer_row: Some(MultiBufferRow(1)),
-                    diff_status: Some(DiffHunkStatus {
-                        kind: DiffHunkStatusKind::Added,
-                        ..
-                    }),
-                    ..
-                }
-            ]
-        );
-    }
-
-    fn init_test(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-            theme::init(theme::LoadThemes::JustBase, cx);
-            release_channel::init(semver::Version::new(0, 0, 0), cx);
-        });
-    }
-}
diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
deleted file mode 100644
index 5e9c55cc56..0000000000
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ /dev/null
@@ -1,2532 +0,0 @@
-use crate::{
-    ChatWithFollow,
-    completion_provider::{
-        PromptCompletionProvider, PromptCompletionProviderDelegate, PromptContextAction,
-        PromptContextType, SlashCommandCompletion,
-    },
-    mention_set::{
-        Mention, MentionImage, MentionSet, insert_crease_for_mention, paste_images_as_context,
-    },
-};
-use acp_thread::MentionUri;
-use agent::HistoryStore;
-use agent_client_protocol as acp;
-use anyhow::{Result, anyhow};
-use collections::HashSet;
-use editor::{
-    Addon, AnchorRangeExt, ContextMenuOptions, ContextMenuPlacement, Editor, EditorElement,
-    EditorEvent, EditorMode, EditorStyle, Inlay, MultiBuffer, MultiBufferOffset,
-    MultiBufferSnapshot, ToOffset, actions::Paste, code_context_menus::CodeContextMenu,
-    scroll::Autoscroll,
-};
-use futures::{FutureExt as _, future::join_all};
-use gpui::{
-    AppContext, ClipboardEntry, Context, Entity, EventEmitter, FocusHandle, Focusable, ImageFormat,
-    KeyContext, SharedString, Subscription, Task, TextStyle, WeakEntity,
-};
-use language::{Buffer, Language, language_settings::InlayHintKind};
-use project::{CompletionIntent, InlayHint, InlayHintLabel, InlayId, Project, Worktree};
-use prompt_store::PromptStore;
-use rope::Point;
-use settings::Settings;
-use std::{cell::RefCell, fmt::Write, rc::Rc, sync::Arc};
-use theme::ThemeSettings;
-use ui::prelude::*;
-use util::{ResultExt, debug_panic};
-use workspace::{CollaboratorId, Workspace};
-use zed_actions::agent::Chat;
-
-pub struct MessageEditor {
-    mention_set: Entity<MentionSet>,
-    editor: Entity<Editor>,
-    workspace: WeakEntity<Workspace>,
-    prompt_capabilities: Rc<RefCell<acp::PromptCapabilities>>,
-    available_commands: Rc<RefCell<Vec<acp::AvailableCommand>>>,
-    agent_name: SharedString,
-    _subscriptions: Vec<Subscription>,
-    _parse_slash_command_task: Task<()>,
-}
-
-#[derive(Clone, Copy, Debug)]
-pub enum MessageEditorEvent {
-    Send,
-    Cancel,
-    Focus,
-    LostFocus,
-}
-
-impl EventEmitter<MessageEditorEvent> for MessageEditor {}
-
-const COMMAND_HINT_INLAY_ID: InlayId = InlayId::Hint(0);
-
-impl PromptCompletionProviderDelegate for Entity<MessageEditor> {
-    fn supports_images(&self, cx: &App) -> bool {
-        self.read(cx).prompt_capabilities.borrow().image
-    }
-
-    fn supported_modes(&self, cx: &App) -> Vec<PromptContextType> {
-        let mut supported = vec![PromptContextType::File, PromptContextType::Symbol];
-        if self.read(cx).prompt_capabilities.borrow().embedded_context {
-            supported.extend(&[
-                PromptContextType::Thread,
-                PromptContextType::Fetch,
-                PromptContextType::Rules,
-            ]);
-        }
-        supported
-    }
-
-    fn available_commands(&self, cx: &App) -> Vec<crate::completion_provider::AvailableCommand> {
-        self.read(cx)
-            .available_commands
-            .borrow()
-            .iter()
-            .map(|cmd| crate::completion_provider::AvailableCommand {
-                name: cmd.name.clone().into(),
-                description: cmd.description.clone().into(),
-                requires_argument: cmd.input.is_some(),
-            })
-            .collect()
-    }
-
-    fn confirm_command(&self, cx: &mut App) {
-        self.update(cx, |this, cx| this.send(cx));
-    }
-}
-
-impl MessageEditor {
-    pub fn new(
-        workspace: WeakEntity<Workspace>,
-        project: WeakEntity<Project>,
-        history_store: Entity<HistoryStore>,
-        prompt_store: Option<Entity<PromptStore>>,
-        prompt_capabilities: Rc<RefCell<acp::PromptCapabilities>>,
-        available_commands: Rc<RefCell<Vec<acp::AvailableCommand>>>,
-        agent_name: SharedString,
-        placeholder: &str,
-        mode: EditorMode,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let language = Language::new(
-            language::LanguageConfig {
-                completion_query_characters: HashSet::from_iter(['.', '-', '_', '@']),
-                ..Default::default()
-            },
-            None,
-        );
-
-        let editor = cx.new(|cx| {
-            let buffer = cx.new(|cx| Buffer::local("", cx).with_language(Arc::new(language), cx));
-            let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-
-            let mut editor = Editor::new(mode, buffer, None, window, cx);
-            editor.set_placeholder_text(placeholder, window, cx);
-            editor.set_show_indent_guides(false, cx);
-            editor.set_show_completions_on_input(Some(true));
-            editor.set_soft_wrap();
-            editor.set_use_modal_editing(true);
-            editor.set_context_menu_options(ContextMenuOptions {
-                min_entries_visible: 12,
-                max_entries_visible: 12,
-                placement: Some(ContextMenuPlacement::Above),
-            });
-            editor.register_addon(MessageEditorAddon::new());
-            editor
-        });
-        let mention_set =
-            cx.new(|_cx| MentionSet::new(project, history_store.clone(), prompt_store.clone()));
-        let completion_provider = Rc::new(PromptCompletionProvider::new(
-            cx.entity(),
-            editor.downgrade(),
-            mention_set.clone(),
-            history_store.clone(),
-            prompt_store.clone(),
-            workspace.clone(),
-        ));
-        editor.update(cx, |editor, _cx| {
-            editor.set_completion_provider(Some(completion_provider.clone()))
-        });
-
-        cx.on_focus_in(&editor.focus_handle(cx), window, |_, _, cx| {
-            cx.emit(MessageEditorEvent::Focus)
-        })
-        .detach();
-        cx.on_focus_out(&editor.focus_handle(cx), window, |_, _, _, cx| {
-            cx.emit(MessageEditorEvent::LostFocus)
-        })
-        .detach();
-
-        let mut has_hint = false;
-        let mut subscriptions = Vec::new();
-
-        subscriptions.push(cx.subscribe_in(&editor, window, {
-            move |this, editor, event, window, cx| {
-                if let EditorEvent::Edited { .. } = event
-                    && !editor.read(cx).read_only(cx)
-                {
-                    editor.update(cx, |editor, cx| {
-                        let snapshot = editor.snapshot(window, cx);
-                        this.mention_set
-                            .update(cx, |mention_set, _cx| mention_set.remove_invalid(&snapshot));
-
-                        let new_hints = this
-                            .command_hint(snapshot.buffer())
-                            .into_iter()
-                            .collect::<Vec<_>>();
-                        let has_new_hint = !new_hints.is_empty();
-                        editor.splice_inlays(
-                            if has_hint {
-                                &[COMMAND_HINT_INLAY_ID]
-                            } else {
-                                &[]
-                            },
-                            new_hints,
-                            cx,
-                        );
-                        has_hint = has_new_hint;
-                    });
-                    cx.notify();
-                }
-            }
-        }));
-
-        Self {
-            editor,
-            mention_set,
-            workspace,
-            prompt_capabilities,
-            available_commands,
-            agent_name,
-            _subscriptions: subscriptions,
-            _parse_slash_command_task: Task::ready(()),
-        }
-    }
-
-    fn command_hint(&self, snapshot: &MultiBufferSnapshot) -> Option<Inlay> {
-        let available_commands = self.available_commands.borrow();
-        if available_commands.is_empty() {
-            return None;
-        }
-
-        let parsed_command = SlashCommandCompletion::try_parse(&snapshot.text(), 0)?;
-        if parsed_command.argument.is_some() {
-            return None;
-        }
-
-        let command_name = parsed_command.command?;
-        let available_command = available_commands
-            .iter()
-            .find(|command| command.name == command_name)?;
-
-        let acp::AvailableCommandInput::Unstructured(acp::UnstructuredCommandInput {
-            mut hint,
-            ..
-        }) = available_command.input.clone()?
-        else {
-            return None;
-        };
-
-        let mut hint_pos = MultiBufferOffset(parsed_command.source_range.end) + 1usize;
-        if hint_pos > snapshot.len() {
-            hint_pos = snapshot.len();
-            hint.insert(0, ' ');
-        }
-
-        let hint_pos = snapshot.anchor_after(hint_pos);
-
-        Some(Inlay::hint(
-            COMMAND_HINT_INLAY_ID,
-            hint_pos,
-            &InlayHint {
-                position: hint_pos.text_anchor,
-                label: InlayHintLabel::String(hint),
-                kind: Some(InlayHintKind::Parameter),
-                padding_left: false,
-                padding_right: false,
-                tooltip: None,
-                resolve_state: project::ResolveState::Resolved,
-            },
-        ))
-    }
-
-    pub fn insert_thread_summary(
-        &mut self,
-        thread: agent::DbThreadMetadata,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(workspace) = self.workspace.upgrade() else {
-            return;
-        };
-        let uri = MentionUri::Thread {
-            id: thread.id.clone(),
-            name: thread.title.to_string(),
-        };
-        let content = format!("{}\n", uri.as_link());
-
-        let content_len = content.len() - 1;
-
-        let start = self.editor.update(cx, |editor, cx| {
-            editor.set_text(content, window, cx);
-            editor
-                .buffer()
-                .read(cx)
-                .snapshot(cx)
-                .anchor_before(Point::zero())
-                .text_anchor
-        });
-
-        let supports_images = self.prompt_capabilities.borrow().image;
-
-        self.mention_set
-            .update(cx, |mention_set, cx| {
-                mention_set.confirm_mention_completion(
-                    thread.title,
-                    start,
-                    content_len,
-                    uri,
-                    supports_images,
-                    self.editor.clone(),
-                    &workspace,
-                    window,
-                    cx,
-                )
-            })
-            .detach();
-    }
-
-    #[cfg(test)]
-    pub(crate) fn editor(&self) -> &Entity<Editor> {
-        &self.editor
-    }
-
-    pub fn is_empty(&self, cx: &App) -> bool {
-        self.editor.read(cx).is_empty(cx)
-    }
-
-    pub fn is_completions_menu_visible(&self, cx: &App) -> bool {
-        self.editor
-            .read(cx)
-            .context_menu()
-            .borrow()
-            .as_ref()
-            .is_some_and(|menu| matches!(menu, CodeContextMenu::Completions(_)) && menu.visible())
-    }
-
-    #[cfg(test)]
-    pub fn mention_set(&self) -> &Entity<MentionSet> {
-        &self.mention_set
-    }
-
-    fn validate_slash_commands(
-        text: &str,
-        available_commands: &[acp::AvailableCommand],
-        agent_name: &str,
-    ) -> Result<()> {
-        if let Some(parsed_command) = SlashCommandCompletion::try_parse(text, 0) {
-            if let Some(command_name) = parsed_command.command {
-                // Check if this command is in the list of available commands from the server
-                let is_supported = available_commands
-                    .iter()
-                    .any(|cmd| cmd.name == command_name);
-
-                if !is_supported {
-                    return Err(anyhow!(
-                        "The /{} command is not supported by {}.\n\nAvailable commands: {}",
-                        command_name,
-                        agent_name,
-                        if available_commands.is_empty() {
-                            "none".to_string()
-                        } else {
-                            available_commands
-                                .iter()
-                                .map(|cmd| format!("/{}", cmd.name))
-                                .collect::<Vec<_>>()
-                                .join(", ")
-                        }
-                    ));
-                }
-            }
-        }
-        Ok(())
-    }
-
-    pub fn contents(
-        &self,
-        full_mention_content: bool,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<(Vec<acp::ContentBlock>, Vec<Entity<Buffer>>)>> {
-        // Check for unsupported slash commands before spawning async task
-        let text = self.editor.read(cx).text(cx);
-        let available_commands = self.available_commands.borrow().clone();
-        if let Err(err) =
-            Self::validate_slash_commands(&text, &available_commands, &self.agent_name)
-        {
-            return Task::ready(Err(err));
-        }
-
-        let contents = self
-            .mention_set
-            .update(cx, |store, cx| store.contents(full_mention_content, cx));
-        let editor = self.editor.clone();
-        let supports_embedded_context = self.prompt_capabilities.borrow().embedded_context;
-
-        cx.spawn(async move |_, cx| {
-            let contents = contents.await?;
-            let mut all_tracked_buffers = Vec::new();
-
-            let result = editor.update(cx, |editor, cx| {
-                let (mut ix, _) = text
-                    .char_indices()
-                    .find(|(_, c)| !c.is_whitespace())
-                    .unwrap_or((0, '\0'));
-                let mut chunks: Vec<acp::ContentBlock> = Vec::new();
-                let text = editor.text(cx);
-                editor.display_map.update(cx, |map, cx| {
-                    let snapshot = map.snapshot(cx);
-                    for (crease_id, crease) in snapshot.crease_snapshot.creases() {
-                        let Some((uri, mention)) = contents.get(&crease_id) else {
-                            continue;
-                        };
-
-                        let crease_range = crease.range().to_offset(&snapshot.buffer_snapshot());
-                        if crease_range.start.0 > ix {
-                            let chunk = text[ix..crease_range.start.0].into();
-                            chunks.push(chunk);
-                        }
-                        let chunk = match mention {
-                            Mention::Text {
-                                content,
-                                tracked_buffers,
-                            } => {
-                                all_tracked_buffers.extend(tracked_buffers.iter().cloned());
-                                if supports_embedded_context {
-                                    acp::ContentBlock::Resource(acp::EmbeddedResource::new(
-                                        acp::EmbeddedResourceResource::TextResourceContents(
-                                            acp::TextResourceContents::new(
-                                                content.clone(),
-                                                uri.to_uri().to_string(),
-                                            ),
-                                        ),
-                                    ))
-                                } else {
-                                    acp::ContentBlock::ResourceLink(acp::ResourceLink::new(
-                                        uri.name(),
-                                        uri.to_uri().to_string(),
-                                    ))
-                                }
-                            }
-                            Mention::Image(mention_image) => acp::ContentBlock::Image(
-                                acp::ImageContent::new(
-                                    mention_image.data.clone(),
-                                    mention_image.format.mime_type(),
-                                )
-                                .uri(match uri {
-                                    MentionUri::File { .. } => Some(uri.to_uri().to_string()),
-                                    MentionUri::PastedImage => None,
-                                    other => {
-                                        debug_panic!(
-                                            "unexpected mention uri for image: {:?}",
-                                            other
-                                        );
-                                        None
-                                    }
-                                }),
-                            ),
-                            Mention::Link => acp::ContentBlock::ResourceLink(
-                                acp::ResourceLink::new(uri.name(), uri.to_uri().to_string()),
-                            ),
-                        };
-                        chunks.push(chunk);
-                        ix = crease_range.end.0;
-                    }
-
-                    if ix < text.len() {
-                        let last_chunk = text[ix..].trim_end().to_owned();
-                        if !last_chunk.is_empty() {
-                            chunks.push(last_chunk.into());
-                        }
-                    }
-                });
-                Ok((chunks, all_tracked_buffers))
-            })?;
-            result
-        })
-    }
-
-    pub fn clear(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.editor.update(cx, |editor, cx| {
-            editor.clear(window, cx);
-            editor.remove_creases(
-                self.mention_set.update(cx, |mention_set, _cx| {
-                    mention_set
-                        .clear()
-                        .map(|(crease_id, _)| crease_id)
-                        .collect::<Vec<_>>()
-                }),
-                cx,
-            )
-        });
-    }
-
-    pub fn send(&mut self, cx: &mut Context<Self>) {
-        if self.is_empty(cx) {
-            return;
-        }
-        self.editor.update(cx, |editor, cx| {
-            editor.clear_inlay_hints(cx);
-        });
-        cx.emit(MessageEditorEvent::Send)
-    }
-
-    pub fn trigger_completion_menu(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let editor = self.editor.clone();
-
-        cx.spawn_in(window, async move |_, cx| {
-            editor
-                .update_in(cx, |editor, window, cx| {
-                    let menu_is_open =
-                        editor.context_menu().borrow().as_ref().is_some_and(|menu| {
-                            matches!(menu, CodeContextMenu::Completions(_)) && menu.visible()
-                        });
-
-                    let has_at_sign = {
-                        let snapshot = editor.display_snapshot(cx);
-                        let cursor = editor.selections.newest::<text::Point>(&snapshot).head();
-                        let offset = cursor.to_offset(&snapshot);
-                        if offset.0 > 0 {
-                            snapshot
-                                .buffer_snapshot()
-                                .reversed_chars_at(offset)
-                                .next()
-                                .map(|sign| sign == '@')
-                                .unwrap_or(false)
-                        } else {
-                            false
-                        }
-                    };
-
-                    if menu_is_open && has_at_sign {
-                        return;
-                    }
-
-                    editor.insert("@", window, cx);
-                    editor.show_completions(&editor::actions::ShowCompletions, window, cx);
-                })
-                .log_err();
-        })
-        .detach();
-    }
-
-    fn chat(&mut self, _: &Chat, _: &mut Window, cx: &mut Context<Self>) {
-        self.send(cx);
-    }
-
-    fn chat_with_follow(
-        &mut self,
-        _: &ChatWithFollow,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.workspace
-            .update(cx, |this, cx| {
-                this.follow(CollaboratorId::Agent, window, cx)
-            })
-            .log_err();
-
-        self.send(cx);
-    }
-
-    fn cancel(&mut self, _: &editor::actions::Cancel, _: &mut Window, cx: &mut Context<Self>) {
-        cx.emit(MessageEditorEvent::Cancel)
-    }
-
-    fn paste(&mut self, _: &Paste, window: &mut Window, cx: &mut Context<Self>) {
-        let editor_clipboard_selections = cx
-            .read_from_clipboard()
-            .and_then(|item| item.entries().first().cloned())
-            .and_then(|entry| match entry {
-                ClipboardEntry::String(text) => {
-                    text.metadata_json::<Vec<editor::ClipboardSelection>>()
-                }
-                _ => None,
-            });
-
-        let has_file_context = editor_clipboard_selections
-            .as_ref()
-            .is_some_and(|selections| {
-                selections
-                    .iter()
-                    .any(|sel| sel.file_path.is_some() && sel.line_range.is_some())
-            });
-
-        if has_file_context {
-            if let Some((workspace, selections)) =
-                self.workspace.upgrade().zip(editor_clipboard_selections)
-            {
-                let Some(first_selection) = selections.first() else {
-                    return;
-                };
-                if let Some(file_path) = &first_selection.file_path {
-                    // In case someone pastes selections from another window
-                    // with a different project, we don't want to insert the
-                    // crease (containing the absolute path) since the agent
-                    // cannot access files outside the project.
-                    let is_in_project = workspace
-                        .read(cx)
-                        .project()
-                        .read(cx)
-                        .project_path_for_absolute_path(file_path, cx)
-                        .is_some();
-                    if !is_in_project {
-                        return;
-                    }
-                }
-
-                cx.stop_propagation();
-                let insertion_target = self
-                    .editor
-                    .read(cx)
-                    .selections
-                    .newest_anchor()
-                    .start
-                    .text_anchor;
-
-                let project = workspace.read(cx).project().clone();
-                for selection in selections {
-                    if let (Some(file_path), Some(line_range)) =
-                        (selection.file_path, selection.line_range)
-                    {
-                        let crease_text =
-                            acp_thread::selection_name(Some(file_path.as_ref()), &line_range);
-
-                        let mention_uri = MentionUri::Selection {
-                            abs_path: Some(file_path.clone()),
-                            line_range: line_range.clone(),
-                        };
-
-                        let mention_text = mention_uri.as_link().to_string();
-                        let (excerpt_id, text_anchor, content_len) =
-                            self.editor.update(cx, |editor, cx| {
-                                let buffer = editor.buffer().read(cx);
-                                let snapshot = buffer.snapshot(cx);
-                                let (excerpt_id, _, buffer_snapshot) =
-                                    snapshot.as_singleton().unwrap();
-                                let text_anchor = insertion_target.bias_left(&buffer_snapshot);
-
-                                editor.insert(&mention_text, window, cx);
-                                editor.insert(" ", window, cx);
-
-                                (*excerpt_id, text_anchor, mention_text.len())
-                            });
-
-                        let Some((crease_id, tx)) = insert_crease_for_mention(
-                            excerpt_id,
-                            text_anchor,
-                            content_len,
-                            crease_text.into(),
-                            mention_uri.icon_path(cx),
-                            None,
-                            self.editor.clone(),
-                            window,
-                            cx,
-                        ) else {
-                            continue;
-                        };
-                        drop(tx);
-
-                        let mention_task = cx
-                            .spawn({
-                                let project = project.clone();
-                                async move |_, cx| {
-                                    let project_path = project
-                                        .update(cx, |project, cx| {
-                                            project.project_path_for_absolute_path(&file_path, cx)
-                                        })
-                                        .map_err(|e| e.to_string())?
-                                        .ok_or_else(|| "project path not found".to_string())?;
-
-                                    let buffer = project
-                                        .update(cx, |project, cx| {
-                                            project.open_buffer(project_path, cx)
-                                        })
-                                        .map_err(|e| e.to_string())?
-                                        .await
-                                        .map_err(|e| e.to_string())?;
-
-                                    buffer
-                                        .update(cx, |buffer, cx| {
-                                            let start = Point::new(*line_range.start(), 0)
-                                                .min(buffer.max_point());
-                                            let end = Point::new(*line_range.end() + 1, 0)
-                                                .min(buffer.max_point());
-                                            let content =
-                                                buffer.text_for_range(start..end).collect();
-                                            Mention::Text {
-                                                content,
-                                                tracked_buffers: vec![cx.entity()],
-                                            }
-                                        })
-                                        .map_err(|e| e.to_string())
-                                }
-                            })
-                            .shared();
-
-                        self.mention_set.update(cx, |mention_set, _cx| {
-                            mention_set.insert_mention(crease_id, mention_uri.clone(), mention_task)
-                        });
-                    }
-                }
-                return;
-            }
-        }
-
-        if self.prompt_capabilities.borrow().image
-            && let Some(task) =
-                paste_images_as_context(self.editor.clone(), self.mention_set.clone(), window, cx)
-        {
-            task.detach();
-        }
-    }
-
-    pub fn insert_dragged_files(
-        &mut self,
-        paths: Vec<project::ProjectPath>,
-        added_worktrees: Vec<Entity<Worktree>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(workspace) = self.workspace.upgrade() else {
-            return;
-        };
-        let project = workspace.read(cx).project().clone();
-        let path_style = project.read(cx).path_style(cx);
-        let buffer = self.editor.read(cx).buffer().clone();
-        let Some(buffer) = buffer.read(cx).as_singleton() else {
-            return;
-        };
-        let mut tasks = Vec::new();
-        for path in paths {
-            let Some(entry) = project.read(cx).entry_for_path(&path, cx) else {
-                continue;
-            };
-            let Some(worktree) = project.read(cx).worktree_for_id(path.worktree_id, cx) else {
-                continue;
-            };
-            let abs_path = worktree.read(cx).absolutize(&path.path);
-            let (file_name, _) = crate::completion_provider::extract_file_name_and_directory(
-                &path.path,
-                worktree.read(cx).root_name(),
-                path_style,
-            );
-
-            let uri = if entry.is_dir() {
-                MentionUri::Directory { abs_path }
-            } else {
-                MentionUri::File { abs_path }
-            };
-
-            let new_text = format!("{} ", uri.as_link());
-            let content_len = new_text.len() - 1;
-
-            let anchor = buffer.update(cx, |buffer, _cx| buffer.anchor_before(buffer.len()));
-
-            self.editor.update(cx, |message_editor, cx| {
-                message_editor.edit(
-                    [(
-                        multi_buffer::Anchor::max()..multi_buffer::Anchor::max(),
-                        new_text,
-                    )],
-                    cx,
-                );
-            });
-            let supports_images = self.prompt_capabilities.borrow().image;
-            tasks.push(self.mention_set.update(cx, |mention_set, cx| {
-                mention_set.confirm_mention_completion(
-                    file_name,
-                    anchor,
-                    content_len,
-                    uri,
-                    supports_images,
-                    self.editor.clone(),
-                    &workspace,
-                    window,
-                    cx,
-                )
-            }));
-        }
-        cx.spawn(async move |_, _| {
-            join_all(tasks).await;
-            drop(added_worktrees);
-        })
-        .detach();
-    }
-
-    pub fn insert_selections(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let editor = self.editor.read(cx);
-        let editor_buffer = editor.buffer().read(cx);
-        let Some(buffer) = editor_buffer.as_singleton() else {
-            return;
-        };
-        let cursor_anchor = editor.selections.newest_anchor().head();
-        let cursor_offset = cursor_anchor.to_offset(&editor_buffer.snapshot(cx));
-        let anchor = buffer.update(cx, |buffer, _cx| {
-            buffer.anchor_before(cursor_offset.0.min(buffer.len()))
-        });
-        let Some(workspace) = self.workspace.upgrade() else {
-            return;
-        };
-        let Some(completion) =
-            PromptCompletionProvider::<Entity<MessageEditor>>::completion_for_action(
-                PromptContextAction::AddSelections,
-                anchor..anchor,
-                self.editor.downgrade(),
-                self.mention_set.downgrade(),
-                &workspace,
-                cx,
-            )
-        else {
-            return;
-        };
-
-        self.editor.update(cx, |message_editor, cx| {
-            message_editor.edit([(cursor_anchor..cursor_anchor, completion.new_text)], cx);
-            message_editor.request_autoscroll(Autoscroll::fit(), cx);
-        });
-        if let Some(confirm) = completion.confirm {
-            confirm(CompletionIntent::Complete, window, cx);
-        }
-    }
-
-    pub fn set_read_only(&mut self, read_only: bool, cx: &mut Context<Self>) {
-        self.editor.update(cx, |message_editor, cx| {
-            message_editor.set_read_only(read_only);
-            cx.notify()
-        })
-    }
-
-    pub fn set_mode(&mut self, mode: EditorMode, cx: &mut Context<Self>) {
-        self.editor.update(cx, |editor, cx| {
-            editor.set_mode(mode);
-            cx.notify()
-        });
-    }
-
-    pub fn set_message(
-        &mut self,
-        message: Vec<acp::ContentBlock>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(workspace) = self.workspace.upgrade() else {
-            return;
-        };
-
-        self.clear(window, cx);
-
-        let path_style = workspace.read(cx).project().read(cx).path_style(cx);
-        let mut text = String::new();
-        let mut mentions = Vec::new();
-
-        for chunk in message {
-            match chunk {
-                acp::ContentBlock::Text(text_content) => {
-                    text.push_str(&text_content.text);
-                }
-                acp::ContentBlock::Resource(acp::EmbeddedResource {
-                    resource: acp::EmbeddedResourceResource::TextResourceContents(resource),
-                    ..
-                }) => {
-                    let Some(mention_uri) = MentionUri::parse(&resource.uri, path_style).log_err()
-                    else {
-                        continue;
-                    };
-                    let start = text.len();
-                    write!(&mut text, "{}", mention_uri.as_link()).ok();
-                    let end = text.len();
-                    mentions.push((
-                        start..end,
-                        mention_uri,
-                        Mention::Text {
-                            content: resource.text,
-                            tracked_buffers: Vec::new(),
-                        },
-                    ));
-                }
-                acp::ContentBlock::ResourceLink(resource) => {
-                    if let Some(mention_uri) =
-                        MentionUri::parse(&resource.uri, path_style).log_err()
-                    {
-                        let start = text.len();
-                        write!(&mut text, "{}", mention_uri.as_link()).ok();
-                        let end = text.len();
-                        mentions.push((start..end, mention_uri, Mention::Link));
-                    }
-                }
-                acp::ContentBlock::Image(acp::ImageContent {
-                    uri,
-                    data,
-                    mime_type,
-                    ..
-                }) => {
-                    let mention_uri = if let Some(uri) = uri {
-                        MentionUri::parse(&uri, path_style)
-                    } else {
-                        Ok(MentionUri::PastedImage)
-                    };
-                    let Some(mention_uri) = mention_uri.log_err() else {
-                        continue;
-                    };
-                    let Some(format) = ImageFormat::from_mime_type(&mime_type) else {
-                        log::error!("failed to parse MIME type for image: {mime_type:?}");
-                        continue;
-                    };
-                    let start = text.len();
-                    write!(&mut text, "{}", mention_uri.as_link()).ok();
-                    let end = text.len();
-                    mentions.push((
-                        start..end,
-                        mention_uri,
-                        Mention::Image(MentionImage {
-                            data: data.into(),
-                            format,
-                        }),
-                    ));
-                }
-                _ => {}
-            }
-        }
-
-        let snapshot = self.editor.update(cx, |editor, cx| {
-            editor.set_text(text, window, cx);
-            editor.buffer().read(cx).snapshot(cx)
-        });
-
-        for (range, mention_uri, mention) in mentions {
-            let anchor = snapshot.anchor_before(MultiBufferOffset(range.start));
-            let Some((crease_id, tx)) = insert_crease_for_mention(
-                anchor.excerpt_id,
-                anchor.text_anchor,
-                range.end - range.start,
-                mention_uri.name().into(),
-                mention_uri.icon_path(cx),
-                None,
-                self.editor.clone(),
-                window,
-                cx,
-            ) else {
-                continue;
-            };
-            drop(tx);
-
-            self.mention_set.update(cx, |mention_set, _cx| {
-                mention_set.insert_mention(
-                    crease_id,
-                    mention_uri.clone(),
-                    Task::ready(Ok(mention)).shared(),
-                )
-            });
-        }
-        cx.notify();
-    }
-
-    pub fn text(&self, cx: &App) -> String {
-        self.editor.read(cx).text(cx)
-    }
-
-    pub fn set_placeholder_text(
-        &mut self,
-        placeholder: &str,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.editor.update(cx, |editor, cx| {
-            editor.set_placeholder_text(placeholder, window, cx);
-        });
-    }
-
-    #[cfg(test)]
-    pub fn set_text(&mut self, text: &str, window: &mut Window, cx: &mut Context<Self>) {
-        self.editor.update(cx, |editor, cx| {
-            editor.set_text(text, window, cx);
-        });
-    }
-}
-
-impl Focusable for MessageEditor {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        self.editor.focus_handle(cx)
-    }
-}
-
-impl Render for MessageEditor {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        div()
-            .key_context("MessageEditor")
-            .on_action(cx.listener(Self::chat))
-            .on_action(cx.listener(Self::chat_with_follow))
-            .on_action(cx.listener(Self::cancel))
-            .capture_action(cx.listener(Self::paste))
-            .flex_1()
-            .child({
-                let settings = ThemeSettings::get_global(cx);
-
-                let text_style = TextStyle {
-                    color: cx.theme().colors().text,
-                    font_family: settings.buffer_font.family.clone(),
-                    font_fallbacks: settings.buffer_font.fallbacks.clone(),
-                    font_features: settings.buffer_font.features.clone(),
-                    font_size: settings.agent_buffer_font_size(cx).into(),
-                    line_height: relative(settings.buffer_line_height.value()),
-                    ..Default::default()
-                };
-
-                EditorElement::new(
-                    &self.editor,
-                    EditorStyle {
-                        background: cx.theme().colors().editor_background,
-                        local_player: cx.theme().players().local(),
-                        text: text_style,
-                        syntax: cx.theme().syntax().clone(),
-                        inlay_hints_style: editor::make_inlay_hints_style(cx),
-                        ..Default::default()
-                    },
-                )
-            })
-    }
-}
-
-pub struct MessageEditorAddon {}
-
-impl MessageEditorAddon {
-    pub fn new() -> Self {
-        Self {}
-    }
-}
-
-impl Addon for MessageEditorAddon {
-    fn to_any(&self) -> &dyn std::any::Any {
-        self
-    }
-
-    fn to_any_mut(&mut self) -> Option<&mut dyn std::any::Any> {
-        Some(self)
-    }
-
-    fn extend_key_context(&self, key_context: &mut KeyContext, cx: &App) {
-        let settings = agent_settings::AgentSettings::get_global(cx);
-        if settings.use_modifier_to_send {
-            key_context.add("use_modifier_to_send");
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::{cell::RefCell, ops::Range, path::Path, rc::Rc, sync::Arc};
-
-    use acp_thread::MentionUri;
-    use agent::{HistoryStore, outline};
-    use agent_client_protocol as acp;
-    use assistant_text_thread::TextThreadStore;
-    use editor::{AnchorRangeExt as _, Editor, EditorMode, MultiBufferOffset};
-    use fs::FakeFs;
-    use futures::StreamExt as _;
-    use gpui::{
-        AppContext, Entity, EventEmitter, FocusHandle, Focusable, TestAppContext, VisualTestContext,
-    };
-    use language_model::LanguageModelRegistry;
-    use lsp::{CompletionContext, CompletionTriggerKind};
-    use project::{CompletionIntent, Project, ProjectPath};
-    use serde_json::json;
-    use text::Point;
-    use ui::{App, Context, IntoElement, Render, SharedString, Window};
-    use util::{path, paths::PathStyle, rel_path::rel_path};
-    use workspace::{AppState, Item, Workspace};
-
-    use crate::acp::{
-        message_editor::{Mention, MessageEditor},
-        thread_view::tests::init_test,
-    };
-
-    #[gpui::test]
-    async fn test_at_mention_removal(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree("/project", json!({"file": ""})).await;
-        let project = Project::test(fs, [Path::new(path!("/project"))], cx).await;
-
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-        let text_thread_store = cx.new(|cx| TextThreadStore::fake(project.clone(), cx));
-        let history_store = cx.new(|cx| HistoryStore::new(text_thread_store, cx));
-
-        let message_editor = cx.update(|window, cx| {
-            cx.new(|cx| {
-                MessageEditor::new(
-                    workspace.downgrade(),
-                    project.downgrade(),
-                    history_store.clone(),
-                    None,
-                    Default::default(),
-                    Default::default(),
-                    "Test Agent".into(),
-                    "Test",
-                    EditorMode::AutoHeight {
-                        min_lines: 1,
-                        max_lines: None,
-                    },
-                    window,
-                    cx,
-                )
-            })
-        });
-        let editor = message_editor.update(cx, |message_editor, _| message_editor.editor.clone());
-
-        cx.run_until_parked();
-
-        let excerpt_id = editor.update(cx, |editor, cx| {
-            editor
-                .buffer()
-                .read(cx)
-                .excerpt_ids()
-                .into_iter()
-                .next()
-                .unwrap()
-        });
-        let completions = editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Hello @file ", window, cx);
-            let buffer = editor.buffer().read(cx).as_singleton().unwrap();
-            let completion_provider = editor.completion_provider().unwrap();
-            completion_provider.completions(
-                excerpt_id,
-                &buffer,
-                text::Anchor::MAX,
-                CompletionContext {
-                    trigger_kind: CompletionTriggerKind::TRIGGER_CHARACTER,
-                    trigger_character: Some("@".into()),
-                },
-                window,
-                cx,
-            )
-        });
-        let [_, completion]: [_; 2] = completions
-            .await
-            .unwrap()
-            .into_iter()
-            .flat_map(|response| response.completions)
-            .collect::<Vec<_>>()
-            .try_into()
-            .unwrap();
-
-        editor.update_in(cx, |editor, window, cx| {
-            let snapshot = editor.buffer().read(cx).snapshot(cx);
-            let range = snapshot
-                .anchor_range_in_excerpt(excerpt_id, completion.replace_range)
-                .unwrap();
-            editor.edit([(range, completion.new_text)], cx);
-            (completion.confirm.unwrap())(CompletionIntent::Complete, window, cx);
-        });
-
-        cx.run_until_parked();
-
-        // Backspace over the inserted crease (and the following space).
-        editor.update_in(cx, |editor, window, cx| {
-            editor.backspace(&Default::default(), window, cx);
-            editor.backspace(&Default::default(), window, cx);
-        });
-
-        let (content, _) = message_editor
-            .update(cx, |message_editor, cx| message_editor.contents(false, cx))
-            .await
-            .unwrap();
-
-        // We don't send a resource link for the deleted crease.
-        pretty_assertions::assert_matches!(content.as_slice(), [acp::ContentBlock::Text { .. }]);
-    }
-
-    #[gpui::test]
-    async fn test_slash_command_validation(cx: &mut gpui::TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            "/test",
-            json!({
-                ".zed": {
-                    "tasks.json": r#"[{"label": "test", "command": "echo"}]"#
-                },
-                "src": {
-                    "main.rs": "fn main() {}",
-                },
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs.clone(), ["/test".as_ref()], cx).await;
-        let text_thread_store = cx.new(|cx| TextThreadStore::fake(project.clone(), cx));
-        let history_store = cx.new(|cx| HistoryStore::new(text_thread_store, cx));
-        let prompt_capabilities = Rc::new(RefCell::new(acp::PromptCapabilities::default()));
-        // Start with no available commands - simulating Claude which doesn't support slash commands
-        let available_commands = Rc::new(RefCell::new(vec![]));
-
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let workspace_handle = workspace.downgrade();
-        let message_editor = workspace.update_in(cx, |_, window, cx| {
-            cx.new(|cx| {
-                MessageEditor::new(
-                    workspace_handle.clone(),
-                    project.downgrade(),
-                    history_store.clone(),
-                    None,
-                    prompt_capabilities.clone(),
-                    available_commands.clone(),
-                    "Claude Code".into(),
-                    "Test",
-                    EditorMode::AutoHeight {
-                        min_lines: 1,
-                        max_lines: None,
-                    },
-                    window,
-                    cx,
-                )
-            })
-        });
-        let editor = message_editor.update(cx, |message_editor, _| message_editor.editor.clone());
-
-        // Test that slash commands fail when no available_commands are set (empty list means no commands supported)
-        editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("/file test.txt", window, cx);
-        });
-
-        let contents_result = message_editor
-            .update(cx, |message_editor, cx| message_editor.contents(false, cx))
-            .await;
-
-        // Should fail because available_commands is empty (no commands supported)
-        assert!(contents_result.is_err());
-        let error_message = contents_result.unwrap_err().to_string();
-        assert!(error_message.contains("not supported by Claude Code"));
-        assert!(error_message.contains("Available commands: none"));
-
-        // Now simulate Claude providing its list of available commands (which doesn't include file)
-        available_commands.replace(vec![acp::AvailableCommand::new("help", "Get help")]);
-
-        // Test that unsupported slash commands trigger an error when we have a list of available commands
-        editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("/file test.txt", window, cx);
-        });
-
-        let contents_result = message_editor
-            .update(cx, |message_editor, cx| message_editor.contents(false, cx))
-            .await;
-
-        assert!(contents_result.is_err());
-        let error_message = contents_result.unwrap_err().to_string();
-        assert!(error_message.contains("not supported by Claude Code"));
-        assert!(error_message.contains("/file"));
-        assert!(error_message.contains("Available commands: /help"));
-
-        // Test that supported commands work fine
-        editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("/help", window, cx);
-        });
-
-        let contents_result = message_editor
-            .update(cx, |message_editor, cx| message_editor.contents(false, cx))
-            .await;
-
-        // Should succeed because /help is in available_commands
-        assert!(contents_result.is_ok());
-
-        // Test that regular text works fine
-        editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Hello Claude!", window, cx);
-        });
-
-        let (content, _) = message_editor
-            .update(cx, |message_editor, cx| message_editor.contents(false, cx))
-            .await
-            .unwrap();
-
-        assert_eq!(content.len(), 1);
-        if let acp::ContentBlock::Text(text) = &content[0] {
-            assert_eq!(text.text, "Hello Claude!");
-        } else {
-            panic!("Expected ContentBlock::Text");
-        }
-
-        // Test that @ mentions still work
-        editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Check this @", window, cx);
-        });
-
-        // The @ mention functionality should not be affected
-        let (content, _) = message_editor
-            .update(cx, |message_editor, cx| message_editor.contents(false, cx))
-            .await
-            .unwrap();
-
-        assert_eq!(content.len(), 1);
-        if let acp::ContentBlock::Text(text) = &content[0] {
-            assert_eq!(text.text, "Check this @");
-        } else {
-            panic!("Expected ContentBlock::Text");
-        }
-    }
-
-    struct MessageEditorItem(Entity<MessageEditor>);
-
-    impl Item for MessageEditorItem {
-        type Event = ();
-
-        fn include_in_nav_history() -> bool {
-            false
-        }
-
-        fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString {
-            "Test".into()
-        }
-    }
-
-    impl EventEmitter<()> for MessageEditorItem {}
-
-    impl Focusable for MessageEditorItem {
-        fn focus_handle(&self, cx: &App) -> FocusHandle {
-            self.0.read(cx).focus_handle(cx)
-        }
-    }
-
-    impl Render for MessageEditorItem {
-        fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
-            self.0.clone().into_any_element()
-        }
-    }
-
-    #[gpui::test]
-    async fn test_completion_provider_commands(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let app_state = cx.update(AppState::test);
-
-        cx.update(|cx| {
-            editor::init(cx);
-            workspace::init(app_state.clone(), cx);
-        });
-
-        let project = Project::test(app_state.fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let window = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let workspace = window.root(cx).unwrap();
-
-        let mut cx = VisualTestContext::from_window(*window, cx);
-
-        let text_thread_store = cx.new(|cx| TextThreadStore::fake(project.clone(), cx));
-        let history_store = cx.new(|cx| HistoryStore::new(text_thread_store, cx));
-        let prompt_capabilities = Rc::new(RefCell::new(acp::PromptCapabilities::default()));
-        let available_commands = Rc::new(RefCell::new(vec![
-            acp::AvailableCommand::new("quick-math", "2 + 2 = 4 - 1 = 3"),
-            acp::AvailableCommand::new("say-hello", "Say hello to whoever you want").input(
-                acp::AvailableCommandInput::Unstructured(acp::UnstructuredCommandInput::new(
-                    "<name>",
-                )),
-            ),
-        ]));
-
-        let editor = workspace.update_in(&mut cx, |workspace, window, cx| {
-            let workspace_handle = cx.weak_entity();
-            let message_editor = cx.new(|cx| {
-                MessageEditor::new(
-                    workspace_handle,
-                    project.downgrade(),
-                    history_store.clone(),
-                    None,
-                    prompt_capabilities.clone(),
-                    available_commands.clone(),
-                    "Test Agent".into(),
-                    "Test",
-                    EditorMode::AutoHeight {
-                        max_lines: None,
-                        min_lines: 1,
-                    },
-                    window,
-                    cx,
-                )
-            });
-            workspace.active_pane().update(cx, |pane, cx| {
-                pane.add_item(
-                    Box::new(cx.new(|_| MessageEditorItem(message_editor.clone()))),
-                    true,
-                    true,
-                    None,
-                    window,
-                    cx,
-                );
-            });
-            message_editor.read(cx).focus_handle(cx).focus(window);
-            message_editor.read(cx).editor().clone()
-        });
-
-        cx.simulate_input("/");
-
-        editor.update_in(&mut cx, |editor, window, cx| {
-            assert_eq!(editor.text(cx), "/");
-            assert!(editor.has_visible_completions_menu());
-
-            assert_eq!(
-                current_completion_labels_with_documentation(editor),
-                &[
-                    ("quick-math".into(), "2 + 2 = 4 - 1 = 3".into()),
-                    ("say-hello".into(), "Say hello to whoever you want".into())
-                ]
-            );
-            editor.set_text("", window, cx);
-        });
-
-        cx.simulate_input("/qui");
-
-        editor.update_in(&mut cx, |editor, window, cx| {
-            assert_eq!(editor.text(cx), "/qui");
-            assert!(editor.has_visible_completions_menu());
-
-            assert_eq!(
-                current_completion_labels_with_documentation(editor),
-                &[("quick-math".into(), "2 + 2 = 4 - 1 = 3".into())]
-            );
-            editor.set_text("", window, cx);
-        });
-
-        editor.update_in(&mut cx, |editor, window, cx| {
-            assert!(editor.has_visible_completions_menu());
-            editor.confirm_completion(&editor::actions::ConfirmCompletion::default(), window, cx);
-        });
-
-        cx.run_until_parked();
-
-        editor.update_in(&mut cx, |editor, window, cx| {
-            assert_eq!(editor.display_text(cx), "/quick-math ");
-            assert!(!editor.has_visible_completions_menu());
-            editor.set_text("", window, cx);
-        });
-
-        cx.simulate_input("/say");
-
-        editor.update_in(&mut cx, |editor, _window, cx| {
-            assert_eq!(editor.display_text(cx), "/say");
-            assert!(editor.has_visible_completions_menu());
-
-            assert_eq!(
-                current_completion_labels_with_documentation(editor),
-                &[("say-hello".into(), "Say hello to whoever you want".into())]
-            );
-        });
-
-        editor.update_in(&mut cx, |editor, window, cx| {
-            assert!(editor.has_visible_completions_menu());
-            editor.confirm_completion(&editor::actions::ConfirmCompletion::default(), window, cx);
-        });
-
-        cx.run_until_parked();
-
-        editor.update_in(&mut cx, |editor, _window, cx| {
-            assert_eq!(editor.text(cx), "/say-hello ");
-            assert_eq!(editor.display_text(cx), "/say-hello <name>");
-            assert!(!editor.has_visible_completions_menu());
-        });
-
-        cx.simulate_input("GPT5");
-
-        cx.run_until_parked();
-
-        editor.update_in(&mut cx, |editor, window, cx| {
-            assert_eq!(editor.text(cx), "/say-hello GPT5");
-            assert_eq!(editor.display_text(cx), "/say-hello GPT5");
-            assert!(!editor.has_visible_completions_menu());
-
-            // Delete argument
-            for _ in 0..5 {
-                editor.backspace(&editor::actions::Backspace, window, cx);
-            }
-        });
-
-        cx.run_until_parked();
-
-        editor.update_in(&mut cx, |editor, window, cx| {
-            assert_eq!(editor.text(cx), "/say-hello");
-            // Hint is visible because argument was deleted
-            assert_eq!(editor.display_text(cx), "/say-hello <name>");
-
-            // Delete last command letter
-            editor.backspace(&editor::actions::Backspace, window, cx);
-        });
-
-        cx.run_until_parked();
-
-        editor.update_in(&mut cx, |editor, _window, cx| {
-            // Hint goes away once command no longer matches an available one
-            assert_eq!(editor.text(cx), "/say-hell");
-            assert_eq!(editor.display_text(cx), "/say-hell");
-            assert!(!editor.has_visible_completions_menu());
-        });
-    }
-
-    #[gpui::test]
-    async fn test_context_completion_provider_mentions(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let app_state = cx.update(AppState::test);
-
-        cx.update(|cx| {
-            editor::init(cx);
-            workspace::init(app_state.clone(), cx);
-        });
-
-        app_state
-            .fs
-            .as_fake()
-            .insert_tree(
-                path!("/dir"),
-                json!({
-                    "editor": "",
-                    "a": {
-                        "one.txt": "1",
-                        "two.txt": "2",
-                        "three.txt": "3",
-                        "four.txt": "4"
-                    },
-                    "b": {
-                        "five.txt": "5",
-                        "six.txt": "6",
-                        "seven.txt": "7",
-                        "eight.txt": "8",
-                    },
-                    "x.png": "",
-                }),
-            )
-            .await;
-
-        let project = Project::test(app_state.fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let window = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let workspace = window.root(cx).unwrap();
-
-        let worktree = project.update(cx, |project, cx| {
-            let mut worktrees = project.worktrees(cx).collect::<Vec<_>>();
-            assert_eq!(worktrees.len(), 1);
-            worktrees.pop().unwrap()
-        });
-        let worktree_id = worktree.read_with(cx, |worktree, _| worktree.id());
-
-        let mut cx = VisualTestContext::from_window(*window, cx);
-
-        let paths = vec![
-            rel_path("a/one.txt"),
-            rel_path("a/two.txt"),
-            rel_path("a/three.txt"),
-            rel_path("a/four.txt"),
-            rel_path("b/five.txt"),
-            rel_path("b/six.txt"),
-            rel_path("b/seven.txt"),
-            rel_path("b/eight.txt"),
-        ];
-
-        let slash = PathStyle::local().primary_separator();
-
-        let mut opened_editors = Vec::new();
-        for path in paths {
-            let buffer = workspace
-                .update_in(&mut cx, |workspace, window, cx| {
-                    workspace.open_path(
-                        ProjectPath {
-                            worktree_id,
-                            path: path.into(),
-                        },
-                        None,
-                        false,
-                        window,
-                        cx,
-                    )
-                })
-                .await
-                .unwrap();
-            opened_editors.push(buffer);
-        }
-
-        let text_thread_store = cx.new(|cx| TextThreadStore::fake(project.clone(), cx));
-        let history_store = cx.new(|cx| HistoryStore::new(text_thread_store, cx));
-        let prompt_capabilities = Rc::new(RefCell::new(acp::PromptCapabilities::default()));
-
-        let (message_editor, editor) = workspace.update_in(&mut cx, |workspace, window, cx| {
-            let workspace_handle = cx.weak_entity();
-            let message_editor = cx.new(|cx| {
-                MessageEditor::new(
-                    workspace_handle,
-                    project.downgrade(),
-                    history_store.clone(),
-                    None,
-                    prompt_capabilities.clone(),
-                    Default::default(),
-                    "Test Agent".into(),
-                    "Test",
-                    EditorMode::AutoHeight {
-                        max_lines: None,
-                        min_lines: 1,
-                    },
-                    window,
-                    cx,
-                )
-            });
-            workspace.active_pane().update(cx, |pane, cx| {
-                pane.add_item(
-                    Box::new(cx.new(|_| MessageEditorItem(message_editor.clone()))),
-                    true,
-                    true,
-                    None,
-                    window,
-                    cx,
-                );
-            });
-            message_editor.read(cx).focus_handle(cx).focus(window);
-            let editor = message_editor.read(cx).editor().clone();
-            (message_editor, editor)
-        });
-
-        cx.simulate_input("Lorem @");
-
-        editor.update_in(&mut cx, |editor, window, cx| {
-            assert_eq!(editor.text(cx), "Lorem @");
-            assert!(editor.has_visible_completions_menu());
-
-            assert_eq!(
-                current_completion_labels(editor),
-                &[
-                    format!("eight.txt b{slash}"),
-                    format!("seven.txt b{slash}"),
-                    format!("six.txt b{slash}"),
-                    format!("five.txt b{slash}"),
-                    "Files & Directories".into(),
-                    "Symbols".into()
-                ]
-            );
-            editor.set_text("", window, cx);
-        });
-
-        prompt_capabilities.replace(
-            acp::PromptCapabilities::new()
-                .image(true)
-                .audio(true)
-                .embedded_context(true),
-        );
-
-        cx.simulate_input("Lorem ");
-
-        editor.update(&mut cx, |editor, cx| {
-            assert_eq!(editor.text(cx), "Lorem ");
-            assert!(!editor.has_visible_completions_menu());
-        });
-
-        cx.simulate_input("@");
-
-        editor.update(&mut cx, |editor, cx| {
-            assert_eq!(editor.text(cx), "Lorem @");
-            assert!(editor.has_visible_completions_menu());
-            assert_eq!(
-                current_completion_labels(editor),
-                &[
-                    format!("eight.txt b{slash}"),
-                    format!("seven.txt b{slash}"),
-                    format!("six.txt b{slash}"),
-                    format!("five.txt b{slash}"),
-                    "Files & Directories".into(),
-                    "Symbols".into(),
-                    "Threads".into(),
-                    "Fetch".into()
-                ]
-            );
-        });
-
-        // Select and confirm "File"
-        editor.update_in(&mut cx, |editor, window, cx| {
-            assert!(editor.has_visible_completions_menu());
-            editor.context_menu_next(&editor::actions::ContextMenuNext, window, cx);
-            editor.context_menu_next(&editor::actions::ContextMenuNext, window, cx);
-            editor.context_menu_next(&editor::actions::ContextMenuNext, window, cx);
-            editor.context_menu_next(&editor::actions::ContextMenuNext, window, cx);
-            editor.confirm_completion(&editor::actions::ConfirmCompletion::default(), window, cx);
-        });
-
-        cx.run_until_parked();
-
-        editor.update(&mut cx, |editor, cx| {
-            assert_eq!(editor.text(cx), "Lorem @file ");
-            assert!(editor.has_visible_completions_menu());
-        });
-
-        cx.simulate_input("one");
-
-        editor.update(&mut cx, |editor, cx| {
-            assert_eq!(editor.text(cx), "Lorem @file one");
-            assert!(editor.has_visible_completions_menu());
-            assert_eq!(
-                current_completion_labels(editor),
-                vec![format!("one.txt a{slash}")]
-            );
-        });
-
-        editor.update_in(&mut cx, |editor, window, cx| {
-            assert!(editor.has_visible_completions_menu());
-            editor.confirm_completion(&editor::actions::ConfirmCompletion::default(), window, cx);
-        });
-
-        let url_one = MentionUri::File {
-            abs_path: path!("/dir/a/one.txt").into(),
-        }
-        .to_uri()
-        .to_string();
-        editor.update(&mut cx, |editor, cx| {
-            let text = editor.text(cx);
-            assert_eq!(text, format!("Lorem [@one.txt]({url_one}) "));
-            assert!(!editor.has_visible_completions_menu());
-            assert_eq!(fold_ranges(editor, cx).len(), 1);
-        });
-
-        let contents = message_editor
-            .update(&mut cx, |message_editor, cx| {
-                message_editor
-                    .mention_set()
-                    .update(cx, |mention_set, cx| mention_set.contents(false, cx))
-            })
-            .await
-            .unwrap()
-            .into_values()
-            .collect::<Vec<_>>();
-
-        {
-            let [(uri, Mention::Text { content, .. })] = contents.as_slice() else {
-                panic!("Unexpected mentions");
-            };
-            pretty_assertions::assert_eq!(content, "1");
-            pretty_assertions::assert_eq!(
-                uri,
-                &MentionUri::parse(&url_one, PathStyle::local()).unwrap()
-            );
-        }
-
-        cx.simulate_input(" ");
-
-        editor.update(&mut cx, |editor, cx| {
-            let text = editor.text(cx);
-            assert_eq!(text, format!("Lorem [@one.txt]({url_one})  "));
-            assert!(!editor.has_visible_completions_menu());
-            assert_eq!(fold_ranges(editor, cx).len(), 1);
-        });
-
-        cx.simulate_input("Ipsum ");
-
-        editor.update(&mut cx, |editor, cx| {
-            let text = editor.text(cx);
-            assert_eq!(text, format!("Lorem [@one.txt]({url_one})  Ipsum "),);
-            assert!(!editor.has_visible_completions_menu());
-            assert_eq!(fold_ranges(editor, cx).len(), 1);
-        });
-
-        cx.simulate_input("@file ");
-
-        editor.update(&mut cx, |editor, cx| {
-            let text = editor.text(cx);
-            assert_eq!(text, format!("Lorem [@one.txt]({url_one})  Ipsum @file "),);
-            assert!(editor.has_visible_completions_menu());
-            assert_eq!(fold_ranges(editor, cx).len(), 1);
-        });
-
-        editor.update_in(&mut cx, |editor, window, cx| {
-            editor.confirm_completion(&editor::actions::ConfirmCompletion::default(), window, cx);
-        });
-
-        cx.run_until_parked();
-
-        let contents = message_editor
-            .update(&mut cx, |message_editor, cx| {
-                message_editor
-                    .mention_set()
-                    .update(cx, |mention_set, cx| mention_set.contents(false, cx))
-            })
-            .await
-            .unwrap()
-            .into_values()
-            .collect::<Vec<_>>();
-
-        let url_eight = MentionUri::File {
-            abs_path: path!("/dir/b/eight.txt").into(),
-        }
-        .to_uri()
-        .to_string();
-
-        {
-            let [_, (uri, Mention::Text { content, .. })] = contents.as_slice() else {
-                panic!("Unexpected mentions");
-            };
-            pretty_assertions::assert_eq!(content, "8");
-            pretty_assertions::assert_eq!(
-                uri,
-                &MentionUri::parse(&url_eight, PathStyle::local()).unwrap()
-            );
-        }
-
-        editor.update(&mut cx, |editor, cx| {
-            assert_eq!(
-                editor.text(cx),
-                format!("Lorem [@one.txt]({url_one})  Ipsum [@eight.txt]({url_eight}) ")
-            );
-            assert!(!editor.has_visible_completions_menu());
-            assert_eq!(fold_ranges(editor, cx).len(), 2);
-        });
-
-        let plain_text_language = Arc::new(language::Language::new(
-            language::LanguageConfig {
-                name: "Plain Text".into(),
-                matcher: language::LanguageMatcher {
-                    path_suffixes: vec!["txt".to_string()],
-                    ..Default::default()
-                },
-                ..Default::default()
-            },
-            None,
-        ));
-
-        // Register the language and fake LSP
-        let language_registry = project.read_with(&cx, |project, _| project.languages().clone());
-        language_registry.add(plain_text_language);
-
-        let mut fake_language_servers = language_registry.register_fake_lsp(
-            "Plain Text",
-            language::FakeLspAdapter {
-                capabilities: lsp::ServerCapabilities {
-                    workspace_symbol_provider: Some(lsp::OneOf::Left(true)),
-                    ..Default::default()
-                },
-                ..Default::default()
-            },
-        );
-
-        // Open the buffer to trigger LSP initialization
-        let buffer = project
-            .update(&mut cx, |project, cx| {
-                project.open_local_buffer(path!("/dir/a/one.txt"), cx)
-            })
-            .await
-            .unwrap();
-
-        // Register the buffer with language servers
-        let _handle = project.update(&mut cx, |project, cx| {
-            project.register_buffer_with_language_servers(&buffer, cx)
-        });
-
-        cx.run_until_parked();
-
-        let fake_language_server = fake_language_servers.next().await.unwrap();
-        fake_language_server.set_request_handler::<lsp::WorkspaceSymbolRequest, _, _>(
-            move |_, _| async move {
-                Ok(Some(lsp::WorkspaceSymbolResponse::Flat(vec![
-                    #[allow(deprecated)]
-                    lsp::SymbolInformation {
-                        name: "MySymbol".into(),
-                        location: lsp::Location {
-                            uri: lsp::Uri::from_file_path(path!("/dir/a/one.txt")).unwrap(),
-                            range: lsp::Range::new(
-                                lsp::Position::new(0, 0),
-                                lsp::Position::new(0, 1),
-                            ),
-                        },
-                        kind: lsp::SymbolKind::CONSTANT,
-                        tags: None,
-                        container_name: None,
-                        deprecated: None,
-                    },
-                ])))
-            },
-        );
-
-        cx.simulate_input("@symbol ");
-
-        editor.update(&mut cx, |editor, cx| {
-            assert_eq!(
-                editor.text(cx),
-                format!("Lorem [@one.txt]({url_one})  Ipsum [@eight.txt]({url_eight}) @symbol ")
-            );
-            assert!(editor.has_visible_completions_menu());
-            assert_eq!(current_completion_labels(editor), &["MySymbol one.txt L1"]);
-        });
-
-        editor.update_in(&mut cx, |editor, window, cx| {
-            editor.confirm_completion(&editor::actions::ConfirmCompletion::default(), window, cx);
-        });
-
-        let symbol = MentionUri::Symbol {
-            abs_path: path!("/dir/a/one.txt").into(),
-            name: "MySymbol".into(),
-            line_range: 0..=0,
-        };
-
-        let contents = message_editor
-            .update(&mut cx, |message_editor, cx| {
-                message_editor
-                    .mention_set()
-                    .update(cx, |mention_set, cx| mention_set.contents(false, cx))
-            })
-            .await
-            .unwrap()
-            .into_values()
-            .collect::<Vec<_>>();
-
-        {
-            let [_, _, (uri, Mention::Text { content, .. })] = contents.as_slice() else {
-                panic!("Unexpected mentions");
-            };
-            pretty_assertions::assert_eq!(content, "1");
-            pretty_assertions::assert_eq!(uri, &symbol);
-        }
-
-        cx.run_until_parked();
-
-        editor.read_with(&cx, |editor, cx| {
-            assert_eq!(
-                editor.text(cx),
-                format!(
-                    "Lorem [@one.txt]({url_one})  Ipsum [@eight.txt]({url_eight}) [@MySymbol]({}) ",
-                    symbol.to_uri(),
-                )
-            );
-        });
-
-        // Try to mention an "image" file that will fail to load
-        cx.simulate_input("@file x.png");
-
-        editor.update(&mut cx, |editor, cx| {
-            assert_eq!(
-                editor.text(cx),
-                format!("Lorem [@one.txt]({url_one})  Ipsum [@eight.txt]({url_eight}) [@MySymbol]({}) @file x.png", symbol.to_uri())
-            );
-            assert!(editor.has_visible_completions_menu());
-            assert_eq!(current_completion_labels(editor), &["x.png "]);
-        });
-
-        editor.update_in(&mut cx, |editor, window, cx| {
-            editor.confirm_completion(&editor::actions::ConfirmCompletion::default(), window, cx);
-        });
-
-        // Getting the message contents fails
-        message_editor
-            .update(&mut cx, |message_editor, cx| {
-                message_editor
-                    .mention_set()
-                    .update(cx, |mention_set, cx| mention_set.contents(false, cx))
-            })
-            .await
-            .expect_err("Should fail to load x.png");
-
-        cx.run_until_parked();
-
-        // Mention was removed
-        editor.read_with(&cx, |editor, cx| {
-            assert_eq!(
-                editor.text(cx),
-                format!(
-                    "Lorem [@one.txt]({url_one})  Ipsum [@eight.txt]({url_eight}) [@MySymbol]({}) ",
-                    symbol.to_uri()
-                )
-            );
-        });
-
-        // Once more
-        cx.simulate_input("@file x.png");
-
-        editor.update(&mut cx, |editor, cx| {
-                    assert_eq!(
-                        editor.text(cx),
-                        format!("Lorem [@one.txt]({url_one})  Ipsum [@eight.txt]({url_eight}) [@MySymbol]({}) @file x.png", symbol.to_uri())
-                    );
-                    assert!(editor.has_visible_completions_menu());
-                    assert_eq!(current_completion_labels(editor), &["x.png "]);
-                });
-
-        editor.update_in(&mut cx, |editor, window, cx| {
-            editor.confirm_completion(&editor::actions::ConfirmCompletion::default(), window, cx);
-        });
-
-        // This time don't immediately get the contents, just let the confirmed completion settle
-        cx.run_until_parked();
-
-        // Mention was removed
-        editor.read_with(&cx, |editor, cx| {
-            assert_eq!(
-                editor.text(cx),
-                format!(
-                    "Lorem [@one.txt]({url_one})  Ipsum [@eight.txt]({url_eight}) [@MySymbol]({}) ",
-                    symbol.to_uri()
-                )
-            );
-        });
-
-        // Now getting the contents succeeds, because the invalid mention was removed
-        let contents = message_editor
-            .update(&mut cx, |message_editor, cx| {
-                message_editor
-                    .mention_set()
-                    .update(cx, |mention_set, cx| mention_set.contents(false, cx))
-            })
-            .await
-            .unwrap();
-        assert_eq!(contents.len(), 3);
-    }
-
-    fn fold_ranges(editor: &Editor, cx: &mut App) -> Vec<Range<Point>> {
-        let snapshot = editor.buffer().read(cx).snapshot(cx);
-        editor.display_map.update(cx, |display_map, cx| {
-            display_map
-                .snapshot(cx)
-                .folds_in_range(MultiBufferOffset(0)..snapshot.len())
-                .map(|fold| fold.range.to_point(&snapshot))
-                .collect()
-        })
-    }
-
-    fn current_completion_labels(editor: &Editor) -> Vec<String> {
-        let completions = editor.current_completions().expect("Missing completions");
-        completions
-            .into_iter()
-            .map(|completion| completion.label.text)
-            .collect::<Vec<_>>()
-    }
-
-    fn current_completion_labels_with_documentation(editor: &Editor) -> Vec<(String, String)> {
-        let completions = editor.current_completions().expect("Missing completions");
-        completions
-            .into_iter()
-            .map(|completion| {
-                (
-                    completion.label.text,
-                    completion
-                        .documentation
-                        .map(|d| d.text().to_string())
-                        .unwrap_or_default(),
-                )
-            })
-            .collect::<Vec<_>>()
-    }
-
-    #[gpui::test]
-    async fn test_large_file_mention_fallback(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-
-        // Create a large file that exceeds AUTO_OUTLINE_SIZE
-        // Using plain text without a configured language, so no outline is available
-        const LINE: &str = "This is a line of text in the file\n";
-        let large_content = LINE.repeat(2 * (outline::AUTO_OUTLINE_SIZE / LINE.len()));
-        assert!(large_content.len() > outline::AUTO_OUTLINE_SIZE);
-
-        // Create a small file that doesn't exceed AUTO_OUTLINE_SIZE
-        let small_content = "fn small_function() { /* small */ }\n";
-        assert!(small_content.len() < outline::AUTO_OUTLINE_SIZE);
-
-        fs.insert_tree(
-            "/project",
-            json!({
-                "large_file.txt": large_content.clone(),
-                "small_file.txt": small_content,
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs, [Path::new(path!("/project"))], cx).await;
-
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-        let text_thread_store = cx.new(|cx| TextThreadStore::fake(project.clone(), cx));
-        let history_store = cx.new(|cx| HistoryStore::new(text_thread_store, cx));
-
-        let message_editor = cx.update(|window, cx| {
-            cx.new(|cx| {
-                let editor = MessageEditor::new(
-                    workspace.downgrade(),
-                    project.downgrade(),
-                    history_store.clone(),
-                    None,
-                    Default::default(),
-                    Default::default(),
-                    "Test Agent".into(),
-                    "Test",
-                    EditorMode::AutoHeight {
-                        min_lines: 1,
-                        max_lines: None,
-                    },
-                    window,
-                    cx,
-                );
-                // Enable embedded context so files are actually included
-                editor
-                    .prompt_capabilities
-                    .replace(acp::PromptCapabilities::new().embedded_context(true));
-                editor
-            })
-        });
-
-        // Test large file mention
-        // Get the absolute path using the project's worktree
-        let large_file_abs_path = project.read_with(cx, |project, cx| {
-            let worktree = project.worktrees(cx).next().unwrap();
-            let worktree_root = worktree.read(cx).abs_path();
-            worktree_root.join("large_file.txt")
-        });
-        let large_file_task = message_editor.update(cx, |editor, cx| {
-            editor.mention_set().update(cx, |set, cx| {
-                set.confirm_mention_for_file(large_file_abs_path, true, cx)
-            })
-        });
-
-        let large_file_mention = large_file_task.await.unwrap();
-        match large_file_mention {
-            Mention::Text { content, .. } => {
-                // Should contain some of the content but not all of it
-                assert!(
-                    content.contains(LINE),
-                    "Should contain some of the file content"
-                );
-                assert!(
-                    !content.contains(&LINE.repeat(100)),
-                    "Should not contain the full file"
-                );
-                // Should be much smaller than original
-                assert!(
-                    content.len() < large_content.len() / 10,
-                    "Should be significantly truncated"
-                );
-            }
-            _ => panic!("Expected Text mention for large file"),
-        }
-
-        // Test small file mention
-        // Get the absolute path using the project's worktree
-        let small_file_abs_path = project.read_with(cx, |project, cx| {
-            let worktree = project.worktrees(cx).next().unwrap();
-            let worktree_root = worktree.read(cx).abs_path();
-            worktree_root.join("small_file.txt")
-        });
-        let small_file_task = message_editor.update(cx, |editor, cx| {
-            editor.mention_set().update(cx, |set, cx| {
-                set.confirm_mention_for_file(small_file_abs_path, true, cx)
-            })
-        });
-
-        let small_file_mention = small_file_task.await.unwrap();
-        match small_file_mention {
-            Mention::Text { content, .. } => {
-                // Should contain the full actual content
-                assert_eq!(content, small_content);
-            }
-            _ => panic!("Expected Text mention for small file"),
-        }
-    }
-
-    #[gpui::test]
-    async fn test_insert_thread_summary(cx: &mut TestAppContext) {
-        init_test(cx);
-        cx.update(LanguageModelRegistry::test);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree("/project", json!({"file": ""})).await;
-        let project = Project::test(fs, [Path::new(path!("/project"))], cx).await;
-
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-        let text_thread_store = cx.new(|cx| TextThreadStore::fake(project.clone(), cx));
-        let history_store = cx.new(|cx| HistoryStore::new(text_thread_store, cx));
-
-        // Create a thread metadata to insert as summary
-        let thread_metadata = agent::DbThreadMetadata {
-            id: acp::SessionId::new("thread-123"),
-            title: "Previous Conversation".into(),
-            updated_at: chrono::Utc::now(),
-        };
-
-        let message_editor = cx.update(|window, cx| {
-            cx.new(|cx| {
-                let mut editor = MessageEditor::new(
-                    workspace.downgrade(),
-                    project.downgrade(),
-                    history_store.clone(),
-                    None,
-                    Default::default(),
-                    Default::default(),
-                    "Test Agent".into(),
-                    "Test",
-                    EditorMode::AutoHeight {
-                        min_lines: 1,
-                        max_lines: None,
-                    },
-                    window,
-                    cx,
-                );
-                editor.insert_thread_summary(thread_metadata.clone(), window, cx);
-                editor
-            })
-        });
-
-        // Construct expected values for verification
-        let expected_uri = MentionUri::Thread {
-            id: thread_metadata.id.clone(),
-            name: thread_metadata.title.to_string(),
-        };
-        let expected_link = format!("[@{}]({})", thread_metadata.title, expected_uri.to_uri());
-
-        message_editor.read_with(cx, |editor, cx| {
-            let text = editor.text(cx);
-
-            assert!(
-                text.contains(&expected_link),
-                "Expected editor text to contain thread mention link.\nExpected substring: {}\nActual text: {}",
-                expected_link,
-                text
-            );
-
-            let mentions = editor.mention_set().read(cx).mentions();
-            assert_eq!(
-                mentions.len(),
-                1,
-                "Expected exactly one mention after inserting thread summary"
-            );
-
-            assert!(
-                mentions.contains(&expected_uri),
-                "Expected mentions to contain the thread URI"
-            );
-        });
-    }
-
-    #[gpui::test]
-    async fn test_whitespace_trimming(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree("/project", json!({"file.rs": "fn main() {}"}))
-            .await;
-        let project = Project::test(fs, [Path::new(path!("/project"))], cx).await;
-
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-        let text_thread_store = cx.new(|cx| TextThreadStore::fake(project.clone(), cx));
-        let history_store = cx.new(|cx| HistoryStore::new(text_thread_store, cx));
-
-        let message_editor = cx.update(|window, cx| {
-            cx.new(|cx| {
-                MessageEditor::new(
-                    workspace.downgrade(),
-                    project.downgrade(),
-                    history_store.clone(),
-                    None,
-                    Default::default(),
-                    Default::default(),
-                    "Test Agent".into(),
-                    "Test",
-                    EditorMode::AutoHeight {
-                        min_lines: 1,
-                        max_lines: None,
-                    },
-                    window,
-                    cx,
-                )
-            })
-        });
-        let editor = message_editor.update(cx, |message_editor, _| message_editor.editor.clone());
-
-        cx.run_until_parked();
-
-        editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("  \u{A0}してhello world  ", window, cx);
-        });
-
-        let (content, _) = message_editor
-            .update(cx, |message_editor, cx| message_editor.contents(false, cx))
-            .await
-            .unwrap();
-
-        assert_eq!(content, vec!["してhello world".into()]);
-    }
-
-    #[gpui::test]
-    async fn test_editor_respects_embedded_context_capability(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-
-        let file_content = "fn main() { println!(\"Hello, world!\"); }\n";
-
-        fs.insert_tree(
-            "/project",
-            json!({
-                "src": {
-                    "main.rs": file_content,
-                }
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs, [Path::new(path!("/project"))], cx).await;
-
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-        let text_thread_store = cx.new(|cx| TextThreadStore::fake(project.clone(), cx));
-        let history_store = cx.new(|cx| HistoryStore::new(text_thread_store, cx));
-
-        let (message_editor, editor) = workspace.update_in(cx, |workspace, window, cx| {
-            let workspace_handle = cx.weak_entity();
-            let message_editor = cx.new(|cx| {
-                MessageEditor::new(
-                    workspace_handle,
-                    project.downgrade(),
-                    history_store.clone(),
-                    None,
-                    Default::default(),
-                    Default::default(),
-                    "Test Agent".into(),
-                    "Test",
-                    EditorMode::AutoHeight {
-                        max_lines: None,
-                        min_lines: 1,
-                    },
-                    window,
-                    cx,
-                )
-            });
-            workspace.active_pane().update(cx, |pane, cx| {
-                pane.add_item(
-                    Box::new(cx.new(|_| MessageEditorItem(message_editor.clone()))),
-                    true,
-                    true,
-                    None,
-                    window,
-                    cx,
-                );
-            });
-            message_editor.read(cx).focus_handle(cx).focus(window);
-            let editor = message_editor.read(cx).editor().clone();
-            (message_editor, editor)
-        });
-
-        cx.simulate_input("What is in @file main");
-
-        editor.update_in(cx, |editor, window, cx| {
-            assert!(editor.has_visible_completions_menu());
-            assert_eq!(editor.text(cx), "What is in @file main");
-            editor.confirm_completion(&editor::actions::ConfirmCompletion::default(), window, cx);
-        });
-
-        let content = message_editor
-            .update(cx, |editor, cx| editor.contents(false, cx))
-            .await
-            .unwrap()
-            .0;
-
-        let main_rs_uri = if cfg!(windows) {
-            "file:///C:/project/src/main.rs"
-        } else {
-            "file:///project/src/main.rs"
-        };
-
-        // When embedded context is `false` we should get a resource link
-        pretty_assertions::assert_eq!(
-            content,
-            vec![
-                "What is in ".into(),
-                acp::ContentBlock::ResourceLink(acp::ResourceLink::new("main.rs", main_rs_uri))
-            ]
-        );
-
-        message_editor.update(cx, |editor, _cx| {
-            editor
-                .prompt_capabilities
-                .replace(acp::PromptCapabilities::new().embedded_context(true))
-        });
-
-        let content = message_editor
-            .update(cx, |editor, cx| editor.contents(false, cx))
-            .await
-            .unwrap()
-            .0;
-
-        // When embedded context is `true` we should get a resource
-        pretty_assertions::assert_eq!(
-            content,
-            vec![
-                "What is in ".into(),
-                acp::ContentBlock::Resource(acp::EmbeddedResource::new(
-                    acp::EmbeddedResourceResource::TextResourceContents(
-                        acp::TextResourceContents::new(file_content, main_rs_uri)
-                    )
-                ))
-            ]
-        );
-    }
-
-    #[gpui::test]
-    async fn test_autoscroll_after_insert_selections(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let app_state = cx.update(AppState::test);
-
-        cx.update(|cx| {
-            editor::init(cx);
-            workspace::init(app_state.clone(), cx);
-        });
-
-        app_state
-            .fs
-            .as_fake()
-            .insert_tree(
-                path!("/dir"),
-                json!({
-                    "test.txt": "line1\nline2\nline3\nline4\nline5\n",
-                }),
-            )
-            .await;
-
-        let project = Project::test(app_state.fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let window = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let workspace = window.root(cx).unwrap();
-
-        let worktree = project.update(cx, |project, cx| {
-            let mut worktrees = project.worktrees(cx).collect::<Vec<_>>();
-            assert_eq!(worktrees.len(), 1);
-            worktrees.pop().unwrap()
-        });
-        let worktree_id = worktree.read_with(cx, |worktree, _| worktree.id());
-
-        let mut cx = VisualTestContext::from_window(*window, cx);
-
-        // Open a regular editor with the created file, and select a portion of
-        // the text that will be used for the selections that are meant to be
-        // inserted in the agent panel.
-        let editor = workspace
-            .update_in(&mut cx, |workspace, window, cx| {
-                workspace.open_path(
-                    ProjectPath {
-                        worktree_id,
-                        path: rel_path("test.txt").into(),
-                    },
-                    None,
-                    false,
-                    window,
-                    cx,
-                )
-            })
-            .await
-            .unwrap()
-            .downcast::<Editor>()
-            .unwrap();
-
-        editor.update_in(&mut cx, |editor, window, cx| {
-            editor.change_selections(Default::default(), window, cx, |selections| {
-                selections.select_ranges([Point::new(0, 0)..Point::new(0, 5)]);
-            });
-        });
-
-        let text_thread_store = cx.new(|cx| TextThreadStore::fake(project.clone(), cx));
-        let history_store = cx.new(|cx| HistoryStore::new(text_thread_store, cx));
-
-        // Create a new `MessageEditor`. The `EditorMode::full()` has to be used
-        // to ensure we have a fixed viewport, so we can eventually actually
-        // place the cursor outside of the visible area.
-        let message_editor = workspace.update_in(&mut cx, |workspace, window, cx| {
-            let workspace_handle = cx.weak_entity();
-            let message_editor = cx.new(|cx| {
-                MessageEditor::new(
-                    workspace_handle,
-                    project.downgrade(),
-                    history_store.clone(),
-                    None,
-                    Default::default(),
-                    Default::default(),
-                    "Test Agent".into(),
-                    "Test",
-                    EditorMode::full(),
-                    window,
-                    cx,
-                )
-            });
-            workspace.active_pane().update(cx, |pane, cx| {
-                pane.add_item(
-                    Box::new(cx.new(|_| MessageEditorItem(message_editor.clone()))),
-                    true,
-                    true,
-                    None,
-                    window,
-                    cx,
-                );
-            });
-
-            message_editor
-        });
-
-        message_editor.update_in(&mut cx, |message_editor, window, cx| {
-            message_editor.editor.update(cx, |editor, cx| {
-                // Update the Agent Panel's Message Editor text to have 100
-                // lines, ensuring that the cursor is set at line 90 and that we
-                // then scroll all the way to the top, so the cursor's position
-                // remains off screen.
-                let mut lines = String::new();
-                for _ in 1..=100 {
-                    lines.push_str(&"Another line in the agent panel's message editor\n");
-                }
-                editor.set_text(lines.as_str(), window, cx);
-                editor.change_selections(Default::default(), window, cx, |selections| {
-                    selections.select_ranges([Point::new(90, 0)..Point::new(90, 0)]);
-                });
-                editor.set_scroll_position(gpui::Point::new(0., 0.), window, cx);
-            });
-        });
-
-        cx.run_until_parked();
-
-        // Before proceeding, let's assert that the cursor is indeed off screen,
-        // otherwise the rest of the test doesn't make sense.
-        message_editor.update_in(&mut cx, |message_editor, window, cx| {
-            message_editor.editor.update(cx, |editor, cx| {
-                let snapshot = editor.snapshot(window, cx);
-                let cursor_row = editor.selections.newest::<Point>(&snapshot).head().row;
-                let scroll_top = snapshot.scroll_position().y as u32;
-                let visible_lines = editor.visible_line_count().unwrap() as u32;
-                let visible_range = scroll_top..(scroll_top + visible_lines);
-
-                assert!(!visible_range.contains(&cursor_row));
-            })
-        });
-
-        // Now let's insert the selection in the Agent Panel's editor and
-        // confirm that, after the insertion, the cursor is now in the visible
-        // range.
-        message_editor.update_in(&mut cx, |message_editor, window, cx| {
-            message_editor.insert_selections(window, cx);
-        });
-
-        cx.run_until_parked();
-
-        message_editor.update_in(&mut cx, |message_editor, window, cx| {
-            message_editor.editor.update(cx, |editor, cx| {
-                let snapshot = editor.snapshot(window, cx);
-                let cursor_row = editor.selections.newest::<Point>(&snapshot).head().row;
-                let scroll_top = snapshot.scroll_position().y as u32;
-                let visible_lines = editor.visible_line_count().unwrap() as u32;
-                let visible_range = scroll_top..(scroll_top + visible_lines);
-
-                assert!(visible_range.contains(&cursor_row));
-            })
-        });
-    }
-}
diff --git a/crates/agent_ui/src/acp/mode_selector.rs b/crates/agent_ui/src/acp/mode_selector.rs
deleted file mode 100644
index 1f50ce7432..0000000000
--- a/crates/agent_ui/src/acp/mode_selector.rs
+++ /dev/null
@@ -1,229 +0,0 @@
-use acp_thread::AgentSessionModes;
-use agent_client_protocol as acp;
-use agent_servers::AgentServer;
-use agent_settings::AgentSettings;
-use fs::Fs;
-use gpui::{Context, Entity, FocusHandle, WeakEntity, Window, prelude::*};
-use settings::Settings as _;
-use std::{rc::Rc, sync::Arc};
-use ui::{
-    Button, ContextMenu, ContextMenuEntry, DocumentationEdge, DocumentationSide, KeyBinding,
-    PopoverMenu, PopoverMenuHandle, Tooltip, prelude::*,
-};
-
-use crate::{CycleModeSelector, ToggleProfileSelector, ui::HoldForDefault};
-
-pub struct ModeSelector {
-    connection: Rc<dyn AgentSessionModes>,
-    agent_server: Rc<dyn AgentServer>,
-    menu_handle: PopoverMenuHandle<ContextMenu>,
-    focus_handle: FocusHandle,
-    fs: Arc<dyn Fs>,
-    setting_mode: bool,
-}
-
-impl ModeSelector {
-    pub fn new(
-        session_modes: Rc<dyn AgentSessionModes>,
-        agent_server: Rc<dyn AgentServer>,
-        fs: Arc<dyn Fs>,
-        focus_handle: FocusHandle,
-    ) -> Self {
-        Self {
-            connection: session_modes,
-            agent_server,
-            menu_handle: PopoverMenuHandle::default(),
-            fs,
-            setting_mode: false,
-            focus_handle,
-        }
-    }
-
-    pub fn menu_handle(&self) -> PopoverMenuHandle<ContextMenu> {
-        self.menu_handle.clone()
-    }
-
-    pub fn cycle_mode(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
-        let all_modes = self.connection.all_modes();
-        let current_mode = self.connection.current_mode();
-
-        let current_index = all_modes
-            .iter()
-            .position(|mode| mode.id.0 == current_mode.0)
-            .unwrap_or(0);
-
-        let next_index = (current_index + 1) % all_modes.len();
-        self.set_mode(all_modes[next_index].id.clone(), cx);
-    }
-
-    pub fn mode(&self) -> acp::SessionModeId {
-        self.connection.current_mode()
-    }
-
-    pub fn set_mode(&mut self, mode: acp::SessionModeId, cx: &mut Context<Self>) {
-        let task = self.connection.set_mode(mode, cx);
-        self.setting_mode = true;
-        cx.notify();
-
-        cx.spawn(async move |this: WeakEntity<ModeSelector>, cx| {
-            if let Err(err) = task.await {
-                log::error!("Failed to set session mode: {:?}", err);
-            }
-            this.update(cx, |this, cx| {
-                this.setting_mode = false;
-                cx.notify();
-            })
-            .ok();
-        })
-        .detach();
-    }
-
-    fn build_context_menu(
-        &self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Entity<ContextMenu> {
-        let weak_self = cx.weak_entity();
-
-        ContextMenu::build(window, cx, move |mut menu, _window, cx| {
-            let all_modes = self.connection.all_modes();
-            let current_mode = self.connection.current_mode();
-            let default_mode = self.agent_server.default_mode(cx);
-
-            let settings = AgentSettings::get_global(cx);
-            let side = match settings.dock {
-                settings::DockPosition::Left => DocumentationSide::Right,
-                settings::DockPosition::Bottom | settings::DockPosition::Right => {
-                    DocumentationSide::Left
-                }
-            };
-
-            for mode in all_modes {
-                let is_selected = &mode.id == &current_mode;
-                let is_default = Some(&mode.id) == default_mode.as_ref();
-                let entry = ContextMenuEntry::new(mode.name.clone())
-                    .toggleable(IconPosition::End, is_selected);
-
-                let entry = if let Some(description) = &mode.description {
-                    entry.documentation_aside(side, DocumentationEdge::Bottom, {
-                        let description = description.clone();
-
-                        move |_| {
-                            v_flex()
-                                .gap_1()
-                                .child(Label::new(description.clone()))
-                                .child(HoldForDefault::new(is_default))
-                                .into_any_element()
-                        }
-                    })
-                } else {
-                    entry
-                };
-
-                menu.push_item(entry.handler({
-                    let mode_id = mode.id.clone();
-                    let weak_self = weak_self.clone();
-                    move |window, cx| {
-                        weak_self
-                            .update(cx, |this, cx| {
-                                if window.modifiers().secondary() {
-                                    this.agent_server.set_default_mode(
-                                        if is_default {
-                                            None
-                                        } else {
-                                            Some(mode_id.clone())
-                                        },
-                                        this.fs.clone(),
-                                        cx,
-                                    );
-                                }
-
-                                this.set_mode(mode_id.clone(), cx);
-                            })
-                            .ok();
-                    }
-                }));
-            }
-
-            menu.key_context("ModeSelector")
-        })
-    }
-}
-
-impl Render for ModeSelector {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let current_mode_id = self.connection.current_mode();
-        let current_mode_name = self
-            .connection
-            .all_modes()
-            .iter()
-            .find(|mode| mode.id == current_mode_id)
-            .map(|mode| mode.name.clone())
-            .unwrap_or_else(|| "Unknown".into());
-
-        let this = cx.weak_entity();
-
-        let icon = if self.menu_handle.is_deployed() {
-            IconName::ChevronUp
-        } else {
-            IconName::ChevronDown
-        };
-
-        let trigger_button = Button::new("mode-selector-trigger", current_mode_name)
-            .label_size(LabelSize::Small)
-            .color(Color::Muted)
-            .icon(icon)
-            .icon_size(IconSize::XSmall)
-            .icon_position(IconPosition::End)
-            .icon_color(Color::Muted)
-            .disabled(self.setting_mode);
-
-        PopoverMenu::new("mode-selector")
-            .trigger_with_tooltip(
-                trigger_button,
-                Tooltip::element({
-                    let focus_handle = self.focus_handle.clone();
-                    move |_window, cx| {
-                        v_flex()
-                            .gap_1()
-                            .child(
-                                h_flex()
-                                    .pb_1()
-                                    .gap_2()
-                                    .justify_between()
-                                    .border_b_1()
-                                    .border_color(cx.theme().colors().border_variant)
-                                    .child(Label::new("Cycle Through Modes"))
-                                    .child(KeyBinding::for_action_in(
-                                        &CycleModeSelector,
-                                        &focus_handle,
-                                        cx,
-                                    )),
-                            )
-                            .child(
-                                h_flex()
-                                    .gap_2()
-                                    .justify_between()
-                                    .child(Label::new("Toggle Mode Menu"))
-                                    .child(KeyBinding::for_action_in(
-                                        &ToggleProfileSelector,
-                                        &focus_handle,
-                                        cx,
-                                    )),
-                            )
-                            .into_any()
-                    }
-                }),
-            )
-            .anchor(gpui::Corner::BottomRight)
-            .with_handle(self.menu_handle.clone())
-            .offset(gpui::Point {
-                x: px(0.0),
-                y: px(-2.0),
-            })
-            .menu(move |window, cx| {
-                this.update(cx, |this, cx| this.build_context_menu(window, cx))
-                    .ok()
-            })
-    }
-}
diff --git a/crates/agent_ui/src/acp/model_selector.rs b/crates/agent_ui/src/acp/model_selector.rs
deleted file mode 100644
index f9710ad9b3..0000000000
--- a/crates/agent_ui/src/acp/model_selector.rs
+++ /dev/null
@@ -1,553 +0,0 @@
-use std::{cmp::Reverse, rc::Rc, sync::Arc};
-
-use acp_thread::{AgentModelInfo, AgentModelList, AgentModelSelector};
-use agent_servers::AgentServer;
-use anyhow::Result;
-use collections::IndexMap;
-use fs::Fs;
-use futures::FutureExt;
-use fuzzy::{StringMatchCandidate, match_strings};
-use gpui::{
-    Action, AsyncWindowContext, BackgroundExecutor, DismissEvent, FocusHandle, Task, WeakEntity,
-};
-use ordered_float::OrderedFloat;
-use picker::{Picker, PickerDelegate};
-use ui::{
-    DocumentationAside, DocumentationEdge, DocumentationSide, IntoElement, KeyBinding, ListItem,
-    ListItemSpacing, prelude::*,
-};
-use util::ResultExt;
-use zed_actions::agent::OpenSettings;
-
-use crate::ui::HoldForDefault;
-
-pub type AcpModelSelector = Picker<AcpModelPickerDelegate>;
-
-pub fn acp_model_selector(
-    selector: Rc<dyn AgentModelSelector>,
-    agent_server: Rc<dyn AgentServer>,
-    fs: Arc<dyn Fs>,
-    focus_handle: FocusHandle,
-    window: &mut Window,
-    cx: &mut Context<AcpModelSelector>,
-) -> AcpModelSelector {
-    let delegate =
-        AcpModelPickerDelegate::new(selector, agent_server, fs, focus_handle, window, cx);
-    Picker::list(delegate, window, cx)
-        .show_scrollbar(true)
-        .width(rems(20.))
-        .max_height(Some(rems(20.).into()))
-}
-
-enum AcpModelPickerEntry {
-    Separator(SharedString),
-    Model(AgentModelInfo),
-}
-
-pub struct AcpModelPickerDelegate {
-    selector: Rc<dyn AgentModelSelector>,
-    agent_server: Rc<dyn AgentServer>,
-    fs: Arc<dyn Fs>,
-    filtered_entries: Vec<AcpModelPickerEntry>,
-    models: Option<AgentModelList>,
-    selected_index: usize,
-    selected_description: Option<(usize, SharedString, bool)>,
-    selected_model: Option<AgentModelInfo>,
-    _refresh_models_task: Task<()>,
-    focus_handle: FocusHandle,
-}
-
-impl AcpModelPickerDelegate {
-    fn new(
-        selector: Rc<dyn AgentModelSelector>,
-        agent_server: Rc<dyn AgentServer>,
-        fs: Arc<dyn Fs>,
-        focus_handle: FocusHandle,
-        window: &mut Window,
-        cx: &mut Context<AcpModelSelector>,
-    ) -> Self {
-        let rx = selector.watch(cx);
-        let refresh_models_task = {
-            cx.spawn_in(window, {
-                async move |this, cx| {
-                    async fn refresh(
-                        this: &WeakEntity<Picker<AcpModelPickerDelegate>>,
-                        cx: &mut AsyncWindowContext,
-                    ) -> Result<()> {
-                        let (models_task, selected_model_task) = this.update(cx, |this, cx| {
-                            (
-                                this.delegate.selector.list_models(cx),
-                                this.delegate.selector.selected_model(cx),
-                            )
-                        })?;
-
-                        let (models, selected_model) =
-                            futures::join!(models_task, selected_model_task);
-
-                        this.update_in(cx, |this, window, cx| {
-                            this.delegate.models = models.ok();
-                            this.delegate.selected_model = selected_model.ok();
-                            this.refresh(window, cx)
-                        })
-                    }
-
-                    refresh(&this, cx).await.log_err();
-                    if let Some(mut rx) = rx {
-                        while let Ok(()) = rx.recv().await {
-                            refresh(&this, cx).await.log_err();
-                        }
-                    }
-                }
-            })
-        };
-
-        Self {
-            selector,
-            agent_server,
-            fs,
-            filtered_entries: Vec::new(),
-            models: None,
-            selected_model: None,
-            selected_index: 0,
-            selected_description: None,
-            _refresh_models_task: refresh_models_task,
-            focus_handle,
-        }
-    }
-
-    pub fn active_model(&self) -> Option<&AgentModelInfo> {
-        self.selected_model.as_ref()
-    }
-}
-
-impl PickerDelegate for AcpModelPickerDelegate {
-    type ListItem = AnyElement;
-
-    fn match_count(&self) -> usize {
-        self.filtered_entries.len()
-    }
-
-    fn selected_index(&self) -> usize {
-        self.selected_index
-    }
-
-    fn set_selected_index(&mut self, ix: usize, _: &mut Window, cx: &mut Context<Picker<Self>>) {
-        self.selected_index = ix.min(self.filtered_entries.len().saturating_sub(1));
-        cx.notify();
-    }
-
-    fn can_select(
-        &mut self,
-        ix: usize,
-        _window: &mut Window,
-        _cx: &mut Context<Picker<Self>>,
-    ) -> bool {
-        match self.filtered_entries.get(ix) {
-            Some(AcpModelPickerEntry::Model(_)) => true,
-            Some(AcpModelPickerEntry::Separator(_)) | None => false,
-        }
-    }
-
-    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
-        "Select a model…".into()
-    }
-
-    fn update_matches(
-        &mut self,
-        query: String,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Task<()> {
-        cx.spawn_in(window, async move |this, cx| {
-            let filtered_models = match this
-                .read_with(cx, |this, cx| {
-                    this.delegate.models.clone().map(move |models| {
-                        fuzzy_search(models, query, cx.background_executor().clone())
-                    })
-                })
-                .ok()
-                .flatten()
-            {
-                Some(task) => task.await,
-                None => AgentModelList::Flat(vec![]),
-            };
-
-            this.update_in(cx, |this, window, cx| {
-                this.delegate.filtered_entries =
-                    info_list_to_picker_entries(filtered_models).collect();
-                // Finds the currently selected model in the list
-                let new_index = this
-                    .delegate
-                    .selected_model
-                    .as_ref()
-                    .and_then(|selected| {
-                        this.delegate.filtered_entries.iter().position(|entry| {
-                            if let AcpModelPickerEntry::Model(model_info) = entry {
-                                model_info.id == selected.id
-                            } else {
-                                false
-                            }
-                        })
-                    })
-                    .unwrap_or(0);
-                this.set_selected_index(new_index, Some(picker::Direction::Down), true, window, cx);
-                cx.notify();
-            })
-            .ok();
-        })
-    }
-
-    fn confirm(&mut self, _secondary: bool, window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        if let Some(AcpModelPickerEntry::Model(model_info)) =
-            self.filtered_entries.get(self.selected_index)
-        {
-            if window.modifiers().secondary() {
-                let default_model = self.agent_server.default_model(cx);
-                let is_default = default_model.as_ref() == Some(&model_info.id);
-
-                self.agent_server.set_default_model(
-                    if is_default {
-                        None
-                    } else {
-                        Some(model_info.id.clone())
-                    },
-                    self.fs.clone(),
-                    cx,
-                );
-            }
-
-            self.selector
-                .select_model(model_info.id.clone(), cx)
-                .detach_and_log_err(cx);
-            self.selected_model = Some(model_info.clone());
-            let current_index = self.selected_index;
-            self.set_selected_index(current_index, window, cx);
-
-            cx.emit(DismissEvent);
-        }
-    }
-
-    fn dismissed(&mut self, window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        cx.defer_in(window, |picker, window, cx| {
-            picker.set_query("", window, cx);
-        });
-    }
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        _: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<Self::ListItem> {
-        match self.filtered_entries.get(ix)? {
-            AcpModelPickerEntry::Separator(title) => Some(
-                div()
-                    .px_2()
-                    .pb_1()
-                    .when(ix > 1, |this| {
-                        this.mt_1()
-                            .pt_2()
-                            .border_t_1()
-                            .border_color(cx.theme().colors().border_variant)
-                    })
-                    .child(
-                        Label::new(title)
-                            .size(LabelSize::XSmall)
-                            .color(Color::Muted),
-                    )
-                    .into_any_element(),
-            ),
-            AcpModelPickerEntry::Model(model_info) => {
-                let is_selected = Some(model_info) == self.selected_model.as_ref();
-                let default_model = self.agent_server.default_model(cx);
-                let is_default = default_model.as_ref() == Some(&model_info.id);
-
-                let model_icon_color = if is_selected {
-                    Color::Accent
-                } else {
-                    Color::Muted
-                };
-
-                Some(
-                    div()
-                        .id(("model-picker-menu-child", ix))
-                        .when_some(model_info.description.clone(), |this, description| {
-                            this
-                                .on_hover(cx.listener(move |menu, hovered, _, cx| {
-                                    if *hovered {
-                                        menu.delegate.selected_description = Some((ix, description.clone(), is_default));
-                                    } else if matches!(menu.delegate.selected_description, Some((id, _, _)) if id == ix) {
-                                        menu.delegate.selected_description = None;
-                                    }
-                                    cx.notify();
-                                }))
-                        })
-                        .child(
-                            ListItem::new(ix)
-                                .inset(true)
-                                .spacing(ListItemSpacing::Sparse)
-                                .toggle_state(selected)
-                                .child(
-                                    h_flex()
-                                        .w_full()
-                                        .gap_1p5()
-                                        .when_some(model_info.icon, |this, icon| {
-                                            this.child(
-                                                Icon::new(icon)
-                                                    .color(model_icon_color)
-                                                    .size(IconSize::Small)
-                                            )
-                                        })
-                                        .child(Label::new(model_info.name.clone()).truncate()),
-                                )
-                                .end_slot(div().pr_3().when(is_selected, |this| {
-                                    this.child(
-                                        Icon::new(IconName::Check)
-                                            .color(Color::Accent)
-                                            .size(IconSize::Small),
-                                    )
-                                })),
-                        )
-                        .into_any_element()
-                )
-            }
-        }
-    }
-
-    fn documentation_aside(
-        &self,
-        _window: &mut Window,
-        _cx: &mut Context<Picker<Self>>,
-    ) -> Option<ui::DocumentationAside> {
-        self.selected_description
-            .as_ref()
-            .map(|(_, description, is_default)| {
-                let description = description.clone();
-                let is_default = *is_default;
-
-                DocumentationAside::new(
-                    DocumentationSide::Left,
-                    DocumentationEdge::Top,
-                    Rc::new(move |_| {
-                        v_flex()
-                            .gap_1()
-                            .child(Label::new(description.clone()))
-                            .child(HoldForDefault::new(is_default))
-                            .into_any_element()
-                    }),
-                )
-            })
-    }
-
-    fn render_footer(
-        &self,
-        _window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<AnyElement> {
-        let focus_handle = self.focus_handle.clone();
-
-        if !self.selector.should_render_footer() {
-            return None;
-        }
-
-        Some(
-            h_flex()
-                .w_full()
-                .p_1p5()
-                .border_t_1()
-                .border_color(cx.theme().colors().border_variant)
-                .child(
-                    Button::new("configure", "Configure")
-                        .full_width()
-                        .style(ButtonStyle::Outlined)
-                        .key_binding(
-                            KeyBinding::for_action_in(&OpenSettings, &focus_handle, cx)
-                                .map(|kb| kb.size(rems_from_px(12.))),
-                        )
-                        .on_click(|_, window, cx| {
-                            window.dispatch_action(OpenSettings.boxed_clone(), cx);
-                        }),
-                )
-                .into_any(),
-        )
-    }
-}
-
-fn info_list_to_picker_entries(
-    model_list: AgentModelList,
-) -> impl Iterator<Item = AcpModelPickerEntry> {
-    match model_list {
-        AgentModelList::Flat(list) => {
-            itertools::Either::Left(list.into_iter().map(AcpModelPickerEntry::Model))
-        }
-        AgentModelList::Grouped(index_map) => {
-            itertools::Either::Right(index_map.into_iter().flat_map(|(group_name, models)| {
-                std::iter::once(AcpModelPickerEntry::Separator(group_name.0))
-                    .chain(models.into_iter().map(AcpModelPickerEntry::Model))
-            }))
-        }
-    }
-}
-
-async fn fuzzy_search(
-    model_list: AgentModelList,
-    query: String,
-    executor: BackgroundExecutor,
-) -> AgentModelList {
-    async fn fuzzy_search_list(
-        model_list: Vec<AgentModelInfo>,
-        query: &str,
-        executor: BackgroundExecutor,
-    ) -> Vec<AgentModelInfo> {
-        let candidates = model_list
-            .iter()
-            .enumerate()
-            .map(|(ix, model)| {
-                StringMatchCandidate::new(ix, &format!("{}/{}", model.id, model.name))
-            })
-            .collect::<Vec<_>>();
-        let mut matches = match_strings(
-            &candidates,
-            query,
-            false,
-            true,
-            100,
-            &Default::default(),
-            executor,
-        )
-        .await;
-
-        matches.sort_unstable_by_key(|mat| {
-            let candidate = &candidates[mat.candidate_id];
-            (Reverse(OrderedFloat(mat.score)), candidate.id)
-        });
-
-        matches
-            .into_iter()
-            .map(|mat| model_list[mat.candidate_id].clone())
-            .collect()
-    }
-
-    match model_list {
-        AgentModelList::Flat(model_list) => {
-            AgentModelList::Flat(fuzzy_search_list(model_list, &query, executor).await)
-        }
-        AgentModelList::Grouped(index_map) => {
-            let groups =
-                futures::future::join_all(index_map.into_iter().map(|(group_name, models)| {
-                    fuzzy_search_list(models, &query, executor.clone())
-                        .map(|results| (group_name, results))
-                }))
-                .await;
-            AgentModelList::Grouped(IndexMap::from_iter(
-                groups
-                    .into_iter()
-                    .filter(|(_, results)| !results.is_empty()),
-            ))
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use agent_client_protocol as acp;
-    use gpui::TestAppContext;
-
-    use super::*;
-
-    fn create_model_list(grouped_models: Vec<(&str, Vec<&str>)>) -> AgentModelList {
-        AgentModelList::Grouped(IndexMap::from_iter(grouped_models.into_iter().map(
-            |(group, models)| {
-                (
-                    acp_thread::AgentModelGroupName(group.to_string().into()),
-                    models
-                        .into_iter()
-                        .map(|model| acp_thread::AgentModelInfo {
-                            id: acp::ModelId::new(model.to_string()),
-                            name: model.to_string().into(),
-                            description: None,
-                            icon: None,
-                        })
-                        .collect::<Vec<_>>(),
-                )
-            },
-        )))
-    }
-
-    fn assert_models_eq(result: AgentModelList, expected: Vec<(&str, Vec<&str>)>) {
-        let AgentModelList::Grouped(groups) = result else {
-            panic!("Expected LanguageModelInfoList::Grouped, got {:?}", result);
-        };
-
-        assert_eq!(
-            groups.len(),
-            expected.len(),
-            "Number of groups doesn't match"
-        );
-
-        for (i, (expected_group, expected_models)) in expected.iter().enumerate() {
-            let (actual_group, actual_models) = groups.get_index(i).unwrap();
-            assert_eq!(
-                actual_group.0.as_ref(),
-                *expected_group,
-                "Group at position {} doesn't match expected group",
-                i
-            );
-            assert_eq!(
-                actual_models.len(),
-                expected_models.len(),
-                "Number of models in group {} doesn't match",
-                expected_group
-            );
-
-            for (j, expected_model_name) in expected_models.iter().enumerate() {
-                assert_eq!(
-                    actual_models[j].name, *expected_model_name,
-                    "Model at position {} in group {} doesn't match expected model",
-                    j, expected_group
-                );
-            }
-        }
-    }
-
-    #[gpui::test]
-    async fn test_fuzzy_match(cx: &mut TestAppContext) {
-        let models = create_model_list(vec![
-            (
-                "zed",
-                vec![
-                    "Claude 3.7 Sonnet",
-                    "Claude 3.7 Sonnet Thinking",
-                    "gpt-4.1",
-                    "gpt-4.1-nano",
-                ],
-            ),
-            ("openai", vec!["gpt-3.5-turbo", "gpt-4.1", "gpt-4.1-nano"]),
-            ("ollama", vec!["mistral", "deepseek"]),
-        ]);
-
-        // Results should preserve models order whenever possible.
-        // In the case below, `zed/gpt-4.1` and `openai/gpt-4.1` have identical
-        // similarity scores, but `zed/gpt-4.1` was higher in the models list,
-        // so it should appear first in the results.
-        let results = fuzzy_search(models.clone(), "41".into(), cx.executor()).await;
-        assert_models_eq(
-            results,
-            vec![
-                ("zed", vec!["gpt-4.1", "gpt-4.1-nano"]),
-                ("openai", vec!["gpt-4.1", "gpt-4.1-nano"]),
-            ],
-        );
-
-        // Fuzzy search
-        let results = fuzzy_search(models.clone(), "4n".into(), cx.executor()).await;
-        assert_models_eq(
-            results,
-            vec![
-                ("zed", vec!["gpt-4.1-nano"]),
-                ("openai", vec!["gpt-4.1-nano"]),
-            ],
-        );
-    }
-}
diff --git a/crates/agent_ui/src/acp/model_selector_popover.rs b/crates/agent_ui/src/acp/model_selector_popover.rs
deleted file mode 100644
index e2393c11bd..0000000000
--- a/crates/agent_ui/src/acp/model_selector_popover.rs
+++ /dev/null
@@ -1,100 +0,0 @@
-use std::rc::Rc;
-use std::sync::Arc;
-
-use acp_thread::{AgentModelInfo, AgentModelSelector};
-use agent_servers::AgentServer;
-use fs::Fs;
-use gpui::{Entity, FocusHandle};
-use picker::popover_menu::PickerPopoverMenu;
-use ui::{
-    ButtonLike, Context, IntoElement, PopoverMenuHandle, SharedString, TintColor, Tooltip, Window,
-    prelude::*,
-};
-use zed_actions::agent::ToggleModelSelector;
-
-use crate::acp::{AcpModelSelector, model_selector::acp_model_selector};
-
-pub struct AcpModelSelectorPopover {
-    selector: Entity<AcpModelSelector>,
-    menu_handle: PopoverMenuHandle<AcpModelSelector>,
-    focus_handle: FocusHandle,
-}
-
-impl AcpModelSelectorPopover {
-    pub(crate) fn new(
-        selector: Rc<dyn AgentModelSelector>,
-        agent_server: Rc<dyn AgentServer>,
-        fs: Arc<dyn Fs>,
-        menu_handle: PopoverMenuHandle<AcpModelSelector>,
-        focus_handle: FocusHandle,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let focus_handle_clone = focus_handle.clone();
-        Self {
-            selector: cx.new(move |cx| {
-                acp_model_selector(
-                    selector,
-                    agent_server,
-                    fs,
-                    focus_handle_clone.clone(),
-                    window,
-                    cx,
-                )
-            }),
-            menu_handle,
-            focus_handle,
-        }
-    }
-
-    pub fn toggle(&self, window: &mut Window, cx: &mut Context<Self>) {
-        self.menu_handle.toggle(window, cx);
-    }
-
-    pub fn active_model<'a>(&self, cx: &'a App) -> Option<&'a AgentModelInfo> {
-        self.selector.read(cx).delegate.active_model()
-    }
-}
-
-impl Render for AcpModelSelectorPopover {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let model = self.selector.read(cx).delegate.active_model();
-        let model_name = model
-            .as_ref()
-            .map(|model| model.name.clone())
-            .unwrap_or_else(|| SharedString::from("Select a Model"));
-
-        let model_icon = model.as_ref().and_then(|model| model.icon);
-
-        let focus_handle = self.focus_handle.clone();
-
-        let (color, icon) = if self.menu_handle.is_deployed() {
-            (Color::Accent, IconName::ChevronUp)
-        } else {
-            (Color::Muted, IconName::ChevronDown)
-        };
-
-        PickerPopoverMenu::new(
-            self.selector.clone(),
-            ButtonLike::new("active-model")
-                .selected_style(ButtonStyle::Tinted(TintColor::Accent))
-                .when_some(model_icon, |this, icon| {
-                    this.child(Icon::new(icon).color(color).size(IconSize::XSmall))
-                })
-                .child(
-                    Label::new(model_name)
-                        .color(color)
-                        .size(LabelSize::Small)
-                        .ml_0p5(),
-                )
-                .child(Icon::new(icon).color(Color::Muted).size(IconSize::XSmall)),
-            move |_window, cx| {
-                Tooltip::for_action_in("Change Model", &ToggleModelSelector, &focus_handle, cx)
-            },
-            gpui::Corner::BottomRight,
-            cx,
-        )
-        .with_handle(self.menu_handle.clone())
-        .render(window, cx)
-    }
-}
diff --git a/crates/agent_ui/src/acp/thread_history.rs b/crates/agent_ui/src/acp/thread_history.rs
deleted file mode 100644
index 1aa89b35d3..0000000000
--- a/crates/agent_ui/src/acp/thread_history.rs
+++ /dev/null
@@ -1,861 +0,0 @@
-use crate::acp::AcpThreadView;
-use crate::{AgentPanel, RemoveHistory, RemoveSelectedThread};
-use agent::{HistoryEntry, HistoryStore};
-use chrono::{Datelike as _, Local, NaiveDate, TimeDelta};
-use editor::{Editor, EditorEvent};
-use fuzzy::StringMatchCandidate;
-use gpui::{
-    App, Entity, EventEmitter, FocusHandle, Focusable, ScrollStrategy, Task,
-    UniformListScrollHandle, WeakEntity, Window, uniform_list,
-};
-use std::{fmt::Display, ops::Range};
-use text::Bias;
-use time::{OffsetDateTime, UtcOffset};
-use ui::{
-    HighlightedLabel, IconButtonShape, ListItem, ListItemSpacing, Tab, Tooltip, WithScrollbar,
-    prelude::*,
-};
-
-pub struct AcpThreadHistory {
-    pub(crate) history_store: Entity<HistoryStore>,
-    scroll_handle: UniformListScrollHandle,
-    selected_index: usize,
-    hovered_index: Option<usize>,
-    search_editor: Entity<Editor>,
-    search_query: SharedString,
-    visible_items: Vec<ListItemType>,
-    local_timezone: UtcOffset,
-    confirming_delete_history: bool,
-    _update_task: Task<()>,
-    _subscriptions: Vec<gpui::Subscription>,
-}
-
-enum ListItemType {
-    BucketSeparator(TimeBucket),
-    Entry {
-        entry: HistoryEntry,
-        format: EntryTimeFormat,
-    },
-    SearchResult {
-        entry: HistoryEntry,
-        positions: Vec<usize>,
-    },
-}
-
-impl ListItemType {
-    fn history_entry(&self) -> Option<&HistoryEntry> {
-        match self {
-            ListItemType::Entry { entry, .. } => Some(entry),
-            ListItemType::SearchResult { entry, .. } => Some(entry),
-            _ => None,
-        }
-    }
-}
-
-pub enum ThreadHistoryEvent {
-    Open(HistoryEntry),
-}
-
-impl EventEmitter<ThreadHistoryEvent> for AcpThreadHistory {}
-
-impl AcpThreadHistory {
-    pub(crate) fn new(
-        history_store: Entity<agent::HistoryStore>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let search_editor = cx.new(|cx| {
-            let mut editor = Editor::single_line(window, cx);
-            editor.set_placeholder_text("Search threads...", window, cx);
-            editor
-        });
-
-        let search_editor_subscription =
-            cx.subscribe(&search_editor, |this, search_editor, event, cx| {
-                if let EditorEvent::BufferEdited = event {
-                    let query = search_editor.read(cx).text(cx);
-                    if this.search_query != query {
-                        this.search_query = query.into();
-                        this.update_visible_items(false, cx);
-                    }
-                }
-            });
-
-        let history_store_subscription = cx.observe(&history_store, |this, _, cx| {
-            this.update_visible_items(true, cx);
-        });
-
-        let scroll_handle = UniformListScrollHandle::default();
-
-        let mut this = Self {
-            history_store,
-            scroll_handle,
-            selected_index: 0,
-            hovered_index: None,
-            visible_items: Default::default(),
-            search_editor,
-            local_timezone: UtcOffset::from_whole_seconds(
-                chrono::Local::now().offset().local_minus_utc(),
-            )
-            .unwrap(),
-            search_query: SharedString::default(),
-            confirming_delete_history: false,
-            _subscriptions: vec![search_editor_subscription, history_store_subscription],
-            _update_task: Task::ready(()),
-        };
-        this.update_visible_items(false, cx);
-        this
-    }
-
-    fn update_visible_items(&mut self, preserve_selected_item: bool, cx: &mut Context<Self>) {
-        let entries = self
-            .history_store
-            .update(cx, |store, _| store.entries().collect());
-        let new_list_items = if self.search_query.is_empty() {
-            self.add_list_separators(entries, cx)
-        } else {
-            self.filter_search_results(entries, cx)
-        };
-        let selected_history_entry = if preserve_selected_item {
-            self.selected_history_entry().cloned()
-        } else {
-            None
-        };
-
-        self._update_task = cx.spawn(async move |this, cx| {
-            let new_visible_items = new_list_items.await;
-            this.update(cx, |this, cx| {
-                let new_selected_index = if let Some(history_entry) = selected_history_entry {
-                    let history_entry_id = history_entry.id();
-                    new_visible_items
-                        .iter()
-                        .position(|visible_entry| {
-                            visible_entry
-                                .history_entry()
-                                .is_some_and(|entry| entry.id() == history_entry_id)
-                        })
-                        .unwrap_or(0)
-                } else {
-                    0
-                };
-
-                this.visible_items = new_visible_items;
-                this.set_selected_index(new_selected_index, Bias::Right, cx);
-                cx.notify();
-            })
-            .ok();
-        });
-    }
-
-    fn add_list_separators(&self, entries: Vec<HistoryEntry>, cx: &App) -> Task<Vec<ListItemType>> {
-        cx.background_spawn(async move {
-            let mut items = Vec::with_capacity(entries.len() + 1);
-            let mut bucket = None;
-            let today = Local::now().naive_local().date();
-
-            for entry in entries.into_iter() {
-                let entry_date = entry
-                    .updated_at()
-                    .with_timezone(&Local)
-                    .naive_local()
-                    .date();
-                let entry_bucket = TimeBucket::from_dates(today, entry_date);
-
-                if Some(entry_bucket) != bucket {
-                    bucket = Some(entry_bucket);
-                    items.push(ListItemType::BucketSeparator(entry_bucket));
-                }
-
-                items.push(ListItemType::Entry {
-                    entry,
-                    format: entry_bucket.into(),
-                });
-            }
-            items
-        })
-    }
-
-    fn filter_search_results(
-        &self,
-        entries: Vec<HistoryEntry>,
-        cx: &App,
-    ) -> Task<Vec<ListItemType>> {
-        let query = self.search_query.clone();
-        cx.background_spawn({
-            let executor = cx.background_executor().clone();
-            async move {
-                let mut candidates = Vec::with_capacity(entries.len());
-
-                for (idx, entry) in entries.iter().enumerate() {
-                    candidates.push(StringMatchCandidate::new(idx, entry.title()));
-                }
-
-                const MAX_MATCHES: usize = 100;
-
-                let matches = fuzzy::match_strings(
-                    &candidates,
-                    &query,
-                    false,
-                    true,
-                    MAX_MATCHES,
-                    &Default::default(),
-                    executor,
-                )
-                .await;
-
-                matches
-                    .into_iter()
-                    .map(|search_match| ListItemType::SearchResult {
-                        entry: entries[search_match.candidate_id].clone(),
-                        positions: search_match.positions,
-                    })
-                    .collect()
-            }
-        })
-    }
-
-    fn search_produced_no_matches(&self) -> bool {
-        self.visible_items.is_empty() && !self.search_query.is_empty()
-    }
-
-    fn selected_history_entry(&self) -> Option<&HistoryEntry> {
-        self.get_history_entry(self.selected_index)
-    }
-
-    fn get_history_entry(&self, visible_items_ix: usize) -> Option<&HistoryEntry> {
-        self.visible_items.get(visible_items_ix)?.history_entry()
-    }
-
-    fn set_selected_index(&mut self, mut index: usize, bias: Bias, cx: &mut Context<Self>) {
-        if self.visible_items.len() == 0 {
-            self.selected_index = 0;
-            return;
-        }
-        while matches!(
-            self.visible_items.get(index),
-            None | Some(ListItemType::BucketSeparator(..))
-        ) {
-            index = match bias {
-                Bias::Left => {
-                    if index == 0 {
-                        self.visible_items.len() - 1
-                    } else {
-                        index - 1
-                    }
-                }
-                Bias::Right => {
-                    if index >= self.visible_items.len() - 1 {
-                        0
-                    } else {
-                        index + 1
-                    }
-                }
-            };
-        }
-        self.selected_index = index;
-        self.scroll_handle
-            .scroll_to_item(index, ScrollStrategy::Top);
-        cx.notify()
-    }
-
-    pub fn select_previous(
-        &mut self,
-        _: &menu::SelectPrevious,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.selected_index == 0 {
-            self.set_selected_index(self.visible_items.len() - 1, Bias::Left, cx);
-        } else {
-            self.set_selected_index(self.selected_index - 1, Bias::Left, cx);
-        }
-    }
-
-    pub fn select_next(
-        &mut self,
-        _: &menu::SelectNext,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.selected_index == self.visible_items.len() - 1 {
-            self.set_selected_index(0, Bias::Right, cx);
-        } else {
-            self.set_selected_index(self.selected_index + 1, Bias::Right, cx);
-        }
-    }
-
-    fn select_first(
-        &mut self,
-        _: &menu::SelectFirst,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.set_selected_index(0, Bias::Right, cx);
-    }
-
-    fn select_last(&mut self, _: &menu::SelectLast, _window: &mut Window, cx: &mut Context<Self>) {
-        self.set_selected_index(self.visible_items.len() - 1, Bias::Left, cx);
-    }
-
-    fn confirm(&mut self, _: &menu::Confirm, _window: &mut Window, cx: &mut Context<Self>) {
-        self.confirm_entry(self.selected_index, cx);
-    }
-
-    fn confirm_entry(&mut self, ix: usize, cx: &mut Context<Self>) {
-        let Some(entry) = self.get_history_entry(ix) else {
-            return;
-        };
-        cx.emit(ThreadHistoryEvent::Open(entry.clone()));
-    }
-
-    fn remove_selected_thread(
-        &mut self,
-        _: &RemoveSelectedThread,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.remove_thread(self.selected_index, cx)
-    }
-
-    fn remove_thread(&mut self, visible_item_ix: usize, cx: &mut Context<Self>) {
-        let Some(entry) = self.get_history_entry(visible_item_ix) else {
-            return;
-        };
-
-        let task = match entry {
-            HistoryEntry::AcpThread(thread) => self
-                .history_store
-                .update(cx, |this, cx| this.delete_thread(thread.id.clone(), cx)),
-            HistoryEntry::TextThread(text_thread) => self.history_store.update(cx, |this, cx| {
-                this.delete_text_thread(text_thread.path.clone(), cx)
-            }),
-        };
-        task.detach_and_log_err(cx);
-    }
-
-    fn remove_history(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
-        self.history_store.update(cx, |store, cx| {
-            store.delete_threads(cx).detach_and_log_err(cx)
-        });
-        self.confirming_delete_history = false;
-        cx.notify();
-    }
-
-    fn prompt_delete_history(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
-        self.confirming_delete_history = true;
-        cx.notify();
-    }
-
-    fn cancel_delete_history(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
-        self.confirming_delete_history = false;
-        cx.notify();
-    }
-
-    fn render_list_items(
-        &mut self,
-        range: Range<usize>,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Vec<AnyElement> {
-        self.visible_items
-            .get(range.clone())
-            .into_iter()
-            .flatten()
-            .enumerate()
-            .map(|(ix, item)| self.render_list_item(item, range.start + ix, cx))
-            .collect()
-    }
-
-    fn render_list_item(&self, item: &ListItemType, ix: usize, cx: &Context<Self>) -> AnyElement {
-        match item {
-            ListItemType::Entry { entry, format } => self
-                .render_history_entry(entry, *format, ix, Vec::default(), cx)
-                .into_any(),
-            ListItemType::SearchResult { entry, positions } => self.render_history_entry(
-                entry,
-                EntryTimeFormat::DateAndTime,
-                ix,
-                positions.clone(),
-                cx,
-            ),
-            ListItemType::BucketSeparator(bucket) => div()
-                .px(DynamicSpacing::Base06.rems(cx))
-                .pt_2()
-                .pb_1()
-                .child(
-                    Label::new(bucket.to_string())
-                        .size(LabelSize::XSmall)
-                        .color(Color::Muted),
-                )
-                .into_any_element(),
-        }
-    }
-
-    fn render_history_entry(
-        &self,
-        entry: &HistoryEntry,
-        format: EntryTimeFormat,
-        ix: usize,
-        highlight_positions: Vec<usize>,
-        cx: &Context<Self>,
-    ) -> AnyElement {
-        let selected = ix == self.selected_index;
-        let hovered = Some(ix) == self.hovered_index;
-        let timestamp = entry.updated_at().timestamp();
-        let thread_timestamp = format.format_timestamp(timestamp, self.local_timezone);
-
-        h_flex()
-            .w_full()
-            .pb_1()
-            .child(
-                ListItem::new(ix)
-                    .rounded()
-                    .toggle_state(selected)
-                    .spacing(ListItemSpacing::Sparse)
-                    .start_slot(
-                        h_flex()
-                            .w_full()
-                            .gap_2()
-                            .justify_between()
-                            .child(
-                                HighlightedLabel::new(entry.title(), highlight_positions)
-                                    .size(LabelSize::Small)
-                                    .truncate(),
-                            )
-                            .child(
-                                Label::new(thread_timestamp)
-                                    .color(Color::Muted)
-                                    .size(LabelSize::XSmall),
-                            ),
-                    )
-                    .on_hover(cx.listener(move |this, is_hovered, _window, cx| {
-                        if *is_hovered {
-                            this.hovered_index = Some(ix);
-                        } else if this.hovered_index == Some(ix) {
-                            this.hovered_index = None;
-                        }
-
-                        cx.notify();
-                    }))
-                    .end_slot::<IconButton>(if hovered {
-                        Some(
-                            IconButton::new("delete", IconName::Trash)
-                                .shape(IconButtonShape::Square)
-                                .icon_size(IconSize::XSmall)
-                                .icon_color(Color::Muted)
-                                .tooltip(move |_window, cx| {
-                                    Tooltip::for_action("Delete", &RemoveSelectedThread, cx)
-                                })
-                                .on_click(cx.listener(move |this, _, _, cx| {
-                                    this.remove_thread(ix, cx);
-                                    cx.stop_propagation()
-                                })),
-                        )
-                    } else {
-                        None
-                    })
-                    .on_click(cx.listener(move |this, _, _, cx| this.confirm_entry(ix, cx))),
-            )
-            .into_any_element()
-    }
-}
-
-impl Focusable for AcpThreadHistory {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        self.search_editor.focus_handle(cx)
-    }
-}
-
-impl Render for AcpThreadHistory {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let has_no_history = self.history_store.read(cx).is_empty(cx);
-
-        v_flex()
-            .key_context("ThreadHistory")
-            .size_full()
-            .bg(cx.theme().colors().panel_background)
-            .on_action(cx.listener(Self::select_previous))
-            .on_action(cx.listener(Self::select_next))
-            .on_action(cx.listener(Self::select_first))
-            .on_action(cx.listener(Self::select_last))
-            .on_action(cx.listener(Self::confirm))
-            .on_action(cx.listener(Self::remove_selected_thread))
-            .on_action(cx.listener(|this, _: &RemoveHistory, window, cx| {
-                this.remove_history(window, cx);
-            }))
-            .child(
-                h_flex()
-                    .h(Tab::container_height(cx))
-                    .w_full()
-                    .py_1()
-                    .px_2()
-                    .gap_2()
-                    .justify_between()
-                    .border_b_1()
-                    .border_color(cx.theme().colors().border)
-                    .child(
-                        Icon::new(IconName::MagnifyingGlass)
-                            .color(Color::Muted)
-                            .size(IconSize::Small),
-                    )
-                    .child(self.search_editor.clone()),
-            )
-            .child({
-                let view = v_flex()
-                    .id("list-container")
-                    .relative()
-                    .overflow_hidden()
-                    .flex_grow();
-
-                if has_no_history {
-                    view.justify_center().items_center().child(
-                        Label::new("You don't have any past threads yet.")
-                            .size(LabelSize::Small)
-                            .color(Color::Muted),
-                    )
-                } else if self.search_produced_no_matches() {
-                    view.justify_center()
-                        .items_center()
-                        .child(Label::new("No threads match your search.").size(LabelSize::Small))
-                } else {
-                    view.child(
-                        uniform_list(
-                            "thread-history",
-                            self.visible_items.len(),
-                            cx.processor(|this, range: Range<usize>, window, cx| {
-                                this.render_list_items(range, window, cx)
-                            }),
-                        )
-                        .p_1()
-                        .pr_4()
-                        .track_scroll(&self.scroll_handle)
-                        .flex_grow(),
-                    )
-                    .vertical_scrollbar_for(&self.scroll_handle, window, cx)
-                }
-            })
-            .when(!has_no_history, |this| {
-                this.child(
-                    h_flex()
-                        .p_2()
-                        .border_t_1()
-                        .border_color(cx.theme().colors().border_variant)
-                        .when(!self.confirming_delete_history, |this| {
-                            this.child(
-                                Button::new("delete_history", "Delete All History")
-                                    .full_width()
-                                    .style(ButtonStyle::Outlined)
-                                    .label_size(LabelSize::Small)
-                                    .on_click(cx.listener(|this, _, window, cx| {
-                                        this.prompt_delete_history(window, cx);
-                                    })),
-                            )
-                        })
-                        .when(self.confirming_delete_history, |this| {
-                            this.w_full()
-                                .gap_2()
-                                .flex_wrap()
-                                .justify_between()
-                                .child(
-                                    h_flex()
-                                        .flex_wrap()
-                                        .gap_1()
-                                        .child(
-                                            Label::new("Delete all threads?")
-                                                .size(LabelSize::Small),
-                                        )
-                                        .child(
-                                            Label::new("You won't be able to recover them later.")
-                                                .size(LabelSize::Small)
-                                                .color(Color::Muted),
-                                        ),
-                                )
-                                .child(
-                                    h_flex()
-                                        .gap_1()
-                                        .child(
-                                            Button::new("cancel_delete", "Cancel")
-                                                .label_size(LabelSize::Small)
-                                                .on_click(cx.listener(|this, _, window, cx| {
-                                                    this.cancel_delete_history(window, cx);
-                                                })),
-                                        )
-                                        .child(
-                                            Button::new("confirm_delete", "Delete")
-                                                .style(ButtonStyle::Tinted(ui::TintColor::Error))
-                                                .color(Color::Error)
-                                                .label_size(LabelSize::Small)
-                                                .on_click(cx.listener(|_, _, window, cx| {
-                                                    window.dispatch_action(
-                                                        Box::new(RemoveHistory),
-                                                        cx,
-                                                    );
-                                                })),
-                                        ),
-                                )
-                        }),
-                )
-            })
-    }
-}
-
-#[derive(IntoElement)]
-pub struct AcpHistoryEntryElement {
-    entry: HistoryEntry,
-    thread_view: WeakEntity<AcpThreadView>,
-    selected: bool,
-    hovered: bool,
-    on_hover: Box<dyn Fn(&bool, &mut Window, &mut App) + 'static>,
-}
-
-impl AcpHistoryEntryElement {
-    pub fn new(entry: HistoryEntry, thread_view: WeakEntity<AcpThreadView>) -> Self {
-        Self {
-            entry,
-            thread_view,
-            selected: false,
-            hovered: false,
-            on_hover: Box::new(|_, _, _| {}),
-        }
-    }
-
-    pub fn hovered(mut self, hovered: bool) -> Self {
-        self.hovered = hovered;
-        self
-    }
-
-    pub fn on_hover(mut self, on_hover: impl Fn(&bool, &mut Window, &mut App) + 'static) -> Self {
-        self.on_hover = Box::new(on_hover);
-        self
-    }
-}
-
-impl RenderOnce for AcpHistoryEntryElement {
-    fn render(self, _window: &mut Window, _cx: &mut App) -> impl IntoElement {
-        let id = self.entry.id();
-        let title = self.entry.title();
-        let timestamp = self.entry.updated_at();
-
-        let formatted_time = {
-            let now = chrono::Utc::now();
-            let duration = now.signed_duration_since(timestamp);
-
-            if duration.num_days() > 0 {
-                format!("{}d", duration.num_days())
-            } else if duration.num_hours() > 0 {
-                format!("{}h ago", duration.num_hours())
-            } else if duration.num_minutes() > 0 {
-                format!("{}m ago", duration.num_minutes())
-            } else {
-                "Just now".to_string()
-            }
-        };
-
-        ListItem::new(id)
-            .rounded()
-            .toggle_state(self.selected)
-            .spacing(ListItemSpacing::Sparse)
-            .start_slot(
-                h_flex()
-                    .w_full()
-                    .gap_2()
-                    .justify_between()
-                    .child(Label::new(title).size(LabelSize::Small).truncate())
-                    .child(
-                        Label::new(formatted_time)
-                            .color(Color::Muted)
-                            .size(LabelSize::XSmall),
-                    ),
-            )
-            .on_hover(self.on_hover)
-            .end_slot::<IconButton>(if self.hovered || self.selected {
-                Some(
-                    IconButton::new("delete", IconName::Trash)
-                        .shape(IconButtonShape::Square)
-                        .icon_size(IconSize::XSmall)
-                        .icon_color(Color::Muted)
-                        .tooltip(move |_window, cx| {
-                            Tooltip::for_action("Delete", &RemoveSelectedThread, cx)
-                        })
-                        .on_click({
-                            let thread_view = self.thread_view.clone();
-                            let entry = self.entry.clone();
-
-                            move |_event, _window, cx| {
-                                if let Some(thread_view) = thread_view.upgrade() {
-                                    thread_view.update(cx, |thread_view, cx| {
-                                        thread_view.delete_history_entry(entry.clone(), cx);
-                                    });
-                                }
-                            }
-                        }),
-                )
-            } else {
-                None
-            })
-            .on_click({
-                let thread_view = self.thread_view.clone();
-                let entry = self.entry;
-
-                move |_event, window, cx| {
-                    if let Some(workspace) = thread_view
-                        .upgrade()
-                        .and_then(|view| view.read(cx).workspace().upgrade())
-                    {
-                        match &entry {
-                            HistoryEntry::AcpThread(thread_metadata) => {
-                                if let Some(panel) = workspace.read(cx).panel::<AgentPanel>(cx) {
-                                    panel.update(cx, |panel, cx| {
-                                        panel.load_agent_thread(
-                                            thread_metadata.clone(),
-                                            window,
-                                            cx,
-                                        );
-                                    });
-                                }
-                            }
-                            HistoryEntry::TextThread(text_thread) => {
-                                if let Some(panel) = workspace.read(cx).panel::<AgentPanel>(cx) {
-                                    panel.update(cx, |panel, cx| {
-                                        panel
-                                            .open_saved_text_thread(
-                                                text_thread.path.clone(),
-                                                window,
-                                                cx,
-                                            )
-                                            .detach_and_log_err(cx);
-                                    });
-                                }
-                            }
-                        }
-                    }
-                }
-            })
-    }
-}
-
-#[derive(Clone, Copy)]
-pub enum EntryTimeFormat {
-    DateAndTime,
-    TimeOnly,
-}
-
-impl EntryTimeFormat {
-    fn format_timestamp(&self, timestamp: i64, timezone: UtcOffset) -> String {
-        let timestamp = OffsetDateTime::from_unix_timestamp(timestamp).unwrap();
-
-        match self {
-            EntryTimeFormat::DateAndTime => time_format::format_localized_timestamp(
-                timestamp,
-                OffsetDateTime::now_utc(),
-                timezone,
-                time_format::TimestampFormat::EnhancedAbsolute,
-            ),
-            EntryTimeFormat::TimeOnly => time_format::format_time(timestamp.to_offset(timezone)),
-        }
-    }
-}
-
-impl From<TimeBucket> for EntryTimeFormat {
-    fn from(bucket: TimeBucket) -> Self {
-        match bucket {
-            TimeBucket::Today => EntryTimeFormat::TimeOnly,
-            TimeBucket::Yesterday => EntryTimeFormat::TimeOnly,
-            TimeBucket::ThisWeek => EntryTimeFormat::DateAndTime,
-            TimeBucket::PastWeek => EntryTimeFormat::DateAndTime,
-            TimeBucket::All => EntryTimeFormat::DateAndTime,
-        }
-    }
-}
-
-#[derive(PartialEq, Eq, Clone, Copy, Debug)]
-enum TimeBucket {
-    Today,
-    Yesterday,
-    ThisWeek,
-    PastWeek,
-    All,
-}
-
-impl TimeBucket {
-    fn from_dates(reference: NaiveDate, date: NaiveDate) -> Self {
-        if date == reference {
-            return TimeBucket::Today;
-        }
-
-        if date == reference - TimeDelta::days(1) {
-            return TimeBucket::Yesterday;
-        }
-
-        let week = date.iso_week();
-
-        if reference.iso_week() == week {
-            return TimeBucket::ThisWeek;
-        }
-
-        let last_week = (reference - TimeDelta::days(7)).iso_week();
-
-        if week == last_week {
-            return TimeBucket::PastWeek;
-        }
-
-        TimeBucket::All
-    }
-}
-
-impl Display for TimeBucket {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            TimeBucket::Today => write!(f, "Today"),
-            TimeBucket::Yesterday => write!(f, "Yesterday"),
-            TimeBucket::ThisWeek => write!(f, "This Week"),
-            TimeBucket::PastWeek => write!(f, "Past Week"),
-            TimeBucket::All => write!(f, "All"),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use chrono::NaiveDate;
-
-    #[test]
-    fn test_time_bucket_from_dates() {
-        let today = NaiveDate::from_ymd_opt(2023, 1, 15).unwrap();
-
-        let date = today;
-        assert_eq!(TimeBucket::from_dates(today, date), TimeBucket::Today);
-
-        let date = NaiveDate::from_ymd_opt(2023, 1, 14).unwrap();
-        assert_eq!(TimeBucket::from_dates(today, date), TimeBucket::Yesterday);
-
-        let date = NaiveDate::from_ymd_opt(2023, 1, 13).unwrap();
-        assert_eq!(TimeBucket::from_dates(today, date), TimeBucket::ThisWeek);
-
-        let date = NaiveDate::from_ymd_opt(2023, 1, 11).unwrap();
-        assert_eq!(TimeBucket::from_dates(today, date), TimeBucket::ThisWeek);
-
-        let date = NaiveDate::from_ymd_opt(2023, 1, 8).unwrap();
-        assert_eq!(TimeBucket::from_dates(today, date), TimeBucket::PastWeek);
-
-        let date = NaiveDate::from_ymd_opt(2023, 1, 5).unwrap();
-        assert_eq!(TimeBucket::from_dates(today, date), TimeBucket::PastWeek);
-
-        // All: not in this week or last week
-        let date = NaiveDate::from_ymd_opt(2023, 1, 1).unwrap();
-        assert_eq!(TimeBucket::from_dates(today, date), TimeBucket::All);
-
-        // Test year boundary cases
-        let new_year = NaiveDate::from_ymd_opt(2023, 1, 1).unwrap();
-
-        let date = NaiveDate::from_ymd_opt(2022, 12, 31).unwrap();
-        assert_eq!(
-            TimeBucket::from_dates(new_year, date),
-            TimeBucket::Yesterday
-        );
-
-        let date = NaiveDate::from_ymd_opt(2022, 12, 28).unwrap();
-        assert_eq!(TimeBucket::from_dates(new_year, date), TimeBucket::ThisWeek);
-    }
-}
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
deleted file mode 100644
index 63ea9eb279..0000000000
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ /dev/null
@@ -1,7296 +0,0 @@
-use acp_thread::{
-    AcpThread, AcpThreadEvent, AgentThreadEntry, AssistantMessage, AssistantMessageChunk,
-    AuthRequired, LoadError, MentionUri, RetryStatus, ThreadStatus, ToolCall, ToolCallContent,
-    ToolCallStatus, UserMessageId,
-};
-use acp_thread::{AgentConnection, Plan};
-use action_log::{ActionLog, ActionLogTelemetry};
-use agent::{DbThreadMetadata, HistoryEntry, HistoryEntryId, HistoryStore, NativeAgentServer};
-use agent_client_protocol::{self as acp, PromptCapabilities};
-use agent_servers::{AgentServer, AgentServerDelegate};
-use agent_settings::{AgentProfileId, AgentSettings, CompletionMode};
-use anyhow::{Result, anyhow};
-use arrayvec::ArrayVec;
-use audio::{Audio, Sound};
-use buffer_diff::BufferDiff;
-use client::zed_urls;
-use cloud_llm_client::PlanV1;
-use collections::{HashMap, HashSet};
-use editor::scroll::Autoscroll;
-use editor::{
-    Editor, EditorEvent, EditorMode, MultiBuffer, PathKey, SelectionEffects, SizingBehavior,
-};
-use file_icons::FileIcons;
-use fs::Fs;
-use futures::FutureExt as _;
-use gpui::{
-    Action, Animation, AnimationExt, AnyView, App, BorderStyle, ClickEvent, ClipboardItem,
-    CursorStyle, EdgesRefinement, ElementId, Empty, Entity, FocusHandle, Focusable, Hsla, Length,
-    ListOffset, ListState, PlatformDisplay, SharedString, StyleRefinement, Subscription, Task,
-    TextStyle, TextStyleRefinement, UnderlineStyle, WeakEntity, Window, WindowHandle, div,
-    ease_in_out, linear_color_stop, linear_gradient, list, point, pulsating_between,
-};
-use language::Buffer;
-
-use language_model::LanguageModelRegistry;
-use markdown::{HeadingLevelStyles, Markdown, MarkdownElement, MarkdownStyle};
-use project::{Project, ProjectEntryId};
-use prompt_store::{PromptId, PromptStore};
-use rope::Point;
-use settings::{NotifyWhenAgentWaiting, Settings as _, SettingsStore};
-use std::cell::RefCell;
-use std::path::Path;
-use std::sync::Arc;
-use std::time::Instant;
-use std::{collections::BTreeMap, rc::Rc, time::Duration};
-use terminal_view::terminal_panel::TerminalPanel;
-use text::Anchor;
-use theme::{AgentFontSize, ThemeSettings};
-use ui::{
-    Callout, CommonAnimationExt, Disclosure, Divider, DividerColor, ElevationIndex, KeyBinding,
-    PopoverMenuHandle, SpinnerLabel, TintColor, Tooltip, WithScrollbar, prelude::*,
-};
-use util::{ResultExt, size::format_file_size, time::duration_alt_display};
-use workspace::{CollaboratorId, NewTerminal, Workspace};
-use zed_actions::agent::{Chat, ToggleModelSelector};
-use zed_actions::assistant::OpenRulesLibrary;
-
-use super::entry_view_state::EntryViewState;
-use crate::acp::AcpModelSelectorPopover;
-use crate::acp::ModeSelector;
-use crate::acp::entry_view_state::{EntryViewEvent, ViewEvent};
-use crate::acp::message_editor::{MessageEditor, MessageEditorEvent};
-use crate::agent_diff::AgentDiff;
-use crate::profile_selector::{ProfileProvider, ProfileSelector};
-
-use crate::ui::{
-    AgentNotification, AgentNotificationEvent, BurnModeTooltip, UnavailableEditingTooltip,
-    UsageCallout,
-};
-use crate::{
-    AgentDiffPane, AgentPanel, AllowAlways, AllowOnce, ContinueThread, ContinueWithBurnMode,
-    CycleModeSelector, ExpandMessageEditor, Follow, KeepAll, NewThread, OpenAgentDiff, OpenHistory,
-    RejectAll, RejectOnce, ToggleBurnMode, ToggleProfileSelector,
-};
-
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-enum ThreadFeedback {
-    Positive,
-    Negative,
-}
-
-#[derive(Debug)]
-enum ThreadError {
-    PaymentRequired,
-    ModelRequestLimitReached(cloud_llm_client::Plan),
-    ToolUseLimitReached,
-    Refusal,
-    AuthenticationRequired(SharedString),
-    Other(SharedString),
-}
-
-impl ThreadError {
-    fn from_err(error: anyhow::Error, agent: &Rc<dyn AgentServer>) -> Self {
-        if error.is::<language_model::PaymentRequiredError>() {
-            Self::PaymentRequired
-        } else if error.is::<language_model::ToolUseLimitReachedError>() {
-            Self::ToolUseLimitReached
-        } else if let Some(error) =
-            error.downcast_ref::<language_model::ModelRequestLimitReachedError>()
-        {
-            Self::ModelRequestLimitReached(error.plan)
-        } else if let Some(acp_error) = error.downcast_ref::<acp::Error>()
-            && acp_error.code == acp::ErrorCode::AuthRequired
-        {
-            Self::AuthenticationRequired(acp_error.message.clone().into())
-        } else {
-            let string = format!("{:#}", error);
-            // TODO: we should have Gemini return better errors here.
-            if agent.clone().downcast::<agent_servers::Gemini>().is_some()
-                && string.contains("Could not load the default credentials")
-                || string.contains("API key not valid")
-                || string.contains("Request had invalid authentication credentials")
-            {
-                Self::AuthenticationRequired(string.into())
-            } else {
-                Self::Other(string.into())
-            }
-        }
-    }
-}
-
-impl ProfileProvider for Entity<agent::Thread> {
-    fn profile_id(&self, cx: &App) -> AgentProfileId {
-        self.read(cx).profile().clone()
-    }
-
-    fn set_profile(&self, profile_id: AgentProfileId, cx: &mut App) {
-        self.update(cx, |thread, cx| {
-            // Apply the profile and let the thread swap to its default model.
-            thread.set_profile(profile_id, cx);
-        });
-    }
-
-    fn profiles_supported(&self, cx: &App) -> bool {
-        self.read(cx)
-            .model()
-            .is_some_and(|model| model.supports_tools())
-    }
-}
-
-#[derive(Default)]
-struct ThreadFeedbackState {
-    feedback: Option<ThreadFeedback>,
-    comments_editor: Option<Entity<Editor>>,
-}
-
-impl ThreadFeedbackState {
-    pub fn submit(
-        &mut self,
-        thread: Entity<AcpThread>,
-        feedback: ThreadFeedback,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        let Some(telemetry) = thread.read(cx).connection().telemetry() else {
-            return;
-        };
-
-        if self.feedback == Some(feedback) {
-            return;
-        }
-
-        self.feedback = Some(feedback);
-        match feedback {
-            ThreadFeedback::Positive => {
-                self.comments_editor = None;
-            }
-            ThreadFeedback::Negative => {
-                self.comments_editor = Some(Self::build_feedback_comments_editor(window, cx));
-            }
-        }
-        let session_id = thread.read(cx).session_id().clone();
-        let agent_telemetry_id = thread.read(cx).connection().telemetry_id();
-        let task = telemetry.thread_data(&session_id, cx);
-        let rating = match feedback {
-            ThreadFeedback::Positive => "positive",
-            ThreadFeedback::Negative => "negative",
-        };
-        cx.background_spawn(async move {
-            let thread = task.await?;
-            telemetry::event!(
-                "Agent Thread Rated",
-                agent = agent_telemetry_id,
-                session_id = session_id,
-                rating = rating,
-                thread = thread
-            );
-            anyhow::Ok(())
-        })
-        .detach_and_log_err(cx);
-    }
-
-    pub fn submit_comments(&mut self, thread: Entity<AcpThread>, cx: &mut App) {
-        let Some(telemetry) = thread.read(cx).connection().telemetry() else {
-            return;
-        };
-
-        let Some(comments) = self
-            .comments_editor
-            .as_ref()
-            .map(|editor| editor.read(cx).text(cx))
-            .filter(|text| !text.trim().is_empty())
-        else {
-            return;
-        };
-
-        self.comments_editor.take();
-
-        let session_id = thread.read(cx).session_id().clone();
-        let agent_telemetry_id = thread.read(cx).connection().telemetry_id();
-        let task = telemetry.thread_data(&session_id, cx);
-        cx.background_spawn(async move {
-            let thread = task.await?;
-            telemetry::event!(
-                "Agent Thread Feedback Comments",
-                agent = agent_telemetry_id,
-                session_id = session_id,
-                comments = comments,
-                thread = thread
-            );
-            anyhow::Ok(())
-        })
-        .detach_and_log_err(cx);
-    }
-
-    pub fn clear(&mut self) {
-        *self = Self::default()
-    }
-
-    pub fn dismiss_comments(&mut self) {
-        self.comments_editor.take();
-    }
-
-    fn build_feedback_comments_editor(window: &mut Window, cx: &mut App) -> Entity<Editor> {
-        let buffer = cx.new(|cx| {
-            let empty_string = String::new();
-            MultiBuffer::singleton(cx.new(|cx| Buffer::local(empty_string, cx)), cx)
-        });
-
-        let editor = cx.new(|cx| {
-            let mut editor = Editor::new(
-                editor::EditorMode::AutoHeight {
-                    min_lines: 1,
-                    max_lines: Some(4),
-                },
-                buffer,
-                None,
-                window,
-                cx,
-            );
-            editor.set_placeholder_text(
-                "What went wrong? Share your feedback so we can improve.",
-                window,
-                cx,
-            );
-            editor
-        });
-
-        editor.read(cx).focus_handle(cx).focus(window);
-        editor
-    }
-}
-
-pub struct AcpThreadView {
-    agent: Rc<dyn AgentServer>,
-    workspace: WeakEntity<Workspace>,
-    project: Entity<Project>,
-    thread_state: ThreadState,
-    login: Option<task::SpawnInTerminal>,
-    history_store: Entity<HistoryStore>,
-    hovered_recent_history_item: Option<usize>,
-    entry_view_state: Entity<EntryViewState>,
-    message_editor: Entity<MessageEditor>,
-    focus_handle: FocusHandle,
-    model_selector: Option<Entity<AcpModelSelectorPopover>>,
-    profile_selector: Option<Entity<ProfileSelector>>,
-    notifications: Vec<WindowHandle<AgentNotification>>,
-    notification_subscriptions: HashMap<WindowHandle<AgentNotification>, Vec<Subscription>>,
-    thread_retry_status: Option<RetryStatus>,
-    thread_error: Option<ThreadError>,
-    thread_error_markdown: Option<Entity<Markdown>>,
-    thread_feedback: ThreadFeedbackState,
-    list_state: ListState,
-    auth_task: Option<Task<()>>,
-    expanded_tool_calls: HashSet<acp::ToolCallId>,
-    expanded_thinking_blocks: HashSet<(usize, usize)>,
-    edits_expanded: bool,
-    plan_expanded: bool,
-    editor_expanded: bool,
-    should_be_following: bool,
-    editing_message: Option<usize>,
-    prompt_capabilities: Rc<RefCell<PromptCapabilities>>,
-    available_commands: Rc<RefCell<Vec<acp::AvailableCommand>>>,
-    is_loading_contents: bool,
-    new_server_version_available: Option<SharedString>,
-    resume_thread_metadata: Option<DbThreadMetadata>,
-    _cancel_task: Option<Task<()>>,
-    _subscriptions: [Subscription; 5],
-    show_codex_windows_warning: bool,
-    in_flight_prompt: Option<Vec<acp::ContentBlock>>,
-}
-
-enum ThreadState {
-    Loading(Entity<LoadingView>),
-    Ready {
-        thread: Entity<AcpThread>,
-        title_editor: Option<Entity<Editor>>,
-        mode_selector: Option<Entity<ModeSelector>>,
-        _subscriptions: Vec<Subscription>,
-    },
-    LoadError(LoadError),
-    Unauthenticated {
-        connection: Rc<dyn AgentConnection>,
-        description: Option<Entity<Markdown>>,
-        configuration_view: Option<AnyView>,
-        pending_auth_method: Option<acp::AuthMethodId>,
-        _subscription: Option<Subscription>,
-    },
-}
-
-struct LoadingView {
-    title: SharedString,
-    _load_task: Task<()>,
-    _update_title_task: Task<anyhow::Result<()>>,
-}
-
-impl AcpThreadView {
-    pub fn new(
-        agent: Rc<dyn AgentServer>,
-        resume_thread: Option<DbThreadMetadata>,
-        summarize_thread: Option<DbThreadMetadata>,
-        workspace: WeakEntity<Workspace>,
-        project: Entity<Project>,
-        history_store: Entity<HistoryStore>,
-        prompt_store: Option<Entity<PromptStore>>,
-        track_load_event: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let prompt_capabilities = Rc::new(RefCell::new(acp::PromptCapabilities::default()));
-        let available_commands = Rc::new(RefCell::new(vec![]));
-
-        let placeholder = placeholder_text(agent.name().as_ref(), false);
-
-        let message_editor = cx.new(|cx| {
-            let mut editor = MessageEditor::new(
-                workspace.clone(),
-                project.downgrade(),
-                history_store.clone(),
-                prompt_store.clone(),
-                prompt_capabilities.clone(),
-                available_commands.clone(),
-                agent.name(),
-                &placeholder,
-                editor::EditorMode::AutoHeight {
-                    min_lines: AgentSettings::get_global(cx).message_editor_min_lines,
-                    max_lines: Some(AgentSettings::get_global(cx).set_message_editor_max_lines()),
-                },
-                window,
-                cx,
-            );
-            if let Some(entry) = summarize_thread {
-                editor.insert_thread_summary(entry, window, cx);
-            }
-            editor
-        });
-
-        let list_state = ListState::new(0, gpui::ListAlignment::Bottom, px(2048.0));
-
-        let entry_view_state = cx.new(|_| {
-            EntryViewState::new(
-                workspace.clone(),
-                project.downgrade(),
-                history_store.clone(),
-                prompt_store.clone(),
-                prompt_capabilities.clone(),
-                available_commands.clone(),
-                agent.name(),
-            )
-        });
-
-        let agent_server_store = project.read(cx).agent_server_store().clone();
-        let subscriptions = [
-            cx.observe_global_in::<SettingsStore>(window, Self::agent_ui_font_size_changed),
-            cx.observe_global_in::<AgentFontSize>(window, Self::agent_ui_font_size_changed),
-            cx.subscribe_in(&message_editor, window, Self::handle_message_editor_event),
-            cx.subscribe_in(&entry_view_state, window, Self::handle_entry_view_event),
-            cx.subscribe_in(
-                &agent_server_store,
-                window,
-                Self::handle_agent_servers_updated,
-            ),
-        ];
-
-        let show_codex_windows_warning = cfg!(windows)
-            && project.read(cx).is_local()
-            && agent.clone().downcast::<agent_servers::Codex>().is_some();
-
-        Self {
-            agent: agent.clone(),
-            workspace: workspace.clone(),
-            project: project.clone(),
-            entry_view_state,
-            thread_state: Self::initial_state(
-                agent.clone(),
-                resume_thread.clone(),
-                workspace.clone(),
-                project.clone(),
-                track_load_event,
-                window,
-                cx,
-            ),
-            login: None,
-            message_editor,
-            model_selector: None,
-            profile_selector: None,
-
-            notifications: Vec::new(),
-            notification_subscriptions: HashMap::default(),
-            list_state: list_state,
-            thread_retry_status: None,
-            thread_error: None,
-            thread_error_markdown: None,
-            thread_feedback: Default::default(),
-            auth_task: None,
-            expanded_tool_calls: HashSet::default(),
-            expanded_thinking_blocks: HashSet::default(),
-            editing_message: None,
-            edits_expanded: false,
-            plan_expanded: false,
-            prompt_capabilities,
-            available_commands,
-            editor_expanded: false,
-            should_be_following: false,
-            history_store,
-            hovered_recent_history_item: None,
-            is_loading_contents: false,
-            _subscriptions: subscriptions,
-            _cancel_task: None,
-            focus_handle: cx.focus_handle(),
-            new_server_version_available: None,
-            resume_thread_metadata: resume_thread,
-            show_codex_windows_warning,
-            in_flight_prompt: None,
-        }
-    }
-
-    fn reset(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.thread_state = Self::initial_state(
-            self.agent.clone(),
-            self.resume_thread_metadata.clone(),
-            self.workspace.clone(),
-            self.project.clone(),
-            true,
-            window,
-            cx,
-        );
-        self.available_commands.replace(vec![]);
-        self.new_server_version_available.take();
-        cx.notify();
-    }
-
-    fn initial_state(
-        agent: Rc<dyn AgentServer>,
-        resume_thread: Option<DbThreadMetadata>,
-        workspace: WeakEntity<Workspace>,
-        project: Entity<Project>,
-        track_load_event: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> ThreadState {
-        if project.read(cx).is_via_collab()
-            && agent.clone().downcast::<NativeAgentServer>().is_none()
-        {
-            return ThreadState::LoadError(LoadError::Other(
-                "External agents are not yet supported in shared projects.".into(),
-            ));
-        }
-        let mut worktrees = project.read(cx).visible_worktrees(cx).collect::<Vec<_>>();
-        // Pick the first non-single-file worktree for the root directory if there are any,
-        // and otherwise the parent of a single-file worktree, falling back to $HOME if there are no visible worktrees.
-        worktrees.sort_by(|l, r| {
-            l.read(cx)
-                .is_single_file()
-                .cmp(&r.read(cx).is_single_file())
-        });
-        let root_dir = worktrees
-            .into_iter()
-            .filter_map(|worktree| {
-                if worktree.read(cx).is_single_file() {
-                    Some(worktree.read(cx).abs_path().parent()?.into())
-                } else {
-                    Some(worktree.read(cx).abs_path())
-                }
-            })
-            .next();
-        let (status_tx, mut status_rx) = watch::channel("Loading…".into());
-        let (new_version_available_tx, mut new_version_available_rx) = watch::channel(None);
-        let delegate = AgentServerDelegate::new(
-            project.read(cx).agent_server_store().clone(),
-            project.clone(),
-            Some(status_tx),
-            Some(new_version_available_tx),
-        );
-
-        let connect_task = agent.connect(root_dir.as_deref(), delegate, cx);
-        let load_task = cx.spawn_in(window, async move |this, cx| {
-            let connection = match connect_task.await {
-                Ok((connection, login)) => {
-                    this.update(cx, |this, _| this.login = login).ok();
-                    connection
-                }
-                Err(err) => {
-                    this.update_in(cx, |this, window, cx| {
-                        if err.downcast_ref::<LoadError>().is_some() {
-                            this.handle_load_error(err, window, cx);
-                        } else {
-                            this.handle_thread_error(err, cx);
-                        }
-                        cx.notify();
-                    })
-                    .log_err();
-                    return;
-                }
-            };
-
-            if track_load_event {
-                telemetry::event!("Agent Thread Started", agent = connection.telemetry_id());
-            }
-
-            let result = if let Some(native_agent) = connection
-                .clone()
-                .downcast::<agent::NativeAgentConnection>()
-                && let Some(resume) = resume_thread.clone()
-            {
-                cx.update(|_, cx| {
-                    native_agent
-                        .0
-                        .update(cx, |agent, cx| agent.open_thread(resume.id, cx))
-                })
-                .log_err()
-            } else {
-                let root_dir = root_dir.unwrap_or(paths::home_dir().as_path().into());
-                cx.update(|_, cx| {
-                    connection
-                        .clone()
-                        .new_thread(project.clone(), &root_dir, cx)
-                })
-                .log_err()
-            };
-
-            let Some(result) = result else {
-                return;
-            };
-
-            let result = match result.await {
-                Err(e) => match e.downcast::<acp_thread::AuthRequired>() {
-                    Ok(err) => {
-                        cx.update(|window, cx| {
-                            Self::handle_auth_required(this, err, agent, connection, window, cx)
-                        })
-                        .log_err();
-                        return;
-                    }
-                    Err(err) => Err(err),
-                },
-                Ok(thread) => Ok(thread),
-            };
-
-            this.update_in(cx, |this, window, cx| {
-                match result {
-                    Ok(thread) => {
-                        let action_log = thread.read(cx).action_log().clone();
-
-                        this.prompt_capabilities
-                            .replace(thread.read(cx).prompt_capabilities());
-
-                        let count = thread.read(cx).entries().len();
-                        this.entry_view_state.update(cx, |view_state, cx| {
-                            for ix in 0..count {
-                                view_state.sync_entry(ix, &thread, window, cx);
-                            }
-                            this.list_state.splice_focusable(
-                                0..0,
-                                (0..count).map(|ix| view_state.entry(ix)?.focus_handle(cx)),
-                            );
-                        });
-
-                        if let Some(resume) = resume_thread {
-                            this.history_store.update(cx, |history, cx| {
-                                history.push_recently_opened_entry(
-                                    HistoryEntryId::AcpThread(resume.id),
-                                    cx,
-                                );
-                            });
-                        }
-
-                        AgentDiff::set_active_thread(&workspace, thread.clone(), window, cx);
-
-                        this.model_selector = thread
-                            .read(cx)
-                            .connection()
-                            .model_selector(thread.read(cx).session_id())
-                            .map(|selector| {
-                                let agent_server = this.agent.clone();
-                                let fs = this.project.read(cx).fs().clone();
-                                cx.new(|cx| {
-                                    AcpModelSelectorPopover::new(
-                                        selector,
-                                        agent_server,
-                                        fs,
-                                        PopoverMenuHandle::default(),
-                                        this.focus_handle(cx),
-                                        window,
-                                        cx,
-                                    )
-                                })
-                            });
-
-                        let mode_selector = thread
-                            .read(cx)
-                            .connection()
-                            .session_modes(thread.read(cx).session_id(), cx)
-                            .map(|session_modes| {
-                                let fs = this.project.read(cx).fs().clone();
-                                let focus_handle = this.focus_handle(cx);
-                                cx.new(|_cx| {
-                                    ModeSelector::new(
-                                        session_modes,
-                                        this.agent.clone(),
-                                        fs,
-                                        focus_handle,
-                                    )
-                                })
-                            });
-
-                        let mut subscriptions = vec![
-                            cx.subscribe_in(&thread, window, Self::handle_thread_event),
-                            cx.observe(&action_log, |_, _, cx| cx.notify()),
-                        ];
-
-                        let title_editor =
-                            if thread.update(cx, |thread, cx| thread.can_set_title(cx)) {
-                                let editor = cx.new(|cx| {
-                                    let mut editor = Editor::single_line(window, cx);
-                                    editor.set_text(thread.read(cx).title(), window, cx);
-                                    editor
-                                });
-                                subscriptions.push(cx.subscribe_in(
-                                    &editor,
-                                    window,
-                                    Self::handle_title_editor_event,
-                                ));
-                                Some(editor)
-                            } else {
-                                None
-                            };
-
-                        this.thread_state = ThreadState::Ready {
-                            thread,
-                            title_editor,
-                            mode_selector,
-                            _subscriptions: subscriptions,
-                        };
-
-                        this.profile_selector = this.as_native_thread(cx).map(|thread| {
-                            cx.new(|cx| {
-                                ProfileSelector::new(
-                                    <dyn Fs>::global(cx),
-                                    Arc::new(thread.clone()),
-                                    this.focus_handle(cx),
-                                    cx,
-                                )
-                            })
-                        });
-
-                        this.message_editor.focus_handle(cx).focus(window);
-
-                        cx.notify();
-                    }
-                    Err(err) => {
-                        this.handle_load_error(err, window, cx);
-                    }
-                };
-            })
-            .log_err();
-        });
-
-        cx.spawn(async move |this, cx| {
-            while let Ok(new_version) = new_version_available_rx.recv().await {
-                if let Some(new_version) = new_version {
-                    this.update(cx, |this, cx| {
-                        this.new_server_version_available = Some(new_version.into());
-                        cx.notify();
-                    })
-                    .log_err();
-                }
-            }
-        })
-        .detach();
-
-        let loading_view = cx.new(|cx| {
-            let update_title_task = cx.spawn(async move |this, cx| {
-                loop {
-                    let status = status_rx.recv().await?;
-                    this.update(cx, |this: &mut LoadingView, cx| {
-                        this.title = status;
-                        cx.notify();
-                    })?;
-                }
-            });
-
-            LoadingView {
-                title: "Loading…".into(),
-                _load_task: load_task,
-                _update_title_task: update_title_task,
-            }
-        });
-
-        ThreadState::Loading(loading_view)
-    }
-
-    fn handle_auth_required(
-        this: WeakEntity<Self>,
-        err: AuthRequired,
-        agent: Rc<dyn AgentServer>,
-        connection: Rc<dyn AgentConnection>,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        let agent_name = agent.name();
-        let (configuration_view, subscription) = if let Some(provider_id) = err.provider_id {
-            let registry = LanguageModelRegistry::global(cx);
-
-            let sub = window.subscribe(&registry, cx, {
-                let provider_id = provider_id.clone();
-                let this = this.clone();
-                move |_, ev, window, cx| {
-                    if let language_model::Event::ProviderStateChanged(updated_provider_id) = &ev
-                        && &provider_id == updated_provider_id
-                        && LanguageModelRegistry::global(cx)
-                            .read(cx)
-                            .provider(&provider_id)
-                            .map_or(false, |provider| provider.is_authenticated(cx))
-                    {
-                        this.update(cx, |this, cx| {
-                            this.reset(window, cx);
-                        })
-                        .ok();
-                    }
-                }
-            });
-
-            let view = registry.read(cx).provider(&provider_id).map(|provider| {
-                provider.configuration_view(
-                    language_model::ConfigurationViewTargetAgent::Other(agent_name.clone()),
-                    window,
-                    cx,
-                )
-            });
-
-            (view, Some(sub))
-        } else {
-            (None, None)
-        };
-
-        this.update(cx, |this, cx| {
-            this.thread_state = ThreadState::Unauthenticated {
-                pending_auth_method: None,
-                connection,
-                configuration_view,
-                description: err
-                    .description
-                    .clone()
-                    .map(|desc| cx.new(|cx| Markdown::new(desc.into(), None, None, cx))),
-                _subscription: subscription,
-            };
-            if this.message_editor.focus_handle(cx).is_focused(window) {
-                this.focus_handle.focus(window)
-            }
-            cx.notify();
-        })
-        .ok();
-    }
-
-    fn handle_load_error(
-        &mut self,
-        err: anyhow::Error,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(load_err) = err.downcast_ref::<LoadError>() {
-            self.thread_state = ThreadState::LoadError(load_err.clone());
-        } else {
-            self.thread_state =
-                ThreadState::LoadError(LoadError::Other(format!("{:#}", err).into()))
-        }
-        if self.message_editor.focus_handle(cx).is_focused(window) {
-            self.focus_handle.focus(window)
-        }
-        cx.notify();
-    }
-
-    fn handle_agent_servers_updated(
-        &mut self,
-        _agent_server_store: &Entity<project::AgentServerStore>,
-        _event: &project::AgentServersUpdated,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        // If we're in a LoadError state OR have a thread_error set (which can happen
-        // when agent.connect() fails during loading), retry loading the thread.
-        // This handles the case where a thread is restored before authentication completes.
-        let should_retry =
-            matches!(&self.thread_state, ThreadState::LoadError(_)) || self.thread_error.is_some();
-
-        if should_retry {
-            self.thread_error = None;
-            self.thread_error_markdown = None;
-            self.reset(window, cx);
-        }
-    }
-
-    pub fn workspace(&self) -> &WeakEntity<Workspace> {
-        &self.workspace
-    }
-
-    pub fn thread(&self) -> Option<&Entity<AcpThread>> {
-        match &self.thread_state {
-            ThreadState::Ready { thread, .. } => Some(thread),
-            ThreadState::Unauthenticated { .. }
-            | ThreadState::Loading { .. }
-            | ThreadState::LoadError { .. } => None,
-        }
-    }
-
-    pub fn mode_selector(&self) -> Option<&Entity<ModeSelector>> {
-        match &self.thread_state {
-            ThreadState::Ready { mode_selector, .. } => mode_selector.as_ref(),
-            ThreadState::Unauthenticated { .. }
-            | ThreadState::Loading { .. }
-            | ThreadState::LoadError { .. } => None,
-        }
-    }
-
-    pub fn title(&self, cx: &App) -> SharedString {
-        match &self.thread_state {
-            ThreadState::Ready { .. } | ThreadState::Unauthenticated { .. } => "New Thread".into(),
-            ThreadState::Loading(loading_view) => loading_view.read(cx).title.clone(),
-            ThreadState::LoadError(error) => match error {
-                LoadError::Unsupported { .. } => format!("Upgrade {}", self.agent.name()).into(),
-                LoadError::FailedToInstall(_) => {
-                    format!("Failed to Install {}", self.agent.name()).into()
-                }
-                LoadError::Exited { .. } => format!("{} Exited", self.agent.name()).into(),
-                LoadError::Other(_) => format!("Error Loading {}", self.agent.name()).into(),
-            },
-        }
-    }
-
-    pub fn title_editor(&self) -> Option<Entity<Editor>> {
-        if let ThreadState::Ready { title_editor, .. } = &self.thread_state {
-            title_editor.clone()
-        } else {
-            None
-        }
-    }
-
-    pub fn cancel_generation(&mut self, cx: &mut Context<Self>) {
-        self.thread_error.take();
-        self.thread_retry_status.take();
-
-        if let Some(thread) = self.thread() {
-            self._cancel_task = Some(thread.update(cx, |thread, cx| thread.cancel(cx)));
-        }
-    }
-
-    pub fn expand_message_editor(
-        &mut self,
-        _: &ExpandMessageEditor,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.set_editor_is_expanded(!self.editor_expanded, cx);
-        cx.stop_propagation();
-        cx.notify();
-    }
-
-    fn set_editor_is_expanded(&mut self, is_expanded: bool, cx: &mut Context<Self>) {
-        self.editor_expanded = is_expanded;
-        self.message_editor.update(cx, |editor, cx| {
-            if is_expanded {
-                editor.set_mode(
-                    EditorMode::Full {
-                        scale_ui_elements_with_buffer_font_size: false,
-                        show_active_line_background: false,
-                        sizing_behavior: SizingBehavior::ExcludeOverscrollMargin,
-                    },
-                    cx,
-                )
-            } else {
-                let agent_settings = AgentSettings::get_global(cx);
-                editor.set_mode(
-                    EditorMode::AutoHeight {
-                        min_lines: agent_settings.message_editor_min_lines,
-                        max_lines: Some(agent_settings.set_message_editor_max_lines()),
-                    },
-                    cx,
-                )
-            }
-        });
-        cx.notify();
-    }
-
-    pub fn handle_title_editor_event(
-        &mut self,
-        title_editor: &Entity<Editor>,
-        event: &EditorEvent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(thread) = self.thread() else { return };
-
-        match event {
-            EditorEvent::BufferEdited => {
-                let new_title = title_editor.read(cx).text(cx);
-                thread.update(cx, |thread, cx| {
-                    thread
-                        .set_title(new_title.into(), cx)
-                        .detach_and_log_err(cx);
-                })
-            }
-            EditorEvent::Blurred => {
-                if title_editor.read(cx).text(cx).is_empty() {
-                    title_editor.update(cx, |editor, cx| {
-                        editor.set_text("New Thread", window, cx);
-                    });
-                }
-            }
-            _ => {}
-        }
-    }
-
-    pub fn handle_message_editor_event(
-        &mut self,
-        _: &Entity<MessageEditor>,
-        event: &MessageEditorEvent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            MessageEditorEvent::Send => self.send(window, cx),
-            MessageEditorEvent::Cancel => self.cancel_generation(cx),
-            MessageEditorEvent::Focus => {
-                self.cancel_editing(&Default::default(), window, cx);
-            }
-            MessageEditorEvent::LostFocus => {}
-        }
-    }
-
-    pub fn handle_entry_view_event(
-        &mut self,
-        _: &Entity<EntryViewState>,
-        event: &EntryViewEvent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        match &event.view_event {
-            ViewEvent::NewDiff(tool_call_id) => {
-                if AgentSettings::get_global(cx).expand_edit_card {
-                    self.expanded_tool_calls.insert(tool_call_id.clone());
-                }
-            }
-            ViewEvent::NewTerminal(tool_call_id) => {
-                if AgentSettings::get_global(cx).expand_terminal_card {
-                    self.expanded_tool_calls.insert(tool_call_id.clone());
-                }
-            }
-            ViewEvent::TerminalMovedToBackground(tool_call_id) => {
-                self.expanded_tool_calls.remove(tool_call_id);
-            }
-            ViewEvent::MessageEditorEvent(_editor, MessageEditorEvent::Focus) => {
-                if let Some(thread) = self.thread()
-                    && let Some(AgentThreadEntry::UserMessage(user_message)) =
-                        thread.read(cx).entries().get(event.entry_index)
-                    && user_message.id.is_some()
-                {
-                    self.editing_message = Some(event.entry_index);
-                    cx.notify();
-                }
-            }
-            ViewEvent::MessageEditorEvent(editor, MessageEditorEvent::LostFocus) => {
-                if let Some(thread) = self.thread()
-                    && let Some(AgentThreadEntry::UserMessage(user_message)) =
-                        thread.read(cx).entries().get(event.entry_index)
-                    && user_message.id.is_some()
-                {
-                    if editor.read(cx).text(cx).as_str() == user_message.content.to_markdown(cx) {
-                        self.editing_message = None;
-                        cx.notify();
-                    }
-                }
-            }
-            ViewEvent::MessageEditorEvent(editor, MessageEditorEvent::Send) => {
-                self.regenerate(event.entry_index, editor.clone(), window, cx);
-            }
-            ViewEvent::MessageEditorEvent(_editor, MessageEditorEvent::Cancel) => {
-                self.cancel_editing(&Default::default(), window, cx);
-            }
-        }
-    }
-
-    pub fn is_loading(&self) -> bool {
-        matches!(self.thread_state, ThreadState::Loading { .. })
-    }
-
-    fn resume_chat(&mut self, cx: &mut Context<Self>) {
-        self.thread_error.take();
-        let Some(thread) = self.thread() else {
-            return;
-        };
-        if !thread.read(cx).can_resume(cx) {
-            return;
-        }
-
-        let task = thread.update(cx, |thread, cx| thread.resume(cx));
-        cx.spawn(async move |this, cx| {
-            let result = task.await;
-
-            this.update(cx, |this, cx| {
-                if let Err(err) = result {
-                    this.handle_thread_error(err, cx);
-                }
-            })
-        })
-        .detach();
-    }
-
-    fn send(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let Some(thread) = self.thread() else { return };
-
-        if self.is_loading_contents {
-            return;
-        }
-
-        self.history_store.update(cx, |history, cx| {
-            history.push_recently_opened_entry(
-                HistoryEntryId::AcpThread(thread.read(cx).session_id().clone()),
-                cx,
-            );
-        });
-
-        if thread.read(cx).status() != ThreadStatus::Idle {
-            self.stop_current_and_send_new_message(window, cx);
-            return;
-        }
-
-        let text = self.message_editor.read(cx).text(cx);
-        let text = text.trim();
-        if text == "/login" || text == "/logout" {
-            let ThreadState::Ready { thread, .. } = &self.thread_state else {
-                return;
-            };
-
-            let connection = thread.read(cx).connection().clone();
-            let can_login = !connection.auth_methods().is_empty() || self.login.is_some();
-            // Does the agent have a specific logout command? Prefer that in case they need to reset internal state.
-            let logout_supported = text == "/logout"
-                && self
-                    .available_commands
-                    .borrow()
-                    .iter()
-                    .any(|command| command.name == "logout");
-            if can_login && !logout_supported {
-                self.message_editor
-                    .update(cx, |editor, cx| editor.clear(window, cx));
-
-                let this = cx.weak_entity();
-                let agent = self.agent.clone();
-                window.defer(cx, |window, cx| {
-                    Self::handle_auth_required(
-                        this,
-                        AuthRequired {
-                            description: None,
-                            provider_id: None,
-                        },
-                        agent,
-                        connection,
-                        window,
-                        cx,
-                    );
-                });
-                cx.notify();
-                return;
-            }
-        }
-
-        self.send_impl(self.message_editor.clone(), window, cx)
-    }
-
-    fn stop_current_and_send_new_message(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let Some(thread) = self.thread().cloned() else {
-            return;
-        };
-
-        let cancelled = thread.update(cx, |thread, cx| thread.cancel(cx));
-
-        cx.spawn_in(window, async move |this, cx| {
-            cancelled.await;
-
-            this.update_in(cx, |this, window, cx| {
-                this.send_impl(this.message_editor.clone(), window, cx);
-            })
-            .ok();
-        })
-        .detach();
-    }
-
-    fn send_impl(
-        &mut self,
-        message_editor: Entity<MessageEditor>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let full_mention_content = self.as_native_thread(cx).is_some_and(|thread| {
-            // Include full contents when using minimal profile
-            let thread = thread.read(cx);
-            AgentSettings::get_global(cx)
-                .profiles
-                .get(thread.profile())
-                .is_some_and(|profile| profile.tools.is_empty())
-        });
-
-        let contents = message_editor.update(cx, |message_editor, cx| {
-            message_editor.contents(full_mention_content, cx)
-        });
-
-        self.thread_error.take();
-        self.editing_message.take();
-        self.thread_feedback.clear();
-
-        let Some(thread) = self.thread() else {
-            return;
-        };
-        let session_id = thread.read(cx).session_id().clone();
-        let agent_telemetry_id = thread.read(cx).connection().telemetry_id();
-        let thread = thread.downgrade();
-        if self.should_be_following {
-            self.workspace
-                .update(cx, |workspace, cx| {
-                    workspace.follow(CollaboratorId::Agent, window, cx);
-                })
-                .ok();
-        }
-
-        self.is_loading_contents = true;
-        let model_id = self.current_model_id(cx);
-        let mode_id = self.current_mode_id(cx);
-        let guard = cx.new(|_| ());
-        cx.observe_release(&guard, |this, _guard, cx| {
-            this.is_loading_contents = false;
-            cx.notify();
-        })
-        .detach();
-
-        let task = cx.spawn_in(window, async move |this, cx| {
-            let (contents, tracked_buffers) = contents.await?;
-
-            if contents.is_empty() {
-                return Ok(());
-            }
-
-            this.update_in(cx, |this, window, cx| {
-                this.in_flight_prompt = Some(contents.clone());
-                this.set_editor_is_expanded(false, cx);
-                this.scroll_to_bottom(cx);
-                this.message_editor.update(cx, |message_editor, cx| {
-                    message_editor.clear(window, cx);
-                });
-            })?;
-            let turn_start_time = Instant::now();
-            let send = thread.update(cx, |thread, cx| {
-                thread.action_log().update(cx, |action_log, cx| {
-                    for buffer in tracked_buffers {
-                        action_log.buffer_read(buffer, cx)
-                    }
-                });
-                drop(guard);
-
-                telemetry::event!(
-                    "Agent Message Sent",
-                    agent = agent_telemetry_id,
-                    session = session_id,
-                    model = model_id,
-                    mode = mode_id
-                );
-
-                thread.send(contents, cx)
-            })?;
-            let res = send.await;
-            let turn_time_ms = turn_start_time.elapsed().as_millis();
-            let status = if res.is_ok() {
-                this.update(cx, |this, _| this.in_flight_prompt.take()).ok();
-                "success"
-            } else {
-                "failure"
-            };
-            telemetry::event!(
-                "Agent Turn Completed",
-                agent = agent_telemetry_id,
-                session = session_id,
-                model = model_id,
-                mode = mode_id,
-                status,
-                turn_time_ms,
-            );
-            res
-        });
-
-        cx.spawn(async move |this, cx| {
-            if let Err(err) = task.await {
-                this.update(cx, |this, cx| {
-                    this.handle_thread_error(err, cx);
-                })
-                .ok();
-            } else {
-                this.update(cx, |this, cx| {
-                    this.should_be_following = this
-                        .workspace
-                        .update(cx, |workspace, _| {
-                            workspace.is_being_followed(CollaboratorId::Agent)
-                        })
-                        .unwrap_or_default();
-                })
-                .ok();
-            }
-        })
-        .detach();
-    }
-
-    fn cancel_editing(&mut self, _: &ClickEvent, window: &mut Window, cx: &mut Context<Self>) {
-        let Some(thread) = self.thread().cloned() else {
-            return;
-        };
-
-        if let Some(index) = self.editing_message.take()
-            && let Some(editor) = self
-                .entry_view_state
-                .read(cx)
-                .entry(index)
-                .and_then(|e| e.message_editor())
-                .cloned()
-        {
-            editor.update(cx, |editor, cx| {
-                if let Some(user_message) = thread
-                    .read(cx)
-                    .entries()
-                    .get(index)
-                    .and_then(|e| e.user_message())
-                {
-                    editor.set_message(user_message.chunks.clone(), window, cx);
-                }
-            })
-        };
-        self.focus_handle(cx).focus(window);
-        cx.notify();
-    }
-
-    fn regenerate(
-        &mut self,
-        entry_ix: usize,
-        message_editor: Entity<MessageEditor>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(thread) = self.thread().cloned() else {
-            return;
-        };
-        if self.is_loading_contents {
-            return;
-        }
-
-        let Some(user_message_id) = thread.update(cx, |thread, _| {
-            thread.entries().get(entry_ix)?.user_message()?.id.clone()
-        }) else {
-            return;
-        };
-
-        cx.spawn_in(window, async move |this, cx| {
-            // Check if there are any edits from prompts before the one being regenerated.
-            //
-            // If there are, we keep/accept them since we're not regenerating the prompt that created them.
-            //
-            // If editing the prompt that generated the edits, they are auto-rejected
-            // through the `rewind` function in the `acp_thread`.
-            let has_earlier_edits = thread.read_with(cx, |thread, _| {
-                thread
-                    .entries()
-                    .iter()
-                    .take(entry_ix)
-                    .any(|entry| entry.diffs().next().is_some())
-            })?;
-
-            if has_earlier_edits {
-                thread.update(cx, |thread, cx| {
-                    thread.action_log().update(cx, |action_log, cx| {
-                        action_log.keep_all_edits(None, cx);
-                    });
-                })?;
-            }
-
-            thread
-                .update(cx, |thread, cx| thread.rewind(user_message_id, cx))?
-                .await?;
-            this.update_in(cx, |this, window, cx| {
-                this.send_impl(message_editor, window, cx);
-                this.focus_handle(cx).focus(window);
-            })?;
-            anyhow::Ok(())
-        })
-        .detach();
-    }
-
-    fn open_edited_buffer(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(thread) = self.thread() else {
-            return;
-        };
-
-        let Some(diff) =
-            AgentDiffPane::deploy(thread.clone(), self.workspace.clone(), window, cx).log_err()
-        else {
-            return;
-        };
-
-        diff.update(cx, |diff, cx| {
-            diff.move_to_path(PathKey::for_buffer(buffer, cx), window, cx)
-        })
-    }
-
-    fn handle_open_rules(&mut self, _: &ClickEvent, window: &mut Window, cx: &mut Context<Self>) {
-        let Some(thread) = self.as_native_thread(cx) else {
-            return;
-        };
-        let project_context = thread.read(cx).project_context().read(cx);
-
-        let project_entry_ids = project_context
-            .worktrees
-            .iter()
-            .flat_map(|worktree| worktree.rules_file.as_ref())
-            .map(|rules_file| ProjectEntryId::from_usize(rules_file.project_entry_id))
-            .collect::<Vec<_>>();
-
-        self.workspace
-            .update(cx, move |workspace, cx| {
-                // TODO: Open a multibuffer instead? In some cases this doesn't make the set of rules
-                // files clear. For example, if rules file 1 is already open but rules file 2 is not,
-                // this would open and focus rules file 2 in a tab that is not next to rules file 1.
-                let project = workspace.project().read(cx);
-                let project_paths = project_entry_ids
-                    .into_iter()
-                    .flat_map(|entry_id| project.path_for_entry(entry_id, cx))
-                    .collect::<Vec<_>>();
-                for project_path in project_paths {
-                    workspace
-                        .open_path(project_path, None, true, window, cx)
-                        .detach_and_log_err(cx);
-                }
-            })
-            .ok();
-    }
-
-    fn handle_thread_error(&mut self, error: anyhow::Error, cx: &mut Context<Self>) {
-        self.thread_error = Some(ThreadError::from_err(error, &self.agent));
-        cx.notify();
-    }
-
-    fn clear_thread_error(&mut self, cx: &mut Context<Self>) {
-        self.thread_error = None;
-        self.thread_error_markdown = None;
-        cx.notify();
-    }
-
-    fn handle_thread_event(
-        &mut self,
-        thread: &Entity<AcpThread>,
-        event: &AcpThreadEvent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            AcpThreadEvent::NewEntry => {
-                let len = thread.read(cx).entries().len();
-                let index = len - 1;
-                self.entry_view_state.update(cx, |view_state, cx| {
-                    view_state.sync_entry(index, thread, window, cx);
-                    self.list_state.splice_focusable(
-                        index..index,
-                        [view_state
-                            .entry(index)
-                            .and_then(|entry| entry.focus_handle(cx))],
-                    );
-                });
-            }
-            AcpThreadEvent::EntryUpdated(index) => {
-                self.entry_view_state.update(cx, |view_state, cx| {
-                    view_state.sync_entry(*index, thread, window, cx)
-                });
-            }
-            AcpThreadEvent::EntriesRemoved(range) => {
-                self.entry_view_state
-                    .update(cx, |view_state, _cx| view_state.remove(range.clone()));
-                self.list_state.splice(range.clone(), 0);
-            }
-            AcpThreadEvent::ToolAuthorizationRequired => {
-                self.notify_with_sound("Waiting for tool confirmation", IconName::Info, window, cx);
-            }
-            AcpThreadEvent::Retry(retry) => {
-                self.thread_retry_status = Some(retry.clone());
-            }
-            AcpThreadEvent::Stopped => {
-                self.thread_retry_status.take();
-                let used_tools = thread.read(cx).used_tools_since_last_user_message();
-                self.notify_with_sound(
-                    if used_tools {
-                        "Finished running tools"
-                    } else {
-                        "New message"
-                    },
-                    IconName::ZedAssistant,
-                    window,
-                    cx,
-                );
-            }
-            AcpThreadEvent::Refusal => {
-                self.thread_retry_status.take();
-                self.thread_error = Some(ThreadError::Refusal);
-                let model_or_agent_name = self.current_model_name(cx);
-                let notification_message =
-                    format!("{} refused to respond to this request", model_or_agent_name);
-                self.notify_with_sound(&notification_message, IconName::Warning, window, cx);
-            }
-            AcpThreadEvent::Error => {
-                self.thread_retry_status.take();
-                self.notify_with_sound(
-                    "Agent stopped due to an error",
-                    IconName::Warning,
-                    window,
-                    cx,
-                );
-            }
-            AcpThreadEvent::LoadError(error) => {
-                self.thread_retry_status.take();
-                self.thread_state = ThreadState::LoadError(error.clone());
-                if self.message_editor.focus_handle(cx).is_focused(window) {
-                    self.focus_handle.focus(window)
-                }
-            }
-            AcpThreadEvent::TitleUpdated => {
-                let title = thread.read(cx).title();
-                if let Some(title_editor) = self.title_editor() {
-                    title_editor.update(cx, |editor, cx| {
-                        if editor.text(cx) != title {
-                            editor.set_text(title, window, cx);
-                        }
-                    });
-                }
-            }
-            AcpThreadEvent::PromptCapabilitiesUpdated => {
-                self.prompt_capabilities
-                    .replace(thread.read(cx).prompt_capabilities());
-            }
-            AcpThreadEvent::TokenUsageUpdated => {}
-            AcpThreadEvent::AvailableCommandsUpdated(available_commands) => {
-                let mut available_commands = available_commands.clone();
-
-                if thread
-                    .read(cx)
-                    .connection()
-                    .auth_methods()
-                    .iter()
-                    .any(|method| method.id.0.as_ref() == "claude-login")
-                {
-                    available_commands.push(acp::AvailableCommand::new("login", "Authenticate"));
-                    available_commands.push(acp::AvailableCommand::new("logout", "Authenticate"));
-                }
-
-                let has_commands = !available_commands.is_empty();
-                self.available_commands.replace(available_commands);
-
-                let new_placeholder = placeholder_text(self.agent.name().as_ref(), has_commands);
-
-                self.message_editor.update(cx, |editor, cx| {
-                    editor.set_placeholder_text(&new_placeholder, window, cx);
-                });
-            }
-            AcpThreadEvent::ModeUpdated(_mode) => {
-                // The connection keeps track of the mode
-                cx.notify();
-            }
-        }
-        cx.notify();
-    }
-
-    fn authenticate(
-        &mut self,
-        method: acp::AuthMethodId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let ThreadState::Unauthenticated {
-            connection,
-            pending_auth_method,
-            configuration_view,
-            ..
-        } = &mut self.thread_state
-        else {
-            return;
-        };
-        let agent_telemetry_id = connection.telemetry_id();
-
-        // Check for the experimental "terminal-auth" _meta field
-        let auth_method = connection.auth_methods().iter().find(|m| m.id == method);
-
-        if let Some(auth_method) = auth_method {
-            if let Some(meta) = &auth_method.meta {
-                if let Some(terminal_auth) = meta.get("terminal-auth") {
-                    // Extract terminal auth details from meta
-                    if let (Some(command), Some(label)) = (
-                        terminal_auth.get("command").and_then(|v| v.as_str()),
-                        terminal_auth.get("label").and_then(|v| v.as_str()),
-                    ) {
-                        let args = terminal_auth
-                            .get("args")
-                            .and_then(|v| v.as_array())
-                            .map(|arr| {
-                                arr.iter()
-                                    .filter_map(|v| v.as_str().map(String::from))
-                                    .collect()
-                            })
-                            .unwrap_or_default();
-
-                        let env = terminal_auth
-                            .get("env")
-                            .and_then(|v| v.as_object())
-                            .map(|obj| {
-                                obj.iter()
-                                    .filter_map(|(k, v)| {
-                                        v.as_str().map(|val| (k.clone(), val.to_string()))
-                                    })
-                                    .collect::<HashMap<String, String>>()
-                            })
-                            .unwrap_or_default();
-
-                        // Run SpawnInTerminal in the same dir as the ACP server
-                        let cwd = connection
-                            .clone()
-                            .downcast::<agent_servers::AcpConnection>()
-                            .map(|acp_conn| acp_conn.root_dir().to_path_buf());
-
-                        // Build SpawnInTerminal from _meta
-                        let login = task::SpawnInTerminal {
-                            id: task::TaskId(format!("external-agent-{}-login", label)),
-                            full_label: label.to_string(),
-                            label: label.to_string(),
-                            command: Some(command.to_string()),
-                            args,
-                            command_label: label.to_string(),
-                            cwd,
-                            env,
-                            use_new_terminal: true,
-                            allow_concurrent_runs: true,
-                            hide: task::HideStrategy::Always,
-                            ..Default::default()
-                        };
-
-                        self.thread_error.take();
-                        configuration_view.take();
-                        pending_auth_method.replace(method.clone());
-
-                        if let Some(workspace) = self.workspace.upgrade() {
-                            let project = self.project.clone();
-                            let authenticate = Self::spawn_external_agent_login(
-                                login, workspace, project, false, true, window, cx,
-                            );
-                            cx.notify();
-                            self.auth_task = Some(cx.spawn_in(window, {
-                                async move |this, cx| {
-                                    let result = authenticate.await;
-
-                                    match &result {
-                                        Ok(_) => telemetry::event!(
-                                            "Authenticate Agent Succeeded",
-                                            agent = agent_telemetry_id
-                                        ),
-                                        Err(_) => {
-                                            telemetry::event!(
-                                                "Authenticate Agent Failed",
-                                                agent = agent_telemetry_id,
-                                            )
-                                        }
-                                    }
-
-                                    this.update_in(cx, |this, window, cx| {
-                                        if let Err(err) = result {
-                                            if let ThreadState::Unauthenticated {
-                                                pending_auth_method,
-                                                ..
-                                            } = &mut this.thread_state
-                                            {
-                                                pending_auth_method.take();
-                                            }
-                                            this.handle_thread_error(err, cx);
-                                        } else {
-                                            this.reset(window, cx);
-                                        }
-                                        this.auth_task.take()
-                                    })
-                                    .ok();
-                                }
-                            }));
-                        }
-                        return;
-                    }
-                }
-            }
-        }
-
-        if method.0.as_ref() == "gemini-api-key" {
-            let registry = LanguageModelRegistry::global(cx);
-            let provider = registry
-                .read(cx)
-                .provider(&language_model::GOOGLE_PROVIDER_ID)
-                .unwrap();
-            if !provider.is_authenticated(cx) {
-                let this = cx.weak_entity();
-                let agent = self.agent.clone();
-                let connection = connection.clone();
-                window.defer(cx, |window, cx| {
-                    Self::handle_auth_required(
-                        this,
-                        AuthRequired {
-                            description: Some("GEMINI_API_KEY must be set".to_owned()),
-                            provider_id: Some(language_model::GOOGLE_PROVIDER_ID),
-                        },
-                        agent,
-                        connection,
-                        window,
-                        cx,
-                    );
-                });
-                return;
-            }
-        } else if method.0.as_ref() == "anthropic-api-key" {
-            let registry = LanguageModelRegistry::global(cx);
-            let provider = registry
-                .read(cx)
-                .provider(&language_model::ANTHROPIC_PROVIDER_ID)
-                .unwrap();
-            let this = cx.weak_entity();
-            let agent = self.agent.clone();
-            let connection = connection.clone();
-            window.defer(cx, move |window, cx| {
-                if !provider.is_authenticated(cx) {
-                    Self::handle_auth_required(
-                        this,
-                        AuthRequired {
-                            description: Some("ANTHROPIC_API_KEY must be set".to_owned()),
-                            provider_id: Some(language_model::ANTHROPIC_PROVIDER_ID),
-                        },
-                        agent,
-                        connection,
-                        window,
-                        cx,
-                    );
-                } else {
-                    this.update(cx, |this, cx| {
-                        this.thread_state = Self::initial_state(
-                            agent,
-                            None,
-                            this.workspace.clone(),
-                            this.project.clone(),
-                            true,
-                            window,
-                            cx,
-                        )
-                    })
-                    .ok();
-                }
-            });
-            return;
-        } else if method.0.as_ref() == "vertex-ai"
-            && std::env::var("GOOGLE_API_KEY").is_err()
-            && (std::env::var("GOOGLE_CLOUD_PROJECT").is_err()
-                || (std::env::var("GOOGLE_CLOUD_PROJECT").is_err()))
-        {
-            let this = cx.weak_entity();
-            let agent = self.agent.clone();
-            let connection = connection.clone();
-
-            window.defer(cx, |window, cx| {
-                    Self::handle_auth_required(
-                        this,
-                        AuthRequired {
-                            description: Some(
-                                "GOOGLE_API_KEY must be set in the environment to use Vertex AI authentication for Gemini CLI. Please export it and restart Zed."
-                                    .to_owned(),
-                            ),
-                            provider_id: None,
-                        },
-                        agent,
-                        connection,
-                        window,
-                        cx,
-                    )
-                });
-            return;
-        }
-
-        self.thread_error.take();
-        configuration_view.take();
-        pending_auth_method.replace(method.clone());
-        let authenticate = if (method.0.as_ref() == "claude-login"
-            || method.0.as_ref() == "spawn-gemini-cli")
-            && let Some(login) = self.login.clone()
-        {
-            if let Some(workspace) = self.workspace.upgrade() {
-                let project = self.project.clone();
-                Self::spawn_external_agent_login(
-                    login, workspace, project, false, false, window, cx,
-                )
-            } else {
-                Task::ready(Ok(()))
-            }
-        } else {
-            connection.authenticate(method, cx)
-        };
-        cx.notify();
-        self.auth_task = Some(cx.spawn_in(window, {
-            async move |this, cx| {
-                let result = authenticate.await;
-
-                match &result {
-                    Ok(_) => telemetry::event!(
-                        "Authenticate Agent Succeeded",
-                        agent = agent_telemetry_id
-                    ),
-                    Err(_) => {
-                        telemetry::event!("Authenticate Agent Failed", agent = agent_telemetry_id,)
-                    }
-                }
-
-                this.update_in(cx, |this, window, cx| {
-                    if let Err(err) = result {
-                        if let ThreadState::Unauthenticated {
-                            pending_auth_method,
-                            ..
-                        } = &mut this.thread_state
-                        {
-                            pending_auth_method.take();
-                        }
-                        this.handle_thread_error(err, cx);
-                    } else {
-                        this.reset(window, cx);
-                    }
-                    this.auth_task.take()
-                })
-                .ok();
-            }
-        }));
-    }
-
-    fn spawn_external_agent_login(
-        login: task::SpawnInTerminal,
-        workspace: Entity<Workspace>,
-        project: Entity<Project>,
-        previous_attempt: bool,
-        check_exit_code: bool,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<()>> {
-        let Some(terminal_panel) = workspace.read(cx).panel::<TerminalPanel>(cx) else {
-            return Task::ready(Ok(()));
-        };
-
-        window.spawn(cx, async move |cx| {
-            let mut task = login.clone();
-            if let Some(cmd) = &task.command {
-                // Have "node" command use Zed's managed Node runtime by default
-                if cmd == "node" {
-                    let resolved_node_runtime = project
-                        .update(cx, |project, cx| {
-                            let agent_server_store = project.agent_server_store().clone();
-                            agent_server_store.update(cx, |store, cx| {
-                                store.node_runtime().map(|node_runtime| {
-                                    cx.background_spawn(async move {
-                                        node_runtime.binary_path().await
-                                    })
-                                })
-                            })
-                        });
-
-                    if let Ok(Some(resolve_task)) = resolved_node_runtime {
-                        if let Ok(node_path) = resolve_task.await {
-                            task.command = Some(node_path.to_string_lossy().to_string());
-                        }
-                    }
-                }
-            }
-            task.shell = task::Shell::WithArguments {
-                program: task.command.take().expect("login command should be set"),
-                args: std::mem::take(&mut task.args),
-                title_override: None
-            };
-            task.full_label = task.label.clone();
-            task.id = task::TaskId(format!("external-agent-{}-login", task.label));
-            task.command_label = task.label.clone();
-            task.use_new_terminal = true;
-            task.allow_concurrent_runs = true;
-            task.hide = task::HideStrategy::Always;
-
-            let terminal = terminal_panel.update_in(cx, |terminal_panel, window, cx| {
-                terminal_panel.spawn_task(&task, window, cx)
-            })?;
-
-            let terminal = terminal.await?;
-
-            if check_exit_code {
-                // For extension-based auth, wait for the process to exit and check exit code
-                let exit_status = terminal
-                    .read_with(cx, |terminal, cx| terminal.wait_for_completed_task(cx))?
-                    .await;
-
-                match exit_status {
-                    Some(status) if status.success() => {
-                        Ok(())
-                    }
-                    Some(status) => {
-                        Err(anyhow!("Login command failed with exit code: {:?}", status.code()))
-                    }
-                    None => {
-                        Err(anyhow!("Login command terminated without exit status"))
-                    }
-                }
-            } else {
-                // For hardcoded agents (claude-login, gemini-cli): look for specific output
-                let mut exit_status = terminal
-                    .read_with(cx, |terminal, cx| terminal.wait_for_completed_task(cx))?
-                    .fuse();
-
-                let logged_in = cx
-                    .spawn({
-                        let terminal = terminal.clone();
-                        async move |cx| {
-                            loop {
-                                cx.background_executor().timer(Duration::from_secs(1)).await;
-                                let content =
-                                    terminal.update(cx, |terminal, _cx| terminal.get_content())?;
-                                if content.contains("Login successful")
-                                    || content.contains("Type your message")
-                                {
-                                    return anyhow::Ok(());
-                                }
-                            }
-                        }
-                    })
-                    .fuse();
-                futures::pin_mut!(logged_in);
-                futures::select_biased! {
-                    result = logged_in => {
-                        if let Err(e) = result {
-                            log::error!("{e}");
-                            return Err(anyhow!("exited before logging in"));
-                        }
-                    }
-                    _ = exit_status => {
-                        if !previous_attempt && project.read_with(cx, |project, _| project.is_via_remote_server())? && login.label.contains("gemini") {
-                            return cx.update(|window, cx| Self::spawn_external_agent_login(login, workspace, project.clone(), true, false, window, cx))?.await
-                        }
-                        return Err(anyhow!("exited before logging in"));
-                    }
-                }
-                terminal.update(cx, |terminal, _| terminal.kill_active_task())?;
-                Ok(())
-            }
-        })
-    }
-
-    fn authorize_tool_call(
-        &mut self,
-        tool_call_id: acp::ToolCallId,
-        option_id: acp::PermissionOptionId,
-        option_kind: acp::PermissionOptionKind,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(thread) = self.thread() else {
-            return;
-        };
-        let agent_telemetry_id = thread.read(cx).connection().telemetry_id();
-
-        telemetry::event!(
-            "Agent Tool Call Authorized",
-            agent = agent_telemetry_id,
-            session = thread.read(cx).session_id(),
-            option = option_kind
-        );
-
-        thread.update(cx, |thread, cx| {
-            thread.authorize_tool_call(tool_call_id, option_id, option_kind, cx);
-        });
-        if self.should_be_following {
-            self.workspace
-                .update(cx, |workspace, cx| {
-                    workspace.follow(CollaboratorId::Agent, window, cx);
-                })
-                .ok();
-        }
-        cx.notify();
-    }
-
-    fn restore_checkpoint(&mut self, message_id: &UserMessageId, cx: &mut Context<Self>) {
-        let Some(thread) = self.thread() else {
-            return;
-        };
-
-        thread
-            .update(cx, |thread, cx| {
-                thread.restore_checkpoint(message_id.clone(), cx)
-            })
-            .detach_and_log_err(cx);
-    }
-
-    fn render_entry(
-        &self,
-        entry_ix: usize,
-        total_entries: usize,
-        entry: &AgentThreadEntry,
-        window: &mut Window,
-        cx: &Context<Self>,
-    ) -> AnyElement {
-        let primary = match &entry {
-            AgentThreadEntry::UserMessage(message) => {
-                let Some(editor) = self
-                    .entry_view_state
-                    .read(cx)
-                    .entry(entry_ix)
-                    .and_then(|entry| entry.message_editor())
-                    .cloned()
-                else {
-                    return Empty.into_any_element();
-                };
-
-                let editing = self.editing_message == Some(entry_ix);
-                let editor_focus = editor.focus_handle(cx).is_focused(window);
-                let focus_border = cx.theme().colors().border_focused;
-
-                let rules_item = if entry_ix == 0 {
-                    self.render_rules_item(cx)
-                } else {
-                    None
-                };
-
-                let has_checkpoint_button = message
-                    .checkpoint
-                    .as_ref()
-                    .is_some_and(|checkpoint| checkpoint.show);
-
-                let agent_name = self.agent.name();
-
-                v_flex()
-                    .id(("user_message", entry_ix))
-                    .map(|this| {
-                        if entry_ix == 0 && !has_checkpoint_button && rules_item.is_none()  {
-                            this.pt(rems_from_px(18.))
-                        } else if rules_item.is_some() {
-                            this.pt_3()
-                        } else {
-                            this.pt_2()
-                        }
-                    })
-                    .pb_3()
-                    .px_2()
-                    .gap_1p5()
-                    .w_full()
-                    .children(rules_item)
-                    .children(message.id.clone().and_then(|message_id| {
-                        message.checkpoint.as_ref()?.show.then(|| {
-                            h_flex()
-                                .px_3()
-                                .gap_2()
-                                .child(Divider::horizontal())
-                                .child(
-                                    Button::new("restore-checkpoint", "Restore Checkpoint")
-                                        .icon(IconName::Undo)
-                                        .icon_size(IconSize::XSmall)
-                                        .icon_position(IconPosition::Start)
-                                        .label_size(LabelSize::XSmall)
-                                        .icon_color(Color::Muted)
-                                        .color(Color::Muted)
-                                        .tooltip(Tooltip::text("Restores all files in the project to the content they had at this point in the conversation."))
-                                        .on_click(cx.listener(move |this, _, _window, cx| {
-                                            this.restore_checkpoint(&message_id, cx);
-                                        }))
-                                )
-                                .child(Divider::horizontal())
-                        })
-                    }))
-                    .child(
-                        div()
-                            .relative()
-                            .child(
-                                div()
-                                    .py_3()
-                                    .px_2()
-                                    .rounded_md()
-                                    .shadow_md()
-                                    .bg(cx.theme().colors().editor_background)
-                                    .border_1()
-                                    .when(editing && !editor_focus, |this| this.border_dashed())
-                                    .border_color(cx.theme().colors().border)
-                                    .map(|this|{
-                                        if editing && editor_focus {
-                                            this.border_color(focus_border)
-                                        } else if message.id.is_some() {
-                                            this.hover(|s| s.border_color(focus_border.opacity(0.8)))
-                                        } else {
-                                            this
-                                        }
-                                    })
-                                    .text_xs()
-                                    .child(editor.clone().into_any_element()),
-                            )
-                            .when(editor_focus, |this| {
-                                let base_container = h_flex()
-                                    .absolute()
-                                    .top_neg_3p5()
-                                    .right_3()
-                                    .gap_1()
-                                    .rounded_sm()
-                                    .border_1()
-                                    .border_color(cx.theme().colors().border)
-                                    .bg(cx.theme().colors().editor_background)
-                                    .overflow_hidden();
-
-                                if message.id.is_some() {
-                                    this.child(
-                                        base_container
-                                            .child(
-                                                IconButton::new("cancel", IconName::Close)
-                                                    .disabled(self.is_loading_contents)
-                                                    .icon_color(Color::Error)
-                                                    .icon_size(IconSize::XSmall)
-                                                    .on_click(cx.listener(Self::cancel_editing))
-                                            )
-                                            .child(
-                                                if self.is_loading_contents {
-                                                    div()
-                                                        .id("loading-edited-message-content")
-                                                        .tooltip(Tooltip::text("Loading Added Context…"))
-                                                        .child(loading_contents_spinner(IconSize::XSmall))
-                                                        .into_any_element()
-                                                } else {
-                                                    IconButton::new("regenerate", IconName::Return)
-                                                        .icon_color(Color::Muted)
-                                                        .icon_size(IconSize::XSmall)
-                                                        .tooltip(Tooltip::text(
-                                                            "Editing will restart the thread from this point."
-                                                        ))
-                                                        .on_click(cx.listener({
-                                                            let editor = editor.clone();
-                                                            move |this, _, window, cx| {
-                                                                this.regenerate(
-                                                                    entry_ix, editor.clone(), window, cx,
-                                                                );
-                                                            }
-                                                        })).into_any_element()
-                                                }
-                                            )
-                                    )
-                                } else {
-                                    this.child(
-                                        base_container
-                                            .border_dashed()
-                                            .child(
-                                                IconButton::new("editing_unavailable", IconName::PencilUnavailable)
-                                                    .icon_size(IconSize::Small)
-                                                    .icon_color(Color::Muted)
-                                                    .style(ButtonStyle::Transparent)
-                                                    .tooltip(move |_window, cx| {
-                                                        cx.new(|_| UnavailableEditingTooltip::new(agent_name.clone()))
-                                                            .into()
-                                                    })
-                                            )
-                                    )
-                                }
-                            }),
-                    )
-                    .into_any()
-            }
-            AgentThreadEntry::AssistantMessage(AssistantMessage { chunks }) => {
-                let is_last = entry_ix + 1 == total_entries;
-
-                let style = default_markdown_style(false, false, window, cx);
-                let message_body = v_flex()
-                    .w_full()
-                    .gap_3()
-                    .children(chunks.iter().enumerate().filter_map(
-                        |(chunk_ix, chunk)| match chunk {
-                            AssistantMessageChunk::Message { block } => {
-                                block.markdown().map(|md| {
-                                    self.render_markdown(md.clone(), style.clone())
-                                        .into_any_element()
-                                })
-                            }
-                            AssistantMessageChunk::Thought { block } => {
-                                block.markdown().map(|md| {
-                                    self.render_thinking_block(
-                                        entry_ix,
-                                        chunk_ix,
-                                        md.clone(),
-                                        window,
-                                        cx,
-                                    )
-                                    .into_any_element()
-                                })
-                            }
-                        },
-                    ))
-                    .into_any();
-
-                v_flex()
-                    .px_5()
-                    .py_1p5()
-                    .when(is_last, |this| this.pb_4())
-                    .w_full()
-                    .text_ui(cx)
-                    .child(message_body)
-                    .into_any()
-            }
-            AgentThreadEntry::ToolCall(tool_call) => {
-                let has_terminals = tool_call.terminals().next().is_some();
-
-                div().w_full().map(|this| {
-                    if has_terminals {
-                        this.children(tool_call.terminals().map(|terminal| {
-                            self.render_terminal_tool_call(
-                                entry_ix, terminal, tool_call, window, cx,
-                            )
-                        }))
-                    } else {
-                        this.child(self.render_tool_call(entry_ix, tool_call, window, cx))
-                    }
-                })
-            }
-            .into_any(),
-        };
-
-        let needs_confirmation = if let AgentThreadEntry::ToolCall(tool_call) = entry {
-            matches!(
-                tool_call.status,
-                ToolCallStatus::WaitingForConfirmation { .. }
-            )
-        } else {
-            false
-        };
-
-        let Some(thread) = self.thread() else {
-            return primary;
-        };
-
-        let primary = if entry_ix == total_entries - 1 {
-            v_flex()
-                .w_full()
-                .child(primary)
-                .map(|this| {
-                    if needs_confirmation {
-                        this.child(self.render_generating(true))
-                    } else {
-                        this.child(self.render_thread_controls(&thread, cx))
-                    }
-                })
-                .when_some(
-                    self.thread_feedback.comments_editor.clone(),
-                    |this, editor| this.child(Self::render_feedback_feedback_editor(editor, cx)),
-                )
-                .into_any_element()
-        } else {
-            primary
-        };
-
-        if let Some(editing_index) = self.editing_message.as_ref()
-            && *editing_index < entry_ix
-        {
-            let backdrop = div()
-                .id(("backdrop", entry_ix))
-                .size_full()
-                .absolute()
-                .inset_0()
-                .bg(cx.theme().colors().panel_background)
-                .opacity(0.8)
-                .block_mouse_except_scroll()
-                .on_click(cx.listener(Self::cancel_editing));
-
-            div()
-                .relative()
-                .child(primary)
-                .child(backdrop)
-                .into_any_element()
-        } else {
-            primary
-        }
-    }
-
-    fn tool_card_header_bg(&self, cx: &Context<Self>) -> Hsla {
-        cx.theme()
-            .colors()
-            .element_background
-            .blend(cx.theme().colors().editor_foreground.opacity(0.025))
-    }
-
-    fn tool_card_border_color(&self, cx: &Context<Self>) -> Hsla {
-        cx.theme().colors().border.opacity(0.8)
-    }
-
-    fn tool_name_font_size(&self) -> Rems {
-        rems_from_px(13.)
-    }
-
-    fn render_thinking_block(
-        &self,
-        entry_ix: usize,
-        chunk_ix: usize,
-        chunk: Entity<Markdown>,
-        window: &Window,
-        cx: &Context<Self>,
-    ) -> AnyElement {
-        let header_id = SharedString::from(format!("thinking-block-header-{}", entry_ix));
-        let card_header_id = SharedString::from("inner-card-header");
-
-        let key = (entry_ix, chunk_ix);
-
-        let is_open = self.expanded_thinking_blocks.contains(&key);
-
-        let scroll_handle = self
-            .entry_view_state
-            .read(cx)
-            .entry(entry_ix)
-            .and_then(|entry| entry.scroll_handle_for_assistant_message_chunk(chunk_ix));
-
-        let thinking_content = {
-            div()
-                .id(("thinking-content", chunk_ix))
-                .when_some(scroll_handle, |this, scroll_handle| {
-                    this.track_scroll(&scroll_handle)
-                })
-                .text_ui_sm(cx)
-                .overflow_hidden()
-                .child(
-                    self.render_markdown(chunk, default_markdown_style(false, false, window, cx)),
-                )
-        };
-
-        v_flex()
-            .gap_1()
-            .child(
-                h_flex()
-                    .id(header_id)
-                    .group(&card_header_id)
-                    .relative()
-                    .w_full()
-                    .pr_1()
-                    .justify_between()
-                    .child(
-                        h_flex()
-                            .h(window.line_height() - px(2.))
-                            .gap_1p5()
-                            .overflow_hidden()
-                            .child(
-                                Icon::new(IconName::ToolThink)
-                                    .size(IconSize::Small)
-                                    .color(Color::Muted),
-                            )
-                            .child(
-                                div()
-                                    .text_size(self.tool_name_font_size())
-                                    .text_color(cx.theme().colors().text_muted)
-                                    .child("Thinking"),
-                            ),
-                    )
-                    .child(
-                        Disclosure::new(("expand", entry_ix), is_open)
-                            .opened_icon(IconName::ChevronUp)
-                            .closed_icon(IconName::ChevronDown)
-                            .visible_on_hover(&card_header_id)
-                            .on_click(cx.listener({
-                                move |this, _event, _window, cx| {
-                                    if is_open {
-                                        this.expanded_thinking_blocks.remove(&key);
-                                    } else {
-                                        this.expanded_thinking_blocks.insert(key);
-                                    }
-                                    cx.notify();
-                                }
-                            })),
-                    )
-                    .on_click(cx.listener({
-                        move |this, _event, _window, cx| {
-                            if is_open {
-                                this.expanded_thinking_blocks.remove(&key);
-                            } else {
-                                this.expanded_thinking_blocks.insert(key);
-                            }
-                            cx.notify();
-                        }
-                    })),
-            )
-            .when(is_open, |this| {
-                this.child(
-                    div()
-                        .ml_1p5()
-                        .pl_3p5()
-                        .border_l_1()
-                        .border_color(self.tool_card_border_color(cx))
-                        .child(thinking_content),
-                )
-            })
-            .into_any_element()
-    }
-
-    fn render_tool_call(
-        &self,
-        entry_ix: usize,
-        tool_call: &ToolCall,
-        window: &Window,
-        cx: &Context<Self>,
-    ) -> Div {
-        let has_location = tool_call.locations.len() == 1;
-        let card_header_id = SharedString::from("inner-tool-call-header");
-
-        let failed_or_canceled = match &tool_call.status {
-            ToolCallStatus::Rejected | ToolCallStatus::Canceled | ToolCallStatus::Failed => true,
-            _ => false,
-        };
-
-        let needs_confirmation = matches!(
-            tool_call.status,
-            ToolCallStatus::WaitingForConfirmation { .. }
-        );
-        let is_terminal_tool = matches!(tool_call.kind, acp::ToolKind::Execute);
-        let is_edit =
-            matches!(tool_call.kind, acp::ToolKind::Edit) || tool_call.diffs().next().is_some();
-
-        let use_card_layout = needs_confirmation || is_edit || is_terminal_tool;
-
-        let is_collapsible = !tool_call.content.is_empty() && !needs_confirmation;
-
-        let is_open = needs_confirmation || self.expanded_tool_calls.contains(&tool_call.id);
-
-        let tool_output_display =
-            if is_open {
-                match &tool_call.status {
-                    ToolCallStatus::WaitingForConfirmation { options, .. } => v_flex()
-                        .w_full()
-                        .children(tool_call.content.iter().enumerate().map(
-                            |(content_ix, content)| {
-                                div()
-                                    .child(self.render_tool_call_content(
-                                        entry_ix,
-                                        content,
-                                        content_ix,
-                                        tool_call,
-                                        use_card_layout,
-                                        window,
-                                        cx,
-                                    ))
-                                    .into_any_element()
-                            },
-                        ))
-                        .child(self.render_permission_buttons(
-                            tool_call.kind,
-                            options,
-                            entry_ix,
-                            tool_call.id.clone(),
-                            cx,
-                        ))
-                        .into_any(),
-                    ToolCallStatus::Pending | ToolCallStatus::InProgress
-                        if is_edit
-                            && tool_call.content.is_empty()
-                            && self.as_native_connection(cx).is_some() =>
-                    {
-                        self.render_diff_loading(cx).into_any()
-                    }
-                    ToolCallStatus::Pending
-                    | ToolCallStatus::InProgress
-                    | ToolCallStatus::Completed
-                    | ToolCallStatus::Failed
-                    | ToolCallStatus::Canceled => v_flex()
-                        .w_full()
-                        .children(tool_call.content.iter().enumerate().map(
-                            |(content_ix, content)| {
-                                div().child(self.render_tool_call_content(
-                                    entry_ix,
-                                    content,
-                                    content_ix,
-                                    tool_call,
-                                    use_card_layout,
-                                    window,
-                                    cx,
-                                ))
-                            },
-                        ))
-                        .into_any(),
-                    ToolCallStatus::Rejected => Empty.into_any(),
-                }
-                .into()
-            } else {
-                None
-            };
-
-        v_flex()
-            .map(|this| {
-                if use_card_layout {
-                    this.my_1p5()
-                        .rounded_md()
-                        .border_1()
-                        .border_color(self.tool_card_border_color(cx))
-                        .bg(cx.theme().colors().editor_background)
-                        .overflow_hidden()
-                } else {
-                    this.my_1()
-                }
-            })
-            .map(|this| {
-                if has_location && !use_card_layout {
-                    this.ml_4()
-                } else {
-                    this.ml_5()
-                }
-            })
-            .mr_5()
-            .map(|this| {
-                if is_terminal_tool {
-                    this.child(
-                        v_flex()
-                            .p_1p5()
-                            .gap_0p5()
-                            .text_ui_sm(cx)
-                            .bg(self.tool_card_header_bg(cx))
-                            .child(
-                                Label::new("Run Command")
-                                    .buffer_font(cx)
-                                    .size(LabelSize::XSmall)
-                                    .color(Color::Muted),
-                            )
-                            .child(
-                                MarkdownElement::new(
-                                    tool_call.label.clone(),
-                                    terminal_command_markdown_style(window, cx),
-                                )
-                                .code_block_renderer(
-                                    markdown::CodeBlockRenderer::Default {
-                                        copy_button: false,
-                                        copy_button_on_hover: false,
-                                        border: false,
-                                    },
-                                )
-                            ),
-                    )
-                } else {
-                   this.child(
-                        h_flex()
-                            .group(&card_header_id)
-                            .relative()
-                            .w_full()
-                            .gap_1()
-                            .justify_between()
-                            .when(use_card_layout, |this| {
-                                this.p_0p5()
-                                    .rounded_t(rems_from_px(5.))
-                                    .bg(self.tool_card_header_bg(cx))
-                            })
-                            .child(self.render_tool_call_label(
-                                entry_ix,
-                                tool_call,
-                                is_edit,
-                                use_card_layout,
-                                window,
-                                cx,
-                            ))
-                            .when(is_collapsible || failed_or_canceled, |this| {
-                                this.child(
-                                    h_flex()
-                                        .px_1()
-                                        .gap_px()
-                                        .when(is_collapsible, |this| {
-                                            this.child(
-                                            Disclosure::new(("expand", entry_ix), is_open)
-                                                .opened_icon(IconName::ChevronUp)
-                                                .closed_icon(IconName::ChevronDown)
-                                                .visible_on_hover(&card_header_id)
-                                                .on_click(cx.listener({
-                                                    let id = tool_call.id.clone();
-                                                    move |this: &mut Self, _, _, cx: &mut Context<Self>| {
-                                                        if is_open {
-                                                            this.expanded_tool_calls.remove(&id);
-                                                        } else {
-                                                            this.expanded_tool_calls.insert(id.clone());
-                                                        }
-                                                        cx.notify();
-                                                    }
-                                                })),
-                                        )
-                                        })
-                                        .when(failed_or_canceled, |this| {
-                                            this.child(
-                                                Icon::new(IconName::Close)
-                                                    .color(Color::Error)
-                                                    .size(IconSize::Small),
-                                            )
-                                        }),
-                                )
-                            }),
-                    )
-                }
-            })
-            .children(tool_output_display)
-    }
-
-    fn render_tool_call_label(
-        &self,
-        entry_ix: usize,
-        tool_call: &ToolCall,
-        is_edit: bool,
-        use_card_layout: bool,
-        window: &Window,
-        cx: &Context<Self>,
-    ) -> Div {
-        let has_location = tool_call.locations.len() == 1;
-
-        let tool_icon = if tool_call.kind == acp::ToolKind::Edit && has_location {
-            FileIcons::get_icon(&tool_call.locations[0].path, cx)
-                .map(Icon::from_path)
-                .unwrap_or(Icon::new(IconName::ToolPencil))
-        } else {
-            Icon::new(match tool_call.kind {
-                acp::ToolKind::Read => IconName::ToolSearch,
-                acp::ToolKind::Edit => IconName::ToolPencil,
-                acp::ToolKind::Delete => IconName::ToolDeleteFile,
-                acp::ToolKind::Move => IconName::ArrowRightLeft,
-                acp::ToolKind::Search => IconName::ToolSearch,
-                acp::ToolKind::Execute => IconName::ToolTerminal,
-                acp::ToolKind::Think => IconName::ToolThink,
-                acp::ToolKind::Fetch => IconName::ToolWeb,
-                acp::ToolKind::SwitchMode => IconName::ArrowRightLeft,
-                acp::ToolKind::Other | _ => IconName::ToolHammer,
-            })
-        }
-        .size(IconSize::Small)
-        .color(Color::Muted);
-
-        let gradient_overlay = {
-            div()
-                .absolute()
-                .top_0()
-                .right_0()
-                .w_12()
-                .h_full()
-                .map(|this| {
-                    if use_card_layout {
-                        this.bg(linear_gradient(
-                            90.,
-                            linear_color_stop(self.tool_card_header_bg(cx), 1.),
-                            linear_color_stop(self.tool_card_header_bg(cx).opacity(0.2), 0.),
-                        ))
-                    } else {
-                        this.bg(linear_gradient(
-                            90.,
-                            linear_color_stop(cx.theme().colors().panel_background, 1.),
-                            linear_color_stop(
-                                cx.theme().colors().panel_background.opacity(0.2),
-                                0.,
-                            ),
-                        ))
-                    }
-                })
-        };
-
-        h_flex()
-            .relative()
-            .w_full()
-            .h(window.line_height() - px(2.))
-            .text_size(self.tool_name_font_size())
-            .gap_1p5()
-            .when(has_location || use_card_layout, |this| this.px_1())
-            .when(has_location, |this| {
-                this.cursor(CursorStyle::PointingHand)
-                    .rounded(rems_from_px(3.)) // Concentric border radius
-                    .hover(|s| s.bg(cx.theme().colors().element_hover.opacity(0.5)))
-            })
-            .overflow_hidden()
-            .child(tool_icon)
-            .child(if has_location {
-                h_flex()
-                    .id(("open-tool-call-location", entry_ix))
-                    .w_full()
-                    .map(|this| {
-                        if use_card_layout {
-                            this.text_color(cx.theme().colors().text)
-                        } else {
-                            this.text_color(cx.theme().colors().text_muted)
-                        }
-                    })
-                    .child(self.render_markdown(
-                        tool_call.label.clone(),
-                        MarkdownStyle {
-                            prevent_mouse_interaction: true,
-                            ..default_markdown_style(false, true, window, cx)
-                        },
-                    ))
-                    .tooltip(Tooltip::text("Jump to File"))
-                    .on_click(cx.listener(move |this, _, window, cx| {
-                        this.open_tool_call_location(entry_ix, 0, window, cx);
-                    }))
-                    .into_any_element()
-            } else {
-                h_flex()
-                    .w_full()
-                    .child(self.render_markdown(
-                        tool_call.label.clone(),
-                        default_markdown_style(false, true, window, cx),
-                    ))
-                    .into_any()
-            })
-            .when(!is_edit, |this| this.child(gradient_overlay))
-    }
-
-    fn render_tool_call_content(
-        &self,
-        entry_ix: usize,
-        content: &ToolCallContent,
-        context_ix: usize,
-        tool_call: &ToolCall,
-        card_layout: bool,
-        window: &Window,
-        cx: &Context<Self>,
-    ) -> AnyElement {
-        match content {
-            ToolCallContent::ContentBlock(content) => {
-                if let Some(resource_link) = content.resource_link() {
-                    self.render_resource_link(resource_link, cx)
-                } else if let Some(markdown) = content.markdown() {
-                    self.render_markdown_output(
-                        markdown.clone(),
-                        tool_call.id.clone(),
-                        context_ix,
-                        card_layout,
-                        window,
-                        cx,
-                    )
-                } else {
-                    Empty.into_any_element()
-                }
-            }
-            ToolCallContent::Diff(diff) => self.render_diff_editor(entry_ix, diff, tool_call, cx),
-            ToolCallContent::Terminal(terminal) => {
-                self.render_terminal_tool_call(entry_ix, terminal, tool_call, window, cx)
-            }
-        }
-    }
-
-    fn render_markdown_output(
-        &self,
-        markdown: Entity<Markdown>,
-        tool_call_id: acp::ToolCallId,
-        context_ix: usize,
-        card_layout: bool,
-        window: &Window,
-        cx: &Context<Self>,
-    ) -> AnyElement {
-        let button_id = SharedString::from(format!("tool_output-{:?}", tool_call_id));
-
-        v_flex()
-            .mt_1p5()
-            .gap_2()
-            .when(!card_layout, |this| {
-                this.ml(rems(0.4))
-                    .px_3p5()
-                    .border_l_1()
-                    .border_color(self.tool_card_border_color(cx))
-            })
-            .when(card_layout, |this| {
-                this.px_2().pb_2().when(context_ix > 0, |this| {
-                    this.border_t_1()
-                        .pt_2()
-                        .border_color(self.tool_card_border_color(cx))
-                })
-            })
-            .text_xs()
-            .text_color(cx.theme().colors().text_muted)
-            .child(self.render_markdown(markdown, default_markdown_style(false, false, window, cx)))
-            .when(!card_layout, |this| {
-                this.child(
-                    IconButton::new(button_id, IconName::ChevronUp)
-                        .full_width()
-                        .style(ButtonStyle::Outlined)
-                        .icon_color(Color::Muted)
-                        .on_click(cx.listener({
-                            move |this: &mut Self, _, _, cx: &mut Context<Self>| {
-                                this.expanded_tool_calls.remove(&tool_call_id);
-                                cx.notify();
-                            }
-                        })),
-                )
-            })
-            .into_any_element()
-    }
-
-    fn render_resource_link(
-        &self,
-        resource_link: &acp::ResourceLink,
-        cx: &Context<Self>,
-    ) -> AnyElement {
-        let uri: SharedString = resource_link.uri.clone().into();
-        let is_file = resource_link.uri.strip_prefix("file://");
-
-        let label: SharedString = if let Some(abs_path) = is_file {
-            if let Some(project_path) = self
-                .project
-                .read(cx)
-                .project_path_for_absolute_path(&Path::new(abs_path), cx)
-                && let Some(worktree) = self
-                    .project
-                    .read(cx)
-                    .worktree_for_id(project_path.worktree_id, cx)
-            {
-                worktree
-                    .read(cx)
-                    .full_path(&project_path.path)
-                    .to_string_lossy()
-                    .to_string()
-                    .into()
-            } else {
-                abs_path.to_string().into()
-            }
-        } else {
-            uri.clone()
-        };
-
-        let button_id = SharedString::from(format!("item-{}", uri));
-
-        div()
-            .ml(rems(0.4))
-            .pl_2p5()
-            .border_l_1()
-            .border_color(self.tool_card_border_color(cx))
-            .overflow_hidden()
-            .child(
-                Button::new(button_id, label)
-                    .label_size(LabelSize::Small)
-                    .color(Color::Muted)
-                    .truncate(true)
-                    .when(is_file.is_none(), |this| {
-                        this.icon(IconName::ArrowUpRight)
-                            .icon_size(IconSize::XSmall)
-                            .icon_color(Color::Muted)
-                    })
-                    .on_click(cx.listener({
-                        let workspace = self.workspace.clone();
-                        move |_, _, window, cx: &mut Context<Self>| {
-                            Self::open_link(uri.clone(), &workspace, window, cx);
-                        }
-                    })),
-            )
-            .into_any_element()
-    }
-
-    fn render_permission_buttons(
-        &self,
-        kind: acp::ToolKind,
-        options: &[acp::PermissionOption],
-        entry_ix: usize,
-        tool_call_id: acp::ToolCallId,
-        cx: &Context<Self>,
-    ) -> Div {
-        let is_first = self.thread().is_some_and(|thread| {
-            thread
-                .read(cx)
-                .first_tool_awaiting_confirmation()
-                .is_some_and(|call| call.id == tool_call_id)
-        });
-        let mut seen_kinds: ArrayVec<acp::PermissionOptionKind, 3> = ArrayVec::new();
-
-        div()
-            .p_1()
-            .border_t_1()
-            .border_color(self.tool_card_border_color(cx))
-            .w_full()
-            .map(|this| {
-                if kind == acp::ToolKind::SwitchMode {
-                    this.v_flex()
-                } else {
-                    this.h_flex().justify_end().flex_wrap()
-                }
-            })
-            .gap_0p5()
-            .children(options.iter().map(move |option| {
-                let option_id = SharedString::from(option.option_id.0.clone());
-                Button::new((option_id, entry_ix), option.name.clone())
-                    .map(|this| {
-                        let (this, action) = match option.kind {
-                            acp::PermissionOptionKind::AllowOnce => (
-                                this.icon(IconName::Check).icon_color(Color::Success),
-                                Some(&AllowOnce as &dyn Action),
-                            ),
-                            acp::PermissionOptionKind::AllowAlways => (
-                                this.icon(IconName::CheckDouble).icon_color(Color::Success),
-                                Some(&AllowAlways as &dyn Action),
-                            ),
-                            acp::PermissionOptionKind::RejectOnce => (
-                                this.icon(IconName::Close).icon_color(Color::Error),
-                                Some(&RejectOnce as &dyn Action),
-                            ),
-                            acp::PermissionOptionKind::RejectAlways | _ => {
-                                (this.icon(IconName::Close).icon_color(Color::Error), None)
-                            }
-                        };
-
-                        let Some(action) = action else {
-                            return this;
-                        };
-
-                        if !is_first || seen_kinds.contains(&option.kind) {
-                            return this;
-                        }
-
-                        seen_kinds.push(option.kind);
-
-                        this.key_binding(
-                            KeyBinding::for_action_in(action, &self.focus_handle, cx)
-                                .map(|kb| kb.size(rems_from_px(10.))),
-                        )
-                    })
-                    .icon_position(IconPosition::Start)
-                    .icon_size(IconSize::XSmall)
-                    .label_size(LabelSize::Small)
-                    .on_click(cx.listener({
-                        let tool_call_id = tool_call_id.clone();
-                        let option_id = option.option_id.clone();
-                        let option_kind = option.kind;
-                        move |this, _, window, cx| {
-                            this.authorize_tool_call(
-                                tool_call_id.clone(),
-                                option_id.clone(),
-                                option_kind,
-                                window,
-                                cx,
-                            );
-                        }
-                    }))
-            }))
-    }
-
-    fn render_diff_loading(&self, cx: &Context<Self>) -> AnyElement {
-        let bar = |n: u64, width_class: &str| {
-            let bg_color = cx.theme().colors().element_active;
-            let base = h_flex().h_1().rounded_full();
-
-            let modified = match width_class {
-                "w_4_5" => base.w_3_4(),
-                "w_1_4" => base.w_1_4(),
-                "w_2_4" => base.w_2_4(),
-                "w_3_5" => base.w_3_5(),
-                "w_2_5" => base.w_2_5(),
-                _ => base.w_1_2(),
-            };
-
-            modified.with_animation(
-                ElementId::Integer(n),
-                Animation::new(Duration::from_secs(2)).repeat(),
-                move |tab, delta| {
-                    let delta = (delta - 0.15 * n as f32) / 0.7;
-                    let delta = 1.0 - (0.5 - delta).abs() * 2.;
-                    let delta = ease_in_out(delta.clamp(0., 1.));
-                    let delta = 0.1 + 0.9 * delta;
-
-                    tab.bg(bg_color.opacity(delta))
-                },
-            )
-        };
-
-        v_flex()
-            .p_3()
-            .gap_1()
-            .rounded_b_md()
-            .bg(cx.theme().colors().editor_background)
-            .child(bar(0, "w_4_5"))
-            .child(bar(1, "w_1_4"))
-            .child(bar(2, "w_2_4"))
-            .child(bar(3, "w_3_5"))
-            .child(bar(4, "w_2_5"))
-            .into_any_element()
-    }
-
-    fn render_diff_editor(
-        &self,
-        entry_ix: usize,
-        diff: &Entity<acp_thread::Diff>,
-        tool_call: &ToolCall,
-        cx: &Context<Self>,
-    ) -> AnyElement {
-        let tool_progress = matches!(
-            &tool_call.status,
-            ToolCallStatus::InProgress | ToolCallStatus::Pending
-        );
-
-        v_flex()
-            .h_full()
-            .border_t_1()
-            .border_color(self.tool_card_border_color(cx))
-            .child(
-                if let Some(entry) = self.entry_view_state.read(cx).entry(entry_ix)
-                    && let Some(editor) = entry.editor_for_diff(diff)
-                    && diff.read(cx).has_revealed_range(cx)
-                {
-                    editor.into_any_element()
-                } else if tool_progress && self.as_native_connection(cx).is_some() {
-                    self.render_diff_loading(cx)
-                } else {
-                    Empty.into_any()
-                },
-            )
-            .into_any()
-    }
-
-    fn render_terminal_tool_call(
-        &self,
-        entry_ix: usize,
-        terminal: &Entity<acp_thread::Terminal>,
-        tool_call: &ToolCall,
-        window: &Window,
-        cx: &Context<Self>,
-    ) -> AnyElement {
-        let terminal_data = terminal.read(cx);
-        let working_dir = terminal_data.working_dir();
-        let command = terminal_data.command();
-        let started_at = terminal_data.started_at();
-
-        let tool_failed = matches!(
-            &tool_call.status,
-            ToolCallStatus::Rejected | ToolCallStatus::Canceled | ToolCallStatus::Failed
-        );
-
-        let output = terminal_data.output();
-        let command_finished = output.is_some();
-        let truncated_output =
-            output.is_some_and(|output| output.original_content_len > output.content.len());
-        let output_line_count = output.map(|output| output.content_line_count).unwrap_or(0);
-
-        let command_failed = command_finished
-            && output.is_some_and(|o| o.exit_status.is_some_and(|status| !status.success()));
-
-        let time_elapsed = if let Some(output) = output {
-            output.ended_at.duration_since(started_at)
-        } else {
-            started_at.elapsed()
-        };
-
-        let header_id =
-            SharedString::from(format!("terminal-tool-header-{}", terminal.entity_id()));
-        let header_group = SharedString::from(format!(
-            "terminal-tool-header-group-{}",
-            terminal.entity_id()
-        ));
-        let header_bg = cx
-            .theme()
-            .colors()
-            .element_background
-            .blend(cx.theme().colors().editor_foreground.opacity(0.025));
-        let border_color = cx.theme().colors().border.opacity(0.6);
-
-        let working_dir = working_dir
-            .as_ref()
-            .map(|path| path.display().to_string())
-            .unwrap_or_else(|| "current directory".to_string());
-
-        let is_expanded = self.expanded_tool_calls.contains(&tool_call.id);
-
-        let header = h_flex()
-            .id(header_id)
-            .flex_none()
-            .gap_1()
-            .justify_between()
-            .rounded_t_md()
-            .child(
-                div()
-                    .id(("command-target-path", terminal.entity_id()))
-                    .w_full()
-                    .max_w_full()
-                    .overflow_x_scroll()
-                    .child(
-                        Label::new(working_dir)
-                            .buffer_font(cx)
-                            .size(LabelSize::XSmall)
-                            .color(Color::Muted),
-                    ),
-            )
-            .when(!command_finished, |header| {
-                header
-                    .gap_1p5()
-                    .child(
-                        Button::new(
-                            SharedString::from(format!("stop-terminal-{}", terminal.entity_id())),
-                            "Stop",
-                        )
-                        .icon(IconName::Stop)
-                        .icon_position(IconPosition::Start)
-                        .icon_size(IconSize::Small)
-                        .icon_color(Color::Error)
-                        .label_size(LabelSize::Small)
-                        .tooltip(move |_window, cx| {
-                            Tooltip::with_meta(
-                                "Stop This Command",
-                                None,
-                                "Also possible by placing your cursor inside the terminal and using regular terminal bindings.",
-                                cx,
-                            )
-                        })
-                        .on_click({
-                            let terminal = terminal.clone();
-                            cx.listener(move |_this, _event, _window, cx| {
-                                let inner_terminal = terminal.read(cx).inner().clone();
-                                inner_terminal.update(cx, |inner_terminal, _cx| {
-                                    inner_terminal.kill_active_task();
-                                });
-                            })
-                        }),
-                    )
-                    .child(Divider::vertical())
-                    .child(
-                        Icon::new(IconName::ArrowCircle)
-                            .size(IconSize::XSmall)
-                            .color(Color::Info)
-                            .with_rotate_animation(2)
-                    )
-            })
-            .when(truncated_output, |header| {
-                let tooltip = if let Some(output) = output {
-                    if output_line_count + 10 > terminal::MAX_SCROLL_HISTORY_LINES {
-                       format!("Output exceeded terminal max lines and was \
-                            truncated, the model received the first {}.", format_file_size(output.content.len() as u64, true))
-                    } else {
-                        format!(
-                            "Output is {} long, and to avoid unexpected token usage, \
-                                only {} was sent back to the agent.",
-                            format_file_size(output.original_content_len as u64, true),
-                             format_file_size(output.content.len() as u64, true)
-                        )
-                    }
-                } else {
-                    "Output was truncated".to_string()
-                };
-
-                header.child(
-                    h_flex()
-                        .id(("terminal-tool-truncated-label", terminal.entity_id()))
-                        .gap_1()
-                        .child(
-                            Icon::new(IconName::Info)
-                                .size(IconSize::XSmall)
-                                .color(Color::Ignored),
-                        )
-                        .child(
-                            Label::new("Truncated")
-                                .color(Color::Muted)
-                                .size(LabelSize::XSmall),
-                        )
-                        .tooltip(Tooltip::text(tooltip)),
-                )
-            })
-            .when(time_elapsed > Duration::from_secs(10), |header| {
-                header.child(
-                    Label::new(format!("({})", duration_alt_display(time_elapsed)))
-                        .buffer_font(cx)
-                        .color(Color::Muted)
-                        .size(LabelSize::XSmall),
-                )
-            })
-            .when(tool_failed || command_failed, |header| {
-                header.child(
-                    div()
-                        .id(("terminal-tool-error-code-indicator", terminal.entity_id()))
-                        .child(
-                            Icon::new(IconName::Close)
-                                .size(IconSize::Small)
-                                .color(Color::Error),
-                        )
-                        .when_some(output.and_then(|o| o.exit_status), |this, status| {
-                            this.tooltip(Tooltip::text(format!(
-                                "Exited with code {}",
-                                status.code().unwrap_or(-1),
-                            )))
-                        }),
-                )
-            })
-            .child(
-                Disclosure::new(
-                    SharedString::from(format!(
-                        "terminal-tool-disclosure-{}",
-                        terminal.entity_id()
-                    )),
-                    is_expanded,
-                )
-                .opened_icon(IconName::ChevronUp)
-                .closed_icon(IconName::ChevronDown)
-                .visible_on_hover(&header_group)
-                .on_click(cx.listener({
-                    let id = tool_call.id.clone();
-                    move |this, _event, _window, _cx| {
-                        if is_expanded {
-                            this.expanded_tool_calls.remove(&id);
-                        } else {
-                            this.expanded_tool_calls.insert(id.clone());
-                        }
-                    }
-                })),
-            );
-
-        let terminal_view = self
-            .entry_view_state
-            .read(cx)
-            .entry(entry_ix)
-            .and_then(|entry| entry.terminal(terminal));
-        let show_output = is_expanded && terminal_view.is_some();
-
-        v_flex()
-            .my_1p5()
-            .mx_5()
-            .border_1()
-            .when(tool_failed || command_failed, |card| card.border_dashed())
-            .border_color(border_color)
-            .rounded_md()
-            .overflow_hidden()
-            .child(
-                v_flex()
-                    .group(&header_group)
-                    .py_1p5()
-                    .pr_1p5()
-                    .pl_2()
-                    .gap_0p5()
-                    .bg(header_bg)
-                    .text_xs()
-                    .child(header)
-                    .child(
-                        MarkdownElement::new(
-                            command.clone(),
-                            terminal_command_markdown_style(window, cx),
-                        )
-                        .code_block_renderer(
-                            markdown::CodeBlockRenderer::Default {
-                                copy_button: false,
-                                copy_button_on_hover: true,
-                                border: false,
-                            },
-                        ),
-                    ),
-            )
-            .when(show_output, |this| {
-                this.child(
-                    div()
-                        .pt_2()
-                        .border_t_1()
-                        .when(tool_failed || command_failed, |card| card.border_dashed())
-                        .border_color(border_color)
-                        .bg(cx.theme().colors().editor_background)
-                        .rounded_b_md()
-                        .text_ui_sm(cx)
-                        .h_full()
-                        .children(terminal_view.map(|terminal_view| {
-                            let element = if terminal_view
-                                .read(cx)
-                                .content_mode(window, cx)
-                                .is_scrollable()
-                            {
-                                div().h_72().child(terminal_view).into_any_element()
-                            } else {
-                                terminal_view.into_any_element()
-                            };
-
-                            div()
-                                .on_action(cx.listener(|_this, _: &NewTerminal, window, cx| {
-                                    window.dispatch_action(NewThread.boxed_clone(), cx);
-                                    cx.stop_propagation();
-                                }))
-                                .child(element)
-                                .into_any_element()
-                        })),
-                )
-            })
-            .into_any()
-    }
-
-    fn render_rules_item(&self, cx: &Context<Self>) -> Option<AnyElement> {
-        let project_context = self
-            .as_native_thread(cx)?
-            .read(cx)
-            .project_context()
-            .read(cx);
-
-        let user_rules_text = if project_context.user_rules.is_empty() {
-            None
-        } else if project_context.user_rules.len() == 1 {
-            let user_rules = &project_context.user_rules[0];
-
-            match user_rules.title.as_ref() {
-                Some(title) => Some(format!("Using \"{title}\" user rule")),
-                None => Some("Using user rule".into()),
-            }
-        } else {
-            Some(format!(
-                "Using {} user rules",
-                project_context.user_rules.len()
-            ))
-        };
-
-        let first_user_rules_id = project_context
-            .user_rules
-            .first()
-            .map(|user_rules| user_rules.uuid.0);
-
-        let rules_files = project_context
-            .worktrees
-            .iter()
-            .filter_map(|worktree| worktree.rules_file.as_ref())
-            .collect::<Vec<_>>();
-
-        let rules_file_text = match rules_files.as_slice() {
-            &[] => None,
-            &[rules_file] => Some(format!(
-                "Using project {:?} file",
-                rules_file.path_in_worktree
-            )),
-            rules_files => Some(format!("Using {} project rules files", rules_files.len())),
-        };
-
-        if user_rules_text.is_none() && rules_file_text.is_none() {
-            return None;
-        }
-
-        let has_both = user_rules_text.is_some() && rules_file_text.is_some();
-
-        Some(
-            h_flex()
-                .px_2p5()
-                .child(
-                    Icon::new(IconName::Attach)
-                        .size(IconSize::XSmall)
-                        .color(Color::Disabled),
-                )
-                .when_some(user_rules_text, |parent, user_rules_text| {
-                    parent.child(
-                        h_flex()
-                            .id("user-rules")
-                            .ml_1()
-                            .mr_1p5()
-                            .child(
-                                Label::new(user_rules_text)
-                                    .size(LabelSize::XSmall)
-                                    .color(Color::Muted)
-                                    .truncate(),
-                            )
-                            .hover(|s| s.bg(cx.theme().colors().element_hover))
-                            .tooltip(Tooltip::text("View User Rules"))
-                            .on_click(move |_event, window, cx| {
-                                window.dispatch_action(
-                                    Box::new(OpenRulesLibrary {
-                                        prompt_to_select: first_user_rules_id,
-                                    }),
-                                    cx,
-                                )
-                            }),
-                    )
-                })
-                .when(has_both, |this| {
-                    this.child(
-                        Label::new("•")
-                            .size(LabelSize::XSmall)
-                            .color(Color::Disabled),
-                    )
-                })
-                .when_some(rules_file_text, |parent, rules_file_text| {
-                    parent.child(
-                        h_flex()
-                            .id("project-rules")
-                            .ml_1p5()
-                            .child(
-                                Label::new(rules_file_text)
-                                    .size(LabelSize::XSmall)
-                                    .color(Color::Muted),
-                            )
-                            .hover(|s| s.bg(cx.theme().colors().element_hover))
-                            .tooltip(Tooltip::text("View Project Rules"))
-                            .on_click(cx.listener(Self::handle_open_rules)),
-                    )
-                })
-                .into_any(),
-        )
-    }
-
-    fn render_empty_state_section_header(
-        &self,
-        label: impl Into<SharedString>,
-        action_slot: Option<AnyElement>,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        div().pl_1().pr_1p5().child(
-            h_flex()
-                .mt_2()
-                .pl_1p5()
-                .pb_1()
-                .w_full()
-                .justify_between()
-                .border_b_1()
-                .border_color(cx.theme().colors().border_variant)
-                .child(
-                    Label::new(label.into())
-                        .size(LabelSize::Small)
-                        .color(Color::Muted),
-                )
-                .children(action_slot),
-        )
-    }
-
-    fn render_recent_history(&self, cx: &mut Context<Self>) -> AnyElement {
-        let render_history = self
-            .agent
-            .clone()
-            .downcast::<agent::NativeAgentServer>()
-            .is_some()
-            && self
-                .history_store
-                .update(cx, |history_store, cx| !history_store.is_empty(cx));
-
-        v_flex()
-            .size_full()
-            .when(render_history, |this| {
-                let recent_history: Vec<_> = self.history_store.update(cx, |history_store, _| {
-                    history_store.entries().take(3).collect()
-                });
-                this.justify_end().child(
-                    v_flex()
-                        .child(
-                            self.render_empty_state_section_header(
-                                "Recent",
-                                Some(
-                                    Button::new("view-history", "View All")
-                                        .style(ButtonStyle::Subtle)
-                                        .label_size(LabelSize::Small)
-                                        .key_binding(
-                                            KeyBinding::for_action_in(
-                                                &OpenHistory,
-                                                &self.focus_handle(cx),
-                                                cx,
-                                            )
-                                            .map(|kb| kb.size(rems_from_px(12.))),
-                                        )
-                                        .on_click(move |_event, window, cx| {
-                                            window.dispatch_action(OpenHistory.boxed_clone(), cx);
-                                        })
-                                        .into_any_element(),
-                                ),
-                                cx,
-                            ),
-                        )
-                        .child(
-                            v_flex().p_1().pr_1p5().gap_1().children(
-                                recent_history
-                                    .into_iter()
-                                    .enumerate()
-                                    .map(|(index, entry)| {
-                                        // TODO: Add keyboard navigation.
-                                        let is_hovered =
-                                            self.hovered_recent_history_item == Some(index);
-                                        crate::acp::thread_history::AcpHistoryEntryElement::new(
-                                            entry,
-                                            cx.entity().downgrade(),
-                                        )
-                                        .hovered(is_hovered)
-                                        .on_hover(cx.listener(
-                                            move |this, is_hovered, _window, cx| {
-                                                if *is_hovered {
-                                                    this.hovered_recent_history_item = Some(index);
-                                                } else if this.hovered_recent_history_item
-                                                    == Some(index)
-                                                {
-                                                    this.hovered_recent_history_item = None;
-                                                }
-                                                cx.notify();
-                                            },
-                                        ))
-                                        .into_any_element()
-                                    }),
-                            ),
-                        ),
-                )
-            })
-            .into_any()
-    }
-
-    fn render_auth_required_state(
-        &self,
-        connection: &Rc<dyn AgentConnection>,
-        description: Option<&Entity<Markdown>>,
-        configuration_view: Option<&AnyView>,
-        pending_auth_method: Option<&acp::AuthMethodId>,
-        window: &mut Window,
-        cx: &Context<Self>,
-    ) -> Div {
-        let show_description =
-            configuration_view.is_none() && description.is_none() && pending_auth_method.is_none();
-
-        let auth_methods = connection.auth_methods();
-
-        v_flex().flex_1().size_full().justify_end().child(
-            v_flex()
-                .p_2()
-                .pr_3()
-                .w_full()
-                .gap_1()
-                .border_t_1()
-                .border_color(cx.theme().colors().border)
-                .bg(cx.theme().status().warning.opacity(0.04))
-                .child(
-                    h_flex()
-                        .gap_1p5()
-                        .child(
-                            Icon::new(IconName::Warning)
-                                .color(Color::Warning)
-                                .size(IconSize::Small),
-                        )
-                        .child(Label::new("Authentication Required").size(LabelSize::Small)),
-                )
-                .children(description.map(|desc| {
-                    div().text_ui(cx).child(self.render_markdown(
-                        desc.clone(),
-                        default_markdown_style(false, false, window, cx),
-                    ))
-                }))
-                .children(
-                    configuration_view
-                        .cloned()
-                        .map(|view| div().w_full().child(view)),
-                )
-                .when(show_description, |el| {
-                    el.child(
-                        Label::new(format!(
-                            "You are not currently authenticated with {}.{}",
-                            self.agent.name(),
-                            if auth_methods.len() > 1 {
-                                " Please choose one of the following options:"
-                            } else {
-                                ""
-                            }
-                        ))
-                        .size(LabelSize::Small)
-                        .color(Color::Muted)
-                        .mb_1()
-                        .ml_5(),
-                    )
-                })
-                .when_some(pending_auth_method, |el, _| {
-                    el.child(
-                        h_flex()
-                            .py_4()
-                            .w_full()
-                            .justify_center()
-                            .gap_1()
-                            .child(
-                                Icon::new(IconName::ArrowCircle)
-                                    .size(IconSize::Small)
-                                    .color(Color::Muted)
-                                    .with_rotate_animation(2),
-                            )
-                            .child(Label::new("Authenticating…").size(LabelSize::Small)),
-                    )
-                })
-                .when(!auth_methods.is_empty(), |this| {
-                    this.child(
-                        h_flex()
-                            .justify_end()
-                            .flex_wrap()
-                            .gap_1()
-                            .when(!show_description, |this| {
-                                this.border_t_1()
-                                    .mt_1()
-                                    .pt_2()
-                                    .border_color(cx.theme().colors().border.opacity(0.8))
-                            })
-                            .children(connection.auth_methods().iter().enumerate().rev().map(
-                                |(ix, method)| {
-                                    let (method_id, name) = if self
-                                        .project
-                                        .read(cx)
-                                        .is_via_remote_server()
-                                        && method.id.0.as_ref() == "oauth-personal"
-                                        && method.name == "Log in with Google"
-                                    {
-                                        ("spawn-gemini-cli".into(), "Log in with Gemini CLI".into())
-                                    } else {
-                                        (method.id.0.clone(), method.name.clone())
-                                    };
-
-                                    let agent_telemetry_id = connection.telemetry_id();
-
-                                    Button::new(method_id.clone(), name)
-                                        .label_size(LabelSize::Small)
-                                        .map(|this| {
-                                            if ix == 0 {
-                                                this.style(ButtonStyle::Tinted(TintColor::Warning))
-                                            } else {
-                                                this.style(ButtonStyle::Outlined)
-                                            }
-                                        })
-                                        .when_some(
-                                            method.description.clone(),
-                                            |this, description| {
-                                                this.tooltip(Tooltip::text(description))
-                                            },
-                                        )
-                                        .on_click({
-                                            cx.listener(move |this, _, window, cx| {
-                                                telemetry::event!(
-                                                    "Authenticate Agent Started",
-                                                    agent = agent_telemetry_id,
-                                                    method = method_id
-                                                );
-
-                                                this.authenticate(
-                                                    acp::AuthMethodId::new(method_id.clone()),
-                                                    window,
-                                                    cx,
-                                                )
-                                            })
-                                        })
-                                },
-                            )),
-                    )
-                }),
-        )
-    }
-
-    fn render_load_error(
-        &self,
-        e: &LoadError,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> AnyElement {
-        let (title, message, action_slot): (_, SharedString, _) = match e {
-            LoadError::Unsupported {
-                command: path,
-                current_version,
-                minimum_version,
-            } => {
-                return self.render_unsupported(path, current_version, minimum_version, window, cx);
-            }
-            LoadError::FailedToInstall(msg) => (
-                "Failed to Install",
-                msg.into(),
-                Some(self.create_copy_button(msg.to_string()).into_any_element()),
-            ),
-            LoadError::Exited { status } => (
-                "Failed to Launch",
-                format!("Server exited with status {status}").into(),
-                None,
-            ),
-            LoadError::Other(msg) => (
-                "Failed to Launch",
-                msg.into(),
-                Some(self.create_copy_button(msg.to_string()).into_any_element()),
-            ),
-        };
-
-        Callout::new()
-            .severity(Severity::Error)
-            .icon(IconName::XCircleFilled)
-            .title(title)
-            .description(message)
-            .actions_slot(div().children(action_slot))
-            .into_any_element()
-    }
-
-    fn render_unsupported(
-        &self,
-        path: &SharedString,
-        version: &SharedString,
-        minimum_version: &SharedString,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> AnyElement {
-        let (heading_label, description_label) = (
-            format!("Upgrade {} to work with Zed", self.agent.name()),
-            if version.is_empty() {
-                format!(
-                    "Currently using {}, which does not report a valid --version",
-                    path,
-                )
-            } else {
-                format!(
-                    "Currently using {}, which is only version {} (need at least {minimum_version})",
-                    path, version
-                )
-            },
-        );
-
-        v_flex()
-            .w_full()
-            .p_3p5()
-            .gap_2p5()
-            .border_t_1()
-            .border_color(cx.theme().colors().border)
-            .bg(linear_gradient(
-                180.,
-                linear_color_stop(cx.theme().colors().editor_background.opacity(0.4), 4.),
-                linear_color_stop(cx.theme().status().info_background.opacity(0.), 0.),
-            ))
-            .child(
-                v_flex().gap_0p5().child(Label::new(heading_label)).child(
-                    Label::new(description_label)
-                        .size(LabelSize::Small)
-                        .color(Color::Muted),
-                ),
-            )
-            .into_any_element()
-    }
-
-    fn activity_bar_bg(&self, cx: &Context<Self>) -> Hsla {
-        let editor_bg_color = cx.theme().colors().editor_background;
-        let active_color = cx.theme().colors().element_selected;
-        editor_bg_color.blend(active_color.opacity(0.3))
-    }
-
-    fn render_activity_bar(
-        &self,
-        thread_entity: &Entity<AcpThread>,
-        window: &mut Window,
-        cx: &Context<Self>,
-    ) -> Option<AnyElement> {
-        let thread = thread_entity.read(cx);
-        let action_log = thread.action_log();
-        let telemetry = ActionLogTelemetry::from(thread);
-        let changed_buffers = action_log.read(cx).changed_buffers(cx);
-        let plan = thread.plan();
-
-        if changed_buffers.is_empty() && plan.is_empty() {
-            return None;
-        }
-
-        // Temporarily always enable ACP edit controls. This is temporary, to lessen the
-        // impact of a nasty bug that causes them to sometimes be disabled when they shouldn't
-        // be, which blocks you from being able to accept or reject edits. This switches the
-        // bug to be that sometimes it's enabled when it shouldn't be, which at least doesn't
-        // block you from using the panel.
-        let pending_edits = false;
-
-        v_flex()
-            .mt_1()
-            .mx_2()
-            .bg(self.activity_bar_bg(cx))
-            .border_1()
-            .border_b_0()
-            .border_color(cx.theme().colors().border)
-            .rounded_t_md()
-            .shadow(vec![gpui::BoxShadow {
-                color: gpui::black().opacity(0.15),
-                offset: point(px(1.), px(-1.)),
-                blur_radius: px(3.),
-                spread_radius: px(0.),
-            }])
-            .when(!plan.is_empty(), |this| {
-                this.child(self.render_plan_summary(plan, window, cx))
-                    .when(self.plan_expanded, |parent| {
-                        parent.child(self.render_plan_entries(plan, window, cx))
-                    })
-            })
-            .when(!plan.is_empty() && !changed_buffers.is_empty(), |this| {
-                this.child(Divider::horizontal().color(DividerColor::Border))
-            })
-            .when(!changed_buffers.is_empty(), |this| {
-                this.child(self.render_edits_summary(
-                    &changed_buffers,
-                    self.edits_expanded,
-                    pending_edits,
-                    cx,
-                ))
-                .when(self.edits_expanded, |parent| {
-                    parent.child(self.render_edited_files(
-                        action_log,
-                        telemetry,
-                        &changed_buffers,
-                        pending_edits,
-                        cx,
-                    ))
-                })
-            })
-            .into_any()
-            .into()
-    }
-
-    fn render_plan_summary(
-        &self,
-        plan: &Plan,
-        window: &mut Window,
-        cx: &Context<Self>,
-    ) -> impl IntoElement {
-        let stats = plan.stats();
-
-        let title = if let Some(entry) = stats.in_progress_entry
-            && !self.plan_expanded
-        {
-            h_flex()
-                .cursor_default()
-                .relative()
-                .w_full()
-                .gap_1()
-                .truncate()
-                .child(
-                    Label::new("Current:")
-                        .size(LabelSize::Small)
-                        .color(Color::Muted),
-                )
-                .child(
-                    div()
-                        .text_xs()
-                        .text_color(cx.theme().colors().text_muted)
-                        .line_clamp(1)
-                        .child(MarkdownElement::new(
-                            entry.content.clone(),
-                            plan_label_markdown_style(&entry.status, window, cx),
-                        )),
-                )
-                .when(stats.pending > 0, |this| {
-                    this.child(
-                        h_flex()
-                            .absolute()
-                            .top_0()
-                            .right_0()
-                            .h_full()
-                            .child(div().min_w_8().h_full().bg(linear_gradient(
-                                90.,
-                                linear_color_stop(self.activity_bar_bg(cx), 1.),
-                                linear_color_stop(self.activity_bar_bg(cx).opacity(0.2), 0.),
-                            )))
-                            .child(
-                                div().pr_0p5().bg(self.activity_bar_bg(cx)).child(
-                                    Label::new(format!("{} left", stats.pending))
-                                        .size(LabelSize::Small)
-                                        .color(Color::Muted),
-                                ),
-                            ),
-                    )
-                })
-        } else {
-            let status_label = if stats.pending == 0 {
-                "All Done".to_string()
-            } else if stats.completed == 0 {
-                format!("{} Tasks", plan.entries.len())
-            } else {
-                format!("{}/{}", stats.completed, plan.entries.len())
-            };
-
-            h_flex()
-                .w_full()
-                .gap_1()
-                .justify_between()
-                .child(
-                    Label::new("Plan")
-                        .size(LabelSize::Small)
-                        .color(Color::Muted),
-                )
-                .child(
-                    Label::new(status_label)
-                        .size(LabelSize::Small)
-                        .color(Color::Muted)
-                        .mr_1(),
-                )
-        };
-
-        h_flex()
-            .id("plan_summary")
-            .p_1()
-            .w_full()
-            .gap_1()
-            .when(self.plan_expanded, |this| {
-                this.border_b_1().border_color(cx.theme().colors().border)
-            })
-            .child(Disclosure::new("plan_disclosure", self.plan_expanded))
-            .child(title)
-            .on_click(cx.listener(|this, _, _, cx| {
-                this.plan_expanded = !this.plan_expanded;
-                cx.notify();
-            }))
-    }
-
-    fn render_plan_entries(
-        &self,
-        plan: &Plan,
-        window: &mut Window,
-        cx: &Context<Self>,
-    ) -> impl IntoElement {
-        v_flex()
-            .id("plan_items_list")
-            .max_h_40()
-            .overflow_y_scroll()
-            .children(plan.entries.iter().enumerate().flat_map(|(index, entry)| {
-                let element = h_flex()
-                    .py_1()
-                    .px_2()
-                    .gap_2()
-                    .justify_between()
-                    .bg(cx.theme().colors().editor_background)
-                    .when(index < plan.entries.len() - 1, |parent| {
-                        parent.border_color(cx.theme().colors().border).border_b_1()
-                    })
-                    .child(
-                        h_flex()
-                            .id(("plan_entry", index))
-                            .gap_1p5()
-                            .max_w_full()
-                            .overflow_x_scroll()
-                            .text_xs()
-                            .text_color(cx.theme().colors().text_muted)
-                            .child(match entry.status {
-                                acp::PlanEntryStatus::InProgress => {
-                                    Icon::new(IconName::TodoProgress)
-                                        .size(IconSize::Small)
-                                        .color(Color::Accent)
-                                        .with_rotate_animation(2)
-                                        .into_any_element()
-                                }
-                                acp::PlanEntryStatus::Completed => {
-                                    Icon::new(IconName::TodoComplete)
-                                        .size(IconSize::Small)
-                                        .color(Color::Success)
-                                        .into_any_element()
-                                }
-                                acp::PlanEntryStatus::Pending | _ => {
-                                    Icon::new(IconName::TodoPending)
-                                        .size(IconSize::Small)
-                                        .color(Color::Muted)
-                                        .into_any_element()
-                                }
-                            })
-                            .child(MarkdownElement::new(
-                                entry.content.clone(),
-                                plan_label_markdown_style(&entry.status, window, cx),
-                            )),
-                    );
-
-                Some(element)
-            }))
-            .into_any_element()
-    }
-
-    fn render_edits_summary(
-        &self,
-        changed_buffers: &BTreeMap<Entity<Buffer>, Entity<BufferDiff>>,
-        expanded: bool,
-        pending_edits: bool,
-        cx: &Context<Self>,
-    ) -> Div {
-        const EDIT_NOT_READY_TOOLTIP_LABEL: &str = "Wait until file edits are complete.";
-
-        let focus_handle = self.focus_handle(cx);
-
-        h_flex()
-            .p_1()
-            .justify_between()
-            .flex_wrap()
-            .when(expanded, |this| {
-                this.border_b_1().border_color(cx.theme().colors().border)
-            })
-            .child(
-                h_flex()
-                    .id("edits-container")
-                    .cursor_pointer()
-                    .gap_1()
-                    .child(Disclosure::new("edits-disclosure", expanded))
-                    .map(|this| {
-                        if pending_edits {
-                            this.child(
-                                Label::new(format!(
-                                    "Editing {} {}…",
-                                    changed_buffers.len(),
-                                    if changed_buffers.len() == 1 {
-                                        "file"
-                                    } else {
-                                        "files"
-                                    }
-                                ))
-                                .color(Color::Muted)
-                                .size(LabelSize::Small)
-                                .with_animation(
-                                    "edit-label",
-                                    Animation::new(Duration::from_secs(2))
-                                        .repeat()
-                                        .with_easing(pulsating_between(0.3, 0.7)),
-                                    |label, delta| label.alpha(delta),
-                                ),
-                            )
-                        } else {
-                            this.child(
-                                Label::new("Edits")
-                                    .size(LabelSize::Small)
-                                    .color(Color::Muted),
-                            )
-                            .child(Label::new("•").size(LabelSize::XSmall).color(Color::Muted))
-                            .child(
-                                Label::new(format!(
-                                    "{} {}",
-                                    changed_buffers.len(),
-                                    if changed_buffers.len() == 1 {
-                                        "file"
-                                    } else {
-                                        "files"
-                                    }
-                                ))
-                                .size(LabelSize::Small)
-                                .color(Color::Muted),
-                            )
-                        }
-                    })
-                    .on_click(cx.listener(|this, _, _, cx| {
-                        this.edits_expanded = !this.edits_expanded;
-                        cx.notify();
-                    })),
-            )
-            .child(
-                h_flex()
-                    .gap_1()
-                    .child(
-                        IconButton::new("review-changes", IconName::ListTodo)
-                            .icon_size(IconSize::Small)
-                            .tooltip({
-                                let focus_handle = focus_handle.clone();
-                                move |_window, cx| {
-                                    Tooltip::for_action_in(
-                                        "Review Changes",
-                                        &OpenAgentDiff,
-                                        &focus_handle,
-                                        cx,
-                                    )
-                                }
-                            })
-                            .on_click(cx.listener(|_, _, window, cx| {
-                                window.dispatch_action(OpenAgentDiff.boxed_clone(), cx);
-                            })),
-                    )
-                    .child(Divider::vertical().color(DividerColor::Border))
-                    .child(
-                        Button::new("reject-all-changes", "Reject All")
-                            .label_size(LabelSize::Small)
-                            .disabled(pending_edits)
-                            .when(pending_edits, |this| {
-                                this.tooltip(Tooltip::text(EDIT_NOT_READY_TOOLTIP_LABEL))
-                            })
-                            .key_binding(
-                                KeyBinding::for_action_in(&RejectAll, &focus_handle.clone(), cx)
-                                    .map(|kb| kb.size(rems_from_px(10.))),
-                            )
-                            .on_click(cx.listener(move |this, _, window, cx| {
-                                this.reject_all(&RejectAll, window, cx);
-                            })),
-                    )
-                    .child(
-                        Button::new("keep-all-changes", "Keep All")
-                            .label_size(LabelSize::Small)
-                            .disabled(pending_edits)
-                            .when(pending_edits, |this| {
-                                this.tooltip(Tooltip::text(EDIT_NOT_READY_TOOLTIP_LABEL))
-                            })
-                            .key_binding(
-                                KeyBinding::for_action_in(&KeepAll, &focus_handle, cx)
-                                    .map(|kb| kb.size(rems_from_px(10.))),
-                            )
-                            .on_click(cx.listener(move |this, _, window, cx| {
-                                this.keep_all(&KeepAll, window, cx);
-                            })),
-                    ),
-            )
-    }
-
-    fn render_edited_files(
-        &self,
-        action_log: &Entity<ActionLog>,
-        telemetry: ActionLogTelemetry,
-        changed_buffers: &BTreeMap<Entity<Buffer>, Entity<BufferDiff>>,
-        pending_edits: bool,
-        cx: &Context<Self>,
-    ) -> impl IntoElement {
-        let editor_bg_color = cx.theme().colors().editor_background;
-
-        v_flex()
-            .id("edited_files_list")
-            .max_h_40()
-            .overflow_y_scroll()
-            .children(
-                changed_buffers
-                    .iter()
-                    .enumerate()
-                    .flat_map(|(index, (buffer, _diff))| {
-                        let file = buffer.read(cx).file()?;
-                        let path = file.path();
-                        let path_style = file.path_style(cx);
-                        let separator = file.path_style(cx).primary_separator();
-
-                        let file_path = path.parent().and_then(|parent| {
-                            if parent.is_empty() {
-                                None
-                            } else {
-                                Some(
-                                    Label::new(format!(
-                                        "{}{separator}",
-                                        parent.display(path_style)
-                                    ))
-                                    .color(Color::Muted)
-                                    .size(LabelSize::XSmall)
-                                    .buffer_font(cx),
-                                )
-                            }
-                        });
-
-                        let file_name = path.file_name().map(|name| {
-                            Label::new(name.to_string())
-                                .size(LabelSize::XSmall)
-                                .buffer_font(cx)
-                                .ml_1p5()
-                        });
-
-                        let file_icon = FileIcons::get_icon(path.as_std_path(), cx)
-                            .map(Icon::from_path)
-                            .map(|icon| icon.color(Color::Muted).size(IconSize::Small))
-                            .unwrap_or_else(|| {
-                                Icon::new(IconName::File)
-                                    .color(Color::Muted)
-                                    .size(IconSize::Small)
-                            });
-
-                        let overlay_gradient = linear_gradient(
-                            90.,
-                            linear_color_stop(editor_bg_color, 1.),
-                            linear_color_stop(editor_bg_color.opacity(0.2), 0.),
-                        );
-
-                        let element = h_flex()
-                            .group("edited-code")
-                            .id(("file-container", index))
-                            .py_1()
-                            .pl_2()
-                            .pr_1()
-                            .gap_2()
-                            .justify_between()
-                            .bg(editor_bg_color)
-                            .when(index < changed_buffers.len() - 1, |parent| {
-                                parent.border_color(cx.theme().colors().border).border_b_1()
-                            })
-                            .child(
-                                h_flex()
-                                    .id(("file-name-row", index))
-                                    .relative()
-                                    .pr_8()
-                                    .w_full()
-                                    .overflow_x_scroll()
-                                    .child(
-                                        h_flex()
-                                            .id(("file-name-path", index))
-                                            .cursor_pointer()
-                                            .pr_0p5()
-                                            .gap_0p5()
-                                            .hover(|s| s.bg(cx.theme().colors().element_hover))
-                                            .rounded_xs()
-                                            .child(file_icon)
-                                            .children(file_name)
-                                            .children(file_path)
-                                            .tooltip(Tooltip::text("Go to File"))
-                                            .on_click({
-                                                let buffer = buffer.clone();
-                                                cx.listener(move |this, _, window, cx| {
-                                                    this.open_edited_buffer(&buffer, window, cx);
-                                                })
-                                            }),
-                                    )
-                                    .child(
-                                        div()
-                                            .absolute()
-                                            .h_full()
-                                            .w_12()
-                                            .top_0()
-                                            .bottom_0()
-                                            .right_0()
-                                            .bg(overlay_gradient),
-                                    ),
-                            )
-                            .child(
-                                h_flex()
-                                    .gap_1()
-                                    .visible_on_hover("edited-code")
-                                    .child(
-                                        Button::new("review", "Review")
-                                            .label_size(LabelSize::Small)
-                                            .on_click({
-                                                let buffer = buffer.clone();
-                                                cx.listener(move |this, _, window, cx| {
-                                                    this.open_edited_buffer(&buffer, window, cx);
-                                                })
-                                            }),
-                                    )
-                                    .child(Divider::vertical().color(DividerColor::BorderVariant))
-                                    .child(
-                                        Button::new("reject-file", "Reject")
-                                            .label_size(LabelSize::Small)
-                                            .disabled(pending_edits)
-                                            .on_click({
-                                                let buffer = buffer.clone();
-                                                let action_log = action_log.clone();
-                                                let telemetry = telemetry.clone();
-                                                move |_, _, cx| {
-                                                    action_log.update(cx, |action_log, cx| {
-                                                        action_log
-                                                    .reject_edits_in_ranges(
-                                                        buffer.clone(),
-                                                        vec![Anchor::min_max_range_for_buffer(
-                                                            buffer.read(cx).remote_id(),
-                                                        )],
-                                                        Some(telemetry.clone()),
-                                                        cx,
-                                                    )
-                                                    .detach_and_log_err(cx);
-                                                    })
-                                                }
-                                            }),
-                                    )
-                                    .child(
-                                        Button::new("keep-file", "Keep")
-                                            .label_size(LabelSize::Small)
-                                            .disabled(pending_edits)
-                                            .on_click({
-                                                let buffer = buffer.clone();
-                                                let action_log = action_log.clone();
-                                                let telemetry = telemetry.clone();
-                                                move |_, _, cx| {
-                                                    action_log.update(cx, |action_log, cx| {
-                                                        action_log.keep_edits_in_range(
-                                                            buffer.clone(),
-                                                            Anchor::min_max_range_for_buffer(
-                                                                buffer.read(cx).remote_id(),
-                                                            ),
-                                                            Some(telemetry.clone()),
-                                                            cx,
-                                                        );
-                                                    })
-                                                }
-                                            }),
-                                    ),
-                            );
-
-                        Some(element)
-                    }),
-            )
-            .into_any_element()
-    }
-
-    fn render_message_editor(&mut self, window: &mut Window, cx: &mut Context<Self>) -> AnyElement {
-        let focus_handle = self.message_editor.focus_handle(cx);
-        let editor_bg_color = cx.theme().colors().editor_background;
-        let (expand_icon, expand_tooltip) = if self.editor_expanded {
-            (IconName::Minimize, "Minimize Message Editor")
-        } else {
-            (IconName::Maximize, "Expand Message Editor")
-        };
-
-        let backdrop = div()
-            .size_full()
-            .absolute()
-            .inset_0()
-            .bg(cx.theme().colors().panel_background)
-            .opacity(0.8)
-            .block_mouse_except_scroll();
-
-        let enable_editor = match self.thread_state {
-            ThreadState::Ready { .. } => true,
-            ThreadState::Loading { .. }
-            | ThreadState::Unauthenticated { .. }
-            | ThreadState::LoadError(..) => false,
-        };
-
-        v_flex()
-            .on_action(cx.listener(Self::expand_message_editor))
-            .on_action(cx.listener(|this, _: &ToggleProfileSelector, window, cx| {
-                if let Some(profile_selector) = this.profile_selector.as_ref() {
-                    profile_selector.read(cx).menu_handle().toggle(window, cx);
-                } else if let Some(mode_selector) = this.mode_selector() {
-                    mode_selector.read(cx).menu_handle().toggle(window, cx);
-                }
-            }))
-            .on_action(cx.listener(|this, _: &CycleModeSelector, window, cx| {
-                if let Some(mode_selector) = this.mode_selector() {
-                    mode_selector.update(cx, |mode_selector, cx| {
-                        mode_selector.cycle_mode(window, cx);
-                    });
-                }
-            }))
-            .on_action(cx.listener(|this, _: &ToggleModelSelector, window, cx| {
-                if let Some(model_selector) = this.model_selector.as_ref() {
-                    model_selector
-                        .update(cx, |model_selector, cx| model_selector.toggle(window, cx));
-                }
-            }))
-            .p_2()
-            .gap_2()
-            .border_t_1()
-            .border_color(cx.theme().colors().border)
-            .bg(editor_bg_color)
-            .when(self.editor_expanded, |this| {
-                this.h(vh(0.8, window)).size_full().justify_between()
-            })
-            .child(
-                v_flex()
-                    .relative()
-                    .size_full()
-                    .pt_1()
-                    .pr_2p5()
-                    .child(self.message_editor.clone())
-                    .child(
-                        h_flex()
-                            .absolute()
-                            .top_0()
-                            .right_0()
-                            .opacity(0.5)
-                            .hover(|this| this.opacity(1.0))
-                            .child(
-                                IconButton::new("toggle-height", expand_icon)
-                                    .icon_size(IconSize::Small)
-                                    .icon_color(Color::Muted)
-                                    .tooltip({
-                                        move |_window, cx| {
-                                            Tooltip::for_action_in(
-                                                expand_tooltip,
-                                                &ExpandMessageEditor,
-                                                &focus_handle,
-                                                cx,
-                                            )
-                                        }
-                                    })
-                                    .on_click(cx.listener(|this, _, window, cx| {
-                                        this.expand_message_editor(
-                                            &ExpandMessageEditor,
-                                            window,
-                                            cx,
-                                        );
-                                    })),
-                            ),
-                    ),
-            )
-            .child(
-                h_flex()
-                    .flex_none()
-                    .flex_wrap()
-                    .justify_between()
-                    .child(
-                        h_flex()
-                            .gap_0p5()
-                            .child(self.render_add_context_button(cx))
-                            .child(self.render_follow_toggle(cx))
-                            .children(self.render_burn_mode_toggle(cx)),
-                    )
-                    .child(
-                        h_flex()
-                            .gap_1()
-                            .children(self.render_token_usage(cx))
-                            .children(self.profile_selector.clone())
-                            .children(self.mode_selector().cloned())
-                            .children(self.model_selector.clone())
-                            .child(self.render_send_button(cx)),
-                    ),
-            )
-            .when(!enable_editor, |this| this.child(backdrop))
-            .into_any()
-    }
-
-    pub(crate) fn as_native_connection(
-        &self,
-        cx: &App,
-    ) -> Option<Rc<agent::NativeAgentConnection>> {
-        let acp_thread = self.thread()?.read(cx);
-        acp_thread.connection().clone().downcast()
-    }
-
-    pub(crate) fn as_native_thread(&self, cx: &App) -> Option<Entity<agent::Thread>> {
-        let acp_thread = self.thread()?.read(cx);
-        self.as_native_connection(cx)?
-            .thread(acp_thread.session_id(), cx)
-    }
-
-    fn is_using_zed_ai_models(&self, cx: &App) -> bool {
-        self.as_native_thread(cx)
-            .and_then(|thread| thread.read(cx).model())
-            .is_some_and(|model| model.provider_id() == language_model::ZED_CLOUD_PROVIDER_ID)
-    }
-
-    fn render_token_usage(&self, cx: &mut Context<Self>) -> Option<Div> {
-        let thread = self.thread()?.read(cx);
-        let usage = thread.token_usage()?;
-        let is_generating = thread.status() != ThreadStatus::Idle;
-
-        let used = crate::text_thread_editor::humanize_token_count(usage.used_tokens);
-        let max = crate::text_thread_editor::humanize_token_count(usage.max_tokens);
-
-        Some(
-            h_flex()
-                .flex_shrink_0()
-                .gap_0p5()
-                .mr_1p5()
-                .child(
-                    Label::new(used)
-                        .size(LabelSize::Small)
-                        .color(Color::Muted)
-                        .map(|label| {
-                            if is_generating {
-                                label
-                                    .with_animation(
-                                        "used-tokens-label",
-                                        Animation::new(Duration::from_secs(2))
-                                            .repeat()
-                                            .with_easing(pulsating_between(0.3, 0.8)),
-                                        |label, delta| label.alpha(delta),
-                                    )
-                                    .into_any()
-                            } else {
-                                label.into_any_element()
-                            }
-                        }),
-                )
-                .child(
-                    Label::new("/")
-                        .size(LabelSize::Small)
-                        .color(Color::Custom(cx.theme().colors().text_muted.opacity(0.5))),
-                )
-                .child(Label::new(max).size(LabelSize::Small).color(Color::Muted)),
-        )
-    }
-
-    fn toggle_burn_mode(
-        &mut self,
-        _: &ToggleBurnMode,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(thread) = self.as_native_thread(cx) else {
-            return;
-        };
-
-        thread.update(cx, |thread, cx| {
-            let current_mode = thread.completion_mode();
-            thread.set_completion_mode(
-                match current_mode {
-                    CompletionMode::Burn => CompletionMode::Normal,
-                    CompletionMode::Normal => CompletionMode::Burn,
-                },
-                cx,
-            );
-        });
-    }
-
-    fn keep_all(&mut self, _: &KeepAll, _window: &mut Window, cx: &mut Context<Self>) {
-        let Some(thread) = self.thread() else {
-            return;
-        };
-        let telemetry = ActionLogTelemetry::from(thread.read(cx));
-        let action_log = thread.read(cx).action_log().clone();
-        action_log.update(cx, |action_log, cx| {
-            action_log.keep_all_edits(Some(telemetry), cx)
-        });
-    }
-
-    fn reject_all(&mut self, _: &RejectAll, _window: &mut Window, cx: &mut Context<Self>) {
-        let Some(thread) = self.thread() else {
-            return;
-        };
-        let telemetry = ActionLogTelemetry::from(thread.read(cx));
-        let action_log = thread.read(cx).action_log().clone();
-        action_log
-            .update(cx, |action_log, cx| {
-                action_log.reject_all_edits(Some(telemetry), cx)
-            })
-            .detach();
-    }
-
-    fn allow_always(&mut self, _: &AllowAlways, window: &mut Window, cx: &mut Context<Self>) {
-        self.authorize_pending_tool_call(acp::PermissionOptionKind::AllowAlways, window, cx);
-    }
-
-    fn allow_once(&mut self, _: &AllowOnce, window: &mut Window, cx: &mut Context<Self>) {
-        self.authorize_pending_tool_call(acp::PermissionOptionKind::AllowOnce, window, cx);
-    }
-
-    fn reject_once(&mut self, _: &RejectOnce, window: &mut Window, cx: &mut Context<Self>) {
-        self.authorize_pending_tool_call(acp::PermissionOptionKind::RejectOnce, window, cx);
-    }
-
-    fn authorize_pending_tool_call(
-        &mut self,
-        kind: acp::PermissionOptionKind,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<()> {
-        let thread = self.thread()?.read(cx);
-        let tool_call = thread.first_tool_awaiting_confirmation()?;
-        let ToolCallStatus::WaitingForConfirmation { options, .. } = &tool_call.status else {
-            return None;
-        };
-        let option = options.iter().find(|o| o.kind == kind)?;
-
-        self.authorize_tool_call(
-            tool_call.id.clone(),
-            option.option_id.clone(),
-            option.kind,
-            window,
-            cx,
-        );
-
-        Some(())
-    }
-
-    fn render_burn_mode_toggle(&self, cx: &mut Context<Self>) -> Option<AnyElement> {
-        let thread = self.as_native_thread(cx)?.read(cx);
-
-        if thread
-            .model()
-            .is_none_or(|model| !model.supports_burn_mode())
-        {
-            return None;
-        }
-
-        let active_completion_mode = thread.completion_mode();
-        let burn_mode_enabled = active_completion_mode == CompletionMode::Burn;
-        let icon = if burn_mode_enabled {
-            IconName::ZedBurnModeOn
-        } else {
-            IconName::ZedBurnMode
-        };
-
-        Some(
-            IconButton::new("burn-mode", icon)
-                .icon_size(IconSize::Small)
-                .icon_color(Color::Muted)
-                .toggle_state(burn_mode_enabled)
-                .selected_icon_color(Color::Error)
-                .on_click(cx.listener(|this, _event, window, cx| {
-                    this.toggle_burn_mode(&ToggleBurnMode, window, cx);
-                }))
-                .tooltip(move |_window, cx| {
-                    cx.new(|_| BurnModeTooltip::new().selected(burn_mode_enabled))
-                        .into()
-                })
-                .into_any_element(),
-        )
-    }
-
-    fn render_send_button(&self, cx: &mut Context<Self>) -> AnyElement {
-        let is_editor_empty = self.message_editor.read(cx).is_empty(cx);
-        let is_generating = self
-            .thread()
-            .is_some_and(|thread| thread.read(cx).status() != ThreadStatus::Idle);
-
-        if self.is_loading_contents {
-            div()
-                .id("loading-message-content")
-                .px_1()
-                .tooltip(Tooltip::text("Loading Added Context…"))
-                .child(loading_contents_spinner(IconSize::default()))
-                .into_any_element()
-        } else if is_generating && is_editor_empty {
-            IconButton::new("stop-generation", IconName::Stop)
-                .icon_color(Color::Error)
-                .style(ButtonStyle::Tinted(ui::TintColor::Error))
-                .tooltip(move |_window, cx| {
-                    Tooltip::for_action("Stop Generation", &editor::actions::Cancel, cx)
-                })
-                .on_click(cx.listener(|this, _event, _, cx| this.cancel_generation(cx)))
-                .into_any_element()
-        } else {
-            let send_btn_tooltip = if is_editor_empty && !is_generating {
-                "Type to Send"
-            } else if is_generating {
-                "Stop and Send Message"
-            } else {
-                "Send"
-            };
-
-            IconButton::new("send-message", IconName::Send)
-                .style(ButtonStyle::Filled)
-                .map(|this| {
-                    if is_editor_empty && !is_generating {
-                        this.disabled(true).icon_color(Color::Muted)
-                    } else {
-                        this.icon_color(Color::Accent)
-                    }
-                })
-                .tooltip(move |_window, cx| Tooltip::for_action(send_btn_tooltip, &Chat, cx))
-                .on_click(cx.listener(|this, _, window, cx| {
-                    this.send(window, cx);
-                }))
-                .into_any_element()
-        }
-    }
-
-    fn is_following(&self, cx: &App) -> bool {
-        match self.thread().map(|thread| thread.read(cx).status()) {
-            Some(ThreadStatus::Generating) => self
-                .workspace
-                .read_with(cx, |workspace, _| {
-                    workspace.is_being_followed(CollaboratorId::Agent)
-                })
-                .unwrap_or(false),
-            _ => self.should_be_following,
-        }
-    }
-
-    fn toggle_following(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let following = self.is_following(cx);
-
-        self.should_be_following = !following;
-        if self.thread().map(|thread| thread.read(cx).status()) == Some(ThreadStatus::Generating) {
-            self.workspace
-                .update(cx, |workspace, cx| {
-                    if following {
-                        workspace.unfollow(CollaboratorId::Agent, window, cx);
-                    } else {
-                        workspace.follow(CollaboratorId::Agent, window, cx);
-                    }
-                })
-                .ok();
-        }
-
-        telemetry::event!("Follow Agent Selected", following = !following);
-    }
-
-    fn render_follow_toggle(&self, cx: &mut Context<Self>) -> impl IntoElement {
-        let following = self.is_following(cx);
-
-        let tooltip_label = if following {
-            if self.agent.name() == "Zed Agent" {
-                format!("Stop Following the {}", self.agent.name())
-            } else {
-                format!("Stop Following {}", self.agent.name())
-            }
-        } else {
-            if self.agent.name() == "Zed Agent" {
-                format!("Follow the {}", self.agent.name())
-            } else {
-                format!("Follow {}", self.agent.name())
-            }
-        };
-
-        IconButton::new("follow-agent", IconName::Crosshair)
-            .icon_size(IconSize::Small)
-            .icon_color(Color::Muted)
-            .toggle_state(following)
-            .selected_icon_color(Some(Color::Custom(cx.theme().players().agent().cursor)))
-            .tooltip(move |_window, cx| {
-                if following {
-                    Tooltip::for_action(tooltip_label.clone(), &Follow, cx)
-                } else {
-                    Tooltip::with_meta(
-                        tooltip_label.clone(),
-                        Some(&Follow),
-                        "Track the agent's location as it reads and edits files.",
-                        cx,
-                    )
-                }
-            })
-            .on_click(cx.listener(move |this, _, window, cx| {
-                this.toggle_following(window, cx);
-            }))
-    }
-
-    fn render_add_context_button(&self, cx: &mut Context<Self>) -> impl IntoElement {
-        let message_editor = self.message_editor.clone();
-        let menu_visible = message_editor.read(cx).is_completions_menu_visible(cx);
-
-        IconButton::new("add-context", IconName::AtSign)
-            .icon_size(IconSize::Small)
-            .icon_color(Color::Muted)
-            .when(!menu_visible, |this| {
-                this.tooltip(move |_window, cx| {
-                    Tooltip::with_meta("Add Context", None, "Or type @ to include context", cx)
-                })
-            })
-            .on_click(cx.listener(move |_this, _, window, cx| {
-                let message_editor_clone = message_editor.clone();
-
-                window.defer(cx, move |window, cx| {
-                    message_editor_clone.update(cx, |message_editor, cx| {
-                        message_editor.trigger_completion_menu(window, cx);
-                    });
-                });
-            }))
-    }
-
-    fn render_markdown(&self, markdown: Entity<Markdown>, style: MarkdownStyle) -> MarkdownElement {
-        let workspace = self.workspace.clone();
-        MarkdownElement::new(markdown, style).on_url_click(move |text, window, cx| {
-            Self::open_link(text, &workspace, window, cx);
-        })
-    }
-
-    fn open_link(
-        url: SharedString,
-        workspace: &WeakEntity<Workspace>,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        let Some(workspace) = workspace.upgrade() else {
-            cx.open_url(&url);
-            return;
-        };
-
-        if let Some(mention) = MentionUri::parse(&url, workspace.read(cx).path_style(cx)).log_err()
-        {
-            workspace.update(cx, |workspace, cx| match mention {
-                MentionUri::File { abs_path } => {
-                    let project = workspace.project();
-                    let Some(path) =
-                        project.update(cx, |project, cx| project.find_project_path(abs_path, cx))
-                    else {
-                        return;
-                    };
-
-                    workspace
-                        .open_path(path, None, true, window, cx)
-                        .detach_and_log_err(cx);
-                }
-                MentionUri::PastedImage => {}
-                MentionUri::Directory { abs_path } => {
-                    let project = workspace.project();
-                    let Some(entry_id) = project.update(cx, |project, cx| {
-                        let path = project.find_project_path(abs_path, cx)?;
-                        project.entry_for_path(&path, cx).map(|entry| entry.id)
-                    }) else {
-                        return;
-                    };
-
-                    project.update(cx, |_, cx| {
-                        cx.emit(project::Event::RevealInProjectPanel(entry_id));
-                    });
-                }
-                MentionUri::Symbol {
-                    abs_path: path,
-                    line_range,
-                    ..
-                }
-                | MentionUri::Selection {
-                    abs_path: Some(path),
-                    line_range,
-                } => {
-                    let project = workspace.project();
-                    let Some(path) =
-                        project.update(cx, |project, cx| project.find_project_path(path, cx))
-                    else {
-                        return;
-                    };
-
-                    let item = workspace.open_path(path, None, true, window, cx);
-                    window
-                        .spawn(cx, async move |cx| {
-                            let Some(editor) = item.await?.downcast::<Editor>() else {
-                                return Ok(());
-                            };
-                            let range = Point::new(*line_range.start(), 0)
-                                ..Point::new(*line_range.start(), 0);
-                            editor
-                                .update_in(cx, |editor, window, cx| {
-                                    editor.change_selections(
-                                        SelectionEffects::scroll(Autoscroll::center()),
-                                        window,
-                                        cx,
-                                        |s| s.select_ranges(vec![range]),
-                                    );
-                                })
-                                .ok();
-                            anyhow::Ok(())
-                        })
-                        .detach_and_log_err(cx);
-                }
-                MentionUri::Selection { abs_path: None, .. } => {}
-                MentionUri::Thread { id, name } => {
-                    if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
-                        panel.update(cx, |panel, cx| {
-                            panel.load_agent_thread(
-                                DbThreadMetadata {
-                                    id,
-                                    title: name.into(),
-                                    updated_at: Default::default(),
-                                },
-                                window,
-                                cx,
-                            )
-                        });
-                    }
-                }
-                MentionUri::TextThread { path, .. } => {
-                    if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
-                        panel.update(cx, |panel, cx| {
-                            panel
-                                .open_saved_text_thread(path.as_path().into(), window, cx)
-                                .detach_and_log_err(cx);
-                        });
-                    }
-                }
-                MentionUri::Rule { id, .. } => {
-                    let PromptId::User { uuid } = id else {
-                        return;
-                    };
-                    window.dispatch_action(
-                        Box::new(OpenRulesLibrary {
-                            prompt_to_select: Some(uuid.0),
-                        }),
-                        cx,
-                    )
-                }
-                MentionUri::Fetch { url } => {
-                    cx.open_url(url.as_str());
-                }
-            })
-        } else {
-            cx.open_url(&url);
-        }
-    }
-
-    fn open_tool_call_location(
-        &self,
-        entry_ix: usize,
-        location_ix: usize,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<()> {
-        let (tool_call_location, agent_location) = self
-            .thread()?
-            .read(cx)
-            .entries()
-            .get(entry_ix)?
-            .location(location_ix)?;
-
-        let project_path = self
-            .project
-            .read(cx)
-            .find_project_path(&tool_call_location.path, cx)?;
-
-        let open_task = self
-            .workspace
-            .update(cx, |workspace, cx| {
-                workspace.open_path(project_path, None, true, window, cx)
-            })
-            .log_err()?;
-        window
-            .spawn(cx, async move |cx| {
-                let item = open_task.await?;
-
-                let Some(active_editor) = item.downcast::<Editor>() else {
-                    return anyhow::Ok(());
-                };
-
-                active_editor.update_in(cx, |editor, window, cx| {
-                    let multibuffer = editor.buffer().read(cx);
-                    let buffer = multibuffer.as_singleton();
-                    if agent_location.buffer.upgrade() == buffer {
-                        let excerpt_id = multibuffer.excerpt_ids().first().cloned();
-                        let anchor =
-                            editor::Anchor::in_buffer(excerpt_id.unwrap(), agent_location.position);
-                        editor.change_selections(Default::default(), window, cx, |selections| {
-                            selections.select_anchor_ranges([anchor..anchor]);
-                        })
-                    } else {
-                        let row = tool_call_location.line.unwrap_or_default();
-                        editor.change_selections(Default::default(), window, cx, |selections| {
-                            selections.select_ranges([Point::new(row, 0)..Point::new(row, 0)]);
-                        })
-                    }
-                })?;
-
-                anyhow::Ok(())
-            })
-            .detach_and_log_err(cx);
-
-        None
-    }
-
-    pub fn open_thread_as_markdown(
-        &self,
-        workspace: Entity<Workspace>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<()>> {
-        let markdown_language_task = workspace
-            .read(cx)
-            .app_state()
-            .languages
-            .language_for_name("Markdown");
-
-        let (thread_title, markdown) = if let Some(thread) = self.thread() {
-            let thread = thread.read(cx);
-            (thread.title().to_string(), thread.to_markdown(cx))
-        } else {
-            return Task::ready(Ok(()));
-        };
-
-        let project = workspace.read(cx).project().clone();
-        window.spawn(cx, async move |cx| {
-            let markdown_language = markdown_language_task.await?;
-
-            let buffer = project
-                .update(cx, |project, cx| project.create_buffer(false, cx))?
-                .await?;
-
-            buffer.update(cx, |buffer, cx| {
-                buffer.set_text(markdown, cx);
-                buffer.set_language(Some(markdown_language), cx);
-                buffer.set_capability(language::Capability::ReadWrite, cx);
-            })?;
-
-            workspace.update_in(cx, |workspace, window, cx| {
-                let buffer = cx
-                    .new(|cx| MultiBuffer::singleton(buffer, cx).with_title(thread_title.clone()));
-
-                workspace.add_item_to_active_pane(
-                    Box::new(cx.new(|cx| {
-                        let mut editor =
-                            Editor::for_multibuffer(buffer, Some(project.clone()), window, cx);
-                        editor.set_breadcrumb_header(thread_title);
-                        editor
-                    })),
-                    None,
-                    true,
-                    window,
-                    cx,
-                );
-            })?;
-            anyhow::Ok(())
-        })
-    }
-
-    fn scroll_to_top(&mut self, cx: &mut Context<Self>) {
-        self.list_state.scroll_to(ListOffset::default());
-        cx.notify();
-    }
-
-    pub fn scroll_to_bottom(&mut self, cx: &mut Context<Self>) {
-        if let Some(thread) = self.thread() {
-            let entry_count = thread.read(cx).entries().len();
-            self.list_state.reset(entry_count);
-            cx.notify();
-        }
-    }
-
-    fn notify_with_sound(
-        &mut self,
-        caption: impl Into<SharedString>,
-        icon: IconName,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.play_notification_sound(window, cx);
-        self.show_notification(caption, icon, window, cx);
-    }
-
-    fn play_notification_sound(&self, window: &Window, cx: &mut App) {
-        let settings = AgentSettings::get_global(cx);
-        if settings.play_sound_when_agent_done && !window.is_window_active() {
-            Audio::play_sound(Sound::AgentDone, cx);
-        }
-    }
-
-    fn show_notification(
-        &mut self,
-        caption: impl Into<SharedString>,
-        icon: IconName,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if !self.notifications.is_empty() {
-            return;
-        }
-
-        let settings = AgentSettings::get_global(cx);
-
-        let window_is_inactive = !window.is_window_active();
-        let panel_is_hidden = self
-            .workspace
-            .upgrade()
-            .map(|workspace| AgentPanel::is_hidden(&workspace, cx))
-            .unwrap_or(true);
-
-        let should_notify = window_is_inactive || panel_is_hidden;
-
-        if !should_notify {
-            return;
-        }
-
-        // TODO: Change this once we have title summarization for external agents.
-        let title = self.agent.name();
-
-        match settings.notify_when_agent_waiting {
-            NotifyWhenAgentWaiting::PrimaryScreen => {
-                if let Some(primary) = cx.primary_display() {
-                    self.pop_up(icon, caption.into(), title, window, primary, cx);
-                }
-            }
-            NotifyWhenAgentWaiting::AllScreens => {
-                let caption = caption.into();
-                for screen in cx.displays() {
-                    self.pop_up(icon, caption.clone(), title.clone(), window, screen, cx);
-                }
-            }
-            NotifyWhenAgentWaiting::Never => {
-                // Don't show anything
-            }
-        }
-    }
-
-    fn pop_up(
-        &mut self,
-        icon: IconName,
-        caption: SharedString,
-        title: SharedString,
-        window: &mut Window,
-        screen: Rc<dyn PlatformDisplay>,
-        cx: &mut Context<Self>,
-    ) {
-        let options = AgentNotification::window_options(screen, cx);
-
-        let project_name = self.workspace.upgrade().and_then(|workspace| {
-            workspace
-                .read(cx)
-                .project()
-                .read(cx)
-                .visible_worktrees(cx)
-                .next()
-                .map(|worktree| worktree.read(cx).root_name_str().to_string())
-        });
-
-        if let Some(screen_window) = cx
-            .open_window(options, |_, cx| {
-                cx.new(|_| {
-                    AgentNotification::new(title.clone(), caption.clone(), icon, project_name)
-                })
-            })
-            .log_err()
-            && let Some(pop_up) = screen_window.entity(cx).log_err()
-        {
-            self.notification_subscriptions
-                .entry(screen_window)
-                .or_insert_with(Vec::new)
-                .push(cx.subscribe_in(&pop_up, window, {
-                    |this, _, event, window, cx| match event {
-                        AgentNotificationEvent::Accepted => {
-                            let handle = window.window_handle();
-                            cx.activate(true);
-
-                            let workspace_handle = this.workspace.clone();
-
-                            // If there are multiple Zed windows, activate the correct one.
-                            cx.defer(move |cx| {
-                                handle
-                                    .update(cx, |_view, window, _cx| {
-                                        window.activate_window();
-
-                                        if let Some(workspace) = workspace_handle.upgrade() {
-                                            workspace.update(_cx, |workspace, cx| {
-                                                workspace.focus_panel::<AgentPanel>(window, cx);
-                                            });
-                                        }
-                                    })
-                                    .log_err();
-                            });
-
-                            this.dismiss_notifications(cx);
-                        }
-                        AgentNotificationEvent::Dismissed => {
-                            this.dismiss_notifications(cx);
-                        }
-                    }
-                }));
-
-            self.notifications.push(screen_window);
-
-            // If the user manually refocuses the original window, dismiss the popup.
-            self.notification_subscriptions
-                .entry(screen_window)
-                .or_insert_with(Vec::new)
-                .push({
-                    let pop_up_weak = pop_up.downgrade();
-
-                    cx.observe_window_activation(window, move |_, window, cx| {
-                        if window.is_window_active()
-                            && let Some(pop_up) = pop_up_weak.upgrade()
-                        {
-                            pop_up.update(cx, |_, cx| {
-                                cx.emit(AgentNotificationEvent::Dismissed);
-                            });
-                        }
-                    })
-                });
-        }
-    }
-
-    fn dismiss_notifications(&mut self, cx: &mut Context<Self>) {
-        for window in self.notifications.drain(..) {
-            window
-                .update(cx, |_, window, _| {
-                    window.remove_window();
-                })
-                .ok();
-
-            self.notification_subscriptions.remove(&window);
-        }
-    }
-
-    fn render_generating(&self, confirmation: bool) -> impl IntoElement {
-        h_flex()
-            .id("generating-spinner")
-            .py_2()
-            .px(rems_from_px(22.))
-            .map(|this| {
-                if confirmation {
-                    this.gap_2()
-                        .child(
-                            h_flex()
-                                .w_2()
-                                .child(SpinnerLabel::sand().size(LabelSize::Small)),
-                        )
-                        .child(
-                            LoadingLabel::new("Waiting Confirmation")
-                                .size(LabelSize::Small)
-                                .color(Color::Muted),
-                        )
-                } else {
-                    this.child(SpinnerLabel::new().size(LabelSize::Small))
-                }
-            })
-            .into_any_element()
-    }
-
-    fn render_thread_controls(
-        &self,
-        thread: &Entity<AcpThread>,
-        cx: &Context<Self>,
-    ) -> impl IntoElement {
-        let is_generating = matches!(thread.read(cx).status(), ThreadStatus::Generating);
-        if is_generating {
-            return self.render_generating(false).into_any_element();
-        }
-
-        let open_as_markdown = IconButton::new("open-as-markdown", IconName::FileMarkdown)
-            .shape(ui::IconButtonShape::Square)
-            .icon_size(IconSize::Small)
-            .icon_color(Color::Ignored)
-            .tooltip(Tooltip::text("Open Thread as Markdown"))
-            .on_click(cx.listener(move |this, _, window, cx| {
-                if let Some(workspace) = this.workspace.upgrade() {
-                    this.open_thread_as_markdown(workspace, window, cx)
-                        .detach_and_log_err(cx);
-                }
-            }));
-
-        let scroll_to_top = IconButton::new("scroll_to_top", IconName::ArrowUp)
-            .shape(ui::IconButtonShape::Square)
-            .icon_size(IconSize::Small)
-            .icon_color(Color::Ignored)
-            .tooltip(Tooltip::text("Scroll To Top"))
-            .on_click(cx.listener(move |this, _, _, cx| {
-                this.scroll_to_top(cx);
-            }));
-
-        let mut container = h_flex()
-            .w_full()
-            .py_2()
-            .px_5()
-            .gap_px()
-            .opacity(0.6)
-            .hover(|s| s.opacity(1.))
-            .justify_end();
-
-        if AgentSettings::get_global(cx).enable_feedback
-            && self
-                .thread()
-                .is_some_and(|thread| thread.read(cx).connection().telemetry().is_some())
-        {
-            let feedback = self.thread_feedback.feedback;
-
-            let tooltip_meta = || {
-                SharedString::new(
-                    "Rating the thread sends all of your current conversation to the Zed team.",
-                )
-            };
-
-            container = container
-                .child(
-                    IconButton::new("feedback-thumbs-up", IconName::ThumbsUp)
-                        .shape(ui::IconButtonShape::Square)
-                        .icon_size(IconSize::Small)
-                        .icon_color(match feedback {
-                            Some(ThreadFeedback::Positive) => Color::Accent,
-                            _ => Color::Ignored,
-                        })
-                        .tooltip(move |window, cx| match feedback {
-                            Some(ThreadFeedback::Positive) => {
-                                Tooltip::text("Thanks for your feedback!")(window, cx)
-                            }
-                            _ => Tooltip::with_meta("Helpful Response", None, tooltip_meta(), cx),
-                        })
-                        .on_click(cx.listener(move |this, _, window, cx| {
-                            this.handle_feedback_click(ThreadFeedback::Positive, window, cx);
-                        })),
-                )
-                .child(
-                    IconButton::new("feedback-thumbs-down", IconName::ThumbsDown)
-                        .shape(ui::IconButtonShape::Square)
-                        .icon_size(IconSize::Small)
-                        .icon_color(match feedback {
-                            Some(ThreadFeedback::Negative) => Color::Accent,
-                            _ => Color::Ignored,
-                        })
-                        .tooltip(move |window, cx| match feedback {
-                            Some(ThreadFeedback::Negative) => {
-                                Tooltip::text(
-                                    "We appreciate your feedback and will use it to improve in the future.",
-                                )(window, cx)
-                            }
-                            _ => {
-                                Tooltip::with_meta("Not Helpful Response", None, tooltip_meta(), cx)
-                            }
-                        })
-                        .on_click(cx.listener(move |this, _, window, cx| {
-                            this.handle_feedback_click(ThreadFeedback::Negative, window, cx);
-                        })),
-                );
-        }
-
-        container
-            .child(open_as_markdown)
-            .child(scroll_to_top)
-            .into_any_element()
-    }
-
-    fn render_feedback_feedback_editor(editor: Entity<Editor>, cx: &Context<Self>) -> Div {
-        h_flex()
-            .key_context("AgentFeedbackMessageEditor")
-            .on_action(cx.listener(move |this, _: &menu::Cancel, _, cx| {
-                this.thread_feedback.dismiss_comments();
-                cx.notify();
-            }))
-            .on_action(cx.listener(move |this, _: &menu::Confirm, _window, cx| {
-                this.submit_feedback_message(cx);
-            }))
-            .p_2()
-            .mb_2()
-            .mx_5()
-            .gap_1()
-            .rounded_md()
-            .border_1()
-            .border_color(cx.theme().colors().border)
-            .bg(cx.theme().colors().editor_background)
-            .child(div().w_full().child(editor))
-            .child(
-                h_flex()
-                    .child(
-                        IconButton::new("dismiss-feedback-message", IconName::Close)
-                            .icon_color(Color::Error)
-                            .icon_size(IconSize::XSmall)
-                            .shape(ui::IconButtonShape::Square)
-                            .on_click(cx.listener(move |this, _, _window, cx| {
-                                this.thread_feedback.dismiss_comments();
-                                cx.notify();
-                            })),
-                    )
-                    .child(
-                        IconButton::new("submit-feedback-message", IconName::Return)
-                            .icon_size(IconSize::XSmall)
-                            .shape(ui::IconButtonShape::Square)
-                            .on_click(cx.listener(move |this, _, _window, cx| {
-                                this.submit_feedback_message(cx);
-                            })),
-                    ),
-            )
-    }
-
-    fn handle_feedback_click(
-        &mut self,
-        feedback: ThreadFeedback,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(thread) = self.thread().cloned() else {
-            return;
-        };
-
-        self.thread_feedback.submit(thread, feedback, window, cx);
-        cx.notify();
-    }
-
-    fn submit_feedback_message(&mut self, cx: &mut Context<Self>) {
-        let Some(thread) = self.thread().cloned() else {
-            return;
-        };
-
-        self.thread_feedback.submit_comments(thread, cx);
-        cx.notify();
-    }
-
-    fn render_token_limit_callout(
-        &self,
-        line_height: Pixels,
-        cx: &mut Context<Self>,
-    ) -> Option<Callout> {
-        let token_usage = self.thread()?.read(cx).token_usage()?;
-        let ratio = token_usage.ratio();
-
-        let (severity, title) = match ratio {
-            acp_thread::TokenUsageRatio::Normal => return None,
-            acp_thread::TokenUsageRatio::Warning => {
-                (Severity::Warning, "Thread reaching the token limit soon")
-            }
-            acp_thread::TokenUsageRatio::Exceeded => {
-                (Severity::Error, "Thread reached the token limit")
-            }
-        };
-
-        let burn_mode_available = self.as_native_thread(cx).is_some_and(|thread| {
-            thread.read(cx).completion_mode() == CompletionMode::Normal
-                && thread
-                    .read(cx)
-                    .model()
-                    .is_some_and(|model| model.supports_burn_mode())
-        });
-
-        let description = if burn_mode_available {
-            "To continue, start a new thread from a summary or turn Burn Mode on."
-        } else {
-            "To continue, start a new thread from a summary."
-        };
-
-        Some(
-            Callout::new()
-                .severity(severity)
-                .line_height(line_height)
-                .title(title)
-                .description(description)
-                .actions_slot(
-                    h_flex()
-                        .gap_0p5()
-                        .child(
-                            Button::new("start-new-thread", "Start New Thread")
-                                .label_size(LabelSize::Small)
-                                .on_click(cx.listener(|this, _, window, cx| {
-                                    let Some(thread) = this.thread() else {
-                                        return;
-                                    };
-                                    let session_id = thread.read(cx).session_id().clone();
-                                    window.dispatch_action(
-                                        crate::NewNativeAgentThreadFromSummary {
-                                            from_session_id: session_id,
-                                        }
-                                        .boxed_clone(),
-                                        cx,
-                                    );
-                                })),
-                        )
-                        .when(burn_mode_available, |this| {
-                            this.child(
-                                IconButton::new("burn-mode-callout", IconName::ZedBurnMode)
-                                    .icon_size(IconSize::XSmall)
-                                    .on_click(cx.listener(|this, _event, window, cx| {
-                                        this.toggle_burn_mode(&ToggleBurnMode, window, cx);
-                                    })),
-                            )
-                        }),
-                ),
-        )
-    }
-
-    fn render_usage_callout(&self, line_height: Pixels, cx: &mut Context<Self>) -> Option<Div> {
-        if !self.is_using_zed_ai_models(cx) {
-            return None;
-        }
-
-        let user_store = self.project.read(cx).user_store().read(cx);
-        if user_store.is_usage_based_billing_enabled() {
-            return None;
-        }
-
-        let plan = user_store
-            .plan()
-            .unwrap_or(cloud_llm_client::Plan::V1(PlanV1::ZedFree));
-
-        let usage = user_store.model_request_usage()?;
-
-        Some(
-            div()
-                .child(UsageCallout::new(plan, usage))
-                .line_height(line_height),
-        )
-    }
-
-    fn agent_ui_font_size_changed(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
-        self.entry_view_state.update(cx, |entry_view_state, cx| {
-            entry_view_state.agent_ui_font_size_changed(cx);
-        });
-    }
-
-    pub(crate) fn insert_dragged_files(
-        &self,
-        paths: Vec<project::ProjectPath>,
-        added_worktrees: Vec<Entity<project::Worktree>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.message_editor.update(cx, |message_editor, cx| {
-            message_editor.insert_dragged_files(paths, added_worktrees, window, cx);
-        })
-    }
-
-    /// Inserts the selected text into the message editor or the message being
-    /// edited, if any.
-    pub(crate) fn insert_selections(&self, window: &mut Window, cx: &mut Context<Self>) {
-        self.active_editor(cx).update(cx, |editor, cx| {
-            editor.insert_selections(window, cx);
-        });
-    }
-
-    fn render_thread_retry_status_callout(
-        &self,
-        _window: &mut Window,
-        _cx: &mut Context<Self>,
-    ) -> Option<Callout> {
-        let state = self.thread_retry_status.as_ref()?;
-
-        let next_attempt_in = state
-            .duration
-            .saturating_sub(Instant::now().saturating_duration_since(state.started_at));
-        if next_attempt_in.is_zero() {
-            return None;
-        }
-
-        let next_attempt_in_secs = next_attempt_in.as_secs() + 1;
-
-        let retry_message = if state.max_attempts == 1 {
-            if next_attempt_in_secs == 1 {
-                "Retrying. Next attempt in 1 second.".to_string()
-            } else {
-                format!("Retrying. Next attempt in {next_attempt_in_secs} seconds.")
-            }
-        } else if next_attempt_in_secs == 1 {
-            format!(
-                "Retrying. Next attempt in 1 second (Attempt {} of {}).",
-                state.attempt, state.max_attempts,
-            )
-        } else {
-            format!(
-                "Retrying. Next attempt in {next_attempt_in_secs} seconds (Attempt {} of {}).",
-                state.attempt, state.max_attempts,
-            )
-        };
-
-        Some(
-            Callout::new()
-                .severity(Severity::Warning)
-                .title(state.last_error.clone())
-                .description(retry_message),
-        )
-    }
-
-    fn render_codex_windows_warning(&self, cx: &mut Context<Self>) -> Callout {
-        Callout::new()
-            .icon(IconName::Warning)
-            .severity(Severity::Warning)
-            .title("Codex on Windows")
-            .description("For best performance, run Codex in Windows Subsystem for Linux (WSL2)")
-            .actions_slot(
-                Button::new("open-wsl-modal", "Open in WSL")
-                    .icon_size(IconSize::Small)
-                    .icon_color(Color::Muted)
-                    .on_click(cx.listener({
-                        move |_, _, _window, cx| {
-                            #[cfg(windows)]
-                            _window.dispatch_action(
-                                zed_actions::wsl_actions::OpenWsl::default().boxed_clone(),
-                                cx,
-                            );
-                            cx.notify();
-                        }
-                    })),
-            )
-            .dismiss_action(
-                IconButton::new("dismiss", IconName::Close)
-                    .icon_size(IconSize::Small)
-                    .icon_color(Color::Muted)
-                    .tooltip(Tooltip::text("Dismiss Warning"))
-                    .on_click(cx.listener({
-                        move |this, _, _, cx| {
-                            this.show_codex_windows_warning = false;
-                            cx.notify();
-                        }
-                    })),
-            )
-    }
-
-    fn render_thread_error(&mut self, window: &mut Window, cx: &mut Context<Self>) -> Option<Div> {
-        let content = match self.thread_error.as_ref()? {
-            ThreadError::Other(error) => self.render_any_thread_error(error.clone(), window, cx),
-            ThreadError::Refusal => self.render_refusal_error(cx),
-            ThreadError::AuthenticationRequired(error) => {
-                self.render_authentication_required_error(error.clone(), cx)
-            }
-            ThreadError::PaymentRequired => self.render_payment_required_error(cx),
-            ThreadError::ModelRequestLimitReached(plan) => {
-                self.render_model_request_limit_reached_error(*plan, cx)
-            }
-            ThreadError::ToolUseLimitReached => self.render_tool_use_limit_reached_error(cx)?,
-        };
-
-        Some(div().child(content))
-    }
-
-    fn render_new_version_callout(&self, version: &SharedString, cx: &mut Context<Self>) -> Div {
-        v_flex().w_full().justify_end().child(
-            h_flex()
-                .p_2()
-                .pr_3()
-                .w_full()
-                .gap_1p5()
-                .border_t_1()
-                .border_color(cx.theme().colors().border)
-                .bg(cx.theme().colors().element_background)
-                .child(
-                    h_flex()
-                        .flex_1()
-                        .gap_1p5()
-                        .child(
-                            Icon::new(IconName::Download)
-                                .color(Color::Accent)
-                                .size(IconSize::Small),
-                        )
-                        .child(Label::new("New version available").size(LabelSize::Small)),
-                )
-                .child(
-                    Button::new("update-button", format!("Update to v{}", version))
-                        .label_size(LabelSize::Small)
-                        .style(ButtonStyle::Tinted(TintColor::Accent))
-                        .on_click(cx.listener(|this, _, window, cx| {
-                            this.reset(window, cx);
-                        })),
-                ),
-        )
-    }
-
-    fn current_mode_id(&self, cx: &App) -> Option<Arc<str>> {
-        if let Some(thread) = self.as_native_thread(cx) {
-            Some(thread.read(cx).profile().0.clone())
-        } else if let Some(mode_selector) = self.mode_selector() {
-            Some(mode_selector.read(cx).mode().0)
-        } else {
-            None
-        }
-    }
-
-    fn current_model_id(&self, cx: &App) -> Option<String> {
-        self.model_selector
-            .as_ref()
-            .and_then(|selector| selector.read(cx).active_model(cx).map(|m| m.id.to_string()))
-    }
-
-    fn current_model_name(&self, cx: &App) -> SharedString {
-        // For native agent (Zed Agent), use the specific model name (e.g., "Claude 3.5 Sonnet")
-        // For ACP agents, use the agent name (e.g., "Claude Code", "Gemini CLI")
-        // This provides better clarity about what refused the request
-        if self.as_native_connection(cx).is_some() {
-            self.model_selector
-                .as_ref()
-                .and_then(|selector| selector.read(cx).active_model(cx))
-                .map(|model| model.name.clone())
-                .unwrap_or_else(|| SharedString::from("The model"))
-        } else {
-            // ACP agent - use the agent name (e.g., "Claude Code", "Gemini CLI")
-            self.agent.name()
-        }
-    }
-
-    fn render_refusal_error(&self, cx: &mut Context<'_, Self>) -> Callout {
-        let model_or_agent_name = self.current_model_name(cx);
-        let refusal_message = format!(
-            "{} refused to respond to this prompt. This can happen when a model believes the prompt violates its content policy or safety guidelines, so rephrasing it can sometimes address the issue.",
-            model_or_agent_name
-        );
-
-        Callout::new()
-            .severity(Severity::Error)
-            .title("Request Refused")
-            .icon(IconName::XCircle)
-            .description(refusal_message.clone())
-            .actions_slot(self.create_copy_button(&refusal_message))
-            .dismiss_action(self.dismiss_error_button(cx))
-    }
-
-    fn render_any_thread_error(
-        &mut self,
-        error: SharedString,
-        window: &mut Window,
-        cx: &mut Context<'_, Self>,
-    ) -> Callout {
-        let can_resume = self
-            .thread()
-            .map_or(false, |thread| thread.read(cx).can_resume(cx));
-
-        let can_enable_burn_mode = self.as_native_thread(cx).map_or(false, |thread| {
-            let thread = thread.read(cx);
-            let supports_burn_mode = thread
-                .model()
-                .map_or(false, |model| model.supports_burn_mode());
-            supports_burn_mode && thread.completion_mode() == CompletionMode::Normal
-        });
-
-        let markdown = if let Some(markdown) = &self.thread_error_markdown {
-            markdown.clone()
-        } else {
-            let markdown = cx.new(|cx| Markdown::new(error.clone(), None, None, cx));
-            self.thread_error_markdown = Some(markdown.clone());
-            markdown
-        };
-
-        let markdown_style = default_markdown_style(false, true, window, cx);
-        let description = self
-            .render_markdown(markdown, markdown_style)
-            .into_any_element();
-
-        Callout::new()
-            .severity(Severity::Error)
-            .icon(IconName::XCircle)
-            .title("An Error Happened")
-            .description_slot(description)
-            .actions_slot(
-                h_flex()
-                    .gap_0p5()
-                    .when(can_resume && can_enable_burn_mode, |this| {
-                        this.child(
-                            Button::new("enable-burn-mode-and-retry", "Enable Burn Mode and Retry")
-                                .icon(IconName::ZedBurnMode)
-                                .icon_position(IconPosition::Start)
-                                .icon_size(IconSize::Small)
-                                .label_size(LabelSize::Small)
-                                .on_click(cx.listener(|this, _, window, cx| {
-                                    this.toggle_burn_mode(&ToggleBurnMode, window, cx);
-                                    this.resume_chat(cx);
-                                })),
-                        )
-                    })
-                    .when(can_resume, |this| {
-                        this.child(
-                            IconButton::new("retry", IconName::RotateCw)
-                                .icon_size(IconSize::Small)
-                                .tooltip(Tooltip::text("Retry Generation"))
-                                .on_click(cx.listener(|this, _, _window, cx| {
-                                    this.resume_chat(cx);
-                                })),
-                        )
-                    })
-                    .child(self.create_copy_button(error.to_string())),
-            )
-            .dismiss_action(self.dismiss_error_button(cx))
-    }
-
-    fn render_payment_required_error(&self, cx: &mut Context<Self>) -> Callout {
-        const ERROR_MESSAGE: &str =
-            "You reached your free usage limit. Upgrade to Zed Pro for more prompts.";
-
-        Callout::new()
-            .severity(Severity::Error)
-            .icon(IconName::XCircle)
-            .title("Free Usage Exceeded")
-            .description(ERROR_MESSAGE)
-            .actions_slot(
-                h_flex()
-                    .gap_0p5()
-                    .child(self.upgrade_button(cx))
-                    .child(self.create_copy_button(ERROR_MESSAGE)),
-            )
-            .dismiss_action(self.dismiss_error_button(cx))
-    }
-
-    fn render_authentication_required_error(
-        &self,
-        error: SharedString,
-        cx: &mut Context<Self>,
-    ) -> Callout {
-        Callout::new()
-            .severity(Severity::Error)
-            .title("Authentication Required")
-            .icon(IconName::XCircle)
-            .description(error.clone())
-            .actions_slot(
-                h_flex()
-                    .gap_0p5()
-                    .child(self.authenticate_button(cx))
-                    .child(self.create_copy_button(error)),
-            )
-            .dismiss_action(self.dismiss_error_button(cx))
-    }
-
-    fn render_model_request_limit_reached_error(
-        &self,
-        plan: cloud_llm_client::Plan,
-        cx: &mut Context<Self>,
-    ) -> Callout {
-        let error_message = match plan {
-            cloud_llm_client::Plan::V1(PlanV1::ZedPro) => {
-                "Upgrade to usage-based billing for more prompts."
-            }
-            cloud_llm_client::Plan::V1(PlanV1::ZedProTrial)
-            | cloud_llm_client::Plan::V1(PlanV1::ZedFree) => "Upgrade to Zed Pro for more prompts.",
-            cloud_llm_client::Plan::V2(_) => "",
-        };
-
-        Callout::new()
-            .severity(Severity::Error)
-            .title("Model Prompt Limit Reached")
-            .icon(IconName::XCircle)
-            .description(error_message)
-            .actions_slot(
-                h_flex()
-                    .gap_0p5()
-                    .child(self.upgrade_button(cx))
-                    .child(self.create_copy_button(error_message)),
-            )
-            .dismiss_action(self.dismiss_error_button(cx))
-    }
-
-    fn render_tool_use_limit_reached_error(&self, cx: &mut Context<Self>) -> Option<Callout> {
-        let thread = self.as_native_thread(cx)?;
-        let supports_burn_mode = thread
-            .read(cx)
-            .model()
-            .is_some_and(|model| model.supports_burn_mode());
-
-        let focus_handle = self.focus_handle(cx);
-
-        Some(
-            Callout::new()
-                .icon(IconName::Info)
-                .title("Consecutive tool use limit reached.")
-                .actions_slot(
-                    h_flex()
-                        .gap_0p5()
-                        .when(supports_burn_mode, |this| {
-                            this.child(
-                                Button::new("continue-burn-mode", "Continue with Burn Mode")
-                                    .style(ButtonStyle::Filled)
-                                    .style(ButtonStyle::Tinted(ui::TintColor::Accent))
-                                    .layer(ElevationIndex::ModalSurface)
-                                    .label_size(LabelSize::Small)
-                                    .key_binding(
-                                        KeyBinding::for_action_in(
-                                            &ContinueWithBurnMode,
-                                            &focus_handle,
-                                            cx,
-                                        )
-                                        .map(|kb| kb.size(rems_from_px(10.))),
-                                    )
-                                    .tooltip(Tooltip::text(
-                                        "Enable Burn Mode for unlimited tool use.",
-                                    ))
-                                    .on_click({
-                                        cx.listener(move |this, _, _window, cx| {
-                                            thread.update(cx, |thread, cx| {
-                                                thread
-                                                    .set_completion_mode(CompletionMode::Burn, cx);
-                                            });
-                                            this.resume_chat(cx);
-                                        })
-                                    }),
-                            )
-                        })
-                        .child(
-                            Button::new("continue-conversation", "Continue")
-                                .layer(ElevationIndex::ModalSurface)
-                                .label_size(LabelSize::Small)
-                                .key_binding(
-                                    KeyBinding::for_action_in(&ContinueThread, &focus_handle, cx)
-                                        .map(|kb| kb.size(rems_from_px(10.))),
-                                )
-                                .on_click(cx.listener(|this, _, _window, cx| {
-                                    this.resume_chat(cx);
-                                })),
-                        ),
-                ),
-        )
-    }
-
-    fn create_copy_button(&self, message: impl Into<String>) -> impl IntoElement {
-        let message = message.into();
-
-        IconButton::new("copy", IconName::Copy)
-            .icon_size(IconSize::Small)
-            .tooltip(Tooltip::text("Copy Error Message"))
-            .on_click(move |_, _, cx| {
-                cx.write_to_clipboard(ClipboardItem::new_string(message.clone()))
-            })
-    }
-
-    fn dismiss_error_button(&self, cx: &mut Context<Self>) -> impl IntoElement {
-        IconButton::new("dismiss", IconName::Close)
-            .icon_size(IconSize::Small)
-            .tooltip(Tooltip::text("Dismiss Error"))
-            .on_click(cx.listener({
-                move |this, _, _, cx| {
-                    this.clear_thread_error(cx);
-                    cx.notify();
-                }
-            }))
-    }
-
-    fn authenticate_button(&self, cx: &mut Context<Self>) -> impl IntoElement {
-        Button::new("authenticate", "Authenticate")
-            .label_size(LabelSize::Small)
-            .style(ButtonStyle::Filled)
-            .on_click(cx.listener({
-                move |this, _, window, cx| {
-                    let agent = this.agent.clone();
-                    let ThreadState::Ready { thread, .. } = &this.thread_state else {
-                        return;
-                    };
-
-                    let connection = thread.read(cx).connection().clone();
-                    let err = AuthRequired {
-                        description: None,
-                        provider_id: None,
-                    };
-                    this.clear_thread_error(cx);
-                    if let Some(message) = this.in_flight_prompt.take() {
-                        this.message_editor.update(cx, |editor, cx| {
-                            editor.set_message(message, window, cx);
-                        });
-                    }
-                    let this = cx.weak_entity();
-                    window.defer(cx, |window, cx| {
-                        Self::handle_auth_required(this, err, agent, connection, window, cx);
-                    })
-                }
-            }))
-    }
-
-    pub(crate) fn reauthenticate(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let agent = self.agent.clone();
-        let ThreadState::Ready { thread, .. } = &self.thread_state else {
-            return;
-        };
-
-        let connection = thread.read(cx).connection().clone();
-        let err = AuthRequired {
-            description: None,
-            provider_id: None,
-        };
-        self.clear_thread_error(cx);
-        let this = cx.weak_entity();
-        window.defer(cx, |window, cx| {
-            Self::handle_auth_required(this, err, agent, connection, window, cx);
-        })
-    }
-
-    fn upgrade_button(&self, cx: &mut Context<Self>) -> impl IntoElement {
-        Button::new("upgrade", "Upgrade")
-            .label_size(LabelSize::Small)
-            .style(ButtonStyle::Tinted(ui::TintColor::Accent))
-            .on_click(cx.listener({
-                move |this, _, _, cx| {
-                    this.clear_thread_error(cx);
-                    cx.open_url(&zed_urls::upgrade_to_zed_pro_url(cx));
-                }
-            }))
-    }
-
-    pub fn delete_history_entry(&mut self, entry: HistoryEntry, cx: &mut Context<Self>) {
-        let task = match entry {
-            HistoryEntry::AcpThread(thread) => self.history_store.update(cx, |history, cx| {
-                history.delete_thread(thread.id.clone(), cx)
-            }),
-            HistoryEntry::TextThread(text_thread) => {
-                self.history_store.update(cx, |history, cx| {
-                    history.delete_text_thread(text_thread.path.clone(), cx)
-                })
-            }
-        };
-        task.detach_and_log_err(cx);
-    }
-
-    /// Returns the currently active editor, either for a message that is being
-    /// edited or the editor for a new message.
-    fn active_editor(&self, cx: &App) -> Entity<MessageEditor> {
-        if let Some(index) = self.editing_message
-            && let Some(editor) = self
-                .entry_view_state
-                .read(cx)
-                .entry(index)
-                .and_then(|e| e.message_editor())
-                .cloned()
-        {
-            editor
-        } else {
-            self.message_editor.clone()
-        }
-    }
-}
-
-fn loading_contents_spinner(size: IconSize) -> AnyElement {
-    Icon::new(IconName::LoadCircle)
-        .size(size)
-        .color(Color::Accent)
-        .with_rotate_animation(3)
-        .into_any_element()
-}
-
-fn placeholder_text(agent_name: &str, has_commands: bool) -> String {
-    if agent_name == "Zed Agent" {
-        format!("Message the {} — @ to include context", agent_name)
-    } else if has_commands {
-        format!(
-            "Message {} — @ to include context, / for commands",
-            agent_name
-        )
-    } else {
-        format!("Message {} — @ to include context", agent_name)
-    }
-}
-
-impl Focusable for AcpThreadView {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        match self.thread_state {
-            ThreadState::Ready { .. } => self.active_editor(cx).focus_handle(cx),
-            ThreadState::Loading { .. }
-            | ThreadState::LoadError(_)
-            | ThreadState::Unauthenticated { .. } => self.focus_handle.clone(),
-        }
-    }
-}
-
-impl Render for AcpThreadView {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let has_messages = self.list_state.item_count() > 0;
-        let line_height = TextSize::Small.rems(cx).to_pixels(window.rem_size()) * 1.5;
-
-        v_flex()
-            .size_full()
-            .key_context("AcpThread")
-            .on_action(cx.listener(Self::toggle_burn_mode))
-            .on_action(cx.listener(Self::keep_all))
-            .on_action(cx.listener(Self::reject_all))
-            .on_action(cx.listener(Self::allow_always))
-            .on_action(cx.listener(Self::allow_once))
-            .on_action(cx.listener(Self::reject_once))
-            .track_focus(&self.focus_handle)
-            .bg(cx.theme().colors().panel_background)
-            .child(match &self.thread_state {
-                ThreadState::Unauthenticated {
-                    connection,
-                    description,
-                    configuration_view,
-                    pending_auth_method,
-                    ..
-                } => self
-                    .render_auth_required_state(
-                        connection,
-                        description.as_ref(),
-                        configuration_view.as_ref(),
-                        pending_auth_method.as_ref(),
-                        window,
-                        cx,
-                    )
-                    .into_any(),
-                ThreadState::Loading { .. } => v_flex()
-                    .flex_1()
-                    .child(self.render_recent_history(cx))
-                    .into_any(),
-                ThreadState::LoadError(e) => v_flex()
-                    .flex_1()
-                    .size_full()
-                    .items_center()
-                    .justify_end()
-                    .child(self.render_load_error(e, window, cx))
-                    .into_any(),
-                ThreadState::Ready { .. } => v_flex().flex_1().map(|this| {
-                    if has_messages {
-                        this.child(
-                            list(
-                                self.list_state.clone(),
-                                cx.processor(|this, index: usize, window, cx| {
-                                    let Some((entry, len)) = this.thread().and_then(|thread| {
-                                        let entries = &thread.read(cx).entries();
-                                        Some((entries.get(index)?, entries.len()))
-                                    }) else {
-                                        return Empty.into_any();
-                                    };
-                                    this.render_entry(index, len, entry, window, cx)
-                                }),
-                            )
-                            .with_sizing_behavior(gpui::ListSizingBehavior::Auto)
-                            .flex_grow()
-                            .into_any(),
-                        )
-                        .vertical_scrollbar_for(&self.list_state, window, cx)
-                        .into_any()
-                    } else {
-                        this.child(self.render_recent_history(cx)).into_any()
-                    }
-                }),
-            })
-            // The activity bar is intentionally rendered outside of the ThreadState::Ready match
-            // above so that the scrollbar doesn't render behind it. The current setup allows
-            // the scrollbar to stop exactly at the activity bar start.
-            .when(has_messages, |this| match &self.thread_state {
-                ThreadState::Ready { thread, .. } => {
-                    this.children(self.render_activity_bar(thread, window, cx))
-                }
-                _ => this,
-            })
-            .children(self.render_thread_retry_status_callout(window, cx))
-            .when(self.show_codex_windows_warning, |this| {
-                this.child(self.render_codex_windows_warning(cx))
-            })
-            .children(self.render_thread_error(window, cx))
-            .when_some(
-                self.new_server_version_available.as_ref().filter(|_| {
-                    !has_messages || !matches!(self.thread_state, ThreadState::Ready { .. })
-                }),
-                |this, version| this.child(self.render_new_version_callout(&version, cx)),
-            )
-            .children(
-                if let Some(usage_callout) = self.render_usage_callout(line_height, cx) {
-                    Some(usage_callout.into_any_element())
-                } else {
-                    self.render_token_limit_callout(line_height, cx)
-                        .map(|token_limit_callout| token_limit_callout.into_any_element())
-                },
-            )
-            .child(self.render_message_editor(window, cx))
-    }
-}
-
-fn default_markdown_style(
-    buffer_font: bool,
-    muted_text: bool,
-    window: &Window,
-    cx: &App,
-) -> MarkdownStyle {
-    let theme_settings = ThemeSettings::get_global(cx);
-    let colors = cx.theme().colors();
-
-    let buffer_font_size = theme_settings.agent_buffer_font_size(cx);
-
-    let mut text_style = window.text_style();
-    let line_height = buffer_font_size * 1.75;
-
-    let font_family = if buffer_font {
-        theme_settings.buffer_font.family.clone()
-    } else {
-        theme_settings.ui_font.family.clone()
-    };
-
-    let font_size = if buffer_font {
-        theme_settings.agent_buffer_font_size(cx)
-    } else {
-        theme_settings.agent_ui_font_size(cx)
-    };
-
-    let text_color = if muted_text {
-        colors.text_muted
-    } else {
-        colors.text
-    };
-
-    text_style.refine(&TextStyleRefinement {
-        font_family: Some(font_family),
-        font_fallbacks: theme_settings.ui_font.fallbacks.clone(),
-        font_features: Some(theme_settings.ui_font.features.clone()),
-        font_size: Some(font_size.into()),
-        line_height: Some(line_height.into()),
-        color: Some(text_color),
-        ..Default::default()
-    });
-
-    MarkdownStyle {
-        base_text_style: text_style.clone(),
-        syntax: cx.theme().syntax().clone(),
-        selection_background_color: colors.element_selection_background,
-        code_block_overflow_x_scroll: true,
-        heading_level_styles: Some(HeadingLevelStyles {
-            h1: Some(TextStyleRefinement {
-                font_size: Some(rems(1.15).into()),
-                ..Default::default()
-            }),
-            h2: Some(TextStyleRefinement {
-                font_size: Some(rems(1.1).into()),
-                ..Default::default()
-            }),
-            h3: Some(TextStyleRefinement {
-                font_size: Some(rems(1.05).into()),
-                ..Default::default()
-            }),
-            h4: Some(TextStyleRefinement {
-                font_size: Some(rems(1.).into()),
-                ..Default::default()
-            }),
-            h5: Some(TextStyleRefinement {
-                font_size: Some(rems(0.95).into()),
-                ..Default::default()
-            }),
-            h6: Some(TextStyleRefinement {
-                font_size: Some(rems(0.875).into()),
-                ..Default::default()
-            }),
-        }),
-        code_block: StyleRefinement {
-            padding: EdgesRefinement {
-                top: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(8.)))),
-                left: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(8.)))),
-                right: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(8.)))),
-                bottom: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(8.)))),
-            },
-            margin: EdgesRefinement {
-                top: Some(Length::Definite(px(8.).into())),
-                left: Some(Length::Definite(px(0.).into())),
-                right: Some(Length::Definite(px(0.).into())),
-                bottom: Some(Length::Definite(px(12.).into())),
-            },
-            border_style: Some(BorderStyle::Solid),
-            border_widths: EdgesRefinement {
-                top: Some(AbsoluteLength::Pixels(px(1.))),
-                left: Some(AbsoluteLength::Pixels(px(1.))),
-                right: Some(AbsoluteLength::Pixels(px(1.))),
-                bottom: Some(AbsoluteLength::Pixels(px(1.))),
-            },
-            border_color: Some(colors.border_variant),
-            background: Some(colors.editor_background.into()),
-            text: Some(TextStyleRefinement {
-                font_family: Some(theme_settings.buffer_font.family.clone()),
-                font_fallbacks: theme_settings.buffer_font.fallbacks.clone(),
-                font_features: Some(theme_settings.buffer_font.features.clone()),
-                font_size: Some(buffer_font_size.into()),
-                ..Default::default()
-            }),
-            ..Default::default()
-        },
-        inline_code: TextStyleRefinement {
-            font_family: Some(theme_settings.buffer_font.family.clone()),
-            font_fallbacks: theme_settings.buffer_font.fallbacks.clone(),
-            font_features: Some(theme_settings.buffer_font.features.clone()),
-            font_size: Some(buffer_font_size.into()),
-            background_color: Some(colors.editor_foreground.opacity(0.08)),
-            ..Default::default()
-        },
-        link: TextStyleRefinement {
-            background_color: Some(colors.editor_foreground.opacity(0.025)),
-            color: Some(colors.text_accent),
-            underline: Some(UnderlineStyle {
-                color: Some(colors.text_accent.opacity(0.5)),
-                thickness: px(1.),
-                ..Default::default()
-            }),
-            ..Default::default()
-        },
-        ..Default::default()
-    }
-}
-
-fn plan_label_markdown_style(
-    status: &acp::PlanEntryStatus,
-    window: &Window,
-    cx: &App,
-) -> MarkdownStyle {
-    let default_md_style = default_markdown_style(false, false, window, cx);
-
-    MarkdownStyle {
-        base_text_style: TextStyle {
-            color: cx.theme().colors().text_muted,
-            strikethrough: if matches!(status, acp::PlanEntryStatus::Completed) {
-                Some(gpui::StrikethroughStyle {
-                    thickness: px(1.),
-                    color: Some(cx.theme().colors().text_muted.opacity(0.8)),
-                })
-            } else {
-                None
-            },
-            ..default_md_style.base_text_style
-        },
-        ..default_md_style
-    }
-}
-
-fn terminal_command_markdown_style(window: &Window, cx: &App) -> MarkdownStyle {
-    let default_md_style = default_markdown_style(true, false, window, cx);
-
-    MarkdownStyle {
-        base_text_style: TextStyle {
-            ..default_md_style.base_text_style
-        },
-        selection_background_color: cx.theme().colors().element_selection_background,
-        ..Default::default()
-    }
-}
-
-#[cfg(test)]
-pub(crate) mod tests {
-    use acp_thread::StubAgentConnection;
-    use agent_client_protocol::SessionId;
-    use assistant_text_thread::TextThreadStore;
-    use editor::MultiBufferOffset;
-    use fs::FakeFs;
-    use gpui::{EventEmitter, TestAppContext, VisualTestContext};
-    use project::Project;
-    use serde_json::json;
-    use settings::SettingsStore;
-    use std::any::Any;
-    use std::path::Path;
-    use workspace::Item;
-
-    use super::*;
-
-    #[gpui::test]
-    async fn test_drop(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let (thread_view, _cx) = setup_thread_view(StubAgentServer::default_response(), cx).await;
-        let weak_view = thread_view.downgrade();
-        drop(thread_view);
-        assert!(!weak_view.is_upgradable());
-    }
-
-    #[gpui::test]
-    async fn test_notification_for_stop_event(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let (thread_view, cx) = setup_thread_view(StubAgentServer::default_response(), cx).await;
-
-        let message_editor = cx.read(|cx| thread_view.read(cx).message_editor.clone());
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Hello", window, cx);
-        });
-
-        cx.deactivate_window();
-
-        thread_view.update_in(cx, |thread_view, window, cx| {
-            thread_view.send(window, cx);
-        });
-
-        cx.run_until_parked();
-
-        assert!(
-            cx.windows()
-                .iter()
-                .any(|window| window.downcast::<AgentNotification>().is_some())
-        );
-    }
-
-    #[gpui::test]
-    async fn test_notification_for_error(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let (thread_view, cx) =
-            setup_thread_view(StubAgentServer::new(SaboteurAgentConnection), cx).await;
-
-        let message_editor = cx.read(|cx| thread_view.read(cx).message_editor.clone());
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Hello", window, cx);
-        });
-
-        cx.deactivate_window();
-
-        thread_view.update_in(cx, |thread_view, window, cx| {
-            thread_view.send(window, cx);
-        });
-
-        cx.run_until_parked();
-
-        assert!(
-            cx.windows()
-                .iter()
-                .any(|window| window.downcast::<AgentNotification>().is_some())
-        );
-    }
-
-    #[gpui::test]
-    async fn test_refusal_handling(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let (thread_view, cx) =
-            setup_thread_view(StubAgentServer::new(RefusalAgentConnection), cx).await;
-
-        let message_editor = cx.read(|cx| thread_view.read(cx).message_editor.clone());
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Do something harmful", window, cx);
-        });
-
-        thread_view.update_in(cx, |thread_view, window, cx| {
-            thread_view.send(window, cx);
-        });
-
-        cx.run_until_parked();
-
-        // Check that the refusal error is set
-        thread_view.read_with(cx, |thread_view, _cx| {
-            assert!(
-                matches!(thread_view.thread_error, Some(ThreadError::Refusal)),
-                "Expected refusal error to be set"
-            );
-        });
-    }
-
-    #[gpui::test]
-    async fn test_notification_for_tool_authorization(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let tool_call_id = acp::ToolCallId::new("1");
-        let tool_call = acp::ToolCall::new(tool_call_id.clone(), "Label")
-            .kind(acp::ToolKind::Edit)
-            .content(vec!["hi".into()]);
-        let connection =
-            StubAgentConnection::new().with_permission_requests(HashMap::from_iter([(
-                tool_call_id,
-                vec![acp::PermissionOption::new(
-                    "1",
-                    "Allow",
-                    acp::PermissionOptionKind::AllowOnce,
-                )],
-            )]));
-
-        connection.set_next_prompt_updates(vec![acp::SessionUpdate::ToolCall(tool_call)]);
-
-        let (thread_view, cx) = setup_thread_view(StubAgentServer::new(connection), cx).await;
-
-        let message_editor = cx.read(|cx| thread_view.read(cx).message_editor.clone());
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Hello", window, cx);
-        });
-
-        cx.deactivate_window();
-
-        thread_view.update_in(cx, |thread_view, window, cx| {
-            thread_view.send(window, cx);
-        });
-
-        cx.run_until_parked();
-
-        assert!(
-            cx.windows()
-                .iter()
-                .any(|window| window.downcast::<AgentNotification>().is_some())
-        );
-    }
-
-    #[gpui::test]
-    async fn test_notification_when_panel_hidden(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let (thread_view, cx) = setup_thread_view(StubAgentServer::default_response(), cx).await;
-
-        add_to_workspace(thread_view.clone(), cx);
-
-        let message_editor = cx.read(|cx| thread_view.read(cx).message_editor.clone());
-
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Hello", window, cx);
-        });
-
-        // Window is active (don't deactivate), but panel will be hidden
-        // Note: In the test environment, the panel is not actually added to the dock,
-        // so is_agent_panel_hidden will return true
-
-        thread_view.update_in(cx, |thread_view, window, cx| {
-            thread_view.send(window, cx);
-        });
-
-        cx.run_until_parked();
-
-        // Should show notification because window is active but panel is hidden
-        assert!(
-            cx.windows()
-                .iter()
-                .any(|window| window.downcast::<AgentNotification>().is_some()),
-            "Expected notification when panel is hidden"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_notification_still_works_when_window_inactive(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let (thread_view, cx) = setup_thread_view(StubAgentServer::default_response(), cx).await;
-
-        let message_editor = cx.read(|cx| thread_view.read(cx).message_editor.clone());
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Hello", window, cx);
-        });
-
-        // Deactivate window - should show notification regardless of setting
-        cx.deactivate_window();
-
-        thread_view.update_in(cx, |thread_view, window, cx| {
-            thread_view.send(window, cx);
-        });
-
-        cx.run_until_parked();
-
-        // Should still show notification when window is inactive (existing behavior)
-        assert!(
-            cx.windows()
-                .iter()
-                .any(|window| window.downcast::<AgentNotification>().is_some()),
-            "Expected notification when window is inactive"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_notification_respects_never_setting(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        // Set notify_when_agent_waiting to Never
-        cx.update(|cx| {
-            AgentSettings::override_global(
-                AgentSettings {
-                    notify_when_agent_waiting: NotifyWhenAgentWaiting::Never,
-                    ..AgentSettings::get_global(cx).clone()
-                },
-                cx,
-            );
-        });
-
-        let (thread_view, cx) = setup_thread_view(StubAgentServer::default_response(), cx).await;
-
-        let message_editor = cx.read(|cx| thread_view.read(cx).message_editor.clone());
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Hello", window, cx);
-        });
-
-        // Window is active
-
-        thread_view.update_in(cx, |thread_view, window, cx| {
-            thread_view.send(window, cx);
-        });
-
-        cx.run_until_parked();
-
-        // Should NOT show notification because notify_when_agent_waiting is Never
-        assert!(
-            !cx.windows()
-                .iter()
-                .any(|window| window.downcast::<AgentNotification>().is_some()),
-            "Expected no notification when notify_when_agent_waiting is Never"
-        );
-    }
-
-    async fn setup_thread_view(
-        agent: impl AgentServer + 'static,
-        cx: &mut TestAppContext,
-    ) -> (Entity<AcpThreadView>, &mut VisualTestContext) {
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, [], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-        let text_thread_store =
-            cx.update(|_window, cx| cx.new(|cx| TextThreadStore::fake(project.clone(), cx)));
-        let history_store =
-            cx.update(|_window, cx| cx.new(|cx| HistoryStore::new(text_thread_store, cx)));
-
-        let thread_view = cx.update(|window, cx| {
-            cx.new(|cx| {
-                AcpThreadView::new(
-                    Rc::new(agent),
-                    None,
-                    None,
-                    workspace.downgrade(),
-                    project,
-                    history_store,
-                    None,
-                    false,
-                    window,
-                    cx,
-                )
-            })
-        });
-        cx.run_until_parked();
-        (thread_view, cx)
-    }
-
-    fn add_to_workspace(thread_view: Entity<AcpThreadView>, cx: &mut VisualTestContext) {
-        let workspace = thread_view.read_with(cx, |thread_view, _cx| thread_view.workspace.clone());
-
-        workspace
-            .update_in(cx, |workspace, window, cx| {
-                workspace.add_item_to_active_pane(
-                    Box::new(cx.new(|_| ThreadViewItem(thread_view.clone()))),
-                    None,
-                    true,
-                    window,
-                    cx,
-                );
-            })
-            .unwrap();
-    }
-
-    struct ThreadViewItem(Entity<AcpThreadView>);
-
-    impl Item for ThreadViewItem {
-        type Event = ();
-
-        fn include_in_nav_history() -> bool {
-            false
-        }
-
-        fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString {
-            "Test".into()
-        }
-    }
-
-    impl EventEmitter<()> for ThreadViewItem {}
-
-    impl Focusable for ThreadViewItem {
-        fn focus_handle(&self, cx: &App) -> FocusHandle {
-            self.0.read(cx).focus_handle(cx)
-        }
-    }
-
-    impl Render for ThreadViewItem {
-        fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
-            self.0.clone().into_any_element()
-        }
-    }
-
-    struct StubAgentServer<C> {
-        connection: C,
-    }
-
-    impl<C> StubAgentServer<C> {
-        fn new(connection: C) -> Self {
-            Self { connection }
-        }
-    }
-
-    impl StubAgentServer<StubAgentConnection> {
-        fn default_response() -> Self {
-            let conn = StubAgentConnection::new();
-            conn.set_next_prompt_updates(vec![acp::SessionUpdate::AgentMessageChunk(
-                acp::ContentChunk::new("Default response".into()),
-            )]);
-            Self::new(conn)
-        }
-    }
-
-    impl<C> AgentServer for StubAgentServer<C>
-    where
-        C: 'static + AgentConnection + Send + Clone,
-    {
-        fn logo(&self) -> ui::IconName {
-            ui::IconName::Ai
-        }
-
-        fn name(&self) -> SharedString {
-            "Test".into()
-        }
-
-        fn connect(
-            &self,
-            _root_dir: Option<&Path>,
-            _delegate: AgentServerDelegate,
-            _cx: &mut App,
-        ) -> Task<gpui::Result<(Rc<dyn AgentConnection>, Option<task::SpawnInTerminal>)>> {
-            Task::ready(Ok((Rc::new(self.connection.clone()), None)))
-        }
-
-        fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
-            self
-        }
-    }
-
-    #[derive(Clone)]
-    struct SaboteurAgentConnection;
-
-    impl AgentConnection for SaboteurAgentConnection {
-        fn telemetry_id(&self) -> SharedString {
-            "saboteur".into()
-        }
-
-        fn new_thread(
-            self: Rc<Self>,
-            project: Entity<Project>,
-            _cwd: &Path,
-            cx: &mut gpui::App,
-        ) -> Task<gpui::Result<Entity<AcpThread>>> {
-            Task::ready(Ok(cx.new(|cx| {
-                let action_log = cx.new(|_| ActionLog::new(project.clone()));
-                AcpThread::new(
-                    "SaboteurAgentConnection",
-                    self,
-                    project,
-                    action_log,
-                    SessionId::new("test"),
-                    watch::Receiver::constant(
-                        acp::PromptCapabilities::new()
-                            .image(true)
-                            .audio(true)
-                            .embedded_context(true),
-                    ),
-                    cx,
-                )
-            })))
-        }
-
-        fn auth_methods(&self) -> &[acp::AuthMethod] {
-            &[]
-        }
-
-        fn authenticate(
-            &self,
-            _method_id: acp::AuthMethodId,
-            _cx: &mut App,
-        ) -> Task<gpui::Result<()>> {
-            unimplemented!()
-        }
-
-        fn prompt(
-            &self,
-            _id: Option<acp_thread::UserMessageId>,
-            _params: acp::PromptRequest,
-            _cx: &mut App,
-        ) -> Task<gpui::Result<acp::PromptResponse>> {
-            Task::ready(Err(anyhow::anyhow!("Error prompting")))
-        }
-
-        fn cancel(&self, _session_id: &acp::SessionId, _cx: &mut App) {
-            unimplemented!()
-        }
-
-        fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
-            self
-        }
-    }
-
-    /// Simulates a model which always returns a refusal response
-    #[derive(Clone)]
-    struct RefusalAgentConnection;
-
-    impl AgentConnection for RefusalAgentConnection {
-        fn telemetry_id(&self) -> SharedString {
-            "refusal".into()
-        }
-
-        fn new_thread(
-            self: Rc<Self>,
-            project: Entity<Project>,
-            _cwd: &Path,
-            cx: &mut gpui::App,
-        ) -> Task<gpui::Result<Entity<AcpThread>>> {
-            Task::ready(Ok(cx.new(|cx| {
-                let action_log = cx.new(|_| ActionLog::new(project.clone()));
-                AcpThread::new(
-                    "RefusalAgentConnection",
-                    self,
-                    project,
-                    action_log,
-                    SessionId::new("test"),
-                    watch::Receiver::constant(
-                        acp::PromptCapabilities::new()
-                            .image(true)
-                            .audio(true)
-                            .embedded_context(true),
-                    ),
-                    cx,
-                )
-            })))
-        }
-
-        fn auth_methods(&self) -> &[acp::AuthMethod] {
-            &[]
-        }
-
-        fn authenticate(
-            &self,
-            _method_id: acp::AuthMethodId,
-            _cx: &mut App,
-        ) -> Task<gpui::Result<()>> {
-            unimplemented!()
-        }
-
-        fn prompt(
-            &self,
-            _id: Option<acp_thread::UserMessageId>,
-            _params: acp::PromptRequest,
-            _cx: &mut App,
-        ) -> Task<gpui::Result<acp::PromptResponse>> {
-            Task::ready(Ok(acp::PromptResponse::new(acp::StopReason::Refusal)))
-        }
-
-        fn cancel(&self, _session_id: &acp::SessionId, _cx: &mut App) {
-            unimplemented!()
-        }
-
-        fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
-            self
-        }
-    }
-
-    pub(crate) fn init_test(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-            theme::init(theme::LoadThemes::JustBase, cx);
-            release_channel::init(semver::Version::new(0, 0, 0), cx);
-            prompt_store::init(cx)
-        });
-    }
-
-    #[gpui::test]
-    async fn test_rewind_views(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            "/project",
-            json!({
-                "test1.txt": "old content 1",
-                "test2.txt": "old content 2"
-            }),
-        )
-        .await;
-        let project = Project::test(fs, [Path::new("/project")], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-        let text_thread_store =
-            cx.update(|_window, cx| cx.new(|cx| TextThreadStore::fake(project.clone(), cx)));
-        let history_store =
-            cx.update(|_window, cx| cx.new(|cx| HistoryStore::new(text_thread_store, cx)));
-
-        let connection = Rc::new(StubAgentConnection::new());
-        let thread_view = cx.update(|window, cx| {
-            cx.new(|cx| {
-                AcpThreadView::new(
-                    Rc::new(StubAgentServer::new(connection.as_ref().clone())),
-                    None,
-                    None,
-                    workspace.downgrade(),
-                    project.clone(),
-                    history_store.clone(),
-                    None,
-                    false,
-                    window,
-                    cx,
-                )
-            })
-        });
-
-        cx.run_until_parked();
-
-        let thread = thread_view
-            .read_with(cx, |view, _| view.thread().cloned())
-            .unwrap();
-
-        // First user message
-        connection.set_next_prompt_updates(vec![acp::SessionUpdate::ToolCall(
-            acp::ToolCall::new("tool1", "Edit file 1")
-                .kind(acp::ToolKind::Edit)
-                .status(acp::ToolCallStatus::Completed)
-                .content(vec![acp::ToolCallContent::Diff(
-                    acp::Diff::new("/project/test1.txt", "new content 1").old_text("old content 1"),
-                )]),
-        )]);
-
-        thread
-            .update(cx, |thread, cx| thread.send_raw("Give me a diff", cx))
-            .await
-            .unwrap();
-        cx.run_until_parked();
-
-        thread.read_with(cx, |thread, _| {
-            assert_eq!(thread.entries().len(), 2);
-        });
-
-        thread_view.read_with(cx, |view, cx| {
-            view.entry_view_state.read_with(cx, |entry_view_state, _| {
-                assert!(
-                    entry_view_state
-                        .entry(0)
-                        .unwrap()
-                        .message_editor()
-                        .is_some()
-                );
-                assert!(entry_view_state.entry(1).unwrap().has_content());
-            });
-        });
-
-        // Second user message
-        connection.set_next_prompt_updates(vec![acp::SessionUpdate::ToolCall(
-            acp::ToolCall::new("tool2", "Edit file 2")
-                .kind(acp::ToolKind::Edit)
-                .status(acp::ToolCallStatus::Completed)
-                .content(vec![acp::ToolCallContent::Diff(
-                    acp::Diff::new("/project/test2.txt", "new content 2").old_text("old content 2"),
-                )]),
-        )]);
-
-        thread
-            .update(cx, |thread, cx| thread.send_raw("Another one", cx))
-            .await
-            .unwrap();
-        cx.run_until_parked();
-
-        let second_user_message_id = thread.read_with(cx, |thread, _| {
-            assert_eq!(thread.entries().len(), 4);
-            let AgentThreadEntry::UserMessage(user_message) = &thread.entries()[2] else {
-                panic!();
-            };
-            user_message.id.clone().unwrap()
-        });
-
-        thread_view.read_with(cx, |view, cx| {
-            view.entry_view_state.read_with(cx, |entry_view_state, _| {
-                assert!(
-                    entry_view_state
-                        .entry(0)
-                        .unwrap()
-                        .message_editor()
-                        .is_some()
-                );
-                assert!(entry_view_state.entry(1).unwrap().has_content());
-                assert!(
-                    entry_view_state
-                        .entry(2)
-                        .unwrap()
-                        .message_editor()
-                        .is_some()
-                );
-                assert!(entry_view_state.entry(3).unwrap().has_content());
-            });
-        });
-
-        // Rewind to first message
-        thread
-            .update(cx, |thread, cx| thread.rewind(second_user_message_id, cx))
-            .await
-            .unwrap();
-
-        cx.run_until_parked();
-
-        thread.read_with(cx, |thread, _| {
-            assert_eq!(thread.entries().len(), 2);
-        });
-
-        thread_view.read_with(cx, |view, cx| {
-            view.entry_view_state.read_with(cx, |entry_view_state, _| {
-                assert!(
-                    entry_view_state
-                        .entry(0)
-                        .unwrap()
-                        .message_editor()
-                        .is_some()
-                );
-                assert!(entry_view_state.entry(1).unwrap().has_content());
-
-                // Old views should be dropped
-                assert!(entry_view_state.entry(2).is_none());
-                assert!(entry_view_state.entry(3).is_none());
-            });
-        });
-    }
-
-    #[gpui::test]
-    async fn test_message_editing_cancel(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let connection = StubAgentConnection::new();
-
-        connection.set_next_prompt_updates(vec![acp::SessionUpdate::AgentMessageChunk(
-            acp::ContentChunk::new("Response".into()),
-        )]);
-
-        let (thread_view, cx) = setup_thread_view(StubAgentServer::new(connection), cx).await;
-        add_to_workspace(thread_view.clone(), cx);
-
-        let message_editor = cx.read(|cx| thread_view.read(cx).message_editor.clone());
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Original message to edit", window, cx);
-        });
-        thread_view.update_in(cx, |thread_view, window, cx| {
-            thread_view.send(window, cx);
-        });
-
-        cx.run_until_parked();
-
-        let user_message_editor = thread_view.read_with(cx, |view, cx| {
-            assert_eq!(view.editing_message, None);
-
-            view.entry_view_state
-                .read(cx)
-                .entry(0)
-                .unwrap()
-                .message_editor()
-                .unwrap()
-                .clone()
-        });
-
-        // Focus
-        cx.focus(&user_message_editor);
-        thread_view.read_with(cx, |view, _cx| {
-            assert_eq!(view.editing_message, Some(0));
-        });
-
-        // Edit
-        user_message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Edited message content", window, cx);
-        });
-
-        // Cancel
-        user_message_editor.update_in(cx, |_editor, window, cx| {
-            window.dispatch_action(Box::new(editor::actions::Cancel), cx);
-        });
-
-        thread_view.read_with(cx, |view, _cx| {
-            assert_eq!(view.editing_message, None);
-        });
-
-        user_message_editor.read_with(cx, |editor, cx| {
-            assert_eq!(editor.text(cx), "Original message to edit");
-        });
-    }
-
-    #[gpui::test]
-    async fn test_message_doesnt_send_if_empty(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let connection = StubAgentConnection::new();
-
-        let (thread_view, cx) = setup_thread_view(StubAgentServer::new(connection), cx).await;
-        add_to_workspace(thread_view.clone(), cx);
-
-        let message_editor = cx.read(|cx| thread_view.read(cx).message_editor.clone());
-        let mut events = cx.events(&message_editor);
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("", window, cx);
-        });
-
-        message_editor.update_in(cx, |_editor, window, cx| {
-            window.dispatch_action(Box::new(Chat), cx);
-        });
-        cx.run_until_parked();
-        // We shouldn't have received any messages
-        assert!(matches!(
-            events.try_next(),
-            Err(futures::channel::mpsc::TryRecvError { .. })
-        ));
-    }
-
-    #[gpui::test]
-    async fn test_message_editing_regenerate(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let connection = StubAgentConnection::new();
-
-        connection.set_next_prompt_updates(vec![acp::SessionUpdate::AgentMessageChunk(
-            acp::ContentChunk::new("Response".into()),
-        )]);
-
-        let (thread_view, cx) =
-            setup_thread_view(StubAgentServer::new(connection.clone()), cx).await;
-        add_to_workspace(thread_view.clone(), cx);
-
-        let message_editor = cx.read(|cx| thread_view.read(cx).message_editor.clone());
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Original message to edit", window, cx);
-        });
-        thread_view.update_in(cx, |thread_view, window, cx| {
-            thread_view.send(window, cx);
-        });
-
-        cx.run_until_parked();
-
-        let user_message_editor = thread_view.read_with(cx, |view, cx| {
-            assert_eq!(view.editing_message, None);
-            assert_eq!(view.thread().unwrap().read(cx).entries().len(), 2);
-
-            view.entry_view_state
-                .read(cx)
-                .entry(0)
-                .unwrap()
-                .message_editor()
-                .unwrap()
-                .clone()
-        });
-
-        // Focus
-        cx.focus(&user_message_editor);
-
-        // Edit
-        user_message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Edited message content", window, cx);
-        });
-
-        // Send
-        connection.set_next_prompt_updates(vec![acp::SessionUpdate::AgentMessageChunk(
-            acp::ContentChunk::new("New Response".into()),
-        )]);
-
-        user_message_editor.update_in(cx, |_editor, window, cx| {
-            window.dispatch_action(Box::new(Chat), cx);
-        });
-
-        cx.run_until_parked();
-
-        thread_view.read_with(cx, |view, cx| {
-            assert_eq!(view.editing_message, None);
-
-            let entries = view.thread().unwrap().read(cx).entries();
-            assert_eq!(entries.len(), 2);
-            assert_eq!(
-                entries[0].to_markdown(cx),
-                "## User\n\nEdited message content\n\n"
-            );
-            assert_eq!(
-                entries[1].to_markdown(cx),
-                "## Assistant\n\nNew Response\n\n"
-            );
-
-            let new_editor = view.entry_view_state.read_with(cx, |state, _cx| {
-                assert!(!state.entry(1).unwrap().has_content());
-                state.entry(0).unwrap().message_editor().unwrap().clone()
-            });
-
-            assert_eq!(new_editor.read(cx).text(cx), "Edited message content");
-        })
-    }
-
-    #[gpui::test]
-    async fn test_message_editing_while_generating(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let connection = StubAgentConnection::new();
-
-        let (thread_view, cx) =
-            setup_thread_view(StubAgentServer::new(connection.clone()), cx).await;
-        add_to_workspace(thread_view.clone(), cx);
-
-        let message_editor = cx.read(|cx| thread_view.read(cx).message_editor.clone());
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Original message to edit", window, cx);
-        });
-        thread_view.update_in(cx, |thread_view, window, cx| {
-            thread_view.send(window, cx);
-        });
-
-        cx.run_until_parked();
-
-        let (user_message_editor, session_id) = thread_view.read_with(cx, |view, cx| {
-            let thread = view.thread().unwrap().read(cx);
-            assert_eq!(thread.entries().len(), 1);
-
-            let editor = view
-                .entry_view_state
-                .read(cx)
-                .entry(0)
-                .unwrap()
-                .message_editor()
-                .unwrap()
-                .clone();
-
-            (editor, thread.session_id().clone())
-        });
-
-        // Focus
-        cx.focus(&user_message_editor);
-
-        thread_view.read_with(cx, |view, _cx| {
-            assert_eq!(view.editing_message, Some(0));
-        });
-
-        // Edit
-        user_message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Edited message content", window, cx);
-        });
-
-        thread_view.read_with(cx, |view, _cx| {
-            assert_eq!(view.editing_message, Some(0));
-        });
-
-        // Finish streaming response
-        cx.update(|_, cx| {
-            connection.send_update(
-                session_id.clone(),
-                acp::SessionUpdate::AgentMessageChunk(acp::ContentChunk::new("Response".into())),
-                cx,
-            );
-            connection.end_turn(session_id, acp::StopReason::EndTurn);
-        });
-
-        thread_view.read_with(cx, |view, _cx| {
-            assert_eq!(view.editing_message, Some(0));
-        });
-
-        cx.run_until_parked();
-
-        // Should still be editing
-        cx.update(|window, cx| {
-            assert!(user_message_editor.focus_handle(cx).is_focused(window));
-            assert_eq!(thread_view.read(cx).editing_message, Some(0));
-            assert_eq!(
-                user_message_editor.read(cx).text(cx),
-                "Edited message content"
-            );
-        });
-    }
-
-    #[gpui::test]
-    async fn test_interrupt(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let connection = StubAgentConnection::new();
-
-        let (thread_view, cx) =
-            setup_thread_view(StubAgentServer::new(connection.clone()), cx).await;
-        add_to_workspace(thread_view.clone(), cx);
-
-        let message_editor = cx.read(|cx| thread_view.read(cx).message_editor.clone());
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Message 1", window, cx);
-        });
-        thread_view.update_in(cx, |thread_view, window, cx| {
-            thread_view.send(window, cx);
-        });
-
-        let (thread, session_id) = thread_view.read_with(cx, |view, cx| {
-            let thread = view.thread().unwrap();
-
-            (thread.clone(), thread.read(cx).session_id().clone())
-        });
-
-        cx.run_until_parked();
-
-        cx.update(|_, cx| {
-            connection.send_update(
-                session_id.clone(),
-                acp::SessionUpdate::AgentMessageChunk(acp::ContentChunk::new(
-                    "Message 1 resp".into(),
-                )),
-                cx,
-            );
-        });
-
-        cx.run_until_parked();
-
-        thread.read_with(cx, |thread, cx| {
-            assert_eq!(
-                thread.to_markdown(cx),
-                indoc::indoc! {"
-                    ## User
-
-                    Message 1
-
-                    ## Assistant
-
-                    Message 1 resp
-
-                "}
-            )
-        });
-
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Message 2", window, cx);
-        });
-        thread_view.update_in(cx, |thread_view, window, cx| {
-            thread_view.send(window, cx);
-        });
-
-        cx.update(|_, cx| {
-            // Simulate a response sent after beginning to cancel
-            connection.send_update(
-                session_id.clone(),
-                acp::SessionUpdate::AgentMessageChunk(acp::ContentChunk::new("onse".into())),
-                cx,
-            );
-        });
-
-        cx.run_until_parked();
-
-        // Last Message 1 response should appear before Message 2
-        thread.read_with(cx, |thread, cx| {
-            assert_eq!(
-                thread.to_markdown(cx),
-                indoc::indoc! {"
-                    ## User
-
-                    Message 1
-
-                    ## Assistant
-
-                    Message 1 response
-
-                    ## User
-
-                    Message 2
-
-                "}
-            )
-        });
-
-        cx.update(|_, cx| {
-            connection.send_update(
-                session_id.clone(),
-                acp::SessionUpdate::AgentMessageChunk(acp::ContentChunk::new(
-                    "Message 2 response".into(),
-                )),
-                cx,
-            );
-            connection.end_turn(session_id.clone(), acp::StopReason::EndTurn);
-        });
-
-        cx.run_until_parked();
-
-        thread.read_with(cx, |thread, cx| {
-            assert_eq!(
-                thread.to_markdown(cx),
-                indoc::indoc! {"
-                    ## User
-
-                    Message 1
-
-                    ## Assistant
-
-                    Message 1 response
-
-                    ## User
-
-                    Message 2
-
-                    ## Assistant
-
-                    Message 2 response
-
-                "}
-            )
-        });
-    }
-
-    #[gpui::test]
-    async fn test_message_editing_insert_selections(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let connection = StubAgentConnection::new();
-        connection.set_next_prompt_updates(vec![acp::SessionUpdate::AgentMessageChunk(
-            acp::ContentChunk::new("Response".into()),
-        )]);
-
-        let (thread_view, cx) = setup_thread_view(StubAgentServer::new(connection), cx).await;
-        add_to_workspace(thread_view.clone(), cx);
-
-        let message_editor = cx.read(|cx| thread_view.read(cx).message_editor.clone());
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Original message to edit", window, cx)
-        });
-        thread_view.update_in(cx, |thread_view, window, cx| thread_view.send(window, cx));
-        cx.run_until_parked();
-
-        let user_message_editor = thread_view.read_with(cx, |thread_view, cx| {
-            thread_view
-                .entry_view_state
-                .read(cx)
-                .entry(0)
-                .expect("Should have at least one entry")
-                .message_editor()
-                .expect("Should have message editor")
-                .clone()
-        });
-
-        cx.focus(&user_message_editor);
-        thread_view.read_with(cx, |thread_view, _cx| {
-            assert_eq!(thread_view.editing_message, Some(0));
-        });
-
-        // Ensure to edit the focused message before proceeding otherwise, since
-        // its content is not different from what was sent, focus will be lost.
-        user_message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Original message to edit with ", window, cx)
-        });
-
-        // Create a simple buffer with some text so we can create a selection
-        // that will then be added to the message being edited.
-        let (workspace, project) = thread_view.read_with(cx, |thread_view, _cx| {
-            (thread_view.workspace.clone(), thread_view.project.clone())
-        });
-        let buffer = project.update(cx, |project, cx| {
-            project.create_local_buffer("let a = 10 + 10;", None, false, cx)
-        });
-
-        workspace
-            .update_in(cx, |workspace, window, cx| {
-                let editor = cx.new(|cx| {
-                    let mut editor =
-                        Editor::for_buffer(buffer.clone(), Some(project.clone()), window, cx);
-
-                    editor.change_selections(Default::default(), window, cx, |selections| {
-                        selections.select_ranges([MultiBufferOffset(8)..MultiBufferOffset(15)]);
-                    });
-
-                    editor
-                });
-                workspace.add_item_to_active_pane(Box::new(editor), None, false, window, cx);
-            })
-            .unwrap();
-
-        thread_view.update_in(cx, |thread_view, window, cx| {
-            assert_eq!(thread_view.editing_message, Some(0));
-            thread_view.insert_selections(window, cx);
-        });
-
-        user_message_editor.read_with(cx, |editor, cx| {
-            let text = editor.editor().read(cx).text(cx);
-            let expected_text = String::from("Original message to edit with selection ");
-
-            assert_eq!(text, expected_text);
-        });
-    }
-
-    #[gpui::test]
-    async fn test_insert_selections(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let connection = StubAgentConnection::new();
-        connection.set_next_prompt_updates(vec![acp::SessionUpdate::AgentMessageChunk(
-            acp::ContentChunk::new("Response".into()),
-        )]);
-
-        let (thread_view, cx) = setup_thread_view(StubAgentServer::new(connection), cx).await;
-        add_to_workspace(thread_view.clone(), cx);
-
-        let message_editor = cx.read(|cx| thread_view.read(cx).message_editor.clone());
-        message_editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("Can you review this snippet ", window, cx)
-        });
-
-        // Create a simple buffer with some text so we can create a selection
-        // that will then be added to the message being edited.
-        let (workspace, project) = thread_view.read_with(cx, |thread_view, _cx| {
-            (thread_view.workspace.clone(), thread_view.project.clone())
-        });
-        let buffer = project.update(cx, |project, cx| {
-            project.create_local_buffer("let a = 10 + 10;", None, false, cx)
-        });
-
-        workspace
-            .update_in(cx, |workspace, window, cx| {
-                let editor = cx.new(|cx| {
-                    let mut editor =
-                        Editor::for_buffer(buffer.clone(), Some(project.clone()), window, cx);
-
-                    editor.change_selections(Default::default(), window, cx, |selections| {
-                        selections.select_ranges([MultiBufferOffset(8)..MultiBufferOffset(15)]);
-                    });
-
-                    editor
-                });
-                workspace.add_item_to_active_pane(Box::new(editor), None, false, window, cx);
-            })
-            .unwrap();
-
-        thread_view.update_in(cx, |thread_view, window, cx| {
-            assert_eq!(thread_view.editing_message, None);
-            thread_view.insert_selections(window, cx);
-        });
-
-        thread_view.read_with(cx, |thread_view, cx| {
-            let text = thread_view.message_editor.read(cx).text(cx);
-            let expected_txt = String::from("Can you review this snippet selection ");
-
-            assert_eq!(text, expected_txt);
-        })
-    }
-}
diff --git a/crates/agent_ui/src/agent_configuration.rs b/crates/agent_ui/src/agent_configuration.rs
deleted file mode 100644
index 327f699b4d..0000000000
--- a/crates/agent_ui/src/agent_configuration.rs
+++ /dev/null
@@ -1,1451 +0,0 @@
-mod add_llm_provider_modal;
-pub mod configure_context_server_modal;
-mod configure_context_server_tools_modal;
-mod manage_profiles_modal;
-mod tool_picker;
-
-use std::{ops::Range, sync::Arc};
-
-use agent::ContextServerRegistry;
-use anyhow::Result;
-use client::zed_urls;
-use cloud_llm_client::{Plan, PlanV1, PlanV2};
-use collections::HashMap;
-use context_server::ContextServerId;
-use editor::{Editor, MultiBufferOffset, SelectionEffects, scroll::Autoscroll};
-use extension::ExtensionManifest;
-use extension_host::ExtensionStore;
-use fs::Fs;
-use gpui::{
-    Action, AnyView, App, AsyncWindowContext, Corner, Entity, EventEmitter, FocusHandle, Focusable,
-    ScrollHandle, Subscription, Task, WeakEntity,
-};
-use language::LanguageRegistry;
-use language_model::{
-    LanguageModelProvider, LanguageModelProviderId, LanguageModelRegistry, ZED_CLOUD_PROVIDER_ID,
-};
-use language_models::AllLanguageModelSettings;
-use notifications::status_toast::{StatusToast, ToastIcon};
-use project::{
-    agent_server_store::{
-        AgentServerStore, CLAUDE_CODE_NAME, CODEX_NAME, ExternalAgentServerName, GEMINI_NAME,
-    },
-    context_server_store::{ContextServerConfiguration, ContextServerStatus, ContextServerStore},
-};
-use settings::{Settings, SettingsStore, update_settings_file};
-use ui::{
-    Button, ButtonStyle, Chip, CommonAnimationExt, ContextMenu, ContextMenuEntry, Disclosure,
-    Divider, DividerColor, ElevationIndex, IconName, IconPosition, IconSize, Indicator, LabelSize,
-    PopoverMenu, Switch, Tooltip, WithScrollbar, prelude::*,
-};
-use util::ResultExt as _;
-use workspace::{Workspace, create_and_open_local_file};
-use zed_actions::{ExtensionCategoryFilter, OpenBrowser};
-
-pub(crate) use configure_context_server_modal::ConfigureContextServerModal;
-pub(crate) use configure_context_server_tools_modal::ConfigureContextServerToolsModal;
-pub(crate) use manage_profiles_modal::ManageProfilesModal;
-
-use crate::agent_configuration::add_llm_provider_modal::{
-    AddLlmProviderModal, LlmCompatibleProvider,
-};
-
-pub struct AgentConfiguration {
-    fs: Arc<dyn Fs>,
-    language_registry: Arc<LanguageRegistry>,
-    agent_server_store: Entity<AgentServerStore>,
-    workspace: WeakEntity<Workspace>,
-    focus_handle: FocusHandle,
-    configuration_views_by_provider: HashMap<LanguageModelProviderId, AnyView>,
-    context_server_store: Entity<ContextServerStore>,
-    expanded_provider_configurations: HashMap<LanguageModelProviderId, bool>,
-    context_server_registry: Entity<ContextServerRegistry>,
-    _registry_subscription: Subscription,
-    scroll_handle: ScrollHandle,
-    _check_for_gemini: Task<()>,
-}
-
-impl AgentConfiguration {
-    pub fn new(
-        fs: Arc<dyn Fs>,
-        agent_server_store: Entity<AgentServerStore>,
-        context_server_store: Entity<ContextServerStore>,
-        context_server_registry: Entity<ContextServerRegistry>,
-        language_registry: Arc<LanguageRegistry>,
-        workspace: WeakEntity<Workspace>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let focus_handle = cx.focus_handle();
-
-        let registry_subscription = cx.subscribe_in(
-            &LanguageModelRegistry::global(cx),
-            window,
-            |this, _, event: &language_model::Event, window, cx| match event {
-                language_model::Event::AddedProvider(provider_id) => {
-                    let provider = LanguageModelRegistry::read_global(cx).provider(provider_id);
-                    if let Some(provider) = provider {
-                        this.add_provider_configuration_view(&provider, window, cx);
-                    }
-                }
-                language_model::Event::RemovedProvider(provider_id) => {
-                    this.remove_provider_configuration_view(provider_id);
-                }
-                _ => {}
-            },
-        );
-
-        cx.subscribe(&context_server_store, |_, _, _, cx| cx.notify())
-            .detach();
-
-        let mut this = Self {
-            fs,
-            language_registry,
-            workspace,
-            focus_handle,
-            configuration_views_by_provider: HashMap::default(),
-            agent_server_store,
-            context_server_store,
-            expanded_provider_configurations: HashMap::default(),
-            context_server_registry,
-            _registry_subscription: registry_subscription,
-            scroll_handle: ScrollHandle::new(),
-            _check_for_gemini: Task::ready(()),
-        };
-        this.build_provider_configuration_views(window, cx);
-        this
-    }
-
-    fn build_provider_configuration_views(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let providers = LanguageModelRegistry::read_global(cx).providers();
-        for provider in providers {
-            self.add_provider_configuration_view(&provider, window, cx);
-        }
-    }
-
-    fn remove_provider_configuration_view(&mut self, provider_id: &LanguageModelProviderId) {
-        self.configuration_views_by_provider.remove(provider_id);
-        self.expanded_provider_configurations.remove(provider_id);
-    }
-
-    fn add_provider_configuration_view(
-        &mut self,
-        provider: &Arc<dyn LanguageModelProvider>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let configuration_view = provider.configuration_view(
-            language_model::ConfigurationViewTargetAgent::ZedAgent,
-            window,
-            cx,
-        );
-        self.configuration_views_by_provider
-            .insert(provider.id(), configuration_view);
-    }
-}
-
-impl Focusable for AgentConfiguration {
-    fn focus_handle(&self, _: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-pub enum AssistantConfigurationEvent {
-    NewThread(Arc<dyn LanguageModelProvider>),
-}
-
-impl EventEmitter<AssistantConfigurationEvent> for AgentConfiguration {}
-
-enum AgentIcon {
-    Name(IconName),
-    Path(SharedString),
-}
-
-impl AgentConfiguration {
-    fn render_section_title(
-        &mut self,
-        title: impl Into<SharedString>,
-        description: impl Into<SharedString>,
-        menu: AnyElement,
-    ) -> impl IntoElement {
-        h_flex()
-            .p_4()
-            .pb_0()
-            .mb_2p5()
-            .items_start()
-            .justify_between()
-            .child(
-                v_flex()
-                    .w_full()
-                    .gap_0p5()
-                    .child(
-                        h_flex()
-                            .pr_1()
-                            .w_full()
-                            .gap_2()
-                            .justify_between()
-                            .flex_wrap()
-                            .child(Headline::new(title.into()))
-                            .child(menu),
-                    )
-                    .child(Label::new(description.into()).color(Color::Muted)),
-            )
-    }
-
-    fn render_provider_configuration_block(
-        &mut self,
-        provider: &Arc<dyn LanguageModelProvider>,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement + use<> {
-        let provider_id = provider.id().0;
-        let provider_name = provider.name().0;
-        let provider_id_string = SharedString::from(format!("provider-disclosure-{provider_id}"));
-
-        let configuration_view = self
-            .configuration_views_by_provider
-            .get(&provider.id())
-            .cloned();
-
-        let is_expanded = self
-            .expanded_provider_configurations
-            .get(&provider.id())
-            .copied()
-            .unwrap_or(false);
-
-        let is_zed_provider = provider.id() == ZED_CLOUD_PROVIDER_ID;
-        let current_plan = if is_zed_provider {
-            self.workspace
-                .upgrade()
-                .and_then(|workspace| workspace.read(cx).user_store().read(cx).plan())
-        } else {
-            None
-        };
-
-        let is_signed_in = self
-            .workspace
-            .read_with(cx, |workspace, _| {
-                !workspace.client().status().borrow().is_signed_out()
-            })
-            .unwrap_or(false);
-
-        v_flex()
-            .w_full()
-            .when(is_expanded, |this| this.mb_2())
-            .child(
-                div()
-                    .px_2()
-                    .child(Divider::horizontal().color(DividerColor::BorderFaded)),
-            )
-            .child(
-                h_flex()
-                    .map(|this| {
-                        if is_expanded {
-                            this.mt_2().mb_1()
-                        } else {
-                            this.my_2()
-                        }
-                    })
-                    .w_full()
-                    .justify_between()
-                    .child(
-                        h_flex()
-                            .id(provider_id_string.clone())
-                            .px_2()
-                            .py_0p5()
-                            .w_full()
-                            .justify_between()
-                            .rounded_sm()
-                            .hover(|hover| hover.bg(cx.theme().colors().element_hover))
-                            .child(
-                                h_flex()
-                                    .w_full()
-                                    .gap_1p5()
-                                    .child(
-                                        Icon::new(provider.icon())
-                                            .size(IconSize::Small)
-                                            .color(Color::Muted),
-                                    )
-                                    .child(
-                                        h_flex()
-                                            .w_full()
-                                            .gap_1()
-                                            .child(Label::new(provider_name.clone()))
-                                            .map(|this| {
-                                                if is_zed_provider && is_signed_in {
-                                                    this.child(
-                                                        self.render_zed_plan_info(current_plan, cx),
-                                                    )
-                                                } else {
-                                                    this.when(
-                                                        provider.is_authenticated(cx)
-                                                            && !is_expanded,
-                                                        |parent| {
-                                                            parent.child(
-                                                                Icon::new(IconName::Check)
-                                                                    .color(Color::Success),
-                                                            )
-                                                        },
-                                                    )
-                                                }
-                                            }),
-                                    ),
-                            )
-                            .child(
-                                Disclosure::new(provider_id_string, is_expanded)
-                                    .opened_icon(IconName::ChevronUp)
-                                    .closed_icon(IconName::ChevronDown),
-                            )
-                            .on_click(cx.listener({
-                                let provider_id = provider.id();
-                                move |this, _event, _window, _cx| {
-                                    let is_expanded = this
-                                        .expanded_provider_configurations
-                                        .entry(provider_id.clone())
-                                        .or_insert(false);
-
-                                    *is_expanded = !*is_expanded;
-                                }
-                            })),
-                    ),
-            )
-            .child(
-                v_flex()
-                    .w_full()
-                    .px_2()
-                    .gap_1()
-                    .when(is_expanded, |parent| match configuration_view {
-                        Some(configuration_view) => parent.child(configuration_view),
-                        None => parent.child(Label::new(format!(
-                            "No configuration view for {provider_name}",
-                        ))),
-                    })
-                    .when(is_expanded && provider.is_authenticated(cx), |parent| {
-                        parent.child(
-                            Button::new(
-                                SharedString::from(format!("new-thread-{provider_id}")),
-                                "Start New Thread",
-                            )
-                            .full_width()
-                            .style(ButtonStyle::Outlined)
-                            .layer(ElevationIndex::ModalSurface)
-                            .icon_position(IconPosition::Start)
-                            .icon(IconName::Thread)
-                            .icon_size(IconSize::Small)
-                            .icon_color(Color::Muted)
-                            .label_size(LabelSize::Small)
-                            .on_click(cx.listener({
-                                let provider = provider.clone();
-                                move |_this, _event, _window, cx| {
-                                    cx.emit(AssistantConfigurationEvent::NewThread(
-                                        provider.clone(),
-                                    ))
-                                }
-                            })),
-                        )
-                    })
-                    .when(
-                        is_expanded && is_removable_provider(&provider.id(), cx),
-                        |this| {
-                            this.child(
-                                Button::new(
-                                    SharedString::from(format!("delete-provider-{provider_id}")),
-                                    "Remove Provider",
-                                )
-                                .full_width()
-                                .style(ButtonStyle::Outlined)
-                                .icon_position(IconPosition::Start)
-                                .icon(IconName::Trash)
-                                .icon_size(IconSize::Small)
-                                .icon_color(Color::Muted)
-                                .label_size(LabelSize::Small)
-                                .on_click(cx.listener({
-                                    let provider = provider.clone();
-                                    move |this, _event, window, cx| {
-                                        this.delete_provider(provider.clone(), window, cx);
-                                    }
-                                })),
-                            )
-                        },
-                    ),
-            )
-    }
-
-    fn delete_provider(
-        &mut self,
-        provider: Arc<dyn LanguageModelProvider>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let fs = self.fs.clone();
-        let provider_id = provider.id();
-
-        cx.spawn_in(window, async move |_, cx| {
-            cx.update(|_window, cx| {
-                update_settings_file(fs.clone(), cx, {
-                    let provider_id = provider_id.clone();
-                    move |settings, _| {
-                        if let Some(ref mut openai_compatible) = settings
-                            .language_models
-                            .as_mut()
-                            .and_then(|lm| lm.openai_compatible.as_mut())
-                        {
-                            let key_to_remove: Arc<str> = Arc::from(provider_id.0.as_ref());
-                            openai_compatible.remove(&key_to_remove);
-                        }
-                    }
-                });
-            })
-            .log_err();
-
-            cx.update(|_window, cx| {
-                LanguageModelRegistry::global(cx).update(cx, {
-                    let provider_id = provider_id.clone();
-                    move |registry, cx| {
-                        registry.unregister_provider(provider_id, cx);
-                    }
-                })
-            })
-            .log_err();
-
-            anyhow::Ok(())
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn render_provider_configuration_section(
-        &mut self,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let providers = LanguageModelRegistry::read_global(cx).providers();
-
-        let popover_menu = PopoverMenu::new("add-provider-popover")
-            .trigger(
-                Button::new("add-provider", "Add Provider")
-                    .style(ButtonStyle::Outlined)
-                    .icon_position(IconPosition::Start)
-                    .icon(IconName::Plus)
-                    .icon_size(IconSize::Small)
-                    .icon_color(Color::Muted)
-                    .label_size(LabelSize::Small),
-            )
-            .menu({
-                let workspace = self.workspace.clone();
-                move |window, cx| {
-                    Some(ContextMenu::build(window, cx, |menu, _window, _cx| {
-                        menu.header("Compatible APIs").entry("OpenAI", None, {
-                            let workspace = workspace.clone();
-                            move |window, cx| {
-                                workspace
-                                    .update(cx, |workspace, cx| {
-                                        AddLlmProviderModal::toggle(
-                                            LlmCompatibleProvider::OpenAi,
-                                            workspace,
-                                            window,
-                                            cx,
-                                        );
-                                    })
-                                    .log_err();
-                            }
-                        })
-                    }))
-                }
-            })
-            .anchor(gpui::Corner::TopRight)
-            .offset(gpui::Point {
-                x: px(0.0),
-                y: px(2.0),
-            });
-
-        v_flex()
-            .w_full()
-            .child(self.render_section_title(
-                "LLM Providers",
-                "Add at least one provider to use AI-powered features with Zed's native agent.",
-                popover_menu.into_any_element(),
-            ))
-            .child(
-                div()
-                    .w_full()
-                    .pl(DynamicSpacing::Base08.rems(cx))
-                    .pr(DynamicSpacing::Base20.rems(cx))
-                    .children(
-                        providers.into_iter().map(|provider| {
-                            self.render_provider_configuration_block(&provider, cx)
-                        }),
-                    ),
-            )
-    }
-
-    fn render_zed_plan_info(&self, plan: Option<Plan>, cx: &mut Context<Self>) -> impl IntoElement {
-        if let Some(plan) = plan {
-            let free_chip_bg = cx
-                .theme()
-                .colors()
-                .editor_background
-                .opacity(0.5)
-                .blend(cx.theme().colors().text_accent.opacity(0.05));
-
-            let pro_chip_bg = cx
-                .theme()
-                .colors()
-                .editor_background
-                .opacity(0.5)
-                .blend(cx.theme().colors().text_accent.opacity(0.2));
-
-            let (plan_name, label_color, bg_color) = match plan {
-                Plan::V1(PlanV1::ZedFree) | Plan::V2(PlanV2::ZedFree) => {
-                    ("Free", Color::Default, free_chip_bg)
-                }
-                Plan::V1(PlanV1::ZedProTrial) | Plan::V2(PlanV2::ZedProTrial) => {
-                    ("Pro Trial", Color::Accent, pro_chip_bg)
-                }
-                Plan::V1(PlanV1::ZedPro) | Plan::V2(PlanV2::ZedPro) => {
-                    ("Pro", Color::Accent, pro_chip_bg)
-                }
-            };
-
-            Chip::new(plan_name.to_string())
-                .bg_color(bg_color)
-                .label_color(label_color)
-                .into_any_element()
-        } else {
-            div().into_any_element()
-        }
-    }
-
-    fn render_context_servers_section(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let mut context_server_ids = self
-            .context_server_store
-            .read(cx)
-            .server_ids(cx)
-            .into_iter()
-            .collect::<Vec<_>>();
-
-        // Sort context servers: ones without mcp-server- prefix first, then prefixed ones
-        context_server_ids.sort_by(|a, b| {
-            const MCP_PREFIX: &str = "mcp-server-";
-            match (a.0.strip_prefix(MCP_PREFIX), b.0.strip_prefix(MCP_PREFIX)) {
-                // If one has mcp-server- prefix and other doesn't, non-mcp comes first
-                (Some(_), None) => std::cmp::Ordering::Greater,
-                (None, Some(_)) => std::cmp::Ordering::Less,
-                // If both have same prefix status, sort by appropriate key
-                (Some(a), Some(b)) => a.cmp(b),
-                (None, None) => a.0.cmp(&b.0),
-            }
-        });
-
-        let add_server_popover = PopoverMenu::new("add-server-popover")
-            .trigger(
-                Button::new("add-server", "Add Server")
-                    .style(ButtonStyle::Outlined)
-                    .icon_position(IconPosition::Start)
-                    .icon(IconName::Plus)
-                    .icon_size(IconSize::Small)
-                    .icon_color(Color::Muted)
-                    .label_size(LabelSize::Small),
-            )
-            .menu({
-                move |window, cx| {
-                    Some(ContextMenu::build(window, cx, |menu, _window, _cx| {
-                        menu.entry("Add Custom Server", None, {
-                            |window, cx| {
-                                window.dispatch_action(crate::AddContextServer.boxed_clone(), cx)
-                            }
-                        })
-                        .entry("Install from Extensions", None, {
-                            |window, cx| {
-                                window.dispatch_action(
-                                    zed_actions::Extensions {
-                                        category_filter: Some(
-                                            ExtensionCategoryFilter::ContextServers,
-                                        ),
-                                        id: None,
-                                    }
-                                    .boxed_clone(),
-                                    cx,
-                                )
-                            }
-                        })
-                    }))
-                }
-            })
-            .anchor(gpui::Corner::TopRight)
-            .offset(gpui::Point {
-                x: px(0.0),
-                y: px(2.0),
-            });
-
-        v_flex()
-            .border_b_1()
-            .border_color(cx.theme().colors().border)
-            .child(self.render_section_title(
-                "Model Context Protocol (MCP) Servers",
-                "All MCP servers connected directly or via a Zed extension.",
-                add_server_popover.into_any_element(),
-            ))
-            .child(
-                v_flex()
-                    .pl_4()
-                    .pb_4()
-                    .pr_5()
-                    .w_full()
-                    .gap_1()
-                    .map(|mut parent| {
-                        if context_server_ids.is_empty() {
-                            parent.child(
-                                h_flex()
-                                    .p_4()
-                                    .justify_center()
-                                    .border_1()
-                                    .border_dashed()
-                                    .border_color(cx.theme().colors().border.opacity(0.6))
-                                    .rounded_sm()
-                                    .child(
-                                        Label::new("No MCP servers added yet.")
-                                            .color(Color::Muted)
-                                            .size(LabelSize::Small),
-                                    ),
-                            )
-                        } else {
-                            for (index, context_server_id) in
-                                context_server_ids.into_iter().enumerate()
-                            {
-                                if index > 0 {
-                                    parent = parent.child(
-                                        Divider::horizontal()
-                                            .color(DividerColor::BorderFaded)
-                                            .into_any_element(),
-                                    );
-                                }
-                                parent = parent.child(self.render_context_server(
-                                    context_server_id,
-                                    window,
-                                    cx,
-                                ));
-                            }
-                            parent
-                        }
-                    }),
-            )
-    }
-
-    fn render_context_server(
-        &self,
-        context_server_id: ContextServerId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl use<> + IntoElement {
-        let server_status = self
-            .context_server_store
-            .read(cx)
-            .status_for_server(&context_server_id)
-            .unwrap_or(ContextServerStatus::Stopped);
-        let server_configuration = self
-            .context_server_store
-            .read(cx)
-            .configuration_for_server(&context_server_id);
-
-        let is_running = matches!(server_status, ContextServerStatus::Running);
-        let item_id = SharedString::from(context_server_id.0.clone());
-        // Servers without a configuration can only be provided by extensions.
-        let provided_by_extension = server_configuration.as_ref().is_none_or(|config| {
-            matches!(
-                config.as_ref(),
-                ContextServerConfiguration::Extension { .. }
-            )
-        });
-
-        let error = if let ContextServerStatus::Error(error) = server_status.clone() {
-            Some(error)
-        } else {
-            None
-        };
-
-        let tool_count = self
-            .context_server_registry
-            .read(cx)
-            .tools_for_server(&context_server_id)
-            .count();
-
-        let (source_icon, source_tooltip) = if provided_by_extension {
-            (
-                IconName::ZedSrcExtension,
-                "This MCP server was installed from an extension.",
-            )
-        } else {
-            (
-                IconName::ZedSrcCustom,
-                "This custom MCP server was installed directly.",
-            )
-        };
-
-        let (status_indicator, tooltip_text) = match server_status {
-            ContextServerStatus::Starting => (
-                Icon::new(IconName::LoadCircle)
-                    .size(IconSize::XSmall)
-                    .color(Color::Accent)
-                    .with_keyed_rotate_animation(
-                        SharedString::from(format!("{}-starting", context_server_id.0)),
-                        3,
-                    )
-                    .into_any_element(),
-                "Server is starting.",
-            ),
-            ContextServerStatus::Running => (
-                Indicator::dot().color(Color::Success).into_any_element(),
-                "Server is active.",
-            ),
-            ContextServerStatus::Error(_) => (
-                Indicator::dot().color(Color::Error).into_any_element(),
-                "Server has an error.",
-            ),
-            ContextServerStatus::Stopped => (
-                Indicator::dot().color(Color::Muted).into_any_element(),
-                "Server is stopped.",
-            ),
-        };
-        let is_remote = server_configuration
-            .as_ref()
-            .map(|config| matches!(config.as_ref(), ContextServerConfiguration::Http { .. }))
-            .unwrap_or(false);
-        let context_server_configuration_menu = PopoverMenu::new("context-server-config-menu")
-            .trigger_with_tooltip(
-                IconButton::new("context-server-config-menu", IconName::Settings)
-                    .icon_color(Color::Muted)
-                    .icon_size(IconSize::Small),
-                Tooltip::text("Configure MCP Server"),
-            )
-            .anchor(Corner::TopRight)
-            .menu({
-                let fs = self.fs.clone();
-                let context_server_id = context_server_id.clone();
-                let language_registry = self.language_registry.clone();
-                let workspace = self.workspace.clone();
-                let context_server_registry = self.context_server_registry.clone();
-
-                move |window, cx| {
-                    Some(ContextMenu::build(window, cx, |menu, _window, _cx| {
-                        menu.entry("Configure Server", None, {
-                            let context_server_id = context_server_id.clone();
-                            let language_registry = language_registry.clone();
-                            let workspace = workspace.clone();
-                            move |window, cx| {
-                                if is_remote {
-                                    crate::agent_configuration::configure_context_server_modal::ConfigureContextServerModal::show_modal_for_existing_server(
-                                        context_server_id.clone(),
-                                        language_registry.clone(),
-                                        workspace.clone(),
-                                        window,
-                                        cx,
-                                    )
-                                    .detach();
-                                } else {
-                                    ConfigureContextServerModal::show_modal_for_existing_server(
-                                        context_server_id.clone(),
-                                        language_registry.clone(),
-                                        workspace.clone(),
-                                        window,
-                                        cx,
-                                    )
-                                    .detach();
-                                }
-                            }
-                        }).when(tool_count > 0, |this| this.entry("View Tools", None, {
-                            let context_server_id = context_server_id.clone();
-                            let context_server_registry = context_server_registry.clone();
-                            let workspace = workspace.clone();
-                            move |window, cx| {
-                                let context_server_id = context_server_id.clone();
-                                workspace.update(cx, |workspace, cx| {
-                                    ConfigureContextServerToolsModal::toggle(
-                                        context_server_id,
-                                        context_server_registry.clone(),
-                                        workspace,
-                                        window,
-                                        cx,
-                                    );
-                                })
-                                .ok();
-                            }
-                        }))
-                        .separator()
-                        .entry("Uninstall", None, {
-                            let fs = fs.clone();
-                            let context_server_id = context_server_id.clone();
-                            let workspace = workspace.clone();
-                            move |_, cx| {
-                                let uninstall_extension_task = match (
-                                    provided_by_extension,
-                                    resolve_extension_for_context_server(&context_server_id, cx),
-                                ) {
-                                    (true, Some((id, manifest))) => {
-                                        if extension_only_provides_context_server(manifest.as_ref())
-                                        {
-                                            ExtensionStore::global(cx).update(cx, |store, cx| {
-                                                store.uninstall_extension(id, cx)
-                                            })
-                                        } else {
-                                            workspace.update(cx, |workspace, cx| {
-                                                show_unable_to_uninstall_extension_with_context_server(workspace, context_server_id.clone(), cx);
-                                            }).log_err();
-                                            Task::ready(Ok(()))
-                                        }
-                                    }
-                                    _ => Task::ready(Ok(())),
-                                };
-
-                                cx.spawn({
-                                    let fs = fs.clone();
-                                    let context_server_id = context_server_id.clone();
-                                    async move |cx| {
-                                        uninstall_extension_task.await?;
-                                        cx.update(|cx| {
-                                            update_settings_file(
-                                                fs.clone(),
-                                                cx,
-                                                {
-                                                    let context_server_id =
-                                                        context_server_id.clone();
-                                                    move |settings, _| {
-                                                        settings.project
-                                                            .context_servers
-                                                            .remove(&context_server_id.0);
-                                                    }
-                                                },
-                                            )
-                                        })
-                                    }
-                                })
-                                .detach_and_log_err(cx);
-                            }
-                        })
-                    }))
-                }
-            });
-
-        v_flex()
-            .id(item_id.clone())
-            .child(
-                h_flex()
-                    .justify_between()
-                    .child(
-                        h_flex()
-                            .flex_1()
-                            .min_w_0()
-                            .child(
-                                h_flex()
-                                    .id(format!("tooltip-{}", item_id))
-                                    .h_full()
-                                    .w_3()
-                                    .mr_2()
-                                    .justify_center()
-                                    .tooltip(Tooltip::text(tooltip_text))
-                                    .child(status_indicator),
-                            )
-                            .child(Label::new(item_id).truncate())
-                            .child(
-                                div()
-                                    .id("extension-source")
-                                    .mt_0p5()
-                                    .mx_1()
-                                    .flex_none()
-                                    .tooltip(Tooltip::text(source_tooltip))
-                                    .child(
-                                        Icon::new(source_icon)
-                                            .size(IconSize::Small)
-                                            .color(Color::Muted),
-                                    ),
-                            )
-                            .when(is_running, |this| {
-                                this.child(
-                                    Label::new(if tool_count == 1 {
-                                        SharedString::from("1 tool")
-                                    } else {
-                                        SharedString::from(format!("{} tools", tool_count))
-                                    })
-                                    .color(Color::Muted)
-                                    .size(LabelSize::Small),
-                                )
-                            }),
-                    )
-                    .child(
-                        h_flex()
-                            .gap_0p5()
-                            .flex_none()
-                            .child(context_server_configuration_menu)
-                            .child(
-                            Switch::new("context-server-switch", is_running.into())
-                                .on_click({
-                                    let context_server_manager = self.context_server_store.clone();
-                                    let fs = self.fs.clone();
-
-                                    move |state, _window, cx| {
-                                        let is_enabled = match state {
-                                            ToggleState::Unselected
-                                            | ToggleState::Indeterminate => {
-                                                context_server_manager.update(cx, |this, cx| {
-                                                    this.stop_server(&context_server_id, cx)
-                                                        .log_err();
-                                                });
-                                                false
-                                            }
-                                            ToggleState::Selected => {
-                                                context_server_manager.update(cx, |this, cx| {
-                                                    if let Some(server) =
-                                                        this.get_server(&context_server_id)
-                                                    {
-                                                        this.start_server(server, cx);
-                                                    }
-                                                });
-                                                true
-                                            }
-                                        };
-                                        update_settings_file(fs.clone(), cx, {
-                                            let context_server_id = context_server_id.clone();
-
-                                            move |settings, _| {
-                                                settings
-                                                    .project
-                                                    .context_servers
-                                                    .entry(context_server_id.0)
-                                                    .or_insert_with(|| {
-                                                        settings::ContextServerSettingsContent::Extension {
-                                                            enabled: is_enabled,
-                                                            settings: serde_json::json!({}),
-                                                        }
-                                                    })
-                                                    .set_enabled(is_enabled);
-                                            }
-                                        });
-                                    }
-                                }),
-                        ),
-                    ),
-            )
-            .map(|parent| {
-                if let Some(error) = error {
-                    return parent.child(
-                        h_flex()
-                            .gap_2()
-                            .pr_4()
-                            .items_start()
-                            .child(
-                                h_flex()
-                                    .flex_none()
-                                    .h(window.line_height() / 1.6_f32)
-                                    .justify_center()
-                                    .child(
-                                        Icon::new(IconName::XCircle)
-                                            .size(IconSize::XSmall)
-                                            .color(Color::Error),
-                                    ),
-                            )
-                            .child(
-                                div().w_full().child(
-                                    Label::new(error)
-                                        .buffer_font(cx)
-                                        .color(Color::Muted)
-                                        .size(LabelSize::Small),
-                                ),
-                            ),
-                    );
-                }
-                parent
-            })
-    }
-
-    fn render_agent_servers_section(&mut self, cx: &mut Context<Self>) -> impl IntoElement {
-        let agent_server_store = self.agent_server_store.read(cx);
-
-        let user_defined_agents = agent_server_store
-            .external_agents()
-            .filter(|name| {
-                name.0 != GEMINI_NAME && name.0 != CLAUDE_CODE_NAME && name.0 != CODEX_NAME
-            })
-            .cloned()
-            .collect::<Vec<_>>();
-
-        let user_defined_agents: Vec<_> = user_defined_agents
-            .into_iter()
-            .map(|name| {
-                let icon = if let Some(icon_path) = agent_server_store.agent_icon(&name) {
-                    AgentIcon::Path(icon_path)
-                } else {
-                    AgentIcon::Name(IconName::Ai)
-                };
-                let display_name = agent_server_store
-                    .agent_display_name(&name)
-                    .unwrap_or_else(|| name.0.clone());
-                (name, icon, display_name)
-            })
-            .collect();
-
-        let add_agent_popover = PopoverMenu::new("add-agent-server-popover")
-            .trigger(
-                Button::new("add-agent", "Add Agent")
-                    .style(ButtonStyle::Outlined)
-                    .icon_position(IconPosition::Start)
-                    .icon(IconName::Plus)
-                    .icon_size(IconSize::Small)
-                    .icon_color(Color::Muted)
-                    .label_size(LabelSize::Small),
-            )
-            .menu({
-                move |window, cx| {
-                    Some(ContextMenu::build(window, cx, |menu, _window, _cx| {
-                        menu.entry("Install from Extensions", None, {
-                            |window, cx| {
-                                window.dispatch_action(
-                                    zed_actions::Extensions {
-                                        category_filter: Some(
-                                            ExtensionCategoryFilter::AgentServers,
-                                        ),
-                                        id: None,
-                                    }
-                                    .boxed_clone(),
-                                    cx,
-                                )
-                            }
-                        })
-                        .entry("Add Custom Agent", None, {
-                            move |window, cx| {
-                                if let Some(workspace) = window.root().flatten() {
-                                    let workspace = workspace.downgrade();
-                                    window
-                                        .spawn(cx, async |cx| {
-                                            open_new_agent_servers_entry_in_settings_editor(
-                                                workspace, cx,
-                                            )
-                                            .await
-                                        })
-                                        .detach_and_log_err(cx);
-                                }
-                            }
-                        })
-                        .separator()
-                        .header("Learn More")
-                        .item(
-                            ContextMenuEntry::new("Agent Servers Docs")
-                                .icon(IconName::ArrowUpRight)
-                                .icon_color(Color::Muted)
-                                .icon_position(IconPosition::End)
-                                .handler({
-                                    move |window, cx| {
-                                        window.dispatch_action(
-                                            Box::new(OpenBrowser {
-                                                url: zed_urls::agent_server_docs(cx),
-                                            }),
-                                            cx,
-                                        );
-                                    }
-                                }),
-                        )
-                        .item(
-                            ContextMenuEntry::new("ACP Docs")
-                                .icon(IconName::ArrowUpRight)
-                                .icon_color(Color::Muted)
-                                .icon_position(IconPosition::End)
-                                .handler({
-                                    move |window, cx| {
-                                        window.dispatch_action(
-                                            Box::new(OpenBrowser {
-                                                url: "https://agentclientprotocol.com/".into(),
-                                            }),
-                                            cx,
-                                        );
-                                    }
-                                }),
-                        )
-                    }))
-                }
-            })
-            .anchor(gpui::Corner::TopRight)
-            .offset(gpui::Point {
-                x: px(0.0),
-                y: px(2.0),
-            });
-
-        v_flex()
-            .border_b_1()
-            .border_color(cx.theme().colors().border)
-            .child(
-                v_flex()
-                    .child(self.render_section_title(
-                        "External Agents",
-                        "All agents connected through the Agent Client Protocol.",
-                        add_agent_popover.into_any_element(),
-                    ))
-                    .child(
-                        v_flex()
-                            .p_4()
-                            .pt_0()
-                            .gap_2()
-                            .child(self.render_agent_server(
-                                AgentIcon::Name(IconName::AiClaude),
-                                "Claude Code",
-                                "Claude Code",
-                                false,
-                                cx,
-                            ))
-                            .child(Divider::horizontal().color(DividerColor::BorderFaded))
-                            .child(self.render_agent_server(
-                                AgentIcon::Name(IconName::AiOpenAi),
-                                "Codex CLI",
-                                "Codex CLI",
-                                false,
-                                cx,
-                            ))
-                            .child(Divider::horizontal().color(DividerColor::BorderFaded))
-                            .child(self.render_agent_server(
-                                AgentIcon::Name(IconName::AiGemini),
-                                "Gemini CLI",
-                                "Gemini CLI",
-                                false,
-                                cx,
-                            ))
-                            .map(|mut parent| {
-                                for (name, icon, display_name) in user_defined_agents {
-                                    parent = parent
-                                        .child(
-                                            Divider::horizontal().color(DividerColor::BorderFaded),
-                                        )
-                                        .child(self.render_agent_server(
-                                            icon,
-                                            name,
-                                            display_name,
-                                            true,
-                                            cx,
-                                        ));
-                                }
-                                parent
-                            }),
-                    ),
-            )
-    }
-
-    fn render_agent_server(
-        &self,
-        icon: AgentIcon,
-        id: impl Into<SharedString>,
-        display_name: impl Into<SharedString>,
-        external: bool,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let id = id.into();
-        let display_name = display_name.into();
-        let icon = match icon {
-            AgentIcon::Name(icon_name) => Icon::new(icon_name)
-                .size(IconSize::Small)
-                .color(Color::Muted),
-            AgentIcon::Path(icon_path) => Icon::from_external_svg(icon_path)
-                .size(IconSize::Small)
-                .color(Color::Muted),
-        };
-
-        let tooltip_id = SharedString::new(format!("agent-source-{}", id));
-        let tooltip_message = format!(
-            "The {} agent was installed from an extension.",
-            display_name
-        );
-
-        let agent_server_name = ExternalAgentServerName(id.clone());
-
-        let uninstall_btn_id = SharedString::from(format!("uninstall-{}", id));
-        let uninstall_button = IconButton::new(uninstall_btn_id, IconName::Trash)
-            .icon_color(Color::Muted)
-            .icon_size(IconSize::Small)
-            .tooltip(Tooltip::text("Uninstall Agent Extension"))
-            .on_click(cx.listener(move |this, _, _window, cx| {
-                let agent_name = agent_server_name.clone();
-
-                if let Some(ext_id) = this.agent_server_store.update(cx, |store, _cx| {
-                    store.get_extension_id_for_agent(&agent_name)
-                }) {
-                    ExtensionStore::global(cx)
-                        .update(cx, |store, cx| store.uninstall_extension(ext_id, cx))
-                        .detach_and_log_err(cx);
-                }
-            }));
-
-        h_flex()
-            .gap_1()
-            .justify_between()
-            .child(
-                h_flex()
-                    .gap_1p5()
-                    .child(icon)
-                    .child(Label::new(display_name))
-                    .when(external, |this| {
-                        this.child(
-                            div()
-                                .id(tooltip_id)
-                                .flex_none()
-                                .tooltip(Tooltip::text(tooltip_message))
-                                .child(
-                                    Icon::new(IconName::ZedSrcExtension)
-                                        .size(IconSize::Small)
-                                        .color(Color::Muted),
-                                ),
-                        )
-                    })
-                    .child(
-                        Icon::new(IconName::Check)
-                            .color(Color::Success)
-                            .size(IconSize::Small),
-                    ),
-            )
-            .when(external, |this| this.child(uninstall_button))
-    }
-}
-
-impl Render for AgentConfiguration {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .id("assistant-configuration")
-            .key_context("AgentConfiguration")
-            .track_focus(&self.focus_handle(cx))
-            .relative()
-            .size_full()
-            .pb_8()
-            .bg(cx.theme().colors().panel_background)
-            .child(
-                div()
-                    .size_full()
-                    .child(
-                        v_flex()
-                            .id("assistant-configuration-content")
-                            .track_scroll(&self.scroll_handle)
-                            .size_full()
-                            .overflow_y_scroll()
-                            .child(self.render_agent_servers_section(cx))
-                            .child(self.render_context_servers_section(window, cx))
-                            .child(self.render_provider_configuration_section(cx)),
-                    )
-                    .vertical_scrollbar_for(&self.scroll_handle, window, cx),
-            )
-    }
-}
-
-fn extension_only_provides_context_server(manifest: &ExtensionManifest) -> bool {
-    manifest.context_servers.len() == 1
-        && manifest.themes.is_empty()
-        && manifest.icon_themes.is_empty()
-        && manifest.languages.is_empty()
-        && manifest.grammars.is_empty()
-        && manifest.language_servers.is_empty()
-        && manifest.slash_commands.is_empty()
-        && manifest.snippets.is_none()
-        && manifest.debug_locators.is_empty()
-}
-
-pub(crate) fn resolve_extension_for_context_server(
-    id: &ContextServerId,
-    cx: &App,
-) -> Option<(Arc<str>, Arc<ExtensionManifest>)> {
-    ExtensionStore::global(cx)
-        .read(cx)
-        .installed_extensions()
-        .iter()
-        .find(|(_, entry)| entry.manifest.context_servers.contains_key(&id.0))
-        .map(|(id, entry)| (id.clone(), entry.manifest.clone()))
-}
-
-// This notification appears when trying to delete
-// an MCP server extension that not only provides
-// the server, but other things, too, like language servers and more.
-fn show_unable_to_uninstall_extension_with_context_server(
-    workspace: &mut Workspace,
-    id: ContextServerId,
-    cx: &mut App,
-) {
-    let workspace_handle = workspace.weak_handle();
-    let context_server_id = id.clone();
-
-    let status_toast = StatusToast::new(
-        format!(
-            "The {} extension provides more than just the MCP server. Proceed to uninstall anyway?",
-            id.0
-        ),
-        cx,
-        move |this, _cx| {
-            let workspace_handle = workspace_handle.clone();
-
-            this.icon(ToastIcon::new(IconName::Warning).color(Color::Warning))
-                .dismiss_button(true)
-                .action("Uninstall", move |_, _cx| {
-                    if let Some((extension_id, _)) =
-                        resolve_extension_for_context_server(&context_server_id, _cx)
-                    {
-                        ExtensionStore::global(_cx).update(_cx, |store, cx| {
-                            store
-                                .uninstall_extension(extension_id, cx)
-                                .detach_and_log_err(cx);
-                        });
-
-                        workspace_handle
-                            .update(_cx, |workspace, cx| {
-                                let fs = workspace.app_state().fs.clone();
-                                cx.spawn({
-                                    let context_server_id = context_server_id.clone();
-                                    async move |_workspace_handle, cx| {
-                                        cx.update(|cx| {
-                                            update_settings_file(fs, cx, move |settings, _| {
-                                                settings
-                                                    .project
-                                                    .context_servers
-                                                    .remove(&context_server_id.0);
-                                            });
-                                        })?;
-                                        anyhow::Ok(())
-                                    }
-                                })
-                                .detach_and_log_err(cx);
-                            })
-                            .log_err();
-                    }
-                })
-        },
-    );
-
-    workspace.toggle_status_toast(status_toast, cx);
-}
-
-async fn open_new_agent_servers_entry_in_settings_editor(
-    workspace: WeakEntity<Workspace>,
-    cx: &mut AsyncWindowContext,
-) -> Result<()> {
-    let settings_editor = workspace
-        .update_in(cx, |_, window, cx| {
-            create_and_open_local_file(paths::settings_file(), window, cx, || {
-                settings::initial_user_settings_content().as_ref().into()
-            })
-        })?
-        .await?
-        .downcast::<Editor>()
-        .unwrap();
-
-    settings_editor
-        .downgrade()
-        .update_in(cx, |item, window, cx| {
-            let text = item.buffer().read(cx).snapshot(cx).text();
-
-            let settings = cx.global::<SettingsStore>();
-
-            let mut unique_server_name = None;
-            let edits = settings.edits_for_update(&text, |settings| {
-                let server_name: Option<SharedString> = (0..u8::MAX)
-                    .map(|i| {
-                        if i == 0 {
-                            "your_agent".into()
-                        } else {
-                            format!("your_agent_{}", i).into()
-                        }
-                    })
-                    .find(|name| {
-                        !settings
-                            .agent_servers
-                            .as_ref()
-                            .is_some_and(|agent_servers| agent_servers.custom.contains_key(name))
-                    });
-                if let Some(server_name) = server_name {
-                    unique_server_name = Some(server_name.clone());
-                    settings
-                        .agent_servers
-                        .get_or_insert_default()
-                        .custom
-                        .insert(
-                            server_name,
-                            settings::CustomAgentServerSettings::Custom {
-                                path: "path_to_executable".into(),
-                                args: vec![],
-                                env: Some(HashMap::default()),
-                                default_mode: None,
-                                default_model: None,
-                            },
-                        );
-                }
-            });
-
-            if edits.is_empty() {
-                return;
-            }
-
-            let ranges = edits
-                .iter()
-                .map(|(range, _)| range.clone())
-                .collect::<Vec<_>>();
-
-            item.edit(
-                edits.into_iter().map(|(range, s)| {
-                    (
-                        MultiBufferOffset(range.start)..MultiBufferOffset(range.end),
-                        s,
-                    )
-                }),
-                cx,
-            );
-            if let Some((unique_server_name, buffer)) =
-                unique_server_name.zip(item.buffer().read(cx).as_singleton())
-            {
-                let snapshot = buffer.read(cx).snapshot();
-                if let Some(range) =
-                    find_text_in_buffer(&unique_server_name, ranges[0].start, &snapshot)
-                {
-                    item.change_selections(
-                        SelectionEffects::scroll(Autoscroll::newest()),
-                        window,
-                        cx,
-                        |selections| {
-                            selections.select_ranges(vec![
-                                MultiBufferOffset(range.start)..MultiBufferOffset(range.end),
-                            ]);
-                        },
-                    );
-                }
-            }
-        })
-}
-
-fn find_text_in_buffer(
-    text: &str,
-    start: usize,
-    snapshot: &language::BufferSnapshot,
-) -> Option<Range<usize>> {
-    let chars = text.chars().collect::<Vec<char>>();
-
-    let mut offset = start;
-    let mut char_offset = 0;
-    for c in snapshot.chars_at(start) {
-        if char_offset >= chars.len() {
-            break;
-        }
-        offset += 1;
-
-        if c == chars[char_offset] {
-            char_offset += 1;
-        } else {
-            char_offset = 0;
-        }
-    }
-
-    if char_offset == chars.len() {
-        Some(offset.saturating_sub(chars.len())..offset)
-    } else {
-        None
-    }
-}
-
-// OpenAI-compatible providers are user-configured and can be removed,
-// whereas built-in providers (like Anthropic, OpenAI, Google, etc.) can't.
-//
-// If in the future we have more "API-compatible-type" of providers,
-// they should be included here as removable providers.
-fn is_removable_provider(provider_id: &LanguageModelProviderId, cx: &App) -> bool {
-    AllLanguageModelSettings::get_global(cx)
-        .openai_compatible
-        .contains_key(provider_id.0.as_ref())
-}
diff --git a/crates/agent_ui/src/agent_configuration/add_llm_provider_modal.rs b/crates/agent_ui/src/agent_configuration/add_llm_provider_modal.rs
deleted file mode 100644
index 02269511bb..0000000000
--- a/crates/agent_ui/src/agent_configuration/add_llm_provider_modal.rs
+++ /dev/null
@@ -1,848 +0,0 @@
-use std::sync::Arc;
-
-use anyhow::Result;
-use collections::HashSet;
-use fs::Fs;
-use gpui::{
-    DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, Render, ScrollHandle, Task,
-};
-use language_model::LanguageModelRegistry;
-use language_models::provider::open_ai_compatible::{AvailableModel, ModelCapabilities};
-use settings::{OpenAiCompatibleSettingsContent, update_settings_file};
-use ui::{
-    Banner, Checkbox, KeyBinding, Modal, ModalFooter, ModalHeader, Section, ToggleState,
-    WithScrollbar, prelude::*,
-};
-use ui_input::InputField;
-use workspace::{ModalView, Workspace};
-
-fn single_line_input(
-    label: impl Into<SharedString>,
-    placeholder: impl Into<SharedString>,
-    text: Option<&str>,
-    tab_index: isize,
-    window: &mut Window,
-    cx: &mut App,
-) -> Entity<InputField> {
-    cx.new(|cx| {
-        let input = InputField::new(window, cx, placeholder)
-            .label(label)
-            .tab_index(tab_index)
-            .tab_stop(true);
-
-        if let Some(text) = text {
-            input
-                .editor()
-                .update(cx, |editor, cx| editor.set_text(text, window, cx));
-        }
-        input
-    })
-}
-
-#[derive(Clone, Copy)]
-pub enum LlmCompatibleProvider {
-    OpenAi,
-}
-
-impl LlmCompatibleProvider {
-    fn name(&self) -> &'static str {
-        match self {
-            LlmCompatibleProvider::OpenAi => "OpenAI",
-        }
-    }
-
-    fn api_url(&self) -> &'static str {
-        match self {
-            LlmCompatibleProvider::OpenAi => "https://api.openai.com/v1",
-        }
-    }
-}
-
-struct AddLlmProviderInput {
-    provider_name: Entity<InputField>,
-    api_url: Entity<InputField>,
-    api_key: Entity<InputField>,
-    models: Vec<ModelInput>,
-}
-
-impl AddLlmProviderInput {
-    fn new(provider: LlmCompatibleProvider, window: &mut Window, cx: &mut App) -> Self {
-        let provider_name =
-            single_line_input("Provider Name", provider.name(), None, 1, window, cx);
-        let api_url = single_line_input("API URL", provider.api_url(), None, 2, window, cx);
-        let api_key = single_line_input(
-            "API Key",
-            "000000000000000000000000000000000000000000000000",
-            None,
-            3,
-            window,
-            cx,
-        );
-
-        Self {
-            provider_name,
-            api_url,
-            api_key,
-            models: vec![ModelInput::new(0, window, cx)],
-        }
-    }
-
-    fn add_model(&mut self, window: &mut Window, cx: &mut App) {
-        let model_index = self.models.len();
-        self.models.push(ModelInput::new(model_index, window, cx));
-    }
-
-    fn remove_model(&mut self, index: usize) {
-        self.models.remove(index);
-    }
-}
-
-struct ModelCapabilityToggles {
-    pub supports_tools: ToggleState,
-    pub supports_images: ToggleState,
-    pub supports_parallel_tool_calls: ToggleState,
-    pub supports_prompt_cache_key: ToggleState,
-}
-
-struct ModelInput {
-    name: Entity<InputField>,
-    max_completion_tokens: Entity<InputField>,
-    max_output_tokens: Entity<InputField>,
-    max_tokens: Entity<InputField>,
-    capabilities: ModelCapabilityToggles,
-}
-
-impl ModelInput {
-    fn new(model_index: usize, window: &mut Window, cx: &mut App) -> Self {
-        let base_tab_index = (3 + (model_index * 4)) as isize;
-
-        let model_name = single_line_input(
-            "Model Name",
-            "e.g. gpt-4o, claude-opus-4, gemini-2.5-pro",
-            None,
-            base_tab_index + 1,
-            window,
-            cx,
-        );
-        let max_completion_tokens = single_line_input(
-            "Max Completion Tokens",
-            "200000",
-            Some("200000"),
-            base_tab_index + 2,
-            window,
-            cx,
-        );
-        let max_output_tokens = single_line_input(
-            "Max Output Tokens",
-            "Max Output Tokens",
-            Some("32000"),
-            base_tab_index + 3,
-            window,
-            cx,
-        );
-        let max_tokens = single_line_input(
-            "Max Tokens",
-            "Max Tokens",
-            Some("200000"),
-            base_tab_index + 4,
-            window,
-            cx,
-        );
-
-        let ModelCapabilities {
-            tools,
-            images,
-            parallel_tool_calls,
-            prompt_cache_key,
-        } = ModelCapabilities::default();
-
-        Self {
-            name: model_name,
-            max_completion_tokens,
-            max_output_tokens,
-            max_tokens,
-            capabilities: ModelCapabilityToggles {
-                supports_tools: tools.into(),
-                supports_images: images.into(),
-                supports_parallel_tool_calls: parallel_tool_calls.into(),
-                supports_prompt_cache_key: prompt_cache_key.into(),
-            },
-        }
-    }
-
-    fn parse(&self, cx: &App) -> Result<AvailableModel, SharedString> {
-        let name = self.name.read(cx).text(cx);
-        if name.is_empty() {
-            return Err(SharedString::from("Model Name cannot be empty"));
-        }
-        Ok(AvailableModel {
-            name,
-            display_name: None,
-            max_completion_tokens: Some(
-                self.max_completion_tokens
-                    .read(cx)
-                    .text(cx)
-                    .parse::<u64>()
-                    .map_err(|_| SharedString::from("Max Completion Tokens must be a number"))?,
-            ),
-            max_output_tokens: Some(
-                self.max_output_tokens
-                    .read(cx)
-                    .text(cx)
-                    .parse::<u64>()
-                    .map_err(|_| SharedString::from("Max Output Tokens must be a number"))?,
-            ),
-            max_tokens: self
-                .max_tokens
-                .read(cx)
-                .text(cx)
-                .parse::<u64>()
-                .map_err(|_| SharedString::from("Max Tokens must be a number"))?,
-            capabilities: ModelCapabilities {
-                tools: self.capabilities.supports_tools.selected(),
-                images: self.capabilities.supports_images.selected(),
-                parallel_tool_calls: self.capabilities.supports_parallel_tool_calls.selected(),
-                prompt_cache_key: self.capabilities.supports_prompt_cache_key.selected(),
-            },
-        })
-    }
-}
-
-fn save_provider_to_settings(
-    input: &AddLlmProviderInput,
-    cx: &mut App,
-) -> Task<Result<(), SharedString>> {
-    let provider_name: Arc<str> = input.provider_name.read(cx).text(cx).into();
-    if provider_name.is_empty() {
-        return Task::ready(Err("Provider Name cannot be empty".into()));
-    }
-
-    if LanguageModelRegistry::read_global(cx)
-        .providers()
-        .iter()
-        .any(|provider| {
-            provider.id().0.as_ref() == provider_name.as_ref()
-                || provider.name().0.as_ref() == provider_name.as_ref()
-        })
-    {
-        return Task::ready(Err(
-            "Provider Name is already taken by another provider".into()
-        ));
-    }
-
-    let api_url = input.api_url.read(cx).text(cx);
-    if api_url.is_empty() {
-        return Task::ready(Err("API URL cannot be empty".into()));
-    }
-
-    let api_key = input.api_key.read(cx).text(cx);
-    if api_key.is_empty() {
-        return Task::ready(Err("API Key cannot be empty".into()));
-    }
-
-    let mut models = Vec::new();
-    let mut model_names: HashSet<String> = HashSet::default();
-    for model in &input.models {
-        match model.parse(cx) {
-            Ok(model) => {
-                if !model_names.insert(model.name.clone()) {
-                    return Task::ready(Err("Model Names must be unique".into()));
-                }
-                models.push(model)
-            }
-            Err(err) => return Task::ready(Err(err)),
-        }
-    }
-
-    let fs = <dyn Fs>::global(cx);
-    let task = cx.write_credentials(&api_url, "Bearer", api_key.as_bytes());
-    cx.spawn(async move |cx| {
-        task.await
-            .map_err(|_| "Failed to write API key to keychain")?;
-        cx.update(|cx| {
-            update_settings_file(fs, cx, |settings, _cx| {
-                settings
-                    .language_models
-                    .get_or_insert_default()
-                    .openai_compatible
-                    .get_or_insert_default()
-                    .insert(
-                        provider_name,
-                        OpenAiCompatibleSettingsContent {
-                            api_url,
-                            available_models: models,
-                        },
-                    );
-            });
-        })
-        .ok();
-        Ok(())
-    })
-}
-
-pub struct AddLlmProviderModal {
-    provider: LlmCompatibleProvider,
-    input: AddLlmProviderInput,
-    scroll_handle: ScrollHandle,
-    focus_handle: FocusHandle,
-    last_error: Option<SharedString>,
-}
-
-impl AddLlmProviderModal {
-    pub fn toggle(
-        provider: LlmCompatibleProvider,
-        workspace: &mut Workspace,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        workspace.toggle_modal(window, cx, |window, cx| Self::new(provider, window, cx));
-    }
-
-    fn new(provider: LlmCompatibleProvider, window: &mut Window, cx: &mut Context<Self>) -> Self {
-        Self {
-            input: AddLlmProviderInput::new(provider, window, cx),
-            provider,
-            last_error: None,
-            focus_handle: cx.focus_handle(),
-            scroll_handle: ScrollHandle::new(),
-        }
-    }
-
-    fn confirm(&mut self, _: &menu::Confirm, _: &mut Window, cx: &mut Context<Self>) {
-        let task = save_provider_to_settings(&self.input, cx);
-        cx.spawn(async move |this, cx| {
-            let result = task.await;
-            this.update(cx, |this, cx| match result {
-                Ok(_) => {
-                    cx.emit(DismissEvent);
-                }
-                Err(error) => {
-                    this.last_error = Some(error);
-                    cx.notify();
-                }
-            })
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn cancel(&mut self, _: &menu::Cancel, _: &mut Window, cx: &mut Context<Self>) {
-        cx.emit(DismissEvent);
-    }
-
-    fn render_model_section(&self, cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .mt_1()
-            .gap_2()
-            .child(
-                h_flex()
-                    .justify_between()
-                    .child(Label::new("Models").size(LabelSize::Small))
-                    .child(
-                        Button::new("add-model", "Add Model")
-                            .icon(IconName::Plus)
-                            .icon_position(IconPosition::Start)
-                            .icon_size(IconSize::XSmall)
-                            .icon_color(Color::Muted)
-                            .label_size(LabelSize::Small)
-                            .on_click(cx.listener(|this, _, window, cx| {
-                                this.input.add_model(window, cx);
-                                cx.notify();
-                            })),
-                    ),
-            )
-            .children(
-                self.input
-                    .models
-                    .iter()
-                    .enumerate()
-                    .map(|(ix, _)| self.render_model(ix, cx)),
-            )
-    }
-
-    fn render_model(&self, ix: usize, cx: &mut Context<Self>) -> impl IntoElement + use<> {
-        let has_more_than_one_model = self.input.models.len() > 1;
-        let model = &self.input.models[ix];
-
-        v_flex()
-            .p_2()
-            .gap_2()
-            .rounded_sm()
-            .border_1()
-            .border_dashed()
-            .border_color(cx.theme().colors().border.opacity(0.6))
-            .bg(cx.theme().colors().element_active.opacity(0.15))
-            .child(model.name.clone())
-            .child(
-                h_flex()
-                    .gap_2()
-                    .child(model.max_completion_tokens.clone())
-                    .child(model.max_output_tokens.clone()),
-            )
-            .child(model.max_tokens.clone())
-            .child(
-                v_flex()
-                    .gap_1()
-                    .child(
-                        Checkbox::new(("supports-tools", ix), model.capabilities.supports_tools)
-                            .label("Supports tools")
-                            .on_click(cx.listener(move |this, checked, _window, cx| {
-                                this.input.models[ix].capabilities.supports_tools = *checked;
-                                cx.notify();
-                            })),
-                    )
-                    .child(
-                        Checkbox::new(("supports-images", ix), model.capabilities.supports_images)
-                            .label("Supports images")
-                            .on_click(cx.listener(move |this, checked, _window, cx| {
-                                this.input.models[ix].capabilities.supports_images = *checked;
-                                cx.notify();
-                            })),
-                    )
-                    .child(
-                        Checkbox::new(
-                            ("supports-parallel-tool-calls", ix),
-                            model.capabilities.supports_parallel_tool_calls,
-                        )
-                        .label("Supports parallel_tool_calls")
-                        .on_click(cx.listener(
-                            move |this, checked, _window, cx| {
-                                this.input.models[ix]
-                                    .capabilities
-                                    .supports_parallel_tool_calls = *checked;
-                                cx.notify();
-                            },
-                        )),
-                    )
-                    .child(
-                        Checkbox::new(
-                            ("supports-prompt-cache-key", ix),
-                            model.capabilities.supports_prompt_cache_key,
-                        )
-                        .label("Supports prompt_cache_key")
-                        .on_click(cx.listener(
-                            move |this, checked, _window, cx| {
-                                this.input.models[ix].capabilities.supports_prompt_cache_key =
-                                    *checked;
-                                cx.notify();
-                            },
-                        )),
-                    ),
-            )
-            .when(has_more_than_one_model, |this| {
-                this.child(
-                    Button::new(("remove-model", ix), "Remove Model")
-                        .icon(IconName::Trash)
-                        .icon_position(IconPosition::Start)
-                        .icon_size(IconSize::XSmall)
-                        .icon_color(Color::Muted)
-                        .label_size(LabelSize::Small)
-                        .style(ButtonStyle::Outlined)
-                        .full_width()
-                        .on_click(cx.listener(move |this, _, _window, cx| {
-                            this.input.remove_model(ix);
-                            cx.notify();
-                        })),
-                )
-            })
-    }
-
-    fn on_tab(&mut self, _: &menu::SelectNext, window: &mut Window, _: &mut Context<Self>) {
-        window.focus_next();
-    }
-
-    fn on_tab_prev(
-        &mut self,
-        _: &menu::SelectPrevious,
-        window: &mut Window,
-        _: &mut Context<Self>,
-    ) {
-        window.focus_prev();
-    }
-}
-
-impl EventEmitter<DismissEvent> for AddLlmProviderModal {}
-
-impl Focusable for AddLlmProviderModal {
-    fn focus_handle(&self, _cx: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl ModalView for AddLlmProviderModal {}
-
-impl Render for AddLlmProviderModal {
-    fn render(&mut self, window: &mut ui::Window, cx: &mut ui::Context<Self>) -> impl IntoElement {
-        let focus_handle = self.focus_handle(cx);
-
-        let window_size = window.viewport_size();
-        let rem_size = window.rem_size();
-        let is_large_window = window_size.height / rem_size > rems_from_px(600.).0;
-
-        let modal_max_height = if is_large_window {
-            rems_from_px(450.)
-        } else {
-            rems_from_px(200.)
-        };
-
-        v_flex()
-            .id("add-llm-provider-modal")
-            .key_context("AddLlmProviderModal")
-            .w(rems(34.))
-            .elevation_3(cx)
-            .on_action(cx.listener(Self::cancel))
-            .on_action(cx.listener(Self::on_tab))
-            .on_action(cx.listener(Self::on_tab_prev))
-            .capture_any_mouse_down(cx.listener(|this, _, window, cx| {
-                this.focus_handle(cx).focus(window);
-            }))
-            .child(
-                Modal::new("configure-context-server", None)
-                    .header(ModalHeader::new().headline("Add LLM Provider").description(
-                        match self.provider {
-                            LlmCompatibleProvider::OpenAi => {
-                                "This provider will use an OpenAI compatible API."
-                            }
-                        },
-                    ))
-                    .when_some(self.last_error.clone(), |this, error| {
-                        this.section(
-                            Section::new().child(
-                                Banner::new()
-                                    .severity(Severity::Warning)
-                                    .child(div().text_xs().child(error)),
-                            ),
-                        )
-                    })
-                    .child(
-                        div()
-                            .size_full()
-                            .vertical_scrollbar_for(&self.scroll_handle, window, cx)
-                            .child(
-                                v_flex()
-                                    .id("modal_content")
-                                    .size_full()
-                                    .tab_group()
-                                    .max_h(modal_max_height)
-                                    .pl_3()
-                                    .pr_4()
-                                    .gap_2()
-                                    .overflow_y_scroll()
-                                    .track_scroll(&self.scroll_handle)
-                                    .child(self.input.provider_name.clone())
-                                    .child(self.input.api_url.clone())
-                                    .child(self.input.api_key.clone())
-                                    .child(self.render_model_section(cx)),
-                            ),
-                    )
-                    .footer(
-                        ModalFooter::new().end_slot(
-                            h_flex()
-                                .gap_1()
-                                .child(
-                                    Button::new("cancel", "Cancel")
-                                        .key_binding(
-                                            KeyBinding::for_action_in(
-                                                &menu::Cancel,
-                                                &focus_handle,
-                                                cx,
-                                            )
-                                            .map(|kb| kb.size(rems_from_px(12.))),
-                                        )
-                                        .on_click(cx.listener(|this, _event, window, cx| {
-                                            this.cancel(&menu::Cancel, window, cx)
-                                        })),
-                                )
-                                .child(
-                                    Button::new("save-server", "Save Provider")
-                                        .key_binding(
-                                            KeyBinding::for_action_in(
-                                                &menu::Confirm,
-                                                &focus_handle,
-                                                cx,
-                                            )
-                                            .map(|kb| kb.size(rems_from_px(12.))),
-                                        )
-                                        .on_click(cx.listener(|this, _event, window, cx| {
-                                            this.confirm(&menu::Confirm, window, cx)
-                                        })),
-                                ),
-                        ),
-                    ),
-            )
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use fs::FakeFs;
-    use gpui::{TestAppContext, VisualTestContext};
-    use language_model::{
-        LanguageModelProviderId, LanguageModelProviderName,
-        fake_provider::FakeLanguageModelProvider,
-    };
-    use project::Project;
-    use settings::SettingsStore;
-    use util::path;
-
-    #[gpui::test]
-    async fn test_save_provider_invalid_inputs(cx: &mut TestAppContext) {
-        let cx = setup_test(cx).await;
-
-        assert_eq!(
-            save_provider_validation_errors("", "someurl", "somekey", vec![], cx,).await,
-            Some("Provider Name cannot be empty".into())
-        );
-
-        assert_eq!(
-            save_provider_validation_errors("someprovider", "", "somekey", vec![], cx,).await,
-            Some("API URL cannot be empty".into())
-        );
-
-        assert_eq!(
-            save_provider_validation_errors("someprovider", "someurl", "", vec![], cx,).await,
-            Some("API Key cannot be empty".into())
-        );
-
-        assert_eq!(
-            save_provider_validation_errors(
-                "someprovider",
-                "someurl",
-                "somekey",
-                vec![("", "200000", "200000", "32000")],
-                cx,
-            )
-            .await,
-            Some("Model Name cannot be empty".into())
-        );
-
-        assert_eq!(
-            save_provider_validation_errors(
-                "someprovider",
-                "someurl",
-                "somekey",
-                vec![("somemodel", "abc", "200000", "32000")],
-                cx,
-            )
-            .await,
-            Some("Max Tokens must be a number".into())
-        );
-
-        assert_eq!(
-            save_provider_validation_errors(
-                "someprovider",
-                "someurl",
-                "somekey",
-                vec![("somemodel", "200000", "abc", "32000")],
-                cx,
-            )
-            .await,
-            Some("Max Completion Tokens must be a number".into())
-        );
-
-        assert_eq!(
-            save_provider_validation_errors(
-                "someprovider",
-                "someurl",
-                "somekey",
-                vec![("somemodel", "200000", "200000", "abc")],
-                cx,
-            )
-            .await,
-            Some("Max Output Tokens must be a number".into())
-        );
-
-        assert_eq!(
-            save_provider_validation_errors(
-                "someprovider",
-                "someurl",
-                "somekey",
-                vec![
-                    ("somemodel", "200000", "200000", "32000"),
-                    ("somemodel", "200000", "200000", "32000"),
-                ],
-                cx,
-            )
-            .await,
-            Some("Model Names must be unique".into())
-        );
-    }
-
-    #[gpui::test]
-    async fn test_save_provider_name_conflict(cx: &mut TestAppContext) {
-        let cx = setup_test(cx).await;
-
-        cx.update(|_window, cx| {
-            LanguageModelRegistry::global(cx).update(cx, |registry, cx| {
-                registry.register_provider(
-                    Arc::new(FakeLanguageModelProvider::new(
-                        LanguageModelProviderId::new("someprovider"),
-                        LanguageModelProviderName::new("Some Provider"),
-                    )),
-                    cx,
-                );
-            });
-        });
-
-        assert_eq!(
-            save_provider_validation_errors(
-                "someprovider",
-                "someurl",
-                "someapikey",
-                vec![("somemodel", "200000", "200000", "32000")],
-                cx,
-            )
-            .await,
-            Some("Provider Name is already taken by another provider".into())
-        );
-    }
-
-    #[gpui::test]
-    async fn test_model_input_default_capabilities(cx: &mut TestAppContext) {
-        let cx = setup_test(cx).await;
-
-        cx.update(|window, cx| {
-            let model_input = ModelInput::new(0, window, cx);
-            model_input.name.update(cx, |input, cx| {
-                input.editor().update(cx, |editor, cx| {
-                    editor.set_text("somemodel", window, cx);
-                });
-            });
-            assert_eq!(
-                model_input.capabilities.supports_tools,
-                ToggleState::Selected
-            );
-            assert_eq!(
-                model_input.capabilities.supports_images,
-                ToggleState::Unselected
-            );
-            assert_eq!(
-                model_input.capabilities.supports_parallel_tool_calls,
-                ToggleState::Unselected
-            );
-            assert_eq!(
-                model_input.capabilities.supports_prompt_cache_key,
-                ToggleState::Unselected
-            );
-
-            let parsed_model = model_input.parse(cx).unwrap();
-            assert!(parsed_model.capabilities.tools);
-            assert!(!parsed_model.capabilities.images);
-            assert!(!parsed_model.capabilities.parallel_tool_calls);
-            assert!(!parsed_model.capabilities.prompt_cache_key);
-        });
-    }
-
-    #[gpui::test]
-    async fn test_model_input_deselected_capabilities(cx: &mut TestAppContext) {
-        let cx = setup_test(cx).await;
-
-        cx.update(|window, cx| {
-            let mut model_input = ModelInput::new(0, window, cx);
-            model_input.name.update(cx, |input, cx| {
-                input.editor().update(cx, |editor, cx| {
-                    editor.set_text("somemodel", window, cx);
-                });
-            });
-
-            model_input.capabilities.supports_tools = ToggleState::Unselected;
-            model_input.capabilities.supports_images = ToggleState::Unselected;
-            model_input.capabilities.supports_parallel_tool_calls = ToggleState::Unselected;
-            model_input.capabilities.supports_prompt_cache_key = ToggleState::Unselected;
-
-            let parsed_model = model_input.parse(cx).unwrap();
-            assert!(!parsed_model.capabilities.tools);
-            assert!(!parsed_model.capabilities.images);
-            assert!(!parsed_model.capabilities.parallel_tool_calls);
-            assert!(!parsed_model.capabilities.prompt_cache_key);
-        });
-    }
-
-    #[gpui::test]
-    async fn test_model_input_with_name_and_capabilities(cx: &mut TestAppContext) {
-        let cx = setup_test(cx).await;
-
-        cx.update(|window, cx| {
-            let mut model_input = ModelInput::new(0, window, cx);
-            model_input.name.update(cx, |input, cx| {
-                input.editor().update(cx, |editor, cx| {
-                    editor.set_text("somemodel", window, cx);
-                });
-            });
-
-            model_input.capabilities.supports_tools = ToggleState::Selected;
-            model_input.capabilities.supports_images = ToggleState::Unselected;
-            model_input.capabilities.supports_parallel_tool_calls = ToggleState::Selected;
-            model_input.capabilities.supports_prompt_cache_key = ToggleState::Unselected;
-
-            let parsed_model = model_input.parse(cx).unwrap();
-            assert_eq!(parsed_model.name, "somemodel");
-            assert!(parsed_model.capabilities.tools);
-            assert!(!parsed_model.capabilities.images);
-            assert!(parsed_model.capabilities.parallel_tool_calls);
-            assert!(!parsed_model.capabilities.prompt_cache_key);
-        });
-    }
-
-    async fn setup_test(cx: &mut TestAppContext) -> &mut VisualTestContext {
-        cx.update(|cx| {
-            let store = SettingsStore::test(cx);
-            cx.set_global(store);
-            theme::init(theme::LoadThemes::JustBase, cx);
-
-            language_model::init_settings(cx);
-        });
-
-        let fs = FakeFs::new(cx.executor());
-        cx.update(|cx| <dyn Fs>::set_global(fs.clone(), cx));
-        let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
-        let (_, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-        cx
-    }
-
-    async fn save_provider_validation_errors(
-        provider_name: &str,
-        api_url: &str,
-        api_key: &str,
-        models: Vec<(&str, &str, &str, &str)>,
-        cx: &mut VisualTestContext,
-    ) -> Option<SharedString> {
-        fn set_text(input: &Entity<InputField>, text: &str, window: &mut Window, cx: &mut App) {
-            input.update(cx, |input, cx| {
-                input.editor().update(cx, |editor, cx| {
-                    editor.set_text(text, window, cx);
-                });
-            });
-        }
-
-        let task = cx.update(|window, cx| {
-            let mut input = AddLlmProviderInput::new(LlmCompatibleProvider::OpenAi, window, cx);
-            set_text(&input.provider_name, provider_name, window, cx);
-            set_text(&input.api_url, api_url, window, cx);
-            set_text(&input.api_key, api_key, window, cx);
-
-            for (i, (name, max_tokens, max_completion_tokens, max_output_tokens)) in
-                models.iter().enumerate()
-            {
-                if i >= input.models.len() {
-                    input.models.push(ModelInput::new(i, window, cx));
-                }
-                let model = &mut input.models[i];
-                set_text(&model.name, name, window, cx);
-                set_text(&model.max_tokens, max_tokens, window, cx);
-                set_text(
-                    &model.max_completion_tokens,
-                    max_completion_tokens,
-                    window,
-                    cx,
-                );
-                set_text(&model.max_output_tokens, max_output_tokens, window, cx);
-            }
-            save_provider_to_settings(&input, cx)
-        });
-
-        task.await.err()
-    }
-}
diff --git a/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs b/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs
deleted file mode 100644
index a0f0be886a..0000000000
--- a/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs
+++ /dev/null
@@ -1,942 +0,0 @@
-use std::sync::{Arc, Mutex};
-
-use anyhow::{Context as _, Result};
-use collections::HashMap;
-use context_server::{ContextServerCommand, ContextServerId};
-use editor::{Editor, EditorElement, EditorStyle};
-use gpui::{
-    AsyncWindowContext, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, ScrollHandle,
-    Task, TextStyle, TextStyleRefinement, UnderlineStyle, WeakEntity, prelude::*,
-};
-use language::{Language, LanguageRegistry};
-use markdown::{Markdown, MarkdownElement, MarkdownStyle};
-use notifications::status_toast::{StatusToast, ToastIcon};
-use project::{
-    context_server_store::{
-        ContextServerStatus, ContextServerStore, registry::ContextServerDescriptorRegistry,
-    },
-    project_settings::{ContextServerSettings, ProjectSettings},
-    worktree_store::WorktreeStore,
-};
-use serde::Deserialize;
-use settings::{Settings as _, update_settings_file};
-use theme::ThemeSettings;
-use ui::{
-    CommonAnimationExt, KeyBinding, Modal, ModalFooter, ModalHeader, Section, Tooltip,
-    WithScrollbar, prelude::*,
-};
-use util::ResultExt as _;
-use workspace::{ModalView, Workspace};
-
-use crate::AddContextServer;
-
-enum ConfigurationTarget {
-    New,
-    Existing {
-        id: ContextServerId,
-        command: ContextServerCommand,
-    },
-    ExistingHttp {
-        id: ContextServerId,
-        url: String,
-        headers: HashMap<String, String>,
-    },
-    Extension {
-        id: ContextServerId,
-        repository_url: Option<SharedString>,
-        installation: Option<extension::ContextServerConfiguration>,
-    },
-}
-
-enum ConfigurationSource {
-    New {
-        editor: Entity<Editor>,
-        is_http: bool,
-    },
-    Existing {
-        editor: Entity<Editor>,
-        is_http: bool,
-    },
-    Extension {
-        id: ContextServerId,
-        editor: Option<Entity<Editor>>,
-        repository_url: Option<SharedString>,
-        installation_instructions: Option<Entity<markdown::Markdown>>,
-        settings_validator: Option<jsonschema::Validator>,
-    },
-}
-
-impl ConfigurationSource {
-    fn has_configuration_options(&self) -> bool {
-        !matches!(self, ConfigurationSource::Extension { editor: None, .. })
-    }
-
-    fn is_new(&self) -> bool {
-        matches!(self, ConfigurationSource::New { .. })
-    }
-
-    fn from_target(
-        target: ConfigurationTarget,
-        language_registry: Arc<LanguageRegistry>,
-        jsonc_language: Option<Arc<Language>>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Self {
-        fn create_editor(
-            json: String,
-            jsonc_language: Option<Arc<Language>>,
-            window: &mut Window,
-            cx: &mut App,
-        ) -> Entity<Editor> {
-            cx.new(|cx| {
-                let mut editor = Editor::auto_height(4, 16, window, cx);
-                editor.set_text(json, window, cx);
-                editor.set_show_gutter(false, cx);
-                editor.set_soft_wrap_mode(language::language_settings::SoftWrap::None, cx);
-                if let Some(buffer) = editor.buffer().read(cx).as_singleton() {
-                    buffer.update(cx, |buffer, cx| buffer.set_language(jsonc_language, cx))
-                }
-                editor
-            })
-        }
-
-        match target {
-            ConfigurationTarget::New => ConfigurationSource::New {
-                editor: create_editor(context_server_input(None), jsonc_language, window, cx),
-                is_http: false,
-            },
-            ConfigurationTarget::Existing { id, command } => ConfigurationSource::Existing {
-                editor: create_editor(
-                    context_server_input(Some((id, command))),
-                    jsonc_language,
-                    window,
-                    cx,
-                ),
-                is_http: false,
-            },
-            ConfigurationTarget::ExistingHttp {
-                id,
-                url,
-                headers: auth,
-            } => ConfigurationSource::Existing {
-                editor: create_editor(
-                    context_server_http_input(Some((id, url, auth))),
-                    jsonc_language,
-                    window,
-                    cx,
-                ),
-                is_http: true,
-            },
-            ConfigurationTarget::Extension {
-                id,
-                repository_url,
-                installation,
-            } => {
-                let settings_validator = installation.as_ref().and_then(|installation| {
-                    jsonschema::validator_for(&installation.settings_schema)
-                        .context("Failed to load JSON schema for context server settings")
-                        .log_err()
-                });
-                let installation_instructions = installation.as_ref().map(|installation| {
-                    cx.new(|cx| {
-                        Markdown::new(
-                            installation.installation_instructions.clone().into(),
-                            Some(language_registry.clone()),
-                            None,
-                            cx,
-                        )
-                    })
-                });
-                ConfigurationSource::Extension {
-                    id,
-                    repository_url,
-                    installation_instructions,
-                    settings_validator,
-                    editor: installation.map(|installation| {
-                        create_editor(installation.default_settings, jsonc_language, window, cx)
-                    }),
-                }
-            }
-        }
-    }
-
-    fn output(&self, cx: &mut App) -> Result<(ContextServerId, ContextServerSettings)> {
-        match self {
-            ConfigurationSource::New { editor, is_http }
-            | ConfigurationSource::Existing { editor, is_http } => {
-                if *is_http {
-                    parse_http_input(&editor.read(cx).text(cx)).map(|(id, url, auth)| {
-                        (
-                            id,
-                            ContextServerSettings::Http {
-                                enabled: true,
-                                url,
-                                headers: auth,
-                            },
-                        )
-                    })
-                } else {
-                    parse_input(&editor.read(cx).text(cx)).map(|(id, command)| {
-                        (
-                            id,
-                            ContextServerSettings::Stdio {
-                                enabled: true,
-                                command,
-                            },
-                        )
-                    })
-                }
-            }
-            ConfigurationSource::Extension {
-                id,
-                editor,
-                settings_validator,
-                ..
-            } => {
-                let text = editor
-                    .as_ref()
-                    .context("No output available")?
-                    .read(cx)
-                    .text(cx);
-                let settings = serde_json_lenient::from_str::<serde_json::Value>(&text)?;
-                if let Some(settings_validator) = settings_validator
-                    && let Err(error) = settings_validator.validate(&settings)
-                {
-                    return Err(anyhow::anyhow!(error.to_string()));
-                }
-                Ok((
-                    id.clone(),
-                    ContextServerSettings::Extension {
-                        enabled: true,
-                        settings,
-                    },
-                ))
-            }
-        }
-    }
-}
-
-fn context_server_input(existing: Option<(ContextServerId, ContextServerCommand)>) -> String {
-    let (name, command, args, env) = match existing {
-        Some((id, cmd)) => {
-            let args = serde_json::to_string(&cmd.args).unwrap();
-            let env = serde_json::to_string(&cmd.env.unwrap_or_default()).unwrap();
-            let cmd_path = serde_json::to_string(&cmd.path).unwrap();
-            (id.0.to_string(), cmd_path, args, env)
-        }
-        None => (
-            "some-mcp-server".to_string(),
-            "".to_string(),
-            "[]".to_string(),
-            "{}".to_string(),
-        ),
-    };
-
-    format!(
-        r#"{{
-  /// The name of your MCP server
-  "{name}": {{
-    /// The command which runs the MCP server
-    "command": {command},
-    /// The arguments to pass to the MCP server
-    "args": {args},
-    /// The environment variables to set
-    "env": {env}
-  }}
-}}"#
-    )
-}
-
-fn context_server_http_input(
-    existing: Option<(ContextServerId, String, HashMap<String, String>)>,
-) -> String {
-    let (name, url, headers) = match existing {
-        Some((id, url, headers)) => {
-            let header = if headers.is_empty() {
-                r#"// "Authorization": "Bearer <token>"#.to_string()
-            } else {
-                let json = serde_json::to_string_pretty(&headers).unwrap();
-                let mut lines = json.split("\n").collect::<Vec<_>>();
-                if lines.len() > 1 {
-                    lines.remove(0);
-                    lines.pop();
-                }
-                lines
-                    .into_iter()
-                    .map(|line| format!("  {}", line))
-                    .collect::<String>()
-            };
-            (id.0.to_string(), url, header)
-        }
-        None => (
-            "some-remote-server".to_string(),
-            "https://example.com/mcp".to_string(),
-            r#"// "Authorization": "Bearer <token>"#.to_string(),
-        ),
-    };
-
-    format!(
-        r#"{{
-  /// The name of your remote MCP server
-  "{name}": {{
-    /// The URL of the remote MCP server
-    "url": "{url}",
-    "headers": {{
-     /// Any headers to send along
-     {headers}
-    }}
-  }}
-}}"#
-    )
-}
-
-fn parse_http_input(text: &str) -> Result<(ContextServerId, String, HashMap<String, String>)> {
-    #[derive(Deserialize)]
-    struct Temp {
-        url: String,
-        #[serde(default)]
-        headers: HashMap<String, String>,
-    }
-    let value: HashMap<String, Temp> = serde_json_lenient::from_str(text)?;
-    if value.len() != 1 {
-        anyhow::bail!("Expected exactly one context server configuration");
-    }
-
-    let (key, value) = value.into_iter().next().unwrap();
-
-    Ok((ContextServerId(key.into()), value.url, value.headers))
-}
-
-fn resolve_context_server_extension(
-    id: ContextServerId,
-    worktree_store: Entity<WorktreeStore>,
-    cx: &mut App,
-) -> Task<Option<ConfigurationTarget>> {
-    let registry = ContextServerDescriptorRegistry::default_global(cx).read(cx);
-
-    let Some(descriptor) = registry.context_server_descriptor(&id.0) else {
-        return Task::ready(None);
-    };
-
-    let extension = crate::agent_configuration::resolve_extension_for_context_server(&id, cx);
-    cx.spawn(async move |cx| {
-        let installation = descriptor
-            .configuration(worktree_store, cx)
-            .await
-            .context("Failed to resolve context server configuration")
-            .log_err()
-            .flatten();
-
-        Some(ConfigurationTarget::Extension {
-            id,
-            repository_url: extension
-                .and_then(|(_, manifest)| manifest.repository.clone().map(SharedString::from)),
-            installation,
-        })
-    })
-}
-
-enum State {
-    Idle,
-    Waiting,
-    Error(SharedString),
-}
-
-pub struct ConfigureContextServerModal {
-    context_server_store: Entity<ContextServerStore>,
-    workspace: WeakEntity<Workspace>,
-    source: ConfigurationSource,
-    state: State,
-    original_server_id: Option<ContextServerId>,
-    scroll_handle: ScrollHandle,
-}
-
-impl ConfigureContextServerModal {
-    pub fn register(
-        workspace: &mut Workspace,
-        language_registry: Arc<LanguageRegistry>,
-        _window: Option<&mut Window>,
-        _cx: &mut Context<Workspace>,
-    ) {
-        workspace.register_action({
-            move |_workspace, _: &AddContextServer, window, cx| {
-                let workspace_handle = cx.weak_entity();
-                let language_registry = language_registry.clone();
-                window
-                    .spawn(cx, async move |cx| {
-                        Self::show_modal(
-                            ConfigurationTarget::New,
-                            language_registry,
-                            workspace_handle,
-                            cx,
-                        )
-                        .await
-                    })
-                    .detach_and_log_err(cx);
-            }
-        });
-    }
-
-    pub fn show_modal_for_existing_server(
-        server_id: ContextServerId,
-        language_registry: Arc<LanguageRegistry>,
-        workspace: WeakEntity<Workspace>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<()>> {
-        let Some(settings) = ProjectSettings::get_global(cx)
-            .context_servers
-            .get(&server_id.0)
-            .cloned()
-            .or_else(|| {
-                ContextServerDescriptorRegistry::default_global(cx)
-                    .read(cx)
-                    .context_server_descriptor(&server_id.0)
-                    .map(|_| ContextServerSettings::default_extension())
-            })
-        else {
-            return Task::ready(Err(anyhow::anyhow!("Context server not found")));
-        };
-
-        window.spawn(cx, async move |cx| {
-            let target = match settings {
-                ContextServerSettings::Stdio {
-                    enabled: _,
-                    command,
-                } => Some(ConfigurationTarget::Existing {
-                    id: server_id,
-                    command,
-                }),
-                ContextServerSettings::Http {
-                    enabled: _,
-                    url,
-                    headers,
-                } => Some(ConfigurationTarget::ExistingHttp {
-                    id: server_id,
-                    url,
-                    headers,
-                }),
-                ContextServerSettings::Extension { .. } => {
-                    match workspace
-                        .update(cx, |workspace, cx| {
-                            resolve_context_server_extension(
-                                server_id,
-                                workspace.project().read(cx).worktree_store(),
-                                cx,
-                            )
-                        })
-                        .ok()
-                    {
-                        Some(task) => task.await,
-                        None => None,
-                    }
-                }
-            };
-
-            match target {
-                Some(target) => Self::show_modal(target, language_registry, workspace, cx).await,
-                None => Err(anyhow::anyhow!("Failed to resolve context server")),
-            }
-        })
-    }
-
-    fn show_modal(
-        target: ConfigurationTarget,
-        language_registry: Arc<LanguageRegistry>,
-        workspace: WeakEntity<Workspace>,
-        cx: &mut AsyncWindowContext,
-    ) -> Task<Result<()>> {
-        cx.spawn(async move |cx| {
-            let jsonc_language = language_registry.language_for_name("jsonc").await.ok();
-            workspace.update_in(cx, |workspace, window, cx| {
-                let workspace_handle = cx.weak_entity();
-                let context_server_store = workspace.project().read(cx).context_server_store();
-                workspace.toggle_modal(window, cx, |window, cx| Self {
-                    context_server_store,
-                    workspace: workspace_handle,
-                    state: State::Idle,
-                    original_server_id: match &target {
-                        ConfigurationTarget::Existing { id, .. } => Some(id.clone()),
-                        ConfigurationTarget::ExistingHttp { id, .. } => Some(id.clone()),
-                        ConfigurationTarget::Extension { id, .. } => Some(id.clone()),
-                        ConfigurationTarget::New => None,
-                    },
-                    source: ConfigurationSource::from_target(
-                        target,
-                        language_registry,
-                        jsonc_language,
-                        window,
-                        cx,
-                    ),
-                    scroll_handle: ScrollHandle::new(),
-                })
-            })
-        })
-    }
-
-    fn set_error(&mut self, err: impl Into<SharedString>, cx: &mut Context<Self>) {
-        self.state = State::Error(err.into());
-        cx.notify();
-    }
-
-    fn confirm(&mut self, _: &menu::Confirm, cx: &mut Context<Self>) {
-        self.state = State::Idle;
-        let Some(workspace) = self.workspace.upgrade() else {
-            return;
-        };
-
-        let (id, settings) = match self.source.output(cx) {
-            Ok(val) => val,
-            Err(error) => {
-                self.set_error(error.to_string(), cx);
-                return;
-            }
-        };
-
-        self.state = State::Waiting;
-
-        let existing_server = self.context_server_store.read(cx).get_running_server(&id);
-        if existing_server.is_some() {
-            self.context_server_store.update(cx, |store, cx| {
-                store.stop_server(&id, cx).log_err();
-            });
-        }
-
-        let wait_for_context_server_task =
-            wait_for_context_server(&self.context_server_store, id.clone(), cx);
-        cx.spawn({
-            let id = id.clone();
-            async move |this, cx| {
-                let result = wait_for_context_server_task.await;
-                this.update(cx, |this, cx| match result {
-                    Ok(_) => {
-                        this.state = State::Idle;
-                        this.show_configured_context_server_toast(id, cx);
-                        cx.emit(DismissEvent);
-                    }
-                    Err(err) => {
-                        this.set_error(err, cx);
-                    }
-                })
-            }
-        })
-        .detach();
-
-        let settings_changed =
-            ProjectSettings::get_global(cx).context_servers.get(&id.0) != Some(&settings);
-
-        if settings_changed {
-            // When we write the settings to the file, the context server will be restarted.
-            workspace.update(cx, |workspace, cx| {
-                let fs = workspace.app_state().fs.clone();
-                let original_server_id = self.original_server_id.clone();
-                update_settings_file(fs.clone(), cx, move |current, _| {
-                    if let Some(original_id) = original_server_id {
-                        if original_id != id {
-                            current.project.context_servers.remove(&original_id.0);
-                        }
-                    }
-                    current
-                        .project
-                        .context_servers
-                        .insert(id.0, settings.into());
-                });
-            });
-        } else if let Some(existing_server) = existing_server {
-            self.context_server_store
-                .update(cx, |store, cx| store.start_server(existing_server, cx));
-        }
-    }
-
-    fn cancel(&mut self, _: &menu::Cancel, cx: &mut Context<Self>) {
-        cx.emit(DismissEvent);
-    }
-
-    fn show_configured_context_server_toast(&self, id: ContextServerId, cx: &mut App) {
-        self.workspace
-            .update(cx, {
-                |workspace, cx| {
-                    let status_toast = StatusToast::new(
-                        format!("{} configured successfully.", id.0),
-                        cx,
-                        |this, _cx| {
-                            this.icon(ToastIcon::new(IconName::ToolHammer).color(Color::Muted))
-                                .action("Dismiss", |_, _| {})
-                        },
-                    );
-
-                    workspace.toggle_status_toast(status_toast, cx);
-                }
-            })
-            .log_err();
-    }
-}
-
-fn parse_input(text: &str) -> Result<(ContextServerId, ContextServerCommand)> {
-    let value: serde_json::Value = serde_json_lenient::from_str(text)?;
-    let object = value.as_object().context("Expected object")?;
-    anyhow::ensure!(object.len() == 1, "Expected exactly one key-value pair");
-    let (context_server_name, value) = object.into_iter().next().unwrap();
-    let command: ContextServerCommand = serde_json::from_value(value.clone())?;
-    Ok((ContextServerId(context_server_name.clone().into()), command))
-}
-
-impl ModalView for ConfigureContextServerModal {}
-
-impl Focusable for ConfigureContextServerModal {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        match &self.source {
-            ConfigurationSource::New { editor, .. } => editor.focus_handle(cx),
-            ConfigurationSource::Existing { editor, .. } => editor.focus_handle(cx),
-            ConfigurationSource::Extension { editor, .. } => editor
-                .as_ref()
-                .map(|editor| editor.focus_handle(cx))
-                .unwrap_or_else(|| cx.focus_handle()),
-        }
-    }
-}
-
-impl EventEmitter<DismissEvent> for ConfigureContextServerModal {}
-
-impl ConfigureContextServerModal {
-    fn render_modal_header(&self) -> ModalHeader {
-        let text: SharedString = match &self.source {
-            ConfigurationSource::New { .. } => "Add MCP Server".into(),
-            ConfigurationSource::Existing { .. } => "Configure MCP Server".into(),
-            ConfigurationSource::Extension { id, .. } => format!("Configure {}", id.0).into(),
-        };
-        ModalHeader::new().headline(text)
-    }
-
-    fn render_modal_description(&self, window: &mut Window, cx: &mut Context<Self>) -> AnyElement {
-        const MODAL_DESCRIPTION: &str = "Visit the MCP server configuration docs to find all necessary arguments and environment variables.";
-
-        if let ConfigurationSource::Extension {
-            installation_instructions: Some(installation_instructions),
-            ..
-        } = &self.source
-        {
-            div()
-                .pb_2()
-                .text_sm()
-                .child(MarkdownElement::new(
-                    installation_instructions.clone(),
-                    default_markdown_style(window, cx),
-                ))
-                .into_any_element()
-        } else {
-            Label::new(MODAL_DESCRIPTION)
-                .color(Color::Muted)
-                .into_any_element()
-        }
-    }
-
-    fn render_modal_content(&self, cx: &App) -> AnyElement {
-        let editor = match &self.source {
-            ConfigurationSource::New { editor, .. } => editor,
-            ConfigurationSource::Existing { editor, .. } => editor,
-            ConfigurationSource::Extension { editor, .. } => {
-                let Some(editor) = editor else {
-                    return div().into_any_element();
-                };
-                editor
-            }
-        };
-
-        div()
-            .p_2()
-            .rounded_md()
-            .border_1()
-            .border_color(cx.theme().colors().border_variant)
-            .bg(cx.theme().colors().editor_background)
-            .child({
-                let settings = ThemeSettings::get_global(cx);
-                let text_style = TextStyle {
-                    color: cx.theme().colors().text,
-                    font_family: settings.buffer_font.family.clone(),
-                    font_fallbacks: settings.buffer_font.fallbacks.clone(),
-                    font_size: settings.buffer_font_size(cx).into(),
-                    font_weight: settings.buffer_font.weight,
-                    line_height: relative(settings.buffer_line_height.value()),
-                    ..Default::default()
-                };
-                EditorElement::new(
-                    editor,
-                    EditorStyle {
-                        background: cx.theme().colors().editor_background,
-                        local_player: cx.theme().players().local(),
-                        text: text_style,
-                        syntax: cx.theme().syntax().clone(),
-                        ..Default::default()
-                    },
-                )
-            })
-            .into_any_element()
-    }
-
-    fn render_modal_footer(&self, cx: &mut Context<Self>) -> ModalFooter {
-        let focus_handle = self.focus_handle(cx);
-        let is_connecting = matches!(self.state, State::Waiting);
-
-        ModalFooter::new()
-            .start_slot::<Button>(
-                if let ConfigurationSource::Extension {
-                    repository_url: Some(repository_url),
-                    ..
-                } = &self.source
-                {
-                    Some(
-                        Button::new("open-repository", "Open Repository")
-                            .icon(IconName::ArrowUpRight)
-                            .icon_color(Color::Muted)
-                            .icon_size(IconSize::Small)
-                            .tooltip({
-                                let repository_url = repository_url.clone();
-                                move |_window, cx| {
-                                    Tooltip::with_meta(
-                                        "Open Repository",
-                                        None,
-                                        repository_url.clone(),
-                                        cx,
-                                    )
-                                }
-                            })
-                            .on_click({
-                                let repository_url = repository_url.clone();
-                                move |_, _, cx| cx.open_url(&repository_url)
-                            }),
-                    )
-                } else if let ConfigurationSource::New { is_http, .. } = &self.source {
-                    let label = if *is_http {
-                        "Configure Local"
-                    } else {
-                        "Configure Remote"
-                    };
-                    let tooltip = if *is_http {
-                        "Configure an MCP server that runs on stdin/stdout."
-                    } else {
-                        "Configure an MCP server that you connect to over HTTP"
-                    };
-
-                    Some(
-                        Button::new("toggle-kind", label)
-                            .tooltip(Tooltip::text(tooltip))
-                            .on_click(cx.listener(|this, _, window, cx| match &mut this.source {
-                                ConfigurationSource::New { editor, is_http } => {
-                                    *is_http = !*is_http;
-                                    let new_text = if *is_http {
-                                        context_server_http_input(None)
-                                    } else {
-                                        context_server_input(None)
-                                    };
-                                    editor.update(cx, |editor, cx| {
-                                        editor.set_text(new_text, window, cx);
-                                    })
-                                }
-                                _ => {}
-                            })),
-                    )
-                } else {
-                    None
-                },
-            )
-            .end_slot(
-                h_flex()
-                    .gap_2()
-                    .child(
-                        Button::new(
-                            "cancel",
-                            if self.source.has_configuration_options() {
-                                "Cancel"
-                            } else {
-                                "Dismiss"
-                            },
-                        )
-                        .key_binding(
-                            KeyBinding::for_action_in(&menu::Cancel, &focus_handle, cx)
-                                .map(|kb| kb.size(rems_from_px(12.))),
-                        )
-                        .on_click(
-                            cx.listener(|this, _event, _window, cx| this.cancel(&menu::Cancel, cx)),
-                        ),
-                    )
-                    .children(self.source.has_configuration_options().then(|| {
-                        Button::new(
-                            "add-server",
-                            if self.source.is_new() {
-                                "Add Server"
-                            } else {
-                                "Configure Server"
-                            },
-                        )
-                        .disabled(is_connecting)
-                        .key_binding(
-                            KeyBinding::for_action_in(&menu::Confirm, &focus_handle, cx)
-                                .map(|kb| kb.size(rems_from_px(12.))),
-                        )
-                        .on_click(
-                            cx.listener(|this, _event, _window, cx| {
-                                this.confirm(&menu::Confirm, cx)
-                            }),
-                        )
-                    })),
-            )
-    }
-
-    fn render_waiting_for_context_server() -> Div {
-        h_flex()
-            .gap_2()
-            .child(
-                Icon::new(IconName::ArrowCircle)
-                    .size(IconSize::XSmall)
-                    .color(Color::Info)
-                    .with_rotate_animation(2)
-                    .into_any_element(),
-            )
-            .child(
-                Label::new("Waiting for Context Server")
-                    .size(LabelSize::Small)
-                    .color(Color::Muted),
-            )
-    }
-
-    fn render_modal_error(error: SharedString) -> Div {
-        h_flex()
-            .gap_2()
-            .child(
-                Icon::new(IconName::Warning)
-                    .size(IconSize::XSmall)
-                    .color(Color::Warning),
-            )
-            .child(
-                div()
-                    .w_full()
-                    .child(Label::new(error).size(LabelSize::Small).color(Color::Muted)),
-            )
-    }
-}
-
-impl Render for ConfigureContextServerModal {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        div()
-            .elevation_3(cx)
-            .w(rems(34.))
-            .key_context("ConfigureContextServerModal")
-            .on_action(
-                cx.listener(|this, _: &menu::Cancel, _window, cx| this.cancel(&menu::Cancel, cx)),
-            )
-            .on_action(
-                cx.listener(|this, _: &menu::Confirm, _window, cx| {
-                    this.confirm(&menu::Confirm, cx)
-                }),
-            )
-            .capture_any_mouse_down(cx.listener(|this, _, window, cx| {
-                this.focus_handle(cx).focus(window);
-            }))
-            .child(
-                Modal::new("configure-context-server", None)
-                    .header(self.render_modal_header())
-                    .section(
-                        Section::new().child(
-                            div()
-                                .size_full()
-                                .child(
-                                    div()
-                                        .id("modal-content")
-                                        .max_h(vh(0.7, window))
-                                        .overflow_y_scroll()
-                                        .track_scroll(&self.scroll_handle)
-                                        .child(self.render_modal_description(window, cx))
-                                        .child(self.render_modal_content(cx))
-                                        .child(match &self.state {
-                                            State::Idle => div(),
-                                            State::Waiting => {
-                                                Self::render_waiting_for_context_server()
-                                            }
-                                            State::Error(error) => {
-                                                Self::render_modal_error(error.clone())
-                                            }
-                                        }),
-                                )
-                                .vertical_scrollbar_for(&self.scroll_handle, window, cx),
-                        ),
-                    )
-                    .footer(self.render_modal_footer(cx)),
-            )
-    }
-}
-
-fn wait_for_context_server(
-    context_server_store: &Entity<ContextServerStore>,
-    context_server_id: ContextServerId,
-    cx: &mut App,
-) -> Task<Result<(), Arc<str>>> {
-    let (tx, rx) = futures::channel::oneshot::channel();
-    let tx = Arc::new(Mutex::new(Some(tx)));
-
-    let subscription = cx.subscribe(context_server_store, move |_, event, _cx| match event {
-        project::context_server_store::Event::ServerStatusChanged { server_id, status } => {
-            match status {
-                ContextServerStatus::Running => {
-                    if server_id == &context_server_id
-                        && let Some(tx) = tx.lock().unwrap().take()
-                    {
-                        let _ = tx.send(Ok(()));
-                    }
-                }
-                ContextServerStatus::Stopped => {
-                    if server_id == &context_server_id
-                        && let Some(tx) = tx.lock().unwrap().take()
-                    {
-                        let _ = tx.send(Err("Context server stopped running".into()));
-                    }
-                }
-                ContextServerStatus::Error(error) => {
-                    if server_id == &context_server_id
-                        && let Some(tx) = tx.lock().unwrap().take()
-                    {
-                        let _ = tx.send(Err(error.clone()));
-                    }
-                }
-                _ => {}
-            }
-        }
-    });
-
-    cx.spawn(async move |_cx| {
-        let result = rx
-            .await
-            .map_err(|_| Arc::from("Context server store was dropped"))?;
-        drop(subscription);
-        result
-    })
-}
-
-pub(crate) fn default_markdown_style(window: &Window, cx: &App) -> MarkdownStyle {
-    let theme_settings = ThemeSettings::get_global(cx);
-    let colors = cx.theme().colors();
-    let mut text_style = window.text_style();
-    text_style.refine(&TextStyleRefinement {
-        font_family: Some(theme_settings.ui_font.family.clone()),
-        font_fallbacks: theme_settings.ui_font.fallbacks.clone(),
-        font_features: Some(theme_settings.ui_font.features.clone()),
-        font_size: Some(TextSize::XSmall.rems(cx).into()),
-        color: Some(colors.text_muted),
-        ..Default::default()
-    });
-
-    MarkdownStyle {
-        base_text_style: text_style.clone(),
-        selection_background_color: colors.element_selection_background,
-        link: TextStyleRefinement {
-            background_color: Some(colors.editor_foreground.opacity(0.025)),
-            underline: Some(UnderlineStyle {
-                color: Some(colors.text_accent.opacity(0.5)),
-                thickness: px(1.),
-                ..Default::default()
-            }),
-            ..Default::default()
-        },
-        ..Default::default()
-    }
-}
diff --git a/crates/agent_ui/src/agent_configuration/configure_context_server_tools_modal.rs b/crates/agent_ui/src/agent_configuration/configure_context_server_tools_modal.rs
deleted file mode 100644
index 5115e2f70c..0000000000
--- a/crates/agent_ui/src/agent_configuration/configure_context_server_tools_modal.rs
+++ /dev/null
@@ -1,175 +0,0 @@
-use agent::ContextServerRegistry;
-use collections::HashMap;
-use context_server::ContextServerId;
-use gpui::{
-    DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, ScrollHandle, Window, prelude::*,
-};
-use ui::{Divider, DividerColor, Modal, ModalHeader, WithScrollbar, prelude::*};
-use workspace::{ModalView, Workspace};
-
-pub struct ConfigureContextServerToolsModal {
-    context_server_id: ContextServerId,
-    context_server_registry: Entity<ContextServerRegistry>,
-    focus_handle: FocusHandle,
-    expanded_tools: HashMap<SharedString, bool>,
-    scroll_handle: ScrollHandle,
-}
-
-impl ConfigureContextServerToolsModal {
-    fn new(
-        context_server_id: ContextServerId,
-        context_server_registry: Entity<ContextServerRegistry>,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        Self {
-            context_server_id,
-            context_server_registry,
-            focus_handle: cx.focus_handle(),
-            expanded_tools: HashMap::default(),
-            scroll_handle: ScrollHandle::new(),
-        }
-    }
-
-    pub fn toggle(
-        context_server_id: ContextServerId,
-        context_server_registry: Entity<ContextServerRegistry>,
-        workspace: &mut Workspace,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        workspace.toggle_modal(window, cx, |window, cx| {
-            Self::new(context_server_id, context_server_registry, window, cx)
-        });
-    }
-
-    fn cancel(&mut self, _: &menu::Cancel, _: &mut Window, cx: &mut Context<Self>) {
-        cx.emit(DismissEvent)
-    }
-
-    fn render_modal_content(
-        &self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let tools = self
-            .context_server_registry
-            .read(cx)
-            .tools_for_server(&self.context_server_id)
-            .collect::<Vec<_>>();
-
-        div()
-            .size_full()
-            .pb_2()
-            .child(
-                v_flex()
-                    .id("modal_content")
-                    .px_2()
-                    .gap_1()
-                    .max_h_128()
-                    .overflow_y_scroll()
-                    .track_scroll(&self.scroll_handle)
-                    .children(tools.iter().enumerate().flat_map(|(index, tool)| {
-                        let tool_name = tool.name();
-                        let is_expanded = self
-                            .expanded_tools
-                            .get(tool_name.as_ref())
-                            .copied()
-                            .unwrap_or(false);
-
-                        let icon = if is_expanded {
-                            IconName::ChevronUp
-                        } else {
-                            IconName::ChevronDown
-                        };
-
-                        let mut items = vec![
-                            v_flex()
-                                .child(
-                                    h_flex()
-                                        .id(format!("tool-header-{}", index))
-                                        .py_1()
-                                        .pl_1()
-                                        .pr_2()
-                                        .w_full()
-                                        .justify_between()
-                                        .rounded_sm()
-                                        .hover(|s| s.bg(cx.theme().colors().element_hover))
-                                        .child(
-                                            Label::new(tool_name.clone())
-                                                .buffer_font(cx)
-                                                .size(LabelSize::Small),
-                                        )
-                                        .child(
-                                            Icon::new(icon)
-                                                .size(IconSize::Small)
-                                                .color(Color::Muted),
-                                        )
-                                        .on_click(cx.listener({
-                                            move |this, _event, _window, _cx| {
-                                                let current = this
-                                                    .expanded_tools
-                                                    .get(tool_name.as_ref())
-                                                    .copied()
-                                                    .unwrap_or(false);
-                                                this.expanded_tools
-                                                    .insert(tool_name.clone(), !current);
-                                                _cx.notify();
-                                            }
-                                        })),
-                                )
-                                .when(is_expanded, |this| {
-                                    this.child(
-                                        Label::new(tool.description()).color(Color::Muted).mx_1(),
-                                    )
-                                })
-                                .into_any_element(),
-                        ];
-
-                        if index < tools.len() - 1 {
-                            items.push(
-                                h_flex()
-                                    .w_full()
-                                    .child(Divider::horizontal().color(DividerColor::BorderVariant))
-                                    .into_any_element(),
-                            );
-                        }
-
-                        items
-                    })),
-            )
-            .vertical_scrollbar_for(&self.scroll_handle, window, cx)
-            .into_any_element()
-    }
-}
-
-impl ModalView for ConfigureContextServerToolsModal {}
-
-impl Focusable for ConfigureContextServerToolsModal {
-    fn focus_handle(&self, _cx: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl EventEmitter<DismissEvent> for ConfigureContextServerToolsModal {}
-
-impl Render for ConfigureContextServerToolsModal {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        div()
-            .key_context("ContextServerToolsModal")
-            .occlude()
-            .elevation_3(cx)
-            .w(rems(34.))
-            .on_action(cx.listener(Self::cancel))
-            .track_focus(&self.focus_handle)
-            .child(
-                Modal::new("configure-context-server-tools", None::<ScrollHandle>)
-                    .header(
-                        ModalHeader::new()
-                            .headline(format!("Tools from {}", self.context_server_id.0))
-                            .show_dismiss_button(true),
-                    )
-                    .child(self.render_modal_content(window, cx)),
-            )
-    }
-}
diff --git a/crates/agent_ui/src/agent_configuration/manage_profiles_modal.rs b/crates/agent_ui/src/agent_configuration/manage_profiles_modal.rs
deleted file mode 100644
index 2f17349c3d..0000000000
--- a/crates/agent_ui/src/agent_configuration/manage_profiles_modal.rs
+++ /dev/null
@@ -1,939 +0,0 @@
-mod profile_modal_header;
-
-use std::sync::Arc;
-
-use agent::ContextServerRegistry;
-use agent_settings::{AgentProfile, AgentProfileId, AgentSettings, builtin_profiles};
-use editor::Editor;
-use fs::Fs;
-use gpui::{DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, Subscription, prelude::*};
-use language_model::{LanguageModel, LanguageModelRegistry};
-use settings::{
-    LanguageModelProviderSetting, LanguageModelSelection, Settings as _, update_settings_file,
-};
-use ui::{
-    KeyBinding, ListItem, ListItemSpacing, ListSeparator, Navigable, NavigableEntry, prelude::*,
-};
-use workspace::{ModalView, Workspace};
-
-use crate::agent_configuration::manage_profiles_modal::profile_modal_header::ProfileModalHeader;
-use crate::agent_configuration::tool_picker::{ToolPicker, ToolPickerDelegate};
-use crate::language_model_selector::{LanguageModelSelector, language_model_selector};
-use crate::{AgentPanel, ManageProfiles};
-
-enum Mode {
-    ChooseProfile(ChooseProfileMode),
-    NewProfile(NewProfileMode),
-    ViewProfile(ViewProfileMode),
-    ConfigureTools {
-        profile_id: AgentProfileId,
-        tool_picker: Entity<ToolPicker>,
-        _subscription: Subscription,
-    },
-    ConfigureMcps {
-        profile_id: AgentProfileId,
-        tool_picker: Entity<ToolPicker>,
-        _subscription: Subscription,
-    },
-    ConfigureDefaultModel {
-        profile_id: AgentProfileId,
-        model_picker: Entity<LanguageModelSelector>,
-        _subscription: Subscription,
-    },
-}
-
-impl Mode {
-    pub fn choose_profile(_window: &mut Window, cx: &mut Context<ManageProfilesModal>) -> Self {
-        let settings = AgentSettings::get_global(cx);
-
-        let mut builtin_profiles = Vec::new();
-        let mut custom_profiles = Vec::new();
-
-        for (profile_id, profile) in settings.profiles.iter() {
-            let entry = ProfileEntry {
-                id: profile_id.clone(),
-                name: profile.name.clone(),
-                navigation: NavigableEntry::focusable(cx),
-            };
-            if builtin_profiles::is_builtin(profile_id) {
-                builtin_profiles.push(entry);
-            } else {
-                custom_profiles.push(entry);
-            }
-        }
-
-        builtin_profiles.sort_unstable_by(|a, b| a.name.cmp(&b.name));
-        custom_profiles.sort_unstable_by(|a, b| a.name.cmp(&b.name));
-
-        Self::ChooseProfile(ChooseProfileMode {
-            builtin_profiles,
-            custom_profiles,
-            add_new_profile: NavigableEntry::focusable(cx),
-        })
-    }
-}
-
-#[derive(Clone)]
-struct ProfileEntry {
-    pub id: AgentProfileId,
-    pub name: SharedString,
-    pub navigation: NavigableEntry,
-}
-
-#[derive(Clone)]
-pub struct ChooseProfileMode {
-    builtin_profiles: Vec<ProfileEntry>,
-    custom_profiles: Vec<ProfileEntry>,
-    add_new_profile: NavigableEntry,
-}
-
-#[derive(Clone)]
-pub struct ViewProfileMode {
-    profile_id: AgentProfileId,
-    fork_profile: NavigableEntry,
-    configure_default_model: NavigableEntry,
-    configure_tools: NavigableEntry,
-    configure_mcps: NavigableEntry,
-    cancel_item: NavigableEntry,
-}
-
-#[derive(Clone)]
-pub struct NewProfileMode {
-    name_editor: Entity<Editor>,
-    base_profile_id: Option<AgentProfileId>,
-}
-
-pub struct ManageProfilesModal {
-    fs: Arc<dyn Fs>,
-    context_server_registry: Entity<ContextServerRegistry>,
-    active_model: Option<Arc<dyn LanguageModel>>,
-    focus_handle: FocusHandle,
-    mode: Mode,
-}
-
-impl ManageProfilesModal {
-    pub fn register(
-        workspace: &mut Workspace,
-        _window: Option<&mut Window>,
-        _cx: &mut Context<Workspace>,
-    ) {
-        workspace.register_action(|workspace, action: &ManageProfiles, window, cx| {
-            if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
-                let fs = workspace.app_state().fs.clone();
-                let active_model = panel
-                    .read(cx)
-                    .active_native_agent_thread(cx)
-                    .and_then(|thread| thread.read(cx).model().cloned());
-
-                let context_server_registry = panel.read(cx).context_server_registry().clone();
-                workspace.toggle_modal(window, cx, |window, cx| {
-                    let mut this = Self::new(fs, active_model, context_server_registry, window, cx);
-
-                    if let Some(profile_id) = action.customize_tools.clone() {
-                        this.configure_builtin_tools(profile_id, window, cx);
-                    }
-
-                    this
-                })
-            }
-        });
-    }
-
-    pub fn new(
-        fs: Arc<dyn Fs>,
-        active_model: Option<Arc<dyn LanguageModel>>,
-        context_server_registry: Entity<ContextServerRegistry>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let focus_handle = cx.focus_handle();
-
-        Self {
-            fs,
-            active_model,
-            context_server_registry,
-            focus_handle,
-            mode: Mode::choose_profile(window, cx),
-        }
-    }
-
-    fn choose_profile(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.mode = Mode::choose_profile(window, cx);
-        self.focus_handle(cx).focus(window);
-    }
-
-    fn new_profile(
-        &mut self,
-        base_profile_id: Option<AgentProfileId>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let name_editor = cx.new(|cx| Editor::single_line(window, cx));
-        name_editor.update(cx, |editor, cx| {
-            editor.set_placeholder_text("Profile name", window, cx);
-        });
-
-        self.mode = Mode::NewProfile(NewProfileMode {
-            name_editor,
-            base_profile_id,
-        });
-        self.focus_handle(cx).focus(window);
-    }
-
-    pub fn view_profile(
-        &mut self,
-        profile_id: AgentProfileId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.mode = Mode::ViewProfile(ViewProfileMode {
-            profile_id,
-            fork_profile: NavigableEntry::focusable(cx),
-            configure_default_model: NavigableEntry::focusable(cx),
-            configure_tools: NavigableEntry::focusable(cx),
-            configure_mcps: NavigableEntry::focusable(cx),
-            cancel_item: NavigableEntry::focusable(cx),
-        });
-        self.focus_handle(cx).focus(window);
-    }
-
-    fn configure_default_model(
-        &mut self,
-        profile_id: AgentProfileId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let fs = self.fs.clone();
-        let profile_id_for_closure = profile_id.clone();
-
-        let model_picker = cx.new(|cx| {
-            let fs = fs.clone();
-            let profile_id = profile_id_for_closure.clone();
-
-            language_model_selector(
-                {
-                    let profile_id = profile_id.clone();
-                    move |cx| {
-                        let settings = AgentSettings::get_global(cx);
-
-                        settings
-                            .profiles
-                            .get(&profile_id)
-                            .and_then(|profile| profile.default_model.as_ref())
-                            .and_then(|selection| {
-                                let registry = LanguageModelRegistry::read_global(cx);
-                                let provider_id = language_model::LanguageModelProviderId(
-                                    gpui::SharedString::from(selection.provider.0.clone()),
-                                );
-                                let provider = registry.provider(&provider_id)?;
-                                let model = provider
-                                    .provided_models(cx)
-                                    .iter()
-                                    .find(|m| m.id().0 == selection.model.as_str())?
-                                    .clone();
-                                Some(language_model::ConfiguredModel { provider, model })
-                            })
-                    }
-                },
-                move |model, cx| {
-                    let provider = model.provider_id().0.to_string();
-                    let model_id = model.id().0.to_string();
-                    let profile_id = profile_id.clone();
-
-                    update_settings_file(fs.clone(), cx, move |settings, _cx| {
-                        let agent_settings = settings.agent.get_or_insert_default();
-                        if let Some(profiles) = agent_settings.profiles.as_mut() {
-                            if let Some(profile) = profiles.get_mut(profile_id.0.as_ref()) {
-                                profile.default_model = Some(LanguageModelSelection {
-                                    provider: LanguageModelProviderSetting(provider.clone()),
-                                    model: model_id.clone(),
-                                });
-                            }
-                        }
-                    });
-                },
-                false, // Do not use popover styles for the model picker
-                self.focus_handle.clone(),
-                window,
-                cx,
-            )
-            .modal(false)
-        });
-
-        let dismiss_subscription = cx.subscribe_in(&model_picker, window, {
-            let profile_id = profile_id.clone();
-            move |this, _picker, _: &DismissEvent, window, cx| {
-                this.view_profile(profile_id.clone(), window, cx);
-            }
-        });
-
-        self.mode = Mode::ConfigureDefaultModel {
-            profile_id,
-            model_picker,
-            _subscription: dismiss_subscription,
-        };
-        self.focus_handle(cx).focus(window);
-    }
-
-    fn configure_mcp_tools(
-        &mut self,
-        profile_id: AgentProfileId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let settings = AgentSettings::get_global(cx);
-        let Some(profile) = settings.profiles.get(&profile_id).cloned() else {
-            return;
-        };
-
-        let tool_picker = cx.new(|cx| {
-            let delegate = ToolPickerDelegate::mcp_tools(
-                &self.context_server_registry,
-                self.fs.clone(),
-                profile_id.clone(),
-                profile,
-                cx,
-            );
-            ToolPicker::mcp_tools(delegate, window, cx)
-        });
-        let dismiss_subscription = cx.subscribe_in(&tool_picker, window, {
-            let profile_id = profile_id.clone();
-            move |this, _tool_picker, _: &DismissEvent, window, cx| {
-                this.view_profile(profile_id.clone(), window, cx);
-            }
-        });
-
-        self.mode = Mode::ConfigureMcps {
-            profile_id,
-            tool_picker,
-            _subscription: dismiss_subscription,
-        };
-        self.focus_handle(cx).focus(window);
-    }
-
-    fn configure_builtin_tools(
-        &mut self,
-        profile_id: AgentProfileId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let settings = AgentSettings::get_global(cx);
-        let Some(profile) = settings.profiles.get(&profile_id).cloned() else {
-            return;
-        };
-
-        let tool_picker = cx.new(|cx| {
-            let delegate = ToolPickerDelegate::builtin_tools(
-                //todo: This causes the web search tool to show up even it only works when using zed hosted models
-                agent::supported_built_in_tool_names(
-                    self.active_model.as_ref().map(|model| model.provider_id()),
-                )
-                .map(|s| s.into())
-                .collect::<Vec<_>>(),
-                self.fs.clone(),
-                profile_id.clone(),
-                profile,
-                cx,
-            );
-            ToolPicker::builtin_tools(delegate, window, cx)
-        });
-        let dismiss_subscription = cx.subscribe_in(&tool_picker, window, {
-            let profile_id = profile_id.clone();
-            move |this, _tool_picker, _: &DismissEvent, window, cx| {
-                this.view_profile(profile_id.clone(), window, cx);
-            }
-        });
-
-        self.mode = Mode::ConfigureTools {
-            profile_id,
-            tool_picker,
-            _subscription: dismiss_subscription,
-        };
-        self.focus_handle(cx).focus(window);
-    }
-
-    fn confirm(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        match &self.mode {
-            Mode::ChooseProfile { .. } => {}
-            Mode::NewProfile(mode) => {
-                let name = mode.name_editor.read(cx).text(cx);
-
-                let profile_id =
-                    AgentProfile::create(name, mode.base_profile_id.clone(), self.fs.clone(), cx);
-                self.view_profile(profile_id, window, cx);
-            }
-            Mode::ViewProfile(_) => {}
-            Mode::ConfigureTools { .. } => {}
-            Mode::ConfigureMcps { .. } => {}
-            Mode::ConfigureDefaultModel { .. } => {}
-        }
-    }
-
-    fn cancel(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        match &self.mode {
-            Mode::ChooseProfile { .. } => {
-                cx.emit(DismissEvent);
-            }
-            Mode::NewProfile(mode) => {
-                if let Some(profile_id) = mode.base_profile_id.clone() {
-                    self.view_profile(profile_id, window, cx);
-                } else {
-                    self.choose_profile(window, cx);
-                }
-            }
-            Mode::ViewProfile(_) => self.choose_profile(window, cx),
-            Mode::ConfigureTools { profile_id, .. } => {
-                self.view_profile(profile_id.clone(), window, cx)
-            }
-            Mode::ConfigureMcps { profile_id, .. } => {
-                self.view_profile(profile_id.clone(), window, cx)
-            }
-            Mode::ConfigureDefaultModel { profile_id, .. } => {
-                self.view_profile(profile_id.clone(), window, cx)
-            }
-        }
-    }
-}
-
-impl ModalView for ManageProfilesModal {}
-
-impl Focusable for ManageProfilesModal {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        match &self.mode {
-            Mode::ChooseProfile(_) => self.focus_handle.clone(),
-            Mode::NewProfile(mode) => mode.name_editor.focus_handle(cx),
-            Mode::ViewProfile(_) => self.focus_handle.clone(),
-            Mode::ConfigureTools { tool_picker, .. } => tool_picker.focus_handle(cx),
-            Mode::ConfigureMcps { tool_picker, .. } => tool_picker.focus_handle(cx),
-            Mode::ConfigureDefaultModel { model_picker, .. } => model_picker.focus_handle(cx),
-        }
-    }
-}
-
-impl EventEmitter<DismissEvent> for ManageProfilesModal {}
-
-impl ManageProfilesModal {
-    fn render_profile(
-        &self,
-        profile: &ProfileEntry,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement + use<> {
-        let is_focused = profile.navigation.focus_handle.contains_focused(window, cx);
-
-        div()
-            .id(format!("profile-{}", profile.id))
-            .track_focus(&profile.navigation.focus_handle)
-            .on_action({
-                let profile_id = profile.id.clone();
-                cx.listener(move |this, _: &menu::Confirm, window, cx| {
-                    this.view_profile(profile_id.clone(), window, cx);
-                })
-            })
-            .child(
-                ListItem::new(format!("profile-{}", profile.id))
-                    .toggle_state(is_focused)
-                    .inset(true)
-                    .spacing(ListItemSpacing::Sparse)
-                    .child(Label::new(profile.name.clone()))
-                    .when(is_focused, |this| {
-                        this.end_slot(
-                            h_flex()
-                                .gap_1()
-                                .child(
-                                    Label::new("Customize")
-                                        .size(LabelSize::Small)
-                                        .color(Color::Muted),
-                                )
-                                .child(KeyBinding::for_action_in(
-                                    &menu::Confirm,
-                                    &self.focus_handle,
-                                    cx,
-                                )),
-                        )
-                    })
-                    .on_click({
-                        let profile_id = profile.id.clone();
-                        cx.listener(move |this, _, window, cx| {
-                            this.view_profile(profile_id.clone(), window, cx);
-                        })
-                    }),
-            )
-    }
-
-    fn render_choose_profile(
-        &mut self,
-        mode: ChooseProfileMode,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        Navigable::new(
-            div()
-                .track_focus(&self.focus_handle(cx))
-                .size_full()
-                .child(ProfileModalHeader::new("Agent Profiles", None))
-                .child(
-                    v_flex()
-                        .pb_1()
-                        .child(ListSeparator)
-                        .children(
-                            mode.builtin_profiles
-                                .iter()
-                                .map(|profile| self.render_profile(profile, window, cx)),
-                        )
-                        .when(!mode.custom_profiles.is_empty(), |this| {
-                            this.child(ListSeparator)
-                                .child(
-                                    div().pl_2().pb_1().child(
-                                        Label::new("Custom Profiles")
-                                            .size(LabelSize::Small)
-                                            .color(Color::Muted),
-                                    ),
-                                )
-                                .children(
-                                    mode.custom_profiles
-                                        .iter()
-                                        .map(|profile| self.render_profile(profile, window, cx)),
-                                )
-                        })
-                        .child(ListSeparator)
-                        .child(
-                            div()
-                                .id("new-profile")
-                                .track_focus(&mode.add_new_profile.focus_handle)
-                                .on_action(cx.listener(|this, _: &menu::Confirm, window, cx| {
-                                    this.new_profile(None, window, cx);
-                                }))
-                                .child(
-                                    ListItem::new("new-profile")
-                                        .toggle_state(
-                                            mode.add_new_profile
-                                                .focus_handle
-                                                .contains_focused(window, cx),
-                                        )
-                                        .inset(true)
-                                        .spacing(ListItemSpacing::Sparse)
-                                        .start_slot(Icon::new(IconName::Plus))
-                                        .child(Label::new("Add New Profile"))
-                                        .on_click({
-                                            cx.listener(move |this, _, window, cx| {
-                                                this.new_profile(None, window, cx);
-                                            })
-                                        }),
-                                ),
-                        ),
-                )
-                .into_any_element(),
-        )
-        .map(|mut navigable| {
-            for profile in mode.builtin_profiles {
-                navigable = navigable.entry(profile.navigation);
-            }
-            for profile in mode.custom_profiles {
-                navigable = navigable.entry(profile.navigation);
-            }
-
-            navigable
-        })
-        .entry(mode.add_new_profile)
-    }
-
-    fn render_new_profile(
-        &mut self,
-        mode: NewProfileMode,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let settings = AgentSettings::get_global(cx);
-
-        let base_profile_name = mode.base_profile_id.as_ref().map(|base_profile_id| {
-            settings
-                .profiles
-                .get(base_profile_id)
-                .map(|profile| profile.name.clone())
-                .unwrap_or_else(|| "Unknown".into())
-        });
-
-        v_flex()
-            .id("new-profile")
-            .track_focus(&self.focus_handle(cx))
-            .child(ProfileModalHeader::new(
-                match &base_profile_name {
-                    Some(base_profile) => format!("Fork {base_profile}"),
-                    None => "New Profile".into(),
-                },
-                match base_profile_name {
-                    Some(_) => Some(IconName::Scissors),
-                    None => Some(IconName::Plus),
-                },
-            ))
-            .child(ListSeparator)
-            .child(h_flex().p_2().child(mode.name_editor))
-    }
-
-    fn render_view_profile(
-        &mut self,
-        mode: ViewProfileMode,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let settings = AgentSettings::get_global(cx);
-
-        let profile_name = settings
-            .profiles
-            .get(&mode.profile_id)
-            .map(|profile| profile.name.clone())
-            .unwrap_or_else(|| "Unknown".into());
-
-        let icon = match mode.profile_id.as_str() {
-            "write" => IconName::Pencil,
-            "ask" => IconName::Chat,
-            _ => IconName::UserRoundPen,
-        };
-
-        Navigable::new(
-            div()
-                .track_focus(&self.focus_handle(cx))
-                .size_full()
-                .child(ProfileModalHeader::new(profile_name, Some(icon)))
-                .child(
-                    v_flex()
-                        .pb_1()
-                        .child(ListSeparator)
-                        .child(
-                            div()
-                                .id("fork-profile")
-                                .track_focus(&mode.fork_profile.focus_handle)
-                                .on_action({
-                                    let profile_id = mode.profile_id.clone();
-                                    cx.listener(move |this, _: &menu::Confirm, window, cx| {
-                                        this.new_profile(Some(profile_id.clone()), window, cx);
-                                    })
-                                })
-                                .child(
-                                    ListItem::new("fork-profile")
-                                        .toggle_state(
-                                            mode.fork_profile
-                                                .focus_handle
-                                                .contains_focused(window, cx),
-                                        )
-                                        .inset(true)
-                                        .spacing(ListItemSpacing::Sparse)
-                                        .start_slot(
-                                            Icon::new(IconName::Scissors)
-                                                .size(IconSize::Small)
-                                                .color(Color::Muted),
-                                        )
-                                        .child(Label::new("Fork Profile"))
-                                        .on_click({
-                                            let profile_id = mode.profile_id.clone();
-                                            cx.listener(move |this, _, window, cx| {
-                                                this.new_profile(
-                                                    Some(profile_id.clone()),
-                                                    window,
-                                                    cx,
-                                                );
-                                            })
-                                        }),
-                                ),
-                        )
-                        .child(
-                            div()
-                                .id("configure-default-model")
-                                .track_focus(&mode.configure_default_model.focus_handle)
-                                .on_action({
-                                    let profile_id = mode.profile_id.clone();
-                                    cx.listener(move |this, _: &menu::Confirm, window, cx| {
-                                        this.configure_default_model(
-                                            profile_id.clone(),
-                                            window,
-                                            cx,
-                                        );
-                                    })
-                                })
-                                .child(
-                                    ListItem::new("model-item")
-                                        .toggle_state(
-                                            mode.configure_default_model
-                                                .focus_handle
-                                                .contains_focused(window, cx),
-                                        )
-                                        .inset(true)
-                                        .spacing(ListItemSpacing::Sparse)
-                                        .start_slot(
-                                            Icon::new(IconName::ZedAssistant)
-                                                .size(IconSize::Small)
-                                                .color(Color::Muted),
-                                        )
-                                        .child(Label::new("Configure Default Model"))
-                                        .on_click({
-                                            let profile_id = mode.profile_id.clone();
-                                            cx.listener(move |this, _, window, cx| {
-                                                this.configure_default_model(
-                                                    profile_id.clone(),
-                                                    window,
-                                                    cx,
-                                                );
-                                            })
-                                        }),
-                                ),
-                        )
-                        .child(
-                            div()
-                                .id("configure-builtin-tools")
-                                .track_focus(&mode.configure_tools.focus_handle)
-                                .on_action({
-                                    let profile_id = mode.profile_id.clone();
-                                    cx.listener(move |this, _: &menu::Confirm, window, cx| {
-                                        this.configure_builtin_tools(
-                                            profile_id.clone(),
-                                            window,
-                                            cx,
-                                        );
-                                    })
-                                })
-                                .child(
-                                    ListItem::new("configure-builtin-tools-item")
-                                        .toggle_state(
-                                            mode.configure_tools
-                                                .focus_handle
-                                                .contains_focused(window, cx),
-                                        )
-                                        .inset(true)
-                                        .spacing(ListItemSpacing::Sparse)
-                                        .start_slot(
-                                            Icon::new(IconName::Settings)
-                                                .size(IconSize::Small)
-                                                .color(Color::Muted),
-                                        )
-                                        .child(Label::new("Configure Built-in Tools"))
-                                        .on_click({
-                                            let profile_id = mode.profile_id.clone();
-                                            cx.listener(move |this, _, window, cx| {
-                                                this.configure_builtin_tools(
-                                                    profile_id.clone(),
-                                                    window,
-                                                    cx,
-                                                );
-                                            })
-                                        }),
-                                ),
-                        )
-                        .child(
-                            div()
-                                .id("configure-mcps")
-                                .track_focus(&mode.configure_mcps.focus_handle)
-                                .on_action({
-                                    let profile_id = mode.profile_id.clone();
-                                    cx.listener(move |this, _: &menu::Confirm, window, cx| {
-                                        this.configure_mcp_tools(profile_id.clone(), window, cx);
-                                    })
-                                })
-                                .child(
-                                    ListItem::new("configure-mcp-tools")
-                                        .toggle_state(
-                                            mode.configure_mcps
-                                                .focus_handle
-                                                .contains_focused(window, cx),
-                                        )
-                                        .inset(true)
-                                        .spacing(ListItemSpacing::Sparse)
-                                        .start_slot(
-                                            Icon::new(IconName::ToolHammer)
-                                                .size(IconSize::Small)
-                                                .color(Color::Muted),
-                                        )
-                                        .child(Label::new("Configure MCP Tools"))
-                                        .on_click({
-                                            let profile_id = mode.profile_id.clone();
-                                            cx.listener(move |this, _, window, cx| {
-                                                this.configure_mcp_tools(
-                                                    profile_id.clone(),
-                                                    window,
-                                                    cx,
-                                                );
-                                            })
-                                        }),
-                                ),
-                        )
-                        .child(ListSeparator)
-                        .child(
-                            div()
-                                .id("cancel-item")
-                                .track_focus(&mode.cancel_item.focus_handle)
-                                .on_action({
-                                    cx.listener(move |this, _: &menu::Confirm, window, cx| {
-                                        this.cancel(window, cx);
-                                    })
-                                })
-                                .child(
-                                    ListItem::new("cancel-item")
-                                        .toggle_state(
-                                            mode.cancel_item
-                                                .focus_handle
-                                                .contains_focused(window, cx),
-                                        )
-                                        .inset(true)
-                                        .spacing(ListItemSpacing::Sparse)
-                                        .start_slot(
-                                            Icon::new(IconName::ArrowLeft)
-                                                .size(IconSize::Small)
-                                                .color(Color::Muted),
-                                        )
-                                        .child(Label::new("Go Back"))
-                                        .end_slot(
-                                            div().child(
-                                                KeyBinding::for_action_in(
-                                                    &menu::Cancel,
-                                                    &self.focus_handle,
-                                                    cx,
-                                                )
-                                                .size(rems_from_px(12.)),
-                                            ),
-                                        )
-                                        .on_click({
-                                            cx.listener(move |this, _, window, cx| {
-                                                this.cancel(window, cx);
-                                            })
-                                        }),
-                                ),
-                        ),
-                )
-                .into_any_element(),
-        )
-        .entry(mode.fork_profile)
-        .entry(mode.configure_default_model)
-        .entry(mode.configure_tools)
-        .entry(mode.configure_mcps)
-        .entry(mode.cancel_item)
-    }
-}
-
-impl Render for ManageProfilesModal {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let settings = AgentSettings::get_global(cx);
-
-        let go_back_item = div()
-            .id("cancel-item")
-            .track_focus(&self.focus_handle)
-            .on_action({
-                cx.listener(move |this, _: &menu::Confirm, window, cx| {
-                    this.cancel(window, cx);
-                })
-            })
-            .child(
-                ListItem::new("cancel-item")
-                    .toggle_state(self.focus_handle.contains_focused(window, cx))
-                    .inset(true)
-                    .spacing(ListItemSpacing::Sparse)
-                    .start_slot(
-                        Icon::new(IconName::ArrowLeft)
-                            .size(IconSize::Small)
-                            .color(Color::Muted),
-                    )
-                    .child(Label::new("Go Back"))
-                    .end_slot(
-                        div().child(
-                            KeyBinding::for_action_in(&menu::Cancel, &self.focus_handle, cx)
-                                .size(rems_from_px(12.)),
-                        ),
-                    )
-                    .on_click({
-                        cx.listener(move |this, _, window, cx| {
-                            this.cancel(window, cx);
-                        })
-                    }),
-            );
-
-        div()
-            .elevation_3(cx)
-            .w(rems(34.))
-            .key_context("ManageProfilesModal")
-            .on_action(cx.listener(|this, _: &menu::Cancel, window, cx| this.cancel(window, cx)))
-            .on_action(cx.listener(|this, _: &menu::Confirm, window, cx| this.confirm(window, cx)))
-            .capture_any_mouse_down(cx.listener(|this, _, window, cx| {
-                this.focus_handle(cx).focus(window);
-            }))
-            .on_mouse_down_out(cx.listener(|_this, _, _, cx| cx.emit(DismissEvent)))
-            .child(match &self.mode {
-                Mode::ChooseProfile(mode) => self
-                    .render_choose_profile(mode.clone(), window, cx)
-                    .into_any_element(),
-                Mode::NewProfile(mode) => self
-                    .render_new_profile(mode.clone(), window, cx)
-                    .into_any_element(),
-                Mode::ViewProfile(mode) => self
-                    .render_view_profile(mode.clone(), window, cx)
-                    .into_any_element(),
-                Mode::ConfigureTools {
-                    profile_id,
-                    tool_picker,
-                    ..
-                } => {
-                    let profile_name = settings
-                        .profiles
-                        .get(profile_id)
-                        .map(|profile| profile.name.clone())
-                        .unwrap_or_else(|| "Unknown".into());
-
-                    v_flex()
-                        .pb_1()
-                        .child(ProfileModalHeader::new(
-                            format!("{profile_name} — Configure Built-in Tools"),
-                            Some(IconName::Cog),
-                        ))
-                        .child(ListSeparator)
-                        .child(tool_picker.clone())
-                        .child(ListSeparator)
-                        .child(go_back_item)
-                        .into_any_element()
-                }
-                Mode::ConfigureDefaultModel {
-                    profile_id,
-                    model_picker,
-                    ..
-                } => {
-                    let profile_name = settings
-                        .profiles
-                        .get(profile_id)
-                        .map(|profile| profile.name.clone())
-                        .unwrap_or_else(|| "Unknown".into());
-
-                    v_flex()
-                        .pb_1()
-                        .child(ProfileModalHeader::new(
-                            format!("{profile_name} — Configure Default Model"),
-                            Some(IconName::Ai),
-                        ))
-                        .child(ListSeparator)
-                        .child(v_flex().w(rems(34.)).child(model_picker.clone()))
-                        .child(ListSeparator)
-                        .child(go_back_item)
-                        .into_any_element()
-                }
-                Mode::ConfigureMcps {
-                    profile_id,
-                    tool_picker,
-                    ..
-                } => {
-                    let profile_name = settings
-                        .profiles
-                        .get(profile_id)
-                        .map(|profile| profile.name.clone())
-                        .unwrap_or_else(|| "Unknown".into());
-
-                    v_flex()
-                        .pb_1()
-                        .child(ProfileModalHeader::new(
-                            format!("{profile_name} — Configure MCP Tools"),
-                            Some(IconName::ToolHammer),
-                        ))
-                        .child(ListSeparator)
-                        .child(tool_picker.clone())
-                        .child(ListSeparator)
-                        .child(go_back_item)
-                        .into_any_element()
-                }
-            })
-    }
-}
diff --git a/crates/agent_ui/src/agent_configuration/manage_profiles_modal/profile_modal_header.rs b/crates/agent_ui/src/agent_configuration/manage_profiles_modal/profile_modal_header.rs
deleted file mode 100644
index 4eca9d721c..0000000000
--- a/crates/agent_ui/src/agent_configuration/manage_profiles_modal/profile_modal_header.rs
+++ /dev/null
@@ -1,42 +0,0 @@
-use ui::prelude::*;
-
-#[derive(IntoElement)]
-pub struct ProfileModalHeader {
-    label: SharedString,
-    icon: Option<IconName>,
-}
-
-impl ProfileModalHeader {
-    pub fn new(label: impl Into<SharedString>, icon: Option<IconName>) -> Self {
-        Self {
-            label: label.into(),
-            icon,
-        }
-    }
-}
-
-impl RenderOnce for ProfileModalHeader {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let mut container = h_flex()
-            .w_full()
-            .px(DynamicSpacing::Base12.rems(cx))
-            .pt(DynamicSpacing::Base08.rems(cx))
-            .pb(DynamicSpacing::Base04.rems(cx))
-            .rounded_t_sm()
-            .gap_1p5();
-
-        if let Some(icon) = self.icon {
-            container = container.child(Icon::new(icon).size(IconSize::XSmall).color(Color::Muted));
-        }
-
-        container.child(
-            h_flex().gap_1().overflow_x_hidden().child(
-                div()
-                    .max_w_96()
-                    .overflow_x_hidden()
-                    .text_ellipsis()
-                    .child(Headline::new(self.label).size(HeadlineSize::XSmall)),
-            ),
-        )
-    }
-}
diff --git a/crates/agent_ui/src/agent_configuration/tool_picker.rs b/crates/agent_ui/src/agent_configuration/tool_picker.rs
deleted file mode 100644
index 1c99f665ab..0000000000
--- a/crates/agent_ui/src/agent_configuration/tool_picker.rs
+++ /dev/null
@@ -1,394 +0,0 @@
-use std::{collections::BTreeMap, sync::Arc};
-
-use agent::ContextServerRegistry;
-use agent_settings::{AgentProfileId, AgentProfileSettings};
-use fs::Fs;
-use gpui::{App, Context, DismissEvent, Entity, EventEmitter, Focusable, Task, WeakEntity, Window};
-use picker::{Picker, PickerDelegate};
-use settings::{AgentProfileContent, ContextServerPresetContent, update_settings_file};
-use ui::{ListItem, ListItemSpacing, prelude::*};
-use util::ResultExt as _;
-
-pub struct ToolPicker {
-    picker: Entity<Picker<ToolPickerDelegate>>,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq)]
-enum ToolPickerMode {
-    BuiltinTools,
-    McpTools,
-}
-
-impl ToolPicker {
-    pub fn builtin_tools(
-        delegate: ToolPickerDelegate,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx).modal(false));
-        Self { picker }
-    }
-
-    pub fn mcp_tools(
-        delegate: ToolPickerDelegate,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let picker = cx.new(|cx| Picker::list(delegate, window, cx).modal(false));
-        Self { picker }
-    }
-}
-
-impl EventEmitter<DismissEvent> for ToolPicker {}
-
-impl Focusable for ToolPicker {
-    fn focus_handle(&self, cx: &App) -> gpui::FocusHandle {
-        self.picker.focus_handle(cx)
-    }
-}
-
-impl Render for ToolPicker {
-    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex().w(rems(34.)).child(self.picker.clone())
-    }
-}
-
-#[derive(Debug, Clone)]
-pub enum PickerItem {
-    Tool {
-        server_id: Option<Arc<str>>,
-        name: Arc<str>,
-    },
-    ContextServer {
-        server_id: Arc<str>,
-    },
-}
-
-pub struct ToolPickerDelegate {
-    tool_picker: WeakEntity<ToolPicker>,
-    fs: Arc<dyn Fs>,
-    items: Arc<Vec<PickerItem>>,
-    profile_id: AgentProfileId,
-    profile_settings: AgentProfileSettings,
-    filtered_items: Vec<PickerItem>,
-    selected_index: usize,
-    mode: ToolPickerMode,
-}
-
-impl ToolPickerDelegate {
-    pub fn builtin_tools(
-        tool_names: Vec<Arc<str>>,
-        fs: Arc<dyn Fs>,
-        profile_id: AgentProfileId,
-        profile_settings: AgentProfileSettings,
-        cx: &mut Context<ToolPicker>,
-    ) -> Self {
-        Self::new(
-            Arc::new(
-                tool_names
-                    .into_iter()
-                    .map(|name| PickerItem::Tool {
-                        name,
-                        server_id: None,
-                    })
-                    .collect(),
-            ),
-            ToolPickerMode::BuiltinTools,
-            fs,
-            profile_id,
-            profile_settings,
-            cx,
-        )
-    }
-
-    pub fn mcp_tools(
-        registry: &Entity<ContextServerRegistry>,
-        fs: Arc<dyn Fs>,
-        profile_id: AgentProfileId,
-        profile_settings: AgentProfileSettings,
-        cx: &mut Context<ToolPicker>,
-    ) -> Self {
-        let mut items = Vec::new();
-
-        for (id, tools) in registry.read(cx).servers() {
-            let server_id = id.clone().0;
-            items.push(PickerItem::ContextServer {
-                server_id: server_id.clone(),
-            });
-            items.extend(tools.keys().map(|tool_name| PickerItem::Tool {
-                name: tool_name.clone().into(),
-                server_id: Some(server_id.clone()),
-            }));
-        }
-
-        Self::new(
-            Arc::new(items),
-            ToolPickerMode::McpTools,
-            fs,
-            profile_id,
-            profile_settings,
-            cx,
-        )
-    }
-
-    fn new(
-        items: Arc<Vec<PickerItem>>,
-        mode: ToolPickerMode,
-        fs: Arc<dyn Fs>,
-        profile_id: AgentProfileId,
-        profile_settings: AgentProfileSettings,
-        cx: &mut Context<ToolPicker>,
-    ) -> Self {
-        Self {
-            tool_picker: cx.entity().downgrade(),
-            mode,
-            fs,
-            items,
-            profile_id,
-            profile_settings,
-            filtered_items: Vec::new(),
-            selected_index: 0,
-        }
-    }
-}
-
-impl PickerDelegate for ToolPickerDelegate {
-    type ListItem = AnyElement;
-
-    fn match_count(&self) -> usize {
-        self.filtered_items.len()
-    }
-
-    fn selected_index(&self) -> usize {
-        self.selected_index
-    }
-
-    fn set_selected_index(
-        &mut self,
-        ix: usize,
-        _window: &mut Window,
-        _cx: &mut Context<Picker<Self>>,
-    ) {
-        self.selected_index = ix;
-    }
-
-    fn can_select(
-        &mut self,
-        ix: usize,
-        _window: &mut Window,
-        _cx: &mut Context<Picker<Self>>,
-    ) -> bool {
-        let item = &self.filtered_items[ix];
-        match item {
-            PickerItem::Tool { .. } => true,
-            PickerItem::ContextServer { .. } => false,
-        }
-    }
-
-    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
-        match self.mode {
-            ToolPickerMode::BuiltinTools => "Search built-in tools…",
-            ToolPickerMode::McpTools => "Search MCP tools…",
-        }
-        .into()
-    }
-
-    fn update_matches(
-        &mut self,
-        query: String,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Task<()> {
-        let all_items = self.items.clone();
-
-        cx.spawn_in(window, async move |this, cx| {
-            let filtered_items = cx
-                .background_spawn(async move {
-                    let mut tools_by_provider: BTreeMap<Option<Arc<str>>, Vec<Arc<str>>> =
-                        BTreeMap::default();
-
-                    for item in all_items.iter() {
-                        if let PickerItem::Tool { server_id, name } = item.clone()
-                            && name.contains(&query)
-                        {
-                            tools_by_provider.entry(server_id).or_default().push(name);
-                        }
-                    }
-
-                    let mut items = Vec::new();
-
-                    for (server_id, names) in tools_by_provider {
-                        if let Some(server_id) = server_id.clone() {
-                            items.push(PickerItem::ContextServer { server_id });
-                        }
-                        for name in names {
-                            items.push(PickerItem::Tool {
-                                server_id: server_id.clone(),
-                                name,
-                            });
-                        }
-                    }
-
-                    items
-                })
-                .await;
-
-            this.update(cx, |this, _cx| {
-                this.delegate.filtered_items = filtered_items;
-                this.delegate.selected_index = this
-                    .delegate
-                    .selected_index
-                    .min(this.delegate.filtered_items.len().saturating_sub(1));
-            })
-            .log_err();
-        })
-    }
-
-    fn confirm(&mut self, _secondary: bool, window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        if self.filtered_items.is_empty() {
-            self.dismissed(window, cx);
-            return;
-        }
-
-        let item = &self.filtered_items[self.selected_index];
-
-        let PickerItem::Tool {
-            name: tool_name,
-            server_id,
-        } = item
-        else {
-            return;
-        };
-
-        let is_currently_enabled = if let Some(server_id) = server_id.clone() {
-            let preset = self
-                .profile_settings
-                .context_servers
-                .entry(server_id)
-                .or_default();
-            let is_enabled = *preset.tools.entry(tool_name.clone()).or_default();
-            *preset.tools.entry(tool_name.clone()).or_default() = !is_enabled;
-            is_enabled
-        } else {
-            let is_enabled = *self
-                .profile_settings
-                .tools
-                .entry(tool_name.clone())
-                .or_default();
-            *self
-                .profile_settings
-                .tools
-                .entry(tool_name.clone())
-                .or_default() = !is_enabled;
-            is_enabled
-        };
-
-        update_settings_file(self.fs.clone(), cx, {
-            let profile_id = self.profile_id.clone();
-            let default_profile = self.profile_settings.clone();
-            let server_id = server_id.clone();
-            let tool_name = tool_name.clone();
-            move |settings, _cx| {
-                let profiles = settings
-                    .agent
-                    .get_or_insert_default()
-                    .profiles
-                    .get_or_insert_default();
-                let profile = profiles
-                    .entry(profile_id.0)
-                    .or_insert_with(|| AgentProfileContent {
-                        name: default_profile.name.into(),
-                        tools: default_profile.tools,
-                        enable_all_context_servers: Some(
-                            default_profile.enable_all_context_servers,
-                        ),
-                        context_servers: default_profile
-                            .context_servers
-                            .into_iter()
-                            .map(|(server_id, preset)| {
-                                (
-                                    server_id,
-                                    ContextServerPresetContent {
-                                        tools: preset.tools,
-                                    },
-                                )
-                            })
-                            .collect(),
-                        default_model: default_profile.default_model.clone(),
-                    });
-
-                if let Some(server_id) = server_id {
-                    let preset = profile.context_servers.entry(server_id).or_default();
-                    *preset.tools.entry(tool_name).or_default() = !is_currently_enabled;
-                } else {
-                    *profile.tools.entry(tool_name).or_default() = !is_currently_enabled;
-                }
-            }
-        });
-    }
-
-    fn dismissed(&mut self, _window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        self.tool_picker
-            .update(cx, |_this, cx| cx.emit(DismissEvent))
-            .log_err();
-    }
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        _window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<Self::ListItem> {
-        let item = &self.filtered_items.get(ix)?;
-        match item {
-            PickerItem::ContextServer { server_id, .. } => Some(
-                div()
-                    .px_2()
-                    .pb_1()
-                    .when(ix > 1, |this| {
-                        this.mt_1()
-                            .pt_2()
-                            .border_t_1()
-                            .border_color(cx.theme().colors().border_variant)
-                    })
-                    .child(
-                        Label::new(server_id)
-                            .size(LabelSize::XSmall)
-                            .color(Color::Muted),
-                    )
-                    .into_any_element(),
-            ),
-            PickerItem::Tool { name, server_id } => {
-                let is_enabled = if let Some(server_id) = server_id {
-                    self.profile_settings
-                        .context_servers
-                        .get(server_id.as_ref())
-                        .and_then(|preset| preset.tools.get(name))
-                        .copied()
-                        .unwrap_or(self.profile_settings.enable_all_context_servers)
-                } else {
-                    self.profile_settings
-                        .tools
-                        .get(name)
-                        .copied()
-                        .unwrap_or(false)
-                };
-
-                Some(
-                    ListItem::new(ix)
-                        .inset(true)
-                        .spacing(ListItemSpacing::Sparse)
-                        .toggle_state(selected)
-                        .child(Label::new(name.clone()))
-                        .end_slot::<Icon>(is_enabled.then(|| {
-                            Icon::new(IconName::Check)
-                                .size(IconSize::Small)
-                                .color(Color::Success)
-                        }))
-                        .into_any_element(),
-                )
-            }
-        }
-    }
-}
diff --git a/crates/agent_ui/src/agent_diff.rs b/crates/agent_ui/src/agent_diff.rs
deleted file mode 100644
index 11acd649ef..0000000000
--- a/crates/agent_ui/src/agent_diff.rs
+++ /dev/null
@@ -1,2191 +0,0 @@
-use crate::{Keep, KeepAll, OpenAgentDiff, Reject, RejectAll};
-use acp_thread::{AcpThread, AcpThreadEvent};
-use action_log::ActionLogTelemetry;
-use agent_settings::AgentSettings;
-use anyhow::Result;
-use buffer_diff::DiffHunkStatus;
-use collections::{HashMap, HashSet};
-use editor::{
-    Direction, Editor, EditorEvent, EditorSettings, MultiBuffer, MultiBufferSnapshot,
-    SelectionEffects, ToPoint,
-    actions::{GoToHunk, GoToPreviousHunk},
-    multibuffer_context_lines,
-    scroll::Autoscroll,
-};
-use gpui::{
-    Action, AnyElement, App, AppContext, Empty, Entity, EventEmitter, FocusHandle, Focusable,
-    Global, SharedString, Subscription, Task, WeakEntity, Window, prelude::*,
-};
-
-use language::{Buffer, Capability, DiskState, OffsetRangeExt, Point};
-use multi_buffer::PathKey;
-use project::{Project, ProjectItem, ProjectPath};
-use settings::{Settings, SettingsStore};
-use std::{
-    any::{Any, TypeId},
-    collections::hash_map::Entry,
-    ops::Range,
-    sync::Arc,
-};
-use ui::{CommonAnimationExt, IconButtonShape, KeyBinding, Tooltip, prelude::*, vertical_divider};
-use util::ResultExt;
-use workspace::{
-    Item, ItemHandle, ItemNavHistory, ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView,
-    Workspace,
-    item::{BreadcrumbText, ItemEvent, SaveOptions, TabContentParams},
-    searchable::SearchableItemHandle,
-};
-use zed_actions::assistant::ToggleFocus;
-
-pub struct AgentDiffPane {
-    multibuffer: Entity<MultiBuffer>,
-    editor: Entity<Editor>,
-    thread: Entity<AcpThread>,
-    focus_handle: FocusHandle,
-    workspace: WeakEntity<Workspace>,
-    title: SharedString,
-    _subscriptions: Vec<Subscription>,
-}
-
-impl AgentDiffPane {
-    pub fn deploy(
-        thread: Entity<AcpThread>,
-        workspace: WeakEntity<Workspace>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Result<Entity<Self>> {
-        workspace.update(cx, |workspace, cx| {
-            Self::deploy_in_workspace(thread, workspace, window, cx)
-        })
-    }
-
-    pub fn deploy_in_workspace(
-        thread: Entity<AcpThread>,
-        workspace: &mut Workspace,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) -> Entity<Self> {
-        let existing_diff = workspace
-            .items_of_type::<AgentDiffPane>(cx)
-            .find(|diff| diff.read(cx).thread == thread);
-
-        if let Some(existing_diff) = existing_diff {
-            workspace.activate_item(&existing_diff, true, true, window, cx);
-            existing_diff
-        } else {
-            let agent_diff = cx
-                .new(|cx| AgentDiffPane::new(thread.clone(), workspace.weak_handle(), window, cx));
-            workspace.add_item_to_center(Box::new(agent_diff.clone()), window, cx);
-            agent_diff
-        }
-    }
-
-    pub fn new(
-        thread: Entity<AcpThread>,
-        workspace: WeakEntity<Workspace>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let focus_handle = cx.focus_handle();
-        let multibuffer = cx.new(|_| MultiBuffer::new(Capability::ReadWrite));
-
-        let project = thread.read(cx).project().clone();
-        let editor = cx.new(|cx| {
-            let mut editor =
-                Editor::for_multibuffer(multibuffer.clone(), Some(project.clone()), window, cx);
-            editor.disable_inline_diagnostics();
-            editor.set_expand_all_diff_hunks(cx);
-            editor.set_render_diff_hunk_controls(diff_hunk_controls(&thread), cx);
-            editor.register_addon(AgentDiffAddon);
-            editor
-        });
-
-        let action_log = thread.read(cx).action_log().clone();
-
-        let mut this = Self {
-            _subscriptions: vec![
-                cx.observe_in(&action_log, window, |this, _action_log, window, cx| {
-                    this.update_excerpts(window, cx)
-                }),
-                cx.subscribe(&thread, |this, _thread, event, cx| {
-                    this.handle_acp_thread_event(event, cx)
-                }),
-            ],
-            title: SharedString::default(),
-            multibuffer,
-            editor,
-            thread,
-            focus_handle,
-            workspace,
-        };
-        this.update_excerpts(window, cx);
-        this.update_title(cx);
-        this
-    }
-
-    fn update_excerpts(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let changed_buffers = self
-            .thread
-            .read(cx)
-            .action_log()
-            .read(cx)
-            .changed_buffers(cx);
-        let mut paths_to_delete = self.multibuffer.read(cx).paths().collect::<HashSet<_>>();
-
-        for (buffer, diff_handle) in changed_buffers {
-            if buffer.read(cx).file().is_none() {
-                continue;
-            }
-
-            let path_key = PathKey::for_buffer(&buffer, cx);
-            paths_to_delete.remove(&path_key);
-
-            let snapshot = buffer.read(cx).snapshot();
-            let diff = diff_handle.read(cx);
-
-            let diff_hunk_ranges = diff
-                .hunks_intersecting_range(
-                    language::Anchor::min_max_range_for_buffer(snapshot.remote_id()),
-                    &snapshot,
-                    cx,
-                )
-                .map(|diff_hunk| diff_hunk.buffer_range.to_point(&snapshot))
-                .collect::<Vec<_>>();
-
-            let (was_empty, is_excerpt_newly_added) =
-                self.multibuffer.update(cx, |multibuffer, cx| {
-                    let was_empty = multibuffer.is_empty();
-                    let (_, is_excerpt_newly_added) = multibuffer.set_excerpts_for_path(
-                        path_key.clone(),
-                        buffer.clone(),
-                        diff_hunk_ranges,
-                        multibuffer_context_lines(cx),
-                        cx,
-                    );
-                    multibuffer.add_diff(diff_handle, cx);
-                    (was_empty, is_excerpt_newly_added)
-                });
-
-            self.editor.update(cx, |editor, cx| {
-                if was_empty {
-                    let first_hunk = editor
-                        .diff_hunks_in_ranges(
-                            &[editor::Anchor::min()..editor::Anchor::max()],
-                            &self.multibuffer.read(cx).read(cx),
-                        )
-                        .next();
-
-                    if let Some(first_hunk) = first_hunk {
-                        let first_hunk_start = first_hunk.multi_buffer_range().start;
-                        editor.change_selections(Default::default(), window, cx, |selections| {
-                            selections.select_anchor_ranges([first_hunk_start..first_hunk_start]);
-                        })
-                    }
-                }
-
-                if is_excerpt_newly_added
-                    && buffer
-                        .read(cx)
-                        .file()
-                        .is_some_and(|file| file.disk_state() == DiskState::Deleted)
-                {
-                    editor.fold_buffer(snapshot.text.remote_id(), cx)
-                }
-            });
-        }
-
-        self.multibuffer.update(cx, |multibuffer, cx| {
-            for path in paths_to_delete {
-                multibuffer.remove_excerpts_for_path(path, cx);
-            }
-        });
-
-        if self.multibuffer.read(cx).is_empty()
-            && self
-                .editor
-                .read(cx)
-                .focus_handle(cx)
-                .contains_focused(window, cx)
-        {
-            self.focus_handle.focus(window);
-        } else if self.focus_handle.is_focused(window) && !self.multibuffer.read(cx).is_empty() {
-            self.editor.update(cx, |editor, cx| {
-                editor.focus_handle(cx).focus(window);
-            });
-        }
-    }
-
-    fn update_title(&mut self, cx: &mut Context<Self>) {
-        let new_title = self.thread.read(cx).title();
-        if new_title != self.title {
-            self.title = new_title;
-            cx.emit(EditorEvent::TitleChanged);
-        }
-    }
-
-    fn handle_acp_thread_event(&mut self, event: &AcpThreadEvent, cx: &mut Context<Self>) {
-        if let AcpThreadEvent::TitleUpdated = event {
-            self.update_title(cx)
-        }
-    }
-
-    pub fn move_to_path(&self, path_key: PathKey, window: &mut Window, cx: &mut App) {
-        if let Some(position) = self.multibuffer.read(cx).location_for_path(&path_key, cx) {
-            self.editor.update(cx, |editor, cx| {
-                let first_hunk = editor
-                    .diff_hunks_in_ranges(
-                        &[position..editor::Anchor::max()],
-                        &self.multibuffer.read(cx).read(cx),
-                    )
-                    .next();
-
-                if let Some(first_hunk) = first_hunk {
-                    let first_hunk_start = first_hunk.multi_buffer_range().start;
-                    editor.change_selections(Default::default(), window, cx, |selections| {
-                        selections.select_anchor_ranges([first_hunk_start..first_hunk_start]);
-                    })
-                }
-            });
-        }
-    }
-
-    fn keep(&mut self, _: &Keep, window: &mut Window, cx: &mut Context<Self>) {
-        self.editor.update(cx, |editor, cx| {
-            let snapshot = editor.buffer().read(cx).snapshot(cx);
-            keep_edits_in_selection(editor, &snapshot, &self.thread, window, cx);
-        });
-    }
-
-    fn reject(&mut self, _: &Reject, window: &mut Window, cx: &mut Context<Self>) {
-        self.editor.update(cx, |editor, cx| {
-            let snapshot = editor.buffer().read(cx).snapshot(cx);
-            reject_edits_in_selection(editor, &snapshot, &self.thread, window, cx);
-        });
-    }
-
-    fn reject_all(&mut self, _: &RejectAll, window: &mut Window, cx: &mut Context<Self>) {
-        self.editor.update(cx, |editor, cx| {
-            let snapshot = editor.buffer().read(cx).snapshot(cx);
-            reject_edits_in_ranges(
-                editor,
-                &snapshot,
-                &self.thread,
-                vec![editor::Anchor::min()..editor::Anchor::max()],
-                window,
-                cx,
-            );
-        });
-    }
-
-    fn keep_all(&mut self, _: &KeepAll, _window: &mut Window, cx: &mut Context<Self>) {
-        let telemetry = ActionLogTelemetry::from(self.thread.read(cx));
-        let action_log = self.thread.read(cx).action_log().clone();
-        action_log.update(cx, |action_log, cx| {
-            action_log.keep_all_edits(Some(telemetry), cx)
-        });
-    }
-}
-
-fn keep_edits_in_selection(
-    editor: &mut Editor,
-    buffer_snapshot: &MultiBufferSnapshot,
-    thread: &Entity<AcpThread>,
-    window: &mut Window,
-    cx: &mut Context<Editor>,
-) {
-    let ranges = editor
-        .selections
-        .disjoint_anchor_ranges()
-        .collect::<Vec<_>>();
-
-    keep_edits_in_ranges(editor, buffer_snapshot, thread, ranges, window, cx)
-}
-
-fn reject_edits_in_selection(
-    editor: &mut Editor,
-    buffer_snapshot: &MultiBufferSnapshot,
-    thread: &Entity<AcpThread>,
-    window: &mut Window,
-    cx: &mut Context<Editor>,
-) {
-    let ranges = editor
-        .selections
-        .disjoint_anchor_ranges()
-        .collect::<Vec<_>>();
-    reject_edits_in_ranges(editor, buffer_snapshot, thread, ranges, window, cx)
-}
-
-fn keep_edits_in_ranges(
-    editor: &mut Editor,
-    buffer_snapshot: &MultiBufferSnapshot,
-    thread: &Entity<AcpThread>,
-    ranges: Vec<Range<editor::Anchor>>,
-    window: &mut Window,
-    cx: &mut Context<Editor>,
-) {
-    let diff_hunks_in_ranges = editor
-        .diff_hunks_in_ranges(&ranges, buffer_snapshot)
-        .collect::<Vec<_>>();
-
-    update_editor_selection(editor, buffer_snapshot, &diff_hunks_in_ranges, window, cx);
-
-    let multibuffer = editor.buffer().clone();
-    for hunk in &diff_hunks_in_ranges {
-        let buffer = multibuffer.read(cx).buffer(hunk.buffer_id);
-        if let Some(buffer) = buffer {
-            let action_log = thread.read(cx).action_log().clone();
-            let telemetry = ActionLogTelemetry::from(thread.read(cx));
-            action_log.update(cx, |action_log, cx| {
-                action_log.keep_edits_in_range(
-                    buffer,
-                    hunk.buffer_range.clone(),
-                    Some(telemetry),
-                    cx,
-                )
-            });
-        }
-    }
-}
-
-fn reject_edits_in_ranges(
-    editor: &mut Editor,
-    buffer_snapshot: &MultiBufferSnapshot,
-    thread: &Entity<AcpThread>,
-    ranges: Vec<Range<editor::Anchor>>,
-    window: &mut Window,
-    cx: &mut Context<Editor>,
-) {
-    let diff_hunks_in_ranges = editor
-        .diff_hunks_in_ranges(&ranges, buffer_snapshot)
-        .collect::<Vec<_>>();
-
-    update_editor_selection(editor, buffer_snapshot, &diff_hunks_in_ranges, window, cx);
-
-    let multibuffer = editor.buffer().clone();
-
-    let mut ranges_by_buffer = HashMap::default();
-    for hunk in &diff_hunks_in_ranges {
-        let buffer = multibuffer.read(cx).buffer(hunk.buffer_id);
-        if let Some(buffer) = buffer {
-            ranges_by_buffer
-                .entry(buffer.clone())
-                .or_insert_with(Vec::new)
-                .push(hunk.buffer_range.clone());
-        }
-    }
-
-    let action_log = thread.read(cx).action_log().clone();
-    let telemetry = ActionLogTelemetry::from(thread.read(cx));
-    for (buffer, ranges) in ranges_by_buffer {
-        action_log
-            .update(cx, |action_log, cx| {
-                action_log.reject_edits_in_ranges(buffer, ranges, Some(telemetry.clone()), cx)
-            })
-            .detach_and_log_err(cx);
-    }
-}
-
-fn update_editor_selection(
-    editor: &mut Editor,
-    buffer_snapshot: &MultiBufferSnapshot,
-    diff_hunks: &[multi_buffer::MultiBufferDiffHunk],
-    window: &mut Window,
-    cx: &mut Context<Editor>,
-) {
-    let newest_cursor = editor
-        .selections
-        .newest::<Point>(&editor.display_snapshot(cx))
-        .head();
-
-    if !diff_hunks.iter().any(|hunk| {
-        hunk.row_range
-            .contains(&multi_buffer::MultiBufferRow(newest_cursor.row))
-    }) {
-        return;
-    }
-
-    let target_hunk = {
-        diff_hunks
-            .last()
-            .and_then(|last_kept_hunk| {
-                let last_kept_hunk_end = last_kept_hunk.multi_buffer_range().end;
-                editor
-                    .diff_hunks_in_ranges(
-                        &[last_kept_hunk_end..editor::Anchor::max()],
-                        buffer_snapshot,
-                    )
-                    .nth(1)
-            })
-            .or_else(|| {
-                let first_kept_hunk = diff_hunks.first()?;
-                let first_kept_hunk_start = first_kept_hunk.multi_buffer_range().start;
-                editor
-                    .diff_hunks_in_ranges(
-                        &[editor::Anchor::min()..first_kept_hunk_start],
-                        buffer_snapshot,
-                    )
-                    .next()
-            })
-    };
-
-    if let Some(target_hunk) = target_hunk {
-        editor.change_selections(Default::default(), window, cx, |selections| {
-            let next_hunk_start = target_hunk.multi_buffer_range().start;
-            selections.select_anchor_ranges([next_hunk_start..next_hunk_start]);
-        })
-    }
-}
-
-impl EventEmitter<EditorEvent> for AgentDiffPane {}
-
-impl Focusable for AgentDiffPane {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        if self.multibuffer.read(cx).is_empty() {
-            self.focus_handle.clone()
-        } else {
-            self.editor.focus_handle(cx)
-        }
-    }
-}
-
-impl Item for AgentDiffPane {
-    type Event = EditorEvent;
-
-    fn tab_icon(&self, _window: &Window, _cx: &App) -> Option<Icon> {
-        Some(Icon::new(IconName::ZedAssistant).color(Color::Muted))
-    }
-
-    fn to_item_events(event: &EditorEvent, f: impl FnMut(ItemEvent)) {
-        Editor::to_item_events(event, f)
-    }
-
-    fn deactivated(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.editor
-            .update(cx, |editor, cx| editor.deactivated(window, cx));
-    }
-
-    fn navigate(
-        &mut self,
-        data: Box<dyn Any>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> bool {
-        self.editor
-            .update(cx, |editor, cx| editor.navigate(data, window, cx))
-    }
-
-    fn tab_tooltip_text(&self, _: &App) -> Option<SharedString> {
-        Some("Agent Diff".into())
-    }
-
-    fn tab_content(&self, params: TabContentParams, _window: &Window, cx: &App) -> AnyElement {
-        let title = self.thread.read(cx).title();
-        Label::new(format!("Review: {}", title))
-            .color(if params.selected {
-                Color::Default
-            } else {
-                Color::Muted
-            })
-            .into_any_element()
-    }
-
-    fn telemetry_event_text(&self) -> Option<&'static str> {
-        Some("Assistant Diff Opened")
-    }
-
-    fn as_searchable(&self, _: &Entity<Self>, _: &App) -> Option<Box<dyn SearchableItemHandle>> {
-        Some(Box::new(self.editor.clone()))
-    }
-
-    fn for_each_project_item(
-        &self,
-        cx: &App,
-        f: &mut dyn FnMut(gpui::EntityId, &dyn project::ProjectItem),
-    ) {
-        self.editor.for_each_project_item(cx, f)
-    }
-
-    fn set_nav_history(
-        &mut self,
-        nav_history: ItemNavHistory,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.editor.update(cx, |editor, _| {
-            editor.set_nav_history(Some(nav_history));
-        });
-    }
-
-    fn can_split(&self) -> bool {
-        true
-    }
-
-    fn clone_on_split(
-        &self,
-        _workspace_id: Option<workspace::WorkspaceId>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Option<Entity<Self>>>
-    where
-        Self: Sized,
-    {
-        Task::ready(Some(cx.new(|cx| {
-            Self::new(self.thread.clone(), self.workspace.clone(), window, cx)
-        })))
-    }
-
-    fn is_dirty(&self, cx: &App) -> bool {
-        self.multibuffer.read(cx).is_dirty(cx)
-    }
-
-    fn has_conflict(&self, cx: &App) -> bool {
-        self.multibuffer.read(cx).has_conflict(cx)
-    }
-
-    fn can_save(&self, _: &App) -> bool {
-        true
-    }
-
-    fn save(
-        &mut self,
-        options: SaveOptions,
-        project: Entity<Project>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        self.editor.save(options, project, window, cx)
-    }
-
-    fn save_as(
-        &mut self,
-        _: Entity<Project>,
-        _: ProjectPath,
-        _window: &mut Window,
-        _: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        unreachable!()
-    }
-
-    fn reload(
-        &mut self,
-        project: Entity<Project>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        self.editor.reload(project, window, cx)
-    }
-
-    fn act_as_type<'a>(
-        &'a self,
-        type_id: TypeId,
-        self_handle: &'a Entity<Self>,
-        _: &'a App,
-    ) -> Option<gpui::AnyEntity> {
-        if type_id == TypeId::of::<Self>() {
-            Some(self_handle.clone().into())
-        } else if type_id == TypeId::of::<Editor>() {
-            Some(self.editor.clone().into())
-        } else {
-            None
-        }
-    }
-
-    fn breadcrumb_location(&self, _: &App) -> ToolbarItemLocation {
-        ToolbarItemLocation::PrimaryLeft
-    }
-
-    fn breadcrumbs(&self, theme: &theme::Theme, cx: &App) -> Option<Vec<BreadcrumbText>> {
-        self.editor.breadcrumbs(theme, cx)
-    }
-
-    fn added_to_workspace(
-        &mut self,
-        workspace: &mut Workspace,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.editor.update(cx, |editor, cx| {
-            editor.added_to_workspace(workspace, window, cx)
-        });
-    }
-
-    fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString {
-        "Agent Diff".into()
-    }
-}
-
-impl Render for AgentDiffPane {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let is_empty = self.multibuffer.read(cx).is_empty();
-        let focus_handle = &self.focus_handle;
-
-        div()
-            .track_focus(focus_handle)
-            .key_context(if is_empty { "EmptyPane" } else { "AgentDiff" })
-            .on_action(cx.listener(Self::keep))
-            .on_action(cx.listener(Self::reject))
-            .on_action(cx.listener(Self::reject_all))
-            .on_action(cx.listener(Self::keep_all))
-            .bg(cx.theme().colors().editor_background)
-            .flex()
-            .items_center()
-            .justify_center()
-            .size_full()
-            .when(is_empty, |el| {
-                el.child(
-                    v_flex()
-                        .items_center()
-                        .gap_2()
-                        .child("No changes to review")
-                        .child(
-                            Button::new("continue-iterating", "Continue Iterating")
-                                .style(ButtonStyle::Filled)
-                                .icon(IconName::ForwardArrow)
-                                .icon_position(IconPosition::Start)
-                                .icon_size(IconSize::Small)
-                                .icon_color(Color::Muted)
-                                .full_width()
-                                .key_binding(KeyBinding::for_action_in(
-                                    &ToggleFocus,
-                                    &focus_handle.clone(),
-                                    cx,
-                                ))
-                                .on_click(|_event, window, cx| {
-                                    window.dispatch_action(ToggleFocus.boxed_clone(), cx)
-                                }),
-                        ),
-                )
-            })
-            .when(!is_empty, |el| el.child(self.editor.clone()))
-    }
-}
-
-fn diff_hunk_controls(thread: &Entity<AcpThread>) -> editor::RenderDiffHunkControlsFn {
-    let thread = thread.clone();
-
-    Arc::new(
-        move |row, status, hunk_range, is_created_file, line_height, editor, _, cx| {
-            {
-                render_diff_hunk_controls(
-                    row,
-                    status,
-                    hunk_range,
-                    is_created_file,
-                    line_height,
-                    &thread,
-                    editor,
-                    cx,
-                )
-            }
-        },
-    )
-}
-
-fn render_diff_hunk_controls(
-    row: u32,
-    _status: &DiffHunkStatus,
-    hunk_range: Range<editor::Anchor>,
-    is_created_file: bool,
-    line_height: Pixels,
-    thread: &Entity<AcpThread>,
-    editor: &Entity<Editor>,
-    cx: &mut App,
-) -> AnyElement {
-    let editor = editor.clone();
-
-    h_flex()
-        .h(line_height)
-        .mr_0p5()
-        .gap_1()
-        .px_0p5()
-        .pb_1()
-        .border_x_1()
-        .border_b_1()
-        .border_color(cx.theme().colors().border)
-        .rounded_b_md()
-        .bg(cx.theme().colors().editor_background)
-        .gap_1()
-        .block_mouse_except_scroll()
-        .shadow_md()
-        .children(vec![
-            Button::new(("reject", row as u64), "Reject")
-                .disabled(is_created_file)
-                .key_binding(
-                    KeyBinding::for_action_in(&Reject, &editor.read(cx).focus_handle(cx), cx)
-                        .map(|kb| kb.size(rems_from_px(12.))),
-                )
-                .on_click({
-                    let editor = editor.clone();
-                    let thread = thread.clone();
-                    move |_event, window, cx| {
-                        editor.update(cx, |editor, cx| {
-                            let snapshot = editor.buffer().read(cx).snapshot(cx);
-                            reject_edits_in_ranges(
-                                editor,
-                                &snapshot,
-                                &thread,
-                                vec![hunk_range.start..hunk_range.start],
-                                window,
-                                cx,
-                            );
-                        })
-                    }
-                }),
-            Button::new(("keep", row as u64), "Keep")
-                .key_binding(
-                    KeyBinding::for_action_in(&Keep, &editor.read(cx).focus_handle(cx), cx)
-                        .map(|kb| kb.size(rems_from_px(12.))),
-                )
-                .on_click({
-                    let editor = editor.clone();
-                    let thread = thread.clone();
-                    move |_event, window, cx| {
-                        editor.update(cx, |editor, cx| {
-                            let snapshot = editor.buffer().read(cx).snapshot(cx);
-                            keep_edits_in_ranges(
-                                editor,
-                                &snapshot,
-                                &thread,
-                                vec![hunk_range.start..hunk_range.start],
-                                window,
-                                cx,
-                            );
-                        });
-                    }
-                }),
-        ])
-        .when(
-            !editor.read(cx).buffer().read(cx).all_diff_hunks_expanded(),
-            |el| {
-                el.child(
-                    IconButton::new(("next-hunk", row as u64), IconName::ArrowDown)
-                        .shape(IconButtonShape::Square)
-                        .icon_size(IconSize::Small)
-                        // .disabled(!has_multiple_hunks)
-                        .tooltip({
-                            let focus_handle = editor.focus_handle(cx);
-                            move |_window, cx| {
-                                Tooltip::for_action_in("Next Hunk", &GoToHunk, &focus_handle, cx)
-                            }
-                        })
-                        .on_click({
-                            let editor = editor.clone();
-                            move |_event, window, cx| {
-                                editor.update(cx, |editor, cx| {
-                                    let snapshot = editor.snapshot(window, cx);
-                                    let position =
-                                        hunk_range.end.to_point(&snapshot.buffer_snapshot());
-                                    editor.go_to_hunk_before_or_after_position(
-                                        &snapshot,
-                                        position,
-                                        Direction::Next,
-                                        window,
-                                        cx,
-                                    );
-                                    editor.expand_selected_diff_hunks(cx);
-                                });
-                            }
-                        }),
-                )
-                .child(
-                    IconButton::new(("prev-hunk", row as u64), IconName::ArrowUp)
-                        .shape(IconButtonShape::Square)
-                        .icon_size(IconSize::Small)
-                        // .disabled(!has_multiple_hunks)
-                        .tooltip({
-                            let focus_handle = editor.focus_handle(cx);
-                            move |_window, cx| {
-                                Tooltip::for_action_in(
-                                    "Previous Hunk",
-                                    &GoToPreviousHunk,
-                                    &focus_handle,
-                                    cx,
-                                )
-                            }
-                        })
-                        .on_click({
-                            let editor = editor.clone();
-                            move |_event, window, cx| {
-                                editor.update(cx, |editor, cx| {
-                                    let snapshot = editor.snapshot(window, cx);
-                                    let point =
-                                        hunk_range.start.to_point(&snapshot.buffer_snapshot());
-                                    editor.go_to_hunk_before_or_after_position(
-                                        &snapshot,
-                                        point,
-                                        Direction::Prev,
-                                        window,
-                                        cx,
-                                    );
-                                    editor.expand_selected_diff_hunks(cx);
-                                });
-                            }
-                        }),
-                )
-            },
-        )
-        .into_any_element()
-}
-
-struct AgentDiffAddon;
-
-impl editor::Addon for AgentDiffAddon {
-    fn to_any(&self) -> &dyn std::any::Any {
-        self
-    }
-
-    fn extend_key_context(&self, key_context: &mut gpui::KeyContext, _: &App) {
-        key_context.add("agent_diff");
-    }
-}
-
-pub struct AgentDiffToolbar {
-    active_item: Option<AgentDiffToolbarItem>,
-    _settings_subscription: Subscription,
-}
-
-pub enum AgentDiffToolbarItem {
-    Pane(WeakEntity<AgentDiffPane>),
-    Editor {
-        editor: WeakEntity<Editor>,
-        state: EditorState,
-        _diff_subscription: Subscription,
-    },
-}
-
-impl AgentDiffToolbar {
-    pub fn new(cx: &mut Context<Self>) -> Self {
-        Self {
-            active_item: None,
-            _settings_subscription: cx.observe_global::<SettingsStore>(Self::update_location),
-        }
-    }
-
-    fn dispatch_action(&self, action: &dyn Action, window: &mut Window, cx: &mut Context<Self>) {
-        let Some(active_item) = self.active_item.as_ref() else {
-            return;
-        };
-
-        match active_item {
-            AgentDiffToolbarItem::Pane(agent_diff) => {
-                if let Some(agent_diff) = agent_diff.upgrade() {
-                    agent_diff.focus_handle(cx).focus(window);
-                }
-            }
-            AgentDiffToolbarItem::Editor { editor, .. } => {
-                if let Some(editor) = editor.upgrade() {
-                    editor.read(cx).focus_handle(cx).focus(window);
-                }
-            }
-        }
-
-        let action = action.boxed_clone();
-        cx.defer(move |cx| {
-            cx.dispatch_action(action.as_ref());
-        })
-    }
-
-    fn handle_diff_notify(&mut self, agent_diff: Entity<AgentDiff>, cx: &mut Context<Self>) {
-        let Some(AgentDiffToolbarItem::Editor { editor, state, .. }) = self.active_item.as_mut()
-        else {
-            return;
-        };
-
-        *state = agent_diff.read(cx).editor_state(editor);
-        self.update_location(cx);
-        cx.notify();
-    }
-
-    fn update_location(&mut self, cx: &mut Context<Self>) {
-        let location = self.location(cx);
-        cx.emit(ToolbarItemEvent::ChangeLocation(location));
-    }
-
-    fn location(&self, cx: &App) -> ToolbarItemLocation {
-        if !EditorSettings::get_global(cx).toolbar.agent_review {
-            return ToolbarItemLocation::Hidden;
-        }
-
-        match &self.active_item {
-            None => ToolbarItemLocation::Hidden,
-            Some(AgentDiffToolbarItem::Pane(_)) => ToolbarItemLocation::PrimaryRight,
-            Some(AgentDiffToolbarItem::Editor { state, .. }) => match state {
-                EditorState::Reviewing => ToolbarItemLocation::PrimaryRight,
-                EditorState::Idle => ToolbarItemLocation::Hidden,
-            },
-        }
-    }
-}
-
-impl EventEmitter<ToolbarItemEvent> for AgentDiffToolbar {}
-
-impl ToolbarItemView for AgentDiffToolbar {
-    fn set_active_pane_item(
-        &mut self,
-        active_pane_item: Option<&dyn ItemHandle>,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> ToolbarItemLocation {
-        if let Some(item) = active_pane_item {
-            if let Some(pane) = item.act_as::<AgentDiffPane>(cx) {
-                self.active_item = Some(AgentDiffToolbarItem::Pane(pane.downgrade()));
-                return self.location(cx);
-            }
-
-            if let Some(editor) = item.act_as::<Editor>(cx)
-                && editor.read(cx).mode().is_full()
-            {
-                let agent_diff = AgentDiff::global(cx);
-
-                self.active_item = Some(AgentDiffToolbarItem::Editor {
-                    editor: editor.downgrade(),
-                    state: agent_diff.read(cx).editor_state(&editor.downgrade()),
-                    _diff_subscription: cx.observe(&agent_diff, Self::handle_diff_notify),
-                });
-
-                return self.location(cx);
-            }
-        }
-
-        self.active_item = None;
-        self.location(cx)
-    }
-
-    fn pane_focus_update(
-        &mut self,
-        _pane_focused: bool,
-        _window: &mut Window,
-        _cx: &mut Context<Self>,
-    ) {
-    }
-}
-
-impl Render for AgentDiffToolbar {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let spinner_icon = div()
-            .px_0p5()
-            .id("generating")
-            .tooltip(Tooltip::text("Generating Changes…"))
-            .child(
-                Icon::new(IconName::LoadCircle)
-                    .size(IconSize::Small)
-                    .color(Color::Accent)
-                    .with_rotate_animation(3),
-            )
-            .into_any();
-
-        let Some(active_item) = self.active_item.as_ref() else {
-            return Empty.into_any();
-        };
-
-        match active_item {
-            AgentDiffToolbarItem::Editor { editor, state, .. } => {
-                let Some(editor) = editor.upgrade() else {
-                    return Empty.into_any();
-                };
-
-                let editor_focus_handle = editor.read(cx).focus_handle(cx);
-
-                let content = match state {
-                    EditorState::Idle => return Empty.into_any(),
-                    EditorState::Reviewing => vec![
-                        h_flex()
-                            .child(
-                                IconButton::new("hunk-up", IconName::ArrowUp)
-                                    .icon_size(IconSize::Small)
-                                    .tooltip(Tooltip::for_action_title_in(
-                                        "Previous Hunk",
-                                        &GoToPreviousHunk,
-                                        &editor_focus_handle,
-                                    ))
-                                    .on_click({
-                                        let editor_focus_handle = editor_focus_handle.clone();
-                                        move |_, window, cx| {
-                                            editor_focus_handle.dispatch_action(
-                                                &GoToPreviousHunk,
-                                                window,
-                                                cx,
-                                            );
-                                        }
-                                    }),
-                            )
-                            .child(
-                                IconButton::new("hunk-down", IconName::ArrowDown)
-                                    .icon_size(IconSize::Small)
-                                    .tooltip(Tooltip::for_action_title_in(
-                                        "Next Hunk",
-                                        &GoToHunk,
-                                        &editor_focus_handle,
-                                    ))
-                                    .on_click({
-                                        let editor_focus_handle = editor_focus_handle.clone();
-                                        move |_, window, cx| {
-                                            editor_focus_handle
-                                                .dispatch_action(&GoToHunk, window, cx);
-                                        }
-                                    }),
-                            )
-                            .into_any_element(),
-                        vertical_divider().into_any_element(),
-                        h_flex()
-                            .gap_0p5()
-                            .child(
-                                Button::new("reject-all", "Reject All")
-                                    .key_binding({
-                                        KeyBinding::for_action_in(
-                                            &RejectAll,
-                                            &editor_focus_handle,
-                                            cx,
-                                        )
-                                        .map(|kb| kb.size(rems_from_px(12.)))
-                                    })
-                                    .on_click(cx.listener(|this, _, window, cx| {
-                                        this.dispatch_action(&RejectAll, window, cx)
-                                    })),
-                            )
-                            .child(
-                                Button::new("keep-all", "Keep All")
-                                    .key_binding({
-                                        KeyBinding::for_action_in(
-                                            &KeepAll,
-                                            &editor_focus_handle,
-                                            cx,
-                                        )
-                                        .map(|kb| kb.size(rems_from_px(12.)))
-                                    })
-                                    .on_click(cx.listener(|this, _, window, cx| {
-                                        this.dispatch_action(&KeepAll, window, cx)
-                                    })),
-                            )
-                            .into_any_element(),
-                    ],
-                };
-
-                h_flex()
-                    .track_focus(&editor_focus_handle)
-                    .size_full()
-                    .px_1()
-                    .mr_1()
-                    .gap_1()
-                    .children(content)
-                    .child(vertical_divider())
-                    .when_some(editor.read(cx).workspace(), |this, _workspace| {
-                        this.child(
-                            IconButton::new("review", IconName::ListTodo)
-                                .icon_size(IconSize::Small)
-                                .tooltip(Tooltip::for_action_title_in(
-                                    "Review All Files",
-                                    &OpenAgentDiff,
-                                    &editor_focus_handle,
-                                ))
-                                .on_click({
-                                    cx.listener(move |this, _, window, cx| {
-                                        this.dispatch_action(&OpenAgentDiff, window, cx);
-                                    })
-                                }),
-                        )
-                    })
-                    .child(vertical_divider())
-                    .on_action({
-                        let editor = editor.clone();
-                        move |_action: &OpenAgentDiff, window, cx| {
-                            AgentDiff::global(cx).update(cx, |agent_diff, cx| {
-                                agent_diff.deploy_pane_from_editor(&editor, window, cx);
-                            });
-                        }
-                    })
-                    .into_any()
-            }
-            AgentDiffToolbarItem::Pane(agent_diff) => {
-                let Some(agent_diff) = agent_diff.upgrade() else {
-                    return Empty.into_any();
-                };
-
-                let has_pending_edit_tool_use = agent_diff
-                    .read(cx)
-                    .thread
-                    .read(cx)
-                    .has_pending_edit_tool_calls();
-
-                if has_pending_edit_tool_use {
-                    return div().px_2().child(spinner_icon).into_any();
-                }
-
-                let is_empty = agent_diff.read(cx).multibuffer.read(cx).is_empty();
-                if is_empty {
-                    return Empty.into_any();
-                }
-
-                let focus_handle = agent_diff.focus_handle(cx);
-
-                h_group_xl()
-                    .my_neg_1()
-                    .py_1()
-                    .items_center()
-                    .flex_wrap()
-                    .child(
-                        h_group_sm()
-                            .child(
-                                Button::new("reject-all", "Reject All")
-                                    .key_binding({
-                                        KeyBinding::for_action_in(&RejectAll, &focus_handle, cx)
-                                            .map(|kb| kb.size(rems_from_px(12.)))
-                                    })
-                                    .on_click(cx.listener(|this, _, window, cx| {
-                                        this.dispatch_action(&RejectAll, window, cx)
-                                    })),
-                            )
-                            .child(
-                                Button::new("keep-all", "Keep All")
-                                    .key_binding({
-                                        KeyBinding::for_action_in(&KeepAll, &focus_handle, cx)
-                                            .map(|kb| kb.size(rems_from_px(12.)))
-                                    })
-                                    .on_click(cx.listener(|this, _, window, cx| {
-                                        this.dispatch_action(&KeepAll, window, cx)
-                                    })),
-                            ),
-                    )
-                    .into_any()
-            }
-        }
-    }
-}
-
-#[derive(Default)]
-pub struct AgentDiff {
-    reviewing_editors: HashMap<WeakEntity<Editor>, EditorState>,
-    workspace_threads: HashMap<WeakEntity<Workspace>, WorkspaceThread>,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum EditorState {
-    Idle,
-    Reviewing,
-}
-
-struct WorkspaceThread {
-    thread: WeakEntity<AcpThread>,
-    _thread_subscriptions: (Subscription, Subscription),
-    singleton_editors: HashMap<WeakEntity<Buffer>, HashMap<WeakEntity<Editor>, Subscription>>,
-    _settings_subscription: Subscription,
-    _workspace_subscription: Option<Subscription>,
-}
-
-struct AgentDiffGlobal(Entity<AgentDiff>);
-
-impl Global for AgentDiffGlobal {}
-
-impl AgentDiff {
-    fn global(cx: &mut App) -> Entity<Self> {
-        cx.try_global::<AgentDiffGlobal>()
-            .map(|global| global.0.clone())
-            .unwrap_or_else(|| {
-                let entity = cx.new(|_cx| Self::default());
-                let global = AgentDiffGlobal(entity.clone());
-                cx.set_global(global);
-                entity
-            })
-    }
-
-    pub fn set_active_thread(
-        workspace: &WeakEntity<Workspace>,
-        thread: Entity<AcpThread>,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        Self::global(cx).update(cx, |this, cx| {
-            this.register_active_thread_impl(workspace, thread, window, cx);
-        });
-    }
-
-    fn register_active_thread_impl(
-        &mut self,
-        workspace: &WeakEntity<Workspace>,
-        thread: Entity<AcpThread>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let action_log = thread.read(cx).action_log().clone();
-
-        let action_log_subscription = cx.observe_in(&action_log, window, {
-            let workspace = workspace.clone();
-            move |this, _action_log, window, cx| {
-                this.update_reviewing_editors(&workspace, window, cx);
-            }
-        });
-
-        let thread_subscription = cx.subscribe_in(&thread, window, {
-            let workspace = workspace.clone();
-            move |this, thread, event, window, cx| {
-                this.handle_acp_thread_event(&workspace, thread, event, window, cx)
-            }
-        });
-
-        if let Some(workspace_thread) = self.workspace_threads.get_mut(workspace) {
-            // replace thread and action log subscription, but keep editors
-            workspace_thread.thread = thread.downgrade();
-            workspace_thread._thread_subscriptions = (action_log_subscription, thread_subscription);
-            self.update_reviewing_editors(workspace, window, cx);
-            return;
-        }
-
-        let settings_subscription = cx.observe_global_in::<SettingsStore>(window, {
-            let workspace = workspace.clone();
-            let mut was_active = AgentSettings::get_global(cx).single_file_review;
-            move |this, window, cx| {
-                let is_active = AgentSettings::get_global(cx).single_file_review;
-                if was_active != is_active {
-                    was_active = is_active;
-                    this.update_reviewing_editors(&workspace, window, cx);
-                }
-            }
-        });
-
-        let workspace_subscription = workspace
-            .upgrade()
-            .map(|workspace| cx.subscribe_in(&workspace, window, Self::handle_workspace_event));
-
-        self.workspace_threads.insert(
-            workspace.clone(),
-            WorkspaceThread {
-                thread: thread.downgrade(),
-                _thread_subscriptions: (action_log_subscription, thread_subscription),
-                singleton_editors: HashMap::default(),
-                _settings_subscription: settings_subscription,
-                _workspace_subscription: workspace_subscription,
-            },
-        );
-
-        let workspace = workspace.clone();
-        cx.defer_in(window, move |this, window, cx| {
-            if let Some(workspace) = workspace.upgrade() {
-                this.register_workspace(workspace, window, cx);
-            }
-        });
-    }
-
-    fn register_workspace(
-        &mut self,
-        workspace: Entity<Workspace>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let agent_diff = cx.entity();
-
-        let editors = workspace.update(cx, |workspace, cx| {
-            let agent_diff = agent_diff.clone();
-
-            Self::register_review_action::<Keep>(workspace, Self::keep, &agent_diff);
-            Self::register_review_action::<Reject>(workspace, Self::reject, &agent_diff);
-            Self::register_review_action::<KeepAll>(workspace, Self::keep_all, &agent_diff);
-            Self::register_review_action::<RejectAll>(workspace, Self::reject_all, &agent_diff);
-
-            workspace.items_of_type(cx).collect::<Vec<_>>()
-        });
-
-        let weak_workspace = workspace.downgrade();
-
-        for editor in editors {
-            if let Some(buffer) = Self::full_editor_buffer(editor.read(cx), cx) {
-                self.register_editor(weak_workspace.clone(), buffer, editor, window, cx);
-            };
-        }
-
-        self.update_reviewing_editors(&weak_workspace, window, cx);
-    }
-
-    fn register_review_action<T: Action>(
-        workspace: &mut Workspace,
-        review: impl Fn(&Entity<Editor>, &Entity<AcpThread>, &mut Window, &mut App) -> PostReviewState
-        + 'static,
-        this: &Entity<AgentDiff>,
-    ) {
-        let this = this.clone();
-        workspace.register_action(move |workspace, _: &T, window, cx| {
-            let review = &review;
-            let task = this.update(cx, |this, cx| {
-                this.review_in_active_editor(workspace, review, window, cx)
-            });
-
-            if let Some(task) = task {
-                task.detach_and_log_err(cx);
-            } else {
-                cx.propagate();
-            }
-        });
-    }
-
-    fn handle_acp_thread_event(
-        &mut self,
-        workspace: &WeakEntity<Workspace>,
-        thread: &Entity<AcpThread>,
-        event: &AcpThreadEvent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            AcpThreadEvent::NewEntry => {
-                if thread
-                    .read(cx)
-                    .entries()
-                    .last()
-                    .is_some_and(|entry| entry.diffs().next().is_some())
-                {
-                    self.update_reviewing_editors(workspace, window, cx);
-                }
-            }
-            AcpThreadEvent::EntryUpdated(ix) => {
-                if thread
-                    .read(cx)
-                    .entries()
-                    .get(*ix)
-                    .is_some_and(|entry| entry.diffs().next().is_some())
-                {
-                    self.update_reviewing_editors(workspace, window, cx);
-                }
-            }
-            AcpThreadEvent::Stopped
-            | AcpThreadEvent::Error
-            | AcpThreadEvent::LoadError(_)
-            | AcpThreadEvent::Refusal => {
-                self.update_reviewing_editors(workspace, window, cx);
-            }
-            AcpThreadEvent::TitleUpdated
-            | AcpThreadEvent::TokenUsageUpdated
-            | AcpThreadEvent::EntriesRemoved(_)
-            | AcpThreadEvent::ToolAuthorizationRequired
-            | AcpThreadEvent::PromptCapabilitiesUpdated
-            | AcpThreadEvent::AvailableCommandsUpdated(_)
-            | AcpThreadEvent::Retry(_)
-            | AcpThreadEvent::ModeUpdated(_) => {}
-        }
-    }
-
-    fn handle_workspace_event(
-        &mut self,
-        workspace: &Entity<Workspace>,
-        event: &workspace::Event,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let workspace::Event::ItemAdded { item } = event
-            && let Some(editor) = item.downcast::<Editor>()
-            && let Some(buffer) = Self::full_editor_buffer(editor.read(cx), cx)
-        {
-            self.register_editor(workspace.downgrade(), buffer, editor, window, cx);
-        }
-    }
-
-    fn full_editor_buffer(editor: &Editor, cx: &App) -> Option<WeakEntity<Buffer>> {
-        if editor.mode().is_full() {
-            editor
-                .buffer()
-                .read(cx)
-                .as_singleton()
-                .map(|buffer| buffer.downgrade())
-        } else {
-            None
-        }
-    }
-
-    fn register_editor(
-        &mut self,
-        workspace: WeakEntity<Workspace>,
-        buffer: WeakEntity<Buffer>,
-        editor: Entity<Editor>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(workspace_thread) = self.workspace_threads.get_mut(&workspace) else {
-            return;
-        };
-
-        let weak_editor = editor.downgrade();
-
-        workspace_thread
-            .singleton_editors
-            .entry(buffer.clone())
-            .or_default()
-            .entry(weak_editor.clone())
-            .or_insert_with(|| {
-                let workspace = workspace.clone();
-                cx.observe_release(&editor, move |this, _, _cx| {
-                    let Some(active_thread) = this.workspace_threads.get_mut(&workspace) else {
-                        return;
-                    };
-
-                    if let Entry::Occupied(mut entry) =
-                        active_thread.singleton_editors.entry(buffer)
-                    {
-                        let set = entry.get_mut();
-                        set.remove(&weak_editor);
-
-                        if set.is_empty() {
-                            entry.remove();
-                        }
-                    }
-                })
-            });
-
-        self.update_reviewing_editors(&workspace, window, cx);
-    }
-
-    fn update_reviewing_editors(
-        &mut self,
-        workspace: &WeakEntity<Workspace>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if !AgentSettings::get_global(cx).single_file_review {
-            for (editor, _) in self.reviewing_editors.drain() {
-                editor
-                    .update(cx, |editor, cx| {
-                        editor.end_temporary_diff_override(cx);
-                        editor.unregister_addon::<EditorAgentDiffAddon>();
-                    })
-                    .ok();
-            }
-            return;
-        }
-
-        let Some(workspace_thread) = self.workspace_threads.get_mut(workspace) else {
-            return;
-        };
-
-        let Some(thread) = workspace_thread.thread.upgrade() else {
-            return;
-        };
-
-        let action_log = thread.read(cx).action_log();
-        let changed_buffers = action_log.read(cx).changed_buffers(cx);
-
-        let mut unaffected = self.reviewing_editors.clone();
-
-        for (buffer, diff_handle) in changed_buffers {
-            if buffer.read(cx).file().is_none() {
-                continue;
-            }
-
-            let Some(buffer_editors) = workspace_thread.singleton_editors.get(&buffer.downgrade())
-            else {
-                continue;
-            };
-
-            for weak_editor in buffer_editors.keys() {
-                let Some(editor) = weak_editor.upgrade() else {
-                    continue;
-                };
-
-                let multibuffer = editor.read(cx).buffer().clone();
-                multibuffer.update(cx, |multibuffer, cx| {
-                    multibuffer.add_diff(diff_handle.clone(), cx);
-                });
-
-                let reviewing_state = EditorState::Reviewing;
-
-                let previous_state = self
-                    .reviewing_editors
-                    .insert(weak_editor.clone(), reviewing_state.clone());
-
-                if previous_state.is_none() {
-                    editor.update(cx, |editor, cx| {
-                        editor.start_temporary_diff_override();
-                        editor.set_render_diff_hunk_controls(diff_hunk_controls(&thread), cx);
-                        editor.set_expand_all_diff_hunks(cx);
-                        editor.register_addon(EditorAgentDiffAddon);
-                    });
-                } else {
-                    unaffected.remove(weak_editor);
-                }
-
-                if reviewing_state == EditorState::Reviewing
-                    && previous_state != Some(reviewing_state)
-                {
-                    // Jump to first hunk when we enter review mode
-                    editor.update(cx, |editor, cx| {
-                        let snapshot = multibuffer.read(cx).snapshot(cx);
-                        if let Some(first_hunk) = snapshot.diff_hunks().next() {
-                            let first_hunk_start = first_hunk.multi_buffer_range().start;
-
-                            editor.change_selections(
-                                SelectionEffects::scroll(Autoscroll::center()),
-                                window,
-                                cx,
-                                |selections| {
-                                    selections.select_ranges([first_hunk_start..first_hunk_start])
-                                },
-                            );
-                        }
-                    });
-                }
-            }
-        }
-
-        // Remove editors from this workspace that are no longer under review
-        for (editor, _) in unaffected {
-            // Note: We could avoid this check by storing `reviewing_editors` by Workspace,
-            // but that would add another lookup in `AgentDiff::editor_state`
-            // which gets called much more frequently.
-            let in_workspace = editor
-                .read_with(cx, |editor, _cx| editor.workspace())
-                .ok()
-                .flatten()
-                .is_some_and(|editor_workspace| {
-                    editor_workspace.entity_id() == workspace.entity_id()
-                });
-
-            if in_workspace {
-                editor
-                    .update(cx, |editor, cx| {
-                        editor.end_temporary_diff_override(cx);
-                        editor.unregister_addon::<EditorAgentDiffAddon>();
-                    })
-                    .ok();
-                self.reviewing_editors.remove(&editor);
-            }
-        }
-
-        cx.notify();
-    }
-
-    fn editor_state(&self, editor: &WeakEntity<Editor>) -> EditorState {
-        self.reviewing_editors
-            .get(editor)
-            .cloned()
-            .unwrap_or(EditorState::Idle)
-    }
-
-    fn deploy_pane_from_editor(&self, editor: &Entity<Editor>, window: &mut Window, cx: &mut App) {
-        let Some(workspace) = editor.read(cx).workspace() else {
-            return;
-        };
-
-        let Some(WorkspaceThread { thread, .. }) =
-            self.workspace_threads.get(&workspace.downgrade())
-        else {
-            return;
-        };
-
-        let Some(thread) = thread.upgrade() else {
-            return;
-        };
-
-        AgentDiffPane::deploy(thread, workspace.downgrade(), window, cx).log_err();
-    }
-
-    fn keep_all(
-        editor: &Entity<Editor>,
-        thread: &Entity<AcpThread>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> PostReviewState {
-        editor.update(cx, |editor, cx| {
-            let snapshot = editor.buffer().read(cx).snapshot(cx);
-            keep_edits_in_ranges(
-                editor,
-                &snapshot,
-                thread,
-                vec![editor::Anchor::min()..editor::Anchor::max()],
-                window,
-                cx,
-            );
-        });
-        PostReviewState::AllReviewed
-    }
-
-    fn reject_all(
-        editor: &Entity<Editor>,
-        thread: &Entity<AcpThread>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> PostReviewState {
-        editor.update(cx, |editor, cx| {
-            let snapshot = editor.buffer().read(cx).snapshot(cx);
-            reject_edits_in_ranges(
-                editor,
-                &snapshot,
-                thread,
-                vec![editor::Anchor::min()..editor::Anchor::max()],
-                window,
-                cx,
-            );
-        });
-        PostReviewState::AllReviewed
-    }
-
-    fn keep(
-        editor: &Entity<Editor>,
-        thread: &Entity<AcpThread>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> PostReviewState {
-        editor.update(cx, |editor, cx| {
-            let snapshot = editor.buffer().read(cx).snapshot(cx);
-            keep_edits_in_selection(editor, &snapshot, thread, window, cx);
-            Self::post_review_state(&snapshot)
-        })
-    }
-
-    fn reject(
-        editor: &Entity<Editor>,
-        thread: &Entity<AcpThread>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> PostReviewState {
-        editor.update(cx, |editor, cx| {
-            let snapshot = editor.buffer().read(cx).snapshot(cx);
-            reject_edits_in_selection(editor, &snapshot, thread, window, cx);
-            Self::post_review_state(&snapshot)
-        })
-    }
-
-    fn post_review_state(snapshot: &MultiBufferSnapshot) -> PostReviewState {
-        for (i, _) in snapshot.diff_hunks().enumerate() {
-            if i > 0 {
-                return PostReviewState::Pending;
-            }
-        }
-        PostReviewState::AllReviewed
-    }
-
-    fn review_in_active_editor(
-        &mut self,
-        workspace: &mut Workspace,
-        review: impl Fn(&Entity<Editor>, &Entity<AcpThread>, &mut Window, &mut App) -> PostReviewState,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Task<Result<()>>> {
-        let active_item = workspace.active_item(cx)?;
-        let editor = active_item.act_as::<Editor>(cx)?;
-
-        if !matches!(
-            self.editor_state(&editor.downgrade()),
-            EditorState::Reviewing
-        ) {
-            return None;
-        }
-
-        let WorkspaceThread { thread, .. } =
-            self.workspace_threads.get(&workspace.weak_handle())?;
-
-        let thread = thread.upgrade()?;
-
-        if let PostReviewState::AllReviewed = review(&editor, &thread, window, cx)
-            && let Some(curr_buffer) = editor.read(cx).buffer().read(cx).as_singleton()
-        {
-            let changed_buffers = thread.read(cx).action_log().read(cx).changed_buffers(cx);
-
-            let mut keys = changed_buffers.keys().cycle();
-            keys.find(|k| *k == &curr_buffer);
-            let next_project_path = keys
-                .next()
-                .filter(|k| *k != &curr_buffer)
-                .and_then(|after| after.read(cx).project_path(cx));
-
-            if let Some(path) = next_project_path {
-                let task = workspace.open_path(path, None, true, window, cx);
-                let task = cx.spawn(async move |_, _cx| task.await.map(|_| ()));
-                return Some(task);
-            }
-        }
-
-        Some(Task::ready(Ok(())))
-    }
-}
-
-enum PostReviewState {
-    AllReviewed,
-    Pending,
-}
-
-pub struct EditorAgentDiffAddon;
-
-impl editor::Addon for EditorAgentDiffAddon {
-    fn to_any(&self) -> &dyn std::any::Any {
-        self
-    }
-
-    fn extend_key_context(&self, key_context: &mut gpui::KeyContext, _: &App) {
-        key_context.add("agent_diff");
-        key_context.add("editor_agent_diff");
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::Keep;
-    use acp_thread::AgentConnection as _;
-    use editor::EditorSettings;
-    use gpui::{TestAppContext, UpdateGlobal, VisualTestContext};
-    use project::{FakeFs, Project};
-    use serde_json::json;
-    use settings::SettingsStore;
-    use std::{path::Path, rc::Rc};
-    use util::path;
-
-    #[gpui::test]
-    async fn test_multibuffer_agent_diff(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-            prompt_store::init(cx);
-            theme::init(theme::LoadThemes::JustBase, cx);
-            language_model::init_settings(cx);
-        });
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/test"),
-            json!({"file1": "abc\ndef\nghi\njkl\nmno\npqr\nstu\nvwx\nyz"}),
-        )
-        .await;
-        let project = Project::test(fs, [path!("/test").as_ref()], cx).await;
-        let buffer_path = project
-            .read_with(cx, |project, cx| {
-                project.find_project_path("test/file1", cx)
-            })
-            .unwrap();
-
-        let connection = Rc::new(acp_thread::StubAgentConnection::new());
-        let thread = cx
-            .update(|cx| {
-                connection
-                    .clone()
-                    .new_thread(project.clone(), Path::new(path!("/test")), cx)
-            })
-            .await
-            .unwrap();
-
-        let action_log = cx.read(|cx| thread.read(cx).action_log().clone());
-
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let agent_diff = cx.new_window_entity(|window, cx| {
-            AgentDiffPane::new(thread.clone(), workspace.downgrade(), window, cx)
-        });
-        let editor = agent_diff.read_with(cx, |diff, _cx| diff.editor.clone());
-
-        let buffer = project
-            .update(cx, |project, cx| project.open_buffer(buffer_path, cx))
-            .await
-            .unwrap();
-        cx.update(|_, cx| {
-            action_log.update(cx, |log, cx| log.buffer_read(buffer.clone(), cx));
-            buffer.update(cx, |buffer, cx| {
-                buffer
-                    .edit(
-                        [
-                            (Point::new(1, 1)..Point::new(1, 2), "E"),
-                            (Point::new(3, 2)..Point::new(3, 3), "L"),
-                            (Point::new(5, 0)..Point::new(5, 1), "P"),
-                            (Point::new(7, 1)..Point::new(7, 2), "W"),
-                        ],
-                        None,
-                        cx,
-                    )
-                    .unwrap()
-            });
-            action_log.update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
-        });
-        cx.run_until_parked();
-
-        // When opening the assistant diff, the cursor is positioned on the first hunk.
-        assert_eq!(
-            editor.read_with(cx, |editor, cx| editor.text(cx)),
-            "abc\ndef\ndEf\nghi\njkl\njkL\nmno\npqr\nPqr\nstu\nvwx\nvWx\nyz"
-        );
-        assert_eq!(
-            editor
-                .update(cx, |editor, cx| editor
-                    .selections
-                    .newest::<Point>(&editor.display_snapshot(cx)))
-                .range(),
-            Point::new(1, 0)..Point::new(1, 0)
-        );
-
-        // After keeping a hunk, the cursor should be positioned on the second hunk.
-        agent_diff.update_in(cx, |diff, window, cx| diff.keep(&Keep, window, cx));
-        cx.run_until_parked();
-        assert_eq!(
-            editor.read_with(cx, |editor, cx| editor.text(cx)),
-            "abc\ndEf\nghi\njkl\njkL\nmno\npqr\nPqr\nstu\nvwx\nvWx\nyz"
-        );
-        assert_eq!(
-            editor
-                .update(cx, |editor, cx| editor
-                    .selections
-                    .newest::<Point>(&editor.display_snapshot(cx)))
-                .range(),
-            Point::new(3, 0)..Point::new(3, 0)
-        );
-
-        // Rejecting a hunk also moves the cursor to the next hunk, possibly cycling if it's at the end.
-        editor.update_in(cx, |editor, window, cx| {
-            editor.change_selections(SelectionEffects::no_scroll(), window, cx, |selections| {
-                selections.select_ranges([Point::new(10, 0)..Point::new(10, 0)])
-            });
-        });
-        agent_diff.update_in(cx, |diff, window, cx| {
-            diff.reject(&crate::Reject, window, cx)
-        });
-        cx.run_until_parked();
-        assert_eq!(
-            editor.read_with(cx, |editor, cx| editor.text(cx)),
-            "abc\ndEf\nghi\njkl\njkL\nmno\npqr\nPqr\nstu\nvwx\nyz"
-        );
-        assert_eq!(
-            editor
-                .update(cx, |editor, cx| editor
-                    .selections
-                    .newest::<Point>(&editor.display_snapshot(cx)))
-                .range(),
-            Point::new(3, 0)..Point::new(3, 0)
-        );
-
-        // Keeping a range that doesn't intersect the current selection doesn't move it.
-        agent_diff.update_in(cx, |_diff, window, cx| {
-            let position = editor
-                .read(cx)
-                .buffer()
-                .read(cx)
-                .read(cx)
-                .anchor_before(Point::new(7, 0));
-            editor.update(cx, |editor, cx| {
-                let snapshot = editor.buffer().read(cx).snapshot(cx);
-                keep_edits_in_ranges(
-                    editor,
-                    &snapshot,
-                    &thread,
-                    vec![position..position],
-                    window,
-                    cx,
-                )
-            });
-        });
-        cx.run_until_parked();
-        assert_eq!(
-            editor.read_with(cx, |editor, cx| editor.text(cx)),
-            "abc\ndEf\nghi\njkl\njkL\nmno\nPqr\nstu\nvwx\nyz"
-        );
-        assert_eq!(
-            editor
-                .update(cx, |editor, cx| editor
-                    .selections
-                    .newest::<Point>(&editor.display_snapshot(cx)))
-                .range(),
-            Point::new(3, 0)..Point::new(3, 0)
-        );
-    }
-
-    #[gpui::test]
-    async fn test_singleton_agent_diff(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-            prompt_store::init(cx);
-            theme::init(theme::LoadThemes::JustBase, cx);
-            language_model::init_settings(cx);
-            workspace::register_project_item::<Editor>(cx);
-        });
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/test"),
-            json!({"file1": "abc\ndef\nghi\njkl\nmno\npqr\nstu\nvwx\nyz"}),
-        )
-        .await;
-        fs.insert_tree(path!("/test"), json!({"file2": "abc\ndef\nghi"}))
-            .await;
-
-        let project = Project::test(fs, [path!("/test").as_ref()], cx).await;
-        let buffer_path1 = project
-            .read_with(cx, |project, cx| {
-                project.find_project_path("test/file1", cx)
-            })
-            .unwrap();
-        let buffer_path2 = project
-            .read_with(cx, |project, cx| {
-                project.find_project_path("test/file2", cx)
-            })
-            .unwrap();
-
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-        // Add the diff toolbar to the active pane
-        let diff_toolbar = cx.new_window_entity(|_, cx| AgentDiffToolbar::new(cx));
-
-        workspace.update_in(cx, {
-            let diff_toolbar = diff_toolbar.clone();
-
-            move |workspace, window, cx| {
-                workspace.active_pane().update(cx, |pane, cx| {
-                    pane.toolbar().update(cx, |toolbar, cx| {
-                        toolbar.add_item(diff_toolbar, window, cx);
-                    });
-                })
-            }
-        });
-
-        let connection = Rc::new(acp_thread::StubAgentConnection::new());
-        let thread = cx
-            .update(|_, cx| {
-                connection
-                    .clone()
-                    .new_thread(project.clone(), Path::new(path!("/test")), cx)
-            })
-            .await
-            .unwrap();
-        let action_log = thread.read_with(cx, |thread, _| thread.action_log().clone());
-
-        // Set the active thread
-        cx.update(|window, cx| {
-            AgentDiff::set_active_thread(&workspace.downgrade(), thread.clone(), window, cx)
-        });
-
-        let buffer1 = project
-            .update(cx, |project, cx| {
-                project.open_buffer(buffer_path1.clone(), cx)
-            })
-            .await
-            .unwrap();
-        let buffer2 = project
-            .update(cx, |project, cx| {
-                project.open_buffer(buffer_path2.clone(), cx)
-            })
-            .await
-            .unwrap();
-
-        // Open an editor for buffer1
-        let editor1 = cx.new_window_entity(|window, cx| {
-            Editor::for_buffer(buffer1.clone(), Some(project.clone()), window, cx)
-        });
-
-        workspace.update_in(cx, |workspace, window, cx| {
-            workspace.add_item_to_active_pane(Box::new(editor1.clone()), None, true, window, cx);
-        });
-        cx.run_until_parked();
-
-        // Toolbar knows about the current editor, but it's hidden since there are no changes yet
-        assert!(diff_toolbar.read_with(cx, |toolbar, _cx| matches!(
-            toolbar.active_item,
-            Some(AgentDiffToolbarItem::Editor {
-                state: EditorState::Idle,
-                ..
-            })
-        )));
-        assert_eq!(
-            diff_toolbar.read_with(cx, |toolbar, cx| toolbar.location(cx)),
-            ToolbarItemLocation::Hidden
-        );
-
-        // Make changes
-        cx.update(|_, cx| {
-            action_log.update(cx, |log, cx| log.buffer_read(buffer1.clone(), cx));
-            buffer1.update(cx, |buffer, cx| {
-                buffer
-                    .edit(
-                        [
-                            (Point::new(1, 1)..Point::new(1, 2), "E"),
-                            (Point::new(3, 2)..Point::new(3, 3), "L"),
-                            (Point::new(5, 0)..Point::new(5, 1), "P"),
-                            (Point::new(7, 1)..Point::new(7, 2), "W"),
-                        ],
-                        None,
-                        cx,
-                    )
-                    .unwrap()
-            });
-            action_log.update(cx, |log, cx| log.buffer_edited(buffer1.clone(), cx));
-
-            action_log.update(cx, |log, cx| log.buffer_read(buffer2.clone(), cx));
-            buffer2.update(cx, |buffer, cx| {
-                buffer
-                    .edit(
-                        [
-                            (Point::new(0, 0)..Point::new(0, 1), "A"),
-                            (Point::new(2, 1)..Point::new(2, 2), "H"),
-                        ],
-                        None,
-                        cx,
-                    )
-                    .unwrap();
-            });
-            action_log.update(cx, |log, cx| log.buffer_edited(buffer2.clone(), cx));
-        });
-        cx.run_until_parked();
-
-        // The already opened editor displays the diff and the cursor is at the first hunk
-        assert_eq!(
-            editor1.read_with(cx, |editor, cx| editor.text(cx)),
-            "abc\ndef\ndEf\nghi\njkl\njkL\nmno\npqr\nPqr\nstu\nvwx\nvWx\nyz"
-        );
-        assert_eq!(
-            editor1
-                .update(cx, |editor, cx| editor
-                    .selections
-                    .newest::<Point>(&editor.display_snapshot(cx)))
-                .range(),
-            Point::new(1, 0)..Point::new(1, 0)
-        );
-
-        // The toolbar is displayed in the right state
-        assert_eq!(
-            diff_toolbar.read_with(cx, |toolbar, cx| toolbar.location(cx)),
-            ToolbarItemLocation::PrimaryRight
-        );
-        assert!(diff_toolbar.read_with(cx, |toolbar, _cx| matches!(
-            toolbar.active_item,
-            Some(AgentDiffToolbarItem::Editor {
-                state: EditorState::Reviewing,
-                ..
-            })
-        )));
-
-        // The toolbar respects its setting
-        override_toolbar_agent_review_setting(false, cx);
-        assert_eq!(
-            diff_toolbar.read_with(cx, |toolbar, cx| toolbar.location(cx)),
-            ToolbarItemLocation::Hidden
-        );
-        override_toolbar_agent_review_setting(true, cx);
-        assert_eq!(
-            diff_toolbar.read_with(cx, |toolbar, cx| toolbar.location(cx)),
-            ToolbarItemLocation::PrimaryRight
-        );
-
-        // After keeping a hunk, the cursor should be positioned on the second hunk.
-        workspace.update(cx, |_, cx| {
-            cx.dispatch_action(&Keep);
-        });
-        cx.run_until_parked();
-        assert_eq!(
-            editor1.read_with(cx, |editor, cx| editor.text(cx)),
-            "abc\ndEf\nghi\njkl\njkL\nmno\npqr\nPqr\nstu\nvwx\nvWx\nyz"
-        );
-        assert_eq!(
-            editor1
-                .update(cx, |editor, cx| editor
-                    .selections
-                    .newest::<Point>(&editor.display_snapshot(cx)))
-                .range(),
-            Point::new(3, 0)..Point::new(3, 0)
-        );
-
-        // Rejecting a hunk also moves the cursor to the next hunk, possibly cycling if it's at the end.
-        editor1.update_in(cx, |editor, window, cx| {
-            editor.change_selections(SelectionEffects::no_scroll(), window, cx, |selections| {
-                selections.select_ranges([Point::new(10, 0)..Point::new(10, 0)])
-            });
-        });
-        workspace.update(cx, |_, cx| {
-            cx.dispatch_action(&Reject);
-        });
-        cx.run_until_parked();
-        assert_eq!(
-            editor1.read_with(cx, |editor, cx| editor.text(cx)),
-            "abc\ndEf\nghi\njkl\njkL\nmno\npqr\nPqr\nstu\nvwx\nyz"
-        );
-        assert_eq!(
-            editor1
-                .update(cx, |editor, cx| editor
-                    .selections
-                    .newest::<Point>(&editor.display_snapshot(cx)))
-                .range(),
-            Point::new(3, 0)..Point::new(3, 0)
-        );
-
-        // Keeping a range that doesn't intersect the current selection doesn't move it.
-        editor1.update_in(cx, |editor, window, cx| {
-            let buffer = editor.buffer().read(cx);
-            let position = buffer.read(cx).anchor_before(Point::new(7, 0));
-            let snapshot = buffer.snapshot(cx);
-            keep_edits_in_ranges(
-                editor,
-                &snapshot,
-                &thread,
-                vec![position..position],
-                window,
-                cx,
-            )
-        });
-        cx.run_until_parked();
-        assert_eq!(
-            editor1.read_with(cx, |editor, cx| editor.text(cx)),
-            "abc\ndEf\nghi\njkl\njkL\nmno\nPqr\nstu\nvwx\nyz"
-        );
-        assert_eq!(
-            editor1
-                .update(cx, |editor, cx| editor
-                    .selections
-                    .newest::<Point>(&editor.display_snapshot(cx)))
-                .range(),
-            Point::new(3, 0)..Point::new(3, 0)
-        );
-
-        // Reviewing the last change opens the next changed buffer
-        workspace
-            .update_in(cx, |workspace, window, cx| {
-                AgentDiff::global(cx).update(cx, |agent_diff, cx| {
-                    agent_diff.review_in_active_editor(workspace, AgentDiff::keep, window, cx)
-                })
-            })
-            .unwrap()
-            .await
-            .unwrap();
-
-        cx.run_until_parked();
-
-        let editor2 = workspace.update(cx, |workspace, cx| {
-            workspace.active_item_as::<Editor>(cx).unwrap()
-        });
-
-        let editor2_path = editor2
-            .read_with(cx, |editor, cx| editor.project_path(cx))
-            .unwrap();
-        assert_eq!(editor2_path, buffer_path2);
-
-        assert_eq!(
-            editor2.read_with(cx, |editor, cx| editor.text(cx)),
-            "abc\nAbc\ndef\nghi\ngHi"
-        );
-        assert_eq!(
-            editor2
-                .update(cx, |editor, cx| editor
-                    .selections
-                    .newest::<Point>(&editor.display_snapshot(cx)))
-                .range(),
-            Point::new(0, 0)..Point::new(0, 0)
-        );
-
-        // Editor 1 toolbar is hidden since all changes have been reviewed
-        workspace.update_in(cx, |workspace, window, cx| {
-            workspace.activate_item(&editor1, true, true, window, cx)
-        });
-
-        assert!(diff_toolbar.read_with(cx, |toolbar, _cx| matches!(
-            toolbar.active_item,
-            Some(AgentDiffToolbarItem::Editor {
-                state: EditorState::Idle,
-                ..
-            })
-        )));
-        assert_eq!(
-            diff_toolbar.read_with(cx, |toolbar, cx| toolbar.location(cx)),
-            ToolbarItemLocation::Hidden
-        );
-    }
-
-    fn override_toolbar_agent_review_setting(active: bool, cx: &mut VisualTestContext) {
-        cx.update(|_window, cx| {
-            SettingsStore::update_global(cx, |store, _cx| {
-                let mut editor_settings = store.get::<EditorSettings>(None).clone();
-                editor_settings.toolbar.agent_review = active;
-                store.override_global(editor_settings);
-            })
-        });
-        cx.run_until_parked();
-    }
-}
diff --git a/crates/agent_ui/src/agent_model_selector.rs b/crates/agent_ui/src/agent_model_selector.rs
deleted file mode 100644
index 9c26341430..0000000000
--- a/crates/agent_ui/src/agent_model_selector.rs
+++ /dev/null
@@ -1,120 +0,0 @@
-use crate::{
-    ModelUsageContext,
-    language_model_selector::{LanguageModelSelector, language_model_selector},
-};
-use fs::Fs;
-use gpui::{Entity, FocusHandle, SharedString};
-use picker::popover_menu::PickerPopoverMenu;
-use settings::update_settings_file;
-use std::sync::Arc;
-use ui::{ButtonLike, PopoverMenuHandle, TintColor, Tooltip, prelude::*};
-use zed_actions::agent::ToggleModelSelector;
-
-pub struct AgentModelSelector {
-    selector: Entity<LanguageModelSelector>,
-    menu_handle: PopoverMenuHandle<LanguageModelSelector>,
-    focus_handle: FocusHandle,
-}
-
-impl AgentModelSelector {
-    pub(crate) fn new(
-        fs: Arc<dyn Fs>,
-        menu_handle: PopoverMenuHandle<LanguageModelSelector>,
-        focus_handle: FocusHandle,
-        model_usage_context: ModelUsageContext,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let focus_handle_clone = focus_handle.clone();
-
-        Self {
-            selector: cx.new(move |cx| {
-                let fs = fs.clone();
-                language_model_selector(
-                    {
-                        let model_context = model_usage_context.clone();
-                        move |cx| model_context.configured_model(cx)
-                    },
-                    move |model, cx| {
-                        let provider = model.provider_id().0.to_string();
-                        let model_id = model.id().0.to_string();
-                        match &model_usage_context {
-                            ModelUsageContext::InlineAssistant => {
-                                update_settings_file(fs.clone(), cx, move |settings, _cx| {
-                                    settings
-                                        .agent
-                                        .get_or_insert_default()
-                                        .set_inline_assistant_model(provider.clone(), model_id);
-                                });
-                            }
-                        }
-                    },
-                    true, // Use popover styles for picker
-                    focus_handle_clone,
-                    window,
-                    cx,
-                )
-            }),
-            menu_handle,
-            focus_handle,
-        }
-    }
-
-    pub fn toggle(&self, window: &mut Window, cx: &mut Context<Self>) {
-        self.menu_handle.toggle(window, cx);
-    }
-
-    pub fn active_model(&self, cx: &App) -> Option<language_model::ConfiguredModel> {
-        self.selector.read(cx).delegate.active_model(cx)
-    }
-}
-
-impl Render for AgentModelSelector {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let model = self.selector.read(cx).delegate.active_model(cx);
-        let model_name = model
-            .as_ref()
-            .map(|model| model.model.name().0)
-            .unwrap_or_else(|| SharedString::from("Select a Model"));
-
-        let provider_icon = model.as_ref().map(|model| model.provider.icon());
-        let color = if self.menu_handle.is_deployed() {
-            Color::Accent
-        } else {
-            Color::Muted
-        };
-
-        let focus_handle = self.focus_handle.clone();
-
-        PickerPopoverMenu::new(
-            self.selector.clone(),
-            ButtonLike::new("active-model")
-                .when_some(provider_icon, |this, icon| {
-                    this.child(Icon::new(icon).color(color).size(IconSize::XSmall))
-                })
-                .selected_style(ButtonStyle::Tinted(TintColor::Accent))
-                .child(
-                    Label::new(model_name)
-                        .color(color)
-                        .size(LabelSize::Small)
-                        .ml_0p5(),
-                )
-                .child(
-                    Icon::new(IconName::ChevronDown)
-                        .color(color)
-                        .size(IconSize::Small),
-                ),
-            move |_window, cx| {
-                Tooltip::for_action_in("Change Model", &ToggleModelSelector, &focus_handle, cx)
-            },
-            gpui::Corner::TopRight,
-            cx,
-        )
-        .with_handle(self.menu_handle.clone())
-        .offset(gpui::Point {
-            x: px(0.0),
-            y: px(2.0),
-        })
-        .render(window, cx)
-    }
-}
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
deleted file mode 100644
index 2f6a722b47..0000000000
--- a/crates/agent_ui/src/agent_panel.rs
+++ /dev/null
@@ -1,2802 +0,0 @@
-use std::{ops::Range, path::Path, rc::Rc, sync::Arc, time::Duration};
-
-use acp_thread::AcpThread;
-use agent::{ContextServerRegistry, DbThreadMetadata, HistoryEntry, HistoryStore};
-use db::kvp::{Dismissable, KEY_VALUE_STORE};
-use project::{
-    ExternalAgentServerName,
-    agent_server_store::{CLAUDE_CODE_NAME, CODEX_NAME, GEMINI_NAME},
-};
-use serde::{Deserialize, Serialize};
-use settings::{
-    DefaultAgentView as DefaultView, LanguageModelProviderSetting, LanguageModelSelection,
-};
-
-use zed_actions::agent::{OpenClaudeCodeOnboardingModal, ReauthenticateAgent};
-
-use crate::ManageProfiles;
-use crate::ui::{AcpOnboardingModal, ClaudeCodeOnboardingModal};
-use crate::{
-    AddContextServer, AgentDiffPane, Follow, InlineAssistant, NewTextThread, NewThread,
-    OpenActiveThreadAsMarkdown, OpenAgentDiff, OpenHistory, ResetTrialEndUpsell, ResetTrialUpsell,
-    ToggleNavigationMenu, ToggleNewThreadMenu, ToggleOptionsMenu,
-    acp::AcpThreadView,
-    agent_configuration::{AgentConfiguration, AssistantConfigurationEvent},
-    slash_command::SlashCommandCompletionProvider,
-    text_thread_editor::{AgentPanelDelegate, TextThreadEditor, make_lsp_adapter_delegate},
-    ui::{AgentOnboardingModal, EndTrialUpsell},
-};
-use crate::{
-    ExpandMessageEditor,
-    acp::{AcpThreadHistory, ThreadHistoryEvent},
-};
-use crate::{ExternalAgent, NewExternalAgentThread, NewNativeAgentThreadFromSummary};
-use agent_settings::AgentSettings;
-use ai_onboarding::AgentPanelOnboarding;
-use anyhow::{Result, anyhow};
-use assistant_slash_command::SlashCommandWorkingSet;
-use assistant_text_thread::{TextThread, TextThreadEvent, TextThreadSummary};
-use client::{UserStore, zed_urls};
-use cloud_llm_client::{Plan, PlanV1, PlanV2, UsageLimit};
-use editor::{Anchor, AnchorRangeExt as _, Editor, EditorEvent, MultiBuffer};
-use extension::ExtensionEvents;
-use extension_host::ExtensionStore;
-use fs::Fs;
-use gpui::{
-    Action, Animation, AnimationExt, AnyElement, App, AsyncWindowContext, Corner, DismissEvent,
-    Entity, EventEmitter, ExternalPaths, FocusHandle, Focusable, KeyContext, Pixels, Subscription,
-    Task, UpdateGlobal, WeakEntity, prelude::*, pulsating_between,
-};
-use language::LanguageRegistry;
-use language_model::{ConfigurationError, LanguageModelRegistry};
-use project::{Project, ProjectPath, Worktree};
-use prompt_store::{PromptBuilder, PromptStore, UserPromptId};
-use rules_library::{RulesLibrary, open_rules_library};
-use search::{BufferSearchBar, buffer_search};
-use settings::{Settings, update_settings_file};
-use theme::ThemeSettings;
-use ui::{
-    Callout, ContextMenu, ContextMenuEntry, KeyBinding, PopoverMenu, PopoverMenuHandle,
-    ProgressBar, Tab, Tooltip, prelude::*, utils::WithRemSize,
-};
-use util::ResultExt as _;
-use workspace::{
-    CollaboratorId, DraggedSelection, DraggedTab, ToggleZoom, ToolbarItemView, Workspace,
-    dock::{DockPosition, Panel, PanelEvent},
-};
-use zed_actions::{
-    DecreaseBufferFontSize, IncreaseBufferFontSize, ResetBufferFontSize,
-    agent::{
-        OpenAcpOnboardingModal, OpenOnboardingModal, OpenSettings, ResetAgentZoom, ResetOnboarding,
-    },
-    assistant::{OpenRulesLibrary, ToggleFocus},
-};
-
-const AGENT_PANEL_KEY: &str = "agent_panel";
-
-#[derive(Serialize, Deserialize, Debug)]
-struct SerializedAgentPanel {
-    width: Option<Pixels>,
-    selected_agent: Option<AgentType>,
-}
-
-pub fn init(cx: &mut App) {
-    cx.observe_new(
-        |workspace: &mut Workspace, _window, _cx: &mut Context<Workspace>| {
-            workspace
-                .register_action(|workspace, action: &NewThread, window, cx| {
-                    if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
-                        panel.update(cx, |panel, cx| panel.new_thread(action, window, cx));
-                        workspace.focus_panel::<AgentPanel>(window, cx);
-                    }
-                })
-                .register_action(
-                    |workspace, action: &NewNativeAgentThreadFromSummary, window, cx| {
-                        if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
-                            panel.update(cx, |panel, cx| {
-                                panel.new_native_agent_thread_from_summary(action, window, cx)
-                            });
-                            workspace.focus_panel::<AgentPanel>(window, cx);
-                        }
-                    },
-                )
-                .register_action(|workspace, _: &ExpandMessageEditor, window, cx| {
-                    if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
-                        workspace.focus_panel::<AgentPanel>(window, cx);
-                        panel.update(cx, |panel, cx| panel.expand_message_editor(window, cx));
-                    }
-                })
-                .register_action(|workspace, _: &OpenHistory, window, cx| {
-                    if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
-                        workspace.focus_panel::<AgentPanel>(window, cx);
-                        panel.update(cx, |panel, cx| panel.open_history(window, cx));
-                    }
-                })
-                .register_action(|workspace, _: &OpenSettings, window, cx| {
-                    if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
-                        workspace.focus_panel::<AgentPanel>(window, cx);
-                        panel.update(cx, |panel, cx| panel.open_configuration(window, cx));
-                    }
-                })
-                .register_action(|workspace, _: &NewTextThread, window, cx| {
-                    if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
-                        workspace.focus_panel::<AgentPanel>(window, cx);
-                        panel.update(cx, |panel, cx| panel.new_text_thread(window, cx));
-                    }
-                })
-                .register_action(|workspace, action: &NewExternalAgentThread, window, cx| {
-                    if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
-                        workspace.focus_panel::<AgentPanel>(window, cx);
-                        panel.update(cx, |panel, cx| {
-                            panel.external_thread(action.agent.clone(), None, None, window, cx)
-                        });
-                    }
-                })
-                .register_action(|workspace, action: &OpenRulesLibrary, window, cx| {
-                    if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
-                        workspace.focus_panel::<AgentPanel>(window, cx);
-                        panel.update(cx, |panel, cx| {
-                            panel.deploy_rules_library(action, window, cx)
-                        });
-                    }
-                })
-                .register_action(|workspace, _: &Follow, window, cx| {
-                    workspace.follow(CollaboratorId::Agent, window, cx);
-                })
-                .register_action(|workspace, _: &OpenAgentDiff, window, cx| {
-                    let thread = workspace
-                        .panel::<AgentPanel>(cx)
-                        .and_then(|panel| panel.read(cx).active_thread_view().cloned())
-                        .and_then(|thread_view| thread_view.read(cx).thread().cloned());
-
-                    if let Some(thread) = thread {
-                        AgentDiffPane::deploy_in_workspace(thread, workspace, window, cx);
-                    }
-                })
-                .register_action(|workspace, _: &ToggleNavigationMenu, window, cx| {
-                    if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
-                        workspace.focus_panel::<AgentPanel>(window, cx);
-                        panel.update(cx, |panel, cx| {
-                            panel.toggle_navigation_menu(&ToggleNavigationMenu, window, cx);
-                        });
-                    }
-                })
-                .register_action(|workspace, _: &ToggleOptionsMenu, window, cx| {
-                    if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
-                        workspace.focus_panel::<AgentPanel>(window, cx);
-                        panel.update(cx, |panel, cx| {
-                            panel.toggle_options_menu(&ToggleOptionsMenu, window, cx);
-                        });
-                    }
-                })
-                .register_action(|workspace, _: &ToggleNewThreadMenu, window, cx| {
-                    if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
-                        workspace.focus_panel::<AgentPanel>(window, cx);
-                        panel.update(cx, |panel, cx| {
-                            panel.toggle_new_thread_menu(&ToggleNewThreadMenu, window, cx);
-                        });
-                    }
-                })
-                .register_action(|workspace, _: &OpenOnboardingModal, window, cx| {
-                    AgentOnboardingModal::toggle(workspace, window, cx)
-                })
-                .register_action(|workspace, _: &OpenAcpOnboardingModal, window, cx| {
-                    AcpOnboardingModal::toggle(workspace, window, cx)
-                })
-                .register_action(|workspace, _: &OpenClaudeCodeOnboardingModal, window, cx| {
-                    ClaudeCodeOnboardingModal::toggle(workspace, window, cx)
-                })
-                .register_action(|_workspace, _: &ResetOnboarding, window, cx| {
-                    window.dispatch_action(workspace::RestoreBanner.boxed_clone(), cx);
-                    window.refresh();
-                })
-                .register_action(|_workspace, _: &ResetTrialUpsell, _window, cx| {
-                    OnboardingUpsell::set_dismissed(false, cx);
-                })
-                .register_action(|_workspace, _: &ResetTrialEndUpsell, _window, cx| {
-                    TrialEndUpsell::set_dismissed(false, cx);
-                })
-                .register_action(|workspace, _: &ResetAgentZoom, window, cx| {
-                    if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
-                        panel.update(cx, |panel, cx| {
-                            panel.reset_agent_zoom(window, cx);
-                        });
-                    }
-                });
-        },
-    )
-    .detach();
-}
-
-enum ActiveView {
-    ExternalAgentThread {
-        thread_view: Entity<AcpThreadView>,
-    },
-    TextThread {
-        text_thread_editor: Entity<TextThreadEditor>,
-        title_editor: Entity<Editor>,
-        buffer_search_bar: Entity<BufferSearchBar>,
-        _subscriptions: Vec<gpui::Subscription>,
-    },
-    History,
-    Configuration,
-}
-
-enum WhichFontSize {
-    AgentFont,
-    BufferFont,
-    None,
-}
-
-// TODO unify this with ExternalAgent
-#[derive(Debug, Default, Clone, PartialEq, Serialize, Deserialize)]
-pub enum AgentType {
-    #[default]
-    NativeAgent,
-    TextThread,
-    Gemini,
-    ClaudeCode,
-    Codex,
-    Custom {
-        name: SharedString,
-    },
-}
-
-impl AgentType {
-    fn label(&self) -> SharedString {
-        match self {
-            Self::NativeAgent | Self::TextThread => "Zed Agent".into(),
-            Self::Gemini => "Gemini CLI".into(),
-            Self::ClaudeCode => "Claude Code".into(),
-            Self::Codex => "Codex".into(),
-            Self::Custom { name, .. } => name.into(),
-        }
-    }
-
-    fn icon(&self) -> Option<IconName> {
-        match self {
-            Self::NativeAgent | Self::TextThread => None,
-            Self::Gemini => Some(IconName::AiGemini),
-            Self::ClaudeCode => Some(IconName::AiClaude),
-            Self::Codex => Some(IconName::AiOpenAi),
-            Self::Custom { .. } => Some(IconName::Terminal),
-        }
-    }
-}
-
-impl From<ExternalAgent> for AgentType {
-    fn from(value: ExternalAgent) -> Self {
-        match value {
-            ExternalAgent::Gemini => Self::Gemini,
-            ExternalAgent::ClaudeCode => Self::ClaudeCode,
-            ExternalAgent::Codex => Self::Codex,
-            ExternalAgent::Custom { name } => Self::Custom { name },
-            ExternalAgent::NativeAgent => Self::NativeAgent,
-        }
-    }
-}
-
-impl ActiveView {
-    pub fn which_font_size_used(&self) -> WhichFontSize {
-        match self {
-            ActiveView::ExternalAgentThread { .. } | ActiveView::History => {
-                WhichFontSize::AgentFont
-            }
-            ActiveView::TextThread { .. } => WhichFontSize::BufferFont,
-            ActiveView::Configuration => WhichFontSize::None,
-        }
-    }
-
-    pub fn native_agent(
-        fs: Arc<dyn Fs>,
-        prompt_store: Option<Entity<PromptStore>>,
-        history_store: Entity<agent::HistoryStore>,
-        project: Entity<Project>,
-        workspace: WeakEntity<Workspace>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Self {
-        let thread_view = cx.new(|cx| {
-            crate::acp::AcpThreadView::new(
-                ExternalAgent::NativeAgent.server(fs, history_store.clone()),
-                None,
-                None,
-                workspace,
-                project,
-                history_store,
-                prompt_store,
-                false,
-                window,
-                cx,
-            )
-        });
-
-        Self::ExternalAgentThread { thread_view }
-    }
-
-    pub fn text_thread(
-        text_thread_editor: Entity<TextThreadEditor>,
-        acp_history_store: Entity<agent::HistoryStore>,
-        language_registry: Arc<LanguageRegistry>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Self {
-        let title = text_thread_editor.read(cx).title(cx).to_string();
-
-        let editor = cx.new(|cx| {
-            let mut editor = Editor::single_line(window, cx);
-            editor.set_text(title, window, cx);
-            editor
-        });
-
-        // This is a workaround for `editor.set_text` emitting a `BufferEdited` event, which would
-        // cause a custom summary to be set. The presence of this custom summary would cause
-        // summarization to not happen.
-        let mut suppress_first_edit = true;
-
-        let subscriptions = vec![
-            window.subscribe(&editor, cx, {
-                {
-                    let text_thread_editor = text_thread_editor.clone();
-                    move |editor, event, window, cx| match event {
-                        EditorEvent::BufferEdited => {
-                            if suppress_first_edit {
-                                suppress_first_edit = false;
-                                return;
-                            }
-                            let new_summary = editor.read(cx).text(cx);
-
-                            text_thread_editor.update(cx, |text_thread_editor, cx| {
-                                text_thread_editor
-                                    .text_thread()
-                                    .update(cx, |text_thread, cx| {
-                                        text_thread.set_custom_summary(new_summary, cx);
-                                    })
-                            })
-                        }
-                        EditorEvent::Blurred => {
-                            if editor.read(cx).text(cx).is_empty() {
-                                let summary = text_thread_editor
-                                    .read(cx)
-                                    .text_thread()
-                                    .read(cx)
-                                    .summary()
-                                    .or_default();
-
-                                editor.update(cx, |editor, cx| {
-                                    editor.set_text(summary, window, cx);
-                                });
-                            }
-                        }
-                        _ => {}
-                    }
-                }
-            }),
-            window.subscribe(&text_thread_editor.read(cx).text_thread().clone(), cx, {
-                let editor = editor.clone();
-                move |text_thread, event, window, cx| match event {
-                    TextThreadEvent::SummaryGenerated => {
-                        let summary = text_thread.read(cx).summary().or_default();
-
-                        editor.update(cx, |editor, cx| {
-                            editor.set_text(summary, window, cx);
-                        })
-                    }
-                    TextThreadEvent::PathChanged { old_path, new_path } => {
-                        acp_history_store.update(cx, |history_store, cx| {
-                            if let Some(old_path) = old_path {
-                                history_store
-                                    .replace_recently_opened_text_thread(old_path, new_path, cx);
-                            } else {
-                                history_store.push_recently_opened_entry(
-                                    agent::HistoryEntryId::TextThread(new_path.clone()),
-                                    cx,
-                                );
-                            }
-                        });
-                    }
-                    _ => {}
-                }
-            }),
-        ];
-
-        let buffer_search_bar =
-            cx.new(|cx| BufferSearchBar::new(Some(language_registry), window, cx));
-        buffer_search_bar.update(cx, |buffer_search_bar, cx| {
-            buffer_search_bar.set_active_pane_item(Some(&text_thread_editor), window, cx)
-        });
-
-        Self::TextThread {
-            text_thread_editor,
-            title_editor: editor,
-            buffer_search_bar,
-            _subscriptions: subscriptions,
-        }
-    }
-}
-
-pub struct AgentPanel {
-    workspace: WeakEntity<Workspace>,
-    loading: bool,
-    user_store: Entity<UserStore>,
-    project: Entity<Project>,
-    fs: Arc<dyn Fs>,
-    language_registry: Arc<LanguageRegistry>,
-    acp_history: Entity<AcpThreadHistory>,
-    history_store: Entity<agent::HistoryStore>,
-    text_thread_store: Entity<assistant_text_thread::TextThreadStore>,
-    prompt_store: Option<Entity<PromptStore>>,
-    context_server_registry: Entity<ContextServerRegistry>,
-    configuration: Option<Entity<AgentConfiguration>>,
-    configuration_subscription: Option<Subscription>,
-    active_view: ActiveView,
-    previous_view: Option<ActiveView>,
-    new_thread_menu_handle: PopoverMenuHandle<ContextMenu>,
-    agent_panel_menu_handle: PopoverMenuHandle<ContextMenu>,
-    agent_navigation_menu_handle: PopoverMenuHandle<ContextMenu>,
-    agent_navigation_menu: Option<Entity<ContextMenu>>,
-    _extension_subscription: Option<Subscription>,
-    width: Option<Pixels>,
-    height: Option<Pixels>,
-    zoomed: bool,
-    pending_serialization: Option<Task<Result<()>>>,
-    onboarding: Entity<AgentPanelOnboarding>,
-    selected_agent: AgentType,
-}
-
-impl AgentPanel {
-    fn serialize(&mut self, cx: &mut Context<Self>) {
-        let width = self.width;
-        let selected_agent = self.selected_agent.clone();
-        self.pending_serialization = Some(cx.background_spawn(async move {
-            KEY_VALUE_STORE
-                .write_kvp(
-                    AGENT_PANEL_KEY.into(),
-                    serde_json::to_string(&SerializedAgentPanel {
-                        width,
-                        selected_agent: Some(selected_agent),
-                    })?,
-                )
-                .await?;
-            anyhow::Ok(())
-        }));
-    }
-
-    pub fn load(
-        workspace: WeakEntity<Workspace>,
-        prompt_builder: Arc<PromptBuilder>,
-        mut cx: AsyncWindowContext,
-    ) -> Task<Result<Entity<Self>>> {
-        let prompt_store = cx.update(|_window, cx| PromptStore::global(cx));
-        cx.spawn(async move |cx| {
-            let prompt_store = match prompt_store {
-                Ok(prompt_store) => prompt_store.await.ok(),
-                Err(_) => None,
-            };
-            let serialized_panel = if let Some(panel) = cx
-                .background_spawn(async move { KEY_VALUE_STORE.read_kvp(AGENT_PANEL_KEY) })
-                .await
-                .log_err()
-                .flatten()
-            {
-                serde_json::from_str::<SerializedAgentPanel>(&panel).log_err()
-            } else {
-                None
-            };
-
-            let slash_commands = Arc::new(SlashCommandWorkingSet::default());
-            let text_thread_store = workspace
-                .update(cx, |workspace, cx| {
-                    let project = workspace.project().clone();
-                    assistant_text_thread::TextThreadStore::new(
-                        project,
-                        prompt_builder,
-                        slash_commands,
-                        cx,
-                    )
-                })?
-                .await?;
-
-            let panel = workspace.update_in(cx, |workspace, window, cx| {
-                let panel =
-                    cx.new(|cx| Self::new(workspace, text_thread_store, prompt_store, window, cx));
-
-                panel.as_mut(cx).loading = true;
-                if let Some(serialized_panel) = serialized_panel {
-                    panel.update(cx, |panel, cx| {
-                        panel.width = serialized_panel.width.map(|w| w.round());
-                        if let Some(selected_agent) = serialized_panel.selected_agent {
-                            panel.selected_agent = selected_agent.clone();
-                            panel.new_agent_thread(selected_agent, window, cx);
-                        }
-                        cx.notify();
-                    });
-                } else {
-                    panel.update(cx, |panel, cx| {
-                        panel.new_agent_thread(AgentType::NativeAgent, window, cx);
-                    });
-                }
-                panel.as_mut(cx).loading = false;
-                panel
-            })?;
-
-            Ok(panel)
-        })
-    }
-
-    fn new(
-        workspace: &Workspace,
-        text_thread_store: Entity<assistant_text_thread::TextThreadStore>,
-        prompt_store: Option<Entity<PromptStore>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let fs = workspace.app_state().fs.clone();
-        let user_store = workspace.app_state().user_store.clone();
-        let project = workspace.project();
-        let language_registry = project.read(cx).languages().clone();
-        let client = workspace.client().clone();
-        let workspace = workspace.weak_handle();
-
-        let context_server_registry =
-            cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
-
-        let history_store = cx.new(|cx| agent::HistoryStore::new(text_thread_store.clone(), cx));
-        let acp_history = cx.new(|cx| AcpThreadHistory::new(history_store.clone(), window, cx));
-        cx.subscribe_in(
-            &acp_history,
-            window,
-            |this, _, event, window, cx| match event {
-                ThreadHistoryEvent::Open(HistoryEntry::AcpThread(thread)) => {
-                    this.external_thread(
-                        Some(crate::ExternalAgent::NativeAgent),
-                        Some(thread.clone()),
-                        None,
-                        window,
-                        cx,
-                    );
-                }
-                ThreadHistoryEvent::Open(HistoryEntry::TextThread(thread)) => {
-                    this.open_saved_text_thread(thread.path.clone(), window, cx)
-                        .detach_and_log_err(cx);
-                }
-            },
-        )
-        .detach();
-
-        let panel_type = AgentSettings::get_global(cx).default_view;
-        let active_view = match panel_type {
-            DefaultView::Thread => ActiveView::native_agent(
-                fs.clone(),
-                prompt_store.clone(),
-                history_store.clone(),
-                project.clone(),
-                workspace.clone(),
-                window,
-                cx,
-            ),
-            DefaultView::TextThread => {
-                let context = text_thread_store.update(cx, |store, cx| store.create(cx));
-                let lsp_adapter_delegate = make_lsp_adapter_delegate(&project.clone(), cx).unwrap();
-                let text_thread_editor = cx.new(|cx| {
-                    let mut editor = TextThreadEditor::for_text_thread(
-                        context,
-                        fs.clone(),
-                        workspace.clone(),
-                        project.clone(),
-                        lsp_adapter_delegate,
-                        window,
-                        cx,
-                    );
-                    editor.insert_default_prompt(window, cx);
-                    editor
-                });
-                ActiveView::text_thread(
-                    text_thread_editor,
-                    history_store.clone(),
-                    language_registry.clone(),
-                    window,
-                    cx,
-                )
-            }
-        };
-
-        let weak_panel = cx.entity().downgrade();
-
-        window.defer(cx, move |window, cx| {
-            let panel = weak_panel.clone();
-            let agent_navigation_menu =
-                ContextMenu::build_persistent(window, cx, move |mut menu, _window, cx| {
-                    if let Some(panel) = panel.upgrade() {
-                        menu = Self::populate_recently_opened_menu_section(menu, panel, cx);
-                    }
-
-                    menu = menu
-                        .action("View All", Box::new(OpenHistory))
-                        .fixed_width(px(320.).into())
-                        .keep_open_on_confirm(false)
-                        .key_context("NavigationMenu");
-
-                    menu
-                });
-            weak_panel
-                .update(cx, |panel, cx| {
-                    cx.subscribe_in(
-                        &agent_navigation_menu,
-                        window,
-                        |_, menu, _: &DismissEvent, window, cx| {
-                            menu.update(cx, |menu, _| {
-                                menu.clear_selected();
-                            });
-                            cx.focus_self(window);
-                        },
-                    )
-                    .detach();
-                    panel.agent_navigation_menu = Some(agent_navigation_menu);
-                })
-                .ok();
-        });
-
-        let onboarding = cx.new(|cx| {
-            AgentPanelOnboarding::new(
-                user_store.clone(),
-                client,
-                |_window, cx| {
-                    OnboardingUpsell::set_dismissed(true, cx);
-                },
-                cx,
-            )
-        });
-
-        // Subscribe to extension events to sync agent servers when extensions change
-        let extension_subscription = if let Some(extension_events) = ExtensionEvents::try_global(cx)
-        {
-            Some(
-                cx.subscribe(&extension_events, |this, _source, event, cx| match event {
-                    extension::Event::ExtensionInstalled(_)
-                    | extension::Event::ExtensionUninstalled(_)
-                    | extension::Event::ExtensionsInstalledChanged => {
-                        this.sync_agent_servers_from_extensions(cx);
-                    }
-                    _ => {}
-                }),
-            )
-        } else {
-            None
-        };
-
-        let mut panel = Self {
-            active_view,
-            workspace,
-            user_store,
-            project: project.clone(),
-            fs: fs.clone(),
-            language_registry,
-            text_thread_store,
-            prompt_store,
-            configuration: None,
-            configuration_subscription: None,
-            context_server_registry,
-            previous_view: None,
-            new_thread_menu_handle: PopoverMenuHandle::default(),
-            agent_panel_menu_handle: PopoverMenuHandle::default(),
-            agent_navigation_menu_handle: PopoverMenuHandle::default(),
-            agent_navigation_menu: None,
-            _extension_subscription: extension_subscription,
-            width: None,
-            height: None,
-            zoomed: false,
-            pending_serialization: None,
-            onboarding,
-            acp_history,
-            history_store,
-            selected_agent: AgentType::default(),
-            loading: false,
-        };
-
-        // Initial sync of agent servers from extensions
-        panel.sync_agent_servers_from_extensions(cx);
-        panel
-    }
-
-    pub fn toggle_focus(
-        workspace: &mut Workspace,
-        _: &ToggleFocus,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        if workspace
-            .panel::<Self>(cx)
-            .is_some_and(|panel| panel.read(cx).enabled(cx))
-        {
-            workspace.toggle_panel_focus::<Self>(window, cx);
-        }
-    }
-
-    pub(crate) fn prompt_store(&self) -> &Option<Entity<PromptStore>> {
-        &self.prompt_store
-    }
-
-    pub(crate) fn thread_store(&self) -> &Entity<HistoryStore> {
-        &self.history_store
-    }
-
-    pub(crate) fn context_server_registry(&self) -> &Entity<ContextServerRegistry> {
-        &self.context_server_registry
-    }
-
-    pub fn is_hidden(workspace: &Entity<Workspace>, cx: &App) -> bool {
-        let workspace_read = workspace.read(cx);
-
-        workspace_read
-            .panel::<AgentPanel>(cx)
-            .map(|panel| {
-                let panel_id = Entity::entity_id(&panel);
-
-                let is_visible = workspace_read.all_docks().iter().any(|dock| {
-                    dock.read(cx)
-                        .visible_panel()
-                        .is_some_and(|visible_panel| visible_panel.panel_id() == panel_id)
-                });
-
-                !is_visible
-            })
-            .unwrap_or(true)
-    }
-
-    fn active_thread_view(&self) -> Option<&Entity<AcpThreadView>> {
-        match &self.active_view {
-            ActiveView::ExternalAgentThread { thread_view, .. } => Some(thread_view),
-            ActiveView::TextThread { .. } | ActiveView::History | ActiveView::Configuration => None,
-        }
-    }
-
-    fn new_thread(&mut self, _action: &NewThread, window: &mut Window, cx: &mut Context<Self>) {
-        self.new_agent_thread(AgentType::NativeAgent, window, cx);
-    }
-
-    fn new_native_agent_thread_from_summary(
-        &mut self,
-        action: &NewNativeAgentThreadFromSummary,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(thread) = self
-            .history_store
-            .read(cx)
-            .thread_from_session_id(&action.from_session_id)
-        else {
-            return;
-        };
-
-        self.external_thread(
-            Some(ExternalAgent::NativeAgent),
-            None,
-            Some(thread.clone()),
-            window,
-            cx,
-        );
-    }
-
-    fn new_text_thread(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        telemetry::event!("Agent Thread Started", agent = "zed-text");
-
-        let context = self
-            .text_thread_store
-            .update(cx, |context_store, cx| context_store.create(cx));
-        let lsp_adapter_delegate = make_lsp_adapter_delegate(&self.project, cx)
-            .log_err()
-            .flatten();
-
-        let text_thread_editor = cx.new(|cx| {
-            let mut editor = TextThreadEditor::for_text_thread(
-                context,
-                self.fs.clone(),
-                self.workspace.clone(),
-                self.project.clone(),
-                lsp_adapter_delegate,
-                window,
-                cx,
-            );
-            editor.insert_default_prompt(window, cx);
-            editor
-        });
-
-        if self.selected_agent != AgentType::TextThread {
-            self.selected_agent = AgentType::TextThread;
-            self.serialize(cx);
-        }
-
-        self.set_active_view(
-            ActiveView::text_thread(
-                text_thread_editor.clone(),
-                self.history_store.clone(),
-                self.language_registry.clone(),
-                window,
-                cx,
-            ),
-            true,
-            window,
-            cx,
-        );
-        text_thread_editor.focus_handle(cx).focus(window);
-    }
-
-    fn external_thread(
-        &mut self,
-        agent_choice: Option<crate::ExternalAgent>,
-        resume_thread: Option<DbThreadMetadata>,
-        summarize_thread: Option<DbThreadMetadata>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let workspace = self.workspace.clone();
-        let project = self.project.clone();
-        let fs = self.fs.clone();
-        let is_via_collab = self.project.read(cx).is_via_collab();
-
-        const LAST_USED_EXTERNAL_AGENT_KEY: &str = "agent_panel__last_used_external_agent";
-
-        #[derive(Serialize, Deserialize)]
-        struct LastUsedExternalAgent {
-            agent: crate::ExternalAgent,
-        }
-
-        let loading = self.loading;
-        let history = self.history_store.clone();
-
-        cx.spawn_in(window, async move |this, cx| {
-            let ext_agent = match agent_choice {
-                Some(agent) => {
-                    cx.background_spawn({
-                        let agent = agent.clone();
-                        async move {
-                            if let Some(serialized) =
-                                serde_json::to_string(&LastUsedExternalAgent { agent }).log_err()
-                            {
-                                KEY_VALUE_STORE
-                                    .write_kvp(LAST_USED_EXTERNAL_AGENT_KEY.to_string(), serialized)
-                                    .await
-                                    .log_err();
-                            }
-                        }
-                    })
-                    .detach();
-
-                    agent
-                }
-                None => {
-                    if is_via_collab {
-                        ExternalAgent::NativeAgent
-                    } else {
-                        cx.background_spawn(async move {
-                            KEY_VALUE_STORE.read_kvp(LAST_USED_EXTERNAL_AGENT_KEY)
-                        })
-                        .await
-                        .log_err()
-                        .flatten()
-                        .and_then(|value| {
-                            serde_json::from_str::<LastUsedExternalAgent>(&value).log_err()
-                        })
-                        .map(|agent| agent.agent)
-                        .unwrap_or(ExternalAgent::NativeAgent)
-                    }
-                }
-            };
-
-            let server = ext_agent.server(fs, history);
-
-            this.update_in(cx, |this, window, cx| {
-                let selected_agent = ext_agent.into();
-                if this.selected_agent != selected_agent {
-                    this.selected_agent = selected_agent;
-                    this.serialize(cx);
-                }
-
-                let thread_view = cx.new(|cx| {
-                    crate::acp::AcpThreadView::new(
-                        server,
-                        resume_thread,
-                        summarize_thread,
-                        workspace.clone(),
-                        project,
-                        this.history_store.clone(),
-                        this.prompt_store.clone(),
-                        !loading,
-                        window,
-                        cx,
-                    )
-                });
-
-                this.set_active_view(
-                    ActiveView::ExternalAgentThread { thread_view },
-                    !loading,
-                    window,
-                    cx,
-                );
-            })
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn deploy_rules_library(
-        &mut self,
-        action: &OpenRulesLibrary,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        open_rules_library(
-            self.language_registry.clone(),
-            Box::new(PromptLibraryInlineAssist::new(self.workspace.clone())),
-            Rc::new(|| {
-                Rc::new(SlashCommandCompletionProvider::new(
-                    Arc::new(SlashCommandWorkingSet::default()),
-                    None,
-                    None,
-                ))
-            }),
-            action
-                .prompt_to_select
-                .map(|uuid| UserPromptId(uuid).into()),
-            cx,
-        )
-        .detach_and_log_err(cx);
-    }
-
-    fn expand_message_editor(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(thread_view) = self.active_thread_view() {
-            thread_view.update(cx, |view, cx| {
-                view.expand_message_editor(&ExpandMessageEditor, window, cx);
-                view.focus_handle(cx).focus(window);
-            });
-        }
-    }
-
-    fn open_history(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if matches!(self.active_view, ActiveView::History) {
-            if let Some(previous_view) = self.previous_view.take() {
-                self.set_active_view(previous_view, true, window, cx);
-            }
-        } else {
-            self.set_active_view(ActiveView::History, true, window, cx);
-        }
-        cx.notify();
-    }
-
-    pub(crate) fn open_saved_text_thread(
-        &mut self,
-        path: Arc<Path>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let text_thread_task = self
-            .history_store
-            .update(cx, |store, cx| store.load_text_thread(path, cx));
-        cx.spawn_in(window, async move |this, cx| {
-            let text_thread = text_thread_task.await?;
-            this.update_in(cx, |this, window, cx| {
-                this.open_text_thread(text_thread, window, cx);
-            })
-        })
-    }
-
-    pub(crate) fn open_text_thread(
-        &mut self,
-        text_thread: Entity<TextThread>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let lsp_adapter_delegate = make_lsp_adapter_delegate(&self.project.clone(), cx)
-            .log_err()
-            .flatten();
-        let editor = cx.new(|cx| {
-            TextThreadEditor::for_text_thread(
-                text_thread,
-                self.fs.clone(),
-                self.workspace.clone(),
-                self.project.clone(),
-                lsp_adapter_delegate,
-                window,
-                cx,
-            )
-        });
-
-        if self.selected_agent != AgentType::TextThread {
-            self.selected_agent = AgentType::TextThread;
-            self.serialize(cx);
-        }
-
-        self.set_active_view(
-            ActiveView::text_thread(
-                editor,
-                self.history_store.clone(),
-                self.language_registry.clone(),
-                window,
-                cx,
-            ),
-            true,
-            window,
-            cx,
-        );
-    }
-
-    pub fn go_back(&mut self, _: &workspace::GoBack, window: &mut Window, cx: &mut Context<Self>) {
-        match self.active_view {
-            ActiveView::Configuration | ActiveView::History => {
-                if let Some(previous_view) = self.previous_view.take() {
-                    self.active_view = previous_view;
-
-                    match &self.active_view {
-                        ActiveView::ExternalAgentThread { thread_view } => {
-                            thread_view.focus_handle(cx).focus(window);
-                        }
-                        ActiveView::TextThread {
-                            text_thread_editor, ..
-                        } => {
-                            text_thread_editor.focus_handle(cx).focus(window);
-                        }
-                        ActiveView::History | ActiveView::Configuration => {}
-                    }
-                }
-                cx.notify();
-            }
-            _ => {}
-        }
-    }
-
-    pub fn toggle_navigation_menu(
-        &mut self,
-        _: &ToggleNavigationMenu,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.agent_navigation_menu_handle.toggle(window, cx);
-    }
-
-    pub fn toggle_options_menu(
-        &mut self,
-        _: &ToggleOptionsMenu,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.agent_panel_menu_handle.toggle(window, cx);
-    }
-
-    pub fn toggle_new_thread_menu(
-        &mut self,
-        _: &ToggleNewThreadMenu,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.new_thread_menu_handle.toggle(window, cx);
-    }
-
-    pub fn increase_font_size(
-        &mut self,
-        action: &IncreaseBufferFontSize,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.handle_font_size_action(action.persist, px(1.0), cx);
-    }
-
-    pub fn decrease_font_size(
-        &mut self,
-        action: &DecreaseBufferFontSize,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.handle_font_size_action(action.persist, px(-1.0), cx);
-    }
-
-    fn handle_font_size_action(&mut self, persist: bool, delta: Pixels, cx: &mut Context<Self>) {
-        match self.active_view.which_font_size_used() {
-            WhichFontSize::AgentFont => {
-                if persist {
-                    update_settings_file(self.fs.clone(), cx, move |settings, cx| {
-                        let agent_ui_font_size =
-                            ThemeSettings::get_global(cx).agent_ui_font_size(cx) + delta;
-                        let agent_buffer_font_size =
-                            ThemeSettings::get_global(cx).agent_buffer_font_size(cx) + delta;
-
-                        let _ = settings
-                            .theme
-                            .agent_ui_font_size
-                            .insert(theme::clamp_font_size(agent_ui_font_size).into());
-                        let _ = settings
-                            .theme
-                            .agent_buffer_font_size
-                            .insert(theme::clamp_font_size(agent_buffer_font_size).into());
-                    });
-                } else {
-                    theme::adjust_agent_ui_font_size(cx, |size| size + delta);
-                    theme::adjust_agent_buffer_font_size(cx, |size| size + delta);
-                }
-            }
-            WhichFontSize::BufferFont => {
-                // Prompt editor uses the buffer font size, so allow the action to propagate to the
-                // default handler that changes that font size.
-                cx.propagate();
-            }
-            WhichFontSize::None => {}
-        }
-    }
-
-    pub fn reset_font_size(
-        &mut self,
-        action: &ResetBufferFontSize,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if action.persist {
-            update_settings_file(self.fs.clone(), cx, move |settings, _| {
-                settings.theme.agent_ui_font_size = None;
-                settings.theme.agent_buffer_font_size = None;
-            });
-        } else {
-            theme::reset_agent_ui_font_size(cx);
-            theme::reset_agent_buffer_font_size(cx);
-        }
-    }
-
-    pub fn reset_agent_zoom(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
-        theme::reset_agent_ui_font_size(cx);
-        theme::reset_agent_buffer_font_size(cx);
-    }
-
-    pub fn toggle_zoom(&mut self, _: &ToggleZoom, window: &mut Window, cx: &mut Context<Self>) {
-        if self.zoomed {
-            cx.emit(PanelEvent::ZoomOut);
-        } else {
-            if !self.focus_handle(cx).contains_focused(window, cx) {
-                cx.focus_self(window);
-            }
-            cx.emit(PanelEvent::ZoomIn);
-        }
-    }
-
-    pub(crate) fn open_configuration(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let agent_server_store = self.project.read(cx).agent_server_store().clone();
-        let context_server_store = self.project.read(cx).context_server_store();
-        let fs = self.fs.clone();
-
-        self.set_active_view(ActiveView::Configuration, true, window, cx);
-        self.configuration = Some(cx.new(|cx| {
-            AgentConfiguration::new(
-                fs,
-                agent_server_store,
-                context_server_store,
-                self.context_server_registry.clone(),
-                self.language_registry.clone(),
-                self.workspace.clone(),
-                window,
-                cx,
-            )
-        }));
-
-        if let Some(configuration) = self.configuration.as_ref() {
-            self.configuration_subscription = Some(cx.subscribe_in(
-                configuration,
-                window,
-                Self::handle_agent_configuration_event,
-            ));
-
-            configuration.focus_handle(cx).focus(window);
-        }
-    }
-
-    pub(crate) fn open_active_thread_as_markdown(
-        &mut self,
-        _: &OpenActiveThreadAsMarkdown,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(workspace) = self.workspace.upgrade() else {
-            return;
-        };
-
-        match &self.active_view {
-            ActiveView::ExternalAgentThread { thread_view } => {
-                thread_view
-                    .update(cx, |thread_view, cx| {
-                        thread_view.open_thread_as_markdown(workspace, window, cx)
-                    })
-                    .detach_and_log_err(cx);
-            }
-            ActiveView::TextThread { .. } | ActiveView::History | ActiveView::Configuration => {}
-        }
-    }
-
-    fn handle_agent_configuration_event(
-        &mut self,
-        _entity: &Entity<AgentConfiguration>,
-        event: &AssistantConfigurationEvent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            AssistantConfigurationEvent::NewThread(provider) => {
-                if LanguageModelRegistry::read_global(cx)
-                    .default_model()
-                    .is_none_or(|model| model.provider.id() != provider.id())
-                    && let Some(model) = provider.default_model(cx)
-                {
-                    update_settings_file(self.fs.clone(), cx, move |settings, _| {
-                        let provider = model.provider_id().0.to_string();
-                        let model = model.id().0.to_string();
-                        settings
-                            .agent
-                            .get_or_insert_default()
-                            .set_model(LanguageModelSelection {
-                                provider: LanguageModelProviderSetting(provider),
-                                model,
-                            })
-                    });
-                }
-
-                self.new_thread(&NewThread, window, cx);
-                if let Some((thread, model)) = self
-                    .active_native_agent_thread(cx)
-                    .zip(provider.default_model(cx))
-                {
-                    thread.update(cx, |thread, cx| {
-                        thread.set_model(model, cx);
-                    });
-                }
-            }
-        }
-    }
-
-    pub(crate) fn active_agent_thread(&self, cx: &App) -> Option<Entity<AcpThread>> {
-        match &self.active_view {
-            ActiveView::ExternalAgentThread { thread_view, .. } => {
-                thread_view.read(cx).thread().cloned()
-            }
-            _ => None,
-        }
-    }
-
-    pub(crate) fn active_native_agent_thread(&self, cx: &App) -> Option<Entity<agent::Thread>> {
-        match &self.active_view {
-            ActiveView::ExternalAgentThread { thread_view, .. } => {
-                thread_view.read(cx).as_native_thread(cx)
-            }
-            _ => None,
-        }
-    }
-
-    pub(crate) fn active_text_thread_editor(&self) -> Option<Entity<TextThreadEditor>> {
-        match &self.active_view {
-            ActiveView::TextThread {
-                text_thread_editor, ..
-            } => Some(text_thread_editor.clone()),
-            _ => None,
-        }
-    }
-
-    fn set_active_view(
-        &mut self,
-        new_view: ActiveView,
-        focus: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let current_is_history = matches!(self.active_view, ActiveView::History);
-        let new_is_history = matches!(new_view, ActiveView::History);
-
-        let current_is_config = matches!(self.active_view, ActiveView::Configuration);
-        let new_is_config = matches!(new_view, ActiveView::Configuration);
-
-        let current_is_special = current_is_history || current_is_config;
-        let new_is_special = new_is_history || new_is_config;
-
-        match &new_view {
-            ActiveView::TextThread {
-                text_thread_editor, ..
-            } => self.history_store.update(cx, |store, cx| {
-                if let Some(path) = text_thread_editor.read(cx).text_thread().read(cx).path() {
-                    store.push_recently_opened_entry(
-                        agent::HistoryEntryId::TextThread(path.clone()),
-                        cx,
-                    )
-                }
-            }),
-            ActiveView::ExternalAgentThread { .. } => {}
-            ActiveView::History | ActiveView::Configuration => {}
-        }
-
-        if current_is_special && !new_is_special {
-            self.active_view = new_view;
-        } else if !current_is_special && new_is_special {
-            self.previous_view = Some(std::mem::replace(&mut self.active_view, new_view));
-        } else {
-            if !new_is_special {
-                self.previous_view = None;
-            }
-            self.active_view = new_view;
-        }
-
-        if focus {
-            self.focus_handle(cx).focus(window);
-        }
-    }
-
-    fn populate_recently_opened_menu_section(
-        mut menu: ContextMenu,
-        panel: Entity<Self>,
-        cx: &mut Context<ContextMenu>,
-    ) -> ContextMenu {
-        let entries = panel
-            .read(cx)
-            .history_store
-            .read(cx)
-            .recently_opened_entries(cx);
-
-        if entries.is_empty() {
-            return menu;
-        }
-
-        menu = menu.header("Recently Opened");
-
-        for entry in entries {
-            let title = entry.title().clone();
-
-            menu = menu.entry_with_end_slot_on_hover(
-                title,
-                None,
-                {
-                    let panel = panel.downgrade();
-                    let entry = entry.clone();
-                    move |window, cx| {
-                        let entry = entry.clone();
-                        panel
-                            .update(cx, move |this, cx| match &entry {
-                                agent::HistoryEntry::AcpThread(entry) => this.external_thread(
-                                    Some(ExternalAgent::NativeAgent),
-                                    Some(entry.clone()),
-                                    None,
-                                    window,
-                                    cx,
-                                ),
-                                agent::HistoryEntry::TextThread(entry) => this
-                                    .open_saved_text_thread(entry.path.clone(), window, cx)
-                                    .detach_and_log_err(cx),
-                            })
-                            .ok();
-                    }
-                },
-                IconName::Close,
-                "Close Entry".into(),
-                {
-                    let panel = panel.downgrade();
-                    let id = entry.id();
-                    move |_window, cx| {
-                        panel
-                            .update(cx, |this, cx| {
-                                this.history_store.update(cx, |history_store, cx| {
-                                    history_store.remove_recently_opened_entry(&id, cx);
-                                });
-                            })
-                            .ok();
-                    }
-                },
-            );
-        }
-
-        menu = menu.separator();
-
-        menu
-    }
-
-    pub fn selected_agent(&self) -> AgentType {
-        self.selected_agent.clone()
-    }
-
-    fn sync_agent_servers_from_extensions(&mut self, cx: &mut Context<Self>) {
-        if let Some(extension_store) = ExtensionStore::try_global(cx) {
-            let (manifests, extensions_dir) = {
-                let store = extension_store.read(cx);
-                let installed = store.installed_extensions();
-                let manifests: Vec<_> = installed
-                    .iter()
-                    .map(|(id, entry)| (id.clone(), entry.manifest.clone()))
-                    .collect();
-                let extensions_dir = paths::extensions_dir().join("installed");
-                (manifests, extensions_dir)
-            };
-
-            self.project.update(cx, |project, cx| {
-                project.agent_server_store().update(cx, |store, cx| {
-                    let manifest_refs: Vec<_> = manifests
-                        .iter()
-                        .map(|(id, manifest)| (id.as_ref(), manifest.as_ref()))
-                        .collect();
-                    store.sync_extension_agents(manifest_refs, extensions_dir, cx);
-                });
-            });
-        }
-    }
-
-    pub fn new_agent_thread(
-        &mut self,
-        agent: AgentType,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        match agent {
-            AgentType::TextThread => {
-                window.dispatch_action(NewTextThread.boxed_clone(), cx);
-            }
-            AgentType::NativeAgent => self.external_thread(
-                Some(crate::ExternalAgent::NativeAgent),
-                None,
-                None,
-                window,
-                cx,
-            ),
-            AgentType::Gemini => {
-                self.external_thread(Some(crate::ExternalAgent::Gemini), None, None, window, cx)
-            }
-            AgentType::ClaudeCode => {
-                self.selected_agent = AgentType::ClaudeCode;
-                self.serialize(cx);
-                self.external_thread(
-                    Some(crate::ExternalAgent::ClaudeCode),
-                    None,
-                    None,
-                    window,
-                    cx,
-                )
-            }
-            AgentType::Codex => {
-                self.selected_agent = AgentType::Codex;
-                self.serialize(cx);
-                self.external_thread(Some(crate::ExternalAgent::Codex), None, None, window, cx)
-            }
-            AgentType::Custom { name } => self.external_thread(
-                Some(crate::ExternalAgent::Custom { name }),
-                None,
-                None,
-                window,
-                cx,
-            ),
-        }
-    }
-
-    pub fn load_agent_thread(
-        &mut self,
-        thread: DbThreadMetadata,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.external_thread(
-            Some(ExternalAgent::NativeAgent),
-            Some(thread),
-            None,
-            window,
-            cx,
-        );
-    }
-}
-
-impl Focusable for AgentPanel {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        match &self.active_view {
-            ActiveView::ExternalAgentThread { thread_view, .. } => thread_view.focus_handle(cx),
-            ActiveView::History => self.acp_history.focus_handle(cx),
-            ActiveView::TextThread {
-                text_thread_editor, ..
-            } => text_thread_editor.focus_handle(cx),
-            ActiveView::Configuration => {
-                if let Some(configuration) = self.configuration.as_ref() {
-                    configuration.focus_handle(cx)
-                } else {
-                    cx.focus_handle()
-                }
-            }
-        }
-    }
-}
-
-fn agent_panel_dock_position(cx: &App) -> DockPosition {
-    AgentSettings::get_global(cx).dock.into()
-}
-
-impl EventEmitter<PanelEvent> for AgentPanel {}
-
-impl Panel for AgentPanel {
-    fn persistent_name() -> &'static str {
-        "AgentPanel"
-    }
-
-    fn panel_key() -> &'static str {
-        AGENT_PANEL_KEY
-    }
-
-    fn position(&self, _window: &Window, cx: &App) -> DockPosition {
-        agent_panel_dock_position(cx)
-    }
-
-    fn position_is_valid(&self, position: DockPosition) -> bool {
-        position != DockPosition::Bottom
-    }
-
-    fn set_position(&mut self, position: DockPosition, _: &mut Window, cx: &mut Context<Self>) {
-        settings::update_settings_file(self.fs.clone(), cx, move |settings, _| {
-            settings
-                .agent
-                .get_or_insert_default()
-                .set_dock(position.into());
-        });
-    }
-
-    fn size(&self, window: &Window, cx: &App) -> Pixels {
-        let settings = AgentSettings::get_global(cx);
-        match self.position(window, cx) {
-            DockPosition::Left | DockPosition::Right => {
-                self.width.unwrap_or(settings.default_width)
-            }
-            DockPosition::Bottom => self.height.unwrap_or(settings.default_height),
-        }
-    }
-
-    fn set_size(&mut self, size: Option<Pixels>, window: &mut Window, cx: &mut Context<Self>) {
-        match self.position(window, cx) {
-            DockPosition::Left | DockPosition::Right => self.width = size,
-            DockPosition::Bottom => self.height = size,
-        }
-        self.serialize(cx);
-        cx.notify();
-    }
-
-    fn set_active(&mut self, _active: bool, _window: &mut Window, _cx: &mut Context<Self>) {}
-
-    fn remote_id() -> Option<proto::PanelId> {
-        Some(proto::PanelId::AssistantPanel)
-    }
-
-    fn icon(&self, _window: &Window, cx: &App) -> Option<IconName> {
-        (self.enabled(cx) && AgentSettings::get_global(cx).button).then_some(IconName::ZedAssistant)
-    }
-
-    fn icon_tooltip(&self, _window: &Window, _cx: &App) -> Option<&'static str> {
-        Some("Agent Panel")
-    }
-
-    fn toggle_action(&self) -> Box<dyn Action> {
-        Box::new(ToggleFocus)
-    }
-
-    fn activation_priority(&self) -> u32 {
-        3
-    }
-
-    fn enabled(&self, cx: &App) -> bool {
-        AgentSettings::get_global(cx).enabled(cx)
-    }
-
-    fn is_zoomed(&self, _window: &Window, _cx: &App) -> bool {
-        self.zoomed
-    }
-
-    fn set_zoomed(&mut self, zoomed: bool, _window: &mut Window, cx: &mut Context<Self>) {
-        self.zoomed = zoomed;
-        cx.notify();
-    }
-}
-
-impl AgentPanel {
-    fn render_title_view(&self, _window: &mut Window, cx: &Context<Self>) -> AnyElement {
-        const LOADING_SUMMARY_PLACEHOLDER: &str = "Loading Summary…";
-
-        let content = match &self.active_view {
-            ActiveView::ExternalAgentThread { thread_view } => {
-                if let Some(title_editor) = thread_view.read(cx).title_editor() {
-                    div()
-                        .w_full()
-                        .on_action({
-                            let thread_view = thread_view.downgrade();
-                            move |_: &menu::Confirm, window, cx| {
-                                if let Some(thread_view) = thread_view.upgrade() {
-                                    thread_view.focus_handle(cx).focus(window);
-                                }
-                            }
-                        })
-                        .on_action({
-                            let thread_view = thread_view.downgrade();
-                            move |_: &editor::actions::Cancel, window, cx| {
-                                if let Some(thread_view) = thread_view.upgrade() {
-                                    thread_view.focus_handle(cx).focus(window);
-                                }
-                            }
-                        })
-                        .child(title_editor)
-                        .into_any_element()
-                } else {
-                    Label::new(thread_view.read(cx).title(cx))
-                        .color(Color::Muted)
-                        .truncate()
-                        .into_any_element()
-                }
-            }
-            ActiveView::TextThread {
-                title_editor,
-                text_thread_editor,
-                ..
-            } => {
-                let summary = text_thread_editor.read(cx).text_thread().read(cx).summary();
-
-                match summary {
-                    TextThreadSummary::Pending => Label::new(TextThreadSummary::DEFAULT)
-                        .color(Color::Muted)
-                        .truncate()
-                        .into_any_element(),
-                    TextThreadSummary::Content(summary) => {
-                        if summary.done {
-                            div()
-                                .w_full()
-                                .child(title_editor.clone())
-                                .into_any_element()
-                        } else {
-                            Label::new(LOADING_SUMMARY_PLACEHOLDER)
-                                .truncate()
-                                .color(Color::Muted)
-                                .into_any_element()
-                        }
-                    }
-                    TextThreadSummary::Error => h_flex()
-                        .w_full()
-                        .child(title_editor.clone())
-                        .child(
-                            IconButton::new("retry-summary-generation", IconName::RotateCcw)
-                                .icon_size(IconSize::Small)
-                                .on_click({
-                                    let text_thread_editor = text_thread_editor.clone();
-                                    move |_, _window, cx| {
-                                        text_thread_editor.update(cx, |text_thread_editor, cx| {
-                                            text_thread_editor.regenerate_summary(cx);
-                                        });
-                                    }
-                                })
-                                .tooltip(move |_window, cx| {
-                                    cx.new(|_| {
-                                        Tooltip::new("Failed to generate title")
-                                            .meta("Click to try again")
-                                    })
-                                    .into()
-                                }),
-                        )
-                        .into_any_element(),
-                }
-            }
-            ActiveView::History => Label::new("History").truncate().into_any_element(),
-            ActiveView::Configuration => Label::new("Settings").truncate().into_any_element(),
-        };
-
-        h_flex()
-            .key_context("TitleEditor")
-            .id("TitleEditor")
-            .flex_grow()
-            .w_full()
-            .max_w_full()
-            .overflow_x_scroll()
-            .child(content)
-            .into_any()
-    }
-
-    fn render_panel_options_menu(
-        &self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let user_store = self.user_store.read(cx);
-        let usage = user_store.model_request_usage();
-        let account_url = zed_urls::account_url(cx);
-
-        let focus_handle = self.focus_handle(cx);
-
-        let full_screen_label = if self.is_zoomed(window, cx) {
-            "Disable Full Screen"
-        } else {
-            "Enable Full Screen"
-        };
-
-        let selected_agent = self.selected_agent.clone();
-
-        PopoverMenu::new("agent-options-menu")
-            .trigger_with_tooltip(
-                IconButton::new("agent-options-menu", IconName::Ellipsis)
-                    .icon_size(IconSize::Small),
-                {
-                    let focus_handle = focus_handle.clone();
-                    move |_window, cx| {
-                        Tooltip::for_action_in(
-                            "Toggle Agent Menu",
-                            &ToggleOptionsMenu,
-                            &focus_handle,
-                            cx,
-                        )
-                    }
-                },
-            )
-            .anchor(Corner::TopRight)
-            .with_handle(self.agent_panel_menu_handle.clone())
-            .menu({
-                move |window, cx| {
-                    Some(ContextMenu::build(window, cx, |mut menu, _window, _| {
-                        menu = menu.context(focus_handle.clone());
-                        if let Some(usage) = usage {
-                            menu = menu
-                                .header_with_link("Prompt Usage", "Manage", account_url.clone())
-                                .custom_entry(
-                                    move |_window, cx| {
-                                        let used_percentage = match usage.limit {
-                                            UsageLimit::Limited(limit) => {
-                                                Some((usage.amount as f32 / limit as f32) * 100.)
-                                            }
-                                            UsageLimit::Unlimited => None,
-                                        };
-
-                                        h_flex()
-                                            .flex_1()
-                                            .gap_1p5()
-                                            .children(used_percentage.map(|percent| {
-                                                ProgressBar::new("usage", percent, 100., cx)
-                                            }))
-                                            .child(
-                                                Label::new(match usage.limit {
-                                                    UsageLimit::Limited(limit) => {
-                                                        format!("{} / {limit}", usage.amount)
-                                                    }
-                                                    UsageLimit::Unlimited => {
-                                                        format!("{} / ∞", usage.amount)
-                                                    }
-                                                })
-                                                .size(LabelSize::Small)
-                                                .color(Color::Muted),
-                                            )
-                                            .into_any_element()
-                                    },
-                                    move |_, cx| cx.open_url(&zed_urls::account_url(cx)),
-                                )
-                                .separator()
-                        }
-
-                        menu = menu
-                            .header("MCP Servers")
-                            .action(
-                                "View Server Extensions",
-                                Box::new(zed_actions::Extensions {
-                                    category_filter: Some(
-                                        zed_actions::ExtensionCategoryFilter::ContextServers,
-                                    ),
-                                    id: None,
-                                }),
-                            )
-                            .action("Add Custom Server…", Box::new(AddContextServer))
-                            .separator()
-                            .action("Rules", Box::new(OpenRulesLibrary::default()))
-                            .action("Profiles", Box::new(ManageProfiles::default()))
-                            .action("Settings", Box::new(OpenSettings))
-                            .separator()
-                            .action(full_screen_label, Box::new(ToggleZoom));
-
-                        if selected_agent == AgentType::Gemini {
-                            menu = menu.action("Reauthenticate", Box::new(ReauthenticateAgent))
-                        }
-
-                        menu
-                    }))
-                }
-            })
-    }
-
-    fn render_recent_entries_menu(
-        &self,
-        icon: IconName,
-        corner: Corner,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let focus_handle = self.focus_handle(cx);
-
-        PopoverMenu::new("agent-nav-menu")
-            .trigger_with_tooltip(
-                IconButton::new("agent-nav-menu", icon).icon_size(IconSize::Small),
-                {
-                    move |_window, cx| {
-                        Tooltip::for_action_in(
-                            "Toggle Recent Threads",
-                            &ToggleNavigationMenu,
-                            &focus_handle,
-                            cx,
-                        )
-                    }
-                },
-            )
-            .anchor(corner)
-            .with_handle(self.agent_navigation_menu_handle.clone())
-            .menu({
-                let menu = self.agent_navigation_menu.clone();
-                move |window, cx| {
-                    telemetry::event!("View Thread History Clicked");
-
-                    if let Some(menu) = menu.as_ref() {
-                        menu.update(cx, |_, cx| {
-                            cx.defer_in(window, |menu, window, cx| {
-                                menu.rebuild(window, cx);
-                            });
-                        })
-                    }
-                    menu.clone()
-                }
-            })
-    }
-
-    fn render_toolbar_back_button(&self, cx: &mut Context<Self>) -> impl IntoElement {
-        let focus_handle = self.focus_handle(cx);
-
-        IconButton::new("go-back", IconName::ArrowLeft)
-            .icon_size(IconSize::Small)
-            .on_click(cx.listener(|this, _, window, cx| {
-                this.go_back(&workspace::GoBack, window, cx);
-            }))
-            .tooltip({
-                move |_window, cx| {
-                    Tooltip::for_action_in("Go Back", &workspace::GoBack, &focus_handle, cx)
-                }
-            })
-    }
-
-    fn render_toolbar(&self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let agent_server_store = self.project.read(cx).agent_server_store().clone();
-        let focus_handle = self.focus_handle(cx);
-
-        // Get custom icon path for selected agent before building menu (to avoid borrow issues)
-        let selected_agent_custom_icon =
-            if let AgentType::Custom { name, .. } = &self.selected_agent {
-                agent_server_store
-                    .read(cx)
-                    .agent_icon(&ExternalAgentServerName(name.clone()))
-            } else {
-                None
-            };
-
-        let active_thread = match &self.active_view {
-            ActiveView::ExternalAgentThread { thread_view } => {
-                thread_view.read(cx).as_native_thread(cx)
-            }
-            ActiveView::TextThread { .. } | ActiveView::History | ActiveView::Configuration => None,
-        };
-
-        let new_thread_menu = PopoverMenu::new("new_thread_menu")
-            .trigger_with_tooltip(
-                IconButton::new("new_thread_menu_btn", IconName::Plus).icon_size(IconSize::Small),
-                {
-                    let focus_handle = focus_handle.clone();
-                    move |_window, cx| {
-                        Tooltip::for_action_in(
-                            "New Thread…",
-                            &ToggleNewThreadMenu,
-                            &focus_handle,
-                            cx,
-                        )
-                    }
-                },
-            )
-            .anchor(Corner::TopRight)
-            .with_handle(self.new_thread_menu_handle.clone())
-            .menu({
-                let selected_agent = self.selected_agent.clone();
-                let is_agent_selected = move |agent_type: AgentType| selected_agent == agent_type;
-
-                let workspace = self.workspace.clone();
-                let is_via_collab = workspace
-                    .update(cx, |workspace, cx| {
-                        workspace.project().read(cx).is_via_collab()
-                    })
-                    .unwrap_or_default();
-
-                move |window, cx| {
-                    telemetry::event!("New Thread Clicked");
-
-                    let active_thread = active_thread.clone();
-                    Some(ContextMenu::build(window, cx, |menu, _window, cx| {
-                        menu.context(focus_handle.clone())
-                            .when_some(active_thread, |this, active_thread| {
-                                let thread = active_thread.read(cx);
-
-                                if !thread.is_empty() {
-                                    let session_id = thread.id().clone();
-                                    this.item(
-                                        ContextMenuEntry::new("New From Summary")
-                                            .icon(IconName::ThreadFromSummary)
-                                            .icon_color(Color::Muted)
-                                            .handler(move |window, cx| {
-                                                window.dispatch_action(
-                                                    Box::new(NewNativeAgentThreadFromSummary {
-                                                        from_session_id: session_id.clone(),
-                                                    }),
-                                                    cx,
-                                                );
-                                            }),
-                                    )
-                                } else {
-                                    this
-                                }
-                            })
-                            .item(
-                                ContextMenuEntry::new("Zed Agent")
-                                    .when(is_agent_selected(AgentType::NativeAgent) | is_agent_selected(AgentType::TextThread) , |this| {
-                                        this.action(Box::new(NewExternalAgentThread { agent: None }))
-                                    })
-                                    .icon(IconName::ZedAgent)
-                                    .icon_color(Color::Muted)
-                                    .handler({
-                                        let workspace = workspace.clone();
-                                        move |window, cx| {
-                                            if let Some(workspace) = workspace.upgrade() {
-                                                workspace.update(cx, |workspace, cx| {
-                                                    if let Some(panel) =
-                                                        workspace.panel::<AgentPanel>(cx)
-                                                    {
-                                                        panel.update(cx, |panel, cx| {
-                                                            panel.new_agent_thread(
-                                                                AgentType::NativeAgent,
-                                                                window,
-                                                                cx,
-                                                            );
-                                                        });
-                                                    }
-                                                });
-                                            }
-                                        }
-                                    }),
-                            )
-                            .item(
-                                ContextMenuEntry::new("Text Thread")
-                                    .action(NewTextThread.boxed_clone())
-                                    .icon(IconName::TextThread)
-                                    .icon_color(Color::Muted)
-                                    .handler({
-                                        let workspace = workspace.clone();
-                                        move |window, cx| {
-                                            if let Some(workspace) = workspace.upgrade() {
-                                                workspace.update(cx, |workspace, cx| {
-                                                    if let Some(panel) =
-                                                        workspace.panel::<AgentPanel>(cx)
-                                                    {
-                                                        panel.update(cx, |panel, cx| {
-                                                            panel.new_agent_thread(
-                                                                AgentType::TextThread,
-                                                                window,
-                                                                cx,
-                                                            );
-                                                        });
-                                                    }
-                                                });
-                                            }
-                                        }
-                                    }),
-                            )
-                            .separator()
-                            .header("External Agents")
-                            .item(
-                                ContextMenuEntry::new("Claude Code")
-                                    .when(is_agent_selected(AgentType::ClaudeCode), |this| {
-                                        this.action(Box::new(NewExternalAgentThread { agent: None }))
-                                    })
-                                    .icon(IconName::AiClaude)
-                                    .disabled(is_via_collab)
-                                    .icon_color(Color::Muted)
-                                    .handler({
-                                        let workspace = workspace.clone();
-                                        move |window, cx| {
-                                            if let Some(workspace) = workspace.upgrade() {
-                                                workspace.update(cx, |workspace, cx| {
-                                                    if let Some(panel) =
-                                                        workspace.panel::<AgentPanel>(cx)
-                                                    {
-                                                        panel.update(cx, |panel, cx| {
-                                                            panel.new_agent_thread(
-                                                                AgentType::ClaudeCode,
-                                                                window,
-                                                                cx,
-                                                            );
-                                                        });
-                                                    }
-                                                });
-                                            }
-                                        }
-                                    }),
-                            )
-                            .item(
-                                ContextMenuEntry::new("Codex CLI")
-                                    .when(is_agent_selected(AgentType::Codex), |this| {
-                                        this.action(Box::new(NewExternalAgentThread { agent: None }))
-                                    })
-                                    .icon(IconName::AiOpenAi)
-                                    .disabled(is_via_collab)
-                                    .icon_color(Color::Muted)
-                                    .handler({
-                                        let workspace = workspace.clone();
-                                        move |window, cx| {
-                                            if let Some(workspace) = workspace.upgrade() {
-                                                workspace.update(cx, |workspace, cx| {
-                                                    if let Some(panel) =
-                                                        workspace.panel::<AgentPanel>(cx)
-                                                    {
-                                                        panel.update(cx, |panel, cx| {
-                                                            panel.new_agent_thread(
-                                                                AgentType::Codex,
-                                                                window,
-                                                                cx,
-                                                            );
-                                                        });
-                                                    }
-                                                });
-                                            }
-                                        }
-                                    }),
-                            )
-                            .item(
-                                ContextMenuEntry::new("Gemini CLI")
-                                    .when(is_agent_selected(AgentType::Gemini), |this| {
-                                        this.action(Box::new(NewExternalAgentThread { agent: None }))
-                                    })
-                                    .icon(IconName::AiGemini)
-                                    .icon_color(Color::Muted)
-                                    .disabled(is_via_collab)
-                                    .handler({
-                                        let workspace = workspace.clone();
-                                        move |window, cx| {
-                                            if let Some(workspace) = workspace.upgrade() {
-                                                workspace.update(cx, |workspace, cx| {
-                                                    if let Some(panel) =
-                                                        workspace.panel::<AgentPanel>(cx)
-                                                    {
-                                                        panel.update(cx, |panel, cx| {
-                                                            panel.new_agent_thread(
-                                                                AgentType::Gemini,
-                                                                window,
-                                                                cx,
-                                                            );
-                                                        });
-                                                    }
-                                                });
-                                            }
-                                        }
-                                    }),
-                            )
-                            .map(|mut menu| {
-                                let agent_server_store = agent_server_store.read(cx);
-                                let agent_names = agent_server_store
-                                    .external_agents()
-                                    .filter(|name| {
-                                        name.0 != GEMINI_NAME
-                                            && name.0 != CLAUDE_CODE_NAME
-                                            && name.0 != CODEX_NAME
-                                    })
-                                    .cloned()
-                                    .collect::<Vec<_>>();
-
-                                for agent_name in agent_names {
-                                    let icon_path = agent_server_store.agent_icon(&agent_name);
-                                    let display_name = agent_server_store
-                                        .agent_display_name(&agent_name)
-                                        .unwrap_or_else(|| agent_name.0.clone());
-
-                                    let mut entry = ContextMenuEntry::new(display_name);
-
-                                    if let Some(icon_path) = icon_path {
-                                        entry = entry.custom_icon_svg(icon_path);
-                                    } else {
-                                        entry = entry.icon(IconName::Terminal);
-                                    }
-                                    entry = entry
-                                        .when(
-                                            is_agent_selected(AgentType::Custom {
-                                                name: agent_name.0.clone(),
-                                            }),
-                                            |this| {
-                                                this.action(Box::new(NewExternalAgentThread { agent: None }))
-                                            },
-                                        )
-                                        .icon_color(Color::Muted)
-                                        .disabled(is_via_collab)
-                                        .handler({
-                                            let workspace = workspace.clone();
-                                            let agent_name = agent_name.clone();
-                                            move |window, cx| {
-                                                if let Some(workspace) = workspace.upgrade() {
-                                                    workspace.update(cx, |workspace, cx| {
-                                                        if let Some(panel) =
-                                                            workspace.panel::<AgentPanel>(cx)
-                                                        {
-                                                            panel.update(cx, |panel, cx| {
-                                                                panel.new_agent_thread(
-                                                                    AgentType::Custom {
-                                                                        name: agent_name
-                                                                            .clone()
-                                                                            .into(),
-                                                                    },
-                                                                    window,
-                                                                    cx,
-                                                                );
-                                                            });
-                                                        }
-                                                    });
-                                                }
-                                            }
-                                        });
-
-                                    menu = menu.item(entry);
-                                }
-
-                                menu
-                            })
-                            .separator()
-                            .item(
-                                ContextMenuEntry::new("Add More Agents")
-                                    .icon(IconName::Plus)
-                                    .icon_color(Color::Muted)
-                                    .handler({
-                                        move |window, cx| {
-                                            window.dispatch_action(Box::new(zed_actions::Extensions {
-                                                category_filter: Some(
-                                                    zed_actions::ExtensionCategoryFilter::AgentServers,
-                                                ),
-                                                id: None,
-                                            }), cx)
-                                        }
-                                    }),
-                            )
-                    }))
-                }
-            });
-
-        let selected_agent_label = self.selected_agent.label();
-
-        let is_thread_loading = self
-            .active_thread_view()
-            .map(|thread| thread.read(cx).is_loading())
-            .unwrap_or(false);
-
-        let has_custom_icon = selected_agent_custom_icon.is_some();
-
-        let selected_agent = div()
-            .id("selected_agent_icon")
-            .when_some(selected_agent_custom_icon, |this, icon_path| {
-                this.px_1()
-                    .child(Icon::from_external_svg(icon_path).color(Color::Muted))
-            })
-            .when(!has_custom_icon, |this| {
-                this.when_some(self.selected_agent.icon(), |this, icon| {
-                    this.px_1().child(Icon::new(icon).color(Color::Muted))
-                })
-            })
-            .tooltip(move |_, cx| {
-                Tooltip::with_meta(selected_agent_label.clone(), None, "Selected Agent", cx)
-            });
-
-        let selected_agent = if is_thread_loading {
-            selected_agent
-                .with_animation(
-                    "pulsating-icon",
-                    Animation::new(Duration::from_secs(1))
-                        .repeat()
-                        .with_easing(pulsating_between(0.2, 0.6)),
-                    |icon, delta| icon.opacity(delta),
-                )
-                .into_any_element()
-        } else {
-            selected_agent.into_any_element()
-        };
-
-        h_flex()
-            .id("agent-panel-toolbar")
-            .h(Tab::container_height(cx))
-            .max_w_full()
-            .flex_none()
-            .justify_between()
-            .gap_2()
-            .bg(cx.theme().colors().tab_bar_background)
-            .border_b_1()
-            .border_color(cx.theme().colors().border)
-            .child(
-                h_flex()
-                    .size_full()
-                    .gap(DynamicSpacing::Base04.rems(cx))
-                    .pl(DynamicSpacing::Base04.rems(cx))
-                    .child(match &self.active_view {
-                        ActiveView::History | ActiveView::Configuration => {
-                            self.render_toolbar_back_button(cx).into_any_element()
-                        }
-                        _ => selected_agent.into_any_element(),
-                    })
-                    .child(self.render_title_view(window, cx)),
-            )
-            .child(
-                h_flex()
-                    .flex_none()
-                    .gap(DynamicSpacing::Base02.rems(cx))
-                    .pl(DynamicSpacing::Base04.rems(cx))
-                    .pr(DynamicSpacing::Base06.rems(cx))
-                    .child(new_thread_menu)
-                    .child(self.render_recent_entries_menu(
-                        IconName::MenuAltTemp,
-                        Corner::TopRight,
-                        cx,
-                    ))
-                    .child(self.render_panel_options_menu(window, cx)),
-            )
-    }
-
-    fn should_render_trial_end_upsell(&self, cx: &mut Context<Self>) -> bool {
-        if TrialEndUpsell::dismissed() {
-            return false;
-        }
-
-        match &self.active_view {
-            ActiveView::TextThread { .. } => {
-                if LanguageModelRegistry::global(cx)
-                    .read(cx)
-                    .default_model()
-                    .is_some_and(|model| {
-                        model.provider.id() != language_model::ZED_CLOUD_PROVIDER_ID
-                    })
-                {
-                    return false;
-                }
-            }
-            ActiveView::ExternalAgentThread { .. }
-            | ActiveView::History
-            | ActiveView::Configuration => return false,
-        }
-
-        let plan = self.user_store.read(cx).plan();
-        let has_previous_trial = self.user_store.read(cx).trial_started_at().is_some();
-
-        matches!(
-            plan,
-            Some(Plan::V1(PlanV1::ZedFree) | Plan::V2(PlanV2::ZedFree))
-        ) && has_previous_trial
-    }
-
-    fn should_render_onboarding(&self, cx: &mut Context<Self>) -> bool {
-        if OnboardingUpsell::dismissed() {
-            return false;
-        }
-
-        let user_store = self.user_store.read(cx);
-
-        if user_store
-            .plan()
-            .is_some_and(|plan| matches!(plan, Plan::V1(PlanV1::ZedPro) | Plan::V2(PlanV2::ZedPro)))
-            && user_store
-                .subscription_period()
-                .and_then(|period| period.0.checked_add_days(chrono::Days::new(1)))
-                .is_some_and(|date| date < chrono::Utc::now())
-        {
-            OnboardingUpsell::set_dismissed(true, cx);
-            return false;
-        }
-
-        match &self.active_view {
-            ActiveView::History | ActiveView::Configuration => false,
-            ActiveView::ExternalAgentThread { thread_view, .. }
-                if thread_view.read(cx).as_native_thread(cx).is_none() =>
-            {
-                false
-            }
-            _ => {
-                let history_is_empty = self.history_store.read(cx).is_empty(cx);
-
-                let has_configured_non_zed_providers = LanguageModelRegistry::read_global(cx)
-                    .providers()
-                    .iter()
-                    .any(|provider| {
-                        provider.is_authenticated(cx)
-                            && provider.id() != language_model::ZED_CLOUD_PROVIDER_ID
-                    });
-
-                history_is_empty || !has_configured_non_zed_providers
-            }
-        }
-    }
-
-    fn render_onboarding(
-        &self,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<impl IntoElement> {
-        if !self.should_render_onboarding(cx) {
-            return None;
-        }
-
-        let text_thread_view = matches!(&self.active_view, ActiveView::TextThread { .. });
-
-        Some(
-            div()
-                .when(text_thread_view, |this| {
-                    this.bg(cx.theme().colors().editor_background)
-                })
-                .child(self.onboarding.clone()),
-        )
-    }
-
-    fn render_trial_end_upsell(
-        &self,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<impl IntoElement> {
-        if !self.should_render_trial_end_upsell(cx) {
-            return None;
-        }
-
-        let plan = self.user_store.read(cx).plan()?;
-
-        Some(
-            v_flex()
-                .absolute()
-                .inset_0()
-                .size_full()
-                .bg(cx.theme().colors().panel_background)
-                .opacity(0.85)
-                .block_mouse_except_scroll()
-                .child(EndTrialUpsell::new(
-                    plan,
-                    Arc::new({
-                        let this = cx.entity();
-                        move |_, cx| {
-                            this.update(cx, |_this, cx| {
-                                TrialEndUpsell::set_dismissed(true, cx);
-                                cx.notify();
-                            });
-                        }
-                    }),
-                )),
-        )
-    }
-
-    fn render_configuration_error(
-        &self,
-        border_bottom: bool,
-        configuration_error: &ConfigurationError,
-        focus_handle: &FocusHandle,
-        cx: &mut App,
-    ) -> impl IntoElement {
-        let zed_provider_configured = AgentSettings::get_global(cx)
-            .default_model
-            .as_ref()
-            .is_some_and(|selection| selection.provider.0.as_str() == "zed.dev");
-
-        let callout = if zed_provider_configured {
-            Callout::new()
-                .icon(IconName::Warning)
-                .severity(Severity::Warning)
-                .when(border_bottom, |this| {
-                    this.border_position(ui::BorderPosition::Bottom)
-                })
-                .title("Sign in to continue using Zed as your LLM provider.")
-                .actions_slot(
-                    Button::new("sign_in", "Sign In")
-                        .style(ButtonStyle::Tinted(ui::TintColor::Warning))
-                        .label_size(LabelSize::Small)
-                        .on_click({
-                            let workspace = self.workspace.clone();
-                            move |_, _, cx| {
-                                let Ok(client) =
-                                    workspace.update(cx, |workspace, _| workspace.client().clone())
-                                else {
-                                    return;
-                                };
-
-                                cx.spawn(async move |cx| {
-                                    client.sign_in_with_optional_connect(true, cx).await
-                                })
-                                .detach_and_log_err(cx);
-                            }
-                        }),
-                )
-        } else {
-            Callout::new()
-                .icon(IconName::Warning)
-                .severity(Severity::Warning)
-                .when(border_bottom, |this| {
-                    this.border_position(ui::BorderPosition::Bottom)
-                })
-                .title(configuration_error.to_string())
-                .actions_slot(
-                    Button::new("settings", "Configure")
-                        .style(ButtonStyle::Tinted(ui::TintColor::Warning))
-                        .label_size(LabelSize::Small)
-                        .key_binding(
-                            KeyBinding::for_action_in(&OpenSettings, focus_handle, cx)
-                                .map(|kb| kb.size(rems_from_px(12.))),
-                        )
-                        .on_click(|_event, window, cx| {
-                            window.dispatch_action(OpenSettings.boxed_clone(), cx)
-                        }),
-                )
-        };
-
-        match configuration_error {
-            ConfigurationError::ModelNotFound
-            | ConfigurationError::ProviderNotAuthenticated(_)
-            | ConfigurationError::NoProvider => callout.into_any_element(),
-        }
-    }
-
-    fn render_text_thread(
-        &self,
-        text_thread_editor: &Entity<TextThreadEditor>,
-        buffer_search_bar: &Entity<BufferSearchBar>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Div {
-        let mut registrar = buffer_search::DivRegistrar::new(
-            |this, _, _cx| match &this.active_view {
-                ActiveView::TextThread {
-                    buffer_search_bar, ..
-                } => Some(buffer_search_bar.clone()),
-                _ => None,
-            },
-            cx,
-        );
-        BufferSearchBar::register(&mut registrar);
-        registrar
-            .into_div()
-            .size_full()
-            .relative()
-            .map(|parent| {
-                buffer_search_bar.update(cx, |buffer_search_bar, cx| {
-                    if buffer_search_bar.is_dismissed() {
-                        return parent;
-                    }
-                    parent.child(
-                        div()
-                            .p(DynamicSpacing::Base08.rems(cx))
-                            .border_b_1()
-                            .border_color(cx.theme().colors().border_variant)
-                            .bg(cx.theme().colors().editor_background)
-                            .child(buffer_search_bar.render(window, cx)),
-                    )
-                })
-            })
-            .child(text_thread_editor.clone())
-            .child(self.render_drag_target(cx))
-    }
-
-    fn render_drag_target(&self, cx: &Context<Self>) -> Div {
-        let is_local = self.project.read(cx).is_local();
-        div()
-            .invisible()
-            .absolute()
-            .top_0()
-            .right_0()
-            .bottom_0()
-            .left_0()
-            .bg(cx.theme().colors().drop_target_background)
-            .drag_over::<DraggedTab>(|this, _, _, _| this.visible())
-            .drag_over::<DraggedSelection>(|this, _, _, _| this.visible())
-            .when(is_local, |this| {
-                this.drag_over::<ExternalPaths>(|this, _, _, _| this.visible())
-            })
-            .on_drop(cx.listener(move |this, tab: &DraggedTab, window, cx| {
-                let item = tab.pane.read(cx).item_for_index(tab.ix);
-                let project_paths = item
-                    .and_then(|item| item.project_path(cx))
-                    .into_iter()
-                    .collect::<Vec<_>>();
-                this.handle_drop(project_paths, vec![], window, cx);
-            }))
-            .on_drop(
-                cx.listener(move |this, selection: &DraggedSelection, window, cx| {
-                    let project_paths = selection
-                        .items()
-                        .filter_map(|item| this.project.read(cx).path_for_entry(item.entry_id, cx))
-                        .collect::<Vec<_>>();
-                    this.handle_drop(project_paths, vec![], window, cx);
-                }),
-            )
-            .on_drop(cx.listener(move |this, paths: &ExternalPaths, window, cx| {
-                let tasks = paths
-                    .paths()
-                    .iter()
-                    .map(|path| {
-                        Workspace::project_path_for_path(this.project.clone(), path, false, cx)
-                    })
-                    .collect::<Vec<_>>();
-                cx.spawn_in(window, async move |this, cx| {
-                    let mut paths = vec![];
-                    let mut added_worktrees = vec![];
-                    let opened_paths = futures::future::join_all(tasks).await;
-                    for entry in opened_paths {
-                        if let Some((worktree, project_path)) = entry.log_err() {
-                            added_worktrees.push(worktree);
-                            paths.push(project_path);
-                        }
-                    }
-                    this.update_in(cx, |this, window, cx| {
-                        this.handle_drop(paths, added_worktrees, window, cx);
-                    })
-                    .ok();
-                })
-                .detach();
-            }))
-    }
-
-    fn handle_drop(
-        &mut self,
-        paths: Vec<ProjectPath>,
-        added_worktrees: Vec<Entity<Worktree>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        match &self.active_view {
-            ActiveView::ExternalAgentThread { thread_view } => {
-                thread_view.update(cx, |thread_view, cx| {
-                    thread_view.insert_dragged_files(paths, added_worktrees, window, cx);
-                });
-            }
-            ActiveView::TextThread {
-                text_thread_editor, ..
-            } => {
-                text_thread_editor.update(cx, |text_thread_editor, cx| {
-                    TextThreadEditor::insert_dragged_files(
-                        text_thread_editor,
-                        paths,
-                        added_worktrees,
-                        window,
-                        cx,
-                    );
-                });
-            }
-            ActiveView::History | ActiveView::Configuration => {}
-        }
-    }
-
-    fn key_context(&self) -> KeyContext {
-        let mut key_context = KeyContext::new_with_defaults();
-        key_context.add("AgentPanel");
-        match &self.active_view {
-            ActiveView::ExternalAgentThread { .. } => key_context.add("acp_thread"),
-            ActiveView::TextThread { .. } => key_context.add("text_thread"),
-            ActiveView::History | ActiveView::Configuration => {}
-        }
-        key_context
-    }
-}
-
-impl Render for AgentPanel {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        // WARNING: Changes to this element hierarchy can have
-        // non-obvious implications to the layout of children.
-        //
-        // If you need to change it, please confirm:
-        // - The message editor expands (cmd-option-esc) correctly
-        // - When expanded, the buttons at the bottom of the panel are displayed correctly
-        // - Font size works as expected and can be changed with cmd-+/cmd-
-        // - Scrolling in all views works as expected
-        // - Files can be dropped into the panel
-        let content = v_flex()
-            .relative()
-            .size_full()
-            .justify_between()
-            .key_context(self.key_context())
-            .on_action(cx.listener(|this, action: &NewThread, window, cx| {
-                this.new_thread(action, window, cx);
-            }))
-            .on_action(cx.listener(|this, _: &OpenHistory, window, cx| {
-                this.open_history(window, cx);
-            }))
-            .on_action(cx.listener(|this, _: &OpenSettings, window, cx| {
-                this.open_configuration(window, cx);
-            }))
-            .on_action(cx.listener(Self::open_active_thread_as_markdown))
-            .on_action(cx.listener(Self::deploy_rules_library))
-            .on_action(cx.listener(Self::go_back))
-            .on_action(cx.listener(Self::toggle_navigation_menu))
-            .on_action(cx.listener(Self::toggle_options_menu))
-            .on_action(cx.listener(Self::increase_font_size))
-            .on_action(cx.listener(Self::decrease_font_size))
-            .on_action(cx.listener(Self::reset_font_size))
-            .on_action(cx.listener(Self::toggle_zoom))
-            .on_action(cx.listener(|this, _: &ReauthenticateAgent, window, cx| {
-                if let Some(thread_view) = this.active_thread_view() {
-                    thread_view.update(cx, |thread_view, cx| thread_view.reauthenticate(window, cx))
-                }
-            }))
-            .child(self.render_toolbar(window, cx))
-            .children(self.render_onboarding(window, cx))
-            .map(|parent| match &self.active_view {
-                ActiveView::ExternalAgentThread { thread_view, .. } => parent
-                    .child(thread_view.clone())
-                    .child(self.render_drag_target(cx)),
-                ActiveView::History => parent.child(self.acp_history.clone()),
-                ActiveView::TextThread {
-                    text_thread_editor,
-                    buffer_search_bar,
-                    ..
-                } => {
-                    let model_registry = LanguageModelRegistry::read_global(cx);
-                    let configuration_error =
-                        model_registry.configuration_error(model_registry.default_model(), cx);
-                    parent
-                        .map(|this| {
-                            if !self.should_render_onboarding(cx)
-                                && let Some(err) = configuration_error.as_ref()
-                            {
-                                this.child(self.render_configuration_error(
-                                    true,
-                                    err,
-                                    &self.focus_handle(cx),
-                                    cx,
-                                ))
-                            } else {
-                                this
-                            }
-                        })
-                        .child(self.render_text_thread(
-                            text_thread_editor,
-                            buffer_search_bar,
-                            window,
-                            cx,
-                        ))
-                }
-                ActiveView::Configuration => parent.children(self.configuration.clone()),
-            })
-            .children(self.render_trial_end_upsell(window, cx));
-
-        match self.active_view.which_font_size_used() {
-            WhichFontSize::AgentFont => {
-                WithRemSize::new(ThemeSettings::get_global(cx).agent_ui_font_size(cx))
-                    .size_full()
-                    .child(content)
-                    .into_any()
-            }
-            _ => content.into_any(),
-        }
-    }
-}
-
-struct PromptLibraryInlineAssist {
-    workspace: WeakEntity<Workspace>,
-}
-
-impl PromptLibraryInlineAssist {
-    pub fn new(workspace: WeakEntity<Workspace>) -> Self {
-        Self { workspace }
-    }
-}
-
-impl rules_library::InlineAssistDelegate for PromptLibraryInlineAssist {
-    fn assist(
-        &self,
-        prompt_editor: &Entity<Editor>,
-        initial_prompt: Option<String>,
-        window: &mut Window,
-        cx: &mut Context<RulesLibrary>,
-    ) {
-        InlineAssistant::update_global(cx, |assistant, cx| {
-            let Some(workspace) = self.workspace.upgrade() else {
-                return;
-            };
-            let Some(panel) = workspace.read(cx).panel::<AgentPanel>(cx) else {
-                return;
-            };
-            let project = workspace.read(cx).project().downgrade();
-            let thread_store = panel.read(cx).thread_store().clone();
-            assistant.assist(
-                prompt_editor,
-                self.workspace.clone(),
-                project,
-                thread_store,
-                None,
-                initial_prompt,
-                window,
-                cx,
-            );
-        })
-    }
-
-    fn focus_agent_panel(
-        &self,
-        workspace: &mut Workspace,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) -> bool {
-        workspace.focus_panel::<AgentPanel>(window, cx).is_some()
-    }
-}
-
-pub struct ConcreteAssistantPanelDelegate;
-
-impl AgentPanelDelegate for ConcreteAssistantPanelDelegate {
-    fn active_text_thread_editor(
-        &self,
-        workspace: &mut Workspace,
-        _window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) -> Option<Entity<TextThreadEditor>> {
-        let panel = workspace.panel::<AgentPanel>(cx)?;
-        panel.read(cx).active_text_thread_editor()
-    }
-
-    fn open_local_text_thread(
-        &self,
-        workspace: &mut Workspace,
-        path: Arc<Path>,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) -> Task<Result<()>> {
-        let Some(panel) = workspace.panel::<AgentPanel>(cx) else {
-            return Task::ready(Err(anyhow!("Agent panel not found")));
-        };
-
-        panel.update(cx, |panel, cx| {
-            panel.open_saved_text_thread(path, window, cx)
-        })
-    }
-
-    fn open_remote_text_thread(
-        &self,
-        _workspace: &mut Workspace,
-        _text_thread_id: assistant_text_thread::TextThreadId,
-        _window: &mut Window,
-        _cx: &mut Context<Workspace>,
-    ) -> Task<Result<Entity<TextThreadEditor>>> {
-        Task::ready(Err(anyhow!("opening remote context not implemented")))
-    }
-
-    fn quote_selection(
-        &self,
-        workspace: &mut Workspace,
-        selection_ranges: Vec<Range<Anchor>>,
-        buffer: Entity<MultiBuffer>,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        let Some(panel) = workspace.panel::<AgentPanel>(cx) else {
-            return;
-        };
-
-        if !panel.focus_handle(cx).contains_focused(window, cx) {
-            workspace.toggle_panel_focus::<AgentPanel>(window, cx);
-        }
-
-        panel.update(cx, |_, cx| {
-            // Wait to create a new context until the workspace is no longer
-            // being updated.
-            cx.defer_in(window, move |panel, window, cx| {
-                if let Some(thread_view) = panel.active_thread_view() {
-                    thread_view.update(cx, |thread_view, cx| {
-                        thread_view.insert_selections(window, cx);
-                    });
-                } else if let Some(text_thread_editor) = panel.active_text_thread_editor() {
-                    let snapshot = buffer.read(cx).snapshot(cx);
-                    let selection_ranges = selection_ranges
-                        .into_iter()
-                        .map(|range| range.to_point(&snapshot))
-                        .collect::<Vec<_>>();
-
-                    text_thread_editor.update(cx, |text_thread_editor, cx| {
-                        text_thread_editor.quote_ranges(selection_ranges, snapshot, window, cx)
-                    });
-                }
-            });
-        });
-    }
-}
-
-struct OnboardingUpsell;
-
-impl Dismissable for OnboardingUpsell {
-    const KEY: &'static str = "dismissed-trial-upsell";
-}
-
-struct TrialEndUpsell;
-
-impl Dismissable for TrialEndUpsell {
-    const KEY: &'static str = "dismissed-trial-end-upsell";
-}
diff --git a/crates/agent_ui/src/agent_ui.rs b/crates/agent_ui/src/agent_ui.rs
deleted file mode 100644
index b6f7517ed9..0000000000
--- a/crates/agent_ui/src/agent_ui.rs
+++ /dev/null
@@ -1,548 +0,0 @@
-mod acp;
-mod agent_configuration;
-mod agent_diff;
-mod agent_model_selector;
-mod agent_panel;
-mod buffer_codegen;
-mod completion_provider;
-mod context;
-mod context_server_configuration;
-#[cfg(test)]
-mod evals;
-mod inline_assistant;
-mod inline_prompt_editor;
-mod language_model_selector;
-mod mention_set;
-mod profile_selector;
-mod slash_command;
-mod slash_command_picker;
-mod terminal_codegen;
-mod terminal_inline_assistant;
-mod text_thread_editor;
-mod ui;
-
-use std::rc::Rc;
-use std::sync::Arc;
-
-use agent_settings::{AgentProfileId, AgentSettings};
-use assistant_slash_command::SlashCommandRegistry;
-use client::Client;
-use command_palette_hooks::CommandPaletteFilter;
-use feature_flags::FeatureFlagAppExt as _;
-use fs::Fs;
-use gpui::{Action, App, Entity, SharedString, actions};
-use language::{
-    LanguageRegistry,
-    language_settings::{AllLanguageSettings, EditPredictionProvider},
-};
-use language_model::{
-    ConfiguredModel, LanguageModelId, LanguageModelProviderId, LanguageModelRegistry,
-};
-use project::DisableAiSettings;
-use prompt_store::PromptBuilder;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use settings::{LanguageModelSelection, Settings as _, SettingsStore};
-use std::any::TypeId;
-
-use crate::agent_configuration::{ConfigureContextServerModal, ManageProfilesModal};
-pub use crate::agent_panel::{AgentPanel, ConcreteAssistantPanelDelegate};
-pub use crate::inline_assistant::InlineAssistant;
-pub use agent_diff::{AgentDiffPane, AgentDiffToolbar};
-pub use text_thread_editor::{AgentPanelDelegate, TextThreadEditor};
-use zed_actions;
-
-actions!(
-    agent,
-    [
-        /// Creates a new text-based conversation thread.
-        NewTextThread,
-        /// Toggles the menu to create new agent threads.
-        ToggleNewThreadMenu,
-        /// Toggles the navigation menu for switching between threads and views.
-        ToggleNavigationMenu,
-        /// Toggles the options menu for agent settings and preferences.
-        ToggleOptionsMenu,
-        /// Deletes the recently opened thread from history.
-        DeleteRecentlyOpenThread,
-        /// Toggles the profile or mode selector for switching between agent profiles.
-        ToggleProfileSelector,
-        /// Cycles through available session modes.
-        CycleModeSelector,
-        /// Expands the message editor to full size.
-        ExpandMessageEditor,
-        /// Removes all thread history.
-        RemoveHistory,
-        /// Opens the conversation history view.
-        OpenHistory,
-        /// Adds a context server to the configuration.
-        AddContextServer,
-        /// Removes the currently selected thread.
-        RemoveSelectedThread,
-        /// Starts a chat conversation with follow-up enabled.
-        ChatWithFollow,
-        /// Cycles to the next inline assist suggestion.
-        CycleNextInlineAssist,
-        /// Cycles to the previous inline assist suggestion.
-        CyclePreviousInlineAssist,
-        /// Moves focus up in the interface.
-        FocusUp,
-        /// Moves focus down in the interface.
-        FocusDown,
-        /// Moves focus left in the interface.
-        FocusLeft,
-        /// Moves focus right in the interface.
-        FocusRight,
-        /// Opens the active thread as a markdown file.
-        OpenActiveThreadAsMarkdown,
-        /// Opens the agent diff view to review changes.
-        OpenAgentDiff,
-        /// Keeps the current suggestion or change.
-        Keep,
-        /// Rejects the current suggestion or change.
-        Reject,
-        /// Rejects all suggestions or changes.
-        RejectAll,
-        /// Keeps all suggestions or changes.
-        KeepAll,
-        /// Allow this operation only this time.
-        AllowOnce,
-        /// Allow this operation and remember the choice.
-        AllowAlways,
-        /// Reject this operation only this time.
-        RejectOnce,
-        /// Follows the agent's suggestions.
-        Follow,
-        /// Resets the trial upsell notification.
-        ResetTrialUpsell,
-        /// Resets the trial end upsell notification.
-        ResetTrialEndUpsell,
-        /// Continues the current thread.
-        ContinueThread,
-        /// Continues the thread with burn mode enabled.
-        ContinueWithBurnMode,
-        /// Toggles burn mode for faster responses.
-        ToggleBurnMode,
-    ]
-);
-
-/// Creates a new conversation thread, optionally based on an existing thread.
-#[derive(Default, Clone, PartialEq, Deserialize, JsonSchema, Action)]
-#[action(namespace = agent)]
-#[serde(deny_unknown_fields)]
-pub struct NewThread;
-
-/// Creates a new external agent conversation thread.
-#[derive(Default, Clone, PartialEq, Deserialize, JsonSchema, Action)]
-#[action(namespace = agent)]
-#[serde(deny_unknown_fields)]
-pub struct NewExternalAgentThread {
-    /// Which agent to use for the conversation.
-    agent: Option<ExternalAgent>,
-}
-
-#[derive(Clone, PartialEq, Deserialize, JsonSchema, Action)]
-#[action(namespace = agent)]
-#[serde(deny_unknown_fields)]
-pub struct NewNativeAgentThreadFromSummary {
-    from_session_id: agent_client_protocol::SessionId,
-}
-
-// TODO unify this with AgentType
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum ExternalAgent {
-    Gemini,
-    ClaudeCode,
-    Codex,
-    NativeAgent,
-    Custom { name: SharedString },
-}
-
-impl ExternalAgent {
-    pub fn server(
-        &self,
-        fs: Arc<dyn fs::Fs>,
-        history: Entity<agent::HistoryStore>,
-    ) -> Rc<dyn agent_servers::AgentServer> {
-        match self {
-            Self::Gemini => Rc::new(agent_servers::Gemini),
-            Self::ClaudeCode => Rc::new(agent_servers::ClaudeCode),
-            Self::Codex => Rc::new(agent_servers::Codex),
-            Self::NativeAgent => Rc::new(agent::NativeAgentServer::new(fs, history)),
-            Self::Custom { name } => Rc::new(agent_servers::CustomAgentServer::new(name.clone())),
-        }
-    }
-}
-
-/// Opens the profile management interface for configuring agent tools and settings.
-#[derive(PartialEq, Clone, Default, Debug, Deserialize, JsonSchema, Action)]
-#[action(namespace = agent)]
-#[serde(deny_unknown_fields)]
-pub struct ManageProfiles {
-    #[serde(default)]
-    pub customize_tools: Option<AgentProfileId>,
-}
-
-impl ManageProfiles {
-    pub fn customize_tools(profile_id: AgentProfileId) -> Self {
-        Self {
-            customize_tools: Some(profile_id),
-        }
-    }
-}
-
-#[derive(Clone)]
-pub(crate) enum ModelUsageContext {
-    InlineAssistant,
-}
-
-impl ModelUsageContext {
-    pub fn configured_model(&self, cx: &App) -> Option<ConfiguredModel> {
-        match self {
-            Self::InlineAssistant => {
-                LanguageModelRegistry::read_global(cx).inline_assistant_model()
-            }
-        }
-    }
-}
-
-/// Initializes the `agent` crate.
-pub fn init(
-    fs: Arc<dyn Fs>,
-    client: Arc<Client>,
-    prompt_builder: Arc<PromptBuilder>,
-    language_registry: Arc<LanguageRegistry>,
-    is_eval: bool,
-    cx: &mut App,
-) {
-    assistant_text_thread::init(client.clone(), cx);
-    rules_library::init(cx);
-    if !is_eval {
-        // Initializing the language model from the user settings messes with the eval, so we only initialize them when
-        // we're not running inside of the eval.
-        init_language_model_settings(cx);
-    }
-    assistant_slash_command::init(cx);
-    agent_panel::init(cx);
-    context_server_configuration::init(language_registry.clone(), fs.clone(), cx);
-    TextThreadEditor::init(cx);
-
-    register_slash_commands(cx);
-    inline_assistant::init(
-        fs.clone(),
-        prompt_builder.clone(),
-        client.telemetry().clone(),
-        cx,
-    );
-    terminal_inline_assistant::init(fs.clone(), prompt_builder, client.telemetry().clone(), cx);
-    cx.observe_new(move |workspace, window, cx| {
-        ConfigureContextServerModal::register(workspace, language_registry.clone(), window, cx)
-    })
-    .detach();
-    cx.observe_new(ManageProfilesModal::register).detach();
-
-    // Update command palette filter based on AI settings
-    update_command_palette_filter(cx);
-
-    // Watch for settings changes
-    cx.observe_global::<SettingsStore>(|app_cx| {
-        // When settings change, update the command palette filter
-        update_command_palette_filter(app_cx);
-    })
-    .detach();
-}
-
-fn update_command_palette_filter(cx: &mut App) {
-    let disable_ai = DisableAiSettings::get_global(cx).disable_ai;
-    let agent_enabled = AgentSettings::get_global(cx).enabled;
-    let edit_prediction_provider = AllLanguageSettings::get_global(cx)
-        .edit_predictions
-        .provider;
-
-    CommandPaletteFilter::update_global(cx, |filter, _| {
-        use editor::actions::{
-            AcceptEditPrediction, AcceptPartialEditPrediction, NextEditPrediction,
-            PreviousEditPrediction, ShowEditPrediction, ToggleEditPrediction,
-        };
-        let edit_prediction_actions = [
-            TypeId::of::<AcceptEditPrediction>(),
-            TypeId::of::<AcceptPartialEditPrediction>(),
-            TypeId::of::<ShowEditPrediction>(),
-            TypeId::of::<NextEditPrediction>(),
-            TypeId::of::<PreviousEditPrediction>(),
-            TypeId::of::<ToggleEditPrediction>(),
-        ];
-
-        if disable_ai {
-            filter.hide_namespace("agent");
-            filter.hide_namespace("assistant");
-            filter.hide_namespace("copilot");
-            filter.hide_namespace("supermaven");
-            filter.hide_namespace("zed_predict_onboarding");
-            filter.hide_namespace("edit_prediction");
-
-            filter.hide_action_types(&edit_prediction_actions);
-            filter.hide_action_types(&[TypeId::of::<zed_actions::OpenZedPredictOnboarding>()]);
-        } else {
-            if agent_enabled {
-                filter.show_namespace("agent");
-            } else {
-                filter.hide_namespace("agent");
-            }
-
-            filter.show_namespace("assistant");
-
-            match edit_prediction_provider {
-                EditPredictionProvider::None => {
-                    filter.hide_namespace("edit_prediction");
-                    filter.hide_namespace("copilot");
-                    filter.hide_namespace("supermaven");
-                    filter.hide_action_types(&edit_prediction_actions);
-                }
-                EditPredictionProvider::Copilot => {
-                    filter.show_namespace("edit_prediction");
-                    filter.show_namespace("copilot");
-                    filter.hide_namespace("supermaven");
-                    filter.show_action_types(edit_prediction_actions.iter());
-                }
-                EditPredictionProvider::Supermaven => {
-                    filter.show_namespace("edit_prediction");
-                    filter.hide_namespace("copilot");
-                    filter.show_namespace("supermaven");
-                    filter.show_action_types(edit_prediction_actions.iter());
-                }
-                EditPredictionProvider::Zed
-                | EditPredictionProvider::Codestral
-                | EditPredictionProvider::Experimental(_) => {
-                    filter.show_namespace("edit_prediction");
-                    filter.hide_namespace("copilot");
-                    filter.hide_namespace("supermaven");
-                    filter.show_action_types(edit_prediction_actions.iter());
-                }
-            }
-
-            filter.show_namespace("zed_predict_onboarding");
-            filter.show_action_types(&[TypeId::of::<zed_actions::OpenZedPredictOnboarding>()]);
-        }
-    });
-}
-
-fn init_language_model_settings(cx: &mut App) {
-    update_active_language_model_from_settings(cx);
-
-    cx.observe_global::<SettingsStore>(update_active_language_model_from_settings)
-        .detach();
-    cx.subscribe(
-        &LanguageModelRegistry::global(cx),
-        |_, event: &language_model::Event, cx| match event {
-            language_model::Event::ProviderStateChanged(_)
-            | language_model::Event::AddedProvider(_)
-            | language_model::Event::RemovedProvider(_) => {
-                update_active_language_model_from_settings(cx);
-            }
-            _ => {}
-        },
-    )
-    .detach();
-}
-
-fn update_active_language_model_from_settings(cx: &mut App) {
-    let settings = AgentSettings::get_global(cx);
-
-    fn to_selected_model(selection: &LanguageModelSelection) -> language_model::SelectedModel {
-        language_model::SelectedModel {
-            provider: LanguageModelProviderId::from(selection.provider.0.clone()),
-            model: LanguageModelId::from(selection.model.clone()),
-        }
-    }
-
-    let default = settings.default_model.as_ref().map(to_selected_model);
-    let inline_assistant = settings
-        .inline_assistant_model
-        .as_ref()
-        .map(to_selected_model);
-    let commit_message = settings
-        .commit_message_model
-        .as_ref()
-        .map(to_selected_model);
-    let thread_summary = settings
-        .thread_summary_model
-        .as_ref()
-        .map(to_selected_model);
-    let inline_alternatives = settings
-        .inline_alternatives
-        .iter()
-        .map(to_selected_model)
-        .collect::<Vec<_>>();
-
-    LanguageModelRegistry::global(cx).update(cx, |registry, cx| {
-        registry.select_default_model(default.as_ref(), cx);
-        registry.select_inline_assistant_model(inline_assistant.as_ref(), cx);
-        registry.select_commit_message_model(commit_message.as_ref(), cx);
-        registry.select_thread_summary_model(thread_summary.as_ref(), cx);
-        registry.select_inline_alternative_models(inline_alternatives, cx);
-    });
-}
-
-fn register_slash_commands(cx: &mut App) {
-    let slash_command_registry = SlashCommandRegistry::global(cx);
-
-    slash_command_registry.register_command(assistant_slash_commands::FileSlashCommand, true);
-    slash_command_registry.register_command(assistant_slash_commands::DeltaSlashCommand, true);
-    slash_command_registry.register_command(assistant_slash_commands::OutlineSlashCommand, true);
-    slash_command_registry.register_command(assistant_slash_commands::TabSlashCommand, true);
-    slash_command_registry.register_command(assistant_slash_commands::PromptSlashCommand, true);
-    slash_command_registry.register_command(assistant_slash_commands::SelectionCommand, true);
-    slash_command_registry.register_command(assistant_slash_commands::DefaultSlashCommand, false);
-    slash_command_registry.register_command(assistant_slash_commands::NowSlashCommand, false);
-    slash_command_registry
-        .register_command(assistant_slash_commands::DiagnosticsSlashCommand, true);
-    slash_command_registry.register_command(assistant_slash_commands::FetchSlashCommand, true);
-
-    cx.observe_flag::<assistant_slash_commands::StreamingExampleSlashCommandFeatureFlag, _>({
-        move |is_enabled, _cx| {
-            if is_enabled {
-                slash_command_registry.register_command(
-                    assistant_slash_commands::StreamingExampleSlashCommand,
-                    false,
-                );
-            }
-        }
-    })
-    .detach();
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use agent_settings::{AgentProfileId, AgentSettings, CompletionMode};
-    use command_palette_hooks::CommandPaletteFilter;
-    use editor::actions::AcceptEditPrediction;
-    use gpui::{BorrowAppContext, TestAppContext, px};
-    use project::DisableAiSettings;
-    use settings::{
-        DefaultAgentView, DockPosition, NotifyWhenAgentWaiting, Settings, SettingsStore,
-    };
-
-    #[gpui::test]
-    fn test_agent_command_palette_visibility(cx: &mut TestAppContext) {
-        // Init settings
-        cx.update(|cx| {
-            let store = SettingsStore::test(cx);
-            cx.set_global(store);
-            command_palette_hooks::init(cx);
-            AgentSettings::register(cx);
-            DisableAiSettings::register(cx);
-            AllLanguageSettings::register(cx);
-        });
-
-        let agent_settings = AgentSettings {
-            enabled: true,
-            button: true,
-            dock: DockPosition::Right,
-            default_width: px(300.),
-            default_height: px(600.),
-            default_model: None,
-            inline_assistant_model: None,
-            commit_message_model: None,
-            thread_summary_model: None,
-            inline_alternatives: vec![],
-            default_profile: AgentProfileId::default(),
-            default_view: DefaultAgentView::Thread,
-            profiles: Default::default(),
-            always_allow_tool_actions: false,
-            notify_when_agent_waiting: NotifyWhenAgentWaiting::default(),
-            play_sound_when_agent_done: false,
-            single_file_review: false,
-            model_parameters: vec![],
-            preferred_completion_mode: CompletionMode::Normal,
-            enable_feedback: false,
-            expand_edit_card: true,
-            expand_terminal_card: true,
-            use_modifier_to_send: true,
-            message_editor_min_lines: 1,
-        };
-
-        cx.update(|cx| {
-            AgentSettings::override_global(agent_settings.clone(), cx);
-            DisableAiSettings::override_global(DisableAiSettings { disable_ai: false }, cx);
-
-            // Initial update
-            update_command_palette_filter(cx);
-        });
-
-        // Assert visible
-        cx.update(|cx| {
-            let filter = CommandPaletteFilter::try_global(cx).unwrap();
-            assert!(
-                !filter.is_hidden(&NewThread),
-                "NewThread should be visible by default"
-            );
-        });
-
-        // Disable agent
-        cx.update(|cx| {
-            let mut new_settings = agent_settings.clone();
-            new_settings.enabled = false;
-            AgentSettings::override_global(new_settings, cx);
-
-            // Trigger update
-            update_command_palette_filter(cx);
-        });
-
-        // Assert hidden
-        cx.update(|cx| {
-            let filter = CommandPaletteFilter::try_global(cx).unwrap();
-            assert!(
-                filter.is_hidden(&NewThread),
-                "NewThread should be hidden when agent is disabled"
-            );
-        });
-
-        // Test EditPredictionProvider
-        // Enable EditPredictionProvider::Copilot
-        cx.update(|cx| {
-            cx.update_global::<SettingsStore, _>(|store, cx| {
-                store.update_user_settings(cx, |s| {
-                    s.project
-                        .all_languages
-                        .features
-                        .get_or_insert(Default::default())
-                        .edit_prediction_provider = Some(EditPredictionProvider::Copilot);
-                });
-            });
-            update_command_palette_filter(cx);
-        });
-
-        cx.update(|cx| {
-            let filter = CommandPaletteFilter::try_global(cx).unwrap();
-            assert!(
-                !filter.is_hidden(&AcceptEditPrediction),
-                "EditPrediction should be visible when provider is Copilot"
-            );
-        });
-
-        // Disable EditPredictionProvider (None)
-        cx.update(|cx| {
-            cx.update_global::<SettingsStore, _>(|store, cx| {
-                store.update_user_settings(cx, |s| {
-                    s.project
-                        .all_languages
-                        .features
-                        .get_or_insert(Default::default())
-                        .edit_prediction_provider = Some(EditPredictionProvider::None);
-                });
-            });
-            update_command_palette_filter(cx);
-        });
-
-        cx.update(|cx| {
-            let filter = CommandPaletteFilter::try_global(cx).unwrap();
-            assert!(
-                filter.is_hidden(&AcceptEditPrediction),
-                "EditPrediction should be hidden when provider is None"
-            );
-        });
-    }
-}
diff --git a/crates/agent_ui/src/buffer_codegen.rs b/crates/agent_ui/src/buffer_codegen.rs
deleted file mode 100644
index 1cd7bec7b5..0000000000
--- a/crates/agent_ui/src/buffer_codegen.rs
+++ /dev/null
@@ -1,1696 +0,0 @@
-use crate::{context::LoadedContext, inline_prompt_editor::CodegenStatus};
-use agent_settings::AgentSettings;
-use anyhow::{Context as _, Result};
-use client::telemetry::Telemetry;
-use cloud_llm_client::CompletionIntent;
-use collections::HashSet;
-use editor::{Anchor, AnchorRangeExt, MultiBuffer, MultiBufferSnapshot, ToOffset as _, ToPoint};
-use feature_flags::{FeatureFlagAppExt as _, InlineAssistantV2FeatureFlag};
-use futures::{
-    SinkExt, Stream, StreamExt, TryStreamExt as _,
-    channel::mpsc,
-    future::{LocalBoxFuture, Shared},
-    join,
-};
-use gpui::{App, AppContext as _, AsyncApp, Context, Entity, EventEmitter, Subscription, Task};
-use language::{Buffer, IndentKind, Point, TransactionId, line_diff};
-use language_model::{
-    LanguageModel, LanguageModelCompletionError, LanguageModelRegistry, LanguageModelRequest,
-    LanguageModelRequestMessage, LanguageModelRequestTool, LanguageModelTextStream, Role,
-    report_assistant_event,
-};
-use multi_buffer::MultiBufferRow;
-use parking_lot::Mutex;
-use prompt_store::PromptBuilder;
-use rope::Rope;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use smol::future::FutureExt;
-use std::{
-    cmp,
-    future::Future,
-    iter,
-    ops::{Range, RangeInclusive},
-    pin::Pin,
-    sync::Arc,
-    task::{self, Poll},
-    time::Instant,
-};
-use streaming_diff::{CharOperation, LineDiff, LineOperation, StreamingDiff};
-use telemetry_events::{AssistantEventData, AssistantKind, AssistantPhase};
-use ui::SharedString;
-
-/// Use this tool to provide a message to the user when you're unable to complete a task.
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct FailureMessageInput {
-    /// A brief message to the user explaining why you're unable to fulfill the request or to ask a question about the request.
-    ///
-    /// The message may use markdown formatting if you wish.
-    pub message: String,
-}
-
-/// Replaces text in <rewrite_this></rewrite_this> tags with your replacement_text.
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct RewriteSectionInput {
-    /// A brief description of the edit you have made.
-    ///
-    /// The description may use markdown formatting if you wish.
-    /// This is optional - if the edit is simple or obvious, you should leave it empty.
-    pub description: String,
-
-    /// The text to replace the section with.
-    pub replacement_text: String,
-}
-
-pub struct BufferCodegen {
-    alternatives: Vec<Entity<CodegenAlternative>>,
-    pub active_alternative: usize,
-    seen_alternatives: HashSet<usize>,
-    subscriptions: Vec<Subscription>,
-    buffer: Entity<MultiBuffer>,
-    range: Range<Anchor>,
-    initial_transaction_id: Option<TransactionId>,
-    telemetry: Arc<Telemetry>,
-    builder: Arc<PromptBuilder>,
-    pub is_insertion: bool,
-}
-
-impl BufferCodegen {
-    pub fn new(
-        buffer: Entity<MultiBuffer>,
-        range: Range<Anchor>,
-        initial_transaction_id: Option<TransactionId>,
-        telemetry: Arc<Telemetry>,
-        builder: Arc<PromptBuilder>,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let codegen = cx.new(|cx| {
-            CodegenAlternative::new(
-                buffer.clone(),
-                range.clone(),
-                false,
-                Some(telemetry.clone()),
-                builder.clone(),
-                cx,
-            )
-        });
-        let mut this = Self {
-            is_insertion: range.to_offset(&buffer.read(cx).snapshot(cx)).is_empty(),
-            alternatives: vec![codegen],
-            active_alternative: 0,
-            seen_alternatives: HashSet::default(),
-            subscriptions: Vec::new(),
-            buffer,
-            range,
-            initial_transaction_id,
-            telemetry,
-            builder,
-        };
-        this.activate(0, cx);
-        this
-    }
-
-    fn subscribe_to_alternative(&mut self, cx: &mut Context<Self>) {
-        let codegen = self.active_alternative().clone();
-        self.subscriptions.clear();
-        self.subscriptions
-            .push(cx.observe(&codegen, |_, _, cx| cx.notify()));
-        self.subscriptions
-            .push(cx.subscribe(&codegen, |_, _, event, cx| cx.emit(*event)));
-    }
-
-    pub fn active_completion(&self, cx: &App) -> Option<String> {
-        self.active_alternative().read(cx).current_completion()
-    }
-
-    pub fn active_alternative(&self) -> &Entity<CodegenAlternative> {
-        &self.alternatives[self.active_alternative]
-    }
-
-    pub fn status<'a>(&self, cx: &'a App) -> &'a CodegenStatus {
-        &self.active_alternative().read(cx).status
-    }
-
-    pub fn alternative_count(&self, cx: &App) -> usize {
-        LanguageModelRegistry::read_global(cx)
-            .inline_alternative_models()
-            .len()
-            + 1
-    }
-
-    pub fn cycle_prev(&mut self, cx: &mut Context<Self>) {
-        let next_active_ix = if self.active_alternative == 0 {
-            self.alternatives.len() - 1
-        } else {
-            self.active_alternative - 1
-        };
-        self.activate(next_active_ix, cx);
-    }
-
-    pub fn cycle_next(&mut self, cx: &mut Context<Self>) {
-        let next_active_ix = (self.active_alternative + 1) % self.alternatives.len();
-        self.activate(next_active_ix, cx);
-    }
-
-    fn activate(&mut self, index: usize, cx: &mut Context<Self>) {
-        self.active_alternative()
-            .update(cx, |codegen, cx| codegen.set_active(false, cx));
-        self.seen_alternatives.insert(index);
-        self.active_alternative = index;
-        self.active_alternative()
-            .update(cx, |codegen, cx| codegen.set_active(true, cx));
-        self.subscribe_to_alternative(cx);
-        cx.notify();
-    }
-
-    pub fn start(
-        &mut self,
-        primary_model: Arc<dyn LanguageModel>,
-        user_prompt: String,
-        context_task: Shared<Task<Option<LoadedContext>>>,
-        cx: &mut Context<Self>,
-    ) -> Result<()> {
-        let alternative_models = LanguageModelRegistry::read_global(cx)
-            .inline_alternative_models()
-            .to_vec();
-
-        self.active_alternative()
-            .update(cx, |alternative, cx| alternative.undo(cx));
-        self.activate(0, cx);
-        self.alternatives.truncate(1);
-
-        for _ in 0..alternative_models.len() {
-            self.alternatives.push(cx.new(|cx| {
-                CodegenAlternative::new(
-                    self.buffer.clone(),
-                    self.range.clone(),
-                    false,
-                    Some(self.telemetry.clone()),
-                    self.builder.clone(),
-                    cx,
-                )
-            }));
-        }
-
-        for (model, alternative) in iter::once(primary_model)
-            .chain(alternative_models)
-            .zip(&self.alternatives)
-        {
-            alternative.update(cx, |alternative, cx| {
-                alternative.start(user_prompt.clone(), context_task.clone(), model.clone(), cx)
-            })?;
-        }
-
-        Ok(())
-    }
-
-    pub fn stop(&mut self, cx: &mut Context<Self>) {
-        for codegen in &self.alternatives {
-            codegen.update(cx, |codegen, cx| codegen.stop(cx));
-        }
-    }
-
-    pub fn undo(&mut self, cx: &mut Context<Self>) {
-        self.active_alternative()
-            .update(cx, |codegen, cx| codegen.undo(cx));
-
-        self.buffer.update(cx, |buffer, cx| {
-            if let Some(transaction_id) = self.initial_transaction_id.take() {
-                buffer.undo_transaction(transaction_id, cx);
-                buffer.refresh_preview(cx);
-            }
-        });
-    }
-
-    pub fn buffer(&self, cx: &App) -> Entity<MultiBuffer> {
-        self.active_alternative().read(cx).buffer.clone()
-    }
-
-    pub fn old_buffer(&self, cx: &App) -> Entity<Buffer> {
-        self.active_alternative().read(cx).old_buffer.clone()
-    }
-
-    pub fn snapshot(&self, cx: &App) -> MultiBufferSnapshot {
-        self.active_alternative().read(cx).snapshot.clone()
-    }
-
-    pub fn edit_position(&self, cx: &App) -> Option<Anchor> {
-        self.active_alternative().read(cx).edit_position
-    }
-
-    pub fn diff<'a>(&self, cx: &'a App) -> &'a Diff {
-        &self.active_alternative().read(cx).diff
-    }
-
-    pub fn last_equal_ranges<'a>(&self, cx: &'a App) -> &'a [Range<Anchor>] {
-        self.active_alternative().read(cx).last_equal_ranges()
-    }
-
-    pub fn selected_text<'a>(&self, cx: &'a App) -> Option<&'a str> {
-        self.active_alternative().read(cx).selected_text()
-    }
-}
-
-impl EventEmitter<CodegenEvent> for BufferCodegen {}
-
-pub struct CodegenAlternative {
-    buffer: Entity<MultiBuffer>,
-    old_buffer: Entity<Buffer>,
-    snapshot: MultiBufferSnapshot,
-    edit_position: Option<Anchor>,
-    range: Range<Anchor>,
-    last_equal_ranges: Vec<Range<Anchor>>,
-    transformation_transaction_id: Option<TransactionId>,
-    status: CodegenStatus,
-    generation: Task<()>,
-    diff: Diff,
-    telemetry: Option<Arc<Telemetry>>,
-    _subscription: gpui::Subscription,
-    builder: Arc<PromptBuilder>,
-    active: bool,
-    edits: Vec<(Range<Anchor>, String)>,
-    line_operations: Vec<LineOperation>,
-    elapsed_time: Option<f64>,
-    completion: Option<String>,
-    selected_text: Option<String>,
-    pub message_id: Option<String>,
-    pub model_explanation: Option<SharedString>,
-}
-
-impl EventEmitter<CodegenEvent> for CodegenAlternative {}
-
-impl CodegenAlternative {
-    pub fn new(
-        buffer: Entity<MultiBuffer>,
-        range: Range<Anchor>,
-        active: bool,
-        telemetry: Option<Arc<Telemetry>>,
-        builder: Arc<PromptBuilder>,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let snapshot = buffer.read(cx).snapshot(cx);
-
-        let (old_buffer, _, _) = snapshot
-            .range_to_buffer_ranges(range.clone())
-            .pop()
-            .unwrap();
-        let old_buffer = cx.new(|cx| {
-            let text = old_buffer.as_rope().clone();
-            let line_ending = old_buffer.line_ending();
-            let language = old_buffer.language().cloned();
-            let language_registry = buffer
-                .read(cx)
-                .buffer(old_buffer.remote_id())
-                .unwrap()
-                .read(cx)
-                .language_registry();
-
-            let mut buffer = Buffer::local_normalized(text, line_ending, cx);
-            buffer.set_language(language, cx);
-            if let Some(language_registry) = language_registry {
-                buffer.set_language_registry(language_registry);
-            }
-            buffer
-        });
-
-        Self {
-            buffer: buffer.clone(),
-            old_buffer,
-            edit_position: None,
-            message_id: None,
-            snapshot,
-            last_equal_ranges: Default::default(),
-            transformation_transaction_id: None,
-            status: CodegenStatus::Idle,
-            generation: Task::ready(()),
-            diff: Diff::default(),
-            telemetry,
-            builder,
-            active: active,
-            edits: Vec::new(),
-            line_operations: Vec::new(),
-            range,
-            elapsed_time: None,
-            completion: None,
-            selected_text: None,
-            model_explanation: None,
-            _subscription: cx.subscribe(&buffer, Self::handle_buffer_event),
-        }
-    }
-
-    pub fn set_active(&mut self, active: bool, cx: &mut Context<Self>) {
-        if active != self.active {
-            self.active = active;
-
-            if self.active {
-                let edits = self.edits.clone();
-                self.apply_edits(edits, cx);
-                if matches!(self.status, CodegenStatus::Pending) {
-                    let line_operations = self.line_operations.clone();
-                    self.reapply_line_based_diff(line_operations, cx);
-                } else {
-                    self.reapply_batch_diff(cx).detach();
-                }
-            } else if let Some(transaction_id) = self.transformation_transaction_id.take() {
-                self.buffer.update(cx, |buffer, cx| {
-                    buffer.undo_transaction(transaction_id, cx);
-                    buffer.forget_transaction(transaction_id, cx);
-                });
-            }
-        }
-    }
-
-    fn handle_buffer_event(
-        &mut self,
-        _buffer: Entity<MultiBuffer>,
-        event: &multi_buffer::Event,
-        cx: &mut Context<Self>,
-    ) {
-        if let multi_buffer::Event::TransactionUndone { transaction_id } = event
-            && self.transformation_transaction_id == Some(*transaction_id)
-        {
-            self.transformation_transaction_id = None;
-            self.generation = Task::ready(());
-            cx.emit(CodegenEvent::Undone);
-        }
-    }
-
-    pub fn last_equal_ranges(&self) -> &[Range<Anchor>] {
-        &self.last_equal_ranges
-    }
-
-    pub fn start(
-        &mut self,
-        user_prompt: String,
-        context_task: Shared<Task<Option<LoadedContext>>>,
-        model: Arc<dyn LanguageModel>,
-        cx: &mut Context<Self>,
-    ) -> Result<()> {
-        if let Some(transformation_transaction_id) = self.transformation_transaction_id.take() {
-            self.buffer.update(cx, |buffer, cx| {
-                buffer.undo_transaction(transformation_transaction_id, cx);
-            });
-        }
-
-        self.edit_position = Some(self.range.start.bias_right(&self.snapshot));
-
-        let api_key = model.api_key(cx);
-        let telemetry_id = model.telemetry_id();
-        let provider_id = model.provider_id();
-
-        if cx.has_flag::<InlineAssistantV2FeatureFlag>() {
-            let request = self.build_request(&model, user_prompt, context_task, cx)?;
-            let tool_use =
-                cx.spawn(async move |_, cx| model.stream_completion_tool(request.await, cx).await);
-            self.handle_tool_use(telemetry_id, provider_id.to_string(), api_key, tool_use, cx);
-        } else {
-            let stream: LocalBoxFuture<Result<LanguageModelTextStream>> =
-                if user_prompt.trim().to_lowercase() == "delete" {
-                    async { Ok(LanguageModelTextStream::default()) }.boxed_local()
-                } else {
-                    let request = self.build_request(&model, user_prompt, context_task, cx)?;
-                    cx.spawn(async move |_, cx| {
-                        Ok(model.stream_completion_text(request.await, cx).await?)
-                    })
-                    .boxed_local()
-                };
-            self.handle_stream(telemetry_id, provider_id.to_string(), api_key, stream, cx);
-        }
-
-        Ok(())
-    }
-
-    fn build_request_v2(
-        &self,
-        model: &Arc<dyn LanguageModel>,
-        user_prompt: String,
-        context_task: Shared<Task<Option<LoadedContext>>>,
-        cx: &mut App,
-    ) -> Result<Task<LanguageModelRequest>> {
-        let buffer = self.buffer.read(cx).snapshot(cx);
-        let language = buffer.language_at(self.range.start);
-        let language_name = if let Some(language) = language.as_ref() {
-            if Arc::ptr_eq(language, &language::PLAIN_TEXT) {
-                None
-            } else {
-                Some(language.name())
-            }
-        } else {
-            None
-        };
-
-        let language_name = language_name.as_ref();
-        let start = buffer.point_to_buffer_offset(self.range.start);
-        let end = buffer.point_to_buffer_offset(self.range.end);
-        let (buffer, range) = if let Some((start, end)) = start.zip(end) {
-            let (start_buffer, start_buffer_offset) = start;
-            let (end_buffer, end_buffer_offset) = end;
-            if start_buffer.remote_id() == end_buffer.remote_id() {
-                (start_buffer.clone(), start_buffer_offset..end_buffer_offset)
-            } else {
-                anyhow::bail!("invalid transformation range");
-            }
-        } else {
-            anyhow::bail!("invalid transformation range");
-        };
-
-        let system_prompt = self
-            .builder
-            .generate_inline_transformation_prompt_v2(
-                language_name,
-                buffer,
-                range.start.0..range.end.0,
-            )
-            .context("generating content prompt")?;
-
-        let temperature = AgentSettings::temperature_for_model(model, cx);
-
-        let tool_input_format = model.tool_input_format();
-
-        Ok(cx.spawn(async move |_cx| {
-            let mut messages = vec![LanguageModelRequestMessage {
-                role: Role::System,
-                content: vec![system_prompt.into()],
-                cache: false,
-                reasoning_details: None,
-            }];
-
-            let mut user_message = LanguageModelRequestMessage {
-                role: Role::User,
-                content: Vec::new(),
-                cache: false,
-                reasoning_details: None,
-            };
-
-            if let Some(context) = context_task.await {
-                context.add_to_request_message(&mut user_message);
-            }
-
-            user_message.content.push(user_prompt.into());
-            messages.push(user_message);
-
-            let tools = vec![
-                LanguageModelRequestTool {
-                    name: "rewrite_section".to_string(),
-                    description: "Replaces text in <rewrite_this></rewrite_this> tags with your replacement_text.".to_string(),
-                    input_schema: language_model::tool_schema::root_schema_for::<RewriteSectionInput>(tool_input_format).to_value(),
-                },
-                LanguageModelRequestTool {
-                    name: "failure_message".to_string(),
-                    description: "Use this tool to provide a message to the user when you're unable to complete a task.".to_string(),
-                    input_schema: language_model::tool_schema::root_schema_for::<FailureMessageInput>(tool_input_format).to_value(),
-                },
-            ];
-
-            LanguageModelRequest {
-                thread_id: None,
-                prompt_id: None,
-                intent: Some(CompletionIntent::InlineAssist),
-                mode: None,
-                tools,
-                tool_choice: None,
-                stop: Vec::new(),
-                temperature,
-                messages,
-                thinking_allowed: false,
-            }
-        }))
-    }
-
-    fn build_request(
-        &self,
-        model: &Arc<dyn LanguageModel>,
-        user_prompt: String,
-        context_task: Shared<Task<Option<LoadedContext>>>,
-        cx: &mut App,
-    ) -> Result<Task<LanguageModelRequest>> {
-        if cx.has_flag::<InlineAssistantV2FeatureFlag>() {
-            return self.build_request_v2(model, user_prompt, context_task, cx);
-        }
-
-        let buffer = self.buffer.read(cx).snapshot(cx);
-        let language = buffer.language_at(self.range.start);
-        let language_name = if let Some(language) = language.as_ref() {
-            if Arc::ptr_eq(language, &language::PLAIN_TEXT) {
-                None
-            } else {
-                Some(language.name())
-            }
-        } else {
-            None
-        };
-
-        let language_name = language_name.as_ref();
-        let start = buffer.point_to_buffer_offset(self.range.start);
-        let end = buffer.point_to_buffer_offset(self.range.end);
-        let (buffer, range) = if let Some((start, end)) = start.zip(end) {
-            let (start_buffer, start_buffer_offset) = start;
-            let (end_buffer, end_buffer_offset) = end;
-            if start_buffer.remote_id() == end_buffer.remote_id() {
-                (start_buffer.clone(), start_buffer_offset..end_buffer_offset)
-            } else {
-                anyhow::bail!("invalid transformation range");
-            }
-        } else {
-            anyhow::bail!("invalid transformation range");
-        };
-
-        let prompt = self
-            .builder
-            .generate_inline_transformation_prompt(
-                user_prompt,
-                language_name,
-                buffer,
-                range.start.0..range.end.0,
-            )
-            .context("generating content prompt")?;
-
-        let temperature = AgentSettings::temperature_for_model(model, cx);
-
-        Ok(cx.spawn(async move |_cx| {
-            let mut request_message = LanguageModelRequestMessage {
-                role: Role::User,
-                content: Vec::new(),
-                cache: false,
-                reasoning_details: None,
-            };
-
-            if let Some(context) = context_task.await {
-                context.add_to_request_message(&mut request_message);
-            }
-
-            request_message.content.push(prompt.into());
-
-            LanguageModelRequest {
-                thread_id: None,
-                prompt_id: None,
-                intent: Some(CompletionIntent::InlineAssist),
-                mode: None,
-                tools: Vec::new(),
-                tool_choice: None,
-                stop: Vec::new(),
-                temperature,
-                messages: vec![request_message],
-                thinking_allowed: false,
-            }
-        }))
-    }
-
-    pub fn handle_stream(
-        &mut self,
-        model_telemetry_id: String,
-        model_provider_id: String,
-        model_api_key: Option<String>,
-        stream: impl 'static + Future<Output = Result<LanguageModelTextStream>>,
-        cx: &mut Context<Self>,
-    ) {
-        let start_time = Instant::now();
-
-        // Make a new snapshot and re-resolve anchor in case the document was modified.
-        // This can happen often if the editor loses focus and is saved + reformatted,
-        // as in https://github.com/zed-industries/zed/issues/39088
-        self.snapshot = self.buffer.read(cx).snapshot(cx);
-        self.range = self.snapshot.anchor_after(self.range.start)
-            ..self.snapshot.anchor_after(self.range.end);
-
-        let snapshot = self.snapshot.clone();
-        let selected_text = snapshot
-            .text_for_range(self.range.start..self.range.end)
-            .collect::<Rope>();
-
-        self.selected_text = Some(selected_text.to_string());
-
-        let selection_start = self.range.start.to_point(&snapshot);
-
-        // Start with the indentation of the first line in the selection
-        let mut suggested_line_indent = snapshot
-            .suggested_indents(selection_start.row..=selection_start.row, cx)
-            .into_values()
-            .next()
-            .unwrap_or_else(|| snapshot.indent_size_for_line(MultiBufferRow(selection_start.row)));
-
-        // If the first line in the selection does not have indentation, check the following lines
-        if suggested_line_indent.len == 0 && suggested_line_indent.kind == IndentKind::Space {
-            for row in selection_start.row..=self.range.end.to_point(&snapshot).row {
-                let line_indent = snapshot.indent_size_for_line(MultiBufferRow(row));
-                // Prefer tabs if a line in the selection uses tabs as indentation
-                if line_indent.kind == IndentKind::Tab {
-                    suggested_line_indent.kind = IndentKind::Tab;
-                    break;
-                }
-            }
-        }
-
-        let http_client = cx.http_client();
-        let telemetry = self.telemetry.clone();
-        let language_name = {
-            let multibuffer = self.buffer.read(cx);
-            let snapshot = multibuffer.snapshot(cx);
-            let ranges = snapshot.range_to_buffer_ranges(self.range.clone());
-            ranges
-                .first()
-                .and_then(|(buffer, _, _)| buffer.language())
-                .map(|language| language.name())
-        };
-
-        self.diff = Diff::default();
-        self.status = CodegenStatus::Pending;
-        let mut edit_start = self.range.start.to_offset(&snapshot);
-        let completion = Arc::new(Mutex::new(String::new()));
-        let completion_clone = completion.clone();
-
-        self.generation = cx.spawn(async move |codegen, cx| {
-            let stream = stream.await;
-
-            let token_usage = stream
-                .as_ref()
-                .ok()
-                .map(|stream| stream.last_token_usage.clone());
-            let message_id = stream
-                .as_ref()
-                .ok()
-                .and_then(|stream| stream.message_id.clone());
-            let generate = async {
-                let model_telemetry_id = model_telemetry_id.clone();
-                let model_provider_id = model_provider_id.clone();
-                let (mut diff_tx, mut diff_rx) = mpsc::channel(1);
-                let executor = cx.background_executor().clone();
-                let message_id = message_id.clone();
-                let line_based_stream_diff: Task<anyhow::Result<()>> =
-                    cx.background_spawn(async move {
-                        let mut response_latency = None;
-                        let request_start = Instant::now();
-                        let diff = async {
-                            let chunks = StripInvalidSpans::new(
-                                stream?.stream.map_err(|error| error.into()),
-                            );
-                            futures::pin_mut!(chunks);
-                            let mut diff = StreamingDiff::new(selected_text.to_string());
-                            let mut line_diff = LineDiff::default();
-
-                            let mut new_text = String::new();
-                            let mut base_indent = None;
-                            let mut line_indent = None;
-                            let mut first_line = true;
-
-                            while let Some(chunk) = chunks.next().await {
-                                if response_latency.is_none() {
-                                    response_latency = Some(request_start.elapsed());
-                                }
-                                let chunk = chunk?;
-                                completion_clone.lock().push_str(&chunk);
-
-                                let mut lines = chunk.split('\n').peekable();
-                                while let Some(line) = lines.next() {
-                                    new_text.push_str(line);
-                                    if line_indent.is_none()
-                                        && let Some(non_whitespace_ch_ix) =
-                                            new_text.find(|ch: char| !ch.is_whitespace())
-                                    {
-                                        line_indent = Some(non_whitespace_ch_ix);
-                                        base_indent = base_indent.or(line_indent);
-
-                                        let line_indent = line_indent.unwrap();
-                                        let base_indent = base_indent.unwrap();
-                                        let indent_delta = line_indent as i32 - base_indent as i32;
-                                        let mut corrected_indent_len = cmp::max(
-                                            0,
-                                            suggested_line_indent.len as i32 + indent_delta,
-                                        )
-                                            as usize;
-                                        if first_line {
-                                            corrected_indent_len = corrected_indent_len
-                                                .saturating_sub(selection_start.column as usize);
-                                        }
-
-                                        let indent_char = suggested_line_indent.char();
-                                        let mut indent_buffer = [0; 4];
-                                        let indent_str =
-                                            indent_char.encode_utf8(&mut indent_buffer);
-                                        new_text.replace_range(
-                                            ..line_indent,
-                                            &indent_str.repeat(corrected_indent_len),
-                                        );
-                                    }
-
-                                    if line_indent.is_some() {
-                                        let char_ops = diff.push_new(&new_text);
-                                        line_diff.push_char_operations(&char_ops, &selected_text);
-                                        diff_tx
-                                            .send((char_ops, line_diff.line_operations()))
-                                            .await?;
-                                        new_text.clear();
-                                    }
-
-                                    if lines.peek().is_some() {
-                                        let char_ops = diff.push_new("\n");
-                                        line_diff.push_char_operations(&char_ops, &selected_text);
-                                        diff_tx
-                                            .send((char_ops, line_diff.line_operations()))
-                                            .await?;
-                                        if line_indent.is_none() {
-                                            // Don't write out the leading indentation in empty lines on the next line
-                                            // This is the case where the above if statement didn't clear the buffer
-                                            new_text.clear();
-                                        }
-                                        line_indent = None;
-                                        first_line = false;
-                                    }
-                                }
-                            }
-
-                            let mut char_ops = diff.push_new(&new_text);
-                            char_ops.extend(diff.finish());
-                            line_diff.push_char_operations(&char_ops, &selected_text);
-                            line_diff.finish(&selected_text);
-                            diff_tx
-                                .send((char_ops, line_diff.line_operations()))
-                                .await?;
-
-                            anyhow::Ok(())
-                        };
-
-                        let result = diff.await;
-
-                        let error_message = result.as_ref().err().map(|error| error.to_string());
-                        report_assistant_event(
-                            AssistantEventData {
-                                conversation_id: None,
-                                message_id,
-                                kind: AssistantKind::Inline,
-                                phase: AssistantPhase::Response,
-                                model: model_telemetry_id,
-                                model_provider: model_provider_id,
-                                response_latency,
-                                error_message,
-                                language_name: language_name.map(|name| name.to_proto()),
-                            },
-                            telemetry,
-                            http_client,
-                            model_api_key,
-                            &executor,
-                        );
-
-                        result?;
-                        Ok(())
-                    });
-
-                while let Some((char_ops, line_ops)) = diff_rx.next().await {
-                    codegen.update(cx, |codegen, cx| {
-                        codegen.last_equal_ranges.clear();
-
-                        let edits = char_ops
-                            .into_iter()
-                            .filter_map(|operation| match operation {
-                                CharOperation::Insert { text } => {
-                                    let edit_start = snapshot.anchor_after(edit_start);
-                                    Some((edit_start..edit_start, text))
-                                }
-                                CharOperation::Delete { bytes } => {
-                                    let edit_end = edit_start + bytes;
-                                    let edit_range = snapshot.anchor_after(edit_start)
-                                        ..snapshot.anchor_before(edit_end);
-                                    edit_start = edit_end;
-                                    Some((edit_range, String::new()))
-                                }
-                                CharOperation::Keep { bytes } => {
-                                    let edit_end = edit_start + bytes;
-                                    let edit_range = snapshot.anchor_after(edit_start)
-                                        ..snapshot.anchor_before(edit_end);
-                                    edit_start = edit_end;
-                                    codegen.last_equal_ranges.push(edit_range);
-                                    None
-                                }
-                            })
-                            .collect::<Vec<_>>();
-
-                        if codegen.active {
-                            codegen.apply_edits(edits.iter().cloned(), cx);
-                            codegen.reapply_line_based_diff(line_ops.iter().cloned(), cx);
-                        }
-                        codegen.edits.extend(edits);
-                        codegen.line_operations = line_ops;
-                        codegen.edit_position = Some(snapshot.anchor_after(edit_start));
-
-                        cx.notify();
-                    })?;
-                }
-
-                // Streaming stopped and we have the new text in the buffer, and a line-based diff applied for the whole new buffer.
-                // That diff is not what a regular diff is and might look unexpected, ergo apply a regular diff.
-                // It's fine to apply even if the rest of the line diffing fails, as no more hunks are coming through `diff_rx`.
-                let batch_diff_task =
-                    codegen.update(cx, |codegen, cx| codegen.reapply_batch_diff(cx))?;
-                let (line_based_stream_diff, ()) = join!(line_based_stream_diff, batch_diff_task);
-                line_based_stream_diff?;
-
-                anyhow::Ok(())
-            };
-
-            let result = generate.await;
-            let elapsed_time = start_time.elapsed().as_secs_f64();
-
-            codegen
-                .update(cx, |this, cx| {
-                    this.message_id = message_id;
-                    this.last_equal_ranges.clear();
-                    if let Err(error) = result {
-                        this.status = CodegenStatus::Error(error);
-                    } else {
-                        this.status = CodegenStatus::Done;
-                    }
-                    this.elapsed_time = Some(elapsed_time);
-                    this.completion = Some(completion.lock().clone());
-                    if let Some(usage) = token_usage {
-                        let usage = usage.lock();
-                        telemetry::event!(
-                            "Inline Assistant Completion",
-                            model = model_telemetry_id,
-                            model_provider = model_provider_id,
-                            input_tokens = usage.input_tokens,
-                            output_tokens = usage.output_tokens,
-                        )
-                    }
-
-                    cx.emit(CodegenEvent::Finished);
-                    cx.notify();
-                })
-                .ok();
-        });
-        cx.notify();
-    }
-
-    pub fn current_completion(&self) -> Option<String> {
-        self.completion.clone()
-    }
-
-    pub fn selected_text(&self) -> Option<&str> {
-        self.selected_text.as_deref()
-    }
-
-    pub fn stop(&mut self, cx: &mut Context<Self>) {
-        self.last_equal_ranges.clear();
-        if self.diff.is_empty() {
-            self.status = CodegenStatus::Idle;
-        } else {
-            self.status = CodegenStatus::Done;
-        }
-        self.generation = Task::ready(());
-        cx.emit(CodegenEvent::Finished);
-        cx.notify();
-    }
-
-    pub fn undo(&mut self, cx: &mut Context<Self>) {
-        self.buffer.update(cx, |buffer, cx| {
-            if let Some(transaction_id) = self.transformation_transaction_id.take() {
-                buffer.undo_transaction(transaction_id, cx);
-                buffer.refresh_preview(cx);
-            }
-        });
-    }
-
-    fn apply_edits(
-        &mut self,
-        edits: impl IntoIterator<Item = (Range<Anchor>, String)>,
-        cx: &mut Context<CodegenAlternative>,
-    ) {
-        let transaction = self.buffer.update(cx, |buffer, cx| {
-            // Avoid grouping agent edits with user edits.
-            buffer.finalize_last_transaction(cx);
-            buffer.start_transaction(cx);
-            buffer.edit(edits, None, cx);
-            buffer.end_transaction(cx)
-        });
-
-        if let Some(transaction) = transaction {
-            if let Some(first_transaction) = self.transformation_transaction_id {
-                // Group all agent edits into the first transaction.
-                self.buffer.update(cx, |buffer, cx| {
-                    buffer.merge_transactions(transaction, first_transaction, cx)
-                });
-            } else {
-                self.transformation_transaction_id = Some(transaction);
-                self.buffer
-                    .update(cx, |buffer, cx| buffer.finalize_last_transaction(cx));
-            }
-        }
-    }
-
-    fn reapply_line_based_diff(
-        &mut self,
-        line_operations: impl IntoIterator<Item = LineOperation>,
-        cx: &mut Context<Self>,
-    ) {
-        let old_snapshot = self.snapshot.clone();
-        let old_range = self.range.to_point(&old_snapshot);
-        let new_snapshot = self.buffer.read(cx).snapshot(cx);
-        let new_range = self.range.to_point(&new_snapshot);
-
-        let mut old_row = old_range.start.row;
-        let mut new_row = new_range.start.row;
-
-        self.diff.deleted_row_ranges.clear();
-        self.diff.inserted_row_ranges.clear();
-        for operation in line_operations {
-            match operation {
-                LineOperation::Keep { lines } => {
-                    old_row += lines;
-                    new_row += lines;
-                }
-                LineOperation::Delete { lines } => {
-                    let old_end_row = old_row + lines - 1;
-                    let new_row = new_snapshot.anchor_before(Point::new(new_row, 0));
-
-                    if let Some((_, last_deleted_row_range)) =
-                        self.diff.deleted_row_ranges.last_mut()
-                    {
-                        if *last_deleted_row_range.end() + 1 == old_row {
-                            *last_deleted_row_range = *last_deleted_row_range.start()..=old_end_row;
-                        } else {
-                            self.diff
-                                .deleted_row_ranges
-                                .push((new_row, old_row..=old_end_row));
-                        }
-                    } else {
-                        self.diff
-                            .deleted_row_ranges
-                            .push((new_row, old_row..=old_end_row));
-                    }
-
-                    old_row += lines;
-                }
-                LineOperation::Insert { lines } => {
-                    let new_end_row = new_row + lines - 1;
-                    let start = new_snapshot.anchor_before(Point::new(new_row, 0));
-                    let end = new_snapshot.anchor_before(Point::new(
-                        new_end_row,
-                        new_snapshot.line_len(MultiBufferRow(new_end_row)),
-                    ));
-                    self.diff.inserted_row_ranges.push(start..end);
-                    new_row += lines;
-                }
-            }
-
-            cx.notify();
-        }
-    }
-
-    fn reapply_batch_diff(&mut self, cx: &mut Context<Self>) -> Task<()> {
-        let old_snapshot = self.snapshot.clone();
-        let old_range = self.range.to_point(&old_snapshot);
-        let new_snapshot = self.buffer.read(cx).snapshot(cx);
-        let new_range = self.range.to_point(&new_snapshot);
-
-        cx.spawn(async move |codegen, cx| {
-            let (deleted_row_ranges, inserted_row_ranges) = cx
-                .background_spawn(async move {
-                    let old_text = old_snapshot
-                        .text_for_range(
-                            Point::new(old_range.start.row, 0)
-                                ..Point::new(
-                                    old_range.end.row,
-                                    old_snapshot.line_len(MultiBufferRow(old_range.end.row)),
-                                ),
-                        )
-                        .collect::<String>();
-                    let new_text = new_snapshot
-                        .text_for_range(
-                            Point::new(new_range.start.row, 0)
-                                ..Point::new(
-                                    new_range.end.row,
-                                    new_snapshot.line_len(MultiBufferRow(new_range.end.row)),
-                                ),
-                        )
-                        .collect::<String>();
-
-                    let old_start_row = old_range.start.row;
-                    let new_start_row = new_range.start.row;
-                    let mut deleted_row_ranges: Vec<(Anchor, RangeInclusive<u32>)> = Vec::new();
-                    let mut inserted_row_ranges = Vec::new();
-                    for (old_rows, new_rows) in line_diff(&old_text, &new_text) {
-                        let old_rows = old_start_row + old_rows.start..old_start_row + old_rows.end;
-                        let new_rows = new_start_row + new_rows.start..new_start_row + new_rows.end;
-                        if !old_rows.is_empty() {
-                            deleted_row_ranges.push((
-                                new_snapshot.anchor_before(Point::new(new_rows.start, 0)),
-                                old_rows.start..=old_rows.end - 1,
-                            ));
-                        }
-                        if !new_rows.is_empty() {
-                            let start = new_snapshot.anchor_before(Point::new(new_rows.start, 0));
-                            let new_end_row = new_rows.end - 1;
-                            let end = new_snapshot.anchor_before(Point::new(
-                                new_end_row,
-                                new_snapshot.line_len(MultiBufferRow(new_end_row)),
-                            ));
-                            inserted_row_ranges.push(start..end);
-                        }
-                    }
-                    (deleted_row_ranges, inserted_row_ranges)
-                })
-                .await;
-
-            codegen
-                .update(cx, |codegen, cx| {
-                    codegen.diff.deleted_row_ranges = deleted_row_ranges;
-                    codegen.diff.inserted_row_ranges = inserted_row_ranges;
-                    cx.notify();
-                })
-                .ok();
-        })
-    }
-
-    fn handle_tool_use(
-        &mut self,
-        _telemetry_id: String,
-        _provider_id: String,
-        _api_key: Option<String>,
-        tool_use: impl 'static
-        + Future<
-            Output = Result<language_model::LanguageModelToolUse, LanguageModelCompletionError>,
-        >,
-        cx: &mut Context<Self>,
-    ) {
-        self.diff = Diff::default();
-        self.status = CodegenStatus::Pending;
-
-        self.generation = cx.spawn(async move |codegen, cx| {
-            let finish_with_status = |status: CodegenStatus, cx: &mut AsyncApp| {
-                let _ = codegen.update(cx, |this, cx| {
-                    this.status = status;
-                    cx.emit(CodegenEvent::Finished);
-                    cx.notify();
-                });
-            };
-
-            let tool_use = tool_use.await;
-
-            match tool_use {
-                Ok(tool_use) if tool_use.name.as_ref() == "rewrite_section" => {
-                    // Parse the input JSON into RewriteSectionInput
-                    match serde_json::from_value::<RewriteSectionInput>(tool_use.input) {
-                        Ok(input) => {
-                            // Store the description if non-empty
-                            let description = if !input.description.trim().is_empty() {
-                                Some(input.description.clone())
-                            } else {
-                                None
-                            };
-
-                            // Apply the replacement text to the buffer and compute diff
-                            let batch_diff_task = codegen
-                                .update(cx, |this, cx| {
-                                    this.model_explanation = description.map(Into::into);
-                                    let range = this.range.clone();
-                                    this.apply_edits(
-                                        std::iter::once((range, input.replacement_text)),
-                                        cx,
-                                    );
-                                    this.reapply_batch_diff(cx)
-                                })
-                                .ok();
-
-                            // Wait for the diff computation to complete
-                            if let Some(diff_task) = batch_diff_task {
-                                diff_task.await;
-                            }
-
-                            finish_with_status(CodegenStatus::Done, cx);
-                            return;
-                        }
-                        Err(e) => {
-                            finish_with_status(CodegenStatus::Error(e.into()), cx);
-                            return;
-                        }
-                    }
-                }
-                Ok(tool_use) if tool_use.name.as_ref() == "failure_message" => {
-                    // Handle failure message tool use
-                    match serde_json::from_value::<FailureMessageInput>(tool_use.input) {
-                        Ok(input) => {
-                            let _ = codegen.update(cx, |this, _cx| {
-                                // Store the failure message as the tool description
-                                this.model_explanation = Some(input.message.into());
-                            });
-                            finish_with_status(CodegenStatus::Done, cx);
-                            return;
-                        }
-                        Err(e) => {
-                            finish_with_status(CodegenStatus::Error(e.into()), cx);
-                            return;
-                        }
-                    }
-                }
-                Ok(_tool_use) => {
-                    // Unexpected tool.
-                    finish_with_status(CodegenStatus::Done, cx);
-                    return;
-                }
-                Err(e) => {
-                    finish_with_status(CodegenStatus::Error(e.into()), cx);
-                    return;
-                }
-            }
-        });
-        cx.notify();
-    }
-}
-
-#[derive(Copy, Clone, Debug)]
-pub enum CodegenEvent {
-    Finished,
-    Undone,
-}
-
-struct StripInvalidSpans<T> {
-    stream: T,
-    stream_done: bool,
-    buffer: String,
-    first_line: bool,
-    line_end: bool,
-    starts_with_code_block: bool,
-}
-
-impl<T> StripInvalidSpans<T>
-where
-    T: Stream<Item = Result<String>>,
-{
-    fn new(stream: T) -> Self {
-        Self {
-            stream,
-            stream_done: false,
-            buffer: String::new(),
-            first_line: true,
-            line_end: false,
-            starts_with_code_block: false,
-        }
-    }
-}
-
-impl<T> Stream for StripInvalidSpans<T>
-where
-    T: Stream<Item = Result<String>>,
-{
-    type Item = Result<String>;
-
-    fn poll_next(self: Pin<&mut Self>, cx: &mut task::Context) -> Poll<Option<Self::Item>> {
-        const CODE_BLOCK_DELIMITER: &str = "```";
-        const CURSOR_SPAN: &str = "<|CURSOR|>";
-
-        let this = unsafe { self.get_unchecked_mut() };
-        loop {
-            if !this.stream_done {
-                let mut stream = unsafe { Pin::new_unchecked(&mut this.stream) };
-                match stream.as_mut().poll_next(cx) {
-                    Poll::Ready(Some(Ok(chunk))) => {
-                        this.buffer.push_str(&chunk);
-                    }
-                    Poll::Ready(Some(Err(error))) => return Poll::Ready(Some(Err(error))),
-                    Poll::Ready(None) => {
-                        this.stream_done = true;
-                    }
-                    Poll::Pending => return Poll::Pending,
-                }
-            }
-
-            let mut chunk = String::new();
-            let mut consumed = 0;
-            if !this.buffer.is_empty() {
-                let mut lines = this.buffer.split('\n').enumerate().peekable();
-                while let Some((line_ix, line)) = lines.next() {
-                    if line_ix > 0 {
-                        this.first_line = false;
-                    }
-
-                    if this.first_line {
-                        let trimmed_line = line.trim();
-                        if lines.peek().is_some() {
-                            if trimmed_line.starts_with(CODE_BLOCK_DELIMITER) {
-                                consumed += line.len() + 1;
-                                this.starts_with_code_block = true;
-                                continue;
-                            }
-                        } else if trimmed_line.is_empty()
-                            || prefixes(CODE_BLOCK_DELIMITER)
-                                .any(|prefix| trimmed_line.starts_with(prefix))
-                        {
-                            break;
-                        }
-                    }
-
-                    let line_without_cursor = line.replace(CURSOR_SPAN, "");
-                    if lines.peek().is_some() {
-                        if this.line_end {
-                            chunk.push('\n');
-                        }
-
-                        chunk.push_str(&line_without_cursor);
-                        this.line_end = true;
-                        consumed += line.len() + 1;
-                    } else if this.stream_done {
-                        if !this.starts_with_code_block
-                            || !line_without_cursor.trim().ends_with(CODE_BLOCK_DELIMITER)
-                        {
-                            if this.line_end {
-                                chunk.push('\n');
-                            }
-
-                            chunk.push_str(line);
-                        }
-
-                        consumed += line.len();
-                    } else {
-                        let trimmed_line = line.trim();
-                        if trimmed_line.is_empty()
-                            || prefixes(CURSOR_SPAN).any(|prefix| trimmed_line.ends_with(prefix))
-                            || prefixes(CODE_BLOCK_DELIMITER)
-                                .any(|prefix| trimmed_line.ends_with(prefix))
-                        {
-                            break;
-                        } else {
-                            if this.line_end {
-                                chunk.push('\n');
-                                this.line_end = false;
-                            }
-
-                            chunk.push_str(&line_without_cursor);
-                            consumed += line.len();
-                        }
-                    }
-                }
-            }
-
-            this.buffer = this.buffer.split_off(consumed);
-            if !chunk.is_empty() {
-                return Poll::Ready(Some(Ok(chunk)));
-            } else if this.stream_done {
-                return Poll::Ready(None);
-            }
-        }
-    }
-}
-
-fn prefixes(text: &str) -> impl Iterator<Item = &str> {
-    (0..text.len() - 1).map(|ix| &text[..ix + 1])
-}
-
-#[derive(Default)]
-pub struct Diff {
-    pub deleted_row_ranges: Vec<(Anchor, RangeInclusive<u32>)>,
-    pub inserted_row_ranges: Vec<Range<Anchor>>,
-}
-
-impl Diff {
-    fn is_empty(&self) -> bool {
-        self.deleted_row_ranges.is_empty() && self.inserted_row_ranges.is_empty()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use futures::{
-        Stream,
-        stream::{self},
-    };
-    use gpui::TestAppContext;
-    use indoc::indoc;
-    use language::{Buffer, Point};
-    use language_model::{LanguageModelRegistry, TokenUsage};
-    use languages::rust_lang;
-    use rand::prelude::*;
-    use settings::SettingsStore;
-    use std::{future, sync::Arc};
-
-    #[gpui::test(iterations = 10)]
-    async fn test_transform_autoindent(cx: &mut TestAppContext, mut rng: StdRng) {
-        init_test(cx);
-
-        let text = indoc! {"
-            fn main() {
-                let x = 0;
-                for _ in 0..10 {
-                    x += 1;
-                }
-            }
-        "};
-        let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(rust_lang(), cx));
-        let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-        let range = buffer.read_with(cx, |buffer, cx| {
-            let snapshot = buffer.snapshot(cx);
-            snapshot.anchor_before(Point::new(1, 0))..snapshot.anchor_after(Point::new(4, 5))
-        });
-        let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
-        let codegen = cx.new(|cx| {
-            CodegenAlternative::new(
-                buffer.clone(),
-                range.clone(),
-                true,
-                None,
-                prompt_builder,
-                cx,
-            )
-        });
-
-        let chunks_tx = simulate_response_stream(&codegen, cx);
-
-        let mut new_text = concat!(
-            "       let mut x = 0;\n",
-            "       while x < 10 {\n",
-            "           x += 1;\n",
-            "       }",
-        );
-        while !new_text.is_empty() {
-            let max_len = cmp::min(new_text.len(), 10);
-            let len = rng.random_range(1..=max_len);
-            let (chunk, suffix) = new_text.split_at(len);
-            chunks_tx.unbounded_send(chunk.to_string()).unwrap();
-            new_text = suffix;
-            cx.background_executor.run_until_parked();
-        }
-        drop(chunks_tx);
-        cx.background_executor.run_until_parked();
-
-        assert_eq!(
-            buffer.read_with(cx, |buffer, cx| buffer.snapshot(cx).text()),
-            indoc! {"
-                fn main() {
-                    let mut x = 0;
-                    while x < 10 {
-                        x += 1;
-                    }
-                }
-            "}
-        );
-    }
-
-    #[gpui::test(iterations = 10)]
-    async fn test_autoindent_when_generating_past_indentation(
-        cx: &mut TestAppContext,
-        mut rng: StdRng,
-    ) {
-        init_test(cx);
-
-        let text = indoc! {"
-            fn main() {
-                le
-            }
-        "};
-        let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(rust_lang(), cx));
-        let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-        let range = buffer.read_with(cx, |buffer, cx| {
-            let snapshot = buffer.snapshot(cx);
-            snapshot.anchor_before(Point::new(1, 6))..snapshot.anchor_after(Point::new(1, 6))
-        });
-        let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
-        let codegen = cx.new(|cx| {
-            CodegenAlternative::new(
-                buffer.clone(),
-                range.clone(),
-                true,
-                None,
-                prompt_builder,
-                cx,
-            )
-        });
-
-        let chunks_tx = simulate_response_stream(&codegen, cx);
-
-        cx.background_executor.run_until_parked();
-
-        let mut new_text = concat!(
-            "t mut x = 0;\n",
-            "while x < 10 {\n",
-            "    x += 1;\n",
-            "}", //
-        );
-        while !new_text.is_empty() {
-            let max_len = cmp::min(new_text.len(), 10);
-            let len = rng.random_range(1..=max_len);
-            let (chunk, suffix) = new_text.split_at(len);
-            chunks_tx.unbounded_send(chunk.to_string()).unwrap();
-            new_text = suffix;
-            cx.background_executor.run_until_parked();
-        }
-        drop(chunks_tx);
-        cx.background_executor.run_until_parked();
-
-        assert_eq!(
-            buffer.read_with(cx, |buffer, cx| buffer.snapshot(cx).text()),
-            indoc! {"
-                fn main() {
-                    let mut x = 0;
-                    while x < 10 {
-                        x += 1;
-                    }
-                }
-            "}
-        );
-    }
-
-    #[gpui::test(iterations = 10)]
-    async fn test_autoindent_when_generating_before_indentation(
-        cx: &mut TestAppContext,
-        mut rng: StdRng,
-    ) {
-        init_test(cx);
-
-        let text = concat!(
-            "fn main() {\n",
-            "  \n",
-            "}\n" //
-        );
-        let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(rust_lang(), cx));
-        let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-        let range = buffer.read_with(cx, |buffer, cx| {
-            let snapshot = buffer.snapshot(cx);
-            snapshot.anchor_before(Point::new(1, 2))..snapshot.anchor_after(Point::new(1, 2))
-        });
-        let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
-        let codegen = cx.new(|cx| {
-            CodegenAlternative::new(
-                buffer.clone(),
-                range.clone(),
-                true,
-                None,
-                prompt_builder,
-                cx,
-            )
-        });
-
-        let chunks_tx = simulate_response_stream(&codegen, cx);
-
-        cx.background_executor.run_until_parked();
-
-        let mut new_text = concat!(
-            "let mut x = 0;\n",
-            "while x < 10 {\n",
-            "    x += 1;\n",
-            "}", //
-        );
-        while !new_text.is_empty() {
-            let max_len = cmp::min(new_text.len(), 10);
-            let len = rng.random_range(1..=max_len);
-            let (chunk, suffix) = new_text.split_at(len);
-            chunks_tx.unbounded_send(chunk.to_string()).unwrap();
-            new_text = suffix;
-            cx.background_executor.run_until_parked();
-        }
-        drop(chunks_tx);
-        cx.background_executor.run_until_parked();
-
-        assert_eq!(
-            buffer.read_with(cx, |buffer, cx| buffer.snapshot(cx).text()),
-            indoc! {"
-                fn main() {
-                    let mut x = 0;
-                    while x < 10 {
-                        x += 1;
-                    }
-                }
-            "}
-        );
-    }
-
-    #[gpui::test(iterations = 10)]
-    async fn test_autoindent_respects_tabs_in_selection(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let text = indoc! {"
-            func main() {
-            \tx := 0
-            \tfor i := 0; i < 10; i++ {
-            \t\tx++
-            \t}
-            }
-        "};
-        let buffer = cx.new(|cx| Buffer::local(text, cx));
-        let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-        let range = buffer.read_with(cx, |buffer, cx| {
-            let snapshot = buffer.snapshot(cx);
-            snapshot.anchor_before(Point::new(0, 0))..snapshot.anchor_after(Point::new(4, 2))
-        });
-        let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
-        let codegen = cx.new(|cx| {
-            CodegenAlternative::new(
-                buffer.clone(),
-                range.clone(),
-                true,
-                None,
-                prompt_builder,
-                cx,
-            )
-        });
-
-        let chunks_tx = simulate_response_stream(&codegen, cx);
-        let new_text = concat!(
-            "func main() {\n",
-            "\tx := 0\n",
-            "\tfor x < 10 {\n",
-            "\t\tx++\n",
-            "\t}", //
-        );
-        chunks_tx.unbounded_send(new_text.to_string()).unwrap();
-        drop(chunks_tx);
-        cx.background_executor.run_until_parked();
-
-        assert_eq!(
-            buffer.read_with(cx, |buffer, cx| buffer.snapshot(cx).text()),
-            indoc! {"
-                func main() {
-                \tx := 0
-                \tfor x < 10 {
-                \t\tx++
-                \t}
-                }
-            "}
-        );
-    }
-
-    #[gpui::test]
-    async fn test_inactive_codegen_alternative(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let text = indoc! {"
-            fn main() {
-                let x = 0;
-            }
-        "};
-        let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(rust_lang(), cx));
-        let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-        let range = buffer.read_with(cx, |buffer, cx| {
-            let snapshot = buffer.snapshot(cx);
-            snapshot.anchor_before(Point::new(1, 0))..snapshot.anchor_after(Point::new(1, 14))
-        });
-        let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
-        let codegen = cx.new(|cx| {
-            CodegenAlternative::new(
-                buffer.clone(),
-                range.clone(),
-                false,
-                None,
-                prompt_builder,
-                cx,
-            )
-        });
-
-        let chunks_tx = simulate_response_stream(&codegen, cx);
-        chunks_tx
-            .unbounded_send("let mut x = 0;\nx += 1;".to_string())
-            .unwrap();
-        drop(chunks_tx);
-        cx.run_until_parked();
-
-        // The codegen is inactive, so the buffer doesn't get modified.
-        assert_eq!(
-            buffer.read_with(cx, |buffer, cx| buffer.snapshot(cx).text()),
-            text
-        );
-
-        // Activating the codegen applies the changes.
-        codegen.update(cx, |codegen, cx| codegen.set_active(true, cx));
-        assert_eq!(
-            buffer.read_with(cx, |buffer, cx| buffer.snapshot(cx).text()),
-            indoc! {"
-                fn main() {
-                    let mut x = 0;
-                    x += 1;
-                }
-            "}
-        );
-
-        // Deactivating the codegen undoes the changes.
-        codegen.update(cx, |codegen, cx| codegen.set_active(false, cx));
-        cx.run_until_parked();
-        assert_eq!(
-            buffer.read_with(cx, |buffer, cx| buffer.snapshot(cx).text()),
-            text
-        );
-    }
-
-    #[gpui::test]
-    async fn test_strip_invalid_spans_from_codeblock() {
-        assert_chunks("Lorem ipsum dolor", "Lorem ipsum dolor").await;
-        assert_chunks("```\nLorem ipsum dolor", "Lorem ipsum dolor").await;
-        assert_chunks("```\nLorem ipsum dolor\n```", "Lorem ipsum dolor").await;
-        assert_chunks(
-            "```html\n```js\nLorem ipsum dolor\n```\n```",
-            "```js\nLorem ipsum dolor\n```",
-        )
-        .await;
-        assert_chunks("``\nLorem ipsum dolor\n```", "``\nLorem ipsum dolor\n```").await;
-        assert_chunks("Lorem<|CURSOR|> ipsum", "Lorem ipsum").await;
-        assert_chunks("Lorem ipsum", "Lorem ipsum").await;
-        assert_chunks("```\n<|CURSOR|>Lorem ipsum\n```", "Lorem ipsum").await;
-
-        async fn assert_chunks(text: &str, expected_text: &str) {
-            for chunk_size in 1..=text.len() {
-                let actual_text = StripInvalidSpans::new(chunks(text, chunk_size))
-                    .map(|chunk| chunk.unwrap())
-                    .collect::<String>()
-                    .await;
-                assert_eq!(
-                    actual_text, expected_text,
-                    "failed to strip invalid spans, chunk size: {}",
-                    chunk_size
-                );
-            }
-        }
-
-        fn chunks(text: &str, size: usize) -> impl Stream<Item = Result<String>> {
-            stream::iter(
-                text.chars()
-                    .collect::<Vec<_>>()
-                    .chunks(size)
-                    .map(|chunk| Ok(chunk.iter().collect::<String>()))
-                    .collect::<Vec<_>>(),
-            )
-        }
-    }
-
-    fn init_test(cx: &mut TestAppContext) {
-        cx.update(LanguageModelRegistry::test);
-        cx.set_global(cx.update(SettingsStore::test));
-    }
-
-    fn simulate_response_stream(
-        codegen: &Entity<CodegenAlternative>,
-        cx: &mut TestAppContext,
-    ) -> mpsc::UnboundedSender<String> {
-        let (chunks_tx, chunks_rx) = mpsc::unbounded();
-        codegen.update(cx, |codegen, cx| {
-            codegen.handle_stream(
-                String::new(),
-                String::new(),
-                None,
-                future::ready(Ok(LanguageModelTextStream {
-                    message_id: None,
-                    stream: chunks_rx.map(Ok).boxed(),
-                    last_token_usage: Arc::new(Mutex::new(TokenUsage::default())),
-                })),
-                cx,
-            );
-        });
-        chunks_tx
-    }
-}
diff --git a/crates/agent_ui/src/completion_provider.rs b/crates/agent_ui/src/completion_provider.rs
deleted file mode 100644
index a2b6e0510e..0000000000
--- a/crates/agent_ui/src/completion_provider.rs
+++ /dev/null
@@ -1,1925 +0,0 @@
-use std::cmp::Reverse;
-use std::ops::Range;
-use std::path::PathBuf;
-use std::sync::Arc;
-use std::sync::atomic::AtomicBool;
-
-use acp_thread::MentionUri;
-use agent::{HistoryEntry, HistoryStore};
-use anyhow::Result;
-use editor::{
-    CompletionProvider, Editor, ExcerptId, code_context_menus::COMPLETION_MENU_MAX_WIDTH,
-};
-use fuzzy::{PathMatch, StringMatch, StringMatchCandidate};
-use gpui::{App, Entity, Task, WeakEntity};
-use language::{Buffer, CodeLabel, CodeLabelBuilder, HighlightId};
-use lsp::CompletionContext;
-use ordered_float::OrderedFloat;
-use project::lsp_store::{CompletionDocumentation, SymbolLocation};
-use project::{
-    Completion, CompletionDisplayOptions, CompletionIntent, CompletionResponse,
-    PathMatchCandidateSet, Project, ProjectPath, Symbol, WorktreeId,
-};
-use prompt_store::{PromptId, PromptStore, UserPromptId};
-use rope::Point;
-use text::{Anchor, ToPoint as _};
-use ui::prelude::*;
-use util::ResultExt as _;
-use util::paths::PathStyle;
-use util::rel_path::RelPath;
-use util::truncate_and_remove_front;
-use workspace::Workspace;
-
-use crate::AgentPanel;
-use crate::mention_set::MentionSet;
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub(crate) enum PromptContextEntry {
-    Mode(PromptContextType),
-    Action(PromptContextAction),
-}
-
-impl PromptContextEntry {
-    pub fn keyword(&self) -> &'static str {
-        match self {
-            Self::Mode(mode) => mode.keyword(),
-            Self::Action(action) => action.keyword(),
-        }
-    }
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub(crate) enum PromptContextType {
-    File,
-    Symbol,
-    Fetch,
-    Thread,
-    Rules,
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub(crate) enum PromptContextAction {
-    AddSelections,
-}
-
-impl PromptContextAction {
-    pub fn keyword(&self) -> &'static str {
-        match self {
-            Self::AddSelections => "selection",
-        }
-    }
-
-    pub fn label(&self) -> &'static str {
-        match self {
-            Self::AddSelections => "Selection",
-        }
-    }
-
-    pub fn icon(&self) -> IconName {
-        match self {
-            Self::AddSelections => IconName::Reader,
-        }
-    }
-}
-
-impl TryFrom<&str> for PromptContextType {
-    type Error = String;
-
-    fn try_from(value: &str) -> Result<Self, Self::Error> {
-        match value {
-            "file" => Ok(Self::File),
-            "symbol" => Ok(Self::Symbol),
-            "fetch" => Ok(Self::Fetch),
-            "thread" => Ok(Self::Thread),
-            "rule" => Ok(Self::Rules),
-            _ => Err(format!("Invalid context picker mode: {}", value)),
-        }
-    }
-}
-
-impl PromptContextType {
-    pub fn keyword(&self) -> &'static str {
-        match self {
-            Self::File => "file",
-            Self::Symbol => "symbol",
-            Self::Fetch => "fetch",
-            Self::Thread => "thread",
-            Self::Rules => "rule",
-        }
-    }
-
-    pub fn label(&self) -> &'static str {
-        match self {
-            Self::File => "Files & Directories",
-            Self::Symbol => "Symbols",
-            Self::Fetch => "Fetch",
-            Self::Thread => "Threads",
-            Self::Rules => "Rules",
-        }
-    }
-
-    pub fn icon(&self) -> IconName {
-        match self {
-            Self::File => IconName::File,
-            Self::Symbol => IconName::Code,
-            Self::Fetch => IconName::ToolWeb,
-            Self::Thread => IconName::Thread,
-            Self::Rules => IconName::Reader,
-        }
-    }
-}
-
-pub(crate) enum Match {
-    File(FileMatch),
-    Symbol(SymbolMatch),
-    Thread(HistoryEntry),
-    RecentThread(HistoryEntry),
-    Fetch(SharedString),
-    Rules(RulesContextEntry),
-    Entry(EntryMatch),
-}
-
-impl Match {
-    pub fn score(&self) -> f64 {
-        match self {
-            Match::File(file) => file.mat.score,
-            Match::Entry(mode) => mode.mat.as_ref().map(|mat| mat.score).unwrap_or(1.),
-            Match::Thread(_) => 1.,
-            Match::RecentThread(_) => 1.,
-            Match::Symbol(_) => 1.,
-            Match::Rules(_) => 1.,
-            Match::Fetch(_) => 1.,
-        }
-    }
-}
-
-pub struct EntryMatch {
-    mat: Option<StringMatch>,
-    entry: PromptContextEntry,
-}
-
-#[derive(Debug, Clone)]
-pub struct RulesContextEntry {
-    pub prompt_id: UserPromptId,
-    pub title: SharedString,
-}
-
-#[derive(Debug, Clone)]
-pub struct AvailableCommand {
-    pub name: Arc<str>,
-    pub description: Arc<str>,
-    pub requires_argument: bool,
-}
-
-pub trait PromptCompletionProviderDelegate: Send + Sync + 'static {
-    fn supports_context(&self, mode: PromptContextType, cx: &App) -> bool {
-        self.supported_modes(cx).contains(&mode)
-    }
-    fn supported_modes(&self, cx: &App) -> Vec<PromptContextType>;
-    fn supports_images(&self, cx: &App) -> bool;
-
-    fn available_commands(&self, cx: &App) -> Vec<AvailableCommand>;
-    fn confirm_command(&self, cx: &mut App);
-}
-
-pub struct PromptCompletionProvider<T: PromptCompletionProviderDelegate> {
-    source: Arc<T>,
-    editor: WeakEntity<Editor>,
-    mention_set: Entity<MentionSet>,
-    history_store: Entity<HistoryStore>,
-    prompt_store: Option<Entity<PromptStore>>,
-    workspace: WeakEntity<Workspace>,
-}
-
-impl<T: PromptCompletionProviderDelegate> PromptCompletionProvider<T> {
-    pub fn new(
-        source: T,
-        editor: WeakEntity<Editor>,
-        mention_set: Entity<MentionSet>,
-        history_store: Entity<HistoryStore>,
-        prompt_store: Option<Entity<PromptStore>>,
-        workspace: WeakEntity<Workspace>,
-    ) -> Self {
-        Self {
-            source: Arc::new(source),
-            editor,
-            mention_set,
-            workspace,
-            history_store,
-            prompt_store,
-        }
-    }
-
-    fn completion_for_entry(
-        entry: PromptContextEntry,
-        source_range: Range<Anchor>,
-        editor: WeakEntity<Editor>,
-        mention_set: WeakEntity<MentionSet>,
-        workspace: &Entity<Workspace>,
-        cx: &mut App,
-    ) -> Option<Completion> {
-        match entry {
-            PromptContextEntry::Mode(mode) => Some(Completion {
-                replace_range: source_range,
-                new_text: format!("@{} ", mode.keyword()),
-                label: CodeLabel::plain(mode.label().to_string(), None),
-                icon_path: Some(mode.icon().path().into()),
-                documentation: None,
-                source: project::CompletionSource::Custom,
-                match_start: None,
-                snippet_deduplication_key: None,
-                insert_text_mode: None,
-                // This ensures that when a user accepts this completion, the
-                // completion menu will still be shown after "@category " is
-                // inserted
-                confirm: Some(Arc::new(|_, _, _| true)),
-            }),
-            PromptContextEntry::Action(action) => Self::completion_for_action(
-                action,
-                source_range,
-                editor,
-                mention_set,
-                workspace,
-                cx,
-            ),
-        }
-    }
-
-    fn completion_for_thread(
-        thread_entry: HistoryEntry,
-        source_range: Range<Anchor>,
-        recent: bool,
-        source: Arc<T>,
-        editor: WeakEntity<Editor>,
-        mention_set: WeakEntity<MentionSet>,
-        workspace: Entity<Workspace>,
-        cx: &mut App,
-    ) -> Completion {
-        let uri = thread_entry.mention_uri();
-
-        let icon_for_completion = if recent {
-            IconName::HistoryRerun.path().into()
-        } else {
-            uri.icon_path(cx)
-        };
-
-        let new_text = format!("{} ", uri.as_link());
-
-        let new_text_len = new_text.len();
-        Completion {
-            replace_range: source_range.clone(),
-            new_text,
-            label: CodeLabel::plain(thread_entry.title().to_string(), None),
-            documentation: None,
-            insert_text_mode: None,
-            source: project::CompletionSource::Custom,
-            match_start: None,
-            snippet_deduplication_key: None,
-            icon_path: Some(icon_for_completion),
-            confirm: Some(confirm_completion_callback(
-                thread_entry.title().clone(),
-                source_range.start,
-                new_text_len - 1,
-                uri,
-                source,
-                editor,
-                mention_set,
-                workspace,
-            )),
-        }
-    }
-
-    fn completion_for_rules(
-        rule: RulesContextEntry,
-        source_range: Range<Anchor>,
-        source: Arc<T>,
-        editor: WeakEntity<Editor>,
-        mention_set: WeakEntity<MentionSet>,
-        workspace: Entity<Workspace>,
-        cx: &mut App,
-    ) -> Completion {
-        let uri = MentionUri::Rule {
-            id: rule.prompt_id.into(),
-            name: rule.title.to_string(),
-        };
-        let new_text = format!("{} ", uri.as_link());
-        let new_text_len = new_text.len();
-        let icon_path = uri.icon_path(cx);
-        Completion {
-            replace_range: source_range.clone(),
-            new_text,
-            label: CodeLabel::plain(rule.title.to_string(), None),
-            documentation: None,
-            insert_text_mode: None,
-            source: project::CompletionSource::Custom,
-            match_start: None,
-            snippet_deduplication_key: None,
-            icon_path: Some(icon_path),
-            confirm: Some(confirm_completion_callback(
-                rule.title,
-                source_range.start,
-                new_text_len - 1,
-                uri,
-                source,
-                editor,
-                mention_set,
-                workspace,
-            )),
-        }
-    }
-
-    pub(crate) fn completion_for_path(
-        project_path: ProjectPath,
-        path_prefix: &RelPath,
-        is_recent: bool,
-        is_directory: bool,
-        source_range: Range<Anchor>,
-        source: Arc<T>,
-        editor: WeakEntity<Editor>,
-        mention_set: WeakEntity<MentionSet>,
-        workspace: Entity<Workspace>,
-        project: Entity<Project>,
-        label_max_chars: usize,
-        cx: &mut App,
-    ) -> Option<Completion> {
-        let path_style = project.read(cx).path_style(cx);
-        let (file_name, directory) =
-            extract_file_name_and_directory(&project_path.path, path_prefix, path_style);
-
-        let label = build_code_label_for_path(
-            &file_name,
-            directory.as_ref().map(|s| s.as_ref()),
-            None,
-            label_max_chars,
-            cx,
-        );
-
-        let abs_path = project.read(cx).absolute_path(&project_path, cx)?;
-
-        let uri = if is_directory {
-            MentionUri::Directory { abs_path }
-        } else {
-            MentionUri::File { abs_path }
-        };
-
-        let crease_icon_path = uri.icon_path(cx);
-        let completion_icon_path = if is_recent {
-            IconName::HistoryRerun.path().into()
-        } else {
-            crease_icon_path
-        };
-
-        let new_text = format!("{} ", uri.as_link());
-        let new_text_len = new_text.len();
-        Some(Completion {
-            replace_range: source_range.clone(),
-            new_text,
-            label,
-            documentation: None,
-            source: project::CompletionSource::Custom,
-            icon_path: Some(completion_icon_path),
-            match_start: None,
-            snippet_deduplication_key: None,
-            insert_text_mode: None,
-            confirm: Some(confirm_completion_callback(
-                file_name,
-                source_range.start,
-                new_text_len - 1,
-                uri,
-                source,
-                editor,
-                mention_set,
-                workspace,
-            )),
-        })
-    }
-
-    fn completion_for_symbol(
-        symbol: Symbol,
-        source_range: Range<Anchor>,
-        source: Arc<T>,
-        editor: WeakEntity<Editor>,
-        mention_set: WeakEntity<MentionSet>,
-        workspace: Entity<Workspace>,
-        label_max_chars: usize,
-        cx: &mut App,
-    ) -> Option<Completion> {
-        let project = workspace.read(cx).project().clone();
-
-        let (abs_path, file_name) = match &symbol.path {
-            SymbolLocation::InProject(project_path) => (
-                project.read(cx).absolute_path(&project_path, cx)?,
-                project_path.path.file_name()?.to_string().into(),
-            ),
-            SymbolLocation::OutsideProject {
-                abs_path,
-                signature: _,
-            } => (
-                PathBuf::from(abs_path.as_ref()),
-                abs_path.file_name().map(|f| f.to_string_lossy())?,
-            ),
-        };
-
-        let label = build_code_label_for_path(
-            &symbol.name,
-            Some(&file_name),
-            Some(symbol.range.start.0.row + 1),
-            label_max_chars,
-            cx,
-        );
-
-        let uri = MentionUri::Symbol {
-            abs_path,
-            name: symbol.name.clone(),
-            line_range: symbol.range.start.0.row..=symbol.range.end.0.row,
-        };
-        let new_text = format!("{} ", uri.as_link());
-        let new_text_len = new_text.len();
-        let icon_path = uri.icon_path(cx);
-        Some(Completion {
-            replace_range: source_range.clone(),
-            new_text,
-            label,
-            documentation: None,
-            source: project::CompletionSource::Custom,
-            icon_path: Some(icon_path),
-            match_start: None,
-            snippet_deduplication_key: None,
-            insert_text_mode: None,
-            confirm: Some(confirm_completion_callback(
-                symbol.name.into(),
-                source_range.start,
-                new_text_len - 1,
-                uri,
-                source,
-                editor,
-                mention_set,
-                workspace,
-            )),
-        })
-    }
-
-    fn completion_for_fetch(
-        source_range: Range<Anchor>,
-        url_to_fetch: SharedString,
-        source: Arc<T>,
-        editor: WeakEntity<Editor>,
-        mention_set: WeakEntity<MentionSet>,
-        workspace: Entity<Workspace>,
-        cx: &mut App,
-    ) -> Option<Completion> {
-        let new_text = format!("@fetch {} ", url_to_fetch);
-        let url_to_fetch = url::Url::parse(url_to_fetch.as_ref())
-            .or_else(|_| url::Url::parse(&format!("https://{url_to_fetch}")))
-            .ok()?;
-        let mention_uri = MentionUri::Fetch {
-            url: url_to_fetch.clone(),
-        };
-        let icon_path = mention_uri.icon_path(cx);
-        Some(Completion {
-            replace_range: source_range.clone(),
-            new_text: new_text.clone(),
-            label: CodeLabel::plain(url_to_fetch.to_string(), None),
-            documentation: None,
-            source: project::CompletionSource::Custom,
-            icon_path: Some(icon_path),
-            match_start: None,
-            snippet_deduplication_key: None,
-            insert_text_mode: None,
-            confirm: Some(confirm_completion_callback(
-                url_to_fetch.to_string().into(),
-                source_range.start,
-                new_text.len() - 1,
-                mention_uri,
-                source,
-                editor,
-                mention_set,
-                workspace,
-            )),
-        })
-    }
-
-    pub(crate) fn completion_for_action(
-        action: PromptContextAction,
-        source_range: Range<Anchor>,
-        editor: WeakEntity<Editor>,
-        mention_set: WeakEntity<MentionSet>,
-        workspace: &Entity<Workspace>,
-        cx: &mut App,
-    ) -> Option<Completion> {
-        let (new_text, on_action) = match action {
-            PromptContextAction::AddSelections => {
-                const PLACEHOLDER: &str = "selection ";
-                let selections = selection_ranges(workspace, cx)
-                    .into_iter()
-                    .enumerate()
-                    .map(|(ix, (buffer, range))| {
-                        (
-                            buffer,
-                            range,
-                            (PLACEHOLDER.len() * ix)..(PLACEHOLDER.len() * (ix + 1) - 1),
-                        )
-                    })
-                    .collect::<Vec<_>>();
-
-                let new_text: String = PLACEHOLDER.repeat(selections.len());
-
-                let callback = Arc::new({
-                    let source_range = source_range.clone();
-                    move |_, window: &mut Window, cx: &mut App| {
-                        let editor = editor.clone();
-                        let selections = selections.clone();
-                        let mention_set = mention_set.clone();
-                        let source_range = source_range.clone();
-                        window.defer(cx, move |window, cx| {
-                            if let Some(editor) = editor.upgrade() {
-                                mention_set
-                                    .update(cx, |store, cx| {
-                                        store.confirm_mention_for_selection(
-                                            source_range,
-                                            selections,
-                                            editor,
-                                            window,
-                                            cx,
-                                        )
-                                    })
-                                    .ok();
-                            }
-                        });
-                        false
-                    }
-                });
-
-                (new_text, callback)
-            }
-        };
-
-        Some(Completion {
-            replace_range: source_range,
-            new_text,
-            label: CodeLabel::plain(action.label().to_string(), None),
-            icon_path: Some(action.icon().path().into()),
-            documentation: None,
-            source: project::CompletionSource::Custom,
-            match_start: None,
-            snippet_deduplication_key: None,
-            insert_text_mode: None,
-            // This ensures that when a user accepts this completion, the
-            // completion menu will still be shown after "@category " is
-            // inserted
-            confirm: Some(on_action),
-        })
-    }
-
-    fn search_slash_commands(&self, query: String, cx: &mut App) -> Task<Vec<AvailableCommand>> {
-        let commands = self.source.available_commands(cx);
-        if commands.is_empty() {
-            return Task::ready(Vec::new());
-        }
-
-        cx.spawn(async move |cx| {
-            let candidates = commands
-                .iter()
-                .enumerate()
-                .map(|(id, command)| StringMatchCandidate::new(id, &command.name))
-                .collect::<Vec<_>>();
-
-            let matches = fuzzy::match_strings(
-                &candidates,
-                &query,
-                false,
-                true,
-                100,
-                &Arc::new(AtomicBool::default()),
-                cx.background_executor().clone(),
-            )
-            .await;
-
-            matches
-                .into_iter()
-                .map(|mat| commands[mat.candidate_id].clone())
-                .collect()
-        })
-    }
-
-    fn search_mentions(
-        &self,
-        mode: Option<PromptContextType>,
-        query: String,
-        cancellation_flag: Arc<AtomicBool>,
-        cx: &mut App,
-    ) -> Task<Vec<Match>> {
-        let Some(workspace) = self.workspace.upgrade() else {
-            return Task::ready(Vec::default());
-        };
-        match mode {
-            Some(PromptContextType::File) => {
-                let search_files_task = search_files(query, cancellation_flag, &workspace, cx);
-                cx.background_spawn(async move {
-                    search_files_task
-                        .await
-                        .into_iter()
-                        .map(Match::File)
-                        .collect()
-                })
-            }
-
-            Some(PromptContextType::Symbol) => {
-                let search_symbols_task = search_symbols(query, cancellation_flag, &workspace, cx);
-                cx.background_spawn(async move {
-                    search_symbols_task
-                        .await
-                        .into_iter()
-                        .map(Match::Symbol)
-                        .collect()
-                })
-            }
-
-            Some(PromptContextType::Thread) => {
-                let search_threads_task =
-                    search_threads(query, cancellation_flag, &self.history_store, cx);
-                cx.background_spawn(async move {
-                    search_threads_task
-                        .await
-                        .into_iter()
-                        .map(Match::Thread)
-                        .collect()
-                })
-            }
-
-            Some(PromptContextType::Fetch) => {
-                if !query.is_empty() {
-                    Task::ready(vec![Match::Fetch(query.into())])
-                } else {
-                    Task::ready(Vec::new())
-                }
-            }
-
-            Some(PromptContextType::Rules) => {
-                if let Some(prompt_store) = self.prompt_store.as_ref() {
-                    let search_rules_task =
-                        search_rules(query, cancellation_flag, prompt_store, cx);
-                    cx.background_spawn(async move {
-                        search_rules_task
-                            .await
-                            .into_iter()
-                            .map(Match::Rules)
-                            .collect::<Vec<_>>()
-                    })
-                } else {
-                    Task::ready(Vec::new())
-                }
-            }
-
-            None if query.is_empty() => {
-                let mut matches = self.recent_context_picker_entries(&workspace, cx);
-
-                matches.extend(
-                    self.available_context_picker_entries(&workspace, cx)
-                        .into_iter()
-                        .map(|mode| {
-                            Match::Entry(EntryMatch {
-                                entry: mode,
-                                mat: None,
-                            })
-                        }),
-                );
-
-                Task::ready(matches)
-            }
-            None => {
-                let executor = cx.background_executor().clone();
-
-                let search_files_task =
-                    search_files(query.clone(), cancellation_flag, &workspace, cx);
-
-                let entries = self.available_context_picker_entries(&workspace, cx);
-                let entry_candidates = entries
-                    .iter()
-                    .enumerate()
-                    .map(|(ix, entry)| StringMatchCandidate::new(ix, entry.keyword()))
-                    .collect::<Vec<_>>();
-
-                cx.background_spawn(async move {
-                    let mut matches = search_files_task
-                        .await
-                        .into_iter()
-                        .map(Match::File)
-                        .collect::<Vec<_>>();
-
-                    let entry_matches = fuzzy::match_strings(
-                        &entry_candidates,
-                        &query,
-                        false,
-                        true,
-                        100,
-                        &Arc::new(AtomicBool::default()),
-                        executor,
-                    )
-                    .await;
-
-                    matches.extend(entry_matches.into_iter().map(|mat| {
-                        Match::Entry(EntryMatch {
-                            entry: entries[mat.candidate_id],
-                            mat: Some(mat),
-                        })
-                    }));
-
-                    matches.sort_by(|a, b| {
-                        b.score()
-                            .partial_cmp(&a.score())
-                            .unwrap_or(std::cmp::Ordering::Equal)
-                    });
-
-                    matches
-                })
-            }
-        }
-    }
-
-    fn recent_context_picker_entries(
-        &self,
-        workspace: &Entity<Workspace>,
-        cx: &mut App,
-    ) -> Vec<Match> {
-        let mut recent = Vec::with_capacity(6);
-
-        let mut mentions = self
-            .mention_set
-            .read_with(cx, |store, _cx| store.mentions());
-        let workspace = workspace.read(cx);
-        let project = workspace.project().read(cx);
-        let include_root_name = workspace.visible_worktrees(cx).count() > 1;
-
-        if let Some(agent_panel) = workspace.panel::<AgentPanel>(cx)
-            && let Some(thread) = agent_panel.read(cx).active_agent_thread(cx)
-        {
-            let thread = thread.read(cx);
-            mentions.insert(MentionUri::Thread {
-                id: thread.session_id().clone(),
-                name: thread.title().into(),
-            });
-        }
-
-        recent.extend(
-            workspace
-                .recent_navigation_history_iter(cx)
-                .filter(|(_, abs_path)| {
-                    abs_path.as_ref().is_none_or(|path| {
-                        !mentions.contains(&MentionUri::File {
-                            abs_path: path.clone(),
-                        })
-                    })
-                })
-                .take(4)
-                .filter_map(|(project_path, _)| {
-                    project
-                        .worktree_for_id(project_path.worktree_id, cx)
-                        .map(|worktree| {
-                            let path_prefix = if include_root_name {
-                                worktree.read(cx).root_name().into()
-                            } else {
-                                RelPath::empty().into()
-                            };
-                            Match::File(FileMatch {
-                                mat: fuzzy::PathMatch {
-                                    score: 1.,
-                                    positions: Vec::new(),
-                                    worktree_id: project_path.worktree_id.to_usize(),
-                                    path: project_path.path,
-                                    path_prefix,
-                                    is_dir: false,
-                                    distance_to_relative_ancestor: 0,
-                                },
-                                is_recent: true,
-                            })
-                        })
-                }),
-        );
-
-        if self.source.supports_context(PromptContextType::Thread, cx) {
-            const RECENT_COUNT: usize = 2;
-            let threads = self
-                .history_store
-                .read(cx)
-                .recently_opened_entries(cx)
-                .into_iter()
-                .filter(|thread| !mentions.contains(&thread.mention_uri()))
-                .take(RECENT_COUNT)
-                .collect::<Vec<_>>();
-
-            recent.extend(threads.into_iter().map(Match::RecentThread));
-        }
-
-        recent
-    }
-
-    fn available_context_picker_entries(
-        &self,
-        workspace: &Entity<Workspace>,
-        cx: &mut App,
-    ) -> Vec<PromptContextEntry> {
-        let mut entries = vec![
-            PromptContextEntry::Mode(PromptContextType::File),
-            PromptContextEntry::Mode(PromptContextType::Symbol),
-        ];
-
-        if self.source.supports_context(PromptContextType::Thread, cx) {
-            entries.push(PromptContextEntry::Mode(PromptContextType::Thread));
-        }
-
-        let has_selection = workspace
-            .read(cx)
-            .active_item(cx)
-            .and_then(|item| item.downcast::<Editor>())
-            .is_some_and(|editor| {
-                editor.update(cx, |editor, cx| {
-                    editor.has_non_empty_selection(&editor.display_snapshot(cx))
-                })
-            });
-        if has_selection {
-            entries.push(PromptContextEntry::Action(
-                PromptContextAction::AddSelections,
-            ));
-        }
-
-        if self.prompt_store.is_some() && self.source.supports_context(PromptContextType::Rules, cx)
-        {
-            entries.push(PromptContextEntry::Mode(PromptContextType::Rules));
-        }
-
-        if self.source.supports_context(PromptContextType::Fetch, cx) {
-            entries.push(PromptContextEntry::Mode(PromptContextType::Fetch));
-        }
-
-        entries
-    }
-}
-
-impl<T: PromptCompletionProviderDelegate> CompletionProvider for PromptCompletionProvider<T> {
-    fn completions(
-        &self,
-        _excerpt_id: ExcerptId,
-        buffer: &Entity<Buffer>,
-        buffer_position: Anchor,
-        _trigger: CompletionContext,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) -> Task<Result<Vec<CompletionResponse>>> {
-        let state = buffer.update(cx, |buffer, cx| {
-            let position = buffer_position.to_point(buffer);
-            let line_start = Point::new(position.row, 0);
-            let offset_to_line = buffer.point_to_offset(line_start);
-            let mut lines = buffer.text_for_range(line_start..position).lines();
-            let line = lines.next()?;
-            PromptCompletion::try_parse(line, offset_to_line, &self.source.supported_modes(cx))
-        });
-        let Some(state) = state else {
-            return Task::ready(Ok(Vec::new()));
-        };
-
-        let Some(workspace) = self.workspace.upgrade() else {
-            return Task::ready(Ok(Vec::new()));
-        };
-
-        let project = workspace.read(cx).project().clone();
-        let snapshot = buffer.read(cx).snapshot();
-        let source_range = snapshot.anchor_before(state.source_range().start)
-            ..snapshot.anchor_after(state.source_range().end);
-
-        let source = self.source.clone();
-        let editor = self.editor.clone();
-        let mention_set = self.mention_set.downgrade();
-        match state {
-            PromptCompletion::SlashCommand(SlashCommandCompletion {
-                command, argument, ..
-            }) => {
-                let search_task = self.search_slash_commands(command.unwrap_or_default(), cx);
-                cx.background_spawn(async move {
-                    let completions = search_task
-                        .await
-                        .into_iter()
-                        .map(|command| {
-                            let new_text = if let Some(argument) = argument.as_ref() {
-                                format!("/{} {}", command.name, argument)
-                            } else {
-                                format!("/{} ", command.name)
-                            };
-
-                            let is_missing_argument =
-                                command.requires_argument && argument.is_none();
-                            Completion {
-                                replace_range: source_range.clone(),
-                                new_text,
-                                label: CodeLabel::plain(command.name.to_string(), None),
-                                documentation: Some(CompletionDocumentation::MultiLinePlainText(
-                                    command.description.into(),
-                                )),
-                                source: project::CompletionSource::Custom,
-                                icon_path: None,
-                                match_start: None,
-                                snippet_deduplication_key: None,
-                                insert_text_mode: None,
-                                confirm: Some(Arc::new({
-                                    let source = source.clone();
-                                    move |intent, _window, cx| {
-                                        if !is_missing_argument {
-                                            cx.defer({
-                                                let source = source.clone();
-                                                move |cx| match intent {
-                                                    CompletionIntent::Complete
-                                                    | CompletionIntent::CompleteWithInsert
-                                                    | CompletionIntent::CompleteWithReplace => {
-                                                        source.confirm_command(cx);
-                                                    }
-                                                    CompletionIntent::Compose => {}
-                                                }
-                                            });
-                                        }
-                                        false
-                                    }
-                                })),
-                            }
-                        })
-                        .collect();
-
-                    Ok(vec![CompletionResponse {
-                        completions,
-                        display_options: CompletionDisplayOptions {
-                            dynamic_width: true,
-                        },
-                        // Since this does its own filtering (see `filter_completions()` returns false),
-                        // there is no benefit to computing whether this set of completions is incomplete.
-                        is_incomplete: true,
-                    }])
-                })
-            }
-            PromptCompletion::Mention(MentionCompletion { mode, argument, .. }) => {
-                let query = argument.unwrap_or_default();
-                let search_task =
-                    self.search_mentions(mode, query, Arc::<AtomicBool>::default(), cx);
-
-                // Calculate maximum characters available for the full label (file_name + space + directory)
-                // based on maximum menu width after accounting for padding, spacing, and icon width
-                let label_max_chars = {
-                    // Base06 left padding + Base06 gap + Base06 right padding + icon width
-                    let used_pixels = DynamicSpacing::Base06.px(cx) * 3.0
-                        + IconSize::XSmall.rems() * window.rem_size();
-
-                    let style = window.text_style();
-                    let font_id = window.text_system().resolve_font(&style.font());
-                    let font_size = TextSize::Small.rems(cx).to_pixels(window.rem_size());
-
-                    // Fallback em_width of 10px matches file_finder.rs fallback for TextSize::Small
-                    let em_width = cx
-                        .text_system()
-                        .em_width(font_id, font_size)
-                        .unwrap_or(px(10.0));
-
-                    // Calculate available pixels for text (file_name + directory)
-                    // Using max width since dynamic_width allows the menu to expand up to this
-                    let available_pixels = COMPLETION_MENU_MAX_WIDTH - used_pixels;
-
-                    // Convert to character count (total available for file_name + directory)
-                    (f32::from(available_pixels) / f32::from(em_width)) as usize
-                };
-
-                cx.spawn(async move |_, cx| {
-                    let matches = search_task.await;
-
-                    let completions = cx.update(|cx| {
-                        matches
-                            .into_iter()
-                            .filter_map(|mat| match mat {
-                                Match::File(FileMatch { mat, is_recent }) => {
-                                    let project_path = ProjectPath {
-                                        worktree_id: WorktreeId::from_usize(mat.worktree_id),
-                                        path: mat.path.clone(),
-                                    };
-
-                                    // If path is empty, this means we're matching with the root directory itself
-                                    // so we use the path_prefix as the name
-                                    let path_prefix = if mat.path.is_empty() {
-                                        project
-                                            .read(cx)
-                                            .worktree_for_id(project_path.worktree_id, cx)
-                                            .map(|wt| wt.read(cx).root_name().into())
-                                            .unwrap_or_else(|| mat.path_prefix.clone())
-                                    } else {
-                                        mat.path_prefix.clone()
-                                    };
-
-                                    Self::completion_for_path(
-                                        project_path,
-                                        &path_prefix,
-                                        is_recent,
-                                        mat.is_dir,
-                                        source_range.clone(),
-                                        source.clone(),
-                                        editor.clone(),
-                                        mention_set.clone(),
-                                        workspace.clone(),
-                                        project.clone(),
-                                        label_max_chars,
-                                        cx,
-                                    )
-                                }
-
-                                Match::Symbol(SymbolMatch { symbol, .. }) => {
-                                    Self::completion_for_symbol(
-                                        symbol,
-                                        source_range.clone(),
-                                        source.clone(),
-                                        editor.clone(),
-                                        mention_set.clone(),
-                                        workspace.clone(),
-                                        label_max_chars,
-                                        cx,
-                                    )
-                                }
-
-                                Match::Thread(thread) => Some(Self::completion_for_thread(
-                                    thread,
-                                    source_range.clone(),
-                                    false,
-                                    source.clone(),
-                                    editor.clone(),
-                                    mention_set.clone(),
-                                    workspace.clone(),
-                                    cx,
-                                )),
-
-                                Match::RecentThread(thread) => Some(Self::completion_for_thread(
-                                    thread,
-                                    source_range.clone(),
-                                    true,
-                                    source.clone(),
-                                    editor.clone(),
-                                    mention_set.clone(),
-                                    workspace.clone(),
-                                    cx,
-                                )),
-
-                                Match::Rules(user_rules) => Some(Self::completion_for_rules(
-                                    user_rules,
-                                    source_range.clone(),
-                                    source.clone(),
-                                    editor.clone(),
-                                    mention_set.clone(),
-                                    workspace.clone(),
-                                    cx,
-                                )),
-
-                                Match::Fetch(url) => Self::completion_for_fetch(
-                                    source_range.clone(),
-                                    url,
-                                    source.clone(),
-                                    editor.clone(),
-                                    mention_set.clone(),
-                                    workspace.clone(),
-                                    cx,
-                                ),
-
-                                Match::Entry(EntryMatch { entry, .. }) => {
-                                    Self::completion_for_entry(
-                                        entry,
-                                        source_range.clone(),
-                                        editor.clone(),
-                                        mention_set.clone(),
-                                        &workspace,
-                                        cx,
-                                    )
-                                }
-                            })
-                            .collect()
-                    })?;
-
-                    Ok(vec![CompletionResponse {
-                        completions,
-                        display_options: CompletionDisplayOptions {
-                            dynamic_width: true,
-                        },
-                        // Since this does its own filtering (see `filter_completions()` returns false),
-                        // there is no benefit to computing whether this set of completions is incomplete.
-                        is_incomplete: true,
-                    }])
-                })
-            }
-        }
-    }
-
-    fn is_completion_trigger(
-        &self,
-        buffer: &Entity<language::Buffer>,
-        position: language::Anchor,
-        _text: &str,
-        _trigger_in_words: bool,
-        cx: &mut Context<Editor>,
-    ) -> bool {
-        let buffer = buffer.read(cx);
-        let position = position.to_point(buffer);
-        let line_start = Point::new(position.row, 0);
-        let offset_to_line = buffer.point_to_offset(line_start);
-        let mut lines = buffer.text_for_range(line_start..position).lines();
-        if let Some(line) = lines.next() {
-            PromptCompletion::try_parse(line, offset_to_line, &self.source.supported_modes(cx))
-                .filter(|completion| {
-                    // Right now we don't support completing arguments of slash commands
-                    let is_slash_command_with_argument = matches!(
-                        completion,
-                        PromptCompletion::SlashCommand(SlashCommandCompletion {
-                            argument: Some(_),
-                            ..
-                        })
-                    );
-                    !is_slash_command_with_argument
-                })
-                .map(|completion| {
-                    completion.source_range().start <= offset_to_line + position.column as usize
-                        && completion.source_range().end
-                            >= offset_to_line + position.column as usize
-                })
-                .unwrap_or(false)
-        } else {
-            false
-        }
-    }
-
-    fn sort_completions(&self) -> bool {
-        false
-    }
-
-    fn filter_completions(&self) -> bool {
-        false
-    }
-}
-
-fn confirm_completion_callback<T: PromptCompletionProviderDelegate>(
-    crease_text: SharedString,
-    start: Anchor,
-    content_len: usize,
-    mention_uri: MentionUri,
-    source: Arc<T>,
-    editor: WeakEntity<Editor>,
-    mention_set: WeakEntity<MentionSet>,
-    workspace: Entity<Workspace>,
-) -> Arc<dyn Fn(CompletionIntent, &mut Window, &mut App) -> bool + Send + Sync> {
-    Arc::new(move |_, window, cx| {
-        let source = source.clone();
-        let editor = editor.clone();
-        let mention_set = mention_set.clone();
-        let crease_text = crease_text.clone();
-        let mention_uri = mention_uri.clone();
-        let workspace = workspace.clone();
-        window.defer(cx, move |window, cx| {
-            if let Some(editor) = editor.upgrade() {
-                mention_set
-                    .clone()
-                    .update(cx, |mention_set, cx| {
-                        mention_set
-                            .confirm_mention_completion(
-                                crease_text,
-                                start,
-                                content_len,
-                                mention_uri,
-                                source.supports_images(cx),
-                                editor,
-                                &workspace,
-                                window,
-                                cx,
-                            )
-                            .detach();
-                    })
-                    .ok();
-            }
-        });
-        false
-    })
-}
-
-#[derive(Debug, PartialEq)]
-enum PromptCompletion {
-    SlashCommand(SlashCommandCompletion),
-    Mention(MentionCompletion),
-}
-
-impl PromptCompletion {
-    fn source_range(&self) -> Range<usize> {
-        match self {
-            Self::SlashCommand(completion) => completion.source_range.clone(),
-            Self::Mention(completion) => completion.source_range.clone(),
-        }
-    }
-
-    fn try_parse(
-        line: &str,
-        offset_to_line: usize,
-        supported_modes: &[PromptContextType],
-    ) -> Option<Self> {
-        if line.contains('@') {
-            if let Some(mention) =
-                MentionCompletion::try_parse(line, offset_to_line, supported_modes)
-            {
-                return Some(Self::Mention(mention));
-            }
-        }
-        SlashCommandCompletion::try_parse(line, offset_to_line).map(Self::SlashCommand)
-    }
-}
-
-#[derive(Debug, Default, PartialEq)]
-pub struct SlashCommandCompletion {
-    pub source_range: Range<usize>,
-    pub command: Option<String>,
-    pub argument: Option<String>,
-}
-
-impl SlashCommandCompletion {
-    pub fn try_parse(line: &str, offset_to_line: usize) -> Option<Self> {
-        // If we decide to support commands that are not at the beginning of the prompt, we can remove this check
-        if !line.starts_with('/') || offset_to_line != 0 {
-            return None;
-        }
-
-        let (prefix, last_command) = line.rsplit_once('/')?;
-        if prefix.chars().last().is_some_and(|c| !c.is_whitespace())
-            || last_command.starts_with(char::is_whitespace)
-        {
-            return None;
-        }
-
-        let mut argument = None;
-        let mut command = None;
-        if let Some((command_text, args)) = last_command.split_once(char::is_whitespace) {
-            if !args.is_empty() {
-                argument = Some(args.trim_end().to_string());
-            }
-            command = Some(command_text.to_string());
-        } else if !last_command.is_empty() {
-            command = Some(last_command.to_string());
-        };
-
-        Some(Self {
-            source_range: prefix.len() + offset_to_line
-                ..line
-                    .rfind(|c: char| !c.is_whitespace())
-                    .unwrap_or_else(|| line.len())
-                    + 1
-                    + offset_to_line,
-            command,
-            argument,
-        })
-    }
-}
-
-#[derive(Debug, Default, PartialEq)]
-struct MentionCompletion {
-    source_range: Range<usize>,
-    mode: Option<PromptContextType>,
-    argument: Option<String>,
-}
-
-impl MentionCompletion {
-    fn try_parse(
-        line: &str,
-        offset_to_line: usize,
-        supported_modes: &[PromptContextType],
-    ) -> Option<Self> {
-        let last_mention_start = line.rfind('@')?;
-
-        // No whitespace immediately after '@'
-        if line[last_mention_start + 1..]
-            .chars()
-            .next()
-            .is_some_and(|c| c.is_whitespace())
-        {
-            return None;
-        }
-
-        //  Must be a word boundary before '@'
-        if last_mention_start > 0
-            && line[..last_mention_start]
-                .chars()
-                .last()
-                .is_some_and(|c| !c.is_whitespace())
-        {
-            return None;
-        }
-
-        let rest_of_line = &line[last_mention_start + 1..];
-
-        let mut mode = None;
-        let mut argument = None;
-
-        let mut parts = rest_of_line.split_whitespace();
-        let mut end = last_mention_start + 1;
-
-        if let Some(mode_text) = parts.next() {
-            // Safe since we check no leading whitespace above
-            end += mode_text.len();
-
-            if let Some(parsed_mode) = PromptContextType::try_from(mode_text).ok()
-                && supported_modes.contains(&parsed_mode)
-            {
-                mode = Some(parsed_mode);
-            } else {
-                argument = Some(mode_text.to_string());
-            }
-            match rest_of_line[mode_text.len()..].find(|c: char| !c.is_whitespace()) {
-                Some(whitespace_count) => {
-                    if let Some(argument_text) = parts.next() {
-                        // If mode wasn't recognized but we have an argument, don't suggest completions
-                        // (e.g. '@something word')
-                        if mode.is_none() && !argument_text.is_empty() {
-                            return None;
-                        }
-
-                        argument = Some(argument_text.to_string());
-                        end += whitespace_count + argument_text.len();
-                    }
-                }
-                None => {
-                    // Rest of line is entirely whitespace
-                    end += rest_of_line.len() - mode_text.len();
-                }
-            }
-        }
-
-        Some(Self {
-            source_range: last_mention_start + offset_to_line..end + offset_to_line,
-            mode,
-            argument,
-        })
-    }
-}
-
-pub(crate) fn search_files(
-    query: String,
-    cancellation_flag: Arc<AtomicBool>,
-    workspace: &Entity<Workspace>,
-    cx: &App,
-) -> Task<Vec<FileMatch>> {
-    if query.is_empty() {
-        let workspace = workspace.read(cx);
-        let project = workspace.project().read(cx);
-        let visible_worktrees = workspace.visible_worktrees(cx).collect::<Vec<_>>();
-        let include_root_name = visible_worktrees.len() > 1;
-
-        let recent_matches = workspace
-            .recent_navigation_history(Some(10), cx)
-            .into_iter()
-            .map(|(project_path, _)| {
-                let path_prefix = if include_root_name {
-                    project
-                        .worktree_for_id(project_path.worktree_id, cx)
-                        .map(|wt| wt.read(cx).root_name().into())
-                        .unwrap_or_else(|| RelPath::empty().into())
-                } else {
-                    RelPath::empty().into()
-                };
-
-                FileMatch {
-                    mat: PathMatch {
-                        score: 0.,
-                        positions: Vec::new(),
-                        worktree_id: project_path.worktree_id.to_usize(),
-                        path: project_path.path,
-                        path_prefix,
-                        distance_to_relative_ancestor: 0,
-                        is_dir: false,
-                    },
-                    is_recent: true,
-                }
-            });
-
-        let file_matches = visible_worktrees.into_iter().flat_map(|worktree| {
-            let worktree = worktree.read(cx);
-            let path_prefix: Arc<RelPath> = if include_root_name {
-                worktree.root_name().into()
-            } else {
-                RelPath::empty().into()
-            };
-            worktree.entries(false, 0).map(move |entry| FileMatch {
-                mat: PathMatch {
-                    score: 0.,
-                    positions: Vec::new(),
-                    worktree_id: worktree.id().to_usize(),
-                    path: entry.path.clone(),
-                    path_prefix: path_prefix.clone(),
-                    distance_to_relative_ancestor: 0,
-                    is_dir: entry.is_dir(),
-                },
-                is_recent: false,
-            })
-        });
-
-        Task::ready(recent_matches.chain(file_matches).collect())
-    } else {
-        let worktrees = workspace.read(cx).visible_worktrees(cx).collect::<Vec<_>>();
-        let include_root_name = worktrees.len() > 1;
-        let candidate_sets = worktrees
-            .into_iter()
-            .map(|worktree| {
-                let worktree = worktree.read(cx);
-
-                PathMatchCandidateSet {
-                    snapshot: worktree.snapshot(),
-                    include_ignored: worktree.root_entry().is_some_and(|entry| entry.is_ignored),
-                    include_root_name,
-                    candidates: project::Candidates::Entries,
-                }
-            })
-            .collect::<Vec<_>>();
-
-        let executor = cx.background_executor().clone();
-        cx.foreground_executor().spawn(async move {
-            fuzzy::match_path_sets(
-                candidate_sets.as_slice(),
-                query.as_str(),
-                &None,
-                false,
-                100,
-                &cancellation_flag,
-                executor,
-            )
-            .await
-            .into_iter()
-            .map(|mat| FileMatch {
-                mat,
-                is_recent: false,
-            })
-            .collect::<Vec<_>>()
-        })
-    }
-}
-
-pub(crate) fn search_symbols(
-    query: String,
-    cancellation_flag: Arc<AtomicBool>,
-    workspace: &Entity<Workspace>,
-    cx: &mut App,
-) -> Task<Vec<SymbolMatch>> {
-    let symbols_task = workspace.update(cx, |workspace, cx| {
-        workspace
-            .project()
-            .update(cx, |project, cx| project.symbols(&query, cx))
-    });
-    let project = workspace.read(cx).project().clone();
-    cx.spawn(async move |cx| {
-        let Some(symbols) = symbols_task.await.log_err() else {
-            return Vec::new();
-        };
-        let Some((visible_match_candidates, external_match_candidates)): Option<(Vec<_>, Vec<_>)> =
-            project
-                .update(cx, |project, cx| {
-                    symbols
-                        .iter()
-                        .enumerate()
-                        .map(|(id, symbol)| {
-                            StringMatchCandidate::new(id, symbol.label.filter_text())
-                        })
-                        .partition(|candidate| match &symbols[candidate.id].path {
-                            SymbolLocation::InProject(project_path) => project
-                                .entry_for_path(project_path, cx)
-                                .is_some_and(|e| !e.is_ignored),
-                            SymbolLocation::OutsideProject { .. } => false,
-                        })
-                })
-                .log_err()
-        else {
-            return Vec::new();
-        };
-
-        const MAX_MATCHES: usize = 100;
-        let mut visible_matches = cx.background_executor().block(fuzzy::match_strings(
-            &visible_match_candidates,
-            &query,
-            false,
-            true,
-            MAX_MATCHES,
-            &cancellation_flag,
-            cx.background_executor().clone(),
-        ));
-        let mut external_matches = cx.background_executor().block(fuzzy::match_strings(
-            &external_match_candidates,
-            &query,
-            false,
-            true,
-            MAX_MATCHES - visible_matches.len().min(MAX_MATCHES),
-            &cancellation_flag,
-            cx.background_executor().clone(),
-        ));
-        let sort_key_for_match = |mat: &StringMatch| {
-            let symbol = &symbols[mat.candidate_id];
-            (Reverse(OrderedFloat(mat.score)), symbol.label.filter_text())
-        };
-
-        visible_matches.sort_unstable_by_key(sort_key_for_match);
-        external_matches.sort_unstable_by_key(sort_key_for_match);
-        let mut matches = visible_matches;
-        matches.append(&mut external_matches);
-
-        matches
-            .into_iter()
-            .map(|mut mat| {
-                let symbol = symbols[mat.candidate_id].clone();
-                let filter_start = symbol.label.filter_range.start;
-                for position in &mut mat.positions {
-                    *position += filter_start;
-                }
-                SymbolMatch { symbol }
-            })
-            .collect()
-    })
-}
-
-pub(crate) fn search_threads(
-    query: String,
-    cancellation_flag: Arc<AtomicBool>,
-    thread_store: &Entity<HistoryStore>,
-    cx: &mut App,
-) -> Task<Vec<HistoryEntry>> {
-    let threads = thread_store.read(cx).entries().collect();
-    if query.is_empty() {
-        return Task::ready(threads);
-    }
-
-    let executor = cx.background_executor().clone();
-    cx.background_spawn(async move {
-        let candidates = threads
-            .iter()
-            .enumerate()
-            .map(|(id, thread)| StringMatchCandidate::new(id, thread.title()))
-            .collect::<Vec<_>>();
-        let matches = fuzzy::match_strings(
-            &candidates,
-            &query,
-            false,
-            true,
-            100,
-            &cancellation_flag,
-            executor,
-        )
-        .await;
-
-        matches
-            .into_iter()
-            .map(|mat| threads[mat.candidate_id].clone())
-            .collect()
-    })
-}
-
-pub(crate) fn search_rules(
-    query: String,
-    cancellation_flag: Arc<AtomicBool>,
-    prompt_store: &Entity<PromptStore>,
-    cx: &mut App,
-) -> Task<Vec<RulesContextEntry>> {
-    let search_task = prompt_store.read(cx).search(query, cancellation_flag, cx);
-    cx.background_spawn(async move {
-        search_task
-            .await
-            .into_iter()
-            .flat_map(|metadata| {
-                // Default prompts are filtered out as they are automatically included.
-                if metadata.default {
-                    None
-                } else {
-                    match metadata.id {
-                        PromptId::EditWorkflow => None,
-                        PromptId::User { uuid } => Some(RulesContextEntry {
-                            prompt_id: uuid,
-                            title: metadata.title?,
-                        }),
-                    }
-                }
-            })
-            .collect::<Vec<_>>()
-    })
-}
-
-pub struct SymbolMatch {
-    pub symbol: Symbol,
-}
-
-pub struct FileMatch {
-    pub mat: PathMatch,
-    pub is_recent: bool,
-}
-
-pub fn extract_file_name_and_directory(
-    path: &RelPath,
-    path_prefix: &RelPath,
-    path_style: PathStyle,
-) -> (SharedString, Option<SharedString>) {
-    // If path is empty, this means we're matching with the root directory itself
-    // so we use the path_prefix as the name
-    if path.is_empty() && !path_prefix.is_empty() {
-        return (path_prefix.display(path_style).to_string().into(), None);
-    }
-
-    let full_path = path_prefix.join(path);
-    let file_name = full_path.file_name().unwrap_or_default();
-    let display_path = full_path.display(path_style);
-    let (directory, file_name) = display_path.split_at(display_path.len() - file_name.len());
-    (
-        file_name.to_string().into(),
-        Some(SharedString::new(directory)).filter(|dir| !dir.is_empty()),
-    )
-}
-
-fn build_code_label_for_path(
-    file: &str,
-    directory: Option<&str>,
-    line_number: Option<u32>,
-    label_max_chars: usize,
-    cx: &App,
-) -> CodeLabel {
-    let variable_highlight_id = cx
-        .theme()
-        .syntax()
-        .highlight_id("variable")
-        .map(HighlightId);
-    let mut label = CodeLabelBuilder::default();
-
-    label.push_str(file, None);
-    label.push_str(" ", None);
-
-    if let Some(directory) = directory {
-        let file_name_chars = file.chars().count();
-        // Account for: file_name + space (ellipsis is handled by truncate_and_remove_front)
-        let directory_max_chars = label_max_chars
-            .saturating_sub(file_name_chars)
-            .saturating_sub(1);
-        let truncated_directory = truncate_and_remove_front(directory, directory_max_chars.max(5));
-        label.push_str(&truncated_directory, variable_highlight_id);
-    }
-    if let Some(line_number) = line_number {
-        label.push_str(&format!(" L{}", line_number), variable_highlight_id);
-    }
-    label.build()
-}
-
-fn selection_ranges(
-    workspace: &Entity<Workspace>,
-    cx: &mut App,
-) -> Vec<(Entity<Buffer>, Range<text::Anchor>)> {
-    let Some(editor) = workspace
-        .read(cx)
-        .active_item(cx)
-        .and_then(|item| item.act_as::<Editor>(cx))
-    else {
-        return Vec::new();
-    };
-
-    editor.update(cx, |editor, cx| {
-        let selections = editor.selections.all_adjusted(&editor.display_snapshot(cx));
-
-        let buffer = editor.buffer().clone().read(cx);
-        let snapshot = buffer.snapshot(cx);
-
-        selections
-            .into_iter()
-            .map(|s| snapshot.anchor_after(s.start)..snapshot.anchor_before(s.end))
-            .flat_map(|range| {
-                let (start_buffer, start) = buffer.text_anchor_for_position(range.start, cx)?;
-                let (end_buffer, end) = buffer.text_anchor_for_position(range.end, cx)?;
-                if start_buffer != end_buffer {
-                    return None;
-                }
-                Some((start_buffer, start..end))
-            })
-            .collect::<Vec<_>>()
-    })
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_prompt_completion_parse() {
-        let supported_modes = vec![PromptContextType::File, PromptContextType::Symbol];
-
-        assert_eq!(
-            PromptCompletion::try_parse("/", 0, &supported_modes),
-            Some(PromptCompletion::SlashCommand(SlashCommandCompletion {
-                source_range: 0..1,
-                command: None,
-                argument: None,
-            }))
-        );
-
-        assert_eq!(
-            PromptCompletion::try_parse("@", 0, &supported_modes),
-            Some(PromptCompletion::Mention(MentionCompletion {
-                source_range: 0..1,
-                mode: None,
-                argument: None,
-            }))
-        );
-
-        assert_eq!(
-            PromptCompletion::try_parse("/test @file", 0, &supported_modes),
-            Some(PromptCompletion::Mention(MentionCompletion {
-                source_range: 6..11,
-                mode: Some(PromptContextType::File),
-                argument: None,
-            }))
-        );
-    }
-
-    #[test]
-    fn test_slash_command_completion_parse() {
-        assert_eq!(
-            SlashCommandCompletion::try_parse("/", 0),
-            Some(SlashCommandCompletion {
-                source_range: 0..1,
-                command: None,
-                argument: None,
-            })
-        );
-
-        assert_eq!(
-            SlashCommandCompletion::try_parse("/help", 0),
-            Some(SlashCommandCompletion {
-                source_range: 0..5,
-                command: Some("help".to_string()),
-                argument: None,
-            })
-        );
-
-        assert_eq!(
-            SlashCommandCompletion::try_parse("/help ", 0),
-            Some(SlashCommandCompletion {
-                source_range: 0..5,
-                command: Some("help".to_string()),
-                argument: None,
-            })
-        );
-
-        assert_eq!(
-            SlashCommandCompletion::try_parse("/help arg1", 0),
-            Some(SlashCommandCompletion {
-                source_range: 0..10,
-                command: Some("help".to_string()),
-                argument: Some("arg1".to_string()),
-            })
-        );
-
-        assert_eq!(
-            SlashCommandCompletion::try_parse("/help arg1 arg2", 0),
-            Some(SlashCommandCompletion {
-                source_range: 0..15,
-                command: Some("help".to_string()),
-                argument: Some("arg1 arg2".to_string()),
-            })
-        );
-
-        assert_eq!(
-            SlashCommandCompletion::try_parse("/拿不到命令 拿不到命令 ", 0),
-            Some(SlashCommandCompletion {
-                source_range: 0..30,
-                command: Some("拿不到命令".to_string()),
-                argument: Some("拿不到命令".to_string()),
-            })
-        );
-
-        assert_eq!(SlashCommandCompletion::try_parse("Lorem Ipsum", 0), None);
-
-        assert_eq!(SlashCommandCompletion::try_parse("Lorem /", 0), None);
-
-        assert_eq!(SlashCommandCompletion::try_parse("Lorem /help", 0), None);
-
-        assert_eq!(SlashCommandCompletion::try_parse("Lorem/", 0), None);
-
-        assert_eq!(SlashCommandCompletion::try_parse("/ ", 0), None);
-    }
-
-    #[test]
-    fn test_mention_completion_parse() {
-        let supported_modes = vec![PromptContextType::File, PromptContextType::Symbol];
-
-        assert_eq!(
-            MentionCompletion::try_parse("Lorem Ipsum", 0, &supported_modes),
-            None
-        );
-
-        assert_eq!(
-            MentionCompletion::try_parse("Lorem @", 0, &supported_modes),
-            Some(MentionCompletion {
-                source_range: 6..7,
-                mode: None,
-                argument: None,
-            })
-        );
-
-        assert_eq!(
-            MentionCompletion::try_parse("Lorem @file", 0, &supported_modes),
-            Some(MentionCompletion {
-                source_range: 6..11,
-                mode: Some(PromptContextType::File),
-                argument: None,
-            })
-        );
-
-        assert_eq!(
-            MentionCompletion::try_parse("Lorem @file ", 0, &supported_modes),
-            Some(MentionCompletion {
-                source_range: 6..12,
-                mode: Some(PromptContextType::File),
-                argument: None,
-            })
-        );
-
-        assert_eq!(
-            MentionCompletion::try_parse("Lorem @file main.rs", 0, &supported_modes),
-            Some(MentionCompletion {
-                source_range: 6..19,
-                mode: Some(PromptContextType::File),
-                argument: Some("main.rs".to_string()),
-            })
-        );
-
-        assert_eq!(
-            MentionCompletion::try_parse("Lorem @file main.rs ", 0, &supported_modes),
-            Some(MentionCompletion {
-                source_range: 6..19,
-                mode: Some(PromptContextType::File),
-                argument: Some("main.rs".to_string()),
-            })
-        );
-
-        assert_eq!(
-            MentionCompletion::try_parse("Lorem @file main.rs Ipsum", 0, &supported_modes),
-            Some(MentionCompletion {
-                source_range: 6..19,
-                mode: Some(PromptContextType::File),
-                argument: Some("main.rs".to_string()),
-            })
-        );
-
-        assert_eq!(
-            MentionCompletion::try_parse("Lorem @main", 0, &supported_modes),
-            Some(MentionCompletion {
-                source_range: 6..11,
-                mode: None,
-                argument: Some("main".to_string()),
-            })
-        );
-
-        assert_eq!(
-            MentionCompletion::try_parse("Lorem @main ", 0, &supported_modes),
-            Some(MentionCompletion {
-                source_range: 6..12,
-                mode: None,
-                argument: Some("main".to_string()),
-            })
-        );
-
-        assert_eq!(
-            MentionCompletion::try_parse("Lorem @main m", 0, &supported_modes),
-            None
-        );
-
-        assert_eq!(
-            MentionCompletion::try_parse("test@", 0, &supported_modes),
-            None
-        );
-
-        // Allowed non-file mentions
-
-        assert_eq!(
-            MentionCompletion::try_parse("Lorem @symbol main", 0, &supported_modes),
-            Some(MentionCompletion {
-                source_range: 6..18,
-                mode: Some(PromptContextType::Symbol),
-                argument: Some("main".to_string()),
-            })
-        );
-
-        // Disallowed non-file mentions
-        assert_eq!(
-            MentionCompletion::try_parse("Lorem @symbol main", 0, &[PromptContextType::File]),
-            None
-        );
-
-        assert_eq!(
-            MentionCompletion::try_parse("Lorem@symbol", 0, &supported_modes),
-            None,
-            "Should not parse mention inside word"
-        );
-
-        assert_eq!(
-            MentionCompletion::try_parse("Lorem @ file", 0, &supported_modes),
-            None,
-            "Should not parse with a space after @"
-        );
-
-        assert_eq!(
-            MentionCompletion::try_parse("@ file", 0, &supported_modes),
-            None,
-            "Should not parse with a space after @ at the start of the line"
-        );
-    }
-}
diff --git a/crates/agent_ui/src/context.rs b/crates/agent_ui/src/context.rs
deleted file mode 100644
index ad8c95ba3e..0000000000
--- a/crates/agent_ui/src/context.rs
+++ /dev/null
@@ -1,63 +0,0 @@
-use crate::mention_set::Mention;
-use gpui::{AppContext as _, Entity, Task};
-use language_model::{LanguageModelImage, LanguageModelRequestMessage, MessageContent};
-use ui::App;
-use util::ResultExt as _;
-
-use crate::mention_set::MentionSet;
-
-#[derive(Debug, Clone, Default)]
-pub struct LoadedContext {
-    pub text: String,
-    pub images: Vec<LanguageModelImage>,
-}
-
-impl LoadedContext {
-    pub fn add_to_request_message(&self, request_message: &mut LanguageModelRequestMessage) {
-        if !self.text.is_empty() {
-            request_message
-                .content
-                .push(MessageContent::Text(self.text.to_string()));
-        }
-
-        if !self.images.is_empty() {
-            // Some providers only support image parts after an initial text part
-            if request_message.content.is_empty() {
-                request_message
-                    .content
-                    .push(MessageContent::Text("Images attached by user:".to_string()));
-            }
-
-            for image in &self.images {
-                request_message
-                    .content
-                    .push(MessageContent::Image(image.clone()))
-            }
-        }
-    }
-}
-
-/// Loads and formats a collection of contexts.
-pub fn load_context(mention_set: &Entity<MentionSet>, cx: &mut App) -> Task<Option<LoadedContext>> {
-    let task = mention_set.update(cx, |mention_set, cx| mention_set.contents(true, cx));
-    cx.background_spawn(async move {
-        let mentions = task.await.log_err()?;
-        let mut loaded_context = LoadedContext::default();
-        loaded_context
-            .text
-            .push_str("The following items were attached by the user.\n");
-        for (_, (_, mention)) in mentions {
-            match mention {
-                Mention::Text { content, .. } => {
-                    loaded_context.text.push_str(&content);
-                }
-                Mention::Image(mention_image) => loaded_context.images.push(LanguageModelImage {
-                    source: mention_image.data,
-                    ..LanguageModelImage::empty()
-                }),
-                Mention::Link => {}
-            }
-        }
-        Some(loaded_context)
-    })
-}
diff --git a/crates/agent_ui/src/context_server_configuration.rs b/crates/agent_ui/src/context_server_configuration.rs
deleted file mode 100644
index 3a1a869517..0000000000
--- a/crates/agent_ui/src/context_server_configuration.rs
+++ /dev/null
@@ -1,116 +0,0 @@
-use std::sync::Arc;
-
-use context_server::ContextServerId;
-use extension::ExtensionManifest;
-use fs::Fs;
-use gpui::WeakEntity;
-use language::LanguageRegistry;
-use settings::update_settings_file;
-use ui::prelude::*;
-use util::ResultExt;
-use workspace::Workspace;
-
-use crate::agent_configuration::ConfigureContextServerModal;
-
-pub(crate) fn init(language_registry: Arc<LanguageRegistry>, fs: Arc<dyn Fs>, cx: &mut App) {
-    cx.observe_new(move |_: &mut Workspace, window, cx| {
-        let Some(window) = window else {
-            return;
-        };
-
-        if let Some(extension_events) = extension::ExtensionEvents::try_global(cx).as_ref() {
-            cx.subscribe_in(extension_events, window, {
-                let language_registry = language_registry.clone();
-                let fs = fs.clone();
-                move |_, _, event, window, cx| match event {
-                    extension::Event::ExtensionInstalled(manifest) => {
-                        show_configure_mcp_modal(
-                            language_registry.clone(),
-                            manifest,
-                            cx.weak_entity(),
-                            window,
-                            cx,
-                        );
-                    }
-                    extension::Event::ExtensionUninstalled(manifest) => {
-                        remove_context_server_settings(
-                            manifest.context_servers.keys().cloned().collect(),
-                            fs.clone(),
-                            cx,
-                        );
-                    }
-                    extension::Event::ConfigureExtensionRequested(manifest) => {
-                        if !manifest.context_servers.is_empty() {
-                            show_configure_mcp_modal(
-                                language_registry.clone(),
-                                manifest,
-                                cx.weak_entity(),
-                                window,
-                                cx,
-                            );
-                        }
-                    }
-                    _ => {}
-                }
-            })
-            .detach();
-        } else {
-            log::info!(
-                "No extension events global found. Skipping context server configuration wizard"
-            );
-        }
-    })
-    .detach();
-}
-
-fn remove_context_server_settings(
-    context_server_ids: Vec<Arc<str>>,
-    fs: Arc<dyn Fs>,
-    cx: &mut App,
-) {
-    update_settings_file(fs, cx, move |settings, _| {
-        settings
-            .project
-            .context_servers
-            .retain(|server_id, _| !context_server_ids.contains(server_id));
-    });
-}
-
-fn show_configure_mcp_modal(
-    language_registry: Arc<LanguageRegistry>,
-    manifest: &Arc<ExtensionManifest>,
-    workspace: WeakEntity<Workspace>,
-    window: &mut Window,
-    cx: &mut Context<'_, Workspace>,
-) {
-    if !window.is_window_active() {
-        return;
-    }
-
-    let ids = manifest.context_servers.keys().cloned().collect::<Vec<_>>();
-    if ids.is_empty() {
-        return;
-    }
-
-    window
-        .spawn(cx, async move |cx| {
-            for id in ids {
-                let Some(task) = cx
-                    .update(|window, cx| {
-                        ConfigureContextServerModal::show_modal_for_existing_server(
-                            ContextServerId(id.clone()),
-                            language_registry.clone(),
-                            workspace.clone(),
-                            window,
-                            cx,
-                        )
-                    })
-                    .ok()
-                else {
-                    continue;
-                };
-                task.await.log_err();
-            }
-        })
-        .detach();
-}
diff --git a/crates/agent_ui/src/evals.rs b/crates/agent_ui/src/evals.rs
deleted file mode 100644
index e82d21bd1f..0000000000
--- a/crates/agent_ui/src/evals.rs
+++ /dev/null
@@ -1,89 +0,0 @@
-use std::str::FromStr;
-
-use crate::inline_assistant::test::run_inline_assistant_test;
-
-use eval_utils::{EvalOutput, NoProcessor};
-use gpui::TestAppContext;
-use language_model::{LanguageModelRegistry, SelectedModel};
-use rand::{SeedableRng as _, rngs::StdRng};
-
-#[test]
-#[cfg_attr(not(feature = "unit-eval"), ignore)]
-fn eval_single_cursor_edit() {
-    eval_utils::eval(20, 1.0, NoProcessor, move || {
-        run_eval(
-            &EvalInput {
-                prompt: "Rename this variable to buffer_text".to_string(),
-                buffer: indoc::indoc! {"
-                    struct EvalExampleStruct {
-                        text: Strˇing,
-                        prompt: String,
-                    }
-                "}
-                .to_string(),
-            },
-            &|_, output| {
-                let expected = indoc::indoc! {"
-                    struct EvalExampleStruct {
-                        buffer_text: String,
-                        prompt: String,
-                    }
-                    "};
-                if output == expected {
-                    EvalOutput {
-                        outcome: eval_utils::OutcomeKind::Passed,
-                        data: "Passed!".to_string(),
-                        metadata: (),
-                    }
-                } else {
-                    EvalOutput {
-                        outcome: eval_utils::OutcomeKind::Failed,
-                        data: format!("Failed to rename variable, output: {}", output),
-                        metadata: (),
-                    }
-                }
-            },
-        )
-    });
-}
-
-struct EvalInput {
-    buffer: String,
-    prompt: String,
-}
-
-fn run_eval(
-    input: &EvalInput,
-    judge: &dyn Fn(&EvalInput, &str) -> eval_utils::EvalOutput<()>,
-) -> eval_utils::EvalOutput<()> {
-    let dispatcher = gpui::TestDispatcher::new(StdRng::from_os_rng());
-    let mut cx = TestAppContext::build(dispatcher, None);
-    cx.skip_drawing();
-
-    let buffer_text = run_inline_assistant_test(
-        input.buffer.clone(),
-        input.prompt.clone(),
-        |cx| {
-            // Reconfigure to use a real model instead of the fake one
-            let model_name = std::env::var("ZED_AGENT_MODEL")
-                .unwrap_or("anthropic/claude-sonnet-4-latest".into());
-
-            let selected_model = SelectedModel::from_str(&model_name)
-                .expect("Invalid model format. Use 'provider/model-id'");
-
-            log::info!("Selected model: {selected_model:?}");
-
-            cx.update(|_, cx| {
-                LanguageModelRegistry::global(cx).update(cx, |registry, cx| {
-                    registry.select_inline_assistant_model(Some(&selected_model), cx);
-                });
-            });
-        },
-        |_cx| {
-            log::info!("Waiting for actual response from the LLM...");
-        },
-        &mut cx,
-    );
-
-    judge(input, &buffer_text)
-}
diff --git a/crates/agent_ui/src/inline_assistant.rs b/crates/agent_ui/src/inline_assistant.rs
deleted file mode 100644
index 48da85d385..0000000000
--- a/crates/agent_ui/src/inline_assistant.rs
+++ /dev/null
@@ -1,2206 +0,0 @@
-use std::cmp;
-use std::mem;
-use std::ops::Range;
-use std::rc::Rc;
-use std::sync::Arc;
-
-use crate::context::load_context;
-use crate::mention_set::MentionSet;
-use crate::{
-    AgentPanel,
-    buffer_codegen::{BufferCodegen, CodegenAlternative, CodegenEvent},
-    inline_prompt_editor::{CodegenStatus, InlineAssistId, PromptEditor, PromptEditorEvent},
-    terminal_inline_assistant::TerminalInlineAssistant,
-};
-use agent::HistoryStore;
-use agent_settings::AgentSettings;
-use anyhow::{Context as _, Result};
-use client::telemetry::Telemetry;
-use collections::{HashMap, HashSet, VecDeque, hash_map};
-use editor::EditorSnapshot;
-use editor::MultiBufferOffset;
-use editor::RowExt;
-use editor::SelectionEffects;
-use editor::scroll::ScrollOffset;
-use editor::{
-    Anchor, AnchorRangeExt, CodeActionProvider, Editor, EditorEvent, ExcerptId, ExcerptRange,
-    MultiBuffer, MultiBufferSnapshot, ToOffset as _, ToPoint,
-    actions::SelectAll,
-    display_map::{
-        BlockContext, BlockPlacement, BlockProperties, BlockStyle, CustomBlockId, EditorMargins,
-        RenderBlock, ToDisplayPoint,
-    },
-};
-use fs::Fs;
-use futures::{FutureExt, channel::mpsc};
-use gpui::{
-    App, Context, Entity, Focusable, Global, HighlightStyle, Subscription, Task, UpdateGlobal,
-    WeakEntity, Window, point,
-};
-use language::{Buffer, Point, Selection, TransactionId};
-use language_model::{
-    ConfigurationError, ConfiguredModel, LanguageModelRegistry, report_assistant_event,
-};
-use multi_buffer::MultiBufferRow;
-use parking_lot::Mutex;
-use project::{CodeAction, DisableAiSettings, LspAction, Project, ProjectTransaction};
-use prompt_store::{PromptBuilder, PromptStore};
-use settings::{Settings, SettingsStore};
-use telemetry_events::{AssistantEventData, AssistantKind, AssistantPhase};
-use terminal_view::{TerminalView, terminal_panel::TerminalPanel};
-use text::{OffsetRangeExt, ToPoint as _};
-use ui::prelude::*;
-use util::{RangeExt, ResultExt, maybe};
-use workspace::{ItemHandle, Toast, Workspace, dock::Panel, notifications::NotificationId};
-use zed_actions::agent::OpenSettings;
-
-pub fn init(
-    fs: Arc<dyn Fs>,
-    prompt_builder: Arc<PromptBuilder>,
-    telemetry: Arc<Telemetry>,
-    cx: &mut App,
-) {
-    cx.set_global(InlineAssistant::new(fs, prompt_builder, telemetry));
-
-    cx.observe_global::<SettingsStore>(|cx| {
-        if DisableAiSettings::get_global(cx).disable_ai {
-            // Hide any active inline assist UI when AI is disabled
-            InlineAssistant::update_global(cx, |assistant, cx| {
-                assistant.cancel_all_active_completions(cx);
-            });
-        }
-    })
-    .detach();
-
-    cx.observe_new(|_workspace: &mut Workspace, window, cx| {
-        let Some(window) = window else {
-            return;
-        };
-        let workspace = cx.entity();
-        InlineAssistant::update_global(cx, |inline_assistant, cx| {
-            inline_assistant.register_workspace(&workspace, window, cx)
-        });
-    })
-    .detach();
-}
-
-const PROMPT_HISTORY_MAX_LEN: usize = 20;
-
-enum InlineAssistTarget {
-    Editor(Entity<Editor>),
-    Terminal(Entity<TerminalView>),
-}
-
-pub struct InlineAssistant {
-    next_assist_id: InlineAssistId,
-    next_assist_group_id: InlineAssistGroupId,
-    assists: HashMap<InlineAssistId, InlineAssist>,
-    assists_by_editor: HashMap<WeakEntity<Editor>, EditorInlineAssists>,
-    assist_groups: HashMap<InlineAssistGroupId, InlineAssistGroup>,
-    confirmed_assists: HashMap<InlineAssistId, Entity<CodegenAlternative>>,
-    prompt_history: VecDeque<String>,
-    prompt_builder: Arc<PromptBuilder>,
-    telemetry: Arc<Telemetry>,
-    fs: Arc<dyn Fs>,
-    _inline_assistant_completions: Option<mpsc::UnboundedSender<anyhow::Result<InlineAssistId>>>,
-}
-
-impl Global for InlineAssistant {}
-
-impl InlineAssistant {
-    pub fn new(
-        fs: Arc<dyn Fs>,
-        prompt_builder: Arc<PromptBuilder>,
-        telemetry: Arc<Telemetry>,
-    ) -> Self {
-        Self {
-            next_assist_id: InlineAssistId::default(),
-            next_assist_group_id: InlineAssistGroupId::default(),
-            assists: HashMap::default(),
-            assists_by_editor: HashMap::default(),
-            assist_groups: HashMap::default(),
-            confirmed_assists: HashMap::default(),
-            prompt_history: VecDeque::default(),
-            prompt_builder,
-            telemetry,
-            fs,
-            _inline_assistant_completions: None,
-        }
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn set_completion_receiver(
-        &mut self,
-        sender: mpsc::UnboundedSender<anyhow::Result<InlineAssistId>>,
-    ) {
-        self._inline_assistant_completions = Some(sender);
-    }
-
-    pub fn register_workspace(
-        &mut self,
-        workspace: &Entity<Workspace>,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        window
-            .subscribe(workspace, cx, |workspace, event, window, cx| {
-                Self::update_global(cx, |this, cx| {
-                    this.handle_workspace_event(workspace, event, window, cx)
-                });
-            })
-            .detach();
-
-        let workspace = workspace.downgrade();
-        cx.observe_global::<SettingsStore>(move |cx| {
-            let Some(workspace) = workspace.upgrade() else {
-                return;
-            };
-            let Some(terminal_panel) = workspace.read(cx).panel::<TerminalPanel>(cx) else {
-                return;
-            };
-            let enabled = AgentSettings::get_global(cx).enabled(cx);
-            terminal_panel.update(cx, |terminal_panel, cx| {
-                terminal_panel.set_assistant_enabled(enabled, cx)
-            });
-        })
-        .detach();
-    }
-
-    /// Hides all active inline assists when AI is disabled
-    pub fn cancel_all_active_completions(&mut self, cx: &mut App) {
-        // Cancel all active completions in editors
-        for (editor_handle, _) in self.assists_by_editor.iter() {
-            if let Some(editor) = editor_handle.upgrade() {
-                let windows = cx.windows();
-                if !windows.is_empty() {
-                    let window = windows[0];
-                    let _ = window.update(cx, |_, window, cx| {
-                        editor.update(cx, |editor, cx| {
-                            if editor.has_active_edit_prediction() {
-                                editor.cancel(&Default::default(), window, cx);
-                            }
-                        });
-                    });
-                }
-            }
-        }
-    }
-
-    fn handle_workspace_event(
-        &mut self,
-        workspace: Entity<Workspace>,
-        event: &workspace::Event,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        match event {
-            workspace::Event::UserSavedItem { item, .. } => {
-                // When the user manually saves an editor, automatically accepts all finished transformations.
-                if let Some(editor) = item.upgrade().and_then(|item| item.act_as::<Editor>(cx))
-                    && let Some(editor_assists) = self.assists_by_editor.get(&editor.downgrade())
-                {
-                    for assist_id in editor_assists.assist_ids.clone() {
-                        let assist = &self.assists[&assist_id];
-                        if let CodegenStatus::Done = assist.codegen.read(cx).status(cx) {
-                            self.finish_assist(assist_id, false, window, cx)
-                        }
-                    }
-                }
-            }
-            workspace::Event::ItemAdded { item } => {
-                self.register_workspace_item(&workspace, item.as_ref(), window, cx);
-            }
-            _ => (),
-        }
-    }
-
-    fn register_workspace_item(
-        &mut self,
-        workspace: &Entity<Workspace>,
-        item: &dyn ItemHandle,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        let is_ai_enabled = !DisableAiSettings::get_global(cx).disable_ai;
-
-        if let Some(editor) = item.act_as::<Editor>(cx) {
-            editor.update(cx, |editor, cx| {
-                if is_ai_enabled {
-                    editor.add_code_action_provider(
-                        Rc::new(AssistantCodeActionProvider {
-                            editor: cx.entity().downgrade(),
-                            workspace: workspace.downgrade(),
-                        }),
-                        window,
-                        cx,
-                    );
-
-                    if DisableAiSettings::get_global(cx).disable_ai {
-                        // Cancel any active edit predictions
-                        if editor.has_active_edit_prediction() {
-                            editor.cancel(&Default::default(), window, cx);
-                        }
-                    }
-                } else {
-                    editor.remove_code_action_provider(
-                        ASSISTANT_CODE_ACTION_PROVIDER_ID.into(),
-                        window,
-                        cx,
-                    );
-                }
-            });
-        }
-    }
-
-    pub fn inline_assist(
-        workspace: &mut Workspace,
-        action: &zed_actions::assistant::InlineAssist,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        if !AgentSettings::get_global(cx).enabled(cx) {
-            return;
-        }
-
-        let Some(inline_assist_target) = Self::resolve_inline_assist_target(
-            workspace,
-            workspace.panel::<AgentPanel>(cx),
-            window,
-            cx,
-        ) else {
-            return;
-        };
-
-        let configuration_error = || {
-            let model_registry = LanguageModelRegistry::read_global(cx);
-            model_registry.configuration_error(model_registry.inline_assistant_model(), cx)
-        };
-
-        let Some(agent_panel) = workspace.panel::<AgentPanel>(cx) else {
-            return;
-        };
-        let agent_panel = agent_panel.read(cx);
-
-        let prompt_store = agent_panel.prompt_store().as_ref().cloned();
-        let thread_store = agent_panel.thread_store().clone();
-
-        let handle_assist =
-            |window: &mut Window, cx: &mut Context<Workspace>| match inline_assist_target {
-                InlineAssistTarget::Editor(active_editor) => {
-                    InlineAssistant::update_global(cx, |assistant, cx| {
-                        assistant.assist(
-                            &active_editor,
-                            cx.entity().downgrade(),
-                            workspace.project().downgrade(),
-                            thread_store,
-                            prompt_store,
-                            action.prompt.clone(),
-                            window,
-                            cx,
-                        );
-                    })
-                }
-                InlineAssistTarget::Terminal(active_terminal) => {
-                    TerminalInlineAssistant::update_global(cx, |assistant, cx| {
-                        assistant.assist(
-                            &active_terminal,
-                            cx.entity().downgrade(),
-                            workspace.project().downgrade(),
-                            thread_store,
-                            prompt_store,
-                            action.prompt.clone(),
-                            window,
-                            cx,
-                        );
-                    });
-                }
-            };
-
-        if let Some(error) = configuration_error() {
-            if let ConfigurationError::ProviderNotAuthenticated(provider) = error {
-                cx.spawn(async move |_, cx| {
-                    cx.update(|cx| provider.authenticate(cx))?.await?;
-                    anyhow::Ok(())
-                })
-                .detach_and_log_err(cx);
-
-                if configuration_error().is_none() {
-                    handle_assist(window, cx);
-                }
-            } else {
-                cx.spawn_in(window, async move |_, cx| {
-                    let answer = cx
-                        .prompt(
-                            gpui::PromptLevel::Warning,
-                            &error.to_string(),
-                            None,
-                            &["Configure", "Cancel"],
-                        )
-                        .await
-                        .ok();
-                    if let Some(answer) = answer
-                        && answer == 0
-                    {
-                        cx.update(|window, cx| window.dispatch_action(Box::new(OpenSettings), cx))
-                            .ok();
-                    }
-                    anyhow::Ok(())
-                })
-                .detach_and_log_err(cx);
-            }
-        } else {
-            handle_assist(window, cx);
-        }
-    }
-
-    fn codegen_ranges(
-        &mut self,
-        editor: &Entity<Editor>,
-        snapshot: &EditorSnapshot,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<(Vec<Range<Anchor>>, Selection<Point>)> {
-        let (initial_selections, newest_selection) = editor.update(cx, |editor, _| {
-            (
-                editor.selections.all::<Point>(&snapshot.display_snapshot),
-                editor
-                    .selections
-                    .newest::<Point>(&snapshot.display_snapshot),
-            )
-        });
-
-        // Check if there is already an inline assistant that contains the
-        // newest selection, if there is, focus it
-        if let Some(editor_assists) = self.assists_by_editor.get(&editor.downgrade()) {
-            for assist_id in &editor_assists.assist_ids {
-                let assist = &self.assists[assist_id];
-                let range = assist.range.to_point(&snapshot.buffer_snapshot());
-                if range.start.row <= newest_selection.start.row
-                    && newest_selection.end.row <= range.end.row
-                {
-                    self.focus_assist(*assist_id, window, cx);
-                    return None;
-                }
-            }
-        }
-
-        let mut selections = Vec::<Selection<Point>>::new();
-        let mut newest_selection = None;
-        for mut selection in initial_selections {
-            if selection.end == selection.start
-                && let Some(fold) =
-                    snapshot.crease_for_buffer_row(MultiBufferRow(selection.end.row))
-            {
-                selection.start = fold.range().start;
-                selection.end = fold.range().end;
-                if MultiBufferRow(selection.end.row) < snapshot.buffer_snapshot().max_row() {
-                    let chars = snapshot
-                        .buffer_snapshot()
-                        .chars_at(Point::new(selection.end.row + 1, 0));
-
-                    for c in chars {
-                        if c == '\n' {
-                            break;
-                        }
-                        if c.is_whitespace() {
-                            continue;
-                        }
-                        if snapshot
-                            .language_at(selection.end)
-                            .is_some_and(|language| language.config().brackets.is_closing_brace(c))
-                        {
-                            selection.end.row += 1;
-                            selection.end.column = snapshot
-                                .buffer_snapshot()
-                                .line_len(MultiBufferRow(selection.end.row));
-                        }
-                    }
-                }
-            } else {
-                selection.start.column = 0;
-                // If the selection ends at the start of the line, we don't want to include it.
-                if selection.end.column == 0 && selection.start.row != selection.end.row {
-                    selection.end.row -= 1;
-                }
-                selection.end.column = snapshot
-                    .buffer_snapshot()
-                    .line_len(MultiBufferRow(selection.end.row));
-            }
-
-            if let Some(prev_selection) = selections.last_mut()
-                && selection.start <= prev_selection.end
-            {
-                prev_selection.end = selection.end;
-                continue;
-            }
-
-            let latest_selection = newest_selection.get_or_insert_with(|| selection.clone());
-            if selection.id > latest_selection.id {
-                *latest_selection = selection.clone();
-            }
-            selections.push(selection);
-        }
-        let snapshot = &snapshot.buffer_snapshot();
-        let newest_selection = newest_selection.unwrap();
-
-        let mut codegen_ranges = Vec::new();
-        for (buffer, buffer_range, excerpt_id) in
-            snapshot.ranges_to_buffer_ranges(selections.iter().map(|selection| {
-                snapshot.anchor_before(selection.start)..snapshot.anchor_after(selection.end)
-            }))
-        {
-            let anchor_range = Anchor::range_in_buffer(
-                excerpt_id,
-                buffer.anchor_before(buffer_range.start)..buffer.anchor_after(buffer_range.end),
-            );
-
-            codegen_ranges.push(anchor_range);
-
-            if let Some(model) = LanguageModelRegistry::read_global(cx).inline_assistant_model() {
-                self.telemetry.report_assistant_event(AssistantEventData {
-                    conversation_id: None,
-                    kind: AssistantKind::Inline,
-                    phase: AssistantPhase::Invoked,
-                    message_id: None,
-                    model: model.model.telemetry_id(),
-                    model_provider: model.provider.id().to_string(),
-                    response_latency: None,
-                    error_message: None,
-                    language_name: buffer.language().map(|language| language.name().to_proto()),
-                });
-            }
-        }
-
-        Some((codegen_ranges, newest_selection))
-    }
-
-    fn batch_assist(
-        &mut self,
-        editor: &Entity<Editor>,
-        workspace: WeakEntity<Workspace>,
-        project: WeakEntity<Project>,
-        thread_store: Entity<HistoryStore>,
-        prompt_store: Option<Entity<PromptStore>>,
-        initial_prompt: Option<String>,
-        window: &mut Window,
-        codegen_ranges: &[Range<Anchor>],
-        newest_selection: Option<Selection<Point>>,
-        initial_transaction_id: Option<TransactionId>,
-        cx: &mut App,
-    ) -> Option<InlineAssistId> {
-        let snapshot = editor.update(cx, |editor, cx| editor.snapshot(window, cx));
-
-        let assist_group_id = self.next_assist_group_id.post_inc();
-        let prompt_buffer = cx.new(|cx| {
-            MultiBuffer::singleton(
-                cx.new(|cx| Buffer::local(initial_prompt.unwrap_or_default(), cx)),
-                cx,
-            )
-        });
-
-        let mut assists = Vec::new();
-        let mut assist_to_focus = None;
-
-        for range in codegen_ranges {
-            let assist_id = self.next_assist_id.post_inc();
-            let codegen = cx.new(|cx| {
-                BufferCodegen::new(
-                    editor.read(cx).buffer().clone(),
-                    range.clone(),
-                    initial_transaction_id,
-                    self.telemetry.clone(),
-                    self.prompt_builder.clone(),
-                    cx,
-                )
-            });
-
-            let editor_margins = Arc::new(Mutex::new(EditorMargins::default()));
-            let prompt_editor = cx.new(|cx| {
-                PromptEditor::new_buffer(
-                    assist_id,
-                    editor_margins,
-                    self.prompt_history.clone(),
-                    prompt_buffer.clone(),
-                    codegen.clone(),
-                    self.fs.clone(),
-                    thread_store.clone(),
-                    prompt_store.clone(),
-                    project.clone(),
-                    workspace.clone(),
-                    window,
-                    cx,
-                )
-            });
-
-            if let Some(newest_selection) = newest_selection.as_ref()
-                && assist_to_focus.is_none()
-            {
-                let focus_assist = if newest_selection.reversed {
-                    range.start.to_point(&snapshot) == newest_selection.start
-                } else {
-                    range.end.to_point(&snapshot) == newest_selection.end
-                };
-                if focus_assist {
-                    assist_to_focus = Some(assist_id);
-                }
-            }
-
-            let [prompt_block_id, tool_description_block_id, end_block_id] =
-                self.insert_assist_blocks(&editor, &range, &prompt_editor, cx);
-
-            assists.push((
-                assist_id,
-                range.clone(),
-                prompt_editor,
-                prompt_block_id,
-                tool_description_block_id,
-                end_block_id,
-            ));
-        }
-
-        let editor_assists = self
-            .assists_by_editor
-            .entry(editor.downgrade())
-            .or_insert_with(|| EditorInlineAssists::new(editor, window, cx));
-
-        let assist_to_focus = if let Some(focus_id) = assist_to_focus {
-            Some(focus_id)
-        } else if assists.len() >= 1 {
-            Some(assists[0].0)
-        } else {
-            None
-        };
-
-        let mut assist_group = InlineAssistGroup::new();
-        for (
-            assist_id,
-            range,
-            prompt_editor,
-            prompt_block_id,
-            tool_description_block_id,
-            end_block_id,
-        ) in assists
-        {
-            let codegen = prompt_editor.read(cx).codegen().clone();
-
-            self.assists.insert(
-                assist_id,
-                InlineAssist::new(
-                    assist_id,
-                    assist_group_id,
-                    editor,
-                    &prompt_editor,
-                    prompt_block_id,
-                    tool_description_block_id,
-                    end_block_id,
-                    range,
-                    codegen,
-                    workspace.clone(),
-                    window,
-                    cx,
-                ),
-            );
-            assist_group.assist_ids.push(assist_id);
-            editor_assists.assist_ids.push(assist_id);
-        }
-
-        self.assist_groups.insert(assist_group_id, assist_group);
-
-        assist_to_focus
-    }
-
-    pub fn assist(
-        &mut self,
-        editor: &Entity<Editor>,
-        workspace: WeakEntity<Workspace>,
-        project: WeakEntity<Project>,
-        thread_store: Entity<HistoryStore>,
-        prompt_store: Option<Entity<PromptStore>>,
-        initial_prompt: Option<String>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<InlineAssistId> {
-        let snapshot = editor.update(cx, |editor, cx| editor.snapshot(window, cx));
-
-        let Some((codegen_ranges, newest_selection)) =
-            self.codegen_ranges(editor, &snapshot, window, cx)
-        else {
-            return None;
-        };
-
-        let assist_to_focus = self.batch_assist(
-            editor,
-            workspace,
-            project,
-            thread_store,
-            prompt_store,
-            initial_prompt,
-            window,
-            &codegen_ranges,
-            Some(newest_selection),
-            None,
-            cx,
-        );
-
-        if let Some(assist_id) = assist_to_focus {
-            self.focus_assist(assist_id, window, cx);
-        }
-
-        assist_to_focus
-    }
-
-    pub fn suggest_assist(
-        &mut self,
-        editor: &Entity<Editor>,
-        mut range: Range<Anchor>,
-        initial_prompt: String,
-        initial_transaction_id: Option<TransactionId>,
-        focus: bool,
-        workspace: Entity<Workspace>,
-        thread_store: Entity<HistoryStore>,
-        prompt_store: Option<Entity<PromptStore>>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> InlineAssistId {
-        let buffer = editor.read(cx).buffer().clone();
-        {
-            let snapshot = buffer.read(cx).read(cx);
-            range.start = range.start.bias_left(&snapshot);
-            range.end = range.end.bias_right(&snapshot);
-        }
-
-        let project = workspace.read(cx).project().downgrade();
-
-        let assist_id = self
-            .batch_assist(
-                editor,
-                workspace.downgrade(),
-                project,
-                thread_store,
-                prompt_store,
-                Some(initial_prompt),
-                window,
-                &[range],
-                None,
-                initial_transaction_id,
-                cx,
-            )
-            .expect("batch_assist returns an id if there's only one range");
-
-        if focus {
-            self.focus_assist(assist_id, window, cx);
-        }
-
-        assist_id
-    }
-
-    fn insert_assist_blocks(
-        &self,
-        editor: &Entity<Editor>,
-        range: &Range<Anchor>,
-        prompt_editor: &Entity<PromptEditor<BufferCodegen>>,
-        cx: &mut App,
-    ) -> [CustomBlockId; 3] {
-        let prompt_editor_height = prompt_editor.update(cx, |prompt_editor, cx| {
-            prompt_editor
-                .editor
-                .update(cx, |editor, cx| editor.max_point(cx).row().0 + 1 + 2)
-        });
-        let assist_blocks = vec![
-            BlockProperties {
-                style: BlockStyle::Sticky,
-                placement: BlockPlacement::Above(range.start),
-                height: Some(prompt_editor_height),
-                render: build_assist_editor_renderer(prompt_editor),
-                priority: 0,
-            },
-            // Placeholder for tool description - will be updated dynamically
-            BlockProperties {
-                style: BlockStyle::Flex,
-                placement: BlockPlacement::Below(range.end),
-                height: Some(0),
-                render: Arc::new(|_cx| div().into_any_element()),
-                priority: 0,
-            },
-            BlockProperties {
-                style: BlockStyle::Sticky,
-                placement: BlockPlacement::Below(range.end),
-                height: None,
-                render: Arc::new(|cx| {
-                    v_flex()
-                        .h_full()
-                        .w_full()
-                        .border_t_1()
-                        .border_color(cx.theme().status().info_border)
-                        .into_any_element()
-                }),
-                priority: 0,
-            },
-        ];
-
-        editor.update(cx, |editor, cx| {
-            let block_ids = editor.insert_blocks(assist_blocks, None, cx);
-            [block_ids[0], block_ids[1], block_ids[2]]
-        })
-    }
-
-    fn handle_prompt_editor_focus_in(&mut self, assist_id: InlineAssistId, cx: &mut App) {
-        let assist = &self.assists[&assist_id];
-        let Some(decorations) = assist.decorations.as_ref() else {
-            return;
-        };
-        let assist_group = self.assist_groups.get_mut(&assist.group_id).unwrap();
-        let editor_assists = self.assists_by_editor.get_mut(&assist.editor).unwrap();
-
-        assist_group.active_assist_id = Some(assist_id);
-        if assist_group.linked {
-            for assist_id in &assist_group.assist_ids {
-                if let Some(decorations) = self.assists[assist_id].decorations.as_ref() {
-                    decorations.prompt_editor.update(cx, |prompt_editor, cx| {
-                        prompt_editor.set_show_cursor_when_unfocused(true, cx)
-                    });
-                }
-            }
-        }
-
-        assist
-            .editor
-            .update(cx, |editor, cx| {
-                let scroll_top = editor.scroll_position(cx).y;
-                let scroll_bottom = scroll_top + editor.visible_line_count().unwrap_or(0.);
-                editor_assists.scroll_lock = editor
-                    .row_for_block(decorations.prompt_block_id, cx)
-                    .map(|row| row.as_f64())
-                    .filter(|prompt_row| (scroll_top..scroll_bottom).contains(&prompt_row))
-                    .map(|prompt_row| InlineAssistScrollLock {
-                        assist_id,
-                        distance_from_top: prompt_row - scroll_top,
-                    });
-            })
-            .ok();
-    }
-
-    fn handle_prompt_editor_focus_out(&mut self, assist_id: InlineAssistId, cx: &mut App) {
-        let assist = &self.assists[&assist_id];
-        let assist_group = self.assist_groups.get_mut(&assist.group_id).unwrap();
-        if assist_group.active_assist_id == Some(assist_id) {
-            assist_group.active_assist_id = None;
-            if assist_group.linked {
-                for assist_id in &assist_group.assist_ids {
-                    if let Some(decorations) = self.assists[assist_id].decorations.as_ref() {
-                        decorations.prompt_editor.update(cx, |prompt_editor, cx| {
-                            prompt_editor.set_show_cursor_when_unfocused(false, cx)
-                        });
-                    }
-                }
-            }
-        }
-    }
-
-    fn handle_prompt_editor_event(
-        &mut self,
-        prompt_editor: Entity<PromptEditor<BufferCodegen>>,
-        event: &PromptEditorEvent,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        let assist_id = prompt_editor.read(cx).id();
-        match event {
-            PromptEditorEvent::StartRequested => {
-                self.start_assist(assist_id, window, cx);
-            }
-            PromptEditorEvent::StopRequested => {
-                self.stop_assist(assist_id, cx);
-            }
-            PromptEditorEvent::ConfirmRequested { execute: _ } => {
-                self.finish_assist(assist_id, false, window, cx);
-            }
-            PromptEditorEvent::CancelRequested => {
-                self.finish_assist(assist_id, true, window, cx);
-            }
-            PromptEditorEvent::Resized { .. } => {
-                // This only matters for the terminal inline assistant
-            }
-        }
-    }
-
-    fn handle_editor_newline(&mut self, editor: Entity<Editor>, window: &mut Window, cx: &mut App) {
-        let Some(editor_assists) = self.assists_by_editor.get(&editor.downgrade()) else {
-            return;
-        };
-
-        if editor.read(cx).selections.count() == 1 {
-            let (selection, buffer) = editor.update(cx, |editor, cx| {
-                (
-                    editor
-                        .selections
-                        .newest::<MultiBufferOffset>(&editor.display_snapshot(cx)),
-                    editor.buffer().read(cx).snapshot(cx),
-                )
-            });
-            for assist_id in &editor_assists.assist_ids {
-                let assist = &self.assists[assist_id];
-                let assist_range = assist.range.to_offset(&buffer);
-                if assist_range.contains(&selection.start) && assist_range.contains(&selection.end)
-                {
-                    if matches!(assist.codegen.read(cx).status(cx), CodegenStatus::Pending) {
-                        self.dismiss_assist(*assist_id, window, cx);
-                    } else {
-                        self.finish_assist(*assist_id, false, window, cx);
-                    }
-
-                    return;
-                }
-            }
-        }
-
-        cx.propagate();
-    }
-
-    fn handle_editor_cancel(&mut self, editor: Entity<Editor>, window: &mut Window, cx: &mut App) {
-        let Some(editor_assists) = self.assists_by_editor.get(&editor.downgrade()) else {
-            return;
-        };
-
-        if editor.read(cx).selections.count() == 1 {
-            let (selection, buffer) = editor.update(cx, |editor, cx| {
-                (
-                    editor
-                        .selections
-                        .newest::<MultiBufferOffset>(&editor.display_snapshot(cx)),
-                    editor.buffer().read(cx).snapshot(cx),
-                )
-            });
-            let mut closest_assist_fallback = None;
-            for assist_id in &editor_assists.assist_ids {
-                let assist = &self.assists[assist_id];
-                let assist_range = assist.range.to_offset(&buffer);
-                if assist.decorations.is_some() {
-                    if assist_range.contains(&selection.start)
-                        && assist_range.contains(&selection.end)
-                    {
-                        self.focus_assist(*assist_id, window, cx);
-                        return;
-                    } else {
-                        let distance_from_selection = assist_range
-                            .start
-                            .0
-                            .abs_diff(selection.start.0)
-                            .min(assist_range.start.0.abs_diff(selection.end.0))
-                            + assist_range
-                                .end
-                                .0
-                                .abs_diff(selection.start.0)
-                                .min(assist_range.end.0.abs_diff(selection.end.0));
-                        match closest_assist_fallback {
-                            Some((_, old_distance)) => {
-                                if distance_from_selection < old_distance {
-                                    closest_assist_fallback =
-                                        Some((assist_id, distance_from_selection));
-                                }
-                            }
-                            None => {
-                                closest_assist_fallback = Some((assist_id, distance_from_selection))
-                            }
-                        }
-                    }
-                }
-            }
-
-            if let Some((&assist_id, _)) = closest_assist_fallback {
-                self.focus_assist(assist_id, window, cx);
-            }
-        }
-
-        cx.propagate();
-    }
-
-    fn handle_editor_release(
-        &mut self,
-        editor: WeakEntity<Editor>,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        if let Some(editor_assists) = self.assists_by_editor.get_mut(&editor) {
-            for assist_id in editor_assists.assist_ids.clone() {
-                self.finish_assist(assist_id, true, window, cx);
-            }
-        }
-    }
-
-    fn handle_editor_change(&mut self, editor: Entity<Editor>, window: &mut Window, cx: &mut App) {
-        let Some(editor_assists) = self.assists_by_editor.get(&editor.downgrade()) else {
-            return;
-        };
-        let Some(scroll_lock) = editor_assists.scroll_lock.as_ref() else {
-            return;
-        };
-        let assist = &self.assists[&scroll_lock.assist_id];
-        let Some(decorations) = assist.decorations.as_ref() else {
-            return;
-        };
-
-        editor.update(cx, |editor, cx| {
-            let scroll_position = editor.scroll_position(cx);
-            let target_scroll_top = editor
-                .row_for_block(decorations.prompt_block_id, cx)?
-                .as_f64()
-                - scroll_lock.distance_from_top;
-            if target_scroll_top != scroll_position.y {
-                editor.set_scroll_position(point(scroll_position.x, target_scroll_top), window, cx);
-            }
-            Some(())
-        });
-    }
-
-    fn handle_editor_event(
-        &mut self,
-        editor: Entity<Editor>,
-        event: &EditorEvent,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        let Some(editor_assists) = self.assists_by_editor.get_mut(&editor.downgrade()) else {
-            return;
-        };
-
-        match event {
-            EditorEvent::Edited { transaction_id } => {
-                let buffer = editor.read(cx).buffer().read(cx);
-                let edited_ranges =
-                    buffer.edited_ranges_for_transaction::<MultiBufferOffset>(*transaction_id, cx);
-                let snapshot = buffer.snapshot(cx);
-
-                for assist_id in editor_assists.assist_ids.clone() {
-                    let assist = &self.assists[&assist_id];
-                    if matches!(
-                        assist.codegen.read(cx).status(cx),
-                        CodegenStatus::Error(_) | CodegenStatus::Done
-                    ) {
-                        let assist_range = assist.range.to_offset(&snapshot);
-                        if edited_ranges
-                            .iter()
-                            .any(|range| range.overlaps(&assist_range))
-                        {
-                            self.finish_assist(assist_id, false, window, cx);
-                        }
-                    }
-                }
-            }
-            EditorEvent::ScrollPositionChanged { .. } => {
-                if let Some(scroll_lock) = editor_assists.scroll_lock.as_ref() {
-                    let assist = &self.assists[&scroll_lock.assist_id];
-                    if let Some(decorations) = assist.decorations.as_ref() {
-                        let distance_from_top = editor.update(cx, |editor, cx| {
-                            let scroll_top = editor.scroll_position(cx).y;
-                            let prompt_row = editor
-                                .row_for_block(decorations.prompt_block_id, cx)?
-                                .0 as ScrollOffset;
-                            Some(prompt_row - scroll_top)
-                        });
-
-                        if distance_from_top.is_none_or(|distance_from_top| {
-                            distance_from_top != scroll_lock.distance_from_top
-                        }) {
-                            editor_assists.scroll_lock = None;
-                        }
-                    }
-                }
-            }
-            EditorEvent::SelectionsChanged { .. } => {
-                for assist_id in editor_assists.assist_ids.clone() {
-                    let assist = &self.assists[&assist_id];
-                    if let Some(decorations) = assist.decorations.as_ref()
-                        && decorations
-                            .prompt_editor
-                            .focus_handle(cx)
-                            .is_focused(window)
-                    {
-                        return;
-                    }
-                }
-
-                editor_assists.scroll_lock = None;
-            }
-            _ => {}
-        }
-    }
-
-    pub fn finish_assist(
-        &mut self,
-        assist_id: InlineAssistId,
-        undo: bool,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        if let Some(assist) = self.assists.get(&assist_id) {
-            let assist_group_id = assist.group_id;
-            if self.assist_groups[&assist_group_id].linked {
-                for assist_id in self.unlink_assist_group(assist_group_id, window, cx) {
-                    self.finish_assist(assist_id, undo, window, cx);
-                }
-                return;
-            }
-        }
-
-        self.dismiss_assist(assist_id, window, cx);
-
-        if let Some(assist) = self.assists.remove(&assist_id) {
-            if let hash_map::Entry::Occupied(mut entry) = self.assist_groups.entry(assist.group_id)
-            {
-                entry.get_mut().assist_ids.retain(|id| *id != assist_id);
-                if entry.get().assist_ids.is_empty() {
-                    entry.remove();
-                }
-            }
-
-            if let hash_map::Entry::Occupied(mut entry) =
-                self.assists_by_editor.entry(assist.editor.clone())
-            {
-                entry.get_mut().assist_ids.retain(|id| *id != assist_id);
-                if entry.get().assist_ids.is_empty() {
-                    entry.remove();
-                    if let Some(editor) = assist.editor.upgrade() {
-                        self.update_editor_highlights(&editor, cx);
-                    }
-                } else {
-                    entry.get_mut().highlight_updates.send(()).ok();
-                }
-            }
-
-            let active_alternative = assist.codegen.read(cx).active_alternative().clone();
-            let message_id = active_alternative.read(cx).message_id.clone();
-
-            if let Some(model) = LanguageModelRegistry::read_global(cx).inline_assistant_model() {
-                let language_name = assist.editor.upgrade().and_then(|editor| {
-                    let multibuffer = editor.read(cx).buffer().read(cx);
-                    let snapshot = multibuffer.snapshot(cx);
-                    let ranges = snapshot.range_to_buffer_ranges(assist.range.clone());
-                    ranges
-                        .first()
-                        .and_then(|(buffer, _, _)| buffer.language())
-                        .map(|language| language.name())
-                });
-                report_assistant_event(
-                    AssistantEventData {
-                        conversation_id: None,
-                        kind: AssistantKind::Inline,
-                        message_id,
-                        phase: if undo {
-                            AssistantPhase::Rejected
-                        } else {
-                            AssistantPhase::Accepted
-                        },
-                        model: model.model.telemetry_id(),
-                        model_provider: model.model.provider_id().to_string(),
-                        response_latency: None,
-                        error_message: None,
-                        language_name: language_name.map(|name| name.to_proto()),
-                    },
-                    Some(self.telemetry.clone()),
-                    cx.http_client(),
-                    model.model.api_key(cx),
-                    cx.background_executor(),
-                );
-            }
-
-            if undo {
-                assist.codegen.update(cx, |codegen, cx| codegen.undo(cx));
-            } else {
-                self.confirmed_assists.insert(assist_id, active_alternative);
-            }
-        }
-    }
-
-    fn dismiss_assist(
-        &mut self,
-        assist_id: InlineAssistId,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> bool {
-        let Some(assist) = self.assists.get_mut(&assist_id) else {
-            return false;
-        };
-        let Some(editor) = assist.editor.upgrade() else {
-            return false;
-        };
-        let Some(decorations) = assist.decorations.take() else {
-            return false;
-        };
-
-        editor.update(cx, |editor, cx| {
-            let mut to_remove = decorations.removed_line_block_ids;
-            to_remove.insert(decorations.prompt_block_id);
-            to_remove.insert(decorations.end_block_id);
-            if let Some(tool_description_block_id) = decorations.model_explanation {
-                to_remove.insert(tool_description_block_id);
-            }
-            editor.remove_blocks(to_remove, None, cx);
-        });
-
-        if decorations
-            .prompt_editor
-            .focus_handle(cx)
-            .contains_focused(window, cx)
-        {
-            self.focus_next_assist(assist_id, window, cx);
-        }
-
-        if let Some(editor_assists) = self.assists_by_editor.get_mut(&editor.downgrade()) {
-            if editor_assists
-                .scroll_lock
-                .as_ref()
-                .is_some_and(|lock| lock.assist_id == assist_id)
-            {
-                editor_assists.scroll_lock = None;
-            }
-            editor_assists.highlight_updates.send(()).ok();
-        }
-
-        true
-    }
-
-    fn focus_next_assist(&mut self, assist_id: InlineAssistId, window: &mut Window, cx: &mut App) {
-        let Some(assist) = self.assists.get(&assist_id) else {
-            return;
-        };
-
-        let assist_group = &self.assist_groups[&assist.group_id];
-        let assist_ix = assist_group
-            .assist_ids
-            .iter()
-            .position(|id| *id == assist_id)
-            .unwrap();
-        let assist_ids = assist_group
-            .assist_ids
-            .iter()
-            .skip(assist_ix + 1)
-            .chain(assist_group.assist_ids.iter().take(assist_ix));
-
-        for assist_id in assist_ids {
-            let assist = &self.assists[assist_id];
-            if assist.decorations.is_some() {
-                self.focus_assist(*assist_id, window, cx);
-                return;
-            }
-        }
-
-        assist
-            .editor
-            .update(cx, |editor, cx| window.focus(&editor.focus_handle(cx)))
-            .ok();
-    }
-
-    fn focus_assist(&mut self, assist_id: InlineAssistId, window: &mut Window, cx: &mut App) {
-        let Some(assist) = self.assists.get(&assist_id) else {
-            return;
-        };
-
-        if let Some(decorations) = assist.decorations.as_ref() {
-            decorations.prompt_editor.update(cx, |prompt_editor, cx| {
-                prompt_editor.editor.update(cx, |editor, cx| {
-                    window.focus(&editor.focus_handle(cx));
-                    editor.select_all(&SelectAll, window, cx);
-                })
-            });
-        }
-
-        self.scroll_to_assist(assist_id, window, cx);
-    }
-
-    pub fn scroll_to_assist(
-        &mut self,
-        assist_id: InlineAssistId,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        let Some(assist) = self.assists.get(&assist_id) else {
-            return;
-        };
-        let Some(editor) = assist.editor.upgrade() else {
-            return;
-        };
-
-        let position = assist.range.start;
-        editor.update(cx, |editor, cx| {
-            editor.change_selections(SelectionEffects::no_scroll(), window, cx, |selections| {
-                selections.select_anchor_ranges([position..position])
-            });
-
-            let mut scroll_target_range = None;
-            if let Some(decorations) = assist.decorations.as_ref() {
-                scroll_target_range = maybe!({
-                    let top = editor.row_for_block(decorations.prompt_block_id, cx)?.0 as f64;
-                    let bottom = editor.row_for_block(decorations.end_block_id, cx)?.0 as f64;
-                    Some((top, bottom))
-                });
-                if scroll_target_range.is_none() {
-                    log::error!("bug: failed to find blocks for scrolling to inline assist");
-                }
-            }
-            let scroll_target_range = scroll_target_range.unwrap_or_else(|| {
-                let snapshot = editor.snapshot(window, cx);
-                let start_row = assist
-                    .range
-                    .start
-                    .to_display_point(&snapshot.display_snapshot)
-                    .row();
-                let top = start_row.0 as ScrollOffset;
-                let bottom = top + 1.0;
-                (top, bottom)
-            });
-            let mut scroll_target_top = scroll_target_range.0;
-            let mut scroll_target_bottom = scroll_target_range.1;
-
-            scroll_target_top -= editor.vertical_scroll_margin() as ScrollOffset;
-            scroll_target_bottom += editor.vertical_scroll_margin() as ScrollOffset;
-
-            let height_in_lines = editor.visible_line_count().unwrap_or(0.);
-            let scroll_top = editor.scroll_position(cx).y;
-            let scroll_bottom = scroll_top + height_in_lines;
-
-            if scroll_target_top < scroll_top {
-                editor.set_scroll_position(point(0., scroll_target_top), window, cx);
-            } else if scroll_target_bottom > scroll_bottom {
-                if (scroll_target_bottom - scroll_target_top) <= height_in_lines {
-                    editor.set_scroll_position(
-                        point(0., scroll_target_bottom - height_in_lines),
-                        window,
-                        cx,
-                    );
-                } else {
-                    editor.set_scroll_position(point(0., scroll_target_top), window, cx);
-                }
-            }
-        });
-    }
-
-    fn unlink_assist_group(
-        &mut self,
-        assist_group_id: InlineAssistGroupId,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Vec<InlineAssistId> {
-        let assist_group = self.assist_groups.get_mut(&assist_group_id).unwrap();
-        assist_group.linked = false;
-
-        for assist_id in &assist_group.assist_ids {
-            let assist = self.assists.get_mut(assist_id).unwrap();
-            if let Some(editor_decorations) = assist.decorations.as_ref() {
-                editor_decorations
-                    .prompt_editor
-                    .update(cx, |prompt_editor, cx| prompt_editor.unlink(window, cx));
-            }
-        }
-        assist_group.assist_ids.clone()
-    }
-
-    pub fn start_assist(&mut self, assist_id: InlineAssistId, window: &mut Window, cx: &mut App) {
-        let assist = if let Some(assist) = self.assists.get_mut(&assist_id) {
-            assist
-        } else {
-            return;
-        };
-
-        let assist_group_id = assist.group_id;
-        if self.assist_groups[&assist_group_id].linked {
-            for assist_id in self.unlink_assist_group(assist_group_id, window, cx) {
-                self.start_assist(assist_id, window, cx);
-            }
-            return;
-        }
-
-        let Some((user_prompt, mention_set)) = assist.user_prompt(cx).zip(assist.mention_set(cx))
-        else {
-            return;
-        };
-
-        self.prompt_history.retain(|prompt| *prompt != user_prompt);
-        self.prompt_history.push_back(user_prompt.clone());
-        if self.prompt_history.len() > PROMPT_HISTORY_MAX_LEN {
-            self.prompt_history.pop_front();
-        }
-
-        let Some(ConfiguredModel { model, .. }) =
-            LanguageModelRegistry::read_global(cx).inline_assistant_model()
-        else {
-            return;
-        };
-
-        let context_task = load_context(&mention_set, cx).shared();
-        assist
-            .codegen
-            .update(cx, |codegen, cx| {
-                codegen.start(model, user_prompt, context_task, cx)
-            })
-            .log_err();
-    }
-
-    pub fn stop_assist(&mut self, assist_id: InlineAssistId, cx: &mut App) {
-        let assist = if let Some(assist) = self.assists.get_mut(&assist_id) {
-            assist
-        } else {
-            return;
-        };
-
-        assist.codegen.update(cx, |codegen, cx| codegen.stop(cx));
-    }
-
-    fn update_editor_highlights(&self, editor: &Entity<Editor>, cx: &mut App) {
-        let mut gutter_pending_ranges = Vec::new();
-        let mut gutter_transformed_ranges = Vec::new();
-        let mut foreground_ranges = Vec::new();
-        let mut inserted_row_ranges = Vec::new();
-        let empty_assist_ids = Vec::new();
-        let assist_ids = self
-            .assists_by_editor
-            .get(&editor.downgrade())
-            .map_or(&empty_assist_ids, |editor_assists| {
-                &editor_assists.assist_ids
-            });
-
-        for assist_id in assist_ids {
-            if let Some(assist) = self.assists.get(assist_id) {
-                let codegen = assist.codegen.read(cx);
-                let buffer = codegen.buffer(cx).read(cx).read(cx);
-                foreground_ranges.extend(codegen.last_equal_ranges(cx).iter().cloned());
-
-                let pending_range =
-                    codegen.edit_position(cx).unwrap_or(assist.range.start)..assist.range.end;
-                if pending_range.end.to_offset(&buffer) > pending_range.start.to_offset(&buffer) {
-                    gutter_pending_ranges.push(pending_range);
-                }
-
-                if let Some(edit_position) = codegen.edit_position(cx) {
-                    let edited_range = assist.range.start..edit_position;
-                    if edited_range.end.to_offset(&buffer) > edited_range.start.to_offset(&buffer) {
-                        gutter_transformed_ranges.push(edited_range);
-                    }
-                }
-
-                if assist.decorations.is_some() {
-                    inserted_row_ranges
-                        .extend(codegen.diff(cx).inserted_row_ranges.iter().cloned());
-                }
-            }
-        }
-
-        let snapshot = editor.read(cx).buffer().read(cx).snapshot(cx);
-        merge_ranges(&mut foreground_ranges, &snapshot);
-        merge_ranges(&mut gutter_pending_ranges, &snapshot);
-        merge_ranges(&mut gutter_transformed_ranges, &snapshot);
-        editor.update(cx, |editor, cx| {
-            enum GutterPendingRange {}
-            if gutter_pending_ranges.is_empty() {
-                editor.clear_gutter_highlights::<GutterPendingRange>(cx);
-            } else {
-                editor.highlight_gutter::<GutterPendingRange>(
-                    gutter_pending_ranges,
-                    |cx| cx.theme().status().info_background,
-                    cx,
-                )
-            }
-
-            enum GutterTransformedRange {}
-            if gutter_transformed_ranges.is_empty() {
-                editor.clear_gutter_highlights::<GutterTransformedRange>(cx);
-            } else {
-                editor.highlight_gutter::<GutterTransformedRange>(
-                    gutter_transformed_ranges,
-                    |cx| cx.theme().status().info,
-                    cx,
-                )
-            }
-
-            if foreground_ranges.is_empty() {
-                editor.clear_highlights::<InlineAssist>(cx);
-            } else {
-                editor.highlight_text::<InlineAssist>(
-                    foreground_ranges,
-                    HighlightStyle {
-                        fade_out: Some(0.6),
-                        ..Default::default()
-                    },
-                    cx,
-                );
-            }
-
-            editor.clear_row_highlights::<InlineAssist>();
-            for row_range in inserted_row_ranges {
-                editor.highlight_rows::<InlineAssist>(
-                    row_range,
-                    cx.theme().status().info_background,
-                    Default::default(),
-                    cx,
-                );
-            }
-        });
-    }
-
-    fn update_editor_blocks(
-        &mut self,
-        editor: &Entity<Editor>,
-        assist_id: InlineAssistId,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        let Some(assist) = self.assists.get_mut(&assist_id) else {
-            return;
-        };
-        let Some(decorations) = assist.decorations.as_mut() else {
-            return;
-        };
-
-        let codegen = assist.codegen.read(cx);
-        let old_snapshot = codegen.snapshot(cx);
-        let old_buffer = codegen.old_buffer(cx);
-        let deleted_row_ranges = codegen.diff(cx).deleted_row_ranges.clone();
-        // let model_explanation = codegen.model_explanation(cx);
-
-        editor.update(cx, |editor, cx| {
-            // Update tool description block
-            // if let Some(description) = model_explanation {
-            //     if let Some(block_id) = decorations.model_explanation {
-            //         editor.remove_blocks(HashSet::from_iter([block_id]), None, cx);
-            //         let new_block_id = editor.insert_blocks(
-            //             [BlockProperties {
-            //                 style: BlockStyle::Flex,
-            //                 placement: BlockPlacement::Below(assist.range.end),
-            //                 height: Some(1),
-            //                 render: Arc::new({
-            //                     let description = description.clone();
-            //                     move |cx| {
-            //                         div()
-            //                             .w_full()
-            //                             .py_1()
-            //                             .px_2()
-            //                             .bg(cx.theme().colors().editor_background)
-            //                             .border_y_1()
-            //                             .border_color(cx.theme().status().info_border)
-            //                             .child(
-            //                                 Label::new(description.clone())
-            //                                     .color(Color::Muted)
-            //                                     .size(LabelSize::Small),
-            //                             )
-            //                             .into_any_element()
-            //                     }
-            //                 }),
-            //                 priority: 0,
-            //             }],
-            //             None,
-            //             cx,
-            //         );
-            //         decorations.model_explanation = new_block_id.into_iter().next();
-            //     }
-            // } else if let Some(block_id) = decorations.model_explanation {
-            //     // Hide the block if there's no description
-            //     editor.remove_blocks(HashSet::from_iter([block_id]), None, cx);
-            //     let new_block_id = editor.insert_blocks(
-            //         [BlockProperties {
-            //             style: BlockStyle::Flex,
-            //             placement: BlockPlacement::Below(assist.range.end),
-            //             height: Some(0),
-            //             render: Arc::new(|_cx| div().into_any_element()),
-            //             priority: 0,
-            //         }],
-            //         None,
-            //         cx,
-            //     );
-            //     decorations.model_explanation = new_block_id.into_iter().next();
-            // }
-
-            let old_blocks = mem::take(&mut decorations.removed_line_block_ids);
-            editor.remove_blocks(old_blocks, None, cx);
-
-            let mut new_blocks = Vec::new();
-            for (new_row, old_row_range) in deleted_row_ranges {
-                let (_, buffer_start) = old_snapshot
-                    .point_to_buffer_offset(Point::new(*old_row_range.start(), 0))
-                    .unwrap();
-                let (_, buffer_end) = old_snapshot
-                    .point_to_buffer_offset(Point::new(
-                        *old_row_range.end(),
-                        old_snapshot.line_len(MultiBufferRow(*old_row_range.end())),
-                    ))
-                    .unwrap();
-
-                let deleted_lines_editor = cx.new(|cx| {
-                    let multi_buffer =
-                        cx.new(|_| MultiBuffer::without_headers(language::Capability::ReadOnly));
-                    multi_buffer.update(cx, |multi_buffer, cx| {
-                        multi_buffer.push_excerpts(
-                            old_buffer.clone(),
-                            // todo(lw): buffer_start and buffer_end might come from different snapshots!
-                            Some(ExcerptRange::new(buffer_start..buffer_end)),
-                            cx,
-                        );
-                    });
-
-                    enum DeletedLines {}
-                    let mut editor = Editor::for_multibuffer(multi_buffer, None, window, cx);
-                    editor.disable_scrollbars_and_minimap(window, cx);
-                    editor.set_soft_wrap_mode(language::language_settings::SoftWrap::None, cx);
-                    editor.set_show_wrap_guides(false, cx);
-                    editor.set_show_gutter(false, cx);
-                    editor.set_offset_content(false, cx);
-                    editor.scroll_manager.set_forbid_vertical_scroll(true);
-                    editor.set_read_only(true);
-                    editor.set_show_edit_predictions(Some(false), window, cx);
-                    editor.highlight_rows::<DeletedLines>(
-                        Anchor::min()..Anchor::max(),
-                        cx.theme().status().deleted_background,
-                        Default::default(),
-                        cx,
-                    );
-                    editor
-                });
-
-                let height =
-                    deleted_lines_editor.update(cx, |editor, cx| editor.max_point(cx).row().0 + 1);
-                new_blocks.push(BlockProperties {
-                    placement: BlockPlacement::Above(new_row),
-                    height: Some(height),
-                    style: BlockStyle::Flex,
-                    render: Arc::new(move |cx| {
-                        div()
-                            .block_mouse_except_scroll()
-                            .bg(cx.theme().status().deleted_background)
-                            .size_full()
-                            .h(height as f32 * cx.window.line_height())
-                            .pl(cx.margins.gutter.full_width())
-                            .child(deleted_lines_editor.clone())
-                            .into_any_element()
-                    }),
-                    priority: 0,
-                });
-            }
-
-            decorations.removed_line_block_ids = editor
-                .insert_blocks(new_blocks, None, cx)
-                .into_iter()
-                .collect();
-        })
-    }
-
-    fn resolve_inline_assist_target(
-        workspace: &mut Workspace,
-        agent_panel: Option<Entity<AgentPanel>>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<InlineAssistTarget> {
-        if let Some(terminal_panel) = workspace.panel::<TerminalPanel>(cx)
-            && terminal_panel
-                .read(cx)
-                .focus_handle(cx)
-                .contains_focused(window, cx)
-            && let Some(terminal_view) = terminal_panel.read(cx).pane().and_then(|pane| {
-                pane.read(cx)
-                    .active_item()
-                    .and_then(|t| t.downcast::<TerminalView>())
-            })
-        {
-            return Some(InlineAssistTarget::Terminal(terminal_view));
-        }
-
-        let text_thread_editor = agent_panel
-            .and_then(|panel| panel.read(cx).active_text_thread_editor())
-            .and_then(|editor| {
-                let editor = &editor.read(cx).editor().clone();
-                if editor.read(cx).is_focused(window) {
-                    Some(editor.clone())
-                } else {
-                    None
-                }
-            });
-
-        if let Some(text_thread_editor) = text_thread_editor {
-            Some(InlineAssistTarget::Editor(text_thread_editor))
-        } else if let Some(workspace_editor) = workspace
-            .active_item(cx)
-            .and_then(|item| item.act_as::<Editor>(cx))
-        {
-            Some(InlineAssistTarget::Editor(workspace_editor))
-        } else {
-            workspace
-                .active_item(cx)
-                .and_then(|item| item.act_as::<TerminalView>(cx))
-                .map(InlineAssistTarget::Terminal)
-        }
-    }
-}
-
-struct EditorInlineAssists {
-    assist_ids: Vec<InlineAssistId>,
-    scroll_lock: Option<InlineAssistScrollLock>,
-    highlight_updates: watch::Sender<()>,
-    _update_highlights: Task<Result<()>>,
-    _subscriptions: Vec<gpui::Subscription>,
-}
-
-struct InlineAssistScrollLock {
-    assist_id: InlineAssistId,
-    distance_from_top: ScrollOffset,
-}
-
-impl EditorInlineAssists {
-    fn new(editor: &Entity<Editor>, window: &mut Window, cx: &mut App) -> Self {
-        let (highlight_updates_tx, mut highlight_updates_rx) = watch::channel(());
-        Self {
-            assist_ids: Vec::new(),
-            scroll_lock: None,
-            highlight_updates: highlight_updates_tx,
-            _update_highlights: cx.spawn({
-                let editor = editor.downgrade();
-                async move |cx| {
-                    while let Ok(()) = highlight_updates_rx.changed().await {
-                        let editor = editor.upgrade().context("editor was dropped")?;
-                        cx.update_global(|assistant: &mut InlineAssistant, cx| {
-                            assistant.update_editor_highlights(&editor, cx);
-                        })?;
-                    }
-                    Ok(())
-                }
-            }),
-            _subscriptions: vec![
-                cx.observe_release_in(editor, window, {
-                    let editor = editor.downgrade();
-                    |_, window, cx| {
-                        InlineAssistant::update_global(cx, |this, cx| {
-                            this.handle_editor_release(editor, window, cx);
-                        })
-                    }
-                }),
-                window.observe(editor, cx, move |editor, window, cx| {
-                    InlineAssistant::update_global(cx, |this, cx| {
-                        this.handle_editor_change(editor, window, cx)
-                    })
-                }),
-                window.subscribe(editor, cx, move |editor, event, window, cx| {
-                    InlineAssistant::update_global(cx, |this, cx| {
-                        this.handle_editor_event(editor, event, window, cx)
-                    })
-                }),
-                editor.update(cx, |editor, cx| {
-                    let editor_handle = cx.entity().downgrade();
-                    editor.register_action(move |_: &editor::actions::Newline, window, cx| {
-                        InlineAssistant::update_global(cx, |this, cx| {
-                            if let Some(editor) = editor_handle.upgrade() {
-                                this.handle_editor_newline(editor, window, cx)
-                            }
-                        })
-                    })
-                }),
-                editor.update(cx, |editor, cx| {
-                    let editor_handle = cx.entity().downgrade();
-                    editor.register_action(move |_: &editor::actions::Cancel, window, cx| {
-                        InlineAssistant::update_global(cx, |this, cx| {
-                            if let Some(editor) = editor_handle.upgrade() {
-                                this.handle_editor_cancel(editor, window, cx)
-                            }
-                        })
-                    })
-                }),
-            ],
-        }
-    }
-}
-
-struct InlineAssistGroup {
-    assist_ids: Vec<InlineAssistId>,
-    linked: bool,
-    active_assist_id: Option<InlineAssistId>,
-}
-
-impl InlineAssistGroup {
-    fn new() -> Self {
-        Self {
-            assist_ids: Vec::new(),
-            linked: true,
-            active_assist_id: None,
-        }
-    }
-}
-
-fn build_assist_editor_renderer(editor: &Entity<PromptEditor<BufferCodegen>>) -> RenderBlock {
-    let editor = editor.clone();
-
-    Arc::new(move |cx: &mut BlockContext| {
-        let editor_margins = editor.read(cx).editor_margins();
-
-        *editor_margins.lock() = *cx.margins;
-        editor.clone().into_any_element()
-    })
-}
-
-#[derive(Copy, Clone, Default, Debug, PartialEq, Eq, Hash)]
-struct InlineAssistGroupId(usize);
-
-impl InlineAssistGroupId {
-    fn post_inc(&mut self) -> InlineAssistGroupId {
-        let id = *self;
-        self.0 += 1;
-        id
-    }
-}
-
-pub struct InlineAssist {
-    group_id: InlineAssistGroupId,
-    range: Range<Anchor>,
-    editor: WeakEntity<Editor>,
-    decorations: Option<InlineAssistDecorations>,
-    codegen: Entity<BufferCodegen>,
-    _subscriptions: Vec<Subscription>,
-    workspace: WeakEntity<Workspace>,
-}
-
-impl InlineAssist {
-    fn new(
-        assist_id: InlineAssistId,
-        group_id: InlineAssistGroupId,
-        editor: &Entity<Editor>,
-        prompt_editor: &Entity<PromptEditor<BufferCodegen>>,
-        prompt_block_id: CustomBlockId,
-        tool_description_block_id: CustomBlockId,
-        end_block_id: CustomBlockId,
-        range: Range<Anchor>,
-        codegen: Entity<BufferCodegen>,
-        workspace: WeakEntity<Workspace>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Self {
-        let prompt_editor_focus_handle = prompt_editor.focus_handle(cx);
-        InlineAssist {
-            group_id,
-            editor: editor.downgrade(),
-            decorations: Some(InlineAssistDecorations {
-                prompt_block_id,
-                prompt_editor: prompt_editor.clone(),
-                removed_line_block_ids: Default::default(),
-                model_explanation: Some(tool_description_block_id),
-                end_block_id,
-            }),
-            range,
-            codegen: codegen.clone(),
-            workspace,
-            _subscriptions: vec![
-                window.on_focus_in(&prompt_editor_focus_handle, cx, move |_, cx| {
-                    InlineAssistant::update_global(cx, |this, cx| {
-                        this.handle_prompt_editor_focus_in(assist_id, cx)
-                    })
-                }),
-                window.on_focus_out(&prompt_editor_focus_handle, cx, move |_, _, cx| {
-                    InlineAssistant::update_global(cx, |this, cx| {
-                        this.handle_prompt_editor_focus_out(assist_id, cx)
-                    })
-                }),
-                window.subscribe(prompt_editor, cx, |prompt_editor, event, window, cx| {
-                    InlineAssistant::update_global(cx, |this, cx| {
-                        this.handle_prompt_editor_event(prompt_editor, event, window, cx)
-                    })
-                }),
-                window.observe(&codegen, cx, {
-                    let editor = editor.downgrade();
-                    move |_, window, cx| {
-                        if let Some(editor) = editor.upgrade() {
-                            InlineAssistant::update_global(cx, |this, cx| {
-                                if let Some(editor_assists) =
-                                    this.assists_by_editor.get_mut(&editor.downgrade())
-                                {
-                                    editor_assists.highlight_updates.send(()).ok();
-                                }
-
-                                this.update_editor_blocks(&editor, assist_id, window, cx);
-                            })
-                        }
-                    }
-                }),
-                window.subscribe(&codegen, cx, move |codegen, event, window, cx| {
-                    InlineAssistant::update_global(cx, |this, cx| match event {
-                        CodegenEvent::Undone => this.finish_assist(assist_id, false, window, cx),
-                        CodegenEvent::Finished => {
-                            let assist = if let Some(assist) = this.assists.get(&assist_id) {
-                                assist
-                            } else {
-                                return;
-                            };
-
-                            if let CodegenStatus::Error(error) = codegen.read(cx).status(cx)
-                                && assist.decorations.is_none()
-                                && let Some(workspace) = assist.workspace.upgrade()
-                            {
-                                #[cfg(any(test, feature = "test-support"))]
-                                if let Some(sender) = &mut this._inline_assistant_completions {
-                                    sender
-                                        .unbounded_send(Err(anyhow::anyhow!(
-                                            "Inline assistant error: {}",
-                                            error
-                                        )))
-                                        .ok();
-                                }
-
-                                let error = format!("Inline assistant error: {}", error);
-                                workspace.update(cx, |workspace, cx| {
-                                    struct InlineAssistantError;
-
-                                    let id = NotificationId::composite::<InlineAssistantError>(
-                                        assist_id.0,
-                                    );
-
-                                    workspace.show_toast(Toast::new(id, error), cx);
-                                })
-                            } else {
-                                #[cfg(any(test, feature = "test-support"))]
-                                if let Some(sender) = &mut this._inline_assistant_completions {
-                                    sender.unbounded_send(Ok(assist_id)).ok();
-                                }
-                            }
-
-                            if assist.decorations.is_none() {
-                                this.finish_assist(assist_id, false, window, cx);
-                            }
-                        }
-                    })
-                }),
-            ],
-        }
-    }
-
-    fn user_prompt(&self, cx: &App) -> Option<String> {
-        let decorations = self.decorations.as_ref()?;
-        Some(decorations.prompt_editor.read(cx).prompt(cx))
-    }
-
-    fn mention_set(&self, cx: &App) -> Option<Entity<MentionSet>> {
-        let decorations = self.decorations.as_ref()?;
-        Some(decorations.prompt_editor.read(cx).mention_set().clone())
-    }
-}
-
-struct InlineAssistDecorations {
-    prompt_block_id: CustomBlockId,
-    prompt_editor: Entity<PromptEditor<BufferCodegen>>,
-    removed_line_block_ids: HashSet<CustomBlockId>,
-    model_explanation: Option<CustomBlockId>,
-    end_block_id: CustomBlockId,
-}
-
-struct AssistantCodeActionProvider {
-    editor: WeakEntity<Editor>,
-    workspace: WeakEntity<Workspace>,
-}
-
-const ASSISTANT_CODE_ACTION_PROVIDER_ID: &str = "assistant";
-
-impl CodeActionProvider for AssistantCodeActionProvider {
-    fn id(&self) -> Arc<str> {
-        ASSISTANT_CODE_ACTION_PROVIDER_ID.into()
-    }
-
-    fn code_actions(
-        &self,
-        buffer: &Entity<Buffer>,
-        range: Range<text::Anchor>,
-        _: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<Vec<CodeAction>>> {
-        if !AgentSettings::get_global(cx).enabled(cx) {
-            return Task::ready(Ok(Vec::new()));
-        }
-
-        let snapshot = buffer.read(cx).snapshot();
-        let mut range = range.to_point(&snapshot);
-
-        // Expand the range to line boundaries.
-        range.start.column = 0;
-        range.end.column = snapshot.line_len(range.end.row);
-
-        let mut has_diagnostics = false;
-        for diagnostic in snapshot.diagnostics_in_range::<_, Point>(range.clone(), false) {
-            range.start = cmp::min(range.start, diagnostic.range.start);
-            range.end = cmp::max(range.end, diagnostic.range.end);
-            has_diagnostics = true;
-        }
-        if has_diagnostics {
-            let symbols_containing_start = snapshot.symbols_containing(range.start, None);
-            if let Some(symbol) = symbols_containing_start.last() {
-                range.start = cmp::min(range.start, symbol.range.start.to_point(&snapshot));
-                range.end = cmp::max(range.end, symbol.range.end.to_point(&snapshot));
-            }
-            let symbols_containing_end = snapshot.symbols_containing(range.end, None);
-            if let Some(symbol) = symbols_containing_end.last() {
-                range.start = cmp::min(range.start, symbol.range.start.to_point(&snapshot));
-                range.end = cmp::max(range.end, symbol.range.end.to_point(&snapshot));
-            }
-
-            Task::ready(Ok(vec![CodeAction {
-                server_id: language::LanguageServerId(0),
-                range: snapshot.anchor_before(range.start)..snapshot.anchor_after(range.end),
-                lsp_action: LspAction::Action(Box::new(lsp::CodeAction {
-                    title: "Fix with Assistant".into(),
-                    ..Default::default()
-                })),
-                resolved: true,
-            }]))
-        } else {
-            Task::ready(Ok(Vec::new()))
-        }
-    }
-
-    fn apply_code_action(
-        &self,
-        buffer: Entity<Buffer>,
-        action: CodeAction,
-        excerpt_id: ExcerptId,
-        _push_to_history: bool,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<ProjectTransaction>> {
-        let editor = self.editor.clone();
-        let workspace = self.workspace.clone();
-        let prompt_store = PromptStore::global(cx);
-        window.spawn(cx, async move |cx| {
-            let workspace = workspace.upgrade().context("workspace was released")?;
-            let thread_store = cx.update(|_window, cx| {
-                anyhow::Ok(
-                    workspace
-                        .read(cx)
-                        .panel::<AgentPanel>(cx)
-                        .context("missing agent panel")?
-                        .read(cx)
-                        .thread_store()
-                        .clone(),
-                )
-            })??;
-            let editor = editor.upgrade().context("editor was released")?;
-            let range = editor
-                .update(cx, |editor, cx| {
-                    editor.buffer().update(cx, |multibuffer, cx| {
-                        let buffer = buffer.read(cx);
-                        let multibuffer_snapshot = multibuffer.read(cx);
-
-                        let old_context_range =
-                            multibuffer_snapshot.context_range_for_excerpt(excerpt_id)?;
-                        let mut new_context_range = old_context_range.clone();
-                        if action
-                            .range
-                            .start
-                            .cmp(&old_context_range.start, buffer)
-                            .is_lt()
-                        {
-                            new_context_range.start = action.range.start;
-                        }
-                        if action.range.end.cmp(&old_context_range.end, buffer).is_gt() {
-                            new_context_range.end = action.range.end;
-                        }
-                        drop(multibuffer_snapshot);
-
-                        if new_context_range != old_context_range {
-                            multibuffer.resize_excerpt(excerpt_id, new_context_range, cx);
-                        }
-
-                        let multibuffer_snapshot = multibuffer.read(cx);
-                        multibuffer_snapshot.anchor_range_in_excerpt(excerpt_id, action.range)
-                    })
-                })?
-                .context("invalid range")?;
-
-            let prompt_store = prompt_store.await.ok();
-            cx.update_global(|assistant: &mut InlineAssistant, window, cx| {
-                let assist_id = assistant.suggest_assist(
-                    &editor,
-                    range,
-                    "Fix Diagnostics".into(),
-                    None,
-                    true,
-                    workspace,
-                    thread_store,
-                    prompt_store,
-                    window,
-                    cx,
-                );
-                assistant.start_assist(assist_id, window, cx);
-            })?;
-
-            Ok(ProjectTransaction::default())
-        })
-    }
-}
-
-fn merge_ranges(ranges: &mut Vec<Range<Anchor>>, buffer: &MultiBufferSnapshot) {
-    ranges.sort_unstable_by(|a, b| {
-        a.start
-            .cmp(&b.start, buffer)
-            .then_with(|| b.end.cmp(&a.end, buffer))
-    });
-
-    let mut ix = 0;
-    while ix + 1 < ranges.len() {
-        let b = ranges[ix + 1].clone();
-        let a = &mut ranges[ix];
-        if a.end.cmp(&b.start, buffer).is_gt() {
-            if a.end.cmp(&b.end, buffer).is_lt() {
-                a.end = b.end;
-            }
-            ranges.remove(ix + 1);
-        } else {
-            ix += 1;
-        }
-    }
-}
-
-#[cfg(any(test, feature = "test-support"))]
-pub mod test {
-    use std::sync::Arc;
-
-    use agent::HistoryStore;
-    use assistant_text_thread::TextThreadStore;
-    use client::{Client, UserStore};
-    use editor::{Editor, MultiBuffer, MultiBufferOffset};
-    use fs::FakeFs;
-    use futures::channel::mpsc;
-    use gpui::{AppContext, TestAppContext, UpdateGlobal as _};
-    use language::Buffer;
-    use language_model::LanguageModelRegistry;
-    use project::Project;
-    use prompt_store::PromptBuilder;
-    use smol::stream::StreamExt as _;
-    use util::test::marked_text_ranges;
-    use workspace::Workspace;
-
-    use crate::InlineAssistant;
-
-    pub fn run_inline_assistant_test<SetupF, TestF>(
-        base_buffer: String,
-        prompt: String,
-        setup: SetupF,
-        test: TestF,
-        cx: &mut TestAppContext,
-    ) -> String
-    where
-        SetupF: FnOnce(&mut gpui::VisualTestContext),
-        TestF: FnOnce(&mut gpui::VisualTestContext),
-    {
-        let fs = FakeFs::new(cx.executor());
-        let app_state = cx.update(|cx| workspace::AppState::test(cx));
-        let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
-        let http = Arc::new(reqwest_client::ReqwestClient::user_agent("agent tests").unwrap());
-        let client = cx.update(|cx| {
-            cx.set_http_client(http);
-            Client::production(cx)
-        });
-        let mut inline_assistant =
-            InlineAssistant::new(fs.clone(), prompt_builder, client.telemetry().clone());
-
-        let (tx, mut completion_rx) = mpsc::unbounded();
-        inline_assistant.set_completion_receiver(tx);
-
-        // Initialize settings and client
-        cx.update(|cx| {
-            gpui_tokio::init(cx);
-            settings::init(cx);
-            client::init(&client, cx);
-            workspace::init(app_state.clone(), cx);
-            let user_store = cx.new(|cx| UserStore::new(client.clone(), cx));
-            language_model::init(client.clone(), cx);
-            language_models::init(user_store, client.clone(), cx);
-
-            cx.set_global(inline_assistant);
-        });
-
-        let project = cx
-            .executor()
-            .block_test(async { Project::test(fs.clone(), [], cx).await });
-
-        // Create workspace with window
-        let (workspace, cx) = cx.add_window_view(|window, cx| {
-            window.activate_window();
-            Workspace::new(None, project.clone(), app_state.clone(), window, cx)
-        });
-
-        setup(cx);
-
-        let (_editor, buffer) = cx.update(|window, cx| {
-            let buffer = cx.new(|cx| Buffer::local("", cx));
-            let multibuffer = cx.new(|cx| MultiBuffer::singleton(buffer.clone(), cx));
-            let editor = cx.new(|cx| Editor::for_multibuffer(multibuffer, None, window, cx));
-            editor.update(cx, |editor, cx| {
-                let (unmarked_text, selection_ranges) = marked_text_ranges(&base_buffer, true);
-                editor.set_text(unmarked_text, window, cx);
-                editor.change_selections(Default::default(), window, cx, |s| {
-                    s.select_ranges(
-                        selection_ranges.into_iter().map(|range| {
-                            MultiBufferOffset(range.start)..MultiBufferOffset(range.end)
-                        }),
-                    )
-                })
-            });
-
-            let text_thread_store = cx.new(|cx| TextThreadStore::fake(project.clone(), cx));
-            let history_store = cx.new(|cx| HistoryStore::new(text_thread_store, cx));
-
-            // Add editor to workspace
-            workspace.update(cx, |workspace, cx| {
-                workspace.add_item_to_active_pane(Box::new(editor.clone()), None, true, window, cx);
-            });
-
-            // Call assist method
-            InlineAssistant::update_global(cx, |inline_assistant, cx| {
-                let assist_id = inline_assistant
-                    .assist(
-                        &editor,
-                        workspace.downgrade(),
-                        project.downgrade(),
-                        history_store, // thread_store
-                        None,          // prompt_store
-                        Some(prompt),
-                        window,
-                        cx,
-                    )
-                    .unwrap();
-
-                inline_assistant.start_assist(assist_id, window, cx);
-            });
-
-            (editor, buffer)
-        });
-
-        cx.run_until_parked();
-
-        test(cx);
-
-        cx.executor()
-            .block_test(async { completion_rx.next().await });
-
-        buffer.read_with(cx, |buffer, _| buffer.text())
-    }
-
-    #[allow(unused)]
-    pub fn test_inline_assistant(
-        base_buffer: &'static str,
-        llm_output: &'static str,
-        cx: &mut TestAppContext,
-    ) -> String {
-        run_inline_assistant_test(
-            base_buffer.to_string(),
-            "Prompt doesn't matter because we're using a fake model".to_string(),
-            |cx| {
-                cx.update(|_, cx| LanguageModelRegistry::test(cx));
-            },
-            |cx| {
-                let fake_model = cx.update(|_, cx| {
-                    LanguageModelRegistry::global(cx)
-                        .update(cx, |registry, _| registry.fake_model())
-                });
-                let fake = fake_model.as_fake();
-
-                // let fake = fake_model;
-                fake.send_last_completion_stream_text_chunk(llm_output.to_string());
-                fake.end_last_completion_stream();
-
-                // Run again to process the model's response
-                cx.run_until_parked();
-            },
-            cx,
-        )
-    }
-}
diff --git a/crates/agent_ui/src/inline_prompt_editor.rs b/crates/agent_ui/src/inline_prompt_editor.rs
deleted file mode 100644
index 4856d4024c..0000000000
--- a/crates/agent_ui/src/inline_prompt_editor.rs
+++ /dev/null
@@ -1,1529 +0,0 @@
-use agent::HistoryStore;
-use collections::{HashMap, VecDeque};
-use editor::actions::Paste;
-use editor::code_context_menus::CodeContextMenu;
-use editor::display_map::{CreaseId, EditorMargins};
-use editor::{AnchorRangeExt as _, MultiBufferOffset, ToOffset as _};
-use editor::{
-    ContextMenuOptions, Editor, EditorElement, EditorEvent, EditorMode, EditorStyle, MultiBuffer,
-    actions::{MoveDown, MoveUp},
-};
-use feature_flags::{FeatureFlag, FeatureFlagAppExt};
-use fs::Fs;
-use gpui::{
-    AnyElement, App, ClipboardItem, Context, Entity, EventEmitter, FocusHandle, Focusable,
-    Subscription, TextStyle, TextStyleRefinement, WeakEntity, Window, actions,
-};
-use language_model::{LanguageModel, LanguageModelRegistry};
-use markdown::{HeadingLevelStyles, Markdown, MarkdownElement, MarkdownStyle};
-use parking_lot::Mutex;
-use project::Project;
-use prompt_store::PromptStore;
-use settings::Settings;
-use std::ops::Range;
-use std::rc::Rc;
-use std::sync::Arc;
-use std::{cmp, mem};
-use theme::ThemeSettings;
-use ui::utils::WithRemSize;
-use ui::{IconButtonShape, KeyBinding, PopoverMenuHandle, Tooltip, prelude::*};
-use uuid::Uuid;
-use workspace::notifications::NotificationId;
-use workspace::{Toast, Workspace};
-use zed_actions::agent::ToggleModelSelector;
-
-use crate::agent_model_selector::AgentModelSelector;
-use crate::buffer_codegen::BufferCodegen;
-use crate::completion_provider::{
-    PromptCompletionProvider, PromptCompletionProviderDelegate, PromptContextType,
-};
-use crate::mention_set::paste_images_as_context;
-use crate::mention_set::{MentionSet, crease_for_mention};
-use crate::terminal_codegen::TerminalCodegen;
-use crate::{CycleNextInlineAssist, CyclePreviousInlineAssist, ModelUsageContext};
-
-actions!(inline_assistant, [ThumbsUpResult, ThumbsDownResult]);
-
-pub struct InlineAssistRatingFeatureFlag;
-
-impl FeatureFlag for InlineAssistRatingFeatureFlag {
-    const NAME: &'static str = "inline-assist-rating";
-
-    fn enabled_for_staff() -> bool {
-        false
-    }
-}
-
-enum RatingState {
-    Pending,
-    GeneratedCompletion(Option<String>),
-    Rated(Uuid),
-}
-
-impl RatingState {
-    fn is_pending(&self) -> bool {
-        matches!(self, RatingState::Pending)
-    }
-
-    fn rating_id(&self) -> Option<Uuid> {
-        match self {
-            RatingState::Pending => None,
-            RatingState::GeneratedCompletion(_) => None,
-            RatingState::Rated(id) => Some(*id),
-        }
-    }
-
-    fn rate(&mut self) -> (Uuid, Option<String>) {
-        let id = Uuid::new_v4();
-        let old_state = mem::replace(self, RatingState::Rated(id));
-        let completion = match old_state {
-            RatingState::Pending => None,
-            RatingState::GeneratedCompletion(completion) => completion,
-            RatingState::Rated(_) => None,
-        };
-
-        (id, completion)
-    }
-
-    fn reset(&mut self) {
-        *self = RatingState::Pending;
-    }
-
-    fn generated_completion(&mut self, generated_completion: Option<String>) {
-        *self = RatingState::GeneratedCompletion(generated_completion);
-    }
-}
-
-pub struct PromptEditor<T> {
-    pub editor: Entity<Editor>,
-    mode: PromptEditorMode,
-    mention_set: Entity<MentionSet>,
-    history_store: Entity<HistoryStore>,
-    prompt_store: Option<Entity<PromptStore>>,
-    workspace: WeakEntity<Workspace>,
-    model_selector: Entity<AgentModelSelector>,
-    edited_since_done: bool,
-    prompt_history: VecDeque<String>,
-    prompt_history_ix: Option<usize>,
-    pending_prompt: String,
-    _codegen_subscription: Subscription,
-    editor_subscriptions: Vec<Subscription>,
-    show_rate_limit_notice: bool,
-    rated: RatingState,
-    _phantom: std::marker::PhantomData<T>,
-}
-
-impl<T: 'static> EventEmitter<PromptEditorEvent> for PromptEditor<T> {}
-
-impl<T: 'static> Render for PromptEditor<T> {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let ui_font_size = ThemeSettings::get_global(cx).ui_font_size(cx);
-        let mut buttons = Vec::new();
-
-        const RIGHT_PADDING: Pixels = px(9.);
-
-        let (left_gutter_width, right_padding, explanation) = match &self.mode {
-            PromptEditorMode::Buffer {
-                id: _,
-                codegen,
-                editor_margins,
-            } => {
-                let codegen = codegen.read(cx);
-
-                if codegen.alternative_count(cx) > 1 {
-                    buttons.push(self.render_cycle_controls(codegen, cx));
-                }
-
-                let editor_margins = editor_margins.lock();
-                let gutter = editor_margins.gutter;
-
-                let left_gutter_width = gutter.full_width() + (gutter.margin / 2.0);
-                let right_padding = editor_margins.right + RIGHT_PADDING;
-
-                let explanation = codegen
-                    .active_alternative()
-                    .read(cx)
-                    .model_explanation
-                    .clone();
-
-                (left_gutter_width, right_padding, explanation)
-            }
-            PromptEditorMode::Terminal { .. } => {
-                // Give the equivalent of the same left-padding that we're using on the right
-                (Pixels::from(40.0), Pixels::from(24.), None)
-            }
-        };
-
-        let bottom_padding = match &self.mode {
-            PromptEditorMode::Buffer { .. } => rems_from_px(2.0),
-            PromptEditorMode::Terminal { .. } => rems_from_px(4.0),
-        };
-
-        buttons.extend(self.render_buttons(window, cx));
-
-        let menu_visible = self.is_completions_menu_visible(cx);
-        let add_context_button = IconButton::new("add-context", IconName::AtSign)
-            .icon_size(IconSize::Small)
-            .icon_color(Color::Muted)
-            .when(!menu_visible, |this| {
-                this.tooltip(move |_window, cx| {
-                    Tooltip::with_meta("Add Context", None, "Or type @ to include context", cx)
-                })
-            })
-            .on_click(cx.listener(move |this, _, window, cx| {
-                this.trigger_completion_menu(window, cx);
-            }));
-
-        let markdown = window.use_state(cx, |_, cx| Markdown::new("".into(), None, None, cx));
-
-        if let Some(explanation) = &explanation {
-            markdown.update(cx, |markdown, cx| {
-                markdown.reset(explanation.clone(), cx);
-            });
-        }
-
-        let explanation_label = self
-            .render_markdown(markdown, markdown_style(window, cx))
-            .into_any_element();
-
-        v_flex()
-            .key_context("PromptEditor")
-            .capture_action(cx.listener(Self::paste))
-            .block_mouse_except_scroll()
-            .size_full()
-            .pt_0p5()
-            .pb(bottom_padding)
-            .pr(right_padding)
-            .gap_0p5()
-            .justify_center()
-            .border_y_1()
-            .border_color(cx.theme().colors().border)
-            .bg(cx.theme().colors().editor_background)
-            .child(
-                h_flex()
-                    .on_action(cx.listener(|this, _: &ToggleModelSelector, window, cx| {
-                        this.model_selector
-                            .update(cx, |model_selector, cx| model_selector.toggle(window, cx));
-                    }))
-                    .on_action(cx.listener(Self::confirm))
-                    .on_action(cx.listener(Self::cancel))
-                    .on_action(cx.listener(Self::move_up))
-                    .on_action(cx.listener(Self::move_down))
-                    .on_action(cx.listener(Self::thumbs_up))
-                    .on_action(cx.listener(Self::thumbs_down))
-                    .capture_action(cx.listener(Self::cycle_prev))
-                    .capture_action(cx.listener(Self::cycle_next))
-                    .child(
-                        WithRemSize::new(ui_font_size)
-                            .h_full()
-                            .w(left_gutter_width)
-                            .flex()
-                            .flex_row()
-                            .flex_shrink_0()
-                            .items_center()
-                            .justify_center()
-                            .gap_1()
-                            .child(self.render_close_button(cx))
-                            .map(|el| {
-                                let CodegenStatus::Error(error) = self.codegen_status(cx) else {
-                                    return el;
-                                };
-
-                                let error_message = SharedString::from(error.to_string());
-                                el.child(
-                                    div()
-                                        .id("error")
-                                        .tooltip(Tooltip::text(error_message))
-                                        .child(
-                                            Icon::new(IconName::XCircle)
-                                                .size(IconSize::Small)
-                                                .color(Color::Error),
-                                        ),
-                                )
-                            }),
-                    )
-                    .child(
-                        h_flex()
-                            .w_full()
-                            .justify_between()
-                            .child(div().flex_1().child(self.render_editor(window, cx)))
-                            .child(
-                                WithRemSize::new(ui_font_size)
-                                    .flex()
-                                    .flex_row()
-                                    .items_center()
-                                    .gap_1()
-                                    .child(add_context_button)
-                                    .child(self.model_selector.clone())
-                                    .children(buttons),
-                            ),
-                    ),
-            )
-            .when_some(explanation, |this, _| {
-                this.child(
-                    h_flex()
-                        .size_full()
-                        .justify_center()
-                        .child(div().w(left_gutter_width + px(6.)))
-                        .child(
-                            div()
-                                .size_full()
-                                .min_w_0()
-                                .pt(rems_from_px(3.))
-                                .pl_0p5()
-                                .flex_1()
-                                .border_t_1()
-                                .border_color(cx.theme().colors().border_variant)
-                                .child(explanation_label),
-                        ),
-                )
-            })
-    }
-}
-
-fn markdown_style(window: &Window, cx: &App) -> MarkdownStyle {
-    let theme_settings = ThemeSettings::get_global(cx);
-    let colors = cx.theme().colors();
-    let mut text_style = window.text_style();
-
-    text_style.refine(&TextStyleRefinement {
-        font_family: Some(theme_settings.ui_font.family.clone()),
-        color: Some(colors.text),
-        ..Default::default()
-    });
-
-    MarkdownStyle {
-        base_text_style: text_style.clone(),
-        syntax: cx.theme().syntax().clone(),
-        selection_background_color: colors.element_selection_background,
-        heading_level_styles: Some(HeadingLevelStyles {
-            h1: Some(TextStyleRefinement {
-                font_size: Some(rems(1.15).into()),
-                ..Default::default()
-            }),
-            h2: Some(TextStyleRefinement {
-                font_size: Some(rems(1.1).into()),
-                ..Default::default()
-            }),
-            h3: Some(TextStyleRefinement {
-                font_size: Some(rems(1.05).into()),
-                ..Default::default()
-            }),
-            h4: Some(TextStyleRefinement {
-                font_size: Some(rems(1.).into()),
-                ..Default::default()
-            }),
-            h5: Some(TextStyleRefinement {
-                font_size: Some(rems(0.95).into()),
-                ..Default::default()
-            }),
-            h6: Some(TextStyleRefinement {
-                font_size: Some(rems(0.875).into()),
-                ..Default::default()
-            }),
-        }),
-        inline_code: TextStyleRefinement {
-            font_family: Some(theme_settings.buffer_font.family.clone()),
-            font_fallbacks: theme_settings.buffer_font.fallbacks.clone(),
-            font_features: Some(theme_settings.buffer_font.features.clone()),
-            background_color: Some(colors.editor_foreground.opacity(0.08)),
-            ..Default::default()
-        },
-        ..Default::default()
-    }
-}
-
-impl<T: 'static> Focusable for PromptEditor<T> {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        self.editor.focus_handle(cx)
-    }
-}
-
-impl<T: 'static> PromptEditor<T> {
-    const MAX_LINES: u8 = 8;
-
-    fn codegen_status<'a>(&'a self, cx: &'a App) -> &'a CodegenStatus {
-        match &self.mode {
-            PromptEditorMode::Buffer { codegen, .. } => codegen.read(cx).status(cx),
-            PromptEditorMode::Terminal { codegen, .. } => &codegen.read(cx).status,
-        }
-    }
-
-    fn subscribe_to_editor(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.editor_subscriptions.clear();
-        self.editor_subscriptions.push(cx.subscribe_in(
-            &self.editor,
-            window,
-            Self::handle_prompt_editor_events,
-        ));
-    }
-
-    fn assign_completion_provider(&mut self, cx: &mut Context<Self>) {
-        self.editor.update(cx, |editor, cx| {
-            editor.set_completion_provider(Some(Rc::new(PromptCompletionProvider::new(
-                PromptEditorCompletionProviderDelegate,
-                cx.weak_entity(),
-                self.mention_set.clone(),
-                self.history_store.clone(),
-                self.prompt_store.clone(),
-                self.workspace.clone(),
-            ))));
-        });
-    }
-
-    pub fn set_show_cursor_when_unfocused(
-        &mut self,
-        show_cursor_when_unfocused: bool,
-        cx: &mut Context<Self>,
-    ) {
-        self.editor.update(cx, |editor, cx| {
-            editor.set_show_cursor_when_unfocused(show_cursor_when_unfocused, cx)
-        });
-    }
-
-    pub fn unlink(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let prompt = self.prompt(cx);
-        let existing_creases = self.editor.update(cx, |editor, cx| {
-            extract_message_creases(editor, &self.mention_set, window, cx)
-        });
-        let focus = self.editor.focus_handle(cx).contains_focused(window, cx);
-        let mut creases = vec![];
-        self.editor = cx.new(|cx| {
-            let mut editor = Editor::auto_height(1, Self::MAX_LINES as usize, window, cx);
-            editor.set_soft_wrap_mode(language::language_settings::SoftWrap::EditorWidth, cx);
-            editor.set_placeholder_text("Add a prompt…", window, cx);
-            editor.set_text(prompt, window, cx);
-            creases = insert_message_creases(&mut editor, &existing_creases, window, cx);
-
-            if focus {
-                window.focus(&editor.focus_handle(cx));
-            }
-            editor
-        });
-
-        self.mention_set.update(cx, |mention_set, _cx| {
-            debug_assert_eq!(
-                creases.len(),
-                mention_set.creases().len(),
-                "Missing creases"
-            );
-
-            let mentions = mention_set
-                .clear()
-                .zip(creases)
-                .map(|((_, value), id)| (id, value))
-                .collect::<HashMap<_, _>>();
-            mention_set.set_mentions(mentions);
-        });
-
-        self.assign_completion_provider(cx);
-        self.subscribe_to_editor(window, cx);
-    }
-
-    pub fn placeholder_text(mode: &PromptEditorMode, window: &mut Window, cx: &mut App) -> String {
-        let action = match mode {
-            PromptEditorMode::Buffer { codegen, .. } => {
-                if codegen.read(cx).is_insertion {
-                    "Generate"
-                } else {
-                    "Transform"
-                }
-            }
-            PromptEditorMode::Terminal { .. } => "Generate",
-        };
-
-        let agent_panel_keybinding =
-            ui::text_for_action(&zed_actions::assistant::ToggleFocus, window, cx)
-                .map(|keybinding| format!("{keybinding} to chat"))
-                .unwrap_or_default();
-
-        format!("{action}… ({agent_panel_keybinding} ― ↓↑ for history — @ to include context)")
-    }
-
-    pub fn prompt(&self, cx: &App) -> String {
-        self.editor.read(cx).text(cx)
-    }
-
-    fn paste(&mut self, _: &Paste, window: &mut Window, cx: &mut Context<Self>) {
-        if inline_assistant_model_supports_images(cx)
-            && let Some(task) =
-                paste_images_as_context(self.editor.clone(), self.mention_set.clone(), window, cx)
-        {
-            task.detach();
-        }
-    }
-
-    fn handle_prompt_editor_events(
-        &mut self,
-        editor: &Entity<Editor>,
-        event: &EditorEvent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            EditorEvent::Edited { .. } => {
-                let snapshot = editor.update(cx, |editor, cx| editor.snapshot(window, cx));
-
-                self.mention_set
-                    .update(cx, |mention_set, _cx| mention_set.remove_invalid(&snapshot));
-
-                if let Some(workspace) = window.root::<Workspace>().flatten() {
-                    workspace.update(cx, |workspace, cx| {
-                        let is_via_ssh = workspace.project().read(cx).is_via_remote_server();
-
-                        workspace
-                            .client()
-                            .telemetry()
-                            .log_edit_event("inline assist", is_via_ssh);
-                    });
-                }
-                let prompt = snapshot.text();
-                if self
-                    .prompt_history_ix
-                    .is_none_or(|ix| self.prompt_history[ix] != prompt)
-                {
-                    self.prompt_history_ix.take();
-                    self.pending_prompt = prompt;
-                }
-
-                self.edited_since_done = true;
-                self.rated.reset();
-                cx.notify();
-            }
-            EditorEvent::Blurred => {
-                if self.show_rate_limit_notice {
-                    self.show_rate_limit_notice = false;
-                    cx.notify();
-                }
-            }
-            _ => {}
-        }
-    }
-
-    pub fn is_completions_menu_visible(&self, cx: &App) -> bool {
-        self.editor
-            .read(cx)
-            .context_menu()
-            .borrow()
-            .as_ref()
-            .is_some_and(|menu| matches!(menu, CodeContextMenu::Completions(_)) && menu.visible())
-    }
-
-    pub fn trigger_completion_menu(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.editor.update(cx, |editor, cx| {
-            let menu_is_open = editor.context_menu().borrow().as_ref().is_some_and(|menu| {
-                matches!(menu, CodeContextMenu::Completions(_)) && menu.visible()
-            });
-
-            let has_at_sign = {
-                let snapshot = editor.display_snapshot(cx);
-                let cursor = editor.selections.newest::<text::Point>(&snapshot).head();
-                let offset = cursor.to_offset(&snapshot);
-                if offset.0 > 0 {
-                    snapshot
-                        .buffer_snapshot()
-                        .reversed_chars_at(offset)
-                        .next()
-                        .map(|sign| sign == '@')
-                        .unwrap_or(false)
-                } else {
-                    false
-                }
-            };
-
-            if menu_is_open && has_at_sign {
-                return;
-            }
-
-            editor.insert("@", window, cx);
-            editor.show_completions(&editor::actions::ShowCompletions, window, cx);
-        });
-    }
-
-    fn cancel(
-        &mut self,
-        _: &editor::actions::Cancel,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        match self.codegen_status(cx) {
-            CodegenStatus::Idle | CodegenStatus::Done | CodegenStatus::Error(_) => {
-                cx.emit(PromptEditorEvent::CancelRequested);
-            }
-            CodegenStatus::Pending => {
-                cx.emit(PromptEditorEvent::StopRequested);
-            }
-        }
-    }
-
-    fn confirm(&mut self, _: &menu::Confirm, _window: &mut Window, cx: &mut Context<Self>) {
-        match self.codegen_status(cx) {
-            CodegenStatus::Idle => {
-                cx.emit(PromptEditorEvent::StartRequested);
-            }
-            CodegenStatus::Pending => {}
-            CodegenStatus::Done => {
-                if self.edited_since_done {
-                    cx.emit(PromptEditorEvent::StartRequested);
-                } else {
-                    cx.emit(PromptEditorEvent::ConfirmRequested { execute: false });
-                }
-            }
-            CodegenStatus::Error(_) => {
-                cx.emit(PromptEditorEvent::StartRequested);
-            }
-        }
-    }
-
-    fn thumbs_up(&mut self, _: &ThumbsUpResult, _window: &mut Window, cx: &mut Context<Self>) {
-        if self.rated.is_pending() {
-            self.toast("Still generating...", None, cx);
-            return;
-        }
-
-        if let Some(rating_id) = self.rated.rating_id() {
-            self.toast("Already rated this completion", Some(rating_id), cx);
-            return;
-        }
-
-        let (rating_id, completion) = self.rated.rate();
-
-        let selected_text = match &self.mode {
-            PromptEditorMode::Buffer { codegen, .. } => {
-                codegen.read(cx).selected_text(cx).map(|s| s.to_string())
-            }
-            PromptEditorMode::Terminal { .. } => None,
-        };
-
-        let model_info = self.model_selector.read(cx).active_model(cx);
-        let model_id = {
-            let Some(configured_model) = model_info else {
-                self.toast("No configured model", None, cx);
-                return;
-            };
-
-            configured_model.model.telemetry_id()
-        };
-
-        let prompt = self.editor.read(cx).text(cx);
-
-        telemetry::event!(
-            "Inline Assistant Rated",
-            rating = "positive",
-            model = model_id,
-            prompt = prompt,
-            completion = completion,
-            selected_text = selected_text,
-            rating_id = rating_id.to_string()
-        );
-
-        cx.notify();
-    }
-
-    fn thumbs_down(&mut self, _: &ThumbsDownResult, _window: &mut Window, cx: &mut Context<Self>) {
-        if self.rated.is_pending() {
-            self.toast("Still generating...", None, cx);
-            return;
-        }
-        if let Some(rating_id) = self.rated.rating_id() {
-            self.toast("Already rated this completion", Some(rating_id), cx);
-            return;
-        }
-
-        let (rating_id, completion) = self.rated.rate();
-
-        let selected_text = match &self.mode {
-            PromptEditorMode::Buffer { codegen, .. } => {
-                codegen.read(cx).selected_text(cx).map(|s| s.to_string())
-            }
-            PromptEditorMode::Terminal { .. } => None,
-        };
-
-        let model_info = self.model_selector.read(cx).active_model(cx);
-        let model_telemetry_id = {
-            let Some(configured_model) = model_info else {
-                self.toast("No configured model", None, cx);
-                return;
-            };
-
-            configured_model.model.telemetry_id()
-        };
-
-        let prompt = self.editor.read(cx).text(cx);
-
-        telemetry::event!(
-            "Inline Assistant Rated",
-            rating = "negative",
-            model = model_telemetry_id,
-            prompt = prompt,
-            completion = completion,
-            selected_text = selected_text,
-            rating_id = rating_id.to_string()
-        );
-
-        cx.notify();
-    }
-
-    fn toast(&mut self, msg: &str, uuid: Option<Uuid>, cx: &mut Context<'_, PromptEditor<T>>) {
-        self.workspace
-            .update(cx, |workspace, cx| {
-                enum InlinePromptRating {}
-                workspace.show_toast(
-                    {
-                        let mut toast = Toast::new(
-                            NotificationId::unique::<InlinePromptRating>(),
-                            msg.to_string(),
-                        )
-                        .autohide();
-
-                        if let Some(uuid) = uuid {
-                            toast = toast.on_click("Click to copy rating ID", move |_, cx| {
-                                cx.write_to_clipboard(ClipboardItem::new_string(uuid.to_string()));
-                            });
-                        };
-
-                        toast
-                    },
-                    cx,
-                );
-            })
-            .ok();
-    }
-
-    fn move_up(&mut self, _: &MoveUp, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(ix) = self.prompt_history_ix {
-            if ix > 0 {
-                self.prompt_history_ix = Some(ix - 1);
-                let prompt = self.prompt_history[ix - 1].as_str();
-                self.editor.update(cx, |editor, cx| {
-                    editor.set_text(prompt, window, cx);
-                    editor.move_to_beginning(&Default::default(), window, cx);
-                });
-            }
-        } else if !self.prompt_history.is_empty() {
-            self.prompt_history_ix = Some(self.prompt_history.len() - 1);
-            let prompt = self.prompt_history[self.prompt_history.len() - 1].as_str();
-            self.editor.update(cx, |editor, cx| {
-                editor.set_text(prompt, window, cx);
-                editor.move_to_beginning(&Default::default(), window, cx);
-            });
-        }
-    }
-
-    fn move_down(&mut self, _: &MoveDown, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(ix) = self.prompt_history_ix {
-            if ix < self.prompt_history.len() - 1 {
-                self.prompt_history_ix = Some(ix + 1);
-                let prompt = self.prompt_history[ix + 1].as_str();
-                self.editor.update(cx, |editor, cx| {
-                    editor.set_text(prompt, window, cx);
-                    editor.move_to_end(&Default::default(), window, cx)
-                });
-            } else {
-                self.prompt_history_ix = None;
-                let prompt = self.pending_prompt.as_str();
-                self.editor.update(cx, |editor, cx| {
-                    editor.set_text(prompt, window, cx);
-                    editor.move_to_end(&Default::default(), window, cx)
-                });
-            }
-        }
-    }
-
-    fn render_buttons(&self, _window: &mut Window, cx: &mut Context<Self>) -> Vec<AnyElement> {
-        let mode = match &self.mode {
-            PromptEditorMode::Buffer { codegen, .. } => {
-                let codegen = codegen.read(cx);
-                if codegen.is_insertion {
-                    GenerationMode::Generate
-                } else {
-                    GenerationMode::Transform
-                }
-            }
-            PromptEditorMode::Terminal { .. } => GenerationMode::Generate,
-        };
-
-        let codegen_status = self.codegen_status(cx);
-
-        match codegen_status {
-            CodegenStatus::Idle => {
-                vec![
-                    Button::new("start", mode.start_label())
-                        .label_size(LabelSize::Small)
-                        .icon(IconName::Return)
-                        .icon_size(IconSize::XSmall)
-                        .icon_color(Color::Muted)
-                        .on_click(
-                            cx.listener(|_, _, _, cx| cx.emit(PromptEditorEvent::StartRequested)),
-                        )
-                        .into_any_element(),
-                ]
-            }
-            CodegenStatus::Pending => vec![
-                IconButton::new("stop", IconName::Stop)
-                    .icon_color(Color::Error)
-                    .shape(IconButtonShape::Square)
-                    .tooltip(move |_window, cx| {
-                        Tooltip::with_meta(
-                            mode.tooltip_interrupt(),
-                            Some(&menu::Cancel),
-                            "Changes won't be discarded",
-                            cx,
-                        )
-                    })
-                    .on_click(cx.listener(|_, _, _, cx| cx.emit(PromptEditorEvent::StopRequested)))
-                    .into_any_element(),
-            ],
-            CodegenStatus::Done | CodegenStatus::Error(_) => {
-                let has_error = matches!(codegen_status, CodegenStatus::Error(_));
-                if has_error || self.edited_since_done {
-                    vec![
-                        IconButton::new("restart", IconName::RotateCw)
-                            .icon_color(Color::Info)
-                            .shape(IconButtonShape::Square)
-                            .tooltip(move |_window, cx| {
-                                Tooltip::with_meta(
-                                    mode.tooltip_restart(),
-                                    Some(&menu::Confirm),
-                                    "Changes will be discarded",
-                                    cx,
-                                )
-                            })
-                            .on_click(cx.listener(|_, _, _, cx| {
-                                cx.emit(PromptEditorEvent::StartRequested);
-                            }))
-                            .into_any_element(),
-                    ]
-                } else {
-                    let show_rating_buttons = cx.has_flag::<InlineAssistRatingFeatureFlag>();
-                    let rated = self.rated.rating_id().is_some();
-
-                    let accept = IconButton::new("accept", IconName::Check)
-                        .icon_color(Color::Info)
-                        .shape(IconButtonShape::Square)
-                        .tooltip(move |_window, cx| {
-                            Tooltip::for_action(mode.tooltip_accept(), &menu::Confirm, cx)
-                        })
-                        .on_click(cx.listener(|_, _, _, cx| {
-                            cx.emit(PromptEditorEvent::ConfirmRequested { execute: false });
-                        }))
-                        .into_any_element();
-
-                    let mut buttons = Vec::new();
-
-                    if show_rating_buttons {
-                        buttons.push(
-                            IconButton::new("thumbs-down", IconName::ThumbsDown)
-                                .icon_color(if rated { Color::Muted } else { Color::Default })
-                                .shape(IconButtonShape::Square)
-                                .disabled(rated)
-                                .tooltip(Tooltip::text("Bad result"))
-                                .on_click(cx.listener(|this, _, window, cx| {
-                                    this.thumbs_down(&ThumbsDownResult, window, cx);
-                                }))
-                                .into_any_element(),
-                        );
-
-                        buttons.push(
-                            IconButton::new("thumbs-up", IconName::ThumbsUp)
-                                .icon_color(if rated { Color::Muted } else { Color::Default })
-                                .shape(IconButtonShape::Square)
-                                .disabled(rated)
-                                .tooltip(Tooltip::text("Good result"))
-                                .on_click(cx.listener(|this, _, window, cx| {
-                                    this.thumbs_up(&ThumbsUpResult, window, cx);
-                                }))
-                                .into_any_element(),
-                        );
-                    }
-
-                    buttons.push(accept);
-
-                    match &self.mode {
-                        PromptEditorMode::Terminal { .. } => {
-                            buttons.push(
-                                IconButton::new("confirm", IconName::PlayFilled)
-                                    .icon_color(Color::Info)
-                                    .shape(IconButtonShape::Square)
-                                    .tooltip(|_window, cx| {
-                                        Tooltip::for_action(
-                                            "Execute Generated Command",
-                                            &menu::SecondaryConfirm,
-                                            cx,
-                                        )
-                                    })
-                                    .on_click(cx.listener(|_, _, _, cx| {
-                                        cx.emit(PromptEditorEvent::ConfirmRequested {
-                                            execute: true,
-                                        });
-                                    }))
-                                    .into_any_element(),
-                            );
-                            buttons
-                        }
-                        PromptEditorMode::Buffer { .. } => buttons,
-                    }
-                }
-            }
-        }
-    }
-
-    fn cycle_prev(
-        &mut self,
-        _: &CyclePreviousInlineAssist,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        match &self.mode {
-            PromptEditorMode::Buffer { codegen, .. } => {
-                codegen.update(cx, |codegen, cx| codegen.cycle_prev(cx));
-            }
-            PromptEditorMode::Terminal { .. } => {
-                // no cycle buttons in terminal mode
-            }
-        }
-    }
-
-    fn cycle_next(&mut self, _: &CycleNextInlineAssist, _: &mut Window, cx: &mut Context<Self>) {
-        match &self.mode {
-            PromptEditorMode::Buffer { codegen, .. } => {
-                codegen.update(cx, |codegen, cx| codegen.cycle_next(cx));
-            }
-            PromptEditorMode::Terminal { .. } => {
-                // no cycle buttons in terminal mode
-            }
-        }
-    }
-
-    fn render_close_button(&self, cx: &mut Context<Self>) -> AnyElement {
-        IconButton::new("cancel", IconName::Close)
-            .icon_color(Color::Muted)
-            .shape(IconButtonShape::Square)
-            .tooltip(Tooltip::text("Close Assistant"))
-            .on_click(cx.listener(|_, _, _, cx| cx.emit(PromptEditorEvent::CancelRequested)))
-            .into_any_element()
-    }
-
-    fn render_cycle_controls(&self, codegen: &BufferCodegen, cx: &Context<Self>) -> AnyElement {
-        let disabled = matches!(codegen.status(cx), CodegenStatus::Idle);
-
-        let model_registry = LanguageModelRegistry::read_global(cx);
-        let default_model = model_registry.default_model().map(|default| default.model);
-        let alternative_models = model_registry.inline_alternative_models();
-
-        let get_model_name = |index: usize| -> String {
-            let name = |model: &Arc<dyn LanguageModel>| model.name().0.to_string();
-
-            match index {
-                0 => default_model.as_ref().map_or_else(String::new, name),
-                index if index <= alternative_models.len() => alternative_models
-                    .get(index - 1)
-                    .map_or_else(String::new, name),
-                _ => String::new(),
-            }
-        };
-
-        let total_models = alternative_models.len() + 1;
-
-        if total_models <= 1 {
-            return div().into_any_element();
-        }
-
-        let current_index = codegen.active_alternative;
-        let prev_index = (current_index + total_models - 1) % total_models;
-        let next_index = (current_index + 1) % total_models;
-
-        let prev_model_name = get_model_name(prev_index);
-        let next_model_name = get_model_name(next_index);
-
-        h_flex()
-            .child(
-                IconButton::new("previous", IconName::ChevronLeft)
-                    .icon_color(Color::Muted)
-                    .disabled(disabled || current_index == 0)
-                    .shape(IconButtonShape::Square)
-                    .tooltip({
-                        let focus_handle = self.editor.focus_handle(cx);
-                        move |_window, cx| {
-                            cx.new(|cx| {
-                                let mut tooltip = Tooltip::new("Previous Alternative").key_binding(
-                                    KeyBinding::for_action_in(
-                                        &CyclePreviousInlineAssist,
-                                        &focus_handle,
-                                        cx,
-                                    ),
-                                );
-                                if !disabled && current_index != 0 {
-                                    tooltip = tooltip.meta(prev_model_name.clone());
-                                }
-                                tooltip
-                            })
-                            .into()
-                        }
-                    })
-                    .on_click(cx.listener(|this, _, window, cx| {
-                        this.cycle_prev(&CyclePreviousInlineAssist, window, cx);
-                    })),
-            )
-            .child(
-                Label::new(format!(
-                    "{}/{}",
-                    codegen.active_alternative + 1,
-                    codegen.alternative_count(cx)
-                ))
-                .size(LabelSize::Small)
-                .color(if disabled {
-                    Color::Disabled
-                } else {
-                    Color::Muted
-                }),
-            )
-            .child(
-                IconButton::new("next", IconName::ChevronRight)
-                    .icon_color(Color::Muted)
-                    .disabled(disabled || current_index == total_models - 1)
-                    .shape(IconButtonShape::Square)
-                    .tooltip({
-                        let focus_handle = self.editor.focus_handle(cx);
-                        move |_window, cx| {
-                            cx.new(|cx| {
-                                let mut tooltip = Tooltip::new("Next Alternative").key_binding(
-                                    KeyBinding::for_action_in(
-                                        &CycleNextInlineAssist,
-                                        &focus_handle,
-                                        cx,
-                                    ),
-                                );
-                                if !disabled && current_index != total_models - 1 {
-                                    tooltip = tooltip.meta(next_model_name.clone());
-                                }
-                                tooltip
-                            })
-                            .into()
-                        }
-                    })
-                    .on_click(cx.listener(|this, _, window, cx| {
-                        this.cycle_next(&CycleNextInlineAssist, window, cx)
-                    })),
-            )
-            .into_any_element()
-    }
-
-    fn render_editor(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> AnyElement {
-        let colors = cx.theme().colors();
-
-        div()
-            .key_context("InlineAssistEditor")
-            .size_full()
-            .p_2()
-            .pl_1()
-            .bg(colors.editor_background)
-            .child({
-                let settings = ThemeSettings::get_global(cx);
-                let font_size = settings.buffer_font_size(cx);
-                let line_height = font_size * 1.2;
-
-                let text_style = TextStyle {
-                    color: colors.editor_foreground,
-                    font_family: settings.buffer_font.family.clone(),
-                    font_features: settings.buffer_font.features.clone(),
-                    font_size: font_size.into(),
-                    line_height: line_height.into(),
-                    ..Default::default()
-                };
-
-                EditorElement::new(
-                    &self.editor,
-                    EditorStyle {
-                        background: colors.editor_background,
-                        local_player: cx.theme().players().local(),
-                        syntax: cx.theme().syntax().clone(),
-                        text: text_style,
-                        ..Default::default()
-                    },
-                )
-            })
-            .into_any_element()
-    }
-
-    fn render_markdown(&self, markdown: Entity<Markdown>, style: MarkdownStyle) -> MarkdownElement {
-        MarkdownElement::new(markdown, style)
-    }
-}
-
-pub enum PromptEditorMode {
-    Buffer {
-        id: InlineAssistId,
-        codegen: Entity<BufferCodegen>,
-        editor_margins: Arc<Mutex<EditorMargins>>,
-    },
-    Terminal {
-        id: TerminalInlineAssistId,
-        codegen: Entity<TerminalCodegen>,
-        height_in_lines: u8,
-    },
-}
-
-pub enum PromptEditorEvent {
-    StartRequested,
-    StopRequested,
-    ConfirmRequested { execute: bool },
-    CancelRequested,
-    Resized { height_in_lines: u8 },
-}
-
-#[derive(Copy, Clone, Default, Debug, PartialEq, Eq, Hash)]
-pub struct InlineAssistId(pub usize);
-
-impl InlineAssistId {
-    pub fn post_inc(&mut self) -> InlineAssistId {
-        let id = *self;
-        self.0 += 1;
-        id
-    }
-}
-
-struct PromptEditorCompletionProviderDelegate;
-
-fn inline_assistant_model_supports_images(cx: &App) -> bool {
-    LanguageModelRegistry::read_global(cx)
-        .inline_assistant_model()
-        .map_or(false, |m| m.model.supports_images())
-}
-
-impl PromptCompletionProviderDelegate for PromptEditorCompletionProviderDelegate {
-    fn supported_modes(&self, _cx: &App) -> Vec<PromptContextType> {
-        vec![
-            PromptContextType::File,
-            PromptContextType::Symbol,
-            PromptContextType::Thread,
-            PromptContextType::Fetch,
-            PromptContextType::Rules,
-        ]
-    }
-
-    fn supports_images(&self, cx: &App) -> bool {
-        inline_assistant_model_supports_images(cx)
-    }
-
-    fn available_commands(&self, _cx: &App) -> Vec<crate::completion_provider::AvailableCommand> {
-        Vec::new()
-    }
-
-    fn confirm_command(&self, _cx: &mut App) {}
-}
-
-impl PromptEditor<BufferCodegen> {
-    pub fn new_buffer(
-        id: InlineAssistId,
-        editor_margins: Arc<Mutex<EditorMargins>>,
-        prompt_history: VecDeque<String>,
-        prompt_buffer: Entity<MultiBuffer>,
-        codegen: Entity<BufferCodegen>,
-        fs: Arc<dyn Fs>,
-        history_store: Entity<HistoryStore>,
-        prompt_store: Option<Entity<PromptStore>>,
-        project: WeakEntity<Project>,
-        workspace: WeakEntity<Workspace>,
-        window: &mut Window,
-        cx: &mut Context<PromptEditor<BufferCodegen>>,
-    ) -> PromptEditor<BufferCodegen> {
-        let codegen_subscription = cx.observe(&codegen, Self::handle_codegen_changed);
-        let mode = PromptEditorMode::Buffer {
-            id,
-            codegen,
-            editor_margins,
-        };
-
-        let prompt_editor = cx.new(|cx| {
-            let mut editor = Editor::new(
-                EditorMode::AutoHeight {
-                    min_lines: 1,
-                    max_lines: Some(Self::MAX_LINES as usize),
-                },
-                prompt_buffer,
-                None,
-                window,
-                cx,
-            );
-            editor.set_soft_wrap_mode(language::language_settings::SoftWrap::EditorWidth, cx);
-            // Since the prompt editors for all inline assistants are linked,
-            // always show the cursor (even when it isn't focused) because
-            // typing in one will make what you typed appear in all of them.
-            editor.set_show_cursor_when_unfocused(true, cx);
-            editor.set_placeholder_text(&Self::placeholder_text(&mode, window, cx), window, cx);
-            editor.set_context_menu_options(ContextMenuOptions {
-                min_entries_visible: 12,
-                max_entries_visible: 12,
-                placement: None,
-            });
-
-            editor
-        });
-
-        let mention_set =
-            cx.new(|_cx| MentionSet::new(project, history_store.clone(), prompt_store.clone()));
-
-        let model_selector_menu_handle = PopoverMenuHandle::default();
-
-        let mut this: PromptEditor<BufferCodegen> = PromptEditor {
-            editor: prompt_editor.clone(),
-            mention_set,
-            history_store,
-            prompt_store,
-            workspace,
-            model_selector: cx.new(|cx| {
-                AgentModelSelector::new(
-                    fs,
-                    model_selector_menu_handle,
-                    prompt_editor.focus_handle(cx),
-                    ModelUsageContext::InlineAssistant,
-                    window,
-                    cx,
-                )
-            }),
-            edited_since_done: false,
-            prompt_history,
-            prompt_history_ix: None,
-            pending_prompt: String::new(),
-            _codegen_subscription: codegen_subscription,
-            editor_subscriptions: Vec::new(),
-            show_rate_limit_notice: false,
-            mode,
-            rated: RatingState::Pending,
-            _phantom: Default::default(),
-        };
-
-        this.assign_completion_provider(cx);
-        this.subscribe_to_editor(window, cx);
-        this
-    }
-
-    fn handle_codegen_changed(
-        &mut self,
-        codegen: Entity<BufferCodegen>,
-        cx: &mut Context<PromptEditor<BufferCodegen>>,
-    ) {
-        match self.codegen_status(cx) {
-            CodegenStatus::Idle => {
-                self.editor
-                    .update(cx, |editor, _| editor.set_read_only(false));
-            }
-            CodegenStatus::Pending => {
-                self.rated.reset();
-                self.editor
-                    .update(cx, |editor, _| editor.set_read_only(true));
-            }
-            CodegenStatus::Done => {
-                let completion = codegen.read(cx).active_completion(cx);
-                self.rated.generated_completion(completion);
-                self.edited_since_done = false;
-                self.editor
-                    .update(cx, |editor, _| editor.set_read_only(false));
-            }
-            CodegenStatus::Error(_error) => {
-                self.edited_since_done = false;
-                self.editor
-                    .update(cx, |editor, _| editor.set_read_only(false));
-            }
-        }
-    }
-
-    pub fn id(&self) -> InlineAssistId {
-        match &self.mode {
-            PromptEditorMode::Buffer { id, .. } => *id,
-            PromptEditorMode::Terminal { .. } => unreachable!(),
-        }
-    }
-
-    pub fn codegen(&self) -> &Entity<BufferCodegen> {
-        match &self.mode {
-            PromptEditorMode::Buffer { codegen, .. } => codegen,
-            PromptEditorMode::Terminal { .. } => unreachable!(),
-        }
-    }
-
-    pub fn mention_set(&self) -> &Entity<MentionSet> {
-        &self.mention_set
-    }
-
-    pub fn editor_margins(&self) -> &Arc<Mutex<EditorMargins>> {
-        match &self.mode {
-            PromptEditorMode::Buffer { editor_margins, .. } => editor_margins,
-            PromptEditorMode::Terminal { .. } => unreachable!(),
-        }
-    }
-}
-
-#[derive(Copy, Clone, Default, Debug, PartialEq, Eq, Hash)]
-pub struct TerminalInlineAssistId(pub usize);
-
-impl TerminalInlineAssistId {
-    pub fn post_inc(&mut self) -> TerminalInlineAssistId {
-        let id = *self;
-        self.0 += 1;
-        id
-    }
-}
-
-impl PromptEditor<TerminalCodegen> {
-    pub fn new_terminal(
-        id: TerminalInlineAssistId,
-        prompt_history: VecDeque<String>,
-        prompt_buffer: Entity<MultiBuffer>,
-        codegen: Entity<TerminalCodegen>,
-        fs: Arc<dyn Fs>,
-        history_store: Entity<HistoryStore>,
-        prompt_store: Option<Entity<PromptStore>>,
-        project: WeakEntity<Project>,
-        workspace: WeakEntity<Workspace>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let codegen_subscription = cx.observe(&codegen, Self::handle_codegen_changed);
-        let mode = PromptEditorMode::Terminal {
-            id,
-            codegen,
-            height_in_lines: 1,
-        };
-
-        let prompt_editor = cx.new(|cx| {
-            let mut editor = Editor::new(
-                EditorMode::AutoHeight {
-                    min_lines: 1,
-                    max_lines: Some(Self::MAX_LINES as usize),
-                },
-                prompt_buffer,
-                None,
-                window,
-                cx,
-            );
-            editor.set_soft_wrap_mode(language::language_settings::SoftWrap::EditorWidth, cx);
-            editor.set_placeholder_text(&Self::placeholder_text(&mode, window, cx), window, cx);
-            editor.set_context_menu_options(ContextMenuOptions {
-                min_entries_visible: 12,
-                max_entries_visible: 12,
-                placement: None,
-            });
-            editor
-        });
-
-        let mention_set =
-            cx.new(|_cx| MentionSet::new(project, history_store.clone(), prompt_store.clone()));
-
-        let model_selector_menu_handle = PopoverMenuHandle::default();
-
-        let mut this = Self {
-            editor: prompt_editor.clone(),
-            mention_set,
-            history_store,
-            prompt_store,
-            workspace,
-            model_selector: cx.new(|cx| {
-                AgentModelSelector::new(
-                    fs,
-                    model_selector_menu_handle.clone(),
-                    prompt_editor.focus_handle(cx),
-                    ModelUsageContext::InlineAssistant,
-                    window,
-                    cx,
-                )
-            }),
-            edited_since_done: false,
-            prompt_history,
-            prompt_history_ix: None,
-            pending_prompt: String::new(),
-            _codegen_subscription: codegen_subscription,
-            editor_subscriptions: Vec::new(),
-            mode,
-            show_rate_limit_notice: false,
-            rated: RatingState::Pending,
-            _phantom: Default::default(),
-        };
-        this.count_lines(cx);
-        this.assign_completion_provider(cx);
-        this.subscribe_to_editor(window, cx);
-        this
-    }
-
-    fn count_lines(&mut self, cx: &mut Context<Self>) {
-        let height_in_lines = cmp::max(
-            2, // Make the editor at least two lines tall, to account for padding and buttons.
-            cmp::min(
-                self.editor
-                    .update(cx, |editor, cx| editor.max_point(cx).row().0 + 1),
-                Self::MAX_LINES as u32,
-            ),
-        ) as u8;
-
-        match &mut self.mode {
-            PromptEditorMode::Terminal {
-                height_in_lines: current_height,
-                ..
-            } => {
-                if height_in_lines != *current_height {
-                    *current_height = height_in_lines;
-                    cx.emit(PromptEditorEvent::Resized { height_in_lines });
-                }
-            }
-            PromptEditorMode::Buffer { .. } => unreachable!(),
-        }
-    }
-
-    fn handle_codegen_changed(&mut self, codegen: Entity<TerminalCodegen>, cx: &mut Context<Self>) {
-        match &self.codegen().read(cx).status {
-            CodegenStatus::Idle => {
-                self.editor
-                    .update(cx, |editor, _| editor.set_read_only(false));
-            }
-            CodegenStatus::Pending => {
-                self.rated = RatingState::Pending;
-                self.editor
-                    .update(cx, |editor, _| editor.set_read_only(true));
-            }
-            CodegenStatus::Done | CodegenStatus::Error(_) => {
-                self.rated
-                    .generated_completion(codegen.read(cx).completion());
-                self.edited_since_done = false;
-                self.editor
-                    .update(cx, |editor, _| editor.set_read_only(false));
-            }
-        }
-    }
-
-    pub fn mention_set(&self) -> &Entity<MentionSet> {
-        &self.mention_set
-    }
-
-    pub fn codegen(&self) -> &Entity<TerminalCodegen> {
-        match &self.mode {
-            PromptEditorMode::Buffer { .. } => unreachable!(),
-            PromptEditorMode::Terminal { codegen, .. } => codegen,
-        }
-    }
-
-    pub fn id(&self) -> TerminalInlineAssistId {
-        match &self.mode {
-            PromptEditorMode::Buffer { .. } => unreachable!(),
-            PromptEditorMode::Terminal { id, .. } => *id,
-        }
-    }
-}
-
-pub enum CodegenStatus {
-    Idle,
-    Pending,
-    Done,
-    Error(anyhow::Error),
-}
-
-/// This is just CodegenStatus without the anyhow::Error, which causes a lifetime issue for rendering the Cancel button.
-#[derive(Copy, Clone)]
-pub enum CancelButtonState {
-    Idle,
-    Pending,
-    Done,
-    Error,
-}
-
-impl Into<CancelButtonState> for &CodegenStatus {
-    fn into(self) -> CancelButtonState {
-        match self {
-            CodegenStatus::Idle => CancelButtonState::Idle,
-            CodegenStatus::Pending => CancelButtonState::Pending,
-            CodegenStatus::Done => CancelButtonState::Done,
-            CodegenStatus::Error(_) => CancelButtonState::Error,
-        }
-    }
-}
-
-#[derive(Copy, Clone)]
-pub enum GenerationMode {
-    Generate,
-    Transform,
-}
-
-impl GenerationMode {
-    fn start_label(self) -> &'static str {
-        match self {
-            GenerationMode::Generate => "Generate",
-            GenerationMode::Transform => "Transform",
-        }
-    }
-    fn tooltip_interrupt(self) -> &'static str {
-        match self {
-            GenerationMode::Generate => "Interrupt Generation",
-            GenerationMode::Transform => "Interrupt Transform",
-        }
-    }
-
-    fn tooltip_restart(self) -> &'static str {
-        match self {
-            GenerationMode::Generate => "Restart Generation",
-            GenerationMode::Transform => "Restart Transform",
-        }
-    }
-
-    fn tooltip_accept(self) -> &'static str {
-        match self {
-            GenerationMode::Generate => "Accept Generation",
-            GenerationMode::Transform => "Accept Transform",
-        }
-    }
-}
-
-/// Stored information that can be used to resurrect a context crease when creating an editor for a past message.
-#[derive(Clone, Debug)]
-struct MessageCrease {
-    range: Range<MultiBufferOffset>,
-    icon_path: SharedString,
-    label: SharedString,
-}
-
-fn extract_message_creases(
-    editor: &mut Editor,
-    mention_set: &Entity<MentionSet>,
-    window: &mut Window,
-    cx: &mut Context<'_, Editor>,
-) -> Vec<MessageCrease> {
-    let creases = mention_set.read(cx).creases();
-    let snapshot = editor.snapshot(window, cx);
-    snapshot
-        .crease_snapshot
-        .creases()
-        .filter(|(id, _)| creases.contains(id))
-        .filter_map(|(_, crease)| {
-            let metadata = crease.metadata()?.clone();
-            Some(MessageCrease {
-                range: crease.range().to_offset(snapshot.buffer()),
-                label: metadata.label,
-                icon_path: metadata.icon_path,
-            })
-        })
-        .collect()
-}
-
-fn insert_message_creases(
-    editor: &mut Editor,
-    message_creases: &[MessageCrease],
-    window: &mut Window,
-    cx: &mut Context<'_, Editor>,
-) -> Vec<CreaseId> {
-    let buffer_snapshot = editor.buffer().read(cx).snapshot(cx);
-    let creases = message_creases
-        .iter()
-        .map(|crease| {
-            let start = buffer_snapshot.anchor_after(crease.range.start);
-            let end = buffer_snapshot.anchor_before(crease.range.end);
-            crease_for_mention(
-                crease.label.clone(),
-                crease.icon_path.clone(),
-                start..end,
-                cx.weak_entity(),
-            )
-        })
-        .collect::<Vec<_>>();
-    let ids = editor.insert_creases(creases.clone(), cx);
-    editor.fold_creases(creases, false, window, cx);
-    ids
-}
diff --git a/crates/agent_ui/src/language_model_selector.rs b/crates/agent_ui/src/language_model_selector.rs
deleted file mode 100644
index 5b5a4513c6..0000000000
--- a/crates/agent_ui/src/language_model_selector.rs
+++ /dev/null
@@ -1,798 +0,0 @@
-use std::{cmp::Reverse, sync::Arc};
-
-use collections::IndexMap;
-use fuzzy::{StringMatch, StringMatchCandidate, match_strings};
-use gpui::{
-    Action, AnyElement, App, BackgroundExecutor, DismissEvent, FocusHandle, Subscription, Task,
-};
-use language_model::{
-    AuthenticateError, ConfiguredModel, LanguageModel, LanguageModelProviderId,
-    LanguageModelRegistry,
-};
-use ordered_float::OrderedFloat;
-use picker::{Picker, PickerDelegate};
-use ui::{KeyBinding, ListItem, ListItemSpacing, prelude::*};
-use zed_actions::agent::OpenSettings;
-
-type OnModelChanged = Arc<dyn Fn(Arc<dyn LanguageModel>, &mut App) + 'static>;
-type GetActiveModel = Arc<dyn Fn(&App) -> Option<ConfiguredModel> + 'static>;
-
-pub type LanguageModelSelector = Picker<LanguageModelPickerDelegate>;
-
-pub fn language_model_selector(
-    get_active_model: impl Fn(&App) -> Option<ConfiguredModel> + 'static,
-    on_model_changed: impl Fn(Arc<dyn LanguageModel>, &mut App) + 'static,
-    popover_styles: bool,
-    focus_handle: FocusHandle,
-    window: &mut Window,
-    cx: &mut Context<LanguageModelSelector>,
-) -> LanguageModelSelector {
-    let delegate = LanguageModelPickerDelegate::new(
-        get_active_model,
-        on_model_changed,
-        popover_styles,
-        focus_handle,
-        window,
-        cx,
-    );
-
-    if popover_styles {
-        Picker::list(delegate, window, cx)
-            .show_scrollbar(true)
-            .width(rems(20.))
-            .max_height(Some(rems(20.).into()))
-    } else {
-        Picker::list(delegate, window, cx).show_scrollbar(true)
-    }
-}
-
-fn all_models(cx: &App) -> GroupedModels {
-    let providers = LanguageModelRegistry::global(cx).read(cx).providers();
-
-    let recommended = providers
-        .iter()
-        .flat_map(|provider| {
-            provider
-                .recommended_models(cx)
-                .into_iter()
-                .map(|model| ModelInfo {
-                    model,
-                    icon: provider.icon(),
-                })
-        })
-        .collect();
-
-    let all = providers
-        .iter()
-        .flat_map(|provider| {
-            provider
-                .provided_models(cx)
-                .into_iter()
-                .map(|model| ModelInfo {
-                    model,
-                    icon: provider.icon(),
-                })
-        })
-        .collect();
-
-    GroupedModels::new(all, recommended)
-}
-
-#[derive(Clone)]
-struct ModelInfo {
-    model: Arc<dyn LanguageModel>,
-    icon: IconName,
-}
-
-pub struct LanguageModelPickerDelegate {
-    on_model_changed: OnModelChanged,
-    get_active_model: GetActiveModel,
-    all_models: Arc<GroupedModels>,
-    filtered_entries: Vec<LanguageModelPickerEntry>,
-    selected_index: usize,
-    _authenticate_all_providers_task: Task<()>,
-    _subscriptions: Vec<Subscription>,
-    popover_styles: bool,
-    focus_handle: FocusHandle,
-}
-
-impl LanguageModelPickerDelegate {
-    fn new(
-        get_active_model: impl Fn(&App) -> Option<ConfiguredModel> + 'static,
-        on_model_changed: impl Fn(Arc<dyn LanguageModel>, &mut App) + 'static,
-        popover_styles: bool,
-        focus_handle: FocusHandle,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Self {
-        let on_model_changed = Arc::new(on_model_changed);
-        let models = all_models(cx);
-        let entries = models.entries();
-
-        Self {
-            on_model_changed,
-            all_models: Arc::new(models),
-            selected_index: Self::get_active_model_index(&entries, get_active_model(cx)),
-            filtered_entries: entries,
-            get_active_model: Arc::new(get_active_model),
-            _authenticate_all_providers_task: Self::authenticate_all_providers(cx),
-            _subscriptions: vec![cx.subscribe_in(
-                &LanguageModelRegistry::global(cx),
-                window,
-                |picker, _, event, window, cx| {
-                    match event {
-                        language_model::Event::ProviderStateChanged(_)
-                        | language_model::Event::AddedProvider(_)
-                        | language_model::Event::RemovedProvider(_) => {
-                            let query = picker.query(cx);
-                            picker.delegate.all_models = Arc::new(all_models(cx));
-                            // Update matches will automatically drop the previous task
-                            // if we get a provider event again
-                            picker.update_matches(query, window, cx)
-                        }
-                        _ => {}
-                    }
-                },
-            )],
-            popover_styles,
-            focus_handle,
-        }
-    }
-
-    fn get_active_model_index(
-        entries: &[LanguageModelPickerEntry],
-        active_model: Option<ConfiguredModel>,
-    ) -> usize {
-        entries
-            .iter()
-            .position(|entry| {
-                if let LanguageModelPickerEntry::Model(model) = entry {
-                    active_model
-                        .as_ref()
-                        .map(|active_model| {
-                            active_model.model.id() == model.model.id()
-                                && active_model.provider.id() == model.model.provider_id()
-                        })
-                        .unwrap_or_default()
-                } else {
-                    false
-                }
-            })
-            .unwrap_or(0)
-    }
-
-    /// Authenticates all providers in the [`LanguageModelRegistry`].
-    ///
-    /// We do this so that we can populate the language selector with all of the
-    /// models from the configured providers.
-    fn authenticate_all_providers(cx: &mut App) -> Task<()> {
-        let authenticate_all_providers = LanguageModelRegistry::global(cx)
-            .read(cx)
-            .providers()
-            .iter()
-            .map(|provider| (provider.id(), provider.name(), provider.authenticate(cx)))
-            .collect::<Vec<_>>();
-
-        cx.spawn(async move |_cx| {
-            for (provider_id, provider_name, authenticate_task) in authenticate_all_providers {
-                if let Err(err) = authenticate_task.await {
-                    if matches!(err, AuthenticateError::CredentialsNotFound) {
-                        // Since we're authenticating these providers in the
-                        // background for the purposes of populating the
-                        // language selector, we don't care about providers
-                        // where the credentials are not found.
-                    } else {
-                        // Some providers have noisy failure states that we
-                        // don't want to spam the logs with every time the
-                        // language model selector is initialized.
-                        //
-                        // Ideally these should have more clear failure modes
-                        // that we know are safe to ignore here, like what we do
-                        // with `CredentialsNotFound` above.
-                        match provider_id.0.as_ref() {
-                            "lmstudio" | "ollama" => {
-                                // LM Studio and Ollama both make fetch requests to the local APIs to determine if they are "authenticated".
-                                //
-                                // These fail noisily, so we don't log them.
-                            }
-                            "copilot_chat" => {
-                                // Copilot Chat returns an error if Copilot is not enabled, so we don't log those errors.
-                            }
-                            _ => {
-                                log::error!(
-                                    "Failed to authenticate provider: {}: {err:#}",
-                                    provider_name.0
-                                );
-                            }
-                        }
-                    }
-                }
-            }
-        })
-    }
-
-    pub fn active_model(&self, cx: &App) -> Option<ConfiguredModel> {
-        (self.get_active_model)(cx)
-    }
-}
-
-struct GroupedModels {
-    recommended: Vec<ModelInfo>,
-    all: IndexMap<LanguageModelProviderId, Vec<ModelInfo>>,
-}
-
-impl GroupedModels {
-    pub fn new(all: Vec<ModelInfo>, recommended: Vec<ModelInfo>) -> Self {
-        let mut all_by_provider: IndexMap<_, Vec<ModelInfo>> = IndexMap::default();
-        for model in all {
-            let provider = model.model.provider_id();
-            if let Some(models) = all_by_provider.get_mut(&provider) {
-                models.push(model);
-            } else {
-                all_by_provider.insert(provider, vec![model]);
-            }
-        }
-
-        Self {
-            recommended,
-            all: all_by_provider,
-        }
-    }
-
-    fn entries(&self) -> Vec<LanguageModelPickerEntry> {
-        let mut entries = Vec::new();
-
-        if !self.recommended.is_empty() {
-            entries.push(LanguageModelPickerEntry::Separator("Recommended".into()));
-            entries.extend(
-                self.recommended
-                    .iter()
-                    .map(|info| LanguageModelPickerEntry::Model(info.clone())),
-            );
-        }
-
-        for models in self.all.values() {
-            if models.is_empty() {
-                continue;
-            }
-            entries.push(LanguageModelPickerEntry::Separator(
-                models[0].model.provider_name().0,
-            ));
-            entries.extend(
-                models
-                    .iter()
-                    .map(|info| LanguageModelPickerEntry::Model(info.clone())),
-            );
-        }
-        entries
-    }
-}
-
-enum LanguageModelPickerEntry {
-    Model(ModelInfo),
-    Separator(SharedString),
-}
-
-struct ModelMatcher {
-    models: Vec<ModelInfo>,
-    bg_executor: BackgroundExecutor,
-    candidates: Vec<StringMatchCandidate>,
-}
-
-impl ModelMatcher {
-    fn new(models: Vec<ModelInfo>, bg_executor: BackgroundExecutor) -> ModelMatcher {
-        let candidates = Self::make_match_candidates(&models);
-        Self {
-            models,
-            bg_executor,
-            candidates,
-        }
-    }
-
-    pub fn fuzzy_search(&self, query: &str) -> Vec<ModelInfo> {
-        let mut matches = self.bg_executor.block(match_strings(
-            &self.candidates,
-            query,
-            false,
-            true,
-            100,
-            &Default::default(),
-            self.bg_executor.clone(),
-        ));
-
-        let sorting_key = |mat: &StringMatch| {
-            let candidate = &self.candidates[mat.candidate_id];
-            (Reverse(OrderedFloat(mat.score)), candidate.id)
-        };
-        matches.sort_unstable_by_key(sorting_key);
-
-        let matched_models: Vec<_> = matches
-            .into_iter()
-            .map(|mat| self.models[mat.candidate_id].clone())
-            .collect();
-
-        matched_models
-    }
-
-    pub fn exact_search(&self, query: &str) -> Vec<ModelInfo> {
-        self.models
-            .iter()
-            .filter(|m| {
-                m.model
-                    .name()
-                    .0
-                    .to_lowercase()
-                    .contains(&query.to_lowercase())
-            })
-            .cloned()
-            .collect::<Vec<_>>()
-    }
-
-    fn make_match_candidates(model_infos: &Vec<ModelInfo>) -> Vec<StringMatchCandidate> {
-        model_infos
-            .iter()
-            .enumerate()
-            .map(|(index, model)| {
-                StringMatchCandidate::new(
-                    index,
-                    &format!(
-                        "{}/{}",
-                        &model.model.provider_name().0,
-                        &model.model.name().0
-                    ),
-                )
-            })
-            .collect::<Vec<_>>()
-    }
-}
-
-impl PickerDelegate for LanguageModelPickerDelegate {
-    type ListItem = AnyElement;
-
-    fn match_count(&self) -> usize {
-        self.filtered_entries.len()
-    }
-
-    fn selected_index(&self) -> usize {
-        self.selected_index
-    }
-
-    fn set_selected_index(&mut self, ix: usize, _: &mut Window, cx: &mut Context<Picker<Self>>) {
-        self.selected_index = ix.min(self.filtered_entries.len().saturating_sub(1));
-        cx.notify();
-    }
-
-    fn can_select(
-        &mut self,
-        ix: usize,
-        _window: &mut Window,
-        _cx: &mut Context<Picker<Self>>,
-    ) -> bool {
-        match self.filtered_entries.get(ix) {
-            Some(LanguageModelPickerEntry::Model(_)) => true,
-            Some(LanguageModelPickerEntry::Separator(_)) | None => false,
-        }
-    }
-
-    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
-        "Select a model…".into()
-    }
-
-    fn update_matches(
-        &mut self,
-        query: String,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Task<()> {
-        let all_models = self.all_models.clone();
-        let active_model = (self.get_active_model)(cx);
-        let bg_executor = cx.background_executor();
-
-        let language_model_registry = LanguageModelRegistry::global(cx);
-
-        let configured_providers = language_model_registry
-            .read(cx)
-            .providers()
-            .into_iter()
-            .filter(|provider| provider.is_authenticated(cx))
-            .collect::<Vec<_>>();
-
-        let configured_provider_ids = configured_providers
-            .iter()
-            .map(|provider| provider.id())
-            .collect::<Vec<_>>();
-
-        let recommended_models = all_models
-            .recommended
-            .iter()
-            .filter(|m| configured_provider_ids.contains(&m.model.provider_id()))
-            .cloned()
-            .collect::<Vec<_>>();
-
-        let available_models = all_models
-            .all
-            .values()
-            .flat_map(|models| models.iter())
-            .filter(|m| configured_provider_ids.contains(&m.model.provider_id()))
-            .cloned()
-            .collect::<Vec<_>>();
-
-        let matcher_rec = ModelMatcher::new(recommended_models, bg_executor.clone());
-        let matcher_all = ModelMatcher::new(available_models, bg_executor.clone());
-
-        let recommended = matcher_rec.exact_search(&query);
-        let all = matcher_all.fuzzy_search(&query);
-
-        let filtered_models = GroupedModels::new(all, recommended);
-
-        cx.spawn_in(window, async move |this, cx| {
-            this.update_in(cx, |this, window, cx| {
-                this.delegate.filtered_entries = filtered_models.entries();
-                // Finds the currently selected model in the list
-                let new_index =
-                    Self::get_active_model_index(&this.delegate.filtered_entries, active_model);
-                this.set_selected_index(new_index, Some(picker::Direction::Down), true, window, cx);
-                cx.notify();
-            })
-            .ok();
-        })
-    }
-
-    fn confirm(&mut self, _secondary: bool, window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        if let Some(LanguageModelPickerEntry::Model(model_info)) =
-            self.filtered_entries.get(self.selected_index)
-        {
-            let model = model_info.model.clone();
-            (self.on_model_changed)(model.clone(), cx);
-
-            let current_index = self.selected_index;
-            self.set_selected_index(current_index, window, cx);
-
-            cx.emit(DismissEvent);
-        }
-    }
-
-    fn dismissed(&mut self, _: &mut Window, cx: &mut Context<Picker<Self>>) {
-        cx.emit(DismissEvent);
-    }
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        _: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<Self::ListItem> {
-        match self.filtered_entries.get(ix)? {
-            LanguageModelPickerEntry::Separator(title) => Some(
-                div()
-                    .px_2()
-                    .pb_1()
-                    .when(ix > 1, |this| {
-                        this.mt_1()
-                            .pt_2()
-                            .border_t_1()
-                            .border_color(cx.theme().colors().border_variant)
-                    })
-                    .child(
-                        Label::new(title)
-                            .size(LabelSize::XSmall)
-                            .color(Color::Muted),
-                    )
-                    .into_any_element(),
-            ),
-            LanguageModelPickerEntry::Model(model_info) => {
-                let active_model = (self.get_active_model)(cx);
-                let active_provider_id = active_model.as_ref().map(|m| m.provider.id());
-                let active_model_id = active_model.map(|m| m.model.id());
-
-                let is_selected = Some(model_info.model.provider_id()) == active_provider_id
-                    && Some(model_info.model.id()) == active_model_id;
-
-                let model_icon_color = if is_selected {
-                    Color::Accent
-                } else {
-                    Color::Muted
-                };
-
-                Some(
-                    ListItem::new(ix)
-                        .inset(true)
-                        .spacing(ListItemSpacing::Sparse)
-                        .toggle_state(selected)
-                        .child(
-                            h_flex()
-                                .w_full()
-                                .gap_1p5()
-                                .child(
-                                    Icon::new(model_info.icon)
-                                        .color(model_icon_color)
-                                        .size(IconSize::Small),
-                                )
-                                .child(Label::new(model_info.model.name().0).truncate()),
-                        )
-                        .end_slot(div().pr_3().when(is_selected, |this| {
-                            this.child(
-                                Icon::new(IconName::Check)
-                                    .color(Color::Accent)
-                                    .size(IconSize::Small),
-                            )
-                        }))
-                        .into_any_element(),
-                )
-            }
-        }
-    }
-
-    fn render_footer(
-        &self,
-        _window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<gpui::AnyElement> {
-        let focus_handle = self.focus_handle.clone();
-
-        if !self.popover_styles {
-            return None;
-        }
-
-        Some(
-            h_flex()
-                .w_full()
-                .p_1p5()
-                .border_t_1()
-                .border_color(cx.theme().colors().border_variant)
-                .child(
-                    Button::new("configure", "Configure")
-                        .full_width()
-                        .style(ButtonStyle::Outlined)
-                        .key_binding(
-                            KeyBinding::for_action_in(&OpenSettings, &focus_handle, cx)
-                                .map(|kb| kb.size(rems_from_px(12.))),
-                        )
-                        .on_click(|_, window, cx| {
-                            window.dispatch_action(OpenSettings.boxed_clone(), cx);
-                        }),
-                )
-                .into_any(),
-        )
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use futures::{future::BoxFuture, stream::BoxStream};
-    use gpui::{AsyncApp, TestAppContext, http_client};
-    use language_model::{
-        LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelId,
-        LanguageModelName, LanguageModelProviderId, LanguageModelProviderName,
-        LanguageModelRequest, LanguageModelToolChoice,
-    };
-    use ui::IconName;
-
-    #[derive(Clone)]
-    struct TestLanguageModel {
-        name: LanguageModelName,
-        id: LanguageModelId,
-        provider_id: LanguageModelProviderId,
-        provider_name: LanguageModelProviderName,
-    }
-
-    impl TestLanguageModel {
-        fn new(name: &str, provider: &str) -> Self {
-            Self {
-                name: LanguageModelName::from(name.to_string()),
-                id: LanguageModelId::from(name.to_string()),
-                provider_id: LanguageModelProviderId::from(provider.to_string()),
-                provider_name: LanguageModelProviderName::from(provider.to_string()),
-            }
-        }
-    }
-
-    impl LanguageModel for TestLanguageModel {
-        fn id(&self) -> LanguageModelId {
-            self.id.clone()
-        }
-
-        fn name(&self) -> LanguageModelName {
-            self.name.clone()
-        }
-
-        fn provider_id(&self) -> LanguageModelProviderId {
-            self.provider_id.clone()
-        }
-
-        fn provider_name(&self) -> LanguageModelProviderName {
-            self.provider_name.clone()
-        }
-
-        fn supports_tools(&self) -> bool {
-            false
-        }
-
-        fn supports_tool_choice(&self, _choice: LanguageModelToolChoice) -> bool {
-            false
-        }
-
-        fn supports_images(&self) -> bool {
-            false
-        }
-
-        fn telemetry_id(&self) -> String {
-            format!("{}/{}", self.provider_id.0, self.name.0)
-        }
-
-        fn max_token_count(&self) -> u64 {
-            1000
-        }
-
-        fn count_tokens(
-            &self,
-            _: LanguageModelRequest,
-            _: &App,
-        ) -> BoxFuture<'static, http_client::Result<u64>> {
-            unimplemented!()
-        }
-
-        fn stream_completion(
-            &self,
-            _: LanguageModelRequest,
-            _: &AsyncApp,
-        ) -> BoxFuture<
-            'static,
-            Result<
-                BoxStream<
-                    'static,
-                    Result<LanguageModelCompletionEvent, LanguageModelCompletionError>,
-                >,
-                LanguageModelCompletionError,
-            >,
-        > {
-            unimplemented!()
-        }
-    }
-
-    fn create_models(model_specs: Vec<(&str, &str)>) -> Vec<ModelInfo> {
-        model_specs
-            .into_iter()
-            .map(|(provider, name)| ModelInfo {
-                model: Arc::new(TestLanguageModel::new(name, provider)),
-                icon: IconName::Ai,
-            })
-            .collect()
-    }
-
-    fn assert_models_eq(result: Vec<ModelInfo>, expected: Vec<&str>) {
-        assert_eq!(
-            result.len(),
-            expected.len(),
-            "Number of models doesn't match"
-        );
-
-        for (i, expected_name) in expected.iter().enumerate() {
-            assert_eq!(
-                result[i].model.telemetry_id(),
-                *expected_name,
-                "Model at position {} doesn't match expected model",
-                i
-            );
-        }
-    }
-
-    #[gpui::test]
-    fn test_exact_match(cx: &mut TestAppContext) {
-        let models = create_models(vec![
-            ("zed", "Claude 3.7 Sonnet"),
-            ("zed", "Claude 3.7 Sonnet Thinking"),
-            ("zed", "gpt-4.1"),
-            ("zed", "gpt-4.1-nano"),
-            ("openai", "gpt-3.5-turbo"),
-            ("openai", "gpt-4.1"),
-            ("openai", "gpt-4.1-nano"),
-            ("ollama", "mistral"),
-            ("ollama", "deepseek"),
-        ]);
-        let matcher = ModelMatcher::new(models, cx.background_executor.clone());
-
-        // The order of models should be maintained, case doesn't matter
-        let results = matcher.exact_search("GPT-4.1");
-        assert_models_eq(
-            results,
-            vec![
-                "zed/gpt-4.1",
-                "zed/gpt-4.1-nano",
-                "openai/gpt-4.1",
-                "openai/gpt-4.1-nano",
-            ],
-        );
-    }
-
-    #[gpui::test]
-    fn test_fuzzy_match(cx: &mut TestAppContext) {
-        let models = create_models(vec![
-            ("zed", "Claude 3.7 Sonnet"),
-            ("zed", "Claude 3.7 Sonnet Thinking"),
-            ("zed", "gpt-4.1"),
-            ("zed", "gpt-4.1-nano"),
-            ("openai", "gpt-3.5-turbo"),
-            ("openai", "gpt-4.1"),
-            ("openai", "gpt-4.1-nano"),
-            ("ollama", "mistral"),
-            ("ollama", "deepseek"),
-        ]);
-        let matcher = ModelMatcher::new(models, cx.background_executor.clone());
-
-        // Results should preserve models order whenever possible.
-        // In the case below, `zed/gpt-4.1` and `openai/gpt-4.1` have identical
-        // similarity scores, but `zed/gpt-4.1` was higher in the models list,
-        // so it should appear first in the results.
-        let results = matcher.fuzzy_search("41");
-        assert_models_eq(
-            results,
-            vec![
-                "zed/gpt-4.1",
-                "openai/gpt-4.1",
-                "zed/gpt-4.1-nano",
-                "openai/gpt-4.1-nano",
-            ],
-        );
-
-        // Model provider should be searchable as well
-        let results = matcher.fuzzy_search("ol"); // meaning "ollama"
-        assert_models_eq(results, vec!["ollama/mistral", "ollama/deepseek"]);
-
-        // Fuzzy search
-        let results = matcher.fuzzy_search("z4n");
-        assert_models_eq(results, vec!["zed/gpt-4.1-nano"]);
-    }
-
-    #[gpui::test]
-    fn test_recommended_models_also_appear_in_other(_cx: &mut TestAppContext) {
-        let recommended_models = create_models(vec![("zed", "claude")]);
-        let all_models = create_models(vec![
-            ("zed", "claude"), // Should also appear in "other"
-            ("zed", "gemini"),
-            ("copilot", "o3"),
-        ]);
-
-        let grouped_models = GroupedModels::new(all_models, recommended_models);
-
-        let actual_all_models = grouped_models
-            .all
-            .values()
-            .flatten()
-            .cloned()
-            .collect::<Vec<_>>();
-
-        // Recommended models should also appear in "all"
-        assert_models_eq(
-            actual_all_models,
-            vec!["zed/claude", "zed/gemini", "copilot/o3"],
-        );
-    }
-
-    #[gpui::test]
-    fn test_models_from_different_providers(_cx: &mut TestAppContext) {
-        let recommended_models = create_models(vec![("zed", "claude")]);
-        let all_models = create_models(vec![
-            ("zed", "claude"), // Should also appear in "other"
-            ("zed", "gemini"),
-            ("copilot", "claude"), // Different provider, should appear in "other"
-        ]);
-
-        let grouped_models = GroupedModels::new(all_models, recommended_models);
-
-        let actual_all_models = grouped_models
-            .all
-            .values()
-            .flatten()
-            .cloned()
-            .collect::<Vec<_>>();
-
-        // All models should appear in "all" regardless of recommended status
-        assert_models_eq(
-            actual_all_models,
-            vec!["zed/claude", "zed/gemini", "copilot/claude"],
-        );
-    }
-}
diff --git a/crates/agent_ui/src/mention_set.rs b/crates/agent_ui/src/mention_set.rs
deleted file mode 100644
index eee28bbfb2..0000000000
--- a/crates/agent_ui/src/mention_set.rs
+++ /dev/null
@@ -1,1098 +0,0 @@
-use acp_thread::{MentionUri, selection_name};
-use agent::{HistoryStore, outline};
-use agent_client_protocol as acp;
-use agent_servers::{AgentServer, AgentServerDelegate};
-use anyhow::{Context as _, Result, anyhow};
-use assistant_slash_commands::codeblock_fence_for_path;
-use collections::{HashMap, HashSet};
-use editor::{
-    Anchor, Editor, EditorSnapshot, ExcerptId, FoldPlaceholder, ToOffset,
-    display_map::{Crease, CreaseId, CreaseMetadata, FoldId},
-    scroll::Autoscroll,
-};
-use futures::{AsyncReadExt as _, FutureExt as _, future::Shared};
-use gpui::{
-    Animation, AnimationExt as _, AppContext, ClipboardEntry, Context, Empty, Entity, EntityId,
-    Image, ImageFormat, Img, SharedString, Task, WeakEntity, pulsating_between,
-};
-use http_client::{AsyncBody, HttpClientWithUrl};
-use itertools::Either;
-use language::Buffer;
-use language_model::LanguageModelImage;
-use multi_buffer::MultiBufferRow;
-use postage::stream::Stream as _;
-use project::{Project, ProjectItem, ProjectPath, Worktree};
-use prompt_store::{PromptId, PromptStore};
-use rope::Point;
-use std::{
-    cell::RefCell,
-    ffi::OsStr,
-    fmt::Write,
-    ops::{Range, RangeInclusive},
-    path::{Path, PathBuf},
-    rc::Rc,
-    sync::Arc,
-    time::Duration,
-};
-use text::OffsetRangeExt;
-use ui::{ButtonLike, Disclosure, TintColor, Toggleable, prelude::*};
-use util::{ResultExt, debug_panic, rel_path::RelPath};
-use workspace::{Workspace, notifications::NotifyResultExt as _};
-
-pub type MentionTask = Shared<Task<Result<Mention, String>>>;
-
-#[derive(Debug, Clone, Eq, PartialEq)]
-pub enum Mention {
-    Text {
-        content: String,
-        tracked_buffers: Vec<Entity<Buffer>>,
-    },
-    Image(MentionImage),
-    Link,
-}
-
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub struct MentionImage {
-    pub data: SharedString,
-    pub format: ImageFormat,
-}
-
-pub struct MentionSet {
-    project: WeakEntity<Project>,
-    history_store: Entity<HistoryStore>,
-    prompt_store: Option<Entity<PromptStore>>,
-    mentions: HashMap<CreaseId, (MentionUri, MentionTask)>,
-}
-
-impl MentionSet {
-    pub fn new(
-        project: WeakEntity<Project>,
-        history_store: Entity<HistoryStore>,
-        prompt_store: Option<Entity<PromptStore>>,
-    ) -> Self {
-        Self {
-            project,
-            history_store,
-            prompt_store,
-            mentions: HashMap::default(),
-        }
-    }
-
-    pub fn contents(
-        &self,
-        full_mention_content: bool,
-        cx: &mut App,
-    ) -> Task<Result<HashMap<CreaseId, (MentionUri, Mention)>>> {
-        let Some(project) = self.project.upgrade() else {
-            return Task::ready(Err(anyhow!("Project not found")));
-        };
-        let mentions = self.mentions.clone();
-        cx.spawn(async move |cx| {
-            let mut contents = HashMap::default();
-            for (crease_id, (mention_uri, task)) in mentions {
-                let content = if full_mention_content
-                    && let MentionUri::Directory { abs_path } = &mention_uri
-                {
-                    cx.update(|cx| full_mention_for_directory(&project, abs_path, cx))?
-                        .await?
-                } else {
-                    task.await.map_err(|e| anyhow!("{e}"))?
-                };
-
-                contents.insert(crease_id, (mention_uri, content));
-            }
-            Ok(contents)
-        })
-    }
-
-    pub fn remove_invalid(&mut self, snapshot: &EditorSnapshot) {
-        for (crease_id, crease) in snapshot.crease_snapshot.creases() {
-            if !crease.range().start.is_valid(snapshot.buffer_snapshot()) {
-                self.mentions.remove(&crease_id);
-            }
-        }
-    }
-
-    pub fn insert_mention(&mut self, crease_id: CreaseId, uri: MentionUri, task: MentionTask) {
-        self.mentions.insert(crease_id, (uri, task));
-    }
-
-    pub fn remove_mention(&mut self, crease_id: &CreaseId) {
-        self.mentions.remove(crease_id);
-    }
-
-    pub fn creases(&self) -> HashSet<CreaseId> {
-        self.mentions.keys().cloned().collect()
-    }
-
-    pub fn mentions(&self) -> HashSet<MentionUri> {
-        self.mentions.values().map(|(uri, _)| uri.clone()).collect()
-    }
-
-    pub fn set_mentions(&mut self, mentions: HashMap<CreaseId, (MentionUri, MentionTask)>) {
-        self.mentions = mentions;
-    }
-
-    pub fn clear(&mut self) -> impl Iterator<Item = (CreaseId, (MentionUri, MentionTask))> {
-        self.mentions.drain()
-    }
-
-    pub fn confirm_mention_completion(
-        &mut self,
-        crease_text: SharedString,
-        start: text::Anchor,
-        content_len: usize,
-        mention_uri: MentionUri,
-        supports_images: bool,
-        editor: Entity<Editor>,
-        workspace: &Entity<Workspace>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<()> {
-        let Some(project) = self.project.upgrade() else {
-            return Task::ready(());
-        };
-
-        let snapshot = editor.update(cx, |editor, cx| editor.snapshot(window, cx));
-        let Some(start_anchor) = snapshot.buffer_snapshot().as_singleton_anchor(start) else {
-            return Task::ready(());
-        };
-        let excerpt_id = start_anchor.excerpt_id;
-        let end_anchor = snapshot.buffer_snapshot().anchor_before(
-            start_anchor.to_offset(&snapshot.buffer_snapshot()) + content_len + 1usize,
-        );
-
-        let crease = if let MentionUri::File { abs_path } = &mention_uri
-            && let Some(extension) = abs_path.extension()
-            && let Some(extension) = extension.to_str()
-            && Img::extensions().contains(&extension)
-            && !extension.contains("svg")
-        {
-            let Some(project_path) = project
-                .read(cx)
-                .project_path_for_absolute_path(&abs_path, cx)
-            else {
-                log::error!("project path not found");
-                return Task::ready(());
-            };
-            let image_task = project.update(cx, |project, cx| project.open_image(project_path, cx));
-            let image = cx
-                .spawn(async move |_, cx| {
-                    let image = image_task.await.map_err(|e| e.to_string())?;
-                    let image = image
-                        .update(cx, |image, _| image.image.clone())
-                        .map_err(|e| e.to_string())?;
-                    Ok(image)
-                })
-                .shared();
-            insert_crease_for_mention(
-                excerpt_id,
-                start,
-                content_len,
-                mention_uri.name().into(),
-                IconName::Image.path().into(),
-                Some(image),
-                editor.clone(),
-                window,
-                cx,
-            )
-        } else {
-            insert_crease_for_mention(
-                excerpt_id,
-                start,
-                content_len,
-                crease_text,
-                mention_uri.icon_path(cx),
-                None,
-                editor.clone(),
-                window,
-                cx,
-            )
-        };
-        let Some((crease_id, tx)) = crease else {
-            return Task::ready(());
-        };
-
-        let task = match mention_uri.clone() {
-            MentionUri::Fetch { url } => {
-                self.confirm_mention_for_fetch(url, workspace.read(cx).client().http_client(), cx)
-            }
-            MentionUri::Directory { .. } => Task::ready(Ok(Mention::Link)),
-            MentionUri::Thread { id, .. } => self.confirm_mention_for_thread(id, cx),
-            MentionUri::TextThread { path, .. } => self.confirm_mention_for_text_thread(path, cx),
-            MentionUri::File { abs_path } => {
-                self.confirm_mention_for_file(abs_path, supports_images, cx)
-            }
-            MentionUri::Symbol {
-                abs_path,
-                line_range,
-                ..
-            } => self.confirm_mention_for_symbol(abs_path, line_range, cx),
-            MentionUri::Rule { id, .. } => self.confirm_mention_for_rule(id, cx),
-            MentionUri::PastedImage => {
-                debug_panic!("pasted image URI should not be included in completions");
-                Task::ready(Err(anyhow!(
-                    "pasted imaged URI should not be included in completions"
-                )))
-            }
-            MentionUri::Selection { .. } => {
-                debug_panic!("unexpected selection URI");
-                Task::ready(Err(anyhow!("unexpected selection URI")))
-            }
-        };
-        let task = cx
-            .spawn(async move |_, _| task.await.map_err(|e| e.to_string()))
-            .shared();
-        self.mentions.insert(crease_id, (mention_uri, task.clone()));
-
-        // Notify the user if we failed to load the mentioned context
-        cx.spawn_in(window, async move |this, cx| {
-            let result = task.await.notify_async_err(cx);
-            drop(tx);
-            if result.is_none() {
-                this.update(cx, |this, cx| {
-                    editor.update(cx, |editor, cx| {
-                        // Remove mention
-                        editor.edit([(start_anchor..end_anchor, "")], cx);
-                    });
-                    this.mentions.remove(&crease_id);
-                })
-                .ok();
-            }
-        })
-    }
-
-    pub fn confirm_mention_for_file(
-        &self,
-        abs_path: PathBuf,
-        supports_images: bool,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Mention>> {
-        let Some(project) = self.project.upgrade() else {
-            return Task::ready(Err(anyhow!("project not found")));
-        };
-
-        let Some(project_path) = project
-            .read(cx)
-            .project_path_for_absolute_path(&abs_path, cx)
-        else {
-            return Task::ready(Err(anyhow!("project path not found")));
-        };
-        let extension = abs_path
-            .extension()
-            .and_then(OsStr::to_str)
-            .unwrap_or_default();
-
-        if Img::extensions().contains(&extension) && !extension.contains("svg") {
-            if !supports_images {
-                return Task::ready(Err(anyhow!("This model does not support images yet")));
-            }
-            let task = project.update(cx, |project, cx| project.open_image(project_path, cx));
-            return cx.spawn(async move |_, cx| {
-                let image = task.await?;
-                let image = image.update(cx, |image, _| image.image.clone())?;
-                let format = image.format;
-                let image = cx
-                    .update(|cx| LanguageModelImage::from_image(image, cx))?
-                    .await;
-                if let Some(image) = image {
-                    Ok(Mention::Image(MentionImage {
-                        data: image.source,
-                        format,
-                    }))
-                } else {
-                    Err(anyhow!("Failed to convert image"))
-                }
-            });
-        }
-
-        let buffer = project.update(cx, |project, cx| project.open_buffer(project_path, cx));
-        cx.spawn(async move |_, cx| {
-            let buffer = buffer.await?;
-            let buffer_content = outline::get_buffer_content_or_outline(
-                buffer.clone(),
-                Some(&abs_path.to_string_lossy()),
-                &cx,
-            )
-            .await?;
-
-            Ok(Mention::Text {
-                content: buffer_content.text,
-                tracked_buffers: vec![buffer],
-            })
-        })
-    }
-
-    fn confirm_mention_for_fetch(
-        &self,
-        url: url::Url,
-        http_client: Arc<HttpClientWithUrl>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Mention>> {
-        cx.background_executor().spawn(async move {
-            let content = fetch_url_content(http_client, url.to_string()).await?;
-            Ok(Mention::Text {
-                content,
-                tracked_buffers: Vec::new(),
-            })
-        })
-    }
-
-    fn confirm_mention_for_symbol(
-        &self,
-        abs_path: PathBuf,
-        line_range: RangeInclusive<u32>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Mention>> {
-        let Some(project) = self.project.upgrade() else {
-            return Task::ready(Err(anyhow!("project not found")));
-        };
-        let Some(project_path) = project
-            .read(cx)
-            .project_path_for_absolute_path(&abs_path, cx)
-        else {
-            return Task::ready(Err(anyhow!("project path not found")));
-        };
-        let buffer = project.update(cx, |project, cx| project.open_buffer(project_path, cx));
-        cx.spawn(async move |_, cx| {
-            let buffer = buffer.await?;
-            let mention = buffer.update(cx, |buffer, cx| {
-                let start = Point::new(*line_range.start(), 0).min(buffer.max_point());
-                let end = Point::new(*line_range.end() + 1, 0).min(buffer.max_point());
-                let content = buffer.text_for_range(start..end).collect();
-                Mention::Text {
-                    content,
-                    tracked_buffers: vec![cx.entity()],
-                }
-            })?;
-            anyhow::Ok(mention)
-        })
-    }
-
-    fn confirm_mention_for_rule(
-        &mut self,
-        id: PromptId,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Mention>> {
-        let Some(prompt_store) = self.prompt_store.as_ref() else {
-            return Task::ready(Err(anyhow!("Missing prompt store")));
-        };
-        let prompt = prompt_store.read(cx).load(id, cx);
-        cx.spawn(async move |_, _| {
-            let prompt = prompt.await?;
-            Ok(Mention::Text {
-                content: prompt,
-                tracked_buffers: Vec::new(),
-            })
-        })
-    }
-
-    pub fn confirm_mention_for_selection(
-        &mut self,
-        source_range: Range<text::Anchor>,
-        selections: Vec<(Entity<Buffer>, Range<text::Anchor>, Range<usize>)>,
-        editor: Entity<Editor>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(project) = self.project.upgrade() else {
-            return;
-        };
-
-        let snapshot = editor.read(cx).buffer().read(cx).snapshot(cx);
-        let Some(start) = snapshot.as_singleton_anchor(source_range.start) else {
-            return;
-        };
-
-        let offset = start.to_offset(&snapshot);
-
-        for (buffer, selection_range, range_to_fold) in selections {
-            let range = snapshot.anchor_after(offset + range_to_fold.start)
-                ..snapshot.anchor_after(offset + range_to_fold.end);
-
-            let abs_path = buffer
-                .read(cx)
-                .project_path(cx)
-                .and_then(|project_path| project.read(cx).absolute_path(&project_path, cx));
-            let snapshot = buffer.read(cx).snapshot();
-
-            let text = snapshot
-                .text_for_range(selection_range.clone())
-                .collect::<String>();
-            let point_range = selection_range.to_point(&snapshot);
-            let line_range = point_range.start.row..=point_range.end.row;
-
-            let uri = MentionUri::Selection {
-                abs_path: abs_path.clone(),
-                line_range: line_range.clone(),
-            };
-            let crease = crease_for_mention(
-                selection_name(abs_path.as_deref(), &line_range).into(),
-                uri.icon_path(cx),
-                range,
-                editor.downgrade(),
-            );
-
-            let crease_id = editor.update(cx, |editor, cx| {
-                let crease_ids = editor.insert_creases(vec![crease.clone()], cx);
-                editor.fold_creases(vec![crease], false, window, cx);
-                crease_ids.first().copied().unwrap()
-            });
-
-            self.mentions.insert(
-                crease_id,
-                (
-                    uri,
-                    Task::ready(Ok(Mention::Text {
-                        content: text,
-                        tracked_buffers: vec![buffer],
-                    }))
-                    .shared(),
-                ),
-            );
-        }
-
-        // Take this explanation with a grain of salt but, with creases being
-        // inserted, GPUI's recomputes the editor layout in the next frames, so
-        // directly calling `editor.request_autoscroll` wouldn't work as
-        // expected. We're leveraging `cx.on_next_frame` to wait 2 frames and
-        // ensure that the layout has been recalculated so that the autoscroll
-        // request actually shows the cursor's new position.
-        cx.on_next_frame(window, move |_, window, cx| {
-            cx.on_next_frame(window, move |_, _, cx| {
-                editor.update(cx, |editor, cx| {
-                    editor.request_autoscroll(Autoscroll::fit(), cx)
-                });
-            });
-        });
-    }
-
-    fn confirm_mention_for_thread(
-        &mut self,
-        id: acp::SessionId,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Mention>> {
-        let Some(project) = self.project.upgrade() else {
-            return Task::ready(Err(anyhow!("project not found")));
-        };
-
-        let server = Rc::new(agent::NativeAgentServer::new(
-            project.read(cx).fs().clone(),
-            self.history_store.clone(),
-        ));
-        let delegate = AgentServerDelegate::new(
-            project.read(cx).agent_server_store().clone(),
-            project.clone(),
-            None,
-            None,
-        );
-        let connection = server.connect(None, delegate, cx);
-        cx.spawn(async move |_, cx| {
-            let (agent, _) = connection.await?;
-            let agent = agent.downcast::<agent::NativeAgentConnection>().unwrap();
-            let summary = agent
-                .0
-                .update(cx, |agent, cx| agent.thread_summary(id, cx))?
-                .await?;
-            anyhow::Ok(Mention::Text {
-                content: summary.to_string(),
-                tracked_buffers: Vec::new(),
-            })
-        })
-    }
-
-    fn confirm_mention_for_text_thread(
-        &mut self,
-        path: PathBuf,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Mention>> {
-        let text_thread_task = self.history_store.update(cx, |store, cx| {
-            store.load_text_thread(path.as_path().into(), cx)
-        });
-        cx.spawn(async move |_, cx| {
-            let text_thread = text_thread_task.await?;
-            let xml = text_thread.update(cx, |text_thread, cx| text_thread.to_xml(cx))?;
-            Ok(Mention::Text {
-                content: xml,
-                tracked_buffers: Vec::new(),
-            })
-        })
-    }
-}
-
-pub(crate) fn paste_images_as_context(
-    editor: Entity<Editor>,
-    mention_set: Entity<MentionSet>,
-    window: &mut Window,
-    cx: &mut App,
-) -> Option<Task<()>> {
-    let clipboard = cx.read_from_clipboard()?;
-    Some(window.spawn(cx, async move |cx| {
-        use itertools::Itertools;
-        let (mut images, paths) = clipboard
-            .into_entries()
-            .filter_map(|entry| match entry {
-                ClipboardEntry::Image(image) => Some(Either::Left(image)),
-                ClipboardEntry::ExternalPaths(paths) => Some(Either::Right(paths)),
-                _ => None,
-            })
-            .partition_map::<Vec<_>, Vec<_>, _, _, _>(std::convert::identity);
-
-        if !paths.is_empty() {
-            images.extend(
-                cx.background_spawn(async move {
-                    let mut images = vec![];
-                    for path in paths.into_iter().flat_map(|paths| paths.paths().to_owned()) {
-                        let Ok(content) = async_fs::read(path).await else {
-                            continue;
-                        };
-                        let Ok(format) = image::guess_format(&content) else {
-                            continue;
-                        };
-                        images.push(gpui::Image::from_bytes(
-                            match format {
-                                image::ImageFormat::Png => gpui::ImageFormat::Png,
-                                image::ImageFormat::Jpeg => gpui::ImageFormat::Jpeg,
-                                image::ImageFormat::WebP => gpui::ImageFormat::Webp,
-                                image::ImageFormat::Gif => gpui::ImageFormat::Gif,
-                                image::ImageFormat::Bmp => gpui::ImageFormat::Bmp,
-                                image::ImageFormat::Tiff => gpui::ImageFormat::Tiff,
-                                image::ImageFormat::Ico => gpui::ImageFormat::Ico,
-                                _ => continue,
-                            },
-                            content,
-                        ));
-                    }
-                    images
-                })
-                .await,
-            );
-        }
-
-        if images.is_empty() {
-            return;
-        }
-
-        let replacement_text = MentionUri::PastedImage.as_link().to_string();
-        cx.update(|_window, cx| {
-            cx.stop_propagation();
-        })
-        .ok();
-        for image in images {
-            let Ok((excerpt_id, text_anchor, multibuffer_anchor)) =
-                editor.update_in(cx, |message_editor, window, cx| {
-                    let snapshot = message_editor.snapshot(window, cx);
-                    let (excerpt_id, _, buffer_snapshot) =
-                        snapshot.buffer_snapshot().as_singleton().unwrap();
-
-                    let text_anchor = buffer_snapshot.anchor_before(buffer_snapshot.len());
-                    let multibuffer_anchor = snapshot
-                        .buffer_snapshot()
-                        .anchor_in_excerpt(*excerpt_id, text_anchor);
-                    message_editor.edit(
-                        [(
-                            multi_buffer::Anchor::max()..multi_buffer::Anchor::max(),
-                            format!("{replacement_text} "),
-                        )],
-                        cx,
-                    );
-                    (*excerpt_id, text_anchor, multibuffer_anchor)
-                })
-            else {
-                break;
-            };
-
-            let content_len = replacement_text.len();
-            let Some(start_anchor) = multibuffer_anchor else {
-                continue;
-            };
-            let Ok(end_anchor) = editor.update(cx, |editor, cx| {
-                let snapshot = editor.buffer().read(cx).snapshot(cx);
-                snapshot.anchor_before(start_anchor.to_offset(&snapshot) + content_len)
-            }) else {
-                continue;
-            };
-            let image = Arc::new(image);
-            let Ok(Some((crease_id, tx))) = cx.update(|window, cx| {
-                insert_crease_for_mention(
-                    excerpt_id,
-                    text_anchor,
-                    content_len,
-                    MentionUri::PastedImage.name().into(),
-                    IconName::Image.path().into(),
-                    Some(Task::ready(Ok(image.clone())).shared()),
-                    editor.clone(),
-                    window,
-                    cx,
-                )
-            }) else {
-                continue;
-            };
-            let task = cx
-                .spawn(async move |cx| {
-                    let format = image.format;
-                    let image = cx
-                        .update(|_, cx| LanguageModelImage::from_image(image, cx))
-                        .map_err(|e| e.to_string())?
-                        .await;
-                    drop(tx);
-                    if let Some(image) = image {
-                        Ok(Mention::Image(MentionImage {
-                            data: image.source,
-                            format,
-                        }))
-                    } else {
-                        Err("Failed to convert image".into())
-                    }
-                })
-                .shared();
-
-            mention_set
-                .update(cx, |mention_set, _cx| {
-                    mention_set.insert_mention(crease_id, MentionUri::PastedImage, task.clone())
-                })
-                .ok();
-
-            if task.await.notify_async_err(cx).is_none() {
-                editor
-                    .update(cx, |editor, cx| {
-                        editor.edit([(start_anchor..end_anchor, "")], cx);
-                    })
-                    .ok();
-                mention_set
-                    .update(cx, |mention_set, _cx| {
-                        mention_set.remove_mention(&crease_id)
-                    })
-                    .ok();
-            }
-        }
-    }))
-}
-
-pub(crate) fn insert_crease_for_mention(
-    excerpt_id: ExcerptId,
-    anchor: text::Anchor,
-    content_len: usize,
-    crease_label: SharedString,
-    crease_icon: SharedString,
-    // abs_path: Option<Arc<Path>>,
-    image: Option<Shared<Task<Result<Arc<Image>, String>>>>,
-    editor: Entity<Editor>,
-    window: &mut Window,
-    cx: &mut App,
-) -> Option<(CreaseId, postage::barrier::Sender)> {
-    let (tx, rx) = postage::barrier::channel();
-
-    let crease_id = editor.update(cx, |editor, cx| {
-        let snapshot = editor.buffer().read(cx).snapshot(cx);
-
-        let start = snapshot.anchor_in_excerpt(excerpt_id, anchor)?;
-
-        let start = start.bias_right(&snapshot);
-        let end = snapshot.anchor_before(start.to_offset(&snapshot) + content_len);
-
-        let placeholder = FoldPlaceholder {
-            render: render_mention_fold_button(
-                crease_label.clone(),
-                crease_icon.clone(),
-                start..end,
-                rx,
-                image,
-                cx.weak_entity(),
-                cx,
-            ),
-            merge_adjacent: false,
-            ..Default::default()
-        };
-
-        let crease = Crease::Inline {
-            range: start..end,
-            placeholder,
-            render_toggle: None,
-            render_trailer: None,
-            metadata: Some(CreaseMetadata {
-                label: crease_label,
-                icon_path: crease_icon,
-            }),
-        };
-
-        let ids = editor.insert_creases(vec![crease.clone()], cx);
-        editor.fold_creases(vec![crease], false, window, cx);
-
-        Some(ids[0])
-    })?;
-
-    Some((crease_id, tx))
-}
-
-pub(crate) fn crease_for_mention(
-    label: SharedString,
-    icon_path: SharedString,
-    range: Range<Anchor>,
-    editor_entity: WeakEntity<Editor>,
-) -> Crease<Anchor> {
-    let placeholder = FoldPlaceholder {
-        render: render_fold_icon_button(icon_path.clone(), label.clone(), editor_entity),
-        merge_adjacent: false,
-        ..Default::default()
-    };
-
-    let render_trailer = move |_row, _unfold, _window: &mut Window, _cx: &mut App| Empty.into_any();
-
-    Crease::inline(range, placeholder, fold_toggle("mention"), render_trailer)
-        .with_metadata(CreaseMetadata { icon_path, label })
-}
-
-fn render_fold_icon_button(
-    icon_path: SharedString,
-    label: SharedString,
-    editor: WeakEntity<Editor>,
-) -> Arc<dyn Send + Sync + Fn(FoldId, Range<Anchor>, &mut App) -> AnyElement> {
-    Arc::new({
-        move |fold_id, fold_range, cx| {
-            let is_in_text_selection = editor
-                .update(cx, |editor, cx| editor.is_range_selected(&fold_range, cx))
-                .unwrap_or_default();
-
-            ButtonLike::new(fold_id)
-                .style(ButtonStyle::Filled)
-                .selected_style(ButtonStyle::Tinted(TintColor::Accent))
-                .toggle_state(is_in_text_selection)
-                .child(
-                    h_flex()
-                        .gap_1()
-                        .child(
-                            Icon::from_path(icon_path.clone())
-                                .size(IconSize::XSmall)
-                                .color(Color::Muted),
-                        )
-                        .child(
-                            Label::new(label.clone())
-                                .size(LabelSize::Small)
-                                .buffer_font(cx)
-                                .single_line(),
-                        ),
-                )
-                .into_any_element()
-        }
-    })
-}
-
-fn fold_toggle(
-    name: &'static str,
-) -> impl Fn(
-    MultiBufferRow,
-    bool,
-    Arc<dyn Fn(bool, &mut Window, &mut App) + Send + Sync>,
-    &mut Window,
-    &mut App,
-) -> AnyElement {
-    move |row, is_folded, fold, _window, _cx| {
-        Disclosure::new((name, row.0 as u64), !is_folded)
-            .toggle_state(is_folded)
-            .on_click(move |_e, window, cx| fold(!is_folded, window, cx))
-            .into_any_element()
-    }
-}
-
-fn full_mention_for_directory(
-    project: &Entity<Project>,
-    abs_path: &Path,
-    cx: &mut App,
-) -> Task<Result<Mention>> {
-    fn collect_files_in_path(worktree: &Worktree, path: &RelPath) -> Vec<(Arc<RelPath>, String)> {
-        let mut files = Vec::new();
-
-        for entry in worktree.child_entries(path) {
-            if entry.is_dir() {
-                files.extend(collect_files_in_path(worktree, &entry.path));
-            } else if entry.is_file() {
-                files.push((
-                    entry.path.clone(),
-                    worktree
-                        .full_path(&entry.path)
-                        .to_string_lossy()
-                        .to_string(),
-                ));
-            }
-        }
-
-        files
-    }
-
-    let Some(project_path) = project
-        .read(cx)
-        .project_path_for_absolute_path(&abs_path, cx)
-    else {
-        return Task::ready(Err(anyhow!("project path not found")));
-    };
-    let Some(entry) = project.read(cx).entry_for_path(&project_path, cx) else {
-        return Task::ready(Err(anyhow!("project entry not found")));
-    };
-    let directory_path = entry.path.clone();
-    let worktree_id = project_path.worktree_id;
-    let Some(worktree) = project.read(cx).worktree_for_id(worktree_id, cx) else {
-        return Task::ready(Err(anyhow!("worktree not found")));
-    };
-    let project = project.clone();
-    cx.spawn(async move |cx| {
-        let file_paths = worktree.read_with(cx, |worktree, _cx| {
-            collect_files_in_path(worktree, &directory_path)
-        })?;
-        let descendants_future = cx.update(|cx| {
-            futures::future::join_all(file_paths.into_iter().map(|(worktree_path, full_path)| {
-                let rel_path = worktree_path
-                    .strip_prefix(&directory_path)
-                    .log_err()
-                    .map_or_else(|| worktree_path.clone(), |rel_path| rel_path.into());
-
-                let open_task = project.update(cx, |project, cx| {
-                    project.buffer_store().update(cx, |buffer_store, cx| {
-                        let project_path = ProjectPath {
-                            worktree_id,
-                            path: worktree_path,
-                        };
-                        buffer_store.open_buffer(project_path, cx)
-                    })
-                });
-
-                cx.spawn(async move |cx| {
-                    let buffer = open_task.await.log_err()?;
-                    let buffer_content = outline::get_buffer_content_or_outline(
-                        buffer.clone(),
-                        Some(&full_path),
-                        &cx,
-                    )
-                    .await
-                    .ok()?;
-
-                    Some((rel_path, full_path, buffer_content.text, buffer))
-                })
-            }))
-        })?;
-
-        let contents = cx
-            .background_spawn(async move {
-                let (contents, tracked_buffers) = descendants_future
-                    .await
-                    .into_iter()
-                    .flatten()
-                    .map(|(rel_path, full_path, rope, buffer)| {
-                        ((rel_path, full_path, rope), buffer)
-                    })
-                    .unzip();
-                Mention::Text {
-                    content: render_directory_contents(contents),
-                    tracked_buffers,
-                }
-            })
-            .await;
-        anyhow::Ok(contents)
-    })
-}
-
-fn render_directory_contents(entries: Vec<(Arc<RelPath>, String, String)>) -> String {
-    let mut output = String::new();
-    for (_relative_path, full_path, content) in entries {
-        let fence = codeblock_fence_for_path(Some(&full_path), None);
-        write!(output, "\n{fence}\n{content}\n```").unwrap();
-    }
-    output
-}
-
-fn render_mention_fold_button(
-    label: SharedString,
-    icon: SharedString,
-    range: Range<Anchor>,
-    mut loading_finished: postage::barrier::Receiver,
-    image_task: Option<Shared<Task<Result<Arc<Image>, String>>>>,
-    editor: WeakEntity<Editor>,
-    cx: &mut App,
-) -> Arc<dyn Send + Sync + Fn(FoldId, Range<Anchor>, &mut App) -> AnyElement> {
-    let loading = cx.new(|cx| {
-        let loading = cx.spawn(async move |this, cx| {
-            loading_finished.recv().await;
-            this.update(cx, |this: &mut LoadingContext, cx| {
-                this.loading = None;
-                cx.notify();
-            })
-            .ok();
-        });
-        LoadingContext {
-            id: cx.entity_id(),
-            label,
-            icon,
-            range,
-            editor,
-            loading: Some(loading),
-            image: image_task.clone(),
-        }
-    });
-    Arc::new(move |_fold_id, _fold_range, _cx| loading.clone().into_any_element())
-}
-
-struct LoadingContext {
-    id: EntityId,
-    label: SharedString,
-    icon: SharedString,
-    range: Range<Anchor>,
-    editor: WeakEntity<Editor>,
-    loading: Option<Task<()>>,
-    image: Option<Shared<Task<Result<Arc<Image>, String>>>>,
-}
-
-impl Render for LoadingContext {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let is_in_text_selection = self
-            .editor
-            .update(cx, |editor, cx| editor.is_range_selected(&self.range, cx))
-            .unwrap_or_default();
-        ButtonLike::new(("loading-context", self.id))
-            .style(ButtonStyle::Filled)
-            .selected_style(ButtonStyle::Tinted(TintColor::Accent))
-            .toggle_state(is_in_text_selection)
-            .when_some(self.image.clone(), |el, image_task| {
-                el.hoverable_tooltip(move |_, cx| {
-                    let image = image_task.peek().cloned().transpose().ok().flatten();
-                    let image_task = image_task.clone();
-                    cx.new::<ImageHover>(|cx| ImageHover {
-                        image,
-                        _task: cx.spawn(async move |this, cx| {
-                            if let Ok(image) = image_task.clone().await {
-                                this.update(cx, |this, cx| {
-                                    if this.image.replace(image).is_none() {
-                                        cx.notify();
-                                    }
-                                })
-                                .ok();
-                            }
-                        }),
-                    })
-                    .into()
-                })
-            })
-            .child(
-                h_flex()
-                    .gap_1()
-                    .child(
-                        Icon::from_path(self.icon.clone())
-                            .size(IconSize::XSmall)
-                            .color(Color::Muted),
-                    )
-                    .child(
-                        Label::new(self.label.clone())
-                            .size(LabelSize::Small)
-                            .buffer_font(cx)
-                            .single_line(),
-                    )
-                    .map(|el| {
-                        if self.loading.is_some() {
-                            el.with_animation(
-                                "loading-context-crease",
-                                Animation::new(Duration::from_secs(2))
-                                    .repeat()
-                                    .with_easing(pulsating_between(0.4, 0.8)),
-                                |label, delta| label.opacity(delta),
-                            )
-                            .into_any()
-                        } else {
-                            el.into_any()
-                        }
-                    }),
-            )
-    }
-}
-
-struct ImageHover {
-    image: Option<Arc<Image>>,
-    _task: Task<()>,
-}
-
-impl Render for ImageHover {
-    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
-        if let Some(image) = self.image.clone() {
-            gpui::img(image).max_w_96().max_h_96().into_any_element()
-        } else {
-            gpui::Empty.into_any_element()
-        }
-    }
-}
-
-async fn fetch_url_content(http_client: Arc<HttpClientWithUrl>, url: String) -> Result<String> {
-    #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
-    enum ContentType {
-        Html,
-        Plaintext,
-        Json,
-    }
-    use html_to_markdown::{TagHandler, convert_html_to_markdown, markdown};
-
-    let url = if !url.starts_with("https://") && !url.starts_with("http://") {
-        format!("https://{url}")
-    } else {
-        url
-    };
-
-    let mut response = http_client.get(&url, AsyncBody::default(), true).await?;
-    let mut body = Vec::new();
-    response
-        .body_mut()
-        .read_to_end(&mut body)
-        .await
-        .context("error reading response body")?;
-
-    if response.status().is_client_error() {
-        let text = String::from_utf8_lossy(body.as_slice());
-        anyhow::bail!(
-            "status error {}, response: {text:?}",
-            response.status().as_u16()
-        );
-    }
-
-    let Some(content_type) = response.headers().get("content-type") else {
-        anyhow::bail!("missing Content-Type header");
-    };
-    let content_type = content_type
-        .to_str()
-        .context("invalid Content-Type header")?;
-    let content_type = match content_type {
-        "text/html" => ContentType::Html,
-        "text/plain" => ContentType::Plaintext,
-        "application/json" => ContentType::Json,
-        _ => ContentType::Html,
-    };
-
-    match content_type {
-        ContentType::Html => {
-            let mut handlers: Vec<TagHandler> = vec![
-                Rc::new(RefCell::new(markdown::WebpageChromeRemover)),
-                Rc::new(RefCell::new(markdown::ParagraphHandler)),
-                Rc::new(RefCell::new(markdown::HeadingHandler)),
-                Rc::new(RefCell::new(markdown::ListHandler)),
-                Rc::new(RefCell::new(markdown::TableHandler::new())),
-                Rc::new(RefCell::new(markdown::StyledTextHandler)),
-            ];
-            if url.contains("wikipedia.org") {
-                use html_to_markdown::structure::wikipedia;
-
-                handlers.push(Rc::new(RefCell::new(wikipedia::WikipediaChromeRemover)));
-                handlers.push(Rc::new(RefCell::new(wikipedia::WikipediaInfoboxHandler)));
-                handlers.push(Rc::new(
-                    RefCell::new(wikipedia::WikipediaCodeHandler::new()),
-                ));
-            } else {
-                handlers.push(Rc::new(RefCell::new(markdown::CodeHandler)));
-            }
-            convert_html_to_markdown(&body[..], &mut handlers)
-        }
-        ContentType::Plaintext => Ok(std::str::from_utf8(&body)?.to_owned()),
-        ContentType::Json => {
-            let json: serde_json::Value = serde_json::from_slice(&body)?;
-
-            Ok(format!(
-                "```json\n{}\n```",
-                serde_json::to_string_pretty(&json)?
-            ))
-        }
-    }
-}
diff --git a/crates/agent_ui/src/profile_selector.rs b/crates/agent_ui/src/profile_selector.rs
deleted file mode 100644
index 0182be0912..0000000000
--- a/crates/agent_ui/src/profile_selector.rs
+++ /dev/null
@@ -1,760 +0,0 @@
-use crate::{ManageProfiles, ToggleProfileSelector};
-use agent_settings::{
-    AgentProfile, AgentProfileId, AgentSettings, AvailableProfiles, builtin_profiles,
-};
-use fs::Fs;
-use fuzzy::{StringMatch, StringMatchCandidate, match_strings};
-use gpui::{
-    Action, AnyElement, App, BackgroundExecutor, Context, DismissEvent, Entity, FocusHandle,
-    Focusable, SharedString, Subscription, Task, Window,
-};
-use picker::{Picker, PickerDelegate, popover_menu::PickerPopoverMenu};
-use settings::{Settings as _, SettingsStore, update_settings_file};
-use std::{
-    sync::atomic::Ordering,
-    sync::{Arc, atomic::AtomicBool},
-};
-use ui::{
-    DocumentationAside, DocumentationEdge, DocumentationSide, HighlightedLabel, KeyBinding,
-    LabelSize, ListItem, ListItemSpacing, PopoverMenuHandle, TintColor, Tooltip, prelude::*,
-};
-
-/// Trait for types that can provide and manage agent profiles
-pub trait ProfileProvider {
-    /// Get the current profile ID
-    fn profile_id(&self, cx: &App) -> AgentProfileId;
-
-    /// Set the profile ID
-    fn set_profile(&self, profile_id: AgentProfileId, cx: &mut App);
-
-    /// Check if profiles are supported in the current context (e.g. if the model that is selected has tool support)
-    fn profiles_supported(&self, cx: &App) -> bool;
-}
-
-pub struct ProfileSelector {
-    profiles: AvailableProfiles,
-    pending_refresh: bool,
-    fs: Arc<dyn Fs>,
-    provider: Arc<dyn ProfileProvider>,
-    picker: Option<Entity<Picker<ProfilePickerDelegate>>>,
-    picker_handle: PopoverMenuHandle<Picker<ProfilePickerDelegate>>,
-    focus_handle: FocusHandle,
-    _subscriptions: Vec<Subscription>,
-}
-
-impl ProfileSelector {
-    pub fn new(
-        fs: Arc<dyn Fs>,
-        provider: Arc<dyn ProfileProvider>,
-        focus_handle: FocusHandle,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let settings_subscription = cx.observe_global::<SettingsStore>(move |this, cx| {
-            this.pending_refresh = true;
-            cx.notify();
-        });
-
-        Self {
-            profiles: AgentProfile::available_profiles(cx),
-            pending_refresh: false,
-            fs,
-            provider,
-            picker: None,
-            picker_handle: PopoverMenuHandle::default(),
-            focus_handle,
-            _subscriptions: vec![settings_subscription],
-        }
-    }
-
-    pub fn menu_handle(&self) -> PopoverMenuHandle<Picker<ProfilePickerDelegate>> {
-        self.picker_handle.clone()
-    }
-
-    fn ensure_picker(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Entity<Picker<ProfilePickerDelegate>> {
-        if self.picker.is_none() {
-            let delegate = ProfilePickerDelegate::new(
-                self.fs.clone(),
-                self.provider.clone(),
-                self.profiles.clone(),
-                cx.background_executor().clone(),
-                self.focus_handle.clone(),
-                cx,
-            );
-
-            let picker = cx.new(|cx| {
-                Picker::list(delegate, window, cx)
-                    .show_scrollbar(true)
-                    .width(rems(18.))
-                    .max_height(Some(rems(20.).into()))
-            });
-
-            self.picker = Some(picker);
-        }
-
-        if self.pending_refresh {
-            if let Some(picker) = &self.picker {
-                let profiles = AgentProfile::available_profiles(cx);
-                self.profiles = profiles.clone();
-                picker.update(cx, |picker, cx| {
-                    let query = picker.query(cx);
-                    picker
-                        .delegate
-                        .refresh_profiles(profiles.clone(), query, cx);
-                });
-            }
-            self.pending_refresh = false;
-        }
-
-        self.picker.as_ref().unwrap().clone()
-    }
-}
-
-impl Focusable for ProfileSelector {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        if let Some(picker) = &self.picker {
-            picker.focus_handle(cx)
-        } else {
-            self.focus_handle.clone()
-        }
-    }
-}
-
-impl Render for ProfileSelector {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        if !self.provider.profiles_supported(cx) {
-            return Button::new("tools-not-supported-button", "Tools Unsupported")
-                .disabled(true)
-                .label_size(LabelSize::Small)
-                .color(Color::Muted)
-                .tooltip(Tooltip::text("This model does not support tools."))
-                .into_any_element();
-        }
-
-        let picker = self.ensure_picker(window, cx);
-
-        let settings = AgentSettings::get_global(cx);
-        let profile_id = self.provider.profile_id(cx);
-        let profile = settings.profiles.get(&profile_id);
-
-        let selected_profile = profile
-            .map(|profile| profile.name.clone())
-            .unwrap_or_else(|| "Unknown".into());
-        let focus_handle = self.focus_handle.clone();
-
-        let icon = if self.picker_handle.is_deployed() {
-            IconName::ChevronUp
-        } else {
-            IconName::ChevronDown
-        };
-
-        let trigger_button = Button::new("profile-selector", selected_profile)
-            .label_size(LabelSize::Small)
-            .color(Color::Muted)
-            .icon(icon)
-            .icon_size(IconSize::XSmall)
-            .icon_position(IconPosition::End)
-            .icon_color(Color::Muted)
-            .selected_style(ButtonStyle::Tinted(TintColor::Accent));
-
-        PickerPopoverMenu::new(
-            picker,
-            trigger_button,
-            move |_window, cx| {
-                Tooltip::for_action_in(
-                    "Toggle Profile Menu",
-                    &ToggleProfileSelector,
-                    &focus_handle,
-                    cx,
-                )
-            },
-            gpui::Corner::BottomRight,
-            cx,
-        )
-        .with_handle(self.picker_handle.clone())
-        .render(window, cx)
-        .into_any_element()
-    }
-}
-
-#[derive(Clone)]
-struct ProfileCandidate {
-    id: AgentProfileId,
-    name: SharedString,
-    is_builtin: bool,
-}
-
-#[derive(Clone)]
-struct ProfileMatchEntry {
-    candidate_index: usize,
-    positions: Vec<usize>,
-}
-
-enum ProfilePickerEntry {
-    Header(SharedString),
-    Profile(ProfileMatchEntry),
-}
-
-pub(crate) struct ProfilePickerDelegate {
-    fs: Arc<dyn Fs>,
-    provider: Arc<dyn ProfileProvider>,
-    background: BackgroundExecutor,
-    candidates: Vec<ProfileCandidate>,
-    string_candidates: Arc<Vec<StringMatchCandidate>>,
-    filtered_entries: Vec<ProfilePickerEntry>,
-    selected_index: usize,
-    query: String,
-    cancel: Option<Arc<AtomicBool>>,
-    focus_handle: FocusHandle,
-}
-
-impl ProfilePickerDelegate {
-    fn new(
-        fs: Arc<dyn Fs>,
-        provider: Arc<dyn ProfileProvider>,
-        profiles: AvailableProfiles,
-        background: BackgroundExecutor,
-        focus_handle: FocusHandle,
-        cx: &mut Context<ProfileSelector>,
-    ) -> Self {
-        let candidates = Self::candidates_from(profiles);
-        let string_candidates = Arc::new(Self::string_candidates(&candidates));
-        let filtered_entries = Self::entries_from_candidates(&candidates);
-
-        let mut this = Self {
-            fs,
-            provider,
-            background,
-            candidates,
-            string_candidates,
-            filtered_entries,
-            selected_index: 0,
-            query: String::new(),
-            cancel: None,
-            focus_handle,
-        };
-
-        this.selected_index = this
-            .index_of_profile(&this.provider.profile_id(cx))
-            .unwrap_or_else(|| this.first_selectable_index().unwrap_or(0));
-
-        this
-    }
-
-    fn refresh_profiles(
-        &mut self,
-        profiles: AvailableProfiles,
-        query: String,
-        cx: &mut Context<Picker<Self>>,
-    ) {
-        self.candidates = Self::candidates_from(profiles);
-        self.string_candidates = Arc::new(Self::string_candidates(&self.candidates));
-        self.query = query;
-
-        if self.query.is_empty() {
-            self.filtered_entries = Self::entries_from_candidates(&self.candidates);
-        } else {
-            let matches = self.search_blocking(&self.query);
-            self.filtered_entries = self.entries_from_matches(matches);
-        }
-
-        self.selected_index = self
-            .index_of_profile(&self.provider.profile_id(cx))
-            .unwrap_or_else(|| self.first_selectable_index().unwrap_or(0));
-        cx.notify();
-    }
-
-    fn candidates_from(profiles: AvailableProfiles) -> Vec<ProfileCandidate> {
-        profiles
-            .into_iter()
-            .map(|(id, name)| ProfileCandidate {
-                is_builtin: builtin_profiles::is_builtin(&id),
-                id,
-                name,
-            })
-            .collect()
-    }
-
-    fn string_candidates(candidates: &[ProfileCandidate]) -> Vec<StringMatchCandidate> {
-        candidates
-            .iter()
-            .enumerate()
-            .map(|(index, candidate)| StringMatchCandidate::new(index, candidate.name.as_ref()))
-            .collect()
-    }
-
-    fn documentation(candidate: &ProfileCandidate) -> Option<&'static str> {
-        match candidate.id.as_str() {
-            builtin_profiles::WRITE => Some("Get help to write anything."),
-            builtin_profiles::ASK => Some("Chat about your codebase."),
-            builtin_profiles::MINIMAL => Some("Chat about anything with no tools."),
-            _ => None,
-        }
-    }
-
-    fn entries_from_candidates(candidates: &[ProfileCandidate]) -> Vec<ProfilePickerEntry> {
-        let mut entries = Vec::new();
-        let mut inserted_custom_header = false;
-
-        for (idx, candidate) in candidates.iter().enumerate() {
-            if !candidate.is_builtin && !inserted_custom_header {
-                if !entries.is_empty() {
-                    entries.push(ProfilePickerEntry::Header("Custom Profiles".into()));
-                }
-                inserted_custom_header = true;
-            }
-
-            entries.push(ProfilePickerEntry::Profile(ProfileMatchEntry {
-                candidate_index: idx,
-                positions: Vec::new(),
-            }));
-        }
-
-        entries
-    }
-
-    fn entries_from_matches(&self, matches: Vec<StringMatch>) -> Vec<ProfilePickerEntry> {
-        let mut entries = Vec::new();
-        for mat in matches {
-            if self.candidates.get(mat.candidate_id).is_some() {
-                entries.push(ProfilePickerEntry::Profile(ProfileMatchEntry {
-                    candidate_index: mat.candidate_id,
-                    positions: mat.positions,
-                }));
-            }
-        }
-        entries
-    }
-
-    fn first_selectable_index(&self) -> Option<usize> {
-        self.filtered_entries
-            .iter()
-            .position(|entry| matches!(entry, ProfilePickerEntry::Profile(_)))
-    }
-
-    fn index_of_profile(&self, profile_id: &AgentProfileId) -> Option<usize> {
-        self.filtered_entries.iter().position(|entry| {
-            matches!(entry, ProfilePickerEntry::Profile(profile) if self
-                .candidates
-                .get(profile.candidate_index)
-                .map(|candidate| &candidate.id == profile_id)
-                .unwrap_or(false))
-        })
-    }
-
-    fn search_blocking(&self, query: &str) -> Vec<StringMatch> {
-        if query.is_empty() {
-            return self
-                .string_candidates
-                .iter()
-                .map(|candidate| StringMatch {
-                    candidate_id: candidate.id,
-                    score: 0.0,
-                    positions: Vec::new(),
-                    string: candidate.string.clone(),
-                })
-                .collect();
-        }
-
-        let cancel_flag = AtomicBool::new(false);
-
-        self.background.block(match_strings(
-            self.string_candidates.as_ref(),
-            query,
-            false,
-            true,
-            100,
-            &cancel_flag,
-            self.background.clone(),
-        ))
-    }
-}
-
-impl PickerDelegate for ProfilePickerDelegate {
-    type ListItem = AnyElement;
-
-    fn placeholder_text(&self, _: &mut Window, _: &mut App) -> Arc<str> {
-        "Search profiles…".into()
-    }
-
-    fn no_matches_text(&self, _window: &mut Window, _cx: &mut App) -> Option<SharedString> {
-        let text = if self.candidates.is_empty() {
-            "No profiles.".into()
-        } else {
-            "No profiles match your search.".into()
-        };
-        Some(text)
-    }
-
-    fn match_count(&self) -> usize {
-        self.filtered_entries.len()
-    }
-
-    fn selected_index(&self) -> usize {
-        self.selected_index
-    }
-
-    fn set_selected_index(&mut self, ix: usize, _: &mut Window, cx: &mut Context<Picker<Self>>) {
-        self.selected_index = ix.min(self.filtered_entries.len().saturating_sub(1));
-        cx.notify();
-    }
-
-    fn can_select(
-        &mut self,
-        ix: usize,
-        _window: &mut Window,
-        _cx: &mut Context<Picker<Self>>,
-    ) -> bool {
-        match self.filtered_entries.get(ix) {
-            Some(ProfilePickerEntry::Profile(_)) => true,
-            Some(ProfilePickerEntry::Header(_)) | None => false,
-        }
-    }
-
-    fn update_matches(
-        &mut self,
-        query: String,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Task<()> {
-        if query.is_empty() {
-            self.query.clear();
-            self.filtered_entries = Self::entries_from_candidates(&self.candidates);
-            self.selected_index = self
-                .index_of_profile(&self.provider.profile_id(cx))
-                .unwrap_or_else(|| self.first_selectable_index().unwrap_or(0));
-            cx.notify();
-            return Task::ready(());
-        }
-
-        if let Some(prev) = &self.cancel {
-            prev.store(true, Ordering::Relaxed);
-        }
-        let cancel = Arc::new(AtomicBool::new(false));
-        self.cancel = Some(cancel.clone());
-
-        let string_candidates = self.string_candidates.clone();
-        let background = self.background.clone();
-        let provider = self.provider.clone();
-        self.query = query.clone();
-
-        let cancel_for_future = cancel;
-
-        cx.spawn_in(window, async move |this, cx| {
-            let matches = match_strings(
-                string_candidates.as_ref(),
-                &query,
-                false,
-                true,
-                100,
-                cancel_for_future.as_ref(),
-                background,
-            )
-            .await;
-
-            this.update_in(cx, |this, _, cx| {
-                if this.delegate.query != query {
-                    return;
-                }
-
-                this.delegate.filtered_entries = this.delegate.entries_from_matches(matches);
-                this.delegate.selected_index = this
-                    .delegate
-                    .index_of_profile(&provider.profile_id(cx))
-                    .unwrap_or_else(|| this.delegate.first_selectable_index().unwrap_or(0));
-                cx.notify();
-            })
-            .ok();
-        })
-    }
-
-    fn confirm(&mut self, _: bool, _window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        match self.filtered_entries.get(self.selected_index) {
-            Some(ProfilePickerEntry::Profile(entry)) => {
-                if let Some(candidate) = self.candidates.get(entry.candidate_index) {
-                    let profile_id = candidate.id.clone();
-                    let fs = self.fs.clone();
-                    let provider = self.provider.clone();
-
-                    update_settings_file(fs, cx, {
-                        let profile_id = profile_id.clone();
-                        move |settings, _cx| {
-                            settings
-                                .agent
-                                .get_or_insert_default()
-                                .set_profile(profile_id.0);
-                        }
-                    });
-
-                    provider.set_profile(profile_id.clone(), cx);
-
-                    telemetry::event!(
-                        "agent_profile_switched",
-                        profile_id = profile_id.as_str(),
-                        source = "picker"
-                    );
-                }
-
-                cx.emit(DismissEvent);
-            }
-            _ => {}
-        }
-    }
-
-    fn dismissed(&mut self, window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        cx.defer_in(window, |picker, window, cx| {
-            picker.set_query("", window, cx);
-        });
-        cx.emit(DismissEvent);
-    }
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        _: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<Self::ListItem> {
-        match self.filtered_entries.get(ix)? {
-            ProfilePickerEntry::Header(label) => Some(
-                div()
-                    .px_2p5()
-                    .pb_0p5()
-                    .when(ix > 0, |this| {
-                        this.mt_1p5()
-                            .pt_2()
-                            .border_t_1()
-                            .border_color(cx.theme().colors().border_variant)
-                    })
-                    .child(
-                        Label::new(label.clone())
-                            .size(LabelSize::XSmall)
-                            .color(Color::Muted),
-                    )
-                    .into_any_element(),
-            ),
-            ProfilePickerEntry::Profile(entry) => {
-                let candidate = self.candidates.get(entry.candidate_index)?;
-                let active_id = self.provider.profile_id(cx);
-                let is_active = active_id == candidate.id;
-
-                Some(
-                    ListItem::new(candidate.id.0.clone())
-                        .inset(true)
-                        .spacing(ListItemSpacing::Sparse)
-                        .toggle_state(selected)
-                        .child(HighlightedLabel::new(
-                            candidate.name.clone(),
-                            entry.positions.clone(),
-                        ))
-                        .when(is_active, |this| {
-                            this.end_slot(
-                                div()
-                                    .pr_2()
-                                    .child(Icon::new(IconName::Check).color(Color::Accent)),
-                            )
-                        })
-                        .into_any_element(),
-                )
-            }
-        }
-    }
-
-    fn documentation_aside(
-        &self,
-        _window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<DocumentationAside> {
-        use std::rc::Rc;
-
-        let entry = match self.filtered_entries.get(self.selected_index)? {
-            ProfilePickerEntry::Profile(entry) => entry,
-            ProfilePickerEntry::Header(_) => return None,
-        };
-
-        let candidate = self.candidates.get(entry.candidate_index)?;
-        let docs_aside = Self::documentation(candidate)?.to_string();
-
-        let settings = AgentSettings::get_global(cx);
-        let side = match settings.dock {
-            settings::DockPosition::Left => DocumentationSide::Right,
-            settings::DockPosition::Bottom | settings::DockPosition::Right => {
-                DocumentationSide::Left
-            }
-        };
-
-        Some(DocumentationAside {
-            side,
-            edge: DocumentationEdge::Top,
-            render: Rc::new(move |_| Label::new(docs_aside.clone()).into_any_element()),
-        })
-    }
-
-    fn render_footer(
-        &self,
-        _: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<gpui::AnyElement> {
-        let focus_handle = self.focus_handle.clone();
-
-        Some(
-            h_flex()
-                .w_full()
-                .border_t_1()
-                .border_color(cx.theme().colors().border_variant)
-                .p_1p5()
-                .child(
-                    Button::new("configure", "Configure")
-                        .full_width()
-                        .style(ButtonStyle::Outlined)
-                        .key_binding(
-                            KeyBinding::for_action_in(
-                                &ManageProfiles::default(),
-                                &focus_handle,
-                                cx,
-                            )
-                            .map(|kb| kb.size(rems_from_px(12.))),
-                        )
-                        .on_click(|_, window, cx| {
-                            window.dispatch_action(ManageProfiles::default().boxed_clone(), cx);
-                        }),
-                )
-                .into_any(),
-        )
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use fs::FakeFs;
-    use gpui::TestAppContext;
-
-    #[gpui::test]
-    fn entries_include_custom_profiles(_cx: &mut TestAppContext) {
-        let candidates = vec![
-            ProfileCandidate {
-                id: AgentProfileId("write".into()),
-                name: SharedString::from("Write"),
-                is_builtin: true,
-            },
-            ProfileCandidate {
-                id: AgentProfileId("my-custom".into()),
-                name: SharedString::from("My Custom"),
-                is_builtin: false,
-            },
-        ];
-
-        let entries = ProfilePickerDelegate::entries_from_candidates(&candidates);
-
-        assert!(entries.iter().any(|entry| matches!(
-            entry,
-            ProfilePickerEntry::Profile(profile)
-                if candidates[profile.candidate_index].id.as_str() == "my-custom"
-        )));
-        assert!(entries.iter().any(|entry| matches!(
-            entry,
-            ProfilePickerEntry::Header(label) if label.as_ref() == "Custom Profiles"
-        )));
-    }
-
-    #[gpui::test]
-    fn fuzzy_filter_returns_no_results_and_keeps_configure(cx: &mut TestAppContext) {
-        let candidates = vec![ProfileCandidate {
-            id: AgentProfileId("write".into()),
-            name: SharedString::from("Write"),
-            is_builtin: true,
-        }];
-
-        cx.update(|cx| {
-            let focus_handle = cx.focus_handle();
-
-            let delegate = ProfilePickerDelegate {
-                fs: FakeFs::new(cx.background_executor().clone()),
-                provider: Arc::new(TestProfileProvider::new(AgentProfileId("write".into()))),
-                background: cx.background_executor().clone(),
-                candidates,
-                string_candidates: Arc::new(Vec::new()),
-                filtered_entries: Vec::new(),
-                selected_index: 0,
-                query: String::new(),
-                cancel: None,
-                focus_handle,
-            };
-
-            let matches = Vec::new(); // No matches
-            let _entries = delegate.entries_from_matches(matches);
-        });
-    }
-
-    #[gpui::test]
-    fn active_profile_selection_logic_works(cx: &mut TestAppContext) {
-        let candidates = vec![
-            ProfileCandidate {
-                id: AgentProfileId("write".into()),
-                name: SharedString::from("Write"),
-                is_builtin: true,
-            },
-            ProfileCandidate {
-                id: AgentProfileId("ask".into()),
-                name: SharedString::from("Ask"),
-                is_builtin: true,
-            },
-        ];
-
-        cx.update(|cx| {
-            let focus_handle = cx.focus_handle();
-
-            let delegate = ProfilePickerDelegate {
-                fs: FakeFs::new(cx.background_executor().clone()),
-                provider: Arc::new(TestProfileProvider::new(AgentProfileId("write".into()))),
-                background: cx.background_executor().clone(),
-                candidates,
-                string_candidates: Arc::new(Vec::new()),
-                filtered_entries: vec![
-                    ProfilePickerEntry::Profile(ProfileMatchEntry {
-                        candidate_index: 0,
-                        positions: Vec::new(),
-                    }),
-                    ProfilePickerEntry::Profile(ProfileMatchEntry {
-                        candidate_index: 1,
-                        positions: Vec::new(),
-                    }),
-                ],
-                selected_index: 0,
-                query: String::new(),
-                cancel: None,
-                focus_handle,
-            };
-
-            // Active profile should be found at index 0
-            let active_index = delegate.index_of_profile(&AgentProfileId("write".into()));
-            assert_eq!(active_index, Some(0));
-        });
-    }
-
-    struct TestProfileProvider {
-        profile_id: AgentProfileId,
-    }
-
-    impl TestProfileProvider {
-        fn new(profile_id: AgentProfileId) -> Self {
-            Self { profile_id }
-        }
-    }
-
-    impl ProfileProvider for TestProfileProvider {
-        fn profile_id(&self, _cx: &App) -> AgentProfileId {
-            self.profile_id.clone()
-        }
-
-        fn set_profile(&self, _profile_id: AgentProfileId, _cx: &mut App) {}
-
-        fn profiles_supported(&self, _cx: &App) -> bool {
-            true
-        }
-    }
-}
diff --git a/crates/agent_ui/src/slash_command.rs b/crates/agent_ui/src/slash_command.rs
deleted file mode 100644
index e328ef6725..0000000000
--- a/crates/agent_ui/src/slash_command.rs
+++ /dev/null
@@ -1,360 +0,0 @@
-use crate::text_thread_editor::TextThreadEditor;
-use anyhow::Result;
-pub use assistant_slash_command::SlashCommand;
-use assistant_slash_command::{AfterCompletion, SlashCommandLine, SlashCommandWorkingSet};
-use editor::{CompletionProvider, Editor, ExcerptId};
-use fuzzy::{StringMatchCandidate, match_strings};
-use gpui::{App, AppContext as _, Context, Entity, Task, WeakEntity, Window};
-use language::{Anchor, Buffer, ToPoint};
-use parking_lot::Mutex;
-use project::{
-    CompletionDisplayOptions, CompletionIntent, CompletionSource,
-    lsp_store::CompletionDocumentation,
-};
-use rope::Point;
-use std::{
-    ops::Range,
-    sync::{
-        Arc,
-        atomic::{AtomicBool, Ordering::SeqCst},
-    },
-};
-use workspace::Workspace;
-
-pub struct SlashCommandCompletionProvider {
-    cancel_flag: Mutex<Arc<AtomicBool>>,
-    slash_commands: Arc<SlashCommandWorkingSet>,
-    editor: Option<WeakEntity<TextThreadEditor>>,
-    workspace: Option<WeakEntity<Workspace>>,
-}
-
-impl SlashCommandCompletionProvider {
-    pub fn new(
-        slash_commands: Arc<SlashCommandWorkingSet>,
-        editor: Option<WeakEntity<TextThreadEditor>>,
-        workspace: Option<WeakEntity<Workspace>>,
-    ) -> Self {
-        Self {
-            cancel_flag: Mutex::new(Arc::new(AtomicBool::new(false))),
-            slash_commands,
-            editor,
-            workspace,
-        }
-    }
-
-    fn complete_command_name(
-        &self,
-        command_name: &str,
-        command_range: Range<Anchor>,
-        name_range: Range<Anchor>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<Vec<project::CompletionResponse>>> {
-        let slash_commands = self.slash_commands.clone();
-        let candidates = slash_commands
-            .command_names(cx)
-            .into_iter()
-            .enumerate()
-            .map(|(ix, def)| StringMatchCandidate::new(ix, &def))
-            .collect::<Vec<_>>();
-        let command_name = command_name.to_string();
-        let editor = self.editor.clone();
-        let workspace = self.workspace.clone();
-        window.spawn(cx, async move |cx| {
-            let matches = match_strings(
-                &candidates,
-                &command_name,
-                true,
-                true,
-                usize::MAX,
-                &Default::default(),
-                cx.background_executor().clone(),
-            )
-            .await;
-
-            cx.update(|_, cx| {
-                let completions = matches
-                    .into_iter()
-                    .filter_map(|mat| {
-                        let command = slash_commands.command(&mat.string, cx)?;
-                        let mut new_text = mat.string.clone();
-                        let requires_argument = command.requires_argument();
-                        let accepts_arguments = command.accepts_arguments();
-                        if requires_argument || accepts_arguments {
-                            new_text.push(' ');
-                        }
-
-                        let confirm =
-                            editor
-                                .clone()
-                                .zip(workspace.clone())
-                                .map(|(editor, workspace)| {
-                                    let command_name = mat.string.clone();
-                                    let command_range = command_range.clone();
-                                    Arc::new(
-                                            move |intent: CompletionIntent,
-                                            window: &mut Window,
-                                            cx: &mut App| {
-                                                if !requires_argument
-                                                && (!accepts_arguments || intent.is_complete())
-                                                {
-                                                    editor
-                                                        .update(cx, |editor, cx| {
-                                                            editor.run_command(
-                                                                command_range.clone(),
-                                                                &command_name,
-                                                                &[],
-                                                                true,
-                                                                workspace.clone(),
-                                                                window,
-                                                                cx,
-                                                            );
-                                                        })
-                                                        .ok();
-                                                    false
-                                                } else {
-                                                    requires_argument || accepts_arguments
-                                                }
-                                            },
-                                        ) as Arc<_>
-                                });
-
-                        Some(project::Completion {
-                            replace_range: name_range.clone(),
-                            documentation: Some(CompletionDocumentation::SingleLine(
-                                command.description().into(),
-                            )),
-                            new_text,
-                            label: command.label(cx),
-                            icon_path: None,
-                            match_start: None,
-                            snippet_deduplication_key: None,
-                            insert_text_mode: None,
-                            confirm,
-                            source: CompletionSource::Custom,
-                        })
-                    })
-                    .collect();
-
-                vec![project::CompletionResponse {
-                    completions,
-                    display_options: CompletionDisplayOptions::default(),
-                    is_incomplete: false,
-                }]
-            })
-        })
-    }
-
-    fn complete_command_argument(
-        &self,
-        command_name: &str,
-        arguments: &[String],
-        command_range: Range<Anchor>,
-        argument_range: Range<Anchor>,
-        last_argument_range: Range<Anchor>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<Vec<project::CompletionResponse>>> {
-        let new_cancel_flag = Arc::new(AtomicBool::new(false));
-        let mut flag = self.cancel_flag.lock();
-        flag.store(true, SeqCst);
-        *flag = new_cancel_flag.clone();
-        if let Some(command) = self.slash_commands.command(command_name, cx) {
-            let completions = command.complete_argument(
-                arguments,
-                new_cancel_flag,
-                self.workspace.clone(),
-                window,
-                cx,
-            );
-            let command_name: Arc<str> = command_name.into();
-            let editor = self.editor.clone();
-            let workspace = self.workspace.clone();
-            let arguments = arguments.to_vec();
-            cx.background_spawn(async move {
-                let completions = completions
-                    .await?
-                    .into_iter()
-                    .map(|new_argument| {
-                        let confirm =
-                            editor
-                                .clone()
-                                .zip(workspace.clone())
-                                .map(|(editor, workspace)| {
-                                    Arc::new({
-                                        let mut completed_arguments = arguments.clone();
-                                        if new_argument.replace_previous_arguments {
-                                            completed_arguments.clear();
-                                        } else {
-                                            completed_arguments.pop();
-                                        }
-                                        completed_arguments.push(new_argument.new_text.clone());
-
-                                        let command_range = command_range.clone();
-                                        let command_name = command_name.clone();
-                                        move |intent: CompletionIntent,
-                                              window: &mut Window,
-                                              cx: &mut App| {
-                                            if new_argument.after_completion.run()
-                                                || intent.is_complete()
-                                            {
-                                                editor
-                                                    .update(cx, |editor, cx| {
-                                                        editor.run_command(
-                                                            command_range.clone(),
-                                                            &command_name,
-                                                            &completed_arguments,
-                                                            true,
-                                                            workspace.clone(),
-                                                            window,
-                                                            cx,
-                                                        );
-                                                    })
-                                                    .ok();
-                                                false
-                                            } else {
-                                                !new_argument.after_completion.run()
-                                            }
-                                        }
-                                    }) as Arc<_>
-                                });
-
-                        let mut new_text = new_argument.new_text.clone();
-                        if new_argument.after_completion == AfterCompletion::Continue {
-                            new_text.push(' ');
-                        }
-
-                        project::Completion {
-                            replace_range: if new_argument.replace_previous_arguments {
-                                argument_range.clone()
-                            } else {
-                                last_argument_range.clone()
-                            },
-                            label: new_argument.label,
-                            icon_path: None,
-                            new_text,
-                            documentation: None,
-                            match_start: None,
-                            snippet_deduplication_key: None,
-                            confirm,
-                            insert_text_mode: None,
-                            source: CompletionSource::Custom,
-                        }
-                    })
-                    .collect();
-
-                Ok(vec![project::CompletionResponse {
-                    completions,
-                    display_options: CompletionDisplayOptions::default(),
-                    // TODO: Could have slash commands indicate whether their completions are incomplete.
-                    is_incomplete: true,
-                }])
-            })
-        } else {
-            Task::ready(Ok(vec![project::CompletionResponse {
-                completions: Vec::new(),
-                display_options: CompletionDisplayOptions::default(),
-                is_incomplete: true,
-            }]))
-        }
-    }
-}
-
-impl CompletionProvider for SlashCommandCompletionProvider {
-    fn completions(
-        &self,
-        _excerpt_id: ExcerptId,
-        buffer: &Entity<Buffer>,
-        buffer_position: Anchor,
-        _: editor::CompletionContext,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) -> Task<Result<Vec<project::CompletionResponse>>> {
-        let Some((name, arguments, command_range, last_argument_range)) =
-            buffer.update(cx, |buffer, _cx| {
-                let position = buffer_position.to_point(buffer);
-                let line_start = Point::new(position.row, 0);
-                let mut lines = buffer.text_for_range(line_start..position).lines();
-                let line = lines.next()?;
-                let call = SlashCommandLine::parse(line)?;
-
-                let command_range_start = Point::new(position.row, call.name.start as u32 - 1);
-                let command_range_end = Point::new(
-                    position.row,
-                    call.arguments.last().map_or(call.name.end, |arg| arg.end) as u32,
-                );
-                let command_range = buffer.anchor_before(command_range_start)
-                    ..buffer.anchor_after(command_range_end);
-
-                let name = line[call.name.clone()].to_string();
-                let (arguments, last_argument_range) = if let Some(argument) = call.arguments.last()
-                {
-                    let last_arg_start =
-                        buffer.anchor_before(Point::new(position.row, argument.start as u32));
-                    let first_arg_start = call.arguments.first().expect("we have the last element");
-                    let first_arg_start = buffer
-                        .anchor_before(Point::new(position.row, first_arg_start.start as u32));
-                    let arguments = call
-                        .arguments
-                        .into_iter()
-                        .filter_map(|argument| Some(line.get(argument)?.to_string()))
-                        .collect::<Vec<_>>();
-                    let argument_range = first_arg_start..buffer_position;
-                    (
-                        Some((arguments, argument_range)),
-                        last_arg_start..buffer_position,
-                    )
-                } else {
-                    let start =
-                        buffer.anchor_before(Point::new(position.row, call.name.start as u32));
-                    (None, start..buffer_position)
-                };
-
-                Some((name, arguments, command_range, last_argument_range))
-            })
-        else {
-            return Task::ready(Ok(vec![project::CompletionResponse {
-                completions: Vec::new(),
-                display_options: CompletionDisplayOptions::default(),
-                is_incomplete: false,
-            }]));
-        };
-
-        if let Some((arguments, argument_range)) = arguments {
-            self.complete_command_argument(
-                &name,
-                &arguments,
-                command_range,
-                argument_range,
-                last_argument_range,
-                window,
-                cx,
-            )
-        } else {
-            self.complete_command_name(&name, command_range, last_argument_range, window, cx)
-        }
-    }
-
-    fn is_completion_trigger(
-        &self,
-        buffer: &Entity<Buffer>,
-        position: language::Anchor,
-        _text: &str,
-        _trigger_in_words: bool,
-        cx: &mut Context<Editor>,
-    ) -> bool {
-        let buffer = buffer.read(cx);
-        let position = position.to_point(buffer);
-        let line_start = Point::new(position.row, 0);
-        let mut lines = buffer.text_for_range(line_start..position).lines();
-        if let Some(line) = lines.next() {
-            SlashCommandLine::parse(line).is_some()
-        } else {
-            false
-        }
-    }
-
-    fn sort_completions(&self) -> bool {
-        false
-    }
-}
diff --git a/crates/agent_ui/src/slash_command_picker.rs b/crates/agent_ui/src/slash_command_picker.rs
deleted file mode 100644
index 0c3cf37599..0000000000
--- a/crates/agent_ui/src/slash_command_picker.rs
+++ /dev/null
@@ -1,348 +0,0 @@
-use crate::text_thread_editor::TextThreadEditor;
-use assistant_slash_command::SlashCommandWorkingSet;
-use gpui::{AnyElement, AnyView, DismissEvent, SharedString, Task, WeakEntity};
-use picker::{Picker, PickerDelegate, PickerEditorPosition};
-use std::sync::Arc;
-use ui::{ListItem, ListItemSpacing, PopoverMenu, PopoverTrigger, Tooltip, prelude::*};
-
-#[derive(IntoElement)]
-pub(super) struct SlashCommandSelector<T, TT>
-where
-    T: PopoverTrigger + ButtonCommon,
-    TT: Fn(&mut Window, &mut App) -> AnyView + 'static,
-{
-    working_set: Arc<SlashCommandWorkingSet>,
-    active_context_editor: WeakEntity<TextThreadEditor>,
-    trigger: T,
-    tooltip: TT,
-}
-
-#[derive(Clone)]
-struct SlashCommandInfo {
-    name: SharedString,
-    description: SharedString,
-    args: Option<SharedString>,
-    icon: IconName,
-}
-
-#[derive(Clone)]
-enum SlashCommandEntry {
-    Info(SlashCommandInfo),
-    Advert {
-        name: SharedString,
-        renderer: fn(&mut Window, &mut App) -> AnyElement,
-        on_confirm: fn(&mut Window, &mut App),
-    },
-}
-
-impl AsRef<str> for SlashCommandEntry {
-    fn as_ref(&self) -> &str {
-        match self {
-            SlashCommandEntry::Info(SlashCommandInfo { name, .. })
-            | SlashCommandEntry::Advert { name, .. } => name,
-        }
-    }
-}
-
-pub(crate) struct SlashCommandDelegate {
-    all_commands: Vec<SlashCommandEntry>,
-    filtered_commands: Vec<SlashCommandEntry>,
-    active_context_editor: WeakEntity<TextThreadEditor>,
-    selected_index: usize,
-}
-
-impl<T, TT> SlashCommandSelector<T, TT>
-where
-    T: PopoverTrigger + ButtonCommon,
-    TT: Fn(&mut Window, &mut App) -> AnyView + 'static,
-{
-    pub(crate) fn new(
-        working_set: Arc<SlashCommandWorkingSet>,
-        active_context_editor: WeakEntity<TextThreadEditor>,
-        trigger: T,
-        tooltip: TT,
-    ) -> Self {
-        SlashCommandSelector {
-            working_set,
-            active_context_editor,
-            trigger,
-            tooltip,
-        }
-    }
-}
-
-impl PickerDelegate for SlashCommandDelegate {
-    type ListItem = ListItem;
-
-    fn match_count(&self) -> usize {
-        self.filtered_commands.len()
-    }
-
-    fn selected_index(&self) -> usize {
-        self.selected_index
-    }
-
-    fn set_selected_index(&mut self, ix: usize, _: &mut Window, cx: &mut Context<Picker<Self>>) {
-        self.selected_index = ix.min(self.filtered_commands.len().saturating_sub(1));
-        cx.notify();
-    }
-
-    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
-        "Select a command...".into()
-    }
-
-    fn update_matches(
-        &mut self,
-        query: String,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Task<()> {
-        let all_commands = self.all_commands.clone();
-        cx.spawn_in(window, async move |this, cx| {
-            let filtered_commands = cx
-                .background_spawn(async move {
-                    if query.is_empty() {
-                        all_commands
-                    } else {
-                        all_commands
-                            .into_iter()
-                            .filter(|model_info| {
-                                model_info
-                                    .as_ref()
-                                    .to_lowercase()
-                                    .contains(&query.to_lowercase())
-                            })
-                            .collect()
-                    }
-                })
-                .await;
-
-            this.update_in(cx, |this, window, cx| {
-                this.delegate.filtered_commands = filtered_commands;
-                this.delegate.set_selected_index(0, window, cx);
-                cx.notify();
-            })
-            .ok();
-        })
-    }
-
-    fn separators_after_indices(&self) -> Vec<usize> {
-        let mut ret = vec![];
-        let mut previous_is_advert = false;
-
-        for (index, command) in self.filtered_commands.iter().enumerate() {
-            if previous_is_advert {
-                if let SlashCommandEntry::Info(_) = command {
-                    previous_is_advert = false;
-                    debug_assert_ne!(
-                        index, 0,
-                        "index cannot be zero, as we can never have a separator at 0th position"
-                    );
-                    ret.push(index - 1);
-                }
-            } else if let SlashCommandEntry::Advert { .. } = command {
-                previous_is_advert = true;
-                if index != 0 {
-                    ret.push(index - 1);
-                }
-            }
-        }
-        ret
-    }
-
-    fn confirm(&mut self, _secondary: bool, window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        if let Some(command) = self.filtered_commands.get(self.selected_index) {
-            match command {
-                SlashCommandEntry::Info(info) => {
-                    self.active_context_editor
-                        .update(cx, |text_thread_editor, cx| {
-                            text_thread_editor.insert_command(&info.name, window, cx)
-                        })
-                        .ok();
-                }
-                SlashCommandEntry::Advert { on_confirm, .. } => {
-                    on_confirm(window, cx);
-                }
-            }
-            cx.emit(DismissEvent);
-        }
-    }
-
-    fn dismissed(&mut self, _window: &mut Window, _cx: &mut Context<Picker<Self>>) {}
-
-    fn editor_position(&self) -> PickerEditorPosition {
-        PickerEditorPosition::End
-    }
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<Self::ListItem> {
-        let command_info = self.filtered_commands.get(ix)?;
-
-        match command_info {
-            SlashCommandEntry::Info(info) => Some(
-                ListItem::new(ix)
-                    .inset(true)
-                    .spacing(ListItemSpacing::Dense)
-                    .toggle_state(selected)
-                    .tooltip({
-                        let description = info.description.clone();
-                        move |_, cx| cx.new(|_| Tooltip::new(description.clone())).into()
-                    })
-                    .child(
-                        v_flex()
-                            .group(format!("command-entry-label-{ix}"))
-                            .w_full()
-                            .py_0p5()
-                            .min_w(px(250.))
-                            .max_w(px(400.))
-                            .child(
-                                h_flex()
-                                    .gap_1p5()
-                                    .child(
-                                        Icon::new(info.icon)
-                                            .size(IconSize::XSmall)
-                                            .color(Color::Muted),
-                                    )
-                                    .child({
-                                        let mut label = format!("{}", info.name);
-                                        if let Some(args) = info.args.as_ref().filter(|_| selected)
-                                        {
-                                            label.push_str(args);
-                                        }
-                                        Label::new(label)
-                                            .single_line()
-                                            .size(LabelSize::Small)
-                                            .buffer_font(cx)
-                                    })
-                                    .children(info.args.clone().filter(|_| !selected).map(
-                                        |args| {
-                                            div()
-                                                .child(
-                                                    Label::new(args)
-                                                        .single_line()
-                                                        .size(LabelSize::Small)
-                                                        .color(Color::Muted)
-                                                        .buffer_font(cx),
-                                                )
-                                                .visible_on_hover(format!(
-                                                    "command-entry-label-{ix}"
-                                                ))
-                                        },
-                                    )),
-                            )
-                            .child(
-                                Label::new(info.description.clone())
-                                    .size(LabelSize::Small)
-                                    .color(Color::Muted)
-                                    .truncate(),
-                            ),
-                    ),
-            ),
-            SlashCommandEntry::Advert { renderer, .. } => Some(
-                ListItem::new(ix)
-                    .inset(true)
-                    .spacing(ListItemSpacing::Dense)
-                    .toggle_state(selected)
-                    .child(renderer(window, cx)),
-            ),
-        }
-    }
-}
-
-impl<T, TT> RenderOnce for SlashCommandSelector<T, TT>
-where
-    T: PopoverTrigger + ButtonCommon,
-    TT: Fn(&mut Window, &mut App) -> AnyView + 'static,
-{
-    fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let all_models = self
-            .working_set
-            .featured_command_names(cx)
-            .into_iter()
-            .filter_map(|command_name| {
-                let command = self.working_set.command(&command_name, cx)?;
-                let menu_text = SharedString::from(Arc::from(command.menu_text()));
-                let label = command.label(cx);
-                let args = label.filter_range.end.ne(&label.text.len()).then(|| {
-                    SharedString::from(
-                        label.text[label.filter_range.end..label.text.len()].to_owned(),
-                    )
-                });
-                Some(SlashCommandEntry::Info(SlashCommandInfo {
-                    name: command_name.into(),
-                    description: menu_text,
-                    args,
-                    icon: command.icon(),
-                }))
-            })
-            .chain([SlashCommandEntry::Advert {
-                name: "create-your-command".into(),
-                renderer: |_, cx| {
-                    v_flex()
-                        .w_full()
-                        .child(
-                            h_flex()
-                                .w_full()
-                                .font_buffer(cx)
-                                .items_center()
-                                .justify_between()
-                                .child(
-                                    h_flex()
-                                        .items_center()
-                                        .gap_1p5()
-                                        .child(Icon::new(IconName::Plus).size(IconSize::XSmall))
-                                        .child(
-                                            Label::new("create-your-command")
-                                                .size(LabelSize::Small)
-                                                .buffer_font(cx),
-                                        ),
-                                )
-                                .child(
-                                    Icon::new(IconName::ArrowUpRight)
-                                        .size(IconSize::Small)
-                                        .color(Color::Muted),
-                                ),
-                        )
-                        .child(
-                            Label::new("Create your custom command")
-                                .size(LabelSize::Small)
-                                .color(Color::Muted),
-                        )
-                        .into_any_element()
-                },
-                on_confirm: |_, cx| cx.open_url("https://zed.dev/docs/extensions/slash-commands"),
-            }])
-            .collect::<Vec<_>>();
-
-        let delegate = SlashCommandDelegate {
-            all_commands: all_models.clone(),
-            active_context_editor: self.active_context_editor.clone(),
-            filtered_commands: all_models,
-            selected_index: 0,
-        };
-
-        let picker_view = cx.new(|cx| {
-            Picker::uniform_list(delegate, window, cx).max_height(Some(rems(20.).into()))
-        });
-
-        let handle = self
-            .active_context_editor
-            .read_with(cx, |this, _| this.slash_menu_handle.clone())
-            .ok();
-        PopoverMenu::new("model-switcher")
-            .menu(move |_window, _cx| Some(picker_view.clone()))
-            .trigger_with_tooltip(self.trigger, self.tooltip)
-            .attach(gpui::Corner::TopLeft)
-            .anchor(gpui::Corner::BottomLeft)
-            .offset(gpui::Point {
-                x: px(0.0),
-                y: px(-2.0),
-            })
-            .when_some(handle, |this, handle| this.with_handle(handle))
-    }
-}
diff --git a/crates/agent_ui/src/terminal_codegen.rs b/crates/agent_ui/src/terminal_codegen.rs
deleted file mode 100644
index cc99471f7f..0000000000
--- a/crates/agent_ui/src/terminal_codegen.rs
+++ /dev/null
@@ -1,210 +0,0 @@
-use crate::inline_prompt_editor::CodegenStatus;
-use client::telemetry::Telemetry;
-use futures::{SinkExt, StreamExt, channel::mpsc};
-use gpui::{App, AppContext as _, Context, Entity, EventEmitter, Task};
-use language_model::{
-    ConfiguredModel, LanguageModelRegistry, LanguageModelRequest, report_assistant_event,
-};
-use std::{sync::Arc, time::Instant};
-use telemetry_events::{AssistantEventData, AssistantKind, AssistantPhase};
-use terminal::Terminal;
-
-pub struct TerminalCodegen {
-    pub status: CodegenStatus,
-    pub telemetry: Option<Arc<Telemetry>>,
-    terminal: Entity<Terminal>,
-    generation: Task<()>,
-    pub message_id: Option<String>,
-    transaction: Option<TerminalTransaction>,
-}
-
-impl EventEmitter<CodegenEvent> for TerminalCodegen {}
-
-impl TerminalCodegen {
-    pub fn new(terminal: Entity<Terminal>, telemetry: Option<Arc<Telemetry>>) -> Self {
-        Self {
-            terminal,
-            telemetry,
-            status: CodegenStatus::Idle,
-            generation: Task::ready(()),
-            message_id: None,
-            transaction: None,
-        }
-    }
-
-    pub fn start(&mut self, prompt_task: Task<LanguageModelRequest>, cx: &mut Context<Self>) {
-        let Some(ConfiguredModel { model, .. }) =
-            LanguageModelRegistry::read_global(cx).inline_assistant_model()
-        else {
-            return;
-        };
-
-        let model_api_key = model.api_key(cx);
-        let http_client = cx.http_client();
-        let telemetry = self.telemetry.clone();
-        self.status = CodegenStatus::Pending;
-        self.transaction = Some(TerminalTransaction::start(self.terminal.clone()));
-        self.generation = cx.spawn(async move |this, cx| {
-            let prompt = prompt_task.await;
-            let model_telemetry_id = model.telemetry_id();
-            let model_provider_id = model.provider_id();
-            let response = model.stream_completion_text(prompt, cx).await;
-            let generate = async {
-                let message_id = response
-                    .as_ref()
-                    .ok()
-                    .and_then(|response| response.message_id.clone());
-
-                let (mut hunks_tx, mut hunks_rx) = mpsc::channel(1);
-
-                let task = cx.background_spawn({
-                    let message_id = message_id.clone();
-                    let executor = cx.background_executor().clone();
-                    async move {
-                        let mut response_latency = None;
-                        let request_start = Instant::now();
-                        let task = async {
-                            let mut chunks = response?.stream;
-                            while let Some(chunk) = chunks.next().await {
-                                if response_latency.is_none() {
-                                    response_latency = Some(request_start.elapsed());
-                                }
-                                let chunk = chunk?;
-                                hunks_tx.send(chunk).await?;
-                            }
-
-                            anyhow::Ok(())
-                        };
-
-                        let result = task.await;
-
-                        let error_message = result.as_ref().err().map(|error| error.to_string());
-                        report_assistant_event(
-                            AssistantEventData {
-                                conversation_id: None,
-                                kind: AssistantKind::InlineTerminal,
-                                message_id,
-                                phase: AssistantPhase::Response,
-                                model: model_telemetry_id,
-                                model_provider: model_provider_id.to_string(),
-                                response_latency,
-                                error_message,
-                                language_name: None,
-                            },
-                            telemetry,
-                            http_client,
-                            model_api_key,
-                            &executor,
-                        );
-
-                        result?;
-                        anyhow::Ok(())
-                    }
-                });
-
-                this.update(cx, |this, _| {
-                    this.message_id = message_id;
-                })?;
-
-                while let Some(hunk) = hunks_rx.next().await {
-                    this.update(cx, |this, cx| {
-                        if let Some(transaction) = &mut this.transaction {
-                            transaction.push(hunk, cx);
-                            cx.notify();
-                        }
-                    })?;
-                }
-
-                task.await?;
-                anyhow::Ok(())
-            };
-
-            let result = generate.await;
-
-            this.update(cx, |this, cx| {
-                if let Err(error) = result {
-                    this.status = CodegenStatus::Error(error);
-                } else {
-                    this.status = CodegenStatus::Done;
-                }
-                cx.emit(CodegenEvent::Finished);
-                cx.notify();
-            })
-            .ok();
-        });
-        cx.notify();
-    }
-
-    pub fn completion(&self) -> Option<String> {
-        self.transaction
-            .as_ref()
-            .map(|transaction| transaction.completion.clone())
-    }
-
-    pub fn stop(&mut self, cx: &mut Context<Self>) {
-        self.status = CodegenStatus::Done;
-        self.generation = Task::ready(());
-        cx.emit(CodegenEvent::Finished);
-        cx.notify();
-    }
-
-    pub fn complete(&mut self, cx: &mut Context<Self>) {
-        if let Some(transaction) = self.transaction.take() {
-            transaction.complete(cx);
-        }
-    }
-
-    pub fn undo(&mut self, cx: &mut Context<Self>) {
-        if let Some(transaction) = self.transaction.take() {
-            transaction.undo(cx);
-        }
-    }
-}
-
-#[derive(Copy, Clone, Debug)]
-pub enum CodegenEvent {
-    Finished,
-}
-
-#[cfg(not(target_os = "windows"))]
-pub const CLEAR_INPUT: &str = "\x15";
-#[cfg(target_os = "windows")]
-pub const CLEAR_INPUT: &str = "\x03";
-const CARRIAGE_RETURN: &str = "\x0d";
-
-struct TerminalTransaction {
-    completion: String,
-    terminal: Entity<Terminal>,
-}
-
-impl TerminalTransaction {
-    pub fn start(terminal: Entity<Terminal>) -> Self {
-        Self {
-            completion: String::new(),
-            terminal,
-        }
-    }
-
-    pub fn push(&mut self, hunk: String, cx: &mut App) {
-        // Ensure that the assistant cannot accidentally execute commands that are streamed into the terminal
-        let input = Self::sanitize_input(hunk);
-        self.completion.push_str(&input);
-        self.terminal
-            .update(cx, |terminal, _| terminal.input(input.into_bytes()));
-    }
-
-    pub fn undo(self, cx: &mut App) {
-        self.terminal
-            .update(cx, |terminal, _| terminal.input(CLEAR_INPUT.as_bytes()));
-    }
-
-    pub fn complete(self, cx: &mut App) {
-        self.terminal
-            .update(cx, |terminal, _| terminal.input(CARRIAGE_RETURN.as_bytes()));
-    }
-
-    fn sanitize_input(mut input: String) -> String {
-        input.retain(|c| c != '\r' && c != '\n');
-        input
-    }
-}
diff --git a/crates/agent_ui/src/terminal_inline_assistant.rs b/crates/agent_ui/src/terminal_inline_assistant.rs
deleted file mode 100644
index 43ea697bec..0000000000
--- a/crates/agent_ui/src/terminal_inline_assistant.rs
+++ /dev/null
@@ -1,456 +0,0 @@
-use crate::{
-    context::load_context,
-    inline_prompt_editor::{
-        CodegenStatus, PromptEditor, PromptEditorEvent, TerminalInlineAssistId,
-    },
-    terminal_codegen::{CLEAR_INPUT, CodegenEvent, TerminalCodegen},
-};
-use agent::HistoryStore;
-use agent_settings::AgentSettings;
-use anyhow::{Context as _, Result};
-use client::telemetry::Telemetry;
-use cloud_llm_client::CompletionIntent;
-use collections::{HashMap, VecDeque};
-use editor::{MultiBuffer, actions::SelectAll};
-use fs::Fs;
-use gpui::{App, Entity, Focusable, Global, Subscription, Task, UpdateGlobal, WeakEntity};
-use language::Buffer;
-use language_model::{
-    ConfiguredModel, LanguageModelRegistry, LanguageModelRequest, LanguageModelRequestMessage,
-    Role, report_assistant_event,
-};
-use project::Project;
-use prompt_store::{PromptBuilder, PromptStore};
-use std::sync::Arc;
-use telemetry_events::{AssistantEventData, AssistantKind, AssistantPhase};
-use terminal_view::TerminalView;
-use ui::prelude::*;
-use util::ResultExt;
-use workspace::{Toast, Workspace, notifications::NotificationId};
-
-pub fn init(
-    fs: Arc<dyn Fs>,
-    prompt_builder: Arc<PromptBuilder>,
-    telemetry: Arc<Telemetry>,
-    cx: &mut App,
-) {
-    cx.set_global(TerminalInlineAssistant::new(fs, prompt_builder, telemetry));
-}
-
-const DEFAULT_CONTEXT_LINES: usize = 50;
-const PROMPT_HISTORY_MAX_LEN: usize = 20;
-
-pub struct TerminalInlineAssistant {
-    next_assist_id: TerminalInlineAssistId,
-    assists: HashMap<TerminalInlineAssistId, TerminalInlineAssist>,
-    prompt_history: VecDeque<String>,
-    telemetry: Option<Arc<Telemetry>>,
-    fs: Arc<dyn Fs>,
-    prompt_builder: Arc<PromptBuilder>,
-}
-
-impl Global for TerminalInlineAssistant {}
-
-impl TerminalInlineAssistant {
-    pub fn new(
-        fs: Arc<dyn Fs>,
-        prompt_builder: Arc<PromptBuilder>,
-        telemetry: Arc<Telemetry>,
-    ) -> Self {
-        Self {
-            next_assist_id: TerminalInlineAssistId::default(),
-            assists: HashMap::default(),
-            prompt_history: VecDeque::default(),
-            telemetry: Some(telemetry),
-            fs,
-            prompt_builder,
-        }
-    }
-
-    pub fn assist(
-        &mut self,
-        terminal_view: &Entity<TerminalView>,
-        workspace: WeakEntity<Workspace>,
-        project: WeakEntity<Project>,
-        thread_store: Entity<HistoryStore>,
-        prompt_store: Option<Entity<PromptStore>>,
-        initial_prompt: Option<String>,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        let terminal = terminal_view.read(cx).terminal().clone();
-        let assist_id = self.next_assist_id.post_inc();
-        let prompt_buffer = cx.new(|cx| {
-            MultiBuffer::singleton(
-                cx.new(|cx| Buffer::local(initial_prompt.unwrap_or_default(), cx)),
-                cx,
-            )
-        });
-        let codegen = cx.new(|_| TerminalCodegen::new(terminal, self.telemetry.clone()));
-
-        let prompt_editor = cx.new(|cx| {
-            PromptEditor::new_terminal(
-                assist_id,
-                self.prompt_history.clone(),
-                prompt_buffer.clone(),
-                codegen,
-                self.fs.clone(),
-                thread_store.clone(),
-                prompt_store.clone(),
-                project.clone(),
-                workspace.clone(),
-                window,
-                cx,
-            )
-        });
-        let prompt_editor_render = prompt_editor.clone();
-        let block = terminal_view::BlockProperties {
-            height: 4,
-            render: Box::new(move |_| prompt_editor_render.clone().into_any_element()),
-        };
-        terminal_view.update(cx, |terminal_view, cx| {
-            terminal_view.set_block_below_cursor(block, window, cx);
-        });
-
-        let terminal_assistant = TerminalInlineAssist::new(
-            assist_id,
-            terminal_view,
-            prompt_editor,
-            workspace.clone(),
-            window,
-            cx,
-        );
-
-        self.assists.insert(assist_id, terminal_assistant);
-
-        self.focus_assist(assist_id, window, cx);
-    }
-
-    fn focus_assist(
-        &mut self,
-        assist_id: TerminalInlineAssistId,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        let assist = &self.assists[&assist_id];
-        if let Some(prompt_editor) = assist.prompt_editor.as_ref() {
-            prompt_editor.update(cx, |this, cx| {
-                this.editor.update(cx, |editor, cx| {
-                    window.focus(&editor.focus_handle(cx));
-                    editor.select_all(&SelectAll, window, cx);
-                });
-            });
-        }
-    }
-
-    fn handle_prompt_editor_event(
-        &mut self,
-        prompt_editor: Entity<PromptEditor<TerminalCodegen>>,
-        event: &PromptEditorEvent,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        let assist_id = prompt_editor.read(cx).id();
-        match event {
-            PromptEditorEvent::StartRequested => {
-                self.start_assist(assist_id, cx);
-            }
-            PromptEditorEvent::StopRequested => {
-                self.stop_assist(assist_id, cx);
-            }
-            PromptEditorEvent::ConfirmRequested { execute } => {
-                self.finish_assist(assist_id, false, *execute, window, cx);
-            }
-            PromptEditorEvent::CancelRequested => {
-                self.finish_assist(assist_id, true, false, window, cx);
-            }
-            PromptEditorEvent::Resized { height_in_lines } => {
-                self.insert_prompt_editor_into_terminal(assist_id, *height_in_lines, window, cx);
-            }
-        }
-    }
-
-    fn start_assist(&mut self, assist_id: TerminalInlineAssistId, cx: &mut App) {
-        let assist = if let Some(assist) = self.assists.get_mut(&assist_id) {
-            assist
-        } else {
-            return;
-        };
-
-        let Some(user_prompt) = assist
-            .prompt_editor
-            .as_ref()
-            .map(|editor| editor.read(cx).prompt(cx))
-        else {
-            return;
-        };
-
-        self.prompt_history.retain(|prompt| *prompt != user_prompt);
-        self.prompt_history.push_back(user_prompt);
-        if self.prompt_history.len() > PROMPT_HISTORY_MAX_LEN {
-            self.prompt_history.pop_front();
-        }
-
-        assist
-            .terminal
-            .update(cx, |terminal, cx| {
-                terminal
-                    .terminal()
-                    .update(cx, |terminal, _| terminal.input(CLEAR_INPUT.as_bytes()));
-            })
-            .log_err();
-
-        let codegen = assist.codegen.clone();
-        let Some(request_task) = self.request_for_inline_assist(assist_id, cx).log_err() else {
-            return;
-        };
-
-        codegen.update(cx, |codegen, cx| codegen.start(request_task, cx));
-    }
-
-    fn stop_assist(&mut self, assist_id: TerminalInlineAssistId, cx: &mut App) {
-        let assist = if let Some(assist) = self.assists.get_mut(&assist_id) {
-            assist
-        } else {
-            return;
-        };
-
-        assist.codegen.update(cx, |codegen, cx| codegen.stop(cx));
-    }
-
-    fn request_for_inline_assist(
-        &self,
-        assist_id: TerminalInlineAssistId,
-        cx: &mut App,
-    ) -> Result<Task<LanguageModelRequest>> {
-        let ConfiguredModel { model, .. } = LanguageModelRegistry::read_global(cx)
-            .inline_assistant_model()
-            .context("No inline assistant model")?;
-
-        let assist = self.assists.get(&assist_id).context("invalid assist")?;
-
-        let shell = std::env::var("SHELL").ok();
-        let (latest_output, working_directory) = assist
-            .terminal
-            .update(cx, |terminal, cx| {
-                let terminal = terminal.entity().read(cx);
-                let latest_output = terminal.last_n_non_empty_lines(DEFAULT_CONTEXT_LINES);
-                let working_directory = terminal
-                    .working_directory()
-                    .map(|path| path.to_string_lossy().into_owned());
-                (latest_output, working_directory)
-            })
-            .ok()
-            .unwrap_or_default();
-
-        let prompt_editor = assist.prompt_editor.clone().context("invalid assist")?;
-
-        let prompt = self.prompt_builder.generate_terminal_assistant_prompt(
-            &prompt_editor.read(cx).prompt(cx),
-            shell.as_deref(),
-            working_directory.as_deref(),
-            &latest_output,
-        )?;
-
-        let temperature = AgentSettings::temperature_for_model(&model, cx);
-
-        let mention_set = prompt_editor.read(cx).mention_set().clone();
-        let load_context_task = load_context(&mention_set, cx);
-
-        Ok(cx.background_spawn(async move {
-            let mut request_message = LanguageModelRequestMessage {
-                role: Role::User,
-                content: vec![],
-                cache: false,
-                reasoning_details: None,
-            };
-
-            if let Some(context) = load_context_task.await {
-                context.add_to_request_message(&mut request_message);
-            }
-
-            request_message.content.push(prompt.into());
-
-            LanguageModelRequest {
-                thread_id: None,
-                prompt_id: None,
-                mode: None,
-                intent: Some(CompletionIntent::TerminalInlineAssist),
-                messages: vec![request_message],
-                tools: Vec::new(),
-                tool_choice: None,
-                stop: Vec::new(),
-                temperature,
-                thinking_allowed: false,
-            }
-        }))
-    }
-
-    fn finish_assist(
-        &mut self,
-        assist_id: TerminalInlineAssistId,
-        undo: bool,
-        execute: bool,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        self.dismiss_assist(assist_id, window, cx);
-
-        if let Some(assist) = self.assists.remove(&assist_id) {
-            assist
-                .terminal
-                .update(cx, |this, cx| {
-                    this.clear_block_below_cursor(cx);
-                    this.focus_handle(cx).focus(window);
-                })
-                .log_err();
-
-            if let Some(ConfiguredModel { model, .. }) =
-                LanguageModelRegistry::read_global(cx).inline_assistant_model()
-            {
-                let codegen = assist.codegen.read(cx);
-                let executor = cx.background_executor().clone();
-                report_assistant_event(
-                    AssistantEventData {
-                        conversation_id: None,
-                        kind: AssistantKind::InlineTerminal,
-                        message_id: codegen.message_id.clone(),
-                        phase: if undo {
-                            AssistantPhase::Rejected
-                        } else {
-                            AssistantPhase::Accepted
-                        },
-                        model: model.telemetry_id(),
-                        model_provider: model.provider_id().to_string(),
-                        response_latency: None,
-                        error_message: None,
-                        language_name: None,
-                    },
-                    codegen.telemetry.clone(),
-                    cx.http_client(),
-                    model.api_key(cx),
-                    &executor,
-                );
-            }
-
-            assist.codegen.update(cx, |codegen, cx| {
-                if undo {
-                    codegen.undo(cx);
-                } else if execute {
-                    codegen.complete(cx);
-                }
-            });
-        }
-    }
-
-    fn dismiss_assist(
-        &mut self,
-        assist_id: TerminalInlineAssistId,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> bool {
-        let Some(assist) = self.assists.get_mut(&assist_id) else {
-            return false;
-        };
-        if assist.prompt_editor.is_none() {
-            return false;
-        }
-        assist.prompt_editor = None;
-        assist
-            .terminal
-            .update(cx, |this, cx| {
-                this.clear_block_below_cursor(cx);
-                this.focus_handle(cx).focus(window);
-            })
-            .is_ok()
-    }
-
-    fn insert_prompt_editor_into_terminal(
-        &mut self,
-        assist_id: TerminalInlineAssistId,
-        height: u8,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        if let Some(assist) = self.assists.get_mut(&assist_id)
-            && let Some(prompt_editor) = assist.prompt_editor.as_ref().cloned()
-        {
-            assist
-                .terminal
-                .update(cx, |terminal, cx| {
-                    terminal.clear_block_below_cursor(cx);
-                    let block = terminal_view::BlockProperties {
-                        height,
-                        render: Box::new(move |_| prompt_editor.clone().into_any_element()),
-                    };
-                    terminal.set_block_below_cursor(block, window, cx);
-                })
-                .log_err();
-        }
-    }
-}
-
-struct TerminalInlineAssist {
-    terminal: WeakEntity<TerminalView>,
-    prompt_editor: Option<Entity<PromptEditor<TerminalCodegen>>>,
-    codegen: Entity<TerminalCodegen>,
-    workspace: WeakEntity<Workspace>,
-    _subscriptions: Vec<Subscription>,
-}
-
-impl TerminalInlineAssist {
-    pub fn new(
-        assist_id: TerminalInlineAssistId,
-        terminal: &Entity<TerminalView>,
-        prompt_editor: Entity<PromptEditor<TerminalCodegen>>,
-        workspace: WeakEntity<Workspace>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Self {
-        let codegen = prompt_editor.read(cx).codegen().clone();
-        Self {
-            terminal: terminal.downgrade(),
-            prompt_editor: Some(prompt_editor.clone()),
-            codegen: codegen.clone(),
-            workspace,
-            _subscriptions: vec![
-                window.subscribe(&prompt_editor, cx, |prompt_editor, event, window, cx| {
-                    TerminalInlineAssistant::update_global(cx, |this, cx| {
-                        this.handle_prompt_editor_event(prompt_editor, event, window, cx)
-                    })
-                }),
-                window.subscribe(&codegen, cx, move |codegen, event, window, cx| {
-                    TerminalInlineAssistant::update_global(cx, |this, cx| match event {
-                        CodegenEvent::Finished => {
-                            let assist = if let Some(assist) = this.assists.get(&assist_id) {
-                                assist
-                            } else {
-                                return;
-                            };
-
-                            if let CodegenStatus::Error(error) = &codegen.read(cx).status
-                                && assist.prompt_editor.is_none()
-                                && let Some(workspace) = assist.workspace.upgrade()
-                            {
-                                let error = format!("Terminal inline assistant error: {}", error);
-                                workspace.update(cx, |workspace, cx| {
-                                    struct InlineAssistantError;
-
-                                    let id = NotificationId::composite::<InlineAssistantError>(
-                                        assist_id.0,
-                                    );
-
-                                    workspace.show_toast(Toast::new(id, error), cx);
-                                })
-                            }
-
-                            if assist.prompt_editor.is_none() {
-                                this.finish_assist(assist_id, false, false, window, cx);
-                            }
-                        }
-                    })
-                }),
-            ],
-        }
-    }
-}
diff --git a/crates/agent_ui/src/text_thread_editor.rs b/crates/agent_ui/src/text_thread_editor.rs
deleted file mode 100644
index fb9ee5e49e..0000000000
--- a/crates/agent_ui/src/text_thread_editor.rs
+++ /dev/null
@@ -1,3370 +0,0 @@
-use crate::{
-    language_model_selector::{LanguageModelSelector, language_model_selector},
-    ui::BurnModeTooltip,
-};
-use agent_settings::CompletionMode;
-use anyhow::Result;
-use assistant_slash_command::{SlashCommand, SlashCommandOutputSection, SlashCommandWorkingSet};
-use assistant_slash_commands::{DefaultSlashCommand, FileSlashCommand, selections_creases};
-use client::{proto, zed_urls};
-use collections::{BTreeSet, HashMap, HashSet, hash_map};
-use editor::{
-    Anchor, Editor, EditorEvent, MenuEditPredictionsPolicy, MultiBuffer, MultiBufferOffset,
-    MultiBufferSnapshot, RowExt, ToOffset as _, ToPoint,
-    actions::{MoveToEndOfLine, Newline, ShowCompletions},
-    display_map::{
-        BlockPlacement, BlockProperties, BlockStyle, Crease, CreaseMetadata, CustomBlockId, FoldId,
-        RenderBlock, ToDisplayPoint,
-    },
-    scroll::ScrollOffset,
-};
-use editor::{FoldPlaceholder, display_map::CreaseId};
-use fs::Fs;
-use futures::FutureExt;
-use gpui::{
-    Action, Animation, AnimationExt, AnyElement, App, ClipboardEntry, ClipboardItem, Empty, Entity,
-    EventEmitter, FocusHandle, Focusable, FontWeight, Global, InteractiveElement, IntoElement,
-    ParentElement, Pixels, Render, RenderImage, SharedString, Size, StatefulInteractiveElement,
-    Styled, Subscription, Task, WeakEntity, actions, div, img, point, prelude::*,
-    pulsating_between, size,
-};
-use language::{
-    BufferSnapshot, LspAdapterDelegate, ToOffset,
-    language_settings::{SoftWrap, all_language_settings},
-};
-use language_model::{
-    ConfigurationError, LanguageModelExt, LanguageModelImage, LanguageModelRegistry, Role,
-};
-use multi_buffer::MultiBufferRow;
-use picker::{Picker, popover_menu::PickerPopoverMenu};
-use project::{Project, Worktree};
-use project::{ProjectPath, lsp_store::LocalLspAdapterDelegate};
-use rope::Point;
-use serde::{Deserialize, Serialize};
-use settings::{
-    LanguageModelProviderSetting, LanguageModelSelection, Settings, SettingsStore,
-    update_settings_file,
-};
-use std::{
-    any::TypeId,
-    cmp,
-    ops::Range,
-    path::{Path, PathBuf},
-    rc::Rc,
-    sync::Arc,
-    time::Duration,
-};
-use text::SelectionGoal;
-use ui::{
-    ButtonLike, CommonAnimationExt, Disclosure, ElevationIndex, KeyBinding, PopoverMenuHandle,
-    TintColor, Tooltip, prelude::*,
-};
-use util::{ResultExt, maybe};
-use workspace::{
-    CollaboratorId,
-    searchable::{Direction, SearchableItemHandle},
-};
-use workspace::{
-    Save, Toast, Workspace,
-    item::{self, FollowableItem, Item},
-    notifications::NotificationId,
-    pane,
-    searchable::{SearchEvent, SearchableItem},
-};
-use zed_actions::agent::{AddSelectionToThread, ToggleModelSelector};
-
-use crate::{slash_command::SlashCommandCompletionProvider, slash_command_picker};
-use assistant_text_thread::{
-    CacheStatus, Content, InvokedSlashCommandId, InvokedSlashCommandStatus, Message, MessageId,
-    MessageMetadata, MessageStatus, PendingSlashCommandStatus, TextThread, TextThreadEvent,
-    TextThreadId, ThoughtProcessOutputSection,
-};
-
-actions!(
-    assistant,
-    [
-        /// Sends the current message to the assistant.
-        Assist,
-        /// Confirms and executes the entered slash command.
-        ConfirmCommand,
-        /// Copies code from the assistant's response to the clipboard.
-        CopyCode,
-        /// Cycles between user and assistant message roles.
-        CycleMessageRole,
-        /// Inserts the selected text into the active editor.
-        InsertIntoEditor,
-        /// Splits the conversation at the current cursor position.
-        Split,
-    ]
-);
-
-/// Inserts files that were dragged and dropped into the assistant conversation.
-#[derive(PartialEq, Clone, Action)]
-#[action(namespace = assistant, no_json, no_register)]
-pub enum InsertDraggedFiles {
-    ProjectPaths(Vec<ProjectPath>),
-    ExternalFiles(Vec<PathBuf>),
-}
-
-#[derive(Copy, Clone, Debug, PartialEq)]
-struct ScrollPosition {
-    offset_before_cursor: gpui::Point<ScrollOffset>,
-    cursor: Anchor,
-}
-
-type MessageHeader = MessageMetadata;
-
-#[derive(Clone)]
-enum AssistError {
-    PaymentRequired,
-    Message(SharedString),
-}
-
-pub enum ThoughtProcessStatus {
-    Pending,
-    Completed,
-}
-
-pub trait AgentPanelDelegate {
-    fn active_text_thread_editor(
-        &self,
-        workspace: &mut Workspace,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) -> Option<Entity<TextThreadEditor>>;
-
-    fn open_local_text_thread(
-        &self,
-        workspace: &mut Workspace,
-        path: Arc<Path>,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) -> Task<Result<()>>;
-
-    fn open_remote_text_thread(
-        &self,
-        workspace: &mut Workspace,
-        text_thread_id: TextThreadId,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) -> Task<Result<Entity<TextThreadEditor>>>;
-
-    fn quote_selection(
-        &self,
-        workspace: &mut Workspace,
-        selection_ranges: Vec<Range<Anchor>>,
-        buffer: Entity<MultiBuffer>,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    );
-}
-
-impl dyn AgentPanelDelegate {
-    /// Returns the global [`AssistantPanelDelegate`], if it exists.
-    pub fn try_global(cx: &App) -> Option<Arc<Self>> {
-        cx.try_global::<GlobalAssistantPanelDelegate>()
-            .map(|global| global.0.clone())
-    }
-
-    /// Sets the global [`AssistantPanelDelegate`].
-    pub fn set_global(delegate: Arc<Self>, cx: &mut App) {
-        cx.set_global(GlobalAssistantPanelDelegate(delegate));
-    }
-}
-
-struct GlobalAssistantPanelDelegate(Arc<dyn AgentPanelDelegate>);
-
-impl Global for GlobalAssistantPanelDelegate {}
-
-pub struct TextThreadEditor {
-    text_thread: Entity<TextThread>,
-    fs: Arc<dyn Fs>,
-    slash_commands: Arc<SlashCommandWorkingSet>,
-    workspace: WeakEntity<Workspace>,
-    project: Entity<Project>,
-    lsp_adapter_delegate: Option<Arc<dyn LspAdapterDelegate>>,
-    editor: Entity<Editor>,
-    pending_thought_process: Option<(CreaseId, language::Anchor)>,
-    blocks: HashMap<MessageId, (MessageHeader, CustomBlockId)>,
-    image_blocks: HashSet<CustomBlockId>,
-    scroll_position: Option<ScrollPosition>,
-    remote_id: Option<workspace::ViewId>,
-    pending_slash_command_creases: HashMap<Range<language::Anchor>, CreaseId>,
-    invoked_slash_command_creases: HashMap<InvokedSlashCommandId, CreaseId>,
-    _subscriptions: Vec<Subscription>,
-    last_error: Option<AssistError>,
-    pub(crate) slash_menu_handle:
-        PopoverMenuHandle<Picker<slash_command_picker::SlashCommandDelegate>>,
-    // dragged_file_worktrees is used to keep references to worktrees that were added
-    // when the user drag/dropped an external file onto the context editor. Since
-    // the worktree is not part of the project panel, it would be dropped as soon as
-    // the file is opened. In order to keep the worktree alive for the duration of the
-    // context editor, we keep a reference here.
-    dragged_file_worktrees: Vec<Entity<Worktree>>,
-    language_model_selector: Entity<LanguageModelSelector>,
-    language_model_selector_menu_handle: PopoverMenuHandle<LanguageModelSelector>,
-}
-
-const MAX_TAB_TITLE_LEN: usize = 16;
-
-impl TextThreadEditor {
-    pub fn init(cx: &mut App) {
-        workspace::FollowableViewRegistry::register::<TextThreadEditor>(cx);
-
-        cx.observe_new(
-            |workspace: &mut Workspace, _window, _cx: &mut Context<Workspace>| {
-                workspace
-                    .register_action(TextThreadEditor::quote_selection)
-                    .register_action(TextThreadEditor::insert_selection)
-                    .register_action(TextThreadEditor::copy_code)
-                    .register_action(TextThreadEditor::handle_insert_dragged_files);
-            },
-        )
-        .detach();
-    }
-
-    pub fn for_text_thread(
-        text_thread: Entity<TextThread>,
-        fs: Arc<dyn Fs>,
-        workspace: WeakEntity<Workspace>,
-        project: Entity<Project>,
-        lsp_adapter_delegate: Option<Arc<dyn LspAdapterDelegate>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let completion_provider = SlashCommandCompletionProvider::new(
-            text_thread.read(cx).slash_commands().clone(),
-            Some(cx.entity().downgrade()),
-            Some(workspace.clone()),
-        );
-
-        let editor = cx.new(|cx| {
-            let mut editor =
-                Editor::for_buffer(text_thread.read(cx).buffer().clone(), None, window, cx);
-            editor.disable_scrollbars_and_minimap(window, cx);
-            editor.set_soft_wrap_mode(SoftWrap::EditorWidth, cx);
-            editor.set_show_line_numbers(false, cx);
-            editor.set_show_git_diff_gutter(false, cx);
-            editor.set_show_code_actions(false, cx);
-            editor.set_show_runnables(false, cx);
-            editor.set_show_breakpoints(false, cx);
-            editor.set_show_wrap_guides(false, cx);
-            editor.set_show_indent_guides(false, cx);
-            editor.set_completion_provider(Some(Rc::new(completion_provider)));
-            editor.set_menu_edit_predictions_policy(MenuEditPredictionsPolicy::Never);
-            editor.set_collaboration_hub(Box::new(project.clone()));
-
-            let show_edit_predictions = all_language_settings(None, cx)
-                .edit_predictions
-                .enabled_in_text_threads;
-
-            editor.set_show_edit_predictions(Some(show_edit_predictions), window, cx);
-
-            editor
-        });
-
-        let _subscriptions = vec![
-            cx.observe(&text_thread, |_, _, cx| cx.notify()),
-            cx.subscribe_in(&text_thread, window, Self::handle_text_thread_event),
-            cx.subscribe_in(&editor, window, Self::handle_editor_event),
-            cx.subscribe_in(&editor, window, Self::handle_editor_search_event),
-            cx.observe_global_in::<SettingsStore>(window, Self::settings_changed),
-        ];
-
-        let slash_command_sections = text_thread
-            .read(cx)
-            .slash_command_output_sections()
-            .to_vec();
-        let thought_process_sections = text_thread
-            .read(cx)
-            .thought_process_output_sections()
-            .to_vec();
-        let slash_commands = text_thread.read(cx).slash_commands().clone();
-        let focus_handle = editor.read(cx).focus_handle(cx);
-
-        let mut this = Self {
-            text_thread,
-            slash_commands,
-            editor,
-            lsp_adapter_delegate,
-            blocks: Default::default(),
-            image_blocks: Default::default(),
-            scroll_position: None,
-            remote_id: None,
-            pending_thought_process: None,
-            fs: fs.clone(),
-            workspace,
-            project,
-            pending_slash_command_creases: HashMap::default(),
-            invoked_slash_command_creases: HashMap::default(),
-            _subscriptions,
-            last_error: None,
-            slash_menu_handle: Default::default(),
-            dragged_file_worktrees: Vec::new(),
-            language_model_selector: cx.new(|cx| {
-                language_model_selector(
-                    |cx| LanguageModelRegistry::read_global(cx).default_model(),
-                    move |model, cx| {
-                        update_settings_file(fs.clone(), cx, move |settings, _| {
-                            let provider = model.provider_id().0.to_string();
-                            let model = model.id().0.to_string();
-                            settings.agent.get_or_insert_default().set_model(
-                                LanguageModelSelection {
-                                    provider: LanguageModelProviderSetting(provider),
-                                    model,
-                                },
-                            )
-                        });
-                    },
-                    true, // Use popover styles for picker
-                    focus_handle,
-                    window,
-                    cx,
-                )
-            }),
-            language_model_selector_menu_handle: PopoverMenuHandle::default(),
-        };
-        this.update_message_headers(cx);
-        this.update_image_blocks(cx);
-        this.insert_slash_command_output_sections(slash_command_sections, false, window, cx);
-        this.insert_thought_process_output_sections(
-            thought_process_sections
-                .into_iter()
-                .map(|section| (section, ThoughtProcessStatus::Completed)),
-            window,
-            cx,
-        );
-        this
-    }
-
-    fn settings_changed(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.editor.update(cx, |editor, cx| {
-            let show_edit_predictions = all_language_settings(None, cx)
-                .edit_predictions
-                .enabled_in_text_threads;
-
-            editor.set_show_edit_predictions(Some(show_edit_predictions), window, cx);
-        });
-    }
-
-    pub fn text_thread(&self) -> &Entity<TextThread> {
-        &self.text_thread
-    }
-
-    pub fn editor(&self) -> &Entity<Editor> {
-        &self.editor
-    }
-
-    pub fn insert_default_prompt(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let command_name = DefaultSlashCommand.name();
-        self.editor.update(cx, |editor, cx| {
-            editor.insert(&format!("/{command_name}\n\n"), window, cx)
-        });
-        let command = self.text_thread.update(cx, |text_thread, cx| {
-            text_thread.reparse(cx);
-            text_thread.parsed_slash_commands()[0].clone()
-        });
-        self.run_command(
-            command.source_range,
-            &command.name,
-            &command.arguments,
-            false,
-            self.workspace.clone(),
-            window,
-            cx,
-        );
-    }
-
-    fn assist(&mut self, _: &Assist, window: &mut Window, cx: &mut Context<Self>) {
-        if self.sending_disabled(cx) {
-            return;
-        }
-        telemetry::event!("Agent Message Sent", agent = "zed-text");
-        self.send_to_model(window, cx);
-    }
-
-    fn send_to_model(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.last_error = None;
-        if let Some(user_message) = self
-            .text_thread
-            .update(cx, |text_thread, cx| text_thread.assist(cx))
-        {
-            let new_selection = {
-                let cursor = user_message
-                    .start
-                    .to_offset(self.text_thread.read(cx).buffer().read(cx));
-                MultiBufferOffset(cursor)..MultiBufferOffset(cursor)
-            };
-            self.editor.update(cx, |editor, cx| {
-                editor.change_selections(Default::default(), window, cx, |selections| {
-                    selections.select_ranges([new_selection])
-                });
-            });
-            // Avoid scrolling to the new cursor position so the assistant's output is stable.
-            cx.defer_in(window, |this, _, _| this.scroll_position = None);
-        }
-
-        cx.notify();
-    }
-
-    fn cancel(
-        &mut self,
-        _: &editor::actions::Cancel,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.last_error = None;
-
-        if self
-            .text_thread
-            .update(cx, |text_thread, cx| text_thread.cancel_last_assist(cx))
-        {
-            return;
-        }
-
-        cx.propagate();
-    }
-
-    fn cycle_message_role(
-        &mut self,
-        _: &CycleMessageRole,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let cursors = self.cursors(cx);
-        self.text_thread.update(cx, |text_thread, cx| {
-            let messages = text_thread
-                .messages_for_offsets(cursors.into_iter().map(|cursor| cursor.0), cx)
-                .into_iter()
-                .map(|message| message.id)
-                .collect();
-            text_thread.cycle_message_roles(messages, cx)
-        });
-    }
-
-    fn cursors(&self, cx: &mut App) -> Vec<MultiBufferOffset> {
-        let selections = self.editor.update(cx, |editor, cx| {
-            editor
-                .selections
-                .all::<MultiBufferOffset>(&editor.display_snapshot(cx))
-        });
-        selections
-            .into_iter()
-            .map(|selection| selection.head())
-            .collect()
-    }
-
-    pub fn insert_command(&mut self, name: &str, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(command) = self.slash_commands.command(name, cx) {
-            self.editor.update(cx, |editor, cx| {
-                editor.transact(window, cx, |editor, window, cx| {
-                    editor.change_selections(Default::default(), window, cx, |s| s.try_cancel());
-                    let snapshot = editor.buffer().read(cx).snapshot(cx);
-                    let newest_cursor = editor
-                        .selections
-                        .newest::<Point>(&editor.display_snapshot(cx))
-                        .head();
-                    if newest_cursor.column > 0
-                        || snapshot
-                            .chars_at(newest_cursor)
-                            .next()
-                            .is_some_and(|ch| ch != '\n')
-                    {
-                        editor.move_to_end_of_line(
-                            &MoveToEndOfLine {
-                                stop_at_soft_wraps: false,
-                            },
-                            window,
-                            cx,
-                        );
-                        editor.newline(&Newline, window, cx);
-                    }
-
-                    editor.insert(&format!("/{name}"), window, cx);
-                    if command.accepts_arguments() {
-                        editor.insert(" ", window, cx);
-                        editor.show_completions(&ShowCompletions, window, cx);
-                    }
-                });
-            });
-            if !command.requires_argument() {
-                self.confirm_command(&ConfirmCommand, window, cx);
-            }
-        }
-    }
-
-    pub fn confirm_command(
-        &mut self,
-        _: &ConfirmCommand,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.editor.read(cx).has_visible_completions_menu() {
-            return;
-        }
-
-        let selections = self.editor.read(cx).selections.disjoint_anchors_arc();
-        let mut commands_by_range = HashMap::default();
-        let workspace = self.workspace.clone();
-        self.text_thread.update(cx, |text_thread, cx| {
-            text_thread.reparse(cx);
-            for selection in selections.iter() {
-                if let Some(command) =
-                    text_thread.pending_command_for_position(selection.head().text_anchor, cx)
-                {
-                    commands_by_range
-                        .entry(command.source_range.clone())
-                        .or_insert_with(|| command.clone());
-                }
-            }
-        });
-
-        if commands_by_range.is_empty() {
-            cx.propagate();
-        } else {
-            for command in commands_by_range.into_values() {
-                self.run_command(
-                    command.source_range,
-                    &command.name,
-                    &command.arguments,
-                    true,
-                    workspace.clone(),
-                    window,
-                    cx,
-                );
-            }
-            cx.stop_propagation();
-        }
-    }
-
-    pub fn run_command(
-        &mut self,
-        command_range: Range<language::Anchor>,
-        name: &str,
-        arguments: &[String],
-        ensure_trailing_newline: bool,
-        workspace: WeakEntity<Workspace>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(command) = self.slash_commands.command(name, cx) {
-            let text_thread = self.text_thread.read(cx);
-            let sections = text_thread
-                .slash_command_output_sections()
-                .iter()
-                .filter(|section| section.is_valid(text_thread.buffer().read(cx)))
-                .cloned()
-                .collect::<Vec<_>>();
-            let snapshot = text_thread.buffer().read(cx).snapshot();
-            let output = command.run(
-                arguments,
-                &sections,
-                snapshot,
-                workspace,
-                self.lsp_adapter_delegate.clone(),
-                window,
-                cx,
-            );
-            self.text_thread.update(cx, |text_thread, cx| {
-                text_thread.insert_command_output(
-                    command_range,
-                    name,
-                    output,
-                    ensure_trailing_newline,
-                    cx,
-                )
-            });
-        }
-    }
-
-    fn handle_text_thread_event(
-        &mut self,
-        _: &Entity<TextThread>,
-        event: &TextThreadEvent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let text_thread_editor = cx.entity().downgrade();
-
-        match event {
-            TextThreadEvent::MessagesEdited => {
-                self.update_message_headers(cx);
-                self.update_image_blocks(cx);
-                self.text_thread.update(cx, |text_thread, cx| {
-                    text_thread.save(Some(Duration::from_millis(500)), self.fs.clone(), cx);
-                });
-            }
-            TextThreadEvent::SummaryChanged => {
-                cx.emit(EditorEvent::TitleChanged);
-                self.text_thread.update(cx, |text_thread, cx| {
-                    text_thread.save(Some(Duration::from_millis(500)), self.fs.clone(), cx);
-                });
-            }
-            TextThreadEvent::SummaryGenerated => {}
-            TextThreadEvent::PathChanged { .. } => {}
-            TextThreadEvent::StartedThoughtProcess(range) => {
-                let creases = self.insert_thought_process_output_sections(
-                    [(
-                        ThoughtProcessOutputSection {
-                            range: range.clone(),
-                        },
-                        ThoughtProcessStatus::Pending,
-                    )],
-                    window,
-                    cx,
-                );
-                self.pending_thought_process = Some((creases[0], range.start));
-            }
-            TextThreadEvent::EndedThoughtProcess(end) => {
-                if let Some((crease_id, start)) = self.pending_thought_process.take() {
-                    self.editor.update(cx, |editor, cx| {
-                        let multi_buffer_snapshot = editor.buffer().read(cx).snapshot(cx);
-                        let start_anchor =
-                            multi_buffer_snapshot.as_singleton_anchor(start).unwrap();
-
-                        editor.display_map.update(cx, |display_map, cx| {
-                            display_map.unfold_intersecting(
-                                vec![start_anchor..start_anchor],
-                                true,
-                                cx,
-                            );
-                        });
-                        editor.remove_creases(vec![crease_id], cx);
-                    });
-                    self.insert_thought_process_output_sections(
-                        [(
-                            ThoughtProcessOutputSection { range: start..*end },
-                            ThoughtProcessStatus::Completed,
-                        )],
-                        window,
-                        cx,
-                    );
-                }
-            }
-            TextThreadEvent::StreamedCompletion => {
-                self.editor.update(cx, |editor, cx| {
-                    if let Some(scroll_position) = self.scroll_position {
-                        let snapshot = editor.snapshot(window, cx);
-                        let cursor_point = scroll_position.cursor.to_display_point(&snapshot);
-                        let scroll_top =
-                            cursor_point.row().as_f64() - scroll_position.offset_before_cursor.y;
-                        editor.set_scroll_position(
-                            point(scroll_position.offset_before_cursor.x, scroll_top),
-                            window,
-                            cx,
-                        );
-                    }
-                });
-            }
-            TextThreadEvent::ParsedSlashCommandsUpdated { removed, updated } => {
-                self.editor.update(cx, |editor, cx| {
-                    let buffer = editor.buffer().read(cx).snapshot(cx);
-                    let (&excerpt_id, _, _) = buffer.as_singleton().unwrap();
-
-                    editor.remove_creases(
-                        removed
-                            .iter()
-                            .filter_map(|range| self.pending_slash_command_creases.remove(range)),
-                        cx,
-                    );
-
-                    let crease_ids = editor.insert_creases(
-                        updated.iter().map(|command| {
-                            let workspace = self.workspace.clone();
-                            let confirm_command = Arc::new({
-                                let text_thread_editor = text_thread_editor.clone();
-                                let command = command.clone();
-                                move |window: &mut Window, cx: &mut App| {
-                                    text_thread_editor
-                                        .update(cx, |text_thread_editor, cx| {
-                                            text_thread_editor.run_command(
-                                                command.source_range.clone(),
-                                                &command.name,
-                                                &command.arguments,
-                                                false,
-                                                workspace.clone(),
-                                                window,
-                                                cx,
-                                            );
-                                        })
-                                        .ok();
-                                }
-                            });
-                            let placeholder = FoldPlaceholder {
-                                render: Arc::new(move |_, _, _| Empty.into_any()),
-                                ..Default::default()
-                            };
-                            let render_toggle = {
-                                let confirm_command = confirm_command.clone();
-                                let command = command.clone();
-                                move |row, _, _, _window: &mut Window, _cx: &mut App| {
-                                    render_pending_slash_command_gutter_decoration(
-                                        row,
-                                        &command.status,
-                                        confirm_command.clone(),
-                                    )
-                                }
-                            };
-                            let render_trailer = {
-                                move |_row, _unfold, _window: &mut Window, _cx: &mut App| {
-                                    Empty.into_any()
-                                }
-                            };
-
-                            let range = buffer
-                                .anchor_range_in_excerpt(excerpt_id, command.source_range.clone())
-                                .unwrap();
-                            Crease::inline(range, placeholder, render_toggle, render_trailer)
-                        }),
-                        cx,
-                    );
-
-                    self.pending_slash_command_creases.extend(
-                        updated
-                            .iter()
-                            .map(|command| command.source_range.clone())
-                            .zip(crease_ids),
-                    );
-                })
-            }
-            TextThreadEvent::InvokedSlashCommandChanged { command_id } => {
-                self.update_invoked_slash_command(*command_id, window, cx);
-            }
-            TextThreadEvent::SlashCommandOutputSectionAdded { section } => {
-                self.insert_slash_command_output_sections([section.clone()], false, window, cx);
-            }
-            TextThreadEvent::Operation(_) => {}
-            TextThreadEvent::ShowAssistError(error_message) => {
-                self.last_error = Some(AssistError::Message(error_message.clone()));
-            }
-            TextThreadEvent::ShowPaymentRequiredError => {
-                self.last_error = Some(AssistError::PaymentRequired);
-            }
-        }
-    }
-
-    fn update_invoked_slash_command(
-        &mut self,
-        command_id: InvokedSlashCommandId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(invoked_slash_command) =
-            self.text_thread.read(cx).invoked_slash_command(&command_id)
-            && let InvokedSlashCommandStatus::Finished = invoked_slash_command.status
-        {
-            let run_commands_in_ranges = invoked_slash_command.run_commands_in_ranges.clone();
-            for range in run_commands_in_ranges {
-                let commands = self.text_thread.update(cx, |text_thread, cx| {
-                    text_thread.reparse(cx);
-                    text_thread
-                        .pending_commands_for_range(range.clone(), cx)
-                        .to_vec()
-                });
-
-                for command in commands {
-                    self.run_command(
-                        command.source_range,
-                        &command.name,
-                        &command.arguments,
-                        false,
-                        self.workspace.clone(),
-                        window,
-                        cx,
-                    );
-                }
-            }
-        }
-
-        self.editor.update(cx, |editor, cx| {
-            if let Some(invoked_slash_command) =
-                self.text_thread.read(cx).invoked_slash_command(&command_id)
-            {
-                if let InvokedSlashCommandStatus::Finished = invoked_slash_command.status {
-                    let buffer = editor.buffer().read(cx).snapshot(cx);
-                    let (&excerpt_id, _buffer_id, _buffer_snapshot) =
-                        buffer.as_singleton().unwrap();
-
-                    let range = buffer
-                        .anchor_range_in_excerpt(excerpt_id, invoked_slash_command.range.clone())
-                        .unwrap();
-                    editor.remove_folds_with_type(
-                        &[range],
-                        TypeId::of::<PendingSlashCommand>(),
-                        false,
-                        cx,
-                    );
-
-                    editor.remove_creases(
-                        HashSet::from_iter(self.invoked_slash_command_creases.remove(&command_id)),
-                        cx,
-                    );
-                } else if let hash_map::Entry::Vacant(entry) =
-                    self.invoked_slash_command_creases.entry(command_id)
-                {
-                    let buffer = editor.buffer().read(cx).snapshot(cx);
-                    let (&excerpt_id, _buffer_id, _buffer_snapshot) =
-                        buffer.as_singleton().unwrap();
-                    let context = self.text_thread.downgrade();
-                    let range = buffer
-                        .anchor_range_in_excerpt(excerpt_id, invoked_slash_command.range.clone())
-                        .unwrap();
-                    let crease = Crease::inline(
-                        range,
-                        invoked_slash_command_fold_placeholder(command_id, context),
-                        fold_toggle("invoked-slash-command"),
-                        |_row, _folded, _window, _cx| Empty.into_any(),
-                    );
-                    let crease_ids = editor.insert_creases([crease.clone()], cx);
-                    editor.fold_creases(vec![crease], false, window, cx);
-                    entry.insert(crease_ids[0]);
-                } else {
-                    cx.notify()
-                }
-            } else {
-                editor.remove_creases(
-                    HashSet::from_iter(self.invoked_slash_command_creases.remove(&command_id)),
-                    cx,
-                );
-                cx.notify();
-            };
-        });
-    }
-
-    fn insert_thought_process_output_sections(
-        &mut self,
-        sections: impl IntoIterator<
-            Item = (
-                ThoughtProcessOutputSection<language::Anchor>,
-                ThoughtProcessStatus,
-            ),
-        >,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Vec<CreaseId> {
-        self.editor.update(cx, |editor, cx| {
-            let buffer = editor.buffer().read(cx).snapshot(cx);
-            let excerpt_id = *buffer.as_singleton().unwrap().0;
-            let mut buffer_rows_to_fold = BTreeSet::new();
-            let mut creases = Vec::new();
-            for (section, status) in sections {
-                let range = buffer
-                    .anchor_range_in_excerpt(excerpt_id, section.range)
-                    .unwrap();
-                let buffer_row = MultiBufferRow(range.start.to_point(&buffer).row);
-                buffer_rows_to_fold.insert(buffer_row);
-                creases.push(
-                    Crease::inline(
-                        range,
-                        FoldPlaceholder {
-                            render: render_thought_process_fold_icon_button(
-                                cx.entity().downgrade(),
-                                status,
-                            ),
-                            merge_adjacent: false,
-                            ..Default::default()
-                        },
-                        render_slash_command_output_toggle,
-                        |_, _, _, _| Empty.into_any_element(),
-                    )
-                    .with_metadata(CreaseMetadata {
-                        icon_path: SharedString::from(IconName::Ai.path()),
-                        label: "Thinking Process".into(),
-                    }),
-                );
-            }
-
-            let creases = editor.insert_creases(creases, cx);
-
-            for buffer_row in buffer_rows_to_fold.into_iter().rev() {
-                editor.fold_at(buffer_row, window, cx);
-            }
-
-            creases
-        })
-    }
-
-    fn insert_slash_command_output_sections(
-        &mut self,
-        sections: impl IntoIterator<Item = SlashCommandOutputSection<language::Anchor>>,
-        expand_result: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.editor.update(cx, |editor, cx| {
-            let buffer = editor.buffer().read(cx).snapshot(cx);
-            let excerpt_id = *buffer.as_singleton().unwrap().0;
-            let mut buffer_rows_to_fold = BTreeSet::new();
-            let mut creases = Vec::new();
-            for section in sections {
-                let range = buffer
-                    .anchor_range_in_excerpt(excerpt_id, section.range)
-                    .unwrap();
-                let buffer_row = MultiBufferRow(range.start.to_point(&buffer).row);
-                buffer_rows_to_fold.insert(buffer_row);
-                creases.push(
-                    Crease::inline(
-                        range,
-                        FoldPlaceholder {
-                            render: render_fold_icon_button(
-                                cx.entity().downgrade(),
-                                section.icon.path().into(),
-                                section.label.clone(),
-                            ),
-                            merge_adjacent: false,
-                            ..Default::default()
-                        },
-                        render_slash_command_output_toggle,
-                        |_, _, _, _| Empty.into_any_element(),
-                    )
-                    .with_metadata(CreaseMetadata {
-                        icon_path: section.icon.path().into(),
-                        label: section.label,
-                    }),
-                );
-            }
-
-            editor.insert_creases(creases, cx);
-
-            if expand_result {
-                buffer_rows_to_fold.clear();
-            }
-            for buffer_row in buffer_rows_to_fold.into_iter().rev() {
-                editor.fold_at(buffer_row, window, cx);
-            }
-        });
-    }
-
-    fn handle_editor_event(
-        &mut self,
-        _: &Entity<Editor>,
-        event: &EditorEvent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            EditorEvent::ScrollPositionChanged { autoscroll, .. } => {
-                let cursor_scroll_position = self.cursor_scroll_position(window, cx);
-                if *autoscroll {
-                    self.scroll_position = cursor_scroll_position;
-                } else if self.scroll_position != cursor_scroll_position {
-                    self.scroll_position = None;
-                }
-            }
-            EditorEvent::SelectionsChanged { .. } => {
-                self.scroll_position = self.cursor_scroll_position(window, cx);
-            }
-            _ => {}
-        }
-        cx.emit(event.clone());
-    }
-
-    fn handle_editor_search_event(
-        &mut self,
-        _: &Entity<Editor>,
-        event: &SearchEvent,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        cx.emit(event.clone());
-    }
-
-    fn cursor_scroll_position(
-        &self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<ScrollPosition> {
-        self.editor.update(cx, |editor, cx| {
-            let snapshot = editor.snapshot(window, cx);
-            let cursor = editor.selections.newest_anchor().head();
-            let cursor_row = cursor
-                .to_display_point(&snapshot.display_snapshot)
-                .row()
-                .as_f64();
-            let scroll_position = editor
-                .scroll_manager
-                .anchor()
-                .scroll_position(&snapshot.display_snapshot);
-
-            let scroll_bottom = scroll_position.y + editor.visible_line_count().unwrap_or(0.);
-            if (scroll_position.y..scroll_bottom).contains(&cursor_row) {
-                Some(ScrollPosition {
-                    cursor,
-                    offset_before_cursor: point(scroll_position.x, cursor_row - scroll_position.y),
-                })
-            } else {
-                None
-            }
-        })
-    }
-
-    fn esc_kbd(cx: &App) -> Div {
-        let colors = cx.theme().colors().clone();
-
-        h_flex()
-            .items_center()
-            .gap_1()
-            .font(theme::ThemeSettings::get_global(cx).buffer_font.clone())
-            .text_size(TextSize::XSmall.rems(cx))
-            .text_color(colors.text_muted)
-            .child("Press")
-            .child(
-                h_flex()
-                    .rounded_sm()
-                    .px_1()
-                    .mr_0p5()
-                    .border_1()
-                    .border_color(colors.border_variant.alpha(0.6))
-                    .bg(colors.element_background.alpha(0.6))
-                    .child("esc"),
-            )
-            .child("to cancel")
-    }
-
-    fn update_message_headers(&mut self, cx: &mut Context<Self>) {
-        self.editor.update(cx, |editor, cx| {
-            let buffer = editor.buffer().read(cx).snapshot(cx);
-
-            let excerpt_id = *buffer.as_singleton().unwrap().0;
-            let mut old_blocks = std::mem::take(&mut self.blocks);
-            let mut blocks_to_remove: HashMap<_, _> = old_blocks
-                .iter()
-                .map(|(message_id, (_, block_id))| (*message_id, *block_id))
-                .collect();
-            let mut blocks_to_replace: HashMap<_, RenderBlock> = Default::default();
-
-            let render_block = |message: MessageMetadata| -> RenderBlock {
-                Arc::new({
-                    let text_thread = self.text_thread.clone();
-
-                    move |cx| {
-                        let message_id = MessageId(message.timestamp);
-                        let llm_loading = message.role == Role::Assistant
-                            && message.status == MessageStatus::Pending;
-
-                        let (label, spinner, note) = match message.role {
-                            Role::User => (
-                                Label::new("You").color(Color::Default).into_any_element(),
-                                None,
-                                None,
-                            ),
-                            Role::Assistant => {
-                                let base_label = Label::new("Agent").color(Color::Info);
-                                let mut spinner = None;
-                                let mut note = None;
-                                let animated_label = if llm_loading {
-                                    base_label
-                                        .with_animation(
-                                            "pulsating-label",
-                                            Animation::new(Duration::from_secs(2))
-                                                .repeat()
-                                                .with_easing(pulsating_between(0.4, 0.8)),
-                                            |label, delta| label.alpha(delta),
-                                        )
-                                        .into_any_element()
-                                } else {
-                                    base_label.into_any_element()
-                                };
-                                if llm_loading {
-                                    spinner = Some(
-                                        Icon::new(IconName::ArrowCircle)
-                                            .size(IconSize::XSmall)
-                                            .color(Color::Info)
-                                            .with_rotate_animation(2)
-                                            .into_any_element(),
-                                    );
-                                    note = Some(Self::esc_kbd(cx).into_any_element());
-                                }
-                                (animated_label, spinner, note)
-                            }
-                            Role::System => (
-                                Label::new("System")
-                                    .color(Color::Warning)
-                                    .into_any_element(),
-                                None,
-                                None,
-                            ),
-                        };
-
-                        let sender = h_flex()
-                            .items_center()
-                            .gap_2p5()
-                            .child(
-                                ButtonLike::new("role")
-                                    .style(ButtonStyle::Filled)
-                                    .child(
-                                        h_flex()
-                                            .items_center()
-                                            .gap_1p5()
-                                            .child(label)
-                                            .children(spinner),
-                                    )
-                                    .tooltip(|_window, cx| {
-                                        Tooltip::with_meta(
-                                            "Toggle message role",
-                                            None,
-                                            "Available roles: You (User), Agent, System",
-                                            cx,
-                                        )
-                                    })
-                                    .on_click({
-                                        let text_thread = text_thread.clone();
-                                        move |_, _window, cx| {
-                                            text_thread.update(cx, |text_thread, cx| {
-                                                text_thread.cycle_message_roles(
-                                                    HashSet::from_iter(Some(message_id)),
-                                                    cx,
-                                                )
-                                            })
-                                        }
-                                    }),
-                            )
-                            .children(note);
-
-                        h_flex()
-                            .id(("message_header", message_id.as_u64()))
-                            .pl(cx.margins.gutter.full_width())
-                            .h_11()
-                            .w_full()
-                            .relative()
-                            .gap_1p5()
-                            .child(sender)
-                            .children(match &message.cache {
-                                Some(cache) if cache.is_final_anchor => match cache.status {
-                                    CacheStatus::Cached => Some(
-                                        div()
-                                            .id("cached")
-                                            .child(
-                                                Icon::new(IconName::DatabaseZap)
-                                                    .size(IconSize::XSmall)
-                                                    .color(Color::Hint),
-                                            )
-                                            .tooltip(|_window, cx| {
-                                                Tooltip::with_meta(
-                                                    "Context Cached",
-                                                    None,
-                                                    "Large messages cached to optimize performance",
-                                                    cx,
-                                                )
-                                            })
-                                            .into_any_element(),
-                                    ),
-                                    CacheStatus::Pending => Some(
-                                        div()
-                                            .child(
-                                                Icon::new(IconName::Ellipsis)
-                                                    .size(IconSize::XSmall)
-                                                    .color(Color::Hint),
-                                            )
-                                            .into_any_element(),
-                                    ),
-                                },
-                                _ => None,
-                            })
-                            .children(match &message.status {
-                                MessageStatus::Error(error) => Some(
-                                    Button::new("show-error", "Error")
-                                        .color(Color::Error)
-                                        .selected_label_color(Color::Error)
-                                        .selected_icon_color(Color::Error)
-                                        .icon(IconName::XCircle)
-                                        .icon_color(Color::Error)
-                                        .icon_size(IconSize::XSmall)
-                                        .icon_position(IconPosition::Start)
-                                        .tooltip(Tooltip::text("View Details"))
-                                        .on_click({
-                                            let text_thread = text_thread.clone();
-                                            let error = error.clone();
-                                            move |_, _window, cx| {
-                                                text_thread.update(cx, |_, cx| {
-                                                    cx.emit(TextThreadEvent::ShowAssistError(
-                                                        error.clone(),
-                                                    ));
-                                                });
-                                            }
-                                        })
-                                        .into_any_element(),
-                                ),
-                                MessageStatus::Canceled => Some(
-                                    h_flex()
-                                        .gap_1()
-                                        .items_center()
-                                        .child(
-                                            Icon::new(IconName::XCircle)
-                                                .color(Color::Disabled)
-                                                .size(IconSize::XSmall),
-                                        )
-                                        .child(
-                                            Label::new("Canceled")
-                                                .size(LabelSize::Small)
-                                                .color(Color::Disabled),
-                                        )
-                                        .into_any_element(),
-                                ),
-                                _ => None,
-                            })
-                            .into_any_element()
-                    }
-                })
-            };
-            let create_block_properties = |message: &Message| BlockProperties {
-                height: Some(2),
-                style: BlockStyle::Sticky,
-                placement: BlockPlacement::Above(
-                    buffer
-                        .anchor_in_excerpt(excerpt_id, message.anchor_range.start)
-                        .unwrap(),
-                ),
-                priority: usize::MAX,
-                render: render_block(MessageMetadata::from(message)),
-            };
-            let mut new_blocks = vec![];
-            let mut block_index_to_message = vec![];
-            for message in self.text_thread.read(cx).messages(cx) {
-                if blocks_to_remove.remove(&message.id).is_some() {
-                    // This is an old message that we might modify.
-                    let Some((meta, block_id)) = old_blocks.get_mut(&message.id) else {
-                        debug_assert!(
-                            false,
-                            "old_blocks should contain a message_id we've just removed."
-                        );
-                        continue;
-                    };
-                    // Should we modify it?
-                    let message_meta = MessageMetadata::from(&message);
-                    if meta != &message_meta {
-                        blocks_to_replace.insert(*block_id, render_block(message_meta.clone()));
-                        *meta = message_meta;
-                    }
-                } else {
-                    // This is a new message.
-                    new_blocks.push(create_block_properties(&message));
-                    block_index_to_message.push((message.id, MessageMetadata::from(&message)));
-                }
-            }
-            editor.replace_blocks(blocks_to_replace, None, cx);
-            editor.remove_blocks(blocks_to_remove.into_values().collect(), None, cx);
-
-            let ids = editor.insert_blocks(new_blocks, None, cx);
-            old_blocks.extend(ids.into_iter().zip(block_index_to_message).map(
-                |(block_id, (message_id, message_meta))| (message_id, (message_meta, block_id)),
-            ));
-            self.blocks = old_blocks;
-        });
-    }
-
-    /// Returns either the selected text, or the content of the Markdown code
-    /// block surrounding the cursor.
-    fn get_selection_or_code_block(
-        context_editor_view: &Entity<TextThreadEditor>,
-        cx: &mut Context<Workspace>,
-    ) -> Option<(String, bool)> {
-        const CODE_FENCE_DELIMITER: &str = "```";
-
-        let text_thread_editor = context_editor_view.read(cx).editor.clone();
-        text_thread_editor.update(cx, |text_thread_editor, cx| {
-            let display_map = text_thread_editor.display_snapshot(cx);
-            if text_thread_editor
-                .selections
-                .newest::<Point>(&display_map)
-                .is_empty()
-            {
-                let snapshot = text_thread_editor.buffer().read(cx).snapshot(cx);
-                let (_, _, snapshot) = snapshot.as_singleton()?;
-
-                let head = text_thread_editor
-                    .selections
-                    .newest::<Point>(&display_map)
-                    .head();
-                let offset = snapshot.point_to_offset(head);
-
-                let surrounding_code_block_range = find_surrounding_code_block(snapshot, offset)?;
-                let mut text = snapshot
-                    .text_for_range(surrounding_code_block_range)
-                    .collect::<String>();
-
-                // If there is no newline trailing the closing three-backticks, then
-                // tree-sitter-md extends the range of the content node to include
-                // the backticks.
-                if text.ends_with(CODE_FENCE_DELIMITER) {
-                    text.drain((text.len() - CODE_FENCE_DELIMITER.len())..);
-                }
-
-                (!text.is_empty()).then_some((text, true))
-            } else {
-                let selection = text_thread_editor.selections.newest_adjusted(&display_map);
-                let buffer = text_thread_editor.buffer().read(cx).snapshot(cx);
-                let selected_text = buffer.text_for_range(selection.range()).collect::<String>();
-
-                (!selected_text.is_empty()).then_some((selected_text, false))
-            }
-        })
-    }
-
-    pub fn insert_selection(
-        workspace: &mut Workspace,
-        _: &InsertIntoEditor,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        let Some(agent_panel_delegate) = <dyn AgentPanelDelegate>::try_global(cx) else {
-            return;
-        };
-        let Some(context_editor_view) =
-            agent_panel_delegate.active_text_thread_editor(workspace, window, cx)
-        else {
-            return;
-        };
-        let Some(active_editor_view) = workspace
-            .active_item(cx)
-            .and_then(|item| item.act_as::<Editor>(cx))
-        else {
-            return;
-        };
-
-        if let Some((text, _)) = Self::get_selection_or_code_block(&context_editor_view, cx) {
-            active_editor_view.update(cx, |editor, cx| {
-                editor.insert(&text, window, cx);
-                editor.focus_handle(cx).focus(window);
-            })
-        }
-    }
-
-    pub fn copy_code(
-        workspace: &mut Workspace,
-        _: &CopyCode,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        let result = maybe!({
-            let agent_panel_delegate = <dyn AgentPanelDelegate>::try_global(cx)?;
-            let context_editor_view =
-                agent_panel_delegate.active_text_thread_editor(workspace, window, cx)?;
-            Self::get_selection_or_code_block(&context_editor_view, cx)
-        });
-        let Some((text, is_code_block)) = result else {
-            return;
-        };
-
-        cx.write_to_clipboard(ClipboardItem::new_string(text));
-
-        struct CopyToClipboardToast;
-        workspace.show_toast(
-            Toast::new(
-                NotificationId::unique::<CopyToClipboardToast>(),
-                format!(
-                    "{} copied to clipboard.",
-                    if is_code_block {
-                        "Code block"
-                    } else {
-                        "Selection"
-                    }
-                ),
-            )
-            .autohide(),
-            cx,
-        );
-    }
-
-    pub fn handle_insert_dragged_files(
-        workspace: &mut Workspace,
-        action: &InsertDraggedFiles,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        let Some(agent_panel_delegate) = <dyn AgentPanelDelegate>::try_global(cx) else {
-            return;
-        };
-        let Some(context_editor_view) =
-            agent_panel_delegate.active_text_thread_editor(workspace, window, cx)
-        else {
-            return;
-        };
-
-        let project = context_editor_view.read(cx).project.clone();
-
-        let paths = match action {
-            InsertDraggedFiles::ProjectPaths(paths) => Task::ready((paths.clone(), vec![])),
-            InsertDraggedFiles::ExternalFiles(paths) => {
-                let tasks = paths
-                    .clone()
-                    .into_iter()
-                    .map(|path| Workspace::project_path_for_path(project.clone(), &path, false, cx))
-                    .collect::<Vec<_>>();
-
-                cx.background_spawn(async move {
-                    let mut paths = vec![];
-                    let mut worktrees = vec![];
-
-                    let opened_paths = futures::future::join_all(tasks).await;
-
-                    for entry in opened_paths {
-                        if let Some((worktree, project_path)) = entry.log_err() {
-                            worktrees.push(worktree);
-                            paths.push(project_path);
-                        }
-                    }
-
-                    (paths, worktrees)
-                })
-            }
-        };
-
-        context_editor_view.update(cx, |_, cx| {
-            cx.spawn_in(window, async move |this, cx| {
-                let (paths, dragged_file_worktrees) = paths.await;
-                this.update_in(cx, |this, window, cx| {
-                    this.insert_dragged_files(paths, dragged_file_worktrees, window, cx);
-                })
-                .ok();
-            })
-            .detach();
-        })
-    }
-
-    pub fn insert_dragged_files(
-        &mut self,
-        opened_paths: Vec<ProjectPath>,
-        added_worktrees: Vec<Entity<Worktree>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let mut file_slash_command_args = vec![];
-        for project_path in opened_paths.into_iter() {
-            let Some(worktree) = self
-                .project
-                .read(cx)
-                .worktree_for_id(project_path.worktree_id, cx)
-            else {
-                continue;
-            };
-            let path_style = worktree.read(cx).path_style();
-            let full_path = worktree
-                .read(cx)
-                .root_name()
-                .join(&project_path.path)
-                .display(path_style)
-                .into_owned();
-            file_slash_command_args.push(full_path);
-        }
-
-        let cmd_name = FileSlashCommand.name();
-
-        let file_argument = file_slash_command_args.join(" ");
-
-        self.editor.update(cx, |editor, cx| {
-            editor.insert("\n", window, cx);
-            editor.insert(&format!("/{} {}", cmd_name, file_argument), window, cx);
-        });
-        self.confirm_command(&ConfirmCommand, window, cx);
-        self.dragged_file_worktrees.extend(added_worktrees);
-    }
-
-    pub fn quote_selection(
-        workspace: &mut Workspace,
-        _: &AddSelectionToThread,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        let Some(agent_panel_delegate) = <dyn AgentPanelDelegate>::try_global(cx) else {
-            return;
-        };
-
-        let Some((selections, buffer)) = maybe!({
-            let editor = workspace
-                .active_item(cx)
-                .and_then(|item| item.act_as::<Editor>(cx))?;
-
-            let buffer = editor.read(cx).buffer().clone();
-            let snapshot = buffer.read(cx).snapshot(cx);
-            let selections = editor.update(cx, |editor, cx| {
-                editor
-                    .selections
-                    .all_adjusted(&editor.display_snapshot(cx))
-                    .into_iter()
-                    .filter_map(|s| {
-                        (!s.is_empty())
-                            .then(|| snapshot.anchor_after(s.start)..snapshot.anchor_before(s.end))
-                    })
-                    .collect::<Vec<_>>()
-            });
-            Some((selections, buffer))
-        }) else {
-            return;
-        };
-
-        if selections.is_empty() {
-            return;
-        }
-
-        agent_panel_delegate.quote_selection(workspace, selections, buffer, window, cx);
-    }
-
-    pub fn quote_ranges(
-        &mut self,
-        ranges: Vec<Range<Point>>,
-        snapshot: MultiBufferSnapshot,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let creases = selections_creases(ranges, snapshot, cx);
-
-        self.editor.update(cx, |editor, cx| {
-            editor.insert("\n", window, cx);
-            for (text, crease_title) in creases {
-                let point = editor
-                    .selections
-                    .newest::<Point>(&editor.display_snapshot(cx))
-                    .head();
-                let start_row = MultiBufferRow(point.row);
-
-                editor.insert(&text, window, cx);
-
-                let snapshot = editor.buffer().read(cx).snapshot(cx);
-                let anchor_before = snapshot.anchor_after(point);
-                let anchor_after = editor
-                    .selections
-                    .newest_anchor()
-                    .head()
-                    .bias_left(&snapshot);
-
-                editor.insert("\n", window, cx);
-
-                let fold_placeholder =
-                    quote_selection_fold_placeholder(crease_title, cx.entity().downgrade());
-                let crease = Crease::inline(
-                    anchor_before..anchor_after,
-                    fold_placeholder,
-                    render_quote_selection_output_toggle,
-                    |_, _, _, _| Empty.into_any(),
-                );
-                editor.insert_creases(vec![crease], cx);
-                editor.fold_at(start_row, window, cx);
-            }
-        })
-    }
-
-    fn copy(&mut self, _: &editor::actions::Copy, _window: &mut Window, cx: &mut Context<Self>) {
-        if self.editor.read(cx).selections.count() == 1 {
-            let (copied_text, metadata, _) = self.get_clipboard_contents(cx);
-            cx.write_to_clipboard(ClipboardItem::new_string_with_json_metadata(
-                copied_text,
-                metadata,
-            ));
-            cx.stop_propagation();
-            return;
-        }
-
-        cx.propagate();
-    }
-
-    fn cut(&mut self, _: &editor::actions::Cut, window: &mut Window, cx: &mut Context<Self>) {
-        if self.editor.read(cx).selections.count() == 1 {
-            let (copied_text, metadata, selections) = self.get_clipboard_contents(cx);
-
-            self.editor.update(cx, |editor, cx| {
-                editor.transact(window, cx, |this, window, cx| {
-                    this.change_selections(Default::default(), window, cx, |s| {
-                        s.select(selections);
-                    });
-                    this.insert("", window, cx);
-                    cx.write_to_clipboard(ClipboardItem::new_string_with_json_metadata(
-                        copied_text,
-                        metadata,
-                    ));
-                });
-            });
-
-            cx.stop_propagation();
-            return;
-        }
-
-        cx.propagate();
-    }
-
-    fn get_clipboard_contents(
-        &mut self,
-        cx: &mut Context<Self>,
-    ) -> (
-        String,
-        CopyMetadata,
-        Vec<text::Selection<MultiBufferOffset>>,
-    ) {
-        let (mut selection, creases) = self.editor.update(cx, |editor, cx| {
-            let mut selection = editor
-                .selections
-                .newest_adjusted(&editor.display_snapshot(cx));
-            let snapshot = editor.buffer().read(cx).snapshot(cx);
-
-            selection.goal = SelectionGoal::None;
-
-            let selection_start = snapshot.point_to_offset(selection.start);
-
-            (
-                selection.map(|point| snapshot.point_to_offset(point)),
-                editor.display_map.update(cx, |display_map, cx| {
-                    display_map
-                        .snapshot(cx)
-                        .crease_snapshot
-                        .creases_in_range(
-                            MultiBufferRow(selection.start.row)
-                                ..MultiBufferRow(selection.end.row + 1),
-                            &snapshot,
-                        )
-                        .filter_map(|crease| {
-                            if let Crease::Inline {
-                                range, metadata, ..
-                            } = &crease
-                            {
-                                let metadata = metadata.as_ref()?;
-                                let start = range
-                                    .start
-                                    .to_offset(&snapshot)
-                                    .saturating_sub(selection_start);
-                                let end = range
-                                    .end
-                                    .to_offset(&snapshot)
-                                    .saturating_sub(selection_start);
-
-                                let range_relative_to_selection = start..end;
-                                if !range_relative_to_selection.is_empty() {
-                                    return Some(SelectedCreaseMetadata {
-                                        range_relative_to_selection,
-                                        crease: metadata.clone(),
-                                    });
-                                }
-                            }
-                            None
-                        })
-                        .collect::<Vec<_>>()
-                }),
-            )
-        });
-
-        let text_thread = self.text_thread.read(cx);
-
-        let mut text = String::new();
-
-        // If selection is empty, we want to copy the entire line
-        if selection.range().is_empty() {
-            let snapshot = self.editor.read(cx).buffer().read(cx).snapshot(cx);
-            let point = snapshot.offset_to_point(selection.range().start);
-            selection.start = snapshot.point_to_offset(Point::new(point.row, 0));
-            selection.end = snapshot
-                .point_to_offset(cmp::min(Point::new(point.row + 1, 0), snapshot.max_point()));
-            for chunk in snapshot.text_for_range(selection.range()) {
-                text.push_str(chunk);
-            }
-        } else {
-            for message in text_thread.messages(cx) {
-                if message.offset_range.start >= selection.range().end.0 {
-                    break;
-                } else if message.offset_range.end >= selection.range().start.0 {
-                    let range = cmp::max(message.offset_range.start, selection.range().start.0)
-                        ..cmp::min(message.offset_range.end, selection.range().end.0);
-                    if !range.is_empty() {
-                        for chunk in text_thread.buffer().read(cx).text_for_range(range) {
-                            text.push_str(chunk);
-                        }
-                        if message.offset_range.end < selection.range().end.0 {
-                            text.push('\n');
-                        }
-                    }
-                }
-            }
-        }
-        (text, CopyMetadata { creases }, vec![selection])
-    }
-
-    fn paste(
-        &mut self,
-        action: &editor::actions::Paste,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let editor_clipboard_selections = cx
-            .read_from_clipboard()
-            .and_then(|item| item.entries().first().cloned())
-            .and_then(|entry| match entry {
-                ClipboardEntry::String(text) => {
-                    text.metadata_json::<Vec<editor::ClipboardSelection>>()
-                }
-                _ => None,
-            });
-
-        let has_file_context = editor_clipboard_selections
-            .as_ref()
-            .is_some_and(|selections| {
-                selections
-                    .iter()
-                    .any(|sel| sel.file_path.is_some() && sel.line_range.is_some())
-            });
-
-        if has_file_context {
-            if let Some(clipboard_item) = cx.read_from_clipboard() {
-                if let Some(ClipboardEntry::String(clipboard_text)) =
-                    clipboard_item.entries().first()
-                {
-                    if let Some(selections) = editor_clipboard_selections {
-                        cx.stop_propagation();
-
-                        let text = clipboard_text.text();
-                        self.editor.update(cx, |editor, cx| {
-                            let mut current_offset = 0;
-                            let weak_editor = cx.entity().downgrade();
-
-                            for selection in selections {
-                                if let (Some(file_path), Some(line_range)) =
-                                    (selection.file_path, selection.line_range)
-                                {
-                                    let selected_text =
-                                        &text[current_offset..current_offset + selection.len];
-                                    let fence = assistant_slash_commands::codeblock_fence_for_path(
-                                        file_path.to_str(),
-                                        Some(line_range.clone()),
-                                    );
-                                    let formatted_text = format!("{fence}{selected_text}\n```");
-
-                                    let insert_point = editor
-                                        .selections
-                                        .newest::<Point>(&editor.display_snapshot(cx))
-                                        .head();
-                                    let start_row = MultiBufferRow(insert_point.row);
-
-                                    editor.insert(&formatted_text, window, cx);
-
-                                    let snapshot = editor.buffer().read(cx).snapshot(cx);
-                                    let anchor_before = snapshot.anchor_after(insert_point);
-                                    let anchor_after = editor
-                                        .selections
-                                        .newest_anchor()
-                                        .head()
-                                        .bias_left(&snapshot);
-
-                                    editor.insert("\n", window, cx);
-
-                                    let crease_text = acp_thread::selection_name(
-                                        Some(file_path.as_ref()),
-                                        &line_range,
-                                    );
-
-                                    let fold_placeholder = quote_selection_fold_placeholder(
-                                        crease_text,
-                                        weak_editor.clone(),
-                                    );
-                                    let crease = Crease::inline(
-                                        anchor_before..anchor_after,
-                                        fold_placeholder,
-                                        render_quote_selection_output_toggle,
-                                        |_, _, _, _| Empty.into_any(),
-                                    );
-                                    editor.insert_creases(vec![crease], cx);
-                                    editor.fold_at(start_row, window, cx);
-
-                                    current_offset += selection.len;
-                                    if !selection.is_entire_line && current_offset < text.len() {
-                                        current_offset += 1;
-                                    }
-                                }
-                            }
-                        });
-                        return;
-                    }
-                }
-            }
-        }
-
-        cx.stop_propagation();
-
-        let mut images = if let Some(item) = cx.read_from_clipboard() {
-            item.into_entries()
-                .filter_map(|entry| {
-                    if let ClipboardEntry::Image(image) = entry {
-                        Some(image)
-                    } else {
-                        None
-                    }
-                })
-                .collect()
-        } else {
-            Vec::new()
-        };
-
-        if let Some(paths) = cx.read_from_clipboard() {
-            for path in paths
-                .into_entries()
-                .filter_map(|entry| {
-                    if let ClipboardEntry::ExternalPaths(paths) = entry {
-                        Some(paths.paths().to_owned())
-                    } else {
-                        None
-                    }
-                })
-                .flatten()
-            {
-                let Ok(content) = std::fs::read(path) else {
-                    continue;
-                };
-                let Ok(format) = image::guess_format(&content) else {
-                    continue;
-                };
-                images.push(gpui::Image::from_bytes(
-                    match format {
-                        image::ImageFormat::Png => gpui::ImageFormat::Png,
-                        image::ImageFormat::Jpeg => gpui::ImageFormat::Jpeg,
-                        image::ImageFormat::WebP => gpui::ImageFormat::Webp,
-                        image::ImageFormat::Gif => gpui::ImageFormat::Gif,
-                        image::ImageFormat::Bmp => gpui::ImageFormat::Bmp,
-                        image::ImageFormat::Tiff => gpui::ImageFormat::Tiff,
-                        image::ImageFormat::Ico => gpui::ImageFormat::Ico,
-                        _ => continue,
-                    },
-                    content,
-                ));
-            }
-        }
-
-        let metadata = if let Some(item) = cx.read_from_clipboard() {
-            item.entries().first().and_then(|entry| {
-                if let ClipboardEntry::String(text) = entry {
-                    text.metadata_json::<CopyMetadata>()
-                } else {
-                    None
-                }
-            })
-        } else {
-            None
-        };
-
-        if images.is_empty() {
-            self.editor.update(cx, |editor, cx| {
-                let paste_position = editor
-                    .selections
-                    .newest::<MultiBufferOffset>(&editor.display_snapshot(cx))
-                    .head();
-                editor.paste(action, window, cx);
-
-                if let Some(metadata) = metadata {
-                    let buffer = editor.buffer().read(cx).snapshot(cx);
-
-                    let mut buffer_rows_to_fold = BTreeSet::new();
-                    let weak_editor = cx.entity().downgrade();
-                    editor.insert_creases(
-                        metadata.creases.into_iter().map(|metadata| {
-                            let start = buffer.anchor_after(
-                                paste_position + metadata.range_relative_to_selection.start,
-                            );
-                            let end = buffer.anchor_before(
-                                paste_position + metadata.range_relative_to_selection.end,
-                            );
-
-                            let buffer_row = MultiBufferRow(start.to_point(&buffer).row);
-                            buffer_rows_to_fold.insert(buffer_row);
-                            Crease::inline(
-                                start..end,
-                                FoldPlaceholder {
-                                    render: render_fold_icon_button(
-                                        weak_editor.clone(),
-                                        metadata.crease.icon_path.clone(),
-                                        metadata.crease.label.clone(),
-                                    ),
-                                    ..Default::default()
-                                },
-                                render_slash_command_output_toggle,
-                                |_, _, _, _| Empty.into_any(),
-                            )
-                            .with_metadata(metadata.crease)
-                        }),
-                        cx,
-                    );
-                    for buffer_row in buffer_rows_to_fold.into_iter().rev() {
-                        editor.fold_at(buffer_row, window, cx);
-                    }
-                }
-            });
-        } else {
-            let mut image_positions = Vec::new();
-            self.editor.update(cx, |editor, cx| {
-                editor.transact(window, cx, |editor, _window, cx| {
-                    let edits = editor
-                        .selections
-                        .all::<MultiBufferOffset>(&editor.display_snapshot(cx))
-                        .into_iter()
-                        .map(|selection| (selection.start..selection.end, "\n"));
-                    editor.edit(edits, cx);
-
-                    let snapshot = editor.buffer().read(cx).snapshot(cx);
-                    for selection in editor
-                        .selections
-                        .all::<MultiBufferOffset>(&editor.display_snapshot(cx))
-                    {
-                        image_positions.push(snapshot.anchor_before(selection.end));
-                    }
-                });
-            });
-
-            self.text_thread.update(cx, |text_thread, cx| {
-                for image in images {
-                    let Some(render_image) = image.to_image_data(cx.svg_renderer()).log_err()
-                    else {
-                        continue;
-                    };
-                    let image_id = image.id();
-                    let image_task = LanguageModelImage::from_image(Arc::new(image), cx).shared();
-
-                    for image_position in image_positions.iter() {
-                        text_thread.insert_content(
-                            Content::Image {
-                                anchor: image_position.text_anchor,
-                                image_id,
-                                image: image_task.clone(),
-                                render_image: render_image.clone(),
-                            },
-                            cx,
-                        );
-                    }
-                }
-            });
-        }
-    }
-
-    fn update_image_blocks(&mut self, cx: &mut Context<Self>) {
-        self.editor.update(cx, |editor, cx| {
-            let buffer = editor.buffer().read(cx).snapshot(cx);
-            let excerpt_id = *buffer.as_singleton().unwrap().0;
-            let old_blocks = std::mem::take(&mut self.image_blocks);
-            let new_blocks = self
-                .text_thread
-                .read(cx)
-                .contents(cx)
-                .map(
-                    |Content::Image {
-                         anchor,
-                         render_image,
-                         ..
-                     }| (anchor, render_image),
-                )
-                .filter_map(|(anchor, render_image)| {
-                    const MAX_HEIGHT_IN_LINES: u32 = 8;
-                    let anchor = buffer.anchor_in_excerpt(excerpt_id, anchor).unwrap();
-                    let image = render_image;
-                    anchor.is_valid(&buffer).then(|| BlockProperties {
-                        placement: BlockPlacement::Above(anchor),
-                        height: Some(MAX_HEIGHT_IN_LINES),
-                        style: BlockStyle::Sticky,
-                        render: Arc::new(move |cx| {
-                            let image_size = size_for_image(
-                                &image,
-                                size(
-                                    cx.max_width - cx.margins.gutter.full_width(),
-                                    MAX_HEIGHT_IN_LINES as f32 * cx.line_height,
-                                ),
-                            );
-                            h_flex()
-                                .pl(cx.margins.gutter.full_width())
-                                .child(
-                                    img(image.clone())
-                                        .object_fit(gpui::ObjectFit::ScaleDown)
-                                        .w(image_size.width)
-                                        .h(image_size.height),
-                                )
-                                .into_any_element()
-                        }),
-                        priority: 0,
-                    })
-                })
-                .collect::<Vec<_>>();
-
-            editor.remove_blocks(old_blocks, None, cx);
-            let ids = editor.insert_blocks(new_blocks, None, cx);
-            self.image_blocks = HashSet::from_iter(ids);
-        });
-    }
-
-    fn split(&mut self, _: &Split, _window: &mut Window, cx: &mut Context<Self>) {
-        self.text_thread.update(cx, |text_thread, cx| {
-            let selections = self.editor.read(cx).selections.disjoint_anchors_arc();
-            for selection in selections.as_ref() {
-                let buffer = self.editor.read(cx).buffer().read(cx).snapshot(cx);
-                let range = selection
-                    .map(|endpoint| endpoint.to_offset(&buffer))
-                    .range();
-                text_thread.split_message(range.start.0..range.end.0, cx);
-            }
-        });
-    }
-
-    fn save(&mut self, _: &Save, _window: &mut Window, cx: &mut Context<Self>) {
-        self.text_thread.update(cx, |text_thread, cx| {
-            text_thread.save(Some(Duration::from_millis(500)), self.fs.clone(), cx)
-        });
-    }
-
-    pub fn title(&self, cx: &App) -> SharedString {
-        self.text_thread.read(cx).summary().or_default()
-    }
-
-    pub fn regenerate_summary(&mut self, cx: &mut Context<Self>) {
-        self.text_thread
-            .update(cx, |text_thread, cx| text_thread.summarize(true, cx));
-    }
-
-    fn render_remaining_tokens(&self, cx: &App) -> Option<impl IntoElement + use<>> {
-        let (token_count_color, token_count, max_token_count, tooltip) =
-            match token_state(&self.text_thread, cx)? {
-                TokenState::NoTokensLeft {
-                    max_token_count,
-                    token_count,
-                } => (
-                    Color::Error,
-                    token_count,
-                    max_token_count,
-                    Some("Token Limit Reached"),
-                ),
-                TokenState::HasMoreTokens {
-                    max_token_count,
-                    token_count,
-                    over_warn_threshold,
-                } => {
-                    let (color, tooltip) = if over_warn_threshold {
-                        (Color::Warning, Some("Token Limit is Close to Exhaustion"))
-                    } else {
-                        (Color::Muted, None)
-                    };
-                    (color, token_count, max_token_count, tooltip)
-                }
-            };
-
-        Some(
-            h_flex()
-                .id("token-count")
-                .gap_0p5()
-                .child(
-                    Label::new(humanize_token_count(token_count))
-                        .size(LabelSize::Small)
-                        .color(token_count_color),
-                )
-                .child(Label::new("/").size(LabelSize::Small).color(Color::Muted))
-                .child(
-                    Label::new(humanize_token_count(max_token_count))
-                        .size(LabelSize::Small)
-                        .color(Color::Muted),
-                )
-                .when_some(tooltip, |element, tooltip| {
-                    element.tooltip(Tooltip::text(tooltip))
-                }),
-        )
-    }
-
-    fn render_send_button(&self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let focus_handle = self.focus_handle(cx);
-
-        let (style, tooltip) = match token_state(&self.text_thread, cx) {
-            Some(TokenState::NoTokensLeft { .. }) => (
-                ButtonStyle::Tinted(TintColor::Error),
-                Some(Tooltip::text("Token limit reached")(window, cx)),
-            ),
-            Some(TokenState::HasMoreTokens {
-                over_warn_threshold,
-                ..
-            }) => {
-                let (style, tooltip) = if over_warn_threshold {
-                    (
-                        ButtonStyle::Tinted(TintColor::Warning),
-                        Some(Tooltip::text("Token limit is close to exhaustion")(
-                            window, cx,
-                        )),
-                    )
-                } else {
-                    (ButtonStyle::Filled, None)
-                };
-                (style, tooltip)
-            }
-            None => (ButtonStyle::Filled, None),
-        };
-
-        Button::new("send_button", "Send")
-            .label_size(LabelSize::Small)
-            .disabled(self.sending_disabled(cx))
-            .style(style)
-            .when_some(tooltip, |button, tooltip| {
-                button.tooltip(move |_, _| tooltip.clone())
-            })
-            .layer(ElevationIndex::ModalSurface)
-            .key_binding(
-                KeyBinding::for_action_in(&Assist, &focus_handle, cx)
-                    .map(|kb| kb.size(rems_from_px(12.))),
-            )
-            .on_click(move |_event, window, cx| {
-                focus_handle.dispatch_action(&Assist, window, cx);
-            })
-    }
-
-    /// Whether or not we should allow messages to be sent.
-    /// Will return false if the selected provided has a configuration error or
-    /// if the user has not accepted the terms of service for this provider.
-    fn sending_disabled(&self, cx: &mut Context<'_, TextThreadEditor>) -> bool {
-        let model_registry = LanguageModelRegistry::read_global(cx);
-        let Some(configuration_error) =
-            model_registry.configuration_error(model_registry.default_model(), cx)
-        else {
-            return false;
-        };
-
-        match configuration_error {
-            ConfigurationError::NoProvider
-            | ConfigurationError::ModelNotFound
-            | ConfigurationError::ProviderNotAuthenticated(_) => true,
-        }
-    }
-
-    fn render_inject_context_menu(&self, cx: &mut Context<Self>) -> impl IntoElement {
-        slash_command_picker::SlashCommandSelector::new(
-            self.slash_commands.clone(),
-            cx.entity().downgrade(),
-            IconButton::new("trigger", IconName::Plus)
-                .icon_size(IconSize::Small)
-                .icon_color(Color::Muted)
-                .selected_icon_color(Color::Accent)
-                .selected_style(ButtonStyle::Filled),
-            move |_window, cx| {
-                Tooltip::with_meta("Add Context", None, "Type / to insert via keyboard", cx)
-            },
-        )
-    }
-
-    fn render_burn_mode_toggle(&self, cx: &mut Context<Self>) -> Option<AnyElement> {
-        let text_thread = self.text_thread().read(cx);
-        let active_model = LanguageModelRegistry::read_global(cx)
-            .default_model()
-            .map(|default| default.model)?;
-        if !active_model.supports_burn_mode() {
-            return None;
-        }
-
-        let active_completion_mode = text_thread.completion_mode();
-        let burn_mode_enabled = active_completion_mode == CompletionMode::Burn;
-        let icon = if burn_mode_enabled {
-            IconName::ZedBurnModeOn
-        } else {
-            IconName::ZedBurnMode
-        };
-
-        Some(
-            IconButton::new("burn-mode", icon)
-                .icon_size(IconSize::Small)
-                .icon_color(Color::Muted)
-                .toggle_state(burn_mode_enabled)
-                .selected_icon_color(Color::Error)
-                .on_click(cx.listener(move |this, _event, _window, cx| {
-                    this.text_thread().update(cx, |text_thread, _cx| {
-                        text_thread.set_completion_mode(match active_completion_mode {
-                            CompletionMode::Burn => CompletionMode::Normal,
-                            CompletionMode::Normal => CompletionMode::Burn,
-                        });
-                    });
-                }))
-                .tooltip(move |_window, cx| {
-                    cx.new(|_| BurnModeTooltip::new().selected(burn_mode_enabled))
-                        .into()
-                })
-                .into_any_element(),
-        )
-    }
-
-    fn render_language_model_selector(
-        &self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let active_model = LanguageModelRegistry::read_global(cx)
-            .default_model()
-            .map(|default| default.model);
-        let model_name = match active_model {
-            Some(model) => model.name().0,
-            None => SharedString::from("Select Model"),
-        };
-
-        let active_provider = LanguageModelRegistry::read_global(cx)
-            .default_model()
-            .map(|default| default.provider);
-
-        let provider_icon = match active_provider {
-            Some(provider) => provider.icon(),
-            None => IconName::Ai,
-        };
-
-        let focus_handle = self.editor().focus_handle(cx);
-        let (color, icon) = if self.language_model_selector_menu_handle.is_deployed() {
-            (Color::Accent, IconName::ChevronUp)
-        } else {
-            (Color::Muted, IconName::ChevronDown)
-        };
-
-        PickerPopoverMenu::new(
-            self.language_model_selector.clone(),
-            ButtonLike::new("active-model")
-                .selected_style(ButtonStyle::Tinted(TintColor::Accent))
-                .child(
-                    h_flex()
-                        .gap_0p5()
-                        .child(Icon::new(provider_icon).color(color).size(IconSize::XSmall))
-                        .child(
-                            Label::new(model_name)
-                                .color(color)
-                                .size(LabelSize::Small)
-                                .ml_0p5(),
-                        )
-                        .child(Icon::new(icon).color(color).size(IconSize::XSmall)),
-                ),
-            move |_window, cx| {
-                Tooltip::for_action_in("Change Model", &ToggleModelSelector, &focus_handle, cx)
-            },
-            gpui::Corner::BottomRight,
-            cx,
-        )
-        .with_handle(self.language_model_selector_menu_handle.clone())
-        .render(window, cx)
-    }
-
-    fn render_last_error(&self, cx: &mut Context<Self>) -> Option<AnyElement> {
-        let last_error = self.last_error.as_ref()?;
-
-        Some(
-            div()
-                .absolute()
-                .right_3()
-                .bottom_12()
-                .max_w_96()
-                .py_2()
-                .px_3()
-                .elevation_2(cx)
-                .occlude()
-                .child(match last_error {
-                    AssistError::PaymentRequired => self.render_payment_required_error(cx),
-                    AssistError::Message(error_message) => {
-                        self.render_assist_error(error_message, cx)
-                    }
-                })
-                .into_any(),
-        )
-    }
-
-    fn render_payment_required_error(&self, cx: &mut Context<Self>) -> AnyElement {
-        const ERROR_MESSAGE: &str = "Free tier exceeded. Subscribe and add payment to continue using Zed LLMs. You'll be billed at cost for tokens used.";
-
-        v_flex()
-            .gap_0p5()
-            .child(
-                h_flex()
-                    .gap_1p5()
-                    .items_center()
-                    .child(Icon::new(IconName::XCircle).color(Color::Error))
-                    .child(Label::new("Free Usage Exceeded").weight(FontWeight::MEDIUM)),
-            )
-            .child(
-                div()
-                    .id("error-message")
-                    .max_h_24()
-                    .overflow_y_scroll()
-                    .child(Label::new(ERROR_MESSAGE)),
-            )
-            .child(
-                h_flex()
-                    .justify_end()
-                    .mt_1()
-                    .child(Button::new("subscribe", "Subscribe").on_click(cx.listener(
-                        |this, _, _window, cx| {
-                            this.last_error = None;
-                            cx.open_url(&zed_urls::account_url(cx));
-                            cx.notify();
-                        },
-                    )))
-                    .child(Button::new("dismiss", "Dismiss").on_click(cx.listener(
-                        |this, _, _window, cx| {
-                            this.last_error = None;
-                            cx.notify();
-                        },
-                    ))),
-            )
-            .into_any()
-    }
-
-    fn render_assist_error(
-        &self,
-        error_message: &SharedString,
-        cx: &mut Context<Self>,
-    ) -> AnyElement {
-        v_flex()
-            .gap_0p5()
-            .child(
-                h_flex()
-                    .gap_1p5()
-                    .items_center()
-                    .child(Icon::new(IconName::XCircle).color(Color::Error))
-                    .child(
-                        Label::new("Error interacting with language model")
-                            .weight(FontWeight::MEDIUM),
-                    ),
-            )
-            .child(
-                div()
-                    .id("error-message")
-                    .max_h_32()
-                    .overflow_y_scroll()
-                    .child(Label::new(error_message.clone())),
-            )
-            .child(
-                h_flex()
-                    .justify_end()
-                    .mt_1()
-                    .child(Button::new("dismiss", "Dismiss").on_click(cx.listener(
-                        |this, _, _window, cx| {
-                            this.last_error = None;
-                            cx.notify();
-                        },
-                    ))),
-            )
-            .into_any()
-    }
-}
-
-/// Returns the contents of the *outermost* fenced code block that contains the given offset.
-fn find_surrounding_code_block(snapshot: &BufferSnapshot, offset: usize) -> Option<Range<usize>> {
-    const CODE_BLOCK_NODE: &str = "fenced_code_block";
-    const CODE_BLOCK_CONTENT: &str = "code_fence_content";
-
-    let layer = snapshot.syntax_layers().next()?;
-
-    let root_node = layer.node();
-    let mut cursor = root_node.walk();
-
-    // Go to the first child for the given offset
-    while cursor.goto_first_child_for_byte(offset).is_some() {
-        // If we're at the end of the node, go to the next one.
-        // Example: if you have a fenced-code-block, and you're on the start of the line
-        // right after the closing ```, you want to skip the fenced-code-block and
-        // go to the next sibling.
-        if cursor.node().end_byte() == offset {
-            cursor.goto_next_sibling();
-        }
-
-        if cursor.node().start_byte() > offset {
-            break;
-        }
-
-        // We found the fenced code block.
-        if cursor.node().kind() == CODE_BLOCK_NODE {
-            // Now we need to find the child node that contains the code.
-            cursor.goto_first_child();
-            loop {
-                if cursor.node().kind() == CODE_BLOCK_CONTENT {
-                    return Some(cursor.node().byte_range());
-                }
-                if !cursor.goto_next_sibling() {
-                    break;
-                }
-            }
-        }
-    }
-
-    None
-}
-
-fn render_thought_process_fold_icon_button(
-    editor: WeakEntity<Editor>,
-    status: ThoughtProcessStatus,
-) -> Arc<dyn Send + Sync + Fn(FoldId, Range<Anchor>, &mut App) -> AnyElement> {
-    Arc::new(move |fold_id, fold_range, _cx| {
-        let editor = editor.clone();
-
-        let button = ButtonLike::new(fold_id).layer(ElevationIndex::ElevatedSurface);
-        let button = match status {
-            ThoughtProcessStatus::Pending => button
-                .child(
-                    Icon::new(IconName::ToolThink)
-                        .size(IconSize::Small)
-                        .color(Color::Muted),
-                )
-                .child(
-                    Label::new("Thinking…").color(Color::Muted).with_animation(
-                        "pulsating-label",
-                        Animation::new(Duration::from_secs(2))
-                            .repeat()
-                            .with_easing(pulsating_between(0.4, 0.8)),
-                        |label, delta| label.alpha(delta),
-                    ),
-                ),
-            ThoughtProcessStatus::Completed => button
-                .style(ButtonStyle::Filled)
-                .child(Icon::new(IconName::ToolThink).size(IconSize::Small))
-                .child(Label::new("Thought Process").single_line()),
-        };
-
-        button
-            .on_click(move |_, window, cx| {
-                editor
-                    .update(cx, |editor, cx| {
-                        let buffer_start = fold_range
-                            .start
-                            .to_point(&editor.buffer().read(cx).read(cx));
-                        let buffer_row = MultiBufferRow(buffer_start.row);
-                        editor.unfold_at(buffer_row, window, cx);
-                    })
-                    .ok();
-            })
-            .into_any_element()
-    })
-}
-
-fn render_fold_icon_button(
-    editor: WeakEntity<Editor>,
-    icon_path: SharedString,
-    label: SharedString,
-) -> Arc<dyn Send + Sync + Fn(FoldId, Range<Anchor>, &mut App) -> AnyElement> {
-    Arc::new(move |fold_id, fold_range, _cx| {
-        let editor = editor.clone();
-        ButtonLike::new(fold_id)
-            .style(ButtonStyle::Filled)
-            .layer(ElevationIndex::ElevatedSurface)
-            .child(Icon::from_path(icon_path.clone()))
-            .child(Label::new(label.clone()).single_line())
-            .on_click(move |_, window, cx| {
-                editor
-                    .update(cx, |editor, cx| {
-                        let buffer_start = fold_range
-                            .start
-                            .to_point(&editor.buffer().read(cx).read(cx));
-                        let buffer_row = MultiBufferRow(buffer_start.row);
-                        editor.unfold_at(buffer_row, window, cx);
-                    })
-                    .ok();
-            })
-            .into_any_element()
-    })
-}
-
-type ToggleFold = Arc<dyn Fn(bool, &mut Window, &mut App) + Send + Sync>;
-
-fn render_slash_command_output_toggle(
-    row: MultiBufferRow,
-    is_folded: bool,
-    fold: ToggleFold,
-    _window: &mut Window,
-    _cx: &mut App,
-) -> AnyElement {
-    Disclosure::new(
-        ("slash-command-output-fold-indicator", row.0 as u64),
-        !is_folded,
-    )
-    .toggle_state(is_folded)
-    .on_click(move |_e, window, cx| fold(!is_folded, window, cx))
-    .into_any_element()
-}
-
-pub fn fold_toggle(
-    name: &'static str,
-) -> impl Fn(
-    MultiBufferRow,
-    bool,
-    Arc<dyn Fn(bool, &mut Window, &mut App) + Send + Sync>,
-    &mut Window,
-    &mut App,
-) -> AnyElement {
-    move |row, is_folded, fold, _window, _cx| {
-        Disclosure::new((name, row.0 as u64), !is_folded)
-            .toggle_state(is_folded)
-            .on_click(move |_e, window, cx| fold(!is_folded, window, cx))
-            .into_any_element()
-    }
-}
-
-fn quote_selection_fold_placeholder(title: String, editor: WeakEntity<Editor>) -> FoldPlaceholder {
-    FoldPlaceholder {
-        render: Arc::new({
-            move |fold_id, fold_range, _cx| {
-                let editor = editor.clone();
-                ButtonLike::new(fold_id)
-                    .style(ButtonStyle::Filled)
-                    .layer(ElevationIndex::ElevatedSurface)
-                    .child(Icon::new(IconName::TextSnippet))
-                    .child(Label::new(title.clone()).single_line())
-                    .on_click(move |_, window, cx| {
-                        editor
-                            .update(cx, |editor, cx| {
-                                let buffer_start = fold_range
-                                    .start
-                                    .to_point(&editor.buffer().read(cx).read(cx));
-                                let buffer_row = MultiBufferRow(buffer_start.row);
-                                editor.unfold_at(buffer_row, window, cx);
-                            })
-                            .ok();
-                    })
-                    .into_any_element()
-            }
-        }),
-        merge_adjacent: false,
-        ..Default::default()
-    }
-}
-
-fn render_quote_selection_output_toggle(
-    row: MultiBufferRow,
-    is_folded: bool,
-    fold: ToggleFold,
-    _window: &mut Window,
-    _cx: &mut App,
-) -> AnyElement {
-    Disclosure::new(("quote-selection-indicator", row.0 as u64), !is_folded)
-        .toggle_state(is_folded)
-        .on_click(move |_e, window, cx| fold(!is_folded, window, cx))
-        .into_any_element()
-}
-
-fn render_pending_slash_command_gutter_decoration(
-    row: MultiBufferRow,
-    status: &PendingSlashCommandStatus,
-    confirm_command: Arc<dyn Fn(&mut Window, &mut App)>,
-) -> AnyElement {
-    let mut icon = IconButton::new(
-        ("slash-command-gutter-decoration", row.0),
-        ui::IconName::TriangleRight,
-    )
-    .on_click(move |_e, window, cx| confirm_command(window, cx))
-    .icon_size(ui::IconSize::Small)
-    .size(ui::ButtonSize::None);
-
-    match status {
-        PendingSlashCommandStatus::Idle => {
-            icon = icon.icon_color(Color::Muted);
-        }
-        PendingSlashCommandStatus::Running { .. } => {
-            icon = icon.toggle_state(true);
-        }
-        PendingSlashCommandStatus::Error(_) => icon = icon.icon_color(Color::Error),
-    }
-
-    icon.into_any_element()
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-struct CopyMetadata {
-    creases: Vec<SelectedCreaseMetadata>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-struct SelectedCreaseMetadata {
-    range_relative_to_selection: Range<usize>,
-    crease: CreaseMetadata,
-}
-
-impl EventEmitter<EditorEvent> for TextThreadEditor {}
-impl EventEmitter<SearchEvent> for TextThreadEditor {}
-
-impl Render for TextThreadEditor {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let language_model_selector = self.language_model_selector_menu_handle.clone();
-
-        v_flex()
-            .key_context("ContextEditor")
-            .capture_action(cx.listener(TextThreadEditor::cancel))
-            .capture_action(cx.listener(TextThreadEditor::save))
-            .capture_action(cx.listener(TextThreadEditor::copy))
-            .capture_action(cx.listener(TextThreadEditor::cut))
-            .capture_action(cx.listener(TextThreadEditor::paste))
-            .capture_action(cx.listener(TextThreadEditor::cycle_message_role))
-            .capture_action(cx.listener(TextThreadEditor::confirm_command))
-            .on_action(cx.listener(TextThreadEditor::assist))
-            .on_action(cx.listener(TextThreadEditor::split))
-            .on_action(move |_: &ToggleModelSelector, window, cx| {
-                language_model_selector.toggle(window, cx);
-            })
-            .size_full()
-            .child(
-                div()
-                    .flex_grow()
-                    .bg(cx.theme().colors().editor_background)
-                    .child(self.editor.clone()),
-            )
-            .children(self.render_last_error(cx))
-            .child(
-                h_flex()
-                    .relative()
-                    .py_2()
-                    .pl_1p5()
-                    .pr_2()
-                    .w_full()
-                    .justify_between()
-                    .border_t_1()
-                    .border_color(cx.theme().colors().border_variant)
-                    .bg(cx.theme().colors().editor_background)
-                    .child(
-                        h_flex()
-                            .gap_0p5()
-                            .child(self.render_inject_context_menu(cx))
-                            .children(self.render_burn_mode_toggle(cx)),
-                    )
-                    .child(
-                        h_flex()
-                            .gap_2p5()
-                            .children(self.render_remaining_tokens(cx))
-                            .child(
-                                h_flex()
-                                    .gap_1()
-                                    .child(self.render_language_model_selector(window, cx))
-                                    .child(self.render_send_button(window, cx)),
-                            ),
-                    ),
-            )
-    }
-}
-
-impl Focusable for TextThreadEditor {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        self.editor.focus_handle(cx)
-    }
-}
-
-impl Item for TextThreadEditor {
-    type Event = editor::EditorEvent;
-
-    fn tab_content_text(&self, _detail: usize, cx: &App) -> SharedString {
-        util::truncate_and_trailoff(&self.title(cx), MAX_TAB_TITLE_LEN).into()
-    }
-
-    fn to_item_events(event: &Self::Event, mut f: impl FnMut(item::ItemEvent)) {
-        match event {
-            EditorEvent::Edited { .. } => {
-                f(item::ItemEvent::Edit);
-            }
-            EditorEvent::TitleChanged => {
-                f(item::ItemEvent::UpdateTab);
-            }
-            _ => {}
-        }
-    }
-
-    fn tab_tooltip_text(&self, cx: &App) -> Option<SharedString> {
-        Some(self.title(cx).to_string().into())
-    }
-
-    fn as_searchable(
-        &self,
-        handle: &Entity<Self>,
-        _: &App,
-    ) -> Option<Box<dyn SearchableItemHandle>> {
-        Some(Box::new(handle.clone()))
-    }
-
-    fn set_nav_history(
-        &mut self,
-        nav_history: pane::ItemNavHistory,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.editor.update(cx, |editor, cx| {
-            Item::set_nav_history(editor, nav_history, window, cx)
-        })
-    }
-
-    fn navigate(
-        &mut self,
-        data: Box<dyn std::any::Any>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> bool {
-        self.editor
-            .update(cx, |editor, cx| Item::navigate(editor, data, window, cx))
-    }
-
-    fn deactivated(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.editor
-            .update(cx, |editor, cx| Item::deactivated(editor, window, cx))
-    }
-
-    fn act_as_type<'a>(
-        &'a self,
-        type_id: TypeId,
-        self_handle: &'a Entity<Self>,
-        _: &'a App,
-    ) -> Option<gpui::AnyEntity> {
-        if type_id == TypeId::of::<Self>() {
-            Some(self_handle.clone().into())
-        } else if type_id == TypeId::of::<Editor>() {
-            Some(self.editor.clone().into())
-        } else {
-            None
-        }
-    }
-
-    fn include_in_nav_history() -> bool {
-        false
-    }
-}
-
-impl SearchableItem for TextThreadEditor {
-    type Match = <Editor as SearchableItem>::Match;
-
-    fn clear_matches(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.editor.update(cx, |editor, cx| {
-            editor.clear_matches(window, cx);
-        });
-    }
-
-    fn update_matches(
-        &mut self,
-        matches: &[Self::Match],
-        active_match_index: Option<usize>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.editor.update(cx, |editor, cx| {
-            editor.update_matches(matches, active_match_index, window, cx)
-        });
-    }
-
-    fn query_suggestion(&mut self, window: &mut Window, cx: &mut Context<Self>) -> String {
-        self.editor
-            .update(cx, |editor, cx| editor.query_suggestion(window, cx))
-    }
-
-    fn activate_match(
-        &mut self,
-        index: usize,
-        matches: &[Self::Match],
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.editor.update(cx, |editor, cx| {
-            editor.activate_match(index, matches, window, cx);
-        });
-    }
-
-    fn select_matches(
-        &mut self,
-        matches: &[Self::Match],
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.editor
-            .update(cx, |editor, cx| editor.select_matches(matches, window, cx));
-    }
-
-    fn replace(
-        &mut self,
-        identifier: &Self::Match,
-        query: &project::search::SearchQuery,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.editor.update(cx, |editor, cx| {
-            editor.replace(identifier, query, window, cx)
-        });
-    }
-
-    fn find_matches(
-        &mut self,
-        query: Arc<project::search::SearchQuery>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Vec<Self::Match>> {
-        self.editor
-            .update(cx, |editor, cx| editor.find_matches(query, window, cx))
-    }
-
-    fn active_match_index(
-        &mut self,
-        direction: Direction,
-        matches: &[Self::Match],
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<usize> {
-        self.editor.update(cx, |editor, cx| {
-            editor.active_match_index(direction, matches, window, cx)
-        })
-    }
-}
-
-impl FollowableItem for TextThreadEditor {
-    fn remote_id(&self) -> Option<workspace::ViewId> {
-        self.remote_id
-    }
-
-    fn to_state_proto(&self, window: &Window, cx: &App) -> Option<proto::view::Variant> {
-        let text_thread = self.text_thread.read(cx);
-        Some(proto::view::Variant::ContextEditor(
-            proto::view::ContextEditor {
-                context_id: text_thread.id().to_proto(),
-                editor: if let Some(proto::view::Variant::Editor(proto)) =
-                    self.editor.read(cx).to_state_proto(window, cx)
-                {
-                    Some(proto)
-                } else {
-                    None
-                },
-            },
-        ))
-    }
-
-    fn from_state_proto(
-        workspace: Entity<Workspace>,
-        id: workspace::ViewId,
-        state: &mut Option<proto::view::Variant>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<Task<Result<Entity<Self>>>> {
-        let proto::view::Variant::ContextEditor(_) = state.as_ref()? else {
-            return None;
-        };
-        let Some(proto::view::Variant::ContextEditor(state)) = state.take() else {
-            unreachable!()
-        };
-
-        let text_thread_id = TextThreadId::from_proto(state.context_id);
-        let editor_state = state.editor?;
-
-        let project = workspace.read(cx).project().clone();
-        let agent_panel_delegate = <dyn AgentPanelDelegate>::try_global(cx)?;
-
-        let text_thread_editor_task = workspace.update(cx, |workspace, cx| {
-            agent_panel_delegate.open_remote_text_thread(workspace, text_thread_id, window, cx)
-        });
-
-        Some(window.spawn(cx, async move |cx| {
-            let text_thread_editor = text_thread_editor_task.await?;
-            text_thread_editor
-                .update_in(cx, |text_thread_editor, window, cx| {
-                    text_thread_editor.remote_id = Some(id);
-                    text_thread_editor.editor.update(cx, |editor, cx| {
-                        editor.apply_update_proto(
-                            &project,
-                            proto::update_view::Variant::Editor(proto::update_view::Editor {
-                                selections: editor_state.selections,
-                                pending_selection: editor_state.pending_selection,
-                                scroll_top_anchor: editor_state.scroll_top_anchor,
-                                scroll_x: editor_state.scroll_y,
-                                scroll_y: editor_state.scroll_y,
-                                ..Default::default()
-                            }),
-                            window,
-                            cx,
-                        )
-                    })
-                })?
-                .await?;
-            Ok(text_thread_editor)
-        }))
-    }
-
-    fn to_follow_event(event: &Self::Event) -> Option<item::FollowEvent> {
-        Editor::to_follow_event(event)
-    }
-
-    fn add_event_to_update_proto(
-        &self,
-        event: &Self::Event,
-        update: &mut Option<proto::update_view::Variant>,
-        window: &Window,
-        cx: &App,
-    ) -> bool {
-        self.editor
-            .read(cx)
-            .add_event_to_update_proto(event, update, window, cx)
-    }
-
-    fn apply_update_proto(
-        &mut self,
-        project: &Entity<Project>,
-        message: proto::update_view::Variant,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        self.editor.update(cx, |editor, cx| {
-            editor.apply_update_proto(project, message, window, cx)
-        })
-    }
-
-    fn is_project_item(&self, _window: &Window, _cx: &App) -> bool {
-        true
-    }
-
-    fn set_leader_id(
-        &mut self,
-        leader_id: Option<CollaboratorId>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.editor
-            .update(cx, |editor, cx| editor.set_leader_id(leader_id, window, cx))
-    }
-
-    fn dedup(&self, existing: &Self, _window: &Window, cx: &App) -> Option<item::Dedup> {
-        if existing.text_thread.read(cx).id() == self.text_thread.read(cx).id() {
-            Some(item::Dedup::KeepExisting)
-        } else {
-            None
-        }
-    }
-}
-
-enum PendingSlashCommand {}
-
-fn invoked_slash_command_fold_placeholder(
-    command_id: InvokedSlashCommandId,
-    text_thread: WeakEntity<TextThread>,
-) -> FoldPlaceholder {
-    FoldPlaceholder {
-        constrain_width: false,
-        merge_adjacent: false,
-        render: Arc::new(move |fold_id, _, cx| {
-            let Some(text_thread) = text_thread.upgrade() else {
-                return Empty.into_any();
-            };
-
-            let Some(command) = text_thread.read(cx).invoked_slash_command(&command_id) else {
-                return Empty.into_any();
-            };
-
-            h_flex()
-                .id(fold_id)
-                .px_1()
-                .ml_6()
-                .gap_2()
-                .bg(cx.theme().colors().surface_background)
-                .rounded_sm()
-                .child(Label::new(format!("/{}", command.name)))
-                .map(|parent| match &command.status {
-                    InvokedSlashCommandStatus::Running(_) => {
-                        parent.child(Icon::new(IconName::ArrowCircle).with_rotate_animation(4))
-                    }
-                    InvokedSlashCommandStatus::Error(message) => parent.child(
-                        Label::new(format!("error: {message}"))
-                            .single_line()
-                            .color(Color::Error),
-                    ),
-                    InvokedSlashCommandStatus::Finished => parent,
-                })
-                .into_any_element()
-        }),
-        type_tag: Some(TypeId::of::<PendingSlashCommand>()),
-    }
-}
-
-enum TokenState {
-    NoTokensLeft {
-        max_token_count: u64,
-        token_count: u64,
-    },
-    HasMoreTokens {
-        max_token_count: u64,
-        token_count: u64,
-        over_warn_threshold: bool,
-    },
-}
-
-fn token_state(text_thread: &Entity<TextThread>, cx: &App) -> Option<TokenState> {
-    const WARNING_TOKEN_THRESHOLD: f32 = 0.8;
-
-    let model = LanguageModelRegistry::read_global(cx)
-        .default_model()?
-        .model;
-    let token_count = text_thread.read(cx).token_count()?;
-    let max_token_count =
-        model.max_token_count_for_mode(text_thread.read(cx).completion_mode().into());
-    let token_state = if max_token_count.saturating_sub(token_count) == 0 {
-        TokenState::NoTokensLeft {
-            max_token_count,
-            token_count,
-        }
-    } else {
-        let over_warn_threshold =
-            token_count as f32 / max_token_count as f32 >= WARNING_TOKEN_THRESHOLD;
-        TokenState::HasMoreTokens {
-            max_token_count,
-            token_count,
-            over_warn_threshold,
-        }
-    };
-    Some(token_state)
-}
-
-fn size_for_image(data: &RenderImage, max_size: Size<Pixels>) -> Size<Pixels> {
-    let image_size = data
-        .size(0)
-        .map(|dimension| Pixels::from(u32::from(dimension)));
-    let image_ratio = image_size.width / image_size.height;
-    let bounds_ratio = max_size.width / max_size.height;
-
-    if image_size.width > max_size.width || image_size.height > max_size.height {
-        if bounds_ratio > image_ratio {
-            size(
-                image_size.width * (max_size.height / image_size.height),
-                max_size.height,
-            )
-        } else {
-            size(
-                max_size.width,
-                image_size.height * (max_size.width / image_size.width),
-            )
-        }
-    } else {
-        size(image_size.width, image_size.height)
-    }
-}
-
-pub fn humanize_token_count(count: u64) -> String {
-    match count {
-        0..=999 => count.to_string(),
-        1000..=9999 => {
-            let thousands = count / 1000;
-            let hundreds = (count % 1000 + 50) / 100;
-            if hundreds == 0 {
-                format!("{}k", thousands)
-            } else if hundreds == 10 {
-                format!("{}k", thousands + 1)
-            } else {
-                format!("{}.{}k", thousands, hundreds)
-            }
-        }
-        1_000_000..=9_999_999 => {
-            let millions = count / 1_000_000;
-            let hundred_thousands = (count % 1_000_000 + 50_000) / 100_000;
-            if hundred_thousands == 0 {
-                format!("{}M", millions)
-            } else if hundred_thousands == 10 {
-                format!("{}M", millions + 1)
-            } else {
-                format!("{}.{}M", millions, hundred_thousands)
-            }
-        }
-        10_000_000.. => format!("{}M", (count + 500_000) / 1_000_000),
-        _ => format!("{}k", (count + 500) / 1000),
-    }
-}
-
-pub fn make_lsp_adapter_delegate(
-    project: &Entity<Project>,
-    cx: &mut App,
-) -> Result<Option<Arc<dyn LspAdapterDelegate>>> {
-    project.update(cx, |project, cx| {
-        // TODO: Find the right worktree.
-        let Some(worktree) = project.worktrees(cx).next() else {
-            return Ok(None::<Arc<dyn LspAdapterDelegate>>);
-        };
-        let http_client = project.client().http_client();
-        project.lsp_store().update(cx, |_, cx| {
-            Ok(Some(LocalLspAdapterDelegate::new(
-                project.languages().clone(),
-                project.environment(),
-                cx.weak_entity(),
-                &worktree,
-                http_client,
-                project.fs().clone(),
-                cx,
-            ) as Arc<dyn LspAdapterDelegate>))
-        })
-    })
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use editor::{MultiBufferOffset, SelectionEffects};
-    use fs::FakeFs;
-    use gpui::{App, TestAppContext, VisualTestContext};
-    use indoc::indoc;
-    use language::{Buffer, LanguageRegistry};
-    use pretty_assertions::assert_eq;
-    use prompt_store::PromptBuilder;
-    use text::OffsetRangeExt;
-    use unindent::Unindent;
-    use util::path;
-
-    #[gpui::test]
-    async fn test_copy_paste_whole_message(cx: &mut TestAppContext) {
-        let (context, text_thread_editor, mut cx) = setup_text_thread_editor_text(vec![
-            (Role::User, "What is the Zed editor?"),
-            (
-                Role::Assistant,
-                "Zed is a modern, high-performance code editor designed from the ground up for speed and collaboration.",
-            ),
-            (Role::User, ""),
-        ],cx).await;
-
-        // Select & Copy whole user message
-        assert_copy_paste_text_thread_editor(
-            &text_thread_editor,
-            message_range(&context, 0, &mut cx),
-            indoc! {"
-                What is the Zed editor?
-                Zed is a modern, high-performance code editor designed from the ground up for speed and collaboration.
-                What is the Zed editor?
-            "},
-            &mut cx,
-        );
-
-        // Select & Copy whole assistant message
-        assert_copy_paste_text_thread_editor(
-            &text_thread_editor,
-            message_range(&context, 1, &mut cx),
-            indoc! {"
-                What is the Zed editor?
-                Zed is a modern, high-performance code editor designed from the ground up for speed and collaboration.
-                What is the Zed editor?
-                Zed is a modern, high-performance code editor designed from the ground up for speed and collaboration.
-            "},
-            &mut cx,
-        );
-    }
-
-    #[gpui::test]
-    async fn test_copy_paste_no_selection(cx: &mut TestAppContext) {
-        let (context, text_thread_editor, mut cx) = setup_text_thread_editor_text(
-            vec![
-                (Role::User, "user1"),
-                (Role::Assistant, "assistant1"),
-                (Role::Assistant, "assistant2"),
-                (Role::User, ""),
-            ],
-            cx,
-        )
-        .await;
-
-        // Copy and paste first assistant message
-        let message_2_range = message_range(&context, 1, &mut cx);
-        assert_copy_paste_text_thread_editor(
-            &text_thread_editor,
-            message_2_range.start..message_2_range.start,
-            indoc! {"
-                user1
-                assistant1
-                assistant2
-                assistant1
-            "},
-            &mut cx,
-        );
-
-        // Copy and cut second assistant message
-        let message_3_range = message_range(&context, 2, &mut cx);
-        assert_copy_paste_text_thread_editor(
-            &text_thread_editor,
-            message_3_range.start..message_3_range.start,
-            indoc! {"
-                user1
-                assistant1
-                assistant2
-                assistant1
-                assistant2
-            "},
-            &mut cx,
-        );
-    }
-
-    #[gpui::test]
-    fn test_find_code_blocks(cx: &mut App) {
-        let markdown = languages::language("markdown", tree_sitter_md::LANGUAGE.into());
-
-        let buffer = cx.new(|cx| {
-            let text = r#"
-                line 0
-                line 1
-                ```rust
-                fn main() {}
-                ```
-                line 5
-                line 6
-                line 7
-                ```go
-                func main() {}
-                ```
-                line 11
-                ```
-                this is plain text code block
-                ```
-
-                ```go
-                func another() {}
-                ```
-                line 19
-            "#
-            .unindent();
-            let mut buffer = Buffer::local(text, cx);
-            buffer.set_language(Some(markdown.clone()), cx);
-            buffer
-        });
-        let snapshot = buffer.read(cx).snapshot();
-
-        let code_blocks = vec![
-            Point::new(3, 0)..Point::new(4, 0),
-            Point::new(9, 0)..Point::new(10, 0),
-            Point::new(13, 0)..Point::new(14, 0),
-            Point::new(17, 0)..Point::new(18, 0),
-        ]
-        .into_iter()
-        .map(|range| snapshot.point_to_offset(range.start)..snapshot.point_to_offset(range.end))
-        .collect::<Vec<_>>();
-
-        let expected_results = vec![
-            (0, None),
-            (1, None),
-            (2, Some(code_blocks[0].clone())),
-            (3, Some(code_blocks[0].clone())),
-            (4, Some(code_blocks[0].clone())),
-            (5, None),
-            (6, None),
-            (7, None),
-            (8, Some(code_blocks[1].clone())),
-            (9, Some(code_blocks[1].clone())),
-            (10, Some(code_blocks[1].clone())),
-            (11, None),
-            (12, Some(code_blocks[2].clone())),
-            (13, Some(code_blocks[2].clone())),
-            (14, Some(code_blocks[2].clone())),
-            (15, None),
-            (16, Some(code_blocks[3].clone())),
-            (17, Some(code_blocks[3].clone())),
-            (18, Some(code_blocks[3].clone())),
-            (19, None),
-        ];
-
-        for (row, expected) in expected_results {
-            let offset = snapshot.point_to_offset(Point::new(row, 0));
-            let range = find_surrounding_code_block(&snapshot, offset);
-            assert_eq!(range, expected, "unexpected result on row {:?}", row);
-        }
-    }
-
-    async fn setup_text_thread_editor_text(
-        messages: Vec<(Role, &str)>,
-        cx: &mut TestAppContext,
-    ) -> (
-        Entity<TextThread>,
-        Entity<TextThreadEditor>,
-        VisualTestContext,
-    ) {
-        cx.update(init_test);
-
-        let fs = FakeFs::new(cx.executor());
-        let text_thread = create_text_thread_with_messages(messages, cx);
-
-        let project = Project::test(fs.clone(), [path!("/test").as_ref()], cx).await;
-        let window = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let workspace = window.root(cx).unwrap();
-        let mut cx = VisualTestContext::from_window(*window, cx);
-
-        let text_thread_editor = window
-            .update(&mut cx, |_, window, cx| {
-                cx.new(|cx| {
-                    TextThreadEditor::for_text_thread(
-                        text_thread.clone(),
-                        fs,
-                        workspace.downgrade(),
-                        project,
-                        None,
-                        window,
-                        cx,
-                    )
-                })
-            })
-            .unwrap();
-
-        (text_thread, text_thread_editor, cx)
-    }
-
-    fn message_range(
-        text_thread: &Entity<TextThread>,
-        message_ix: usize,
-        cx: &mut TestAppContext,
-    ) -> Range<MultiBufferOffset> {
-        let range = text_thread.update(cx, |text_thread, cx| {
-            text_thread
-                .messages(cx)
-                .nth(message_ix)
-                .unwrap()
-                .anchor_range
-                .to_offset(&text_thread.buffer().read(cx).snapshot())
-        });
-        MultiBufferOffset(range.start)..MultiBufferOffset(range.end)
-    }
-
-    fn assert_copy_paste_text_thread_editor<T: editor::ToOffset>(
-        text_thread_editor: &Entity<TextThreadEditor>,
-        range: Range<T>,
-        expected_text: &str,
-        cx: &mut VisualTestContext,
-    ) {
-        text_thread_editor.update_in(cx, |text_thread_editor, window, cx| {
-            text_thread_editor.editor.update(cx, |editor, cx| {
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.select_ranges([range])
-                });
-            });
-
-            text_thread_editor.copy(&Default::default(), window, cx);
-
-            text_thread_editor.editor.update(cx, |editor, cx| {
-                editor.move_to_end(&Default::default(), window, cx);
-            });
-
-            text_thread_editor.paste(&Default::default(), window, cx);
-
-            text_thread_editor.editor.update(cx, |editor, cx| {
-                assert_eq!(editor.text(cx), expected_text);
-            });
-        });
-    }
-
-    fn create_text_thread_with_messages(
-        mut messages: Vec<(Role, &str)>,
-        cx: &mut TestAppContext,
-    ) -> Entity<TextThread> {
-        let registry = Arc::new(LanguageRegistry::test(cx.executor()));
-        let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
-        cx.new(|cx| {
-            let mut text_thread = TextThread::local(
-                registry,
-                None,
-                None,
-                prompt_builder.clone(),
-                Arc::new(SlashCommandWorkingSet::default()),
-                cx,
-            );
-            let mut message_1 = text_thread.messages(cx).next().unwrap();
-            let (role, text) = messages.remove(0);
-
-            loop {
-                if role == message_1.role {
-                    text_thread.buffer().update(cx, |buffer, cx| {
-                        buffer.edit([(message_1.offset_range, text)], None, cx);
-                    });
-                    break;
-                }
-                let mut ids = HashSet::default();
-                ids.insert(message_1.id);
-                text_thread.cycle_message_roles(ids, cx);
-                message_1 = text_thread.messages(cx).next().unwrap();
-            }
-
-            let mut last_message_id = message_1.id;
-            for (role, text) in messages {
-                text_thread.insert_message_after(last_message_id, role, MessageStatus::Done, cx);
-                let message = text_thread.messages(cx).last().unwrap();
-                last_message_id = message.id;
-                text_thread.buffer().update(cx, |buffer, cx| {
-                    buffer.edit([(message.offset_range, text)], None, cx);
-                })
-            }
-
-            text_thread
-        })
-    }
-
-    fn init_test(cx: &mut App) {
-        let settings_store = SettingsStore::test(cx);
-        prompt_store::init(cx);
-        LanguageModelRegistry::test(cx);
-        cx.set_global(settings_store);
-
-        theme::init(theme::LoadThemes::JustBase, cx);
-    }
-}
diff --git a/crates/agent_ui/src/ui.rs b/crates/agent_ui/src/ui.rs
deleted file mode 100644
index e604df416e..0000000000
--- a/crates/agent_ui/src/ui.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-mod acp_onboarding_modal;
-mod agent_notification;
-mod burn_mode_tooltip;
-mod claude_code_onboarding_modal;
-mod end_trial_upsell;
-mod hold_for_default;
-mod onboarding_modal;
-mod unavailable_editing_tooltip;
-mod usage_callout;
-
-pub use acp_onboarding_modal::*;
-pub use agent_notification::*;
-pub use burn_mode_tooltip::*;
-pub use claude_code_onboarding_modal::*;
-pub use end_trial_upsell::*;
-pub use hold_for_default::*;
-pub use onboarding_modal::*;
-pub use unavailable_editing_tooltip::*;
-pub use usage_callout::*;
diff --git a/crates/agent_ui/src/ui/acp_onboarding_modal.rs b/crates/agent_ui/src/ui/acp_onboarding_modal.rs
deleted file mode 100644
index 8433904fb3..0000000000
--- a/crates/agent_ui/src/ui/acp_onboarding_modal.rs
+++ /dev/null
@@ -1,246 +0,0 @@
-use client::zed_urls;
-use gpui::{
-    ClickEvent, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, MouseDownEvent, Render,
-    linear_color_stop, linear_gradient,
-};
-use ui::{TintColor, Vector, VectorName, prelude::*};
-use workspace::{ModalView, Workspace};
-
-use crate::agent_panel::{AgentPanel, AgentType};
-
-macro_rules! acp_onboarding_event {
-    ($name:expr) => {
-        telemetry::event!($name, source = "ACP Onboarding");
-    };
-    ($name:expr, $($key:ident $(= $value:expr)?),+ $(,)?) => {
-        telemetry::event!($name, source = "ACP Onboarding", $($key $(= $value)?),+);
-    };
-}
-
-pub struct AcpOnboardingModal {
-    focus_handle: FocusHandle,
-    workspace: Entity<Workspace>,
-}
-
-impl AcpOnboardingModal {
-    pub fn toggle(workspace: &mut Workspace, window: &mut Window, cx: &mut Context<Workspace>) {
-        let workspace_entity = cx.entity();
-        workspace.toggle_modal(window, cx, |_window, cx| Self {
-            workspace: workspace_entity,
-            focus_handle: cx.focus_handle(),
-        });
-    }
-
-    fn open_panel(&mut self, _: &ClickEvent, window: &mut Window, cx: &mut Context<Self>) {
-        self.workspace.update(cx, |workspace, cx| {
-            workspace.focus_panel::<AgentPanel>(window, cx);
-
-            if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
-                panel.update(cx, |panel, cx| {
-                    panel.new_agent_thread(AgentType::Gemini, window, cx);
-                });
-            }
-        });
-
-        cx.emit(DismissEvent);
-
-        acp_onboarding_event!("Open Panel Clicked");
-    }
-
-    fn view_docs(&mut self, _: &ClickEvent, _: &mut Window, cx: &mut Context<Self>) {
-        cx.open_url(&zed_urls::external_agents_docs(cx));
-        cx.notify();
-
-        acp_onboarding_event!("Documentation Link Clicked");
-    }
-
-    fn cancel(&mut self, _: &menu::Cancel, _: &mut Window, cx: &mut Context<Self>) {
-        cx.emit(DismissEvent);
-    }
-}
-
-impl EventEmitter<DismissEvent> for AcpOnboardingModal {}
-
-impl Focusable for AcpOnboardingModal {
-    fn focus_handle(&self, _cx: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl ModalView for AcpOnboardingModal {}
-
-impl Render for AcpOnboardingModal {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let illustration_element = |label: bool, opacity: f32| {
-            h_flex()
-                .px_1()
-                .py_0p5()
-                .gap_1()
-                .rounded_sm()
-                .bg(cx.theme().colors().element_active.opacity(0.05))
-                .border_1()
-                .border_color(cx.theme().colors().border)
-                .border_dashed()
-                .child(
-                    Icon::new(IconName::Stop)
-                        .size(IconSize::Small)
-                        .color(Color::Custom(cx.theme().colors().text_muted.opacity(0.15))),
-                )
-                .map(|this| {
-                    if label {
-                        this.child(
-                            Label::new("Your Agent Here")
-                                .size(LabelSize::Small)
-                                .color(Color::Muted),
-                        )
-                    } else {
-                        this.child(
-                            div().w_16().h_1().rounded_full().bg(cx
-                                .theme()
-                                .colors()
-                                .element_active
-                                .opacity(0.6)),
-                        )
-                    }
-                })
-                .opacity(opacity)
-        };
-
-        let illustration = h_flex()
-            .relative()
-            .h(rems_from_px(126.))
-            .bg(cx.theme().colors().editor_background)
-            .border_b_1()
-            .border_color(cx.theme().colors().border_variant)
-            .justify_center()
-            .gap_8()
-            .rounded_t_md()
-            .overflow_hidden()
-            .child(
-                div().absolute().inset_0().w(px(515.)).h(px(126.)).child(
-                    Vector::new(VectorName::AcpGrid, rems_from_px(515.), rems_from_px(126.))
-                        .color(ui::Color::Custom(cx.theme().colors().text.opacity(0.02))),
-                ),
-            )
-            .child(div().absolute().inset_0().size_full().bg(linear_gradient(
-                0.,
-                linear_color_stop(
-                    cx.theme().colors().elevated_surface_background.opacity(0.1),
-                    0.9,
-                ),
-                linear_color_stop(
-                    cx.theme().colors().elevated_surface_background.opacity(0.),
-                    0.,
-                ),
-            )))
-            .child(
-                div()
-                    .absolute()
-                    .inset_0()
-                    .size_full()
-                    .bg(gpui::black().opacity(0.15)),
-            )
-            .child(
-                Vector::new(
-                    VectorName::AcpLogoSerif,
-                    rems_from_px(257.),
-                    rems_from_px(47.),
-                )
-                .color(ui::Color::Custom(cx.theme().colors().text.opacity(0.8))),
-            )
-            .child(
-                v_flex()
-                    .gap_1p5()
-                    .child(illustration_element(false, 0.15))
-                    .child(illustration_element(true, 0.3))
-                    .child(
-                        h_flex()
-                            .pl_1()
-                            .pr_2()
-                            .py_0p5()
-                            .gap_1()
-                            .rounded_sm()
-                            .bg(cx.theme().colors().element_active.opacity(0.2))
-                            .border_1()
-                            .border_color(cx.theme().colors().border)
-                            .child(
-                                Icon::new(IconName::AiGemini)
-                                    .size(IconSize::Small)
-                                    .color(Color::Muted),
-                            )
-                            .child(Label::new("New Gemini CLI Thread").size(LabelSize::Small)),
-                    )
-                    .child(illustration_element(true, 0.3))
-                    .child(illustration_element(false, 0.15)),
-            );
-
-        let heading = v_flex()
-            .w_full()
-            .gap_1()
-            .child(
-                Label::new("Now Available")
-                    .size(LabelSize::Small)
-                    .color(Color::Muted),
-            )
-            .child(Headline::new("Bring Your Own Agent to Zed").size(HeadlineSize::Large));
-
-        let copy = "Bring the agent of your choice to Zed via our new Agent Client Protocol (ACP), starting with Google's Gemini CLI integration.";
-
-        let open_panel_button = Button::new("open-panel", "Start with Gemini CLI")
-            .icon_size(IconSize::Indicator)
-            .style(ButtonStyle::Tinted(TintColor::Accent))
-            .full_width()
-            .on_click(cx.listener(Self::open_panel));
-
-        let docs_button = Button::new("add-other-agents", "Add Other Agents")
-            .icon(IconName::ArrowUpRight)
-            .icon_size(IconSize::Indicator)
-            .icon_color(Color::Muted)
-            .full_width()
-            .on_click(cx.listener(Self::view_docs));
-
-        let close_button = h_flex().absolute().top_2().right_2().child(
-            IconButton::new("cancel", IconName::Close).on_click(cx.listener(
-                |_, _: &ClickEvent, _window, cx| {
-                    acp_onboarding_event!("Canceled", trigger = "X click");
-                    cx.emit(DismissEvent);
-                },
-            )),
-        );
-
-        v_flex()
-            .id("acp-onboarding")
-            .key_context("AcpOnboardingModal")
-            .relative()
-            .w(rems(34.))
-            .h_full()
-            .elevation_3(cx)
-            .track_focus(&self.focus_handle(cx))
-            .overflow_hidden()
-            .on_action(cx.listener(Self::cancel))
-            .on_action(cx.listener(|_, _: &menu::Cancel, _window, cx| {
-                acp_onboarding_event!("Canceled", trigger = "Action");
-                cx.emit(DismissEvent);
-            }))
-            .on_any_mouse_down(cx.listener(|this, _: &MouseDownEvent, window, _cx| {
-                this.focus_handle.focus(window);
-            }))
-            .child(illustration)
-            .child(
-                v_flex()
-                    .p_4()
-                    .gap_2()
-                    .child(heading)
-                    .child(Label::new(copy).color(Color::Muted))
-                    .child(
-                        v_flex()
-                            .w_full()
-                            .mt_2()
-                            .gap_1()
-                            .child(open_panel_button)
-                            .child(docs_button),
-                    ),
-            )
-            .child(close_button)
-    }
-}
diff --git a/crates/agent_ui/src/ui/agent_notification.rs b/crates/agent_ui/src/ui/agent_notification.rs
deleted file mode 100644
index 34ca0bb32a..0000000000
--- a/crates/agent_ui/src/ui/agent_notification.rs
+++ /dev/null
@@ -1,189 +0,0 @@
-use gpui::{
-    App, Context, EventEmitter, IntoElement, PlatformDisplay, Size, Window,
-    WindowBackgroundAppearance, WindowBounds, WindowDecorations, WindowKind, WindowOptions,
-    linear_color_stop, linear_gradient, point,
-};
-use release_channel::ReleaseChannel;
-use std::rc::Rc;
-use theme;
-use ui::{Render, prelude::*};
-
-pub struct AgentNotification {
-    title: SharedString,
-    caption: SharedString,
-    icon: IconName,
-    project_name: Option<SharedString>,
-}
-
-impl AgentNotification {
-    pub fn new(
-        title: impl Into<SharedString>,
-        caption: impl Into<SharedString>,
-        icon: IconName,
-        project_name: Option<impl Into<SharedString>>,
-    ) -> Self {
-        Self {
-            title: title.into(),
-            caption: caption.into(),
-            icon,
-            project_name: project_name.map(|name| name.into()),
-        }
-    }
-
-    pub fn window_options(screen: Rc<dyn PlatformDisplay>, cx: &App) -> WindowOptions {
-        let size = Size {
-            width: px(450.),
-            height: px(72.),
-        };
-
-        let notification_margin_width = px(16.);
-        let notification_margin_height = px(-48.);
-
-        let bounds = gpui::Bounds::<Pixels> {
-            origin: screen.bounds().top_right()
-                - point(
-                    size.width + notification_margin_width,
-                    notification_margin_height,
-                ),
-            size,
-        };
-
-        let app_id = ReleaseChannel::global(cx).app_id();
-
-        WindowOptions {
-            window_bounds: Some(WindowBounds::Windowed(bounds)),
-            titlebar: None,
-            focus: false,
-            show: true,
-            kind: WindowKind::PopUp,
-            is_movable: false,
-            display_id: Some(screen.id()),
-            window_background: WindowBackgroundAppearance::Transparent,
-            app_id: Some(app_id.to_owned()),
-            window_min_size: None,
-            window_decorations: Some(WindowDecorations::Client),
-            tabbing_identifier: None,
-            ..Default::default()
-        }
-    }
-}
-
-pub enum AgentNotificationEvent {
-    Accepted,
-    Dismissed,
-}
-
-impl EventEmitter<AgentNotificationEvent> for AgentNotification {}
-
-impl Render for AgentNotification {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let ui_font = theme::setup_ui_font(window, cx);
-        let line_height = window.line_height();
-
-        let bg = cx.theme().colors().elevated_surface_background;
-        let gradient_overflow = || {
-            div()
-                .h_full()
-                .absolute()
-                .w_8()
-                .bottom_0()
-                .right_0()
-                .bg(linear_gradient(
-                    90.,
-                    linear_color_stop(bg, 1.),
-                    linear_color_stop(bg.opacity(0.2), 0.),
-                ))
-        };
-
-        h_flex()
-            .id("agent-notification")
-            .size_full()
-            .p_3()
-            .gap_4()
-            .justify_between()
-            .elevation_3(cx)
-            .text_ui(cx)
-            .font(ui_font)
-            .border_color(cx.theme().colors().border)
-            .rounded_xl()
-            .child(
-                h_flex()
-                    .items_start()
-                    .gap_2()
-                    .flex_1()
-                    .child(
-                        h_flex().h(line_height).justify_center().child(
-                            Icon::new(self.icon)
-                                .color(Color::Muted)
-                                .size(IconSize::Small),
-                        ),
-                    )
-                    .child(
-                        v_flex()
-                            .flex_1()
-                            .max_w(px(300.))
-                            .child(
-                                div()
-                                    .relative()
-                                    .text_size(px(14.))
-                                    .text_color(cx.theme().colors().text)
-                                    .truncate()
-                                    .child(self.title.clone())
-                                    .child(gradient_overflow()),
-                            )
-                            .child(
-                                h_flex()
-                                    .relative()
-                                    .gap_1p5()
-                                    .text_size(px(12.))
-                                    .text_color(cx.theme().colors().text_muted)
-                                    .truncate()
-                                    .when_some(
-                                        self.project_name.clone(),
-                                        |description, project_name| {
-                                            description.child(
-                                                h_flex()
-                                                    .gap_1p5()
-                                                    .child(
-                                                        div()
-                                                            .max_w_16()
-                                                            .truncate()
-                                                            .child(project_name),
-                                                    )
-                                                    .child(
-                                                        div().size(px(3.)).rounded_full().bg(cx
-                                                            .theme()
-                                                            .colors()
-                                                            .text
-                                                            .opacity(0.5)),
-                                                    ),
-                                            )
-                                        },
-                                    )
-                                    .child(self.caption.clone())
-                                    .child(gradient_overflow()),
-                            ),
-                    ),
-            )
-            .child(
-                v_flex()
-                    .gap_1()
-                    .items_center()
-                    .child(
-                        Button::new("open", "View Panel")
-                            .style(ButtonStyle::Tinted(ui::TintColor::Accent))
-                            .full_width()
-                            .on_click({
-                                cx.listener(move |_this, _event, _, cx| {
-                                    cx.emit(AgentNotificationEvent::Accepted);
-                                })
-                            }),
-                    )
-                    .child(Button::new("dismiss", "Dismiss").full_width().on_click({
-                        cx.listener(move |_, _event, _, cx| {
-                            cx.emit(AgentNotificationEvent::Dismissed);
-                        })
-                    })),
-            )
-    }
-}
diff --git a/crates/agent_ui/src/ui/burn_mode_tooltip.rs b/crates/agent_ui/src/ui/burn_mode_tooltip.rs
deleted file mode 100644
index ccd7d4bf31..0000000000
--- a/crates/agent_ui/src/ui/burn_mode_tooltip.rs
+++ /dev/null
@@ -1,69 +0,0 @@
-use crate::ToggleBurnMode;
-use gpui::{Context, FontWeight, IntoElement, Render, Window};
-use ui::{KeyBinding, prelude::*, tooltip_container};
-
-pub struct BurnModeTooltip {
-    selected: bool,
-}
-
-impl BurnModeTooltip {
-    pub fn new() -> Self {
-        Self { selected: false }
-    }
-
-    pub fn selected(mut self, selected: bool) -> Self {
-        self.selected = selected;
-        self
-    }
-}
-
-impl Render for BurnModeTooltip {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let (icon, color) = if self.selected {
-            (IconName::ZedBurnModeOn, Color::Error)
-        } else {
-            (IconName::ZedBurnMode, Color::Default)
-        };
-
-        let turned_on = h_flex()
-            .h_4()
-            .px_1()
-            .border_1()
-            .border_color(cx.theme().colors().border)
-            .bg(cx.theme().colors().text_accent.opacity(0.1))
-            .rounded_sm()
-            .child(
-                Label::new("ON")
-                    .size(LabelSize::XSmall)
-                    .weight(FontWeight::SEMIBOLD)
-                    .color(Color::Accent),
-            );
-
-        let title = h_flex()
-            .gap_1p5()
-            .child(Icon::new(icon).size(IconSize::Small).color(color))
-            .child(Label::new("Burn Mode"))
-            .when(self.selected, |title| title.child(turned_on));
-
-        let keybinding = KeyBinding::for_action(&ToggleBurnMode, cx).size(rems_from_px(12.));
-
-        tooltip_container(cx, |this, _| {
-            this
-                .child(
-                    h_flex()
-                        .justify_between()
-                        .child(title)
-                        .child(keybinding)
-                )
-                .child(
-                    div()
-                        .max_w_64()
-                        .child(
-                            Label::new("Enables models to use large context windows, unlimited tool calls, and other capabilities for expanded reasoning.")
-                                .size(LabelSize::Small)
-                                .color(Color::Muted)
-                        )
-                )
-        })
-    }
-}
diff --git a/crates/agent_ui/src/ui/claude_code_onboarding_modal.rs b/crates/agent_ui/src/ui/claude_code_onboarding_modal.rs
deleted file mode 100644
index 06980f1897..0000000000
--- a/crates/agent_ui/src/ui/claude_code_onboarding_modal.rs
+++ /dev/null
@@ -1,254 +0,0 @@
-use client::zed_urls;
-use gpui::{
-    ClickEvent, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, MouseDownEvent, Render,
-    linear_color_stop, linear_gradient,
-};
-use ui::{TintColor, Vector, VectorName, prelude::*};
-use workspace::{ModalView, Workspace};
-
-use crate::agent_panel::{AgentPanel, AgentType};
-
-macro_rules! claude_code_onboarding_event {
-    ($name:expr) => {
-        telemetry::event!($name, source = "ACP Claude Code Onboarding");
-    };
-    ($name:expr, $($key:ident $(= $value:expr)?),+ $(,)?) => {
-        telemetry::event!($name, source = "ACP Claude Code Onboarding", $($key $(= $value)?),+);
-    };
-}
-
-pub struct ClaudeCodeOnboardingModal {
-    focus_handle: FocusHandle,
-    workspace: Entity<Workspace>,
-}
-
-impl ClaudeCodeOnboardingModal {
-    pub fn toggle(workspace: &mut Workspace, window: &mut Window, cx: &mut Context<Workspace>) {
-        let workspace_entity = cx.entity();
-        workspace.toggle_modal(window, cx, |_window, cx| Self {
-            workspace: workspace_entity,
-            focus_handle: cx.focus_handle(),
-        });
-    }
-
-    fn open_panel(&mut self, _: &ClickEvent, window: &mut Window, cx: &mut Context<Self>) {
-        self.workspace.update(cx, |workspace, cx| {
-            workspace.focus_panel::<AgentPanel>(window, cx);
-
-            if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
-                panel.update(cx, |panel, cx| {
-                    panel.new_agent_thread(AgentType::ClaudeCode, window, cx);
-                });
-            }
-        });
-
-        cx.emit(DismissEvent);
-
-        claude_code_onboarding_event!("Open Panel Clicked");
-    }
-
-    fn view_docs(&mut self, _: &ClickEvent, _: &mut Window, cx: &mut Context<Self>) {
-        cx.open_url(&zed_urls::external_agents_docs(cx));
-        cx.notify();
-
-        claude_code_onboarding_event!("Documentation Link Clicked");
-    }
-
-    fn cancel(&mut self, _: &menu::Cancel, _: &mut Window, cx: &mut Context<Self>) {
-        cx.emit(DismissEvent);
-    }
-}
-
-impl EventEmitter<DismissEvent> for ClaudeCodeOnboardingModal {}
-
-impl Focusable for ClaudeCodeOnboardingModal {
-    fn focus_handle(&self, _cx: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl ModalView for ClaudeCodeOnboardingModal {}
-
-impl Render for ClaudeCodeOnboardingModal {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let illustration_element = |icon: IconName, label: Option<SharedString>, opacity: f32| {
-            h_flex()
-                .px_1()
-                .py_0p5()
-                .gap_1()
-                .rounded_sm()
-                .bg(cx.theme().colors().element_active.opacity(0.05))
-                .border_1()
-                .border_color(cx.theme().colors().border)
-                .border_dashed()
-                .child(
-                    Icon::new(icon)
-                        .size(IconSize::Small)
-                        .color(Color::Custom(cx.theme().colors().text_muted.opacity(0.15))),
-                )
-                .map(|this| {
-                    if let Some(label_text) = label {
-                        this.child(
-                            Label::new(label_text)
-                                .size(LabelSize::Small)
-                                .color(Color::Muted),
-                        )
-                    } else {
-                        this.child(
-                            div().w_16().h_1().rounded_full().bg(cx
-                                .theme()
-                                .colors()
-                                .element_active
-                                .opacity(0.6)),
-                        )
-                    }
-                })
-                .opacity(opacity)
-        };
-
-        let illustration = h_flex()
-            .relative()
-            .h(rems_from_px(126.))
-            .bg(cx.theme().colors().editor_background)
-            .border_b_1()
-            .border_color(cx.theme().colors().border_variant)
-            .justify_center()
-            .gap_8()
-            .rounded_t_md()
-            .overflow_hidden()
-            .child(
-                div().absolute().inset_0().w(px(515.)).h(px(126.)).child(
-                    Vector::new(VectorName::AcpGrid, rems_from_px(515.), rems_from_px(126.))
-                        .color(ui::Color::Custom(cx.theme().colors().text.opacity(0.02))),
-                ),
-            )
-            .child(div().absolute().inset_0().size_full().bg(linear_gradient(
-                0.,
-                linear_color_stop(
-                    cx.theme().colors().elevated_surface_background.opacity(0.1),
-                    0.9,
-                ),
-                linear_color_stop(
-                    cx.theme().colors().elevated_surface_background.opacity(0.),
-                    0.,
-                ),
-            )))
-            .child(
-                div()
-                    .absolute()
-                    .inset_0()
-                    .size_full()
-                    .bg(gpui::black().opacity(0.15)),
-            )
-            .child(
-                Vector::new(
-                    VectorName::AcpLogoSerif,
-                    rems_from_px(257.),
-                    rems_from_px(47.),
-                )
-                .color(ui::Color::Custom(cx.theme().colors().text.opacity(0.8))),
-            )
-            .child(
-                v_flex()
-                    .gap_1p5()
-                    .child(illustration_element(IconName::Stop, None, 0.15))
-                    .child(illustration_element(
-                        IconName::AiGemini,
-                        Some("New Gemini CLI Thread".into()),
-                        0.3,
-                    ))
-                    .child(
-                        h_flex()
-                            .pl_1()
-                            .pr_2()
-                            .py_0p5()
-                            .gap_1()
-                            .rounded_sm()
-                            .bg(cx.theme().colors().element_active.opacity(0.2))
-                            .border_1()
-                            .border_color(cx.theme().colors().border)
-                            .child(
-                                Icon::new(IconName::AiClaude)
-                                    .size(IconSize::Small)
-                                    .color(Color::Muted),
-                            )
-                            .child(Label::new("New Claude Code Thread").size(LabelSize::Small)),
-                    )
-                    .child(illustration_element(
-                        IconName::Stop,
-                        Some("Your Agent Here".into()),
-                        0.3,
-                    ))
-                    .child(illustration_element(IconName::Stop, None, 0.15)),
-            );
-
-        let heading = v_flex()
-            .w_full()
-            .gap_1()
-            .child(
-                Label::new("Beta Release")
-                    .size(LabelSize::Small)
-                    .color(Color::Muted),
-            )
-            .child(Headline::new("Claude Code: Natively in Zed").size(HeadlineSize::Large));
-
-        let copy = "Powered by the Agent Client Protocol, you can now run Claude Code as\na first-class citizen in Zed's agent panel.";
-
-        let open_panel_button = Button::new("open-panel", "Start with Claude Code")
-            .icon_size(IconSize::Indicator)
-            .style(ButtonStyle::Tinted(TintColor::Accent))
-            .full_width()
-            .on_click(cx.listener(Self::open_panel));
-
-        let docs_button = Button::new("add-other-agents", "Add Other Agents")
-            .icon(IconName::ArrowUpRight)
-            .icon_size(IconSize::Indicator)
-            .icon_color(Color::Muted)
-            .full_width()
-            .on_click(cx.listener(Self::view_docs));
-
-        let close_button = h_flex().absolute().top_2().right_2().child(
-            IconButton::new("cancel", IconName::Close).on_click(cx.listener(
-                |_, _: &ClickEvent, _window, cx| {
-                    claude_code_onboarding_event!("Canceled", trigger = "X click");
-                    cx.emit(DismissEvent);
-                },
-            )),
-        );
-
-        v_flex()
-            .id("acp-onboarding")
-            .key_context("AcpOnboardingModal")
-            .relative()
-            .w(rems(34.))
-            .h_full()
-            .elevation_3(cx)
-            .track_focus(&self.focus_handle(cx))
-            .overflow_hidden()
-            .on_action(cx.listener(Self::cancel))
-            .on_action(cx.listener(|_, _: &menu::Cancel, _window, cx| {
-                claude_code_onboarding_event!("Canceled", trigger = "Action");
-                cx.emit(DismissEvent);
-            }))
-            .on_any_mouse_down(cx.listener(|this, _: &MouseDownEvent, window, _cx| {
-                this.focus_handle.focus(window);
-            }))
-            .child(illustration)
-            .child(
-                v_flex()
-                    .p_4()
-                    .gap_2()
-                    .child(heading)
-                    .child(Label::new(copy).color(Color::Muted))
-                    .child(
-                        v_flex()
-                            .w_full()
-                            .mt_2()
-                            .gap_1()
-                            .child(open_panel_button)
-                            .child(docs_button),
-                    ),
-            )
-            .child(close_button)
-    }
-}
diff --git a/crates/agent_ui/src/ui/end_trial_upsell.rs b/crates/agent_ui/src/ui/end_trial_upsell.rs
deleted file mode 100644
index 9c25519659..0000000000
--- a/crates/agent_ui/src/ui/end_trial_upsell.rs
+++ /dev/null
@@ -1,121 +0,0 @@
-use std::sync::Arc;
-
-use ai_onboarding::{AgentPanelOnboardingCard, PlanDefinitions};
-use client::zed_urls;
-use cloud_llm_client::{Plan, PlanV2};
-use gpui::{AnyElement, App, IntoElement, RenderOnce, Window};
-use ui::{Divider, Tooltip, prelude::*};
-
-#[derive(IntoElement, RegisterComponent)]
-pub struct EndTrialUpsell {
-    plan: Plan,
-    dismiss_upsell: Arc<dyn Fn(&mut Window, &mut App)>,
-}
-
-impl EndTrialUpsell {
-    pub fn new(plan: Plan, dismiss_upsell: Arc<dyn Fn(&mut Window, &mut App)>) -> Self {
-        Self {
-            plan,
-            dismiss_upsell,
-        }
-    }
-}
-
-impl RenderOnce for EndTrialUpsell {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let pro_section = v_flex()
-            .gap_1()
-            .child(
-                h_flex()
-                    .gap_2()
-                    .child(
-                        Label::new("Pro")
-                            .size(LabelSize::Small)
-                            .color(Color::Accent)
-                            .buffer_font(cx),
-                    )
-                    .child(Divider::horizontal()),
-            )
-            .child(PlanDefinitions.pro_plan(self.plan.is_v2(), false))
-            .child(
-                Button::new("cta-button", "Upgrade to Zed Pro")
-                    .full_width()
-                    .style(ButtonStyle::Tinted(ui::TintColor::Accent))
-                    .on_click(move |_, _window, cx| {
-                        telemetry::event!("Upgrade To Pro Clicked", state = "end-of-trial");
-                        cx.open_url(&zed_urls::upgrade_to_zed_pro_url(cx))
-                    }),
-            );
-
-        let free_section = v_flex()
-            .mt_1p5()
-            .gap_1()
-            .child(
-                h_flex()
-                    .gap_2()
-                    .child(
-                        Label::new("Free")
-                            .size(LabelSize::Small)
-                            .color(Color::Muted)
-                            .buffer_font(cx),
-                    )
-                    .child(
-                        Label::new("(Current Plan)")
-                            .size(LabelSize::Small)
-                            .color(Color::Custom(cx.theme().colors().text_muted.opacity(0.6)))
-                            .buffer_font(cx),
-                    )
-                    .child(Divider::horizontal()),
-            )
-            .child(PlanDefinitions.free_plan(self.plan.is_v2()));
-
-        AgentPanelOnboardingCard::new()
-            .child(Headline::new("Your Zed Pro Trial has expired"))
-            .child(
-                Label::new("You've been automatically reset to the Free plan.")
-                    .color(Color::Muted)
-                    .mb_2(),
-            )
-            .child(pro_section)
-            .child(free_section)
-            .child(
-                h_flex().absolute().top_4().right_4().child(
-                    IconButton::new("dismiss_onboarding", IconName::Close)
-                        .icon_size(IconSize::Small)
-                        .tooltip(Tooltip::text("Dismiss"))
-                        .on_click({
-                            let callback = self.dismiss_upsell.clone();
-                            move |_, window, cx| {
-                                telemetry::event!("Banner Dismissed", source = "AI Onboarding");
-                                callback(window, cx)
-                            }
-                        }),
-                ),
-            )
-    }
-}
-
-impl Component for EndTrialUpsell {
-    fn scope() -> ComponentScope {
-        ComponentScope::Onboarding
-    }
-
-    fn name() -> &'static str {
-        "End of Trial Upsell Banner"
-    }
-
-    fn sort_name() -> &'static str {
-        "End of Trial Upsell Banner"
-    }
-
-    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
-        Some(
-            v_flex()
-                .child(EndTrialUpsell {
-                    plan: Plan::V2(PlanV2::ZedFree),
-                    dismiss_upsell: Arc::new(|_, _| {}),
-                })
-                .into_any_element(),
-        )
-    }
-}
diff --git a/crates/agent_ui/src/ui/hold_for_default.rs b/crates/agent_ui/src/ui/hold_for_default.rs
deleted file mode 100644
index 409e5d5970..0000000000
--- a/crates/agent_ui/src/ui/hold_for_default.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-use gpui::{App, IntoElement, Modifiers, RenderOnce, Window};
-use ui::{prelude::*, render_modifiers};
-
-#[derive(IntoElement)]
-pub struct HoldForDefault {
-    is_default: bool,
-}
-
-impl HoldForDefault {
-    pub fn new(is_default: bool) -> Self {
-        Self { is_default }
-    }
-}
-
-impl RenderOnce for HoldForDefault {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        h_flex()
-            .pt_1()
-            .border_t_1()
-            .border_color(cx.theme().colors().border_variant)
-            .gap_0p5()
-            .text_sm()
-            .text_color(Color::Muted.color(cx))
-            .child("Hold")
-            .child(h_flex().flex_shrink_0().children(render_modifiers(
-                &Modifiers::secondary_key(),
-                PlatformStyle::platform(),
-                None,
-                Some(TextSize::Default.rems(cx).into()),
-                true,
-            )))
-            .child(div().map(|this| {
-                if self.is_default {
-                    this.child("to unset as default")
-                } else {
-                    this.child("to set as default")
-                }
-            }))
-    }
-}
diff --git a/crates/agent_ui/src/ui/onboarding_modal.rs b/crates/agent_ui/src/ui/onboarding_modal.rs
deleted file mode 100644
index ad404afa78..0000000000
--- a/crates/agent_ui/src/ui/onboarding_modal.rs
+++ /dev/null
@@ -1,174 +0,0 @@
-use gpui::{
-    ClickEvent, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, MouseDownEvent, Render,
-};
-use ui::{TintColor, Vector, VectorName, prelude::*};
-use workspace::{ModalView, Workspace};
-
-use crate::agent_panel::AgentPanel;
-
-macro_rules! agent_onboarding_event {
-    ($name:expr) => {
-        telemetry::event!($name, source = "Agent Onboarding");
-    };
-    ($name:expr, $($key:ident $(= $value:expr)?),+ $(,)?) => {
-        telemetry::event!($name, source = "Agent Onboarding", $($key $(= $value)?),+);
-    };
-}
-
-pub struct AgentOnboardingModal {
-    focus_handle: FocusHandle,
-    workspace: Entity<Workspace>,
-}
-
-impl AgentOnboardingModal {
-    pub fn toggle(workspace: &mut Workspace, window: &mut Window, cx: &mut Context<Workspace>) {
-        let workspace_entity = cx.entity();
-        workspace.toggle_modal(window, cx, |_window, cx| Self {
-            workspace: workspace_entity,
-            focus_handle: cx.focus_handle(),
-        });
-    }
-
-    fn open_panel(&mut self, _: &ClickEvent, window: &mut Window, cx: &mut Context<Self>) {
-        self.workspace.update(cx, |workspace, cx| {
-            workspace.focus_panel::<AgentPanel>(window, cx);
-        });
-
-        cx.emit(DismissEvent);
-
-        agent_onboarding_event!("Open Panel Clicked");
-    }
-
-    fn view_blog(&mut self, _: &ClickEvent, _: &mut Window, cx: &mut Context<Self>) {
-        cx.open_url("https://zed.dev/blog/fastest-ai-code-editor");
-        cx.notify();
-
-        agent_onboarding_event!("Blog Link Clicked");
-    }
-
-    fn cancel(&mut self, _: &menu::Cancel, _: &mut Window, cx: &mut Context<Self>) {
-        cx.emit(DismissEvent);
-    }
-}
-
-impl EventEmitter<DismissEvent> for AgentOnboardingModal {}
-
-impl Focusable for AgentOnboardingModal {
-    fn focus_handle(&self, _cx: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl ModalView for AgentOnboardingModal {}
-
-impl Render for AgentOnboardingModal {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let window_height = window.viewport_size().height;
-        let max_height = window_height - px(200.);
-
-        let base = v_flex()
-            .id("agent-onboarding")
-            .key_context("AgentOnboardingModal")
-            .relative()
-            .w(px(450.))
-            .h_full()
-            .max_h(max_height)
-            .p_4()
-            .gap_2()
-            .elevation_3(cx)
-            .track_focus(&self.focus_handle(cx))
-            .overflow_hidden()
-            .on_action(cx.listener(Self::cancel))
-            .on_action(cx.listener(|_, _: &menu::Cancel, _window, cx| {
-                agent_onboarding_event!("Canceled", trigger = "Action");
-                cx.emit(DismissEvent);
-            }))
-            .on_any_mouse_down(cx.listener(|this, _: &MouseDownEvent, window, _cx| {
-                this.focus_handle.focus(window);
-            }))
-            .child(
-                div()
-                    .absolute()
-                    .top_0()
-                    .right(px(-1.0))
-                    .w(px(441.))
-                    .h(px(240.))
-                    .child(
-                        Vector::new(VectorName::Grid, rems_from_px(441.), rems_from_px(240.))
-                            .color(ui::Color::Custom(cx.theme().colors().text.alpha(0.05))),
-                    ),
-            )
-            .child(
-                div()
-                    .absolute()
-                    .top(px(-8.0))
-                    .right_0()
-                    .w(px(400.))
-                    .h(px(92.))
-                    .child(
-                        Vector::new(VectorName::AiGrid, rems_from_px(400.), rems_from_px(92.))
-                            .color(ui::Color::Custom(cx.theme().colors().text.alpha(0.32))),
-                    ),
-            )
-            .child(
-                div()
-                    .absolute()
-                    .inset_0()
-                    .size_full()
-                    .bg(gpui::linear_gradient(
-                        175.,
-                        gpui::linear_color_stop(
-                            cx.theme().colors().elevated_surface_background,
-                            0.,
-                        ),
-                        gpui::linear_color_stop(
-                            cx.theme().colors().elevated_surface_background.opacity(0.),
-                            0.8,
-                        ),
-                    )),
-            )
-            .child(
-                v_flex()
-                    .w_full()
-                    .gap_1()
-                    .child(
-                        Label::new("Introducing")
-                            .size(LabelSize::Small)
-                            .color(Color::Muted),
-                    )
-                    .child(Headline::new("Agentic Editing in Zed").size(HeadlineSize::Large)),
-            )
-            .child(h_flex().absolute().top_2().right_2().child(
-                IconButton::new("cancel", IconName::Close).on_click(cx.listener(
-                    |_, _: &ClickEvent, _window, cx| {
-                        agent_onboarding_event!("Cancelled", trigger = "X click");
-                        cx.emit(DismissEvent);
-                    },
-                )),
-            ));
-
-        let open_panel_button = Button::new("open-panel", "Get Started with the Agent Panel")
-            .icon_size(IconSize::Indicator)
-            .style(ButtonStyle::Tinted(TintColor::Accent))
-            .full_width()
-            .on_click(cx.listener(Self::open_panel));
-
-        let blog_post_button = Button::new("view-blog", "Check out the Blog Post")
-            .icon(IconName::ArrowUpRight)
-            .icon_size(IconSize::Indicator)
-            .icon_color(Color::Muted)
-            .full_width()
-            .on_click(cx.listener(Self::view_blog));
-
-        let copy = "Zed now natively supports agentic editing, enabling fluid collaboration between humans and AI.";
-
-        base.child(Label::new(copy).color(Color::Muted)).child(
-            v_flex()
-                .w_full()
-                .mt_2()
-                .gap_2()
-                .child(open_panel_button)
-                .child(blog_post_button),
-        )
-    }
-}
diff --git a/crates/agent_ui/src/ui/unavailable_editing_tooltip.rs b/crates/agent_ui/src/ui/unavailable_editing_tooltip.rs
deleted file mode 100644
index 2993fb89a9..0000000000
--- a/crates/agent_ui/src/ui/unavailable_editing_tooltip.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-use gpui::{Context, IntoElement, Render, Window};
-use ui::{prelude::*, tooltip_container};
-
-pub struct UnavailableEditingTooltip {
-    agent_name: SharedString,
-}
-
-impl UnavailableEditingTooltip {
-    pub fn new(agent_name: SharedString) -> Self {
-        Self { agent_name }
-    }
-}
-
-impl Render for UnavailableEditingTooltip {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        tooltip_container(cx, |this, _| {
-            this.child(Label::new("Unavailable Editing")).child(
-                div().max_w_64().child(
-                    Label::new(format!(
-                        "Editing previous messages is not available for {} yet.",
-                        self.agent_name
-                    ))
-                    .size(LabelSize::Small)
-                    .color(Color::Muted),
-                ),
-            )
-        })
-    }
-}
diff --git a/crates/agent_ui/src/ui/usage_callout.rs b/crates/agent_ui/src/ui/usage_callout.rs
deleted file mode 100644
index e31af9f49a..0000000000
--- a/crates/agent_ui/src/ui/usage_callout.rs
+++ /dev/null
@@ -1,200 +0,0 @@
-use client::{ModelRequestUsage, RequestUsage, zed_urls};
-use cloud_llm_client::{Plan, PlanV1, PlanV2, UsageLimit};
-use component::{empty_example, example_group_with_title, single_example};
-use gpui::{AnyElement, App, IntoElement, RenderOnce, Window};
-use ui::{Callout, prelude::*};
-
-#[derive(IntoElement, RegisterComponent)]
-pub struct UsageCallout {
-    plan: Plan,
-    usage: ModelRequestUsage,
-}
-
-impl UsageCallout {
-    pub fn new(plan: Plan, usage: ModelRequestUsage) -> Self {
-        Self { plan, usage }
-    }
-}
-
-impl RenderOnce for UsageCallout {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let (is_limit_reached, is_approaching_limit, remaining) = match self.usage.limit {
-            UsageLimit::Limited(limit) => {
-                let percentage = self.usage.amount as f32 / limit as f32;
-                let is_limit_reached = percentage >= 1.0;
-                let is_near_limit = percentage >= 0.9 && percentage < 1.0;
-                (
-                    is_limit_reached,
-                    is_near_limit,
-                    limit.saturating_sub(self.usage.amount),
-                )
-            }
-            UsageLimit::Unlimited => (false, false, 0),
-        };
-
-        if !is_limit_reached && !is_approaching_limit {
-            return div().into_any_element();
-        }
-
-        let (title, message, button_text, url) = if is_limit_reached {
-            match self.plan {
-                Plan::V1(PlanV1::ZedFree) | Plan::V2(PlanV2::ZedFree) => (
-                    "Out of free prompts",
-                    "Upgrade to continue, wait for the next reset, or switch to API key."
-                        .to_string(),
-                    "Upgrade",
-                    zed_urls::account_url(cx),
-                ),
-                Plan::V1(PlanV1::ZedProTrial) | Plan::V2(PlanV2::ZedProTrial) => (
-                    "Out of trial prompts",
-                    "Upgrade to Zed Pro to continue, or switch to API key.".to_string(),
-                    "Upgrade",
-                    zed_urls::account_url(cx),
-                ),
-                Plan::V1(PlanV1::ZedPro) | Plan::V2(PlanV2::ZedPro) => (
-                    "Out of included prompts",
-                    "Enable usage-based billing to continue.".to_string(),
-                    "Manage",
-                    zed_urls::account_url(cx),
-                ),
-            }
-        } else {
-            match self.plan {
-                Plan::V1(PlanV1::ZedFree) => (
-                    "Reaching free plan limit soon",
-                    format!(
-                        "{remaining} remaining - Upgrade to increase limit, or switch providers",
-                    ),
-                    "Upgrade",
-                    zed_urls::account_url(cx),
-                ),
-                Plan::V1(PlanV1::ZedProTrial) => (
-                    "Reaching trial limit soon",
-                    format!(
-                        "{remaining} remaining - Upgrade to increase limit, or switch providers",
-                    ),
-                    "Upgrade",
-                    zed_urls::account_url(cx),
-                ),
-                Plan::V1(PlanV1::ZedPro) | Plan::V2(_) => return div().into_any_element(),
-            }
-        };
-
-        let (icon, severity) = if is_limit_reached {
-            (IconName::Close, Severity::Error)
-        } else {
-            (IconName::Warning, Severity::Warning)
-        };
-
-        Callout::new()
-            .icon(icon)
-            .severity(severity)
-            .icon(icon)
-            .title(title)
-            .description(message)
-            .actions_slot(
-                Button::new("upgrade", button_text)
-                    .label_size(LabelSize::Small)
-                    .on_click(move |_, _, cx| {
-                        cx.open_url(&url);
-                    }),
-            )
-            .into_any_element()
-    }
-}
-
-impl Component for UsageCallout {
-    fn scope() -> ComponentScope {
-        ComponentScope::Agent
-    }
-
-    fn sort_name() -> &'static str {
-        "AgentUsageCallout"
-    }
-
-    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
-        let free_examples = example_group_with_title(
-            "Free Plan",
-            vec![
-                single_example(
-                    "Approaching limit (90%)",
-                    UsageCallout::new(
-                        Plan::V1(PlanV1::ZedFree),
-                        ModelRequestUsage(RequestUsage {
-                            limit: UsageLimit::Limited(50),
-                            amount: 45, // 90% of limit
-                        }),
-                    )
-                    .into_any_element(),
-                ),
-                single_example(
-                    "Limit reached (100%)",
-                    UsageCallout::new(
-                        Plan::V1(PlanV1::ZedFree),
-                        ModelRequestUsage(RequestUsage {
-                            limit: UsageLimit::Limited(50),
-                            amount: 50, // 100% of limit
-                        }),
-                    )
-                    .into_any_element(),
-                ),
-            ],
-        );
-
-        let trial_examples = example_group_with_title(
-            "Zed Pro Trial",
-            vec![
-                single_example(
-                    "Approaching limit (90%)",
-                    UsageCallout::new(
-                        Plan::V1(PlanV1::ZedProTrial),
-                        ModelRequestUsage(RequestUsage {
-                            limit: UsageLimit::Limited(150),
-                            amount: 135, // 90% of limit
-                        }),
-                    )
-                    .into_any_element(),
-                ),
-                single_example(
-                    "Limit reached (100%)",
-                    UsageCallout::new(
-                        Plan::V1(PlanV1::ZedProTrial),
-                        ModelRequestUsage(RequestUsage {
-                            limit: UsageLimit::Limited(150),
-                            amount: 150, // 100% of limit
-                        }),
-                    )
-                    .into_any_element(),
-                ),
-            ],
-        );
-
-        let pro_examples = example_group_with_title(
-            "Zed Pro",
-            vec![
-                single_example(
-                    "Limit reached (100%)",
-                    UsageCallout::new(
-                        Plan::V1(PlanV1::ZedPro),
-                        ModelRequestUsage(RequestUsage {
-                            limit: UsageLimit::Limited(500),
-                            amount: 500, // 100% of limit
-                        }),
-                    )
-                    .into_any_element(),
-                ),
-                empty_example("Unlimited plan (no callout shown)"),
-            ],
-        );
-
-        Some(
-            v_flex()
-                .p_4()
-                .gap_4()
-                .child(free_examples)
-                .child(trial_examples)
-                .child(pro_examples)
-                .into_any_element(),
-        )
-    }
-}
diff --git a/crates/ai_onboarding/Cargo.toml b/crates/ai_onboarding/Cargo.toml
deleted file mode 100644
index 8fb0570e5c..0000000000
--- a/crates/ai_onboarding/Cargo.toml
+++ /dev/null
@@ -1,27 +0,0 @@
-[package]
-name = "ai_onboarding"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/ai_onboarding.rs"
-
-[features]
-default = []
-
-[dependencies]
-client.workspace = true
-cloud_llm_client.workspace = true
-component.workspace = true
-gpui.workspace = true
-language_model.workspace = true
-serde.workspace = true
-smallvec.workspace = true
-telemetry.workspace = true
-ui.workspace = true
-zed_actions.workspace = true
diff --git a/crates/ai_onboarding/LICENSE-GPL b/crates/ai_onboarding/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/ai_onboarding/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/ai_onboarding/src/agent_api_keys_onboarding.rs b/crates/ai_onboarding/src/agent_api_keys_onboarding.rs
deleted file mode 100644
index fadc4222ae..0000000000
--- a/crates/ai_onboarding/src/agent_api_keys_onboarding.rs
+++ /dev/null
@@ -1,141 +0,0 @@
-use gpui::{Action, IntoElement, ParentElement, RenderOnce, point};
-use language_model::{LanguageModelRegistry, ZED_CLOUD_PROVIDER_ID};
-use ui::{Divider, List, ListBulletItem, prelude::*};
-
-pub struct ApiKeysWithProviders {
-    configured_providers: Vec<(IconName, SharedString)>,
-}
-
-impl ApiKeysWithProviders {
-    pub fn new(cx: &mut Context<Self>) -> Self {
-        cx.subscribe(
-            &LanguageModelRegistry::global(cx),
-            |this: &mut Self, _registry, event: &language_model::Event, cx| match event {
-                language_model::Event::ProviderStateChanged(_)
-                | language_model::Event::AddedProvider(_)
-                | language_model::Event::RemovedProvider(_) => {
-                    this.configured_providers = Self::compute_configured_providers(cx)
-                }
-                _ => {}
-            },
-        )
-        .detach();
-
-        Self {
-            configured_providers: Self::compute_configured_providers(cx),
-        }
-    }
-
-    fn compute_configured_providers(cx: &App) -> Vec<(IconName, SharedString)> {
-        LanguageModelRegistry::read_global(cx)
-            .providers()
-            .iter()
-            .filter(|provider| {
-                provider.is_authenticated(cx) && provider.id() != ZED_CLOUD_PROVIDER_ID
-            })
-            .map(|provider| (provider.icon(), provider.name().0))
-            .collect()
-    }
-}
-
-impl Render for ApiKeysWithProviders {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let configured_providers_list =
-            self.configured_providers
-                .iter()
-                .cloned()
-                .map(|(icon, name)| {
-                    h_flex()
-                        .gap_1p5()
-                        .child(Icon::new(icon).size(IconSize::XSmall).color(Color::Muted))
-                        .child(Label::new(name))
-                });
-        div()
-            .mx_2p5()
-            .p_1()
-            .pb_0()
-            .gap_2()
-            .rounded_t_lg()
-            .border_t_1()
-            .border_x_1()
-            .border_color(cx.theme().colors().border.opacity(0.5))
-            .bg(cx.theme().colors().background.alpha(0.5))
-            .shadow(vec![gpui::BoxShadow {
-                color: gpui::black().opacity(0.15),
-                offset: point(px(1.), px(-1.)),
-                blur_radius: px(3.),
-                spread_radius: px(0.),
-            }])
-            .child(
-                h_flex()
-                    .px_2p5()
-                    .py_1p5()
-                    .gap_2()
-                    .flex_wrap()
-                    .rounded_t(px(5.))
-                    .overflow_hidden()
-                    .border_t_1()
-                    .border_x_1()
-                    .border_color(cx.theme().colors().border)
-                    .bg(cx.theme().colors().panel_background)
-                    .child(
-                        h_flex()
-                            .min_w_0()
-                            .gap_2()
-                            .child(
-                                Icon::new(IconName::Info)
-                                    .size(IconSize::XSmall)
-                                    .color(Color::Muted)
-                            )
-                            .child(
-                                div()
-                                    .w_full()
-                                    .child(
-                                        Label::new("Start now using API keys from your environment for the following providers:")
-                                            .color(Color::Muted)
-                                    )
-                            )
-                    )
-                    .children(configured_providers_list)
-            )
-    }
-}
-
-#[derive(IntoElement)]
-pub struct ApiKeysWithoutProviders;
-
-impl ApiKeysWithoutProviders {
-    pub fn new() -> Self {
-        Self
-    }
-}
-
-impl RenderOnce for ApiKeysWithoutProviders {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        v_flex()
-            .mt_2()
-            .gap_1()
-            .child(
-                h_flex()
-                    .gap_2()
-                    .child(
-                        Label::new("API Keys")
-                            .size(LabelSize::Small)
-                            .color(Color::Muted)
-                            .buffer_font(cx),
-                    )
-                    .child(Divider::horizontal()),
-            )
-            .child(List::new().child(ListBulletItem::new(
-                "Add your own keys to use AI without signing in.",
-            )))
-            .child(
-                Button::new("configure-providers", "Configure Providers")
-                    .full_width()
-                    .style(ButtonStyle::Outlined)
-                    .on_click(move |_, window, cx| {
-                        window.dispatch_action(zed_actions::agent::OpenSettings.boxed_clone(), cx);
-                    }),
-            )
-    }
-}
diff --git a/crates/ai_onboarding/src/agent_panel_onboarding_card.rs b/crates/ai_onboarding/src/agent_panel_onboarding_card.rs
deleted file mode 100644
index c63c592642..0000000000
--- a/crates/ai_onboarding/src/agent_panel_onboarding_card.rs
+++ /dev/null
@@ -1,83 +0,0 @@
-use gpui::{AnyElement, IntoElement, ParentElement, linear_color_stop, linear_gradient};
-use smallvec::SmallVec;
-use ui::{Vector, VectorName, prelude::*};
-
-#[derive(IntoElement)]
-pub struct AgentPanelOnboardingCard {
-    children: SmallVec<[AnyElement; 2]>,
-}
-
-impl AgentPanelOnboardingCard {
-    pub fn new() -> Self {
-        Self {
-            children: SmallVec::new(),
-        }
-    }
-}
-
-impl ParentElement for AgentPanelOnboardingCard {
-    fn extend(&mut self, elements: impl IntoIterator<Item = AnyElement>) {
-        self.children.extend(elements)
-    }
-}
-
-impl RenderOnce for AgentPanelOnboardingCard {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        div()
-            .m_2p5()
-            .p(px(3.))
-            .elevation_2(cx)
-            .rounded_lg()
-            .bg(cx.theme().colors().background.alpha(0.5))
-            .child(
-                v_flex()
-                    .relative()
-                    .size_full()
-                    .px_4()
-                    .py_3()
-                    .gap_2()
-                    .border_1()
-                    .rounded(px(5.))
-                    .border_color(cx.theme().colors().text.alpha(0.1))
-                    .overflow_hidden()
-                    .bg(cx.theme().colors().panel_background)
-                    .child(
-                        div()
-                            .opacity(0.5)
-                            .absolute()
-                            .top(px(-8.0))
-                            .right_0()
-                            .w(px(400.))
-                            .h(px(92.))
-                            .rounded_md()
-                            .child(
-                                Vector::new(
-                                    VectorName::AiGrid,
-                                    rems_from_px(400.),
-                                    rems_from_px(92.),
-                                )
-                                .color(Color::Custom(cx.theme().colors().text.alpha(0.32))),
-                            ),
-                    )
-                    .child(
-                        div()
-                            .absolute()
-                            .top_0p5()
-                            .right_0p5()
-                            .w(px(660.))
-                            .h(px(401.))
-                            .overflow_hidden()
-                            .rounded_md()
-                            .bg(linear_gradient(
-                                75.,
-                                linear_color_stop(
-                                    cx.theme().colors().panel_background.alpha(0.01),
-                                    1.0,
-                                ),
-                                linear_color_stop(cx.theme().colors().panel_background, 0.45),
-                            )),
-                    )
-                    .children(self.children),
-            )
-    }
-}
diff --git a/crates/ai_onboarding/src/agent_panel_onboarding_content.rs b/crates/ai_onboarding/src/agent_panel_onboarding_content.rs
deleted file mode 100644
index 3c8ffc1663..0000000000
--- a/crates/ai_onboarding/src/agent_panel_onboarding_content.rs
+++ /dev/null
@@ -1,91 +0,0 @@
-use std::sync::Arc;
-
-use client::{Client, UserStore};
-use cloud_llm_client::{Plan, PlanV1, PlanV2};
-use gpui::{Entity, IntoElement, ParentElement};
-use language_model::{LanguageModelRegistry, ZED_CLOUD_PROVIDER_ID};
-use ui::prelude::*;
-
-use crate::{AgentPanelOnboardingCard, ApiKeysWithoutProviders, ZedAiOnboarding};
-
-pub struct AgentPanelOnboarding {
-    user_store: Entity<UserStore>,
-    client: Arc<Client>,
-    configured_providers: Vec<(IconName, SharedString)>,
-    continue_with_zed_ai: Arc<dyn Fn(&mut Window, &mut App)>,
-}
-
-impl AgentPanelOnboarding {
-    pub fn new(
-        user_store: Entity<UserStore>,
-        client: Arc<Client>,
-        continue_with_zed_ai: impl Fn(&mut Window, &mut App) + 'static,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        cx.subscribe(
-            &LanguageModelRegistry::global(cx),
-            |this: &mut Self, _registry, event: &language_model::Event, cx| match event {
-                language_model::Event::ProviderStateChanged(_)
-                | language_model::Event::AddedProvider(_)
-                | language_model::Event::RemovedProvider(_) => {
-                    this.configured_providers = Self::compute_available_providers(cx)
-                }
-                _ => {}
-            },
-        )
-        .detach();
-
-        Self {
-            user_store,
-            client,
-            configured_providers: Self::compute_available_providers(cx),
-            continue_with_zed_ai: Arc::new(continue_with_zed_ai),
-        }
-    }
-
-    fn compute_available_providers(cx: &App) -> Vec<(IconName, SharedString)> {
-        LanguageModelRegistry::read_global(cx)
-            .providers()
-            .iter()
-            .filter(|provider| {
-                provider.is_authenticated(cx) && provider.id() != ZED_CLOUD_PROVIDER_ID
-            })
-            .map(|provider| (provider.icon(), provider.name().0))
-            .collect()
-    }
-}
-
-impl Render for AgentPanelOnboarding {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let enrolled_in_trial = self.user_store.read(cx).plan().is_some_and(|plan| {
-            matches!(
-                plan,
-                Plan::V1(PlanV1::ZedProTrial) | Plan::V2(PlanV2::ZedProTrial)
-            )
-        });
-        let is_pro_user = self.user_store.read(cx).plan().is_some_and(|plan| {
-            matches!(plan, Plan::V1(PlanV1::ZedPro) | Plan::V2(PlanV2::ZedPro))
-        });
-
-        AgentPanelOnboardingCard::new()
-            .child(
-                ZedAiOnboarding::new(
-                    self.client.clone(),
-                    &self.user_store,
-                    self.continue_with_zed_ai.clone(),
-                    cx,
-                )
-                .with_dismiss({
-                    let callback = self.continue_with_zed_ai.clone();
-                    move |window, cx| callback(window, cx)
-                }),
-            )
-            .map(|this| {
-                if enrolled_in_trial || is_pro_user || !self.configured_providers.is_empty() {
-                    this
-                } else {
-                    this.child(ApiKeysWithoutProviders::new())
-                }
-            })
-    }
-}
diff --git a/crates/ai_onboarding/src/ai_onboarding.rs b/crates/ai_onboarding/src/ai_onboarding.rs
deleted file mode 100644
index 20bb0a5f68..0000000000
--- a/crates/ai_onboarding/src/ai_onboarding.rs
+++ /dev/null
@@ -1,363 +0,0 @@
-mod agent_api_keys_onboarding;
-mod agent_panel_onboarding_card;
-mod agent_panel_onboarding_content;
-mod ai_upsell_card;
-mod edit_prediction_onboarding_content;
-mod plan_definitions;
-mod young_account_banner;
-
-pub use agent_api_keys_onboarding::{ApiKeysWithProviders, ApiKeysWithoutProviders};
-pub use agent_panel_onboarding_card::AgentPanelOnboardingCard;
-pub use agent_panel_onboarding_content::AgentPanelOnboarding;
-pub use ai_upsell_card::AiUpsellCard;
-use cloud_llm_client::{Plan, PlanV1, PlanV2};
-pub use edit_prediction_onboarding_content::EditPredictionOnboarding;
-pub use plan_definitions::PlanDefinitions;
-pub use young_account_banner::YoungAccountBanner;
-
-use std::sync::Arc;
-
-use client::{Client, UserStore, zed_urls};
-use gpui::{AnyElement, Entity, IntoElement, ParentElement};
-use ui::{Divider, RegisterComponent, Tooltip, prelude::*};
-
-#[derive(PartialEq)]
-pub enum SignInStatus {
-    SignedIn,
-    SigningIn,
-    SignedOut,
-}
-
-impl From<client::Status> for SignInStatus {
-    fn from(status: client::Status) -> Self {
-        if status.is_signing_in() {
-            Self::SigningIn
-        } else if status.is_signed_out() {
-            Self::SignedOut
-        } else {
-            Self::SignedIn
-        }
-    }
-}
-
-#[derive(RegisterComponent, IntoElement)]
-pub struct ZedAiOnboarding {
-    pub sign_in_status: SignInStatus,
-    pub plan: Option<Plan>,
-    pub account_too_young: bool,
-    pub continue_with_zed_ai: Arc<dyn Fn(&mut Window, &mut App)>,
-    pub sign_in: Arc<dyn Fn(&mut Window, &mut App)>,
-    pub dismiss_onboarding: Option<Arc<dyn Fn(&mut Window, &mut App)>>,
-}
-
-impl ZedAiOnboarding {
-    pub fn new(
-        client: Arc<Client>,
-        user_store: &Entity<UserStore>,
-        continue_with_zed_ai: Arc<dyn Fn(&mut Window, &mut App)>,
-        cx: &mut App,
-    ) -> Self {
-        let store = user_store.read(cx);
-        let status = *client.status().borrow();
-
-        Self {
-            sign_in_status: status.into(),
-            plan: store.plan(),
-            account_too_young: store.account_too_young(),
-            continue_with_zed_ai,
-            sign_in: Arc::new(move |_window, cx| {
-                cx.spawn({
-                    let client = client.clone();
-                    async move |cx| client.sign_in_with_optional_connect(true, cx).await
-                })
-                .detach_and_log_err(cx);
-            }),
-            dismiss_onboarding: None,
-        }
-    }
-
-    pub fn with_dismiss(
-        mut self,
-        dismiss_callback: impl Fn(&mut Window, &mut App) + 'static,
-    ) -> Self {
-        self.dismiss_onboarding = Some(Arc::new(dismiss_callback));
-        self
-    }
-
-    fn render_dismiss_button(&self) -> Option<AnyElement> {
-        self.dismiss_onboarding.as_ref().map(|dismiss_callback| {
-            let callback = dismiss_callback.clone();
-
-            h_flex()
-                .absolute()
-                .top_0()
-                .right_0()
-                .child(
-                    IconButton::new("dismiss_onboarding", IconName::Close)
-                        .icon_size(IconSize::Small)
-                        .tooltip(Tooltip::text("Dismiss"))
-                        .on_click(move |_, window, cx| {
-                            telemetry::event!("Banner Dismissed", source = "AI Onboarding",);
-                            callback(window, cx)
-                        }),
-                )
-                .into_any_element()
-        })
-    }
-
-    fn render_sign_in_disclaimer(&self, _cx: &mut App) -> AnyElement {
-        let signing_in = matches!(self.sign_in_status, SignInStatus::SigningIn);
-
-        v_flex()
-            .relative()
-            .gap_1()
-            .child(Headline::new("Welcome to Zed AI"))
-            .child(
-                Label::new("Sign in to try Zed Pro for 14 days, no credit card required.")
-                    .color(Color::Muted)
-                    .mb_2(),
-            )
-            .child(PlanDefinitions.pro_plan(true, false))
-            .child(
-                Button::new("sign_in", "Try Zed Pro for Free")
-                    .disabled(signing_in)
-                    .full_width()
-                    .style(ButtonStyle::Tinted(ui::TintColor::Accent))
-                    .on_click({
-                        let callback = self.sign_in.clone();
-                        move |_, window, cx| {
-                            telemetry::event!("Start Trial Clicked", state = "pre-sign-in");
-                            callback(window, cx)
-                        }
-                    }),
-            )
-            .children(self.render_dismiss_button())
-            .into_any_element()
-    }
-
-    fn render_free_plan_state(&self, is_v2: bool, cx: &mut App) -> AnyElement {
-        if self.account_too_young {
-            v_flex()
-                .relative()
-                .max_w_full()
-                .gap_1()
-                .child(Headline::new("Welcome to Zed AI"))
-                .child(YoungAccountBanner)
-                .child(
-                    v_flex()
-                        .mt_2()
-                        .gap_1()
-                        .child(
-                            h_flex()
-                                .gap_2()
-                                .child(
-                                    Label::new("Pro")
-                                        .size(LabelSize::Small)
-                                        .color(Color::Accent)
-                                        .buffer_font(cx),
-                                )
-                                .child(Divider::horizontal()),
-                        )
-                        .child(PlanDefinitions.pro_plan(is_v2, true))
-                        .child(
-                            Button::new("pro", "Get Started")
-                                .full_width()
-                                .style(ButtonStyle::Tinted(ui::TintColor::Accent))
-                                .on_click(move |_, _window, cx| {
-                                    telemetry::event!(
-                                        "Upgrade To Pro Clicked",
-                                        state = "young-account"
-                                    );
-                                    cx.open_url(&zed_urls::upgrade_to_zed_pro_url(cx))
-                                }),
-                        ),
-                )
-                .into_any_element()
-        } else {
-            v_flex()
-                .relative()
-                .gap_1()
-                .child(Headline::new("Welcome to Zed AI"))
-                .child(
-                    v_flex()
-                        .mt_2()
-                        .gap_1()
-                        .child(
-                            h_flex()
-                                .gap_2()
-                                .child(
-                                    Label::new("Free")
-                                        .size(LabelSize::Small)
-                                        .color(Color::Muted)
-                                        .buffer_font(cx),
-                                )
-                                .child(
-                                    Label::new("(Current Plan)")
-                                        .size(LabelSize::Small)
-                                        .color(Color::Custom(
-                                            cx.theme().colors().text_muted.opacity(0.6),
-                                        ))
-                                        .buffer_font(cx),
-                                )
-                                .child(Divider::horizontal()),
-                        )
-                        .child(PlanDefinitions.free_plan(is_v2)),
-                )
-                .children(self.render_dismiss_button())
-                .child(
-                    v_flex()
-                        .mt_2()
-                        .gap_1()
-                        .child(
-                            h_flex()
-                                .gap_2()
-                                .child(
-                                    Label::new("Pro Trial")
-                                        .size(LabelSize::Small)
-                                        .color(Color::Accent)
-                                        .buffer_font(cx),
-                                )
-                                .child(Divider::horizontal()),
-                        )
-                        .child(PlanDefinitions.pro_trial(is_v2, true))
-                        .child(
-                            Button::new("pro", "Start Free Trial")
-                                .full_width()
-                                .style(ButtonStyle::Tinted(ui::TintColor::Accent))
-                                .on_click(move |_, _window, cx| {
-                                    telemetry::event!(
-                                        "Start Trial Clicked",
-                                        state = "post-sign-in"
-                                    );
-                                    cx.open_url(&zed_urls::start_trial_url(cx))
-                                }),
-                        ),
-                )
-                .into_any_element()
-        }
-    }
-
-    fn render_trial_state(&self, is_v2: bool, _cx: &mut App) -> AnyElement {
-        v_flex()
-            .relative()
-            .gap_1()
-            .child(Headline::new("Welcome to the Zed Pro Trial"))
-            .child(
-                Label::new("Here's what you get for the next 14 days:")
-                    .color(Color::Muted)
-                    .mb_2(),
-            )
-            .child(PlanDefinitions.pro_trial(is_v2, false))
-            .children(self.render_dismiss_button())
-            .into_any_element()
-    }
-
-    fn render_pro_plan_state(&self, is_v2: bool, _cx: &mut App) -> AnyElement {
-        v_flex()
-            .gap_1()
-            .child(Headline::new("Welcome to Zed Pro"))
-            .child(
-                Label::new("Here's what you get:")
-                    .color(Color::Muted)
-                    .mb_2(),
-            )
-            .child(PlanDefinitions.pro_plan(is_v2, false))
-            .children(self.render_dismiss_button())
-            .into_any_element()
-    }
-}
-
-impl RenderOnce for ZedAiOnboarding {
-    fn render(self, _window: &mut ui::Window, cx: &mut App) -> impl IntoElement {
-        if matches!(self.sign_in_status, SignInStatus::SignedIn) {
-            match self.plan {
-                None => self.render_free_plan_state(true, cx),
-                Some(plan @ (Plan::V1(PlanV1::ZedFree) | Plan::V2(PlanV2::ZedFree))) => {
-                    self.render_free_plan_state(plan.is_v2(), cx)
-                }
-                Some(plan @ (Plan::V1(PlanV1::ZedProTrial) | Plan::V2(PlanV2::ZedProTrial))) => {
-                    self.render_trial_state(plan.is_v2(), cx)
-                }
-                Some(plan @ (Plan::V1(PlanV1::ZedPro) | Plan::V2(PlanV2::ZedPro))) => {
-                    self.render_pro_plan_state(plan.is_v2(), cx)
-                }
-            }
-        } else {
-            self.render_sign_in_disclaimer(cx)
-        }
-    }
-}
-
-impl Component for ZedAiOnboarding {
-    fn scope() -> ComponentScope {
-        ComponentScope::Onboarding
-    }
-
-    fn name() -> &'static str {
-        "Agent Panel Banners"
-    }
-
-    fn sort_name() -> &'static str {
-        "Agent Panel Banners"
-    }
-
-    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
-        fn onboarding(
-            sign_in_status: SignInStatus,
-            plan: Option<Plan>,
-            account_too_young: bool,
-        ) -> AnyElement {
-            ZedAiOnboarding {
-                sign_in_status,
-                plan,
-                account_too_young,
-                continue_with_zed_ai: Arc::new(|_, _| {}),
-                sign_in: Arc::new(|_, _| {}),
-                dismiss_onboarding: None,
-            }
-            .into_any_element()
-        }
-
-        Some(
-            v_flex()
-                .gap_4()
-                .items_center()
-                .max_w_4_5()
-                .children(vec![
-                    single_example(
-                        "Not Signed-in",
-                        onboarding(SignInStatus::SignedOut, None, false),
-                    ),
-                    single_example(
-                        "Young Account",
-                        onboarding(SignInStatus::SignedIn, None, true),
-                    ),
-                    single_example(
-                        "Free Plan",
-                        onboarding(
-                            SignInStatus::SignedIn,
-                            Some(Plan::V2(PlanV2::ZedFree)),
-                            false,
-                        ),
-                    ),
-                    single_example(
-                        "Pro Trial",
-                        onboarding(
-                            SignInStatus::SignedIn,
-                            Some(Plan::V2(PlanV2::ZedProTrial)),
-                            false,
-                        ),
-                    ),
-                    single_example(
-                        "Pro Plan",
-                        onboarding(
-                            SignInStatus::SignedIn,
-                            Some(Plan::V2(PlanV2::ZedPro)),
-                            false,
-                        ),
-                    ),
-                ])
-                .into_any_element(),
-        )
-    }
-}
diff --git a/crates/ai_onboarding/src/ai_upsell_card.rs b/crates/ai_onboarding/src/ai_upsell_card.rs
deleted file mode 100644
index 91191688b5..0000000000
--- a/crates/ai_onboarding/src/ai_upsell_card.rs
+++ /dev/null
@@ -1,370 +0,0 @@
-use std::sync::Arc;
-
-use client::{Client, UserStore, zed_urls};
-use cloud_llm_client::{Plan, PlanV1, PlanV2};
-use gpui::{AnyElement, App, Entity, IntoElement, RenderOnce, Window};
-use ui::{CommonAnimationExt, Divider, Vector, VectorName, prelude::*};
-
-use crate::{SignInStatus, YoungAccountBanner, plan_definitions::PlanDefinitions};
-
-#[derive(IntoElement, RegisterComponent)]
-pub struct AiUpsellCard {
-    sign_in_status: SignInStatus,
-    sign_in: Arc<dyn Fn(&mut Window, &mut App)>,
-    account_too_young: bool,
-    user_plan: Option<Plan>,
-    tab_index: Option<isize>,
-}
-
-impl AiUpsellCard {
-    pub fn new(
-        client: Arc<Client>,
-        user_store: &Entity<UserStore>,
-        user_plan: Option<Plan>,
-        cx: &mut App,
-    ) -> Self {
-        let status = *client.status().borrow();
-        let store = user_store.read(cx);
-
-        Self {
-            user_plan,
-            sign_in_status: status.into(),
-            sign_in: Arc::new(move |_window, cx| {
-                cx.spawn({
-                    let client = client.clone();
-                    async move |cx| client.sign_in_with_optional_connect(true, cx).await
-                })
-                .detach_and_log_err(cx);
-            }),
-            account_too_young: store.account_too_young(),
-            tab_index: None,
-        }
-    }
-
-    pub fn tab_index(mut self, tab_index: Option<isize>) -> Self {
-        self.tab_index = tab_index;
-        self
-    }
-}
-
-impl RenderOnce for AiUpsellCard {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let is_v2_plan = self.user_plan.map_or(true, |plan| plan.is_v2());
-
-        let pro_section = v_flex()
-            .flex_grow()
-            .w_full()
-            .gap_1()
-            .child(
-                h_flex()
-                    .gap_2()
-                    .child(
-                        Label::new("Pro")
-                            .size(LabelSize::Small)
-                            .color(Color::Accent)
-                            .buffer_font(cx),
-                    )
-                    .child(Divider::horizontal()),
-            )
-            .child(PlanDefinitions.pro_plan(is_v2_plan, false));
-
-        let free_section = v_flex()
-            .flex_grow()
-            .w_full()
-            .gap_1()
-            .child(
-                h_flex()
-                    .gap_2()
-                    .child(
-                        Label::new("Free")
-                            .size(LabelSize::Small)
-                            .color(Color::Muted)
-                            .buffer_font(cx),
-                    )
-                    .child(Divider::horizontal()),
-            )
-            .child(PlanDefinitions.free_plan(is_v2_plan));
-
-        let grid_bg = h_flex()
-            .absolute()
-            .inset_0()
-            .w_full()
-            .h(px(240.))
-            .bg(gpui::pattern_slash(
-                cx.theme().colors().border.opacity(0.1),
-                2.,
-                25.,
-            ));
-
-        let gradient_bg = div()
-            .absolute()
-            .inset_0()
-            .size_full()
-            .bg(gpui::linear_gradient(
-                180.,
-                gpui::linear_color_stop(
-                    cx.theme().colors().elevated_surface_background.opacity(0.8),
-                    0.,
-                ),
-                gpui::linear_color_stop(
-                    cx.theme().colors().elevated_surface_background.opacity(0.),
-                    0.8,
-                ),
-            ));
-
-        let description = PlanDefinitions::AI_DESCRIPTION;
-
-        let card = v_flex()
-            .relative()
-            .flex_grow()
-            .p_4()
-            .pt_3()
-            .border_1()
-            .border_color(cx.theme().colors().border)
-            .rounded_lg()
-            .overflow_hidden()
-            .child(grid_bg)
-            .child(gradient_bg);
-
-        let plans_section = h_flex()
-            .w_full()
-            .mt_1p5()
-            .mb_2p5()
-            .items_start()
-            .gap_6()
-            .child(free_section)
-            .child(pro_section);
-
-        let footer_container = v_flex().items_center().gap_1();
-
-        let certified_user_stamp = div()
-            .absolute()
-            .top_2()
-            .right_2()
-            .size(rems_from_px(72.))
-            .child(
-                Vector::new(
-                    VectorName::ProUserStamp,
-                    rems_from_px(72.),
-                    rems_from_px(72.),
-                )
-                .color(Color::Custom(cx.theme().colors().text_accent.alpha(0.3)))
-                .with_rotate_animation(10),
-            );
-
-        let pro_trial_stamp = div()
-            .absolute()
-            .top_2()
-            .right_2()
-            .size(rems_from_px(72.))
-            .child(
-                Vector::new(
-                    VectorName::ProTrialStamp,
-                    rems_from_px(72.),
-                    rems_from_px(72.),
-                )
-                .color(Color::Custom(cx.theme().colors().text.alpha(0.2))),
-            );
-
-        match self.sign_in_status {
-            SignInStatus::SignedIn => match self.user_plan {
-                None | Some(Plan::V1(PlanV1::ZedFree) | Plan::V2(PlanV2::ZedFree)) => card
-                    .child(Label::new("Try Zed AI").size(LabelSize::Large))
-                    .map(|this| {
-                        if self.account_too_young {
-                            this.child(YoungAccountBanner).child(
-                                v_flex()
-                                    .mt_2()
-                                    .gap_1()
-                                    .child(
-                                        h_flex()
-                                            .gap_2()
-                                            .child(
-                                                Label::new("Pro")
-                                                    .size(LabelSize::Small)
-                                                    .color(Color::Accent)
-                                                    .buffer_font(cx),
-                                            )
-                                            .child(Divider::horizontal()),
-                                    )
-                                    .child(PlanDefinitions.pro_plan(is_v2_plan, true))
-                                    .child(
-                                        Button::new("pro", "Get Started")
-                                            .full_width()
-                                            .style(ButtonStyle::Tinted(ui::TintColor::Accent))
-                                            .on_click(move |_, _window, cx| {
-                                                telemetry::event!(
-                                                    "Upgrade To Pro Clicked",
-                                                    state = "young-account"
-                                                );
-                                                cx.open_url(&zed_urls::upgrade_to_zed_pro_url(cx))
-                                            }),
-                                    ),
-                            )
-                        } else {
-                            this.child(
-                                div()
-                                    .max_w_3_4()
-                                    .mb_2()
-                                    .child(Label::new(description).color(Color::Muted)),
-                            )
-                            .child(plans_section)
-                            .child(
-                                footer_container
-                                    .child(
-                                        Button::new("start_trial", "Start Pro Trial")
-                                            .full_width()
-                                            .style(ButtonStyle::Tinted(ui::TintColor::Accent))
-                                            .when_some(self.tab_index, |this, tab_index| {
-                                                this.tab_index(tab_index)
-                                            })
-                                            .on_click(move |_, _window, cx| {
-                                                telemetry::event!(
-                                                    "Start Trial Clicked",
-                                                    state = "post-sign-in"
-                                                );
-                                                cx.open_url(&zed_urls::start_trial_url(cx))
-                                            }),
-                                    )
-                                    .child(
-                                        Label::new("14 days, no credit card required")
-                                            .size(LabelSize::Small)
-                                            .color(Color::Muted),
-                                    ),
-                            )
-                        }
-                    }),
-                Some(plan @ (Plan::V1(PlanV1::ZedProTrial) | Plan::V2(PlanV2::ZedProTrial))) => {
-                    card.child(pro_trial_stamp)
-                        .child(Label::new("You're in the Zed Pro Trial").size(LabelSize::Large))
-                        .child(
-                            Label::new("Here's what you get for the next 14 days:")
-                                .color(Color::Muted)
-                                .mb_2(),
-                        )
-                        .child(PlanDefinitions.pro_trial(plan.is_v2(), false))
-                }
-                Some(plan @ (Plan::V1(PlanV1::ZedPro) | Plan::V2(PlanV2::ZedPro))) => card
-                    .child(certified_user_stamp)
-                    .child(Label::new("You're in the Zed Pro plan").size(LabelSize::Large))
-                    .child(
-                        Label::new("Here's what you get:")
-                            .color(Color::Muted)
-                            .mb_2(),
-                    )
-                    .child(PlanDefinitions.pro_plan(plan.is_v2(), false)),
-            },
-            // Signed Out State
-            _ => card
-                .child(Label::new("Try Zed AI").size(LabelSize::Large))
-                .child(
-                    div()
-                        .max_w_3_4()
-                        .mb_2()
-                        .child(Label::new(description).color(Color::Muted)),
-                )
-                .child(plans_section)
-                .child(
-                    Button::new("sign_in", "Sign In")
-                        .full_width()
-                        .style(ButtonStyle::Tinted(ui::TintColor::Accent))
-                        .when_some(self.tab_index, |this, tab_index| this.tab_index(tab_index))
-                        .on_click({
-                            let callback = self.sign_in.clone();
-                            move |_, window, cx| {
-                                telemetry::event!("Start Trial Clicked", state = "pre-sign-in");
-                                callback(window, cx)
-                            }
-                        }),
-                ),
-        }
-    }
-}
-
-impl Component for AiUpsellCard {
-    fn scope() -> ComponentScope {
-        ComponentScope::Onboarding
-    }
-
-    fn name() -> &'static str {
-        "AI Upsell Card"
-    }
-
-    fn sort_name() -> &'static str {
-        "AI Upsell Card"
-    }
-
-    fn description() -> Option<&'static str> {
-        Some("A card presenting the Zed AI product during user's first-open onboarding flow.")
-    }
-
-    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
-        Some(
-            v_flex()
-                .gap_4()
-                .items_center()
-                .max_w_4_5()
-                .child(single_example(
-                    "Signed Out State",
-                    AiUpsellCard {
-                        sign_in_status: SignInStatus::SignedOut,
-                        sign_in: Arc::new(|_, _| {}),
-                        account_too_young: false,
-                        user_plan: None,
-                        tab_index: Some(0),
-                    }
-                    .into_any_element(),
-                ))
-                .child(example_group_with_title(
-                    "Signed In States",
-                    vec![
-                        single_example(
-                            "Free Plan",
-                            AiUpsellCard {
-                                sign_in_status: SignInStatus::SignedIn,
-                                sign_in: Arc::new(|_, _| {}),
-                                account_too_young: false,
-                                user_plan: Some(Plan::V2(PlanV2::ZedFree)),
-                                tab_index: Some(1),
-                            }
-                            .into_any_element(),
-                        ),
-                        single_example(
-                            "Free Plan but Young Account",
-                            AiUpsellCard {
-                                sign_in_status: SignInStatus::SignedIn,
-                                sign_in: Arc::new(|_, _| {}),
-                                account_too_young: true,
-                                user_plan: Some(Plan::V2(PlanV2::ZedFree)),
-                                tab_index: Some(1),
-                            }
-                            .into_any_element(),
-                        ),
-                        single_example(
-                            "Pro Trial",
-                            AiUpsellCard {
-                                sign_in_status: SignInStatus::SignedIn,
-                                sign_in: Arc::new(|_, _| {}),
-                                account_too_young: false,
-                                user_plan: Some(Plan::V2(PlanV2::ZedProTrial)),
-                                tab_index: Some(1),
-                            }
-                            .into_any_element(),
-                        ),
-                        single_example(
-                            "Pro Plan",
-                            AiUpsellCard {
-                                sign_in_status: SignInStatus::SignedIn,
-                                sign_in: Arc::new(|_, _| {}),
-                                account_too_young: false,
-                                user_plan: Some(Plan::V2(PlanV2::ZedPro)),
-                                tab_index: Some(1),
-                            }
-                            .into_any_element(),
-                        ),
-                    ],
-                ))
-                .into_any_element(),
-        )
-    }
-}
diff --git a/crates/ai_onboarding/src/edit_prediction_onboarding_content.rs b/crates/ai_onboarding/src/edit_prediction_onboarding_content.rs
deleted file mode 100644
index 571f0f8e45..0000000000
--- a/crates/ai_onboarding/src/edit_prediction_onboarding_content.rs
+++ /dev/null
@@ -1,79 +0,0 @@
-use std::sync::Arc;
-
-use client::{Client, UserStore};
-use cloud_llm_client::{Plan, PlanV1, PlanV2};
-use gpui::{Entity, IntoElement, ParentElement};
-use ui::prelude::*;
-
-use crate::ZedAiOnboarding;
-
-pub struct EditPredictionOnboarding {
-    user_store: Entity<UserStore>,
-    client: Arc<Client>,
-    copilot_is_configured: bool,
-    continue_with_zed_ai: Arc<dyn Fn(&mut Window, &mut App)>,
-    continue_with_copilot: Arc<dyn Fn(&mut Window, &mut App)>,
-}
-
-impl EditPredictionOnboarding {
-    pub fn new(
-        user_store: Entity<UserStore>,
-        client: Arc<Client>,
-        copilot_is_configured: bool,
-        continue_with_zed_ai: Arc<dyn Fn(&mut Window, &mut App)>,
-        continue_with_copilot: Arc<dyn Fn(&mut Window, &mut App)>,
-        _cx: &mut Context<Self>,
-    ) -> Self {
-        Self {
-            user_store,
-            copilot_is_configured,
-            client,
-            continue_with_zed_ai,
-            continue_with_copilot,
-        }
-    }
-}
-
-impl Render for EditPredictionOnboarding {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let is_free_plan = self.user_store.read(cx).plan().is_some_and(|plan| {
-            matches!(plan, Plan::V1(PlanV1::ZedFree) | Plan::V2(PlanV2::ZedFree))
-        });
-
-        let github_copilot = v_flex()
-            .gap_1()
-            .child(Label::new(if self.copilot_is_configured {
-                "Alternatively, you can continue to use GitHub Copilot as that's already set up."
-            } else {
-                "Alternatively, you can use GitHub Copilot as your edit prediction provider."
-            }))
-            .child(
-                Button::new(
-                    "configure-copilot",
-                    if self.copilot_is_configured {
-                        "Use Copilot"
-                    } else {
-                        "Configure Copilot"
-                    },
-                )
-                .full_width()
-                .style(ButtonStyle::Outlined)
-                .on_click({
-                    let callback = self.continue_with_copilot.clone();
-                    move |_, window, cx| callback(window, cx)
-                }),
-            );
-
-        v_flex()
-            .gap_2()
-            .child(ZedAiOnboarding::new(
-                self.client.clone(),
-                &self.user_store,
-                self.continue_with_zed_ai.clone(),
-                cx,
-            ))
-            .when(is_free_plan, |this| {
-                this.child(ui::Divider::horizontal()).child(github_copilot)
-            })
-    }
-}
diff --git a/crates/ai_onboarding/src/plan_definitions.rs b/crates/ai_onboarding/src/plan_definitions.rs
deleted file mode 100644
index 11f5631171..0000000000
--- a/crates/ai_onboarding/src/plan_definitions.rs
+++ /dev/null
@@ -1,68 +0,0 @@
-use gpui::{IntoElement, ParentElement};
-use ui::{List, ListBulletItem, prelude::*};
-
-/// Centralized definitions for Zed AI plans
-pub struct PlanDefinitions;
-
-impl PlanDefinitions {
-    pub const AI_DESCRIPTION: &'static str = "Zed offers a complete agentic experience, with robust editing and reviewing features to collaborate with AI.";
-
-    pub fn free_plan(&self, is_v2: bool) -> impl IntoElement {
-        if is_v2 {
-            List::new()
-                .child(ListBulletItem::new("2,000 accepted edit predictions"))
-                .child(ListBulletItem::new(
-                    "Unlimited prompts with your AI API keys",
-                ))
-                .child(ListBulletItem::new(
-                    "Unlimited use of external agents like Claude Code",
-                ))
-        } else {
-            List::new()
-                .child(ListBulletItem::new("50 prompts with Claude models"))
-                .child(ListBulletItem::new("2,000 accepted edit predictions"))
-        }
-    }
-
-    pub fn pro_trial(&self, is_v2: bool, period: bool) -> impl IntoElement {
-        if is_v2 {
-            List::new()
-                .child(ListBulletItem::new("Unlimited edit predictions"))
-                .child(ListBulletItem::new("$20 of tokens"))
-                .when(period, |this| {
-                    this.child(ListBulletItem::new(
-                        "Try it out for 14 days, no credit card required",
-                    ))
-                })
-        } else {
-            List::new()
-                .child(ListBulletItem::new("150 prompts with Claude models"))
-                .child(ListBulletItem::new(
-                    "Unlimited edit predictions with Zeta, our open-source model",
-                ))
-                .when(period, |this| {
-                    this.child(ListBulletItem::new(
-                        "Try it out for 14 days, no credit card required",
-                    ))
-                })
-        }
-    }
-
-    pub fn pro_plan(&self, is_v2: bool, price: bool) -> impl IntoElement {
-        if is_v2 {
-            List::new()
-                .child(ListBulletItem::new("Unlimited edit predictions"))
-                .child(ListBulletItem::new("$5 of tokens"))
-                .child(ListBulletItem::new("Usage-based billing beyond $5"))
-        } else {
-            List::new()
-                .child(ListBulletItem::new("500 prompts with Claude models"))
-                .child(ListBulletItem::new(
-                    "Unlimited edit predictions with Zeta, our open-source model",
-                ))
-                .when(price, |this| {
-                    this.child(ListBulletItem::new("$20 USD per month"))
-                })
-        }
-    }
-}
diff --git a/crates/ai_onboarding/src/young_account_banner.rs b/crates/ai_onboarding/src/young_account_banner.rs
deleted file mode 100644
index c4a7887364..0000000000
--- a/crates/ai_onboarding/src/young_account_banner.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-use gpui::{IntoElement, ParentElement};
-use ui::{Banner, prelude::*};
-
-#[derive(IntoElement)]
-pub struct YoungAccountBanner;
-
-impl RenderOnce for YoungAccountBanner {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        const YOUNG_ACCOUNT_DISCLAIMER: &str = "To prevent abuse of our service, GitHub accounts created fewer than 30 days ago are not eligible for the Pro trial. You can request an exception by reaching out to billing-support@zed.dev";
-
-        let label = div()
-            .w_full()
-            .text_sm()
-            .text_color(cx.theme().colors().text_muted)
-            .child(YOUNG_ACCOUNT_DISCLAIMER);
-
-        div()
-            .max_w_full()
-            .my_1()
-            .child(Banner::new().severity(Severity::Warning).child(label))
-    }
-}
diff --git a/crates/anthropic/Cargo.toml b/crates/anthropic/Cargo.toml
deleted file mode 100644
index a9c7208b0c..0000000000
--- a/crates/anthropic/Cargo.toml
+++ /dev/null
@@ -1,28 +0,0 @@
-[package]
-name = "anthropic"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[features]
-default = []
-schemars = ["dep:schemars"]
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/anthropic.rs"
-
-[dependencies]
-anyhow.workspace = true
-chrono.workspace = true
-futures.workspace = true
-http_client.workspace = true
-schemars = { workspace = true, optional = true }
-serde.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-strum.workspace = true
-thiserror.workspace = true
diff --git a/crates/anthropic/LICENSE-GPL b/crates/anthropic/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/anthropic/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/anthropic/src/anthropic.rs b/crates/anthropic/src/anthropic.rs
deleted file mode 100644
index 09b293b122..0000000000
--- a/crates/anthropic/src/anthropic.rs
+++ /dev/null
@@ -1,1072 +0,0 @@
-use std::io;
-use std::str::FromStr;
-use std::time::Duration;
-
-use anyhow::{Context as _, Result, anyhow};
-use chrono::{DateTime, Utc};
-use futures::{AsyncBufReadExt, AsyncReadExt, StreamExt, io::BufReader, stream::BoxStream};
-use http_client::http::{self, HeaderMap, HeaderValue};
-use http_client::{AsyncBody, HttpClient, Method, Request as HttpRequest, StatusCode};
-use serde::{Deserialize, Serialize};
-pub use settings::{AnthropicAvailableModel as AvailableModel, ModelMode};
-use strum::{EnumIter, EnumString};
-use thiserror::Error;
-
-pub mod batches;
-
-pub const ANTHROPIC_API_URL: &str = "https://api.anthropic.com";
-
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
-#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq)]
-pub struct AnthropicModelCacheConfiguration {
-    pub min_total_token: u64,
-    pub should_speculate: bool,
-    pub max_cache_anchors: usize,
-}
-
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
-#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq)]
-pub enum AnthropicModelMode {
-    #[default]
-    Default,
-    Thinking {
-        budget_tokens: Option<u32>,
-    },
-}
-
-impl From<ModelMode> for AnthropicModelMode {
-    fn from(value: ModelMode) -> Self {
-        match value {
-            ModelMode::Default => AnthropicModelMode::Default,
-            ModelMode::Thinking { budget_tokens } => AnthropicModelMode::Thinking { budget_tokens },
-        }
-    }
-}
-
-impl From<AnthropicModelMode> for ModelMode {
-    fn from(value: AnthropicModelMode) -> Self {
-        match value {
-            AnthropicModelMode::Default => ModelMode::Default,
-            AnthropicModelMode::Thinking { budget_tokens } => ModelMode::Thinking { budget_tokens },
-        }
-    }
-}
-
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
-#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq, EnumIter)]
-pub enum Model {
-    #[serde(rename = "claude-opus-4", alias = "claude-opus-4-latest")]
-    ClaudeOpus4,
-    #[serde(rename = "claude-opus-4-1", alias = "claude-opus-4-1-latest")]
-    ClaudeOpus4_1,
-    #[serde(
-        rename = "claude-opus-4-thinking",
-        alias = "claude-opus-4-thinking-latest"
-    )]
-    ClaudeOpus4Thinking,
-    #[serde(
-        rename = "claude-opus-4-1-thinking",
-        alias = "claude-opus-4-1-thinking-latest"
-    )]
-    ClaudeOpus4_1Thinking,
-    #[serde(rename = "claude-opus-4-5", alias = "claude-opus-4-5-latest")]
-    ClaudeOpus4_5,
-    #[serde(
-        rename = "claude-opus-4-5-thinking",
-        alias = "claude-opus-4-5-thinking-latest"
-    )]
-    ClaudeOpus4_5Thinking,
-    #[serde(rename = "claude-sonnet-4", alias = "claude-sonnet-4-latest")]
-    ClaudeSonnet4,
-    #[serde(
-        rename = "claude-sonnet-4-thinking",
-        alias = "claude-sonnet-4-thinking-latest"
-    )]
-    ClaudeSonnet4Thinking,
-    #[default]
-    #[serde(rename = "claude-sonnet-4-5", alias = "claude-sonnet-4-5-latest")]
-    ClaudeSonnet4_5,
-    #[serde(
-        rename = "claude-sonnet-4-5-thinking",
-        alias = "claude-sonnet-4-5-thinking-latest"
-    )]
-    ClaudeSonnet4_5Thinking,
-    #[serde(rename = "claude-3-7-sonnet", alias = "claude-3-7-sonnet-latest")]
-    Claude3_7Sonnet,
-    #[serde(
-        rename = "claude-3-7-sonnet-thinking",
-        alias = "claude-3-7-sonnet-thinking-latest"
-    )]
-    Claude3_7SonnetThinking,
-    #[serde(rename = "claude-3-5-sonnet", alias = "claude-3-5-sonnet-latest")]
-    Claude3_5Sonnet,
-    #[serde(rename = "claude-haiku-4-5", alias = "claude-haiku-4-5-latest")]
-    ClaudeHaiku4_5,
-    #[serde(
-        rename = "claude-haiku-4-5-thinking",
-        alias = "claude-haiku-4-5-thinking-latest"
-    )]
-    ClaudeHaiku4_5Thinking,
-    #[serde(rename = "claude-3-5-haiku", alias = "claude-3-5-haiku-latest")]
-    Claude3_5Haiku,
-    #[serde(rename = "claude-3-opus", alias = "claude-3-opus-latest")]
-    Claude3Opus,
-    #[serde(rename = "claude-3-sonnet", alias = "claude-3-sonnet-latest")]
-    Claude3Sonnet,
-    #[serde(rename = "claude-3-haiku", alias = "claude-3-haiku-latest")]
-    Claude3Haiku,
-    #[serde(rename = "custom")]
-    Custom {
-        name: String,
-        max_tokens: u64,
-        /// The name displayed in the UI, such as in the assistant panel model dropdown menu.
-        display_name: Option<String>,
-        /// Override this model with a different Anthropic model for tool calls.
-        tool_override: Option<String>,
-        /// Indicates whether this custom model supports caching.
-        cache_configuration: Option<AnthropicModelCacheConfiguration>,
-        max_output_tokens: Option<u64>,
-        default_temperature: Option<f32>,
-        #[serde(default)]
-        extra_beta_headers: Vec<String>,
-        #[serde(default)]
-        mode: AnthropicModelMode,
-    },
-}
-
-impl Model {
-    pub fn default_fast() -> Self {
-        Self::Claude3_5Haiku
-    }
-
-    pub fn from_id(id: &str) -> Result<Self> {
-        if id.starts_with("claude-opus-4-5-thinking") {
-            return Ok(Self::ClaudeOpus4_5Thinking);
-        }
-
-        if id.starts_with("claude-opus-4-5") {
-            return Ok(Self::ClaudeOpus4_5);
-        }
-
-        if id.starts_with("claude-opus-4-1-thinking") {
-            return Ok(Self::ClaudeOpus4_1Thinking);
-        }
-
-        if id.starts_with("claude-opus-4-thinking") {
-            return Ok(Self::ClaudeOpus4Thinking);
-        }
-
-        if id.starts_with("claude-opus-4-1") {
-            return Ok(Self::ClaudeOpus4_1);
-        }
-
-        if id.starts_with("claude-opus-4") {
-            return Ok(Self::ClaudeOpus4);
-        }
-
-        if id.starts_with("claude-sonnet-4-5-thinking") {
-            return Ok(Self::ClaudeSonnet4_5Thinking);
-        }
-
-        if id.starts_with("claude-sonnet-4-5") {
-            return Ok(Self::ClaudeSonnet4_5);
-        }
-
-        if id.starts_with("claude-sonnet-4-thinking") {
-            return Ok(Self::ClaudeSonnet4Thinking);
-        }
-
-        if id.starts_with("claude-sonnet-4") {
-            return Ok(Self::ClaudeSonnet4);
-        }
-
-        if id.starts_with("claude-3-7-sonnet-thinking") {
-            return Ok(Self::Claude3_7SonnetThinking);
-        }
-
-        if id.starts_with("claude-3-7-sonnet") {
-            return Ok(Self::Claude3_7Sonnet);
-        }
-
-        if id.starts_with("claude-3-5-sonnet") {
-            return Ok(Self::Claude3_5Sonnet);
-        }
-
-        if id.starts_with("claude-haiku-4-5-thinking") {
-            return Ok(Self::ClaudeHaiku4_5Thinking);
-        }
-
-        if id.starts_with("claude-haiku-4-5") {
-            return Ok(Self::ClaudeHaiku4_5);
-        }
-
-        if id.starts_with("claude-3-5-haiku") {
-            return Ok(Self::Claude3_5Haiku);
-        }
-
-        if id.starts_with("claude-3-opus") {
-            return Ok(Self::Claude3Opus);
-        }
-
-        if id.starts_with("claude-3-sonnet") {
-            return Ok(Self::Claude3Sonnet);
-        }
-
-        if id.starts_with("claude-3-haiku") {
-            return Ok(Self::Claude3Haiku);
-        }
-
-        Err(anyhow!("invalid model ID: {id}"))
-    }
-
-    pub fn id(&self) -> &str {
-        match self {
-            Self::ClaudeOpus4 => "claude-opus-4-latest",
-            Self::ClaudeOpus4_1 => "claude-opus-4-1-latest",
-            Self::ClaudeOpus4Thinking => "claude-opus-4-thinking-latest",
-            Self::ClaudeOpus4_1Thinking => "claude-opus-4-1-thinking-latest",
-            Self::ClaudeOpus4_5 => "claude-opus-4-5-latest",
-            Self::ClaudeOpus4_5Thinking => "claude-opus-4-5-thinking-latest",
-            Self::ClaudeSonnet4 => "claude-sonnet-4-latest",
-            Self::ClaudeSonnet4Thinking => "claude-sonnet-4-thinking-latest",
-            Self::ClaudeSonnet4_5 => "claude-sonnet-4-5-latest",
-            Self::ClaudeSonnet4_5Thinking => "claude-sonnet-4-5-thinking-latest",
-            Self::Claude3_5Sonnet => "claude-3-5-sonnet-latest",
-            Self::Claude3_7Sonnet => "claude-3-7-sonnet-latest",
-            Self::Claude3_7SonnetThinking => "claude-3-7-sonnet-thinking-latest",
-            Self::ClaudeHaiku4_5 => "claude-haiku-4-5-latest",
-            Self::ClaudeHaiku4_5Thinking => "claude-haiku-4-5-thinking-latest",
-            Self::Claude3_5Haiku => "claude-3-5-haiku-latest",
-            Self::Claude3Opus => "claude-3-opus-latest",
-            Self::Claude3Sonnet => "claude-3-sonnet-20240229",
-            Self::Claude3Haiku => "claude-3-haiku-20240307",
-            Self::Custom { name, .. } => name,
-        }
-    }
-
-    /// The id of the model that should be used for making API requests
-    pub fn request_id(&self) -> &str {
-        match self {
-            Self::ClaudeOpus4 | Self::ClaudeOpus4Thinking => "claude-opus-4-20250514",
-            Self::ClaudeOpus4_1 | Self::ClaudeOpus4_1Thinking => "claude-opus-4-1-20250805",
-            Self::ClaudeOpus4_5 | Self::ClaudeOpus4_5Thinking => "claude-opus-4-5-20251101",
-            Self::ClaudeSonnet4 | Self::ClaudeSonnet4Thinking => "claude-sonnet-4-20250514",
-            Self::ClaudeSonnet4_5 | Self::ClaudeSonnet4_5Thinking => "claude-sonnet-4-5-20250929",
-            Self::Claude3_5Sonnet => "claude-3-5-sonnet-latest",
-            Self::Claude3_7Sonnet | Self::Claude3_7SonnetThinking => "claude-3-7-sonnet-latest",
-            Self::ClaudeHaiku4_5 | Self::ClaudeHaiku4_5Thinking => "claude-haiku-4-5-20251001",
-            Self::Claude3_5Haiku => "claude-3-5-haiku-latest",
-            Self::Claude3Opus => "claude-3-opus-latest",
-            Self::Claude3Sonnet => "claude-3-sonnet-20240229",
-            Self::Claude3Haiku => "claude-3-haiku-20240307",
-            Self::Custom { name, .. } => name,
-        }
-    }
-
-    pub fn display_name(&self) -> &str {
-        match self {
-            Self::ClaudeOpus4 => "Claude Opus 4",
-            Self::ClaudeOpus4_1 => "Claude Opus 4.1",
-            Self::ClaudeOpus4Thinking => "Claude Opus 4 Thinking",
-            Self::ClaudeOpus4_1Thinking => "Claude Opus 4.1 Thinking",
-            Self::ClaudeOpus4_5 => "Claude Opus 4.5",
-            Self::ClaudeOpus4_5Thinking => "Claude Opus 4.5 Thinking",
-            Self::ClaudeSonnet4 => "Claude Sonnet 4",
-            Self::ClaudeSonnet4Thinking => "Claude Sonnet 4 Thinking",
-            Self::ClaudeSonnet4_5 => "Claude Sonnet 4.5",
-            Self::ClaudeSonnet4_5Thinking => "Claude Sonnet 4.5 Thinking",
-            Self::Claude3_7Sonnet => "Claude 3.7 Sonnet",
-            Self::Claude3_5Sonnet => "Claude 3.5 Sonnet",
-            Self::Claude3_7SonnetThinking => "Claude 3.7 Sonnet Thinking",
-            Self::ClaudeHaiku4_5 => "Claude Haiku 4.5",
-            Self::ClaudeHaiku4_5Thinking => "Claude Haiku 4.5 Thinking",
-            Self::Claude3_5Haiku => "Claude 3.5 Haiku",
-            Self::Claude3Opus => "Claude 3 Opus",
-            Self::Claude3Sonnet => "Claude 3 Sonnet",
-            Self::Claude3Haiku => "Claude 3 Haiku",
-            Self::Custom {
-                name, display_name, ..
-            } => display_name.as_ref().unwrap_or(name),
-        }
-    }
-
-    pub fn cache_configuration(&self) -> Option<AnthropicModelCacheConfiguration> {
-        match self {
-            Self::ClaudeOpus4
-            | Self::ClaudeOpus4_1
-            | Self::ClaudeOpus4Thinking
-            | Self::ClaudeOpus4_1Thinking
-            | Self::ClaudeOpus4_5
-            | Self::ClaudeOpus4_5Thinking
-            | Self::ClaudeSonnet4
-            | Self::ClaudeSonnet4Thinking
-            | Self::ClaudeSonnet4_5
-            | Self::ClaudeSonnet4_5Thinking
-            | Self::Claude3_5Sonnet
-            | Self::ClaudeHaiku4_5
-            | Self::ClaudeHaiku4_5Thinking
-            | Self::Claude3_5Haiku
-            | Self::Claude3_7Sonnet
-            | Self::Claude3_7SonnetThinking
-            | Self::Claude3Haiku => Some(AnthropicModelCacheConfiguration {
-                min_total_token: 2_048,
-                should_speculate: true,
-                max_cache_anchors: 4,
-            }),
-            Self::Custom {
-                cache_configuration,
-                ..
-            } => cache_configuration.clone(),
-            _ => None,
-        }
-    }
-
-    pub fn max_token_count(&self) -> u64 {
-        match self {
-            Self::ClaudeOpus4
-            | Self::ClaudeOpus4_1
-            | Self::ClaudeOpus4Thinking
-            | Self::ClaudeOpus4_1Thinking
-            | Self::ClaudeOpus4_5
-            | Self::ClaudeOpus4_5Thinking
-            | Self::ClaudeSonnet4
-            | Self::ClaudeSonnet4Thinking
-            | Self::ClaudeSonnet4_5
-            | Self::ClaudeSonnet4_5Thinking
-            | Self::Claude3_5Sonnet
-            | Self::ClaudeHaiku4_5
-            | Self::ClaudeHaiku4_5Thinking
-            | Self::Claude3_5Haiku
-            | Self::Claude3_7Sonnet
-            | Self::Claude3_7SonnetThinking
-            | Self::Claude3Opus
-            | Self::Claude3Sonnet
-            | Self::Claude3Haiku => 200_000,
-            Self::Custom { max_tokens, .. } => *max_tokens,
-        }
-    }
-
-    pub fn max_output_tokens(&self) -> u64 {
-        match self {
-            Self::ClaudeOpus4
-            | Self::ClaudeOpus4_1
-            | Self::ClaudeOpus4Thinking
-            | Self::ClaudeOpus4_1Thinking
-            | Self::ClaudeOpus4_5
-            | Self::ClaudeOpus4_5Thinking
-            | Self::ClaudeSonnet4
-            | Self::ClaudeSonnet4Thinking
-            | Self::ClaudeSonnet4_5
-            | Self::ClaudeSonnet4_5Thinking
-            | Self::Claude3_5Sonnet
-            | Self::Claude3_7Sonnet
-            | Self::Claude3_7SonnetThinking
-            | Self::Claude3_5Haiku => 8_192,
-            Self::ClaudeHaiku4_5 | Self::ClaudeHaiku4_5Thinking => 64_000,
-            Self::Claude3Opus | Self::Claude3Sonnet | Self::Claude3Haiku => 4_096,
-            Self::Custom {
-                max_output_tokens, ..
-            } => max_output_tokens.unwrap_or(4_096),
-        }
-    }
-
-    pub fn default_temperature(&self) -> f32 {
-        match self {
-            Self::ClaudeOpus4
-            | Self::ClaudeOpus4_1
-            | Self::ClaudeOpus4Thinking
-            | Self::ClaudeOpus4_1Thinking
-            | Self::ClaudeOpus4_5
-            | Self::ClaudeOpus4_5Thinking
-            | Self::ClaudeSonnet4
-            | Self::ClaudeSonnet4Thinking
-            | Self::ClaudeSonnet4_5
-            | Self::ClaudeSonnet4_5Thinking
-            | Self::Claude3_5Sonnet
-            | Self::Claude3_7Sonnet
-            | Self::Claude3_7SonnetThinking
-            | Self::ClaudeHaiku4_5
-            | Self::ClaudeHaiku4_5Thinking
-            | Self::Claude3_5Haiku
-            | Self::Claude3Opus
-            | Self::Claude3Sonnet
-            | Self::Claude3Haiku => 1.0,
-            Self::Custom {
-                default_temperature,
-                ..
-            } => default_temperature.unwrap_or(1.0),
-        }
-    }
-
-    pub fn mode(&self) -> AnthropicModelMode {
-        match self {
-            Self::ClaudeOpus4
-            | Self::ClaudeOpus4_1
-            | Self::ClaudeOpus4_5
-            | Self::ClaudeSonnet4
-            | Self::ClaudeSonnet4_5
-            | Self::Claude3_5Sonnet
-            | Self::Claude3_7Sonnet
-            | Self::ClaudeHaiku4_5
-            | Self::Claude3_5Haiku
-            | Self::Claude3Opus
-            | Self::Claude3Sonnet
-            | Self::Claude3Haiku => AnthropicModelMode::Default,
-            Self::ClaudeOpus4Thinking
-            | Self::ClaudeOpus4_1Thinking
-            | Self::ClaudeOpus4_5Thinking
-            | Self::ClaudeSonnet4Thinking
-            | Self::ClaudeSonnet4_5Thinking
-            | Self::ClaudeHaiku4_5Thinking
-            | Self::Claude3_7SonnetThinking => AnthropicModelMode::Thinking {
-                budget_tokens: Some(4_096),
-            },
-            Self::Custom { mode, .. } => mode.clone(),
-        }
-    }
-
-    pub fn beta_headers(&self) -> Option<String> {
-        let mut headers = vec![];
-
-        match self {
-            Self::Claude3_7Sonnet | Self::Claude3_7SonnetThinking => {
-                // Try beta token-efficient tool use (supported in Claude 3.7 Sonnet only)
-                // https://docs.anthropic.com/en/docs/build-with-claude/tool-use/token-efficient-tool-use
-                headers.push("token-efficient-tools-2025-02-19".to_string());
-            }
-            Self::Custom {
-                extra_beta_headers, ..
-            } => {
-                headers.extend(
-                    extra_beta_headers
-                        .iter()
-                        .filter(|header| !header.trim().is_empty())
-                        .cloned(),
-                );
-            }
-            _ => {}
-        }
-
-        if headers.is_empty() {
-            None
-        } else {
-            Some(headers.join(","))
-        }
-    }
-
-    pub fn tool_model_id(&self) -> &str {
-        if let Self::Custom {
-            tool_override: Some(tool_override),
-            ..
-        } = self
-        {
-            tool_override
-        } else {
-            self.request_id()
-        }
-    }
-}
-
-/// Generate completion with streaming.
-pub async fn stream_completion(
-    client: &dyn HttpClient,
-    api_url: &str,
-    api_key: &str,
-    request: Request,
-    beta_headers: Option<String>,
-) -> Result<BoxStream<'static, Result<Event, AnthropicError>>, AnthropicError> {
-    stream_completion_with_rate_limit_info(client, api_url, api_key, request, beta_headers)
-        .await
-        .map(|output| output.0)
-}
-
-/// Generate completion without streaming.
-pub async fn non_streaming_completion(
-    client: &dyn HttpClient,
-    api_url: &str,
-    api_key: &str,
-    request: Request,
-    beta_headers: Option<String>,
-) -> Result<Response, AnthropicError> {
-    let (mut response, rate_limits) =
-        send_request(client, api_url, api_key, &request, beta_headers).await?;
-
-    if response.status().is_success() {
-        let mut body = String::new();
-        response
-            .body_mut()
-            .read_to_string(&mut body)
-            .await
-            .map_err(AnthropicError::ReadResponse)?;
-
-        serde_json::from_str(&body).map_err(AnthropicError::DeserializeResponse)
-    } else {
-        Err(handle_error_response(response, rate_limits).await)
-    }
-}
-
-async fn send_request(
-    client: &dyn HttpClient,
-    api_url: &str,
-    api_key: &str,
-    request: impl Serialize,
-    beta_headers: Option<String>,
-) -> Result<(http::Response<AsyncBody>, RateLimitInfo), AnthropicError> {
-    let uri = format!("{api_url}/v1/messages");
-
-    let mut request_builder = HttpRequest::builder()
-        .method(Method::POST)
-        .uri(uri)
-        .header("Anthropic-Version", "2023-06-01")
-        .header("X-Api-Key", api_key.trim())
-        .header("Content-Type", "application/json");
-
-    if let Some(beta_headers) = beta_headers {
-        request_builder = request_builder.header("Anthropic-Beta", beta_headers);
-    }
-
-    let serialized_request =
-        serde_json::to_string(&request).map_err(AnthropicError::SerializeRequest)?;
-    let request = request_builder
-        .body(AsyncBody::from(serialized_request))
-        .map_err(AnthropicError::BuildRequestBody)?;
-
-    let response = client
-        .send(request)
-        .await
-        .map_err(AnthropicError::HttpSend)?;
-
-    let rate_limits = RateLimitInfo::from_headers(response.headers());
-
-    Ok((response, rate_limits))
-}
-
-async fn handle_error_response(
-    mut response: http::Response<AsyncBody>,
-    rate_limits: RateLimitInfo,
-) -> AnthropicError {
-    if response.status().as_u16() == 529 {
-        return AnthropicError::ServerOverloaded {
-            retry_after: rate_limits.retry_after,
-        };
-    }
-
-    if let Some(retry_after) = rate_limits.retry_after {
-        return AnthropicError::RateLimit { retry_after };
-    }
-
-    let mut body = String::new();
-    let read_result = response
-        .body_mut()
-        .read_to_string(&mut body)
-        .await
-        .map_err(AnthropicError::ReadResponse);
-
-    if let Err(err) = read_result {
-        return err;
-    }
-
-    match serde_json::from_str::<Event>(&body) {
-        Ok(Event::Error { error }) => AnthropicError::ApiError(error),
-        Ok(_) | Err(_) => AnthropicError::HttpResponseError {
-            status_code: response.status(),
-            message: body,
-        },
-    }
-}
-
-/// An individual rate limit.
-#[derive(Debug)]
-pub struct RateLimit {
-    pub limit: usize,
-    pub remaining: usize,
-    pub reset: DateTime<Utc>,
-}
-
-impl RateLimit {
-    fn from_headers(resource: &str, headers: &HeaderMap<HeaderValue>) -> Result<Self> {
-        let limit =
-            get_header(&format!("anthropic-ratelimit-{resource}-limit"), headers)?.parse()?;
-        let remaining = get_header(
-            &format!("anthropic-ratelimit-{resource}-remaining"),
-            headers,
-        )?
-        .parse()?;
-        let reset = DateTime::parse_from_rfc3339(get_header(
-            &format!("anthropic-ratelimit-{resource}-reset"),
-            headers,
-        )?)?
-        .to_utc();
-
-        Ok(Self {
-            limit,
-            remaining,
-            reset,
-        })
-    }
-}
-
-/// <https://docs.anthropic.com/en/api/rate-limits#response-headers>
-#[derive(Debug)]
-pub struct RateLimitInfo {
-    pub retry_after: Option<Duration>,
-    pub requests: Option<RateLimit>,
-    pub tokens: Option<RateLimit>,
-    pub input_tokens: Option<RateLimit>,
-    pub output_tokens: Option<RateLimit>,
-}
-
-impl RateLimitInfo {
-    fn from_headers(headers: &HeaderMap<HeaderValue>) -> Self {
-        // Check if any rate limit headers exist
-        let has_rate_limit_headers = headers
-            .keys()
-            .any(|k| k == "retry-after" || k.as_str().starts_with("anthropic-ratelimit-"));
-
-        if !has_rate_limit_headers {
-            return Self {
-                retry_after: None,
-                requests: None,
-                tokens: None,
-                input_tokens: None,
-                output_tokens: None,
-            };
-        }
-
-        Self {
-            retry_after: parse_retry_after(headers),
-            requests: RateLimit::from_headers("requests", headers).ok(),
-            tokens: RateLimit::from_headers("tokens", headers).ok(),
-            input_tokens: RateLimit::from_headers("input-tokens", headers).ok(),
-            output_tokens: RateLimit::from_headers("output-tokens", headers).ok(),
-        }
-    }
-}
-
-/// Parses the Retry-After header value as an integer number of seconds (anthropic always uses
-/// seconds). Note that other services might specify an HTTP date or some other format for this
-/// header. Returns `None` if the header is not present or cannot be parsed.
-pub fn parse_retry_after(headers: &HeaderMap<HeaderValue>) -> Option<Duration> {
-    headers
-        .get("retry-after")
-        .and_then(|v| v.to_str().ok())
-        .and_then(|v| v.parse::<u64>().ok())
-        .map(Duration::from_secs)
-}
-
-fn get_header<'a>(key: &str, headers: &'a HeaderMap) -> anyhow::Result<&'a str> {
-    Ok(headers
-        .get(key)
-        .with_context(|| format!("missing header `{key}`"))?
-        .to_str()?)
-}
-
-pub async fn stream_completion_with_rate_limit_info(
-    client: &dyn HttpClient,
-    api_url: &str,
-    api_key: &str,
-    request: Request,
-    beta_headers: Option<String>,
-) -> Result<
-    (
-        BoxStream<'static, Result<Event, AnthropicError>>,
-        Option<RateLimitInfo>,
-    ),
-    AnthropicError,
-> {
-    let request = StreamingRequest {
-        base: request,
-        stream: true,
-    };
-
-    let (response, rate_limits) =
-        send_request(client, api_url, api_key, &request, beta_headers).await?;
-
-    if response.status().is_success() {
-        let reader = BufReader::new(response.into_body());
-        let stream = reader
-            .lines()
-            .filter_map(|line| async move {
-                match line {
-                    Ok(line) => {
-                        let line = line.strip_prefix("data: ")?;
-                        match serde_json::from_str(line) {
-                            Ok(response) => Some(Ok(response)),
-                            Err(error) => Some(Err(AnthropicError::DeserializeResponse(error))),
-                        }
-                    }
-                    Err(error) => Some(Err(AnthropicError::ReadResponse(error))),
-                }
-            })
-            .boxed();
-        Ok((stream, Some(rate_limits)))
-    } else {
-        Err(handle_error_response(response, rate_limits).await)
-    }
-}
-
-#[derive(Debug, Serialize, Deserialize, Copy, Clone)]
-#[serde(rename_all = "lowercase")]
-pub enum CacheControlType {
-    Ephemeral,
-}
-
-#[derive(Debug, Serialize, Deserialize, Copy, Clone)]
-pub struct CacheControl {
-    #[serde(rename = "type")]
-    pub cache_type: CacheControlType,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct Message {
-    pub role: Role,
-    pub content: Vec<RequestContent>,
-}
-
-#[derive(Debug, Serialize, Deserialize, Eq, PartialEq, Hash)]
-#[serde(rename_all = "lowercase")]
-pub enum Role {
-    User,
-    Assistant,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(tag = "type")]
-pub enum RequestContent {
-    #[serde(rename = "text")]
-    Text {
-        text: String,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        cache_control: Option<CacheControl>,
-    },
-    #[serde(rename = "thinking")]
-    Thinking {
-        thinking: String,
-        signature: String,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        cache_control: Option<CacheControl>,
-    },
-    #[serde(rename = "redacted_thinking")]
-    RedactedThinking { data: String },
-    #[serde(rename = "image")]
-    Image {
-        source: ImageSource,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        cache_control: Option<CacheControl>,
-    },
-    #[serde(rename = "tool_use")]
-    ToolUse {
-        id: String,
-        name: String,
-        input: serde_json::Value,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        cache_control: Option<CacheControl>,
-    },
-    #[serde(rename = "tool_result")]
-    ToolResult {
-        tool_use_id: String,
-        is_error: bool,
-        content: ToolResultContent,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        cache_control: Option<CacheControl>,
-    },
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(untagged)]
-pub enum ToolResultContent {
-    Plain(String),
-    Multipart(Vec<ToolResultPart>),
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(tag = "type", rename_all = "lowercase")]
-pub enum ToolResultPart {
-    Text { text: String },
-    Image { source: ImageSource },
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(tag = "type")]
-pub enum ResponseContent {
-    #[serde(rename = "text")]
-    Text { text: String },
-    #[serde(rename = "thinking")]
-    Thinking { thinking: String },
-    #[serde(rename = "redacted_thinking")]
-    RedactedThinking { data: String },
-    #[serde(rename = "tool_use")]
-    ToolUse {
-        id: String,
-        name: String,
-        input: serde_json::Value,
-    },
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct ImageSource {
-    #[serde(rename = "type")]
-    pub source_type: String,
-    pub media_type: String,
-    pub data: String,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct Tool {
-    pub name: String,
-    pub description: String,
-    pub input_schema: serde_json::Value,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(tag = "type", rename_all = "lowercase")]
-pub enum ToolChoice {
-    Auto,
-    Any,
-    Tool { name: String },
-    None,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(tag = "type", rename_all = "lowercase")]
-pub enum Thinking {
-    Enabled { budget_tokens: Option<u32> },
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(untagged)]
-pub enum StringOrContents {
-    String(String),
-    Content(Vec<RequestContent>),
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct Request {
-    pub model: String,
-    pub max_tokens: u64,
-    pub messages: Vec<Message>,
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub tools: Vec<Tool>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub thinking: Option<Thinking>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub tool_choice: Option<ToolChoice>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub system: Option<StringOrContents>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub metadata: Option<Metadata>,
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub stop_sequences: Vec<String>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub temperature: Option<f32>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub top_k: Option<u32>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub top_p: Option<f32>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-struct StreamingRequest {
-    #[serde(flatten)]
-    pub base: Request,
-    pub stream: bool,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct Metadata {
-    pub user_id: Option<String>,
-}
-
-#[derive(Debug, Serialize, Deserialize, Default)]
-pub struct Usage {
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub input_tokens: Option<u64>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub output_tokens: Option<u64>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub cache_creation_input_tokens: Option<u64>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub cache_read_input_tokens: Option<u64>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct Response {
-    pub id: String,
-    #[serde(rename = "type")]
-    pub response_type: String,
-    pub role: Role,
-    pub content: Vec<ResponseContent>,
-    pub model: String,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub stop_reason: Option<String>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub stop_sequence: Option<String>,
-    pub usage: Usage,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(tag = "type")]
-pub enum Event {
-    #[serde(rename = "message_start")]
-    MessageStart { message: Response },
-    #[serde(rename = "content_block_start")]
-    ContentBlockStart {
-        index: usize,
-        content_block: ResponseContent,
-    },
-    #[serde(rename = "content_block_delta")]
-    ContentBlockDelta { index: usize, delta: ContentDelta },
-    #[serde(rename = "content_block_stop")]
-    ContentBlockStop { index: usize },
-    #[serde(rename = "message_delta")]
-    MessageDelta { delta: MessageDelta, usage: Usage },
-    #[serde(rename = "message_stop")]
-    MessageStop,
-    #[serde(rename = "ping")]
-    Ping,
-    #[serde(rename = "error")]
-    Error { error: ApiError },
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(tag = "type")]
-pub enum ContentDelta {
-    #[serde(rename = "text_delta")]
-    TextDelta { text: String },
-    #[serde(rename = "thinking_delta")]
-    ThinkingDelta { thinking: String },
-    #[serde(rename = "signature_delta")]
-    SignatureDelta { signature: String },
-    #[serde(rename = "input_json_delta")]
-    InputJsonDelta { partial_json: String },
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct MessageDelta {
-    pub stop_reason: Option<String>,
-    pub stop_sequence: Option<String>,
-}
-
-#[derive(Debug)]
-pub enum AnthropicError {
-    /// Failed to serialize the HTTP request body to JSON
-    SerializeRequest(serde_json::Error),
-
-    /// Failed to construct the HTTP request body
-    BuildRequestBody(http::Error),
-
-    /// Failed to send the HTTP request
-    HttpSend(anyhow::Error),
-
-    /// Failed to deserialize the response from JSON
-    DeserializeResponse(serde_json::Error),
-
-    /// Failed to read from response stream
-    ReadResponse(io::Error),
-
-    /// HTTP error response from the API
-    HttpResponseError {
-        status_code: StatusCode,
-        message: String,
-    },
-
-    /// Rate limit exceeded
-    RateLimit { retry_after: Duration },
-
-    /// Server overloaded
-    ServerOverloaded { retry_after: Option<Duration> },
-
-    /// API returned an error response
-    ApiError(ApiError),
-}
-
-#[derive(Debug, Serialize, Deserialize, Error)]
-#[error("Anthropic API Error: {error_type}: {message}")]
-pub struct ApiError {
-    #[serde(rename = "type")]
-    pub error_type: String,
-    pub message: String,
-}
-
-/// An Anthropic API error code.
-/// <https://docs.anthropic.com/en/api/errors#http-errors>
-#[derive(Debug, PartialEq, Eq, Clone, Copy, EnumString)]
-#[strum(serialize_all = "snake_case")]
-pub enum ApiErrorCode {
-    /// 400 - `invalid_request_error`: There was an issue with the format or content of your request.
-    InvalidRequestError,
-    /// 401 - `authentication_error`: There's an issue with your API key.
-    AuthenticationError,
-    /// 403 - `permission_error`: Your API key does not have permission to use the specified resource.
-    PermissionError,
-    /// 404 - `not_found_error`: The requested resource was not found.
-    NotFoundError,
-    /// 413 - `request_too_large`: Request exceeds the maximum allowed number of bytes.
-    RequestTooLarge,
-    /// 429 - `rate_limit_error`: Your account has hit a rate limit.
-    RateLimitError,
-    /// 500 - `api_error`: An unexpected error has occurred internal to Anthropic's systems.
-    ApiError,
-    /// 529 - `overloaded_error`: Anthropic's API is temporarily overloaded.
-    OverloadedError,
-}
-
-impl ApiError {
-    pub fn code(&self) -> Option<ApiErrorCode> {
-        ApiErrorCode::from_str(&self.error_type).ok()
-    }
-
-    pub fn is_rate_limit_error(&self) -> bool {
-        matches!(self.error_type.as_str(), "rate_limit_error")
-    }
-
-    pub fn match_window_exceeded(&self) -> Option<u64> {
-        let Some(ApiErrorCode::InvalidRequestError) = self.code() else {
-            return None;
-        };
-
-        parse_prompt_too_long(&self.message)
-    }
-}
-
-pub fn parse_prompt_too_long(message: &str) -> Option<u64> {
-    message
-        .strip_prefix("prompt is too long: ")?
-        .split_once(" tokens")?
-        .0
-        .parse()
-        .ok()
-}
-
-#[test]
-fn test_match_window_exceeded() {
-    let error = ApiError {
-        error_type: "invalid_request_error".to_string(),
-        message: "prompt is too long: 220000 tokens > 200000".to_string(),
-    };
-    assert_eq!(error.match_window_exceeded(), Some(220_000));
-
-    let error = ApiError {
-        error_type: "invalid_request_error".to_string(),
-        message: "prompt is too long: 1234953 tokens".to_string(),
-    };
-    assert_eq!(error.match_window_exceeded(), Some(1234953));
-
-    let error = ApiError {
-        error_type: "invalid_request_error".to_string(),
-        message: "not a prompt length error".to_string(),
-    };
-    assert_eq!(error.match_window_exceeded(), None);
-
-    let error = ApiError {
-        error_type: "rate_limit_error".to_string(),
-        message: "prompt is too long: 12345 tokens".to_string(),
-    };
-    assert_eq!(error.match_window_exceeded(), None);
-
-    let error = ApiError {
-        error_type: "invalid_request_error".to_string(),
-        message: "prompt is too long: invalid tokens".to_string(),
-    };
-    assert_eq!(error.match_window_exceeded(), None);
-}
diff --git a/crates/anthropic/src/batches.rs b/crates/anthropic/src/batches.rs
deleted file mode 100644
index 5fb594348d..0000000000
--- a/crates/anthropic/src/batches.rs
+++ /dev/null
@@ -1,190 +0,0 @@
-use anyhow::Result;
-use futures::AsyncReadExt;
-use http_client::{AsyncBody, HttpClient, Method, Request as HttpRequest};
-use serde::{Deserialize, Serialize};
-
-use crate::{AnthropicError, ApiError, RateLimitInfo, Request, Response};
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct BatchRequest {
-    pub custom_id: String,
-    pub params: Request,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct CreateBatchRequest {
-    pub requests: Vec<BatchRequest>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct MessageBatchRequestCounts {
-    pub processing: u64,
-    pub succeeded: u64,
-    pub errored: u64,
-    pub canceled: u64,
-    pub expired: u64,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct MessageBatch {
-    pub id: String,
-    #[serde(rename = "type")]
-    pub batch_type: String,
-    pub processing_status: String,
-    pub request_counts: MessageBatchRequestCounts,
-    pub ended_at: Option<String>,
-    pub created_at: String,
-    pub expires_at: String,
-    pub archived_at: Option<String>,
-    pub cancel_initiated_at: Option<String>,
-    pub results_url: Option<String>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(tag = "type")]
-pub enum BatchResult {
-    #[serde(rename = "succeeded")]
-    Succeeded { message: Response },
-    #[serde(rename = "errored")]
-    Errored { error: ApiError },
-    #[serde(rename = "canceled")]
-    Canceled,
-    #[serde(rename = "expired")]
-    Expired,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct BatchIndividualResponse {
-    pub custom_id: String,
-    pub result: BatchResult,
-}
-
-pub async fn create_batch(
-    client: &dyn HttpClient,
-    api_url: &str,
-    api_key: &str,
-    request: CreateBatchRequest,
-) -> Result<MessageBatch, AnthropicError> {
-    let uri = format!("{api_url}/v1/messages/batches");
-
-    let request_builder = HttpRequest::builder()
-        .method(Method::POST)
-        .uri(uri)
-        .header("Anthropic-Version", "2023-06-01")
-        .header("X-Api-Key", api_key.trim())
-        .header("Content-Type", "application/json");
-
-    let serialized_request =
-        serde_json::to_string(&request).map_err(AnthropicError::SerializeRequest)?;
-    let http_request = request_builder
-        .body(AsyncBody::from(serialized_request))
-        .map_err(AnthropicError::BuildRequestBody)?;
-
-    let mut response = client
-        .send(http_request)
-        .await
-        .map_err(AnthropicError::HttpSend)?;
-
-    let rate_limits = RateLimitInfo::from_headers(response.headers());
-
-    if response.status().is_success() {
-        let mut body = String::new();
-        response
-            .body_mut()
-            .read_to_string(&mut body)
-            .await
-            .map_err(AnthropicError::ReadResponse)?;
-
-        serde_json::from_str(&body).map_err(AnthropicError::DeserializeResponse)
-    } else {
-        Err(crate::handle_error_response(response, rate_limits).await)
-    }
-}
-
-pub async fn retrieve_batch(
-    client: &dyn HttpClient,
-    api_url: &str,
-    api_key: &str,
-    message_batch_id: &str,
-) -> Result<MessageBatch, AnthropicError> {
-    let uri = format!("{api_url}/v1/messages/batches/{message_batch_id}");
-
-    let request_builder = HttpRequest::builder()
-        .method(Method::GET)
-        .uri(uri)
-        .header("Anthropic-Version", "2023-06-01")
-        .header("X-Api-Key", api_key.trim());
-
-    let http_request = request_builder
-        .body(AsyncBody::default())
-        .map_err(AnthropicError::BuildRequestBody)?;
-
-    let mut response = client
-        .send(http_request)
-        .await
-        .map_err(AnthropicError::HttpSend)?;
-
-    let rate_limits = RateLimitInfo::from_headers(response.headers());
-
-    if response.status().is_success() {
-        let mut body = String::new();
-        response
-            .body_mut()
-            .read_to_string(&mut body)
-            .await
-            .map_err(AnthropicError::ReadResponse)?;
-
-        serde_json::from_str(&body).map_err(AnthropicError::DeserializeResponse)
-    } else {
-        Err(crate::handle_error_response(response, rate_limits).await)
-    }
-}
-
-pub async fn retrieve_batch_results(
-    client: &dyn HttpClient,
-    api_url: &str,
-    api_key: &str,
-    message_batch_id: &str,
-) -> Result<Vec<BatchIndividualResponse>, AnthropicError> {
-    let uri = format!("{api_url}/v1/messages/batches/{message_batch_id}/results");
-
-    let request_builder = HttpRequest::builder()
-        .method(Method::GET)
-        .uri(uri)
-        .header("Anthropic-Version", "2023-06-01")
-        .header("X-Api-Key", api_key.trim());
-
-    let http_request = request_builder
-        .body(AsyncBody::default())
-        .map_err(AnthropicError::BuildRequestBody)?;
-
-    let mut response = client
-        .send(http_request)
-        .await
-        .map_err(AnthropicError::HttpSend)?;
-
-    let rate_limits = RateLimitInfo::from_headers(response.headers());
-
-    if response.status().is_success() {
-        let mut body = String::new();
-        response
-            .body_mut()
-            .read_to_string(&mut body)
-            .await
-            .map_err(AnthropicError::ReadResponse)?;
-
-        let mut results = Vec::new();
-        for line in body.lines() {
-            if line.trim().is_empty() {
-                continue;
-            }
-            let result: BatchIndividualResponse =
-                serde_json::from_str(line).map_err(AnthropicError::DeserializeResponse)?;
-            results.push(result);
-        }
-
-        Ok(results)
-    } else {
-        Err(crate::handle_error_response(response, rate_limits).await)
-    }
-}
diff --git a/crates/askpass/Cargo.toml b/crates/askpass/Cargo.toml
deleted file mode 100644
index 298d1a7369..0000000000
--- a/crates/askpass/Cargo.toml
+++ /dev/null
@@ -1,29 +0,0 @@
-[package]
-name = "askpass"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/askpass.rs"
-
-[dependencies]
-anyhow.workspace = true
-futures.workspace = true
-gpui.workspace = true
-net.workspace = true
-smol.workspace = true
-log.workspace = true
-tempfile.workspace = true
-util.workspace = true
-zeroize.workspace = true
-
-[target.'cfg(target_os = "windows")'.dependencies]
-windows.workspace = true
-
-[package.metadata.cargo-machete]
-ignored = ["log"]
diff --git a/crates/askpass/LICENSE-GPL b/crates/askpass/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/askpass/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/askpass/src/askpass.rs b/crates/askpass/src/askpass.rs
deleted file mode 100644
index ab4474aa62..0000000000
--- a/crates/askpass/src/askpass.rs
+++ /dev/null
@@ -1,385 +0,0 @@
-mod encrypted_password;
-
-pub use encrypted_password::{EncryptedPassword, IKnowWhatIAmDoingAndIHaveReadTheDocs};
-
-use net::async_net::UnixListener;
-use smol::lock::Mutex;
-use util::fs::make_file_executable;
-
-use std::ffi::OsStr;
-use std::ops::ControlFlow;
-use std::sync::Arc;
-use std::sync::OnceLock;
-use std::time::Duration;
-
-use anyhow::{Context as _, Result};
-use futures::channel::{mpsc, oneshot};
-use futures::{
-    AsyncBufReadExt as _, AsyncWriteExt as _, FutureExt as _, SinkExt, StreamExt, io::BufReader,
-    select_biased,
-};
-use gpui::{AsyncApp, BackgroundExecutor, Task};
-use smol::fs;
-use util::{ResultExt as _, debug_panic, maybe, paths::PathExt, shell::ShellKind};
-
-/// Path to the program used for askpass
-///
-/// On Unix and remote servers, this defaults to the current executable
-/// On Windows, this is set to the CLI variant of zed
-static ASKPASS_PROGRAM: OnceLock<std::path::PathBuf> = OnceLock::new();
-
-#[derive(PartialEq, Eq)]
-pub enum AskPassResult {
-    CancelledByUser,
-    Timedout,
-}
-
-pub struct AskPassDelegate {
-    tx: mpsc::UnboundedSender<(String, oneshot::Sender<EncryptedPassword>)>,
-    executor: BackgroundExecutor,
-    _task: Task<()>,
-}
-
-impl AskPassDelegate {
-    pub fn new(
-        cx: &mut AsyncApp,
-        password_prompt: impl Fn(String, oneshot::Sender<EncryptedPassword>, &mut AsyncApp)
-        + Send
-        + Sync
-        + 'static,
-    ) -> Self {
-        let (tx, mut rx) = mpsc::unbounded::<(String, oneshot::Sender<_>)>();
-        let task = cx.spawn(async move |cx: &mut AsyncApp| {
-            while let Some((prompt, channel)) = rx.next().await {
-                password_prompt(prompt, channel, cx);
-            }
-        });
-        Self {
-            tx,
-            _task: task,
-            executor: cx.background_executor().clone(),
-        }
-    }
-
-    pub fn ask_password(&mut self, prompt: String) -> Task<Option<EncryptedPassword>> {
-        let mut this_tx = self.tx.clone();
-        self.executor.spawn(async move {
-            let (tx, rx) = oneshot::channel();
-            this_tx.send((prompt, tx)).await.ok()?;
-            rx.await.ok()
-        })
-    }
-}
-
-pub struct AskPassSession {
-    #[cfg(target_os = "windows")]
-    secret: std::sync::Arc<OnceLock<EncryptedPassword>>,
-    askpass_task: PasswordProxy,
-    askpass_opened_rx: Option<oneshot::Receiver<()>>,
-    askpass_kill_master_rx: Option<oneshot::Receiver<()>>,
-}
-
-#[cfg(not(target_os = "windows"))]
-const ASKPASS_SCRIPT_NAME: &str = "askpass.sh";
-#[cfg(target_os = "windows")]
-const ASKPASS_SCRIPT_NAME: &str = "askpass.ps1";
-
-impl AskPassSession {
-    /// This will create a new AskPassSession.
-    /// You must retain this session until the master process exits.
-    #[must_use]
-    pub async fn new(executor: &BackgroundExecutor, mut delegate: AskPassDelegate) -> Result<Self> {
-        #[cfg(target_os = "windows")]
-        let secret = std::sync::Arc::new(OnceLock::new());
-        let (askpass_opened_tx, askpass_opened_rx) = oneshot::channel::<()>();
-
-        let askpass_opened_tx = Arc::new(Mutex::new(Some(askpass_opened_tx)));
-
-        let (askpass_kill_master_tx, askpass_kill_master_rx) = oneshot::channel::<()>();
-        let kill_tx = Arc::new(Mutex::new(Some(askpass_kill_master_tx)));
-
-        #[cfg(target_os = "windows")]
-        let askpass_secret = secret.clone();
-        let get_password = {
-            let executor = executor.clone();
-
-            move |prompt| {
-                let prompt = delegate.ask_password(prompt);
-                let kill_tx = kill_tx.clone();
-                let askpass_opened_tx = askpass_opened_tx.clone();
-                #[cfg(target_os = "windows")]
-                let askpass_secret = askpass_secret.clone();
-                executor.spawn(async move {
-                    if let Some(askpass_opened_tx) = askpass_opened_tx.lock().await.take() {
-                        askpass_opened_tx.send(()).ok();
-                    }
-                    if let Some(password) = prompt.await {
-                        #[cfg(target_os = "windows")]
-                        {
-                            _ = askpass_secret.set(password.clone());
-                        }
-                        ControlFlow::Continue(Ok(password))
-                    } else {
-                        if let Some(kill_tx) = kill_tx.lock().await.take() {
-                            kill_tx.send(()).log_err();
-                        }
-                        ControlFlow::Break(())
-                    }
-                })
-            }
-        };
-        let askpass_task = PasswordProxy::new(get_password, executor.clone()).await?;
-
-        Ok(Self {
-            #[cfg(target_os = "windows")]
-            secret,
-
-            askpass_task,
-            askpass_kill_master_rx: Some(askpass_kill_master_rx),
-            askpass_opened_rx: Some(askpass_opened_rx),
-        })
-    }
-
-    // This will run the askpass task forever, resolving as many authentication requests as needed.
-    // The caller is responsible for examining the result of their own commands and cancelling this
-    // future when this is no longer needed. Note that this can only be called once, but due to the
-    // drop order this takes an &mut, so you can `drop()` it after you're done with the master process.
-    pub async fn run(&mut self) -> AskPassResult {
-        // This is the default timeout setting used by VSCode.
-        let connection_timeout = Duration::from_secs(17);
-        let askpass_opened_rx = self.askpass_opened_rx.take().expect("Only call run once");
-        let askpass_kill_master_rx = self
-            .askpass_kill_master_rx
-            .take()
-            .expect("Only call run once");
-
-        select_biased! {
-            _ = askpass_opened_rx.fuse() => {
-                // Note: this await can only resolve after we are dropped.
-                askpass_kill_master_rx.await.ok();
-                AskPassResult::CancelledByUser
-            }
-
-            _ = futures::FutureExt::fuse(smol::Timer::after(connection_timeout)) => {
-                AskPassResult::Timedout
-            }
-        }
-    }
-
-    /// This will return the password that was last set by the askpass script.
-    #[cfg(target_os = "windows")]
-    pub fn get_password(&self) -> Option<EncryptedPassword> {
-        self.secret.get().cloned()
-    }
-
-    pub fn script_path(&self) -> impl AsRef<OsStr> {
-        self.askpass_task.script_path()
-    }
-}
-
-pub struct PasswordProxy {
-    _task: Task<()>,
-    #[cfg(not(target_os = "windows"))]
-    askpass_script_path: std::path::PathBuf,
-    #[cfg(target_os = "windows")]
-    askpass_helper: String,
-}
-
-impl PasswordProxy {
-    pub async fn new(
-        mut get_password: impl FnMut(String) -> Task<ControlFlow<(), Result<EncryptedPassword>>>
-        + 'static
-        + Send
-        + Sync,
-        executor: BackgroundExecutor,
-    ) -> Result<Self> {
-        let temp_dir = tempfile::Builder::new().prefix("zed-askpass").tempdir()?;
-        let askpass_socket = temp_dir.path().join("askpass.sock");
-        let askpass_script_path = temp_dir.path().join(ASKPASS_SCRIPT_NAME);
-        let current_exec =
-            std::env::current_exe().context("Failed to determine current zed executable path.")?;
-
-        // TODO: inferred from the use of powershell.exe in askpass_helper_script
-        let shell_kind = if cfg!(windows) {
-            ShellKind::PowerShell
-        } else {
-            ShellKind::Posix
-        };
-        let askpass_program = ASKPASS_PROGRAM.get_or_init(|| current_exec);
-        // Create an askpass script that communicates back to this process.
-        let askpass_script = generate_askpass_script(shell_kind, askpass_program, &askpass_socket)?;
-        let _task = executor.spawn(async move {
-            maybe!(async move {
-                let listener =
-                    UnixListener::bind(&askpass_socket).context("creating askpass socket")?;
-
-                while let Ok((mut stream, _)) = listener.accept().await {
-                    let mut buffer = Vec::new();
-                    let mut reader = BufReader::new(&mut stream);
-                    if reader.read_until(b'\0', &mut buffer).await.is_err() {
-                        buffer.clear();
-                    }
-                    let prompt = String::from_utf8_lossy(&buffer).into_owned();
-                    let password = get_password(prompt).await;
-                    match password {
-                        ControlFlow::Continue(password) => {
-                            if let Ok(password) = password
-                                && let Ok(decrypted) =
-                                    password.decrypt(IKnowWhatIAmDoingAndIHaveReadTheDocs)
-                            {
-                                stream.write_all(decrypted.as_bytes()).await.log_err();
-                            }
-                        }
-                        ControlFlow::Break(()) => {
-                            // note: we expect the caller to drop this task when it's done.
-                            // We need to keep the stream open until the caller is done to avoid
-                            // spurious errors from ssh.
-                            std::future::pending::<()>().await;
-                            drop(stream);
-                        }
-                    }
-                }
-                drop(temp_dir);
-                Result::<_, anyhow::Error>::Ok(())
-            })
-            .await
-            .log_err();
-        });
-
-        fs::write(&askpass_script_path, askpass_script)
-            .await
-            .with_context(|| format!("creating askpass script at {askpass_script_path:?}"))?;
-        make_file_executable(&askpass_script_path)
-            .await
-            .with_context(|| {
-                format!("marking askpass script executable at {askpass_script_path:?}")
-            })?;
-        // todo(shell): There might be no powershell on the system
-        #[cfg(target_os = "windows")]
-        let askpass_helper = format!(
-            "powershell.exe -ExecutionPolicy Bypass -File \"{}\"",
-            askpass_script_path.display()
-        );
-
-        Ok(Self {
-            _task,
-            #[cfg(not(target_os = "windows"))]
-            askpass_script_path,
-            #[cfg(target_os = "windows")]
-            askpass_helper,
-        })
-    }
-
-    pub fn script_path(&self) -> impl AsRef<OsStr> {
-        #[cfg(not(target_os = "windows"))]
-        {
-            &self.askpass_script_path
-        }
-        #[cfg(target_os = "windows")]
-        {
-            &self.askpass_helper
-        }
-    }
-}
-/// The main function for when Zed is running in netcat mode for use in askpass.
-/// Called from both the remote server binary and the zed binary in their respective main functions.
-pub fn main(socket: &str) {
-    use net::UnixStream;
-    use std::io::{self, Read, Write};
-    use std::process::exit;
-
-    let mut stream = match UnixStream::connect(socket) {
-        Ok(stream) => stream,
-        Err(err) => {
-            eprintln!("Error connecting to socket {}: {}", socket, err);
-            exit(1);
-        }
-    };
-
-    let mut buffer = Vec::new();
-    if let Err(err) = io::stdin().read_to_end(&mut buffer) {
-        eprintln!("Error reading from stdin: {}", err);
-        exit(1);
-    }
-
-    #[cfg(target_os = "windows")]
-    while buffer.last().is_some_and(|&b| b == b'\n' || b == b'\r') {
-        buffer.pop();
-    }
-    if buffer.last() != Some(&b'\0') {
-        buffer.push(b'\0');
-    }
-
-    if let Err(err) = stream.write_all(&buffer) {
-        eprintln!("Error writing to socket: {}", err);
-        exit(1);
-    }
-
-    let mut response = Vec::new();
-    if let Err(err) = stream.read_to_end(&mut response) {
-        eprintln!("Error reading from socket: {}", err);
-        exit(1);
-    }
-
-    if let Err(err) = io::stdout().write_all(&response) {
-        eprintln!("Error writing to stdout: {}", err);
-        exit(1);
-    }
-}
-
-pub fn set_askpass_program(path: std::path::PathBuf) {
-    if ASKPASS_PROGRAM.set(path).is_err() {
-        debug_panic!("askpass program has already been set");
-    }
-}
-
-#[inline]
-#[cfg(not(target_os = "windows"))]
-fn generate_askpass_script(
-    shell_kind: ShellKind,
-    askpass_program: &std::path::Path,
-    askpass_socket: &std::path::Path,
-) -> Result<String> {
-    let askpass_program = shell_kind.prepend_command_prefix(
-        askpass_program
-            .to_str()
-            .context("Askpass program is on a non-utf8 path")?,
-    );
-    let askpass_program = shell_kind
-        .try_quote_prefix_aware(&askpass_program)
-        .context("Failed to shell-escape Askpass program path")?;
-    let askpass_socket = askpass_socket
-        .try_shell_safe(shell_kind)
-        .context("Failed to shell-escape Askpass socket path")?;
-    let print_args = "printf '%s\\0' \"$@\"";
-    let shebang = "#!/bin/sh";
-    Ok(format!(
-        "{shebang}\n{print_args} | {askpass_program} --askpass={askpass_socket} 2> /dev/null \n",
-    ))
-}
-
-#[inline]
-#[cfg(target_os = "windows")]
-fn generate_askpass_script(
-    shell_kind: ShellKind,
-    askpass_program: &std::path::Path,
-    askpass_socket: &std::path::Path,
-) -> Result<String> {
-    let askpass_program = shell_kind.prepend_command_prefix(
-        askpass_program
-            .to_str()
-            .context("Askpass program is on a non-utf8 path")?,
-    );
-    let askpass_program = shell_kind
-        .try_quote_prefix_aware(&askpass_program)
-        .context("Failed to shell-escape Askpass program path")?;
-    let askpass_socket = askpass_socket
-        .try_shell_safe(shell_kind)
-        .context("Failed to shell-escape Askpass socket path")?;
-    Ok(format!(
-        r#"
-        $ErrorActionPreference = 'Stop';
-        ($args -join [char]0) | {askpass_program} --askpass={askpass_socket} 2> $null
-        "#,
-    ))
-}
diff --git a/crates/askpass/src/encrypted_password.rs b/crates/askpass/src/encrypted_password.rs
deleted file mode 100644
index b5d54c18a1..0000000000
--- a/crates/askpass/src/encrypted_password.rs
+++ /dev/null
@@ -1,102 +0,0 @@
-//! This module provides [EncryptedPassword] for storage of passwords in memory.
-//! On Windows that's implemented with CryptProtectMemory/CryptUnprotectMemory; on other platforms it just falls through
-//! to string for now.
-//!
-//! The "safety" of this module lies in exploiting visibility rules of Rust:
-//! 1. No outside module has access to the internal representation of [EncryptedPassword].
-//! 2. [EncryptedPassword] cannot be converted into a [String] or any other plaintext representation.
-//! All use cases that do need such functionality (of which we have two right now) are implemented within this module.
-//!
-//! Note that this is not bulletproof.
-//! 1. [ProcessExt] is implemented for [smol::process::Command], which is a builder for smol processes.
-//! Before the process itself is spawned the contents of [EncryptedPassword] are unencrypted in env var storage of said builder.
-//! 2. We're also sending plaintext passwords over RPC with [proto::AskPassResponse]. Go figure how great that is.
-//!
-//! Still, the goal of this module is to not have passwords laying around nilly-willy in memory.
-//! We do not claim that it is fool-proof.
-use anyhow::Result;
-use zeroize::Zeroize;
-
-type LengthWithoutPadding = u32;
-#[derive(Clone)]
-pub struct EncryptedPassword(Vec<u8>, LengthWithoutPadding);
-
-impl Drop for EncryptedPassword {
-    fn drop(&mut self) {
-        self.0.zeroize();
-        self.1.zeroize();
-    }
-}
-
-impl TryFrom<&str> for EncryptedPassword {
-    type Error = anyhow::Error;
-    fn try_from(password: &str) -> Result<EncryptedPassword> {
-        let len: u32 = password.len().try_into()?;
-        #[cfg(windows)]
-        {
-            use windows::Win32::Security::Cryptography::{
-                CRYPTPROTECTMEMORY_BLOCK_SIZE, CRYPTPROTECTMEMORY_SAME_PROCESS, CryptProtectMemory,
-            };
-            let mut value = password.bytes().collect::<Vec<_>>();
-            let padded_length = len.next_multiple_of(CRYPTPROTECTMEMORY_BLOCK_SIZE);
-            if padded_length != len {
-                value.resize(padded_length as usize, 0);
-            }
-            if len != 0 {
-                unsafe {
-                    CryptProtectMemory(
-                        value.as_mut_ptr() as _,
-                        padded_length,
-                        CRYPTPROTECTMEMORY_SAME_PROCESS,
-                    )?;
-                }
-            }
-            Ok(Self(value, len))
-        }
-        #[cfg(not(windows))]
-        Ok(Self(String::from(password).into(), len))
-    }
-}
-
-/// Read the docs for [EncryptedPassword]; please take care of not storing the plaintext string in memory for extended
-/// periods of time.
-pub struct IKnowWhatIAmDoingAndIHaveReadTheDocs;
-
-impl EncryptedPassword {
-    pub fn decrypt(mut self, _: IKnowWhatIAmDoingAndIHaveReadTheDocs) -> Result<String> {
-        #[cfg(windows)]
-        {
-            use anyhow::Context;
-            use windows::Win32::Security::Cryptography::{
-                CRYPTPROTECTMEMORY_BLOCK_SIZE, CRYPTPROTECTMEMORY_SAME_PROCESS,
-                CryptUnprotectMemory,
-            };
-            assert_eq!(
-                self.0.len() % CRYPTPROTECTMEMORY_BLOCK_SIZE as usize,
-                0,
-                "Violated pre-condition (buffer size <{}> must be a multiple of CRYPTPROTECTMEMORY_BLOCK_SIZE <{}>) for CryptUnprotectMemory.",
-                self.0.len(),
-                CRYPTPROTECTMEMORY_BLOCK_SIZE
-            );
-            if self.1 != 0 {
-                unsafe {
-                    CryptUnprotectMemory(
-                        self.0.as_mut_ptr() as _,
-                        self.0.len().try_into()?,
-                        CRYPTPROTECTMEMORY_SAME_PROCESS,
-                    )
-                    .context("while decrypting a SSH password")?
-                };
-
-                {
-                    // Remove padding
-                    _ = self.0.drain(self.1 as usize..);
-                }
-            }
-
-            Ok(String::from_utf8(std::mem::take(&mut self.0))?)
-        }
-        #[cfg(not(windows))]
-        Ok(String::from_utf8(std::mem::take(&mut self.0))?)
-    }
-}
diff --git a/crates/assets/Cargo.toml b/crates/assets/Cargo.toml
deleted file mode 100644
index a56cd109f1..0000000000
--- a/crates/assets/Cargo.toml
+++ /dev/null
@@ -1,17 +0,0 @@
-[package]
-name = "assets"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lib]
-path = "src/assets.rs"
-
-[lints]
-workspace = true
-
-[dependencies]
-anyhow.workspace = true
-gpui.workspace = true
-rust-embed.workspace = true
diff --git a/crates/assets/LICENSE-GPL b/crates/assets/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/assets/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/assets/src/assets.rs b/crates/assets/src/assets.rs
deleted file mode 100644
index 5c7e671159..0000000000
--- a/crates/assets/src/assets.rs
+++ /dev/null
@@ -1,65 +0,0 @@
-// This crate was essentially pulled out verbatim from main `zed` crate to avoid having to run RustEmbed macro whenever zed has to be rebuilt. It saves a second or two on an incremental build.
-
-use anyhow::Context as _;
-use gpui::{App, AssetSource, Result, SharedString};
-use rust_embed::RustEmbed;
-
-#[derive(RustEmbed)]
-#[folder = "../../assets"]
-#[include = "fonts/**/*"]
-#[include = "icons/**/*"]
-#[include = "images/**/*"]
-#[include = "themes/**/*"]
-#[exclude = "themes/src/*"]
-#[include = "sounds/**/*"]
-#[include = "prompts/**/*"]
-#[include = "*.md"]
-#[exclude = "*.DS_Store"]
-pub struct Assets;
-
-impl AssetSource for Assets {
-    fn load(&self, path: &str) -> Result<Option<std::borrow::Cow<'static, [u8]>>> {
-        Self::get(path)
-            .map(|f| Some(f.data))
-            .with_context(|| format!("loading asset at path {path:?}"))
-    }
-
-    fn list(&self, path: &str) -> Result<Vec<SharedString>> {
-        Ok(Self::iter()
-            .filter_map(|p| {
-                if p.starts_with(path) {
-                    Some(p.into())
-                } else {
-                    None
-                }
-            })
-            .collect())
-    }
-}
-
-impl Assets {
-    /// Populate the [`TextSystem`] of the given [`AppContext`] with all `.ttf` fonts in the `fonts` directory.
-    pub fn load_fonts(&self, cx: &App) -> anyhow::Result<()> {
-        let font_paths = self.list("fonts")?;
-        let mut embedded_fonts = Vec::new();
-        for font_path in font_paths {
-            if font_path.ends_with(".ttf") {
-                let font_bytes = cx
-                    .asset_source()
-                    .load(&font_path)?
-                    .expect("Assets should never return None");
-                embedded_fonts.push(font_bytes);
-            }
-        }
-
-        cx.text_system().add_fonts(embedded_fonts)
-    }
-
-    pub fn load_test_fonts(&self, cx: &App) {
-        cx.text_system()
-            .add_fonts(vec![
-                self.load("fonts/lilex/Lilex-Regular.ttf").unwrap().unwrap(),
-            ])
-            .unwrap()
-    }
-}
diff --git a/crates/assistant_slash_command/Cargo.toml b/crates/assistant_slash_command/Cargo.toml
deleted file mode 100644
index 1fc3e8448c..0000000000
--- a/crates/assistant_slash_command/Cargo.toml
+++ /dev/null
@@ -1,34 +0,0 @@
-[package]
-name = "assistant_slash_command"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/assistant_slash_command.rs"
-
-[dependencies]
-anyhow.workspace = true
-async-trait.workspace = true
-collections.workspace = true
-derive_more.workspace = true
-extension.workspace = true
-futures.workspace = true
-gpui.workspace = true
-language.workspace = true
-language_model.workspace = true
-parking_lot.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-ui.workspace = true
-util.workspace = true
-workspace.workspace = true
-
-[dev-dependencies]
-gpui = { workspace = true, features = ["test-support"] }
-pretty_assertions.workspace = true
-workspace = { workspace = true, features = ["test-support"] }
diff --git a/crates/assistant_slash_command/LICENSE-GPL b/crates/assistant_slash_command/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/assistant_slash_command/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/assistant_slash_command/src/assistant_slash_command.rs b/crates/assistant_slash_command/src/assistant_slash_command.rs
deleted file mode 100644
index 2e6bb7325e..0000000000
--- a/crates/assistant_slash_command/src/assistant_slash_command.rs
+++ /dev/null
@@ -1,573 +0,0 @@
-mod extension_slash_command;
-mod slash_command_registry;
-mod slash_command_working_set;
-
-pub use crate::extension_slash_command::*;
-pub use crate::slash_command_registry::*;
-pub use crate::slash_command_working_set::*;
-use anyhow::Result;
-use futures::StreamExt;
-use futures::stream::{self, BoxStream};
-use gpui::{App, SharedString, Task, WeakEntity, Window};
-use language::CodeLabelBuilder;
-use language::HighlightId;
-use language::{BufferSnapshot, CodeLabel, LspAdapterDelegate, OffsetRangeExt};
-pub use language_model::Role;
-use serde::{Deserialize, Serialize};
-use std::{
-    ops::Range,
-    sync::{Arc, atomic::AtomicBool},
-};
-use ui::ActiveTheme;
-use workspace::{Workspace, ui::IconName};
-
-pub fn init(cx: &mut App) {
-    SlashCommandRegistry::default_global(cx);
-    extension_slash_command::init(cx);
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum AfterCompletion {
-    /// Run the command
-    Run,
-    /// Continue composing the current argument, doesn't add a space
-    Compose,
-    /// Continue the command composition, adds a space
-    Continue,
-}
-
-impl From<bool> for AfterCompletion {
-    fn from(value: bool) -> Self {
-        if value {
-            AfterCompletion::Run
-        } else {
-            AfterCompletion::Continue
-        }
-    }
-}
-
-impl AfterCompletion {
-    pub fn run(&self) -> bool {
-        match self {
-            AfterCompletion::Run => true,
-            AfterCompletion::Compose | AfterCompletion::Continue => false,
-        }
-    }
-}
-
-#[derive(Debug)]
-pub struct ArgumentCompletion {
-    /// The label to display for this completion.
-    pub label: CodeLabel,
-    /// The new text that should be inserted into the command when this completion is accepted.
-    pub new_text: String,
-    /// Whether the command should be run when accepting this completion.
-    pub after_completion: AfterCompletion,
-    /// Whether to replace the all arguments, or whether to treat this as an independent argument.
-    pub replace_previous_arguments: bool,
-}
-
-pub type SlashCommandResult = Result<BoxStream<'static, Result<SlashCommandEvent>>>;
-
-pub trait SlashCommand: 'static + Send + Sync {
-    fn name(&self) -> String;
-    fn icon(&self) -> IconName {
-        IconName::Slash
-    }
-    fn label(&self, _cx: &App) -> CodeLabel {
-        CodeLabel::plain(self.name(), None)
-    }
-    fn description(&self) -> String;
-    fn menu_text(&self) -> String;
-    fn complete_argument(
-        self: Arc<Self>,
-        arguments: &[String],
-        cancel: Arc<AtomicBool>,
-        workspace: Option<WeakEntity<Workspace>>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<Vec<ArgumentCompletion>>>;
-    fn requires_argument(&self) -> bool;
-    fn accepts_arguments(&self) -> bool {
-        self.requires_argument()
-    }
-    fn run(
-        self: Arc<Self>,
-        arguments: &[String],
-        context_slash_command_output_sections: &[SlashCommandOutputSection<language::Anchor>],
-        context_buffer: BufferSnapshot,
-        workspace: WeakEntity<Workspace>,
-        // TODO: We're just using the `LspAdapterDelegate` here because that is
-        // what the extension API is already expecting.
-        //
-        // It may be that `LspAdapterDelegate` needs a more general name, or
-        // perhaps another kind of delegate is needed here.
-        delegate: Option<Arc<dyn LspAdapterDelegate>>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<SlashCommandResult>;
-}
-
-#[derive(Debug, PartialEq)]
-pub enum SlashCommandContent {
-    Text {
-        text: String,
-        run_commands_in_text: bool,
-    },
-}
-
-impl<'a> From<&'a str> for SlashCommandContent {
-    fn from(text: &'a str) -> Self {
-        Self::Text {
-            text: text.into(),
-            run_commands_in_text: false,
-        }
-    }
-}
-
-#[derive(Debug, PartialEq)]
-pub enum SlashCommandEvent {
-    StartMessage {
-        role: Role,
-        merge_same_roles: bool,
-    },
-    StartSection {
-        icon: IconName,
-        label: SharedString,
-        metadata: Option<serde_json::Value>,
-    },
-    Content(SlashCommandContent),
-    EndSection,
-}
-
-#[derive(Debug, Default, PartialEq, Clone)]
-pub struct SlashCommandOutput {
-    pub text: String,
-    pub sections: Vec<SlashCommandOutputSection<usize>>,
-    pub run_commands_in_text: bool,
-}
-
-impl SlashCommandOutput {
-    pub fn ensure_valid_section_ranges(&mut self) {
-        for section in &mut self.sections {
-            section.range.start = section.range.start.min(self.text.len());
-            section.range.end = section.range.end.min(self.text.len());
-            while !self.text.is_char_boundary(section.range.start) {
-                section.range.start -= 1;
-            }
-            while !self.text.is_char_boundary(section.range.end) {
-                section.range.end += 1;
-            }
-        }
-    }
-
-    /// Returns this [`SlashCommandOutput`] as a stream of [`SlashCommandEvent`]s.
-    pub fn into_event_stream(mut self) -> BoxStream<'static, Result<SlashCommandEvent>> {
-        self.ensure_valid_section_ranges();
-
-        let mut events = Vec::new();
-
-        let mut section_endpoints = Vec::new();
-        for section in self.sections {
-            section_endpoints.push((
-                section.range.start,
-                SlashCommandEvent::StartSection {
-                    icon: section.icon,
-                    label: section.label,
-                    metadata: section.metadata,
-                },
-            ));
-            section_endpoints.push((section.range.end, SlashCommandEvent::EndSection));
-        }
-        section_endpoints.sort_by_key(|(offset, _)| *offset);
-
-        let mut content_offset = 0;
-        for (endpoint_offset, endpoint) in section_endpoints {
-            if content_offset < endpoint_offset {
-                events.push(Ok(SlashCommandEvent::Content(SlashCommandContent::Text {
-                    text: self.text[content_offset..endpoint_offset].to_string(),
-                    run_commands_in_text: self.run_commands_in_text,
-                })));
-                content_offset = endpoint_offset;
-            }
-
-            events.push(Ok(endpoint));
-        }
-
-        if content_offset < self.text.len() {
-            events.push(Ok(SlashCommandEvent::Content(SlashCommandContent::Text {
-                text: self.text[content_offset..].to_string(),
-                run_commands_in_text: self.run_commands_in_text,
-            })));
-        }
-
-        stream::iter(events).boxed()
-    }
-
-    pub async fn from_event_stream(
-        mut events: BoxStream<'static, Result<SlashCommandEvent>>,
-    ) -> Result<SlashCommandOutput> {
-        let mut output = SlashCommandOutput::default();
-        let mut section_stack = Vec::new();
-
-        while let Some(event) = events.next().await {
-            match event? {
-                SlashCommandEvent::StartSection {
-                    icon,
-                    label,
-                    metadata,
-                } => {
-                    let start = output.text.len();
-                    section_stack.push(SlashCommandOutputSection {
-                        range: start..start,
-                        icon,
-                        label,
-                        metadata,
-                    });
-                }
-                SlashCommandEvent::Content(SlashCommandContent::Text {
-                    text,
-                    run_commands_in_text,
-                }) => {
-                    output.text.push_str(&text);
-                    output.run_commands_in_text = run_commands_in_text;
-
-                    if let Some(section) = section_stack.last_mut() {
-                        section.range.end = output.text.len();
-                    }
-                }
-                SlashCommandEvent::EndSection => {
-                    if let Some(section) = section_stack.pop() {
-                        output.sections.push(section);
-                    }
-                }
-                SlashCommandEvent::StartMessage { .. } => {}
-            }
-        }
-
-        while let Some(section) = section_stack.pop() {
-            output.sections.push(section);
-        }
-
-        Ok(output)
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct SlashCommandOutputSection<T> {
-    pub range: Range<T>,
-    pub icon: IconName,
-    pub label: SharedString,
-    pub metadata: Option<serde_json::Value>,
-}
-
-impl SlashCommandOutputSection<language::Anchor> {
-    pub fn is_valid(&self, buffer: &language::TextBuffer) -> bool {
-        self.range.start.is_valid(buffer) && !self.range.to_offset(buffer).is_empty()
-    }
-}
-
-pub struct SlashCommandLine {
-    /// The range within the line containing the command name.
-    pub name: Range<usize>,
-    /// Ranges within the line containing the command arguments.
-    pub arguments: Vec<Range<usize>>,
-}
-
-impl SlashCommandLine {
-    pub fn parse(line: &str) -> Option<Self> {
-        let mut call: Option<Self> = None;
-        let mut ix = 0;
-        for c in line.chars() {
-            let next_ix = ix + c.len_utf8();
-            if let Some(call) = &mut call {
-                // The command arguments start at the first non-whitespace character
-                // after the command name, and continue until the end of the line.
-                if let Some(argument) = call.arguments.last_mut() {
-                    if c.is_whitespace() {
-                        if (*argument).is_empty() {
-                            argument.start = next_ix;
-                            argument.end = next_ix;
-                        } else {
-                            argument.end = ix;
-                            call.arguments.push(next_ix..next_ix);
-                        }
-                    } else {
-                        argument.end = next_ix;
-                    }
-                }
-                // The command name ends at the first whitespace character.
-                else if !call.name.is_empty() {
-                    if c.is_whitespace() {
-                        call.arguments = vec![next_ix..next_ix];
-                    } else {
-                        call.name.end = next_ix;
-                    }
-                }
-                // The command name must begin with a letter.
-                else if c.is_alphabetic() {
-                    call.name.end = next_ix;
-                } else {
-                    return None;
-                }
-            }
-            // Commands start with a slash.
-            else if c == '/' {
-                call = Some(SlashCommandLine {
-                    name: next_ix..next_ix,
-                    arguments: Vec::new(),
-                });
-            }
-            // The line can't contain anything before the slash except for whitespace.
-            else if !c.is_whitespace() {
-                return None;
-            }
-            ix = next_ix;
-        }
-        call
-    }
-}
-
-pub fn create_label_for_command(command_name: &str, arguments: &[&str], cx: &App) -> CodeLabel {
-    let mut label = CodeLabelBuilder::default();
-    label.push_str(command_name, None);
-    label.respan_filter_range(None);
-    label.push_str(" ", None);
-    label.push_str(
-        &arguments.join(" "),
-        cx.theme().syntax().highlight_id("comment").map(HighlightId),
-    );
-    label.build()
-}
-
-#[cfg(test)]
-mod tests {
-    use pretty_assertions::assert_eq;
-    use serde_json::json;
-
-    use super::*;
-
-    #[gpui::test]
-    async fn test_slash_command_output_to_events_round_trip() {
-        // Test basic output consisting of a single section.
-        {
-            let text = "Hello, world!".to_string();
-            let range = 0..text.len();
-            let output = SlashCommandOutput {
-                text,
-                sections: vec![SlashCommandOutputSection {
-                    range,
-                    icon: IconName::Code,
-                    label: "Section 1".into(),
-                    metadata: None,
-                }],
-                run_commands_in_text: false,
-            };
-
-            let events = output.clone().into_event_stream().collect::<Vec<_>>().await;
-            let events = events
-                .into_iter()
-                .filter_map(|event| event.ok())
-                .collect::<Vec<_>>();
-
-            assert_eq!(
-                events,
-                vec![
-                    SlashCommandEvent::StartSection {
-                        icon: IconName::Code,
-                        label: "Section 1".into(),
-                        metadata: None
-                    },
-                    SlashCommandEvent::Content(SlashCommandContent::Text {
-                        text: "Hello, world!".into(),
-                        run_commands_in_text: false
-                    }),
-                    SlashCommandEvent::EndSection
-                ]
-            );
-
-            let new_output =
-                SlashCommandOutput::from_event_stream(output.clone().into_event_stream())
-                    .await
-                    .unwrap();
-
-            assert_eq!(new_output, output);
-        }
-
-        // Test output where the sections do not comprise all of the text.
-        {
-            let text = "Apple\nCucumber\nBanana\n".to_string();
-            let output = SlashCommandOutput {
-                text,
-                sections: vec![
-                    SlashCommandOutputSection {
-                        range: 0..6,
-                        icon: IconName::Check,
-                        label: "Fruit".into(),
-                        metadata: None,
-                    },
-                    SlashCommandOutputSection {
-                        range: 15..22,
-                        icon: IconName::Check,
-                        label: "Fruit".into(),
-                        metadata: None,
-                    },
-                ],
-                run_commands_in_text: false,
-            };
-
-            let events = output.clone().into_event_stream().collect::<Vec<_>>().await;
-            let events = events
-                .into_iter()
-                .filter_map(|event| event.ok())
-                .collect::<Vec<_>>();
-
-            assert_eq!(
-                events,
-                vec![
-                    SlashCommandEvent::StartSection {
-                        icon: IconName::Check,
-                        label: "Fruit".into(),
-                        metadata: None
-                    },
-                    SlashCommandEvent::Content(SlashCommandContent::Text {
-                        text: "Apple\n".into(),
-                        run_commands_in_text: false
-                    }),
-                    SlashCommandEvent::EndSection,
-                    SlashCommandEvent::Content(SlashCommandContent::Text {
-                        text: "Cucumber\n".into(),
-                        run_commands_in_text: false
-                    }),
-                    SlashCommandEvent::StartSection {
-                        icon: IconName::Check,
-                        label: "Fruit".into(),
-                        metadata: None
-                    },
-                    SlashCommandEvent::Content(SlashCommandContent::Text {
-                        text: "Banana\n".into(),
-                        run_commands_in_text: false
-                    }),
-                    SlashCommandEvent::EndSection
-                ]
-            );
-
-            let new_output =
-                SlashCommandOutput::from_event_stream(output.clone().into_event_stream())
-                    .await
-                    .unwrap();
-
-            assert_eq!(new_output, output);
-        }
-
-        // Test output consisting of multiple sections.
-        {
-            let text = "Line 1\nLine 2\nLine 3\nLine 4\n".to_string();
-            let output = SlashCommandOutput {
-                text,
-                sections: vec![
-                    SlashCommandOutputSection {
-                        range: 0..6,
-                        icon: IconName::FileCode,
-                        label: "Section 1".into(),
-                        metadata: Some(json!({ "a": true })),
-                    },
-                    SlashCommandOutputSection {
-                        range: 7..13,
-                        icon: IconName::FileDoc,
-                        label: "Section 2".into(),
-                        metadata: Some(json!({ "b": true })),
-                    },
-                    SlashCommandOutputSection {
-                        range: 14..20,
-                        icon: IconName::FileGit,
-                        label: "Section 3".into(),
-                        metadata: Some(json!({ "c": true })),
-                    },
-                    SlashCommandOutputSection {
-                        range: 21..27,
-                        icon: IconName::FileToml,
-                        label: "Section 4".into(),
-                        metadata: Some(json!({ "d": true })),
-                    },
-                ],
-                run_commands_in_text: false,
-            };
-
-            let events = output.clone().into_event_stream().collect::<Vec<_>>().await;
-            let events = events
-                .into_iter()
-                .filter_map(|event| event.ok())
-                .collect::<Vec<_>>();
-
-            assert_eq!(
-                events,
-                vec![
-                    SlashCommandEvent::StartSection {
-                        icon: IconName::FileCode,
-                        label: "Section 1".into(),
-                        metadata: Some(json!({ "a": true }))
-                    },
-                    SlashCommandEvent::Content(SlashCommandContent::Text {
-                        text: "Line 1".into(),
-                        run_commands_in_text: false
-                    }),
-                    SlashCommandEvent::EndSection,
-                    SlashCommandEvent::Content(SlashCommandContent::Text {
-                        text: "\n".into(),
-                        run_commands_in_text: false
-                    }),
-                    SlashCommandEvent::StartSection {
-                        icon: IconName::FileDoc,
-                        label: "Section 2".into(),
-                        metadata: Some(json!({ "b": true }))
-                    },
-                    SlashCommandEvent::Content(SlashCommandContent::Text {
-                        text: "Line 2".into(),
-                        run_commands_in_text: false
-                    }),
-                    SlashCommandEvent::EndSection,
-                    SlashCommandEvent::Content(SlashCommandContent::Text {
-                        text: "\n".into(),
-                        run_commands_in_text: false
-                    }),
-                    SlashCommandEvent::StartSection {
-                        icon: IconName::FileGit,
-                        label: "Section 3".into(),
-                        metadata: Some(json!({ "c": true }))
-                    },
-                    SlashCommandEvent::Content(SlashCommandContent::Text {
-                        text: "Line 3".into(),
-                        run_commands_in_text: false
-                    }),
-                    SlashCommandEvent::EndSection,
-                    SlashCommandEvent::Content(SlashCommandContent::Text {
-                        text: "\n".into(),
-                        run_commands_in_text: false
-                    }),
-                    SlashCommandEvent::StartSection {
-                        icon: IconName::FileToml,
-                        label: "Section 4".into(),
-                        metadata: Some(json!({ "d": true }))
-                    },
-                    SlashCommandEvent::Content(SlashCommandContent::Text {
-                        text: "Line 4".into(),
-                        run_commands_in_text: false
-                    }),
-                    SlashCommandEvent::EndSection,
-                    SlashCommandEvent::Content(SlashCommandContent::Text {
-                        text: "\n".into(),
-                        run_commands_in_text: false
-                    }),
-                ]
-            );
-
-            let new_output =
-                SlashCommandOutput::from_event_stream(output.clone().into_event_stream())
-                    .await
-                    .unwrap();
-
-            assert_eq!(new_output, output);
-        }
-    }
-}
diff --git a/crates/assistant_slash_command/src/extension_slash_command.rs b/crates/assistant_slash_command/src/extension_slash_command.rs
deleted file mode 100644
index 6dd2c05f19..0000000000
--- a/crates/assistant_slash_command/src/extension_slash_command.rs
+++ /dev/null
@@ -1,171 +0,0 @@
-use anyhow::Result;
-use async_trait::async_trait;
-use extension::{Extension, ExtensionHostProxy, ExtensionSlashCommandProxy, WorktreeDelegate};
-use gpui::{App, Task, WeakEntity, Window};
-use language::{BufferSnapshot, LspAdapterDelegate};
-use std::sync::{Arc, atomic::AtomicBool};
-use ui::prelude::*;
-use util::rel_path::RelPath;
-use workspace::Workspace;
-
-use crate::{
-    ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
-    SlashCommandRegistry, SlashCommandResult,
-};
-
-pub fn init(cx: &mut App) {
-    let proxy = ExtensionHostProxy::default_global(cx);
-    proxy.register_slash_command_proxy(SlashCommandRegistryProxy {
-        slash_command_registry: SlashCommandRegistry::global(cx),
-    });
-}
-
-struct SlashCommandRegistryProxy {
-    slash_command_registry: Arc<SlashCommandRegistry>,
-}
-
-impl ExtensionSlashCommandProxy for SlashCommandRegistryProxy {
-    fn register_slash_command(
-        &self,
-        extension: Arc<dyn Extension>,
-        command: extension::SlashCommand,
-    ) {
-        self.slash_command_registry
-            .register_command(ExtensionSlashCommand::new(extension, command), false)
-    }
-
-    fn unregister_slash_command(&self, command_name: Arc<str>) {
-        self.slash_command_registry
-            .unregister_command_by_name(&command_name)
-    }
-}
-
-/// An adapter that allows an [`LspAdapterDelegate`] to be used as a [`WorktreeDelegate`].
-struct WorktreeDelegateAdapter(Arc<dyn LspAdapterDelegate>);
-
-#[async_trait]
-impl WorktreeDelegate for WorktreeDelegateAdapter {
-    fn id(&self) -> u64 {
-        self.0.worktree_id().to_proto()
-    }
-
-    fn root_path(&self) -> String {
-        self.0.worktree_root_path().to_string_lossy().into_owned()
-    }
-
-    async fn read_text_file(&self, path: &RelPath) -> Result<String> {
-        self.0.read_text_file(path).await
-    }
-
-    async fn which(&self, binary_name: String) -> Option<String> {
-        self.0
-            .which(binary_name.as_ref())
-            .await
-            .map(|path| path.to_string_lossy().into_owned())
-    }
-
-    async fn shell_env(&self) -> Vec<(String, String)> {
-        self.0.shell_env().await.into_iter().collect()
-    }
-}
-
-pub struct ExtensionSlashCommand {
-    extension: Arc<dyn Extension>,
-    command: extension::SlashCommand,
-}
-
-impl ExtensionSlashCommand {
-    pub fn new(extension: Arc<dyn Extension>, command: extension::SlashCommand) -> Self {
-        Self { extension, command }
-    }
-}
-
-impl SlashCommand for ExtensionSlashCommand {
-    fn name(&self) -> String {
-        self.command.name.clone()
-    }
-
-    fn description(&self) -> String {
-        self.command.description.clone()
-    }
-
-    fn menu_text(&self) -> String {
-        self.command.tooltip_text.clone()
-    }
-
-    fn requires_argument(&self) -> bool {
-        self.command.requires_argument
-    }
-
-    fn complete_argument(
-        self: Arc<Self>,
-        arguments: &[String],
-        _cancel: Arc<AtomicBool>,
-        _workspace: Option<WeakEntity<Workspace>>,
-        _window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<Vec<ArgumentCompletion>>> {
-        let command = self.command.clone();
-        let arguments = arguments.to_owned();
-        cx.background_spawn(async move {
-            let completions = self
-                .extension
-                .complete_slash_command_argument(command, arguments)
-                .await?;
-
-            anyhow::Ok(
-                completions
-                    .into_iter()
-                    .map(|completion| ArgumentCompletion {
-                        label: completion.label.into(),
-                        new_text: completion.new_text,
-                        replace_previous_arguments: false,
-                        after_completion: completion.run_command.into(),
-                    })
-                    .collect(),
-            )
-        })
-    }
-
-    fn run(
-        self: Arc<Self>,
-        arguments: &[String],
-        _context_slash_command_output_sections: &[SlashCommandOutputSection<language::Anchor>],
-        _context_buffer: BufferSnapshot,
-        _workspace: WeakEntity<Workspace>,
-        delegate: Option<Arc<dyn LspAdapterDelegate>>,
-        _window: &mut Window,
-        cx: &mut App,
-    ) -> Task<SlashCommandResult> {
-        let command = self.command.clone();
-        let arguments = arguments.to_owned();
-        let output = cx.background_spawn(async move {
-            let delegate =
-                delegate.map(|delegate| Arc::new(WorktreeDelegateAdapter(delegate.clone())) as _);
-            let output = self
-                .extension
-                .run_slash_command(command, arguments, delegate)
-                .await?;
-
-            anyhow::Ok(output)
-        });
-        cx.foreground_executor().spawn(async move {
-            let output = output.await?;
-            Ok(SlashCommandOutput {
-                text: output.text,
-                sections: output
-                    .sections
-                    .into_iter()
-                    .map(|section| SlashCommandOutputSection {
-                        range: section.range,
-                        icon: IconName::Code,
-                        label: section.label.into(),
-                        metadata: None,
-                    })
-                    .collect(),
-                run_commands_in_text: false,
-            }
-            .into_event_stream())
-        })
-    }
-}
diff --git a/crates/assistant_slash_command/src/slash_command_registry.rs b/crates/assistant_slash_command/src/slash_command_registry.rs
deleted file mode 100644
index 258869840b..0000000000
--- a/crates/assistant_slash_command/src/slash_command_registry.rs
+++ /dev/null
@@ -1,90 +0,0 @@
-use std::sync::Arc;
-
-use collections::{BTreeSet, HashMap};
-use derive_more::{Deref, DerefMut};
-use gpui::Global;
-use gpui::{App, ReadGlobal};
-use parking_lot::RwLock;
-
-use crate::SlashCommand;
-
-#[derive(Default, Deref, DerefMut)]
-struct GlobalSlashCommandRegistry(Arc<SlashCommandRegistry>);
-
-impl Global for GlobalSlashCommandRegistry {}
-
-#[derive(Default)]
-struct SlashCommandRegistryState {
-    commands: HashMap<Arc<str>, Arc<dyn SlashCommand>>,
-    featured_commands: BTreeSet<Arc<str>>,
-}
-
-#[derive(Default)]
-pub struct SlashCommandRegistry {
-    state: RwLock<SlashCommandRegistryState>,
-}
-
-impl SlashCommandRegistry {
-    /// Returns the global [`SlashCommandRegistry`].
-    pub fn global(cx: &App) -> Arc<Self> {
-        GlobalSlashCommandRegistry::global(cx).0.clone()
-    }
-
-    /// Returns the global [`SlashCommandRegistry`].
-    ///
-    /// Inserts a default [`SlashCommandRegistry`] if one does not yet exist.
-    pub fn default_global(cx: &mut App) -> Arc<Self> {
-        cx.default_global::<GlobalSlashCommandRegistry>().0.clone()
-    }
-
-    pub fn new() -> Arc<Self> {
-        Arc::new(Self {
-            state: RwLock::new(SlashCommandRegistryState {
-                commands: HashMap::default(),
-                featured_commands: BTreeSet::default(),
-            }),
-        })
-    }
-
-    /// Registers the provided [`SlashCommand`].
-    pub fn register_command(&self, command: impl SlashCommand, is_featured: bool) {
-        let mut state = self.state.write();
-        let command_name: Arc<str> = command.name().into();
-        if is_featured {
-            state.featured_commands.insert(command_name.clone());
-        }
-        state.commands.insert(command_name, Arc::new(command));
-    }
-
-    /// Unregisters the provided [`SlashCommand`].
-    pub fn unregister_command(&self, command: impl SlashCommand) {
-        self.unregister_command_by_name(command.name().as_str())
-    }
-
-    /// Unregisters the command with the given name.
-    pub fn unregister_command_by_name(&self, command_name: &str) {
-        let mut state = self.state.write();
-        state.featured_commands.remove(command_name);
-        state.commands.remove(command_name);
-    }
-
-    /// Returns the names of registered [`SlashCommand`]s.
-    pub fn command_names(&self) -> Vec<Arc<str>> {
-        self.state.read().commands.keys().cloned().collect()
-    }
-
-    /// Returns the names of registered, featured [`SlashCommand`]s.
-    pub fn featured_command_names(&self) -> Vec<Arc<str>> {
-        self.state
-            .read()
-            .featured_commands
-            .iter()
-            .cloned()
-            .collect()
-    }
-
-    /// Returns the [`SlashCommand`] with the given name.
-    pub fn command(&self, name: &str) -> Option<Arc<dyn SlashCommand>> {
-        self.state.read().commands.get(name).cloned()
-    }
-}
diff --git a/crates/assistant_slash_command/src/slash_command_working_set.rs b/crates/assistant_slash_command/src/slash_command_working_set.rs
deleted file mode 100644
index b920e1d217..0000000000
--- a/crates/assistant_slash_command/src/slash_command_working_set.rs
+++ /dev/null
@@ -1,81 +0,0 @@
-use std::sync::Arc;
-
-use collections::HashMap;
-use gpui::App;
-use parking_lot::Mutex;
-
-use crate::{SlashCommand, SlashCommandRegistry};
-
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, Default)]
-pub struct SlashCommandId(usize);
-
-/// A working set of slash commands for use in one instance of the Assistant Panel.
-#[derive(Default)]
-pub struct SlashCommandWorkingSet {
-    state: Mutex<WorkingSetState>,
-}
-
-#[derive(Default)]
-struct WorkingSetState {
-    context_server_commands_by_id: HashMap<SlashCommandId, Arc<dyn SlashCommand>>,
-    context_server_commands_by_name: HashMap<Arc<str>, Arc<dyn SlashCommand>>,
-    next_command_id: SlashCommandId,
-}
-
-impl SlashCommandWorkingSet {
-    pub fn command(&self, name: &str, cx: &App) -> Option<Arc<dyn SlashCommand>> {
-        self.state
-            .lock()
-            .context_server_commands_by_name
-            .get(name)
-            .cloned()
-            .or_else(|| SlashCommandRegistry::global(cx).command(name))
-    }
-
-    pub fn command_names(&self, cx: &App) -> Vec<Arc<str>> {
-        let mut command_names = SlashCommandRegistry::global(cx).command_names();
-        command_names.extend(
-            self.state
-                .lock()
-                .context_server_commands_by_name
-                .keys()
-                .cloned(),
-        );
-
-        command_names
-    }
-
-    pub fn featured_command_names(&self, cx: &App) -> Vec<Arc<str>> {
-        SlashCommandRegistry::global(cx).featured_command_names()
-    }
-
-    pub fn insert(&self, command: Arc<dyn SlashCommand>) -> SlashCommandId {
-        let mut state = self.state.lock();
-        let command_id = state.next_command_id;
-        state.next_command_id.0 += 1;
-        state
-            .context_server_commands_by_id
-            .insert(command_id, command.clone());
-        state.slash_commands_changed();
-        command_id
-    }
-
-    pub fn remove(&self, command_ids_to_remove: &[SlashCommandId]) {
-        let mut state = self.state.lock();
-        state
-            .context_server_commands_by_id
-            .retain(|id, _| !command_ids_to_remove.contains(id));
-        state.slash_commands_changed();
-    }
-}
-
-impl WorkingSetState {
-    fn slash_commands_changed(&mut self) {
-        self.context_server_commands_by_name.clear();
-        self.context_server_commands_by_name.extend(
-            self.context_server_commands_by_id
-                .values()
-                .map(|command| (command.name().into(), command.clone())),
-        );
-    }
-}
diff --git a/crates/assistant_slash_commands/Cargo.toml b/crates/assistant_slash_commands/Cargo.toml
deleted file mode 100644
index 85dd92501f..0000000000
--- a/crates/assistant_slash_commands/Cargo.toml
+++ /dev/null
@@ -1,48 +0,0 @@
-[package]
-name = "assistant_slash_commands"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/assistant_slash_commands.rs"
-
-[dependencies]
-anyhow.workspace = true
-assistant_slash_command.workspace = true
-chrono.workspace = true
-collections.workspace = true
-context_server.workspace = true
-editor.workspace = true
-feature_flags.workspace = true
-fs.workspace = true
-futures.workspace = true
-fuzzy.workspace = true
-globset.workspace = true
-gpui.workspace = true
-html_to_markdown.workspace = true
-http_client.workspace = true
-language.workspace = true
-project.workspace = true
-prompt_store.workspace = true
-rope.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-smol.workspace = true
-text.workspace = true
-ui.workspace = true
-util.workspace = true
-workspace.workspace = true
-worktree.workspace = true
-
-[dev-dependencies]
-fs = { workspace = true, features = ["test-support"] }
-gpui = { workspace = true, features = ["test-support"] }
-pretty_assertions.workspace = true
-project = { workspace = true, features = ["test-support"] }
-settings = { workspace = true, features = ["test-support"] }
-zlog.workspace = true
diff --git a/crates/assistant_slash_commands/LICENSE-GPL b/crates/assistant_slash_commands/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/assistant_slash_commands/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/assistant_slash_commands/src/assistant_slash_commands.rs b/crates/assistant_slash_commands/src/assistant_slash_commands.rs
deleted file mode 100644
index 2bf2573e99..0000000000
--- a/crates/assistant_slash_commands/src/assistant_slash_commands.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-mod context_server_command;
-mod default_command;
-mod delta_command;
-mod diagnostics_command;
-mod fetch_command;
-mod file_command;
-mod now_command;
-mod prompt_command;
-mod selection_command;
-mod streaming_example_command;
-mod symbols_command;
-mod tab_command;
-
-pub use crate::context_server_command::*;
-pub use crate::default_command::*;
-pub use crate::delta_command::*;
-pub use crate::diagnostics_command::*;
-pub use crate::fetch_command::*;
-pub use crate::file_command::*;
-pub use crate::now_command::*;
-pub use crate::prompt_command::*;
-pub use crate::selection_command::*;
-pub use crate::streaming_example_command::*;
-pub use crate::symbols_command::*;
-pub use crate::tab_command::*;
-
-use assistant_slash_command::create_label_for_command;
diff --git a/crates/assistant_slash_commands/src/cargo_workspace_command.rs b/crates/assistant_slash_commands/src/cargo_workspace_command.rs
deleted file mode 100644
index 8a6950a4a2..0000000000
--- a/crates/assistant_slash_commands/src/cargo_workspace_command.rs
+++ /dev/null
@@ -1,159 +0,0 @@
-use anyhow::{Context as _, Result, anyhow};
-use assistant_slash_command::{
-    ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
-    SlashCommandResult,
-};
-use fs::Fs;
-use gpui::{App, Entity, Task, WeakEntity};
-use language::{BufferSnapshot, LspAdapterDelegate};
-use project::{Project, ProjectPath};
-use std::{
-    fmt::Write,
-    path::Path,
-    sync::{Arc, atomic::AtomicBool},
-};
-use ui::prelude::*;
-use util::rel_path::RelPath;
-use workspace::Workspace;
-
-pub struct CargoWorkspaceSlashCommand;
-
-impl CargoWorkspaceSlashCommand {
-    async fn build_message(fs: Arc<dyn Fs>, path_to_cargo_toml: &Path) -> Result<String> {
-        let buffer = fs.load(path_to_cargo_toml).await?;
-        let cargo_toml: cargo_toml::Manifest = toml::from_str(&buffer)?;
-
-        let mut message = String::new();
-        writeln!(message, "You are in a Rust project.")?;
-
-        if let Some(workspace) = cargo_toml.workspace {
-            writeln!(
-                message,
-                "The project is a Cargo workspace with the following members:"
-            )?;
-            for member in workspace.members {
-                writeln!(message, "- {member}")?;
-            }
-
-            if !workspace.default_members.is_empty() {
-                writeln!(message, "The default members are:")?;
-                for member in workspace.default_members {
-                    writeln!(message, "- {member}")?;
-                }
-            }
-
-            if !workspace.dependencies.is_empty() {
-                writeln!(
-                    message,
-                    "The following workspace dependencies are installed:"
-                )?;
-                for dependency in workspace.dependencies.keys() {
-                    writeln!(message, "- {dependency}")?;
-                }
-            }
-        } else if let Some(package) = cargo_toml.package {
-            writeln!(
-                message,
-                "The project name is \"{name}\".",
-                name = package.name
-            )?;
-
-            let description = package
-                .description
-                .as_ref()
-                .and_then(|description| description.get().ok().cloned());
-            if let Some(description) = description.as_ref() {
-                writeln!(message, "It describes itself as \"{description}\".")?;
-            }
-
-            if !cargo_toml.dependencies.is_empty() {
-                writeln!(message, "The following dependencies are installed:")?;
-                for dependency in cargo_toml.dependencies.keys() {
-                    writeln!(message, "- {dependency}")?;
-                }
-            }
-        }
-
-        Ok(message)
-    }
-
-    fn path_to_cargo_toml(project: Entity<Project>, cx: &mut App) -> Option<Arc<Path>> {
-        let worktree = project.read(cx).worktrees(cx).next()?;
-        let worktree = worktree.read(cx);
-        let entry = worktree.entry_for_path(RelPath::new("Cargo.toml").unwrap())?;
-        let path = ProjectPath {
-            worktree_id: worktree.id(),
-            path: entry.path.clone(),
-        };
-        Some(Arc::from(
-            project.read(cx).absolute_path(&path, cx)?.as_path(),
-        ))
-    }
-}
-
-impl SlashCommand for CargoWorkspaceSlashCommand {
-    fn name(&self) -> String {
-        "cargo-workspace".into()
-    }
-
-    fn description(&self) -> String {
-        "insert project workspace metadata".into()
-    }
-
-    fn menu_text(&self) -> String {
-        "Insert Project Workspace Metadata".into()
-    }
-
-    fn complete_argument(
-        self: Arc<Self>,
-        _arguments: &[String],
-        _cancel: Arc<AtomicBool>,
-        _workspace: Option<WeakEntity<Workspace>>,
-        _window: &mut Window,
-        _cx: &mut App,
-    ) -> Task<Result<Vec<ArgumentCompletion>>> {
-        Task::ready(Err(anyhow!("this command does not require argument")))
-    }
-
-    fn requires_argument(&self) -> bool {
-        false
-    }
-
-    fn run(
-        self: Arc<Self>,
-        _arguments: &[String],
-        _context_slash_command_output_sections: &[SlashCommandOutputSection<language::Anchor>],
-        _context_buffer: BufferSnapshot,
-        workspace: WeakEntity<Workspace>,
-        _delegate: Option<Arc<dyn LspAdapterDelegate>>,
-        _window: &mut Window,
-        cx: &mut App,
-    ) -> Task<SlashCommandResult> {
-        let output = workspace.update(cx, |workspace, cx| {
-            let project = workspace.project().clone();
-            let fs = workspace.project().read(cx).fs().clone();
-            let path = Self::path_to_cargo_toml(project, cx);
-            let output = cx.background_spawn(async move {
-                let path = path.with_context(|| "Cargo.toml not found")?;
-                Self::build_message(fs, &path).await
-            });
-
-            cx.foreground_executor().spawn(async move {
-                let text = output.await?;
-                let range = 0..text.len();
-                Ok(SlashCommandOutput {
-                    text,
-                    sections: vec![SlashCommandOutputSection {
-                        range,
-                        icon: IconName::FileTree,
-                        label: "Project".into(),
-                        metadata: None,
-                    }],
-                    run_commands_in_text: false,
-                }
-                .into_event_stream())
-            })
-        });
-        output.unwrap_or_else(|error| Task::ready(Err(error)))
-    }
-}
diff --git a/crates/assistant_slash_commands/src/context_server_command.rs b/crates/assistant_slash_commands/src/context_server_command.rs
deleted file mode 100644
index ee0cbf54c2..0000000000
--- a/crates/assistant_slash_commands/src/context_server_command.rs
+++ /dev/null
@@ -1,251 +0,0 @@
-use anyhow::{Context as _, Result, anyhow};
-use assistant_slash_command::{
-    AfterCompletion, ArgumentCompletion, SlashCommand, SlashCommandOutput,
-    SlashCommandOutputSection, SlashCommandResult,
-};
-use collections::HashMap;
-use context_server::{ContextServerId, types::Prompt};
-use gpui::{App, Entity, Task, WeakEntity, Window};
-use language::{BufferSnapshot, CodeLabel, LspAdapterDelegate};
-use project::context_server_store::ContextServerStore;
-use std::sync::Arc;
-use std::sync::atomic::AtomicBool;
-use text::LineEnding;
-use ui::{IconName, SharedString};
-use workspace::Workspace;
-
-use crate::create_label_for_command;
-
-pub struct ContextServerSlashCommand {
-    store: Entity<ContextServerStore>,
-    server_id: ContextServerId,
-    prompt: Prompt,
-}
-
-impl ContextServerSlashCommand {
-    pub fn new(store: Entity<ContextServerStore>, id: ContextServerId, prompt: Prompt) -> Self {
-        Self {
-            server_id: id,
-            prompt,
-            store,
-        }
-    }
-}
-
-impl SlashCommand for ContextServerSlashCommand {
-    fn name(&self) -> String {
-        self.prompt.name.clone()
-    }
-
-    fn label(&self, cx: &App) -> language::CodeLabel {
-        let mut parts = vec![self.prompt.name.as_str()];
-        if let Some(args) = &self.prompt.arguments
-            && let Some(arg) = args.first()
-        {
-            parts.push(arg.name.as_str());
-        }
-        create_label_for_command(parts[0], &parts[1..], cx)
-    }
-
-    fn description(&self) -> String {
-        match &self.prompt.description {
-            Some(desc) => desc.clone(),
-            None => format!("Run '{}' from {}", self.prompt.name, self.server_id),
-        }
-    }
-
-    fn menu_text(&self) -> String {
-        match &self.prompt.description {
-            Some(desc) => desc.clone(),
-            None => format!("Run '{}' from {}", self.prompt.name, self.server_id),
-        }
-    }
-
-    fn requires_argument(&self) -> bool {
-        self.prompt
-            .arguments
-            .as_ref()
-            .is_some_and(|args| args.iter().any(|arg| arg.required == Some(true)))
-    }
-
-    fn complete_argument(
-        self: Arc<Self>,
-        arguments: &[String],
-        _cancel: Arc<AtomicBool>,
-        _workspace: Option<WeakEntity<Workspace>>,
-        _window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<Vec<ArgumentCompletion>>> {
-        let Ok((arg_name, arg_value)) = completion_argument(&self.prompt, arguments) else {
-            return Task::ready(Err(anyhow!("Failed to complete argument")));
-        };
-
-        let server_id = self.server_id.clone();
-        let prompt_name = self.prompt.name.clone();
-
-        if let Some(server) = self.store.read(cx).get_running_server(&server_id) {
-            cx.foreground_executor().spawn(async move {
-                let protocol = server.client().context("Context server not initialized")?;
-
-                let response = protocol
-                    .request::<context_server::types::requests::CompletionComplete>(
-                        context_server::types::CompletionCompleteParams {
-                            reference: context_server::types::CompletionReference::Prompt(
-                                context_server::types::PromptReference {
-                                    ty: context_server::types::PromptReferenceType::Prompt,
-                                    name: prompt_name,
-                                },
-                            ),
-                            argument: context_server::types::CompletionArgument {
-                                name: arg_name,
-                                value: arg_value,
-                            },
-                            meta: None,
-                        },
-                    )
-                    .await?;
-
-                let completions = response
-                    .completion
-                    .values
-                    .into_iter()
-                    .map(|value| ArgumentCompletion {
-                        label: CodeLabel::plain(value.clone(), None),
-                        new_text: value,
-                        after_completion: AfterCompletion::Continue,
-                        replace_previous_arguments: false,
-                    })
-                    .collect();
-                Ok(completions)
-            })
-        } else {
-            Task::ready(Err(anyhow!("Context server not found")))
-        }
-    }
-
-    fn run(
-        self: Arc<Self>,
-        arguments: &[String],
-        _context_slash_command_output_sections: &[SlashCommandOutputSection<language::Anchor>],
-        _context_buffer: BufferSnapshot,
-        _workspace: WeakEntity<Workspace>,
-        _delegate: Option<Arc<dyn LspAdapterDelegate>>,
-        _window: &mut Window,
-        cx: &mut App,
-    ) -> Task<SlashCommandResult> {
-        let server_id = self.server_id.clone();
-        let prompt_name = self.prompt.name.clone();
-
-        let prompt_args = match prompt_arguments(&self.prompt, arguments) {
-            Ok(args) => args,
-            Err(e) => return Task::ready(Err(e)),
-        };
-
-        let store = self.store.read(cx);
-        if let Some(server) = store.get_running_server(&server_id) {
-            cx.foreground_executor().spawn(async move {
-                let protocol = server.client().context("Context server not initialized")?;
-                let response = protocol
-                    .request::<context_server::types::requests::PromptsGet>(
-                        context_server::types::PromptsGetParams {
-                            name: prompt_name.clone(),
-                            arguments: Some(prompt_args),
-                            meta: None,
-                        },
-                    )
-                    .await?;
-
-                anyhow::ensure!(
-                    response
-                        .messages
-                        .iter()
-                        .all(|msg| matches!(msg.role, context_server::types::Role::User)),
-                    "Prompt contains non-user roles, which is not supported"
-                );
-
-                // Extract text from user messages into a single prompt string
-                let mut prompt = response
-                    .messages
-                    .into_iter()
-                    .filter_map(|msg| match msg.content {
-                        context_server::types::MessageContent::Text { text, .. } => Some(text),
-                        _ => None,
-                    })
-                    .collect::<Vec<String>>()
-                    .join("\n\n");
-
-                // We must normalize the line endings here, since servers might return CR characters.
-                LineEnding::normalize(&mut prompt);
-
-                Ok(SlashCommandOutput {
-                    sections: vec![SlashCommandOutputSection {
-                        range: 0..(prompt.len()),
-                        icon: IconName::ZedAssistant,
-                        label: SharedString::from(
-                            response
-                                .description
-                                .unwrap_or(format!("Result from {}", prompt_name)),
-                        ),
-                        metadata: None,
-                    }],
-                    text: prompt,
-                    run_commands_in_text: false,
-                }
-                .into_event_stream())
-            })
-        } else {
-            Task::ready(Err(anyhow!("Context server not found")))
-        }
-    }
-}
-
-fn completion_argument(prompt: &Prompt, arguments: &[String]) -> Result<(String, String)> {
-    anyhow::ensure!(!arguments.is_empty(), "No arguments given");
-
-    match &prompt.arguments {
-        Some(args) if args.len() == 1 => {
-            let arg_name = args[0].name.clone();
-            let arg_value = arguments.join(" ");
-            Ok((arg_name, arg_value))
-        }
-        Some(_) => anyhow::bail!("Prompt must have exactly one argument"),
-        None => anyhow::bail!("Prompt has no arguments"),
-    }
-}
-
-fn prompt_arguments(prompt: &Prompt, arguments: &[String]) -> Result<HashMap<String, String>> {
-    match &prompt.arguments {
-        Some(args) if args.len() > 1 => {
-            anyhow::bail!("Prompt has more than one argument, which is not supported");
-        }
-        Some(args) if args.len() == 1 => {
-            if !arguments.is_empty() {
-                let mut map = HashMap::default();
-                map.insert(args[0].name.clone(), arguments.join(" "));
-                Ok(map)
-            } else if arguments.is_empty() && args[0].required == Some(false) {
-                Ok(HashMap::default())
-            } else {
-                anyhow::bail!("Prompt expects argument but none given");
-            }
-        }
-        Some(_) | None => {
-            anyhow::ensure!(
-                arguments.is_empty(),
-                "Prompt expects no arguments but some were given"
-            );
-            Ok(HashMap::default())
-        }
-    }
-}
-
-/// MCP servers can return prompts with multiple arguments. Since we only
-/// support one argument, we ignore all others. This is the necessary predicate
-/// for this.
-pub fn acceptable_prompt(prompt: &Prompt) -> bool {
-    match &prompt.arguments {
-        None => true,
-        Some(args) if args.len() <= 1 => true,
-        _ => false,
-    }
-}
diff --git a/crates/assistant_slash_commands/src/default_command.rs b/crates/assistant_slash_commands/src/default_command.rs
deleted file mode 100644
index 01eff881cf..0000000000
--- a/crates/assistant_slash_commands/src/default_command.rs
+++ /dev/null
@@ -1,91 +0,0 @@
-use anyhow::{Result, anyhow};
-use assistant_slash_command::{
-    ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
-    SlashCommandResult,
-};
-use gpui::{Task, WeakEntity};
-use language::{BufferSnapshot, LspAdapterDelegate};
-use prompt_store::PromptStore;
-use std::{
-    fmt::Write,
-    sync::{Arc, atomic::AtomicBool},
-};
-use ui::prelude::*;
-use workspace::Workspace;
-
-pub struct DefaultSlashCommand;
-
-impl SlashCommand for DefaultSlashCommand {
-    fn name(&self) -> String {
-        "default".into()
-    }
-
-    fn description(&self) -> String {
-        "Insert default prompt".into()
-    }
-
-    fn menu_text(&self) -> String {
-        self.description()
-    }
-
-    fn requires_argument(&self) -> bool {
-        false
-    }
-
-    fn complete_argument(
-        self: Arc<Self>,
-        _arguments: &[String],
-        _cancellation_flag: Arc<AtomicBool>,
-        _workspace: Option<WeakEntity<Workspace>>,
-        _window: &mut Window,
-        _cx: &mut App,
-    ) -> Task<Result<Vec<ArgumentCompletion>>> {
-        Task::ready(Err(anyhow!("this command does not require argument")))
-    }
-
-    fn run(
-        self: Arc<Self>,
-        _arguments: &[String],
-        _context_slash_command_output_sections: &[SlashCommandOutputSection<language::Anchor>],
-        _context_buffer: BufferSnapshot,
-        _workspace: WeakEntity<Workspace>,
-        _delegate: Option<Arc<dyn LspAdapterDelegate>>,
-        _window: &mut Window,
-        cx: &mut App,
-    ) -> Task<SlashCommandResult> {
-        let store = PromptStore::global(cx);
-        cx.spawn(async move |cx| {
-            let store = store.await?;
-            let prompts = store.read_with(cx, |store, _cx| store.default_prompt_metadata())?;
-
-            let mut text = String::new();
-            text.push('\n');
-            for prompt in prompts {
-                if let Some(title) = prompt.title {
-                    writeln!(text, "/prompt {}", title).unwrap();
-                }
-            }
-            text.pop();
-
-            if text.is_empty() {
-                text.push('\n');
-            }
-
-            if !text.ends_with('\n') {
-                text.push('\n');
-            }
-
-            Ok(SlashCommandOutput {
-                sections: vec![SlashCommandOutputSection {
-                    range: 0..text.len(),
-                    icon: IconName::Library,
-                    label: "Default".into(),
-                    metadata: None,
-                }],
-                text,
-                run_commands_in_text: true,
-            }
-            .into_event_stream())
-        })
-    }
-}
diff --git a/crates/assistant_slash_commands/src/delta_command.rs b/crates/assistant_slash_commands/src/delta_command.rs
deleted file mode 100644
index ea05fca588..0000000000
--- a/crates/assistant_slash_commands/src/delta_command.rs
+++ /dev/null
@@ -1,124 +0,0 @@
-use crate::file_command::{FileCommandMetadata, FileSlashCommand};
-use anyhow::{Result, anyhow};
-use assistant_slash_command::{
-    ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
-    SlashCommandResult,
-};
-use collections::HashSet;
-use futures::future;
-use gpui::{App, Task, WeakEntity, Window};
-use language::{BufferSnapshot, LspAdapterDelegate};
-use std::sync::{Arc, atomic::AtomicBool};
-use text::OffsetRangeExt;
-use ui::prelude::*;
-use workspace::Workspace;
-
-pub struct DeltaSlashCommand;
-
-impl SlashCommand for DeltaSlashCommand {
-    fn name(&self) -> String {
-        "delta".into()
-    }
-
-    fn description(&self) -> String {
-        "Re-insert changed files".into()
-    }
-
-    fn menu_text(&self) -> String {
-        self.description()
-    }
-
-    fn icon(&self) -> IconName {
-        IconName::Diff
-    }
-
-    fn requires_argument(&self) -> bool {
-        false
-    }
-
-    fn complete_argument(
-        self: Arc<Self>,
-        _arguments: &[String],
-        _cancellation_flag: Arc<AtomicBool>,
-        _workspace: Option<WeakEntity<Workspace>>,
-        _window: &mut Window,
-        _cx: &mut App,
-    ) -> Task<Result<Vec<ArgumentCompletion>>> {
-        Task::ready(Err(anyhow!("this command does not require argument")))
-    }
-
-    fn run(
-        self: Arc<Self>,
-        _arguments: &[String],
-        context_slash_command_output_sections: &[SlashCommandOutputSection<language::Anchor>],
-        context_buffer: BufferSnapshot,
-        workspace: WeakEntity<Workspace>,
-        delegate: Option<Arc<dyn LspAdapterDelegate>>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<SlashCommandResult> {
-        let mut paths = HashSet::default();
-        let mut file_command_old_outputs = Vec::new();
-        let mut file_command_new_outputs = Vec::new();
-
-        for section in context_slash_command_output_sections.iter().rev() {
-            if let Some(metadata) = section
-                .metadata
-                .as_ref()
-                .and_then(|value| serde_json::from_value::<FileCommandMetadata>(value.clone()).ok())
-                && paths.insert(metadata.path.clone())
-            {
-                file_command_old_outputs.push(
-                    context_buffer
-                        .as_rope()
-                        .slice(section.range.to_offset(&context_buffer)),
-                );
-                file_command_new_outputs.push(Arc::new(FileSlashCommand).run(
-                    std::slice::from_ref(&metadata.path),
-                    context_slash_command_output_sections,
-                    context_buffer.clone(),
-                    workspace.clone(),
-                    delegate.clone(),
-                    window,
-                    cx,
-                ));
-            }
-        }
-
-        cx.background_spawn(async move {
-            let mut output = SlashCommandOutput::default();
-            let mut changes_detected = false;
-
-            let file_command_new_outputs = future::join_all(file_command_new_outputs).await;
-            for (old_text, new_output) in file_command_old_outputs
-                .into_iter()
-                .zip(file_command_new_outputs)
-            {
-                if let Ok(new_output) = new_output
-                    && let Ok(new_output) = SlashCommandOutput::from_event_stream(new_output).await
-                    && let Some(file_command_range) = new_output.sections.first()
-                {
-                    let new_text = &new_output.text[file_command_range.range.clone()];
-                    if old_text.chars().ne(new_text.chars()) {
-                        changes_detected = true;
-                        output
-                            .sections
-                            .extend(new_output.sections.into_iter().map(|section| {
-                                SlashCommandOutputSection {
-                                    range: output.text.len() + section.range.start
-                                        ..output.text.len() + section.range.end,
-                                    icon: section.icon,
-                                    label: section.label,
-                                    metadata: section.metadata,
-                                }
-                            }));
-                        output.text.push_str(&new_output.text);
-                    }
-                }
-            }
-
-            anyhow::ensure!(changes_detected, "no new changes detected");
-            Ok(output.into_event_stream())
-        })
-    }
-}
diff --git a/crates/assistant_slash_commands/src/diagnostics_command.rs b/crates/assistant_slash_commands/src/diagnostics_command.rs
deleted file mode 100644
index 3b3e3f7b89..0000000000
--- a/crates/assistant_slash_commands/src/diagnostics_command.rs
+++ /dev/null
@@ -1,432 +0,0 @@
-use anyhow::{Context as _, Result, anyhow};
-use assistant_slash_command::{
-    ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
-    SlashCommandResult,
-};
-use fuzzy::{PathMatch, StringMatchCandidate};
-use gpui::{App, Entity, Task, WeakEntity};
-use language::{
-    Anchor, BufferSnapshot, DiagnosticEntryRef, DiagnosticSeverity, LspAdapterDelegate,
-    OffsetRangeExt, ToOffset,
-};
-use project::{DiagnosticSummary, PathMatchCandidateSet, Project};
-use rope::Point;
-use std::{
-    fmt::Write,
-    path::Path,
-    sync::{Arc, atomic::AtomicBool},
-};
-use ui::prelude::*;
-use util::paths::{PathMatcher, PathStyle};
-use util::{ResultExt, rel_path::RelPath};
-use workspace::Workspace;
-
-use crate::create_label_for_command;
-
-pub struct DiagnosticsSlashCommand;
-
-impl DiagnosticsSlashCommand {
-    fn search_paths(
-        &self,
-        query: String,
-        cancellation_flag: Arc<AtomicBool>,
-        workspace: &Entity<Workspace>,
-        cx: &mut App,
-    ) -> Task<Vec<PathMatch>> {
-        if query.is_empty() {
-            let workspace = workspace.read(cx);
-            let entries = workspace.recent_navigation_history(Some(10), cx);
-            let path_prefix: Arc<RelPath> = RelPath::empty().into();
-            Task::ready(
-                entries
-                    .into_iter()
-                    .map(|(entry, _)| PathMatch {
-                        score: 0.,
-                        positions: Vec::new(),
-                        worktree_id: entry.worktree_id.to_usize(),
-                        path: entry.path,
-                        path_prefix: path_prefix.clone(),
-                        is_dir: false, // Diagnostics can't be produced for directories
-                        distance_to_relative_ancestor: 0,
-                    })
-                    .collect(),
-            )
-        } else {
-            let worktrees = workspace.read(cx).visible_worktrees(cx).collect::<Vec<_>>();
-            let candidate_sets = worktrees
-                .into_iter()
-                .map(|worktree| {
-                    let worktree = worktree.read(cx);
-                    PathMatchCandidateSet {
-                        snapshot: worktree.snapshot(),
-                        include_ignored: worktree
-                            .root_entry()
-                            .is_some_and(|entry| entry.is_ignored),
-                        include_root_name: true,
-                        candidates: project::Candidates::Entries,
-                    }
-                })
-                .collect::<Vec<_>>();
-
-            let executor = cx.background_executor().clone();
-            cx.foreground_executor().spawn(async move {
-                fuzzy::match_path_sets(
-                    candidate_sets.as_slice(),
-                    query.as_str(),
-                    &None,
-                    false,
-                    100,
-                    &cancellation_flag,
-                    executor,
-                )
-                .await
-            })
-        }
-    }
-}
-
-impl SlashCommand for DiagnosticsSlashCommand {
-    fn name(&self) -> String {
-        "diagnostics".into()
-    }
-
-    fn label(&self, cx: &App) -> language::CodeLabel {
-        create_label_for_command("diagnostics", &[INCLUDE_WARNINGS_ARGUMENT], cx)
-    }
-
-    fn description(&self) -> String {
-        "Insert diagnostics".into()
-    }
-
-    fn icon(&self) -> IconName {
-        IconName::XCircle
-    }
-
-    fn menu_text(&self) -> String {
-        self.description()
-    }
-
-    fn requires_argument(&self) -> bool {
-        false
-    }
-
-    fn accepts_arguments(&self) -> bool {
-        true
-    }
-
-    fn complete_argument(
-        self: Arc<Self>,
-        arguments: &[String],
-        cancellation_flag: Arc<AtomicBool>,
-        workspace: Option<WeakEntity<Workspace>>,
-        _: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<Vec<ArgumentCompletion>>> {
-        let Some(workspace) = workspace.and_then(|workspace| workspace.upgrade()) else {
-            return Task::ready(Err(anyhow!("workspace was dropped")));
-        };
-        let path_style = workspace.read(cx).project().read(cx).path_style(cx);
-        let query = arguments.last().cloned().unwrap_or_default();
-
-        let paths = self.search_paths(query.clone(), cancellation_flag.clone(), &workspace, cx);
-        let executor = cx.background_executor().clone();
-        cx.background_spawn(async move {
-            let mut matches: Vec<String> = paths
-                .await
-                .into_iter()
-                .map(|path_match| {
-                    path_match
-                        .path_prefix
-                        .join(&path_match.path)
-                        .display(path_style)
-                        .to_string()
-                })
-                .collect();
-
-            matches.extend(
-                fuzzy::match_strings(
-                    &Options::match_candidates_for_args(),
-                    &query,
-                    false,
-                    true,
-                    10,
-                    &cancellation_flag,
-                    executor,
-                )
-                .await
-                .into_iter()
-                .map(|candidate| candidate.string),
-            );
-
-            Ok(matches
-                .into_iter()
-                .map(|completion| ArgumentCompletion {
-                    label: completion.clone().into(),
-                    new_text: completion,
-                    after_completion: assistant_slash_command::AfterCompletion::Run,
-                    replace_previous_arguments: false,
-                })
-                .collect())
-        })
-    }
-
-    fn run(
-        self: Arc<Self>,
-        arguments: &[String],
-        _context_slash_command_output_sections: &[SlashCommandOutputSection<language::Anchor>],
-        _context_buffer: BufferSnapshot,
-        workspace: WeakEntity<Workspace>,
-        _delegate: Option<Arc<dyn LspAdapterDelegate>>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<SlashCommandResult> {
-        let Some(workspace) = workspace.upgrade() else {
-            return Task::ready(Err(anyhow!("workspace was dropped")));
-        };
-
-        let project = workspace.read(cx).project();
-        let path_style = project.read(cx).path_style(cx);
-        let options = Options::parse(arguments, path_style);
-
-        let task = collect_diagnostics(project.clone(), options, cx);
-
-        window.spawn(cx, async move |_| {
-            task.await?
-                .map(|output| output.into_event_stream())
-                .context("No diagnostics found")
-        })
-    }
-}
-
-#[derive(Default)]
-struct Options {
-    include_warnings: bool,
-    path_matcher: Option<PathMatcher>,
-}
-
-const INCLUDE_WARNINGS_ARGUMENT: &str = "--include-warnings";
-
-impl Options {
-    fn parse(arguments: &[String], path_style: PathStyle) -> Self {
-        let mut include_warnings = false;
-        let mut path_matcher = None;
-        for arg in arguments {
-            if arg == INCLUDE_WARNINGS_ARGUMENT {
-                include_warnings = true;
-            } else {
-                path_matcher = PathMatcher::new(&[arg.to_owned()], path_style).log_err();
-            }
-        }
-        Self {
-            include_warnings,
-            path_matcher,
-        }
-    }
-
-    fn match_candidates_for_args() -> [StringMatchCandidate; 1] {
-        [StringMatchCandidate::new(0, INCLUDE_WARNINGS_ARGUMENT)]
-    }
-}
-
-fn collect_diagnostics(
-    project: Entity<Project>,
-    options: Options,
-    cx: &mut App,
-) -> Task<Result<Option<SlashCommandOutput>>> {
-    let path_style = project.read(cx).path_style(cx);
-    let glob_is_exact_file_match = if let Some(path) = options
-        .path_matcher
-        .as_ref()
-        .and_then(|pm| pm.sources().next())
-    {
-        project
-            .read(cx)
-            .find_project_path(Path::new(path), cx)
-            .is_some()
-    } else {
-        false
-    };
-
-    let project_handle = project.downgrade();
-    let diagnostic_summaries: Vec<_> = project
-        .read(cx)
-        .diagnostic_summaries(false, cx)
-        .flat_map(|(path, _, summary)| {
-            let worktree = project.read(cx).worktree_for_id(path.worktree_id, cx)?;
-            let full_path = worktree.read(cx).root_name().join(&path.path);
-            Some((path, full_path, summary))
-        })
-        .collect();
-
-    cx.spawn(async move |cx| {
-        let error_source = if let Some(path_matcher) = &options.path_matcher {
-            debug_assert_eq!(path_matcher.sources().count(), 1);
-            Some(path_matcher.sources().next().unwrap_or_default())
-        } else {
-            None
-        };
-
-        let mut output = SlashCommandOutput::default();
-
-        if let Some(error_source) = error_source.as_ref() {
-            writeln!(output.text, "diagnostics: {}", error_source).unwrap();
-        } else {
-            writeln!(output.text, "diagnostics").unwrap();
-        }
-
-        let mut project_summary = DiagnosticSummary::default();
-        for (project_path, path, summary) in diagnostic_summaries {
-            if let Some(path_matcher) = &options.path_matcher
-                && !path_matcher.is_match(&path)
-            {
-                continue;
-            }
-
-            project_summary.error_count += summary.error_count;
-            if options.include_warnings {
-                project_summary.warning_count += summary.warning_count;
-            } else if summary.error_count == 0 {
-                continue;
-            }
-
-            let last_end = output.text.len();
-            let file_path = path.display(path_style).to_string();
-            if !glob_is_exact_file_match {
-                writeln!(&mut output.text, "{file_path}").unwrap();
-            }
-
-            if let Some(buffer) = project_handle
-                .update(cx, |project, cx| project.open_buffer(project_path, cx))?
-                .await
-                .log_err()
-            {
-                let snapshot = cx.read_entity(&buffer, |buffer, _| buffer.snapshot())?;
-                collect_buffer_diagnostics(&mut output, &snapshot, options.include_warnings);
-            }
-
-            if !glob_is_exact_file_match {
-                output.sections.push(SlashCommandOutputSection {
-                    range: last_end..output.text.len().saturating_sub(1),
-                    icon: IconName::File,
-                    label: file_path.into(),
-                    metadata: None,
-                });
-            }
-        }
-
-        // No diagnostics found
-        if output.sections.is_empty() {
-            return Ok(None);
-        }
-
-        let mut label = String::new();
-        label.push_str("Diagnostics");
-        if let Some(source) = error_source {
-            write!(label, " ({})", source).unwrap();
-        }
-
-        if project_summary.error_count > 0 || project_summary.warning_count > 0 {
-            label.push(':');
-
-            if project_summary.error_count > 0 {
-                write!(label, " {} errors", project_summary.error_count).unwrap();
-                if project_summary.warning_count > 0 {
-                    label.push_str(",");
-                }
-            }
-
-            if project_summary.warning_count > 0 {
-                write!(label, " {} warnings", project_summary.warning_count).unwrap();
-            }
-        }
-
-        output.sections.insert(
-            0,
-            SlashCommandOutputSection {
-                range: 0..output.text.len(),
-                icon: IconName::Warning,
-                label: label.into(),
-                metadata: None,
-            },
-        );
-
-        Ok(Some(output))
-    })
-}
-
-pub fn collect_buffer_diagnostics(
-    output: &mut SlashCommandOutput,
-    snapshot: &BufferSnapshot,
-    include_warnings: bool,
-) {
-    for (_, group) in snapshot.diagnostic_groups(None) {
-        let entry = &group.entries[group.primary_ix];
-        collect_diagnostic(output, entry, snapshot, include_warnings)
-    }
-}
-
-fn collect_diagnostic(
-    output: &mut SlashCommandOutput,
-    entry: &DiagnosticEntryRef<'_, Anchor>,
-    snapshot: &BufferSnapshot,
-    include_warnings: bool,
-) {
-    const EXCERPT_EXPANSION_SIZE: u32 = 2;
-    const MAX_MESSAGE_LENGTH: usize = 2000;
-
-    let (ty, icon) = match entry.diagnostic.severity {
-        DiagnosticSeverity::WARNING => {
-            if !include_warnings {
-                return;
-            }
-            ("warning", IconName::Warning)
-        }
-        DiagnosticSeverity::ERROR => ("error", IconName::XCircle),
-        _ => return,
-    };
-    let prev_len = output.text.len();
-
-    let range = entry.range.to_point(snapshot);
-    let diagnostic_row_number = range.start.row + 1;
-
-    let start_row = range.start.row.saturating_sub(EXCERPT_EXPANSION_SIZE);
-    let end_row = (range.end.row + EXCERPT_EXPANSION_SIZE).min(snapshot.max_point().row) + 1;
-    let excerpt_range =
-        Point::new(start_row, 0).to_offset(snapshot)..Point::new(end_row, 0).to_offset(snapshot);
-
-    output.text.push_str("```");
-    if let Some(language_name) = snapshot.language().map(|l| l.code_fence_block_name()) {
-        output.text.push_str(&language_name);
-    }
-    output.text.push('\n');
-
-    let mut buffer_text = String::new();
-    for chunk in snapshot.text_for_range(excerpt_range) {
-        buffer_text.push_str(chunk);
-    }
-
-    for (i, line) in buffer_text.lines().enumerate() {
-        let line_number = start_row + i as u32 + 1;
-        writeln!(output.text, "{}", line).unwrap();
-
-        if line_number == diagnostic_row_number {
-            output.text.push_str("//");
-            let prev_len = output.text.len();
-            write!(output.text, " {}: ", ty).unwrap();
-            let padding = output.text.len() - prev_len;
-
-            let message = util::truncate(&entry.diagnostic.message, MAX_MESSAGE_LENGTH)
-                .replace('\n', format!("\n//{:padding$}", "").as_str());
-
-            writeln!(output.text, "{message}").unwrap();
-        }
-    }
-
-    writeln!(output.text, "```").unwrap();
-    output.sections.push(SlashCommandOutputSection {
-        range: prev_len..output.text.len().saturating_sub(1),
-        icon,
-        label: entry.diagnostic.message.clone().into(),
-        metadata: None,
-    });
-}
diff --git a/crates/assistant_slash_commands/src/fetch_command.rs b/crates/assistant_slash_commands/src/fetch_command.rs
deleted file mode 100644
index 6d3f66c9a2..0000000000
--- a/crates/assistant_slash_commands/src/fetch_command.rs
+++ /dev/null
@@ -1,183 +0,0 @@
-use std::cell::RefCell;
-use std::rc::Rc;
-use std::sync::Arc;
-use std::sync::atomic::AtomicBool;
-
-use anyhow::{Context as _, Result, anyhow, bail};
-use assistant_slash_command::{
-    ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
-    SlashCommandResult,
-};
-use futures::AsyncReadExt;
-use gpui::{Task, WeakEntity};
-use html_to_markdown::{TagHandler, convert_html_to_markdown, markdown};
-use http_client::{AsyncBody, HttpClient, HttpClientWithUrl};
-use language::{BufferSnapshot, LspAdapterDelegate};
-use ui::prelude::*;
-use workspace::Workspace;
-
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
-enum ContentType {
-    Html,
-    Plaintext,
-    Json,
-}
-
-pub struct FetchSlashCommand;
-
-impl FetchSlashCommand {
-    async fn build_message(http_client: Arc<HttpClientWithUrl>, url: &str) -> Result<String> {
-        let mut url = url.to_owned();
-        if !url.starts_with("https://") && !url.starts_with("http://") {
-            url = format!("https://{url}");
-        }
-
-        let mut response = http_client.get(&url, AsyncBody::default(), true).await?;
-
-        let mut body = Vec::new();
-        response
-            .body_mut()
-            .read_to_end(&mut body)
-            .await
-            .context("error reading response body")?;
-
-        if response.status().is_client_error() {
-            let text = String::from_utf8_lossy(body.as_slice());
-            bail!(
-                "status error {}, response: {text:?}",
-                response.status().as_u16()
-            );
-        }
-
-        let Some(content_type) = response.headers().get("content-type") else {
-            bail!("missing Content-Type header");
-        };
-        let content_type = content_type
-            .to_str()
-            .context("invalid Content-Type header")?;
-        let content_type = if content_type.starts_with("text/html") {
-            ContentType::Html
-        } else if content_type.starts_with("text/plain") {
-            ContentType::Plaintext
-        } else if content_type.starts_with("application/json") {
-            ContentType::Json
-        } else {
-            ContentType::Html
-        };
-
-        match content_type {
-            ContentType::Html => {
-                let mut handlers: Vec<TagHandler> = vec![
-                    Rc::new(RefCell::new(markdown::WebpageChromeRemover)),
-                    Rc::new(RefCell::new(markdown::ParagraphHandler)),
-                    Rc::new(RefCell::new(markdown::HeadingHandler)),
-                    Rc::new(RefCell::new(markdown::ListHandler)),
-                    Rc::new(RefCell::new(markdown::TableHandler::new())),
-                    Rc::new(RefCell::new(markdown::StyledTextHandler)),
-                ];
-                if url.contains("wikipedia.org") {
-                    use html_to_markdown::structure::wikipedia;
-
-                    handlers.push(Rc::new(RefCell::new(wikipedia::WikipediaChromeRemover)));
-                    handlers.push(Rc::new(RefCell::new(wikipedia::WikipediaInfoboxHandler)));
-                    handlers.push(Rc::new(
-                        RefCell::new(wikipedia::WikipediaCodeHandler::new()),
-                    ));
-                } else {
-                    handlers.push(Rc::new(RefCell::new(markdown::CodeHandler)));
-                }
-
-                convert_html_to_markdown(&body[..], &mut handlers)
-            }
-            ContentType::Plaintext => Ok(std::str::from_utf8(&body)?.to_owned()),
-            ContentType::Json => {
-                let json: serde_json::Value = serde_json::from_slice(&body)?;
-
-                Ok(format!(
-                    "```json\n{}\n```",
-                    serde_json::to_string_pretty(&json)?
-                ))
-            }
-        }
-    }
-}
-
-impl SlashCommand for FetchSlashCommand {
-    fn name(&self) -> String {
-        "fetch".into()
-    }
-
-    fn description(&self) -> String {
-        "Insert fetched URL contents".into()
-    }
-
-    fn icon(&self) -> IconName {
-        IconName::ToolWeb
-    }
-
-    fn menu_text(&self) -> String {
-        self.description()
-    }
-
-    fn requires_argument(&self) -> bool {
-        true
-    }
-
-    fn complete_argument(
-        self: Arc<Self>,
-        _arguments: &[String],
-        _cancel: Arc<AtomicBool>,
-        _workspace: Option<WeakEntity<Workspace>>,
-        _window: &mut Window,
-        _cx: &mut App,
-    ) -> Task<Result<Vec<ArgumentCompletion>>> {
-        Task::ready(Ok(Vec::new()))
-    }
-
-    fn run(
-        self: Arc<Self>,
-        arguments: &[String],
-        _context_slash_command_output_sections: &[SlashCommandOutputSection<language::Anchor>],
-        _context_buffer: BufferSnapshot,
-        workspace: WeakEntity<Workspace>,
-        _delegate: Option<Arc<dyn LspAdapterDelegate>>,
-        _: &mut Window,
-        cx: &mut App,
-    ) -> Task<SlashCommandResult> {
-        let Some(argument) = arguments.first() else {
-            return Task::ready(Err(anyhow!("missing URL")));
-        };
-        let Some(workspace) = workspace.upgrade() else {
-            return Task::ready(Err(anyhow!("workspace was dropped")));
-        };
-
-        let http_client = workspace.read(cx).client().http_client();
-        let url = argument.to_string();
-
-        let text = cx.background_spawn({
-            let url = url.clone();
-            async move { Self::build_message(http_client, &url).await }
-        });
-
-        let url = SharedString::from(url);
-        cx.foreground_executor().spawn(async move {
-            let text = text.await?;
-            if text.trim().is_empty() {
-                bail!("no textual content found");
-            }
-
-            let range = 0..text.len();
-            Ok(SlashCommandOutput {
-                text,
-                sections: vec![SlashCommandOutputSection {
-                    range,
-                    icon: IconName::ToolWeb,
-                    label: format!("fetch {}", url).into(),
-                    metadata: None,
-                }],
-                run_commands_in_text: false,
-            }
-            .into_event_stream())
-        })
-    }
-}
diff --git a/crates/assistant_slash_commands/src/file_command.rs b/crates/assistant_slash_commands/src/file_command.rs
deleted file mode 100644
index a17e198ed3..0000000000
--- a/crates/assistant_slash_commands/src/file_command.rs
+++ /dev/null
@@ -1,777 +0,0 @@
-use anyhow::{Context as _, Result, anyhow};
-use assistant_slash_command::{
-    AfterCompletion, ArgumentCompletion, SlashCommand, SlashCommandContent, SlashCommandEvent,
-    SlashCommandOutput, SlashCommandOutputSection, SlashCommandResult,
-};
-use futures::Stream;
-use futures::channel::mpsc;
-use fuzzy::PathMatch;
-use gpui::{App, Entity, Task, WeakEntity};
-use language::{BufferSnapshot, CodeLabelBuilder, HighlightId, LineEnding, LspAdapterDelegate};
-use project::{PathMatchCandidateSet, Project};
-use serde::{Deserialize, Serialize};
-use smol::stream::StreamExt;
-use std::{
-    fmt::Write,
-    ops::{Range, RangeInclusive},
-    path::Path,
-    sync::{Arc, atomic::AtomicBool},
-};
-use ui::prelude::*;
-use util::{ResultExt, rel_path::RelPath};
-use workspace::Workspace;
-use worktree::ChildEntriesOptions;
-
-pub struct FileSlashCommand;
-
-impl FileSlashCommand {
-    fn search_paths(
-        &self,
-        query: String,
-        cancellation_flag: Arc<AtomicBool>,
-        workspace: &Entity<Workspace>,
-        cx: &mut App,
-    ) -> Task<Vec<PathMatch>> {
-        if query.is_empty() {
-            let workspace = workspace.read(cx);
-            let project = workspace.project().read(cx);
-            let entries = workspace.recent_navigation_history(Some(10), cx);
-
-            let entries = entries
-                .into_iter()
-                .map(|entries| (entries.0, false))
-                .chain(project.worktrees(cx).flat_map(|worktree| {
-                    let worktree = worktree.read(cx);
-                    let id = worktree.id();
-                    let options = ChildEntriesOptions {
-                        include_files: true,
-                        include_dirs: true,
-                        include_ignored: false,
-                    };
-                    let entries = worktree.child_entries_with_options(RelPath::empty(), options);
-                    entries.map(move |entry| {
-                        (
-                            project::ProjectPath {
-                                worktree_id: id,
-                                path: entry.path.clone(),
-                            },
-                            entry.kind.is_dir(),
-                        )
-                    })
-                }))
-                .collect::<Vec<_>>();
-
-            let path_prefix: Arc<RelPath> = RelPath::empty().into();
-            Task::ready(
-                entries
-                    .into_iter()
-                    .filter_map(|(entry, is_dir)| {
-                        let worktree = project.worktree_for_id(entry.worktree_id, cx)?;
-                        let full_path = worktree.read(cx).root_name().join(&entry.path);
-                        Some(PathMatch {
-                            score: 0.,
-                            positions: Vec::new(),
-                            worktree_id: entry.worktree_id.to_usize(),
-                            path: full_path,
-                            path_prefix: path_prefix.clone(),
-                            distance_to_relative_ancestor: 0,
-                            is_dir,
-                        })
-                    })
-                    .collect(),
-            )
-        } else {
-            let worktrees = workspace.read(cx).visible_worktrees(cx).collect::<Vec<_>>();
-            let candidate_sets = worktrees
-                .into_iter()
-                .map(|worktree| {
-                    let worktree = worktree.read(cx);
-
-                    PathMatchCandidateSet {
-                        snapshot: worktree.snapshot(),
-                        include_ignored: worktree
-                            .root_entry()
-                            .is_some_and(|entry| entry.is_ignored),
-                        include_root_name: true,
-                        candidates: project::Candidates::Entries,
-                    }
-                })
-                .collect::<Vec<_>>();
-
-            let executor = cx.background_executor().clone();
-            cx.foreground_executor().spawn(async move {
-                fuzzy::match_path_sets(
-                    candidate_sets.as_slice(),
-                    query.as_str(),
-                    &None,
-                    false,
-                    100,
-                    &cancellation_flag,
-                    executor,
-                )
-                .await
-            })
-        }
-    }
-}
-
-impl SlashCommand for FileSlashCommand {
-    fn name(&self) -> String {
-        "file".into()
-    }
-
-    fn description(&self) -> String {
-        "Insert file and/or directory".into()
-    }
-
-    fn menu_text(&self) -> String {
-        self.description()
-    }
-
-    fn requires_argument(&self) -> bool {
-        true
-    }
-
-    fn icon(&self) -> IconName {
-        IconName::File
-    }
-
-    fn complete_argument(
-        self: Arc<Self>,
-        arguments: &[String],
-        cancellation_flag: Arc<AtomicBool>,
-        workspace: Option<WeakEntity<Workspace>>,
-        _: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<Vec<ArgumentCompletion>>> {
-        let Some(workspace) = workspace.and_then(|workspace| workspace.upgrade()) else {
-            return Task::ready(Err(anyhow!("workspace was dropped")));
-        };
-
-        let path_style = workspace.read(cx).path_style(cx);
-
-        let paths = self.search_paths(
-            arguments.last().cloned().unwrap_or_default(),
-            cancellation_flag,
-            &workspace,
-            cx,
-        );
-        let comment_id = cx.theme().syntax().highlight_id("comment").map(HighlightId);
-        cx.background_spawn(async move {
-            Ok(paths
-                .await
-                .into_iter()
-                .filter_map(|path_match| {
-                    let text = path_match
-                        .path_prefix
-                        .join(&path_match.path)
-                        .display(path_style)
-                        .to_string();
-
-                    let mut label = CodeLabelBuilder::default();
-                    let file_name = path_match.path.file_name()?;
-                    let label_text = if path_match.is_dir {
-                        format!("{}/ ", file_name)
-                    } else {
-                        format!("{} ", file_name)
-                    };
-
-                    label.push_str(label_text.as_str(), None);
-                    label.push_str(&text, comment_id);
-                    label.respan_filter_range(Some(file_name));
-
-                    Some(ArgumentCompletion {
-                        label: label.build(),
-                        new_text: text,
-                        after_completion: AfterCompletion::Compose,
-                        replace_previous_arguments: false,
-                    })
-                })
-                .collect())
-        })
-    }
-
-    fn run(
-        self: Arc<Self>,
-        arguments: &[String],
-        _context_slash_command_output_sections: &[SlashCommandOutputSection<language::Anchor>],
-        _context_buffer: BufferSnapshot,
-        workspace: WeakEntity<Workspace>,
-        _delegate: Option<Arc<dyn LspAdapterDelegate>>,
-        _: &mut Window,
-        cx: &mut App,
-    ) -> Task<SlashCommandResult> {
-        let Some(workspace) = workspace.upgrade() else {
-            return Task::ready(Err(anyhow!("workspace was dropped")));
-        };
-
-        if arguments.is_empty() {
-            return Task::ready(Err(anyhow!("missing path")));
-        };
-
-        Task::ready(Ok(collect_files(
-            workspace.read(cx).project().clone(),
-            arguments,
-            cx,
-        )
-        .boxed()))
-    }
-}
-
-fn collect_files(
-    project: Entity<Project>,
-    glob_inputs: &[String],
-    cx: &mut App,
-) -> impl Stream<Item = Result<SlashCommandEvent>> + use<> {
-    let Ok(matchers) = glob_inputs
-        .iter()
-        .map(|glob_input| {
-            custom_path_matcher::PathMatcher::new(&[glob_input.to_owned()])
-                .with_context(|| format!("invalid path {glob_input}"))
-        })
-        .collect::<anyhow::Result<Vec<custom_path_matcher::PathMatcher>>>()
-    else {
-        return futures::stream::once(async {
-            anyhow::bail!("invalid path");
-        })
-        .boxed();
-    };
-
-    let project_handle = project.downgrade();
-    let snapshots = project
-        .read(cx)
-        .worktrees(cx)
-        .map(|worktree| worktree.read(cx).snapshot())
-        .collect::<Vec<_>>();
-
-    let (events_tx, events_rx) = mpsc::unbounded();
-    cx.spawn(async move |cx| {
-        for snapshot in snapshots {
-            let worktree_id = snapshot.id();
-            let path_style = snapshot.path_style();
-            let mut directory_stack: Vec<Arc<RelPath>> = Vec::new();
-            let mut folded_directory_names: Arc<RelPath> = RelPath::empty().into();
-            let mut is_top_level_directory = true;
-
-            for entry in snapshot.entries(false, 0) {
-                let path_including_worktree_name = snapshot.root_name().join(&entry.path);
-
-                if !matchers
-                    .iter()
-                    .any(|matcher| matcher.is_match(&path_including_worktree_name))
-                {
-                    continue;
-                }
-
-                while let Some(dir) = directory_stack.last() {
-                    if entry.path.starts_with(dir) {
-                        break;
-                    }
-                    directory_stack.pop().unwrap();
-                    events_tx.unbounded_send(Ok(SlashCommandEvent::EndSection))?;
-                    events_tx.unbounded_send(Ok(SlashCommandEvent::Content(
-                        SlashCommandContent::Text {
-                            text: "\n".into(),
-                            run_commands_in_text: false,
-                        },
-                    )))?;
-                }
-
-                let filename = entry.path.file_name().unwrap_or_default().to_string();
-
-                if entry.is_dir() {
-                    // Auto-fold directories that contain no files
-                    let mut child_entries = snapshot.child_entries(&entry.path);
-                    if let Some(child) = child_entries.next() {
-                        if child_entries.next().is_none() && child.kind.is_dir() {
-                            if is_top_level_directory {
-                                is_top_level_directory = false;
-                                folded_directory_names =
-                                    folded_directory_names.join(&path_including_worktree_name);
-                            } else {
-                                folded_directory_names =
-                                    folded_directory_names.join(RelPath::unix(&filename).unwrap());
-                            }
-                            continue;
-                        }
-                    } else {
-                        // Skip empty directories
-                        folded_directory_names = RelPath::empty().into();
-                        continue;
-                    }
-                    if folded_directory_names.is_empty() {
-                        let label = if is_top_level_directory {
-                            is_top_level_directory = false;
-                            path_including_worktree_name.display(path_style).to_string()
-                        } else {
-                            filename
-                        };
-                        events_tx.unbounded_send(Ok(SlashCommandEvent::StartSection {
-                            icon: IconName::Folder,
-                            label: label.clone().into(),
-                            metadata: None,
-                        }))?;
-                        events_tx.unbounded_send(Ok(SlashCommandEvent::Content(
-                            SlashCommandContent::Text {
-                                text: label.to_string(),
-                                run_commands_in_text: false,
-                            },
-                        )))?;
-                        directory_stack.push(entry.path.clone());
-                    } else {
-                        let entry_name =
-                            folded_directory_names.join(RelPath::unix(&filename).unwrap());
-                        let entry_name = entry_name.display(path_style);
-                        events_tx.unbounded_send(Ok(SlashCommandEvent::StartSection {
-                            icon: IconName::Folder,
-                            label: entry_name.to_string().into(),
-                            metadata: None,
-                        }))?;
-                        events_tx.unbounded_send(Ok(SlashCommandEvent::Content(
-                            SlashCommandContent::Text {
-                                text: entry_name.to_string(),
-                                run_commands_in_text: false,
-                            },
-                        )))?;
-                        directory_stack.push(entry.path.clone());
-                    }
-                    events_tx.unbounded_send(Ok(SlashCommandEvent::Content(
-                        SlashCommandContent::Text {
-                            text: "\n".into(),
-                            run_commands_in_text: false,
-                        },
-                    )))?;
-                } else if entry.is_file() {
-                    let Some(open_buffer_task) = project_handle
-                        .update(cx, |project, cx| {
-                            project.open_buffer((worktree_id, entry.path.clone()), cx)
-                        })
-                        .ok()
-                    else {
-                        continue;
-                    };
-                    if let Some(buffer) = open_buffer_task.await.log_err() {
-                        let mut output = SlashCommandOutput::default();
-                        let snapshot = buffer.read_with(cx, |buffer, _| buffer.snapshot())?;
-                        append_buffer_to_output(
-                            &snapshot,
-                            Some(path_including_worktree_name.display(path_style).as_ref()),
-                            &mut output,
-                        )
-                        .log_err();
-                        let mut buffer_events = output.into_event_stream();
-                        while let Some(event) = buffer_events.next().await {
-                            events_tx.unbounded_send(event)?;
-                        }
-                    }
-                }
-            }
-
-            while directory_stack.pop().is_some() {
-                events_tx.unbounded_send(Ok(SlashCommandEvent::EndSection))?;
-            }
-        }
-
-        anyhow::Ok(())
-    })
-    .detach_and_log_err(cx);
-
-    events_rx.boxed()
-}
-
-pub fn codeblock_fence_for_path(
-    path: Option<&str>,
-    row_range: Option<RangeInclusive<u32>>,
-) -> String {
-    let mut text = String::new();
-    write!(text, "```").unwrap();
-
-    if let Some(path) = path {
-        if let Some(extension) = Path::new(path).extension().and_then(|ext| ext.to_str()) {
-            write!(text, "{} ", extension).unwrap();
-        }
-
-        write!(text, "{path}").unwrap();
-    } else {
-        write!(text, "untitled").unwrap();
-    }
-
-    if let Some(row_range) = row_range {
-        write!(text, ":{}-{}", row_range.start() + 1, row_range.end() + 1).unwrap();
-    }
-
-    text.push('\n');
-    text
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct FileCommandMetadata {
-    pub path: String,
-}
-
-pub fn build_entry_output_section(
-    range: Range<usize>,
-    path: Option<&str>,
-    is_directory: bool,
-    line_range: Option<Range<u32>>,
-) -> SlashCommandOutputSection<usize> {
-    let mut label = if let Some(path) = path {
-        path.to_string()
-    } else {
-        "untitled".to_string()
-    };
-    if let Some(line_range) = line_range {
-        write!(label, ":{}-{}", line_range.start, line_range.end).unwrap();
-    }
-
-    let icon = if is_directory {
-        IconName::Folder
-    } else {
-        IconName::File
-    };
-
-    SlashCommandOutputSection {
-        range,
-        icon,
-        label: label.into(),
-        metadata: if is_directory {
-            None
-        } else {
-            path.and_then(|path| {
-                serde_json::to_value(FileCommandMetadata {
-                    path: path.to_string(),
-                })
-                .ok()
-            })
-        },
-    }
-}
-
-/// This contains a small fork of the util::paths::PathMatcher, that is stricter about the prefix
-/// check. Only subpaths pass the prefix check, rather than any prefix.
-mod custom_path_matcher {
-    use globset::{Glob, GlobSet, GlobSetBuilder};
-    use std::fmt::Debug as _;
-    use util::{paths::SanitizedPath, rel_path::RelPath};
-
-    #[derive(Clone, Debug, Default)]
-    pub struct PathMatcher {
-        sources: Vec<String>,
-        sources_with_trailing_slash: Vec<String>,
-        glob: GlobSet,
-    }
-
-    impl std::fmt::Display for PathMatcher {
-        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-            self.sources.fmt(f)
-        }
-    }
-
-    impl PartialEq for PathMatcher {
-        fn eq(&self, other: &Self) -> bool {
-            self.sources.eq(&other.sources)
-        }
-    }
-
-    impl Eq for PathMatcher {}
-
-    impl PathMatcher {
-        pub fn new(globs: &[String]) -> Result<Self, globset::Error> {
-            let globs = globs
-                .iter()
-                .map(|glob| Glob::new(&SanitizedPath::new(glob).to_string()))
-                .collect::<Result<Vec<_>, _>>()?;
-            let sources = globs.iter().map(|glob| glob.glob().to_owned()).collect();
-            let sources_with_trailing_slash = globs
-                .iter()
-                .map(|glob| glob.glob().to_string() + "/")
-                .collect();
-            let mut glob_builder = GlobSetBuilder::new();
-            for single_glob in globs {
-                glob_builder.add(single_glob);
-            }
-            let glob = glob_builder.build()?;
-            Ok(PathMatcher {
-                glob,
-                sources,
-                sources_with_trailing_slash,
-            })
-        }
-
-        pub fn is_match(&self, other: &RelPath) -> bool {
-            self.sources
-                .iter()
-                .zip(self.sources_with_trailing_slash.iter())
-                .any(|(source, with_slash)| {
-                    let as_bytes = other.as_unix_str().as_bytes();
-                    let with_slash = if source.ends_with('/') {
-                        source.as_bytes()
-                    } else {
-                        with_slash.as_bytes()
-                    };
-
-                    as_bytes.starts_with(with_slash) || as_bytes.ends_with(source.as_bytes())
-                })
-                || self.glob.is_match(other.as_std_path())
-                || self.check_with_end_separator(other)
-        }
-
-        fn check_with_end_separator(&self, path: &RelPath) -> bool {
-            let path_str = path.as_unix_str();
-            let separator = "/";
-            if path_str.ends_with(separator) {
-                false
-            } else {
-                self.glob.is_match(path_str.to_string() + separator)
-            }
-        }
-    }
-}
-
-pub fn append_buffer_to_output(
-    buffer: &BufferSnapshot,
-    path: Option<&str>,
-    output: &mut SlashCommandOutput,
-) -> Result<()> {
-    let prev_len = output.text.len();
-
-    let mut content = buffer.text();
-    LineEnding::normalize(&mut content);
-    output.text.push_str(&codeblock_fence_for_path(path, None));
-    output.text.push_str(&content);
-    if !output.text.ends_with('\n') {
-        output.text.push('\n');
-    }
-    output.text.push_str("```");
-    output.text.push('\n');
-
-    let section_ix = output.sections.len();
-    output.sections.insert(
-        section_ix,
-        build_entry_output_section(prev_len..output.text.len(), path, false, None),
-    );
-
-    output.text.push('\n');
-
-    Ok(())
-}
-
-#[cfg(test)]
-mod test {
-    use assistant_slash_command::SlashCommandOutput;
-    use fs::FakeFs;
-    use gpui::TestAppContext;
-    use pretty_assertions::assert_eq;
-    use project::Project;
-    use serde_json::json;
-    use settings::SettingsStore;
-    use smol::stream::StreamExt;
-    use util::path;
-
-    use super::collect_files;
-
-    pub fn init_test(cx: &mut gpui::TestAppContext) {
-        zlog::init_test();
-
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-            // release_channel::init(SemanticVersion::default(), cx);
-        });
-    }
-
-    #[gpui::test]
-    async fn test_file_exact_matching(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        fs.insert_tree(
-            path!("/root"),
-            json!({
-                "dir": {
-                    "subdir": {
-                       "file_0": "0"
-                    },
-                    "file_1": "1",
-                    "file_2": "2",
-                    "file_3": "3",
-                },
-                "dir.rs": "4"
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs, [path!("/root").as_ref()], cx).await;
-
-        let result_1 =
-            cx.update(|cx| collect_files(project.clone(), &["root/dir".to_string()], cx));
-        let result_1 = SlashCommandOutput::from_event_stream(result_1.boxed())
-            .await
-            .unwrap();
-
-        assert!(result_1.text.starts_with(path!("root/dir")));
-        // 4 files + 2 directories
-        assert_eq!(result_1.sections.len(), 6);
-
-        let result_2 =
-            cx.update(|cx| collect_files(project.clone(), &["root/dir/".to_string()], cx));
-        let result_2 = SlashCommandOutput::from_event_stream(result_2.boxed())
-            .await
-            .unwrap();
-
-        assert_eq!(result_1, result_2);
-
-        let result =
-            cx.update(|cx| collect_files(project.clone(), &["root/dir*".to_string()], cx).boxed());
-        let result = SlashCommandOutput::from_event_stream(result).await.unwrap();
-
-        assert!(result.text.starts_with(path!("root/dir")));
-        // 5 files + 2 directories
-        assert_eq!(result.sections.len(), 7);
-
-        // Ensure that the project lasts until after the last await
-        drop(project);
-    }
-
-    #[gpui::test]
-    async fn test_file_sub_directory_rendering(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        fs.insert_tree(
-            path!("/zed"),
-            json!({
-                "assets": {
-                    "dir1": {
-                        ".gitkeep": ""
-                    },
-                    "dir2": {
-                        ".gitkeep": ""
-                    },
-                    "themes": {
-                        "ayu": {
-                            "LICENSE": "1",
-                        },
-                        "andromeda": {
-                            "LICENSE": "2",
-                        },
-                        "summercamp": {
-                            "LICENSE": "3",
-                        },
-                    },
-                },
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs, [path!("/zed").as_ref()], cx).await;
-
-        let result =
-            cx.update(|cx| collect_files(project.clone(), &["zed/assets/themes".to_string()], cx));
-        let result = SlashCommandOutput::from_event_stream(result.boxed())
-            .await
-            .unwrap();
-
-        // Sanity check
-        assert!(result.text.starts_with(path!("zed/assets/themes\n")));
-        assert_eq!(result.sections.len(), 7);
-
-        // Ensure that full file paths are included in the real output
-        assert!(
-            result
-                .text
-                .contains(path!("zed/assets/themes/andromeda/LICENSE"))
-        );
-        assert!(result.text.contains(path!("zed/assets/themes/ayu/LICENSE")));
-        assert!(
-            result
-                .text
-                .contains(path!("zed/assets/themes/summercamp/LICENSE"))
-        );
-
-        assert_eq!(result.sections[5].label, "summercamp");
-
-        // Ensure that things are in descending order, with properly relativized paths
-        assert_eq!(
-            result.sections[0].label,
-            path!("zed/assets/themes/andromeda/LICENSE")
-        );
-        assert_eq!(result.sections[1].label, "andromeda");
-        assert_eq!(
-            result.sections[2].label,
-            path!("zed/assets/themes/ayu/LICENSE")
-        );
-        assert_eq!(result.sections[3].label, "ayu");
-        assert_eq!(
-            result.sections[4].label,
-            path!("zed/assets/themes/summercamp/LICENSE")
-        );
-
-        // Ensure that the project lasts until after the last await
-        drop(project);
-    }
-
-    #[gpui::test]
-    async fn test_file_deep_sub_directory_rendering(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        fs.insert_tree(
-            path!("/zed"),
-            json!({
-                "assets": {
-                    "themes": {
-                        "LICENSE": "1",
-                        "summercamp": {
-                            "LICENSE": "1",
-                            "subdir": {
-                                "LICENSE": "1",
-                                "subsubdir": {
-                                    "LICENSE": "3",
-                                }
-                            }
-                        },
-                    },
-                },
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs, [path!("/zed").as_ref()], cx).await;
-
-        let result =
-            cx.update(|cx| collect_files(project.clone(), &["zed/assets/themes".to_string()], cx));
-        let result = SlashCommandOutput::from_event_stream(result.boxed())
-            .await
-            .unwrap();
-
-        assert!(result.text.starts_with(path!("zed/assets/themes\n")));
-        assert_eq!(result.sections[0].label, path!("zed/assets/themes/LICENSE"));
-        assert_eq!(
-            result.sections[1].label,
-            path!("zed/assets/themes/summercamp/LICENSE")
-        );
-        assert_eq!(
-            result.sections[2].label,
-            path!("zed/assets/themes/summercamp/subdir/LICENSE")
-        );
-        assert_eq!(
-            result.sections[3].label,
-            path!("zed/assets/themes/summercamp/subdir/subsubdir/LICENSE")
-        );
-        assert_eq!(result.sections[4].label, "subsubdir");
-        assert_eq!(result.sections[5].label, "subdir");
-        assert_eq!(result.sections[6].label, "summercamp");
-        assert_eq!(result.sections[7].label, path!("zed/assets/themes"));
-
-        assert_eq!(
-            result.text,
-            path!(
-                "zed/assets/themes\n```zed/assets/themes/LICENSE\n1\n```\n\nsummercamp\n```zed/assets/themes/summercamp/LICENSE\n1\n```\n\nsubdir\n```zed/assets/themes/summercamp/subdir/LICENSE\n1\n```\n\nsubsubdir\n```zed/assets/themes/summercamp/subdir/subsubdir/LICENSE\n3\n```\n\n"
-            )
-        );
-
-        // Ensure that the project lasts until after the last await
-        drop(project);
-    }
-}
diff --git a/crates/assistant_slash_commands/src/now_command.rs b/crates/assistant_slash_commands/src/now_command.rs
deleted file mode 100644
index aec21e7173..0000000000
--- a/crates/assistant_slash_commands/src/now_command.rs
+++ /dev/null
@@ -1,71 +0,0 @@
-use std::sync::Arc;
-use std::sync::atomic::AtomicBool;
-
-use anyhow::Result;
-use assistant_slash_command::{
-    ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
-    SlashCommandResult,
-};
-use chrono::Local;
-use gpui::{Task, WeakEntity};
-use language::{BufferSnapshot, LspAdapterDelegate};
-use ui::prelude::*;
-use workspace::Workspace;
-
-pub struct NowSlashCommand;
-
-impl SlashCommand for NowSlashCommand {
-    fn name(&self) -> String {
-        "now".into()
-    }
-
-    fn description(&self) -> String {
-        "Insert current date and time".into()
-    }
-
-    fn menu_text(&self) -> String {
-        self.description()
-    }
-
-    fn requires_argument(&self) -> bool {
-        false
-    }
-
-    fn complete_argument(
-        self: Arc<Self>,
-        _arguments: &[String],
-        _cancel: Arc<AtomicBool>,
-        _workspace: Option<WeakEntity<Workspace>>,
-        _window: &mut Window,
-        _cx: &mut App,
-    ) -> Task<Result<Vec<ArgumentCompletion>>> {
-        Task::ready(Ok(Vec::new()))
-    }
-
-    fn run(
-        self: Arc<Self>,
-        _arguments: &[String],
-        _context_slash_command_output_sections: &[SlashCommandOutputSection<language::Anchor>],
-        _context_buffer: BufferSnapshot,
-        _workspace: WeakEntity<Workspace>,
-        _delegate: Option<Arc<dyn LspAdapterDelegate>>,
-        _window: &mut Window,
-        _cx: &mut App,
-    ) -> Task<SlashCommandResult> {
-        let now = Local::now();
-        let text = format!("Today is {now}.", now = now.to_rfc2822());
-        let range = 0..text.len();
-
-        Task::ready(Ok(SlashCommandOutput {
-            text,
-            sections: vec![SlashCommandOutputSection {
-                range,
-                icon: IconName::CountdownTimer,
-                label: now.to_rfc2822().into(),
-                metadata: None,
-            }],
-            run_commands_in_text: false,
-        }
-        .into_event_stream()))
-    }
-}
diff --git a/crates/assistant_slash_commands/src/prompt_command.rs b/crates/assistant_slash_commands/src/prompt_command.rs
deleted file mode 100644
index bbd6d3e3ad..0000000000
--- a/crates/assistant_slash_commands/src/prompt_command.rs
+++ /dev/null
@@ -1,123 +0,0 @@
-use anyhow::{Context as _, Result, anyhow};
-use assistant_slash_command::{
-    ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
-    SlashCommandResult,
-};
-use gpui::{Task, WeakEntity};
-use language::{BufferSnapshot, LspAdapterDelegate};
-use prompt_store::{PromptMetadata, PromptStore};
-use std::sync::{Arc, atomic::AtomicBool};
-use ui::prelude::*;
-use workspace::Workspace;
-
-pub struct PromptSlashCommand;
-
-impl SlashCommand for PromptSlashCommand {
-    fn name(&self) -> String {
-        "prompt".into()
-    }
-
-    fn description(&self) -> String {
-        "Insert prompt from library".into()
-    }
-
-    fn icon(&self) -> IconName {
-        IconName::Library
-    }
-
-    fn menu_text(&self) -> String {
-        self.description()
-    }
-
-    fn requires_argument(&self) -> bool {
-        true
-    }
-
-    fn complete_argument(
-        self: Arc<Self>,
-        arguments: &[String],
-        _cancellation_flag: Arc<AtomicBool>,
-        _workspace: Option<WeakEntity<Workspace>>,
-        _: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<Vec<ArgumentCompletion>>> {
-        let store = PromptStore::global(cx);
-        let query = arguments.to_owned().join(" ");
-        cx.spawn(async move |cx| {
-            let cancellation_flag = Arc::new(AtomicBool::default());
-            let prompts: Vec<PromptMetadata> = store
-                .await?
-                .read_with(cx, |store, cx| store.search(query, cancellation_flag, cx))?
-                .await;
-            Ok(prompts
-                .into_iter()
-                .filter_map(|prompt| {
-                    let prompt_title = prompt.title?.to_string();
-                    Some(ArgumentCompletion {
-                        label: prompt_title.clone().into(),
-                        new_text: prompt_title,
-                        after_completion: true.into(),
-                        replace_previous_arguments: true,
-                    })
-                })
-                .collect())
-        })
-    }
-
-    fn run(
-        self: Arc<Self>,
-        arguments: &[String],
-        _context_slash_command_output_sections: &[SlashCommandOutputSection<language::Anchor>],
-        _context_buffer: BufferSnapshot,
-        _workspace: WeakEntity<Workspace>,
-        _delegate: Option<Arc<dyn LspAdapterDelegate>>,
-        _: &mut Window,
-        cx: &mut App,
-    ) -> Task<SlashCommandResult> {
-        let title = arguments.to_owned().join(" ");
-        if title.trim().is_empty() {
-            return Task::ready(Err(anyhow!("missing prompt name")));
-        };
-
-        let store = PromptStore::global(cx);
-        let title = SharedString::from(title);
-        let prompt = cx.spawn({
-            let title = title.clone();
-            async move |cx| {
-                let store = store.await?;
-                let body = store
-                    .read_with(cx, |store, cx| {
-                        let prompt_id = store
-                            .id_for_title(&title)
-                            .with_context(|| format!("no prompt found with title {:?}", title))?;
-                        anyhow::Ok(store.load(prompt_id, cx))
-                    })??
-                    .await?;
-                anyhow::Ok(body)
-            }
-        });
-        cx.foreground_executor().spawn(async move {
-            let mut prompt = prompt.await?;
-
-            if prompt.starts_with('/') {
-                // Prevent an edge case where the inserted prompt starts with a slash command (that leads to funky rendering).
-                prompt.insert(0, '\n');
-            }
-            if prompt.is_empty() {
-                prompt.push('\n');
-            }
-            let range = 0..prompt.len();
-            Ok(SlashCommandOutput {
-                text: prompt,
-                sections: vec![SlashCommandOutputSection {
-                    range,
-                    icon: IconName::Library,
-                    label: title,
-                    metadata: None,
-                }],
-                run_commands_in_text: true,
-            }
-            .into_event_stream())
-        })
-    }
-}
diff --git a/crates/assistant_slash_commands/src/selection_command.rs b/crates/assistant_slash_commands/src/selection_command.rs
deleted file mode 100644
index ce6c0b9314..0000000000
--- a/crates/assistant_slash_commands/src/selection_command.rs
+++ /dev/null
@@ -1,202 +0,0 @@
-use anyhow::{Result, anyhow};
-use assistant_slash_command::{
-    ArgumentCompletion, SlashCommand, SlashCommandContent, SlashCommandEvent,
-    SlashCommandOutputSection, SlashCommandResult,
-};
-use editor::{Editor, MultiBufferSnapshot};
-use futures::StreamExt;
-use gpui::{App, SharedString, Task, WeakEntity, Window};
-use language::{BufferSnapshot, CodeLabel, LspAdapterDelegate};
-use rope::Point;
-use std::ops::Range;
-use std::sync::Arc;
-use std::sync::atomic::AtomicBool;
-use ui::IconName;
-use workspace::Workspace;
-
-use crate::file_command::codeblock_fence_for_path;
-
-pub struct SelectionCommand;
-
-impl SlashCommand for SelectionCommand {
-    fn name(&self) -> String {
-        "selection".into()
-    }
-
-    fn label(&self, _cx: &App) -> CodeLabel {
-        CodeLabel::plain(self.name(), None)
-    }
-
-    fn description(&self) -> String {
-        "Insert editor selection".into()
-    }
-
-    fn icon(&self) -> IconName {
-        IconName::Quote
-    }
-
-    fn menu_text(&self) -> String {
-        self.description()
-    }
-
-    fn requires_argument(&self) -> bool {
-        false
-    }
-
-    fn accepts_arguments(&self) -> bool {
-        true
-    }
-
-    fn complete_argument(
-        self: Arc<Self>,
-        _arguments: &[String],
-        _cancel: Arc<AtomicBool>,
-        _workspace: Option<WeakEntity<Workspace>>,
-        _window: &mut Window,
-        _cx: &mut App,
-    ) -> Task<Result<Vec<ArgumentCompletion>>> {
-        Task::ready(Err(anyhow!("this command does not require argument")))
-    }
-
-    fn run(
-        self: Arc<Self>,
-        _arguments: &[String],
-        _context_slash_command_output_sections: &[SlashCommandOutputSection<language::Anchor>],
-        _context_buffer: BufferSnapshot,
-        workspace: WeakEntity<Workspace>,
-        _delegate: Option<Arc<dyn LspAdapterDelegate>>,
-        _window: &mut Window,
-        cx: &mut App,
-    ) -> Task<SlashCommandResult> {
-        let mut events = vec![];
-
-        let Some(creases) = workspace
-            .update(cx, |workspace, cx| {
-                let editor = workspace
-                    .active_item(cx)
-                    .and_then(|item| item.act_as::<Editor>(cx))?;
-
-                editor.update(cx, |editor, cx| {
-                    let selection_ranges = editor
-                        .selections
-                        .all_adjusted(&editor.display_snapshot(cx))
-                        .iter()
-                        .map(|selection| selection.range())
-                        .collect::<Vec<_>>();
-                    let snapshot = editor.buffer().read(cx).snapshot(cx);
-                    Some(selections_creases(selection_ranges, snapshot, cx))
-                })
-            })
-            .unwrap_or_else(|e| {
-                events.push(Err(e));
-                None
-            })
-        else {
-            return Task::ready(Err(anyhow!("no active selection")));
-        };
-
-        for (text, title) in creases {
-            events.push(Ok(SlashCommandEvent::StartSection {
-                icon: IconName::TextSnippet,
-                label: SharedString::from(title),
-                metadata: None,
-            }));
-            events.push(Ok(SlashCommandEvent::Content(SlashCommandContent::Text {
-                text,
-                run_commands_in_text: false,
-            })));
-            events.push(Ok(SlashCommandEvent::EndSection));
-            events.push(Ok(SlashCommandEvent::Content(SlashCommandContent::Text {
-                text: "\n".to_string(),
-                run_commands_in_text: false,
-            })));
-        }
-
-        let result = futures::stream::iter(events).boxed();
-
-        Task::ready(Ok(result))
-    }
-}
-
-pub fn selections_creases(
-    selection_ranges: Vec<Range<Point>>,
-    snapshot: MultiBufferSnapshot,
-    cx: &App,
-) -> Vec<(String, String)> {
-    let mut creases = Vec::new();
-    for range in selection_ranges {
-        let selected_text = snapshot.text_for_range(range.clone()).collect::<String>();
-        if selected_text.is_empty() {
-            continue;
-        }
-        let start_language = snapshot.language_at(range.start);
-        let end_language = snapshot.language_at(range.end);
-        let language_name = if start_language == end_language {
-            start_language.map(|language| language.code_fence_block_name())
-        } else {
-            None
-        };
-        let language_name = language_name.as_deref().unwrap_or("");
-        let filename = snapshot
-            .file_at(range.start)
-            .map(|file| file.full_path(cx).to_string_lossy().into_owned());
-        let text = if language_name == "markdown" {
-            selected_text
-                .lines()
-                .map(|line| format!("> {}", line))
-                .collect::<Vec<_>>()
-                .join("\n")
-        } else {
-            let start_symbols = snapshot
-                .symbols_containing(range.start, None)
-                .map(|(_, symbols)| symbols);
-            let end_symbols = snapshot
-                .symbols_containing(range.end, None)
-                .map(|(_, symbols)| symbols);
-
-            let outline_text =
-                if let Some((start_symbols, end_symbols)) = start_symbols.zip(end_symbols) {
-                    Some(
-                        start_symbols
-                            .into_iter()
-                            .zip(end_symbols)
-                            .take_while(|(a, b)| a == b)
-                            .map(|(a, _)| a.text)
-                            .collect::<Vec<_>>()
-                            .join(" > "),
-                    )
-                } else {
-                    None
-                };
-
-            let line_comment_prefix = start_language
-                .and_then(|l| l.default_scope().line_comment_prefixes().first().cloned());
-
-            let fence = codeblock_fence_for_path(
-                filename.as_deref(),
-                Some(range.start.row..=range.end.row),
-            );
-
-            if let Some((line_comment_prefix, outline_text)) = line_comment_prefix.zip(outline_text)
-            {
-                let breadcrumb = format!("{line_comment_prefix}Excerpt from: {outline_text}\n");
-                format!("{fence}{breadcrumb}{selected_text}\n```")
-            } else {
-                format!("{fence}{selected_text}\n```")
-            }
-        };
-        let crease_title = if let Some(path) = filename {
-            let start_line = range.start.row + 1;
-            let end_line = range.end.row + 1;
-            if start_line == end_line {
-                format!("{path}, Line {start_line}")
-            } else {
-                format!("{path}, Lines {start_line} to {end_line}")
-            }
-        } else {
-            "Quoted selection".to_string()
-        };
-        creases.push((text, crease_title));
-    }
-    creases
-}
diff --git a/crates/assistant_slash_commands/src/streaming_example_command.rs b/crates/assistant_slash_commands/src/streaming_example_command.rs
deleted file mode 100644
index 3f56613bc2..0000000000
--- a/crates/assistant_slash_commands/src/streaming_example_command.rs
+++ /dev/null
@@ -1,118 +0,0 @@
-use std::sync::Arc;
-use std::sync::atomic::AtomicBool;
-use std::time::Duration;
-
-use anyhow::Result;
-use assistant_slash_command::{
-    ArgumentCompletion, SlashCommand, SlashCommandContent, SlashCommandEvent,
-    SlashCommandOutputSection, SlashCommandResult,
-};
-use feature_flags::FeatureFlag;
-use futures::channel::mpsc;
-use gpui::{Task, WeakEntity};
-use language::{BufferSnapshot, LspAdapterDelegate};
-use smol::Timer;
-use smol::stream::StreamExt;
-use ui::prelude::*;
-use workspace::Workspace;
-
-pub struct StreamingExampleSlashCommandFeatureFlag;
-
-impl FeatureFlag for StreamingExampleSlashCommandFeatureFlag {
-    const NAME: &'static str = "streaming-example-slash-command";
-}
-
-pub struct StreamingExampleSlashCommand;
-
-impl SlashCommand for StreamingExampleSlashCommand {
-    fn name(&self) -> String {
-        "streaming-example".into()
-    }
-
-    fn description(&self) -> String {
-        "An example slash command that showcases streaming.".into()
-    }
-
-    fn menu_text(&self) -> String {
-        self.description()
-    }
-
-    fn requires_argument(&self) -> bool {
-        false
-    }
-
-    fn complete_argument(
-        self: Arc<Self>,
-        _arguments: &[String],
-        _cancel: Arc<AtomicBool>,
-        _workspace: Option<WeakEntity<Workspace>>,
-        _window: &mut Window,
-        _cx: &mut App,
-    ) -> Task<Result<Vec<ArgumentCompletion>>> {
-        Task::ready(Ok(Vec::new()))
-    }
-
-    fn run(
-        self: Arc<Self>,
-        _arguments: &[String],
-        _context_slash_command_output_sections: &[SlashCommandOutputSection<language::Anchor>],
-        _context_buffer: BufferSnapshot,
-        _workspace: WeakEntity<Workspace>,
-        _delegate: Option<Arc<dyn LspAdapterDelegate>>,
-        _: &mut Window,
-        cx: &mut App,
-    ) -> Task<SlashCommandResult> {
-        let (events_tx, events_rx) = mpsc::unbounded();
-        cx.background_spawn(async move {
-            events_tx.unbounded_send(Ok(SlashCommandEvent::StartSection {
-                icon: IconName::FileRust,
-                label: "Section 1".into(),
-                metadata: None,
-            }))?;
-            events_tx.unbounded_send(Ok(SlashCommandEvent::Content(
-                SlashCommandContent::Text {
-                    text: "Hello".into(),
-                    run_commands_in_text: false,
-                },
-            )))?;
-            events_tx.unbounded_send(Ok(SlashCommandEvent::EndSection))?;
-
-            Timer::after(Duration::from_secs(1)).await;
-
-            events_tx.unbounded_send(Ok(SlashCommandEvent::StartSection {
-                icon: IconName::FileRust,
-                label: "Section 2".into(),
-                metadata: None,
-            }))?;
-            events_tx.unbounded_send(Ok(SlashCommandEvent::Content(
-                SlashCommandContent::Text {
-                    text: "World".into(),
-                    run_commands_in_text: false,
-                },
-            )))?;
-            events_tx.unbounded_send(Ok(SlashCommandEvent::EndSection))?;
-
-            for n in 1..=10 {
-                Timer::after(Duration::from_secs(1)).await;
-
-                events_tx.unbounded_send(Ok(SlashCommandEvent::StartSection {
-                    icon: IconName::StarFilled,
-                    label: format!("Section {n}").into(),
-                    metadata: None,
-                }))?;
-                events_tx.unbounded_send(Ok(SlashCommandEvent::Content(
-                    SlashCommandContent::Text {
-                        text: "lorem ipsum ".repeat(n).trim().into(),
-                        run_commands_in_text: false,
-                    },
-                )))?;
-                events_tx.unbounded_send(Ok(SlashCommandEvent::EndSection))?;
-            }
-
-            anyhow::Ok(())
-        })
-        .detach_and_log_err(cx);
-
-        Task::ready(Ok(events_rx.boxed()))
-    }
-}
diff --git a/crates/assistant_slash_commands/src/symbols_command.rs b/crates/assistant_slash_commands/src/symbols_command.rs
deleted file mode 100644
index c537ced296..0000000000
--- a/crates/assistant_slash_commands/src/symbols_command.rs
+++ /dev/null
@@ -1,99 +0,0 @@
-use anyhow::{Result, anyhow};
-use assistant_slash_command::{
-    ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
-    SlashCommandResult,
-};
-use editor::Editor;
-use gpui::{AppContext as _, Task, WeakEntity};
-use language::{BufferSnapshot, LspAdapterDelegate};
-use std::sync::Arc;
-use std::sync::atomic::AtomicBool;
-use ui::{App, IconName, SharedString, Window};
-use workspace::Workspace;
-
-pub struct OutlineSlashCommand;
-
-impl SlashCommand for OutlineSlashCommand {
-    fn name(&self) -> String {
-        "symbols".into()
-    }
-
-    fn description(&self) -> String {
-        "Insert symbols for active tab".into()
-    }
-
-    fn icon(&self) -> IconName {
-        IconName::ListTree
-    }
-
-    fn menu_text(&self) -> String {
-        self.description()
-    }
-
-    fn complete_argument(
-        self: Arc<Self>,
-        _arguments: &[String],
-        _cancel: Arc<AtomicBool>,
-        _workspace: Option<WeakEntity<Workspace>>,
-        _window: &mut Window,
-        _cx: &mut App,
-    ) -> Task<Result<Vec<ArgumentCompletion>>> {
-        Task::ready(Err(anyhow!("this command does not require argument")))
-    }
-
-    fn requires_argument(&self) -> bool {
-        false
-    }
-
-    fn run(
-        self: Arc<Self>,
-        _arguments: &[String],
-        _context_slash_command_output_sections: &[SlashCommandOutputSection<language::Anchor>],
-        _context_buffer: BufferSnapshot,
-        workspace: WeakEntity<Workspace>,
-        _delegate: Option<Arc<dyn LspAdapterDelegate>>,
-        _: &mut Window,
-        cx: &mut App,
-    ) -> Task<SlashCommandResult> {
-        let output = workspace.update(cx, |workspace, cx| {
-            let Some(active_item) = workspace.active_item(cx) else {
-                return Task::ready(Err(anyhow!("no active tab")));
-            };
-            let Some(buffer) = active_item
-                .downcast::<Editor>()
-                .and_then(|editor| editor.read(cx).buffer().read(cx).as_singleton())
-            else {
-                return Task::ready(Err(anyhow!("active tab is not an editor")));
-            };
-
-            let snapshot = buffer.read(cx).snapshot();
-            let path = snapshot.resolve_file_path(true, cx);
-
-            cx.background_spawn(async move {
-                let outline = snapshot.outline(None);
-
-                let path = path.as_deref().unwrap_or("untitled");
-                let mut outline_text = format!("Symbols for {path}:\n");
-                for item in &outline.path_candidates {
-                    outline_text.push_str("- ");
-                    outline_text.push_str(&item.string);
-                    outline_text.push('\n');
-                }
-
-                Ok(SlashCommandOutput {
-                    sections: vec![SlashCommandOutputSection {
-                        range: 0..outline_text.len(),
-                        icon: IconName::ListTree,
-                        label: SharedString::new(path),
-                        metadata: None,
-                    }],
-                    text: outline_text,
-                    run_commands_in_text: false,
-                }
-                .into_event_stream())
-            })
-        });
-
-        output.unwrap_or_else(|error| Task::ready(Err(error)))
-    }
-}
diff --git a/crates/assistant_slash_commands/src/tab_command.rs b/crates/assistant_slash_commands/src/tab_command.rs
deleted file mode 100644
index a4c0ad412c..0000000000
--- a/crates/assistant_slash_commands/src/tab_command.rs
+++ /dev/null
@@ -1,317 +0,0 @@
-use anyhow::{Context as _, Result};
-use assistant_slash_command::{
-    ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
-    SlashCommandResult,
-};
-use collections::{HashMap, HashSet};
-use editor::Editor;
-use futures::future::join_all;
-use gpui::{Task, WeakEntity};
-use language::{BufferSnapshot, CodeLabel, CodeLabelBuilder, HighlightId, LspAdapterDelegate};
-use std::sync::{Arc, atomic::AtomicBool};
-use ui::{ActiveTheme, App, Window, prelude::*};
-use util::{ResultExt, paths::PathStyle};
-use workspace::Workspace;
-
-use crate::file_command::append_buffer_to_output;
-
-pub struct TabSlashCommand;
-
-const ALL_TABS_COMPLETION_ITEM: &str = "all";
-
-impl SlashCommand for TabSlashCommand {
-    fn name(&self) -> String {
-        "tab".into()
-    }
-
-    fn description(&self) -> String {
-        "Insert open tabs (active tab by default)".to_owned()
-    }
-
-    fn icon(&self) -> IconName {
-        IconName::FileTree
-    }
-
-    fn menu_text(&self) -> String {
-        self.description()
-    }
-
-    fn requires_argument(&self) -> bool {
-        false
-    }
-
-    fn accepts_arguments(&self) -> bool {
-        true
-    }
-
-    fn complete_argument(
-        self: Arc<Self>,
-        arguments: &[String],
-        cancel: Arc<AtomicBool>,
-        workspace: Option<WeakEntity<Workspace>>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<Vec<ArgumentCompletion>>> {
-        let mut has_all_tabs_completion_item = false;
-        let argument_set = arguments
-            .iter()
-            .filter(|argument| {
-                if has_all_tabs_completion_item || ALL_TABS_COMPLETION_ITEM == argument.as_str() {
-                    has_all_tabs_completion_item = true;
-                    false
-                } else {
-                    true
-                }
-            })
-            .cloned()
-            .collect::<HashSet<_>>();
-        if has_all_tabs_completion_item {
-            return Task::ready(Ok(Vec::new()));
-        }
-
-        let Some(workspace) = workspace.and_then(|workspace| workspace.upgrade()) else {
-            return Task::ready(Err(anyhow::anyhow!("no workspace")));
-        };
-
-        let active_item_path = workspace.update(cx, |workspace, cx| {
-            let snapshot = active_item_buffer(workspace, cx).ok()?;
-            snapshot.resolve_file_path(true, cx)
-        });
-        let path_style = workspace.read(cx).path_style(cx);
-
-        let current_query = arguments.last().cloned().unwrap_or_default();
-        let tab_items_search = tab_items_for_queries(
-            Some(workspace.downgrade()),
-            &[current_query],
-            cancel,
-            false,
-            window,
-            cx,
-        );
-
-        let comment_id = cx.theme().syntax().highlight_id("comment").map(HighlightId);
-        window.spawn(cx, async move |_| {
-            let tab_items = tab_items_search.await?;
-            let run_command = tab_items.len() == 1;
-            let tab_completion_items = tab_items.into_iter().filter_map(|(path, ..)| {
-                let path = path?;
-                if argument_set.contains(&path) {
-                    return None;
-                }
-                if active_item_path.as_ref() == Some(&path) {
-                    return None;
-                }
-                let label = create_tab_completion_label(&path, path_style, comment_id);
-                Some(ArgumentCompletion {
-                    label,
-                    new_text: path,
-                    replace_previous_arguments: false,
-                    after_completion: run_command.into(),
-                })
-            });
-
-            let active_item_completion = active_item_path
-                .as_deref()
-                .map(|active_item_path| {
-                    let path_string = active_item_path.to_string();
-                    let label =
-                        create_tab_completion_label(active_item_path, path_style, comment_id);
-                    ArgumentCompletion {
-                        label,
-                        new_text: path_string,
-                        replace_previous_arguments: false,
-                        after_completion: run_command.into(),
-                    }
-                })
-                .filter(|completion| !argument_set.contains(&completion.new_text));
-
-            Ok(active_item_completion
-                .into_iter()
-                .chain(Some(ArgumentCompletion {
-                    label: ALL_TABS_COMPLETION_ITEM.into(),
-                    new_text: ALL_TABS_COMPLETION_ITEM.to_owned(),
-                    replace_previous_arguments: false,
-                    after_completion: true.into(),
-                }))
-                .chain(tab_completion_items)
-                .collect())
-        })
-    }
-
-    fn run(
-        self: Arc<Self>,
-        arguments: &[String],
-        _context_slash_command_output_sections: &[SlashCommandOutputSection<language::Anchor>],
-        _context_buffer: BufferSnapshot,
-        workspace: WeakEntity<Workspace>,
-        _delegate: Option<Arc<dyn LspAdapterDelegate>>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<SlashCommandResult> {
-        let tab_items_search = tab_items_for_queries(
-            Some(workspace),
-            arguments,
-            Arc::new(AtomicBool::new(false)),
-            true,
-            window,
-            cx,
-        );
-
-        cx.background_spawn(async move {
-            let mut output = SlashCommandOutput::default();
-            for (full_path, buffer, _) in tab_items_search.await? {
-                append_buffer_to_output(&buffer, full_path.as_deref(), &mut output).log_err();
-            }
-            Ok(output.into_event_stream())
-        })
-    }
-}
-
-fn tab_items_for_queries(
-    workspace: Option<WeakEntity<Workspace>>,
-    queries: &[String],
-    cancel: Arc<AtomicBool>,
-    strict_match: bool,
-    window: &mut Window,
-    cx: &mut App,
-) -> Task<anyhow::Result<Vec<(Option<String>, BufferSnapshot, usize)>>> {
-    let empty_query = queries.is_empty() || queries.iter().all(|query| query.trim().is_empty());
-    let queries = queries.to_owned();
-    window.spawn(cx, async move |cx| {
-        let mut open_buffers =
-            workspace
-                .context("no workspace")?
-                .update(cx, |workspace, cx| {
-                    if strict_match && empty_query {
-                        let snapshot = active_item_buffer(workspace, cx)?;
-                        let full_path = snapshot.resolve_file_path(true, cx);
-                        return anyhow::Ok(vec![(full_path, snapshot, 0)]);
-                    }
-
-                    let mut timestamps_by_entity_id = HashMap::default();
-                    let mut visited_buffers = HashSet::default();
-                    let mut open_buffers = Vec::new();
-
-                    for pane in workspace.panes() {
-                        let pane = pane.read(cx);
-                        for entry in pane.activation_history() {
-                            timestamps_by_entity_id.insert(entry.entity_id, entry.timestamp);
-                        }
-                    }
-
-                    for editor in workspace.items_of_type::<Editor>(cx) {
-                        if let Some(buffer) = editor.read(cx).buffer().read(cx).as_singleton()
-                            && let Some(timestamp) =
-                                timestamps_by_entity_id.get(&editor.entity_id())
-                            && visited_buffers.insert(buffer.read(cx).remote_id())
-                        {
-                            let snapshot = buffer.read(cx).snapshot();
-                            let full_path = snapshot.resolve_file_path(true, cx);
-                            open_buffers.push((full_path, snapshot, *timestamp));
-                        }
-                    }
-
-                    Ok(open_buffers)
-                })??;
-
-        let background_executor = cx.background_executor().clone();
-        cx.background_spawn(async move {
-            open_buffers.sort_by_key(|(_, _, timestamp)| *timestamp);
-            if empty_query
-                || queries
-                    .iter()
-                    .any(|query| query == ALL_TABS_COMPLETION_ITEM)
-            {
-                return Ok(open_buffers);
-            }
-
-            let matched_items = if strict_match {
-                let match_candidates = open_buffers
-                    .iter()
-                    .enumerate()
-                    .filter_map(|(id, (full_path, ..))| Some((id, full_path.clone()?)))
-                    .fold(HashMap::default(), |mut candidates, (id, path_string)| {
-                        candidates
-                            .entry(path_string)
-                            .or_insert_with(Vec::new)
-                            .push(id);
-                        candidates
-                    });
-
-                queries
-                    .iter()
-                    .filter_map(|query| match_candidates.get(query))
-                    .flatten()
-                    .copied()
-                    .filter_map(|id| open_buffers.get(id))
-                    .cloned()
-                    .collect()
-            } else {
-                let match_candidates = open_buffers
-                    .iter()
-                    .enumerate()
-                    .filter_map(|(id, (full_path, ..))| {
-                        Some(fuzzy::StringMatchCandidate::new(id, full_path.as_ref()?))
-                    })
-                    .collect::<Vec<_>>();
-                let mut processed_matches = HashSet::default();
-                let file_queries = queries.iter().map(|query| {
-                    fuzzy::match_strings(
-                        &match_candidates,
-                        query,
-                        true,
-                        true,
-                        usize::MAX,
-                        &cancel,
-                        background_executor.clone(),
-                    )
-                });
-
-                join_all(file_queries)
-                    .await
-                    .into_iter()
-                    .flatten()
-                    .filter(|string_match| processed_matches.insert(string_match.candidate_id))
-                    .filter_map(|string_match| open_buffers.get(string_match.candidate_id))
-                    .cloned()
-                    .collect()
-            };
-            Ok(matched_items)
-        })
-        .await
-    })
-}
-
-fn active_item_buffer(
-    workspace: &mut Workspace,
-    cx: &mut Context<Workspace>,
-) -> anyhow::Result<BufferSnapshot> {
-    let active_editor = workspace
-        .active_item(cx)
-        .context("no active item")?
-        .downcast::<Editor>()
-        .context("active item is not an editor")?;
-    let snapshot = active_editor
-        .read(cx)
-        .buffer()
-        .read(cx)
-        .as_singleton()
-        .context("active editor is not a singleton buffer")?
-        .read(cx)
-        .snapshot();
-    Ok(snapshot)
-}
-
-fn create_tab_completion_label(
-    path: &str,
-    path_style: PathStyle,
-    comment_id: Option<HighlightId>,
-) -> CodeLabel {
-    let (parent_path, file_name) = path_style.split(path);
-    let mut label = CodeLabelBuilder::default();
-    label.push_str(file_name, None);
-    label.push_str(" ", None);
-    label.push_str(parent_path.unwrap_or_default(), comment_id);
-    label.respan_filter_range(Some(file_name));
-    label.build()
-}
diff --git a/crates/assistant_text_thread/Cargo.toml b/crates/assistant_text_thread/Cargo.toml
deleted file mode 100644
index 7c8fcca3bf..0000000000
--- a/crates/assistant_text_thread/Cargo.toml
+++ /dev/null
@@ -1,63 +0,0 @@
-[package]
-name = "assistant_text_thread"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/assistant_text_thread.rs"
-
-[features]
-test-support = []
-
-[dependencies]
-agent_settings.workspace = true
-anyhow.workspace = true
-assistant_slash_command.workspace = true
-assistant_slash_commands.workspace = true
-chrono.workspace = true
-client.workspace = true
-clock.workspace = true
-cloud_llm_client.workspace = true
-collections.workspace = true
-context_server.workspace = true
-fs.workspace = true
-futures.workspace = true
-fuzzy.workspace = true
-gpui.workspace = true
-itertools.workspace = true
-language.workspace = true
-language_model.workspace = true
-log.workspace = true
-open_ai.workspace = true
-parking_lot.workspace = true
-paths.workspace = true
-project.workspace = true
-prompt_store.workspace = true
-proto.workspace = true
-regex.workspace = true
-rpc.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-smallvec.workspace = true
-smol.workspace = true
-telemetry_events.workspace = true
-text.workspace = true
-ui.workspace = true
-util.workspace = true
-uuid.workspace = true
-workspace.workspace = true
-zed_env_vars.workspace = true
-
-[dev-dependencies]
-indoc.workspace = true
-language_model = { workspace = true, features = ["test-support"] }
-pretty_assertions.workspace = true
-rand.workspace = true
-unindent.workspace = true
-workspace = { workspace = true, features = ["test-support"] }
diff --git a/crates/assistant_text_thread/LICENSE-GPL b/crates/assistant_text_thread/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/assistant_text_thread/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/assistant_text_thread/src/assistant_text_thread.rs b/crates/assistant_text_thread/src/assistant_text_thread.rs
deleted file mode 100644
index 7eab9800d5..0000000000
--- a/crates/assistant_text_thread/src/assistant_text_thread.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-#[cfg(test)]
-mod assistant_text_thread_tests;
-mod text_thread;
-mod text_thread_store;
-
-pub use crate::text_thread::*;
-pub use crate::text_thread_store::*;
-
-use client::Client;
-use gpui::App;
-use std::sync::Arc;
-
-pub fn init(client: Arc<Client>, _: &mut App) {
-    text_thread_store::init(&client.into());
-}
diff --git a/crates/assistant_text_thread/src/assistant_text_thread_tests.rs b/crates/assistant_text_thread/src/assistant_text_thread_tests.rs
deleted file mode 100644
index 0743641bf5..0000000000
--- a/crates/assistant_text_thread/src/assistant_text_thread_tests.rs
+++ /dev/null
@@ -1,1462 +0,0 @@
-use crate::{
-    CacheStatus, InvokedSlashCommandId, MessageCacheMetadata, MessageId, MessageStatus, TextThread,
-    TextThreadEvent, TextThreadId, TextThreadOperation, TextThreadSummary,
-};
-use anyhow::Result;
-use assistant_slash_command::{
-    ArgumentCompletion, SlashCommand, SlashCommandContent, SlashCommandEvent, SlashCommandOutput,
-    SlashCommandOutputSection, SlashCommandRegistry, SlashCommandResult, SlashCommandWorkingSet,
-};
-use assistant_slash_commands::FileSlashCommand;
-use collections::{HashMap, HashSet};
-use fs::FakeFs;
-use futures::{
-    channel::mpsc,
-    stream::{self, StreamExt},
-};
-use gpui::{App, Entity, SharedString, Task, TestAppContext, WeakEntity, prelude::*};
-use language::{Buffer, BufferSnapshot, LanguageRegistry, LspAdapterDelegate};
-use language_model::{
-    ConfiguredModel, LanguageModelCacheConfiguration, LanguageModelRegistry, Role,
-    fake_provider::{FakeLanguageModel, FakeLanguageModelProvider},
-};
-use parking_lot::Mutex;
-use pretty_assertions::assert_eq;
-use prompt_store::PromptBuilder;
-use rand::prelude::*;
-use serde_json::json;
-use settings::SettingsStore;
-use std::{
-    cell::RefCell,
-    env,
-    ops::Range,
-    path::Path,
-    rc::Rc,
-    sync::{Arc, atomic::AtomicBool},
-};
-use text::{ReplicaId, ToOffset, network::Network};
-use ui::{IconName, Window};
-use unindent::Unindent;
-use util::RandomCharIter;
-use workspace::Workspace;
-
-#[gpui::test]
-fn test_inserting_and_removing_messages(cx: &mut App) {
-    init_test(cx);
-
-    let registry = Arc::new(LanguageRegistry::test(cx.background_executor().clone()));
-    let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
-    let text_thread = cx.new(|cx| {
-        TextThread::local(
-            registry,
-            None,
-            None,
-            prompt_builder.clone(),
-            Arc::new(SlashCommandWorkingSet::default()),
-            cx,
-        )
-    });
-    let buffer = text_thread.read(cx).buffer().clone();
-
-    let message_1 = text_thread.read(cx).message_anchors[0].clone();
-    assert_eq!(
-        messages(&text_thread, cx),
-        vec![(message_1.id, Role::User, 0..0)]
-    );
-
-    let message_2 = text_thread.update(cx, |context, cx| {
-        context
-            .insert_message_after(message_1.id, Role::Assistant, MessageStatus::Done, cx)
-            .unwrap()
-    });
-    assert_eq!(
-        messages(&text_thread, cx),
-        vec![
-            (message_1.id, Role::User, 0..1),
-            (message_2.id, Role::Assistant, 1..1)
-        ]
-    );
-
-    buffer.update(cx, |buffer, cx| {
-        buffer.edit([(0..0, "1"), (1..1, "2")], None, cx)
-    });
-    assert_eq!(
-        messages(&text_thread, cx),
-        vec![
-            (message_1.id, Role::User, 0..2),
-            (message_2.id, Role::Assistant, 2..3)
-        ]
-    );
-
-    let message_3 = text_thread.update(cx, |context, cx| {
-        context
-            .insert_message_after(message_2.id, Role::User, MessageStatus::Done, cx)
-            .unwrap()
-    });
-    assert_eq!(
-        messages(&text_thread, cx),
-        vec![
-            (message_1.id, Role::User, 0..2),
-            (message_2.id, Role::Assistant, 2..4),
-            (message_3.id, Role::User, 4..4)
-        ]
-    );
-
-    let message_4 = text_thread.update(cx, |context, cx| {
-        context
-            .insert_message_after(message_2.id, Role::User, MessageStatus::Done, cx)
-            .unwrap()
-    });
-    assert_eq!(
-        messages(&text_thread, cx),
-        vec![
-            (message_1.id, Role::User, 0..2),
-            (message_2.id, Role::Assistant, 2..4),
-            (message_4.id, Role::User, 4..5),
-            (message_3.id, Role::User, 5..5),
-        ]
-    );
-
-    buffer.update(cx, |buffer, cx| {
-        buffer.edit([(4..4, "C"), (5..5, "D")], None, cx)
-    });
-    assert_eq!(
-        messages(&text_thread, cx),
-        vec![
-            (message_1.id, Role::User, 0..2),
-            (message_2.id, Role::Assistant, 2..4),
-            (message_4.id, Role::User, 4..6),
-            (message_3.id, Role::User, 6..7),
-        ]
-    );
-
-    // Deleting across message boundaries merges the messages.
-    buffer.update(cx, |buffer, cx| buffer.edit([(1..4, "")], None, cx));
-    assert_eq!(
-        messages(&text_thread, cx),
-        vec![
-            (message_1.id, Role::User, 0..3),
-            (message_3.id, Role::User, 3..4),
-        ]
-    );
-
-    // Undoing the deletion should also undo the merge.
-    buffer.update(cx, |buffer, cx| buffer.undo(cx));
-    assert_eq!(
-        messages(&text_thread, cx),
-        vec![
-            (message_1.id, Role::User, 0..2),
-            (message_2.id, Role::Assistant, 2..4),
-            (message_4.id, Role::User, 4..6),
-            (message_3.id, Role::User, 6..7),
-        ]
-    );
-
-    // Redoing the deletion should also redo the merge.
-    buffer.update(cx, |buffer, cx| buffer.redo(cx));
-    assert_eq!(
-        messages(&text_thread, cx),
-        vec![
-            (message_1.id, Role::User, 0..3),
-            (message_3.id, Role::User, 3..4),
-        ]
-    );
-
-    // Ensure we can still insert after a merged message.
-    let message_5 = text_thread.update(cx, |context, cx| {
-        context
-            .insert_message_after(message_1.id, Role::System, MessageStatus::Done, cx)
-            .unwrap()
-    });
-    assert_eq!(
-        messages(&text_thread, cx),
-        vec![
-            (message_1.id, Role::User, 0..3),
-            (message_5.id, Role::System, 3..4),
-            (message_3.id, Role::User, 4..5)
-        ]
-    );
-}
-
-#[gpui::test]
-fn test_message_splitting(cx: &mut App) {
-    init_test(cx);
-
-    let registry = Arc::new(LanguageRegistry::test(cx.background_executor().clone()));
-
-    let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
-    let text_thread = cx.new(|cx| {
-        TextThread::local(
-            registry.clone(),
-            None,
-            None,
-            prompt_builder.clone(),
-            Arc::new(SlashCommandWorkingSet::default()),
-            cx,
-        )
-    });
-    let buffer = text_thread.read(cx).buffer().clone();
-
-    let message_1 = text_thread.read(cx).message_anchors[0].clone();
-    assert_eq!(
-        messages(&text_thread, cx),
-        vec![(message_1.id, Role::User, 0..0)]
-    );
-
-    buffer.update(cx, |buffer, cx| {
-        buffer.edit([(0..0, "aaa\nbbb\nccc\nddd\n")], None, cx)
-    });
-
-    let (_, message_2) =
-        text_thread.update(cx, |text_thread, cx| text_thread.split_message(3..3, cx));
-    let message_2 = message_2.unwrap();
-
-    // We recycle newlines in the middle of a split message
-    assert_eq!(buffer.read(cx).text(), "aaa\nbbb\nccc\nddd\n");
-    assert_eq!(
-        messages(&text_thread, cx),
-        vec![
-            (message_1.id, Role::User, 0..4),
-            (message_2.id, Role::User, 4..16),
-        ]
-    );
-
-    let (_, message_3) =
-        text_thread.update(cx, |text_thread, cx| text_thread.split_message(3..3, cx));
-    let message_3 = message_3.unwrap();
-
-    // We don't recycle newlines at the end of a split message
-    assert_eq!(buffer.read(cx).text(), "aaa\n\nbbb\nccc\nddd\n");
-    assert_eq!(
-        messages(&text_thread, cx),
-        vec![
-            (message_1.id, Role::User, 0..4),
-            (message_3.id, Role::User, 4..5),
-            (message_2.id, Role::User, 5..17),
-        ]
-    );
-
-    let (_, message_4) =
-        text_thread.update(cx, |text_thread, cx| text_thread.split_message(9..9, cx));
-    let message_4 = message_4.unwrap();
-    assert_eq!(buffer.read(cx).text(), "aaa\n\nbbb\nccc\nddd\n");
-    assert_eq!(
-        messages(&text_thread, cx),
-        vec![
-            (message_1.id, Role::User, 0..4),
-            (message_3.id, Role::User, 4..5),
-            (message_2.id, Role::User, 5..9),
-            (message_4.id, Role::User, 9..17),
-        ]
-    );
-
-    let (_, message_5) =
-        text_thread.update(cx, |text_thread, cx| text_thread.split_message(9..9, cx));
-    let message_5 = message_5.unwrap();
-    assert_eq!(buffer.read(cx).text(), "aaa\n\nbbb\n\nccc\nddd\n");
-    assert_eq!(
-        messages(&text_thread, cx),
-        vec![
-            (message_1.id, Role::User, 0..4),
-            (message_3.id, Role::User, 4..5),
-            (message_2.id, Role::User, 5..9),
-            (message_4.id, Role::User, 9..10),
-            (message_5.id, Role::User, 10..18),
-        ]
-    );
-
-    let (message_6, message_7) =
-        text_thread.update(cx, |text_thread, cx| text_thread.split_message(14..16, cx));
-    let message_6 = message_6.unwrap();
-    let message_7 = message_7.unwrap();
-    assert_eq!(buffer.read(cx).text(), "aaa\n\nbbb\n\nccc\ndd\nd\n");
-    assert_eq!(
-        messages(&text_thread, cx),
-        vec![
-            (message_1.id, Role::User, 0..4),
-            (message_3.id, Role::User, 4..5),
-            (message_2.id, Role::User, 5..9),
-            (message_4.id, Role::User, 9..10),
-            (message_5.id, Role::User, 10..14),
-            (message_6.id, Role::User, 14..17),
-            (message_7.id, Role::User, 17..19),
-        ]
-    );
-}
-
-#[gpui::test]
-fn test_messages_for_offsets(cx: &mut App) {
-    init_test(cx);
-
-    let registry = Arc::new(LanguageRegistry::test(cx.background_executor().clone()));
-    let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
-    let text_thread = cx.new(|cx| {
-        TextThread::local(
-            registry,
-            None,
-            None,
-            prompt_builder.clone(),
-            Arc::new(SlashCommandWorkingSet::default()),
-            cx,
-        )
-    });
-    let buffer = text_thread.read(cx).buffer().clone();
-
-    let message_1 = text_thread.read(cx).message_anchors[0].clone();
-    assert_eq!(
-        messages(&text_thread, cx),
-        vec![(message_1.id, Role::User, 0..0)]
-    );
-
-    buffer.update(cx, |buffer, cx| buffer.edit([(0..0, "aaa")], None, cx));
-    let message_2 = text_thread
-        .update(cx, |text_thread, cx| {
-            text_thread.insert_message_after(message_1.id, Role::User, MessageStatus::Done, cx)
-        })
-        .unwrap();
-    buffer.update(cx, |buffer, cx| buffer.edit([(4..4, "bbb")], None, cx));
-
-    let message_3 = text_thread
-        .update(cx, |text_thread, cx| {
-            text_thread.insert_message_after(message_2.id, Role::User, MessageStatus::Done, cx)
-        })
-        .unwrap();
-    buffer.update(cx, |buffer, cx| buffer.edit([(8..8, "ccc")], None, cx));
-
-    assert_eq!(buffer.read(cx).text(), "aaa\nbbb\nccc");
-    assert_eq!(
-        messages(&text_thread, cx),
-        vec![
-            (message_1.id, Role::User, 0..4),
-            (message_2.id, Role::User, 4..8),
-            (message_3.id, Role::User, 8..11)
-        ]
-    );
-
-    assert_eq!(
-        message_ids_for_offsets(&text_thread, &[0, 4, 9], cx),
-        [message_1.id, message_2.id, message_3.id]
-    );
-    assert_eq!(
-        message_ids_for_offsets(&text_thread, &[0, 1, 11], cx),
-        [message_1.id, message_3.id]
-    );
-
-    let message_4 = text_thread
-        .update(cx, |text_thread, cx| {
-            text_thread.insert_message_after(message_3.id, Role::User, MessageStatus::Done, cx)
-        })
-        .unwrap();
-    assert_eq!(buffer.read(cx).text(), "aaa\nbbb\nccc\n");
-    assert_eq!(
-        messages(&text_thread, cx),
-        vec![
-            (message_1.id, Role::User, 0..4),
-            (message_2.id, Role::User, 4..8),
-            (message_3.id, Role::User, 8..12),
-            (message_4.id, Role::User, 12..12)
-        ]
-    );
-    assert_eq!(
-        message_ids_for_offsets(&text_thread, &[0, 4, 8, 12], cx),
-        [message_1.id, message_2.id, message_3.id, message_4.id]
-    );
-
-    fn message_ids_for_offsets(
-        context: &Entity<TextThread>,
-        offsets: &[usize],
-        cx: &App,
-    ) -> Vec<MessageId> {
-        context
-            .read(cx)
-            .messages_for_offsets(offsets.iter().copied(), cx)
-            .into_iter()
-            .map(|message| message.id)
-            .collect()
-    }
-}
-
-#[gpui::test]
-async fn test_slash_commands(cx: &mut TestAppContext) {
-    cx.update(init_test);
-
-    let fs = FakeFs::new(cx.background_executor.clone());
-
-    fs.insert_tree(
-        "/test",
-        json!({
-            "src": {
-                "lib.rs": "fn one() -> usize { 1 }",
-                "main.rs": "
-                    use crate::one;
-                    fn main() { one(); }
-                ".unindent(),
-            }
-        }),
-    )
-    .await;
-
-    let slash_command_registry = cx.update(SlashCommandRegistry::default_global);
-    slash_command_registry.register_command(FileSlashCommand, false);
-
-    let registry = Arc::new(LanguageRegistry::test(cx.executor()));
-    let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
-    let text_thread = cx.new(|cx| {
-        TextThread::local(
-            registry.clone(),
-            None,
-            None,
-            prompt_builder.clone(),
-            Arc::new(SlashCommandWorkingSet::default()),
-            cx,
-        )
-    });
-
-    #[derive(Default)]
-    struct ContextRanges {
-        parsed_commands: HashSet<Range<language::Anchor>>,
-        command_outputs: HashMap<InvokedSlashCommandId, Range<language::Anchor>>,
-        output_sections: HashSet<Range<language::Anchor>>,
-    }
-
-    let context_ranges = Rc::new(RefCell::new(ContextRanges::default()));
-    text_thread.update(cx, |_, cx| {
-        cx.subscribe(&text_thread, {
-            let context_ranges = context_ranges.clone();
-            move |text_thread, _, event, _| {
-                let mut context_ranges = context_ranges.borrow_mut();
-                match event {
-                    TextThreadEvent::InvokedSlashCommandChanged { command_id } => {
-                        let command = text_thread.invoked_slash_command(command_id).unwrap();
-                        context_ranges
-                            .command_outputs
-                            .insert(*command_id, command.range.clone());
-                    }
-                    TextThreadEvent::ParsedSlashCommandsUpdated { removed, updated } => {
-                        for range in removed {
-                            context_ranges.parsed_commands.remove(range);
-                        }
-                        for command in updated {
-                            context_ranges
-                                .parsed_commands
-                                .insert(command.source_range.clone());
-                        }
-                    }
-                    TextThreadEvent::SlashCommandOutputSectionAdded { section } => {
-                        context_ranges.output_sections.insert(section.range.clone());
-                    }
-                    _ => {}
-                }
-            }
-        })
-        .detach();
-    });
-
-    let buffer = text_thread.read_with(cx, |text_thread, _| text_thread.buffer().clone());
-
-    // Insert a slash command
-    buffer.update(cx, |buffer, cx| {
-        buffer.edit([(0..0, "/file src/lib.rs")], None, cx);
-    });
-    assert_text_and_context_ranges(
-        &buffer,
-        &context_ranges,
-        &"
-        «/file src/lib.rs»"
-            .unindent(),
-        cx,
-    );
-
-    // Edit the argument of the slash command.
-    buffer.update(cx, |buffer, cx| {
-        let edit_offset = buffer.text().find("lib.rs").unwrap();
-        buffer.edit([(edit_offset..edit_offset + "lib".len(), "main")], None, cx);
-    });
-    assert_text_and_context_ranges(
-        &buffer,
-        &context_ranges,
-        &"
-        «/file src/main.rs»"
-            .unindent(),
-        cx,
-    );
-
-    // Edit the name of the slash command, using one that doesn't exist.
-    buffer.update(cx, |buffer, cx| {
-        let edit_offset = buffer.text().find("/file").unwrap();
-        buffer.edit(
-            [(edit_offset..edit_offset + "/file".len(), "/unknown")],
-            None,
-            cx,
-        );
-    });
-    assert_text_and_context_ranges(
-        &buffer,
-        &context_ranges,
-        &"
-        /unknown src/main.rs"
-            .unindent(),
-        cx,
-    );
-
-    // Undoing the insertion of an non-existent slash command resorts the previous one.
-    buffer.update(cx, |buffer, cx| buffer.undo(cx));
-    assert_text_and_context_ranges(
-        &buffer,
-        &context_ranges,
-        &"
-        «/file src/main.rs»"
-            .unindent(),
-        cx,
-    );
-
-    let (command_output_tx, command_output_rx) = mpsc::unbounded();
-    text_thread.update(cx, |text_thread, cx| {
-        let command_source_range = text_thread.parsed_slash_commands[0].source_range.clone();
-        text_thread.insert_command_output(
-            command_source_range,
-            "file",
-            Task::ready(Ok(command_output_rx.boxed())),
-            true,
-            cx,
-        );
-    });
-    assert_text_and_context_ranges(
-        &buffer,
-        &context_ranges,
-        &"
-        ⟦«/file src/main.rs»
-        …⟧
-        "
-        .unindent(),
-        cx,
-    );
-
-    command_output_tx
-        .unbounded_send(Ok(SlashCommandEvent::StartSection {
-            icon: IconName::Ai,
-            label: "src/main.rs".into(),
-            metadata: None,
-        }))
-        .unwrap();
-    command_output_tx
-        .unbounded_send(Ok(SlashCommandEvent::Content("src/main.rs".into())))
-        .unwrap();
-    cx.run_until_parked();
-    assert_text_and_context_ranges(
-        &buffer,
-        &context_ranges,
-        &"
-        ⟦«/file src/main.rs»
-        src/main.rs…⟧
-        "
-        .unindent(),
-        cx,
-    );
-
-    command_output_tx
-        .unbounded_send(Ok(SlashCommandEvent::Content("\nfn main() {}".into())))
-        .unwrap();
-    cx.run_until_parked();
-    assert_text_and_context_ranges(
-        &buffer,
-        &context_ranges,
-        &"
-        ⟦«/file src/main.rs»
-        src/main.rs
-        fn main() {}…⟧
-        "
-        .unindent(),
-        cx,
-    );
-
-    command_output_tx
-        .unbounded_send(Ok(SlashCommandEvent::EndSection))
-        .unwrap();
-    cx.run_until_parked();
-    assert_text_and_context_ranges(
-        &buffer,
-        &context_ranges,
-        &"
-        ⟦«/file src/main.rs»
-        ⟪src/main.rs
-        fn main() {}⟫…⟧
-        "
-        .unindent(),
-        cx,
-    );
-
-    drop(command_output_tx);
-    cx.run_until_parked();
-    assert_text_and_context_ranges(
-        &buffer,
-        &context_ranges,
-        &"
-        ⟦⟪src/main.rs
-        fn main() {}⟫⟧
-        "
-        .unindent(),
-        cx,
-    );
-
-    #[track_caller]
-    fn assert_text_and_context_ranges(
-        buffer: &Entity<Buffer>,
-        ranges: &RefCell<ContextRanges>,
-        expected_marked_text: &str,
-        cx: &mut TestAppContext,
-    ) {
-        let mut actual_marked_text = String::new();
-        buffer.update(cx, |buffer, _| {
-            struct Endpoint {
-                offset: usize,
-                marker: char,
-            }
-
-            let ranges = ranges.borrow();
-            let mut endpoints = Vec::new();
-            for range in ranges.command_outputs.values() {
-                endpoints.push(Endpoint {
-                    offset: range.start.to_offset(buffer),
-                    marker: '⟦',
-                });
-            }
-            for range in ranges.parsed_commands.iter() {
-                endpoints.push(Endpoint {
-                    offset: range.start.to_offset(buffer),
-                    marker: '«',
-                });
-            }
-            for range in ranges.output_sections.iter() {
-                endpoints.push(Endpoint {
-                    offset: range.start.to_offset(buffer),
-                    marker: '⟪',
-                });
-            }
-
-            for range in ranges.output_sections.iter() {
-                endpoints.push(Endpoint {
-                    offset: range.end.to_offset(buffer),
-                    marker: '⟫',
-                });
-            }
-            for range in ranges.parsed_commands.iter() {
-                endpoints.push(Endpoint {
-                    offset: range.end.to_offset(buffer),
-                    marker: '»',
-                });
-            }
-            for range in ranges.command_outputs.values() {
-                endpoints.push(Endpoint {
-                    offset: range.end.to_offset(buffer),
-                    marker: '⟧',
-                });
-            }
-
-            endpoints.sort_by_key(|endpoint| endpoint.offset);
-            let mut offset = 0;
-            for endpoint in endpoints {
-                actual_marked_text.extend(buffer.text_for_range(offset..endpoint.offset));
-                actual_marked_text.push(endpoint.marker);
-                offset = endpoint.offset;
-            }
-            actual_marked_text.extend(buffer.text_for_range(offset..buffer.len()));
-        });
-
-        assert_eq!(actual_marked_text, expected_marked_text);
-    }
-}
-
-#[gpui::test]
-async fn test_serialization(cx: &mut TestAppContext) {
-    cx.update(init_test);
-
-    let registry = Arc::new(LanguageRegistry::test(cx.executor()));
-    let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
-    let text_thread = cx.new(|cx| {
-        TextThread::local(
-            registry.clone(),
-            None,
-            None,
-            prompt_builder.clone(),
-            Arc::new(SlashCommandWorkingSet::default()),
-            cx,
-        )
-    });
-    let buffer = text_thread.read_with(cx, |text_thread, _| text_thread.buffer().clone());
-    let message_0 = text_thread.read_with(cx, |text_thread, _| text_thread.message_anchors[0].id);
-    let message_1 = text_thread.update(cx, |text_thread, cx| {
-        text_thread
-            .insert_message_after(message_0, Role::Assistant, MessageStatus::Done, cx)
-            .unwrap()
-    });
-    let message_2 = text_thread.update(cx, |text_thread, cx| {
-        text_thread
-            .insert_message_after(message_1.id, Role::System, MessageStatus::Done, cx)
-            .unwrap()
-    });
-    buffer.update(cx, |buffer, cx| {
-        buffer.edit([(0..0, "a"), (1..1, "b\nc")], None, cx);
-        buffer.finalize_last_transaction();
-    });
-    let _message_3 = text_thread.update(cx, |text_thread, cx| {
-        text_thread
-            .insert_message_after(message_2.id, Role::System, MessageStatus::Done, cx)
-            .unwrap()
-    });
-    buffer.update(cx, |buffer, cx| buffer.undo(cx));
-    assert_eq!(buffer.read_with(cx, |buffer, _| buffer.text()), "a\nb\nc\n");
-    assert_eq!(
-        cx.read(|cx| messages(&text_thread, cx)),
-        [
-            (message_0, Role::User, 0..2),
-            (message_1.id, Role::Assistant, 2..6),
-            (message_2.id, Role::System, 6..6),
-        ]
-    );
-
-    let serialized_context = text_thread.read_with(cx, |text_thread, cx| text_thread.serialize(cx));
-    let deserialized_context = cx.new(|cx| {
-        TextThread::deserialize(
-            serialized_context,
-            Path::new("").into(),
-            registry.clone(),
-            prompt_builder.clone(),
-            Arc::new(SlashCommandWorkingSet::default()),
-            None,
-            None,
-            cx,
-        )
-    });
-    let deserialized_buffer =
-        deserialized_context.read_with(cx, |text_thread, _| text_thread.buffer().clone());
-    assert_eq!(
-        deserialized_buffer.read_with(cx, |buffer, _| buffer.text()),
-        "a\nb\nc\n"
-    );
-    assert_eq!(
-        cx.read(|cx| messages(&deserialized_context, cx)),
-        [
-            (message_0, Role::User, 0..2),
-            (message_1.id, Role::Assistant, 2..6),
-            (message_2.id, Role::System, 6..6),
-        ]
-    );
-}
-
-#[gpui::test(iterations = 25)]
-async fn test_random_context_collaboration(cx: &mut TestAppContext, mut rng: StdRng) {
-    cx.update(init_test);
-
-    let min_peers = env::var("MIN_PEERS")
-        .map(|i| i.parse().expect("invalid `MIN_PEERS` variable"))
-        .unwrap_or(2);
-    let max_peers = env::var("MAX_PEERS")
-        .map(|i| i.parse().expect("invalid `MAX_PEERS` variable"))
-        .unwrap_or(5);
-    let operations = env::var("OPERATIONS")
-        .map(|i| i.parse().expect("invalid `OPERATIONS` variable"))
-        .unwrap_or(50);
-
-    let slash_commands = cx.update(SlashCommandRegistry::default_global);
-    slash_commands.register_command(FakeSlashCommand("cmd-1".into()), false);
-    slash_commands.register_command(FakeSlashCommand("cmd-2".into()), false);
-    slash_commands.register_command(FakeSlashCommand("cmd-3".into()), false);
-
-    let registry = Arc::new(LanguageRegistry::test(cx.background_executor.clone()));
-    let network = Arc::new(Mutex::new(Network::new(rng.clone())));
-    let mut text_threads = Vec::new();
-
-    let num_peers = rng.random_range(min_peers..=max_peers);
-    let context_id = TextThreadId::new();
-    let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
-    for i in 0..num_peers {
-        let context = cx.new(|cx| {
-            TextThread::new(
-                context_id.clone(),
-                ReplicaId::new(i as u16),
-                language::Capability::ReadWrite,
-                registry.clone(),
-                prompt_builder.clone(),
-                Arc::new(SlashCommandWorkingSet::default()),
-                None,
-                None,
-                cx,
-            )
-        });
-
-        cx.update(|cx| {
-            cx.subscribe(&context, {
-                let network = network.clone();
-                move |_, event, _| {
-                    if let TextThreadEvent::Operation(op) = event {
-                        network
-                            .lock()
-                            .broadcast(ReplicaId::new(i as u16), vec![op.to_proto()]);
-                    }
-                }
-            })
-            .detach();
-        });
-
-        text_threads.push(context);
-        network.lock().add_peer(ReplicaId::new(i as u16));
-    }
-
-    let mut mutation_count = operations;
-
-    while mutation_count > 0
-        || !network.lock().is_idle()
-        || network.lock().contains_disconnected_peers()
-    {
-        let context_index = rng.random_range(0..text_threads.len());
-        let text_thread = &text_threads[context_index];
-
-        match rng.random_range(0..100) {
-            0..=29 if mutation_count > 0 => {
-                log::info!("Context {}: edit buffer", context_index);
-                text_thread.update(cx, |text_thread, cx| {
-                    text_thread
-                        .buffer()
-                        .update(cx, |buffer, cx| buffer.randomly_edit(&mut rng, 1, cx));
-                });
-                mutation_count -= 1;
-            }
-            30..=44 if mutation_count > 0 => {
-                text_thread.update(cx, |text_thread, cx| {
-                    let range = text_thread.buffer().read(cx).random_byte_range(0, &mut rng);
-                    log::info!("Context {}: split message at {:?}", context_index, range);
-                    text_thread.split_message(range, cx);
-                });
-                mutation_count -= 1;
-            }
-            45..=59 if mutation_count > 0 => {
-                text_thread.update(cx, |text_thread, cx| {
-                    if let Some(message) = text_thread.messages(cx).choose(&mut rng) {
-                        let role = *[Role::User, Role::Assistant, Role::System]
-                            .choose(&mut rng)
-                            .unwrap();
-                        log::info!(
-                            "Context {}: insert message after {:?} with {:?}",
-                            context_index,
-                            message.id,
-                            role
-                        );
-                        text_thread.insert_message_after(message.id, role, MessageStatus::Done, cx);
-                    }
-                });
-                mutation_count -= 1;
-            }
-            60..=74 if mutation_count > 0 => {
-                text_thread.update(cx, |text_thread, cx| {
-                    let command_text = "/".to_string()
-                        + slash_commands
-                            .command_names()
-                            .choose(&mut rng)
-                            .unwrap()
-                            .clone()
-                            .as_ref();
-
-                    let command_range = text_thread.buffer().update(cx, |buffer, cx| {
-                        let offset = buffer.random_byte_range(0, &mut rng).start;
-                        buffer.edit(
-                            [(offset..offset, format!("\n{}\n", command_text))],
-                            None,
-                            cx,
-                        );
-                        offset + 1..offset + 1 + command_text.len()
-                    });
-
-                    let output_text = RandomCharIter::new(&mut rng)
-                        .filter(|c| *c != '\r')
-                        .take(10)
-                        .collect::<String>();
-
-                    let mut events = vec![Ok(SlashCommandEvent::StartMessage {
-                        role: Role::User,
-                        merge_same_roles: true,
-                    })];
-
-                    let num_sections = rng.random_range(0..=3);
-                    let mut section_start = 0;
-                    for _ in 0..num_sections {
-                        let section_end = output_text.floor_char_boundary(
-                            rng.random_range(section_start..=output_text.len()),
-                        );
-                        events.push(Ok(SlashCommandEvent::StartSection {
-                            icon: IconName::Ai,
-                            label: "section".into(),
-                            metadata: None,
-                        }));
-                        events.push(Ok(SlashCommandEvent::Content(SlashCommandContent::Text {
-                            text: output_text[section_start..section_end].to_string(),
-                            run_commands_in_text: false,
-                        })));
-                        events.push(Ok(SlashCommandEvent::EndSection));
-                        section_start = section_end;
-                    }
-
-                    if section_start < output_text.len() {
-                        events.push(Ok(SlashCommandEvent::Content(SlashCommandContent::Text {
-                            text: output_text[section_start..].to_string(),
-                            run_commands_in_text: false,
-                        })));
-                    }
-
-                    log::info!(
-                        "Context {}: insert slash command output at {:?} with {:?} events",
-                        context_index,
-                        command_range,
-                        events.len()
-                    );
-
-                    let command_range = text_thread
-                        .buffer()
-                        .read(cx)
-                        .anchor_after(command_range.start)
-                        ..text_thread
-                            .buffer()
-                            .read(cx)
-                            .anchor_after(command_range.end);
-                    text_thread.insert_command_output(
-                        command_range,
-                        "/command",
-                        Task::ready(Ok(stream::iter(events).boxed())),
-                        true,
-                        cx,
-                    );
-                });
-                cx.run_until_parked();
-                mutation_count -= 1;
-            }
-            75..=84 if mutation_count > 0 => {
-                text_thread.update(cx, |text_thread, cx| {
-                    if let Some(message) = text_thread.messages(cx).choose(&mut rng) {
-                        let new_status = match rng.random_range(0..3) {
-                            0 => MessageStatus::Done,
-                            1 => MessageStatus::Pending,
-                            _ => MessageStatus::Error(SharedString::from("Random error")),
-                        };
-                        log::info!(
-                            "Context {}: update message {:?} status to {:?}",
-                            context_index,
-                            message.id,
-                            new_status
-                        );
-                        text_thread.update_metadata(message.id, cx, |metadata| {
-                            metadata.status = new_status;
-                        });
-                    }
-                });
-                mutation_count -= 1;
-            }
-            _ => {
-                let replica_id = ReplicaId::new(context_index as u16);
-                if network.lock().is_disconnected(replica_id) {
-                    network.lock().reconnect_peer(replica_id, ReplicaId::new(0));
-
-                    let (ops_to_send, ops_to_receive) = cx.read(|cx| {
-                        let host_context = &text_threads[0].read(cx);
-                        let guest_context = text_thread.read(cx);
-                        (
-                            guest_context.serialize_ops(&host_context.version(cx), cx),
-                            host_context.serialize_ops(&guest_context.version(cx), cx),
-                        )
-                    });
-                    let ops_to_send = ops_to_send.await;
-                    let ops_to_receive = ops_to_receive
-                        .await
-                        .into_iter()
-                        .map(TextThreadOperation::from_proto)
-                        .collect::<Result<Vec<_>>>()
-                        .unwrap();
-                    log::info!(
-                        "Context {}: reconnecting. Sent {} operations, received {} operations",
-                        context_index,
-                        ops_to_send.len(),
-                        ops_to_receive.len()
-                    );
-
-                    network.lock().broadcast(replica_id, ops_to_send);
-                    text_thread.update(cx, |text_thread, cx| {
-                        text_thread.apply_ops(ops_to_receive, cx)
-                    });
-                } else if rng.random_bool(0.1) && replica_id != ReplicaId::new(0) {
-                    log::info!("Context {}: disconnecting", context_index);
-                    network.lock().disconnect_peer(replica_id);
-                } else if network.lock().has_unreceived(replica_id) {
-                    log::info!("Context {}: applying operations", context_index);
-                    let ops = network.lock().receive(replica_id);
-                    let ops = ops
-                        .into_iter()
-                        .map(TextThreadOperation::from_proto)
-                        .collect::<Result<Vec<_>>>()
-                        .unwrap();
-                    text_thread.update(cx, |text_thread, cx| text_thread.apply_ops(ops, cx));
-                }
-            }
-        }
-    }
-
-    cx.read(|cx| {
-        let first_context = text_threads[0].read(cx);
-        for text_thread in &text_threads[1..] {
-            let text_thread = text_thread.read(cx);
-            assert!(text_thread.pending_ops.is_empty(), "pending ops: {:?}", text_thread.pending_ops);
-            assert_eq!(
-                text_thread.buffer().read(cx).text(),
-                first_context.buffer().read(cx).text(),
-                "Context {:?} text != Context 0 text",
-                text_thread.buffer().read(cx).replica_id()
-            );
-            assert_eq!(
-                text_thread.message_anchors,
-                first_context.message_anchors,
-                "Context {:?} messages != Context 0 messages",
-                text_thread.buffer().read(cx).replica_id()
-            );
-            assert_eq!(
-                text_thread.messages_metadata,
-                first_context.messages_metadata,
-                "Context {:?} message metadata != Context 0 message metadata",
-                text_thread.buffer().read(cx).replica_id()
-            );
-            assert_eq!(
-                text_thread.slash_command_output_sections,
-                first_context.slash_command_output_sections,
-                "Context {:?} slash command output sections != Context 0 slash command output sections",
-                text_thread.buffer().read(cx).replica_id()
-            );
-        }
-    });
-}
-
-#[gpui::test]
-fn test_mark_cache_anchors(cx: &mut App) {
-    init_test(cx);
-
-    let registry = Arc::new(LanguageRegistry::test(cx.background_executor().clone()));
-    let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
-    let text_thread = cx.new(|cx| {
-        TextThread::local(
-            registry,
-            None,
-            None,
-            prompt_builder.clone(),
-            Arc::new(SlashCommandWorkingSet::default()),
-            cx,
-        )
-    });
-    let buffer = text_thread.read(cx).buffer().clone();
-
-    // Create a test cache configuration
-    let cache_configuration = &Some(LanguageModelCacheConfiguration {
-        max_cache_anchors: 3,
-        should_speculate: true,
-        min_total_token: 10,
-    });
-
-    let message_1 = text_thread.read(cx).message_anchors[0].clone();
-
-    text_thread.update(cx, |text_thread, cx| {
-        text_thread.mark_cache_anchors(cache_configuration, false, cx)
-    });
-
-    assert_eq!(
-        messages_cache(&text_thread, cx)
-            .iter()
-            .filter(|(_, cache)| cache.as_ref().is_some_and(|cache| cache.is_anchor))
-            .count(),
-        0,
-        "Empty messages should not have any cache anchors."
-    );
-
-    buffer.update(cx, |buffer, cx| buffer.edit([(0..0, "aaa")], None, cx));
-    let message_2 = text_thread
-        .update(cx, |text_thread, cx| {
-            text_thread.insert_message_after(message_1.id, Role::User, MessageStatus::Pending, cx)
-        })
-        .unwrap();
-
-    buffer.update(cx, |buffer, cx| buffer.edit([(4..4, "bbbbbbb")], None, cx));
-    let message_3 = text_thread
-        .update(cx, |text_thread, cx| {
-            text_thread.insert_message_after(message_2.id, Role::User, MessageStatus::Pending, cx)
-        })
-        .unwrap();
-    buffer.update(cx, |buffer, cx| buffer.edit([(12..12, "cccccc")], None, cx));
-
-    text_thread.update(cx, |text_thread, cx| {
-        text_thread.mark_cache_anchors(cache_configuration, false, cx)
-    });
-    assert_eq!(buffer.read(cx).text(), "aaa\nbbbbbbb\ncccccc");
-    assert_eq!(
-        messages_cache(&text_thread, cx)
-            .iter()
-            .filter(|(_, cache)| cache.as_ref().is_some_and(|cache| cache.is_anchor))
-            .count(),
-        0,
-        "Messages should not be marked for cache before going over the token minimum."
-    );
-    text_thread.update(cx, |text_thread, _| {
-        text_thread.token_count = Some(20);
-    });
-
-    text_thread.update(cx, |text_thread, cx| {
-        text_thread.mark_cache_anchors(cache_configuration, true, cx)
-    });
-    assert_eq!(
-        messages_cache(&text_thread, cx)
-            .iter()
-            .map(|(_, cache)| cache.as_ref().is_some_and(|cache| cache.is_anchor))
-            .collect::<Vec<bool>>(),
-        vec![true, true, false],
-        "Last message should not be an anchor on speculative request."
-    );
-
-    text_thread
-        .update(cx, |text_thread, cx| {
-            text_thread.insert_message_after(
-                message_3.id,
-                Role::Assistant,
-                MessageStatus::Pending,
-                cx,
-            )
-        })
-        .unwrap();
-
-    text_thread.update(cx, |text_thread, cx| {
-        text_thread.mark_cache_anchors(cache_configuration, false, cx)
-    });
-    assert_eq!(
-        messages_cache(&text_thread, cx)
-            .iter()
-            .map(|(_, cache)| cache.as_ref().is_some_and(|cache| cache.is_anchor))
-            .collect::<Vec<bool>>(),
-        vec![false, true, true, false],
-        "Most recent message should also be cached if not a speculative request."
-    );
-    text_thread.update(cx, |text_thread, cx| {
-        text_thread.update_cache_status_for_completion(cx)
-    });
-    assert_eq!(
-        messages_cache(&text_thread, cx)
-            .iter()
-            .map(|(_, cache)| cache
-                .as_ref()
-                .map_or(None, |cache| Some(cache.status.clone())))
-            .collect::<Vec<Option<CacheStatus>>>(),
-        vec![
-            Some(CacheStatus::Cached),
-            Some(CacheStatus::Cached),
-            Some(CacheStatus::Cached),
-            None
-        ],
-        "All user messages prior to anchor should be marked as cached."
-    );
-
-    buffer.update(cx, |buffer, cx| buffer.edit([(14..14, "d")], None, cx));
-    text_thread.update(cx, |text_thread, cx| {
-        text_thread.mark_cache_anchors(cache_configuration, false, cx)
-    });
-    assert_eq!(
-        messages_cache(&text_thread, cx)
-            .iter()
-            .map(|(_, cache)| cache
-                .as_ref()
-                .map_or(None, |cache| Some(cache.status.clone())))
-            .collect::<Vec<Option<CacheStatus>>>(),
-        vec![
-            Some(CacheStatus::Cached),
-            Some(CacheStatus::Cached),
-            Some(CacheStatus::Pending),
-            None
-        ],
-        "Modifying a message should invalidate it's cache but leave previous messages."
-    );
-    buffer.update(cx, |buffer, cx| buffer.edit([(2..2, "e")], None, cx));
-    text_thread.update(cx, |text_thread, cx| {
-        text_thread.mark_cache_anchors(cache_configuration, false, cx)
-    });
-    assert_eq!(
-        messages_cache(&text_thread, cx)
-            .iter()
-            .map(|(_, cache)| cache
-                .as_ref()
-                .map_or(None, |cache| Some(cache.status.clone())))
-            .collect::<Vec<Option<CacheStatus>>>(),
-        vec![
-            Some(CacheStatus::Pending),
-            Some(CacheStatus::Pending),
-            Some(CacheStatus::Pending),
-            None
-        ],
-        "Modifying a message should invalidate all future messages."
-    );
-}
-
-#[gpui::test]
-async fn test_summarization(cx: &mut TestAppContext) {
-    let (text_thread, fake_model) = setup_context_editor_with_fake_model(cx);
-
-    // Initial state should be pending
-    text_thread.read_with(cx, |text_thread, _| {
-        assert!(matches!(text_thread.summary(), TextThreadSummary::Pending));
-        assert_eq!(
-            text_thread.summary().or_default(),
-            TextThreadSummary::DEFAULT
-        );
-    });
-
-    let message_1 = text_thread.read_with(cx, |text_thread, _cx| {
-        text_thread.message_anchors[0].clone()
-    });
-    text_thread.update(cx, |context, cx| {
-        context
-            .insert_message_after(message_1.id, Role::Assistant, MessageStatus::Done, cx)
-            .unwrap();
-    });
-
-    // Send a message
-    text_thread.update(cx, |text_thread, cx| {
-        text_thread.assist(cx);
-    });
-
-    simulate_successful_response(&fake_model, cx);
-
-    // Should start generating summary when there are >= 2 messages
-    text_thread.read_with(cx, |text_thread, _| {
-        assert!(!text_thread.summary().content().unwrap().done);
-    });
-
-    cx.run_until_parked();
-    fake_model.send_last_completion_stream_text_chunk("Brief");
-    fake_model.send_last_completion_stream_text_chunk(" Introduction");
-    fake_model.end_last_completion_stream();
-    cx.run_until_parked();
-
-    // Summary should be set
-    text_thread.read_with(cx, |text_thread, _| {
-        assert_eq!(text_thread.summary().or_default(), "Brief Introduction");
-    });
-
-    // We should be able to manually set a summary
-    text_thread.update(cx, |text_thread, cx| {
-        text_thread.set_custom_summary("Brief Intro".into(), cx);
-    });
-
-    text_thread.read_with(cx, |text_thread, _| {
-        assert_eq!(text_thread.summary().or_default(), "Brief Intro");
-    });
-}
-
-#[gpui::test]
-async fn test_thread_summary_error_set_manually(cx: &mut TestAppContext) {
-    let (text_thread, fake_model) = setup_context_editor_with_fake_model(cx);
-
-    test_summarize_error(&fake_model, &text_thread, cx);
-
-    // Now we should be able to set a summary
-    text_thread.update(cx, |text_thread, cx| {
-        text_thread.set_custom_summary("Brief Intro".into(), cx);
-    });
-
-    text_thread.read_with(cx, |text_thread, _| {
-        assert_eq!(text_thread.summary().or_default(), "Brief Intro");
-    });
-}
-
-#[gpui::test]
-async fn test_thread_summary_error_retry(cx: &mut TestAppContext) {
-    let (text_thread, fake_model) = setup_context_editor_with_fake_model(cx);
-
-    test_summarize_error(&fake_model, &text_thread, cx);
-
-    // Sending another message should not trigger another summarize request
-    text_thread.update(cx, |text_thread, cx| {
-        text_thread.assist(cx);
-    });
-
-    simulate_successful_response(&fake_model, cx);
-
-    text_thread.read_with(cx, |text_thread, _| {
-        // State is still Error, not Generating
-        assert!(matches!(text_thread.summary(), TextThreadSummary::Error));
-    });
-
-    // But the summarize request can be invoked manually
-    text_thread.update(cx, |text_thread, cx| {
-        text_thread.summarize(true, cx);
-    });
-
-    text_thread.read_with(cx, |text_thread, _| {
-        assert!(!text_thread.summary().content().unwrap().done);
-    });
-
-    cx.run_until_parked();
-    fake_model.send_last_completion_stream_text_chunk("A successful summary");
-    fake_model.end_last_completion_stream();
-    cx.run_until_parked();
-
-    text_thread.read_with(cx, |text_thread, _| {
-        assert_eq!(text_thread.summary().or_default(), "A successful summary");
-    });
-}
-
-fn test_summarize_error(
-    model: &Arc<FakeLanguageModel>,
-    text_thread: &Entity<TextThread>,
-    cx: &mut TestAppContext,
-) {
-    let message_1 = text_thread.read_with(cx, |text_thread, _cx| {
-        text_thread.message_anchors[0].clone()
-    });
-    text_thread.update(cx, |text_thread, cx| {
-        text_thread
-            .insert_message_after(message_1.id, Role::Assistant, MessageStatus::Done, cx)
-            .unwrap();
-    });
-
-    // Send a message
-    text_thread.update(cx, |text_thread, cx| {
-        text_thread.assist(cx);
-    });
-
-    simulate_successful_response(model, cx);
-
-    text_thread.read_with(cx, |text_thread, _| {
-        assert!(!text_thread.summary().content().unwrap().done);
-    });
-
-    // Simulate summary request ending
-    cx.run_until_parked();
-    model.end_last_completion_stream();
-    cx.run_until_parked();
-
-    // State is set to Error and default message
-    text_thread.read_with(cx, |text_thread, _| {
-        assert_eq!(*text_thread.summary(), TextThreadSummary::Error);
-        assert_eq!(
-            text_thread.summary().or_default(),
-            TextThreadSummary::DEFAULT
-        );
-    });
-}
-
-fn setup_context_editor_with_fake_model(
-    cx: &mut TestAppContext,
-) -> (Entity<TextThread>, Arc<FakeLanguageModel>) {
-    let registry = Arc::new(LanguageRegistry::test(cx.executor()));
-
-    let fake_provider = Arc::new(FakeLanguageModelProvider::default());
-    let fake_model = Arc::new(fake_provider.test_model());
-
-    cx.update(|cx| {
-        init_test(cx);
-        LanguageModelRegistry::global(cx).update(cx, |registry, cx| {
-            let configured_model = ConfiguredModel {
-                provider: fake_provider.clone(),
-                model: fake_model.clone(),
-            };
-            registry.set_default_model(Some(configured_model.clone()), cx);
-            registry.set_thread_summary_model(Some(configured_model), cx);
-        })
-    });
-
-    let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
-    let context = cx.new(|cx| {
-        TextThread::local(
-            registry,
-            None,
-            None,
-            prompt_builder.clone(),
-            Arc::new(SlashCommandWorkingSet::default()),
-            cx,
-        )
-    });
-
-    (context, fake_model)
-}
-
-fn simulate_successful_response(fake_model: &FakeLanguageModel, cx: &mut TestAppContext) {
-    cx.run_until_parked();
-    fake_model.send_last_completion_stream_text_chunk("Assistant response");
-    fake_model.end_last_completion_stream();
-    cx.run_until_parked();
-}
-
-fn messages(context: &Entity<TextThread>, cx: &App) -> Vec<(MessageId, Role, Range<usize>)> {
-    context
-        .read(cx)
-        .messages(cx)
-        .map(|message| (message.id, message.role, message.offset_range))
-        .collect()
-}
-
-fn messages_cache(
-    context: &Entity<TextThread>,
-    cx: &App,
-) -> Vec<(MessageId, Option<MessageCacheMetadata>)> {
-    context
-        .read(cx)
-        .messages(cx)
-        .map(|message| (message.id, message.cache))
-        .collect()
-}
-
-fn init_test(cx: &mut App) {
-    let settings_store = SettingsStore::test(cx);
-    prompt_store::init(cx);
-    LanguageModelRegistry::test(cx);
-    cx.set_global(settings_store);
-}
-
-#[derive(Clone)]
-struct FakeSlashCommand(String);
-
-impl SlashCommand for FakeSlashCommand {
-    fn name(&self) -> String {
-        self.0.clone()
-    }
-
-    fn description(&self) -> String {
-        format!("Fake slash command: {}", self.0)
-    }
-
-    fn menu_text(&self) -> String {
-        format!("Run fake command: {}", self.0)
-    }
-
-    fn complete_argument(
-        self: Arc<Self>,
-        _arguments: &[String],
-        _cancel: Arc<AtomicBool>,
-        _workspace: Option<WeakEntity<Workspace>>,
-        _window: &mut Window,
-        _cx: &mut App,
-    ) -> Task<Result<Vec<ArgumentCompletion>>> {
-        Task::ready(Ok(vec![]))
-    }
-
-    fn requires_argument(&self) -> bool {
-        false
-    }
-
-    fn run(
-        self: Arc<Self>,
-        _arguments: &[String],
-        _context_slash_command_output_sections: &[SlashCommandOutputSection<language::Anchor>],
-        _context_buffer: BufferSnapshot,
-        _workspace: WeakEntity<Workspace>,
-        _delegate: Option<Arc<dyn LspAdapterDelegate>>,
-        _window: &mut Window,
-        _cx: &mut App,
-    ) -> Task<SlashCommandResult> {
-        Task::ready(Ok(SlashCommandOutput {
-            text: format!("Executed fake command: {}", self.0),
-            sections: vec![],
-            run_commands_in_text: false,
-        }
-        .into_event_stream()))
-    }
-}
diff --git a/crates/assistant_text_thread/src/text_thread.rs b/crates/assistant_text_thread/src/text_thread.rs
deleted file mode 100644
index b808d9fb00..0000000000
--- a/crates/assistant_text_thread/src/text_thread.rs
+++ /dev/null
@@ -1,3335 +0,0 @@
-use agent_settings::{AgentSettings, SUMMARIZE_THREAD_PROMPT};
-use anyhow::{Context as _, Result, bail};
-use assistant_slash_command::{
-    SlashCommandContent, SlashCommandEvent, SlashCommandLine, SlashCommandOutputSection,
-    SlashCommandResult, SlashCommandWorkingSet,
-};
-use assistant_slash_commands::FileCommandMetadata;
-use client::{self, ModelRequestUsage, RequestUsage, proto, telemetry::Telemetry};
-use clock::ReplicaId;
-use cloud_llm_client::{CompletionIntent, UsageLimit};
-use collections::{HashMap, HashSet};
-use fs::{Fs, RenameOptions};
-
-use futures::{FutureExt, StreamExt, future::Shared};
-use gpui::{
-    App, AppContext as _, Context, Entity, EventEmitter, RenderImage, SharedString, Subscription,
-    Task, WeakEntity,
-};
-use itertools::Itertools as _;
-use language::{AnchorRangeExt, Bias, Buffer, LanguageRegistry, OffsetRangeExt, Point, ToOffset};
-use language_model::{
-    LanguageModel, LanguageModelCacheConfiguration, LanguageModelCompletionEvent,
-    LanguageModelImage, LanguageModelRegistry, LanguageModelRequest, LanguageModelRequestMessage,
-    LanguageModelToolUseId, MessageContent, PaymentRequiredError, Role, StopReason,
-    report_assistant_event,
-};
-use open_ai::Model as OpenAiModel;
-use paths::text_threads_dir;
-use project::Project;
-use prompt_store::PromptBuilder;
-use serde::{Deserialize, Serialize};
-use settings::Settings;
-use smallvec::SmallVec;
-use std::{
-    cmp::{Ordering, max},
-    fmt::{Debug, Write as _},
-    iter, mem,
-    ops::Range,
-    path::Path,
-    sync::Arc,
-    time::{Duration, Instant},
-};
-use telemetry_events::{AssistantEventData, AssistantKind, AssistantPhase};
-use text::{BufferSnapshot, ToPoint};
-use ui::IconName;
-use util::{ResultExt, TryFutureExt, post_inc};
-use uuid::Uuid;
-
-#[derive(Clone, Debug, Eq, PartialEq, Hash, PartialOrd, Ord, Serialize, Deserialize)]
-pub struct TextThreadId(String);
-
-impl TextThreadId {
-    pub fn new() -> Self {
-        Self(Uuid::new_v4().to_string())
-    }
-
-    pub fn from_proto(id: String) -> Self {
-        Self(id)
-    }
-
-    pub fn to_proto(&self) -> String {
-        self.0.clone()
-    }
-}
-
-#[derive(Copy, Clone, Debug, Eq, PartialEq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
-pub struct MessageId(pub clock::Lamport);
-
-impl MessageId {
-    pub fn as_u64(self) -> u64 {
-        self.0.as_u64()
-    }
-}
-
-#[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize)]
-pub enum MessageStatus {
-    Pending,
-    Done,
-    Error(SharedString),
-    Canceled,
-}
-
-impl MessageStatus {
-    pub fn from_proto(status: proto::ContextMessageStatus) -> MessageStatus {
-        match status.variant {
-            Some(proto::context_message_status::Variant::Pending(_)) => MessageStatus::Pending,
-            Some(proto::context_message_status::Variant::Done(_)) => MessageStatus::Done,
-            Some(proto::context_message_status::Variant::Error(error)) => {
-                MessageStatus::Error(error.message.into())
-            }
-            Some(proto::context_message_status::Variant::Canceled(_)) => MessageStatus::Canceled,
-            None => MessageStatus::Pending,
-        }
-    }
-
-    pub fn to_proto(&self) -> proto::ContextMessageStatus {
-        match self {
-            MessageStatus::Pending => proto::ContextMessageStatus {
-                variant: Some(proto::context_message_status::Variant::Pending(
-                    proto::context_message_status::Pending {},
-                )),
-            },
-            MessageStatus::Done => proto::ContextMessageStatus {
-                variant: Some(proto::context_message_status::Variant::Done(
-                    proto::context_message_status::Done {},
-                )),
-            },
-            MessageStatus::Error(message) => proto::ContextMessageStatus {
-                variant: Some(proto::context_message_status::Variant::Error(
-                    proto::context_message_status::Error {
-                        message: message.to_string(),
-                    },
-                )),
-            },
-            MessageStatus::Canceled => proto::ContextMessageStatus {
-                variant: Some(proto::context_message_status::Variant::Canceled(
-                    proto::context_message_status::Canceled {},
-                )),
-            },
-        }
-    }
-}
-
-#[derive(Clone, Debug)]
-pub enum TextThreadOperation {
-    InsertMessage {
-        anchor: MessageAnchor,
-        metadata: MessageMetadata,
-        version: clock::Global,
-    },
-    UpdateMessage {
-        message_id: MessageId,
-        metadata: MessageMetadata,
-        version: clock::Global,
-    },
-    UpdateSummary {
-        summary: TextThreadSummaryContent,
-        version: clock::Global,
-    },
-    SlashCommandStarted {
-        id: InvokedSlashCommandId,
-        output_range: Range<language::Anchor>,
-        name: String,
-        version: clock::Global,
-    },
-    SlashCommandFinished {
-        id: InvokedSlashCommandId,
-        timestamp: clock::Lamport,
-        error_message: Option<String>,
-        version: clock::Global,
-    },
-    SlashCommandOutputSectionAdded {
-        timestamp: clock::Lamport,
-        section: SlashCommandOutputSection<language::Anchor>,
-        version: clock::Global,
-    },
-    ThoughtProcessOutputSectionAdded {
-        timestamp: clock::Lamport,
-        section: ThoughtProcessOutputSection<language::Anchor>,
-        version: clock::Global,
-    },
-    BufferOperation(language::Operation),
-}
-
-impl TextThreadOperation {
-    pub fn from_proto(op: proto::ContextOperation) -> Result<Self> {
-        match op.variant.context("invalid variant")? {
-            proto::context_operation::Variant::InsertMessage(insert) => {
-                let message = insert.message.context("invalid message")?;
-                let id = MessageId(language::proto::deserialize_timestamp(
-                    message.id.context("invalid id")?,
-                ));
-                Ok(Self::InsertMessage {
-                    anchor: MessageAnchor {
-                        id,
-                        start: language::proto::deserialize_anchor(
-                            message.start.context("invalid anchor")?,
-                        )
-                        .context("invalid anchor")?,
-                    },
-                    metadata: MessageMetadata {
-                        role: Role::from_proto(message.role),
-                        status: MessageStatus::from_proto(
-                            message.status.context("invalid status")?,
-                        ),
-                        timestamp: id.0,
-                        cache: None,
-                    },
-                    version: language::proto::deserialize_version(&insert.version),
-                })
-            }
-            proto::context_operation::Variant::UpdateMessage(update) => Ok(Self::UpdateMessage {
-                message_id: MessageId(language::proto::deserialize_timestamp(
-                    update.message_id.context("invalid message id")?,
-                )),
-                metadata: MessageMetadata {
-                    role: Role::from_proto(update.role),
-                    status: MessageStatus::from_proto(update.status.context("invalid status")?),
-                    timestamp: language::proto::deserialize_timestamp(
-                        update.timestamp.context("invalid timestamp")?,
-                    ),
-                    cache: None,
-                },
-                version: language::proto::deserialize_version(&update.version),
-            }),
-            proto::context_operation::Variant::UpdateSummary(update) => Ok(Self::UpdateSummary {
-                summary: TextThreadSummaryContent {
-                    text: update.summary,
-                    done: update.done,
-                    timestamp: language::proto::deserialize_timestamp(
-                        update.timestamp.context("invalid timestamp")?,
-                    ),
-                },
-                version: language::proto::deserialize_version(&update.version),
-            }),
-            proto::context_operation::Variant::SlashCommandStarted(message) => {
-                Ok(Self::SlashCommandStarted {
-                    id: InvokedSlashCommandId(language::proto::deserialize_timestamp(
-                        message.id.context("invalid id")?,
-                    )),
-                    output_range: language::proto::deserialize_anchor_range(
-                        message.output_range.context("invalid range")?,
-                    )?,
-                    name: message.name,
-                    version: language::proto::deserialize_version(&message.version),
-                })
-            }
-            proto::context_operation::Variant::SlashCommandOutputSectionAdded(message) => {
-                let section = message.section.context("missing section")?;
-                Ok(Self::SlashCommandOutputSectionAdded {
-                    timestamp: language::proto::deserialize_timestamp(
-                        message.timestamp.context("missing timestamp")?,
-                    ),
-                    section: SlashCommandOutputSection {
-                        range: language::proto::deserialize_anchor_range(
-                            section.range.context("invalid range")?,
-                        )?,
-                        icon: section.icon_name.parse()?,
-                        label: section.label.into(),
-                        metadata: section
-                            .metadata
-                            .and_then(|metadata| serde_json::from_str(&metadata).log_err()),
-                    },
-                    version: language::proto::deserialize_version(&message.version),
-                })
-            }
-            proto::context_operation::Variant::SlashCommandCompleted(message) => {
-                Ok(Self::SlashCommandFinished {
-                    id: InvokedSlashCommandId(language::proto::deserialize_timestamp(
-                        message.id.context("invalid id")?,
-                    )),
-                    timestamp: language::proto::deserialize_timestamp(
-                        message.timestamp.context("missing timestamp")?,
-                    ),
-                    error_message: message.error_message,
-                    version: language::proto::deserialize_version(&message.version),
-                })
-            }
-            proto::context_operation::Variant::ThoughtProcessOutputSectionAdded(message) => {
-                let section = message.section.context("missing section")?;
-                Ok(Self::ThoughtProcessOutputSectionAdded {
-                    timestamp: language::proto::deserialize_timestamp(
-                        message.timestamp.context("missing timestamp")?,
-                    ),
-                    section: ThoughtProcessOutputSection {
-                        range: language::proto::deserialize_anchor_range(
-                            section.range.context("invalid range")?,
-                        )?,
-                    },
-                    version: language::proto::deserialize_version(&message.version),
-                })
-            }
-            proto::context_operation::Variant::BufferOperation(op) => Ok(Self::BufferOperation(
-                language::proto::deserialize_operation(
-                    op.operation.context("invalid buffer operation")?,
-                )?,
-            )),
-        }
-    }
-
-    pub fn to_proto(&self) -> proto::ContextOperation {
-        match self {
-            Self::InsertMessage {
-                anchor,
-                metadata,
-                version,
-            } => proto::ContextOperation {
-                variant: Some(proto::context_operation::Variant::InsertMessage(
-                    proto::context_operation::InsertMessage {
-                        message: Some(proto::ContextMessage {
-                            id: Some(language::proto::serialize_timestamp(anchor.id.0)),
-                            start: Some(language::proto::serialize_anchor(&anchor.start)),
-                            role: metadata.role.to_proto() as i32,
-                            status: Some(metadata.status.to_proto()),
-                        }),
-                        version: language::proto::serialize_version(version),
-                    },
-                )),
-            },
-            Self::UpdateMessage {
-                message_id,
-                metadata,
-                version,
-            } => proto::ContextOperation {
-                variant: Some(proto::context_operation::Variant::UpdateMessage(
-                    proto::context_operation::UpdateMessage {
-                        message_id: Some(language::proto::serialize_timestamp(message_id.0)),
-                        role: metadata.role.to_proto() as i32,
-                        status: Some(metadata.status.to_proto()),
-                        timestamp: Some(language::proto::serialize_timestamp(metadata.timestamp)),
-                        version: language::proto::serialize_version(version),
-                    },
-                )),
-            },
-            Self::UpdateSummary { summary, version } => proto::ContextOperation {
-                variant: Some(proto::context_operation::Variant::UpdateSummary(
-                    proto::context_operation::UpdateSummary {
-                        summary: summary.text.clone(),
-                        done: summary.done,
-                        timestamp: Some(language::proto::serialize_timestamp(summary.timestamp)),
-                        version: language::proto::serialize_version(version),
-                    },
-                )),
-            },
-            Self::SlashCommandStarted {
-                id,
-                output_range,
-                name,
-                version,
-            } => proto::ContextOperation {
-                variant: Some(proto::context_operation::Variant::SlashCommandStarted(
-                    proto::context_operation::SlashCommandStarted {
-                        id: Some(language::proto::serialize_timestamp(id.0)),
-                        output_range: Some(language::proto::serialize_anchor_range(
-                            output_range.clone(),
-                        )),
-                        name: name.clone(),
-                        version: language::proto::serialize_version(version),
-                    },
-                )),
-            },
-            Self::SlashCommandOutputSectionAdded {
-                timestamp,
-                section,
-                version,
-            } => proto::ContextOperation {
-                variant: Some(
-                    proto::context_operation::Variant::SlashCommandOutputSectionAdded(
-                        proto::context_operation::SlashCommandOutputSectionAdded {
-                            timestamp: Some(language::proto::serialize_timestamp(*timestamp)),
-                            section: Some({
-                                let icon_name: &'static str = section.icon.into();
-                                proto::SlashCommandOutputSection {
-                                    range: Some(language::proto::serialize_anchor_range(
-                                        section.range.clone(),
-                                    )),
-                                    icon_name: icon_name.to_string(),
-                                    label: section.label.to_string(),
-                                    metadata: section.metadata.as_ref().and_then(|metadata| {
-                                        serde_json::to_string(metadata).log_err()
-                                    }),
-                                }
-                            }),
-                            version: language::proto::serialize_version(version),
-                        },
-                    ),
-                ),
-            },
-            Self::SlashCommandFinished {
-                id,
-                timestamp,
-                error_message,
-                version,
-            } => proto::ContextOperation {
-                variant: Some(proto::context_operation::Variant::SlashCommandCompleted(
-                    proto::context_operation::SlashCommandCompleted {
-                        id: Some(language::proto::serialize_timestamp(id.0)),
-                        timestamp: Some(language::proto::serialize_timestamp(*timestamp)),
-                        error_message: error_message.clone(),
-                        version: language::proto::serialize_version(version),
-                    },
-                )),
-            },
-            Self::ThoughtProcessOutputSectionAdded {
-                timestamp,
-                section,
-                version,
-            } => proto::ContextOperation {
-                variant: Some(
-                    proto::context_operation::Variant::ThoughtProcessOutputSectionAdded(
-                        proto::context_operation::ThoughtProcessOutputSectionAdded {
-                            timestamp: Some(language::proto::serialize_timestamp(*timestamp)),
-                            section: Some({
-                                proto::ThoughtProcessOutputSection {
-                                    range: Some(language::proto::serialize_anchor_range(
-                                        section.range.clone(),
-                                    )),
-                                }
-                            }),
-                            version: language::proto::serialize_version(version),
-                        },
-                    ),
-                ),
-            },
-            Self::BufferOperation(operation) => proto::ContextOperation {
-                variant: Some(proto::context_operation::Variant::BufferOperation(
-                    proto::context_operation::BufferOperation {
-                        operation: Some(language::proto::serialize_operation(operation)),
-                    },
-                )),
-            },
-        }
-    }
-
-    fn timestamp(&self) -> clock::Lamport {
-        match self {
-            Self::InsertMessage { anchor, .. } => anchor.id.0,
-            Self::UpdateMessage { metadata, .. } => metadata.timestamp,
-            Self::UpdateSummary { summary, .. } => summary.timestamp,
-            Self::SlashCommandStarted { id, .. } => id.0,
-            Self::SlashCommandOutputSectionAdded { timestamp, .. }
-            | Self::SlashCommandFinished { timestamp, .. }
-            | Self::ThoughtProcessOutputSectionAdded { timestamp, .. } => *timestamp,
-            Self::BufferOperation(_) => {
-                panic!("reading the timestamp of a buffer operation is not supported")
-            }
-        }
-    }
-
-    /// Returns the current version of the context operation.
-    pub fn version(&self) -> &clock::Global {
-        match self {
-            Self::InsertMessage { version, .. }
-            | Self::UpdateMessage { version, .. }
-            | Self::UpdateSummary { version, .. }
-            | Self::SlashCommandStarted { version, .. }
-            | Self::SlashCommandOutputSectionAdded { version, .. }
-            | Self::SlashCommandFinished { version, .. }
-            | Self::ThoughtProcessOutputSectionAdded { version, .. } => version,
-            Self::BufferOperation(_) => {
-                panic!("reading the version of a buffer operation is not supported")
-            }
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub enum TextThreadEvent {
-    ShowAssistError(SharedString),
-    ShowPaymentRequiredError,
-    MessagesEdited,
-    SummaryChanged,
-    SummaryGenerated,
-    PathChanged {
-        old_path: Option<Arc<Path>>,
-        new_path: Arc<Path>,
-    },
-    StreamedCompletion,
-    StartedThoughtProcess(Range<language::Anchor>),
-    EndedThoughtProcess(language::Anchor),
-    InvokedSlashCommandChanged {
-        command_id: InvokedSlashCommandId,
-    },
-    ParsedSlashCommandsUpdated {
-        removed: Vec<Range<language::Anchor>>,
-        updated: Vec<ParsedSlashCommand>,
-    },
-    SlashCommandOutputSectionAdded {
-        section: SlashCommandOutputSection<language::Anchor>,
-    },
-    Operation(TextThreadOperation),
-}
-
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub enum TextThreadSummary {
-    Pending,
-    Content(TextThreadSummaryContent),
-    Error,
-}
-
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub struct TextThreadSummaryContent {
-    pub text: String,
-    pub done: bool,
-    pub timestamp: clock::Lamport,
-}
-
-impl TextThreadSummary {
-    pub const DEFAULT: &str = "New Text Thread";
-
-    pub fn or_default(&self) -> SharedString {
-        self.unwrap_or(Self::DEFAULT)
-    }
-
-    pub fn unwrap_or(&self, message: impl Into<SharedString>) -> SharedString {
-        self.content()
-            .map_or_else(|| message.into(), |content| content.text.clone().into())
-    }
-
-    pub fn content(&self) -> Option<&TextThreadSummaryContent> {
-        match self {
-            TextThreadSummary::Content(content) => Some(content),
-            TextThreadSummary::Pending | TextThreadSummary::Error => None,
-        }
-    }
-
-    fn content_as_mut(&mut self) -> Option<&mut TextThreadSummaryContent> {
-        match self {
-            TextThreadSummary::Content(content) => Some(content),
-            TextThreadSummary::Pending | TextThreadSummary::Error => None,
-        }
-    }
-
-    fn content_or_set_empty(&mut self) -> &mut TextThreadSummaryContent {
-        match self {
-            TextThreadSummary::Content(content) => content,
-            TextThreadSummary::Pending | TextThreadSummary::Error => {
-                let content = TextThreadSummaryContent {
-                    text: "".to_string(),
-                    done: false,
-                    timestamp: clock::Lamport::MIN,
-                };
-                *self = TextThreadSummary::Content(content);
-                self.content_as_mut().unwrap()
-            }
-        }
-    }
-
-    pub fn is_pending(&self) -> bool {
-        matches!(self, TextThreadSummary::Pending)
-    }
-
-    fn timestamp(&self) -> Option<clock::Lamport> {
-        match self {
-            TextThreadSummary::Content(content) => Some(content.timestamp),
-            TextThreadSummary::Pending | TextThreadSummary::Error => None,
-        }
-    }
-}
-
-impl PartialOrd for TextThreadSummary {
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        self.timestamp().partial_cmp(&other.timestamp())
-    }
-}
-
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub struct MessageAnchor {
-    pub id: MessageId,
-    pub start: language::Anchor,
-}
-
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub enum CacheStatus {
-    Pending,
-    Cached,
-}
-
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub struct MessageCacheMetadata {
-    pub is_anchor: bool,
-    pub is_final_anchor: bool,
-    pub status: CacheStatus,
-    pub cached_at: clock::Global,
-}
-
-#[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize)]
-pub struct MessageMetadata {
-    pub role: Role,
-    pub status: MessageStatus,
-    pub timestamp: clock::Lamport,
-    #[serde(skip)]
-    pub cache: Option<MessageCacheMetadata>,
-}
-
-impl From<&Message> for MessageMetadata {
-    fn from(message: &Message) -> Self {
-        Self {
-            role: message.role,
-            status: message.status.clone(),
-            timestamp: message.id.0,
-            cache: message.cache.clone(),
-        }
-    }
-}
-
-impl MessageMetadata {
-    pub fn is_cache_valid(&self, buffer: &BufferSnapshot, range: &Range<usize>) -> bool {
-        match &self.cache {
-            Some(MessageCacheMetadata { cached_at, .. }) => !buffer.has_edits_since_in_range(
-                cached_at,
-                Range {
-                    start: buffer.anchor_at(range.start, Bias::Right),
-                    end: buffer.anchor_at(range.end, Bias::Left),
-                },
-            ),
-            _ => false,
-        }
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct ThoughtProcessOutputSection<T> {
-    pub range: Range<T>,
-}
-
-impl ThoughtProcessOutputSection<language::Anchor> {
-    pub fn is_valid(&self, buffer: &language::TextBuffer) -> bool {
-        self.range.start.is_valid(buffer) && !self.range.to_offset(buffer).is_empty()
-    }
-}
-
-#[derive(Clone, Debug)]
-pub struct Message {
-    pub offset_range: Range<usize>,
-    pub index_range: Range<usize>,
-    pub anchor_range: Range<language::Anchor>,
-    pub id: MessageId,
-    pub role: Role,
-    pub status: MessageStatus,
-    pub cache: Option<MessageCacheMetadata>,
-}
-
-#[derive(Debug, Clone)]
-pub enum Content {
-    Image {
-        anchor: language::Anchor,
-        image_id: u64,
-        render_image: Arc<RenderImage>,
-        image: Shared<Task<Option<LanguageModelImage>>>,
-    },
-}
-
-impl Content {
-    fn range(&self) -> Range<language::Anchor> {
-        match self {
-            Self::Image { anchor, .. } => *anchor..*anchor,
-        }
-    }
-
-    fn cmp(&self, other: &Self, buffer: &BufferSnapshot) -> Ordering {
-        let self_range = self.range();
-        let other_range = other.range();
-        if self_range.end.cmp(&other_range.start, buffer).is_lt() {
-            Ordering::Less
-        } else if self_range.start.cmp(&other_range.end, buffer).is_gt() {
-            Ordering::Greater
-        } else {
-            Ordering::Equal
-        }
-    }
-}
-
-struct PendingCompletion {
-    id: usize,
-    assistant_message_id: MessageId,
-    _task: Task<()>,
-}
-
-#[derive(Copy, Clone, Debug, Hash, Eq, PartialEq)]
-pub struct InvokedSlashCommandId(clock::Lamport);
-
-pub struct TextThread {
-    id: TextThreadId,
-    timestamp: clock::Lamport,
-    version: clock::Global,
-    pub(crate) pending_ops: Vec<TextThreadOperation>,
-    operations: Vec<TextThreadOperation>,
-    buffer: Entity<Buffer>,
-    pub(crate) parsed_slash_commands: Vec<ParsedSlashCommand>,
-    invoked_slash_commands: HashMap<InvokedSlashCommandId, InvokedSlashCommand>,
-    edits_since_last_parse: language::Subscription<usize>,
-    slash_commands: Arc<SlashCommandWorkingSet>,
-    pub(crate) slash_command_output_sections: Vec<SlashCommandOutputSection<language::Anchor>>,
-    thought_process_output_sections: Vec<ThoughtProcessOutputSection<language::Anchor>>,
-    pub(crate) message_anchors: Vec<MessageAnchor>,
-    contents: Vec<Content>,
-    pub(crate) messages_metadata: HashMap<MessageId, MessageMetadata>,
-    summary: TextThreadSummary,
-    summary_task: Task<Option<()>>,
-    completion_count: usize,
-    pending_completions: Vec<PendingCompletion>,
-    pub(crate) token_count: Option<u64>,
-    pending_token_count: Task<Option<()>>,
-    pending_save: Task<Result<()>>,
-    pending_cache_warming_task: Task<Option<()>>,
-    path: Option<Arc<Path>>,
-    _subscriptions: Vec<Subscription>,
-    telemetry: Option<Arc<Telemetry>>,
-    language_registry: Arc<LanguageRegistry>,
-    project: Option<WeakEntity<Project>>,
-    prompt_builder: Arc<PromptBuilder>,
-    completion_mode: agent_settings::CompletionMode,
-}
-
-trait ContextAnnotation {
-    fn range(&self) -> &Range<language::Anchor>;
-}
-
-impl ContextAnnotation for ParsedSlashCommand {
-    fn range(&self) -> &Range<language::Anchor> {
-        &self.source_range
-    }
-}
-
-impl EventEmitter<TextThreadEvent> for TextThread {}
-
-impl TextThread {
-    pub fn local(
-        language_registry: Arc<LanguageRegistry>,
-        project: Option<WeakEntity<Project>>,
-        telemetry: Option<Arc<Telemetry>>,
-        prompt_builder: Arc<PromptBuilder>,
-        slash_commands: Arc<SlashCommandWorkingSet>,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        Self::new(
-            TextThreadId::new(),
-            ReplicaId::default(),
-            language::Capability::ReadWrite,
-            language_registry,
-            prompt_builder,
-            slash_commands,
-            project,
-            telemetry,
-            cx,
-        )
-    }
-
-    pub fn completion_mode(&self) -> agent_settings::CompletionMode {
-        self.completion_mode
-    }
-
-    pub fn set_completion_mode(&mut self, completion_mode: agent_settings::CompletionMode) {
-        self.completion_mode = completion_mode;
-    }
-
-    pub fn new(
-        id: TextThreadId,
-        replica_id: ReplicaId,
-        capability: language::Capability,
-        language_registry: Arc<LanguageRegistry>,
-        prompt_builder: Arc<PromptBuilder>,
-        slash_commands: Arc<SlashCommandWorkingSet>,
-        project: Option<WeakEntity<Project>>,
-        telemetry: Option<Arc<Telemetry>>,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let buffer = cx.new(|_cx| {
-            let buffer = Buffer::remote(
-                language::BufferId::new(1).unwrap(),
-                replica_id,
-                capability,
-                "",
-            );
-            buffer.set_language_registry(language_registry.clone());
-            buffer
-        });
-        let edits_since_last_slash_command_parse =
-            buffer.update(cx, |buffer, _| buffer.subscribe());
-        let mut this = Self {
-            id,
-            timestamp: clock::Lamport::new(replica_id),
-            version: clock::Global::new(),
-            pending_ops: Vec::new(),
-            operations: Vec::new(),
-            message_anchors: Default::default(),
-            contents: Default::default(),
-            messages_metadata: Default::default(),
-            parsed_slash_commands: Vec::new(),
-            invoked_slash_commands: HashMap::default(),
-            slash_command_output_sections: Vec::new(),
-            thought_process_output_sections: Vec::new(),
-            edits_since_last_parse: edits_since_last_slash_command_parse,
-            summary: TextThreadSummary::Pending,
-            summary_task: Task::ready(None),
-            completion_count: Default::default(),
-            pending_completions: Default::default(),
-            token_count: None,
-            pending_token_count: Task::ready(None),
-            pending_cache_warming_task: Task::ready(None),
-            _subscriptions: vec![cx.subscribe(&buffer, Self::handle_buffer_event)],
-            pending_save: Task::ready(Ok(())),
-            completion_mode: AgentSettings::get_global(cx).preferred_completion_mode,
-            path: None,
-            buffer,
-            telemetry,
-            project,
-            language_registry,
-            slash_commands,
-            prompt_builder,
-        };
-
-        let first_message_id = MessageId(clock::Lamport {
-            replica_id: ReplicaId::LOCAL,
-            value: 0,
-        });
-        let message = MessageAnchor {
-            id: first_message_id,
-            start: language::Anchor::min_for_buffer(this.buffer.read(cx).remote_id()),
-        };
-        this.messages_metadata.insert(
-            first_message_id,
-            MessageMetadata {
-                role: Role::User,
-                status: MessageStatus::Done,
-                timestamp: first_message_id.0,
-                cache: None,
-            },
-        );
-        this.message_anchors.push(message);
-
-        this.set_language(cx);
-        this.count_remaining_tokens(cx);
-        this
-    }
-
-    pub(crate) fn serialize(&self, cx: &App) -> SavedTextThread {
-        let buffer = self.buffer.read(cx);
-        SavedTextThread {
-            id: Some(self.id.clone()),
-            zed: "context".into(),
-            version: SavedTextThread::VERSION.into(),
-            text: buffer.text(),
-            messages: self
-                .messages(cx)
-                .map(|message| SavedMessage {
-                    id: message.id,
-                    start: message.offset_range.start,
-                    metadata: self.messages_metadata[&message.id].clone(),
-                })
-                .collect(),
-            summary: self
-                .summary
-                .content()
-                .map(|summary| summary.text.clone())
-                .unwrap_or_default(),
-            slash_command_output_sections: self
-                .slash_command_output_sections
-                .iter()
-                .filter_map(|section| {
-                    if section.is_valid(buffer) {
-                        let range = section.range.to_offset(buffer);
-                        Some(assistant_slash_command::SlashCommandOutputSection {
-                            range,
-                            icon: section.icon,
-                            label: section.label.clone(),
-                            metadata: section.metadata.clone(),
-                        })
-                    } else {
-                        None
-                    }
-                })
-                .collect(),
-            thought_process_output_sections: self
-                .thought_process_output_sections
-                .iter()
-                .filter_map(|section| {
-                    if section.is_valid(buffer) {
-                        let range = section.range.to_offset(buffer);
-                        Some(ThoughtProcessOutputSection { range })
-                    } else {
-                        None
-                    }
-                })
-                .collect(),
-        }
-    }
-
-    pub fn deserialize(
-        saved_context: SavedTextThread,
-        path: Arc<Path>,
-        language_registry: Arc<LanguageRegistry>,
-        prompt_builder: Arc<PromptBuilder>,
-        slash_commands: Arc<SlashCommandWorkingSet>,
-        project: Option<WeakEntity<Project>>,
-        telemetry: Option<Arc<Telemetry>>,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let id = saved_context.id.clone().unwrap_or_else(TextThreadId::new);
-        let mut this = Self::new(
-            id,
-            ReplicaId::default(),
-            language::Capability::ReadWrite,
-            language_registry,
-            prompt_builder,
-            slash_commands,
-            project,
-            telemetry,
-            cx,
-        );
-        this.path = Some(path);
-        this.buffer.update(cx, |buffer, cx| {
-            buffer.set_text(saved_context.text.as_str(), cx)
-        });
-        let operations = saved_context.into_ops(&this.buffer, cx);
-        this.apply_ops(operations, cx);
-        this
-    }
-
-    pub fn id(&self) -> &TextThreadId {
-        &self.id
-    }
-
-    pub fn replica_id(&self) -> ReplicaId {
-        self.timestamp.replica_id
-    }
-
-    pub fn version(&self, cx: &App) -> TextThreadVersion {
-        TextThreadVersion {
-            text_thread: self.version.clone(),
-            buffer: self.buffer.read(cx).version(),
-        }
-    }
-
-    pub fn slash_commands(&self) -> &Arc<SlashCommandWorkingSet> {
-        &self.slash_commands
-    }
-
-    pub fn set_capability(&mut self, capability: language::Capability, cx: &mut Context<Self>) {
-        self.buffer
-            .update(cx, |buffer, cx| buffer.set_capability(capability, cx));
-    }
-
-    fn next_timestamp(&mut self) -> clock::Lamport {
-        let timestamp = self.timestamp.tick();
-        self.version.observe(timestamp);
-        timestamp
-    }
-
-    pub fn serialize_ops(
-        &self,
-        since: &TextThreadVersion,
-        cx: &App,
-    ) -> Task<Vec<proto::ContextOperation>> {
-        let buffer_ops = self
-            .buffer
-            .read(cx)
-            .serialize_ops(Some(since.buffer.clone()), cx);
-
-        let mut context_ops = self
-            .operations
-            .iter()
-            .filter(|op| !since.text_thread.observed(op.timestamp()))
-            .cloned()
-            .collect::<Vec<_>>();
-        context_ops.extend(self.pending_ops.iter().cloned());
-
-        cx.background_spawn(async move {
-            let buffer_ops = buffer_ops.await;
-            context_ops.sort_unstable_by_key(|op| op.timestamp());
-            buffer_ops
-                .into_iter()
-                .map(|op| proto::ContextOperation {
-                    variant: Some(proto::context_operation::Variant::BufferOperation(
-                        proto::context_operation::BufferOperation {
-                            operation: Some(op),
-                        },
-                    )),
-                })
-                .chain(context_ops.into_iter().map(|op| op.to_proto()))
-                .collect()
-        })
-    }
-
-    pub fn apply_ops(
-        &mut self,
-        ops: impl IntoIterator<Item = TextThreadOperation>,
-        cx: &mut Context<Self>,
-    ) {
-        let mut buffer_ops = Vec::new();
-        for op in ops {
-            match op {
-                TextThreadOperation::BufferOperation(buffer_op) => buffer_ops.push(buffer_op),
-                op @ _ => self.pending_ops.push(op),
-            }
-        }
-        self.buffer
-            .update(cx, |buffer, cx| buffer.apply_ops(buffer_ops, cx));
-        self.flush_ops(cx);
-    }
-
-    fn flush_ops(&mut self, cx: &mut Context<TextThread>) {
-        let mut changed_messages = HashSet::default();
-        let mut summary_generated = false;
-
-        self.pending_ops.sort_unstable_by_key(|op| op.timestamp());
-        for op in mem::take(&mut self.pending_ops) {
-            if !self.can_apply_op(&op, cx) {
-                self.pending_ops.push(op);
-                continue;
-            }
-
-            let timestamp = op.timestamp();
-            match op.clone() {
-                TextThreadOperation::InsertMessage {
-                    anchor, metadata, ..
-                } => {
-                    if self.messages_metadata.contains_key(&anchor.id) {
-                        // We already applied this operation.
-                    } else {
-                        changed_messages.insert(anchor.id);
-                        self.insert_message(anchor, metadata, cx);
-                    }
-                }
-                TextThreadOperation::UpdateMessage {
-                    message_id,
-                    metadata: new_metadata,
-                    ..
-                } => {
-                    let metadata = self.messages_metadata.get_mut(&message_id).unwrap();
-                    if new_metadata.timestamp > metadata.timestamp {
-                        *metadata = new_metadata;
-                        changed_messages.insert(message_id);
-                    }
-                }
-                TextThreadOperation::UpdateSummary {
-                    summary: new_summary,
-                    ..
-                } => {
-                    if self
-                        .summary
-                        .timestamp()
-                        .is_none_or(|current_timestamp| new_summary.timestamp > current_timestamp)
-                    {
-                        self.summary = TextThreadSummary::Content(new_summary);
-                        summary_generated = true;
-                    }
-                }
-                TextThreadOperation::SlashCommandStarted {
-                    id,
-                    output_range,
-                    name,
-                    ..
-                } => {
-                    self.invoked_slash_commands.insert(
-                        id,
-                        InvokedSlashCommand {
-                            name: name.into(),
-                            range: output_range,
-                            run_commands_in_ranges: Vec::new(),
-                            status: InvokedSlashCommandStatus::Running(Task::ready(())),
-                            transaction: None,
-                            timestamp: id.0,
-                        },
-                    );
-                    cx.emit(TextThreadEvent::InvokedSlashCommandChanged { command_id: id });
-                }
-                TextThreadOperation::SlashCommandOutputSectionAdded { section, .. } => {
-                    let buffer = self.buffer.read(cx);
-                    if let Err(ix) = self
-                        .slash_command_output_sections
-                        .binary_search_by(|probe| probe.range.cmp(&section.range, buffer))
-                    {
-                        self.slash_command_output_sections
-                            .insert(ix, section.clone());
-                        cx.emit(TextThreadEvent::SlashCommandOutputSectionAdded { section });
-                    }
-                }
-                TextThreadOperation::ThoughtProcessOutputSectionAdded { section, .. } => {
-                    let buffer = self.buffer.read(cx);
-                    if let Err(ix) = self
-                        .thought_process_output_sections
-                        .binary_search_by(|probe| probe.range.cmp(&section.range, buffer))
-                    {
-                        self.thought_process_output_sections
-                            .insert(ix, section.clone());
-                    }
-                }
-                TextThreadOperation::SlashCommandFinished {
-                    id,
-                    error_message,
-                    timestamp,
-                    ..
-                } => {
-                    if let Some(slash_command) = self.invoked_slash_commands.get_mut(&id)
-                        && timestamp > slash_command.timestamp
-                    {
-                        slash_command.timestamp = timestamp;
-                        match error_message {
-                            Some(message) => {
-                                slash_command.status =
-                                    InvokedSlashCommandStatus::Error(message.into());
-                            }
-                            None => {
-                                slash_command.status = InvokedSlashCommandStatus::Finished;
-                            }
-                        }
-                        cx.emit(TextThreadEvent::InvokedSlashCommandChanged { command_id: id });
-                    }
-                }
-                TextThreadOperation::BufferOperation(_) => unreachable!(),
-            }
-
-            self.version.observe(timestamp);
-            self.timestamp.observe(timestamp);
-            self.operations.push(op);
-        }
-
-        if !changed_messages.is_empty() {
-            self.message_roles_updated(changed_messages, cx);
-            cx.emit(TextThreadEvent::MessagesEdited);
-            cx.notify();
-        }
-
-        if summary_generated {
-            cx.emit(TextThreadEvent::SummaryChanged);
-            cx.emit(TextThreadEvent::SummaryGenerated);
-            cx.notify();
-        }
-    }
-
-    fn can_apply_op(&self, op: &TextThreadOperation, cx: &App) -> bool {
-        if !self.version.observed_all(op.version()) {
-            return false;
-        }
-
-        match op {
-            TextThreadOperation::InsertMessage { anchor, .. } => self
-                .buffer
-                .read(cx)
-                .version
-                .observed(anchor.start.timestamp),
-            TextThreadOperation::UpdateMessage { message_id, .. } => {
-                self.messages_metadata.contains_key(message_id)
-            }
-            TextThreadOperation::UpdateSummary { .. } => true,
-            TextThreadOperation::SlashCommandStarted { output_range, .. } => {
-                self.has_received_operations_for_anchor_range(output_range.clone(), cx)
-            }
-            TextThreadOperation::SlashCommandOutputSectionAdded { section, .. } => {
-                self.has_received_operations_for_anchor_range(section.range.clone(), cx)
-            }
-            TextThreadOperation::ThoughtProcessOutputSectionAdded { section, .. } => {
-                self.has_received_operations_for_anchor_range(section.range.clone(), cx)
-            }
-            TextThreadOperation::SlashCommandFinished { .. } => true,
-            TextThreadOperation::BufferOperation(_) => {
-                panic!("buffer operations should always be applied")
-            }
-        }
-    }
-
-    fn has_received_operations_for_anchor_range(
-        &self,
-        range: Range<text::Anchor>,
-        cx: &App,
-    ) -> bool {
-        let version = &self.buffer.read(cx).version;
-        let observed_start =
-            range.start.is_min() || range.start.is_max() || version.observed(range.start.timestamp);
-        let observed_end =
-            range.end.is_min() || range.end.is_max() || version.observed(range.end.timestamp);
-        observed_start && observed_end
-    }
-
-    fn push_op(&mut self, op: TextThreadOperation, cx: &mut Context<Self>) {
-        self.operations.push(op.clone());
-        cx.emit(TextThreadEvent::Operation(op));
-    }
-
-    pub fn buffer(&self) -> &Entity<Buffer> {
-        &self.buffer
-    }
-
-    pub fn language_registry(&self) -> Arc<LanguageRegistry> {
-        self.language_registry.clone()
-    }
-
-    pub fn prompt_builder(&self) -> Arc<PromptBuilder> {
-        self.prompt_builder.clone()
-    }
-
-    pub fn path(&self) -> Option<&Arc<Path>> {
-        self.path.as_ref()
-    }
-
-    pub fn summary(&self) -> &TextThreadSummary {
-        &self.summary
-    }
-
-    pub fn parsed_slash_commands(&self) -> &[ParsedSlashCommand] {
-        &self.parsed_slash_commands
-    }
-
-    pub fn invoked_slash_command(
-        &self,
-        command_id: &InvokedSlashCommandId,
-    ) -> Option<&InvokedSlashCommand> {
-        self.invoked_slash_commands.get(command_id)
-    }
-
-    pub fn slash_command_output_sections(&self) -> &[SlashCommandOutputSection<language::Anchor>] {
-        &self.slash_command_output_sections
-    }
-
-    pub fn thought_process_output_sections(
-        &self,
-    ) -> &[ThoughtProcessOutputSection<language::Anchor>] {
-        &self.thought_process_output_sections
-    }
-
-    pub fn contains_files(&self, cx: &App) -> bool {
-        let buffer = self.buffer.read(cx);
-        self.slash_command_output_sections.iter().any(|section| {
-            section.is_valid(buffer)
-                && section
-                    .metadata
-                    .as_ref()
-                    .and_then(|metadata| {
-                        serde_json::from_value::<FileCommandMetadata>(metadata.clone()).ok()
-                    })
-                    .is_some()
-        })
-    }
-
-    fn set_language(&mut self, cx: &mut Context<Self>) {
-        let markdown = self.language_registry.language_for_name("Markdown");
-        cx.spawn(async move |this, cx| {
-            let markdown = markdown.await?;
-            this.update(cx, |this, cx| {
-                this.buffer
-                    .update(cx, |buffer, cx| buffer.set_language(Some(markdown), cx));
-            })
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn handle_buffer_event(
-        &mut self,
-        _: Entity<Buffer>,
-        event: &language::BufferEvent,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            language::BufferEvent::Operation {
-                operation,
-                is_local: true,
-            } => cx.emit(TextThreadEvent::Operation(
-                TextThreadOperation::BufferOperation(operation.clone()),
-            )),
-            language::BufferEvent::Edited => {
-                self.count_remaining_tokens(cx);
-                self.reparse(cx);
-                cx.emit(TextThreadEvent::MessagesEdited);
-            }
-            _ => {}
-        }
-    }
-
-    pub fn token_count(&self) -> Option<u64> {
-        self.token_count
-    }
-
-    pub(crate) fn count_remaining_tokens(&mut self, cx: &mut Context<Self>) {
-        // Assume it will be a Chat request, even though that takes fewer tokens (and risks going over the limit),
-        // because otherwise you see in the UI that your empty message has a bunch of tokens already used.
-        let Some(model) = LanguageModelRegistry::read_global(cx).default_model() else {
-            return;
-        };
-        let request = self.to_completion_request(Some(&model.model), cx);
-        let debounce = self.token_count.is_some();
-        self.pending_token_count = cx.spawn(async move |this, cx| {
-            async move {
-                if debounce {
-                    cx.background_executor()
-                        .timer(Duration::from_millis(200))
-                        .await;
-                }
-
-                let token_count = cx
-                    .update(|cx| model.model.count_tokens(request, cx))?
-                    .await?;
-                this.update(cx, |this, cx| {
-                    this.token_count = Some(token_count);
-                    this.start_cache_warming(&model.model, cx);
-                    cx.notify()
-                })
-            }
-            .log_err()
-            .await
-        });
-    }
-
-    pub fn mark_cache_anchors(
-        &mut self,
-        cache_configuration: &Option<LanguageModelCacheConfiguration>,
-        speculative: bool,
-        cx: &mut Context<Self>,
-    ) -> bool {
-        let cache_configuration =
-            cache_configuration
-                .as_ref()
-                .unwrap_or(&LanguageModelCacheConfiguration {
-                    max_cache_anchors: 0,
-                    should_speculate: false,
-                    min_total_token: 0,
-                });
-
-        let messages: Vec<Message> = self.messages(cx).collect();
-
-        let mut sorted_messages = messages.clone();
-        if speculative {
-            // Avoid caching the last message if this is a speculative cache fetch as
-            // it's likely to change.
-            sorted_messages.pop();
-        }
-        sorted_messages.retain(|m| m.role == Role::User);
-        sorted_messages.sort_by(|a, b| b.offset_range.len().cmp(&a.offset_range.len()));
-
-        let cache_anchors = if self.token_count.unwrap_or(0) < cache_configuration.min_total_token {
-            // If we have't hit the minimum threshold to enable caching, don't cache anything.
-            0
-        } else {
-            // Save 1 anchor for the inline assistant to use.
-            max(cache_configuration.max_cache_anchors, 1) - 1
-        };
-        sorted_messages.truncate(cache_anchors);
-
-        let anchors: HashSet<MessageId> = sorted_messages
-            .into_iter()
-            .map(|message| message.id)
-            .collect();
-
-        let buffer = self.buffer.read(cx).snapshot();
-        let invalidated_caches: HashSet<MessageId> = messages
-            .iter()
-            .scan(false, |encountered_invalid, message| {
-                let message_id = message.id;
-                let is_invalid = self
-                    .messages_metadata
-                    .get(&message_id)
-                    .is_none_or(|metadata| {
-                        !metadata.is_cache_valid(&buffer, &message.offset_range)
-                            || *encountered_invalid
-                    });
-                *encountered_invalid |= is_invalid;
-                Some(if is_invalid { Some(message_id) } else { None })
-            })
-            .flatten()
-            .collect();
-
-        let last_anchor = messages.iter().rev().find_map(|message| {
-            if anchors.contains(&message.id) {
-                Some(message.id)
-            } else {
-                None
-            }
-        });
-
-        let mut new_anchor_needs_caching = false;
-        let current_version = &buffer.version;
-        // If we have no anchors, mark all messages as not being cached.
-        let mut hit_last_anchor = last_anchor.is_none();
-
-        for message in messages.iter() {
-            if hit_last_anchor {
-                self.update_metadata(message.id, cx, |metadata| metadata.cache = None);
-                continue;
-            }
-
-            if let Some(last_anchor) = last_anchor
-                && message.id == last_anchor
-            {
-                hit_last_anchor = true;
-            }
-
-            new_anchor_needs_caching = new_anchor_needs_caching
-                || (invalidated_caches.contains(&message.id) && anchors.contains(&message.id));
-
-            self.update_metadata(message.id, cx, |metadata| {
-                let cache_status = if invalidated_caches.contains(&message.id) {
-                    CacheStatus::Pending
-                } else {
-                    metadata
-                        .cache
-                        .as_ref()
-                        .map_or(CacheStatus::Pending, |cm| cm.status.clone())
-                };
-                metadata.cache = Some(MessageCacheMetadata {
-                    is_anchor: anchors.contains(&message.id),
-                    is_final_anchor: hit_last_anchor,
-                    status: cache_status,
-                    cached_at: current_version.clone(),
-                });
-            });
-        }
-        new_anchor_needs_caching
-    }
-
-    fn start_cache_warming(&mut self, model: &Arc<dyn LanguageModel>, cx: &mut Context<Self>) {
-        let cache_configuration = model.cache_configuration();
-
-        if !self.mark_cache_anchors(&cache_configuration, true, cx) {
-            return;
-        }
-        if !self.pending_completions.is_empty() {
-            return;
-        }
-        if let Some(cache_configuration) = cache_configuration
-            && !cache_configuration.should_speculate
-        {
-            return;
-        }
-
-        let request = {
-            let mut req = self.to_completion_request(Some(model), cx);
-            // Skip the last message because it's likely to change and
-            // therefore would be a waste to cache.
-            req.messages.pop();
-            req.messages.push(LanguageModelRequestMessage {
-                role: Role::User,
-                content: vec!["Respond only with OK, nothing else.".into()],
-                cache: false,
-                reasoning_details: None,
-            });
-            req
-        };
-
-        let model = Arc::clone(model);
-        self.pending_cache_warming_task = cx.spawn(async move |this, cx| {
-            async move {
-                match model.stream_completion(request, cx).await {
-                    Ok(mut stream) => {
-                        stream.next().await;
-                        log::info!("Cache warming completed successfully");
-                    }
-                    Err(e) => {
-                        log::warn!("Cache warming failed: {}", e);
-                    }
-                };
-                this.update(cx, |this, cx| {
-                    this.update_cache_status_for_completion(cx);
-                })
-                .ok();
-                anyhow::Ok(())
-            }
-            .log_err()
-            .await
-        });
-    }
-
-    pub fn update_cache_status_for_completion(&mut self, cx: &mut Context<Self>) {
-        let cached_message_ids: Vec<MessageId> = self
-            .messages_metadata
-            .iter()
-            .filter_map(|(message_id, metadata)| {
-                metadata.cache.as_ref().and_then(|cache| {
-                    if cache.status == CacheStatus::Pending {
-                        Some(*message_id)
-                    } else {
-                        None
-                    }
-                })
-            })
-            .collect();
-
-        for message_id in cached_message_ids {
-            self.update_metadata(message_id, cx, |metadata| {
-                if let Some(cache) = &mut metadata.cache {
-                    cache.status = CacheStatus::Cached;
-                }
-            });
-        }
-        cx.notify();
-    }
-
-    pub fn reparse(&mut self, cx: &mut Context<Self>) {
-        let buffer = self.buffer.read(cx).text_snapshot();
-        let mut row_ranges = self
-            .edits_since_last_parse
-            .consume()
-            .into_iter()
-            .map(|edit| {
-                let start_row = buffer.offset_to_point(edit.new.start).row;
-                let end_row = buffer.offset_to_point(edit.new.end).row + 1;
-                start_row..end_row
-            })
-            .peekable();
-
-        let mut removed_parsed_slash_command_ranges = Vec::new();
-        let mut updated_parsed_slash_commands = Vec::new();
-        while let Some(mut row_range) = row_ranges.next() {
-            while let Some(next_row_range) = row_ranges.peek() {
-                if row_range.end >= next_row_range.start {
-                    row_range.end = next_row_range.end;
-                    row_ranges.next();
-                } else {
-                    break;
-                }
-            }
-
-            let start = buffer.anchor_before(Point::new(row_range.start, 0));
-            let end = buffer.anchor_after(Point::new(
-                row_range.end - 1,
-                buffer.line_len(row_range.end - 1),
-            ));
-
-            self.reparse_slash_commands_in_range(
-                start..end,
-                &buffer,
-                &mut updated_parsed_slash_commands,
-                &mut removed_parsed_slash_command_ranges,
-                cx,
-            );
-            self.invalidate_pending_slash_commands(&buffer, cx);
-        }
-
-        if !updated_parsed_slash_commands.is_empty()
-            || !removed_parsed_slash_command_ranges.is_empty()
-        {
-            cx.emit(TextThreadEvent::ParsedSlashCommandsUpdated {
-                removed: removed_parsed_slash_command_ranges,
-                updated: updated_parsed_slash_commands,
-            });
-        }
-    }
-
-    fn reparse_slash_commands_in_range(
-        &mut self,
-        range: Range<text::Anchor>,
-        buffer: &BufferSnapshot,
-        updated: &mut Vec<ParsedSlashCommand>,
-        removed: &mut Vec<Range<text::Anchor>>,
-        cx: &App,
-    ) {
-        let old_range = self.pending_command_indices_for_range(range.clone(), cx);
-
-        let mut new_commands = Vec::new();
-        let mut lines = buffer.text_for_range(range).lines();
-        let mut offset = lines.offset();
-        while let Some(line) = lines.next() {
-            if let Some(command_line) = SlashCommandLine::parse(line) {
-                let name = &line[command_line.name.clone()];
-                let arguments = command_line
-                    .arguments
-                    .iter()
-                    .filter_map(|argument_range| {
-                        if argument_range.is_empty() {
-                            None
-                        } else {
-                            line.get(argument_range.clone())
-                        }
-                    })
-                    .map(ToOwned::to_owned)
-                    .collect::<SmallVec<_>>();
-                if let Some(command) = self.slash_commands.command(name, cx)
-                    && (!command.requires_argument() || !arguments.is_empty())
-                {
-                    let start_ix = offset + command_line.name.start - 1;
-                    let end_ix = offset
-                        + command_line
-                            .arguments
-                            .last()
-                            .map_or(command_line.name.end, |argument| argument.end);
-                    let source_range = buffer.anchor_after(start_ix)..buffer.anchor_after(end_ix);
-                    let pending_command = ParsedSlashCommand {
-                        name: name.to_string(),
-                        arguments,
-                        source_range,
-                        status: PendingSlashCommandStatus::Idle,
-                    };
-                    updated.push(pending_command.clone());
-                    new_commands.push(pending_command);
-                }
-            }
-
-            offset = lines.offset();
-        }
-
-        let removed_commands = self.parsed_slash_commands.splice(old_range, new_commands);
-        removed.extend(removed_commands.map(|command| command.source_range));
-    }
-
-    fn invalidate_pending_slash_commands(
-        &mut self,
-        buffer: &BufferSnapshot,
-        cx: &mut Context<Self>,
-    ) {
-        let mut invalidated_command_ids = Vec::new();
-        for (&command_id, command) in self.invoked_slash_commands.iter_mut() {
-            if !matches!(command.status, InvokedSlashCommandStatus::Finished)
-                && (!command.range.start.is_valid(buffer) || !command.range.end.is_valid(buffer))
-            {
-                command.status = InvokedSlashCommandStatus::Finished;
-                cx.emit(TextThreadEvent::InvokedSlashCommandChanged { command_id });
-                invalidated_command_ids.push(command_id);
-            }
-        }
-
-        for command_id in invalidated_command_ids {
-            let version = self.version.clone();
-            let timestamp = self.next_timestamp();
-            self.push_op(
-                TextThreadOperation::SlashCommandFinished {
-                    id: command_id,
-                    timestamp,
-                    error_message: None,
-                    version: version.clone(),
-                },
-                cx,
-            );
-        }
-    }
-
-    pub fn pending_command_for_position(
-        &mut self,
-        position: language::Anchor,
-        cx: &mut Context<Self>,
-    ) -> Option<&mut ParsedSlashCommand> {
-        let buffer = self.buffer.read(cx);
-        match self
-            .parsed_slash_commands
-            .binary_search_by(|probe| probe.source_range.end.cmp(&position, buffer))
-        {
-            Ok(ix) => Some(&mut self.parsed_slash_commands[ix]),
-            Err(ix) => {
-                let cmd = self.parsed_slash_commands.get_mut(ix)?;
-                if position.cmp(&cmd.source_range.start, buffer).is_ge()
-                    && position.cmp(&cmd.source_range.end, buffer).is_le()
-                {
-                    Some(cmd)
-                } else {
-                    None
-                }
-            }
-        }
-    }
-
-    pub fn pending_commands_for_range(
-        &self,
-        range: Range<language::Anchor>,
-        cx: &App,
-    ) -> &[ParsedSlashCommand] {
-        let range = self.pending_command_indices_for_range(range, cx);
-        &self.parsed_slash_commands[range]
-    }
-
-    fn pending_command_indices_for_range(
-        &self,
-        range: Range<language::Anchor>,
-        cx: &App,
-    ) -> Range<usize> {
-        self.indices_intersecting_buffer_range(&self.parsed_slash_commands, range, cx)
-    }
-
-    fn indices_intersecting_buffer_range<T: ContextAnnotation>(
-        &self,
-        all_annotations: &[T],
-        range: Range<language::Anchor>,
-        cx: &App,
-    ) -> Range<usize> {
-        let buffer = self.buffer.read(cx);
-        let start_ix = match all_annotations
-            .binary_search_by(|probe| probe.range().end.cmp(&range.start, buffer))
-        {
-            Ok(ix) | Err(ix) => ix,
-        };
-        let end_ix = match all_annotations
-            .binary_search_by(|probe| probe.range().start.cmp(&range.end, buffer))
-        {
-            Ok(ix) => ix + 1,
-            Err(ix) => ix,
-        };
-        start_ix..end_ix
-    }
-
-    pub fn insert_command_output(
-        &mut self,
-        command_source_range: Range<language::Anchor>,
-        name: &str,
-        output: Task<SlashCommandResult>,
-        ensure_trailing_newline: bool,
-        cx: &mut Context<Self>,
-    ) {
-        let version = self.version.clone();
-        let command_id = InvokedSlashCommandId(self.next_timestamp());
-
-        const PENDING_OUTPUT_END_MARKER: &str = "…";
-
-        let (command_range, command_source_range, insert_position, first_transaction) =
-            self.buffer.update(cx, |buffer, cx| {
-                let command_source_range = command_source_range.to_offset(buffer);
-                let mut insertion = format!("\n{PENDING_OUTPUT_END_MARKER}");
-                if ensure_trailing_newline {
-                    insertion.push('\n');
-                }
-
-                buffer.finalize_last_transaction();
-                buffer.start_transaction();
-                buffer.edit(
-                    [(
-                        command_source_range.end..command_source_range.end,
-                        insertion,
-                    )],
-                    None,
-                    cx,
-                );
-                let first_transaction = buffer.end_transaction(cx).unwrap();
-                buffer.finalize_last_transaction();
-
-                let insert_position = buffer.anchor_after(command_source_range.end + 1);
-                let command_range = buffer.anchor_after(command_source_range.start)
-                    ..buffer.anchor_before(
-                        command_source_range.end + 1 + PENDING_OUTPUT_END_MARKER.len(),
-                    );
-                let command_source_range = buffer.anchor_before(command_source_range.start)
-                    ..buffer.anchor_before(command_source_range.end + 1);
-                (
-                    command_range,
-                    command_source_range,
-                    insert_position,
-                    first_transaction,
-                )
-            });
-        self.reparse(cx);
-
-        let insert_output_task = cx.spawn(async move |this, cx| {
-            let run_command = async {
-                let mut stream = output.await?;
-
-                struct PendingSection {
-                    start: language::Anchor,
-                    icon: IconName,
-                    label: SharedString,
-                    metadata: Option<serde_json::Value>,
-                }
-
-                let mut pending_section_stack: Vec<PendingSection> = Vec::new();
-                let mut last_role: Option<Role> = None;
-                let mut last_section_range = None;
-
-                while let Some(event) = stream.next().await {
-                    let event = event?;
-                    this.update(cx, |this, cx| {
-                        this.buffer.update(cx, |buffer, _cx| {
-                            buffer.finalize_last_transaction();
-                            buffer.start_transaction()
-                        });
-
-                        match event {
-                            SlashCommandEvent::StartMessage {
-                                role,
-                                merge_same_roles,
-                            } => {
-                                if !merge_same_roles && Some(role) != last_role {
-                                    let buffer = this.buffer.read(cx);
-                                    let offset = insert_position.to_offset(buffer);
-                                    this.insert_message_at_offset(
-                                        offset,
-                                        role,
-                                        MessageStatus::Pending,
-                                        cx,
-                                    );
-                                }
-
-                                last_role = Some(role);
-                            }
-                            SlashCommandEvent::StartSection {
-                                icon,
-                                label,
-                                metadata,
-                            } => {
-                                this.buffer.update(cx, |buffer, cx| {
-                                    let insert_point = insert_position.to_point(buffer);
-                                    if insert_point.column > 0 {
-                                        buffer.edit([(insert_point..insert_point, "\n")], None, cx);
-                                    }
-
-                                    pending_section_stack.push(PendingSection {
-                                        start: buffer.anchor_before(insert_position),
-                                        icon,
-                                        label,
-                                        metadata,
-                                    });
-                                });
-                            }
-                            SlashCommandEvent::Content(SlashCommandContent::Text {
-                                text,
-                                run_commands_in_text,
-                            }) => {
-                                let start = this.buffer.read(cx).anchor_before(insert_position);
-
-                                this.buffer.update(cx, |buffer, cx| {
-                                    buffer.edit(
-                                        [(insert_position..insert_position, text)],
-                                        None,
-                                        cx,
-                                    )
-                                });
-
-                                let end = this.buffer.read(cx).anchor_before(insert_position);
-                                if run_commands_in_text
-                                    && let Some(invoked_slash_command) =
-                                        this.invoked_slash_commands.get_mut(&command_id)
-                                {
-                                    invoked_slash_command
-                                        .run_commands_in_ranges
-                                        .push(start..end);
-                                }
-                            }
-                            SlashCommandEvent::EndSection => {
-                                if let Some(pending_section) = pending_section_stack.pop() {
-                                    let offset_range = (pending_section.start..insert_position)
-                                        .to_offset(this.buffer.read(cx));
-                                    if !offset_range.is_empty() {
-                                        let range = this.buffer.update(cx, |buffer, _cx| {
-                                            buffer.anchor_after(offset_range.start)
-                                                ..buffer.anchor_before(offset_range.end)
-                                        });
-                                        this.insert_slash_command_output_section(
-                                            SlashCommandOutputSection {
-                                                range: range.clone(),
-                                                icon: pending_section.icon,
-                                                label: pending_section.label,
-                                                metadata: pending_section.metadata,
-                                            },
-                                            cx,
-                                        );
-                                        last_section_range = Some(range);
-                                    }
-                                }
-                            }
-                        }
-
-                        this.buffer.update(cx, |buffer, cx| {
-                            if let Some(event_transaction) = buffer.end_transaction(cx) {
-                                buffer.merge_transactions(event_transaction, first_transaction);
-                            }
-                        });
-                    })?;
-                }
-
-                this.update(cx, |this, cx| {
-                    this.buffer.update(cx, |buffer, cx| {
-                        buffer.finalize_last_transaction();
-                        buffer.start_transaction();
-
-                        let mut deletions = vec![(command_source_range.to_offset(buffer), "")];
-                        let insert_position = insert_position.to_offset(buffer);
-                        let command_range_end = command_range.end.to_offset(buffer);
-
-                        if buffer.contains_str_at(insert_position, PENDING_OUTPUT_END_MARKER) {
-                            deletions.push((
-                                insert_position..insert_position + PENDING_OUTPUT_END_MARKER.len(),
-                                "",
-                            ));
-                        }
-
-                        if ensure_trailing_newline
-                            && buffer
-                                .chars_at(command_range_end)
-                                .next()
-                                .is_some_and(|c| c == '\n')
-                        {
-                            if let Some((prev_char, '\n')) =
-                                buffer.reversed_chars_at(insert_position).next_tuple()
-                                && last_section_range.is_none_or(|last_section_range| {
-                                    !last_section_range
-                                        .to_offset(buffer)
-                                        .contains(&(insert_position - prev_char.len_utf8()))
-                                })
-                            {
-                                deletions.push((command_range_end..command_range_end + 1, ""));
-                            }
-                        }
-
-                        buffer.edit(deletions, None, cx);
-
-                        if let Some(deletion_transaction) = buffer.end_transaction(cx) {
-                            buffer.merge_transactions(deletion_transaction, first_transaction);
-                        }
-                    });
-                })?;
-
-                debug_assert!(pending_section_stack.is_empty());
-
-                anyhow::Ok(())
-            };
-
-            let command_result = run_command.await;
-
-            this.update(cx, |this, cx| {
-                let version = this.version.clone();
-                let timestamp = this.next_timestamp();
-                let Some(invoked_slash_command) = this.invoked_slash_commands.get_mut(&command_id)
-                else {
-                    return;
-                };
-                let mut error_message = None;
-                match command_result {
-                    Ok(()) => {
-                        invoked_slash_command.status = InvokedSlashCommandStatus::Finished;
-                    }
-                    Err(error) => {
-                        let message = error.to_string();
-                        invoked_slash_command.status =
-                            InvokedSlashCommandStatus::Error(message.clone().into());
-                        error_message = Some(message);
-                    }
-                }
-
-                cx.emit(TextThreadEvent::InvokedSlashCommandChanged { command_id });
-                this.push_op(
-                    TextThreadOperation::SlashCommandFinished {
-                        id: command_id,
-                        timestamp,
-                        error_message,
-                        version,
-                    },
-                    cx,
-                );
-            })
-            .ok();
-        });
-
-        self.invoked_slash_commands.insert(
-            command_id,
-            InvokedSlashCommand {
-                name: name.to_string().into(),
-                range: command_range.clone(),
-                run_commands_in_ranges: Vec::new(),
-                status: InvokedSlashCommandStatus::Running(insert_output_task),
-                transaction: Some(first_transaction),
-                timestamp: command_id.0,
-            },
-        );
-        cx.emit(TextThreadEvent::InvokedSlashCommandChanged { command_id });
-        self.push_op(
-            TextThreadOperation::SlashCommandStarted {
-                id: command_id,
-                output_range: command_range,
-                name: name.to_string(),
-                version,
-            },
-            cx,
-        );
-    }
-
-    fn insert_slash_command_output_section(
-        &mut self,
-        section: SlashCommandOutputSection<language::Anchor>,
-        cx: &mut Context<Self>,
-    ) {
-        let buffer = self.buffer.read(cx);
-        let insertion_ix = match self
-            .slash_command_output_sections
-            .binary_search_by(|probe| probe.range.cmp(&section.range, buffer))
-        {
-            Ok(ix) | Err(ix) => ix,
-        };
-        self.slash_command_output_sections
-            .insert(insertion_ix, section.clone());
-        cx.emit(TextThreadEvent::SlashCommandOutputSectionAdded {
-            section: section.clone(),
-        });
-        let version = self.version.clone();
-        let timestamp = self.next_timestamp();
-        self.push_op(
-            TextThreadOperation::SlashCommandOutputSectionAdded {
-                timestamp,
-                section,
-                version,
-            },
-            cx,
-        );
-    }
-
-    fn insert_thought_process_output_section(
-        &mut self,
-        section: ThoughtProcessOutputSection<language::Anchor>,
-        cx: &mut Context<Self>,
-    ) {
-        let buffer = self.buffer.read(cx);
-        let insertion_ix = match self
-            .thought_process_output_sections
-            .binary_search_by(|probe| probe.range.cmp(&section.range, buffer))
-        {
-            Ok(ix) | Err(ix) => ix,
-        };
-        self.thought_process_output_sections
-            .insert(insertion_ix, section.clone());
-        // cx.emit(ContextEvent::ThoughtProcessOutputSectionAdded {
-        //     section: section.clone(),
-        // });
-        let version = self.version.clone();
-        let timestamp = self.next_timestamp();
-        self.push_op(
-            TextThreadOperation::ThoughtProcessOutputSectionAdded {
-                timestamp,
-                section,
-                version,
-            },
-            cx,
-        );
-    }
-
-    pub fn completion_provider_changed(&mut self, cx: &mut Context<Self>) {
-        self.count_remaining_tokens(cx);
-    }
-
-    fn get_last_valid_message_id(&self, cx: &Context<Self>) -> Option<MessageId> {
-        self.message_anchors.iter().rev().find_map(|message| {
-            message
-                .start
-                .is_valid(self.buffer.read(cx))
-                .then_some(message.id)
-        })
-    }
-
-    pub fn assist(&mut self, cx: &mut Context<Self>) -> Option<MessageAnchor> {
-        let model_registry = LanguageModelRegistry::read_global(cx);
-        let model = model_registry.default_model()?;
-        let last_message_id = self.get_last_valid_message_id(cx)?;
-
-        if !model.provider.is_authenticated(cx) {
-            log::info!("completion provider has no credentials");
-            return None;
-        }
-
-        let model = model.model;
-
-        // Compute which messages to cache, including the last one.
-        self.mark_cache_anchors(&model.cache_configuration(), false, cx);
-
-        let request = self.to_completion_request(Some(&model), cx);
-
-        let assistant_message = self
-            .insert_message_after(last_message_id, Role::Assistant, MessageStatus::Pending, cx)
-            .unwrap();
-
-        // Queue up the user's next reply.
-        let user_message = self
-            .insert_message_after(assistant_message.id, Role::User, MessageStatus::Done, cx)
-            .unwrap();
-
-        let pending_completion_id = post_inc(&mut self.completion_count);
-
-        let task = cx.spawn({
-            async move |this, cx| {
-                let stream = model.stream_completion(request, cx);
-                let assistant_message_id = assistant_message.id;
-                let mut response_latency = None;
-                let stream_completion = async {
-                    let request_start = Instant::now();
-                    let mut events = stream.await?;
-                    let mut stop_reason = StopReason::EndTurn;
-                    let mut thought_process_stack = Vec::new();
-
-                    const THOUGHT_PROCESS_START_MARKER: &str = "<think>\n";
-                    const THOUGHT_PROCESS_END_MARKER: &str = "\n</think>";
-
-                    while let Some(event) = events.next().await {
-                        if response_latency.is_none() {
-                            response_latency = Some(request_start.elapsed());
-                        }
-                        let event = event?;
-
-                        let mut context_event = None;
-                        let mut thought_process_output_section = None;
-
-                        this.update(cx, |this, cx| {
-                            let message_ix = this
-                                .message_anchors
-                                .iter()
-                                .position(|message| message.id == assistant_message_id)?;
-                            this.buffer.update(cx, |buffer, cx| {
-                                let message_old_end_offset = this.message_anchors[message_ix + 1..]
-                                    .iter()
-                                    .find(|message| message.start.is_valid(buffer))
-                                    .map_or(buffer.len(), |message| {
-                                        message.start.to_offset(buffer).saturating_sub(1)
-                                    });
-
-                                match event {
-                                    LanguageModelCompletionEvent::Started |
-                                    LanguageModelCompletionEvent::Queued {..} |
-                                    LanguageModelCompletionEvent::ToolUseLimitReached { .. } => {}
-                                    LanguageModelCompletionEvent::UsageUpdated { amount, limit } => {
-                                        this.update_model_request_usage(
-                                            amount as u32,
-                                            limit,
-                                            cx,
-                                        );
-                                    }
-                                    LanguageModelCompletionEvent::StartMessage { .. } => {}
-                                    LanguageModelCompletionEvent::ReasoningDetails(_) => {
-                                        // ReasoningDetails are metadata (signatures, encrypted data, format info)
-                                        // used for request/response validation, not UI content.
-                                        // The displayable thinking text is already handled by the Thinking event.
-                                    }
-                                    LanguageModelCompletionEvent::Stop(reason) => {
-                                        stop_reason = reason;
-                                    }
-                                    LanguageModelCompletionEvent::Thinking { text: chunk, .. } => {
-                                        if thought_process_stack.is_empty() {
-                                            let start =
-                                                buffer.anchor_before(message_old_end_offset);
-                                            thought_process_stack.push(start);
-                                            let chunk =
-                                                format!("{THOUGHT_PROCESS_START_MARKER}{chunk}{THOUGHT_PROCESS_END_MARKER}");
-                                            let chunk_len = chunk.len();
-                                            buffer.edit(
-                                                [(
-                                                    message_old_end_offset..message_old_end_offset,
-                                                    chunk,
-                                                )],
-                                                None,
-                                                cx,
-                                            );
-                                            let end = buffer
-                                                .anchor_before(message_old_end_offset + chunk_len);
-                                            context_event = Some(
-                                                TextThreadEvent::StartedThoughtProcess(start..end),
-                                            );
-                                        } else {
-                                            // This ensures that all the thinking chunks are inserted inside the thinking tag
-                                            let insertion_position =
-                                                message_old_end_offset - THOUGHT_PROCESS_END_MARKER.len();
-                                            buffer.edit(
-                                                [(insertion_position..insertion_position, chunk)],
-                                                None,
-                                                cx,
-                                            );
-                                        }
-                                    }
-                                    LanguageModelCompletionEvent::RedactedThinking { .. } => {},
-                                    LanguageModelCompletionEvent::Text(mut chunk) => {
-                                        if let Some(start) = thought_process_stack.pop() {
-                                            let end = buffer.anchor_before(message_old_end_offset);
-                                            context_event =
-                                                Some(TextThreadEvent::EndedThoughtProcess(end));
-                                            thought_process_output_section =
-                                                Some(ThoughtProcessOutputSection {
-                                                    range: start..end,
-                                                });
-                                            chunk.insert_str(0, "\n\n");
-                                        }
-
-                                        buffer.edit(
-                                            [(
-                                                message_old_end_offset..message_old_end_offset,
-                                                chunk,
-                                            )],
-                                            None,
-                                            cx,
-                                        );
-                                    }
-                                    LanguageModelCompletionEvent::ToolUse(_) |
-                                    LanguageModelCompletionEvent::ToolUseJsonParseError { .. } |
-                                    LanguageModelCompletionEvent::UsageUpdate(_) => {}
-                                }
-                            });
-
-                            if let Some(section) = thought_process_output_section.take() {
-                                this.insert_thought_process_output_section(section, cx);
-                            }
-                            if let Some(context_event) = context_event.take() {
-                                cx.emit(context_event);
-                            }
-
-                            cx.emit(TextThreadEvent::StreamedCompletion);
-
-                            Some(())
-                        })?;
-                        smol::future::yield_now().await;
-                    }
-                    this.update(cx, |this, cx| {
-                        this.pending_completions
-                            .retain(|completion| completion.id != pending_completion_id);
-                        this.summarize(false, cx);
-                        this.update_cache_status_for_completion(cx);
-                    })?;
-
-                    anyhow::Ok(stop_reason)
-                };
-
-                let result = stream_completion.await;
-
-                this.update(cx, |this, cx| {
-                    let error_message = if let Some(error) = result.as_ref().err() {
-                        if error.is::<PaymentRequiredError>() {
-                            cx.emit(TextThreadEvent::ShowPaymentRequiredError);
-                            this.update_metadata(assistant_message_id, cx, |metadata| {
-                                metadata.status = MessageStatus::Canceled;
-                            });
-                            Some(error.to_string())
-                        } else {
-                            let error_message = error
-                                .chain()
-                                .map(|err| err.to_string())
-                                .collect::<Vec<_>>()
-                                .join("\n");
-                            cx.emit(TextThreadEvent::ShowAssistError(SharedString::from(
-                                error_message.clone(),
-                            )));
-                            this.update_metadata(assistant_message_id, cx, |metadata| {
-                                metadata.status =
-                                    MessageStatus::Error(SharedString::from(error_message.clone()));
-                            });
-                            Some(error_message)
-                        }
-                    } else {
-                        this.update_metadata(assistant_message_id, cx, |metadata| {
-                            metadata.status = MessageStatus::Done;
-                        });
-                        None
-                    };
-
-                    let language_name = this
-                        .buffer
-                        .read(cx)
-                        .language()
-                        .map(|language| language.name());
-                    report_assistant_event(
-                        AssistantEventData {
-                            conversation_id: Some(this.id.0.clone()),
-                            kind: AssistantKind::Panel,
-                            phase: AssistantPhase::Response,
-                            message_id: None,
-                            model: model.telemetry_id(),
-                            model_provider: model.provider_id().to_string(),
-                            response_latency,
-                            error_message,
-                            language_name: language_name.map(|name| name.to_proto()),
-                        },
-                        this.telemetry.clone(),
-                        cx.http_client(),
-                        model.api_key(cx),
-                        cx.background_executor(),
-                    );
-
-                    if let Ok(stop_reason) = result {
-                        match stop_reason {
-                            StopReason::ToolUse => {}
-                            StopReason::EndTurn => {}
-                            StopReason::MaxTokens => {}
-                            StopReason::Refusal => {}
-                        }
-                    }
-                })
-                .ok();
-            }
-        });
-
-        self.pending_completions.push(PendingCompletion {
-            id: pending_completion_id,
-            assistant_message_id: assistant_message.id,
-            _task: task,
-        });
-
-        Some(user_message)
-    }
-
-    pub fn to_xml(&self, cx: &App) -> String {
-        let mut output = String::new();
-        let buffer = self.buffer.read(cx);
-        for message in self.messages(cx) {
-            if message.status != MessageStatus::Done {
-                continue;
-            }
-
-            writeln!(&mut output, "<{}>", message.role).unwrap();
-            for chunk in buffer.text_for_range(message.offset_range) {
-                output.push_str(chunk);
-            }
-            if !output.ends_with('\n') {
-                output.push('\n');
-            }
-            writeln!(&mut output, "</{}>", message.role).unwrap();
-        }
-        output
-    }
-
-    pub fn to_completion_request(
-        &self,
-        model: Option<&Arc<dyn LanguageModel>>,
-        cx: &App,
-    ) -> LanguageModelRequest {
-        let buffer = self.buffer.read(cx);
-
-        let mut contents = self.contents(cx).peekable();
-
-        fn collect_text_content(buffer: &Buffer, range: Range<usize>) -> Option<String> {
-            let text: String = buffer.text_for_range(range).collect();
-            if text.trim().is_empty() {
-                None
-            } else {
-                Some(text)
-            }
-        }
-
-        let mut completion_request = LanguageModelRequest {
-            thread_id: None,
-            prompt_id: None,
-            intent: Some(CompletionIntent::UserPrompt),
-            mode: None,
-            messages: Vec::new(),
-            tools: Vec::new(),
-            tool_choice: None,
-            stop: Vec::new(),
-            temperature: model.and_then(|model| AgentSettings::temperature_for_model(model, cx)),
-            thinking_allowed: true,
-        };
-        for message in self.messages(cx) {
-            if message.status != MessageStatus::Done {
-                continue;
-            }
-
-            let mut offset = message.offset_range.start;
-            let mut request_message = LanguageModelRequestMessage {
-                role: message.role,
-                content: Vec::new(),
-                cache: message.cache.as_ref().is_some_and(|cache| cache.is_anchor),
-                reasoning_details: None,
-            };
-
-            while let Some(content) = contents.peek() {
-                if content
-                    .range()
-                    .end
-                    .cmp(&message.anchor_range.end, buffer)
-                    .is_lt()
-                {
-                    let content = contents.next().unwrap();
-                    let range = content.range().to_offset(buffer);
-                    request_message.content.extend(
-                        collect_text_content(buffer, offset..range.start).map(MessageContent::Text),
-                    );
-
-                    match content {
-                        Content::Image { image, .. } => {
-                            if let Some(image) = image.clone().now_or_never().flatten() {
-                                request_message
-                                    .content
-                                    .push(language_model::MessageContent::Image(image));
-                            }
-                        }
-                    }
-
-                    offset = range.end;
-                } else {
-                    break;
-                }
-            }
-
-            request_message.content.extend(
-                collect_text_content(buffer, offset..message.offset_range.end)
-                    .map(MessageContent::Text),
-            );
-
-            if !request_message.contents_empty() {
-                completion_request.messages.push(request_message);
-            }
-        }
-        let supports_burn_mode = if let Some(model) = model {
-            model.supports_burn_mode()
-        } else {
-            false
-        };
-
-        if supports_burn_mode {
-            completion_request.mode = Some(self.completion_mode.into());
-        }
-        completion_request
-    }
-
-    pub fn cancel_last_assist(&mut self, cx: &mut Context<Self>) -> bool {
-        if let Some(pending_completion) = self.pending_completions.pop() {
-            self.update_metadata(pending_completion.assistant_message_id, cx, |metadata| {
-                if metadata.status == MessageStatus::Pending {
-                    metadata.status = MessageStatus::Canceled;
-                }
-            });
-            true
-        } else {
-            false
-        }
-    }
-
-    pub fn cycle_message_roles(&mut self, ids: HashSet<MessageId>, cx: &mut Context<Self>) {
-        for id in &ids {
-            if let Some(metadata) = self.messages_metadata.get(id) {
-                let role = metadata.role.cycle();
-                self.update_metadata(*id, cx, |metadata| metadata.role = role);
-            }
-        }
-
-        self.message_roles_updated(ids, cx);
-    }
-
-    fn message_roles_updated(&mut self, ids: HashSet<MessageId>, cx: &mut Context<Self>) {
-        let mut ranges = Vec::new();
-        for message in self.messages(cx) {
-            if ids.contains(&message.id) {
-                ranges.push(message.anchor_range.clone());
-            }
-        }
-    }
-
-    pub fn update_metadata(
-        &mut self,
-        id: MessageId,
-        cx: &mut Context<Self>,
-        f: impl FnOnce(&mut MessageMetadata),
-    ) {
-        let version = self.version.clone();
-        let timestamp = self.next_timestamp();
-        if let Some(metadata) = self.messages_metadata.get_mut(&id) {
-            f(metadata);
-            metadata.timestamp = timestamp;
-            let operation = TextThreadOperation::UpdateMessage {
-                message_id: id,
-                metadata: metadata.clone(),
-                version,
-            };
-            self.push_op(operation, cx);
-            cx.emit(TextThreadEvent::MessagesEdited);
-            cx.notify();
-        }
-    }
-
-    pub fn insert_message_after(
-        &mut self,
-        message_id: MessageId,
-        role: Role,
-        status: MessageStatus,
-        cx: &mut Context<Self>,
-    ) -> Option<MessageAnchor> {
-        if let Some(prev_message_ix) = self
-            .message_anchors
-            .iter()
-            .position(|message| message.id == message_id)
-        {
-            // Find the next valid message after the one we were given.
-            let mut next_message_ix = prev_message_ix + 1;
-            while let Some(next_message) = self.message_anchors.get(next_message_ix) {
-                if next_message.start.is_valid(self.buffer.read(cx)) {
-                    break;
-                }
-                next_message_ix += 1;
-            }
-
-            let buffer = self.buffer.read(cx);
-            let offset = self
-                .message_anchors
-                .get(next_message_ix)
-                .map_or(buffer.len(), |message| {
-                    buffer.clip_offset(message.start.to_previous_offset(buffer), Bias::Left)
-                });
-            Some(self.insert_message_at_offset(offset, role, status, cx))
-        } else {
-            None
-        }
-    }
-
-    fn insert_message_at_offset(
-        &mut self,
-        offset: usize,
-        role: Role,
-        status: MessageStatus,
-        cx: &mut Context<Self>,
-    ) -> MessageAnchor {
-        let start = self.buffer.update(cx, |buffer, cx| {
-            buffer.edit([(offset..offset, "\n")], None, cx);
-            buffer.anchor_before(offset + 1)
-        });
-
-        let version = self.version.clone();
-        let anchor = MessageAnchor {
-            id: MessageId(self.next_timestamp()),
-            start,
-        };
-        let metadata = MessageMetadata {
-            role,
-            status,
-            timestamp: anchor.id.0,
-            cache: None,
-        };
-        self.insert_message(anchor.clone(), metadata.clone(), cx);
-        self.push_op(
-            TextThreadOperation::InsertMessage {
-                anchor: anchor.clone(),
-                metadata,
-                version,
-            },
-            cx,
-        );
-        anchor
-    }
-
-    pub fn insert_content(&mut self, content: Content, cx: &mut Context<Self>) {
-        let buffer = self.buffer.read(cx);
-        let insertion_ix = match self
-            .contents
-            .binary_search_by(|probe| probe.cmp(&content, buffer))
-        {
-            Ok(ix) => {
-                self.contents.remove(ix);
-                ix
-            }
-            Err(ix) => ix,
-        };
-        self.contents.insert(insertion_ix, content);
-        cx.emit(TextThreadEvent::MessagesEdited);
-    }
-
-    pub fn contents<'a>(&'a self, cx: &'a App) -> impl 'a + Iterator<Item = Content> {
-        let buffer = self.buffer.read(cx);
-        self.contents
-            .iter()
-            .filter(|content| {
-                let range = content.range();
-                range.start.is_valid(buffer) && range.end.is_valid(buffer)
-            })
-            .cloned()
-    }
-
-    pub fn split_message(
-        &mut self,
-        range: Range<usize>,
-        cx: &mut Context<Self>,
-    ) -> (Option<MessageAnchor>, Option<MessageAnchor>) {
-        let start_message = self.message_for_offset(range.start, cx);
-        let end_message = self.message_for_offset(range.end, cx);
-        if let Some((start_message, end_message)) = start_message.zip(end_message) {
-            // Prevent splitting when range spans multiple messages.
-            if start_message.id != end_message.id {
-                return (None, None);
-            }
-
-            let message = start_message;
-            let at_end = range.end >= message.offset_range.end.saturating_sub(1);
-            let role_after = if range.start == range.end || at_end {
-                Role::User
-            } else {
-                message.role
-            };
-            let role = message.role;
-            let mut edited_buffer = false;
-
-            let mut suffix_start = None;
-
-            // TODO: why did this start panicking?
-            if range.start > message.offset_range.start
-                && range.end < message.offset_range.end.saturating_sub(1)
-            {
-                if self.buffer.read(cx).chars_at(range.end).next() == Some('\n') {
-                    suffix_start = Some(range.end + 1);
-                } else if self.buffer.read(cx).reversed_chars_at(range.end).next() == Some('\n') {
-                    suffix_start = Some(range.end);
-                }
-            }
-
-            let version = self.version.clone();
-            let suffix = if let Some(suffix_start) = suffix_start {
-                MessageAnchor {
-                    id: MessageId(self.next_timestamp()),
-                    start: self.buffer.read(cx).anchor_before(suffix_start),
-                }
-            } else {
-                self.buffer.update(cx, |buffer, cx| {
-                    buffer.edit([(range.end..range.end, "\n")], None, cx);
-                });
-                edited_buffer = true;
-                MessageAnchor {
-                    id: MessageId(self.next_timestamp()),
-                    start: self.buffer.read(cx).anchor_before(range.end + 1),
-                }
-            };
-
-            let suffix_metadata = MessageMetadata {
-                role: role_after,
-                status: MessageStatus::Done,
-                timestamp: suffix.id.0,
-                cache: None,
-            };
-            self.insert_message(suffix.clone(), suffix_metadata.clone(), cx);
-            self.push_op(
-                TextThreadOperation::InsertMessage {
-                    anchor: suffix.clone(),
-                    metadata: suffix_metadata,
-                    version,
-                },
-                cx,
-            );
-
-            let new_messages =
-                if range.start == range.end || range.start == message.offset_range.start {
-                    (None, Some(suffix))
-                } else {
-                    let mut prefix_end = None;
-                    if range.start > message.offset_range.start
-                        && range.end < message.offset_range.end - 1
-                    {
-                        if self.buffer.read(cx).chars_at(range.start).next() == Some('\n') {
-                            prefix_end = Some(range.start + 1);
-                        } else if self.buffer.read(cx).reversed_chars_at(range.start).next()
-                            == Some('\n')
-                        {
-                            prefix_end = Some(range.start);
-                        }
-                    }
-
-                    let version = self.version.clone();
-                    let selection = if let Some(prefix_end) = prefix_end {
-                        MessageAnchor {
-                            id: MessageId(self.next_timestamp()),
-                            start: self.buffer.read(cx).anchor_before(prefix_end),
-                        }
-                    } else {
-                        self.buffer.update(cx, |buffer, cx| {
-                            buffer.edit([(range.start..range.start, "\n")], None, cx)
-                        });
-                        edited_buffer = true;
-                        MessageAnchor {
-                            id: MessageId(self.next_timestamp()),
-                            start: self.buffer.read(cx).anchor_before(range.end + 1),
-                        }
-                    };
-
-                    let selection_metadata = MessageMetadata {
-                        role,
-                        status: MessageStatus::Done,
-                        timestamp: selection.id.0,
-                        cache: None,
-                    };
-                    self.insert_message(selection.clone(), selection_metadata.clone(), cx);
-                    self.push_op(
-                        TextThreadOperation::InsertMessage {
-                            anchor: selection.clone(),
-                            metadata: selection_metadata,
-                            version,
-                        },
-                        cx,
-                    );
-
-                    (Some(selection), Some(suffix))
-                };
-
-            if !edited_buffer {
-                cx.emit(TextThreadEvent::MessagesEdited);
-            }
-            new_messages
-        } else {
-            (None, None)
-        }
-    }
-
-    fn insert_message(
-        &mut self,
-        new_anchor: MessageAnchor,
-        new_metadata: MessageMetadata,
-        cx: &mut Context<Self>,
-    ) {
-        cx.emit(TextThreadEvent::MessagesEdited);
-
-        self.messages_metadata.insert(new_anchor.id, new_metadata);
-
-        let buffer = self.buffer.read(cx);
-        let insertion_ix = self
-            .message_anchors
-            .iter()
-            .position(|anchor| {
-                let comparison = new_anchor.start.cmp(&anchor.start, buffer);
-                comparison.is_lt() || (comparison.is_eq() && new_anchor.id > anchor.id)
-            })
-            .unwrap_or(self.message_anchors.len());
-        self.message_anchors.insert(insertion_ix, new_anchor);
-    }
-
-    pub fn summarize(&mut self, mut replace_old: bool, cx: &mut Context<Self>) {
-        let Some(model) = LanguageModelRegistry::read_global(cx).thread_summary_model() else {
-            return;
-        };
-
-        if replace_old || (self.message_anchors.len() >= 2 && self.summary.is_pending()) {
-            if !model.provider.is_authenticated(cx) {
-                return;
-            }
-
-            let mut request = self.to_completion_request(Some(&model.model), cx);
-            request.messages.push(LanguageModelRequestMessage {
-                role: Role::User,
-                content: vec![SUMMARIZE_THREAD_PROMPT.into()],
-                cache: false,
-                reasoning_details: None,
-            });
-
-            // If there is no summary, it is set with `done: false` so that "Loading Summary…" can
-            // be displayed.
-            match self.summary {
-                TextThreadSummary::Pending | TextThreadSummary::Error => {
-                    self.summary = TextThreadSummary::Content(TextThreadSummaryContent {
-                        text: "".to_string(),
-                        done: false,
-                        timestamp: clock::Lamport::MIN,
-                    });
-                    replace_old = true;
-                }
-                TextThreadSummary::Content(_) => {}
-            }
-
-            self.summary_task = cx.spawn(async move |this, cx| {
-                let result = async {
-                    let stream = model.model.stream_completion_text(request, cx);
-                    let mut messages = stream.await?;
-
-                    let mut replaced = !replace_old;
-                    while let Some(message) = messages.stream.next().await {
-                        let text = message?;
-                        let mut lines = text.lines();
-                        this.update(cx, |this, cx| {
-                            let version = this.version.clone();
-                            let timestamp = this.next_timestamp();
-                            let summary = this.summary.content_or_set_empty();
-                            if !replaced && replace_old {
-                                summary.text.clear();
-                                replaced = true;
-                            }
-                            summary.text.extend(lines.next());
-                            summary.timestamp = timestamp;
-                            let operation = TextThreadOperation::UpdateSummary {
-                                summary: summary.clone(),
-                                version,
-                            };
-                            this.push_op(operation, cx);
-                            cx.emit(TextThreadEvent::SummaryChanged);
-                            cx.emit(TextThreadEvent::SummaryGenerated);
-                        })?;
-
-                        // Stop if the LLM generated multiple lines.
-                        if lines.next().is_some() {
-                            break;
-                        }
-                    }
-
-                    this.read_with(cx, |this, _cx| {
-                        if let Some(summary) = this.summary.content()
-                            && summary.text.is_empty()
-                        {
-                            bail!("Model generated an empty summary");
-                        }
-                        Ok(())
-                    })??;
-
-                    this.update(cx, |this, cx| {
-                        let version = this.version.clone();
-                        let timestamp = this.next_timestamp();
-                        if let Some(summary) = this.summary.content_as_mut() {
-                            summary.done = true;
-                            summary.timestamp = timestamp;
-                            let operation = TextThreadOperation::UpdateSummary {
-                                summary: summary.clone(),
-                                version,
-                            };
-                            this.push_op(operation, cx);
-                            cx.emit(TextThreadEvent::SummaryChanged);
-                            cx.emit(TextThreadEvent::SummaryGenerated);
-                        }
-                    })?;
-
-                    anyhow::Ok(())
-                }
-                .await;
-
-                if let Err(err) = result {
-                    this.update(cx, |this, cx| {
-                        this.summary = TextThreadSummary::Error;
-                        cx.emit(TextThreadEvent::SummaryChanged);
-                    })
-                    .log_err();
-                    log::error!("Error generating context summary: {}", err);
-                }
-
-                Some(())
-            });
-        }
-    }
-
-    fn message_for_offset(&self, offset: usize, cx: &App) -> Option<Message> {
-        self.messages_for_offsets([offset], cx).pop()
-    }
-
-    pub fn messages_for_offsets(
-        &self,
-        offsets: impl IntoIterator<Item = usize>,
-        cx: &App,
-    ) -> Vec<Message> {
-        let mut result = Vec::new();
-
-        let mut messages = self.messages(cx).peekable();
-        let mut offsets = offsets.into_iter().peekable();
-        let mut current_message = messages.next();
-        while let Some(offset) = offsets.next() {
-            // Locate the message that contains the offset.
-            while current_message.as_ref().is_some_and(|message| {
-                !message.offset_range.contains(&offset) && messages.peek().is_some()
-            }) {
-                current_message = messages.next();
-            }
-            let Some(message) = current_message.as_ref() else {
-                break;
-            };
-
-            // Skip offsets that are in the same message.
-            while offsets.peek().is_some_and(|offset| {
-                message.offset_range.contains(offset) || messages.peek().is_none()
-            }) {
-                offsets.next();
-            }
-
-            result.push(message.clone());
-        }
-        result
-    }
-
-    fn messages_from_anchors<'a>(
-        &'a self,
-        message_anchors: impl Iterator<Item = &'a MessageAnchor> + 'a,
-        cx: &'a App,
-    ) -> impl 'a + Iterator<Item = Message> {
-        let buffer = self.buffer.read(cx);
-
-        Self::messages_from_iters(buffer, &self.messages_metadata, message_anchors.enumerate())
-    }
-
-    pub fn messages<'a>(&'a self, cx: &'a App) -> impl 'a + Iterator<Item = Message> {
-        self.messages_from_anchors(self.message_anchors.iter(), cx)
-    }
-
-    pub fn messages_from_iters<'a>(
-        buffer: &'a Buffer,
-        metadata: &'a HashMap<MessageId, MessageMetadata>,
-        messages: impl Iterator<Item = (usize, &'a MessageAnchor)> + 'a,
-    ) -> impl 'a + Iterator<Item = Message> {
-        let mut messages = messages.peekable();
-
-        iter::from_fn(move || {
-            if let Some((start_ix, message_anchor)) = messages.next() {
-                let metadata = metadata.get(&message_anchor.id)?;
-
-                let message_start = message_anchor.start.to_offset(buffer);
-                let mut message_end = None;
-                let mut end_ix = start_ix;
-                while let Some((_, next_message)) = messages.peek() {
-                    if next_message.start.is_valid(buffer) {
-                        message_end = Some(next_message.start);
-                        break;
-                    } else {
-                        end_ix += 1;
-                        messages.next();
-                    }
-                }
-                let message_end_anchor =
-                    message_end.unwrap_or(language::Anchor::max_for_buffer(buffer.remote_id()));
-                let message_end = message_end_anchor.to_offset(buffer);
-
-                return Some(Message {
-                    index_range: start_ix..end_ix,
-                    offset_range: message_start..message_end,
-                    anchor_range: message_anchor.start..message_end_anchor,
-                    id: message_anchor.id,
-                    role: metadata.role,
-                    status: metadata.status.clone(),
-                    cache: metadata.cache.clone(),
-                });
-            }
-            None
-        })
-    }
-
-    pub fn save(
-        &mut self,
-        debounce: Option<Duration>,
-        fs: Arc<dyn Fs>,
-        cx: &mut Context<TextThread>,
-    ) {
-        if self.replica_id() != ReplicaId::default() {
-            // Prevent saving a remote context for now.
-            return;
-        }
-
-        self.pending_save = cx.spawn(async move |this, cx| {
-            if let Some(debounce) = debounce {
-                cx.background_executor().timer(debounce).await;
-            }
-
-            let (old_path, summary) = this.read_with(cx, |this, _| {
-                let path = this.path.clone();
-                let summary = if let Some(summary) = this.summary.content() {
-                    if summary.done {
-                        Some(summary.text.clone())
-                    } else {
-                        None
-                    }
-                } else {
-                    None
-                };
-                (path, summary)
-            })?;
-
-            if let Some(summary) = summary {
-                let context = this.read_with(cx, |this, cx| this.serialize(cx))?;
-                let mut discriminant = 1;
-                let mut new_path;
-                loop {
-                    new_path = text_threads_dir().join(&format!(
-                        "{} - {}.zed.json",
-                        summary.trim(),
-                        discriminant
-                    ));
-                    if fs.is_file(&new_path).await {
-                        discriminant += 1;
-                    } else {
-                        break;
-                    }
-                }
-
-                fs.create_dir(text_threads_dir().as_ref()).await?;
-
-                // rename before write ensures that only one file exists
-                if let Some(old_path) = old_path.as_ref()
-                    && new_path.as_path() != old_path.as_ref()
-                {
-                    fs.rename(
-                        old_path,
-                        &new_path,
-                        RenameOptions {
-                            overwrite: true,
-                            ignore_if_exists: true,
-                            create_parents: false,
-                        },
-                    )
-                    .await?;
-                }
-
-                // update path before write in case it fails
-                this.update(cx, {
-                    let new_path: Arc<Path> = new_path.clone().into();
-                    move |this, cx| {
-                        this.path = Some(new_path.clone());
-                        cx.emit(TextThreadEvent::PathChanged { old_path, new_path });
-                    }
-                })
-                .ok();
-
-                fs.atomic_write(new_path, serde_json::to_string(&context).unwrap())
-                    .await?;
-            }
-
-            Ok(())
-        });
-    }
-
-    pub fn set_custom_summary(&mut self, custom_summary: String, cx: &mut Context<Self>) {
-        let timestamp = self.next_timestamp();
-        let summary = self.summary.content_or_set_empty();
-        summary.timestamp = timestamp;
-        summary.done = true;
-        summary.text = custom_summary;
-        cx.emit(TextThreadEvent::SummaryChanged);
-    }
-
-    fn update_model_request_usage(&self, amount: u32, limit: UsageLimit, cx: &mut App) {
-        let Some(project) = self.project.as_ref().and_then(|project| project.upgrade()) else {
-            return;
-        };
-        project.read(cx).user_store().update(cx, |user_store, cx| {
-            user_store.update_model_request_usage(
-                ModelRequestUsage(RequestUsage {
-                    amount: amount as i32,
-                    limit,
-                }),
-                cx,
-            )
-        });
-    }
-}
-
-#[derive(Debug, Default)]
-pub struct TextThreadVersion {
-    text_thread: clock::Global,
-    buffer: clock::Global,
-}
-
-impl TextThreadVersion {
-    pub fn from_proto(proto: &proto::ContextVersion) -> Self {
-        Self {
-            text_thread: language::proto::deserialize_version(&proto.context_version),
-            buffer: language::proto::deserialize_version(&proto.buffer_version),
-        }
-    }
-
-    pub fn to_proto(&self, context_id: TextThreadId) -> proto::ContextVersion {
-        proto::ContextVersion {
-            context_id: context_id.to_proto(),
-            context_version: language::proto::serialize_version(&self.text_thread),
-            buffer_version: language::proto::serialize_version(&self.buffer),
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct ParsedSlashCommand {
-    pub name: String,
-    pub arguments: SmallVec<[String; 3]>,
-    pub status: PendingSlashCommandStatus,
-    pub source_range: Range<language::Anchor>,
-}
-
-#[derive(Debug)]
-pub struct InvokedSlashCommand {
-    pub name: SharedString,
-    pub range: Range<language::Anchor>,
-    pub run_commands_in_ranges: Vec<Range<language::Anchor>>,
-    pub status: InvokedSlashCommandStatus,
-    pub transaction: Option<language::TransactionId>,
-    timestamp: clock::Lamport,
-}
-
-#[derive(Debug)]
-pub enum InvokedSlashCommandStatus {
-    Running(Task<()>),
-    Error(SharedString),
-    Finished,
-}
-
-#[derive(Debug, Clone)]
-pub enum PendingSlashCommandStatus {
-    Idle,
-    Running { _task: Shared<Task<()>> },
-    Error(String),
-}
-
-#[derive(Debug, Clone)]
-pub struct PendingToolUse {
-    pub id: LanguageModelToolUseId,
-    pub name: String,
-    pub input: serde_json::Value,
-    pub status: PendingToolUseStatus,
-    pub source_range: Range<language::Anchor>,
-}
-
-#[derive(Debug, Clone)]
-pub enum PendingToolUseStatus {
-    Idle,
-    Running { _task: Shared<Task<()>> },
-    Error(String),
-}
-
-impl PendingToolUseStatus {
-    pub fn is_idle(&self) -> bool {
-        matches!(self, PendingToolUseStatus::Idle)
-    }
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct SavedMessage {
-    pub id: MessageId,
-    pub start: usize,
-    pub metadata: MessageMetadata,
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct SavedTextThread {
-    pub id: Option<TextThreadId>,
-    pub zed: String,
-    pub version: String,
-    pub text: String,
-    pub messages: Vec<SavedMessage>,
-    pub summary: String,
-    pub slash_command_output_sections:
-        Vec<assistant_slash_command::SlashCommandOutputSection<usize>>,
-    #[serde(default)]
-    pub thought_process_output_sections: Vec<ThoughtProcessOutputSection<usize>>,
-}
-
-impl SavedTextThread {
-    pub const VERSION: &'static str = "0.4.0";
-
-    pub fn from_json(json: &str) -> Result<Self> {
-        let saved_context_json = serde_json::from_str::<serde_json::Value>(json)?;
-        match saved_context_json
-            .get("version")
-            .context("version not found")?
-        {
-            serde_json::Value::String(version) => match version.as_str() {
-                SavedTextThread::VERSION => Ok(serde_json::from_value::<SavedTextThread>(
-                    saved_context_json,
-                )?),
-                SavedContextV0_3_0::VERSION => {
-                    let saved_context =
-                        serde_json::from_value::<SavedContextV0_3_0>(saved_context_json)?;
-                    Ok(saved_context.upgrade())
-                }
-                SavedContextV0_2_0::VERSION => {
-                    let saved_context =
-                        serde_json::from_value::<SavedContextV0_2_0>(saved_context_json)?;
-                    Ok(saved_context.upgrade())
-                }
-                SavedContextV0_1_0::VERSION => {
-                    let saved_context =
-                        serde_json::from_value::<SavedContextV0_1_0>(saved_context_json)?;
-                    Ok(saved_context.upgrade())
-                }
-                _ => anyhow::bail!("unrecognized saved context version: {version:?}"),
-            },
-            _ => anyhow::bail!("version not found on saved context"),
-        }
-    }
-
-    fn into_ops(
-        self,
-        buffer: &Entity<Buffer>,
-        cx: &mut Context<TextThread>,
-    ) -> Vec<TextThreadOperation> {
-        let mut operations = Vec::new();
-        let mut version = clock::Global::new();
-        let mut next_timestamp = clock::Lamport::new(ReplicaId::default());
-
-        let mut first_message_metadata = None;
-        for message in self.messages {
-            if message.id == MessageId(clock::Lamport::MIN) {
-                first_message_metadata = Some(message.metadata);
-            } else {
-                operations.push(TextThreadOperation::InsertMessage {
-                    anchor: MessageAnchor {
-                        id: message.id,
-                        start: buffer.read(cx).anchor_before(message.start),
-                    },
-                    metadata: MessageMetadata {
-                        role: message.metadata.role,
-                        status: message.metadata.status,
-                        timestamp: message.metadata.timestamp,
-                        cache: None,
-                    },
-                    version: version.clone(),
-                });
-                version.observe(message.id.0);
-                next_timestamp.observe(message.id.0);
-            }
-        }
-
-        if let Some(metadata) = first_message_metadata {
-            let timestamp = next_timestamp.tick();
-            operations.push(TextThreadOperation::UpdateMessage {
-                message_id: MessageId(clock::Lamport::MIN),
-                metadata: MessageMetadata {
-                    role: metadata.role,
-                    status: metadata.status,
-                    timestamp,
-                    cache: None,
-                },
-                version: version.clone(),
-            });
-            version.observe(timestamp);
-        }
-
-        let buffer = buffer.read(cx);
-        for section in self.slash_command_output_sections {
-            let timestamp = next_timestamp.tick();
-            operations.push(TextThreadOperation::SlashCommandOutputSectionAdded {
-                timestamp,
-                section: SlashCommandOutputSection {
-                    range: buffer.anchor_after(section.range.start)
-                        ..buffer.anchor_before(section.range.end),
-                    icon: section.icon,
-                    label: section.label,
-                    metadata: section.metadata,
-                },
-                version: version.clone(),
-            });
-
-            version.observe(timestamp);
-        }
-
-        for section in self.thought_process_output_sections {
-            let timestamp = next_timestamp.tick();
-            operations.push(TextThreadOperation::ThoughtProcessOutputSectionAdded {
-                timestamp,
-                section: ThoughtProcessOutputSection {
-                    range: buffer.anchor_after(section.range.start)
-                        ..buffer.anchor_before(section.range.end),
-                },
-                version: version.clone(),
-            });
-
-            version.observe(timestamp);
-        }
-
-        let timestamp = next_timestamp.tick();
-        operations.push(TextThreadOperation::UpdateSummary {
-            summary: TextThreadSummaryContent {
-                text: self.summary,
-                done: true,
-                timestamp,
-            },
-            version: version.clone(),
-        });
-        version.observe(timestamp);
-
-        operations
-    }
-}
-
-#[derive(Copy, Clone, Debug, Eq, PartialEq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
-struct SavedMessageIdPreV0_4_0(usize);
-
-#[derive(Serialize, Deserialize)]
-struct SavedMessagePreV0_4_0 {
-    id: SavedMessageIdPreV0_4_0,
-    start: usize,
-}
-
-#[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize)]
-struct SavedMessageMetadataPreV0_4_0 {
-    role: Role,
-    status: MessageStatus,
-}
-
-#[derive(Serialize, Deserialize)]
-struct SavedContextV0_3_0 {
-    id: Option<TextThreadId>,
-    zed: String,
-    version: String,
-    text: String,
-    messages: Vec<SavedMessagePreV0_4_0>,
-    message_metadata: HashMap<SavedMessageIdPreV0_4_0, SavedMessageMetadataPreV0_4_0>,
-    summary: String,
-    slash_command_output_sections: Vec<assistant_slash_command::SlashCommandOutputSection<usize>>,
-}
-
-impl SavedContextV0_3_0 {
-    const VERSION: &'static str = "0.3.0";
-
-    fn upgrade(self) -> SavedTextThread {
-        SavedTextThread {
-            id: self.id,
-            zed: self.zed,
-            version: SavedTextThread::VERSION.into(),
-            text: self.text,
-            messages: self
-                .messages
-                .into_iter()
-                .filter_map(|message| {
-                    let metadata = self.message_metadata.get(&message.id)?;
-                    let timestamp = clock::Lamport {
-                        replica_id: ReplicaId::default(),
-                        value: message.id.0 as u32,
-                    };
-                    Some(SavedMessage {
-                        id: MessageId(timestamp),
-                        start: message.start,
-                        metadata: MessageMetadata {
-                            role: metadata.role,
-                            status: metadata.status.clone(),
-                            timestamp,
-                            cache: None,
-                        },
-                    })
-                })
-                .collect(),
-            summary: self.summary,
-            slash_command_output_sections: self.slash_command_output_sections,
-            thought_process_output_sections: Vec::new(),
-        }
-    }
-}
-
-#[derive(Serialize, Deserialize)]
-struct SavedContextV0_2_0 {
-    id: Option<TextThreadId>,
-    zed: String,
-    version: String,
-    text: String,
-    messages: Vec<SavedMessagePreV0_4_0>,
-    message_metadata: HashMap<SavedMessageIdPreV0_4_0, SavedMessageMetadataPreV0_4_0>,
-    summary: String,
-}
-
-impl SavedContextV0_2_0 {
-    const VERSION: &'static str = "0.2.0";
-
-    fn upgrade(self) -> SavedTextThread {
-        SavedContextV0_3_0 {
-            id: self.id,
-            zed: self.zed,
-            version: SavedContextV0_3_0::VERSION.to_string(),
-            text: self.text,
-            messages: self.messages,
-            message_metadata: self.message_metadata,
-            summary: self.summary,
-            slash_command_output_sections: Vec::new(),
-        }
-        .upgrade()
-    }
-}
-
-#[derive(Serialize, Deserialize)]
-struct SavedContextV0_1_0 {
-    id: Option<TextThreadId>,
-    zed: String,
-    version: String,
-    text: String,
-    messages: Vec<SavedMessagePreV0_4_0>,
-    message_metadata: HashMap<SavedMessageIdPreV0_4_0, SavedMessageMetadataPreV0_4_0>,
-    summary: String,
-    api_url: Option<String>,
-    model: OpenAiModel,
-}
-
-impl SavedContextV0_1_0 {
-    const VERSION: &'static str = "0.1.0";
-
-    fn upgrade(self) -> SavedTextThread {
-        SavedContextV0_2_0 {
-            id: self.id,
-            zed: self.zed,
-            version: SavedContextV0_2_0::VERSION.to_string(),
-            text: self.text,
-            messages: self.messages,
-            message_metadata: self.message_metadata,
-            summary: self.summary,
-        }
-        .upgrade()
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct SavedTextThreadMetadata {
-    pub title: SharedString,
-    pub path: Arc<Path>,
-    pub mtime: chrono::DateTime<chrono::Local>,
-}
diff --git a/crates/assistant_text_thread/src/text_thread_store.rs b/crates/assistant_text_thread/src/text_thread_store.rs
deleted file mode 100644
index 71fabed503..0000000000
--- a/crates/assistant_text_thread/src/text_thread_store.rs
+++ /dev/null
@@ -1,941 +0,0 @@
-use crate::{
-    SavedTextThread, SavedTextThreadMetadata, TextThread, TextThreadEvent, TextThreadId,
-    TextThreadOperation, TextThreadVersion,
-};
-use anyhow::{Context as _, Result};
-use assistant_slash_command::{SlashCommandId, SlashCommandWorkingSet};
-use client::{Client, TypedEnvelope, proto, telemetry::Telemetry};
-use clock::ReplicaId;
-use collections::HashMap;
-use context_server::ContextServerId;
-use fs::{Fs, RemoveOptions};
-use futures::StreamExt;
-use fuzzy::StringMatchCandidate;
-use gpui::{App, AppContext as _, AsyncApp, Context, Entity, Task, WeakEntity};
-use language::LanguageRegistry;
-use paths::text_threads_dir;
-use project::{
-    Project,
-    context_server_store::{ContextServerStatus, ContextServerStore},
-};
-use prompt_store::PromptBuilder;
-use regex::Regex;
-use rpc::AnyProtoClient;
-use std::sync::LazyLock;
-use std::{cmp::Reverse, ffi::OsStr, mem, path::Path, sync::Arc, time::Duration};
-use util::{ResultExt, TryFutureExt};
-use zed_env_vars::ZED_STATELESS;
-
-pub(crate) fn init(client: &AnyProtoClient) {
-    client.add_entity_message_handler(TextThreadStore::handle_advertise_contexts);
-    client.add_entity_request_handler(TextThreadStore::handle_open_context);
-    client.add_entity_request_handler(TextThreadStore::handle_create_context);
-    client.add_entity_message_handler(TextThreadStore::handle_update_context);
-    client.add_entity_request_handler(TextThreadStore::handle_synchronize_contexts);
-}
-
-#[derive(Clone)]
-pub struct RemoteTextThreadMetadata {
-    pub id: TextThreadId,
-    pub summary: Option<String>,
-}
-
-pub struct TextThreadStore {
-    text_threads: Vec<TextThreadHandle>,
-    text_threads_metadata: Vec<SavedTextThreadMetadata>,
-    context_server_slash_command_ids: HashMap<ContextServerId, Vec<SlashCommandId>>,
-    host_text_threads: Vec<RemoteTextThreadMetadata>,
-    fs: Arc<dyn Fs>,
-    languages: Arc<LanguageRegistry>,
-    slash_commands: Arc<SlashCommandWorkingSet>,
-    telemetry: Arc<Telemetry>,
-    _watch_updates: Task<Option<()>>,
-    client: Arc<Client>,
-    project: WeakEntity<Project>,
-    project_is_shared: bool,
-    client_subscription: Option<client::Subscription>,
-    _project_subscriptions: Vec<gpui::Subscription>,
-    prompt_builder: Arc<PromptBuilder>,
-}
-
-enum TextThreadHandle {
-    Weak(WeakEntity<TextThread>),
-    Strong(Entity<TextThread>),
-}
-
-impl TextThreadHandle {
-    fn upgrade(&self) -> Option<Entity<TextThread>> {
-        match self {
-            TextThreadHandle::Weak(weak) => weak.upgrade(),
-            TextThreadHandle::Strong(strong) => Some(strong.clone()),
-        }
-    }
-
-    fn downgrade(&self) -> WeakEntity<TextThread> {
-        match self {
-            TextThreadHandle::Weak(weak) => weak.clone(),
-            TextThreadHandle::Strong(strong) => strong.downgrade(),
-        }
-    }
-}
-
-impl TextThreadStore {
-    pub fn new(
-        project: Entity<Project>,
-        prompt_builder: Arc<PromptBuilder>,
-        slash_commands: Arc<SlashCommandWorkingSet>,
-        cx: &mut App,
-    ) -> Task<Result<Entity<Self>>> {
-        let fs = project.read(cx).fs().clone();
-        let languages = project.read(cx).languages().clone();
-        let telemetry = project.read(cx).client().telemetry().clone();
-        cx.spawn(async move |cx| {
-            const CONTEXT_WATCH_DURATION: Duration = Duration::from_millis(100);
-            let (mut events, _) = fs.watch(text_threads_dir(), CONTEXT_WATCH_DURATION).await;
-
-            let this = cx.new(|cx: &mut Context<Self>| {
-                let mut this = Self {
-                    text_threads: Vec::new(),
-                    text_threads_metadata: Vec::new(),
-                    context_server_slash_command_ids: HashMap::default(),
-                    host_text_threads: Vec::new(),
-                    fs,
-                    languages,
-                    slash_commands,
-                    telemetry,
-                    _watch_updates: cx.spawn(async move |this, cx| {
-                        async move {
-                            while events.next().await.is_some() {
-                                this.update(cx, |this, cx| this.reload(cx))?.await.log_err();
-                            }
-                            anyhow::Ok(())
-                        }
-                        .log_err()
-                        .await
-                    }),
-                    client_subscription: None,
-                    _project_subscriptions: vec![
-                        cx.subscribe(&project, Self::handle_project_event),
-                    ],
-                    project_is_shared: false,
-                    client: project.read(cx).client(),
-                    project: project.downgrade(),
-                    prompt_builder,
-                };
-                this.handle_project_shared(cx);
-                this.synchronize_contexts(cx);
-                this.register_context_server_handlers(cx);
-                this.reload(cx).detach_and_log_err(cx);
-                this
-            })?;
-
-            Ok(this)
-        })
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn fake(project: Entity<Project>, cx: &mut Context<Self>) -> Self {
-        Self {
-            text_threads: Default::default(),
-            text_threads_metadata: Default::default(),
-            context_server_slash_command_ids: Default::default(),
-            host_text_threads: Default::default(),
-            fs: project.read(cx).fs().clone(),
-            languages: project.read(cx).languages().clone(),
-            slash_commands: Arc::default(),
-            telemetry: project.read(cx).client().telemetry().clone(),
-            _watch_updates: Task::ready(None),
-            client: project.read(cx).client(),
-            project: project.downgrade(),
-            project_is_shared: false,
-            client_subscription: None,
-            _project_subscriptions: Default::default(),
-            prompt_builder: Arc::new(PromptBuilder::new(None).unwrap()),
-        }
-    }
-
-    async fn handle_advertise_contexts(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::AdvertiseContexts>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        this.update(&mut cx, |this, cx| {
-            this.host_text_threads = envelope
-                .payload
-                .contexts
-                .into_iter()
-                .map(|text_thread| RemoteTextThreadMetadata {
-                    id: TextThreadId::from_proto(text_thread.context_id),
-                    summary: text_thread.summary,
-                })
-                .collect();
-            cx.notify();
-        })
-    }
-
-    async fn handle_open_context(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::OpenContext>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::OpenContextResponse> {
-        let context_id = TextThreadId::from_proto(envelope.payload.context_id);
-        let operations = this.update(&mut cx, |this, cx| {
-            let project = this.project.upgrade().context("project not found")?;
-
-            anyhow::ensure!(
-                !project.read(cx).is_via_collab(),
-                "only the host contexts can be opened"
-            );
-
-            let text_thread = this
-                .loaded_text_thread_for_id(&context_id, cx)
-                .context("context not found")?;
-            anyhow::ensure!(
-                text_thread.read(cx).replica_id() == ReplicaId::default(),
-                "context must be opened via the host"
-            );
-
-            anyhow::Ok(
-                text_thread
-                    .read(cx)
-                    .serialize_ops(&TextThreadVersion::default(), cx),
-            )
-        })??;
-        let operations = operations.await;
-        Ok(proto::OpenContextResponse {
-            context: Some(proto::Context { operations }),
-        })
-    }
-
-    async fn handle_create_context(
-        this: Entity<Self>,
-        _: TypedEnvelope<proto::CreateContext>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::CreateContextResponse> {
-        let (context_id, operations) = this.update(&mut cx, |this, cx| {
-            let project = this.project.upgrade().context("project not found")?;
-            anyhow::ensure!(
-                !project.read(cx).is_via_collab(),
-                "can only create contexts as the host"
-            );
-
-            let text_thread = this.create(cx);
-            let context_id = text_thread.read(cx).id().clone();
-
-            anyhow::Ok((
-                context_id,
-                text_thread
-                    .read(cx)
-                    .serialize_ops(&TextThreadVersion::default(), cx),
-            ))
-        })??;
-        let operations = operations.await;
-        Ok(proto::CreateContextResponse {
-            context_id: context_id.to_proto(),
-            context: Some(proto::Context { operations }),
-        })
-    }
-
-    async fn handle_update_context(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::UpdateContext>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        this.update(&mut cx, |this, cx| {
-            let context_id = TextThreadId::from_proto(envelope.payload.context_id);
-            if let Some(text_thread) = this.loaded_text_thread_for_id(&context_id, cx) {
-                let operation_proto = envelope.payload.operation.context("invalid operation")?;
-                let operation = TextThreadOperation::from_proto(operation_proto)?;
-                text_thread.update(cx, |text_thread, cx| text_thread.apply_ops([operation], cx));
-            }
-            Ok(())
-        })?
-    }
-
-    async fn handle_synchronize_contexts(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::SynchronizeContexts>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::SynchronizeContextsResponse> {
-        this.update(&mut cx, |this, cx| {
-            let project = this.project.upgrade().context("project not found")?;
-            anyhow::ensure!(
-                !project.read(cx).is_via_collab(),
-                "only the host can synchronize contexts"
-            );
-
-            let mut local_versions = Vec::new();
-            for remote_version_proto in envelope.payload.contexts {
-                let remote_version = TextThreadVersion::from_proto(&remote_version_proto);
-                let context_id = TextThreadId::from_proto(remote_version_proto.context_id);
-                if let Some(text_thread) = this.loaded_text_thread_for_id(&context_id, cx) {
-                    let text_thread = text_thread.read(cx);
-                    let operations = text_thread.serialize_ops(&remote_version, cx);
-                    local_versions.push(text_thread.version(cx).to_proto(context_id.clone()));
-                    let client = this.client.clone();
-                    let project_id = envelope.payload.project_id;
-                    cx.background_spawn(async move {
-                        let operations = operations.await;
-                        for operation in operations {
-                            client.send(proto::UpdateContext {
-                                project_id,
-                                context_id: context_id.to_proto(),
-                                operation: Some(operation),
-                            })?;
-                        }
-                        anyhow::Ok(())
-                    })
-                    .detach_and_log_err(cx);
-                }
-            }
-
-            this.advertise_contexts(cx);
-
-            anyhow::Ok(proto::SynchronizeContextsResponse {
-                contexts: local_versions,
-            })
-        })?
-    }
-
-    fn handle_project_shared(&mut self, cx: &mut Context<Self>) {
-        let Some(project) = self.project.upgrade() else {
-            return;
-        };
-
-        let is_shared = project.read(cx).is_shared();
-        let was_shared = mem::replace(&mut self.project_is_shared, is_shared);
-        if is_shared == was_shared {
-            return;
-        }
-
-        if is_shared {
-            self.text_threads.retain_mut(|text_thread| {
-                if let Some(strong_context) = text_thread.upgrade() {
-                    *text_thread = TextThreadHandle::Strong(strong_context);
-                    true
-                } else {
-                    false
-                }
-            });
-            let remote_id = project.read(cx).remote_id().unwrap();
-            self.client_subscription = self
-                .client
-                .subscribe_to_entity(remote_id)
-                .log_err()
-                .map(|subscription| subscription.set_entity(&cx.entity(), &cx.to_async()));
-            self.advertise_contexts(cx);
-        } else {
-            self.client_subscription = None;
-        }
-    }
-
-    fn handle_project_event(
-        &mut self,
-        _project: Entity<Project>,
-        event: &project::Event,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            project::Event::RemoteIdChanged(_) => {
-                self.handle_project_shared(cx);
-            }
-            project::Event::Reshared => {
-                self.advertise_contexts(cx);
-            }
-            project::Event::HostReshared | project::Event::Rejoined => {
-                self.synchronize_contexts(cx);
-            }
-            project::Event::DisconnectedFromHost => {
-                self.text_threads.retain_mut(|text_thread| {
-                    if let Some(strong_context) = text_thread.upgrade() {
-                        *text_thread = TextThreadHandle::Weak(text_thread.downgrade());
-                        strong_context.update(cx, |text_thread, cx| {
-                            if text_thread.replica_id() != ReplicaId::default() {
-                                text_thread.set_capability(language::Capability::ReadOnly, cx);
-                            }
-                        });
-                        true
-                    } else {
-                        false
-                    }
-                });
-                self.host_text_threads.clear();
-                cx.notify();
-            }
-            _ => {}
-        }
-    }
-
-    pub fn unordered_text_threads(&self) -> impl Iterator<Item = &SavedTextThreadMetadata> {
-        self.text_threads_metadata.iter()
-    }
-
-    pub fn host_text_threads(&self) -> impl Iterator<Item = &RemoteTextThreadMetadata> {
-        self.host_text_threads.iter()
-    }
-
-    pub fn create(&mut self, cx: &mut Context<Self>) -> Entity<TextThread> {
-        let context = cx.new(|cx| {
-            TextThread::local(
-                self.languages.clone(),
-                Some(self.project.clone()),
-                Some(self.telemetry.clone()),
-                self.prompt_builder.clone(),
-                self.slash_commands.clone(),
-                cx,
-            )
-        });
-        self.register_text_thread(&context, cx);
-        context
-    }
-
-    pub fn create_remote(&mut self, cx: &mut Context<Self>) -> Task<Result<Entity<TextThread>>> {
-        let Some(project) = self.project.upgrade() else {
-            return Task::ready(Err(anyhow::anyhow!("project was dropped")));
-        };
-        let project = project.read(cx);
-        let Some(project_id) = project.remote_id() else {
-            return Task::ready(Err(anyhow::anyhow!("project was not remote")));
-        };
-
-        let replica_id = project.replica_id();
-        let capability = project.capability();
-        let language_registry = self.languages.clone();
-        let project = self.project.clone();
-        let telemetry = self.telemetry.clone();
-        let prompt_builder = self.prompt_builder.clone();
-        let slash_commands = self.slash_commands.clone();
-        let request = self.client.request(proto::CreateContext { project_id });
-        cx.spawn(async move |this, cx| {
-            let response = request.await?;
-            let context_id = TextThreadId::from_proto(response.context_id);
-            let context_proto = response.context.context("invalid context")?;
-            let text_thread = cx.new(|cx| {
-                TextThread::new(
-                    context_id.clone(),
-                    replica_id,
-                    capability,
-                    language_registry,
-                    prompt_builder,
-                    slash_commands,
-                    Some(project),
-                    Some(telemetry),
-                    cx,
-                )
-            })?;
-            let operations = cx
-                .background_spawn(async move {
-                    context_proto
-                        .operations
-                        .into_iter()
-                        .map(TextThreadOperation::from_proto)
-                        .collect::<Result<Vec<_>>>()
-                })
-                .await?;
-            text_thread.update(cx, |context, cx| context.apply_ops(operations, cx))?;
-            this.update(cx, |this, cx| {
-                if let Some(existing_context) = this.loaded_text_thread_for_id(&context_id, cx) {
-                    existing_context
-                } else {
-                    this.register_text_thread(&text_thread, cx);
-                    this.synchronize_contexts(cx);
-                    text_thread
-                }
-            })
-        })
-    }
-
-    pub fn open_local(
-        &mut self,
-        path: Arc<Path>,
-        cx: &Context<Self>,
-    ) -> Task<Result<Entity<TextThread>>> {
-        if let Some(existing_context) = self.loaded_text_thread_for_path(&path, cx) {
-            return Task::ready(Ok(existing_context));
-        }
-
-        let fs = self.fs.clone();
-        let languages = self.languages.clone();
-        let project = self.project.clone();
-        let telemetry = self.telemetry.clone();
-        let load = cx.background_spawn({
-            let path = path.clone();
-            async move {
-                let saved_context = fs.load(&path).await?;
-                SavedTextThread::from_json(&saved_context)
-            }
-        });
-        let prompt_builder = self.prompt_builder.clone();
-        let slash_commands = self.slash_commands.clone();
-
-        cx.spawn(async move |this, cx| {
-            let saved_context = load.await?;
-            let context = cx.new(|cx| {
-                TextThread::deserialize(
-                    saved_context,
-                    path.clone(),
-                    languages,
-                    prompt_builder,
-                    slash_commands,
-                    Some(project),
-                    Some(telemetry),
-                    cx,
-                )
-            })?;
-            this.update(cx, |this, cx| {
-                if let Some(existing_context) = this.loaded_text_thread_for_path(&path, cx) {
-                    existing_context
-                } else {
-                    this.register_text_thread(&context, cx);
-                    context
-                }
-            })
-        })
-    }
-
-    pub fn delete_local(&mut self, path: Arc<Path>, cx: &mut Context<Self>) -> Task<Result<()>> {
-        let fs = self.fs.clone();
-
-        cx.spawn(async move |this, cx| {
-            fs.remove_file(
-                &path,
-                RemoveOptions {
-                    recursive: false,
-                    ignore_if_not_exists: true,
-                },
-            )
-            .await?;
-
-            this.update(cx, |this, cx| {
-                this.text_threads.retain(|text_thread| {
-                    text_thread
-                        .upgrade()
-                        .and_then(|text_thread| text_thread.read(cx).path())
-                        != Some(&path)
-                });
-                this.text_threads_metadata
-                    .retain(|text_thread| text_thread.path.as_ref() != path.as_ref());
-            })?;
-
-            Ok(())
-        })
-    }
-
-    fn loaded_text_thread_for_path(&self, path: &Path, cx: &App) -> Option<Entity<TextThread>> {
-        self.text_threads.iter().find_map(|text_thread| {
-            let text_thread = text_thread.upgrade()?;
-            if text_thread.read(cx).path().map(Arc::as_ref) == Some(path) {
-                Some(text_thread)
-            } else {
-                None
-            }
-        })
-    }
-
-    pub fn loaded_text_thread_for_id(
-        &self,
-        id: &TextThreadId,
-        cx: &App,
-    ) -> Option<Entity<TextThread>> {
-        self.text_threads.iter().find_map(|text_thread| {
-            let text_thread = text_thread.upgrade()?;
-            if text_thread.read(cx).id() == id {
-                Some(text_thread)
-            } else {
-                None
-            }
-        })
-    }
-
-    pub fn open_remote(
-        &mut self,
-        text_thread_id: TextThreadId,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Entity<TextThread>>> {
-        let Some(project) = self.project.upgrade() else {
-            return Task::ready(Err(anyhow::anyhow!("project was dropped")));
-        };
-        let project = project.read(cx);
-        let Some(project_id) = project.remote_id() else {
-            return Task::ready(Err(anyhow::anyhow!("project was not remote")));
-        };
-
-        if let Some(context) = self.loaded_text_thread_for_id(&text_thread_id, cx) {
-            return Task::ready(Ok(context));
-        }
-
-        let replica_id = project.replica_id();
-        let capability = project.capability();
-        let language_registry = self.languages.clone();
-        let project = self.project.clone();
-        let telemetry = self.telemetry.clone();
-        let request = self.client.request(proto::OpenContext {
-            project_id,
-            context_id: text_thread_id.to_proto(),
-        });
-        let prompt_builder = self.prompt_builder.clone();
-        let slash_commands = self.slash_commands.clone();
-        cx.spawn(async move |this, cx| {
-            let response = request.await?;
-            let context_proto = response.context.context("invalid context")?;
-            let text_thread = cx.new(|cx| {
-                TextThread::new(
-                    text_thread_id.clone(),
-                    replica_id,
-                    capability,
-                    language_registry,
-                    prompt_builder,
-                    slash_commands,
-                    Some(project),
-                    Some(telemetry),
-                    cx,
-                )
-            })?;
-            let operations = cx
-                .background_spawn(async move {
-                    context_proto
-                        .operations
-                        .into_iter()
-                        .map(TextThreadOperation::from_proto)
-                        .collect::<Result<Vec<_>>>()
-                })
-                .await?;
-            text_thread.update(cx, |context, cx| context.apply_ops(operations, cx))?;
-            this.update(cx, |this, cx| {
-                if let Some(existing_context) = this.loaded_text_thread_for_id(&text_thread_id, cx)
-                {
-                    existing_context
-                } else {
-                    this.register_text_thread(&text_thread, cx);
-                    this.synchronize_contexts(cx);
-                    text_thread
-                }
-            })
-        })
-    }
-
-    fn register_text_thread(&mut self, text_thread: &Entity<TextThread>, cx: &mut Context<Self>) {
-        let handle = if self.project_is_shared {
-            TextThreadHandle::Strong(text_thread.clone())
-        } else {
-            TextThreadHandle::Weak(text_thread.downgrade())
-        };
-        self.text_threads.push(handle);
-        self.advertise_contexts(cx);
-        cx.subscribe(text_thread, Self::handle_context_event)
-            .detach();
-    }
-
-    fn handle_context_event(
-        &mut self,
-        text_thread: Entity<TextThread>,
-        event: &TextThreadEvent,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(project) = self.project.upgrade() else {
-            return;
-        };
-        let Some(project_id) = project.read(cx).remote_id() else {
-            return;
-        };
-
-        match event {
-            TextThreadEvent::SummaryChanged => {
-                self.advertise_contexts(cx);
-            }
-            TextThreadEvent::PathChanged { old_path, new_path } => {
-                if let Some(old_path) = old_path.as_ref() {
-                    for metadata in &mut self.text_threads_metadata {
-                        if &metadata.path == old_path {
-                            metadata.path = new_path.clone();
-                            break;
-                        }
-                    }
-                }
-            }
-            TextThreadEvent::Operation(operation) => {
-                let context_id = text_thread.read(cx).id().to_proto();
-                let operation = operation.to_proto();
-                self.client
-                    .send(proto::UpdateContext {
-                        project_id,
-                        context_id,
-                        operation: Some(operation),
-                    })
-                    .log_err();
-            }
-            _ => {}
-        }
-    }
-
-    fn advertise_contexts(&self, cx: &App) {
-        let Some(project) = self.project.upgrade() else {
-            return;
-        };
-        let Some(project_id) = project.read(cx).remote_id() else {
-            return;
-        };
-        // For now, only the host can advertise their open contexts.
-        if project.read(cx).is_via_collab() {
-            return;
-        }
-
-        let contexts = self
-            .text_threads
-            .iter()
-            .rev()
-            .filter_map(|text_thread| {
-                let text_thread = text_thread.upgrade()?.read(cx);
-                if text_thread.replica_id() == ReplicaId::default() {
-                    Some(proto::ContextMetadata {
-                        context_id: text_thread.id().to_proto(),
-                        summary: text_thread
-                            .summary()
-                            .content()
-                            .map(|summary| summary.text.clone()),
-                    })
-                } else {
-                    None
-                }
-            })
-            .collect();
-        self.client
-            .send(proto::AdvertiseContexts {
-                project_id,
-                contexts,
-            })
-            .ok();
-    }
-
-    fn synchronize_contexts(&mut self, cx: &mut Context<Self>) {
-        let Some(project) = self.project.upgrade() else {
-            return;
-        };
-        let Some(project_id) = project.read(cx).remote_id() else {
-            return;
-        };
-
-        let text_threads = self
-            .text_threads
-            .iter()
-            .filter_map(|text_thread| {
-                let text_thread = text_thread.upgrade()?.read(cx);
-                if text_thread.replica_id() != ReplicaId::default() {
-                    Some(text_thread.version(cx).to_proto(text_thread.id().clone()))
-                } else {
-                    None
-                }
-            })
-            .collect();
-
-        let client = self.client.clone();
-        let request = self.client.request(proto::SynchronizeContexts {
-            project_id,
-            contexts: text_threads,
-        });
-        cx.spawn(async move |this, cx| {
-            let response = request.await?;
-
-            let mut text_thread_ids = Vec::new();
-            let mut operations = Vec::new();
-            this.read_with(cx, |this, cx| {
-                for context_version_proto in response.contexts {
-                    let text_thread_version = TextThreadVersion::from_proto(&context_version_proto);
-                    let text_thread_id = TextThreadId::from_proto(context_version_proto.context_id);
-                    if let Some(text_thread) = this.loaded_text_thread_for_id(&text_thread_id, cx) {
-                        text_thread_ids.push(text_thread_id);
-                        operations
-                            .push(text_thread.read(cx).serialize_ops(&text_thread_version, cx));
-                    }
-                }
-            })?;
-
-            let operations = futures::future::join_all(operations).await;
-            for (context_id, operations) in text_thread_ids.into_iter().zip(operations) {
-                for operation in operations {
-                    client.send(proto::UpdateContext {
-                        project_id,
-                        context_id: context_id.to_proto(),
-                        operation: Some(operation),
-                    })?;
-                }
-            }
-
-            anyhow::Ok(())
-        })
-        .detach_and_log_err(cx);
-    }
-
-    pub fn search(&self, query: String, cx: &App) -> Task<Vec<SavedTextThreadMetadata>> {
-        let metadata = self.text_threads_metadata.clone();
-        let executor = cx.background_executor().clone();
-        cx.background_spawn(async move {
-            if query.is_empty() {
-                metadata
-            } else {
-                let candidates = metadata
-                    .iter()
-                    .enumerate()
-                    .map(|(id, metadata)| StringMatchCandidate::new(id, &metadata.title))
-                    .collect::<Vec<_>>();
-                let matches = fuzzy::match_strings(
-                    &candidates,
-                    &query,
-                    false,
-                    true,
-                    100,
-                    &Default::default(),
-                    executor,
-                )
-                .await;
-
-                matches
-                    .into_iter()
-                    .map(|mat| metadata[mat.candidate_id].clone())
-                    .collect()
-            }
-        })
-    }
-
-    fn reload(&mut self, cx: &mut Context<Self>) -> Task<Result<()>> {
-        let fs = self.fs.clone();
-        cx.spawn(async move |this, cx| {
-            if *ZED_STATELESS {
-                return Ok(());
-            }
-            fs.create_dir(text_threads_dir()).await?;
-
-            let mut paths = fs.read_dir(text_threads_dir()).await?;
-            let mut contexts = Vec::<SavedTextThreadMetadata>::new();
-            while let Some(path) = paths.next().await {
-                let path = path?;
-                if path.extension() != Some(OsStr::new("json")) {
-                    continue;
-                }
-
-                static ASSISTANT_CONTEXT_REGEX: LazyLock<Regex> =
-                    LazyLock::new(|| Regex::new(r" - \d+.zed.json$").unwrap());
-
-                let metadata = fs.metadata(&path).await?;
-                if let Some((file_name, metadata)) = path
-                    .file_name()
-                    .and_then(|name| name.to_str())
-                    .zip(metadata)
-                {
-                    // This is used to filter out contexts saved by the new assistant.
-                    if !ASSISTANT_CONTEXT_REGEX.is_match(file_name) {
-                        continue;
-                    }
-
-                    if let Some(title) = ASSISTANT_CONTEXT_REGEX
-                        .replace(file_name, "")
-                        .lines()
-                        .next()
-                    {
-                        contexts.push(SavedTextThreadMetadata {
-                            title: title.to_string().into(),
-                            path: path.into(),
-                            mtime: metadata.mtime.timestamp_for_user().into(),
-                        });
-                    }
-                }
-            }
-            contexts.sort_unstable_by_key(|text_thread| Reverse(text_thread.mtime));
-
-            this.update(cx, |this, cx| {
-                this.text_threads_metadata = contexts;
-                cx.notify();
-            })
-        })
-    }
-
-    fn register_context_server_handlers(&self, cx: &mut Context<Self>) {
-        let Some(project) = self.project.upgrade() else {
-            return;
-        };
-        let context_server_store = project.read(cx).context_server_store();
-        cx.subscribe(&context_server_store, Self::handle_context_server_event)
-            .detach();
-
-        // Check for any servers that were already running before the handler was registered
-        for server in context_server_store.read(cx).running_servers() {
-            self.load_context_server_slash_commands(server.id(), context_server_store.clone(), cx);
-        }
-    }
-
-    fn handle_context_server_event(
-        &mut self,
-        context_server_store: Entity<ContextServerStore>,
-        event: &project::context_server_store::Event,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            project::context_server_store::Event::ServerStatusChanged { server_id, status } => {
-                match status {
-                    ContextServerStatus::Running => {
-                        self.load_context_server_slash_commands(
-                            server_id.clone(),
-                            context_server_store,
-                            cx,
-                        );
-                    }
-                    ContextServerStatus::Stopped | ContextServerStatus::Error(_) => {
-                        if let Some(slash_command_ids) =
-                            self.context_server_slash_command_ids.remove(server_id)
-                        {
-                            self.slash_commands.remove(&slash_command_ids);
-                        }
-                    }
-                    _ => {}
-                }
-            }
-        }
-    }
-
-    fn load_context_server_slash_commands(
-        &self,
-        server_id: ContextServerId,
-        context_server_store: Entity<ContextServerStore>,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(server) = context_server_store.read(cx).get_running_server(&server_id) else {
-            return;
-        };
-        let slash_command_working_set = self.slash_commands.clone();
-        cx.spawn(async move |this, cx| {
-            let Some(protocol) = server.client() else {
-                return;
-            };
-
-            if protocol.capable(context_server::protocol::ServerCapability::Prompts)
-                && let Some(response) = protocol
-                    .request::<context_server::types::requests::PromptsList>(())
-                    .await
-                    .log_err()
-            {
-                let slash_command_ids = response
-                    .prompts
-                    .into_iter()
-                    .filter(assistant_slash_commands::acceptable_prompt)
-                    .map(|prompt| {
-                        log::info!("registering context server command: {:?}", prompt.name);
-                        slash_command_working_set.insert(Arc::new(
-                            assistant_slash_commands::ContextServerSlashCommand::new(
-                                context_server_store.clone(),
-                                server.id(),
-                                prompt,
-                            ),
-                        ))
-                    })
-                    .collect::<Vec<_>>();
-
-                this.update(cx, |this, _cx| {
-                    this.context_server_slash_command_ids
-                        .insert(server_id.clone(), slash_command_ids);
-                })
-                .log_err();
-            }
-        })
-        .detach();
-    }
-}
diff --git a/crates/audio/Cargo.toml b/crates/audio/Cargo.toml
deleted file mode 100644
index 2aee764007..0000000000
--- a/crates/audio/Cargo.toml
+++ /dev/null
@@ -1,32 +0,0 @@
-[package]
-name = "audio"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/audio.rs"
-doctest = false
-
-[dependencies]
-anyhow.workspace = true
-async-tar.workspace = true
-collections.workspace = true
-crossbeam.workspace = true
-gpui.workspace = true
-denoise = { path = "../denoise" }
-log.workspace = true
-parking_lot.workspace = true
-rodio.workspace = true
-serde.workspace = true
-settings.workspace = true
-smol.workspace = true
-thiserror.workspace = true
-util.workspace = true
-
-[target.'cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))'.dependencies]
-libwebrtc = { rev = "5f04705ac3f356350ae31534ffbc476abc9ea83d", git = "https://github.com/zed-industries/livekit-rust-sdks" }
diff --git a/crates/audio/LICENSE-GPL b/crates/audio/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/audio/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/audio/src/audio.rs b/crates/audio/src/audio.rs
deleted file mode 100644
index 2c1f770530..0000000000
--- a/crates/audio/src/audio.rs
+++ /dev/null
@@ -1,319 +0,0 @@
-use anyhow::{Context as _, Result};
-use collections::HashMap;
-use gpui::{App, BackgroundExecutor, BorrowAppContext, Global};
-use log::info;
-
-#[cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))]
-mod non_windows_and_freebsd_deps {
-    pub(super) use gpui::AsyncApp;
-    pub(super) use libwebrtc::native::apm;
-    pub(super) use parking_lot::Mutex;
-    pub(super) use rodio::cpal::Sample;
-    pub(super) use rodio::source::LimitSettings;
-    pub(super) use std::sync::Arc;
-}
-
-#[cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))]
-use non_windows_and_freebsd_deps::*;
-
-use rodio::{
-    Decoder, OutputStream, OutputStreamBuilder, Source, mixer::Mixer, nz, source::Buffered,
-};
-use settings::Settings;
-use std::{io::Cursor, num::NonZero, path::PathBuf, sync::atomic::Ordering, time::Duration};
-use util::ResultExt;
-
-mod audio_settings;
-mod replays;
-mod rodio_ext;
-pub use audio_settings::AudioSettings;
-pub use rodio_ext::RodioExt;
-
-use crate::audio_settings::LIVE_SETTINGS;
-
-// We are migrating to 16kHz sample rate from 48kHz. In the future
-// once we are reasonably sure most users have upgraded we will
-// remove the LEGACY parameters.
-//
-// We migrate to 16kHz because it is sufficient for speech and required
-// by the denoiser and future Speech to Text layers.
-pub const SAMPLE_RATE: NonZero<u32> = nz!(16000);
-pub const CHANNEL_COUNT: NonZero<u16> = nz!(1);
-pub const BUFFER_SIZE: usize = // echo canceller and livekit want 10ms of audio
-    (SAMPLE_RATE.get() as usize / 100) * CHANNEL_COUNT.get() as usize;
-
-pub const LEGACY_SAMPLE_RATE: NonZero<u32> = nz!(48000);
-pub const LEGACY_CHANNEL_COUNT: NonZero<u16> = nz!(2);
-
-pub const REPLAY_DURATION: Duration = Duration::from_secs(30);
-
-pub fn init(cx: &mut App) {
-    LIVE_SETTINGS.initialize(cx);
-}
-
-#[derive(Debug, Copy, Clone, Eq, Hash, PartialEq)]
-pub enum Sound {
-    Joined,
-    GuestJoined,
-    Leave,
-    Mute,
-    Unmute,
-    StartScreenshare,
-    StopScreenshare,
-    AgentDone,
-}
-
-impl Sound {
-    fn file(&self) -> &'static str {
-        match self {
-            Self::Joined => "joined_call",
-            Self::GuestJoined => "guest_joined_call",
-            Self::Leave => "leave_call",
-            Self::Mute => "mute",
-            Self::Unmute => "unmute",
-            Self::StartScreenshare => "start_screenshare",
-            Self::StopScreenshare => "stop_screenshare",
-            Self::AgentDone => "agent_done",
-        }
-    }
-}
-
-pub struct Audio {
-    output_handle: Option<OutputStream>,
-    output_mixer: Option<Mixer>,
-    #[cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))]
-    pub echo_canceller: Arc<Mutex<apm::AudioProcessingModule>>,
-    source_cache: HashMap<Sound, Buffered<Decoder<Cursor<Vec<u8>>>>>,
-    replays: replays::Replays,
-}
-
-impl Default for Audio {
-    fn default() -> Self {
-        Self {
-            output_handle: Default::default(),
-            output_mixer: Default::default(),
-            #[cfg(not(any(
-                all(target_os = "windows", target_env = "gnu"),
-                target_os = "freebsd"
-            )))]
-            echo_canceller: Arc::new(Mutex::new(apm::AudioProcessingModule::new(
-                true, false, false, false,
-            ))),
-            source_cache: Default::default(),
-            replays: Default::default(),
-        }
-    }
-}
-
-impl Global for Audio {}
-
-impl Audio {
-    fn ensure_output_exists(&mut self) -> Result<&Mixer> {
-        #[cfg(debug_assertions)]
-        log::warn!(
-            "Audio does not sound correct without optimizations. Use a release build to debug audio issues"
-        );
-
-        if self.output_handle.is_none() {
-            let output_handle = OutputStreamBuilder::open_default_stream()
-                .context("Could not open default output stream")?;
-            info!("Output stream: {:?}", output_handle);
-            self.output_handle = Some(output_handle);
-            if let Some(output_handle) = &self.output_handle {
-                let (mixer, source) = rodio::mixer::mixer(CHANNEL_COUNT, SAMPLE_RATE);
-                // or the mixer will end immediately as its empty.
-                mixer.add(rodio::source::Zero::new(CHANNEL_COUNT, SAMPLE_RATE));
-                self.output_mixer = Some(mixer);
-
-                // The webrtc apm is not yet compiling for windows & freebsd
-                #[cfg(not(any(
-                    any(all(target_os = "windows", target_env = "gnu")),
-                    target_os = "freebsd"
-                )))]
-                let echo_canceller = Arc::clone(&self.echo_canceller);
-                #[cfg(not(any(
-                    any(all(target_os = "windows", target_env = "gnu")),
-                    target_os = "freebsd"
-                )))]
-                let source = source.inspect_buffer::<BUFFER_SIZE, _>(move |buffer| {
-                    let mut buf: [i16; _] = buffer.map(|s| s.to_sample());
-                    echo_canceller
-                        .lock()
-                        .process_reverse_stream(
-                            &mut buf,
-                            SAMPLE_RATE.get() as i32,
-                            CHANNEL_COUNT.get().into(),
-                        )
-                        .expect("Audio input and output threads should not panic");
-                });
-                output_handle.mixer().add(source);
-            }
-        }
-
-        Ok(self
-            .output_mixer
-            .as_ref()
-            .expect("we only get here if opening the outputstream succeeded"))
-    }
-
-    pub fn save_replays(
-        &self,
-        executor: BackgroundExecutor,
-    ) -> gpui::Task<anyhow::Result<(PathBuf, Duration)>> {
-        self.replays.replays_to_tar(executor)
-    }
-
-    #[cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))]
-    pub fn open_microphone(voip_parts: VoipParts) -> anyhow::Result<impl Source> {
-        let stream = rodio::microphone::MicrophoneBuilder::new()
-            .default_device()?
-            .default_config()?
-            .prefer_sample_rates([
-                SAMPLE_RATE, // sample rates trivially resamplable to `SAMPLE_RATE`
-                SAMPLE_RATE.saturating_mul(nz!(2)),
-                SAMPLE_RATE.saturating_mul(nz!(3)),
-                SAMPLE_RATE.saturating_mul(nz!(4)),
-            ])
-            .prefer_channel_counts([nz!(1), nz!(2), nz!(3), nz!(4)])
-            .prefer_buffer_sizes(512..)
-            .open_stream()?;
-        info!("Opened microphone: {:?}", stream.config());
-
-        let stream = stream
-            .possibly_disconnected_channels_to_mono()
-            .constant_samplerate(SAMPLE_RATE)
-            .limit(LimitSettings::live_performance())
-            .process_buffer::<BUFFER_SIZE, _>(move |buffer| {
-                let mut int_buffer: [i16; _] = buffer.map(|s| s.to_sample());
-                if voip_parts
-                    .echo_canceller
-                    .lock()
-                    .process_stream(
-                        &mut int_buffer,
-                        SAMPLE_RATE.get() as i32,
-                        CHANNEL_COUNT.get() as i32,
-                    )
-                    .context("livekit audio processor error")
-                    .log_err()
-                    .is_some()
-                {
-                    for (sample, processed) in buffer.iter_mut().zip(&int_buffer) {
-                        *sample = (*processed).to_sample();
-                    }
-                }
-            })
-            .denoise()
-            .context("Could not set up denoiser")?
-            .automatic_gain_control(0.90, 1.0, 0.0, 5.0)
-            .periodic_access(Duration::from_millis(100), move |agc_source| {
-                agc_source
-                    .set_enabled(LIVE_SETTINGS.auto_microphone_volume.load(Ordering::Relaxed));
-                let denoise = agc_source.inner_mut();
-                denoise.set_enabled(LIVE_SETTINGS.denoise.load(Ordering::Relaxed));
-            });
-
-        let stream = if voip_parts.legacy_audio_compatible {
-            stream.constant_params(LEGACY_CHANNEL_COUNT, LEGACY_SAMPLE_RATE)
-        } else {
-            stream.constant_params(CHANNEL_COUNT, SAMPLE_RATE)
-        };
-
-        let (replay, stream) = stream.replayable(REPLAY_DURATION)?;
-        voip_parts
-            .replays
-            .add_voip_stream("local microphone".to_string(), replay);
-
-        Ok(stream)
-    }
-
-    pub fn play_voip_stream(
-        source: impl rodio::Source + Send + 'static,
-        speaker_name: String,
-        is_staff: bool,
-        cx: &mut App,
-    ) -> anyhow::Result<()> {
-        let (replay_source, source) = source
-            .constant_params(CHANNEL_COUNT, SAMPLE_RATE)
-            .automatic_gain_control(0.90, 1.0, 0.0, 5.0)
-            .periodic_access(Duration::from_millis(100), move |agc_source| {
-                agc_source.set_enabled(LIVE_SETTINGS.auto_speaker_volume.load(Ordering::Relaxed));
-            })
-            .replayable(REPLAY_DURATION)
-            .expect("REPLAY_DURATION is longer than 100ms");
-
-        cx.update_default_global(|this: &mut Self, _cx| {
-            let output_mixer = this
-                .ensure_output_exists()
-                .context("Could not get output mixer")?;
-            output_mixer.add(source);
-            if is_staff {
-                this.replays.add_voip_stream(speaker_name, replay_source);
-            }
-            Ok(())
-        })
-    }
-
-    pub fn play_sound(sound: Sound, cx: &mut App) {
-        cx.update_default_global(|this: &mut Self, cx| {
-            let source = this.sound_source(sound, cx).log_err()?;
-            let output_mixer = this
-                .ensure_output_exists()
-                .context("Could not get output mixer")
-                .log_err()?;
-
-            output_mixer.add(source);
-            Some(())
-        });
-    }
-
-    pub fn end_call(cx: &mut App) {
-        cx.update_default_global(|this: &mut Self, _cx| {
-            this.output_handle.take();
-        });
-    }
-
-    fn sound_source(&mut self, sound: Sound, cx: &App) -> Result<impl Source + use<>> {
-        if let Some(wav) = self.source_cache.get(&sound) {
-            return Ok(wav.clone());
-        }
-
-        let path = format!("sounds/{}.wav", sound.file());
-        let bytes = cx
-            .asset_source()
-            .load(&path)?
-            .map(anyhow::Ok)
-            .with_context(|| format!("No asset available for path {path}"))??
-            .into_owned();
-        let cursor = Cursor::new(bytes);
-        let source = Decoder::new(cursor)?.buffered();
-
-        self.source_cache.insert(sound, source.clone());
-
-        Ok(source)
-    }
-}
-
-#[cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))]
-pub struct VoipParts {
-    echo_canceller: Arc<Mutex<apm::AudioProcessingModule>>,
-    replays: replays::Replays,
-    legacy_audio_compatible: bool,
-}
-
-#[cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))]
-impl VoipParts {
-    pub fn new(cx: &AsyncApp) -> anyhow::Result<Self> {
-        let (apm, replays) = cx.try_read_default_global::<Audio, _>(|audio, _| {
-            (Arc::clone(&audio.echo_canceller), audio.replays.clone())
-        })?;
-        let legacy_audio_compatible =
-            AudioSettings::try_read_global(cx, |settings| settings.legacy_audio_compatible)
-                .unwrap_or(true);
-
-        Ok(Self {
-            legacy_audio_compatible,
-            echo_canceller: apm,
-            replays,
-        })
-    }
-}
diff --git a/crates/audio/src/audio_settings.rs b/crates/audio/src/audio_settings.rs
deleted file mode 100644
index f862462928..0000000000
--- a/crates/audio/src/audio_settings.rs
+++ /dev/null
@@ -1,119 +0,0 @@
-use std::sync::atomic::{AtomicBool, Ordering};
-
-use gpui::App;
-use settings::{RegisterSetting, Settings, SettingsStore};
-
-#[derive(Clone, Debug, RegisterSetting)]
-pub struct AudioSettings {
-    /// Opt into the new audio system.
-    ///
-    /// You need to rejoin a call for this setting to apply
-    pub rodio_audio: bool, // default is false
-    /// Requires 'rodio_audio: true'
-    ///
-    /// Automatically increase or decrease you microphone's volume. This affects how
-    /// loud you sound to others.
-    ///
-    /// Recommended: off (default)
-    /// Microphones are too quite in zed, until everyone is on experimental
-    /// audio and has auto speaker volume on this will make you very loud
-    /// compared to other speakers.
-    pub auto_microphone_volume: bool,
-    /// Requires 'rodio_audio: true'
-    ///
-    /// Automatically increate or decrease the volume of other call members.
-    /// This only affects how things sound for you.
-    pub auto_speaker_volume: bool,
-    /// Requires 'rodio_audio: true'
-    ///
-    /// Remove background noises. Works great for typing, cars, dogs, AC. Does
-    /// not work well on music.
-    pub denoise: bool,
-    /// Requires 'rodio_audio: true'
-    ///
-    /// Use audio parameters compatible with the previous versions of
-    /// experimental audio and non-experimental audio. When this is false you
-    /// will sound strange to anyone not on the latest experimental audio. In
-    /// the future we will migrate by setting this to false
-    ///
-    /// You need to rejoin a call for this setting to apply
-    pub legacy_audio_compatible: bool,
-}
-
-/// Configuration of audio in Zed
-impl Settings for AudioSettings {
-    fn from_settings(content: &settings::SettingsContent) -> Self {
-        let audio = &content.audio.as_ref().unwrap();
-        AudioSettings {
-            rodio_audio: audio.rodio_audio.unwrap(),
-            auto_microphone_volume: audio.auto_microphone_volume.unwrap(),
-            auto_speaker_volume: audio.auto_speaker_volume.unwrap(),
-            denoise: audio.denoise.unwrap(),
-            legacy_audio_compatible: audio.legacy_audio_compatible.unwrap(),
-        }
-    }
-}
-
-/// See docs on [LIVE_SETTINGS]
-pub(crate) struct LiveSettings {
-    pub(crate) auto_microphone_volume: AtomicBool,
-    pub(crate) auto_speaker_volume: AtomicBool,
-    pub(crate) denoise: AtomicBool,
-}
-
-impl LiveSettings {
-    pub(crate) fn initialize(&self, cx: &mut App) {
-        cx.observe_global::<SettingsStore>(move |cx| {
-            LIVE_SETTINGS.auto_microphone_volume.store(
-                AudioSettings::get_global(cx).auto_microphone_volume,
-                Ordering::Relaxed,
-            );
-            LIVE_SETTINGS.auto_speaker_volume.store(
-                AudioSettings::get_global(cx).auto_speaker_volume,
-                Ordering::Relaxed,
-            );
-
-            let denoise_enabled = AudioSettings::get_global(cx).denoise;
-            #[cfg(debug_assertions)]
-            {
-                static DENOISE_WARNING_SEND: AtomicBool = AtomicBool::new(false);
-                if denoise_enabled && !DENOISE_WARNING_SEND.load(Ordering::Relaxed) {
-                    DENOISE_WARNING_SEND.store(true, Ordering::Relaxed);
-                    log::warn!("Denoise does not work on debug builds, not enabling")
-                }
-            }
-            #[cfg(not(debug_assertions))]
-            LIVE_SETTINGS
-                .denoise
-                .store(denoise_enabled, Ordering::Relaxed);
-        })
-        .detach();
-
-        let init_settings = AudioSettings::get_global(cx);
-        LIVE_SETTINGS
-            .auto_microphone_volume
-            .store(init_settings.auto_microphone_volume, Ordering::Relaxed);
-        LIVE_SETTINGS
-            .auto_speaker_volume
-            .store(init_settings.auto_speaker_volume, Ordering::Relaxed);
-        let denoise_enabled = AudioSettings::get_global(cx).denoise;
-        #[cfg(debug_assertions)]
-        if denoise_enabled {
-            log::warn!("Denoise does not work on debug builds, not enabling")
-        }
-        #[cfg(not(debug_assertions))]
-        LIVE_SETTINGS
-            .denoise
-            .store(denoise_enabled, Ordering::Relaxed);
-    }
-}
-
-/// Allows access to settings from the audio thread. Updated by
-/// observer of SettingsStore. Needed because audio playback and recording are
-/// real time and must each run in a dedicated OS thread, therefore we can not
-/// use the background executor.
-pub(crate) static LIVE_SETTINGS: LiveSettings = LiveSettings {
-    auto_microphone_volume: AtomicBool::new(true),
-    auto_speaker_volume: AtomicBool::new(true),
-    denoise: AtomicBool::new(true),
-};
diff --git a/crates/audio/src/replays.rs b/crates/audio/src/replays.rs
deleted file mode 100644
index bb21df51e5..0000000000
--- a/crates/audio/src/replays.rs
+++ /dev/null
@@ -1,77 +0,0 @@
-use anyhow::{Context, anyhow};
-use async_tar::{Builder, Header};
-use gpui::{BackgroundExecutor, Task};
-
-use collections::HashMap;
-use parking_lot::Mutex;
-use rodio::Source;
-use smol::fs::File;
-use std::{io, path::PathBuf, sync::Arc, time::Duration};
-
-use crate::{REPLAY_DURATION, rodio_ext::Replay};
-
-#[derive(Default, Clone)]
-pub(crate) struct Replays(Arc<Mutex<HashMap<String, Replay>>>);
-
-impl Replays {
-    pub(crate) fn add_voip_stream(&self, stream_name: String, source: Replay) {
-        let mut map = self.0.lock();
-        map.retain(|_, replay| replay.source_is_active());
-        map.insert(stream_name, source);
-    }
-
-    pub(crate) fn replays_to_tar(
-        &self,
-        executor: BackgroundExecutor,
-    ) -> Task<anyhow::Result<(PathBuf, Duration)>> {
-        let map = Arc::clone(&self.0);
-        executor.spawn(async move {
-            let recordings: Vec<_> = map
-                .lock()
-                .iter_mut()
-                .map(|(name, replay)| {
-                    let queued = REPLAY_DURATION.min(replay.duration_ready());
-                    (name.clone(), replay.take_duration(queued).record())
-                })
-                .collect();
-            let longest = recordings
-                .iter()
-                .map(|(_, r)| {
-                    r.total_duration()
-                        .expect("SamplesBuffer always returns a total duration")
-                })
-                .max()
-                .ok_or(anyhow!("There is no audio to capture"))?;
-
-            let path = std::env::current_dir()
-                .context("Could not get current dir")?
-                .join("replays.tar");
-            let tar = File::create(&path)
-                .await
-                .context("Could not create file for tar")?;
-
-            let mut tar = Builder::new(tar);
-
-            for (name, recording) in recordings {
-                let mut writer = io::Cursor::new(Vec::new());
-                rodio::wav_to_writer(recording, &mut writer).context("failed to encode wav")?;
-                let wav_data = writer.into_inner();
-                let path = name.replace(' ', "_") + ".wav";
-                let mut header = Header::new_gnu();
-                // rw permissions for everyone
-                header.set_mode(0o666);
-                header.set_size(wav_data.len() as u64);
-                tar.append_data(&mut header, path, wav_data.as_slice())
-                    .await
-                    .context("failed to apped wav to tar")?;
-            }
-            tar.into_inner()
-                .await
-                .context("Could not finish writing tar")?
-                .sync_all()
-                .await
-                .context("Could not flush tar file to disk")?;
-            Ok((path, longest))
-        })
-    }
-}
diff --git a/crates/audio/src/rodio_ext.rs b/crates/audio/src/rodio_ext.rs
deleted file mode 100644
index ab74c59fe6..0000000000
--- a/crates/audio/src/rodio_ext.rs
+++ /dev/null
@@ -1,763 +0,0 @@
-use std::{
-    num::NonZero,
-    sync::{
-        Arc, Mutex,
-        atomic::{AtomicBool, Ordering},
-    },
-    time::Duration,
-};
-
-use crossbeam::queue::ArrayQueue;
-use denoise::{Denoiser, DenoiserError};
-use log::warn;
-use rodio::{
-    ChannelCount, Sample, SampleRate, Source, conversions::SampleRateConverter, nz,
-    source::UniformSourceIterator,
-};
-
-const MAX_CHANNELS: usize = 8;
-
-#[derive(Debug, thiserror::Error)]
-#[error("Replay duration is too short must be >= 100ms")]
-pub struct ReplayDurationTooShort;
-
-// These all require constant sources (so the span is infinitely long)
-// this is not guaranteed by rodio however we know it to be true in all our
-// applications. Rodio desperately needs a constant source concept.
-pub trait RodioExt: Source + Sized {
-    fn process_buffer<const N: usize, F>(self, callback: F) -> ProcessBuffer<N, Self, F>
-    where
-        F: FnMut(&mut [Sample; N]);
-    fn inspect_buffer<const N: usize, F>(self, callback: F) -> InspectBuffer<N, Self, F>
-    where
-        F: FnMut(&[Sample; N]);
-    fn replayable(
-        self,
-        duration: Duration,
-    ) -> Result<(Replay, Replayable<Self>), ReplayDurationTooShort>;
-    fn take_samples(self, n: usize) -> TakeSamples<Self>;
-    fn denoise(self) -> Result<Denoiser<Self>, DenoiserError>;
-    fn constant_params(
-        self,
-        channel_count: ChannelCount,
-        sample_rate: SampleRate,
-    ) -> UniformSourceIterator<Self>;
-    fn constant_samplerate(self, sample_rate: SampleRate) -> ConstantSampleRate<Self>;
-    fn possibly_disconnected_channels_to_mono(self) -> ToMono<Self>;
-}
-
-impl<S: Source> RodioExt for S {
-    fn process_buffer<const N: usize, F>(self, callback: F) -> ProcessBuffer<N, Self, F>
-    where
-        F: FnMut(&mut [Sample; N]),
-    {
-        ProcessBuffer {
-            inner: self,
-            callback,
-            buffer: [0.0; N],
-            next: N,
-        }
-    }
-    fn inspect_buffer<const N: usize, F>(self, callback: F) -> InspectBuffer<N, Self, F>
-    where
-        F: FnMut(&[Sample; N]),
-    {
-        InspectBuffer {
-            inner: self,
-            callback,
-            buffer: [0.0; N],
-            free: 0,
-        }
-    }
-    /// Maintains a live replay with a history of at least `duration` seconds.
-    ///
-    /// Note:
-    /// History can be 100ms longer if the source drops before or while the
-    /// replay is being read
-    ///
-    /// # Errors
-    /// If duration is smaller than 100ms
-    fn replayable(
-        self,
-        duration: Duration,
-    ) -> Result<(Replay, Replayable<Self>), ReplayDurationTooShort> {
-        if duration < Duration::from_millis(100) {
-            return Err(ReplayDurationTooShort);
-        }
-
-        let samples_per_second = self.sample_rate().get() as usize * self.channels().get() as usize;
-        let samples_to_queue = duration.as_secs_f64() * samples_per_second as f64;
-        let samples_to_queue =
-            (samples_to_queue as usize).next_multiple_of(self.channels().get().into());
-
-        let chunk_size =
-            (samples_per_second.div_ceil(10)).next_multiple_of(self.channels().get() as usize);
-        let chunks_to_queue = samples_to_queue.div_ceil(chunk_size);
-
-        let is_active = Arc::new(AtomicBool::new(true));
-        let queue = Arc::new(ReplayQueue::new(chunks_to_queue, chunk_size));
-        Ok((
-            Replay {
-                rx: Arc::clone(&queue),
-                buffer: Vec::new().into_iter(),
-                sleep_duration: duration / 2,
-                sample_rate: self.sample_rate(),
-                channel_count: self.channels(),
-                source_is_active: is_active.clone(),
-            },
-            Replayable {
-                tx: queue,
-                inner: self,
-                buffer: Vec::with_capacity(chunk_size),
-                chunk_size,
-                is_active,
-            },
-        ))
-    }
-    fn take_samples(self, n: usize) -> TakeSamples<S> {
-        TakeSamples {
-            inner: self,
-            left_to_take: n,
-        }
-    }
-    fn denoise(self) -> Result<Denoiser<Self>, DenoiserError> {
-        let res = Denoiser::try_new(self);
-        res
-    }
-    fn constant_params(
-        self,
-        channel_count: ChannelCount,
-        sample_rate: SampleRate,
-    ) -> UniformSourceIterator<Self> {
-        UniformSourceIterator::new(self, channel_count, sample_rate)
-    }
-    fn constant_samplerate(self, sample_rate: SampleRate) -> ConstantSampleRate<Self> {
-        ConstantSampleRate::new(self, sample_rate)
-    }
-    fn possibly_disconnected_channels_to_mono(self) -> ToMono<Self> {
-        ToMono::new(self)
-    }
-}
-
-pub struct ConstantSampleRate<S: Source> {
-    inner: SampleRateConverter<S>,
-    channels: ChannelCount,
-    sample_rate: SampleRate,
-}
-
-impl<S: Source> ConstantSampleRate<S> {
-    fn new(source: S, target_rate: SampleRate) -> Self {
-        let input_sample_rate = source.sample_rate();
-        let channels = source.channels();
-        let inner = SampleRateConverter::new(source, input_sample_rate, target_rate, channels);
-        Self {
-            inner,
-            channels,
-            sample_rate: target_rate,
-        }
-    }
-}
-
-impl<S: Source> Iterator for ConstantSampleRate<S> {
-    type Item = rodio::Sample;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.inner.next()
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        self.inner.size_hint()
-    }
-}
-
-impl<S: Source> Source for ConstantSampleRate<S> {
-    fn current_span_len(&self) -> Option<usize> {
-        None
-    }
-
-    fn channels(&self) -> ChannelCount {
-        self.channels
-    }
-
-    fn sample_rate(&self) -> SampleRate {
-        self.sample_rate
-    }
-
-    fn total_duration(&self) -> Option<Duration> {
-        None // not supported (not used by us)
-    }
-}
-
-const TYPICAL_NOISE_FLOOR: Sample = 1e-3;
-
-/// constant source, only works on a single span
-pub struct ToMono<S> {
-    inner: S,
-    input_channel_count: ChannelCount,
-    connected_channels: ChannelCount,
-    /// running mean of second channel 'volume'
-    means: [f32; MAX_CHANNELS],
-}
-impl<S: Source> ToMono<S> {
-    fn new(input: S) -> Self {
-        let channels = input
-            .channels()
-            .min(const { NonZero::<u16>::new(MAX_CHANNELS as u16).unwrap() });
-        if channels < input.channels() {
-            warn!("Ignoring input channels {}..", channels.get());
-        }
-
-        Self {
-            connected_channels: channels,
-            input_channel_count: channels,
-            inner: input,
-            means: [TYPICAL_NOISE_FLOOR; MAX_CHANNELS],
-        }
-    }
-}
-
-impl<S: Source> Source for ToMono<S> {
-    fn current_span_len(&self) -> Option<usize> {
-        None
-    }
-
-    fn channels(&self) -> ChannelCount {
-        rodio::nz!(1)
-    }
-
-    fn sample_rate(&self) -> SampleRate {
-        self.inner.sample_rate()
-    }
-
-    fn total_duration(&self) -> Option<Duration> {
-        self.inner.total_duration()
-    }
-}
-
-fn update_mean(mean: &mut f32, sample: Sample) {
-    const HISTORY: f32 = 500.0;
-    *mean *= (HISTORY - 1.0) / HISTORY;
-    *mean += sample.abs() / HISTORY;
-}
-
-impl<S: Source> Iterator for ToMono<S> {
-    type Item = Sample;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        let mut mono_sample = 0f32;
-        let mut active_channels = 0;
-        for channel in 0..self.input_channel_count.get() as usize {
-            let sample = self.inner.next()?;
-            mono_sample += sample;
-
-            update_mean(&mut self.means[channel], sample);
-            if self.means[channel] > TYPICAL_NOISE_FLOOR / 10.0 {
-                active_channels += 1;
-            }
-        }
-        mono_sample /= self.connected_channels.get() as f32;
-        self.connected_channels = NonZero::new(active_channels).unwrap_or(nz!(1));
-
-        Some(mono_sample)
-    }
-}
-
-/// constant source, only works on a single span
-pub struct TakeSamples<S> {
-    inner: S,
-    left_to_take: usize,
-}
-
-impl<S: Source> Iterator for TakeSamples<S> {
-    type Item = Sample;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        if self.left_to_take == 0 {
-            None
-        } else {
-            self.left_to_take -= 1;
-            self.inner.next()
-        }
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        (0, Some(self.left_to_take))
-    }
-}
-
-impl<S: Source> Source for TakeSamples<S> {
-    fn current_span_len(&self) -> Option<usize> {
-        None // does not support spans
-    }
-
-    fn channels(&self) -> ChannelCount {
-        self.inner.channels()
-    }
-
-    fn sample_rate(&self) -> SampleRate {
-        self.inner.sample_rate()
-    }
-
-    fn total_duration(&self) -> Option<Duration> {
-        Some(Duration::from_secs_f64(
-            self.left_to_take as f64
-                / self.sample_rate().get() as f64
-                / self.channels().get() as f64,
-        ))
-    }
-}
-
-/// constant source, only works on a single span
-#[derive(Debug)]
-struct ReplayQueue {
-    inner: ArrayQueue<Vec<Sample>>,
-    normal_chunk_len: usize,
-    /// The last chunk in the queue may be smaller than
-    /// the normal chunk size. This is always equal to the
-    /// size of the last element in the queue.
-    /// (so normally chunk_size)
-    last_chunk: Mutex<Vec<Sample>>,
-}
-
-impl ReplayQueue {
-    fn new(queue_len: usize, chunk_size: usize) -> Self {
-        Self {
-            inner: ArrayQueue::new(queue_len),
-            normal_chunk_len: chunk_size,
-            last_chunk: Mutex::new(Vec::new()),
-        }
-    }
-    /// Returns the length in samples
-    fn len(&self) -> usize {
-        self.inner.len().saturating_sub(1) * self.normal_chunk_len
-            + self
-                .last_chunk
-                .lock()
-                .expect("Self::push_last can not poison this lock")
-                .len()
-    }
-
-    fn pop(&self) -> Option<Vec<Sample>> {
-        self.inner.pop() // removes element that was inserted first
-    }
-
-    fn push_last(&self, mut samples: Vec<Sample>) {
-        let mut last_chunk = self
-            .last_chunk
-            .lock()
-            .expect("Self::len can not poison this lock");
-        std::mem::swap(&mut *last_chunk, &mut samples);
-    }
-
-    fn push_normal(&self, samples: Vec<Sample>) {
-        let _pushed_out_of_ringbuf = self.inner.force_push(samples);
-    }
-}
-
-/// constant source, only works on a single span
-pub struct ProcessBuffer<const N: usize, S, F>
-where
-    S: Source + Sized,
-    F: FnMut(&mut [Sample; N]),
-{
-    inner: S,
-    callback: F,
-    /// Buffer used for both input and output.
-    buffer: [Sample; N],
-    /// Next already processed sample is at this index
-    /// in buffer.
-    ///
-    /// If this is equal to the length of the buffer we have no more samples and
-    /// we must get new ones and process them
-    next: usize,
-}
-
-impl<const N: usize, S, F> Iterator for ProcessBuffer<N, S, F>
-where
-    S: Source + Sized,
-    F: FnMut(&mut [Sample; N]),
-{
-    type Item = Sample;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.next += 1;
-        if self.next < self.buffer.len() {
-            let sample = self.buffer[self.next];
-            return Some(sample);
-        }
-
-        for sample in &mut self.buffer {
-            *sample = self.inner.next()?
-        }
-        (self.callback)(&mut self.buffer);
-
-        self.next = 0;
-        Some(self.buffer[0])
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        self.inner.size_hint()
-    }
-}
-
-impl<const N: usize, S, F> Source for ProcessBuffer<N, S, F>
-where
-    S: Source + Sized,
-    F: FnMut(&mut [Sample; N]),
-{
-    fn current_span_len(&self) -> Option<usize> {
-        None
-    }
-
-    fn channels(&self) -> rodio::ChannelCount {
-        self.inner.channels()
-    }
-
-    fn sample_rate(&self) -> rodio::SampleRate {
-        self.inner.sample_rate()
-    }
-
-    fn total_duration(&self) -> Option<std::time::Duration> {
-        self.inner.total_duration()
-    }
-}
-
-/// constant source, only works on a single span
-pub struct InspectBuffer<const N: usize, S, F>
-where
-    S: Source + Sized,
-    F: FnMut(&[Sample; N]),
-{
-    inner: S,
-    callback: F,
-    /// Stores already emitted samples, once its full we call the callback.
-    buffer: [Sample; N],
-    /// Next free element in buffer. If this is equal to the buffer length
-    /// we have no more free elements.
-    free: usize,
-}
-
-impl<const N: usize, S, F> Iterator for InspectBuffer<N, S, F>
-where
-    S: Source + Sized,
-    F: FnMut(&[Sample; N]),
-{
-    type Item = Sample;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        let Some(sample) = self.inner.next() else {
-            return None;
-        };
-
-        self.buffer[self.free] = sample;
-        self.free += 1;
-
-        if self.free == self.buffer.len() {
-            (self.callback)(&self.buffer);
-            self.free = 0
-        }
-
-        Some(sample)
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        self.inner.size_hint()
-    }
-}
-
-impl<const N: usize, S, F> Source for InspectBuffer<N, S, F>
-where
-    S: Source + Sized,
-    F: FnMut(&[Sample; N]),
-{
-    fn current_span_len(&self) -> Option<usize> {
-        None
-    }
-
-    fn channels(&self) -> rodio::ChannelCount {
-        self.inner.channels()
-    }
-
-    fn sample_rate(&self) -> rodio::SampleRate {
-        self.inner.sample_rate()
-    }
-
-    fn total_duration(&self) -> Option<std::time::Duration> {
-        self.inner.total_duration()
-    }
-}
-
-/// constant source, only works on a single span
-#[derive(Debug)]
-pub struct Replayable<S: Source> {
-    inner: S,
-    buffer: Vec<Sample>,
-    chunk_size: usize,
-    tx: Arc<ReplayQueue>,
-    is_active: Arc<AtomicBool>,
-}
-
-impl<S: Source> Iterator for Replayable<S> {
-    type Item = Sample;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        if let Some(sample) = self.inner.next() {
-            self.buffer.push(sample);
-            // If the buffer is full send it
-            if self.buffer.len() == self.chunk_size {
-                self.tx.push_normal(std::mem::take(&mut self.buffer));
-            }
-            Some(sample)
-        } else {
-            let last_chunk = std::mem::take(&mut self.buffer);
-            self.tx.push_last(last_chunk);
-            self.is_active.store(false, Ordering::Relaxed);
-            None
-        }
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        self.inner.size_hint()
-    }
-}
-
-impl<S: Source> Source for Replayable<S> {
-    fn current_span_len(&self) -> Option<usize> {
-        self.inner.current_span_len()
-    }
-
-    fn channels(&self) -> ChannelCount {
-        self.inner.channels()
-    }
-
-    fn sample_rate(&self) -> SampleRate {
-        self.inner.sample_rate()
-    }
-
-    fn total_duration(&self) -> Option<Duration> {
-        self.inner.total_duration()
-    }
-}
-
-/// constant source, only works on a single span
-#[derive(Debug)]
-pub struct Replay {
-    rx: Arc<ReplayQueue>,
-    buffer: std::vec::IntoIter<Sample>,
-    sleep_duration: Duration,
-    sample_rate: SampleRate,
-    channel_count: ChannelCount,
-    source_is_active: Arc<AtomicBool>,
-}
-
-impl Replay {
-    pub fn source_is_active(&self) -> bool {
-        // - source could return None and not drop
-        // - source could be dropped before returning None
-        self.source_is_active.load(Ordering::Relaxed) && Arc::strong_count(&self.rx) < 2
-    }
-
-    /// Duration of what is in the buffer and can be returned without blocking.
-    pub fn duration_ready(&self) -> Duration {
-        let samples_per_second = self.channels().get() as u32 * self.sample_rate().get();
-
-        let seconds_queued = self.samples_ready() as f64 / samples_per_second as f64;
-        Duration::from_secs_f64(seconds_queued)
-    }
-
-    /// Number of samples in the buffer and can be returned without blocking.
-    pub fn samples_ready(&self) -> usize {
-        self.rx.len() + self.buffer.len()
-    }
-}
-
-impl Iterator for Replay {
-    type Item = Sample;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        if let Some(sample) = self.buffer.next() {
-            return Some(sample);
-        }
-
-        loop {
-            if let Some(new_buffer) = self.rx.pop() {
-                self.buffer = new_buffer.into_iter();
-                return self.buffer.next();
-            }
-
-            if !self.source_is_active() {
-                return None;
-            }
-
-            // The queue does not support blocking on a next item. We want this queue as it
-            // is quite fast and provides a fixed size. We know how many samples are in a
-            // buffer so if we do not get one now we must be getting one after `sleep_duration`.
-            std::thread::sleep(self.sleep_duration);
-        }
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        ((self.rx.len() + self.buffer.len()), None)
-    }
-}
-
-impl Source for Replay {
-    fn current_span_len(&self) -> Option<usize> {
-        None // source is not compatible with spans
-    }
-
-    fn channels(&self) -> ChannelCount {
-        self.channel_count
-    }
-
-    fn sample_rate(&self) -> SampleRate {
-        self.sample_rate
-    }
-
-    fn total_duration(&self) -> Option<Duration> {
-        None
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use rodio::{nz, static_buffer::StaticSamplesBuffer};
-
-    use super::*;
-
-    const SAMPLES: [Sample; 5] = [0.0, 1.0, 2.0, 3.0, 4.0];
-
-    fn test_source() -> StaticSamplesBuffer {
-        StaticSamplesBuffer::new(nz!(1), nz!(1), &SAMPLES)
-    }
-
-    mod process_buffer {
-        use super::*;
-
-        #[test]
-        fn callback_gets_all_samples() {
-            let input = test_source();
-
-            let _ = input
-                .process_buffer::<{ SAMPLES.len() }, _>(|buffer| assert_eq!(*buffer, SAMPLES))
-                .count();
-        }
-        #[test]
-        fn callback_modifies_yielded() {
-            let input = test_source();
-
-            let yielded: Vec<_> = input
-                .process_buffer::<{ SAMPLES.len() }, _>(|buffer| {
-                    for sample in buffer {
-                        *sample += 1.0;
-                    }
-                })
-                .collect();
-            assert_eq!(
-                yielded,
-                SAMPLES.into_iter().map(|s| s + 1.0).collect::<Vec<_>>()
-            )
-        }
-        #[test]
-        fn source_truncates_to_whole_buffers() {
-            let input = test_source();
-
-            let yielded = input
-                .process_buffer::<3, _>(|buffer| assert_eq!(buffer, &SAMPLES[..3]))
-                .count();
-            assert_eq!(yielded, 3)
-        }
-    }
-
-    mod inspect_buffer {
-        use super::*;
-
-        #[test]
-        fn callback_gets_all_samples() {
-            let input = test_source();
-
-            let _ = input
-                .inspect_buffer::<{ SAMPLES.len() }, _>(|buffer| assert_eq!(*buffer, SAMPLES))
-                .count();
-        }
-        #[test]
-        fn source_does_not_truncate() {
-            let input = test_source();
-
-            let yielded = input
-                .inspect_buffer::<3, _>(|buffer| assert_eq!(buffer, &SAMPLES[..3]))
-                .count();
-            assert_eq!(yielded, SAMPLES.len())
-        }
-    }
-
-    mod instant_replay {
-        use super::*;
-
-        #[test]
-        fn continues_after_history() {
-            let input = test_source();
-
-            let (mut replay, mut source) = input
-                .replayable(Duration::from_secs(3))
-                .expect("longer than 100ms");
-
-            source.by_ref().take(3).count();
-            let yielded: Vec<Sample> = replay.by_ref().take(3).collect();
-            assert_eq!(&yielded, &SAMPLES[0..3],);
-
-            source.count();
-            let yielded: Vec<Sample> = replay.collect();
-            assert_eq!(&yielded, &SAMPLES[3..5],);
-        }
-
-        #[test]
-        fn keeps_only_latest() {
-            let input = test_source();
-
-            let (mut replay, mut source) = input
-                .replayable(Duration::from_secs(2))
-                .expect("longer than 100ms");
-
-            source.by_ref().take(5).count(); // get all items but do not end the source
-            let yielded: Vec<Sample> = replay.by_ref().take(2).collect();
-            assert_eq!(&yielded, &SAMPLES[3..5]);
-            source.count(); // exhaust source
-            assert_eq!(replay.next(), None);
-        }
-
-        #[test]
-        fn keeps_correct_amount_of_seconds() {
-            let input = StaticSamplesBuffer::new(nz!(1), nz!(16_000), &[0.0; 40_000]);
-
-            let (replay, mut source) = input
-                .replayable(Duration::from_secs(2))
-                .expect("longer than 100ms");
-
-            // exhaust but do not yet end source
-            source.by_ref().take(40_000).count();
-
-            // take all samples we can without blocking
-            let ready = replay.samples_ready();
-            let n_yielded = replay.take_samples(ready).count();
-
-            let max = source.sample_rate().get() * source.channels().get() as u32 * 2;
-            let margin = 16_000 / 10; // 100ms
-            assert!(n_yielded as u32 >= max - margin);
-        }
-
-        #[test]
-        fn samples_ready() {
-            let input = StaticSamplesBuffer::new(nz!(1), nz!(16_000), &[0.0; 40_000]);
-            let (mut replay, source) = input
-                .replayable(Duration::from_secs(2))
-                .expect("longer than 100ms");
-            assert_eq!(replay.by_ref().samples_ready(), 0);
-
-            source.take(8000).count(); // half a second
-            let margin = 16_000 / 10; // 100ms
-            let ready = replay.samples_ready();
-            assert!(ready >= 8000 - margin);
-        }
-    }
-}
diff --git a/crates/auto_update/Cargo.toml b/crates/auto_update/Cargo.toml
deleted file mode 100644
index 6f352fbd7b..0000000000
--- a/crates/auto_update/Cargo.toml
+++ /dev/null
@@ -1,42 +0,0 @@
-[package]
-name = "auto_update"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/auto_update.rs"
-doctest = false
-
-[dependencies]
-anyhow.workspace = true
-client.workspace = true
-db.workspace = true
-gpui.workspace = true
-http_client.workspace = true
-log.workspace = true
-paths.workspace = true
-release_channel.workspace = true
-semver.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-smol.workspace = true
-tempfile.workspace = true
-util.workspace = true
-workspace.workspace = true
-
-[target.'cfg(not(target_os = "windows"))'.dependencies]
-which.workspace = true
-
-[dev-dependencies]
-ctor.workspace = true
-clock= { workspace = true, "features" = ["test-support"] }
-futures.workspace = true
-gpui = { workspace = true, "features" = ["test-support"] }
-parking_lot.workspace = true
-zlog.workspace = true
diff --git a/crates/auto_update/LICENSE-GPL b/crates/auto_update/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/auto_update/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/auto_update/src/auto_update.rs b/crates/auto_update/src/auto_update.rs
deleted file mode 100644
index 0c122717d7..0000000000
--- a/crates/auto_update/src/auto_update.rs
+++ /dev/null
@@ -1,1378 +0,0 @@
-use anyhow::{Context as _, Result};
-use client::Client;
-use db::kvp::KEY_VALUE_STORE;
-use gpui::{
-    App, AppContext as _, AsyncApp, BackgroundExecutor, Context, Entity, Global, Task, Window,
-    actions,
-};
-use http_client::{HttpClient, HttpClientWithUrl};
-use paths::remote_servers_dir;
-use release_channel::{AppCommitSha, ReleaseChannel};
-use semver::Version;
-use serde::{Deserialize, Serialize};
-use settings::{RegisterSetting, Settings, SettingsStore};
-use smol::fs::File;
-use smol::{fs, io::AsyncReadExt};
-use std::mem;
-use std::{
-    env::{
-        self,
-        consts::{ARCH, OS},
-    },
-    ffi::OsString,
-    path::{Path, PathBuf},
-    sync::Arc,
-    time::Duration,
-};
-use util::command::new_smol_command;
-use workspace::Workspace;
-
-const SHOULD_SHOW_UPDATE_NOTIFICATION_KEY: &str = "auto-updater-should-show-updated-notification";
-const POLL_INTERVAL: Duration = Duration::from_secs(60 * 60);
-
-actions!(
-    auto_update,
-    [
-        /// Checks for available updates.
-        Check,
-        /// Dismisses the update error message.
-        DismissMessage,
-        /// Opens the release notes for the current version in a browser.
-        ViewReleaseNotes,
-    ]
-);
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum VersionCheckType {
-    Sha(AppCommitSha),
-    Semantic(Version),
-}
-
-#[derive(Serialize, Debug)]
-pub struct AssetQuery<'a> {
-    asset: &'a str,
-    os: &'a str,
-    arch: &'a str,
-    metrics_id: Option<&'a str>,
-    system_id: Option<&'a str>,
-    is_staff: Option<bool>,
-}
-
-#[derive(Clone, Debug)]
-pub enum AutoUpdateStatus {
-    Idle,
-    Checking,
-    Downloading { version: VersionCheckType },
-    Installing { version: VersionCheckType },
-    Updated { version: VersionCheckType },
-    Errored { error: Arc<anyhow::Error> },
-}
-
-impl PartialEq for AutoUpdateStatus {
-    fn eq(&self, other: &Self) -> bool {
-        match (self, other) {
-            (AutoUpdateStatus::Idle, AutoUpdateStatus::Idle) => true,
-            (AutoUpdateStatus::Checking, AutoUpdateStatus::Checking) => true,
-            (
-                AutoUpdateStatus::Downloading { version: v1 },
-                AutoUpdateStatus::Downloading { version: v2 },
-            ) => v1 == v2,
-            (
-                AutoUpdateStatus::Installing { version: v1 },
-                AutoUpdateStatus::Installing { version: v2 },
-            ) => v1 == v2,
-            (
-                AutoUpdateStatus::Updated { version: v1 },
-                AutoUpdateStatus::Updated { version: v2 },
-            ) => v1 == v2,
-            (AutoUpdateStatus::Errored { error: e1 }, AutoUpdateStatus::Errored { error: e2 }) => {
-                e1.to_string() == e2.to_string()
-            }
-            _ => false,
-        }
-    }
-}
-
-impl AutoUpdateStatus {
-    pub fn is_updated(&self) -> bool {
-        matches!(self, Self::Updated { .. })
-    }
-}
-
-pub struct AutoUpdater {
-    status: AutoUpdateStatus,
-    current_version: Version,
-    client: Arc<Client>,
-    pending_poll: Option<Task<Option<()>>>,
-    quit_subscription: Option<gpui::Subscription>,
-}
-
-#[derive(Deserialize, Serialize, Clone, Debug)]
-pub struct ReleaseAsset {
-    pub version: String,
-    pub url: String,
-}
-
-struct MacOsUnmounter<'a> {
-    mount_path: PathBuf,
-    background_executor: &'a BackgroundExecutor,
-}
-
-impl Drop for MacOsUnmounter<'_> {
-    fn drop(&mut self) {
-        let mount_path = mem::take(&mut self.mount_path);
-        self.background_executor
-            .spawn(async move {
-                let unmount_output = new_smol_command("hdiutil")
-                    .args(["detach", "-force"])
-                    .arg(&mount_path)
-                    .output()
-                    .await;
-                match unmount_output {
-                    Ok(output) if output.status.success() => {
-                        log::info!("Successfully unmounted the disk image");
-                    }
-                    Ok(output) => {
-                        log::error!(
-                            "Failed to unmount disk image: {:?}",
-                            String::from_utf8_lossy(&output.stderr)
-                        );
-                    }
-                    Err(error) => {
-                        log::error!("Error while trying to unmount disk image: {:?}", error);
-                    }
-                }
-            })
-            .detach();
-    }
-}
-
-#[derive(Clone, Copy, Debug, RegisterSetting)]
-struct AutoUpdateSetting(bool);
-
-/// Whether or not to automatically check for updates.
-///
-/// Default: true
-impl Settings for AutoUpdateSetting {
-    fn from_settings(content: &settings::SettingsContent) -> Self {
-        Self(content.auto_update.unwrap())
-    }
-}
-
-#[derive(Default)]
-struct GlobalAutoUpdate(Option<Entity<AutoUpdater>>);
-
-impl Global for GlobalAutoUpdate {}
-
-pub fn init(client: Arc<Client>, cx: &mut App) {
-    cx.observe_new(|workspace: &mut Workspace, _window, _cx| {
-        workspace.register_action(|_, action, window, cx| check(action, window, cx));
-
-        workspace.register_action(|_, action, _, cx| {
-            view_release_notes(action, cx);
-        });
-    })
-    .detach();
-
-    let version = release_channel::AppVersion::global(cx);
-    let auto_updater = cx.new(|cx| {
-        let updater = AutoUpdater::new(version, client, cx);
-
-        let poll_for_updates = ReleaseChannel::try_global(cx)
-            .map(|channel| channel.poll_for_updates())
-            .unwrap_or(false);
-
-        if option_env!("ZED_UPDATE_EXPLANATION").is_none()
-            && env::var("ZED_UPDATE_EXPLANATION").is_err()
-            && poll_for_updates
-        {
-            let mut update_subscription = AutoUpdateSetting::get_global(cx)
-                .0
-                .then(|| updater.start_polling(cx));
-
-            cx.observe_global::<SettingsStore>(move |updater: &mut AutoUpdater, cx| {
-                if AutoUpdateSetting::get_global(cx).0 {
-                    if update_subscription.is_none() {
-                        update_subscription = Some(updater.start_polling(cx))
-                    }
-                } else {
-                    update_subscription.take();
-                }
-            })
-            .detach();
-        }
-
-        updater
-    });
-    cx.set_global(GlobalAutoUpdate(Some(auto_updater)));
-}
-
-pub fn check(_: &Check, window: &mut Window, cx: &mut App) {
-    if let Some(message) = option_env!("ZED_UPDATE_EXPLANATION") {
-        drop(window.prompt(
-            gpui::PromptLevel::Info,
-            "Zed was installed via a package manager.",
-            Some(message),
-            &["Ok"],
-            cx,
-        ));
-        return;
-    }
-
-    if let Ok(message) = env::var("ZED_UPDATE_EXPLANATION") {
-        drop(window.prompt(
-            gpui::PromptLevel::Info,
-            "Zed was installed via a package manager.",
-            Some(&message),
-            &["Ok"],
-            cx,
-        ));
-        return;
-    }
-
-    if !ReleaseChannel::try_global(cx)
-        .map(|channel| channel.poll_for_updates())
-        .unwrap_or(false)
-    {
-        return;
-    }
-
-    if let Some(updater) = AutoUpdater::get(cx) {
-        updater.update(cx, |updater, cx| updater.poll(UpdateCheckType::Manual, cx));
-    } else {
-        drop(window.prompt(
-            gpui::PromptLevel::Info,
-            "Could not check for updates",
-            Some("Auto-updates disabled for non-bundled app."),
-            &["Ok"],
-            cx,
-        ));
-    }
-}
-
-pub fn view_release_notes(_: &ViewReleaseNotes, cx: &mut App) -> Option<()> {
-    let auto_updater = AutoUpdater::get(cx)?;
-    let release_channel = ReleaseChannel::try_global(cx)?;
-
-    match release_channel {
-        ReleaseChannel::Stable | ReleaseChannel::Preview => {
-            let auto_updater = auto_updater.read(cx);
-            let current_version = auto_updater.current_version.clone();
-            let release_channel = release_channel.dev_name();
-            let path = format!("/releases/{release_channel}/{current_version}");
-            let url = &auto_updater.client.http_client().build_url(&path);
-            cx.open_url(url);
-        }
-        ReleaseChannel::Nightly => {
-            cx.open_url("https://github.com/zed-industries/zed/commits/nightly/");
-        }
-        ReleaseChannel::Dev => {
-            cx.open_url("https://github.com/zed-industries/zed/commits/main/");
-        }
-    }
-    None
-}
-
-#[cfg(not(target_os = "windows"))]
-struct InstallerDir(tempfile::TempDir);
-
-#[cfg(not(target_os = "windows"))]
-impl InstallerDir {
-    async fn new() -> Result<Self> {
-        Ok(Self(
-            tempfile::Builder::new()
-                .prefix("zed-auto-update")
-                .tempdir()?,
-        ))
-    }
-
-    fn path(&self) -> &Path {
-        self.0.path()
-    }
-}
-
-#[cfg(target_os = "windows")]
-struct InstallerDir(PathBuf);
-
-#[cfg(target_os = "windows")]
-impl InstallerDir {
-    async fn new() -> Result<Self> {
-        let installer_dir = std::env::current_exe()?
-            .parent()
-            .context("No parent dir for Zed.exe")?
-            .join("updates");
-        if smol::fs::metadata(&installer_dir).await.is_ok() {
-            smol::fs::remove_dir_all(&installer_dir).await?;
-        }
-        smol::fs::create_dir(&installer_dir).await?;
-        Ok(Self(installer_dir))
-    }
-
-    fn path(&self) -> &Path {
-        self.0.as_path()
-    }
-}
-
-pub enum UpdateCheckType {
-    Automatic,
-    Manual,
-}
-
-impl AutoUpdater {
-    pub fn get(cx: &mut App) -> Option<Entity<Self>> {
-        cx.default_global::<GlobalAutoUpdate>().0.clone()
-    }
-
-    fn new(current_version: Version, client: Arc<Client>, cx: &mut Context<Self>) -> Self {
-        // On windows, executable files cannot be overwritten while they are
-        // running, so we must wait to overwrite the application until quitting
-        // or restarting. When quitting the app, we spawn the auto update helper
-        // to finish the auto update process after Zed exits. When restarting
-        // the app after an update, we use `set_restart_path` to run the auto
-        // update helper instead of the app, so that it can overwrite the app
-        // and then spawn the new binary.
-        #[cfg(target_os = "windows")]
-        let quit_subscription = Some(cx.on_app_quit(|_, _| finalize_auto_update_on_quit()));
-        #[cfg(not(target_os = "windows"))]
-        let quit_subscription = None;
-
-        cx.on_app_restart(|this, _| {
-            this.quit_subscription.take();
-        })
-        .detach();
-
-        Self {
-            status: AutoUpdateStatus::Idle,
-            current_version,
-            client,
-            pending_poll: None,
-            quit_subscription,
-        }
-    }
-
-    pub fn start_polling(&self, cx: &mut Context<Self>) -> Task<Result<()>> {
-        cx.spawn(async move |this, cx| {
-            if cfg!(target_os = "windows") {
-                use util::ResultExt;
-
-                cleanup_windows()
-                    .await
-                    .context("failed to cleanup old directories")
-                    .log_err();
-            }
-
-            loop {
-                this.update(cx, |this, cx| this.poll(UpdateCheckType::Automatic, cx))?;
-                cx.background_executor().timer(POLL_INTERVAL).await;
-            }
-        })
-    }
-
-    pub fn poll(&mut self, check_type: UpdateCheckType, cx: &mut Context<Self>) {
-        if self.pending_poll.is_some() {
-            return;
-        }
-
-        cx.notify();
-
-        self.pending_poll = Some(cx.spawn(async move |this, cx| {
-            let result = Self::update(this.upgrade()?, cx).await;
-            this.update(cx, |this, cx| {
-                this.pending_poll = None;
-                if let Err(error) = result {
-                    this.status = match check_type {
-                        // Be quiet if the check was automated (e.g. when offline)
-                        UpdateCheckType::Automatic => {
-                            log::info!("auto-update check failed: error:{:?}", error);
-                            AutoUpdateStatus::Idle
-                        }
-                        UpdateCheckType::Manual => {
-                            log::error!("auto-update failed: error:{:?}", error);
-                            AutoUpdateStatus::Errored {
-                                error: Arc::new(error),
-                            }
-                        }
-                    };
-
-                    cx.notify();
-                }
-            })
-            .ok()
-        }));
-    }
-
-    pub fn current_version(&self) -> Version {
-        self.current_version.clone()
-    }
-
-    pub fn status(&self) -> AutoUpdateStatus {
-        self.status.clone()
-    }
-
-    pub fn dismiss(&mut self, cx: &mut Context<Self>) -> bool {
-        if let AutoUpdateStatus::Idle = self.status {
-            return false;
-        }
-        self.status = AutoUpdateStatus::Idle;
-        cx.notify();
-        true
-    }
-
-    // If you are packaging Zed and need to override the place it downloads SSH remotes from,
-    // you can override this function. You should also update get_remote_server_release_url to return
-    // Ok(None).
-    pub async fn download_remote_server_release(
-        release_channel: ReleaseChannel,
-        version: Option<Version>,
-        os: &str,
-        arch: &str,
-        set_status: impl Fn(&str, &mut AsyncApp) + Send + 'static,
-        cx: &mut AsyncApp,
-    ) -> Result<PathBuf> {
-        let this = cx.update(|cx| {
-            cx.default_global::<GlobalAutoUpdate>()
-                .0
-                .clone()
-                .context("auto-update not initialized")
-        })??;
-
-        set_status("Fetching remote server release", cx);
-        let release = Self::get_release_asset(
-            &this,
-            release_channel,
-            version,
-            "zed-remote-server",
-            os,
-            arch,
-            cx,
-        )
-        .await?;
-
-        let servers_dir = paths::remote_servers_dir();
-        let channel_dir = servers_dir.join(release_channel.dev_name());
-        let platform_dir = channel_dir.join(format!("{}-{}", os, arch));
-        let version_path = platform_dir.join(format!("{}.gz", release.version));
-        smol::fs::create_dir_all(&platform_dir).await.ok();
-
-        let client = this.read_with(cx, |this, _| this.client.http_client())?;
-
-        if smol::fs::metadata(&version_path).await.is_err() {
-            log::info!(
-                "downloading zed-remote-server {os} {arch} version {}",
-                release.version
-            );
-            set_status("Downloading remote server", cx);
-            download_remote_server_binary(&version_path, release, client).await?;
-        }
-
-        Ok(version_path)
-    }
-
-    pub async fn get_remote_server_release_url(
-        channel: ReleaseChannel,
-        version: Option<Version>,
-        os: &str,
-        arch: &str,
-        cx: &mut AsyncApp,
-    ) -> Result<Option<String>> {
-        let this = cx.update(|cx| {
-            cx.default_global::<GlobalAutoUpdate>()
-                .0
-                .clone()
-                .context("auto-update not initialized")
-        })??;
-
-        let release =
-            Self::get_release_asset(&this, channel, version, "zed-remote-server", os, arch, cx)
-                .await?;
-
-        Ok(Some(release.url))
-    }
-
-    async fn get_release_asset(
-        this: &Entity<Self>,
-        release_channel: ReleaseChannel,
-        version: Option<Version>,
-        asset: &str,
-        os: &str,
-        arch: &str,
-        cx: &mut AsyncApp,
-    ) -> Result<ReleaseAsset> {
-        let client = this.read_with(cx, |this, _| this.client.clone())?;
-
-        let (system_id, metrics_id, is_staff) = if client.telemetry().metrics_enabled() {
-            (
-                client.telemetry().system_id(),
-                client.telemetry().metrics_id(),
-                client.telemetry().is_staff(),
-            )
-        } else {
-            (None, None, None)
-        };
-
-        let version = if let Some(mut version) = version {
-            version.pre = semver::Prerelease::EMPTY;
-            version.build = semver::BuildMetadata::EMPTY;
-            version.to_string()
-        } else {
-            "latest".to_string()
-        };
-        let http_client = client.http_client();
-
-        let path = format!("/releases/{}/{}/asset", release_channel.dev_name(), version,);
-        let url = http_client.build_zed_cloud_url_with_query(
-            &path,
-            AssetQuery {
-                os,
-                arch,
-                asset,
-                metrics_id: metrics_id.as_deref(),
-                system_id: system_id.as_deref(),
-                is_staff: is_staff,
-            },
-        )?;
-
-        let mut response = http_client
-            .get(url.as_str(), Default::default(), true)
-            .await?;
-        let mut body = Vec::new();
-        response.body_mut().read_to_end(&mut body).await?;
-
-        anyhow::ensure!(
-            response.status().is_success(),
-            "failed to fetch release: {:?}",
-            String::from_utf8_lossy(&body),
-        );
-
-        serde_json::from_slice(body.as_slice()).with_context(|| {
-            format!(
-                "error deserializing release {:?}",
-                String::from_utf8_lossy(&body),
-            )
-        })
-    }
-
-    async fn update(this: Entity<Self>, cx: &mut AsyncApp) -> Result<()> {
-        let (client, installed_version, previous_status, release_channel) =
-            this.read_with(cx, |this, cx| {
-                (
-                    this.client.http_client(),
-                    this.current_version.clone(),
-                    this.status.clone(),
-                    ReleaseChannel::try_global(cx).unwrap_or(ReleaseChannel::Stable),
-                )
-            })?;
-
-        Self::check_dependencies()?;
-
-        this.update(cx, |this, cx| {
-            this.status = AutoUpdateStatus::Checking;
-            log::info!("Auto Update: checking for updates");
-            cx.notify();
-        })?;
-
-        let fetched_release_data =
-            Self::get_release_asset(&this, release_channel, None, "zed", OS, ARCH, cx).await?;
-        let fetched_version = fetched_release_data.clone().version;
-        let app_commit_sha = cx.update(|cx| AppCommitSha::try_global(cx).map(|sha| sha.full()));
-        let newer_version = Self::check_if_fetched_version_is_newer(
-            release_channel,
-            app_commit_sha,
-            installed_version,
-            fetched_version,
-            previous_status.clone(),
-        )?;
-
-        let Some(newer_version) = newer_version else {
-            return this.update(cx, |this, cx| {
-                let status = match previous_status {
-                    AutoUpdateStatus::Updated { .. } => previous_status,
-                    _ => AutoUpdateStatus::Idle,
-                };
-                this.status = status;
-                cx.notify();
-            });
-        };
-
-        this.update(cx, |this, cx| {
-            this.status = AutoUpdateStatus::Downloading {
-                version: newer_version.clone(),
-            };
-            cx.notify();
-        })?;
-
-        let installer_dir = InstallerDir::new().await?;
-        let target_path = Self::target_path(&installer_dir).await?;
-        download_release(&target_path, fetched_release_data, client).await?;
-
-        this.update(cx, |this, cx| {
-            this.status = AutoUpdateStatus::Installing {
-                version: newer_version.clone(),
-            };
-            cx.notify();
-        })?;
-
-        let new_binary_path = Self::install_release(installer_dir, target_path, cx).await?;
-        if let Some(new_binary_path) = new_binary_path {
-            cx.update(|cx| cx.set_restart_path(new_binary_path))?;
-        }
-
-        this.update(cx, |this, cx| {
-            this.set_should_show_update_notification(true, cx)
-                .detach_and_log_err(cx);
-            this.status = AutoUpdateStatus::Updated {
-                version: newer_version,
-            };
-            cx.notify();
-        })
-    }
-
-    fn check_if_fetched_version_is_newer(
-        release_channel: ReleaseChannel,
-        app_commit_sha: Result<Option<String>>,
-        installed_version: Version,
-        fetched_version: String,
-        status: AutoUpdateStatus,
-    ) -> Result<Option<VersionCheckType>> {
-        let parsed_fetched_version = fetched_version.parse::<Version>();
-
-        if let AutoUpdateStatus::Updated { version, .. } = status {
-            match version {
-                VersionCheckType::Sha(cached_version) => {
-                    let should_download =
-                        parsed_fetched_version.as_ref().ok().is_none_or(|version| {
-                            version.build.as_str().rsplit('.').next()
-                                != Some(&cached_version.full())
-                        });
-                    let newer_version = should_download
-                        .then(|| VersionCheckType::Sha(AppCommitSha::new(fetched_version)));
-                    return Ok(newer_version);
-                }
-                VersionCheckType::Semantic(cached_version) => {
-                    return Self::check_if_fetched_version_is_newer_non_nightly(
-                        cached_version,
-                        parsed_fetched_version?,
-                    );
-                }
-            }
-        }
-
-        match release_channel {
-            ReleaseChannel::Nightly => {
-                let should_download = app_commit_sha
-                    .ok()
-                    .flatten()
-                    .map(|sha| {
-                        parsed_fetched_version.as_ref().ok().is_none_or(|version| {
-                            version.build.as_str().rsplit('.').next() != Some(&sha)
-                        })
-                    })
-                    .unwrap_or(true);
-                let newer_version = should_download
-                    .then(|| VersionCheckType::Sha(AppCommitSha::new(fetched_version)));
-                Ok(newer_version)
-            }
-            _ => Self::check_if_fetched_version_is_newer_non_nightly(
-                installed_version,
-                parsed_fetched_version?,
-            ),
-        }
-    }
-
-    fn check_dependencies() -> Result<()> {
-        #[cfg(not(target_os = "windows"))]
-        anyhow::ensure!(
-            which::which("rsync").is_ok(),
-            "Could not auto-update because the required rsync utility was not found."
-        );
-        Ok(())
-    }
-
-    async fn target_path(installer_dir: &InstallerDir) -> Result<PathBuf> {
-        let filename = match OS {
-            "macos" => anyhow::Ok("Zed.dmg"),
-            "linux" => Ok("zed.tar.gz"),
-            "windows" => Ok("Zed.exe"),
-            unsupported_os => anyhow::bail!("not supported: {unsupported_os}"),
-        }?;
-
-        Ok(installer_dir.path().join(filename))
-    }
-
-    async fn install_release(
-        installer_dir: InstallerDir,
-        target_path: PathBuf,
-        cx: &AsyncApp,
-    ) -> Result<Option<PathBuf>> {
-        #[cfg(test)]
-        if let Some(test_install) =
-            cx.try_read_global::<tests::InstallOverride, _>(|g, _| g.0.clone())
-        {
-            return test_install(target_path, cx);
-        }
-        match OS {
-            "macos" => install_release_macos(&installer_dir, target_path, cx).await,
-            "linux" => install_release_linux(&installer_dir, target_path, cx).await,
-            "windows" => install_release_windows(target_path).await,
-            unsupported_os => anyhow::bail!("not supported: {unsupported_os}"),
-        }
-    }
-
-    fn check_if_fetched_version_is_newer_non_nightly(
-        mut installed_version: Version,
-        fetched_version: Version,
-    ) -> Result<Option<VersionCheckType>> {
-        // For non-nightly releases, ignore build and pre-release fields as they're not provided by our endpoints right now.
-        installed_version.build = semver::BuildMetadata::EMPTY;
-        installed_version.pre = semver::Prerelease::EMPTY;
-        let should_download = fetched_version > installed_version;
-        let newer_version = should_download.then(|| VersionCheckType::Semantic(fetched_version));
-        Ok(newer_version)
-    }
-
-    pub fn set_should_show_update_notification(
-        &self,
-        should_show: bool,
-        cx: &App,
-    ) -> Task<Result<()>> {
-        cx.background_spawn(async move {
-            if should_show {
-                KEY_VALUE_STORE
-                    .write_kvp(
-                        SHOULD_SHOW_UPDATE_NOTIFICATION_KEY.to_string(),
-                        "".to_string(),
-                    )
-                    .await?;
-            } else {
-                KEY_VALUE_STORE
-                    .delete_kvp(SHOULD_SHOW_UPDATE_NOTIFICATION_KEY.to_string())
-                    .await?;
-            }
-            Ok(())
-        })
-    }
-
-    pub fn should_show_update_notification(&self, cx: &App) -> Task<Result<bool>> {
-        cx.background_spawn(async move {
-            Ok(KEY_VALUE_STORE
-                .read_kvp(SHOULD_SHOW_UPDATE_NOTIFICATION_KEY)?
-                .is_some())
-        })
-    }
-}
-
-async fn download_remote_server_binary(
-    target_path: &PathBuf,
-    release: ReleaseAsset,
-    client: Arc<HttpClientWithUrl>,
-) -> Result<()> {
-    let temp = tempfile::Builder::new().tempfile_in(remote_servers_dir())?;
-    let mut temp_file = File::create(&temp).await?;
-
-    let mut response = client.get(&release.url, Default::default(), true).await?;
-    anyhow::ensure!(
-        response.status().is_success(),
-        "failed to download remote server release: {:?}",
-        response.status()
-    );
-    smol::io::copy(response.body_mut(), &mut temp_file).await?;
-    smol::fs::rename(&temp, &target_path).await?;
-
-    Ok(())
-}
-
-async fn download_release(
-    target_path: &Path,
-    release: ReleaseAsset,
-    client: Arc<HttpClientWithUrl>,
-) -> Result<()> {
-    let mut target_file = File::create(&target_path).await?;
-
-    let mut response = client.get(&release.url, Default::default(), true).await?;
-    anyhow::ensure!(
-        response.status().is_success(),
-        "failed to download update: {:?}",
-        response.status()
-    );
-    smol::io::copy(response.body_mut(), &mut target_file).await?;
-    log::info!("downloaded update. path:{:?}", target_path);
-
-    Ok(())
-}
-
-async fn install_release_linux(
-    temp_dir: &InstallerDir,
-    downloaded_tar_gz: PathBuf,
-    cx: &AsyncApp,
-) -> Result<Option<PathBuf>> {
-    let channel = cx.update(|cx| ReleaseChannel::global(cx).dev_name())?;
-    let home_dir = PathBuf::from(env::var("HOME").context("no HOME env var set")?);
-    let running_app_path = cx.update(|cx| cx.app_path())??;
-
-    let extracted = temp_dir.path().join("zed");
-    fs::create_dir_all(&extracted)
-        .await
-        .context("failed to create directory into which to extract update")?;
-
-    let output = new_smol_command("tar")
-        .arg("-xzf")
-        .arg(&downloaded_tar_gz)
-        .arg("-C")
-        .arg(&extracted)
-        .output()
-        .await?;
-
-    anyhow::ensure!(
-        output.status.success(),
-        "failed to extract {:?} to {:?}: {:?}",
-        downloaded_tar_gz,
-        extracted,
-        String::from_utf8_lossy(&output.stderr)
-    );
-
-    let suffix = if channel != "stable" {
-        format!("-{}", channel)
-    } else {
-        String::default()
-    };
-    let app_folder_name = format!("zed{}.app", suffix);
-
-    let from = extracted.join(&app_folder_name);
-    let mut to = home_dir.join(".local");
-
-    let expected_suffix = format!("{}/libexec/zed-editor", app_folder_name);
-
-    if let Some(prefix) = running_app_path
-        .to_str()
-        .and_then(|str| str.strip_suffix(&expected_suffix))
-    {
-        to = PathBuf::from(prefix);
-    }
-
-    let output = new_smol_command("rsync")
-        .args(["-av", "--delete"])
-        .arg(&from)
-        .arg(&to)
-        .output()
-        .await?;
-
-    anyhow::ensure!(
-        output.status.success(),
-        "failed to copy Zed update from {:?} to {:?}: {:?}",
-        from,
-        to,
-        String::from_utf8_lossy(&output.stderr)
-    );
-
-    Ok(Some(to.join(expected_suffix)))
-}
-
-async fn install_release_macos(
-    temp_dir: &InstallerDir,
-    downloaded_dmg: PathBuf,
-    cx: &AsyncApp,
-) -> Result<Option<PathBuf>> {
-    let running_app_path = cx.update(|cx| cx.app_path())??;
-    let running_app_filename = running_app_path
-        .file_name()
-        .with_context(|| format!("invalid running app path {running_app_path:?}"))?;
-
-    let mount_path = temp_dir.path().join("Zed");
-    let mut mounted_app_path: OsString = mount_path.join(running_app_filename).into();
-
-    mounted_app_path.push("/");
-    let output = new_smol_command("hdiutil")
-        .args(["attach", "-nobrowse"])
-        .arg(&downloaded_dmg)
-        .arg("-mountroot")
-        .arg(temp_dir.path())
-        .output()
-        .await?;
-
-    anyhow::ensure!(
-        output.status.success(),
-        "failed to mount: {:?}",
-        String::from_utf8_lossy(&output.stderr)
-    );
-
-    // Create an MacOsUnmounter that will be dropped (and thus unmount the disk) when this function exits
-    let _unmounter = MacOsUnmounter {
-        mount_path: mount_path.clone(),
-        background_executor: cx.background_executor(),
-    };
-
-    let output = new_smol_command("rsync")
-        .args(["-av", "--delete"])
-        .arg(&mounted_app_path)
-        .arg(&running_app_path)
-        .output()
-        .await?;
-
-    anyhow::ensure!(
-        output.status.success(),
-        "failed to copy app: {:?}",
-        String::from_utf8_lossy(&output.stderr)
-    );
-
-    Ok(None)
-}
-
-async fn cleanup_windows() -> Result<()> {
-    let parent = std::env::current_exe()?
-        .parent()
-        .context("No parent dir for Zed.exe")?
-        .to_owned();
-
-    // keep in sync with crates/auto_update_helper/src/updater.rs
-    _ = smol::fs::remove_dir(parent.join("updates")).await;
-    _ = smol::fs::remove_dir(parent.join("install")).await;
-    _ = smol::fs::remove_dir(parent.join("old")).await;
-
-    Ok(())
-}
-
-async fn install_release_windows(downloaded_installer: PathBuf) -> Result<Option<PathBuf>> {
-    let output = new_smol_command(downloaded_installer)
-        .arg("/verysilent")
-        .arg("/update=true")
-        .arg("!desktopicon")
-        .arg("!quicklaunchicon")
-        .output()
-        .await?;
-    anyhow::ensure!(
-        output.status.success(),
-        "failed to start installer: {:?}",
-        String::from_utf8_lossy(&output.stderr)
-    );
-    // We return the path to the update helper program, because it will
-    // perform the final steps of the update process, copying the new binary,
-    // deleting the old one, and launching the new binary.
-    let helper_path = std::env::current_exe()?
-        .parent()
-        .context("No parent dir for Zed.exe")?
-        .join("tools")
-        .join("auto_update_helper.exe");
-    Ok(Some(helper_path))
-}
-
-pub async fn finalize_auto_update_on_quit() {
-    let Some(installer_path) = std::env::current_exe()
-        .ok()
-        .and_then(|p| p.parent().map(|p| p.join("updates")))
-    else {
-        return;
-    };
-
-    // The installer will create a flag file after it finishes updating
-    let flag_file = installer_path.join("versions.txt");
-    if flag_file.exists()
-        && let Some(helper) = installer_path
-            .parent()
-            .map(|p| p.join("tools").join("auto_update_helper.exe"))
-    {
-        let mut command = util::command::new_smol_command(helper);
-        command.arg("--launch");
-        command.arg("false");
-        if let Ok(mut cmd) = command.spawn() {
-            _ = cmd.status().await;
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use client::Client;
-    use clock::FakeSystemClock;
-    use futures::channel::oneshot;
-    use gpui::TestAppContext;
-    use http_client::{FakeHttpClient, Response};
-    use settings::default_settings;
-    use std::{
-        rc::Rc,
-        sync::{
-            Arc,
-            atomic::{self, AtomicBool},
-        },
-    };
-    use tempfile::tempdir;
-
-    #[ctor::ctor]
-    fn init_logger() {
-        zlog::init_test();
-    }
-
-    use super::*;
-
-    pub(super) struct InstallOverride(
-        pub Rc<dyn Fn(PathBuf, &AsyncApp) -> Result<Option<PathBuf>>>,
-    );
-    impl Global for InstallOverride {}
-
-    #[gpui::test]
-    fn test_auto_update_defaults_to_true(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let mut store = SettingsStore::new(cx, &settings::default_settings());
-            store
-                .set_default_settings(&default_settings(), cx)
-                .expect("Unable to set default settings");
-            store
-                .set_user_settings("{}", cx)
-                .expect("Unable to set user settings");
-            cx.set_global(store);
-            assert!(AutoUpdateSetting::get_global(cx).0);
-        });
-    }
-
-    #[gpui::test]
-    async fn test_auto_update_downloads(cx: &mut TestAppContext) {
-        cx.background_executor.allow_parking();
-        zlog::init_test();
-        let release_available = Arc::new(AtomicBool::new(false));
-
-        let (dmg_tx, dmg_rx) = oneshot::channel::<String>();
-
-        cx.update(|cx| {
-            settings::init(cx);
-
-            let current_version = semver::Version::new(0, 100, 0);
-            release_channel::init_test(current_version, ReleaseChannel::Stable, cx);
-
-            let clock = Arc::new(FakeSystemClock::new());
-            let release_available = Arc::clone(&release_available);
-            let dmg_rx = Arc::new(parking_lot::Mutex::new(Some(dmg_rx)));
-            let fake_client_http = FakeHttpClient::create(move |req| {
-                let release_available = release_available.load(atomic::Ordering::Relaxed);
-                let dmg_rx = dmg_rx.clone();
-                async move {
-                if req.uri().path() == "/releases/stable/latest/asset" {
-                    if release_available {
-                        return Ok(Response::builder().status(200).body(
-                            r#"{"version":"0.100.1","url":"https://test.example/new-download"}"#.into()
-                        ).unwrap());
-                    } else {
-                        return Ok(Response::builder().status(200).body(
-                            r#"{"version":"0.100.0","url":"https://test.example/old-download"}"#.into()
-                        ).unwrap());
-                    }
-                } else if req.uri().path() == "/new-download" {
-                    return Ok(Response::builder().status(200).body({
-                        let dmg_rx = dmg_rx.lock().take().unwrap();
-                        dmg_rx.await.unwrap().into()
-                    }).unwrap());
-                }
-                Ok(Response::builder().status(404).body("".into()).unwrap())
-                }
-            });
-            let client = Client::new(clock, fake_client_http, cx);
-            crate::init(client, cx);
-        });
-
-        let auto_updater = cx.update(|cx| AutoUpdater::get(cx).expect("auto updater should exist"));
-
-        cx.background_executor.run_until_parked();
-
-        auto_updater.read_with(cx, |updater, _| {
-            assert_eq!(updater.status(), AutoUpdateStatus::Idle);
-            assert_eq!(updater.current_version(), semver::Version::new(0, 100, 0));
-        });
-
-        release_available.store(true, atomic::Ordering::SeqCst);
-        cx.background_executor.advance_clock(POLL_INTERVAL);
-        cx.background_executor.run_until_parked();
-
-        loop {
-            cx.background_executor.timer(Duration::from_millis(0)).await;
-            cx.run_until_parked();
-            let status = auto_updater.read_with(cx, |updater, _| updater.status());
-            if !matches!(status, AutoUpdateStatus::Idle) {
-                break;
-            }
-        }
-        let status = auto_updater.read_with(cx, |updater, _| updater.status());
-        assert_eq!(
-            status,
-            AutoUpdateStatus::Downloading {
-                version: VersionCheckType::Semantic(semver::Version::new(0, 100, 1))
-            }
-        );
-
-        dmg_tx.send("<fake-zed-update>".to_owned()).unwrap();
-
-        let tmp_dir = Arc::new(tempdir().unwrap());
-
-        cx.update(|cx| {
-            let tmp_dir = tmp_dir.clone();
-            cx.set_global(InstallOverride(Rc::new(move |target_path, _cx| {
-                let tmp_dir = tmp_dir.clone();
-                let dest_path = tmp_dir.path().join("zed");
-                std::fs::copy(&target_path, &dest_path)?;
-                Ok(Some(dest_path))
-            })));
-        });
-
-        loop {
-            cx.background_executor.timer(Duration::from_millis(0)).await;
-            cx.run_until_parked();
-            let status = auto_updater.read_with(cx, |updater, _| updater.status());
-            if !matches!(status, AutoUpdateStatus::Downloading { .. }) {
-                break;
-            }
-        }
-        let status = auto_updater.read_with(cx, |updater, _| updater.status());
-        assert_eq!(
-            status,
-            AutoUpdateStatus::Updated {
-                version: VersionCheckType::Semantic(semver::Version::new(0, 100, 1))
-            }
-        );
-        let will_restart = cx.expect_restart();
-        cx.update(|cx| cx.restart());
-        let path = will_restart.await.unwrap().unwrap();
-        assert_eq!(path, tmp_dir.path().join("zed"));
-        assert_eq!(std::fs::read_to_string(path).unwrap(), "<fake-zed-update>");
-    }
-
-    #[test]
-    fn test_stable_does_not_update_when_fetched_version_is_not_higher() {
-        let release_channel = ReleaseChannel::Stable;
-        let app_commit_sha = Ok(Some("a".to_string()));
-        let installed_version = semver::Version::new(1, 0, 0);
-        let status = AutoUpdateStatus::Idle;
-        let fetched_version = semver::Version::new(1, 0, 0);
-
-        let newer_version = AutoUpdater::check_if_fetched_version_is_newer(
-            release_channel,
-            app_commit_sha,
-            installed_version,
-            fetched_version.to_string(),
-            status,
-        );
-
-        assert_eq!(newer_version.unwrap(), None);
-    }
-
-    #[test]
-    fn test_stable_does_update_when_fetched_version_is_higher() {
-        let release_channel = ReleaseChannel::Stable;
-        let app_commit_sha = Ok(Some("a".to_string()));
-        let installed_version = semver::Version::new(1, 0, 0);
-        let status = AutoUpdateStatus::Idle;
-        let fetched_version = semver::Version::new(1, 0, 1);
-
-        let newer_version = AutoUpdater::check_if_fetched_version_is_newer(
-            release_channel,
-            app_commit_sha,
-            installed_version,
-            fetched_version.to_string(),
-            status,
-        );
-
-        assert_eq!(
-            newer_version.unwrap(),
-            Some(VersionCheckType::Semantic(fetched_version))
-        );
-    }
-
-    #[test]
-    fn test_stable_does_not_update_when_fetched_version_is_not_higher_than_cached() {
-        let release_channel = ReleaseChannel::Stable;
-        let app_commit_sha = Ok(Some("a".to_string()));
-        let installed_version = semver::Version::new(1, 0, 0);
-        let status = AutoUpdateStatus::Updated {
-            version: VersionCheckType::Semantic(semver::Version::new(1, 0, 1)),
-        };
-        let fetched_version = semver::Version::new(1, 0, 1);
-
-        let newer_version = AutoUpdater::check_if_fetched_version_is_newer(
-            release_channel,
-            app_commit_sha,
-            installed_version,
-            fetched_version.to_string(),
-            status,
-        );
-
-        assert_eq!(newer_version.unwrap(), None);
-    }
-
-    #[test]
-    fn test_stable_does_update_when_fetched_version_is_higher_than_cached() {
-        let release_channel = ReleaseChannel::Stable;
-        let app_commit_sha = Ok(Some("a".to_string()));
-        let installed_version = semver::Version::new(1, 0, 0);
-        let status = AutoUpdateStatus::Updated {
-            version: VersionCheckType::Semantic(semver::Version::new(1, 0, 1)),
-        };
-        let fetched_version = semver::Version::new(1, 0, 2);
-
-        let newer_version = AutoUpdater::check_if_fetched_version_is_newer(
-            release_channel,
-            app_commit_sha,
-            installed_version,
-            fetched_version.to_string(),
-            status,
-        );
-
-        assert_eq!(
-            newer_version.unwrap(),
-            Some(VersionCheckType::Semantic(fetched_version))
-        );
-    }
-
-    #[test]
-    fn test_nightly_does_not_update_when_fetched_sha_is_same() {
-        let release_channel = ReleaseChannel::Nightly;
-        let app_commit_sha = Ok(Some("a".to_string()));
-        let mut installed_version = semver::Version::new(1, 0, 0);
-        installed_version.build = semver::BuildMetadata::new("a").unwrap();
-        let status = AutoUpdateStatus::Idle;
-        let fetched_sha = "1.0.0+a".to_string();
-
-        let newer_version = AutoUpdater::check_if_fetched_version_is_newer(
-            release_channel,
-            app_commit_sha,
-            installed_version,
-            fetched_sha,
-            status,
-        );
-
-        assert_eq!(newer_version.unwrap(), None);
-    }
-
-    #[test]
-    fn test_nightly_does_update_when_fetched_sha_is_not_same() {
-        let release_channel = ReleaseChannel::Nightly;
-        let app_commit_sha = Ok(Some("a".to_string()));
-        let installed_version = semver::Version::new(1, 0, 0);
-        let status = AutoUpdateStatus::Idle;
-        let fetched_sha = "b".to_string();
-
-        let newer_version = AutoUpdater::check_if_fetched_version_is_newer(
-            release_channel,
-            app_commit_sha,
-            installed_version,
-            fetched_sha.clone(),
-            status,
-        );
-
-        assert_eq!(
-            newer_version.unwrap(),
-            Some(VersionCheckType::Sha(AppCommitSha::new(fetched_sha)))
-        );
-    }
-
-    #[test]
-    fn test_nightly_does_not_update_when_fetched_version_is_same_as_cached() {
-        let release_channel = ReleaseChannel::Nightly;
-        let app_commit_sha = Ok(Some("a".to_string()));
-        let mut installed_version = semver::Version::new(1, 0, 0);
-        installed_version.build = semver::BuildMetadata::new("a").unwrap();
-        let status = AutoUpdateStatus::Updated {
-            version: VersionCheckType::Sha(AppCommitSha::new("b".to_string())),
-        };
-        let fetched_sha = "1.0.0+b".to_string();
-
-        let newer_version = AutoUpdater::check_if_fetched_version_is_newer(
-            release_channel,
-            app_commit_sha,
-            installed_version,
-            fetched_sha,
-            status,
-        );
-
-        assert_eq!(newer_version.unwrap(), None);
-    }
-
-    #[test]
-    fn test_nightly_does_update_when_fetched_sha_is_not_same_as_cached() {
-        let release_channel = ReleaseChannel::Nightly;
-        let app_commit_sha = Ok(Some("a".to_string()));
-        let mut installed_version = semver::Version::new(1, 0, 0);
-        installed_version.build = semver::BuildMetadata::new("a").unwrap();
-        let status = AutoUpdateStatus::Updated {
-            version: VersionCheckType::Sha(AppCommitSha::new("b".to_string())),
-        };
-        let fetched_sha = "1.0.0+c".to_string();
-
-        let newer_version = AutoUpdater::check_if_fetched_version_is_newer(
-            release_channel,
-            app_commit_sha,
-            installed_version,
-            fetched_sha.clone(),
-            status,
-        );
-
-        assert_eq!(
-            newer_version.unwrap(),
-            Some(VersionCheckType::Sha(AppCommitSha::new(fetched_sha)))
-        );
-    }
-
-    #[test]
-    fn test_nightly_does_update_when_installed_versions_sha_cannot_be_retrieved() {
-        let release_channel = ReleaseChannel::Nightly;
-        let app_commit_sha = Ok(None);
-        let installed_version = semver::Version::new(1, 0, 0);
-        let status = AutoUpdateStatus::Idle;
-        let fetched_sha = "a".to_string();
-
-        let newer_version = AutoUpdater::check_if_fetched_version_is_newer(
-            release_channel,
-            app_commit_sha,
-            installed_version,
-            fetched_sha.clone(),
-            status,
-        );
-
-        assert_eq!(
-            newer_version.unwrap(),
-            Some(VersionCheckType::Sha(AppCommitSha::new(fetched_sha)))
-        );
-    }
-
-    #[test]
-    fn test_nightly_does_not_update_when_cached_update_is_same_as_fetched_and_installed_versions_sha_cannot_be_retrieved()
-     {
-        let release_channel = ReleaseChannel::Nightly;
-        let app_commit_sha = Ok(None);
-        let installed_version = semver::Version::new(1, 0, 0);
-        let status = AutoUpdateStatus::Updated {
-            version: VersionCheckType::Sha(AppCommitSha::new("b".to_string())),
-        };
-        let fetched_sha = "1.0.0+b".to_string();
-
-        let newer_version = AutoUpdater::check_if_fetched_version_is_newer(
-            release_channel,
-            app_commit_sha,
-            installed_version,
-            fetched_sha,
-            status,
-        );
-
-        assert_eq!(newer_version.unwrap(), None);
-    }
-
-    #[test]
-    fn test_nightly_does_update_when_cached_update_is_not_same_as_fetched_and_installed_versions_sha_cannot_be_retrieved()
-     {
-        let release_channel = ReleaseChannel::Nightly;
-        let app_commit_sha = Ok(None);
-        let installed_version = semver::Version::new(1, 0, 0);
-        let status = AutoUpdateStatus::Updated {
-            version: VersionCheckType::Sha(AppCommitSha::new("b".to_string())),
-        };
-        let fetched_sha = "c".to_string();
-
-        let newer_version = AutoUpdater::check_if_fetched_version_is_newer(
-            release_channel,
-            app_commit_sha,
-            installed_version,
-            fetched_sha.clone(),
-            status,
-        );
-
-        assert_eq!(
-            newer_version.unwrap(),
-            Some(VersionCheckType::Sha(AppCommitSha::new(fetched_sha)))
-        );
-    }
-}
diff --git a/crates/auto_update_helper/Cargo.toml b/crates/auto_update_helper/Cargo.toml
deleted file mode 100644
index 73c38d80dd..0000000000
--- a/crates/auto_update_helper/Cargo.toml
+++ /dev/null
@@ -1,31 +0,0 @@
-[package]
-name = "auto_update_helper"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[[bin]]
-name = "auto_update_helper"
-path = "src/auto_update_helper.rs"
-doctest = false
-
-[dependencies]
-anyhow.workspace = true
-log.workspace = true
-simplelog.workspace = true
-
-[target.'cfg(target_os = "windows")'.dependencies]
-windows.workspace = true
-
-[target.'cfg(target_os = "windows")'.dev-dependencies]
-tempfile.workspace = true
-
-[target.'cfg(target_os = "windows")'.build-dependencies]
-winresource = "0.1"
-
-[package.metadata.docs.rs]
-targets = ["x86_64-pc-windows-msvc"]
diff --git a/crates/auto_update_helper/LICENSE-GPL b/crates/auto_update_helper/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/auto_update_helper/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/auto_update_helper/app-icon.ico b/crates/auto_update_helper/app-icon.ico
deleted file mode 100644
index 321e90fcfa..0000000000
Binary files a/crates/auto_update_helper/app-icon.ico and /dev/null differ
diff --git a/crates/auto_update_helper/build.rs b/crates/auto_update_helper/build.rs
deleted file mode 100644
index 2910632c7f..0000000000
--- a/crates/auto_update_helper/build.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-fn main() {
-    #[cfg(target_os = "windows")]
-    {
-        println!("cargo:rerun-if-changed=manifest.xml");
-
-        let mut res = winresource::WindowsResource::new();
-        res.set_manifest_file("manifest.xml");
-        res.set_icon("app-icon.ico");
-
-        if let Err(e) = res.compile() {
-            eprintln!("{}", e);
-            std::process::exit(1);
-        }
-    }
-}
diff --git a/crates/auto_update_helper/manifest.xml b/crates/auto_update_helper/manifest.xml
deleted file mode 100644
index c3a99d23ff..0000000000
--- a/crates/auto_update_helper/manifest.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-    <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-        <security>
-            <requestedPrivileges>
-                <requestedExecutionLevel level="asInvoker" uiAccess="false" />
-            </requestedPrivileges>
-        </security>
-    </trustInfo>
-    <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-        <application>
-            <!-- Windows 10 -->
-            <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
-        </application>
-    </compatibility>
-    <application xmlns="urn:schemas-microsoft-com:asm.v3">
-        <windowsSettings>
-            <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/pm</dpiAware>
-            <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
-        </windowsSettings>
-    </application>
-    <dependency>
-        <dependentAssembly>
-            <assemblyIdentity
-                type='win32'
-                name='Microsoft.Windows.Common-Controls'
-                version='6.0.0.0'
-                processorArchitecture='*'
-                publicKeyToken='6595b64144ccf1df'
-            />
-        </dependentAssembly>
-    </dependency>
-</assembly>
diff --git a/crates/auto_update_helper/src/auto_update_helper.rs b/crates/auto_update_helper/src/auto_update_helper.rs
deleted file mode 100644
index 21ead701b2..0000000000
--- a/crates/auto_update_helper/src/auto_update_helper.rs
+++ /dev/null
@@ -1,147 +0,0 @@
-#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
-
-#[cfg(target_os = "windows")]
-mod dialog;
-#[cfg(target_os = "windows")]
-mod updater;
-
-#[cfg(target_os = "windows")]
-fn main() {
-    if let Err(e) = windows_impl::run() {
-        log::error!("Error: Zed update failed, {:?}", e);
-        windows_impl::show_error(format!("Error: {:?}", e));
-    }
-}
-
-#[cfg(not(target_os = "windows"))]
-fn main() {}
-
-#[cfg(target_os = "windows")]
-mod windows_impl {
-    use std::{borrow::Cow, path::Path};
-
-    use super::dialog::create_dialog_window;
-    use super::updater::perform_update;
-    use anyhow::{Context as _, Result};
-    use windows::{
-        Win32::{
-            Foundation::{HWND, LPARAM, WPARAM},
-            UI::WindowsAndMessaging::{
-                DispatchMessageW, GetMessageW, MB_ICONERROR, MB_SYSTEMMODAL, MSG, MessageBoxW,
-                PostMessageW, WM_USER,
-            },
-        },
-        core::HSTRING,
-    };
-
-    pub(crate) const WM_JOB_UPDATED: u32 = WM_USER + 1;
-    pub(crate) const WM_TERMINATE: u32 = WM_USER + 2;
-
-    #[derive(Debug, Default)]
-    struct Args {
-        launch: bool,
-    }
-
-    pub(crate) fn run() -> Result<()> {
-        let helper_dir = std::env::current_exe()?
-            .parent()
-            .context("No parent directory")?
-            .to_path_buf();
-        init_log(&helper_dir)?;
-        let app_dir = helper_dir
-            .parent()
-            .context("No parent directory")?
-            .to_path_buf();
-
-        log::info!("======= Starting Zed update =======");
-        let (tx, rx) = std::sync::mpsc::channel();
-        let hwnd = create_dialog_window(rx)?.0 as isize;
-        let args = parse_args(std::env::args().skip(1));
-        std::thread::spawn(move || {
-            let result = perform_update(app_dir.as_path(), Some(hwnd), args.launch);
-            tx.send(result).ok();
-            unsafe { PostMessageW(Some(HWND(hwnd as _)), WM_TERMINATE, WPARAM(0), LPARAM(0)) }.ok();
-        });
-        unsafe {
-            let mut message = MSG::default();
-            while GetMessageW(&mut message, None, 0, 0).as_bool() {
-                DispatchMessageW(&message);
-            }
-        }
-        Ok(())
-    }
-
-    fn init_log(helper_dir: &Path) -> Result<()> {
-        simplelog::WriteLogger::init(
-            simplelog::LevelFilter::Info,
-            simplelog::Config::default(),
-            std::fs::File::options()
-                .append(true)
-                .create(true)
-                .open(helper_dir.join("auto_update_helper.log"))?,
-        )?;
-        Ok(())
-    }
-
-    fn parse_args(input: impl IntoIterator<Item = String>) -> Args {
-        let mut args: Args = Args { launch: true };
-
-        let mut input = input.into_iter();
-        if let Some(arg) = input.next() {
-            let launch_arg;
-
-            if arg == "--launch" {
-                launch_arg = input.next().map(Cow::Owned);
-            } else if let Some(rest) = arg.strip_prefix("--launch=") {
-                launch_arg = Some(Cow::Borrowed(rest));
-            } else {
-                launch_arg = None;
-            }
-
-            if launch_arg.as_deref() == Some("false") {
-                args.launch = false;
-            }
-        }
-
-        args
-    }
-
-    pub(crate) fn show_error(mut content: String) {
-        if content.len() > 600 {
-            content.truncate(600);
-            content.push_str("...\n");
-        }
-        let _ = unsafe {
-            MessageBoxW(
-                None,
-                &HSTRING::from(content),
-                windows::core::w!("Error: Zed update failed."),
-                MB_ICONERROR | MB_SYSTEMMODAL,
-            )
-        };
-    }
-
-    #[cfg(test)]
-    mod tests {
-        use crate::windows_impl::parse_args;
-
-        #[test]
-        fn test_parse_args() {
-            // launch can be specified via two separate arguments
-            assert!(parse_args(["--launch".into(), "true".into()]).launch);
-            assert!(!parse_args(["--launch".into(), "false".into()]).launch);
-
-            // launch can be specified via one single argument
-            assert!(parse_args(["--launch=true".into()]).launch);
-            assert!(!parse_args(["--launch=false".into()]).launch);
-
-            // launch defaults to true on no arguments
-            assert!(parse_args([]).launch);
-
-            // launch defaults to true on invalid arguments
-            assert!(parse_args(["--launch".into()]).launch);
-            assert!(parse_args(["--launch=".into()]).launch);
-            assert!(parse_args(["--launch=invalid".into()]).launch);
-        }
-    }
-}
diff --git a/crates/auto_update_helper/src/dialog.rs b/crates/auto_update_helper/src/dialog.rs
deleted file mode 100644
index 903ac34da2..0000000000
--- a/crates/auto_update_helper/src/dialog.rs
+++ /dev/null
@@ -1,236 +0,0 @@
-use std::{cell::RefCell, sync::mpsc::Receiver};
-
-use anyhow::{Context as _, Result};
-use windows::{
-    Win32::{
-        Foundation::{HWND, LPARAM, LRESULT, RECT, WPARAM},
-        Graphics::Gdi::{
-            BeginPaint, CLEARTYPE_QUALITY, CLIP_DEFAULT_PRECIS, CreateFontW, DEFAULT_CHARSET,
-            DeleteObject, EndPaint, FW_NORMAL, LOGFONTW, OUT_TT_ONLY_PRECIS, PAINTSTRUCT,
-            ReleaseDC, SelectObject, TextOutW,
-        },
-        System::LibraryLoader::GetModuleHandleW,
-        UI::{
-            Controls::{PBM_SETRANGE, PBM_SETSTEP, PBM_STEPIT, PROGRESS_CLASS},
-            WindowsAndMessaging::{
-                CREATESTRUCTW, CS_HREDRAW, CS_VREDRAW, CreateWindowExW, DefWindowProcW,
-                GWLP_USERDATA, GetDesktopWindow, GetWindowLongPtrW, GetWindowRect, HICON,
-                IMAGE_ICON, LR_DEFAULTSIZE, LR_SHARED, LoadImageW, PostQuitMessage, RegisterClassW,
-                SPI_GETICONTITLELOGFONT, SYSTEM_PARAMETERS_INFO_UPDATE_FLAGS, SendMessageW,
-                SetWindowLongPtrW, SystemParametersInfoW, WINDOW_EX_STYLE, WM_CLOSE, WM_CREATE,
-                WM_DESTROY, WM_NCCREATE, WM_PAINT, WNDCLASSW, WS_CAPTION, WS_CHILD, WS_EX_TOPMOST,
-                WS_POPUP, WS_VISIBLE,
-            },
-        },
-    },
-    core::HSTRING,
-};
-
-use crate::{
-    updater::JOBS,
-    windows_impl::{WM_JOB_UPDATED, WM_TERMINATE, show_error},
-};
-
-#[repr(C)]
-#[derive(Debug)]
-struct DialogInfo {
-    rx: Receiver<Result<()>>,
-    progress_bar: isize,
-}
-
-pub(crate) fn create_dialog_window(receiver: Receiver<Result<()>>) -> Result<HWND> {
-    unsafe {
-        let class_name = windows::core::w!("Zed-Auto-Updater-Dialog-Class");
-        let module = GetModuleHandleW(None).context("unable to get module handle")?;
-        let handle = LoadImageW(
-            Some(module.into()),
-            windows::core::PCWSTR(1 as _),
-            IMAGE_ICON,
-            0,
-            0,
-            LR_DEFAULTSIZE | LR_SHARED,
-        )
-        .context("unable to load icon file")?;
-        let wc = WNDCLASSW {
-            lpfnWndProc: Some(wnd_proc),
-            lpszClassName: class_name,
-            style: CS_HREDRAW | CS_VREDRAW,
-            hIcon: HICON(handle.0),
-            ..Default::default()
-        };
-        RegisterClassW(&wc);
-        let mut rect = RECT::default();
-        GetWindowRect(GetDesktopWindow(), &mut rect)
-            .context("unable to get desktop window rect")?;
-        let width = 400;
-        let height = 150;
-        let info = Box::new(RefCell::new(DialogInfo {
-            rx: receiver,
-            progress_bar: 0,
-        }));
-
-        let hwnd = CreateWindowExW(
-            WS_EX_TOPMOST,
-            class_name,
-            windows::core::w!("Zed"),
-            WS_VISIBLE | WS_POPUP | WS_CAPTION,
-            rect.right / 2 - width / 2,
-            rect.bottom / 2 - height / 2,
-            width,
-            height,
-            None,
-            None,
-            None,
-            Some(Box::into_raw(info) as _),
-        )
-        .context("unable to create dialog window")?;
-        Ok(hwnd)
-    }
-}
-
-macro_rules! return_if_failed {
-    ($e:expr) => {
-        match $e {
-            Ok(v) => v,
-            Err(e) => {
-                return LRESULT(e.code().0 as _);
-            }
-        }
-    };
-}
-
-macro_rules! make_lparam {
-    ($l:expr, $h:expr) => {
-        LPARAM(($l as u32 | ($h as u32) << 16) as isize)
-    };
-}
-
-unsafe extern "system" fn wnd_proc(
-    hwnd: HWND,
-    msg: u32,
-    wparam: WPARAM,
-    lparam: LPARAM,
-) -> LRESULT {
-    match msg {
-        WM_NCCREATE => unsafe {
-            let create_struct = lparam.0 as *const CREATESTRUCTW;
-            let info = (*create_struct).lpCreateParams as *mut RefCell<DialogInfo>;
-            let info = Box::from_raw(info);
-            SetWindowLongPtrW(hwnd, GWLP_USERDATA, Box::into_raw(info) as _);
-            DefWindowProcW(hwnd, msg, wparam, lparam)
-        },
-        WM_CREATE => unsafe {
-            // Create progress bar
-            let mut rect = RECT::default();
-            return_if_failed!(GetWindowRect(hwnd, &mut rect));
-            let progress_bar = return_if_failed!(CreateWindowExW(
-                WINDOW_EX_STYLE(0),
-                PROGRESS_CLASS,
-                None,
-                WS_CHILD | WS_VISIBLE,
-                20,
-                50,
-                340,
-                35,
-                Some(hwnd),
-                None,
-                None,
-                None,
-            ));
-            SendMessageW(
-                progress_bar,
-                PBM_SETRANGE,
-                None,
-                Some(make_lparam!(0, JOBS.len() * 10)),
-            );
-            SendMessageW(progress_bar, PBM_SETSTEP, Some(WPARAM(10)), None);
-            with_dialog_data(hwnd, |data| {
-                data.borrow_mut().progress_bar = progress_bar.0 as isize
-            });
-            LRESULT(0)
-        },
-        WM_PAINT => unsafe {
-            let mut ps = PAINTSTRUCT::default();
-            let hdc = BeginPaint(hwnd, &mut ps);
-
-            let font_name = get_system_ui_font_name();
-            let font = CreateFontW(
-                24,
-                0,
-                0,
-                0,
-                FW_NORMAL.0 as _,
-                0,
-                0,
-                0,
-                DEFAULT_CHARSET,
-                OUT_TT_ONLY_PRECIS,
-                CLIP_DEFAULT_PRECIS,
-                CLEARTYPE_QUALITY,
-                0,
-                &HSTRING::from(font_name),
-            );
-            let temp = SelectObject(hdc, font.into());
-            let string = HSTRING::from("Updating Zed...");
-            return_if_failed!(TextOutW(hdc, 20, 15, &string).ok());
-            return_if_failed!(DeleteObject(temp).ok());
-
-            return_if_failed!(EndPaint(hwnd, &ps).ok());
-            ReleaseDC(Some(hwnd), hdc);
-
-            LRESULT(0)
-        },
-        WM_JOB_UPDATED => with_dialog_data(hwnd, |data| {
-            let progress_bar = data.borrow().progress_bar;
-            unsafe { SendMessageW(HWND(progress_bar as _), PBM_STEPIT, None, None) }
-        }),
-        WM_TERMINATE => {
-            with_dialog_data(hwnd, |data| {
-                if let Ok(result) = data.borrow_mut().rx.recv()
-                    && let Err(e) = result
-                {
-                    log::error!("Failed to update Zed: {:?}", e);
-                    show_error(format!("Error: {:?}", e));
-                }
-            });
-            unsafe { PostQuitMessage(0) };
-            LRESULT(0)
-        }
-        WM_CLOSE => LRESULT(0), // Prevent user occasionally closing the window
-        WM_DESTROY => {
-            unsafe { PostQuitMessage(0) };
-            LRESULT(0)
-        }
-        _ => unsafe { DefWindowProcW(hwnd, msg, wparam, lparam) },
-    }
-}
-
-fn with_dialog_data<F, T>(hwnd: HWND, f: F) -> T
-where
-    F: FnOnce(&RefCell<DialogInfo>) -> T,
-{
-    let raw = unsafe { GetWindowLongPtrW(hwnd, GWLP_USERDATA) as *mut RefCell<DialogInfo> };
-    let data = unsafe { Box::from_raw(raw) };
-    let result = f(data.as_ref());
-    unsafe { SetWindowLongPtrW(hwnd, GWLP_USERDATA, Box::into_raw(data) as _) };
-    result
-}
-
-fn get_system_ui_font_name() -> String {
-    unsafe {
-        let mut info: LOGFONTW = std::mem::zeroed();
-        if SystemParametersInfoW(
-            SPI_GETICONTITLELOGFONT,
-            std::mem::size_of::<LOGFONTW>() as u32,
-            Some(&mut info as *mut _ as _),
-            SYSTEM_PARAMETERS_INFO_UPDATE_FLAGS(0),
-        )
-        .is_ok()
-        {
-            let font_name = String::from_utf16_lossy(&info.lfFaceName);
-            font_name.trim_matches(char::from(0)).to_owned()
-        } else {
-            "MS Shell Dlg".to_owned()
-        }
-    }
-}
diff --git a/crates/auto_update_helper/src/updater.rs b/crates/auto_update_helper/src/updater.rs
deleted file mode 100644
index 076e11fb4e..0000000000
--- a/crates/auto_update_helper/src/updater.rs
+++ /dev/null
@@ -1,357 +0,0 @@
-use std::{
-    path::Path,
-    sync::LazyLock,
-    time::{Duration, Instant},
-};
-
-use anyhow::{Context as _, Result};
-use windows::Win32::{
-    Foundation::{HWND, LPARAM, WPARAM},
-    UI::WindowsAndMessaging::PostMessageW,
-};
-
-use crate::windows_impl::WM_JOB_UPDATED;
-
-pub(crate) struct Job {
-    pub apply: Box<dyn Fn(&Path) -> Result<()> + Send + Sync>,
-    pub rollback: Box<dyn Fn(&Path) -> Result<()> + Send + Sync>,
-}
-
-impl Job {
-    pub fn mkdir(name: &'static Path) -> Self {
-        Job {
-            apply: Box::new(move |app_dir| {
-                let dir = app_dir.join(name);
-                std::fs::create_dir_all(&dir)
-                    .context(format!("Failed to create directory {}", dir.display()))
-            }),
-            rollback: Box::new(move |app_dir| {
-                let dir = app_dir.join(name);
-                std::fs::remove_dir_all(&dir)
-                    .context(format!("Failed to remove directory {}", dir.display()))
-            }),
-        }
-    }
-
-    pub fn mkdir_if_exists(name: &'static Path, check: &'static Path) -> Self {
-        Job {
-            apply: Box::new(move |app_dir| {
-                let dir = app_dir.join(name);
-                let check = app_dir.join(check);
-
-                if check.exists() {
-                    std::fs::create_dir_all(&dir)
-                        .context(format!("Failed to create directory {}", dir.display()))?
-                }
-                Ok(())
-            }),
-            rollback: Box::new(move |app_dir| {
-                let dir = app_dir.join(name);
-
-                if dir.exists() {
-                    std::fs::remove_dir_all(&dir)
-                        .context(format!("Failed to remove directory {}", dir.display()))?
-                }
-
-                Ok(())
-            }),
-        }
-    }
-
-    pub fn move_file(filename: &'static Path, new_filename: &'static Path) -> Self {
-        Job {
-            apply: Box::new(move |app_dir| {
-                let old_file = app_dir.join(filename);
-                let new_file = app_dir.join(new_filename);
-                log::info!(
-                    "Moving file: {}->{}",
-                    old_file.display(),
-                    new_file.display()
-                );
-
-                std::fs::rename(&old_file, new_file)
-                    .context(format!("Failed to move file {}", old_file.display()))
-            }),
-            rollback: Box::new(move |app_dir| {
-                let old_file = app_dir.join(filename);
-                let new_file = app_dir.join(new_filename);
-                log::info!(
-                    "Rolling back file move: {}->{}",
-                    old_file.display(),
-                    new_file.display()
-                );
-
-                std::fs::rename(&new_file, &old_file).context(format!(
-                    "Failed to rollback file move {}->{}",
-                    new_file.display(),
-                    old_file.display()
-                ))
-            }),
-        }
-    }
-
-    pub fn move_if_exists(filename: &'static Path, new_filename: &'static Path) -> Self {
-        Job {
-            apply: Box::new(move |app_dir| {
-                let old_file = app_dir.join(filename);
-                let new_file = app_dir.join(new_filename);
-
-                if old_file.exists() {
-                    log::info!(
-                        "Moving file: {}->{}",
-                        old_file.display(),
-                        new_file.display()
-                    );
-
-                    std::fs::rename(&old_file, new_file)
-                        .context(format!("Failed to move file {}", old_file.display()))?;
-                }
-
-                Ok(())
-            }),
-            rollback: Box::new(move |app_dir| {
-                let old_file = app_dir.join(filename);
-                let new_file = app_dir.join(new_filename);
-
-                if new_file.exists() {
-                    log::info!(
-                        "Rolling back file move: {}->{}",
-                        old_file.display(),
-                        new_file.display()
-                    );
-
-                    std::fs::rename(&new_file, &old_file).context(format!(
-                        "Failed to rollback file move {}->{}",
-                        new_file.display(),
-                        old_file.display()
-                    ))?
-                }
-
-                Ok(())
-            }),
-        }
-    }
-
-    pub fn rmdir_nofail(filename: &'static Path) -> Self {
-        Job {
-            apply: Box::new(move |app_dir| {
-                let filename = app_dir.join(filename);
-                log::info!("Removing file: {}", filename.display());
-                if let Err(e) = std::fs::remove_dir_all(&filename) {
-                    log::warn!("Failed to remove directory: {}", e);
-                }
-
-                Ok(())
-            }),
-            rollback: Box::new(move |app_dir| {
-                let filename = app_dir.join(filename);
-                anyhow::bail!(
-                    "Delete operations cannot be rolled back, file: {}",
-                    filename.display()
-                )
-            }),
-        }
-    }
-}
-
-#[cfg(not(test))]
-pub(crate) static JOBS: LazyLock<[Job; 22]> = LazyLock::new(|| {
-    fn p(value: &str) -> &Path {
-        Path::new(value)
-    }
-    [
-        // Move old files
-        // Not deleting because installing new files can fail
-        Job::mkdir(p("old")),
-        Job::move_file(p("Zed.exe"), p("old\\Zed.exe")),
-        Job::mkdir(p("old\\bin")),
-        Job::move_file(p("bin\\Zed.exe"), p("old\\bin\\Zed.exe")),
-        Job::move_file(p("bin\\zed"), p("old\\bin\\zed")),
-        //
-        // TODO: remove after a few weeks once everyone is on the new version and this file never exists
-        Job::move_if_exists(p("OpenConsole.exe"), p("old\\OpenConsole.exe")),
-        Job::mkdir(p("old\\x64")),
-        Job::mkdir(p("old\\arm64")),
-        Job::move_if_exists(p("x64\\OpenConsole.exe"), p("old\\x64\\OpenConsole.exe")),
-        Job::move_if_exists(
-            p("arm64\\OpenConsole.exe"),
-            p("old\\arm64\\OpenConsole.exe"),
-        ),
-        //
-        Job::move_file(p("conpty.dll"), p("old\\conpty.dll")),
-        // Copy new files
-        Job::move_file(p("install\\Zed.exe"), p("Zed.exe")),
-        Job::move_file(p("install\\bin\\Zed.exe"), p("bin\\Zed.exe")),
-        Job::move_file(p("install\\bin\\zed"), p("bin\\zed")),
-        //
-        Job::mkdir_if_exists(p("x64"), p("install\\x64")),
-        Job::mkdir_if_exists(p("arm64"), p("install\\arm64")),
-        Job::move_if_exists(
-            p("install\\x64\\OpenConsole.exe"),
-            p("x64\\OpenConsole.exe"),
-        ),
-        Job::move_if_exists(
-            p("install\\arm64\\OpenConsole.exe"),
-            p("arm64\\OpenConsole.exe"),
-        ),
-        //
-        Job::move_file(p("install\\conpty.dll"), p("conpty.dll")),
-        // Cleanup installer and updates folder
-        Job::rmdir_nofail(p("updates")),
-        Job::rmdir_nofail(p("install")),
-        // Cleanup old installation
-        Job::rmdir_nofail(p("old")),
-    ]
-});
-
-#[cfg(test)]
-pub(crate) static JOBS: LazyLock<[Job; 9]> = LazyLock::new(|| {
-    fn p(value: &str) -> &Path {
-        Path::new(value)
-    }
-    [
-        Job {
-            apply: Box::new(|_| {
-                std::thread::sleep(Duration::from_millis(1000));
-                if let Ok(config) = std::env::var("ZED_AUTO_UPDATE") {
-                    match config.as_str() {
-                        "err1" => Err(std::io::Error::other("Simulated error")).context("Anyhow!"),
-                        "err2" => Ok(()),
-                        _ => panic!("Unknown ZED_AUTO_UPDATE value: {}", config),
-                    }
-                } else {
-                    Ok(())
-                }
-            }),
-            rollback: Box::new(|_| {
-                unsafe { std::env::set_var("ZED_AUTO_UPDATE_RB", "rollback1") };
-                Ok(())
-            }),
-        },
-        Job::mkdir(p("test1")),
-        Job::mkdir_if_exists(p("test_exists"), p("test1")),
-        Job::mkdir_if_exists(p("test_missing"), p("dont")),
-        Job {
-            apply: Box::new(|folder| {
-                std::fs::write(folder.join("test1/test"), "test")?;
-                Ok(())
-            }),
-            rollback: Box::new(|folder| {
-                std::fs::remove_file(folder.join("test1/test"))?;
-                Ok(())
-            }),
-        },
-        Job::move_file(p("test1/test"), p("test1/moved")),
-        Job::move_if_exists(p("test1/test"), p("test1/noop")),
-        Job {
-            apply: Box::new(|_| {
-                std::thread::sleep(Duration::from_millis(1000));
-                if let Ok(config) = std::env::var("ZED_AUTO_UPDATE") {
-                    match config.as_str() {
-                        "err1" => Ok(()),
-                        "err2" => Err(std::io::Error::other("Simulated error")).context("Anyhow!"),
-                        _ => panic!("Unknown ZED_AUTO_UPDATE value: {}", config),
-                    }
-                } else {
-                    Ok(())
-                }
-            }),
-            rollback: Box::new(|_| Ok(())),
-        },
-        Job::rmdir_nofail(p("test1/nofolder")),
-    ]
-});
-
-pub(crate) fn perform_update(app_dir: &Path, hwnd: Option<isize>, launch: bool) -> Result<()> {
-    let hwnd = hwnd.map(|ptr| HWND(ptr as _));
-
-    let mut last_successful_job = None;
-    'outer: for (i, job) in JOBS.iter().enumerate() {
-        let start = Instant::now();
-        loop {
-            if start.elapsed().as_secs() > 2 {
-                log::error!("Timed out, rolling back");
-                break 'outer;
-            }
-            match (job.apply)(app_dir) {
-                Ok(_) => {
-                    last_successful_job = Some(i);
-                    unsafe { PostMessageW(hwnd, WM_JOB_UPDATED, WPARAM(0), LPARAM(0))? };
-                    break;
-                }
-                Err(err) => {
-                    // Check if it's a "not found" error
-                    let io_err = err.downcast_ref::<std::io::Error>().unwrap();
-                    if io_err.kind() == std::io::ErrorKind::NotFound {
-                        log::warn!("File or folder not found.");
-                        last_successful_job = Some(i);
-                        unsafe { PostMessageW(hwnd, WM_JOB_UPDATED, WPARAM(0), LPARAM(0))? };
-                        break;
-                    }
-
-                    log::error!("Operation failed: {} ({:?})", err, io_err.kind());
-                    std::thread::sleep(Duration::from_millis(50));
-                }
-            }
-        }
-    }
-
-    if last_successful_job
-        .map(|job| job != JOBS.len() - 1)
-        .unwrap_or(true)
-    {
-        let Some(last_successful_job) = last_successful_job else {
-            anyhow::bail!("Autoupdate failed, nothing to rollback");
-        };
-
-        for job in (0..=last_successful_job).rev() {
-            let job = &JOBS[job];
-            if let Err(e) = (job.rollback)(app_dir) {
-                anyhow::bail!(
-                    "Job rollback failed, the app might be left in an inconsistent state: ({:?})",
-                    e
-                );
-            }
-        }
-
-        anyhow::bail!("Autoupdate failed, rollback successful");
-    }
-
-    if launch {
-        #[allow(clippy::disallowed_methods, reason = "doesn't run in the main binary")]
-        let _ = std::process::Command::new(app_dir.join("Zed.exe")).spawn();
-    }
-    log::info!("Update completed successfully");
-    Ok(())
-}
-
-#[cfg(test)]
-mod test {
-    use super::perform_update;
-
-    #[test]
-    fn test_perform_update() {
-        let app_dir = tempfile::tempdir().unwrap();
-        let app_dir = app_dir.path();
-        assert!(perform_update(app_dir, None, false).is_ok());
-
-        let app_dir = tempfile::tempdir().unwrap();
-        let app_dir = app_dir.path();
-        // Simulate a timeout
-        unsafe { std::env::set_var("ZED_AUTO_UPDATE", "err1") };
-        let ret = perform_update(app_dir, None, false);
-        assert!(
-            ret.is_err_and(|e| e.to_string().as_str() == "Autoupdate failed, nothing to rollback")
-        );
-
-        let app_dir = tempfile::tempdir().unwrap();
-        let app_dir = app_dir.path();
-        // Simulate a timeout
-        unsafe { std::env::set_var("ZED_AUTO_UPDATE", "err2") };
-        let ret = perform_update(app_dir, None, false);
-        assert!(
-            ret.is_err_and(|e| e.to_string().as_str() == "Autoupdate failed, rollback successful")
-        );
-        assert!(std::env::var("ZED_AUTO_UPDATE_RB").is_ok_and(|e| e == "rollback1"));
-    }
-}
diff --git a/crates/auto_update_ui/Cargo.toml b/crates/auto_update_ui/Cargo.toml
deleted file mode 100644
index 2b1421e35d..0000000000
--- a/crates/auto_update_ui/Cargo.toml
+++ /dev/null
@@ -1,28 +0,0 @@
-[package]
-name = "auto_update_ui"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/auto_update_ui.rs"
-
-[dependencies]
-anyhow.workspace = true
-auto_update.workspace = true
-client.workspace = true
-editor.workspace = true
-gpui.workspace = true
-http_client.workspace = true
-markdown_preview.workspace = true
-release_channel.workspace = true
-semver.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-smol.workspace = true
-util.workspace = true
-workspace.workspace = true
diff --git a/crates/auto_update_ui/LICENSE-GPL b/crates/auto_update_ui/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/auto_update_ui/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/auto_update_ui/src/auto_update_ui.rs b/crates/auto_update_ui/src/auto_update_ui.rs
deleted file mode 100644
index 6c32ee3b6c..0000000000
--- a/crates/auto_update_ui/src/auto_update_ui.rs
+++ /dev/null
@@ -1,188 +0,0 @@
-use auto_update::AutoUpdater;
-use editor::{Editor, MultiBuffer};
-use gpui::{App, Context, DismissEvent, Entity, Window, actions, prelude::*};
-use http_client::HttpClient;
-use markdown_preview::markdown_preview_view::{MarkdownPreviewMode, MarkdownPreviewView};
-use release_channel::{AppVersion, ReleaseChannel};
-use serde::Deserialize;
-use smol::io::AsyncReadExt;
-use util::ResultExt as _;
-use workspace::Workspace;
-use workspace::notifications::simple_message_notification::MessageNotification;
-use workspace::notifications::{NotificationId, show_app_notification};
-
-actions!(
-    auto_update,
-    [
-        /// Opens the release notes for the current version in a new tab.
-        ViewReleaseNotesLocally
-    ]
-);
-
-pub fn init(cx: &mut App) {
-    notify_if_app_was_updated(cx);
-    cx.observe_new(|workspace: &mut Workspace, _window, _cx| {
-        workspace.register_action(|workspace, _: &ViewReleaseNotesLocally, window, cx| {
-            view_release_notes_locally(workspace, window, cx);
-        });
-    })
-    .detach();
-}
-
-#[derive(Deserialize)]
-struct ReleaseNotesBody {
-    #[expect(
-        unused,
-        reason = "This field was found to be unused with serde library bump; it's left as is due to insufficient context on PO's side, but it *may* be fine to remove"
-    )]
-    title: String,
-    release_notes: String,
-}
-
-fn view_release_notes_locally(
-    workspace: &mut Workspace,
-    window: &mut Window,
-    cx: &mut Context<Workspace>,
-) {
-    let release_channel = ReleaseChannel::global(cx);
-
-    let url = match release_channel {
-        ReleaseChannel::Nightly => Some("https://github.com/zed-industries/zed/commits/nightly/"),
-        ReleaseChannel::Dev => Some("https://github.com/zed-industries/zed/commits/main/"),
-        _ => None,
-    };
-
-    if let Some(url) = url {
-        cx.open_url(url);
-        return;
-    }
-
-    let version = AppVersion::global(cx).to_string();
-
-    let client = client::Client::global(cx).http_client();
-    let url = client.build_url(&format!(
-        "/api/release_notes/v2/{}/{}",
-        release_channel.dev_name(),
-        version
-    ));
-
-    let markdown = workspace
-        .app_state()
-        .languages
-        .language_for_name("Markdown");
-
-    workspace
-        .with_local_workspace(window, cx, move |_, window, cx| {
-            cx.spawn_in(window, async move |workspace, cx| {
-                let markdown = markdown.await.log_err();
-                let response = client.get(&url, Default::default(), true).await;
-                let Some(mut response) = response.log_err() else {
-                    return;
-                };
-
-                let mut body = Vec::new();
-                response.body_mut().read_to_end(&mut body).await.ok();
-
-                let body: serde_json::Result<ReleaseNotesBody> =
-                    serde_json::from_slice(body.as_slice());
-
-                if let Ok(body) = body {
-                    workspace
-                        .update_in(cx, |workspace, window, cx| {
-                            let project = workspace.project().clone();
-                            let buffer = project.update(cx, |project, cx| {
-                                project.create_local_buffer("", markdown, false, cx)
-                            });
-                            buffer.update(cx, |buffer, cx| {
-                                buffer.edit([(0..0, body.release_notes)], None, cx)
-                            });
-                            let language_registry = project.read(cx).languages().clone();
-
-                            let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-
-                            let editor = cx.new(|cx| {
-                                Editor::for_multibuffer(buffer, Some(project), window, cx)
-                            });
-                            let workspace_handle = workspace.weak_handle();
-                            let markdown_preview: Entity<MarkdownPreviewView> =
-                                MarkdownPreviewView::new(
-                                    MarkdownPreviewMode::Default,
-                                    editor,
-                                    workspace_handle,
-                                    language_registry,
-                                    window,
-                                    cx,
-                                );
-                            workspace.add_item_to_active_pane(
-                                Box::new(markdown_preview),
-                                None,
-                                true,
-                                window,
-                                cx,
-                            );
-                            cx.notify();
-                        })
-                        .log_err();
-                }
-            })
-            .detach();
-        })
-        .detach();
-}
-
-/// Shows a notification across all workspaces if an update was previously automatically installed
-/// and this notification had not yet been shown.
-pub fn notify_if_app_was_updated(cx: &mut App) {
-    let Some(updater) = AutoUpdater::get(cx) else {
-        return;
-    };
-
-    if let ReleaseChannel::Nightly = ReleaseChannel::global(cx) {
-        return;
-    }
-
-    struct UpdateNotification;
-
-    let should_show_notification = updater.read(cx).should_show_update_notification(cx);
-    cx.spawn(async move |cx| {
-        let should_show_notification = should_show_notification.await?;
-        if should_show_notification {
-            cx.update(|cx| {
-                let mut version = updater.read(cx).current_version();
-                version.build = semver::BuildMetadata::EMPTY;
-                version.pre = semver::Prerelease::EMPTY;
-                let app_name = ReleaseChannel::global(cx).display_name();
-                show_app_notification(
-                    NotificationId::unique::<UpdateNotification>(),
-                    cx,
-                    move |cx| {
-                        let workspace_handle = cx.entity().downgrade();
-                        cx.new(|cx| {
-                            MessageNotification::new(
-                                format!("Updated to {app_name} {}", version),
-                                cx,
-                            )
-                            .primary_message("View Release Notes")
-                            .primary_on_click(move |window, cx| {
-                                if let Some(workspace) = workspace_handle.upgrade() {
-                                    workspace.update(cx, |workspace, cx| {
-                                        crate::view_release_notes_locally(workspace, window, cx);
-                                    })
-                                }
-                                cx.emit(DismissEvent);
-                            })
-                            .show_suppress_button(false)
-                        })
-                    },
-                );
-                updater.update(cx, |updater, cx| {
-                    updater
-                        .set_should_show_update_notification(false, cx)
-                        .detach_and_log_err(cx);
-                })
-            })?;
-        }
-        anyhow::Ok(())
-    })
-    .detach();
-}
diff --git a/crates/aws_http_client/Cargo.toml b/crates/aws_http_client/Cargo.toml
deleted file mode 100644
index 24569a764d..0000000000
--- a/crates/aws_http_client/Cargo.toml
+++ /dev/null
@@ -1,20 +0,0 @@
-[package]
-name = "aws_http_client"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/aws_http_client.rs"
-
-[features]
-default = []
-
-[dependencies]
-aws-smithy-runtime-api.workspace = true
-aws-smithy-types.workspace = true
-http_client.workspace = true
diff --git a/crates/aws_http_client/LICENSE-GPL b/crates/aws_http_client/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/aws_http_client/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/aws_http_client/src/aws_http_client.rs b/crates/aws_http_client/src/aws_http_client.rs
deleted file mode 100644
index d08c8e64a7..0000000000
--- a/crates/aws_http_client/src/aws_http_client.rs
+++ /dev/null
@@ -1,104 +0,0 @@
-use std::fmt;
-use std::sync::Arc;
-
-use aws_smithy_runtime_api::client::http::{
-    HttpClient as AwsClient, HttpConnector as AwsConnector,
-    HttpConnectorFuture as AwsConnectorFuture, HttpConnectorFuture, HttpConnectorSettings,
-    SharedHttpConnector,
-};
-use aws_smithy_runtime_api::client::orchestrator::{HttpRequest as AwsHttpRequest, HttpResponse};
-use aws_smithy_runtime_api::client::result::ConnectorError;
-use aws_smithy_runtime_api::client::runtime_components::RuntimeComponents;
-use aws_smithy_runtime_api::http::{Headers, StatusCode};
-use aws_smithy_types::body::SdkBody;
-use http_client::AsyncBody;
-use http_client::{HttpClient, Request};
-
-struct AwsHttpConnector {
-    client: Arc<dyn HttpClient>,
-}
-
-impl std::fmt::Debug for AwsHttpConnector {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("AwsHttpConnector").finish()
-    }
-}
-
-impl AwsConnector for AwsHttpConnector {
-    fn call(&self, request: AwsHttpRequest) -> AwsConnectorFuture {
-        let req = match request.try_into_http1x() {
-            Ok(req) => req,
-            Err(err) => {
-                return HttpConnectorFuture::ready(Err(ConnectorError::other(err.into(), None)));
-            }
-        };
-
-        let (parts, body) = req.into_parts();
-
-        let response = self
-            .client
-            .send(Request::from_parts(parts, convert_to_async_body(body)));
-
-        HttpConnectorFuture::new(async move {
-            let response = match response.await {
-                Ok(response) => response,
-                Err(err) => return Err(ConnectorError::other(err.into(), None)),
-            };
-            let (parts, body) = response.into_parts();
-
-            let mut response = HttpResponse::new(
-                StatusCode::try_from(parts.status.as_u16()).unwrap(),
-                convert_to_sdk_body(body),
-            );
-
-            let headers = match Headers::try_from(parts.headers) {
-                Ok(headers) => headers,
-                Err(err) => return Err(ConnectorError::other(err.into(), None)),
-            };
-
-            *response.headers_mut() = headers;
-
-            Ok(response)
-        })
-    }
-}
-
-#[derive(Clone)]
-pub struct AwsHttpClient {
-    client: Arc<dyn HttpClient>,
-}
-
-impl std::fmt::Debug for AwsHttpClient {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("AwsHttpClient").finish()
-    }
-}
-
-impl AwsHttpClient {
-    pub fn new(client: Arc<dyn HttpClient>) -> Self {
-        Self { client }
-    }
-}
-
-impl AwsClient for AwsHttpClient {
-    fn http_connector(
-        &self,
-        _settings: &HttpConnectorSettings,
-        _components: &RuntimeComponents,
-    ) -> SharedHttpConnector {
-        SharedHttpConnector::new(AwsHttpConnector {
-            client: self.client.clone(),
-        })
-    }
-}
-
-pub fn convert_to_sdk_body(body: AsyncBody) -> SdkBody {
-    SdkBody::from_body_1_x(body)
-}
-
-pub fn convert_to_async_body(body: SdkBody) -> AsyncBody {
-    match body.bytes() {
-        Some(bytes) => AsyncBody::from((*bytes).to_vec()),
-        None => AsyncBody::empty(),
-    }
-}
diff --git a/crates/bedrock/Cargo.toml b/crates/bedrock/Cargo.toml
deleted file mode 100644
index f8f6fa4601..0000000000
--- a/crates/bedrock/Cargo.toml
+++ /dev/null
@@ -1,27 +0,0 @@
-[package]
-name = "bedrock"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/bedrock.rs"
-
-[features]
-default = []
-schemars = ["dep:schemars"]
-
-[dependencies]
-anyhow.workspace = true
-aws-sdk-bedrockruntime = { workspace = true, features = ["behavior-version-latest"] }
-aws-smithy-types = {workspace = true}
-futures.workspace = true
-schemars = { workspace = true, optional = true }
-serde.workspace = true
-serde_json.workspace = true
-strum.workspace = true
-thiserror.workspace = true
diff --git a/crates/bedrock/LICENSE-GPL b/crates/bedrock/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/bedrock/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/bedrock/src/bedrock.rs b/crates/bedrock/src/bedrock.rs
deleted file mode 100644
index ec0b407090..0000000000
--- a/crates/bedrock/src/bedrock.rs
+++ /dev/null
@@ -1,179 +0,0 @@
-mod models;
-
-use anyhow::{Context, Error, Result, anyhow};
-use aws_sdk_bedrockruntime as bedrock;
-pub use aws_sdk_bedrockruntime as bedrock_client;
-use aws_sdk_bedrockruntime::types::InferenceConfiguration;
-pub use aws_sdk_bedrockruntime::types::{
-    AnyToolChoice as BedrockAnyToolChoice, AutoToolChoice as BedrockAutoToolChoice,
-    ContentBlock as BedrockInnerContent, Tool as BedrockTool, ToolChoice as BedrockToolChoice,
-    ToolConfiguration as BedrockToolConfig, ToolInputSchema as BedrockToolInputSchema,
-    ToolSpecification as BedrockToolSpec,
-};
-pub use aws_smithy_types::Blob as BedrockBlob;
-use aws_smithy_types::{Document, Number as AwsNumber};
-pub use bedrock::operation::converse_stream::ConverseStreamInput as BedrockStreamingRequest;
-pub use bedrock::types::{
-    ContentBlock as BedrockRequestContent, ConversationRole as BedrockRole,
-    ConverseOutput as BedrockResponse, ConverseStreamOutput as BedrockStreamingResponse,
-    ImageBlock as BedrockImageBlock, Message as BedrockMessage,
-    ReasoningContentBlock as BedrockThinkingBlock, ReasoningTextBlock as BedrockThinkingTextBlock,
-    ResponseStream as BedrockResponseStream, SystemContentBlock as BedrockSystemContentBlock,
-    ToolResultBlock as BedrockToolResultBlock,
-    ToolResultContentBlock as BedrockToolResultContentBlock,
-    ToolResultStatus as BedrockToolResultStatus, ToolUseBlock as BedrockToolUseBlock,
-};
-use futures::stream::{self, BoxStream};
-use serde::{Deserialize, Serialize};
-use serde_json::{Number, Value};
-use std::collections::HashMap;
-use thiserror::Error;
-
-pub use crate::models::*;
-
-pub async fn stream_completion(
-    client: bedrock::Client,
-    request: Request,
-) -> Result<BoxStream<'static, Result<BedrockStreamingResponse, BedrockError>>, Error> {
-    let mut response = bedrock::Client::converse_stream(&client)
-        .model_id(request.model.clone())
-        .set_messages(request.messages.into());
-
-    if let Some(Thinking::Enabled {
-        budget_tokens: Some(budget_tokens),
-    }) = request.thinking
-    {
-        let thinking_config = HashMap::from([
-            ("type".to_string(), Document::String("enabled".to_string())),
-            (
-                "budget_tokens".to_string(),
-                Document::Number(AwsNumber::PosInt(budget_tokens)),
-            ),
-        ]);
-        response = response.additional_model_request_fields(Document::Object(HashMap::from([(
-            "thinking".to_string(),
-            Document::from(thinking_config),
-        )])));
-    }
-
-    if request.tools.as_ref().is_some_and(|t| !t.tools.is_empty()) {
-        response = response.set_tool_config(request.tools);
-    }
-
-    let inference_config = InferenceConfiguration::builder()
-        .max_tokens(request.max_tokens as i32)
-        .set_temperature(request.temperature)
-        .set_top_p(request.top_p)
-        .build();
-
-    response = response.inference_config(inference_config);
-
-    if let Some(system) = request.system {
-        if !system.is_empty() {
-            response = response.system(BedrockSystemContentBlock::Text(system));
-        }
-    }
-
-    let output = response
-        .send()
-        .await
-        .context("Failed to send API request to Bedrock");
-
-    let stream = Box::pin(stream::unfold(
-        output?.stream,
-        move |mut stream| async move {
-            match stream.recv().await {
-                Ok(Some(output)) => Some((Ok(output), stream)),
-                Ok(None) => None,
-                Err(err) => Some((
-                    Err(BedrockError::ClientError(anyhow!(
-                        "{:?}",
-                        aws_sdk_bedrockruntime::error::DisplayErrorContext(err)
-                    ))),
-                    stream,
-                )),
-            }
-        },
-    ));
-
-    Ok(stream)
-}
-
-pub fn aws_document_to_value(document: &Document) -> Value {
-    match document {
-        Document::Null => Value::Null,
-        Document::Bool(value) => Value::Bool(*value),
-        Document::Number(value) => match *value {
-            AwsNumber::PosInt(value) => Value::Number(Number::from(value)),
-            AwsNumber::NegInt(value) => Value::Number(Number::from(value)),
-            AwsNumber::Float(value) => Value::Number(Number::from_f64(value).unwrap()),
-        },
-        Document::String(value) => Value::String(value.clone()),
-        Document::Array(array) => Value::Array(array.iter().map(aws_document_to_value).collect()),
-        Document::Object(map) => Value::Object(
-            map.iter()
-                .map(|(key, value)| (key.clone(), aws_document_to_value(value)))
-                .collect(),
-        ),
-    }
-}
-
-pub fn value_to_aws_document(value: &Value) -> Document {
-    match value {
-        Value::Null => Document::Null,
-        Value::Bool(value) => Document::Bool(*value),
-        Value::Number(value) => {
-            if let Some(value) = value.as_u64() {
-                Document::Number(AwsNumber::PosInt(value))
-            } else if let Some(value) = value.as_i64() {
-                Document::Number(AwsNumber::NegInt(value))
-            } else if let Some(value) = value.as_f64() {
-                Document::Number(AwsNumber::Float(value))
-            } else {
-                Document::Null
-            }
-        }
-        Value::String(value) => Document::String(value.clone()),
-        Value::Array(array) => Document::Array(array.iter().map(value_to_aws_document).collect()),
-        Value::Object(map) => Document::Object(
-            map.iter()
-                .map(|(key, value)| (key.clone(), value_to_aws_document(value)))
-                .collect(),
-        ),
-    }
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub enum Thinking {
-    Enabled { budget_tokens: Option<u64> },
-}
-
-#[derive(Debug)]
-pub struct Request {
-    pub model: String,
-    pub max_tokens: u64,
-    pub messages: Vec<BedrockMessage>,
-    pub tools: Option<BedrockToolConfig>,
-    pub thinking: Option<Thinking>,
-    pub system: Option<String>,
-    pub metadata: Option<Metadata>,
-    pub stop_sequences: Vec<String>,
-    pub temperature: Option<f32>,
-    pub top_k: Option<u32>,
-    pub top_p: Option<f32>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct Metadata {
-    pub user_id: Option<String>,
-}
-
-#[derive(Error, Debug)]
-pub enum BedrockError {
-    #[error("client error: {0}")]
-    ClientError(anyhow::Error),
-    #[error("extension error: {0}")]
-    ExtensionError(anyhow::Error),
-    #[error(transparent)]
-    Other(#[from] anyhow::Error),
-}
diff --git a/crates/bedrock/src/models.rs b/crates/bedrock/src/models.rs
deleted file mode 100644
index 51e1b29f9a..0000000000
--- a/crates/bedrock/src/models.rs
+++ /dev/null
@@ -1,987 +0,0 @@
-use serde::{Deserialize, Serialize};
-use strum::EnumIter;
-
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
-#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq)]
-pub enum BedrockModelMode {
-    #[default]
-    Default,
-    Thinking {
-        budget_tokens: Option<u64>,
-    },
-}
-
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
-#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq)]
-pub struct BedrockModelCacheConfiguration {
-    pub max_cache_anchors: usize,
-    pub min_total_token: u64,
-}
-
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
-#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq, EnumIter)]
-pub enum Model {
-    // Anthropic models (already included)
-    #[serde(rename = "claude-sonnet-4", alias = "claude-sonnet-4-latest")]
-    ClaudeSonnet4,
-    #[serde(
-        rename = "claude-sonnet-4-thinking",
-        alias = "claude-sonnet-4-thinking-latest"
-    )]
-    ClaudeSonnet4Thinking,
-    #[default]
-    #[serde(rename = "claude-sonnet-4-5", alias = "claude-sonnet-4-5-latest")]
-    ClaudeSonnet4_5,
-    #[serde(
-        rename = "claude-sonnet-4-5-thinking",
-        alias = "claude-sonnet-4-5-thinking-latest"
-    )]
-    ClaudeSonnet4_5Thinking,
-    #[serde(rename = "claude-opus-4", alias = "claude-opus-4-latest")]
-    ClaudeOpus4,
-    #[serde(rename = "claude-opus-4-1", alias = "claude-opus-4-1-latest")]
-    ClaudeOpus4_1,
-    #[serde(
-        rename = "claude-opus-4-thinking",
-        alias = "claude-opus-4-thinking-latest"
-    )]
-    ClaudeOpus4Thinking,
-    #[serde(
-        rename = "claude-opus-4-1-thinking",
-        alias = "claude-opus-4-1-thinking-latest"
-    )]
-    ClaudeOpus4_1Thinking,
-    #[serde(rename = "claude-opus-4-5", alias = "claude-opus-4-5-latest")]
-    ClaudeOpus4_5,
-    #[serde(
-        rename = "claude-opus-4-5-thinking",
-        alias = "claude-opus-4-5-thinking-latest"
-    )]
-    ClaudeOpus4_5Thinking,
-    #[serde(rename = "claude-3-5-sonnet-v2", alias = "claude-3-5-sonnet-latest")]
-    Claude3_5SonnetV2,
-    #[serde(rename = "claude-3-7-sonnet", alias = "claude-3-7-sonnet-latest")]
-    Claude3_7Sonnet,
-    #[serde(
-        rename = "claude-3-7-sonnet-thinking",
-        alias = "claude-3-7-sonnet-thinking-latest"
-    )]
-    Claude3_7SonnetThinking,
-    #[serde(rename = "claude-3-opus", alias = "claude-3-opus-latest")]
-    Claude3Opus,
-    #[serde(rename = "claude-3-sonnet", alias = "claude-3-sonnet-latest")]
-    Claude3Sonnet,
-    #[serde(rename = "claude-3-5-haiku", alias = "claude-3-5-haiku-latest")]
-    Claude3_5Haiku,
-    #[serde(rename = "claude-haiku-4-5", alias = "claude-haiku-4-5-latest")]
-    ClaudeHaiku4_5,
-    Claude3_5Sonnet,
-    Claude3Haiku,
-    // Amazon Nova Models
-    AmazonNovaLite,
-    AmazonNovaMicro,
-    AmazonNovaPro,
-    AmazonNovaPremier,
-    // AI21 models
-    AI21J2GrandeInstruct,
-    AI21J2JumboInstruct,
-    AI21J2Mid,
-    AI21J2MidV1,
-    AI21J2Ultra,
-    AI21J2UltraV1_8k,
-    AI21J2UltraV1,
-    AI21JambaInstructV1,
-    AI21Jamba15LargeV1,
-    AI21Jamba15MiniV1,
-    // Cohere models
-    CohereCommandTextV14_4k,
-    CohereCommandRV1,
-    CohereCommandRPlusV1,
-    CohereCommandLightTextV14_4k,
-    // DeepSeek
-    DeepSeekR1,
-    // Meta models
-    MetaLlama38BInstructV1,
-    MetaLlama370BInstructV1,
-    MetaLlama318BInstructV1_128k,
-    MetaLlama318BInstructV1,
-    MetaLlama3170BInstructV1_128k,
-    MetaLlama3170BInstructV1,
-    MetaLlama31405BInstructV1,
-    MetaLlama321BInstructV1,
-    MetaLlama323BInstructV1,
-    MetaLlama3211BInstructV1,
-    MetaLlama3290BInstructV1,
-    MetaLlama3370BInstructV1,
-    #[allow(non_camel_case_types)]
-    MetaLlama4Scout17BInstructV1,
-    #[allow(non_camel_case_types)]
-    MetaLlama4Maverick17BInstructV1,
-    // Mistral models
-    MistralMistral7BInstructV0,
-    MistralMixtral8x7BInstructV0,
-    MistralMistralLarge2402V1,
-    MistralMistralSmall2402V1,
-    MistralPixtralLarge2502V1,
-    // Writer models
-    PalmyraWriterX5,
-    PalmyraWriterX4,
-    #[serde(rename = "custom")]
-    Custom {
-        name: String,
-        max_tokens: u64,
-        /// The name displayed in the UI, such as in the assistant panel model dropdown menu.
-        display_name: Option<String>,
-        max_output_tokens: Option<u64>,
-        default_temperature: Option<f32>,
-        cache_configuration: Option<BedrockModelCacheConfiguration>,
-    },
-}
-
-impl Model {
-    pub fn default_fast(region: &str) -> Self {
-        if region.starts_with("us-") {
-            Self::Claude3_5Haiku
-        } else {
-            Self::Claude3Haiku
-        }
-    }
-
-    pub fn from_id(id: &str) -> anyhow::Result<Self> {
-        if id.starts_with("claude-opus-4-5-thinking") {
-            Ok(Self::ClaudeOpus4_5Thinking)
-        } else if id.starts_with("claude-opus-4-5") {
-            Ok(Self::ClaudeOpus4_5)
-        } else if id.starts_with("claude-opus-4-1-thinking") {
-            Ok(Self::ClaudeOpus4_1Thinking)
-        } else if id.starts_with("claude-opus-4-1") {
-            Ok(Self::ClaudeOpus4_1)
-        } else if id.starts_with("claude-opus-4-thinking") {
-            Ok(Self::ClaudeOpus4Thinking)
-        } else if id.starts_with("claude-opus-4") {
-            Ok(Self::ClaudeOpus4)
-        } else if id.starts_with("claude-3-5-sonnet-v2") {
-            Ok(Self::Claude3_5SonnetV2)
-        } else if id.starts_with("claude-3-opus") {
-            Ok(Self::Claude3Opus)
-        } else if id.starts_with("claude-3-sonnet") {
-            Ok(Self::Claude3Sonnet)
-        } else if id.starts_with("claude-3-5-haiku") {
-            Ok(Self::Claude3_5Haiku)
-        } else if id.starts_with("claude-haiku-4-5") {
-            Ok(Self::ClaudeHaiku4_5)
-        } else if id.starts_with("claude-3-7-sonnet") {
-            Ok(Self::Claude3_7Sonnet)
-        } else if id.starts_with("claude-3-7-sonnet-thinking") {
-            Ok(Self::Claude3_7SonnetThinking)
-        } else if id.starts_with("claude-sonnet-4-5-thinking") {
-            Ok(Self::ClaudeSonnet4_5Thinking)
-        } else if id.starts_with("claude-sonnet-4-5") {
-            Ok(Self::ClaudeSonnet4_5)
-        } else if id.starts_with("claude-sonnet-4-thinking") {
-            Ok(Self::ClaudeSonnet4Thinking)
-        } else if id.starts_with("claude-sonnet-4") {
-            Ok(Self::ClaudeSonnet4)
-        } else {
-            anyhow::bail!("invalid model id {id}");
-        }
-    }
-
-    pub fn id(&self) -> &str {
-        match self {
-            Model::ClaudeSonnet4 => "claude-sonnet-4",
-            Model::ClaudeSonnet4Thinking => "claude-sonnet-4-thinking",
-            Model::ClaudeSonnet4_5 => "claude-sonnet-4-5",
-            Model::ClaudeSonnet4_5Thinking => "claude-sonnet-4-5-thinking",
-            Model::ClaudeOpus4 => "claude-opus-4",
-            Model::ClaudeOpus4_1 => "claude-opus-4-1",
-            Model::ClaudeOpus4Thinking => "claude-opus-4-thinking",
-            Model::ClaudeOpus4_1Thinking => "claude-opus-4-1-thinking",
-            Model::ClaudeOpus4_5 => "claude-opus-4-5",
-            Model::ClaudeOpus4_5Thinking => "claude-opus-4-5-thinking",
-            Model::Claude3_5SonnetV2 => "claude-3-5-sonnet-v2",
-            Model::Claude3_5Sonnet => "claude-3-5-sonnet",
-            Model::Claude3Opus => "claude-3-opus",
-            Model::Claude3Sonnet => "claude-3-sonnet",
-            Model::Claude3Haiku => "claude-3-haiku",
-            Model::Claude3_5Haiku => "claude-3-5-haiku",
-            Model::ClaudeHaiku4_5 => "claude-haiku-4-5",
-            Model::Claude3_7Sonnet => "claude-3-7-sonnet",
-            Model::Claude3_7SonnetThinking => "claude-3-7-sonnet-thinking",
-            Model::AmazonNovaLite => "amazon-nova-lite",
-            Model::AmazonNovaMicro => "amazon-nova-micro",
-            Model::AmazonNovaPro => "amazon-nova-pro",
-            Model::AmazonNovaPremier => "amazon-nova-premier",
-            Model::DeepSeekR1 => "deepseek-r1",
-            Model::AI21J2GrandeInstruct => "ai21-j2-grande-instruct",
-            Model::AI21J2JumboInstruct => "ai21-j2-jumbo-instruct",
-            Model::AI21J2Mid => "ai21-j2-mid",
-            Model::AI21J2MidV1 => "ai21-j2-mid-v1",
-            Model::AI21J2Ultra => "ai21-j2-ultra",
-            Model::AI21J2UltraV1_8k => "ai21-j2-ultra-v1-8k",
-            Model::AI21J2UltraV1 => "ai21-j2-ultra-v1",
-            Model::AI21JambaInstructV1 => "ai21-jamba-instruct-v1",
-            Model::AI21Jamba15LargeV1 => "ai21-jamba-1-5-large-v1",
-            Model::AI21Jamba15MiniV1 => "ai21-jamba-1-5-mini-v1",
-            Model::CohereCommandTextV14_4k => "cohere-command-text-v14-4k",
-            Model::CohereCommandRV1 => "cohere-command-r-v1",
-            Model::CohereCommandRPlusV1 => "cohere-command-r-plus-v1",
-            Model::CohereCommandLightTextV14_4k => "cohere-command-light-text-v14-4k",
-            Model::MetaLlama38BInstructV1 => "meta-llama3-8b-instruct-v1",
-            Model::MetaLlama370BInstructV1 => "meta-llama3-70b-instruct-v1",
-            Model::MetaLlama318BInstructV1_128k => "meta-llama3-1-8b-instruct-v1-128k",
-            Model::MetaLlama318BInstructV1 => "meta-llama3-1-8b-instruct-v1",
-            Model::MetaLlama3170BInstructV1_128k => "meta-llama3-1-70b-instruct-v1-128k",
-            Model::MetaLlama3170BInstructV1 => "meta-llama3-1-70b-instruct-v1",
-            Model::MetaLlama31405BInstructV1 => "meta-llama3-1-405b-instruct-v1",
-            Model::MetaLlama321BInstructV1 => "meta-llama3-2-1b-instruct-v1",
-            Model::MetaLlama323BInstructV1 => "meta-llama3-2-3b-instruct-v1",
-            Model::MetaLlama3211BInstructV1 => "meta-llama3-2-11b-instruct-v1",
-            Model::MetaLlama3290BInstructV1 => "meta-llama3-2-90b-instruct-v1",
-            Model::MetaLlama3370BInstructV1 => "meta-llama3-3-70b-instruct-v1",
-            Model::MetaLlama4Scout17BInstructV1 => "meta-llama4-scout-17b-instruct-v1",
-            Model::MetaLlama4Maverick17BInstructV1 => "meta-llama4-maverick-17b-instruct-v1",
-            Model::MistralMistral7BInstructV0 => "mistral-7b-instruct-v0",
-            Model::MistralMixtral8x7BInstructV0 => "mistral-mixtral-8x7b-instruct-v0",
-            Model::MistralMistralLarge2402V1 => "mistral-large-2402-v1",
-            Model::MistralMistralSmall2402V1 => "mistral-small-2402-v1",
-            Model::MistralPixtralLarge2502V1 => "mistral-pixtral-large-2502-v1",
-            Model::PalmyraWriterX4 => "palmyra-writer-x4",
-            Model::PalmyraWriterX5 => "palmyra-writer-x5",
-            Self::Custom { name, .. } => name,
-        }
-    }
-
-    pub fn request_id(&self) -> &str {
-        match self {
-            Model::ClaudeSonnet4 | Model::ClaudeSonnet4Thinking => {
-                "anthropic.claude-sonnet-4-20250514-v1:0"
-            }
-            Model::ClaudeSonnet4_5 | Model::ClaudeSonnet4_5Thinking => {
-                "anthropic.claude-sonnet-4-5-20250929-v1:0"
-            }
-            Model::ClaudeOpus4 | Model::ClaudeOpus4Thinking => {
-                "anthropic.claude-opus-4-20250514-v1:0"
-            }
-            Model::ClaudeOpus4_1 | Model::ClaudeOpus4_1Thinking => {
-                "anthropic.claude-opus-4-1-20250805-v1:0"
-            }
-            Model::ClaudeOpus4_5 | Model::ClaudeOpus4_5Thinking => {
-                "anthropic.claude-opus-4-5-20251101-v1:0"
-            }
-            Model::Claude3_5SonnetV2 => "anthropic.claude-3-5-sonnet-20241022-v2:0",
-            Model::Claude3_5Sonnet => "anthropic.claude-3-5-sonnet-20240620-v1:0",
-            Model::Claude3Opus => "anthropic.claude-3-opus-20240229-v1:0",
-            Model::Claude3Sonnet => "anthropic.claude-3-sonnet-20240229-v1:0",
-            Model::Claude3Haiku => "anthropic.claude-3-haiku-20240307-v1:0",
-            Model::Claude3_5Haiku => "anthropic.claude-3-5-haiku-20241022-v1:0",
-            Model::ClaudeHaiku4_5 => "anthropic.claude-haiku-4-5-20251001-v1:0",
-            Model::Claude3_7Sonnet | Model::Claude3_7SonnetThinking => {
-                "anthropic.claude-3-7-sonnet-20250219-v1:0"
-            }
-            Model::AmazonNovaLite => "amazon.nova-lite-v1:0",
-            Model::AmazonNovaMicro => "amazon.nova-micro-v1:0",
-            Model::AmazonNovaPro => "amazon.nova-pro-v1:0",
-            Model::AmazonNovaPremier => "amazon.nova-premier-v1:0",
-            Model::DeepSeekR1 => "deepseek.r1-v1:0",
-            Model::AI21J2GrandeInstruct => "ai21.j2-grande-instruct",
-            Model::AI21J2JumboInstruct => "ai21.j2-jumbo-instruct",
-            Model::AI21J2Mid => "ai21.j2-mid",
-            Model::AI21J2MidV1 => "ai21.j2-mid-v1",
-            Model::AI21J2Ultra => "ai21.j2-ultra",
-            Model::AI21J2UltraV1_8k => "ai21.j2-ultra-v1:0:8k",
-            Model::AI21J2UltraV1 => "ai21.j2-ultra-v1",
-            Model::AI21JambaInstructV1 => "ai21.jamba-instruct-v1:0",
-            Model::AI21Jamba15LargeV1 => "ai21.jamba-1-5-large-v1:0",
-            Model::AI21Jamba15MiniV1 => "ai21.jamba-1-5-mini-v1:0",
-            Model::CohereCommandTextV14_4k => "cohere.command-text-v14:7:4k",
-            Model::CohereCommandRV1 => "cohere.command-r-v1:0",
-            Model::CohereCommandRPlusV1 => "cohere.command-r-plus-v1:0",
-            Model::CohereCommandLightTextV14_4k => "cohere.command-light-text-v14:7:4k",
-            Model::MetaLlama38BInstructV1 => "meta.llama3-8b-instruct-v1:0",
-            Model::MetaLlama370BInstructV1 => "meta.llama3-70b-instruct-v1:0",
-            Model::MetaLlama318BInstructV1_128k => "meta.llama3-1-8b-instruct-v1:0",
-            Model::MetaLlama318BInstructV1 => "meta.llama3-1-8b-instruct-v1:0",
-            Model::MetaLlama3170BInstructV1_128k => "meta.llama3-1-70b-instruct-v1:0",
-            Model::MetaLlama3170BInstructV1 => "meta.llama3-1-70b-instruct-v1:0",
-            Model::MetaLlama31405BInstructV1 => "meta.llama3-1-405b-instruct-v1:0",
-            Model::MetaLlama3211BInstructV1 => "meta.llama3-2-11b-instruct-v1:0",
-            Model::MetaLlama3290BInstructV1 => "meta.llama3-2-90b-instruct-v1:0",
-            Model::MetaLlama321BInstructV1 => "meta.llama3-2-1b-instruct-v1:0",
-            Model::MetaLlama323BInstructV1 => "meta.llama3-2-3b-instruct-v1:0",
-            Model::MetaLlama3370BInstructV1 => "meta.llama3-3-70b-instruct-v1:0",
-            Model::MetaLlama4Scout17BInstructV1 => "meta.llama4-scout-17b-instruct-v1:0",
-            Model::MetaLlama4Maverick17BInstructV1 => "meta.llama4-maverick-17b-instruct-v1:0",
-            Model::MistralMistral7BInstructV0 => "mistral.mistral-7b-instruct-v0:2",
-            Model::MistralMixtral8x7BInstructV0 => "mistral.mixtral-8x7b-instruct-v0:1",
-            Model::MistralMistralLarge2402V1 => "mistral.mistral-large-2402-v1:0",
-            Model::MistralMistralSmall2402V1 => "mistral.mistral-small-2402-v1:0",
-            Model::MistralPixtralLarge2502V1 => "mistral.pixtral-large-2502-v1:0",
-            Model::PalmyraWriterX4 => "writer.palmyra-x4-v1:0",
-            Model::PalmyraWriterX5 => "writer.palmyra-x5-v1:0",
-            Self::Custom { name, .. } => name,
-        }
-    }
-
-    pub fn display_name(&self) -> &str {
-        match self {
-            Self::ClaudeSonnet4 => "Claude Sonnet 4",
-            Self::ClaudeSonnet4Thinking => "Claude Sonnet 4 Thinking",
-            Self::ClaudeSonnet4_5 => "Claude Sonnet 4.5",
-            Self::ClaudeSonnet4_5Thinking => "Claude Sonnet 4.5 Thinking",
-            Self::ClaudeOpus4 => "Claude Opus 4",
-            Self::ClaudeOpus4_1 => "Claude Opus 4.1",
-            Self::ClaudeOpus4Thinking => "Claude Opus 4 Thinking",
-            Self::ClaudeOpus4_1Thinking => "Claude Opus 4.1 Thinking",
-            Self::ClaudeOpus4_5 => "Claude Opus 4.5",
-            Self::ClaudeOpus4_5Thinking => "Claude Opus 4.5 Thinking",
-            Self::Claude3_5SonnetV2 => "Claude 3.5 Sonnet v2",
-            Self::Claude3_5Sonnet => "Claude 3.5 Sonnet",
-            Self::Claude3Opus => "Claude 3 Opus",
-            Self::Claude3Sonnet => "Claude 3 Sonnet",
-            Self::Claude3Haiku => "Claude 3 Haiku",
-            Self::Claude3_5Haiku => "Claude 3.5 Haiku",
-            Self::ClaudeHaiku4_5 => "Claude Haiku 4.5",
-            Self::Claude3_7Sonnet => "Claude 3.7 Sonnet",
-            Self::Claude3_7SonnetThinking => "Claude 3.7 Sonnet Thinking",
-            Self::AmazonNovaLite => "Amazon Nova Lite",
-            Self::AmazonNovaMicro => "Amazon Nova Micro",
-            Self::AmazonNovaPro => "Amazon Nova Pro",
-            Self::AmazonNovaPremier => "Amazon Nova Premier",
-            Self::DeepSeekR1 => "DeepSeek R1",
-            Self::AI21J2GrandeInstruct => "AI21 Jurassic2 Grande Instruct",
-            Self::AI21J2JumboInstruct => "AI21 Jurassic2 Jumbo Instruct",
-            Self::AI21J2Mid => "AI21 Jurassic2 Mid",
-            Self::AI21J2MidV1 => "AI21 Jurassic2 Mid V1",
-            Self::AI21J2Ultra => "AI21 Jurassic2 Ultra",
-            Self::AI21J2UltraV1_8k => "AI21 Jurassic2 Ultra V1 8K",
-            Self::AI21J2UltraV1 => "AI21 Jurassic2 Ultra V1",
-            Self::AI21JambaInstructV1 => "AI21 Jamba Instruct",
-            Self::AI21Jamba15LargeV1 => "AI21 Jamba 1.5 Large",
-            Self::AI21Jamba15MiniV1 => "AI21 Jamba 1.5 Mini",
-            Self::CohereCommandTextV14_4k => "Cohere Command Text V14 4K",
-            Self::CohereCommandRV1 => "Cohere Command R V1",
-            Self::CohereCommandRPlusV1 => "Cohere Command R Plus V1",
-            Self::CohereCommandLightTextV14_4k => "Cohere Command Light Text V14 4K",
-            Self::MetaLlama38BInstructV1 => "Meta Llama 3 8B Instruct",
-            Self::MetaLlama370BInstructV1 => "Meta Llama 3 70B Instruct",
-            Self::MetaLlama318BInstructV1_128k => "Meta Llama 3.1 8B Instruct 128K",
-            Self::MetaLlama318BInstructV1 => "Meta Llama 3.1 8B Instruct",
-            Self::MetaLlama3170BInstructV1_128k => "Meta Llama 3.1 70B Instruct 128K",
-            Self::MetaLlama3170BInstructV1 => "Meta Llama 3.1 70B Instruct",
-            Self::MetaLlama31405BInstructV1 => "Meta Llama 3.1 405B Instruct",
-            Self::MetaLlama3211BInstructV1 => "Meta Llama 3.2 11B Instruct",
-            Self::MetaLlama3290BInstructV1 => "Meta Llama 3.2 90B Instruct",
-            Self::MetaLlama321BInstructV1 => "Meta Llama 3.2 1B Instruct",
-            Self::MetaLlama323BInstructV1 => "Meta Llama 3.2 3B Instruct",
-            Self::MetaLlama3370BInstructV1 => "Meta Llama 3.3 70B Instruct",
-            Self::MetaLlama4Scout17BInstructV1 => "Meta Llama 4 Scout 17B Instruct",
-            Self::MetaLlama4Maverick17BInstructV1 => "Meta Llama 4 Maverick 17B Instruct",
-            Self::MistralMistral7BInstructV0 => "Mistral 7B Instruct V0",
-            Self::MistralMixtral8x7BInstructV0 => "Mistral Mixtral 8x7B Instruct V0",
-            Self::MistralMistralLarge2402V1 => "Mistral Large 2402 V1",
-            Self::MistralMistralSmall2402V1 => "Mistral Small 2402 V1",
-            Self::MistralPixtralLarge2502V1 => "Pixtral Large 25.02 V1",
-            Self::PalmyraWriterX5 => "Writer Palmyra X5",
-            Self::PalmyraWriterX4 => "Writer Palmyra X4",
-            Self::Custom {
-                display_name, name, ..
-            } => display_name.as_deref().unwrap_or(name),
-        }
-    }
-
-    pub fn max_token_count(&self) -> u64 {
-        match self {
-            Self::Claude3_5SonnetV2
-            | Self::Claude3Opus
-            | Self::Claude3Sonnet
-            | Self::Claude3_5Haiku
-            | Self::ClaudeHaiku4_5
-            | Self::Claude3_7Sonnet
-            | Self::ClaudeSonnet4
-            | Self::ClaudeOpus4
-            | Self::ClaudeOpus4_1
-            | Self::ClaudeSonnet4Thinking
-            | Self::ClaudeSonnet4_5
-            | Self::ClaudeSonnet4_5Thinking
-            | Self::ClaudeOpus4Thinking
-            | Self::ClaudeOpus4_1Thinking
-            | Self::ClaudeOpus4_5
-            | Self::ClaudeOpus4_5Thinking => 200_000,
-            Self::AmazonNovaPremier => 1_000_000,
-            Self::PalmyraWriterX5 => 1_000_000,
-            Self::PalmyraWriterX4 => 128_000,
-            Self::Custom { max_tokens, .. } => *max_tokens,
-            _ => 128_000,
-        }
-    }
-
-    pub fn max_output_tokens(&self) -> u64 {
-        match self {
-            Self::Claude3Opus | Self::Claude3Sonnet | Self::Claude3_5Haiku => 4_096,
-            Self::Claude3_7Sonnet | Self::Claude3_7SonnetThinking => 128_000,
-            Self::ClaudeSonnet4 | Self::ClaudeSonnet4Thinking => 64_000,
-            Self::ClaudeSonnet4_5
-            | Self::ClaudeSonnet4_5Thinking
-            | Self::ClaudeHaiku4_5
-            | Self::ClaudeOpus4_5
-            | Self::ClaudeOpus4_5Thinking => 64_000,
-            Self::ClaudeOpus4
-            | Self::ClaudeOpus4Thinking
-            | Self::ClaudeOpus4_1
-            | Self::ClaudeOpus4_1Thinking => 32_000,
-            Self::Claude3_5SonnetV2 | Self::PalmyraWriterX4 | Self::PalmyraWriterX5 => 8_192,
-            Self::Custom {
-                max_output_tokens, ..
-            } => max_output_tokens.unwrap_or(4_096),
-            _ => 4_096,
-        }
-    }
-
-    pub fn default_temperature(&self) -> f32 {
-        match self {
-            Self::Claude3_5SonnetV2
-            | Self::Claude3Opus
-            | Self::Claude3Sonnet
-            | Self::Claude3_5Haiku
-            | Self::ClaudeHaiku4_5
-            | Self::Claude3_7Sonnet
-            | Self::ClaudeOpus4
-            | Self::ClaudeOpus4Thinking
-            | Self::ClaudeOpus4_1
-            | Self::ClaudeOpus4_1Thinking
-            | Self::ClaudeOpus4_5
-            | Self::ClaudeOpus4_5Thinking
-            | Self::ClaudeSonnet4
-            | Self::ClaudeSonnet4Thinking
-            | Self::ClaudeSonnet4_5
-            | Self::ClaudeSonnet4_5Thinking => 1.0,
-            Self::Custom {
-                default_temperature,
-                ..
-            } => default_temperature.unwrap_or(1.0),
-            _ => 1.0,
-        }
-    }
-
-    pub fn supports_tool_use(&self) -> bool {
-        match self {
-            // Anthropic Claude 3 models (all support tool use)
-            Self::Claude3Opus
-            | Self::Claude3Sonnet
-            | Self::Claude3_5Sonnet
-            | Self::Claude3_5SonnetV2
-            | Self::Claude3_7Sonnet
-            | Self::Claude3_7SonnetThinking
-            | Self::ClaudeOpus4
-            | Self::ClaudeOpus4Thinking
-            | Self::ClaudeOpus4_1
-            | Self::ClaudeOpus4_1Thinking
-            | Self::ClaudeOpus4_5
-            | Self::ClaudeOpus4_5Thinking
-            | Self::ClaudeSonnet4
-            | Self::ClaudeSonnet4Thinking
-            | Self::ClaudeSonnet4_5
-            | Self::ClaudeSonnet4_5Thinking
-            | Self::Claude3_5Haiku
-            | Self::ClaudeHaiku4_5 => true,
-
-            // Amazon Nova models (all support tool use)
-            Self::AmazonNovaPremier
-            | Self::AmazonNovaPro
-            | Self::AmazonNovaLite
-            | Self::AmazonNovaMicro => true,
-
-            // AI21 Jamba 1.5 models support tool use
-            Self::AI21Jamba15LargeV1 | Self::AI21Jamba15MiniV1 => true,
-
-            // Cohere Command R models support tool use
-            Self::CohereCommandRV1 | Self::CohereCommandRPlusV1 => true,
-
-            // All other models don't support tool use
-            // Including Meta Llama 3.2, AI21 Jurassic, and others
-            _ => false,
-        }
-    }
-
-    pub fn supports_caching(&self) -> bool {
-        match self {
-            // Only Claude models on Bedrock support caching
-            // Nova models support only text caching
-            // https://docs.aws.amazon.com/bedrock/latest/userguide/prompt-caching.html#prompt-caching-models
-            Self::Claude3_5Haiku
-            | Self::ClaudeHaiku4_5
-            | Self::Claude3_7Sonnet
-            | Self::Claude3_7SonnetThinking
-            | Self::ClaudeSonnet4
-            | Self::ClaudeSonnet4Thinking
-            | Self::ClaudeSonnet4_5
-            | Self::ClaudeSonnet4_5Thinking
-            | Self::ClaudeOpus4
-            | Self::ClaudeOpus4Thinking
-            | Self::ClaudeOpus4_1
-            | Self::ClaudeOpus4_1Thinking
-            | Self::ClaudeOpus4_5
-            | Self::ClaudeOpus4_5Thinking => true,
-
-            // Custom models - check if they have cache configuration
-            Self::Custom {
-                cache_configuration,
-                ..
-            } => cache_configuration.is_some(),
-
-            // All other models don't support caching
-            _ => false,
-        }
-    }
-
-    pub fn cache_configuration(&self) -> Option<BedrockModelCacheConfiguration> {
-        match self {
-            Self::Claude3_7Sonnet
-            | Self::Claude3_7SonnetThinking
-            | Self::ClaudeSonnet4
-            | Self::ClaudeSonnet4Thinking
-            | Self::ClaudeOpus4
-            | Self::ClaudeOpus4Thinking
-            | Self::ClaudeOpus4_1
-            | Self::ClaudeOpus4_1Thinking
-            | Self::ClaudeOpus4_5
-            | Self::ClaudeOpus4_5Thinking => Some(BedrockModelCacheConfiguration {
-                max_cache_anchors: 4,
-                min_total_token: 1024,
-            }),
-
-            Self::Claude3_5Haiku | Self::ClaudeHaiku4_5 => Some(BedrockModelCacheConfiguration {
-                max_cache_anchors: 4,
-                min_total_token: 2048,
-            }),
-
-            Self::Custom {
-                cache_configuration,
-                ..
-            } => cache_configuration.clone(),
-
-            _ => None,
-        }
-    }
-
-    pub fn mode(&self) -> BedrockModelMode {
-        match self {
-            Model::Claude3_7SonnetThinking => BedrockModelMode::Thinking {
-                budget_tokens: Some(4096),
-            },
-            Model::ClaudeSonnet4Thinking | Model::ClaudeSonnet4_5Thinking => {
-                BedrockModelMode::Thinking {
-                    budget_tokens: Some(4096),
-                }
-            }
-            Model::ClaudeOpus4Thinking
-            | Model::ClaudeOpus4_1Thinking
-            | Model::ClaudeOpus4_5Thinking => BedrockModelMode::Thinking {
-                budget_tokens: Some(4096),
-            },
-            _ => BedrockModelMode::Default,
-        }
-    }
-
-    pub fn cross_region_inference_id(
-        &self,
-        region: &str,
-        allow_global: bool,
-    ) -> anyhow::Result<String> {
-        // List derived from here:
-        // https://docs.aws.amazon.com/bedrock/latest/userguide/inference-profiles-support.html#inference-profiles-support-system
-        let model_id = self.request_id();
-
-        let supports_global = matches!(
-            self,
-            Model::ClaudeOpus4_5
-                | Model::ClaudeOpus4_5Thinking
-                | Model::ClaudeHaiku4_5
-                | Model::ClaudeSonnet4
-                | Model::ClaudeSonnet4Thinking
-                | Model::ClaudeSonnet4_5
-                | Model::ClaudeSonnet4_5Thinking
-        );
-
-        let region_group = if region.starts_with("us-gov-") {
-            "us-gov"
-        } else if region.starts_with("us-")
-            || region.starts_with("ca-")
-            || region.starts_with("sa-")
-        {
-            if allow_global && supports_global {
-                "global"
-            } else {
-                "us"
-            }
-        } else if region.starts_with("eu-") {
-            if allow_global && supports_global {
-                "global"
-            } else {
-                "eu"
-            }
-        } else if region.starts_with("ap-") || region == "me-central-1" || region == "me-south-1" {
-            if allow_global && supports_global {
-                "global"
-            } else {
-                "apac"
-            }
-        } else {
-            anyhow::bail!("Unsupported Region {region}");
-        };
-
-        match (self, region_group, region) {
-            (Model::Custom { .. }, _, _) => Ok(self.request_id().into()),
-
-            (
-                Model::ClaudeOpus4_5
-                | Model::ClaudeOpus4_5Thinking
-                | Model::ClaudeHaiku4_5
-                | Model::ClaudeSonnet4
-                | Model::ClaudeSonnet4Thinking
-                | Model::ClaudeSonnet4_5
-                | Model::ClaudeSonnet4_5Thinking,
-                "global",
-                _,
-            ) => Ok(format!("{}.{}", region_group, model_id)),
-
-            (
-                Model::Claude3Haiku
-                | Model::Claude3_5Sonnet
-                | Model::Claude3_7Sonnet
-                | Model::Claude3_7SonnetThinking
-                | Model::ClaudeSonnet4_5
-                | Model::ClaudeSonnet4_5Thinking,
-                "us-gov",
-                _,
-            ) => Ok(format!("{}.{}", region_group, model_id)),
-
-            (
-                Model::ClaudeHaiku4_5 | Model::ClaudeSonnet4_5 | Model::ClaudeSonnet4_5Thinking,
-                "apac",
-                "ap-southeast-2" | "ap-southeast-4",
-            ) => Ok(format!("au.{}", model_id)),
-
-            (
-                Model::ClaudeHaiku4_5 | Model::ClaudeSonnet4_5 | Model::ClaudeSonnet4_5Thinking,
-                "apac",
-                "ap-northeast-1" | "ap-northeast-3",
-            ) => Ok(format!("jp.{}", model_id)),
-
-            (Model::AmazonNovaLite, "us", r) if r.starts_with("ca-") => {
-                Ok(format!("ca.{}", model_id))
-            }
-
-            (
-                Model::AmazonNovaPremier
-                | Model::AmazonNovaLite
-                | Model::AmazonNovaMicro
-                | Model::AmazonNovaPro
-                | Model::Claude3_5Haiku
-                | Model::ClaudeHaiku4_5
-                | Model::Claude3_5Sonnet
-                | Model::Claude3_5SonnetV2
-                | Model::Claude3_7Sonnet
-                | Model::Claude3_7SonnetThinking
-                | Model::ClaudeSonnet4
-                | Model::ClaudeSonnet4Thinking
-                | Model::ClaudeSonnet4_5
-                | Model::ClaudeSonnet4_5Thinking
-                | Model::ClaudeOpus4
-                | Model::ClaudeOpus4Thinking
-                | Model::ClaudeOpus4_1
-                | Model::ClaudeOpus4_1Thinking
-                | Model::ClaudeOpus4_5
-                | Model::ClaudeOpus4_5Thinking
-                | Model::Claude3Haiku
-                | Model::Claude3Opus
-                | Model::Claude3Sonnet
-                | Model::DeepSeekR1
-                | Model::MetaLlama31405BInstructV1
-                | Model::MetaLlama3170BInstructV1_128k
-                | Model::MetaLlama3170BInstructV1
-                | Model::MetaLlama318BInstructV1_128k
-                | Model::MetaLlama318BInstructV1
-                | Model::MetaLlama3211BInstructV1
-                | Model::MetaLlama321BInstructV1
-                | Model::MetaLlama323BInstructV1
-                | Model::MetaLlama3290BInstructV1
-                | Model::MetaLlama3370BInstructV1
-                | Model::MetaLlama4Maverick17BInstructV1
-                | Model::MetaLlama4Scout17BInstructV1
-                | Model::MistralPixtralLarge2502V1
-                | Model::PalmyraWriterX4
-                | Model::PalmyraWriterX5,
-                "us",
-                _,
-            ) => Ok(format!("{}.{}", region_group, model_id)),
-
-            (
-                Model::AmazonNovaLite
-                | Model::AmazonNovaMicro
-                | Model::AmazonNovaPro
-                | Model::Claude3_5Sonnet
-                | Model::ClaudeHaiku4_5
-                | Model::Claude3_7Sonnet
-                | Model::Claude3_7SonnetThinking
-                | Model::ClaudeSonnet4
-                | Model::ClaudeSonnet4_5
-                | Model::ClaudeSonnet4_5Thinking
-                | Model::Claude3Haiku
-                | Model::Claude3Sonnet
-                | Model::MetaLlama321BInstructV1
-                | Model::MetaLlama323BInstructV1
-                | Model::MistralPixtralLarge2502V1,
-                "eu",
-                _,
-            ) => Ok(format!("{}.{}", region_group, model_id)),
-
-            (
-                Model::AmazonNovaLite
-                | Model::AmazonNovaMicro
-                | Model::AmazonNovaPro
-                | Model::Claude3_5Sonnet
-                | Model::Claude3_5SonnetV2
-                | Model::ClaudeHaiku4_5
-                | Model::Claude3_7Sonnet
-                | Model::Claude3_7SonnetThinking
-                | Model::ClaudeSonnet4
-                | Model::Claude3Haiku
-                | Model::Claude3Sonnet,
-                "apac",
-                _,
-            ) => Ok(format!("{}.{}", region_group, model_id)),
-
-            _ => Ok(model_id.into()),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_us_region_inference_ids() -> anyhow::Result<()> {
-        // Test US regions
-        assert_eq!(
-            Model::Claude3_5SonnetV2.cross_region_inference_id("us-east-1", false)?,
-            "us.anthropic.claude-3-5-sonnet-20241022-v2:0"
-        );
-        assert_eq!(
-            Model::Claude3_5SonnetV2.cross_region_inference_id("us-west-2", false)?,
-            "us.anthropic.claude-3-5-sonnet-20241022-v2:0"
-        );
-        assert_eq!(
-            Model::AmazonNovaPro.cross_region_inference_id("us-east-2", false)?,
-            "us.amazon.nova-pro-v1:0"
-        );
-        Ok(())
-    }
-
-    #[test]
-    fn test_eu_region_inference_ids() -> anyhow::Result<()> {
-        // Test European regions
-        assert_eq!(
-            Model::ClaudeSonnet4.cross_region_inference_id("eu-west-1", false)?,
-            "eu.anthropic.claude-sonnet-4-20250514-v1:0"
-        );
-        assert_eq!(
-            Model::ClaudeSonnet4_5.cross_region_inference_id("eu-west-1", false)?,
-            "eu.anthropic.claude-sonnet-4-5-20250929-v1:0"
-        );
-        assert_eq!(
-            Model::Claude3Sonnet.cross_region_inference_id("eu-west-1", false)?,
-            "eu.anthropic.claude-3-sonnet-20240229-v1:0"
-        );
-        assert_eq!(
-            Model::AmazonNovaMicro.cross_region_inference_id("eu-north-1", false)?,
-            "eu.amazon.nova-micro-v1:0"
-        );
-        Ok(())
-    }
-
-    #[test]
-    fn test_apac_region_inference_ids() -> anyhow::Result<()> {
-        // Test Asia-Pacific regions
-        assert_eq!(
-            Model::Claude3_5SonnetV2.cross_region_inference_id("ap-northeast-1", false)?,
-            "apac.anthropic.claude-3-5-sonnet-20241022-v2:0"
-        );
-        assert_eq!(
-            Model::Claude3_5SonnetV2.cross_region_inference_id("ap-southeast-2", false)?,
-            "apac.anthropic.claude-3-5-sonnet-20241022-v2:0"
-        );
-        assert_eq!(
-            Model::AmazonNovaLite.cross_region_inference_id("ap-south-1", false)?,
-            "apac.amazon.nova-lite-v1:0"
-        );
-        Ok(())
-    }
-
-    #[test]
-    fn test_gov_region_inference_ids() -> anyhow::Result<()> {
-        // Test Government regions
-        assert_eq!(
-            Model::Claude3_5Sonnet.cross_region_inference_id("us-gov-east-1", false)?,
-            "us-gov.anthropic.claude-3-5-sonnet-20240620-v1:0"
-        );
-        assert_eq!(
-            Model::Claude3Haiku.cross_region_inference_id("us-gov-west-1", false)?,
-            "us-gov.anthropic.claude-3-haiku-20240307-v1:0"
-        );
-        Ok(())
-    }
-
-    #[test]
-    fn test_meta_models_inference_ids() -> anyhow::Result<()> {
-        // Test Meta models
-        assert_eq!(
-            Model::MetaLlama370BInstructV1.cross_region_inference_id("us-east-1", false)?,
-            "meta.llama3-70b-instruct-v1:0"
-        );
-        assert_eq!(
-            Model::MetaLlama3170BInstructV1.cross_region_inference_id("us-east-1", false)?,
-            "us.meta.llama3-1-70b-instruct-v1:0"
-        );
-        assert_eq!(
-            Model::MetaLlama321BInstructV1.cross_region_inference_id("eu-west-1", false)?,
-            "eu.meta.llama3-2-1b-instruct-v1:0"
-        );
-        Ok(())
-    }
-
-    #[test]
-    fn test_mistral_models_inference_ids() -> anyhow::Result<()> {
-        // Mistral models don't follow the regional prefix pattern,
-        // so they should return their original IDs
-        assert_eq!(
-            Model::MistralMistralLarge2402V1.cross_region_inference_id("us-east-1", false)?,
-            "mistral.mistral-large-2402-v1:0"
-        );
-        assert_eq!(
-            Model::MistralMixtral8x7BInstructV0.cross_region_inference_id("eu-west-1", false)?,
-            "mistral.mixtral-8x7b-instruct-v0:1"
-        );
-        Ok(())
-    }
-
-    #[test]
-    fn test_ai21_models_inference_ids() -> anyhow::Result<()> {
-        // AI21 models don't follow the regional prefix pattern,
-        // so they should return their original IDs
-        assert_eq!(
-            Model::AI21J2UltraV1.cross_region_inference_id("us-east-1", false)?,
-            "ai21.j2-ultra-v1"
-        );
-        assert_eq!(
-            Model::AI21JambaInstructV1.cross_region_inference_id("eu-west-1", false)?,
-            "ai21.jamba-instruct-v1:0"
-        );
-        Ok(())
-    }
-
-    #[test]
-    fn test_cohere_models_inference_ids() -> anyhow::Result<()> {
-        // Cohere models don't follow the regional prefix pattern,
-        // so they should return their original IDs
-        assert_eq!(
-            Model::CohereCommandRV1.cross_region_inference_id("us-east-1", false)?,
-            "cohere.command-r-v1:0"
-        );
-        assert_eq!(
-            Model::CohereCommandTextV14_4k.cross_region_inference_id("ap-southeast-1", false)?,
-            "cohere.command-text-v14:7:4k"
-        );
-        Ok(())
-    }
-
-    #[test]
-    fn test_custom_model_inference_ids() -> anyhow::Result<()> {
-        // Test custom models
-        let custom_model = Model::Custom {
-            name: "custom.my-model-v1:0".to_string(),
-            max_tokens: 100000,
-            display_name: Some("My Custom Model".to_string()),
-            max_output_tokens: Some(8192),
-            default_temperature: Some(0.7),
-            cache_configuration: None,
-        };
-
-        // Custom model should return its name unchanged
-        assert_eq!(
-            custom_model.cross_region_inference_id("us-east-1", false)?,
-            "custom.my-model-v1:0"
-        );
-
-        // Test that models without global support fall back to regional when allow_global is true
-        assert_eq!(
-            Model::AmazonNovaPro.cross_region_inference_id("us-east-1", true)?,
-            "us.amazon.nova-pro-v1:0",
-            "Nova Pro should fall back to regional profile even when allow_global is true"
-        );
-
-        Ok(())
-    }
-
-    #[test]
-    fn test_friendly_id_vs_request_id() {
-        // Test that id() returns friendly identifiers
-        assert_eq!(Model::Claude3_5SonnetV2.id(), "claude-3-5-sonnet-v2");
-        assert_eq!(Model::AmazonNovaLite.id(), "amazon-nova-lite");
-        assert_eq!(Model::DeepSeekR1.id(), "deepseek-r1");
-        assert_eq!(
-            Model::MetaLlama38BInstructV1.id(),
-            "meta-llama3-8b-instruct-v1"
-        );
-
-        // Test that request_id() returns actual backend model IDs
-        assert_eq!(
-            Model::Claude3_5SonnetV2.request_id(),
-            "anthropic.claude-3-5-sonnet-20241022-v2:0"
-        );
-        assert_eq!(Model::AmazonNovaLite.request_id(), "amazon.nova-lite-v1:0");
-        assert_eq!(Model::DeepSeekR1.request_id(), "deepseek.r1-v1:0");
-        assert_eq!(
-            Model::MetaLlama38BInstructV1.request_id(),
-            "meta.llama3-8b-instruct-v1:0"
-        );
-
-        // Test thinking models have different friendly IDs but same request IDs
-        assert_eq!(Model::ClaudeSonnet4.id(), "claude-sonnet-4");
-        assert_eq!(
-            Model::ClaudeSonnet4Thinking.id(),
-            "claude-sonnet-4-thinking"
-        );
-        assert_eq!(
-            Model::ClaudeSonnet4.request_id(),
-            Model::ClaudeSonnet4Thinking.request_id()
-        );
-    }
-}
-
-#[test]
-fn test_global_inference_ids() -> anyhow::Result<()> {
-    // Test global inference for models that support it when allow_global is true
-    assert_eq!(
-        Model::ClaudeSonnet4.cross_region_inference_id("us-east-1", true)?,
-        "global.anthropic.claude-sonnet-4-20250514-v1:0"
-    );
-    assert_eq!(
-        Model::ClaudeSonnet4_5.cross_region_inference_id("eu-west-1", true)?,
-        "global.anthropic.claude-sonnet-4-5-20250929-v1:0"
-    );
-    assert_eq!(
-        Model::ClaudeHaiku4_5.cross_region_inference_id("ap-south-1", true)?,
-        "global.anthropic.claude-haiku-4-5-20251001-v1:0"
-    );
-
-    // Test that regional prefix is used when allow_global is false
-    assert_eq!(
-        Model::ClaudeSonnet4.cross_region_inference_id("us-east-1", false)?,
-        "us.anthropic.claude-sonnet-4-20250514-v1:0"
-    );
-
-    Ok(())
-}
diff --git a/crates/breadcrumbs/Cargo.toml b/crates/breadcrumbs/Cargo.toml
deleted file mode 100644
index 16d0ff10e1..0000000000
--- a/crates/breadcrumbs/Cargo.toml
+++ /dev/null
@@ -1,28 +0,0 @@
-[package]
-name = "breadcrumbs"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/breadcrumbs.rs"
-doctest = false
-
-[dependencies]
-editor.workspace = true
-gpui.workspace = true
-itertools.workspace = true
-settings.workspace = true
-theme.workspace = true
-ui.workspace = true
-workspace.workspace = true
-zed_actions.workspace = true
-
-[dev-dependencies]
-editor = { workspace = true, features = ["test-support"] }
-gpui = { workspace = true, features = ["test-support"] }
-workspace = { workspace = true, features = ["test-support"] }
diff --git a/crates/breadcrumbs/LICENSE-GPL b/crates/breadcrumbs/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/breadcrumbs/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/breadcrumbs/src/breadcrumbs.rs b/crates/breadcrumbs/src/breadcrumbs.rs
deleted file mode 100644
index 00c1c0939b..0000000000
--- a/crates/breadcrumbs/src/breadcrumbs.rs
+++ /dev/null
@@ -1,244 +0,0 @@
-use editor::Editor;
-use gpui::{
-    Context, Element, EventEmitter, Focusable, FontWeight, IntoElement, ParentElement, Render,
-    StyledText, Subscription, Window,
-};
-use itertools::Itertools;
-use settings::Settings;
-use std::cmp;
-use theme::ActiveTheme;
-use ui::{ButtonLike, ButtonStyle, Label, Tooltip, prelude::*};
-use workspace::{
-    TabBarSettings, ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView,
-    item::{BreadcrumbText, ItemEvent, ItemHandle},
-};
-
-pub struct Breadcrumbs {
-    pane_focused: bool,
-    active_item: Option<Box<dyn ItemHandle>>,
-    subscription: Option<Subscription>,
-}
-
-impl Default for Breadcrumbs {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl Breadcrumbs {
-    pub fn new() -> Self {
-        Self {
-            pane_focused: false,
-            active_item: Default::default(),
-            subscription: Default::default(),
-        }
-    }
-}
-
-impl EventEmitter<ToolbarItemEvent> for Breadcrumbs {}
-
-impl Render for Breadcrumbs {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        const MAX_SEGMENTS: usize = 12;
-
-        let element = h_flex()
-            .id("breadcrumb-container")
-            .flex_grow()
-            .overflow_x_scroll()
-            .text_ui(cx);
-
-        let Some(active_item) = self.active_item.as_ref() else {
-            return element;
-        };
-
-        let Some(mut segments) = active_item.breadcrumbs(cx.theme(), cx) else {
-            return element;
-        };
-
-        let prefix_end_ix = cmp::min(segments.len(), MAX_SEGMENTS / 2);
-        let suffix_start_ix = cmp::max(
-            prefix_end_ix,
-            segments.len().saturating_sub(MAX_SEGMENTS / 2),
-        );
-
-        if suffix_start_ix > prefix_end_ix {
-            segments.splice(
-                prefix_end_ix..suffix_start_ix,
-                Some(BreadcrumbText {
-                    text: "⋯".into(),
-                    highlights: None,
-                    font: None,
-                }),
-            );
-        }
-
-        let highlighted_segments = segments.into_iter().enumerate().map(|(index, segment)| {
-            let mut text_style = window.text_style();
-            if let Some(ref font) = segment.font {
-                text_style.font_family = font.family.clone();
-                text_style.font_features = font.features.clone();
-                text_style.font_style = font.style;
-                text_style.font_weight = font.weight;
-            }
-            text_style.color = Color::Muted.color(cx);
-
-            if index == 0
-                && !TabBarSettings::get_global(cx).show
-                && active_item.is_dirty(cx)
-                && let Some(styled_element) = apply_dirty_filename_style(&segment, &text_style, cx)
-            {
-                return styled_element;
-            }
-
-            StyledText::new(segment.text.replace('\n', "⏎"))
-                .with_default_highlights(&text_style, segment.highlights.unwrap_or_default())
-                .into_any()
-        });
-        let breadcrumbs = Itertools::intersperse_with(highlighted_segments, || {
-            Label::new("›").color(Color::Placeholder).into_any_element()
-        });
-
-        let breadcrumbs_stack = h_flex().gap_1().children(breadcrumbs);
-
-        let prefix_element = active_item.breadcrumb_prefix(window, cx);
-
-        let breadcrumbs = if let Some(prefix) = prefix_element {
-            h_flex().gap_1p5().child(prefix).child(breadcrumbs_stack)
-        } else {
-            breadcrumbs_stack
-        };
-
-        match active_item
-            .downcast::<Editor>()
-            .map(|editor| editor.downgrade())
-        {
-            Some(editor) => element.child(
-                ButtonLike::new("toggle outline view")
-                    .child(breadcrumbs)
-                    .style(ButtonStyle::Transparent)
-                    .on_click({
-                        let editor = editor.clone();
-                        move |_, window, cx| {
-                            if let Some((editor, callback)) = editor
-                                .upgrade()
-                                .zip(zed_actions::outline::TOGGLE_OUTLINE.get())
-                            {
-                                callback(editor.to_any_view(), window, cx);
-                            }
-                        }
-                    })
-                    .tooltip(move |_window, cx| {
-                        if let Some(editor) = editor.upgrade() {
-                            let focus_handle = editor.read(cx).focus_handle(cx);
-                            Tooltip::for_action_in(
-                                "Show Symbol Outline",
-                                &zed_actions::outline::ToggleOutline,
-                                &focus_handle,
-                                cx,
-                            )
-                        } else {
-                            Tooltip::for_action(
-                                "Show Symbol Outline",
-                                &zed_actions::outline::ToggleOutline,
-                                cx,
-                            )
-                        }
-                    }),
-            ),
-            None => element
-                // Match the height and padding of the `ButtonLike` in the other arm.
-                .h(rems_from_px(22.))
-                .pl_1()
-                .child(breadcrumbs),
-        }
-    }
-}
-
-impl ToolbarItemView for Breadcrumbs {
-    fn set_active_pane_item(
-        &mut self,
-        active_pane_item: Option<&dyn ItemHandle>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> ToolbarItemLocation {
-        cx.notify();
-        self.active_item = None;
-
-        let Some(item) = active_pane_item else {
-            return ToolbarItemLocation::Hidden;
-        };
-
-        let this = cx.entity().downgrade();
-        self.subscription = Some(item.subscribe_to_item_events(
-            window,
-            cx,
-            Box::new(move |event, _, cx| {
-                if let ItemEvent::UpdateBreadcrumbs = event {
-                    this.update(cx, |this, cx| {
-                        cx.notify();
-                        if let Some(active_item) = this.active_item.as_ref() {
-                            cx.emit(ToolbarItemEvent::ChangeLocation(
-                                active_item.breadcrumb_location(cx),
-                            ))
-                        }
-                    })
-                    .ok();
-                }
-            }),
-        ));
-        self.active_item = Some(item.boxed_clone());
-        item.breadcrumb_location(cx)
-    }
-
-    fn pane_focus_update(
-        &mut self,
-        pane_focused: bool,
-        _window: &mut Window,
-        _: &mut Context<Self>,
-    ) {
-        self.pane_focused = pane_focused;
-    }
-}
-
-fn apply_dirty_filename_style(
-    segment: &BreadcrumbText,
-    text_style: &gpui::TextStyle,
-    cx: &mut Context<Breadcrumbs>,
-) -> Option<gpui::AnyElement> {
-    let text = segment.text.replace('\n', "⏎");
-
-    let filename_position = std::path::Path::new(&segment.text)
-        .file_name()
-        .and_then(|f| {
-            let filename_str = f.to_string_lossy();
-            segment.text.rfind(filename_str.as_ref())
-        })?;
-
-    let bold_weight = FontWeight::BOLD;
-    let default_color = Color::Default.color(cx);
-
-    if filename_position == 0 {
-        let mut filename_style = text_style.clone();
-        filename_style.font_weight = bold_weight;
-        filename_style.color = default_color;
-
-        return Some(
-            StyledText::new(text)
-                .with_default_highlights(&filename_style, [])
-                .into_any(),
-        );
-    }
-
-    let highlight_style = gpui::HighlightStyle {
-        font_weight: Some(bold_weight),
-        color: Some(default_color),
-        ..Default::default()
-    };
-
-    let highlight = vec![(filename_position..text.len(), highlight_style)];
-    Some(
-        StyledText::new(text)
-            .with_default_highlights(text_style, highlight)
-            .into_any(),
-    )
-}
diff --git a/crates/buffer_diff/Cargo.toml b/crates/buffer_diff/Cargo.toml
deleted file mode 100644
index 6249ae418c..0000000000
--- a/crates/buffer_diff/Cargo.toml
+++ /dev/null
@@ -1,40 +0,0 @@
-[package]
-name = "buffer_diff"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/buffer_diff.rs"
-
-[features]
-test-support = ["settings"]
-
-[dependencies]
-anyhow.workspace = true
-clock.workspace = true
-futures.workspace = true
-git2.workspace = true
-gpui.workspace = true
-language.workspace = true
-log.workspace = true
-pretty_assertions.workspace = true
-rope.workspace = true
-settings = { workspace = true, optional = true }
-sum_tree.workspace = true
-text.workspace = true
-util.workspace = true
-
-[dev-dependencies]
-ctor.workspace = true
-gpui = { workspace = true, features = ["test-support"] }
-rand.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-text = { workspace = true, features = ["test-support"] }
-unindent.workspace = true
-zlog.workspace = true
diff --git a/crates/buffer_diff/LICENSE-GPL b/crates/buffer_diff/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/buffer_diff/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/buffer_diff/src/buffer_diff.rs b/crates/buffer_diff/src/buffer_diff.rs
deleted file mode 100644
index 55de3f968b..0000000000
--- a/crates/buffer_diff/src/buffer_diff.rs
+++ /dev/null
@@ -1,2479 +0,0 @@
-use futures::channel::oneshot;
-use git2::{DiffLineType as GitDiffLineType, DiffOptions as GitOptions, Patch as GitPatch};
-use gpui::{App, AppContext as _, AsyncApp, Context, Entity, EventEmitter, Task, TaskLabel};
-use language::{
-    BufferRow, DiffOptions, File, Language, LanguageName, LanguageRegistry,
-    language_settings::language_settings, word_diff_ranges,
-};
-use rope::Rope;
-use std::{
-    cmp::Ordering,
-    future::Future,
-    iter,
-    ops::Range,
-    sync::{Arc, LazyLock},
-};
-use sum_tree::SumTree;
-use text::{Anchor, Bias, BufferId, OffsetRangeExt, Point, ToOffset as _, ToPoint as _};
-use util::ResultExt;
-
-pub static CALCULATE_DIFF_TASK: LazyLock<TaskLabel> = LazyLock::new(TaskLabel::new);
-pub const MAX_WORD_DIFF_LINE_COUNT: usize = 5;
-
-pub struct BufferDiff {
-    pub buffer_id: BufferId,
-    inner: BufferDiffInner,
-    // diff of the index vs head
-    secondary_diff: Option<Entity<BufferDiff>>,
-}
-
-#[derive(Clone, Debug)]
-pub struct BufferDiffSnapshot {
-    inner: BufferDiffInner,
-    secondary_diff: Option<Box<BufferDiffSnapshot>>,
-}
-
-#[derive(Clone)]
-struct BufferDiffInner {
-    hunks: SumTree<InternalDiffHunk>,
-    // Used for making staging mo
-    pending_hunks: SumTree<PendingHunk>,
-    base_text: language::BufferSnapshot,
-    base_text_exists: bool,
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct DiffHunkStatus {
-    pub kind: DiffHunkStatusKind,
-    pub secondary: DiffHunkSecondaryStatus,
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub enum DiffHunkStatusKind {
-    Added,
-    Modified,
-    Deleted,
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-/// Diff of Working Copy vs Index
-/// aka 'is this hunk staged or not'
-pub enum DiffHunkSecondaryStatus {
-    /// Unstaged
-    HasSecondaryHunk,
-    /// Partially staged
-    OverlapsWithSecondaryHunk,
-    /// Staged
-    NoSecondaryHunk,
-    /// We are unstaging
-    SecondaryHunkAdditionPending,
-    /// We are stagind
-    SecondaryHunkRemovalPending,
-}
-
-/// A diff hunk resolved to rows in the buffer.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct DiffHunk {
-    /// The buffer range as points.
-    pub range: Range<Point>,
-    /// The range in the buffer to which this hunk corresponds.
-    pub buffer_range: Range<Anchor>,
-    /// The range in the buffer's diff base text to which this hunk corresponds.
-    pub diff_base_byte_range: Range<usize>,
-    pub secondary_status: DiffHunkSecondaryStatus,
-    // Anchors representing the word diff locations in the active buffer
-    pub buffer_word_diffs: Vec<Range<Anchor>>,
-    // Offsets relative to the start of the deleted diff that represent word diff locations
-    pub base_word_diffs: Vec<Range<usize>>,
-}
-
-/// We store [`InternalDiffHunk`]s internally so we don't need to store the additional row range.
-#[derive(Debug, Clone, PartialEq, Eq)]
-struct InternalDiffHunk {
-    buffer_range: Range<Anchor>,
-    diff_base_byte_range: Range<usize>,
-    base_word_diffs: Vec<Range<usize>>,
-    buffer_word_diffs: Vec<Range<Anchor>>,
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-struct PendingHunk {
-    buffer_range: Range<Anchor>,
-    diff_base_byte_range: Range<usize>,
-    buffer_version: clock::Global,
-    new_status: DiffHunkSecondaryStatus,
-}
-
-#[derive(Debug, Clone)]
-pub struct DiffHunkSummary {
-    buffer_range: Range<Anchor>,
-    diff_base_byte_range: Range<usize>,
-}
-
-impl sum_tree::Item for InternalDiffHunk {
-    type Summary = DiffHunkSummary;
-
-    fn summary(&self, _cx: &text::BufferSnapshot) -> Self::Summary {
-        DiffHunkSummary {
-            buffer_range: self.buffer_range.clone(),
-            diff_base_byte_range: self.diff_base_byte_range.clone(),
-        }
-    }
-}
-
-impl sum_tree::Item for PendingHunk {
-    type Summary = DiffHunkSummary;
-
-    fn summary(&self, _cx: &text::BufferSnapshot) -> Self::Summary {
-        DiffHunkSummary {
-            buffer_range: self.buffer_range.clone(),
-            diff_base_byte_range: self.diff_base_byte_range.clone(),
-        }
-    }
-}
-
-impl sum_tree::Summary for DiffHunkSummary {
-    type Context<'a> = &'a text::BufferSnapshot;
-
-    fn zero(_cx: Self::Context<'_>) -> Self {
-        DiffHunkSummary {
-            buffer_range: Anchor::MIN..Anchor::MIN,
-            diff_base_byte_range: 0..0,
-        }
-    }
-
-    fn add_summary(&mut self, other: &Self, buffer: Self::Context<'_>) {
-        self.buffer_range.start = *self
-            .buffer_range
-            .start
-            .min(&other.buffer_range.start, buffer);
-        self.buffer_range.end = *self.buffer_range.end.max(&other.buffer_range.end, buffer);
-
-        self.diff_base_byte_range.start = self
-            .diff_base_byte_range
-            .start
-            .min(other.diff_base_byte_range.start);
-        self.diff_base_byte_range.end = self
-            .diff_base_byte_range
-            .end
-            .max(other.diff_base_byte_range.end);
-    }
-}
-
-impl sum_tree::SeekTarget<'_, DiffHunkSummary, DiffHunkSummary> for Anchor {
-    fn cmp(&self, cursor_location: &DiffHunkSummary, buffer: &text::BufferSnapshot) -> Ordering {
-        if self
-            .cmp(&cursor_location.buffer_range.start, buffer)
-            .is_lt()
-        {
-            Ordering::Less
-        } else if self.cmp(&cursor_location.buffer_range.end, buffer).is_gt() {
-            Ordering::Greater
-        } else {
-            Ordering::Equal
-        }
-    }
-}
-
-impl std::fmt::Debug for BufferDiffInner {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("BufferDiffSnapshot")
-            .field("hunks", &self.hunks)
-            .field("remote_id", &self.base_text.remote_id())
-            .finish()
-    }
-}
-
-impl BufferDiffSnapshot {
-    pub fn buffer_diff_id(&self) -> BufferId {
-        self.inner.base_text.remote_id()
-    }
-
-    fn empty(buffer: &text::BufferSnapshot, cx: &mut App) -> BufferDiffSnapshot {
-        BufferDiffSnapshot {
-            inner: BufferDiffInner {
-                base_text: language::Buffer::build_empty_snapshot(cx),
-                hunks: SumTree::new(buffer),
-                pending_hunks: SumTree::new(buffer),
-                base_text_exists: false,
-            },
-            secondary_diff: None,
-        }
-    }
-
-    fn unchanged(
-        buffer: &text::BufferSnapshot,
-        base_text: language::BufferSnapshot,
-    ) -> BufferDiffSnapshot {
-        debug_assert_eq!(buffer.text(), base_text.text());
-        BufferDiffSnapshot {
-            inner: BufferDiffInner {
-                base_text,
-                hunks: SumTree::new(buffer),
-                pending_hunks: SumTree::new(buffer),
-                base_text_exists: false,
-            },
-            secondary_diff: None,
-        }
-    }
-
-    fn new_with_base_text(
-        buffer: text::BufferSnapshot,
-        base_text: Option<Arc<String>>,
-        language: Option<Arc<Language>>,
-        language_registry: Option<Arc<LanguageRegistry>>,
-        cx: &mut App,
-    ) -> impl Future<Output = Self> + use<> {
-        let base_text_pair;
-        let base_text_exists;
-        let base_text_snapshot;
-        let diff_options = build_diff_options(
-            None,
-            language.as_ref().map(|l| l.name()),
-            language.as_ref().map(|l| l.default_scope()),
-            cx,
-        );
-
-        if let Some(text) = &base_text {
-            let base_text_rope = Rope::from(text.as_str());
-            base_text_pair = Some((text.clone(), base_text_rope.clone()));
-            let snapshot =
-                language::Buffer::build_snapshot(base_text_rope, language, language_registry, cx);
-            base_text_snapshot = cx.background_spawn(snapshot);
-            base_text_exists = true;
-        } else {
-            base_text_pair = None;
-            base_text_snapshot = Task::ready(language::Buffer::build_empty_snapshot(cx));
-            base_text_exists = false;
-        };
-
-        let hunks = cx
-            .background_executor()
-            .spawn_labeled(*CALCULATE_DIFF_TASK, {
-                let buffer = buffer.clone();
-                async move { compute_hunks(base_text_pair, buffer, diff_options) }
-            });
-
-        async move {
-            let (base_text, hunks) = futures::join!(base_text_snapshot, hunks);
-            Self {
-                inner: BufferDiffInner {
-                    base_text,
-                    hunks,
-                    base_text_exists,
-                    pending_hunks: SumTree::new(&buffer),
-                },
-                secondary_diff: None,
-            }
-        }
-    }
-
-    pub fn new_with_base_buffer(
-        buffer: text::BufferSnapshot,
-        base_text: Option<Arc<String>>,
-        base_text_snapshot: language::BufferSnapshot,
-        cx: &App,
-    ) -> impl Future<Output = Self> + use<> {
-        let diff_options = build_diff_options(
-            base_text_snapshot.file(),
-            base_text_snapshot.language().map(|l| l.name()),
-            base_text_snapshot.language().map(|l| l.default_scope()),
-            cx,
-        );
-        let base_text_exists = base_text.is_some();
-        let base_text_pair = base_text.map(|text| {
-            debug_assert_eq!(&*text, &base_text_snapshot.text());
-            (text, base_text_snapshot.as_rope().clone())
-        });
-        cx.background_executor()
-            .spawn_labeled(*CALCULATE_DIFF_TASK, async move {
-                Self {
-                    inner: BufferDiffInner {
-                        base_text: base_text_snapshot,
-                        pending_hunks: SumTree::new(&buffer),
-                        hunks: compute_hunks(base_text_pair, buffer, diff_options),
-                        base_text_exists,
-                    },
-                    secondary_diff: None,
-                }
-            })
-    }
-
-    #[cfg(test)]
-    fn new_sync(
-        buffer: text::BufferSnapshot,
-        diff_base: String,
-        cx: &mut gpui::TestAppContext,
-    ) -> BufferDiffSnapshot {
-        cx.executor().block(cx.update(|cx| {
-            Self::new_with_base_text(buffer, Some(Arc::new(diff_base)), None, None, cx)
-        }))
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.inner.hunks.is_empty()
-    }
-
-    pub fn secondary_diff(&self) -> Option<&BufferDiffSnapshot> {
-        self.secondary_diff.as_deref()
-    }
-
-    pub fn hunks_intersecting_range<'a>(
-        &'a self,
-        range: Range<Anchor>,
-        buffer: &'a text::BufferSnapshot,
-    ) -> impl 'a + Iterator<Item = DiffHunk> {
-        let unstaged_counterpart = self.secondary_diff.as_ref().map(|diff| &diff.inner);
-        self.inner
-            .hunks_intersecting_range(range, buffer, unstaged_counterpart)
-    }
-
-    pub fn hunks_intersecting_range_rev<'a>(
-        &'a self,
-        range: Range<Anchor>,
-        buffer: &'a text::BufferSnapshot,
-    ) -> impl 'a + Iterator<Item = DiffHunk> {
-        self.inner.hunks_intersecting_range_rev(range, buffer)
-    }
-
-    pub fn base_text(&self) -> &language::BufferSnapshot {
-        &self.inner.base_text
-    }
-
-    pub fn base_texts_eq(&self, other: &Self) -> bool {
-        if self.inner.base_text_exists != other.inner.base_text_exists {
-            return false;
-        }
-        let left = &self.inner.base_text;
-        let right = &other.inner.base_text;
-        let (old_id, old_empty) = (left.remote_id(), left.is_empty());
-        let (new_id, new_empty) = (right.remote_id(), right.is_empty());
-        new_id == old_id || (new_empty && old_empty)
-    }
-
-    pub fn row_to_base_text_row(&self, row: BufferRow, buffer: &text::BufferSnapshot) -> u32 {
-        // TODO(split-diff) expose a parameter to reuse a cursor to avoid repeatedly seeking from the start
-
-        // Find the last hunk that starts before this position.
-        let mut cursor = self.inner.hunks.cursor::<DiffHunkSummary>(buffer);
-        let position = buffer.anchor_before(Point::new(row, 0));
-        cursor.seek(&position, Bias::Left);
-        if cursor
-            .item()
-            .is_none_or(|hunk| hunk.buffer_range.start.cmp(&position, buffer).is_gt())
-        {
-            cursor.prev();
-        }
-
-        let unclipped_point = if let Some(hunk) = cursor.item()
-            && hunk.buffer_range.start.cmp(&position, buffer).is_le()
-        {
-            let mut unclipped_point = cursor
-                .end()
-                .diff_base_byte_range
-                .end
-                .to_point(self.base_text());
-            if position.cmp(&cursor.end().buffer_range.end, buffer).is_ge() {
-                unclipped_point +=
-                    Point::new(row, 0) - cursor.end().buffer_range.end.to_point(buffer);
-            }
-            // Move the cursor so that at the next step we can clip with the start of the next hunk.
-            cursor.next();
-            unclipped_point
-        } else {
-            // Position is before the added region for the first hunk.
-            debug_assert!(self.inner.hunks.first().is_none_or(|first_hunk| {
-                position.cmp(&first_hunk.buffer_range.start, buffer).is_le()
-            }));
-            Point::new(row, 0)
-        };
-
-        let max_point = if let Some(next_hunk) = cursor.item() {
-            next_hunk
-                .diff_base_byte_range
-                .start
-                .to_point(self.base_text())
-        } else {
-            self.base_text().max_point()
-        };
-        unclipped_point.min(max_point).row
-    }
-}
-
-impl BufferDiffInner {
-    /// Returns the new index text and new pending hunks.
-    fn stage_or_unstage_hunks_impl(
-        &mut self,
-        unstaged_diff: &Self,
-        stage: bool,
-        hunks: &[DiffHunk],
-        buffer: &text::BufferSnapshot,
-        file_exists: bool,
-    ) -> Option<Rope> {
-        let head_text = self
-            .base_text_exists
-            .then(|| self.base_text.as_rope().clone());
-        let index_text = unstaged_diff
-            .base_text_exists
-            .then(|| unstaged_diff.base_text.as_rope().clone());
-
-        // If the file doesn't exist in either HEAD or the index, then the
-        // entire file must be either created or deleted in the index.
-        let (index_text, head_text) = match (index_text, head_text) {
-            (Some(index_text), Some(head_text)) if file_exists || !stage => (index_text, head_text),
-            (index_text, head_text) => {
-                let (new_index_text, new_status) = if stage {
-                    log::debug!("stage all");
-                    (
-                        file_exists.then(|| buffer.as_rope().clone()),
-                        DiffHunkSecondaryStatus::SecondaryHunkRemovalPending,
-                    )
-                } else {
-                    log::debug!("unstage all");
-                    (
-                        head_text,
-                        DiffHunkSecondaryStatus::SecondaryHunkAdditionPending,
-                    )
-                };
-
-                let hunk = PendingHunk {
-                    buffer_range: Anchor::min_max_range_for_buffer(buffer.remote_id()),
-                    diff_base_byte_range: 0..index_text.map_or(0, |rope| rope.len()),
-                    buffer_version: buffer.version().clone(),
-                    new_status,
-                };
-                self.pending_hunks = SumTree::from_item(hunk, buffer);
-                return new_index_text;
-            }
-        };
-
-        let mut pending_hunks = SumTree::new(buffer);
-        let mut old_pending_hunks = self.pending_hunks.cursor::<DiffHunkSummary>(buffer);
-
-        // first, merge new hunks into pending_hunks
-        for DiffHunk {
-            buffer_range,
-            diff_base_byte_range,
-            secondary_status,
-            ..
-        } in hunks.iter().cloned()
-        {
-            let preceding_pending_hunks = old_pending_hunks.slice(&buffer_range.start, Bias::Left);
-            pending_hunks.append(preceding_pending_hunks, buffer);
-
-            // Skip all overlapping or adjacent old pending hunks
-            while old_pending_hunks.item().is_some_and(|old_hunk| {
-                old_hunk
-                    .buffer_range
-                    .start
-                    .cmp(&buffer_range.end, buffer)
-                    .is_le()
-            }) {
-                old_pending_hunks.next();
-            }
-
-            if (stage && secondary_status == DiffHunkSecondaryStatus::NoSecondaryHunk)
-                || (!stage && secondary_status == DiffHunkSecondaryStatus::HasSecondaryHunk)
-            {
-                continue;
-            }
-
-            pending_hunks.push(
-                PendingHunk {
-                    buffer_range,
-                    diff_base_byte_range,
-                    buffer_version: buffer.version().clone(),
-                    new_status: if stage {
-                        DiffHunkSecondaryStatus::SecondaryHunkRemovalPending
-                    } else {
-                        DiffHunkSecondaryStatus::SecondaryHunkAdditionPending
-                    },
-                },
-                buffer,
-            );
-        }
-        // append the remainder
-        pending_hunks.append(old_pending_hunks.suffix(), buffer);
-
-        let mut unstaged_hunk_cursor = unstaged_diff.hunks.cursor::<DiffHunkSummary>(buffer);
-        unstaged_hunk_cursor.next();
-
-        // then, iterate over all pending hunks (both new ones and the existing ones) and compute the edits
-        let mut prev_unstaged_hunk_buffer_end = 0;
-        let mut prev_unstaged_hunk_base_text_end = 0;
-        let mut edits = Vec::<(Range<usize>, String)>::new();
-        let mut pending_hunks_iter = pending_hunks.iter().cloned().peekable();
-        while let Some(PendingHunk {
-            buffer_range,
-            diff_base_byte_range,
-            new_status,
-            ..
-        }) = pending_hunks_iter.next()
-        {
-            // Advance unstaged_hunk_cursor to skip unstaged hunks before current hunk
-            let skipped_unstaged = unstaged_hunk_cursor.slice(&buffer_range.start, Bias::Left);
-
-            if let Some(unstaged_hunk) = skipped_unstaged.last() {
-                prev_unstaged_hunk_base_text_end = unstaged_hunk.diff_base_byte_range.end;
-                prev_unstaged_hunk_buffer_end = unstaged_hunk.buffer_range.end.to_offset(buffer);
-            }
-
-            // Find where this hunk is in the index if it doesn't overlap
-            let mut buffer_offset_range = buffer_range.to_offset(buffer);
-            let start_overshoot = buffer_offset_range.start - prev_unstaged_hunk_buffer_end;
-            let mut index_start = prev_unstaged_hunk_base_text_end + start_overshoot;
-
-            loop {
-                // Merge this hunk with any overlapping unstaged hunks.
-                if let Some(unstaged_hunk) = unstaged_hunk_cursor.item() {
-                    let unstaged_hunk_offset_range = unstaged_hunk.buffer_range.to_offset(buffer);
-                    if unstaged_hunk_offset_range.start <= buffer_offset_range.end {
-                        prev_unstaged_hunk_base_text_end = unstaged_hunk.diff_base_byte_range.end;
-                        prev_unstaged_hunk_buffer_end = unstaged_hunk_offset_range.end;
-
-                        index_start = index_start.min(unstaged_hunk.diff_base_byte_range.start);
-                        buffer_offset_range.start = buffer_offset_range
-                            .start
-                            .min(unstaged_hunk_offset_range.start);
-                        buffer_offset_range.end =
-                            buffer_offset_range.end.max(unstaged_hunk_offset_range.end);
-
-                        unstaged_hunk_cursor.next();
-                        continue;
-                    }
-                }
-
-                // If any unstaged hunks were merged, then subsequent pending hunks may
-                // now overlap this hunk. Merge them.
-                if let Some(next_pending_hunk) = pending_hunks_iter.peek() {
-                    let next_pending_hunk_offset_range =
-                        next_pending_hunk.buffer_range.to_offset(buffer);
-                    if next_pending_hunk_offset_range.start <= buffer_offset_range.end {
-                        buffer_offset_range.end = next_pending_hunk_offset_range.end;
-                        pending_hunks_iter.next();
-                        continue;
-                    }
-                }
-
-                break;
-            }
-
-            let end_overshoot = buffer_offset_range
-                .end
-                .saturating_sub(prev_unstaged_hunk_buffer_end);
-            let index_end = prev_unstaged_hunk_base_text_end + end_overshoot;
-            let index_byte_range = index_start..index_end;
-
-            let replacement_text = match new_status {
-                DiffHunkSecondaryStatus::SecondaryHunkRemovalPending => {
-                    log::debug!("staging hunk {:?}", buffer_offset_range);
-                    buffer
-                        .text_for_range(buffer_offset_range)
-                        .collect::<String>()
-                }
-                DiffHunkSecondaryStatus::SecondaryHunkAdditionPending => {
-                    log::debug!("unstaging hunk {:?}", buffer_offset_range);
-                    head_text
-                        .chunks_in_range(diff_base_byte_range.clone())
-                        .collect::<String>()
-                }
-                _ => {
-                    debug_assert!(false);
-                    continue;
-                }
-            };
-
-            edits.push((index_byte_range, replacement_text));
-        }
-        drop(pending_hunks_iter);
-        drop(old_pending_hunks);
-        self.pending_hunks = pending_hunks;
-
-        #[cfg(debug_assertions)] // invariants: non-overlapping and sorted
-        {
-            for window in edits.windows(2) {
-                let (range_a, range_b) = (&window[0].0, &window[1].0);
-                debug_assert!(range_a.end < range_b.start);
-            }
-        }
-
-        let mut new_index_text = Rope::new();
-        let mut index_cursor = index_text.cursor(0);
-
-        for (old_range, replacement_text) in edits {
-            new_index_text.append(index_cursor.slice(old_range.start));
-            index_cursor.seek_forward(old_range.end);
-            new_index_text.push(&replacement_text);
-        }
-        new_index_text.append(index_cursor.suffix());
-        Some(new_index_text)
-    }
-
-    fn hunks_intersecting_range<'a>(
-        &'a self,
-        range: Range<Anchor>,
-        buffer: &'a text::BufferSnapshot,
-        secondary: Option<&'a Self>,
-    ) -> impl 'a + Iterator<Item = DiffHunk> {
-        let range = range.to_offset(buffer);
-
-        let mut cursor = self
-            .hunks
-            .filter::<_, DiffHunkSummary>(buffer, move |summary| {
-                let summary_range = summary.buffer_range.to_offset(buffer);
-                let before_start = summary_range.end < range.start;
-                let after_end = summary_range.start > range.end;
-                !before_start && !after_end
-            });
-
-        let anchor_iter = iter::from_fn(move || {
-            cursor.next();
-            cursor.item()
-        })
-        .flat_map(move |hunk| {
-            [
-                (
-                    &hunk.buffer_range.start,
-                    (
-                        hunk.buffer_range.start,
-                        hunk.diff_base_byte_range.start,
-                        hunk,
-                    ),
-                ),
-                (
-                    &hunk.buffer_range.end,
-                    (hunk.buffer_range.end, hunk.diff_base_byte_range.end, hunk),
-                ),
-            ]
-        });
-
-        let mut pending_hunks_cursor = self.pending_hunks.cursor::<DiffHunkSummary>(buffer);
-        pending_hunks_cursor.next();
-
-        let mut secondary_cursor = None;
-        if let Some(secondary) = secondary.as_ref() {
-            let mut cursor = secondary.hunks.cursor::<DiffHunkSummary>(buffer);
-            cursor.next();
-            secondary_cursor = Some(cursor);
-        }
-
-        let max_point = buffer.max_point();
-        let mut summaries = buffer.summaries_for_anchors_with_payload::<Point, _, _>(anchor_iter);
-        iter::from_fn(move || {
-            loop {
-                let (start_point, (start_anchor, start_base, hunk)) = summaries.next()?;
-                let (mut end_point, (mut end_anchor, end_base, _)) = summaries.next()?;
-
-                let base_word_diffs = hunk.base_word_diffs.clone();
-                let buffer_word_diffs = hunk.buffer_word_diffs.clone();
-
-                if !start_anchor.is_valid(buffer) {
-                    continue;
-                }
-
-                if end_point.column > 0 && end_point < max_point {
-                    end_point.row += 1;
-                    end_point.column = 0;
-                    end_anchor = buffer.anchor_before(end_point);
-                }
-
-                let mut secondary_status = DiffHunkSecondaryStatus::NoSecondaryHunk;
-
-                let mut has_pending = false;
-                if start_anchor
-                    .cmp(&pending_hunks_cursor.start().buffer_range.start, buffer)
-                    .is_gt()
-                {
-                    pending_hunks_cursor.seek_forward(&start_anchor, Bias::Left);
-                }
-
-                if let Some(pending_hunk) = pending_hunks_cursor.item() {
-                    let mut pending_range = pending_hunk.buffer_range.to_point(buffer);
-                    if pending_range.end.column > 0 {
-                        pending_range.end.row += 1;
-                        pending_range.end.column = 0;
-                    }
-
-                    if pending_range == (start_point..end_point)
-                        && !buffer.has_edits_since_in_range(
-                            &pending_hunk.buffer_version,
-                            start_anchor..end_anchor,
-                        )
-                    {
-                        has_pending = true;
-                        secondary_status = pending_hunk.new_status;
-                    }
-                }
-
-                if let (Some(secondary_cursor), false) = (secondary_cursor.as_mut(), has_pending) {
-                    if start_anchor
-                        .cmp(&secondary_cursor.start().buffer_range.start, buffer)
-                        .is_gt()
-                    {
-                        secondary_cursor.seek_forward(&start_anchor, Bias::Left);
-                    }
-
-                    if let Some(secondary_hunk) = secondary_cursor.item() {
-                        let mut secondary_range = secondary_hunk.buffer_range.to_point(buffer);
-                        if secondary_range.end.column > 0 {
-                            secondary_range.end.row += 1;
-                            secondary_range.end.column = 0;
-                        }
-                        if secondary_range.is_empty()
-                            && secondary_hunk.diff_base_byte_range.is_empty()
-                        {
-                            // ignore
-                        } else if secondary_range == (start_point..end_point) {
-                            secondary_status = DiffHunkSecondaryStatus::HasSecondaryHunk;
-                        } else if secondary_range.start <= end_point {
-                            secondary_status = DiffHunkSecondaryStatus::OverlapsWithSecondaryHunk;
-                        }
-                    }
-                }
-
-                return Some(DiffHunk {
-                    range: start_point..end_point,
-                    diff_base_byte_range: start_base..end_base,
-                    buffer_range: start_anchor..end_anchor,
-                    base_word_diffs,
-                    buffer_word_diffs,
-                    secondary_status,
-                });
-            }
-        })
-    }
-
-    fn hunks_intersecting_range_rev<'a>(
-        &'a self,
-        range: Range<Anchor>,
-        buffer: &'a text::BufferSnapshot,
-    ) -> impl 'a + Iterator<Item = DiffHunk> {
-        let mut cursor = self
-            .hunks
-            .filter::<_, DiffHunkSummary>(buffer, move |summary| {
-                let before_start = summary.buffer_range.end.cmp(&range.start, buffer).is_lt();
-                let after_end = summary.buffer_range.start.cmp(&range.end, buffer).is_gt();
-                !before_start && !after_end
-            });
-
-        iter::from_fn(move || {
-            cursor.prev();
-
-            let hunk = cursor.item()?;
-            let range = hunk.buffer_range.to_point(buffer);
-
-            Some(DiffHunk {
-                range,
-                diff_base_byte_range: hunk.diff_base_byte_range.clone(),
-                buffer_range: hunk.buffer_range.clone(),
-                // The secondary status is not used by callers of this method.
-                secondary_status: DiffHunkSecondaryStatus::NoSecondaryHunk,
-                base_word_diffs: hunk.base_word_diffs.clone(),
-                buffer_word_diffs: hunk.buffer_word_diffs.clone(),
-            })
-        })
-    }
-
-    fn compare(&self, old: &Self, new_snapshot: &text::BufferSnapshot) -> Option<Range<Anchor>> {
-        let mut new_cursor = self.hunks.cursor::<()>(new_snapshot);
-        let mut old_cursor = old.hunks.cursor::<()>(new_snapshot);
-        old_cursor.next();
-        new_cursor.next();
-        let mut start = None;
-        let mut end = None;
-
-        loop {
-            match (new_cursor.item(), old_cursor.item()) {
-                (Some(new_hunk), Some(old_hunk)) => {
-                    match new_hunk
-                        .buffer_range
-                        .start
-                        .cmp(&old_hunk.buffer_range.start, new_snapshot)
-                    {
-                        Ordering::Less => {
-                            start.get_or_insert(new_hunk.buffer_range.start);
-                            end.replace(new_hunk.buffer_range.end);
-                            new_cursor.next();
-                        }
-                        Ordering::Equal => {
-                            if new_hunk != old_hunk {
-                                start.get_or_insert(new_hunk.buffer_range.start);
-                                if old_hunk
-                                    .buffer_range
-                                    .end
-                                    .cmp(&new_hunk.buffer_range.end, new_snapshot)
-                                    .is_ge()
-                                {
-                                    end.replace(old_hunk.buffer_range.end);
-                                } else {
-                                    end.replace(new_hunk.buffer_range.end);
-                                }
-                            }
-
-                            new_cursor.next();
-                            old_cursor.next();
-                        }
-                        Ordering::Greater => {
-                            start.get_or_insert(old_hunk.buffer_range.start);
-                            end.replace(old_hunk.buffer_range.end);
-                            old_cursor.next();
-                        }
-                    }
-                }
-                (Some(new_hunk), None) => {
-                    start.get_or_insert(new_hunk.buffer_range.start);
-                    end.replace(new_hunk.buffer_range.end);
-                    new_cursor.next();
-                }
-                (None, Some(old_hunk)) => {
-                    start.get_or_insert(old_hunk.buffer_range.start);
-                    end.replace(old_hunk.buffer_range.end);
-                    old_cursor.next();
-                }
-                (None, None) => break,
-            }
-        }
-
-        start.zip(end).map(|(start, end)| start..end)
-    }
-}
-
-fn build_diff_options(
-    file: Option<&Arc<dyn File>>,
-    language: Option<LanguageName>,
-    language_scope: Option<language::LanguageScope>,
-    cx: &App,
-) -> Option<DiffOptions> {
-    #[cfg(any(test, feature = "test-support"))]
-    {
-        if !cx.has_global::<settings::SettingsStore>() {
-            return Some(DiffOptions {
-                language_scope,
-                max_word_diff_line_count: MAX_WORD_DIFF_LINE_COUNT,
-                ..Default::default()
-            });
-        }
-    }
-
-    language_settings(language, file, cx)
-        .word_diff_enabled
-        .then_some(DiffOptions {
-            language_scope,
-            max_word_diff_line_count: MAX_WORD_DIFF_LINE_COUNT,
-            ..Default::default()
-        })
-}
-
-fn compute_hunks(
-    diff_base: Option<(Arc<String>, Rope)>,
-    buffer: text::BufferSnapshot,
-    diff_options: Option<DiffOptions>,
-) -> SumTree<InternalDiffHunk> {
-    let mut tree = SumTree::new(&buffer);
-
-    if let Some((diff_base, diff_base_rope)) = diff_base {
-        let buffer_text = buffer.as_rope().to_string();
-
-        let mut options = GitOptions::default();
-        options.context_lines(0);
-        let patch = GitPatch::from_buffers(
-            diff_base.as_bytes(),
-            None,
-            buffer_text.as_bytes(),
-            None,
-            Some(&mut options),
-        )
-        .log_err();
-
-        // A common case in Zed is that the empty buffer is represented as just a newline,
-        // but if we just compute a naive diff you get a "preserved" line in the middle,
-        // which is a bit odd.
-        if buffer_text == "\n" && diff_base.ends_with("\n") && diff_base.len() > 1 {
-            tree.push(
-                InternalDiffHunk {
-                    buffer_range: buffer.anchor_before(0)..buffer.anchor_before(0),
-                    diff_base_byte_range: 0..diff_base.len() - 1,
-                    base_word_diffs: Vec::default(),
-                    buffer_word_diffs: Vec::default(),
-                },
-                &buffer,
-            );
-            return tree;
-        }
-
-        if let Some(patch) = patch {
-            let mut divergence = 0;
-            for hunk_index in 0..patch.num_hunks() {
-                let hunk = process_patch_hunk(
-                    &patch,
-                    hunk_index,
-                    &diff_base_rope,
-                    &buffer,
-                    &mut divergence,
-                    diff_options.as_ref(),
-                );
-                tree.push(hunk, &buffer);
-            }
-        }
-    } else {
-        tree.push(
-            InternalDiffHunk {
-                buffer_range: Anchor::min_max_range_for_buffer(buffer.remote_id()),
-                diff_base_byte_range: 0..0,
-                base_word_diffs: Vec::default(),
-                buffer_word_diffs: Vec::default(),
-            },
-            &buffer,
-        );
-    }
-
-    tree
-}
-
-fn process_patch_hunk(
-    patch: &GitPatch<'_>,
-    hunk_index: usize,
-    diff_base: &Rope,
-    buffer: &text::BufferSnapshot,
-    buffer_row_divergence: &mut i64,
-    diff_options: Option<&DiffOptions>,
-) -> InternalDiffHunk {
-    let line_item_count = patch.num_lines_in_hunk(hunk_index).unwrap();
-    assert!(line_item_count > 0);
-
-    let mut first_deletion_buffer_row: Option<u32> = None;
-    let mut buffer_row_range: Option<Range<u32>> = None;
-    let mut diff_base_byte_range: Option<Range<usize>> = None;
-    let mut first_addition_old_row: Option<u32> = None;
-
-    for line_index in 0..line_item_count {
-        let line = patch.line_in_hunk(hunk_index, line_index).unwrap();
-        let kind = line.origin_value();
-        let content_offset = line.content_offset() as isize;
-        let content_len = line.content().len() as isize;
-        match kind {
-            GitDiffLineType::Addition => {
-                if first_addition_old_row.is_none() {
-                    first_addition_old_row = Some(
-                        (line.new_lineno().unwrap() as i64 - *buffer_row_divergence - 1) as u32,
-                    );
-                }
-                *buffer_row_divergence += 1;
-                let row = line.new_lineno().unwrap().saturating_sub(1);
-
-                match &mut buffer_row_range {
-                    Some(Range { end, .. }) => *end = row + 1,
-                    None => buffer_row_range = Some(row..row + 1),
-                }
-            }
-            GitDiffLineType::Deletion => {
-                let end = content_offset + content_len;
-
-                match &mut diff_base_byte_range {
-                    Some(head_byte_range) => head_byte_range.end = end as usize,
-                    None => diff_base_byte_range = Some(content_offset as usize..end as usize),
-                }
-
-                if first_deletion_buffer_row.is_none() {
-                    let old_row = line.old_lineno().unwrap().saturating_sub(1);
-                    let row = old_row as i64 + *buffer_row_divergence;
-                    first_deletion_buffer_row = Some(row as u32);
-                }
-
-                *buffer_row_divergence -= 1;
-            }
-            _ => {}
-        }
-    }
-
-    let buffer_row_range = buffer_row_range.unwrap_or_else(|| {
-        // Pure deletion hunk without addition.
-        let row = first_deletion_buffer_row.unwrap();
-        row..row
-    });
-    let diff_base_byte_range = diff_base_byte_range.unwrap_or_else(|| {
-        // Pure addition hunk without deletion.
-        let row = first_addition_old_row.unwrap();
-        let offset = diff_base.point_to_offset(Point::new(row, 0));
-        offset..offset
-    });
-
-    let start = Point::new(buffer_row_range.start, 0);
-    let end = Point::new(buffer_row_range.end, 0);
-    let buffer_range = buffer.anchor_before(start)..buffer.anchor_before(end);
-
-    let base_line_count = line_item_count.saturating_sub(buffer_row_range.len());
-
-    let (base_word_diffs, buffer_word_diffs) = if let Some(diff_options) = diff_options
-        && !buffer_row_range.is_empty()
-        && base_line_count == buffer_row_range.len()
-        && diff_options.max_word_diff_line_count >= base_line_count
-    {
-        let base_text: String = diff_base
-            .chunks_in_range(diff_base_byte_range.clone())
-            .collect();
-
-        let buffer_text: String = buffer.text_for_range(buffer_range.clone()).collect();
-
-        let (base_word_diffs, buffer_word_diffs_relative) = word_diff_ranges(
-            &base_text,
-            &buffer_text,
-            DiffOptions {
-                language_scope: diff_options.language_scope.clone(),
-                ..*diff_options
-            },
-        );
-
-        let buffer_start_offset = buffer_range.start.to_offset(buffer);
-        let buffer_word_diffs = buffer_word_diffs_relative
-            .into_iter()
-            .map(|range| {
-                let start = buffer.anchor_after(buffer_start_offset + range.start);
-                let end = buffer.anchor_after(buffer_start_offset + range.end);
-                start..end
-            })
-            .collect();
-
-        (base_word_diffs, buffer_word_diffs)
-    } else {
-        (Vec::default(), Vec::default())
-    };
-
-    InternalDiffHunk {
-        buffer_range,
-        diff_base_byte_range,
-        base_word_diffs,
-        buffer_word_diffs,
-    }
-}
-
-impl std::fmt::Debug for BufferDiff {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("BufferChangeSet")
-            .field("buffer_id", &self.buffer_id)
-            .field("snapshot", &self.inner)
-            .finish()
-    }
-}
-
-#[derive(Clone, Debug)]
-pub enum BufferDiffEvent {
-    DiffChanged {
-        changed_range: Option<Range<text::Anchor>>,
-    },
-    LanguageChanged,
-    HunksStagedOrUnstaged(Option<Rope>),
-}
-
-impl EventEmitter<BufferDiffEvent> for BufferDiff {}
-
-impl BufferDiff {
-    pub fn new(buffer: &text::BufferSnapshot, cx: &mut App) -> Self {
-        BufferDiff {
-            buffer_id: buffer.remote_id(),
-            inner: BufferDiffSnapshot::empty(buffer, cx).inner,
-            secondary_diff: None,
-        }
-    }
-
-    pub fn new_unchanged(
-        buffer: &text::BufferSnapshot,
-        base_text: language::BufferSnapshot,
-    ) -> Self {
-        debug_assert_eq!(buffer.text(), base_text.text());
-        BufferDiff {
-            buffer_id: buffer.remote_id(),
-            inner: BufferDiffSnapshot::unchanged(buffer, base_text).inner,
-            secondary_diff: None,
-        }
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn new_with_base_text(
-        base_text: &str,
-        buffer: &Entity<language::Buffer>,
-        cx: &mut App,
-    ) -> Self {
-        let mut base_text = base_text.to_owned();
-        text::LineEnding::normalize(&mut base_text);
-        let snapshot = BufferDiffSnapshot::new_with_base_text(
-            buffer.read(cx).text_snapshot(),
-            Some(base_text.into()),
-            None,
-            None,
-            cx,
-        );
-        let snapshot = cx.background_executor().block(snapshot);
-        Self {
-            buffer_id: buffer.read(cx).remote_id(),
-            inner: snapshot.inner,
-            secondary_diff: None,
-        }
-    }
-
-    pub fn set_secondary_diff(&mut self, diff: Entity<BufferDiff>) {
-        self.secondary_diff = Some(diff);
-    }
-
-    pub fn secondary_diff(&self) -> Option<Entity<BufferDiff>> {
-        self.secondary_diff.clone()
-    }
-
-    pub fn clear_pending_hunks(&mut self, cx: &mut Context<Self>) {
-        if self.secondary_diff.is_some() {
-            self.inner.pending_hunks = SumTree::from_summary(DiffHunkSummary {
-                buffer_range: Anchor::min_min_range_for_buffer(self.buffer_id),
-                diff_base_byte_range: 0..0,
-            });
-            cx.emit(BufferDiffEvent::DiffChanged {
-                changed_range: Some(Anchor::min_max_range_for_buffer(self.buffer_id)),
-            });
-        }
-    }
-
-    pub fn stage_or_unstage_hunks(
-        &mut self,
-        stage: bool,
-        hunks: &[DiffHunk],
-        buffer: &text::BufferSnapshot,
-        file_exists: bool,
-        cx: &mut Context<Self>,
-    ) -> Option<Rope> {
-        let new_index_text = self.inner.stage_or_unstage_hunks_impl(
-            &self.secondary_diff.as_ref()?.read(cx).inner,
-            stage,
-            hunks,
-            buffer,
-            file_exists,
-        );
-
-        cx.emit(BufferDiffEvent::HunksStagedOrUnstaged(
-            new_index_text.clone(),
-        ));
-        if let Some((first, last)) = hunks.first().zip(hunks.last()) {
-            let changed_range = first.buffer_range.start..last.buffer_range.end;
-            cx.emit(BufferDiffEvent::DiffChanged {
-                changed_range: Some(changed_range),
-            });
-        }
-        new_index_text
-    }
-
-    pub fn range_to_hunk_range(
-        &self,
-        range: Range<Anchor>,
-        buffer: &text::BufferSnapshot,
-        cx: &App,
-    ) -> Option<Range<Anchor>> {
-        let start = self
-            .hunks_intersecting_range(range.clone(), buffer, cx)
-            .next()?
-            .buffer_range
-            .start;
-        let end = self
-            .hunks_intersecting_range_rev(range, buffer)
-            .next()?
-            .buffer_range
-            .end;
-        Some(start..end)
-    }
-
-    pub async fn update_diff(
-        this: Entity<BufferDiff>,
-        buffer: text::BufferSnapshot,
-        base_text: Option<Arc<String>>,
-        base_text_changed: bool,
-        language_changed: bool,
-        language: Option<Arc<Language>>,
-        language_registry: Option<Arc<LanguageRegistry>>,
-        cx: &mut AsyncApp,
-    ) -> anyhow::Result<BufferDiffSnapshot> {
-        Ok(if base_text_changed || language_changed {
-            cx.update(|cx| {
-                BufferDiffSnapshot::new_with_base_text(
-                    buffer.clone(),
-                    base_text,
-                    language.clone(),
-                    language_registry.clone(),
-                    cx,
-                )
-            })?
-            .await
-        } else {
-            this.read_with(cx, |this, cx| {
-                BufferDiffSnapshot::new_with_base_buffer(
-                    buffer.clone(),
-                    base_text,
-                    this.base_text().clone(),
-                    cx,
-                )
-            })?
-            .await
-        })
-    }
-
-    pub fn language_changed(&mut self, cx: &mut Context<Self>) {
-        cx.emit(BufferDiffEvent::LanguageChanged);
-    }
-
-    pub fn set_snapshot(
-        &mut self,
-        new_snapshot: BufferDiffSnapshot,
-        buffer: &text::BufferSnapshot,
-        cx: &mut Context<Self>,
-    ) -> Option<Range<Anchor>> {
-        self.set_snapshot_with_secondary(new_snapshot, buffer, None, false, cx)
-    }
-
-    pub fn set_snapshot_with_secondary(
-        &mut self,
-        new_snapshot: BufferDiffSnapshot,
-        buffer: &text::BufferSnapshot,
-        secondary_diff_change: Option<Range<Anchor>>,
-        clear_pending_hunks: bool,
-        cx: &mut Context<Self>,
-    ) -> Option<Range<Anchor>> {
-        log::debug!("set snapshot with secondary {secondary_diff_change:?}");
-
-        let state = &mut self.inner;
-        let new_state = new_snapshot.inner;
-        let (base_text_changed, mut changed_range) =
-            match (state.base_text_exists, new_state.base_text_exists) {
-                (false, false) => (true, None),
-                (true, true)
-                    if state.base_text.remote_id() == new_state.base_text.remote_id()
-                        && state.base_text.syntax_update_count()
-                            == new_state.base_text.syntax_update_count() =>
-                {
-                    (false, new_state.compare(state, buffer))
-                }
-                _ => (
-                    true,
-                    Some(text::Anchor::min_max_range_for_buffer(self.buffer_id)),
-                ),
-            };
-
-        if let Some(secondary_changed_range) = secondary_diff_change
-            && let Some(secondary_hunk_range) =
-                self.range_to_hunk_range(secondary_changed_range, buffer, cx)
-        {
-            if let Some(range) = &mut changed_range {
-                range.start = *secondary_hunk_range.start.min(&range.start, buffer);
-                range.end = *secondary_hunk_range.end.max(&range.end, buffer);
-            } else {
-                changed_range = Some(secondary_hunk_range);
-            }
-        }
-
-        let state = &mut self.inner;
-        state.base_text_exists = new_state.base_text_exists;
-        state.base_text = new_state.base_text;
-        state.hunks = new_state.hunks;
-        if base_text_changed || clear_pending_hunks {
-            if let Some((first, last)) = state.pending_hunks.first().zip(state.pending_hunks.last())
-            {
-                if let Some(range) = &mut changed_range {
-                    range.start = *range.start.min(&first.buffer_range.start, buffer);
-                    range.end = *range.end.max(&last.buffer_range.end, buffer);
-                } else {
-                    changed_range = Some(first.buffer_range.start..last.buffer_range.end);
-                }
-            }
-            state.pending_hunks = SumTree::new(buffer);
-        }
-
-        cx.emit(BufferDiffEvent::DiffChanged {
-            changed_range: changed_range.clone(),
-        });
-        changed_range
-    }
-
-    pub fn base_text(&self) -> &language::BufferSnapshot {
-        &self.inner.base_text
-    }
-
-    pub fn base_text_exists(&self) -> bool {
-        self.inner.base_text_exists
-    }
-
-    pub fn snapshot(&self, cx: &App) -> BufferDiffSnapshot {
-        BufferDiffSnapshot {
-            inner: self.inner.clone(),
-            secondary_diff: self
-                .secondary_diff
-                .as_ref()
-                .map(|diff| Box::new(diff.read(cx).snapshot(cx))),
-        }
-    }
-
-    pub fn hunks<'a>(
-        &'a self,
-        buffer_snapshot: &'a text::BufferSnapshot,
-        cx: &'a App,
-    ) -> impl 'a + Iterator<Item = DiffHunk> {
-        self.hunks_intersecting_range(
-            Anchor::min_max_range_for_buffer(buffer_snapshot.remote_id()),
-            buffer_snapshot,
-            cx,
-        )
-    }
-
-    pub fn hunks_intersecting_range<'a>(
-        &'a self,
-        range: Range<text::Anchor>,
-        buffer_snapshot: &'a text::BufferSnapshot,
-        cx: &'a App,
-    ) -> impl 'a + Iterator<Item = DiffHunk> {
-        let unstaged_counterpart = self
-            .secondary_diff
-            .as_ref()
-            .map(|diff| &diff.read(cx).inner);
-        self.inner
-            .hunks_intersecting_range(range, buffer_snapshot, unstaged_counterpart)
-    }
-
-    pub fn hunks_intersecting_range_rev<'a>(
-        &'a self,
-        range: Range<text::Anchor>,
-        buffer_snapshot: &'a text::BufferSnapshot,
-    ) -> impl 'a + Iterator<Item = DiffHunk> {
-        self.inner
-            .hunks_intersecting_range_rev(range, buffer_snapshot)
-    }
-
-    pub fn hunks_in_row_range<'a>(
-        &'a self,
-        range: Range<u32>,
-        buffer: &'a text::BufferSnapshot,
-        cx: &'a App,
-    ) -> impl 'a + Iterator<Item = DiffHunk> {
-        let start = buffer.anchor_before(Point::new(range.start, 0));
-        let end = buffer.anchor_after(Point::new(range.end, 0));
-        self.hunks_intersecting_range(start..end, buffer, cx)
-    }
-
-    /// Used in cases where the change set isn't derived from git.
-    pub fn set_base_text(
-        &mut self,
-        base_text: Option<Arc<String>>,
-        language: Option<Arc<Language>>,
-        language_registry: Option<Arc<LanguageRegistry>>,
-        buffer: text::BufferSnapshot,
-        cx: &mut Context<Self>,
-    ) -> oneshot::Receiver<()> {
-        let (tx, rx) = oneshot::channel();
-        let this = cx.weak_entity();
-
-        let snapshot = BufferDiffSnapshot::new_with_base_text(
-            buffer.clone(),
-            base_text,
-            language,
-            language_registry,
-            cx,
-        );
-        let complete_on_drop = util::defer(|| {
-            tx.send(()).ok();
-        });
-        cx.spawn(async move |_, cx| {
-            let snapshot = snapshot.await;
-            let Some(this) = this.upgrade() else {
-                return;
-            };
-            this.update(cx, |this, cx| {
-                this.set_snapshot(snapshot, &buffer, cx);
-            })
-            .log_err();
-            drop(complete_on_drop)
-        })
-        .detach();
-        rx
-    }
-
-    pub fn base_text_string(&self) -> Option<String> {
-        self.inner
-            .base_text_exists
-            .then(|| self.inner.base_text.text())
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn recalculate_diff_sync(&mut self, buffer: text::BufferSnapshot, cx: &mut Context<Self>) {
-        let base_text = self.base_text_string().map(Arc::new);
-        let snapshot = BufferDiffSnapshot::new_with_base_buffer(
-            buffer.clone(),
-            base_text,
-            self.inner.base_text.clone(),
-            cx,
-        );
-        let snapshot = cx.background_executor().block(snapshot);
-        self.set_snapshot(snapshot, &buffer, cx);
-    }
-}
-
-impl DiffHunk {
-    pub fn is_created_file(&self) -> bool {
-        self.diff_base_byte_range == (0..0)
-            && self.buffer_range.start.is_min()
-            && self.buffer_range.end.is_max()
-    }
-
-    pub fn status(&self) -> DiffHunkStatus {
-        let kind = if self.buffer_range.start == self.buffer_range.end {
-            DiffHunkStatusKind::Deleted
-        } else if self.diff_base_byte_range.is_empty() {
-            DiffHunkStatusKind::Added
-        } else {
-            DiffHunkStatusKind::Modified
-        };
-        DiffHunkStatus {
-            kind,
-            secondary: self.secondary_status,
-        }
-    }
-}
-
-impl DiffHunkStatus {
-    pub fn has_secondary_hunk(&self) -> bool {
-        matches!(
-            self.secondary,
-            DiffHunkSecondaryStatus::HasSecondaryHunk
-                | DiffHunkSecondaryStatus::SecondaryHunkAdditionPending
-                | DiffHunkSecondaryStatus::OverlapsWithSecondaryHunk
-        )
-    }
-
-    pub fn is_pending(&self) -> bool {
-        matches!(
-            self.secondary,
-            DiffHunkSecondaryStatus::SecondaryHunkAdditionPending
-                | DiffHunkSecondaryStatus::SecondaryHunkRemovalPending
-        )
-    }
-
-    pub fn is_deleted(&self) -> bool {
-        self.kind == DiffHunkStatusKind::Deleted
-    }
-
-    pub fn is_added(&self) -> bool {
-        self.kind == DiffHunkStatusKind::Added
-    }
-
-    pub fn is_modified(&self) -> bool {
-        self.kind == DiffHunkStatusKind::Modified
-    }
-
-    pub fn added(secondary: DiffHunkSecondaryStatus) -> Self {
-        Self {
-            kind: DiffHunkStatusKind::Added,
-            secondary,
-        }
-    }
-
-    pub fn modified(secondary: DiffHunkSecondaryStatus) -> Self {
-        Self {
-            kind: DiffHunkStatusKind::Modified,
-            secondary,
-        }
-    }
-
-    pub fn deleted(secondary: DiffHunkSecondaryStatus) -> Self {
-        Self {
-            kind: DiffHunkStatusKind::Deleted,
-            secondary,
-        }
-    }
-
-    pub fn deleted_none() -> Self {
-        Self {
-            kind: DiffHunkStatusKind::Deleted,
-            secondary: DiffHunkSecondaryStatus::NoSecondaryHunk,
-        }
-    }
-
-    pub fn added_none() -> Self {
-        Self {
-            kind: DiffHunkStatusKind::Added,
-            secondary: DiffHunkSecondaryStatus::NoSecondaryHunk,
-        }
-    }
-
-    pub fn modified_none() -> Self {
-        Self {
-            kind: DiffHunkStatusKind::Modified,
-            secondary: DiffHunkSecondaryStatus::NoSecondaryHunk,
-        }
-    }
-}
-
-#[cfg(any(test, feature = "test-support"))]
-#[track_caller]
-pub fn assert_hunks<ExpectedText, HunkIter>(
-    diff_hunks: HunkIter,
-    buffer: &text::BufferSnapshot,
-    diff_base: &str,
-    // Line range, deleted, added, status
-    expected_hunks: &[(Range<u32>, ExpectedText, ExpectedText, DiffHunkStatus)],
-) where
-    HunkIter: Iterator<Item = DiffHunk>,
-    ExpectedText: AsRef<str>,
-{
-    let actual_hunks = diff_hunks
-        .map(|hunk| {
-            (
-                hunk.range.clone(),
-                &diff_base[hunk.diff_base_byte_range.clone()],
-                buffer
-                    .text_for_range(hunk.range.clone())
-                    .collect::<String>(),
-                hunk.status(),
-            )
-        })
-        .collect::<Vec<_>>();
-
-    let expected_hunks: Vec<_> = expected_hunks
-        .iter()
-        .map(|(line_range, deleted_text, added_text, status)| {
-            (
-                Point::new(line_range.start, 0)..Point::new(line_range.end, 0),
-                deleted_text.as_ref(),
-                added_text.as_ref().to_string(),
-                *status,
-            )
-        })
-        .collect();
-
-    pretty_assertions::assert_eq!(actual_hunks, expected_hunks);
-}
-
-#[cfg(test)]
-mod tests {
-    use std::fmt::Write as _;
-
-    use super::*;
-    use gpui::TestAppContext;
-    use pretty_assertions::{assert_eq, assert_ne};
-    use rand::{Rng as _, rngs::StdRng};
-    use text::{Buffer, BufferId, ReplicaId, Rope};
-    use unindent::Unindent as _;
-    use util::test::marked_text_ranges;
-
-    #[ctor::ctor]
-    fn init_logger() {
-        zlog::init_test();
-    }
-
-    #[gpui::test]
-    async fn test_buffer_diff_simple(cx: &mut gpui::TestAppContext) {
-        let diff_base = "
-            one
-            two
-            three
-        "
-        .unindent();
-
-        let buffer_text = "
-            one
-            HELLO
-            three
-        "
-        .unindent();
-
-        let mut buffer = Buffer::new(ReplicaId::LOCAL, BufferId::new(1).unwrap(), buffer_text);
-        let mut diff = BufferDiffSnapshot::new_sync(buffer.clone(), diff_base.clone(), cx);
-        assert_hunks(
-            diff.hunks_intersecting_range(
-                Anchor::min_max_range_for_buffer(buffer.remote_id()),
-                &buffer,
-            ),
-            &buffer,
-            &diff_base,
-            &[(1..2, "two\n", "HELLO\n", DiffHunkStatus::modified_none())],
-        );
-
-        buffer.edit([(0..0, "point five\n")]);
-        diff = BufferDiffSnapshot::new_sync(buffer.clone(), diff_base.clone(), cx);
-        assert_hunks(
-            diff.hunks_intersecting_range(
-                Anchor::min_max_range_for_buffer(buffer.remote_id()),
-                &buffer,
-            ),
-            &buffer,
-            &diff_base,
-            &[
-                (0..1, "", "point five\n", DiffHunkStatus::added_none()),
-                (2..3, "two\n", "HELLO\n", DiffHunkStatus::modified_none()),
-            ],
-        );
-
-        diff = cx.update(|cx| BufferDiffSnapshot::empty(&buffer, cx));
-        assert_hunks::<&str, _>(
-            diff.hunks_intersecting_range(
-                Anchor::min_max_range_for_buffer(buffer.remote_id()),
-                &buffer,
-            ),
-            &buffer,
-            &diff_base,
-            &[],
-        );
-    }
-
-    #[gpui::test]
-    async fn test_buffer_diff_with_secondary(cx: &mut gpui::TestAppContext) {
-        let head_text = "
-            zero
-            one
-            two
-            three
-            four
-            five
-            six
-            seven
-            eight
-            nine
-        "
-        .unindent();
-
-        let index_text = "
-            zero
-            one
-            TWO
-            three
-            FOUR
-            five
-            six
-            seven
-            eight
-            NINE
-        "
-        .unindent();
-
-        let buffer_text = "
-            zero
-            one
-            TWO
-            three
-            FOUR
-            FIVE
-            six
-            SEVEN
-            eight
-            nine
-        "
-        .unindent();
-
-        let buffer = Buffer::new(ReplicaId::LOCAL, BufferId::new(1).unwrap(), buffer_text);
-        let unstaged_diff = BufferDiffSnapshot::new_sync(buffer.clone(), index_text, cx);
-        let mut uncommitted_diff =
-            BufferDiffSnapshot::new_sync(buffer.clone(), head_text.clone(), cx);
-        uncommitted_diff.secondary_diff = Some(Box::new(unstaged_diff));
-
-        let expected_hunks = vec![
-            (2..3, "two\n", "TWO\n", DiffHunkStatus::modified_none()),
-            (
-                4..6,
-                "four\nfive\n",
-                "FOUR\nFIVE\n",
-                DiffHunkStatus::modified(DiffHunkSecondaryStatus::OverlapsWithSecondaryHunk),
-            ),
-            (
-                7..8,
-                "seven\n",
-                "SEVEN\n",
-                DiffHunkStatus::modified(DiffHunkSecondaryStatus::HasSecondaryHunk),
-            ),
-        ];
-
-        assert_hunks(
-            uncommitted_diff.hunks_intersecting_range(
-                Anchor::min_max_range_for_buffer(buffer.remote_id()),
-                &buffer,
-            ),
-            &buffer,
-            &head_text,
-            &expected_hunks,
-        );
-    }
-
-    #[gpui::test]
-    async fn test_buffer_diff_range(cx: &mut TestAppContext) {
-        let diff_base = Arc::new(
-            "
-            one
-            two
-            three
-            four
-            five
-            six
-            seven
-            eight
-            nine
-            ten
-        "
-            .unindent(),
-        );
-
-        let buffer_text = "
-            A
-            one
-            B
-            two
-            C
-            three
-            HELLO
-            four
-            five
-            SIXTEEN
-            seven
-            eight
-            WORLD
-            nine
-
-            ten
-
-        "
-        .unindent();
-
-        let buffer = Buffer::new(ReplicaId::LOCAL, BufferId::new(1).unwrap(), buffer_text);
-        let diff = cx
-            .update(|cx| {
-                BufferDiffSnapshot::new_with_base_text(
-                    buffer.snapshot(),
-                    Some(diff_base.clone()),
-                    None,
-                    None,
-                    cx,
-                )
-            })
-            .await;
-        assert_eq!(
-            diff.hunks_intersecting_range(
-                Anchor::min_max_range_for_buffer(buffer.remote_id()),
-                &buffer
-            )
-            .count(),
-            8
-        );
-
-        assert_hunks(
-            diff.hunks_intersecting_range(
-                buffer.anchor_before(Point::new(7, 0))..buffer.anchor_before(Point::new(12, 0)),
-                &buffer,
-            ),
-            &buffer,
-            &diff_base,
-            &[
-                (6..7, "", "HELLO\n", DiffHunkStatus::added_none()),
-                (9..10, "six\n", "SIXTEEN\n", DiffHunkStatus::modified_none()),
-                (12..13, "", "WORLD\n", DiffHunkStatus::added_none()),
-            ],
-        );
-    }
-
-    #[gpui::test]
-    async fn test_stage_hunk(cx: &mut TestAppContext) {
-        struct Example {
-            name: &'static str,
-            head_text: String,
-            index_text: String,
-            buffer_marked_text: String,
-            final_index_text: String,
-        }
-
-        let table = [
-            Example {
-                name: "uncommitted hunk straddles end of unstaged hunk",
-                head_text: "
-                    one
-                    two
-                    three
-                    four
-                    five
-                "
-                .unindent(),
-                index_text: "
-                    one
-                    TWO_HUNDRED
-                    three
-                    FOUR_HUNDRED
-                    five
-                "
-                .unindent(),
-                buffer_marked_text: "
-                    ZERO
-                    one
-                    two
-                    «THREE_HUNDRED
-                    FOUR_HUNDRED»
-                    five
-                    SIX
-                "
-                .unindent(),
-                final_index_text: "
-                    one
-                    two
-                    THREE_HUNDRED
-                    FOUR_HUNDRED
-                    five
-                "
-                .unindent(),
-            },
-            Example {
-                name: "uncommitted hunk straddles start of unstaged hunk",
-                head_text: "
-                    one
-                    two
-                    three
-                    four
-                    five
-                "
-                .unindent(),
-                index_text: "
-                    one
-                    TWO_HUNDRED
-                    three
-                    FOUR_HUNDRED
-                    five
-                "
-                .unindent(),
-                buffer_marked_text: "
-                    ZERO
-                    one
-                    «TWO_HUNDRED
-                    THREE_HUNDRED»
-                    four
-                    five
-                    SIX
-                "
-                .unindent(),
-                final_index_text: "
-                    one
-                    TWO_HUNDRED
-                    THREE_HUNDRED
-                    four
-                    five
-                "
-                .unindent(),
-            },
-            Example {
-                name: "uncommitted hunk strictly contains unstaged hunks",
-                head_text: "
-                    one
-                    two
-                    three
-                    four
-                    five
-                    six
-                    seven
-                "
-                .unindent(),
-                index_text: "
-                    one
-                    TWO
-                    THREE
-                    FOUR
-                    FIVE
-                    SIX
-                    seven
-                "
-                .unindent(),
-                buffer_marked_text: "
-                    one
-                    TWO
-                    «THREE_HUNDRED
-                    FOUR
-                    FIVE_HUNDRED»
-                    SIX
-                    seven
-                "
-                .unindent(),
-                final_index_text: "
-                    one
-                    TWO
-                    THREE_HUNDRED
-                    FOUR
-                    FIVE_HUNDRED
-                    SIX
-                    seven
-                "
-                .unindent(),
-            },
-            Example {
-                name: "uncommitted deletion hunk",
-                head_text: "
-                    one
-                    two
-                    three
-                    four
-                    five
-                "
-                .unindent(),
-                index_text: "
-                    one
-                    two
-                    three
-                    four
-                    five
-                "
-                .unindent(),
-                buffer_marked_text: "
-                    one
-                    ˇfive
-                "
-                .unindent(),
-                final_index_text: "
-                    one
-                    five
-                "
-                .unindent(),
-            },
-            Example {
-                name: "one unstaged hunk that contains two uncommitted hunks",
-                head_text: "
-                    one
-                    two
-
-                    three
-                    four
-                "
-                .unindent(),
-                index_text: "
-                    one
-                    two
-                    three
-                    four
-                "
-                .unindent(),
-                buffer_marked_text: "
-                    «one
-
-                    three // modified
-                    four»
-                "
-                .unindent(),
-                final_index_text: "
-                    one
-
-                    three // modified
-                    four
-                "
-                .unindent(),
-            },
-            Example {
-                name: "one uncommitted hunk that contains two unstaged hunks",
-                head_text: "
-                    one
-                    two
-                    three
-                    four
-                    five
-                "
-                .unindent(),
-                index_text: "
-                    ZERO
-                    one
-                    TWO
-                    THREE
-                    FOUR
-                    five
-                "
-                .unindent(),
-                buffer_marked_text: "
-                    «one
-                    TWO_HUNDRED
-                    THREE
-                    FOUR_HUNDRED
-                    five»
-                "
-                .unindent(),
-                final_index_text: "
-                    ZERO
-                    one
-                    TWO_HUNDRED
-                    THREE
-                    FOUR_HUNDRED
-                    five
-                "
-                .unindent(),
-            },
-        ];
-
-        for example in table {
-            let (buffer_text, ranges) = marked_text_ranges(&example.buffer_marked_text, false);
-            let buffer = Buffer::new(ReplicaId::LOCAL, BufferId::new(1).unwrap(), buffer_text);
-            let hunk_range =
-                buffer.anchor_before(ranges[0].start)..buffer.anchor_before(ranges[0].end);
-
-            let unstaged =
-                BufferDiffSnapshot::new_sync(buffer.clone(), example.index_text.clone(), cx);
-            let uncommitted =
-                BufferDiffSnapshot::new_sync(buffer.clone(), example.head_text.clone(), cx);
-
-            let unstaged_diff = cx.new(|cx| {
-                let mut diff = BufferDiff::new(&buffer, cx);
-                diff.set_snapshot(unstaged, &buffer, cx);
-                diff
-            });
-
-            let uncommitted_diff = cx.new(|cx| {
-                let mut diff = BufferDiff::new(&buffer, cx);
-                diff.set_snapshot(uncommitted, &buffer, cx);
-                diff.set_secondary_diff(unstaged_diff);
-                diff
-            });
-
-            uncommitted_diff.update(cx, |diff, cx| {
-                let hunks = diff
-                    .hunks_intersecting_range(hunk_range.clone(), &buffer, cx)
-                    .collect::<Vec<_>>();
-                for hunk in &hunks {
-                    assert_ne!(
-                        hunk.secondary_status,
-                        DiffHunkSecondaryStatus::NoSecondaryHunk
-                    )
-                }
-
-                let new_index_text = diff
-                    .stage_or_unstage_hunks(true, &hunks, &buffer, true, cx)
-                    .unwrap()
-                    .to_string();
-
-                let hunks = diff
-                    .hunks_intersecting_range(hunk_range.clone(), &buffer, cx)
-                    .collect::<Vec<_>>();
-                for hunk in &hunks {
-                    assert_eq!(
-                        hunk.secondary_status,
-                        DiffHunkSecondaryStatus::SecondaryHunkRemovalPending
-                    )
-                }
-
-                pretty_assertions::assert_eq!(
-                    new_index_text,
-                    example.final_index_text,
-                    "example: {}",
-                    example.name
-                );
-            });
-        }
-    }
-
-    #[gpui::test]
-    async fn test_toggling_stage_and_unstage_same_hunk(cx: &mut TestAppContext) {
-        let head_text = "
-            one
-            two
-            three
-        "
-        .unindent();
-        let index_text = head_text.clone();
-        let buffer_text = "
-            one
-            three
-        "
-        .unindent();
-
-        let buffer = Buffer::new(
-            ReplicaId::LOCAL,
-            BufferId::new(1).unwrap(),
-            buffer_text.clone(),
-        );
-        let unstaged = BufferDiffSnapshot::new_sync(buffer.clone(), index_text, cx);
-        let uncommitted = BufferDiffSnapshot::new_sync(buffer.clone(), head_text.clone(), cx);
-        let unstaged_diff = cx.new(|cx| {
-            let mut diff = BufferDiff::new(&buffer, cx);
-            diff.set_snapshot(unstaged, &buffer, cx);
-            diff
-        });
-        let uncommitted_diff = cx.new(|cx| {
-            let mut diff = BufferDiff::new(&buffer, cx);
-            diff.set_snapshot(uncommitted, &buffer, cx);
-            diff.set_secondary_diff(unstaged_diff.clone());
-            diff
-        });
-
-        uncommitted_diff.update(cx, |diff, cx| {
-            let hunk = diff.hunks(&buffer, cx).next().unwrap();
-
-            let new_index_text = diff
-                .stage_or_unstage_hunks(true, std::slice::from_ref(&hunk), &buffer, true, cx)
-                .unwrap()
-                .to_string();
-            assert_eq!(new_index_text, buffer_text);
-
-            let hunk = diff.hunks(&buffer, cx).next().unwrap();
-            assert_eq!(
-                hunk.secondary_status,
-                DiffHunkSecondaryStatus::SecondaryHunkRemovalPending
-            );
-
-            let index_text = diff
-                .stage_or_unstage_hunks(false, &[hunk], &buffer, true, cx)
-                .unwrap()
-                .to_string();
-            assert_eq!(index_text, head_text);
-
-            let hunk = diff.hunks(&buffer, cx).next().unwrap();
-            // optimistically unstaged (fine, could also be HasSecondaryHunk)
-            assert_eq!(
-                hunk.secondary_status,
-                DiffHunkSecondaryStatus::SecondaryHunkAdditionPending
-            );
-        });
-    }
-
-    #[gpui::test]
-    async fn test_buffer_diff_compare(cx: &mut TestAppContext) {
-        let base_text = "
-            zero
-            one
-            two
-            three
-            four
-            five
-            six
-            seven
-            eight
-            nine
-        "
-        .unindent();
-
-        let buffer_text_1 = "
-            one
-            three
-            four
-            five
-            SIX
-            seven
-            eight
-            NINE
-        "
-        .unindent();
-
-        let mut buffer = Buffer::new(ReplicaId::LOCAL, BufferId::new(1).unwrap(), buffer_text_1);
-
-        let empty_diff = cx.update(|cx| BufferDiffSnapshot::empty(&buffer, cx));
-        let diff_1 = BufferDiffSnapshot::new_sync(buffer.clone(), base_text.clone(), cx);
-        let range = diff_1.inner.compare(&empty_diff.inner, &buffer).unwrap();
-        assert_eq!(range.to_point(&buffer), Point::new(0, 0)..Point::new(8, 0));
-
-        // Edit does not affect the diff.
-        buffer.edit_via_marked_text(
-            &"
-                one
-                three
-                four
-                five
-                «SIX.5»
-                seven
-                eight
-                NINE
-            "
-            .unindent(),
-        );
-        let diff_2 = BufferDiffSnapshot::new_sync(buffer.clone(), base_text.clone(), cx);
-        assert_eq!(None, diff_2.inner.compare(&diff_1.inner, &buffer));
-
-        // Edit turns a deletion hunk into a modification.
-        buffer.edit_via_marked_text(
-            &"
-                one
-                «THREE»
-                four
-                five
-                SIX.5
-                seven
-                eight
-                NINE
-            "
-            .unindent(),
-        );
-        let diff_3 = BufferDiffSnapshot::new_sync(buffer.clone(), base_text.clone(), cx);
-        let range = diff_3.inner.compare(&diff_2.inner, &buffer).unwrap();
-        assert_eq!(range.to_point(&buffer), Point::new(1, 0)..Point::new(2, 0));
-
-        // Edit turns a modification hunk into a deletion.
-        buffer.edit_via_marked_text(
-            &"
-                one
-                THREE
-                four
-                five«»
-                seven
-                eight
-                NINE
-            "
-            .unindent(),
-        );
-        let diff_4 = BufferDiffSnapshot::new_sync(buffer.clone(), base_text.clone(), cx);
-        let range = diff_4.inner.compare(&diff_3.inner, &buffer).unwrap();
-        assert_eq!(range.to_point(&buffer), Point::new(3, 4)..Point::new(4, 0));
-
-        // Edit introduces a new insertion hunk.
-        buffer.edit_via_marked_text(
-            &"
-                one
-                THREE
-                four«
-                FOUR.5
-                »five
-                seven
-                eight
-                NINE
-            "
-            .unindent(),
-        );
-        let diff_5 = BufferDiffSnapshot::new_sync(buffer.snapshot(), base_text.clone(), cx);
-        let range = diff_5.inner.compare(&diff_4.inner, &buffer).unwrap();
-        assert_eq!(range.to_point(&buffer), Point::new(3, 0)..Point::new(4, 0));
-
-        // Edit removes a hunk.
-        buffer.edit_via_marked_text(
-            &"
-                one
-                THREE
-                four
-                FOUR.5
-                five
-                seven
-                eight
-                «nine»
-            "
-            .unindent(),
-        );
-        let diff_6 = BufferDiffSnapshot::new_sync(buffer.snapshot(), base_text, cx);
-        let range = diff_6.inner.compare(&diff_5.inner, &buffer).unwrap();
-        assert_eq!(range.to_point(&buffer), Point::new(7, 0)..Point::new(8, 0));
-    }
-
-    #[gpui::test(iterations = 100)]
-    async fn test_staging_and_unstaging_hunks(cx: &mut TestAppContext, mut rng: StdRng) {
-        fn gen_line(rng: &mut StdRng) -> String {
-            if rng.random_bool(0.2) {
-                "\n".to_owned()
-            } else {
-                let c = rng.random_range('A'..='Z');
-                format!("{c}{c}{c}\n")
-            }
-        }
-
-        fn gen_working_copy(rng: &mut StdRng, head: &str) -> String {
-            let mut old_lines = {
-                let mut old_lines = Vec::new();
-                let old_lines_iter = head.lines();
-                for line in old_lines_iter {
-                    assert!(!line.ends_with("\n"));
-                    old_lines.push(line.to_owned());
-                }
-                if old_lines.last().is_some_and(|line| line.is_empty()) {
-                    old_lines.pop();
-                }
-                old_lines.into_iter()
-            };
-            let mut result = String::new();
-            let unchanged_count = rng.random_range(0..=old_lines.len());
-            result +=
-                &old_lines
-                    .by_ref()
-                    .take(unchanged_count)
-                    .fold(String::new(), |mut s, line| {
-                        writeln!(&mut s, "{line}").unwrap();
-                        s
-                    });
-            while old_lines.len() > 0 {
-                let deleted_count = rng.random_range(0..=old_lines.len());
-                let _advance = old_lines
-                    .by_ref()
-                    .take(deleted_count)
-                    .map(|line| line.len() + 1)
-                    .sum::<usize>();
-                let minimum_added = if deleted_count == 0 { 1 } else { 0 };
-                let added_count = rng.random_range(minimum_added..=5);
-                let addition = (0..added_count).map(|_| gen_line(rng)).collect::<String>();
-                result += &addition;
-
-                if old_lines.len() > 0 {
-                    let blank_lines = old_lines.clone().take_while(|line| line.is_empty()).count();
-                    if blank_lines == old_lines.len() {
-                        break;
-                    };
-                    let unchanged_count =
-                        rng.random_range((blank_lines + 1).max(1)..=old_lines.len());
-                    result += &old_lines.by_ref().take(unchanged_count).fold(
-                        String::new(),
-                        |mut s, line| {
-                            writeln!(&mut s, "{line}").unwrap();
-                            s
-                        },
-                    );
-                }
-            }
-            result
-        }
-
-        fn uncommitted_diff(
-            working_copy: &language::BufferSnapshot,
-            index_text: &Rope,
-            head_text: String,
-            cx: &mut TestAppContext,
-        ) -> Entity<BufferDiff> {
-            let inner =
-                BufferDiffSnapshot::new_sync(working_copy.text.clone(), head_text, cx).inner;
-            let secondary = BufferDiff {
-                buffer_id: working_copy.remote_id(),
-                inner: BufferDiffSnapshot::new_sync(
-                    working_copy.text.clone(),
-                    index_text.to_string(),
-                    cx,
-                )
-                .inner,
-                secondary_diff: None,
-            };
-            let secondary = cx.new(|_| secondary);
-            cx.new(|_| BufferDiff {
-                buffer_id: working_copy.remote_id(),
-                inner,
-                secondary_diff: Some(secondary),
-            })
-        }
-
-        let operations = std::env::var("OPERATIONS")
-            .map(|i| i.parse().expect("invalid `OPERATIONS` variable"))
-            .unwrap_or(10);
-
-        let rng = &mut rng;
-        let head_text = ('a'..='z').fold(String::new(), |mut s, c| {
-            writeln!(&mut s, "{c}{c}{c}").unwrap();
-            s
-        });
-        let working_copy = gen_working_copy(rng, &head_text);
-        let working_copy = cx.new(|cx| {
-            language::Buffer::local_normalized(
-                Rope::from(working_copy.as_str()),
-                text::LineEnding::default(),
-                cx,
-            )
-        });
-        let working_copy = working_copy.read_with(cx, |working_copy, _| working_copy.snapshot());
-        let mut index_text = if rng.random() {
-            Rope::from(head_text.as_str())
-        } else {
-            working_copy.as_rope().clone()
-        };
-
-        let mut diff = uncommitted_diff(&working_copy, &index_text, head_text.clone(), cx);
-        let mut hunks = diff.update(cx, |diff, cx| {
-            diff.hunks_intersecting_range(
-                Anchor::min_max_range_for_buffer(diff.buffer_id),
-                &working_copy,
-                cx,
-            )
-            .collect::<Vec<_>>()
-        });
-        if hunks.is_empty() {
-            return;
-        }
-
-        for _ in 0..operations {
-            let i = rng.random_range(0..hunks.len());
-            let hunk = &mut hunks[i];
-            let hunk_to_change = hunk.clone();
-            let stage = match hunk.secondary_status {
-                DiffHunkSecondaryStatus::HasSecondaryHunk => {
-                    hunk.secondary_status = DiffHunkSecondaryStatus::NoSecondaryHunk;
-                    true
-                }
-                DiffHunkSecondaryStatus::NoSecondaryHunk => {
-                    hunk.secondary_status = DiffHunkSecondaryStatus::HasSecondaryHunk;
-                    false
-                }
-                _ => unreachable!(),
-            };
-
-            index_text = diff.update(cx, |diff, cx| {
-                diff.stage_or_unstage_hunks(stage, &[hunk_to_change], &working_copy, true, cx)
-                    .unwrap()
-            });
-
-            diff = uncommitted_diff(&working_copy, &index_text, head_text.clone(), cx);
-            let found_hunks = diff.update(cx, |diff, cx| {
-                diff.hunks_intersecting_range(
-                    Anchor::min_max_range_for_buffer(diff.buffer_id),
-                    &working_copy,
-                    cx,
-                )
-                .collect::<Vec<_>>()
-            });
-            assert_eq!(hunks.len(), found_hunks.len());
-
-            for (expected_hunk, found_hunk) in hunks.iter().zip(&found_hunks) {
-                assert_eq!(
-                    expected_hunk.buffer_range.to_point(&working_copy),
-                    found_hunk.buffer_range.to_point(&working_copy)
-                );
-                assert_eq!(
-                    expected_hunk.diff_base_byte_range,
-                    found_hunk.diff_base_byte_range
-                );
-                assert_eq!(expected_hunk.secondary_status, found_hunk.secondary_status);
-            }
-            hunks = found_hunks;
-        }
-    }
-
-    #[gpui::test]
-    async fn test_row_to_base_text_row(cx: &mut TestAppContext) {
-        let base_text = "
-            zero
-            one
-            two
-            three
-            four
-            five
-            six
-            seven
-            eight
-        "
-        .unindent();
-        let buffer_text = "
-            zero
-            ONE
-            two
-            NINE
-            five
-            seven
-        "
-        .unindent();
-
-        //   zero
-        // - one
-        // + ONE
-        //   two
-        // - three
-        // - four
-        // + NINE
-        //   five
-        // - six
-        //   seven
-        // + eight
-
-        let buffer = Buffer::new(ReplicaId::LOCAL, BufferId::new(1).unwrap(), buffer_text);
-        let buffer_snapshot = buffer.snapshot();
-        let diff = BufferDiffSnapshot::new_sync(buffer_snapshot.clone(), base_text, cx);
-        let expected_results = [
-            // don't format me
-            (0, 0),
-            (1, 2),
-            (2, 2),
-            (3, 5),
-            (4, 5),
-            (5, 7),
-            (6, 9),
-        ];
-        for (buffer_row, expected) in expected_results {
-            assert_eq!(
-                diff.row_to_base_text_row(buffer_row, &buffer_snapshot),
-                expected,
-                "{buffer_row}"
-            );
-        }
-    }
-}
diff --git a/crates/call/Cargo.toml b/crates/call/Cargo.toml
deleted file mode 100644
index ff034f914b..0000000000
--- a/crates/call/Cargo.toml
+++ /dev/null
@@ -1,54 +0,0 @@
-[package]
-name = "call"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/call.rs"
-doctest = false
-
-[features]
-test-support = [
-    "client/test-support",
-    "collections/test-support",
-    "gpui/test-support",
-    "livekit_client/test-support",
-    "project/test-support",
-    "util/test-support"
-]
-
-[dependencies]
-anyhow.workspace = true
-audio.workspace = true
-client.workspace = true
-collections.workspace = true
-fs.workspace = true
-futures.workspace = true
-feature_flags.workspace = true
-gpui = { workspace = true, features = ["screen-capture"] }
-language.workspace = true
-log.workspace = true
-postage.workspace = true
-project.workspace = true
-serde.workspace = true
-settings.workspace = true
-telemetry.workspace = true
-util.workspace = true
-gpui_tokio.workspace = true
-livekit_client.workspace = true
-
-[dev-dependencies]
-client = { workspace = true, features = ["test-support"] }
-collections = { workspace = true, features = ["test-support"] }
-fs = { workspace = true, features = ["test-support"] }
-gpui = { workspace = true, features = ["test-support"] }
-language = { workspace = true, features = ["test-support"] }
-project = { workspace = true, features = ["test-support"] }
-util = { workspace = true, features = ["test-support"] }
-http_client = { workspace = true, features = ["test-support"] }
-livekit_client = { workspace = true, features = ["test-support"] }
diff --git a/crates/call/LICENSE-GPL b/crates/call/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/call/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/call/src/call.rs b/crates/call/src/call.rs
deleted file mode 100644
index 5218c3c6b8..0000000000
--- a/crates/call/src/call.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-pub mod call_settings;
-
-mod call_impl;
-
-pub use call_impl::*;
diff --git a/crates/call/src/call_impl/mod.rs b/crates/call/src/call_impl/mod.rs
deleted file mode 100644
index b4fcdb2552..0000000000
--- a/crates/call/src/call_impl/mod.rs
+++ /dev/null
@@ -1,515 +0,0 @@
-pub mod participant;
-pub mod room;
-
-use anyhow::{Context as _, Result, anyhow};
-use audio::Audio;
-use client::{ChannelId, Client, TypedEnvelope, User, UserStore, ZED_ALWAYS_ACTIVE, proto};
-use collections::HashSet;
-use futures::{Future, FutureExt, channel::oneshot, future::Shared};
-use gpui::{
-    App, AppContext as _, AsyncApp, Context, Entity, EventEmitter, Global, Subscription, Task,
-    WeakEntity,
-};
-use postage::watch;
-use project::Project;
-use room::Event;
-use std::sync::Arc;
-
-pub use livekit_client::{RemoteVideoTrack, RemoteVideoTrackView, RemoteVideoTrackViewEvent};
-pub use participant::ParticipantLocation;
-pub use room::Room;
-
-struct GlobalActiveCall(Entity<ActiveCall>);
-
-impl Global for GlobalActiveCall {}
-
-pub fn init(client: Arc<Client>, user_store: Entity<UserStore>, cx: &mut App) {
-    let active_call = cx.new(|cx| ActiveCall::new(client, user_store, cx));
-    cx.set_global(GlobalActiveCall(active_call));
-}
-
-pub struct OneAtATime {
-    cancel: Option<oneshot::Sender<()>>,
-}
-
-impl OneAtATime {
-    /// spawn a task in the given context.
-    /// if another task is spawned before that resolves, or if the OneAtATime itself is dropped, the first task will be cancelled and return Ok(None)
-    /// otherwise you'll see the result of the task.
-    fn spawn<F, Fut, R>(&mut self, cx: &mut App, f: F) -> Task<Result<Option<R>>>
-    where
-        F: 'static + FnOnce(AsyncApp) -> Fut,
-        Fut: Future<Output = Result<R>>,
-        R: 'static,
-    {
-        let (tx, rx) = oneshot::channel();
-        self.cancel.replace(tx);
-        cx.spawn(async move |cx| {
-            futures::select_biased! {
-                _ = rx.fuse() => Ok(None),
-                result = f(cx.clone()).fuse() => result.map(Some),
-            }
-        })
-    }
-
-    fn running(&self) -> bool {
-        self.cancel
-            .as_ref()
-            .is_some_and(|cancel| !cancel.is_canceled())
-    }
-}
-
-#[derive(Clone)]
-pub struct IncomingCall {
-    pub room_id: u64,
-    pub calling_user: Arc<User>,
-    pub participants: Vec<Arc<User>>,
-    pub initial_project: Option<proto::ParticipantProject>,
-}
-
-/// Singleton global maintaining the user's participation in a room across workspaces.
-pub struct ActiveCall {
-    room: Option<(Entity<Room>, Vec<Subscription>)>,
-    pending_room_creation: Option<Shared<Task<Result<Entity<Room>, Arc<anyhow::Error>>>>>,
-    location: Option<WeakEntity<Project>>,
-    _join_debouncer: OneAtATime,
-    pending_invites: HashSet<u64>,
-    incoming_call: (
-        watch::Sender<Option<IncomingCall>>,
-        watch::Receiver<Option<IncomingCall>>,
-    ),
-    client: Arc<Client>,
-    user_store: Entity<UserStore>,
-    _subscriptions: Vec<client::Subscription>,
-}
-
-impl EventEmitter<Event> for ActiveCall {}
-
-impl ActiveCall {
-    fn new(client: Arc<Client>, user_store: Entity<UserStore>, cx: &mut Context<Self>) -> Self {
-        Self {
-            room: None,
-            pending_room_creation: None,
-            location: None,
-            pending_invites: Default::default(),
-            incoming_call: watch::channel(),
-            _join_debouncer: OneAtATime { cancel: None },
-            _subscriptions: vec![
-                client.add_request_handler(cx.weak_entity(), Self::handle_incoming_call),
-                client.add_message_handler(cx.weak_entity(), Self::handle_call_canceled),
-            ],
-            client,
-            user_store,
-        }
-    }
-
-    pub fn channel_id(&self, cx: &App) -> Option<ChannelId> {
-        self.room()?.read(cx).channel_id()
-    }
-
-    async fn handle_incoming_call(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::IncomingCall>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::Ack> {
-        let user_store = this.read_with(&cx, |this, _| this.user_store.clone())?;
-        let call = IncomingCall {
-            room_id: envelope.payload.room_id,
-            participants: user_store
-                .update(&mut cx, |user_store, cx| {
-                    user_store.get_users(envelope.payload.participant_user_ids, cx)
-                })?
-                .await?,
-            calling_user: user_store
-                .update(&mut cx, |user_store, cx| {
-                    user_store.get_user(envelope.payload.calling_user_id, cx)
-                })?
-                .await?,
-            initial_project: envelope.payload.initial_project,
-        };
-        this.update(&mut cx, |this, _| {
-            *this.incoming_call.0.borrow_mut() = Some(call);
-        })?;
-
-        Ok(proto::Ack {})
-    }
-
-    async fn handle_call_canceled(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::CallCanceled>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        this.update(&mut cx, |this, _| {
-            let mut incoming_call = this.incoming_call.0.borrow_mut();
-            if incoming_call
-                .as_ref()
-                .is_some_and(|call| call.room_id == envelope.payload.room_id)
-            {
-                incoming_call.take();
-            }
-        })?;
-        Ok(())
-    }
-
-    pub fn global(cx: &App) -> Entity<Self> {
-        cx.global::<GlobalActiveCall>().0.clone()
-    }
-
-    pub fn try_global(cx: &App) -> Option<Entity<Self>> {
-        cx.try_global::<GlobalActiveCall>()
-            .map(|call| call.0.clone())
-    }
-
-    pub fn invite(
-        &mut self,
-        called_user_id: u64,
-        initial_project: Option<Entity<Project>>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        if !self.pending_invites.insert(called_user_id) {
-            return Task::ready(Err(anyhow!("user was already invited")));
-        }
-        cx.notify();
-
-        if self._join_debouncer.running() {
-            return Task::ready(Ok(()));
-        }
-
-        let room = if let Some(room) = self.room().cloned() {
-            Some(Task::ready(Ok(room)).shared())
-        } else {
-            self.pending_room_creation.clone()
-        };
-
-        let invite = if let Some(room) = room {
-            cx.spawn(async move |_, cx| {
-                let room = room.await.map_err(|err| anyhow!("{err:?}"))?;
-
-                let initial_project_id = if let Some(initial_project) = initial_project {
-                    Some(
-                        room.update(cx, |room, cx| room.share_project(initial_project, cx))?
-                            .await?,
-                    )
-                } else {
-                    None
-                };
-
-                room.update(cx, move |room, cx| {
-                    room.call(called_user_id, initial_project_id, cx)
-                })?
-                .await?;
-
-                anyhow::Ok(())
-            })
-        } else {
-            let client = self.client.clone();
-            let user_store = self.user_store.clone();
-            let room = cx
-                .spawn(async move |this, cx| {
-                    let create_room = async {
-                        let room = cx
-                            .update(|cx| {
-                                Room::create(
-                                    called_user_id,
-                                    initial_project,
-                                    client,
-                                    user_store,
-                                    cx,
-                                )
-                            })?
-                            .await?;
-
-                        this.update(cx, |this, cx| this.set_room(Some(room.clone()), cx))?
-                            .await?;
-
-                        anyhow::Ok(room)
-                    };
-
-                    let room = create_room.await;
-                    this.update(cx, |this, _| this.pending_room_creation = None)?;
-                    room.map_err(Arc::new)
-                })
-                .shared();
-            self.pending_room_creation = Some(room.clone());
-            cx.background_spawn(async move {
-                room.await.map_err(|err| anyhow!("{err:?}"))?;
-                anyhow::Ok(())
-            })
-        };
-
-        cx.spawn(async move |this, cx| {
-            let result = invite.await;
-            if result.is_ok() {
-                this.update(cx, |this, cx| {
-                    this.report_call_event("Participant Invited", cx)
-                })?;
-            } else {
-                //TODO: report collaboration error
-                log::error!("invite failed: {:?}", result);
-            }
-
-            this.update(cx, |this, cx| {
-                this.pending_invites.remove(&called_user_id);
-                cx.notify();
-            })?;
-            result
-        })
-    }
-
-    pub fn cancel_invite(
-        &mut self,
-        called_user_id: u64,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let room_id = if let Some(room) = self.room() {
-            room.read(cx).id()
-        } else {
-            return Task::ready(Err(anyhow!("no active call")));
-        };
-
-        let client = self.client.clone();
-        cx.background_spawn(async move {
-            client
-                .request(proto::CancelCall {
-                    room_id,
-                    called_user_id,
-                })
-                .await?;
-            anyhow::Ok(())
-        })
-    }
-
-    pub fn incoming(&self) -> watch::Receiver<Option<IncomingCall>> {
-        self.incoming_call.1.clone()
-    }
-
-    pub fn accept_incoming(&mut self, cx: &mut Context<Self>) -> Task<Result<()>> {
-        if self.room.is_some() {
-            return Task::ready(Err(anyhow!("cannot join while on another call")));
-        }
-
-        let call = if let Some(call) = self.incoming_call.0.borrow_mut().take() {
-            call
-        } else {
-            return Task::ready(Err(anyhow!("no incoming call")));
-        };
-
-        if self.pending_room_creation.is_some() {
-            return Task::ready(Ok(()));
-        }
-
-        let room_id = call.room_id;
-        let client = self.client.clone();
-        let user_store = self.user_store.clone();
-        let join = self
-            ._join_debouncer
-            .spawn(cx, move |cx| Room::join(room_id, client, user_store, cx));
-
-        cx.spawn(async move |this, cx| {
-            let room = join.await?;
-            this.update(cx, |this, cx| this.set_room(room.clone(), cx))?
-                .await?;
-            this.update(cx, |this, cx| {
-                this.report_call_event("Incoming Call Accepted", cx)
-            })?;
-            Ok(())
-        })
-    }
-
-    pub fn decline_incoming(&mut self, _: &mut Context<Self>) -> Result<()> {
-        let call = self
-            .incoming_call
-            .0
-            .borrow_mut()
-            .take()
-            .context("no incoming call")?;
-        telemetry::event!("Incoming Call Declined", room_id = call.room_id);
-        self.client.send(proto::DeclineCall {
-            room_id: call.room_id,
-        })?;
-        Ok(())
-    }
-
-    pub fn join_channel(
-        &mut self,
-        channel_id: ChannelId,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Option<Entity<Room>>>> {
-        if let Some(room) = self.room().cloned() {
-            if room.read(cx).channel_id() == Some(channel_id) {
-                return Task::ready(Ok(Some(room)));
-            } else {
-                room.update(cx, |room, cx| room.clear_state(cx));
-            }
-        }
-
-        if self.pending_room_creation.is_some() {
-            return Task::ready(Ok(None));
-        }
-
-        let client = self.client.clone();
-        let user_store = self.user_store.clone();
-        let join = self._join_debouncer.spawn(cx, move |cx| async move {
-            Room::join_channel(channel_id, client, user_store, cx).await
-        });
-
-        cx.spawn(async move |this, cx| {
-            let room = join.await?;
-            this.update(cx, |this, cx| this.set_room(room.clone(), cx))?
-                .await?;
-            this.update(cx, |this, cx| this.report_call_event("Channel Joined", cx))?;
-            Ok(room)
-        })
-    }
-
-    pub fn hang_up(&mut self, cx: &mut Context<Self>) -> Task<Result<()>> {
-        cx.notify();
-        self.report_call_event("Call Ended", cx);
-
-        Audio::end_call(cx);
-
-        let channel_id = self.channel_id(cx);
-        if let Some((room, _)) = self.room.take() {
-            cx.emit(Event::RoomLeft { channel_id });
-            room.update(cx, |room, cx| room.leave(cx))
-        } else {
-            Task::ready(Ok(()))
-        }
-    }
-
-    pub fn share_project(
-        &mut self,
-        project: Entity<Project>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<u64>> {
-        if let Some((room, _)) = self.room.as_ref() {
-            self.report_call_event("Project Shared", cx);
-            room.update(cx, |room, cx| room.share_project(project, cx))
-        } else {
-            Task::ready(Err(anyhow!("no active call")))
-        }
-    }
-
-    pub fn unshare_project(
-        &mut self,
-        project: Entity<Project>,
-        cx: &mut Context<Self>,
-    ) -> Result<()> {
-        let (room, _) = self.room.as_ref().context("no active call")?;
-        self.report_call_event("Project Unshared", cx);
-        room.update(cx, |room, cx| room.unshare_project(project, cx))
-    }
-
-    pub fn location(&self) -> Option<&WeakEntity<Project>> {
-        self.location.as_ref()
-    }
-
-    pub fn set_location(
-        &mut self,
-        project: Option<&Entity<Project>>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        if project.is_some() || !*ZED_ALWAYS_ACTIVE {
-            self.location = project.map(|project| project.downgrade());
-            if let Some((room, _)) = self.room.as_ref() {
-                return room.update(cx, |room, cx| room.set_location(project, cx));
-            }
-        }
-        Task::ready(Ok(()))
-    }
-
-    fn set_room(&mut self, room: Option<Entity<Room>>, cx: &mut Context<Self>) -> Task<Result<()>> {
-        if room.as_ref() == self.room.as_ref().map(|room| &room.0) {
-            Task::ready(Ok(()))
-        } else {
-            cx.notify();
-            if let Some(room) = room {
-                if room.read(cx).status().is_offline() {
-                    self.room = None;
-                    Task::ready(Ok(()))
-                } else {
-                    let subscriptions = vec![
-                        cx.observe(&room, |this, room, cx| {
-                            if room.read(cx).status().is_offline() {
-                                this.set_room(None, cx).detach_and_log_err(cx);
-                            }
-
-                            cx.notify();
-                        }),
-                        cx.subscribe(&room, |_, _, event, cx| cx.emit(event.clone())),
-                    ];
-                    self.room = Some((room.clone(), subscriptions));
-                    let location = self
-                        .location
-                        .as_ref()
-                        .and_then(|location| location.upgrade());
-                    let channel_id = room.read(cx).channel_id();
-                    cx.emit(Event::RoomJoined { channel_id });
-                    room.update(cx, |room, cx| room.set_location(location.as_ref(), cx))
-                }
-            } else {
-                self.room = None;
-                Task::ready(Ok(()))
-            }
-        }
-    }
-
-    pub fn room(&self) -> Option<&Entity<Room>> {
-        self.room.as_ref().map(|(room, _)| room)
-    }
-
-    pub fn client(&self) -> Arc<Client> {
-        self.client.clone()
-    }
-
-    pub fn pending_invites(&self) -> &HashSet<u64> {
-        &self.pending_invites
-    }
-
-    pub fn report_call_event(&self, operation: &'static str, cx: &mut App) {
-        if let Some(room) = self.room() {
-            let room = room.read(cx);
-            telemetry::event!(
-                operation,
-                room_id = room.id(),
-                channel_id = room.channel_id()
-            )
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use gpui::TestAppContext;
-
-    use crate::OneAtATime;
-
-    #[gpui::test]
-    async fn test_one_at_a_time(cx: &mut TestAppContext) {
-        let mut one_at_a_time = OneAtATime { cancel: None };
-
-        assert_eq!(
-            cx.update(|cx| one_at_a_time.spawn(cx, |_| async { Ok(1) }))
-                .await
-                .unwrap(),
-            Some(1)
-        );
-
-        let (a, b) = cx.update(|cx| {
-            (
-                one_at_a_time.spawn(cx, |_| async {
-                    panic!("");
-                }),
-                one_at_a_time.spawn(cx, |_| async { Ok(3) }),
-            )
-        });
-
-        assert_eq!(a.await.unwrap(), None::<u32>);
-        assert_eq!(b.await.unwrap(), Some(3));
-
-        let promise = cx.update(|cx| one_at_a_time.spawn(cx, |_| async { Ok(4) }));
-        drop(one_at_a_time);
-
-        assert_eq!(promise.await.unwrap(), None);
-    }
-}
diff --git a/crates/call/src/call_impl/participant.rs b/crates/call/src/call_impl/participant.rs
deleted file mode 100644
index 6fb6a2eb79..0000000000
--- a/crates/call/src/call_impl/participant.rs
+++ /dev/null
@@ -1,76 +0,0 @@
-use anyhow::{Context as _, Result};
-use client::{ParticipantIndex, User, proto};
-use collections::HashMap;
-use gpui::WeakEntity;
-use livekit_client::AudioStream;
-use project::Project;
-use std::sync::Arc;
-
-pub use livekit_client::TrackSid;
-pub use livekit_client::{RemoteAudioTrack, RemoteVideoTrack};
-
-#[derive(Copy, Clone, Debug, Eq, PartialEq)]
-pub enum ParticipantLocation {
-    SharedProject { project_id: u64 },
-    UnsharedProject,
-    External,
-}
-
-impl ParticipantLocation {
-    pub fn from_proto(location: Option<proto::ParticipantLocation>) -> Result<Self> {
-        match location
-            .and_then(|l| l.variant)
-            .context("participant location was not provided")?
-        {
-            proto::participant_location::Variant::SharedProject(project) => {
-                Ok(Self::SharedProject {
-                    project_id: project.id,
-                })
-            }
-            proto::participant_location::Variant::UnsharedProject(_) => Ok(Self::UnsharedProject),
-            proto::participant_location::Variant::External(_) => Ok(Self::External),
-        }
-    }
-}
-
-#[derive(Clone, Default)]
-pub struct LocalParticipant {
-    pub projects: Vec<proto::ParticipantProject>,
-    pub active_project: Option<WeakEntity<Project>>,
-    pub role: proto::ChannelRole,
-}
-
-impl LocalParticipant {
-    pub fn can_write(&self) -> bool {
-        matches!(
-            self.role,
-            proto::ChannelRole::Admin | proto::ChannelRole::Member
-        )
-    }
-}
-
-pub struct RemoteParticipant {
-    pub user: Arc<User>,
-    pub peer_id: proto::PeerId,
-    pub role: proto::ChannelRole,
-    pub projects: Vec<proto::ParticipantProject>,
-    pub location: ParticipantLocation,
-    pub participant_index: ParticipantIndex,
-    pub muted: bool,
-    pub speaking: bool,
-    pub video_tracks: HashMap<TrackSid, RemoteVideoTrack>,
-    pub audio_tracks: HashMap<TrackSid, (RemoteAudioTrack, AudioStream)>,
-}
-
-impl RemoteParticipant {
-    pub fn has_video_tracks(&self) -> bool {
-        !self.video_tracks.is_empty()
-    }
-
-    pub fn can_write(&self) -> bool {
-        matches!(
-            self.role,
-            proto::ChannelRole::Admin | proto::ChannelRole::Member
-        )
-    }
-}
diff --git a/crates/call/src/call_impl/room.rs b/crates/call/src/call_impl/room.rs
deleted file mode 100644
index fc15b4e439..0000000000
--- a/crates/call/src/call_impl/room.rs
+++ /dev/null
@@ -1,1724 +0,0 @@
-use crate::{
-    call_settings::CallSettings,
-    participant::{LocalParticipant, ParticipantLocation, RemoteParticipant},
-};
-use anyhow::{Context as _, Result, anyhow};
-use audio::{Audio, Sound};
-use client::{
-    ChannelId, Client, ParticipantIndex, TypedEnvelope, User, UserStore,
-    proto::{self, PeerId},
-};
-use collections::{BTreeMap, HashMap, HashSet};
-use feature_flags::FeatureFlagAppExt;
-use fs::Fs;
-use futures::StreamExt;
-use gpui::{
-    App, AppContext as _, AsyncApp, Context, Entity, EventEmitter, FutureExt as _,
-    ScreenCaptureSource, ScreenCaptureStream, Task, Timeout, WeakEntity,
-};
-use gpui_tokio::Tokio;
-use language::LanguageRegistry;
-use livekit::{LocalTrackPublication, ParticipantIdentity, RoomEvent};
-use livekit_client::{self as livekit, AudioStream, TrackSid};
-use postage::{sink::Sink, stream::Stream, watch};
-use project::Project;
-use settings::Settings as _;
-use std::{future::Future, mem, rc::Rc, sync::Arc, time::Duration, time::Instant};
-use util::{ResultExt, TryFutureExt, paths::PathStyle, post_inc};
-
-pub const RECONNECT_TIMEOUT: Duration = Duration::from_secs(30);
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum Event {
-    RoomJoined {
-        channel_id: Option<ChannelId>,
-    },
-    ParticipantLocationChanged {
-        participant_id: proto::PeerId,
-    },
-    RemoteVideoTracksChanged {
-        participant_id: proto::PeerId,
-    },
-    RemoteVideoTrackUnsubscribed {
-        sid: TrackSid,
-    },
-    RemoteAudioTracksChanged {
-        participant_id: proto::PeerId,
-    },
-    RemoteProjectShared {
-        owner: Arc<User>,
-        project_id: u64,
-        worktree_root_names: Vec<String>,
-    },
-    RemoteProjectUnshared {
-        project_id: u64,
-    },
-    RemoteProjectJoined {
-        project_id: u64,
-    },
-    RemoteProjectInvitationDiscarded {
-        project_id: u64,
-    },
-    RoomLeft {
-        channel_id: Option<ChannelId>,
-    },
-}
-
-pub struct Room {
-    id: u64,
-    channel_id: Option<ChannelId>,
-    live_kit: Option<LiveKitRoom>,
-    status: RoomStatus,
-    shared_projects: HashSet<WeakEntity<Project>>,
-    joined_projects: HashSet<WeakEntity<Project>>,
-    local_participant: LocalParticipant,
-    remote_participants: BTreeMap<u64, RemoteParticipant>,
-    pending_participants: Vec<Arc<User>>,
-    participant_user_ids: HashSet<u64>,
-    pending_call_count: usize,
-    leave_when_empty: bool,
-    client: Arc<Client>,
-    user_store: Entity<UserStore>,
-    follows_by_leader_id_project_id: HashMap<(PeerId, u64), Vec<PeerId>>,
-    client_subscriptions: Vec<client::Subscription>,
-    _subscriptions: Vec<gpui::Subscription>,
-    room_update_completed_tx: watch::Sender<Option<()>>,
-    room_update_completed_rx: watch::Receiver<Option<()>>,
-    pending_room_update: Option<Task<()>>,
-    maintain_connection: Option<Task<Option<()>>>,
-    created: Instant,
-}
-
-impl EventEmitter<Event> for Room {}
-
-impl Room {
-    pub fn channel_id(&self) -> Option<ChannelId> {
-        self.channel_id
-    }
-
-    pub fn is_sharing_project(&self) -> bool {
-        !self.shared_projects.is_empty()
-    }
-
-    pub fn is_connected(&self, _: &App) -> bool {
-        if let Some(live_kit) = self.live_kit.as_ref() {
-            live_kit.room.connection_state() == livekit::ConnectionState::Connected
-        } else {
-            false
-        }
-    }
-
-    fn new(
-        id: u64,
-        channel_id: Option<ChannelId>,
-        livekit_connection_info: Option<proto::LiveKitConnectionInfo>,
-        client: Arc<Client>,
-        user_store: Entity<UserStore>,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        spawn_room_connection(livekit_connection_info, cx);
-
-        let maintain_connection = cx.spawn({
-            let client = client.clone();
-            async move |this, cx| {
-                Self::maintain_connection(this, client.clone(), cx)
-                    .log_err()
-                    .await
-            }
-        });
-
-        Audio::play_sound(Sound::Joined, cx);
-
-        let (room_update_completed_tx, room_update_completed_rx) = watch::channel();
-
-        Self {
-            id,
-            channel_id,
-            live_kit: None,
-            status: RoomStatus::Online,
-            shared_projects: Default::default(),
-            joined_projects: Default::default(),
-            participant_user_ids: Default::default(),
-            local_participant: Default::default(),
-            remote_participants: Default::default(),
-            pending_participants: Default::default(),
-            pending_call_count: 0,
-            client_subscriptions: vec![
-                client.add_message_handler(cx.weak_entity(), Self::handle_room_updated),
-            ],
-            _subscriptions: vec![
-                cx.on_release(Self::released),
-                cx.on_app_quit(Self::app_will_quit),
-            ],
-            leave_when_empty: false,
-            pending_room_update: None,
-            client,
-            user_store,
-            follows_by_leader_id_project_id: Default::default(),
-            maintain_connection: Some(maintain_connection),
-            room_update_completed_tx,
-            room_update_completed_rx,
-            created: cx.background_executor().now(),
-        }
-    }
-
-    pub(crate) fn create(
-        called_user_id: u64,
-        initial_project: Option<Entity<Project>>,
-        client: Arc<Client>,
-        user_store: Entity<UserStore>,
-        cx: &mut App,
-    ) -> Task<Result<Entity<Self>>> {
-        cx.spawn(async move |cx| {
-            let response = client.request(proto::CreateRoom {}).await?;
-            let room_proto = response.room.context("invalid room")?;
-            let room = cx.new(|cx| {
-                let mut room = Self::new(
-                    room_proto.id,
-                    None,
-                    response.live_kit_connection_info,
-                    client,
-                    user_store,
-                    cx,
-                );
-                if let Some(participant) = room_proto.participants.first() {
-                    room.local_participant.role = participant.role()
-                }
-                room
-            })?;
-
-            let initial_project_id = if let Some(initial_project) = initial_project {
-                let initial_project_id = room
-                    .update(cx, |room, cx| {
-                        room.share_project(initial_project.clone(), cx)
-                    })?
-                    .await?;
-                Some(initial_project_id)
-            } else {
-                None
-            };
-
-            let did_join = room
-                .update(cx, |room, cx| {
-                    room.leave_when_empty = true;
-                    room.call(called_user_id, initial_project_id, cx)
-                })?
-                .await;
-            match did_join {
-                Ok(()) => Ok(room),
-                Err(error) => Err(error.context("room creation failed")),
-            }
-        })
-    }
-
-    pub(crate) async fn join_channel(
-        channel_id: ChannelId,
-        client: Arc<Client>,
-        user_store: Entity<UserStore>,
-        cx: AsyncApp,
-    ) -> Result<Entity<Self>> {
-        Self::from_join_response(
-            client
-                .request(proto::JoinChannel {
-                    channel_id: channel_id.0,
-                })
-                .await?,
-            client,
-            user_store,
-            cx,
-        )
-    }
-
-    pub(crate) async fn join(
-        room_id: u64,
-        client: Arc<Client>,
-        user_store: Entity<UserStore>,
-        cx: AsyncApp,
-    ) -> Result<Entity<Self>> {
-        Self::from_join_response(
-            client.request(proto::JoinRoom { id: room_id }).await?,
-            client,
-            user_store,
-            cx,
-        )
-    }
-
-    fn released(&mut self, cx: &mut App) {
-        if self.status.is_online() {
-            self.leave_internal(cx).detach_and_log_err(cx);
-        }
-    }
-
-    fn app_will_quit(&mut self, cx: &mut Context<Self>) -> impl Future<Output = ()> + use<> {
-        let task = if self.status.is_online() {
-            let leave = self.leave_internal(cx);
-            Some(cx.background_spawn(async move {
-                leave.await.log_err();
-            }))
-        } else {
-            None
-        };
-
-        async move {
-            if let Some(task) = task {
-                task.await;
-            }
-        }
-    }
-
-    pub fn mute_on_join(cx: &App) -> bool {
-        CallSettings::get_global(cx).mute_on_join || client::IMPERSONATE_LOGIN.is_some()
-    }
-
-    fn from_join_response(
-        response: proto::JoinRoomResponse,
-        client: Arc<Client>,
-        user_store: Entity<UserStore>,
-        mut cx: AsyncApp,
-    ) -> Result<Entity<Self>> {
-        let room_proto = response.room.context("invalid room")?;
-        let room = cx.new(|cx| {
-            Self::new(
-                room_proto.id,
-                response.channel_id.map(ChannelId),
-                response.live_kit_connection_info,
-                client,
-                user_store,
-                cx,
-            )
-        })?;
-        room.update(&mut cx, |room, cx| {
-            room.leave_when_empty = room.channel_id.is_none();
-            room.apply_room_update(room_proto, cx)?;
-            anyhow::Ok(())
-        })??;
-        Ok(room)
-    }
-
-    fn should_leave(&self) -> bool {
-        self.leave_when_empty
-            && self.pending_room_update.is_none()
-            && self.pending_participants.is_empty()
-            && self.remote_participants.is_empty()
-            && self.pending_call_count == 0
-    }
-
-    pub(crate) fn leave(&mut self, cx: &mut Context<Self>) -> Task<Result<()>> {
-        cx.notify();
-        self.leave_internal(cx)
-    }
-
-    fn leave_internal(&mut self, cx: &mut App) -> Task<Result<()>> {
-        if self.status.is_offline() {
-            return Task::ready(Err(anyhow!("room is offline")));
-        }
-
-        log::info!("leaving room");
-        Audio::play_sound(Sound::Leave, cx);
-
-        self.clear_state(cx);
-
-        let leave_room = self.client.request(proto::LeaveRoom {});
-        cx.background_spawn(async move {
-            leave_room.await?;
-            anyhow::Ok(())
-        })
-    }
-
-    pub(crate) fn clear_state(&mut self, cx: &mut App) {
-        for project in self.shared_projects.drain() {
-            if let Some(project) = project.upgrade() {
-                project.update(cx, |project, cx| {
-                    project.unshare(cx).log_err();
-                });
-            }
-        }
-        for project in self.joined_projects.drain() {
-            if let Some(project) = project.upgrade() {
-                project.update(cx, |project, cx| {
-                    project.disconnected_from_host(cx);
-                    project.close(cx);
-                });
-            }
-        }
-
-        self.status = RoomStatus::Offline;
-        self.remote_participants.clear();
-        self.pending_participants.clear();
-        self.participant_user_ids.clear();
-        self.client_subscriptions.clear();
-        self.live_kit.take();
-        self.pending_room_update.take();
-        self.maintain_connection.take();
-    }
-
-    async fn maintain_connection(
-        this: WeakEntity<Self>,
-        client: Arc<Client>,
-        cx: &mut AsyncApp,
-    ) -> Result<()> {
-        let mut client_status = client.status();
-        loop {
-            let _ = client_status.try_recv();
-            let is_connected = client_status.borrow().is_connected();
-            // Even if we're initially connected, any future change of the status means we momentarily disconnected.
-            if !is_connected || client_status.next().await.is_some() {
-                log::info!("detected client disconnection");
-
-                this.upgrade()
-                    .context("room was dropped")?
-                    .update(cx, |this, cx| {
-                        this.status = RoomStatus::Rejoining;
-                        cx.notify();
-                    })?;
-
-                // Wait for client to re-establish a connection to the server.
-                let executor = cx.background_executor().clone();
-                let client_reconnection = async {
-                    let mut remaining_attempts = 3;
-                    while remaining_attempts > 0 {
-                        if client_status.borrow().is_connected() {
-                            log::info!("client reconnected, attempting to rejoin room");
-
-                            let Some(this) = this.upgrade() else { break };
-                            match this.update(cx, |this, cx| this.rejoin(cx)) {
-                                Ok(task) => {
-                                    if task.await.log_err().is_some() {
-                                        return true;
-                                    } else {
-                                        remaining_attempts -= 1;
-                                    }
-                                }
-                                Err(_app_dropped) => return false,
-                            }
-                        } else if client_status.borrow().is_signed_out() {
-                            return false;
-                        }
-
-                        log::info!(
-                            "waiting for client status change, remaining attempts {}",
-                            remaining_attempts
-                        );
-                        client_status.next().await;
-                    }
-                    false
-                };
-
-                match client_reconnection
-                    .with_timeout(RECONNECT_TIMEOUT, &executor)
-                    .await
-                {
-                    Ok(true) => {
-                        log::info!("successfully reconnected to room");
-                        // If we successfully joined the room, go back around the loop
-                        // waiting for future connection status changes.
-                        continue;
-                    }
-                    Ok(false) => break,
-                    Err(Timeout) => {
-                        log::info!("room reconnection timeout expired");
-                        break;
-                    }
-                }
-            }
-        }
-
-        // The client failed to re-establish a connection to the server
-        // or an error occurred while trying to re-join the room. Either way
-        // we leave the room and return an error.
-        if let Some(this) = this.upgrade() {
-            log::info!("reconnection failed, leaving room");
-            this.update(cx, |this, cx| this.leave(cx))?.await?;
-        }
-        anyhow::bail!("can't reconnect to room: client failed to re-establish connection");
-    }
-
-    fn rejoin(&mut self, cx: &mut Context<Self>) -> Task<Result<()>> {
-        let mut projects = HashMap::default();
-        let mut reshared_projects = Vec::new();
-        let mut rejoined_projects = Vec::new();
-        self.shared_projects.retain(|project| {
-            if let Some(handle) = project.upgrade() {
-                let project = handle.read(cx);
-                if let Some(project_id) = project.remote_id() {
-                    projects.insert(project_id, handle.clone());
-                    reshared_projects.push(proto::UpdateProject {
-                        project_id,
-                        worktrees: project.worktree_metadata_protos(cx),
-                    });
-                    return true;
-                }
-            }
-            false
-        });
-        self.joined_projects.retain(|project| {
-            if let Some(handle) = project.upgrade() {
-                let project = handle.read(cx);
-                if let Some(project_id) = project.remote_id() {
-                    projects.insert(project_id, handle.clone());
-                    let mut worktrees = Vec::new();
-                    let mut repositories = Vec::new();
-                    for worktree in project.worktrees(cx) {
-                        let worktree = worktree.read(cx);
-                        worktrees.push(proto::RejoinWorktree {
-                            id: worktree.id().to_proto(),
-                            scan_id: worktree.completed_scan_id() as u64,
-                        });
-                    }
-                    for (entry_id, repository) in project.repositories(cx) {
-                        let repository = repository.read(cx);
-                        repositories.push(proto::RejoinRepository {
-                            id: entry_id.to_proto(),
-                            scan_id: repository.scan_id,
-                        });
-                    }
-
-                    rejoined_projects.push(proto::RejoinProject {
-                        id: project_id,
-                        worktrees,
-                        repositories,
-                    });
-                }
-                return true;
-            }
-            false
-        });
-
-        let response = self.client.request_envelope(proto::RejoinRoom {
-            id: self.id,
-            reshared_projects,
-            rejoined_projects,
-        });
-
-        cx.spawn(async move |this, cx| {
-            let response = response.await?;
-            let message_id = response.message_id;
-            let response = response.payload;
-            let room_proto = response.room.context("invalid room")?;
-            this.update(cx, |this, cx| {
-                this.status = RoomStatus::Online;
-                this.apply_room_update(room_proto, cx)?;
-
-                for reshared_project in response.reshared_projects {
-                    if let Some(project) = projects.get(&reshared_project.id) {
-                        project.update(cx, |project, cx| {
-                            project.reshared(reshared_project, cx).log_err();
-                        });
-                    }
-                }
-
-                for rejoined_project in response.rejoined_projects {
-                    if let Some(project) = projects.get(&rejoined_project.id) {
-                        project.update(cx, |project, cx| {
-                            project.rejoined(rejoined_project, message_id, cx).log_err();
-                        });
-                    }
-                }
-
-                anyhow::Ok(())
-            })?
-        })
-    }
-
-    pub fn id(&self) -> u64 {
-        self.id
-    }
-
-    pub fn room_id(&self) -> impl Future<Output = Option<String>> + 'static {
-        let room = self.live_kit.as_ref().map(|lk| lk.room.clone());
-        async move {
-            let room = room?;
-            let sid = room.sid().await;
-            let name = room.name();
-            Some(format!("{} (sid: {sid})", name))
-        }
-    }
-
-    pub fn status(&self) -> RoomStatus {
-        self.status
-    }
-
-    pub fn local_participant(&self) -> &LocalParticipant {
-        &self.local_participant
-    }
-
-    pub fn local_participant_user(&self, cx: &App) -> Option<Arc<User>> {
-        self.user_store.read(cx).current_user()
-    }
-
-    pub fn remote_participants(&self) -> &BTreeMap<u64, RemoteParticipant> {
-        &self.remote_participants
-    }
-
-    pub fn remote_participant_for_peer_id(&self, peer_id: PeerId) -> Option<&RemoteParticipant> {
-        self.remote_participants
-            .values()
-            .find(|p| p.peer_id == peer_id)
-    }
-
-    pub fn role_for_user(&self, user_id: u64) -> Option<proto::ChannelRole> {
-        self.remote_participants
-            .get(&user_id)
-            .map(|participant| participant.role)
-    }
-
-    pub fn contains_guests(&self) -> bool {
-        self.local_participant.role == proto::ChannelRole::Guest
-            || self
-                .remote_participants
-                .values()
-                .any(|p| p.role == proto::ChannelRole::Guest)
-    }
-
-    pub fn local_participant_is_admin(&self) -> bool {
-        self.local_participant.role == proto::ChannelRole::Admin
-    }
-
-    pub fn local_participant_is_guest(&self) -> bool {
-        self.local_participant.role == proto::ChannelRole::Guest
-    }
-
-    pub fn set_participant_role(
-        &mut self,
-        user_id: u64,
-        role: proto::ChannelRole,
-        cx: &Context<Self>,
-    ) -> Task<Result<()>> {
-        let client = self.client.clone();
-        let room_id = self.id;
-        let role = role.into();
-        cx.spawn(async move |_, _| {
-            client
-                .request(proto::SetRoomParticipantRole {
-                    room_id,
-                    user_id,
-                    role,
-                })
-                .await
-                .map(|_| ())
-        })
-    }
-
-    pub fn pending_participants(&self) -> &[Arc<User>] {
-        &self.pending_participants
-    }
-
-    pub fn contains_participant(&self, user_id: u64) -> bool {
-        self.participant_user_ids.contains(&user_id)
-    }
-
-    pub fn followers_for(&self, leader_id: PeerId, project_id: u64) -> &[PeerId] {
-        self.follows_by_leader_id_project_id
-            .get(&(leader_id, project_id))
-            .map_or(&[], |v| v.as_slice())
-    }
-
-    /// Returns the most 'active' projects, defined as most people in the project
-    pub fn most_active_project(&self, cx: &App) -> Option<(u64, u64)> {
-        let mut project_hosts_and_guest_counts = HashMap::<u64, (Option<u64>, u32)>::default();
-        for participant in self.remote_participants.values() {
-            match participant.location {
-                ParticipantLocation::SharedProject { project_id } => {
-                    project_hosts_and_guest_counts
-                        .entry(project_id)
-                        .or_default()
-                        .1 += 1;
-                }
-                ParticipantLocation::External | ParticipantLocation::UnsharedProject => {}
-            }
-            for project in &participant.projects {
-                project_hosts_and_guest_counts
-                    .entry(project.id)
-                    .or_default()
-                    .0 = Some(participant.user.id);
-            }
-        }
-
-        if let Some(user) = self.user_store.read(cx).current_user() {
-            for project in &self.local_participant.projects {
-                project_hosts_and_guest_counts
-                    .entry(project.id)
-                    .or_default()
-                    .0 = Some(user.id);
-            }
-        }
-
-        project_hosts_and_guest_counts
-            .into_iter()
-            .filter_map(|(id, (host, guest_count))| Some((id, host?, guest_count)))
-            .max_by_key(|(_, _, guest_count)| *guest_count)
-            .map(|(id, host, _)| (id, host))
-    }
-
-    async fn handle_room_updated(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::RoomUpdated>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        let room = envelope.payload.room.context("invalid room")?;
-        this.update(&mut cx, |this, cx| this.apply_room_update(room, cx))?
-    }
-
-    fn apply_room_update(&mut self, room: proto::Room, cx: &mut Context<Self>) -> Result<()> {
-        log::trace!(
-            "client {:?}. room update: {:?}",
-            self.client.user_id(),
-            &room
-        );
-
-        self.pending_room_update = Some(self.start_room_connection(room, cx));
-
-        cx.notify();
-        Ok(())
-    }
-
-    pub fn room_update_completed(&mut self) -> impl Future<Output = ()> + use<> {
-        let mut done_rx = self.room_update_completed_rx.clone();
-        async move {
-            while let Some(result) = done_rx.next().await {
-                if result.is_some() {
-                    break;
-                }
-            }
-        }
-    }
-
-    fn start_room_connection(&self, mut room: proto::Room, cx: &mut Context<Self>) -> Task<()> {
-        // Filter ourselves out from the room's participants.
-        let local_participant_ix = room
-            .participants
-            .iter()
-            .position(|participant| Some(participant.user_id) == self.client.user_id());
-        let local_participant = local_participant_ix.map(|ix| room.participants.swap_remove(ix));
-
-        let pending_participant_user_ids = room
-            .pending_participants
-            .iter()
-            .map(|p| p.user_id)
-            .collect::<Vec<_>>();
-
-        let remote_participant_user_ids = room
-            .participants
-            .iter()
-            .map(|p| p.user_id)
-            .collect::<Vec<_>>();
-
-        let (remote_participants, pending_participants) =
-            self.user_store.update(cx, move |user_store, cx| {
-                (
-                    user_store.get_users(remote_participant_user_ids, cx),
-                    user_store.get_users(pending_participant_user_ids, cx),
-                )
-            });
-        cx.spawn(async move |this, cx| {
-            let (remote_participants, pending_participants) =
-                futures::join!(remote_participants, pending_participants);
-
-            this.update(cx, |this, cx| {
-                this.participant_user_ids.clear();
-
-                if let Some(participant) = local_participant {
-                    let role = participant.role();
-                    this.local_participant.projects = participant.projects;
-                    if this.local_participant.role != role {
-                        this.local_participant.role = role;
-
-                        if role == proto::ChannelRole::Guest {
-                            for project in mem::take(&mut this.shared_projects) {
-                                if let Some(project) = project.upgrade() {
-                                    this.unshare_project(project, cx).log_err();
-                                }
-                            }
-                            this.local_participant.projects.clear();
-                            if let Some(livekit_room) = &mut this.live_kit {
-                                livekit_room.stop_publishing(cx);
-                            }
-                        }
-
-                        this.joined_projects.retain(|project| {
-                            if let Some(project) = project.upgrade() {
-                                project.update(cx, |project, cx| project.set_role(role, cx));
-                                true
-                            } else {
-                                false
-                            }
-                        });
-                    }
-                } else {
-                    this.local_participant.projects.clear();
-                }
-
-                let livekit_participants = this
-                    .live_kit
-                    .as_ref()
-                    .map(|live_kit| live_kit.room.remote_participants());
-
-                if let Some(participants) = remote_participants.log_err() {
-                    for (participant, user) in room.participants.into_iter().zip(participants) {
-                        let Some(peer_id) = participant.peer_id else {
-                            continue;
-                        };
-                        let participant_index = ParticipantIndex(participant.participant_index);
-                        this.participant_user_ids.insert(participant.user_id);
-
-                        let old_projects = this
-                            .remote_participants
-                            .get(&participant.user_id)
-                            .into_iter()
-                            .flat_map(|existing| &existing.projects)
-                            .map(|project| project.id)
-                            .collect::<HashSet<_>>();
-                        let new_projects = participant
-                            .projects
-                            .iter()
-                            .map(|project| project.id)
-                            .collect::<HashSet<_>>();
-
-                        for project in &participant.projects {
-                            if !old_projects.contains(&project.id) {
-                                cx.emit(Event::RemoteProjectShared {
-                                    owner: user.clone(),
-                                    project_id: project.id,
-                                    worktree_root_names: project.worktree_root_names.clone(),
-                                });
-                            }
-                        }
-
-                        for unshared_project_id in old_projects.difference(&new_projects) {
-                            this.joined_projects.retain(|project| {
-                                if let Some(project) = project.upgrade() {
-                                    project.update(cx, |project, cx| {
-                                        if project.remote_id() == Some(*unshared_project_id) {
-                                            project.disconnected_from_host(cx);
-                                            false
-                                        } else {
-                                            true
-                                        }
-                                    })
-                                } else {
-                                    false
-                                }
-                            });
-                            cx.emit(Event::RemoteProjectUnshared {
-                                project_id: *unshared_project_id,
-                            });
-                        }
-
-                        let role = participant.role();
-                        let location = ParticipantLocation::from_proto(participant.location)
-                            .unwrap_or(ParticipantLocation::External);
-                        if let Some(remote_participant) =
-                            this.remote_participants.get_mut(&participant.user_id)
-                        {
-                            remote_participant.peer_id = peer_id;
-                            remote_participant.projects = participant.projects;
-                            remote_participant.participant_index = participant_index;
-                            if location != remote_participant.location
-                                || role != remote_participant.role
-                            {
-                                remote_participant.location = location;
-                                remote_participant.role = role;
-                                cx.emit(Event::ParticipantLocationChanged {
-                                    participant_id: peer_id,
-                                });
-                            }
-                        } else {
-                            this.remote_participants.insert(
-                                participant.user_id,
-                                RemoteParticipant {
-                                    user: user.clone(),
-                                    participant_index,
-                                    peer_id,
-                                    projects: participant.projects,
-                                    location,
-                                    role,
-                                    muted: true,
-                                    speaking: false,
-                                    video_tracks: Default::default(),
-                                    audio_tracks: Default::default(),
-                                },
-                            );
-
-                            // When joining a room start_room_connection gets
-                            // called but we have already played the join sound.
-                            // Dont play extra sounds over that.
-                            if this.created.elapsed() > Duration::from_millis(100) {
-                                if let proto::ChannelRole::Guest = role {
-                                    Audio::play_sound(Sound::GuestJoined, cx);
-                                } else {
-                                    Audio::play_sound(Sound::Joined, cx);
-                                }
-                            }
-
-                            if let Some(livekit_participants) = &livekit_participants
-                                && let Some(livekit_participant) = livekit_participants
-                                    .get(&ParticipantIdentity(user.id.to_string()))
-                            {
-                                for publication in
-                                    livekit_participant.track_publications().into_values()
-                                {
-                                    if let Some(track) = publication.track() {
-                                        this.livekit_room_updated(
-                                            RoomEvent::TrackSubscribed {
-                                                track,
-                                                publication,
-                                                participant: livekit_participant.clone(),
-                                            },
-                                            cx,
-                                        )
-                                        .warn_on_err();
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                    this.remote_participants.retain(|user_id, participant| {
-                        if this.participant_user_ids.contains(user_id) {
-                            true
-                        } else {
-                            for project in &participant.projects {
-                                cx.emit(Event::RemoteProjectUnshared {
-                                    project_id: project.id,
-                                });
-                            }
-                            false
-                        }
-                    });
-                }
-
-                if let Some(pending_participants) = pending_participants.log_err() {
-                    this.pending_participants = pending_participants;
-                    for participant in &this.pending_participants {
-                        this.participant_user_ids.insert(participant.id);
-                    }
-                }
-
-                this.follows_by_leader_id_project_id.clear();
-                for follower in room.followers {
-                    let project_id = follower.project_id;
-                    let (leader, follower) = match (follower.leader_id, follower.follower_id) {
-                        (Some(leader), Some(follower)) => (leader, follower),
-
-                        _ => {
-                            log::error!("Follower message {follower:?} missing some state");
-                            continue;
-                        }
-                    };
-
-                    let list = this
-                        .follows_by_leader_id_project_id
-                        .entry((leader, project_id))
-                        .or_default();
-                    if !list.contains(&follower) {
-                        list.push(follower);
-                    }
-                }
-
-                this.pending_room_update.take();
-                if this.should_leave() {
-                    log::info!("room is empty, leaving");
-                    this.leave(cx).detach();
-                }
-
-                this.user_store.update(cx, |user_store, cx| {
-                    let participant_indices_by_user_id = this
-                        .remote_participants
-                        .iter()
-                        .map(|(user_id, participant)| (*user_id, participant.participant_index))
-                        .collect();
-                    user_store.set_participant_indices(participant_indices_by_user_id, cx);
-                });
-
-                this.check_invariants();
-                this.room_update_completed_tx.try_send(Some(())).ok();
-                cx.notify();
-            })
-            .ok();
-        })
-    }
-
-    fn livekit_room_updated(&mut self, event: RoomEvent, cx: &mut Context<Self>) -> Result<()> {
-        log::trace!(
-            "client {:?}. livekit event: {:?}",
-            self.client.user_id(),
-            &event
-        );
-
-        match event {
-            RoomEvent::TrackSubscribed {
-                track,
-                participant,
-                publication,
-            } => {
-                let user_id = participant.identity().0.parse()?;
-                let track_id = track.sid();
-                let participant =
-                    self.remote_participants
-                        .get_mut(&user_id)
-                        .with_context(|| {
-                            format!(
-                                "{:?} subscribed to track by unknown participant {user_id}",
-                                self.client.user_id()
-                            )
-                        })?;
-                if self.live_kit.as_ref().is_none_or(|kit| kit.deafened) && publication.is_audio() {
-                    publication.set_enabled(false, cx);
-                }
-                match track {
-                    livekit_client::RemoteTrack::Audio(track) => {
-                        cx.emit(Event::RemoteAudioTracksChanged {
-                            participant_id: participant.peer_id,
-                        });
-                        if let Some(live_kit) = self.live_kit.as_ref() {
-                            let stream = live_kit.room.play_remote_audio_track(&track, cx)?;
-                            participant.audio_tracks.insert(track_id, (track, stream));
-                            participant.muted = publication.is_muted();
-                        }
-                    }
-                    livekit_client::RemoteTrack::Video(track) => {
-                        cx.emit(Event::RemoteVideoTracksChanged {
-                            participant_id: participant.peer_id,
-                        });
-                        participant.video_tracks.insert(track_id, track);
-                    }
-                }
-            }
-
-            RoomEvent::TrackUnsubscribed {
-                track, participant, ..
-            } => {
-                let user_id = participant.identity().0.parse()?;
-                let participant =
-                    self.remote_participants
-                        .get_mut(&user_id)
-                        .with_context(|| {
-                            format!(
-                                "{:?}, unsubscribed from track by unknown participant {user_id}",
-                                self.client.user_id()
-                            )
-                        })?;
-                match track {
-                    livekit_client::RemoteTrack::Audio(track) => {
-                        participant.audio_tracks.remove(&track.sid());
-                        participant.muted = true;
-                        cx.emit(Event::RemoteAudioTracksChanged {
-                            participant_id: participant.peer_id,
-                        });
-                    }
-                    livekit_client::RemoteTrack::Video(track) => {
-                        participant.video_tracks.remove(&track.sid());
-                        cx.emit(Event::RemoteVideoTracksChanged {
-                            participant_id: participant.peer_id,
-                        });
-                        cx.emit(Event::RemoteVideoTrackUnsubscribed { sid: track.sid() });
-                    }
-                }
-            }
-
-            RoomEvent::ActiveSpeakersChanged { speakers } => {
-                let mut speaker_ids = speakers
-                    .into_iter()
-                    .filter_map(|speaker| speaker.identity().0.parse().ok())
-                    .collect::<Vec<u64>>();
-                speaker_ids.sort_unstable();
-                for (sid, participant) in &mut self.remote_participants {
-                    participant.speaking = speaker_ids.binary_search(sid).is_ok();
-                }
-                if let Some(id) = self.client.user_id()
-                    && let Some(room) = &mut self.live_kit
-                {
-                    room.speaking = speaker_ids.binary_search(&id).is_ok();
-                }
-            }
-
-            RoomEvent::TrackMuted {
-                participant,
-                publication,
-            }
-            | RoomEvent::TrackUnmuted {
-                participant,
-                publication,
-            } => {
-                let mut found = false;
-                let user_id = participant.identity().0.parse()?;
-                let track_id = publication.sid();
-                if let Some(participant) = self.remote_participants.get_mut(&user_id) {
-                    for (track, _) in participant.audio_tracks.values() {
-                        if track.sid() == track_id {
-                            found = true;
-                            break;
-                        }
-                    }
-                    if found {
-                        participant.muted = publication.is_muted();
-                    }
-                }
-            }
-
-            RoomEvent::LocalTrackUnpublished { publication, .. } => {
-                log::info!("unpublished track {}", publication.sid());
-                if let Some(room) = &mut self.live_kit {
-                    if let LocalTrack::Published {
-                        track_publication, ..
-                    } = &room.microphone_track
-                        && track_publication.sid() == publication.sid()
-                    {
-                        room.microphone_track = LocalTrack::None;
-                    }
-                    if let LocalTrack::Published {
-                        track_publication, ..
-                    } = &room.screen_track
-                        && track_publication.sid() == publication.sid()
-                    {
-                        room.screen_track = LocalTrack::None;
-                    }
-                }
-            }
-
-            RoomEvent::LocalTrackPublished { publication, .. } => {
-                log::info!("published track {:?}", publication.sid());
-            }
-
-            RoomEvent::Disconnected { reason } => {
-                log::info!("disconnected from room: {reason:?}");
-                self.leave(cx).detach_and_log_err(cx);
-            }
-            _ => {}
-        }
-
-        cx.notify();
-        Ok(())
-    }
-
-    fn check_invariants(&self) {
-        #[cfg(any(test, feature = "test-support"))]
-        {
-            for participant in self.remote_participants.values() {
-                assert!(self.participant_user_ids.contains(&participant.user.id));
-                assert_ne!(participant.user.id, self.client.user_id().unwrap());
-            }
-
-            for participant in &self.pending_participants {
-                assert!(self.participant_user_ids.contains(&participant.id));
-                assert_ne!(participant.id, self.client.user_id().unwrap());
-            }
-
-            assert_eq!(
-                self.participant_user_ids.len(),
-                self.remote_participants.len() + self.pending_participants.len()
-            );
-        }
-    }
-
-    pub(crate) fn call(
-        &mut self,
-        called_user_id: u64,
-        initial_project_id: Option<u64>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        if self.status.is_offline() {
-            return Task::ready(Err(anyhow!("room is offline")));
-        }
-
-        cx.notify();
-        let client = self.client.clone();
-        let room_id = self.id;
-        self.pending_call_count += 1;
-        cx.spawn(async move |this, cx| {
-            let result = client
-                .request(proto::Call {
-                    room_id,
-                    called_user_id,
-                    initial_project_id,
-                })
-                .await;
-            this.update(cx, |this, cx| {
-                this.pending_call_count -= 1;
-                if this.should_leave() {
-                    this.leave(cx).detach_and_log_err(cx);
-                }
-            })?;
-            result?;
-            Ok(())
-        })
-    }
-
-    pub fn join_project(
-        &mut self,
-        id: u64,
-        language_registry: Arc<LanguageRegistry>,
-        fs: Arc<dyn Fs>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Entity<Project>>> {
-        let client = self.client.clone();
-        let user_store = self.user_store.clone();
-        cx.emit(Event::RemoteProjectJoined { project_id: id });
-        cx.spawn(async move |this, cx| {
-            let project =
-                Project::in_room(id, client, user_store, language_registry, fs, cx.clone()).await?;
-
-            this.update(cx, |this, cx| {
-                this.joined_projects.retain(|project| {
-                    if let Some(project) = project.upgrade() {
-                        !project.read(cx).is_disconnected(cx)
-                    } else {
-                        false
-                    }
-                });
-                this.joined_projects.insert(project.downgrade());
-            })?;
-            Ok(project)
-        })
-    }
-
-    pub fn share_project(
-        &mut self,
-        project: Entity<Project>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<u64>> {
-        if let Some(project_id) = project.read(cx).remote_id() {
-            return Task::ready(Ok(project_id));
-        }
-
-        let request = self.client.request(proto::ShareProject {
-            room_id: self.id(),
-            worktrees: project.read(cx).worktree_metadata_protos(cx),
-            is_ssh_project: project.read(cx).is_via_remote_server(),
-            windows_paths: Some(project.read(cx).path_style(cx) == PathStyle::Windows),
-        });
-
-        cx.spawn(async move |this, cx| {
-            let response = request.await?;
-
-            project.update(cx, |project, cx| project.shared(response.project_id, cx))??;
-
-            // If the user's location is in this project, it changes from UnsharedProject to SharedProject.
-            this.update(cx, |this, cx| {
-                this.shared_projects.insert(project.downgrade());
-                let active_project = this.local_participant.active_project.as_ref();
-                if active_project.is_some_and(|location| *location == project) {
-                    this.set_location(Some(&project), cx)
-                } else {
-                    Task::ready(Ok(()))
-                }
-            })?
-            .await?;
-
-            Ok(response.project_id)
-        })
-    }
-
-    pub(crate) fn unshare_project(
-        &mut self,
-        project: Entity<Project>,
-        cx: &mut Context<Self>,
-    ) -> Result<()> {
-        let project_id = match project.read(cx).remote_id() {
-            Some(project_id) => project_id,
-            None => return Ok(()),
-        };
-
-        self.client.send(proto::UnshareProject { project_id })?;
-        project.update(cx, |this, cx| this.unshare(cx))?;
-
-        if self.local_participant.active_project == Some(project.downgrade()) {
-            self.set_location(Some(&project), cx).detach_and_log_err(cx);
-        }
-        Ok(())
-    }
-
-    pub(crate) fn set_location(
-        &mut self,
-        project: Option<&Entity<Project>>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        if self.status.is_offline() {
-            return Task::ready(Err(anyhow!("room is offline")));
-        }
-
-        let client = self.client.clone();
-        let room_id = self.id;
-        let location = if let Some(project) = project {
-            self.local_participant.active_project = Some(project.downgrade());
-            if let Some(project_id) = project.read(cx).remote_id() {
-                proto::participant_location::Variant::SharedProject(
-                    proto::participant_location::SharedProject { id: project_id },
-                )
-            } else {
-                proto::participant_location::Variant::UnsharedProject(
-                    proto::participant_location::UnsharedProject {},
-                )
-            }
-        } else {
-            self.local_participant.active_project = None;
-            proto::participant_location::Variant::External(proto::participant_location::External {})
-        };
-
-        cx.notify();
-        cx.background_spawn(async move {
-            client
-                .request(proto::UpdateParticipantLocation {
-                    room_id,
-                    location: Some(proto::ParticipantLocation {
-                        variant: Some(location),
-                    }),
-                })
-                .await?;
-            Ok(())
-        })
-    }
-
-    pub fn is_sharing_screen(&self) -> bool {
-        self.live_kit
-            .as_ref()
-            .is_some_and(|live_kit| !matches!(live_kit.screen_track, LocalTrack::None))
-    }
-
-    pub fn shared_screen_id(&self) -> Option<u64> {
-        self.live_kit.as_ref().and_then(|lk| match lk.screen_track {
-            LocalTrack::Published { ref _stream, .. } => {
-                _stream.metadata().ok().map(|meta| meta.id)
-            }
-            _ => None,
-        })
-    }
-
-    pub fn is_sharing_mic(&self) -> bool {
-        self.live_kit
-            .as_ref()
-            .is_some_and(|live_kit| !matches!(live_kit.microphone_track, LocalTrack::None))
-    }
-
-    pub fn is_muted(&self) -> bool {
-        self.live_kit.as_ref().is_some_and(|live_kit| {
-            matches!(live_kit.microphone_track, LocalTrack::None)
-                || live_kit.muted_by_user
-                || live_kit.deafened
-        })
-    }
-
-    pub fn muted_by_user(&self) -> bool {
-        self.live_kit
-            .as_ref()
-            .is_some_and(|live_kit| live_kit.muted_by_user)
-    }
-
-    pub fn is_speaking(&self) -> bool {
-        self.live_kit
-            .as_ref()
-            .is_some_and(|live_kit| live_kit.speaking)
-    }
-
-    pub fn is_deafened(&self) -> Option<bool> {
-        self.live_kit.as_ref().map(|live_kit| live_kit.deafened)
-    }
-
-    pub fn can_use_microphone(&self) -> bool {
-        use proto::ChannelRole::*;
-
-        match self.local_participant.role {
-            Admin | Member | Talker => true,
-            Guest | Banned => false,
-        }
-    }
-
-    pub fn can_share_projects(&self) -> bool {
-        use proto::ChannelRole::*;
-        match self.local_participant.role {
-            Admin | Member => true,
-            Guest | Banned | Talker => false,
-        }
-    }
-
-    #[track_caller]
-    pub fn share_microphone(&mut self, cx: &mut Context<Self>) -> Task<Result<()>> {
-        if self.status.is_offline() {
-            return Task::ready(Err(anyhow!("room is offline")));
-        }
-
-        let (room, publish_id) = if let Some(live_kit) = self.live_kit.as_mut() {
-            let publish_id = post_inc(&mut live_kit.next_publish_id);
-            live_kit.microphone_track = LocalTrack::Pending { publish_id };
-            cx.notify();
-            (live_kit.room.clone(), publish_id)
-        } else {
-            return Task::ready(Err(anyhow!("live-kit was not initialized")));
-        };
-
-        let is_staff = cx.is_staff();
-        let user_name = self
-            .user_store
-            .read(cx)
-            .current_user()
-            .and_then(|user| user.name.clone())
-            .unwrap_or_else(|| "unknown".to_string());
-
-        cx.spawn(async move |this, cx| {
-            let publication = room
-                .publish_local_microphone_track(user_name, is_staff, cx)
-                .await;
-            this.update(cx, |this, cx| {
-                let live_kit = this
-                    .live_kit
-                    .as_mut()
-                    .context("live-kit was not initialized")?;
-
-                let canceled = if let LocalTrack::Pending {
-                    publish_id: cur_publish_id,
-                } = &live_kit.microphone_track
-                {
-                    *cur_publish_id != publish_id
-                } else {
-                    true
-                };
-
-                match publication {
-                    Ok((publication, stream)) => {
-                        if canceled {
-                            cx.spawn(async move |_, cx| {
-                                room.unpublish_local_track(publication.sid(), cx).await
-                            })
-                            .detach_and_log_err(cx)
-                        } else {
-                            if live_kit.muted_by_user || live_kit.deafened {
-                                publication.mute(cx);
-                            }
-                            live_kit.microphone_track = LocalTrack::Published {
-                                track_publication: publication,
-                                _stream: Box::new(stream),
-                            };
-                            cx.notify();
-                        }
-                        Ok(())
-                    }
-                    Err(error) => {
-                        if canceled {
-                            Ok(())
-                        } else {
-                            live_kit.microphone_track = LocalTrack::None;
-                            cx.notify();
-                            Err(error)
-                        }
-                    }
-                }
-            })?
-        })
-    }
-
-    pub fn share_screen(
-        &mut self,
-        source: Rc<dyn ScreenCaptureSource>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        if self.status.is_offline() {
-            return Task::ready(Err(anyhow!("room is offline")));
-        }
-        if self.is_sharing_screen() {
-            return Task::ready(Err(anyhow!("screen was already shared")));
-        }
-
-        let (participant, publish_id) = if let Some(live_kit) = self.live_kit.as_mut() {
-            let publish_id = post_inc(&mut live_kit.next_publish_id);
-            live_kit.screen_track = LocalTrack::Pending { publish_id };
-            cx.notify();
-            (live_kit.room.local_participant(), publish_id)
-        } else {
-            return Task::ready(Err(anyhow!("live-kit was not initialized")));
-        };
-
-        cx.spawn(async move |this, cx| {
-            let publication = participant.publish_screenshare_track(&*source, cx).await;
-
-            this.update(cx, |this, cx| {
-                let live_kit = this
-                    .live_kit
-                    .as_mut()
-                    .context("live-kit was not initialized")?;
-
-                let canceled = if let LocalTrack::Pending {
-                    publish_id: cur_publish_id,
-                } = &live_kit.screen_track
-                {
-                    *cur_publish_id != publish_id
-                } else {
-                    true
-                };
-
-                match publication {
-                    Ok((publication, stream)) => {
-                        if canceled {
-                            cx.spawn(async move |_, cx| {
-                                participant.unpublish_track(publication.sid(), cx).await
-                            })
-                            .detach()
-                        } else {
-                            live_kit.screen_track = LocalTrack::Published {
-                                track_publication: publication,
-                                _stream: stream,
-                            };
-                            cx.notify();
-                        }
-
-                        Audio::play_sound(Sound::StartScreenshare, cx);
-                        Ok(())
-                    }
-                    Err(error) => {
-                        if canceled {
-                            Ok(())
-                        } else {
-                            live_kit.screen_track = LocalTrack::None;
-                            cx.notify();
-                            Err(error)
-                        }
-                    }
-                }
-            })?
-        })
-    }
-
-    pub fn toggle_mute(&mut self, cx: &mut Context<Self>) {
-        if let Some(live_kit) = self.live_kit.as_mut() {
-            // When unmuting, undeafen if the user was deafened before.
-            let was_deafened = live_kit.deafened;
-            if live_kit.muted_by_user
-                || live_kit.deafened
-                || matches!(live_kit.microphone_track, LocalTrack::None)
-            {
-                live_kit.muted_by_user = false;
-                live_kit.deafened = false;
-            } else {
-                live_kit.muted_by_user = true;
-            }
-            let muted = live_kit.muted_by_user;
-            let should_undeafen = was_deafened && !live_kit.deafened;
-
-            if let Some(task) = self.set_mute(muted, cx) {
-                task.detach_and_log_err(cx);
-            }
-
-            if should_undeafen {
-                self.set_deafened(false, cx);
-            }
-        }
-    }
-
-    pub fn toggle_deafen(&mut self, cx: &mut Context<Self>) {
-        if let Some(live_kit) = self.live_kit.as_mut() {
-            // When deafening, mute the microphone if it was not already muted.
-            // When un-deafening, unmute the microphone, unless it was explicitly muted.
-            let deafened = !live_kit.deafened;
-            live_kit.deafened = deafened;
-            let should_change_mute = !live_kit.muted_by_user;
-
-            self.set_deafened(deafened, cx);
-
-            if should_change_mute && let Some(task) = self.set_mute(deafened, cx) {
-                task.detach_and_log_err(cx);
-            }
-        }
-    }
-
-    pub fn unshare_screen(&mut self, play_sound: bool, cx: &mut Context<Self>) -> Result<()> {
-        anyhow::ensure!(!self.status.is_offline(), "room is offline");
-
-        let live_kit = self
-            .live_kit
-            .as_mut()
-            .context("live-kit was not initialized")?;
-        match mem::take(&mut live_kit.screen_track) {
-            LocalTrack::None => anyhow::bail!("screen was not shared"),
-            LocalTrack::Pending { .. } => {
-                cx.notify();
-                Ok(())
-            }
-            LocalTrack::Published {
-                track_publication, ..
-            } => {
-                {
-                    let local_participant = live_kit.room.local_participant();
-                    let sid = track_publication.sid();
-                    cx.spawn(async move |_, cx| local_participant.unpublish_track(sid, cx).await)
-                        .detach_and_log_err(cx);
-                    cx.notify();
-                }
-
-                if play_sound {
-                    Audio::play_sound(Sound::StopScreenshare, cx);
-                }
-
-                Ok(())
-            }
-        }
-    }
-
-    fn set_deafened(&mut self, deafened: bool, cx: &mut Context<Self>) -> Option<()> {
-        {
-            let live_kit = self.live_kit.as_mut()?;
-            cx.notify();
-            for (_, participant) in live_kit.room.remote_participants() {
-                for (_, publication) in participant.track_publications() {
-                    if publication.is_audio() {
-                        publication.set_enabled(!deafened, cx);
-                    }
-                }
-            }
-        }
-
-        None
-    }
-
-    fn set_mute(&mut self, should_mute: bool, cx: &mut Context<Room>) -> Option<Task<Result<()>>> {
-        let live_kit = self.live_kit.as_mut()?;
-        cx.notify();
-
-        if should_mute {
-            Audio::play_sound(Sound::Mute, cx);
-        } else {
-            Audio::play_sound(Sound::Unmute, cx);
-        }
-
-        match &mut live_kit.microphone_track {
-            LocalTrack::None => {
-                if should_mute {
-                    None
-                } else {
-                    Some(self.share_microphone(cx))
-                }
-            }
-            LocalTrack::Pending { .. } => None,
-            LocalTrack::Published {
-                track_publication, ..
-            } => {
-                let guard = Tokio::handle(cx);
-                if should_mute {
-                    track_publication.mute(cx)
-                } else {
-                    track_publication.unmute(cx)
-                }
-                drop(guard);
-
-                None
-            }
-        }
-    }
-}
-
-fn spawn_room_connection(
-    livekit_connection_info: Option<proto::LiveKitConnectionInfo>,
-    cx: &mut Context<Room>,
-) {
-    if let Some(connection_info) = livekit_connection_info {
-        cx.spawn(async move |this, cx| {
-            let (room, mut events) =
-                livekit::Room::connect(connection_info.server_url, connection_info.token, cx)
-                    .await?;
-
-            this.update(cx, |this, cx| {
-                let _handle_updates = cx.spawn(async move |this, cx| {
-                    while let Some(event) = events.next().await {
-                        if this
-                            .update(cx, |this, cx| {
-                                this.livekit_room_updated(event, cx).warn_on_err();
-                            })
-                            .is_err()
-                        {
-                            break;
-                        }
-                    }
-                });
-
-                let muted_by_user = Room::mute_on_join(cx);
-                this.live_kit = Some(LiveKitRoom {
-                    room: Rc::new(room),
-                    screen_track: LocalTrack::None,
-                    microphone_track: LocalTrack::None,
-                    next_publish_id: 0,
-                    muted_by_user,
-                    deafened: false,
-                    speaking: false,
-                    _handle_updates,
-                });
-
-                if !muted_by_user && this.can_use_microphone() {
-                    this.share_microphone(cx)
-                } else {
-                    Task::ready(Ok(()))
-                }
-            })?
-            .await
-        })
-        .detach_and_log_err(cx);
-    }
-}
-
-struct LiveKitRoom {
-    room: Rc<livekit::Room>,
-    screen_track: LocalTrack<dyn ScreenCaptureStream>,
-    microphone_track: LocalTrack<AudioStream>,
-    /// Tracks whether we're currently in a muted state due to auto-mute from deafening or manual mute performed by user.
-    muted_by_user: bool,
-    deafened: bool,
-    speaking: bool,
-    next_publish_id: usize,
-    _handle_updates: Task<()>,
-}
-
-impl LiveKitRoom {
-    fn stop_publishing(&mut self, cx: &mut Context<Room>) {
-        let mut tracks_to_unpublish = Vec::new();
-        if let LocalTrack::Published {
-            track_publication, ..
-        } = mem::replace(&mut self.microphone_track, LocalTrack::None)
-        {
-            tracks_to_unpublish.push(track_publication.sid());
-            cx.notify();
-        }
-
-        if let LocalTrack::Published {
-            track_publication, ..
-        } = mem::replace(&mut self.screen_track, LocalTrack::None)
-        {
-            tracks_to_unpublish.push(track_publication.sid());
-            cx.notify();
-        }
-
-        let participant = self.room.local_participant();
-        cx.spawn(async move |_, cx| {
-            for sid in tracks_to_unpublish {
-                participant.unpublish_track(sid, cx).await.log_err();
-            }
-        })
-        .detach();
-    }
-}
-
-#[derive(Default)]
-enum LocalTrack<Stream: ?Sized> {
-    #[default]
-    None,
-    Pending {
-        publish_id: usize,
-    },
-    Published {
-        track_publication: LocalTrackPublication,
-        _stream: Box<Stream>,
-    },
-}
-
-#[derive(Copy, Clone, PartialEq, Eq)]
-pub enum RoomStatus {
-    Online,
-    Rejoining,
-    Offline,
-}
-
-impl RoomStatus {
-    pub fn is_offline(&self) -> bool {
-        matches!(self, RoomStatus::Offline)
-    }
-
-    pub fn is_online(&self) -> bool {
-        matches!(self, RoomStatus::Online)
-    }
-}
diff --git a/crates/call/src/call_settings.rs b/crates/call/src/call_settings.rs
deleted file mode 100644
index 1b10a8bc34..0000000000
--- a/crates/call/src/call_settings.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-use settings::{RegisterSetting, Settings};
-
-#[derive(Debug, RegisterSetting)]
-pub struct CallSettings {
-    pub mute_on_join: bool,
-    pub share_on_join: bool,
-}
-
-impl Settings for CallSettings {
-    fn from_settings(content: &settings::SettingsContent) -> Self {
-        let call = content.calls.clone().unwrap();
-        CallSettings {
-            mute_on_join: call.mute_on_join.unwrap(),
-            share_on_join: call.share_on_join.unwrap(),
-        }
-    }
-}
diff --git a/crates/channel/Cargo.toml b/crates/channel/Cargo.toml
deleted file mode 100644
index a8664da8e9..0000000000
--- a/crates/channel/Cargo.toml
+++ /dev/null
@@ -1,43 +0,0 @@
-[package]
-name = "channel"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/channel.rs"
-doctest = false
-
-[features]
-test-support = ["collections/test-support", "gpui/test-support", "rpc/test-support"]
-
-[dependencies]
-anyhow.workspace = true
-client.workspace = true
-clock.workspace = true
-collections.workspace = true
-futures.workspace = true
-gpui.workspace = true
-language.workspace = true
-log.workspace = true
-postage.workspace = true
-release_channel.workspace = true
-rpc.workspace = true
-settings.workspace = true
-text.workspace = true
-time.workspace = true
-util.workspace = true
-
-[dev-dependencies]
-collections = { workspace = true, features = ["test-support"] }
-gpui = { workspace = true, features = ["test-support"] }
-rpc = { workspace = true, features = ["test-support"] }
-client = { workspace = true, features = ["test-support"] }
-semver.workspace = true
-settings = { workspace = true, features = ["test-support"] }
-util = { workspace = true, features = ["test-support"] }
-http_client = { workspace = true, features = ["test-support"] }
diff --git a/crates/channel/LICENSE-GPL b/crates/channel/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/channel/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/channel/src/channel.rs b/crates/channel/src/channel.rs
deleted file mode 100644
index 6cc5a0e881..0000000000
--- a/crates/channel/src/channel.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-mod channel_buffer;
-mod channel_store;
-
-use client::{Client, UserStore};
-use gpui::{App, Entity};
-use std::sync::Arc;
-
-pub use channel_buffer::{ACKNOWLEDGE_DEBOUNCE_INTERVAL, ChannelBuffer, ChannelBufferEvent};
-pub use channel_store::{Channel, ChannelEvent, ChannelMembership, ChannelStore};
-
-#[cfg(test)]
-mod channel_store_tests;
-
-pub fn init(client: &Arc<Client>, user_store: Entity<UserStore>, cx: &mut App) {
-    channel_store::init(client, user_store, cx);
-    channel_buffer::init(&client.clone().into());
-}
diff --git a/crates/channel/src/channel_buffer.rs b/crates/channel/src/channel_buffer.rs
deleted file mode 100644
index efa0850753..0000000000
--- a/crates/channel/src/channel_buffer.rs
+++ /dev/null
@@ -1,283 +0,0 @@
-use crate::{Channel, ChannelStore};
-use anyhow::Result;
-use client::{ChannelId, Client, Collaborator, UserStore, ZED_ALWAYS_ACTIVE};
-use collections::HashMap;
-use gpui::{App, AppContext as _, AsyncApp, Context, Entity, EventEmitter, Task};
-use language::proto::serialize_version;
-use rpc::{
-    AnyProtoClient, TypedEnvelope,
-    proto::{self, PeerId},
-};
-use std::{sync::Arc, time::Duration};
-use text::{BufferId, ReplicaId};
-use util::ResultExt;
-
-pub const ACKNOWLEDGE_DEBOUNCE_INTERVAL: Duration = Duration::from_millis(250);
-
-pub(crate) fn init(client: &AnyProtoClient) {
-    client.add_entity_message_handler(ChannelBuffer::handle_update_channel_buffer);
-    client.add_entity_message_handler(ChannelBuffer::handle_update_channel_buffer_collaborators);
-}
-
-pub struct ChannelBuffer {
-    pub channel_id: ChannelId,
-    connected: bool,
-    collaborators: HashMap<PeerId, Collaborator>,
-    user_store: Entity<UserStore>,
-    channel_store: Entity<ChannelStore>,
-    buffer: Entity<language::Buffer>,
-    buffer_epoch: u64,
-    client: Arc<Client>,
-    subscription: Option<client::Subscription>,
-    acknowledge_task: Option<Task<Result<()>>>,
-}
-
-pub enum ChannelBufferEvent {
-    CollaboratorsChanged,
-    Disconnected,
-    Connected,
-    BufferEdited,
-    ChannelChanged,
-}
-
-impl EventEmitter<ChannelBufferEvent> for ChannelBuffer {}
-
-impl ChannelBuffer {
-    pub(crate) async fn new(
-        channel: Arc<Channel>,
-        client: Arc<Client>,
-        user_store: Entity<UserStore>,
-        channel_store: Entity<ChannelStore>,
-        cx: &mut AsyncApp,
-    ) -> Result<Entity<Self>> {
-        let response = client
-            .request(proto::JoinChannelBuffer {
-                channel_id: channel.id.0,
-            })
-            .await?;
-        let buffer_id = BufferId::new(response.buffer_id)?;
-        let base_text = response.base_text;
-        let operations = response
-            .operations
-            .into_iter()
-            .map(language::proto::deserialize_operation)
-            .collect::<Result<Vec<_>, _>>()?;
-
-        let buffer = cx.new(|cx| {
-            let capability = channel_store.read(cx).channel_capability(channel.id);
-            language::Buffer::remote(
-                buffer_id,
-                ReplicaId::new(response.replica_id as u16),
-                capability,
-                base_text,
-            )
-        })?;
-        buffer.update(cx, |buffer, cx| buffer.apply_ops(operations, cx))?;
-
-        let subscription = client.subscribe_to_entity(channel.id.0)?;
-
-        anyhow::Ok(cx.new(|cx| {
-            cx.subscribe(&buffer, Self::on_buffer_update).detach();
-            cx.on_release(Self::release).detach();
-            let mut this = Self {
-                buffer,
-                buffer_epoch: response.epoch,
-                client,
-                connected: true,
-                collaborators: Default::default(),
-                acknowledge_task: None,
-                channel_id: channel.id,
-                subscription: Some(subscription.set_entity(&cx.entity(), &cx.to_async())),
-                user_store,
-                channel_store,
-            };
-            this.replace_collaborators(response.collaborators, cx);
-            this
-        })?)
-    }
-
-    fn release(&mut self, _: &mut App) {
-        if self.connected {
-            if let Some(task) = self.acknowledge_task.take() {
-                task.detach();
-            }
-            self.client
-                .send(proto::LeaveChannelBuffer {
-                    channel_id: self.channel_id.0,
-                })
-                .log_err();
-        }
-    }
-
-    pub fn connected(&mut self, cx: &mut Context<Self>) {
-        self.connected = true;
-        if self.subscription.is_none() {
-            let Ok(subscription) = self.client.subscribe_to_entity(self.channel_id.0) else {
-                return;
-            };
-            self.subscription = Some(subscription.set_entity(&cx.entity(), &cx.to_async()));
-            cx.emit(ChannelBufferEvent::Connected);
-        }
-    }
-
-    pub fn remote_id(&self, cx: &App) -> BufferId {
-        self.buffer.read(cx).remote_id()
-    }
-
-    pub fn user_store(&self) -> &Entity<UserStore> {
-        &self.user_store
-    }
-
-    pub(crate) fn replace_collaborators(
-        &mut self,
-        collaborators: Vec<proto::Collaborator>,
-        cx: &mut Context<Self>,
-    ) {
-        let mut new_collaborators = HashMap::default();
-        for collaborator in collaborators {
-            if let Ok(collaborator) = Collaborator::from_proto(collaborator) {
-                new_collaborators.insert(collaborator.peer_id, collaborator);
-            }
-        }
-
-        for old_collaborator in self.collaborators.values() {
-            if !new_collaborators.contains_key(&old_collaborator.peer_id) {
-                self.buffer.update(cx, |buffer, cx| {
-                    buffer.remove_peer(old_collaborator.replica_id, cx)
-                });
-            }
-        }
-        self.collaborators = new_collaborators;
-        cx.emit(ChannelBufferEvent::CollaboratorsChanged);
-        cx.notify();
-    }
-
-    async fn handle_update_channel_buffer(
-        this: Entity<Self>,
-        update_channel_buffer: TypedEnvelope<proto::UpdateChannelBuffer>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        let ops = update_channel_buffer
-            .payload
-            .operations
-            .into_iter()
-            .map(language::proto::deserialize_operation)
-            .collect::<Result<Vec<_>, _>>()?;
-
-        this.update(&mut cx, |this, cx| {
-            cx.notify();
-            this.buffer
-                .update(cx, |buffer, cx| buffer.apply_ops(ops, cx))
-        })?;
-
-        Ok(())
-    }
-
-    async fn handle_update_channel_buffer_collaborators(
-        this: Entity<Self>,
-        message: TypedEnvelope<proto::UpdateChannelBufferCollaborators>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        this.update(&mut cx, |this, cx| {
-            this.replace_collaborators(message.payload.collaborators, cx);
-            cx.emit(ChannelBufferEvent::CollaboratorsChanged);
-            cx.notify();
-        })
-    }
-
-    fn on_buffer_update(
-        &mut self,
-        _: Entity<language::Buffer>,
-        event: &language::BufferEvent,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            language::BufferEvent::Operation {
-                operation,
-                is_local: true,
-            } => {
-                if *ZED_ALWAYS_ACTIVE
-                    && let language::Operation::UpdateSelections { selections, .. } = operation
-                    && selections.is_empty()
-                {
-                    return;
-                }
-                let operation = language::proto::serialize_operation(operation);
-                self.client
-                    .send(proto::UpdateChannelBuffer {
-                        channel_id: self.channel_id.0,
-                        operations: vec![operation],
-                    })
-                    .log_err();
-            }
-            language::BufferEvent::Edited => {
-                cx.emit(ChannelBufferEvent::BufferEdited);
-            }
-            _ => {}
-        }
-    }
-
-    pub fn acknowledge_buffer_version(&mut self, cx: &mut Context<ChannelBuffer>) {
-        let buffer = self.buffer.read(cx);
-        let version = buffer.version();
-        let buffer_id = buffer.remote_id().into();
-        let client = self.client.clone();
-        let epoch = self.epoch();
-
-        self.acknowledge_task = Some(cx.spawn(async move |_, cx| {
-            cx.background_executor()
-                .timer(ACKNOWLEDGE_DEBOUNCE_INTERVAL)
-                .await;
-            client
-                .send(proto::AckBufferOperation {
-                    buffer_id,
-                    epoch,
-                    version: serialize_version(&version),
-                })
-                .ok();
-            Ok(())
-        }));
-    }
-
-    pub fn epoch(&self) -> u64 {
-        self.buffer_epoch
-    }
-
-    pub fn buffer(&self) -> Entity<language::Buffer> {
-        self.buffer.clone()
-    }
-
-    pub fn collaborators(&self) -> &HashMap<PeerId, Collaborator> {
-        &self.collaborators
-    }
-
-    pub fn channel(&self, cx: &App) -> Option<Arc<Channel>> {
-        self.channel_store
-            .read(cx)
-            .channel_for_id(self.channel_id)
-            .cloned()
-    }
-
-    pub(crate) fn disconnect(&mut self, cx: &mut Context<Self>) {
-        log::info!("channel buffer {} disconnected", self.channel_id);
-        if self.connected {
-            self.connected = false;
-            self.subscription.take();
-            cx.emit(ChannelBufferEvent::Disconnected);
-            cx.notify()
-        }
-    }
-
-    pub(crate) fn channel_changed(&mut self, cx: &mut Context<Self>) {
-        cx.emit(ChannelBufferEvent::ChannelChanged);
-        cx.notify()
-    }
-
-    pub fn is_connected(&self) -> bool {
-        self.connected
-    }
-
-    pub fn replica_id(&self, cx: &App) -> ReplicaId {
-        self.buffer.read(cx).replica_id()
-    }
-}
diff --git a/crates/channel/src/channel_store.rs b/crates/channel/src/channel_store.rs
deleted file mode 100644
index e983d03e0d..0000000000
--- a/crates/channel/src/channel_store.rs
+++ /dev/null
@@ -1,1151 +0,0 @@
-mod channel_index;
-
-use crate::channel_buffer::ChannelBuffer;
-use anyhow::{Context as _, Result, anyhow};
-use channel_index::ChannelIndex;
-use client::{ChannelId, Client, ClientSettings, Subscription, User, UserId, UserStore};
-use collections::{HashMap, HashSet};
-use futures::{Future, FutureExt, StreamExt, channel::mpsc, future::Shared};
-use gpui::{
-    App, AppContext as _, AsyncApp, Context, Entity, EventEmitter, Global, SharedString, Task,
-    WeakEntity,
-};
-use language::Capability;
-use postage::{sink::Sink, watch};
-use rpc::{
-    TypedEnvelope,
-    proto::{self, ChannelRole, ChannelVisibility},
-};
-use settings::Settings;
-use std::{mem, sync::Arc, time::Duration};
-use util::{ResultExt, maybe};
-
-pub const RECONNECT_TIMEOUT: Duration = Duration::from_secs(30);
-
-pub fn init(client: &Arc<Client>, user_store: Entity<UserStore>, cx: &mut App) {
-    let channel_store = cx.new(|cx| ChannelStore::new(client.clone(), user_store.clone(), cx));
-    cx.set_global(GlobalChannelStore(channel_store));
-}
-
-#[derive(Debug, Clone, Default, PartialEq)]
-struct NotesVersion {
-    epoch: u64,
-    version: clock::Global,
-}
-
-pub struct ChannelStore {
-    pub channel_index: ChannelIndex,
-    channel_invitations: Vec<Arc<Channel>>,
-    channel_participants: HashMap<ChannelId, Vec<Arc<User>>>,
-    channel_states: HashMap<ChannelId, ChannelState>,
-    outgoing_invites: HashSet<(ChannelId, UserId)>,
-    update_channels_tx: mpsc::UnboundedSender<proto::UpdateChannels>,
-    opened_buffers: HashMap<ChannelId, OpenEntityHandle<ChannelBuffer>>,
-    client: Arc<Client>,
-    did_subscribe: bool,
-    channels_loaded: (watch::Sender<bool>, watch::Receiver<bool>),
-    user_store: Entity<UserStore>,
-    _rpc_subscriptions: [Subscription; 2],
-    _watch_connection_status: Task<Option<()>>,
-    disconnect_channel_buffers_task: Option<Task<()>>,
-    _update_channels: Task<()>,
-}
-
-#[derive(Clone, Debug)]
-pub struct Channel {
-    pub id: ChannelId,
-    pub name: SharedString,
-    pub visibility: proto::ChannelVisibility,
-    pub parent_path: Vec<ChannelId>,
-    pub channel_order: i32,
-}
-
-#[derive(Default, Debug)]
-pub struct ChannelState {
-    latest_notes_version: NotesVersion,
-    observed_notes_version: NotesVersion,
-    role: Option<ChannelRole>,
-}
-
-impl Channel {
-    pub fn link(&self, cx: &App) -> String {
-        format!(
-            "{}/channel/{}-{}",
-            ClientSettings::get_global(cx).server_url,
-            Self::slug(&self.name),
-            self.id
-        )
-    }
-
-    pub fn notes_link(&self, heading: Option<String>, cx: &App) -> String {
-        self.link(cx)
-            + "/notes"
-            + &heading
-                .map(|h| format!("#{}", Self::slug(&h)))
-                .unwrap_or_default()
-    }
-
-    pub fn is_root_channel(&self) -> bool {
-        self.parent_path.is_empty()
-    }
-
-    pub fn root_id(&self) -> ChannelId {
-        self.parent_path.first().copied().unwrap_or(self.id)
-    }
-
-    pub fn slug(str: &str) -> String {
-        let slug: String = str
-            .chars()
-            .map(|c| if c.is_alphanumeric() { c } else { '-' })
-            .collect();
-
-        slug.trim_matches(|c| c == '-').to_string()
-    }
-}
-
-#[derive(Debug)]
-pub struct ChannelMembership {
-    pub user: Arc<User>,
-    pub kind: proto::channel_member::Kind,
-    pub role: proto::ChannelRole,
-}
-impl ChannelMembership {
-    pub fn sort_key(&self) -> MembershipSortKey<'_> {
-        MembershipSortKey {
-            role_order: match self.role {
-                proto::ChannelRole::Admin => 0,
-                proto::ChannelRole::Member => 1,
-                proto::ChannelRole::Banned => 2,
-                proto::ChannelRole::Talker => 3,
-                proto::ChannelRole::Guest => 4,
-            },
-            kind_order: match self.kind {
-                proto::channel_member::Kind::Member => 0,
-                proto::channel_member::Kind::Invitee => 1,
-            },
-            username_order: &self.user.github_login,
-        }
-    }
-}
-
-#[derive(PartialOrd, Ord, PartialEq, Eq)]
-pub struct MembershipSortKey<'a> {
-    role_order: u8,
-    kind_order: u8,
-    username_order: &'a str,
-}
-
-pub enum ChannelEvent {
-    ChannelCreated(ChannelId),
-    ChannelRenamed(ChannelId),
-}
-
-impl EventEmitter<ChannelEvent> for ChannelStore {}
-
-enum OpenEntityHandle<E> {
-    Open(WeakEntity<E>),
-    Loading(Shared<Task<Result<Entity<E>, Arc<anyhow::Error>>>>),
-}
-
-struct GlobalChannelStore(Entity<ChannelStore>);
-
-impl Global for GlobalChannelStore {}
-
-impl ChannelStore {
-    pub fn global(cx: &App) -> Entity<Self> {
-        cx.global::<GlobalChannelStore>().0.clone()
-    }
-
-    pub fn new(client: Arc<Client>, user_store: Entity<UserStore>, cx: &mut Context<Self>) -> Self {
-        let rpc_subscriptions = [
-            client.add_message_handler(cx.weak_entity(), Self::handle_update_channels),
-            client.add_message_handler(cx.weak_entity(), Self::handle_update_user_channels),
-        ];
-
-        let mut connection_status = client.status();
-        let (update_channels_tx, mut update_channels_rx) = mpsc::unbounded();
-        let watch_connection_status = cx.spawn(async move |this, cx| {
-            while let Some(status) = connection_status.next().await {
-                let this = this.upgrade()?;
-                match status {
-                    client::Status::Connected { .. } => {
-                        this.update(cx, |this, cx| this.handle_connect(cx))
-                            .ok()?
-                            .await
-                            .log_err()?;
-                    }
-                    client::Status::SignedOut | client::Status::UpgradeRequired => {
-                        this.update(cx, |this, cx| this.handle_disconnect(false, cx))
-                            .ok();
-                    }
-                    _ => {
-                        this.update(cx, |this, cx| this.handle_disconnect(true, cx))
-                            .ok();
-                    }
-                }
-            }
-            Some(())
-        });
-
-        Self {
-            channel_invitations: Vec::default(),
-            channel_index: ChannelIndex::default(),
-            channel_participants: Default::default(),
-            outgoing_invites: Default::default(),
-            opened_buffers: Default::default(),
-            update_channels_tx,
-            client,
-            user_store,
-            _rpc_subscriptions: rpc_subscriptions,
-            _watch_connection_status: watch_connection_status,
-            disconnect_channel_buffers_task: None,
-            _update_channels: cx.spawn(async move |this, cx| {
-                maybe!(async move {
-                    while let Some(update_channels) = update_channels_rx.next().await {
-                        if let Some(this) = this.upgrade() {
-                            let update_task = this
-                                .update(cx, |this, cx| this.update_channels(update_channels, cx))?;
-                            if let Some(update_task) = update_task {
-                                update_task.await.log_err();
-                            }
-                        }
-                    }
-                    anyhow::Ok(())
-                })
-                .await
-                .log_err();
-            }),
-            channel_states: Default::default(),
-            did_subscribe: false,
-            channels_loaded: watch::channel_with(false),
-        }
-    }
-
-    pub fn initialize(&mut self) {
-        if !self.did_subscribe
-            && self
-                .client
-                .send(proto::SubscribeToChannels {})
-                .log_err()
-                .is_some()
-        {
-            self.did_subscribe = true;
-        }
-    }
-
-    pub fn wait_for_channels(
-        &mut self,
-        timeout: Duration,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let mut channels_loaded_rx = self.channels_loaded.1.clone();
-        if *channels_loaded_rx.borrow() {
-            return Task::ready(Ok(()));
-        }
-
-        let mut status_receiver = self.client.status();
-        if status_receiver.borrow().is_connected() {
-            self.initialize();
-        }
-
-        let mut timer = cx.background_executor().timer(timeout).fuse();
-        cx.spawn(async move |this, cx| {
-            loop {
-                futures::select_biased! {
-                    channels_loaded = channels_loaded_rx.next().fuse() => {
-                        if let Some(true) = channels_loaded {
-                            return Ok(());
-                        }
-                    }
-                    status = status_receiver.next().fuse() => {
-                        if let Some(status) = status
-                            && status.is_connected() {
-                                this.update(cx, |this, _cx| {
-                                    this.initialize();
-                                }).ok();
-                            }
-                        continue;
-                    }
-                    _ = timer => {
-                        return Err(anyhow!("{:?} elapsed without receiving channels", timeout));
-                    }
-                }
-            }
-        })
-    }
-
-    pub fn client(&self) -> Arc<Client> {
-        self.client.clone()
-    }
-
-    /// Returns the number of unique channels in the store
-    pub fn channel_count(&self) -> usize {
-        self.channel_index.by_id().len()
-    }
-
-    /// Returns the index of a channel ID in the list of unique channels
-    pub fn index_of_channel(&self, channel_id: ChannelId) -> Option<usize> {
-        self.channel_index
-            .by_id()
-            .keys()
-            .position(|id| *id == channel_id)
-    }
-
-    /// Returns an iterator over all unique channels
-    pub fn channels(&self) -> impl '_ + Iterator<Item = &Arc<Channel>> {
-        self.channel_index.by_id().values()
-    }
-
-    /// Iterate over all entries in the channel DAG
-    pub fn ordered_channels(&self) -> impl '_ + Iterator<Item = (usize, &Arc<Channel>)> {
-        self.channel_index
-            .ordered_channels()
-            .iter()
-            .filter_map(move |id| {
-                let channel = self.channel_index.by_id().get(id)?;
-                Some((channel.parent_path.len(), channel))
-            })
-    }
-
-    pub fn channel_at_index(&self, ix: usize) -> Option<&Arc<Channel>> {
-        let channel_id = self.channel_index.ordered_channels().get(ix)?;
-        self.channel_index.by_id().get(channel_id)
-    }
-
-    pub fn channel_at(&self, ix: usize) -> Option<&Arc<Channel>> {
-        self.channel_index.by_id().values().nth(ix)
-    }
-
-    pub fn has_channel_invitation(&self, channel_id: ChannelId) -> bool {
-        self.channel_invitations
-            .iter()
-            .any(|channel| channel.id == channel_id)
-    }
-
-    pub fn channel_invitations(&self) -> &[Arc<Channel>] {
-        &self.channel_invitations
-    }
-
-    pub fn channel_for_id(&self, channel_id: ChannelId) -> Option<&Arc<Channel>> {
-        self.channel_index.by_id().get(&channel_id)
-    }
-
-    pub fn has_open_channel_buffer(&self, channel_id: ChannelId, _cx: &App) -> bool {
-        if let Some(buffer) = self.opened_buffers.get(&channel_id)
-            && let OpenEntityHandle::Open(buffer) = buffer
-        {
-            return buffer.upgrade().is_some();
-        }
-        false
-    }
-
-    pub fn open_channel_buffer(
-        &mut self,
-        channel_id: ChannelId,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Entity<ChannelBuffer>>> {
-        let client = self.client.clone();
-        let user_store = self.user_store.clone();
-        let channel_store = cx.entity();
-        self.open_channel_resource(
-            channel_id,
-            "notes",
-            |this| &mut this.opened_buffers,
-            async move |channel, cx| {
-                ChannelBuffer::new(channel, client, user_store, channel_store, cx).await
-            },
-            cx,
-        )
-    }
-
-    pub fn has_channel_buffer_changed(&self, channel_id: ChannelId) -> bool {
-        self.channel_states
-            .get(&channel_id)
-            .is_some_and(|state| state.has_channel_buffer_changed())
-    }
-
-    pub fn acknowledge_notes_version(
-        &mut self,
-        channel_id: ChannelId,
-        epoch: u64,
-        version: &clock::Global,
-        cx: &mut Context<Self>,
-    ) {
-        self.channel_states
-            .entry(channel_id)
-            .or_default()
-            .acknowledge_notes_version(epoch, version);
-        cx.notify()
-    }
-
-    pub fn update_latest_notes_version(
-        &mut self,
-        channel_id: ChannelId,
-        epoch: u64,
-        version: &clock::Global,
-        cx: &mut Context<Self>,
-    ) {
-        self.channel_states
-            .entry(channel_id)
-            .or_default()
-            .update_latest_notes_version(epoch, version);
-        cx.notify()
-    }
-
-    /// Asynchronously open a given resource associated with a channel.
-    ///
-    /// Make sure that the resource is only opened once, even if this method
-    /// is called multiple times with the same channel id while the first task
-    /// is still running.
-    fn open_channel_resource<T, F>(
-        &mut self,
-        channel_id: ChannelId,
-        resource_name: &'static str,
-        get_map: fn(&mut Self) -> &mut HashMap<ChannelId, OpenEntityHandle<T>>,
-        load: F,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Entity<T>>>
-    where
-        F: AsyncFnOnce(Arc<Channel>, &mut AsyncApp) -> Result<Entity<T>> + 'static,
-        T: 'static,
-    {
-        let task = loop {
-            match get_map(self).get(&channel_id) {
-                Some(OpenEntityHandle::Open(entity)) => {
-                    if let Some(entity) = entity.upgrade() {
-                        break Task::ready(Ok(entity)).shared();
-                    } else {
-                        get_map(self).remove(&channel_id);
-                        continue;
-                    }
-                }
-                Some(OpenEntityHandle::Loading(task)) => break task.clone(),
-                None => {}
-            }
-
-            let channels_ready = self.wait_for_channels(Duration::from_secs(10), cx);
-            let task = cx
-                .spawn(async move |this, cx| {
-                    channels_ready.await?;
-                    let channel = this.read_with(cx, |this, _| {
-                        this.channel_for_id(channel_id)
-                            .cloned()
-                            .ok_or_else(|| Arc::new(anyhow!("no channel for id: {channel_id}")))
-                    })??;
-
-                    load(channel, cx).await.map_err(Arc::new)
-                })
-                .shared();
-
-            get_map(self).insert(channel_id, OpenEntityHandle::Loading(task.clone()));
-            let task = cx.spawn({
-                async move |this, cx| {
-                    let result = task.await;
-                    this.update(cx, |this, _| match &result {
-                        Ok(model) => {
-                            get_map(this)
-                                .insert(channel_id, OpenEntityHandle::Open(model.downgrade()));
-                        }
-                        Err(_) => {
-                            get_map(this).remove(&channel_id);
-                        }
-                    })?;
-                    result
-                }
-            });
-            break task.shared();
-        };
-        cx.background_spawn(async move {
-            task.await.map_err(|error| {
-                anyhow!("{error}").context(format!("failed to open channel {resource_name}"))
-            })
-        })
-    }
-
-    pub fn is_channel_admin(&self, channel_id: ChannelId) -> bool {
-        self.channel_role(channel_id) == proto::ChannelRole::Admin
-    }
-
-    pub fn is_root_channel(&self, channel_id: ChannelId) -> bool {
-        self.channel_index
-            .by_id()
-            .get(&channel_id)
-            .is_some_and(|channel| channel.is_root_channel())
-    }
-
-    pub fn is_public_channel(&self, channel_id: ChannelId) -> bool {
-        self.channel_index
-            .by_id()
-            .get(&channel_id)
-            .is_some_and(|channel| channel.visibility == ChannelVisibility::Public)
-    }
-
-    pub fn channel_capability(&self, channel_id: ChannelId) -> Capability {
-        match self.channel_role(channel_id) {
-            ChannelRole::Admin | ChannelRole::Member => Capability::ReadWrite,
-            _ => Capability::ReadOnly,
-        }
-    }
-
-    pub fn channel_role(&self, channel_id: ChannelId) -> proto::ChannelRole {
-        maybe!({
-            let mut channel = self.channel_for_id(channel_id)?;
-            if !channel.is_root_channel() {
-                channel = self.channel_for_id(channel.root_id())?;
-            }
-            let root_channel_state = self.channel_states.get(&channel.id);
-            root_channel_state?.role
-        })
-        .unwrap_or(proto::ChannelRole::Guest)
-    }
-
-    pub fn channel_participants(&self, channel_id: ChannelId) -> &[Arc<User>] {
-        self.channel_participants
-            .get(&channel_id)
-            .map_or(&[], |v| v.as_slice())
-    }
-
-    pub fn create_channel(
-        &self,
-        name: &str,
-        parent_id: Option<ChannelId>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<ChannelId>> {
-        let client = self.client.clone();
-        let name = name.trim_start_matches('#').to_owned();
-        cx.spawn(async move |this, cx| {
-            let response = client
-                .request(proto::CreateChannel {
-                    name,
-                    parent_id: parent_id.map(|cid| cid.0),
-                })
-                .await?;
-
-            let channel = response.channel.context("missing channel in response")?;
-            let channel_id = ChannelId(channel.id);
-
-            this.update(cx, |this, cx| {
-                let task = this.update_channels(
-                    proto::UpdateChannels {
-                        channels: vec![channel],
-                        ..Default::default()
-                    },
-                    cx,
-                );
-                assert!(task.is_none());
-
-                // This event is emitted because the collab panel wants to clear the pending edit state
-                // before this frame is rendered. But we can't guarantee that the collab panel's future
-                // will resolve before this flush_effects finishes. Synchronously emitting this event
-                // ensures that the collab panel will observe this creation before the frame completes
-                cx.emit(ChannelEvent::ChannelCreated(channel_id));
-            })?;
-
-            Ok(channel_id)
-        })
-    }
-
-    pub fn move_channel(
-        &mut self,
-        channel_id: ChannelId,
-        to: ChannelId,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let client = self.client.clone();
-        cx.spawn(async move |_, _| {
-            let _ = client
-                .request(proto::MoveChannel {
-                    channel_id: channel_id.0,
-                    to: to.0,
-                })
-                .await?;
-            Ok(())
-        })
-    }
-
-    pub fn reorder_channel(
-        &mut self,
-        channel_id: ChannelId,
-        direction: proto::reorder_channel::Direction,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let client = self.client.clone();
-        cx.spawn(async move |_, _| {
-            client
-                .request(proto::ReorderChannel {
-                    channel_id: channel_id.0,
-                    direction: direction.into(),
-                })
-                .await?;
-            Ok(())
-        })
-    }
-
-    pub fn set_channel_visibility(
-        &mut self,
-        channel_id: ChannelId,
-        visibility: ChannelVisibility,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let client = self.client.clone();
-        cx.spawn(async move |_, _| {
-            let _ = client
-                .request(proto::SetChannelVisibility {
-                    channel_id: channel_id.0,
-                    visibility: visibility.into(),
-                })
-                .await?;
-
-            Ok(())
-        })
-    }
-
-    pub fn invite_member(
-        &mut self,
-        channel_id: ChannelId,
-        user_id: UserId,
-        role: proto::ChannelRole,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        if !self.outgoing_invites.insert((channel_id, user_id)) {
-            return Task::ready(Err(anyhow!("invite request already in progress")));
-        }
-
-        cx.notify();
-        let client = self.client.clone();
-        cx.spawn(async move |this, cx| {
-            let result = client
-                .request(proto::InviteChannelMember {
-                    channel_id: channel_id.0,
-                    user_id,
-                    role: role.into(),
-                })
-                .await;
-
-            this.update(cx, |this, cx| {
-                this.outgoing_invites.remove(&(channel_id, user_id));
-                cx.notify();
-            })?;
-
-            result?;
-
-            Ok(())
-        })
-    }
-
-    pub fn remove_member(
-        &mut self,
-        channel_id: ChannelId,
-        user_id: u64,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        if !self.outgoing_invites.insert((channel_id, user_id)) {
-            return Task::ready(Err(anyhow!("invite request already in progress")));
-        }
-
-        cx.notify();
-        let client = self.client.clone();
-        cx.spawn(async move |this, cx| {
-            let result = client
-                .request(proto::RemoveChannelMember {
-                    channel_id: channel_id.0,
-                    user_id,
-                })
-                .await;
-
-            this.update(cx, |this, cx| {
-                this.outgoing_invites.remove(&(channel_id, user_id));
-                cx.notify();
-            })?;
-            result?;
-            Ok(())
-        })
-    }
-
-    pub fn set_member_role(
-        &mut self,
-        channel_id: ChannelId,
-        user_id: UserId,
-        role: proto::ChannelRole,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        if !self.outgoing_invites.insert((channel_id, user_id)) {
-            return Task::ready(Err(anyhow!("member request already in progress")));
-        }
-
-        cx.notify();
-        let client = self.client.clone();
-        cx.spawn(async move |this, cx| {
-            let result = client
-                .request(proto::SetChannelMemberRole {
-                    channel_id: channel_id.0,
-                    user_id,
-                    role: role.into(),
-                })
-                .await;
-
-            this.update(cx, |this, cx| {
-                this.outgoing_invites.remove(&(channel_id, user_id));
-                cx.notify();
-            })?;
-
-            result?;
-            Ok(())
-        })
-    }
-
-    pub fn rename(
-        &mut self,
-        channel_id: ChannelId,
-        new_name: &str,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let client = self.client.clone();
-        let name = new_name.to_string();
-        cx.spawn(async move |this, cx| {
-            let channel = client
-                .request(proto::RenameChannel {
-                    channel_id: channel_id.0,
-                    name,
-                })
-                .await?
-                .channel
-                .context("missing channel in response")?;
-            this.update(cx, |this, cx| {
-                let task = this.update_channels(
-                    proto::UpdateChannels {
-                        channels: vec![channel],
-                        ..Default::default()
-                    },
-                    cx,
-                );
-                assert!(task.is_none());
-
-                // This event is emitted because the collab panel wants to clear the pending edit state
-                // before this frame is rendered. But we can't guarantee that the collab panel's future
-                // will resolve before this flush_effects finishes. Synchronously emitting this event
-                // ensures that the collab panel will observe this creation before the frame complete
-                cx.emit(ChannelEvent::ChannelRenamed(channel_id))
-            })?;
-            Ok(())
-        })
-    }
-
-    pub fn respond_to_channel_invite(
-        &mut self,
-        channel_id: ChannelId,
-        accept: bool,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let client = self.client.clone();
-        cx.background_spawn(async move {
-            client
-                .request(proto::RespondToChannelInvite {
-                    channel_id: channel_id.0,
-                    accept,
-                })
-                .await?;
-            Ok(())
-        })
-    }
-    pub fn fuzzy_search_members(
-        &self,
-        channel_id: ChannelId,
-        query: String,
-        limit: u16,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Vec<ChannelMembership>>> {
-        let client = self.client.clone();
-        let user_store = self.user_store.downgrade();
-        cx.spawn(async move |_, cx| {
-            let response = client
-                .request(proto::GetChannelMembers {
-                    channel_id: channel_id.0,
-                    query,
-                    limit: limit as u64,
-                })
-                .await?;
-            user_store.update(cx, |user_store, _| {
-                user_store.insert(response.users);
-                response
-                    .members
-                    .into_iter()
-                    .filter_map(|member| {
-                        Some(ChannelMembership {
-                            user: user_store.get_cached_user(member.user_id)?,
-                            role: member.role(),
-                            kind: member.kind(),
-                        })
-                    })
-                    .collect()
-            })
-        })
-    }
-
-    pub fn remove_channel(
-        &self,
-        channel_id: ChannelId,
-    ) -> impl Future<Output = Result<()>> + use<> {
-        let client = self.client.clone();
-        async move {
-            client
-                .request(proto::DeleteChannel {
-                    channel_id: channel_id.0,
-                })
-                .await?;
-            Ok(())
-        }
-    }
-
-    pub fn has_pending_channel_invite_response(&self, _: &Arc<Channel>) -> bool {
-        false
-    }
-
-    pub fn has_pending_channel_invite(&self, channel_id: ChannelId, user_id: UserId) -> bool {
-        self.outgoing_invites.contains(&(channel_id, user_id))
-    }
-
-    async fn handle_update_channels(
-        this: Entity<Self>,
-        message: TypedEnvelope<proto::UpdateChannels>,
-        cx: AsyncApp,
-    ) -> Result<()> {
-        this.read_with(&cx, |this, _| {
-            this.update_channels_tx
-                .unbounded_send(message.payload)
-                .unwrap();
-        })?;
-        Ok(())
-    }
-
-    async fn handle_update_user_channels(
-        this: Entity<Self>,
-        message: TypedEnvelope<proto::UpdateUserChannels>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        this.update(&mut cx, |this, cx| {
-            for buffer_version in message.payload.observed_channel_buffer_version {
-                let version = language::proto::deserialize_version(&buffer_version.version);
-                this.acknowledge_notes_version(
-                    ChannelId(buffer_version.channel_id),
-                    buffer_version.epoch,
-                    &version,
-                    cx,
-                );
-            }
-            for membership in message.payload.channel_memberships {
-                if let Some(role) = ChannelRole::from_i32(membership.role) {
-                    this.channel_states
-                        .entry(ChannelId(membership.channel_id))
-                        .or_default()
-                        .set_role(role)
-                }
-            }
-        })
-    }
-
-    fn handle_connect(&mut self, cx: &mut Context<Self>) -> Task<Result<()>> {
-        self.channel_index.clear();
-        self.channel_invitations.clear();
-        self.channel_participants.clear();
-        self.channel_index.clear();
-        self.outgoing_invites.clear();
-        self.disconnect_channel_buffers_task.take();
-
-        let mut buffer_versions = Vec::new();
-        for buffer in self.opened_buffers.values() {
-            if let OpenEntityHandle::Open(buffer) = buffer
-                && let Some(buffer) = buffer.upgrade()
-            {
-                let channel_buffer = buffer.read(cx);
-                let buffer = channel_buffer.buffer().read(cx);
-                buffer_versions.push(proto::ChannelBufferVersion {
-                    channel_id: channel_buffer.channel_id.0,
-                    epoch: channel_buffer.epoch(),
-                    version: language::proto::serialize_version(&buffer.version()),
-                });
-            }
-        }
-
-        if buffer_versions.is_empty() {
-            return Task::ready(Ok(()));
-        }
-
-        let response = self.client.request(proto::RejoinChannelBuffers {
-            buffers: buffer_versions,
-        });
-
-        cx.spawn(async move |this, cx| {
-            let mut response = response.await?;
-
-            this.update(cx, |this, cx| {
-                this.opened_buffers.retain(|_, buffer| match buffer {
-                    OpenEntityHandle::Open(channel_buffer) => {
-                        let Some(channel_buffer) = channel_buffer.upgrade() else {
-                            return false;
-                        };
-
-                        channel_buffer.update(cx, |channel_buffer, cx| {
-                            let channel_id = channel_buffer.channel_id;
-                            if let Some(remote_buffer) = response
-                                .buffers
-                                .iter_mut()
-                                .find(|buffer| buffer.channel_id == channel_id.0)
-                            {
-                                let channel_id = channel_buffer.channel_id;
-                                let remote_version =
-                                    language::proto::deserialize_version(&remote_buffer.version);
-
-                                channel_buffer.replace_collaborators(
-                                    mem::take(&mut remote_buffer.collaborators),
-                                    cx,
-                                );
-
-                                let operations = channel_buffer
-                                    .buffer()
-                                    .update(cx, |buffer, cx| {
-                                        let outgoing_operations =
-                                            buffer.serialize_ops(Some(remote_version), cx);
-                                        let incoming_operations =
-                                            mem::take(&mut remote_buffer.operations)
-                                                .into_iter()
-                                                .map(language::proto::deserialize_operation)
-                                                .collect::<Result<Vec<_>>>()?;
-                                        buffer.apply_ops(incoming_operations, cx);
-                                        anyhow::Ok(outgoing_operations)
-                                    })
-                                    .log_err();
-
-                                if let Some(operations) = operations {
-                                    channel_buffer.connected(cx);
-                                    let client = this.client.clone();
-                                    cx.background_spawn(async move {
-                                        let operations = operations.await;
-                                        for chunk in language::proto::split_operations(operations) {
-                                            client
-                                                .send(proto::UpdateChannelBuffer {
-                                                    channel_id: channel_id.0,
-                                                    operations: chunk,
-                                                })
-                                                .ok();
-                                        }
-                                    })
-                                    .detach();
-                                    return true;
-                                }
-                            }
-
-                            channel_buffer.disconnect(cx);
-                            false
-                        })
-                    }
-                    OpenEntityHandle::Loading(_) => true,
-                });
-            })
-            .ok();
-            anyhow::Ok(())
-        })
-    }
-
-    fn handle_disconnect(&mut self, wait_for_reconnect: bool, cx: &mut Context<Self>) {
-        cx.notify();
-        self.did_subscribe = false;
-        self.disconnect_channel_buffers_task.get_or_insert_with(|| {
-            cx.spawn(async move |this, cx| {
-                if wait_for_reconnect {
-                    cx.background_executor().timer(RECONNECT_TIMEOUT).await;
-                }
-
-                if let Some(this) = this.upgrade() {
-                    this.update(cx, |this, cx| {
-                        for buffer in this.opened_buffers.values() {
-                            if let OpenEntityHandle::Open(buffer) = &buffer
-                                && let Some(buffer) = buffer.upgrade()
-                            {
-                                buffer.update(cx, |buffer, cx| buffer.disconnect(cx));
-                            }
-                        }
-                    })
-                    .ok();
-                }
-            })
-        });
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn reset(&mut self) {
-        self.channel_invitations.clear();
-        self.channel_index.clear();
-        self.channel_participants.clear();
-        self.outgoing_invites.clear();
-        self.opened_buffers.clear();
-        self.disconnect_channel_buffers_task = None;
-        self.channel_states.clear();
-    }
-
-    pub(crate) fn update_channels(
-        &mut self,
-        payload: proto::UpdateChannels,
-        cx: &mut Context<ChannelStore>,
-    ) -> Option<Task<Result<()>>> {
-        if !payload.remove_channel_invitations.is_empty() {
-            self.channel_invitations
-                .retain(|channel| !payload.remove_channel_invitations.contains(&channel.id.0));
-        }
-        for channel in payload.channel_invitations {
-            match self
-                .channel_invitations
-                .binary_search_by_key(&channel.id, |c| c.id.0)
-            {
-                Ok(ix) => {
-                    Arc::make_mut(&mut self.channel_invitations[ix]).name = channel.name.into()
-                }
-                Err(ix) => self.channel_invitations.insert(
-                    ix,
-                    Arc::new(Channel {
-                        id: ChannelId(channel.id),
-                        visibility: channel.visibility(),
-                        name: channel.name.into(),
-                        parent_path: channel.parent_path.into_iter().map(ChannelId).collect(),
-                        channel_order: channel.channel_order,
-                    }),
-                ),
-            }
-        }
-
-        let channels_changed = !payload.channels.is_empty()
-            || !payload.delete_channels.is_empty()
-            || !payload.latest_channel_buffer_versions.is_empty();
-
-        if channels_changed {
-            if !payload.delete_channels.is_empty() {
-                let delete_channels: Vec<ChannelId> =
-                    payload.delete_channels.into_iter().map(ChannelId).collect();
-                self.channel_index.delete_channels(&delete_channels);
-                self.channel_participants
-                    .retain(|channel_id, _| !delete_channels.contains(channel_id));
-
-                for channel_id in &delete_channels {
-                    let channel_id = *channel_id;
-                    if payload
-                        .channels
-                        .iter()
-                        .any(|channel| channel.id == channel_id.0)
-                    {
-                        continue;
-                    }
-                    if let Some(OpenEntityHandle::Open(buffer)) =
-                        self.opened_buffers.remove(&channel_id)
-                        && let Some(buffer) = buffer.upgrade()
-                    {
-                        buffer.update(cx, ChannelBuffer::disconnect);
-                    }
-                }
-            }
-
-            let mut index = self.channel_index.bulk_insert();
-            for channel in payload.channels {
-                let id = ChannelId(channel.id);
-                let channel_changed = index.insert(channel);
-
-                if channel_changed
-                    && let Some(OpenEntityHandle::Open(buffer)) = self.opened_buffers.get(&id)
-                    && let Some(buffer) = buffer.upgrade()
-                {
-                    buffer.update(cx, ChannelBuffer::channel_changed);
-                }
-            }
-
-            for latest_buffer_version in payload.latest_channel_buffer_versions {
-                let version = language::proto::deserialize_version(&latest_buffer_version.version);
-                self.channel_states
-                    .entry(ChannelId(latest_buffer_version.channel_id))
-                    .or_default()
-                    .update_latest_notes_version(latest_buffer_version.epoch, &version)
-            }
-
-            self.channels_loaded.0.try_send(true).log_err();
-        }
-
-        cx.notify();
-        if payload.channel_participants.is_empty() {
-            return None;
-        }
-
-        let mut all_user_ids = Vec::new();
-        let channel_participants = payload.channel_participants;
-        for entry in &channel_participants {
-            for user_id in entry.participant_user_ids.iter() {
-                if let Err(ix) = all_user_ids.binary_search(user_id) {
-                    all_user_ids.insert(ix, *user_id);
-                }
-            }
-        }
-
-        let users = self
-            .user_store
-            .update(cx, |user_store, cx| user_store.get_users(all_user_ids, cx));
-        Some(cx.spawn(async move |this, cx| {
-            let users = users.await?;
-
-            this.update(cx, |this, cx| {
-                for entry in &channel_participants {
-                    let mut participants: Vec<_> = entry
-                        .participant_user_ids
-                        .iter()
-                        .filter_map(|user_id| {
-                            users
-                                .binary_search_by_key(&user_id, |user| &user.id)
-                                .ok()
-                                .map(|ix| users[ix].clone())
-                        })
-                        .collect();
-
-                    participants.sort_by_key(|u| u.id);
-
-                    this.channel_participants
-                        .insert(ChannelId(entry.channel_id), participants);
-                }
-
-                cx.notify();
-            })
-        }))
-    }
-}
-
-impl ChannelState {
-    fn set_role(&mut self, role: ChannelRole) {
-        self.role = Some(role);
-    }
-
-    fn has_channel_buffer_changed(&self) -> bool {
-        self.latest_notes_version.epoch > self.observed_notes_version.epoch
-            || (self.latest_notes_version.epoch == self.observed_notes_version.epoch
-                && self
-                    .latest_notes_version
-                    .version
-                    .changed_since(&self.observed_notes_version.version))
-    }
-
-    fn acknowledge_notes_version(&mut self, epoch: u64, version: &clock::Global) {
-        if self.observed_notes_version.epoch == epoch {
-            self.observed_notes_version.version.join(version);
-        } else {
-            self.observed_notes_version = NotesVersion {
-                epoch,
-                version: version.clone(),
-            };
-        }
-    }
-
-    fn update_latest_notes_version(&mut self, epoch: u64, version: &clock::Global) {
-        if self.latest_notes_version.epoch == epoch {
-            self.latest_notes_version.version.join(version);
-        } else {
-            self.latest_notes_version = NotesVersion {
-                epoch,
-                version: version.clone(),
-            };
-        }
-    }
-}
diff --git a/crates/channel/src/channel_store/channel_index.rs b/crates/channel/src/channel_store/channel_index.rs
deleted file mode 100644
index 749160f956..0000000000
--- a/crates/channel/src/channel_store/channel_index.rs
+++ /dev/null
@@ -1,120 +0,0 @@
-use crate::Channel;
-use client::ChannelId;
-use collections::BTreeMap;
-use rpc::proto;
-use std::sync::Arc;
-
-#[derive(Default, Debug)]
-pub struct ChannelIndex {
-    channels_ordered: Vec<ChannelId>,
-    channels_by_id: BTreeMap<ChannelId, Arc<Channel>>,
-}
-
-impl ChannelIndex {
-    pub fn by_id(&self) -> &BTreeMap<ChannelId, Arc<Channel>> {
-        &self.channels_by_id
-    }
-
-    pub fn ordered_channels(&self) -> &[ChannelId] {
-        &self.channels_ordered
-    }
-
-    pub fn clear(&mut self) {
-        self.channels_ordered.clear();
-        self.channels_by_id.clear();
-    }
-
-    /// Delete the given channels from this index.
-    pub fn delete_channels(&mut self, channels: &[ChannelId]) {
-        self.channels_by_id
-            .retain(|channel_id, _| !channels.contains(channel_id));
-        self.channels_ordered
-            .retain(|channel_id| !channels.contains(channel_id));
-    }
-
-    pub fn bulk_insert(&mut self) -> ChannelPathsInsertGuard<'_> {
-        ChannelPathsInsertGuard {
-            channels_ordered: &mut self.channels_ordered,
-            channels_by_id: &mut self.channels_by_id,
-        }
-    }
-}
-
-/// A guard for ensuring that the paths index maintains its sort and uniqueness
-/// invariants after a series of insertions
-#[derive(Debug)]
-pub struct ChannelPathsInsertGuard<'a> {
-    channels_ordered: &'a mut Vec<ChannelId>,
-    channels_by_id: &'a mut BTreeMap<ChannelId, Arc<Channel>>,
-}
-
-impl ChannelPathsInsertGuard<'_> {
-    pub fn insert(&mut self, channel_proto: proto::Channel) -> bool {
-        let mut ret = false;
-        let parent_path = channel_proto
-            .parent_path
-            .iter()
-            .map(|cid| ChannelId(*cid))
-            .collect();
-        if let Some(existing_channel) = self.channels_by_id.get_mut(&ChannelId(channel_proto.id)) {
-            let existing_channel = Arc::make_mut(existing_channel);
-
-            ret = existing_channel.visibility != channel_proto.visibility()
-                || existing_channel.name != channel_proto.name
-                || existing_channel.parent_path != parent_path
-                || existing_channel.channel_order != channel_proto.channel_order;
-
-            existing_channel.visibility = channel_proto.visibility();
-            existing_channel.name = channel_proto.name.into();
-            existing_channel.parent_path = parent_path;
-            existing_channel.channel_order = channel_proto.channel_order;
-        } else {
-            self.channels_by_id.insert(
-                ChannelId(channel_proto.id),
-                Arc::new(Channel {
-                    id: ChannelId(channel_proto.id),
-                    visibility: channel_proto.visibility(),
-                    name: channel_proto.name.into(),
-                    parent_path,
-                    channel_order: channel_proto.channel_order,
-                }),
-            );
-            self.insert_root(ChannelId(channel_proto.id));
-        }
-        ret
-    }
-
-    fn insert_root(&mut self, channel_id: ChannelId) {
-        self.channels_ordered.push(channel_id);
-    }
-}
-
-impl Drop for ChannelPathsInsertGuard<'_> {
-    fn drop(&mut self) {
-        self.channels_ordered.sort_by(|a, b| {
-            let a = channel_path_sorting_key(*a, self.channels_by_id);
-            let b = channel_path_sorting_key(*b, self.channels_by_id);
-            a.cmp(b)
-        });
-        self.channels_ordered.dedup();
-    }
-}
-
-fn channel_path_sorting_key(
-    id: ChannelId,
-    channels_by_id: &BTreeMap<ChannelId, Arc<Channel>>,
-) -> impl Iterator<Item = (i32, ChannelId)> {
-    let (parent_path, order_and_id) =
-        channels_by_id
-            .get(&id)
-            .map_or((&[] as &[_], None), |channel| {
-                (
-                    channel.parent_path.as_slice(),
-                    Some((channel.channel_order, channel.id)),
-                )
-            });
-    parent_path
-        .iter()
-        .filter_map(|id| Some((channels_by_id.get(id)?.channel_order, *id)))
-        .chain(order_and_id)
-}
diff --git a/crates/channel/src/channel_store_tests.rs b/crates/channel/src/channel_store_tests.rs
deleted file mode 100644
index f1f9d23a99..0000000000
--- a/crates/channel/src/channel_store_tests.rs
+++ /dev/null
@@ -1,274 +0,0 @@
-use super::*;
-use client::{Client, UserStore};
-use clock::FakeSystemClock;
-use gpui::{App, AppContext as _, Entity};
-use http_client::FakeHttpClient;
-use rpc::proto::{self};
-use settings::SettingsStore;
-
-#[gpui::test]
-fn test_update_channels(cx: &mut App) {
-    let channel_store = init_test(cx);
-
-    update_channels(
-        &channel_store,
-        proto::UpdateChannels {
-            channels: vec![
-                proto::Channel {
-                    id: 1,
-                    name: "b".to_string(),
-                    visibility: proto::ChannelVisibility::Members as i32,
-                    parent_path: Vec::new(),
-                    channel_order: 1,
-                },
-                proto::Channel {
-                    id: 2,
-                    name: "a".to_string(),
-                    visibility: proto::ChannelVisibility::Members as i32,
-                    parent_path: Vec::new(),
-                    channel_order: 2,
-                },
-            ],
-            ..Default::default()
-        },
-        cx,
-    );
-    assert_channels(
-        &channel_store,
-        &[
-            //
-            (0, "b".to_string()),
-            (0, "a".to_string()),
-        ],
-        cx,
-    );
-
-    update_channels(
-        &channel_store,
-        proto::UpdateChannels {
-            channels: vec![
-                proto::Channel {
-                    id: 3,
-                    name: "x".to_string(),
-                    visibility: proto::ChannelVisibility::Members as i32,
-                    parent_path: vec![1],
-                    channel_order: 1,
-                },
-                proto::Channel {
-                    id: 4,
-                    name: "y".to_string(),
-                    visibility: proto::ChannelVisibility::Members as i32,
-                    parent_path: vec![2],
-                    channel_order: 1,
-                },
-            ],
-            ..Default::default()
-        },
-        cx,
-    );
-    assert_channels(
-        &channel_store,
-        &[
-            (0, "b".to_string()),
-            (1, "x".to_string()),
-            (0, "a".to_string()),
-            (1, "y".to_string()),
-        ],
-        cx,
-    );
-}
-
-#[gpui::test]
-fn test_update_channels_order_independent(cx: &mut App) {
-    /// Based on: https://stackoverflow.com/a/59939809
-    fn unique_permutations<T: Clone>(items: Vec<T>) -> Vec<Vec<T>> {
-        if items.len() == 1 {
-            vec![items]
-        } else {
-            let mut output: Vec<Vec<T>> = vec![];
-
-            for (ix, first) in items.iter().enumerate() {
-                let mut remaining_elements = items.clone();
-                remaining_elements.remove(ix);
-                for mut permutation in unique_permutations(remaining_elements) {
-                    permutation.insert(0, first.clone());
-                    output.push(permutation);
-                }
-            }
-            output
-        }
-    }
-
-    let test_data = vec![
-        proto::Channel {
-            id: 6,
-            name: "β".to_string(),
-            visibility: proto::ChannelVisibility::Members as i32,
-            parent_path: vec![1, 3],
-            channel_order: 1,
-        },
-        proto::Channel {
-            id: 5,
-            name: "α".to_string(),
-            visibility: proto::ChannelVisibility::Members as i32,
-            parent_path: vec![1],
-            channel_order: 2,
-        },
-        proto::Channel {
-            id: 3,
-            name: "x".to_string(),
-            visibility: proto::ChannelVisibility::Members as i32,
-            parent_path: vec![1],
-            channel_order: 1,
-        },
-        proto::Channel {
-            id: 4,
-            name: "y".to_string(),
-            visibility: proto::ChannelVisibility::Members as i32,
-            parent_path: vec![2],
-            channel_order: 1,
-        },
-        proto::Channel {
-            id: 1,
-            name: "b".to_string(),
-            visibility: proto::ChannelVisibility::Members as i32,
-            parent_path: Vec::new(),
-            channel_order: 1,
-        },
-        proto::Channel {
-            id: 2,
-            name: "a".to_string(),
-            visibility: proto::ChannelVisibility::Members as i32,
-            parent_path: Vec::new(),
-            channel_order: 2,
-        },
-    ];
-
-    let channel_store = init_test(cx);
-    let permutations = unique_permutations(test_data);
-
-    for test_instance in permutations {
-        channel_store.update(cx, |channel_store, _| channel_store.reset());
-
-        update_channels(
-            &channel_store,
-            proto::UpdateChannels {
-                channels: test_instance,
-                ..Default::default()
-            },
-            cx,
-        );
-
-        assert_channels(
-            &channel_store,
-            &[
-                (0, "b".to_string()),
-                (1, "x".to_string()),
-                (2, "β".to_string()),
-                (1, "α".to_string()),
-                (0, "a".to_string()),
-                (1, "y".to_string()),
-            ],
-            cx,
-        );
-    }
-}
-
-#[gpui::test]
-fn test_dangling_channel_paths(cx: &mut App) {
-    let channel_store = init_test(cx);
-
-    update_channels(
-        &channel_store,
-        proto::UpdateChannels {
-            channels: vec![
-                proto::Channel {
-                    id: 0,
-                    name: "a".to_string(),
-                    visibility: proto::ChannelVisibility::Members as i32,
-                    parent_path: vec![],
-                    channel_order: 1,
-                },
-                proto::Channel {
-                    id: 1,
-                    name: "b".to_string(),
-                    visibility: proto::ChannelVisibility::Members as i32,
-                    parent_path: vec![0],
-                    channel_order: 1,
-                },
-                proto::Channel {
-                    id: 2,
-                    name: "c".to_string(),
-                    visibility: proto::ChannelVisibility::Members as i32,
-                    parent_path: vec![0, 1],
-                    channel_order: 1,
-                },
-            ],
-            ..Default::default()
-        },
-        cx,
-    );
-    // Sanity check
-    assert_channels(
-        &channel_store,
-        &[
-            //
-            (0, "a".to_string()),
-            (1, "b".to_string()),
-            (2, "c".to_string()),
-        ],
-        cx,
-    );
-
-    update_channels(
-        &channel_store,
-        proto::UpdateChannels {
-            delete_channels: vec![1, 2],
-            ..Default::default()
-        },
-        cx,
-    );
-
-    // Make sure that the 1/2/3 path is gone
-    assert_channels(&channel_store, &[(0, "a".to_string())], cx);
-}
-
-fn init_test(cx: &mut App) -> Entity<ChannelStore> {
-    let settings_store = SettingsStore::test(cx);
-    cx.set_global(settings_store);
-    release_channel::init(semver::Version::new(0, 0, 0), cx);
-
-    let clock = Arc::new(FakeSystemClock::new());
-    let http = FakeHttpClient::with_404_response();
-    let client = Client::new(clock, http, cx);
-    let user_store = cx.new(|cx| UserStore::new(client.clone(), cx));
-
-    client::init(&client, cx);
-    crate::init(&client, user_store, cx);
-
-    ChannelStore::global(cx)
-}
-
-fn update_channels(
-    channel_store: &Entity<ChannelStore>,
-    message: proto::UpdateChannels,
-    cx: &mut App,
-) {
-    let task = channel_store.update(cx, |store, cx| store.update_channels(message, cx));
-    assert!(task.is_none());
-}
-
-#[track_caller]
-fn assert_channels(
-    channel_store: &Entity<ChannelStore>,
-    expected_channels: &[(usize, String)],
-    cx: &mut App,
-) {
-    let actual = channel_store.update(cx, |store, _| {
-        store
-            .ordered_channels()
-            .map(|(depth, channel)| (depth, channel.name.to_string()))
-            .collect::<Vec<_>>()
-    });
-    assert_eq!(actual, expected_channels);
-}
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
deleted file mode 100644
index 63e99a3ed2..0000000000
--- a/crates/cli/Cargo.toml
+++ /dev/null
@@ -1,51 +0,0 @@
-[package]
-name = "cli"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/cli.rs"
-doctest = false
-
-[[bin]]
-name = "cli"
-path = "src/main.rs"
-
-[features]
-no-bundled-uninstall = []
-default = []
-
-[dependencies]
-anyhow.workspace = true
-askpass.workspace = true
-clap.workspace = true
-collections.workspace = true
-ipc-channel = "0.19"
-parking_lot.workspace = true
-paths.workspace = true
-release_channel.workspace = true
-serde.workspace = true
-util.workspace = true
-tempfile.workspace = true
-rayon.workspace = true
-
-[dev-dependencies]
-serde_json.workspace = true
-util = { workspace = true, features = ["test-support"] }
-
-[target.'cfg(any(target_os = "linux", target_os = "freebsd"))'.dependencies]
-exec.workspace = true
-fork.workspace = true
-
-[target.'cfg(target_os = "macos")'.dependencies]
-core-foundation.workspace = true
-core-services = "0.2"
-plist = "1.3"
-
-[target.'cfg(target_os = "windows")'.dependencies]
-windows.workspace = true
diff --git a/crates/cli/LICENSE-GPL b/crates/cli/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/cli/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/cli/README.md b/crates/cli/README.md
deleted file mode 100644
index ac4384e256..0000000000
--- a/crates/cli/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Cli
-
-## Testing
-
-You can test your changes to the `cli` crate by first building the main zed binary:
-
-```
-cargo build -p zed
-```
-
-And then building and running the `cli` crate with the following parameters:
-
-```
- cargo run -p cli -- --zed ./target/debug/zed.exe
-```
diff --git a/crates/cli/build.rs b/crates/cli/build.rs
deleted file mode 100644
index a3c4bc6437..0000000000
--- a/crates/cli/build.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-#![allow(clippy::disallowed_methods, reason = "build scripts are exempt")]
-use std::process::Command;
-
-fn main() {
-    if std::env::var("ZED_UPDATE_EXPLANATION").is_ok() {
-        println!(r#"cargo:rustc-cfg=feature="no-bundled-uninstall""#);
-    }
-
-    if cfg!(target_os = "macos") {
-        println!("cargo:rustc-env=MACOSX_DEPLOYMENT_TARGET=10.15.7");
-    }
-
-    // Populate git sha environment variable if git is available
-    println!("cargo:rerun-if-changed=../../.git/logs/HEAD");
-    if let Some(output) = Command::new("git")
-        .args(["rev-parse", "HEAD"])
-        .output()
-        .ok()
-        .filter(|output| output.status.success())
-    {
-        let git_sha = String::from_utf8_lossy(&output.stdout);
-        let git_sha = git_sha.trim();
-
-        println!("cargo:rustc-env=ZED_COMMIT_SHA={git_sha}");
-    }
-    if let Some(build_identifier) = option_env!("GITHUB_RUN_NUMBER") {
-        println!("cargo:rustc-env=ZED_BUILD_ID={build_identifier}");
-    }
-}
diff --git a/crates/cli/src/cli.rs b/crates/cli/src/cli.rs
deleted file mode 100644
index fbd7e2693a..0000000000
--- a/crates/cli/src/cli.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-use collections::HashMap;
-pub use ipc_channel::ipc;
-use serde::{Deserialize, Serialize};
-
-#[derive(Serialize, Deserialize)]
-pub struct IpcHandshake {
-    pub requests: ipc::IpcSender<CliRequest>,
-    pub responses: ipc::IpcReceiver<CliResponse>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub enum CliRequest {
-    Open {
-        paths: Vec<String>,
-        urls: Vec<String>,
-        diff_paths: Vec<[String; 2]>,
-        wsl: Option<String>,
-        wait: bool,
-        open_new_workspace: Option<bool>,
-        reuse: bool,
-        env: Option<HashMap<String, String>>,
-        user_data_dir: Option<String>,
-    },
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub enum CliResponse {
-    Ping,
-    Stdout { message: String },
-    Stderr { message: String },
-    Exit { status: i32 },
-}
-
-/// When Zed started not as an *.app but as a binary (e.g. local development),
-/// there's a possibility to tell it to behave "regularly".
-pub const FORCE_CLI_MODE_ENV_VAR_NAME: &str = "ZED_FORCE_CLI_MODE";
diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs
deleted file mode 100644
index 92c0ce2377..0000000000
--- a/crates/cli/src/main.rs
+++ /dev/null
@@ -1,1250 +0,0 @@
-#![allow(
-    clippy::disallowed_methods,
-    reason = "We are not in an async environment, so std::process::Command is fine"
-)]
-#![cfg_attr(
-    any(target_os = "linux", target_os = "freebsd", target_os = "windows"),
-    allow(dead_code)
-)]
-
-use anyhow::{Context as _, Result};
-use clap::Parser;
-use cli::{CliRequest, CliResponse, IpcHandshake, ipc::IpcOneShotServer};
-use parking_lot::Mutex;
-use std::{
-    env,
-    ffi::OsStr,
-    fs, io,
-    path::{Path, PathBuf},
-    process::ExitStatus,
-    sync::Arc,
-    thread::{self, JoinHandle},
-};
-use tempfile::NamedTempFile;
-use util::paths::PathWithPosition;
-
-#[cfg(any(target_os = "linux", target_os = "freebsd"))]
-use std::io::IsTerminal;
-
-const URL_PREFIX: [&'static str; 5] = ["zed://", "http://", "https://", "file://", "ssh://"];
-
-struct Detect;
-
-trait InstalledApp {
-    fn zed_version_string(&self) -> String;
-    fn launch(&self, ipc_url: String, user_data_dir: Option<&str>) -> anyhow::Result<()>;
-    fn run_foreground(
-        &self,
-        ipc_url: String,
-        user_data_dir: Option<&str>,
-    ) -> io::Result<ExitStatus>;
-    fn path(&self) -> PathBuf;
-}
-
-#[derive(Parser, Debug)]
-#[command(
-    name = "zed",
-    disable_version_flag = true,
-    before_help = "The Zed CLI binary.
-This CLI is a separate binary that invokes Zed.
-
-Examples:
-    `zed`
-          Simply opens Zed
-    `zed --foreground`
-          Runs in foreground (shows all logs)
-    `zed path-to-your-project`
-          Open your project in Zed
-    `zed -n path-to-file `
-          Open file/folder in a new window",
-    after_help = "To read from stdin, append '-', e.g. 'ps axf | zed -'"
-)]
-struct Args {
-    /// Wait for all of the given paths to be opened/closed before exiting.
-    #[arg(short, long)]
-    wait: bool,
-    /// Add files to the currently open workspace
-    #[arg(short, long, overrides_with_all = ["new", "reuse"])]
-    add: bool,
-    /// Create a new workspace
-    #[arg(short, long, overrides_with_all = ["add", "reuse"])]
-    new: bool,
-    /// Reuse an existing window, replacing its workspace
-    #[arg(short, long, overrides_with_all = ["add", "new"])]
-    reuse: bool,
-    /// Sets a custom directory for all user data (e.g., database, extensions, logs).
-    /// This overrides the default platform-specific data directory location:
-    #[cfg_attr(target_os = "macos", doc = "`~/Library/Application Support/Zed`.")]
-    #[cfg_attr(target_os = "windows", doc = "`%LOCALAPPDATA%\\Zed`.")]
-    #[cfg_attr(
-        not(any(target_os = "windows", target_os = "macos")),
-        doc = "`$XDG_DATA_HOME/zed`."
-    )]
-    #[arg(long, value_name = "DIR")]
-    user_data_dir: Option<String>,
-    /// The paths to open in Zed (space-separated).
-    ///
-    /// Use `path:line:column` syntax to open a file at the given line and column.
-    paths_with_position: Vec<String>,
-    /// Print Zed's version and the app path.
-    #[arg(short, long)]
-    version: bool,
-    /// Run zed in the foreground (useful for debugging)
-    #[arg(long)]
-    foreground: bool,
-    /// Custom path to Zed.app or the zed binary
-    #[arg(long)]
-    zed: Option<PathBuf>,
-    /// Run zed in dev-server mode
-    #[arg(long)]
-    dev_server_token: Option<String>,
-    /// The username and WSL distribution to use when opening paths. If not specified,
-    /// Zed will attempt to open the paths directly.
-    ///
-    /// The username is optional, and if not specified, the default user for the distribution
-    /// will be used.
-    ///
-    /// Example: `me@Ubuntu` or `Ubuntu`.
-    ///
-    /// WARN: You should not fill in this field by hand.
-    #[cfg(target_os = "windows")]
-    #[arg(long, value_name = "USER@DISTRO")]
-    wsl: Option<String>,
-    /// Not supported in Zed CLI, only supported on Zed binary
-    /// Will attempt to give the correct command to run
-    #[arg(long)]
-    system_specs: bool,
-    /// Pairs of file paths to diff. Can be specified multiple times.
-    #[arg(long, action = clap::ArgAction::Append, num_args = 2, value_names = ["OLD_PATH", "NEW_PATH"])]
-    diff: Vec<String>,
-    /// Uninstall Zed from user system
-    #[cfg(all(
-        any(target_os = "linux", target_os = "macos"),
-        not(feature = "no-bundled-uninstall")
-    ))]
-    #[arg(long)]
-    uninstall: bool,
-
-    /// Used for SSH/Git password authentication, to remove the need for netcat as a dependency,
-    /// by having Zed act like netcat communicating over a Unix socket.
-    #[arg(long, hide = true)]
-    askpass: Option<String>,
-}
-
-/// Parses a path containing a position (e.g. `path:line:column`)
-/// and returns its canonicalized string representation.
-///
-/// If a part of path doesn't exist, it will canonicalize the
-/// existing part and append the non-existing part.
-///
-/// This method must return an absolute path, as many zed
-/// crates assume absolute paths.
-fn parse_path_with_position(argument_str: &str) -> anyhow::Result<String> {
-    match Path::new(argument_str).canonicalize() {
-        Ok(existing_path) => Ok(PathWithPosition::from_path(existing_path)),
-        Err(_) => PathWithPosition::parse_str(argument_str).map_path(|mut path| {
-            let curdir = env::current_dir().context("retrieving current directory")?;
-            let mut children = Vec::new();
-            let root;
-            loop {
-                // canonicalize handles './', and '/'.
-                if let Ok(canonicalized) = fs::canonicalize(&path) {
-                    root = canonicalized;
-                    break;
-                }
-                // The comparison to `curdir` is just a shortcut
-                // since we know it is canonical. The other one
-                // is if `argument_str` is a string that starts
-                // with a name (e.g. "foo/bar").
-                if path == curdir || path == Path::new("") {
-                    root = curdir;
-                    break;
-                }
-                children.push(
-                    path.file_name()
-                        .with_context(|| format!("parsing as path with position {argument_str}"))?
-                        .to_owned(),
-                );
-                if !path.pop() {
-                    unreachable!("parsing as path with position {argument_str}");
-                }
-            }
-            Ok(children.iter().rev().fold(root, |mut path, child| {
-                path.push(child);
-                path
-            }))
-        }),
-    }
-    .map(|path_with_pos| path_with_pos.to_string(|path| path.to_string_lossy().into_owned()))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use serde_json::json;
-    use util::path;
-    use util::paths::SanitizedPath;
-    use util::test::TempTree;
-
-    macro_rules! assert_path_eq {
-        ($left:expr, $right:expr) => {
-            assert_eq!(
-                SanitizedPath::new(Path::new(&$left)),
-                SanitizedPath::new(Path::new(&$right))
-            )
-        };
-    }
-
-    fn cwd() -> PathBuf {
-        env::current_dir().unwrap()
-    }
-
-    static CWD_LOCK: Mutex<()> = Mutex::new(());
-
-    fn with_cwd<T>(path: &Path, f: impl FnOnce() -> anyhow::Result<T>) -> anyhow::Result<T> {
-        let _lock = CWD_LOCK.lock();
-        let old_cwd = cwd();
-        env::set_current_dir(path)?;
-        let result = f();
-        env::set_current_dir(old_cwd)?;
-        result
-    }
-
-    #[test]
-    fn test_parse_non_existing_path() {
-        // Absolute path
-        let result = parse_path_with_position(path!("/non/existing/path.txt")).unwrap();
-        assert_path_eq!(result, path!("/non/existing/path.txt"));
-
-        // Absolute path in cwd
-        let path = cwd().join(path!("non/existing/path.txt"));
-        let expected = path.to_string_lossy().to_string();
-        let result = parse_path_with_position(&expected).unwrap();
-        assert_path_eq!(result, expected);
-
-        // Relative path
-        let result = parse_path_with_position(path!("non/existing/path.txt")).unwrap();
-        assert_path_eq!(result, expected)
-    }
-
-    #[test]
-    fn test_parse_existing_path() {
-        let temp_tree = TempTree::new(json!({
-            "file.txt": "",
-        }));
-        let file_path = temp_tree.path().join("file.txt");
-        let expected = file_path.to_string_lossy().to_string();
-
-        // Absolute path
-        let result = parse_path_with_position(file_path.to_str().unwrap()).unwrap();
-        assert_path_eq!(result, expected);
-
-        // Relative path
-        let result = with_cwd(temp_tree.path(), || parse_path_with_position("file.txt")).unwrap();
-        assert_path_eq!(result, expected);
-    }
-
-    // NOTE:
-    // While POSIX symbolic links are somewhat supported on Windows, they are an opt in by the user, and thus
-    // we assume that they are not supported out of the box.
-    #[cfg(not(windows))]
-    #[test]
-    fn test_parse_symlink_file() {
-        let temp_tree = TempTree::new(json!({
-            "target.txt": "",
-        }));
-        let target_path = temp_tree.path().join("target.txt");
-        let symlink_path = temp_tree.path().join("symlink.txt");
-        std::os::unix::fs::symlink(&target_path, &symlink_path).unwrap();
-
-        // Absolute path
-        let result = parse_path_with_position(symlink_path.to_str().unwrap()).unwrap();
-        assert_eq!(result, target_path.to_string_lossy());
-
-        // Relative path
-        let result =
-            with_cwd(temp_tree.path(), || parse_path_with_position("symlink.txt")).unwrap();
-        assert_eq!(result, target_path.to_string_lossy());
-    }
-
-    #[cfg(not(windows))]
-    #[test]
-    fn test_parse_symlink_dir() {
-        let temp_tree = TempTree::new(json!({
-            "some": {
-                "dir": { // symlink target
-                    "ec": {
-                        "tory": {
-                            "file.txt": "",
-        }}}}}));
-
-        let target_file_path = temp_tree.path().join("some/dir/ec/tory/file.txt");
-        let expected = target_file_path.to_string_lossy();
-
-        let dir_path = temp_tree.path().join("some/dir");
-        let symlink_path = temp_tree.path().join("symlink");
-        std::os::unix::fs::symlink(&dir_path, &symlink_path).unwrap();
-
-        // Absolute path
-        let result =
-            parse_path_with_position(symlink_path.join("ec/tory/file.txt").to_str().unwrap())
-                .unwrap();
-        assert_eq!(result, expected);
-
-        // Relative path
-        let result = with_cwd(temp_tree.path(), || {
-            parse_path_with_position("symlink/ec/tory/file.txt")
-        })
-        .unwrap();
-        assert_eq!(result, expected);
-    }
-}
-
-fn parse_path_in_wsl(source: &str, wsl: &str) -> Result<String> {
-    let mut source = PathWithPosition::parse_str(source);
-
-    let (user, distro_name) = if let Some((user, distro)) = wsl.split_once('@') {
-        if user.is_empty() {
-            anyhow::bail!("user is empty in wsl argument");
-        }
-        (Some(user), distro)
-    } else {
-        (None, wsl)
-    };
-
-    let mut args = vec!["--distribution", distro_name];
-    if let Some(user) = user {
-        args.push("--user");
-        args.push(user);
-    }
-
-    let command = [
-        OsStr::new("realpath"),
-        OsStr::new("-s"),
-        source.path.as_ref(),
-    ];
-
-    let output = util::command::new_std_command("wsl.exe")
-        .args(&args)
-        .arg("--exec")
-        .args(&command)
-        .output()?;
-    let result = if output.status.success() {
-        String::from_utf8_lossy(&output.stdout).to_string()
-    } else {
-        let fallback = util::command::new_std_command("wsl.exe")
-            .args(&args)
-            .arg("--")
-            .args(&command)
-            .output()?;
-        String::from_utf8_lossy(&fallback.stdout).to_string()
-    };
-
-    source.path = Path::new(result.trim()).to_owned();
-
-    Ok(source.to_string(|path| path.to_string_lossy().into_owned()))
-}
-
-fn main() -> Result<()> {
-    #[cfg(unix)]
-    util::prevent_root_execution();
-
-    // Exit flatpak sandbox if needed
-    #[cfg(target_os = "linux")]
-    {
-        flatpak::try_restart_to_host();
-        flatpak::ld_extra_libs();
-    }
-
-    // Intercept version designators
-    #[cfg(target_os = "macos")]
-    if let Some(channel) = std::env::args().nth(1).filter(|arg| arg.starts_with("--")) {
-        // When the first argument is a name of a release channel, we're going to spawn off the CLI of that version, with trailing args passed along.
-        use std::str::FromStr as _;
-
-        if let Ok(channel) = release_channel::ReleaseChannel::from_str(&channel[2..]) {
-            return mac_os::spawn_channel_cli(channel, std::env::args().skip(2).collect());
-        }
-    }
-    let args = Args::parse();
-
-    // `zed --askpass` Makes zed operate in nc/netcat mode for use with askpass
-    if let Some(socket) = &args.askpass {
-        askpass::main(socket);
-        return Ok(());
-    }
-
-    // Set custom data directory before any path operations
-    let user_data_dir = args.user_data_dir.clone();
-    if let Some(dir) = &user_data_dir {
-        paths::set_custom_data_dir(dir);
-    }
-
-    #[cfg(target_os = "linux")]
-    let args = flatpak::set_bin_if_no_escape(args);
-
-    let app = Detect::detect(args.zed.as_deref()).context("Bundle detection")?;
-
-    if args.version {
-        println!("{}", app.zed_version_string());
-        return Ok(());
-    }
-
-    if args.system_specs {
-        let path = app.path();
-        let msg = [
-            "The `--system-specs` argument is not supported in the Zed CLI, only on Zed binary.",
-            "To retrieve the system specs on the command line, run the following command:",
-            &format!("{} --system-specs", path.display()),
-        ];
-        anyhow::bail!(msg.join("\n"));
-    }
-
-    #[cfg(all(
-        any(target_os = "linux", target_os = "macos"),
-        not(feature = "no-bundled-uninstall")
-    ))]
-    if args.uninstall {
-        static UNINSTALL_SCRIPT: &[u8] = include_bytes!("../../../script/uninstall.sh");
-
-        let tmp_dir = tempfile::tempdir()?;
-        let script_path = tmp_dir.path().join("uninstall.sh");
-        fs::write(&script_path, UNINSTALL_SCRIPT)?;
-
-        use std::os::unix::fs::PermissionsExt as _;
-        fs::set_permissions(&script_path, fs::Permissions::from_mode(0o755))?;
-
-        let status = std::process::Command::new("sh")
-            .arg(&script_path)
-            .env("ZED_CHANNEL", &*release_channel::RELEASE_CHANNEL_NAME)
-            .status()
-            .context("Failed to execute uninstall script")?;
-
-        std::process::exit(status.code().unwrap_or(1));
-    }
-
-    let (server, server_name) =
-        IpcOneShotServer::<IpcHandshake>::new().context("Handshake before Zed spawn")?;
-    let url = format!("zed-cli://{server_name}");
-
-    let open_new_workspace = if args.new {
-        Some(true)
-    } else if args.add {
-        Some(false)
-    } else {
-        None
-    };
-
-    let env = {
-        #[cfg(any(target_os = "linux", target_os = "freebsd"))]
-        {
-            use collections::HashMap;
-
-            // On Linux, the desktop entry uses `cli` to spawn `zed`.
-            // We need to handle env vars correctly since std::env::vars() may not contain
-            // project-specific vars (e.g. those set by direnv).
-            // By setting env to None here, the LSP will use worktree env vars instead,
-            // which is what we want.
-            if !std::io::stdout().is_terminal() {
-                None
-            } else {
-                Some(std::env::vars().collect::<HashMap<_, _>>())
-            }
-        }
-
-        #[cfg(target_os = "windows")]
-        {
-            // On Windows, by default, a child process inherits a copy of the environment block of the parent process.
-            // So we don't need to pass env vars explicitly.
-            None
-        }
-
-        #[cfg(not(any(target_os = "linux", target_os = "freebsd", target_os = "windows")))]
-        {
-            use collections::HashMap;
-
-            Some(std::env::vars().collect::<HashMap<_, _>>())
-        }
-    };
-
-    let exit_status = Arc::new(Mutex::new(None));
-    let mut paths = vec![];
-    let mut urls = vec![];
-    let mut diff_paths = vec![];
-    let mut stdin_tmp_file: Option<fs::File> = None;
-    let mut anonymous_fd_tmp_files = vec![];
-
-    for path in args.diff.chunks(2) {
-        diff_paths.push([
-            parse_path_with_position(&path[0])?,
-            parse_path_with_position(&path[1])?,
-        ]);
-    }
-
-    #[cfg(target_os = "windows")]
-    let wsl = args.wsl.as_ref();
-    #[cfg(not(target_os = "windows"))]
-    let wsl = None;
-
-    for path in args.paths_with_position.iter() {
-        if URL_PREFIX.iter().any(|&prefix| path.starts_with(prefix)) {
-            urls.push(path.to_string());
-        } else if path == "-" && args.paths_with_position.len() == 1 {
-            let file = NamedTempFile::new()?;
-            paths.push(file.path().to_string_lossy().into_owned());
-            let (file, _) = file.keep()?;
-            stdin_tmp_file = Some(file);
-        } else if let Some(file) = anonymous_fd(path) {
-            let tmp_file = NamedTempFile::new()?;
-            paths.push(tmp_file.path().to_string_lossy().into_owned());
-            let (tmp_file, _) = tmp_file.keep()?;
-            anonymous_fd_tmp_files.push((file, tmp_file));
-        } else if let Some(wsl) = wsl {
-            urls.push(format!("file://{}", parse_path_in_wsl(path, wsl)?));
-        } else {
-            paths.push(parse_path_with_position(path)?);
-        }
-    }
-
-    anyhow::ensure!(
-        args.dev_server_token.is_none(),
-        "Dev servers were removed in v0.157.x please upgrade to SSH remoting: https://zed.dev/docs/remote-development"
-    );
-
-    rayon::ThreadPoolBuilder::new()
-        .num_threads(4)
-        .stack_size(10 * 1024 * 1024)
-        .thread_name(|ix| format!("RayonWorker{}", ix))
-        .build_global()
-        .unwrap();
-
-    let sender: JoinHandle<anyhow::Result<()>> = thread::Builder::new()
-        .name("CliReceiver".to_string())
-        .spawn({
-            let exit_status = exit_status.clone();
-            let user_data_dir_for_thread = user_data_dir.clone();
-            move || {
-                let (_, handshake) = server.accept().context("Handshake after Zed spawn")?;
-                let (tx, rx) = (handshake.requests, handshake.responses);
-
-                #[cfg(target_os = "windows")]
-                let wsl = args.wsl;
-                #[cfg(not(target_os = "windows"))]
-                let wsl = None;
-
-                tx.send(CliRequest::Open {
-                    paths,
-                    urls,
-                    diff_paths,
-                    wsl,
-                    wait: args.wait,
-                    open_new_workspace,
-                    reuse: args.reuse,
-                    env,
-                    user_data_dir: user_data_dir_for_thread,
-                })?;
-
-                while let Ok(response) = rx.recv() {
-                    match response {
-                        CliResponse::Ping => {}
-                        CliResponse::Stdout { message } => println!("{message}"),
-                        CliResponse::Stderr { message } => eprintln!("{message}"),
-                        CliResponse::Exit { status } => {
-                            exit_status.lock().replace(status);
-                            return Ok(());
-                        }
-                    }
-                }
-
-                Ok(())
-            }
-        })
-        .unwrap();
-
-    let stdin_pipe_handle: Option<JoinHandle<anyhow::Result<()>>> =
-        stdin_tmp_file.map(|mut tmp_file| {
-            thread::Builder::new()
-                .name("CliStdin".to_string())
-                .spawn(move || {
-                    let mut stdin = std::io::stdin().lock();
-                    if !io::IsTerminal::is_terminal(&stdin) {
-                        io::copy(&mut stdin, &mut tmp_file)?;
-                    }
-                    Ok(())
-                })
-                .unwrap()
-        });
-
-    let anonymous_fd_pipe_handles: Vec<_> = anonymous_fd_tmp_files
-        .into_iter()
-        .map(|(mut file, mut tmp_file)| {
-            thread::Builder::new()
-                .name("CliAnonymousFd".to_string())
-                .spawn(move || io::copy(&mut file, &mut tmp_file))
-                .unwrap()
-        })
-        .collect();
-
-    if args.foreground {
-        app.run_foreground(url, user_data_dir.as_deref())?;
-    } else {
-        app.launch(url, user_data_dir.as_deref())?;
-        sender.join().unwrap()?;
-        if let Some(handle) = stdin_pipe_handle {
-            handle.join().unwrap()?;
-        }
-        for handle in anonymous_fd_pipe_handles {
-            handle.join().unwrap()?;
-        }
-    }
-
-    if let Some(exit_status) = exit_status.lock().take() {
-        std::process::exit(exit_status);
-    }
-    Ok(())
-}
-
-fn anonymous_fd(path: &str) -> Option<fs::File> {
-    #[cfg(target_os = "linux")]
-    {
-        use std::os::fd::{self, FromRawFd};
-
-        let fd_str = path.strip_prefix("/proc/self/fd/")?;
-
-        let link = fs::read_link(path).ok()?;
-        if !link.starts_with("memfd:") {
-            return None;
-        }
-
-        let fd: fd::RawFd = fd_str.parse().ok()?;
-        let file = unsafe { fs::File::from_raw_fd(fd) };
-        Some(file)
-    }
-    #[cfg(any(target_os = "macos", target_os = "freebsd"))]
-    {
-        use std::os::{
-            fd::{self, FromRawFd},
-            unix::fs::FileTypeExt,
-        };
-
-        let fd_str = path.strip_prefix("/dev/fd/")?;
-
-        let metadata = fs::metadata(path).ok()?;
-        let file_type = metadata.file_type();
-        if !file_type.is_fifo() && !file_type.is_socket() {
-            return None;
-        }
-        let fd: fd::RawFd = fd_str.parse().ok()?;
-        let file = unsafe { fs::File::from_raw_fd(fd) };
-        Some(file)
-    }
-    #[cfg(not(any(target_os = "linux", target_os = "macos", target_os = "freebsd")))]
-    {
-        _ = path;
-        // not implemented for bsd, windows. Could be, but isn't yet
-        None
-    }
-}
-
-#[cfg(any(target_os = "linux", target_os = "freebsd"))]
-mod linux {
-    use std::{
-        env,
-        ffi::OsString,
-        io,
-        os::unix::net::{SocketAddr, UnixDatagram},
-        path::{Path, PathBuf},
-        process::{self, ExitStatus},
-        thread,
-        time::Duration,
-    };
-
-    use anyhow::{Context as _, anyhow};
-    use cli::FORCE_CLI_MODE_ENV_VAR_NAME;
-    use fork::Fork;
-
-    use crate::{Detect, InstalledApp};
-
-    struct App(PathBuf);
-
-    impl Detect {
-        pub fn detect(path: Option<&Path>) -> anyhow::Result<impl InstalledApp> {
-            let path = if let Some(path) = path {
-                path.to_path_buf().canonicalize()?
-            } else {
-                let cli = env::current_exe()?;
-                let dir = cli.parent().context("no parent path for cli")?;
-
-                // libexec is the standard, lib/zed is for Arch (and other non-libexec distros),
-                // ./zed is for the target directory in development builds.
-                let possible_locations =
-                    ["../libexec/zed-editor", "../lib/zed/zed-editor", "./zed"];
-                possible_locations
-                    .iter()
-                    .find_map(|p| dir.join(p).canonicalize().ok().filter(|path| path != &cli))
-                    .with_context(|| {
-                        format!("could not find any of: {}", possible_locations.join(", "))
-                    })?
-            };
-
-            Ok(App(path))
-        }
-    }
-
-    impl InstalledApp for App {
-        fn zed_version_string(&self) -> String {
-            format!(
-                "Zed {}{}{} – {}",
-                if *release_channel::RELEASE_CHANNEL_NAME == "stable" {
-                    "".to_string()
-                } else {
-                    format!("{} ", *release_channel::RELEASE_CHANNEL_NAME)
-                },
-                option_env!("RELEASE_VERSION").unwrap_or_default(),
-                match option_env!("ZED_COMMIT_SHA") {
-                    Some(commit_sha) => format!(" {commit_sha} "),
-                    None => "".to_string(),
-                },
-                self.0.display(),
-            )
-        }
-
-        fn launch(&self, ipc_url: String, user_data_dir: Option<&str>) -> anyhow::Result<()> {
-            let data_dir = user_data_dir
-                .map(PathBuf::from)
-                .unwrap_or_else(|| paths::data_dir().clone());
-
-            let sock_path = data_dir.join(format!(
-                "zed-{}.sock",
-                *release_channel::RELEASE_CHANNEL_NAME
-            ));
-            let sock = UnixDatagram::unbound()?;
-            if sock.connect(&sock_path).is_err() {
-                self.boot_background(ipc_url, user_data_dir)?;
-            } else {
-                sock.send(ipc_url.as_bytes())?;
-            }
-            Ok(())
-        }
-
-        fn run_foreground(
-            &self,
-            ipc_url: String,
-            user_data_dir: Option<&str>,
-        ) -> io::Result<ExitStatus> {
-            let mut cmd = std::process::Command::new(self.0.clone());
-            cmd.arg(ipc_url);
-            if let Some(dir) = user_data_dir {
-                cmd.arg("--user-data-dir").arg(dir);
-            }
-            cmd.status()
-        }
-
-        fn path(&self) -> PathBuf {
-            self.0.clone()
-        }
-    }
-
-    impl App {
-        fn boot_background(
-            &self,
-            ipc_url: String,
-            user_data_dir: Option<&str>,
-        ) -> anyhow::Result<()> {
-            let path = &self.0;
-
-            match fork::fork() {
-                Ok(Fork::Parent(_)) => Ok(()),
-                Ok(Fork::Child) => {
-                    unsafe { std::env::set_var(FORCE_CLI_MODE_ENV_VAR_NAME, "") };
-                    if fork::setsid().is_err() {
-                        eprintln!("failed to setsid: {}", std::io::Error::last_os_error());
-                        process::exit(1);
-                    }
-                    if fork::close_fd().is_err() {
-                        eprintln!("failed to close_fd: {}", std::io::Error::last_os_error());
-                    }
-                    let mut args: Vec<OsString> =
-                        vec![path.as_os_str().to_owned(), OsString::from(ipc_url)];
-                    if let Some(dir) = user_data_dir {
-                        args.push(OsString::from("--user-data-dir"));
-                        args.push(OsString::from(dir));
-                    }
-                    let error = exec::execvp(path.clone(), &args);
-                    // if exec succeeded, we never get here.
-                    eprintln!("failed to exec {:?}: {}", path, error);
-                    process::exit(1)
-                }
-                Err(_) => Err(anyhow!(io::Error::last_os_error())),
-            }
-        }
-
-        fn wait_for_socket(
-            &self,
-            sock_addr: &SocketAddr,
-            sock: &mut UnixDatagram,
-        ) -> Result<(), std::io::Error> {
-            for _ in 0..100 {
-                thread::sleep(Duration::from_millis(10));
-                if sock.connect_addr(sock_addr).is_ok() {
-                    return Ok(());
-                }
-            }
-            sock.connect_addr(sock_addr)
-        }
-    }
-}
-
-#[cfg(target_os = "linux")]
-mod flatpak {
-    use std::ffi::OsString;
-    use std::path::PathBuf;
-    use std::process::Command;
-    use std::{env, process};
-
-    const EXTRA_LIB_ENV_NAME: &str = "ZED_FLATPAK_LIB_PATH";
-    const NO_ESCAPE_ENV_NAME: &str = "ZED_FLATPAK_NO_ESCAPE";
-
-    /// Adds bundled libraries to LD_LIBRARY_PATH if running under flatpak
-    pub fn ld_extra_libs() {
-        let mut paths = if let Ok(paths) = env::var("LD_LIBRARY_PATH") {
-            env::split_paths(&paths).collect()
-        } else {
-            Vec::new()
-        };
-
-        if let Ok(extra_path) = env::var(EXTRA_LIB_ENV_NAME) {
-            paths.push(extra_path.into());
-        }
-
-        unsafe { env::set_var("LD_LIBRARY_PATH", env::join_paths(paths).unwrap()) };
-    }
-
-    /// Restarts outside of the sandbox if currently running within it
-    pub fn try_restart_to_host() {
-        if let Some(flatpak_dir) = get_flatpak_dir() {
-            let mut args = vec!["/usr/bin/flatpak-spawn".into(), "--host".into()];
-            args.append(&mut get_xdg_env_args());
-            args.push("--env=ZED_UPDATE_EXPLANATION=Please use flatpak to update zed".into());
-            args.push(
-                format!(
-                    "--env={EXTRA_LIB_ENV_NAME}={}",
-                    flatpak_dir.join("lib").to_str().unwrap()
-                )
-                .into(),
-            );
-            args.push(flatpak_dir.join("bin").join("zed").into());
-
-            let mut is_app_location_set = false;
-            for arg in &env::args_os().collect::<Vec<_>>()[1..] {
-                args.push(arg.clone());
-                is_app_location_set |= arg == "--zed";
-            }
-
-            if !is_app_location_set {
-                args.push("--zed".into());
-                args.push(flatpak_dir.join("libexec").join("zed-editor").into());
-            }
-
-            let error = exec::execvp("/usr/bin/flatpak-spawn", args);
-            eprintln!("failed restart cli on host: {:?}", error);
-            process::exit(1);
-        }
-    }
-
-    pub fn set_bin_if_no_escape(mut args: super::Args) -> super::Args {
-        if env::var(NO_ESCAPE_ENV_NAME).is_ok()
-            && env::var("FLATPAK_ID").is_ok_and(|id| id.starts_with("dev.zed.Zed"))
-            && args.zed.is_none()
-        {
-            args.zed = Some("/app/libexec/zed-editor".into());
-            unsafe { env::set_var("ZED_UPDATE_EXPLANATION", "Please use flatpak to update zed") };
-        }
-        args
-    }
-
-    fn get_flatpak_dir() -> Option<PathBuf> {
-        if env::var(NO_ESCAPE_ENV_NAME).is_ok() {
-            return None;
-        }
-
-        if let Ok(flatpak_id) = env::var("FLATPAK_ID") {
-            if !flatpak_id.starts_with("dev.zed.Zed") {
-                return None;
-            }
-
-            let install_dir = Command::new("/usr/bin/flatpak-spawn")
-                .arg("--host")
-                .arg("flatpak")
-                .arg("info")
-                .arg("--show-location")
-                .arg(flatpak_id)
-                .output()
-                .unwrap();
-            let install_dir = PathBuf::from(String::from_utf8(install_dir.stdout).unwrap().trim());
-            Some(install_dir.join("files"))
-        } else {
-            None
-        }
-    }
-
-    fn get_xdg_env_args() -> Vec<OsString> {
-        let xdg_keys = [
-            "XDG_DATA_HOME",
-            "XDG_CONFIG_HOME",
-            "XDG_CACHE_HOME",
-            "XDG_STATE_HOME",
-        ];
-        env::vars()
-            .filter(|(key, _)| xdg_keys.contains(&key.as_str()))
-            .map(|(key, val)| format!("--env=FLATPAK_{}={}", key, val).into())
-            .collect()
-    }
-}
-
-#[cfg(target_os = "windows")]
-mod windows {
-    use anyhow::Context;
-    use release_channel::app_identifier;
-    use windows::{
-        Win32::{
-            Foundation::{CloseHandle, ERROR_ALREADY_EXISTS, GENERIC_WRITE, GetLastError},
-            Storage::FileSystem::{
-                CreateFileW, FILE_FLAGS_AND_ATTRIBUTES, FILE_SHARE_MODE, OPEN_EXISTING, WriteFile,
-            },
-            System::Threading::CreateMutexW,
-        },
-        core::HSTRING,
-    };
-
-    use crate::{Detect, InstalledApp};
-    use std::io;
-    use std::path::{Path, PathBuf};
-    use std::process::ExitStatus;
-
-    fn check_single_instance() -> bool {
-        let mutex = unsafe {
-            CreateMutexW(
-                None,
-                false,
-                &HSTRING::from(format!("{}-Instance-Mutex", app_identifier())),
-            )
-            .expect("Unable to create instance sync event")
-        };
-        let last_err = unsafe { GetLastError() };
-        let _ = unsafe { CloseHandle(mutex) };
-        last_err != ERROR_ALREADY_EXISTS
-    }
-
-    struct App(PathBuf);
-
-    impl InstalledApp for App {
-        fn zed_version_string(&self) -> String {
-            format!(
-                "Zed {}{}{} – {}",
-                if *release_channel::RELEASE_CHANNEL_NAME == "stable" {
-                    "".to_string()
-                } else {
-                    format!("{} ", *release_channel::RELEASE_CHANNEL_NAME)
-                },
-                option_env!("RELEASE_VERSION").unwrap_or_default(),
-                match option_env!("ZED_COMMIT_SHA") {
-                    Some(commit_sha) => format!(" {commit_sha} "),
-                    None => "".to_string(),
-                },
-                self.0.display(),
-            )
-        }
-
-        fn launch(&self, ipc_url: String, user_data_dir: Option<&str>) -> anyhow::Result<()> {
-            if check_single_instance() {
-                let mut cmd = std::process::Command::new(self.0.clone());
-                cmd.arg(ipc_url);
-                if let Some(dir) = user_data_dir {
-                    cmd.arg("--user-data-dir").arg(dir);
-                }
-                cmd.spawn()?;
-            } else {
-                unsafe {
-                    let pipe = CreateFileW(
-                        &HSTRING::from(format!("\\\\.\\pipe\\{}-Named-Pipe", app_identifier())),
-                        GENERIC_WRITE.0,
-                        FILE_SHARE_MODE::default(),
-                        None,
-                        OPEN_EXISTING,
-                        FILE_FLAGS_AND_ATTRIBUTES::default(),
-                        None,
-                    )?;
-                    let message = ipc_url.as_bytes();
-                    let mut bytes_written = 0;
-                    WriteFile(pipe, Some(message), Some(&mut bytes_written), None)?;
-                    CloseHandle(pipe)?;
-                }
-            }
-            Ok(())
-        }
-
-        fn run_foreground(
-            &self,
-            ipc_url: String,
-            user_data_dir: Option<&str>,
-        ) -> io::Result<ExitStatus> {
-            let mut cmd = std::process::Command::new(self.0.clone());
-            cmd.arg(ipc_url).arg("--foreground");
-            if let Some(dir) = user_data_dir {
-                cmd.arg("--user-data-dir").arg(dir);
-            }
-            cmd.spawn()?.wait()
-        }
-
-        fn path(&self) -> PathBuf {
-            self.0.clone()
-        }
-    }
-
-    impl Detect {
-        pub fn detect(path: Option<&Path>) -> anyhow::Result<impl InstalledApp> {
-            let path = if let Some(path) = path {
-                path.to_path_buf().canonicalize()?
-            } else {
-                let cli = std::env::current_exe()?;
-                let dir = cli.parent().context("no parent path for cli")?;
-
-                // ../Zed.exe is the standard, lib/zed is for MSYS2, ./zed.exe is for the target
-                // directory in development builds.
-                let possible_locations = ["../Zed.exe", "../lib/zed/zed-editor.exe", "./zed.exe"];
-                possible_locations
-                    .iter()
-                    .find_map(|p| dir.join(p).canonicalize().ok().filter(|path| path != &cli))
-                    .context(format!(
-                        "could not find any of: {}",
-                        possible_locations.join(", ")
-                    ))?
-            };
-
-            Ok(App(path))
-        }
-    }
-}
-
-#[cfg(target_os = "macos")]
-mod mac_os {
-    use anyhow::{Context as _, Result};
-    use core_foundation::{
-        array::{CFArray, CFIndex},
-        base::TCFType as _,
-        string::kCFStringEncodingUTF8,
-        url::{CFURL, CFURLCreateWithBytes},
-    };
-    use core_services::{LSLaunchURLSpec, LSOpenFromURLSpec, kLSLaunchDefaults};
-    use serde::Deserialize;
-    use std::{
-        ffi::OsStr,
-        fs, io,
-        path::{Path, PathBuf},
-        process::{Command, ExitStatus},
-        ptr,
-    };
-
-    use cli::FORCE_CLI_MODE_ENV_VAR_NAME;
-
-    use crate::{Detect, InstalledApp};
-
-    #[derive(Debug, Deserialize)]
-    struct InfoPlist {
-        #[serde(rename = "CFBundleShortVersionString")]
-        bundle_short_version_string: String,
-    }
-
-    enum Bundle {
-        App {
-            app_bundle: PathBuf,
-            plist: InfoPlist,
-        },
-        LocalPath {
-            executable: PathBuf,
-        },
-    }
-
-    fn locate_bundle() -> Result<PathBuf> {
-        let cli_path = std::env::current_exe()?.canonicalize()?;
-        let mut app_path = cli_path.clone();
-        while app_path.extension() != Some(OsStr::new("app")) {
-            anyhow::ensure!(
-                app_path.pop(),
-                "cannot find app bundle containing {cli_path:?}"
-            );
-        }
-        Ok(app_path)
-    }
-
-    impl Detect {
-        pub fn detect(path: Option<&Path>) -> anyhow::Result<impl InstalledApp> {
-            let bundle_path = if let Some(bundle_path) = path {
-                bundle_path
-                    .canonicalize()
-                    .with_context(|| format!("Args bundle path {bundle_path:?} canonicalization"))?
-            } else {
-                locate_bundle().context("bundle autodiscovery")?
-            };
-
-            match bundle_path.extension().and_then(|ext| ext.to_str()) {
-                Some("app") => {
-                    let plist_path = bundle_path.join("Contents/Info.plist");
-                    let plist =
-                        plist::from_file::<_, InfoPlist>(&plist_path).with_context(|| {
-                            format!("Reading *.app bundle plist file at {plist_path:?}")
-                        })?;
-                    Ok(Bundle::App {
-                        app_bundle: bundle_path,
-                        plist,
-                    })
-                }
-                _ => Ok(Bundle::LocalPath {
-                    executable: bundle_path,
-                }),
-            }
-        }
-    }
-
-    impl InstalledApp for Bundle {
-        fn zed_version_string(&self) -> String {
-            format!("Zed {} – {}", self.version(), self.path().display(),)
-        }
-
-        fn launch(&self, url: String, user_data_dir: Option<&str>) -> anyhow::Result<()> {
-            match self {
-                Self::App { app_bundle, .. } => {
-                    let app_path = app_bundle;
-
-                    let status = unsafe {
-                        let app_url = CFURL::from_path(app_path, true)
-                            .with_context(|| format!("invalid app path {app_path:?}"))?;
-                        let url_to_open = CFURL::wrap_under_create_rule(CFURLCreateWithBytes(
-                            ptr::null(),
-                            url.as_ptr(),
-                            url.len() as CFIndex,
-                            kCFStringEncodingUTF8,
-                            ptr::null(),
-                        ));
-                        // equivalent to: open zed-cli:... -a /Applications/Zed\ Preview.app
-                        let urls_to_open =
-                            CFArray::from_copyable(&[url_to_open.as_concrete_TypeRef()]);
-                        LSOpenFromURLSpec(
-                            &LSLaunchURLSpec {
-                                appURL: app_url.as_concrete_TypeRef(),
-                                itemURLs: urls_to_open.as_concrete_TypeRef(),
-                                passThruParams: ptr::null(),
-                                launchFlags: kLSLaunchDefaults,
-                                asyncRefCon: ptr::null_mut(),
-                            },
-                            ptr::null_mut(),
-                        )
-                    };
-
-                    anyhow::ensure!(
-                        status == 0,
-                        "cannot start app bundle {}",
-                        self.zed_version_string()
-                    );
-                }
-
-                Self::LocalPath { executable, .. } => {
-                    let executable_parent = executable
-                        .parent()
-                        .with_context(|| format!("Executable {executable:?} path has no parent"))?;
-                    let subprocess_stdout_file = fs::File::create(
-                        executable_parent.join("zed_dev.log"),
-                    )
-                    .with_context(|| format!("Log file creation in {executable_parent:?}"))?;
-                    let subprocess_stdin_file =
-                        subprocess_stdout_file.try_clone().with_context(|| {
-                            format!("Cloning descriptor for file {subprocess_stdout_file:?}")
-                        })?;
-                    let mut command = std::process::Command::new(executable);
-                    command.env(FORCE_CLI_MODE_ENV_VAR_NAME, "");
-                    if let Some(dir) = user_data_dir {
-                        command.arg("--user-data-dir").arg(dir);
-                    }
-                    command
-                        .stderr(subprocess_stdout_file)
-                        .stdout(subprocess_stdin_file)
-                        .arg(url);
-
-                    command
-                        .spawn()
-                        .with_context(|| format!("Spawning {command:?}"))?;
-                }
-            }
-
-            Ok(())
-        }
-
-        fn run_foreground(
-            &self,
-            ipc_url: String,
-            user_data_dir: Option<&str>,
-        ) -> io::Result<ExitStatus> {
-            let path = match self {
-                Bundle::App { app_bundle, .. } => app_bundle.join("Contents/MacOS/zed"),
-                Bundle::LocalPath { executable, .. } => executable.clone(),
-            };
-
-            let mut cmd = std::process::Command::new(path);
-            cmd.arg(ipc_url);
-            if let Some(dir) = user_data_dir {
-                cmd.arg("--user-data-dir").arg(dir);
-            }
-            cmd.status()
-        }
-
-        fn path(&self) -> PathBuf {
-            match self {
-                Bundle::App { app_bundle, .. } => app_bundle.join("Contents/MacOS/zed"),
-                Bundle::LocalPath { executable, .. } => executable.clone(),
-            }
-        }
-    }
-
-    impl Bundle {
-        fn version(&self) -> String {
-            match self {
-                Self::App { plist, .. } => plist.bundle_short_version_string.clone(),
-                Self::LocalPath { .. } => "<development>".to_string(),
-            }
-        }
-
-        fn path(&self) -> &Path {
-            match self {
-                Self::App { app_bundle, .. } => app_bundle,
-                Self::LocalPath { executable, .. } => executable,
-            }
-        }
-    }
-
-    pub(super) fn spawn_channel_cli(
-        channel: release_channel::ReleaseChannel,
-        leftover_args: Vec<String>,
-    ) -> Result<()> {
-        use anyhow::bail;
-
-        let app_path_prompt = format!(
-            "POSIX path of (path to application \"{}\")",
-            channel.display_name()
-        );
-        let app_path_output = Command::new("osascript")
-            .arg("-e")
-            .arg(&app_path_prompt)
-            .output()?;
-        if !app_path_output.status.success() {
-            bail!(
-                "Could not determine app path for {}",
-                channel.display_name()
-            );
-        }
-        let app_path = String::from_utf8(app_path_output.stdout)?.trim().to_owned();
-        let cli_path = format!("{app_path}/Contents/MacOS/cli");
-        Command::new(cli_path).args(leftover_args).spawn()?;
-        Ok(())
-    }
-}
diff --git a/crates/client/Cargo.toml b/crates/client/Cargo.toml
deleted file mode 100644
index 50cf12b977..0000000000
--- a/crates/client/Cargo.toml
+++ /dev/null
@@ -1,84 +0,0 @@
-[package]
-name = "client"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/client.rs"
-doctest = false
-
-[features]
-test-support = ["clock/test-support", "collections/test-support", "gpui/test-support", "rpc/test-support"]
-
-[dependencies]
-anyhow.workspace = true
-async-tungstenite = { workspace = true, features = ["tokio", "tokio-rustls-manual-roots"] }
-base64.workspace = true
-chrono = { workspace = true, features = ["serde"] }
-clock.workspace = true
-cloud_api_client.workspace = true
-cloud_llm_client.workspace = true
-collections.workspace = true
-credentials_provider.workspace = true
-derive_more.workspace = true
-feature_flags.workspace = true
-futures.workspace = true
-gpui.workspace = true
-gpui_tokio.workspace = true
-http_client.workspace = true
-http_client_tls.workspace = true
-httparse = "1.10"
-log.workspace = true
-parking_lot.workspace = true
-paths.workspace = true
-postage.workspace = true
-rand.workspace = true
-regex.workspace = true
-release_channel.workspace = true
-rpc = { workspace = true, features = ["gpui"] }
-serde.workspace = true
-serde_json.workspace = true
-serde_urlencoded.workspace = true
-settings.workspace = true
-sha2.workspace = true
-smol.workspace = true
-telemetry.workspace = true
-telemetry_events.workspace = true
-text.workspace = true
-thiserror.workspace = true
-time.workspace = true
-tiny_http.workspace = true
-tokio-socks.workspace = true
-tokio.workspace = true
-url.workspace = true
-util.workspace = true
-worktree.workspace = true
-
-[dev-dependencies]
-clock = { workspace = true, features = ["test-support"] }
-collections = { workspace = true, features = ["test-support"] }
-fs.workspace = true
-gpui = { workspace = true, features = ["test-support"] }
-http_client = { workspace = true, features = ["test-support"] }
-rpc = { workspace = true, features = ["test-support"] }
-settings = { workspace = true, features = ["test-support"] }
-util = { workspace = true, features = ["test-support"] }
-
-[target.'cfg(target_os = "windows")'.dependencies]
-semver.workspace = true
-windows.workspace = true
-
-[target.'cfg(target_os = "macos")'.dependencies]
-objc2-foundation.workspace = true
-
-[target.'cfg(any(target_os = "windows", target_os = "macos"))'.dependencies]
-tokio-native-tls = "0.3"
-
-[target.'cfg(not(any(target_os = "windows", target_os = "macos")))'.dependencies]
-rustls-pki-types = "1.12"
-tokio-rustls = { version = "0.26", features = ["tls12", "ring"], default-features = false }
diff --git a/crates/client/LICENSE-GPL b/crates/client/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/client/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/client/src/client.rs b/crates/client/src/client.rs
deleted file mode 100644
index 6d6d229b94..0000000000
--- a/crates/client/src/client.rs
+++ /dev/null
@@ -1,2180 +0,0 @@
-#[cfg(any(test, feature = "test-support"))]
-pub mod test;
-
-mod proxy;
-pub mod telemetry;
-pub mod user;
-pub mod zed_urls;
-
-use anyhow::{Context as _, Result, anyhow};
-use async_tungstenite::tungstenite::{
-    client::IntoClientRequest,
-    error::Error as WebsocketError,
-    http::{HeaderValue, Request, StatusCode},
-};
-use clock::SystemClock;
-use cloud_api_client::CloudApiClient;
-use cloud_api_client::websocket_protocol::MessageToClient;
-use credentials_provider::CredentialsProvider;
-use feature_flags::FeatureFlagAppExt as _;
-use futures::{
-    AsyncReadExt, FutureExt, SinkExt, Stream, StreamExt, TryFutureExt as _, TryStreamExt,
-    channel::oneshot, future::BoxFuture,
-};
-use gpui::{App, AsyncApp, Entity, Global, Task, WeakEntity, actions};
-use http_client::{HttpClient, HttpClientWithUrl, http, read_proxy_from_env};
-use parking_lot::RwLock;
-use postage::watch;
-use proxy::connect_proxy_stream;
-use rand::prelude::*;
-use release_channel::{AppVersion, ReleaseChannel};
-use rpc::proto::{AnyTypedEnvelope, EnvelopedMessage, PeerId, RequestMessage};
-use serde::{Deserialize, Serialize};
-use settings::{RegisterSetting, Settings, SettingsContent};
-use std::{
-    any::TypeId,
-    convert::TryFrom,
-    fmt::Write as _,
-    future::Future,
-    marker::PhantomData,
-    path::PathBuf,
-    sync::{
-        Arc, LazyLock, Weak,
-        atomic::{AtomicU64, Ordering},
-    },
-    time::{Duration, Instant},
-};
-use std::{cmp, pin::Pin};
-use telemetry::Telemetry;
-use thiserror::Error;
-use tokio::net::TcpStream;
-use url::Url;
-use util::{ConnectionResult, ResultExt};
-
-pub use rpc::*;
-pub use telemetry_events::Event;
-pub use user::*;
-
-static ZED_SERVER_URL: LazyLock<Option<String>> =
-    LazyLock::new(|| std::env::var("ZED_SERVER_URL").ok());
-static ZED_RPC_URL: LazyLock<Option<String>> = LazyLock::new(|| std::env::var("ZED_RPC_URL").ok());
-
-pub static IMPERSONATE_LOGIN: LazyLock<Option<String>> = LazyLock::new(|| {
-    std::env::var("ZED_IMPERSONATE")
-        .ok()
-        .and_then(|s| if s.is_empty() { None } else { Some(s) })
-});
-
-pub static USE_WEB_LOGIN: LazyLock<bool> = LazyLock::new(|| std::env::var("ZED_WEB_LOGIN").is_ok());
-
-pub static ADMIN_API_TOKEN: LazyLock<Option<String>> = LazyLock::new(|| {
-    std::env::var("ZED_ADMIN_API_TOKEN")
-        .ok()
-        .and_then(|s| if s.is_empty() { None } else { Some(s) })
-});
-
-pub static ZED_APP_PATH: LazyLock<Option<PathBuf>> =
-    LazyLock::new(|| std::env::var("ZED_APP_PATH").ok().map(PathBuf::from));
-
-pub static ZED_ALWAYS_ACTIVE: LazyLock<bool> =
-    LazyLock::new(|| std::env::var("ZED_ALWAYS_ACTIVE").is_ok_and(|e| !e.is_empty()));
-
-pub const INITIAL_RECONNECTION_DELAY: Duration = Duration::from_millis(500);
-pub const MAX_RECONNECTION_DELAY: Duration = Duration::from_secs(30);
-pub const CONNECTION_TIMEOUT: Duration = Duration::from_secs(20);
-
-actions!(
-    client,
-    [
-        /// Signs in to Zed account.
-        SignIn,
-        /// Signs out of Zed account.
-        SignOut,
-        /// Reconnects to the collaboration server.
-        Reconnect
-    ]
-);
-
-#[derive(Deserialize, RegisterSetting)]
-pub struct ClientSettings {
-    pub server_url: String,
-}
-
-impl Settings for ClientSettings {
-    fn from_settings(content: &settings::SettingsContent) -> Self {
-        if let Some(server_url) = &*ZED_SERVER_URL {
-            return Self {
-                server_url: server_url.clone(),
-            };
-        }
-        Self {
-            server_url: content.server_url.clone().unwrap(),
-        }
-    }
-}
-
-#[derive(Deserialize, Default, RegisterSetting)]
-pub struct ProxySettings {
-    pub proxy: Option<String>,
-}
-
-impl ProxySettings {
-    pub fn proxy_url(&self) -> Option<Url> {
-        self.proxy
-            .as_ref()
-            .and_then(|input| {
-                input
-                    .parse::<Url>()
-                    .inspect_err(|e| log::error!("Error parsing proxy settings: {}", e))
-                    .ok()
-            })
-            .or_else(read_proxy_from_env)
-    }
-}
-
-impl Settings for ProxySettings {
-    fn from_settings(content: &settings::SettingsContent) -> Self {
-        Self {
-            proxy: content.proxy.clone(),
-        }
-    }
-}
-
-pub fn init(client: &Arc<Client>, cx: &mut App) {
-    let client = Arc::downgrade(client);
-    cx.on_action({
-        let client = client.clone();
-        move |_: &SignIn, cx| {
-            if let Some(client) = client.upgrade() {
-                cx.spawn(async move |cx| client.sign_in_with_optional_connect(true, cx).await)
-                    .detach_and_log_err(cx);
-            }
-        }
-    });
-
-    cx.on_action({
-        let client = client.clone();
-        move |_: &SignOut, cx| {
-            if let Some(client) = client.upgrade() {
-                cx.spawn(async move |cx| {
-                    client.sign_out(cx).await;
-                })
-                .detach();
-            }
-        }
-    });
-
-    cx.on_action({
-        let client = client;
-        move |_: &Reconnect, cx| {
-            if let Some(client) = client.upgrade() {
-                cx.spawn(async move |cx| {
-                    client.reconnect(cx);
-                })
-                .detach();
-            }
-        }
-    });
-}
-
-pub type MessageToClientHandler = Box<dyn Fn(&MessageToClient, &mut App) + Send + Sync + 'static>;
-
-struct GlobalClient(Arc<Client>);
-
-impl Global for GlobalClient {}
-
-pub struct Client {
-    id: AtomicU64,
-    peer: Arc<Peer>,
-    http: Arc<HttpClientWithUrl>,
-    cloud_client: Arc<CloudApiClient>,
-    telemetry: Arc<Telemetry>,
-    credentials_provider: ClientCredentialsProvider,
-    state: RwLock<ClientState>,
-    handler_set: parking_lot::Mutex<ProtoMessageHandlerSet>,
-    message_to_client_handlers: parking_lot::Mutex<Vec<MessageToClientHandler>>,
-
-    #[allow(clippy::type_complexity)]
-    #[cfg(any(test, feature = "test-support"))]
-    authenticate:
-        RwLock<Option<Box<dyn 'static + Send + Sync + Fn(&AsyncApp) -> Task<Result<Credentials>>>>>,
-
-    #[allow(clippy::type_complexity)]
-    #[cfg(any(test, feature = "test-support"))]
-    establish_connection: RwLock<
-        Option<
-            Box<
-                dyn 'static
-                    + Send
-                    + Sync
-                    + Fn(
-                        &Credentials,
-                        &AsyncApp,
-                    ) -> Task<Result<Connection, EstablishConnectionError>>,
-            >,
-        >,
-    >,
-
-    #[cfg(any(test, feature = "test-support"))]
-    rpc_url: RwLock<Option<Url>>,
-}
-
-#[derive(Error, Debug)]
-pub enum EstablishConnectionError {
-    #[error("upgrade required")]
-    UpgradeRequired,
-    #[error("unauthorized")]
-    Unauthorized,
-    #[error("{0}")]
-    Other(#[from] anyhow::Error),
-    #[error("{0}")]
-    InvalidHeaderValue(#[from] async_tungstenite::tungstenite::http::header::InvalidHeaderValue),
-    #[error("{0}")]
-    Io(#[from] std::io::Error),
-    #[error("{0}")]
-    Websocket(#[from] async_tungstenite::tungstenite::http::Error),
-}
-
-impl From<WebsocketError> for EstablishConnectionError {
-    fn from(error: WebsocketError) -> Self {
-        if let WebsocketError::Http(response) = &error {
-            match response.status() {
-                StatusCode::UNAUTHORIZED => return EstablishConnectionError::Unauthorized,
-                StatusCode::UPGRADE_REQUIRED => return EstablishConnectionError::UpgradeRequired,
-                _ => {}
-            }
-        }
-        EstablishConnectionError::Other(error.into())
-    }
-}
-
-impl EstablishConnectionError {
-    pub fn other(error: impl Into<anyhow::Error> + Send + Sync) -> Self {
-        Self::Other(error.into())
-    }
-}
-
-#[derive(Copy, Clone, Debug, PartialEq)]
-pub enum Status {
-    SignedOut,
-    UpgradeRequired,
-    Authenticating,
-    Authenticated,
-    AuthenticationError,
-    Connecting,
-    ConnectionError,
-    Connected {
-        peer_id: PeerId,
-        connection_id: ConnectionId,
-    },
-    ConnectionLost,
-    Reauthenticating,
-    Reauthenticated,
-    Reconnecting,
-    ReconnectionError {
-        next_reconnection: Instant,
-    },
-}
-
-impl Status {
-    pub fn is_connected(&self) -> bool {
-        matches!(self, Self::Connected { .. })
-    }
-
-    pub fn was_connected(&self) -> bool {
-        matches!(
-            self,
-            Self::ConnectionLost
-                | Self::Reauthenticating
-                | Self::Reauthenticated
-                | Self::Reconnecting
-        )
-    }
-
-    /// Returns whether the client is currently connected or was connected at some point.
-    pub fn is_or_was_connected(&self) -> bool {
-        self.is_connected() || self.was_connected()
-    }
-
-    pub fn is_signing_in(&self) -> bool {
-        matches!(
-            self,
-            Self::Authenticating | Self::Reauthenticating | Self::Connecting | Self::Reconnecting
-        )
-    }
-
-    pub fn is_signed_out(&self) -> bool {
-        matches!(self, Self::SignedOut | Self::UpgradeRequired)
-    }
-}
-
-struct ClientState {
-    credentials: Option<Credentials>,
-    status: (watch::Sender<Status>, watch::Receiver<Status>),
-    _reconnect_task: Option<Task<()>>,
-}
-
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub struct Credentials {
-    pub user_id: u64,
-    pub access_token: String,
-}
-
-impl Credentials {
-    pub fn authorization_header(&self) -> String {
-        format!("{} {}", self.user_id, self.access_token)
-    }
-}
-
-pub struct ClientCredentialsProvider {
-    provider: Arc<dyn CredentialsProvider>,
-}
-
-impl ClientCredentialsProvider {
-    pub fn new(cx: &App) -> Self {
-        Self {
-            provider: <dyn CredentialsProvider>::global(cx),
-        }
-    }
-
-    fn server_url(&self, cx: &AsyncApp) -> Result<String> {
-        cx.update(|cx| ClientSettings::get_global(cx).server_url.clone())
-    }
-
-    /// Reads the credentials from the provider.
-    fn read_credentials<'a>(
-        &'a self,
-        cx: &'a AsyncApp,
-    ) -> Pin<Box<dyn Future<Output = Option<Credentials>> + 'a>> {
-        async move {
-            if IMPERSONATE_LOGIN.is_some() {
-                return None;
-            }
-
-            let server_url = self.server_url(cx).ok()?;
-            let (user_id, access_token) = self
-                .provider
-                .read_credentials(&server_url, cx)
-                .await
-                .log_err()
-                .flatten()?;
-
-            Some(Credentials {
-                user_id: user_id.parse().ok()?,
-                access_token: String::from_utf8(access_token).ok()?,
-            })
-        }
-        .boxed_local()
-    }
-
-    /// Writes the credentials to the provider.
-    fn write_credentials<'a>(
-        &'a self,
-        user_id: u64,
-        access_token: String,
-        cx: &'a AsyncApp,
-    ) -> Pin<Box<dyn Future<Output = Result<()>> + 'a>> {
-        async move {
-            let server_url = self.server_url(cx)?;
-            self.provider
-                .write_credentials(
-                    &server_url,
-                    &user_id.to_string(),
-                    access_token.as_bytes(),
-                    cx,
-                )
-                .await
-        }
-        .boxed_local()
-    }
-
-    /// Deletes the credentials from the provider.
-    fn delete_credentials<'a>(
-        &'a self,
-        cx: &'a AsyncApp,
-    ) -> Pin<Box<dyn Future<Output = Result<()>> + 'a>> {
-        async move {
-            let server_url = self.server_url(cx)?;
-            self.provider.delete_credentials(&server_url, cx).await
-        }
-        .boxed_local()
-    }
-}
-
-impl Default for ClientState {
-    fn default() -> Self {
-        Self {
-            credentials: None,
-            status: watch::channel_with(Status::SignedOut),
-            _reconnect_task: None,
-        }
-    }
-}
-
-pub enum Subscription {
-    Entity {
-        client: Weak<Client>,
-        id: (TypeId, u64),
-    },
-    Message {
-        client: Weak<Client>,
-        id: TypeId,
-    },
-}
-
-impl Drop for Subscription {
-    fn drop(&mut self) {
-        match self {
-            Subscription::Entity { client, id } => {
-                if let Some(client) = client.upgrade() {
-                    let mut state = client.handler_set.lock();
-                    let _ = state.entities_by_type_and_remote_id.remove(id);
-                }
-            }
-            Subscription::Message { client, id } => {
-                if let Some(client) = client.upgrade() {
-                    let mut state = client.handler_set.lock();
-                    let _ = state.entity_types_by_message_type.remove(id);
-                    let _ = state.message_handlers.remove(id);
-                }
-            }
-        }
-    }
-}
-
-pub struct PendingEntitySubscription<T: 'static> {
-    client: Arc<Client>,
-    remote_id: u64,
-    _entity_type: PhantomData<T>,
-    consumed: bool,
-}
-
-impl<T: 'static> PendingEntitySubscription<T> {
-    pub fn set_entity(mut self, entity: &Entity<T>, cx: &AsyncApp) -> Subscription {
-        self.consumed = true;
-        let mut handlers = self.client.handler_set.lock();
-        let id = (TypeId::of::<T>(), self.remote_id);
-        let Some(EntityMessageSubscriber::Pending(messages)) =
-            handlers.entities_by_type_and_remote_id.remove(&id)
-        else {
-            unreachable!()
-        };
-
-        handlers.entities_by_type_and_remote_id.insert(
-            id,
-            EntityMessageSubscriber::Entity {
-                handle: entity.downgrade().into(),
-            },
-        );
-        drop(handlers);
-        for message in messages {
-            let client_id = self.client.id();
-            let type_name = message.payload_type_name();
-            let sender_id = message.original_sender_id();
-            log::debug!(
-                "handling queued rpc message. client_id:{}, sender_id:{:?}, type:{}",
-                client_id,
-                sender_id,
-                type_name
-            );
-            self.client.handle_message(message, cx);
-        }
-        Subscription::Entity {
-            client: Arc::downgrade(&self.client),
-            id,
-        }
-    }
-}
-
-impl<T: 'static> Drop for PendingEntitySubscription<T> {
-    fn drop(&mut self) {
-        if !self.consumed {
-            let mut state = self.client.handler_set.lock();
-            if let Some(EntityMessageSubscriber::Pending(messages)) = state
-                .entities_by_type_and_remote_id
-                .remove(&(TypeId::of::<T>(), self.remote_id))
-            {
-                for message in messages {
-                    log::info!("unhandled message {}", message.payload_type_name());
-                }
-            }
-        }
-    }
-}
-
-#[derive(Copy, Clone, Deserialize, Debug, RegisterSetting)]
-pub struct TelemetrySettings {
-    pub diagnostics: bool,
-    pub metrics: bool,
-}
-
-impl settings::Settings for TelemetrySettings {
-    fn from_settings(content: &SettingsContent) -> Self {
-        Self {
-            diagnostics: content.telemetry.as_ref().unwrap().diagnostics.unwrap(),
-            metrics: content.telemetry.as_ref().unwrap().metrics.unwrap(),
-        }
-    }
-}
-
-impl Client {
-    pub fn new(
-        clock: Arc<dyn SystemClock>,
-        http: Arc<HttpClientWithUrl>,
-        cx: &mut App,
-    ) -> Arc<Self> {
-        Arc::new(Self {
-            id: AtomicU64::new(0),
-            peer: Peer::new(0),
-            telemetry: Telemetry::new(clock, http.clone(), cx),
-            cloud_client: Arc::new(CloudApiClient::new(http.clone())),
-            http,
-            credentials_provider: ClientCredentialsProvider::new(cx),
-            state: Default::default(),
-            handler_set: Default::default(),
-            message_to_client_handlers: parking_lot::Mutex::new(Vec::new()),
-
-            #[cfg(any(test, feature = "test-support"))]
-            authenticate: Default::default(),
-            #[cfg(any(test, feature = "test-support"))]
-            establish_connection: Default::default(),
-            #[cfg(any(test, feature = "test-support"))]
-            rpc_url: RwLock::default(),
-        })
-    }
-
-    pub fn production(cx: &mut App) -> Arc<Self> {
-        let clock = Arc::new(clock::RealSystemClock);
-        let http = Arc::new(HttpClientWithUrl::new_url(
-            cx.http_client(),
-            &ClientSettings::get_global(cx).server_url,
-            cx.http_client().proxy().cloned(),
-        ));
-        Self::new(clock, http, cx)
-    }
-
-    pub fn id(&self) -> u64 {
-        self.id.load(Ordering::SeqCst)
-    }
-
-    pub fn http_client(&self) -> Arc<HttpClientWithUrl> {
-        self.http.clone()
-    }
-
-    pub fn cloud_client(&self) -> Arc<CloudApiClient> {
-        self.cloud_client.clone()
-    }
-
-    pub fn set_id(&self, id: u64) -> &Self {
-        self.id.store(id, Ordering::SeqCst);
-        self
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn teardown(&self) {
-        let mut state = self.state.write();
-        state._reconnect_task.take();
-        self.handler_set.lock().clear();
-        self.peer.teardown();
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn override_authenticate<F>(&self, authenticate: F) -> &Self
-    where
-        F: 'static + Send + Sync + Fn(&AsyncApp) -> Task<Result<Credentials>>,
-    {
-        *self.authenticate.write() = Some(Box::new(authenticate));
-        self
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn override_establish_connection<F>(&self, connect: F) -> &Self
-    where
-        F: 'static
-            + Send
-            + Sync
-            + Fn(&Credentials, &AsyncApp) -> Task<Result<Connection, EstablishConnectionError>>,
-    {
-        *self.establish_connection.write() = Some(Box::new(connect));
-        self
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn override_rpc_url(&self, url: Url) -> &Self {
-        *self.rpc_url.write() = Some(url);
-        self
-    }
-
-    pub fn global(cx: &App) -> Arc<Self> {
-        cx.global::<GlobalClient>().0.clone()
-    }
-    pub fn set_global(client: Arc<Client>, cx: &mut App) {
-        cx.set_global(GlobalClient(client))
-    }
-
-    pub fn user_id(&self) -> Option<u64> {
-        self.state
-            .read()
-            .credentials
-            .as_ref()
-            .map(|credentials| credentials.user_id)
-    }
-
-    pub fn peer_id(&self) -> Option<PeerId> {
-        if let Status::Connected { peer_id, .. } = &*self.status().borrow() {
-            Some(*peer_id)
-        } else {
-            None
-        }
-    }
-
-    pub fn status(&self) -> watch::Receiver<Status> {
-        self.state.read().status.1.clone()
-    }
-
-    fn set_status(self: &Arc<Self>, status: Status, cx: &AsyncApp) {
-        log::info!("set status on client {}: {:?}", self.id(), status);
-        let mut state = self.state.write();
-        *state.status.0.borrow_mut() = status;
-
-        match status {
-            Status::Connected { .. } => {
-                state._reconnect_task = None;
-            }
-            Status::ConnectionLost => {
-                let client = self.clone();
-                state._reconnect_task = Some(cx.spawn(async move |cx| {
-                    #[cfg(any(test, feature = "test-support"))]
-                    let mut rng = StdRng::seed_from_u64(0);
-                    #[cfg(not(any(test, feature = "test-support")))]
-                    let mut rng = StdRng::from_os_rng();
-
-                    let mut delay = INITIAL_RECONNECTION_DELAY;
-                    loop {
-                        match client.connect(true, cx).await {
-                            ConnectionResult::Timeout => {
-                                log::error!("client connect attempt timed out")
-                            }
-                            ConnectionResult::ConnectionReset => {
-                                log::error!("client connect attempt reset")
-                            }
-                            ConnectionResult::Result(r) => {
-                                if let Err(error) = r {
-                                    log::error!("failed to connect: {error}");
-                                } else {
-                                    break;
-                                }
-                            }
-                        }
-
-                        if matches!(
-                            *client.status().borrow(),
-                            Status::AuthenticationError | Status::ConnectionError
-                        ) {
-                            client.set_status(
-                                Status::ReconnectionError {
-                                    next_reconnection: Instant::now() + delay,
-                                },
-                                cx,
-                            );
-                            let jitter = Duration::from_millis(
-                                rng.random_range(0..delay.as_millis() as u64),
-                            );
-                            cx.background_executor().timer(delay + jitter).await;
-                            delay = cmp::min(delay * 2, MAX_RECONNECTION_DELAY);
-                        } else {
-                            break;
-                        }
-                    }
-                }));
-            }
-            Status::SignedOut | Status::UpgradeRequired => {
-                self.telemetry.set_authenticated_user_info(None, false);
-                state._reconnect_task.take();
-            }
-            _ => {}
-        }
-    }
-
-    pub fn subscribe_to_entity<T>(
-        self: &Arc<Self>,
-        remote_id: u64,
-    ) -> Result<PendingEntitySubscription<T>>
-    where
-        T: 'static,
-    {
-        let id = (TypeId::of::<T>(), remote_id);
-
-        let mut state = self.handler_set.lock();
-        anyhow::ensure!(
-            !state.entities_by_type_and_remote_id.contains_key(&id),
-            "already subscribed to entity"
-        );
-
-        state
-            .entities_by_type_and_remote_id
-            .insert(id, EntityMessageSubscriber::Pending(Default::default()));
-
-        Ok(PendingEntitySubscription {
-            client: self.clone(),
-            remote_id,
-            consumed: false,
-            _entity_type: PhantomData,
-        })
-    }
-
-    #[track_caller]
-    pub fn add_message_handler<M, E, H, F>(
-        self: &Arc<Self>,
-        entity: WeakEntity<E>,
-        handler: H,
-    ) -> Subscription
-    where
-        M: EnvelopedMessage,
-        E: 'static,
-        H: 'static + Sync + Fn(Entity<E>, TypedEnvelope<M>, AsyncApp) -> F + Send + Sync,
-        F: 'static + Future<Output = Result<()>>,
-    {
-        self.add_message_handler_impl(entity, move |entity, message, _, cx| {
-            handler(entity, message, cx)
-        })
-    }
-
-    fn add_message_handler_impl<M, E, H, F>(
-        self: &Arc<Self>,
-        entity: WeakEntity<E>,
-        handler: H,
-    ) -> Subscription
-    where
-        M: EnvelopedMessage,
-        E: 'static,
-        H: 'static
-            + Sync
-            + Fn(Entity<E>, TypedEnvelope<M>, AnyProtoClient, AsyncApp) -> F
-            + Send
-            + Sync,
-        F: 'static + Future<Output = Result<()>>,
-    {
-        let message_type_id = TypeId::of::<M>();
-        let mut state = self.handler_set.lock();
-        state
-            .entities_by_message_type
-            .insert(message_type_id, entity.into());
-
-        let prev_handler = state.message_handlers.insert(
-            message_type_id,
-            Arc::new(move |subscriber, envelope, client, cx| {
-                let subscriber = subscriber.downcast::<E>().unwrap();
-                let envelope = envelope.into_any().downcast::<TypedEnvelope<M>>().unwrap();
-                handler(subscriber, *envelope, client, cx).boxed_local()
-            }),
-        );
-        if prev_handler.is_some() {
-            let location = std::panic::Location::caller();
-            panic!(
-                "{}:{} registered handler for the same message {} twice",
-                location.file(),
-                location.line(),
-                std::any::type_name::<M>()
-            );
-        }
-
-        Subscription::Message {
-            client: Arc::downgrade(self),
-            id: message_type_id,
-        }
-    }
-
-    pub fn add_request_handler<M, E, H, F>(
-        self: &Arc<Self>,
-        entity: WeakEntity<E>,
-        handler: H,
-    ) -> Subscription
-    where
-        M: RequestMessage,
-        E: 'static,
-        H: 'static + Sync + Fn(Entity<E>, TypedEnvelope<M>, AsyncApp) -> F + Send + Sync,
-        F: 'static + Future<Output = Result<M::Response>>,
-    {
-        self.add_message_handler_impl(entity, move |handle, envelope, this, cx| {
-            Self::respond_to_request(envelope.receipt(), handler(handle, envelope, cx), this)
-        })
-    }
-
-    async fn respond_to_request<T: RequestMessage, F: Future<Output = Result<T::Response>>>(
-        receipt: Receipt<T>,
-        response: F,
-        client: AnyProtoClient,
-    ) -> Result<()> {
-        match response.await {
-            Ok(response) => {
-                client.send_response(receipt.message_id, response)?;
-                Ok(())
-            }
-            Err(error) => {
-                client.send_response(receipt.message_id, error.to_proto())?;
-                Err(error)
-            }
-        }
-    }
-
-    pub async fn has_credentials(&self, cx: &AsyncApp) -> bool {
-        self.credentials_provider
-            .read_credentials(cx)
-            .await
-            .is_some()
-    }
-
-    pub async fn sign_in(
-        self: &Arc<Self>,
-        try_provider: bool,
-        cx: &AsyncApp,
-    ) -> Result<Credentials> {
-        let is_reauthenticating = if self.status().borrow().is_signed_out() {
-            self.set_status(Status::Authenticating, cx);
-            false
-        } else {
-            self.set_status(Status::Reauthenticating, cx);
-            true
-        };
-
-        let mut credentials = None;
-
-        let old_credentials = self.state.read().credentials.clone();
-        if let Some(old_credentials) = old_credentials
-            && self.validate_credentials(&old_credentials, cx).await?
-        {
-            credentials = Some(old_credentials);
-        }
-
-        if credentials.is_none()
-            && try_provider
-            && let Some(stored_credentials) = self.credentials_provider.read_credentials(cx).await
-        {
-            if self.validate_credentials(&stored_credentials, cx).await? {
-                credentials = Some(stored_credentials);
-            } else {
-                self.credentials_provider
-                    .delete_credentials(cx)
-                    .await
-                    .log_err();
-            }
-        }
-
-        if credentials.is_none() {
-            let mut status_rx = self.status();
-            let _ = status_rx.next().await;
-            futures::select_biased! {
-                authenticate = self.authenticate(cx).fuse() => {
-                    match authenticate {
-                        Ok(creds) => {
-                            if IMPERSONATE_LOGIN.is_none() {
-                                self.credentials_provider
-                                    .write_credentials(creds.user_id, creds.access_token.clone(), cx)
-                                    .await
-                                    .log_err();
-                            }
-
-                            credentials = Some(creds);
-                        },
-                        Err(err) => {
-                            self.set_status(Status::AuthenticationError, cx);
-                            return Err(err);
-                        }
-                    }
-                }
-                _ = status_rx.next().fuse() => {
-                    return Err(anyhow!("authentication canceled"));
-                }
-            }
-        }
-
-        let credentials = credentials.unwrap();
-        self.set_id(credentials.user_id);
-        self.cloud_client
-            .set_credentials(credentials.user_id as u32, credentials.access_token.clone());
-        self.state.write().credentials = Some(credentials.clone());
-        self.set_status(
-            if is_reauthenticating {
-                Status::Reauthenticated
-            } else {
-                Status::Authenticated
-            },
-            cx,
-        );
-
-        Ok(credentials)
-    }
-
-    async fn validate_credentials(
-        self: &Arc<Self>,
-        credentials: &Credentials,
-        cx: &AsyncApp,
-    ) -> Result<bool> {
-        match self
-            .cloud_client
-            .validate_credentials(credentials.user_id as u32, &credentials.access_token)
-            .await
-        {
-            Ok(valid) => Ok(valid),
-            Err(err) => {
-                self.set_status(Status::AuthenticationError, cx);
-                Err(anyhow!("failed to validate credentials: {}", err))
-            }
-        }
-    }
-
-    /// Establishes a WebSocket connection with Cloud for receiving updates from the server.
-    async fn connect_to_cloud(self: &Arc<Self>, cx: &AsyncApp) -> Result<()> {
-        let connect_task = cx.update({
-            let cloud_client = self.cloud_client.clone();
-            move |cx| cloud_client.connect(cx)
-        })??;
-        let connection = connect_task.await?;
-
-        let (mut messages, task) = cx.update(|cx| connection.spawn(cx))?;
-        task.detach();
-
-        cx.spawn({
-            let this = self.clone();
-            async move |cx| {
-                while let Some(message) = messages.next().await {
-                    if let Some(message) = message.log_err() {
-                        this.handle_message_to_client(message, cx);
-                    }
-                }
-            }
-        })
-        .detach();
-
-        Ok(())
-    }
-
-    /// Performs a sign-in and also (optionally) connects to Collab.
-    ///
-    /// Only Zed staff automatically connect to Collab.
-    pub async fn sign_in_with_optional_connect(
-        self: &Arc<Self>,
-        try_provider: bool,
-        cx: &AsyncApp,
-    ) -> Result<()> {
-        // Don't try to sign in again if we're already connected to Collab, as it will temporarily disconnect us.
-        if self.status().borrow().is_connected() {
-            return Ok(());
-        }
-
-        let (is_staff_tx, is_staff_rx) = oneshot::channel::<bool>();
-        let mut is_staff_tx = Some(is_staff_tx);
-        cx.update(|cx| {
-            cx.on_flags_ready(move |state, _cx| {
-                if let Some(is_staff_tx) = is_staff_tx.take() {
-                    is_staff_tx.send(state.is_staff).log_err();
-                }
-            })
-            .detach();
-        })
-        .log_err();
-
-        let credentials = self.sign_in(try_provider, cx).await?;
-
-        self.connect_to_cloud(cx).await.log_err();
-
-        cx.update(move |cx| {
-            cx.spawn({
-                let client = self.clone();
-                async move |cx| {
-                    let is_staff = is_staff_rx.await?;
-                    if is_staff {
-                        match client.connect_with_credentials(credentials, cx).await {
-                            ConnectionResult::Timeout => Err(anyhow!("connection timed out")),
-                            ConnectionResult::ConnectionReset => Err(anyhow!("connection reset")),
-                            ConnectionResult::Result(result) => {
-                                result.context("client auth and connect")
-                            }
-                        }
-                    } else {
-                        Ok(())
-                    }
-                }
-            })
-            .detach_and_log_err(cx);
-        })
-        .log_err();
-
-        Ok(())
-    }
-
-    pub async fn connect(
-        self: &Arc<Self>,
-        try_provider: bool,
-        cx: &AsyncApp,
-    ) -> ConnectionResult<()> {
-        let was_disconnected = match *self.status().borrow() {
-            Status::SignedOut | Status::Authenticated => true,
-            Status::ConnectionError
-            | Status::ConnectionLost
-            | Status::Authenticating
-            | Status::AuthenticationError
-            | Status::Reauthenticating
-            | Status::Reauthenticated
-            | Status::ReconnectionError { .. } => false,
-            Status::Connected { .. } | Status::Connecting | Status::Reconnecting => {
-                return ConnectionResult::Result(Ok(()));
-            }
-            Status::UpgradeRequired => {
-                return ConnectionResult::Result(
-                    Err(EstablishConnectionError::UpgradeRequired)
-                        .context("client auth and connect"),
-                );
-            }
-        };
-        let credentials = match self.sign_in(try_provider, cx).await {
-            Ok(credentials) => credentials,
-            Err(err) => return ConnectionResult::Result(Err(err)),
-        };
-
-        if was_disconnected {
-            self.set_status(Status::Connecting, cx);
-        } else {
-            self.set_status(Status::Reconnecting, cx);
-        }
-
-        self.connect_with_credentials(credentials, cx).await
-    }
-
-    async fn connect_with_credentials(
-        self: &Arc<Self>,
-        credentials: Credentials,
-        cx: &AsyncApp,
-    ) -> ConnectionResult<()> {
-        let mut timeout =
-            futures::FutureExt::fuse(cx.background_executor().timer(CONNECTION_TIMEOUT));
-        futures::select_biased! {
-            connection = self.establish_connection(&credentials, cx).fuse() => {
-                match connection {
-                    Ok(conn) => {
-                        futures::select_biased! {
-                            result = self.set_connection(conn, cx).fuse() => {
-                                match result.context("client auth and connect") {
-                                    Ok(()) => ConnectionResult::Result(Ok(())),
-                                    Err(err) => {
-                                        self.set_status(Status::ConnectionError, cx);
-                                        ConnectionResult::Result(Err(err))
-                                    },
-                                }
-                            },
-                            _ = timeout => {
-                                self.set_status(Status::ConnectionError, cx);
-                                ConnectionResult::Timeout
-                            }
-                        }
-                    }
-                    Err(EstablishConnectionError::Unauthorized) => {
-                        self.set_status(Status::ConnectionError, cx);
-                        ConnectionResult::Result(Err(EstablishConnectionError::Unauthorized).context("client auth and connect"))
-                    }
-                    Err(EstablishConnectionError::UpgradeRequired) => {
-                        self.set_status(Status::UpgradeRequired, cx);
-                        ConnectionResult::Result(Err(EstablishConnectionError::UpgradeRequired).context("client auth and connect"))
-                    }
-                    Err(error) => {
-                        self.set_status(Status::ConnectionError, cx);
-                        ConnectionResult::Result(Err(error).context("client auth and connect"))
-                    }
-                }
-            }
-            _ = &mut timeout => {
-                self.set_status(Status::ConnectionError, cx);
-                ConnectionResult::Timeout
-            }
-        }
-    }
-
-    async fn set_connection(self: &Arc<Self>, conn: Connection, cx: &AsyncApp) -> Result<()> {
-        let executor = cx.background_executor();
-        log::debug!("add connection to peer");
-        let (connection_id, handle_io, mut incoming) = self.peer.add_connection(conn, {
-            let executor = executor.clone();
-            move |duration| executor.timer(duration)
-        });
-        let handle_io = executor.spawn(handle_io);
-
-        let peer_id = async {
-            log::debug!("waiting for server hello");
-            let message = incoming.next().await.context("no hello message received")?;
-            log::debug!("got server hello");
-            let hello_message_type_name = message.payload_type_name().to_string();
-            let hello = message
-                .into_any()
-                .downcast::<TypedEnvelope<proto::Hello>>()
-                .map_err(|_| {
-                    anyhow!(
-                        "invalid hello message received: {:?}",
-                        hello_message_type_name
-                    )
-                })?;
-            let peer_id = hello.payload.peer_id.context("invalid peer id")?;
-            Ok(peer_id)
-        };
-
-        let peer_id = match peer_id.await {
-            Ok(peer_id) => peer_id,
-            Err(error) => {
-                self.peer.disconnect(connection_id);
-                return Err(error);
-            }
-        };
-
-        log::debug!(
-            "set status to connected (connection id: {:?}, peer id: {:?})",
-            connection_id,
-            peer_id
-        );
-        self.set_status(
-            Status::Connected {
-                peer_id,
-                connection_id,
-            },
-            cx,
-        );
-
-        cx.spawn({
-            let this = self.clone();
-            async move |cx| {
-                while let Some(message) = incoming.next().await {
-                    this.handle_message(message, cx);
-                    // Don't starve the main thread when receiving lots of messages at once.
-                    smol::future::yield_now().await;
-                }
-            }
-        })
-        .detach();
-
-        cx.spawn({
-            let this = self.clone();
-            async move |cx| match handle_io.await {
-                Ok(()) => {
-                    if *this.status().borrow()
-                        == (Status::Connected {
-                            connection_id,
-                            peer_id,
-                        })
-                    {
-                        this.set_status(Status::SignedOut, cx);
-                    }
-                }
-                Err(err) => {
-                    log::error!("connection error: {:?}", err);
-                    this.set_status(Status::ConnectionLost, cx);
-                }
-            }
-        })
-        .detach();
-
-        Ok(())
-    }
-
-    fn authenticate(self: &Arc<Self>, cx: &AsyncApp) -> Task<Result<Credentials>> {
-        #[cfg(any(test, feature = "test-support"))]
-        if let Some(callback) = self.authenticate.read().as_ref() {
-            return callback(cx);
-        }
-
-        self.authenticate_with_browser(cx)
-    }
-
-    fn establish_connection(
-        self: &Arc<Self>,
-        credentials: &Credentials,
-        cx: &AsyncApp,
-    ) -> Task<Result<Connection, EstablishConnectionError>> {
-        #[cfg(any(test, feature = "test-support"))]
-        if let Some(callback) = self.establish_connection.read().as_ref() {
-            return callback(credentials, cx);
-        }
-
-        self.establish_websocket_connection(credentials, cx)
-    }
-
-    fn rpc_url(
-        &self,
-        http: Arc<HttpClientWithUrl>,
-        release_channel: Option<ReleaseChannel>,
-    ) -> impl Future<Output = Result<url::Url>> + use<> {
-        #[cfg(any(test, feature = "test-support"))]
-        let url_override = self.rpc_url.read().clone();
-
-        async move {
-            #[cfg(any(test, feature = "test-support"))]
-            if let Some(url) = url_override {
-                return Ok(url);
-            }
-
-            if let Some(url) = &*ZED_RPC_URL {
-                return Url::parse(url).context("invalid rpc url");
-            }
-
-            let mut url = http.build_url("/rpc");
-            if let Some(preview_param) =
-                release_channel.and_then(|channel| channel.release_query_param())
-            {
-                url += "?";
-                url += preview_param;
-            }
-
-            let response = http.get(&url, Default::default(), false).await?;
-            anyhow::ensure!(
-                response.status().is_redirection(),
-                "unexpected /rpc response status {}",
-                response.status()
-            );
-            let collab_url = response
-                .headers()
-                .get("Location")
-                .context("missing location header in /rpc response")?
-                .to_str()
-                .map_err(EstablishConnectionError::other)?
-                .to_string();
-            Url::parse(&collab_url).with_context(|| format!("parsing collab rpc url {collab_url}"))
-        }
-    }
-
-    fn establish_websocket_connection(
-        self: &Arc<Self>,
-        credentials: &Credentials,
-        cx: &AsyncApp,
-    ) -> Task<Result<Connection, EstablishConnectionError>> {
-        let release_channel = cx
-            .update(|cx| ReleaseChannel::try_global(cx))
-            .ok()
-            .flatten();
-        let app_version = cx
-            .update(|cx| AppVersion::global(cx).to_string())
-            .ok()
-            .unwrap_or_default();
-
-        let http = self.http.clone();
-        let proxy = http.proxy().cloned();
-        let user_agent = http.user_agent().cloned();
-        let credentials = credentials.clone();
-        let rpc_url = self.rpc_url(http, release_channel);
-        let system_id = self.telemetry.system_id();
-        let metrics_id = self.telemetry.metrics_id();
-        cx.spawn(async move |cx| {
-            use HttpOrHttps::*;
-
-            #[derive(Debug)]
-            enum HttpOrHttps {
-                Http,
-                Https,
-            }
-
-            let mut rpc_url = rpc_url.await?;
-            let url_scheme = match rpc_url.scheme() {
-                "https" => Https,
-                "http" => Http,
-                _ => Err(anyhow!("invalid rpc url: {}", rpc_url))?,
-            };
-
-            let stream = gpui_tokio::Tokio::spawn_result(cx, {
-                let rpc_url = rpc_url.clone();
-                async move {
-                    let rpc_host = rpc_url
-                        .host_str()
-                        .zip(rpc_url.port_or_known_default())
-                        .context("missing host in rpc url")?;
-                    Ok(match proxy {
-                        Some(proxy) => connect_proxy_stream(&proxy, rpc_host).await?,
-                        None => Box::new(TcpStream::connect(rpc_host).await?),
-                    })
-                }
-            })?
-            .await?;
-
-            log::info!("connected to rpc endpoint {}", rpc_url);
-
-            rpc_url
-                .set_scheme(match url_scheme {
-                    Https => "wss",
-                    Http => "ws",
-                })
-                .unwrap();
-
-            // We call `into_client_request` to let `tungstenite` construct the WebSocket request
-            // for us from the RPC URL.
-            //
-            // Among other things, it will generate and set a `Sec-WebSocket-Key` header for us.
-            let mut request = IntoClientRequest::into_client_request(rpc_url.as_str())?;
-
-            // We then modify the request to add our desired headers.
-            let request_headers = request.headers_mut();
-            request_headers.insert(
-                http::header::AUTHORIZATION,
-                HeaderValue::from_str(&credentials.authorization_header())?,
-            );
-            request_headers.insert(
-                "x-zed-protocol-version",
-                HeaderValue::from_str(&rpc::PROTOCOL_VERSION.to_string())?,
-            );
-            request_headers.insert("x-zed-app-version", HeaderValue::from_str(&app_version)?);
-            request_headers.insert(
-                "x-zed-release-channel",
-                HeaderValue::from_str(release_channel.map(|r| r.dev_name()).unwrap_or("unknown"))?,
-            );
-            if let Some(user_agent) = user_agent {
-                request_headers.insert(http::header::USER_AGENT, user_agent);
-            }
-            if let Some(system_id) = system_id {
-                request_headers.insert("x-zed-system-id", HeaderValue::from_str(&system_id)?);
-            }
-            if let Some(metrics_id) = metrics_id {
-                request_headers.insert("x-zed-metrics-id", HeaderValue::from_str(&metrics_id)?);
-            }
-
-            let (stream, _) = async_tungstenite::tokio::client_async_tls_with_connector_and_config(
-                request,
-                stream,
-                Some(Arc::new(http_client_tls::tls_config()).into()),
-                None,
-            )
-            .await?;
-
-            Ok(Connection::new(
-                stream
-                    .map_err(|error| anyhow!(error))
-                    .sink_map_err(|error| anyhow!(error)),
-            ))
-        })
-    }
-
-    pub fn authenticate_with_browser(self: &Arc<Self>, cx: &AsyncApp) -> Task<Result<Credentials>> {
-        let http = self.http.clone();
-        let this = self.clone();
-        cx.spawn(async move |cx| {
-            let background = cx.background_executor().clone();
-
-            let (open_url_tx, open_url_rx) = oneshot::channel::<String>();
-            cx.update(|cx| {
-                cx.spawn(async move |cx| {
-                    let url = open_url_rx.await?;
-                    cx.update(|cx| cx.open_url(&url))
-                })
-                .detach_and_log_err(cx);
-            })
-            .log_err();
-
-            let credentials = background
-                .clone()
-                .spawn(async move {
-                    // Generate a pair of asymmetric encryption keys. The public key will be used by the
-                    // zed server to encrypt the user's access token, so that it can'be intercepted by
-                    // any other app running on the user's device.
-                    let (public_key, private_key) =
-                        rpc::auth::keypair().expect("failed to generate keypair for auth");
-                    let public_key_string = String::try_from(public_key)
-                        .expect("failed to serialize public key for auth");
-
-                    if let Some((login, token)) =
-                        IMPERSONATE_LOGIN.as_ref().zip(ADMIN_API_TOKEN.as_ref())
-                    {
-                        if !*USE_WEB_LOGIN {
-                            eprintln!("authenticate as admin {login}, {token}");
-
-                            return this
-                                .authenticate_as_admin(http, login.clone(), token.clone())
-                                .await;
-                        }
-                    }
-
-                    // Start an HTTP server to receive the redirect from Zed's sign-in page.
-                    let server =
-                        tiny_http::Server::http("127.0.0.1:0").expect("failed to find open port");
-                    let port = server.server_addr().port();
-
-                    // Open the Zed sign-in page in the user's browser, with query parameters that indicate
-                    // that the user is signing in from a Zed app running on the same device.
-                    let mut url = http.build_url(&format!(
-                        "/native_app_signin?native_app_port={}&native_app_public_key={}",
-                        port, public_key_string
-                    ));
-
-                    if let Some(impersonate_login) = IMPERSONATE_LOGIN.as_ref() {
-                        log::info!("impersonating user @{}", impersonate_login);
-                        write!(&mut url, "&impersonate={}", impersonate_login).unwrap();
-                    }
-
-                    open_url_tx.send(url).log_err();
-
-                    #[derive(Deserialize)]
-                    struct CallbackParams {
-                        pub user_id: String,
-                        pub access_token: String,
-                    }
-
-                    // Receive the HTTP request from the user's browser. Retrieve the user id and encrypted
-                    // access token from the query params.
-                    //
-                    // TODO - Avoid ever starting more than one HTTP server. Maybe switch to using a
-                    // custom URL scheme instead of this local HTTP server.
-                    let (user_id, access_token) = background
-                        .spawn(async move {
-                            for _ in 0..100 {
-                                if let Some(req) = server.recv_timeout(Duration::from_secs(1))? {
-                                    let path = req.url();
-                                    let url = Url::parse(&format!("http://example.com{}", path))
-                                        .context("failed to parse login notification url")?;
-                                    let callback_params: CallbackParams =
-                                        serde_urlencoded::from_str(url.query().unwrap_or_default())
-                                            .context(
-                                                "failed to parse sign-in callback query parameters",
-                                            )?;
-
-                                    let post_auth_url =
-                                        http.build_url("/native_app_signin_succeeded");
-                                    req.respond(
-                                        tiny_http::Response::empty(302).with_header(
-                                            tiny_http::Header::from_bytes(
-                                                &b"Location"[..],
-                                                post_auth_url.as_bytes(),
-                                            )
-                                            .unwrap(),
-                                        ),
-                                    )
-                                    .context("failed to respond to login http request")?;
-                                    return Ok((
-                                        callback_params.user_id,
-                                        callback_params.access_token,
-                                    ));
-                                }
-                            }
-
-                            anyhow::bail!("didn't receive login redirect");
-                        })
-                        .await?;
-
-                    let access_token = private_key
-                        .decrypt_string(&access_token)
-                        .context("failed to decrypt access token")?;
-
-                    Ok(Credentials {
-                        user_id: user_id.parse()?,
-                        access_token,
-                    })
-                })
-                .await?;
-
-            cx.update(|cx| cx.activate(true))?;
-            Ok(credentials)
-        })
-    }
-
-    async fn authenticate_as_admin(
-        self: &Arc<Self>,
-        http: Arc<HttpClientWithUrl>,
-        login: String,
-        api_token: String,
-    ) -> Result<Credentials> {
-        #[derive(Serialize)]
-        struct ImpersonateUserBody {
-            github_login: String,
-        }
-
-        #[derive(Deserialize)]
-        struct ImpersonateUserResponse {
-            user_id: u64,
-            access_token: String,
-        }
-
-        let url = self
-            .http
-            .build_zed_cloud_url("/internal/users/impersonate")?;
-        let request = Request::post(url.as_str())
-            .header("Content-Type", "application/json")
-            .header("Authorization", format!("Bearer {api_token}"))
-            .body(
-                serde_json::to_string(&ImpersonateUserBody {
-                    github_login: login,
-                })?
-                .into(),
-            )?;
-
-        let mut response = http.send(request).await?;
-        let mut body = String::new();
-        response.body_mut().read_to_string(&mut body).await?;
-        anyhow::ensure!(
-            response.status().is_success(),
-            "admin user request failed {} - {}",
-            response.status().as_u16(),
-            body,
-        );
-        let response: ImpersonateUserResponse = serde_json::from_str(&body)?;
-
-        Ok(Credentials {
-            user_id: response.user_id,
-            access_token: response.access_token,
-        })
-    }
-
-    pub async fn sign_out(self: &Arc<Self>, cx: &AsyncApp) {
-        self.state.write().credentials = None;
-        self.cloud_client.clear_credentials();
-        self.disconnect(cx);
-
-        if self.has_credentials(cx).await {
-            self.credentials_provider
-                .delete_credentials(cx)
-                .await
-                .log_err();
-        }
-    }
-
-    pub fn disconnect(self: &Arc<Self>, cx: &AsyncApp) {
-        self.peer.teardown();
-        self.set_status(Status::SignedOut, cx);
-    }
-
-    pub fn reconnect(self: &Arc<Self>, cx: &AsyncApp) {
-        self.peer.teardown();
-        self.set_status(Status::ConnectionLost, cx);
-    }
-
-    fn connection_id(&self) -> Result<ConnectionId> {
-        if let Status::Connected { connection_id, .. } = *self.status().borrow() {
-            Ok(connection_id)
-        } else {
-            anyhow::bail!("not connected");
-        }
-    }
-
-    pub fn send<T: EnvelopedMessage>(&self, message: T) -> Result<()> {
-        log::debug!("rpc send. client_id:{}, name:{}", self.id(), T::NAME);
-        self.peer.send(self.connection_id()?, message)
-    }
-
-    pub fn request<T: RequestMessage>(
-        &self,
-        request: T,
-    ) -> impl Future<Output = Result<T::Response>> + use<T> {
-        self.request_envelope(request)
-            .map_ok(|envelope| envelope.payload)
-    }
-
-    pub fn request_stream<T: RequestMessage>(
-        &self,
-        request: T,
-    ) -> impl Future<Output = Result<impl Stream<Item = Result<T::Response>>>> {
-        let client_id = self.id.load(Ordering::SeqCst);
-        log::debug!(
-            "rpc request start. client_id:{}. name:{}",
-            client_id,
-            T::NAME
-        );
-        let response = self
-            .connection_id()
-            .map(|conn_id| self.peer.request_stream(conn_id, request));
-        async move {
-            let response = response?.await;
-            log::debug!(
-                "rpc request finish. client_id:{}. name:{}",
-                client_id,
-                T::NAME
-            );
-            response
-        }
-    }
-
-    pub fn request_envelope<T: RequestMessage>(
-        &self,
-        request: T,
-    ) -> impl Future<Output = Result<TypedEnvelope<T::Response>>> + use<T> {
-        let client_id = self.id();
-        log::debug!(
-            "rpc request start. client_id:{}. name:{}",
-            client_id,
-            T::NAME
-        );
-        let response = self
-            .connection_id()
-            .map(|conn_id| self.peer.request_envelope(conn_id, request));
-        async move {
-            let response = response?.await;
-            log::debug!(
-                "rpc request finish. client_id:{}. name:{}",
-                client_id,
-                T::NAME
-            );
-            response
-        }
-    }
-
-    pub fn request_dynamic(
-        &self,
-        envelope: proto::Envelope,
-        request_type: &'static str,
-    ) -> impl Future<Output = Result<proto::Envelope>> + use<> {
-        let client_id = self.id();
-        log::debug!(
-            "rpc request start. client_id:{}. name:{}",
-            client_id,
-            request_type
-        );
-        let response = self
-            .connection_id()
-            .map(|conn_id| self.peer.request_dynamic(conn_id, envelope, request_type));
-        async move {
-            let response = response?.await;
-            log::debug!(
-                "rpc request finish. client_id:{}. name:{}",
-                client_id,
-                request_type
-            );
-            Ok(response?.0)
-        }
-    }
-
-    fn handle_message(self: &Arc<Client>, message: Box<dyn AnyTypedEnvelope>, cx: &AsyncApp) {
-        let sender_id = message.sender_id();
-        let request_id = message.message_id();
-        let type_name = message.payload_type_name();
-        let original_sender_id = message.original_sender_id();
-
-        if let Some(future) = ProtoMessageHandlerSet::handle_message(
-            &self.handler_set,
-            message,
-            self.clone().into(),
-            cx.clone(),
-        ) {
-            let client_id = self.id();
-            log::debug!(
-                "rpc message received. client_id:{}, sender_id:{:?}, type:{}",
-                client_id,
-                original_sender_id,
-                type_name
-            );
-            cx.spawn(async move |_| match future.await {
-                Ok(()) => {
-                    log::debug!("rpc message handled. client_id:{client_id}, sender_id:{original_sender_id:?}, type:{type_name}");
-                }
-                Err(error) => {
-                    log::error!("error handling message. client_id:{client_id}, sender_id:{original_sender_id:?}, type:{type_name}, error:{error:#}");
-                }
-            })
-            .detach();
-        } else {
-            log::info!("unhandled message {}", type_name);
-            self.peer
-                .respond_with_unhandled_message(sender_id.into(), request_id, type_name)
-                .log_err();
-        }
-    }
-
-    pub fn add_message_to_client_handler(
-        self: &Arc<Client>,
-        handler: impl Fn(&MessageToClient, &mut App) + Send + Sync + 'static,
-    ) {
-        self.message_to_client_handlers
-            .lock()
-            .push(Box::new(handler));
-    }
-
-    fn handle_message_to_client(self: &Arc<Client>, message: MessageToClient, cx: &AsyncApp) {
-        cx.update(|cx| {
-            for handler in self.message_to_client_handlers.lock().iter() {
-                handler(&message, cx);
-            }
-        })
-        .ok();
-    }
-
-    pub fn telemetry(&self) -> &Arc<Telemetry> {
-        &self.telemetry
-    }
-}
-
-impl ProtoClient for Client {
-    fn request(
-        &self,
-        envelope: proto::Envelope,
-        request_type: &'static str,
-    ) -> BoxFuture<'static, Result<proto::Envelope>> {
-        self.request_dynamic(envelope, request_type).boxed()
-    }
-
-    fn send(&self, envelope: proto::Envelope, message_type: &'static str) -> Result<()> {
-        log::debug!("rpc send. client_id:{}, name:{}", self.id(), message_type);
-        let connection_id = self.connection_id()?;
-        self.peer.send_dynamic(connection_id, envelope)
-    }
-
-    fn send_response(&self, envelope: proto::Envelope, message_type: &'static str) -> Result<()> {
-        log::debug!(
-            "rpc respond. client_id:{}, name:{}",
-            self.id(),
-            message_type
-        );
-        let connection_id = self.connection_id()?;
-        self.peer.send_dynamic(connection_id, envelope)
-    }
-
-    fn message_handler_set(&self) -> &parking_lot::Mutex<ProtoMessageHandlerSet> {
-        &self.handler_set
-    }
-
-    fn is_via_collab(&self) -> bool {
-        true
-    }
-
-    fn has_wsl_interop(&self) -> bool {
-        false
-    }
-}
-
-/// prefix for the zed:// url scheme
-pub const ZED_URL_SCHEME: &str = "zed";
-
-/// Parses the given link into a Zed link.
-///
-/// Returns a [`Some`] containing the unprefixed link if the link is a Zed link.
-/// Returns [`None`] otherwise.
-pub fn parse_zed_link<'a>(link: &'a str, cx: &App) -> Option<&'a str> {
-    let server_url = &ClientSettings::get_global(cx).server_url;
-    if let Some(stripped) = link
-        .strip_prefix(server_url)
-        .and_then(|result| result.strip_prefix('/'))
-    {
-        return Some(stripped);
-    }
-    if let Some(stripped) = link
-        .strip_prefix(ZED_URL_SCHEME)
-        .and_then(|result| result.strip_prefix("://"))
-    {
-        return Some(stripped);
-    }
-
-    None
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::test::{FakeServer, parse_authorization_header};
-
-    use clock::FakeSystemClock;
-    use gpui::{AppContext as _, BackgroundExecutor, TestAppContext};
-    use http_client::FakeHttpClient;
-    use parking_lot::Mutex;
-    use proto::TypedEnvelope;
-    use settings::SettingsStore;
-    use std::future;
-
-    #[gpui::test(iterations = 10)]
-    async fn test_reconnection(cx: &mut TestAppContext) {
-        init_test(cx);
-        let user_id = 5;
-        let client = cx.update(|cx| {
-            Client::new(
-                Arc::new(FakeSystemClock::new()),
-                FakeHttpClient::with_404_response(),
-                cx,
-            )
-        });
-        let server = FakeServer::for_client(user_id, &client, cx).await;
-        let mut status = client.status();
-        assert!(matches!(
-            status.next().await,
-            Some(Status::Connected { .. })
-        ));
-        assert_eq!(server.auth_count(), 1);
-
-        server.forbid_connections();
-        server.disconnect();
-        while !matches!(status.next().await, Some(Status::ReconnectionError { .. })) {}
-
-        server.allow_connections();
-        cx.executor().advance_clock(Duration::from_secs(10));
-        while !matches!(status.next().await, Some(Status::Connected { .. })) {}
-        assert_eq!(server.auth_count(), 1); // Client reused the cached credentials when reconnecting
-
-        server.forbid_connections();
-        server.disconnect();
-        while !matches!(status.next().await, Some(Status::ReconnectionError { .. })) {}
-
-        // Clear cached credentials after authentication fails
-        server.roll_access_token();
-        server.allow_connections();
-        cx.executor().run_until_parked();
-        cx.executor().advance_clock(Duration::from_secs(10));
-        while !matches!(status.next().await, Some(Status::Connected { .. })) {}
-        assert_eq!(server.auth_count(), 2); // Client re-authenticated due to an invalid token
-    }
-
-    #[gpui::test(iterations = 10)]
-    async fn test_auth_failure_during_reconnection(cx: &mut TestAppContext) {
-        init_test(cx);
-        let http_client = FakeHttpClient::with_200_response();
-        let client =
-            cx.update(|cx| Client::new(Arc::new(FakeSystemClock::new()), http_client.clone(), cx));
-        let server = FakeServer::for_client(42, &client, cx).await;
-        let mut status = client.status();
-        assert!(matches!(
-            status.next().await,
-            Some(Status::Connected { .. })
-        ));
-        assert_eq!(server.auth_count(), 1);
-
-        // Simulate an auth failure during reconnection.
-        http_client
-            .as_fake()
-            .replace_handler(|_, _request| async move {
-                Ok(http_client::Response::builder()
-                    .status(503)
-                    .body("".into())
-                    .unwrap())
-            });
-        server.disconnect();
-        while !matches!(status.next().await, Some(Status::ReconnectionError { .. })) {}
-
-        // Restore the ability to authenticate.
-        http_client
-            .as_fake()
-            .replace_handler(|_, _request| async move {
-                Ok(http_client::Response::builder()
-                    .status(200)
-                    .body("".into())
-                    .unwrap())
-            });
-        cx.executor().advance_clock(Duration::from_secs(10));
-        while !matches!(status.next().await, Some(Status::Connected { .. })) {}
-        assert_eq!(server.auth_count(), 1); // Client reused the cached credentials when reconnecting
-    }
-
-    #[gpui::test(iterations = 10)]
-    async fn test_connection_timeout(executor: BackgroundExecutor, cx: &mut TestAppContext) {
-        init_test(cx);
-        let user_id = 5;
-        let client = cx.update(|cx| {
-            Client::new(
-                Arc::new(FakeSystemClock::new()),
-                FakeHttpClient::with_404_response(),
-                cx,
-            )
-        });
-        let mut status = client.status();
-
-        // Time out when client tries to connect.
-        client.override_authenticate(move |cx| {
-            cx.background_spawn(async move {
-                Ok(Credentials {
-                    user_id,
-                    access_token: "token".into(),
-                })
-            })
-        });
-        client.override_establish_connection(|_, cx| {
-            cx.background_spawn(async move {
-                future::pending::<()>().await;
-                unreachable!()
-            })
-        });
-        let auth_and_connect = cx.spawn({
-            let client = client.clone();
-            |cx| async move { client.connect(false, &cx).await }
-        });
-        executor.run_until_parked();
-        assert!(matches!(status.next().await, Some(Status::Connecting)));
-
-        executor.advance_clock(CONNECTION_TIMEOUT);
-        assert!(matches!(status.next().await, Some(Status::ConnectionError)));
-        auth_and_connect.await.into_response().unwrap_err();
-
-        // Allow the connection to be established.
-        let server = FakeServer::for_client(user_id, &client, cx).await;
-        assert!(matches!(
-            status.next().await,
-            Some(Status::Connected { .. })
-        ));
-
-        // Disconnect client.
-        server.forbid_connections();
-        server.disconnect();
-        while !matches!(status.next().await, Some(Status::ReconnectionError { .. })) {}
-
-        // Time out when re-establishing the connection.
-        server.allow_connections();
-        client.override_establish_connection(|_, cx| {
-            cx.background_spawn(async move {
-                future::pending::<()>().await;
-                unreachable!()
-            })
-        });
-        executor.advance_clock(2 * INITIAL_RECONNECTION_DELAY);
-        assert!(matches!(status.next().await, Some(Status::Reconnecting)));
-
-        executor.advance_clock(CONNECTION_TIMEOUT);
-        assert!(matches!(
-            status.next().await,
-            Some(Status::ReconnectionError { .. })
-        ));
-    }
-
-    #[gpui::test(iterations = 10)]
-    async fn test_reauthenticate_only_if_unauthorized(cx: &mut TestAppContext) {
-        init_test(cx);
-        let auth_count = Arc::new(Mutex::new(0));
-        let http_client = FakeHttpClient::create(|_request| async move {
-            Ok(http_client::Response::builder()
-                .status(200)
-                .body("".into())
-                .unwrap())
-        });
-        let client =
-            cx.update(|cx| Client::new(Arc::new(FakeSystemClock::new()), http_client.clone(), cx));
-        client.override_authenticate({
-            let auth_count = auth_count.clone();
-            move |cx| {
-                let auth_count = auth_count.clone();
-                cx.background_spawn(async move {
-                    *auth_count.lock() += 1;
-                    Ok(Credentials {
-                        user_id: 1,
-                        access_token: auth_count.lock().to_string(),
-                    })
-                })
-            }
-        });
-
-        let credentials = client.sign_in(false, &cx.to_async()).await.unwrap();
-        assert_eq!(*auth_count.lock(), 1);
-        assert_eq!(credentials.access_token, "1");
-
-        // If credentials are still valid, signing in doesn't trigger authentication.
-        let credentials = client.sign_in(false, &cx.to_async()).await.unwrap();
-        assert_eq!(*auth_count.lock(), 1);
-        assert_eq!(credentials.access_token, "1");
-
-        // If the server is unavailable, signing in doesn't trigger authentication.
-        http_client
-            .as_fake()
-            .replace_handler(|_, _request| async move {
-                Ok(http_client::Response::builder()
-                    .status(503)
-                    .body("".into())
-                    .unwrap())
-            });
-        client.sign_in(false, &cx.to_async()).await.unwrap_err();
-        assert_eq!(*auth_count.lock(), 1);
-
-        // If credentials became invalid, signing in triggers authentication.
-        http_client
-            .as_fake()
-            .replace_handler(|_, request| async move {
-                let credentials = parse_authorization_header(&request).unwrap();
-                if credentials.access_token == "2" {
-                    Ok(http_client::Response::builder()
-                        .status(200)
-                        .body("".into())
-                        .unwrap())
-                } else {
-                    Ok(http_client::Response::builder()
-                        .status(401)
-                        .body("".into())
-                        .unwrap())
-                }
-            });
-        let credentials = client.sign_in(false, &cx.to_async()).await.unwrap();
-        assert_eq!(*auth_count.lock(), 2);
-        assert_eq!(credentials.access_token, "2");
-    }
-
-    #[gpui::test(iterations = 10)]
-    async fn test_authenticating_more_than_once(
-        cx: &mut TestAppContext,
-        executor: BackgroundExecutor,
-    ) {
-        init_test(cx);
-        let auth_count = Arc::new(Mutex::new(0));
-        let dropped_auth_count = Arc::new(Mutex::new(0));
-        let client = cx.update(|cx| {
-            Client::new(
-                Arc::new(FakeSystemClock::new()),
-                FakeHttpClient::with_404_response(),
-                cx,
-            )
-        });
-        client.override_authenticate({
-            let auth_count = auth_count.clone();
-            let dropped_auth_count = dropped_auth_count.clone();
-            move |cx| {
-                let auth_count = auth_count.clone();
-                let dropped_auth_count = dropped_auth_count.clone();
-                cx.background_spawn(async move {
-                    *auth_count.lock() += 1;
-                    let _drop = util::defer(move || *dropped_auth_count.lock() += 1);
-                    future::pending::<()>().await;
-                    unreachable!()
-                })
-            }
-        });
-
-        let _authenticate = cx.spawn({
-            let client = client.clone();
-            move |cx| async move { client.connect(false, &cx).await }
-        });
-        executor.run_until_parked();
-        assert_eq!(*auth_count.lock(), 1);
-        assert_eq!(*dropped_auth_count.lock(), 0);
-
-        let _authenticate = cx.spawn(|cx| async move { client.connect(false, &cx).await });
-        executor.run_until_parked();
-        assert_eq!(*auth_count.lock(), 2);
-        assert_eq!(*dropped_auth_count.lock(), 1);
-    }
-
-    #[gpui::test]
-    async fn test_subscribing_to_entity(cx: &mut TestAppContext) {
-        init_test(cx);
-        let user_id = 5;
-        let client = cx.update(|cx| {
-            Client::new(
-                Arc::new(FakeSystemClock::new()),
-                FakeHttpClient::with_404_response(),
-                cx,
-            )
-        });
-        let server = FakeServer::for_client(user_id, &client, cx).await;
-
-        let (done_tx1, done_rx1) = smol::channel::unbounded();
-        let (done_tx2, done_rx2) = smol::channel::unbounded();
-        AnyProtoClient::from(client.clone()).add_entity_message_handler(
-            move |entity: Entity<TestEntity>, _: TypedEnvelope<proto::JoinProject>, cx| {
-                match entity.read_with(&cx, |entity, _| entity.id).unwrap() {
-                    1 => done_tx1.try_send(()).unwrap(),
-                    2 => done_tx2.try_send(()).unwrap(),
-                    _ => unreachable!(),
-                }
-                async { Ok(()) }
-            },
-        );
-        let entity1 = cx.new(|_| TestEntity {
-            id: 1,
-            subscription: None,
-        });
-        let entity2 = cx.new(|_| TestEntity {
-            id: 2,
-            subscription: None,
-        });
-        let entity3 = cx.new(|_| TestEntity {
-            id: 3,
-            subscription: None,
-        });
-
-        let _subscription1 = client
-            .subscribe_to_entity(1)
-            .unwrap()
-            .set_entity(&entity1, &cx.to_async());
-        let _subscription2 = client
-            .subscribe_to_entity(2)
-            .unwrap()
-            .set_entity(&entity2, &cx.to_async());
-        // Ensure dropping a subscription for the same entity type still allows receiving of
-        // messages for other entity IDs of the same type.
-        let subscription3 = client
-            .subscribe_to_entity(3)
-            .unwrap()
-            .set_entity(&entity3, &cx.to_async());
-        drop(subscription3);
-
-        server.send(proto::JoinProject {
-            project_id: 1,
-            committer_name: None,
-            committer_email: None,
-        });
-        server.send(proto::JoinProject {
-            project_id: 2,
-            committer_name: None,
-            committer_email: None,
-        });
-        done_rx1.recv().await.unwrap();
-        done_rx2.recv().await.unwrap();
-    }
-
-    #[gpui::test]
-    async fn test_subscribing_after_dropping_subscription(cx: &mut TestAppContext) {
-        init_test(cx);
-        let user_id = 5;
-        let client = cx.update(|cx| {
-            Client::new(
-                Arc::new(FakeSystemClock::new()),
-                FakeHttpClient::with_404_response(),
-                cx,
-            )
-        });
-        let server = FakeServer::for_client(user_id, &client, cx).await;
-
-        let entity = cx.new(|_| TestEntity::default());
-        let (done_tx1, _done_rx1) = smol::channel::unbounded();
-        let (done_tx2, done_rx2) = smol::channel::unbounded();
-        let subscription1 = client.add_message_handler(
-            entity.downgrade(),
-            move |_, _: TypedEnvelope<proto::Ping>, _| {
-                done_tx1.try_send(()).unwrap();
-                async { Ok(()) }
-            },
-        );
-        drop(subscription1);
-        let _subscription2 = client.add_message_handler(
-            entity.downgrade(),
-            move |_, _: TypedEnvelope<proto::Ping>, _| {
-                done_tx2.try_send(()).unwrap();
-                async { Ok(()) }
-            },
-        );
-        server.send(proto::Ping {});
-        done_rx2.recv().await.unwrap();
-    }
-
-    #[gpui::test]
-    async fn test_dropping_subscription_in_handler(cx: &mut TestAppContext) {
-        init_test(cx);
-        let user_id = 5;
-        let client = cx.update(|cx| {
-            Client::new(
-                Arc::new(FakeSystemClock::new()),
-                FakeHttpClient::with_404_response(),
-                cx,
-            )
-        });
-        let server = FakeServer::for_client(user_id, &client, cx).await;
-
-        let entity = cx.new(|_| TestEntity::default());
-        let (done_tx, done_rx) = smol::channel::unbounded();
-        let subscription = client.add_message_handler(
-            entity.clone().downgrade(),
-            move |entity: Entity<TestEntity>, _: TypedEnvelope<proto::Ping>, mut cx| {
-                entity
-                    .update(&mut cx, |entity, _| entity.subscription.take())
-                    .unwrap();
-                done_tx.try_send(()).unwrap();
-                async { Ok(()) }
-            },
-        );
-        entity.update(cx, |entity, _| {
-            entity.subscription = Some(subscription);
-        });
-        server.send(proto::Ping {});
-        done_rx.recv().await.unwrap();
-    }
-
-    #[derive(Default)]
-    struct TestEntity {
-        id: usize,
-        subscription: Option<Subscription>,
-    }
-
-    fn init_test(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-        });
-    }
-}
diff --git a/crates/client/src/proxy.rs b/crates/client/src/proxy.rs
deleted file mode 100644
index eb3812ca07..0000000000
--- a/crates/client/src/proxy.rs
+++ /dev/null
@@ -1,66 +0,0 @@
-//! client proxy
-
-mod http_proxy;
-mod socks_proxy;
-
-use anyhow::{Context as _, Result};
-use http_client::Url;
-use http_proxy::{HttpProxyType, connect_http_proxy_stream, parse_http_proxy};
-use socks_proxy::{SocksVersion, connect_socks_proxy_stream, parse_socks_proxy};
-
-pub(crate) async fn connect_proxy_stream(
-    proxy: &Url,
-    rpc_host: (&str, u16),
-) -> Result<Box<dyn AsyncReadWrite>> {
-    let Some(((proxy_domain, proxy_port), proxy_type)) = parse_proxy_type(proxy) else {
-        // If parsing the proxy URL fails, we must avoid falling back to an insecure connection.
-        // SOCKS proxies are often used in contexts where security and privacy are critical,
-        // so any fallback could expose users to significant risks.
-        anyhow::bail!("Parsing proxy url failed");
-    };
-
-    // Connect to proxy and wrap protocol later
-    let stream = tokio::net::TcpStream::connect((proxy_domain.as_str(), proxy_port))
-        .await
-        .context("Failed to connect to proxy")?;
-
-    let proxy_stream = match proxy_type {
-        ProxyType::SocksProxy(proxy) => connect_socks_proxy_stream(stream, proxy, rpc_host).await?,
-        ProxyType::HttpProxy(proxy) => {
-            connect_http_proxy_stream(stream, proxy, rpc_host, &proxy_domain).await?
-        }
-    };
-
-    Ok(proxy_stream)
-}
-
-enum ProxyType<'t> {
-    SocksProxy(SocksVersion<'t>),
-    HttpProxy(HttpProxyType<'t>),
-}
-
-fn parse_proxy_type(proxy: &Url) -> Option<((String, u16), ProxyType<'_>)> {
-    let scheme = proxy.scheme();
-    let host = proxy.host()?.to_string();
-    let port = proxy.port_or_known_default()?;
-    let proxy_type = match scheme {
-        scheme if scheme.starts_with("socks") => {
-            Some(ProxyType::SocksProxy(parse_socks_proxy(scheme, proxy)))
-        }
-        scheme if scheme.starts_with("http") => {
-            Some(ProxyType::HttpProxy(parse_http_proxy(scheme, proxy)))
-        }
-        _ => None,
-    }?;
-
-    Some(((host, port), proxy_type))
-}
-
-pub(crate) trait AsyncReadWrite:
-    tokio::io::AsyncRead + tokio::io::AsyncWrite + Unpin + Send + 'static
-{
-}
-impl<T: tokio::io::AsyncRead + tokio::io::AsyncWrite + Unpin + Send + 'static> AsyncReadWrite
-    for T
-{
-}
diff --git a/crates/client/src/proxy/http_proxy.rs b/crates/client/src/proxy/http_proxy.rs
deleted file mode 100644
index f64c56b16c..0000000000
--- a/crates/client/src/proxy/http_proxy.rs
+++ /dev/null
@@ -1,193 +0,0 @@
-use anyhow::{Context, Result};
-use base64::Engine;
-use httparse::{EMPTY_HEADER, Response};
-use tokio::{
-    io::{AsyncBufReadExt, AsyncWriteExt, BufStream},
-    net::TcpStream,
-};
-#[cfg(any(target_os = "windows", target_os = "macos"))]
-use tokio_native_tls::{TlsConnector, native_tls};
-#[cfg(not(any(target_os = "windows", target_os = "macos")))]
-use tokio_rustls::TlsConnector;
-use url::Url;
-
-use super::AsyncReadWrite;
-
-pub(super) enum HttpProxyType<'t> {
-    HTTP(Option<HttpProxyAuthorization<'t>>),
-    HTTPS(Option<HttpProxyAuthorization<'t>>),
-}
-
-pub(super) struct HttpProxyAuthorization<'t> {
-    username: &'t str,
-    password: &'t str,
-}
-
-pub(super) fn parse_http_proxy<'t>(scheme: &str, proxy: &'t Url) -> HttpProxyType<'t> {
-    let auth = proxy.password().map(|password| HttpProxyAuthorization {
-        username: proxy.username(),
-        password,
-    });
-    if scheme.starts_with("https") {
-        HttpProxyType::HTTPS(auth)
-    } else {
-        HttpProxyType::HTTP(auth)
-    }
-}
-
-pub(crate) async fn connect_http_proxy_stream(
-    stream: TcpStream,
-    http_proxy: HttpProxyType<'_>,
-    rpc_host: (&str, u16),
-    proxy_domain: &str,
-) -> Result<Box<dyn AsyncReadWrite>> {
-    match http_proxy {
-        HttpProxyType::HTTP(auth) => http_connect(stream, rpc_host, auth).await,
-        HttpProxyType::HTTPS(auth) => https_connect(stream, rpc_host, auth, proxy_domain).await,
-    }
-    .context("error connecting to http/https proxy")
-}
-
-async fn http_connect<T>(
-    stream: T,
-    target: (&str, u16),
-    auth: Option<HttpProxyAuthorization<'_>>,
-) -> Result<Box<dyn AsyncReadWrite>>
-where
-    T: AsyncReadWrite,
-{
-    let mut stream = BufStream::new(stream);
-    let request = make_request(target, auth);
-    stream.write_all(request.as_bytes()).await?;
-    stream.flush().await?;
-    check_response(&mut stream).await?;
-    Ok(Box::new(stream))
-}
-
-#[cfg(any(target_os = "windows", target_os = "macos"))]
-async fn https_connect<T>(
-    stream: T,
-    target: (&str, u16),
-    auth: Option<HttpProxyAuthorization<'_>>,
-    proxy_domain: &str,
-) -> Result<Box<dyn AsyncReadWrite>>
-where
-    T: AsyncReadWrite,
-{
-    let tls_connector = TlsConnector::from(native_tls::TlsConnector::new()?);
-    let stream = tls_connector.connect(proxy_domain, stream).await?;
-    http_connect(stream, target, auth).await
-}
-
-#[cfg(not(any(target_os = "windows", target_os = "macos")))]
-async fn https_connect<T>(
-    stream: T,
-    target: (&str, u16),
-    auth: Option<HttpProxyAuthorization<'_>>,
-    proxy_domain: &str,
-) -> Result<Box<dyn AsyncReadWrite>>
-where
-    T: AsyncReadWrite,
-{
-    let proxy_domain = rustls_pki_types::ServerName::try_from(proxy_domain)
-        .context("Address resolution failed")?
-        .to_owned();
-    let tls_connector = TlsConnector::from(std::sync::Arc::new(http_client_tls::tls_config()));
-    let stream = tls_connector.connect(proxy_domain, stream).await?;
-    http_connect(stream, target, auth).await
-}
-
-fn make_request(target: (&str, u16), auth: Option<HttpProxyAuthorization<'_>>) -> String {
-    let (host, port) = target;
-    let mut request = format!(
-        "CONNECT {host}:{port} HTTP/1.1\r\nHost: {host}:{port}\r\nProxy-Connection: Keep-Alive\r\n"
-    );
-    if let Some(HttpProxyAuthorization { username, password }) = auth {
-        let auth =
-            base64::prelude::BASE64_STANDARD.encode(format!("{username}:{password}").as_bytes());
-        let auth = format!("Proxy-Authorization: Basic {auth}\r\n");
-        request.push_str(&auth);
-    }
-    request.push_str("\r\n");
-    request
-}
-
-async fn check_response<T>(stream: &mut BufStream<T>) -> Result<()>
-where
-    T: AsyncReadWrite,
-{
-    let response = recv_response(stream).await?;
-    let mut dummy_headers = [EMPTY_HEADER; MAX_RESPONSE_HEADERS];
-    let mut parser = Response::new(&mut dummy_headers);
-    parser.parse(response.as_bytes())?;
-
-    match parser.code {
-        Some(code) => {
-            if code == 200 {
-                Ok(())
-            } else {
-                Err(anyhow::anyhow!(
-                    "Proxy connection failed with HTTP code: {code}"
-                ))
-            }
-        }
-        None => Err(anyhow::anyhow!(
-            "Proxy connection failed with no HTTP code: {}",
-            parser.reason.unwrap_or("Unknown reason")
-        )),
-    }
-}
-
-const MAX_RESPONSE_HEADER_LENGTH: usize = 4096;
-const MAX_RESPONSE_HEADERS: usize = 16;
-
-async fn recv_response<T>(stream: &mut BufStream<T>) -> Result<String>
-where
-    T: AsyncReadWrite,
-{
-    let mut response = String::new();
-    loop {
-        if stream.read_line(&mut response).await? == 0 {
-            return Err(anyhow::anyhow!("End of stream"));
-        }
-
-        if MAX_RESPONSE_HEADER_LENGTH < response.len() {
-            return Err(anyhow::anyhow!("Maximum response header length exceeded"));
-        }
-
-        if response.ends_with("\r\n\r\n") {
-            return Ok(response);
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use url::Url;
-
-    use super::{HttpProxyAuthorization, HttpProxyType, parse_http_proxy};
-
-    #[test]
-    fn test_parse_http_proxy() {
-        let proxy = Url::parse("http://proxy.example.com:1080").unwrap();
-        let scheme = proxy.scheme();
-
-        let version = parse_http_proxy(scheme, &proxy);
-        assert!(matches!(version, HttpProxyType::HTTP(None)))
-    }
-
-    #[test]
-    fn test_parse_http_proxy_with_auth() {
-        let proxy = Url::parse("http://username:password@proxy.example.com:1080").unwrap();
-        let scheme = proxy.scheme();
-
-        let version = parse_http_proxy(scheme, &proxy);
-        assert!(matches!(
-            version,
-            HttpProxyType::HTTP(Some(HttpProxyAuthorization {
-                username: "username",
-                password: "password"
-            }))
-        ))
-    }
-}
diff --git a/crates/client/src/proxy/socks_proxy.rs b/crates/client/src/proxy/socks_proxy.rs
deleted file mode 100644
index bf2a5eab62..0000000000
--- a/crates/client/src/proxy/socks_proxy.rs
+++ /dev/null
@@ -1,226 +0,0 @@
-//! socks proxy
-
-use anyhow::{Context as _, Result};
-use http_client::Url;
-use tokio::net::TcpStream;
-use tokio_socks::{
-    IntoTargetAddr, TargetAddr,
-    tcp::{Socks4Stream, Socks5Stream},
-};
-
-use super::AsyncReadWrite;
-
-/// Identification to a Socks V4 Proxy
-pub(super) struct Socks4Identification<'a> {
-    user_id: &'a str,
-}
-
-/// Authorization to a Socks V5 Proxy
-pub(super) struct Socks5Authorization<'a> {
-    username: &'a str,
-    password: &'a str,
-}
-
-/// Socks Proxy Protocol Version
-///
-/// V4 allows identification using a user_id
-/// V5 allows authorization using a username and password
-pub(super) enum SocksVersion<'a> {
-    V4 {
-        local_dns: bool,
-        identification: Option<Socks4Identification<'a>>,
-    },
-    V5 {
-        local_dns: bool,
-        authorization: Option<Socks5Authorization<'a>>,
-    },
-}
-
-pub(super) fn parse_socks_proxy<'t>(scheme: &str, proxy: &'t Url) -> SocksVersion<'t> {
-    if scheme.starts_with("socks4") {
-        let identification = match proxy.username() {
-            "" => None,
-            username => Some(Socks4Identification { user_id: username }),
-        };
-        SocksVersion::V4 {
-            local_dns: scheme != "socks4a",
-            identification,
-        }
-    } else {
-        let authorization = proxy.password().map(|password| Socks5Authorization {
-            username: proxy.username(),
-            password,
-        });
-        SocksVersion::V5 {
-            local_dns: scheme != "socks5h",
-            authorization,
-        }
-    }
-}
-
-pub(super) async fn connect_socks_proxy_stream(
-    stream: TcpStream,
-    socks_version: SocksVersion<'_>,
-    rpc_host: (&str, u16),
-) -> Result<Box<dyn AsyncReadWrite>> {
-    let rpc_host = rpc_host
-        .into_target_addr()
-        .context("Failed to parse target addr")?;
-
-    let local_dns = match &socks_version {
-        SocksVersion::V4 { local_dns, .. } => local_dns,
-        SocksVersion::V5 { local_dns, .. } => local_dns,
-    };
-    let rpc_host = match (rpc_host, local_dns) {
-        (TargetAddr::Domain(domain, port), true) => {
-            let ip_addr = tokio::net::lookup_host((domain.as_ref(), port))
-                .await
-                .with_context(|| format!("Failed to lookup domain {}", domain))?
-                .next()
-                .ok_or_else(|| anyhow::anyhow!("Failed to lookup domain {}", domain))?;
-            TargetAddr::Ip(ip_addr)
-        }
-        (rpc_host, _) => rpc_host,
-    };
-
-    match socks_version {
-        SocksVersion::V4 {
-            identification: None,
-            ..
-        } => {
-            let socks = Socks4Stream::connect_with_socket(stream, rpc_host)
-                .await
-                .context("error connecting to socks")?;
-            Ok(Box::new(socks))
-        }
-        SocksVersion::V4 {
-            identification: Some(Socks4Identification { user_id }),
-            ..
-        } => {
-            let socks = Socks4Stream::connect_with_userid_and_socket(stream, rpc_host, user_id)
-                .await
-                .context("error connecting to socks")?;
-            Ok(Box::new(socks))
-        }
-        SocksVersion::V5 {
-            authorization: None,
-            ..
-        } => {
-            let socks = Socks5Stream::connect_with_socket(stream, rpc_host)
-                .await
-                .context("error connecting to socks")?;
-            Ok(Box::new(socks))
-        }
-        SocksVersion::V5 {
-            authorization: Some(Socks5Authorization { username, password }),
-            ..
-        } => {
-            let socks = Socks5Stream::connect_with_password_and_socket(
-                stream, rpc_host, username, password,
-            )
-            .await
-            .context("error connecting to socks")?;
-            Ok(Box::new(socks))
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use url::Url;
-
-    use super::*;
-
-    #[test]
-    fn parse_socks4() {
-        let proxy = Url::parse("socks4://proxy.example.com:1080").unwrap();
-        let scheme = proxy.scheme();
-
-        let version = parse_socks_proxy(scheme, &proxy);
-        assert!(matches!(
-            version,
-            SocksVersion::V4 {
-                local_dns: true,
-                identification: None
-            }
-        ))
-    }
-
-    #[test]
-    fn parse_socks4_with_identification() {
-        let proxy = Url::parse("socks4://userid@proxy.example.com:1080").unwrap();
-        let scheme = proxy.scheme();
-
-        let version = parse_socks_proxy(scheme, &proxy);
-        assert!(matches!(
-            version,
-            SocksVersion::V4 {
-                local_dns: true,
-                identification: Some(Socks4Identification { user_id: "userid" })
-            }
-        ))
-    }
-
-    #[test]
-    fn parse_socks4_with_remote_dns() {
-        let proxy = Url::parse("socks4a://proxy.example.com:1080").unwrap();
-        let scheme = proxy.scheme();
-
-        let version = parse_socks_proxy(scheme, &proxy);
-        assert!(matches!(
-            version,
-            SocksVersion::V4 {
-                local_dns: false,
-                identification: None
-            }
-        ))
-    }
-
-    #[test]
-    fn parse_socks5() {
-        let proxy = Url::parse("socks5://proxy.example.com:1080").unwrap();
-        let scheme = proxy.scheme();
-
-        let version = parse_socks_proxy(scheme, &proxy);
-        assert!(matches!(
-            version,
-            SocksVersion::V5 {
-                local_dns: true,
-                authorization: None
-            }
-        ))
-    }
-
-    #[test]
-    fn parse_socks5_with_authorization() {
-        let proxy = Url::parse("socks5://username:password@proxy.example.com:1080").unwrap();
-        let scheme = proxy.scheme();
-
-        let version = parse_socks_proxy(scheme, &proxy);
-        assert!(matches!(
-            version,
-            SocksVersion::V5 {
-                local_dns: true,
-                authorization: Some(Socks5Authorization {
-                    username: "username",
-                    password: "password"
-                })
-            }
-        ))
-    }
-
-    #[test]
-    fn parse_socks5_with_remote_dns() {
-        let proxy = Url::parse("socks5h://proxy.example.com:1080").unwrap();
-        let scheme = proxy.scheme();
-
-        let version = parse_socks_proxy(scheme, &proxy);
-        assert!(matches!(
-            version,
-            SocksVersion::V5 {
-                local_dns: false,
-                authorization: None
-            }
-        ))
-    }
-}
diff --git a/crates/client/src/telemetry.rs b/crates/client/src/telemetry.rs
deleted file mode 100644
index 68b6c302fb..0000000000
--- a/crates/client/src/telemetry.rs
+++ /dev/null
@@ -1,881 +0,0 @@
-mod event_coalescer;
-
-use crate::TelemetrySettings;
-use anyhow::Result;
-use clock::SystemClock;
-use futures::channel::mpsc;
-use futures::{Future, FutureExt, StreamExt};
-use gpui::{App, AppContext as _, BackgroundExecutor, Task};
-use http_client::{self, AsyncBody, HttpClient, HttpClientWithUrl, Method, Request};
-use parking_lot::Mutex;
-use regex::Regex;
-use release_channel::ReleaseChannel;
-use settings::{Settings, SettingsStore};
-use sha2::{Digest, Sha256};
-use std::collections::HashSet;
-use std::fs::File;
-use std::io::Write;
-use std::sync::LazyLock;
-use std::time::Instant;
-use std::{env, mem, path::PathBuf, sync::Arc, time::Duration};
-use telemetry_events::{AssistantEventData, AssistantPhase, Event, EventRequestBody, EventWrapper};
-use util::TryFutureExt;
-use worktree::{UpdatedEntriesSet, WorktreeId};
-
-use self::event_coalescer::EventCoalescer;
-
-pub struct Telemetry {
-    clock: Arc<dyn SystemClock>,
-    http_client: Arc<HttpClientWithUrl>,
-    executor: BackgroundExecutor,
-    state: Arc<Mutex<TelemetryState>>,
-}
-
-struct TelemetryState {
-    settings: TelemetrySettings,
-    system_id: Option<Arc<str>>,       // Per system
-    installation_id: Option<Arc<str>>, // Per app installation (different for dev, nightly, preview, and stable)
-    session_id: Option<String>,        // Per app launch
-    metrics_id: Option<Arc<str>>,      // Per logged-in user
-    release_channel: Option<&'static str>,
-    architecture: &'static str,
-    events_queue: Vec<EventWrapper>,
-    flush_events_task: Option<Task<()>>,
-    log_file: Option<File>,
-    is_staff: Option<bool>,
-    first_event_date_time: Option<Instant>,
-    event_coalescer: EventCoalescer,
-    max_queue_size: usize,
-    worktrees_with_project_type_events_sent: HashSet<WorktreeId>,
-
-    os_name: String,
-    app_version: String,
-    os_version: Option<String>,
-}
-
-#[cfg(debug_assertions)]
-const MAX_QUEUE_LEN: usize = 5;
-
-#[cfg(not(debug_assertions))]
-const MAX_QUEUE_LEN: usize = 50;
-
-#[cfg(debug_assertions)]
-const FLUSH_INTERVAL: Duration = Duration::from_secs(1);
-
-#[cfg(not(debug_assertions))]
-const FLUSH_INTERVAL: Duration = Duration::from_secs(60 * 5);
-static ZED_CLIENT_CHECKSUM_SEED: LazyLock<Option<Vec<u8>>> = LazyLock::new(|| {
-    option_env!("ZED_CLIENT_CHECKSUM_SEED")
-        .map(|s| s.as_bytes().into())
-        .or_else(|| {
-            env::var("ZED_CLIENT_CHECKSUM_SEED")
-                .ok()
-                .map(|s| s.as_bytes().into())
-        })
-});
-
-pub static MINIDUMP_ENDPOINT: LazyLock<Option<String>> = LazyLock::new(|| {
-    option_env!("ZED_MINIDUMP_ENDPOINT")
-        .map(str::to_string)
-        .or_else(|| env::var("ZED_MINIDUMP_ENDPOINT").ok())
-});
-
-static DOTNET_PROJECT_FILES_REGEX: LazyLock<Regex> = LazyLock::new(|| {
-    Regex::new(r"^(global\.json|Directory\.Build\.props|.*\.(csproj|fsproj|vbproj|sln))$").unwrap()
-});
-
-#[cfg(target_os = "macos")]
-static MACOS_VERSION_REGEX: LazyLock<Regex> =
-    LazyLock::new(|| Regex::new(r"(\s*\(Build [^)]*[0-9]\))").unwrap());
-
-pub fn os_name() -> String {
-    #[cfg(target_os = "macos")]
-    {
-        "macOS".to_string()
-    }
-    #[cfg(target_os = "linux")]
-    {
-        format!("Linux {}", gpui::guess_compositor())
-    }
-    #[cfg(target_os = "freebsd")]
-    {
-        format!("FreeBSD {}", gpui::guess_compositor())
-    }
-
-    #[cfg(target_os = "windows")]
-    {
-        "Windows".to_string()
-    }
-}
-
-/// Note: This might do blocking IO! Only call from background threads
-pub fn os_version() -> String {
-    #[cfg(target_os = "macos")]
-    {
-        use objc2_foundation::NSProcessInfo;
-        let process_info = NSProcessInfo::processInfo();
-        let version_nsstring = unsafe { process_info.operatingSystemVersionString() };
-        // "Version 15.6.1 (Build 24G90)" -> "15.6.1 (Build 24G90)"
-        let version_string = version_nsstring.to_string().replace("Version ", "");
-        // "15.6.1 (Build 24G90)" -> "15.6.1"
-        // "26.0.0 (Build 25A5349a)" -> unchanged (Beta or Rapid Security Response; ends with letter)
-        MACOS_VERSION_REGEX
-            .replace_all(&version_string, "")
-            .to_string()
-    }
-    #[cfg(any(target_os = "linux", target_os = "freebsd"))]
-    {
-        use std::path::Path;
-
-        let content = if let Ok(file) = std::fs::read_to_string(&Path::new("/etc/os-release")) {
-            file
-        } else if let Ok(file) = std::fs::read_to_string(&Path::new("/usr/lib/os-release")) {
-            file
-        } else if let Ok(file) = std::fs::read_to_string(&Path::new("/var/run/os-release")) {
-            file
-        } else {
-            log::error!(
-                "Failed to load /etc/os-release, /usr/lib/os-release, or /var/run/os-release"
-            );
-            "".to_string()
-        };
-        let mut name = "unknown";
-        let mut version = "unknown";
-
-        for line in content.lines() {
-            match line.split_once('=') {
-                Some(("ID", val)) => name = val.trim_matches('"'),
-                Some(("VERSION_ID", val)) => version = val.trim_matches('"'),
-                _ => {}
-            }
-        }
-
-        format!("{} {}", name, version)
-    }
-
-    #[cfg(target_os = "windows")]
-    {
-        let mut info = unsafe { std::mem::zeroed() };
-        let status = unsafe { windows::Wdk::System::SystemServices::RtlGetVersion(&mut info) };
-        if status.is_ok() {
-            semver::Version::new(
-                info.dwMajorVersion as _,
-                info.dwMinorVersion as _,
-                info.dwBuildNumber as _,
-            )
-            .to_string()
-        } else {
-            "unknown".to_string()
-        }
-    }
-}
-
-impl Telemetry {
-    pub fn new(
-        clock: Arc<dyn SystemClock>,
-        client: Arc<HttpClientWithUrl>,
-        cx: &mut App,
-    ) -> Arc<Self> {
-        let release_channel =
-            ReleaseChannel::try_global(cx).map(|release_channel| release_channel.display_name());
-
-        let state = Arc::new(Mutex::new(TelemetryState {
-            settings: *TelemetrySettings::get_global(cx),
-            architecture: env::consts::ARCH,
-            release_channel,
-            system_id: None,
-            installation_id: None,
-            session_id: None,
-            metrics_id: None,
-            events_queue: Vec::new(),
-            flush_events_task: None,
-            log_file: None,
-            is_staff: None,
-            first_event_date_time: None,
-            event_coalescer: EventCoalescer::new(clock.clone()),
-            max_queue_size: MAX_QUEUE_LEN,
-            worktrees_with_project_type_events_sent: HashSet::new(),
-
-            os_version: None,
-            os_name: os_name(),
-            app_version: release_channel::AppVersion::global(cx).to_string(),
-        }));
-        Self::log_file_path();
-
-        cx.background_spawn({
-            let state = state.clone();
-            let os_version = os_version();
-            state.lock().os_version = Some(os_version);
-            async move {
-                if let Some(tempfile) = File::create(Self::log_file_path()).ok() {
-                    state.lock().log_file = Some(tempfile);
-                }
-            }
-        })
-        .detach();
-
-        cx.observe_global::<SettingsStore>({
-            let state = state.clone();
-
-            move |cx| {
-                let mut state = state.lock();
-                state.settings = *TelemetrySettings::get_global(cx);
-            }
-        })
-        .detach();
-
-        let this = Arc::new(Self {
-            clock,
-            http_client: client,
-            executor: cx.background_executor().clone(),
-            state,
-        });
-
-        let (tx, mut rx) = mpsc::unbounded();
-        ::telemetry::init(tx);
-
-        cx.background_spawn({
-            let this = Arc::downgrade(&this);
-            async move {
-                while let Some(event) = rx.next().await {
-                    let Some(state) = this.upgrade() else { break };
-                    state.report_event(Event::Flexible(event))
-                }
-            }
-        })
-        .detach();
-
-        // We should only ever have one instance of Telemetry, leak the subscription to keep it alive
-        // rather than store in TelemetryState, complicating spawn as subscriptions are not Send
-        std::mem::forget(cx.on_app_quit({
-            let this = this.clone();
-            move |_| this.shutdown_telemetry()
-        }));
-
-        this
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    fn shutdown_telemetry(self: &Arc<Self>) -> impl Future<Output = ()> + use<> {
-        Task::ready(())
-    }
-
-    // Skip calling this function in tests.
-    // TestAppContext ends up calling this function on shutdown and it panics when trying to find the TelemetrySettings
-    #[cfg(not(any(test, feature = "test-support")))]
-    fn shutdown_telemetry(self: &Arc<Self>) -> impl Future<Output = ()> + use<> {
-        telemetry::event!("App Closed");
-        // TODO: close final edit period and make sure it's sent
-        Task::ready(())
-    }
-
-    pub fn log_file_path() -> PathBuf {
-        paths::logs_dir().join("telemetry.log")
-    }
-
-    pub fn has_checksum_seed(&self) -> bool {
-        ZED_CLIENT_CHECKSUM_SEED.is_some()
-    }
-
-    pub fn start(
-        self: &Arc<Self>,
-        system_id: Option<String>,
-        installation_id: Option<String>,
-        session_id: String,
-        cx: &App,
-    ) {
-        let mut state = self.state.lock();
-        state.system_id = system_id.map(|id| id.into());
-        state.installation_id = installation_id.map(|id| id.into());
-        state.session_id = Some(session_id);
-        state.app_version = release_channel::AppVersion::global(cx).to_string();
-        state.os_name = os_name();
-    }
-
-    pub fn metrics_enabled(self: &Arc<Self>) -> bool {
-        self.state.lock().settings.metrics
-    }
-
-    pub fn diagnostics_enabled(self: &Arc<Self>) -> bool {
-        self.state.lock().settings.diagnostics
-    }
-
-    pub fn set_authenticated_user_info(
-        self: &Arc<Self>,
-        metrics_id: Option<String>,
-        is_staff: bool,
-    ) {
-        let mut state = self.state.lock();
-
-        if !state.settings.metrics {
-            return;
-        }
-
-        let metrics_id: Option<Arc<str>> = metrics_id.map(|id| id.into());
-        state.metrics_id.clone_from(&metrics_id);
-        state.is_staff = Some(is_staff);
-        drop(state);
-    }
-
-    pub fn report_assistant_event(self: &Arc<Self>, event: AssistantEventData) {
-        let event_type = match event.phase {
-            AssistantPhase::Response => "Assistant Responded",
-            AssistantPhase::Invoked => "Assistant Invoked",
-            AssistantPhase::Accepted => "Assistant Response Accepted",
-            AssistantPhase::Rejected => "Assistant Response Rejected",
-        };
-
-        telemetry::event!(
-            event_type,
-            conversation_id = event.conversation_id,
-            kind = event.kind,
-            phase = event.phase,
-            message_id = event.message_id,
-            model = event.model,
-            model_provider = event.model_provider,
-            response_latency = event.response_latency,
-            error_message = event.error_message,
-            language_name = event.language_name,
-        );
-    }
-
-    pub fn log_edit_event(self: &Arc<Self>, environment: &'static str, is_via_ssh: bool) {
-        static LAST_EVENT_TIME: Mutex<Option<Instant>> = Mutex::new(None);
-
-        let mut state = self.state.lock();
-        let period_data = state.event_coalescer.log_event(environment);
-        drop(state);
-
-        if let Some(mut last_event) = LAST_EVENT_TIME.try_lock() {
-            let current_time = std::time::Instant::now();
-            let last_time = last_event.get_or_insert(current_time);
-
-            if current_time.duration_since(*last_time) > Duration::from_secs(60 * 10) {
-                *last_time = current_time;
-            } else {
-                return;
-            }
-
-            if let Some((start, end, environment)) = period_data {
-                let duration = end
-                    .saturating_duration_since(start)
-                    .min(Duration::from_secs(60 * 60 * 24))
-                    .as_millis() as i64;
-
-                telemetry::event!(
-                    "Editor Edited",
-                    duration = duration,
-                    environment = environment,
-                    is_via_ssh = is_via_ssh
-                );
-            }
-        }
-    }
-
-    pub fn report_discovered_project_type_events(
-        self: &Arc<Self>,
-        worktree_id: WorktreeId,
-        updated_entries_set: &UpdatedEntriesSet,
-    ) {
-        let Some(project_types) = self.detect_project_types(worktree_id, updated_entries_set)
-        else {
-            return;
-        };
-
-        for project_type in project_types {
-            telemetry::event!("Project Opened", project_type = project_type);
-        }
-    }
-
-    fn detect_project_types(
-        self: &Arc<Self>,
-        worktree_id: WorktreeId,
-        updated_entries_set: &UpdatedEntriesSet,
-    ) -> Option<Vec<String>> {
-        let mut state = self.state.lock();
-
-        if state
-            .worktrees_with_project_type_events_sent
-            .contains(&worktree_id)
-        {
-            return None;
-        }
-
-        let mut project_types: HashSet<&str> = HashSet::new();
-
-        for (path, _, _) in updated_entries_set.iter() {
-            let Some(file_name) = path.file_name() else {
-                continue;
-            };
-
-            let project_type = if file_name == "pnpm-lock.yaml" {
-                Some("pnpm")
-            } else if file_name == "yarn.lock" {
-                Some("yarn")
-            } else if file_name == "package.json" {
-                Some("node")
-            } else if DOTNET_PROJECT_FILES_REGEX.is_match(file_name) {
-                Some("dotnet")
-            } else {
-                None
-            };
-
-            if let Some(project_type) = project_type {
-                project_types.insert(project_type);
-            };
-        }
-
-        if !project_types.is_empty() {
-            state
-                .worktrees_with_project_type_events_sent
-                .insert(worktree_id);
-        }
-
-        let mut project_types: Vec<_> = project_types.into_iter().map(String::from).collect();
-        project_types.sort();
-        Some(project_types)
-    }
-
-    fn report_event(self: &Arc<Self>, mut event: Event) {
-        let mut state = self.state.lock();
-        // RUST_LOG=telemetry=trace to debug telemetry events
-        log::trace!(target: "telemetry", "{:?}", event);
-
-        if !state.settings.metrics {
-            return;
-        }
-
-        match &mut event {
-            Event::Flexible(event) => event
-                .event_properties
-                .insert("event_source".into(), "zed".into()),
-        };
-
-        if state.flush_events_task.is_none() {
-            let this = self.clone();
-            state.flush_events_task = Some(self.executor.spawn(async move {
-                this.executor.timer(FLUSH_INTERVAL).await;
-                this.flush_events().detach();
-            }));
-        }
-
-        let date_time = self.clock.utc_now();
-
-        let milliseconds_since_first_event = match state.first_event_date_time {
-            Some(first_event_date_time) => date_time
-                .saturating_duration_since(first_event_date_time)
-                .min(Duration::from_secs(60 * 60 * 24))
-                .as_millis() as i64,
-            None => {
-                state.first_event_date_time = Some(date_time);
-                0
-            }
-        };
-
-        let signed_in = state.metrics_id.is_some();
-        state.events_queue.push(EventWrapper {
-            signed_in,
-            milliseconds_since_first_event,
-            event,
-        });
-
-        if state.installation_id.is_some() && state.events_queue.len() >= state.max_queue_size {
-            drop(state);
-            self.flush_events().detach();
-        }
-    }
-
-    pub fn metrics_id(self: &Arc<Self>) -> Option<Arc<str>> {
-        self.state.lock().metrics_id.clone()
-    }
-
-    pub fn system_id(self: &Arc<Self>) -> Option<Arc<str>> {
-        self.state.lock().system_id.clone()
-    }
-
-    pub fn installation_id(self: &Arc<Self>) -> Option<Arc<str>> {
-        self.state.lock().installation_id.clone()
-    }
-
-    pub fn is_staff(self: &Arc<Self>) -> Option<bool> {
-        self.state.lock().is_staff
-    }
-
-    fn build_request(
-        self: &Arc<Self>,
-        // We take in the JSON bytes buffer so we can reuse the existing allocation.
-        mut json_bytes: Vec<u8>,
-        event_request: &EventRequestBody,
-    ) -> Result<Request<AsyncBody>> {
-        json_bytes.clear();
-        serde_json::to_writer(&mut json_bytes, event_request)?;
-
-        let checksum = calculate_json_checksum(&json_bytes).unwrap_or_default();
-
-        Ok(Request::builder()
-            .method(Method::POST)
-            .uri(
-                self.http_client
-                    .build_zed_api_url("/telemetry/events", &[])?
-                    .as_ref(),
-            )
-            .header("Content-Type", "application/json")
-            .header("x-zed-checksum", checksum)
-            .body(json_bytes.into())?)
-    }
-
-    pub fn flush_events(self: &Arc<Self>) -> Task<()> {
-        let mut state = self.state.lock();
-        state.first_event_date_time = None;
-        let events = mem::take(&mut state.events_queue);
-        state.flush_events_task.take();
-        drop(state);
-        if events.is_empty() {
-            return Task::ready(());
-        }
-
-        let this = self.clone();
-        self.executor.spawn(
-            async move {
-                let mut json_bytes = Vec::new();
-
-                if let Some(file) = &mut this.state.lock().log_file {
-                    for event in &events {
-                        json_bytes.clear();
-                        serde_json::to_writer(&mut json_bytes, event)?;
-                        file.write_all(&json_bytes)?;
-                        file.write_all(b"\n")?;
-                    }
-                }
-
-                let request_body = {
-                    let state = this.state.lock();
-
-                    EventRequestBody {
-                        system_id: state.system_id.as_deref().map(Into::into),
-                        installation_id: state.installation_id.as_deref().map(Into::into),
-                        session_id: state.session_id.clone(),
-                        metrics_id: state.metrics_id.as_deref().map(Into::into),
-                        is_staff: state.is_staff,
-                        app_version: state.app_version.clone(),
-                        os_name: state.os_name.clone(),
-                        os_version: state.os_version.clone(),
-                        architecture: state.architecture.to_string(),
-
-                        release_channel: state.release_channel.map(Into::into),
-                        events,
-                    }
-                };
-
-                let request = this.build_request(json_bytes, &request_body)?;
-                let response = this.http_client.send(request).await?;
-                if response.status() != 200 {
-                    log::error!("Failed to send events: HTTP {:?}", response.status());
-                }
-                anyhow::Ok(())
-            }
-            .log_err()
-            .map(|_| ()),
-        )
-    }
-}
-
-pub fn calculate_json_checksum(json: &impl AsRef<[u8]>) -> Option<String> {
-    let Some(checksum_seed) = &*ZED_CLIENT_CHECKSUM_SEED else {
-        return None;
-    };
-
-    let mut summer = Sha256::new();
-    summer.update(checksum_seed);
-    summer.update(json);
-    summer.update(checksum_seed);
-    let mut checksum = String::new();
-    for byte in summer.finalize().as_slice() {
-        use std::fmt::Write;
-        write!(&mut checksum, "{:02x}", byte).unwrap();
-    }
-
-    Some(checksum)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use clock::FakeSystemClock;
-    use gpui::TestAppContext;
-    use http_client::FakeHttpClient;
-    use std::collections::HashMap;
-    use telemetry_events::FlexibleEvent;
-    use util::rel_path::RelPath;
-    use worktree::{PathChange, ProjectEntryId, WorktreeId};
-
-    #[gpui::test]
-    fn test_telemetry_flush_on_max_queue_size(cx: &mut TestAppContext) {
-        init_test(cx);
-        let clock = Arc::new(FakeSystemClock::new());
-        let http = FakeHttpClient::with_200_response();
-        let system_id = Some("system_id".to_string());
-        let installation_id = Some("installation_id".to_string());
-        let session_id = "session_id".to_string();
-
-        cx.update(|cx| {
-            let telemetry = Telemetry::new(clock.clone(), http, cx);
-
-            telemetry.state.lock().max_queue_size = 4;
-            telemetry.start(system_id, installation_id, session_id, cx);
-
-            assert!(is_empty_state(&telemetry));
-
-            let first_date_time = clock.utc_now();
-            let event_properties = HashMap::from_iter([(
-                "test_key".to_string(),
-                serde_json::Value::String("test_value".to_string()),
-            )]);
-
-            let event = FlexibleEvent {
-                event_type: "test".to_string(),
-                event_properties,
-            };
-
-            telemetry.report_event(Event::Flexible(event.clone()));
-            assert_eq!(telemetry.state.lock().events_queue.len(), 1);
-            assert!(telemetry.state.lock().flush_events_task.is_some());
-            assert_eq!(
-                telemetry.state.lock().first_event_date_time,
-                Some(first_date_time)
-            );
-
-            clock.advance(Duration::from_millis(100));
-
-            telemetry.report_event(Event::Flexible(event.clone()));
-            assert_eq!(telemetry.state.lock().events_queue.len(), 2);
-            assert!(telemetry.state.lock().flush_events_task.is_some());
-            assert_eq!(
-                telemetry.state.lock().first_event_date_time,
-                Some(first_date_time)
-            );
-
-            clock.advance(Duration::from_millis(100));
-
-            telemetry.report_event(Event::Flexible(event.clone()));
-            assert_eq!(telemetry.state.lock().events_queue.len(), 3);
-            assert!(telemetry.state.lock().flush_events_task.is_some());
-            assert_eq!(
-                telemetry.state.lock().first_event_date_time,
-                Some(first_date_time)
-            );
-
-            clock.advance(Duration::from_millis(100));
-
-            // Adding a 4th event should cause a flush
-            telemetry.report_event(Event::Flexible(event));
-            assert!(is_empty_state(&telemetry));
-        });
-    }
-
-    #[gpui::test]
-    async fn test_telemetry_flush_on_flush_interval(
-        executor: BackgroundExecutor,
-        cx: &mut TestAppContext,
-    ) {
-        init_test(cx);
-        let clock = Arc::new(FakeSystemClock::new());
-        let http = FakeHttpClient::with_200_response();
-        let system_id = Some("system_id".to_string());
-        let installation_id = Some("installation_id".to_string());
-        let session_id = "session_id".to_string();
-
-        cx.update(|cx| {
-            let telemetry = Telemetry::new(clock.clone(), http, cx);
-            telemetry.state.lock().max_queue_size = 4;
-            telemetry.start(system_id, installation_id, session_id, cx);
-
-            assert!(is_empty_state(&telemetry));
-            let first_date_time = clock.utc_now();
-
-            let event_properties = HashMap::from_iter([(
-                "test_key".to_string(),
-                serde_json::Value::String("test_value".to_string()),
-            )]);
-
-            let event = FlexibleEvent {
-                event_type: "test".to_string(),
-                event_properties,
-            };
-
-            telemetry.report_event(Event::Flexible(event));
-            assert_eq!(telemetry.state.lock().events_queue.len(), 1);
-            assert!(telemetry.state.lock().flush_events_task.is_some());
-            assert_eq!(
-                telemetry.state.lock().first_event_date_time,
-                Some(first_date_time)
-            );
-
-            let duration = Duration::from_millis(1);
-
-            // Test 1 millisecond before the flush interval limit is met
-            executor.advance_clock(FLUSH_INTERVAL - duration);
-
-            assert!(!is_empty_state(&telemetry));
-
-            // Test the exact moment the flush interval limit is met
-            executor.advance_clock(duration);
-
-            assert!(is_empty_state(&telemetry));
-        });
-    }
-
-    #[gpui::test]
-    fn test_project_discovery_does_not_double_report(cx: &mut gpui::TestAppContext) {
-        init_test(cx);
-
-        let clock = Arc::new(FakeSystemClock::new());
-        let http = FakeHttpClient::with_200_response();
-        let telemetry = cx.update(|cx| Telemetry::new(clock.clone(), http, cx));
-        let worktree_id = 1;
-
-        // Scan of empty worktree finds nothing
-        test_project_discovery_helper(telemetry.clone(), vec![], Some(vec![]), worktree_id);
-
-        // Files added, second scan of worktree 1 finds project type
-        test_project_discovery_helper(
-            telemetry.clone(),
-            vec!["package.json"],
-            Some(vec!["node"]),
-            worktree_id,
-        );
-
-        // Third scan of worktree does not double report, as we already reported
-        test_project_discovery_helper(telemetry, vec!["package.json"], None, worktree_id);
-    }
-
-    #[gpui::test]
-    fn test_pnpm_project_discovery(cx: &mut gpui::TestAppContext) {
-        init_test(cx);
-
-        let clock = Arc::new(FakeSystemClock::new());
-        let http = FakeHttpClient::with_200_response();
-        let telemetry = cx.update(|cx| Telemetry::new(clock.clone(), http, cx));
-
-        test_project_discovery_helper(
-            telemetry,
-            vec!["package.json", "pnpm-lock.yaml"],
-            Some(vec!["node", "pnpm"]),
-            1,
-        );
-    }
-
-    #[gpui::test]
-    fn test_yarn_project_discovery(cx: &mut gpui::TestAppContext) {
-        init_test(cx);
-
-        let clock = Arc::new(FakeSystemClock::new());
-        let http = FakeHttpClient::with_200_response();
-        let telemetry = cx.update(|cx| Telemetry::new(clock.clone(), http, cx));
-
-        test_project_discovery_helper(
-            telemetry,
-            vec!["package.json", "yarn.lock"],
-            Some(vec!["node", "yarn"]),
-            1,
-        );
-    }
-
-    #[gpui::test]
-    fn test_dotnet_project_discovery(cx: &mut gpui::TestAppContext) {
-        init_test(cx);
-
-        let clock = Arc::new(FakeSystemClock::new());
-        let http = FakeHttpClient::with_200_response();
-        let telemetry = cx.update(|cx| Telemetry::new(clock.clone(), http, cx));
-
-        // Using different worktrees, as production code blocks from reporting a
-        // project type for the same worktree multiple times
-
-        test_project_discovery_helper(
-            telemetry.clone(),
-            vec!["global.json"],
-            Some(vec!["dotnet"]),
-            1,
-        );
-        test_project_discovery_helper(
-            telemetry.clone(),
-            vec!["Directory.Build.props"],
-            Some(vec!["dotnet"]),
-            2,
-        );
-        test_project_discovery_helper(
-            telemetry.clone(),
-            vec!["file.csproj"],
-            Some(vec!["dotnet"]),
-            3,
-        );
-        test_project_discovery_helper(
-            telemetry.clone(),
-            vec!["file.fsproj"],
-            Some(vec!["dotnet"]),
-            4,
-        );
-        test_project_discovery_helper(
-            telemetry.clone(),
-            vec!["file.vbproj"],
-            Some(vec!["dotnet"]),
-            5,
-        );
-        test_project_discovery_helper(telemetry.clone(), vec!["file.sln"], Some(vec!["dotnet"]), 6);
-
-        // Each worktree should only send a single project type event, even when
-        // encountering multiple files associated with that project type
-        test_project_discovery_helper(
-            telemetry,
-            vec!["global.json", "Directory.Build.props"],
-            Some(vec!["dotnet"]),
-            7,
-        );
-    }
-
-    // TODO:
-    // Test settings
-    // Update FakeHTTPClient to keep track of the number of requests and assert on it
-
-    fn init_test(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-        });
-    }
-
-    fn is_empty_state(telemetry: &Telemetry) -> bool {
-        telemetry.state.lock().events_queue.is_empty()
-            && telemetry.state.lock().flush_events_task.is_none()
-            && telemetry.state.lock().first_event_date_time.is_none()
-    }
-
-    fn test_project_discovery_helper(
-        telemetry: Arc<Telemetry>,
-        file_paths: Vec<&str>,
-        expected_project_types: Option<Vec<&str>>,
-        worktree_id_num: usize,
-    ) {
-        let worktree_id = WorktreeId::from_usize(worktree_id_num);
-        let entries: Vec<_> = file_paths
-            .into_iter()
-            .enumerate()
-            .filter_map(|(i, path)| {
-                Some((
-                    Arc::from(RelPath::unix(path).ok()?),
-                    ProjectEntryId::from_proto(i as u64 + 1),
-                    PathChange::Added,
-                ))
-            })
-            .collect();
-        let updated_entries: UpdatedEntriesSet = Arc::from(entries.as_slice());
-
-        let detected_project_types = telemetry.detect_project_types(worktree_id, &updated_entries);
-
-        let expected_project_types =
-            expected_project_types.map(|types| types.iter().map(|&t| t.to_string()).collect());
-
-        assert_eq!(detected_project_types, expected_project_types);
-    }
-}
diff --git a/crates/client/src/telemetry/event_coalescer.rs b/crates/client/src/telemetry/event_coalescer.rs
deleted file mode 100644
index e58112ac08..0000000000
--- a/crates/client/src/telemetry/event_coalescer.rs
+++ /dev/null
@@ -1,283 +0,0 @@
-use std::time;
-use std::{sync::Arc, time::Instant};
-
-use clock::SystemClock;
-
-const COALESCE_TIMEOUT: time::Duration = time::Duration::from_secs(20);
-const SIMULATED_DURATION_FOR_SINGLE_EVENT: time::Duration = time::Duration::from_millis(1);
-
-#[derive(Debug, PartialEq)]
-struct PeriodData {
-    environment: &'static str,
-    start: Instant,
-    end: Option<Instant>,
-}
-
-pub struct EventCoalescer {
-    clock: Arc<dyn SystemClock>,
-    state: Option<PeriodData>,
-}
-
-impl EventCoalescer {
-    pub fn new(clock: Arc<dyn SystemClock>) -> Self {
-        Self { clock, state: None }
-    }
-
-    pub fn log_event(
-        &mut self,
-        environment: &'static str,
-    ) -> Option<(Instant, Instant, &'static str)> {
-        let log_time = self.clock.utc_now();
-
-        let Some(state) = &mut self.state else {
-            self.state = Some(PeriodData {
-                start: log_time,
-                end: None,
-                environment,
-            });
-            return None;
-        };
-
-        let period_end = state
-            .end
-            .unwrap_or(state.start + SIMULATED_DURATION_FOR_SINGLE_EVENT);
-        let within_timeout = log_time - period_end < COALESCE_TIMEOUT;
-        let environment_is_same = state.environment == environment;
-        let should_coaelesce = !within_timeout || !environment_is_same;
-
-        if should_coaelesce {
-            let previous_environment = state.environment;
-            let original_start = state.start;
-
-            state.start = log_time;
-            state.end = None;
-            state.environment = environment;
-
-            return Some((
-                original_start,
-                if within_timeout { log_time } else { period_end },
-                previous_environment,
-            ));
-        }
-
-        state.end = Some(log_time);
-
-        None
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use clock::FakeSystemClock;
-
-    use super::*;
-
-    #[test]
-    fn test_same_context_exceeding_timeout() {
-        let clock = Arc::new(FakeSystemClock::new());
-        let environment_1 = "environment_1";
-        let mut event_coalescer = EventCoalescer::new(clock.clone());
-
-        assert_eq!(event_coalescer.state, None);
-
-        let period_start = clock.utc_now();
-        let period_data = event_coalescer.log_event(environment_1);
-
-        assert_eq!(period_data, None);
-        assert_eq!(
-            event_coalescer.state,
-            Some(PeriodData {
-                start: period_start,
-                end: None,
-                environment: environment_1,
-            })
-        );
-
-        let within_timeout_adjustment = COALESCE_TIMEOUT / 2;
-
-        // Ensure that many calls within the timeout don't start a new period
-        for _ in 0..100 {
-            clock.advance(within_timeout_adjustment);
-            let period_data = event_coalescer.log_event(environment_1);
-            let period_end = clock.utc_now();
-
-            assert_eq!(period_data, None);
-            assert_eq!(
-                event_coalescer.state,
-                Some(PeriodData {
-                    start: period_start,
-                    end: Some(period_end),
-                    environment: environment_1,
-                })
-            );
-        }
-
-        let period_end = clock.utc_now();
-        let exceed_timeout_adjustment = COALESCE_TIMEOUT * 2;
-        // Logging an event exceeding the timeout should start a new period
-        clock.advance(exceed_timeout_adjustment);
-        let new_period_start = clock.utc_now();
-        let period_data = event_coalescer.log_event(environment_1);
-
-        assert_eq!(period_data, Some((period_start, period_end, environment_1)));
-        assert_eq!(
-            event_coalescer.state,
-            Some(PeriodData {
-                start: new_period_start,
-                end: None,
-                environment: environment_1,
-            })
-        );
-    }
-
-    #[test]
-    fn test_different_environment_under_timeout() {
-        let clock = Arc::new(FakeSystemClock::new());
-        let environment_1 = "environment_1";
-        let mut event_coalescer = EventCoalescer::new(clock.clone());
-
-        assert_eq!(event_coalescer.state, None);
-
-        let period_start = clock.utc_now();
-        let period_data = event_coalescer.log_event(environment_1);
-
-        assert_eq!(period_data, None);
-        assert_eq!(
-            event_coalescer.state,
-            Some(PeriodData {
-                start: period_start,
-                end: None,
-                environment: environment_1,
-            })
-        );
-
-        let within_timeout_adjustment = COALESCE_TIMEOUT / 2;
-        clock.advance(within_timeout_adjustment);
-        let period_end = clock.utc_now();
-        let period_data = event_coalescer.log_event(environment_1);
-
-        assert_eq!(period_data, None);
-        assert_eq!(
-            event_coalescer.state,
-            Some(PeriodData {
-                start: period_start,
-                end: Some(period_end),
-                environment: environment_1,
-            })
-        );
-
-        clock.advance(within_timeout_adjustment);
-
-        // Logging an event within the timeout but with a different environment should start a new period
-        let period_end = clock.utc_now();
-        let environment_2 = "environment_2";
-        let period_data = event_coalescer.log_event(environment_2);
-
-        assert_eq!(period_data, Some((period_start, period_end, environment_1)));
-        assert_eq!(
-            event_coalescer.state,
-            Some(PeriodData {
-                start: period_end,
-                end: None,
-                environment: environment_2,
-            })
-        );
-    }
-
-    #[test]
-    fn test_switching_environment_while_within_timeout() {
-        let clock = Arc::new(FakeSystemClock::new());
-        let environment_1 = "environment_1";
-        let mut event_coalescer = EventCoalescer::new(clock.clone());
-
-        assert_eq!(event_coalescer.state, None);
-
-        let period_start = clock.utc_now();
-        let period_data = event_coalescer.log_event(environment_1);
-
-        assert_eq!(period_data, None);
-        assert_eq!(
-            event_coalescer.state,
-            Some(PeriodData {
-                start: period_start,
-                end: None,
-                environment: environment_1,
-            })
-        );
-
-        let within_timeout_adjustment = COALESCE_TIMEOUT / 2;
-        clock.advance(within_timeout_adjustment);
-        let period_end = clock.utc_now();
-        let environment_2 = "environment_2";
-        let period_data = event_coalescer.log_event(environment_2);
-
-        assert_eq!(period_data, Some((period_start, period_end, environment_1)));
-        assert_eq!(
-            event_coalescer.state,
-            Some(PeriodData {
-                start: period_end,
-                end: None,
-                environment: environment_2,
-            })
-        );
-    }
-
-    // 0                   20                  40                  60
-    // |-------------------|-------------------|-------------------|-------------------
-    // |--------|----------env change
-    //          |-------------------
-    // |period_start       |period_end
-    //                     |new_period_start
-
-    #[test]
-    fn test_switching_environment_while_exceeding_timeout() {
-        let clock = Arc::new(FakeSystemClock::new());
-        let environment_1 = "environment_1";
-        let mut event_coalescer = EventCoalescer::new(clock.clone());
-
-        assert_eq!(event_coalescer.state, None);
-
-        let period_start = clock.utc_now();
-        let period_data = event_coalescer.log_event(environment_1);
-
-        assert_eq!(period_data, None);
-        assert_eq!(
-            event_coalescer.state,
-            Some(PeriodData {
-                start: period_start,
-                end: None,
-                environment: environment_1,
-            })
-        );
-
-        let exceed_timeout_adjustment = COALESCE_TIMEOUT * 2;
-        clock.advance(exceed_timeout_adjustment);
-        let period_end = clock.utc_now();
-        let environment_2 = "environment_2";
-        let period_data = event_coalescer.log_event(environment_2);
-
-        assert_eq!(
-            period_data,
-            Some((
-                period_start,
-                period_start + SIMULATED_DURATION_FOR_SINGLE_EVENT,
-                environment_1
-            ))
-        );
-        assert_eq!(
-            event_coalescer.state,
-            Some(PeriodData {
-                start: period_end,
-                end: None,
-                environment: environment_2,
-            })
-        );
-    }
-
-    // 0                   20                  40                  60
-    // |-------------------|-------------------|-------------------|-------------------
-    // |--------|----------------------------------------env change
-    //          |-------------------|
-    // |period_start                |period_end
-    //                                                   |new_period_start
-}
diff --git a/crates/client/src/test.rs b/crates/client/src/test.rs
deleted file mode 100644
index da0e8a0f55..0000000000
--- a/crates/client/src/test.rs
+++ /dev/null
@@ -1,291 +0,0 @@
-use crate::{Client, Connection, Credentials, EstablishConnectionError, UserStore};
-use anyhow::{Context as _, Result, anyhow};
-use cloud_api_client::{AuthenticatedUser, GetAuthenticatedUserResponse, PlanInfo};
-use cloud_llm_client::{CurrentUsage, PlanV1, UsageData, UsageLimit};
-use futures::{StreamExt, stream::BoxStream};
-use gpui::{AppContext as _, BackgroundExecutor, Entity, TestAppContext};
-use http_client::{AsyncBody, Method, Request, http};
-use parking_lot::Mutex;
-use rpc::{ConnectionId, Peer, Receipt, TypedEnvelope, proto};
-use std::sync::Arc;
-
-pub struct FakeServer {
-    peer: Arc<Peer>,
-    state: Arc<Mutex<FakeServerState>>,
-    user_id: u64,
-    executor: BackgroundExecutor,
-}
-
-#[derive(Default)]
-struct FakeServerState {
-    incoming: Option<BoxStream<'static, Box<dyn proto::AnyTypedEnvelope>>>,
-    connection_id: Option<ConnectionId>,
-    forbid_connections: bool,
-    auth_count: usize,
-    access_token: usize,
-}
-
-impl FakeServer {
-    pub async fn for_client(
-        client_user_id: u64,
-        client: &Arc<Client>,
-        cx: &TestAppContext,
-    ) -> Self {
-        let server = Self {
-            peer: Peer::new(0),
-            state: Default::default(),
-            user_id: client_user_id,
-            executor: cx.executor(),
-        };
-
-        client.http_client().as_fake().replace_handler({
-            let state = server.state.clone();
-            move |old_handler, req| {
-                let state = state.clone();
-                let old_handler = old_handler.clone();
-                async move {
-                    match (req.method(), req.uri().path()) {
-                        (&Method::GET, "/client/users/me") => {
-                            let credentials = parse_authorization_header(&req);
-                            if credentials
-                                != Some(Credentials {
-                                    user_id: client_user_id,
-                                    access_token: state.lock().access_token.to_string(),
-                                })
-                            {
-                                return Ok(http_client::Response::builder()
-                                    .status(401)
-                                    .body("Unauthorized".into())
-                                    .unwrap());
-                            }
-
-                            Ok(http_client::Response::builder()
-                                .status(200)
-                                .body(
-                                    serde_json::to_string(&make_get_authenticated_user_response(
-                                        client_user_id as i32,
-                                        format!("user-{client_user_id}"),
-                                    ))
-                                    .unwrap()
-                                    .into(),
-                                )
-                                .unwrap())
-                        }
-                        _ => old_handler(req).await,
-                    }
-                }
-            }
-        });
-        client
-            .override_authenticate({
-                let state = Arc::downgrade(&server.state);
-                move |cx| {
-                    let state = state.clone();
-                    cx.spawn(async move |_| {
-                        let state = state.upgrade().context("server dropped")?;
-                        let mut state = state.lock();
-                        state.auth_count += 1;
-                        let access_token = state.access_token.to_string();
-                        Ok(Credentials {
-                            user_id: client_user_id,
-                            access_token,
-                        })
-                    })
-                }
-            })
-            .override_establish_connection({
-                let peer = Arc::downgrade(&server.peer);
-                let state = Arc::downgrade(&server.state);
-                move |credentials, cx| {
-                    let peer = peer.clone();
-                    let state = state.clone();
-                    let credentials = credentials.clone();
-                    cx.spawn(async move |cx| {
-                        let state = state.upgrade().context("server dropped")?;
-                        let peer = peer.upgrade().context("server dropped")?;
-                        if state.lock().forbid_connections {
-                            Err(EstablishConnectionError::Other(anyhow!(
-                                "server is forbidding connections"
-                            )))?
-                        }
-
-                        if credentials
-                            != (Credentials {
-                                user_id: client_user_id,
-                                access_token: state.lock().access_token.to_string(),
-                            })
-                        {
-                            Err(EstablishConnectionError::Unauthorized)?
-                        }
-
-                        let (client_conn, server_conn, _) =
-                            Connection::in_memory(cx.background_executor().clone());
-                        let (connection_id, io, incoming) =
-                            peer.add_test_connection(server_conn, cx.background_executor().clone());
-                        cx.background_spawn(io).detach();
-                        {
-                            let mut state = state.lock();
-                            state.connection_id = Some(connection_id);
-                            state.incoming = Some(incoming);
-                        }
-                        peer.send(
-                            connection_id,
-                            proto::Hello {
-                                peer_id: Some(connection_id.into()),
-                            },
-                        )
-                        .unwrap();
-
-                        Ok(client_conn)
-                    })
-                }
-            });
-
-        client
-            .connect(false, &cx.to_async())
-            .await
-            .into_response()
-            .unwrap();
-
-        server
-    }
-
-    pub fn disconnect(&self) {
-        if self.state.lock().connection_id.is_some() {
-            self.peer.disconnect(self.connection_id());
-            let mut state = self.state.lock();
-            state.connection_id.take();
-            state.incoming.take();
-        }
-    }
-
-    pub fn auth_count(&self) -> usize {
-        self.state.lock().auth_count
-    }
-
-    pub fn roll_access_token(&self) {
-        self.state.lock().access_token += 1;
-    }
-
-    pub fn forbid_connections(&self) {
-        self.state.lock().forbid_connections = true;
-    }
-
-    pub fn allow_connections(&self) {
-        self.state.lock().forbid_connections = false;
-    }
-
-    pub fn send<T: proto::EnvelopedMessage>(&self, message: T) {
-        self.peer.send(self.connection_id(), message).unwrap();
-    }
-
-    #[allow(clippy::await_holding_lock)]
-    pub async fn receive<M: proto::EnvelopedMessage>(&self) -> Result<TypedEnvelope<M>> {
-        self.executor.start_waiting();
-
-        let message = self
-            .state
-            .lock()
-            .incoming
-            .as_mut()
-            .expect("not connected")
-            .next()
-            .await
-            .context("other half hung up")?;
-        self.executor.finish_waiting();
-        let type_name = message.payload_type_name();
-        let message = message.into_any();
-
-        if message.is::<TypedEnvelope<M>>() {
-            return Ok(*message.downcast().unwrap());
-        }
-
-        panic!(
-            "fake server received unexpected message type: {:?}",
-            type_name
-        );
-    }
-
-    pub fn respond<T: proto::RequestMessage>(&self, receipt: Receipt<T>, response: T::Response) {
-        self.peer.respond(receipt, response).unwrap()
-    }
-
-    fn connection_id(&self) -> ConnectionId {
-        self.state.lock().connection_id.expect("not connected")
-    }
-
-    pub async fn build_user_store(
-        &self,
-        client: Arc<Client>,
-        cx: &mut TestAppContext,
-    ) -> Entity<UserStore> {
-        let user_store = cx.new(|cx| UserStore::new(client, cx));
-        assert_eq!(
-            self.receive::<proto::GetUsers>()
-                .await
-                .unwrap()
-                .payload
-                .user_ids,
-            &[self.user_id]
-        );
-        user_store
-    }
-}
-
-impl Drop for FakeServer {
-    fn drop(&mut self) {
-        self.disconnect();
-    }
-}
-
-pub fn parse_authorization_header(req: &Request<AsyncBody>) -> Option<Credentials> {
-    let mut auth_header = req
-        .headers()
-        .get(http::header::AUTHORIZATION)?
-        .to_str()
-        .ok()?
-        .split_whitespace();
-    let user_id = auth_header.next()?.parse().ok()?;
-    let access_token = auth_header.next()?;
-    Some(Credentials {
-        user_id,
-        access_token: access_token.to_string(),
-    })
-}
-
-pub fn make_get_authenticated_user_response(
-    user_id: i32,
-    github_login: String,
-) -> GetAuthenticatedUserResponse {
-    GetAuthenticatedUserResponse {
-        user: AuthenticatedUser {
-            id: user_id,
-            metrics_id: format!("metrics-id-{user_id}"),
-            avatar_url: "".to_string(),
-            github_login,
-            name: None,
-            is_staff: false,
-            accepted_tos_at: None,
-        },
-        feature_flags: vec![],
-        plan: PlanInfo {
-            plan: PlanV1::ZedPro,
-            plan_v2: None,
-            subscription_period: None,
-            usage: CurrentUsage {
-                model_requests: UsageData {
-                    used: 0,
-                    limit: UsageLimit::Limited(500),
-                },
-                edit_predictions: UsageData {
-                    used: 250,
-                    limit: UsageLimit::Unlimited,
-                },
-            },
-            trial_started_at: None,
-            is_usage_based_billing_enabled: false,
-            is_account_too_young: false,
-            has_overdue_invoices: false,
-        },
-    }
-}
diff --git a/crates/client/src/user.rs b/crates/client/src/user.rs
deleted file mode 100644
index 37f0f3ec27..0000000000
--- a/crates/client/src/user.rs
+++ /dev/null
@@ -1,1007 +0,0 @@
-use super::{Client, Status, TypedEnvelope, proto};
-use anyhow::{Context as _, Result};
-use chrono::{DateTime, Utc};
-use cloud_api_client::websocket_protocol::MessageToClient;
-use cloud_api_client::{GetAuthenticatedUserResponse, PlanInfo};
-use cloud_llm_client::{
-    EDIT_PREDICTIONS_USAGE_AMOUNT_HEADER_NAME, EDIT_PREDICTIONS_USAGE_LIMIT_HEADER_NAME,
-    MODEL_REQUESTS_USAGE_AMOUNT_HEADER_NAME, MODEL_REQUESTS_USAGE_LIMIT_HEADER_NAME, Plan,
-    UsageLimit,
-};
-use collections::{HashMap, HashSet, hash_map::Entry};
-use derive_more::Deref;
-use feature_flags::FeatureFlagAppExt;
-use futures::{Future, StreamExt, channel::mpsc};
-use gpui::{
-    App, AsyncApp, Context, Entity, EventEmitter, SharedString, SharedUri, Task, WeakEntity,
-};
-use http_client::http::{HeaderMap, HeaderValue};
-use postage::{sink::Sink, watch};
-use rpc::proto::{RequestMessage, UsersResponse};
-use std::{
-    str::FromStr as _,
-    sync::{Arc, Weak},
-};
-use text::ReplicaId;
-use util::{ResultExt, TryFutureExt as _};
-
-pub type UserId = u64;
-
-#[derive(
-    Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy, serde::Serialize, serde::Deserialize,
-)]
-pub struct ChannelId(pub u64);
-
-impl std::fmt::Display for ChannelId {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        self.0.fmt(f)
-    }
-}
-
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
-pub struct ProjectId(pub u64);
-
-impl ProjectId {
-    pub fn to_proto(self) -> u64 {
-        self.0
-    }
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub struct ParticipantIndex(pub u32);
-
-#[derive(Default, Debug)]
-pub struct User {
-    pub id: UserId,
-    pub github_login: SharedString,
-    pub avatar_uri: SharedUri,
-    pub name: Option<String>,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct Collaborator {
-    pub peer_id: proto::PeerId,
-    pub replica_id: ReplicaId,
-    pub user_id: UserId,
-    pub is_host: bool,
-    pub committer_name: Option<String>,
-    pub committer_email: Option<String>,
-}
-
-impl PartialOrd for User {
-    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-impl Ord for User {
-    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
-        self.github_login.cmp(&other.github_login)
-    }
-}
-
-impl PartialEq for User {
-    fn eq(&self, other: &Self) -> bool {
-        self.id == other.id && self.github_login == other.github_login
-    }
-}
-
-impl Eq for User {}
-
-#[derive(Debug, PartialEq)]
-pub struct Contact {
-    pub user: Arc<User>,
-    pub online: bool,
-    pub busy: bool,
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum ContactRequestStatus {
-    None,
-    RequestSent,
-    RequestReceived,
-    RequestAccepted,
-}
-
-pub struct UserStore {
-    users: HashMap<u64, Arc<User>>,
-    by_github_login: HashMap<SharedString, u64>,
-    participant_indices: HashMap<u64, ParticipantIndex>,
-    update_contacts_tx: mpsc::UnboundedSender<UpdateContacts>,
-    model_request_usage: Option<ModelRequestUsage>,
-    edit_prediction_usage: Option<EditPredictionUsage>,
-    plan_info: Option<PlanInfo>,
-    current_user: watch::Receiver<Option<Arc<User>>>,
-    contacts: Vec<Arc<Contact>>,
-    incoming_contact_requests: Vec<Arc<User>>,
-    outgoing_contact_requests: Vec<Arc<User>>,
-    pending_contact_requests: HashMap<u64, usize>,
-    invite_info: Option<InviteInfo>,
-    client: Weak<Client>,
-    _maintain_contacts: Task<()>,
-    _maintain_current_user: Task<Result<()>>,
-    weak_self: WeakEntity<Self>,
-}
-
-#[derive(Clone)]
-pub struct InviteInfo {
-    pub count: u32,
-    pub url: Arc<str>,
-}
-
-pub enum Event {
-    Contact {
-        user: Arc<User>,
-        kind: ContactEventKind,
-    },
-    ShowContacts,
-    ParticipantIndicesChanged,
-    PrivateUserInfoUpdated,
-    PlanUpdated,
-}
-
-#[derive(Clone, Copy)]
-pub enum ContactEventKind {
-    Requested,
-    Accepted,
-    Cancelled,
-}
-
-impl EventEmitter<Event> for UserStore {}
-
-enum UpdateContacts {
-    Update(proto::UpdateContacts),
-    Wait(postage::barrier::Sender),
-    Clear(postage::barrier::Sender),
-}
-
-#[derive(Debug, Clone, Copy, Deref)]
-pub struct ModelRequestUsage(pub RequestUsage);
-
-#[derive(Debug, Clone, Copy, Deref)]
-pub struct EditPredictionUsage(pub RequestUsage);
-
-#[derive(Debug, Clone, Copy)]
-pub struct RequestUsage {
-    pub limit: UsageLimit,
-    pub amount: i32,
-}
-
-impl UserStore {
-    pub fn new(client: Arc<Client>, cx: &Context<Self>) -> Self {
-        let (mut current_user_tx, current_user_rx) = watch::channel();
-        let (update_contacts_tx, mut update_contacts_rx) = mpsc::unbounded();
-        let rpc_subscriptions = vec![
-            client.add_message_handler(cx.weak_entity(), Self::handle_update_contacts),
-            client.add_message_handler(cx.weak_entity(), Self::handle_update_invite_info),
-            client.add_message_handler(cx.weak_entity(), Self::handle_show_contacts),
-        ];
-
-        client.add_message_to_client_handler({
-            let this = cx.weak_entity();
-            move |message, cx| Self::handle_message_to_client(this.clone(), message, cx)
-        });
-
-        Self {
-            users: Default::default(),
-            by_github_login: Default::default(),
-            current_user: current_user_rx,
-            plan_info: None,
-            model_request_usage: None,
-            edit_prediction_usage: None,
-            contacts: Default::default(),
-            incoming_contact_requests: Default::default(),
-            participant_indices: Default::default(),
-            outgoing_contact_requests: Default::default(),
-            invite_info: None,
-            client: Arc::downgrade(&client),
-            update_contacts_tx,
-            _maintain_contacts: cx.spawn(async move |this, cx| {
-                let _subscriptions = rpc_subscriptions;
-                while let Some(message) = update_contacts_rx.next().await {
-                    if let Ok(task) = this.update(cx, |this, cx| this.update_contacts(message, cx))
-                    {
-                        task.log_err().await;
-                    } else {
-                        break;
-                    }
-                }
-            }),
-            _maintain_current_user: cx.spawn(async move |this, cx| {
-                let mut status = client.status();
-                let weak = Arc::downgrade(&client);
-                drop(client);
-                while let Some(status) = status.next().await {
-                    // if the client is dropped, the app is shutting down.
-                    let Some(client) = weak.upgrade() else {
-                        return Ok(());
-                    };
-                    match status {
-                        Status::Authenticated
-                        | Status::Reauthenticated
-                        | Status::Connected { .. } => {
-                            if let Some(user_id) = client.user_id() {
-                                let response = client
-                                    .cloud_client()
-                                    .get_authenticated_user()
-                                    .await
-                                    .log_err();
-
-                                let current_user_and_response = if let Some(response) = response {
-                                    let user = Arc::new(User {
-                                        id: user_id,
-                                        github_login: response.user.github_login.clone().into(),
-                                        avatar_uri: response.user.avatar_url.clone().into(),
-                                        name: response.user.name.clone(),
-                                    });
-
-                                    Some((user, response))
-                                } else {
-                                    None
-                                };
-                                current_user_tx
-                                    .send(
-                                        current_user_and_response
-                                            .as_ref()
-                                            .map(|(user, _)| user.clone()),
-                                    )
-                                    .await
-                                    .ok();
-
-                                cx.update(|cx| {
-                                    if let Some((user, response)) = current_user_and_response {
-                                        this.update(cx, |this, cx| {
-                                            this.by_github_login
-                                                .insert(user.github_login.clone(), user_id);
-                                            this.users.insert(user_id, user);
-                                            this.update_authenticated_user(response, cx)
-                                        })
-                                    } else {
-                                        anyhow::Ok(())
-                                    }
-                                })??;
-
-                                this.update(cx, |_, cx| cx.notify())?;
-                            }
-                        }
-                        Status::SignedOut => {
-                            current_user_tx.send(None).await.ok();
-                            this.update(cx, |this, cx| {
-                                this.clear_plan_and_usage();
-                                cx.emit(Event::PrivateUserInfoUpdated);
-                                cx.notify();
-                                this.clear_contacts()
-                            })?
-                            .await;
-                        }
-                        Status::ConnectionLost => {
-                            this.update(cx, |this, cx| {
-                                cx.notify();
-                                this.clear_contacts()
-                            })?
-                            .await;
-                        }
-                        _ => {}
-                    }
-                }
-                Ok(())
-            }),
-            pending_contact_requests: Default::default(),
-            weak_self: cx.weak_entity(),
-        }
-    }
-
-    #[cfg(feature = "test-support")]
-    pub fn clear_cache(&mut self) {
-        self.users.clear();
-        self.by_github_login.clear();
-    }
-
-    async fn handle_update_invite_info(
-        this: Entity<Self>,
-        message: TypedEnvelope<proto::UpdateInviteInfo>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        this.update(&mut cx, |this, cx| {
-            this.invite_info = Some(InviteInfo {
-                url: Arc::from(message.payload.url),
-                count: message.payload.count,
-            });
-            cx.notify();
-        })?;
-        Ok(())
-    }
-
-    async fn handle_show_contacts(
-        this: Entity<Self>,
-        _: TypedEnvelope<proto::ShowContacts>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        this.update(&mut cx, |_, cx| cx.emit(Event::ShowContacts))?;
-        Ok(())
-    }
-
-    pub fn invite_info(&self) -> Option<&InviteInfo> {
-        self.invite_info.as_ref()
-    }
-
-    async fn handle_update_contacts(
-        this: Entity<Self>,
-        message: TypedEnvelope<proto::UpdateContacts>,
-        cx: AsyncApp,
-    ) -> Result<()> {
-        this.read_with(&cx, |this, _| {
-            this.update_contacts_tx
-                .unbounded_send(UpdateContacts::Update(message.payload))
-                .unwrap();
-        })?;
-        Ok(())
-    }
-
-    fn update_contacts(&mut self, message: UpdateContacts, cx: &Context<Self>) -> Task<Result<()>> {
-        match message {
-            UpdateContacts::Wait(barrier) => {
-                drop(barrier);
-                Task::ready(Ok(()))
-            }
-            UpdateContacts::Clear(barrier) => {
-                self.contacts.clear();
-                self.incoming_contact_requests.clear();
-                self.outgoing_contact_requests.clear();
-                drop(barrier);
-                Task::ready(Ok(()))
-            }
-            UpdateContacts::Update(message) => {
-                let mut user_ids = HashSet::default();
-                for contact in &message.contacts {
-                    user_ids.insert(contact.user_id);
-                }
-                user_ids.extend(message.incoming_requests.iter().map(|req| req.requester_id));
-                user_ids.extend(message.outgoing_requests.iter());
-
-                let load_users = self.get_users(user_ids.into_iter().collect(), cx);
-                cx.spawn(async move |this, cx| {
-                    load_users.await?;
-
-                    // Users are fetched in parallel above and cached in call to get_users
-                    // No need to parallelize here
-                    let mut updated_contacts = Vec::new();
-                    let this = this.upgrade().context("can't upgrade user store handle")?;
-                    for contact in message.contacts {
-                        updated_contacts
-                            .push(Arc::new(Contact::from_proto(contact, &this, cx).await?));
-                    }
-
-                    let mut incoming_requests = Vec::new();
-                    for request in message.incoming_requests {
-                        incoming_requests.push({
-                            this.update(cx, |this, cx| this.get_user(request.requester_id, cx))?
-                                .await?
-                        });
-                    }
-
-                    let mut outgoing_requests = Vec::new();
-                    for requested_user_id in message.outgoing_requests {
-                        outgoing_requests.push(
-                            this.update(cx, |this, cx| this.get_user(requested_user_id, cx))?
-                                .await?,
-                        );
-                    }
-
-                    let removed_contacts =
-                        HashSet::<u64>::from_iter(message.remove_contacts.iter().copied());
-                    let removed_incoming_requests =
-                        HashSet::<u64>::from_iter(message.remove_incoming_requests.iter().copied());
-                    let removed_outgoing_requests =
-                        HashSet::<u64>::from_iter(message.remove_outgoing_requests.iter().copied());
-
-                    this.update(cx, |this, cx| {
-                        // Remove contacts
-                        this.contacts
-                            .retain(|contact| !removed_contacts.contains(&contact.user.id));
-                        // Update existing contacts and insert new ones
-                        for updated_contact in updated_contacts {
-                            match this.contacts.binary_search_by_key(
-                                &&updated_contact.user.github_login,
-                                |contact| &contact.user.github_login,
-                            ) {
-                                Ok(ix) => this.contacts[ix] = updated_contact,
-                                Err(ix) => this.contacts.insert(ix, updated_contact),
-                            }
-                        }
-
-                        // Remove incoming contact requests
-                        this.incoming_contact_requests.retain(|user| {
-                            if removed_incoming_requests.contains(&user.id) {
-                                cx.emit(Event::Contact {
-                                    user: user.clone(),
-                                    kind: ContactEventKind::Cancelled,
-                                });
-                                false
-                            } else {
-                                true
-                            }
-                        });
-                        // Update existing incoming requests and insert new ones
-                        for user in incoming_requests {
-                            match this
-                                .incoming_contact_requests
-                                .binary_search_by_key(&&user.github_login, |contact| {
-                                    &contact.github_login
-                                }) {
-                                Ok(ix) => this.incoming_contact_requests[ix] = user,
-                                Err(ix) => this.incoming_contact_requests.insert(ix, user),
-                            }
-                        }
-
-                        // Remove outgoing contact requests
-                        this.outgoing_contact_requests
-                            .retain(|user| !removed_outgoing_requests.contains(&user.id));
-                        // Update existing incoming requests and insert new ones
-                        for request in outgoing_requests {
-                            match this
-                                .outgoing_contact_requests
-                                .binary_search_by_key(&&request.github_login, |contact| {
-                                    &contact.github_login
-                                }) {
-                                Ok(ix) => this.outgoing_contact_requests[ix] = request,
-                                Err(ix) => this.outgoing_contact_requests.insert(ix, request),
-                            }
-                        }
-
-                        cx.notify();
-                    })?;
-
-                    Ok(())
-                })
-            }
-        }
-    }
-
-    pub fn contacts(&self) -> &[Arc<Contact>] {
-        &self.contacts
-    }
-
-    pub fn has_contact(&self, user: &Arc<User>) -> bool {
-        self.contacts
-            .binary_search_by_key(&&user.github_login, |contact| &contact.user.github_login)
-            .is_ok()
-    }
-
-    pub fn incoming_contact_requests(&self) -> &[Arc<User>] {
-        &self.incoming_contact_requests
-    }
-
-    pub fn outgoing_contact_requests(&self) -> &[Arc<User>] {
-        &self.outgoing_contact_requests
-    }
-
-    pub fn is_contact_request_pending(&self, user: &User) -> bool {
-        self.pending_contact_requests.contains_key(&user.id)
-    }
-
-    pub fn contact_request_status(&self, user: &User) -> ContactRequestStatus {
-        if self
-            .contacts
-            .binary_search_by_key(&&user.github_login, |contact| &contact.user.github_login)
-            .is_ok()
-        {
-            ContactRequestStatus::RequestAccepted
-        } else if self
-            .outgoing_contact_requests
-            .binary_search_by_key(&&user.github_login, |user| &user.github_login)
-            .is_ok()
-        {
-            ContactRequestStatus::RequestSent
-        } else if self
-            .incoming_contact_requests
-            .binary_search_by_key(&&user.github_login, |user| &user.github_login)
-            .is_ok()
-        {
-            ContactRequestStatus::RequestReceived
-        } else {
-            ContactRequestStatus::None
-        }
-    }
-
-    pub fn request_contact(
-        &mut self,
-        responder_id: u64,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        self.perform_contact_request(responder_id, proto::RequestContact { responder_id }, cx)
-    }
-
-    pub fn remove_contact(&mut self, user_id: u64, cx: &mut Context<Self>) -> Task<Result<()>> {
-        self.perform_contact_request(user_id, proto::RemoveContact { user_id }, cx)
-    }
-
-    pub fn has_incoming_contact_request(&self, user_id: u64) -> bool {
-        self.incoming_contact_requests
-            .iter()
-            .any(|user| user.id == user_id)
-    }
-
-    pub fn respond_to_contact_request(
-        &mut self,
-        requester_id: u64,
-        accept: bool,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        self.perform_contact_request(
-            requester_id,
-            proto::RespondToContactRequest {
-                requester_id,
-                response: if accept {
-                    proto::ContactRequestResponse::Accept
-                } else {
-                    proto::ContactRequestResponse::Decline
-                } as i32,
-            },
-            cx,
-        )
-    }
-
-    pub fn dismiss_contact_request(
-        &self,
-        requester_id: u64,
-        cx: &Context<Self>,
-    ) -> Task<Result<()>> {
-        let client = self.client.upgrade();
-        cx.spawn(async move |_, _| {
-            client
-                .context("can't upgrade client reference")?
-                .request(proto::RespondToContactRequest {
-                    requester_id,
-                    response: proto::ContactRequestResponse::Dismiss as i32,
-                })
-                .await?;
-            Ok(())
-        })
-    }
-
-    fn perform_contact_request<T: RequestMessage>(
-        &mut self,
-        user_id: u64,
-        request: T,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let client = self.client.upgrade();
-        *self.pending_contact_requests.entry(user_id).or_insert(0) += 1;
-        cx.notify();
-
-        cx.spawn(async move |this, cx| {
-            let response = client
-                .context("can't upgrade client reference")?
-                .request(request)
-                .await;
-            this.update(cx, |this, cx| {
-                if let Entry::Occupied(mut request_count) =
-                    this.pending_contact_requests.entry(user_id)
-                {
-                    *request_count.get_mut() -= 1;
-                    if *request_count.get() == 0 {
-                        request_count.remove();
-                    }
-                }
-                cx.notify();
-            })?;
-            response?;
-            Ok(())
-        })
-    }
-
-    pub fn clear_contacts(&self) -> impl Future<Output = ()> + use<> {
-        let (tx, mut rx) = postage::barrier::channel();
-        self.update_contacts_tx
-            .unbounded_send(UpdateContacts::Clear(tx))
-            .unwrap();
-        async move {
-            rx.next().await;
-        }
-    }
-
-    pub fn contact_updates_done(&self) -> impl Future<Output = ()> {
-        let (tx, mut rx) = postage::barrier::channel();
-        self.update_contacts_tx
-            .unbounded_send(UpdateContacts::Wait(tx))
-            .unwrap();
-        async move {
-            rx.next().await;
-        }
-    }
-
-    pub fn get_users(
-        &self,
-        user_ids: Vec<u64>,
-        cx: &Context<Self>,
-    ) -> Task<Result<Vec<Arc<User>>>> {
-        let mut user_ids_to_fetch = user_ids.clone();
-        user_ids_to_fetch.retain(|id| !self.users.contains_key(id));
-
-        cx.spawn(async move |this, cx| {
-            if !user_ids_to_fetch.is_empty() {
-                this.update(cx, |this, cx| {
-                    this.load_users(
-                        proto::GetUsers {
-                            user_ids: user_ids_to_fetch,
-                        },
-                        cx,
-                    )
-                })?
-                .await?;
-            }
-
-            this.read_with(cx, |this, _| {
-                user_ids
-                    .iter()
-                    .map(|user_id| {
-                        this.users
-                            .get(user_id)
-                            .cloned()
-                            .with_context(|| format!("user {user_id} not found"))
-                    })
-                    .collect()
-            })?
-        })
-    }
-
-    pub fn fuzzy_search_users(
-        &self,
-        query: String,
-        cx: &Context<Self>,
-    ) -> Task<Result<Vec<Arc<User>>>> {
-        self.load_users(proto::FuzzySearchUsers { query }, cx)
-    }
-
-    pub fn get_cached_user(&self, user_id: u64) -> Option<Arc<User>> {
-        self.users.get(&user_id).cloned()
-    }
-
-    pub fn get_user_optimistic(&self, user_id: u64, cx: &Context<Self>) -> Option<Arc<User>> {
-        if let Some(user) = self.users.get(&user_id).cloned() {
-            return Some(user);
-        }
-
-        self.get_user(user_id, cx).detach_and_log_err(cx);
-        None
-    }
-
-    pub fn get_user(&self, user_id: u64, cx: &Context<Self>) -> Task<Result<Arc<User>>> {
-        if let Some(user) = self.users.get(&user_id).cloned() {
-            return Task::ready(Ok(user));
-        }
-
-        let load_users = self.get_users(vec![user_id], cx);
-        cx.spawn(async move |this, cx| {
-            load_users.await?;
-            this.read_with(cx, |this, _| {
-                this.users
-                    .get(&user_id)
-                    .cloned()
-                    .context("server responded with no users")
-            })?
-        })
-    }
-
-    pub fn cached_user_by_github_login(&self, github_login: &str) -> Option<Arc<User>> {
-        self.by_github_login
-            .get(github_login)
-            .and_then(|id| self.users.get(id).cloned())
-    }
-
-    pub fn current_user(&self) -> Option<Arc<User>> {
-        self.current_user.borrow().clone()
-    }
-
-    pub fn plan(&self) -> Option<Plan> {
-        #[cfg(debug_assertions)]
-        if let Ok(plan) = std::env::var("ZED_SIMULATE_PLAN").as_ref() {
-            use cloud_llm_client::PlanV1;
-
-            return match plan.as_str() {
-                "free" => Some(Plan::V1(PlanV1::ZedFree)),
-                "trial" => Some(Plan::V1(PlanV1::ZedProTrial)),
-                "pro" => Some(Plan::V1(PlanV1::ZedPro)),
-                _ => {
-                    panic!("ZED_SIMULATE_PLAN must be one of 'free', 'trial', or 'pro'");
-                }
-            };
-        }
-
-        self.plan_info.as_ref().map(|info| info.plan())
-    }
-
-    pub fn subscription_period(&self) -> Option<(DateTime<Utc>, DateTime<Utc>)> {
-        self.plan_info
-            .as_ref()
-            .and_then(|plan| plan.subscription_period)
-            .map(|subscription_period| {
-                (
-                    subscription_period.started_at.0,
-                    subscription_period.ended_at.0,
-                )
-            })
-    }
-
-    pub fn trial_started_at(&self) -> Option<DateTime<Utc>> {
-        self.plan_info
-            .as_ref()
-            .and_then(|plan| plan.trial_started_at)
-            .map(|trial_started_at| trial_started_at.0)
-    }
-
-    /// Returns whether the user's account is too new to use the service.
-    pub fn account_too_young(&self) -> bool {
-        self.plan_info
-            .as_ref()
-            .map(|plan| plan.is_account_too_young)
-            .unwrap_or_default()
-    }
-
-    /// Returns whether the current user has overdue invoices and usage should be blocked.
-    pub fn has_overdue_invoices(&self) -> bool {
-        self.plan_info
-            .as_ref()
-            .map(|plan| plan.has_overdue_invoices)
-            .unwrap_or_default()
-    }
-
-    pub fn is_usage_based_billing_enabled(&self) -> bool {
-        self.plan_info
-            .as_ref()
-            .map(|plan| plan.is_usage_based_billing_enabled)
-            .unwrap_or_default()
-    }
-
-    pub fn model_request_usage(&self) -> Option<ModelRequestUsage> {
-        if self.plan().is_some_and(|plan| plan.is_v2()) {
-            return None;
-        }
-
-        self.model_request_usage
-    }
-
-    pub fn update_model_request_usage(&mut self, usage: ModelRequestUsage, cx: &mut Context<Self>) {
-        self.model_request_usage = Some(usage);
-        cx.notify();
-    }
-
-    pub fn edit_prediction_usage(&self) -> Option<EditPredictionUsage> {
-        self.edit_prediction_usage
-    }
-
-    pub fn update_edit_prediction_usage(
-        &mut self,
-        usage: EditPredictionUsage,
-        cx: &mut Context<Self>,
-    ) {
-        self.edit_prediction_usage = Some(usage);
-        cx.notify();
-    }
-
-    pub fn clear_plan_and_usage(&mut self) {
-        self.plan_info = None;
-        self.model_request_usage = None;
-        self.edit_prediction_usage = None;
-    }
-
-    fn update_authenticated_user(
-        &mut self,
-        response: GetAuthenticatedUserResponse,
-        cx: &mut Context<Self>,
-    ) {
-        let staff = response.user.is_staff && !*feature_flags::ZED_DISABLE_STAFF;
-        cx.update_flags(staff, response.feature_flags);
-        if let Some(client) = self.client.upgrade() {
-            client
-                .telemetry
-                .set_authenticated_user_info(Some(response.user.metrics_id.clone()), staff);
-        }
-
-        self.model_request_usage = Some(ModelRequestUsage(RequestUsage {
-            limit: response.plan.usage.model_requests.limit,
-            amount: response.plan.usage.model_requests.used as i32,
-        }));
-        self.edit_prediction_usage = Some(EditPredictionUsage(RequestUsage {
-            limit: response.plan.usage.edit_predictions.limit,
-            amount: response.plan.usage.edit_predictions.used as i32,
-        }));
-        self.plan_info = Some(response.plan);
-        cx.emit(Event::PrivateUserInfoUpdated);
-    }
-
-    fn handle_message_to_client(this: WeakEntity<Self>, message: &MessageToClient, cx: &App) {
-        cx.spawn(async move |cx| {
-            match message {
-                MessageToClient::UserUpdated => {
-                    let cloud_client = cx
-                        .update(|cx| {
-                            this.read_with(cx, |this, _cx| {
-                                this.client.upgrade().map(|client| client.cloud_client())
-                            })
-                        })??
-                        .ok_or(anyhow::anyhow!("Failed to get Cloud client"))?;
-
-                    let response = cloud_client.get_authenticated_user().await?;
-                    cx.update(|cx| {
-                        this.update(cx, |this, cx| {
-                            this.update_authenticated_user(response, cx);
-                        })
-                    })??;
-                }
-            }
-
-            anyhow::Ok(())
-        })
-        .detach_and_log_err(cx);
-    }
-
-    pub fn watch_current_user(&self) -> watch::Receiver<Option<Arc<User>>> {
-        self.current_user.clone()
-    }
-
-    fn load_users(
-        &self,
-        request: impl RequestMessage<Response = UsersResponse>,
-        cx: &Context<Self>,
-    ) -> Task<Result<Vec<Arc<User>>>> {
-        let client = self.client.clone();
-        cx.spawn(async move |this, cx| {
-            if let Some(rpc) = client.upgrade() {
-                let response = rpc.request(request).await.context("error loading users")?;
-                let users = response.users;
-
-                this.update(cx, |this, _| this.insert(users))
-            } else {
-                Ok(Vec::new())
-            }
-        })
-    }
-
-    pub fn insert(&mut self, users: Vec<proto::User>) -> Vec<Arc<User>> {
-        let mut ret = Vec::with_capacity(users.len());
-        for user in users {
-            let user = User::new(user);
-            if let Some(old) = self.users.insert(user.id, user.clone())
-                && old.github_login != user.github_login
-            {
-                self.by_github_login.remove(&old.github_login);
-            }
-            self.by_github_login
-                .insert(user.github_login.clone(), user.id);
-            ret.push(user)
-        }
-        ret
-    }
-
-    pub fn set_participant_indices(
-        &mut self,
-        participant_indices: HashMap<u64, ParticipantIndex>,
-        cx: &mut Context<Self>,
-    ) {
-        if participant_indices != self.participant_indices {
-            self.participant_indices = participant_indices;
-            cx.emit(Event::ParticipantIndicesChanged);
-        }
-    }
-
-    pub fn participant_indices(&self) -> &HashMap<u64, ParticipantIndex> {
-        &self.participant_indices
-    }
-
-    pub fn participant_names(
-        &self,
-        user_ids: impl Iterator<Item = u64>,
-        cx: &App,
-    ) -> HashMap<u64, SharedString> {
-        let mut ret = HashMap::default();
-        let mut missing_user_ids = Vec::new();
-        for id in user_ids {
-            if let Some(github_login) = self.get_cached_user(id).map(|u| u.github_login.clone()) {
-                ret.insert(id, github_login);
-            } else {
-                missing_user_ids.push(id)
-            }
-        }
-        if !missing_user_ids.is_empty() {
-            let this = self.weak_self.clone();
-            cx.spawn(async move |cx| {
-                this.update(cx, |this, cx| this.get_users(missing_user_ids, cx))?
-                    .await
-            })
-            .detach_and_log_err(cx);
-        }
-        ret
-    }
-}
-
-impl User {
-    fn new(message: proto::User) -> Arc<Self> {
-        Arc::new(User {
-            id: message.id,
-            github_login: message.github_login.into(),
-            avatar_uri: message.avatar_url.into(),
-            name: message.name,
-        })
-    }
-}
-
-impl Contact {
-    async fn from_proto(
-        contact: proto::Contact,
-        user_store: &Entity<UserStore>,
-        cx: &mut AsyncApp,
-    ) -> Result<Self> {
-        let user = user_store
-            .update(cx, |user_store, cx| {
-                user_store.get_user(contact.user_id, cx)
-            })?
-            .await?;
-        Ok(Self {
-            user,
-            online: contact.online,
-            busy: contact.busy,
-        })
-    }
-}
-
-impl Collaborator {
-    pub fn from_proto(message: proto::Collaborator) -> Result<Self> {
-        Ok(Self {
-            peer_id: message.peer_id.context("invalid peer id")?,
-            replica_id: ReplicaId::new(message.replica_id as u16),
-            user_id: message.user_id as UserId,
-            is_host: message.is_host,
-            committer_name: message.committer_name,
-            committer_email: message.committer_email,
-        })
-    }
-}
-
-impl RequestUsage {
-    pub fn over_limit(&self) -> bool {
-        match self.limit {
-            UsageLimit::Limited(limit) => self.amount >= limit,
-            UsageLimit::Unlimited => false,
-        }
-    }
-
-    fn from_headers(
-        limit_name: &str,
-        amount_name: &str,
-        headers: &HeaderMap<HeaderValue>,
-    ) -> Result<Self> {
-        let limit = headers
-            .get(limit_name)
-            .with_context(|| format!("missing {limit_name:?} header"))?;
-        let limit = UsageLimit::from_str(limit.to_str()?)?;
-
-        let amount = headers
-            .get(amount_name)
-            .with_context(|| format!("missing {amount_name:?} header"))?;
-        let amount = amount.to_str()?.parse::<i32>()?;
-
-        Ok(Self { limit, amount })
-    }
-}
-
-impl ModelRequestUsage {
-    pub fn from_headers(headers: &HeaderMap<HeaderValue>) -> Result<Self> {
-        Ok(Self(RequestUsage::from_headers(
-            MODEL_REQUESTS_USAGE_LIMIT_HEADER_NAME,
-            MODEL_REQUESTS_USAGE_AMOUNT_HEADER_NAME,
-            headers,
-        )?))
-    }
-}
-
-impl EditPredictionUsage {
-    pub fn from_headers(headers: &HeaderMap<HeaderValue>) -> Result<Self> {
-        Ok(Self(RequestUsage::from_headers(
-            EDIT_PREDICTIONS_USAGE_LIMIT_HEADER_NAME,
-            EDIT_PREDICTIONS_USAGE_AMOUNT_HEADER_NAME,
-            headers,
-        )?))
-    }
-}
diff --git a/crates/client/src/zed_urls.rs b/crates/client/src/zed_urls.rs
deleted file mode 100644
index 2fe4725169..0000000000
--- a/crates/client/src/zed_urls.rs
+++ /dev/null
@@ -1,69 +0,0 @@
-//! Contains helper functions for constructing URLs to various Zed-related pages.
-//!
-//! These URLs will adapt to the configured server URL in order to construct
-//! links appropriate for the environment (e.g., by linking to a local copy of
-//! zed.dev in development).
-
-use gpui::App;
-use settings::Settings;
-
-use crate::ClientSettings;
-
-fn server_url(cx: &App) -> &str {
-    &ClientSettings::get_global(cx).server_url
-}
-
-/// Returns the URL to the account page on zed.dev.
-pub fn account_url(cx: &App) -> String {
-    format!("{server_url}/account", server_url = server_url(cx))
-}
-
-/// Returns the URL to the start trial page on zed.dev.
-pub fn start_trial_url(cx: &App) -> String {
-    format!(
-        "{server_url}/account/start-trial",
-        server_url = server_url(cx)
-    )
-}
-
-/// Returns the URL to the upgrade page on zed.dev.
-pub fn upgrade_to_zed_pro_url(cx: &App) -> String {
-    format!("{server_url}/account/upgrade", server_url = server_url(cx))
-}
-
-/// Returns the URL to Zed's terms of service.
-pub fn terms_of_service(cx: &App) -> String {
-    format!("{server_url}/terms-of-service", server_url = server_url(cx))
-}
-
-/// Returns the URL to Zed AI's privacy and security docs.
-pub fn ai_privacy_and_security(cx: &App) -> String {
-    format!(
-        "{server_url}/docs/ai/privacy-and-security",
-        server_url = server_url(cx)
-    )
-}
-
-/// Returns the URL to Zed AI's external agents documentation.
-pub fn external_agents_docs(cx: &App) -> String {
-    format!(
-        "{server_url}/docs/ai/external-agents",
-        server_url = server_url(cx)
-    )
-}
-
-/// Returns the URL to Zed agent servers documentation.
-pub fn agent_server_docs(cx: &App) -> String {
-    format!(
-        "{server_url}/docs/extensions/agent-servers",
-        server_url = server_url(cx)
-    )
-}
-
-/// Returns the URL to Zed's edit prediction documentation.
-pub fn edit_prediction_docs(cx: &App) -> String {
-    format!(
-        "{server_url}/docs/ai/edit-prediction",
-        server_url = server_url(cx)
-    )
-}
diff --git a/crates/clock/Cargo.toml b/crates/clock/Cargo.toml
deleted file mode 100644
index 486cf0ba8b..0000000000
--- a/crates/clock/Cargo.toml
+++ /dev/null
@@ -1,21 +0,0 @@
-[package]
-name = "clock"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/clock.rs"
-doctest = false
-
-[features]
-test-support = ["dep:parking_lot"]
-
-[dependencies]
-parking_lot = { workspace = true, optional = true }
-serde.workspace = true
-smallvec.workspace = true
diff --git a/crates/clock/LICENSE-GPL b/crates/clock/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/clock/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/clock/src/clock.rs b/crates/clock/src/clock.rs
deleted file mode 100644
index 6526ae1d55..0000000000
--- a/crates/clock/src/clock.rs
+++ /dev/null
@@ -1,271 +0,0 @@
-mod system_clock;
-
-use serde::{Deserialize, Serialize};
-use smallvec::SmallVec;
-use std::{
-    cmp::{self, Ordering},
-    fmt,
-};
-
-pub use system_clock::*;
-
-/// A unique identifier for each distributed node.
-#[derive(Clone, Copy, Default, Eq, Hash, PartialEq, Ord, PartialOrd, Serialize, Deserialize)]
-pub struct ReplicaId(u16);
-
-impl ReplicaId {
-    /// The local replica
-    pub const LOCAL: ReplicaId = ReplicaId(0);
-    /// The remote replica of the connected remote server.
-    pub const REMOTE_SERVER: ReplicaId = ReplicaId(1);
-    /// The agent's unique identifier.
-    pub const AGENT: ReplicaId = ReplicaId(2);
-    /// A local branch.
-    pub const LOCAL_BRANCH: ReplicaId = ReplicaId(3);
-    /// The first collaborative replica ID, any replica equal or greater than this is a collaborative replica.
-    pub const FIRST_COLLAB_ID: ReplicaId = ReplicaId(8);
-
-    pub fn new(id: u16) -> Self {
-        ReplicaId(id)
-    }
-
-    pub fn as_u16(&self) -> u16 {
-        self.0
-    }
-
-    pub fn is_remote(self) -> bool {
-        self == ReplicaId::REMOTE_SERVER || self >= ReplicaId::FIRST_COLLAB_ID
-    }
-}
-
-impl fmt::Debug for ReplicaId {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        if *self == ReplicaId::LOCAL {
-            write!(f, "<local>")
-        } else if *self == ReplicaId::REMOTE_SERVER {
-            write!(f, "<remote>")
-        } else if *self == ReplicaId::AGENT {
-            write!(f, "<agent>")
-        } else if *self == ReplicaId::LOCAL_BRANCH {
-            write!(f, "<branch>")
-        } else {
-            write!(f, "{}", self.0)
-        }
-    }
-}
-
-/// A [Lamport sequence number](https://en.wikipedia.org/wiki/Lamport_timestamp).
-pub type Seq = u32;
-
-/// A [Lamport timestamp](https://en.wikipedia.org/wiki/Lamport_timestamp),
-/// used to determine the ordering of events in the editor.
-#[derive(Clone, Copy, Eq, Hash, PartialEq, Serialize, Deserialize)]
-pub struct Lamport {
-    pub replica_id: ReplicaId,
-    pub value: Seq,
-}
-
-/// A [version vector](https://en.wikipedia.org/wiki/Version_vector).
-#[derive(Clone, Default, Hash, Eq, PartialEq)]
-pub struct Global {
-    // 4 is chosen as it is the biggest count that does not increase the size of the field itself.
-    // Coincidentally, it also covers all the important non-collab replica ids.
-    values: SmallVec<[u32; 4]>,
-}
-
-impl Global {
-    pub fn new() -> Self {
-        Self::default()
-    }
-
-    /// Fetches the sequence number for the given replica ID.
-    pub fn get(&self, replica_id: ReplicaId) -> Seq {
-        self.values.get(replica_id.0 as usize).copied().unwrap_or(0) as Seq
-    }
-
-    /// Observe the lamport timestamp.
-    ///
-    /// This sets the current sequence number of the observed replica ID to the maximum of this global's observed sequence and the observed timestamp.
-    pub fn observe(&mut self, timestamp: Lamport) {
-        debug_assert_ne!(timestamp.replica_id, Lamport::MAX.replica_id);
-        if timestamp.value > 0 {
-            let new_len = timestamp.replica_id.0 as usize + 1;
-            if new_len > self.values.len() {
-                self.values.resize(new_len, 0);
-            }
-
-            let entry = &mut self.values[timestamp.replica_id.0 as usize];
-            *entry = cmp::max(*entry, timestamp.value);
-        }
-    }
-
-    /// Join another global.
-    ///
-    /// This observes all timestamps from the other global.
-    #[doc(alias = "synchronize")]
-    pub fn join(&mut self, other: &Self) {
-        if other.values.len() > self.values.len() {
-            self.values.resize(other.values.len(), 0);
-        }
-
-        for (left, right) in self.values.iter_mut().zip(&other.values) {
-            *left = cmp::max(*left, *right);
-        }
-    }
-
-    /// Meet another global.
-    ///
-    /// Sets all unobserved timestamps of this global to the sequences of other and sets all observed timestamps of this global to the minimum observed of both globals.
-    pub fn meet(&mut self, other: &Self) {
-        if other.values.len() > self.values.len() {
-            self.values.resize(other.values.len(), 0);
-        }
-
-        let mut new_len = 0;
-        for (ix, (left, &right)) in self.values.iter_mut().zip(&other.values).enumerate() {
-            match (*left, right) {
-                // left has not observed the replica
-                (0, _) => *left = right,
-                // right has not observed the replica
-                (_, 0) => (),
-                (_, _) => *left = cmp::min(*left, right),
-            }
-            if *left != 0 {
-                new_len = ix + 1;
-            }
-        }
-        if other.values.len() == self.values.len() {
-            // only truncate if other was equal or shorter (which at this point
-            // cant be due to the resize above) to `self` as otherwise we would
-            // truncate the unprocessed tail that is guaranteed to contain
-            // non-null timestamps
-            self.values.truncate(new_len);
-        }
-    }
-
-    pub fn observed(&self, timestamp: Lamport) -> bool {
-        self.get(timestamp.replica_id) >= timestamp.value
-    }
-
-    pub fn observed_any(&self, other: &Self) -> bool {
-        self.iter()
-            .zip(other.iter())
-            .any(|(left, right)| right.value > 0 && left.value >= right.value)
-    }
-
-    pub fn observed_all(&self, other: &Self) -> bool {
-        if self.values.len() < other.values.len() {
-            return false;
-        }
-        self.iter()
-            .zip(other.iter())
-            .all(|(left, right)| left.value >= right.value)
-    }
-
-    pub fn changed_since(&self, other: &Self) -> bool {
-        self.values.len() > other.values.len()
-            || self
-                .values
-                .iter()
-                .zip(other.values.iter())
-                .any(|(left, right)| left > right)
-    }
-
-    pub fn most_recent(&self) -> Option<Lamport> {
-        self.iter().max_by_key(|timestamp| timestamp.value)
-    }
-
-    /// Iterates all replicas observed by this global as well as any unobserved replicas whose ID is lower than the highest observed replica.
-    pub fn iter(&self) -> impl Iterator<Item = Lamport> + '_ {
-        self.values
-            .iter()
-            .enumerate()
-            .map(|(replica_id, seq)| Lamport {
-                replica_id: ReplicaId(replica_id as u16),
-                value: *seq,
-            })
-    }
-}
-
-impl FromIterator<Lamport> for Global {
-    fn from_iter<T: IntoIterator<Item = Lamport>>(locals: T) -> Self {
-        let mut result = Self::new();
-        for local in locals {
-            result.observe(local);
-        }
-        result
-    }
-}
-
-impl Ord for Lamport {
-    fn cmp(&self, other: &Self) -> Ordering {
-        // Use the replica id to break ties between concurrent events.
-        self.value
-            .cmp(&other.value)
-            .then_with(|| self.replica_id.cmp(&other.replica_id))
-    }
-}
-
-impl PartialOrd for Lamport {
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-impl Lamport {
-    pub const MIN: Self = Self {
-        replica_id: ReplicaId(u16::MIN),
-        value: Seq::MIN,
-    };
-
-    pub const MAX: Self = Self {
-        replica_id: ReplicaId(u16::MAX),
-        value: Seq::MAX,
-    };
-
-    pub fn new(replica_id: ReplicaId) -> Self {
-        Self {
-            value: 1,
-            replica_id,
-        }
-    }
-
-    pub fn as_u64(self) -> u64 {
-        ((self.value as u64) << 32) | (self.replica_id.0 as u64)
-    }
-
-    pub fn tick(&mut self) -> Self {
-        let timestamp = *self;
-        self.value += 1;
-        timestamp
-    }
-
-    pub fn observe(&mut self, timestamp: Self) {
-        self.value = cmp::max(self.value, timestamp.value) + 1;
-    }
-}
-
-impl fmt::Debug for Lamport {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        if *self == Self::MAX {
-            write!(f, "Lamport {{MAX}}")
-        } else if *self == Self::MIN {
-            write!(f, "Lamport {{MIN}}")
-        } else {
-            write!(f, "Lamport {{{:?}: {}}}", self.replica_id, self.value)
-        }
-    }
-}
-
-impl fmt::Debug for Global {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "Global {{")?;
-        for timestamp in self.iter().filter(|t| t.value > 0) {
-            if timestamp.replica_id.0 > 0 {
-                write!(f, ", ")?;
-            }
-            write!(f, "{:?}: {}", timestamp.replica_id, timestamp.value)?;
-        }
-        write!(f, "}}")
-    }
-}
diff --git a/crates/clock/src/system_clock.rs b/crates/clock/src/system_clock.rs
deleted file mode 100644
index b8e50d0b27..0000000000
--- a/crates/clock/src/system_clock.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-use std::time::Instant;
-
-pub trait SystemClock: Send + Sync {
-    /// Returns the current date and time in UTC.
-    fn utc_now(&self) -> Instant;
-}
-
-pub struct RealSystemClock;
-
-impl SystemClock for RealSystemClock {
-    fn utc_now(&self) -> Instant {
-        Instant::now()
-    }
-}
-
-#[cfg(any(test, feature = "test-support"))]
-pub struct FakeSystemClockState {
-    now: Instant,
-}
-
-#[cfg(any(test, feature = "test-support"))]
-pub struct FakeSystemClock {
-    // Use an unfair lock to ensure tests are deterministic.
-    state: parking_lot::Mutex<FakeSystemClockState>,
-}
-
-#[cfg(any(test, feature = "test-support"))]
-impl FakeSystemClock {
-    pub fn new() -> Self {
-        let state = FakeSystemClockState {
-            now: Instant::now(),
-        };
-
-        Self {
-            state: parking_lot::Mutex::new(state),
-        }
-    }
-
-    pub fn set_now(&self, now: Instant) {
-        self.state.lock().now = now;
-    }
-
-    pub fn advance(&self, duration: std::time::Duration) {
-        self.state.lock().now += duration;
-    }
-}
-
-#[cfg(any(test, feature = "test-support"))]
-impl SystemClock for FakeSystemClock {
-    fn utc_now(&self) -> Instant {
-        self.state.lock().now
-    }
-}
diff --git a/crates/cloud_api_client/Cargo.toml b/crates/cloud_api_client/Cargo.toml
deleted file mode 100644
index 9dc009bf2e..0000000000
--- a/crates/cloud_api_client/Cargo.toml
+++ /dev/null
@@ -1,23 +0,0 @@
-[package]
-name = "cloud_api_client"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "Apache-2.0"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/cloud_api_client.rs"
-
-[dependencies]
-anyhow.workspace = true
-cloud_api_types.workspace = true
-futures.workspace = true
-gpui.workspace = true
-gpui_tokio.workspace = true
-http_client.workspace = true
-parking_lot.workspace = true
-serde_json.workspace = true
-yawc.workspace = true
diff --git a/crates/cloud_api_client/LICENSE-APACHE b/crates/cloud_api_client/LICENSE-APACHE
deleted file mode 120000
index 1cd601d0a3..0000000000
--- a/crates/cloud_api_client/LICENSE-APACHE
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-APACHE
\ No newline at end of file
diff --git a/crates/cloud_api_client/src/cloud_api_client.rs b/crates/cloud_api_client/src/cloud_api_client.rs
deleted file mode 100644
index 9206e5e7ef..0000000000
--- a/crates/cloud_api_client/src/cloud_api_client.rs
+++ /dev/null
@@ -1,198 +0,0 @@
-mod websocket;
-
-use std::sync::Arc;
-
-use anyhow::{Context, Result, anyhow};
-use cloud_api_types::websocket_protocol::{PROTOCOL_VERSION, PROTOCOL_VERSION_HEADER_NAME};
-pub use cloud_api_types::*;
-use futures::AsyncReadExt as _;
-use gpui::{App, Task};
-use gpui_tokio::Tokio;
-use http_client::http::request;
-use http_client::{AsyncBody, HttpClientWithUrl, HttpRequestExt, Method, Request, StatusCode};
-use parking_lot::RwLock;
-use yawc::WebSocket;
-
-use crate::websocket::Connection;
-
-struct Credentials {
-    user_id: u32,
-    access_token: String,
-}
-
-pub struct CloudApiClient {
-    credentials: RwLock<Option<Credentials>>,
-    http_client: Arc<HttpClientWithUrl>,
-}
-
-impl CloudApiClient {
-    pub fn new(http_client: Arc<HttpClientWithUrl>) -> Self {
-        Self {
-            credentials: RwLock::new(None),
-            http_client,
-        }
-    }
-
-    pub fn has_credentials(&self) -> bool {
-        self.credentials.read().is_some()
-    }
-
-    pub fn set_credentials(&self, user_id: u32, access_token: String) {
-        *self.credentials.write() = Some(Credentials {
-            user_id,
-            access_token,
-        });
-    }
-
-    pub fn clear_credentials(&self) {
-        *self.credentials.write() = None;
-    }
-
-    fn build_request(
-        &self,
-        req: request::Builder,
-        body: impl Into<AsyncBody>,
-    ) -> Result<Request<AsyncBody>> {
-        let credentials = self.credentials.read();
-        let credentials = credentials.as_ref().context("no credentials provided")?;
-        build_request(req, body, credentials)
-    }
-
-    pub async fn get_authenticated_user(&self) -> Result<GetAuthenticatedUserResponse> {
-        let request = self.build_request(
-            Request::builder().method(Method::GET).uri(
-                self.http_client
-                    .build_zed_cloud_url("/client/users/me")?
-                    .as_ref(),
-            ),
-            AsyncBody::default(),
-        )?;
-
-        let mut response = self.http_client.send(request).await?;
-
-        if !response.status().is_success() {
-            let mut body = String::new();
-            response.body_mut().read_to_string(&mut body).await?;
-
-            anyhow::bail!(
-                "Failed to get authenticated user.\nStatus: {:?}\nBody: {body}",
-                response.status()
-            )
-        }
-
-        let mut body = String::new();
-        response.body_mut().read_to_string(&mut body).await?;
-
-        Ok(serde_json::from_str(&body)?)
-    }
-
-    pub fn connect(&self, cx: &App) -> Result<Task<Result<Connection>>> {
-        let mut connect_url = self
-            .http_client
-            .build_zed_cloud_url("/client/users/connect")?;
-        connect_url
-            .set_scheme(match connect_url.scheme() {
-                "https" => "wss",
-                "http" => "ws",
-                scheme => Err(anyhow!("invalid URL scheme: {scheme}"))?,
-            })
-            .map_err(|_| anyhow!("failed to set URL scheme"))?;
-
-        let credentials = self.credentials.read();
-        let credentials = credentials.as_ref().context("no credentials provided")?;
-        let authorization_header = format!("{} {}", credentials.user_id, credentials.access_token);
-
-        Ok(Tokio::spawn_result(cx, async move {
-            let ws = WebSocket::connect(connect_url)
-                .with_request(
-                    request::Builder::new()
-                        .header("Authorization", authorization_header)
-                        .header(PROTOCOL_VERSION_HEADER_NAME, PROTOCOL_VERSION.to_string()),
-                )
-                .await?;
-
-            Ok(Connection::new(ws))
-        }))
-    }
-
-    pub async fn create_llm_token(
-        &self,
-        system_id: Option<String>,
-    ) -> Result<CreateLlmTokenResponse> {
-        let request_builder = Request::builder()
-            .method(Method::POST)
-            .uri(
-                self.http_client
-                    .build_zed_cloud_url("/client/llm_tokens")?
-                    .as_ref(),
-            )
-            .when_some(system_id, |builder, system_id| {
-                builder.header(ZED_SYSTEM_ID_HEADER_NAME, system_id)
-            });
-
-        let request = self.build_request(request_builder, AsyncBody::default())?;
-
-        let mut response = self.http_client.send(request).await?;
-
-        if !response.status().is_success() {
-            let mut body = String::new();
-            response.body_mut().read_to_string(&mut body).await?;
-
-            anyhow::bail!(
-                "Failed to create LLM token.\nStatus: {:?}\nBody: {body}",
-                response.status()
-            )
-        }
-
-        let mut body = String::new();
-        response.body_mut().read_to_string(&mut body).await?;
-
-        Ok(serde_json::from_str(&body)?)
-    }
-
-    pub async fn validate_credentials(&self, user_id: u32, access_token: &str) -> Result<bool> {
-        let request = build_request(
-            Request::builder().method(Method::GET).uri(
-                self.http_client
-                    .build_zed_cloud_url("/client/users/me")?
-                    .as_ref(),
-            ),
-            AsyncBody::default(),
-            &Credentials {
-                user_id,
-                access_token: access_token.into(),
-            },
-        )?;
-
-        let mut response = self.http_client.send(request).await?;
-
-        if response.status().is_success() {
-            Ok(true)
-        } else {
-            let mut body = String::new();
-            response.body_mut().read_to_string(&mut body).await?;
-            if response.status() == StatusCode::UNAUTHORIZED {
-                Ok(false)
-            } else {
-                Err(anyhow!(
-                    "Failed to get authenticated user.\nStatus: {:?}\nBody: {body}",
-                    response.status()
-                ))
-            }
-        }
-    }
-}
-
-fn build_request(
-    req: request::Builder,
-    body: impl Into<AsyncBody>,
-    credentials: &Credentials,
-) -> Result<Request<AsyncBody>> {
-    Ok(req
-        .header("Content-Type", "application/json")
-        .header(
-            "Authorization",
-            format!("{} {}", credentials.user_id, credentials.access_token),
-        )
-        .body(body.into())?)
-}
diff --git a/crates/cloud_api_client/src/websocket.rs b/crates/cloud_api_client/src/websocket.rs
deleted file mode 100644
index 48a628db78..0000000000
--- a/crates/cloud_api_client/src/websocket.rs
+++ /dev/null
@@ -1,73 +0,0 @@
-use std::pin::Pin;
-use std::time::Duration;
-
-use anyhow::Result;
-use cloud_api_types::websocket_protocol::MessageToClient;
-use futures::channel::mpsc::unbounded;
-use futures::stream::{SplitSink, SplitStream};
-use futures::{FutureExt as _, SinkExt as _, Stream, StreamExt as _, TryStreamExt as _, pin_mut};
-use gpui::{App, BackgroundExecutor, Task};
-use yawc::WebSocket;
-use yawc::frame::{FrameView, OpCode};
-
-const KEEPALIVE_INTERVAL: Duration = Duration::from_secs(1);
-
-pub type MessageStream = Pin<Box<dyn Stream<Item = Result<MessageToClient>>>>;
-
-pub struct Connection {
-    tx: SplitSink<WebSocket, FrameView>,
-    rx: SplitStream<WebSocket>,
-}
-
-impl Connection {
-    pub fn new(ws: WebSocket) -> Self {
-        let (tx, rx) = ws.split();
-
-        Self { tx, rx }
-    }
-
-    pub fn spawn(self, cx: &App) -> (MessageStream, Task<()>) {
-        let (mut tx, rx) = (self.tx, self.rx);
-
-        let (message_tx, message_rx) = unbounded();
-
-        let handle_io = |executor: BackgroundExecutor| async move {
-            // Send messages on this frequency so the connection isn't closed.
-            let keepalive_timer = executor.timer(KEEPALIVE_INTERVAL).fuse();
-            futures::pin_mut!(keepalive_timer);
-
-            let rx = rx.fuse();
-            pin_mut!(rx);
-
-            loop {
-                futures::select_biased! {
-                    _ = keepalive_timer => {
-                        let _ = tx.send(FrameView::ping(Vec::new())).await;
-
-                        keepalive_timer.set(executor.timer(KEEPALIVE_INTERVAL).fuse());
-                    }
-                    frame = rx.next() => {
-                        let Some(frame) = frame else {
-                            break;
-                        };
-
-                        match frame.opcode {
-                            OpCode::Binary => {
-                                let message_result = MessageToClient::deserialize(&frame.payload);
-                                message_tx.unbounded_send(message_result).ok();
-                            }
-                            OpCode::Close => {
-                                break;
-                            }
-                            _ => {}
-                        }
-                    }
-                }
-            }
-        };
-
-        let task = cx.spawn(async move |cx| handle_io(cx.background_executor().clone()).await);
-
-        (message_rx.into_stream().boxed(), task)
-    }
-}
diff --git a/crates/cloud_api_types/Cargo.toml b/crates/cloud_api_types/Cargo.toml
deleted file mode 100644
index 46d5d109b1..0000000000
--- a/crates/cloud_api_types/Cargo.toml
+++ /dev/null
@@ -1,23 +0,0 @@
-[package]
-name = "cloud_api_types"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "Apache-2.0"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/cloud_api_types.rs"
-
-[dependencies]
-anyhow.workspace = true
-chrono.workspace = true
-ciborium.workspace = true
-cloud_llm_client.workspace = true
-serde.workspace = true
-
-[dev-dependencies]
-pretty_assertions.workspace = true
-serde_json.workspace = true
diff --git a/crates/cloud_api_types/LICENSE-APACHE b/crates/cloud_api_types/LICENSE-APACHE
deleted file mode 120000
index 1cd601d0a3..0000000000
--- a/crates/cloud_api_types/LICENSE-APACHE
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-APACHE
\ No newline at end of file
diff --git a/crates/cloud_api_types/src/cloud_api_types.rs b/crates/cloud_api_types/src/cloud_api_types.rs
deleted file mode 100644
index fddf505f10..0000000000
--- a/crates/cloud_api_types/src/cloud_api_types.rs
+++ /dev/null
@@ -1,65 +0,0 @@
-mod timestamp;
-pub mod websocket_protocol;
-
-use cloud_llm_client::Plan;
-use serde::{Deserialize, Serialize};
-
-pub use crate::timestamp::Timestamp;
-
-pub const ZED_SYSTEM_ID_HEADER_NAME: &str = "x-zed-system-id";
-
-#[derive(Debug, PartialEq, Serialize, Deserialize)]
-pub struct GetAuthenticatedUserResponse {
-    pub user: AuthenticatedUser,
-    pub feature_flags: Vec<String>,
-    pub plan: PlanInfo,
-}
-
-#[derive(Debug, PartialEq, Serialize, Deserialize)]
-pub struct AuthenticatedUser {
-    pub id: i32,
-    pub metrics_id: String,
-    pub avatar_url: String,
-    pub github_login: String,
-    pub name: Option<String>,
-    pub is_staff: bool,
-    pub accepted_tos_at: Option<Timestamp>,
-}
-
-#[derive(Debug, PartialEq, Serialize, Deserialize)]
-pub struct PlanInfo {
-    pub plan: cloud_llm_client::PlanV1,
-    #[serde(default)]
-    pub plan_v2: Option<cloud_llm_client::PlanV2>,
-    pub subscription_period: Option<SubscriptionPeriod>,
-    pub usage: cloud_llm_client::CurrentUsage,
-    pub trial_started_at: Option<Timestamp>,
-    pub is_usage_based_billing_enabled: bool,
-    pub is_account_too_young: bool,
-    pub has_overdue_invoices: bool,
-}
-
-impl PlanInfo {
-    pub fn plan(&self) -> Plan {
-        self.plan_v2.map(Plan::V2).unwrap_or(Plan::V1(self.plan))
-    }
-}
-
-#[derive(Debug, PartialEq, Clone, Copy, Serialize, Deserialize)]
-pub struct SubscriptionPeriod {
-    pub started_at: Timestamp,
-    pub ended_at: Timestamp,
-}
-
-#[derive(Debug, PartialEq, Serialize, Deserialize)]
-pub struct AcceptTermsOfServiceResponse {
-    pub user: AuthenticatedUser,
-}
-
-#[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]
-pub struct LlmToken(pub String);
-
-#[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]
-pub struct CreateLlmTokenResponse {
-    pub token: LlmToken,
-}
diff --git a/crates/cloud_api_types/src/timestamp.rs b/crates/cloud_api_types/src/timestamp.rs
deleted file mode 100644
index 1f055d58ef..0000000000
--- a/crates/cloud_api_types/src/timestamp.rs
+++ /dev/null
@@ -1,166 +0,0 @@
-use chrono::{DateTime, NaiveDateTime, SecondsFormat, Utc};
-use serde::{Deserialize, Deserializer, Serialize, Serializer};
-
-/// A timestamp with a serialized representation in RFC 3339 format.
-#[derive(Debug, PartialEq, Eq, Hash, Clone, Copy)]
-pub struct Timestamp(pub DateTime<Utc>);
-
-impl Timestamp {
-    pub fn new(datetime: DateTime<Utc>) -> Self {
-        Self(datetime)
-    }
-}
-
-impl From<DateTime<Utc>> for Timestamp {
-    fn from(value: DateTime<Utc>) -> Self {
-        Self(value)
-    }
-}
-
-impl From<NaiveDateTime> for Timestamp {
-    fn from(value: NaiveDateTime) -> Self {
-        Self(value.and_utc())
-    }
-}
-
-impl Serialize for Timestamp {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        let rfc3339_string = self.0.to_rfc3339_opts(SecondsFormat::Millis, true);
-        serializer.serialize_str(&rfc3339_string)
-    }
-}
-
-impl<'de> Deserialize<'de> for Timestamp {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        let value = String::deserialize(deserializer)?;
-        let datetime = DateTime::parse_from_rfc3339(&value)
-            .map_err(serde::de::Error::custom)?
-            .to_utc();
-        Ok(Self(datetime))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use chrono::NaiveDate;
-    use pretty_assertions::assert_eq;
-
-    use super::*;
-
-    #[test]
-    fn test_timestamp_serialization() {
-        let datetime = DateTime::parse_from_rfc3339("2023-12-25T14:30:45.123Z")
-            .unwrap()
-            .to_utc();
-        let timestamp = Timestamp::new(datetime);
-
-        let json = serde_json::to_string(&timestamp).unwrap();
-        assert_eq!(json, "\"2023-12-25T14:30:45.123Z\"");
-    }
-
-    #[test]
-    fn test_timestamp_deserialization() {
-        let json = "\"2023-12-25T14:30:45.123Z\"";
-        let timestamp: Timestamp = serde_json::from_str(json).unwrap();
-
-        let expected = DateTime::parse_from_rfc3339("2023-12-25T14:30:45.123Z")
-            .unwrap()
-            .to_utc();
-
-        assert_eq!(timestamp.0, expected);
-    }
-
-    #[test]
-    fn test_timestamp_roundtrip() {
-        let original = DateTime::parse_from_rfc3339("2023-12-25T14:30:45.123Z")
-            .unwrap()
-            .to_utc();
-
-        let timestamp = Timestamp::new(original);
-        let json = serde_json::to_string(&timestamp).unwrap();
-        let deserialized: Timestamp = serde_json::from_str(&json).unwrap();
-
-        assert_eq!(deserialized.0, original);
-    }
-
-    #[test]
-    fn test_timestamp_from_datetime_utc() {
-        let datetime = DateTime::parse_from_rfc3339("2023-12-25T14:30:45.123Z")
-            .unwrap()
-            .to_utc();
-
-        let timestamp = Timestamp::from(datetime);
-        assert_eq!(timestamp.0, datetime);
-    }
-
-    #[test]
-    fn test_timestamp_from_naive_datetime() {
-        let naive_dt = NaiveDate::from_ymd_opt(2023, 12, 25)
-            .unwrap()
-            .and_hms_milli_opt(14, 30, 45, 123)
-            .unwrap();
-
-        let timestamp = Timestamp::from(naive_dt);
-        let expected = naive_dt.and_utc();
-
-        assert_eq!(timestamp.0, expected);
-    }
-
-    #[test]
-    fn test_timestamp_serialization_with_microseconds() {
-        // Test that microseconds are truncated to milliseconds
-        let datetime = NaiveDate::from_ymd_opt(2023, 12, 25)
-            .unwrap()
-            .and_hms_micro_opt(14, 30, 45, 123456)
-            .unwrap()
-            .and_utc();
-
-        let timestamp = Timestamp::new(datetime);
-        let json = serde_json::to_string(&timestamp).unwrap();
-
-        // Should be truncated to milliseconds
-        assert_eq!(json, "\"2023-12-25T14:30:45.123Z\"");
-    }
-
-    #[test]
-    fn test_timestamp_deserialization_without_milliseconds() {
-        let json = "\"2023-12-25T14:30:45Z\"";
-        let timestamp: Timestamp = serde_json::from_str(json).unwrap();
-
-        let expected = NaiveDate::from_ymd_opt(2023, 12, 25)
-            .unwrap()
-            .and_hms_opt(14, 30, 45)
-            .unwrap()
-            .and_utc();
-
-        assert_eq!(timestamp.0, expected);
-    }
-
-    #[test]
-    fn test_timestamp_deserialization_with_timezone() {
-        let json = "\"2023-12-25T14:30:45.123+05:30\"";
-        let timestamp: Timestamp = serde_json::from_str(json).unwrap();
-
-        // Should be converted to UTC
-        let expected = NaiveDate::from_ymd_opt(2023, 12, 25)
-            .unwrap()
-            .and_hms_milli_opt(9, 0, 45, 123) // 14:30:45 + 5:30 = 20:00:45, but we want UTC so subtract 5:30
-            .unwrap()
-            .and_utc();
-
-        assert_eq!(timestamp.0, expected);
-    }
-
-    #[test]
-    fn test_timestamp_deserialization_with_invalid_format() {
-        let json = "\"invalid-date\"";
-        let result: Result<Timestamp, _> = serde_json::from_str(json);
-        assert!(result.is_err());
-    }
-}
diff --git a/crates/cloud_api_types/src/websocket_protocol.rs b/crates/cloud_api_types/src/websocket_protocol.rs
deleted file mode 100644
index 75f6a73b43..0000000000
--- a/crates/cloud_api_types/src/websocket_protocol.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-use anyhow::{Context as _, Result};
-use serde::{Deserialize, Serialize};
-
-/// The version of the Cloud WebSocket protocol.
-pub const PROTOCOL_VERSION: u32 = 0;
-
-/// The name of the header used to indicate the protocol version in use.
-pub const PROTOCOL_VERSION_HEADER_NAME: &str = "x-zed-protocol-version";
-
-/// A message from Cloud to the Zed client.
-#[derive(Debug, Serialize, Deserialize)]
-pub enum MessageToClient {
-    /// The user was updated and should be refreshed.
-    UserUpdated,
-}
-
-impl MessageToClient {
-    pub fn serialize(&self) -> Result<Vec<u8>> {
-        let mut buffer = Vec::new();
-        ciborium::into_writer(self, &mut buffer).context("failed to serialize message")?;
-
-        Ok(buffer)
-    }
-
-    pub fn deserialize(data: &[u8]) -> Result<Self> {
-        ciborium::from_reader(data).context("failed to deserialize message")
-    }
-}
diff --git a/crates/cloud_llm_client/Cargo.toml b/crates/cloud_llm_client/Cargo.toml
deleted file mode 100644
index c6a551a1fb..0000000000
--- a/crates/cloud_llm_client/Cargo.toml
+++ /dev/null
@@ -1,27 +0,0 @@
-[package]
-name = "cloud_llm_client"
-version = "0.1.0"
-publish.workspace = true
-edition.workspace = true
-license = "Apache-2.0"
-
-[features]
-test-support = []
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/cloud_llm_client.rs"
-
-[dependencies]
-anyhow.workspace = true
-chrono.workspace = true
-serde = { workspace = true, features = ["derive", "rc"] }
-serde_json.workspace = true
-strum = { workspace = true, features = ["derive"] }
-uuid = { workspace = true, features = ["serde"] }
-
-[dev-dependencies]
-pretty_assertions.workspace = true
-indoc.workspace = true
diff --git a/crates/cloud_llm_client/LICENSE-APACHE b/crates/cloud_llm_client/LICENSE-APACHE
deleted file mode 120000
index 1cd601d0a3..0000000000
--- a/crates/cloud_llm_client/LICENSE-APACHE
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-APACHE
\ No newline at end of file
diff --git a/crates/cloud_llm_client/src/cloud_llm_client.rs b/crates/cloud_llm_client/src/cloud_llm_client.rs
deleted file mode 100644
index 917929a985..0000000000
--- a/crates/cloud_llm_client/src/cloud_llm_client.rs
+++ /dev/null
@@ -1,464 +0,0 @@
-pub mod predict_edits_v3;
-
-use std::str::FromStr;
-use std::sync::Arc;
-
-use anyhow::Context as _;
-use serde::{Deserialize, Serialize};
-use strum::{Display, EnumIter, EnumString};
-use uuid::Uuid;
-
-/// The name of the header used to indicate which version of Zed the client is running.
-pub const ZED_VERSION_HEADER_NAME: &str = "x-zed-version";
-
-/// The name of the header used to indicate when a request failed due to an
-/// expired LLM token.
-///
-/// The client may use this as a signal to refresh the token.
-pub const EXPIRED_LLM_TOKEN_HEADER_NAME: &str = "x-zed-expired-token";
-
-/// The name of the header used to indicate what plan the user is currently on.
-pub const CURRENT_PLAN_HEADER_NAME: &str = "x-zed-plan";
-
-/// The name of the header used to indicate the usage limit for model requests.
-pub const MODEL_REQUESTS_USAGE_LIMIT_HEADER_NAME: &str = "x-zed-model-requests-usage-limit";
-
-/// The name of the header used to indicate the usage amount for model requests.
-pub const MODEL_REQUESTS_USAGE_AMOUNT_HEADER_NAME: &str = "x-zed-model-requests-usage-amount";
-
-/// The name of the header used to indicate the usage limit for edit predictions.
-pub const EDIT_PREDICTIONS_USAGE_LIMIT_HEADER_NAME: &str = "x-zed-edit-predictions-usage-limit";
-
-/// The name of the header used to indicate the usage amount for edit predictions.
-pub const EDIT_PREDICTIONS_USAGE_AMOUNT_HEADER_NAME: &str = "x-zed-edit-predictions-usage-amount";
-
-/// The name of the header used to indicate the resource for which the subscription limit has been reached.
-pub const SUBSCRIPTION_LIMIT_RESOURCE_HEADER_NAME: &str = "x-zed-subscription-limit-resource";
-
-pub const MODEL_REQUESTS_RESOURCE_HEADER_VALUE: &str = "model_requests";
-pub const EDIT_PREDICTIONS_RESOURCE_HEADER_VALUE: &str = "edit_predictions";
-
-/// The name of the header used to indicate that the maximum number of consecutive tool uses has been reached.
-pub const TOOL_USE_LIMIT_REACHED_HEADER_NAME: &str = "x-zed-tool-use-limit-reached";
-
-/// The name of the header used to indicate the minimum required Zed version.
-///
-/// This can be used to force a Zed upgrade in order to continue communicating
-/// with the LLM service.
-pub const MINIMUM_REQUIRED_VERSION_HEADER_NAME: &str = "x-zed-minimum-required-version";
-
-/// The name of the header used by the client to indicate to the server that it supports receiving status messages.
-pub const CLIENT_SUPPORTS_STATUS_MESSAGES_HEADER_NAME: &str =
-    "x-zed-client-supports-status-messages";
-
-/// The name of the header used by the server to indicate to the client that it supports sending status messages.
-pub const SERVER_SUPPORTS_STATUS_MESSAGES_HEADER_NAME: &str =
-    "x-zed-server-supports-status-messages";
-
-/// The name of the header used by the client to indicate that it supports receiving xAI models.
-pub const CLIENT_SUPPORTS_X_AI_HEADER_NAME: &str = "x-zed-client-supports-x-ai";
-
-/// The maximum number of edit predictions that can be rejected per request.
-pub const MAX_EDIT_PREDICTION_REJECTIONS_PER_REQUEST: usize = 100;
-
-#[derive(Debug, PartialEq, Clone, Copy, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum UsageLimit {
-    Limited(i32),
-    Unlimited,
-}
-
-impl FromStr for UsageLimit {
-    type Err = anyhow::Error;
-
-    fn from_str(value: &str) -> Result<Self, Self::Err> {
-        match value {
-            "unlimited" => Ok(Self::Unlimited),
-            limit => limit
-                .parse::<i32>()
-                .map(Self::Limited)
-                .context("failed to parse limit"),
-        }
-    }
-}
-
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub enum Plan {
-    V1(PlanV1),
-    V2(PlanV2),
-}
-
-impl Plan {
-    pub fn is_v2(&self) -> bool {
-        matches!(self, Self::V2(_))
-    }
-}
-
-#[derive(Debug, Clone, Copy, Default, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum PlanV1 {
-    #[default]
-    #[serde(alias = "Free")]
-    ZedFree,
-    #[serde(alias = "ZedPro")]
-    ZedPro,
-    #[serde(alias = "ZedProTrial")]
-    ZedProTrial,
-}
-
-impl FromStr for PlanV1 {
-    type Err = anyhow::Error;
-
-    fn from_str(value: &str) -> Result<Self, Self::Err> {
-        match value {
-            "zed_free" => Ok(Self::ZedFree),
-            "zed_pro" => Ok(Self::ZedPro),
-            "zed_pro_trial" => Ok(Self::ZedProTrial),
-            plan => Err(anyhow::anyhow!("invalid plan: {plan:?}")),
-        }
-    }
-}
-
-#[derive(Debug, Clone, Copy, Default, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum PlanV2 {
-    #[default]
-    ZedFree,
-    ZedPro,
-    ZedProTrial,
-}
-
-impl FromStr for PlanV2 {
-    type Err = anyhow::Error;
-
-    fn from_str(value: &str) -> Result<Self, Self::Err> {
-        match value {
-            "zed_free" => Ok(Self::ZedFree),
-            "zed_pro" => Ok(Self::ZedPro),
-            "zed_pro_trial" => Ok(Self::ZedProTrial),
-            plan => Err(anyhow::anyhow!("invalid plan: {plan:?}")),
-        }
-    }
-}
-
-#[derive(
-    Debug, PartialEq, Eq, Hash, Clone, Copy, Serialize, Deserialize, EnumString, EnumIter, Display,
-)]
-#[serde(rename_all = "snake_case")]
-#[strum(serialize_all = "snake_case")]
-pub enum LanguageModelProvider {
-    Anthropic,
-    OpenAi,
-    Google,
-    XAi,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct PredictEditsBody {
-    #[serde(skip_serializing_if = "Option::is_none", default)]
-    pub outline: Option<String>,
-    pub input_events: String,
-    pub input_excerpt: String,
-    #[serde(skip_serializing_if = "Option::is_none", default)]
-    pub speculated_output: Option<String>,
-    /// Whether the user provided consent for sampling this interaction.
-    #[serde(default, alias = "data_collection_permission")]
-    pub can_collect_data: bool,
-    #[serde(skip_serializing_if = "Option::is_none", default)]
-    pub diagnostic_groups: Option<Vec<(String, serde_json::Value)>>,
-    /// Info about the git repository state, only present when can_collect_data is true.
-    #[serde(skip_serializing_if = "Option::is_none", default)]
-    pub git_info: Option<PredictEditsGitInfo>,
-    /// The trigger for this request.
-    #[serde(default)]
-    pub trigger: PredictEditsRequestTrigger,
-}
-
-#[derive(Default, Debug, Clone, Copy, Serialize, Deserialize)]
-pub enum PredictEditsRequestTrigger {
-    Diagnostics,
-    Cli,
-    #[default]
-    Other,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct PredictEditsGitInfo {
-    /// SHA of git HEAD commit at time of prediction.
-    #[serde(skip_serializing_if = "Option::is_none", default)]
-    pub head_sha: Option<String>,
-    /// URL of the remote called `origin`.
-    #[serde(skip_serializing_if = "Option::is_none", default)]
-    pub remote_origin_url: Option<String>,
-    /// URL of the remote called `upstream`.
-    #[serde(skip_serializing_if = "Option::is_none", default)]
-    pub remote_upstream_url: Option<String>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct PredictEditsResponse {
-    pub request_id: String,
-    pub output_excerpt: String,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct AcceptEditPredictionBody {
-    pub request_id: String,
-}
-
-#[derive(Debug, Clone, Deserialize)]
-pub struct RejectEditPredictionsBody {
-    pub rejections: Vec<EditPredictionRejection>,
-}
-
-#[derive(Debug, Clone, Serialize)]
-pub struct RejectEditPredictionsBodyRef<'a> {
-    pub rejections: &'a [EditPredictionRejection],
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-pub struct EditPredictionRejection {
-    pub request_id: String,
-    #[serde(default)]
-    pub reason: EditPredictionRejectReason,
-    pub was_shown: bool,
-}
-
-#[derive(Default, Debug, Clone, Copy, Serialize, Deserialize, PartialEq)]
-pub enum EditPredictionRejectReason {
-    /// New requests were triggered before this one completed
-    Canceled,
-    /// No edits returned
-    Empty,
-    /// Edits returned, but none remained after interpolation
-    InterpolatedEmpty,
-    /// The new prediction was preferred over the current one
-    Replaced,
-    /// The current prediction was preferred over the new one
-    CurrentPreferred,
-    /// The current prediction was discarded
-    #[default]
-    Discarded,
-}
-
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum CompletionMode {
-    Normal,
-    Max,
-}
-
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum CompletionIntent {
-    UserPrompt,
-    ToolResults,
-    ThreadSummarization,
-    ThreadContextSummarization,
-    CreateFile,
-    EditFile,
-    InlineAssist,
-    TerminalInlineAssist,
-    GenerateGitCommitMessage,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct CompletionBody {
-    #[serde(skip_serializing_if = "Option::is_none", default)]
-    pub thread_id: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", default)]
-    pub prompt_id: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none", default)]
-    pub intent: Option<CompletionIntent>,
-    #[serde(skip_serializing_if = "Option::is_none", default)]
-    pub mode: Option<CompletionMode>,
-    pub provider: LanguageModelProvider,
-    pub model: String,
-    pub provider_request: serde_json::Value,
-}
-
-#[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum CompletionRequestStatus {
-    Queued {
-        position: usize,
-    },
-    Started,
-    Failed {
-        code: String,
-        message: String,
-        request_id: Uuid,
-        /// Retry duration in seconds.
-        retry_after: Option<f64>,
-    },
-    UsageUpdated {
-        amount: usize,
-        limit: UsageLimit,
-    },
-    ToolUseLimitReached,
-}
-
-#[derive(Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum CompletionEvent<T> {
-    Status(CompletionRequestStatus),
-    Event(T),
-}
-
-impl<T> CompletionEvent<T> {
-    pub fn into_status(self) -> Option<CompletionRequestStatus> {
-        match self {
-            Self::Status(status) => Some(status),
-            Self::Event(_) => None,
-        }
-    }
-
-    pub fn into_event(self) -> Option<T> {
-        match self {
-            Self::Event(event) => Some(event),
-            Self::Status(_) => None,
-        }
-    }
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct WebSearchBody {
-    pub query: String,
-}
-
-#[derive(Debug, Serialize, Deserialize, Clone)]
-pub struct WebSearchResponse {
-    pub results: Vec<WebSearchResult>,
-}
-
-#[derive(Debug, Serialize, Deserialize, Clone)]
-pub struct WebSearchResult {
-    pub title: String,
-    pub url: String,
-    pub text: String,
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct CountTokensBody {
-    pub provider: LanguageModelProvider,
-    pub model: String,
-    pub provider_request: serde_json::Value,
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct CountTokensResponse {
-    pub tokens: usize,
-}
-
-#[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize, Deserialize)]
-pub struct LanguageModelId(pub Arc<str>);
-
-impl std::fmt::Display for LanguageModelId {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-pub struct LanguageModel {
-    pub provider: LanguageModelProvider,
-    pub id: LanguageModelId,
-    pub display_name: String,
-    pub max_token_count: usize,
-    pub max_token_count_in_max_mode: Option<usize>,
-    pub max_output_tokens: usize,
-    pub supports_tools: bool,
-    pub supports_images: bool,
-    pub supports_thinking: bool,
-    pub supports_max_mode: bool,
-    // only used by OpenAI and xAI
-    #[serde(default)]
-    pub supports_parallel_tool_calls: bool,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct ListModelsResponse {
-    pub models: Vec<LanguageModel>,
-    pub default_model: Option<LanguageModelId>,
-    pub default_fast_model: Option<LanguageModelId>,
-    pub recommended_models: Vec<LanguageModelId>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct GetSubscriptionResponse {
-    pub plan: PlanV1,
-    pub usage: Option<CurrentUsage>,
-}
-
-#[derive(Debug, PartialEq, Serialize, Deserialize)]
-pub struct CurrentUsage {
-    pub model_requests: UsageData,
-    pub edit_predictions: UsageData,
-}
-
-#[derive(Debug, PartialEq, Serialize, Deserialize)]
-pub struct UsageData {
-    pub used: u32,
-    pub limit: UsageLimit,
-}
-
-#[cfg(test)]
-mod tests {
-    use pretty_assertions::assert_eq;
-    use serde_json::json;
-
-    use super::*;
-
-    #[test]
-    fn test_plan_v1_deserialize_snake_case() {
-        let plan = serde_json::from_value::<PlanV1>(json!("zed_free")).unwrap();
-        assert_eq!(plan, PlanV1::ZedFree);
-
-        let plan = serde_json::from_value::<PlanV1>(json!("zed_pro")).unwrap();
-        assert_eq!(plan, PlanV1::ZedPro);
-
-        let plan = serde_json::from_value::<PlanV1>(json!("zed_pro_trial")).unwrap();
-        assert_eq!(plan, PlanV1::ZedProTrial);
-    }
-
-    #[test]
-    fn test_plan_v1_deserialize_aliases() {
-        let plan = serde_json::from_value::<PlanV1>(json!("Free")).unwrap();
-        assert_eq!(plan, PlanV1::ZedFree);
-
-        let plan = serde_json::from_value::<PlanV1>(json!("ZedPro")).unwrap();
-        assert_eq!(plan, PlanV1::ZedPro);
-
-        let plan = serde_json::from_value::<PlanV1>(json!("ZedProTrial")).unwrap();
-        assert_eq!(plan, PlanV1::ZedProTrial);
-    }
-
-    #[test]
-    fn test_plan_v2_deserialize_snake_case() {
-        let plan = serde_json::from_value::<PlanV2>(json!("zed_free")).unwrap();
-        assert_eq!(plan, PlanV2::ZedFree);
-
-        let plan = serde_json::from_value::<PlanV2>(json!("zed_pro")).unwrap();
-        assert_eq!(plan, PlanV2::ZedPro);
-
-        let plan = serde_json::from_value::<PlanV2>(json!("zed_pro_trial")).unwrap();
-        assert_eq!(plan, PlanV2::ZedProTrial);
-    }
-
-    #[test]
-    fn test_usage_limit_from_str() {
-        let limit = UsageLimit::from_str("unlimited").unwrap();
-        assert!(matches!(limit, UsageLimit::Unlimited));
-
-        let limit = UsageLimit::from_str(&0.to_string()).unwrap();
-        assert!(matches!(limit, UsageLimit::Limited(0)));
-
-        let limit = UsageLimit::from_str(&50.to_string()).unwrap();
-        assert!(matches!(limit, UsageLimit::Limited(50)));
-
-        for value in ["not_a_number", "50xyz"] {
-            let limit = UsageLimit::from_str(value);
-            assert!(limit.is_err());
-        }
-    }
-}
diff --git a/crates/cloud_llm_client/src/predict_edits_v3.rs b/crates/cloud_llm_client/src/predict_edits_v3.rs
deleted file mode 100644
index 9e590dc4cf..0000000000
--- a/crates/cloud_llm_client/src/predict_edits_v3.rs
+++ /dev/null
@@ -1,298 +0,0 @@
-use chrono::Duration;
-use serde::{Deserialize, Serialize};
-use std::{
-    fmt::{Display, Write as _},
-    ops::{Add, Range, Sub},
-    path::Path,
-    sync::Arc,
-};
-use strum::EnumIter;
-use uuid::Uuid;
-
-use crate::{PredictEditsGitInfo, PredictEditsRequestTrigger};
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct PlanContextRetrievalRequest {
-    pub excerpt: String,
-    pub excerpt_path: Arc<Path>,
-    pub excerpt_line_range: Range<Line>,
-    pub cursor_file_max_row: Line,
-    pub events: Vec<Arc<Event>>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct PredictEditsRequest {
-    pub excerpt: String,
-    pub excerpt_path: Arc<Path>,
-    /// Within file
-    pub excerpt_range: Range<usize>,
-    pub excerpt_line_range: Range<Line>,
-    pub cursor_point: Point,
-    /// Within `signatures`
-    pub excerpt_parent: Option<usize>,
-    #[serde(skip_serializing_if = "Vec::is_empty", default)]
-    pub related_files: Vec<RelatedFile>,
-    pub events: Vec<Arc<Event>>,
-    #[serde(default)]
-    pub can_collect_data: bool,
-    /// Info about the git repository state, only present when can_collect_data is true.
-    #[serde(skip_serializing_if = "Option::is_none", default)]
-    pub git_info: Option<PredictEditsGitInfo>,
-    // Only available to staff
-    #[serde(default)]
-    pub debug_info: bool,
-    #[serde(skip_serializing_if = "Option::is_none", default)]
-    pub prompt_max_bytes: Option<usize>,
-    #[serde(default)]
-    pub prompt_format: PromptFormat,
-    #[serde(default)]
-    pub trigger: PredictEditsRequestTrigger,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct RelatedFile {
-    pub path: Arc<Path>,
-    pub max_row: Line,
-    pub excerpts: Vec<Excerpt>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct Excerpt {
-    pub start_line: Line,
-    pub text: Arc<str>,
-}
-
-#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, EnumIter)]
-pub enum PromptFormat {
-    /// XML old_tex/new_text
-    OldTextNewText,
-    /// Prompt format intended for use via edit_prediction_cli
-    OnlySnippets,
-    /// One-sentence instructions used in fine-tuned models
-    Minimal,
-    /// One-sentence instructions + FIM-like template
-    MinimalQwen,
-    /// No instructions, Qwen chat + Seed-Coder 1120 FIM-like template
-    SeedCoder1120,
-}
-
-impl PromptFormat {
-    pub const DEFAULT: PromptFormat = PromptFormat::Minimal;
-}
-
-impl Default for PromptFormat {
-    fn default() -> Self {
-        Self::DEFAULT
-    }
-}
-
-impl PromptFormat {
-    pub fn iter() -> impl Iterator<Item = Self> {
-        <Self as strum::IntoEnumIterator>::iter()
-    }
-}
-
-impl std::fmt::Display for PromptFormat {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            PromptFormat::OnlySnippets => write!(f, "Only Snippets"),
-            PromptFormat::OldTextNewText => write!(f, "Old Text / New Text"),
-            PromptFormat::Minimal => write!(f, "Minimal"),
-            PromptFormat::MinimalQwen => write!(f, "Minimal + Qwen FIM"),
-            PromptFormat::SeedCoder1120 => write!(f, "Seed-Coder 1120"),
-        }
-    }
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[cfg_attr(any(test, feature = "test-support"), derive(PartialEq))]
-#[serde(tag = "event")]
-pub enum Event {
-    BufferChange {
-        path: Arc<Path>,
-        old_path: Arc<Path>,
-        diff: String,
-        predicted: bool,
-        in_open_source_repo: bool,
-    },
-}
-
-impl Display for Event {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Event::BufferChange {
-                path,
-                old_path,
-                diff,
-                predicted,
-                ..
-            } => {
-                if *predicted {
-                    write!(
-                        f,
-                        "// User accepted prediction:\n--- a/{}\n+++ b/{}\n{diff}",
-                        DiffPathFmt(old_path),
-                        DiffPathFmt(path)
-                    )
-                } else {
-                    write!(
-                        f,
-                        "--- a/{}\n+++ b/{}\n{diff}",
-                        DiffPathFmt(old_path),
-                        DiffPathFmt(path)
-                    )
-                }
-            }
-        }
-    }
-}
-
-/// always format the Path as a unix path with `/` as the path sep in Diffs
-pub struct DiffPathFmt<'a>(pub &'a Path);
-
-impl<'a> std::fmt::Display for DiffPathFmt<'a> {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let mut is_first = true;
-        for component in self.0.components() {
-            if !is_first {
-                f.write_char('/')?;
-            } else {
-                is_first = false;
-            }
-            write!(f, "{}", component.as_os_str().display())?;
-        }
-        Ok(())
-    }
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct PredictEditsResponse {
-    pub request_id: Uuid,
-    pub edits: Vec<Edit>,
-    pub debug_info: Option<DebugInfo>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct DebugInfo {
-    pub prompt: String,
-    pub prompt_planning_time: Duration,
-    pub model_response: String,
-    pub inference_time: Duration,
-    pub parsing_time: Duration,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct Edit {
-    pub path: Arc<Path>,
-    pub range: Range<Line>,
-    pub content: String,
-}
-
-#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, PartialOrd, Eq, Ord)]
-pub struct Point {
-    pub line: Line,
-    pub column: u32,
-}
-
-#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, PartialOrd, Eq, Ord)]
-#[serde(transparent)]
-pub struct Line(pub u32);
-
-impl Add for Line {
-    type Output = Self;
-
-    fn add(self, rhs: Self) -> Self::Output {
-        Self(self.0 + rhs.0)
-    }
-}
-
-impl Sub for Line {
-    type Output = Self;
-
-    fn sub(self, rhs: Self) -> Self::Output {
-        Self(self.0 - rhs.0)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use indoc::indoc;
-    use pretty_assertions::assert_eq;
-
-    #[test]
-    fn test_event_display() {
-        let ev = Event::BufferChange {
-            path: Path::new("untitled").into(),
-            old_path: Path::new("untitled").into(),
-            diff: "@@ -1,2 +1,2 @@\n-a\n-b\n".into(),
-            predicted: false,
-            in_open_source_repo: true,
-        };
-        assert_eq!(
-            ev.to_string(),
-            indoc! {"
-                --- a/untitled
-                +++ b/untitled
-                @@ -1,2 +1,2 @@
-                -a
-                -b
-            "}
-        );
-
-        let ev = Event::BufferChange {
-            path: Path::new("foo/bar.txt").into(),
-            old_path: Path::new("foo/bar.txt").into(),
-            diff: "@@ -1,2 +1,2 @@\n-a\n-b\n".into(),
-            predicted: false,
-            in_open_source_repo: true,
-        };
-        assert_eq!(
-            ev.to_string(),
-            indoc! {"
-                --- a/foo/bar.txt
-                +++ b/foo/bar.txt
-                @@ -1,2 +1,2 @@
-                -a
-                -b
-            "}
-        );
-
-        let ev = Event::BufferChange {
-            path: Path::new("abc.txt").into(),
-            old_path: Path::new("123.txt").into(),
-            diff: "@@ -1,2 +1,2 @@\n-a\n-b\n".into(),
-            predicted: false,
-            in_open_source_repo: true,
-        };
-        assert_eq!(
-            ev.to_string(),
-            indoc! {"
-                --- a/123.txt
-                +++ b/abc.txt
-                @@ -1,2 +1,2 @@
-                -a
-                -b
-            "}
-        );
-
-        let ev = Event::BufferChange {
-            path: Path::new("abc.txt").into(),
-            old_path: Path::new("123.txt").into(),
-            diff: "@@ -1,2 +1,2 @@\n-a\n-b\n".into(),
-            predicted: true,
-            in_open_source_repo: true,
-        };
-        assert_eq!(
-            ev.to_string(),
-            indoc! {"
-                // User accepted prediction:
-                --- a/123.txt
-                +++ b/abc.txt
-                @@ -1,2 +1,2 @@
-                -a
-                -b
-            "}
-        );
-    }
-}
diff --git a/crates/codestral/Cargo.toml b/crates/codestral/Cargo.toml
deleted file mode 100644
index 7f3bf3b22d..0000000000
--- a/crates/codestral/Cargo.toml
+++ /dev/null
@@ -1,27 +0,0 @@
-[package]
-name = "codestral"
-version = "0.1.0"
-edition = "2021"
-publish = false
-license = "GPL-3.0-or-later"
-
-[lib]
-path = "src/codestral.rs"
-
-[dependencies]
-anyhow.workspace = true
-edit_prediction_types.workspace = true
-edit_prediction_context.workspace = true
-futures.workspace = true
-gpui.workspace = true
-http_client.workspace = true
-language.workspace = true
-language_models.workspace = true
-log.workspace = true
-mistral.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-smol.workspace = true
-text.workspace = true
-
-[dev-dependencies]
diff --git a/crates/codestral/LICENSE-GPL b/crates/codestral/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/codestral/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/codestral/src/codestral.rs b/crates/codestral/src/codestral.rs
deleted file mode 100644
index 9bf0296ac3..0000000000
--- a/crates/codestral/src/codestral.rs
+++ /dev/null
@@ -1,396 +0,0 @@
-use anyhow::{Context as _, Result};
-use edit_prediction_context::{EditPredictionExcerpt, EditPredictionExcerptOptions};
-use edit_prediction_types::{Direction, EditPrediction, EditPredictionDelegate};
-use futures::AsyncReadExt;
-use gpui::{App, Context, Entity, Task};
-use http_client::HttpClient;
-use language::{
-    language_settings::all_language_settings, Anchor, Buffer, BufferSnapshot, EditPreview, ToPoint,
-};
-use language_models::MistralLanguageModelProvider;
-use mistral::CODESTRAL_API_URL;
-use serde::{Deserialize, Serialize};
-use std::{
-    ops::Range,
-    sync::Arc,
-    time::{Duration, Instant},
-};
-use text::ToOffset;
-
-pub const DEBOUNCE_TIMEOUT: Duration = Duration::from_millis(150);
-
-const EXCERPT_OPTIONS: EditPredictionExcerptOptions = EditPredictionExcerptOptions {
-    max_bytes: 1050,
-    min_bytes: 525,
-    target_before_cursor_over_total_bytes: 0.66,
-};
-
-/// Represents a completion that has been received and processed from Codestral.
-/// This struct maintains the state needed to interpolate the completion as the user types.
-#[derive(Clone)]
-struct CurrentCompletion {
-    /// The buffer snapshot at the time the completion was generated.
-    /// Used to detect changes and interpolate edits.
-    snapshot: BufferSnapshot,
-    /// The edits that should be applied to transform the original text into the predicted text.
-    /// Each edit is a range in the buffer and the text to replace it with.
-    edits: Arc<[(Range<Anchor>, Arc<str>)]>,
-    /// Preview of how the buffer will look after applying the edits.
-    edit_preview: EditPreview,
-}
-
-impl CurrentCompletion {
-    /// Attempts to adjust the edits based on changes made to the buffer since the completion was generated.
-    /// Returns None if the user's edits conflict with the predicted edits.
-    fn interpolate(&self, new_snapshot: &BufferSnapshot) -> Option<Vec<(Range<Anchor>, Arc<str>)>> {
-        edit_prediction_types::interpolate_edits(&self.snapshot, new_snapshot, &self.edits)
-    }
-}
-
-pub struct CodestralEditPredictionDelegate {
-    http_client: Arc<dyn HttpClient>,
-    pending_request: Option<Task<Result<()>>>,
-    current_completion: Option<CurrentCompletion>,
-}
-
-impl CodestralEditPredictionDelegate {
-    pub fn new(http_client: Arc<dyn HttpClient>) -> Self {
-        Self {
-            http_client,
-            pending_request: None,
-            current_completion: None,
-        }
-    }
-
-    pub fn has_api_key(cx: &App) -> bool {
-        Self::api_key(cx).is_some()
-    }
-
-    /// This is so we can immediately show Codestral as a provider users can
-    /// switch to in the edit prediction menu, if the API has been added
-    pub fn ensure_api_key_loaded(http_client: Arc<dyn HttpClient>, cx: &mut App) {
-        MistralLanguageModelProvider::global(http_client, cx)
-            .load_codestral_api_key(cx)
-            .detach();
-    }
-
-    fn api_key(cx: &App) -> Option<Arc<str>> {
-        MistralLanguageModelProvider::try_global(cx)
-            .and_then(|provider| provider.codestral_api_key(CODESTRAL_API_URL, cx))
-    }
-
-    /// Uses Codestral's Fill-in-the-Middle API for code completion.
-    async fn fetch_completion(
-        http_client: Arc<dyn HttpClient>,
-        api_key: &str,
-        prompt: String,
-        suffix: String,
-        model: String,
-        max_tokens: Option<u32>,
-        api_url: String,
-    ) -> Result<String> {
-        let start_time = Instant::now();
-
-        log::debug!(
-            "Codestral: Requesting completion (model: {}, max_tokens: {:?})",
-            model,
-            max_tokens
-        );
-
-        let request = CodestralRequest {
-            model,
-            prompt,
-            suffix: if suffix.is_empty() {
-                None
-            } else {
-                Some(suffix)
-            },
-            max_tokens: max_tokens.or(Some(350)),
-            temperature: Some(0.2),
-            top_p: Some(1.0),
-            stream: Some(false),
-            stop: None,
-            random_seed: None,
-            min_tokens: None,
-        };
-
-        let request_body = serde_json::to_string(&request)?;
-
-        log::debug!("Codestral: Sending FIM request");
-
-        let http_request = http_client::Request::builder()
-            .method(http_client::Method::POST)
-            .uri(format!("{}/v1/fim/completions", api_url))
-            .header("Content-Type", "application/json")
-            .header("Authorization", format!("Bearer {}", api_key))
-            .body(http_client::AsyncBody::from(request_body))?;
-
-        let mut response = http_client.send(http_request).await?;
-        let status = response.status();
-
-        log::debug!("Codestral: Response status: {}", status);
-
-        if !status.is_success() {
-            let mut body = String::new();
-            response.body_mut().read_to_string(&mut body).await?;
-            return Err(anyhow::anyhow!(
-                "Codestral API error: {} - {}",
-                status,
-                body
-            ));
-        }
-
-        let mut body = String::new();
-        response.body_mut().read_to_string(&mut body).await?;
-
-        let codestral_response: CodestralResponse = serde_json::from_str(&body)?;
-
-        let elapsed = start_time.elapsed();
-
-        if let Some(choice) = codestral_response.choices.first() {
-            let completion = &choice.message.content;
-
-            log::debug!(
-                "Codestral: Completion received ({} tokens, {:.2}s)",
-                codestral_response.usage.completion_tokens,
-                elapsed.as_secs_f64()
-            );
-
-            // Return just the completion text for insertion at cursor
-            Ok(completion.clone())
-        } else {
-            log::error!("Codestral: No completion returned in response");
-            Err(anyhow::anyhow!("No completion returned from Codestral"))
-        }
-    }
-}
-
-impl EditPredictionDelegate for CodestralEditPredictionDelegate {
-    fn name() -> &'static str {
-        "codestral"
-    }
-
-    fn display_name() -> &'static str {
-        "Codestral"
-    }
-
-    fn show_predictions_in_menu() -> bool {
-        true
-    }
-
-    fn is_enabled(&self, _buffer: &Entity<Buffer>, _cursor_position: Anchor, cx: &App) -> bool {
-        Self::api_key(cx).is_some()
-    }
-
-    fn is_refreshing(&self, _cx: &App) -> bool {
-        self.pending_request.is_some()
-    }
-
-    fn refresh(
-        &mut self,
-        buffer: Entity<Buffer>,
-        cursor_position: language::Anchor,
-        debounce: bool,
-        cx: &mut Context<Self>,
-    ) {
-        log::debug!("Codestral: Refresh called (debounce: {})", debounce);
-
-        let Some(api_key) = Self::api_key(cx) else {
-            log::warn!("Codestral: No API key configured, skipping refresh");
-            return;
-        };
-
-        let snapshot = buffer.read(cx).snapshot();
-
-        // Check if current completion is still valid
-        if let Some(current_completion) = self.current_completion.as_ref() {
-            if current_completion.interpolate(&snapshot).is_some() {
-                return;
-            }
-        }
-
-        let http_client = self.http_client.clone();
-
-        // Get settings
-        let settings = all_language_settings(None, cx);
-        let model = settings
-            .edit_predictions
-            .codestral
-            .model
-            .clone()
-            .unwrap_or_else(|| "codestral-latest".to_string());
-        let max_tokens = settings.edit_predictions.codestral.max_tokens;
-        let api_url = settings
-            .edit_predictions
-            .codestral
-            .api_url
-            .clone()
-            .unwrap_or_else(|| CODESTRAL_API_URL.to_string());
-
-        self.pending_request = Some(cx.spawn(async move |this, cx| {
-            if debounce {
-                log::debug!("Codestral: Debouncing for {:?}", DEBOUNCE_TIMEOUT);
-                smol::Timer::after(DEBOUNCE_TIMEOUT).await;
-            }
-
-            let cursor_offset = cursor_position.to_offset(&snapshot);
-            let cursor_point = cursor_offset.to_point(&snapshot);
-            let excerpt = EditPredictionExcerpt::select_from_buffer(
-                cursor_point,
-                &snapshot,
-                &EXCERPT_OPTIONS,
-            )
-            .context("Line containing cursor doesn't fit in excerpt max bytes")?;
-
-            let excerpt_text = excerpt.text(&snapshot);
-            let cursor_within_excerpt = cursor_offset
-                .saturating_sub(excerpt.range.start)
-                .min(excerpt_text.body.len());
-            let prompt = excerpt_text.body[..cursor_within_excerpt].to_string();
-            let suffix = excerpt_text.body[cursor_within_excerpt..].to_string();
-
-            let completion_text = match Self::fetch_completion(
-                http_client,
-                &api_key,
-                prompt,
-                suffix,
-                model,
-                max_tokens,
-                api_url,
-            )
-            .await
-            {
-                Ok(completion) => completion,
-                Err(e) => {
-                    log::error!("Codestral: Failed to fetch completion: {}", e);
-                    this.update(cx, |this, cx| {
-                        this.pending_request = None;
-                        cx.notify();
-                    })?;
-                    return Err(e);
-                }
-            };
-
-            if completion_text.trim().is_empty() {
-                log::debug!("Codestral: Completion was empty after trimming; ignoring");
-                this.update(cx, |this, cx| {
-                    this.pending_request = None;
-                    cx.notify();
-                })?;
-                return Ok(());
-            }
-
-            let edits: Arc<[(Range<Anchor>, Arc<str>)]> =
-                vec![(cursor_position..cursor_position, completion_text.into())].into();
-            let edit_preview = buffer
-                .read_with(cx, |buffer, cx| buffer.preview_edits(edits.clone(), cx))?
-                .await;
-
-            this.update(cx, |this, cx| {
-                this.current_completion = Some(CurrentCompletion {
-                    snapshot,
-                    edits,
-                    edit_preview,
-                });
-                this.pending_request = None;
-                cx.notify();
-            })?;
-
-            Ok(())
-        }));
-    }
-
-    fn cycle(
-        &mut self,
-        _buffer: Entity<Buffer>,
-        _cursor_position: Anchor,
-        _direction: Direction,
-        _cx: &mut Context<Self>,
-    ) {
-        // Codestral doesn't support multiple completions, so cycling does nothing
-    }
-
-    fn accept(&mut self, _cx: &mut Context<Self>) {
-        log::debug!("Codestral: Completion accepted");
-        self.pending_request = None;
-        self.current_completion = None;
-    }
-
-    fn discard(&mut self, _cx: &mut Context<Self>) {
-        log::debug!("Codestral: Completion discarded");
-        self.pending_request = None;
-        self.current_completion = None;
-    }
-
-    /// Returns the completion suggestion, adjusted or invalidated based on user edits
-    fn suggest(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        _cursor_position: Anchor,
-        cx: &mut Context<Self>,
-    ) -> Option<EditPrediction> {
-        let current_completion = self.current_completion.as_ref()?;
-        let buffer = buffer.read(cx);
-        let edits = current_completion.interpolate(&buffer.snapshot())?;
-        if edits.is_empty() {
-            return None;
-        }
-        Some(EditPrediction::Local {
-            id: None,
-            edits,
-            edit_preview: Some(current_completion.edit_preview.clone()),
-        })
-    }
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct CodestralRequest {
-    pub model: String,
-    pub prompt: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub suffix: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub max_tokens: Option<u32>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub temperature: Option<f32>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub top_p: Option<f32>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub stream: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub stop: Option<Vec<String>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub random_seed: Option<u32>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub min_tokens: Option<u32>,
-}
-
-#[derive(Debug, Deserialize)]
-pub struct CodestralResponse {
-    pub id: String,
-    pub object: String,
-    pub model: String,
-    pub usage: Usage,
-    pub created: u64,
-    pub choices: Vec<Choice>,
-}
-
-#[derive(Debug, Deserialize)]
-pub struct Usage {
-    pub prompt_tokens: u32,
-    pub completion_tokens: u32,
-    pub total_tokens: u32,
-}
-
-#[derive(Debug, Deserialize)]
-pub struct Choice {
-    pub index: u32,
-    pub message: Message,
-    pub finish_reason: String,
-}
-
-#[derive(Debug, Deserialize)]
-pub struct Message {
-    pub content: String,
-    pub role: String,
-}
diff --git a/crates/collab/.env.toml b/crates/collab/.env.toml
deleted file mode 100644
index 325beb28fc..0000000000
--- a/crates/collab/.env.toml
+++ /dev/null
@@ -1,24 +0,0 @@
-DATABASE_URL = "postgres://postgres@localhost/zed"
-# DATABASE_URL = "sqlite:////root/0/zed/db.sqlite3?mode=rwc"
-DATABASE_MAX_CONNECTIONS = 5
-HTTP_PORT = 8080
-API_TOKEN = "secret"
-INVITE_LINK_PREFIX = "http://localhost:3000/invites/"
-ZED_ENVIRONMENT = "development"
-LIVEKIT_SERVER = "http://localhost:7880"
-LIVEKIT_KEY = "devkey"
-LIVEKIT_SECRET = "secret"
-BLOB_STORE_ACCESS_KEY = "the-blob-store-access-key"
-BLOB_STORE_SECRET_KEY = "the-blob-store-secret-key"
-BLOB_STORE_BUCKET = "the-extensions-bucket"
-BLOB_STORE_URL = "http://127.0.0.1:9000"
-BLOB_STORE_REGION = "the-region"
-ZED_CLIENT_CHECKSUM_SEED = "development-checksum-seed"
-SEED_PATH = "crates/collab/seed.default.json"
-LLM_DATABASE_URL = "postgres://postgres@localhost/zed_llm"
-LLM_DATABASE_MAX_CONNECTIONS = 5
-LLM_API_SECRET = "llm-secret"
-OPENAI_API_KEY = "llm-secret"
-
-# RUST_LOG=info
-# LOG_JSON=true
diff --git a/crates/collab/Cargo.toml b/crates/collab/Cargo.toml
deleted file mode 100644
index 79fc21fe33..0000000000
--- a/crates/collab/Cargo.toml
+++ /dev/null
@@ -1,131 +0,0 @@
-[package]
-authors = ["Nathan Sobo <nathan@zed.dev>"]
-default-run = "collab"
-edition.workspace = true
-name = "collab"
-version = "0.44.0"
-publish.workspace = true
-license = "AGPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[[bin]]
-name = "collab"
-
-[features]
-sqlite = ["sea-orm/sqlx-sqlite", "sqlx/sqlite"]
-test-support = ["sqlite"]
-
-[dependencies]
-anyhow.workspace = true
-async-trait.workspace = true
-async-tungstenite = { workspace = true, features = ["tokio", "tokio-rustls-manual-roots" ] }
-aws-config = { version = "1.1.5" }
-aws-sdk-kinesis = "1.51.0"
-aws-sdk-s3 = { version = "1.15.0" }
-axum = { version = "0.6", features = ["json", "headers", "ws"] }
-axum-extra = { version = "0.4", features = ["erased-json"] }
-base64.workspace = true
-chrono.workspace = true
-clock.workspace = true
-collections.workspace = true
-dashmap.workspace = true
-envy = "0.4.2"
-futures.workspace = true
-gpui.workspace = true
-hex.workspace = true
-http_client.workspace = true
-livekit_api.workspace = true
-log.workspace = true
-nanoid.workspace = true
-parking_lot.workspace = true
-prometheus = "0.14"
-prost.workspace = true
-rand.workspace = true
-reqwest = { version = "0.11", features = ["json"] }
-reqwest_client.workspace = true
-rpc.workspace = true
-scrypt = "0.11"
-# sea-orm and sea-orm-macros versions must match exactly.
-sea-orm = { version = "=1.1.10", features = ["sqlx-postgres", "postgres-array", "runtime-tokio-rustls", "with-uuid"] }
-sea-orm-macros = "=1.1.10"
-semver.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-sha2.workspace = true
-sqlx = { version = "0.8", features = ["runtime-tokio-rustls", "postgres", "json", "time", "uuid", "any"] }
-strum.workspace = true
-subtle.workspace = true
-supermaven_api.workspace = true
-telemetry_events.workspace = true
-text.workspace = true
-time.workspace = true
-tokio = { workspace = true, features = ["full"] }
-toml.workspace = true
-tower = "0.4"
-tower-http = { workspace = true, features = ["trace"] }
-tracing.workspace = true
-tracing-subscriber = { version = "0.3.18", features = ["env-filter", "json", "registry", "tracing-log"] } # workaround for https://github.com/tokio-rs/tracing/issues/2927
-util.workspace = true
-uuid.workspace = true
-
-[dev-dependencies]
-agent_settings.workspace = true
-assistant_text_thread.workspace = true
-assistant_slash_command.workspace = true
-async-trait.workspace = true
-audio.workspace = true
-buffer_diff.workspace = true
-call = { workspace = true, features = ["test-support"] }
-channel.workspace = true
-client = { workspace = true, features = ["test-support"] }
-collab_ui = { workspace = true, features = ["test-support"] }
-collections = { workspace = true, features = ["test-support"] }
-command_palette_hooks.workspace = true
-context_server.workspace = true
-ctor.workspace = true
-dap = { workspace = true, features = ["test-support"] }
-dap_adapters = { workspace = true, features = ["test-support"] }
-dap-types.workspace = true
-debugger_ui = { workspace = true, features = ["test-support"] }
-editor = { workspace = true, features = ["test-support"] }
-extension.workspace = true
-file_finder.workspace = true
-fs = { workspace = true, features = ["test-support"] }
-git = { workspace = true, features = ["test-support"] }
-git_hosting_providers.workspace = true
-git_ui = { workspace = true, features = ["test-support"] }
-gpui = { workspace = true, features = ["test-support"] }
-gpui_tokio.workspace = true
-hyper.workspace = true
-indoc.workspace = true
-language = { workspace = true, features = ["test-support"] }
-language_model = { workspace = true, features = ["test-support"] }
-livekit_client =  { workspace = true, features = ["test-support"] }
-lsp = { workspace = true, features = ["test-support"] }
-menu.workspace = true
-multi_buffer = { workspace = true, features = ["test-support"] }
-node_runtime.workspace = true
-notifications = { workspace = true, features = ["test-support"] }
-pretty_assertions.workspace = true
-project = { workspace = true, features = ["test-support"] }
-prompt_store.workspace = true
-recent_projects.workspace = true
-release_channel.workspace = true
-remote = { workspace = true, features = ["test-support"] }
-remote_server.workspace = true
-rpc = { workspace = true, features = ["test-support"] }
-sea-orm = { version = "=1.1.10", features = ["sqlx-sqlite"] }
-serde_json.workspace = true
-session = { workspace = true, features = ["test-support"] }
-settings = { workspace = true, features = ["test-support"] }
-smol.workspace = true
-sqlx = { version = "0.8", features = ["sqlite"] }
-task.workspace = true
-theme.workspace = true
-unindent.workspace = true
-util.workspace = true
-workspace = { workspace = true, features = ["test-support"] }
-worktree = { workspace = true, features = ["test-support"] }
-zlog.workspace = true
diff --git a/crates/collab/LICENSE-AGPL b/crates/collab/LICENSE-AGPL
deleted file mode 120000
index 5f5cf25dc4..0000000000
--- a/crates/collab/LICENSE-AGPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-AGPL
\ No newline at end of file
diff --git a/crates/collab/README.md b/crates/collab/README.md
deleted file mode 100644
index 902c9841e2..0000000000
--- a/crates/collab/README.md
+++ /dev/null
@@ -1,65 +0,0 @@
-# Zed Server
-
-This crate is what we run at https://collab.zed.dev.
-
-It contains our back-end logic for collaboration, to which we connect from the Zed client via a websocket after authenticating via https://zed.dev, which is a separate repo running on Vercel.
-
-# Local Development
-
-## Database setup
-
-Before you can run the collab server locally, you'll need to set up a zed Postgres database. Follow the steps sequentially:
-
-1. Ensure you have postgres installed. If not, install with `brew install postgresql@15`.
-2. Follow the steps on Brew's formula and verify your `$PATH` contains `/opt/homebrew/opt/postgresql@15/bin`.
-3. If you hadn't done it before, create the `postgres` user with `createuser -s postgres`.
-4. You are now ready to run the `bootstrap` script:
-
-```sh
-script/bootstrap
-```
-
-This script will set up the `zed` Postgres database, and populate it with some users. It requires internet access, because it fetches some users from the GitHub API.
-
-The script will create several _admin_ users, who you'll sign in as by default when developing locally. The GitHub logins for the default users are specified in the `seed.default.json` file.
-
-To use a different set of admin users, create `crates/collab/seed.json`.
-
-```json
-{
-  "admins": ["yourgithubhere"],
-  "channels": ["zed"]
-}
-```
-
-## Testing collaborative features locally
-
-In one terminal, run Zed's collaboration server and the livekit dev server:
-
-```sh
-foreman start
-```
-
-In a second terminal, run two or more instances of Zed.
-
-```sh
-script/zed-local -2
-```
-
-This script starts one to four instances of Zed, depending on the `-2`, `-3` or `-4` flags. Each instance will be connected to the local `collab` server, signed in as a different user from `seed.json` or `seed.default.json`.
-
-# Deployment
-
-We run two instances of collab:
-
-- Staging (https://staging-collab.zed.dev)
-- Production (https://collab.zed.dev)
-
-Both of these run on the Kubernetes cluster hosted in Digital Ocean.
-
-Deployment is triggered by pushing to the `collab-staging` (or `collab-production`) tag in GitHub. The best way to do this is:
-
-- `./script/deploy-collab staging`
-- `./script/deploy-collab production`
-
-You can tell what is currently deployed with `./script/what-is-deployed`.
diff --git a/crates/collab/k8s/collab.template.yml b/crates/collab/k8s/collab.template.yml
deleted file mode 100644
index 751decf5ff..0000000000
--- a/crates/collab/k8s/collab.template.yml
+++ /dev/null
@@ -1,241 +0,0 @@
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: ${ZED_KUBE_NAMESPACE}
-
----
-kind: Service
-apiVersion: v1
-metadata:
-  namespace: ${ZED_KUBE_NAMESPACE}
-  name: ${ZED_SERVICE_NAME}
-  annotations:
-    service.beta.kubernetes.io/do-loadbalancer-name: "${ZED_SERVICE_NAME}-${ZED_KUBE_NAMESPACE}"
-    service.beta.kubernetes.io/do-loadbalancer-size-unit: "${ZED_LOAD_BALANCER_SIZE_UNIT}"
-    service.beta.kubernetes.io/do-loadbalancer-tls-ports: "443"
-    service.beta.kubernetes.io/do-loadbalancer-certificate-id: ${ZED_DO_CERTIFICATE_ID}
-    service.beta.kubernetes.io/do-loadbalancer-disable-lets-encrypt-dns-records: "true"
-spec:
-  type: LoadBalancer
-  selector:
-    app: ${ZED_SERVICE_NAME}
-  ports:
-    - name: web
-      protocol: TCP
-      port: 443
-      targetPort: 8080
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  namespace: ${ZED_KUBE_NAMESPACE}
-  name: ${ZED_SERVICE_NAME}
-
-spec:
-  replicas: 1
-  strategy:
-    type: RollingUpdate
-    rollingUpdate:
-      maxSurge: 1
-      maxUnavailable: 0
-  selector:
-    matchLabels:
-      app: ${ZED_SERVICE_NAME}
-  template:
-    metadata:
-      labels:
-        app: ${ZED_SERVICE_NAME}
-    spec:
-      containers:
-        - name: ${ZED_SERVICE_NAME}
-          image: "${ZED_IMAGE_ID}"
-          args:
-            - serve
-            - ${ZED_SERVICE_NAME}
-          ports:
-            - containerPort: 8080
-              protocol: TCP
-          livenessProbe:
-            httpGet:
-              path: /healthz
-              port: 8080
-            initialDelaySeconds: 5
-            periodSeconds: 5
-            timeoutSeconds: 5
-          readinessProbe:
-            httpGet:
-              path: /
-              port: 8080
-            initialDelaySeconds: 1
-            periodSeconds: 1
-          startupProbe:
-            httpGet:
-              path: /
-              port: 8080
-            initialDelaySeconds: 1
-            periodSeconds: 1
-            failureThreshold: 15
-          env:
-            - name: HTTP_PORT
-              value: "8080"
-            - name: DATABASE_URL
-              valueFrom:
-                secretKeyRef:
-                  name: database
-                  key: url
-            - name: DATABASE_MAX_CONNECTIONS
-              value: "${DATABASE_MAX_CONNECTIONS}"
-            - name: API_TOKEN
-              valueFrom:
-                secretKeyRef:
-                  name: api
-                  key: token
-            - name: LLM_API_SECRET
-              valueFrom:
-                secretKeyRef:
-                  name: llm-token
-                  key: secret
-            - name: LLM_DATABASE_URL
-              valueFrom:
-                secretKeyRef:
-                  name: llm-database
-                  key: url
-            - name: LLM_DATABASE_MAX_CONNECTIONS
-              value: "${LLM_DATABASE_MAX_CONNECTIONS}"
-            - name: ZED_CLIENT_CHECKSUM_SEED
-              valueFrom:
-                secretKeyRef:
-                  name: zed-client
-                  key: checksum-seed
-            - name: LIVEKIT_SERVER
-              valueFrom:
-                secretKeyRef:
-                  name: livekit
-                  key: server
-            - name: LIVEKIT_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: livekit
-                  key: key
-            - name: LIVEKIT_SECRET
-              valueFrom:
-                secretKeyRef:
-                  name: livekit
-                  key: secret
-            - name: OPENAI_API_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: openai
-                  key: api_key
-            - name: ANTHROPIC_API_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: anthropic
-                  key: api_key
-            - name: ANTHROPIC_STAFF_API_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: anthropic
-                  key: staff_api_key
-            - name: LLM_CLOSED_BETA_MODEL_NAME
-              valueFrom:
-                secretKeyRef:
-                  name: llm-closed-beta
-                  key: model_name
-            - name: GOOGLE_AI_API_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: google-ai
-                  key: api_key
-            - name: PREDICTION_API_URL
-              valueFrom:
-                secretKeyRef:
-                  name: prediction
-                  key: api_url
-            - name: PREDICTION_API_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: prediction
-                  key: api_key
-            - name: PREDICTION_MODEL
-              valueFrom:
-                secretKeyRef:
-                  name: prediction
-                  key: model
-            - name: BLOB_STORE_ACCESS_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: blob-store
-                  key: access_key
-            - name: BLOB_STORE_SECRET_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: blob-store
-                  key: secret_key
-            - name: BLOB_STORE_URL
-              valueFrom:
-                secretKeyRef:
-                  name: blob-store
-                  key: url
-            - name: BLOB_STORE_REGION
-              valueFrom:
-                secretKeyRef:
-                  name: blob-store
-                  key: region
-            - name: BLOB_STORE_BUCKET
-              valueFrom:
-                secretKeyRef:
-                  name: blob-store
-                  key: bucket
-            - name: KINESIS_ACCESS_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: kinesis
-                  key: access_key
-            - name: KINESIS_SECRET_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: kinesis
-                  key: secret_key
-            - name: KINESIS_STREAM
-              valueFrom:
-                secretKeyRef:
-                  name: kinesis
-                  key: stream
-            - name: KINESIS_REGION
-              valueFrom:
-                secretKeyRef:
-                  name: kinesis
-                  key: region
-            - name: BLOB_STORE_BUCKET
-              valueFrom:
-                secretKeyRef:
-                  name: blob-store
-                  key: bucket
-            - name: COMPLETE_WITH_LANGUAGE_MODEL_RATE_LIMIT_PER_HOUR
-              value: "1000"
-            - name: SUPERMAVEN_ADMIN_API_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: supermaven
-                  key: api_key
-            - name: INVITE_LINK_PREFIX
-              value: ${INVITE_LINK_PREFIX}
-            - name: RUST_BACKTRACE
-              value: "1"
-            - name: RUST_LOG
-              value: ${RUST_LOG}
-            - name: LOG_JSON
-              value: "true"
-            - name: ZED_ENVIRONMENT
-              value: ${ZED_ENVIRONMENT}
-            - name: AUTO_JOIN_CHANNEL_ID
-              value: "${AUTO_JOIN_CHANNEL_ID}"
-          securityContext:
-            capabilities:
-              # TODO - Switch to the more restrictive `PERFMON` capability.
-              # This capability isn't yet available in a stable version of Debian.
-              add: ["SYS_ADMIN"]
-      terminationGracePeriodSeconds: 10
diff --git a/crates/collab/k8s/environments/production.sh b/crates/collab/k8s/environments/production.sh
deleted file mode 100644
index 2861f37896..0000000000
--- a/crates/collab/k8s/environments/production.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-ZED_ENVIRONMENT=production
-RUST_LOG=info
-INVITE_LINK_PREFIX=https://zed.dev/invites/
-AUTO_JOIN_CHANNEL_ID=283
-# Set DATABASE_MAX_CONNECTIONS max connections in the `deploy_collab.yml`:
-# https://github.com/zed-industries/zed/blob/main/.github/workflows/deploy_collab.yml
-LLM_DATABASE_MAX_CONNECTIONS=25
diff --git a/crates/collab/k8s/environments/staging.sh b/crates/collab/k8s/environments/staging.sh
deleted file mode 100644
index 90aadce514..0000000000
--- a/crates/collab/k8s/environments/staging.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-ZED_ENVIRONMENT=staging
-RUST_LOG=info
-INVITE_LINK_PREFIX=https://staging.zed.dev/invites/
-DATABASE_MAX_CONNECTIONS=5
-LLM_DATABASE_MAX_CONNECTIONS=5
-AUTO_JOIN_CHANNEL_ID=8
diff --git a/crates/collab/migrations.sqlite/20221109000000_test_schema.sql b/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
deleted file mode 100644
index 32a2ed2e13..0000000000
--- a/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
+++ /dev/null
@@ -1,462 +0,0 @@
-CREATE TABLE "users" (
-    "id" INTEGER PRIMARY KEY AUTOINCREMENT,
-    "github_login" VARCHAR,
-    "admin" BOOLEAN,
-    "email_address" VARCHAR(255) DEFAULT NULL,
-    "name" TEXT,
-    "invite_code" VARCHAR(64),
-    "invite_count" INTEGER NOT NULL DEFAULT 0,
-    "inviter_id" INTEGER REFERENCES users (id),
-    "connected_once" BOOLEAN NOT NULL DEFAULT false,
-    "created_at" TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "metrics_id" TEXT,
-    "github_user_id" INTEGER NOT NULL,
-    "accepted_tos_at" TIMESTAMP WITHOUT TIME ZONE,
-    "github_user_created_at" TIMESTAMP WITHOUT TIME ZONE,
-    "custom_llm_monthly_allowance_in_cents" INTEGER
-);
-
-CREATE UNIQUE INDEX "index_users_github_login" ON "users" ("github_login");
-
-CREATE UNIQUE INDEX "index_invite_code_users" ON "users" ("invite_code");
-
-CREATE INDEX "index_users_on_email_address" ON "users" ("email_address");
-
-CREATE UNIQUE INDEX "index_users_on_github_user_id" ON "users" ("github_user_id");
-
-CREATE TABLE "access_tokens" (
-    "id" INTEGER PRIMARY KEY AUTOINCREMENT,
-    "user_id" INTEGER REFERENCES users (id) ON DELETE CASCADE,
-    "impersonated_user_id" INTEGER REFERENCES users (id),
-    "hash" VARCHAR(128)
-);
-
-CREATE INDEX "index_access_tokens_user_id" ON "access_tokens" ("user_id");
-
-CREATE TABLE "contacts" (
-    "id" INTEGER PRIMARY KEY AUTOINCREMENT,
-    "user_id_a" INTEGER REFERENCES users (id) NOT NULL,
-    "user_id_b" INTEGER REFERENCES users (id) NOT NULL,
-    "a_to_b" BOOLEAN NOT NULL,
-    "should_notify" BOOLEAN NOT NULL,
-    "accepted" BOOLEAN NOT NULL
-);
-
-CREATE UNIQUE INDEX "index_contacts_user_ids" ON "contacts" ("user_id_a", "user_id_b");
-
-CREATE INDEX "index_contacts_user_id_b" ON "contacts" ("user_id_b");
-
-CREATE TABLE "rooms" (
-    "id" INTEGER PRIMARY KEY AUTOINCREMENT,
-    "live_kit_room" VARCHAR NOT NULL,
-    "environment" VARCHAR,
-    "channel_id" INTEGER REFERENCES channels (id) ON DELETE CASCADE
-);
-
-CREATE UNIQUE INDEX "index_rooms_on_channel_id" ON "rooms" ("channel_id");
-
-CREATE TABLE "projects" (
-    "id" INTEGER PRIMARY KEY AUTOINCREMENT,
-    "room_id" INTEGER REFERENCES rooms (id) ON DELETE CASCADE,
-    "host_user_id" INTEGER REFERENCES users (id),
-    "host_connection_id" INTEGER,
-    "host_connection_server_id" INTEGER REFERENCES servers (id) ON DELETE CASCADE,
-    "unregistered" BOOLEAN NOT NULL DEFAULT FALSE,
-    "windows_paths" BOOLEAN NOT NULL DEFAULT FALSE
-);
-
-CREATE INDEX "index_projects_on_host_connection_server_id" ON "projects" ("host_connection_server_id");
-
-CREATE INDEX "index_projects_on_host_connection_id_and_host_connection_server_id" ON "projects" ("host_connection_id", "host_connection_server_id");
-
-CREATE TABLE "worktrees" (
-    "project_id" INTEGER NOT NULL REFERENCES projects (id) ON DELETE CASCADE,
-    "id" INTEGER NOT NULL,
-    "root_name" VARCHAR NOT NULL,
-    "abs_path" VARCHAR NOT NULL,
-    "visible" BOOL NOT NULL,
-    "scan_id" INTEGER NOT NULL,
-    "is_complete" BOOL NOT NULL DEFAULT FALSE,
-    "completed_scan_id" INTEGER NOT NULL,
-    PRIMARY KEY (project_id, id)
-);
-
-CREATE INDEX "index_worktrees_on_project_id" ON "worktrees" ("project_id");
-
-CREATE TABLE "worktree_entries" (
-    "project_id" INTEGER NOT NULL,
-    "worktree_id" INTEGER NOT NULL,
-    "scan_id" INTEGER NOT NULL,
-    "id" INTEGER NOT NULL,
-    "is_dir" BOOL NOT NULL,
-    "path" VARCHAR NOT NULL,
-    "canonical_path" TEXT,
-    "inode" INTEGER NOT NULL,
-    "mtime_seconds" INTEGER NOT NULL,
-    "mtime_nanos" INTEGER NOT NULL,
-    "is_external" BOOL NOT NULL,
-    "is_ignored" BOOL NOT NULL,
-    "is_deleted" BOOL NOT NULL,
-    "is_hidden" BOOL NOT NULL,
-    "git_status" INTEGER,
-    "is_fifo" BOOL NOT NULL,
-    PRIMARY KEY (project_id, worktree_id, id),
-    FOREIGN KEY (project_id, worktree_id) REFERENCES worktrees (project_id, id) ON DELETE CASCADE
-);
-
-CREATE INDEX "index_worktree_entries_on_project_id" ON "worktree_entries" ("project_id");
-
-CREATE INDEX "index_worktree_entries_on_project_id_and_worktree_id" ON "worktree_entries" ("project_id", "worktree_id");
-
-CREATE TABLE "project_repositories" (
-    "project_id" INTEGER NOT NULL REFERENCES projects (id) ON DELETE CASCADE,
-    "abs_path" VARCHAR,
-    "id" INTEGER NOT NULL,
-    "entry_ids" VARCHAR,
-    "legacy_worktree_id" INTEGER,
-    "branch" VARCHAR,
-    "scan_id" INTEGER NOT NULL,
-    "is_deleted" BOOL NOT NULL,
-    "current_merge_conflicts" VARCHAR,
-    "merge_message" VARCHAR,
-    "branch_summary" VARCHAR,
-    "head_commit_details" VARCHAR,
-    "remote_upstream_url" VARCHAR,
-    "remote_origin_url" VARCHAR,
-    PRIMARY KEY (project_id, id)
-);
-
-CREATE INDEX "index_project_repositories_on_project_id" ON "project_repositories" ("project_id");
-
-CREATE TABLE "project_repository_statuses" (
-    "project_id" INTEGER NOT NULL REFERENCES projects (id) ON DELETE CASCADE,
-    "repository_id" INTEGER NOT NULL,
-    "repo_path" VARCHAR NOT NULL,
-    "status" INT8 NOT NULL,
-    "status_kind" INT4 NOT NULL,
-    "first_status" INT4 NULL,
-    "second_status" INT4 NULL,
-    "scan_id" INT8 NOT NULL,
-    "is_deleted" BOOL NOT NULL,
-    PRIMARY KEY (project_id, repository_id, repo_path)
-);
-
-CREATE INDEX "index_project_repos_statuses_on_project_id" ON "project_repository_statuses" ("project_id");
-
-CREATE INDEX "index_project_repos_statuses_on_project_id_and_repo_id" ON "project_repository_statuses" ("project_id", "repository_id");
-
-CREATE TABLE "worktree_settings_files" (
-    "project_id" INTEGER NOT NULL,
-    "worktree_id" INTEGER NOT NULL,
-    "path" VARCHAR NOT NULL,
-    "content" TEXT,
-    "kind" VARCHAR,
-    PRIMARY KEY (project_id, worktree_id, path),
-    FOREIGN KEY (project_id, worktree_id) REFERENCES worktrees (project_id, id) ON DELETE CASCADE
-);
-
-CREATE INDEX "index_worktree_settings_files_on_project_id" ON "worktree_settings_files" ("project_id");
-
-CREATE INDEX "index_worktree_settings_files_on_project_id_and_worktree_id" ON "worktree_settings_files" ("project_id", "worktree_id");
-
-CREATE TABLE "worktree_diagnostic_summaries" (
-    "project_id" INTEGER NOT NULL,
-    "worktree_id" INTEGER NOT NULL,
-    "path" VARCHAR NOT NULL,
-    "language_server_id" INTEGER NOT NULL,
-    "error_count" INTEGER NOT NULL,
-    "warning_count" INTEGER NOT NULL,
-    PRIMARY KEY (project_id, worktree_id, path),
-    FOREIGN KEY (project_id, worktree_id) REFERENCES worktrees (project_id, id) ON DELETE CASCADE
-);
-
-CREATE INDEX "index_worktree_diagnostic_summaries_on_project_id" ON "worktree_diagnostic_summaries" ("project_id");
-
-CREATE INDEX "index_worktree_diagnostic_summaries_on_project_id_and_worktree_id" ON "worktree_diagnostic_summaries" ("project_id", "worktree_id");
-
-CREATE TABLE "language_servers" (
-    "id" INTEGER NOT NULL,
-    "project_id" INTEGER NOT NULL REFERENCES projects (id) ON DELETE CASCADE,
-    "name" VARCHAR NOT NULL,
-    "capabilities" TEXT NOT NULL,
-    "worktree_id" BIGINT,
-    PRIMARY KEY (project_id, id)
-);
-
-CREATE INDEX "index_language_servers_on_project_id" ON "language_servers" ("project_id");
-
-CREATE TABLE "project_collaborators" (
-    "id" INTEGER PRIMARY KEY AUTOINCREMENT,
-    "project_id" INTEGER NOT NULL REFERENCES projects (id) ON DELETE CASCADE,
-    "connection_id" INTEGER NOT NULL,
-    "connection_server_id" INTEGER NOT NULL REFERENCES servers (id) ON DELETE CASCADE,
-    "user_id" INTEGER NOT NULL,
-    "replica_id" INTEGER NOT NULL,
-    "is_host" BOOLEAN NOT NULL,
-    "committer_name" VARCHAR,
-    "committer_email" VARCHAR
-);
-
-CREATE INDEX "index_project_collaborators_on_project_id" ON "project_collaborators" ("project_id");
-
-CREATE UNIQUE INDEX "index_project_collaborators_on_project_id_and_replica_id" ON "project_collaborators" ("project_id", "replica_id");
-
-CREATE INDEX "index_project_collaborators_on_connection_server_id" ON "project_collaborators" ("connection_server_id");
-
-CREATE INDEX "index_project_collaborators_on_connection_id" ON "project_collaborators" ("connection_id");
-
-CREATE UNIQUE INDEX "index_project_collaborators_on_project_id_connection_id_and_server_id" ON "project_collaborators" (
-    "project_id",
-    "connection_id",
-    "connection_server_id"
-);
-
-CREATE TABLE "room_participants" (
-    "id" INTEGER PRIMARY KEY AUTOINCREMENT,
-    "room_id" INTEGER NOT NULL REFERENCES rooms (id),
-    "user_id" INTEGER NOT NULL REFERENCES users (id),
-    "answering_connection_id" INTEGER,
-    "answering_connection_server_id" INTEGER REFERENCES servers (id) ON DELETE CASCADE,
-    "answering_connection_lost" BOOLEAN NOT NULL,
-    "location_kind" INTEGER,
-    "location_project_id" INTEGER,
-    "initial_project_id" INTEGER,
-    "calling_user_id" INTEGER NOT NULL REFERENCES users (id),
-    "calling_connection_id" INTEGER NOT NULL,
-    "calling_connection_server_id" INTEGER REFERENCES servers (id) ON DELETE SET NULL,
-    "participant_index" INTEGER,
-    "role" TEXT,
-    "in_call" BOOLEAN NOT NULL DEFAULT FALSE
-);
-
-CREATE UNIQUE INDEX "index_room_participants_on_user_id" ON "room_participants" ("user_id");
-
-CREATE INDEX "index_room_participants_on_room_id" ON "room_participants" ("room_id");
-
-CREATE INDEX "index_room_participants_on_answering_connection_server_id" ON "room_participants" ("answering_connection_server_id");
-
-CREATE INDEX "index_room_participants_on_calling_connection_server_id" ON "room_participants" ("calling_connection_server_id");
-
-CREATE INDEX "index_room_participants_on_answering_connection_id" ON "room_participants" ("answering_connection_id");
-
-CREATE UNIQUE INDEX "index_room_participants_on_answering_connection_id_and_answering_connection_server_id" ON "room_participants" (
-    "answering_connection_id",
-    "answering_connection_server_id"
-);
-
-CREATE TABLE "servers" (
-    "id" INTEGER PRIMARY KEY AUTOINCREMENT,
-    "environment" VARCHAR NOT NULL
-);
-
-CREATE TABLE "followers" (
-    "id" INTEGER PRIMARY KEY AUTOINCREMENT,
-    "room_id" INTEGER NOT NULL REFERENCES rooms (id) ON DELETE CASCADE,
-    "project_id" INTEGER NOT NULL REFERENCES projects (id) ON DELETE CASCADE,
-    "leader_connection_server_id" INTEGER NOT NULL REFERENCES servers (id) ON DELETE CASCADE,
-    "leader_connection_id" INTEGER NOT NULL,
-    "follower_connection_server_id" INTEGER NOT NULL REFERENCES servers (id) ON DELETE CASCADE,
-    "follower_connection_id" INTEGER NOT NULL
-);
-
-CREATE UNIQUE INDEX "index_followers_on_project_id_and_leader_connection_server_id_and_leader_connection_id_and_follower_connection_server_id_and_follower_connection_id" ON "followers" (
-    "project_id",
-    "leader_connection_server_id",
-    "leader_connection_id",
-    "follower_connection_server_id",
-    "follower_connection_id"
-);
-
-CREATE INDEX "index_followers_on_room_id" ON "followers" ("room_id");
-
-CREATE TABLE "channels" (
-    "id" INTEGER PRIMARY KEY AUTOINCREMENT,
-    "name" VARCHAR NOT NULL,
-    "created_at" TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "visibility" VARCHAR NOT NULL,
-    "parent_path" TEXT NOT NULL,
-    "requires_zed_cla" BOOLEAN NOT NULL DEFAULT FALSE,
-    "channel_order" INTEGER NOT NULL DEFAULT 1
-);
-
-CREATE INDEX "index_channels_on_parent_path" ON "channels" ("parent_path");
-
-CREATE INDEX "index_channels_on_parent_path_and_order" ON "channels" ("parent_path", "channel_order");
-
-CREATE TABLE IF NOT EXISTS "channel_chat_participants" (
-    "id" INTEGER PRIMARY KEY AUTOINCREMENT,
-    "user_id" INTEGER NOT NULL REFERENCES users (id),
-    "channel_id" INTEGER NOT NULL REFERENCES channels (id) ON DELETE CASCADE,
-    "connection_id" INTEGER NOT NULL,
-    "connection_server_id" INTEGER NOT NULL REFERENCES servers (id) ON DELETE CASCADE
-);
-
-CREATE INDEX "index_channel_chat_participants_on_channel_id" ON "channel_chat_participants" ("channel_id");
-
-CREATE TABLE "channel_members" (
-    "id" INTEGER PRIMARY KEY AUTOINCREMENT,
-    "channel_id" INTEGER NOT NULL REFERENCES channels (id) ON DELETE CASCADE,
-    "user_id" INTEGER NOT NULL REFERENCES users (id) ON DELETE CASCADE,
-    "role" VARCHAR NOT NULL,
-    "accepted" BOOLEAN NOT NULL DEFAULT false,
-    "updated_at" TIMESTAMP NOT NULL DEFAULT now
-);
-
-CREATE UNIQUE INDEX "index_channel_members_on_channel_id_and_user_id" ON "channel_members" ("channel_id", "user_id");
-
-CREATE TABLE "buffers" (
-    "id" INTEGER PRIMARY KEY AUTOINCREMENT,
-    "channel_id" INTEGER NOT NULL REFERENCES channels (id) ON DELETE CASCADE,
-    "epoch" INTEGER NOT NULL DEFAULT 0,
-    "latest_operation_epoch" INTEGER,
-    "latest_operation_replica_id" INTEGER,
-    "latest_operation_lamport_timestamp" INTEGER
-);
-
-CREATE INDEX "index_buffers_on_channel_id" ON "buffers" ("channel_id");
-
-CREATE TABLE "buffer_operations" (
-    "buffer_id" INTEGER NOT NULL REFERENCES buffers (id) ON DELETE CASCADE,
-    "epoch" INTEGER NOT NULL,
-    "replica_id" INTEGER NOT NULL,
-    "lamport_timestamp" INTEGER NOT NULL,
-    "value" BLOB NOT NULL,
-    PRIMARY KEY (buffer_id, epoch, lamport_timestamp, replica_id)
-);
-
-CREATE TABLE "buffer_snapshots" (
-    "buffer_id" INTEGER NOT NULL REFERENCES buffers (id) ON DELETE CASCADE,
-    "epoch" INTEGER NOT NULL,
-    "text" TEXT NOT NULL,
-    "operation_serialization_version" INTEGER NOT NULL,
-    PRIMARY KEY (buffer_id, epoch)
-);
-
-CREATE TABLE "channel_buffer_collaborators" (
-    "id" INTEGER PRIMARY KEY AUTOINCREMENT,
-    "channel_id" INTEGER NOT NULL REFERENCES channels (id) ON DELETE CASCADE,
-    "connection_id" INTEGER NOT NULL,
-    "connection_server_id" INTEGER NOT NULL REFERENCES servers (id) ON DELETE CASCADE,
-    "connection_lost" BOOLEAN NOT NULL DEFAULT false,
-    "user_id" INTEGER NOT NULL REFERENCES users (id) ON DELETE CASCADE,
-    "replica_id" INTEGER NOT NULL
-);
-
-CREATE INDEX "index_channel_buffer_collaborators_on_channel_id" ON "channel_buffer_collaborators" ("channel_id");
-
-CREATE UNIQUE INDEX "index_channel_buffer_collaborators_on_channel_id_and_replica_id" ON "channel_buffer_collaborators" ("channel_id", "replica_id");
-
-CREATE INDEX "index_channel_buffer_collaborators_on_connection_server_id" ON "channel_buffer_collaborators" ("connection_server_id");
-
-CREATE INDEX "index_channel_buffer_collaborators_on_connection_id" ON "channel_buffer_collaborators" ("connection_id");
-
-CREATE UNIQUE INDEX "index_channel_buffer_collaborators_on_channel_id_connection_id_and_server_id" ON "channel_buffer_collaborators" (
-    "channel_id",
-    "connection_id",
-    "connection_server_id"
-);
-
-CREATE TABLE "feature_flags" (
-    "id" INTEGER PRIMARY KEY AUTOINCREMENT,
-    "flag" TEXT NOT NULL UNIQUE,
-    "enabled_for_all" BOOLEAN NOT NULL DEFAULT false
-);
-
-CREATE INDEX "index_feature_flags" ON "feature_flags" ("id");
-
-CREATE TABLE "user_features" (
-    "user_id" INTEGER NOT NULL REFERENCES users (id) ON DELETE CASCADE,
-    "feature_id" INTEGER NOT NULL REFERENCES feature_flags (id) ON DELETE CASCADE,
-    PRIMARY KEY (user_id, feature_id)
-);
-
-CREATE UNIQUE INDEX "index_user_features_user_id_and_feature_id" ON "user_features" ("user_id", "feature_id");
-
-CREATE INDEX "index_user_features_on_user_id" ON "user_features" ("user_id");
-
-CREATE INDEX "index_user_features_on_feature_id" ON "user_features" ("feature_id");
-
-CREATE TABLE "observed_buffer_edits" (
-    "user_id" INTEGER NOT NULL REFERENCES users (id) ON DELETE CASCADE,
-    "buffer_id" INTEGER NOT NULL REFERENCES buffers (id) ON DELETE CASCADE,
-    "epoch" INTEGER NOT NULL,
-    "lamport_timestamp" INTEGER NOT NULL,
-    "replica_id" INTEGER NOT NULL,
-    PRIMARY KEY (user_id, buffer_id)
-);
-
-CREATE UNIQUE INDEX "index_observed_buffers_user_and_buffer_id" ON "observed_buffer_edits" ("user_id", "buffer_id");
-
-CREATE TABLE "notification_kinds" (
-    "id" INTEGER PRIMARY KEY AUTOINCREMENT,
-    "name" VARCHAR NOT NULL
-);
-
-CREATE UNIQUE INDEX "index_notification_kinds_on_name" ON "notification_kinds" ("name");
-
-CREATE TABLE "notifications" (
-    "id" INTEGER PRIMARY KEY AUTOINCREMENT,
-    "created_at" TIMESTAMP NOT NULL default CURRENT_TIMESTAMP,
-    "recipient_id" INTEGER NOT NULL REFERENCES users (id) ON DELETE CASCADE,
-    "kind" INTEGER NOT NULL REFERENCES notification_kinds (id),
-    "entity_id" INTEGER,
-    "content" TEXT,
-    "is_read" BOOLEAN NOT NULL DEFAULT FALSE,
-    "response" BOOLEAN
-);
-
-CREATE INDEX "index_notifications_on_recipient_id_is_read_kind_entity_id" ON "notifications" ("recipient_id", "is_read", "kind", "entity_id");
-
-CREATE TABLE contributors (
-    user_id INTEGER REFERENCES users (id),
-    signed_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    PRIMARY KEY (user_id)
-);
-
-CREATE TABLE extensions (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    external_id TEXT NOT NULL,
-    name TEXT NOT NULL,
-    latest_version TEXT NOT NULL,
-    total_download_count INTEGER NOT NULL DEFAULT 0
-);
-
-CREATE TABLE extension_versions (
-    extension_id INTEGER REFERENCES extensions (id),
-    version TEXT NOT NULL,
-    published_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    authors TEXT NOT NULL,
-    repository TEXT NOT NULL,
-    description TEXT NOT NULL,
-    schema_version INTEGER NOT NULL DEFAULT 0,
-    wasm_api_version TEXT,
-    download_count INTEGER NOT NULL DEFAULT 0,
-    provides_themes BOOLEAN NOT NULL DEFAULT FALSE,
-    provides_icon_themes BOOLEAN NOT NULL DEFAULT FALSE,
-    provides_languages BOOLEAN NOT NULL DEFAULT FALSE,
-    provides_grammars BOOLEAN NOT NULL DEFAULT FALSE,
-    provides_language_servers BOOLEAN NOT NULL DEFAULT FALSE,
-    provides_context_servers BOOLEAN NOT NULL DEFAULT FALSE,
-    provides_agent_servers BOOLEAN NOT NULL DEFAULT FALSE,
-    provides_slash_commands BOOLEAN NOT NULL DEFAULT FALSE,
-    provides_indexed_docs_providers BOOLEAN NOT NULL DEFAULT FALSE,
-    provides_snippets BOOLEAN NOT NULL DEFAULT FALSE,
-    provides_debug_adapters BOOLEAN NOT NULL DEFAULT FALSE,
-    PRIMARY KEY (extension_id, version)
-);
-
-CREATE UNIQUE INDEX "index_extensions_external_id" ON "extensions" ("external_id");
-
-CREATE INDEX "index_extensions_total_download_count" ON "extensions" ("total_download_count");
-
-CREATE TABLE IF NOT EXISTS "breakpoints" (
-    "id" INTEGER PRIMARY KEY AUTOINCREMENT,
-    "project_id" INTEGER NOT NULL REFERENCES projects (id) ON DELETE CASCADE,
-    "position" INTEGER NOT NULL,
-    "log_message" TEXT NULL,
-    "worktree_id" BIGINT NOT NULL,
-    "path" TEXT NOT NULL,
-    "kind" VARCHAR NOT NULL
-);
-
-CREATE INDEX "index_breakpoints_on_project_id" ON "breakpoints" ("project_id");
diff --git a/crates/collab/migrations/20251208000000_test_schema.sql b/crates/collab/migrations/20251208000000_test_schema.sql
deleted file mode 100644
index ed9c9d16db..0000000000
--- a/crates/collab/migrations/20251208000000_test_schema.sql
+++ /dev/null
@@ -1,899 +0,0 @@
-CREATE EXTENSION IF NOT EXISTS pg_trgm WITH SCHEMA public;
-
-CREATE TABLE public.access_tokens (
-    id integer NOT NULL,
-    user_id integer,
-    hash character varying(128),
-    impersonated_user_id integer
-);
-
-CREATE SEQUENCE public.access_tokens_id_seq
-    AS integer
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-ALTER SEQUENCE public.access_tokens_id_seq OWNED BY public.access_tokens.id;
-
-CREATE TABLE public.breakpoints (
-    id integer NOT NULL,
-    project_id integer NOT NULL,
-    "position" integer NOT NULL,
-    log_message text,
-    worktree_id bigint NOT NULL,
-    path text NOT NULL,
-    kind character varying NOT NULL
-);
-
-CREATE SEQUENCE public.breakpoints_id_seq
-    AS integer
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-ALTER SEQUENCE public.breakpoints_id_seq OWNED BY public.breakpoints.id;
-
-CREATE TABLE public.buffer_operations (
-    buffer_id integer NOT NULL,
-    epoch integer NOT NULL,
-    replica_id integer NOT NULL,
-    lamport_timestamp integer NOT NULL,
-    value bytea NOT NULL
-);
-
-CREATE TABLE public.buffer_snapshots (
-    buffer_id integer NOT NULL,
-    epoch integer NOT NULL,
-    text text NOT NULL,
-    operation_serialization_version integer NOT NULL
-);
-
-CREATE TABLE public.buffers (
-    id integer NOT NULL,
-    channel_id integer NOT NULL,
-    epoch integer DEFAULT 0 NOT NULL,
-    latest_operation_epoch integer,
-    latest_operation_lamport_timestamp integer,
-    latest_operation_replica_id integer
-);
-
-CREATE SEQUENCE public.buffers_id_seq
-    AS integer
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-ALTER SEQUENCE public.buffers_id_seq OWNED BY public.buffers.id;
-
-CREATE TABLE public.channel_buffer_collaborators (
-    id integer NOT NULL,
-    channel_id integer NOT NULL,
-    connection_id integer NOT NULL,
-    connection_server_id integer NOT NULL,
-    connection_lost boolean DEFAULT false NOT NULL,
-    user_id integer NOT NULL,
-    replica_id integer NOT NULL
-);
-
-CREATE SEQUENCE public.channel_buffer_collaborators_id_seq
-    AS integer
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-ALTER SEQUENCE public.channel_buffer_collaborators_id_seq OWNED BY public.channel_buffer_collaborators.id;
-
-CREATE TABLE public.channel_chat_participants (
-    id integer NOT NULL,
-    user_id integer NOT NULL,
-    channel_id integer NOT NULL,
-    connection_id integer NOT NULL,
-    connection_server_id integer NOT NULL
-);
-
-CREATE SEQUENCE public.channel_chat_participants_id_seq
-    AS integer
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-ALTER SEQUENCE public.channel_chat_participants_id_seq OWNED BY public.channel_chat_participants.id;
-
-CREATE TABLE public.channel_members (
-    id integer NOT NULL,
-    channel_id integer NOT NULL,
-    user_id integer NOT NULL,
-    accepted boolean DEFAULT false NOT NULL,
-    updated_at timestamp without time zone DEFAULT now() NOT NULL,
-    role text NOT NULL
-);
-
-CREATE SEQUENCE public.channel_members_id_seq
-    AS integer
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-ALTER SEQUENCE public.channel_members_id_seq OWNED BY public.channel_members.id;
-
-CREATE TABLE public.channels (
-    id integer NOT NULL,
-    name character varying NOT NULL,
-    created_at timestamp without time zone DEFAULT now() NOT NULL,
-    visibility text DEFAULT 'members'::text NOT NULL,
-    parent_path text NOT NULL,
-    requires_zed_cla boolean DEFAULT false NOT NULL,
-    channel_order integer DEFAULT 1 NOT NULL
-);
-
-CREATE SEQUENCE public.channels_id_seq
-    AS integer
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-ALTER SEQUENCE public.channels_id_seq OWNED BY public.channels.id;
-
-CREATE TABLE public.contacts (
-    id integer NOT NULL,
-    user_id_a integer NOT NULL,
-    user_id_b integer NOT NULL,
-    a_to_b boolean NOT NULL,
-    should_notify boolean NOT NULL,
-    accepted boolean NOT NULL
-);
-
-CREATE SEQUENCE public.contacts_id_seq
-    AS integer
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-ALTER SEQUENCE public.contacts_id_seq OWNED BY public.contacts.id;
-
-CREATE TABLE public.contributors (
-    user_id integer NOT NULL,
-    signed_at timestamp without time zone DEFAULT now() NOT NULL
-);
-
-CREATE TABLE public.extension_versions (
-    extension_id integer NOT NULL,
-    version text NOT NULL,
-    published_at timestamp without time zone DEFAULT now() NOT NULL,
-    authors text NOT NULL,
-    repository text NOT NULL,
-    description text NOT NULL,
-    download_count bigint DEFAULT 0 NOT NULL,
-    schema_version integer DEFAULT 0 NOT NULL,
-    wasm_api_version text,
-    provides_themes boolean DEFAULT false NOT NULL,
-    provides_icon_themes boolean DEFAULT false NOT NULL,
-    provides_languages boolean DEFAULT false NOT NULL,
-    provides_grammars boolean DEFAULT false NOT NULL,
-    provides_language_servers boolean DEFAULT false NOT NULL,
-    provides_context_servers boolean DEFAULT false NOT NULL,
-    provides_slash_commands boolean DEFAULT false NOT NULL,
-    provides_indexed_docs_providers boolean DEFAULT false NOT NULL,
-    provides_snippets boolean DEFAULT false NOT NULL,
-    provides_debug_adapters boolean DEFAULT false NOT NULL,
-    provides_agent_servers boolean DEFAULT false NOT NULL
-);
-
-CREATE TABLE public.extensions (
-    id integer NOT NULL,
-    name text NOT NULL,
-    external_id text NOT NULL,
-    latest_version text NOT NULL,
-    total_download_count bigint DEFAULT 0 NOT NULL
-);
-
-CREATE SEQUENCE public.extensions_id_seq
-    AS integer
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-ALTER SEQUENCE public.extensions_id_seq OWNED BY public.extensions.id;
-
-CREATE TABLE public.feature_flags (
-    id integer NOT NULL,
-    flag character varying(255) NOT NULL,
-    enabled_for_all boolean DEFAULT false NOT NULL
-);
-
-CREATE SEQUENCE public.feature_flags_id_seq
-    AS integer
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-ALTER SEQUENCE public.feature_flags_id_seq OWNED BY public.feature_flags.id;
-
-CREATE TABLE public.followers (
-    id integer NOT NULL,
-    room_id integer NOT NULL,
-    project_id integer NOT NULL,
-    leader_connection_server_id integer NOT NULL,
-    leader_connection_id integer NOT NULL,
-    follower_connection_server_id integer NOT NULL,
-    follower_connection_id integer NOT NULL
-);
-
-CREATE SEQUENCE public.followers_id_seq
-    AS integer
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-ALTER SEQUENCE public.followers_id_seq OWNED BY public.followers.id;
-
-CREATE TABLE public.language_servers (
-    project_id integer NOT NULL,
-    id bigint NOT NULL,
-    name character varying NOT NULL,
-    capabilities text NOT NULL,
-    worktree_id bigint
-);
-
-CREATE TABLE public.notification_kinds (
-    id integer NOT NULL,
-    name character varying NOT NULL
-);
-
-CREATE SEQUENCE public.notification_kinds_id_seq
-    AS integer
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-ALTER SEQUENCE public.notification_kinds_id_seq OWNED BY public.notification_kinds.id;
-
-CREATE TABLE public.notifications (
-    id integer NOT NULL,
-    created_at timestamp without time zone DEFAULT now() NOT NULL,
-    recipient_id integer NOT NULL,
-    kind integer NOT NULL,
-    entity_id integer,
-    content text,
-    is_read boolean DEFAULT false NOT NULL,
-    response boolean
-);
-
-CREATE SEQUENCE public.notifications_id_seq
-    AS integer
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-ALTER SEQUENCE public.notifications_id_seq OWNED BY public.notifications.id;
-
-CREATE TABLE public.observed_buffer_edits (
-    user_id integer NOT NULL,
-    buffer_id integer NOT NULL,
-    epoch integer NOT NULL,
-    lamport_timestamp integer NOT NULL,
-    replica_id integer NOT NULL
-);
-
-CREATE TABLE public.project_collaborators (
-    id integer NOT NULL,
-    project_id integer NOT NULL,
-    connection_id integer NOT NULL,
-    user_id integer NOT NULL,
-    replica_id integer NOT NULL,
-    is_host boolean NOT NULL,
-    connection_server_id integer NOT NULL,
-    committer_name character varying,
-    committer_email character varying
-);
-
-CREATE SEQUENCE public.project_collaborators_id_seq
-    AS integer
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-ALTER SEQUENCE public.project_collaborators_id_seq OWNED BY public.project_collaborators.id;
-
-CREATE TABLE public.project_repositories (
-    project_id integer NOT NULL,
-    abs_path character varying,
-    id bigint NOT NULL,
-    legacy_worktree_id bigint,
-    entry_ids character varying,
-    branch character varying,
-    scan_id bigint NOT NULL,
-    is_deleted boolean NOT NULL,
-    current_merge_conflicts character varying,
-    branch_summary character varying,
-    head_commit_details character varying,
-    merge_message character varying
-);
-
-CREATE TABLE public.project_repository_statuses (
-    project_id integer NOT NULL,
-    repository_id bigint NOT NULL,
-    repo_path character varying NOT NULL,
-    status bigint NOT NULL,
-    status_kind integer NOT NULL,
-    first_status integer,
-    second_status integer,
-    scan_id bigint NOT NULL,
-    is_deleted boolean NOT NULL
-);
-
-CREATE TABLE public.projects (
-    id integer NOT NULL,
-    host_user_id integer,
-    unregistered boolean DEFAULT false NOT NULL,
-    room_id integer,
-    host_connection_id integer,
-    host_connection_server_id integer,
-    windows_paths boolean DEFAULT false
-);
-
-CREATE SEQUENCE public.projects_id_seq
-    AS integer
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-ALTER SEQUENCE public.projects_id_seq OWNED BY public.projects.id;
-
-CREATE TABLE public.room_participants (
-    id integer NOT NULL,
-    room_id integer NOT NULL,
-    user_id integer NOT NULL,
-    answering_connection_id integer,
-    location_kind integer,
-    location_project_id integer,
-    initial_project_id integer,
-    calling_user_id integer NOT NULL,
-    calling_connection_id integer NOT NULL,
-    answering_connection_lost boolean DEFAULT false NOT NULL,
-    answering_connection_server_id integer,
-    calling_connection_server_id integer,
-    participant_index integer,
-    role text
-);
-
-CREATE SEQUENCE public.room_participants_id_seq
-    AS integer
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-ALTER SEQUENCE public.room_participants_id_seq OWNED BY public.room_participants.id;
-
-CREATE TABLE public.rooms (
-    id integer NOT NULL,
-    live_kit_room character varying NOT NULL,
-    channel_id integer
-);
-
-CREATE SEQUENCE public.rooms_id_seq
-    AS integer
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-ALTER SEQUENCE public.rooms_id_seq OWNED BY public.rooms.id;
-
-CREATE TABLE public.servers (
-    id integer NOT NULL,
-    environment character varying NOT NULL
-);
-
-CREATE SEQUENCE public.servers_id_seq
-    AS integer
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-ALTER SEQUENCE public.servers_id_seq OWNED BY public.servers.id;
-
-CREATE TABLE public.user_features (
-    user_id integer NOT NULL,
-    feature_id integer NOT NULL
-);
-
-CREATE TABLE public.users (
-    id integer NOT NULL,
-    github_login character varying,
-    admin boolean NOT NULL,
-    email_address character varying(255) DEFAULT NULL::character varying,
-    invite_code character varying(64),
-    invite_count integer DEFAULT 0 NOT NULL,
-    inviter_id integer,
-    connected_once boolean DEFAULT false NOT NULL,
-    created_at timestamp without time zone DEFAULT now() NOT NULL,
-    github_user_id integer NOT NULL,
-    metrics_id uuid DEFAULT gen_random_uuid() NOT NULL,
-    accepted_tos_at timestamp without time zone,
-    github_user_created_at timestamp without time zone,
-    custom_llm_monthly_allowance_in_cents integer,
-    name text
-);
-
-CREATE SEQUENCE public.users_id_seq
-    AS integer
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-ALTER SEQUENCE public.users_id_seq OWNED BY public.users.id;
-
-CREATE TABLE public.worktree_diagnostic_summaries (
-    project_id integer NOT NULL,
-    worktree_id bigint NOT NULL,
-    path character varying NOT NULL,
-    language_server_id bigint NOT NULL,
-    error_count integer NOT NULL,
-    warning_count integer NOT NULL
-);
-
-CREATE TABLE public.worktree_entries (
-    project_id integer NOT NULL,
-    worktree_id bigint NOT NULL,
-    id bigint NOT NULL,
-    is_dir boolean NOT NULL,
-    path character varying NOT NULL,
-    inode bigint NOT NULL,
-    mtime_seconds bigint NOT NULL,
-    mtime_nanos integer NOT NULL,
-    is_symlink boolean DEFAULT false NOT NULL,
-    is_ignored boolean NOT NULL,
-    scan_id bigint,
-    is_deleted boolean,
-    git_status bigint,
-    is_external boolean DEFAULT false NOT NULL,
-    is_fifo boolean DEFAULT false NOT NULL,
-    canonical_path text,
-    is_hidden boolean DEFAULT false NOT NULL
-);
-
-CREATE TABLE public.worktree_settings_files (
-    project_id integer NOT NULL,
-    worktree_id bigint NOT NULL,
-    path character varying NOT NULL,
-    content text NOT NULL,
-    kind character varying
-);
-
-CREATE TABLE public.worktrees (
-    project_id integer NOT NULL,
-    id bigint NOT NULL,
-    root_name character varying NOT NULL,
-    abs_path character varying NOT NULL,
-    visible boolean NOT NULL,
-    scan_id bigint NOT NULL,
-    is_complete boolean DEFAULT false NOT NULL,
-    completed_scan_id bigint
-);
-
-ALTER TABLE ONLY public.access_tokens ALTER COLUMN id SET DEFAULT nextval('public.access_tokens_id_seq'::regclass);
-
-ALTER TABLE ONLY public.breakpoints ALTER COLUMN id SET DEFAULT nextval('public.breakpoints_id_seq'::regclass);
-
-ALTER TABLE ONLY public.buffers ALTER COLUMN id SET DEFAULT nextval('public.buffers_id_seq'::regclass);
-
-ALTER TABLE ONLY public.channel_buffer_collaborators ALTER COLUMN id SET DEFAULT nextval('public.channel_buffer_collaborators_id_seq'::regclass);
-
-ALTER TABLE ONLY public.channel_chat_participants ALTER COLUMN id SET DEFAULT nextval('public.channel_chat_participants_id_seq'::regclass);
-
-ALTER TABLE ONLY public.channel_members ALTER COLUMN id SET DEFAULT nextval('public.channel_members_id_seq'::regclass);
-
-ALTER TABLE ONLY public.channels ALTER COLUMN id SET DEFAULT nextval('public.channels_id_seq'::regclass);
-
-ALTER TABLE ONLY public.contacts ALTER COLUMN id SET DEFAULT nextval('public.contacts_id_seq'::regclass);
-
-ALTER TABLE ONLY public.extensions ALTER COLUMN id SET DEFAULT nextval('public.extensions_id_seq'::regclass);
-
-ALTER TABLE ONLY public.feature_flags ALTER COLUMN id SET DEFAULT nextval('public.feature_flags_id_seq'::regclass);
-
-ALTER TABLE ONLY public.followers ALTER COLUMN id SET DEFAULT nextval('public.followers_id_seq'::regclass);
-
-ALTER TABLE ONLY public.notification_kinds ALTER COLUMN id SET DEFAULT nextval('public.notification_kinds_id_seq'::regclass);
-
-ALTER TABLE ONLY public.notifications ALTER COLUMN id SET DEFAULT nextval('public.notifications_id_seq'::regclass);
-
-ALTER TABLE ONLY public.project_collaborators ALTER COLUMN id SET DEFAULT nextval('public.project_collaborators_id_seq'::regclass);
-
-ALTER TABLE ONLY public.projects ALTER COLUMN id SET DEFAULT nextval('public.projects_id_seq'::regclass);
-
-ALTER TABLE ONLY public.room_participants ALTER COLUMN id SET DEFAULT nextval('public.room_participants_id_seq'::regclass);
-
-ALTER TABLE ONLY public.rooms ALTER COLUMN id SET DEFAULT nextval('public.rooms_id_seq'::regclass);
-
-ALTER TABLE ONLY public.servers ALTER COLUMN id SET DEFAULT nextval('public.servers_id_seq'::regclass);
-
-ALTER TABLE ONLY public.users ALTER COLUMN id SET DEFAULT nextval('public.users_id_seq'::regclass);
-
-ALTER TABLE ONLY public.access_tokens
-    ADD CONSTRAINT access_tokens_pkey PRIMARY KEY (id);
-
-ALTER TABLE ONLY public.breakpoints
-    ADD CONSTRAINT breakpoints_pkey PRIMARY KEY (id);
-
-ALTER TABLE ONLY public.buffer_operations
-    ADD CONSTRAINT buffer_operations_pkey PRIMARY KEY (buffer_id, epoch, lamport_timestamp, replica_id);
-
-ALTER TABLE ONLY public.buffer_snapshots
-    ADD CONSTRAINT buffer_snapshots_pkey PRIMARY KEY (buffer_id, epoch);
-
-ALTER TABLE ONLY public.buffers
-    ADD CONSTRAINT buffers_pkey PRIMARY KEY (id);
-
-ALTER TABLE ONLY public.channel_buffer_collaborators
-    ADD CONSTRAINT channel_buffer_collaborators_pkey PRIMARY KEY (id);
-
-ALTER TABLE ONLY public.channel_chat_participants
-    ADD CONSTRAINT channel_chat_participants_pkey PRIMARY KEY (id);
-
-ALTER TABLE ONLY public.channel_members
-    ADD CONSTRAINT channel_members_pkey PRIMARY KEY (id);
-
-ALTER TABLE ONLY public.channels
-    ADD CONSTRAINT channels_pkey PRIMARY KEY (id);
-
-ALTER TABLE ONLY public.contacts
-    ADD CONSTRAINT contacts_pkey PRIMARY KEY (id);
-
-ALTER TABLE ONLY public.contributors
-    ADD CONSTRAINT contributors_pkey PRIMARY KEY (user_id);
-
-ALTER TABLE ONLY public.extension_versions
-    ADD CONSTRAINT extension_versions_pkey PRIMARY KEY (extension_id, version);
-
-ALTER TABLE ONLY public.extensions
-    ADD CONSTRAINT extensions_pkey PRIMARY KEY (id);
-
-ALTER TABLE ONLY public.feature_flags
-    ADD CONSTRAINT feature_flags_flag_key UNIQUE (flag);
-
-ALTER TABLE ONLY public.feature_flags
-    ADD CONSTRAINT feature_flags_pkey PRIMARY KEY (id);
-
-ALTER TABLE ONLY public.followers
-    ADD CONSTRAINT followers_pkey PRIMARY KEY (id);
-
-ALTER TABLE ONLY public.language_servers
-    ADD CONSTRAINT language_servers_pkey PRIMARY KEY (project_id, id);
-
-ALTER TABLE ONLY public.notification_kinds
-    ADD CONSTRAINT notification_kinds_pkey PRIMARY KEY (id);
-
-ALTER TABLE ONLY public.notifications
-    ADD CONSTRAINT notifications_pkey PRIMARY KEY (id);
-
-ALTER TABLE ONLY public.observed_buffer_edits
-    ADD CONSTRAINT observed_buffer_edits_pkey PRIMARY KEY (user_id, buffer_id);
-
-ALTER TABLE ONLY public.project_collaborators
-    ADD CONSTRAINT project_collaborators_pkey PRIMARY KEY (id);
-
-ALTER TABLE ONLY public.project_repositories
-    ADD CONSTRAINT project_repositories_pkey PRIMARY KEY (project_id, id);
-
-ALTER TABLE ONLY public.project_repository_statuses
-    ADD CONSTRAINT project_repository_statuses_pkey PRIMARY KEY (project_id, repository_id, repo_path);
-
-ALTER TABLE ONLY public.projects
-    ADD CONSTRAINT projects_pkey PRIMARY KEY (id);
-
-ALTER TABLE ONLY public.room_participants
-    ADD CONSTRAINT room_participants_pkey PRIMARY KEY (id);
-
-ALTER TABLE ONLY public.rooms
-    ADD CONSTRAINT rooms_pkey PRIMARY KEY (id);
-
-ALTER TABLE ONLY public.servers
-    ADD CONSTRAINT servers_pkey PRIMARY KEY (id);
-
-ALTER TABLE ONLY public.user_features
-    ADD CONSTRAINT user_features_pkey PRIMARY KEY (user_id, feature_id);
-
-ALTER TABLE ONLY public.users
-    ADD CONSTRAINT users_pkey PRIMARY KEY (id);
-
-ALTER TABLE ONLY public.worktree_diagnostic_summaries
-    ADD CONSTRAINT worktree_diagnostic_summaries_pkey PRIMARY KEY (project_id, worktree_id, path);
-
-ALTER TABLE ONLY public.worktree_entries
-    ADD CONSTRAINT worktree_entries_pkey PRIMARY KEY (project_id, worktree_id, id);
-
-ALTER TABLE ONLY public.worktree_settings_files
-    ADD CONSTRAINT worktree_settings_files_pkey PRIMARY KEY (project_id, worktree_id, path);
-
-ALTER TABLE ONLY public.worktrees
-    ADD CONSTRAINT worktrees_pkey PRIMARY KEY (project_id, id);
-
-CREATE INDEX index_access_tokens_user_id ON public.access_tokens USING btree (user_id);
-
-CREATE INDEX index_breakpoints_on_project_id ON public.breakpoints USING btree (project_id);
-
-CREATE INDEX index_buffers_on_channel_id ON public.buffers USING btree (channel_id);
-
-CREATE INDEX index_channel_buffer_collaborators_on_channel_id ON public.channel_buffer_collaborators USING btree (channel_id);
-
-CREATE UNIQUE INDEX index_channel_buffer_collaborators_on_channel_id_and_replica_id ON public.channel_buffer_collaborators USING btree (channel_id, replica_id);
-
-CREATE UNIQUE INDEX index_channel_buffer_collaborators_on_channel_id_connection_id_ ON public.channel_buffer_collaborators USING btree (channel_id, connection_id, connection_server_id);
-
-CREATE INDEX index_channel_buffer_collaborators_on_connection_id ON public.channel_buffer_collaborators USING btree (connection_id);
-
-CREATE INDEX index_channel_buffer_collaborators_on_connection_server_id ON public.channel_buffer_collaborators USING btree (connection_server_id);
-
-CREATE INDEX index_channel_chat_participants_on_channel_id ON public.channel_chat_participants USING btree (channel_id);
-
-CREATE UNIQUE INDEX index_channel_members_on_channel_id_and_user_id ON public.channel_members USING btree (channel_id, user_id);
-
-CREATE INDEX index_channels_on_parent_path ON public.channels USING btree (parent_path text_pattern_ops);
-
-CREATE INDEX index_channels_on_parent_path_and_order ON public.channels USING btree (parent_path, channel_order);
-
-CREATE INDEX index_contacts_user_id_b ON public.contacts USING btree (user_id_b);
-
-CREATE UNIQUE INDEX index_contacts_user_ids ON public.contacts USING btree (user_id_a, user_id_b);
-
-CREATE UNIQUE INDEX index_extensions_external_id ON public.extensions USING btree (external_id);
-
-CREATE INDEX index_extensions_total_download_count ON public.extensions USING btree (total_download_count);
-
-CREATE UNIQUE INDEX index_feature_flags ON public.feature_flags USING btree (id);
-
-CREATE UNIQUE INDEX index_followers_on_project_id_and_leader_connection_server_id_a ON public.followers USING btree (project_id, leader_connection_server_id, leader_connection_id, follower_connection_server_id, follower_connection_id);
-
-CREATE INDEX index_followers_on_room_id ON public.followers USING btree (room_id);
-
-CREATE UNIQUE INDEX index_invite_code_users ON public.users USING btree (invite_code);
-
-CREATE INDEX index_language_servers_on_project_id ON public.language_servers USING btree (project_id);
-
-CREATE UNIQUE INDEX index_notification_kinds_on_name ON public.notification_kinds USING btree (name);
-
-CREATE INDEX index_notifications_on_recipient_id_is_read_kind_entity_id ON public.notifications USING btree (recipient_id, is_read, kind, entity_id);
-
-CREATE UNIQUE INDEX index_observed_buffer_user_and_buffer_id ON public.observed_buffer_edits USING btree (user_id, buffer_id);
-
-CREATE INDEX index_project_collaborators_on_connection_id ON public.project_collaborators USING btree (connection_id);
-
-CREATE INDEX index_project_collaborators_on_connection_server_id ON public.project_collaborators USING btree (connection_server_id);
-
-CREATE INDEX index_project_collaborators_on_project_id ON public.project_collaborators USING btree (project_id);
-
-CREATE UNIQUE INDEX index_project_collaborators_on_project_id_and_replica_id ON public.project_collaborators USING btree (project_id, replica_id);
-
-CREATE UNIQUE INDEX index_project_collaborators_on_project_id_connection_id_and_ser ON public.project_collaborators USING btree (project_id, connection_id, connection_server_id);
-
-CREATE INDEX index_project_repos_statuses_on_project_id ON public.project_repository_statuses USING btree (project_id);
-
-CREATE INDEX index_project_repos_statuses_on_project_id_and_repo_id ON public.project_repository_statuses USING btree (project_id, repository_id);
-
-CREATE INDEX index_project_repositories_on_project_id ON public.project_repositories USING btree (project_id);
-
-CREATE INDEX index_projects_on_host_connection_id_and_host_connection_server ON public.projects USING btree (host_connection_id, host_connection_server_id);
-
-CREATE INDEX index_projects_on_host_connection_server_id ON public.projects USING btree (host_connection_server_id);
-
-CREATE INDEX index_room_participants_on_answering_connection_id ON public.room_participants USING btree (answering_connection_id);
-
-CREATE UNIQUE INDEX index_room_participants_on_answering_connection_id_and_answerin ON public.room_participants USING btree (answering_connection_id, answering_connection_server_id);
-
-CREATE INDEX index_room_participants_on_answering_connection_server_id ON public.room_participants USING btree (answering_connection_server_id);
-
-CREATE INDEX index_room_participants_on_calling_connection_server_id ON public.room_participants USING btree (calling_connection_server_id);
-
-CREATE INDEX index_room_participants_on_room_id ON public.room_participants USING btree (room_id);
-
-CREATE UNIQUE INDEX index_room_participants_on_user_id ON public.room_participants USING btree (user_id);
-
-CREATE UNIQUE INDEX index_rooms_on_channel_id ON public.rooms USING btree (channel_id);
-
-CREATE INDEX index_settings_files_on_project_id ON public.worktree_settings_files USING btree (project_id);
-
-CREATE INDEX index_settings_files_on_project_id_and_wt_id ON public.worktree_settings_files USING btree (project_id, worktree_id);
-
-CREATE INDEX index_user_features_on_feature_id ON public.user_features USING btree (feature_id);
-
-CREATE INDEX index_user_features_on_user_id ON public.user_features USING btree (user_id);
-
-CREATE UNIQUE INDEX index_user_features_user_id_and_feature_id ON public.user_features USING btree (user_id, feature_id);
-
-CREATE UNIQUE INDEX index_users_github_login ON public.users USING btree (github_login);
-
-CREATE INDEX index_users_on_email_address ON public.users USING btree (email_address);
-
-CREATE INDEX index_worktree_diagnostic_summaries_on_project_id ON public.worktree_diagnostic_summaries USING btree (project_id);
-
-CREATE INDEX index_worktree_diagnostic_summaries_on_project_id_and_worktree_ ON public.worktree_diagnostic_summaries USING btree (project_id, worktree_id);
-
-CREATE INDEX index_worktree_entries_on_project_id ON public.worktree_entries USING btree (project_id);
-
-CREATE INDEX index_worktree_entries_on_project_id_and_worktree_id ON public.worktree_entries USING btree (project_id, worktree_id);
-
-CREATE INDEX index_worktrees_on_project_id ON public.worktrees USING btree (project_id);
-
-CREATE INDEX trigram_index_extensions_name ON public.extensions USING gin (name public.gin_trgm_ops);
-
-CREATE INDEX trigram_index_users_on_github_login ON public.users USING gin (github_login public.gin_trgm_ops);
-
-CREATE UNIQUE INDEX uix_channels_parent_path_name ON public.channels USING btree (parent_path, name) WHERE ((parent_path IS NOT NULL) AND (parent_path <> ''::text));
-
-CREATE UNIQUE INDEX uix_users_on_github_user_id ON public.users USING btree (github_user_id);
-
-ALTER TABLE ONLY public.access_tokens
-    ADD CONSTRAINT access_tokens_user_id_fkey FOREIGN KEY (user_id) REFERENCES public.users(id) ON DELETE CASCADE;
-
-ALTER TABLE ONLY public.breakpoints
-    ADD CONSTRAINT breakpoints_project_id_fkey FOREIGN KEY (project_id) REFERENCES public.projects(id) ON DELETE CASCADE;
-
-ALTER TABLE ONLY public.buffer_operations
-    ADD CONSTRAINT buffer_operations_buffer_id_fkey FOREIGN KEY (buffer_id) REFERENCES public.buffers(id) ON DELETE CASCADE;
-
-ALTER TABLE ONLY public.buffer_snapshots
-    ADD CONSTRAINT buffer_snapshots_buffer_id_fkey FOREIGN KEY (buffer_id) REFERENCES public.buffers(id) ON DELETE CASCADE;
-
-ALTER TABLE ONLY public.buffers
-    ADD CONSTRAINT buffers_channel_id_fkey FOREIGN KEY (channel_id) REFERENCES public.channels(id) ON DELETE CASCADE;
-
-ALTER TABLE ONLY public.channel_buffer_collaborators
-    ADD CONSTRAINT channel_buffer_collaborators_channel_id_fkey FOREIGN KEY (channel_id) REFERENCES public.channels(id) ON DELETE CASCADE;
-
-ALTER TABLE ONLY public.channel_buffer_collaborators
-    ADD CONSTRAINT channel_buffer_collaborators_connection_server_id_fkey FOREIGN KEY (connection_server_id) REFERENCES public.servers(id) ON DELETE CASCADE;
-
-ALTER TABLE ONLY public.channel_buffer_collaborators
-    ADD CONSTRAINT channel_buffer_collaborators_user_id_fkey FOREIGN KEY (user_id) REFERENCES public.users(id) ON DELETE CASCADE;
-
-ALTER TABLE ONLY public.channel_chat_participants
-    ADD CONSTRAINT channel_chat_participants_channel_id_fkey FOREIGN KEY (channel_id) REFERENCES public.channels(id) ON DELETE CASCADE;
-
-ALTER TABLE ONLY public.channel_chat_participants
-    ADD CONSTRAINT channel_chat_participants_connection_server_id_fkey FOREIGN KEY (connection_server_id) REFERENCES public.servers(id) ON DELETE CASCADE;
-
-ALTER TABLE ONLY public.channel_chat_participants
-    ADD CONSTRAINT channel_chat_participants_user_id_fkey FOREIGN KEY (user_id) REFERENCES public.users(id);
-
-ALTER TABLE ONLY public.channel_members
-    ADD CONSTRAINT channel_members_channel_id_fkey FOREIGN KEY (channel_id) REFERENCES public.channels(id) ON DELETE CASCADE;
-
-ALTER TABLE ONLY public.channel_members
-    ADD CONSTRAINT channel_members_user_id_fkey FOREIGN KEY (user_id) REFERENCES public.users(id) ON DELETE CASCADE;
-
-ALTER TABLE ONLY public.contacts
-    ADD CONSTRAINT contacts_user_id_a_fkey FOREIGN KEY (user_id_a) REFERENCES public.users(id) ON DELETE CASCADE;
-
-ALTER TABLE ONLY public.contacts
-    ADD CONSTRAINT contacts_user_id_b_fkey FOREIGN KEY (user_id_b) REFERENCES public.users(id) ON DELETE CASCADE;
-
-ALTER TABLE ONLY public.contributors
-    ADD CONSTRAINT contributors_user_id_fkey FOREIGN KEY (user_id) REFERENCES public.users(id);
-
-ALTER TABLE ONLY public.extension_versions
-    ADD CONSTRAINT extension_versions_extension_id_fkey FOREIGN KEY (extension_id) REFERENCES public.extensions(id);
-
-ALTER TABLE ONLY public.project_repositories
-    ADD CONSTRAINT fk_project_repositories_project_id FOREIGN KEY (project_id) REFERENCES public.projects(id) ON DELETE CASCADE;
-
-ALTER TABLE ONLY public.project_repository_statuses
-    ADD CONSTRAINT fk_project_repository_statuses_project_id FOREIGN KEY (project_id) REFERENCES public.projects(id) ON DELETE CASCADE;
-
-ALTER TABLE ONLY public.followers
-    ADD CONSTRAINT followers_follower_connection_server_id_fkey FOREIGN KEY (follower_connection_server_id) REFERENCES public.servers(id) ON DELETE CASCADE;
-
-ALTER TABLE ONLY public.followers
-    ADD CONSTRAINT followers_leader_connection_server_id_fkey FOREIGN KEY (leader_connection_server_id) REFERENCES public.servers(id) ON DELETE CASCADE;
-
-ALTER TABLE ONLY public.followers
-    ADD CONSTRAINT followers_project_id_fkey FOREIGN KEY (project_id) REFERENCES public.projects(id) ON DELETE CASCADE;
-
-ALTER TABLE ONLY public.followers
-    ADD CONSTRAINT followers_room_id_fkey FOREIGN KEY (room_id) REFERENCES public.rooms(id) ON DELETE CASCADE;
-
-ALTER TABLE ONLY public.language_servers
-    ADD CONSTRAINT language_servers_project_id_fkey FOREIGN KEY (project_id) REFERENCES public.projects(id) ON DELETE CASCADE;
-
-ALTER TABLE ONLY public.notifications
-    ADD CONSTRAINT notifications_kind_fkey FOREIGN KEY (kind) REFERENCES public.notification_kinds(id);
-
-ALTER TABLE ONLY public.notifications
-    ADD CONSTRAINT notifications_recipient_id_fkey FOREIGN KEY (recipient_id) REFERENCES public.users(id) ON DELETE CASCADE;
-
-ALTER TABLE ONLY public.observed_buffer_edits
-    ADD CONSTRAINT observed_buffer_edits_buffer_id_fkey FOREIGN KEY (buffer_id) REFERENCES public.buffers(id) ON DELETE CASCADE;
-
-ALTER TABLE ONLY public.observed_buffer_edits
-    ADD CONSTRAINT observed_buffer_edits_user_id_fkey FOREIGN KEY (user_id) REFERENCES public.users(id) ON DELETE CASCADE;
-
-ALTER TABLE ONLY public.project_collaborators
-    ADD CONSTRAINT project_collaborators_connection_server_id_fkey FOREIGN KEY (connection_server_id) REFERENCES public.servers(id) ON DELETE CASCADE;
-
-ALTER TABLE ONLY public.project_collaborators
-    ADD CONSTRAINT project_collaborators_project_id_fkey FOREIGN KEY (project_id) REFERENCES public.projects(id) ON DELETE CASCADE;
-
-ALTER TABLE ONLY public.projects
-    ADD CONSTRAINT projects_host_connection_server_id_fkey FOREIGN KEY (host_connection_server_id) REFERENCES public.servers(id) ON DELETE CASCADE;
-
-ALTER TABLE ONLY public.projects
-    ADD CONSTRAINT projects_host_user_id_fkey FOREIGN KEY (host_user_id) REFERENCES public.users(id);
-
-ALTER TABLE ONLY public.projects
-    ADD CONSTRAINT projects_room_id_fkey FOREIGN KEY (room_id) REFERENCES public.rooms(id) ON DELETE CASCADE;
-
-ALTER TABLE ONLY public.room_participants
-    ADD CONSTRAINT room_participants_answering_connection_server_id_fkey FOREIGN KEY (answering_connection_server_id) REFERENCES public.servers(id) ON DELETE CASCADE;
-
-ALTER TABLE ONLY public.room_participants
-    ADD CONSTRAINT room_participants_calling_connection_server_id_fkey FOREIGN KEY (calling_connection_server_id) REFERENCES public.servers(id) ON DELETE SET NULL;
-
-ALTER TABLE ONLY public.room_participants
-    ADD CONSTRAINT room_participants_calling_user_id_fkey FOREIGN KEY (calling_user_id) REFERENCES public.users(id);
-
-ALTER TABLE ONLY public.room_participants
-    ADD CONSTRAINT room_participants_room_id_fkey FOREIGN KEY (room_id) REFERENCES public.rooms(id);
-
-ALTER TABLE ONLY public.room_participants
-    ADD CONSTRAINT room_participants_user_id_fkey FOREIGN KEY (user_id) REFERENCES public.users(id);
-
-ALTER TABLE ONLY public.rooms
-    ADD CONSTRAINT rooms_channel_id_fkey FOREIGN KEY (channel_id) REFERENCES public.channels(id) ON DELETE CASCADE;
-
-ALTER TABLE ONLY public.user_features
-    ADD CONSTRAINT user_features_feature_id_fkey FOREIGN KEY (feature_id) REFERENCES public.feature_flags(id) ON DELETE CASCADE;
-
-ALTER TABLE ONLY public.user_features
-    ADD CONSTRAINT user_features_user_id_fkey FOREIGN KEY (user_id) REFERENCES public.users(id) ON DELETE CASCADE;
-
-ALTER TABLE ONLY public.users
-    ADD CONSTRAINT users_inviter_id_fkey FOREIGN KEY (inviter_id) REFERENCES public.users(id) ON DELETE SET NULL;
-
-ALTER TABLE ONLY public.worktree_diagnostic_summaries
-    ADD CONSTRAINT worktree_diagnostic_summaries_project_id_worktree_id_fkey FOREIGN KEY (project_id, worktree_id) REFERENCES public.worktrees(project_id, id) ON DELETE CASCADE;
-
-ALTER TABLE ONLY public.worktree_entries
-    ADD CONSTRAINT worktree_entries_project_id_worktree_id_fkey FOREIGN KEY (project_id, worktree_id) REFERENCES public.worktrees(project_id, id) ON DELETE CASCADE;
-
-ALTER TABLE ONLY public.worktree_settings_files
-    ADD CONSTRAINT worktree_settings_files_project_id_worktree_id_fkey FOREIGN KEY (project_id, worktree_id) REFERENCES public.worktrees(project_id, id) ON DELETE CASCADE;
-
-ALTER TABLE ONLY public.worktrees
-    ADD CONSTRAINT worktrees_project_id_fkey FOREIGN KEY (project_id) REFERENCES public.projects(id) ON DELETE CASCADE;
diff --git a/crates/collab/seed.default.json b/crates/collab/seed.default.json
deleted file mode 100644
index 983594d623..0000000000
--- a/crates/collab/seed.default.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "admins": [
-    "nathansobo",
-    "maxbrunsfeld",
-    "as-cii",
-    "JosephTLyons",
-    "maxdeviant",
-    "SomeoneToIgnore",
-    "mikayla-maki",
-    "agu-z",
-    "osiewicz",
-    "ConradIrwin",
-    "benbrandt",
-    "bennetbo",
-    "smitbarmase",
-    "notpeter",
-    "rgbkrk",
-    "JunkuiZhang",
-    "Anthony-Eid",
-    "rtfeldman",
-    "danilo-leal",
-    "MrSubidubi",
-    "cole-miller",
-    "osyvokon",
-    "probably-neb",
-    "mgsloan",
-    "P1n3appl3",
-    "mslzed",
-    "franciskafyi",
-    "katie-z-geer"
-  ],
-  "channels": ["zed"]
-}
diff --git a/crates/collab/seed/github_users.json b/crates/collab/seed/github_users.json
deleted file mode 100644
index 88acd6aa54..0000000000
--- a/crates/collab/seed/github_users.json
+++ /dev/null
@@ -1,602 +0,0 @@
-[
-  {
-    "id": 1,
-    "login": "mojombo",
-    "email": "tom@mojombo.com",
-    "created_at": "2007-10-20T05:24:19Z"
-  },
-  {
-    "id": 2,
-    "login": "defunkt",
-    "email": null,
-    "created_at": "2007-10-20T05:24:19Z"
-  },
-  {
-    "id": 3,
-    "login": "pjhyett",
-    "email": "pj@hyett.com",
-    "created_at": "2008-01-07T17:54:22Z"
-  },
-  {
-    "id": 4,
-    "login": "wycats",
-    "email": "wycats@gmail.com",
-    "created_at": "2008-01-12T05:38:33Z"
-  },
-  {
-    "id": 5,
-    "login": "ezmobius",
-    "email": null,
-    "created_at": "2008-01-12T07:51:46Z"
-  },
-  {
-    "id": 6,
-    "login": "ivey",
-    "email": "ivey@gweezlebur.com",
-    "created_at": "2008-01-12T15:15:00Z"
-  },
-  {
-    "id": 7,
-    "login": "evanphx",
-    "email": "evan@phx.io",
-    "created_at": "2008-01-12T16:46:24Z"
-  },
-  {
-    "id": 17,
-    "login": "vanpelt",
-    "email": "vanpelt@wandb.com",
-    "created_at": "2008-01-13T05:57:18Z"
-  },
-  {
-    "id": 18,
-    "login": "wayneeseguin",
-    "email": "wayneeseguin@gmail.com",
-    "created_at": "2008-01-13T06:02:21Z"
-  },
-  {
-    "id": 19,
-    "login": "brynary",
-    "email": null,
-    "created_at": "2008-01-13T10:19:47Z"
-  },
-  {
-    "id": 20,
-    "login": "kevinclark",
-    "email": "kevin.clark@gmail.com",
-    "created_at": "2008-01-13T18:33:26Z"
-  },
-  {
-    "id": 21,
-    "login": "technoweenie",
-    "email": "technoweenie@hey.com",
-    "created_at": "2008-01-14T04:33:35Z"
-  },
-  {
-    "id": 22,
-    "login": "macournoyer",
-    "email": "macournoyer@gmail.com",
-    "created_at": "2008-01-14T10:49:35Z"
-  },
-  {
-    "id": 23,
-    "login": "takeo",
-    "email": "toby@takeo.email",
-    "created_at": "2008-01-14T11:25:49Z"
-  },
-  {
-    "id": 25,
-    "login": "caged",
-    "email": "encytemedia@gmail.com",
-    "created_at": "2008-01-15T04:47:24Z"
-  },
-  {
-    "id": 26,
-    "login": "topfunky",
-    "email": null,
-    "created_at": "2008-01-15T05:40:05Z"
-  },
-  {
-    "id": 27,
-    "login": "anotherjesse",
-    "email": "anotherjesse@gmail.com",
-    "created_at": "2008-01-15T07:49:30Z"
-  },
-  {
-    "id": 28,
-    "login": "roland",
-    "email": null,
-    "created_at": "2008-01-15T08:12:51Z"
-  },
-  {
-    "id": 29,
-    "login": "lukas",
-    "email": "lukas@wandb.com",
-    "created_at": "2008-01-15T12:50:02Z"
-  },
-  {
-    "id": 30,
-    "login": "fanvsfan",
-    "email": null,
-    "created_at": "2008-01-15T14:15:23Z"
-  },
-  {
-    "id": 31,
-    "login": "tomtt",
-    "email": null,
-    "created_at": "2008-01-15T15:44:31Z"
-  },
-  {
-    "id": 32,
-    "login": "railsjitsu",
-    "email": null,
-    "created_at": "2008-01-16T04:57:23Z"
-  },
-  {
-    "id": 34,
-    "login": "nitay",
-    "email": null,
-    "created_at": "2008-01-18T14:09:11Z"
-  },
-  {
-    "id": 35,
-    "login": "kevwil",
-    "email": null,
-    "created_at": "2008-01-19T05:50:12Z"
-  },
-  {
-    "id": 36,
-    "login": "KirinDave",
-    "email": null,
-    "created_at": "2008-01-19T08:01:02Z"
-  },
-  {
-    "id": 37,
-    "login": "jamesgolick",
-    "email": "jamesgolick@gmail.com",
-    "created_at": "2008-01-19T22:52:30Z"
-  },
-  {
-    "id": 38,
-    "login": "atmos",
-    "email": "atmos@atmos.org",
-    "created_at": "2008-01-22T09:14:11Z"
-  },
-  {
-    "id": 44,
-    "login": "errfree",
-    "email": null,
-    "created_at": "2008-01-24T02:08:37Z"
-  },
-  {
-    "id": 45,
-    "login": "mojodna",
-    "email": null,
-    "created_at": "2008-01-24T04:40:22Z"
-  },
-  {
-    "id": 46,
-    "login": "bmizerany",
-    "email": "blake.mizerany@gmail.com",
-    "created_at": "2008-01-24T04:44:30Z"
-  },
-  {
-    "id": 47,
-    "login": "jnewland",
-    "email": "jesse@jnewland.com",
-    "created_at": "2008-01-25T02:28:12Z"
-  },
-  {
-    "id": 48,
-    "login": "joshknowles",
-    "email": "joshknowles@gmail.com",
-    "created_at": "2008-01-25T21:30:42Z"
-  },
-  {
-    "id": 49,
-    "login": "hornbeck",
-    "email": "hornbeck@gmail.com",
-    "created_at": "2008-01-25T21:49:23Z"
-  },
-  {
-    "id": 50,
-    "login": "jwhitmire",
-    "email": "jeff@jwhitmire.com",
-    "created_at": "2008-01-25T22:07:48Z"
-  },
-  {
-    "id": 51,
-    "login": "elbowdonkey",
-    "email": null,
-    "created_at": "2008-01-25T22:08:20Z"
-  },
-  {
-    "id": 52,
-    "login": "reinh",
-    "email": null,
-    "created_at": "2008-01-25T22:16:29Z"
-  },
-  {
-    "id": 53,
-    "login": "knzai",
-    "email": "git@knz.ai",
-    "created_at": "2008-01-25T22:33:10Z"
-  },
-  {
-    "id": 68,
-    "login": "bs",
-    "email": "yap@bri.tt",
-    "created_at": "2008-01-27T01:46:29Z"
-  },
-  {
-    "id": 69,
-    "login": "rsanheim",
-    "email": null,
-    "created_at": "2008-01-27T07:09:47Z"
-  },
-  {
-    "id": 70,
-    "login": "schacon",
-    "email": "schacon@gmail.com",
-    "created_at": "2008-01-27T17:19:28Z"
-  },
-  {
-    "id": 71,
-    "login": "uggedal",
-    "email": null,
-    "created_at": "2008-01-27T22:18:57Z"
-  },
-  {
-    "id": 72,
-    "login": "bruce",
-    "email": "brwcodes@gmail.com",
-    "created_at": "2008-01-28T07:16:45Z"
-  },
-  {
-    "id": 73,
-    "login": "sam",
-    "email": "ssmoot@gmail.com",
-    "created_at": "2008-01-28T19:01:26Z"
-  },
-  {
-    "id": 74,
-    "login": "mmower",
-    "email": "self@mattmower.com",
-    "created_at": "2008-01-28T19:47:50Z"
-  },
-  {
-    "id": 75,
-    "login": "abhay",
-    "email": null,
-    "created_at": "2008-01-28T21:08:23Z"
-  },
-  {
-    "id": 76,
-    "login": "rabble",
-    "email": "evan@protest.net",
-    "created_at": "2008-01-28T23:27:02Z"
-  },
-  {
-    "id": 77,
-    "login": "benburkert",
-    "email": "ben@benburkert.com",
-    "created_at": "2008-01-28T23:44:14Z"
-  },
-  {
-    "id": 78,
-    "login": "indirect",
-    "email": "andre@arko.net",
-    "created_at": "2008-01-29T07:59:27Z"
-  },
-  {
-    "id": 79,
-    "login": "fearoffish",
-    "email": "me@fearof.fish",
-    "created_at": "2008-01-29T08:43:10Z"
-  },
-  {
-    "id": 80,
-    "login": "ry",
-    "email": "ry@tinyclouds.org",
-    "created_at": "2008-01-29T08:50:34Z"
-  },
-  {
-    "id": 81,
-    "login": "engineyard",
-    "email": null,
-    "created_at": "2008-01-29T09:51:30Z"
-  },
-  {
-    "id": 82,
-    "login": "jsierles",
-    "email": null,
-    "created_at": "2008-01-29T11:10:25Z"
-  },
-  {
-    "id": 83,
-    "login": "tweibley",
-    "email": null,
-    "created_at": "2008-01-29T13:52:07Z"
-  },
-  {
-    "id": 84,
-    "login": "peimei",
-    "email": "james@railsjitsu.com",
-    "created_at": "2008-01-29T15:44:11Z"
-  },
-  {
-    "id": 85,
-    "login": "brixen",
-    "email": "brixen@gmail.com",
-    "created_at": "2008-01-29T16:47:55Z"
-  },
-  {
-    "id": 87,
-    "login": "tmornini",
-    "email": null,
-    "created_at": "2008-01-29T18:43:39Z"
-  },
-  {
-    "id": 88,
-    "login": "outerim",
-    "email": "lee@outerim.com",
-    "created_at": "2008-01-29T18:48:32Z"
-  },
-  {
-    "id": 89,
-    "login": "daksis",
-    "email": null,
-    "created_at": "2008-01-29T19:18:16Z"
-  },
-  {
-    "id": 90,
-    "login": "sr",
-    "email": "me@simonrozet.com",
-    "created_at": "2008-01-29T20:37:53Z"
-  },
-  {
-    "id": 91,
-    "login": "lifo",
-    "email": null,
-    "created_at": "2008-01-29T23:09:30Z"
-  },
-  {
-    "id": 92,
-    "login": "rsl",
-    "email": "sconds@gmail.com",
-    "created_at": "2008-01-29T23:13:36Z"
-  },
-  {
-    "id": 93,
-    "login": "imownbey",
-    "email": null,
-    "created_at": "2008-01-29T23:13:44Z"
-  },
-  {
-    "id": 94,
-    "login": "dylanegan",
-    "email": null,
-    "created_at": "2008-01-29T23:15:18Z"
-  },
-  {
-    "id": 95,
-    "login": "jm",
-    "email": "jeremymcanally@gmail.com",
-    "created_at": "2008-01-29T23:15:32Z"
-  },
-  {
-    "id": 100,
-    "login": "kmarsh",
-    "email": "kevin.marsh@gmail.com",
-    "created_at": "2008-01-29T23:48:24Z"
-  },
-  {
-    "id": 101,
-    "login": "jvantuyl",
-    "email": "jayson@aggressive.ly",
-    "created_at": "2008-01-30T01:11:50Z"
-  },
-  {
-    "id": 102,
-    "login": "BrianTheCoder",
-    "email": "wbsmith83@gmail.com",
-    "created_at": "2008-01-30T02:22:32Z"
-  },
-  {
-    "id": 103,
-    "login": "freeformz",
-    "email": "freeformz@gmail.com",
-    "created_at": "2008-01-30T06:19:57Z"
-  },
-  {
-    "id": 104,
-    "login": "hassox",
-    "email": "dneighman@gmail.com",
-    "created_at": "2008-01-30T06:31:06Z"
-  },
-  {
-    "id": 105,
-    "login": "automatthew",
-    "email": "automatthew@gmail.com",
-    "created_at": "2008-01-30T19:00:58Z"
-  },
-  {
-    "id": 106,
-    "login": "queso",
-    "email": "Joshua.owens@gmail.com",
-    "created_at": "2008-01-30T19:48:45Z"
-  },
-  {
-    "id": 107,
-    "login": "lancecarlson",
-    "email": null,
-    "created_at": "2008-01-30T19:53:29Z"
-  },
-  {
-    "id": 108,
-    "login": "drnic",
-    "email": "drnicwilliams@gmail.com",
-    "created_at": "2008-01-30T23:19:18Z"
-  },
-  {
-    "id": 109,
-    "login": "lukesutton",
-    "email": null,
-    "created_at": "2008-01-31T04:01:02Z"
-  },
-  {
-    "id": 110,
-    "login": "danwrong",
-    "email": null,
-    "created_at": "2008-01-31T08:51:31Z"
-  },
-  {
-    "id": 111,
-    "login": "HamptonMakes",
-    "email": "hampton@hamptoncatlin.com",
-    "created_at": "2008-01-31T17:03:51Z"
-  },
-  {
-    "id": 112,
-    "login": "jfrost",
-    "email": null,
-    "created_at": "2008-01-31T22:14:27Z"
-  },
-  {
-    "id": 113,
-    "login": "mattetti",
-    "email": null,
-    "created_at": "2008-01-31T22:56:31Z"
-  },
-  {
-    "id": 114,
-    "login": "ctennis",
-    "email": "c@leb.tennis",
-    "created_at": "2008-01-31T23:43:14Z"
-  },
-  {
-    "id": 115,
-    "login": "lawrencepit",
-    "email": "lawrence.pit@gmail.com",
-    "created_at": "2008-01-31T23:57:16Z"
-  },
-  {
-    "id": 116,
-    "login": "marcjeanson",
-    "email": "github@marcjeanson.com",
-    "created_at": "2008-02-01T01:27:19Z"
-  },
-  {
-    "id": 117,
-    "login": "grempe",
-    "email": null,
-    "created_at": "2008-02-01T04:12:42Z"
-  },
-  {
-    "id": 118,
-    "login": "peterc",
-    "email": "git@peterc.org",
-    "created_at": "2008-02-02T01:00:36Z"
-  },
-  {
-    "id": 119,
-    "login": "ministrycentered",
-    "email": null,
-    "created_at": "2008-02-02T03:50:26Z"
-  },
-  {
-    "id": 120,
-    "login": "afarnham",
-    "email": null,
-    "created_at": "2008-02-02T05:11:03Z"
-  },
-  {
-    "id": 121,
-    "login": "up_the_irons",
-    "email": null,
-    "created_at": "2008-02-02T10:59:51Z"
-  },
-  {
-    "id": 122,
-    "login": "cristibalan",
-    "email": "cristibalan@gmail.com",
-    "created_at": "2008-02-02T11:29:45Z"
-  },
-  {
-    "id": 123,
-    "login": "heavysixer",
-    "email": null,
-    "created_at": "2008-02-02T15:06:53Z"
-  },
-  {
-    "id": 124,
-    "login": "brosner",
-    "email": "brosner@gmail.com",
-    "created_at": "2008-02-02T19:03:54Z"
-  },
-  {
-    "id": 125,
-    "login": "danielmorrison",
-    "email": "daniel@collectiveidea.com",
-    "created_at": "2008-02-02T19:46:35Z"
-  },
-  {
-    "id": 126,
-    "login": "danielharan",
-    "email": "chebuctonian@gmail.com",
-    "created_at": "2008-02-02T21:42:21Z"
-  },
-  {
-    "id": 127,
-    "login": "kvnsmth",
-    "email": null,
-    "created_at": "2008-02-02T22:00:03Z"
-  },
-  {
-    "id": 128,
-    "login": "collectiveidea",
-    "email": "info@collectiveidea.com",
-    "created_at": "2008-02-02T22:34:46Z"
-  },
-  {
-    "id": 129,
-    "login": "canadaduane",
-    "email": "duane.johnson@gmail.com",
-    "created_at": "2008-02-02T23:25:39Z"
-  },
-  {
-    "id": 130,
-    "login": "corasaurus-hex",
-    "email": "cora@sutton.me",
-    "created_at": "2008-02-03T04:20:22Z"
-  },
-  {
-    "id": 131,
-    "login": "dstrelau",
-    "email": null,
-    "created_at": "2008-02-03T14:59:12Z"
-  },
-  {
-    "id": 132,
-    "login": "sunny",
-    "email": "sunny@sunfox.org",
-    "created_at": "2008-02-03T15:43:43Z"
-  },
-  {
-    "id": 133,
-    "login": "dkubb",
-    "email": "github@dan.kubb.ca",
-    "created_at": "2008-02-03T20:40:13Z"
-  },
-  {
-    "id": 134,
-    "login": "jnicklas",
-    "email": "jonas@jnicklas.com",
-    "created_at": "2008-02-03T20:43:50Z"
-  },
-  {
-    "id": 135,
-    "login": "richcollins",
-    "email": "richcollins@gmail.com",
-    "created_at": "2008-02-03T21:11:25Z"
-  }
-]
diff --git a/crates/collab/src/api.rs b/crates/collab/src/api.rs
deleted file mode 100644
index d2432d828d..0000000000
--- a/crates/collab/src/api.rs
+++ /dev/null
@@ -1,190 +0,0 @@
-pub mod contributors;
-pub mod events;
-pub mod extensions;
-
-use crate::{AppState, Error, Result, auth, db::UserId, rpc};
-use anyhow::Context as _;
-use axum::{
-    Extension, Json, Router,
-    body::Body,
-    extract::{Path, Query},
-    headers::Header,
-    http::{self, HeaderName, Request, StatusCode},
-    middleware::{self, Next},
-    response::IntoResponse,
-    routing::{get, post},
-};
-use axum_extra::response::ErasedJson;
-use serde::{Deserialize, Serialize};
-use std::sync::{Arc, OnceLock};
-use tower::ServiceBuilder;
-
-pub use extensions::fetch_extensions_from_blob_store_periodically;
-
-pub struct CloudflareIpCountryHeader(String);
-
-impl Header for CloudflareIpCountryHeader {
-    fn name() -> &'static HeaderName {
-        static CLOUDFLARE_IP_COUNTRY_HEADER: OnceLock<HeaderName> = OnceLock::new();
-        CLOUDFLARE_IP_COUNTRY_HEADER.get_or_init(|| HeaderName::from_static("cf-ipcountry"))
-    }
-
-    fn decode<'i, I>(values: &mut I) -> Result<Self, axum::headers::Error>
-    where
-        Self: Sized,
-        I: Iterator<Item = &'i axum::http::HeaderValue>,
-    {
-        let country_code = values
-            .next()
-            .ok_or_else(axum::headers::Error::invalid)?
-            .to_str()
-            .map_err(|_| axum::headers::Error::invalid())?;
-
-        Ok(Self(country_code.to_string()))
-    }
-
-    fn encode<E: Extend<axum::http::HeaderValue>>(&self, _values: &mut E) {
-        unimplemented!()
-    }
-}
-
-impl std::fmt::Display for CloudflareIpCountryHeader {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
-pub struct SystemIdHeader(String);
-
-impl Header for SystemIdHeader {
-    fn name() -> &'static HeaderName {
-        static SYSTEM_ID_HEADER: OnceLock<HeaderName> = OnceLock::new();
-        SYSTEM_ID_HEADER.get_or_init(|| HeaderName::from_static("x-zed-system-id"))
-    }
-
-    fn decode<'i, I>(values: &mut I) -> Result<Self, axum::headers::Error>
-    where
-        Self: Sized,
-        I: Iterator<Item = &'i axum::http::HeaderValue>,
-    {
-        let system_id = values
-            .next()
-            .ok_or_else(axum::headers::Error::invalid)?
-            .to_str()
-            .map_err(|_| axum::headers::Error::invalid())?;
-
-        Ok(Self(system_id.to_string()))
-    }
-
-    fn encode<E: Extend<axum::http::HeaderValue>>(&self, _values: &mut E) {
-        unimplemented!()
-    }
-}
-
-impl std::fmt::Display for SystemIdHeader {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
-pub fn routes(rpc_server: Arc<rpc::Server>) -> Router<(), Body> {
-    Router::new()
-        .route("/users/:id/access_tokens", post(create_access_token))
-        .route("/rpc_server_snapshot", get(get_rpc_server_snapshot))
-        .merge(contributors::router())
-        .layer(
-            ServiceBuilder::new()
-                .layer(Extension(rpc_server))
-                .layer(middleware::from_fn(validate_api_token)),
-        )
-}
-
-pub async fn validate_api_token<B>(req: Request<B>, next: Next<B>) -> impl IntoResponse {
-    let token = req
-        .headers()
-        .get(http::header::AUTHORIZATION)
-        .and_then(|header| header.to_str().ok())
-        .ok_or_else(|| {
-            Error::http(
-                StatusCode::BAD_REQUEST,
-                "missing authorization header".to_string(),
-            )
-        })?
-        .strip_prefix("token ")
-        .ok_or_else(|| {
-            Error::http(
-                StatusCode::BAD_REQUEST,
-                "invalid authorization header".to_string(),
-            )
-        })?;
-
-    let state = req.extensions().get::<Arc<AppState>>().unwrap();
-
-    if token != state.config.api_token {
-        Err(Error::http(
-            StatusCode::UNAUTHORIZED,
-            "invalid authorization token".to_string(),
-        ))?
-    }
-
-    Ok::<_, Error>(next.run(req).await)
-}
-
-async fn get_rpc_server_snapshot(
-    Extension(rpc_server): Extension<Arc<rpc::Server>>,
-) -> Result<ErasedJson> {
-    Ok(ErasedJson::pretty(rpc_server.snapshot().await))
-}
-
-#[derive(Deserialize)]
-struct CreateAccessTokenQueryParams {
-    public_key: String,
-    impersonate: Option<String>,
-}
-
-#[derive(Serialize)]
-struct CreateAccessTokenResponse {
-    user_id: UserId,
-    encrypted_access_token: String,
-}
-
-async fn create_access_token(
-    Path(user_id): Path<UserId>,
-    Query(params): Query<CreateAccessTokenQueryParams>,
-    Extension(app): Extension<Arc<AppState>>,
-) -> Result<Json<CreateAccessTokenResponse>> {
-    let user = app
-        .db
-        .get_user_by_id(user_id)
-        .await?
-        .context("user not found")?;
-
-    let mut impersonated_user_id = None;
-    if let Some(impersonate) = params.impersonate {
-        if user.admin {
-            if let Some(impersonated_user) = app.db.get_user_by_github_login(&impersonate).await? {
-                impersonated_user_id = Some(impersonated_user.id);
-            } else {
-                return Err(Error::http(
-                    StatusCode::UNPROCESSABLE_ENTITY,
-                    format!("user {impersonate} does not exist"),
-                ));
-            }
-        } else {
-            return Err(Error::http(
-                StatusCode::UNAUTHORIZED,
-                "you do not have permission to impersonate other users".to_string(),
-            ));
-        }
-    }
-
-    let access_token =
-        auth::create_access_token(app.db.as_ref(), user_id, impersonated_user_id).await?;
-    let encrypted_access_token =
-        auth::encrypt_access_token(&access_token, params.public_key.clone())?;
-
-    Ok(Json(CreateAccessTokenResponse {
-        user_id: impersonated_user_id.unwrap_or(user_id),
-        encrypted_access_token,
-    }))
-}
diff --git a/crates/collab/src/api/contributors.rs b/crates/collab/src/api/contributors.rs
deleted file mode 100644
index 574667c723..0000000000
--- a/crates/collab/src/api/contributors.rs
+++ /dev/null
@@ -1,170 +0,0 @@
-use std::sync::{Arc, OnceLock};
-
-use axum::{
-    Extension, Json, Router,
-    extract::{self, Query},
-    routing::get,
-};
-use chrono::{NaiveDateTime, SecondsFormat};
-use serde::{Deserialize, Serialize};
-
-use crate::db::ContributorSelector;
-use crate::{AppState, Result};
-
-pub fn router() -> Router {
-    Router::new()
-        .route("/contributors", get(get_contributors).post(add_contributor))
-        .route("/contributor", get(check_is_contributor))
-}
-
-async fn get_contributors(Extension(app): Extension<Arc<AppState>>) -> Result<Json<Vec<String>>> {
-    Ok(Json(app.db.get_contributors().await?))
-}
-
-#[derive(Debug, Deserialize)]
-struct CheckIsContributorParams {
-    github_user_id: Option<i32>,
-    github_login: Option<String>,
-}
-
-impl CheckIsContributorParams {
-    fn into_contributor_selector(self) -> Result<ContributorSelector> {
-        if let Some(github_user_id) = self.github_user_id {
-            return Ok(ContributorSelector::GitHubUserId { github_user_id });
-        }
-
-        if let Some(github_login) = self.github_login {
-            return Ok(ContributorSelector::GitHubLogin { github_login });
-        }
-
-        Err(anyhow::anyhow!(
-            "must be one of `github_user_id` or `github_login`."
-        ))?
-    }
-}
-
-#[derive(Debug, Serialize)]
-struct CheckIsContributorResponse {
-    signed_at: Option<String>,
-}
-
-async fn check_is_contributor(
-    Extension(app): Extension<Arc<AppState>>,
-    Query(params): Query<CheckIsContributorParams>,
-) -> Result<Json<CheckIsContributorResponse>> {
-    let params = params.into_contributor_selector()?;
-
-    if RenovateBot::is_renovate_bot(&params) {
-        return Ok(Json(CheckIsContributorResponse {
-            signed_at: Some(
-                RenovateBot::created_at()
-                    .and_utc()
-                    .to_rfc3339_opts(SecondsFormat::Millis, true),
-            ),
-        }));
-    }
-
-    if ZedZippyBot::is_zed_zippy_bot(&params) {
-        return Ok(Json(CheckIsContributorResponse {
-            signed_at: Some(
-                ZedZippyBot::created_at()
-                    .and_utc()
-                    .to_rfc3339_opts(SecondsFormat::Millis, true),
-            ),
-        }));
-    }
-
-    Ok(Json(CheckIsContributorResponse {
-        signed_at: app
-            .db
-            .get_contributor_sign_timestamp(&params)
-            .await?
-            .map(|ts| ts.and_utc().to_rfc3339_opts(SecondsFormat::Millis, true)),
-    }))
-}
-
-/// The Renovate bot GitHub user (`renovate[bot]`).
-///
-/// https://api.github.com/users/renovate[bot]
-struct RenovateBot;
-
-impl RenovateBot {
-    const LOGIN: &'static str = "renovate[bot]";
-    const USER_ID: i32 = 29139614;
-
-    /// Returns the `created_at` timestamp for the Renovate bot user.
-    fn created_at() -> &'static NaiveDateTime {
-        static CREATED_AT: OnceLock<NaiveDateTime> = OnceLock::new();
-        CREATED_AT.get_or_init(|| {
-            chrono::DateTime::parse_from_rfc3339("2017-06-02T07:04:12Z")
-                .expect("failed to parse 'created_at' for 'renovate[bot]'")
-                .naive_utc()
-        })
-    }
-
-    /// Returns whether the given contributor selector corresponds to the Renovate bot user.
-    fn is_renovate_bot(contributor: &ContributorSelector) -> bool {
-        match contributor {
-            ContributorSelector::GitHubLogin { github_login } => github_login == Self::LOGIN,
-            ContributorSelector::GitHubUserId { github_user_id } => {
-                github_user_id == &Self::USER_ID
-            }
-        }
-    }
-}
-
-/// The Zed Zippy bot GitHub user (`zed-zippy[bot]`).
-///
-/// https://api.github.com/users/zed-zippy[bot]
-struct ZedZippyBot;
-
-impl ZedZippyBot {
-    const LOGIN: &'static str = "zed-zippy[bot]";
-    const USER_ID: i32 = 234243425;
-
-    /// Returns the `created_at` timestamp for the Zed Zippy bot user.
-    fn created_at() -> &'static NaiveDateTime {
-        static CREATED_AT: OnceLock<NaiveDateTime> = OnceLock::new();
-        CREATED_AT.get_or_init(|| {
-            chrono::DateTime::parse_from_rfc3339("2025-09-24T17:00:11Z")
-                .expect("failed to parse 'created_at' for 'zed-zippy[bot]'")
-                .naive_utc()
-        })
-    }
-
-    /// Returns whether the given contributor selector corresponds to the Zed Zippy bot user.
-    fn is_zed_zippy_bot(contributor: &ContributorSelector) -> bool {
-        match contributor {
-            ContributorSelector::GitHubLogin { github_login } => github_login == Self::LOGIN,
-            ContributorSelector::GitHubUserId { github_user_id } => {
-                github_user_id == &Self::USER_ID
-            }
-        }
-    }
-}
-
-#[derive(Debug, Deserialize)]
-struct AddContributorBody {
-    github_user_id: i32,
-    github_login: String,
-    github_email: Option<String>,
-    github_name: Option<String>,
-    github_user_created_at: chrono::DateTime<chrono::Utc>,
-}
-
-async fn add_contributor(
-    Extension(app): Extension<Arc<AppState>>,
-    extract::Json(params): extract::Json<AddContributorBody>,
-) -> Result<()> {
-    let initial_channel_id = app.config.auto_join_channel_id;
-    app.db
-        .add_contributor(
-            &params.github_login,
-            params.github_user_id,
-            params.github_email.as_deref(),
-            params.github_name.as_deref(),
-            params.github_user_created_at,
-            initial_channel_id,
-        )
-        .await
-}
diff --git a/crates/collab/src/api/events.rs b/crates/collab/src/api/events.rs
deleted file mode 100644
index 0c1419144d..0000000000
--- a/crates/collab/src/api/events.rs
+++ /dev/null
@@ -1,232 +0,0 @@
-use crate::api::CloudflareIpCountryHeader;
-use crate::{AppState, Error, Result};
-use anyhow::anyhow;
-use axum::{
-    Extension, Router, TypedHeader,
-    body::Bytes,
-    headers::Header,
-    http::{HeaderName, StatusCode},
-    routing::post,
-};
-use chrono::Duration;
-use serde::{Deserialize, Serialize};
-use serde_json::json;
-use sha2::{Digest, Sha256};
-use std::sync::{Arc, OnceLock};
-use telemetry_events::{Event, EventRequestBody};
-use util::ResultExt;
-use uuid::Uuid;
-
-pub fn router() -> Router {
-    Router::new()
-        .route("/telemetry/events", post(post_events))
-        .route("/telemetry/crashes", post(post_panic))
-        .route("/telemetry/panics", post(post_panic))
-        .route("/telemetry/hangs", post(post_panic))
-}
-
-pub struct ZedChecksumHeader(Vec<u8>);
-
-impl Header for ZedChecksumHeader {
-    fn name() -> &'static HeaderName {
-        static ZED_CHECKSUM_HEADER: OnceLock<HeaderName> = OnceLock::new();
-        ZED_CHECKSUM_HEADER.get_or_init(|| HeaderName::from_static("x-zed-checksum"))
-    }
-
-    fn decode<'i, I>(values: &mut I) -> Result<Self, axum::headers::Error>
-    where
-        Self: Sized,
-        I: Iterator<Item = &'i axum::http::HeaderValue>,
-    {
-        let checksum = values
-            .next()
-            .ok_or_else(axum::headers::Error::invalid)?
-            .to_str()
-            .map_err(|_| axum::headers::Error::invalid())?;
-
-        let bytes = hex::decode(checksum).map_err(|_| axum::headers::Error::invalid())?;
-        Ok(Self(bytes))
-    }
-
-    fn encode<E: Extend<axum::http::HeaderValue>>(&self, _values: &mut E) {
-        unimplemented!()
-    }
-}
-
-pub async fn post_panic() -> Result<()> {
-    // as of v0.201.x crash/panic reporting is now done via Sentry.
-    // The endpoint returns OK to avoid spurious errors for old clients.
-    Ok(())
-}
-
-pub async fn post_events(
-    Extension(app): Extension<Arc<AppState>>,
-    TypedHeader(ZedChecksumHeader(checksum)): TypedHeader<ZedChecksumHeader>,
-    country_code_header: Option<TypedHeader<CloudflareIpCountryHeader>>,
-    body: Bytes,
-) -> Result<()> {
-    let Some(expected) = calculate_json_checksum(app.clone(), &body) else {
-        return Err(Error::http(
-            StatusCode::INTERNAL_SERVER_ERROR,
-            "events not enabled".into(),
-        ))?;
-    };
-
-    let checksum_matched = checksum == expected;
-
-    let request_body: telemetry_events::EventRequestBody =
-        serde_json::from_slice(&body).map_err(|err| {
-            log::error!("can't parse event json: {err}");
-            Error::Internal(anyhow!(err))
-        })?;
-
-    let Some(last_event) = request_body.events.last() else {
-        return Err(Error::http(StatusCode::BAD_REQUEST, "no events".into()))?;
-    };
-    let country_code = country_code_header.map(|h| h.to_string());
-
-    let first_event_at = chrono::Utc::now()
-        - chrono::Duration::milliseconds(last_event.milliseconds_since_first_event);
-
-    if let Some(kinesis_client) = app.kinesis_client.clone()
-        && let Some(stream) = app.config.kinesis_stream.clone()
-    {
-        let mut request = kinesis_client.put_records().stream_name(stream);
-        let mut has_records = false;
-        for row in for_snowflake(
-            request_body.clone(),
-            first_event_at,
-            country_code.clone(),
-            checksum_matched,
-        ) {
-            if let Some(data) = serde_json::to_vec(&row).log_err() {
-                request = request.records(
-                    aws_sdk_kinesis::types::PutRecordsRequestEntry::builder()
-                        .partition_key(request_body.system_id.clone().unwrap_or_default())
-                        .data(data.into())
-                        .build()
-                        .unwrap(),
-                );
-                has_records = true;
-            }
-        }
-        if has_records {
-            request.send().await.log_err();
-        }
-    };
-
-    Ok(())
-}
-
-pub fn calculate_json_checksum(app: Arc<AppState>, json: &impl AsRef<[u8]>) -> Option<Vec<u8>> {
-    let checksum_seed = app.config.zed_client_checksum_seed.as_ref()?;
-
-    let mut summer = Sha256::new();
-    summer.update(checksum_seed);
-    summer.update(json);
-    summer.update(checksum_seed);
-    Some(summer.finalize().into_iter().collect())
-}
-
-fn for_snowflake(
-    body: EventRequestBody,
-    first_event_at: chrono::DateTime<chrono::Utc>,
-    country_code: Option<String>,
-    checksum_matched: bool,
-) -> impl Iterator<Item = SnowflakeRow> {
-    body.events.into_iter().map(move |event| {
-        let timestamp =
-            first_event_at + Duration::milliseconds(event.milliseconds_since_first_event);
-        let (event_type, mut event_properties) = match &event.event {
-            Event::Flexible(e) => (
-                e.event_type.clone(),
-                serde_json::to_value(&e.event_properties).unwrap(),
-            ),
-        };
-
-        if let serde_json::Value::Object(ref mut map) = event_properties {
-            map.insert("app_version".to_string(), body.app_version.clone().into());
-            map.insert("os_name".to_string(), body.os_name.clone().into());
-            map.insert("os_version".to_string(), body.os_version.clone().into());
-            map.insert("architecture".to_string(), body.architecture.clone().into());
-            map.insert(
-                "release_channel".to_string(),
-                body.release_channel.clone().into(),
-            );
-            map.insert("signed_in".to_string(), event.signed_in.into());
-            map.insert("checksum_matched".to_string(), checksum_matched.into());
-            if let Some(country_code) = country_code.as_ref() {
-                map.insert("country".to_string(), country_code.clone().into());
-            }
-        }
-
-        // NOTE: most amplitude user properties are read out of our event_properties
-        // dictionary. See https://app.amplitude.com/data/zed/Zed/sources/detail/production/falcon%3A159998
-        // for how that is configured.
-        let user_properties = body.is_staff.map(|is_staff| {
-            serde_json::json!({
-                "is_staff": is_staff,
-            })
-        });
-
-        SnowflakeRow {
-            time: timestamp,
-            user_id: body.metrics_id.clone(),
-            device_id: body.system_id.clone(),
-            event_type,
-            event_properties,
-            user_properties,
-            insert_id: Some(Uuid::new_v4().to_string()),
-        }
-    })
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct SnowflakeRow {
-    pub time: chrono::DateTime<chrono::Utc>,
-    pub user_id: Option<String>,
-    pub device_id: Option<String>,
-    pub event_type: String,
-    pub event_properties: serde_json::Value,
-    pub user_properties: Option<serde_json::Value>,
-    pub insert_id: Option<String>,
-}
-
-impl SnowflakeRow {
-    pub fn new(
-        event_type: impl Into<String>,
-        metrics_id: Option<Uuid>,
-        is_staff: bool,
-        system_id: Option<String>,
-        event_properties: serde_json::Value,
-    ) -> Self {
-        Self {
-            time: chrono::Utc::now(),
-            event_type: event_type.into(),
-            device_id: system_id,
-            user_id: metrics_id.map(|id| id.to_string()),
-            insert_id: Some(uuid::Uuid::new_v4().to_string()),
-            event_properties,
-            user_properties: Some(json!({"is_staff": is_staff})),
-        }
-    }
-
-    pub async fn write(
-        self,
-        client: &Option<aws_sdk_kinesis::Client>,
-        stream: &Option<String>,
-    ) -> anyhow::Result<()> {
-        let Some((client, stream)) = client.as_ref().zip(stream.as_ref()) else {
-            return Ok(());
-        };
-        let row = serde_json::to_vec(&self)?;
-        client
-            .put_record()
-            .stream_name(stream)
-            .partition_key(&self.user_id.unwrap_or_default())
-            .data(row.into())
-            .send()
-            .await?;
-        Ok(())
-    }
-}
diff --git a/crates/collab/src/api/extensions.rs b/crates/collab/src/api/extensions.rs
deleted file mode 100644
index 187b2ab279..0000000000
--- a/crates/collab/src/api/extensions.rs
+++ /dev/null
@@ -1,417 +0,0 @@
-use crate::db::ExtensionVersionConstraints;
-use crate::{AppState, Error, Result, db::NewExtensionVersion};
-use anyhow::Context as _;
-use aws_sdk_s3::presigning::PresigningConfig;
-use axum::{
-    Extension, Json, Router,
-    extract::{Path, Query},
-    http::StatusCode,
-    response::Redirect,
-    routing::get,
-};
-use collections::{BTreeSet, HashMap};
-use rpc::{ExtensionApiManifest, ExtensionProvides, GetExtensionsResponse};
-use semver::Version as SemanticVersion;
-use serde::Deserialize;
-use std::str::FromStr;
-use std::{sync::Arc, time::Duration};
-use time::PrimitiveDateTime;
-use util::{ResultExt, maybe};
-
-pub fn router() -> Router {
-    Router::new()
-        .route("/extensions", get(get_extensions))
-        .route("/extensions/updates", get(get_extension_updates))
-        .route("/extensions/:extension_id", get(get_extension_versions))
-        .route(
-            "/extensions/:extension_id/download",
-            get(download_latest_extension),
-        )
-        .route(
-            "/extensions/:extension_id/:version/download",
-            get(download_extension),
-        )
-}
-
-#[derive(Debug, Deserialize)]
-struct GetExtensionsParams {
-    filter: Option<String>,
-    /// A comma-delimited list of features that the extension must provide.
-    ///
-    /// For example:
-    /// - `themes`
-    /// - `themes,icon-themes`
-    /// - `languages,language-servers`
-    #[serde(default)]
-    provides: Option<String>,
-    #[serde(default)]
-    max_schema_version: i32,
-}
-
-async fn get_extensions(
-    Extension(app): Extension<Arc<AppState>>,
-    Query(params): Query<GetExtensionsParams>,
-) -> Result<Json<GetExtensionsResponse>> {
-    let provides_filter = params.provides.map(|provides| {
-        provides
-            .split(',')
-            .map(|value| value.trim())
-            .filter_map(|value| ExtensionProvides::from_str(value).ok())
-            .collect::<BTreeSet<_>>()
-    });
-
-    let mut extensions = app
-        .db
-        .get_extensions(
-            params.filter.as_deref(),
-            provides_filter.as_ref(),
-            params.max_schema_version,
-            1_000,
-        )
-        .await?;
-
-    if let Some(filter) = params.filter.as_deref() {
-        let extension_id = filter.to_lowercase();
-        let mut exact_match = None;
-        extensions.retain(|extension| {
-            if extension.id.as_ref() == extension_id {
-                exact_match = Some(extension.clone());
-                false
-            } else {
-                true
-            }
-        });
-        if exact_match.is_none() {
-            exact_match = app
-                .db
-                .get_extensions_by_ids(&[&extension_id], None)
-                .await?
-                .first()
-                .cloned();
-        }
-
-        if let Some(exact_match) = exact_match {
-            extensions.insert(0, exact_match);
-        }
-    };
-
-    if let Some(query) = params.filter.as_deref() {
-        let count = extensions.len();
-        tracing::info!(query, count, "extension_search")
-    }
-
-    Ok(Json(GetExtensionsResponse { data: extensions }))
-}
-
-#[derive(Debug, Deserialize)]
-struct GetExtensionUpdatesParams {
-    ids: String,
-    min_schema_version: i32,
-    max_schema_version: i32,
-    min_wasm_api_version: semver::Version,
-    max_wasm_api_version: semver::Version,
-}
-
-async fn get_extension_updates(
-    Extension(app): Extension<Arc<AppState>>,
-    Query(params): Query<GetExtensionUpdatesParams>,
-) -> Result<Json<GetExtensionsResponse>> {
-    let constraints = ExtensionVersionConstraints {
-        schema_versions: params.min_schema_version..=params.max_schema_version,
-        wasm_api_versions: params.min_wasm_api_version..=params.max_wasm_api_version,
-    };
-
-    let extension_ids = params.ids.split(',').map(|s| s.trim()).collect::<Vec<_>>();
-
-    let extensions = app
-        .db
-        .get_extensions_by_ids(&extension_ids, Some(&constraints))
-        .await?;
-
-    Ok(Json(GetExtensionsResponse { data: extensions }))
-}
-
-#[derive(Debug, Deserialize)]
-struct GetExtensionVersionsParams {
-    extension_id: String,
-}
-
-async fn get_extension_versions(
-    Extension(app): Extension<Arc<AppState>>,
-    Path(params): Path<GetExtensionVersionsParams>,
-) -> Result<Json<GetExtensionsResponse>> {
-    let extension_versions = app.db.get_extension_versions(&params.extension_id).await?;
-
-    Ok(Json(GetExtensionsResponse {
-        data: extension_versions,
-    }))
-}
-
-#[derive(Debug, Deserialize)]
-struct DownloadLatestExtensionPathParams {
-    extension_id: String,
-}
-
-#[derive(Debug, Deserialize)]
-struct DownloadLatestExtensionQueryParams {
-    min_schema_version: Option<i32>,
-    max_schema_version: Option<i32>,
-    min_wasm_api_version: Option<SemanticVersion>,
-    max_wasm_api_version: Option<SemanticVersion>,
-}
-
-async fn download_latest_extension(
-    Extension(app): Extension<Arc<AppState>>,
-    Path(params): Path<DownloadLatestExtensionPathParams>,
-    Query(query): Query<DownloadLatestExtensionQueryParams>,
-) -> Result<Redirect> {
-    let constraints = maybe!({
-        let min_schema_version = query.min_schema_version?;
-        let max_schema_version = query.max_schema_version?;
-        let min_wasm_api_version = query.min_wasm_api_version?;
-        let max_wasm_api_version = query.max_wasm_api_version?;
-
-        Some(ExtensionVersionConstraints {
-            schema_versions: min_schema_version..=max_schema_version,
-            wasm_api_versions: min_wasm_api_version..=max_wasm_api_version,
-        })
-    });
-
-    let extension = app
-        .db
-        .get_extension(&params.extension_id, constraints.as_ref())
-        .await?
-        .context("unknown extension")?;
-    download_extension(
-        Extension(app),
-        Path(DownloadExtensionParams {
-            extension_id: params.extension_id,
-            version: extension.manifest.version.to_string(),
-        }),
-    )
-    .await
-}
-
-#[derive(Debug, Deserialize)]
-struct DownloadExtensionParams {
-    extension_id: String,
-    version: String,
-}
-
-async fn download_extension(
-    Extension(app): Extension<Arc<AppState>>,
-    Path(params): Path<DownloadExtensionParams>,
-) -> Result<Redirect> {
-    let Some((blob_store_client, bucket)) = app
-        .blob_store_client
-        .clone()
-        .zip(app.config.blob_store_bucket.clone())
-    else {
-        Err(Error::http(
-            StatusCode::NOT_IMPLEMENTED,
-            "not supported".into(),
-        ))?
-    };
-
-    let DownloadExtensionParams {
-        extension_id,
-        version,
-    } = params;
-
-    let version_exists = app
-        .db
-        .record_extension_download(&extension_id, &version)
-        .await?;
-
-    if !version_exists {
-        Err(Error::http(
-            StatusCode::NOT_FOUND,
-            "unknown extension version".into(),
-        ))?;
-    }
-
-    let url = blob_store_client
-        .get_object()
-        .bucket(bucket)
-        .key(format!(
-            "extensions/{extension_id}/{version}/archive.tar.gz"
-        ))
-        .presigned(PresigningConfig::expires_in(EXTENSION_DOWNLOAD_URL_LIFETIME).unwrap())
-        .await
-        .context("creating presigned extension download url")?;
-
-    Ok(Redirect::temporary(url.uri()))
-}
-
-const EXTENSION_FETCH_INTERVAL: Duration = Duration::from_secs(5 * 60);
-const EXTENSION_DOWNLOAD_URL_LIFETIME: Duration = Duration::from_secs(3 * 60);
-
-pub fn fetch_extensions_from_blob_store_periodically(app_state: Arc<AppState>) {
-    let Some(blob_store_client) = app_state.blob_store_client.clone() else {
-        log::info!("no blob store client");
-        return;
-    };
-    let Some(blob_store_bucket) = app_state.config.blob_store_bucket.clone() else {
-        log::info!("no blob store bucket");
-        return;
-    };
-
-    let executor = app_state.executor.clone();
-    executor.spawn_detached({
-        let executor = executor.clone();
-        async move {
-            loop {
-                fetch_extensions_from_blob_store(
-                    &blob_store_client,
-                    &blob_store_bucket,
-                    &app_state,
-                )
-                .await
-                .log_err();
-                executor.sleep(EXTENSION_FETCH_INTERVAL).await;
-            }
-        }
-    });
-}
-
-async fn fetch_extensions_from_blob_store(
-    blob_store_client: &aws_sdk_s3::Client,
-    blob_store_bucket: &String,
-    app_state: &Arc<AppState>,
-) -> anyhow::Result<()> {
-    log::info!("fetching extensions from blob store");
-
-    let mut next_marker = None;
-    let mut published_versions = HashMap::<String, Vec<String>>::default();
-
-    loop {
-        let list = blob_store_client
-            .list_objects()
-            .bucket(blob_store_bucket)
-            .prefix("extensions/")
-            .set_marker(next_marker.clone())
-            .send()
-            .await?;
-        let objects = list.contents.unwrap_or_default();
-        log::info!("fetched {} object(s) from blob store", objects.len());
-
-        for object in &objects {
-            let Some(key) = object.key.as_ref() else {
-                continue;
-            };
-            let mut parts = key.split('/');
-            let Some(_) = parts.next().filter(|part| *part == "extensions") else {
-                continue;
-            };
-            let Some(extension_id) = parts.next() else {
-                continue;
-            };
-            let Some(version) = parts.next() else {
-                continue;
-            };
-            if parts.next() == Some("manifest.json") {
-                published_versions
-                    .entry(extension_id.to_owned())
-                    .or_default()
-                    .push(version.to_owned());
-            }
-        }
-
-        if let (Some(true), Some(last_object)) = (list.is_truncated, objects.last()) {
-            next_marker.clone_from(&last_object.key);
-        } else {
-            break;
-        }
-    }
-
-    log::info!("found {} published extensions", published_versions.len());
-
-    let known_versions = app_state.db.get_known_extension_versions().await?;
-
-    let mut new_versions = HashMap::<&str, Vec<NewExtensionVersion>>::default();
-    let empty = Vec::new();
-    for (extension_id, published_versions) in &published_versions {
-        let known_versions = known_versions.get(extension_id).unwrap_or(&empty);
-
-        for published_version in published_versions {
-            if known_versions
-                .binary_search_by_key(&published_version, |known_version| known_version)
-                .is_err()
-                && let Some(extension) = fetch_extension_manifest(
-                    blob_store_client,
-                    blob_store_bucket,
-                    extension_id,
-                    published_version,
-                )
-                .await
-                .log_err()
-            {
-                new_versions
-                    .entry(extension_id)
-                    .or_default()
-                    .push(extension);
-            }
-        }
-    }
-
-    app_state
-        .db
-        .insert_extension_versions(&new_versions)
-        .await?;
-
-    log::info!(
-        "fetched {} new extensions from blob store",
-        new_versions.values().map(|v| v.len()).sum::<usize>()
-    );
-
-    Ok(())
-}
-
-async fn fetch_extension_manifest(
-    blob_store_client: &aws_sdk_s3::Client,
-    blob_store_bucket: &String,
-    extension_id: &str,
-    version: &str,
-) -> anyhow::Result<NewExtensionVersion> {
-    let object = blob_store_client
-        .get_object()
-        .bucket(blob_store_bucket)
-        .key(format!("extensions/{extension_id}/{version}/manifest.json"))
-        .send()
-        .await?;
-    let manifest_bytes = object
-        .body
-        .collect()
-        .await
-        .map(|data| data.into_bytes())
-        .with_context(|| {
-            format!("failed to download manifest for extension {extension_id} version {version}")
-        })?
-        .to_vec();
-    let manifest =
-        serde_json::from_slice::<ExtensionApiManifest>(&manifest_bytes).with_context(|| {
-            format!(
-                "invalid manifest for extension {extension_id} version {version}: {}",
-                String::from_utf8_lossy(&manifest_bytes)
-            )
-        })?;
-    let published_at = object.last_modified.with_context(|| {
-        format!("missing last modified timestamp for extension {extension_id} version {version}")
-    })?;
-    let published_at = time::OffsetDateTime::from_unix_timestamp_nanos(published_at.as_nanos())?;
-    let published_at = PrimitiveDateTime::new(published_at.date(), published_at.time());
-    let version = semver::Version::parse(&manifest.version).with_context(|| {
-        format!("invalid version for extension {extension_id} version {version}")
-    })?;
-    Ok(NewExtensionVersion {
-        name: manifest.name,
-        version,
-        description: manifest.description.unwrap_or_default(),
-        authors: manifest.authors,
-        repository: manifest.repository,
-        schema_version: manifest.schema_version.unwrap_or(0),
-        wasm_api_version: manifest.wasm_api_version,
-        provides: manifest.provides,
-        published_at,
-    })
-}
diff --git a/crates/collab/src/auth.rs b/crates/collab/src/auth.rs
deleted file mode 100644
index 13296b79ae..0000000000
--- a/crates/collab/src/auth.rs
+++ /dev/null
@@ -1,399 +0,0 @@
-use crate::{
-    AppState, Error, Result,
-    db::{self, AccessTokenId, Database, UserId},
-    rpc::Principal,
-};
-use anyhow::Context as _;
-use axum::{
-    http::{self, Request, StatusCode},
-    middleware::Next,
-    response::IntoResponse,
-};
-use base64::prelude::*;
-use prometheus::{Histogram, exponential_buckets, register_histogram};
-pub use rpc::auth::random_token;
-use scrypt::{
-    Scrypt,
-    password_hash::{PasswordHash, PasswordVerifier},
-};
-use serde::{Deserialize, Serialize};
-use sha2::Digest;
-use std::sync::OnceLock;
-use std::{sync::Arc, time::Instant};
-use subtle::ConstantTimeEq;
-
-/// Validates the authorization header and adds an Extension<Principal> to the request.
-/// Authorization: <user-id> <token>
-///   <token> can be an access_token attached to that user, or an access token of an admin
-///   or (in development) the string ADMIN:<config.api_token>.
-/// Authorization: "dev-server-token" <token>
-pub async fn validate_header<B>(mut req: Request<B>, next: Next<B>) -> impl IntoResponse {
-    let mut auth_header = req
-        .headers()
-        .get(http::header::AUTHORIZATION)
-        .and_then(|header| header.to_str().ok())
-        .ok_or_else(|| {
-            Error::http(
-                StatusCode::UNAUTHORIZED,
-                "missing authorization header".to_string(),
-            )
-        })?
-        .split_whitespace();
-
-    let state = req.extensions().get::<Arc<AppState>>().unwrap();
-
-    let first = auth_header.next().unwrap_or("");
-    if first == "dev-server-token" {
-        Err(Error::http(
-            StatusCode::UNAUTHORIZED,
-            "Dev servers were removed in Zed 0.157 please upgrade to SSH remoting".to_string(),
-        ))?;
-    }
-
-    let user_id = UserId(first.parse().map_err(|_| {
-        Error::http(
-            StatusCode::BAD_REQUEST,
-            "missing user id in authorization header".to_string(),
-        )
-    })?);
-
-    let access_token = auth_header.next().ok_or_else(|| {
-        Error::http(
-            StatusCode::BAD_REQUEST,
-            "missing access token in authorization header".to_string(),
-        )
-    })?;
-
-    // In development, allow impersonation using the admin API token.
-    // Don't allow this in production because we can't tell who is doing
-    // the impersonating.
-    let validate_result = if let (Some(admin_token), true) = (
-        access_token.strip_prefix("ADMIN_TOKEN:"),
-        state.config.is_development(),
-    ) {
-        Ok(VerifyAccessTokenResult {
-            is_valid: state.config.api_token == admin_token,
-            impersonator_id: None,
-        })
-    } else {
-        verify_access_token(access_token, user_id, &state.db).await
-    };
-
-    if let Ok(validate_result) = validate_result
-        && validate_result.is_valid
-    {
-        let user = state
-            .db
-            .get_user_by_id(user_id)
-            .await?
-            .with_context(|| format!("user {user_id} not found"))?;
-
-        if let Some(impersonator_id) = validate_result.impersonator_id {
-            let admin = state
-                .db
-                .get_user_by_id(impersonator_id)
-                .await?
-                .with_context(|| format!("user {impersonator_id} not found"))?;
-            req.extensions_mut()
-                .insert(Principal::Impersonated { user, admin });
-        } else {
-            req.extensions_mut().insert(Principal::User(user));
-        };
-        return Ok::<_, Error>(next.run(req).await);
-    }
-
-    Err(Error::http(
-        StatusCode::UNAUTHORIZED,
-        "invalid credentials".to_string(),
-    ))
-}
-
-const MAX_ACCESS_TOKENS_TO_STORE: usize = 8;
-
-#[derive(Serialize, Deserialize)]
-struct AccessTokenJson {
-    version: usize,
-    id: AccessTokenId,
-    token: String,
-}
-
-/// Creates a new access token to identify the given user. before returning it, you should
-/// encrypt it with the user's public key.
-pub async fn create_access_token(
-    db: &db::Database,
-    user_id: UserId,
-    impersonated_user_id: Option<UserId>,
-) -> Result<String> {
-    const VERSION: usize = 1;
-    let access_token = rpc::auth::random_token();
-    let access_token_hash = hash_access_token(&access_token);
-    let id = db
-        .create_access_token(
-            user_id,
-            impersonated_user_id,
-            &access_token_hash,
-            MAX_ACCESS_TOKENS_TO_STORE,
-        )
-        .await?;
-    Ok(serde_json::to_string(&AccessTokenJson {
-        version: VERSION,
-        id,
-        token: access_token,
-    })?)
-}
-
-/// Hashing prevents anyone with access to the database being able to login.
-/// As the token is randomly generated, we don't need to worry about scrypt-style
-/// protection.
-pub fn hash_access_token(token: &str) -> String {
-    let digest = sha2::Sha256::digest(token);
-    format!("$sha256${}", BASE64_URL_SAFE.encode(digest))
-}
-
-/// Encrypts the given access token with the given public key to avoid leaking it on the way
-/// to the client.
-pub fn encrypt_access_token(access_token: &str, public_key: String) -> Result<String> {
-    use rpc::auth::EncryptionFormat;
-
-    /// The encryption format to use for the access token.
-    const ENCRYPTION_FORMAT: EncryptionFormat = EncryptionFormat::V1;
-
-    let native_app_public_key =
-        rpc::auth::PublicKey::try_from(public_key).context("failed to parse app public key")?;
-    let encrypted_access_token = native_app_public_key
-        .encrypt_string(access_token, ENCRYPTION_FORMAT)
-        .context("failed to encrypt access token with public key")?;
-    Ok(encrypted_access_token)
-}
-
-pub struct VerifyAccessTokenResult {
-    pub is_valid: bool,
-    pub impersonator_id: Option<UserId>,
-}
-
-/// Checks that the given access token is valid for the given user.
-pub async fn verify_access_token(
-    token: &str,
-    user_id: UserId,
-    db: &Arc<Database>,
-) -> Result<VerifyAccessTokenResult> {
-    static METRIC_ACCESS_TOKEN_HASHING_TIME: OnceLock<Histogram> = OnceLock::new();
-    let metric_access_token_hashing_time = METRIC_ACCESS_TOKEN_HASHING_TIME.get_or_init(|| {
-        register_histogram!(
-            "access_token_hashing_time",
-            "time spent hashing access tokens",
-            exponential_buckets(10.0, 2.0, 10).unwrap(),
-        )
-        .unwrap()
-    });
-
-    let token: AccessTokenJson = serde_json::from_str(token)?;
-
-    let db_token = db.get_access_token(token.id).await?;
-    let token_user_id = db_token.impersonated_user_id.unwrap_or(db_token.user_id);
-    if token_user_id != user_id {
-        return Err(anyhow::anyhow!("no such access token"))?;
-    }
-    let t0 = Instant::now();
-
-    let is_valid = if db_token.hash.starts_with("$scrypt$") {
-        let db_hash = PasswordHash::new(&db_token.hash).map_err(anyhow::Error::new)?;
-        Scrypt
-            .verify_password(token.token.as_bytes(), &db_hash)
-            .is_ok()
-    } else {
-        let token_hash = hash_access_token(&token.token);
-        db_token.hash.as_bytes().ct_eq(token_hash.as_ref()).into()
-    };
-
-    let duration = t0.elapsed();
-    log::info!("hashed access token in {:?}", duration);
-    metric_access_token_hashing_time.observe(duration.as_millis() as f64);
-
-    if is_valid && db_token.hash.starts_with("$scrypt$") {
-        let new_hash = hash_access_token(&token.token);
-        db.update_access_token_hash(db_token.id, &new_hash).await?;
-    }
-
-    Ok(VerifyAccessTokenResult {
-        is_valid,
-        impersonator_id: if db_token.impersonated_user_id.is_some() {
-            Some(db_token.user_id)
-        } else {
-            None
-        },
-    })
-}
-
-#[cfg(test)]
-mod test {
-    use rand::prelude::*;
-    use scrypt::password_hash::{PasswordHasher, SaltString};
-    use sea_orm::EntityTrait;
-
-    use super::*;
-    use crate::db::{NewUserParams, access_token};
-
-    #[gpui::test]
-    async fn test_verify_access_token(cx: &mut gpui::TestAppContext) {
-        let test_db = crate::db::TestDb::sqlite(cx.executor());
-        let db = test_db.db();
-
-        let user = db
-            .create_user(
-                "example@example.com",
-                None,
-                false,
-                NewUserParams {
-                    github_login: "example".into(),
-                    github_user_id: 1,
-                },
-            )
-            .await
-            .unwrap();
-
-        let token = create_access_token(db, user.user_id, None).await.unwrap();
-        assert!(matches!(
-            verify_access_token(&token, user.user_id, db).await.unwrap(),
-            VerifyAccessTokenResult {
-                is_valid: true,
-                impersonator_id: None,
-            }
-        ));
-
-        let old_token = create_previous_access_token(user.user_id, None, db)
-            .await
-            .unwrap();
-
-        let old_token_id = serde_json::from_str::<AccessTokenJson>(&old_token)
-            .unwrap()
-            .id;
-
-        let hash = db
-            .transaction(|tx| async move {
-                Ok(access_token::Entity::find_by_id(old_token_id)
-                    .one(&*tx)
-                    .await?)
-            })
-            .await
-            .unwrap()
-            .unwrap()
-            .hash;
-        assert!(hash.starts_with("$scrypt$"));
-
-        assert!(matches!(
-            verify_access_token(&old_token, user.user_id, db)
-                .await
-                .unwrap(),
-            VerifyAccessTokenResult {
-                is_valid: true,
-                impersonator_id: None,
-            }
-        ));
-
-        let hash = db
-            .transaction(|tx| async move {
-                Ok(access_token::Entity::find_by_id(old_token_id)
-                    .one(&*tx)
-                    .await?)
-            })
-            .await
-            .unwrap()
-            .unwrap()
-            .hash;
-        assert!(hash.starts_with("$sha256$"));
-
-        assert!(matches!(
-            verify_access_token(&old_token, user.user_id, db)
-                .await
-                .unwrap(),
-            VerifyAccessTokenResult {
-                is_valid: true,
-                impersonator_id: None,
-            }
-        ));
-
-        assert!(matches!(
-            verify_access_token(&token, user.user_id, db).await.unwrap(),
-            VerifyAccessTokenResult {
-                is_valid: true,
-                impersonator_id: None,
-            }
-        ));
-    }
-
-    async fn create_previous_access_token(
-        user_id: UserId,
-        impersonated_user_id: Option<UserId>,
-        db: &Database,
-    ) -> Result<String> {
-        let access_token = rpc::auth::random_token();
-        let access_token_hash = previous_hash_access_token(&access_token)?;
-        let id = db
-            .create_access_token(
-                user_id,
-                impersonated_user_id,
-                &access_token_hash,
-                MAX_ACCESS_TOKENS_TO_STORE,
-            )
-            .await?;
-        Ok(serde_json::to_string(&AccessTokenJson {
-            version: 1,
-            id,
-            token: access_token,
-        })?)
-    }
-
-    fn previous_hash_access_token(token: &str) -> Result<String> {
-        // Avoid slow hashing in debug mode.
-        let params = if cfg!(debug_assertions) {
-            scrypt::Params::new(1, 1, 1, scrypt::Params::RECOMMENDED_LEN).unwrap()
-        } else {
-            scrypt::Params::new(14, 8, 1, scrypt::Params::RECOMMENDED_LEN).unwrap()
-        };
-
-        Ok(Scrypt
-            .hash_password_customized(
-                token.as_bytes(),
-                None,
-                None,
-                params,
-                &SaltString::generate(PasswordHashRngCompat::new()),
-            )
-            .map_err(anyhow::Error::new)?
-            .to_string())
-    }
-
-    // TODO: remove once we password_hash v0.6 is released.
-    struct PasswordHashRngCompat(rand::rngs::ThreadRng);
-
-    impl PasswordHashRngCompat {
-        fn new() -> Self {
-            Self(rand::rng())
-        }
-    }
-
-    impl scrypt::password_hash::rand_core::RngCore for PasswordHashRngCompat {
-        fn next_u32(&mut self) -> u32 {
-            self.0.next_u32()
-        }
-
-        fn next_u64(&mut self) -> u64 {
-            self.0.next_u64()
-        }
-
-        fn fill_bytes(&mut self, dest: &mut [u8]) {
-            self.0.fill_bytes(dest);
-        }
-
-        fn try_fill_bytes(
-            &mut self,
-            dest: &mut [u8],
-        ) -> Result<(), scrypt::password_hash::rand_core::Error> {
-            self.fill_bytes(dest);
-            Ok(())
-        }
-    }
-
-    impl scrypt::password_hash::rand_core::CryptoRng for PasswordHashRngCompat {}
-}
diff --git a/crates/collab/src/bin/dotenv.rs b/crates/collab/src/bin/dotenv.rs
deleted file mode 100644
index 2ba7a3e1e6..0000000000
--- a/crates/collab/src/bin/dotenv.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-use collab::env::get_dotenv_vars;
-
-fn main() -> anyhow::Result<()> {
-    for (key, value) in get_dotenv_vars(".")? {
-        if option_env!("POWERSHELL").is_some() {
-            println!("$env:{}=\"{}\"", key, value);
-        } else {
-            println!("export {}=\"{}\"", key, value);
-        }
-    }
-    Ok(())
-}
diff --git a/crates/collab/src/completion.rs b/crates/collab/src/completion.rs
deleted file mode 100644
index dd1f4b3be6..0000000000
--- a/crates/collab/src/completion.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-use anyhow::{anyhow, Result};
-use rpc::proto;
diff --git a/crates/collab/src/db.rs b/crates/collab/src/db.rs
deleted file mode 100644
index a3eceb472c..0000000000
--- a/crates/collab/src/db.rs
+++ /dev/null
@@ -1,782 +0,0 @@
-mod ids;
-mod queries;
-mod tables;
-#[cfg(test)]
-pub mod tests;
-
-use crate::{Error, Result};
-use anyhow::{Context as _, anyhow};
-use collections::{BTreeMap, BTreeSet, HashMap, HashSet};
-use dashmap::DashMap;
-use futures::StreamExt;
-use project_repository_statuses::StatusKind;
-use rpc::ExtensionProvides;
-use rpc::{
-    ConnectionId, ExtensionMetadata,
-    proto::{self},
-};
-use sea_orm::{
-    ActiveValue, Condition, ConnectionTrait, DatabaseConnection, DatabaseTransaction,
-    FromQueryResult, IntoActiveModel, IsolationLevel, JoinType, QueryOrder, QuerySelect, Statement,
-    TransactionTrait,
-    entity::prelude::*,
-    sea_query::{Alias, Expr, OnConflict},
-};
-use semver::Version;
-use serde::{Deserialize, Serialize};
-use std::ops::RangeInclusive;
-use std::{
-    future::Future,
-    marker::PhantomData,
-    ops::{Deref, DerefMut},
-    rc::Rc,
-    sync::Arc,
-};
-use time::PrimitiveDateTime;
-use tokio::sync::{Mutex, OwnedMutexGuard};
-use util::paths::PathStyle;
-use worktree_settings_file::LocalSettingsKind;
-
-#[cfg(test)]
-pub use tests::TestDb;
-
-pub use ids::*;
-pub use queries::contributors::ContributorSelector;
-pub use sea_orm::ConnectOptions;
-pub use tables::user::Model as User;
-pub use tables::*;
-
-#[cfg(test)]
-pub struct DatabaseTestOptions {
-    pub executor: gpui::BackgroundExecutor,
-    pub runtime: tokio::runtime::Runtime,
-    pub query_failure_probability: parking_lot::Mutex<f64>,
-}
-
-/// Database gives you a handle that lets you access the database.
-/// It handles pooling internally.
-pub struct Database {
-    options: ConnectOptions,
-    pool: DatabaseConnection,
-    rooms: DashMap<RoomId, Arc<Mutex<()>>>,
-    projects: DashMap<ProjectId, Arc<Mutex<()>>>,
-    notification_kinds_by_id: HashMap<NotificationKindId, &'static str>,
-    notification_kinds_by_name: HashMap<String, NotificationKindId>,
-    #[cfg(test)]
-    test_options: Option<DatabaseTestOptions>,
-}
-
-// The `Database` type has so many methods that its impl blocks are split into
-// separate files in the `queries` folder.
-impl Database {
-    /// Connects to the database with the given options
-    pub async fn new(options: ConnectOptions) -> Result<Self> {
-        sqlx::any::install_default_drivers();
-        Ok(Self {
-            options: options.clone(),
-            pool: sea_orm::Database::connect(options).await?,
-            rooms: DashMap::with_capacity(16384),
-            projects: DashMap::with_capacity(16384),
-            notification_kinds_by_id: HashMap::default(),
-            notification_kinds_by_name: HashMap::default(),
-            #[cfg(test)]
-            test_options: None,
-        })
-    }
-
-    pub fn options(&self) -> &ConnectOptions {
-        &self.options
-    }
-
-    #[cfg(test)]
-    pub fn reset(&self) {
-        self.rooms.clear();
-        self.projects.clear();
-    }
-
-    pub async fn transaction<F, Fut, T>(&self, f: F) -> Result<T>
-    where
-        F: Send + Fn(TransactionHandle) -> Fut,
-        Fut: Send + Future<Output = Result<T>>,
-    {
-        let body = async {
-            let (tx, result) = self.with_transaction(&f).await?;
-            match result {
-                Ok(result) => match tx.commit().await.map_err(Into::into) {
-                    Ok(()) => Ok(result),
-                    Err(error) => Err(error),
-                },
-                Err(error) => {
-                    tx.rollback().await?;
-                    Err(error)
-                }
-            }
-        };
-
-        self.run(body).await
-    }
-
-    /// The same as room_transaction, but if you need to only optionally return a Room.
-    async fn optional_room_transaction<F, Fut, T>(
-        &self,
-        f: F,
-    ) -> Result<Option<TransactionGuard<T>>>
-    where
-        F: Send + Fn(TransactionHandle) -> Fut,
-        Fut: Send + Future<Output = Result<Option<(RoomId, T)>>>,
-    {
-        let body = async {
-            let (tx, result) = self.with_transaction(&f).await?;
-            match result {
-                Ok(Some((room_id, data))) => {
-                    let lock = self.rooms.entry(room_id).or_default().clone();
-                    let _guard = lock.lock_owned().await;
-                    match tx.commit().await.map_err(Into::into) {
-                        Ok(()) => Ok(Some(TransactionGuard {
-                            data,
-                            _guard,
-                            _not_send: PhantomData,
-                        })),
-                        Err(error) => Err(error),
-                    }
-                }
-                Ok(None) => match tx.commit().await.map_err(Into::into) {
-                    Ok(()) => Ok(None),
-                    Err(error) => Err(error),
-                },
-                Err(error) => {
-                    tx.rollback().await?;
-                    Err(error)
-                }
-            }
-        };
-
-        self.run(body).await
-    }
-
-    async fn project_transaction<F, Fut, T>(
-        &self,
-        project_id: ProjectId,
-        f: F,
-    ) -> Result<TransactionGuard<T>>
-    where
-        F: Send + Fn(TransactionHandle) -> Fut,
-        Fut: Send + Future<Output = Result<T>>,
-    {
-        let room_id = Database::room_id_for_project(self, project_id).await?;
-        let body = async {
-            let lock = if let Some(room_id) = room_id {
-                self.rooms.entry(room_id).or_default().clone()
-            } else {
-                self.projects.entry(project_id).or_default().clone()
-            };
-            let _guard = lock.lock_owned().await;
-            let (tx, result) = self.with_transaction(&f).await?;
-            match result {
-                Ok(data) => match tx.commit().await.map_err(Into::into) {
-                    Ok(()) => Ok(TransactionGuard {
-                        data,
-                        _guard,
-                        _not_send: PhantomData,
-                    }),
-                    Err(error) => Err(error),
-                },
-                Err(error) => {
-                    tx.rollback().await?;
-                    Err(error)
-                }
-            }
-        };
-
-        self.run(body).await
-    }
-
-    /// room_transaction runs the block in a transaction. It returns a RoomGuard, that keeps
-    /// the database locked until it is dropped. This ensures that updates sent to clients are
-    /// properly serialized with respect to database changes.
-    async fn room_transaction<F, Fut, T>(
-        &self,
-        room_id: RoomId,
-        f: F,
-    ) -> Result<TransactionGuard<T>>
-    where
-        F: Send + Fn(TransactionHandle) -> Fut,
-        Fut: Send + Future<Output = Result<T>>,
-    {
-        let body = async {
-            let lock = self.rooms.entry(room_id).or_default().clone();
-            let _guard = lock.lock_owned().await;
-            let (tx, result) = self.with_transaction(&f).await?;
-            match result {
-                Ok(data) => match tx.commit().await.map_err(Into::into) {
-                    Ok(()) => Ok(TransactionGuard {
-                        data,
-                        _guard,
-                        _not_send: PhantomData,
-                    }),
-                    Err(error) => Err(error),
-                },
-                Err(error) => {
-                    tx.rollback().await?;
-                    Err(error)
-                }
-            }
-        };
-
-        self.run(body).await
-    }
-
-    async fn with_transaction<F, Fut, T>(&self, f: &F) -> Result<(DatabaseTransaction, Result<T>)>
-    where
-        F: Send + Fn(TransactionHandle) -> Fut,
-        Fut: Send + Future<Output = Result<T>>,
-    {
-        let tx = self
-            .pool
-            .begin_with_config(Some(IsolationLevel::ReadCommitted), None)
-            .await?;
-
-        let mut tx = Arc::new(Some(tx));
-        let result = f(TransactionHandle(tx.clone())).await;
-        let tx = Arc::get_mut(&mut tx)
-            .and_then(|tx| tx.take())
-            .context("couldn't complete transaction because it's still in use")?;
-
-        Ok((tx, result))
-    }
-
-    async fn run<F, T>(&self, future: F) -> Result<T>
-    where
-        F: Future<Output = Result<T>>,
-    {
-        #[cfg(test)]
-        {
-            use rand::prelude::*;
-
-            let test_options = self.test_options.as_ref().unwrap();
-            test_options.executor.simulate_random_delay().await;
-            let fail_probability = *test_options.query_failure_probability.lock();
-            if test_options.executor.rng().random_bool(fail_probability) {
-                return Err(anyhow!("simulated query failure"))?;
-            }
-
-            test_options.runtime.block_on(future)
-        }
-
-        #[cfg(not(test))]
-        {
-            future.await
-        }
-    }
-}
-
-/// A handle to a [`DatabaseTransaction`].
-pub struct TransactionHandle(pub(crate) Arc<Option<DatabaseTransaction>>);
-
-impl Deref for TransactionHandle {
-    type Target = DatabaseTransaction;
-
-    fn deref(&self) -> &Self::Target {
-        self.0.as_ref().as_ref().unwrap()
-    }
-}
-
-/// [`TransactionGuard`] keeps a database transaction alive until it is dropped.
-/// It wraps data that depends on the state of the database and prevents an additional
-/// transaction from starting that would invalidate that data.
-pub struct TransactionGuard<T> {
-    data: T,
-    _guard: OwnedMutexGuard<()>,
-    _not_send: PhantomData<Rc<()>>,
-}
-
-impl<T> Deref for TransactionGuard<T> {
-    type Target = T;
-
-    fn deref(&self) -> &T {
-        &self.data
-    }
-}
-
-impl<T> DerefMut for TransactionGuard<T> {
-    fn deref_mut(&mut self) -> &mut T {
-        &mut self.data
-    }
-}
-
-impl<T> TransactionGuard<T> {
-    /// Returns the inner value of the guard.
-    pub fn into_inner(self) -> T {
-        self.data
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum Contact {
-    Accepted { user_id: UserId, busy: bool },
-    Outgoing { user_id: UserId },
-    Incoming { user_id: UserId },
-}
-
-impl Contact {
-    pub fn user_id(&self) -> UserId {
-        match self {
-            Contact::Accepted { user_id, .. } => *user_id,
-            Contact::Outgoing { user_id } => *user_id,
-            Contact::Incoming { user_id, .. } => *user_id,
-        }
-    }
-}
-
-pub type NotificationBatch = Vec<(UserId, proto::Notification)>;
-
-pub struct CreatedChannelMessage {
-    pub message_id: MessageId,
-    pub participant_connection_ids: HashSet<ConnectionId>,
-    pub notifications: NotificationBatch,
-}
-
-pub struct UpdatedChannelMessage {
-    pub message_id: MessageId,
-    pub participant_connection_ids: Vec<ConnectionId>,
-    pub notifications: NotificationBatch,
-    pub reply_to_message_id: Option<MessageId>,
-    pub timestamp: PrimitiveDateTime,
-    pub deleted_mention_notification_ids: Vec<NotificationId>,
-    pub updated_mention_notifications: Vec<rpc::proto::Notification>,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, FromQueryResult, Serialize, Deserialize)]
-pub struct Invite {
-    pub email_address: String,
-    pub email_confirmation_code: String,
-}
-
-#[derive(Clone, Debug, Deserialize)]
-pub struct NewSignup {
-    pub email_address: String,
-    pub platform_mac: bool,
-    pub platform_windows: bool,
-    pub platform_linux: bool,
-    pub editor_features: Vec<String>,
-    pub programming_languages: Vec<String>,
-    pub device_id: Option<String>,
-    pub added_to_mailing_list: bool,
-    pub created_at: Option<DateTime>,
-}
-
-#[derive(Clone, Debug, PartialEq, Deserialize, Serialize, FromQueryResult)]
-pub struct WaitlistSummary {
-    pub count: i64,
-    pub linux_count: i64,
-    pub mac_count: i64,
-    pub windows_count: i64,
-    pub unknown_count: i64,
-}
-
-/// The parameters to create a new user.
-#[derive(Debug, Serialize, Deserialize)]
-pub struct NewUserParams {
-    pub github_login: String,
-    pub github_user_id: i32,
-}
-
-/// The result of creating a new user.
-#[derive(Debug)]
-pub struct NewUserResult {
-    pub user_id: UserId,
-    pub metrics_id: String,
-    pub inviting_user_id: Option<UserId>,
-    pub signup_device_id: Option<String>,
-}
-
-/// The result of updating a channel membership.
-#[derive(Debug)]
-pub struct MembershipUpdated {
-    pub channel_id: ChannelId,
-    pub new_channels: ChannelsForUser,
-    pub removed_channels: Vec<ChannelId>,
-}
-
-/// The result of setting a member's role.
-#[derive(Debug)]
-
-pub enum SetMemberRoleResult {
-    InviteUpdated(Channel),
-    MembershipUpdated(MembershipUpdated),
-}
-
-/// The result of inviting a member to a channel.
-#[derive(Debug)]
-pub struct InviteMemberResult {
-    pub channel: Channel,
-    pub notifications: NotificationBatch,
-}
-
-#[derive(Debug)]
-pub struct RespondToChannelInvite {
-    pub membership_update: Option<MembershipUpdated>,
-    pub notifications: NotificationBatch,
-}
-
-#[derive(Debug)]
-pub struct RemoveChannelMemberResult {
-    pub membership_update: MembershipUpdated,
-    pub notification_id: Option<NotificationId>,
-}
-
-#[derive(Debug, PartialEq, Eq, Hash)]
-pub struct Channel {
-    pub id: ChannelId,
-    pub name: String,
-    pub visibility: ChannelVisibility,
-    /// parent_path is the channel ids from the root to this one (not including this one)
-    pub parent_path: Vec<ChannelId>,
-    pub channel_order: i32,
-}
-
-impl Channel {
-    pub fn from_model(value: channel::Model) -> Self {
-        Channel {
-            id: value.id,
-            visibility: value.visibility,
-            name: value.clone().name,
-            parent_path: value.ancestors().collect(),
-            channel_order: value.channel_order,
-        }
-    }
-
-    pub fn to_proto(&self) -> proto::Channel {
-        proto::Channel {
-            id: self.id.to_proto(),
-            name: self.name.clone(),
-            visibility: self.visibility.into(),
-            parent_path: self.parent_path.iter().map(|c| c.to_proto()).collect(),
-            channel_order: self.channel_order,
-        }
-    }
-
-    pub fn root_id(&self) -> ChannelId {
-        self.parent_path.first().copied().unwrap_or(self.id)
-    }
-}
-
-#[derive(Debug, PartialEq, Eq, Hash)]
-pub struct ChannelMember {
-    pub role: ChannelRole,
-    pub user_id: UserId,
-    pub kind: proto::channel_member::Kind,
-}
-
-impl ChannelMember {
-    pub fn to_proto(&self) -> proto::ChannelMember {
-        proto::ChannelMember {
-            role: self.role.into(),
-            user_id: self.user_id.to_proto(),
-            kind: self.kind.into(),
-        }
-    }
-}
-
-#[derive(Debug, PartialEq)]
-pub struct ChannelsForUser {
-    pub channels: Vec<Channel>,
-    pub channel_memberships: Vec<channel_member::Model>,
-    pub channel_participants: HashMap<ChannelId, Vec<UserId>>,
-    pub invited_channels: Vec<Channel>,
-
-    pub observed_buffer_versions: Vec<proto::ChannelBufferVersion>,
-    pub latest_buffer_versions: Vec<proto::ChannelBufferVersion>,
-}
-
-#[derive(Debug)]
-pub struct RejoinedChannelBuffer {
-    pub buffer: proto::RejoinedChannelBuffer,
-    pub old_connection_id: ConnectionId,
-}
-
-#[derive(Clone)]
-pub struct JoinRoom {
-    pub room: proto::Room,
-    pub channel: Option<channel::Model>,
-}
-
-pub struct RejoinedRoom {
-    pub room: proto::Room,
-    pub rejoined_projects: Vec<RejoinedProject>,
-    pub reshared_projects: Vec<ResharedProject>,
-    pub channel: Option<channel::Model>,
-}
-
-pub struct ResharedProject {
-    pub id: ProjectId,
-    pub old_connection_id: ConnectionId,
-    pub collaborators: Vec<ProjectCollaborator>,
-    pub worktrees: Vec<proto::WorktreeMetadata>,
-}
-
-pub struct RejoinedProject {
-    pub id: ProjectId,
-    pub old_connection_id: ConnectionId,
-    pub collaborators: Vec<ProjectCollaborator>,
-    pub worktrees: Vec<RejoinedWorktree>,
-    pub updated_repositories: Vec<proto::UpdateRepository>,
-    pub removed_repositories: Vec<u64>,
-    pub language_servers: Vec<LanguageServer>,
-}
-
-impl RejoinedProject {
-    pub fn to_proto(&self) -> proto::RejoinedProject {
-        let (language_servers, language_server_capabilities) = self
-            .language_servers
-            .clone()
-            .into_iter()
-            .map(|server| (server.server, server.capabilities))
-            .unzip();
-        proto::RejoinedProject {
-            id: self.id.to_proto(),
-            worktrees: self
-                .worktrees
-                .iter()
-                .map(|worktree| proto::WorktreeMetadata {
-                    id: worktree.id,
-                    root_name: worktree.root_name.clone(),
-                    visible: worktree.visible,
-                    abs_path: worktree.abs_path.clone(),
-                })
-                .collect(),
-            collaborators: self
-                .collaborators
-                .iter()
-                .map(|collaborator| collaborator.to_proto())
-                .collect(),
-            language_servers,
-            language_server_capabilities,
-        }
-    }
-}
-
-#[derive(Debug)]
-pub struct RejoinedWorktree {
-    pub id: u64,
-    pub abs_path: String,
-    pub root_name: String,
-    pub visible: bool,
-    pub updated_entries: Vec<proto::Entry>,
-    pub removed_entries: Vec<u64>,
-    pub updated_repositories: Vec<proto::RepositoryEntry>,
-    pub removed_repositories: Vec<u64>,
-    pub diagnostic_summaries: Vec<proto::DiagnosticSummary>,
-    pub settings_files: Vec<WorktreeSettingsFile>,
-    pub scan_id: u64,
-    pub completed_scan_id: u64,
-}
-
-pub struct LeftRoom {
-    pub room: proto::Room,
-    pub channel: Option<channel::Model>,
-    pub left_projects: HashMap<ProjectId, LeftProject>,
-    pub canceled_calls_to_user_ids: Vec<UserId>,
-    pub deleted: bool,
-}
-
-pub struct RefreshedRoom {
-    pub room: proto::Room,
-    pub channel: Option<channel::Model>,
-    pub stale_participant_user_ids: Vec<UserId>,
-    pub canceled_calls_to_user_ids: Vec<UserId>,
-}
-
-pub struct RefreshedChannelBuffer {
-    pub connection_ids: Vec<ConnectionId>,
-    pub collaborators: Vec<proto::Collaborator>,
-}
-
-pub struct Project {
-    pub id: ProjectId,
-    pub role: ChannelRole,
-    pub collaborators: Vec<ProjectCollaborator>,
-    pub worktrees: BTreeMap<u64, Worktree>,
-    pub repositories: Vec<proto::UpdateRepository>,
-    pub language_servers: Vec<LanguageServer>,
-    pub path_style: PathStyle,
-}
-
-pub struct ProjectCollaborator {
-    pub connection_id: ConnectionId,
-    pub user_id: UserId,
-    pub replica_id: ReplicaId,
-    pub is_host: bool,
-    pub committer_name: Option<String>,
-    pub committer_email: Option<String>,
-}
-
-impl ProjectCollaborator {
-    pub fn to_proto(&self) -> proto::Collaborator {
-        proto::Collaborator {
-            peer_id: Some(self.connection_id.into()),
-            replica_id: self.replica_id.0 as u32,
-            user_id: self.user_id.to_proto(),
-            is_host: self.is_host,
-            committer_name: self.committer_name.clone(),
-            committer_email: self.committer_email.clone(),
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct LanguageServer {
-    pub server: proto::LanguageServer,
-    pub capabilities: String,
-}
-
-#[derive(Debug)]
-pub struct LeftProject {
-    pub id: ProjectId,
-    pub should_unshare: bool,
-    pub connection_ids: Vec<ConnectionId>,
-}
-
-pub struct Worktree {
-    pub id: u64,
-    pub abs_path: String,
-    pub root_name: String,
-    pub visible: bool,
-    pub entries: Vec<proto::Entry>,
-    pub legacy_repository_entries: BTreeMap<u64, proto::RepositoryEntry>,
-    pub diagnostic_summaries: Vec<proto::DiagnosticSummary>,
-    pub settings_files: Vec<WorktreeSettingsFile>,
-    pub scan_id: u64,
-    pub completed_scan_id: u64,
-}
-
-#[derive(Debug)]
-pub struct WorktreeSettingsFile {
-    pub path: String,
-    pub content: String,
-    pub kind: LocalSettingsKind,
-}
-
-pub struct NewExtensionVersion {
-    pub name: String,
-    pub version: semver::Version,
-    pub description: String,
-    pub authors: Vec<String>,
-    pub repository: String,
-    pub schema_version: i32,
-    pub wasm_api_version: Option<String>,
-    pub provides: BTreeSet<ExtensionProvides>,
-    pub published_at: PrimitiveDateTime,
-}
-
-pub struct ExtensionVersionConstraints {
-    pub schema_versions: RangeInclusive<i32>,
-    pub wasm_api_versions: RangeInclusive<semver::Version>,
-}
-
-impl LocalSettingsKind {
-    pub fn from_proto(proto_kind: proto::LocalSettingsKind) -> Self {
-        match proto_kind {
-            proto::LocalSettingsKind::Settings => Self::Settings,
-            proto::LocalSettingsKind::Tasks => Self::Tasks,
-            proto::LocalSettingsKind::Editorconfig => Self::Editorconfig,
-            proto::LocalSettingsKind::Debug => Self::Debug,
-        }
-    }
-
-    pub fn to_proto(self) -> proto::LocalSettingsKind {
-        match self {
-            Self::Settings => proto::LocalSettingsKind::Settings,
-            Self::Tasks => proto::LocalSettingsKind::Tasks,
-            Self::Editorconfig => proto::LocalSettingsKind::Editorconfig,
-            Self::Debug => proto::LocalSettingsKind::Debug,
-        }
-    }
-}
-
-fn db_status_to_proto(
-    entry: project_repository_statuses::Model,
-) -> anyhow::Result<proto::StatusEntry> {
-    use proto::git_file_status::{Tracked, Unmerged, Variant};
-
-    let (simple_status, variant) =
-        match (entry.status_kind, entry.first_status, entry.second_status) {
-            (StatusKind::Untracked, None, None) => (
-                proto::GitStatus::Added as i32,
-                Variant::Untracked(Default::default()),
-            ),
-            (StatusKind::Ignored, None, None) => (
-                proto::GitStatus::Added as i32,
-                Variant::Ignored(Default::default()),
-            ),
-            (StatusKind::Unmerged, Some(first_head), Some(second_head)) => (
-                proto::GitStatus::Conflict as i32,
-                Variant::Unmerged(Unmerged {
-                    first_head,
-                    second_head,
-                }),
-            ),
-            (StatusKind::Tracked, Some(index_status), Some(worktree_status)) => {
-                let simple_status = if worktree_status != proto::GitStatus::Unmodified as i32 {
-                    worktree_status
-                } else if index_status != proto::GitStatus::Unmodified as i32 {
-                    index_status
-                } else {
-                    proto::GitStatus::Unmodified as i32
-                };
-                (
-                    simple_status,
-                    Variant::Tracked(Tracked {
-                        index_status,
-                        worktree_status,
-                    }),
-                )
-            }
-            _ => {
-                anyhow::bail!("Unexpected combination of status fields: {entry:?}");
-            }
-        };
-    Ok(proto::StatusEntry {
-        repo_path: entry.repo_path,
-        simple_status,
-        status: Some(proto::GitFileStatus {
-            variant: Some(variant),
-        }),
-    })
-}
-
-fn proto_status_to_db(
-    status_entry: proto::StatusEntry,
-) -> (String, StatusKind, Option<i32>, Option<i32>) {
-    use proto::git_file_status::{Tracked, Unmerged, Variant};
-
-    let (status_kind, first_status, second_status) = status_entry
-        .status
-        .clone()
-        .and_then(|status| status.variant)
-        .map_or(
-            (StatusKind::Untracked, None, None),
-            |variant| match variant {
-                Variant::Untracked(_) => (StatusKind::Untracked, None, None),
-                Variant::Ignored(_) => (StatusKind::Ignored, None, None),
-                Variant::Unmerged(Unmerged {
-                    first_head,
-                    second_head,
-                }) => (StatusKind::Unmerged, Some(first_head), Some(second_head)),
-                Variant::Tracked(Tracked {
-                    index_status,
-                    worktree_status,
-                }) => (
-                    StatusKind::Tracked,
-                    Some(index_status),
-                    Some(worktree_status),
-                ),
-            },
-        );
-    (
-        status_entry.repo_path,
-        status_kind,
-        first_status,
-        second_status,
-    )
-}
diff --git a/crates/collab/src/db/ids.rs b/crates/collab/src/db/ids.rs
deleted file mode 100644
index 8f116cfd63..0000000000
--- a/crates/collab/src/db/ids.rs
+++ /dev/null
@@ -1,282 +0,0 @@
-use crate::Result;
-use rpc::proto;
-use sea_orm::{DbErr, entity::prelude::*};
-use serde::{Deserialize, Serialize};
-
-#[macro_export]
-macro_rules! id_type {
-    ($name:ident) => {
-        #[derive(
-            Clone,
-            Copy,
-            Debug,
-            Default,
-            PartialEq,
-            Eq,
-            PartialOrd,
-            Ord,
-            Hash,
-            Serialize,
-            Deserialize,
-            DeriveValueType,
-        )]
-        #[allow(missing_docs)]
-        #[serde(transparent)]
-        pub struct $name(pub i32);
-
-        impl $name {
-            #[allow(unused)]
-            #[allow(missing_docs)]
-            pub const MAX: Self = Self(i32::MAX);
-
-            #[allow(unused)]
-            #[allow(missing_docs)]
-            pub fn from_proto(value: u64) -> Self {
-                debug_assert!(value != 0);
-                Self(value as i32)
-            }
-
-            #[allow(unused)]
-            #[allow(missing_docs)]
-            pub fn to_proto(self) -> u64 {
-                self.0 as u64
-            }
-        }
-
-        impl std::fmt::Display for $name {
-            fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-                self.0.fmt(f)
-            }
-        }
-
-        impl sea_orm::TryFromU64 for $name {
-            fn try_from_u64(n: u64) -> Result<Self, DbErr> {
-                Ok(Self(n.try_into().map_err(|_| {
-                    DbErr::ConvertFromU64(concat!(
-                        "error converting ",
-                        stringify!($name),
-                        " to u64"
-                    ))
-                })?))
-            }
-        }
-
-        impl sea_orm::sea_query::Nullable for $name {
-            fn null() -> Value {
-                Value::Int(None)
-            }
-        }
-    };
-}
-
-id_type!(AccessTokenId);
-id_type!(BufferId);
-id_type!(ChannelBufferCollaboratorId);
-id_type!(ChannelChatParticipantId);
-id_type!(ChannelId);
-id_type!(ChannelMemberId);
-id_type!(ContactId);
-id_type!(ExtensionId);
-id_type!(FlagId);
-id_type!(FollowerId);
-id_type!(HostedProjectId);
-id_type!(MessageId);
-id_type!(NotificationId);
-id_type!(NotificationKindId);
-id_type!(ProjectCollaboratorId);
-id_type!(ProjectId);
-id_type!(ReplicaId);
-id_type!(RoomId);
-id_type!(RoomParticipantId);
-id_type!(ServerId);
-id_type!(SignupId);
-id_type!(UserId);
-
-/// ChannelRole gives you permissions for both channels and calls.
-#[derive(
-    Eq, PartialEq, Copy, Clone, Debug, EnumIter, DeriveActiveEnum, Default, Hash, Serialize,
-)]
-#[sea_orm(rs_type = "String", db_type = "String(StringLen::None)")]
-pub enum ChannelRole {
-    /// Admin can read/write and change permissions.
-    #[sea_orm(string_value = "admin")]
-    Admin,
-    /// Member can read/write, but not change permissions.
-    #[sea_orm(string_value = "member")]
-    #[default]
-    Member,
-    /// Talker can read, but not write.
-    /// They can use microphones and the channel chat
-    #[sea_orm(string_value = "talker")]
-    Talker,
-    /// Guest can read, but not write.
-    /// They can not use microphones but can use the chat.
-    #[sea_orm(string_value = "guest")]
-    Guest,
-    /// Banned may not read.
-    #[sea_orm(string_value = "banned")]
-    Banned,
-}
-
-impl ChannelRole {
-    /// Returns true if this role is more powerful than the other role.
-    pub fn should_override(&self, other: Self) -> bool {
-        use ChannelRole::*;
-        match self {
-            Admin => matches!(other, Member | Banned | Talker | Guest),
-            Member => matches!(other, Banned | Talker | Guest),
-            Talker => matches!(other, Guest),
-            Banned => matches!(other, Guest),
-            Guest => false,
-        }
-    }
-
-    /// Returns the maximal role between the two
-    pub fn max(&self, other: Self) -> Self {
-        if self.should_override(other) {
-            *self
-        } else {
-            other
-        }
-    }
-
-    pub fn can_see_channel(&self, visibility: ChannelVisibility) -> bool {
-        use ChannelRole::*;
-        match self {
-            Admin | Member => true,
-            Guest | Talker => visibility == ChannelVisibility::Public,
-            Banned => false,
-        }
-    }
-
-    /// True if the role allows access to all descendant channels
-    pub fn can_see_all_descendants(&self) -> bool {
-        use ChannelRole::*;
-        match self {
-            Admin | Member => true,
-            Guest | Talker | Banned => false,
-        }
-    }
-
-    /// True if the role only allows access to public descendant channels
-    pub fn can_only_see_public_descendants(&self) -> bool {
-        use ChannelRole::*;
-        match self {
-            Guest | Talker => true,
-            Admin | Member | Banned => false,
-        }
-    }
-
-    /// True if the role can share screen/microphone/projects into rooms.
-    pub fn can_use_microphone(&self) -> bool {
-        use ChannelRole::*;
-        match self {
-            Admin | Member | Talker => true,
-            Guest | Banned => false,
-        }
-    }
-
-    /// True if the role can edit shared projects.
-    pub fn can_edit_projects(&self) -> bool {
-        use ChannelRole::*;
-        match self {
-            Admin | Member => true,
-            Talker | Guest | Banned => false,
-        }
-    }
-
-    /// True if the role can read shared projects.
-    pub fn can_read_projects(&self) -> bool {
-        use ChannelRole::*;
-        match self {
-            Admin | Member | Guest | Talker => true,
-            Banned => false,
-        }
-    }
-
-    pub fn requires_cla(&self) -> bool {
-        use ChannelRole::*;
-        match self {
-            Admin | Member => true,
-            Banned | Guest | Talker => false,
-        }
-    }
-}
-
-impl From<proto::ChannelRole> for ChannelRole {
-    fn from(value: proto::ChannelRole) -> Self {
-        match value {
-            proto::ChannelRole::Admin => ChannelRole::Admin,
-            proto::ChannelRole::Member => ChannelRole::Member,
-            proto::ChannelRole::Talker => ChannelRole::Talker,
-            proto::ChannelRole::Guest => ChannelRole::Guest,
-            proto::ChannelRole::Banned => ChannelRole::Banned,
-        }
-    }
-}
-
-impl From<ChannelRole> for proto::ChannelRole {
-    fn from(val: ChannelRole) -> Self {
-        match val {
-            ChannelRole::Admin => proto::ChannelRole::Admin,
-            ChannelRole::Member => proto::ChannelRole::Member,
-            ChannelRole::Talker => proto::ChannelRole::Talker,
-            ChannelRole::Guest => proto::ChannelRole::Guest,
-            ChannelRole::Banned => proto::ChannelRole::Banned,
-        }
-    }
-}
-
-impl From<ChannelRole> for i32 {
-    fn from(val: ChannelRole) -> Self {
-        let proto: proto::ChannelRole = val.into();
-        proto.into()
-    }
-}
-
-/// ChannelVisibility controls whether channels are public or private.
-#[derive(Eq, PartialEq, Copy, Clone, Debug, EnumIter, DeriveActiveEnum, Default, Hash)]
-#[sea_orm(rs_type = "String", db_type = "String(StringLen::None)")]
-pub enum ChannelVisibility {
-    /// Public channels are visible to anyone with the link. People join with the Guest role by default.
-    #[sea_orm(string_value = "public")]
-    Public,
-    /// Members channels are only visible to members of this channel or its parents.
-    #[sea_orm(string_value = "members")]
-    #[default]
-    Members,
-}
-
-impl From<proto::ChannelVisibility> for ChannelVisibility {
-    fn from(value: proto::ChannelVisibility) -> Self {
-        match value {
-            proto::ChannelVisibility::Public => ChannelVisibility::Public,
-            proto::ChannelVisibility::Members => ChannelVisibility::Members,
-        }
-    }
-}
-
-impl From<ChannelVisibility> for proto::ChannelVisibility {
-    fn from(val: ChannelVisibility) -> Self {
-        match val {
-            ChannelVisibility::Public => proto::ChannelVisibility::Public,
-            ChannelVisibility::Members => proto::ChannelVisibility::Members,
-        }
-    }
-}
-
-impl From<ChannelVisibility> for i32 {
-    fn from(val: ChannelVisibility) -> Self {
-        let proto: proto::ChannelVisibility = val.into();
-        proto.into()
-    }
-}
-
-/// Indicate whether a [Buffer] has permissions to edit.
-#[derive(PartialEq, Clone, Copy, Debug)]
-pub enum Capability {
-    /// The buffer is a mutable replica.
-    ReadWrite,
-    /// The buffer is a read-only replica.
-    ReadOnly,
-}
diff --git a/crates/collab/src/db/queries.rs b/crates/collab/src/db/queries.rs
deleted file mode 100644
index db91021c22..0000000000
--- a/crates/collab/src/db/queries.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-use super::*;
-
-pub mod access_tokens;
-pub mod buffers;
-pub mod channels;
-pub mod contacts;
-pub mod contributors;
-pub mod extensions;
-pub mod notifications;
-pub mod projects;
-pub mod rooms;
-pub mod servers;
-pub mod users;
diff --git a/crates/collab/src/db/queries/access_tokens.rs b/crates/collab/src/db/queries/access_tokens.rs
deleted file mode 100644
index 6ddecc64d0..0000000000
--- a/crates/collab/src/db/queries/access_tokens.rs
+++ /dev/null
@@ -1,77 +0,0 @@
-use super::*;
-use anyhow::Context as _;
-use sea_orm::sea_query::Query;
-
-impl Database {
-    /// Creates a new access token for the given user.
-    pub async fn create_access_token(
-        &self,
-        user_id: UserId,
-        impersonated_user_id: Option<UserId>,
-        access_token_hash: &str,
-        max_access_token_count: usize,
-    ) -> Result<AccessTokenId> {
-        self.transaction(|tx| async {
-            let tx = tx;
-
-            let token = access_token::ActiveModel {
-                user_id: ActiveValue::set(user_id),
-                impersonated_user_id: ActiveValue::set(impersonated_user_id),
-                hash: ActiveValue::set(access_token_hash.into()),
-                ..Default::default()
-            }
-            .insert(&*tx)
-            .await?;
-
-            access_token::Entity::delete_many()
-                .filter(
-                    access_token::Column::Id.in_subquery(
-                        Query::select()
-                            .column(access_token::Column::Id)
-                            .from(access_token::Entity)
-                            .and_where(access_token::Column::UserId.eq(user_id))
-                            .order_by(access_token::Column::Id, sea_orm::Order::Desc)
-                            .limit(10000)
-                            .offset(max_access_token_count as u64)
-                            .to_owned(),
-                    ),
-                )
-                .exec(&*tx)
-                .await?;
-            Ok(token.id)
-        })
-        .await
-    }
-
-    /// Retrieves the access token with the given ID.
-    pub async fn get_access_token(
-        &self,
-        access_token_id: AccessTokenId,
-    ) -> Result<access_token::Model> {
-        self.transaction(|tx| async move {
-            Ok(access_token::Entity::find_by_id(access_token_id)
-                .one(&*tx)
-                .await?
-                .context("no such access token")?)
-        })
-        .await
-    }
-
-    /// Retrieves the access token with the given ID.
-    pub async fn update_access_token_hash(
-        &self,
-        id: AccessTokenId,
-        new_hash: &str,
-    ) -> Result<access_token::Model> {
-        self.transaction(|tx| async move {
-            Ok(access_token::Entity::update(access_token::ActiveModel {
-                id: ActiveValue::unchanged(id),
-                hash: ActiveValue::set(new_hash.into()),
-                ..Default::default()
-            })
-            .exec(&*tx)
-            .await?)
-        })
-        .await
-    }
-}
diff --git a/crates/collab/src/db/queries/buffers.rs b/crates/collab/src/db/queries/buffers.rs
deleted file mode 100644
index 6c4cd58d13..0000000000
--- a/crates/collab/src/db/queries/buffers.rs
+++ /dev/null
@@ -1,1049 +0,0 @@
-use super::*;
-use anyhow::Context as _;
-use prost::Message;
-use text::{EditOperation, UndoOperation};
-
-pub struct LeftChannelBuffer {
-    pub channel_id: ChannelId,
-    pub collaborators: Vec<proto::Collaborator>,
-    pub connections: Vec<ConnectionId>,
-}
-
-impl Database {
-    /// Open a channel buffer. Returns the current contents, and adds you to the list of people
-    /// to notify on changes.
-    pub async fn join_channel_buffer(
-        &self,
-        channel_id: ChannelId,
-        user_id: UserId,
-        connection: ConnectionId,
-    ) -> Result<proto::JoinChannelBufferResponse> {
-        self.transaction(|tx| async move {
-            let channel = self.get_channel_internal(channel_id, &tx).await?;
-            self.check_user_is_channel_participant(&channel, user_id, &tx)
-                .await?;
-
-            let buffer = channel::Model {
-                id: channel_id,
-                ..Default::default()
-            }
-            .find_related(buffer::Entity)
-            .one(&*tx)
-            .await?;
-
-            let buffer = if let Some(buffer) = buffer {
-                buffer
-            } else {
-                let buffer = buffer::ActiveModel {
-                    channel_id: ActiveValue::Set(channel_id),
-                    ..Default::default()
-                }
-                .insert(&*tx)
-                .await?;
-                buffer_snapshot::ActiveModel {
-                    buffer_id: ActiveValue::Set(buffer.id),
-                    epoch: ActiveValue::Set(0),
-                    text: ActiveValue::Set(String::new()),
-                    operation_serialization_version: ActiveValue::Set(
-                        storage::SERIALIZATION_VERSION,
-                    ),
-                }
-                .insert(&*tx)
-                .await?;
-                buffer
-            };
-
-            // Join the collaborators
-            let mut collaborators = channel_buffer_collaborator::Entity::find()
-                .filter(channel_buffer_collaborator::Column::ChannelId.eq(channel_id))
-                .all(&*tx)
-                .await?;
-            let replica_ids = collaborators
-                .iter()
-                .map(|c| c.replica_id)
-                .collect::<HashSet<_>>();
-            let mut replica_id = ReplicaId(clock::ReplicaId::FIRST_COLLAB_ID.as_u16() as i32);
-            while replica_ids.contains(&replica_id) {
-                replica_id = ReplicaId(replica_id.0 + 1);
-            }
-            let collaborator = channel_buffer_collaborator::ActiveModel {
-                channel_id: ActiveValue::Set(channel_id),
-                connection_id: ActiveValue::Set(connection.id as i32),
-                connection_server_id: ActiveValue::Set(ServerId(connection.owner_id as i32)),
-                user_id: ActiveValue::Set(user_id),
-                replica_id: ActiveValue::Set(replica_id),
-                ..Default::default()
-            }
-            .insert(&*tx)
-            .await?;
-            collaborators.push(collaborator);
-
-            let (base_text, operations, max_operation) =
-                self.get_buffer_state(&buffer, &tx).await?;
-
-            // Save the last observed operation
-            if let Some(op) = max_operation {
-                observed_buffer_edits::Entity::insert(observed_buffer_edits::ActiveModel {
-                    user_id: ActiveValue::Set(user_id),
-                    buffer_id: ActiveValue::Set(buffer.id),
-                    epoch: ActiveValue::Set(op.epoch),
-                    lamport_timestamp: ActiveValue::Set(op.lamport_timestamp),
-                    replica_id: ActiveValue::Set(op.replica_id),
-                })
-                .on_conflict(
-                    OnConflict::columns([
-                        observed_buffer_edits::Column::UserId,
-                        observed_buffer_edits::Column::BufferId,
-                    ])
-                    .update_columns([
-                        observed_buffer_edits::Column::Epoch,
-                        observed_buffer_edits::Column::LamportTimestamp,
-                    ])
-                    .to_owned(),
-                )
-                .exec(&*tx)
-                .await?;
-            }
-
-            Ok(proto::JoinChannelBufferResponse {
-                buffer_id: buffer.id.to_proto(),
-                replica_id: replica_id.to_proto() as u32,
-                base_text,
-                operations,
-                epoch: buffer.epoch as u64,
-                collaborators: collaborators
-                    .into_iter()
-                    .map(|collaborator| proto::Collaborator {
-                        peer_id: Some(collaborator.connection().into()),
-                        user_id: collaborator.user_id.to_proto(),
-                        replica_id: collaborator.replica_id.0 as u32,
-                        is_host: false,
-                        committer_name: None,
-                        committer_email: None,
-                    })
-                    .collect(),
-            })
-        })
-        .await
-    }
-
-    /// Rejoin a channel buffer (after a connection interruption)
-    pub async fn rejoin_channel_buffers(
-        &self,
-        buffers: &[proto::ChannelBufferVersion],
-        user_id: UserId,
-        connection_id: ConnectionId,
-    ) -> Result<Vec<RejoinedChannelBuffer>> {
-        self.transaction(|tx| async move {
-            let mut results = Vec::new();
-            for client_buffer in buffers {
-                let channel = self
-                    .get_channel_internal(ChannelId::from_proto(client_buffer.channel_id), &tx)
-                    .await?;
-                if self
-                    .check_user_is_channel_participant(&channel, user_id, &tx)
-                    .await
-                    .is_err()
-                {
-                    log::info!("user is not a member of channel");
-                    continue;
-                }
-
-                let buffer = self.get_channel_buffer(channel.id, &tx).await?;
-                let mut collaborators = channel_buffer_collaborator::Entity::find()
-                    .filter(channel_buffer_collaborator::Column::ChannelId.eq(channel.id))
-                    .all(&*tx)
-                    .await?;
-
-                // If the buffer epoch hasn't changed since the client lost
-                // connection, then the client's buffer can be synchronized with
-                // the server's buffer.
-                if buffer.epoch as u64 != client_buffer.epoch {
-                    log::info!("can't rejoin buffer, epoch has changed");
-                    continue;
-                }
-
-                // Find the collaborator record for this user's previous lost
-                // connection. Update it with the new connection id.
-                let Some(self_collaborator) =
-                    collaborators.iter_mut().find(|c| c.user_id == user_id)
-                else {
-                    log::info!("can't rejoin buffer, no previous collaborator found");
-                    continue;
-                };
-                let old_connection_id = self_collaborator.connection();
-                *self_collaborator = channel_buffer_collaborator::ActiveModel {
-                    id: ActiveValue::Unchanged(self_collaborator.id),
-                    connection_id: ActiveValue::Set(connection_id.id as i32),
-                    connection_server_id: ActiveValue::Set(ServerId(connection_id.owner_id as i32)),
-                    connection_lost: ActiveValue::Set(false),
-                    ..Default::default()
-                }
-                .update(&*tx)
-                .await?;
-
-                let client_version = version_from_wire(&client_buffer.version);
-                let serialization_version = self
-                    .get_buffer_operation_serialization_version(buffer.id, buffer.epoch, &tx)
-                    .await?;
-
-                let mut rows = buffer_operation::Entity::find()
-                    .filter(
-                        buffer_operation::Column::BufferId
-                            .eq(buffer.id)
-                            .and(buffer_operation::Column::Epoch.eq(buffer.epoch)),
-                    )
-                    .stream(&*tx)
-                    .await?;
-
-                // Find the server's version vector and any operations
-                // that the client has not seen.
-                let mut server_version = clock::Global::new();
-                let mut operations = Vec::new();
-                while let Some(row) = rows.next().await {
-                    let row = row?;
-                    let timestamp = clock::Lamport {
-                        replica_id: clock::ReplicaId::new(row.replica_id as u16),
-                        value: row.lamport_timestamp as u32,
-                    };
-                    server_version.observe(timestamp);
-                    if !client_version.observed(timestamp) {
-                        operations.push(proto::Operation {
-                            variant: Some(operation_from_storage(row, serialization_version)?),
-                        })
-                    }
-                }
-
-                results.push(RejoinedChannelBuffer {
-                    old_connection_id,
-                    buffer: proto::RejoinedChannelBuffer {
-                        channel_id: client_buffer.channel_id,
-                        version: version_to_wire(&server_version),
-                        operations,
-                        collaborators: collaborators
-                            .into_iter()
-                            .map(|collaborator| proto::Collaborator {
-                                peer_id: Some(collaborator.connection().into()),
-                                user_id: collaborator.user_id.to_proto(),
-                                replica_id: collaborator.replica_id.0 as u32,
-                                is_host: false,
-                                committer_name: None,
-                                committer_email: None,
-                            })
-                            .collect(),
-                    },
-                });
-            }
-
-            Ok(results)
-        })
-        .await
-    }
-
-    /// Clear out any buffer collaborators who are no longer collaborating.
-    pub async fn clear_stale_channel_buffer_collaborators(
-        &self,
-        channel_id: ChannelId,
-        server_id: ServerId,
-    ) -> Result<RefreshedChannelBuffer> {
-        self.transaction(|tx| async move {
-            let db_collaborators = channel_buffer_collaborator::Entity::find()
-                .filter(channel_buffer_collaborator::Column::ChannelId.eq(channel_id))
-                .all(&*tx)
-                .await?;
-
-            let mut connection_ids = Vec::new();
-            let mut collaborators = Vec::new();
-            let mut collaborator_ids_to_remove = Vec::new();
-            for db_collaborator in &db_collaborators {
-                if !db_collaborator.connection_lost
-                    && db_collaborator.connection_server_id == server_id
-                {
-                    connection_ids.push(db_collaborator.connection());
-                    collaborators.push(proto::Collaborator {
-                        peer_id: Some(db_collaborator.connection().into()),
-                        replica_id: db_collaborator.replica_id.0 as u32,
-                        user_id: db_collaborator.user_id.to_proto(),
-                        is_host: false,
-                        committer_name: None,
-                        committer_email: None,
-                    })
-                } else {
-                    collaborator_ids_to_remove.push(db_collaborator.id);
-                }
-            }
-
-            channel_buffer_collaborator::Entity::delete_many()
-                .filter(channel_buffer_collaborator::Column::Id.is_in(collaborator_ids_to_remove))
-                .exec(&*tx)
-                .await?;
-
-            Ok(RefreshedChannelBuffer {
-                connection_ids,
-                collaborators,
-            })
-        })
-        .await
-    }
-
-    /// Close the channel buffer, and stop receiving updates for it.
-    pub async fn leave_channel_buffer(
-        &self,
-        channel_id: ChannelId,
-        connection: ConnectionId,
-    ) -> Result<LeftChannelBuffer> {
-        self.transaction(|tx| async move {
-            self.leave_channel_buffer_internal(channel_id, connection, &tx)
-                .await
-        })
-        .await
-    }
-
-    /// Close the channel buffer, and stop receiving updates for it.
-    pub async fn channel_buffer_connection_lost(
-        &self,
-        connection: ConnectionId,
-        tx: &DatabaseTransaction,
-    ) -> Result<()> {
-        channel_buffer_collaborator::Entity::update_many()
-            .filter(
-                Condition::all()
-                    .add(channel_buffer_collaborator::Column::ConnectionId.eq(connection.id as i32))
-                    .add(
-                        channel_buffer_collaborator::Column::ConnectionServerId
-                            .eq(connection.owner_id as i32),
-                    ),
-            )
-            .set(channel_buffer_collaborator::ActiveModel {
-                connection_lost: ActiveValue::set(true),
-                ..Default::default()
-            })
-            .exec(tx)
-            .await?;
-        Ok(())
-    }
-
-    /// Close all open channel buffers
-    pub async fn leave_channel_buffers(
-        &self,
-        connection: ConnectionId,
-    ) -> Result<Vec<LeftChannelBuffer>> {
-        self.transaction(|tx| async move {
-            #[derive(Debug, Clone, Copy, EnumIter, DeriveColumn)]
-            enum QueryChannelIds {
-                ChannelId,
-            }
-
-            let channel_ids: Vec<ChannelId> = channel_buffer_collaborator::Entity::find()
-                .select_only()
-                .column(channel_buffer_collaborator::Column::ChannelId)
-                .filter(Condition::all().add(
-                    channel_buffer_collaborator::Column::ConnectionId.eq(connection.id as i32),
-                ))
-                .into_values::<_, QueryChannelIds>()
-                .all(&*tx)
-                .await?;
-
-            let mut result = Vec::new();
-            for channel_id in channel_ids {
-                let left_channel_buffer = self
-                    .leave_channel_buffer_internal(channel_id, connection, &tx)
-                    .await?;
-                result.push(left_channel_buffer);
-            }
-
-            Ok(result)
-        })
-        .await
-    }
-
-    async fn leave_channel_buffer_internal(
-        &self,
-        channel_id: ChannelId,
-        connection: ConnectionId,
-        tx: &DatabaseTransaction,
-    ) -> Result<LeftChannelBuffer> {
-        let result = channel_buffer_collaborator::Entity::delete_many()
-            .filter(
-                Condition::all()
-                    .add(channel_buffer_collaborator::Column::ChannelId.eq(channel_id))
-                    .add(channel_buffer_collaborator::Column::ConnectionId.eq(connection.id as i32))
-                    .add(
-                        channel_buffer_collaborator::Column::ConnectionServerId
-                            .eq(connection.owner_id as i32),
-                    ),
-            )
-            .exec(tx)
-            .await?;
-        if result.rows_affected == 0 {
-            Err(anyhow!("not a collaborator on this project"))?;
-        }
-
-        let mut collaborators = Vec::new();
-        let mut connections = Vec::new();
-        let mut rows = channel_buffer_collaborator::Entity::find()
-            .filter(
-                Condition::all().add(channel_buffer_collaborator::Column::ChannelId.eq(channel_id)),
-            )
-            .stream(tx)
-            .await?;
-        while let Some(row) = rows.next().await {
-            let row = row?;
-            let connection = row.connection();
-            connections.push(connection);
-            collaborators.push(proto::Collaborator {
-                peer_id: Some(connection.into()),
-                replica_id: row.replica_id.0 as u32,
-                user_id: row.user_id.to_proto(),
-                is_host: false,
-                committer_name: None,
-                committer_email: None,
-            });
-        }
-
-        drop(rows);
-
-        if collaborators.is_empty() {
-            self.snapshot_channel_buffer(channel_id, tx).await?;
-        }
-
-        Ok(LeftChannelBuffer {
-            channel_id,
-            collaborators,
-            connections,
-        })
-    }
-
-    pub async fn get_channel_buffer_collaborators(
-        &self,
-        channel_id: ChannelId,
-    ) -> Result<Vec<UserId>> {
-        self.transaction(|tx| async move {
-            self.get_channel_buffer_collaborators_internal(channel_id, &tx)
-                .await
-        })
-        .await
-    }
-
-    async fn get_channel_buffer_collaborators_internal(
-        &self,
-        channel_id: ChannelId,
-        tx: &DatabaseTransaction,
-    ) -> Result<Vec<UserId>> {
-        #[derive(Debug, Clone, Copy, EnumIter, DeriveColumn)]
-        enum QueryUserIds {
-            UserId,
-        }
-
-        let users: Vec<UserId> = channel_buffer_collaborator::Entity::find()
-            .select_only()
-            .column(channel_buffer_collaborator::Column::UserId)
-            .filter(
-                Condition::all().add(channel_buffer_collaborator::Column::ChannelId.eq(channel_id)),
-            )
-            .into_values::<_, QueryUserIds>()
-            .all(tx)
-            .await?;
-
-        Ok(users)
-    }
-
-    pub async fn update_channel_buffer(
-        &self,
-        channel_id: ChannelId,
-        user: UserId,
-        operations: &[proto::Operation],
-    ) -> Result<(HashSet<ConnectionId>, i32, Vec<proto::VectorClockEntry>)> {
-        self.transaction(move |tx| async move {
-            let channel = self.get_channel_internal(channel_id, &tx).await?;
-
-            let mut requires_write_permission = false;
-            for op in operations.iter() {
-                match op.variant {
-                    None | Some(proto::operation::Variant::UpdateSelections(_)) => {}
-                    Some(_) => requires_write_permission = true,
-                }
-            }
-            if requires_write_permission {
-                self.check_user_is_channel_member(&channel, user, &tx)
-                    .await?;
-            } else {
-                self.check_user_is_channel_participant(&channel, user, &tx)
-                    .await?;
-            }
-
-            let buffer = buffer::Entity::find()
-                .filter(buffer::Column::ChannelId.eq(channel_id))
-                .one(&*tx)
-                .await?
-                .context("no such buffer")?;
-
-            let serialization_version = self
-                .get_buffer_operation_serialization_version(buffer.id, buffer.epoch, &tx)
-                .await?;
-
-            let operations = operations
-                .iter()
-                .filter_map(|op| operation_to_storage(op, &buffer, serialization_version))
-                .collect::<Vec<_>>();
-
-            let max_version;
-
-            if !operations.is_empty() {
-                let max_operation = operations
-                    .iter()
-                    .max_by_key(|op| (op.lamport_timestamp.as_ref(), op.replica_id.as_ref()))
-                    .unwrap();
-
-                max_version = vec![proto::VectorClockEntry {
-                    replica_id: *max_operation.replica_id.as_ref() as u32,
-                    timestamp: *max_operation.lamport_timestamp.as_ref() as u32,
-                }];
-
-                // get current channel participants and save the max operation above
-                self.save_max_operation(
-                    user,
-                    buffer.id,
-                    buffer.epoch,
-                    *max_operation.replica_id.as_ref(),
-                    *max_operation.lamport_timestamp.as_ref(),
-                    &tx,
-                )
-                .await?;
-
-                buffer_operation::Entity::insert_many(operations)
-                    .on_conflict(
-                        OnConflict::columns([
-                            buffer_operation::Column::BufferId,
-                            buffer_operation::Column::Epoch,
-                            buffer_operation::Column::LamportTimestamp,
-                            buffer_operation::Column::ReplicaId,
-                        ])
-                        .do_nothing()
-                        .to_owned(),
-                    )
-                    .exec(&*tx)
-                    .await?;
-            } else {
-                max_version = Vec::new();
-            }
-
-            let mut connections = HashSet::default();
-            let mut rows = channel_buffer_collaborator::Entity::find()
-                .filter(
-                    Condition::all()
-                        .add(channel_buffer_collaborator::Column::ChannelId.eq(channel_id)),
-                )
-                .stream(&*tx)
-                .await?;
-            while let Some(row) = rows.next().await {
-                let row = row?;
-                connections.insert(ConnectionId {
-                    id: row.connection_id as u32,
-                    owner_id: row.connection_server_id.0 as u32,
-                });
-            }
-
-            Ok((connections, buffer.epoch, max_version))
-        })
-        .await
-    }
-
-    async fn save_max_operation(
-        &self,
-        user_id: UserId,
-        buffer_id: BufferId,
-        epoch: i32,
-        replica_id: i32,
-        lamport_timestamp: i32,
-        tx: &DatabaseTransaction,
-    ) -> Result<()> {
-        buffer::Entity::update(buffer::ActiveModel {
-            id: ActiveValue::Unchanged(buffer_id),
-            epoch: ActiveValue::Unchanged(epoch),
-            latest_operation_epoch: ActiveValue::Set(Some(epoch)),
-            latest_operation_replica_id: ActiveValue::Set(Some(replica_id)),
-            latest_operation_lamport_timestamp: ActiveValue::Set(Some(lamport_timestamp)),
-            channel_id: ActiveValue::NotSet,
-        })
-        .exec(tx)
-        .await?;
-
-        use observed_buffer_edits::Column;
-        observed_buffer_edits::Entity::insert(observed_buffer_edits::ActiveModel {
-            user_id: ActiveValue::Set(user_id),
-            buffer_id: ActiveValue::Set(buffer_id),
-            epoch: ActiveValue::Set(epoch),
-            replica_id: ActiveValue::Set(replica_id),
-            lamport_timestamp: ActiveValue::Set(lamport_timestamp),
-        })
-        .on_conflict(
-            OnConflict::columns([Column::UserId, Column::BufferId])
-                .update_columns([Column::Epoch, Column::LamportTimestamp, Column::ReplicaId])
-                .action_cond_where(
-                    Condition::any().add(Column::Epoch.lt(epoch)).add(
-                        Condition::all().add(Column::Epoch.eq(epoch)).add(
-                            Condition::any()
-                                .add(Column::LamportTimestamp.lt(lamport_timestamp))
-                                .add(
-                                    Column::LamportTimestamp
-                                        .eq(lamport_timestamp)
-                                        .and(Column::ReplicaId.lt(replica_id)),
-                                ),
-                        ),
-                    ),
-                )
-                .to_owned(),
-        )
-        .exec_without_returning(tx)
-        .await?;
-
-        Ok(())
-    }
-
-    async fn get_buffer_operation_serialization_version(
-        &self,
-        buffer_id: BufferId,
-        epoch: i32,
-        tx: &DatabaseTransaction,
-    ) -> Result<i32> {
-        Ok(buffer_snapshot::Entity::find()
-            .filter(buffer_snapshot::Column::BufferId.eq(buffer_id))
-            .filter(buffer_snapshot::Column::Epoch.eq(epoch))
-            .select_only()
-            .column(buffer_snapshot::Column::OperationSerializationVersion)
-            .into_values::<_, QueryOperationSerializationVersion>()
-            .one(tx)
-            .await?
-            .context("missing buffer snapshot")?)
-    }
-
-    pub async fn get_channel_buffer(
-        &self,
-        channel_id: ChannelId,
-        tx: &DatabaseTransaction,
-    ) -> Result<buffer::Model> {
-        Ok(channel::Model {
-            id: channel_id,
-            ..Default::default()
-        }
-        .find_related(buffer::Entity)
-        .one(tx)
-        .await?
-        .context("no such buffer")?)
-    }
-
-    async fn get_buffer_state(
-        &self,
-        buffer: &buffer::Model,
-        tx: &DatabaseTransaction,
-    ) -> Result<(
-        String,
-        Vec<proto::Operation>,
-        Option<buffer_operation::Model>,
-    )> {
-        let id = buffer.id;
-        let (base_text, version) = if buffer.epoch > 0 {
-            let snapshot = buffer_snapshot::Entity::find()
-                .filter(
-                    buffer_snapshot::Column::BufferId
-                        .eq(id)
-                        .and(buffer_snapshot::Column::Epoch.eq(buffer.epoch)),
-                )
-                .one(tx)
-                .await?
-                .context("no such snapshot")?;
-
-            let version = snapshot.operation_serialization_version;
-            (snapshot.text, version)
-        } else {
-            (String::new(), storage::SERIALIZATION_VERSION)
-        };
-
-        let mut rows = buffer_operation::Entity::find()
-            .filter(
-                buffer_operation::Column::BufferId
-                    .eq(id)
-                    .and(buffer_operation::Column::Epoch.eq(buffer.epoch)),
-            )
-            .order_by_asc(buffer_operation::Column::LamportTimestamp)
-            .order_by_asc(buffer_operation::Column::ReplicaId)
-            .stream(tx)
-            .await?;
-
-        let mut operations = Vec::new();
-        let mut last_row = None;
-        while let Some(row) = rows.next().await {
-            let row = row?;
-            last_row = Some(buffer_operation::Model {
-                buffer_id: row.buffer_id,
-                epoch: row.epoch,
-                lamport_timestamp: row.lamport_timestamp,
-                replica_id: row.replica_id,
-                value: Default::default(),
-            });
-            operations.push(proto::Operation {
-                variant: Some(operation_from_storage(row, version)?),
-            });
-        }
-
-        Ok((base_text, operations, last_row))
-    }
-
-    async fn snapshot_channel_buffer(
-        &self,
-        channel_id: ChannelId,
-        tx: &DatabaseTransaction,
-    ) -> Result<()> {
-        let buffer = self.get_channel_buffer(channel_id, tx).await?;
-        let (base_text, operations, _) = self.get_buffer_state(&buffer, tx).await?;
-        if operations.is_empty() {
-            return Ok(());
-        }
-
-        let mut text_buffer = text::Buffer::new(
-            clock::ReplicaId::LOCAL,
-            text::BufferId::new(1).unwrap(),
-            base_text,
-        );
-        text_buffer.apply_ops(operations.into_iter().filter_map(operation_from_wire));
-
-        let base_text = text_buffer.text();
-        let epoch = buffer.epoch + 1;
-
-        buffer_snapshot::Model {
-            buffer_id: buffer.id,
-            epoch,
-            text: base_text,
-            operation_serialization_version: storage::SERIALIZATION_VERSION,
-        }
-        .into_active_model()
-        .insert(tx)
-        .await?;
-
-        buffer::ActiveModel {
-            id: ActiveValue::Unchanged(buffer.id),
-            epoch: ActiveValue::Set(epoch),
-            latest_operation_epoch: ActiveValue::NotSet,
-            latest_operation_replica_id: ActiveValue::NotSet,
-            latest_operation_lamport_timestamp: ActiveValue::NotSet,
-            channel_id: ActiveValue::NotSet,
-        }
-        .save(tx)
-        .await?;
-
-        Ok(())
-    }
-
-    pub async fn observe_buffer_version(
-        &self,
-        buffer_id: BufferId,
-        user_id: UserId,
-        epoch: i32,
-        version: &[proto::VectorClockEntry],
-    ) -> Result<()> {
-        self.transaction(|tx| async move {
-            // For now, combine concurrent operations.
-            let Some(component) = version.iter().max_by_key(|version| version.timestamp) else {
-                return Ok(());
-            };
-            self.save_max_operation(
-                user_id,
-                buffer_id,
-                epoch,
-                component.replica_id as i32,
-                component.timestamp as i32,
-                &tx,
-            )
-            .await?;
-            Ok(())
-        })
-        .await
-    }
-
-    pub async fn observed_channel_buffer_changes(
-        &self,
-        channel_ids_by_buffer_id: &HashMap<BufferId, ChannelId>,
-        user_id: UserId,
-        tx: &DatabaseTransaction,
-    ) -> Result<Vec<proto::ChannelBufferVersion>> {
-        let observed_operations = observed_buffer_edits::Entity::find()
-            .filter(observed_buffer_edits::Column::UserId.eq(user_id))
-            .filter(
-                observed_buffer_edits::Column::BufferId
-                    .is_in(channel_ids_by_buffer_id.keys().copied()),
-            )
-            .all(tx)
-            .await?;
-
-        Ok(observed_operations
-            .iter()
-            .flat_map(|op| {
-                Some(proto::ChannelBufferVersion {
-                    channel_id: channel_ids_by_buffer_id.get(&op.buffer_id)?.to_proto(),
-                    epoch: op.epoch as u64,
-                    version: vec![proto::VectorClockEntry {
-                        replica_id: op.replica_id as u32,
-                        timestamp: op.lamport_timestamp as u32,
-                    }],
-                })
-            })
-            .collect())
-    }
-
-    /// Update language server capabilities for a given id.
-    pub async fn update_server_capabilities(
-        &self,
-        project_id: ProjectId,
-        server_id: u64,
-        new_capabilities: String,
-    ) -> Result<()> {
-        self.transaction(|tx| {
-            let new_capabilities = new_capabilities.clone();
-            async move {
-                Ok(
-                    language_server::Entity::update(language_server::ActiveModel {
-                        project_id: ActiveValue::unchanged(project_id),
-                        id: ActiveValue::unchanged(server_id as i64),
-                        capabilities: ActiveValue::set(new_capabilities),
-                        ..Default::default()
-                    })
-                    .exec(&*tx)
-                    .await?,
-                )
-            }
-        })
-        .await?;
-        Ok(())
-    }
-}
-
-fn operation_to_storage(
-    operation: &proto::Operation,
-    buffer: &buffer::Model,
-    _format: i32,
-) -> Option<buffer_operation::ActiveModel> {
-    let (replica_id, lamport_timestamp, value) = match operation.variant.as_ref()? {
-        proto::operation::Variant::Edit(operation) => (
-            operation.replica_id,
-            operation.lamport_timestamp,
-            storage::Operation {
-                version: version_to_storage(&operation.version),
-                is_undo: false,
-                edit_ranges: operation
-                    .ranges
-                    .iter()
-                    .map(|range| storage::Range {
-                        start: range.start,
-                        end: range.end,
-                    })
-                    .collect(),
-                edit_texts: operation.new_text.clone(),
-                undo_counts: Vec::new(),
-            },
-        ),
-        proto::operation::Variant::Undo(operation) => (
-            operation.replica_id,
-            operation.lamport_timestamp,
-            storage::Operation {
-                version: version_to_storage(&operation.version),
-                is_undo: true,
-                edit_ranges: Vec::new(),
-                edit_texts: Vec::new(),
-                undo_counts: operation
-                    .counts
-                    .iter()
-                    .map(|entry| storage::UndoCount {
-                        replica_id: entry.replica_id,
-                        lamport_timestamp: entry.lamport_timestamp,
-                        count: entry.count,
-                    })
-                    .collect(),
-            },
-        ),
-        _ => None?,
-    };
-
-    Some(buffer_operation::ActiveModel {
-        buffer_id: ActiveValue::Set(buffer.id),
-        epoch: ActiveValue::Set(buffer.epoch),
-        replica_id: ActiveValue::Set(replica_id as i32),
-        lamport_timestamp: ActiveValue::Set(lamport_timestamp as i32),
-        value: ActiveValue::Set(value.encode_to_vec()),
-    })
-}
-
-fn operation_from_storage(
-    row: buffer_operation::Model,
-    _format_version: i32,
-) -> Result<proto::operation::Variant, Error> {
-    let operation =
-        storage::Operation::decode(row.value.as_slice()).map_err(|error| anyhow!("{error}"))?;
-    let version = version_from_storage(&operation.version);
-    Ok(if operation.is_undo {
-        proto::operation::Variant::Undo(proto::operation::Undo {
-            replica_id: row.replica_id as u32,
-            lamport_timestamp: row.lamport_timestamp as u32,
-            version,
-            counts: operation
-                .undo_counts
-                .iter()
-                .map(|entry| proto::UndoCount {
-                    replica_id: entry.replica_id,
-                    lamport_timestamp: entry.lamport_timestamp,
-                    count: entry.count,
-                })
-                .collect(),
-        })
-    } else {
-        proto::operation::Variant::Edit(proto::operation::Edit {
-            replica_id: row.replica_id as u32,
-            lamport_timestamp: row.lamport_timestamp as u32,
-            version,
-            ranges: operation
-                .edit_ranges
-                .into_iter()
-                .map(|range| proto::Range {
-                    start: range.start,
-                    end: range.end,
-                })
-                .collect(),
-            new_text: operation.edit_texts,
-        })
-    })
-}
-
-fn version_to_storage(version: &[proto::VectorClockEntry]) -> Vec<storage::VectorClockEntry> {
-    version
-        .iter()
-        .map(|entry| storage::VectorClockEntry {
-            replica_id: entry.replica_id,
-            timestamp: entry.timestamp,
-        })
-        .collect()
-}
-
-fn version_from_storage(version: &[storage::VectorClockEntry]) -> Vec<proto::VectorClockEntry> {
-    version
-        .iter()
-        .map(|entry| proto::VectorClockEntry {
-            replica_id: entry.replica_id,
-            timestamp: entry.timestamp,
-        })
-        .collect()
-}
-
-// This is currently a manual copy of the deserialization code in the client's language crate
-pub fn operation_from_wire(operation: proto::Operation) -> Option<text::Operation> {
-    match operation.variant? {
-        proto::operation::Variant::Edit(edit) => Some(text::Operation::Edit(EditOperation {
-            timestamp: clock::Lamport {
-                replica_id: clock::ReplicaId::new(edit.replica_id as u16),
-                value: edit.lamport_timestamp,
-            },
-            version: version_from_wire(&edit.version),
-            ranges: edit
-                .ranges
-                .into_iter()
-                .map(|range| {
-                    text::FullOffset(range.start as usize)..text::FullOffset(range.end as usize)
-                })
-                .collect(),
-            new_text: edit.new_text.into_iter().map(Arc::from).collect(),
-        })),
-        proto::operation::Variant::Undo(undo) => Some(text::Operation::Undo(UndoOperation {
-            timestamp: clock::Lamport {
-                replica_id: clock::ReplicaId::new(undo.replica_id as u16),
-                value: undo.lamport_timestamp,
-            },
-            version: version_from_wire(&undo.version),
-            counts: undo
-                .counts
-                .into_iter()
-                .map(|c| {
-                    (
-                        clock::Lamport {
-                            replica_id: clock::ReplicaId::new(c.replica_id as u16),
-                            value: c.lamport_timestamp,
-                        },
-                        c.count,
-                    )
-                })
-                .collect(),
-        })),
-        _ => None,
-    }
-}
-
-fn version_from_wire(message: &[proto::VectorClockEntry]) -> clock::Global {
-    let mut version = clock::Global::new();
-    for entry in message {
-        version.observe(clock::Lamport {
-            replica_id: clock::ReplicaId::new(entry.replica_id as u16),
-            value: entry.timestamp,
-        });
-    }
-    version
-}
-
-fn version_to_wire(version: &clock::Global) -> Vec<proto::VectorClockEntry> {
-    let mut message = Vec::new();
-    for entry in version.iter() {
-        message.push(proto::VectorClockEntry {
-            replica_id: entry.replica_id.as_u16() as u32,
-            timestamp: entry.value,
-        });
-    }
-    message
-}
-
-#[derive(Debug, Clone, Copy, EnumIter, DeriveColumn)]
-enum QueryOperationSerializationVersion {
-    OperationSerializationVersion,
-}
-
-mod storage {
-    #![allow(non_snake_case)]
-    use prost::Message;
-    pub const SERIALIZATION_VERSION: i32 = 1;
-
-    #[derive(Message)]
-    pub struct Operation {
-        #[prost(message, repeated, tag = "2")]
-        pub version: Vec<VectorClockEntry>,
-        #[prost(bool, tag = "3")]
-        pub is_undo: bool,
-        #[prost(message, repeated, tag = "4")]
-        pub edit_ranges: Vec<Range>,
-        #[prost(string, repeated, tag = "5")]
-        pub edit_texts: Vec<String>,
-        #[prost(message, repeated, tag = "6")]
-        pub undo_counts: Vec<UndoCount>,
-    }
-
-    #[derive(Message)]
-    pub struct VectorClockEntry {
-        #[prost(uint32, tag = "1")]
-        pub replica_id: u32,
-        #[prost(uint32, tag = "2")]
-        pub timestamp: u32,
-    }
-
-    #[derive(Message)]
-    pub struct Range {
-        #[prost(uint64, tag = "1")]
-        pub start: u64,
-        #[prost(uint64, tag = "2")]
-        pub end: u64,
-    }
-
-    #[derive(Message)]
-    pub struct UndoCount {
-        #[prost(uint32, tag = "1")]
-        pub replica_id: u32,
-        #[prost(uint32, tag = "2")]
-        pub lamport_timestamp: u32,
-        #[prost(uint32, tag = "3")]
-        pub count: u32,
-    }
-}
diff --git a/crates/collab/src/db/queries/channels.rs b/crates/collab/src/db/queries/channels.rs
deleted file mode 100644
index 3f5c8b6a88..0000000000
--- a/crates/collab/src/db/queries/channels.rs
+++ /dev/null
@@ -1,1131 +0,0 @@
-use super::*;
-use anyhow::Context as _;
-use rpc::{
-    ErrorCode, ErrorCodeExt,
-    proto::{ChannelBufferVersion, VectorClockEntry, channel_member::Kind},
-};
-use sea_orm::{ActiveValue, DbBackend, TryGetableMany};
-
-impl Database {
-    #[cfg(test)]
-    pub async fn all_channels(&self) -> Result<Vec<(ChannelId, String)>> {
-        self.transaction(move |tx| async move {
-            let mut channels = Vec::new();
-            let mut rows = channel::Entity::find().stream(&*tx).await?;
-            while let Some(row) = rows.next().await {
-                let row = row?;
-                channels.push((row.id, row.name));
-            }
-            Ok(channels)
-        })
-        .await
-    }
-
-    #[cfg(test)]
-    pub async fn create_root_channel(&self, name: &str, creator_id: UserId) -> Result<ChannelId> {
-        Ok(self.create_channel(name, None, creator_id).await?.0.id)
-    }
-
-    #[cfg(test)]
-    pub async fn create_sub_channel(
-        &self,
-        name: &str,
-        parent: ChannelId,
-        creator_id: UserId,
-    ) -> Result<ChannelId> {
-        Ok(self
-            .create_channel(name, Some(parent), creator_id)
-            .await?
-            .0
-            .id)
-    }
-
-    /// Creates a new channel.
-    pub async fn create_channel(
-        &self,
-        name: &str,
-        parent_channel_id: Option<ChannelId>,
-        admin_id: UserId,
-    ) -> Result<(channel::Model, Option<channel_member::Model>)> {
-        let name = Self::sanitize_channel_name(name)?;
-        self.transaction(move |tx| async move {
-            let mut parent = None;
-            let mut membership = None;
-
-            if let Some(parent_channel_id) = parent_channel_id {
-                let parent_channel = self.get_channel_internal(parent_channel_id, &tx).await?;
-                self.check_user_is_channel_admin(&parent_channel, admin_id, &tx)
-                    .await?;
-                parent = Some(parent_channel);
-            }
-
-            let parent_path = parent
-                .as_ref()
-                .map_or(String::new(), |parent| parent.path());
-
-            // Find the maximum channel_order among siblings to set the new channel at the end
-            let max_order = if parent_path.is_empty() {
-                0
-            } else {
-                max_order(&parent_path, &tx).await?
-            };
-
-            log::info!(
-                "Creating channel '{}' with parent_path='{}', max_order={}, new_order={}",
-                name,
-                parent_path,
-                max_order,
-                max_order + 1
-            );
-
-            let channel = channel::ActiveModel {
-                id: ActiveValue::NotSet,
-                name: ActiveValue::Set(name.to_string()),
-                visibility: ActiveValue::Set(ChannelVisibility::Members),
-                parent_path: ActiveValue::Set(parent_path),
-                requires_zed_cla: ActiveValue::NotSet,
-                channel_order: ActiveValue::Set(max_order + 1),
-            }
-            .insert(&*tx)
-            .await?;
-
-            if parent.is_none() {
-                membership = Some(
-                    channel_member::ActiveModel {
-                        id: ActiveValue::NotSet,
-                        channel_id: ActiveValue::Set(channel.id),
-                        user_id: ActiveValue::Set(admin_id),
-                        accepted: ActiveValue::Set(true),
-                        role: ActiveValue::Set(ChannelRole::Admin),
-                    }
-                    .insert(&*tx)
-                    .await?,
-                );
-            }
-
-            Ok((channel, membership))
-        })
-        .await
-    }
-
-    /// Adds a user to the specified channel.
-    pub async fn join_channel(
-        &self,
-        channel_id: ChannelId,
-        user_id: UserId,
-        connection: ConnectionId,
-    ) -> Result<(JoinRoom, Option<MembershipUpdated>, ChannelRole)> {
-        self.transaction(move |tx| async move {
-            let channel = self.get_channel_internal(channel_id, &tx).await?;
-            let mut role = self.channel_role_for_user(&channel, user_id, &tx).await?;
-
-            let mut accept_invite_result = None;
-
-            if role.is_none() {
-                if let Some(invitation) = self
-                    .pending_invite_for_channel(&channel, user_id, &tx)
-                    .await?
-                {
-                    // note, this may be a parent channel
-                    role = Some(invitation.role);
-                    channel_member::Entity::update(channel_member::ActiveModel {
-                        accepted: ActiveValue::Set(true),
-                        ..invitation.into_active_model()
-                    })
-                    .exec(&*tx)
-                    .await?;
-
-                    accept_invite_result = Some(
-                        self.calculate_membership_updated(&channel, user_id, &tx)
-                            .await?,
-                    );
-
-                    debug_assert!(
-                        self.channel_role_for_user(&channel, user_id, &tx).await? == role
-                    );
-                } else if channel.visibility == ChannelVisibility::Public {
-                    role = Some(ChannelRole::Guest);
-                    channel_member::Entity::insert(channel_member::ActiveModel {
-                        id: ActiveValue::NotSet,
-                        channel_id: ActiveValue::Set(channel.root_id()),
-                        user_id: ActiveValue::Set(user_id),
-                        accepted: ActiveValue::Set(true),
-                        role: ActiveValue::Set(ChannelRole::Guest),
-                    })
-                    .exec(&*tx)
-                    .await?;
-
-                    accept_invite_result = Some(
-                        self.calculate_membership_updated(&channel, user_id, &tx)
-                            .await?,
-                    );
-
-                    debug_assert!(
-                        self.channel_role_for_user(&channel, user_id, &tx).await? == role
-                    );
-                }
-            }
-
-            if role.is_none() || role == Some(ChannelRole::Banned) {
-                Err(ErrorCode::Forbidden.anyhow())?
-            }
-            let role = role.unwrap();
-
-            let livekit_room = format!("channel-{}", nanoid::nanoid!(30));
-            let room_id = self
-                .get_or_create_channel_room(channel_id, &livekit_room, &tx)
-                .await?;
-
-            self.join_channel_room_internal(room_id, user_id, connection, role, &tx)
-                .await
-                .map(|jr| (jr, accept_invite_result, role))
-        })
-        .await
-    }
-
-    /// Sets the visibility of the given channel.
-    pub async fn set_channel_visibility(
-        &self,
-        channel_id: ChannelId,
-        visibility: ChannelVisibility,
-        admin_id: UserId,
-    ) -> Result<channel::Model> {
-        self.transaction(move |tx| async move {
-            let channel = self.get_channel_internal(channel_id, &tx).await?;
-            self.check_user_is_channel_admin(&channel, admin_id, &tx)
-                .await?;
-
-            if visibility == ChannelVisibility::Public {
-                if let Some(parent_id) = channel.parent_id() {
-                    let parent = self.get_channel_internal(parent_id, &tx).await?;
-
-                    if parent.visibility != ChannelVisibility::Public {
-                        Err(ErrorCode::BadPublicNesting
-                            .with_tag("direction", "parent")
-                            .anyhow())?;
-                    }
-                }
-            } else if visibility == ChannelVisibility::Members
-                && self
-                    .get_channel_descendants_excluding_self([&channel], &tx)
-                    .await?
-                    .into_iter()
-                    .any(|channel| channel.visibility == ChannelVisibility::Public)
-            {
-                Err(ErrorCode::BadPublicNesting
-                    .with_tag("direction", "children")
-                    .anyhow())?;
-            }
-
-            let mut model = channel.into_active_model();
-            model.visibility = ActiveValue::Set(visibility);
-            let channel = model.update(&*tx).await?;
-
-            Ok(channel)
-        })
-        .await
-    }
-
-    #[cfg(test)]
-    pub async fn set_channel_requires_zed_cla(
-        &self,
-        channel_id: ChannelId,
-        requires_zed_cla: bool,
-    ) -> Result<()> {
-        self.transaction(move |tx| async move {
-            let channel = self.get_channel_internal(channel_id, &tx).await?;
-            let mut model = channel.into_active_model();
-            model.requires_zed_cla = ActiveValue::Set(requires_zed_cla);
-            model.update(&*tx).await?;
-            Ok(())
-        })
-        .await
-    }
-
-    /// Deletes the channel with the specified ID.
-    pub async fn delete_channel(
-        &self,
-        channel_id: ChannelId,
-        user_id: UserId,
-    ) -> Result<(ChannelId, Vec<ChannelId>)> {
-        self.transaction(move |tx| async move {
-            let channel = self.get_channel_internal(channel_id, &tx).await?;
-            self.check_user_is_channel_admin(&channel, user_id, &tx)
-                .await?;
-
-            let channels_to_remove = self
-                .get_channel_descendants_excluding_self([&channel], &tx)
-                .await?
-                .into_iter()
-                .map(|channel| channel.id)
-                .chain(Some(channel_id))
-                .collect::<Vec<_>>();
-
-            channel::Entity::delete_many()
-                .filter(channel::Column::Id.is_in(channels_to_remove.iter().copied()))
-                .exec(&*tx)
-                .await?;
-
-            Ok((channel.root_id(), channels_to_remove))
-        })
-        .await
-    }
-
-    /// Invites a user to a channel as a member.
-    pub async fn invite_channel_member(
-        &self,
-        channel_id: ChannelId,
-        invitee_id: UserId,
-        inviter_id: UserId,
-        role: ChannelRole,
-    ) -> Result<InviteMemberResult> {
-        self.transaction(move |tx| async move {
-            let channel = self.get_channel_internal(channel_id, &tx).await?;
-            self.check_user_is_channel_admin(&channel, inviter_id, &tx)
-                .await?;
-            if !channel.is_root() {
-                Err(ErrorCode::NotARootChannel.anyhow())?
-            }
-
-            channel_member::ActiveModel {
-                id: ActiveValue::NotSet,
-                channel_id: ActiveValue::Set(channel_id),
-                user_id: ActiveValue::Set(invitee_id),
-                accepted: ActiveValue::Set(false),
-                role: ActiveValue::Set(role),
-            }
-            .insert(&*tx)
-            .await?;
-
-            let channel = Channel::from_model(channel);
-
-            let notifications = self
-                .create_notification(
-                    invitee_id,
-                    rpc::Notification::ChannelInvitation {
-                        channel_id: channel_id.to_proto(),
-                        channel_name: channel.name.clone(),
-                        inviter_id: inviter_id.to_proto(),
-                    },
-                    true,
-                    &tx,
-                )
-                .await?
-                .into_iter()
-                .collect();
-
-            Ok(InviteMemberResult {
-                channel,
-                notifications,
-            })
-        })
-        .await
-    }
-
-    fn sanitize_channel_name(name: &str) -> Result<&str> {
-        let new_name = name.trim().trim_start_matches('#');
-        if new_name.is_empty() {
-            Err(anyhow!("channel name can't be blank"))?;
-        }
-        Ok(new_name)
-    }
-
-    /// Renames the specified channel.
-    pub async fn rename_channel(
-        &self,
-        channel_id: ChannelId,
-        admin_id: UserId,
-        new_name: &str,
-    ) -> Result<channel::Model> {
-        self.transaction(move |tx| async move {
-            let new_name = Self::sanitize_channel_name(new_name)?.to_string();
-
-            let channel = self.get_channel_internal(channel_id, &tx).await?;
-            self.check_user_is_channel_admin(&channel, admin_id, &tx)
-                .await?;
-
-            let mut model = channel.into_active_model();
-            model.name = ActiveValue::Set(new_name.clone());
-            let channel = model.update(&*tx).await?;
-
-            Ok(channel)
-        })
-        .await
-    }
-
-    /// accept or decline an invite to join a channel
-    pub async fn respond_to_channel_invite(
-        &self,
-        channel_id: ChannelId,
-        user_id: UserId,
-        accept: bool,
-    ) -> Result<RespondToChannelInvite> {
-        self.transaction(move |tx| async move {
-            let channel = self.get_channel_internal(channel_id, &tx).await?;
-
-            let membership_update = if accept {
-                let rows_affected = channel_member::Entity::update_many()
-                    .set(channel_member::ActiveModel {
-                        accepted: ActiveValue::Set(accept),
-                        ..Default::default()
-                    })
-                    .filter(
-                        channel_member::Column::ChannelId
-                            .eq(channel_id)
-                            .and(channel_member::Column::UserId.eq(user_id))
-                            .and(channel_member::Column::Accepted.eq(false)),
-                    )
-                    .exec(&*tx)
-                    .await?
-                    .rows_affected;
-
-                if rows_affected == 0 {
-                    Err(anyhow!("no such invitation"))?;
-                }
-
-                Some(
-                    self.calculate_membership_updated(&channel, user_id, &tx)
-                        .await?,
-                )
-            } else {
-                let rows_affected = channel_member::Entity::delete_many()
-                    .filter(
-                        channel_member::Column::ChannelId
-                            .eq(channel_id)
-                            .and(channel_member::Column::UserId.eq(user_id))
-                            .and(channel_member::Column::Accepted.eq(false)),
-                    )
-                    .exec(&*tx)
-                    .await?
-                    .rows_affected;
-                if rows_affected == 0 {
-                    Err(anyhow!("no such invitation"))?;
-                }
-
-                None
-            };
-
-            Ok(RespondToChannelInvite {
-                membership_update,
-                notifications: self
-                    .mark_notification_as_read_with_response(
-                        user_id,
-                        &rpc::Notification::ChannelInvitation {
-                            channel_id: channel_id.to_proto(),
-                            channel_name: Default::default(),
-                            inviter_id: Default::default(),
-                        },
-                        accept,
-                        &tx,
-                    )
-                    .await?
-                    .into_iter()
-                    .collect(),
-            })
-        })
-        .await
-    }
-
-    async fn calculate_membership_updated(
-        &self,
-        channel: &channel::Model,
-        user_id: UserId,
-        tx: &DatabaseTransaction,
-    ) -> Result<MembershipUpdated> {
-        let new_channels = self
-            .get_user_channels(user_id, Some(channel), false, tx)
-            .await?;
-        let removed_channels = self
-            .get_channel_descendants_excluding_self([channel], tx)
-            .await?
-            .into_iter()
-            .map(|channel| channel.id)
-            .chain([channel.id])
-            .filter(|channel_id| !new_channels.channels.iter().any(|c| c.id == *channel_id))
-            .collect::<Vec<_>>();
-
-        Ok(MembershipUpdated {
-            channel_id: channel.id,
-            new_channels,
-            removed_channels,
-        })
-    }
-
-    /// Removes a channel member.
-    pub async fn remove_channel_member(
-        &self,
-        channel_id: ChannelId,
-        member_id: UserId,
-        admin_id: UserId,
-    ) -> Result<RemoveChannelMemberResult> {
-        self.transaction(|tx| async move {
-            let channel = self.get_channel_internal(channel_id, &tx).await?;
-
-            if member_id != admin_id {
-                self.check_user_is_channel_admin(&channel, admin_id, &tx)
-                    .await?;
-            }
-
-            let result = channel_member::Entity::delete_many()
-                .filter(
-                    channel_member::Column::ChannelId
-                        .eq(channel_id)
-                        .and(channel_member::Column::UserId.eq(member_id)),
-                )
-                .exec(&*tx)
-                .await?;
-
-            if result.rows_affected == 0 {
-                Err(anyhow!("no such member"))?;
-            }
-
-            Ok(RemoveChannelMemberResult {
-                membership_update: self
-                    .calculate_membership_updated(&channel, member_id, &tx)
-                    .await?,
-                notification_id: self
-                    .remove_notification(
-                        member_id,
-                        rpc::Notification::ChannelInvitation {
-                            channel_id: channel_id.to_proto(),
-                            channel_name: Default::default(),
-                            inviter_id: Default::default(),
-                        },
-                        &tx,
-                    )
-                    .await?,
-            })
-        })
-        .await
-    }
-
-    /// Returns all channels for the user with the given ID.
-    pub async fn get_channels_for_user(&self, user_id: UserId) -> Result<ChannelsForUser> {
-        self.transaction(|tx| async move { self.get_user_channels(user_id, None, true, &tx).await })
-            .await
-    }
-
-    /// Returns all channels for the user with the given ID that are descendants
-    /// of the specified ancestor channel.
-    pub async fn get_user_channels(
-        &self,
-        user_id: UserId,
-        ancestor_channel: Option<&channel::Model>,
-        include_invites: bool,
-        tx: &DatabaseTransaction,
-    ) -> Result<ChannelsForUser> {
-        let mut filter = channel_member::Column::UserId.eq(user_id);
-        if !include_invites {
-            filter = filter.and(channel_member::Column::Accepted.eq(true))
-        }
-        if let Some(ancestor) = ancestor_channel {
-            filter = filter.and(channel_member::Column::ChannelId.eq(ancestor.root_id()));
-        }
-
-        let mut channels = Vec::<channel::Model>::new();
-        let mut invited_channels = Vec::<Channel>::new();
-        let mut channel_memberships = Vec::<channel_member::Model>::new();
-        let mut rows = channel_member::Entity::find()
-            .filter(filter)
-            .inner_join(channel::Entity)
-            .select_also(channel::Entity)
-            .stream(tx)
-            .await?;
-        while let Some(row) = rows.next().await {
-            if let (membership, Some(channel)) = row? {
-                if membership.accepted {
-                    channel_memberships.push(membership);
-                    channels.push(channel);
-                } else {
-                    invited_channels.push(Channel::from_model(channel));
-                }
-            }
-        }
-        drop(rows);
-
-        let mut descendants = self
-            .get_channel_descendants_excluding_self(channels.iter(), tx)
-            .await?;
-
-        descendants.extend(channels);
-
-        let roles_by_channel_id = channel_memberships
-            .iter()
-            .map(|membership| (membership.channel_id, membership.role))
-            .collect::<HashMap<_, _>>();
-
-        let channels: Vec<Channel> = descendants
-            .into_iter()
-            .filter_map(|channel| {
-                let parent_role = roles_by_channel_id.get(&channel.root_id())?;
-                if parent_role.can_see_channel(channel.visibility) {
-                    Some(Channel::from_model(channel))
-                } else {
-                    None
-                }
-            })
-            .collect();
-
-        #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
-        enum QueryUserIdsAndChannelIds {
-            ChannelId,
-            UserId,
-        }
-
-        let mut channel_participants: HashMap<ChannelId, Vec<UserId>> = HashMap::default();
-        {
-            let mut rows = room_participant::Entity::find()
-                .inner_join(room::Entity)
-                .filter(room::Column::ChannelId.is_in(channels.iter().map(|c| c.id)))
-                .select_only()
-                .column(room::Column::ChannelId)
-                .column(room_participant::Column::UserId)
-                .into_values::<_, QueryUserIdsAndChannelIds>()
-                .stream(tx)
-                .await?;
-            while let Some(row) = rows.next().await {
-                let row: (ChannelId, UserId) = row?;
-                channel_participants.entry(row.0).or_default().push(row.1)
-            }
-        }
-
-        let channel_ids = channels.iter().map(|c| c.id).collect::<Vec<_>>();
-
-        let mut channel_ids_by_buffer_id = HashMap::default();
-        let mut latest_buffer_versions: Vec<ChannelBufferVersion> = vec![];
-        let mut rows = buffer::Entity::find()
-            .filter(buffer::Column::ChannelId.is_in(channel_ids.iter().copied()))
-            .stream(tx)
-            .await?;
-        while let Some(row) = rows.next().await {
-            let row = row?;
-            channel_ids_by_buffer_id.insert(row.id, row.channel_id);
-            latest_buffer_versions.push(ChannelBufferVersion {
-                channel_id: row.channel_id.0 as u64,
-                epoch: row.latest_operation_epoch.unwrap_or_default() as u64,
-                version: if let Some((latest_lamport_timestamp, latest_replica_id)) = row
-                    .latest_operation_lamport_timestamp
-                    .zip(row.latest_operation_replica_id)
-                {
-                    vec![VectorClockEntry {
-                        timestamp: latest_lamport_timestamp as u32,
-                        replica_id: latest_replica_id as u32,
-                    }]
-                } else {
-                    vec![]
-                },
-            });
-        }
-        drop(rows);
-
-        let observed_buffer_versions = self
-            .observed_channel_buffer_changes(&channel_ids_by_buffer_id, user_id, tx)
-            .await?;
-
-        Ok(ChannelsForUser {
-            channel_memberships,
-            channels,
-            invited_channels,
-            channel_participants,
-            latest_buffer_versions,
-            observed_buffer_versions,
-        })
-    }
-
-    /// Sets the role for the specified channel member.
-    pub async fn set_channel_member_role(
-        &self,
-        channel_id: ChannelId,
-        admin_id: UserId,
-        for_user: UserId,
-        role: ChannelRole,
-    ) -> Result<SetMemberRoleResult> {
-        self.transaction(|tx| async move {
-            let channel = self.get_channel_internal(channel_id, &tx).await?;
-            self.check_user_is_channel_admin(&channel, admin_id, &tx)
-                .await?;
-
-            let membership = channel_member::Entity::find()
-                .filter(
-                    channel_member::Column::ChannelId
-                        .eq(channel_id)
-                        .and(channel_member::Column::UserId.eq(for_user)),
-                )
-                .one(&*tx)
-                .await?
-                .context("no such member")?;
-
-            let mut update = membership.into_active_model();
-            update.role = ActiveValue::Set(role);
-            let updated = channel_member::Entity::update(update).exec(&*tx).await?;
-
-            if updated.accepted {
-                Ok(SetMemberRoleResult::MembershipUpdated(
-                    self.calculate_membership_updated(&channel, for_user, &tx)
-                        .await?,
-                ))
-            } else {
-                Ok(SetMemberRoleResult::InviteUpdated(Channel::from_model(
-                    channel,
-                )))
-            }
-        })
-        .await
-    }
-
-    /// Returns the details for the specified channel member.
-    pub async fn get_channel_participant_details(
-        &self,
-        channel_id: ChannelId,
-        filter: &str,
-        limit: u64,
-        user_id: UserId,
-    ) -> Result<(Vec<proto::ChannelMember>, Vec<proto::User>)> {
-        let members = self
-            .transaction(move |tx| async move {
-                let channel = self.get_channel_internal(channel_id, &tx).await?;
-                self.check_user_is_channel_participant(&channel, user_id, &tx)
-                    .await?;
-                let mut query = channel_member::Entity::find()
-                    .find_also_related(user::Entity)
-                    .filter(channel_member::Column::ChannelId.eq(channel.root_id()));
-
-                if cfg!(any(test, feature = "sqlite")) && self.pool.get_database_backend() == DbBackend::Sqlite {
-                    query = query.filter(Expr::cust_with_values(
-                        "UPPER(github_login) LIKE ?",
-                        [Self::fuzzy_like_string(&filter.to_uppercase())],
-                    ))
-                } else {
-                    query = query.filter(Expr::cust_with_values(
-                        "github_login ILIKE $1",
-                        [Self::fuzzy_like_string(filter)],
-                    ))
-                }
-                let members = query.order_by(
-                        Expr::cust(
-                            "not role = 'admin', not role = 'member', not role = 'guest', not accepted, github_login",
-                        ),
-                        sea_orm::Order::Asc,
-                    )
-                    .limit(limit)
-                    .all(&*tx)
-                    .await?;
-
-                Ok(members)
-            })
-            .await?;
-
-        let mut users: Vec<proto::User> = Vec::with_capacity(members.len());
-
-        let members = members
-            .into_iter()
-            .map(|(member, user)| {
-                if let Some(user) = user {
-                    users.push(proto::User {
-                        id: user.id.to_proto(),
-                        avatar_url: format!(
-                            "https://avatars.githubusercontent.com/u/{}?s=128&v=4",
-                            user.github_user_id
-                        ),
-                        github_login: user.github_login,
-                        name: user.name,
-                    })
-                }
-                proto::ChannelMember {
-                    role: member.role.into(),
-                    user_id: member.user_id.to_proto(),
-                    kind: if member.accepted {
-                        Kind::Member
-                    } else {
-                        Kind::Invitee
-                    }
-                    .into(),
-                }
-            })
-            .collect();
-
-        Ok((members, users))
-    }
-
-    /// Returns whether the given user is an admin in the specified channel.
-    pub async fn check_user_is_channel_admin(
-        &self,
-        channel: &channel::Model,
-        user_id: UserId,
-        tx: &DatabaseTransaction,
-    ) -> Result<ChannelRole> {
-        let role = self.channel_role_for_user(channel, user_id, tx).await?;
-        match role {
-            Some(ChannelRole::Admin) => Ok(role.unwrap()),
-            Some(ChannelRole::Member)
-            | Some(ChannelRole::Talker)
-            | Some(ChannelRole::Banned)
-            | Some(ChannelRole::Guest)
-            | None => Err(anyhow!(
-                "user is not a channel admin or channel does not exist"
-            ))?,
-        }
-    }
-
-    /// Returns whether the given user is a member of the specified channel.
-    pub async fn check_user_is_channel_member(
-        &self,
-        channel: &channel::Model,
-        user_id: UserId,
-        tx: &DatabaseTransaction,
-    ) -> Result<ChannelRole> {
-        let channel_role = self.channel_role_for_user(channel, user_id, tx).await?;
-        match channel_role {
-            Some(ChannelRole::Admin) | Some(ChannelRole::Member) => Ok(channel_role.unwrap()),
-            Some(ChannelRole::Banned)
-            | Some(ChannelRole::Guest)
-            | Some(ChannelRole::Talker)
-            | None => Err(anyhow!(
-                "user is not a channel member or channel does not exist"
-            ))?,
-        }
-    }
-
-    /// Returns whether the given user is a participant in the specified channel.
-    pub async fn check_user_is_channel_participant(
-        &self,
-        channel: &channel::Model,
-        user_id: UserId,
-        tx: &DatabaseTransaction,
-    ) -> Result<ChannelRole> {
-        let role = self.channel_role_for_user(channel, user_id, tx).await?;
-        match role {
-            Some(ChannelRole::Admin)
-            | Some(ChannelRole::Member)
-            | Some(ChannelRole::Guest)
-            | Some(ChannelRole::Talker) => Ok(role.unwrap()),
-            Some(ChannelRole::Banned) | None => Err(anyhow!(
-                "user is not a channel participant or channel does not exist"
-            ))?,
-        }
-    }
-
-    /// Returns a user's pending invite for the given channel, if one exists.
-    pub async fn pending_invite_for_channel(
-        &self,
-        channel: &channel::Model,
-        user_id: UserId,
-        tx: &DatabaseTransaction,
-    ) -> Result<Option<channel_member::Model>> {
-        let row = channel_member::Entity::find()
-            .filter(channel_member::Column::ChannelId.eq(channel.root_id()))
-            .filter(channel_member::Column::UserId.eq(user_id))
-            .filter(channel_member::Column::Accepted.eq(false))
-            .one(tx)
-            .await?;
-
-        Ok(row)
-    }
-
-    /// Returns the role for a user in the given channel.
-    pub async fn channel_role_for_user(
-        &self,
-        channel: &channel::Model,
-        user_id: UserId,
-        tx: &DatabaseTransaction,
-    ) -> Result<Option<ChannelRole>> {
-        let membership = channel_member::Entity::find()
-            .filter(
-                channel_member::Column::ChannelId
-                    .eq(channel.root_id())
-                    .and(channel_member::Column::UserId.eq(user_id))
-                    .and(channel_member::Column::Accepted.eq(true)),
-            )
-            .one(tx)
-            .await?;
-
-        let Some(membership) = membership else {
-            return Ok(None);
-        };
-
-        if !membership.role.can_see_channel(channel.visibility) {
-            return Ok(None);
-        }
-
-        Ok(Some(membership.role))
-    }
-
-    // Get the descendants of the given set if channels, ordered by their
-    // path.
-    pub(crate) async fn get_channel_descendants_excluding_self(
-        &self,
-        channels: impl IntoIterator<Item = &channel::Model>,
-        tx: &DatabaseTransaction,
-    ) -> Result<Vec<channel::Model>> {
-        let mut filter = Condition::any();
-        for channel in channels.into_iter() {
-            filter = filter.add(channel::Column::ParentPath.like(channel.descendant_path_filter()));
-        }
-
-        if filter.is_empty() {
-            return Ok(vec![]);
-        }
-
-        Ok(channel::Entity::find()
-            .filter(filter)
-            .order_by_asc(Expr::cust("parent_path || id || '/'"))
-            .all(tx)
-            .await?)
-    }
-
-    /// Returns the channel with the given ID.
-    pub async fn get_channel(&self, channel_id: ChannelId, user_id: UserId) -> Result<Channel> {
-        self.transaction(|tx| async move {
-            let channel = self.get_channel_internal(channel_id, &tx).await?;
-            self.check_user_is_channel_participant(&channel, user_id, &tx)
-                .await?;
-
-            Ok(Channel::from_model(channel))
-        })
-        .await
-    }
-
-    pub(crate) async fn get_channel_internal(
-        &self,
-        channel_id: ChannelId,
-        tx: &DatabaseTransaction,
-    ) -> Result<channel::Model> {
-        Ok(channel::Entity::find_by_id(channel_id)
-            .one(tx)
-            .await?
-            .ok_or_else(|| proto::ErrorCode::NoSuchChannel.anyhow())?)
-    }
-
-    pub(crate) async fn get_or_create_channel_room(
-        &self,
-        channel_id: ChannelId,
-        livekit_room: &str,
-        tx: &DatabaseTransaction,
-    ) -> Result<RoomId> {
-        let room = room::Entity::find()
-            .filter(room::Column::ChannelId.eq(channel_id))
-            .one(tx)
-            .await?;
-
-        let room_id = if let Some(room) = room {
-            room.id
-        } else {
-            let result = room::Entity::insert(room::ActiveModel {
-                channel_id: ActiveValue::Set(Some(channel_id)),
-                live_kit_room: ActiveValue::Set(livekit_room.to_string()),
-                ..Default::default()
-            })
-            .exec(tx)
-            .await?;
-
-            result.last_insert_id
-        };
-
-        Ok(room_id)
-    }
-
-    /// Move a channel from one parent to another
-    pub async fn move_channel(
-        &self,
-        channel_id: ChannelId,
-        new_parent_id: ChannelId,
-        admin_id: UserId,
-    ) -> Result<(ChannelId, Vec<Channel>)> {
-        self.transaction(|tx| async move {
-            let channel = self.get_channel_internal(channel_id, &tx).await?;
-            self.check_user_is_channel_admin(&channel, admin_id, &tx)
-                .await?;
-            let new_parent = self.get_channel_internal(new_parent_id, &tx).await?;
-
-            if new_parent.root_id() != channel.root_id() {
-                Err(anyhow!(ErrorCode::WrongMoveTarget))?;
-            }
-
-            if new_parent
-                .ancestors_including_self()
-                .any(|id| id == channel.id)
-            {
-                Err(anyhow!(ErrorCode::CircularNesting))?;
-            }
-
-            if channel.visibility == ChannelVisibility::Public
-                && new_parent.visibility != ChannelVisibility::Public
-            {
-                Err(anyhow!(ErrorCode::BadPublicNesting))?;
-            }
-
-            let root_id = channel.root_id();
-            let new_parent_path = new_parent.path();
-            let old_path = format!("{}{}/", channel.parent_path, channel.id);
-            let new_path = format!("{}{}/", &new_parent_path, channel.id);
-            let new_order = max_order(&new_parent_path, &tx).await? + 1;
-
-            let mut model = channel.into_active_model();
-            model.parent_path = ActiveValue::Set(new_parent.path());
-            model.channel_order = ActiveValue::Set(new_order);
-            let channel = model.update(&*tx).await?;
-
-            let descendent_ids =
-                ChannelId::find_by_statement::<QueryIds>(Statement::from_sql_and_values(
-                    self.pool.get_database_backend(),
-                    "
-                    UPDATE channels SET parent_path = REPLACE(parent_path, $1, $2)
-                    WHERE parent_path LIKE $3 || '%'
-                    RETURNING id
-                ",
-                    [old_path.clone().into(), new_path.into(), old_path.into()],
-                ))
-                .all(&*tx)
-                .await?;
-
-            let all_moved_ids = Some(channel.id).into_iter().chain(descendent_ids);
-
-            let channels = channel::Entity::find()
-                .filter(channel::Column::Id.is_in(all_moved_ids))
-                .all(&*tx)
-                .await?
-                .into_iter()
-                .map(Channel::from_model)
-                .collect::<Vec<_>>();
-
-            Ok((root_id, channels))
-        })
-        .await
-    }
-
-    pub async fn reorder_channel(
-        &self,
-        channel_id: ChannelId,
-        direction: proto::reorder_channel::Direction,
-        user_id: UserId,
-    ) -> Result<Vec<Channel>> {
-        self.transaction(|tx| async move {
-            let mut channel = self.get_channel_internal(channel_id, &tx).await?;
-
-            if channel.is_root() {
-                log::info!("Skipping reorder of root channel {}", channel.id,);
-                return Ok(vec![]);
-            }
-
-            log::info!(
-                "Reordering channel {} (parent_path: '{}', order: {})",
-                channel.id,
-                channel.parent_path,
-                channel.channel_order
-            );
-
-            // Check if user is admin of the channel
-            self.check_user_is_channel_admin(&channel, user_id, &tx)
-                .await?;
-
-            // Find the sibling channel to swap with
-            let sibling_channel = match direction {
-                proto::reorder_channel::Direction::Up => {
-                    log::info!(
-                        "Looking for sibling with parent_path='{}' and order < {}",
-                        channel.parent_path,
-                        channel.channel_order
-                    );
-                    // Find channel with highest order less than current
-                    channel::Entity::find()
-                        .filter(
-                            channel::Column::ParentPath
-                                .eq(&channel.parent_path)
-                                .and(channel::Column::ChannelOrder.lt(channel.channel_order)),
-                        )
-                        .order_by_desc(channel::Column::ChannelOrder)
-                        .one(&*tx)
-                        .await?
-                }
-                proto::reorder_channel::Direction::Down => {
-                    log::info!(
-                        "Looking for sibling with parent_path='{}' and order > {}",
-                        channel.parent_path,
-                        channel.channel_order
-                    );
-                    // Find channel with lowest order greater than current
-                    channel::Entity::find()
-                        .filter(
-                            channel::Column::ParentPath
-                                .eq(&channel.parent_path)
-                                .and(channel::Column::ChannelOrder.gt(channel.channel_order)),
-                        )
-                        .order_by_asc(channel::Column::ChannelOrder)
-                        .one(&*tx)
-                        .await?
-                }
-            };
-
-            let mut sibling_channel = match sibling_channel {
-                Some(sibling) => {
-                    log::info!(
-                        "Found sibling {} (parent_path: '{}', order: {})",
-                        sibling.id,
-                        sibling.parent_path,
-                        sibling.channel_order
-                    );
-                    sibling
-                }
-                None => {
-                    log::warn!("No sibling found to swap with");
-                    // No sibling to swap with
-                    return Ok(vec![]);
-                }
-            };
-
-            let current_order = channel.channel_order;
-            let sibling_order = sibling_channel.channel_order;
-
-            channel::ActiveModel {
-                id: ActiveValue::Unchanged(sibling_channel.id),
-                channel_order: ActiveValue::Set(current_order),
-                ..Default::default()
-            }
-            .update(&*tx)
-            .await?;
-            sibling_channel.channel_order = current_order;
-
-            channel::ActiveModel {
-                id: ActiveValue::Unchanged(channel.id),
-                channel_order: ActiveValue::Set(sibling_order),
-                ..Default::default()
-            }
-            .update(&*tx)
-            .await?;
-            channel.channel_order = sibling_order;
-
-            log::info!(
-                "Reorder complete. Swapped channels {} and {}",
-                channel.id,
-                sibling_channel.id
-            );
-
-            let swapped_channels = vec![
-                Channel::from_model(channel),
-                Channel::from_model(sibling_channel),
-            ];
-
-            Ok(swapped_channels)
-        })
-        .await
-    }
-}
-
-async fn max_order(parent_path: &str, tx: &TransactionHandle) -> Result<i32> {
-    let max_order = channel::Entity::find()
-        .filter(channel::Column::ParentPath.eq(parent_path))
-        .select_only()
-        .column_as(channel::Column::ChannelOrder.max(), "max_order")
-        .into_tuple::<Option<i32>>()
-        .one(&**tx)
-        .await?
-        .flatten()
-        .unwrap_or(0);
-
-    Ok(max_order)
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
-enum QueryIds {
-    Id,
-}
diff --git a/crates/collab/src/db/queries/contacts.rs b/crates/collab/src/db/queries/contacts.rs
deleted file mode 100644
index 8521814bdb..0000000000
--- a/crates/collab/src/db/queries/contacts.rs
+++ /dev/null
@@ -1,363 +0,0 @@
-use anyhow::Context as _;
-
-use super::*;
-
-impl Database {
-    /// Retrieves the contacts for the user with the given ID.
-    pub async fn get_contacts(&self, user_id: UserId) -> Result<Vec<Contact>> {
-        #[derive(Debug, FromQueryResult)]
-        struct ContactWithUserBusyStatuses {
-            user_id_a: UserId,
-            user_id_b: UserId,
-            a_to_b: bool,
-            accepted: bool,
-            user_a_busy: bool,
-            user_b_busy: bool,
-        }
-
-        self.transaction(|tx| async move {
-            let user_a_participant = Alias::new("user_a_participant");
-            let user_b_participant = Alias::new("user_b_participant");
-            let mut db_contacts = contact::Entity::find()
-                .column_as(
-                    Expr::col((user_a_participant.clone(), room_participant::Column::Id))
-                        .is_not_null(),
-                    "user_a_busy",
-                )
-                .column_as(
-                    Expr::col((user_b_participant.clone(), room_participant::Column::Id))
-                        .is_not_null(),
-                    "user_b_busy",
-                )
-                .filter(
-                    contact::Column::UserIdA
-                        .eq(user_id)
-                        .or(contact::Column::UserIdB.eq(user_id)),
-                )
-                .join_as(
-                    JoinType::LeftJoin,
-                    contact::Relation::UserARoomParticipant.def(),
-                    user_a_participant,
-                )
-                .join_as(
-                    JoinType::LeftJoin,
-                    contact::Relation::UserBRoomParticipant.def(),
-                    user_b_participant,
-                )
-                .into_model::<ContactWithUserBusyStatuses>()
-                .stream(&*tx)
-                .await?;
-
-            let mut contacts = Vec::new();
-            while let Some(db_contact) = db_contacts.next().await {
-                let db_contact = db_contact?;
-                if db_contact.user_id_a == user_id {
-                    if db_contact.accepted {
-                        contacts.push(Contact::Accepted {
-                            user_id: db_contact.user_id_b,
-                            busy: db_contact.user_b_busy,
-                        });
-                    } else if db_contact.a_to_b {
-                        contacts.push(Contact::Outgoing {
-                            user_id: db_contact.user_id_b,
-                        })
-                    } else {
-                        contacts.push(Contact::Incoming {
-                            user_id: db_contact.user_id_b,
-                        });
-                    }
-                } else if db_contact.accepted {
-                    contacts.push(Contact::Accepted {
-                        user_id: db_contact.user_id_a,
-                        busy: db_contact.user_a_busy,
-                    });
-                } else if db_contact.a_to_b {
-                    contacts.push(Contact::Incoming {
-                        user_id: db_contact.user_id_a,
-                    });
-                } else {
-                    contacts.push(Contact::Outgoing {
-                        user_id: db_contact.user_id_a,
-                    });
-                }
-            }
-
-            contacts.sort_unstable_by_key(|contact| contact.user_id());
-
-            Ok(contacts)
-        })
-        .await
-    }
-
-    /// Returns whether the given user is a busy (on a call).
-    pub async fn is_user_busy(&self, user_id: UserId) -> Result<bool> {
-        self.transaction(|tx| async move {
-            let participant = room_participant::Entity::find()
-                .filter(room_participant::Column::UserId.eq(user_id))
-                .one(&*tx)
-                .await?;
-            Ok(participant.is_some())
-        })
-        .await
-    }
-
-    /// Returns whether the user with `user_id_1` has the user with `user_id_2` as a contact.
-    ///
-    /// In order for this to return `true`, `user_id_2` must have an accepted invite from `user_id_1`.
-    pub async fn has_contact(&self, user_id_1: UserId, user_id_2: UserId) -> Result<bool> {
-        self.transaction(|tx| async move {
-            let (id_a, id_b) = if user_id_1 < user_id_2 {
-                (user_id_1, user_id_2)
-            } else {
-                (user_id_2, user_id_1)
-            };
-
-            Ok(contact::Entity::find()
-                .filter(
-                    contact::Column::UserIdA
-                        .eq(id_a)
-                        .and(contact::Column::UserIdB.eq(id_b))
-                        .and(contact::Column::Accepted.eq(true)),
-                )
-                .one(&*tx)
-                .await?
-                .is_some())
-        })
-        .await
-    }
-
-    /// Invite the user with `receiver_id` to be a contact of the user with `sender_id`.
-    pub async fn send_contact_request(
-        &self,
-        sender_id: UserId,
-        receiver_id: UserId,
-    ) -> Result<NotificationBatch> {
-        self.transaction(|tx| async move {
-            let (id_a, id_b, a_to_b) = if sender_id < receiver_id {
-                (sender_id, receiver_id, true)
-            } else {
-                (receiver_id, sender_id, false)
-            };
-
-            let rows_affected = contact::Entity::insert(contact::ActiveModel {
-                user_id_a: ActiveValue::set(id_a),
-                user_id_b: ActiveValue::set(id_b),
-                a_to_b: ActiveValue::set(a_to_b),
-                accepted: ActiveValue::set(false),
-                should_notify: ActiveValue::set(true),
-                ..Default::default()
-            })
-            .on_conflict(
-                OnConflict::columns([contact::Column::UserIdA, contact::Column::UserIdB])
-                    .values([
-                        (contact::Column::Accepted, true.into()),
-                        (contact::Column::ShouldNotify, false.into()),
-                    ])
-                    .action_and_where(
-                        contact::Column::Accepted.eq(false).and(
-                            contact::Column::AToB
-                                .eq(a_to_b)
-                                .and(contact::Column::UserIdA.eq(id_b))
-                                .or(contact::Column::AToB
-                                    .ne(a_to_b)
-                                    .and(contact::Column::UserIdA.eq(id_a))),
-                        ),
-                    )
-                    .to_owned(),
-            )
-            .exec_without_returning(&*tx)
-            .await?;
-
-            if rows_affected == 0 {
-                Err(anyhow!("contact already requested"))?;
-            }
-
-            Ok(self
-                .create_notification(
-                    receiver_id,
-                    rpc::Notification::ContactRequest {
-                        sender_id: sender_id.to_proto(),
-                    },
-                    true,
-                    &tx,
-                )
-                .await?
-                .into_iter()
-                .collect())
-        })
-        .await
-    }
-
-    /// Returns a bool indicating whether the removed contact had originally accepted or not
-    ///
-    /// Deletes the contact identified by the requester and responder ids, and then returns
-    /// whether the deleted contact had originally accepted or was a pending contact request.
-    ///
-    /// # Arguments
-    ///
-    /// * `requester_id` - The user that initiates this request
-    /// * `responder_id` - The user that will be removed
-    pub async fn remove_contact(
-        &self,
-        requester_id: UserId,
-        responder_id: UserId,
-    ) -> Result<(bool, Option<NotificationId>)> {
-        self.transaction(|tx| async move {
-            let (id_a, id_b) = if responder_id < requester_id {
-                (responder_id, requester_id)
-            } else {
-                (requester_id, responder_id)
-            };
-
-            let contact = contact::Entity::find()
-                .filter(
-                    contact::Column::UserIdA
-                        .eq(id_a)
-                        .and(contact::Column::UserIdB.eq(id_b)),
-                )
-                .one(&*tx)
-                .await?
-                .context("no such contact")?;
-
-            contact::Entity::delete_by_id(contact.id).exec(&*tx).await?;
-
-            let mut deleted_notification_id = None;
-            if !contact.accepted {
-                deleted_notification_id = self
-                    .remove_notification(
-                        responder_id,
-                        rpc::Notification::ContactRequest {
-                            sender_id: requester_id.to_proto(),
-                        },
-                        &tx,
-                    )
-                    .await?;
-            }
-
-            Ok((contact.accepted, deleted_notification_id))
-        })
-        .await
-    }
-
-    /// Dismisses a contact notification for the given user.
-    pub async fn dismiss_contact_notification(
-        &self,
-        user_id: UserId,
-        contact_user_id: UserId,
-    ) -> Result<()> {
-        self.transaction(|tx| async move {
-            let (id_a, id_b, a_to_b) = if user_id < contact_user_id {
-                (user_id, contact_user_id, true)
-            } else {
-                (contact_user_id, user_id, false)
-            };
-
-            let result = contact::Entity::update_many()
-                .set(contact::ActiveModel {
-                    should_notify: ActiveValue::set(false),
-                    ..Default::default()
-                })
-                .filter(
-                    contact::Column::UserIdA
-                        .eq(id_a)
-                        .and(contact::Column::UserIdB.eq(id_b))
-                        .and(
-                            contact::Column::AToB
-                                .eq(a_to_b)
-                                .and(contact::Column::Accepted.eq(true))
-                                .or(contact::Column::AToB
-                                    .ne(a_to_b)
-                                    .and(contact::Column::Accepted.eq(false))),
-                        ),
-                )
-                .exec(&*tx)
-                .await?;
-            if result.rows_affected == 0 {
-                Err(anyhow!("no such contact request"))?
-            } else {
-                Ok(())
-            }
-        })
-        .await
-    }
-
-    /// Accept or decline a contact request
-    pub async fn respond_to_contact_request(
-        &self,
-        responder_id: UserId,
-        requester_id: UserId,
-        accept: bool,
-    ) -> Result<NotificationBatch> {
-        self.transaction(|tx| async move {
-            let (id_a, id_b, a_to_b) = if responder_id < requester_id {
-                (responder_id, requester_id, false)
-            } else {
-                (requester_id, responder_id, true)
-            };
-            let rows_affected = if accept {
-                let result = contact::Entity::update_many()
-                    .set(contact::ActiveModel {
-                        accepted: ActiveValue::set(true),
-                        should_notify: ActiveValue::set(true),
-                        ..Default::default()
-                    })
-                    .filter(
-                        contact::Column::UserIdA
-                            .eq(id_a)
-                            .and(contact::Column::UserIdB.eq(id_b))
-                            .and(contact::Column::AToB.eq(a_to_b)),
-                    )
-                    .exec(&*tx)
-                    .await?;
-                result.rows_affected
-            } else {
-                let result = contact::Entity::delete_many()
-                    .filter(
-                        contact::Column::UserIdA
-                            .eq(id_a)
-                            .and(contact::Column::UserIdB.eq(id_b))
-                            .and(contact::Column::AToB.eq(a_to_b))
-                            .and(contact::Column::Accepted.eq(false)),
-                    )
-                    .exec(&*tx)
-                    .await?;
-
-                result.rows_affected
-            };
-
-            if rows_affected == 0 {
-                Err(anyhow!("no such contact request"))?
-            }
-
-            let mut notifications = Vec::new();
-            notifications.extend(
-                self.mark_notification_as_read_with_response(
-                    responder_id,
-                    &rpc::Notification::ContactRequest {
-                        sender_id: requester_id.to_proto(),
-                    },
-                    accept,
-                    &tx,
-                )
-                .await?,
-            );
-
-            if accept {
-                notifications.extend(
-                    self.create_notification(
-                        requester_id,
-                        rpc::Notification::ContactRequestAccepted {
-                            responder_id: responder_id.to_proto(),
-                        },
-                        true,
-                        &tx,
-                    )
-                    .await?,
-                );
-            }
-
-            Ok(notifications)
-        })
-        .await
-    }
-}
diff --git a/crates/collab/src/db/queries/contributors.rs b/crates/collab/src/db/queries/contributors.rs
deleted file mode 100644
index 6f675a5fe7..0000000000
--- a/crates/collab/src/db/queries/contributors.rs
+++ /dev/null
@@ -1,100 +0,0 @@
-use super::*;
-
-#[derive(Debug)]
-pub enum ContributorSelector {
-    GitHubUserId { github_user_id: i32 },
-    GitHubLogin { github_login: String },
-}
-
-impl Database {
-    /// Retrieves the GitHub logins of all users who have signed the CLA.
-    pub async fn get_contributors(&self) -> Result<Vec<String>> {
-        self.transaction(|tx| async move {
-            #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
-            enum QueryGithubLogin {
-                GithubLogin,
-            }
-
-            Ok(contributor::Entity::find()
-                .inner_join(user::Entity)
-                .order_by_asc(contributor::Column::SignedAt)
-                .select_only()
-                .column(user::Column::GithubLogin)
-                .into_values::<_, QueryGithubLogin>()
-                .all(&*tx)
-                .await?)
-        })
-        .await
-    }
-
-    /// Records that a given user has signed the CLA.
-    pub async fn get_contributor_sign_timestamp(
-        &self,
-        selector: &ContributorSelector,
-    ) -> Result<Option<DateTime>> {
-        self.transaction(|tx| async move {
-            let condition = match selector {
-                ContributorSelector::GitHubUserId { github_user_id } => {
-                    user::Column::GithubUserId.eq(*github_user_id)
-                }
-                ContributorSelector::GitHubLogin { github_login } => {
-                    user::Column::GithubLogin.eq(github_login)
-                }
-            };
-
-            if let Some(user) = user::Entity::find().filter(condition).one(&*tx).await? {
-                if user.admin {
-                    return Ok(Some(user.created_at));
-                }
-
-                if let Some(contributor) =
-                    contributor::Entity::find_by_id(user.id).one(&*tx).await?
-                {
-                    return Ok(Some(contributor.signed_at));
-                }
-            }
-
-            Ok(None)
-        })
-        .await
-    }
-
-    /// Records that a given user has signed the CLA.
-    pub async fn add_contributor(
-        &self,
-        github_login: &str,
-        github_user_id: i32,
-        github_email: Option<&str>,
-        github_name: Option<&str>,
-        github_user_created_at: DateTimeUtc,
-        initial_channel_id: Option<ChannelId>,
-    ) -> Result<()> {
-        self.transaction(|tx| async move {
-            let user = self
-                .update_or_create_user_by_github_account_tx(
-                    github_login,
-                    github_user_id,
-                    github_email,
-                    github_name,
-                    github_user_created_at.naive_utc(),
-                    initial_channel_id,
-                    &tx,
-                )
-                .await?;
-
-            contributor::Entity::insert(contributor::ActiveModel {
-                user_id: ActiveValue::Set(user.id),
-                signed_at: ActiveValue::NotSet,
-            })
-            .on_conflict(
-                OnConflict::column(contributor::Column::UserId)
-                    .do_nothing()
-                    .to_owned(),
-            )
-            .exec_without_returning(&*tx)
-            .await?;
-            Ok(())
-        })
-        .await
-    }
-}
diff --git a/crates/collab/src/db/queries/dev_server_projects.rs b/crates/collab/src/db/queries/dev_server_projects.rs
deleted file mode 100644
index 8b13789179..0000000000
--- a/crates/collab/src/db/queries/dev_server_projects.rs
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/crates/collab/src/db/queries/dev_servers.rs b/crates/collab/src/db/queries/dev_servers.rs
deleted file mode 100644
index 8b13789179..0000000000
--- a/crates/collab/src/db/queries/dev_servers.rs
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/crates/collab/src/db/queries/extensions.rs b/crates/collab/src/db/queries/extensions.rs
deleted file mode 100644
index 729e3de99f..0000000000
--- a/crates/collab/src/db/queries/extensions.rs
+++ /dev/null
@@ -1,484 +0,0 @@
-use std::str::FromStr;
-
-use anyhow::Context;
-use chrono::Utc;
-use sea_orm::sea_query::IntoCondition;
-use util::ResultExt;
-
-use super::*;
-
-impl Database {
-    pub async fn get_extensions(
-        &self,
-        filter: Option<&str>,
-        provides_filter: Option<&BTreeSet<ExtensionProvides>>,
-        max_schema_version: i32,
-        limit: usize,
-    ) -> Result<Vec<ExtensionMetadata>> {
-        self.transaction(|tx| async move {
-            let mut condition = Condition::all()
-                .add(
-                    extension::Column::LatestVersion
-                        .into_expr()
-                        .eq(extension_version::Column::Version.into_expr()),
-                )
-                .add(extension_version::Column::SchemaVersion.lte(max_schema_version));
-            if let Some(filter) = filter {
-                let fuzzy_name_filter = Self::fuzzy_like_string(filter);
-                condition = condition.add(Expr::cust_with_expr("name ILIKE $1", fuzzy_name_filter));
-            }
-
-            if let Some(provides_filter) = provides_filter {
-                condition = apply_provides_filter(condition, provides_filter);
-            }
-
-            self.get_extensions_where(condition, Some(limit as u64), &tx)
-                .await
-        })
-        .await
-    }
-
-    pub async fn get_extensions_by_ids(
-        &self,
-        ids: &[&str],
-        constraints: Option<&ExtensionVersionConstraints>,
-    ) -> Result<Vec<ExtensionMetadata>> {
-        self.transaction(|tx| async move {
-            let extensions = extension::Entity::find()
-                .filter(extension::Column::ExternalId.is_in(ids.iter().copied()))
-                .all(&*tx)
-                .await?;
-
-            let mut max_versions = self
-                .get_latest_versions_for_extensions(&extensions, constraints, &tx)
-                .await?;
-
-            Ok(extensions
-                .into_iter()
-                .filter_map(|extension| {
-                    let (version, _) = max_versions.remove(&extension.id)?;
-                    Some(metadata_from_extension_and_version(extension, version))
-                })
-                .collect())
-        })
-        .await
-    }
-
-    async fn get_latest_versions_for_extensions(
-        &self,
-        extensions: &[extension::Model],
-        constraints: Option<&ExtensionVersionConstraints>,
-        tx: &DatabaseTransaction,
-    ) -> Result<HashMap<ExtensionId, (extension_version::Model, Version)>> {
-        let mut versions = extension_version::Entity::find()
-            .filter(
-                extension_version::Column::ExtensionId
-                    .is_in(extensions.iter().map(|extension| extension.id)),
-            )
-            .stream(tx)
-            .await?;
-
-        let mut max_versions =
-            HashMap::<ExtensionId, (extension_version::Model, Version)>::default();
-        while let Some(version) = versions.next().await {
-            let version = version?;
-            let Some(extension_version) = Version::from_str(&version.version).log_err() else {
-                continue;
-            };
-
-            if let Some((_, max_extension_version)) = &max_versions.get(&version.extension_id)
-                && max_extension_version > &extension_version
-            {
-                continue;
-            }
-
-            if let Some(constraints) = constraints {
-                if !constraints
-                    .schema_versions
-                    .contains(&version.schema_version)
-                {
-                    continue;
-                }
-
-                if let Some(wasm_api_version) = version.wasm_api_version.as_ref() {
-                    if let Some(version) = Version::from_str(wasm_api_version).log_err() {
-                        if !constraints.wasm_api_versions.contains(&version) {
-                            continue;
-                        }
-                    } else {
-                        continue;
-                    }
-                }
-            }
-
-            max_versions.insert(version.extension_id, (version, extension_version));
-        }
-
-        Ok(max_versions)
-    }
-
-    /// Returns all of the versions for the extension with the given ID.
-    pub async fn get_extension_versions(
-        &self,
-        extension_id: &str,
-    ) -> Result<Vec<ExtensionMetadata>> {
-        self.transaction(|tx| async move {
-            let condition = extension::Column::ExternalId
-                .eq(extension_id)
-                .into_condition();
-
-            self.get_extensions_where(condition, None, &tx).await
-        })
-        .await
-    }
-
-    async fn get_extensions_where(
-        &self,
-        condition: Condition,
-        limit: Option<u64>,
-        tx: &DatabaseTransaction,
-    ) -> Result<Vec<ExtensionMetadata>> {
-        let extensions = extension::Entity::find()
-            .inner_join(extension_version::Entity)
-            .select_also(extension_version::Entity)
-            .filter(condition)
-            .order_by_desc(extension::Column::TotalDownloadCount)
-            .order_by_asc(extension::Column::Name)
-            .limit(limit)
-            .all(tx)
-            .await?;
-
-        Ok(extensions
-            .into_iter()
-            .filter_map(|(extension, version)| {
-                Some(metadata_from_extension_and_version(extension, version?))
-            })
-            .collect())
-    }
-
-    pub async fn get_extension(
-        &self,
-        extension_id: &str,
-        constraints: Option<&ExtensionVersionConstraints>,
-    ) -> Result<Option<ExtensionMetadata>> {
-        self.transaction(|tx| async move {
-            let extension = extension::Entity::find()
-                .filter(extension::Column::ExternalId.eq(extension_id))
-                .one(&*tx)
-                .await?
-                .with_context(|| format!("no such extension: {extension_id}"))?;
-
-            let extensions = [extension];
-            let mut versions = self
-                .get_latest_versions_for_extensions(&extensions, constraints, &tx)
-                .await?;
-            let [extension] = extensions;
-
-            Ok(versions.remove(&extension.id).map(|(max_version, _)| {
-                metadata_from_extension_and_version(extension, max_version)
-            }))
-        })
-        .await
-    }
-
-    pub async fn get_extension_version(
-        &self,
-        extension_id: &str,
-        version: &str,
-    ) -> Result<Option<ExtensionMetadata>> {
-        self.transaction(|tx| async move {
-            let extension = extension::Entity::find()
-                .filter(extension::Column::ExternalId.eq(extension_id))
-                .filter(extension_version::Column::Version.eq(version))
-                .inner_join(extension_version::Entity)
-                .select_also(extension_version::Entity)
-                .one(&*tx)
-                .await?;
-
-            Ok(extension.and_then(|(extension, version)| {
-                Some(metadata_from_extension_and_version(extension, version?))
-            }))
-        })
-        .await
-    }
-
-    pub async fn get_known_extension_versions(&self) -> Result<HashMap<String, Vec<String>>> {
-        self.transaction(|tx| async move {
-            let mut extension_external_ids_by_id = HashMap::default();
-
-            let mut rows = extension::Entity::find().stream(&*tx).await?;
-            while let Some(row) = rows.next().await {
-                let row = row?;
-                extension_external_ids_by_id.insert(row.id, row.external_id);
-            }
-            drop(rows);
-
-            let mut known_versions_by_extension_id: HashMap<String, Vec<String>> =
-                HashMap::default();
-            let mut rows = extension_version::Entity::find().stream(&*tx).await?;
-            while let Some(row) = rows.next().await {
-                let row = row?;
-
-                let Some(extension_id) = extension_external_ids_by_id.get(&row.extension_id) else {
-                    continue;
-                };
-
-                let versions = known_versions_by_extension_id
-                    .entry(extension_id.clone())
-                    .or_default();
-                if let Err(ix) = versions.binary_search(&row.version) {
-                    versions.insert(ix, row.version);
-                }
-            }
-            drop(rows);
-
-            Ok(known_versions_by_extension_id)
-        })
-        .await
-    }
-
-    pub async fn insert_extension_versions(
-        &self,
-        versions_by_extension_id: &HashMap<&str, Vec<NewExtensionVersion>>,
-    ) -> Result<()> {
-        self.transaction(|tx| async move {
-            for (external_id, versions) in versions_by_extension_id {
-                if versions.is_empty() {
-                    continue;
-                }
-
-                let latest_version = versions
-                    .iter()
-                    .max_by_key(|version| &version.version)
-                    .unwrap();
-
-                let insert = extension::Entity::insert(extension::ActiveModel {
-                    name: ActiveValue::Set(latest_version.name.clone()),
-                    external_id: ActiveValue::Set((*external_id).to_owned()),
-                    id: ActiveValue::NotSet,
-                    latest_version: ActiveValue::Set(latest_version.version.to_string()),
-                    total_download_count: ActiveValue::NotSet,
-                })
-                .on_conflict(
-                    OnConflict::columns([extension::Column::ExternalId])
-                        .update_column(extension::Column::ExternalId)
-                        .to_owned(),
-                );
-
-                let extension = if tx.support_returning() {
-                    insert.exec_with_returning(&*tx).await?
-                } else {
-                    // Sqlite
-                    insert.exec_without_returning(&*tx).await?;
-                    extension::Entity::find()
-                        .filter(extension::Column::ExternalId.eq(*external_id))
-                        .one(&*tx)
-                        .await?
-                        .context("failed to insert extension")?
-                };
-
-                extension_version::Entity::insert_many(versions.iter().map(|version| {
-                    extension_version::ActiveModel {
-                        extension_id: ActiveValue::Set(extension.id),
-                        published_at: ActiveValue::Set(version.published_at),
-                        version: ActiveValue::Set(version.version.to_string()),
-                        authors: ActiveValue::Set(version.authors.join(", ")),
-                        repository: ActiveValue::Set(version.repository.clone()),
-                        description: ActiveValue::Set(version.description.clone()),
-                        schema_version: ActiveValue::Set(version.schema_version),
-                        wasm_api_version: ActiveValue::Set(version.wasm_api_version.clone()),
-                        provides_themes: ActiveValue::Set(
-                            version.provides.contains(&ExtensionProvides::Themes),
-                        ),
-                        provides_icon_themes: ActiveValue::Set(
-                            version.provides.contains(&ExtensionProvides::IconThemes),
-                        ),
-                        provides_languages: ActiveValue::Set(
-                            version.provides.contains(&ExtensionProvides::Languages),
-                        ),
-                        provides_grammars: ActiveValue::Set(
-                            version.provides.contains(&ExtensionProvides::Grammars),
-                        ),
-                        provides_language_servers: ActiveValue::Set(
-                            version
-                                .provides
-                                .contains(&ExtensionProvides::LanguageServers),
-                        ),
-                        provides_context_servers: ActiveValue::Set(
-                            version
-                                .provides
-                                .contains(&ExtensionProvides::ContextServers),
-                        ),
-                        provides_agent_servers: ActiveValue::Set(
-                            version.provides.contains(&ExtensionProvides::AgentServers),
-                        ),
-                        provides_slash_commands: ActiveValue::Set(
-                            version.provides.contains(&ExtensionProvides::SlashCommands),
-                        ),
-                        provides_indexed_docs_providers: ActiveValue::Set(
-                            version
-                                .provides
-                                .contains(&ExtensionProvides::IndexedDocsProviders),
-                        ),
-                        provides_snippets: ActiveValue::Set(
-                            version.provides.contains(&ExtensionProvides::Snippets),
-                        ),
-                        provides_debug_adapters: ActiveValue::Set(
-                            version.provides.contains(&ExtensionProvides::DebugAdapters),
-                        ),
-                        download_count: ActiveValue::NotSet,
-                    }
-                }))
-                .on_conflict(OnConflict::new().do_nothing().to_owned())
-                .exec_without_returning(&*tx)
-                .await?;
-
-                if let Ok(db_version) = semver::Version::parse(&extension.latest_version)
-                    && db_version >= latest_version.version
-                {
-                    continue;
-                }
-
-                let mut extension = extension.into_active_model();
-                extension.latest_version = ActiveValue::Set(latest_version.version.to_string());
-                extension.name = ActiveValue::set(latest_version.name.clone());
-                extension::Entity::update(extension).exec(&*tx).await?;
-            }
-
-            Ok(())
-        })
-        .await
-    }
-
-    pub async fn record_extension_download(&self, extension: &str, version: &str) -> Result<bool> {
-        self.transaction(|tx| async move {
-            #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
-            enum QueryId {
-                Id,
-            }
-
-            let extension_id: Option<ExtensionId> = extension::Entity::find()
-                .filter(extension::Column::ExternalId.eq(extension))
-                .select_only()
-                .column(extension::Column::Id)
-                .into_values::<_, QueryId>()
-                .one(&*tx)
-                .await?;
-            let Some(extension_id) = extension_id else {
-                return Ok(false);
-            };
-
-            extension_version::Entity::update_many()
-                .col_expr(
-                    extension_version::Column::DownloadCount,
-                    extension_version::Column::DownloadCount.into_expr().add(1),
-                )
-                .filter(
-                    extension_version::Column::ExtensionId
-                        .eq(extension_id)
-                        .and(extension_version::Column::Version.eq(version)),
-                )
-                .exec(&*tx)
-                .await?;
-
-            extension::Entity::update_many()
-                .col_expr(
-                    extension::Column::TotalDownloadCount,
-                    extension::Column::TotalDownloadCount.into_expr().add(1),
-                )
-                .filter(extension::Column::Id.eq(extension_id))
-                .exec(&*tx)
-                .await?;
-
-            Ok(true)
-        })
-        .await
-    }
-}
-
-fn apply_provides_filter(
-    mut condition: Condition,
-    provides_filter: &BTreeSet<ExtensionProvides>,
-) -> Condition {
-    if provides_filter.contains(&ExtensionProvides::Themes) {
-        condition = condition.add(extension_version::Column::ProvidesThemes.eq(true));
-    }
-
-    if provides_filter.contains(&ExtensionProvides::IconThemes) {
-        condition = condition.add(extension_version::Column::ProvidesIconThemes.eq(true));
-    }
-
-    if provides_filter.contains(&ExtensionProvides::Languages) {
-        condition = condition.add(extension_version::Column::ProvidesLanguages.eq(true));
-    }
-
-    if provides_filter.contains(&ExtensionProvides::Grammars) {
-        condition = condition.add(extension_version::Column::ProvidesGrammars.eq(true));
-    }
-
-    if provides_filter.contains(&ExtensionProvides::LanguageServers) {
-        condition = condition.add(extension_version::Column::ProvidesLanguageServers.eq(true));
-    }
-
-    if provides_filter.contains(&ExtensionProvides::ContextServers) {
-        condition = condition.add(extension_version::Column::ProvidesContextServers.eq(true));
-    }
-
-    if provides_filter.contains(&ExtensionProvides::AgentServers) {
-        condition = condition.add(extension_version::Column::ProvidesAgentServers.eq(true));
-    }
-
-    if provides_filter.contains(&ExtensionProvides::SlashCommands) {
-        condition = condition.add(extension_version::Column::ProvidesSlashCommands.eq(true));
-    }
-
-    if provides_filter.contains(&ExtensionProvides::IndexedDocsProviders) {
-        condition = condition.add(extension_version::Column::ProvidesIndexedDocsProviders.eq(true));
-    }
-
-    if provides_filter.contains(&ExtensionProvides::Snippets) {
-        condition = condition.add(extension_version::Column::ProvidesSnippets.eq(true));
-    }
-
-    if provides_filter.contains(&ExtensionProvides::DebugAdapters) {
-        condition = condition.add(extension_version::Column::ProvidesDebugAdapters.eq(true));
-    }
-
-    condition
-}
-
-fn metadata_from_extension_and_version(
-    extension: extension::Model,
-    version: extension_version::Model,
-) -> ExtensionMetadata {
-    let provides = version.provides();
-
-    ExtensionMetadata {
-        id: extension.external_id.into(),
-        manifest: rpc::ExtensionApiManifest {
-            name: extension.name,
-            version: version.version.into(),
-            authors: version
-                .authors
-                .split(',')
-                .map(|author| author.trim().to_string())
-                .collect::<Vec<_>>(),
-            description: Some(version.description),
-            repository: version.repository,
-            schema_version: Some(version.schema_version),
-            wasm_api_version: version.wasm_api_version,
-            provides,
-        },
-
-        published_at: convert_time_to_chrono(version.published_at),
-        download_count: extension.total_download_count as u64,
-    }
-}
-
-pub fn convert_time_to_chrono(time: time::PrimitiveDateTime) -> chrono::DateTime<Utc> {
-    chrono::DateTime::from_naive_utc_and_offset(
-        #[allow(deprecated)]
-        chrono::NaiveDateTime::from_timestamp_opt(time.assume_utc().unix_timestamp(), 0).unwrap(),
-        Utc,
-    )
-}
diff --git a/crates/collab/src/db/queries/notifications.rs b/crates/collab/src/db/queries/notifications.rs
deleted file mode 100644
index e92c269b7e..0000000000
--- a/crates/collab/src/db/queries/notifications.rs
+++ /dev/null
@@ -1,281 +0,0 @@
-use super::*;
-use anyhow::Context as _;
-use rpc::Notification;
-use util::ResultExt;
-
-impl Database {
-    /// Initializes the different kinds of notifications by upserting records for them.
-    pub async fn initialize_notification_kinds(&mut self) -> Result<()> {
-        let all_kinds = Notification::all_variant_names();
-        let existing_kinds = notification_kind::Entity::find().all(&self.pool).await?;
-
-        let kinds_to_create: Vec<_> = all_kinds
-            .iter()
-            .filter(|&kind| {
-                !existing_kinds
-                    .iter()
-                    .any(|existing| existing.name == **kind)
-            })
-            .map(|kind| notification_kind::ActiveModel {
-                name: ActiveValue::Set((*kind).to_owned()),
-                ..Default::default()
-            })
-            .collect();
-
-        if !kinds_to_create.is_empty() {
-            notification_kind::Entity::insert_many(kinds_to_create)
-                .exec_without_returning(&self.pool)
-                .await?;
-        }
-
-        let mut rows = notification_kind::Entity::find().stream(&self.pool).await?;
-        while let Some(row) = rows.next().await {
-            let row = row?;
-            self.notification_kinds_by_name.insert(row.name, row.id);
-        }
-
-        for name in Notification::all_variant_names() {
-            if let Some(id) = self.notification_kinds_by_name.get(*name).copied() {
-                self.notification_kinds_by_id.insert(id, name);
-            }
-        }
-
-        Ok(())
-    }
-
-    /// Returns the notifications for the given recipient.
-    pub async fn get_notifications(
-        &self,
-        recipient_id: UserId,
-        limit: usize,
-        before_id: Option<NotificationId>,
-    ) -> Result<Vec<proto::Notification>> {
-        self.transaction(|tx| async move {
-            let mut result = Vec::new();
-            let mut condition =
-                Condition::all().add(notification::Column::RecipientId.eq(recipient_id));
-
-            if let Some(before_id) = before_id {
-                condition = condition.add(notification::Column::Id.lt(before_id));
-            }
-
-            let mut rows = notification::Entity::find()
-                .filter(condition)
-                .order_by_desc(notification::Column::Id)
-                .limit(limit as u64)
-                .stream(&*tx)
-                .await?;
-            while let Some(row) = rows.next().await {
-                let row = row?;
-                if let Some(proto) = model_to_proto(self, row).log_err() {
-                    result.push(proto);
-                }
-            }
-            result.reverse();
-            Ok(result)
-        })
-        .await
-    }
-
-    /// Creates a notification. If `avoid_duplicates` is set to true, then avoid
-    /// creating a new notification if the given recipient already has an
-    /// unread notification with the given kind and entity id.
-    pub async fn create_notification(
-        &self,
-        recipient_id: UserId,
-        notification: Notification,
-        avoid_duplicates: bool,
-        tx: &DatabaseTransaction,
-    ) -> Result<Option<(UserId, proto::Notification)>> {
-        if avoid_duplicates
-            && self
-                .find_notification(recipient_id, &notification, tx)
-                .await?
-                .is_some()
-        {
-            return Ok(None);
-        }
-
-        let proto = notification.to_proto();
-        let kind = notification_kind_from_proto(self, &proto)?;
-        let model = notification::ActiveModel {
-            recipient_id: ActiveValue::Set(recipient_id),
-            kind: ActiveValue::Set(kind),
-            entity_id: ActiveValue::Set(proto.entity_id.map(|id| id as i32)),
-            content: ActiveValue::Set(proto.content.clone()),
-            ..Default::default()
-        }
-        .save(tx)
-        .await?;
-
-        Ok(Some((
-            recipient_id,
-            proto::Notification {
-                id: model.id.as_ref().to_proto(),
-                kind: proto.kind,
-                timestamp: model.created_at.as_ref().assume_utc().unix_timestamp() as u64,
-                is_read: false,
-                response: None,
-                content: proto.content,
-                entity_id: proto.entity_id,
-            },
-        )))
-    }
-
-    /// Remove an unread notification with the given recipient, kind and
-    /// entity id.
-    pub async fn remove_notification(
-        &self,
-        recipient_id: UserId,
-        notification: Notification,
-        tx: &DatabaseTransaction,
-    ) -> Result<Option<NotificationId>> {
-        let id = self
-            .find_notification(recipient_id, &notification, tx)
-            .await?;
-        if let Some(id) = id {
-            notification::Entity::delete_by_id(id).exec(tx).await?;
-        }
-        Ok(id)
-    }
-
-    /// Populate the response for the notification with the given kind and
-    /// entity id.
-    pub async fn mark_notification_as_read_with_response(
-        &self,
-        recipient_id: UserId,
-        notification: &Notification,
-        response: bool,
-        tx: &DatabaseTransaction,
-    ) -> Result<Option<(UserId, proto::Notification)>> {
-        self.mark_notification_as_read_internal(recipient_id, notification, Some(response), tx)
-            .await
-    }
-
-    /// Marks the given notification as read.
-    pub async fn mark_notification_as_read(
-        &self,
-        recipient_id: UserId,
-        notification: &Notification,
-        tx: &DatabaseTransaction,
-    ) -> Result<Option<(UserId, proto::Notification)>> {
-        self.mark_notification_as_read_internal(recipient_id, notification, None, tx)
-            .await
-    }
-
-    /// Marks the notification with the given ID as read.
-    pub async fn mark_notification_as_read_by_id(
-        &self,
-        recipient_id: UserId,
-        notification_id: NotificationId,
-    ) -> Result<NotificationBatch> {
-        self.transaction(|tx| async move {
-            let row = notification::Entity::update(notification::ActiveModel {
-                id: ActiveValue::Unchanged(notification_id),
-                recipient_id: ActiveValue::Unchanged(recipient_id),
-                is_read: ActiveValue::Set(true),
-                ..Default::default()
-            })
-            .exec(&*tx)
-            .await?;
-            Ok(model_to_proto(self, row)
-                .map(|notification| (recipient_id, notification))
-                .into_iter()
-                .collect())
-        })
-        .await
-    }
-
-    async fn mark_notification_as_read_internal(
-        &self,
-        recipient_id: UserId,
-        notification: &Notification,
-        response: Option<bool>,
-        tx: &DatabaseTransaction,
-    ) -> Result<Option<(UserId, proto::Notification)>> {
-        if let Some(id) = self
-            .find_notification(recipient_id, notification, tx)
-            .await?
-        {
-            let row = notification::Entity::update(notification::ActiveModel {
-                id: ActiveValue::Unchanged(id),
-                recipient_id: ActiveValue::Unchanged(recipient_id),
-                is_read: ActiveValue::Set(true),
-                response: if let Some(response) = response {
-                    ActiveValue::Set(Some(response))
-                } else {
-                    ActiveValue::NotSet
-                },
-                ..Default::default()
-            })
-            .exec(tx)
-            .await?;
-            Ok(model_to_proto(self, row)
-                .map(|notification| (recipient_id, notification))
-                .ok())
-        } else {
-            Ok(None)
-        }
-    }
-
-    /// Find an unread notification by its recipient, kind and entity id.
-    async fn find_notification(
-        &self,
-        recipient_id: UserId,
-        notification: &Notification,
-        tx: &DatabaseTransaction,
-    ) -> Result<Option<NotificationId>> {
-        let proto = notification.to_proto();
-        let kind = notification_kind_from_proto(self, &proto)?;
-
-        #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
-        enum QueryIds {
-            Id,
-        }
-
-        Ok(notification::Entity::find()
-            .select_only()
-            .column(notification::Column::Id)
-            .filter(
-                Condition::all()
-                    .add(notification::Column::RecipientId.eq(recipient_id))
-                    .add(notification::Column::IsRead.eq(false))
-                    .add(notification::Column::Kind.eq(kind))
-                    .add(if proto.entity_id.is_some() {
-                        notification::Column::EntityId.eq(proto.entity_id)
-                    } else {
-                        notification::Column::EntityId.is_null()
-                    }),
-            )
-            .into_values::<_, QueryIds>()
-            .one(tx)
-            .await?)
-    }
-}
-
-pub fn model_to_proto(this: &Database, row: notification::Model) -> Result<proto::Notification> {
-    let kind = this
-        .notification_kinds_by_id
-        .get(&row.kind)
-        .context("Unknown notification kind")?;
-    Ok(proto::Notification {
-        id: row.id.to_proto(),
-        kind: (*kind).to_owned(),
-        timestamp: row.created_at.assume_utc().unix_timestamp() as u64,
-        is_read: row.is_read,
-        response: row.response,
-        content: row.content,
-        entity_id: row.entity_id.map(|id| id as u64),
-    })
-}
-
-fn notification_kind_from_proto(
-    this: &Database,
-    proto: &proto::Notification,
-) -> Result<NotificationKindId> {
-    Ok(this
-        .notification_kinds_by_name
-        .get(&proto.kind)
-        .copied()
-        .with_context(|| format!("invalid notification kind {:?}", proto.kind))?)
-}
diff --git a/crates/collab/src/db/queries/projects.rs b/crates/collab/src/db/queries/projects.rs
deleted file mode 100644
index 6f1d8b884d..0000000000
--- a/crates/collab/src/db/queries/projects.rs
+++ /dev/null
@@ -1,1501 +0,0 @@
-use anyhow::Context as _;
-use collections::HashSet;
-use util::ResultExt;
-
-use super::*;
-
-impl Database {
-    /// Returns the count of all projects, excluding ones marked as admin.
-    pub async fn project_count_excluding_admins(&self) -> Result<usize> {
-        #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
-        enum QueryAs {
-            Count,
-        }
-
-        self.transaction(|tx| async move {
-            Ok(project::Entity::find()
-                .select_only()
-                .column_as(project::Column::Id.count(), QueryAs::Count)
-                .inner_join(user::Entity)
-                .filter(user::Column::Admin.eq(false))
-                .into_values::<_, QueryAs>()
-                .one(&*tx)
-                .await?
-                .unwrap_or(0i64) as usize)
-        })
-        .await
-    }
-
-    /// Shares a project with the given room.
-    pub async fn share_project(
-        &self,
-        room_id: RoomId,
-        connection: ConnectionId,
-        worktrees: &[proto::WorktreeMetadata],
-        is_ssh_project: bool,
-        windows_paths: bool,
-    ) -> Result<TransactionGuard<(ProjectId, proto::Room)>> {
-        self.room_transaction(room_id, |tx| async move {
-            let participant = room_participant::Entity::find()
-                .filter(
-                    Condition::all()
-                        .add(
-                            room_participant::Column::AnsweringConnectionId
-                                .eq(connection.id as i32),
-                        )
-                        .add(
-                            room_participant::Column::AnsweringConnectionServerId
-                                .eq(connection.owner_id as i32),
-                        ),
-                )
-                .one(&*tx)
-                .await?
-                .context("could not find participant")?;
-            if participant.room_id != room_id {
-                return Err(anyhow!("shared project on unexpected room"))?;
-            }
-            if !participant
-                .role
-                .unwrap_or(ChannelRole::Member)
-                .can_edit_projects()
-            {
-                return Err(anyhow!("guests cannot share projects"))?;
-            }
-
-            let project = project::ActiveModel {
-                room_id: ActiveValue::set(Some(participant.room_id)),
-                host_user_id: ActiveValue::set(Some(participant.user_id)),
-                host_connection_id: ActiveValue::set(Some(connection.id as i32)),
-                host_connection_server_id: ActiveValue::set(Some(ServerId(
-                    connection.owner_id as i32,
-                ))),
-                id: ActiveValue::NotSet,
-                windows_paths: ActiveValue::set(windows_paths),
-            }
-            .insert(&*tx)
-            .await?;
-
-            if !worktrees.is_empty() {
-                worktree::Entity::insert_many(worktrees.iter().map(|worktree| {
-                    worktree::ActiveModel {
-                        id: ActiveValue::set(worktree.id as i64),
-                        project_id: ActiveValue::set(project.id),
-                        abs_path: ActiveValue::set(worktree.abs_path.clone()),
-                        root_name: ActiveValue::set(worktree.root_name.clone()),
-                        visible: ActiveValue::set(worktree.visible),
-                        scan_id: ActiveValue::set(0),
-                        completed_scan_id: ActiveValue::set(0),
-                    }
-                }))
-                .exec(&*tx)
-                .await?;
-            }
-
-            let replica_id = if is_ssh_project {
-                clock::ReplicaId::REMOTE_SERVER
-            } else {
-                clock::ReplicaId::LOCAL
-            };
-
-            project_collaborator::ActiveModel {
-                project_id: ActiveValue::set(project.id),
-                connection_id: ActiveValue::set(connection.id as i32),
-                connection_server_id: ActiveValue::set(ServerId(connection.owner_id as i32)),
-                user_id: ActiveValue::set(participant.user_id),
-                replica_id: ActiveValue::set(ReplicaId(replica_id.as_u16() as i32)),
-                is_host: ActiveValue::set(true),
-                id: ActiveValue::NotSet,
-                committer_name: ActiveValue::Set(None),
-                committer_email: ActiveValue::Set(None),
-            }
-            .insert(&*tx)
-            .await?;
-
-            let room = self.get_room(room_id, &tx).await?;
-            Ok((project.id, room))
-        })
-        .await
-    }
-
-    pub async fn delete_project(&self, project_id: ProjectId) -> Result<()> {
-        self.transaction(|tx| async move {
-            project::Entity::delete_by_id(project_id).exec(&*tx).await?;
-            Ok(())
-        })
-        .await
-    }
-
-    /// Unshares the given project.
-    pub async fn unshare_project(
-        &self,
-        project_id: ProjectId,
-        connection: ConnectionId,
-    ) -> Result<TransactionGuard<(bool, Option<proto::Room>, Vec<ConnectionId>)>> {
-        self.project_transaction(project_id, |tx| async move {
-            let guest_connection_ids = self.project_guest_connection_ids(project_id, &tx).await?;
-            let project = project::Entity::find_by_id(project_id)
-                .one(&*tx)
-                .await?
-                .context("project not found")?;
-            let room = if let Some(room_id) = project.room_id {
-                Some(self.get_room(room_id, &tx).await?)
-            } else {
-                None
-            };
-            if project.host_connection()? == connection {
-                return Ok((true, room, guest_connection_ids));
-            }
-            Err(anyhow!("cannot unshare a project hosted by another user"))?
-        })
-        .await
-    }
-
-    /// Updates the worktrees associated with the given project.
-    pub async fn update_project(
-        &self,
-        project_id: ProjectId,
-        connection: ConnectionId,
-        worktrees: &[proto::WorktreeMetadata],
-    ) -> Result<TransactionGuard<(Option<proto::Room>, Vec<ConnectionId>)>> {
-        self.project_transaction(project_id, |tx| async move {
-            let project = project::Entity::find_by_id(project_id)
-                .filter(
-                    Condition::all()
-                        .add(project::Column::HostConnectionId.eq(connection.id as i32))
-                        .add(
-                            project::Column::HostConnectionServerId.eq(connection.owner_id as i32),
-                        ),
-                )
-                .one(&*tx)
-                .await?
-                .context("no such project")?;
-
-            self.update_project_worktrees(project.id, worktrees, &tx)
-                .await?;
-
-            let guest_connection_ids = self.project_guest_connection_ids(project.id, &tx).await?;
-
-            let room = if let Some(room_id) = project.room_id {
-                Some(self.get_room(room_id, &tx).await?)
-            } else {
-                None
-            };
-
-            Ok((room, guest_connection_ids))
-        })
-        .await
-    }
-
-    pub(in crate::db) async fn update_project_worktrees(
-        &self,
-        project_id: ProjectId,
-        worktrees: &[proto::WorktreeMetadata],
-        tx: &DatabaseTransaction,
-    ) -> Result<()> {
-        if !worktrees.is_empty() {
-            worktree::Entity::insert_many(worktrees.iter().map(|worktree| worktree::ActiveModel {
-                id: ActiveValue::set(worktree.id as i64),
-                project_id: ActiveValue::set(project_id),
-                abs_path: ActiveValue::set(worktree.abs_path.clone()),
-                root_name: ActiveValue::set(worktree.root_name.clone()),
-                visible: ActiveValue::set(worktree.visible),
-                scan_id: ActiveValue::set(0),
-                completed_scan_id: ActiveValue::set(0),
-            }))
-            .on_conflict(
-                OnConflict::columns([worktree::Column::ProjectId, worktree::Column::Id])
-                    .update_column(worktree::Column::RootName)
-                    .to_owned(),
-            )
-            .exec(tx)
-            .await?;
-        }
-
-        worktree::Entity::delete_many()
-            .filter(worktree::Column::ProjectId.eq(project_id).and(
-                worktree::Column::Id.is_not_in(worktrees.iter().map(|worktree| worktree.id as i64)),
-            ))
-            .exec(tx)
-            .await?;
-
-        Ok(())
-    }
-
-    pub async fn update_worktree(
-        &self,
-        update: &proto::UpdateWorktree,
-        connection: ConnectionId,
-    ) -> Result<TransactionGuard<Vec<ConnectionId>>> {
-        if update.removed_entries.len() > proto::MAX_WORKTREE_UPDATE_MAX_CHUNK_SIZE
-            || update.updated_entries.len() > proto::MAX_WORKTREE_UPDATE_MAX_CHUNK_SIZE
-        {
-            return Err(anyhow!(
-                "invalid worktree update. removed entries: {}, updated entries: {}",
-                update.removed_entries.len(),
-                update.updated_entries.len()
-            ))?;
-        }
-
-        let project_id = ProjectId::from_proto(update.project_id);
-        let worktree_id = update.worktree_id as i64;
-        self.project_transaction(project_id, |tx| async move {
-            // Ensure the update comes from the host.
-            let _project = project::Entity::find_by_id(project_id)
-                .filter(
-                    Condition::all()
-                        .add(project::Column::HostConnectionId.eq(connection.id as i32))
-                        .add(
-                            project::Column::HostConnectionServerId.eq(connection.owner_id as i32),
-                        ),
-                )
-                .one(&*tx)
-                .await?
-                .with_context(|| format!("no such project: {project_id}"))?;
-
-            // Update metadata.
-            worktree::Entity::update(worktree::ActiveModel {
-                id: ActiveValue::set(worktree_id),
-                project_id: ActiveValue::set(project_id),
-                root_name: ActiveValue::set(update.root_name.clone()),
-                scan_id: ActiveValue::set(update.scan_id as i64),
-                completed_scan_id: if update.is_last_update {
-                    ActiveValue::set(update.scan_id as i64)
-                } else {
-                    ActiveValue::default()
-                },
-                abs_path: ActiveValue::set(update.abs_path.clone()),
-                ..Default::default()
-            })
-            .exec(&*tx)
-            .await?;
-
-            if !update.updated_entries.is_empty() {
-                worktree_entry::Entity::insert_many(update.updated_entries.iter().map(|entry| {
-                    let mtime = entry.mtime.clone().unwrap_or_default();
-                    worktree_entry::ActiveModel {
-                        project_id: ActiveValue::set(project_id),
-                        worktree_id: ActiveValue::set(worktree_id),
-                        id: ActiveValue::set(entry.id as i64),
-                        is_dir: ActiveValue::set(entry.is_dir),
-                        path: ActiveValue::set(entry.path.clone()),
-                        inode: ActiveValue::set(entry.inode as i64),
-                        mtime_seconds: ActiveValue::set(mtime.seconds as i64),
-                        mtime_nanos: ActiveValue::set(mtime.nanos as i32),
-                        canonical_path: ActiveValue::set(entry.canonical_path.clone()),
-                        is_ignored: ActiveValue::set(entry.is_ignored),
-                        git_status: ActiveValue::set(None),
-                        is_external: ActiveValue::set(entry.is_external),
-                        is_deleted: ActiveValue::set(false),
-                        is_hidden: ActiveValue::set(entry.is_hidden),
-                        scan_id: ActiveValue::set(update.scan_id as i64),
-                        is_fifo: ActiveValue::set(entry.is_fifo),
-                    }
-                }))
-                .on_conflict(
-                    OnConflict::columns([
-                        worktree_entry::Column::ProjectId,
-                        worktree_entry::Column::WorktreeId,
-                        worktree_entry::Column::Id,
-                    ])
-                    .update_columns([
-                        worktree_entry::Column::IsDir,
-                        worktree_entry::Column::Path,
-                        worktree_entry::Column::Inode,
-                        worktree_entry::Column::MtimeSeconds,
-                        worktree_entry::Column::MtimeNanos,
-                        worktree_entry::Column::CanonicalPath,
-                        worktree_entry::Column::IsIgnored,
-                        worktree_entry::Column::IsHidden,
-                        worktree_entry::Column::ScanId,
-                    ])
-                    .to_owned(),
-                )
-                .exec(&*tx)
-                .await?;
-            }
-
-            if !update.removed_entries.is_empty() {
-                worktree_entry::Entity::update_many()
-                    .filter(
-                        worktree_entry::Column::ProjectId
-                            .eq(project_id)
-                            .and(worktree_entry::Column::WorktreeId.eq(worktree_id))
-                            .and(
-                                worktree_entry::Column::Id
-                                    .is_in(update.removed_entries.iter().map(|id| *id as i64)),
-                            ),
-                    )
-                    .set(worktree_entry::ActiveModel {
-                        is_deleted: ActiveValue::Set(true),
-                        scan_id: ActiveValue::Set(update.scan_id as i64),
-                        ..Default::default()
-                    })
-                    .exec(&*tx)
-                    .await?;
-            }
-
-            // Backward-compatibility for old Zed clients.
-            //
-            // Remove this block when Zed 1.80 stable has been out for a week.
-            {
-                if !update.updated_repositories.is_empty() {
-                    project_repository::Entity::insert_many(
-                        update.updated_repositories.iter().map(|repository| {
-                            project_repository::ActiveModel {
-                                project_id: ActiveValue::set(project_id),
-                                legacy_worktree_id: ActiveValue::set(Some(worktree_id)),
-                                id: ActiveValue::set(repository.repository_id as i64),
-                                scan_id: ActiveValue::set(update.scan_id as i64),
-                                is_deleted: ActiveValue::set(false),
-                                branch_summary: ActiveValue::Set(
-                                    repository
-                                        .branch_summary
-                                        .as_ref()
-                                        .map(|summary| serde_json::to_string(summary).unwrap()),
-                                ),
-                                current_merge_conflicts: ActiveValue::Set(Some(
-                                    serde_json::to_string(&repository.current_merge_conflicts)
-                                        .unwrap(),
-                                )),
-                                // Old clients do not use abs path, entry ids, head_commit_details, or merge_message.
-                                abs_path: ActiveValue::set(String::new()),
-                                entry_ids: ActiveValue::set("[]".into()),
-                                head_commit_details: ActiveValue::set(None),
-                                merge_message: ActiveValue::set(None),
-                                remote_upstream_url: ActiveValue::set(None),
-                                remote_origin_url: ActiveValue::set(None),
-                            }
-                        }),
-                    )
-                    .on_conflict(
-                        OnConflict::columns([
-                            project_repository::Column::ProjectId,
-                            project_repository::Column::Id,
-                        ])
-                        .update_columns([
-                            project_repository::Column::ScanId,
-                            project_repository::Column::BranchSummary,
-                            project_repository::Column::CurrentMergeConflicts,
-                        ])
-                        .to_owned(),
-                    )
-                    .exec(&*tx)
-                    .await?;
-
-                    let has_any_statuses = update
-                        .updated_repositories
-                        .iter()
-                        .any(|repository| !repository.updated_statuses.is_empty());
-
-                    if has_any_statuses {
-                        project_repository_statuses::Entity::insert_many(
-                            update.updated_repositories.iter().flat_map(
-                                |repository: &proto::RepositoryEntry| {
-                                    repository.updated_statuses.iter().map(|status_entry| {
-                                        let (repo_path, status_kind, first_status, second_status) =
-                                            proto_status_to_db(status_entry.clone());
-                                        project_repository_statuses::ActiveModel {
-                                            project_id: ActiveValue::set(project_id),
-                                            repository_id: ActiveValue::set(
-                                                repository.repository_id as i64,
-                                            ),
-                                            scan_id: ActiveValue::set(update.scan_id as i64),
-                                            is_deleted: ActiveValue::set(false),
-                                            repo_path: ActiveValue::set(repo_path),
-                                            status: ActiveValue::set(0),
-                                            status_kind: ActiveValue::set(status_kind),
-                                            first_status: ActiveValue::set(first_status),
-                                            second_status: ActiveValue::set(second_status),
-                                        }
-                                    })
-                                },
-                            ),
-                        )
-                        .on_conflict(
-                            OnConflict::columns([
-                                project_repository_statuses::Column::ProjectId,
-                                project_repository_statuses::Column::RepositoryId,
-                                project_repository_statuses::Column::RepoPath,
-                            ])
-                            .update_columns([
-                                project_repository_statuses::Column::ScanId,
-                                project_repository_statuses::Column::StatusKind,
-                                project_repository_statuses::Column::FirstStatus,
-                                project_repository_statuses::Column::SecondStatus,
-                            ])
-                            .to_owned(),
-                        )
-                        .exec(&*tx)
-                        .await?;
-                    }
-
-                    for repo in &update.updated_repositories {
-                        if !repo.removed_statuses.is_empty() {
-                            project_repository_statuses::Entity::update_many()
-                                .filter(
-                                    project_repository_statuses::Column::ProjectId
-                                        .eq(project_id)
-                                        .and(
-                                            project_repository_statuses::Column::RepositoryId
-                                                .eq(repo.repository_id),
-                                        )
-                                        .and(
-                                            project_repository_statuses::Column::RepoPath
-                                                .is_in(repo.removed_statuses.iter()),
-                                        ),
-                                )
-                                .set(project_repository_statuses::ActiveModel {
-                                    is_deleted: ActiveValue::Set(true),
-                                    scan_id: ActiveValue::Set(update.scan_id as i64),
-                                    ..Default::default()
-                                })
-                                .exec(&*tx)
-                                .await?;
-                        }
-                    }
-                }
-
-                if !update.removed_repositories.is_empty() {
-                    project_repository::Entity::update_many()
-                        .filter(
-                            project_repository::Column::ProjectId
-                                .eq(project_id)
-                                .and(project_repository::Column::LegacyWorktreeId.eq(worktree_id))
-                                .and(project_repository::Column::Id.is_in(
-                                    update.removed_repositories.iter().map(|id| *id as i64),
-                                )),
-                        )
-                        .set(project_repository::ActiveModel {
-                            is_deleted: ActiveValue::Set(true),
-                            scan_id: ActiveValue::Set(update.scan_id as i64),
-                            ..Default::default()
-                        })
-                        .exec(&*tx)
-                        .await?;
-                }
-            }
-
-            let connection_ids = self.project_guest_connection_ids(project_id, &tx).await?;
-            Ok(connection_ids)
-        })
-        .await
-    }
-
-    pub async fn update_repository(
-        &self,
-        update: &proto::UpdateRepository,
-        _connection: ConnectionId,
-    ) -> Result<TransactionGuard<Vec<ConnectionId>>> {
-        let project_id = ProjectId::from_proto(update.project_id);
-        let repository_id = update.id as i64;
-        self.project_transaction(project_id, |tx| async move {
-            project_repository::Entity::insert(project_repository::ActiveModel {
-                project_id: ActiveValue::set(project_id),
-                id: ActiveValue::set(repository_id),
-                legacy_worktree_id: ActiveValue::set(None),
-                abs_path: ActiveValue::set(update.abs_path.clone()),
-                entry_ids: ActiveValue::Set(serde_json::to_string(&update.entry_ids).unwrap()),
-                scan_id: ActiveValue::set(update.scan_id as i64),
-                is_deleted: ActiveValue::set(false),
-                branch_summary: ActiveValue::Set(
-                    update
-                        .branch_summary
-                        .as_ref()
-                        .map(|summary| serde_json::to_string(summary).unwrap()),
-                ),
-                head_commit_details: ActiveValue::Set(
-                    update
-                        .head_commit_details
-                        .as_ref()
-                        .map(|details| serde_json::to_string(details).unwrap()),
-                ),
-                current_merge_conflicts: ActiveValue::Set(Some(
-                    serde_json::to_string(&update.current_merge_conflicts).unwrap(),
-                )),
-                merge_message: ActiveValue::set(update.merge_message.clone()),
-                remote_upstream_url: ActiveValue::set(update.remote_upstream_url.clone()),
-                remote_origin_url: ActiveValue::set(update.remote_origin_url.clone()),
-            })
-            .on_conflict(
-                OnConflict::columns([
-                    project_repository::Column::ProjectId,
-                    project_repository::Column::Id,
-                ])
-                .update_columns([
-                    project_repository::Column::ScanId,
-                    project_repository::Column::BranchSummary,
-                    project_repository::Column::EntryIds,
-                    project_repository::Column::AbsPath,
-                    project_repository::Column::CurrentMergeConflicts,
-                    project_repository::Column::HeadCommitDetails,
-                    project_repository::Column::MergeMessage,
-                ])
-                .to_owned(),
-            )
-            .exec(&*tx)
-            .await?;
-
-            let has_any_statuses = !update.updated_statuses.is_empty();
-
-            if has_any_statuses {
-                project_repository_statuses::Entity::insert_many(
-                    update.updated_statuses.iter().map(|status_entry| {
-                        let (repo_path, status_kind, first_status, second_status) =
-                            proto_status_to_db(status_entry.clone());
-                        project_repository_statuses::ActiveModel {
-                            project_id: ActiveValue::set(project_id),
-                            repository_id: ActiveValue::set(repository_id),
-                            scan_id: ActiveValue::set(update.scan_id as i64),
-                            is_deleted: ActiveValue::set(false),
-                            repo_path: ActiveValue::set(repo_path),
-                            status: ActiveValue::set(0),
-                            status_kind: ActiveValue::set(status_kind),
-                            first_status: ActiveValue::set(first_status),
-                            second_status: ActiveValue::set(second_status),
-                        }
-                    }),
-                )
-                .on_conflict(
-                    OnConflict::columns([
-                        project_repository_statuses::Column::ProjectId,
-                        project_repository_statuses::Column::RepositoryId,
-                        project_repository_statuses::Column::RepoPath,
-                    ])
-                    .update_columns([
-                        project_repository_statuses::Column::ScanId,
-                        project_repository_statuses::Column::StatusKind,
-                        project_repository_statuses::Column::FirstStatus,
-                        project_repository_statuses::Column::SecondStatus,
-                    ])
-                    .to_owned(),
-                )
-                .exec(&*tx)
-                .await?;
-            }
-
-            let has_any_removed_statuses = !update.removed_statuses.is_empty();
-
-            if has_any_removed_statuses {
-                project_repository_statuses::Entity::update_many()
-                    .filter(
-                        project_repository_statuses::Column::ProjectId
-                            .eq(project_id)
-                            .and(
-                                project_repository_statuses::Column::RepositoryId.eq(repository_id),
-                            )
-                            .and(
-                                project_repository_statuses::Column::RepoPath
-                                    .is_in(update.removed_statuses.iter()),
-                            ),
-                    )
-                    .set(project_repository_statuses::ActiveModel {
-                        is_deleted: ActiveValue::Set(true),
-                        scan_id: ActiveValue::Set(update.scan_id as i64),
-                        ..Default::default()
-                    })
-                    .exec(&*tx)
-                    .await?;
-            }
-
-            let connection_ids = self.project_guest_connection_ids(project_id, &tx).await?;
-            Ok(connection_ids)
-        })
-        .await
-    }
-
-    pub async fn remove_repository(
-        &self,
-        remove: &proto::RemoveRepository,
-        _connection: ConnectionId,
-    ) -> Result<TransactionGuard<Vec<ConnectionId>>> {
-        let project_id = ProjectId::from_proto(remove.project_id);
-        let repository_id = remove.id as i64;
-        self.project_transaction(project_id, |tx| async move {
-            project_repository::Entity::update_many()
-                .filter(
-                    project_repository::Column::ProjectId
-                        .eq(project_id)
-                        .and(project_repository::Column::Id.eq(repository_id)),
-                )
-                .set(project_repository::ActiveModel {
-                    is_deleted: ActiveValue::Set(true),
-                    // scan_id: ActiveValue::Set(update.scan_id as i64),
-                    ..Default::default()
-                })
-                .exec(&*tx)
-                .await?;
-
-            let connection_ids = self.project_guest_connection_ids(project_id, &tx).await?;
-            Ok(connection_ids)
-        })
-        .await
-    }
-
-    /// Updates the diagnostic summary for the given connection.
-    pub async fn update_diagnostic_summary(
-        &self,
-        update: &proto::UpdateDiagnosticSummary,
-        connection: ConnectionId,
-    ) -> Result<TransactionGuard<Vec<ConnectionId>>> {
-        let project_id = ProjectId::from_proto(update.project_id);
-        let worktree_id = update.worktree_id as i64;
-        self.project_transaction(project_id, |tx| async move {
-            let summary = update.summary.as_ref().context("invalid summary")?;
-
-            // Ensure the update comes from the host.
-            let project = project::Entity::find_by_id(project_id)
-                .one(&*tx)
-                .await?
-                .context("no such project")?;
-            if project.host_connection()? != connection {
-                return Err(anyhow!("can't update a project hosted by someone else"))?;
-            }
-
-            // Update summary.
-            worktree_diagnostic_summary::Entity::insert(worktree_diagnostic_summary::ActiveModel {
-                project_id: ActiveValue::set(project_id),
-                worktree_id: ActiveValue::set(worktree_id),
-                path: ActiveValue::set(summary.path.clone()),
-                language_server_id: ActiveValue::set(summary.language_server_id as i64),
-                error_count: ActiveValue::set(summary.error_count as i32),
-                warning_count: ActiveValue::set(summary.warning_count as i32),
-            })
-            .on_conflict(
-                OnConflict::columns([
-                    worktree_diagnostic_summary::Column::ProjectId,
-                    worktree_diagnostic_summary::Column::WorktreeId,
-                    worktree_diagnostic_summary::Column::Path,
-                ])
-                .update_columns([
-                    worktree_diagnostic_summary::Column::LanguageServerId,
-                    worktree_diagnostic_summary::Column::ErrorCount,
-                    worktree_diagnostic_summary::Column::WarningCount,
-                ])
-                .to_owned(),
-            )
-            .exec(&*tx)
-            .await?;
-
-            let connection_ids = self.project_guest_connection_ids(project_id, &tx).await?;
-            Ok(connection_ids)
-        })
-        .await
-    }
-
-    /// Starts the language server for the given connection.
-    pub async fn start_language_server(
-        &self,
-        update: &proto::StartLanguageServer,
-        connection: ConnectionId,
-    ) -> Result<TransactionGuard<Vec<ConnectionId>>> {
-        let project_id = ProjectId::from_proto(update.project_id);
-        self.project_transaction(project_id, |tx| async move {
-            let server = update.server.as_ref().context("invalid language server")?;
-
-            // Ensure the update comes from the host.
-            let project = project::Entity::find_by_id(project_id)
-                .one(&*tx)
-                .await?
-                .context("no such project")?;
-            if project.host_connection()? != connection {
-                return Err(anyhow!("can't update a project hosted by someone else"))?;
-            }
-
-            // Add the newly-started language server.
-            language_server::Entity::insert(language_server::ActiveModel {
-                project_id: ActiveValue::set(project_id),
-                id: ActiveValue::set(server.id as i64),
-                name: ActiveValue::set(server.name.clone()),
-                worktree_id: ActiveValue::set(server.worktree_id.map(|id| id as i64)),
-                capabilities: ActiveValue::set(update.capabilities.clone()),
-            })
-            .on_conflict(
-                OnConflict::columns([
-                    language_server::Column::ProjectId,
-                    language_server::Column::Id,
-                ])
-                .update_columns([
-                    language_server::Column::Name,
-                    language_server::Column::Capabilities,
-                    language_server::Column::WorktreeId,
-                ])
-                .to_owned(),
-            )
-            .exec(&*tx)
-            .await?;
-
-            let connection_ids = self.project_guest_connection_ids(project_id, &tx).await?;
-            Ok(connection_ids)
-        })
-        .await
-    }
-
-    /// Updates the worktree settings for the given connection.
-    pub async fn update_worktree_settings(
-        &self,
-        update: &proto::UpdateWorktreeSettings,
-        connection: ConnectionId,
-    ) -> Result<TransactionGuard<Vec<ConnectionId>>> {
-        let project_id = ProjectId::from_proto(update.project_id);
-        let kind = match update.kind {
-            Some(kind) => proto::LocalSettingsKind::from_i32(kind)
-                .with_context(|| format!("unknown worktree settings kind: {kind}"))?,
-            None => proto::LocalSettingsKind::Settings,
-        };
-        let kind = LocalSettingsKind::from_proto(kind);
-        self.project_transaction(project_id, |tx| async move {
-            // Ensure the update comes from the host.
-            let project = project::Entity::find_by_id(project_id)
-                .one(&*tx)
-                .await?
-                .context("no such project")?;
-            if project.host_connection()? != connection {
-                return Err(anyhow!("can't update a project hosted by someone else"))?;
-            }
-
-            if let Some(content) = &update.content {
-                worktree_settings_file::Entity::insert(worktree_settings_file::ActiveModel {
-                    project_id: ActiveValue::Set(project_id),
-                    worktree_id: ActiveValue::Set(update.worktree_id as i64),
-                    path: ActiveValue::Set(update.path.clone()),
-                    content: ActiveValue::Set(content.clone()),
-                    kind: ActiveValue::Set(kind),
-                })
-                .on_conflict(
-                    OnConflict::columns([
-                        worktree_settings_file::Column::ProjectId,
-                        worktree_settings_file::Column::WorktreeId,
-                        worktree_settings_file::Column::Path,
-                    ])
-                    .update_column(worktree_settings_file::Column::Content)
-                    .to_owned(),
-                )
-                .exec(&*tx)
-                .await?;
-            } else {
-                worktree_settings_file::Entity::delete(worktree_settings_file::ActiveModel {
-                    project_id: ActiveValue::Set(project_id),
-                    worktree_id: ActiveValue::Set(update.worktree_id as i64),
-                    path: ActiveValue::Set(update.path.clone()),
-                    ..Default::default()
-                })
-                .exec(&*tx)
-                .await?;
-            }
-
-            let connection_ids = self.project_guest_connection_ids(project_id, &tx).await?;
-            Ok(connection_ids)
-        })
-        .await
-    }
-
-    pub async fn get_project(&self, id: ProjectId) -> Result<project::Model> {
-        self.transaction(|tx| async move {
-            Ok(project::Entity::find_by_id(id)
-                .one(&*tx)
-                .await?
-                .context("no such project")?)
-        })
-        .await
-    }
-
-    /// Adds the given connection to the specified project
-    /// in the current room.
-    pub async fn join_project(
-        &self,
-        project_id: ProjectId,
-        connection: ConnectionId,
-        user_id: UserId,
-        committer_name: Option<String>,
-        committer_email: Option<String>,
-    ) -> Result<TransactionGuard<(Project, ReplicaId)>> {
-        self.project_transaction(project_id, move |tx| {
-            let committer_name = committer_name.clone();
-            let committer_email = committer_email.clone();
-            async move {
-                let (project, role) = self
-                    .access_project(project_id, connection, Capability::ReadOnly, &tx)
-                    .await?;
-                self.join_project_internal(
-                    project,
-                    user_id,
-                    committer_name,
-                    committer_email,
-                    connection,
-                    role,
-                    &tx,
-                )
-                .await
-            }
-        })
-        .await
-    }
-
-    async fn join_project_internal(
-        &self,
-        project: project::Model,
-        user_id: UserId,
-        committer_name: Option<String>,
-        committer_email: Option<String>,
-        connection: ConnectionId,
-        role: ChannelRole,
-        tx: &DatabaseTransaction,
-    ) -> Result<(Project, ReplicaId)> {
-        let mut collaborators = project
-            .find_related(project_collaborator::Entity)
-            .all(tx)
-            .await?;
-        let replica_ids = collaborators
-            .iter()
-            .map(|c| c.replica_id)
-            .collect::<HashSet<_>>();
-        let mut replica_id = ReplicaId(clock::ReplicaId::FIRST_COLLAB_ID.as_u16() as i32);
-        while replica_ids.contains(&replica_id) {
-            replica_id.0 += 1;
-        }
-        let new_collaborator = project_collaborator::ActiveModel {
-            project_id: ActiveValue::set(project.id),
-            connection_id: ActiveValue::set(connection.id as i32),
-            connection_server_id: ActiveValue::set(ServerId(connection.owner_id as i32)),
-            user_id: ActiveValue::set(user_id),
-            replica_id: ActiveValue::set(replica_id),
-            is_host: ActiveValue::set(false),
-            id: ActiveValue::NotSet,
-            committer_name: ActiveValue::set(committer_name),
-            committer_email: ActiveValue::set(committer_email),
-        }
-        .insert(tx)
-        .await?;
-        collaborators.push(new_collaborator);
-
-        let db_worktrees = project.find_related(worktree::Entity).all(tx).await?;
-        let mut worktrees = db_worktrees
-            .into_iter()
-            .map(|db_worktree| {
-                (
-                    db_worktree.id as u64,
-                    Worktree {
-                        id: db_worktree.id as u64,
-                        abs_path: db_worktree.abs_path,
-                        root_name: db_worktree.root_name,
-                        visible: db_worktree.visible,
-                        entries: Default::default(),
-                        diagnostic_summaries: Default::default(),
-                        settings_files: Default::default(),
-                        scan_id: db_worktree.scan_id as u64,
-                        completed_scan_id: db_worktree.completed_scan_id as u64,
-                        legacy_repository_entries: Default::default(),
-                    },
-                )
-            })
-            .collect::<BTreeMap<_, _>>();
-
-        // Populate worktree entries.
-        {
-            let mut db_entries = worktree_entry::Entity::find()
-                .filter(
-                    Condition::all()
-                        .add(worktree_entry::Column::ProjectId.eq(project.id))
-                        .add(worktree_entry::Column::IsDeleted.eq(false)),
-                )
-                .stream(tx)
-                .await?;
-            while let Some(db_entry) = db_entries.next().await {
-                let db_entry = db_entry?;
-                if let Some(worktree) = worktrees.get_mut(&(db_entry.worktree_id as u64)) {
-                    worktree.entries.push(proto::Entry {
-                        id: db_entry.id as u64,
-                        is_dir: db_entry.is_dir,
-                        path: db_entry.path,
-                        inode: db_entry.inode as u64,
-                        mtime: Some(proto::Timestamp {
-                            seconds: db_entry.mtime_seconds as u64,
-                            nanos: db_entry.mtime_nanos as u32,
-                        }),
-                        canonical_path: db_entry.canonical_path,
-                        is_ignored: db_entry.is_ignored,
-                        is_external: db_entry.is_external,
-                        is_hidden: db_entry.is_hidden,
-                        // This is only used in the summarization backlog, so if it's None,
-                        // that just means we won't be able to detect when to resummarize
-                        // based on total number of backlogged bytes - instead, we'd go
-                        // on number of files only. That shouldn't be a huge deal in practice.
-                        size: None,
-                        is_fifo: db_entry.is_fifo,
-                    });
-                }
-            }
-        }
-
-        // Populate repository entries.
-        let mut repositories = Vec::new();
-        {
-            let db_repository_entries = project_repository::Entity::find()
-                .filter(
-                    Condition::all()
-                        .add(project_repository::Column::ProjectId.eq(project.id))
-                        .add(project_repository::Column::IsDeleted.eq(false)),
-                )
-                .all(tx)
-                .await?;
-            for db_repository_entry in db_repository_entries {
-                let mut repository_statuses = project_repository_statuses::Entity::find()
-                    .filter(
-                        Condition::all()
-                            .add(project_repository_statuses::Column::ProjectId.eq(project.id))
-                            .add(
-                                project_repository_statuses::Column::RepositoryId
-                                    .eq(db_repository_entry.id),
-                            )
-                            .add(project_repository_statuses::Column::IsDeleted.eq(false)),
-                    )
-                    .stream(tx)
-                    .await?;
-                let mut updated_statuses = Vec::new();
-                while let Some(status_entry) = repository_statuses.next().await {
-                    let status_entry = status_entry?;
-                    updated_statuses.push(db_status_to_proto(status_entry)?);
-                }
-
-                let current_merge_conflicts = db_repository_entry
-                    .current_merge_conflicts
-                    .as_ref()
-                    .map(|conflicts| serde_json::from_str(conflicts))
-                    .transpose()?
-                    .unwrap_or_default();
-
-                let branch_summary = db_repository_entry
-                    .branch_summary
-                    .as_ref()
-                    .map(|branch_summary| serde_json::from_str(branch_summary))
-                    .transpose()?
-                    .unwrap_or_default();
-
-                let head_commit_details = db_repository_entry
-                    .head_commit_details
-                    .as_ref()
-                    .map(|head_commit_details| serde_json::from_str(head_commit_details))
-                    .transpose()?
-                    .unwrap_or_default();
-
-                let entry_ids = serde_json::from_str(&db_repository_entry.entry_ids)
-                    .context("failed to deserialize repository's entry ids")?;
-
-                if let Some(worktree_id) = db_repository_entry.legacy_worktree_id {
-                    if let Some(worktree) = worktrees.get_mut(&(worktree_id as u64)) {
-                        worktree.legacy_repository_entries.insert(
-                            db_repository_entry.id as u64,
-                            proto::RepositoryEntry {
-                                repository_id: db_repository_entry.id as u64,
-                                updated_statuses,
-                                removed_statuses: Vec::new(),
-                                current_merge_conflicts,
-                                branch_summary,
-                            },
-                        );
-                    }
-                } else {
-                    repositories.push(proto::UpdateRepository {
-                        project_id: db_repository_entry.project_id.0 as u64,
-                        id: db_repository_entry.id as u64,
-                        abs_path: db_repository_entry.abs_path,
-                        entry_ids,
-                        updated_statuses,
-                        removed_statuses: Vec::new(),
-                        current_merge_conflicts,
-                        branch_summary,
-                        head_commit_details,
-                        scan_id: db_repository_entry.scan_id as u64,
-                        is_last_update: true,
-                        merge_message: db_repository_entry.merge_message,
-                        stash_entries: Vec::new(),
-                        remote_upstream_url: db_repository_entry.remote_upstream_url.clone(),
-                        remote_origin_url: db_repository_entry.remote_origin_url.clone(),
-                    });
-                }
-            }
-        }
-
-        // Populate worktree diagnostic summaries.
-        {
-            let mut db_summaries = worktree_diagnostic_summary::Entity::find()
-                .filter(worktree_diagnostic_summary::Column::ProjectId.eq(project.id))
-                .stream(tx)
-                .await?;
-            while let Some(db_summary) = db_summaries.next().await {
-                let db_summary = db_summary?;
-                if let Some(worktree) = worktrees.get_mut(&(db_summary.worktree_id as u64)) {
-                    worktree
-                        .diagnostic_summaries
-                        .push(proto::DiagnosticSummary {
-                            path: db_summary.path,
-                            language_server_id: db_summary.language_server_id as u64,
-                            error_count: db_summary.error_count as u32,
-                            warning_count: db_summary.warning_count as u32,
-                        });
-                }
-            }
-        }
-
-        // Populate worktree settings files
-        {
-            let mut db_settings_files = worktree_settings_file::Entity::find()
-                .filter(worktree_settings_file::Column::ProjectId.eq(project.id))
-                .stream(tx)
-                .await?;
-            while let Some(db_settings_file) = db_settings_files.next().await {
-                let db_settings_file = db_settings_file?;
-                if let Some(worktree) = worktrees.get_mut(&(db_settings_file.worktree_id as u64)) {
-                    worktree.settings_files.push(WorktreeSettingsFile {
-                        path: db_settings_file.path,
-                        content: db_settings_file.content,
-                        kind: db_settings_file.kind,
-                    });
-                }
-            }
-        }
-
-        // Populate language servers.
-        let language_servers = project
-            .find_related(language_server::Entity)
-            .all(tx)
-            .await?;
-
-        let path_style = if project.windows_paths {
-            PathStyle::Windows
-        } else {
-            PathStyle::Posix
-        };
-
-        let project = Project {
-            id: project.id,
-            role,
-            collaborators: collaborators
-                .into_iter()
-                .map(|collaborator| ProjectCollaborator {
-                    connection_id: collaborator.connection(),
-                    user_id: collaborator.user_id,
-                    replica_id: collaborator.replica_id,
-                    is_host: collaborator.is_host,
-                    committer_name: collaborator.committer_name,
-                    committer_email: collaborator.committer_email,
-                })
-                .collect(),
-            worktrees,
-            repositories,
-            language_servers: language_servers
-                .into_iter()
-                .map(|language_server| LanguageServer {
-                    server: proto::LanguageServer {
-                        id: language_server.id as u64,
-                        name: language_server.name,
-                        worktree_id: language_server.worktree_id.map(|id| id as u64),
-                    },
-                    capabilities: language_server.capabilities,
-                })
-                .collect(),
-            path_style,
-        };
-        Ok((project, replica_id as ReplicaId))
-    }
-
-    /// Removes the given connection from the specified project.
-    pub async fn leave_project(
-        &self,
-        project_id: ProjectId,
-        connection: ConnectionId,
-    ) -> Result<TransactionGuard<(Option<proto::Room>, LeftProject)>> {
-        self.project_transaction(project_id, |tx| async move {
-            let result = project_collaborator::Entity::delete_many()
-                .filter(
-                    Condition::all()
-                        .add(project_collaborator::Column::ProjectId.eq(project_id))
-                        .add(project_collaborator::Column::ConnectionId.eq(connection.id as i32))
-                        .add(
-                            project_collaborator::Column::ConnectionServerId
-                                .eq(connection.owner_id as i32),
-                        ),
-                )
-                .exec(&*tx)
-                .await?;
-            if result.rows_affected == 0 {
-                Err(anyhow!("not a collaborator on this project"))?;
-            }
-
-            let project = project::Entity::find_by_id(project_id)
-                .one(&*tx)
-                .await?
-                .context("no such project")?;
-            let collaborators = project
-                .find_related(project_collaborator::Entity)
-                .all(&*tx)
-                .await?;
-            let connection_ids: Vec<ConnectionId> = collaborators
-                .into_iter()
-                .map(|collaborator| collaborator.connection())
-                .collect();
-
-            follower::Entity::delete_many()
-                .filter(
-                    Condition::any()
-                        .add(
-                            Condition::all()
-                                .add(follower::Column::ProjectId.eq(Some(project_id)))
-                                .add(
-                                    follower::Column::LeaderConnectionServerId
-                                        .eq(connection.owner_id),
-                                )
-                                .add(follower::Column::LeaderConnectionId.eq(connection.id)),
-                        )
-                        .add(
-                            Condition::all()
-                                .add(follower::Column::ProjectId.eq(Some(project_id)))
-                                .add(
-                                    follower::Column::FollowerConnectionServerId
-                                        .eq(connection.owner_id),
-                                )
-                                .add(follower::Column::FollowerConnectionId.eq(connection.id)),
-                        ),
-                )
-                .exec(&*tx)
-                .await?;
-
-            let room = if let Some(room_id) = project.room_id {
-                Some(self.get_room(room_id, &tx).await?)
-            } else {
-                None
-            };
-
-            let left_project = LeftProject {
-                id: project_id,
-                should_unshare: connection == project.host_connection()?,
-                connection_ids,
-            };
-            Ok((room, left_project))
-        })
-        .await
-    }
-
-    pub async fn check_user_is_project_host(
-        &self,
-        project_id: ProjectId,
-        connection_id: ConnectionId,
-    ) -> Result<()> {
-        self.project_transaction(project_id, |tx| async move {
-            project::Entity::find()
-                .filter(
-                    Condition::all()
-                        .add(project::Column::Id.eq(project_id))
-                        .add(project::Column::HostConnectionId.eq(Some(connection_id.id as i32)))
-                        .add(
-                            project::Column::HostConnectionServerId
-                                .eq(Some(connection_id.owner_id as i32)),
-                        ),
-                )
-                .one(&*tx)
-                .await?
-                .context("failed to read project host")?;
-
-            Ok(())
-        })
-        .await
-        .map(|guard| guard.into_inner())
-    }
-
-    /// Returns the current project if the given user is authorized to access it with the specified capability.
-    pub async fn access_project(
-        &self,
-        project_id: ProjectId,
-        connection_id: ConnectionId,
-        capability: Capability,
-        tx: &DatabaseTransaction,
-    ) -> Result<(project::Model, ChannelRole)> {
-        let project = project::Entity::find_by_id(project_id)
-            .one(tx)
-            .await?
-            .context("no such project")?;
-
-        let role_from_room = if let Some(room_id) = project.room_id {
-            room_participant::Entity::find()
-                .filter(room_participant::Column::RoomId.eq(room_id))
-                .filter(room_participant::Column::AnsweringConnectionId.eq(connection_id.id))
-                .one(tx)
-                .await?
-                .and_then(|participant| participant.role)
-        } else {
-            None
-        };
-
-        let role = role_from_room.unwrap_or(ChannelRole::Banned);
-
-        match capability {
-            Capability::ReadWrite => {
-                if !role.can_edit_projects() {
-                    return Err(anyhow!("not authorized to edit projects"))?;
-                }
-            }
-            Capability::ReadOnly => {
-                if !role.can_read_projects() {
-                    return Err(anyhow!("not authorized to read projects"))?;
-                }
-            }
-        }
-
-        Ok((project, role))
-    }
-
-    /// Returns the host connection for a read-only request to join a shared project.
-    pub async fn host_for_read_only_project_request(
-        &self,
-        project_id: ProjectId,
-        connection_id: ConnectionId,
-    ) -> Result<ConnectionId> {
-        self.project_transaction(project_id, |tx| async move {
-            let (project, _) = self
-                .access_project(project_id, connection_id, Capability::ReadOnly, &tx)
-                .await?;
-            project.host_connection()
-        })
-        .await
-        .map(|guard| guard.into_inner())
-    }
-
-    /// Returns the host connection for a request to join a shared project.
-    pub async fn host_for_mutating_project_request(
-        &self,
-        project_id: ProjectId,
-        connection_id: ConnectionId,
-    ) -> Result<ConnectionId> {
-        self.project_transaction(project_id, |tx| async move {
-            let (project, _) = self
-                .access_project(project_id, connection_id, Capability::ReadWrite, &tx)
-                .await?;
-            project.host_connection()
-        })
-        .await
-        .map(|guard| guard.into_inner())
-    }
-
-    pub async fn connections_for_buffer_update(
-        &self,
-        project_id: ProjectId,
-        connection_id: ConnectionId,
-        capability: Capability,
-    ) -> Result<TransactionGuard<(ConnectionId, Vec<ConnectionId>)>> {
-        self.project_transaction(project_id, |tx| async move {
-            // Authorize
-            let (project, _) = self
-                .access_project(project_id, connection_id, capability, &tx)
-                .await?;
-
-            let host_connection_id = project.host_connection()?;
-
-            let collaborators = project_collaborator::Entity::find()
-                .filter(project_collaborator::Column::ProjectId.eq(project_id))
-                .all(&*tx)
-                .await?;
-
-            let guest_connection_ids = collaborators
-                .into_iter()
-                .filter_map(|collaborator| {
-                    if collaborator.is_host {
-                        None
-                    } else {
-                        Some(collaborator.connection())
-                    }
-                })
-                .collect();
-
-            Ok((host_connection_id, guest_connection_ids))
-        })
-        .await
-    }
-
-    /// Returns the connection IDs in the given project.
-    ///
-    /// The provided `connection_id` must also be a collaborator in the project,
-    /// otherwise an error will be returned.
-    pub async fn project_connection_ids(
-        &self,
-        project_id: ProjectId,
-        connection_id: ConnectionId,
-        exclude_dev_server: bool,
-    ) -> Result<TransactionGuard<HashSet<ConnectionId>>> {
-        self.project_transaction(project_id, |tx| async move {
-            self.internal_project_connection_ids(project_id, connection_id, exclude_dev_server, &tx)
-                .await
-        })
-        .await
-    }
-
-    async fn internal_project_connection_ids(
-        &self,
-        project_id: ProjectId,
-        connection_id: ConnectionId,
-        exclude_dev_server: bool,
-        tx: &DatabaseTransaction,
-    ) -> Result<HashSet<ConnectionId>> {
-        let project = project::Entity::find_by_id(project_id)
-            .one(tx)
-            .await?
-            .context("no such project")?;
-
-        let mut collaborators = project_collaborator::Entity::find()
-            .filter(project_collaborator::Column::ProjectId.eq(project_id))
-            .stream(tx)
-            .await?;
-
-        let mut connection_ids = HashSet::default();
-        if let Some(host_connection) = project.host_connection().log_err()
-            && !exclude_dev_server
-        {
-            connection_ids.insert(host_connection);
-        }
-
-        while let Some(collaborator) = collaborators.next().await {
-            let collaborator = collaborator?;
-            connection_ids.insert(collaborator.connection());
-        }
-
-        if connection_ids.contains(&connection_id)
-            || Some(connection_id) == project.host_connection().ok()
-        {
-            Ok(connection_ids)
-        } else {
-            Err(anyhow!(
-                "can only send project updates to a project you're in"
-            ))?
-        }
-    }
-
-    async fn project_guest_connection_ids(
-        &self,
-        project_id: ProjectId,
-        tx: &DatabaseTransaction,
-    ) -> Result<Vec<ConnectionId>> {
-        let mut collaborators = project_collaborator::Entity::find()
-            .filter(
-                project_collaborator::Column::ProjectId
-                    .eq(project_id)
-                    .and(project_collaborator::Column::IsHost.eq(false)),
-            )
-            .stream(tx)
-            .await?;
-
-        let mut guest_connection_ids = Vec::new();
-        while let Some(collaborator) = collaborators.next().await {
-            let collaborator = collaborator?;
-            guest_connection_ids.push(collaborator.connection());
-        }
-        Ok(guest_connection_ids)
-    }
-
-    /// Returns the [`RoomId`] for the given project.
-    pub async fn room_id_for_project(&self, project_id: ProjectId) -> Result<Option<RoomId>> {
-        self.transaction(|tx| async move {
-            Ok(project::Entity::find_by_id(project_id)
-                .one(&*tx)
-                .await?
-                .and_then(|project| project.room_id))
-        })
-        .await
-    }
-
-    pub async fn check_room_participants(
-        &self,
-        room_id: RoomId,
-        leader_id: ConnectionId,
-        follower_id: ConnectionId,
-    ) -> Result<()> {
-        self.transaction(|tx| async move {
-            use room_participant::Column;
-
-            let count = room_participant::Entity::find()
-                .filter(
-                    Condition::all().add(Column::RoomId.eq(room_id)).add(
-                        Condition::any()
-                            .add(Column::AnsweringConnectionId.eq(leader_id.id as i32).and(
-                                Column::AnsweringConnectionServerId.eq(leader_id.owner_id as i32),
-                            ))
-                            .add(Column::AnsweringConnectionId.eq(follower_id.id as i32).and(
-                                Column::AnsweringConnectionServerId.eq(follower_id.owner_id as i32),
-                            )),
-                    ),
-                )
-                .count(&*tx)
-                .await?;
-
-            if count < 2 {
-                Err(anyhow!("not room participants"))?;
-            }
-
-            Ok(())
-        })
-        .await
-    }
-
-    /// Adds the given follower connection as a follower of the given leader connection.
-    pub async fn follow(
-        &self,
-        room_id: RoomId,
-        project_id: ProjectId,
-        leader_connection: ConnectionId,
-        follower_connection: ConnectionId,
-    ) -> Result<TransactionGuard<proto::Room>> {
-        self.room_transaction(room_id, |tx| async move {
-            follower::ActiveModel {
-                room_id: ActiveValue::set(room_id),
-                project_id: ActiveValue::set(project_id),
-                leader_connection_server_id: ActiveValue::set(ServerId(
-                    leader_connection.owner_id as i32,
-                )),
-                leader_connection_id: ActiveValue::set(leader_connection.id as i32),
-                follower_connection_server_id: ActiveValue::set(ServerId(
-                    follower_connection.owner_id as i32,
-                )),
-                follower_connection_id: ActiveValue::set(follower_connection.id as i32),
-                ..Default::default()
-            }
-            .insert(&*tx)
-            .await?;
-
-            let room = self.get_room(room_id, &tx).await?;
-            Ok(room)
-        })
-        .await
-    }
-
-    /// Removes the given follower connection as a follower of the given leader connection.
-    pub async fn unfollow(
-        &self,
-        room_id: RoomId,
-        project_id: ProjectId,
-        leader_connection: ConnectionId,
-        follower_connection: ConnectionId,
-    ) -> Result<TransactionGuard<proto::Room>> {
-        self.room_transaction(room_id, |tx| async move {
-            follower::Entity::delete_many()
-                .filter(
-                    Condition::all()
-                        .add(follower::Column::RoomId.eq(room_id))
-                        .add(follower::Column::ProjectId.eq(project_id))
-                        .add(
-                            follower::Column::LeaderConnectionServerId
-                                .eq(leader_connection.owner_id),
-                        )
-                        .add(follower::Column::LeaderConnectionId.eq(leader_connection.id))
-                        .add(
-                            follower::Column::FollowerConnectionServerId
-                                .eq(follower_connection.owner_id),
-                        )
-                        .add(follower::Column::FollowerConnectionId.eq(follower_connection.id)),
-                )
-                .exec(&*tx)
-                .await?;
-
-            let room = self.get_room(room_id, &tx).await?;
-            Ok(room)
-        })
-        .await
-    }
-}
diff --git a/crates/collab/src/db/queries/rooms.rs b/crates/collab/src/db/queries/rooms.rs
deleted file mode 100644
index eafb5cac44..0000000000
--- a/crates/collab/src/db/queries/rooms.rs
+++ /dev/null
@@ -1,1422 +0,0 @@
-use anyhow::Context as _;
-
-use super::*;
-
-impl Database {
-    /// Clears all room participants in rooms attached to a stale server.
-    pub async fn clear_stale_room_participants(
-        &self,
-        room_id: RoomId,
-        new_server_id: ServerId,
-    ) -> Result<TransactionGuard<RefreshedRoom>> {
-        self.room_transaction(room_id, |tx| async move {
-            let stale_participant_filter = Condition::all()
-                .add(room_participant::Column::RoomId.eq(room_id))
-                .add(room_participant::Column::AnsweringConnectionId.is_not_null())
-                .add(room_participant::Column::AnsweringConnectionServerId.ne(new_server_id));
-
-            let stale_participant_user_ids = room_participant::Entity::find()
-                .filter(stale_participant_filter.clone())
-                .all(&*tx)
-                .await?
-                .into_iter()
-                .map(|participant| participant.user_id)
-                .collect::<Vec<_>>();
-
-            // Delete participants who failed to reconnect and cancel their calls.
-            let mut canceled_calls_to_user_ids = Vec::new();
-            room_participant::Entity::delete_many()
-                .filter(stale_participant_filter)
-                .exec(&*tx)
-                .await?;
-            let called_participants = room_participant::Entity::find()
-                .filter(
-                    Condition::all()
-                        .add(
-                            room_participant::Column::CallingUserId
-                                .is_in(stale_participant_user_ids.iter().copied()),
-                        )
-                        .add(room_participant::Column::AnsweringConnectionId.is_null()),
-                )
-                .all(&*tx)
-                .await?;
-            room_participant::Entity::delete_many()
-                .filter(
-                    room_participant::Column::Id
-                        .is_in(called_participants.iter().map(|participant| participant.id)),
-                )
-                .exec(&*tx)
-                .await?;
-            canceled_calls_to_user_ids.extend(
-                called_participants
-                    .into_iter()
-                    .map(|participant| participant.user_id),
-            );
-
-            let (channel, room) = self.get_channel_room(room_id, &tx).await?;
-            if channel.is_none() {
-                // Delete the room if it becomes empty.
-                if room.participants.is_empty() {
-                    project::Entity::delete_many()
-                        .filter(project::Column::RoomId.eq(room_id))
-                        .exec(&*tx)
-                        .await?;
-                    room::Entity::delete_by_id(room_id).exec(&*tx).await?;
-                }
-            };
-
-            Ok(RefreshedRoom {
-                room,
-                channel,
-                stale_participant_user_ids,
-                canceled_calls_to_user_ids,
-            })
-        })
-        .await
-    }
-
-    /// Returns the incoming calls for user with the given ID.
-    pub async fn incoming_call_for_user(
-        &self,
-        user_id: UserId,
-    ) -> Result<Option<proto::IncomingCall>> {
-        self.transaction(|tx| async move {
-            let pending_participant = room_participant::Entity::find()
-                .filter(
-                    room_participant::Column::UserId
-                        .eq(user_id)
-                        .and(room_participant::Column::AnsweringConnectionId.is_null()),
-                )
-                .one(&*tx)
-                .await?;
-
-            if let Some(pending_participant) = pending_participant {
-                let room = self.get_room(pending_participant.room_id, &tx).await?;
-                Ok(Self::build_incoming_call(&room, user_id))
-            } else {
-                Ok(None)
-            }
-        })
-        .await
-    }
-
-    /// Creates a new room.
-    pub async fn create_room(
-        &self,
-        user_id: UserId,
-        connection: ConnectionId,
-        livekit_room: &str,
-    ) -> Result<proto::Room> {
-        self.transaction(|tx| async move {
-            let room = room::ActiveModel {
-                live_kit_room: ActiveValue::set(livekit_room.into()),
-                ..Default::default()
-            }
-            .insert(&*tx)
-            .await?;
-            room_participant::ActiveModel {
-                room_id: ActiveValue::set(room.id),
-                user_id: ActiveValue::set(user_id),
-                answering_connection_id: ActiveValue::set(Some(connection.id as i32)),
-                answering_connection_server_id: ActiveValue::set(Some(ServerId(
-                    connection.owner_id as i32,
-                ))),
-                answering_connection_lost: ActiveValue::set(false),
-                calling_user_id: ActiveValue::set(user_id),
-                calling_connection_id: ActiveValue::set(connection.id as i32),
-                calling_connection_server_id: ActiveValue::set(Some(ServerId(
-                    connection.owner_id as i32,
-                ))),
-                participant_index: ActiveValue::set(Some(0)),
-                role: ActiveValue::set(Some(ChannelRole::Admin)),
-
-                id: ActiveValue::NotSet,
-                location_kind: ActiveValue::NotSet,
-                location_project_id: ActiveValue::NotSet,
-                initial_project_id: ActiveValue::NotSet,
-            }
-            .insert(&*tx)
-            .await?;
-
-            let room = self.get_room(room.id, &tx).await?;
-            Ok(room)
-        })
-        .await
-    }
-
-    pub async fn call(
-        &self,
-        room_id: RoomId,
-        calling_user_id: UserId,
-        calling_connection: ConnectionId,
-        called_user_id: UserId,
-        initial_project_id: Option<ProjectId>,
-    ) -> Result<TransactionGuard<(proto::Room, proto::IncomingCall)>> {
-        self.room_transaction(room_id, |tx| async move {
-            let caller = room_participant::Entity::find()
-                .filter(
-                    room_participant::Column::UserId
-                        .eq(calling_user_id)
-                        .and(room_participant::Column::RoomId.eq(room_id)),
-                )
-                .one(&*tx)
-                .await?
-                .context("user is not in the room")?;
-
-            let called_user_role = match caller.role.unwrap_or(ChannelRole::Member) {
-                ChannelRole::Admin | ChannelRole::Member => ChannelRole::Member,
-                ChannelRole::Guest | ChannelRole::Talker => ChannelRole::Guest,
-                ChannelRole::Banned => return Err(anyhow!("banned users cannot invite").into()),
-            };
-
-            room_participant::ActiveModel {
-                room_id: ActiveValue::set(room_id),
-                user_id: ActiveValue::set(called_user_id),
-                answering_connection_lost: ActiveValue::set(false),
-                participant_index: ActiveValue::NotSet,
-                calling_user_id: ActiveValue::set(calling_user_id),
-                calling_connection_id: ActiveValue::set(calling_connection.id as i32),
-                calling_connection_server_id: ActiveValue::set(Some(ServerId(
-                    calling_connection.owner_id as i32,
-                ))),
-                initial_project_id: ActiveValue::set(initial_project_id),
-                role: ActiveValue::set(Some(called_user_role)),
-
-                id: ActiveValue::NotSet,
-                answering_connection_id: ActiveValue::NotSet,
-                answering_connection_server_id: ActiveValue::NotSet,
-                location_kind: ActiveValue::NotSet,
-                location_project_id: ActiveValue::NotSet,
-            }
-            .insert(&*tx)
-            .await?;
-
-            let room = self.get_room(room_id, &tx).await?;
-            let incoming_call = Self::build_incoming_call(&room, called_user_id)
-                .context("failed to build incoming call")?;
-            Ok((room, incoming_call))
-        })
-        .await
-    }
-
-    pub async fn call_failed(
-        &self,
-        room_id: RoomId,
-        called_user_id: UserId,
-    ) -> Result<TransactionGuard<proto::Room>> {
-        self.room_transaction(room_id, |tx| async move {
-            room_participant::Entity::delete_many()
-                .filter(
-                    room_participant::Column::RoomId
-                        .eq(room_id)
-                        .and(room_participant::Column::UserId.eq(called_user_id)),
-                )
-                .exec(&*tx)
-                .await?;
-            let room = self.get_room(room_id, &tx).await?;
-            Ok(room)
-        })
-        .await
-    }
-
-    pub async fn decline_call(
-        &self,
-        expected_room_id: Option<RoomId>,
-        user_id: UserId,
-    ) -> Result<Option<TransactionGuard<proto::Room>>> {
-        self.optional_room_transaction(|tx| async move {
-            let mut filter = Condition::all()
-                .add(room_participant::Column::UserId.eq(user_id))
-                .add(room_participant::Column::AnsweringConnectionId.is_null());
-            if let Some(room_id) = expected_room_id {
-                filter = filter.add(room_participant::Column::RoomId.eq(room_id));
-            }
-            let participant = room_participant::Entity::find()
-                .filter(filter)
-                .one(&*tx)
-                .await?;
-
-            let participant = if let Some(participant) = participant {
-                participant
-            } else if expected_room_id.is_some() {
-                return Err(anyhow!("could not find call to decline"))?;
-            } else {
-                return Ok(None);
-            };
-
-            let room_id = participant.room_id;
-            room_participant::Entity::delete(participant.into_active_model())
-                .exec(&*tx)
-                .await?;
-
-            let room = self.get_room(room_id, &tx).await?;
-            Ok(Some((room_id, room)))
-        })
-        .await
-    }
-
-    pub async fn cancel_call(
-        &self,
-        room_id: RoomId,
-        calling_connection: ConnectionId,
-        called_user_id: UserId,
-    ) -> Result<TransactionGuard<proto::Room>> {
-        self.room_transaction(room_id, |tx| async move {
-            let participant = room_participant::Entity::find()
-                .filter(
-                    Condition::all()
-                        .add(room_participant::Column::UserId.eq(called_user_id))
-                        .add(room_participant::Column::RoomId.eq(room_id))
-                        .add(
-                            room_participant::Column::CallingConnectionId
-                                .eq(calling_connection.id as i32),
-                        )
-                        .add(
-                            room_participant::Column::CallingConnectionServerId
-                                .eq(calling_connection.owner_id as i32),
-                        )
-                        .add(room_participant::Column::AnsweringConnectionId.is_null()),
-                )
-                .one(&*tx)
-                .await?
-                .context("no call to cancel")?;
-
-            room_participant::Entity::delete(participant.into_active_model())
-                .exec(&*tx)
-                .await?;
-
-            let room = self.get_room(room_id, &tx).await?;
-            Ok(room)
-        })
-        .await
-    }
-
-    pub async fn join_room(
-        &self,
-        room_id: RoomId,
-        user_id: UserId,
-        connection: ConnectionId,
-    ) -> Result<TransactionGuard<JoinRoom>> {
-        self.room_transaction(room_id, |tx| async move {
-            #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
-            enum QueryChannelId {
-                ChannelId,
-            }
-
-            let channel_id: Option<ChannelId> = room::Entity::find()
-                .select_only()
-                .column(room::Column::ChannelId)
-                .filter(room::Column::Id.eq(room_id))
-                .into_values::<_, QueryChannelId>()
-                .one(&*tx)
-                .await?
-                .context("no such room")?;
-
-            if channel_id.is_some() {
-                Err(anyhow!("tried to join channel call directly"))?
-            }
-
-            let participant_index = self
-                .get_next_participant_index_internal(room_id, &tx)
-                .await?;
-
-            let result = room_participant::Entity::update_many()
-                .filter(
-                    Condition::all()
-                        .add(room_participant::Column::RoomId.eq(room_id))
-                        .add(room_participant::Column::UserId.eq(user_id))
-                        .add(room_participant::Column::AnsweringConnectionId.is_null()),
-                )
-                .set(room_participant::ActiveModel {
-                    participant_index: ActiveValue::Set(Some(participant_index)),
-                    answering_connection_id: ActiveValue::set(Some(connection.id as i32)),
-                    answering_connection_server_id: ActiveValue::set(Some(ServerId(
-                        connection.owner_id as i32,
-                    ))),
-                    answering_connection_lost: ActiveValue::set(false),
-                    ..Default::default()
-                })
-                .exec(&*tx)
-                .await?;
-            if result.rows_affected == 0 {
-                Err(anyhow!("room does not exist or was already joined"))?;
-            }
-
-            let room = self.get_room(room_id, &tx).await?;
-            Ok(JoinRoom {
-                room,
-                channel: None,
-            })
-        })
-        .await
-    }
-
-    pub async fn stale_room_connection(&self, user_id: UserId) -> Result<Option<ConnectionId>> {
-        self.transaction(|tx| async move {
-            let participant = room_participant::Entity::find()
-                .filter(room_participant::Column::UserId.eq(user_id))
-                .one(&*tx)
-                .await?;
-            Ok(participant.and_then(|p| p.answering_connection()))
-        })
-        .await
-    }
-
-    async fn get_next_participant_index_internal(
-        &self,
-        room_id: RoomId,
-        tx: &DatabaseTransaction,
-    ) -> Result<i32> {
-        #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
-        enum QueryParticipantIndices {
-            ParticipantIndex,
-        }
-        let existing_participant_indices: Vec<i32> = room_participant::Entity::find()
-            .filter(
-                room_participant::Column::RoomId
-                    .eq(room_id)
-                    .and(room_participant::Column::ParticipantIndex.is_not_null()),
-            )
-            .select_only()
-            .column(room_participant::Column::ParticipantIndex)
-            .into_values::<_, QueryParticipantIndices>()
-            .all(tx)
-            .await?;
-
-        let mut participant_index = 0;
-        while existing_participant_indices.contains(&participant_index) {
-            participant_index += 1;
-        }
-
-        Ok(participant_index)
-    }
-
-    /// Returns the channel ID for the given room, if it has one.
-    pub async fn channel_id_for_room(&self, room_id: RoomId) -> Result<Option<ChannelId>> {
-        self.transaction(|tx| async move {
-            let room: Option<room::Model> = room::Entity::find()
-                .filter(room::Column::Id.eq(room_id))
-                .one(&*tx)
-                .await?;
-
-            Ok(room.and_then(|room| room.channel_id))
-        })
-        .await
-    }
-
-    pub(crate) async fn join_channel_room_internal(
-        &self,
-        room_id: RoomId,
-        user_id: UserId,
-        connection: ConnectionId,
-        role: ChannelRole,
-        tx: &DatabaseTransaction,
-    ) -> Result<JoinRoom> {
-        let participant_index = self
-            .get_next_participant_index_internal(room_id, tx)
-            .await?;
-
-        // If someone has been invited into the room, accept the invite instead of inserting
-        let result = room_participant::Entity::update_many()
-            .filter(
-                Condition::all()
-                    .add(room_participant::Column::RoomId.eq(room_id))
-                    .add(room_participant::Column::UserId.eq(user_id))
-                    .add(room_participant::Column::AnsweringConnectionId.is_null()),
-            )
-            .set(room_participant::ActiveModel {
-                participant_index: ActiveValue::Set(Some(participant_index)),
-                answering_connection_id: ActiveValue::set(Some(connection.id as i32)),
-                answering_connection_server_id: ActiveValue::set(Some(ServerId(
-                    connection.owner_id as i32,
-                ))),
-                answering_connection_lost: ActiveValue::set(false),
-                ..Default::default()
-            })
-            .exec(tx)
-            .await?;
-
-        if result.rows_affected == 0 {
-            room_participant::Entity::insert(room_participant::ActiveModel {
-                room_id: ActiveValue::set(room_id),
-                user_id: ActiveValue::set(user_id),
-                answering_connection_id: ActiveValue::set(Some(connection.id as i32)),
-                answering_connection_server_id: ActiveValue::set(Some(ServerId(
-                    connection.owner_id as i32,
-                ))),
-                answering_connection_lost: ActiveValue::set(false),
-                calling_user_id: ActiveValue::set(user_id),
-                calling_connection_id: ActiveValue::set(connection.id as i32),
-                calling_connection_server_id: ActiveValue::set(Some(ServerId(
-                    connection.owner_id as i32,
-                ))),
-                participant_index: ActiveValue::Set(Some(participant_index)),
-                role: ActiveValue::set(Some(role)),
-                id: ActiveValue::NotSet,
-                location_kind: ActiveValue::NotSet,
-                location_project_id: ActiveValue::NotSet,
-                initial_project_id: ActiveValue::NotSet,
-            })
-            .exec(tx)
-            .await?;
-        }
-
-        let (channel, room) = self.get_channel_room(room_id, tx).await?;
-        let channel = channel.context("no channel for room")?;
-        Ok(JoinRoom {
-            room,
-            channel: Some(channel),
-        })
-    }
-
-    pub async fn rejoin_room(
-        &self,
-        rejoin_room: proto::RejoinRoom,
-        user_id: UserId,
-        connection: ConnectionId,
-    ) -> Result<TransactionGuard<RejoinedRoom>> {
-        let room_id = RoomId::from_proto(rejoin_room.id);
-        self.room_transaction(room_id, |tx| async {
-            let tx = tx;
-            let participant_update = room_participant::Entity::update_many()
-                .filter(
-                    Condition::all()
-                        .add(room_participant::Column::RoomId.eq(room_id))
-                        .add(room_participant::Column::UserId.eq(user_id))
-                        .add(room_participant::Column::AnsweringConnectionId.is_not_null()),
-                )
-                .set(room_participant::ActiveModel {
-                    answering_connection_id: ActiveValue::set(Some(connection.id as i32)),
-                    answering_connection_server_id: ActiveValue::set(Some(ServerId(
-                        connection.owner_id as i32,
-                    ))),
-                    answering_connection_lost: ActiveValue::set(false),
-                    ..Default::default()
-                })
-                .exec(&*tx)
-                .await?;
-            if participant_update.rows_affected == 0 {
-                return Err(anyhow!("room does not exist or was already joined"))?;
-            }
-
-            let mut reshared_projects = Vec::new();
-            for reshared_project in &rejoin_room.reshared_projects {
-                let project_id = ProjectId::from_proto(reshared_project.project_id);
-                let project = project::Entity::find_by_id(project_id)
-                    .one(&*tx)
-                    .await?
-                    .context("project does not exist")?;
-                if project.host_user_id != Some(user_id) {
-                    return Err(anyhow!("no such project"))?;
-                }
-
-                let mut collaborators = project
-                    .find_related(project_collaborator::Entity)
-                    .all(&*tx)
-                    .await?;
-                let host_ix = collaborators
-                    .iter()
-                    .position(|collaborator| {
-                        collaborator.user_id == user_id && collaborator.is_host
-                    })
-                    .context("host not found among collaborators")?;
-                let host = collaborators.swap_remove(host_ix);
-                let old_connection_id = host.connection();
-
-                project::Entity::update(project::ActiveModel {
-                    host_connection_id: ActiveValue::set(Some(connection.id as i32)),
-                    host_connection_server_id: ActiveValue::set(Some(ServerId(
-                        connection.owner_id as i32,
-                    ))),
-                    ..project.into_active_model()
-                })
-                .exec(&*tx)
-                .await?;
-                project_collaborator::Entity::update(project_collaborator::ActiveModel {
-                    connection_id: ActiveValue::set(connection.id as i32),
-                    connection_server_id: ActiveValue::set(ServerId(connection.owner_id as i32)),
-                    ..host.into_active_model()
-                })
-                .exec(&*tx)
-                .await?;
-
-                self.update_project_worktrees(project_id, &reshared_project.worktrees, &tx)
-                    .await?;
-
-                reshared_projects.push(ResharedProject {
-                    id: project_id,
-                    old_connection_id,
-                    collaborators: collaborators
-                        .iter()
-                        .map(|collaborator| ProjectCollaborator {
-                            connection_id: collaborator.connection(),
-                            user_id: collaborator.user_id,
-                            replica_id: collaborator.replica_id,
-                            is_host: collaborator.is_host,
-                            committer_name: collaborator.committer_name.clone(),
-                            committer_email: collaborator.committer_email.clone(),
-                        })
-                        .collect(),
-                    worktrees: reshared_project.worktrees.clone(),
-                });
-            }
-
-            project::Entity::delete_many()
-                .filter(
-                    Condition::all()
-                        .add(project::Column::RoomId.eq(room_id))
-                        .add(project::Column::HostUserId.eq(user_id))
-                        .add(
-                            project::Column::Id
-                                .is_not_in(reshared_projects.iter().map(|project| project.id)),
-                        ),
-                )
-                .exec(&*tx)
-                .await?;
-
-            let mut rejoined_projects = Vec::new();
-            for rejoined_project in &rejoin_room.rejoined_projects {
-                if let Some(rejoined_project) = self
-                    .rejoin_project_internal(&tx, rejoined_project, user_id, connection)
-                    .await?
-                {
-                    rejoined_projects.push(rejoined_project);
-                }
-            }
-
-            let (channel, room) = self.get_channel_room(room_id, &tx).await?;
-
-            Ok(RejoinedRoom {
-                room,
-                channel,
-                rejoined_projects,
-                reshared_projects,
-            })
-        })
-        .await
-    }
-
-    pub async fn rejoin_project_internal(
-        &self,
-        tx: &DatabaseTransaction,
-        rejoined_project: &proto::RejoinProject,
-        user_id: UserId,
-        connection: ConnectionId,
-    ) -> Result<Option<RejoinedProject>> {
-        let project_id = ProjectId::from_proto(rejoined_project.id);
-        let Some(project) = project::Entity::find_by_id(project_id).one(tx).await? else {
-            return Ok(None);
-        };
-
-        let mut worktrees = Vec::new();
-        let db_worktrees = project.find_related(worktree::Entity).all(tx).await?;
-        let db_repos = project
-            .find_related(project_repository::Entity)
-            .all(tx)
-            .await?;
-
-        for db_worktree in db_worktrees {
-            let mut worktree = RejoinedWorktree {
-                id: db_worktree.id as u64,
-                abs_path: db_worktree.abs_path,
-                root_name: db_worktree.root_name,
-                visible: db_worktree.visible,
-                updated_entries: Default::default(),
-                removed_entries: Default::default(),
-                updated_repositories: Default::default(),
-                removed_repositories: Default::default(),
-                diagnostic_summaries: Default::default(),
-                settings_files: Default::default(),
-                scan_id: db_worktree.scan_id as u64,
-                completed_scan_id: db_worktree.completed_scan_id as u64,
-            };
-
-            let rejoined_worktree = rejoined_project
-                .worktrees
-                .iter()
-                .find(|worktree| worktree.id == db_worktree.id as u64);
-
-            // File entries
-            {
-                let entry_filter = if let Some(rejoined_worktree) = rejoined_worktree {
-                    worktree_entry::Column::ScanId.gt(rejoined_worktree.scan_id)
-                } else {
-                    worktree_entry::Column::IsDeleted.eq(false)
-                };
-
-                let mut db_entries = worktree_entry::Entity::find()
-                    .filter(
-                        Condition::all()
-                            .add(worktree_entry::Column::ProjectId.eq(project.id))
-                            .add(worktree_entry::Column::WorktreeId.eq(worktree.id))
-                            .add(entry_filter),
-                    )
-                    .stream(tx)
-                    .await?;
-
-                while let Some(db_entry) = db_entries.next().await {
-                    let db_entry = db_entry?;
-                    if db_entry.is_deleted {
-                        worktree.removed_entries.push(db_entry.id as u64);
-                    } else {
-                        worktree.updated_entries.push(proto::Entry {
-                            id: db_entry.id as u64,
-                            is_dir: db_entry.is_dir,
-                            path: db_entry.path,
-                            inode: db_entry.inode as u64,
-                            mtime: Some(proto::Timestamp {
-                                seconds: db_entry.mtime_seconds as u64,
-                                nanos: db_entry.mtime_nanos as u32,
-                            }),
-                            canonical_path: db_entry.canonical_path,
-                            is_ignored: db_entry.is_ignored,
-                            is_external: db_entry.is_external,
-                            is_hidden: db_entry.is_hidden,
-                            // This is only used in the summarization backlog, so if it's None,
-                            // that just means we won't be able to detect when to resummarize
-                            // based on total number of backlogged bytes - instead, we'd go
-                            // on number of files only. That shouldn't be a huge deal in practice.
-                            size: None,
-                            is_fifo: db_entry.is_fifo,
-                        });
-                    }
-                }
-            }
-
-            worktrees.push(worktree);
-        }
-
-        let mut removed_repositories = Vec::new();
-        let mut updated_repositories = Vec::new();
-        for db_repo in db_repos {
-            let rejoined_repository = rejoined_project
-                .repositories
-                .iter()
-                .find(|repo| repo.id == db_repo.id as u64);
-
-            let repository_filter = if let Some(rejoined_repository) = rejoined_repository {
-                project_repository::Column::ScanId.gt(rejoined_repository.scan_id)
-            } else {
-                project_repository::Column::IsDeleted.eq(false)
-            };
-
-            let db_repositories = project_repository::Entity::find()
-                .filter(
-                    Condition::all()
-                        .add(project_repository::Column::ProjectId.eq(project.id))
-                        .add(repository_filter),
-                )
-                .all(tx)
-                .await?;
-
-            for db_repository in db_repositories.into_iter() {
-                if db_repository.is_deleted {
-                    removed_repositories.push(db_repository.id as u64);
-                } else {
-                    let status_entry_filter = if let Some(rejoined_repository) = rejoined_repository
-                    {
-                        project_repository_statuses::Column::ScanId.gt(rejoined_repository.scan_id)
-                    } else {
-                        project_repository_statuses::Column::IsDeleted.eq(false)
-                    };
-
-                    let mut db_statuses = project_repository_statuses::Entity::find()
-                        .filter(
-                            Condition::all()
-                                .add(project_repository_statuses::Column::ProjectId.eq(project.id))
-                                .add(
-                                    project_repository_statuses::Column::RepositoryId
-                                        .eq(db_repository.id),
-                                )
-                                .add(status_entry_filter),
-                        )
-                        .stream(tx)
-                        .await?;
-                    let mut removed_statuses = Vec::new();
-                    let mut updated_statuses = Vec::new();
-
-                    while let Some(db_status) = db_statuses.next().await {
-                        let db_status: project_repository_statuses::Model = db_status?;
-                        if db_status.is_deleted {
-                            removed_statuses.push(db_status.repo_path);
-                        } else {
-                            updated_statuses.push(db_status_to_proto(db_status)?);
-                        }
-                    }
-
-                    let current_merge_conflicts = db_repository
-                        .current_merge_conflicts
-                        .as_ref()
-                        .map(|conflicts| serde_json::from_str(conflicts))
-                        .transpose()?
-                        .unwrap_or_default();
-
-                    let branch_summary = db_repository
-                        .branch_summary
-                        .as_ref()
-                        .map(|branch_summary| serde_json::from_str(branch_summary))
-                        .transpose()?
-                        .unwrap_or_default();
-
-                    let head_commit_details = db_repository
-                        .head_commit_details
-                        .as_ref()
-                        .map(|head_commit_details| serde_json::from_str(head_commit_details))
-                        .transpose()?
-                        .unwrap_or_default();
-
-                    let entry_ids = serde_json::from_str(&db_repository.entry_ids)
-                        .context("failed to deserialize repository's entry ids")?;
-
-                    if let Some(legacy_worktree_id) = db_repository.legacy_worktree_id {
-                        if let Some(worktree) = worktrees
-                            .iter_mut()
-                            .find(|worktree| worktree.id as i64 == legacy_worktree_id)
-                        {
-                            worktree.updated_repositories.push(proto::RepositoryEntry {
-                                repository_id: db_repository.id as u64,
-                                updated_statuses,
-                                removed_statuses,
-                                current_merge_conflicts,
-                                branch_summary,
-                            });
-                        }
-                    } else {
-                        updated_repositories.push(proto::UpdateRepository {
-                            entry_ids,
-                            updated_statuses,
-                            removed_statuses,
-                            current_merge_conflicts,
-                            branch_summary,
-                            head_commit_details,
-                            project_id: project_id.to_proto(),
-                            id: db_repository.id as u64,
-                            abs_path: db_repository.abs_path,
-                            scan_id: db_repository.scan_id as u64,
-                            is_last_update: true,
-                            merge_message: db_repository.merge_message,
-                            stash_entries: Vec::new(),
-                            remote_upstream_url: db_repository.remote_upstream_url.clone(),
-                            remote_origin_url: db_repository.remote_origin_url.clone(),
-                        });
-                    }
-                }
-            }
-        }
-
-        let language_servers = project
-            .find_related(language_server::Entity)
-            .all(tx)
-            .await?
-            .into_iter()
-            .map(|language_server| LanguageServer {
-                server: proto::LanguageServer {
-                    id: language_server.id as u64,
-                    name: language_server.name,
-                    worktree_id: language_server.worktree_id.map(|id| id as u64),
-                },
-                capabilities: language_server.capabilities,
-            })
-            .collect::<Vec<_>>();
-
-        {
-            let mut db_settings_files = worktree_settings_file::Entity::find()
-                .filter(worktree_settings_file::Column::ProjectId.eq(project_id))
-                .stream(tx)
-                .await?;
-            while let Some(db_settings_file) = db_settings_files.next().await {
-                let db_settings_file = db_settings_file?;
-                if let Some(worktree) = worktrees
-                    .iter_mut()
-                    .find(|w| w.id == db_settings_file.worktree_id as u64)
-                {
-                    worktree.settings_files.push(WorktreeSettingsFile {
-                        path: db_settings_file.path,
-                        content: db_settings_file.content,
-                        kind: db_settings_file.kind,
-                    });
-                }
-            }
-        }
-
-        let mut collaborators = project
-            .find_related(project_collaborator::Entity)
-            .all(tx)
-            .await?;
-        let self_collaborator = if let Some(self_collaborator_ix) = collaborators
-            .iter()
-            .position(|collaborator| collaborator.user_id == user_id)
-        {
-            collaborators.swap_remove(self_collaborator_ix)
-        } else {
-            return Ok(None);
-        };
-        let old_connection_id = self_collaborator.connection();
-        project_collaborator::Entity::update(project_collaborator::ActiveModel {
-            connection_id: ActiveValue::set(connection.id as i32),
-            connection_server_id: ActiveValue::set(ServerId(connection.owner_id as i32)),
-            ..self_collaborator.into_active_model()
-        })
-        .exec(tx)
-        .await?;
-
-        let collaborators = collaborators
-            .into_iter()
-            .map(|collaborator| ProjectCollaborator {
-                connection_id: collaborator.connection(),
-                user_id: collaborator.user_id,
-                replica_id: collaborator.replica_id,
-                is_host: collaborator.is_host,
-                committer_name: collaborator.committer_name,
-                committer_email: collaborator.committer_email,
-            })
-            .collect::<Vec<_>>();
-
-        Ok(Some(RejoinedProject {
-            id: project_id,
-            old_connection_id,
-            collaborators,
-            updated_repositories,
-            removed_repositories,
-            worktrees,
-            language_servers,
-        }))
-    }
-
-    pub async fn leave_room(
-        &self,
-        connection: ConnectionId,
-    ) -> Result<Option<TransactionGuard<LeftRoom>>> {
-        self.optional_room_transaction(|tx| async move {
-            let leaving_participant = room_participant::Entity::find()
-                .filter(
-                    Condition::all()
-                        .add(
-                            room_participant::Column::AnsweringConnectionId
-                                .eq(connection.id as i32),
-                        )
-                        .add(
-                            room_participant::Column::AnsweringConnectionServerId
-                                .eq(connection.owner_id as i32),
-                        ),
-                )
-                .one(&*tx)
-                .await?;
-
-            if let Some(leaving_participant) = leaving_participant {
-                // Leave room.
-                let room_id = leaving_participant.room_id;
-                room_participant::Entity::delete_by_id(leaving_participant.id)
-                    .exec(&*tx)
-                    .await?;
-
-                // Cancel pending calls initiated by the leaving user.
-                let called_participants = room_participant::Entity::find()
-                    .filter(
-                        Condition::all()
-                            .add(
-                                room_participant::Column::CallingUserId
-                                    .eq(leaving_participant.user_id),
-                            )
-                            .add(room_participant::Column::AnsweringConnectionId.is_null()),
-                    )
-                    .all(&*tx)
-                    .await?;
-                room_participant::Entity::delete_many()
-                    .filter(
-                        room_participant::Column::Id
-                            .is_in(called_participants.iter().map(|participant| participant.id)),
-                    )
-                    .exec(&*tx)
-                    .await?;
-                let canceled_calls_to_user_ids = called_participants
-                    .into_iter()
-                    .map(|participant| participant.user_id)
-                    .collect();
-
-                // Detect left projects.
-                #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
-                enum QueryProjectIds {
-                    ProjectId,
-                }
-                let project_ids: Vec<ProjectId> = project_collaborator::Entity::find()
-                    .select_only()
-                    .column_as(
-                        project_collaborator::Column::ProjectId,
-                        QueryProjectIds::ProjectId,
-                    )
-                    .filter(
-                        Condition::all()
-                            .add(
-                                project_collaborator::Column::ConnectionId.eq(connection.id as i32),
-                            )
-                            .add(
-                                project_collaborator::Column::ConnectionServerId
-                                    .eq(connection.owner_id as i32),
-                            ),
-                    )
-                    .into_values::<_, QueryProjectIds>()
-                    .all(&*tx)
-                    .await?;
-
-                let mut left_projects = HashMap::default();
-                let mut collaborators = project_collaborator::Entity::find()
-                    .filter(project_collaborator::Column::ProjectId.is_in(project_ids))
-                    .stream(&*tx)
-                    .await?;
-
-                while let Some(collaborator) = collaborators.next().await {
-                    let collaborator = collaborator?;
-                    let left_project =
-                        left_projects
-                            .entry(collaborator.project_id)
-                            .or_insert(LeftProject {
-                                id: collaborator.project_id,
-                                connection_ids: Default::default(),
-                                should_unshare: false,
-                            });
-
-                    let collaborator_connection_id = collaborator.connection();
-                    if collaborator_connection_id != connection {
-                        left_project.connection_ids.push(collaborator_connection_id);
-                    }
-
-                    if collaborator.is_host && collaborator.connection() == connection {
-                        left_project.should_unshare = true;
-                    }
-                }
-                drop(collaborators);
-
-                // Leave projects.
-                project_collaborator::Entity::delete_many()
-                    .filter(
-                        Condition::all()
-                            .add(
-                                project_collaborator::Column::ConnectionId.eq(connection.id as i32),
-                            )
-                            .add(
-                                project_collaborator::Column::ConnectionServerId
-                                    .eq(connection.owner_id as i32),
-                            ),
-                    )
-                    .exec(&*tx)
-                    .await?;
-
-                follower::Entity::delete_many()
-                    .filter(
-                        Condition::all()
-                            .add(follower::Column::FollowerConnectionId.eq(connection.id as i32)),
-                    )
-                    .exec(&*tx)
-                    .await?;
-
-                // Unshare projects.
-                project::Entity::delete_many()
-                    .filter(
-                        Condition::all()
-                            .add(project::Column::RoomId.eq(room_id))
-                            .add(project::Column::HostConnectionId.eq(connection.id as i32))
-                            .add(
-                                project::Column::HostConnectionServerId
-                                    .eq(connection.owner_id as i32),
-                            ),
-                    )
-                    .exec(&*tx)
-                    .await?;
-
-                let (channel, room) = self.get_channel_room(room_id, &tx).await?;
-                let deleted = if room.participants.is_empty() {
-                    let result = room::Entity::delete_by_id(room_id).exec(&*tx).await?;
-                    result.rows_affected > 0
-                } else {
-                    false
-                };
-
-                let left_room = LeftRoom {
-                    room,
-                    channel,
-                    left_projects,
-                    canceled_calls_to_user_ids,
-                    deleted,
-                };
-
-                if left_room.room.participants.is_empty() {
-                    self.rooms.remove(&room_id);
-                }
-
-                Ok(Some((room_id, left_room)))
-            } else {
-                Ok(None)
-            }
-        })
-        .await
-    }
-
-    /// Updates the location of a participant in the given room.
-    pub async fn update_room_participant_location(
-        &self,
-        room_id: RoomId,
-        connection: ConnectionId,
-        location: proto::ParticipantLocation,
-    ) -> Result<TransactionGuard<proto::Room>> {
-        self.room_transaction(room_id, |tx| async {
-            let tx = tx;
-            let location_kind;
-            let location_project_id;
-            match location.variant.as_ref().context("invalid location")? {
-                proto::participant_location::Variant::SharedProject(project) => {
-                    location_kind = 0;
-                    location_project_id = Some(ProjectId::from_proto(project.id));
-                }
-                proto::participant_location::Variant::UnsharedProject(_) => {
-                    location_kind = 1;
-                    location_project_id = None;
-                }
-                proto::participant_location::Variant::External(_) => {
-                    location_kind = 2;
-                    location_project_id = None;
-                }
-            }
-
-            let result = room_participant::Entity::update_many()
-                .filter(
-                    Condition::all()
-                        .add(room_participant::Column::RoomId.eq(room_id))
-                        .add(
-                            room_participant::Column::AnsweringConnectionId
-                                .eq(connection.id as i32),
-                        )
-                        .add(
-                            room_participant::Column::AnsweringConnectionServerId
-                                .eq(connection.owner_id as i32),
-                        ),
-                )
-                .set(room_participant::ActiveModel {
-                    location_kind: ActiveValue::set(Some(location_kind)),
-                    location_project_id: ActiveValue::set(location_project_id),
-                    ..Default::default()
-                })
-                .exec(&*tx)
-                .await?;
-
-            if result.rows_affected == 1 {
-                let room = self.get_room(room_id, &tx).await?;
-                Ok(room)
-            } else {
-                Err(anyhow!("could not update room participant location"))?
-            }
-        })
-        .await
-    }
-
-    /// Sets the role of a participant in the given room.
-    pub async fn set_room_participant_role(
-        &self,
-        admin_id: UserId,
-        room_id: RoomId,
-        user_id: UserId,
-        role: ChannelRole,
-    ) -> Result<TransactionGuard<proto::Room>> {
-        self.room_transaction(room_id, |tx| async move {
-            room_participant::Entity::find()
-                .filter(
-                    Condition::all()
-                        .add(room_participant::Column::RoomId.eq(room_id))
-                        .add(room_participant::Column::UserId.eq(admin_id))
-                        .add(room_participant::Column::Role.eq(ChannelRole::Admin)),
-                )
-                .one(&*tx)
-                .await?
-                .context("only admins can set participant role")?;
-
-            if role.requires_cla() {
-                self.check_user_has_signed_cla(user_id, room_id, &tx)
-                    .await?;
-            }
-
-            let result = room_participant::Entity::update_many()
-                .filter(
-                    Condition::all()
-                        .add(room_participant::Column::RoomId.eq(room_id))
-                        .add(room_participant::Column::UserId.eq(user_id)),
-                )
-                .set(room_participant::ActiveModel {
-                    role: ActiveValue::set(Some(role)),
-                    ..Default::default()
-                })
-                .exec(&*tx)
-                .await?;
-
-            if result.rows_affected != 1 {
-                Err(anyhow!("could not update room participant role"))?;
-            }
-            self.get_room(room_id, &tx).await
-        })
-        .await
-    }
-
-    async fn check_user_has_signed_cla(
-        &self,
-        user_id: UserId,
-        room_id: RoomId,
-        tx: &DatabaseTransaction,
-    ) -> Result<()> {
-        let channel = room::Entity::find_by_id(room_id)
-            .one(tx)
-            .await?
-            .context("could not find room")?
-            .find_related(channel::Entity)
-            .one(tx)
-            .await?;
-
-        if let Some(channel) = channel {
-            let requires_zed_cla = channel.requires_zed_cla
-                || channel::Entity::find()
-                    .filter(
-                        channel::Column::Id
-                            .is_in(channel.ancestors())
-                            .and(channel::Column::RequiresZedCla.eq(true)),
-                    )
-                    .count(tx)
-                    .await?
-                    > 0;
-            if requires_zed_cla
-                && contributor::Entity::find()
-                    .filter(contributor::Column::UserId.eq(user_id))
-                    .one(tx)
-                    .await?
-                    .is_none()
-            {
-                Err(anyhow!("user has not signed the Zed CLA"))?;
-            }
-        }
-        Ok(())
-    }
-
-    pub async fn connection_lost(&self, connection: ConnectionId) -> Result<()> {
-        self.transaction(|tx| async move {
-            self.room_connection_lost(connection, &tx).await?;
-            self.channel_buffer_connection_lost(connection, &tx).await?;
-            Ok(())
-        })
-        .await
-    }
-
-    pub async fn room_connection_lost(
-        &self,
-        connection: ConnectionId,
-        tx: &DatabaseTransaction,
-    ) -> Result<()> {
-        let participant = room_participant::Entity::find()
-            .filter(
-                Condition::all()
-                    .add(room_participant::Column::AnsweringConnectionId.eq(connection.id as i32))
-                    .add(
-                        room_participant::Column::AnsweringConnectionServerId
-                            .eq(connection.owner_id as i32),
-                    ),
-            )
-            .one(tx)
-            .await?;
-
-        if let Some(participant) = participant {
-            room_participant::Entity::update(room_participant::ActiveModel {
-                answering_connection_lost: ActiveValue::set(true),
-                ..participant.into_active_model()
-            })
-            .exec(tx)
-            .await?;
-        }
-        Ok(())
-    }
-
-    fn build_incoming_call(
-        room: &proto::Room,
-        called_user_id: UserId,
-    ) -> Option<proto::IncomingCall> {
-        let pending_participant = room
-            .pending_participants
-            .iter()
-            .find(|participant| participant.user_id == called_user_id.to_proto())?;
-
-        Some(proto::IncomingCall {
-            room_id: room.id,
-            calling_user_id: pending_participant.calling_user_id,
-            participant_user_ids: room
-                .participants
-                .iter()
-                .map(|participant| participant.user_id)
-                .collect(),
-            initial_project: room.participants.iter().find_map(|participant| {
-                let initial_project_id = pending_participant.initial_project_id?;
-                participant
-                    .projects
-                    .iter()
-                    .find(|project| project.id == initial_project_id)
-                    .cloned()
-            }),
-        })
-    }
-
-    pub async fn get_room(&self, room_id: RoomId, tx: &DatabaseTransaction) -> Result<proto::Room> {
-        let (_, room) = self.get_channel_room(room_id, tx).await?;
-        Ok(room)
-    }
-
-    pub async fn room_connection_ids(
-        &self,
-        room_id: RoomId,
-        connection_id: ConnectionId,
-    ) -> Result<TransactionGuard<HashSet<ConnectionId>>> {
-        self.room_transaction(room_id, |tx| async move {
-            let mut participants = room_participant::Entity::find()
-                .filter(room_participant::Column::RoomId.eq(room_id))
-                .stream(&*tx)
-                .await?;
-
-            let mut is_participant = false;
-            let mut connection_ids = HashSet::default();
-            while let Some(participant) = participants.next().await {
-                let participant = participant?;
-                if let Some(answering_connection) = participant.answering_connection() {
-                    if answering_connection == connection_id {
-                        is_participant = true;
-                    } else {
-                        connection_ids.insert(answering_connection);
-                    }
-                }
-            }
-
-            if !is_participant {
-                Err(anyhow!("not a room participant"))?;
-            }
-
-            Ok(connection_ids)
-        })
-        .await
-    }
-
-    async fn get_channel_room(
-        &self,
-        room_id: RoomId,
-        tx: &DatabaseTransaction,
-    ) -> Result<(Option<channel::Model>, proto::Room)> {
-        let db_room = room::Entity::find_by_id(room_id)
-            .one(tx)
-            .await?
-            .context("could not find room")?;
-
-        let mut db_participants = db_room
-            .find_related(room_participant::Entity)
-            .stream(tx)
-            .await?;
-        let mut participants = HashMap::default();
-        let mut pending_participants = Vec::new();
-        while let Some(db_participant) = db_participants.next().await {
-            let db_participant = db_participant?;
-            if let (
-                Some(answering_connection_id),
-                Some(answering_connection_server_id),
-                Some(participant_index),
-            ) = (
-                db_participant.answering_connection_id,
-                db_participant.answering_connection_server_id,
-                db_participant.participant_index,
-            ) {
-                let location = match (
-                    db_participant.location_kind,
-                    db_participant.location_project_id,
-                ) {
-                    (Some(0), Some(project_id)) => {
-                        Some(proto::participant_location::Variant::SharedProject(
-                            proto::participant_location::SharedProject {
-                                id: project_id.to_proto(),
-                            },
-                        ))
-                    }
-                    (Some(1), _) => Some(proto::participant_location::Variant::UnsharedProject(
-                        Default::default(),
-                    )),
-                    _ => Some(proto::participant_location::Variant::External(
-                        Default::default(),
-                    )),
-                };
-
-                let answering_connection = ConnectionId {
-                    owner_id: answering_connection_server_id.0 as u32,
-                    id: answering_connection_id as u32,
-                };
-                participants.insert(
-                    answering_connection,
-                    proto::Participant {
-                        user_id: db_participant.user_id.to_proto(),
-                        peer_id: Some(answering_connection.into()),
-                        projects: Default::default(),
-                        location: Some(proto::ParticipantLocation { variant: location }),
-                        participant_index: participant_index as u32,
-                        role: db_participant.role.unwrap_or(ChannelRole::Member).into(),
-                    },
-                );
-            } else {
-                pending_participants.push(proto::PendingParticipant {
-                    user_id: db_participant.user_id.to_proto(),
-                    calling_user_id: db_participant.calling_user_id.to_proto(),
-                    initial_project_id: db_participant.initial_project_id.map(|id| id.to_proto()),
-                });
-            }
-        }
-        drop(db_participants);
-
-        let db_projects = db_room
-            .find_related(project::Entity)
-            .find_with_related(worktree::Entity)
-            .all(tx)
-            .await?;
-
-        for (db_project, db_worktrees) in db_projects {
-            let host_connection = db_project.host_connection()?;
-            if let Some(participant) = participants.get_mut(&host_connection) {
-                participant.projects.push(proto::ParticipantProject {
-                    id: db_project.id.to_proto(),
-                    worktree_root_names: Default::default(),
-                });
-                let project = participant.projects.last_mut().unwrap();
-
-                for db_worktree in db_worktrees {
-                    if db_worktree.visible {
-                        project.worktree_root_names.push(db_worktree.root_name);
-                    }
-                }
-            }
-        }
-
-        let mut db_followers = db_room.find_related(follower::Entity).stream(tx).await?;
-        let mut followers = Vec::new();
-        while let Some(db_follower) = db_followers.next().await {
-            let db_follower = db_follower?;
-            followers.push(proto::Follower {
-                leader_id: Some(db_follower.leader_connection().into()),
-                follower_id: Some(db_follower.follower_connection().into()),
-                project_id: db_follower.project_id.to_proto(),
-            });
-        }
-        drop(db_followers);
-
-        let channel = if let Some(channel_id) = db_room.channel_id {
-            Some(self.get_channel_internal(channel_id, tx).await?)
-        } else {
-            None
-        };
-
-        Ok((
-            channel,
-            proto::Room {
-                id: db_room.id.to_proto(),
-                livekit_room: db_room.live_kit_room,
-                participants: participants.into_values().collect(),
-                pending_participants,
-                followers,
-            },
-        ))
-    }
-}
diff --git a/crates/collab/src/db/queries/servers.rs b/crates/collab/src/db/queries/servers.rs
deleted file mode 100644
index da6ff77cf0..0000000000
--- a/crates/collab/src/db/queries/servers.rs
+++ /dev/null
@@ -1,230 +0,0 @@
-use super::*;
-
-impl Database {
-    /// Creates a new server in the given environment.
-    pub async fn create_server(&self, environment: &str) -> Result<ServerId> {
-        self.transaction(|tx| async move {
-            let server = server::ActiveModel {
-                environment: ActiveValue::set(environment.into()),
-                ..Default::default()
-            }
-            .insert(&*tx)
-            .await?;
-            Ok(server.id)
-        })
-        .await
-    }
-
-    /// Returns the IDs of resources associated with stale servers.
-    ///
-    /// A server is stale if it is in the specified `environment` and does not
-    /// match the provided `new_server_id`.
-    pub async fn stale_server_resource_ids(
-        &self,
-        environment: &str,
-        new_server_id: ServerId,
-    ) -> Result<(Vec<RoomId>, Vec<ChannelId>)> {
-        self.transaction(|tx| async move {
-            #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
-            enum QueryRoomIds {
-                RoomId,
-            }
-
-            #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
-            enum QueryChannelIds {
-                ChannelId,
-            }
-
-            let stale_server_epochs = self
-                .stale_server_ids(environment, new_server_id, &tx)
-                .await?;
-            let room_ids = room_participant::Entity::find()
-                .select_only()
-                .column(room_participant::Column::RoomId)
-                .distinct()
-                .filter(
-                    room_participant::Column::AnsweringConnectionServerId
-                        .is_in(stale_server_epochs.iter().copied()),
-                )
-                .into_values::<_, QueryRoomIds>()
-                .all(&*tx)
-                .await?;
-            let channel_ids = channel_buffer_collaborator::Entity::find()
-                .select_only()
-                .column(channel_buffer_collaborator::Column::ChannelId)
-                .distinct()
-                .filter(
-                    channel_buffer_collaborator::Column::ConnectionServerId
-                        .is_in(stale_server_epochs.iter().copied()),
-                )
-                .into_values::<_, QueryChannelIds>()
-                .all(&*tx)
-                .await?;
-
-            Ok((room_ids, channel_ids))
-        })
-        .await
-    }
-
-    /// Delete all channel chat participants from previous servers
-    pub async fn delete_stale_channel_chat_participants(
-        &self,
-        environment: &str,
-        new_server_id: ServerId,
-    ) -> Result<()> {
-        self.transaction(|tx| async move {
-            let stale_server_epochs = self
-                .stale_server_ids(environment, new_server_id, &tx)
-                .await?;
-
-            channel_chat_participant::Entity::delete_many()
-                .filter(
-                    channel_chat_participant::Column::ConnectionServerId
-                        .is_in(stale_server_epochs.iter().copied()),
-                )
-                .exec(&*tx)
-                .await?;
-
-            Ok(())
-        })
-        .await
-    }
-
-    pub async fn clear_old_worktree_entries(&self, server_id: ServerId) -> Result<()> {
-        self.transaction(|tx| async move {
-            use sea_orm::Statement;
-            use sea_orm::sea_query::{Expr, Query};
-
-            loop {
-                let delete_query = Query::delete()
-                    .from_table(worktree_entry::Entity)
-                    .and_where(
-                        Expr::tuple([
-                            Expr::col((worktree_entry::Entity, worktree_entry::Column::ProjectId))
-                                .into(),
-                            Expr::col((worktree_entry::Entity, worktree_entry::Column::WorktreeId))
-                                .into(),
-                            Expr::col((worktree_entry::Entity, worktree_entry::Column::Id)).into(),
-                        ])
-                        .in_subquery(
-                            Query::select()
-                                .columns([
-                                    (worktree_entry::Entity, worktree_entry::Column::ProjectId),
-                                    (worktree_entry::Entity, worktree_entry::Column::WorktreeId),
-                                    (worktree_entry::Entity, worktree_entry::Column::Id),
-                                ])
-                                .from(worktree_entry::Entity)
-                                .inner_join(
-                                    project::Entity,
-                                    Expr::col((project::Entity, project::Column::Id)).equals((
-                                        worktree_entry::Entity,
-                                        worktree_entry::Column::ProjectId,
-                                    )),
-                                )
-                                .and_where(project::Column::HostConnectionServerId.ne(server_id))
-                                .limit(10000)
-                                .to_owned(),
-                        ),
-                    )
-                    .to_owned();
-
-                let statement = Statement::from_sql_and_values(
-                    tx.get_database_backend(),
-                    delete_query
-                        .to_string(sea_orm::sea_query::PostgresQueryBuilder)
-                        .as_str(),
-                    vec![],
-                );
-
-                let result = tx.execute(statement).await?;
-                if result.rows_affected() == 0 {
-                    break;
-                }
-            }
-
-            loop {
-                let delete_query = Query::delete()
-                    .from_table(project_repository_statuses::Entity)
-                    .and_where(
-                        Expr::tuple([Expr::col((
-                            project_repository_statuses::Entity,
-                            project_repository_statuses::Column::ProjectId,
-                        ))
-                        .into()])
-                        .in_subquery(
-                            Query::select()
-                                .columns([(
-                                    project_repository_statuses::Entity,
-                                    project_repository_statuses::Column::ProjectId,
-                                )])
-                                .from(project_repository_statuses::Entity)
-                                .inner_join(
-                                    project::Entity,
-                                    Expr::col((project::Entity, project::Column::Id)).equals((
-                                        project_repository_statuses::Entity,
-                                        project_repository_statuses::Column::ProjectId,
-                                    )),
-                                )
-                                .and_where(project::Column::HostConnectionServerId.ne(server_id))
-                                .limit(10000)
-                                .to_owned(),
-                        ),
-                    )
-                    .to_owned();
-
-                let statement = Statement::from_sql_and_values(
-                    tx.get_database_backend(),
-                    delete_query
-                        .to_string(sea_orm::sea_query::PostgresQueryBuilder)
-                        .as_str(),
-                    vec![],
-                );
-
-                let result = tx.execute(statement).await?;
-                if result.rows_affected() == 0 {
-                    break;
-                }
-            }
-
-            Ok(())
-        })
-        .await
-    }
-
-    /// Deletes any stale servers in the environment that don't match the `new_server_id`.
-    pub async fn delete_stale_servers(
-        &self,
-        environment: &str,
-        new_server_id: ServerId,
-    ) -> Result<()> {
-        self.transaction(|tx| async move {
-            server::Entity::delete_many()
-                .filter(
-                    Condition::all()
-                        .add(server::Column::Environment.eq(environment))
-                        .add(server::Column::Id.ne(new_server_id)),
-                )
-                .exec(&*tx)
-                .await?;
-            Ok(())
-        })
-        .await
-    }
-
-    pub async fn stale_server_ids(
-        &self,
-        environment: &str,
-        new_server_id: ServerId,
-        tx: &DatabaseTransaction,
-    ) -> Result<Vec<ServerId>> {
-        let stale_servers = server::Entity::find()
-            .filter(
-                Condition::all()
-                    .add(server::Column::Environment.eq(environment))
-                    .add(server::Column::Id.ne(new_server_id)),
-            )
-            .all(tx)
-            .await?;
-        Ok(stale_servers.into_iter().map(|server| server.id).collect())
-    }
-}
diff --git a/crates/collab/src/db/queries/users.rs b/crates/collab/src/db/queries/users.rs
deleted file mode 100644
index 79b5d227c0..0000000000
--- a/crates/collab/src/db/queries/users.rs
+++ /dev/null
@@ -1,277 +0,0 @@
-use anyhow::Context as _;
-use chrono::NaiveDateTime;
-
-use super::*;
-
-impl Database {
-    /// Creates a new user.
-    pub async fn create_user(
-        &self,
-        email_address: &str,
-        name: Option<&str>,
-        admin: bool,
-        params: NewUserParams,
-    ) -> Result<NewUserResult> {
-        self.transaction(|tx| async {
-            let tx = tx;
-            let user = user::Entity::insert(user::ActiveModel {
-                email_address: ActiveValue::set(Some(email_address.into())),
-                name: ActiveValue::set(name.map(|s| s.into())),
-                github_login: ActiveValue::set(params.github_login.clone()),
-                github_user_id: ActiveValue::set(params.github_user_id),
-                admin: ActiveValue::set(admin),
-                metrics_id: ActiveValue::set(Uuid::new_v4()),
-                ..Default::default()
-            })
-            .on_conflict(
-                OnConflict::column(user::Column::GithubUserId)
-                    .update_columns([
-                        user::Column::Admin,
-                        user::Column::EmailAddress,
-                        user::Column::GithubLogin,
-                    ])
-                    .to_owned(),
-            )
-            .exec_with_returning(&*tx)
-            .await?;
-
-            Ok(NewUserResult {
-                user_id: user.id,
-                metrics_id: user.metrics_id.to_string(),
-                signup_device_id: None,
-                inviting_user_id: None,
-            })
-        })
-        .await
-    }
-
-    /// Returns a user by ID. There are no access checks here, so this should only be used internally.
-    pub async fn get_user_by_id(&self, id: UserId) -> Result<Option<user::Model>> {
-        self.transaction(|tx| async move { Ok(user::Entity::find_by_id(id).one(&*tx).await?) })
-            .await
-    }
-
-    /// Returns all users by ID. There are no access checks here, so this should only be used internally.
-    pub async fn get_users_by_ids(&self, ids: Vec<UserId>) -> Result<Vec<user::Model>> {
-        if ids.len() >= 10000_usize {
-            return Err(anyhow!("too many users"))?;
-        }
-        self.transaction(|tx| async {
-            let tx = tx;
-            Ok(user::Entity::find()
-                .filter(user::Column::Id.is_in(ids.iter().copied()))
-                .all(&*tx)
-                .await?)
-        })
-        .await
-    }
-
-    /// Returns a user by GitHub login. There are no access checks here, so this should only be used internally.
-    pub async fn get_user_by_github_login(&self, github_login: &str) -> Result<Option<User>> {
-        self.transaction(|tx| async move {
-            Ok(user::Entity::find()
-                .filter(user::Column::GithubLogin.eq(github_login))
-                .one(&*tx)
-                .await?)
-        })
-        .await
-    }
-
-    pub async fn update_or_create_user_by_github_account(
-        &self,
-        github_login: &str,
-        github_user_id: i32,
-        github_email: Option<&str>,
-        github_name: Option<&str>,
-        github_user_created_at: DateTimeUtc,
-        initial_channel_id: Option<ChannelId>,
-    ) -> Result<User> {
-        self.transaction(|tx| async move {
-            self.update_or_create_user_by_github_account_tx(
-                github_login,
-                github_user_id,
-                github_email,
-                github_name,
-                github_user_created_at.naive_utc(),
-                initial_channel_id,
-                &tx,
-            )
-            .await
-        })
-        .await
-    }
-
-    pub async fn update_or_create_user_by_github_account_tx(
-        &self,
-        github_login: &str,
-        github_user_id: i32,
-        github_email: Option<&str>,
-        github_name: Option<&str>,
-        github_user_created_at: NaiveDateTime,
-        initial_channel_id: Option<ChannelId>,
-        tx: &DatabaseTransaction,
-    ) -> Result<User> {
-        if let Some(existing_user) = self
-            .get_user_by_github_user_id_or_github_login(github_user_id, github_login, tx)
-            .await?
-        {
-            let mut existing_user = existing_user.into_active_model();
-            existing_user.github_login = ActiveValue::set(github_login.into());
-            existing_user.github_user_created_at = ActiveValue::set(Some(github_user_created_at));
-
-            if let Some(github_email) = github_email {
-                existing_user.email_address = ActiveValue::set(Some(github_email.into()));
-            }
-
-            if let Some(github_name) = github_name {
-                existing_user.name = ActiveValue::set(Some(github_name.into()));
-            }
-
-            Ok(existing_user.update(tx).await?)
-        } else {
-            let user = user::Entity::insert(user::ActiveModel {
-                email_address: ActiveValue::set(github_email.map(|email| email.into())),
-                name: ActiveValue::set(github_name.map(|name| name.into())),
-                github_login: ActiveValue::set(github_login.into()),
-                github_user_id: ActiveValue::set(github_user_id),
-                github_user_created_at: ActiveValue::set(Some(github_user_created_at)),
-                admin: ActiveValue::set(false),
-                invite_count: ActiveValue::set(0),
-                invite_code: ActiveValue::set(None),
-                metrics_id: ActiveValue::set(Uuid::new_v4()),
-                ..Default::default()
-            })
-            .exec_with_returning(tx)
-            .await?;
-            if let Some(channel_id) = initial_channel_id {
-                channel_member::Entity::insert(channel_member::ActiveModel {
-                    id: ActiveValue::NotSet,
-                    channel_id: ActiveValue::Set(channel_id),
-                    user_id: ActiveValue::Set(user.id),
-                    accepted: ActiveValue::Set(true),
-                    role: ActiveValue::Set(ChannelRole::Guest),
-                })
-                .exec(tx)
-                .await?;
-            }
-            Ok(user)
-        }
-    }
-
-    /// Tries to retrieve a user, first by their GitHub user ID, and then by their GitHub login.
-    ///
-    /// Returns `None` if a user is not found with this GitHub user ID or GitHub login.
-    pub async fn get_user_by_github_user_id_or_github_login(
-        &self,
-        github_user_id: i32,
-        github_login: &str,
-        tx: &DatabaseTransaction,
-    ) -> Result<Option<User>> {
-        if let Some(user_by_github_user_id) = user::Entity::find()
-            .filter(user::Column::GithubUserId.eq(github_user_id))
-            .one(tx)
-            .await?
-        {
-            return Ok(Some(user_by_github_user_id));
-        }
-
-        if let Some(user_by_github_login) = user::Entity::find()
-            .filter(user::Column::GithubLogin.eq(github_login))
-            .one(tx)
-            .await?
-        {
-            return Ok(Some(user_by_github_login));
-        }
-
-        Ok(None)
-    }
-
-    /// get_all_users returns the next page of users. To get more call again with
-    /// the same limit and the page incremented by 1.
-    pub async fn get_all_users(&self, page: u32, limit: u32) -> Result<Vec<User>> {
-        self.transaction(|tx| async move {
-            Ok(user::Entity::find()
-                .order_by_asc(user::Column::GithubLogin)
-                .limit(limit as u64)
-                .offset(page as u64 * limit as u64)
-                .all(&*tx)
-                .await?)
-        })
-        .await
-    }
-
-    /// Returns the metrics id for the user.
-    pub async fn get_user_metrics_id(&self, id: UserId) -> Result<String> {
-        #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
-        enum QueryAs {
-            MetricsId,
-        }
-
-        self.transaction(|tx| async move {
-            let metrics_id: Uuid = user::Entity::find_by_id(id)
-                .select_only()
-                .column(user::Column::MetricsId)
-                .into_values::<_, QueryAs>()
-                .one(&*tx)
-                .await?
-                .context("could not find user")?;
-            Ok(metrics_id.to_string())
-        })
-        .await
-    }
-
-    /// Sets "connected_once" on the user for analytics.
-    pub async fn set_user_connected_once(&self, id: UserId, connected_once: bool) -> Result<()> {
-        self.transaction(|tx| async move {
-            user::Entity::update_many()
-                .filter(user::Column::Id.eq(id))
-                .set(user::ActiveModel {
-                    connected_once: ActiveValue::set(connected_once),
-                    ..Default::default()
-                })
-                .exec(&*tx)
-                .await?;
-            Ok(())
-        })
-        .await
-    }
-
-    /// Find users where github_login ILIKE name_query.
-    pub async fn fuzzy_search_users(&self, name_query: &str, limit: u32) -> Result<Vec<User>> {
-        self.transaction(|tx| async {
-            let tx = tx;
-            let like_string = Self::fuzzy_like_string(name_query);
-            let query = "
-                SELECT users.*
-                FROM users
-                WHERE github_login ILIKE $1
-                ORDER BY github_login <-> $2
-                LIMIT $3
-            ";
-
-            Ok(user::Entity::find()
-                .from_raw_sql(Statement::from_sql_and_values(
-                    self.pool.get_database_backend(),
-                    query,
-                    vec![like_string.into(), name_query.into(), limit.into()],
-                ))
-                .all(&*tx)
-                .await?)
-        })
-        .await
-    }
-
-    /// fuzzy_like_string creates a string for matching in-order using fuzzy_search_users.
-    /// e.g. "cir" would become "%c%i%r%"
-    pub fn fuzzy_like_string(string: &str) -> String {
-        let mut result = String::with_capacity(string.len() * 2 + 1);
-        for c in string.chars() {
-            if c.is_alphanumeric() {
-                result.push('%');
-                result.push(c);
-            }
-        }
-        result.push('%');
-        result
-    }
-}
diff --git a/crates/collab/src/db/tables.rs b/crates/collab/src/db/tables.rs
deleted file mode 100644
index c179539e4b..0000000000
--- a/crates/collab/src/db/tables.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-pub mod access_token;
-pub mod buffer;
-pub mod buffer_operation;
-pub mod buffer_snapshot;
-pub mod channel;
-pub mod channel_buffer_collaborator;
-pub mod channel_chat_participant;
-pub mod channel_member;
-pub mod contact;
-pub mod contributor;
-pub mod extension;
-pub mod extension_version;
-pub mod follower;
-pub mod language_server;
-pub mod notification;
-pub mod notification_kind;
-pub mod observed_buffer_edits;
-pub mod project;
-pub mod project_collaborator;
-pub mod project_repository;
-pub mod project_repository_statuses;
-pub mod room;
-pub mod room_participant;
-pub mod server;
-pub mod user;
-pub mod worktree;
-pub mod worktree_diagnostic_summary;
-pub mod worktree_entry;
-pub mod worktree_settings_file;
diff --git a/crates/collab/src/db/tables/access_token.rs b/crates/collab/src/db/tables/access_token.rs
deleted file mode 100644
index 22635fb64d..0000000000
--- a/crates/collab/src/db/tables/access_token.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-use crate::db::{AccessTokenId, UserId};
-use sea_orm::entity::prelude::*;
-
-#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
-#[sea_orm(table_name = "access_tokens")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub id: AccessTokenId,
-    pub user_id: UserId,
-    pub impersonated_user_id: Option<UserId>,
-    pub hash: String,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-    #[sea_orm(
-        belongs_to = "super::user::Entity",
-        from = "Column::UserId",
-        to = "super::user::Column::Id"
-    )]
-    User,
-}
-
-impl Related<super::user::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::User.def()
-    }
-}
-
-impl ActiveModelBehavior for ActiveModel {}
diff --git a/crates/collab/src/db/tables/buffer.rs b/crates/collab/src/db/tables/buffer.rs
deleted file mode 100644
index e35746a0d2..0000000000
--- a/crates/collab/src/db/tables/buffer.rs
+++ /dev/null
@@ -1,48 +0,0 @@
-use crate::db::{BufferId, ChannelId};
-use sea_orm::entity::prelude::*;
-
-#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
-#[sea_orm(table_name = "buffers")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub id: BufferId,
-    pub epoch: i32,
-    pub channel_id: ChannelId,
-    pub latest_operation_epoch: Option<i32>,
-    pub latest_operation_lamport_timestamp: Option<i32>,
-    pub latest_operation_replica_id: Option<i32>,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-    #[sea_orm(has_many = "super::buffer_operation::Entity")]
-    Operations,
-    #[sea_orm(has_many = "super::buffer_snapshot::Entity")]
-    Snapshots,
-    #[sea_orm(
-        belongs_to = "super::channel::Entity",
-        from = "Column::ChannelId",
-        to = "super::channel::Column::Id"
-    )]
-    Channel,
-}
-
-impl Related<super::buffer_operation::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Operations.def()
-    }
-}
-
-impl Related<super::buffer_snapshot::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Snapshots.def()
-    }
-}
-
-impl Related<super::channel::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Channel.def()
-    }
-}
-
-impl ActiveModelBehavior for ActiveModel {}
diff --git a/crates/collab/src/db/tables/buffer_operation.rs b/crates/collab/src/db/tables/buffer_operation.rs
deleted file mode 100644
index 37bd4bedfe..0000000000
--- a/crates/collab/src/db/tables/buffer_operation.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-use crate::db::BufferId;
-use sea_orm::entity::prelude::*;
-
-#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
-#[sea_orm(table_name = "buffer_operations")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub buffer_id: BufferId,
-    #[sea_orm(primary_key)]
-    pub epoch: i32,
-    #[sea_orm(primary_key)]
-    pub lamport_timestamp: i32,
-    #[sea_orm(primary_key)]
-    pub replica_id: i32,
-    pub value: Vec<u8>,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-    #[sea_orm(
-        belongs_to = "super::buffer::Entity",
-        from = "Column::BufferId",
-        to = "super::buffer::Column::Id"
-    )]
-    Buffer,
-}
-
-impl Related<super::buffer::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Buffer.def()
-    }
-}
-
-impl ActiveModelBehavior for ActiveModel {}
diff --git a/crates/collab/src/db/tables/buffer_snapshot.rs b/crates/collab/src/db/tables/buffer_snapshot.rs
deleted file mode 100644
index c9de665e43..0000000000
--- a/crates/collab/src/db/tables/buffer_snapshot.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-use crate::db::BufferId;
-use sea_orm::entity::prelude::*;
-
-#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
-#[sea_orm(table_name = "buffer_snapshots")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub buffer_id: BufferId,
-    #[sea_orm(primary_key)]
-    pub epoch: i32,
-    pub text: String,
-    pub operation_serialization_version: i32,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-    #[sea_orm(
-        belongs_to = "super::buffer::Entity",
-        from = "Column::BufferId",
-        to = "super::buffer::Column::Id"
-    )]
-    Buffer,
-}
-
-impl Related<super::buffer::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Buffer.def()
-    }
-}
-
-impl ActiveModelBehavior for ActiveModel {}
diff --git a/crates/collab/src/db/tables/channel.rs b/crates/collab/src/db/tables/channel.rs
deleted file mode 100644
index cd3b867e13..0000000000
--- a/crates/collab/src/db/tables/channel.rs
+++ /dev/null
@@ -1,95 +0,0 @@
-use crate::db::{ChannelId, ChannelVisibility};
-use sea_orm::entity::prelude::*;
-
-#[derive(Clone, Debug, Default, PartialEq, Eq, DeriveEntityModel)]
-#[sea_orm(table_name = "channels")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub id: ChannelId,
-    pub name: String,
-    pub visibility: ChannelVisibility,
-    pub parent_path: String,
-    pub requires_zed_cla: bool,
-    /// The order of this channel relative to its siblings within the same parent.
-    /// Lower values appear first. Channels are sorted by parent_path first, then by channel_order.
-    pub channel_order: i32,
-}
-
-impl Model {
-    pub fn parent_id(&self) -> Option<ChannelId> {
-        self.ancestors().last()
-    }
-
-    pub fn is_root(&self) -> bool {
-        self.parent_path.is_empty()
-    }
-
-    pub fn root_id(&self) -> ChannelId {
-        self.ancestors().next().unwrap_or(self.id)
-    }
-
-    pub fn ancestors(&self) -> impl Iterator<Item = ChannelId> + '_ {
-        self.parent_path
-            .trim_end_matches('/')
-            .split('/')
-            .filter_map(|id| Some(ChannelId::from_proto(id.parse().ok()?)))
-    }
-
-    pub fn ancestors_including_self(&self) -> impl Iterator<Item = ChannelId> + '_ {
-        self.ancestors().chain(Some(self.id))
-    }
-
-    pub fn path(&self) -> String {
-        format!("{}{}/", self.parent_path, self.id)
-    }
-
-    pub fn descendant_path_filter(&self) -> String {
-        format!("{}{}/%", self.parent_path, self.id)
-    }
-}
-
-impl ActiveModelBehavior for ActiveModel {}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-    #[sea_orm(has_one = "super::room::Entity")]
-    Room,
-    #[sea_orm(has_one = "super::buffer::Entity")]
-    Buffer,
-    #[sea_orm(has_many = "super::channel_member::Entity")]
-    Member,
-    #[sea_orm(has_many = "super::channel_buffer_collaborator::Entity")]
-    BufferCollaborators,
-    #[sea_orm(has_many = "super::channel_chat_participant::Entity")]
-    ChatParticipants,
-}
-
-impl Related<super::channel_member::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Member.def()
-    }
-}
-
-impl Related<super::room::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Room.def()
-    }
-}
-
-impl Related<super::buffer::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Buffer.def()
-    }
-}
-
-impl Related<super::channel_buffer_collaborator::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::BufferCollaborators.def()
-    }
-}
-
-impl Related<super::channel_chat_participant::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::ChatParticipants.def()
-    }
-}
diff --git a/crates/collab/src/db/tables/channel_buffer_collaborator.rs b/crates/collab/src/db/tables/channel_buffer_collaborator.rs
deleted file mode 100644
index ac2637b36e..0000000000
--- a/crates/collab/src/db/tables/channel_buffer_collaborator.rs
+++ /dev/null
@@ -1,43 +0,0 @@
-use crate::db::{ChannelBufferCollaboratorId, ChannelId, ReplicaId, ServerId, UserId};
-use rpc::ConnectionId;
-use sea_orm::entity::prelude::*;
-
-#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
-#[sea_orm(table_name = "channel_buffer_collaborators")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub id: ChannelBufferCollaboratorId,
-    pub channel_id: ChannelId,
-    pub connection_id: i32,
-    pub connection_server_id: ServerId,
-    pub connection_lost: bool,
-    pub user_id: UserId,
-    pub replica_id: ReplicaId,
-}
-
-impl Model {
-    pub fn connection(&self) -> ConnectionId {
-        ConnectionId {
-            owner_id: self.connection_server_id.0 as u32,
-            id: self.connection_id as u32,
-        }
-    }
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-    #[sea_orm(
-        belongs_to = "super::channel::Entity",
-        from = "Column::ChannelId",
-        to = "super::channel::Column::Id"
-    )]
-    Channel,
-}
-
-impl Related<super::channel::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Channel.def()
-    }
-}
-
-impl ActiveModelBehavior for ActiveModel {}
diff --git a/crates/collab/src/db/tables/channel_chat_participant.rs b/crates/collab/src/db/tables/channel_chat_participant.rs
deleted file mode 100644
index f3ef36c289..0000000000
--- a/crates/collab/src/db/tables/channel_chat_participant.rs
+++ /dev/null
@@ -1,41 +0,0 @@
-use crate::db::{ChannelChatParticipantId, ChannelId, ServerId, UserId};
-use rpc::ConnectionId;
-use sea_orm::entity::prelude::*;
-
-#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
-#[sea_orm(table_name = "channel_chat_participants")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub id: ChannelChatParticipantId,
-    pub channel_id: ChannelId,
-    pub user_id: UserId,
-    pub connection_id: i32,
-    pub connection_server_id: ServerId,
-}
-
-impl Model {
-    pub fn connection(&self) -> ConnectionId {
-        ConnectionId {
-            owner_id: self.connection_server_id.0 as u32,
-            id: self.connection_id as u32,
-        }
-    }
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-    #[sea_orm(
-        belongs_to = "super::channel::Entity",
-        from = "Column::ChannelId",
-        to = "super::channel::Column::Id"
-    )]
-    Channel,
-}
-
-impl Related<super::channel::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Channel.def()
-    }
-}
-
-impl ActiveModelBehavior for ActiveModel {}
diff --git a/crates/collab/src/db/tables/channel_member.rs b/crates/collab/src/db/tables/channel_member.rs
deleted file mode 100644
index a00a380d55..0000000000
--- a/crates/collab/src/db/tables/channel_member.rs
+++ /dev/null
@@ -1,59 +0,0 @@
-use crate::db::{ChannelId, ChannelMemberId, ChannelRole, UserId, channel_member};
-use sea_orm::entity::prelude::*;
-
-#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
-#[sea_orm(table_name = "channel_members")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub id: ChannelMemberId,
-    pub channel_id: ChannelId,
-    pub user_id: UserId,
-    pub accepted: bool,
-    pub role: ChannelRole,
-}
-
-impl ActiveModelBehavior for ActiveModel {}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-    #[sea_orm(
-        belongs_to = "super::channel::Entity",
-        from = "Column::ChannelId",
-        to = "super::channel::Column::Id"
-    )]
-    Channel,
-    #[sea_orm(
-        belongs_to = "super::user::Entity",
-        from = "Column::UserId",
-        to = "super::user::Column::Id"
-    )]
-    User,
-}
-
-impl Related<super::channel::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Channel.def()
-    }
-}
-
-impl Related<super::user::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::User.def()
-    }
-}
-
-#[derive(Debug)]
-pub struct UserToChannel;
-
-impl Linked for UserToChannel {
-    type FromEntity = super::user::Entity;
-
-    type ToEntity = super::channel::Entity;
-
-    fn link(&self) -> Vec<RelationDef> {
-        vec![
-            channel_member::Relation::User.def().rev(),
-            channel_member::Relation::Channel.def(),
-        ]
-    }
-}
diff --git a/crates/collab/src/db/tables/contact.rs b/crates/collab/src/db/tables/contact.rs
deleted file mode 100644
index 38af8b782b..0000000000
--- a/crates/collab/src/db/tables/contact.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-use crate::db::{ContactId, UserId};
-use sea_orm::entity::prelude::*;
-
-#[derive(Clone, Debug, Default, PartialEq, Eq, DeriveEntityModel)]
-#[sea_orm(table_name = "contacts")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub id: ContactId,
-    pub user_id_a: UserId,
-    pub user_id_b: UserId,
-    pub a_to_b: bool,
-    pub should_notify: bool,
-    pub accepted: bool,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-    #[sea_orm(
-        belongs_to = "super::room_participant::Entity",
-        from = "Column::UserIdA",
-        to = "super::room_participant::Column::UserId"
-    )]
-    UserARoomParticipant,
-    #[sea_orm(
-        belongs_to = "super::room_participant::Entity",
-        from = "Column::UserIdB",
-        to = "super::room_participant::Column::UserId"
-    )]
-    UserBRoomParticipant,
-}
-
-impl ActiveModelBehavior for ActiveModel {}
diff --git a/crates/collab/src/db/tables/contributor.rs b/crates/collab/src/db/tables/contributor.rs
deleted file mode 100644
index 3ae96a62d9..0000000000
--- a/crates/collab/src/db/tables/contributor.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-use crate::db::UserId;
-use sea_orm::entity::prelude::*;
-use serde::Serialize;
-
-/// A user who has signed the CLA.
-#[derive(Clone, Debug, Default, PartialEq, Eq, DeriveEntityModel, Serialize)]
-#[sea_orm(table_name = "contributors")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub user_id: UserId,
-    pub signed_at: DateTime,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-    #[sea_orm(
-        belongs_to = "super::user::Entity",
-        from = "Column::UserId",
-        to = "super::user::Column::Id"
-    )]
-    User,
-}
-
-impl ActiveModelBehavior for ActiveModel {}
-
-impl Related<super::user::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::User.def()
-    }
-}
diff --git a/crates/collab/src/db/tables/extension.rs b/crates/collab/src/db/tables/extension.rs
deleted file mode 100644
index 5a1462c701..0000000000
--- a/crates/collab/src/db/tables/extension.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-use crate::db::ExtensionId;
-use sea_orm::entity::prelude::*;
-
-#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
-#[sea_orm(table_name = "extensions")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub id: ExtensionId,
-    pub external_id: String,
-    pub name: String,
-    pub latest_version: String,
-    pub total_download_count: i64,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-    #[sea_orm(has_one = "super::extension_version::Entity")]
-    LatestVersion,
-}
-
-impl Related<super::extension_version::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::LatestVersion.def()
-    }
-}
-
-impl ActiveModelBehavior for ActiveModel {}
diff --git a/crates/collab/src/db/tables/extension_version.rs b/crates/collab/src/db/tables/extension_version.rs
deleted file mode 100644
index 5e71914ddb..0000000000
--- a/crates/collab/src/db/tables/extension_version.rs
+++ /dev/null
@@ -1,102 +0,0 @@
-use crate::db::ExtensionId;
-use collections::BTreeSet;
-use rpc::ExtensionProvides;
-use sea_orm::entity::prelude::*;
-use time::PrimitiveDateTime;
-
-#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
-#[sea_orm(table_name = "extension_versions")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub extension_id: ExtensionId,
-    #[sea_orm(primary_key)]
-    pub version: String,
-    pub published_at: PrimitiveDateTime,
-    pub authors: String,
-    pub repository: String,
-    pub description: String,
-    pub schema_version: i32,
-    pub wasm_api_version: Option<String>,
-    pub download_count: i64,
-    pub provides_themes: bool,
-    pub provides_icon_themes: bool,
-    pub provides_languages: bool,
-    pub provides_grammars: bool,
-    pub provides_language_servers: bool,
-    pub provides_context_servers: bool,
-    pub provides_agent_servers: bool,
-    pub provides_slash_commands: bool,
-    pub provides_indexed_docs_providers: bool,
-    pub provides_snippets: bool,
-    pub provides_debug_adapters: bool,
-}
-
-impl Model {
-    pub fn provides(&self) -> BTreeSet<ExtensionProvides> {
-        let mut provides = BTreeSet::default();
-        if self.provides_themes {
-            provides.insert(ExtensionProvides::Themes);
-        }
-
-        if self.provides_icon_themes {
-            provides.insert(ExtensionProvides::IconThemes);
-        }
-
-        if self.provides_languages {
-            provides.insert(ExtensionProvides::Languages);
-        }
-
-        if self.provides_grammars {
-            provides.insert(ExtensionProvides::Grammars);
-        }
-
-        if self.provides_language_servers {
-            provides.insert(ExtensionProvides::LanguageServers);
-        }
-
-        if self.provides_context_servers {
-            provides.insert(ExtensionProvides::ContextServers);
-        }
-
-        if self.provides_agent_servers {
-            provides.insert(ExtensionProvides::AgentServers);
-        }
-
-        if self.provides_slash_commands {
-            provides.insert(ExtensionProvides::SlashCommands);
-        }
-
-        if self.provides_indexed_docs_providers {
-            provides.insert(ExtensionProvides::IndexedDocsProviders);
-        }
-
-        if self.provides_snippets {
-            provides.insert(ExtensionProvides::Snippets);
-        }
-
-        if self.provides_debug_adapters {
-            provides.insert(ExtensionProvides::DebugAdapters);
-        }
-
-        provides
-    }
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-    #[sea_orm(
-        belongs_to = "super::extension::Entity",
-        from = "Column::ExtensionId",
-        to = "super::extension::Column::Id"
-        on_condition = r#"super::extension::Column::LatestVersion.into_expr().eq(Column::Version.into_expr())"#
-    )]
-    Extension,
-}
-
-impl Related<super::extension::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Extension.def()
-    }
-}
-
-impl ActiveModelBehavior for ActiveModel {}
diff --git a/crates/collab/src/db/tables/follower.rs b/crates/collab/src/db/tables/follower.rs
deleted file mode 100644
index ffd45434e9..0000000000
--- a/crates/collab/src/db/tables/follower.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-use crate::db::{FollowerId, ProjectId, RoomId, ServerId};
-use rpc::ConnectionId;
-use sea_orm::entity::prelude::*;
-
-#[derive(Clone, Debug, Default, PartialEq, Eq, DeriveEntityModel)]
-#[sea_orm(table_name = "followers")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub id: FollowerId,
-    pub room_id: RoomId,
-    pub project_id: ProjectId,
-    pub leader_connection_server_id: ServerId,
-    pub leader_connection_id: i32,
-    pub follower_connection_server_id: ServerId,
-    pub follower_connection_id: i32,
-}
-
-impl Model {
-    pub fn leader_connection(&self) -> ConnectionId {
-        ConnectionId {
-            owner_id: self.leader_connection_server_id.0 as u32,
-            id: self.leader_connection_id as u32,
-        }
-    }
-
-    pub fn follower_connection(&self) -> ConnectionId {
-        ConnectionId {
-            owner_id: self.follower_connection_server_id.0 as u32,
-            id: self.follower_connection_id as u32,
-        }
-    }
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-    #[sea_orm(
-        belongs_to = "super::room::Entity",
-        from = "Column::RoomId",
-        to = "super::room::Column::Id"
-    )]
-    Room,
-}
-
-impl Related<super::room::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Room.def()
-    }
-}
-
-impl ActiveModelBehavior for ActiveModel {}
diff --git a/crates/collab/src/db/tables/language_server.rs b/crates/collab/src/db/tables/language_server.rs
deleted file mode 100644
index 705aae292b..0000000000
--- a/crates/collab/src/db/tables/language_server.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-use crate::db::ProjectId;
-use sea_orm::entity::prelude::*;
-
-#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
-#[sea_orm(table_name = "language_servers")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub project_id: ProjectId,
-    #[sea_orm(primary_key)]
-    pub id: i64,
-    pub name: String,
-    pub capabilities: String,
-    pub worktree_id: Option<i64>,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-    #[sea_orm(
-        belongs_to = "super::project::Entity",
-        from = "Column::ProjectId",
-        to = "super::project::Column::Id"
-    )]
-    Project,
-}
-
-impl Related<super::project::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Project.def()
-    }
-}
-
-impl ActiveModelBehavior for ActiveModel {}
diff --git a/crates/collab/src/db/tables/notification.rs b/crates/collab/src/db/tables/notification.rs
deleted file mode 100644
index 3105198fa2..0000000000
--- a/crates/collab/src/db/tables/notification.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-use crate::db::{NotificationId, NotificationKindId, UserId};
-use sea_orm::entity::prelude::*;
-use time::PrimitiveDateTime;
-
-#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
-#[sea_orm(table_name = "notifications")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub id: NotificationId,
-    pub created_at: PrimitiveDateTime,
-    pub recipient_id: UserId,
-    pub kind: NotificationKindId,
-    pub entity_id: Option<i32>,
-    pub content: String,
-    pub is_read: bool,
-    pub response: Option<bool>,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-    #[sea_orm(
-        belongs_to = "super::user::Entity",
-        from = "Column::RecipientId",
-        to = "super::user::Column::Id"
-    )]
-    Recipient,
-}
-
-impl ActiveModelBehavior for ActiveModel {}
diff --git a/crates/collab/src/db/tables/notification_kind.rs b/crates/collab/src/db/tables/notification_kind.rs
deleted file mode 100644
index 865b5da04b..0000000000
--- a/crates/collab/src/db/tables/notification_kind.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-use crate::db::NotificationKindId;
-use sea_orm::entity::prelude::*;
-
-#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
-#[sea_orm(table_name = "notification_kinds")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub id: NotificationKindId,
-    pub name: String,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {}
-
-impl ActiveModelBehavior for ActiveModel {}
diff --git a/crates/collab/src/db/tables/observed_buffer_edits.rs b/crates/collab/src/db/tables/observed_buffer_edits.rs
deleted file mode 100644
index e8e7aafaa2..0000000000
--- a/crates/collab/src/db/tables/observed_buffer_edits.rs
+++ /dev/null
@@ -1,43 +0,0 @@
-use crate::db::{BufferId, UserId};
-use sea_orm::entity::prelude::*;
-
-#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
-#[sea_orm(table_name = "observed_buffer_edits")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub user_id: UserId,
-    pub buffer_id: BufferId,
-    pub epoch: i32,
-    pub lamport_timestamp: i32,
-    pub replica_id: i32,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-    #[sea_orm(
-        belongs_to = "super::buffer::Entity",
-        from = "Column::BufferId",
-        to = "super::buffer::Column::Id"
-    )]
-    Buffer,
-    #[sea_orm(
-        belongs_to = "super::user::Entity",
-        from = "Column::UserId",
-        to = "super::user::Column::Id"
-    )]
-    User,
-}
-
-impl Related<super::buffer::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Buffer.def()
-    }
-}
-
-impl Related<super::user::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::User.def()
-    }
-}
-
-impl ActiveModelBehavior for ActiveModel {}
diff --git a/crates/collab/src/db/tables/project.rs b/crates/collab/src/db/tables/project.rs
deleted file mode 100644
index 11a9b972eb..0000000000
--- a/crates/collab/src/db/tables/project.rs
+++ /dev/null
@@ -1,93 +0,0 @@
-use crate::db::{ProjectId, Result, RoomId, ServerId, UserId};
-use anyhow::Context as _;
-use rpc::ConnectionId;
-use sea_orm::entity::prelude::*;
-
-#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
-#[sea_orm(table_name = "projects")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub id: ProjectId,
-    pub room_id: Option<RoomId>,
-    pub host_user_id: Option<UserId>,
-    pub host_connection_id: Option<i32>,
-    pub host_connection_server_id: Option<ServerId>,
-    pub windows_paths: bool,
-}
-
-impl Model {
-    pub fn host_connection(&self) -> Result<ConnectionId> {
-        let host_connection_server_id = self
-            .host_connection_server_id
-            .context("empty host_connection_server_id")?;
-        let host_connection_id = self
-            .host_connection_id
-            .context("empty host_connection_id")?;
-        Ok(ConnectionId {
-            owner_id: host_connection_server_id.0 as u32,
-            id: host_connection_id as u32,
-        })
-    }
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-    #[sea_orm(
-        belongs_to = "super::user::Entity",
-        from = "Column::HostUserId",
-        to = "super::user::Column::Id"
-    )]
-    HostUser,
-    #[sea_orm(
-        belongs_to = "super::room::Entity",
-        from = "Column::RoomId",
-        to = "super::room::Column::Id"
-    )]
-    Room,
-    #[sea_orm(has_many = "super::worktree::Entity")]
-    Worktrees,
-    #[sea_orm(has_many = "super::project_repository::Entity")]
-    Repositories,
-    #[sea_orm(has_many = "super::project_collaborator::Entity")]
-    Collaborators,
-    #[sea_orm(has_many = "super::language_server::Entity")]
-    LanguageServers,
-}
-
-impl Related<super::user::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::HostUser.def()
-    }
-}
-
-impl Related<super::room::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Room.def()
-    }
-}
-
-impl Related<super::worktree::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Worktrees.def()
-    }
-}
-
-impl Related<super::project_repository::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Repositories.def()
-    }
-}
-
-impl Related<super::project_collaborator::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Collaborators.def()
-    }
-}
-
-impl Related<super::language_server::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::LanguageServers.def()
-    }
-}
-
-impl ActiveModelBehavior for ActiveModel {}
diff --git a/crates/collab/src/db/tables/project_collaborator.rs b/crates/collab/src/db/tables/project_collaborator.rs
deleted file mode 100644
index 1564abdf46..0000000000
--- a/crates/collab/src/db/tables/project_collaborator.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-use crate::db::{ProjectCollaboratorId, ProjectId, ReplicaId, ServerId, UserId};
-use rpc::ConnectionId;
-use sea_orm::entity::prelude::*;
-
-#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
-#[sea_orm(table_name = "project_collaborators")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub id: ProjectCollaboratorId,
-    pub project_id: ProjectId,
-    pub connection_id: i32,
-    pub connection_server_id: ServerId,
-    pub user_id: UserId,
-    pub replica_id: ReplicaId,
-    pub is_host: bool,
-    pub committer_name: Option<String>,
-    pub committer_email: Option<String>,
-}
-
-impl Model {
-    pub fn connection(&self) -> ConnectionId {
-        ConnectionId {
-            owner_id: self.connection_server_id.0 as u32,
-            id: self.connection_id as u32,
-        }
-    }
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-    #[sea_orm(
-        belongs_to = "super::project::Entity",
-        from = "Column::ProjectId",
-        to = "super::project::Column::Id"
-    )]
-    Project,
-}
-
-impl Related<super::project::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Project.def()
-    }
-}
-
-impl ActiveModelBehavior for ActiveModel {}
diff --git a/crates/collab/src/db/tables/project_repository.rs b/crates/collab/src/db/tables/project_repository.rs
deleted file mode 100644
index 190ae8d79c..0000000000
--- a/crates/collab/src/db/tables/project_repository.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-use crate::db::ProjectId;
-use sea_orm::entity::prelude::*;
-
-#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
-#[sea_orm(table_name = "project_repositories")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub project_id: ProjectId,
-    #[sea_orm(primary_key)]
-    pub id: i64,
-    pub abs_path: String,
-    pub legacy_worktree_id: Option<i64>,
-    // JSON array containing 1 or more integer project entry ids
-    pub entry_ids: String,
-    pub scan_id: i64,
-    pub is_deleted: bool,
-    // JSON array typed string
-    pub current_merge_conflicts: Option<String>,
-    // The suggested merge commit message
-    pub merge_message: Option<String>,
-    // A JSON object representing the current Branch values
-    pub branch_summary: Option<String>,
-    // A JSON object representing the current Head commit values
-    pub head_commit_details: Option<String>,
-    pub remote_upstream_url: Option<String>,
-    pub remote_origin_url: Option<String>,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-    #[sea_orm(
-        belongs_to = "super::project::Entity",
-        from = "Column::ProjectId",
-        to = "super::project::Column::Id"
-    )]
-    Project,
-}
-
-impl Related<super::project::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Project.def()
-    }
-}
-
-impl ActiveModelBehavior for ActiveModel {}
diff --git a/crates/collab/src/db/tables/project_repository_statuses.rs b/crates/collab/src/db/tables/project_repository_statuses.rs
deleted file mode 100644
index 7bb903d450..0000000000
--- a/crates/collab/src/db/tables/project_repository_statuses.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-use crate::db::ProjectId;
-use sea_orm::entity::prelude::*;
-
-#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
-#[sea_orm(table_name = "project_repository_statuses")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub project_id: ProjectId,
-    #[sea_orm(primary_key)]
-    pub repository_id: i64,
-    #[sea_orm(primary_key)]
-    pub repo_path: String,
-    /// Old single-code status field, no longer used but kept here to mirror the DB schema.
-    pub status: i64,
-    pub status_kind: StatusKind,
-    /// For unmerged entries, this is the `first_head` status. For tracked entries, this is the `index_status`.
-    pub first_status: Option<i32>,
-    /// For unmerged entries, this is the `second_head` status. For tracked entries, this is the `worktree_status`.
-    pub second_status: Option<i32>,
-    pub scan_id: i64,
-    pub is_deleted: bool,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
-#[sea_orm(rs_type = "i32", db_type = "Integer")]
-pub enum StatusKind {
-    Untracked = 0,
-    Ignored = 1,
-    Unmerged = 2,
-    Tracked = 3,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {}
-
-impl ActiveModelBehavior for ActiveModel {}
diff --git a/crates/collab/src/db/tables/room.rs b/crates/collab/src/db/tables/room.rs
deleted file mode 100644
index f72f7000a7..0000000000
--- a/crates/collab/src/db/tables/room.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-use crate::db::{ChannelId, RoomId};
-use sea_orm::entity::prelude::*;
-
-#[derive(Clone, Default, Debug, PartialEq, Eq, DeriveEntityModel)]
-#[sea_orm(table_name = "rooms")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub id: RoomId,
-    pub live_kit_room: String,
-    pub channel_id: Option<ChannelId>,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-    #[sea_orm(has_many = "super::room_participant::Entity")]
-    RoomParticipant,
-    #[sea_orm(has_many = "super::project::Entity")]
-    Project,
-    #[sea_orm(has_many = "super::follower::Entity")]
-    Follower,
-    #[sea_orm(
-        belongs_to = "super::channel::Entity",
-        from = "Column::ChannelId",
-        to = "super::channel::Column::Id"
-    )]
-    Channel,
-}
-
-impl Related<super::room_participant::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::RoomParticipant.def()
-    }
-}
-
-impl Related<super::project::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Project.def()
-    }
-}
-
-impl Related<super::follower::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Follower.def()
-    }
-}
-
-impl Related<super::channel::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Channel.def()
-    }
-}
-
-impl ActiveModelBehavior for ActiveModel {}
diff --git a/crates/collab/src/db/tables/room_participant.rs b/crates/collab/src/db/tables/room_participant.rs
deleted file mode 100644
index c562111e96..0000000000
--- a/crates/collab/src/db/tables/room_participant.rs
+++ /dev/null
@@ -1,62 +0,0 @@
-use crate::db::{ChannelRole, ProjectId, RoomId, RoomParticipantId, ServerId, UserId};
-use rpc::ConnectionId;
-use sea_orm::entity::prelude::*;
-
-#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
-#[sea_orm(table_name = "room_participants")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub id: RoomParticipantId,
-    pub room_id: RoomId,
-    pub user_id: UserId,
-    pub answering_connection_id: Option<i32>,
-    pub answering_connection_server_id: Option<ServerId>,
-    pub answering_connection_lost: bool,
-    pub location_kind: Option<i32>,
-    pub location_project_id: Option<ProjectId>,
-    pub initial_project_id: Option<ProjectId>,
-    pub calling_user_id: UserId,
-    pub calling_connection_id: i32,
-    pub calling_connection_server_id: Option<ServerId>,
-    pub participant_index: Option<i32>,
-    pub role: Option<ChannelRole>,
-}
-
-impl Model {
-    pub fn answering_connection(&self) -> Option<ConnectionId> {
-        Some(ConnectionId {
-            owner_id: self.answering_connection_server_id?.0 as u32,
-            id: self.answering_connection_id? as u32,
-        })
-    }
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-    #[sea_orm(
-        belongs_to = "super::user::Entity",
-        from = "Column::UserId",
-        to = "super::user::Column::Id"
-    )]
-    User,
-    #[sea_orm(
-        belongs_to = "super::room::Entity",
-        from = "Column::RoomId",
-        to = "super::room::Column::Id"
-    )]
-    Room,
-}
-
-impl Related<super::user::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::User.def()
-    }
-}
-
-impl Related<super::room::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Room.def()
-    }
-}
-
-impl ActiveModelBehavior for ActiveModel {}
diff --git a/crates/collab/src/db/tables/server.rs b/crates/collab/src/db/tables/server.rs
deleted file mode 100644
index ea847bdf74..0000000000
--- a/crates/collab/src/db/tables/server.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-use crate::db::ServerId;
-use sea_orm::entity::prelude::*;
-
-#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
-#[sea_orm(table_name = "servers")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub id: ServerId,
-    pub environment: String,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {}
-
-impl ActiveModelBehavior for ActiveModel {}
diff --git a/crates/collab/src/db/tables/user.rs b/crates/collab/src/db/tables/user.rs
deleted file mode 100644
index 3f753954eb..0000000000
--- a/crates/collab/src/db/tables/user.rs
+++ /dev/null
@@ -1,66 +0,0 @@
-use crate::db::UserId;
-use chrono::NaiveDateTime;
-use sea_orm::entity::prelude::*;
-use serde::Serialize;
-
-/// A user model.
-#[derive(Clone, Debug, Default, PartialEq, Eq, DeriveEntityModel, Serialize)]
-#[sea_orm(table_name = "users")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub id: UserId,
-    pub github_login: String,
-    pub github_user_id: i32,
-    pub github_user_created_at: Option<NaiveDateTime>,
-    pub email_address: Option<String>,
-    pub name: Option<String>,
-    pub admin: bool,
-    pub invite_code: Option<String>,
-    pub invite_count: i32,
-    pub inviter_id: Option<UserId>,
-    pub connected_once: bool,
-    pub metrics_id: Uuid,
-    pub created_at: NaiveDateTime,
-    pub accepted_tos_at: Option<NaiveDateTime>,
-    pub custom_llm_monthly_allowance_in_cents: Option<i32>,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-    #[sea_orm(has_many = "super::access_token::Entity")]
-    AccessToken,
-    #[sea_orm(has_one = "super::room_participant::Entity")]
-    RoomParticipant,
-    #[sea_orm(has_many = "super::project::Entity")]
-    HostedProjects,
-    #[sea_orm(has_many = "super::channel_member::Entity")]
-    ChannelMemberships,
-    #[sea_orm(has_one = "super::contributor::Entity")]
-    Contributor,
-}
-
-impl Related<super::access_token::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::AccessToken.def()
-    }
-}
-
-impl Related<super::room_participant::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::RoomParticipant.def()
-    }
-}
-
-impl Related<super::project::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::HostedProjects.def()
-    }
-}
-
-impl Related<super::channel_member::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::ChannelMemberships.def()
-    }
-}
-
-impl ActiveModelBehavior for ActiveModel {}
diff --git a/crates/collab/src/db/tables/worktree.rs b/crates/collab/src/db/tables/worktree.rs
deleted file mode 100644
index 46d9877dff..0000000000
--- a/crates/collab/src/db/tables/worktree.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-use crate::db::ProjectId;
-use sea_orm::entity::prelude::*;
-
-#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
-#[sea_orm(table_name = "worktrees")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub id: i64,
-    #[sea_orm(primary_key)]
-    pub project_id: ProjectId,
-    pub abs_path: String,
-    pub root_name: String,
-    pub visible: bool,
-    /// The last scan for which we've observed entries. It may be in progress.
-    pub scan_id: i64,
-    /// The last scan that fully completed.
-    pub completed_scan_id: i64,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-    #[sea_orm(
-        belongs_to = "super::project::Entity",
-        from = "Column::ProjectId",
-        to = "super::project::Column::Id"
-    )]
-    Project,
-}
-
-impl Related<super::project::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Project.def()
-    }
-}
-
-impl ActiveModelBehavior for ActiveModel {}
diff --git a/crates/collab/src/db/tables/worktree_diagnostic_summary.rs b/crates/collab/src/db/tables/worktree_diagnostic_summary.rs
deleted file mode 100644
index 5620ed255f..0000000000
--- a/crates/collab/src/db/tables/worktree_diagnostic_summary.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-use crate::db::ProjectId;
-use sea_orm::entity::prelude::*;
-
-#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
-#[sea_orm(table_name = "worktree_diagnostic_summaries")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub project_id: ProjectId,
-    #[sea_orm(primary_key)]
-    pub worktree_id: i64,
-    #[sea_orm(primary_key)]
-    pub path: String,
-    pub language_server_id: i64,
-    pub error_count: i32,
-    pub warning_count: i32,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {}
-
-impl ActiveModelBehavior for ActiveModel {}
diff --git a/crates/collab/src/db/tables/worktree_entry.rs b/crates/collab/src/db/tables/worktree_entry.rs
deleted file mode 100644
index 1a28203977..0000000000
--- a/crates/collab/src/db/tables/worktree_entry.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-use crate::db::ProjectId;
-use sea_orm::entity::prelude::*;
-
-#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
-#[sea_orm(table_name = "worktree_entries")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub project_id: ProjectId,
-    #[sea_orm(primary_key)]
-    pub worktree_id: i64,
-    #[sea_orm(primary_key)]
-    pub id: i64,
-    pub is_dir: bool,
-    pub path: String,
-    pub inode: i64,
-    pub mtime_seconds: i64,
-    pub mtime_nanos: i32,
-    pub git_status: Option<i64>,
-    pub is_ignored: bool,
-    pub is_external: bool,
-    pub is_deleted: bool,
-    pub is_hidden: bool,
-    pub scan_id: i64,
-    pub is_fifo: bool,
-    pub canonical_path: Option<String>,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {}
-
-impl ActiveModelBehavior for ActiveModel {}
diff --git a/crates/collab/src/db/tables/worktree_settings_file.rs b/crates/collab/src/db/tables/worktree_settings_file.rs
deleted file mode 100644
index bed2de55ef..0000000000
--- a/crates/collab/src/db/tables/worktree_settings_file.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-use crate::db::ProjectId;
-use sea_orm::entity::prelude::*;
-
-#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
-#[sea_orm(table_name = "worktree_settings_files")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub project_id: ProjectId,
-    #[sea_orm(primary_key)]
-    pub worktree_id: i64,
-    #[sea_orm(primary_key)]
-    pub path: String,
-    pub content: String,
-    pub kind: LocalSettingsKind,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {}
-
-impl ActiveModelBehavior for ActiveModel {}
-
-#[derive(
-    Copy, Clone, Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, Default, Hash, serde::Serialize,
-)]
-#[sea_orm(rs_type = "String", db_type = "String(StringLen::None)")]
-#[serde(rename_all = "snake_case")]
-pub enum LocalSettingsKind {
-    #[default]
-    #[sea_orm(string_value = "settings")]
-    Settings,
-    #[sea_orm(string_value = "tasks")]
-    Tasks,
-    #[sea_orm(string_value = "editorconfig")]
-    Editorconfig,
-    #[sea_orm(string_value = "debug")]
-    Debug,
-}
diff --git a/crates/collab/src/db/tests.rs b/crates/collab/src/db/tests.rs
deleted file mode 100644
index 10a32691ed..0000000000
--- a/crates/collab/src/db/tests.rs
+++ /dev/null
@@ -1,219 +0,0 @@
-mod buffer_tests;
-mod channel_tests;
-mod contributor_tests;
-mod db_tests;
-mod extension_tests;
-mod migrations;
-
-use std::sync::Arc;
-use std::sync::atomic::{AtomicI32, Ordering::SeqCst};
-use std::time::Duration;
-
-use gpui::BackgroundExecutor;
-use parking_lot::Mutex;
-use rand::prelude::*;
-use sea_orm::ConnectionTrait;
-use sqlx::migrate::MigrateDatabase;
-
-use self::migrations::run_database_migrations;
-
-use super::*;
-
-pub struct TestDb {
-    pub db: Option<Arc<Database>>,
-    pub connection: Option<sqlx::AnyConnection>,
-}
-
-impl TestDb {
-    pub fn sqlite(executor: BackgroundExecutor) -> Self {
-        let url = "sqlite::memory:";
-        let runtime = tokio::runtime::Builder::new_current_thread()
-            .enable_io()
-            .enable_time()
-            .build()
-            .unwrap();
-
-        let mut db = runtime.block_on(async {
-            let mut options = ConnectOptions::new(url);
-            options.max_connections(5);
-            let mut db = Database::new(options).await.unwrap();
-            let sql = include_str!(concat!(
-                env!("CARGO_MANIFEST_DIR"),
-                "/migrations.sqlite/20221109000000_test_schema.sql"
-            ));
-            db.pool
-                .execute(sea_orm::Statement::from_string(
-                    db.pool.get_database_backend(),
-                    sql,
-                ))
-                .await
-                .unwrap();
-            db.initialize_notification_kinds().await.unwrap();
-            db
-        });
-
-        db.test_options = Some(DatabaseTestOptions {
-            executor,
-            runtime,
-            query_failure_probability: parking_lot::Mutex::new(0.0),
-        });
-
-        Self {
-            db: Some(Arc::new(db)),
-            connection: None,
-        }
-    }
-
-    pub fn postgres(executor: BackgroundExecutor) -> Self {
-        static LOCK: Mutex<()> = Mutex::new(());
-
-        let _guard = LOCK.lock();
-        let mut rng = StdRng::from_os_rng();
-        let url = format!(
-            "postgres://postgres@localhost/zed-test-{}",
-            rng.random::<u128>()
-        );
-        let runtime = tokio::runtime::Builder::new_current_thread()
-            .enable_io()
-            .enable_time()
-            .build()
-            .unwrap();
-
-        let mut db = runtime.block_on(async {
-            sqlx::Postgres::create_database(&url)
-                .await
-                .expect("failed to create test db");
-            let mut options = ConnectOptions::new(url);
-            options
-                .max_connections(5)
-                .idle_timeout(Duration::from_secs(0));
-            let mut db = Database::new(options).await.unwrap();
-            let migrations_path = concat!(env!("CARGO_MANIFEST_DIR"), "/migrations");
-            run_database_migrations(db.options(), migrations_path)
-                .await
-                .unwrap();
-            db.initialize_notification_kinds().await.unwrap();
-            db
-        });
-
-        db.test_options = Some(DatabaseTestOptions {
-            executor,
-            runtime,
-            query_failure_probability: parking_lot::Mutex::new(0.0),
-        });
-
-        Self {
-            db: Some(Arc::new(db)),
-            connection: None,
-        }
-    }
-
-    pub fn db(&self) -> &Arc<Database> {
-        self.db.as_ref().unwrap()
-    }
-
-    pub fn set_query_failure_probability(&self, probability: f64) {
-        let database = self.db.as_ref().unwrap();
-        let test_options = database.test_options.as_ref().unwrap();
-        *test_options.query_failure_probability.lock() = probability;
-    }
-}
-
-#[macro_export]
-macro_rules! test_both_dbs {
-    ($test_name:ident, $postgres_test_name:ident, $sqlite_test_name:ident) => {
-        #[cfg(target_os = "macos")]
-        #[gpui::test]
-        async fn $postgres_test_name(cx: &mut gpui::TestAppContext) {
-            let test_db = $crate::db::TestDb::postgres(cx.executor().clone());
-            $test_name(test_db.db()).await;
-        }
-
-        #[gpui::test]
-        async fn $sqlite_test_name(cx: &mut gpui::TestAppContext) {
-            let test_db = $crate::db::TestDb::sqlite(cx.executor().clone());
-            $test_name(test_db.db()).await;
-        }
-    };
-}
-
-impl Drop for TestDb {
-    fn drop(&mut self) {
-        let db = self.db.take().unwrap();
-        if let sea_orm::DatabaseBackend::Postgres = db.pool.get_database_backend() {
-            db.test_options.as_ref().unwrap().runtime.block_on(async {
-                use util::ResultExt;
-                let query = "
-                        SELECT pg_terminate_backend(pg_stat_activity.pid)
-                        FROM pg_stat_activity
-                        WHERE
-                            pg_stat_activity.datname = current_database() AND
-                            pid <> pg_backend_pid();
-                    ";
-                db.pool
-                    .execute(sea_orm::Statement::from_string(
-                        db.pool.get_database_backend(),
-                        query,
-                    ))
-                    .await
-                    .log_err();
-                sqlx::Postgres::drop_database(db.options.get_url())
-                    .await
-                    .log_err();
-            })
-        }
-    }
-}
-
-#[track_caller]
-fn assert_channel_tree_matches(actual: Vec<Channel>, expected: Vec<Channel>) {
-    let expected_channels = expected.into_iter().collect::<HashSet<_>>();
-    let actual_channels = actual.into_iter().collect::<HashSet<_>>();
-    pretty_assertions::assert_eq!(expected_channels, actual_channels);
-}
-
-fn channel_tree(channels: &[(ChannelId, &[ChannelId], &'static str)]) -> Vec<Channel> {
-    use std::collections::HashMap;
-
-    let mut result = Vec::new();
-    let mut order_by_parent: HashMap<Vec<ChannelId>, i32> = HashMap::new();
-
-    for (id, parent_path, name) in channels {
-        let parent_key = parent_path.to_vec();
-        let order = if parent_key.is_empty() {
-            1
-        } else {
-            *order_by_parent
-                .entry(parent_key.clone())
-                .and_modify(|e| *e += 1)
-                .or_insert(1)
-        };
-
-        result.push(Channel {
-            id: *id,
-            name: (*name).to_owned(),
-            visibility: ChannelVisibility::Members,
-            parent_path: parent_key,
-            channel_order: order,
-        });
-    }
-
-    result
-}
-
-static GITHUB_USER_ID: AtomicI32 = AtomicI32::new(5);
-
-async fn new_test_user(db: &Arc<Database>, email: &str) -> UserId {
-    db.create_user(
-        email,
-        None,
-        false,
-        NewUserParams {
-            github_login: email[0..email.find('@').unwrap()].to_string(),
-            github_user_id: GITHUB_USER_ID.fetch_add(1, SeqCst),
-        },
-    )
-    .await
-    .unwrap()
-    .user_id
-}
diff --git a/crates/collab/src/db/tests/buffer_tests.rs b/crates/collab/src/db/tests/buffer_tests.rs
deleted file mode 100644
index 4eae7a54cb..0000000000
--- a/crates/collab/src/db/tests/buffer_tests.rs
+++ /dev/null
@@ -1,361 +0,0 @@
-use super::*;
-use crate::test_both_dbs;
-use language::proto::{self, serialize_version};
-use text::{Buffer, ReplicaId};
-
-test_both_dbs!(
-    test_channel_buffers,
-    test_channel_buffers_postgres,
-    test_channel_buffers_sqlite
-);
-
-async fn test_channel_buffers(db: &Arc<Database>) {
-    let a_id = db
-        .create_user(
-            "user_a@example.com",
-            None,
-            false,
-            NewUserParams {
-                github_login: "user_a".into(),
-                github_user_id: 101,
-            },
-        )
-        .await
-        .unwrap()
-        .user_id;
-    let b_id = db
-        .create_user(
-            "user_b@example.com",
-            None,
-            false,
-            NewUserParams {
-                github_login: "user_b".into(),
-                github_user_id: 102,
-            },
-        )
-        .await
-        .unwrap()
-        .user_id;
-
-    // This user will not be a part of the channel
-    let c_id = db
-        .create_user(
-            "user_c@example.com",
-            None,
-            false,
-            NewUserParams {
-                github_login: "user_c".into(),
-                github_user_id: 103,
-            },
-        )
-        .await
-        .unwrap()
-        .user_id;
-
-    let owner_id = db.create_server("production").await.unwrap().0 as u32;
-
-    let zed_id = db.create_root_channel("zed", a_id).await.unwrap();
-
-    db.invite_channel_member(zed_id, b_id, a_id, ChannelRole::Member)
-        .await
-        .unwrap();
-
-    db.respond_to_channel_invite(zed_id, b_id, true)
-        .await
-        .unwrap();
-
-    let connection_id_a = ConnectionId { owner_id, id: 1 };
-    let _ = db
-        .join_channel_buffer(zed_id, a_id, connection_id_a)
-        .await
-        .unwrap();
-
-    let mut buffer_a = Buffer::new(
-        ReplicaId::new(0),
-        text::BufferId::new(1).unwrap(),
-        "".to_string(),
-    );
-    let operations = vec![
-        buffer_a.edit([(0..0, "hello world")]),
-        buffer_a.edit([(5..5, ", cruel")]),
-        buffer_a.edit([(0..5, "goodbye")]),
-        buffer_a.undo().unwrap().1,
-    ];
-    assert_eq!(buffer_a.text(), "hello, cruel world");
-
-    let operations = operations
-        .into_iter()
-        .map(|op| proto::serialize_operation(&language::Operation::Buffer(op)))
-        .collect::<Vec<_>>();
-
-    db.update_channel_buffer(zed_id, a_id, &operations)
-        .await
-        .unwrap();
-
-    let connection_id_b = ConnectionId { owner_id, id: 2 };
-    let buffer_response_b = db
-        .join_channel_buffer(zed_id, b_id, connection_id_b)
-        .await
-        .unwrap();
-
-    let mut buffer_b = Buffer::new(
-        ReplicaId::new(0),
-        text::BufferId::new(1).unwrap(),
-        buffer_response_b.base_text,
-    );
-    buffer_b.apply_ops(buffer_response_b.operations.into_iter().map(|operation| {
-        let operation = proto::deserialize_operation(operation).unwrap();
-        if let language::Operation::Buffer(operation) = operation {
-            operation
-        } else {
-            unreachable!()
-        }
-    }));
-
-    assert_eq!(buffer_b.text(), "hello, cruel world");
-
-    // Ensure that C fails to open the buffer
-    assert!(
-        db.join_channel_buffer(zed_id, c_id, ConnectionId { owner_id, id: 3 })
-            .await
-            .is_err()
-    );
-
-    // Ensure that both collaborators have shown up
-    assert_eq!(
-        buffer_response_b.collaborators,
-        &[
-            rpc::proto::Collaborator {
-                user_id: a_id.to_proto(),
-                peer_id: Some(rpc::proto::PeerId { id: 1, owner_id }),
-                replica_id: ReplicaId::FIRST_COLLAB_ID.as_u16() as u32,
-                is_host: false,
-                committer_name: None,
-                committer_email: None,
-            },
-            rpc::proto::Collaborator {
-                user_id: b_id.to_proto(),
-                peer_id: Some(rpc::proto::PeerId { id: 2, owner_id }),
-                replica_id: ReplicaId::FIRST_COLLAB_ID.as_u16() as u32 + 1,
-                is_host: false,
-                committer_name: None,
-                committer_email: None,
-            }
-        ]
-    );
-
-    // Ensure that get_channel_buffer_collaborators works
-    let zed_collaborats = db.get_channel_buffer_collaborators(zed_id).await.unwrap();
-    assert_eq!(zed_collaborats, &[a_id, b_id]);
-
-    let left_buffer = db
-        .leave_channel_buffer(zed_id, connection_id_b)
-        .await
-        .unwrap();
-
-    assert_eq!(left_buffer.connections, &[connection_id_a],);
-
-    let cargo_id = db.create_root_channel("cargo", a_id).await.unwrap();
-    let _ = db
-        .join_channel_buffer(cargo_id, a_id, connection_id_a)
-        .await
-        .unwrap();
-
-    db.leave_channel_buffers(connection_id_a).await.unwrap();
-
-    let zed_collaborators = db.get_channel_buffer_collaborators(zed_id).await.unwrap();
-    let cargo_collaborators = db.get_channel_buffer_collaborators(cargo_id).await.unwrap();
-    assert_eq!(zed_collaborators, &[]);
-    assert_eq!(cargo_collaborators, &[]);
-
-    // When everyone has left the channel, the operations are collapsed into
-    // a new base text.
-    let buffer_response_b = db
-        .join_channel_buffer(zed_id, b_id, connection_id_b)
-        .await
-        .unwrap();
-    assert_eq!(buffer_response_b.base_text, "hello, cruel world");
-    assert_eq!(buffer_response_b.operations, &[]);
-}
-
-test_both_dbs!(
-    test_channel_buffers_last_operations,
-    test_channel_buffers_last_operations_postgres,
-    test_channel_buffers_last_operations_sqlite
-);
-
-async fn test_channel_buffers_last_operations(db: &Database) {
-    let user_id = db
-        .create_user(
-            "user_a@example.com",
-            None,
-            false,
-            NewUserParams {
-                github_login: "user_a".into(),
-                github_user_id: 101,
-            },
-        )
-        .await
-        .unwrap()
-        .user_id;
-    let observer_id = db
-        .create_user(
-            "user_b@example.com",
-            None,
-            false,
-            NewUserParams {
-                github_login: "user_b".into(),
-                github_user_id: 102,
-            },
-        )
-        .await
-        .unwrap()
-        .user_id;
-    let owner_id = db.create_server("production").await.unwrap().0 as u32;
-    let connection_id = ConnectionId {
-        owner_id,
-        id: user_id.0 as u32,
-    };
-
-    let mut buffers = Vec::new();
-    let mut text_buffers = Vec::new();
-    for i in 0..3 {
-        let channel = db
-            .create_root_channel(&format!("channel-{i}"), user_id)
-            .await
-            .unwrap();
-
-        db.invite_channel_member(channel, observer_id, user_id, ChannelRole::Member)
-            .await
-            .unwrap();
-        db.respond_to_channel_invite(channel, observer_id, true)
-            .await
-            .unwrap();
-
-        let res = db
-            .join_channel_buffer(channel, user_id, connection_id)
-            .await
-            .unwrap();
-
-        buffers.push(
-            db.transaction(|tx| async move { db.get_channel_buffer(channel, &tx).await })
-                .await
-                .unwrap(),
-        );
-
-        text_buffers.push(Buffer::new(
-            ReplicaId::new(res.replica_id as u16),
-            text::BufferId::new(1).unwrap(),
-            "".to_string(),
-        ));
-    }
-
-    update_buffer(
-        buffers[0].channel_id,
-        user_id,
-        db,
-        vec![
-            text_buffers[0].edit([(0..0, "a")]),
-            text_buffers[0].edit([(0..0, "b")]),
-            text_buffers[0].edit([(0..0, "c")]),
-        ],
-    )
-    .await;
-
-    update_buffer(
-        buffers[1].channel_id,
-        user_id,
-        db,
-        vec![
-            text_buffers[1].edit([(0..0, "d")]),
-            text_buffers[1].edit([(1..1, "e")]),
-            text_buffers[1].edit([(2..2, "f")]),
-        ],
-    )
-    .await;
-
-    // cause buffer 1's epoch to increment.
-    db.leave_channel_buffer(buffers[1].channel_id, connection_id)
-        .await
-        .unwrap();
-    db.join_channel_buffer(buffers[1].channel_id, user_id, connection_id)
-        .await
-        .unwrap();
-    let replica_id = text_buffers[1].replica_id();
-    text_buffers[1] = Buffer::new(
-        replica_id,
-        text::BufferId::new(1).unwrap(),
-        "def".to_string(),
-    );
-    update_buffer(
-        buffers[1].channel_id,
-        user_id,
-        db,
-        vec![
-            text_buffers[1].edit([(0..0, "g")]),
-            text_buffers[1].edit([(0..0, "h")]),
-        ],
-    )
-    .await;
-
-    update_buffer(
-        buffers[2].channel_id,
-        user_id,
-        db,
-        vec![text_buffers[2].edit([(0..0, "i")])],
-    )
-    .await;
-
-    let channels_for_user = db.get_channels_for_user(user_id).await.unwrap();
-
-    pretty_assertions::assert_eq!(
-        channels_for_user.latest_buffer_versions,
-        [
-            rpc::proto::ChannelBufferVersion {
-                channel_id: buffers[0].channel_id.to_proto(),
-                epoch: 0,
-                version: serialize_version(&text_buffers[0].version())
-                    .into_iter()
-                    .filter(
-                        |vector| vector.replica_id == text_buffers[0].replica_id().as_u16() as u32
-                    )
-                    .collect::<Vec<_>>(),
-            },
-            rpc::proto::ChannelBufferVersion {
-                channel_id: buffers[1].channel_id.to_proto(),
-                epoch: 1,
-                version: serialize_version(&text_buffers[1].version())
-                    .into_iter()
-                    .filter(
-                        |vector| vector.replica_id == text_buffers[1].replica_id().as_u16() as u32
-                    )
-                    .collect::<Vec<_>>(),
-            },
-            rpc::proto::ChannelBufferVersion {
-                channel_id: buffers[2].channel_id.to_proto(),
-                epoch: 0,
-                version: serialize_version(&text_buffers[2].version())
-                    .into_iter()
-                    .filter(
-                        |vector| vector.replica_id == text_buffers[2].replica_id().as_u16() as u32
-                    )
-                    .collect::<Vec<_>>(),
-            },
-        ]
-    );
-}
-
-async fn update_buffer(
-    channel_id: ChannelId,
-    user_id: UserId,
-    db: &Database,
-    operations: Vec<text::Operation>,
-) {
-    let operations = operations
-        .into_iter()
-        .map(|op| proto::serialize_operation(&language::Operation::Buffer(op)))
-        .collect::<Vec<_>>();
-    db.update_channel_buffer(channel_id, user_id, &operations)
-        .await
-        .unwrap();
-}
diff --git a/crates/collab/src/db/tests/channel_tests.rs b/crates/collab/src/db/tests/channel_tests.rs
deleted file mode 100644
index 705dbba5ea..0000000000
--- a/crates/collab/src/db/tests/channel_tests.rs
+++ /dev/null
@@ -1,982 +0,0 @@
-use crate::{
-    db::{
-        Channel, ChannelId, ChannelRole, Database, NewUserParams, RoomId, UserId,
-        tests::{assert_channel_tree_matches, channel_tree, new_test_user},
-    },
-    test_both_dbs,
-};
-use rpc::{
-    ConnectionId,
-    proto::{self, reorder_channel},
-};
-use std::{collections::HashSet, sync::Arc};
-
-test_both_dbs!(test_channels, test_channels_postgres, test_channels_sqlite);
-
-async fn test_channels(db: &Arc<Database>) {
-    let a_id = new_test_user(db, "user1@example.com").await;
-    let b_id = new_test_user(db, "user2@example.com").await;
-
-    let zed_id = db.create_root_channel("zed", a_id).await.unwrap();
-
-    // Make sure that people cannot read channels they haven't been invited to
-    assert!(db.get_channel(zed_id, b_id).await.is_err());
-
-    db.invite_channel_member(zed_id, b_id, a_id, ChannelRole::Member)
-        .await
-        .unwrap();
-
-    db.respond_to_channel_invite(zed_id, b_id, true)
-        .await
-        .unwrap();
-
-    let crdb_id = db.create_sub_channel("crdb", zed_id, a_id).await.unwrap();
-    let livestreaming_id = db
-        .create_sub_channel("livestreaming", zed_id, a_id)
-        .await
-        .unwrap();
-    let replace_id = db
-        .create_sub_channel("replace", zed_id, a_id)
-        .await
-        .unwrap();
-
-    let (members, _) = db
-        .get_channel_participant_details(replace_id, "", 10, a_id)
-        .await
-        .unwrap();
-    let ids = members
-        .into_iter()
-        .map(|m| UserId::from_proto(m.user_id))
-        .collect::<Vec<_>>();
-    assert_eq!(ids, &[a_id, b_id]);
-
-    let rust_id = db.create_root_channel("rust", a_id).await.unwrap();
-    let cargo_id = db.create_sub_channel("cargo", rust_id, a_id).await.unwrap();
-
-    let cargo_ra_id = db
-        .create_sub_channel("cargo-ra", cargo_id, a_id)
-        .await
-        .unwrap();
-
-    let result = db.get_channels_for_user(a_id).await.unwrap();
-    assert_channel_tree_matches(
-        result.channels,
-        channel_tree(&[
-            (zed_id, &[], "zed"),
-            (crdb_id, &[zed_id], "crdb"),
-            (livestreaming_id, &[zed_id], "livestreaming"),
-            (replace_id, &[zed_id], "replace"),
-            (rust_id, &[], "rust"),
-            (cargo_id, &[rust_id], "cargo"),
-            (cargo_ra_id, &[rust_id, cargo_id], "cargo-ra"),
-        ]),
-    );
-
-    let result = db.get_channels_for_user(b_id).await.unwrap();
-    assert_channel_tree_matches(
-        result.channels,
-        channel_tree(&[
-            (zed_id, &[], "zed"),
-            (crdb_id, &[zed_id], "crdb"),
-            (livestreaming_id, &[zed_id], "livestreaming"),
-            (replace_id, &[zed_id], "replace"),
-        ]),
-    );
-
-    // Update member permissions
-    let set_subchannel_admin = db
-        .set_channel_member_role(crdb_id, a_id, b_id, ChannelRole::Admin)
-        .await;
-    assert!(set_subchannel_admin.is_err());
-    let set_channel_admin = db
-        .set_channel_member_role(zed_id, a_id, b_id, ChannelRole::Admin)
-        .await;
-    assert!(set_channel_admin.is_ok());
-
-    let result = db.get_channels_for_user(b_id).await.unwrap();
-    assert_channel_tree_matches(
-        result.channels,
-        channel_tree(&[
-            (zed_id, &[], "zed"),
-            (crdb_id, &[zed_id], "crdb"),
-            (livestreaming_id, &[zed_id], "livestreaming"),
-            (replace_id, &[zed_id], "replace"),
-        ]),
-    );
-
-    // Remove a single channel
-    db.delete_channel(crdb_id, a_id).await.unwrap();
-    assert!(db.get_channel(crdb_id, a_id).await.is_err());
-
-    // Remove a channel tree
-    let (_, mut channel_ids) = db.delete_channel(rust_id, a_id).await.unwrap();
-    channel_ids.sort();
-    assert_eq!(channel_ids, &[rust_id, cargo_id, cargo_ra_id]);
-
-    assert!(db.get_channel(rust_id, a_id).await.is_err());
-    assert!(db.get_channel(cargo_id, a_id).await.is_err());
-    assert!(db.get_channel(cargo_ra_id, a_id).await.is_err());
-}
-
-test_both_dbs!(
-    test_joining_channels,
-    test_joining_channels_postgres,
-    test_joining_channels_sqlite
-);
-
-async fn test_joining_channels(db: &Arc<Database>) {
-    let owner_id = db.create_server("test").await.unwrap().0 as u32;
-
-    let user_1 = new_test_user(db, "user1@example.com").await;
-    let user_2 = new_test_user(db, "user2@example.com").await;
-
-    let channel_1 = db.create_root_channel("channel_1", user_1).await.unwrap();
-
-    // can join a room with membership to its channel
-    let (joined_room, _, _) = db
-        .join_channel(channel_1, user_1, ConnectionId { owner_id, id: 1 })
-        .await
-        .unwrap();
-    assert_eq!(joined_room.room.participants.len(), 1);
-
-    let room_id = RoomId::from_proto(joined_room.room.id);
-    drop(joined_room);
-    // cannot join a room without membership to its channel
-    assert!(
-        db.join_room(room_id, user_2, ConnectionId { owner_id, id: 1 },)
-            .await
-            .is_err()
-    );
-}
-
-test_both_dbs!(
-    test_channel_invites,
-    test_channel_invites_postgres,
-    test_channel_invites_sqlite
-);
-
-async fn test_channel_invites(db: &Arc<Database>) {
-    db.create_server("test").await.unwrap();
-
-    let user_1 = new_test_user(db, "user1@example.com").await;
-    let user_2 = new_test_user(db, "user2@example.com").await;
-    let user_3 = new_test_user(db, "user3@example.com").await;
-
-    let channel_1_1 = db.create_root_channel("channel_1", user_1).await.unwrap();
-
-    let channel_1_2 = db.create_root_channel("channel_2", user_1).await.unwrap();
-
-    db.invite_channel_member(channel_1_1, user_2, user_1, ChannelRole::Member)
-        .await
-        .unwrap();
-    db.invite_channel_member(channel_1_2, user_2, user_1, ChannelRole::Member)
-        .await
-        .unwrap();
-    db.invite_channel_member(channel_1_1, user_3, user_1, ChannelRole::Admin)
-        .await
-        .unwrap();
-
-    let user_2_invites = db
-        .get_channels_for_user(user_2)
-        .await
-        .unwrap()
-        .invited_channels
-        .into_iter()
-        .map(|channel| channel.id)
-        .collect::<Vec<_>>();
-    assert_eq!(user_2_invites, &[channel_1_1, channel_1_2]);
-
-    let user_3_invites = db
-        .get_channels_for_user(user_3)
-        .await
-        .unwrap()
-        .invited_channels
-        .into_iter()
-        .map(|channel| channel.id)
-        .collect::<Vec<_>>();
-    assert_eq!(user_3_invites, &[channel_1_1]);
-
-    let (mut members, _) = db
-        .get_channel_participant_details(channel_1_1, "", 100, user_1)
-        .await
-        .unwrap();
-
-    members.sort_by_key(|member| member.user_id);
-    assert_eq!(
-        members,
-        &[
-            proto::ChannelMember {
-                user_id: user_1.to_proto(),
-                kind: proto::channel_member::Kind::Member.into(),
-                role: proto::ChannelRole::Admin.into(),
-            },
-            proto::ChannelMember {
-                user_id: user_2.to_proto(),
-                kind: proto::channel_member::Kind::Invitee.into(),
-                role: proto::ChannelRole::Member.into(),
-            },
-            proto::ChannelMember {
-                user_id: user_3.to_proto(),
-                kind: proto::channel_member::Kind::Invitee.into(),
-                role: proto::ChannelRole::Admin.into(),
-            },
-        ]
-    );
-
-    db.respond_to_channel_invite(channel_1_1, user_2, true)
-        .await
-        .unwrap();
-
-    let channel_1_3 = db
-        .create_sub_channel("channel_3", channel_1_1, user_1)
-        .await
-        .unwrap();
-
-    let (members, _) = db
-        .get_channel_participant_details(channel_1_3, "", 100, user_1)
-        .await
-        .unwrap();
-    assert_eq!(
-        members,
-        &[
-            proto::ChannelMember {
-                user_id: user_1.to_proto(),
-                kind: proto::channel_member::Kind::Member.into(),
-                role: proto::ChannelRole::Admin.into(),
-            },
-            proto::ChannelMember {
-                user_id: user_3.to_proto(),
-                kind: proto::channel_member::Kind::Invitee.into(),
-                role: proto::ChannelRole::Admin.into(),
-            },
-            proto::ChannelMember {
-                user_id: user_2.to_proto(),
-                kind: proto::channel_member::Kind::Member.into(),
-                role: proto::ChannelRole::Member.into(),
-            },
-        ]
-    );
-}
-
-test_both_dbs!(
-    test_channel_renames,
-    test_channel_renames_postgres,
-    test_channel_renames_sqlite
-);
-
-async fn test_channel_renames(db: &Arc<Database>) {
-    db.create_server("test").await.unwrap();
-
-    let user_1 = db
-        .create_user(
-            "user1@example.com",
-            None,
-            false,
-            NewUserParams {
-                github_login: "user1".into(),
-                github_user_id: 5,
-            },
-        )
-        .await
-        .unwrap()
-        .user_id;
-
-    let user_2 = db
-        .create_user(
-            "user2@example.com",
-            None,
-            false,
-            NewUserParams {
-                github_login: "user2".into(),
-                github_user_id: 6,
-            },
-        )
-        .await
-        .unwrap()
-        .user_id;
-
-    let zed_id = db.create_root_channel("zed", user_1).await.unwrap();
-
-    db.rename_channel(zed_id, user_1, "#zed-archive")
-        .await
-        .unwrap();
-
-    let channel = db.get_channel(zed_id, user_1).await.unwrap();
-    assert_eq!(channel.name, "zed-archive");
-
-    let non_permissioned_rename = db.rename_channel(zed_id, user_2, "hacked-lol").await;
-    assert!(non_permissioned_rename.is_err());
-
-    let bad_name_rename = db.rename_channel(zed_id, user_1, "#").await;
-    assert!(bad_name_rename.is_err())
-}
-
-test_both_dbs!(
-    test_db_channel_moving,
-    test_db_channel_moving_postgres,
-    test_db_channel_moving_sqlite
-);
-
-async fn test_db_channel_moving(db: &Arc<Database>) {
-    let a_id = db
-        .create_user(
-            "user1@example.com",
-            None,
-            false,
-            NewUserParams {
-                github_login: "user1".into(),
-                github_user_id: 5,
-            },
-        )
-        .await
-        .unwrap()
-        .user_id;
-
-    let zed_id = db.create_root_channel("zed", a_id).await.unwrap();
-
-    let crdb_id = db.create_sub_channel("crdb", zed_id, a_id).await.unwrap();
-
-    let gpui2_id = db.create_sub_channel("gpui2", zed_id, a_id).await.unwrap();
-
-    let livestreaming_id = db
-        .create_sub_channel("livestreaming", crdb_id, a_id)
-        .await
-        .unwrap();
-
-    let livestreaming_sub_id = db
-        .create_sub_channel("livestreaming_sub", livestreaming_id, a_id)
-        .await
-        .unwrap();
-
-    // sanity check
-    //     /- gpui2
-    // zed -- crdb - livestreaming - livestreaming_sub
-    let result = db.get_channels_for_user(a_id).await.unwrap();
-    assert_channel_tree(
-        result.channels,
-        &[
-            (zed_id, &[]),
-            (crdb_id, &[zed_id]),
-            (livestreaming_id, &[zed_id, crdb_id]),
-            (livestreaming_sub_id, &[zed_id, crdb_id, livestreaming_id]),
-            (gpui2_id, &[zed_id]),
-        ],
-    );
-
-    // Check that we can do a simple leaf -> leaf move
-    db.move_channel(livestreaming_sub_id, crdb_id, a_id)
-        .await
-        .unwrap();
-
-    //     /- gpui2
-    // zed -- crdb -- livestreaming
-    //             \- livestreaming_sub
-    let result = db.get_channels_for_user(a_id).await.unwrap();
-    assert_channel_tree(
-        result.channels,
-        &[
-            (zed_id, &[]),
-            (crdb_id, &[zed_id]),
-            (livestreaming_id, &[zed_id, crdb_id]),
-            (livestreaming_sub_id, &[zed_id, crdb_id]),
-            (gpui2_id, &[zed_id]),
-        ],
-    );
-
-    // Check that we can move a whole subtree at once
-    db.move_channel(crdb_id, gpui2_id, a_id).await.unwrap();
-
-    // zed -- gpui2 -- crdb -- livestreaming
-    //                      \- livestreaming_sub
-    let result = db.get_channels_for_user(a_id).await.unwrap();
-    assert_channel_tree(
-        result.channels,
-        &[
-            (zed_id, &[]),
-            (gpui2_id, &[zed_id]),
-            (crdb_id, &[zed_id, gpui2_id]),
-            (livestreaming_id, &[zed_id, gpui2_id, crdb_id]),
-            (livestreaming_sub_id, &[zed_id, gpui2_id, crdb_id]),
-        ],
-    );
-}
-
-test_both_dbs!(
-    test_channel_reordering,
-    test_channel_reordering_postgres,
-    test_channel_reordering_sqlite
-);
-
-async fn test_channel_reordering(db: &Arc<Database>) {
-    let admin_id = db
-        .create_user(
-            "admin@example.com",
-            None,
-            false,
-            NewUserParams {
-                github_login: "admin".into(),
-                github_user_id: 1,
-            },
-        )
-        .await
-        .unwrap()
-        .user_id;
-
-    let user_id = db
-        .create_user(
-            "user@example.com",
-            None,
-            false,
-            NewUserParams {
-                github_login: "user".into(),
-                github_user_id: 2,
-            },
-        )
-        .await
-        .unwrap()
-        .user_id;
-
-    // Create a root channel with some sub-channels
-    let root_id = db.create_root_channel("root", admin_id).await.unwrap();
-
-    // Invite user to root channel so they can see the sub-channels
-    db.invite_channel_member(root_id, user_id, admin_id, ChannelRole::Member)
-        .await
-        .unwrap();
-    db.respond_to_channel_invite(root_id, user_id, true)
-        .await
-        .unwrap();
-
-    let alpha_id = db
-        .create_sub_channel("alpha", root_id, admin_id)
-        .await
-        .unwrap();
-    let beta_id = db
-        .create_sub_channel("beta", root_id, admin_id)
-        .await
-        .unwrap();
-    let gamma_id = db
-        .create_sub_channel("gamma", root_id, admin_id)
-        .await
-        .unwrap();
-
-    // Initial order should be: root, alpha (order=1), beta (order=2), gamma (order=3)
-    let result = db.get_channels_for_user(admin_id).await.unwrap();
-    assert_channel_tree_order(
-        result.channels,
-        &[
-            (root_id, &[], 1),
-            (alpha_id, &[root_id], 1),
-            (beta_id, &[root_id], 2),
-            (gamma_id, &[root_id], 3),
-        ],
-    );
-
-    // Test moving beta up (should swap with alpha)
-    let updated_channels = db
-        .reorder_channel(beta_id, reorder_channel::Direction::Up, admin_id)
-        .await
-        .unwrap();
-
-    // Verify that beta and alpha were returned as updated
-    assert_eq!(updated_channels.len(), 2);
-    let updated_ids: std::collections::HashSet<_> = updated_channels.iter().map(|c| c.id).collect();
-    assert!(updated_ids.contains(&alpha_id));
-    assert!(updated_ids.contains(&beta_id));
-
-    // Now order should be: root, beta (order=1), alpha (order=2), gamma (order=3)
-    let result = db.get_channels_for_user(admin_id).await.unwrap();
-    assert_channel_tree_order(
-        result.channels,
-        &[
-            (root_id, &[], 1),
-            (beta_id, &[root_id], 1),
-            (alpha_id, &[root_id], 2),
-            (gamma_id, &[root_id], 3),
-        ],
-    );
-
-    // Test moving gamma down (should be no-op since it's already last)
-    let updated_channels = db
-        .reorder_channel(gamma_id, reorder_channel::Direction::Down, admin_id)
-        .await
-        .unwrap();
-
-    // Should return just nothing
-    assert_eq!(updated_channels.len(), 0);
-
-    // Test moving alpha down (should swap with gamma)
-    let updated_channels = db
-        .reorder_channel(alpha_id, reorder_channel::Direction::Down, admin_id)
-        .await
-        .unwrap();
-
-    // Verify that alpha and gamma were returned as updated
-    assert_eq!(updated_channels.len(), 2);
-    let updated_ids: std::collections::HashSet<_> = updated_channels.iter().map(|c| c.id).collect();
-    assert!(updated_ids.contains(&alpha_id));
-    assert!(updated_ids.contains(&gamma_id));
-
-    // Now order should be: root, beta (order=1), gamma (order=2), alpha (order=3)
-    let result = db.get_channels_for_user(admin_id).await.unwrap();
-    assert_channel_tree_order(
-        result.channels,
-        &[
-            (root_id, &[], 1),
-            (beta_id, &[root_id], 1),
-            (gamma_id, &[root_id], 2),
-            (alpha_id, &[root_id], 3),
-        ],
-    );
-
-    // Test that non-admin cannot reorder
-    let reorder_result = db
-        .reorder_channel(beta_id, reorder_channel::Direction::Up, user_id)
-        .await;
-    assert!(reorder_result.is_err());
-
-    // Test moving beta up (should be no-op since it's already first)
-    let updated_channels = db
-        .reorder_channel(beta_id, reorder_channel::Direction::Up, admin_id)
-        .await
-        .unwrap();
-
-    // Should return nothing
-    assert_eq!(updated_channels.len(), 0);
-
-    // Adding a channel to an existing ordering should add it to the end
-    let delta_id = db
-        .create_sub_channel("delta", root_id, admin_id)
-        .await
-        .unwrap();
-
-    let result = db.get_channels_for_user(admin_id).await.unwrap();
-    assert_channel_tree_order(
-        result.channels,
-        &[
-            (root_id, &[], 1),
-            (beta_id, &[root_id], 1),
-            (gamma_id, &[root_id], 2),
-            (alpha_id, &[root_id], 3),
-            (delta_id, &[root_id], 4),
-        ],
-    );
-
-    // And moving a channel into an existing ordering should add it to the end
-    let eta_id = db
-        .create_sub_channel("eta", delta_id, admin_id)
-        .await
-        .unwrap();
-
-    let result = db.get_channels_for_user(admin_id).await.unwrap();
-    assert_channel_tree_order(
-        result.channels,
-        &[
-            (root_id, &[], 1),
-            (beta_id, &[root_id], 1),
-            (gamma_id, &[root_id], 2),
-            (alpha_id, &[root_id], 3),
-            (delta_id, &[root_id], 4),
-            (eta_id, &[root_id, delta_id], 1),
-        ],
-    );
-
-    db.move_channel(eta_id, root_id, admin_id).await.unwrap();
-    let result = db.get_channels_for_user(admin_id).await.unwrap();
-    assert_channel_tree_order(
-        result.channels,
-        &[
-            (root_id, &[], 1),
-            (beta_id, &[root_id], 1),
-            (gamma_id, &[root_id], 2),
-            (alpha_id, &[root_id], 3),
-            (delta_id, &[root_id], 4),
-            (eta_id, &[root_id], 5),
-        ],
-    );
-}
-
-test_both_dbs!(
-    test_db_channel_moving_bugs,
-    test_db_channel_moving_bugs_postgres,
-    test_db_channel_moving_bugs_sqlite
-);
-
-async fn test_db_channel_moving_bugs(db: &Arc<Database>) {
-    let user_id = db
-        .create_user(
-            "user1@example.com",
-            None,
-            false,
-            NewUserParams {
-                github_login: "user1".into(),
-                github_user_id: 5,
-            },
-        )
-        .await
-        .unwrap()
-        .user_id;
-
-    let zed_id = db.create_root_channel("zed", user_id).await.unwrap();
-
-    let projects_id = db
-        .create_sub_channel("projects", zed_id, user_id)
-        .await
-        .unwrap();
-
-    let livestreaming_id = db
-        .create_sub_channel("livestreaming", projects_id, user_id)
-        .await
-        .unwrap();
-
-    let result = db.get_channels_for_user(user_id).await.unwrap();
-    assert_channel_tree(
-        result.channels,
-        &[
-            (zed_id, &[]),
-            (projects_id, &[zed_id]),
-            (livestreaming_id, &[zed_id, projects_id]),
-        ],
-    );
-
-    // Can't move a channel into its ancestor
-    db.move_channel(projects_id, livestreaming_id, user_id)
-        .await
-        .unwrap_err();
-    let result = db.get_channels_for_user(user_id).await.unwrap();
-    assert_channel_tree(
-        result.channels,
-        &[
-            (zed_id, &[]),
-            (projects_id, &[zed_id]),
-            (livestreaming_id, &[zed_id, projects_id]),
-        ],
-    );
-
-    // Can't un-root a root channel
-    db.move_channel(zed_id, livestreaming_id, user_id)
-        .await
-        .unwrap_err();
-    let result = db.get_channels_for_user(user_id).await.unwrap();
-    assert_channel_tree(
-        result.channels,
-        &[
-            (zed_id, &[]),
-            (projects_id, &[zed_id]),
-            (livestreaming_id, &[zed_id, projects_id]),
-        ],
-    );
-}
-
-test_both_dbs!(
-    test_user_is_channel_participant,
-    test_user_is_channel_participant_postgres,
-    test_user_is_channel_participant_sqlite
-);
-
-async fn test_user_is_channel_participant(db: &Arc<Database>) {
-    let admin = new_test_user(db, "admin@example.com").await;
-    let member = new_test_user(db, "member@example.com").await;
-    let guest = new_test_user(db, "guest@example.com").await;
-
-    let zed_channel = db.create_root_channel("zed", admin).await.unwrap();
-    let internal_channel_id = db
-        .create_sub_channel("active", zed_channel, admin)
-        .await
-        .unwrap();
-    let public_channel_id = db
-        .create_sub_channel("vim", zed_channel, admin)
-        .await
-        .unwrap();
-
-    db.set_channel_visibility(zed_channel, crate::db::ChannelVisibility::Public, admin)
-        .await
-        .unwrap();
-    db.set_channel_visibility(
-        public_channel_id,
-        crate::db::ChannelVisibility::Public,
-        admin,
-    )
-    .await
-    .unwrap();
-    db.invite_channel_member(zed_channel, member, admin, ChannelRole::Member)
-        .await
-        .unwrap();
-    db.invite_channel_member(zed_channel, guest, admin, ChannelRole::Guest)
-        .await
-        .unwrap();
-
-    db.respond_to_channel_invite(zed_channel, member, true)
-        .await
-        .unwrap();
-
-    db.transaction(|tx| async move {
-        db.check_user_is_channel_participant(
-            &db.get_channel_internal(public_channel_id, &tx).await?,
-            admin,
-            &tx,
-        )
-        .await
-    })
-    .await
-    .unwrap();
-    db.transaction(|tx| async move {
-        db.check_user_is_channel_participant(
-            &db.get_channel_internal(public_channel_id, &tx).await?,
-            member,
-            &tx,
-        )
-        .await
-    })
-    .await
-    .unwrap();
-
-    let (mut members, _) = db
-        .get_channel_participant_details(public_channel_id, "", 100, admin)
-        .await
-        .unwrap();
-
-    members.sort_by_key(|member| member.user_id);
-
-    assert_eq!(
-        members,
-        &[
-            proto::ChannelMember {
-                user_id: admin.to_proto(),
-                kind: proto::channel_member::Kind::Member.into(),
-                role: proto::ChannelRole::Admin.into(),
-            },
-            proto::ChannelMember {
-                user_id: member.to_proto(),
-                kind: proto::channel_member::Kind::Member.into(),
-                role: proto::ChannelRole::Member.into(),
-            },
-            proto::ChannelMember {
-                user_id: guest.to_proto(),
-                kind: proto::channel_member::Kind::Invitee.into(),
-                role: proto::ChannelRole::Guest.into(),
-            },
-        ]
-    );
-
-    db.respond_to_channel_invite(zed_channel, guest, true)
-        .await
-        .unwrap();
-
-    db.transaction(|tx| async move {
-        db.check_user_is_channel_participant(
-            &db.get_channel_internal(public_channel_id, &tx).await?,
-            guest,
-            &tx,
-        )
-        .await
-    })
-    .await
-    .unwrap();
-
-    let channels = db.get_channels_for_user(guest).await.unwrap().channels;
-    assert_channel_tree(
-        channels,
-        &[(zed_channel, &[]), (public_channel_id, &[zed_channel])],
-    );
-    let channels = db.get_channels_for_user(member).await.unwrap().channels;
-    assert_channel_tree(
-        channels,
-        &[
-            (zed_channel, &[]),
-            (internal_channel_id, &[zed_channel]),
-            (public_channel_id, &[zed_channel]),
-        ],
-    );
-
-    db.set_channel_member_role(zed_channel, admin, guest, ChannelRole::Banned)
-        .await
-        .unwrap();
-    assert!(
-        db.transaction(|tx| async move {
-            db.check_user_is_channel_participant(
-                &db.get_channel_internal(public_channel_id, &tx)
-                    .await
-                    .unwrap(),
-                guest,
-                &tx,
-            )
-            .await
-        })
-        .await
-        .is_err()
-    );
-
-    let (mut members, _) = db
-        .get_channel_participant_details(public_channel_id, "", 100, admin)
-        .await
-        .unwrap();
-
-    members.sort_by_key(|member| member.user_id);
-
-    assert_eq!(
-        members,
-        &[
-            proto::ChannelMember {
-                user_id: admin.to_proto(),
-                kind: proto::channel_member::Kind::Member.into(),
-                role: proto::ChannelRole::Admin.into(),
-            },
-            proto::ChannelMember {
-                user_id: member.to_proto(),
-                kind: proto::channel_member::Kind::Member.into(),
-                role: proto::ChannelRole::Member.into(),
-            },
-            proto::ChannelMember {
-                user_id: guest.to_proto(),
-                kind: proto::channel_member::Kind::Member.into(),
-                role: proto::ChannelRole::Banned.into(),
-            },
-        ]
-    );
-
-    db.remove_channel_member(zed_channel, guest, admin)
-        .await
-        .unwrap();
-
-    db.invite_channel_member(zed_channel, guest, admin, ChannelRole::Guest)
-        .await
-        .unwrap();
-
-    // currently people invited to parent channels are not shown here
-    let (mut members, _) = db
-        .get_channel_participant_details(public_channel_id, "", 100, admin)
-        .await
-        .unwrap();
-
-    members.sort_by_key(|member| member.user_id);
-
-    assert_eq!(
-        members,
-        &[
-            proto::ChannelMember {
-                user_id: admin.to_proto(),
-                kind: proto::channel_member::Kind::Member.into(),
-                role: proto::ChannelRole::Admin.into(),
-            },
-            proto::ChannelMember {
-                user_id: member.to_proto(),
-                kind: proto::channel_member::Kind::Member.into(),
-                role: proto::ChannelRole::Member.into(),
-            },
-            proto::ChannelMember {
-                user_id: guest.to_proto(),
-                kind: proto::channel_member::Kind::Invitee.into(),
-                role: proto::ChannelRole::Guest.into(),
-            },
-        ]
-    );
-
-    db.respond_to_channel_invite(zed_channel, guest, true)
-        .await
-        .unwrap();
-
-    db.transaction(|tx| async move {
-        db.check_user_is_channel_participant(
-            &db.get_channel_internal(zed_channel, &tx).await.unwrap(),
-            guest,
-            &tx,
-        )
-        .await
-    })
-    .await
-    .unwrap();
-    assert!(
-        db.transaction(|tx| async move {
-            db.check_user_is_channel_participant(
-                &db.get_channel_internal(internal_channel_id, &tx)
-                    .await
-                    .unwrap(),
-                guest,
-                &tx,
-            )
-            .await
-        })
-        .await
-        .is_err(),
-    );
-
-    db.transaction(|tx| async move {
-        db.check_user_is_channel_participant(
-            &db.get_channel_internal(public_channel_id, &tx)
-                .await
-                .unwrap(),
-            guest,
-            &tx,
-        )
-        .await
-    })
-    .await
-    .unwrap();
-
-    let (mut members, _) = db
-        .get_channel_participant_details(public_channel_id, "", 100, admin)
-        .await
-        .unwrap();
-
-    members.sort_by_key(|member| member.user_id);
-
-    assert_eq!(
-        members,
-        &[
-            proto::ChannelMember {
-                user_id: admin.to_proto(),
-                kind: proto::channel_member::Kind::Member.into(),
-                role: proto::ChannelRole::Admin.into(),
-            },
-            proto::ChannelMember {
-                user_id: member.to_proto(),
-                kind: proto::channel_member::Kind::Member.into(),
-                role: proto::ChannelRole::Member.into(),
-            },
-            proto::ChannelMember {
-                user_id: guest.to_proto(),
-                kind: proto::channel_member::Kind::Member.into(),
-                role: proto::ChannelRole::Guest.into(),
-            },
-        ]
-    );
-
-    let channels = db.get_channels_for_user(guest).await.unwrap().channels;
-    assert_channel_tree(
-        channels,
-        &[(zed_channel, &[]), (public_channel_id, &[zed_channel])],
-    )
-}
-
-#[track_caller]
-fn assert_channel_tree(actual: Vec<Channel>, expected: &[(ChannelId, &[ChannelId])]) {
-    let actual = actual
-        .iter()
-        .map(|channel| (channel.id, channel.parent_path.as_slice()))
-        .collect::<HashSet<_>>();
-    let expected = expected
-        .iter()
-        .map(|(id, parents)| (*id, *parents))
-        .collect::<HashSet<_>>();
-    pretty_assertions::assert_eq!(actual, expected, "wrong channel ids and parent paths");
-}
-
-#[track_caller]
-fn assert_channel_tree_order(actual: Vec<Channel>, expected: &[(ChannelId, &[ChannelId], i32)]) {
-    let actual = actual
-        .iter()
-        .map(|channel| {
-            (
-                channel.id,
-                channel.parent_path.as_slice(),
-                channel.channel_order,
-            )
-        })
-        .collect::<HashSet<_>>();
-    let expected = expected
-        .iter()
-        .map(|(id, parents, order)| (*id, *parents, *order))
-        .collect::<HashSet<_>>();
-    pretty_assertions::assert_eq!(actual, expected, "wrong channel ids and parent paths");
-}
diff --git a/crates/collab/src/db/tests/contributor_tests.rs b/crates/collab/src/db/tests/contributor_tests.rs
deleted file mode 100644
index d1ff516d1a..0000000000
--- a/crates/collab/src/db/tests/contributor_tests.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-use chrono::Utc;
-
-use super::Database;
-use crate::{db::NewUserParams, test_both_dbs};
-use std::sync::Arc;
-
-test_both_dbs!(
-    test_contributors,
-    test_contributors_postgres,
-    test_contributors_sqlite
-);
-
-async fn test_contributors(db: &Arc<Database>) {
-    db.create_user(
-        "user1@example.com",
-        None,
-        false,
-        NewUserParams {
-            github_login: "user1".to_string(),
-            github_user_id: 1,
-        },
-    )
-    .await
-    .unwrap();
-
-    assert_eq!(db.get_contributors().await.unwrap(), Vec::<String>::new());
-
-    let user1_created_at = Utc::now();
-    db.add_contributor("user1", 1, None, None, user1_created_at, None)
-        .await
-        .unwrap();
-    assert_eq!(
-        db.get_contributors().await.unwrap(),
-        vec!["user1".to_string()]
-    );
-
-    let user2_created_at = Utc::now();
-    db.add_contributor("user2", 2, None, None, user2_created_at, None)
-        .await
-        .unwrap();
-    assert_eq!(
-        db.get_contributors().await.unwrap(),
-        vec!["user1".to_string(), "user2".to_string()]
-    );
-}
diff --git a/crates/collab/src/db/tests/db_tests.rs b/crates/collab/src/db/tests/db_tests.rs
deleted file mode 100644
index 2f0bda1cc6..0000000000
--- a/crates/collab/src/db/tests/db_tests.rs
+++ /dev/null
@@ -1,590 +0,0 @@
-use super::*;
-use crate::test_both_dbs;
-use chrono::Utc;
-use pretty_assertions::assert_eq;
-use std::sync::Arc;
-
-test_both_dbs!(
-    test_get_users,
-    test_get_users_by_ids_postgres,
-    test_get_users_by_ids_sqlite
-);
-
-async fn test_get_users(db: &Arc<Database>) {
-    let mut user_ids = Vec::new();
-    let mut user_metric_ids = Vec::new();
-    for i in 1..=4 {
-        let user = db
-            .create_user(
-                &format!("user{i}@example.com"),
-                None,
-                false,
-                NewUserParams {
-                    github_login: format!("user{i}"),
-                    github_user_id: i,
-                },
-            )
-            .await
-            .unwrap();
-        user_ids.push(user.user_id);
-        user_metric_ids.push(user.metrics_id);
-    }
-
-    assert_eq!(
-        db.get_users_by_ids(user_ids.clone())
-            .await
-            .unwrap()
-            .into_iter()
-            .map(|user| (
-                user.id,
-                user.github_login,
-                user.github_user_id,
-                user.email_address
-            ))
-            .collect::<Vec<_>>(),
-        vec![
-            (
-                user_ids[0],
-                "user1".to_string(),
-                1,
-                Some("user1@example.com".to_string()),
-            ),
-            (
-                user_ids[1],
-                "user2".to_string(),
-                2,
-                Some("user2@example.com".to_string()),
-            ),
-            (
-                user_ids[2],
-                "user3".to_string(),
-                3,
-                Some("user3@example.com".to_string()),
-            ),
-            (
-                user_ids[3],
-                "user4".to_string(),
-                4,
-                Some("user4@example.com".to_string()),
-            )
-        ]
-    );
-}
-
-test_both_dbs!(
-    test_update_or_create_user_by_github_account,
-    test_update_or_create_user_by_github_account_postgres,
-    test_update_or_create_user_by_github_account_sqlite
-);
-
-async fn test_update_or_create_user_by_github_account(db: &Arc<Database>) {
-    db.create_user(
-        "user1@example.com",
-        None,
-        false,
-        NewUserParams {
-            github_login: "login1".into(),
-            github_user_id: 101,
-        },
-    )
-    .await
-    .unwrap();
-    let user_id2 = db
-        .create_user(
-            "user2@example.com",
-            None,
-            false,
-            NewUserParams {
-                github_login: "login2".into(),
-                github_user_id: 102,
-            },
-        )
-        .await
-        .unwrap()
-        .user_id;
-
-    let user = db
-        .update_or_create_user_by_github_account(
-            "the-new-login2",
-            102,
-            None,
-            None,
-            Utc::now(),
-            None,
-        )
-        .await
-        .unwrap();
-    assert_eq!(user.id, user_id2);
-    assert_eq!(&user.github_login, "the-new-login2");
-    assert_eq!(user.github_user_id, 102);
-
-    let user = db
-        .update_or_create_user_by_github_account(
-            "login3",
-            103,
-            Some("user3@example.com"),
-            None,
-            Utc::now(),
-            None,
-        )
-        .await
-        .unwrap();
-    assert_eq!(&user.github_login, "login3");
-    assert_eq!(user.github_user_id, 103);
-    assert_eq!(user.email_address, Some("user3@example.com".into()));
-}
-
-test_both_dbs!(
-    test_create_access_tokens,
-    test_create_access_tokens_postgres,
-    test_create_access_tokens_sqlite
-);
-
-async fn test_create_access_tokens(db: &Arc<Database>) {
-    let user_1 = db
-        .create_user(
-            "u1@example.com",
-            None,
-            false,
-            NewUserParams {
-                github_login: "u1".into(),
-                github_user_id: 1,
-            },
-        )
-        .await
-        .unwrap()
-        .user_id;
-    let user_2 = db
-        .create_user(
-            "u2@example.com",
-            None,
-            false,
-            NewUserParams {
-                github_login: "u2".into(),
-                github_user_id: 2,
-            },
-        )
-        .await
-        .unwrap()
-        .user_id;
-
-    let token_1 = db.create_access_token(user_1, None, "h1", 2).await.unwrap();
-    let token_2 = db.create_access_token(user_1, None, "h2", 2).await.unwrap();
-    assert_eq!(
-        db.get_access_token(token_1).await.unwrap(),
-        access_token::Model {
-            id: token_1,
-            user_id: user_1,
-            impersonated_user_id: None,
-            hash: "h1".into(),
-        }
-    );
-    assert_eq!(
-        db.get_access_token(token_2).await.unwrap(),
-        access_token::Model {
-            id: token_2,
-            user_id: user_1,
-            impersonated_user_id: None,
-            hash: "h2".into()
-        }
-    );
-
-    let token_3 = db.create_access_token(user_1, None, "h3", 2).await.unwrap();
-    assert_eq!(
-        db.get_access_token(token_3).await.unwrap(),
-        access_token::Model {
-            id: token_3,
-            user_id: user_1,
-            impersonated_user_id: None,
-            hash: "h3".into()
-        }
-    );
-    assert_eq!(
-        db.get_access_token(token_2).await.unwrap(),
-        access_token::Model {
-            id: token_2,
-            user_id: user_1,
-            impersonated_user_id: None,
-            hash: "h2".into()
-        }
-    );
-    assert!(db.get_access_token(token_1).await.is_err());
-
-    let token_4 = db.create_access_token(user_1, None, "h4", 2).await.unwrap();
-    assert_eq!(
-        db.get_access_token(token_4).await.unwrap(),
-        access_token::Model {
-            id: token_4,
-            user_id: user_1,
-            impersonated_user_id: None,
-            hash: "h4".into()
-        }
-    );
-    assert_eq!(
-        db.get_access_token(token_3).await.unwrap(),
-        access_token::Model {
-            id: token_3,
-            user_id: user_1,
-            impersonated_user_id: None,
-            hash: "h3".into()
-        }
-    );
-    assert!(db.get_access_token(token_2).await.is_err());
-    assert!(db.get_access_token(token_1).await.is_err());
-
-    // An access token for user 2 impersonating user 1 does not
-    // count against user 1's access token limit (of 2).
-    let token_5 = db
-        .create_access_token(user_2, Some(user_1), "h5", 2)
-        .await
-        .unwrap();
-    assert_eq!(
-        db.get_access_token(token_5).await.unwrap(),
-        access_token::Model {
-            id: token_5,
-            user_id: user_2,
-            impersonated_user_id: Some(user_1),
-            hash: "h5".into()
-        }
-    );
-    assert_eq!(
-        db.get_access_token(token_3).await.unwrap(),
-        access_token::Model {
-            id: token_3,
-            user_id: user_1,
-            impersonated_user_id: None,
-            hash: "h3".into()
-        }
-    );
-
-    // Only a limited number (2) of access tokens are stored for user 2
-    // impersonating other users.
-    let token_6 = db
-        .create_access_token(user_2, Some(user_1), "h6", 2)
-        .await
-        .unwrap();
-    let token_7 = db
-        .create_access_token(user_2, Some(user_1), "h7", 2)
-        .await
-        .unwrap();
-    assert_eq!(
-        db.get_access_token(token_6).await.unwrap(),
-        access_token::Model {
-            id: token_6,
-            user_id: user_2,
-            impersonated_user_id: Some(user_1),
-            hash: "h6".into()
-        }
-    );
-    assert_eq!(
-        db.get_access_token(token_7).await.unwrap(),
-        access_token::Model {
-            id: token_7,
-            user_id: user_2,
-            impersonated_user_id: Some(user_1),
-            hash: "h7".into()
-        }
-    );
-    assert!(db.get_access_token(token_5).await.is_err());
-    assert_eq!(
-        db.get_access_token(token_3).await.unwrap(),
-        access_token::Model {
-            id: token_3,
-            user_id: user_1,
-            impersonated_user_id: None,
-            hash: "h3".into()
-        }
-    );
-}
-
-test_both_dbs!(
-    test_add_contacts,
-    test_add_contacts_postgres,
-    test_add_contacts_sqlite
-);
-
-async fn test_add_contacts(db: &Arc<Database>) {
-    let mut user_ids = Vec::new();
-    for i in 0..3 {
-        user_ids.push(
-            db.create_user(
-                &format!("user{i}@example.com"),
-                None,
-                false,
-                NewUserParams {
-                    github_login: format!("user{i}"),
-                    github_user_id: i,
-                },
-            )
-            .await
-            .unwrap()
-            .user_id,
-        );
-    }
-
-    let user_1 = user_ids[0];
-    let user_2 = user_ids[1];
-    let user_3 = user_ids[2];
-
-    // User starts with no contacts
-    assert_eq!(db.get_contacts(user_1).await.unwrap(), &[]);
-
-    // User requests a contact. Both users see the pending request.
-    db.send_contact_request(user_1, user_2).await.unwrap();
-    assert!(!db.has_contact(user_1, user_2).await.unwrap());
-    assert!(!db.has_contact(user_2, user_1).await.unwrap());
-    assert_eq!(
-        db.get_contacts(user_1).await.unwrap(),
-        &[Contact::Outgoing { user_id: user_2 }],
-    );
-    assert_eq!(
-        db.get_contacts(user_2).await.unwrap(),
-        &[Contact::Incoming { user_id: user_1 }]
-    );
-
-    // User 2 dismisses the contact request notification without accepting or rejecting.
-    // We shouldn't notify them again.
-    db.dismiss_contact_notification(user_1, user_2)
-        .await
-        .unwrap_err();
-    db.dismiss_contact_notification(user_2, user_1)
-        .await
-        .unwrap();
-    assert_eq!(
-        db.get_contacts(user_2).await.unwrap(),
-        &[Contact::Incoming { user_id: user_1 }]
-    );
-
-    // User can't accept their own contact request
-    db.respond_to_contact_request(user_1, user_2, true)
-        .await
-        .unwrap_err();
-
-    // User accepts a contact request. Both users see the contact.
-    db.respond_to_contact_request(user_2, user_1, true)
-        .await
-        .unwrap();
-    assert_eq!(
-        db.get_contacts(user_1).await.unwrap(),
-        &[Contact::Accepted {
-            user_id: user_2,
-            busy: false,
-        }],
-    );
-    assert!(db.has_contact(user_1, user_2).await.unwrap());
-    assert!(db.has_contact(user_2, user_1).await.unwrap());
-    assert_eq!(
-        db.get_contacts(user_2).await.unwrap(),
-        &[Contact::Accepted {
-            user_id: user_1,
-            busy: false,
-        }]
-    );
-
-    // Users cannot re-request existing contacts.
-    db.send_contact_request(user_1, user_2).await.unwrap_err();
-    db.send_contact_request(user_2, user_1).await.unwrap_err();
-
-    // Users can't dismiss notifications of them accepting other users' requests.
-    db.dismiss_contact_notification(user_2, user_1)
-        .await
-        .unwrap_err();
-    assert_eq!(
-        db.get_contacts(user_1).await.unwrap(),
-        &[Contact::Accepted {
-            user_id: user_2,
-            busy: false,
-        }]
-    );
-
-    // Users can dismiss notifications of other users accepting their requests.
-    db.dismiss_contact_notification(user_1, user_2)
-        .await
-        .unwrap();
-    assert_eq!(
-        db.get_contacts(user_1).await.unwrap(),
-        &[Contact::Accepted {
-            user_id: user_2,
-            busy: false,
-        }]
-    );
-
-    // Users send each other concurrent contact requests and
-    // see that they are immediately accepted.
-    db.send_contact_request(user_1, user_3).await.unwrap();
-    db.send_contact_request(user_3, user_1).await.unwrap();
-    assert_eq!(
-        db.get_contacts(user_1).await.unwrap(),
-        &[
-            Contact::Accepted {
-                user_id: user_2,
-                busy: false,
-            },
-            Contact::Accepted {
-                user_id: user_3,
-                busy: false,
-            }
-        ]
-    );
-    assert_eq!(
-        db.get_contacts(user_3).await.unwrap(),
-        &[Contact::Accepted {
-            user_id: user_1,
-            busy: false,
-        }],
-    );
-
-    // User declines a contact request. Both users see that it is gone.
-    db.send_contact_request(user_2, user_3).await.unwrap();
-    db.respond_to_contact_request(user_3, user_2, false)
-        .await
-        .unwrap();
-    assert!(!db.has_contact(user_2, user_3).await.unwrap());
-    assert!(!db.has_contact(user_3, user_2).await.unwrap());
-    assert_eq!(
-        db.get_contacts(user_2).await.unwrap(),
-        &[Contact::Accepted {
-            user_id: user_1,
-            busy: false,
-        }]
-    );
-    assert_eq!(
-        db.get_contacts(user_3).await.unwrap(),
-        &[Contact::Accepted {
-            user_id: user_1,
-            busy: false,
-        }],
-    );
-}
-
-test_both_dbs!(
-    test_project_count,
-    test_project_count_postgres,
-    test_project_count_sqlite
-);
-
-async fn test_project_count(db: &Arc<Database>) {
-    let owner_id = db.create_server("test").await.unwrap().0 as u32;
-
-    let user1 = db
-        .create_user(
-            "admin@example.com",
-            None,
-            true,
-            NewUserParams {
-                github_login: "admin".into(),
-                github_user_id: 0,
-            },
-        )
-        .await
-        .unwrap();
-    let user2 = db
-        .create_user(
-            "user@example.com",
-            None,
-            false,
-            NewUserParams {
-                github_login: "user".into(),
-                github_user_id: 1,
-            },
-        )
-        .await
-        .unwrap();
-
-    let room_id = RoomId::from_proto(
-        db.create_room(user1.user_id, ConnectionId { owner_id, id: 0 }, "")
-            .await
-            .unwrap()
-            .id,
-    );
-    db.call(
-        room_id,
-        user1.user_id,
-        ConnectionId { owner_id, id: 0 },
-        user2.user_id,
-        None,
-    )
-    .await
-    .unwrap();
-    db.join_room(room_id, user2.user_id, ConnectionId { owner_id, id: 1 })
-        .await
-        .unwrap();
-    assert_eq!(db.project_count_excluding_admins().await.unwrap(), 0);
-
-    db.share_project(room_id, ConnectionId { owner_id, id: 1 }, &[], false, false)
-        .await
-        .unwrap();
-    assert_eq!(db.project_count_excluding_admins().await.unwrap(), 1);
-
-    db.share_project(room_id, ConnectionId { owner_id, id: 1 }, &[], false, false)
-        .await
-        .unwrap();
-    assert_eq!(db.project_count_excluding_admins().await.unwrap(), 2);
-
-    // Projects shared by admins aren't counted.
-    db.share_project(room_id, ConnectionId { owner_id, id: 0 }, &[], false, false)
-        .await
-        .unwrap();
-    assert_eq!(db.project_count_excluding_admins().await.unwrap(), 2);
-
-    db.leave_room(ConnectionId { owner_id, id: 1 })
-        .await
-        .unwrap();
-    assert_eq!(db.project_count_excluding_admins().await.unwrap(), 0);
-}
-
-#[test]
-fn test_fuzzy_like_string() {
-    assert_eq!(Database::fuzzy_like_string("abcd"), "%a%b%c%d%");
-    assert_eq!(Database::fuzzy_like_string("x y"), "%x%y%");
-    assert_eq!(Database::fuzzy_like_string(" z  "), "%z%");
-}
-
-#[cfg(target_os = "macos")]
-#[gpui::test]
-async fn test_fuzzy_search_users(cx: &mut gpui::TestAppContext) {
-    let test_db = tests::TestDb::postgres(cx.executor());
-    let db = test_db.db();
-    for (i, github_login) in [
-        "California",
-        "colorado",
-        "oregon",
-        "washington",
-        "florida",
-        "delaware",
-        "rhode-island",
-    ]
-    .into_iter()
-    .enumerate()
-    {
-        db.create_user(
-            &format!("{github_login}@example.com"),
-            None,
-            false,
-            NewUserParams {
-                github_login: github_login.into(),
-                github_user_id: i as i32,
-            },
-        )
-        .await
-        .unwrap();
-    }
-
-    assert_eq!(
-        fuzzy_search_user_names(db, "clr").await,
-        &["colorado", "California"]
-    );
-    assert_eq!(
-        fuzzy_search_user_names(db, "ro").await,
-        &["rhode-island", "colorado", "oregon"],
-    );
-
-    async fn fuzzy_search_user_names(db: &Database, query: &str) -> Vec<String> {
-        db.fuzzy_search_users(query, 10)
-            .await
-            .unwrap()
-            .into_iter()
-            .map(|user| user.github_login)
-            .collect::<Vec<_>>()
-    }
-}
diff --git a/crates/collab/src/db/tests/extension_tests.rs b/crates/collab/src/db/tests/extension_tests.rs
deleted file mode 100644
index cb58f6af2a..0000000000
--- a/crates/collab/src/db/tests/extension_tests.rs
+++ /dev/null
@@ -1,489 +0,0 @@
-use std::collections::BTreeSet;
-use std::sync::Arc;
-
-use rpc::ExtensionProvides;
-
-use super::Database;
-use crate::db::ExtensionVersionConstraints;
-use crate::{
-    db::{ExtensionMetadata, NewExtensionVersion, queries::extensions::convert_time_to_chrono},
-    test_both_dbs,
-};
-
-test_both_dbs!(
-    test_extensions,
-    test_extensions_postgres,
-    test_extensions_sqlite
-);
-
-test_both_dbs!(
-    test_agent_servers_filter,
-    test_agent_servers_filter_postgres,
-    test_agent_servers_filter_sqlite
-);
-
-async fn test_agent_servers_filter(db: &Arc<Database>) {
-    // No extensions initially
-    let versions = db.get_known_extension_versions().await.unwrap();
-    assert!(versions.is_empty());
-
-    // Shared timestamp
-    let t0 = time::OffsetDateTime::from_unix_timestamp_nanos(0).unwrap();
-    let t0 = time::PrimitiveDateTime::new(t0.date(), t0.time());
-
-    // Insert two extensions, only one provides AgentServers
-    db.insert_extension_versions(
-        &[
-            (
-                "ext_agent_servers",
-                vec![NewExtensionVersion {
-                    name: "Agent Servers Provider".into(),
-                    version: semver::Version::parse("1.0.0").unwrap(),
-                    description: "has agent servers".into(),
-                    authors: vec!["author".into()],
-                    repository: "org/agent-servers".into(),
-                    schema_version: 1,
-                    wasm_api_version: None,
-                    provides: BTreeSet::from_iter([ExtensionProvides::AgentServers]),
-                    published_at: t0,
-                }],
-            ),
-            (
-                "ext_plain",
-                vec![NewExtensionVersion {
-                    name: "Plain Extension".into(),
-                    version: semver::Version::parse("0.1.0").unwrap(),
-                    description: "no agent servers".into(),
-                    authors: vec!["author2".into()],
-                    repository: "org/plain".into(),
-                    schema_version: 1,
-                    wasm_api_version: None,
-                    provides: BTreeSet::default(),
-                    published_at: t0,
-                }],
-            ),
-        ]
-        .into_iter()
-        .collect(),
-    )
-    .await
-    .unwrap();
-
-    // Filter by AgentServers provides
-    let provides_filter = BTreeSet::from_iter([ExtensionProvides::AgentServers]);
-
-    let filtered = db
-        .get_extensions(None, Some(&provides_filter), 1, 10)
-        .await
-        .unwrap();
-
-    // Expect only the extension that declared AgentServers
-    assert_eq!(filtered.len(), 1);
-    assert_eq!(filtered[0].id.as_ref(), "ext_agent_servers");
-}
-
-async fn test_extensions(db: &Arc<Database>) {
-    let versions = db.get_known_extension_versions().await.unwrap();
-    assert!(versions.is_empty());
-
-    let extensions = db.get_extensions(None, None, 1, 5).await.unwrap();
-    assert!(extensions.is_empty());
-
-    let t0 = time::OffsetDateTime::from_unix_timestamp_nanos(0).unwrap();
-    let t0 = time::PrimitiveDateTime::new(t0.date(), t0.time());
-
-    let t0_chrono = convert_time_to_chrono(t0);
-
-    db.insert_extension_versions(
-        &[
-            (
-                "ext1",
-                vec![
-                    NewExtensionVersion {
-                        name: "Extension 1".into(),
-                        version: semver::Version::parse("0.0.1").unwrap(),
-                        description: "an extension".into(),
-                        authors: vec!["max".into()],
-                        repository: "ext1/repo".into(),
-                        schema_version: 1,
-                        wasm_api_version: None,
-                        provides: BTreeSet::default(),
-                        published_at: t0,
-                    },
-                    NewExtensionVersion {
-                        name: "Extension One".into(),
-                        version: semver::Version::parse("0.0.2").unwrap(),
-                        description: "a good extension".into(),
-                        authors: vec!["max".into(), "marshall".into()],
-                        repository: "ext1/repo".into(),
-                        schema_version: 1,
-                        wasm_api_version: None,
-                        provides: BTreeSet::default(),
-                        published_at: t0,
-                    },
-                ],
-            ),
-            (
-                "ext2",
-                vec![NewExtensionVersion {
-                    name: "Extension Two".into(),
-                    version: semver::Version::parse("0.2.0").unwrap(),
-                    description: "a great extension".into(),
-                    authors: vec!["marshall".into()],
-                    repository: "ext2/repo".into(),
-                    schema_version: 0,
-                    wasm_api_version: None,
-                    provides: BTreeSet::default(),
-                    published_at: t0,
-                }],
-            ),
-        ]
-        .into_iter()
-        .collect(),
-    )
-    .await
-    .unwrap();
-
-    let versions = db.get_known_extension_versions().await.unwrap();
-    assert_eq!(
-        versions,
-        [
-            ("ext1".into(), vec!["0.0.1".into(), "0.0.2".into()]),
-            ("ext2".into(), vec!["0.2.0".into()])
-        ]
-        .into_iter()
-        .collect()
-    );
-
-    // The latest version of each extension is returned.
-    let extensions = db.get_extensions(None, None, 1, 5).await.unwrap();
-    assert_eq!(
-        extensions,
-        &[
-            ExtensionMetadata {
-                id: "ext1".into(),
-                manifest: rpc::ExtensionApiManifest {
-                    name: "Extension One".into(),
-                    version: "0.0.2".into(),
-                    authors: vec!["max".into(), "marshall".into()],
-                    description: Some("a good extension".into()),
-                    repository: "ext1/repo".into(),
-                    schema_version: Some(1),
-                    wasm_api_version: None,
-                    provides: BTreeSet::default(),
-                },
-                published_at: t0_chrono,
-                download_count: 0,
-            },
-            ExtensionMetadata {
-                id: "ext2".into(),
-                manifest: rpc::ExtensionApiManifest {
-                    name: "Extension Two".into(),
-                    version: "0.2.0".into(),
-                    authors: vec!["marshall".into()],
-                    description: Some("a great extension".into()),
-                    repository: "ext2/repo".into(),
-                    schema_version: Some(0),
-                    wasm_api_version: None,
-                    provides: BTreeSet::default(),
-                },
-                published_at: t0_chrono,
-                download_count: 0
-            },
-        ]
-    );
-
-    // Extensions with too new of a schema version are excluded.
-    let extensions = db.get_extensions(None, None, 0, 5).await.unwrap();
-    assert_eq!(
-        extensions,
-        &[ExtensionMetadata {
-            id: "ext2".into(),
-            manifest: rpc::ExtensionApiManifest {
-                name: "Extension Two".into(),
-                version: "0.2.0".into(),
-                authors: vec!["marshall".into()],
-                description: Some("a great extension".into()),
-                repository: "ext2/repo".into(),
-                schema_version: Some(0),
-                wasm_api_version: None,
-                provides: BTreeSet::default(),
-            },
-            published_at: t0_chrono,
-            download_count: 0
-        },]
-    );
-
-    // Record extensions being downloaded.
-    for _ in 0..7 {
-        assert!(db.record_extension_download("ext2", "0.0.2").await.unwrap());
-    }
-
-    for _ in 0..3 {
-        assert!(db.record_extension_download("ext1", "0.0.1").await.unwrap());
-    }
-
-    for _ in 0..2 {
-        assert!(db.record_extension_download("ext1", "0.0.2").await.unwrap());
-    }
-
-    // Record download returns false if the extension does not exist.
-    assert!(
-        !db.record_extension_download("no-such-extension", "0.0.2")
-            .await
-            .unwrap()
-    );
-
-    // Extensions are returned in descending order of total downloads.
-    let extensions = db.get_extensions(None, None, 1, 5).await.unwrap();
-    assert_eq!(
-        extensions,
-        &[
-            ExtensionMetadata {
-                id: "ext2".into(),
-                manifest: rpc::ExtensionApiManifest {
-                    name: "Extension Two".into(),
-                    version: "0.2.0".into(),
-                    authors: vec!["marshall".into()],
-                    description: Some("a great extension".into()),
-                    repository: "ext2/repo".into(),
-                    schema_version: Some(0),
-                    wasm_api_version: None,
-                    provides: BTreeSet::default(),
-                },
-                published_at: t0_chrono,
-                download_count: 7
-            },
-            ExtensionMetadata {
-                id: "ext1".into(),
-                manifest: rpc::ExtensionApiManifest {
-                    name: "Extension One".into(),
-                    version: "0.0.2".into(),
-                    authors: vec!["max".into(), "marshall".into()],
-                    description: Some("a good extension".into()),
-                    repository: "ext1/repo".into(),
-                    schema_version: Some(1),
-                    wasm_api_version: None,
-                    provides: BTreeSet::default(),
-                },
-                published_at: t0_chrono,
-                download_count: 5,
-            },
-        ]
-    );
-
-    // Add more extensions, including a new version of `ext1`, and backfilling
-    // an older version of `ext2`.
-    db.insert_extension_versions(
-        &[
-            (
-                "ext1",
-                vec![NewExtensionVersion {
-                    name: "Extension One".into(),
-                    version: semver::Version::parse("0.0.3").unwrap(),
-                    description: "a real good extension".into(),
-                    authors: vec!["max".into(), "marshall".into()],
-                    repository: "ext1/repo".into(),
-                    schema_version: 1,
-                    wasm_api_version: None,
-                    provides: BTreeSet::default(),
-                    published_at: t0,
-                }],
-            ),
-            (
-                "ext2",
-                vec![NewExtensionVersion {
-                    name: "Extension Two".into(),
-                    version: semver::Version::parse("0.1.0").unwrap(),
-                    description: "an old extension".into(),
-                    authors: vec!["marshall".into()],
-                    repository: "ext2/repo".into(),
-                    schema_version: 0,
-                    wasm_api_version: None,
-                    provides: BTreeSet::default(),
-                    published_at: t0,
-                }],
-            ),
-        ]
-        .into_iter()
-        .collect(),
-    )
-    .await
-    .unwrap();
-
-    let versions = db.get_known_extension_versions().await.unwrap();
-    assert_eq!(
-        versions,
-        [
-            (
-                "ext1".into(),
-                vec!["0.0.1".into(), "0.0.2".into(), "0.0.3".into()]
-            ),
-            ("ext2".into(), vec!["0.1.0".into(), "0.2.0".into()])
-        ]
-        .into_iter()
-        .collect()
-    );
-
-    let extensions = db.get_extensions(None, None, 1, 5).await.unwrap();
-    assert_eq!(
-        extensions,
-        &[
-            ExtensionMetadata {
-                id: "ext2".into(),
-                manifest: rpc::ExtensionApiManifest {
-                    name: "Extension Two".into(),
-                    version: "0.2.0".into(),
-                    authors: vec!["marshall".into()],
-                    description: Some("a great extension".into()),
-                    repository: "ext2/repo".into(),
-                    schema_version: Some(0),
-                    wasm_api_version: None,
-                    provides: BTreeSet::default(),
-                },
-                published_at: t0_chrono,
-                download_count: 7
-            },
-            ExtensionMetadata {
-                id: "ext1".into(),
-                manifest: rpc::ExtensionApiManifest {
-                    name: "Extension One".into(),
-                    version: "0.0.3".into(),
-                    authors: vec!["max".into(), "marshall".into()],
-                    description: Some("a real good extension".into()),
-                    repository: "ext1/repo".into(),
-                    schema_version: Some(1),
-                    wasm_api_version: None,
-                    provides: BTreeSet::default(),
-                },
-                published_at: t0_chrono,
-                download_count: 5,
-            },
-        ]
-    );
-}
-
-test_both_dbs!(
-    test_extensions_by_id,
-    test_extensions_by_id_postgres,
-    test_extensions_by_id_sqlite
-);
-
-async fn test_extensions_by_id(db: &Arc<Database>) {
-    let versions = db.get_known_extension_versions().await.unwrap();
-    assert!(versions.is_empty());
-
-    let extensions = db.get_extensions(None, None, 1, 5).await.unwrap();
-    assert!(extensions.is_empty());
-
-    let t0 = time::OffsetDateTime::from_unix_timestamp_nanos(0).unwrap();
-    let t0 = time::PrimitiveDateTime::new(t0.date(), t0.time());
-
-    let t0_chrono = convert_time_to_chrono(t0);
-
-    db.insert_extension_versions(
-        &[
-            (
-                "ext1",
-                vec![
-                    NewExtensionVersion {
-                        name: "Extension 1".into(),
-                        version: semver::Version::parse("0.0.1").unwrap(),
-                        description: "an extension".into(),
-                        authors: vec!["max".into()],
-                        repository: "ext1/repo".into(),
-                        schema_version: 1,
-                        wasm_api_version: Some("0.0.4".into()),
-                        provides: BTreeSet::from_iter([
-                            ExtensionProvides::Grammars,
-                            ExtensionProvides::Languages,
-                        ]),
-                        published_at: t0,
-                    },
-                    NewExtensionVersion {
-                        name: "Extension 1".into(),
-                        version: semver::Version::parse("0.0.2").unwrap(),
-                        description: "a good extension".into(),
-                        authors: vec!["max".into()],
-                        repository: "ext1/repo".into(),
-                        schema_version: 1,
-                        wasm_api_version: Some("0.0.4".into()),
-                        provides: BTreeSet::from_iter([
-                            ExtensionProvides::Grammars,
-                            ExtensionProvides::Languages,
-                            ExtensionProvides::LanguageServers,
-                        ]),
-                        published_at: t0,
-                    },
-                    NewExtensionVersion {
-                        name: "Extension 1".into(),
-                        version: semver::Version::parse("0.0.3").unwrap(),
-                        description: "a real good extension".into(),
-                        authors: vec!["max".into(), "marshall".into()],
-                        repository: "ext1/repo".into(),
-                        schema_version: 1,
-                        wasm_api_version: Some("0.0.5".into()),
-                        provides: BTreeSet::from_iter([
-                            ExtensionProvides::Grammars,
-                            ExtensionProvides::Languages,
-                            ExtensionProvides::LanguageServers,
-                        ]),
-                        published_at: t0,
-                    },
-                ],
-            ),
-            (
-                "ext2",
-                vec![NewExtensionVersion {
-                    name: "Extension 2".into(),
-                    version: semver::Version::parse("0.2.0").unwrap(),
-                    description: "a great extension".into(),
-                    authors: vec!["marshall".into()],
-                    repository: "ext2/repo".into(),
-                    schema_version: 0,
-                    wasm_api_version: None,
-                    provides: BTreeSet::default(),
-                    published_at: t0,
-                }],
-            ),
-        ]
-        .into_iter()
-        .collect(),
-    )
-    .await
-    .unwrap();
-
-    let extensions = db
-        .get_extensions_by_ids(
-            &["ext1"],
-            Some(&ExtensionVersionConstraints {
-                schema_versions: 1..=1,
-                wasm_api_versions: "0.0.1".parse().unwrap()..="0.0.4".parse().unwrap(),
-            }),
-        )
-        .await
-        .unwrap();
-
-    assert_eq!(
-        extensions,
-        &[ExtensionMetadata {
-            id: "ext1".into(),
-            manifest: rpc::ExtensionApiManifest {
-                name: "Extension 1".into(),
-                version: "0.0.2".into(),
-                authors: vec!["max".into()],
-                description: Some("a good extension".into()),
-                repository: "ext1/repo".into(),
-                schema_version: Some(1),
-                wasm_api_version: Some("0.0.4".into()),
-                provides: BTreeSet::from_iter([
-                    ExtensionProvides::Grammars,
-                    ExtensionProvides::Languages,
-                    ExtensionProvides::LanguageServers,
-                ]),
-            },
-            published_at: t0_chrono,
-            download_count: 0,
-        }]
-    );
-}
diff --git a/crates/collab/src/db/tests/migrations.rs b/crates/collab/src/db/tests/migrations.rs
deleted file mode 100644
index dcae79956b..0000000000
--- a/crates/collab/src/db/tests/migrations.rs
+++ /dev/null
@@ -1,47 +0,0 @@
-use std::path::Path;
-use std::time::Duration;
-
-use anyhow::{Result, anyhow};
-use collections::HashMap;
-use sea_orm::ConnectOptions;
-use sqlx::Connection;
-use sqlx::migrate::{Migrate, Migration, MigrationSource};
-
-/// Runs the database migrations for the specified database.
-pub async fn run_database_migrations(
-    database_options: &ConnectOptions,
-    migrations_path: impl AsRef<Path>,
-) -> Result<Vec<(Migration, Duration)>> {
-    let migrations = MigrationSource::resolve(migrations_path.as_ref())
-        .await
-        .map_err(|err| anyhow!("failed to load migrations: {err:?}"))?;
-
-    let mut connection = sqlx::AnyConnection::connect(database_options.get_url()).await?;
-
-    connection.ensure_migrations_table().await?;
-    let applied_migrations: HashMap<_, _> = connection
-        .list_applied_migrations()
-        .await?
-        .into_iter()
-        .map(|migration| (migration.version, migration))
-        .collect();
-
-    let mut new_migrations = Vec::new();
-    for migration in migrations {
-        match applied_migrations.get(&migration.version) {
-            Some(applied_migration) => {
-                anyhow::ensure!(
-                    migration.checksum == applied_migration.checksum,
-                    "checksum mismatch for applied migration {}",
-                    migration.description
-                );
-            }
-            None => {
-                let elapsed = connection.apply(&migration).await?;
-                new_migrations.push((migration, elapsed));
-            }
-        }
-    }
-
-    Ok(new_migrations)
-}
diff --git a/crates/collab/src/env.rs b/crates/collab/src/env.rs
deleted file mode 100644
index aa511afd8b..0000000000
--- a/crates/collab/src/env.rs
+++ /dev/null
@@ -1,41 +0,0 @@
-use anyhow::{Context as _, Result};
-use std::fs;
-use std::path::Path;
-
-pub fn get_dotenv_vars(current_dir: impl AsRef<Path>) -> Result<Vec<(String, String)>> {
-    let current_dir = current_dir.as_ref();
-
-    let mut vars = Vec::new();
-    let env_content =
-        fs::read_to_string(current_dir.join(".env.toml")).context("no .env.toml file found")?;
-
-    add_vars(env_content, &mut vars)?;
-
-    if let Ok(secret_content) = fs::read_to_string(current_dir.join(".env.secret.toml")) {
-        add_vars(secret_content, &mut vars)?;
-    }
-
-    Ok(vars)
-}
-
-pub fn load_dotenv() -> Result<()> {
-    for (key, value) in get_dotenv_vars("./crates/collab")? {
-        unsafe { std::env::set_var(key, value) };
-    }
-    Ok(())
-}
-
-fn add_vars(env_content: String, vars: &mut Vec<(String, String)>) -> Result<()> {
-    let env: toml::map::Map<String, toml::Value> = toml::de::from_str(&env_content)?;
-    for (key, value) in env {
-        let value = match value {
-            toml::Value::String(value) => value,
-            toml::Value::Integer(value) => value.to_string(),
-            toml::Value::Float(value) => value.to_string(),
-            toml::Value::Boolean(value) => value.to_string(),
-            _ => panic!("unsupported TOML value in .env.toml for key {}", key),
-        };
-        vars.push((key, value));
-    }
-    Ok(())
-}
diff --git a/crates/collab/src/errors.rs b/crates/collab/src/errors.rs
deleted file mode 100644
index 93e46848a1..0000000000
--- a/crates/collab/src/errors.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Allow tide Results to accept context like other Results do when
-// using anyhow.
-pub trait TideResultExt {
-    fn context<C>(self, cx: C) -> Self
-    where
-        C: std::fmt::Display + Send + Sync + 'static;
-
-    fn with_context<C, F>(self, f: F) -> Self
-    where
-        C: std::fmt::Display + Send + Sync + 'static,
-        F: FnOnce() -> C;
-}
-
-impl<T> TideResultExt for tide::Result<T> {
-    fn context<C>(self, cx: C) -> Self
-    where
-        C: std::fmt::Display + Send + Sync + 'static,
-    {
-        self.map_err(|e| tide::Error::new(e.status(), e.into_inner().context(cx)))
-    }
-
-    fn with_context<C, F>(self, f: F) -> Self
-    where
-        C: std::fmt::Display + Send + Sync + 'static,
-        F: FnOnce() -> C,
-    {
-        self.map_err(|e| tide::Error::new(e.status(), e.into_inner().context(f())))
-    }
-}
diff --git a/crates/collab/src/executor.rs b/crates/collab/src/executor.rs
deleted file mode 100644
index e69aed363b..0000000000
--- a/crates/collab/src/executor.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-use std::{future::Future, time::Duration};
-
-#[cfg(test)]
-use gpui::BackgroundExecutor;
-
-#[derive(Clone)]
-pub enum Executor {
-    Production,
-    #[cfg(test)]
-    Deterministic(BackgroundExecutor),
-}
-
-impl Executor {
-    pub fn spawn_detached<F>(&self, future: F)
-    where
-        F: 'static + Send + Future<Output = ()>,
-    {
-        match self {
-            Executor::Production => {
-                tokio::spawn(future);
-            }
-            #[cfg(test)]
-            Executor::Deterministic(background) => {
-                background.spawn(future).detach();
-            }
-        }
-    }
-
-    pub fn sleep(&self, duration: Duration) -> impl Future<Output = ()> + use<> {
-        let this = self.clone();
-        async move {
-            match this {
-                Executor::Production => tokio::time::sleep(duration).await,
-                #[cfg(test)]
-                Executor::Deterministic(background) => background.timer(duration).await,
-            }
-        }
-    }
-}
diff --git a/crates/collab/src/lib.rs b/crates/collab/src/lib.rs
deleted file mode 100644
index 08f7e61c02..0000000000
--- a/crates/collab/src/lib.rs
+++ /dev/null
@@ -1,345 +0,0 @@
-pub mod api;
-pub mod auth;
-pub mod db;
-pub mod env;
-pub mod executor;
-pub mod rpc;
-pub mod seed;
-
-#[cfg(test)]
-mod tests;
-
-use anyhow::Context as _;
-use aws_config::{BehaviorVersion, Region};
-use axum::{
-    http::{HeaderMap, StatusCode},
-    response::IntoResponse,
-};
-use db::{ChannelId, Database};
-use executor::Executor;
-use serde::Deserialize;
-use std::{path::PathBuf, sync::Arc};
-use util::ResultExt;
-
-pub type Result<T, E = Error> = std::result::Result<T, E>;
-
-pub enum Error {
-    Http(StatusCode, String, HeaderMap),
-    Database(sea_orm::error::DbErr),
-    Internal(anyhow::Error),
-}
-
-impl From<anyhow::Error> for Error {
-    fn from(error: anyhow::Error) -> Self {
-        Self::Internal(error)
-    }
-}
-
-impl From<sea_orm::error::DbErr> for Error {
-    fn from(error: sea_orm::error::DbErr) -> Self {
-        Self::Database(error)
-    }
-}
-
-impl From<axum::Error> for Error {
-    fn from(error: axum::Error) -> Self {
-        Self::Internal(error.into())
-    }
-}
-
-impl From<axum::http::Error> for Error {
-    fn from(error: axum::http::Error) -> Self {
-        Self::Internal(error.into())
-    }
-}
-
-impl From<serde_json::Error> for Error {
-    fn from(error: serde_json::Error) -> Self {
-        Self::Internal(error.into())
-    }
-}
-
-impl Error {
-    fn http(code: StatusCode, message: String) -> Self {
-        Self::Http(code, message, HeaderMap::default())
-    }
-}
-
-impl IntoResponse for Error {
-    fn into_response(self) -> axum::response::Response {
-        match self {
-            Error::Http(code, message, headers) => {
-                log::error!("HTTP error {}: {}", code, &message);
-                (code, headers, message).into_response()
-            }
-            Error::Database(error) => {
-                log::error!(
-                    "HTTP error {}: {:?}",
-                    StatusCode::INTERNAL_SERVER_ERROR,
-                    &error
-                );
-                (StatusCode::INTERNAL_SERVER_ERROR, format!("{}", &error)).into_response()
-            }
-            Error::Internal(error) => {
-                log::error!(
-                    "HTTP error {}: {:?}",
-                    StatusCode::INTERNAL_SERVER_ERROR,
-                    &error
-                );
-                (StatusCode::INTERNAL_SERVER_ERROR, format!("{}", &error)).into_response()
-            }
-        }
-    }
-}
-
-impl std::fmt::Debug for Error {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Error::Http(code, message, _headers) => (code, message).fmt(f),
-            Error::Database(error) => error.fmt(f),
-            Error::Internal(error) => error.fmt(f),
-        }
-    }
-}
-
-impl std::fmt::Display for Error {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Error::Http(code, message, _) => write!(f, "{code}: {message}"),
-            Error::Database(error) => error.fmt(f),
-            Error::Internal(error) => error.fmt(f),
-        }
-    }
-}
-
-impl std::error::Error for Error {}
-
-#[derive(Clone, Deserialize)]
-pub struct Config {
-    pub http_port: u16,
-    pub database_url: String,
-    pub migrations_path: Option<PathBuf>,
-    pub seed_path: Option<PathBuf>,
-    pub database_max_connections: u32,
-    pub api_token: String,
-    pub invite_link_prefix: String,
-    pub livekit_server: Option<String>,
-    pub livekit_key: Option<String>,
-    pub livekit_secret: Option<String>,
-    pub llm_database_url: Option<String>,
-    pub llm_database_max_connections: Option<u32>,
-    pub llm_database_migrations_path: Option<PathBuf>,
-    pub llm_api_secret: Option<String>,
-    pub rust_log: Option<String>,
-    pub log_json: Option<bool>,
-    pub blob_store_url: Option<String>,
-    pub blob_store_region: Option<String>,
-    pub blob_store_access_key: Option<String>,
-    pub blob_store_secret_key: Option<String>,
-    pub blob_store_bucket: Option<String>,
-    pub kinesis_region: Option<String>,
-    pub kinesis_stream: Option<String>,
-    pub kinesis_access_key: Option<String>,
-    pub kinesis_secret_key: Option<String>,
-    pub zed_environment: Arc<str>,
-    pub openai_api_key: Option<Arc<str>>,
-    pub google_ai_api_key: Option<Arc<str>>,
-    pub anthropic_api_key: Option<Arc<str>>,
-    pub anthropic_staff_api_key: Option<Arc<str>>,
-    pub llm_closed_beta_model_name: Option<Arc<str>>,
-    pub prediction_api_url: Option<Arc<str>>,
-    pub prediction_api_key: Option<Arc<str>>,
-    pub prediction_model: Option<Arc<str>>,
-    pub zed_client_checksum_seed: Option<String>,
-    pub auto_join_channel_id: Option<ChannelId>,
-    pub supermaven_admin_api_key: Option<Arc<str>>,
-}
-
-impl Config {
-    pub fn is_development(&self) -> bool {
-        self.zed_environment == "development".into()
-    }
-
-    /// Returns the base `zed.dev` URL.
-    pub fn zed_dot_dev_url(&self) -> &str {
-        match self.zed_environment.as_ref() {
-            "development" => "http://localhost:3000",
-            "staging" => "https://staging.zed.dev",
-            _ => "https://zed.dev",
-        }
-    }
-
-    #[cfg(test)]
-    pub fn test() -> Self {
-        Self {
-            http_port: 0,
-            database_url: "".into(),
-            database_max_connections: 0,
-            api_token: "".into(),
-            invite_link_prefix: "".into(),
-            livekit_server: None,
-            livekit_key: None,
-            livekit_secret: None,
-            llm_database_url: None,
-            llm_database_max_connections: None,
-            llm_database_migrations_path: None,
-            llm_api_secret: None,
-            rust_log: None,
-            log_json: None,
-            zed_environment: "test".into(),
-            blob_store_url: None,
-            blob_store_region: None,
-            blob_store_access_key: None,
-            blob_store_secret_key: None,
-            blob_store_bucket: None,
-            openai_api_key: None,
-            google_ai_api_key: None,
-            anthropic_api_key: None,
-            anthropic_staff_api_key: None,
-            llm_closed_beta_model_name: None,
-            prediction_api_url: None,
-            prediction_api_key: None,
-            prediction_model: None,
-            zed_client_checksum_seed: None,
-            auto_join_channel_id: None,
-            migrations_path: None,
-            seed_path: None,
-            supermaven_admin_api_key: None,
-            kinesis_region: None,
-            kinesis_access_key: None,
-            kinesis_secret_key: None,
-            kinesis_stream: None,
-        }
-    }
-}
-
-/// The service mode that collab should run in.
-#[derive(Debug, PartialEq, Eq, Clone, Copy, strum::Display)]
-#[strum(serialize_all = "snake_case")]
-pub enum ServiceMode {
-    Api,
-    Collab,
-    All,
-}
-
-impl ServiceMode {
-    pub fn is_collab(&self) -> bool {
-        matches!(self, Self::Collab | Self::All)
-    }
-
-    pub fn is_api(&self) -> bool {
-        matches!(self, Self::Api | Self::All)
-    }
-}
-
-pub struct AppState {
-    pub db: Arc<Database>,
-    pub livekit_client: Option<Arc<dyn livekit_api::Client>>,
-    pub blob_store_client: Option<aws_sdk_s3::Client>,
-    pub executor: Executor,
-    pub kinesis_client: Option<::aws_sdk_kinesis::Client>,
-    pub config: Config,
-}
-
-impl AppState {
-    pub async fn new(config: Config, executor: Executor) -> Result<Arc<Self>> {
-        let mut db_options = db::ConnectOptions::new(config.database_url.clone());
-        db_options.max_connections(config.database_max_connections);
-        let mut db = Database::new(db_options).await?;
-        db.initialize_notification_kinds().await?;
-
-        let livekit_client = if let Some(((server, key), secret)) = config
-            .livekit_server
-            .as_ref()
-            .zip(config.livekit_key.as_ref())
-            .zip(config.livekit_secret.as_ref())
-        {
-            Some(Arc::new(livekit_api::LiveKitClient::new(
-                server.clone(),
-                key.clone(),
-                secret.clone(),
-            )) as Arc<dyn livekit_api::Client>)
-        } else {
-            None
-        };
-
-        let db = Arc::new(db);
-        let this = Self {
-            db: db.clone(),
-            livekit_client,
-            blob_store_client: build_blob_store_client(&config).await.log_err(),
-            executor,
-            kinesis_client: if config.kinesis_access_key.is_some() {
-                build_kinesis_client(&config).await.log_err()
-            } else {
-                None
-            },
-            config,
-        };
-        Ok(Arc::new(this))
-    }
-}
-
-async fn build_blob_store_client(config: &Config) -> anyhow::Result<aws_sdk_s3::Client> {
-    let keys = aws_sdk_s3::config::Credentials::new(
-        config
-            .blob_store_access_key
-            .clone()
-            .context("missing blob_store_access_key")?,
-        config
-            .blob_store_secret_key
-            .clone()
-            .context("missing blob_store_secret_key")?,
-        None,
-        None,
-        "env",
-    );
-
-    let s3_config = aws_config::defaults(BehaviorVersion::latest())
-        .endpoint_url(
-            config
-                .blob_store_url
-                .as_ref()
-                .context("missing blob_store_url")?,
-        )
-        .region(Region::new(
-            config
-                .blob_store_region
-                .clone()
-                .context("missing blob_store_region")?,
-        ))
-        .credentials_provider(keys)
-        .load()
-        .await;
-
-    Ok(aws_sdk_s3::Client::new(&s3_config))
-}
-
-async fn build_kinesis_client(config: &Config) -> anyhow::Result<aws_sdk_kinesis::Client> {
-    let keys = aws_sdk_s3::config::Credentials::new(
-        config
-            .kinesis_access_key
-            .clone()
-            .context("missing kinesis_access_key")?,
-        config
-            .kinesis_secret_key
-            .clone()
-            .context("missing kinesis_secret_key")?,
-        None,
-        None,
-        "env",
-    );
-
-    let kinesis_config = aws_config::defaults(BehaviorVersion::latest())
-        .region(Region::new(
-            config
-                .kinesis_region
-                .clone()
-                .context("missing kinesis_region")?,
-        ))
-        .credentials_provider(keys)
-        .load()
-        .await;
-
-    Ok(aws_sdk_kinesis::Client::new(&kinesis_config))
-}
diff --git a/crates/collab/src/main.rs b/crates/collab/src/main.rs
deleted file mode 100644
index 030158c94d..0000000000
--- a/crates/collab/src/main.rs
+++ /dev/null
@@ -1,273 +0,0 @@
-use anyhow::anyhow;
-use axum::headers::HeaderMapExt;
-use axum::{
-    Extension, Router,
-    extract::MatchedPath,
-    http::{Request, Response},
-    routing::get,
-};
-
-use collab::ServiceMode;
-use collab::api::CloudflareIpCountryHeader;
-use collab::{
-    AppState, Config, Result, api::fetch_extensions_from_blob_store_periodically, db, env,
-    executor::Executor,
-};
-use db::Database;
-use std::{
-    env::args,
-    net::{SocketAddr, TcpListener},
-    sync::Arc,
-    time::Duration,
-};
-#[cfg(unix)]
-use tokio::signal::unix::SignalKind;
-use tower_http::trace::TraceLayer;
-use tracing_subscriber::{
-    Layer, filter::EnvFilter, fmt::format::JsonFields, util::SubscriberInitExt,
-};
-use util::ResultExt as _;
-
-const VERSION: &str = env!("CARGO_PKG_VERSION");
-const REVISION: Option<&'static str> = option_env!("GITHUB_SHA");
-
-#[expect(clippy::result_large_err)]
-#[tokio::main]
-async fn main() -> Result<()> {
-    if let Err(error) = env::load_dotenv() {
-        eprintln!(
-            "error loading .env.toml (this is expected in production): {}",
-            error
-        );
-    }
-
-    let mut args = args().skip(1);
-    match args.next().as_deref() {
-        Some("version") => {
-            println!("collab v{} ({})", VERSION, REVISION.unwrap_or("unknown"));
-        }
-        Some("seed") => {
-            let config = envy::from_env::<Config>().expect("error loading config");
-            let db_options = db::ConnectOptions::new(config.database_url.clone());
-
-            let mut db = Database::new(db_options).await?;
-            db.initialize_notification_kinds().await?;
-
-            collab::seed::seed(&config, &db, false).await?;
-        }
-        Some("serve") => {
-            let mode = match args.next().as_deref() {
-                Some("collab") => ServiceMode::Collab,
-                Some("api") => ServiceMode::Api,
-                Some("all") => ServiceMode::All,
-                _ => {
-                    return Err(anyhow!(
-                        "usage: collab <version | seed | serve <api|collab|all>>"
-                    ))?;
-                }
-            };
-
-            let config = envy::from_env::<Config>().expect("error loading config");
-            init_tracing(&config);
-            init_panic_hook();
-
-            let mut app = Router::new()
-                .route("/", get(handle_root))
-                .route("/healthz", get(handle_liveness_probe))
-                .layer(Extension(mode));
-
-            let listener = TcpListener::bind(format!("0.0.0.0:{}", config.http_port))
-                .expect("failed to bind TCP listener");
-
-            let mut on_shutdown = None;
-
-            if mode.is_collab() || mode.is_api() {
-                setup_app_database(&config).await?;
-
-                let state = AppState::new(config, Executor::Production).await?;
-
-                if mode.is_collab() {
-                    let epoch = state
-                        .db
-                        .create_server(&state.config.zed_environment)
-                        .await?;
-                    let rpc_server = collab::rpc::Server::new(epoch, state.clone());
-                    rpc_server.start().await?;
-
-                    app = app
-                        .merge(collab::api::routes(rpc_server.clone()))
-                        .merge(collab::rpc::routes(rpc_server.clone()));
-
-                    on_shutdown = Some(Box::new(move || rpc_server.teardown()));
-                }
-
-                if mode.is_api() {
-                    fetch_extensions_from_blob_store_periodically(state.clone());
-
-                    app = app
-                        .merge(collab::api::events::router())
-                        .merge(collab::api::extensions::router())
-                }
-
-                app = app.layer(Extension(state.clone()));
-            }
-
-            app = app.layer(
-                TraceLayer::new_for_http()
-                    .make_span_with(|request: &Request<_>| {
-                        let matched_path = request
-                            .extensions()
-                            .get::<MatchedPath>()
-                            .map(MatchedPath::as_str);
-
-                        let geoip_country_code = request
-                            .headers()
-                            .typed_get::<CloudflareIpCountryHeader>()
-                            .map(|header| header.to_string());
-
-                        tracing::info_span!(
-                            "http_request",
-                            method = ?request.method(),
-                            matched_path,
-                            geoip_country_code,
-                            user_id = tracing::field::Empty,
-                            login = tracing::field::Empty,
-                            authn.jti = tracing::field::Empty,
-                            is_staff = tracing::field::Empty
-                        )
-                    })
-                    .on_response(
-                        |response: &Response<_>, latency: Duration, _: &tracing::Span| {
-                            let duration_ms = latency.as_micros() as f64 / 1000.;
-                            tracing::info!(
-                                duration_ms,
-                                status = response.status().as_u16(),
-                                "finished processing request"
-                            );
-                        },
-                    ),
-            );
-
-            #[cfg(unix)]
-            let signal = async move {
-                let mut sigterm = tokio::signal::unix::signal(SignalKind::terminate())
-                    .expect("failed to listen for interrupt signal");
-                let mut sigint = tokio::signal::unix::signal(SignalKind::interrupt())
-                    .expect("failed to listen for interrupt signal");
-                let sigterm = sigterm.recv();
-                let sigint = sigint.recv();
-                futures::pin_mut!(sigterm, sigint);
-                futures::future::select(sigterm, sigint).await;
-            };
-
-            #[cfg(windows)]
-            let signal = async move {
-                // todo(windows):
-                // `ctrl_close` does not work well, because tokio's signal handler always returns soon,
-                // but system terminates the application soon after returning CTRL+CLOSE handler.
-                // So we should implement blocking handler to treat CTRL+CLOSE signal.
-                let mut ctrl_break = tokio::signal::windows::ctrl_break()
-                    .expect("failed to listen for interrupt signal");
-                let mut ctrl_c = tokio::signal::windows::ctrl_c()
-                    .expect("failed to listen for interrupt signal");
-                let ctrl_break = ctrl_break.recv();
-                let ctrl_c = ctrl_c.recv();
-                futures::pin_mut!(ctrl_break, ctrl_c);
-                futures::future::select(ctrl_break, ctrl_c).await;
-            };
-
-            axum::Server::from_tcp(listener)
-                .map_err(|e| anyhow!(e))?
-                .serve(app.into_make_service_with_connect_info::<SocketAddr>())
-                .with_graceful_shutdown(async move {
-                    signal.await;
-                    tracing::info!("Received interrupt signal");
-
-                    if let Some(on_shutdown) = on_shutdown {
-                        on_shutdown();
-                    }
-                })
-                .await
-                .map_err(|e| anyhow!(e))?;
-        }
-        _ => {
-            Err(anyhow!(
-                "usage: collab <version | migrate | seed | serve <api|collab|llm|all>>"
-            ))?;
-        }
-    }
-    Ok(())
-}
-
-async fn setup_app_database(config: &Config) -> Result<()> {
-    let db_options = db::ConnectOptions::new(config.database_url.clone());
-    let mut db = Database::new(db_options).await?;
-
-    db.initialize_notification_kinds().await?;
-
-    if config.seed_path.is_some() {
-        collab::seed::seed(config, &db, false).await?;
-    }
-
-    Ok(())
-}
-
-async fn handle_root(Extension(mode): Extension<ServiceMode>) -> String {
-    format!("zed:{mode} v{VERSION} ({})", REVISION.unwrap_or("unknown"))
-}
-
-async fn handle_liveness_probe(app_state: Option<Extension<Arc<AppState>>>) -> Result<String> {
-    if let Some(state) = app_state {
-        state.db.get_all_users(0, 1).await?;
-    }
-
-    Ok("ok".to_string())
-}
-
-pub fn init_tracing(config: &Config) -> Option<()> {
-    use std::str::FromStr;
-    use tracing_subscriber::layer::SubscriberExt;
-
-    let filter = EnvFilter::from_str(config.rust_log.as_deref()?).log_err()?;
-
-    tracing_subscriber::registry()
-        .with(if config.log_json.unwrap_or(false) {
-            Box::new(
-                tracing_subscriber::fmt::layer()
-                    .fmt_fields(JsonFields::default())
-                    .event_format(
-                        tracing_subscriber::fmt::format()
-                            .json()
-                            .flatten_event(true)
-                            .with_span_list(false),
-                    )
-                    .with_filter(filter),
-            ) as Box<dyn Layer<_> + Send + Sync>
-        } else {
-            Box::new(
-                tracing_subscriber::fmt::layer()
-                    .event_format(tracing_subscriber::fmt::format().pretty())
-                    .with_filter(filter),
-            )
-        })
-        .init();
-
-    None
-}
-
-fn init_panic_hook() {
-    std::panic::set_hook(Box::new(move |panic_info| {
-        let panic_message = match panic_info.payload().downcast_ref::<&'static str>() {
-            Some(message) => *message,
-            None => match panic_info.payload().downcast_ref::<String>() {
-                Some(message) => message.as_str(),
-                None => "Box<Any>",
-            },
-        };
-        let backtrace = std::backtrace::Backtrace::force_capture();
-        let location = panic_info
-            .location()
-            .map(|loc| format!("{}:{}", loc.file(), loc.line()));
-        tracing::error!(panic = true, ?location, %panic_message, %backtrace, "Server Panic");
-    }));
-}
diff --git a/crates/collab/src/rpc.rs b/crates/collab/src/rpc.rs
deleted file mode 100644
index 9511087af8..0000000000
--- a/crates/collab/src/rpc.rs
+++ /dev/null
@@ -1,4150 +0,0 @@
-mod connection_pool;
-
-use crate::api::{CloudflareIpCountryHeader, SystemIdHeader};
-use crate::{
-    AppState, Error, Result, auth,
-    db::{
-        self, BufferId, Capability, Channel, ChannelId, ChannelRole, ChannelsForUser, Database,
-        InviteMemberResult, MembershipUpdated, NotificationId, ProjectId, RejoinedProject,
-        RemoveChannelMemberResult, RespondToChannelInvite, RoomId, ServerId, User, UserId,
-    },
-    executor::Executor,
-};
-use anyhow::{Context as _, anyhow, bail};
-use async_tungstenite::tungstenite::{
-    Message as TungsteniteMessage, protocol::CloseFrame as TungsteniteCloseFrame,
-};
-use axum::headers::UserAgent;
-use axum::{
-    Extension, Router, TypedHeader,
-    body::Body,
-    extract::{
-        ConnectInfo, WebSocketUpgrade,
-        ws::{CloseFrame as AxumCloseFrame, Message as AxumMessage},
-    },
-    headers::{Header, HeaderName},
-    http::StatusCode,
-    middleware,
-    response::IntoResponse,
-    routing::get,
-};
-use collections::{HashMap, HashSet};
-pub use connection_pool::{ConnectionPool, ZedVersion};
-use core::fmt::{self, Debug, Formatter};
-use futures::TryFutureExt as _;
-use reqwest_client::ReqwestClient;
-use rpc::proto::split_repository_update;
-use supermaven_api::{CreateExternalUserRequest, SupermavenAdminApi};
-use tracing::Span;
-use util::paths::PathStyle;
-
-use futures::{
-    FutureExt, SinkExt, StreamExt, TryStreamExt, channel::oneshot, future::BoxFuture,
-    stream::FuturesUnordered,
-};
-use prometheus::{IntGauge, register_int_gauge};
-use rpc::{
-    Connection, ConnectionId, ErrorCode, ErrorCodeExt, ErrorExt, Peer, Receipt, TypedEnvelope,
-    proto::{
-        self, Ack, AnyTypedEnvelope, EntityMessage, EnvelopedMessage, LiveKitConnectionInfo,
-        RequestMessage, ShareProject, UpdateChannelBufferCollaborators,
-    },
-};
-use semver::Version;
-use serde::{Serialize, Serializer};
-use std::{
-    any::TypeId,
-    future::Future,
-    marker::PhantomData,
-    mem,
-    net::SocketAddr,
-    ops::{Deref, DerefMut},
-    rc::Rc,
-    sync::{
-        Arc, OnceLock,
-        atomic::{AtomicBool, AtomicUsize, Ordering::SeqCst},
-    },
-    time::{Duration, Instant},
-};
-use tokio::sync::{Semaphore, watch};
-use tower::ServiceBuilder;
-use tracing::{
-    Instrument,
-    field::{self},
-    info_span, instrument,
-};
-
-pub const RECONNECT_TIMEOUT: Duration = Duration::from_secs(30);
-
-// kubernetes gives terminated pods 10s to shutdown gracefully. After they're gone, we can clean up old resources.
-pub const CLEANUP_TIMEOUT: Duration = Duration::from_secs(15);
-
-const NOTIFICATION_COUNT_PER_PAGE: usize = 50;
-const MAX_CONCURRENT_CONNECTIONS: usize = 512;
-
-static CONCURRENT_CONNECTIONS: AtomicUsize = AtomicUsize::new(0);
-
-const TOTAL_DURATION_MS: &str = "total_duration_ms";
-const PROCESSING_DURATION_MS: &str = "processing_duration_ms";
-const QUEUE_DURATION_MS: &str = "queue_duration_ms";
-const HOST_WAITING_MS: &str = "host_waiting_ms";
-
-type MessageHandler =
-    Box<dyn Send + Sync + Fn(Box<dyn AnyTypedEnvelope>, Session, Span) -> BoxFuture<'static, ()>>;
-
-pub struct ConnectionGuard;
-
-impl ConnectionGuard {
-    pub fn try_acquire() -> Result<Self, ()> {
-        let current_connections = CONCURRENT_CONNECTIONS.fetch_add(1, SeqCst);
-        if current_connections >= MAX_CONCURRENT_CONNECTIONS {
-            CONCURRENT_CONNECTIONS.fetch_sub(1, SeqCst);
-            tracing::error!(
-                "too many concurrent connections: {}",
-                current_connections + 1
-            );
-            return Err(());
-        }
-        Ok(ConnectionGuard)
-    }
-}
-
-impl Drop for ConnectionGuard {
-    fn drop(&mut self) {
-        CONCURRENT_CONNECTIONS.fetch_sub(1, SeqCst);
-    }
-}
-
-struct Response<R> {
-    peer: Arc<Peer>,
-    receipt: Receipt<R>,
-    responded: Arc<AtomicBool>,
-}
-
-impl<R: RequestMessage> Response<R> {
-    fn send(self, payload: R::Response) -> Result<()> {
-        self.responded.store(true, SeqCst);
-        self.peer.respond(self.receipt, payload)?;
-        Ok(())
-    }
-}
-
-#[derive(Clone, Debug)]
-pub enum Principal {
-    User(User),
-    Impersonated { user: User, admin: User },
-}
-
-impl Principal {
-    fn update_span(&self, span: &tracing::Span) {
-        match &self {
-            Principal::User(user) => {
-                span.record("user_id", user.id.0);
-                span.record("login", &user.github_login);
-            }
-            Principal::Impersonated { user, admin } => {
-                span.record("user_id", user.id.0);
-                span.record("login", &user.github_login);
-                span.record("impersonator", &admin.github_login);
-            }
-        }
-    }
-}
-
-#[derive(Clone)]
-struct MessageContext {
-    session: Session,
-    span: tracing::Span,
-}
-
-impl Deref for MessageContext {
-    type Target = Session;
-
-    fn deref(&self) -> &Self::Target {
-        &self.session
-    }
-}
-
-impl MessageContext {
-    pub fn forward_request<T: RequestMessage>(
-        &self,
-        receiver_id: ConnectionId,
-        request: T,
-    ) -> impl Future<Output = anyhow::Result<T::Response>> {
-        let request_start_time = Instant::now();
-        let span = self.span.clone();
-        tracing::info!("start forwarding request");
-        self.peer
-            .forward_request(self.connection_id, receiver_id, request)
-            .inspect(move |_| {
-                span.record(
-                    HOST_WAITING_MS,
-                    request_start_time.elapsed().as_micros() as f64 / 1000.0,
-                );
-            })
-            .inspect_err(|_| tracing::error!("error forwarding request"))
-            .inspect_ok(|_| tracing::info!("finished forwarding request"))
-    }
-}
-
-#[derive(Clone)]
-struct Session {
-    principal: Principal,
-    connection_id: ConnectionId,
-    db: Arc<tokio::sync::Mutex<DbHandle>>,
-    peer: Arc<Peer>,
-    connection_pool: Arc<parking_lot::Mutex<ConnectionPool>>,
-    app_state: Arc<AppState>,
-    supermaven_client: Option<Arc<SupermavenAdminApi>>,
-    /// The GeoIP country code for the user.
-    #[allow(unused)]
-    geoip_country_code: Option<String>,
-    #[allow(unused)]
-    system_id: Option<String>,
-    _executor: Executor,
-}
-
-impl Session {
-    async fn db(&self) -> tokio::sync::MutexGuard<'_, DbHandle> {
-        #[cfg(test)]
-        tokio::task::yield_now().await;
-        let guard = self.db.lock().await;
-        #[cfg(test)]
-        tokio::task::yield_now().await;
-        guard
-    }
-
-    async fn connection_pool(&self) -> ConnectionPoolGuard<'_> {
-        #[cfg(test)]
-        tokio::task::yield_now().await;
-        let guard = self.connection_pool.lock();
-        ConnectionPoolGuard {
-            guard,
-            _not_send: PhantomData,
-        }
-    }
-
-    fn is_staff(&self) -> bool {
-        match &self.principal {
-            Principal::User(user) => user.admin,
-            Principal::Impersonated { .. } => true,
-        }
-    }
-
-    fn user_id(&self) -> UserId {
-        match &self.principal {
-            Principal::User(user) => user.id,
-            Principal::Impersonated { user, .. } => user.id,
-        }
-    }
-
-    pub fn email(&self) -> Option<String> {
-        match &self.principal {
-            Principal::User(user) => user.email_address.clone(),
-            Principal::Impersonated { user, .. } => user.email_address.clone(),
-        }
-    }
-}
-
-impl Debug for Session {
-    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        let mut result = f.debug_struct("Session");
-        match &self.principal {
-            Principal::User(user) => {
-                result.field("user", &user.github_login);
-            }
-            Principal::Impersonated { user, admin } => {
-                result.field("user", &user.github_login);
-                result.field("impersonator", &admin.github_login);
-            }
-        }
-        result.field("connection_id", &self.connection_id).finish()
-    }
-}
-
-struct DbHandle(Arc<Database>);
-
-impl Deref for DbHandle {
-    type Target = Database;
-
-    fn deref(&self) -> &Self::Target {
-        self.0.as_ref()
-    }
-}
-
-pub struct Server {
-    id: parking_lot::Mutex<ServerId>,
-    peer: Arc<Peer>,
-    pub(crate) connection_pool: Arc<parking_lot::Mutex<ConnectionPool>>,
-    app_state: Arc<AppState>,
-    handlers: HashMap<TypeId, MessageHandler>,
-    teardown: watch::Sender<bool>,
-}
-
-pub(crate) struct ConnectionPoolGuard<'a> {
-    guard: parking_lot::MutexGuard<'a, ConnectionPool>,
-    _not_send: PhantomData<Rc<()>>,
-}
-
-#[derive(Serialize)]
-pub struct ServerSnapshot<'a> {
-    peer: &'a Peer,
-    #[serde(serialize_with = "serialize_deref")]
-    connection_pool: ConnectionPoolGuard<'a>,
-}
-
-pub fn serialize_deref<S, T, U>(value: &T, serializer: S) -> Result<S::Ok, S::Error>
-where
-    S: Serializer,
-    T: Deref<Target = U>,
-    U: Serialize,
-{
-    Serialize::serialize(value.deref(), serializer)
-}
-
-impl Server {
-    pub fn new(id: ServerId, app_state: Arc<AppState>) -> Arc<Self> {
-        let mut server = Self {
-            id: parking_lot::Mutex::new(id),
-            peer: Peer::new(id.0 as u32),
-            app_state,
-            connection_pool: Default::default(),
-            handlers: Default::default(),
-            teardown: watch::channel(false).0,
-        };
-
-        server
-            .add_request_handler(ping)
-            .add_request_handler(create_room)
-            .add_request_handler(join_room)
-            .add_request_handler(rejoin_room)
-            .add_request_handler(leave_room)
-            .add_request_handler(set_room_participant_role)
-            .add_request_handler(call)
-            .add_request_handler(cancel_call)
-            .add_message_handler(decline_call)
-            .add_request_handler(update_participant_location)
-            .add_request_handler(share_project)
-            .add_message_handler(unshare_project)
-            .add_request_handler(join_project)
-            .add_message_handler(leave_project)
-            .add_request_handler(update_project)
-            .add_request_handler(update_worktree)
-            .add_request_handler(update_repository)
-            .add_request_handler(remove_repository)
-            .add_message_handler(start_language_server)
-            .add_message_handler(update_language_server)
-            .add_message_handler(update_diagnostic_summary)
-            .add_message_handler(update_worktree_settings)
-            .add_request_handler(forward_read_only_project_request::<proto::FindSearchCandidates>)
-            .add_request_handler(forward_read_only_project_request::<proto::GetDocumentHighlights>)
-            .add_request_handler(forward_read_only_project_request::<proto::GetDocumentSymbols>)
-            .add_request_handler(forward_read_only_project_request::<proto::GetProjectSymbols>)
-            .add_request_handler(forward_read_only_project_request::<proto::OpenBufferForSymbol>)
-            .add_request_handler(forward_read_only_project_request::<proto::OpenBufferById>)
-            .add_request_handler(forward_read_only_project_request::<proto::SynchronizeBuffers>)
-            .add_request_handler(forward_read_only_project_request::<proto::ResolveInlayHint>)
-            .add_request_handler(forward_read_only_project_request::<proto::GetColorPresentation>)
-            .add_request_handler(forward_read_only_project_request::<proto::OpenBufferByPath>)
-            .add_request_handler(forward_read_only_project_request::<proto::OpenImageByPath>)
-            .add_request_handler(forward_read_only_project_request::<proto::GitGetBranches>)
-            .add_request_handler(forward_read_only_project_request::<proto::GetDefaultBranch>)
-            .add_request_handler(forward_read_only_project_request::<proto::OpenUnstagedDiff>)
-            .add_request_handler(forward_read_only_project_request::<proto::OpenUncommittedDiff>)
-            .add_request_handler(forward_read_only_project_request::<proto::LspExtExpandMacro>)
-            .add_request_handler(forward_read_only_project_request::<proto::LspExtOpenDocs>)
-            .add_request_handler(forward_mutating_project_request::<proto::LspExtRunnables>)
-            .add_request_handler(
-                forward_read_only_project_request::<proto::LspExtSwitchSourceHeader>,
-            )
-            .add_request_handler(forward_read_only_project_request::<proto::LspExtGoToParentModule>)
-            .add_request_handler(forward_read_only_project_request::<proto::LspExtCancelFlycheck>)
-            .add_request_handler(forward_read_only_project_request::<proto::LspExtRunFlycheck>)
-            .add_request_handler(forward_read_only_project_request::<proto::LspExtClearFlycheck>)
-            .add_request_handler(
-                forward_mutating_project_request::<proto::RegisterBufferWithLanguageServers>,
-            )
-            .add_request_handler(forward_mutating_project_request::<proto::UpdateGitBranch>)
-            .add_request_handler(forward_mutating_project_request::<proto::GetCompletions>)
-            .add_request_handler(
-                forward_mutating_project_request::<proto::ApplyCompletionAdditionalEdits>,
-            )
-            .add_request_handler(forward_mutating_project_request::<proto::OpenNewBuffer>)
-            .add_request_handler(
-                forward_mutating_project_request::<proto::ResolveCompletionDocumentation>,
-            )
-            .add_request_handler(forward_mutating_project_request::<proto::ApplyCodeAction>)
-            .add_request_handler(forward_mutating_project_request::<proto::PrepareRename>)
-            .add_request_handler(forward_mutating_project_request::<proto::PerformRename>)
-            .add_request_handler(forward_mutating_project_request::<proto::ReloadBuffers>)
-            .add_request_handler(forward_mutating_project_request::<proto::ApplyCodeActionKind>)
-            .add_request_handler(forward_mutating_project_request::<proto::FormatBuffers>)
-            .add_request_handler(forward_mutating_project_request::<proto::CreateProjectEntry>)
-            .add_request_handler(forward_mutating_project_request::<proto::RenameProjectEntry>)
-            .add_request_handler(forward_mutating_project_request::<proto::CopyProjectEntry>)
-            .add_request_handler(forward_mutating_project_request::<proto::DeleteProjectEntry>)
-            .add_request_handler(forward_mutating_project_request::<proto::ExpandProjectEntry>)
-            .add_request_handler(
-                forward_mutating_project_request::<proto::ExpandAllForProjectEntry>,
-            )
-            .add_request_handler(forward_mutating_project_request::<proto::OnTypeFormatting>)
-            .add_request_handler(forward_mutating_project_request::<proto::SaveBuffer>)
-            .add_request_handler(forward_mutating_project_request::<proto::BlameBuffer>)
-            .add_request_handler(lsp_query)
-            .add_message_handler(broadcast_project_message_from_host::<proto::LspQueryResponse>)
-            .add_request_handler(forward_mutating_project_request::<proto::RestartLanguageServers>)
-            .add_request_handler(forward_mutating_project_request::<proto::StopLanguageServers>)
-            .add_request_handler(forward_mutating_project_request::<proto::LinkedEditingRange>)
-            .add_message_handler(create_buffer_for_peer)
-            .add_message_handler(create_image_for_peer)
-            .add_request_handler(update_buffer)
-            .add_message_handler(broadcast_project_message_from_host::<proto::RefreshInlayHints>)
-            .add_message_handler(broadcast_project_message_from_host::<proto::RefreshCodeLens>)
-            .add_message_handler(broadcast_project_message_from_host::<proto::UpdateBufferFile>)
-            .add_message_handler(broadcast_project_message_from_host::<proto::BufferReloaded>)
-            .add_message_handler(broadcast_project_message_from_host::<proto::BufferSaved>)
-            .add_message_handler(broadcast_project_message_from_host::<proto::UpdateDiffBases>)
-            .add_message_handler(
-                broadcast_project_message_from_host::<proto::PullWorkspaceDiagnostics>,
-            )
-            .add_request_handler(get_users)
-            .add_request_handler(fuzzy_search_users)
-            .add_request_handler(request_contact)
-            .add_request_handler(remove_contact)
-            .add_request_handler(respond_to_contact_request)
-            .add_message_handler(subscribe_to_channels)
-            .add_request_handler(create_channel)
-            .add_request_handler(delete_channel)
-            .add_request_handler(invite_channel_member)
-            .add_request_handler(remove_channel_member)
-            .add_request_handler(set_channel_member_role)
-            .add_request_handler(set_channel_visibility)
-            .add_request_handler(rename_channel)
-            .add_request_handler(join_channel_buffer)
-            .add_request_handler(leave_channel_buffer)
-            .add_message_handler(update_channel_buffer)
-            .add_request_handler(rejoin_channel_buffers)
-            .add_request_handler(get_channel_members)
-            .add_request_handler(respond_to_channel_invite)
-            .add_request_handler(join_channel)
-            .add_request_handler(join_channel_chat)
-            .add_message_handler(leave_channel_chat)
-            .add_request_handler(send_channel_message)
-            .add_request_handler(remove_channel_message)
-            .add_request_handler(update_channel_message)
-            .add_request_handler(get_channel_messages)
-            .add_request_handler(get_channel_messages_by_id)
-            .add_request_handler(get_notifications)
-            .add_request_handler(mark_notification_as_read)
-            .add_request_handler(move_channel)
-            .add_request_handler(reorder_channel)
-            .add_request_handler(follow)
-            .add_message_handler(unfollow)
-            .add_message_handler(update_followers)
-            .add_message_handler(acknowledge_channel_message)
-            .add_message_handler(acknowledge_buffer_version)
-            .add_request_handler(get_supermaven_api_key)
-            .add_request_handler(forward_mutating_project_request::<proto::OpenContext>)
-            .add_request_handler(forward_mutating_project_request::<proto::CreateContext>)
-            .add_request_handler(forward_mutating_project_request::<proto::SynchronizeContexts>)
-            .add_request_handler(forward_mutating_project_request::<proto::Stage>)
-            .add_request_handler(forward_mutating_project_request::<proto::Unstage>)
-            .add_request_handler(forward_mutating_project_request::<proto::Stash>)
-            .add_request_handler(forward_mutating_project_request::<proto::StashPop>)
-            .add_request_handler(forward_mutating_project_request::<proto::StashDrop>)
-            .add_request_handler(forward_mutating_project_request::<proto::Commit>)
-            .add_request_handler(forward_mutating_project_request::<proto::RunGitHook>)
-            .add_request_handler(forward_mutating_project_request::<proto::GitInit>)
-            .add_request_handler(forward_read_only_project_request::<proto::GetRemotes>)
-            .add_request_handler(forward_read_only_project_request::<proto::GitShow>)
-            .add_request_handler(forward_read_only_project_request::<proto::LoadCommitDiff>)
-            .add_request_handler(forward_read_only_project_request::<proto::GitReset>)
-            .add_request_handler(forward_read_only_project_request::<proto::GitCheckoutFiles>)
-            .add_request_handler(forward_mutating_project_request::<proto::SetIndexText>)
-            .add_request_handler(forward_mutating_project_request::<proto::ToggleBreakpoint>)
-            .add_message_handler(broadcast_project_message_from_host::<proto::BreakpointsForFile>)
-            .add_request_handler(forward_mutating_project_request::<proto::OpenCommitMessageBuffer>)
-            .add_request_handler(forward_mutating_project_request::<proto::GitDiff>)
-            .add_request_handler(forward_mutating_project_request::<proto::GetTreeDiff>)
-            .add_request_handler(forward_mutating_project_request::<proto::GetBlobContent>)
-            .add_request_handler(forward_mutating_project_request::<proto::GitCreateBranch>)
-            .add_request_handler(forward_mutating_project_request::<proto::GitChangeBranch>)
-            .add_request_handler(forward_mutating_project_request::<proto::GitCreateRemote>)
-            .add_request_handler(forward_mutating_project_request::<proto::GitRemoveRemote>)
-            .add_request_handler(forward_mutating_project_request::<proto::CheckForPushedCommits>)
-            .add_message_handler(broadcast_project_message_from_host::<proto::AdvertiseContexts>)
-            .add_message_handler(update_context)
-            .add_request_handler(forward_mutating_project_request::<proto::ToggleLspLogs>)
-            .add_message_handler(broadcast_project_message_from_host::<proto::LanguageServerLog>);
-
-        Arc::new(server)
-    }
-
-    pub async fn start(&self) -> Result<()> {
-        let server_id = *self.id.lock();
-        let app_state = self.app_state.clone();
-        let peer = self.peer.clone();
-        let timeout = self.app_state.executor.sleep(CLEANUP_TIMEOUT);
-        let pool = self.connection_pool.clone();
-        let livekit_client = self.app_state.livekit_client.clone();
-
-        let span = info_span!("start server");
-        self.app_state.executor.spawn_detached(
-            async move {
-                tracing::info!("waiting for cleanup timeout");
-                timeout.await;
-                tracing::info!("cleanup timeout expired, retrieving stale rooms");
-
-                app_state
-                    .db
-                    .delete_stale_channel_chat_participants(
-                        &app_state.config.zed_environment,
-                        server_id,
-                    )
-                    .await
-                    .trace_err();
-
-                if let Some((room_ids, channel_ids)) = app_state
-                    .db
-                    .stale_server_resource_ids(&app_state.config.zed_environment, server_id)
-                    .await
-                    .trace_err()
-                {
-                    tracing::info!(stale_room_count = room_ids.len(), "retrieved stale rooms");
-                    tracing::info!(
-                        stale_channel_buffer_count = channel_ids.len(),
-                        "retrieved stale channel buffers"
-                    );
-
-                    for channel_id in channel_ids {
-                        if let Some(refreshed_channel_buffer) = app_state
-                            .db
-                            .clear_stale_channel_buffer_collaborators(channel_id, server_id)
-                            .await
-                            .trace_err()
-                        {
-                            for connection_id in refreshed_channel_buffer.connection_ids {
-                                peer.send(
-                                    connection_id,
-                                    proto::UpdateChannelBufferCollaborators {
-                                        channel_id: channel_id.to_proto(),
-                                        collaborators: refreshed_channel_buffer
-                                            .collaborators
-                                            .clone(),
-                                    },
-                                )
-                                .trace_err();
-                            }
-                        }
-                    }
-
-                    for room_id in room_ids {
-                        let mut contacts_to_update = HashSet::default();
-                        let mut canceled_calls_to_user_ids = Vec::new();
-                        let mut livekit_room = String::new();
-                        let mut delete_livekit_room = false;
-
-                        if let Some(mut refreshed_room) = app_state
-                            .db
-                            .clear_stale_room_participants(room_id, server_id)
-                            .await
-                            .trace_err()
-                        {
-                            tracing::info!(
-                                room_id = room_id.0,
-                                new_participant_count = refreshed_room.room.participants.len(),
-                                "refreshed room"
-                            );
-                            room_updated(&refreshed_room.room, &peer);
-                            if let Some(channel) = refreshed_room.channel.as_ref() {
-                                channel_updated(channel, &refreshed_room.room, &peer, &pool.lock());
-                            }
-                            contacts_to_update
-                                .extend(refreshed_room.stale_participant_user_ids.iter().copied());
-                            contacts_to_update
-                                .extend(refreshed_room.canceled_calls_to_user_ids.iter().copied());
-                            canceled_calls_to_user_ids =
-                                mem::take(&mut refreshed_room.canceled_calls_to_user_ids);
-                            livekit_room = mem::take(&mut refreshed_room.room.livekit_room);
-                            delete_livekit_room = refreshed_room.room.participants.is_empty();
-                        }
-
-                        {
-                            let pool = pool.lock();
-                            for canceled_user_id in canceled_calls_to_user_ids {
-                                for connection_id in pool.user_connection_ids(canceled_user_id) {
-                                    peer.send(
-                                        connection_id,
-                                        proto::CallCanceled {
-                                            room_id: room_id.to_proto(),
-                                        },
-                                    )
-                                    .trace_err();
-                                }
-                            }
-                        }
-
-                        for user_id in contacts_to_update {
-                            let busy = app_state.db.is_user_busy(user_id).await.trace_err();
-                            let contacts = app_state.db.get_contacts(user_id).await.trace_err();
-                            if let Some((busy, contacts)) = busy.zip(contacts) {
-                                let pool = pool.lock();
-                                let updated_contact = contact_for_user(user_id, busy, &pool);
-                                for contact in contacts {
-                                    if let db::Contact::Accepted {
-                                        user_id: contact_user_id,
-                                        ..
-                                    } = contact
-                                    {
-                                        for contact_conn_id in
-                                            pool.user_connection_ids(contact_user_id)
-                                        {
-                                            peer.send(
-                                                contact_conn_id,
-                                                proto::UpdateContacts {
-                                                    contacts: vec![updated_contact.clone()],
-                                                    remove_contacts: Default::default(),
-                                                    incoming_requests: Default::default(),
-                                                    remove_incoming_requests: Default::default(),
-                                                    outgoing_requests: Default::default(),
-                                                    remove_outgoing_requests: Default::default(),
-                                                },
-                                            )
-                                            .trace_err();
-                                        }
-                                    }
-                                }
-                            }
-                        }
-
-                        if let Some(live_kit) = livekit_client.as_ref()
-                            && delete_livekit_room
-                        {
-                            live_kit.delete_room(livekit_room).await.trace_err();
-                        }
-                    }
-                }
-
-                app_state
-                    .db
-                    .delete_stale_channel_chat_participants(
-                        &app_state.config.zed_environment,
-                        server_id,
-                    )
-                    .await
-                    .trace_err();
-
-                app_state
-                    .db
-                    .clear_old_worktree_entries(server_id)
-                    .await
-                    .trace_err();
-
-                app_state
-                    .db
-                    .delete_stale_servers(&app_state.config.zed_environment, server_id)
-                    .await
-                    .trace_err();
-            }
-            .instrument(span),
-        );
-        Ok(())
-    }
-
-    pub fn teardown(&self) {
-        self.peer.teardown();
-        self.connection_pool.lock().reset();
-        let _ = self.teardown.send(true);
-    }
-
-    #[cfg(test)]
-    pub fn reset(&self, id: ServerId) {
-        self.teardown();
-        *self.id.lock() = id;
-        self.peer.reset(id.0 as u32);
-        let _ = self.teardown.send(false);
-    }
-
-    #[cfg(test)]
-    pub fn id(&self) -> ServerId {
-        *self.id.lock()
-    }
-
-    fn add_handler<F, Fut, M>(&mut self, handler: F) -> &mut Self
-    where
-        F: 'static + Send + Sync + Fn(TypedEnvelope<M>, MessageContext) -> Fut,
-        Fut: 'static + Send + Future<Output = Result<()>>,
-        M: EnvelopedMessage,
-    {
-        let prev_handler = self.handlers.insert(
-            TypeId::of::<M>(),
-            Box::new(move |envelope, session, span| {
-                let envelope = envelope.into_any().downcast::<TypedEnvelope<M>>().unwrap();
-                let received_at = envelope.received_at;
-                tracing::info!("message received");
-                let start_time = Instant::now();
-                let future = (handler)(
-                    *envelope,
-                    MessageContext {
-                        session,
-                        span: span.clone(),
-                    },
-                );
-                async move {
-                    let result = future.await;
-                    let total_duration_ms = received_at.elapsed().as_micros() as f64 / 1000.0;
-                    let processing_duration_ms = start_time.elapsed().as_micros() as f64 / 1000.0;
-                    let queue_duration_ms = total_duration_ms - processing_duration_ms;
-                    span.record(TOTAL_DURATION_MS, total_duration_ms);
-                    span.record(PROCESSING_DURATION_MS, processing_duration_ms);
-                    span.record(QUEUE_DURATION_MS, queue_duration_ms);
-                    match result {
-                        Err(error) => {
-                            tracing::error!(?error, "error handling message")
-                        }
-                        Ok(()) => tracing::info!("finished handling message"),
-                    }
-                }
-                .boxed()
-            }),
-        );
-        if prev_handler.is_some() {
-            panic!("registered a handler for the same message twice");
-        }
-        self
-    }
-
-    fn add_message_handler<F, Fut, M>(&mut self, handler: F) -> &mut Self
-    where
-        F: 'static + Send + Sync + Fn(M, MessageContext) -> Fut,
-        Fut: 'static + Send + Future<Output = Result<()>>,
-        M: EnvelopedMessage,
-    {
-        self.add_handler(move |envelope, session| handler(envelope.payload, session));
-        self
-    }
-
-    fn add_request_handler<F, Fut, M>(&mut self, handler: F) -> &mut Self
-    where
-        F: 'static + Send + Sync + Fn(M, Response<M>, MessageContext) -> Fut,
-        Fut: Send + Future<Output = Result<()>>,
-        M: RequestMessage,
-    {
-        let handler = Arc::new(handler);
-        self.add_handler(move |envelope, session| {
-            let receipt = envelope.receipt();
-            let handler = handler.clone();
-            async move {
-                let peer = session.peer.clone();
-                let responded = Arc::new(AtomicBool::default());
-                let response = Response {
-                    peer: peer.clone(),
-                    responded: responded.clone(),
-                    receipt,
-                };
-                match (handler)(envelope.payload, response, session).await {
-                    Ok(()) => {
-                        if responded.load(std::sync::atomic::Ordering::SeqCst) {
-                            Ok(())
-                        } else {
-                            Err(anyhow!("handler did not send a response"))?
-                        }
-                    }
-                    Err(error) => {
-                        let proto_err = match &error {
-                            Error::Internal(err) => err.to_proto(),
-                            _ => ErrorCode::Internal.message(format!("{error}")).to_proto(),
-                        };
-                        peer.respond_with_error(receipt, proto_err)?;
-                        Err(error)
-                    }
-                }
-            }
-        })
-    }
-
-    pub fn handle_connection(
-        self: &Arc<Self>,
-        connection: Connection,
-        address: String,
-        principal: Principal,
-        zed_version: ZedVersion,
-        release_channel: Option<String>,
-        user_agent: Option<String>,
-        geoip_country_code: Option<String>,
-        system_id: Option<String>,
-        send_connection_id: Option<oneshot::Sender<ConnectionId>>,
-        executor: Executor,
-        connection_guard: Option<ConnectionGuard>,
-    ) -> impl Future<Output = ()> + use<> {
-        let this = self.clone();
-        let span = info_span!("handle connection", %address,
-            connection_id=field::Empty,
-            user_id=field::Empty,
-            login=field::Empty,
-            impersonator=field::Empty,
-            user_agent=field::Empty,
-            geoip_country_code=field::Empty,
-            release_channel=field::Empty,
-        );
-        principal.update_span(&span);
-        if let Some(user_agent) = user_agent {
-            span.record("user_agent", user_agent);
-        }
-        if let Some(release_channel) = release_channel {
-            span.record("release_channel", release_channel);
-        }
-
-        if let Some(country_code) = geoip_country_code.as_ref() {
-            span.record("geoip_country_code", country_code);
-        }
-
-        let mut teardown = self.teardown.subscribe();
-        async move {
-            if *teardown.borrow() {
-                tracing::error!("server is tearing down");
-                return;
-            }
-
-            let (connection_id, handle_io, mut incoming_rx) =
-                this.peer.add_connection(connection, {
-                    let executor = executor.clone();
-                    move |duration| executor.sleep(duration)
-                });
-            tracing::Span::current().record("connection_id", format!("{}", connection_id));
-
-            tracing::info!("connection opened");
-
-            let user_agent = format!("Zed Server/{}", env!("CARGO_PKG_VERSION"));
-            let http_client = match ReqwestClient::user_agent(&user_agent) {
-                Ok(http_client) => Arc::new(http_client),
-                Err(error) => {
-                    tracing::error!(?error, "failed to create HTTP client");
-                    return;
-                }
-            };
-
-            let supermaven_client = this.app_state.config.supermaven_admin_api_key.clone().map(
-                |supermaven_admin_api_key| {
-                    Arc::new(SupermavenAdminApi::new(
-                        supermaven_admin_api_key.to_string(),
-                        http_client.clone(),
-                    ))
-                },
-            );
-
-            let session = Session {
-                principal: principal.clone(),
-                connection_id,
-                db: Arc::new(tokio::sync::Mutex::new(DbHandle(this.app_state.db.clone()))),
-                peer: this.peer.clone(),
-                connection_pool: this.connection_pool.clone(),
-                app_state: this.app_state.clone(),
-                geoip_country_code,
-                system_id,
-                _executor: executor.clone(),
-                supermaven_client,
-            };
-
-            if let Err(error) = this
-                .send_initial_client_update(
-                    connection_id,
-                    zed_version,
-                    send_connection_id,
-                    &session,
-                )
-                .await
-            {
-                tracing::error!(?error, "failed to send initial client update");
-                return;
-            }
-            drop(connection_guard);
-
-            let handle_io = handle_io.fuse();
-            futures::pin_mut!(handle_io);
-
-            // Handlers for foreground messages are pushed into the following `FuturesUnordered`.
-            // This prevents deadlocks when e.g., client A performs a request to client B and
-            // client B performs a request to client A. If both clients stop processing further
-            // messages until their respective request completes, they won't have a chance to
-            // respond to the other client's request and cause a deadlock.
-            //
-            // This arrangement ensures we will attempt to process earlier messages first, but fall
-            // back to processing messages arrived later in the spirit of making progress.
-            const MAX_CONCURRENT_HANDLERS: usize = 256;
-            let mut foreground_message_handlers = FuturesUnordered::new();
-            let concurrent_handlers = Arc::new(Semaphore::new(MAX_CONCURRENT_HANDLERS));
-            let get_concurrent_handlers = {
-                let concurrent_handlers = concurrent_handlers.clone();
-                move || MAX_CONCURRENT_HANDLERS - concurrent_handlers.available_permits()
-            };
-            loop {
-                let next_message = async {
-                    let permit = concurrent_handlers.clone().acquire_owned().await.unwrap();
-                    let message = incoming_rx.next().await;
-                    // Cache the concurrent_handlers here, so that we know what the
-                    // queue looks like as each handler starts
-                    (permit, message, get_concurrent_handlers())
-                }
-                .fuse();
-                futures::pin_mut!(next_message);
-                futures::select_biased! {
-                    _ = teardown.changed().fuse() => return,
-                    result = handle_io => {
-                        if let Err(error) = result {
-                            tracing::error!(?error, "error handling I/O");
-                        }
-                        break;
-                    }
-                    _ = foreground_message_handlers.next() => {}
-                    next_message = next_message => {
-                        let (permit, message, concurrent_handlers) = next_message;
-                        if let Some(message) = message {
-                            let type_name = message.payload_type_name();
-                            // note: we copy all the fields from the parent span so we can query them in the logs.
-                            // (https://github.com/tokio-rs/tracing/issues/2670).
-                            let span = tracing::info_span!("receive message",
-                                %connection_id,
-                                %address,
-                                type_name,
-                                concurrent_handlers,
-                                user_id=field::Empty,
-                                login=field::Empty,
-                                impersonator=field::Empty,
-                                lsp_query_request=field::Empty,
-                                release_channel=field::Empty,
-                                { TOTAL_DURATION_MS }=field::Empty,
-                                { PROCESSING_DURATION_MS }=field::Empty,
-                                { QUEUE_DURATION_MS }=field::Empty,
-                                { HOST_WAITING_MS }=field::Empty
-                            );
-                            principal.update_span(&span);
-                            let span_enter = span.enter();
-                            if let Some(handler) = this.handlers.get(&message.payload_type_id()) {
-                                let is_background = message.is_background();
-                                let handle_message = (handler)(message, session.clone(), span.clone());
-                                drop(span_enter);
-
-                                let handle_message = async move {
-                                    handle_message.await;
-                                    drop(permit);
-                                }.instrument(span);
-                                if is_background {
-                                    executor.spawn_detached(handle_message);
-                                } else {
-                                    foreground_message_handlers.push(handle_message);
-                                }
-                            } else {
-                                tracing::error!("no message handler");
-                            }
-                        } else {
-                            tracing::info!("connection closed");
-                            break;
-                        }
-                    }
-                }
-            }
-
-            drop(foreground_message_handlers);
-            let concurrent_handlers = get_concurrent_handlers();
-            tracing::info!(concurrent_handlers, "signing out");
-            if let Err(error) = connection_lost(session, teardown, executor).await {
-                tracing::error!(?error, "error signing out");
-            }
-        }
-        .instrument(span)
-    }
-
-    async fn send_initial_client_update(
-        &self,
-        connection_id: ConnectionId,
-        zed_version: ZedVersion,
-        mut send_connection_id: Option<oneshot::Sender<ConnectionId>>,
-        session: &Session,
-    ) -> Result<()> {
-        self.peer.send(
-            connection_id,
-            proto::Hello {
-                peer_id: Some(connection_id.into()),
-            },
-        )?;
-        tracing::info!("sent hello message");
-        if let Some(send_connection_id) = send_connection_id.take() {
-            let _ = send_connection_id.send(connection_id);
-        }
-
-        match &session.principal {
-            Principal::User(user) | Principal::Impersonated { user, admin: _ } => {
-                if !user.connected_once {
-                    self.peer.send(connection_id, proto::ShowContacts {})?;
-                    self.app_state
-                        .db
-                        .set_user_connected_once(user.id, true)
-                        .await?;
-                }
-
-                let contacts = self.app_state.db.get_contacts(user.id).await?;
-
-                {
-                    let mut pool = self.connection_pool.lock();
-                    pool.add_connection(connection_id, user.id, user.admin, zed_version.clone());
-                    self.peer.send(
-                        connection_id,
-                        build_initial_contacts_update(contacts, &pool),
-                    )?;
-                }
-
-                if should_auto_subscribe_to_channels(&zed_version) {
-                    subscribe_user_to_channels(user.id, session).await?;
-                }
-
-                if let Some(incoming_call) =
-                    self.app_state.db.incoming_call_for_user(user.id).await?
-                {
-                    self.peer.send(connection_id, incoming_call)?;
-                }
-
-                update_user_contacts(user.id, session).await?;
-            }
-        }
-
-        Ok(())
-    }
-
-    pub async fn invite_code_redeemed(
-        self: &Arc<Self>,
-        inviter_id: UserId,
-        invitee_id: UserId,
-    ) -> Result<()> {
-        if let Some(user) = self.app_state.db.get_user_by_id(inviter_id).await?
-            && let Some(code) = &user.invite_code
-        {
-            let pool = self.connection_pool.lock();
-            let invitee_contact = contact_for_user(invitee_id, false, &pool);
-            for connection_id in pool.user_connection_ids(inviter_id) {
-                self.peer.send(
-                    connection_id,
-                    proto::UpdateContacts {
-                        contacts: vec![invitee_contact.clone()],
-                        ..Default::default()
-                    },
-                )?;
-                self.peer.send(
-                    connection_id,
-                    proto::UpdateInviteInfo {
-                        url: format!("{}{}", self.app_state.config.invite_link_prefix, &code),
-                        count: user.invite_count as u32,
-                    },
-                )?;
-            }
-        }
-        Ok(())
-    }
-
-    pub async fn invite_count_updated(self: &Arc<Self>, user_id: UserId) -> Result<()> {
-        if let Some(user) = self.app_state.db.get_user_by_id(user_id).await?
-            && let Some(invite_code) = &user.invite_code
-        {
-            let pool = self.connection_pool.lock();
-            for connection_id in pool.user_connection_ids(user_id) {
-                self.peer.send(
-                    connection_id,
-                    proto::UpdateInviteInfo {
-                        url: format!(
-                            "{}{}",
-                            self.app_state.config.invite_link_prefix, invite_code
-                        ),
-                        count: user.invite_count as u32,
-                    },
-                )?;
-            }
-        }
-        Ok(())
-    }
-
-    pub async fn snapshot(self: &Arc<Self>) -> ServerSnapshot<'_> {
-        ServerSnapshot {
-            connection_pool: ConnectionPoolGuard {
-                guard: self.connection_pool.lock(),
-                _not_send: PhantomData,
-            },
-            peer: &self.peer,
-        }
-    }
-}
-
-impl Deref for ConnectionPoolGuard<'_> {
-    type Target = ConnectionPool;
-
-    fn deref(&self) -> &Self::Target {
-        &self.guard
-    }
-}
-
-impl DerefMut for ConnectionPoolGuard<'_> {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.guard
-    }
-}
-
-impl Drop for ConnectionPoolGuard<'_> {
-    fn drop(&mut self) {
-        #[cfg(test)]
-        self.check_invariants();
-    }
-}
-
-fn broadcast<F>(
-    sender_id: Option<ConnectionId>,
-    receiver_ids: impl IntoIterator<Item = ConnectionId>,
-    mut f: F,
-) where
-    F: FnMut(ConnectionId) -> anyhow::Result<()>,
-{
-    for receiver_id in receiver_ids {
-        if Some(receiver_id) != sender_id
-            && let Err(error) = f(receiver_id)
-        {
-            tracing::error!("failed to send to {:?} {}", receiver_id, error);
-        }
-    }
-}
-
-pub struct ProtocolVersion(u32);
-
-impl Header for ProtocolVersion {
-    fn name() -> &'static HeaderName {
-        static ZED_PROTOCOL_VERSION: OnceLock<HeaderName> = OnceLock::new();
-        ZED_PROTOCOL_VERSION.get_or_init(|| HeaderName::from_static("x-zed-protocol-version"))
-    }
-
-    fn decode<'i, I>(values: &mut I) -> Result<Self, axum::headers::Error>
-    where
-        Self: Sized,
-        I: Iterator<Item = &'i axum::http::HeaderValue>,
-    {
-        let version = values
-            .next()
-            .ok_or_else(axum::headers::Error::invalid)?
-            .to_str()
-            .map_err(|_| axum::headers::Error::invalid())?
-            .parse()
-            .map_err(|_| axum::headers::Error::invalid())?;
-        Ok(Self(version))
-    }
-
-    fn encode<E: Extend<axum::http::HeaderValue>>(&self, values: &mut E) {
-        values.extend([self.0.to_string().parse().unwrap()]);
-    }
-}
-
-pub struct AppVersionHeader(Version);
-impl Header for AppVersionHeader {
-    fn name() -> &'static HeaderName {
-        static ZED_APP_VERSION: OnceLock<HeaderName> = OnceLock::new();
-        ZED_APP_VERSION.get_or_init(|| HeaderName::from_static("x-zed-app-version"))
-    }
-
-    fn decode<'i, I>(values: &mut I) -> Result<Self, axum::headers::Error>
-    where
-        Self: Sized,
-        I: Iterator<Item = &'i axum::http::HeaderValue>,
-    {
-        let version = values
-            .next()
-            .ok_or_else(axum::headers::Error::invalid)?
-            .to_str()
-            .map_err(|_| axum::headers::Error::invalid())?
-            .parse()
-            .map_err(|_| axum::headers::Error::invalid())?;
-        Ok(Self(version))
-    }
-
-    fn encode<E: Extend<axum::http::HeaderValue>>(&self, values: &mut E) {
-        values.extend([self.0.to_string().parse().unwrap()]);
-    }
-}
-
-#[derive(Debug)]
-pub struct ReleaseChannelHeader(String);
-
-impl Header for ReleaseChannelHeader {
-    fn name() -> &'static HeaderName {
-        static ZED_RELEASE_CHANNEL: OnceLock<HeaderName> = OnceLock::new();
-        ZED_RELEASE_CHANNEL.get_or_init(|| HeaderName::from_static("x-zed-release-channel"))
-    }
-
-    fn decode<'i, I>(values: &mut I) -> Result<Self, axum::headers::Error>
-    where
-        Self: Sized,
-        I: Iterator<Item = &'i axum::http::HeaderValue>,
-    {
-        Ok(Self(
-            values
-                .next()
-                .ok_or_else(axum::headers::Error::invalid)?
-                .to_str()
-                .map_err(|_| axum::headers::Error::invalid())?
-                .to_owned(),
-        ))
-    }
-
-    fn encode<E: Extend<axum::http::HeaderValue>>(&self, values: &mut E) {
-        values.extend([self.0.parse().unwrap()]);
-    }
-}
-
-pub fn routes(server: Arc<Server>) -> Router<(), Body> {
-    Router::new()
-        .route("/rpc", get(handle_websocket_request))
-        .layer(
-            ServiceBuilder::new()
-                .layer(Extension(server.app_state.clone()))
-                .layer(middleware::from_fn(auth::validate_header)),
-        )
-        .route("/metrics", get(handle_metrics))
-        .layer(Extension(server))
-}
-
-pub async fn handle_websocket_request(
-    TypedHeader(ProtocolVersion(protocol_version)): TypedHeader<ProtocolVersion>,
-    app_version_header: Option<TypedHeader<AppVersionHeader>>,
-    release_channel_header: Option<TypedHeader<ReleaseChannelHeader>>,
-    ConnectInfo(socket_address): ConnectInfo<SocketAddr>,
-    Extension(server): Extension<Arc<Server>>,
-    Extension(principal): Extension<Principal>,
-    user_agent: Option<TypedHeader<UserAgent>>,
-    country_code_header: Option<TypedHeader<CloudflareIpCountryHeader>>,
-    system_id_header: Option<TypedHeader<SystemIdHeader>>,
-    ws: WebSocketUpgrade,
-) -> axum::response::Response {
-    if protocol_version != rpc::PROTOCOL_VERSION {
-        return (
-            StatusCode::UPGRADE_REQUIRED,
-            "client must be upgraded".to_string(),
-        )
-            .into_response();
-    }
-
-    let Some(version) = app_version_header.map(|header| ZedVersion(header.0.0)) else {
-        return (
-            StatusCode::UPGRADE_REQUIRED,
-            "no version header found".to_string(),
-        )
-            .into_response();
-    };
-
-    let release_channel = release_channel_header.map(|header| header.0.0);
-
-    if !version.can_collaborate() {
-        return (
-            StatusCode::UPGRADE_REQUIRED,
-            "client must be upgraded".to_string(),
-        )
-            .into_response();
-    }
-
-    let socket_address = socket_address.to_string();
-
-    // Acquire connection guard before WebSocket upgrade
-    let connection_guard = match ConnectionGuard::try_acquire() {
-        Ok(guard) => guard,
-        Err(()) => {
-            return (
-                StatusCode::SERVICE_UNAVAILABLE,
-                "Too many concurrent connections",
-            )
-                .into_response();
-        }
-    };
-
-    ws.on_upgrade(move |socket| {
-        let socket = socket
-            .map_ok(to_tungstenite_message)
-            .err_into()
-            .with(|message| async move { to_axum_message(message) });
-        let connection = Connection::new(Box::pin(socket));
-        async move {
-            server
-                .handle_connection(
-                    connection,
-                    socket_address,
-                    principal,
-                    version,
-                    release_channel,
-                    user_agent.map(|header| header.to_string()),
-                    country_code_header.map(|header| header.to_string()),
-                    system_id_header.map(|header| header.to_string()),
-                    None,
-                    Executor::Production,
-                    Some(connection_guard),
-                )
-                .await;
-        }
-    })
-}
-
-pub async fn handle_metrics(Extension(server): Extension<Arc<Server>>) -> Result<String> {
-    static CONNECTIONS_METRIC: OnceLock<IntGauge> = OnceLock::new();
-    let connections_metric = CONNECTIONS_METRIC
-        .get_or_init(|| register_int_gauge!("connections", "number of connections").unwrap());
-
-    let connections = server
-        .connection_pool
-        .lock()
-        .connections()
-        .filter(|connection| !connection.admin)
-        .count();
-    connections_metric.set(connections as _);
-
-    static SHARED_PROJECTS_METRIC: OnceLock<IntGauge> = OnceLock::new();
-    let shared_projects_metric = SHARED_PROJECTS_METRIC.get_or_init(|| {
-        register_int_gauge!(
-            "shared_projects",
-            "number of open projects with one or more guests"
-        )
-        .unwrap()
-    });
-
-    let shared_projects = server.app_state.db.project_count_excluding_admins().await?;
-    shared_projects_metric.set(shared_projects as _);
-
-    let encoder = prometheus::TextEncoder::new();
-    let metric_families = prometheus::gather();
-    let encoded_metrics = encoder
-        .encode_to_string(&metric_families)
-        .map_err(|err| anyhow!("{err}"))?;
-    Ok(encoded_metrics)
-}
-
-#[instrument(err, skip(executor))]
-async fn connection_lost(
-    session: Session,
-    mut teardown: watch::Receiver<bool>,
-    executor: Executor,
-) -> Result<()> {
-    session.peer.disconnect(session.connection_id);
-    session
-        .connection_pool()
-        .await
-        .remove_connection(session.connection_id)?;
-
-    session
-        .db()
-        .await
-        .connection_lost(session.connection_id)
-        .await
-        .trace_err();
-
-    futures::select_biased! {
-        _ = executor.sleep(RECONNECT_TIMEOUT).fuse() => {
-
-            log::info!("connection lost, removing all resources for user:{}, connection:{:?}", session.user_id(), session.connection_id);
-            leave_room_for_session(&session, session.connection_id).await.trace_err();
-            leave_channel_buffers_for_session(&session)
-                .await
-                .trace_err();
-
-            if !session
-                .connection_pool()
-                .await
-                .is_user_online(session.user_id())
-            {
-                let db = session.db().await;
-                if let Some(room) = db.decline_call(None, session.user_id()).await.trace_err().flatten() {
-                    room_updated(&room, &session.peer);
-                }
-            }
-
-            update_user_contacts(session.user_id(), &session).await?;
-        },
-        _ = teardown.changed().fuse() => {}
-    }
-
-    Ok(())
-}
-
-/// Acknowledges a ping from a client, used to keep the connection alive.
-async fn ping(
-    _: proto::Ping,
-    response: Response<proto::Ping>,
-    _session: MessageContext,
-) -> Result<()> {
-    response.send(proto::Ack {})?;
-    Ok(())
-}
-
-/// Creates a new room for calling (outside of channels)
-async fn create_room(
-    _request: proto::CreateRoom,
-    response: Response<proto::CreateRoom>,
-    session: MessageContext,
-) -> Result<()> {
-    let livekit_room = nanoid::nanoid!(30);
-
-    let live_kit_connection_info = util::maybe!(async {
-        let live_kit = session.app_state.livekit_client.as_ref();
-        let live_kit = live_kit?;
-        let user_id = session.user_id().to_string();
-
-        let token = live_kit.room_token(&livekit_room, &user_id).trace_err()?;
-
-        Some(proto::LiveKitConnectionInfo {
-            server_url: live_kit.url().into(),
-            token,
-            can_publish: true,
-        })
-    })
-    .await;
-
-    let room = session
-        .db()
-        .await
-        .create_room(session.user_id(), session.connection_id, &livekit_room)
-        .await?;
-
-    response.send(proto::CreateRoomResponse {
-        room: Some(room.clone()),
-        live_kit_connection_info,
-    })?;
-
-    update_user_contacts(session.user_id(), &session).await?;
-    Ok(())
-}
-
-/// Join a room from an invitation. Equivalent to joining a channel if there is one.
-async fn join_room(
-    request: proto::JoinRoom,
-    response: Response<proto::JoinRoom>,
-    session: MessageContext,
-) -> Result<()> {
-    let room_id = RoomId::from_proto(request.id);
-
-    let channel_id = session.db().await.channel_id_for_room(room_id).await?;
-
-    if let Some(channel_id) = channel_id {
-        return join_channel_internal(channel_id, Box::new(response), session).await;
-    }
-
-    let joined_room = {
-        let room = session
-            .db()
-            .await
-            .join_room(room_id, session.user_id(), session.connection_id)
-            .await?;
-        room_updated(&room.room, &session.peer);
-        room.into_inner()
-    };
-
-    for connection_id in session
-        .connection_pool()
-        .await
-        .user_connection_ids(session.user_id())
-    {
-        session
-            .peer
-            .send(
-                connection_id,
-                proto::CallCanceled {
-                    room_id: room_id.to_proto(),
-                },
-            )
-            .trace_err();
-    }
-
-    let live_kit_connection_info = if let Some(live_kit) = session.app_state.livekit_client.as_ref()
-    {
-        live_kit
-            .room_token(
-                &joined_room.room.livekit_room,
-                &session.user_id().to_string(),
-            )
-            .trace_err()
-            .map(|token| proto::LiveKitConnectionInfo {
-                server_url: live_kit.url().into(),
-                token,
-                can_publish: true,
-            })
-    } else {
-        None
-    };
-
-    response.send(proto::JoinRoomResponse {
-        room: Some(joined_room.room),
-        channel_id: None,
-        live_kit_connection_info,
-    })?;
-
-    update_user_contacts(session.user_id(), &session).await?;
-    Ok(())
-}
-
-/// Rejoin room is used to reconnect to a room after connection errors.
-async fn rejoin_room(
-    request: proto::RejoinRoom,
-    response: Response<proto::RejoinRoom>,
-    session: MessageContext,
-) -> Result<()> {
-    let room;
-    let channel;
-    {
-        let mut rejoined_room = session
-            .db()
-            .await
-            .rejoin_room(request, session.user_id(), session.connection_id)
-            .await?;
-
-        response.send(proto::RejoinRoomResponse {
-            room: Some(rejoined_room.room.clone()),
-            reshared_projects: rejoined_room
-                .reshared_projects
-                .iter()
-                .map(|project| proto::ResharedProject {
-                    id: project.id.to_proto(),
-                    collaborators: project
-                        .collaborators
-                        .iter()
-                        .map(|collaborator| collaborator.to_proto())
-                        .collect(),
-                })
-                .collect(),
-            rejoined_projects: rejoined_room
-                .rejoined_projects
-                .iter()
-                .map(|rejoined_project| rejoined_project.to_proto())
-                .collect(),
-        })?;
-        room_updated(&rejoined_room.room, &session.peer);
-
-        for project in &rejoined_room.reshared_projects {
-            for collaborator in &project.collaborators {
-                session
-                    .peer
-                    .send(
-                        collaborator.connection_id,
-                        proto::UpdateProjectCollaborator {
-                            project_id: project.id.to_proto(),
-                            old_peer_id: Some(project.old_connection_id.into()),
-                            new_peer_id: Some(session.connection_id.into()),
-                        },
-                    )
-                    .trace_err();
-            }
-
-            broadcast(
-                Some(session.connection_id),
-                project
-                    .collaborators
-                    .iter()
-                    .map(|collaborator| collaborator.connection_id),
-                |connection_id| {
-                    session.peer.forward_send(
-                        session.connection_id,
-                        connection_id,
-                        proto::UpdateProject {
-                            project_id: project.id.to_proto(),
-                            worktrees: project.worktrees.clone(),
-                        },
-                    )
-                },
-            );
-        }
-
-        notify_rejoined_projects(&mut rejoined_room.rejoined_projects, &session)?;
-
-        let rejoined_room = rejoined_room.into_inner();
-
-        room = rejoined_room.room;
-        channel = rejoined_room.channel;
-    }
-
-    if let Some(channel) = channel {
-        channel_updated(
-            &channel,
-            &room,
-            &session.peer,
-            &*session.connection_pool().await,
-        );
-    }
-
-    update_user_contacts(session.user_id(), &session).await?;
-    Ok(())
-}
-
-fn notify_rejoined_projects(
-    rejoined_projects: &mut Vec<RejoinedProject>,
-    session: &Session,
-) -> Result<()> {
-    for project in rejoined_projects.iter() {
-        for collaborator in &project.collaborators {
-            session
-                .peer
-                .send(
-                    collaborator.connection_id,
-                    proto::UpdateProjectCollaborator {
-                        project_id: project.id.to_proto(),
-                        old_peer_id: Some(project.old_connection_id.into()),
-                        new_peer_id: Some(session.connection_id.into()),
-                    },
-                )
-                .trace_err();
-        }
-    }
-
-    for project in rejoined_projects {
-        for worktree in mem::take(&mut project.worktrees) {
-            // Stream this worktree's entries.
-            let message = proto::UpdateWorktree {
-                project_id: project.id.to_proto(),
-                worktree_id: worktree.id,
-                abs_path: worktree.abs_path.clone(),
-                root_name: worktree.root_name,
-                updated_entries: worktree.updated_entries,
-                removed_entries: worktree.removed_entries,
-                scan_id: worktree.scan_id,
-                is_last_update: worktree.completed_scan_id == worktree.scan_id,
-                updated_repositories: worktree.updated_repositories,
-                removed_repositories: worktree.removed_repositories,
-            };
-            for update in proto::split_worktree_update(message) {
-                session.peer.send(session.connection_id, update)?;
-            }
-
-            // Stream this worktree's diagnostics.
-            let mut worktree_diagnostics = worktree.diagnostic_summaries.into_iter();
-            if let Some(summary) = worktree_diagnostics.next() {
-                let message = proto::UpdateDiagnosticSummary {
-                    project_id: project.id.to_proto(),
-                    worktree_id: worktree.id,
-                    summary: Some(summary),
-                    more_summaries: worktree_diagnostics.collect(),
-                };
-                session.peer.send(session.connection_id, message)?;
-            }
-
-            for settings_file in worktree.settings_files {
-                session.peer.send(
-                    session.connection_id,
-                    proto::UpdateWorktreeSettings {
-                        project_id: project.id.to_proto(),
-                        worktree_id: worktree.id,
-                        path: settings_file.path,
-                        content: Some(settings_file.content),
-                        kind: Some(settings_file.kind.to_proto().into()),
-                    },
-                )?;
-            }
-        }
-
-        for repository in mem::take(&mut project.updated_repositories) {
-            for update in split_repository_update(repository) {
-                session.peer.send(session.connection_id, update)?;
-            }
-        }
-
-        for id in mem::take(&mut project.removed_repositories) {
-            session.peer.send(
-                session.connection_id,
-                proto::RemoveRepository {
-                    project_id: project.id.to_proto(),
-                    id,
-                },
-            )?;
-        }
-    }
-
-    Ok(())
-}
-
-/// leave room disconnects from the room.
-async fn leave_room(
-    _: proto::LeaveRoom,
-    response: Response<proto::LeaveRoom>,
-    session: MessageContext,
-) -> Result<()> {
-    leave_room_for_session(&session, session.connection_id).await?;
-    response.send(proto::Ack {})?;
-    Ok(())
-}
-
-/// Updates the permissions of someone else in the room.
-async fn set_room_participant_role(
-    request: proto::SetRoomParticipantRole,
-    response: Response<proto::SetRoomParticipantRole>,
-    session: MessageContext,
-) -> Result<()> {
-    let user_id = UserId::from_proto(request.user_id);
-    let role = ChannelRole::from(request.role());
-
-    let (livekit_room, can_publish) = {
-        let room = session
-            .db()
-            .await
-            .set_room_participant_role(
-                session.user_id(),
-                RoomId::from_proto(request.room_id),
-                user_id,
-                role,
-            )
-            .await?;
-
-        let livekit_room = room.livekit_room.clone();
-        let can_publish = ChannelRole::from(request.role()).can_use_microphone();
-        room_updated(&room, &session.peer);
-        (livekit_room, can_publish)
-    };
-
-    if let Some(live_kit) = session.app_state.livekit_client.as_ref() {
-        live_kit
-            .update_participant(
-                livekit_room.clone(),
-                request.user_id.to_string(),
-                livekit_api::proto::ParticipantPermission {
-                    can_subscribe: true,
-                    can_publish,
-                    can_publish_data: can_publish,
-                    hidden: false,
-                    recorder: false,
-                },
-            )
-            .await
-            .trace_err();
-    }
-
-    response.send(proto::Ack {})?;
-    Ok(())
-}
-
-/// Call someone else into the current room
-async fn call(
-    request: proto::Call,
-    response: Response<proto::Call>,
-    session: MessageContext,
-) -> Result<()> {
-    let room_id = RoomId::from_proto(request.room_id);
-    let calling_user_id = session.user_id();
-    let calling_connection_id = session.connection_id;
-    let called_user_id = UserId::from_proto(request.called_user_id);
-    let initial_project_id = request.initial_project_id.map(ProjectId::from_proto);
-    if !session
-        .db()
-        .await
-        .has_contact(calling_user_id, called_user_id)
-        .await?
-    {
-        return Err(anyhow!("cannot call a user who isn't a contact"))?;
-    }
-
-    let incoming_call = {
-        let (room, incoming_call) = &mut *session
-            .db()
-            .await
-            .call(
-                room_id,
-                calling_user_id,
-                calling_connection_id,
-                called_user_id,
-                initial_project_id,
-            )
-            .await?;
-        room_updated(room, &session.peer);
-        mem::take(incoming_call)
-    };
-    update_user_contacts(called_user_id, &session).await?;
-
-    let mut calls = session
-        .connection_pool()
-        .await
-        .user_connection_ids(called_user_id)
-        .map(|connection_id| session.peer.request(connection_id, incoming_call.clone()))
-        .collect::<FuturesUnordered<_>>();
-
-    while let Some(call_response) = calls.next().await {
-        match call_response.as_ref() {
-            Ok(_) => {
-                response.send(proto::Ack {})?;
-                return Ok(());
-            }
-            Err(_) => {
-                call_response.trace_err();
-            }
-        }
-    }
-
-    {
-        let room = session
-            .db()
-            .await
-            .call_failed(room_id, called_user_id)
-            .await?;
-        room_updated(&room, &session.peer);
-    }
-    update_user_contacts(called_user_id, &session).await?;
-
-    Err(anyhow!("failed to ring user"))?
-}
-
-/// Cancel an outgoing call.
-async fn cancel_call(
-    request: proto::CancelCall,
-    response: Response<proto::CancelCall>,
-    session: MessageContext,
-) -> Result<()> {
-    let called_user_id = UserId::from_proto(request.called_user_id);
-    let room_id = RoomId::from_proto(request.room_id);
-    {
-        let room = session
-            .db()
-            .await
-            .cancel_call(room_id, session.connection_id, called_user_id)
-            .await?;
-        room_updated(&room, &session.peer);
-    }
-
-    for connection_id in session
-        .connection_pool()
-        .await
-        .user_connection_ids(called_user_id)
-    {
-        session
-            .peer
-            .send(
-                connection_id,
-                proto::CallCanceled {
-                    room_id: room_id.to_proto(),
-                },
-            )
-            .trace_err();
-    }
-    response.send(proto::Ack {})?;
-
-    update_user_contacts(called_user_id, &session).await?;
-    Ok(())
-}
-
-/// Decline an incoming call.
-async fn decline_call(message: proto::DeclineCall, session: MessageContext) -> Result<()> {
-    let room_id = RoomId::from_proto(message.room_id);
-    {
-        let room = session
-            .db()
-            .await
-            .decline_call(Some(room_id), session.user_id())
-            .await?
-            .context("declining call")?;
-        room_updated(&room, &session.peer);
-    }
-
-    for connection_id in session
-        .connection_pool()
-        .await
-        .user_connection_ids(session.user_id())
-    {
-        session
-            .peer
-            .send(
-                connection_id,
-                proto::CallCanceled {
-                    room_id: room_id.to_proto(),
-                },
-            )
-            .trace_err();
-    }
-    update_user_contacts(session.user_id(), &session).await?;
-    Ok(())
-}
-
-/// Updates other participants in the room with your current location.
-async fn update_participant_location(
-    request: proto::UpdateParticipantLocation,
-    response: Response<proto::UpdateParticipantLocation>,
-    session: MessageContext,
-) -> Result<()> {
-    let room_id = RoomId::from_proto(request.room_id);
-    let location = request.location.context("invalid location")?;
-
-    let db = session.db().await;
-    let room = db
-        .update_room_participant_location(room_id, session.connection_id, location)
-        .await?;
-
-    room_updated(&room, &session.peer);
-    response.send(proto::Ack {})?;
-    Ok(())
-}
-
-/// Share a project into the room.
-async fn share_project(
-    request: proto::ShareProject,
-    response: Response<proto::ShareProject>,
-    session: MessageContext,
-) -> Result<()> {
-    let (project_id, room) = &*session
-        .db()
-        .await
-        .share_project(
-            RoomId::from_proto(request.room_id),
-            session.connection_id,
-            &request.worktrees,
-            request.is_ssh_project,
-            request.windows_paths.unwrap_or(false),
-        )
-        .await?;
-    response.send(proto::ShareProjectResponse {
-        project_id: project_id.to_proto(),
-    })?;
-    room_updated(room, &session.peer);
-
-    Ok(())
-}
-
-/// Unshare a project from the room.
-async fn unshare_project(message: proto::UnshareProject, session: MessageContext) -> Result<()> {
-    let project_id = ProjectId::from_proto(message.project_id);
-    unshare_project_internal(project_id, session.connection_id, &session).await
-}
-
-async fn unshare_project_internal(
-    project_id: ProjectId,
-    connection_id: ConnectionId,
-    session: &Session,
-) -> Result<()> {
-    let delete = {
-        let room_guard = session
-            .db()
-            .await
-            .unshare_project(project_id, connection_id)
-            .await?;
-
-        let (delete, room, guest_connection_ids) = &*room_guard;
-
-        let message = proto::UnshareProject {
-            project_id: project_id.to_proto(),
-        };
-
-        broadcast(
-            Some(connection_id),
-            guest_connection_ids.iter().copied(),
-            |conn_id| session.peer.send(conn_id, message.clone()),
-        );
-        if let Some(room) = room {
-            room_updated(room, &session.peer);
-        }
-
-        *delete
-    };
-
-    if delete {
-        let db = session.db().await;
-        db.delete_project(project_id).await?;
-    }
-
-    Ok(())
-}
-
-/// Join someone elses shared project.
-async fn join_project(
-    request: proto::JoinProject,
-    response: Response<proto::JoinProject>,
-    session: MessageContext,
-) -> Result<()> {
-    let project_id = ProjectId::from_proto(request.project_id);
-
-    tracing::info!(%project_id, "join project");
-
-    let db = session.db().await;
-    let (project, replica_id) = &mut *db
-        .join_project(
-            project_id,
-            session.connection_id,
-            session.user_id(),
-            request.committer_name.clone(),
-            request.committer_email.clone(),
-        )
-        .await?;
-    drop(db);
-    tracing::info!(%project_id, "join remote project");
-    let collaborators = project
-        .collaborators
-        .iter()
-        .filter(|collaborator| collaborator.connection_id != session.connection_id)
-        .map(|collaborator| collaborator.to_proto())
-        .collect::<Vec<_>>();
-    let project_id = project.id;
-    let guest_user_id = session.user_id();
-
-    let worktrees = project
-        .worktrees
-        .iter()
-        .map(|(id, worktree)| proto::WorktreeMetadata {
-            id: *id,
-            root_name: worktree.root_name.clone(),
-            visible: worktree.visible,
-            abs_path: worktree.abs_path.clone(),
-        })
-        .collect::<Vec<_>>();
-
-    let add_project_collaborator = proto::AddProjectCollaborator {
-        project_id: project_id.to_proto(),
-        collaborator: Some(proto::Collaborator {
-            peer_id: Some(session.connection_id.into()),
-            replica_id: replica_id.0 as u32,
-            user_id: guest_user_id.to_proto(),
-            is_host: false,
-            committer_name: request.committer_name.clone(),
-            committer_email: request.committer_email.clone(),
-        }),
-    };
-
-    for collaborator in &collaborators {
-        session
-            .peer
-            .send(
-                collaborator.peer_id.unwrap().into(),
-                add_project_collaborator.clone(),
-            )
-            .trace_err();
-    }
-
-    // First, we send the metadata associated with each worktree.
-    let (language_servers, language_server_capabilities) = project
-        .language_servers
-        .clone()
-        .into_iter()
-        .map(|server| (server.server, server.capabilities))
-        .unzip();
-    response.send(proto::JoinProjectResponse {
-        project_id: project.id.0 as u64,
-        worktrees,
-        replica_id: replica_id.0 as u32,
-        collaborators,
-        language_servers,
-        language_server_capabilities,
-        role: project.role.into(),
-        windows_paths: project.path_style == PathStyle::Windows,
-    })?;
-
-    for (worktree_id, worktree) in mem::take(&mut project.worktrees) {
-        // Stream this worktree's entries.
-        let message = proto::UpdateWorktree {
-            project_id: project_id.to_proto(),
-            worktree_id,
-            abs_path: worktree.abs_path.clone(),
-            root_name: worktree.root_name,
-            updated_entries: worktree.entries,
-            removed_entries: Default::default(),
-            scan_id: worktree.scan_id,
-            is_last_update: worktree.scan_id == worktree.completed_scan_id,
-            updated_repositories: worktree.legacy_repository_entries.into_values().collect(),
-            removed_repositories: Default::default(),
-        };
-        for update in proto::split_worktree_update(message) {
-            session.peer.send(session.connection_id, update.clone())?;
-        }
-
-        // Stream this worktree's diagnostics.
-        let mut worktree_diagnostics = worktree.diagnostic_summaries.into_iter();
-        if let Some(summary) = worktree_diagnostics.next() {
-            let message = proto::UpdateDiagnosticSummary {
-                project_id: project.id.to_proto(),
-                worktree_id: worktree.id,
-                summary: Some(summary),
-                more_summaries: worktree_diagnostics.collect(),
-            };
-            session.peer.send(session.connection_id, message)?;
-        }
-
-        for settings_file in worktree.settings_files {
-            session.peer.send(
-                session.connection_id,
-                proto::UpdateWorktreeSettings {
-                    project_id: project_id.to_proto(),
-                    worktree_id: worktree.id,
-                    path: settings_file.path,
-                    content: Some(settings_file.content),
-                    kind: Some(settings_file.kind.to_proto() as i32),
-                },
-            )?;
-        }
-    }
-
-    for repository in mem::take(&mut project.repositories) {
-        for update in split_repository_update(repository) {
-            session.peer.send(session.connection_id, update)?;
-        }
-    }
-
-    for language_server in &project.language_servers {
-        session.peer.send(
-            session.connection_id,
-            proto::UpdateLanguageServer {
-                project_id: project_id.to_proto(),
-                server_name: Some(language_server.server.name.clone()),
-                language_server_id: language_server.server.id,
-                variant: Some(
-                    proto::update_language_server::Variant::DiskBasedDiagnosticsUpdated(
-                        proto::LspDiskBasedDiagnosticsUpdated {},
-                    ),
-                ),
-            },
-        )?;
-    }
-
-    Ok(())
-}
-
-/// Leave someone elses shared project.
-async fn leave_project(request: proto::LeaveProject, session: MessageContext) -> Result<()> {
-    let sender_id = session.connection_id;
-    let project_id = ProjectId::from_proto(request.project_id);
-    let db = session.db().await;
-
-    let (room, project) = &*db.leave_project(project_id, sender_id).await?;
-    tracing::info!(
-        %project_id,
-        "leave project"
-    );
-
-    project_left(project, &session);
-    if let Some(room) = room {
-        room_updated(room, &session.peer);
-    }
-
-    Ok(())
-}
-
-/// Updates other participants with changes to the project
-async fn update_project(
-    request: proto::UpdateProject,
-    response: Response<proto::UpdateProject>,
-    session: MessageContext,
-) -> Result<()> {
-    let project_id = ProjectId::from_proto(request.project_id);
-    let (room, guest_connection_ids) = &*session
-        .db()
-        .await
-        .update_project(project_id, session.connection_id, &request.worktrees)
-        .await?;
-    broadcast(
-        Some(session.connection_id),
-        guest_connection_ids.iter().copied(),
-        |connection_id| {
-            session
-                .peer
-                .forward_send(session.connection_id, connection_id, request.clone())
-        },
-    );
-    if let Some(room) = room {
-        room_updated(room, &session.peer);
-    }
-    response.send(proto::Ack {})?;
-
-    Ok(())
-}
-
-/// Updates other participants with changes to the worktree
-async fn update_worktree(
-    request: proto::UpdateWorktree,
-    response: Response<proto::UpdateWorktree>,
-    session: MessageContext,
-) -> Result<()> {
-    let guest_connection_ids = session
-        .db()
-        .await
-        .update_worktree(&request, session.connection_id)
-        .await?;
-
-    broadcast(
-        Some(session.connection_id),
-        guest_connection_ids.iter().copied(),
-        |connection_id| {
-            session
-                .peer
-                .forward_send(session.connection_id, connection_id, request.clone())
-        },
-    );
-    response.send(proto::Ack {})?;
-    Ok(())
-}
-
-async fn update_repository(
-    request: proto::UpdateRepository,
-    response: Response<proto::UpdateRepository>,
-    session: MessageContext,
-) -> Result<()> {
-    let guest_connection_ids = session
-        .db()
-        .await
-        .update_repository(&request, session.connection_id)
-        .await?;
-
-    broadcast(
-        Some(session.connection_id),
-        guest_connection_ids.iter().copied(),
-        |connection_id| {
-            session
-                .peer
-                .forward_send(session.connection_id, connection_id, request.clone())
-        },
-    );
-    response.send(proto::Ack {})?;
-    Ok(())
-}
-
-async fn remove_repository(
-    request: proto::RemoveRepository,
-    response: Response<proto::RemoveRepository>,
-    session: MessageContext,
-) -> Result<()> {
-    let guest_connection_ids = session
-        .db()
-        .await
-        .remove_repository(&request, session.connection_id)
-        .await?;
-
-    broadcast(
-        Some(session.connection_id),
-        guest_connection_ids.iter().copied(),
-        |connection_id| {
-            session
-                .peer
-                .forward_send(session.connection_id, connection_id, request.clone())
-        },
-    );
-    response.send(proto::Ack {})?;
-    Ok(())
-}
-
-/// Updates other participants with changes to the diagnostics
-async fn update_diagnostic_summary(
-    message: proto::UpdateDiagnosticSummary,
-    session: MessageContext,
-) -> Result<()> {
-    let guest_connection_ids = session
-        .db()
-        .await
-        .update_diagnostic_summary(&message, session.connection_id)
-        .await?;
-
-    broadcast(
-        Some(session.connection_id),
-        guest_connection_ids.iter().copied(),
-        |connection_id| {
-            session
-                .peer
-                .forward_send(session.connection_id, connection_id, message.clone())
-        },
-    );
-
-    Ok(())
-}
-
-/// Updates other participants with changes to the worktree settings
-async fn update_worktree_settings(
-    message: proto::UpdateWorktreeSettings,
-    session: MessageContext,
-) -> Result<()> {
-    let guest_connection_ids = session
-        .db()
-        .await
-        .update_worktree_settings(&message, session.connection_id)
-        .await?;
-
-    broadcast(
-        Some(session.connection_id),
-        guest_connection_ids.iter().copied(),
-        |connection_id| {
-            session
-                .peer
-                .forward_send(session.connection_id, connection_id, message.clone())
-        },
-    );
-
-    Ok(())
-}
-
-/// Notify other participants that a language server has started.
-async fn start_language_server(
-    request: proto::StartLanguageServer,
-    session: MessageContext,
-) -> Result<()> {
-    let guest_connection_ids = session
-        .db()
-        .await
-        .start_language_server(&request, session.connection_id)
-        .await?;
-
-    broadcast(
-        Some(session.connection_id),
-        guest_connection_ids.iter().copied(),
-        |connection_id| {
-            session
-                .peer
-                .forward_send(session.connection_id, connection_id, request.clone())
-        },
-    );
-    Ok(())
-}
-
-/// Notify other participants that a language server has changed.
-async fn update_language_server(
-    request: proto::UpdateLanguageServer,
-    session: MessageContext,
-) -> Result<()> {
-    let project_id = ProjectId::from_proto(request.project_id);
-    let db = session.db().await;
-
-    if let Some(proto::update_language_server::Variant::MetadataUpdated(update)) = &request.variant
-        && let Some(capabilities) = update.capabilities.clone()
-    {
-        db.update_server_capabilities(project_id, request.language_server_id, capabilities)
-            .await?;
-    }
-
-    let project_connection_ids = db
-        .project_connection_ids(project_id, session.connection_id, true)
-        .await?;
-    broadcast(
-        Some(session.connection_id),
-        project_connection_ids.iter().copied(),
-        |connection_id| {
-            session
-                .peer
-                .forward_send(session.connection_id, connection_id, request.clone())
-        },
-    );
-    Ok(())
-}
-
-/// forward a project request to the host. These requests should be read only
-/// as guests are allowed to send them.
-async fn forward_read_only_project_request<T>(
-    request: T,
-    response: Response<T>,
-    session: MessageContext,
-) -> Result<()>
-where
-    T: EntityMessage + RequestMessage,
-{
-    let project_id = ProjectId::from_proto(request.remote_entity_id());
-    let host_connection_id = session
-        .db()
-        .await
-        .host_for_read_only_project_request(project_id, session.connection_id)
-        .await?;
-    let payload = session.forward_request(host_connection_id, request).await?;
-    response.send(payload)?;
-    Ok(())
-}
-
-/// forward a project request to the host. These requests are disallowed
-/// for guests.
-async fn forward_mutating_project_request<T>(
-    request: T,
-    response: Response<T>,
-    session: MessageContext,
-) -> Result<()>
-where
-    T: EntityMessage + RequestMessage,
-{
-    let project_id = ProjectId::from_proto(request.remote_entity_id());
-
-    let host_connection_id = session
-        .db()
-        .await
-        .host_for_mutating_project_request(project_id, session.connection_id)
-        .await?;
-    let payload = session.forward_request(host_connection_id, request).await?;
-    response.send(payload)?;
-    Ok(())
-}
-
-async fn lsp_query(
-    request: proto::LspQuery,
-    response: Response<proto::LspQuery>,
-    session: MessageContext,
-) -> Result<()> {
-    let (name, should_write) = request.query_name_and_write_permissions();
-    tracing::Span::current().record("lsp_query_request", name);
-    tracing::info!("lsp_query message received");
-    if should_write {
-        forward_mutating_project_request(request, response, session).await
-    } else {
-        forward_read_only_project_request(request, response, session).await
-    }
-}
-
-/// Notify other participants that a new buffer has been created
-async fn create_buffer_for_peer(
-    request: proto::CreateBufferForPeer,
-    session: MessageContext,
-) -> Result<()> {
-    session
-        .db()
-        .await
-        .check_user_is_project_host(
-            ProjectId::from_proto(request.project_id),
-            session.connection_id,
-        )
-        .await?;
-    let peer_id = request.peer_id.context("invalid peer id")?;
-    session
-        .peer
-        .forward_send(session.connection_id, peer_id.into(), request)?;
-    Ok(())
-}
-
-/// Notify other participants that a new image has been created
-async fn create_image_for_peer(
-    request: proto::CreateImageForPeer,
-    session: MessageContext,
-) -> Result<()> {
-    session
-        .db()
-        .await
-        .check_user_is_project_host(
-            ProjectId::from_proto(request.project_id),
-            session.connection_id,
-        )
-        .await?;
-    let peer_id = request.peer_id.context("invalid peer id")?;
-    session
-        .peer
-        .forward_send(session.connection_id, peer_id.into(), request)?;
-    Ok(())
-}
-
-/// Notify other participants that a buffer has been updated. This is
-/// allowed for guests as long as the update is limited to selections.
-async fn update_buffer(
-    request: proto::UpdateBuffer,
-    response: Response<proto::UpdateBuffer>,
-    session: MessageContext,
-) -> Result<()> {
-    let project_id = ProjectId::from_proto(request.project_id);
-    let mut capability = Capability::ReadOnly;
-
-    for op in request.operations.iter() {
-        match op.variant {
-            None | Some(proto::operation::Variant::UpdateSelections(_)) => {}
-            Some(_) => capability = Capability::ReadWrite,
-        }
-    }
-
-    let host = {
-        let guard = session
-            .db()
-            .await
-            .connections_for_buffer_update(project_id, session.connection_id, capability)
-            .await?;
-
-        let (host, guests) = &*guard;
-
-        broadcast(
-            Some(session.connection_id),
-            guests.clone(),
-            |connection_id| {
-                session
-                    .peer
-                    .forward_send(session.connection_id, connection_id, request.clone())
-            },
-        );
-
-        *host
-    };
-
-    if host != session.connection_id {
-        session.forward_request(host, request.clone()).await?;
-    }
-
-    response.send(proto::Ack {})?;
-    Ok(())
-}
-
-async fn update_context(message: proto::UpdateContext, session: MessageContext) -> Result<()> {
-    let project_id = ProjectId::from_proto(message.project_id);
-
-    let operation = message.operation.as_ref().context("invalid operation")?;
-    let capability = match operation.variant.as_ref() {
-        Some(proto::context_operation::Variant::BufferOperation(buffer_op)) => {
-            if let Some(buffer_op) = buffer_op.operation.as_ref() {
-                match buffer_op.variant {
-                    None | Some(proto::operation::Variant::UpdateSelections(_)) => {
-                        Capability::ReadOnly
-                    }
-                    _ => Capability::ReadWrite,
-                }
-            } else {
-                Capability::ReadWrite
-            }
-        }
-        Some(_) => Capability::ReadWrite,
-        None => Capability::ReadOnly,
-    };
-
-    let guard = session
-        .db()
-        .await
-        .connections_for_buffer_update(project_id, session.connection_id, capability)
-        .await?;
-
-    let (host, guests) = &*guard;
-
-    broadcast(
-        Some(session.connection_id),
-        guests.iter().chain([host]).copied(),
-        |connection_id| {
-            session
-                .peer
-                .forward_send(session.connection_id, connection_id, message.clone())
-        },
-    );
-
-    Ok(())
-}
-
-/// Notify other participants that a project has been updated.
-async fn broadcast_project_message_from_host<T: EntityMessage<Entity = ShareProject>>(
-    request: T,
-    session: MessageContext,
-) -> Result<()> {
-    let project_id = ProjectId::from_proto(request.remote_entity_id());
-    let project_connection_ids = session
-        .db()
-        .await
-        .project_connection_ids(project_id, session.connection_id, false)
-        .await?;
-
-    broadcast(
-        Some(session.connection_id),
-        project_connection_ids.iter().copied(),
-        |connection_id| {
-            session
-                .peer
-                .forward_send(session.connection_id, connection_id, request.clone())
-        },
-    );
-    Ok(())
-}
-
-/// Start following another user in a call.
-async fn follow(
-    request: proto::Follow,
-    response: Response<proto::Follow>,
-    session: MessageContext,
-) -> Result<()> {
-    let room_id = RoomId::from_proto(request.room_id);
-    let project_id = request.project_id.map(ProjectId::from_proto);
-    let leader_id = request.leader_id.context("invalid leader id")?.into();
-    let follower_id = session.connection_id;
-
-    session
-        .db()
-        .await
-        .check_room_participants(room_id, leader_id, session.connection_id)
-        .await?;
-
-    let response_payload = session.forward_request(leader_id, request).await?;
-    response.send(response_payload)?;
-
-    if let Some(project_id) = project_id {
-        let room = session
-            .db()
-            .await
-            .follow(room_id, project_id, leader_id, follower_id)
-            .await?;
-        room_updated(&room, &session.peer);
-    }
-
-    Ok(())
-}
-
-/// Stop following another user in a call.
-async fn unfollow(request: proto::Unfollow, session: MessageContext) -> Result<()> {
-    let room_id = RoomId::from_proto(request.room_id);
-    let project_id = request.project_id.map(ProjectId::from_proto);
-    let leader_id = request.leader_id.context("invalid leader id")?.into();
-    let follower_id = session.connection_id;
-
-    session
-        .db()
-        .await
-        .check_room_participants(room_id, leader_id, session.connection_id)
-        .await?;
-
-    session
-        .peer
-        .forward_send(session.connection_id, leader_id, request)?;
-
-    if let Some(project_id) = project_id {
-        let room = session
-            .db()
-            .await
-            .unfollow(room_id, project_id, leader_id, follower_id)
-            .await?;
-        room_updated(&room, &session.peer);
-    }
-
-    Ok(())
-}
-
-/// Notify everyone following you of your current location.
-async fn update_followers(request: proto::UpdateFollowers, session: MessageContext) -> Result<()> {
-    let room_id = RoomId::from_proto(request.room_id);
-    let database = session.db.lock().await;
-
-    let connection_ids = if let Some(project_id) = request.project_id {
-        let project_id = ProjectId::from_proto(project_id);
-        database
-            .project_connection_ids(project_id, session.connection_id, true)
-            .await?
-    } else {
-        database
-            .room_connection_ids(room_id, session.connection_id)
-            .await?
-    };
-
-    // For now, don't send view update messages back to that view's current leader.
-    let peer_id_to_omit = request.variant.as_ref().and_then(|variant| match variant {
-        proto::update_followers::Variant::UpdateView(payload) => payload.leader_id,
-        _ => None,
-    });
-
-    for connection_id in connection_ids.iter().cloned() {
-        if Some(connection_id.into()) != peer_id_to_omit && connection_id != session.connection_id {
-            session
-                .peer
-                .forward_send(session.connection_id, connection_id, request.clone())?;
-        }
-    }
-    Ok(())
-}
-
-/// Get public data about users.
-async fn get_users(
-    request: proto::GetUsers,
-    response: Response<proto::GetUsers>,
-    session: MessageContext,
-) -> Result<()> {
-    let user_ids = request
-        .user_ids
-        .into_iter()
-        .map(UserId::from_proto)
-        .collect();
-    let users = session
-        .db()
-        .await
-        .get_users_by_ids(user_ids)
-        .await?
-        .into_iter()
-        .map(|user| proto::User {
-            id: user.id.to_proto(),
-            avatar_url: format!("https://github.com/{}.png?size=128", user.github_login),
-            github_login: user.github_login,
-            name: user.name,
-        })
-        .collect();
-    response.send(proto::UsersResponse { users })?;
-    Ok(())
-}
-
-/// Search for users (to invite) buy Github login
-async fn fuzzy_search_users(
-    request: proto::FuzzySearchUsers,
-    response: Response<proto::FuzzySearchUsers>,
-    session: MessageContext,
-) -> Result<()> {
-    let query = request.query;
-    let users = match query.len() {
-        0 => vec![],
-        1 | 2 => session
-            .db()
-            .await
-            .get_user_by_github_login(&query)
-            .await?
-            .into_iter()
-            .collect(),
-        _ => session.db().await.fuzzy_search_users(&query, 10).await?,
-    };
-    let users = users
-        .into_iter()
-        .filter(|user| user.id != session.user_id())
-        .map(|user| proto::User {
-            id: user.id.to_proto(),
-            avatar_url: format!("https://github.com/{}.png?size=128", user.github_login),
-            github_login: user.github_login,
-            name: user.name,
-        })
-        .collect();
-    response.send(proto::UsersResponse { users })?;
-    Ok(())
-}
-
-/// Send a contact request to another user.
-async fn request_contact(
-    request: proto::RequestContact,
-    response: Response<proto::RequestContact>,
-    session: MessageContext,
-) -> Result<()> {
-    let requester_id = session.user_id();
-    let responder_id = UserId::from_proto(request.responder_id);
-    if requester_id == responder_id {
-        return Err(anyhow!("cannot add yourself as a contact"))?;
-    }
-
-    let notifications = session
-        .db()
-        .await
-        .send_contact_request(requester_id, responder_id)
-        .await?;
-
-    // Update outgoing contact requests of requester
-    let mut update = proto::UpdateContacts::default();
-    update.outgoing_requests.push(responder_id.to_proto());
-    for connection_id in session
-        .connection_pool()
-        .await
-        .user_connection_ids(requester_id)
-    {
-        session.peer.send(connection_id, update.clone())?;
-    }
-
-    // Update incoming contact requests of responder
-    let mut update = proto::UpdateContacts::default();
-    update
-        .incoming_requests
-        .push(proto::IncomingContactRequest {
-            requester_id: requester_id.to_proto(),
-        });
-    let connection_pool = session.connection_pool().await;
-    for connection_id in connection_pool.user_connection_ids(responder_id) {
-        session.peer.send(connection_id, update.clone())?;
-    }
-
-    send_notifications(&connection_pool, &session.peer, notifications);
-
-    response.send(proto::Ack {})?;
-    Ok(())
-}
-
-/// Accept or decline a contact request
-async fn respond_to_contact_request(
-    request: proto::RespondToContactRequest,
-    response: Response<proto::RespondToContactRequest>,
-    session: MessageContext,
-) -> Result<()> {
-    let responder_id = session.user_id();
-    let requester_id = UserId::from_proto(request.requester_id);
-    let db = session.db().await;
-    if request.response == proto::ContactRequestResponse::Dismiss as i32 {
-        db.dismiss_contact_notification(responder_id, requester_id)
-            .await?;
-    } else {
-        let accept = request.response == proto::ContactRequestResponse::Accept as i32;
-
-        let notifications = db
-            .respond_to_contact_request(responder_id, requester_id, accept)
-            .await?;
-        let requester_busy = db.is_user_busy(requester_id).await?;
-        let responder_busy = db.is_user_busy(responder_id).await?;
-
-        let pool = session.connection_pool().await;
-        // Update responder with new contact
-        let mut update = proto::UpdateContacts::default();
-        if accept {
-            update
-                .contacts
-                .push(contact_for_user(requester_id, requester_busy, &pool));
-        }
-        update
-            .remove_incoming_requests
-            .push(requester_id.to_proto());
-        for connection_id in pool.user_connection_ids(responder_id) {
-            session.peer.send(connection_id, update.clone())?;
-        }
-
-        // Update requester with new contact
-        let mut update = proto::UpdateContacts::default();
-        if accept {
-            update
-                .contacts
-                .push(contact_for_user(responder_id, responder_busy, &pool));
-        }
-        update
-            .remove_outgoing_requests
-            .push(responder_id.to_proto());
-
-        for connection_id in pool.user_connection_ids(requester_id) {
-            session.peer.send(connection_id, update.clone())?;
-        }
-
-        send_notifications(&pool, &session.peer, notifications);
-    }
-
-    response.send(proto::Ack {})?;
-    Ok(())
-}
-
-/// Remove a contact.
-async fn remove_contact(
-    request: proto::RemoveContact,
-    response: Response<proto::RemoveContact>,
-    session: MessageContext,
-) -> Result<()> {
-    let requester_id = session.user_id();
-    let responder_id = UserId::from_proto(request.user_id);
-    let db = session.db().await;
-    let (contact_accepted, deleted_notification_id) =
-        db.remove_contact(requester_id, responder_id).await?;
-
-    let pool = session.connection_pool().await;
-    // Update outgoing contact requests of requester
-    let mut update = proto::UpdateContacts::default();
-    if contact_accepted {
-        update.remove_contacts.push(responder_id.to_proto());
-    } else {
-        update
-            .remove_outgoing_requests
-            .push(responder_id.to_proto());
-    }
-    for connection_id in pool.user_connection_ids(requester_id) {
-        session.peer.send(connection_id, update.clone())?;
-    }
-
-    // Update incoming contact requests of responder
-    let mut update = proto::UpdateContacts::default();
-    if contact_accepted {
-        update.remove_contacts.push(requester_id.to_proto());
-    } else {
-        update
-            .remove_incoming_requests
-            .push(requester_id.to_proto());
-    }
-    for connection_id in pool.user_connection_ids(responder_id) {
-        session.peer.send(connection_id, update.clone())?;
-        if let Some(notification_id) = deleted_notification_id {
-            session.peer.send(
-                connection_id,
-                proto::DeleteNotification {
-                    notification_id: notification_id.to_proto(),
-                },
-            )?;
-        }
-    }
-
-    response.send(proto::Ack {})?;
-    Ok(())
-}
-
-fn should_auto_subscribe_to_channels(version: &ZedVersion) -> bool {
-    version.0.minor < 139
-}
-
-async fn subscribe_to_channels(
-    _: proto::SubscribeToChannels,
-    session: MessageContext,
-) -> Result<()> {
-    subscribe_user_to_channels(session.user_id(), &session).await?;
-    Ok(())
-}
-
-async fn subscribe_user_to_channels(user_id: UserId, session: &Session) -> Result<(), Error> {
-    let channels_for_user = session.db().await.get_channels_for_user(user_id).await?;
-    let mut pool = session.connection_pool().await;
-    for membership in &channels_for_user.channel_memberships {
-        pool.subscribe_to_channel(user_id, membership.channel_id, membership.role)
-    }
-    session.peer.send(
-        session.connection_id,
-        build_update_user_channels(&channels_for_user),
-    )?;
-    session.peer.send(
-        session.connection_id,
-        build_channels_update(channels_for_user),
-    )?;
-    Ok(())
-}
-
-/// Creates a new channel.
-async fn create_channel(
-    request: proto::CreateChannel,
-    response: Response<proto::CreateChannel>,
-    session: MessageContext,
-) -> Result<()> {
-    let db = session.db().await;
-
-    let parent_id = request.parent_id.map(ChannelId::from_proto);
-    let (channel, membership) = db
-        .create_channel(&request.name, parent_id, session.user_id())
-        .await?;
-
-    let root_id = channel.root_id();
-    let channel = Channel::from_model(channel);
-
-    response.send(proto::CreateChannelResponse {
-        channel: Some(channel.to_proto()),
-        parent_id: request.parent_id,
-    })?;
-
-    let mut connection_pool = session.connection_pool().await;
-    if let Some(membership) = membership {
-        connection_pool.subscribe_to_channel(
-            membership.user_id,
-            membership.channel_id,
-            membership.role,
-        );
-        let update = proto::UpdateUserChannels {
-            channel_memberships: vec![proto::ChannelMembership {
-                channel_id: membership.channel_id.to_proto(),
-                role: membership.role.into(),
-            }],
-            ..Default::default()
-        };
-        for connection_id in connection_pool.user_connection_ids(membership.user_id) {
-            session.peer.send(connection_id, update.clone())?;
-        }
-    }
-
-    for (connection_id, role) in connection_pool.channel_connection_ids(root_id) {
-        if !role.can_see_channel(channel.visibility) {
-            continue;
-        }
-
-        let update = proto::UpdateChannels {
-            channels: vec![channel.to_proto()],
-            ..Default::default()
-        };
-        session.peer.send(connection_id, update.clone())?;
-    }
-
-    Ok(())
-}
-
-/// Delete a channel
-async fn delete_channel(
-    request: proto::DeleteChannel,
-    response: Response<proto::DeleteChannel>,
-    session: MessageContext,
-) -> Result<()> {
-    let db = session.db().await;
-
-    let channel_id = request.channel_id;
-    let (root_channel, removed_channels) = db
-        .delete_channel(ChannelId::from_proto(channel_id), session.user_id())
-        .await?;
-    response.send(proto::Ack {})?;
-
-    // Notify members of removed channels
-    let mut update = proto::UpdateChannels::default();
-    update
-        .delete_channels
-        .extend(removed_channels.into_iter().map(|id| id.to_proto()));
-
-    let connection_pool = session.connection_pool().await;
-    for (connection_id, _) in connection_pool.channel_connection_ids(root_channel) {
-        session.peer.send(connection_id, update.clone())?;
-    }
-
-    Ok(())
-}
-
-/// Invite someone to join a channel.
-async fn invite_channel_member(
-    request: proto::InviteChannelMember,
-    response: Response<proto::InviteChannelMember>,
-    session: MessageContext,
-) -> Result<()> {
-    let db = session.db().await;
-    let channel_id = ChannelId::from_proto(request.channel_id);
-    let invitee_id = UserId::from_proto(request.user_id);
-    let InviteMemberResult {
-        channel,
-        notifications,
-    } = db
-        .invite_channel_member(
-            channel_id,
-            invitee_id,
-            session.user_id(),
-            request.role().into(),
-        )
-        .await?;
-
-    let update = proto::UpdateChannels {
-        channel_invitations: vec![channel.to_proto()],
-        ..Default::default()
-    };
-
-    let connection_pool = session.connection_pool().await;
-    for connection_id in connection_pool.user_connection_ids(invitee_id) {
-        session.peer.send(connection_id, update.clone())?;
-    }
-
-    send_notifications(&connection_pool, &session.peer, notifications);
-
-    response.send(proto::Ack {})?;
-    Ok(())
-}
-
-/// remove someone from a channel
-async fn remove_channel_member(
-    request: proto::RemoveChannelMember,
-    response: Response<proto::RemoveChannelMember>,
-    session: MessageContext,
-) -> Result<()> {
-    let db = session.db().await;
-    let channel_id = ChannelId::from_proto(request.channel_id);
-    let member_id = UserId::from_proto(request.user_id);
-
-    let RemoveChannelMemberResult {
-        membership_update,
-        notification_id,
-    } = db
-        .remove_channel_member(channel_id, member_id, session.user_id())
-        .await?;
-
-    let mut connection_pool = session.connection_pool().await;
-    notify_membership_updated(
-        &mut connection_pool,
-        membership_update,
-        member_id,
-        &session.peer,
-    );
-    for connection_id in connection_pool.user_connection_ids(member_id) {
-        if let Some(notification_id) = notification_id {
-            session
-                .peer
-                .send(
-                    connection_id,
-                    proto::DeleteNotification {
-                        notification_id: notification_id.to_proto(),
-                    },
-                )
-                .trace_err();
-        }
-    }
-
-    response.send(proto::Ack {})?;
-    Ok(())
-}
-
-/// Toggle the channel between public and private.
-/// Care is taken to maintain the invariant that public channels only descend from public channels,
-/// (though members-only channels can appear at any point in the hierarchy).
-async fn set_channel_visibility(
-    request: proto::SetChannelVisibility,
-    response: Response<proto::SetChannelVisibility>,
-    session: MessageContext,
-) -> Result<()> {
-    let db = session.db().await;
-    let channel_id = ChannelId::from_proto(request.channel_id);
-    let visibility = request.visibility().into();
-
-    let channel_model = db
-        .set_channel_visibility(channel_id, visibility, session.user_id())
-        .await?;
-    let root_id = channel_model.root_id();
-    let channel = Channel::from_model(channel_model);
-
-    let mut connection_pool = session.connection_pool().await;
-    for (user_id, role) in connection_pool
-        .channel_user_ids(root_id)
-        .collect::<Vec<_>>()
-        .into_iter()
-    {
-        let update = if role.can_see_channel(channel.visibility) {
-            connection_pool.subscribe_to_channel(user_id, channel_id, role);
-            proto::UpdateChannels {
-                channels: vec![channel.to_proto()],
-                ..Default::default()
-            }
-        } else {
-            connection_pool.unsubscribe_from_channel(&user_id, &channel_id);
-            proto::UpdateChannels {
-                delete_channels: vec![channel.id.to_proto()],
-                ..Default::default()
-            }
-        };
-
-        for connection_id in connection_pool.user_connection_ids(user_id) {
-            session.peer.send(connection_id, update.clone())?;
-        }
-    }
-
-    response.send(proto::Ack {})?;
-    Ok(())
-}
-
-/// Alter the role for a user in the channel.
-async fn set_channel_member_role(
-    request: proto::SetChannelMemberRole,
-    response: Response<proto::SetChannelMemberRole>,
-    session: MessageContext,
-) -> Result<()> {
-    let db = session.db().await;
-    let channel_id = ChannelId::from_proto(request.channel_id);
-    let member_id = UserId::from_proto(request.user_id);
-    let result = db
-        .set_channel_member_role(
-            channel_id,
-            session.user_id(),
-            member_id,
-            request.role().into(),
-        )
-        .await?;
-
-    match result {
-        db::SetMemberRoleResult::MembershipUpdated(membership_update) => {
-            let mut connection_pool = session.connection_pool().await;
-            notify_membership_updated(
-                &mut connection_pool,
-                membership_update,
-                member_id,
-                &session.peer,
-            )
-        }
-        db::SetMemberRoleResult::InviteUpdated(channel) => {
-            let update = proto::UpdateChannels {
-                channel_invitations: vec![channel.to_proto()],
-                ..Default::default()
-            };
-
-            for connection_id in session
-                .connection_pool()
-                .await
-                .user_connection_ids(member_id)
-            {
-                session.peer.send(connection_id, update.clone())?;
-            }
-        }
-    }
-
-    response.send(proto::Ack {})?;
-    Ok(())
-}
-
-/// Change the name of a channel
-async fn rename_channel(
-    request: proto::RenameChannel,
-    response: Response<proto::RenameChannel>,
-    session: MessageContext,
-) -> Result<()> {
-    let db = session.db().await;
-    let channel_id = ChannelId::from_proto(request.channel_id);
-    let channel_model = db
-        .rename_channel(channel_id, session.user_id(), &request.name)
-        .await?;
-    let root_id = channel_model.root_id();
-    let channel = Channel::from_model(channel_model);
-
-    response.send(proto::RenameChannelResponse {
-        channel: Some(channel.to_proto()),
-    })?;
-
-    let connection_pool = session.connection_pool().await;
-    let update = proto::UpdateChannels {
-        channels: vec![channel.to_proto()],
-        ..Default::default()
-    };
-    for (connection_id, role) in connection_pool.channel_connection_ids(root_id) {
-        if role.can_see_channel(channel.visibility) {
-            session.peer.send(connection_id, update.clone())?;
-        }
-    }
-
-    Ok(())
-}
-
-/// Move a channel to a new parent.
-async fn move_channel(
-    request: proto::MoveChannel,
-    response: Response<proto::MoveChannel>,
-    session: MessageContext,
-) -> Result<()> {
-    let channel_id = ChannelId::from_proto(request.channel_id);
-    let to = ChannelId::from_proto(request.to);
-
-    let (root_id, channels) = session
-        .db()
-        .await
-        .move_channel(channel_id, to, session.user_id())
-        .await?;
-
-    let connection_pool = session.connection_pool().await;
-    for (connection_id, role) in connection_pool.channel_connection_ids(root_id) {
-        let channels = channels
-            .iter()
-            .filter_map(|channel| {
-                if role.can_see_channel(channel.visibility) {
-                    Some(channel.to_proto())
-                } else {
-                    None
-                }
-            })
-            .collect::<Vec<_>>();
-        if channels.is_empty() {
-            continue;
-        }
-
-        let update = proto::UpdateChannels {
-            channels,
-            ..Default::default()
-        };
-
-        session.peer.send(connection_id, update.clone())?;
-    }
-
-    response.send(Ack {})?;
-    Ok(())
-}
-
-async fn reorder_channel(
-    request: proto::ReorderChannel,
-    response: Response<proto::ReorderChannel>,
-    session: MessageContext,
-) -> Result<()> {
-    let channel_id = ChannelId::from_proto(request.channel_id);
-    let direction = request.direction();
-
-    let updated_channels = session
-        .db()
-        .await
-        .reorder_channel(channel_id, direction, session.user_id())
-        .await?;
-
-    if let Some(root_id) = updated_channels.first().map(|channel| channel.root_id()) {
-        let connection_pool = session.connection_pool().await;
-        for (connection_id, role) in connection_pool.channel_connection_ids(root_id) {
-            let channels = updated_channels
-                .iter()
-                .filter_map(|channel| {
-                    if role.can_see_channel(channel.visibility) {
-                        Some(channel.to_proto())
-                    } else {
-                        None
-                    }
-                })
-                .collect::<Vec<_>>();
-
-            if channels.is_empty() {
-                continue;
-            }
-
-            let update = proto::UpdateChannels {
-                channels,
-                ..Default::default()
-            };
-
-            session.peer.send(connection_id, update.clone())?;
-        }
-    }
-
-    response.send(Ack {})?;
-    Ok(())
-}
-
-/// Get the list of channel members
-async fn get_channel_members(
-    request: proto::GetChannelMembers,
-    response: Response<proto::GetChannelMembers>,
-    session: MessageContext,
-) -> Result<()> {
-    let db = session.db().await;
-    let channel_id = ChannelId::from_proto(request.channel_id);
-    let limit = if request.limit == 0 {
-        u16::MAX as u64
-    } else {
-        request.limit
-    };
-    let (members, users) = db
-        .get_channel_participant_details(channel_id, &request.query, limit, session.user_id())
-        .await?;
-    response.send(proto::GetChannelMembersResponse { members, users })?;
-    Ok(())
-}
-
-/// Accept or decline a channel invitation.
-async fn respond_to_channel_invite(
-    request: proto::RespondToChannelInvite,
-    response: Response<proto::RespondToChannelInvite>,
-    session: MessageContext,
-) -> Result<()> {
-    let db = session.db().await;
-    let channel_id = ChannelId::from_proto(request.channel_id);
-    let RespondToChannelInvite {
-        membership_update,
-        notifications,
-    } = db
-        .respond_to_channel_invite(channel_id, session.user_id(), request.accept)
-        .await?;
-
-    let mut connection_pool = session.connection_pool().await;
-    if let Some(membership_update) = membership_update {
-        notify_membership_updated(
-            &mut connection_pool,
-            membership_update,
-            session.user_id(),
-            &session.peer,
-        );
-    } else {
-        let update = proto::UpdateChannels {
-            remove_channel_invitations: vec![channel_id.to_proto()],
-            ..Default::default()
-        };
-
-        for connection_id in connection_pool.user_connection_ids(session.user_id()) {
-            session.peer.send(connection_id, update.clone())?;
-        }
-    };
-
-    send_notifications(&connection_pool, &session.peer, notifications);
-
-    response.send(proto::Ack {})?;
-
-    Ok(())
-}
-
-/// Join the channels' room
-async fn join_channel(
-    request: proto::JoinChannel,
-    response: Response<proto::JoinChannel>,
-    session: MessageContext,
-) -> Result<()> {
-    let channel_id = ChannelId::from_proto(request.channel_id);
-    join_channel_internal(channel_id, Box::new(response), session).await
-}
-
-trait JoinChannelInternalResponse {
-    fn send(self, result: proto::JoinRoomResponse) -> Result<()>;
-}
-impl JoinChannelInternalResponse for Response<proto::JoinChannel> {
-    fn send(self, result: proto::JoinRoomResponse) -> Result<()> {
-        Response::<proto::JoinChannel>::send(self, result)
-    }
-}
-impl JoinChannelInternalResponse for Response<proto::JoinRoom> {
-    fn send(self, result: proto::JoinRoomResponse) -> Result<()> {
-        Response::<proto::JoinRoom>::send(self, result)
-    }
-}
-
-async fn join_channel_internal(
-    channel_id: ChannelId,
-    response: Box<impl JoinChannelInternalResponse>,
-    session: MessageContext,
-) -> Result<()> {
-    let joined_room = {
-        let mut db = session.db().await;
-        // If zed quits without leaving the room, and the user re-opens zed before the
-        // RECONNECT_TIMEOUT, we need to make sure that we kick the user out of the previous
-        // room they were in.
-        if let Some(connection) = db.stale_room_connection(session.user_id()).await? {
-            tracing::info!(
-                stale_connection_id = %connection,
-                "cleaning up stale connection",
-            );
-            drop(db);
-            leave_room_for_session(&session, connection).await?;
-            db = session.db().await;
-        }
-
-        let (joined_room, membership_updated, role) = db
-            .join_channel(channel_id, session.user_id(), session.connection_id)
-            .await?;
-
-        let live_kit_connection_info =
-            session
-                .app_state
-                .livekit_client
-                .as_ref()
-                .and_then(|live_kit| {
-                    let (can_publish, token) = if role == ChannelRole::Guest {
-                        (
-                            false,
-                            live_kit
-                                .guest_token(
-                                    &joined_room.room.livekit_room,
-                                    &session.user_id().to_string(),
-                                )
-                                .trace_err()?,
-                        )
-                    } else {
-                        (
-                            true,
-                            live_kit
-                                .room_token(
-                                    &joined_room.room.livekit_room,
-                                    &session.user_id().to_string(),
-                                )
-                                .trace_err()?,
-                        )
-                    };
-
-                    Some(LiveKitConnectionInfo {
-                        server_url: live_kit.url().into(),
-                        token,
-                        can_publish,
-                    })
-                });
-
-        response.send(proto::JoinRoomResponse {
-            room: Some(joined_room.room.clone()),
-            channel_id: joined_room
-                .channel
-                .as_ref()
-                .map(|channel| channel.id.to_proto()),
-            live_kit_connection_info,
-        })?;
-
-        let mut connection_pool = session.connection_pool().await;
-        if let Some(membership_updated) = membership_updated {
-            notify_membership_updated(
-                &mut connection_pool,
-                membership_updated,
-                session.user_id(),
-                &session.peer,
-            );
-        }
-
-        room_updated(&joined_room.room, &session.peer);
-
-        joined_room
-    };
-
-    channel_updated(
-        &joined_room.channel.context("channel not returned")?,
-        &joined_room.room,
-        &session.peer,
-        &*session.connection_pool().await,
-    );
-
-    update_user_contacts(session.user_id(), &session).await?;
-    Ok(())
-}
-
-/// Start editing the channel notes
-async fn join_channel_buffer(
-    request: proto::JoinChannelBuffer,
-    response: Response<proto::JoinChannelBuffer>,
-    session: MessageContext,
-) -> Result<()> {
-    let db = session.db().await;
-    let channel_id = ChannelId::from_proto(request.channel_id);
-
-    let open_response = db
-        .join_channel_buffer(channel_id, session.user_id(), session.connection_id)
-        .await?;
-
-    let collaborators = open_response.collaborators.clone();
-    response.send(open_response)?;
-
-    let update = UpdateChannelBufferCollaborators {
-        channel_id: channel_id.to_proto(),
-        collaborators: collaborators.clone(),
-    };
-    channel_buffer_updated(
-        session.connection_id,
-        collaborators
-            .iter()
-            .filter_map(|collaborator| Some(collaborator.peer_id?.into())),
-        &update,
-        &session.peer,
-    );
-
-    Ok(())
-}
-
-/// Edit the channel notes
-async fn update_channel_buffer(
-    request: proto::UpdateChannelBuffer,
-    session: MessageContext,
-) -> Result<()> {
-    let db = session.db().await;
-    let channel_id = ChannelId::from_proto(request.channel_id);
-
-    let (collaborators, epoch, version) = db
-        .update_channel_buffer(channel_id, session.user_id(), &request.operations)
-        .await?;
-
-    channel_buffer_updated(
-        session.connection_id,
-        collaborators.clone(),
-        &proto::UpdateChannelBuffer {
-            channel_id: channel_id.to_proto(),
-            operations: request.operations,
-        },
-        &session.peer,
-    );
-
-    let pool = &*session.connection_pool().await;
-
-    let non_collaborators =
-        pool.channel_connection_ids(channel_id)
-            .filter_map(|(connection_id, _)| {
-                if collaborators.contains(&connection_id) {
-                    None
-                } else {
-                    Some(connection_id)
-                }
-            });
-
-    broadcast(None, non_collaborators, |peer_id| {
-        session.peer.send(
-            peer_id,
-            proto::UpdateChannels {
-                latest_channel_buffer_versions: vec![proto::ChannelBufferVersion {
-                    channel_id: channel_id.to_proto(),
-                    epoch: epoch as u64,
-                    version: version.clone(),
-                }],
-                ..Default::default()
-            },
-        )
-    });
-
-    Ok(())
-}
-
-/// Rejoin the channel notes after a connection blip
-async fn rejoin_channel_buffers(
-    request: proto::RejoinChannelBuffers,
-    response: Response<proto::RejoinChannelBuffers>,
-    session: MessageContext,
-) -> Result<()> {
-    let db = session.db().await;
-    let buffers = db
-        .rejoin_channel_buffers(&request.buffers, session.user_id(), session.connection_id)
-        .await?;
-
-    for rejoined_buffer in &buffers {
-        let collaborators_to_notify = rejoined_buffer
-            .buffer
-            .collaborators
-            .iter()
-            .filter_map(|c| Some(c.peer_id?.into()));
-        channel_buffer_updated(
-            session.connection_id,
-            collaborators_to_notify,
-            &proto::UpdateChannelBufferCollaborators {
-                channel_id: rejoined_buffer.buffer.channel_id,
-                collaborators: rejoined_buffer.buffer.collaborators.clone(),
-            },
-            &session.peer,
-        );
-    }
-
-    response.send(proto::RejoinChannelBuffersResponse {
-        buffers: buffers.into_iter().map(|b| b.buffer).collect(),
-    })?;
-
-    Ok(())
-}
-
-/// Stop editing the channel notes
-async fn leave_channel_buffer(
-    request: proto::LeaveChannelBuffer,
-    response: Response<proto::LeaveChannelBuffer>,
-    session: MessageContext,
-) -> Result<()> {
-    let db = session.db().await;
-    let channel_id = ChannelId::from_proto(request.channel_id);
-
-    let left_buffer = db
-        .leave_channel_buffer(channel_id, session.connection_id)
-        .await?;
-
-    response.send(Ack {})?;
-
-    channel_buffer_updated(
-        session.connection_id,
-        left_buffer.connections,
-        &proto::UpdateChannelBufferCollaborators {
-            channel_id: channel_id.to_proto(),
-            collaborators: left_buffer.collaborators,
-        },
-        &session.peer,
-    );
-
-    Ok(())
-}
-
-fn channel_buffer_updated<T: EnvelopedMessage>(
-    sender_id: ConnectionId,
-    collaborators: impl IntoIterator<Item = ConnectionId>,
-    message: &T,
-    peer: &Peer,
-) {
-    broadcast(Some(sender_id), collaborators, |peer_id| {
-        peer.send(peer_id, message.clone())
-    });
-}
-
-fn send_notifications(
-    connection_pool: &ConnectionPool,
-    peer: &Peer,
-    notifications: db::NotificationBatch,
-) {
-    for (user_id, notification) in notifications {
-        for connection_id in connection_pool.user_connection_ids(user_id) {
-            if let Err(error) = peer.send(
-                connection_id,
-                proto::AddNotification {
-                    notification: Some(notification.clone()),
-                },
-            ) {
-                tracing::error!(
-                    "failed to send notification to {:?} {}",
-                    connection_id,
-                    error
-                );
-            }
-        }
-    }
-}
-
-/// Send a message to the channel
-async fn send_channel_message(
-    _request: proto::SendChannelMessage,
-    _response: Response<proto::SendChannelMessage>,
-    _session: MessageContext,
-) -> Result<()> {
-    Err(anyhow!("chat has been removed in the latest version of Zed").into())
-}
-
-/// Delete a channel message
-async fn remove_channel_message(
-    _request: proto::RemoveChannelMessage,
-    _response: Response<proto::RemoveChannelMessage>,
-    _session: MessageContext,
-) -> Result<()> {
-    Err(anyhow!("chat has been removed in the latest version of Zed").into())
-}
-
-async fn update_channel_message(
-    _request: proto::UpdateChannelMessage,
-    _response: Response<proto::UpdateChannelMessage>,
-    _session: MessageContext,
-) -> Result<()> {
-    Err(anyhow!("chat has been removed in the latest version of Zed").into())
-}
-
-/// Mark a channel message as read
-async fn acknowledge_channel_message(
-    _request: proto::AckChannelMessage,
-    _session: MessageContext,
-) -> Result<()> {
-    Err(anyhow!("chat has been removed in the latest version of Zed").into())
-}
-
-/// Mark a buffer version as synced
-async fn acknowledge_buffer_version(
-    request: proto::AckBufferOperation,
-    session: MessageContext,
-) -> Result<()> {
-    let buffer_id = BufferId::from_proto(request.buffer_id);
-    session
-        .db()
-        .await
-        .observe_buffer_version(
-            buffer_id,
-            session.user_id(),
-            request.epoch as i32,
-            &request.version,
-        )
-        .await?;
-    Ok(())
-}
-
-/// Get a Supermaven API key for the user
-async fn get_supermaven_api_key(
-    _request: proto::GetSupermavenApiKey,
-    response: Response<proto::GetSupermavenApiKey>,
-    session: MessageContext,
-) -> Result<()> {
-    let user_id: String = session.user_id().to_string();
-    if !session.is_staff() {
-        return Err(anyhow!("supermaven not enabled for this account"))?;
-    }
-
-    let email = session.email().context("user must have an email")?;
-
-    let supermaven_admin_api = session
-        .supermaven_client
-        .as_ref()
-        .context("supermaven not configured")?;
-
-    let result = supermaven_admin_api
-        .try_get_or_create_user(CreateExternalUserRequest { id: user_id, email })
-        .await?;
-
-    response.send(proto::GetSupermavenApiKeyResponse {
-        api_key: result.api_key,
-    })?;
-
-    Ok(())
-}
-
-/// Start receiving chat updates for a channel
-async fn join_channel_chat(
-    _request: proto::JoinChannelChat,
-    _response: Response<proto::JoinChannelChat>,
-    _session: MessageContext,
-) -> Result<()> {
-    Err(anyhow!("chat has been removed in the latest version of Zed").into())
-}
-
-/// Stop receiving chat updates for a channel
-async fn leave_channel_chat(
-    _request: proto::LeaveChannelChat,
-    _session: MessageContext,
-) -> Result<()> {
-    Err(anyhow!("chat has been removed in the latest version of Zed").into())
-}
-
-/// Retrieve the chat history for a channel
-async fn get_channel_messages(
-    _request: proto::GetChannelMessages,
-    _response: Response<proto::GetChannelMessages>,
-    _session: MessageContext,
-) -> Result<()> {
-    Err(anyhow!("chat has been removed in the latest version of Zed").into())
-}
-
-/// Retrieve specific chat messages
-async fn get_channel_messages_by_id(
-    _request: proto::GetChannelMessagesById,
-    _response: Response<proto::GetChannelMessagesById>,
-    _session: MessageContext,
-) -> Result<()> {
-    Err(anyhow!("chat has been removed in the latest version of Zed").into())
-}
-
-/// Retrieve the current users notifications
-async fn get_notifications(
-    request: proto::GetNotifications,
-    response: Response<proto::GetNotifications>,
-    session: MessageContext,
-) -> Result<()> {
-    let notifications = session
-        .db()
-        .await
-        .get_notifications(
-            session.user_id(),
-            NOTIFICATION_COUNT_PER_PAGE,
-            request.before_id.map(db::NotificationId::from_proto),
-        )
-        .await?;
-    response.send(proto::GetNotificationsResponse {
-        done: notifications.len() < NOTIFICATION_COUNT_PER_PAGE,
-        notifications,
-    })?;
-    Ok(())
-}
-
-/// Mark notifications as read
-async fn mark_notification_as_read(
-    request: proto::MarkNotificationRead,
-    response: Response<proto::MarkNotificationRead>,
-    session: MessageContext,
-) -> Result<()> {
-    let database = &session.db().await;
-    let notifications = database
-        .mark_notification_as_read_by_id(
-            session.user_id(),
-            NotificationId::from_proto(request.notification_id),
-        )
-        .await?;
-    send_notifications(
-        &*session.connection_pool().await,
-        &session.peer,
-        notifications,
-    );
-    response.send(proto::Ack {})?;
-    Ok(())
-}
-
-fn to_axum_message(message: TungsteniteMessage) -> anyhow::Result<AxumMessage> {
-    let message = match message {
-        TungsteniteMessage::Text(payload) => AxumMessage::Text(payload.as_str().to_string()),
-        TungsteniteMessage::Binary(payload) => AxumMessage::Binary(payload.into()),
-        TungsteniteMessage::Ping(payload) => AxumMessage::Ping(payload.into()),
-        TungsteniteMessage::Pong(payload) => AxumMessage::Pong(payload.into()),
-        TungsteniteMessage::Close(frame) => AxumMessage::Close(frame.map(|frame| AxumCloseFrame {
-            code: frame.code.into(),
-            reason: frame.reason.as_str().to_owned().into(),
-        })),
-        // We should never receive a frame while reading the message, according
-        // to the `tungstenite` maintainers:
-        //
-        // > It cannot occur when you read messages from the WebSocket, but it
-        // > can be used when you want to send the raw frames (e.g. you want to
-        // > send the frames to the WebSocket without composing the full message first).
-        // >
-        // > — https://github.com/snapview/tungstenite-rs/issues/268
-        TungsteniteMessage::Frame(_) => {
-            bail!("received an unexpected frame while reading the message")
-        }
-    };
-
-    Ok(message)
-}
-
-fn to_tungstenite_message(message: AxumMessage) -> TungsteniteMessage {
-    match message {
-        AxumMessage::Text(payload) => TungsteniteMessage::Text(payload.into()),
-        AxumMessage::Binary(payload) => TungsteniteMessage::Binary(payload.into()),
-        AxumMessage::Ping(payload) => TungsteniteMessage::Ping(payload.into()),
-        AxumMessage::Pong(payload) => TungsteniteMessage::Pong(payload.into()),
-        AxumMessage::Close(frame) => {
-            TungsteniteMessage::Close(frame.map(|frame| TungsteniteCloseFrame {
-                code: frame.code.into(),
-                reason: frame.reason.as_ref().into(),
-            }))
-        }
-    }
-}
-
-fn notify_membership_updated(
-    connection_pool: &mut ConnectionPool,
-    result: MembershipUpdated,
-    user_id: UserId,
-    peer: &Peer,
-) {
-    for membership in &result.new_channels.channel_memberships {
-        connection_pool.subscribe_to_channel(user_id, membership.channel_id, membership.role)
-    }
-    for channel_id in &result.removed_channels {
-        connection_pool.unsubscribe_from_channel(&user_id, channel_id)
-    }
-
-    let user_channels_update = proto::UpdateUserChannels {
-        channel_memberships: result
-            .new_channels
-            .channel_memberships
-            .iter()
-            .map(|cm| proto::ChannelMembership {
-                channel_id: cm.channel_id.to_proto(),
-                role: cm.role.into(),
-            })
-            .collect(),
-        ..Default::default()
-    };
-
-    let mut update = build_channels_update(result.new_channels);
-    update.delete_channels = result
-        .removed_channels
-        .into_iter()
-        .map(|id| id.to_proto())
-        .collect();
-    update.remove_channel_invitations = vec![result.channel_id.to_proto()];
-
-    for connection_id in connection_pool.user_connection_ids(user_id) {
-        peer.send(connection_id, user_channels_update.clone())
-            .trace_err();
-        peer.send(connection_id, update.clone()).trace_err();
-    }
-}
-
-fn build_update_user_channels(channels: &ChannelsForUser) -> proto::UpdateUserChannels {
-    proto::UpdateUserChannels {
-        channel_memberships: channels
-            .channel_memberships
-            .iter()
-            .map(|m| proto::ChannelMembership {
-                channel_id: m.channel_id.to_proto(),
-                role: m.role.into(),
-            })
-            .collect(),
-        observed_channel_buffer_version: channels.observed_buffer_versions.clone(),
-    }
-}
-
-fn build_channels_update(channels: ChannelsForUser) -> proto::UpdateChannels {
-    let mut update = proto::UpdateChannels::default();
-
-    for channel in channels.channels {
-        update.channels.push(channel.to_proto());
-    }
-
-    update.latest_channel_buffer_versions = channels.latest_buffer_versions;
-
-    for (channel_id, participants) in channels.channel_participants {
-        update
-            .channel_participants
-            .push(proto::ChannelParticipants {
-                channel_id: channel_id.to_proto(),
-                participant_user_ids: participants.into_iter().map(|id| id.to_proto()).collect(),
-            });
-    }
-
-    for channel in channels.invited_channels {
-        update.channel_invitations.push(channel.to_proto());
-    }
-
-    update
-}
-
-fn build_initial_contacts_update(
-    contacts: Vec<db::Contact>,
-    pool: &ConnectionPool,
-) -> proto::UpdateContacts {
-    let mut update = proto::UpdateContacts::default();
-
-    for contact in contacts {
-        match contact {
-            db::Contact::Accepted { user_id, busy } => {
-                update.contacts.push(contact_for_user(user_id, busy, pool));
-            }
-            db::Contact::Outgoing { user_id } => update.outgoing_requests.push(user_id.to_proto()),
-            db::Contact::Incoming { user_id } => {
-                update
-                    .incoming_requests
-                    .push(proto::IncomingContactRequest {
-                        requester_id: user_id.to_proto(),
-                    })
-            }
-        }
-    }
-
-    update
-}
-
-fn contact_for_user(user_id: UserId, busy: bool, pool: &ConnectionPool) -> proto::Contact {
-    proto::Contact {
-        user_id: user_id.to_proto(),
-        online: pool.is_user_online(user_id),
-        busy,
-    }
-}
-
-fn room_updated(room: &proto::Room, peer: &Peer) {
-    broadcast(
-        None,
-        room.participants
-            .iter()
-            .filter_map(|participant| Some(participant.peer_id?.into())),
-        |peer_id| {
-            peer.send(
-                peer_id,
-                proto::RoomUpdated {
-                    room: Some(room.clone()),
-                },
-            )
-        },
-    );
-}
-
-fn channel_updated(
-    channel: &db::channel::Model,
-    room: &proto::Room,
-    peer: &Peer,
-    pool: &ConnectionPool,
-) {
-    let participants = room
-        .participants
-        .iter()
-        .map(|p| p.user_id)
-        .collect::<Vec<_>>();
-
-    broadcast(
-        None,
-        pool.channel_connection_ids(channel.root_id())
-            .filter_map(|(channel_id, role)| {
-                role.can_see_channel(channel.visibility)
-                    .then_some(channel_id)
-            }),
-        |peer_id| {
-            peer.send(
-                peer_id,
-                proto::UpdateChannels {
-                    channel_participants: vec![proto::ChannelParticipants {
-                        channel_id: channel.id.to_proto(),
-                        participant_user_ids: participants.clone(),
-                    }],
-                    ..Default::default()
-                },
-            )
-        },
-    );
-}
-
-async fn update_user_contacts(user_id: UserId, session: &Session) -> Result<()> {
-    let db = session.db().await;
-
-    let contacts = db.get_contacts(user_id).await?;
-    let busy = db.is_user_busy(user_id).await?;
-
-    let pool = session.connection_pool().await;
-    let updated_contact = contact_for_user(user_id, busy, &pool);
-    for contact in contacts {
-        if let db::Contact::Accepted {
-            user_id: contact_user_id,
-            ..
-        } = contact
-        {
-            for contact_conn_id in pool.user_connection_ids(contact_user_id) {
-                session
-                    .peer
-                    .send(
-                        contact_conn_id,
-                        proto::UpdateContacts {
-                            contacts: vec![updated_contact.clone()],
-                            remove_contacts: Default::default(),
-                            incoming_requests: Default::default(),
-                            remove_incoming_requests: Default::default(),
-                            outgoing_requests: Default::default(),
-                            remove_outgoing_requests: Default::default(),
-                        },
-                    )
-                    .trace_err();
-            }
-        }
-    }
-    Ok(())
-}
-
-async fn leave_room_for_session(session: &Session, connection_id: ConnectionId) -> Result<()> {
-    let mut contacts_to_update = HashSet::default();
-
-    let room_id;
-    let canceled_calls_to_user_ids;
-    let livekit_room;
-    let delete_livekit_room;
-    let room;
-    let channel;
-
-    if let Some(mut left_room) = session.db().await.leave_room(connection_id).await? {
-        contacts_to_update.insert(session.user_id());
-
-        for project in left_room.left_projects.values() {
-            project_left(project, session);
-        }
-
-        room_id = RoomId::from_proto(left_room.room.id);
-        canceled_calls_to_user_ids = mem::take(&mut left_room.canceled_calls_to_user_ids);
-        livekit_room = mem::take(&mut left_room.room.livekit_room);
-        delete_livekit_room = left_room.deleted;
-        room = mem::take(&mut left_room.room);
-        channel = mem::take(&mut left_room.channel);
-
-        room_updated(&room, &session.peer);
-    } else {
-        return Ok(());
-    }
-
-    if let Some(channel) = channel {
-        channel_updated(
-            &channel,
-            &room,
-            &session.peer,
-            &*session.connection_pool().await,
-        );
-    }
-
-    {
-        let pool = session.connection_pool().await;
-        for canceled_user_id in canceled_calls_to_user_ids {
-            for connection_id in pool.user_connection_ids(canceled_user_id) {
-                session
-                    .peer
-                    .send(
-                        connection_id,
-                        proto::CallCanceled {
-                            room_id: room_id.to_proto(),
-                        },
-                    )
-                    .trace_err();
-            }
-            contacts_to_update.insert(canceled_user_id);
-        }
-    }
-
-    for contact_user_id in contacts_to_update {
-        update_user_contacts(contact_user_id, session).await?;
-    }
-
-    if let Some(live_kit) = session.app_state.livekit_client.as_ref() {
-        live_kit
-            .remove_participant(livekit_room.clone(), session.user_id().to_string())
-            .await
-            .trace_err();
-
-        if delete_livekit_room {
-            live_kit.delete_room(livekit_room).await.trace_err();
-        }
-    }
-
-    Ok(())
-}
-
-async fn leave_channel_buffers_for_session(session: &Session) -> Result<()> {
-    let left_channel_buffers = session
-        .db()
-        .await
-        .leave_channel_buffers(session.connection_id)
-        .await?;
-
-    for left_buffer in left_channel_buffers {
-        channel_buffer_updated(
-            session.connection_id,
-            left_buffer.connections,
-            &proto::UpdateChannelBufferCollaborators {
-                channel_id: left_buffer.channel_id.to_proto(),
-                collaborators: left_buffer.collaborators,
-            },
-            &session.peer,
-        );
-    }
-
-    Ok(())
-}
-
-fn project_left(project: &db::LeftProject, session: &Session) {
-    for connection_id in &project.connection_ids {
-        if project.should_unshare {
-            session
-                .peer
-                .send(
-                    *connection_id,
-                    proto::UnshareProject {
-                        project_id: project.id.to_proto(),
-                    },
-                )
-                .trace_err();
-        } else {
-            session
-                .peer
-                .send(
-                    *connection_id,
-                    proto::RemoveProjectCollaborator {
-                        project_id: project.id.to_proto(),
-                        peer_id: Some(session.connection_id.into()),
-                    },
-                )
-                .trace_err();
-        }
-    }
-}
-
-pub trait ResultExt {
-    type Ok;
-
-    fn trace_err(self) -> Option<Self::Ok>;
-}
-
-impl<T, E> ResultExt for Result<T, E>
-where
-    E: std::fmt::Debug,
-{
-    type Ok = T;
-
-    #[track_caller]
-    fn trace_err(self) -> Option<T> {
-        match self {
-            Ok(value) => Some(value),
-            Err(error) => {
-                tracing::error!("{:?}", error);
-                None
-            }
-        }
-    }
-}
diff --git a/crates/collab/src/rpc/connection_pool.rs b/crates/collab/src/rpc/connection_pool.rs
deleted file mode 100644
index b119323916..0000000000
--- a/crates/collab/src/rpc/connection_pool.rs
+++ /dev/null
@@ -1,259 +0,0 @@
-use crate::db::{ChannelId, ChannelRole, UserId};
-use anyhow::{Context as _, Result};
-use collections::{BTreeMap, HashMap, HashSet};
-use rpc::ConnectionId;
-use semver::Version;
-use serde::Serialize;
-use std::fmt;
-use tracing::instrument;
-
-#[derive(Default, Serialize)]
-pub struct ConnectionPool {
-    connections: BTreeMap<ConnectionId, Connection>,
-    connected_users: BTreeMap<UserId, ConnectedPrincipal>,
-    channels: ChannelPool,
-}
-
-#[derive(Default, Serialize)]
-struct ConnectedPrincipal {
-    connection_ids: HashSet<ConnectionId>,
-}
-
-#[derive(Clone, Debug, Serialize, PartialOrd, PartialEq, Eq, Ord)]
-pub struct ZedVersion(pub Version);
-
-impl fmt::Display for ZedVersion {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
-impl ZedVersion {
-    pub fn can_collaborate(&self) -> bool {
-        // v0.204.1 was the first version after the auto-update bug.
-        // We reject any clients older than that to hope we can persuade them to upgrade.
-        if self.0 < Version::new(0, 204, 1) {
-            return false;
-        }
-
-        // Since we hotfixed the changes to no longer connect to Collab automatically to Preview, we also need to reject
-        // versions in the range [v0.199.0, v0.199.1].
-        if self.0 >= Version::new(0, 199, 0) && self.0 < Version::new(0, 199, 2) {
-            return false;
-        }
-
-        true
-    }
-}
-
-#[derive(Serialize)]
-pub struct Connection {
-    pub user_id: UserId,
-    pub admin: bool,
-    pub zed_version: ZedVersion,
-}
-
-impl ConnectionPool {
-    pub fn reset(&mut self) {
-        self.connections.clear();
-        self.connected_users.clear();
-        self.channels.clear();
-    }
-
-    pub fn connection(&mut self, connection_id: ConnectionId) -> Option<&Connection> {
-        self.connections.get(&connection_id)
-    }
-
-    #[instrument(skip(self))]
-    pub fn add_connection(
-        &mut self,
-        connection_id: ConnectionId,
-        user_id: UserId,
-        admin: bool,
-        zed_version: ZedVersion,
-    ) {
-        self.connections.insert(
-            connection_id,
-            Connection {
-                user_id,
-                admin,
-                zed_version,
-            },
-        );
-        let connected_user = self.connected_users.entry(user_id).or_default();
-        connected_user.connection_ids.insert(connection_id);
-    }
-
-    #[instrument(skip(self))]
-    pub fn remove_connection(&mut self, connection_id: ConnectionId) -> Result<()> {
-        let connection = self
-            .connections
-            .get_mut(&connection_id)
-            .context("no such connection")?;
-
-        let user_id = connection.user_id;
-
-        let connected_user = self.connected_users.get_mut(&user_id).unwrap();
-        connected_user.connection_ids.remove(&connection_id);
-        if connected_user.connection_ids.is_empty() {
-            self.connected_users.remove(&user_id);
-            self.channels.remove_user(&user_id);
-        };
-        self.connections.remove(&connection_id).unwrap();
-        Ok(())
-    }
-
-    pub fn connections(&self) -> impl Iterator<Item = &Connection> {
-        self.connections.values()
-    }
-
-    pub fn user_connections(&self, user_id: UserId) -> impl Iterator<Item = &Connection> + '_ {
-        self.connected_users
-            .get(&user_id)
-            .into_iter()
-            .flat_map(|state| {
-                state
-                    .connection_ids
-                    .iter()
-                    .flat_map(|cid| self.connections.get(cid))
-            })
-    }
-
-    pub fn user_connection_ids(&self, user_id: UserId) -> impl Iterator<Item = ConnectionId> + '_ {
-        self.connected_users
-            .get(&user_id)
-            .into_iter()
-            .flat_map(|state| &state.connection_ids)
-            .copied()
-    }
-
-    pub fn channel_user_ids(
-        &self,
-        channel_id: ChannelId,
-    ) -> impl Iterator<Item = (UserId, ChannelRole)> + '_ {
-        self.channels.users_to_notify(channel_id)
-    }
-
-    pub fn channel_connection_ids(
-        &self,
-        channel_id: ChannelId,
-    ) -> impl Iterator<Item = (ConnectionId, ChannelRole)> + '_ {
-        self.channels
-            .users_to_notify(channel_id)
-            .flat_map(|(user_id, role)| {
-                self.user_connection_ids(user_id)
-                    .map(move |connection_id| (connection_id, role))
-            })
-    }
-
-    pub fn subscribe_to_channel(
-        &mut self,
-        user_id: UserId,
-        channel_id: ChannelId,
-        role: ChannelRole,
-    ) {
-        self.channels.subscribe(user_id, channel_id, role);
-    }
-
-    pub fn unsubscribe_from_channel(&mut self, user_id: &UserId, channel_id: &ChannelId) {
-        self.channels.unsubscribe(user_id, channel_id);
-    }
-
-    pub fn is_user_online(&self, user_id: UserId) -> bool {
-        !self
-            .connected_users
-            .get(&user_id)
-            .unwrap_or(&Default::default())
-            .connection_ids
-            .is_empty()
-    }
-
-    #[cfg(test)]
-    pub fn check_invariants(&self) {
-        for (connection_id, connection) in &self.connections {
-            assert!(
-                self.connected_users
-                    .get(&connection.user_id)
-                    .unwrap()
-                    .connection_ids
-                    .contains(connection_id)
-            );
-        }
-
-        for (user_id, state) in &self.connected_users {
-            for connection_id in &state.connection_ids {
-                assert_eq!(
-                    self.connections.get(connection_id).unwrap().user_id,
-                    *user_id
-                );
-            }
-        }
-    }
-}
-
-#[derive(Default, Serialize)]
-pub struct ChannelPool {
-    by_user: HashMap<UserId, HashMap<ChannelId, ChannelRole>>,
-    by_channel: HashMap<ChannelId, HashSet<UserId>>,
-}
-
-impl ChannelPool {
-    pub fn clear(&mut self) {
-        self.by_user.clear();
-        self.by_channel.clear();
-    }
-
-    pub fn subscribe(&mut self, user_id: UserId, channel_id: ChannelId, role: ChannelRole) {
-        self.by_user
-            .entry(user_id)
-            .or_default()
-            .insert(channel_id, role);
-        self.by_channel
-            .entry(channel_id)
-            .or_default()
-            .insert(user_id);
-    }
-
-    pub fn unsubscribe(&mut self, user_id: &UserId, channel_id: &ChannelId) {
-        if let Some(channels) = self.by_user.get_mut(user_id) {
-            channels.remove(channel_id);
-            if channels.is_empty() {
-                self.by_user.remove(user_id);
-            }
-        }
-        if let Some(users) = self.by_channel.get_mut(channel_id) {
-            users.remove(user_id);
-            if users.is_empty() {
-                self.by_channel.remove(channel_id);
-            }
-        }
-    }
-
-    pub fn remove_user(&mut self, user_id: &UserId) {
-        if let Some(channels) = self.by_user.remove(user_id) {
-            for channel_id in channels.keys() {
-                self.unsubscribe(user_id, channel_id)
-            }
-        }
-    }
-
-    pub fn users_to_notify(
-        &self,
-        channel_id: ChannelId,
-    ) -> impl '_ + Iterator<Item = (UserId, ChannelRole)> {
-        self.by_channel
-            .get(&channel_id)
-            .into_iter()
-            .flat_map(move |users| {
-                users.iter().flat_map(move |user_id| {
-                    Some((
-                        *user_id,
-                        self.by_user
-                            .get(user_id)
-                            .and_then(|channels| channels.get(&channel_id))
-                            .copied()?,
-                    ))
-                })
-            })
-    }
-}
diff --git a/crates/collab/src/seed.rs b/crates/collab/src/seed.rs
deleted file mode 100644
index 5f5779e1e4..0000000000
--- a/crates/collab/src/seed.rs
+++ /dev/null
@@ -1,136 +0,0 @@
-use crate::db::{self, ChannelRole, NewUserParams};
-
-use anyhow::Context as _;
-use chrono::{DateTime, Utc};
-use db::Database;
-use serde::{Deserialize, de::DeserializeOwned};
-use std::{fs, path::Path};
-
-use crate::Config;
-
-/// A GitHub user.
-///
-/// This representation corresponds to the entries in the `seed/github_users.json` file.
-#[derive(Debug, Deserialize)]
-struct GithubUser {
-    id: i32,
-    login: String,
-    email: Option<String>,
-    name: Option<String>,
-    created_at: DateTime<Utc>,
-}
-
-#[derive(Deserialize)]
-struct SeedConfig {
-    /// Which users to create as admins.
-    admins: Vec<String>,
-    /// Which channels to create (all admins are invited to all channels).
-    channels: Vec<String>,
-}
-
-pub async fn seed(config: &Config, db: &Database, force: bool) -> anyhow::Result<()> {
-    let client = reqwest::Client::new();
-
-    if !db.get_all_users(0, 1).await?.is_empty() && !force {
-        return Ok(());
-    }
-
-    let seed_path = config
-        .seed_path
-        .as_ref()
-        .context("called seed with no SEED_PATH")?;
-
-    let seed_config = load_admins(seed_path)
-        .context(format!("failed to load {}", seed_path.to_string_lossy()))?;
-
-    let mut first_user = None;
-    let mut others = vec![];
-
-    for admin_login in seed_config.admins {
-        let user = fetch_github::<GithubUser>(
-            &client,
-            &format!("https://api.github.com/users/{admin_login}"),
-        )
-        .await;
-        let user = db
-            .create_user(
-                &user.email.unwrap_or(format!("{admin_login}@example.com")),
-                user.name.as_deref(),
-                true,
-                NewUserParams {
-                    github_login: user.login,
-                    github_user_id: user.id,
-                },
-            )
-            .await
-            .context("failed to create admin user")?;
-        if first_user.is_none() {
-            first_user = Some(user.user_id);
-        } else {
-            others.push(user.user_id)
-        }
-    }
-
-    for channel in seed_config.channels {
-        let (channel, _) = db
-            .create_channel(&channel, None, first_user.unwrap())
-            .await
-            .context("failed to create channel")?;
-
-        for user_id in &others {
-            db.invite_channel_member(
-                channel.id,
-                *user_id,
-                first_user.unwrap(),
-                ChannelRole::Admin,
-            )
-            .await
-            .context("failed to add user to channel")?;
-        }
-    }
-
-    let github_users_filepath = seed_path.parent().unwrap().join("seed/github_users.json");
-    let github_users: Vec<GithubUser> =
-        serde_json::from_str(&fs::read_to_string(github_users_filepath)?)?;
-
-    for github_user in github_users {
-        log::info!("Seeding {:?} from GitHub", github_user.login);
-
-        db.update_or_create_user_by_github_account(
-            &github_user.login,
-            github_user.id,
-            github_user.email.as_deref(),
-            github_user.name.as_deref(),
-            github_user.created_at,
-            None,
-        )
-        .await
-        .expect("failed to insert user");
-    }
-
-    Ok(())
-}
-
-fn load_admins(path: impl AsRef<Path>) -> anyhow::Result<SeedConfig> {
-    let file_content = fs::read_to_string(path)?;
-    Ok(serde_json::from_str(&file_content)?)
-}
-
-async fn fetch_github<T: DeserializeOwned>(client: &reqwest::Client, url: &str) -> T {
-    let mut request_builder = client.get(url);
-    if let Ok(github_token) = std::env::var("GITHUB_TOKEN") {
-        request_builder =
-            request_builder.header("Authorization", format!("Bearer {}", github_token));
-    }
-    let response = request_builder
-        .header("user-agent", "zed")
-        .send()
-        .await
-        .unwrap_or_else(|error| panic!("failed to fetch '{url}': {error}"));
-    let response_text = response.text().await.unwrap_or_else(|error| {
-        panic!("failed to fetch '{url}': {error}");
-    });
-    serde_json::from_str(&response_text).unwrap_or_else(|error| {
-        panic!("failed to deserialize github user from '{url}'. Error: '{error}', text: '{response_text}'");
-    })
-}
diff --git a/crates/collab/src/tests.rs b/crates/collab/src/tests.rs
deleted file mode 100644
index 3785ee0b7a..0000000000
--- a/crates/collab/src/tests.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-use call::Room;
-use client::ChannelId;
-use gpui::{Entity, TestAppContext};
-
-mod channel_buffer_tests;
-mod channel_guest_tests;
-mod channel_tests;
-mod editor_tests;
-mod following_tests;
-mod git_tests;
-mod integration_tests;
-mod notification_tests;
-mod random_channel_buffer_tests;
-mod random_project_collaboration_tests;
-mod randomized_test_helpers;
-mod remote_editing_collaboration_tests;
-mod test_server;
-
-pub use randomized_test_helpers::{
-    RandomizedTest, TestError, UserTestPlan, run_randomized_test, save_randomized_test_plan,
-};
-pub use test_server::{TestClient, TestServer};
-
-#[derive(Debug, Eq, PartialEq)]
-struct RoomParticipants {
-    remote: Vec<String>,
-    pending: Vec<String>,
-}
-
-fn room_participants(room: &Entity<Room>, cx: &mut TestAppContext) -> RoomParticipants {
-    room.read_with(cx, |room, _| {
-        let mut remote = room
-            .remote_participants()
-            .values()
-            .map(|participant| participant.user.github_login.clone().to_string())
-            .collect::<Vec<_>>();
-        let mut pending = room
-            .pending_participants()
-            .iter()
-            .map(|user| user.github_login.clone().to_string())
-            .collect::<Vec<_>>();
-        remote.sort();
-        pending.sort();
-        RoomParticipants { remote, pending }
-    })
-}
-
-fn channel_id(room: &Entity<Room>, cx: &mut TestAppContext) -> Option<ChannelId> {
-    cx.read(|cx| room.read(cx).channel_id())
-}
diff --git a/crates/collab/src/tests/channel_buffer_tests.rs b/crates/collab/src/tests/channel_buffer_tests.rs
deleted file mode 100644
index 62c61d3cf0..0000000000
--- a/crates/collab/src/tests/channel_buffer_tests.rs
+++ /dev/null
@@ -1,720 +0,0 @@
-use crate::{
-    rpc::{CLEANUP_TIMEOUT, RECONNECT_TIMEOUT},
-    tests::{TestServer, test_server::open_channel_notes},
-};
-use call::ActiveCall;
-use channel::ACKNOWLEDGE_DEBOUNCE_INTERVAL;
-use client::{Collaborator, ParticipantIndex, UserId};
-use collab_ui::channel_view::ChannelView;
-use collections::HashMap;
-use editor::{Anchor, Editor, MultiBufferOffset, ToOffset};
-use futures::future;
-use gpui::{BackgroundExecutor, Context, Entity, TestAppContext, Window};
-use rpc::{RECEIVE_TIMEOUT, proto::PeerId};
-use serde_json::json;
-use std::ops::Range;
-use util::rel_path::rel_path;
-use workspace::CollaboratorId;
-
-#[gpui::test]
-async fn test_core_channel_buffers(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-
-    let channel_id = server
-        .make_channel("zed", None, (&client_a, cx_a), &mut [(&client_b, cx_b)])
-        .await;
-
-    // Client A joins the channel buffer
-    let channel_buffer_a = client_a
-        .channel_store()
-        .update(cx_a, |store, cx| store.open_channel_buffer(channel_id, cx))
-        .await
-        .unwrap();
-
-    // Client A edits the buffer
-    let buffer_a = channel_buffer_a.read_with(cx_a, |buffer, _| buffer.buffer());
-    buffer_a.update(cx_a, |buffer, cx| {
-        buffer.edit([(0..0, "hello world")], None, cx)
-    });
-    buffer_a.update(cx_a, |buffer, cx| {
-        buffer.edit([(5..5, ", cruel")], None, cx)
-    });
-    buffer_a.update(cx_a, |buffer, cx| {
-        buffer.edit([(0..5, "goodbye")], None, cx)
-    });
-    buffer_a.update(cx_a, |buffer, cx| buffer.undo(cx));
-    assert_eq!(buffer_text(&buffer_a, cx_a), "hello, cruel world");
-    executor.run_until_parked();
-
-    // Client B joins the channel buffer
-    let channel_buffer_b = client_b
-        .channel_store()
-        .update(cx_b, |store, cx| store.open_channel_buffer(channel_id, cx))
-        .await
-        .unwrap();
-    channel_buffer_b.read_with(cx_b, |buffer, _| {
-        assert_collaborators(
-            buffer.collaborators(),
-            &[client_a.user_id(), client_b.user_id()],
-        );
-    });
-
-    // Client B sees the correct text, and then edits it
-    let buffer_b = channel_buffer_b.read_with(cx_b, |buffer, _| buffer.buffer());
-    assert_eq!(
-        buffer_b.read_with(cx_b, |buffer, _| buffer.remote_id()),
-        buffer_a.read_with(cx_a, |buffer, _| buffer.remote_id())
-    );
-    assert_eq!(buffer_text(&buffer_b, cx_b), "hello, cruel world");
-    buffer_b.update(cx_b, |buffer, cx| {
-        buffer.edit([(7..12, "beautiful")], None, cx)
-    });
-
-    // Both A and B see the new edit
-    executor.run_until_parked();
-    assert_eq!(buffer_text(&buffer_a, cx_a), "hello, beautiful world");
-    assert_eq!(buffer_text(&buffer_b, cx_b), "hello, beautiful world");
-
-    // Client A closes the channel buffer.
-    cx_a.update(|_| drop(channel_buffer_a));
-    executor.run_until_parked();
-
-    // Client B sees that client A is gone from the channel buffer.
-    channel_buffer_b.read_with(cx_b, |buffer, _| {
-        assert_collaborators(buffer.collaborators(), &[client_b.user_id()]);
-    });
-
-    // Client A rejoins the channel buffer
-    let _channel_buffer_a = client_a
-        .channel_store()
-        .update(cx_a, |store, cx| store.open_channel_buffer(channel_id, cx))
-        .await
-        .unwrap();
-    executor.run_until_parked();
-
-    // Sanity test, make sure we saw A rejoining
-    channel_buffer_b.read_with(cx_b, |buffer, _| {
-        assert_collaborators(
-            buffer.collaborators(),
-            &[client_a.user_id(), client_b.user_id()],
-        );
-    });
-
-    // Client A loses connection.
-    server.forbid_connections();
-    server.disconnect_client(client_a.peer_id().unwrap());
-    executor.advance_clock(RECEIVE_TIMEOUT + RECONNECT_TIMEOUT);
-
-    // Client B observes A disconnect
-    channel_buffer_b.read_with(cx_b, |buffer, _| {
-        assert_collaborators(buffer.collaborators(), &[client_b.user_id()]);
-    });
-
-    // TODO:
-    // - Test synchronizing offline updates, what happens to A's channel buffer when A disconnects
-    // - Test interaction with channel deletion while buffer is open
-}
-
-#[gpui::test]
-async fn test_channel_notes_participant_indices(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-    cx_c: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    let client_c = server.create_client(cx_c, "user_c").await;
-
-    let active_call_a = cx_a.read(ActiveCall::global);
-    let active_call_b = cx_b.read(ActiveCall::global);
-
-    cx_a.update(editor::init);
-    cx_b.update(editor::init);
-    cx_c.update(editor::init);
-
-    let channel_id = server
-        .make_channel(
-            "the-channel",
-            None,
-            (&client_a, cx_a),
-            &mut [(&client_b, cx_b), (&client_c, cx_c)],
-        )
-        .await;
-
-    client_a
-        .fs()
-        .insert_tree("/root", json!({"file.txt": "123"}))
-        .await;
-    let (project_a, worktree_id_a) = client_a.build_local_project("/root", cx_a).await;
-    let project_b = client_b.build_empty_local_project(cx_b);
-    let project_c = client_c.build_empty_local_project(cx_c);
-
-    let (workspace_a, mut cx_a) = client_a.build_workspace(&project_a, cx_a);
-    let (workspace_b, mut cx_b) = client_b.build_workspace(&project_b, cx_b);
-    let (workspace_c, cx_c) = client_c.build_workspace(&project_c, cx_c);
-
-    // Clients A, B, and C open the channel notes
-    let channel_view_a = cx_a
-        .update(|window, cx| ChannelView::open(channel_id, None, workspace_a.clone(), window, cx))
-        .await
-        .unwrap();
-    let channel_view_b = cx_b
-        .update(|window, cx| ChannelView::open(channel_id, None, workspace_b.clone(), window, cx))
-        .await
-        .unwrap();
-    let channel_view_c = cx_c
-        .update(|window, cx| ChannelView::open(channel_id, None, workspace_c.clone(), window, cx))
-        .await
-        .unwrap();
-
-    // Clients A, B, and C all insert and select some text
-    channel_view_a.update_in(cx_a, |notes, window, cx| {
-        notes.editor.update(cx, |editor, cx| {
-            editor.insert("a", window, cx);
-            editor.change_selections(Default::default(), window, cx, |selections| {
-                selections.select_ranges(vec![MultiBufferOffset(0)..MultiBufferOffset(1)]);
-            });
-        });
-    });
-    executor.run_until_parked();
-    channel_view_b.update_in(cx_b, |notes, window, cx| {
-        notes.editor.update(cx, |editor, cx| {
-            editor.move_down(&Default::default(), window, cx);
-            editor.insert("b", window, cx);
-            editor.change_selections(Default::default(), window, cx, |selections| {
-                selections.select_ranges(vec![MultiBufferOffset(1)..MultiBufferOffset(2)]);
-            });
-        });
-    });
-    executor.run_until_parked();
-    channel_view_c.update_in(cx_c, |notes, window, cx| {
-        notes.editor.update(cx, |editor, cx| {
-            editor.move_down(&Default::default(), window, cx);
-            editor.insert("c", window, cx);
-            editor.change_selections(Default::default(), window, cx, |selections| {
-                selections.select_ranges(vec![MultiBufferOffset(2)..MultiBufferOffset(3)]);
-            });
-        });
-    });
-
-    // Client A sees clients B and C without assigned colors, because they aren't
-    // in a call together.
-    executor.run_until_parked();
-    channel_view_a.update_in(cx_a, |notes, window, cx| {
-        notes.editor.update(cx, |editor, cx| {
-            assert_remote_selections(editor, &[(None, 1..2), (None, 2..3)], window, cx);
-        });
-    });
-
-    // Clients A and B join the same call.
-    for (call, cx) in [(&active_call_a, &mut cx_a), (&active_call_b, &mut cx_b)] {
-        call.update(*cx, |call, cx| call.join_channel(channel_id, cx))
-            .await
-            .unwrap();
-    }
-
-    // Clients A and B see each other with two different assigned colors. Client C
-    // still doesn't have a color.
-    executor.run_until_parked();
-    channel_view_a.update_in(cx_a, |notes, window, cx| {
-        notes.editor.update(cx, |editor, cx| {
-            assert_remote_selections(
-                editor,
-                &[(Some(ParticipantIndex(1)), 1..2), (None, 2..3)],
-                window,
-                cx,
-            );
-        });
-    });
-    channel_view_b.update_in(cx_b, |notes, window, cx| {
-        notes.editor.update(cx, |editor, cx| {
-            assert_remote_selections(
-                editor,
-                &[(Some(ParticipantIndex(0)), 0..1), (None, 2..3)],
-                window,
-                cx,
-            );
-        });
-    });
-
-    // Client A shares a project, and client B joins.
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-    let (workspace_b, cx_b) = client_b.build_workspace(&project_b, cx_b);
-
-    // Clients A and B open the same file.
-    executor.start_waiting();
-    let editor_a = workspace_a
-        .update_in(cx_a, |workspace, window, cx| {
-            workspace.open_path(
-                (worktree_id_a, rel_path("file.txt")),
-                None,
-                true,
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-    executor.start_waiting();
-    let editor_b = workspace_b
-        .update_in(cx_b, |workspace, window, cx| {
-            workspace.open_path(
-                (worktree_id_a, rel_path("file.txt")),
-                None,
-                true,
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-
-    editor_a.update_in(cx_a, |editor, window, cx| {
-        editor.change_selections(Default::default(), window, cx, |selections| {
-            selections.select_ranges(vec![MultiBufferOffset(0)..MultiBufferOffset(1)]);
-        });
-    });
-    editor_b.update_in(cx_b, |editor, window, cx| {
-        editor.change_selections(Default::default(), window, cx, |selections| {
-            selections.select_ranges(vec![MultiBufferOffset(2)..MultiBufferOffset(3)]);
-        });
-    });
-    executor.run_until_parked();
-
-    // Clients A and B see each other with the same colors as in the channel notes.
-    editor_a.update_in(cx_a, |editor, window, cx| {
-        assert_remote_selections(editor, &[(Some(ParticipantIndex(1)), 2..3)], window, cx);
-    });
-    editor_b.update_in(cx_b, |editor, window, cx| {
-        assert_remote_selections(editor, &[(Some(ParticipantIndex(0)), 0..1)], window, cx);
-    });
-}
-
-#[track_caller]
-fn assert_remote_selections(
-    editor: &mut Editor,
-    expected_selections: &[(Option<ParticipantIndex>, Range<usize>)],
-    window: &mut Window,
-    cx: &mut Context<Editor>,
-) {
-    let snapshot = editor.snapshot(window, cx);
-    let hub = editor.collaboration_hub().unwrap();
-    let collaborators = hub.collaborators(cx);
-    let range = Anchor::min()..Anchor::max();
-    let remote_selections = snapshot
-        .remote_selections_in_range(&range, hub, cx)
-        .map(|s| {
-            let CollaboratorId::PeerId(peer_id) = s.collaborator_id else {
-                panic!("unexpected collaborator id");
-            };
-            let start = s.selection.start.to_offset(snapshot.buffer_snapshot());
-            let end = s.selection.end.to_offset(snapshot.buffer_snapshot());
-            let user_id = collaborators.get(&peer_id).unwrap().user_id;
-            let participant_index = hub.user_participant_indices(cx).get(&user_id).copied();
-            (participant_index, start.0..end.0)
-        })
-        .collect::<Vec<_>>();
-    assert_eq!(
-        remote_selections, expected_selections,
-        "incorrect remote selections"
-    );
-}
-
-#[gpui::test]
-async fn test_multiple_handles_to_channel_buffer(
-    deterministic: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(deterministic.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-
-    let channel_id = server
-        .make_channel("the-channel", None, (&client_a, cx_a), &mut [])
-        .await;
-
-    let channel_buffer_1 = client_a
-        .channel_store()
-        .update(cx_a, |store, cx| store.open_channel_buffer(channel_id, cx));
-    let channel_buffer_2 = client_a
-        .channel_store()
-        .update(cx_a, |store, cx| store.open_channel_buffer(channel_id, cx));
-    let channel_buffer_3 = client_a
-        .channel_store()
-        .update(cx_a, |store, cx| store.open_channel_buffer(channel_id, cx));
-
-    // All concurrent tasks for opening a channel buffer return the same model handle.
-    let (channel_buffer, channel_buffer_2, channel_buffer_3) =
-        future::try_join3(channel_buffer_1, channel_buffer_2, channel_buffer_3)
-            .await
-            .unwrap();
-    let channel_buffer_entity_id = channel_buffer.entity_id();
-    assert_eq!(channel_buffer, channel_buffer_2);
-    assert_eq!(channel_buffer, channel_buffer_3);
-
-    channel_buffer.update(cx_a, |buffer, cx| {
-        buffer.buffer().update(cx, |buffer, cx| {
-            buffer.edit([(0..0, "hello")], None, cx);
-        })
-    });
-    deterministic.run_until_parked();
-
-    cx_a.update(|_| {
-        drop(channel_buffer);
-        drop(channel_buffer_2);
-        drop(channel_buffer_3);
-    });
-    deterministic.run_until_parked();
-
-    // The channel buffer can be reopened after dropping it.
-    let channel_buffer = client_a
-        .channel_store()
-        .update(cx_a, |store, cx| store.open_channel_buffer(channel_id, cx))
-        .await
-        .unwrap();
-    assert_ne!(channel_buffer.entity_id(), channel_buffer_entity_id);
-    channel_buffer.update(cx_a, |buffer, cx| {
-        buffer.buffer().update(cx, |buffer, _| {
-            assert_eq!(buffer.text(), "hello");
-        })
-    });
-}
-
-#[gpui::test]
-async fn test_channel_buffer_disconnect(
-    deterministic: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(deterministic.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-
-    let channel_id = server
-        .make_channel(
-            "the-channel",
-            None,
-            (&client_a, cx_a),
-            &mut [(&client_b, cx_b)],
-        )
-        .await;
-
-    let channel_buffer_a = client_a
-        .channel_store()
-        .update(cx_a, |store, cx| store.open_channel_buffer(channel_id, cx))
-        .await
-        .unwrap();
-
-    let channel_buffer_b = client_b
-        .channel_store()
-        .update(cx_b, |store, cx| store.open_channel_buffer(channel_id, cx))
-        .await
-        .unwrap();
-
-    server.forbid_connections();
-    server.disconnect_client(client_a.peer_id().unwrap());
-    deterministic.advance_clock(RECEIVE_TIMEOUT + RECONNECT_TIMEOUT);
-
-    channel_buffer_a.update(cx_a, |buffer, cx| {
-        assert_eq!(buffer.channel(cx).unwrap().name, "the-channel");
-        assert!(!buffer.is_connected());
-    });
-
-    deterministic.run_until_parked();
-
-    server.allow_connections();
-    deterministic.advance_clock(RECEIVE_TIMEOUT + RECONNECT_TIMEOUT);
-
-    deterministic.run_until_parked();
-
-    client_a
-        .channel_store()
-        .update(cx_a, |channel_store, _| {
-            channel_store.remove_channel(channel_id)
-        })
-        .await
-        .unwrap();
-    deterministic.run_until_parked();
-
-    // Channel buffer observed the deletion
-    channel_buffer_b.update(cx_b, |buffer, cx| {
-        assert!(buffer.channel(cx).is_none());
-        assert!(!buffer.is_connected());
-    });
-}
-
-#[gpui::test]
-async fn test_rejoin_channel_buffer(
-    deterministic: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(deterministic.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-
-    let channel_id = server
-        .make_channel(
-            "the-channel",
-            None,
-            (&client_a, cx_a),
-            &mut [(&client_b, cx_b)],
-        )
-        .await;
-
-    let channel_buffer_a = client_a
-        .channel_store()
-        .update(cx_a, |store, cx| store.open_channel_buffer(channel_id, cx))
-        .await
-        .unwrap();
-    let channel_buffer_b = client_b
-        .channel_store()
-        .update(cx_b, |store, cx| store.open_channel_buffer(channel_id, cx))
-        .await
-        .unwrap();
-
-    channel_buffer_a.update(cx_a, |buffer, cx| {
-        buffer.buffer().update(cx, |buffer, cx| {
-            buffer.edit([(0..0, "1")], None, cx);
-        })
-    });
-    deterministic.run_until_parked();
-
-    // Client A disconnects.
-    server.forbid_connections();
-    server.disconnect_client(client_a.peer_id().unwrap());
-
-    // Both clients make an edit.
-    channel_buffer_a.update(cx_a, |buffer, cx| {
-        buffer.buffer().update(cx, |buffer, cx| {
-            buffer.edit([(1..1, "2")], None, cx);
-        })
-    });
-    channel_buffer_b.update(cx_b, |buffer, cx| {
-        buffer.buffer().update(cx, |buffer, cx| {
-            buffer.edit([(0..0, "0")], None, cx);
-        })
-    });
-
-    // Both clients see their own edit.
-    deterministic.run_until_parked();
-    channel_buffer_a.read_with(cx_a, |buffer, cx| {
-        assert_eq!(buffer.buffer().read(cx).text(), "12");
-    });
-    channel_buffer_b.read_with(cx_b, |buffer, cx| {
-        assert_eq!(buffer.buffer().read(cx).text(), "01");
-    });
-
-    // Client A reconnects. Both clients see each other's edits, and see
-    // the same collaborators.
-    server.allow_connections();
-    deterministic.advance_clock(RECEIVE_TIMEOUT);
-    channel_buffer_a.read_with(cx_a, |buffer, cx| {
-        assert_eq!(buffer.buffer().read(cx).text(), "012");
-    });
-    channel_buffer_b.read_with(cx_b, |buffer, cx| {
-        assert_eq!(buffer.buffer().read(cx).text(), "012");
-    });
-
-    channel_buffer_a.read_with(cx_a, |buffer_a, _| {
-        channel_buffer_b.read_with(cx_b, |buffer_b, _| {
-            assert_eq!(buffer_a.collaborators(), buffer_b.collaborators());
-        });
-    });
-}
-
-#[gpui::test]
-async fn test_channel_buffers_and_server_restarts(
-    deterministic: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-    cx_c: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(deterministic.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    let client_c = server.create_client(cx_c, "user_c").await;
-
-    let channel_id = server
-        .make_channel(
-            "the-channel",
-            None,
-            (&client_a, cx_a),
-            &mut [(&client_b, cx_b), (&client_c, cx_c)],
-        )
-        .await;
-
-    let channel_buffer_a = client_a
-        .channel_store()
-        .update(cx_a, |store, cx| store.open_channel_buffer(channel_id, cx))
-        .await
-        .unwrap();
-    let channel_buffer_b = client_b
-        .channel_store()
-        .update(cx_b, |store, cx| store.open_channel_buffer(channel_id, cx))
-        .await
-        .unwrap();
-    let _channel_buffer_c = client_c
-        .channel_store()
-        .update(cx_c, |store, cx| store.open_channel_buffer(channel_id, cx))
-        .await
-        .unwrap();
-
-    channel_buffer_a.update(cx_a, |buffer, cx| {
-        buffer.buffer().update(cx, |buffer, cx| {
-            buffer.edit([(0..0, "1")], None, cx);
-        })
-    });
-    deterministic.run_until_parked();
-
-    // Client C can't reconnect.
-    client_c.override_establish_connection(|_, cx| cx.spawn(async |_| future::pending().await));
-
-    // Server stops.
-    server.reset().await;
-    deterministic.advance_clock(RECEIVE_TIMEOUT);
-
-    // While the server is down, both clients make an edit.
-    channel_buffer_a.update(cx_a, |buffer, cx| {
-        buffer.buffer().update(cx, |buffer, cx| {
-            buffer.edit([(1..1, "2")], None, cx);
-        })
-    });
-    channel_buffer_b.update(cx_b, |buffer, cx| {
-        buffer.buffer().update(cx, |buffer, cx| {
-            buffer.edit([(0..0, "0")], None, cx);
-        })
-    });
-
-    // Server restarts.
-    server.start().await.unwrap();
-    deterministic.advance_clock(CLEANUP_TIMEOUT);
-
-    // Clients reconnects. Clients A and B see each other's edits, and see
-    // that client C has disconnected.
-    channel_buffer_a.read_with(cx_a, |buffer, cx| {
-        assert_eq!(buffer.buffer().read(cx).text(), "012");
-    });
-    channel_buffer_b.read_with(cx_b, |buffer, cx| {
-        assert_eq!(buffer.buffer().read(cx).text(), "012");
-    });
-
-    channel_buffer_a.read_with(cx_a, |buffer_a, _| {
-        channel_buffer_b.read_with(cx_b, |buffer_b, _| {
-            assert_collaborators(
-                buffer_a.collaborators(),
-                &[client_a.user_id(), client_b.user_id()],
-            );
-            assert_eq!(buffer_a.collaborators(), buffer_b.collaborators());
-        });
-    });
-}
-
-#[gpui::test]
-async fn test_channel_buffer_changes(
-    deterministic: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let (server, client_a, client_b, channel_id) = TestServer::start2(cx_a, cx_b).await;
-    let (_, cx_a) = client_a.build_test_workspace(cx_a).await;
-    let (workspace_b, cx_b) = client_b.build_test_workspace(cx_b).await;
-    let channel_store_b = client_b.channel_store().clone();
-
-    // Editing the channel notes should set them to dirty
-    open_channel_notes(channel_id, cx_a).await.unwrap();
-    cx_a.simulate_keystrokes("1");
-    channel_store_b.read_with(cx_b, |channel_store, _| {
-        assert!(channel_store.has_channel_buffer_changed(channel_id))
-    });
-
-    // Opening the buffer should clear the changed flag.
-    open_channel_notes(channel_id, cx_b).await.unwrap();
-    channel_store_b.read_with(cx_b, |channel_store, _| {
-        assert!(!channel_store.has_channel_buffer_changed(channel_id))
-    });
-
-    // Editing the channel while the buffer is open should not show that the buffer has changed.
-    cx_a.simulate_keystrokes("2");
-    channel_store_b.read_with(cx_b, |channel_store, _| {
-        assert!(!channel_store.has_channel_buffer_changed(channel_id))
-    });
-
-    // Test that the server is tracking things correctly, and we retain our 'not changed'
-    // state across a disconnect
-    deterministic.advance_clock(ACKNOWLEDGE_DEBOUNCE_INTERVAL);
-    server
-        .simulate_long_connection_interruption(client_b.peer_id().unwrap(), deterministic.clone());
-    channel_store_b.read_with(cx_b, |channel_store, _| {
-        assert!(!channel_store.has_channel_buffer_changed(channel_id))
-    });
-
-    // Closing the buffer should re-enable change tracking
-    cx_b.update(|window, cx| {
-        workspace_b.update(cx, |workspace, cx| {
-            workspace.close_all_items_and_panes(&Default::default(), window, cx)
-        });
-    });
-    deterministic.run_until_parked();
-
-    cx_a.simulate_keystrokes("3");
-    channel_store_b.read_with(cx_b, |channel_store, _| {
-        assert!(channel_store.has_channel_buffer_changed(channel_id))
-    });
-}
-
-#[gpui::test]
-async fn test_channel_buffer_changes_persist(
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-    cx_b2: &mut TestAppContext,
-) {
-    let (mut server, client_a, client_b, channel_id) = TestServer::start2(cx_a, cx_b).await;
-    let (_, cx_a) = client_a.build_test_workspace(cx_a).await;
-    let (_, cx_b) = client_b.build_test_workspace(cx_b).await;
-
-    // a) edits the notes
-    open_channel_notes(channel_id, cx_a).await.unwrap();
-    cx_a.simulate_keystrokes("1");
-    // b) opens them to observe the current version
-    open_channel_notes(channel_id, cx_b).await.unwrap();
-
-    // On boot the client should get the correct state.
-    let client_b2 = server.create_client(cx_b2, "user_b").await;
-    let channel_store_b2 = client_b2.channel_store().clone();
-    channel_store_b2.read_with(cx_b2, |channel_store, _| {
-        assert!(!channel_store.has_channel_buffer_changed(channel_id))
-    });
-}
-
-#[track_caller]
-fn assert_collaborators(collaborators: &HashMap<PeerId, Collaborator>, ids: &[Option<UserId>]) {
-    let mut user_ids = collaborators
-        .values()
-        .map(|collaborator| collaborator.user_id)
-        .collect::<Vec<_>>();
-    user_ids.sort();
-    assert_eq!(
-        user_ids,
-        ids.iter().map(|id| id.unwrap()).collect::<Vec<_>>()
-    );
-}
-
-fn buffer_text(channel_buffer: &Entity<language::Buffer>, cx: &mut TestAppContext) -> String {
-    channel_buffer.read_with(cx, |buffer, _| buffer.text())
-}
diff --git a/crates/collab/src/tests/channel_guest_tests.rs b/crates/collab/src/tests/channel_guest_tests.rs
deleted file mode 100644
index 604dec3194..0000000000
--- a/crates/collab/src/tests/channel_guest_tests.rs
+++ /dev/null
@@ -1,310 +0,0 @@
-use crate::{db::ChannelId, tests::TestServer};
-use call::ActiveCall;
-use chrono::Utc;
-use editor::Editor;
-use gpui::{BackgroundExecutor, TestAppContext};
-use rpc::proto;
-use util::rel_path::rel_path;
-
-#[gpui::test]
-async fn test_channel_guests(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-
-    let channel_id = server
-        .make_public_channel("the-channel", &client_a, cx_a)
-        .await;
-
-    // Client A shares a project in the channel
-    let project_a = client_a.build_test_project(cx_a).await;
-    active_call_a
-        .update(cx_a, |call, cx| call.join_channel(channel_id, cx))
-        .await
-        .unwrap();
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-    cx_a.executor().run_until_parked();
-
-    // Client B joins channel A as a guest
-    cx_b.update(|cx| workspace::join_channel(channel_id, client_b.app_state.clone(), None, cx))
-        .await
-        .unwrap();
-
-    // b should be following a in the shared project.
-    // B is a guest,
-    executor.run_until_parked();
-
-    let active_call_b = cx_b.read(ActiveCall::global);
-    let project_b =
-        active_call_b.read_with(cx_b, |call, _| call.location().unwrap().upgrade().unwrap());
-    let room_b = active_call_b.update(cx_b, |call, _| call.room().unwrap().clone());
-
-    assert_eq!(
-        project_b.read_with(cx_b, |project, _| project.remote_id()),
-        Some(project_id),
-    );
-    assert!(project_b.read_with(cx_b, |project, cx| project.is_read_only(cx)));
-    assert!(
-        project_b
-            .update(cx_b, |project, cx| {
-                let worktree_id = project.worktrees(cx).next().unwrap().read(cx).id();
-                project.create_entry((worktree_id, rel_path("b.txt")), false, cx)
-            })
-            .await
-            .is_err()
-    );
-    assert!(room_b.read_with(cx_b, |room, _| room.is_muted()));
-}
-
-#[gpui::test]
-async fn test_channel_guest_promotion(cx_a: &mut TestAppContext, cx_b: &mut TestAppContext) {
-    let mut server = TestServer::start(cx_a.executor()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-
-    let channel_id = server
-        .make_public_channel("the-channel", &client_a, cx_a)
-        .await;
-
-    let project_a = client_a.build_test_project(cx_a).await;
-    cx_a.update(|cx| workspace::join_channel(channel_id, client_a.app_state.clone(), None, cx))
-        .await
-        .unwrap();
-
-    // Client A shares a project in the channel
-    active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-    cx_a.run_until_parked();
-
-    // Client B joins channel A as a guest
-    cx_b.update(|cx| workspace::join_channel(channel_id, client_b.app_state.clone(), None, cx))
-        .await
-        .unwrap();
-    cx_a.run_until_parked();
-
-    // client B opens 1.txt as a guest
-    let (workspace_b, cx_b) = client_b.active_workspace(cx_b);
-    let room_b = cx_b
-        .read(ActiveCall::global)
-        .update(cx_b, |call, _| call.room().unwrap().clone());
-    cx_b.simulate_keystrokes("cmd-p");
-    cx_a.run_until_parked();
-    cx_b.simulate_keystrokes("1 enter");
-
-    let (project_b, editor_b) = workspace_b.update(cx_b, |workspace, cx| {
-        (
-            workspace.project().clone(),
-            workspace.active_item_as::<Editor>(cx).unwrap(),
-        )
-    });
-    assert!(project_b.read_with(cx_b, |project, cx| project.is_read_only(cx)));
-    assert!(editor_b.update(cx_b, |e, cx| e.read_only(cx)));
-    cx_b.update(|_window, cx_b| {
-        assert!(room_b.read_with(cx_b, |room, _| !room.can_use_microphone()));
-    });
-    assert!(
-        room_b
-            .update(cx_b, |room, cx| room.share_microphone(cx))
-            .await
-            .is_err()
-    );
-
-    // B is promoted
-    active_call_a
-        .update(cx_a, |call, cx| {
-            call.room().unwrap().update(cx, |room, cx| {
-                room.set_participant_role(
-                    client_b.user_id().unwrap(),
-                    proto::ChannelRole::Member,
-                    cx,
-                )
-            })
-        })
-        .await
-        .unwrap();
-    cx_a.run_until_parked();
-
-    // project and buffers are now editable
-    assert!(project_b.read_with(cx_b, |project, cx| !project.is_read_only(cx)));
-    assert!(editor_b.update(cx_b, |editor, cx| !editor.read_only(cx)));
-
-    // B sees themselves as muted, and can unmute.
-    cx_b.update(|_window, cx_b| {
-        assert!(room_b.read_with(cx_b, |room, _| room.can_use_microphone()));
-    });
-    room_b.read_with(cx_b, |room, _| assert!(room.is_muted()));
-    room_b.update(cx_b, |room, cx| room.toggle_mute(cx));
-    cx_a.run_until_parked();
-    room_b.read_with(cx_b, |room, _| assert!(!room.is_muted()));
-
-    // B is demoted
-    active_call_a
-        .update(cx_a, |call, cx| {
-            call.room().unwrap().update(cx, |room, cx| {
-                room.set_participant_role(
-                    client_b.user_id().unwrap(),
-                    proto::ChannelRole::Guest,
-                    cx,
-                )
-            })
-        })
-        .await
-        .unwrap();
-    cx_a.run_until_parked();
-
-    // project and buffers are no longer editable
-    assert!(project_b.read_with(cx_b, |project, cx| project.is_read_only(cx)));
-    assert!(editor_b.update(cx_b, |editor, cx| editor.read_only(cx)));
-    assert!(
-        room_b
-            .update(cx_b, |room, cx| room.share_microphone(cx))
-            .await
-            .is_err()
-    );
-}
-
-#[gpui::test]
-async fn test_channel_requires_zed_cla(cx_a: &mut TestAppContext, cx_b: &mut TestAppContext) {
-    let mut server = TestServer::start(cx_a.executor()).await;
-
-    server
-        .app_state
-        .db
-        .update_or_create_user_by_github_account("user_b", 100, None, None, Utc::now(), None)
-        .await
-        .unwrap();
-
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-    let active_call_b = cx_b.read(ActiveCall::global);
-
-    // Create a parent channel that requires the Zed CLA
-    let parent_channel_id = server
-        .make_channel("the-channel", None, (&client_a, cx_a), &mut [])
-        .await;
-    server
-        .app_state
-        .db
-        .set_channel_requires_zed_cla(ChannelId::from_proto(parent_channel_id.0), true)
-        .await
-        .unwrap();
-
-    // Create a public channel that is a child of the parent channel.
-    let channel_id = client_a
-        .channel_store()
-        .update(cx_a, |store, cx| {
-            store.create_channel("the-sub-channel", Some(parent_channel_id), cx)
-        })
-        .await
-        .unwrap();
-    client_a
-        .channel_store()
-        .update(cx_a, |store, cx| {
-            store.set_channel_visibility(parent_channel_id, proto::ChannelVisibility::Public, cx)
-        })
-        .await
-        .unwrap();
-    client_a
-        .channel_store()
-        .update(cx_a, |store, cx| {
-            store.set_channel_visibility(channel_id, proto::ChannelVisibility::Public, cx)
-        })
-        .await
-        .unwrap();
-
-    // Users A and B join the channel. B is a guest.
-    active_call_a
-        .update(cx_a, |call, cx| call.join_channel(channel_id, cx))
-        .await
-        .unwrap();
-    active_call_b
-        .update(cx_b, |call, cx| call.join_channel(channel_id, cx))
-        .await
-        .unwrap();
-    cx_a.run_until_parked();
-    let room_b = cx_b
-        .read(ActiveCall::global)
-        .update(cx_b, |call, _| call.room().unwrap().clone());
-    cx_b.update(|cx_b| {
-        assert!(room_b.read_with(cx_b, |room, _| !room.can_use_microphone()));
-    });
-
-    // A tries to grant write access to B, but cannot because B has not
-    // yet signed the zed CLA.
-    active_call_a
-        .update(cx_a, |call, cx| {
-            call.room().unwrap().update(cx, |room, cx| {
-                room.set_participant_role(
-                    client_b.user_id().unwrap(),
-                    proto::ChannelRole::Member,
-                    cx,
-                )
-            })
-        })
-        .await
-        .unwrap_err();
-    cx_a.run_until_parked();
-    assert!(room_b.read_with(cx_b, |room, _| !room.can_share_projects()));
-    cx_b.update(|cx_b| {
-        assert!(room_b.read_with(cx_b, |room, _| !room.can_use_microphone()));
-    });
-
-    // A tries to grant write access to B, but cannot because B has not
-    // yet signed the zed CLA.
-    active_call_a
-        .update(cx_a, |call, cx| {
-            call.room().unwrap().update(cx, |room, cx| {
-                room.set_participant_role(
-                    client_b.user_id().unwrap(),
-                    proto::ChannelRole::Talker,
-                    cx,
-                )
-            })
-        })
-        .await
-        .unwrap();
-    cx_a.run_until_parked();
-    assert!(room_b.read_with(cx_b, |room, _| !room.can_share_projects()));
-    cx_b.update(|cx_b| {
-        assert!(room_b.read_with(cx_b, |room, _| room.can_use_microphone()));
-    });
-
-    // User B signs the zed CLA.
-    server
-        .app_state
-        .db
-        .add_contributor("user_b", 100, None, None, Utc::now(), None)
-        .await
-        .unwrap();
-
-    // A can now grant write access to B.
-    active_call_a
-        .update(cx_a, |call, cx| {
-            call.room().unwrap().update(cx, |room, cx| {
-                room.set_participant_role(
-                    client_b.user_id().unwrap(),
-                    proto::ChannelRole::Member,
-                    cx,
-                )
-            })
-        })
-        .await
-        .unwrap();
-    cx_a.run_until_parked();
-    assert!(room_b.read_with(cx_b, |room, _| room.can_share_projects()));
-    cx_b.update(|cx_b| {
-        assert!(room_b.read_with(cx_b, |room, _| room.can_use_microphone()));
-    });
-}
diff --git a/crates/collab/src/tests/channel_tests.rs b/crates/collab/src/tests/channel_tests.rs
deleted file mode 100644
index fdfd9c502c..0000000000
--- a/crates/collab/src/tests/channel_tests.rs
+++ /dev/null
@@ -1,1466 +0,0 @@
-use crate::{
-    db::{self, UserId},
-    rpc::RECONNECT_TIMEOUT,
-    tests::{RoomParticipants, TestServer, room_participants},
-};
-use call::ActiveCall;
-use channel::{ChannelMembership, ChannelStore};
-use client::{ChannelId, User};
-use futures::future::try_join_all;
-use gpui::{BackgroundExecutor, Entity, SharedString, TestAppContext};
-use rpc::{
-    RECEIVE_TIMEOUT,
-    proto::{self, ChannelRole},
-};
-use std::sync::Arc;
-
-#[gpui::test]
-async fn test_core_channels(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-
-    let channel_a_id = client_a
-        .channel_store()
-        .update(cx_a, |channel_store, cx| {
-            channel_store.create_channel("channel-a", None, cx)
-        })
-        .await
-        .unwrap();
-    let channel_b_id = client_a
-        .channel_store()
-        .update(cx_a, |channel_store, cx| {
-            channel_store.create_channel("channel-b", Some(channel_a_id), cx)
-        })
-        .await
-        .unwrap();
-
-    executor.run_until_parked();
-    assert_channels(
-        client_a.channel_store(),
-        cx_a,
-        &[
-            ExpectedChannel {
-                id: channel_a_id,
-                name: "channel-a".into(),
-                depth: 0,
-            },
-            ExpectedChannel {
-                id: channel_b_id,
-                name: "channel-b".into(),
-                depth: 1,
-            },
-        ],
-    );
-
-    cx_b.read(|cx| {
-        client_b.channel_store().read_with(cx, |channels, _| {
-            assert!(channels.ordered_channels().collect::<Vec<_>>().is_empty())
-        })
-    });
-
-    // Invite client B to channel A as client A.
-    client_a
-        .channel_store()
-        .update(cx_a, |store, cx| {
-            assert!(!store.has_pending_channel_invite(channel_a_id, client_b.user_id().unwrap()));
-
-            let invite = store.invite_member(
-                channel_a_id,
-                client_b.user_id().unwrap(),
-                proto::ChannelRole::Member,
-                cx,
-            );
-
-            // Make sure we're synchronously storing the pending invite
-            assert!(store.has_pending_channel_invite(channel_a_id, client_b.user_id().unwrap()));
-            invite
-        })
-        .await
-        .unwrap();
-
-    // Client A sees that B has been invited.
-    executor.run_until_parked();
-    assert_channel_invitations(
-        client_b.channel_store(),
-        cx_b,
-        &[ExpectedChannel {
-            id: channel_a_id,
-            name: "channel-a".into(),
-            depth: 0,
-        }],
-    );
-
-    let members = client_a
-        .channel_store()
-        .update(cx_a, |store, cx| {
-            assert!(!store.has_pending_channel_invite(channel_a_id, client_b.user_id().unwrap()));
-            store.fuzzy_search_members(channel_a_id, "".to_string(), 10, cx)
-        })
-        .await
-        .unwrap();
-    assert_members_eq(
-        &members,
-        &[
-            (
-                client_a.user_id().unwrap(),
-                proto::ChannelRole::Admin,
-                proto::channel_member::Kind::Member,
-            ),
-            (
-                client_b.user_id().unwrap(),
-                proto::ChannelRole::Member,
-                proto::channel_member::Kind::Invitee,
-            ),
-        ],
-    );
-
-    // Client B accepts the invitation.
-    client_b
-        .channel_store()
-        .update(cx_b, |channels, cx| {
-            channels.respond_to_channel_invite(channel_a_id, true, cx)
-        })
-        .await
-        .unwrap();
-    executor.run_until_parked();
-
-    // Client B now sees that they are a member of channel A and its existing subchannels.
-    assert_channel_invitations(client_b.channel_store(), cx_b, &[]);
-    assert_channels(
-        client_b.channel_store(),
-        cx_b,
-        &[
-            ExpectedChannel {
-                id: channel_a_id,
-                name: "channel-a".into(),
-                depth: 0,
-            },
-            ExpectedChannel {
-                id: channel_b_id,
-                name: "channel-b".into(),
-                depth: 1,
-            },
-        ],
-    );
-
-    let channel_c_id = client_a
-        .channel_store()
-        .update(cx_a, |channel_store, cx| {
-            channel_store.create_channel("channel-c", Some(channel_b_id), cx)
-        })
-        .await
-        .unwrap();
-
-    executor.run_until_parked();
-    assert_channels(
-        client_b.channel_store(),
-        cx_b,
-        &[
-            ExpectedChannel {
-                id: channel_a_id,
-                name: "channel-a".into(),
-                depth: 0,
-            },
-            ExpectedChannel {
-                id: channel_b_id,
-                name: "channel-b".into(),
-                depth: 1,
-            },
-            ExpectedChannel {
-                id: channel_c_id,
-                name: "channel-c".into(),
-                depth: 2,
-            },
-        ],
-    );
-
-    // Update client B's membership to channel A to be an admin.
-    client_a
-        .channel_store()
-        .update(cx_a, |store, cx| {
-            store.set_member_role(
-                channel_a_id,
-                client_b.user_id().unwrap(),
-                proto::ChannelRole::Admin,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-    executor.run_until_parked();
-
-    // Observe that client B is now an admin of channel A, and that
-    // their admin privileges extend to subchannels of channel A.
-    assert_channel_invitations(client_b.channel_store(), cx_b, &[]);
-    assert_channels(
-        client_b.channel_store(),
-        cx_b,
-        &[
-            ExpectedChannel {
-                id: channel_a_id,
-                name: "channel-a".into(),
-                depth: 0,
-            },
-            ExpectedChannel {
-                id: channel_b_id,
-                name: "channel-b".into(),
-                depth: 1,
-            },
-            ExpectedChannel {
-                id: channel_c_id,
-                name: "channel-c".into(),
-                depth: 2,
-            },
-        ],
-    );
-
-    // Client A deletes the channel, deletion also deletes subchannels.
-    client_a
-        .channel_store()
-        .update(cx_a, |channel_store, _| {
-            channel_store.remove_channel(channel_b_id)
-        })
-        .await
-        .unwrap();
-
-    executor.run_until_parked();
-    assert_channels(
-        client_a.channel_store(),
-        cx_a,
-        &[ExpectedChannel {
-            id: channel_a_id,
-            name: "channel-a".into(),
-            depth: 0,
-        }],
-    );
-    assert_channels(
-        client_b.channel_store(),
-        cx_b,
-        &[ExpectedChannel {
-            id: channel_a_id,
-            name: "channel-a".into(),
-            depth: 0,
-        }],
-    );
-
-    // Remove client B
-    client_a
-        .channel_store()
-        .update(cx_a, |channel_store, cx| {
-            channel_store.remove_member(channel_a_id, client_b.user_id().unwrap(), cx)
-        })
-        .await
-        .unwrap();
-
-    executor.run_until_parked();
-
-    // Client A still has their channel
-    assert_channels(
-        client_a.channel_store(),
-        cx_a,
-        &[ExpectedChannel {
-            id: channel_a_id,
-            name: "channel-a".into(),
-            depth: 0,
-        }],
-    );
-
-    // Client B no longer has access to the channel
-    assert_channels(client_b.channel_store(), cx_b, &[]);
-
-    server.forbid_connections();
-    server.disconnect_client(client_a.peer_id().unwrap());
-    executor.advance_clock(RECEIVE_TIMEOUT + RECONNECT_TIMEOUT);
-
-    server
-        .app_state
-        .db
-        .rename_channel(
-            db::ChannelId::from_proto(channel_a_id.0),
-            UserId::from_proto(client_a.id()),
-            "channel-a-renamed",
-        )
-        .await
-        .unwrap();
-
-    server.allow_connections();
-    executor.advance_clock(RECEIVE_TIMEOUT + RECONNECT_TIMEOUT);
-    assert_channels(
-        client_a.channel_store(),
-        cx_a,
-        &[ExpectedChannel {
-            id: channel_a_id,
-            name: "channel-a-renamed".into(),
-            depth: 0,
-        }],
-    );
-}
-
-#[track_caller]
-fn assert_participants_eq(participants: &[Arc<User>], expected_partitipants: &[u64]) {
-    assert_eq!(
-        participants.iter().map(|p| p.id).collect::<Vec<_>>(),
-        expected_partitipants
-    );
-}
-
-#[track_caller]
-fn assert_members_eq(
-    members: &[ChannelMembership],
-    expected_members: &[(u64, proto::ChannelRole, proto::channel_member::Kind)],
-) {
-    assert_eq!(
-        members
-            .iter()
-            .map(|member| (member.user.id, member.role, member.kind))
-            .collect::<Vec<_>>(),
-        expected_members
-    );
-}
-
-#[gpui::test]
-async fn test_joining_channel_ancestor_member(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-
-    let parent_id = server
-        .make_channel("parent", None, (&client_a, cx_a), &mut [(&client_b, cx_b)])
-        .await;
-
-    let sub_id = client_a
-        .channel_store()
-        .update(cx_a, |channel_store, cx| {
-            channel_store.create_channel("sub_channel", Some(parent_id), cx)
-        })
-        .await
-        .unwrap();
-
-    let active_call_b = cx_b.read(ActiveCall::global);
-
-    assert!(
-        active_call_b
-            .update(cx_b, |active_call, cx| active_call.join_channel(sub_id, cx))
-            .await
-            .is_ok()
-    );
-}
-
-#[gpui::test]
-async fn test_channel_room(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-    cx_c: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    let client_c = server.create_client(cx_c, "user_c").await;
-
-    let zed_id = server
-        .make_channel(
-            "zed",
-            None,
-            (&client_a, cx_a),
-            &mut [(&client_b, cx_b), (&client_c, cx_c)],
-        )
-        .await;
-
-    let active_call_a = cx_a.read(ActiveCall::global);
-    let active_call_b = cx_b.read(ActiveCall::global);
-
-    active_call_a
-        .update(cx_a, |active_call, cx| active_call.join_channel(zed_id, cx))
-        .await
-        .unwrap();
-
-    // Give everyone a chance to observe user A joining
-    executor.run_until_parked();
-    let room_a =
-        cx_a.read(|cx| active_call_a.read_with(cx, |call, _| call.room().unwrap().clone()));
-    cx_a.read(|cx| room_a.read_with(cx, |room, cx| assert!(room.is_connected(cx))));
-
-    cx_a.read(|cx| {
-        client_a.channel_store().read_with(cx, |channels, _| {
-            assert_participants_eq(
-                channels.channel_participants(zed_id),
-                &[client_a.user_id().unwrap()],
-            );
-        })
-    });
-
-    assert_channels(
-        client_b.channel_store(),
-        cx_b,
-        &[ExpectedChannel {
-            id: zed_id,
-            name: "zed".into(),
-            depth: 0,
-        }],
-    );
-    cx_b.read(|cx| {
-        client_b.channel_store().read_with(cx, |channels, _| {
-            assert_participants_eq(
-                channels.channel_participants(zed_id),
-                &[client_a.user_id().unwrap()],
-            );
-        })
-    });
-
-    cx_c.read(|cx| {
-        client_c.channel_store().read_with(cx, |channels, _| {
-            assert_participants_eq(
-                channels.channel_participants(zed_id),
-                &[client_a.user_id().unwrap()],
-            );
-        })
-    });
-
-    active_call_b
-        .update(cx_b, |active_call, cx| active_call.join_channel(zed_id, cx))
-        .await
-        .unwrap();
-
-    executor.run_until_parked();
-
-    cx_a.read(|cx| {
-        client_a.channel_store().read_with(cx, |channels, _| {
-            assert_participants_eq(
-                channels.channel_participants(zed_id),
-                &[client_a.user_id().unwrap(), client_b.user_id().unwrap()],
-            );
-        })
-    });
-
-    cx_b.read(|cx| {
-        client_b.channel_store().read_with(cx, |channels, _| {
-            assert_participants_eq(
-                channels.channel_participants(zed_id),
-                &[client_a.user_id().unwrap(), client_b.user_id().unwrap()],
-            );
-        })
-    });
-
-    cx_c.read(|cx| {
-        client_c.channel_store().read_with(cx, |channels, _| {
-            assert_participants_eq(
-                channels.channel_participants(zed_id),
-                &[client_a.user_id().unwrap(), client_b.user_id().unwrap()],
-            );
-        })
-    });
-
-    let room_a =
-        cx_a.read(|cx| active_call_a.read_with(cx, |call, _| call.room().unwrap().clone()));
-    cx_a.read(|cx| room_a.read_with(cx, |room, cx| assert!(room.is_connected(cx))));
-    assert_eq!(
-        room_participants(&room_a, cx_a),
-        RoomParticipants {
-            remote: vec!["user_b".to_string()],
-            pending: vec![]
-        }
-    );
-
-    let room_b =
-        cx_b.read(|cx| active_call_b.read_with(cx, |call, _| call.room().unwrap().clone()));
-    cx_b.read(|cx| room_b.read_with(cx, |room, cx| assert!(room.is_connected(cx))));
-    assert_eq!(
-        room_participants(&room_b, cx_b),
-        RoomParticipants {
-            remote: vec!["user_a".to_string()],
-            pending: vec![]
-        }
-    );
-
-    // Make sure that leaving and rejoining works
-
-    active_call_a
-        .update(cx_a, |active_call, cx| active_call.hang_up(cx))
-        .await
-        .unwrap();
-
-    executor.run_until_parked();
-
-    cx_a.read(|cx| {
-        client_a.channel_store().read_with(cx, |channels, _| {
-            assert_participants_eq(
-                channels.channel_participants(zed_id),
-                &[client_b.user_id().unwrap()],
-            );
-        })
-    });
-
-    cx_b.read(|cx| {
-        client_b.channel_store().read_with(cx, |channels, _| {
-            assert_participants_eq(
-                channels.channel_participants(zed_id),
-                &[client_b.user_id().unwrap()],
-            );
-        })
-    });
-
-    cx_c.read(|cx| {
-        client_c.channel_store().read_with(cx, |channels, _| {
-            assert_participants_eq(
-                channels.channel_participants(zed_id),
-                &[client_b.user_id().unwrap()],
-            );
-        })
-    });
-
-    active_call_b
-        .update(cx_b, |active_call, cx| active_call.hang_up(cx))
-        .await
-        .unwrap();
-
-    executor.run_until_parked();
-
-    cx_a.read(|cx| {
-        client_a.channel_store().read_with(cx, |channels, _| {
-            assert_participants_eq(channels.channel_participants(zed_id), &[]);
-        })
-    });
-
-    cx_b.read(|cx| {
-        client_b.channel_store().read_with(cx, |channels, _| {
-            assert_participants_eq(channels.channel_participants(zed_id), &[]);
-        })
-    });
-
-    cx_c.read(|cx| {
-        client_c.channel_store().read_with(cx, |channels, _| {
-            assert_participants_eq(channels.channel_participants(zed_id), &[]);
-        })
-    });
-
-    active_call_a
-        .update(cx_a, |active_call, cx| active_call.join_channel(zed_id, cx))
-        .await
-        .unwrap();
-
-    active_call_b
-        .update(cx_b, |active_call, cx| active_call.join_channel(zed_id, cx))
-        .await
-        .unwrap();
-
-    executor.run_until_parked();
-
-    let room_a =
-        cx_a.read(|cx| active_call_a.read_with(cx, |call, _| call.room().unwrap().clone()));
-    cx_a.read(|cx| room_a.read_with(cx, |room, cx| assert!(room.is_connected(cx))));
-    assert_eq!(
-        room_participants(&room_a, cx_a),
-        RoomParticipants {
-            remote: vec!["user_b".to_string()],
-            pending: vec![]
-        }
-    );
-
-    let room_b =
-        cx_b.read(|cx| active_call_b.read_with(cx, |call, _| call.room().unwrap().clone()));
-    cx_b.read(|cx| room_b.read_with(cx, |room, cx| assert!(room.is_connected(cx))));
-    assert_eq!(
-        room_participants(&room_b, cx_b),
-        RoomParticipants {
-            remote: vec!["user_a".to_string()],
-            pending: vec![]
-        }
-    );
-}
-
-#[gpui::test]
-async fn test_channel_jumping(executor: BackgroundExecutor, cx_a: &mut TestAppContext) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-
-    let zed_id = server
-        .make_channel("zed", None, (&client_a, cx_a), &mut [])
-        .await;
-    let rust_id = server
-        .make_channel("rust", None, (&client_a, cx_a), &mut [])
-        .await;
-
-    let active_call_a = cx_a.read(ActiveCall::global);
-
-    active_call_a
-        .update(cx_a, |active_call, cx| active_call.join_channel(zed_id, cx))
-        .await
-        .unwrap();
-
-    // Give everything a chance to observe user A joining
-    executor.run_until_parked();
-
-    cx_a.read(|cx| {
-        client_a.channel_store().read_with(cx, |channels, _| {
-            assert_participants_eq(
-                channels.channel_participants(zed_id),
-                &[client_a.user_id().unwrap()],
-            );
-            assert_participants_eq(channels.channel_participants(rust_id), &[]);
-        })
-    });
-
-    active_call_a
-        .update(cx_a, |active_call, cx| {
-            active_call.join_channel(rust_id, cx)
-        })
-        .await
-        .unwrap();
-
-    executor.run_until_parked();
-
-    cx_a.read(|cx| {
-        client_a.channel_store().read_with(cx, |channels, _| {
-            assert_participants_eq(channels.channel_participants(zed_id), &[]);
-            assert_participants_eq(
-                channels.channel_participants(rust_id),
-                &[client_a.user_id().unwrap()],
-            );
-        })
-    });
-}
-
-#[gpui::test]
-async fn test_permissions_update_while_invited(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-
-    let rust_id = server
-        .make_channel("rust", None, (&client_a, cx_a), &mut [])
-        .await;
-
-    client_a
-        .channel_store()
-        .update(cx_a, |channel_store, cx| {
-            channel_store.invite_member(
-                rust_id,
-                client_b.user_id().unwrap(),
-                proto::ChannelRole::Member,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-
-    executor.run_until_parked();
-
-    assert_channel_invitations(
-        client_b.channel_store(),
-        cx_b,
-        &[ExpectedChannel {
-            depth: 0,
-            id: rust_id,
-            name: "rust".into(),
-        }],
-    );
-    assert_channels(client_b.channel_store(), cx_b, &[]);
-
-    // Update B's invite before they've accepted it
-    client_a
-        .channel_store()
-        .update(cx_a, |channel_store, cx| {
-            channel_store.set_member_role(
-                rust_id,
-                client_b.user_id().unwrap(),
-                proto::ChannelRole::Admin,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-
-    executor.run_until_parked();
-
-    assert_channel_invitations(
-        client_b.channel_store(),
-        cx_b,
-        &[ExpectedChannel {
-            depth: 0,
-            id: rust_id,
-            name: "rust".into(),
-        }],
-    );
-    assert_channels(client_b.channel_store(), cx_b, &[]);
-}
-
-#[gpui::test]
-async fn test_channel_rename(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-
-    let rust_id = server
-        .make_channel("rust", None, (&client_a, cx_a), &mut [(&client_b, cx_b)])
-        .await;
-
-    // Rename the channel
-    client_a
-        .channel_store()
-        .update(cx_a, |channel_store, cx| {
-            channel_store.rename(rust_id, "#rust-archive", cx)
-        })
-        .await
-        .unwrap();
-
-    executor.run_until_parked();
-
-    // Client A sees the channel with its new name.
-    assert_channels(
-        client_a.channel_store(),
-        cx_a,
-        &[ExpectedChannel {
-            depth: 0,
-            id: rust_id,
-            name: "rust-archive".into(),
-        }],
-    );
-
-    // Client B sees the channel with its new name.
-    assert_channels(
-        client_b.channel_store(),
-        cx_b,
-        &[ExpectedChannel {
-            depth: 0,
-            id: rust_id,
-            name: "rust-archive".into(),
-        }],
-    );
-}
-
-#[gpui::test]
-async fn test_call_from_channel(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-    cx_c: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    let client_c = server.create_client(cx_c, "user_c").await;
-    server
-        .make_contacts(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-
-    let channel_id = server
-        .make_channel(
-            "x",
-            None,
-            (&client_a, cx_a),
-            &mut [(&client_b, cx_b), (&client_c, cx_c)],
-        )
-        .await;
-
-    let active_call_a = cx_a.read(ActiveCall::global);
-    let active_call_b = cx_b.read(ActiveCall::global);
-
-    active_call_a
-        .update(cx_a, |call, cx| call.join_channel(channel_id, cx))
-        .await
-        .unwrap();
-
-    // Client A calls client B while in the channel.
-    active_call_a
-        .update(cx_a, |call, cx| {
-            call.invite(client_b.user_id().unwrap(), None, cx)
-        })
-        .await
-        .unwrap();
-
-    // Client B accepts the call.
-    executor.run_until_parked();
-    active_call_b
-        .update(cx_b, |call, cx| call.accept_incoming(cx))
-        .await
-        .unwrap();
-
-    // Client B sees that they are now in the channel
-    executor.run_until_parked();
-    cx_b.read(|cx| {
-        active_call_b.read_with(cx, |call, cx| {
-            assert_eq!(call.channel_id(cx), Some(channel_id));
-        })
-    });
-    cx_b.read(|cx| {
-        client_b.channel_store().read_with(cx, |channels, _| {
-            assert_participants_eq(
-                channels.channel_participants(channel_id),
-                &[client_a.user_id().unwrap(), client_b.user_id().unwrap()],
-            );
-        })
-    });
-
-    // Clients A and C also see that client B is in the channel.
-    cx_a.read(|cx| {
-        client_a.channel_store().read_with(cx, |channels, _| {
-            assert_participants_eq(
-                channels.channel_participants(channel_id),
-                &[client_a.user_id().unwrap(), client_b.user_id().unwrap()],
-            );
-        })
-    });
-    cx_c.read(|cx| {
-        client_c.channel_store().read_with(cx, |channels, _| {
-            assert_participants_eq(
-                channels.channel_participants(channel_id),
-                &[client_a.user_id().unwrap(), client_b.user_id().unwrap()],
-            );
-        })
-    });
-}
-
-#[gpui::test]
-async fn test_lost_channel_creation(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-
-    server
-        .make_contacts(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-
-    let channel_id = server
-        .make_channel("x", None, (&client_a, cx_a), &mut [])
-        .await;
-
-    // Invite a member
-    client_a
-        .channel_store()
-        .update(cx_a, |channel_store, cx| {
-            channel_store.invite_member(
-                channel_id,
-                client_b.user_id().unwrap(),
-                proto::ChannelRole::Member,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-
-    executor.run_until_parked();
-
-    // Sanity check, B has the invitation
-    assert_channel_invitations(
-        client_b.channel_store(),
-        cx_b,
-        &[ExpectedChannel {
-            depth: 0,
-            id: channel_id,
-            name: "x".into(),
-        }],
-    );
-
-    // A creates a subchannel while the invite is still pending.
-    let subchannel_id = client_a
-        .channel_store()
-        .update(cx_a, |channel_store, cx| {
-            channel_store.create_channel("subchannel", Some(channel_id), cx)
-        })
-        .await
-        .unwrap();
-
-    executor.run_until_parked();
-
-    // Make sure A sees their new channel
-    assert_channels(
-        client_a.channel_store(),
-        cx_a,
-        &[
-            ExpectedChannel {
-                depth: 0,
-                id: channel_id,
-                name: "x".into(),
-            },
-            ExpectedChannel {
-                depth: 1,
-                id: subchannel_id,
-                name: "subchannel".into(),
-            },
-        ],
-    );
-
-    // Client B accepts the invite
-    client_b
-        .channel_store()
-        .update(cx_b, |channel_store, cx| {
-            channel_store.respond_to_channel_invite(channel_id, true, cx)
-        })
-        .await
-        .unwrap();
-
-    executor.run_until_parked();
-
-    // Client B should now see the channel
-    assert_channels(
-        client_b.channel_store(),
-        cx_b,
-        &[
-            ExpectedChannel {
-                depth: 0,
-                id: channel_id,
-                name: "x".into(),
-            },
-            ExpectedChannel {
-                depth: 1,
-                id: subchannel_id,
-                name: "subchannel".into(),
-            },
-        ],
-    );
-}
-
-#[gpui::test]
-async fn test_channel_link_notifications(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-    cx_c: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    let client_c = server.create_client(cx_c, "user_c").await;
-
-    let user_b = client_b.user_id().unwrap();
-    let user_c = client_c.user_id().unwrap();
-
-    let channels = server
-        .make_channel_tree(&[("zed", None)], (&client_a, cx_a))
-        .await;
-    let zed_channel = channels[0];
-
-    try_join_all(client_a.channel_store().update(cx_a, |channel_store, cx| {
-        [
-            channel_store.set_channel_visibility(zed_channel, proto::ChannelVisibility::Public, cx),
-            channel_store.invite_member(zed_channel, user_b, proto::ChannelRole::Member, cx),
-            channel_store.invite_member(zed_channel, user_c, proto::ChannelRole::Guest, cx),
-        ]
-    }))
-    .await
-    .unwrap();
-
-    executor.run_until_parked();
-
-    client_b
-        .channel_store()
-        .update(cx_b, |channel_store, cx| {
-            channel_store.respond_to_channel_invite(zed_channel, true, cx)
-        })
-        .await
-        .unwrap();
-
-    client_c
-        .channel_store()
-        .update(cx_c, |channel_store, cx| {
-            channel_store.respond_to_channel_invite(zed_channel, true, cx)
-        })
-        .await
-        .unwrap();
-
-    executor.run_until_parked();
-
-    // we have an admin (a), member (b) and guest (c) all part of the zed channel.
-
-    // create a new private channel, make it public, and move it under the previous one, and verify it shows for b and not c
-    let active_channel = client_a
-        .channel_store()
-        .update(cx_a, |channel_store, cx| {
-            channel_store.create_channel("active", Some(zed_channel), cx)
-        })
-        .await
-        .unwrap();
-
-    executor.run_until_parked();
-
-    // the new channel shows for b and not c
-    assert_channels_list_shape(
-        client_a.channel_store(),
-        cx_a,
-        &[(zed_channel, 0), (active_channel, 1)],
-    );
-    assert_channels_list_shape(
-        client_b.channel_store(),
-        cx_b,
-        &[(zed_channel, 0), (active_channel, 1)],
-    );
-    assert_channels_list_shape(client_c.channel_store(), cx_c, &[(zed_channel, 0)]);
-
-    let vim_channel = client_a
-        .channel_store()
-        .update(cx_a, |channel_store, cx| {
-            channel_store.create_channel("vim", Some(zed_channel), cx)
-        })
-        .await
-        .unwrap();
-
-    client_a
-        .channel_store()
-        .update(cx_a, |channel_store, cx| {
-            channel_store.set_channel_visibility(vim_channel, proto::ChannelVisibility::Public, cx)
-        })
-        .await
-        .unwrap();
-
-    executor.run_until_parked();
-
-    // the new channel shows for b and c
-    assert_channels_list_shape(
-        client_a.channel_store(),
-        cx_a,
-        &[(zed_channel, 0), (active_channel, 1), (vim_channel, 1)],
-    );
-    assert_channels_list_shape(
-        client_b.channel_store(),
-        cx_b,
-        &[(zed_channel, 0), (active_channel, 1), (vim_channel, 1)],
-    );
-    assert_channels_list_shape(
-        client_c.channel_store(),
-        cx_c,
-        &[(zed_channel, 0), (vim_channel, 1)],
-    );
-
-    let helix_channel = client_a
-        .channel_store()
-        .update(cx_a, |channel_store, cx| {
-            channel_store.create_channel("helix", Some(zed_channel), cx)
-        })
-        .await
-        .unwrap();
-
-    client_a
-        .channel_store()
-        .update(cx_a, |channel_store, cx| {
-            channel_store.move_channel(helix_channel, vim_channel, cx)
-        })
-        .await
-        .unwrap();
-
-    client_a
-        .channel_store()
-        .update(cx_a, |channel_store, cx| {
-            channel_store.set_channel_visibility(
-                helix_channel,
-                proto::ChannelVisibility::Public,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-    cx_a.run_until_parked();
-
-    // the new channel shows for b and c
-    assert_channels_list_shape(
-        client_b.channel_store(),
-        cx_b,
-        &[
-            (zed_channel, 0),
-            (active_channel, 1),
-            (vim_channel, 1),
-            (helix_channel, 2),
-        ],
-    );
-    assert_channels_list_shape(
-        client_c.channel_store(),
-        cx_c,
-        &[(zed_channel, 0), (vim_channel, 1), (helix_channel, 2)],
-    );
-}
-
-#[gpui::test]
-async fn test_channel_membership_notifications(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_c").await;
-
-    let user_b = client_b.user_id().unwrap();
-
-    let channels = server
-        .make_channel_tree(
-            &[("zed", None), ("vim", Some("zed")), ("opensource", None)],
-            (&client_a, cx_a),
-        )
-        .await;
-    let zed_channel = channels[0];
-    let vim_channel = channels[1];
-    let opensource_channel = channels[2];
-
-    try_join_all(client_a.channel_store().update(cx_a, |channel_store, cx| {
-        [
-            channel_store.set_channel_visibility(zed_channel, proto::ChannelVisibility::Public, cx),
-            channel_store.set_channel_visibility(vim_channel, proto::ChannelVisibility::Public, cx),
-            channel_store.invite_member(zed_channel, user_b, proto::ChannelRole::Admin, cx),
-            channel_store.invite_member(opensource_channel, user_b, proto::ChannelRole::Member, cx),
-        ]
-    }))
-    .await
-    .unwrap();
-
-    executor.run_until_parked();
-
-    client_b
-        .channel_store()
-        .update(cx_b, |channel_store, cx| {
-            channel_store.respond_to_channel_invite(zed_channel, true, cx)
-        })
-        .await
-        .unwrap();
-
-    executor.run_until_parked();
-
-    // we have an admin (a), and a guest (b) with access to all of zed, and membership in vim.
-    assert_channels(
-        client_b.channel_store(),
-        cx_b,
-        &[
-            ExpectedChannel {
-                depth: 0,
-                id: zed_channel,
-                name: "zed".into(),
-            },
-            ExpectedChannel {
-                depth: 1,
-                id: vim_channel,
-                name: "vim".into(),
-            },
-        ],
-    );
-
-    client_b.channel_store().update(cx_b, |channel_store, _| {
-        channel_store.is_channel_admin(zed_channel)
-    });
-
-    client_b
-        .channel_store()
-        .update(cx_b, |channel_store, cx| {
-            channel_store.respond_to_channel_invite(opensource_channel, true, cx)
-        })
-        .await
-        .unwrap();
-
-    cx_a.run_until_parked();
-
-    client_a
-        .channel_store()
-        .update(cx_a, |channel_store, cx| {
-            channel_store.set_member_role(opensource_channel, user_b, ChannelRole::Admin, cx)
-        })
-        .await
-        .unwrap();
-
-    cx_a.run_until_parked();
-
-    client_b.channel_store().update(cx_b, |channel_store, _| {
-        channel_store.is_channel_admin(opensource_channel)
-    });
-}
-
-#[gpui::test]
-async fn test_guest_access(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-
-    let channels = server
-        .make_channel_tree(
-            &[("channel-a", None), ("channel-b", Some("channel-a"))],
-            (&client_a, cx_a),
-        )
-        .await;
-    let channel_a = channels[0];
-    let channel_b = channels[1];
-
-    let active_call_b = cx_b.read(ActiveCall::global);
-
-    // Non-members should not be allowed to join
-    assert!(
-        active_call_b
-            .update(cx_b, |call, cx| call.join_channel(channel_a, cx))
-            .await
-            .is_err()
-    );
-
-    // Make channels A and B public
-    client_a
-        .channel_store()
-        .update(cx_a, |channel_store, cx| {
-            channel_store.set_channel_visibility(channel_a, proto::ChannelVisibility::Public, cx)
-        })
-        .await
-        .unwrap();
-    client_a
-        .channel_store()
-        .update(cx_a, |channel_store, cx| {
-            channel_store.set_channel_visibility(channel_b, proto::ChannelVisibility::Public, cx)
-        })
-        .await
-        .unwrap();
-
-    // Client B joins channel A as a guest
-    active_call_b
-        .update(cx_b, |call, cx| call.join_channel(channel_a, cx))
-        .await
-        .unwrap();
-
-    executor.run_until_parked();
-    assert_channels_list_shape(
-        client_a.channel_store(),
-        cx_a,
-        &[(channel_a, 0), (channel_b, 1)],
-    );
-    assert_channels_list_shape(
-        client_b.channel_store(),
-        cx_b,
-        &[(channel_a, 0), (channel_b, 1)],
-    );
-
-    client_a.channel_store().update(cx_a, |channel_store, _| {
-        let participants = channel_store.channel_participants(channel_a);
-        assert_eq!(participants.len(), 1);
-        assert_eq!(participants[0].id, client_b.user_id().unwrap());
-    });
-}
-
-#[gpui::test]
-async fn test_invite_access(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-
-    let channels = server
-        .make_channel_tree(
-            &[("channel-a", None), ("channel-b", Some("channel-a"))],
-            (&client_a, cx_a),
-        )
-        .await;
-    let channel_a_id = channels[0];
-    let channel_b_id = channels[0];
-
-    let active_call_b = cx_b.read(ActiveCall::global);
-
-    // should not be allowed to join
-    assert!(
-        active_call_b
-            .update(cx_b, |call, cx| call.join_channel(channel_b_id, cx))
-            .await
-            .is_err()
-    );
-
-    client_a
-        .channel_store()
-        .update(cx_a, |channel_store, cx| {
-            channel_store.invite_member(
-                channel_a_id,
-                client_b.user_id().unwrap(),
-                ChannelRole::Member,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-
-    active_call_b
-        .update(cx_b, |call, cx| call.join_channel(channel_b_id, cx))
-        .await
-        .unwrap();
-
-    executor.run_until_parked();
-
-    client_b.channel_store().update(cx_b, |channel_store, _| {
-        assert!(channel_store.channel_for_id(channel_b_id).is_some());
-        assert!(channel_store.channel_for_id(channel_a_id).is_some());
-    });
-
-    client_a.channel_store().update(cx_a, |channel_store, _| {
-        let participants = channel_store.channel_participants(channel_b_id);
-        assert_eq!(participants.len(), 1);
-        assert_eq!(participants[0].id, client_b.user_id().unwrap());
-    })
-}
-
-#[gpui::test]
-async fn test_leave_channel(cx_a: &mut TestAppContext, cx_b: &mut TestAppContext) {
-    let (_server, _client_a, client_b, channel_id) = TestServer::start2(cx_a, cx_b).await;
-
-    client_b
-        .channel_store()
-        .update(cx_b, |channel_store, cx| {
-            channel_store.remove_member(channel_id, client_b.user_id().unwrap(), cx)
-        })
-        .await
-        .unwrap();
-
-    cx_a.run_until_parked();
-
-    assert_eq!(
-        client_b
-            .channel_store()
-            .read_with(cx_b, |store, _| store.channels().count()),
-        0
-    );
-}
-
-#[gpui::test]
-async fn test_channel_moving(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    _cx_b: &mut TestAppContext,
-    _cx_c: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-
-    let channels = server
-        .make_channel_tree(
-            &[
-                ("channel-a", None),
-                ("channel-b", Some("channel-a")),
-                ("channel-c", Some("channel-b")),
-                ("channel-d", Some("channel-c")),
-            ],
-            (&client_a, cx_a),
-        )
-        .await;
-    let channel_a_id = channels[0];
-    let channel_b_id = channels[1];
-    let channel_c_id = channels[2];
-    let channel_d_id = channels[3];
-
-    // Current shape:
-    // a - b - c - d
-    assert_channels_list_shape(
-        client_a.channel_store(),
-        cx_a,
-        &[
-            (channel_a_id, 0),
-            (channel_b_id, 1),
-            (channel_c_id, 2),
-            (channel_d_id, 3),
-        ],
-    );
-
-    client_a
-        .channel_store()
-        .update(cx_a, |channel_store, cx| {
-            channel_store.move_channel(channel_d_id, channel_b_id, cx)
-        })
-        .await
-        .unwrap();
-
-    // Current shape:
-    //       /- d
-    // a - b -- c
-    assert_channels_list_shape(
-        client_a.channel_store(),
-        cx_a,
-        &[
-            (channel_a_id, 0),
-            (channel_b_id, 1),
-            (channel_c_id, 2),
-            (channel_d_id, 2),
-        ],
-    );
-}
-
-#[derive(Debug, PartialEq)]
-struct ExpectedChannel {
-    depth: usize,
-    id: ChannelId,
-    name: SharedString,
-}
-
-#[track_caller]
-fn assert_channel_invitations(
-    channel_store: &Entity<ChannelStore>,
-    cx: &TestAppContext,
-    expected_channels: &[ExpectedChannel],
-) {
-    let actual = cx.read(|cx| {
-        channel_store.read_with(cx, |store, _| {
-            store
-                .channel_invitations()
-                .iter()
-                .map(|channel| ExpectedChannel {
-                    depth: 0,
-                    name: channel.name.clone(),
-                    id: channel.id,
-                })
-                .collect::<Vec<_>>()
-        })
-    });
-    assert_eq!(actual, expected_channels);
-}
-
-#[track_caller]
-fn assert_channels(
-    channel_store: &Entity<ChannelStore>,
-    cx: &TestAppContext,
-    expected_channels: &[ExpectedChannel],
-) {
-    let actual = cx.read(|cx| {
-        channel_store.read_with(cx, |store, _| {
-            store
-                .ordered_channels()
-                .map(|(depth, channel)| ExpectedChannel {
-                    depth,
-                    name: channel.name.clone(),
-                    id: channel.id,
-                })
-                .collect::<Vec<_>>()
-        })
-    });
-    pretty_assertions::assert_eq!(actual, expected_channels);
-}
-
-#[track_caller]
-fn assert_channels_list_shape(
-    channel_store: &Entity<ChannelStore>,
-    cx: &TestAppContext,
-    expected_channels: &[(ChannelId, usize)],
-) {
-    let actual = cx.read(|cx| {
-        channel_store.read_with(cx, |store, _| {
-            store
-                .ordered_channels()
-                .map(|(depth, channel)| (channel.id, depth))
-                .collect::<Vec<_>>()
-        })
-    });
-    pretty_assertions::assert_eq!(actual, expected_channels);
-}
diff --git a/crates/collab/src/tests/debug_panel_tests.rs b/crates/collab/src/tests/debug_panel_tests.rs
deleted file mode 100644
index d1659e5114..0000000000
--- a/crates/collab/src/tests/debug_panel_tests.rs
+++ /dev/null
@@ -1,2449 +0,0 @@
-use call::ActiveCall;
-use dap::DebugRequestType;
-use dap::requests::{Initialize, Launch, StackTrace};
-use dap::{SourceBreakpoint, requests::SetBreakpoints};
-use debugger_ui::debugger_panel::DebugPanel;
-use debugger_ui::session::DebugSession;
-use editor::Editor;
-use gpui::{Entity, TestAppContext, VisualTestContext};
-use project::{Project, ProjectPath, WorktreeId};
-use serde_json::json;
-use std::sync::Arc;
-use std::{
-    path::Path,
-    sync::atomic::{AtomicBool, Ordering},
-};
-use workspace::{Workspace, dock::Panel};
-
-use super::{TestClient, TestServer};
-
-pub fn init_test(cx: &mut gpui::TestAppContext) {
-    zlog::init_test();
-
-    cx.update(|cx| {
-        theme::init(theme::LoadThemes::JustBase, cx);
-        command_palette_hooks::init(cx);
-        debugger_ui::init(cx);
-        editor::init(cx);
-    });
-}
-
-async fn add_debugger_panel(workspace: &Entity<Workspace>, cx: &mut VisualTestContext) {
-    let debugger_panel = workspace
-        .update_in(cx, |_workspace, window, cx| {
-            cx.spawn_in(window, DebugPanel::load)
-        })
-        .await
-        .unwrap();
-
-    workspace.update_in(cx, |workspace, window, cx| {
-        workspace.add_panel(debugger_panel, window, cx);
-    });
-}
-
-pub fn _active_session(
-    workspace: Entity<Workspace>,
-    cx: &mut VisualTestContext,
-) -> Entity<DebugSession> {
-    workspace.update_in(cx, |workspace, _window, cx| {
-        let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap();
-        debug_panel
-            .update(cx, |this, cx| this.active_session(cx))
-            .unwrap()
-    })
-}
-
-struct ZedInstance<'a> {
-    client: TestClient,
-    project: Option<Entity<Project>>,
-    active_call: Entity<ActiveCall>,
-    cx: &'a mut TestAppContext,
-}
-
-impl<'a> ZedInstance<'a> {
-    fn new(client: TestClient, cx: &'a mut TestAppContext) -> Self {
-        ZedInstance {
-            project: None,
-            client,
-            active_call: cx.read(ActiveCall::global),
-            cx,
-        }
-    }
-
-    async fn host_project(
-        &mut self,
-        project_files: Option<serde_json::Value>,
-    ) -> (u64, WorktreeId) {
-        let (project, worktree_id) = self.client.build_local_project("/project", self.cx).await;
-        self.active_call
-            .update(self.cx, |call, cx| call.set_location(Some(&project), cx))
-            .await
-            .unwrap();
-
-        if let Some(tree) = project_files {
-            self.client.fs().insert_tree("/project", tree).await;
-        }
-
-        self.project = Some(project.clone());
-
-        let project_id = self
-            .active_call
-            .update(self.cx, |call, cx| call.share_project(project, cx))
-            .await
-            .unwrap();
-
-        (project_id, worktree_id)
-    }
-
-    async fn join_project(&mut self, project_id: u64) {
-        let remote_project = self.client.join_remote_project(project_id, self.cx).await;
-        self.project = Some(remote_project);
-
-        self.active_call
-            .update(self.cx, |call, cx| {
-                call.set_location(self.project.as_ref(), cx)
-            })
-            .await
-            .unwrap();
-    }
-
-    async fn expand(
-        &'a mut self,
-    ) -> (
-        &'a TestClient,
-        Entity<Workspace>,
-        Entity<Project>,
-        &'a mut VisualTestContext,
-    ) {
-        let (workspace, cx) = self.client.build_workspace(
-            self.project
-                .as_ref()
-                .expect("Project should be hosted or built before expanding"),
-            self.cx,
-        );
-        add_debugger_panel(&workspace, cx).await;
-        (&self.client, workspace, self.project.clone().unwrap(), cx)
-    }
-}
-
-async fn _setup_three_member_test<'a, 'b, 'c>(
-    server: &mut TestServer,
-    host_cx: &'a mut TestAppContext,
-    first_remote_cx: &'b mut TestAppContext,
-    second_remote_cx: &'c mut TestAppContext,
-) -> (ZedInstance<'a>, ZedInstance<'b>, ZedInstance<'c>) {
-    let host_client = server.create_client(host_cx, "user_host").await;
-    let first_remote_client = server.create_client(first_remote_cx, "user_remote_1").await;
-    let second_remote_client = server
-        .create_client(second_remote_cx, "user_remote_2")
-        .await;
-
-    init_test(host_cx);
-    init_test(first_remote_cx);
-    init_test(second_remote_cx);
-
-    server
-        .create_room(&mut [
-            (&host_client, host_cx),
-            (&first_remote_client, first_remote_cx),
-            (&second_remote_client, second_remote_cx),
-        ])
-        .await;
-
-    let host_zed = ZedInstance::new(host_client, host_cx);
-    let first_remote_zed = ZedInstance::new(first_remote_client, first_remote_cx);
-    let second_remote_zed = ZedInstance::new(second_remote_client, second_remote_cx);
-
-    (host_zed, first_remote_zed, second_remote_zed)
-}
-
-async fn setup_two_member_test<'a, 'b>(
-    server: &mut TestServer,
-    host_cx: &'a mut TestAppContext,
-    remote_cx: &'b mut TestAppContext,
-) -> (ZedInstance<'a>, ZedInstance<'b>) {
-    let host_client = server.create_client(host_cx, "user_host").await;
-    let remote_client = server.create_client(remote_cx, "user_remote").await;
-
-    init_test(host_cx);
-    init_test(remote_cx);
-
-    server
-        .create_room(&mut [(&host_client, host_cx), (&remote_client, remote_cx)])
-        .await;
-
-    let host_zed = ZedInstance::new(host_client, host_cx);
-    let remote_zed = ZedInstance::new(remote_client, remote_cx);
-
-    (host_zed, remote_zed)
-}
-
-#[gpui::test]
-async fn test_debug_panel_item_opens_on_remote(
-    host_cx: &mut TestAppContext,
-    remote_cx: &mut TestAppContext,
-) {
-    let executor = host_cx.executor();
-    let mut server = TestServer::start(executor).await;
-
-    let (mut host_zed, mut remote_zed) =
-        setup_two_member_test(&mut server, host_cx, remote_cx).await;
-
-    let (host_project_id, _) = host_zed.host_project(None).await;
-    remote_zed.join_project(host_project_id).await;
-
-    let (_client_host, _host_workspace, host_project, host_cx) = host_zed.expand().await;
-    let (_client_remote, remote_workspace, _remote_project, remote_cx) = remote_zed.expand().await;
-
-    remote_cx.run_until_parked();
-
-    let task = host_project.update(host_cx, |project, cx| {
-        project.start_debug_session(dap::test_config(DebugRequestType::Launch, None, None), cx)
-    });
-
-    let session = task.await.unwrap();
-    let client = session.read_with(host_cx, |project, _| project.adapter_client().unwrap());
-
-    client
-        .on_request::<Initialize, _>(move |_, _| {
-            Ok(dap::Capabilities {
-                supports_step_back: Some(false),
-                ..Default::default()
-            })
-        })
-        .await;
-
-    client.on_request::<Launch, _>(move |_, _| Ok(())).await;
-
-    client
-        .on_request::<StackTrace, _>(move |_, _| {
-            Ok(dap::StackTraceResponse {
-                stack_frames: Vec::default(),
-                total_frames: None,
-            })
-        })
-        .await;
-
-    client
-        .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-            reason: dap::StoppedEventReason::Pause,
-            description: None,
-            thread_id: Some(1),
-            preserve_focus_hint: None,
-            text: None,
-            all_threads_stopped: None,
-            hit_breakpoint_ids: None,
-        }))
-        .await;
-
-    host_cx.run_until_parked();
-    remote_cx.run_until_parked();
-
-    remote_workspace.update(remote_cx, |workspace, cx| {
-        let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap();
-        let _active_session = debug_panel
-            .update(cx, |this, cx| this.active_session(cx))
-            .unwrap();
-
-        assert_eq!(
-            1,
-            debug_panel.update(cx, |this, cx| this.pane().unwrap().read(cx).items_len())
-        );
-        // assert_eq!(client.id(), active_session.read(cx).());
-        // assert_eq!(1, active_session.read(cx).thread_id().0);
-        // todo(debugger) check selected thread id
-    });
-
-    let shutdown_client = host_project.update(host_cx, |project, cx| {
-        project.dap_store().update(cx, |dap_store, cx| {
-            dap_store.shutdown_session(session.read(cx).session_id(), cx)
-        })
-    });
-
-    shutdown_client.await.unwrap();
-}
-
-#[gpui::test]
-async fn test_active_debug_panel_item_set_on_join_project(
-    host_cx: &mut TestAppContext,
-    remote_cx: &mut TestAppContext,
-) {
-    let executor = host_cx.executor();
-    let mut server = TestServer::start(executor).await;
-
-    let (mut host_zed, mut remote_zed) =
-        setup_two_member_test(&mut server, host_cx, remote_cx).await;
-
-    let (host_project_id, _) = host_zed.host_project(None).await;
-
-    let (_client_host, _host_workspace, host_project, host_cx) = host_zed.expand().await;
-
-    host_cx.run_until_parked();
-
-    let task = host_project.update(host_cx, |project, cx| {
-        project.start_debug_session(dap::test_config(DebugRequestType::Launch, None, None), cx)
-    });
-
-    let session = task.await.unwrap();
-    let client = session.read_with(host_cx, |project, _| project.adapter_client().unwrap());
-
-    client
-        .on_request::<Initialize, _>(move |_, _| {
-            Ok(dap::Capabilities {
-                supports_step_back: Some(false),
-                ..Default::default()
-            })
-        })
-        .await;
-
-    client.on_request::<Launch, _>(move |_, _| Ok(())).await;
-
-    client
-        .on_request::<StackTrace, _>(move |_, _| {
-            Ok(dap::StackTraceResponse {
-                stack_frames: Vec::default(),
-                total_frames: None,
-            })
-        })
-        .await;
-
-    client
-        .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-            reason: dap::StoppedEventReason::Pause,
-            description: None,
-            thread_id: Some(1),
-            preserve_focus_hint: None,
-            text: None,
-            all_threads_stopped: None,
-            hit_breakpoint_ids: None,
-        }))
-        .await;
-
-    // Give host_client time to send a debug panel item to collab server
-    host_cx.run_until_parked();
-
-    remote_zed.join_project(host_project_id).await;
-    let (_client_remote, remote_workspace, _remote_project, remote_cx) = remote_zed.expand().await;
-
-    host_cx.run_until_parked();
-    remote_cx.run_until_parked();
-
-    remote_workspace.update(remote_cx, |workspace, cx| {
-        let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap();
-        let _active_session = debug_panel
-            .update(cx, |this, cx| this.active_session(cx))
-            .unwrap();
-
-        assert_eq!(
-            1,
-            debug_panel.update(cx, |this, cx| this.pane().unwrap().read(cx).items_len())
-        );
-        // assert_eq!(cl, active_session.read(cx).client_id());
-        // assert_eq!(1, active_session.read(cx).thread_id().0);
-        // todo(debugger)
-    });
-
-    let shutdown_client = host_project.update(host_cx, |project, cx| {
-        project.dap_store().update(cx, |dap_store, cx| {
-            dap_store.shutdown_session(session.read(cx).session_id(), cx)
-        })
-    });
-
-    shutdown_client.await.unwrap();
-
-    remote_cx.run_until_parked();
-
-    // assert we don't have a debug panel item anymore because the client shutdown
-    remote_workspace.update(remote_cx, |workspace, cx| {
-        let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap();
-
-        debug_panel.update(cx, |this, cx| {
-            assert!(this.active_session(cx).is_none());
-            assert_eq!(0, this.pane().unwrap().read(cx).items_len());
-        });
-    });
-}
-
-#[gpui::test]
-async fn test_debug_panel_remote_button_presses(
-    _host_cx: &mut TestAppContext,
-    _remote_cx: &mut TestAppContext,
-) {
-    unimplemented!("Collab is still being refactored");
-    // let executor = host_cx.executor();
-    // let mut server = TestServer::start(executor).await;
-
-    // let (mut host_zed, mut remote_zed) =
-    //     setup_two_member_test(&mut server, host_cx, remote_cx).await;
-
-    // let (host_project_id, _) = host_zed.host_project(None).await;
-    // remote_zed.join_project(host_project_id).await;
-
-    // let (_client_host, host_workspace, host_project, host_cx) = host_zed.expand().await;
-    // let (_client_remote, remote_workspace, _remote_project, remote_cx) = remote_zed.expand().await;
-
-    // let task = host_project.update(host_cx, |project, cx| {
-    //     project.start_debug_session(dap::test_config(None), cx)
-    // });
-
-    // let session = task.await.unwrap();
-    // let client = session.read_with(host_cx, |project, _| project.adapter_client().unwrap());
-
-    // client
-    //     .on_request::<Initialize, _>(move |_, _| {
-    //         Ok(dap::Capabilities {
-    //             supports_step_back: Some(true),
-    //             ..Default::default()
-    //         })
-    //     })
-    //     .await;
-
-    // client.on_request::<Launch, _>(move |_, _| Ok(())).await;
-
-    // client
-    //     .on_request::<StackTrace, _>(move |_, _| {
-    //         Ok(dap::StackTraceResponse {
-    //             stack_frames: Vec::default(),
-    //             total_frames: None,
-    //         })
-    //     })
-    //     .await;
-
-    // client
-    //     .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-    //         reason: dap::StoppedEventReason::Pause,
-    //         description: None,
-    //         thread_id: Some(1),
-    //         preserve_focus_hint: None,
-    //         text: None,
-    //         all_threads_stopped: None,
-    //         hit_breakpoint_ids: None,
-    //     }))
-    //     .await;
-
-    // client
-    //     .on_request::<dap::requests::Continue, _>(move |_, _| {
-    //         Ok(dap::ContinueResponse {
-    //             all_threads_continued: Some(true),
-    //         })
-    //     })
-    //     .await;
-
-    // host_cx.run_until_parked();
-    // remote_cx.run_until_parked();
-
-    // let remote_debug_item = remote_workspace.update(remote_cx, |workspace, cx| {
-    //     let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap();
-    //     let active_session = debug_panel
-    //         .update(cx, |this, cx| this.active_session(cx))
-    //         .unwrap();
-
-    //     assert_eq!(
-    //         1,
-    //         debug_panel.update(cx, |this, cx| this.pane().unwrap().read(cx).items_len())
-    //     );
-    //     // assert_eq!(client.id(), active_session.read(cx).client_id());
-    //     // assert_eq!(1, active_session.read(cx).thread_id().0);
-    //     // todo(debugger)
-    //     active_session
-    // });
-
-    // let local_debug_item = host_workspace.update(host_cx, |workspace, cx| {
-    //     let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap();
-    //     let active_session = debug_panel
-    //         .update(cx, |this, cx| this.active_session(cx))
-    //         .unwrap();
-
-    //     assert_eq!(
-    //         1,
-    //         debug_panel.update(cx, |this, cx| this.pane().unwrap().read(cx).items_len())
-    //     );
-    //     // assert_eq!(client.id(), active_session.read(cx).client_id());
-    //     // assert_eq!(1, active_session.read(cx).thread_id().0);
-    //     // todo(debugger)
-    //     active_session
-    // });
-
-    // remote_debug_item.update(remote_cx, |this, cx| {
-    //     this.continue_thread(cx);
-    // });
-
-    // host_cx.run_until_parked();
-    // remote_cx.run_until_parked();
-
-    // local_debug_item.update(host_cx, |debug_panel_item, cx| {
-    //     assert_eq!(
-    //         debugger_ui::debugger_panel::ThreadStatus::Running,
-    //         debug_panel_item.thread_state().read(cx).status,
-    //     );
-    // });
-
-    // remote_debug_item.update(remote_cx, |debug_panel_item, cx| {
-    //     assert_eq!(
-    //         debugger_ui::debugger_panel::ThreadStatus::Running,
-    //         debug_panel_item.thread_state().read(cx).status,
-    //     );
-    // });
-
-    // client
-    //     .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-    //         reason: dap::StoppedEventReason::Pause,
-    //         description: None,
-    //         thread_id: Some(1),
-    //         preserve_focus_hint: None,
-    //         text: None,
-    //         all_threads_stopped: None,
-    //         hit_breakpoint_ids: None,
-    //     }))
-    //     .await;
-
-    // client
-    //     .on_request::<StackTrace, _>(move |_, _| {
-    //         Ok(dap::StackTraceResponse {
-    //             stack_frames: Vec::default(),
-    //             total_frames: None,
-    //         })
-    //     })
-    //     .await;
-
-    // host_cx.run_until_parked();
-    // remote_cx.run_until_parked();
-
-    // local_debug_item.update(host_cx, |debug_panel_item, cx| {
-    //     assert_eq!(
-    //         debugger_ui::debugger_panel::ThreadStatus::Stopped,
-    //         debug_panel_item.thread_state().read(cx).status,
-    //     );
-    // });
-
-    // remote_debug_item.update(remote_cx, |debug_panel_item, cx| {
-    //     assert_eq!(
-    //         debugger_ui::debugger_panel::ThreadStatus::Stopped,
-    //         debug_panel_item.thread_state().read(cx).status,
-    //     );
-    // });
-
-    // client
-    //     .on_request::<dap::requests::Continue, _>(move |_, _| {
-    //         Ok(dap::ContinueResponse {
-    //             all_threads_continued: Some(true),
-    //         })
-    //     })
-    //     .await;
-
-    // local_debug_item.update(host_cx, |this, cx| {
-    //     this.continue_thread(cx);
-    // });
-
-    // host_cx.run_until_parked();
-    // remote_cx.run_until_parked();
-
-    // local_debug_item.update(host_cx, |debug_panel_item, cx| {
-    //     assert_eq!(
-    //         debugger_ui::debugger_panel::ThreadStatus::Running,
-    //         debug_panel_item.thread_state().read(cx).status,
-    //     );
-    // });
-
-    // remote_debug_item.update(remote_cx, |debug_panel_item, cx| {
-    //     assert_eq!(
-    //         debugger_ui::debugger_panel::ThreadStatus::Running,
-    //         debug_panel_item.thread_state().read(cx).status,
-    //     );
-    // });
-
-    // client
-    //     .on_request::<dap::requests::Pause, _>(move |_, _| Ok(()))
-    //     .await;
-
-    // client
-    //     .on_request::<StackTrace, _>(move |_, _| {
-    //         Ok(dap::StackTraceResponse {
-    //             stack_frames: Vec::default(),
-    //             total_frames: None,
-    //         })
-    //     })
-    //     .await;
-
-    // client
-    //     .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-    //         reason: dap::StoppedEventReason::Pause,
-    //         description: None,
-    //         thread_id: Some(1),
-    //         preserve_focus_hint: None,
-    //         text: None,
-    //         all_threads_stopped: None,
-    //         hit_breakpoint_ids: None,
-    //     }))
-    //     .await;
-
-    // remote_debug_item.update(remote_cx, |this, cx| {
-    //     this.pause_thread(cx);
-    // });
-
-    // remote_cx.run_until_parked();
-    // host_cx.run_until_parked();
-
-    // client
-    //     .on_request::<dap::requests::StepOut, _>(move |_, _| Ok(()))
-    //     .await;
-
-    // remote_debug_item.update(remote_cx, |this, cx| {
-    //     this.step_out(cx);
-    // });
-
-    // client
-    //     .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-    //         reason: dap::StoppedEventReason::Pause,
-    //         description: None,
-    //         thread_id: Some(1),
-    //         preserve_focus_hint: None,
-    //         text: None,
-    //         all_threads_stopped: None,
-    //         hit_breakpoint_ids: None,
-    //     }))
-    //     .await;
-
-    // remote_cx.run_until_parked();
-    // host_cx.run_until_parked();
-
-    // client
-    //     .on_request::<dap::requests::Next, _>(move |_, _| Ok(()))
-    //     .await;
-
-    // remote_debug_item.update(remote_cx, |this, cx| {
-    //     this.step_over(cx);
-    // });
-
-    // client
-    //     .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-    //         reason: dap::StoppedEventReason::Pause,
-    //         description: None,
-    //         thread_id: Some(1),
-    //         preserve_focus_hint: None,
-    //         text: None,
-    //         all_threads_stopped: None,
-    //         hit_breakpoint_ids: None,
-    //     }))
-    //     .await;
-
-    // remote_cx.run_until_parked();
-    // host_cx.run_until_parked();
-
-    // client
-    //     .on_request::<dap::requests::StepIn, _>(move |_, _| Ok(()))
-    //     .await;
-
-    // remote_debug_item.update(remote_cx, |this, cx| {
-    //     this.step_in(cx);
-    // });
-
-    // client
-    //     .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-    //         reason: dap::StoppedEventReason::Pause,
-    //         description: None,
-    //         thread_id: Some(1),
-    //         preserve_focus_hint: None,
-    //         text: None,
-    //         all_threads_stopped: None,
-    //         hit_breakpoint_ids: None,
-    //     }))
-    //     .await;
-
-    // remote_cx.run_until_parked();
-    // host_cx.run_until_parked();
-
-    // client
-    //     .on_request::<dap::requests::StepBack, _>(move |_, _| Ok(()))
-    //     .await;
-
-    // remote_debug_item.update(remote_cx, |this, cx| {
-    //     this.step_back(cx);
-    // });
-
-    // client
-    //     .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-    //         reason: dap::StoppedEventReason::Pause,
-    //         description: None,
-    //         thread_id: Some(1),
-    //         preserve_focus_hint: None,
-    //         text: None,
-    //         all_threads_stopped: None,
-    //         hit_breakpoint_ids: None,
-    //     }))
-    //     .await;
-
-    // remote_cx.run_until_parked();
-    // host_cx.run_until_parked();
-
-    // remote_debug_item.update(remote_cx, |this, cx| {
-    //     this.stop_thread(cx);
-    // });
-
-    // host_cx.run_until_parked();
-    // remote_cx.run_until_parked();
-
-    // // assert we don't have a debug panel item anymore because the client shutdown
-    // remote_workspace.update(remote_cx, |workspace, cx| {
-    //     let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap();
-
-    //     debug_panel.update(cx, |this, cx| {
-    //         assert!(this.active_session(cx).is_none());
-    //         assert_eq!(0, this.pane().unwrap().read(cx).items_len());
-    //     });
-    // });
-}
-
-#[gpui::test]
-async fn test_restart_stack_frame(_host_cx: &mut TestAppContext, _remote_cx: &mut TestAppContext) {
-    unimplemented!("Collab is still being refactored");
-    // let executor = host_cx.executor();
-    // let mut server = TestServer::start(executor).await;
-
-    // let (mut host_zed, mut remote_zed) =
-    //     setup_two_member_test(&mut server, host_cx, remote_cx).await;
-
-    // let (host_project_id, _) = host_zed.host_project(None).await;
-    // remote_zed.join_project(host_project_id).await;
-
-    // let (_client_host, _host_workspace, host_project, host_cx) = host_zed.expand().await;
-    // let (_client_remote, remote_workspace, _remote_project, remote_cx) = remote_zed.expand().await;
-
-    // let called_restart_frame = Arc::new(AtomicBool::new(false));
-
-    // let task = host_project.update(host_cx, |project, cx| {
-    //     project.start_debug_session(dap::test_config(None), cx)
-    // });
-
-    // let session = task.await.unwrap();
-    // let client = session.read(cx).adapter_client().unwrap();
-
-    // client
-    //     .on_request::<Initialize, _>(move |_, _| {
-    //         Ok(dap::Capabilities {
-    //             supports_restart_frame: Some(true),
-    //             ..Default::default()
-    //         })
-    //     })
-    //     .await;
-
-    // client.on_request::<Launch, _>(move |_, _| Ok(())).await;
-
-    // let stack_frames = vec![StackFrame {
-    //     id: 1,
-    //     name: "Stack Frame 1".into(),
-    //     source: Some(dap::Source {
-    //         name: Some("test.js".into()),
-    //         path: Some("/project/src/test.js".into()),
-    //         source_reference: None,
-    //         presentation_hint: None,
-    //         origin: None,
-    //         sources: None,
-    //         adapter_data: None,
-    //         checksums: None,
-    //     }),
-    //     line: 3,
-    //     column: 1,
-    //     end_line: None,
-    //     end_column: None,
-    //     can_restart: None,
-    //     instruction_pointer_reference: None,
-    //     module_id: None,
-    //     presentation_hint: None,
-    // }];
-
-    // client
-    //     .on_request::<StackTrace, _>({
-    //         let stack_frames = Arc::new(stack_frames.clone());
-    //         move |_, args| {
-    //             assert_eq!(1, args.thread_id);
-
-    //             Ok(dap::StackTraceResponse {
-    //                 stack_frames: (*stack_frames).clone(),
-    //                 total_frames: None,
-    //             })
-    //         }
-    //     })
-    //     .await;
-
-    // client
-    //     .on_request::<RestartFrame, _>({
-    //         let called_restart_frame = called_restart_frame.clone();
-    //         move |_, args| {
-    //             assert_eq!(1, args.frame_id);
-
-    //             called_restart_frame.store(true, Ordering::SeqCst);
-
-    //             Ok(())
-    //         }
-    //     })
-    //     .await;
-
-    // client
-    //     .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-    //         reason: dap::StoppedEventReason::Pause,
-    //         description: None,
-    //         thread_id: Some(1),
-    //         preserve_focus_hint: None,
-    //         text: None,
-    //         all_threads_stopped: None,
-    //         hit_breakpoint_ids: None,
-    //     }))
-    //     .await;
-
-    // host_cx.run_until_parked();
-    // remote_cx.run_until_parked();
-
-    // // try to restart stack frame 1 from the guest side
-    // remote_workspace.update(remote_cx, |workspace, cx| {
-    //     let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap();
-    //     let active_session = debug_panel
-    //         .update(cx, |this, cx| this.active_session(cx))
-    //         .unwrap();
-
-    //     active_session.update(cx, |debug_panel_item, cx| {
-    //         debug_panel_item
-    //             .stack_frame_list()
-    //             .update(cx, |stack_frame_list, cx| {
-    //                 stack_frame_list.restart_stack_frame(1, cx);
-    //             });
-    //     });
-    // });
-
-    // host_cx.run_until_parked();
-    // remote_cx.run_until_parked();
-
-    // assert!(
-    //     called_restart_frame.load(std::sync::atomic::Ordering::SeqCst),
-    //     "Restart stack frame was not called"
-    // );
-
-    // let shutdown_client = host_project.update(host_cx, |project, cx| {
-    //     project.dap_store().update(cx, |dap_store, cx| {
-    //         dap_store.shutdown_session(&session.read(cx).session_id(), cx)
-    //     })
-    // });
-
-    // shutdown_client.await.unwrap();
-}
-
-#[gpui::test]
-async fn test_updated_breakpoints_send_to_dap(
-    host_cx: &mut TestAppContext,
-    remote_cx: &mut TestAppContext,
-) {
-    let executor = host_cx.executor();
-    let mut server = TestServer::start(executor).await;
-
-    let (mut host_zed, mut remote_zed) =
-        setup_two_member_test(&mut server, host_cx, remote_cx).await;
-
-    let (host_project_id, worktree_id) = host_zed
-        .host_project(Some(json!({"test.txt": "one\ntwo\nthree\nfour\nfive"})))
-        .await;
-
-    remote_zed.join_project(host_project_id).await;
-
-    let (_client_host, host_workspace, host_project, host_cx) = host_zed.expand().await;
-    let (_client_remote, remote_workspace, _remote_project, remote_cx) = remote_zed.expand().await;
-
-    let project_path = ProjectPath {
-        worktree_id,
-        path: Arc::from(Path::new(&"test.txt")),
-    };
-
-    let task = host_project.update(host_cx, |project, cx| {
-        project.start_debug_session(dap::test_config(DebugRequestType::Launch, None, None), cx)
-    });
-
-    let session = task.await.unwrap();
-    let client = session.read_with(host_cx, |project, _| project.adapter_client().unwrap());
-
-    client
-        .on_request::<Initialize, _>(move |_, _| {
-            Ok(dap::Capabilities {
-                supports_restart_frame: Some(true),
-                ..Default::default()
-            })
-        })
-        .await;
-
-    client.on_request::<Launch, _>(move |_, _| Ok(())).await;
-    client
-        .on_request::<StackTrace, _>(move |_, _| {
-            Ok(dap::StackTraceResponse {
-                stack_frames: Vec::default(),
-                total_frames: None,
-            })
-        })
-        .await;
-
-    let called_set_breakpoints = Arc::new(AtomicBool::new(false));
-    client
-        .on_request::<SetBreakpoints, _>({
-            let called_set_breakpoints = called_set_breakpoints.clone();
-            move |_, args| {
-                assert_eq!("/project/test.txt", args.source.path.unwrap());
-                assert_eq!(
-                    vec![SourceBreakpoint {
-                        line: 3,
-                        column: None,
-                        condition: None,
-                        hit_condition: None,
-                        log_message: None,
-                        mode: None
-                    }],
-                    args.breakpoints.unwrap()
-                );
-                // assert!(!args.source_modified.unwrap());
-                // todo(debugger): Implement source_modified handling
-
-                called_set_breakpoints.store(true, Ordering::SeqCst);
-
-                Ok(dap::SetBreakpointsResponse {
-                    breakpoints: Vec::default(),
-                })
-            }
-        })
-        .await;
-
-    client
-        .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-            reason: dap::StoppedEventReason::Pause,
-            description: None,
-            thread_id: Some(1),
-            preserve_focus_hint: None,
-            text: None,
-            all_threads_stopped: None,
-            hit_breakpoint_ids: None,
-        }))
-        .await;
-
-    host_cx.run_until_parked();
-    remote_cx.run_until_parked();
-
-    // Client B opens an editor.
-    let editor_b = remote_workspace
-        .update_in(remote_cx, |workspace, window, cx| {
-            workspace.open_path(project_path.clone(), None, true, window, cx)
-        })
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-
-    editor_b.update_in(remote_cx, |editor, window, cx| {
-        editor.move_down(&editor::actions::MoveDown, window, cx);
-        editor.move_down(&editor::actions::MoveDown, window, cx);
-        editor.toggle_breakpoint(&editor::actions::ToggleBreakpoint, window, cx);
-    });
-
-    // Client A opens an editor.
-    let editor_a = host_workspace
-        .update_in(host_cx, |workspace, window, cx| {
-            workspace.open_path(project_path.clone(), None, true, window, cx)
-        })
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-
-    host_cx.run_until_parked();
-    remote_cx.run_until_parked();
-
-    let called_set_breakpoints = Arc::new(AtomicBool::new(false));
-    client
-        .on_request::<SetBreakpoints, _>({
-            let called_set_breakpoints = called_set_breakpoints.clone();
-            move |_, args| {
-                assert_eq!("/project/test.txt", args.source.path.unwrap());
-                assert!(args.breakpoints.unwrap().is_empty());
-                // assert!(!args.source_modified.unwrap());
-                // todo(debugger) Implement source modified support
-
-                called_set_breakpoints.store(true, Ordering::SeqCst);
-
-                Ok(dap::SetBreakpointsResponse {
-                    breakpoints: Vec::default(),
-                })
-            }
-        })
-        .await;
-
-    // remove the breakpoint that client B added
-    editor_a.update_in(host_cx, |editor, window, cx| {
-        editor.move_down(&editor::actions::MoveDown, window, cx);
-        editor.move_down(&editor::actions::MoveDown, window, cx);
-        editor.toggle_breakpoint(&editor::actions::ToggleBreakpoint, window, cx);
-    });
-
-    host_cx.run_until_parked();
-    remote_cx.run_until_parked();
-
-    assert!(
-        called_set_breakpoints.load(std::sync::atomic::Ordering::SeqCst),
-        "SetBreakpoint request must be called"
-    );
-
-    let called_set_breakpoints = Arc::new(AtomicBool::new(false));
-    client
-        .on_request::<SetBreakpoints, _>({
-            let called_set_breakpoints = called_set_breakpoints.clone();
-            move |_, args| {
-                assert_eq!("/project/test.txt", args.source.path.unwrap());
-                let mut breakpoints = args.breakpoints.unwrap();
-                breakpoints.sort_by_key(|b| b.line);
-                assert_eq!(
-                    vec![
-                        SourceBreakpoint {
-                            line: 2,
-                            column: None,
-                            condition: None,
-                            hit_condition: None,
-                            log_message: None,
-                            mode: None
-                        },
-                        SourceBreakpoint {
-                            line: 3,
-                            column: None,
-                            condition: None,
-                            hit_condition: None,
-                            log_message: None,
-                            mode: None
-                        }
-                    ],
-                    breakpoints
-                );
-                // assert!(!args.source_modified.unwrap());
-                // todo(debugger) Implement source modified support
-
-                called_set_breakpoints.store(true, Ordering::SeqCst);
-
-                Ok(dap::SetBreakpointsResponse {
-                    breakpoints: Vec::default(),
-                })
-            }
-        })
-        .await;
-
-    // Add our own breakpoint now
-    editor_a.update_in(host_cx, |editor, window, cx| {
-        editor.toggle_breakpoint(&editor::actions::ToggleBreakpoint, window, cx);
-        editor.move_up(&editor::actions::MoveUp, window, cx);
-        editor.toggle_breakpoint(&editor::actions::ToggleBreakpoint, window, cx);
-    });
-
-    host_cx.run_until_parked();
-    remote_cx.run_until_parked();
-
-    assert!(
-        called_set_breakpoints.load(std::sync::atomic::Ordering::SeqCst),
-        "SetBreakpoint request must be called"
-    );
-
-    let shutdown_client = host_project.update(host_cx, |project, cx| {
-        project.dap_store().update(cx, |dap_store, cx| {
-            dap_store.shutdown_session(session.read(cx).session_id(), cx)
-        })
-    });
-
-    shutdown_client.await.unwrap();
-}
-
-#[gpui::test]
-async fn test_module_list(
-    _host_cx: &mut TestAppContext,
-    _remote_cx: &mut TestAppContext,
-    _late_join_cx: &mut TestAppContext,
-) {
-    unimplemented!("Collab is still being refactored");
-    // let executor = host_cx.executor();
-    // let mut server = TestServer::start(executor).await;
-
-    // let (mut host_zed, mut remote_zed, mut late_join_zed) =
-    //     setup_three_member_test(&mut server, host_cx, remote_cx, late_join_cx).await;
-
-    // let (host_project_id, _worktree_id) = host_zed.host_project(None).await;
-
-    // remote_zed.join_project(host_project_id).await;
-
-    // let (_client_host, host_workspace, host_project, host_cx) = host_zed.expand().await;
-    // let (_client_remote, remote_workspace, _remote_project, remote_cx) = remote_zed.expand().await;
-
-    // let task = host_project.update(host_cx, |project, cx| {
-    //     project.start_debug_session(dap::test_config(None), cx)
-    // });
-
-    // let session = task.await.unwrap();
-    // let client = session.read_with(host_cx, |project, _| project.adapter_client().unwrap());
-
-    // let called_initialize = Arc::new(AtomicBool::new(false));
-
-    // client
-    //     .on_request::<Initialize, _>({
-    //         let called_initialize = called_initialize.clone();
-    //         move |_, _| {
-    //             called_initialize.store(true, Ordering::SeqCst);
-    //             Ok(dap::Capabilities {
-    //                 supports_restart_frame: Some(true),
-    //                 supports_modules_request: Some(true),
-    //                 ..Default::default()
-    //             })
-    //         }
-    //     })
-    //     .await;
-
-    // client.on_request::<Launch, _>(move |_, _| Ok(())).await;
-    // client
-    //     .on_request::<StackTrace, _>(move |_, _| {
-    //         Ok(dap::StackTraceResponse {
-    //             stack_frames: Vec::default(),
-    //             total_frames: None,
-    //         })
-    //     })
-    //     .await;
-
-    // let called_modules = Arc::new(AtomicBool::new(false));
-    // let modules = vec![
-    //     dap::Module {
-    //         id: dap::ModuleId::Number(1),
-    //         name: "First Module".into(),
-    //         address_range: None,
-    //         date_time_stamp: None,
-    //         path: None,
-    //         symbol_file_path: None,
-    //         symbol_status: None,
-    //         version: None,
-    //         is_optimized: None,
-    //         is_user_code: None,
-    //     },
-    //     dap::Module {
-    //         id: dap::ModuleId::Number(2),
-    //         name: "Second Module".into(),
-    //         address_range: None,
-    //         date_time_stamp: None,
-    //         path: None,
-    //         symbol_file_path: None,
-    //         symbol_status: None,
-    //         version: None,
-    //         is_optimized: None,
-    //         is_user_code: None,
-    //     },
-    // ];
-
-    // client
-    //     .on_request::<dap::requests::Modules, _>({
-    //         let called_modules = called_modules.clone();
-    //         let modules = modules.clone();
-    //         move |_, _| unsafe {
-    //             static mut REQUEST_COUNT: i32 = 1;
-    //             assert_eq!(
-    //                 1, REQUEST_COUNT,
-    //                 "This request should only be called once from the host"
-    //             );
-    //             REQUEST_COUNT += 1;
-    //             called_modules.store(true, Ordering::SeqCst);
-
-    //             Ok(dap::ModulesResponse {
-    //                 modules: modules.clone(),
-    //                 total_modules: Some(2u64),
-    //             })
-    //         }
-    //     })
-    //     .await;
-
-    // host_cx.run_until_parked();
-    // remote_cx.run_until_parked();
-
-    // assert!(
-    //     called_initialize.load(std::sync::atomic::Ordering::SeqCst),
-    //     "Request Initialize must be called"
-    // );
-
-    // client
-    //     .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-    //         reason: dap::StoppedEventReason::Pause,
-    //         description: None,
-    //         thread_id: Some(1),
-    //         preserve_focus_hint: None,
-    //         text: None,
-    //         all_threads_stopped: None,
-    //         hit_breakpoint_ids: None,
-    //     }))
-    //     .await;
-
-    // host_cx.run_until_parked();
-    // remote_cx.run_until_parked();
-
-    // assert!(
-    //     called_modules.load(std::sync::atomic::Ordering::SeqCst),
-    //     "Request Modules must be called"
-    // );
-
-    // host_workspace.update(host_cx, |workspace, cx| {
-    //     let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap();
-    //     let debug_panel_item = debug_panel
-    //         .update(cx, |this, cx| this.active_session(cx))
-    //         .unwrap();
-
-    //     debug_panel_item.update(cx, |item, cx| {
-    //         assert_eq!(
-    //             true,
-    //             item.capabilities(cx).supports_modules_request.unwrap(),
-    //             "Local supports modules request should be true"
-    //         );
-
-    //         let local_module_list = item.module_list().update(cx, |list, cx| list.modules(cx));
-
-    //         assert_eq!(
-    //             2usize,
-    //             local_module_list.len(),
-    //             "Local module list should have two items in it"
-    //         );
-    //         assert_eq!(
-    //             modules.clone(),
-    //             local_module_list,
-    //             "Local module list should match module list from response"
-    //         );
-    //     })
-    // });
-
-    // remote_workspace.update(remote_cx, |workspace, cx| {
-    //     let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap();
-    //     let debug_panel_item = debug_panel
-    //         .update(cx, |this, cx| this.active_session(cx))
-    //         .unwrap();
-
-    //     debug_panel_item.update(cx, |item, cx| {
-    //         assert_eq!(
-    //             true,
-    //             item.capabilities(cx).supports_modules_request.unwrap(),
-    //             "Remote capabilities supports modules request should be true"
-    //         );
-    //         let remote_module_list = item.module_list().update(cx, |list, cx| list.modules(cx));
-
-    //         assert_eq!(
-    //             2usize,
-    //             remote_module_list.len(),
-    //             "Remote module list should have two items in it"
-    //         );
-    //         assert_eq!(
-    //             modules.clone(),
-    //             remote_module_list,
-    //             "Remote module list should match module list from response"
-    //         );
-    //     })
-    // });
-
-    // late_join_zed.join_project(host_project_id).await;
-    // let (_late_join_client, late_join_workspace, _late_join_project, late_join_cx) =
-    //     late_join_zed.expand().await;
-
-    // late_join_workspace.update(late_join_cx, |workspace, cx| {
-    //     let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap();
-    //     let debug_panel_item = debug_panel
-    //         .update(cx, |this, cx| this.active_session(cx))
-    //         .unwrap();
-
-    //     debug_panel_item.update(cx, |item, cx| {
-    //         assert_eq!(
-    //             true,
-    //             item.capabilities(cx).supports_modules_request.unwrap(),
-    //             "Remote (mid session join) capabilities supports modules request should be true"
-    //         );
-    //         let remote_module_list = item.module_list().update(cx, |list, cx| list.modules(cx));
-
-    //         assert_eq!(
-    //             2usize,
-    //             remote_module_list.len(),
-    //             "Remote (mid session join) module list should have two items in it"
-    //         );
-    //         assert_eq!(
-    //             modules.clone(),
-    //             remote_module_list,
-    //             "Remote (mid session join) module list should match module list from response"
-    //         );
-    //     })
-    // });
-
-    // let shutdown_client = host_project.update(host_cx, |project, cx| {
-    //     project.dap_store().update(cx, |dap_store, cx| {
-    //         dap_store.shutdown_session(&session.read(cx).id(), cx)
-    //     })
-    // });
-
-    // shutdown_client.await.unwrap();
-}
-
-// #[gpui::test]
-// async fn test_variable_list(
-//     host_cx: &mut TestAppContext,
-//     remote_cx: &mut TestAppContext,
-//     late_join_cx: &mut TestAppContext,
-// ) {
-//     let executor = host_cx.executor();
-//     let mut server = TestServer::start(executor).await;
-
-//     let (mut host_zed, mut remote_zed, mut late_join_zed) =
-//         setup_three_member_test(&mut server, host_cx, remote_cx, late_join_cx).await;
-
-//     let (host_project_id, _worktree_id) = host_zed
-//         .host_project(Some(json!({"test.txt": "one\ntwo\nthree\nfour\nfive"})))
-//         .await;
-
-//     remote_zed.join_project(host_project_id).await;
-
-//     let (_client_host, host_workspace, host_project, host_cx) = host_zed.expand().await;
-//     let (_client_remote, remote_workspace, _remote_project, remote_cx) = remote_zed.expand().await;
-
-//     let task = host_project.update(host_cx, |project, cx| {
-//         project.start_debug_session(
-//             dap::DebugAdapterConfig {
-//                 label: "test config".into(),
-//                 kind: dap::DebugAdapterKind::Fake,
-//                 request: dap::DebugRequestType::Launch,
-//                 program: None,
-//                 cwd: None,
-//                 initialize_args: None,
-//             },
-//             cx,
-//         )
-//     });
-
-//     let (session, client) = task.await.unwrap();
-
-//     client
-//         .on_request::<Initialize, _>(move |_, _| {
-//             Ok(dap::Capabilities {
-//                 supports_step_back: Some(true),
-//                 ..Default::default()
-//             })
-//         })
-//         .await;
-
-//     client.on_request::<Launch, _>(move |_, _| Ok(())).await;
-
-//     let stack_frames = vec![dap::StackFrame {
-//         id: 1,
-//         name: "Stack Frame 1".into(),
-//         source: Some(dap::Source {
-//             name: Some("test.js".into()),
-//             path: Some("/project/src/test.js".into()),
-//             source_reference: None,
-//             presentation_hint: None,
-//             origin: None,
-//             sources: None,
-//             adapter_data: None,
-//             checksums: None,
-//         }),
-//         line: 1,
-//         column: 1,
-//         end_line: None,
-//         end_column: None,
-//         can_restart: None,
-//         instruction_pointer_reference: None,
-//         module_id: None,
-//         presentation_hint: None,
-//     }];
-
-//     let scopes = vec![Scope {
-//         name: "Scope 1".into(),
-//         presentation_hint: None,
-//         variables_reference: 1,
-//         named_variables: None,
-//         indexed_variables: None,
-//         expensive: false,
-//         source: None,
-//         line: None,
-//         column: None,
-//         end_line: None,
-//         end_column: None,
-//     }];
-
-//     let variable_1 = Variable {
-//         name: "variable 1".into(),
-//         value: "1".into(),
-//         type_: None,
-//         presentation_hint: None,
-//         evaluate_name: None,
-//         variables_reference: 2,
-//         named_variables: None,
-//         indexed_variables: None,
-//         memory_reference: None,
-//     };
-
-//     let variable_2 = Variable {
-//         name: "variable 2".into(),
-//         value: "2".into(),
-//         type_: None,
-//         presentation_hint: None,
-//         evaluate_name: None,
-//         variables_reference: 3,
-//         named_variables: None,
-//         indexed_variables: None,
-//         memory_reference: None,
-//     };
-
-//     let variable_3 = Variable {
-//         name: "variable 3".into(),
-//         value: "hello world".into(),
-//         type_: None,
-//         presentation_hint: None,
-//         evaluate_name: None,
-//         variables_reference: 4,
-//         named_variables: None,
-//         indexed_variables: None,
-//         memory_reference: None,
-//     };
-
-//     let variable_4 = Variable {
-//         name: "variable 4".into(),
-//         value: "hello world this is the final variable".into(),
-//         type_: None,
-//         presentation_hint: None,
-//         evaluate_name: None,
-//         variables_reference: 0,
-//         named_variables: None,
-//         indexed_variables: None,
-//         memory_reference: None,
-//     };
-
-//     client
-//         .on_request::<StackTrace, _>({
-//             let stack_frames = std::sync::Arc::new(stack_frames.clone());
-//             move |_, args| {
-//                 assert_eq!(1, args.thread_id);
-
-//                 Ok(dap::StackTraceResponse {
-//                     stack_frames: (*stack_frames).clone(),
-//                     total_frames: None,
-//                 })
-//             }
-//         })
-//         .await;
-
-//     client
-//         .on_request::<Scopes, _>({
-//             let scopes = Arc::new(scopes.clone());
-//             move |_, args| {
-//                 assert_eq!(1, args.frame_id);
-
-//                 Ok(dap::ScopesResponse {
-//                     scopes: (*scopes).clone(),
-//                 })
-//             }
-//         })
-//         .await;
-
-//     let first_variable_request = vec![variable_1.clone(), variable_2.clone()];
-
-//     client
-//         .on_request::<Variables, _>({
-//             move |_, args| {
-//                 assert_eq!(1, args.variables_reference);
-
-//                 Ok(dap::VariablesResponse {
-//                     variables: first_variable_request.clone(),
-//                 })
-//             }
-//         })
-//         .await;
-
-//     client
-//         .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-//             reason: dap::StoppedEventReason::Pause,
-//             description: None,
-//             thread_id: Some(1),
-//             preserve_focus_hint: None,
-//             text: None,
-//             all_threads_stopped: None,
-//             hit_breakpoint_ids: None,
-//         }))
-//         .await;
-
-//     host_cx.run_until_parked();
-//     remote_cx.run_until_parked();
-
-//     let local_debug_item = host_workspace.update(host_cx, |workspace, cx| {
-//         let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap();
-//         let active_debug_panel_item = debug_panel
-//             .update(cx, |this, cx| this.active_debug_panel_item(cx))
-//             .unwrap();
-
-//         assert_eq!(
-//             1,
-//             debug_panel.update(cx, |this, cx| this.pane().unwrap().read(cx).items_len())
-//         );
-//         assert_eq!(client.id(), active_debug_panel_item.read(cx).client_id());
-//         assert_eq!(1, active_debug_panel_item.read(cx).thread_id());
-//         active_debug_panel_item
-//     });
-
-//     let remote_debug_item = remote_workspace.update(remote_cx, |workspace, cx| {
-//         let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap();
-//         let active_debug_panel_item = debug_panel
-//             .update(cx, |this, cx| this.active_debug_panel_item(cx))
-//             .unwrap();
-
-//         assert_eq!(
-//             1,
-//             debug_panel.update(cx, |this, cx| this.pane().unwrap().read(cx).items_len())
-//         );
-//         assert_eq!(client.id(), active_debug_panel_item.read(cx).client_id());
-//         assert_eq!(1, active_debug_panel_item.read(cx).thread_id());
-//         active_debug_panel_item
-//     });
-
-//     let first_visual_entries = vec!["v Scope 1", "    > variable 1", "    > variable 2"];
-//     let first_variable_containers = vec![
-//         VariableContainer {
-//             container_reference: scopes[0].variables_reference,
-//             variable: variable_1.clone(),
-//             depth: 1,
-//         },
-//         VariableContainer {
-//             container_reference: scopes[0].variables_reference,
-//             variable: variable_2.clone(),
-//             depth: 1,
-//         },
-//     ];
-
-//     local_debug_item
-//         .update(host_cx, |this, _| this.variable_list().clone())
-//         .update(host_cx, |variable_list, cx| {
-//             assert_eq!(1, variable_list.scopes().len());
-//             assert_eq!(scopes, variable_list.scopes().get(&1).unwrap().clone());
-//             assert_eq!(&first_variable_containers, &variable_list.variables());
-
-//             variable_list.assert_visual_entries(first_visual_entries.clone(), cx);
-//         });
-
-//     client
-//         .on_request::<Variables, _>({
-//             let variables = Arc::new(vec![variable_3.clone()]);
-//             move |_, args| {
-//                 assert_eq!(2, args.variables_reference);
-
-//                 Ok(dap::VariablesResponse {
-//                     variables: (*variables).clone(),
-//                 })
-//             }
-//         })
-//         .await;
-
-//     remote_debug_item
-//         .update(remote_cx, |this, _| this.variable_list().clone())
-//         .update(remote_cx, |variable_list, cx| {
-//             assert_eq!(1, variable_list.scopes().len());
-//             assert_eq!(scopes, variable_list.scopes().get(&1).unwrap().clone());
-//             assert_eq!(&first_variable_containers, &variable_list.variables());
-
-//             variable_list.assert_visual_entries(first_visual_entries.clone(), cx);
-
-//             variable_list.toggle_variable(&scopes[0], &variable_1, 1, cx);
-//         });
-
-//     host_cx.run_until_parked();
-//     remote_cx.run_until_parked();
-
-//     let second_req_variable_list = vec![
-//         VariableContainer {
-//             container_reference: scopes[0].variables_reference,
-//             variable: variable_1.clone(),
-//             depth: 1,
-//         },
-//         VariableContainer {
-//             container_reference: variable_1.variables_reference,
-//             variable: variable_3.clone(),
-//             depth: 2,
-//         },
-//         VariableContainer {
-//             container_reference: scopes[0].variables_reference,
-//             variable: variable_2.clone(),
-//             depth: 1,
-//         },
-//     ];
-
-//     remote_debug_item
-//         .update(remote_cx, |this, _| this.variable_list().clone())
-//         .update(remote_cx, |variable_list, cx| {
-//             assert_eq!(1, variable_list.scopes().len());
-//             assert_eq!(3, variable_list.variables().len());
-//             assert_eq!(scopes, variable_list.scopes().get(&1).unwrap().clone());
-//             assert_eq!(&second_req_variable_list, &variable_list.variables());
-
-//             variable_list.assert_visual_entries(
-//                 vec![
-//                     "v Scope 1",
-//                     "    v variable 1",
-//                     "        > variable 3",
-//                     "    > variable 2",
-//                 ],
-//                 cx,
-//             );
-//         });
-
-//     client
-//         .on_request::<Variables, _>({
-//             let variables = Arc::new(vec![variable_4.clone()]);
-//             move |_, args| {
-//                 assert_eq!(3, args.variables_reference);
-
-//                 Ok(dap::VariablesResponse {
-//                     variables: (*variables).clone(),
-//                 })
-//             }
-//         })
-//         .await;
-
-//     local_debug_item
-//         .update(host_cx, |this, _| this.variable_list().clone())
-//         .update(host_cx, |variable_list, cx| {
-//             assert_eq!(1, variable_list.scopes().len());
-//             assert_eq!(3, variable_list.variables().len());
-//             assert_eq!(scopes, variable_list.scopes().get(&1).unwrap().clone());
-//             assert_eq!(&second_req_variable_list, &variable_list.variables());
-
-//             variable_list.assert_visual_entries(first_visual_entries.clone(), cx);
-
-//             variable_list.toggle_variable(&scopes[0], &variable_2.clone(), 1, cx);
-//         });
-
-//     host_cx.run_until_parked();
-//     remote_cx.run_until_parked();
-
-//     let final_variable_containers: Vec<VariableContainer> = vec![
-//         VariableContainer {
-//             container_reference: scopes[0].variables_reference,
-//             variable: variable_1.clone(),
-//             depth: 1,
-//         },
-//         VariableContainer {
-//             container_reference: variable_1.variables_reference,
-//             variable: variable_3.clone(),
-//             depth: 2,
-//         },
-//         VariableContainer {
-//             container_reference: scopes[0].variables_reference,
-//             variable: variable_2.clone(),
-//             depth: 1,
-//         },
-//         VariableContainer {
-//             container_reference: variable_2.variables_reference,
-//             variable: variable_4.clone(),
-//             depth: 2,
-//         },
-//     ];
-
-//     remote_debug_item
-//         .update(remote_cx, |this, _| this.variable_list().clone())
-//         .update(remote_cx, |variable_list, cx| {
-//             assert_eq!(1, variable_list.scopes().len());
-//             assert_eq!(4, variable_list.variables().len());
-//             assert_eq!(scopes, variable_list.scopes().get(&1).unwrap().clone());
-//             assert_eq!(&final_variable_containers, &variable_list.variables());
-
-//             variable_list.assert_visual_entries(
-//                 vec![
-//                     "v Scope 1",
-//                     "    v variable 1",
-//                     "        > variable 3",
-//                     "    > variable 2",
-//                 ],
-//                 cx,
-//             );
-//         });
-
-//     local_debug_item
-//         .update(host_cx, |this, _| this.variable_list().clone())
-//         .update(host_cx, |variable_list, cx| {
-//             assert_eq!(1, variable_list.scopes().len());
-//             assert_eq!(4, variable_list.variables().len());
-//             assert_eq!(scopes, variable_list.scopes().get(&1).unwrap().clone());
-//             assert_eq!(&final_variable_containers, &variable_list.variables());
-
-//             variable_list.assert_visual_entries(
-//                 vec![
-//                     "v Scope 1",
-//                     "    > variable 1",
-//                     "    v variable 2",
-//                     "        > variable 4",
-//                 ],
-//                 cx,
-//             );
-//         });
-
-//     late_join_zed.join_project(host_project_id).await;
-//     let (_late_join_client, late_join_workspace, _late_join_project, late_join_cx) =
-//         late_join_zed.expand().await;
-
-//     late_join_cx.run_until_parked();
-
-//     let last_join_remote_item = late_join_workspace.update(late_join_cx, |workspace, cx| {
-//         let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap();
-//         let active_debug_panel_item = debug_panel
-//             .update(cx, |this, cx| this.active_debug_panel_item(cx))
-//             .unwrap();
-
-//         assert_eq!(
-//             1,
-//             debug_panel.update(cx, |this, cx| this.pane().unwrap().read(cx).items_len())
-//         );
-//         assert_eq!(client.id(), active_debug_panel_item.read(cx).client_id());
-//         assert_eq!(1, active_debug_panel_item.read(cx).thread_id());
-//         active_debug_panel_item
-//     });
-
-//     last_join_remote_item
-//         .update(late_join_cx, |this, _| this.variable_list().clone())
-//         .update(late_join_cx, |variable_list, cx| {
-//             assert_eq!(1, variable_list.scopes().len());
-//             assert_eq!(4, variable_list.variables().len());
-//             assert_eq!(scopes, variable_list.scopes().get(&1).unwrap().clone());
-//             assert_eq!(final_variable_containers, variable_list.variables());
-
-//             variable_list.assert_visual_entries(first_visual_entries, cx);
-//         });
-
-//     let shutdown_client = host_project.update(host_cx, |project, cx| {
-//         project.dap_store().update(cx, |dap_store, cx| {
-//             dap_store.shutdown_session(&session.read(cx).id(), cx)
-//         })
-//     });
-
-//     shutdown_client.await.unwrap();
-// }
-
-#[gpui::test]
-async fn test_ignore_breakpoints(
-    _host_cx: &mut TestAppContext,
-    _remote_cx: &mut TestAppContext,
-    _cx_c: &mut TestAppContext,
-) {
-    unimplemented!("Collab is still being refactored");
-    // let executor = host_cx.executor();
-    // let mut server = TestServer::start(executor).await;
-
-    // let (mut host_zed, mut remote_zed, mut late_join_zed) =
-    //     setup_three_member_test(&mut server, host_cx, remote_cx, cx_c).await;
-
-    // let (host_project_id, worktree_id) = host_zed
-    //     .host_project(Some(json!({"test.txt": "one\ntwo\nthree\nfour\nfive"})))
-    //     .await;
-
-    // remote_zed.join_project(host_project_id).await;
-
-    // let (_client_host, host_workspace, host_project, host_cx) = host_zed.expand().await;
-    // let (_client_remote, remote_workspace, remote_project, remote_cx) = remote_zed.expand().await;
-
-    // let project_path = ProjectPath {
-    //     worktree_id,
-    //     path: Arc::from(Path::new(&"test.txt")),
-    // };
-
-    // let local_editor = host_workspace
-    //     .update_in(host_cx, |workspace, window, cx| {
-    //         workspace.open_path(project_path.clone(), None, true, window, cx)
-    //     })
-    //     .await
-    //     .unwrap()
-    //     .downcast::<Editor>()
-    //     .unwrap();
-
-    // local_editor.update_in(host_cx, |editor, window, cx| {
-    //     editor.move_down(&editor::actions::MoveDown, window, cx);
-    //     editor.toggle_breakpoint(&editor::actions::ToggleBreakpoint, window, cx); // Line 2
-    //     editor.move_down(&editor::actions::MoveDown, window, cx);
-    //     editor.toggle_breakpoint(&editor::actions::ToggleBreakpoint, window, cx);
-    //     // Line 3
-    // });
-
-    // host_cx.run_until_parked();
-    // remote_cx.run_until_parked();
-
-    // let task = host_project.update(host_cx, |project, cx| {
-    //     project.start_debug_session(dap::test_config(None), cx)
-    // });
-
-    // let session = task.await.unwrap();
-    // let client = session.read_with(host_cx, |project, _| project.adapter_client().unwrap());
-    // let client_id = client.id();
-
-    // client
-    //     .on_request::<Initialize, _>(move |_, _| {
-    //         Ok(dap::Capabilities {
-    //             supports_configuration_done_request: Some(true),
-    //             ..Default::default()
-    //         })
-    //     })
-    //     .await;
-
-    // let called_set_breakpoints = Arc::new(AtomicBool::new(false));
-    // client
-    //     .on_request::<SetBreakpoints, _>({
-    //         let called_set_breakpoints = called_set_breakpoints.clone();
-    //         move |_, args| {
-    //             assert_eq!("/project/test.txt", args.source.path.unwrap());
-
-    //             let mut actual_breakpoints = args.breakpoints.unwrap();
-    //             actual_breakpoints.sort_by_key(|b| b.line);
-
-    //             let expected_breakpoints = vec![
-    //                 SourceBreakpoint {
-    //                     line: 2,
-    //                     column: None,
-    //                     condition: None,
-    //                     hit_condition: None,
-    //                     log_message: None,
-    //                     mode: None,
-    //                 },
-    //                 SourceBreakpoint {
-    //                     line: 3,
-    //                     column: None,
-    //                     condition: None,
-    //                     hit_condition: None,
-    //                     log_message: None,
-    //                     mode: None,
-    //                 },
-    //             ];
-
-    //             assert_eq!(actual_breakpoints, expected_breakpoints);
-
-    //             called_set_breakpoints.store(true, Ordering::SeqCst);
-
-    //             Ok(dap::SetBreakpointsResponse {
-    //                 breakpoints: Vec::default(),
-    //             })
-    //         }
-    //     })
-    //     .await;
-
-    // client.on_request::<Launch, _>(move |_, _| Ok(())).await;
-    // client
-    //     .on_request::<StackTrace, _>(move |_, _| {
-    //         Ok(dap::StackTraceResponse {
-    //             stack_frames: Vec::default(),
-    //             total_frames: None,
-    //         })
-    //     })
-    //     .await;
-
-    // client
-    //     .fake_event(dap::messages::Events::Initialized(Some(
-    //         dap::Capabilities {
-    //             supports_configuration_done_request: Some(true),
-    //             ..Default::default()
-    //         },
-    //     )))
-    //     .await;
-
-    // host_cx.run_until_parked();
-    // remote_cx.run_until_parked();
-
-    // assert!(
-    //     called_set_breakpoints.load(std::sync::atomic::Ordering::SeqCst),
-    //     "SetBreakpoint request must be called when starting debug session"
-    // );
-
-    // client
-    //     .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-    //         reason: dap::StoppedEventReason::Pause,
-    //         description: None,
-    //         thread_id: Some(1),
-    //         preserve_focus_hint: None,
-    //         text: None,
-    //         all_threads_stopped: None,
-    //         hit_breakpoint_ids: None,
-    //     }))
-    //     .await;
-
-    // host_cx.run_until_parked();
-    // remote_cx.run_until_parked();
-
-    // let remote_debug_item = remote_workspace.update(remote_cx, |workspace, cx| {
-    //     let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap();
-    //     let active_session = debug_panel
-    //         .update(cx, |this, cx| this.active_session(cx))
-    //         .unwrap();
-
-    //     assert_eq!(
-    //         1,
-    //         debug_panel.update(cx, |this, cx| this.pane().unwrap().read(cx).items_len())
-    //     );
-
-    //     let session_id = debug_panel.update(cx, |this, cx| {
-    //         this.dap_store()
-    //             .read(cx)
-    //             .session_by_client_id(client.id())
-    //             .unwrap()
-    //             .read(cx)
-    //             .id()
-    //     });
-
-    //     let breakpoints_ignored = active_session.read(cx).are_breakpoints_ignored(cx);
-
-    //     assert_eq!(session_id, active_session.read(cx).session().read(cx).id());
-    //     assert_eq!(false, breakpoints_ignored);
-    //     assert_eq!(client.id(), active_session.read(cx).client_id());
-    //     assert_eq!(1, active_session.read(cx).thread_id().0);
-    //     active_session
-    // });
-
-    // called_set_breakpoints.store(false, Ordering::SeqCst);
-
-    // client
-    //     .on_request::<SetBreakpoints, _>({
-    //         let called_set_breakpoints = called_set_breakpoints.clone();
-    //         move |_, args| {
-    //             assert_eq!("/project/test.txt", args.source.path.unwrap());
-    //             assert_eq!(args.breakpoints, Some(vec![]));
-
-    //             called_set_breakpoints.store(true, Ordering::SeqCst);
-
-    //             Ok(dap::SetBreakpointsResponse {
-    //                 breakpoints: Vec::default(),
-    //             })
-    //         }
-    //     })
-    //     .await;
-
-    // let local_debug_item = host_workspace.update(host_cx, |workspace, cx| {
-    //     let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap();
-    //     let active_session = debug_panel
-    //         .update(cx, |this, cx| this.active_session(cx))
-    //         .unwrap();
-
-    //     assert_eq!(
-    //         1,
-    //         debug_panel.update(cx, |this, cx| this.pane().unwrap().read(cx).items_len())
-    //     );
-
-    //     assert_eq!(false, active_session.read(cx).are_breakpoints_ignored(cx));
-    //     assert_eq!(client.id(), active_session.read(cx).client_id());
-    //     assert_eq!(1, active_session.read(cx).thread_id().0);
-
-    //     active_session
-    // });
-
-    // local_debug_item.update(host_cx, |item, cx| {
-    //     item.toggle_ignore_breakpoints(cx); // Set to true
-    //     assert_eq!(true, item.are_breakpoints_ignored(cx));
-    // });
-
-    // host_cx.run_until_parked();
-    // remote_cx.run_until_parked();
-
-    // assert!(
-    //     called_set_breakpoints.load(std::sync::atomic::Ordering::SeqCst),
-    //     "SetBreakpoint request must be called to ignore breakpoints"
-    // );
-
-    // client
-    //     .on_request::<SetBreakpoints, _>({
-    //         let called_set_breakpoints = called_set_breakpoints.clone();
-    //         move |_, _args| {
-    //             called_set_breakpoints.store(true, Ordering::SeqCst);
-
-    //             Ok(dap::SetBreakpointsResponse {
-    //                 breakpoints: Vec::default(),
-    //             })
-    //         }
-    //     })
-    //     .await;
-
-    // let remote_editor = remote_workspace
-    //     .update_in(remote_cx, |workspace, window, cx| {
-    //         workspace.open_path(project_path.clone(), None, true, window, cx)
-    //     })
-    //     .await
-    //     .unwrap()
-    //     .downcast::<Editor>()
-    //     .unwrap();
-
-    // called_set_breakpoints.store(false, std::sync::atomic::Ordering::SeqCst);
-
-    // remote_editor.update_in(remote_cx, |editor, window, cx| {
-    //     // Line 1
-    //     editor.toggle_breakpoint(&editor::actions::ToggleBreakpoint, window, cx);
-    // });
-
-    // host_cx.run_until_parked();
-    // remote_cx.run_until_parked();
-
-    // assert!(
-    //     called_set_breakpoints.load(std::sync::atomic::Ordering::SeqCst),
-    //     "SetBreakpoint request be called whenever breakpoints are toggled but with not breakpoints"
-    // );
-
-    // remote_debug_item.update(remote_cx, |debug_panel, cx| {
-    //     let breakpoints_ignored = debug_panel.are_breakpoints_ignored(cx);
-
-    //     assert_eq!(true, breakpoints_ignored);
-    //     assert_eq!(client.id(), debug_panel.client_id());
-    //     assert_eq!(1, debug_panel.thread_id().0);
-    // });
-
-    // client
-    //     .on_request::<SetBreakpoints, _>({
-    //         let called_set_breakpoints = called_set_breakpoints.clone();
-    //         move |_, args| {
-    //             assert_eq!("/project/test.txt", args.source.path.unwrap());
-
-    //             let mut actual_breakpoints = args.breakpoints.unwrap();
-    //             actual_breakpoints.sort_by_key(|b| b.line);
-
-    //             let expected_breakpoints = vec![
-    //                 SourceBreakpoint {
-    //                     line: 1,
-    //                     column: None,
-    //                     condition: None,
-    //                     hit_condition: None,
-    //                     log_message: None,
-    //                     mode: None,
-    //                 },
-    //                 SourceBreakpoint {
-    //                     line: 2,
-    //                     column: None,
-    //                     condition: None,
-    //                     hit_condition: None,
-    //                     log_message: None,
-    //                     mode: None,
-    //                 },
-    //                 SourceBreakpoint {
-    //                     line: 3,
-    //                     column: None,
-    //                     condition: None,
-    //                     hit_condition: None,
-    //                     log_message: None,
-    //                     mode: None,
-    //                 },
-    //             ];
-
-    //             assert_eq!(actual_breakpoints, expected_breakpoints);
-
-    //             called_set_breakpoints.store(true, Ordering::SeqCst);
-
-    //             Ok(dap::SetBreakpointsResponse {
-    //                 breakpoints: Vec::default(),
-    //             })
-    //         }
-    //     })
-    //     .await;
-
-    // late_join_zed.join_project(host_project_id).await;
-    // let (_late_join_client, late_join_workspace, late_join_project, late_join_cx) =
-    //     late_join_zed.expand().await;
-
-    // late_join_cx.run_until_parked();
-
-    // let last_join_remote_item = late_join_workspace.update(late_join_cx, |workspace, cx| {
-    //     let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap();
-    //     let active_session = debug_panel
-    //         .update(cx, |this, cx| this.active_session(cx))
-    //         .unwrap();
-
-    //     let breakpoints_ignored = active_session.read(cx).are_breakpoints_ignored(cx);
-
-    //     assert_eq!(true, breakpoints_ignored);
-
-    //     assert_eq!(
-    //         1,
-    //         debug_panel.update(cx, |this, cx| this.pane().unwrap().read(cx).items_len())
-    //     );
-    //     assert_eq!(client.id(), active_session.read(cx).client_id());
-    //     assert_eq!(1, active_session.read(cx).thread_id().0);
-    //     active_session
-    // });
-
-    // remote_debug_item.update(remote_cx, |item, cx| {
-    //     item.toggle_ignore_breakpoints(cx);
-    // });
-
-    // host_cx.run_until_parked();
-    // remote_cx.run_until_parked();
-    // late_join_cx.run_until_parked();
-
-    // assert!(
-    //     called_set_breakpoints.load(std::sync::atomic::Ordering::SeqCst),
-    //     "SetBreakpoint request should be called to update breakpoints"
-    // );
-
-    // client
-    //     .on_request::<SetBreakpoints, _>({
-    //         let called_set_breakpoints = called_set_breakpoints.clone();
-    //         move |_, args| {
-    //             assert_eq!("/project/test.txt", args.source.path.unwrap());
-    //             assert_eq!(args.breakpoints, Some(vec![]));
-
-    //             called_set_breakpoints.store(true, Ordering::SeqCst);
-
-    //             Ok(dap::SetBreakpointsResponse {
-    //                 breakpoints: Vec::default(),
-    //             })
-    //         }
-    //     })
-    //     .await;
-
-    // local_debug_item.update(host_cx, |debug_panel_item, cx| {
-    //     assert_eq!(
-    //         false,
-    //         debug_panel_item.are_breakpoints_ignored(cx),
-    //         "Remote client set this to false"
-    //     );
-    // });
-
-    // remote_debug_item.update(remote_cx, |debug_panel_item, cx| {
-    //     assert_eq!(
-    //         false,
-    //         debug_panel_item.are_breakpoints_ignored(cx),
-    //         "Remote client set this to false"
-    //     );
-    // });
-
-    // last_join_remote_item.update(late_join_cx, |debug_panel_item, cx| {
-    //     assert_eq!(
-    //         false,
-    //         debug_panel_item.are_breakpoints_ignored(cx),
-    //         "Remote client set this to false"
-    //     );
-    // });
-
-    // let shutdown_client = host_project.update(host_cx, |project, cx| {
-    //     project.dap_store().update(cx, |dap_store, cx| {
-    //         dap_store.shutdown_session(&session.read(cx).id(), cx)
-    //     })
-    // });
-
-    // shutdown_client.await.unwrap();
-
-    // host_cx.run_until_parked();
-    // remote_cx.run_until_parked();
-
-    // remote_project.update(remote_cx, |project, cx| {
-    //     project.dap_store().update(cx, |dap_store, _cx| {
-    //         let sessions = dap_store.sessions().collect::<Vec<_>>();
-
-    //         assert_eq!(
-    //             None,
-    //             dap_store.session_by_client_id(&client_id),
-    //             "No client_id to session mapping should exist after shutdown"
-    //         );
-    //         assert_eq!(
-    //             0,
-    //             sessions.len(),
-    //             "No sessions should be left after shutdown"
-    //         );
-    //     })
-    // });
-
-    // late_join_project.update(late_join_cx, |project, cx| {
-    //     project.dap_store().update(cx, |dap_store, _cx| {
-    //         let sessions = dap_store.sessions().collect::<Vec<_>>();
-
-    //         assert_eq!(
-    //             None,
-    //             dap_store.session_by_client_id(&client_id),
-    //             "No client_id to session mapping should exist after shutdown"
-    //         );
-    //         assert_eq!(
-    //             0,
-    //             sessions.len(),
-    //             "No sessions should be left after shutdown"
-    //         );
-    //     })
-    // });
-}
-
-#[gpui::test]
-async fn test_debug_panel_console(_host_cx: &mut TestAppContext, _remote_cx: &mut TestAppContext) {
-    unimplemented!("Collab is still being refactored");
-    // let executor = host_cx.executor();
-    // let mut server = TestServer::start(executor).await;
-
-    // let (mut host_zed, mut remote_zed) =
-    //     setup_two_member_test(&mut server, host_cx, remote_cx).await;
-
-    // let (host_project_id, _) = host_zed.host_project(None).await;
-    // remote_zed.join_project(host_project_id).await;
-
-    // let (_client_host, _host_workspace, host_project, host_cx) = host_zed.expand().await;
-    // let (_client_remote, remote_workspace, _remote_project, remote_cx) = remote_zed.expand().await;
-
-    // remote_cx.run_until_parked();
-
-    // let task = host_project.update(host_cx, |project, cx| {
-    //     project.start_debug_session(dap::test_config(None), cx)
-    // });
-
-    // let session = task.await.unwrap();
-    // let client = session.read_with(host_cx, |project, _| project.adapter_client().unwrap());
-
-    // client
-    //     .on_request::<Initialize, _>(move |_, _| {
-    //         Ok(dap::Capabilities {
-    //             supports_step_back: Some(false),
-    //             ..Default::default()
-    //         })
-    //     })
-    //     .await;
-
-    // client.on_request::<Launch, _>(move |_, _| Ok(())).await;
-
-    // client
-    //     .on_request::<StackTrace, _>(move |_, _| {
-    //         Ok(dap::StackTraceResponse {
-    //             stack_frames: Vec::default(),
-    //             total_frames: None,
-    //         })
-    //     })
-    //     .await;
-
-    // client
-    //     .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-    //         reason: dap::StoppedEventReason::Pause,
-    //         description: None,
-    //         thread_id: Some(1),
-    //         preserve_focus_hint: None,
-    //         text: None,
-    //         all_threads_stopped: None,
-    //         hit_breakpoint_ids: None,
-    //     }))
-    //     .await;
-
-    // client
-    //     .fake_event(dap::messages::Events::Output(dap::OutputEvent {
-    //         category: None,
-    //         output: "First line".to_string(),
-    //         data: None,
-    //         variables_reference: None,
-    //         source: None,
-    //         line: None,
-    //         column: None,
-    //         group: None,
-    //         location_reference: None,
-    //     }))
-    //     .await;
-
-    // client
-    //     .fake_event(dap::messages::Events::Output(dap::OutputEvent {
-    //         category: Some(dap::OutputEventCategory::Stdout),
-    //         output: "First group".to_string(),
-    //         data: None,
-    //         variables_reference: None,
-    //         source: None,
-    //         line: None,
-    //         column: None,
-    //         group: Some(dap::OutputEventGroup::Start),
-    //         location_reference: None,
-    //     }))
-    //     .await;
-
-    // client
-    //     .fake_event(dap::messages::Events::Output(dap::OutputEvent {
-    //         category: Some(dap::OutputEventCategory::Stdout),
-    //         output: "First item in group 1".to_string(),
-    //         data: None,
-    //         variables_reference: None,
-    //         source: None,
-    //         line: None,
-    //         column: None,
-    //         group: None,
-    //         location_reference: None,
-    //     }))
-    //     .await;
-
-    // client
-    //     .fake_event(dap::messages::Events::Output(dap::OutputEvent {
-    //         category: Some(dap::OutputEventCategory::Stdout),
-    //         output: "Second item in group 1".to_string(),
-    //         data: None,
-    //         variables_reference: None,
-    //         source: None,
-    //         line: None,
-    //         column: None,
-    //         group: None,
-    //         location_reference: None,
-    //     }))
-    //     .await;
-
-    // client
-    //     .fake_event(dap::messages::Events::Output(dap::OutputEvent {
-    //         category: Some(dap::OutputEventCategory::Stdout),
-    //         output: "Second group".to_string(),
-    //         data: None,
-    //         variables_reference: None,
-    //         source: None,
-    //         line: None,
-    //         column: None,
-    //         group: Some(dap::OutputEventGroup::Start),
-    //         location_reference: None,
-    //     }))
-    //     .await;
-
-    // client
-    //     .fake_event(dap::messages::Events::Output(dap::OutputEvent {
-    //         category: Some(dap::OutputEventCategory::Stdout),
-    //         output: "First item in group 2".to_string(),
-    //         data: None,
-    //         variables_reference: None,
-    //         source: None,
-    //         line: None,
-    //         column: None,
-    //         group: None,
-    //         location_reference: None,
-    //     }))
-    //     .await;
-
-    // client
-    //     .fake_event(dap::messages::Events::Output(dap::OutputEvent {
-    //         category: Some(dap::OutputEventCategory::Stdout),
-    //         output: "Second item in group 2".to_string(),
-    //         data: None,
-    //         variables_reference: None,
-    //         source: None,
-    //         line: None,
-    //         column: None,
-    //         group: None,
-    //         location_reference: None,
-    //     }))
-    //     .await;
-
-    // client
-    //     .fake_event(dap::messages::Events::Output(dap::OutputEvent {
-    //         category: Some(dap::OutputEventCategory::Stdout),
-    //         output: "End group 2".to_string(),
-    //         data: None,
-    //         variables_reference: None,
-    //         source: None,
-    //         line: None,
-    //         column: None,
-    //         group: Some(dap::OutputEventGroup::End),
-    //         location_reference: None,
-    //     }))
-    //     .await;
-
-    // client
-    //     .fake_event(dap::messages::Events::Output(dap::OutputEvent {
-    //         category: Some(dap::OutputEventCategory::Stdout),
-    //         output: "Third group".to_string(),
-    //         data: None,
-    //         variables_reference: None,
-    //         source: None,
-    //         line: None,
-    //         column: None,
-    //         group: Some(dap::OutputEventGroup::StartCollapsed),
-    //         location_reference: None,
-    //     }))
-    //     .await;
-
-    // client
-    //     .fake_event(dap::messages::Events::Output(dap::OutputEvent {
-    //         category: Some(dap::OutputEventCategory::Stdout),
-    //         output: "First item in group 3".to_string(),
-    //         data: None,
-    //         variables_reference: None,
-    //         source: None,
-    //         line: None,
-    //         column: None,
-    //         group: None,
-    //         location_reference: None,
-    //     }))
-    //     .await;
-
-    // client
-    //     .fake_event(dap::messages::Events::Output(dap::OutputEvent {
-    //         category: Some(dap::OutputEventCategory::Stdout),
-    //         output: "Second item in group 3".to_string(),
-    //         data: None,
-    //         variables_reference: None,
-    //         source: None,
-    //         line: None,
-    //         column: None,
-    //         group: None,
-    //         location_reference: None,
-    //     }))
-    //     .await;
-
-    // client
-    //     .fake_event(dap::messages::Events::Output(dap::OutputEvent {
-    //         category: Some(dap::OutputEventCategory::Stdout),
-    //         output: "End group 3".to_string(),
-    //         data: None,
-    //         variables_reference: None,
-    //         source: None,
-    //         line: None,
-    //         column: None,
-    //         group: Some(dap::OutputEventGroup::End),
-    //         location_reference: None,
-    //     }))
-    //     .await;
-
-    // client
-    //     .fake_event(dap::messages::Events::Output(dap::OutputEvent {
-    //         category: Some(dap::OutputEventCategory::Stdout),
-    //         output: "Third item in group 1".to_string(),
-    //         data: None,
-    //         variables_reference: None,
-    //         source: None,
-    //         line: None,
-    //         column: None,
-    //         group: None,
-    //         location_reference: None,
-    //     }))
-    //     .await;
-
-    // client
-    //     .fake_event(dap::messages::Events::Output(dap::OutputEvent {
-    //         category: Some(dap::OutputEventCategory::Stdout),
-    //         output: "Second item".to_string(),
-    //         data: None,
-    //         variables_reference: None,
-    //         source: None,
-    //         line: None,
-    //         column: None,
-    //         group: Some(dap::OutputEventGroup::End),
-    //         location_reference: None,
-    //     }))
-    //     .await;
-
-    // host_cx.run_until_parked();
-    // remote_cx.run_until_parked();
-
-    // active_session(remote_workspace, remote_cx).update(remote_cx, |session_item, cx| {
-    //     session_item
-    //         .mode()
-    //         .as_running()
-    //         .unwrap()
-    //         .read(cx)
-    //         .console()
-    //         .update(cx, |console, cx| {
-    //             console.editor().update(cx, |editor, cx| {
-    //                 pretty_assertions::assert_eq!(
-    //                     "
-    //                     <First line
-    //                     First group
-    //                         First item in group 1
-    //                         Second item in group 1
-    //                         Second group
-    //                             First item in group 2
-    //                             Second item in group 2
-    //                         End group 2
-    //                     ⋯    End group 3
-    //                         Third item in group 1
-    //                     Second item
-    //                 "
-    //                     .unindent(),
-    //                     editor.display_text(cx)
-    //                 );
-    //             })
-    //         });
-    // });
-
-    // let shutdown_client = host_project.update(host_cx, |project, cx| {
-    //     project.dap_store().update(cx, |dap_store, cx| {
-    //         dap_store.shutdown_session(&session.read(cx).session_id(), cx)
-    //     })
-    // });
-
-    // shutdown_client.await.unwrap();
-}
diff --git a/crates/collab/src/tests/editor_tests.rs b/crates/collab/src/tests/editor_tests.rs
deleted file mode 100644
index ba92e86812..0000000000
--- a/crates/collab/src/tests/editor_tests.rs
+++ /dev/null
@@ -1,4644 +0,0 @@
-use crate::{rpc::RECONNECT_TIMEOUT, tests::TestServer};
-use call::ActiveCall;
-use editor::{
-    DocumentColorsRenderMode, Editor, FETCH_COLORS_DEBOUNCE_TIMEOUT, MultiBufferOffset, RowInfo,
-    SelectionEffects,
-    actions::{
-        ConfirmCodeAction, ConfirmCompletion, ConfirmRename, ContextMenuFirst, CopyFileLocation,
-        CopyFileName, CopyFileNameWithoutExtension, ExpandMacroRecursively, MoveToEnd, Redo,
-        Rename, SelectAll, ToggleCodeActions, Undo,
-    },
-    test::{
-        editor_test_context::{AssertionContextManager, EditorTestContext},
-        expand_macro_recursively,
-    },
-};
-use fs::Fs;
-use futures::{SinkExt, StreamExt, channel::mpsc, lock::Mutex};
-use git::repository::repo_path;
-use gpui::{
-    App, Rgba, SharedString, TestAppContext, UpdateGlobal, VisualContext, VisualTestContext,
-};
-use indoc::indoc;
-use language::{FakeLspAdapter, rust_lang};
-use lsp::LSP_REQUEST_TIMEOUT;
-use pretty_assertions::assert_eq;
-use project::{
-    ProgressToken, ProjectPath, SERVER_PROGRESS_THROTTLE_TIMEOUT,
-    lsp_store::lsp_ext_command::{ExpandedMacro, LspExtExpandMacro},
-};
-use recent_projects::disconnected_overlay::DisconnectedOverlay;
-use rpc::RECEIVE_TIMEOUT;
-use serde_json::json;
-use settings::{InlayHintSettingsContent, InlineBlameSettings, SettingsStore};
-use std::{
-    collections::BTreeSet,
-    ops::{Deref as _, Range},
-    path::{Path, PathBuf},
-    sync::{
-        Arc,
-        atomic::{self, AtomicBool, AtomicUsize},
-    },
-    time::Duration,
-};
-use text::Point;
-use util::{path, rel_path::rel_path, uri};
-use workspace::{CloseIntent, Workspace};
-
-#[gpui::test(iterations = 10)]
-async fn test_host_disconnect(
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-    cx_c: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(cx_a.executor()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    let client_c = server.create_client(cx_c, "user_c").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b), (&client_c, cx_c)])
-        .await;
-
-    cx_b.update(editor::init);
-    cx_b.update(recent_projects::init);
-
-    client_a
-        .fs()
-        .insert_tree(
-            "/a",
-            json!({
-                "a.txt": "a-contents",
-                "b.txt": "b-contents",
-            }),
-        )
-        .await;
-
-    let active_call_a = cx_a.read(ActiveCall::global);
-    let (project_a, worktree_id) = client_a.build_local_project("/a", cx_a).await;
-
-    let worktree_a = project_a.read_with(cx_a, |project, cx| project.worktrees(cx).next().unwrap());
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-    cx_a.background_executor.run_until_parked();
-
-    assert!(worktree_a.read_with(cx_a, |tree, _| tree.has_update_observer()));
-
-    let workspace_b = cx_b.add_window(|window, cx| {
-        Workspace::new(
-            None,
-            project_b.clone(),
-            client_b.app_state.clone(),
-            window,
-            cx,
-        )
-    });
-    let cx_b = &mut VisualTestContext::from_window(*workspace_b, cx_b);
-    let workspace_b_view = workspace_b.root(cx_b).unwrap();
-
-    let editor_b = workspace_b
-        .update(cx_b, |workspace, window, cx| {
-            workspace.open_path((worktree_id, rel_path("b.txt")), None, true, window, cx)
-        })
-        .unwrap()
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-
-    //TODO: focus
-    assert!(cx_b.update_window_entity(&editor_b, |editor, window, _| editor.is_focused(window)));
-    editor_b.update_in(cx_b, |editor, window, cx| editor.insert("X", window, cx));
-
-    cx_b.update(|_, cx| {
-        assert!(workspace_b_view.read(cx).is_edited());
-    });
-
-    // Drop client A's connection. Collaborators should disappear and the project should not be shown as shared.
-    server.forbid_connections();
-    server.disconnect_client(client_a.peer_id().unwrap());
-    cx_a.background_executor
-        .advance_clock(RECEIVE_TIMEOUT + RECONNECT_TIMEOUT);
-
-    project_a.read_with(cx_a, |project, _| project.collaborators().is_empty());
-
-    project_a.read_with(cx_a, |project, _| assert!(!project.is_shared()));
-
-    project_b.read_with(cx_b, |project, cx| project.is_read_only(cx));
-
-    assert!(worktree_a.read_with(cx_a, |tree, _| !tree.has_update_observer()));
-
-    // Ensure client B's edited state is reset and that the whole window is blurred.
-    workspace_b
-        .update(cx_b, |workspace, _, cx| {
-            assert!(workspace.active_modal::<DisconnectedOverlay>(cx).is_some());
-            assert!(!workspace.is_edited());
-        })
-        .unwrap();
-
-    // Ensure client B is not prompted to save edits when closing window after disconnecting.
-    let can_close = workspace_b
-        .update(cx_b, |workspace, window, cx| {
-            workspace.prepare_to_close(CloseIntent::Quit, window, cx)
-        })
-        .unwrap()
-        .await
-        .unwrap();
-    assert!(can_close);
-
-    // Allow client A to reconnect to the server.
-    server.allow_connections();
-    cx_a.background_executor.advance_clock(RECEIVE_TIMEOUT);
-
-    // Client B calls client A again after they reconnected.
-    let active_call_b = cx_b.read(ActiveCall::global);
-    active_call_b
-        .update(cx_b, |call, cx| {
-            call.invite(client_a.user_id().unwrap(), None, cx)
-        })
-        .await
-        .unwrap();
-    cx_a.background_executor.run_until_parked();
-    active_call_a
-        .update(cx_a, |call, cx| call.accept_incoming(cx))
-        .await
-        .unwrap();
-
-    active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-
-    // Drop client A's connection again. We should still unshare it successfully.
-    server.forbid_connections();
-    server.disconnect_client(client_a.peer_id().unwrap());
-    cx_a.background_executor
-        .advance_clock(RECEIVE_TIMEOUT + RECONNECT_TIMEOUT);
-
-    project_a.read_with(cx_a, |project, _| assert!(!project.is_shared()));
-}
-
-#[gpui::test]
-async fn test_newline_above_or_below_does_not_move_guest_cursor(
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(cx_a.executor()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    let executor = cx_a.executor();
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-
-    client_a
-        .fs()
-        .insert_tree(path!("/dir"), json!({ "a.txt": "Some text\n" }))
-        .await;
-    let (project_a, worktree_id) = client_a.build_local_project(path!("/dir"), cx_a).await;
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-
-    // Open a buffer as client A
-    let buffer_a = project_a
-        .update(cx_a, |p, cx| {
-            p.open_buffer((worktree_id, rel_path("a.txt")), cx)
-        })
-        .await
-        .unwrap();
-    let cx_a = cx_a.add_empty_window();
-    let editor_a = cx_a
-        .new_window_entity(|window, cx| Editor::for_buffer(buffer_a, Some(project_a), window, cx));
-
-    let mut editor_cx_a = EditorTestContext {
-        cx: cx_a.clone(),
-        window: cx_a.window_handle(),
-        editor: editor_a,
-        assertion_cx: AssertionContextManager::new(),
-    };
-
-    let cx_b = cx_b.add_empty_window();
-    // Open a buffer as client B
-    let buffer_b = project_b
-        .update(cx_b, |p, cx| {
-            p.open_buffer((worktree_id, rel_path("a.txt")), cx)
-        })
-        .await
-        .unwrap();
-    let editor_b = cx_b
-        .new_window_entity(|window, cx| Editor::for_buffer(buffer_b, Some(project_b), window, cx));
-
-    let mut editor_cx_b = EditorTestContext {
-        cx: cx_b.clone(),
-        window: cx_b.window_handle(),
-        editor: editor_b,
-        assertion_cx: AssertionContextManager::new(),
-    };
-
-    // Test newline above
-    editor_cx_a.set_selections_state(indoc! {"
-        Some textˇ
-    "});
-    editor_cx_b.set_selections_state(indoc! {"
-        Some textˇ
-    "});
-    editor_cx_a.update_editor(|editor, window, cx| {
-        editor.newline_above(&editor::actions::NewlineAbove, window, cx)
-    });
-    executor.run_until_parked();
-    editor_cx_a.assert_editor_state(indoc! {"
-        ˇ
-        Some text
-    "});
-    editor_cx_b.assert_editor_state(indoc! {"
-
-        Some textˇ
-    "});
-
-    // Test newline below
-    editor_cx_a.set_selections_state(indoc! {"
-
-        Some textˇ
-    "});
-    editor_cx_b.set_selections_state(indoc! {"
-
-        Some textˇ
-    "});
-    editor_cx_a.update_editor(|editor, window, cx| {
-        editor.newline_below(&editor::actions::NewlineBelow, window, cx)
-    });
-    executor.run_until_parked();
-    editor_cx_a.assert_editor_state(indoc! {"
-
-        Some text
-        ˇ
-    "});
-    editor_cx_b.assert_editor_state(indoc! {"
-
-        Some textˇ
-
-    "});
-}
-
-#[gpui::test]
-async fn test_collaborating_with_completion(cx_a: &mut TestAppContext, cx_b: &mut TestAppContext) {
-    let mut server = TestServer::start(cx_a.executor()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-
-    let capabilities = lsp::ServerCapabilities {
-        completion_provider: Some(lsp::CompletionOptions {
-            trigger_characters: Some(vec![".".to_string()]),
-            resolve_provider: Some(true),
-            ..lsp::CompletionOptions::default()
-        }),
-        ..lsp::ServerCapabilities::default()
-    };
-    client_a.language_registry().add(rust_lang());
-    let mut fake_language_servers = [
-        client_a.language_registry().register_fake_lsp(
-            "Rust",
-            FakeLspAdapter {
-                capabilities: capabilities.clone(),
-                ..FakeLspAdapter::default()
-            },
-        ),
-        client_a.language_registry().register_fake_lsp(
-            "Rust",
-            FakeLspAdapter {
-                name: "fake-analyzer",
-                capabilities: capabilities.clone(),
-                ..FakeLspAdapter::default()
-            },
-        ),
-    ];
-    client_b.language_registry().add(rust_lang());
-    client_b.language_registry().register_fake_lsp_adapter(
-        "Rust",
-        FakeLspAdapter {
-            capabilities: capabilities.clone(),
-            ..FakeLspAdapter::default()
-        },
-    );
-    client_b.language_registry().register_fake_lsp_adapter(
-        "Rust",
-        FakeLspAdapter {
-            name: "fake-analyzer",
-            capabilities,
-            ..FakeLspAdapter::default()
-        },
-    );
-
-    client_a
-        .fs()
-        .insert_tree(
-            path!("/a"),
-            json!({
-                "main.rs": "fn main() { a }",
-                "other.rs": "",
-            }),
-        )
-        .await;
-    let (project_a, worktree_id) = client_a.build_local_project(path!("/a"), cx_a).await;
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-
-    // Open a file in an editor as the guest.
-    let buffer_b = project_b
-        .update(cx_b, |p, cx| {
-            p.open_buffer((worktree_id, rel_path("main.rs")), cx)
-        })
-        .await
-        .unwrap();
-    let cx_b = cx_b.add_empty_window();
-    let editor_b = cx_b.new_window_entity(|window, cx| {
-        Editor::for_buffer(buffer_b.clone(), Some(project_b.clone()), window, cx)
-    });
-
-    let fake_language_server = fake_language_servers[0].next().await.unwrap();
-    let second_fake_language_server = fake_language_servers[1].next().await.unwrap();
-    cx_a.background_executor.run_until_parked();
-
-    buffer_b.read_with(cx_b, |buffer, _| {
-        assert!(!buffer.completion_triggers().is_empty())
-    });
-
-    // Type a completion trigger character as the guest.
-    editor_b.update_in(cx_b, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([MultiBufferOffset(13)..MultiBufferOffset(13)])
-        });
-        editor.handle_input(".", window, cx);
-    });
-    cx_b.focus(&editor_b);
-
-    // Receive a completion request as the host's language server.
-    // Return some completions from the host's language server.
-    cx_a.executor().start_waiting();
-    fake_language_server
-        .set_request_handler::<lsp::request::Completion, _, _>(|params, _| async move {
-            assert_eq!(
-                params.text_document_position.text_document.uri,
-                lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap(),
-            );
-            assert_eq!(
-                params.text_document_position.position,
-                lsp::Position::new(0, 14),
-            );
-
-            Ok(Some(lsp::CompletionResponse::Array(vec![
-                lsp::CompletionItem {
-                    label: "first_method(…)".into(),
-                    detail: Some("fn(&mut self, B) -> C".into()),
-                    text_edit: Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
-                        new_text: "first_method($1)".to_string(),
-                        range: lsp::Range::new(
-                            lsp::Position::new(0, 14),
-                            lsp::Position::new(0, 14),
-                        ),
-                    })),
-                    insert_text_format: Some(lsp::InsertTextFormat::SNIPPET),
-                    ..Default::default()
-                },
-                lsp::CompletionItem {
-                    label: "second_method(…)".into(),
-                    detail: Some("fn(&mut self, C) -> D<E>".into()),
-                    text_edit: Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
-                        new_text: "second_method()".to_string(),
-                        range: lsp::Range::new(
-                            lsp::Position::new(0, 14),
-                            lsp::Position::new(0, 14),
-                        ),
-                    })),
-                    insert_text_format: Some(lsp::InsertTextFormat::SNIPPET),
-                    ..Default::default()
-                },
-            ])))
-        })
-        .next()
-        .await
-        .unwrap();
-    second_fake_language_server
-        .set_request_handler::<lsp::request::Completion, _, _>(|_, _| async move { Ok(None) })
-        .next()
-        .await
-        .unwrap();
-    cx_a.executor().finish_waiting();
-
-    // Open the buffer on the host.
-    let buffer_a = project_a
-        .update(cx_a, |p, cx| {
-            p.open_buffer((worktree_id, rel_path("main.rs")), cx)
-        })
-        .await
-        .unwrap();
-    cx_a.executor().run_until_parked();
-
-    buffer_a.read_with(cx_a, |buffer, _| {
-        assert_eq!(buffer.text(), "fn main() { a. }")
-    });
-
-    // Confirm a completion on the guest.
-    editor_b.update_in(cx_b, |editor, window, cx| {
-        assert!(editor.context_menu_visible());
-        editor.confirm_completion(&ConfirmCompletion { item_ix: Some(0) }, window, cx);
-        assert_eq!(editor.text(cx), "fn main() { a.first_method() }");
-    });
-
-    // Return a resolved completion from the host's language server.
-    // The resolved completion has an additional text edit.
-    fake_language_server.set_request_handler::<lsp::request::ResolveCompletionItem, _, _>(
-        |params, _| async move {
-            assert_eq!(params.label, "first_method(…)");
-            Ok(lsp::CompletionItem {
-                label: "first_method(…)".into(),
-                detail: Some("fn(&mut self, B) -> C".into()),
-                text_edit: Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
-                    new_text: "first_method($1)".to_string(),
-                    range: lsp::Range::new(lsp::Position::new(0, 14), lsp::Position::new(0, 14)),
-                })),
-                additional_text_edits: Some(vec![lsp::TextEdit {
-                    new_text: "use d::SomeTrait;\n".to_string(),
-                    range: lsp::Range::new(lsp::Position::new(0, 0), lsp::Position::new(0, 0)),
-                }]),
-                insert_text_format: Some(lsp::InsertTextFormat::SNIPPET),
-                ..Default::default()
-            })
-        },
-    );
-
-    // The additional edit is applied.
-    cx_a.executor().run_until_parked();
-
-    buffer_a.read_with(cx_a, |buffer, _| {
-        assert_eq!(
-            buffer.text(),
-            "use d::SomeTrait;\nfn main() { a.first_method() }"
-        );
-    });
-
-    buffer_b.read_with(cx_b, |buffer, _| {
-        assert_eq!(
-            buffer.text(),
-            "use d::SomeTrait;\nfn main() { a.first_method() }"
-        );
-    });
-
-    // Now we do a second completion, this time to ensure that documentation/snippets are
-    // resolved
-    editor_b.update_in(cx_b, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([MultiBufferOffset(46)..MultiBufferOffset(46)])
-        });
-        editor.handle_input("; a", window, cx);
-        editor.handle_input(".", window, cx);
-    });
-
-    buffer_b.read_with(cx_b, |buffer, _| {
-        assert_eq!(
-            buffer.text(),
-            "use d::SomeTrait;\nfn main() { a.first_method(); a. }"
-        );
-    });
-
-    let mut completion_response = fake_language_server
-        .set_request_handler::<lsp::request::Completion, _, _>(|params, _| async move {
-            assert_eq!(
-                params.text_document_position.text_document.uri,
-                lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap(),
-            );
-            assert_eq!(
-                params.text_document_position.position,
-                lsp::Position::new(1, 32),
-            );
-
-            Ok(Some(lsp::CompletionResponse::Array(vec![
-                lsp::CompletionItem {
-                    label: "third_method(…)".into(),
-                    detail: Some("fn(&mut self, B, C, D) -> E".into()),
-                    text_edit: Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
-                        // no snippet placeholders
-                        new_text: "third_method".to_string(),
-                        range: lsp::Range::new(
-                            lsp::Position::new(1, 32),
-                            lsp::Position::new(1, 32),
-                        ),
-                    })),
-                    insert_text_format: Some(lsp::InsertTextFormat::SNIPPET),
-                    documentation: None,
-                    ..Default::default()
-                },
-            ])))
-        });
-
-    // Second language server also needs to handle the request (returns None)
-    let mut second_completion_response = second_fake_language_server
-        .set_request_handler::<lsp::request::Completion, _, _>(|_, _| async move { Ok(None) });
-
-    // The completion now gets a new `text_edit.new_text` when resolving the completion item
-    let mut resolve_completion_response = fake_language_server
-        .set_request_handler::<lsp::request::ResolveCompletionItem, _, _>(|params, _| async move {
-            assert_eq!(params.label, "third_method(…)");
-            Ok(lsp::CompletionItem {
-                label: "third_method(…)".into(),
-                detail: Some("fn(&mut self, B, C, D) -> E".into()),
-                text_edit: Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
-                    // Now it's a snippet
-                    new_text: "third_method($1, $2, $3)".to_string(),
-                    range: lsp::Range::new(lsp::Position::new(1, 32), lsp::Position::new(1, 32)),
-                })),
-                insert_text_format: Some(lsp::InsertTextFormat::SNIPPET),
-                documentation: Some(lsp::Documentation::String(
-                    "this is the documentation".into(),
-                )),
-                ..Default::default()
-            })
-        });
-
-    cx_b.executor().run_until_parked();
-
-    completion_response.next().await.unwrap();
-    second_completion_response.next().await.unwrap();
-
-    editor_b.update_in(cx_b, |editor, window, cx| {
-        assert!(editor.context_menu_visible());
-        editor.context_menu_first(&ContextMenuFirst {}, window, cx);
-    });
-
-    resolve_completion_response.next().await.unwrap();
-    cx_b.executor().run_until_parked();
-
-    // When accepting the completion, the snippet is insert.
-    editor_b.update_in(cx_b, |editor, window, cx| {
-        assert!(editor.context_menu_visible());
-        editor.confirm_completion(&ConfirmCompletion { item_ix: Some(0) }, window, cx);
-        assert_eq!(
-            editor.text(cx),
-            "use d::SomeTrait;\nfn main() { a.first_method(); a.third_method(, , ) }"
-        );
-    });
-
-    // Ensure buffer is synced before proceeding with the next test
-    cx_a.executor().run_until_parked();
-    cx_b.executor().run_until_parked();
-
-    // Test completions from the second fake language server
-    // Add another completion trigger to test the second language server
-    editor_b.update_in(cx_b, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([MultiBufferOffset(68)..MultiBufferOffset(68)])
-        });
-        editor.handle_input("; b", window, cx);
-        editor.handle_input(".", window, cx);
-    });
-
-    buffer_b.read_with(cx_b, |buffer, _| {
-        assert_eq!(
-            buffer.text(),
-            "use d::SomeTrait;\nfn main() { a.first_method(); a.third_method(, , ); b. }"
-        );
-    });
-
-    // Set up completion handlers for both language servers
-    let mut first_lsp_completion = fake_language_server
-        .set_request_handler::<lsp::request::Completion, _, _>(|_, _| async move { Ok(None) });
-
-    let mut second_lsp_completion = second_fake_language_server
-        .set_request_handler::<lsp::request::Completion, _, _>(|params, _| async move {
-            assert_eq!(
-                params.text_document_position.text_document.uri,
-                lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap(),
-            );
-            assert_eq!(
-                params.text_document_position.position,
-                lsp::Position::new(1, 54),
-            );
-
-            Ok(Some(lsp::CompletionResponse::Array(vec![
-                lsp::CompletionItem {
-                    label: "analyzer_method(…)".into(),
-                    detail: Some("fn(&self) -> Result<T>".into()),
-                    text_edit: Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
-                        new_text: "analyzer_method()".to_string(),
-                        range: lsp::Range::new(
-                            lsp::Position::new(1, 54),
-                            lsp::Position::new(1, 54),
-                        ),
-                    })),
-                    insert_text_format: Some(lsp::InsertTextFormat::SNIPPET),
-                    ..Default::default()
-                },
-            ])))
-        });
-
-    cx_b.executor().run_until_parked();
-
-    // Await both language server responses
-    first_lsp_completion.next().await.unwrap();
-    second_lsp_completion.next().await.unwrap();
-
-    cx_b.executor().run_until_parked();
-
-    // Confirm the completion from the second language server works
-    editor_b.update_in(cx_b, |editor, window, cx| {
-        assert!(editor.context_menu_visible());
-        editor.confirm_completion(&ConfirmCompletion { item_ix: Some(0) }, window, cx);
-        assert_eq!(
-            editor.text(cx),
-            "use d::SomeTrait;\nfn main() { a.first_method(); a.third_method(, , ); b.analyzer_method() }"
-        );
-    });
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_collaborating_with_code_actions(
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(cx_a.executor()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    //
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-
-    cx_b.update(editor::init);
-
-    client_a.language_registry().add(rust_lang());
-    let mut fake_language_servers = client_a
-        .language_registry()
-        .register_fake_lsp("Rust", FakeLspAdapter::default());
-    client_b.language_registry().add(rust_lang());
-    client_b
-        .language_registry()
-        .register_fake_lsp("Rust", FakeLspAdapter::default());
-
-    client_a
-        .fs()
-        .insert_tree(
-            path!("/a"),
-            json!({
-                "main.rs": "mod other;\nfn main() { let foo = other::foo(); }",
-                "other.rs": "pub fn foo() -> usize { 4 }",
-            }),
-        )
-        .await;
-    let (project_a, worktree_id) = client_a.build_local_project(path!("/a"), cx_a).await;
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-
-    // Join the project as client B.
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-    let (workspace_b, cx_b) = client_b.build_workspace(&project_b, cx_b);
-    let editor_b = workspace_b
-        .update_in(cx_b, |workspace, window, cx| {
-            workspace.open_path((worktree_id, rel_path("main.rs")), None, true, window, cx)
-        })
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-
-    let mut fake_language_server = fake_language_servers.next().await.unwrap();
-    let mut requests = fake_language_server
-        .set_request_handler::<lsp::request::CodeActionRequest, _, _>(|params, _| async move {
-            assert_eq!(
-                params.text_document.uri,
-                lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap(),
-            );
-            assert_eq!(params.range.start, lsp::Position::new(0, 0));
-            assert_eq!(params.range.end, lsp::Position::new(0, 0));
-            Ok(None)
-        });
-    cx_a.background_executor
-        .advance_clock(editor::CODE_ACTIONS_DEBOUNCE_TIMEOUT * 2);
-    requests.next().await;
-
-    // Move cursor to a location that contains code actions.
-    editor_b.update_in(cx_b, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([Point::new(1, 31)..Point::new(1, 31)])
-        });
-    });
-    cx_b.focus(&editor_b);
-
-    let mut requests = fake_language_server
-        .set_request_handler::<lsp::request::CodeActionRequest, _, _>(|params, _| async move {
-            assert_eq!(
-                params.text_document.uri,
-                lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap(),
-            );
-            assert_eq!(params.range.start, lsp::Position::new(1, 31));
-            assert_eq!(params.range.end, lsp::Position::new(1, 31));
-
-            Ok(Some(vec![lsp::CodeActionOrCommand::CodeAction(
-                lsp::CodeAction {
-                    title: "Inline into all callers".to_string(),
-                    edit: Some(lsp::WorkspaceEdit {
-                        changes: Some(
-                            [
-                                (
-                                    lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap(),
-                                    vec![lsp::TextEdit::new(
-                                        lsp::Range::new(
-                                            lsp::Position::new(1, 22),
-                                            lsp::Position::new(1, 34),
-                                        ),
-                                        "4".to_string(),
-                                    )],
-                                ),
-                                (
-                                    lsp::Uri::from_file_path(path!("/a/other.rs")).unwrap(),
-                                    vec![lsp::TextEdit::new(
-                                        lsp::Range::new(
-                                            lsp::Position::new(0, 0),
-                                            lsp::Position::new(0, 27),
-                                        ),
-                                        "".to_string(),
-                                    )],
-                                ),
-                            ]
-                            .into_iter()
-                            .collect(),
-                        ),
-                        ..Default::default()
-                    }),
-                    data: Some(json!({
-                        "codeActionParams": {
-                            "range": {
-                                "start": {"line": 1, "column": 31},
-                                "end": {"line": 1, "column": 31},
-                            }
-                        }
-                    })),
-                    ..Default::default()
-                },
-            )]))
-        });
-    cx_a.background_executor
-        .advance_clock(editor::CODE_ACTIONS_DEBOUNCE_TIMEOUT * 2);
-    requests.next().await;
-
-    // Toggle code actions and wait for them to display.
-    editor_b.update_in(cx_b, |editor, window, cx| {
-        editor.toggle_code_actions(
-            &ToggleCodeActions {
-                deployed_from: None,
-                quick_launch: false,
-            },
-            window,
-            cx,
-        );
-    });
-    cx_a.background_executor.run_until_parked();
-
-    editor_b.update(cx_b, |editor, _| assert!(editor.context_menu_visible()));
-
-    fake_language_server.remove_request_handler::<lsp::request::CodeActionRequest>();
-
-    // Confirming the code action will trigger a resolve request.
-    let confirm_action = editor_b
-        .update_in(cx_b, |editor, window, cx| {
-            Editor::confirm_code_action(editor, &ConfirmCodeAction { item_ix: Some(0) }, window, cx)
-        })
-        .unwrap();
-    fake_language_server.set_request_handler::<lsp::request::CodeActionResolveRequest, _, _>(
-        |_, _| async move {
-            Ok(lsp::CodeAction {
-                title: "Inline into all callers".to_string(),
-                edit: Some(lsp::WorkspaceEdit {
-                    changes: Some(
-                        [
-                            (
-                                lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap(),
-                                vec![lsp::TextEdit::new(
-                                    lsp::Range::new(
-                                        lsp::Position::new(1, 22),
-                                        lsp::Position::new(1, 34),
-                                    ),
-                                    "4".to_string(),
-                                )],
-                            ),
-                            (
-                                lsp::Uri::from_file_path(path!("/a/other.rs")).unwrap(),
-                                vec![lsp::TextEdit::new(
-                                    lsp::Range::new(
-                                        lsp::Position::new(0, 0),
-                                        lsp::Position::new(0, 27),
-                                    ),
-                                    "".to_string(),
-                                )],
-                            ),
-                        ]
-                        .into_iter()
-                        .collect(),
-                    ),
-                    ..Default::default()
-                }),
-                ..Default::default()
-            })
-        },
-    );
-
-    // After the action is confirmed, an editor containing both modified files is opened.
-    confirm_action.await.unwrap();
-
-    let code_action_editor = workspace_b.update(cx_b, |workspace, cx| {
-        workspace
-            .active_item(cx)
-            .unwrap()
-            .downcast::<Editor>()
-            .unwrap()
-    });
-    code_action_editor.update_in(cx_b, |editor, window, cx| {
-        assert_eq!(editor.text(cx), "mod other;\nfn main() { let foo = 4; }\n");
-        editor.undo(&Undo, window, cx);
-        assert_eq!(
-            editor.text(cx),
-            "mod other;\nfn main() { let foo = other::foo(); }\npub fn foo() -> usize { 4 }"
-        );
-        editor.redo(&Redo, window, cx);
-        assert_eq!(editor.text(cx), "mod other;\nfn main() { let foo = 4; }\n");
-    });
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_collaborating_with_renames(cx_a: &mut TestAppContext, cx_b: &mut TestAppContext) {
-    let mut server = TestServer::start(cx_a.executor()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-
-    cx_b.update(editor::init);
-
-    let capabilities = lsp::ServerCapabilities {
-        rename_provider: Some(lsp::OneOf::Right(lsp::RenameOptions {
-            prepare_provider: Some(true),
-            work_done_progress_options: Default::default(),
-        })),
-        ..lsp::ServerCapabilities::default()
-    };
-    client_a.language_registry().add(rust_lang());
-    let mut fake_language_servers = client_a.language_registry().register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            capabilities: capabilities.clone(),
-            ..FakeLspAdapter::default()
-        },
-    );
-    client_b.language_registry().add(rust_lang());
-    client_b.language_registry().register_fake_lsp_adapter(
-        "Rust",
-        FakeLspAdapter {
-            capabilities,
-            ..FakeLspAdapter::default()
-        },
-    );
-
-    client_a
-        .fs()
-        .insert_tree(
-            path!("/dir"),
-            json!({
-                "one.rs": "const ONE: usize = 1;",
-                "two.rs": "const TWO: usize = one::ONE + one::ONE;"
-            }),
-        )
-        .await;
-    let (project_a, worktree_id) = client_a.build_local_project(path!("/dir"), cx_a).await;
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-
-    let (workspace_b, cx_b) = client_b.build_workspace(&project_b, cx_b);
-    let editor_b = workspace_b
-        .update_in(cx_b, |workspace, window, cx| {
-            workspace.open_path((worktree_id, rel_path("one.rs")), None, true, window, cx)
-        })
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-    let fake_language_server = fake_language_servers.next().await.unwrap();
-    cx_a.run_until_parked();
-    cx_b.run_until_parked();
-
-    // Move cursor to a location that can be renamed.
-    let prepare_rename = editor_b.update_in(cx_b, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([MultiBufferOffset(7)..MultiBufferOffset(7)])
-        });
-        editor.rename(&Rename, window, cx).unwrap()
-    });
-
-    fake_language_server
-        .set_request_handler::<lsp::request::PrepareRenameRequest, _, _>(|params, _| async move {
-            assert_eq!(
-                params.text_document.uri.as_str(),
-                uri!("file:///dir/one.rs")
-            );
-            assert_eq!(params.position, lsp::Position::new(0, 7));
-            Ok(Some(lsp::PrepareRenameResponse::Range(lsp::Range::new(
-                lsp::Position::new(0, 6),
-                lsp::Position::new(0, 9),
-            ))))
-        })
-        .next()
-        .await
-        .unwrap();
-    prepare_rename.await.unwrap();
-    editor_b.update(cx_b, |editor, cx| {
-        use editor::ToOffset;
-        let rename = editor.pending_rename().unwrap();
-        let buffer = editor.buffer().read(cx).snapshot(cx);
-        assert_eq!(
-            rename.range.start.to_offset(&buffer)..rename.range.end.to_offset(&buffer),
-            MultiBufferOffset(6)..MultiBufferOffset(9)
-        );
-        rename.editor.update(cx, |rename_editor, cx| {
-            let rename_selection = rename_editor.selections.newest::<MultiBufferOffset>(&rename_editor.display_snapshot(cx));
-            assert_eq!(
-                rename_selection.range(),
-                MultiBufferOffset(0)..MultiBufferOffset(3),
-                "Rename that was triggered from zero selection caret, should propose the whole word."
-            );
-            rename_editor.buffer().update(cx, |rename_buffer, cx| {
-                rename_buffer.edit([(MultiBufferOffset(0)..MultiBufferOffset(3), "THREE")], None, cx);
-            });
-        });
-    });
-
-    // Cancel the rename, and repeat the same, but use selections instead of cursor movement
-    editor_b.update_in(cx_b, |editor, window, cx| {
-        editor.cancel(&editor::actions::Cancel, window, cx);
-    });
-    let prepare_rename = editor_b.update_in(cx_b, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([MultiBufferOffset(7)..MultiBufferOffset(8)])
-        });
-        editor.rename(&Rename, window, cx).unwrap()
-    });
-
-    fake_language_server
-        .set_request_handler::<lsp::request::PrepareRenameRequest, _, _>(|params, _| async move {
-            assert_eq!(
-                params.text_document.uri.as_str(),
-                uri!("file:///dir/one.rs")
-            );
-            assert_eq!(params.position, lsp::Position::new(0, 8));
-            Ok(Some(lsp::PrepareRenameResponse::Range(lsp::Range::new(
-                lsp::Position::new(0, 6),
-                lsp::Position::new(0, 9),
-            ))))
-        })
-        .next()
-        .await
-        .unwrap();
-    prepare_rename.await.unwrap();
-    editor_b.update(cx_b, |editor, cx| {
-        use editor::ToOffset;
-        let rename = editor.pending_rename().unwrap();
-        let buffer = editor.buffer().read(cx).snapshot(cx);
-        let lsp_rename_start = rename.range.start.to_offset(&buffer);
-        let lsp_rename_end = rename.range.end.to_offset(&buffer);
-        assert_eq!(lsp_rename_start..lsp_rename_end, MultiBufferOffset(6)..MultiBufferOffset(9));
-        rename.editor.update(cx, |rename_editor, cx| {
-            let rename_selection = rename_editor.selections.newest::<MultiBufferOffset>(&rename_editor.display_snapshot(cx));
-            assert_eq!(
-                rename_selection.range(),
-                MultiBufferOffset(1)..MultiBufferOffset(2),
-                "Rename that was triggered from a selection, should have the same selection range in the rename proposal"
-            );
-            rename_editor.buffer().update(cx, |rename_buffer, cx| {
-                rename_buffer.edit([(MultiBufferOffset(0)..MultiBufferOffset(lsp_rename_end - lsp_rename_start), "THREE")], None, cx);
-            });
-        });
-    });
-
-    let confirm_rename = editor_b.update_in(cx_b, |editor, window, cx| {
-        Editor::confirm_rename(editor, &ConfirmRename, window, cx).unwrap()
-    });
-    fake_language_server
-        .set_request_handler::<lsp::request::Rename, _, _>(|params, _| async move {
-            assert_eq!(
-                params.text_document_position.text_document.uri.as_str(),
-                uri!("file:///dir/one.rs")
-            );
-            assert_eq!(
-                params.text_document_position.position,
-                lsp::Position::new(0, 6)
-            );
-            assert_eq!(params.new_name, "THREE");
-            Ok(Some(lsp::WorkspaceEdit {
-                changes: Some(
-                    [
-                        (
-                            lsp::Uri::from_file_path(path!("/dir/one.rs")).unwrap(),
-                            vec![lsp::TextEdit::new(
-                                lsp::Range::new(lsp::Position::new(0, 6), lsp::Position::new(0, 9)),
-                                "THREE".to_string(),
-                            )],
-                        ),
-                        (
-                            lsp::Uri::from_file_path(path!("/dir/two.rs")).unwrap(),
-                            vec![
-                                lsp::TextEdit::new(
-                                    lsp::Range::new(
-                                        lsp::Position::new(0, 24),
-                                        lsp::Position::new(0, 27),
-                                    ),
-                                    "THREE".to_string(),
-                                ),
-                                lsp::TextEdit::new(
-                                    lsp::Range::new(
-                                        lsp::Position::new(0, 35),
-                                        lsp::Position::new(0, 38),
-                                    ),
-                                    "THREE".to_string(),
-                                ),
-                            ],
-                        ),
-                    ]
-                    .into_iter()
-                    .collect(),
-                ),
-                ..Default::default()
-            }))
-        })
-        .next()
-        .await
-        .unwrap();
-    confirm_rename.await.unwrap();
-
-    let rename_editor = workspace_b.update(cx_b, |workspace, cx| {
-        workspace.active_item_as::<Editor>(cx).unwrap()
-    });
-
-    rename_editor.update_in(cx_b, |editor, window, cx| {
-        assert_eq!(
-            editor.text(cx),
-            "const THREE: usize = 1;\nconst TWO: usize = one::THREE + one::THREE;"
-        );
-        editor.undo(&Undo, window, cx);
-        assert_eq!(
-            editor.text(cx),
-            "const ONE: usize = 1;\nconst TWO: usize = one::ONE + one::ONE;"
-        );
-        editor.redo(&Redo, window, cx);
-        assert_eq!(
-            editor.text(cx),
-            "const THREE: usize = 1;\nconst TWO: usize = one::THREE + one::THREE;"
-        );
-    });
-
-    // Ensure temporary rename edits cannot be undone/redone.
-    editor_b.update_in(cx_b, |editor, window, cx| {
-        editor.undo(&Undo, window, cx);
-        assert_eq!(editor.text(cx), "const ONE: usize = 1;");
-        editor.undo(&Undo, window, cx);
-        assert_eq!(editor.text(cx), "const ONE: usize = 1;");
-        editor.redo(&Redo, window, cx);
-        assert_eq!(editor.text(cx), "const THREE: usize = 1;");
-    })
-}
-
-#[gpui::test]
-async fn test_slow_lsp_server(cx_a: &mut TestAppContext, cx_b: &mut TestAppContext) {
-    let mut server = TestServer::start(cx_a.executor()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-    cx_b.update(editor::init);
-
-    let command_name = "test_command";
-    let capabilities = lsp::ServerCapabilities {
-        code_lens_provider: Some(lsp::CodeLensOptions {
-            resolve_provider: None,
-        }),
-        execute_command_provider: Some(lsp::ExecuteCommandOptions {
-            commands: vec![command_name.to_string()],
-            ..lsp::ExecuteCommandOptions::default()
-        }),
-        ..lsp::ServerCapabilities::default()
-    };
-    client_a.language_registry().add(rust_lang());
-    let mut fake_language_servers = client_a.language_registry().register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            capabilities: capabilities.clone(),
-            ..FakeLspAdapter::default()
-        },
-    );
-    client_b.language_registry().add(rust_lang());
-    client_b.language_registry().register_fake_lsp_adapter(
-        "Rust",
-        FakeLspAdapter {
-            capabilities,
-            ..FakeLspAdapter::default()
-        },
-    );
-
-    client_a
-        .fs()
-        .insert_tree(
-            path!("/dir"),
-            json!({
-                "one.rs": "const ONE: usize = 1;"
-            }),
-        )
-        .await;
-    let (project_a, worktree_id) = client_a.build_local_project(path!("/dir"), cx_a).await;
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-
-    let (workspace_b, cx_b) = client_b.build_workspace(&project_b, cx_b);
-    let editor_b = workspace_b
-        .update_in(cx_b, |workspace, window, cx| {
-            workspace.open_path((worktree_id, rel_path("one.rs")), None, true, window, cx)
-        })
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-    let (lsp_store_b, buffer_b) = editor_b.update(cx_b, |editor, cx| {
-        let lsp_store = editor.project().unwrap().read(cx).lsp_store();
-        let buffer = editor.buffer().read(cx).as_singleton().unwrap();
-        (lsp_store, buffer)
-    });
-    let fake_language_server = fake_language_servers.next().await.unwrap();
-    cx_a.run_until_parked();
-    cx_b.run_until_parked();
-
-    let long_request_time = LSP_REQUEST_TIMEOUT / 2;
-    let (request_started_tx, mut request_started_rx) = mpsc::unbounded();
-    let requests_started = Arc::new(AtomicUsize::new(0));
-    let requests_completed = Arc::new(AtomicUsize::new(0));
-    let _lens_requests = fake_language_server
-        .set_request_handler::<lsp::request::CodeLensRequest, _, _>({
-            let request_started_tx = request_started_tx.clone();
-            let requests_started = requests_started.clone();
-            let requests_completed = requests_completed.clone();
-            move |params, cx| {
-                let mut request_started_tx = request_started_tx.clone();
-                let requests_started = requests_started.clone();
-                let requests_completed = requests_completed.clone();
-                async move {
-                    assert_eq!(
-                        params.text_document.uri.as_str(),
-                        uri!("file:///dir/one.rs")
-                    );
-                    requests_started.fetch_add(1, atomic::Ordering::Release);
-                    request_started_tx.send(()).await.unwrap();
-                    cx.background_executor().timer(long_request_time).await;
-                    let i = requests_completed.fetch_add(1, atomic::Ordering::Release) + 1;
-                    Ok(Some(vec![lsp::CodeLens {
-                        range: lsp::Range::new(lsp::Position::new(0, 0), lsp::Position::new(0, 9)),
-                        command: Some(lsp::Command {
-                            title: format!("LSP Command {i}"),
-                            command: command_name.to_string(),
-                            arguments: None,
-                        }),
-                        data: None,
-                    }]))
-                }
-            }
-        });
-
-    // Move cursor to a location, this should trigger the code lens call.
-    editor_b.update_in(cx_b, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([MultiBufferOffset(7)..MultiBufferOffset(7)])
-        });
-    });
-    let () = request_started_rx.next().await.unwrap();
-    assert_eq!(
-        requests_started.load(atomic::Ordering::Acquire),
-        1,
-        "Selection change should have initiated the first request"
-    );
-    assert_eq!(
-        requests_completed.load(atomic::Ordering::Acquire),
-        0,
-        "Slow requests should be running still"
-    );
-    let _first_task = lsp_store_b.update(cx_b, |lsp_store, cx| {
-        lsp_store
-            .forget_code_lens_task(buffer_b.read(cx).remote_id())
-            .expect("Should have the fetch task started")
-    });
-
-    editor_b.update_in(cx_b, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([MultiBufferOffset(1)..MultiBufferOffset(1)])
-        });
-    });
-    let () = request_started_rx.next().await.unwrap();
-    assert_eq!(
-        requests_started.load(atomic::Ordering::Acquire),
-        2,
-        "Selection change should have initiated the second request"
-    );
-    assert_eq!(
-        requests_completed.load(atomic::Ordering::Acquire),
-        0,
-        "Slow requests should be running still"
-    );
-    let _second_task = lsp_store_b.update(cx_b, |lsp_store, cx| {
-        lsp_store
-            .forget_code_lens_task(buffer_b.read(cx).remote_id())
-            .expect("Should have the fetch task started for the 2nd time")
-    });
-
-    editor_b.update_in(cx_b, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([MultiBufferOffset(2)..MultiBufferOffset(2)])
-        });
-    });
-    let () = request_started_rx.next().await.unwrap();
-    assert_eq!(
-        requests_started.load(atomic::Ordering::Acquire),
-        3,
-        "Selection change should have initiated the third request"
-    );
-    assert_eq!(
-        requests_completed.load(atomic::Ordering::Acquire),
-        0,
-        "Slow requests should be running still"
-    );
-
-    _first_task.await.unwrap();
-    _second_task.await.unwrap();
-    cx_b.run_until_parked();
-    assert_eq!(
-        requests_started.load(atomic::Ordering::Acquire),
-        3,
-        "No selection changes should trigger no more code lens requests"
-    );
-    assert_eq!(
-        requests_completed.load(atomic::Ordering::Acquire),
-        3,
-        "After enough time, all 3 LSP requests should have been served by the language server"
-    );
-    let resulting_lens_actions = editor_b
-        .update(cx_b, |editor, cx| {
-            let lsp_store = editor.project().unwrap().read(cx).lsp_store();
-            lsp_store.update(cx, |lsp_store, cx| {
-                lsp_store.code_lens_actions(&buffer_b, cx)
-            })
-        })
-        .await
-        .unwrap()
-        .unwrap();
-    assert_eq!(
-        resulting_lens_actions.len(),
-        1,
-        "Should have fetched one code lens action, but got: {resulting_lens_actions:?}"
-    );
-    assert_eq!(
-        resulting_lens_actions.first().unwrap().lsp_action.title(),
-        "LSP Command 3",
-        "Only the final code lens action should be in the data"
-    )
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_language_server_statuses(cx_a: &mut TestAppContext, cx_b: &mut TestAppContext) {
-    let mut server = TestServer::start(cx_a.executor()).await;
-    let executor = cx_a.executor();
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-
-    cx_b.update(editor::init);
-
-    client_a.language_registry().add(rust_lang());
-    let mut fake_language_servers = client_a.language_registry().register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            name: "the-language-server",
-            ..Default::default()
-        },
-    );
-
-    client_a
-        .fs()
-        .insert_tree(
-            path!("/dir"),
-            json!({
-                "main.rs": "const ONE: usize = 1;",
-            }),
-        )
-        .await;
-    let (project_a, _) = client_a.build_local_project(path!("/dir"), cx_a).await;
-
-    let _buffer_a = project_a
-        .update(cx_a, |p, cx| {
-            p.open_local_buffer_with_lsp(path!("/dir/main.rs"), cx)
-        })
-        .await
-        .unwrap();
-
-    let fake_language_server = fake_language_servers.next().await.unwrap();
-    fake_language_server.start_progress("the-token").await;
-
-    executor.advance_clock(SERVER_PROGRESS_THROTTLE_TIMEOUT);
-    fake_language_server.notify::<lsp::notification::Progress>(lsp::ProgressParams {
-        token: lsp::NumberOrString::String("the-token".to_string()),
-        value: lsp::ProgressParamsValue::WorkDone(lsp::WorkDoneProgress::Report(
-            lsp::WorkDoneProgressReport {
-                message: Some("the-message".to_string()),
-                ..Default::default()
-            },
-        )),
-    });
-    executor.run_until_parked();
-
-    let token = ProgressToken::String(SharedString::from("the-token"));
-
-    project_a.read_with(cx_a, |project, cx| {
-        let status = project.language_server_statuses(cx).next().unwrap().1;
-        assert_eq!(status.name.0, "the-language-server");
-        assert_eq!(status.pending_work.len(), 1);
-        assert_eq!(
-            status.pending_work[&token].message.as_ref().unwrap(),
-            "the-message"
-        );
-    });
-
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-    executor.run_until_parked();
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-
-    project_b.read_with(cx_b, |project, cx| {
-        let status = project.language_server_statuses(cx).next().unwrap().1;
-        assert_eq!(status.name.0, "the-language-server");
-    });
-
-    executor.advance_clock(SERVER_PROGRESS_THROTTLE_TIMEOUT);
-    fake_language_server.notify::<lsp::notification::Progress>(lsp::ProgressParams {
-        token: lsp::NumberOrString::String("the-token".to_string()),
-        value: lsp::ProgressParamsValue::WorkDone(lsp::WorkDoneProgress::Report(
-            lsp::WorkDoneProgressReport {
-                message: Some("the-message-2".to_string()),
-                ..Default::default()
-            },
-        )),
-    });
-    executor.run_until_parked();
-
-    project_a.read_with(cx_a, |project, cx| {
-        let status = project.language_server_statuses(cx).next().unwrap().1;
-        assert_eq!(status.name.0, "the-language-server");
-        assert_eq!(status.pending_work.len(), 1);
-        assert_eq!(
-            status.pending_work[&token].message.as_ref().unwrap(),
-            "the-message-2"
-        );
-    });
-
-    project_b.read_with(cx_b, |project, cx| {
-        let status = project.language_server_statuses(cx).next().unwrap().1;
-        assert_eq!(status.name.0, "the-language-server");
-        assert_eq!(status.pending_work.len(), 1);
-        assert_eq!(
-            status.pending_work[&token].message.as_ref().unwrap(),
-            "the-message-2"
-        );
-    });
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_share_project(
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-    cx_c: &mut TestAppContext,
-) {
-    let executor = cx_a.executor();
-    let cx_b = cx_b.add_empty_window();
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    let client_c = server.create_client(cx_c, "user_c").await;
-    server
-        .make_contacts(&mut [(&client_a, cx_a), (&client_b, cx_b), (&client_c, cx_c)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-    let active_call_b = cx_b.read(ActiveCall::global);
-    let active_call_c = cx_c.read(ActiveCall::global);
-
-    client_a
-        .fs()
-        .insert_tree(
-            path!("/a"),
-            json!({
-                ".gitignore": "ignored-dir",
-                "a.txt": "a-contents",
-                "b.txt": "b-contents",
-                "ignored-dir": {
-                    "c.txt": "",
-                    "d.txt": "",
-                }
-            }),
-        )
-        .await;
-
-    // Invite client B to collaborate on a project
-    let (project_a, worktree_id) = client_a.build_local_project(path!("/a"), cx_a).await;
-    active_call_a
-        .update(cx_a, |call, cx| {
-            call.invite(client_b.user_id().unwrap(), Some(project_a.clone()), cx)
-        })
-        .await
-        .unwrap();
-
-    // Join that project as client B
-
-    let incoming_call_b = active_call_b.read_with(cx_b, |call, _| call.incoming());
-    executor.run_until_parked();
-    let call = incoming_call_b.borrow().clone().unwrap();
-    assert_eq!(call.calling_user.github_login, "user_a");
-    let initial_project = call.initial_project.unwrap();
-    active_call_b
-        .update(cx_b, |call, cx| call.accept_incoming(cx))
-        .await
-        .unwrap();
-    let client_b_peer_id = client_b.peer_id().unwrap();
-    let project_b = client_b.join_remote_project(initial_project.id, cx_b).await;
-
-    let replica_id_b = project_b.read_with(cx_b, |project, _| project.replica_id());
-
-    executor.run_until_parked();
-
-    project_a.read_with(cx_a, |project, _| {
-        let client_b_collaborator = project.collaborators().get(&client_b_peer_id).unwrap();
-        assert_eq!(client_b_collaborator.replica_id, replica_id_b);
-    });
-
-    project_b.read_with(cx_b, |project, cx| {
-        let worktree = project.worktrees(cx).next().unwrap().read(cx);
-        assert_eq!(
-            worktree.paths().collect::<Vec<_>>(),
-            [
-                rel_path(".gitignore"),
-                rel_path("a.txt"),
-                rel_path("b.txt"),
-                rel_path("ignored-dir"),
-            ]
-        );
-    });
-
-    project_b
-        .update(cx_b, |project, cx| {
-            let worktree = project.worktrees(cx).next().unwrap();
-            let entry = worktree
-                .read(cx)
-                .entry_for_path(rel_path("ignored-dir"))
-                .unwrap();
-            project.expand_entry(worktree_id, entry.id, cx).unwrap()
-        })
-        .await
-        .unwrap();
-
-    project_b.read_with(cx_b, |project, cx| {
-        let worktree = project.worktrees(cx).next().unwrap().read(cx);
-        assert_eq!(
-            worktree.paths().collect::<Vec<_>>(),
-            [
-                rel_path(".gitignore"),
-                rel_path("a.txt"),
-                rel_path("b.txt"),
-                rel_path("ignored-dir"),
-                rel_path("ignored-dir/c.txt"),
-                rel_path("ignored-dir/d.txt"),
-            ]
-        );
-    });
-
-    // Open the same file as client B and client A.
-    let buffer_b = project_b
-        .update(cx_b, |p, cx| {
-            p.open_buffer((worktree_id, rel_path("b.txt")), cx)
-        })
-        .await
-        .unwrap();
-
-    buffer_b.read_with(cx_b, |buf, _| assert_eq!(buf.text(), "b-contents"));
-
-    project_a.read_with(cx_a, |project, cx| {
-        assert!(project.has_open_buffer((worktree_id, rel_path("b.txt")), cx))
-    });
-    let buffer_a = project_a
-        .update(cx_a, |p, cx| {
-            p.open_buffer((worktree_id, rel_path("b.txt")), cx)
-        })
-        .await
-        .unwrap();
-
-    let editor_b =
-        cx_b.new_window_entity(|window, cx| Editor::for_buffer(buffer_b, None, window, cx));
-
-    // Client A sees client B's selection
-    executor.run_until_parked();
-
-    buffer_a.read_with(cx_a, |buffer, _| {
-        buffer
-            .snapshot()
-            .selections_in_range(
-                text::Anchor::min_max_range_for_buffer(buffer.remote_id()),
-                false,
-            )
-            .count()
-            == 1
-    });
-
-    // Edit the buffer as client B and see that edit as client A.
-    editor_b.update_in(cx_b, |editor, window, cx| {
-        editor.handle_input("ok, ", window, cx)
-    });
-    executor.run_until_parked();
-
-    buffer_a.read_with(cx_a, |buffer, _| {
-        assert_eq!(buffer.text(), "ok, b-contents")
-    });
-
-    // Client B can invite client C on a project shared by client A.
-    active_call_b
-        .update(cx_b, |call, cx| {
-            call.invite(client_c.user_id().unwrap(), Some(project_b.clone()), cx)
-        })
-        .await
-        .unwrap();
-
-    let incoming_call_c = active_call_c.read_with(cx_c, |call, _| call.incoming());
-    executor.run_until_parked();
-    let call = incoming_call_c.borrow().clone().unwrap();
-    assert_eq!(call.calling_user.github_login, "user_b");
-    let initial_project = call.initial_project.unwrap();
-    active_call_c
-        .update(cx_c, |call, cx| call.accept_incoming(cx))
-        .await
-        .unwrap();
-    let _project_c = client_c.join_remote_project(initial_project.id, cx_c).await;
-
-    // Client B closes the editor, and client A sees client B's selections removed.
-    cx_b.update(move |_, _| drop(editor_b));
-    executor.run_until_parked();
-
-    buffer_a.read_with(cx_a, |buffer, _| {
-        buffer
-            .snapshot()
-            .selections_in_range(
-                text::Anchor::min_max_range_for_buffer(buffer.remote_id()),
-                false,
-            )
-            .count()
-            == 0
-    });
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_on_input_format_from_host_to_guest(
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(cx_a.executor()).await;
-    let executor = cx_a.executor();
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-
-    client_a.language_registry().add(rust_lang());
-    let mut fake_language_servers = client_a.language_registry().register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            capabilities: lsp::ServerCapabilities {
-                document_on_type_formatting_provider: Some(lsp::DocumentOnTypeFormattingOptions {
-                    first_trigger_character: ":".to_string(),
-                    more_trigger_character: Some(vec![">".to_string()]),
-                }),
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-    );
-
-    client_a
-        .fs()
-        .insert_tree(
-            path!("/a"),
-            json!({
-                "main.rs": "fn main() { a }",
-                "other.rs": "// Test file",
-            }),
-        )
-        .await;
-    let (project_a, worktree_id) = client_a.build_local_project(path!("/a"), cx_a).await;
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-
-    // Open a file in an editor as the host.
-    let buffer_a = project_a
-        .update(cx_a, |p, cx| {
-            p.open_buffer((worktree_id, rel_path("main.rs")), cx)
-        })
-        .await
-        .unwrap();
-    let cx_a = cx_a.add_empty_window();
-    let editor_a = cx_a.new_window_entity(|window, cx| {
-        Editor::for_buffer(buffer_a, Some(project_a.clone()), window, cx)
-    });
-
-    let fake_language_server = fake_language_servers.next().await.unwrap();
-    executor.run_until_parked();
-
-    // Receive an OnTypeFormatting request as the host's language server.
-    // Return some formatting from the host's language server.
-    fake_language_server.set_request_handler::<lsp::request::OnTypeFormatting, _, _>(
-        |params, _| async move {
-            assert_eq!(
-                params.text_document_position.text_document.uri,
-                lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap(),
-            );
-            assert_eq!(
-                params.text_document_position.position,
-                lsp::Position::new(0, 14),
-            );
-
-            Ok(Some(vec![lsp::TextEdit {
-                new_text: "~<".to_string(),
-                range: lsp::Range::new(lsp::Position::new(0, 14), lsp::Position::new(0, 14)),
-            }]))
-        },
-    );
-
-    // Open the buffer on the guest and see that the formatting worked
-    let buffer_b = project_b
-        .update(cx_b, |p, cx| {
-            p.open_buffer((worktree_id, rel_path("main.rs")), cx)
-        })
-        .await
-        .unwrap();
-
-    // Type a on type formatting trigger character as the guest.
-    cx_a.focus(&editor_a);
-    editor_a.update_in(cx_a, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([MultiBufferOffset(13)..MultiBufferOffset(13)])
-        });
-        editor.handle_input(">", window, cx);
-    });
-
-    executor.run_until_parked();
-
-    buffer_b.read_with(cx_b, |buffer, _| {
-        assert_eq!(buffer.text(), "fn main() { a>~< }")
-    });
-
-    // Undo should remove LSP edits first
-    editor_a.update_in(cx_a, |editor, window, cx| {
-        assert_eq!(editor.text(cx), "fn main() { a>~< }");
-        editor.undo(&Undo, window, cx);
-        assert_eq!(editor.text(cx), "fn main() { a> }");
-    });
-    executor.run_until_parked();
-
-    buffer_b.read_with(cx_b, |buffer, _| {
-        assert_eq!(buffer.text(), "fn main() { a> }")
-    });
-
-    editor_a.update_in(cx_a, |editor, window, cx| {
-        assert_eq!(editor.text(cx), "fn main() { a> }");
-        editor.undo(&Undo, window, cx);
-        assert_eq!(editor.text(cx), "fn main() { a }");
-    });
-    executor.run_until_parked();
-
-    buffer_b.read_with(cx_b, |buffer, _| {
-        assert_eq!(buffer.text(), "fn main() { a }")
-    });
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_on_input_format_from_guest_to_host(
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(cx_a.executor()).await;
-    let executor = cx_a.executor();
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-
-    let capabilities = lsp::ServerCapabilities {
-        document_on_type_formatting_provider: Some(lsp::DocumentOnTypeFormattingOptions {
-            first_trigger_character: ":".to_string(),
-            more_trigger_character: Some(vec![">".to_string()]),
-        }),
-        ..lsp::ServerCapabilities::default()
-    };
-    client_a.language_registry().add(rust_lang());
-    let mut fake_language_servers = client_a.language_registry().register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            capabilities: capabilities.clone(),
-            ..FakeLspAdapter::default()
-        },
-    );
-    client_b.language_registry().add(rust_lang());
-    client_b.language_registry().register_fake_lsp_adapter(
-        "Rust",
-        FakeLspAdapter {
-            capabilities,
-            ..FakeLspAdapter::default()
-        },
-    );
-
-    client_a
-        .fs()
-        .insert_tree(
-            path!("/a"),
-            json!({
-                "main.rs": "fn main() { a }",
-                "other.rs": "// Test file",
-            }),
-        )
-        .await;
-    let (project_a, worktree_id) = client_a.build_local_project(path!("/a"), cx_a).await;
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-
-    // Open a file in an editor as the guest.
-    let buffer_b = project_b
-        .update(cx_b, |p, cx| {
-            p.open_buffer((worktree_id, rel_path("main.rs")), cx)
-        })
-        .await
-        .unwrap();
-    let cx_b = cx_b.add_empty_window();
-    let editor_b = cx_b.new_window_entity(|window, cx| {
-        Editor::for_buffer(buffer_b, Some(project_b.clone()), window, cx)
-    });
-
-    let fake_language_server = fake_language_servers.next().await.unwrap();
-    executor.run_until_parked();
-
-    // Type a on type formatting trigger character as the guest.
-    cx_b.focus(&editor_b);
-    editor_b.update_in(cx_b, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([MultiBufferOffset(13)..MultiBufferOffset(13)])
-        });
-        editor.handle_input(":", window, cx);
-    });
-
-    // Receive an OnTypeFormatting request as the host's language server.
-    // Return some formatting from the host's language server.
-    executor.start_waiting();
-    fake_language_server
-        .set_request_handler::<lsp::request::OnTypeFormatting, _, _>(|params, _| async move {
-            assert_eq!(
-                params.text_document_position.text_document.uri,
-                lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap(),
-            );
-            assert_eq!(
-                params.text_document_position.position,
-                lsp::Position::new(0, 14),
-            );
-
-            Ok(Some(vec![lsp::TextEdit {
-                new_text: "~:".to_string(),
-                range: lsp::Range::new(lsp::Position::new(0, 14), lsp::Position::new(0, 14)),
-            }]))
-        })
-        .next()
-        .await
-        .unwrap();
-    executor.finish_waiting();
-
-    // Open the buffer on the host and see that the formatting worked
-    let buffer_a = project_a
-        .update(cx_a, |p, cx| {
-            p.open_buffer((worktree_id, rel_path("main.rs")), cx)
-        })
-        .await
-        .unwrap();
-    executor.run_until_parked();
-
-    buffer_a.read_with(cx_a, |buffer, _| {
-        assert_eq!(buffer.text(), "fn main() { a:~: }")
-    });
-
-    // Undo should remove LSP edits first
-    editor_b.update_in(cx_b, |editor, window, cx| {
-        assert_eq!(editor.text(cx), "fn main() { a:~: }");
-        editor.undo(&Undo, window, cx);
-        assert_eq!(editor.text(cx), "fn main() { a: }");
-    });
-    executor.run_until_parked();
-
-    buffer_a.read_with(cx_a, |buffer, _| {
-        assert_eq!(buffer.text(), "fn main() { a: }")
-    });
-
-    editor_b.update_in(cx_b, |editor, window, cx| {
-        assert_eq!(editor.text(cx), "fn main() { a: }");
-        editor.undo(&Undo, window, cx);
-        assert_eq!(editor.text(cx), "fn main() { a }");
-    });
-    executor.run_until_parked();
-
-    buffer_a.read_with(cx_a, |buffer, _| {
-        assert_eq!(buffer.text(), "fn main() { a }")
-    });
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_mutual_editor_inlay_hint_cache_update(
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(cx_a.executor()).await;
-    let executor = cx_a.executor();
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-    let active_call_b = cx_b.read(ActiveCall::global);
-
-    cx_a.update(editor::init);
-    cx_b.update(editor::init);
-
-    cx_a.update(|cx| {
-        SettingsStore::update_global(cx, |store, cx| {
-            store.update_user_settings(cx, |settings| {
-                settings.project.all_languages.defaults.inlay_hints =
-                    Some(InlayHintSettingsContent {
-                        enabled: Some(true),
-                        ..InlayHintSettingsContent::default()
-                    })
-            });
-        });
-    });
-    cx_b.update(|cx| {
-        SettingsStore::update_global(cx, |store, cx| {
-            store.update_user_settings(cx, |settings| {
-                settings.project.all_languages.defaults.inlay_hints =
-                    Some(InlayHintSettingsContent {
-                        enabled: Some(true),
-                        ..InlayHintSettingsContent::default()
-                    })
-            });
-        });
-    });
-
-    let capabilities = lsp::ServerCapabilities {
-        inlay_hint_provider: Some(lsp::OneOf::Left(true)),
-        ..lsp::ServerCapabilities::default()
-    };
-    client_a.language_registry().add(rust_lang());
-
-    // Set up the language server to return an additional inlay hint on each request.
-    let edits_made = Arc::new(AtomicUsize::new(0));
-    let closure_edits_made = Arc::clone(&edits_made);
-    let mut fake_language_servers = client_a.language_registry().register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            capabilities: capabilities.clone(),
-            initializer: Some(Box::new(move |fake_language_server| {
-                let closure_edits_made = closure_edits_made.clone();
-                fake_language_server.set_request_handler::<lsp::request::InlayHintRequest, _, _>(
-                    move |params, _| {
-                        let edits_made_2 = Arc::clone(&closure_edits_made);
-                        async move {
-                            assert_eq!(
-                                params.text_document.uri,
-                                lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap(),
-                            );
-                            let edits_made =
-                                AtomicUsize::load(&edits_made_2, atomic::Ordering::Acquire);
-                            Ok(Some(vec![lsp::InlayHint {
-                                position: lsp::Position::new(0, edits_made as u32),
-                                label: lsp::InlayHintLabel::String(edits_made.to_string()),
-                                kind: None,
-                                text_edits: None,
-                                tooltip: None,
-                                padding_left: None,
-                                padding_right: None,
-                                data: None,
-                            }]))
-                        }
-                    },
-                );
-            })),
-            ..FakeLspAdapter::default()
-        },
-    );
-    client_b.language_registry().add(rust_lang());
-    client_b.language_registry().register_fake_lsp_adapter(
-        "Rust",
-        FakeLspAdapter {
-            capabilities,
-            ..FakeLspAdapter::default()
-        },
-    );
-
-    // Client A opens a project.
-    client_a
-        .fs()
-        .insert_tree(
-            path!("/a"),
-            json!({
-                "main.rs": "fn main() { a } // and some long comment to ensure inlay hints are not trimmed out",
-                "other.rs": "// Test file",
-            }),
-        )
-        .await;
-    let (project_a, worktree_id) = client_a.build_local_project(path!("/a"), cx_a).await;
-    active_call_a
-        .update(cx_a, |call, cx| call.set_location(Some(&project_a), cx))
-        .await
-        .unwrap();
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-
-    // Client B joins the project
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-    active_call_b
-        .update(cx_b, |call, cx| call.set_location(Some(&project_b), cx))
-        .await
-        .unwrap();
-
-    let (workspace_a, cx_a) = client_a.build_workspace(&project_a, cx_a);
-
-    // The host opens a rust file.
-    let file_a = workspace_a.update_in(cx_a, |workspace, window, cx| {
-        workspace.open_path((worktree_id, rel_path("main.rs")), None, true, window, cx)
-    });
-    let fake_language_server = fake_language_servers.next().await.unwrap();
-    let editor_a = file_a.await.unwrap().downcast::<Editor>().unwrap();
-    executor.advance_clock(Duration::from_millis(100));
-    executor.run_until_parked();
-
-    let initial_edit = edits_made.load(atomic::Ordering::Acquire);
-    editor_a.update(cx_a, |editor, cx| {
-        assert_eq!(
-            vec![initial_edit.to_string()],
-            extract_hint_labels(editor, cx),
-            "Host should get its first hints when opens an editor"
-        );
-    });
-    let (workspace_b, cx_b) = client_b.build_workspace(&project_b, cx_b);
-    let editor_b = workspace_b
-        .update_in(cx_b, |workspace, window, cx| {
-            workspace.open_path((worktree_id, rel_path("main.rs")), None, true, window, cx)
-        })
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-
-    executor.advance_clock(Duration::from_millis(100));
-    executor.run_until_parked();
-    editor_b.update(cx_b, |editor, cx| {
-        assert_eq!(
-            vec![initial_edit.to_string()],
-            extract_hint_labels(editor, cx),
-            "Client should get its first hints when opens an editor"
-        );
-    });
-
-    let after_client_edit = edits_made.fetch_add(1, atomic::Ordering::Release) + 1;
-    editor_b.update_in(cx_b, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([MultiBufferOffset(13)..MultiBufferOffset(13)].clone())
-        });
-        editor.handle_input(":", window, cx);
-    });
-    cx_b.focus(&editor_b);
-
-    executor.advance_clock(Duration::from_secs(1));
-    executor.run_until_parked();
-    editor_a.update(cx_a, |editor, cx| {
-        assert_eq!(
-            vec![after_client_edit.to_string()],
-            extract_hint_labels(editor, cx),
-        );
-    });
-    editor_b.update(cx_b, |editor, cx| {
-        assert_eq!(
-            vec![after_client_edit.to_string()],
-            extract_hint_labels(editor, cx),
-        );
-    });
-
-    let after_host_edit = edits_made.fetch_add(1, atomic::Ordering::Release) + 1;
-    editor_a.update_in(cx_a, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([MultiBufferOffset(13)..MultiBufferOffset(13)])
-        });
-        editor.handle_input("a change to increment both buffers' versions", window, cx);
-    });
-    cx_a.focus(&editor_a);
-
-    executor.advance_clock(Duration::from_secs(1));
-    executor.run_until_parked();
-    editor_a.update(cx_a, |editor, cx| {
-        assert_eq!(
-            vec![after_host_edit.to_string()],
-            extract_hint_labels(editor, cx),
-        );
-    });
-    editor_b.update(cx_b, |editor, cx| {
-        assert_eq!(
-            vec![after_host_edit.to_string()],
-            extract_hint_labels(editor, cx),
-        );
-    });
-
-    let after_special_edit_for_refresh = edits_made.fetch_add(1, atomic::Ordering::Release) + 1;
-    fake_language_server
-        .request::<lsp::request::InlayHintRefreshRequest>(())
-        .await
-        .into_response()
-        .expect("inlay refresh request failed");
-
-    executor.advance_clock(Duration::from_secs(1));
-    executor.run_until_parked();
-    editor_a.update(cx_a, |editor, cx| {
-        assert_eq!(
-            vec![after_special_edit_for_refresh.to_string()],
-            extract_hint_labels(editor, cx),
-            "Host should react to /refresh LSP request"
-        );
-    });
-    editor_b.update(cx_b, |editor, cx| {
-        assert_eq!(
-            vec![after_special_edit_for_refresh.to_string()],
-            extract_hint_labels(editor, cx),
-            "Guest should get a /refresh LSP request propagated by host"
-        );
-    });
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_inlay_hint_refresh_is_forwarded(
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(cx_a.executor()).await;
-    let executor = cx_a.executor();
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-    let active_call_b = cx_b.read(ActiveCall::global);
-
-    cx_a.update(editor::init);
-    cx_b.update(editor::init);
-
-    cx_a.update(|cx| {
-        SettingsStore::update_global(cx, |store, cx| {
-            store.update_user_settings(cx, |settings| {
-                settings.project.all_languages.defaults.inlay_hints =
-                    Some(InlayHintSettingsContent {
-                        show_value_hints: Some(true),
-                        enabled: Some(false),
-                        edit_debounce_ms: Some(0),
-                        scroll_debounce_ms: Some(0),
-                        show_type_hints: Some(false),
-                        show_parameter_hints: Some(false),
-                        show_other_hints: Some(false),
-                        show_background: Some(false),
-                        toggle_on_modifiers_press: None,
-                    })
-            });
-        });
-    });
-    cx_b.update(|cx| {
-        SettingsStore::update_global(cx, |store, cx| {
-            store.update_user_settings(cx, |settings| {
-                settings.project.all_languages.defaults.inlay_hints =
-                    Some(InlayHintSettingsContent {
-                        show_value_hints: Some(true),
-                        enabled: Some(true),
-                        edit_debounce_ms: Some(0),
-                        scroll_debounce_ms: Some(0),
-                        show_type_hints: Some(true),
-                        show_parameter_hints: Some(true),
-                        show_other_hints: Some(true),
-                        show_background: Some(false),
-                        toggle_on_modifiers_press: None,
-                    })
-            });
-        });
-    });
-
-    let capabilities = lsp::ServerCapabilities {
-        inlay_hint_provider: Some(lsp::OneOf::Left(true)),
-        ..lsp::ServerCapabilities::default()
-    };
-    client_a.language_registry().add(rust_lang());
-    let mut fake_language_servers = client_a.language_registry().register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            capabilities: capabilities.clone(),
-            ..FakeLspAdapter::default()
-        },
-    );
-    client_b.language_registry().add(rust_lang());
-    client_b.language_registry().register_fake_lsp_adapter(
-        "Rust",
-        FakeLspAdapter {
-            capabilities,
-            ..FakeLspAdapter::default()
-        },
-    );
-
-    client_a
-        .fs()
-        .insert_tree(
-            path!("/a"),
-            json!({
-                "main.rs": "fn main() { a } // and some long comment to ensure inlay hints are not trimmed out",
-                "other.rs": "// Test file",
-            }),
-        )
-        .await;
-    let (project_a, worktree_id) = client_a.build_local_project(path!("/a"), cx_a).await;
-    active_call_a
-        .update(cx_a, |call, cx| call.set_location(Some(&project_a), cx))
-        .await
-        .unwrap();
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-    active_call_b
-        .update(cx_b, |call, cx| call.set_location(Some(&project_b), cx))
-        .await
-        .unwrap();
-
-    let (workspace_a, cx_a) = client_a.build_workspace(&project_a, cx_a);
-    let (workspace_b, cx_b) = client_b.build_workspace(&project_b, cx_b);
-
-    cx_a.background_executor.start_waiting();
-
-    let editor_a = workspace_a
-        .update_in(cx_a, |workspace, window, cx| {
-            workspace.open_path((worktree_id, rel_path("main.rs")), None, true, window, cx)
-        })
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-
-    let editor_b = workspace_b
-        .update_in(cx_b, |workspace, window, cx| {
-            workspace.open_path((worktree_id, rel_path("main.rs")), None, true, window, cx)
-        })
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-
-    let other_hints = Arc::new(AtomicBool::new(false));
-    let fake_language_server = fake_language_servers.next().await.unwrap();
-    let closure_other_hints = Arc::clone(&other_hints);
-    fake_language_server
-        .set_request_handler::<lsp::request::InlayHintRequest, _, _>(move |params, _| {
-            let task_other_hints = Arc::clone(&closure_other_hints);
-            async move {
-                assert_eq!(
-                    params.text_document.uri,
-                    lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap(),
-                );
-                let other_hints = task_other_hints.load(atomic::Ordering::Acquire);
-                let character = if other_hints { 0 } else { 2 };
-                let label = if other_hints {
-                    "other hint"
-                } else {
-                    "initial hint"
-                };
-                Ok(Some(vec![
-                    lsp::InlayHint {
-                        position: lsp::Position::new(0, character),
-                        label: lsp::InlayHintLabel::String(label.to_string()),
-                        kind: None,
-                        text_edits: None,
-                        tooltip: None,
-                        padding_left: None,
-                        padding_right: None,
-                        data: None,
-                    },
-                    lsp::InlayHint {
-                        position: lsp::Position::new(1090, 1090),
-                        label: lsp::InlayHintLabel::String("out-of-bounds hint".to_string()),
-                        kind: None,
-                        text_edits: None,
-                        tooltip: None,
-                        padding_left: None,
-                        padding_right: None,
-                        data: None,
-                    },
-                ]))
-            }
-        })
-        .next()
-        .await
-        .unwrap();
-    executor.finish_waiting();
-
-    executor.run_until_parked();
-    editor_a.update(cx_a, |editor, cx| {
-        assert!(
-            extract_hint_labels(editor, cx).is_empty(),
-            "Host should get no hints due to them turned off"
-        );
-    });
-
-    executor.run_until_parked();
-    editor_b.update(cx_b, |editor, cx| {
-        assert_eq!(
-            vec!["initial hint".to_string()],
-            extract_hint_labels(editor, cx),
-            "Client should get its first hints when opens an editor"
-        );
-    });
-
-    other_hints.fetch_or(true, atomic::Ordering::Release);
-    fake_language_server
-        .request::<lsp::request::InlayHintRefreshRequest>(())
-        .await
-        .into_response()
-        .expect("inlay refresh request failed");
-    executor.run_until_parked();
-    editor_a.update(cx_a, |editor, cx| {
-        assert!(
-            extract_hint_labels(editor, cx).is_empty(),
-            "Host should get no hints due to them turned off, even after the /refresh"
-        );
-    });
-
-    executor.run_until_parked();
-    editor_b.update(cx_b, |editor, cx| {
-        assert_eq!(
-            vec!["other hint".to_string()],
-            extract_hint_labels(editor, cx),
-            "Guest should get a /refresh LSP request propagated by host despite host hints are off"
-        );
-    });
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_lsp_document_color(cx_a: &mut TestAppContext, cx_b: &mut TestAppContext) {
-    let expected_color = Rgba {
-        r: 0.33,
-        g: 0.33,
-        b: 0.33,
-        a: 0.33,
-    };
-    let mut server = TestServer::start(cx_a.executor()).await;
-    let executor = cx_a.executor();
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-    let active_call_b = cx_b.read(ActiveCall::global);
-
-    cx_a.update(editor::init);
-    cx_b.update(editor::init);
-
-    cx_a.update(|cx| {
-        SettingsStore::update_global(cx, |store, cx| {
-            store.update_user_settings(cx, |settings| {
-                settings.editor.lsp_document_colors = Some(DocumentColorsRenderMode::None);
-            });
-        });
-    });
-    cx_b.update(|cx| {
-        SettingsStore::update_global(cx, |store, cx| {
-            store.update_user_settings(cx, |settings| {
-                settings.editor.lsp_document_colors = Some(DocumentColorsRenderMode::Inlay);
-            });
-        });
-    });
-
-    let capabilities = lsp::ServerCapabilities {
-        color_provider: Some(lsp::ColorProviderCapability::Simple(true)),
-        ..lsp::ServerCapabilities::default()
-    };
-    client_a.language_registry().add(rust_lang());
-    let mut fake_language_servers = client_a.language_registry().register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            capabilities: capabilities.clone(),
-            ..FakeLspAdapter::default()
-        },
-    );
-    client_b.language_registry().add(rust_lang());
-    client_b.language_registry().register_fake_lsp_adapter(
-        "Rust",
-        FakeLspAdapter {
-            capabilities,
-            ..FakeLspAdapter::default()
-        },
-    );
-
-    // Client A opens a project.
-    client_a
-        .fs()
-        .insert_tree(
-            path!("/a"),
-            json!({
-                "main.rs": "fn main() { a }",
-            }),
-        )
-        .await;
-    let (project_a, worktree_id) = client_a.build_local_project(path!("/a"), cx_a).await;
-    active_call_a
-        .update(cx_a, |call, cx| call.set_location(Some(&project_a), cx))
-        .await
-        .unwrap();
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-
-    // Client B joins the project
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-    active_call_b
-        .update(cx_b, |call, cx| call.set_location(Some(&project_b), cx))
-        .await
-        .unwrap();
-
-    let (workspace_a, cx_a) = client_a.build_workspace(&project_a, cx_a);
-
-    // The host opens a rust file.
-    let _buffer_a = project_a
-        .update(cx_a, |project, cx| {
-            project.open_local_buffer(path!("/a/main.rs"), cx)
-        })
-        .await
-        .unwrap();
-    let editor_a = workspace_a
-        .update_in(cx_a, |workspace, window, cx| {
-            workspace.open_path((worktree_id, rel_path("main.rs")), None, true, window, cx)
-        })
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-
-    let fake_language_server = fake_language_servers.next().await.unwrap();
-    cx_a.run_until_parked();
-    cx_b.run_until_parked();
-
-    let requests_made = Arc::new(AtomicUsize::new(0));
-    let closure_requests_made = Arc::clone(&requests_made);
-    let mut color_request_handle = fake_language_server
-        .set_request_handler::<lsp::request::DocumentColor, _, _>(move |params, _| {
-            let requests_made = Arc::clone(&closure_requests_made);
-            async move {
-                assert_eq!(
-                    params.text_document.uri,
-                    lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap(),
-                );
-                requests_made.fetch_add(1, atomic::Ordering::Release);
-                Ok(vec![lsp::ColorInformation {
-                    range: lsp::Range {
-                        start: lsp::Position {
-                            line: 0,
-                            character: 0,
-                        },
-                        end: lsp::Position {
-                            line: 0,
-                            character: 1,
-                        },
-                    },
-                    color: lsp::Color {
-                        red: 0.33,
-                        green: 0.33,
-                        blue: 0.33,
-                        alpha: 0.33,
-                    },
-                }])
-            }
-        });
-    executor.run_until_parked();
-
-    assert_eq!(
-        0,
-        requests_made.load(atomic::Ordering::Acquire),
-        "Host did not enable document colors, hence should query for none"
-    );
-    editor_a.update(cx_a, |editor, cx| {
-        assert_eq!(
-            Vec::<Rgba>::new(),
-            extract_color_inlays(editor, cx),
-            "No query colors should result in no hints"
-        );
-    });
-
-    let (workspace_b, cx_b) = client_b.build_workspace(&project_b, cx_b);
-    let editor_b = workspace_b
-        .update_in(cx_b, |workspace, window, cx| {
-            workspace.open_path((worktree_id, rel_path("main.rs")), None, true, window, cx)
-        })
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-
-    color_request_handle.next().await.unwrap();
-    executor.advance_clock(FETCH_COLORS_DEBOUNCE_TIMEOUT);
-    executor.run_until_parked();
-
-    assert_eq!(
-        1,
-        requests_made.load(atomic::Ordering::Acquire),
-        "The client opened the file and got its first colors back"
-    );
-    editor_b.update(cx_b, |editor, cx| {
-        assert_eq!(
-            vec![expected_color],
-            extract_color_inlays(editor, cx),
-            "With document colors as inlays, color inlays should be pushed"
-        );
-    });
-
-    editor_a.update_in(cx_a, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([MultiBufferOffset(13)..MultiBufferOffset(13)].clone())
-        });
-        editor.handle_input(":", window, cx);
-    });
-    color_request_handle.next().await.unwrap();
-    executor.run_until_parked();
-    assert_eq!(
-        2,
-        requests_made.load(atomic::Ordering::Acquire),
-        "After the host edits his file, the client should request the colors again"
-    );
-    editor_a.update(cx_a, |editor, cx| {
-        assert_eq!(
-            Vec::<Rgba>::new(),
-            extract_color_inlays(editor, cx),
-            "Host has no colors still"
-        );
-    });
-    editor_b.update(cx_b, |editor, cx| {
-        assert_eq!(vec![expected_color], extract_color_inlays(editor, cx),);
-    });
-
-    cx_b.update(|_, cx| {
-        SettingsStore::update_global(cx, |store, cx| {
-            store.update_user_settings(cx, |settings| {
-                settings.editor.lsp_document_colors = Some(DocumentColorsRenderMode::Background);
-            });
-        });
-    });
-    executor.run_until_parked();
-    assert_eq!(
-        2,
-        requests_made.load(atomic::Ordering::Acquire),
-        "After the client have changed the colors settings, no extra queries should happen"
-    );
-    editor_a.update(cx_a, |editor, cx| {
-        assert_eq!(
-            Vec::<Rgba>::new(),
-            extract_color_inlays(editor, cx),
-            "Host is unaffected by the client's settings changes"
-        );
-    });
-    editor_b.update(cx_b, |editor, cx| {
-        assert_eq!(
-            Vec::<Rgba>::new(),
-            extract_color_inlays(editor, cx),
-            "Client should have no colors hints, as in the settings"
-        );
-    });
-
-    cx_b.update(|_, cx| {
-        SettingsStore::update_global(cx, |store, cx| {
-            store.update_user_settings(cx, |settings| {
-                settings.editor.lsp_document_colors = Some(DocumentColorsRenderMode::Inlay);
-            });
-        });
-    });
-    executor.run_until_parked();
-    assert_eq!(
-        2,
-        requests_made.load(atomic::Ordering::Acquire),
-        "After falling back to colors as inlays, no extra LSP queries are made"
-    );
-    editor_a.update(cx_a, |editor, cx| {
-        assert_eq!(
-            Vec::<Rgba>::new(),
-            extract_color_inlays(editor, cx),
-            "Host is unaffected by the client's settings changes, again"
-        );
-    });
-    editor_b.update(cx_b, |editor, cx| {
-        assert_eq!(
-            vec![expected_color],
-            extract_color_inlays(editor, cx),
-            "Client should have its color hints back"
-        );
-    });
-
-    cx_a.update(|_, cx| {
-        SettingsStore::update_global(cx, |store, cx| {
-            store.update_user_settings(cx, |settings| {
-                settings.editor.lsp_document_colors = Some(DocumentColorsRenderMode::Border);
-            });
-        });
-    });
-    color_request_handle.next().await.unwrap();
-    executor.run_until_parked();
-    assert_eq!(
-        3,
-        requests_made.load(atomic::Ordering::Acquire),
-        "After the host enables document colors, another LSP query should be made"
-    );
-    editor_a.update(cx_a, |editor, cx| {
-        assert_eq!(
-            Vec::<Rgba>::new(),
-            extract_color_inlays(editor, cx),
-            "Host did not configure document colors as hints hence gets nothing"
-        );
-    });
-    editor_b.update(cx_b, |editor, cx| {
-        assert_eq!(
-            vec![expected_color],
-            extract_color_inlays(editor, cx),
-            "Client should be unaffected by the host's settings changes"
-        );
-    });
-}
-
-async fn test_lsp_pull_diagnostics(
-    should_stream_workspace_diagnostic: bool,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(cx_a.executor()).await;
-    let executor = cx_a.executor();
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-    let active_call_b = cx_b.read(ActiveCall::global);
-
-    cx_a.update(editor::init);
-    cx_b.update(editor::init);
-
-    let expected_push_diagnostic_main_message = "pushed main diagnostic";
-    let expected_push_diagnostic_lib_message = "pushed lib diagnostic";
-    let expected_pull_diagnostic_main_message = "pulled main diagnostic";
-    let expected_pull_diagnostic_lib_message = "pulled lib diagnostic";
-    let expected_workspace_pull_diagnostics_main_message = "pulled workspace main diagnostic";
-    let expected_workspace_pull_diagnostics_lib_message = "pulled workspace lib diagnostic";
-
-    let diagnostics_pulls_result_ids = Arc::new(Mutex::new(BTreeSet::<Option<String>>::new()));
-    let workspace_diagnostics_pulls_result_ids = Arc::new(Mutex::new(BTreeSet::<String>::new()));
-    let diagnostics_pulls_made = Arc::new(AtomicUsize::new(0));
-    let closure_diagnostics_pulls_made = diagnostics_pulls_made.clone();
-    let closure_diagnostics_pulls_result_ids = diagnostics_pulls_result_ids.clone();
-    let workspace_diagnostics_pulls_made = Arc::new(AtomicUsize::new(0));
-    let closure_workspace_diagnostics_pulls_made = workspace_diagnostics_pulls_made.clone();
-    let closure_workspace_diagnostics_pulls_result_ids =
-        workspace_diagnostics_pulls_result_ids.clone();
-    let (workspace_diagnostic_cancel_tx, closure_workspace_diagnostic_cancel_rx) =
-        smol::channel::bounded::<()>(1);
-    let (closure_workspace_diagnostic_received_tx, workspace_diagnostic_received_rx) =
-        smol::channel::bounded::<()>(1);
-
-    let capabilities = lsp::ServerCapabilities {
-        diagnostic_provider: Some(lsp::DiagnosticServerCapabilities::Options(
-            lsp::DiagnosticOptions {
-                identifier: Some("test-pulls".to_string()),
-                inter_file_dependencies: true,
-                workspace_diagnostics: true,
-                work_done_progress_options: lsp::WorkDoneProgressOptions {
-                    work_done_progress: None,
-                },
-            },
-        )),
-        ..lsp::ServerCapabilities::default()
-    };
-    client_a.language_registry().add(rust_lang());
-
-    let pull_diagnostics_handle = Arc::new(parking_lot::Mutex::new(None));
-    let workspace_diagnostics_pulls_handle = Arc::new(parking_lot::Mutex::new(None));
-
-    let closure_pull_diagnostics_handle = pull_diagnostics_handle.clone();
-    let closure_workspace_diagnostics_pulls_handle = workspace_diagnostics_pulls_handle.clone();
-    let mut fake_language_servers = client_a.language_registry().register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            capabilities: capabilities.clone(),
-            initializer: Some(Box::new(move |fake_language_server| {
-                let expected_workspace_diagnostic_token = lsp::ProgressToken::String(format!(
-                    "workspace/diagnostic/{}/1",
-                    fake_language_server.server.server_id()
-                ));
-                let closure_workspace_diagnostics_pulls_result_ids = closure_workspace_diagnostics_pulls_result_ids.clone();
-                let diagnostics_pulls_made = closure_diagnostics_pulls_made.clone();
-                let diagnostics_pulls_result_ids = closure_diagnostics_pulls_result_ids.clone();
-                let closure_pull_diagnostics_handle = closure_pull_diagnostics_handle.clone();
-                let closure_workspace_diagnostics_pulls_handle = closure_workspace_diagnostics_pulls_handle.clone();
-                let closure_workspace_diagnostic_cancel_rx = closure_workspace_diagnostic_cancel_rx.clone();
-                let closure_workspace_diagnostic_received_tx = closure_workspace_diagnostic_received_tx.clone();
-                let pull_diagnostics_handle = fake_language_server
-                    .set_request_handler::<lsp::request::DocumentDiagnosticRequest, _, _>(
-                        move |params, _| {
-                            let requests_made = diagnostics_pulls_made.clone();
-                            let diagnostics_pulls_result_ids =
-                                diagnostics_pulls_result_ids.clone();
-                            async move {
-                                let message = if lsp::Uri::from_file_path(path!("/a/main.rs"))
-                                    .unwrap()
-                                    == params.text_document.uri
-                                {
-                                    expected_pull_diagnostic_main_message.to_string()
-                                } else if lsp::Uri::from_file_path(path!("/a/lib.rs")).unwrap()
-                                    == params.text_document.uri
-                                {
-                                    expected_pull_diagnostic_lib_message.to_string()
-                                } else {
-                                    panic!("Unexpected document: {}", params.text_document.uri)
-                                };
-                                {
-                                    diagnostics_pulls_result_ids
-                                        .lock()
-                                        .await
-                                        .insert(params.previous_result_id);
-                                }
-                                let new_requests_count =
-                                    requests_made.fetch_add(1, atomic::Ordering::Release) + 1;
-                                Ok(lsp::DocumentDiagnosticReportResult::Report(
-                                    lsp::DocumentDiagnosticReport::Full(
-                                        lsp::RelatedFullDocumentDiagnosticReport {
-                                            related_documents: None,
-                                            full_document_diagnostic_report:
-                                                lsp::FullDocumentDiagnosticReport {
-                                                    result_id: Some(format!(
-                                                        "pull-{new_requests_count}"
-                                                    )),
-                                                    items: vec![lsp::Diagnostic {
-                                                        range: lsp::Range {
-                                                            start: lsp::Position {
-                                                                line: 0,
-                                                                character: 0,
-                                                            },
-                                                            end: lsp::Position {
-                                                                line: 0,
-                                                                character: 2,
-                                                            },
-                                                        },
-                                                        severity: Some(
-                                                            lsp::DiagnosticSeverity::ERROR,
-                                                        ),
-                                                        message,
-                                                        ..lsp::Diagnostic::default()
-                                                    }],
-                                                },
-                                        },
-                                    ),
-                                ))
-                            }
-                        },
-                    );
-                let _ = closure_pull_diagnostics_handle.lock().insert(pull_diagnostics_handle);
-
-                let closure_workspace_diagnostics_pulls_made = closure_workspace_diagnostics_pulls_made.clone();
-                let workspace_diagnostics_pulls_handle = fake_language_server.set_request_handler::<lsp::request::WorkspaceDiagnosticRequest, _, _>(
-                    move |params, _| {
-                        let workspace_requests_made = closure_workspace_diagnostics_pulls_made.clone();
-                        let workspace_diagnostics_pulls_result_ids =
-                            closure_workspace_diagnostics_pulls_result_ids.clone();
-                        let workspace_diagnostic_cancel_rx = closure_workspace_diagnostic_cancel_rx.clone();
-                        let workspace_diagnostic_received_tx = closure_workspace_diagnostic_received_tx.clone();
-                        let expected_workspace_diagnostic_token = expected_workspace_diagnostic_token.clone();
-                        async move {
-                            let workspace_request_count =
-                                workspace_requests_made.fetch_add(1, atomic::Ordering::Release) + 1;
-                            {
-                                workspace_diagnostics_pulls_result_ids
-                                    .lock()
-                                    .await
-                                    .extend(params.previous_result_ids.into_iter().map(|id| id.value));
-                            }
-                            if should_stream_workspace_diagnostic && !workspace_diagnostic_cancel_rx.is_closed()
-                            {
-                                assert_eq!(
-                                    params.partial_result_params.partial_result_token,
-                                    Some(expected_workspace_diagnostic_token)
-                                );
-                                workspace_diagnostic_received_tx.send(()).await.unwrap();
-                                workspace_diagnostic_cancel_rx.recv().await.unwrap();
-                                workspace_diagnostic_cancel_rx.close();
-                                // https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#partialResults
-                                // > The final response has to be empty in terms of result values.
-                                return Ok(lsp::WorkspaceDiagnosticReportResult::Report(
-                                    lsp::WorkspaceDiagnosticReport { items: Vec::new() },
-                                ));
-                            }
-                            Ok(lsp::WorkspaceDiagnosticReportResult::Report(
-                                lsp::WorkspaceDiagnosticReport {
-                                    items: vec![
-                                        lsp::WorkspaceDocumentDiagnosticReport::Full(
-                                            lsp::WorkspaceFullDocumentDiagnosticReport {
-                                                uri: lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap(),
-                                                version: None,
-                                                full_document_diagnostic_report:
-                                                    lsp::FullDocumentDiagnosticReport {
-                                                        result_id: Some(format!(
-                                                            "workspace_{workspace_request_count}"
-                                                        )),
-                                                        items: vec![lsp::Diagnostic {
-                                                            range: lsp::Range {
-                                                                start: lsp::Position {
-                                                                    line: 0,
-                                                                    character: 1,
-                                                                },
-                                                                end: lsp::Position {
-                                                                    line: 0,
-                                                                    character: 3,
-                                                                },
-                                                            },
-                                                            severity: Some(lsp::DiagnosticSeverity::WARNING),
-                                                            message:
-                                                                expected_workspace_pull_diagnostics_main_message
-                                                                    .to_string(),
-                                                            ..lsp::Diagnostic::default()
-                                                        }],
-                                                    },
-                                            },
-                                        ),
-                                        lsp::WorkspaceDocumentDiagnosticReport::Full(
-                                            lsp::WorkspaceFullDocumentDiagnosticReport {
-                                                uri: lsp::Uri::from_file_path(path!("/a/lib.rs")).unwrap(),
-                                                version: None,
-                                                full_document_diagnostic_report:
-                                                    lsp::FullDocumentDiagnosticReport {
-                                                        result_id: Some(format!(
-                                                            "workspace_{workspace_request_count}"
-                                                        )),
-                                                        items: vec![lsp::Diagnostic {
-                                                            range: lsp::Range {
-                                                                start: lsp::Position {
-                                                                    line: 0,
-                                                                    character: 1,
-                                                                },
-                                                                end: lsp::Position {
-                                                                    line: 0,
-                                                                    character: 3,
-                                                                },
-                                                            },
-                                                            severity: Some(lsp::DiagnosticSeverity::WARNING),
-                                                            message:
-                                                                expected_workspace_pull_diagnostics_lib_message
-                                                                    .to_string(),
-                                                            ..lsp::Diagnostic::default()
-                                                        }],
-                                                    },
-                                            },
-                                        ),
-                                    ],
-                                },
-                            ))
-                        }
-                    });
-                let _ = closure_workspace_diagnostics_pulls_handle.lock().insert(workspace_diagnostics_pulls_handle);
-            })),
-            ..FakeLspAdapter::default()
-        },
-    );
-
-    client_b.language_registry().add(rust_lang());
-    client_b.language_registry().register_fake_lsp_adapter(
-        "Rust",
-        FakeLspAdapter {
-            capabilities,
-            ..FakeLspAdapter::default()
-        },
-    );
-
-    // Client A opens a project.
-    client_a
-        .fs()
-        .insert_tree(
-            path!("/a"),
-            json!({
-                "main.rs": "fn main() { a }",
-                "lib.rs": "fn other() {}",
-            }),
-        )
-        .await;
-    let (project_a, worktree_id) = client_a.build_local_project(path!("/a"), cx_a).await;
-    active_call_a
-        .update(cx_a, |call, cx| call.set_location(Some(&project_a), cx))
-        .await
-        .unwrap();
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-
-    // Client B joins the project
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-    active_call_b
-        .update(cx_b, |call, cx| call.set_location(Some(&project_b), cx))
-        .await
-        .unwrap();
-
-    let (workspace_a, cx_a) = client_a.build_workspace(&project_a, cx_a);
-    executor.start_waiting();
-
-    // The host opens a rust file.
-    let _buffer_a = project_a
-        .update(cx_a, |project, cx| {
-            project.open_local_buffer(path!("/a/main.rs"), cx)
-        })
-        .await
-        .unwrap();
-    let editor_a_main = workspace_a
-        .update_in(cx_a, |workspace, window, cx| {
-            workspace.open_path((worktree_id, rel_path("main.rs")), None, true, window, cx)
-        })
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-
-    let fake_language_server = fake_language_servers.next().await.unwrap();
-    let expected_workspace_diagnostic_token = lsp::ProgressToken::String(format!(
-        "workspace/diagnostic-{}-1",
-        fake_language_server.server.server_id()
-    ));
-    cx_a.run_until_parked();
-    cx_b.run_until_parked();
-    let mut pull_diagnostics_handle = pull_diagnostics_handle.lock().take().unwrap();
-    let mut workspace_diagnostics_pulls_handle =
-        workspace_diagnostics_pulls_handle.lock().take().unwrap();
-
-    if should_stream_workspace_diagnostic {
-        workspace_diagnostic_received_rx.recv().await.unwrap();
-    } else {
-        workspace_diagnostics_pulls_handle.next().await.unwrap();
-    }
-    assert_eq!(
-        1,
-        workspace_diagnostics_pulls_made.load(atomic::Ordering::Acquire),
-        "Workspace diagnostics should be pulled initially on a server startup"
-    );
-    pull_diagnostics_handle.next().await.unwrap();
-    assert_eq!(
-        1,
-        diagnostics_pulls_made.load(atomic::Ordering::Acquire),
-        "Host should query pull diagnostics when the editor is opened"
-    );
-    executor.run_until_parked();
-    editor_a_main.update(cx_a, |editor, cx| {
-        let snapshot = editor.buffer().read(cx).snapshot(cx);
-        let all_diagnostics = snapshot
-            .diagnostics_in_range(MultiBufferOffset(0)..snapshot.len())
-            .collect::<Vec<_>>();
-        assert_eq!(
-            all_diagnostics.len(),
-            1,
-            "Expected single diagnostic, but got: {all_diagnostics:?}"
-        );
-        let diagnostic = &all_diagnostics[0];
-        let mut expected_messages = vec![expected_pull_diagnostic_main_message];
-        if !should_stream_workspace_diagnostic {
-            expected_messages.push(expected_workspace_pull_diagnostics_main_message);
-        }
-        assert!(
-            expected_messages.contains(&diagnostic.diagnostic.message.as_str()),
-            "Expected {expected_messages:?} on the host, but got: {}",
-            diagnostic.diagnostic.message
-        );
-    });
-
-    fake_language_server.notify::<lsp::notification::PublishDiagnostics>(
-        lsp::PublishDiagnosticsParams {
-            uri: lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap(),
-            diagnostics: vec![lsp::Diagnostic {
-                range: lsp::Range {
-                    start: lsp::Position {
-                        line: 0,
-                        character: 3,
-                    },
-                    end: lsp::Position {
-                        line: 0,
-                        character: 4,
-                    },
-                },
-                severity: Some(lsp::DiagnosticSeverity::INFORMATION),
-                message: expected_push_diagnostic_main_message.to_string(),
-                ..lsp::Diagnostic::default()
-            }],
-            version: None,
-        },
-    );
-    fake_language_server.notify::<lsp::notification::PublishDiagnostics>(
-        lsp::PublishDiagnosticsParams {
-            uri: lsp::Uri::from_file_path(path!("/a/lib.rs")).unwrap(),
-            diagnostics: vec![lsp::Diagnostic {
-                range: lsp::Range {
-                    start: lsp::Position {
-                        line: 0,
-                        character: 3,
-                    },
-                    end: lsp::Position {
-                        line: 0,
-                        character: 4,
-                    },
-                },
-                severity: Some(lsp::DiagnosticSeverity::INFORMATION),
-                message: expected_push_diagnostic_lib_message.to_string(),
-                ..lsp::Diagnostic::default()
-            }],
-            version: None,
-        },
-    );
-
-    if should_stream_workspace_diagnostic {
-        fake_language_server.notify::<lsp::notification::Progress>(lsp::ProgressParams {
-            token: expected_workspace_diagnostic_token.clone(),
-            value: lsp::ProgressParamsValue::WorkspaceDiagnostic(
-                lsp::WorkspaceDiagnosticReportResult::Report(lsp::WorkspaceDiagnosticReport {
-                    items: vec![
-                        lsp::WorkspaceDocumentDiagnosticReport::Full(
-                            lsp::WorkspaceFullDocumentDiagnosticReport {
-                                uri: lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap(),
-                                version: None,
-                                full_document_diagnostic_report:
-                                    lsp::FullDocumentDiagnosticReport {
-                                        result_id: Some(format!(
-                                            "workspace_{}",
-                                            workspace_diagnostics_pulls_made
-                                                .fetch_add(1, atomic::Ordering::Release)
-                                                + 1
-                                        )),
-                                        items: vec![lsp::Diagnostic {
-                                            range: lsp::Range {
-                                                start: lsp::Position {
-                                                    line: 0,
-                                                    character: 1,
-                                                },
-                                                end: lsp::Position {
-                                                    line: 0,
-                                                    character: 2,
-                                                },
-                                            },
-                                            severity: Some(lsp::DiagnosticSeverity::ERROR),
-                                            message:
-                                                expected_workspace_pull_diagnostics_main_message
-                                                    .to_string(),
-                                            ..lsp::Diagnostic::default()
-                                        }],
-                                    },
-                            },
-                        ),
-                        lsp::WorkspaceDocumentDiagnosticReport::Full(
-                            lsp::WorkspaceFullDocumentDiagnosticReport {
-                                uri: lsp::Uri::from_file_path(path!("/a/lib.rs")).unwrap(),
-                                version: None,
-                                full_document_diagnostic_report:
-                                    lsp::FullDocumentDiagnosticReport {
-                                        result_id: Some(format!(
-                                            "workspace_{}",
-                                            workspace_diagnostics_pulls_made
-                                                .fetch_add(1, atomic::Ordering::Release)
-                                                + 1
-                                        )),
-                                        items: Vec::new(),
-                                    },
-                            },
-                        ),
-                    ],
-                }),
-            ),
-        });
-    };
-
-    let mut workspace_diagnostic_start_count =
-        workspace_diagnostics_pulls_made.load(atomic::Ordering::Acquire);
-
-    executor.run_until_parked();
-    editor_a_main.update(cx_a, |editor, cx| {
-        let snapshot = editor.buffer().read(cx).snapshot(cx);
-        let all_diagnostics = snapshot
-            .diagnostics_in_range(MultiBufferOffset(0)..snapshot.len())
-            .collect::<Vec<_>>();
-        assert_eq!(
-            all_diagnostics.len(),
-            2,
-            "Expected pull and push diagnostics, but got: {all_diagnostics:?}"
-        );
-        let expected_messages = [
-            expected_workspace_pull_diagnostics_main_message,
-            expected_pull_diagnostic_main_message,
-            expected_push_diagnostic_main_message,
-        ];
-        for diagnostic in all_diagnostics {
-            assert!(
-                expected_messages.contains(&diagnostic.diagnostic.message.as_str()),
-                "Expected push and pull messages on the host: {expected_messages:?}, but got: {}",
-                diagnostic.diagnostic.message
-            );
-        }
-    });
-
-    let (workspace_b, cx_b) = client_b.build_workspace(&project_b, cx_b);
-    let editor_b_main = workspace_b
-        .update_in(cx_b, |workspace, window, cx| {
-            workspace.open_path((worktree_id, rel_path("main.rs")), None, true, window, cx)
-        })
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-    cx_b.run_until_parked();
-
-    pull_diagnostics_handle.next().await.unwrap();
-    assert_eq!(
-        2,
-        diagnostics_pulls_made.load(atomic::Ordering::Acquire),
-        "Client should query pull diagnostics when its editor is opened"
-    );
-    executor.run_until_parked();
-    assert_eq!(
-        workspace_diagnostic_start_count,
-        workspace_diagnostics_pulls_made.load(atomic::Ordering::Acquire),
-        "Workspace diagnostics should not be changed as the remote client does not initialize the workspace diagnostics pull"
-    );
-    editor_b_main.update(cx_b, |editor, cx| {
-        let snapshot = editor.buffer().read(cx).snapshot(cx);
-        let all_diagnostics = snapshot
-            .diagnostics_in_range(MultiBufferOffset(0)..snapshot.len())
-            .collect::<Vec<_>>();
-        assert_eq!(
-            all_diagnostics.len(),
-            2,
-            "Expected pull and push diagnostics, but got: {all_diagnostics:?}"
-        );
-
-        // Despite the workspace diagnostics not re-initialized for the remote client, we can still expect its message synced from the host.
-        let expected_messages = [
-            expected_workspace_pull_diagnostics_main_message,
-            expected_pull_diagnostic_main_message,
-            expected_push_diagnostic_main_message,
-        ];
-        for diagnostic in all_diagnostics {
-            assert!(
-                expected_messages.contains(&diagnostic.diagnostic.message.as_str()),
-                "The client should get both push and pull messages: {expected_messages:?}, but got: {}",
-                diagnostic.diagnostic.message
-            );
-        }
-    });
-
-    let editor_b_lib = workspace_b
-        .update_in(cx_b, |workspace, window, cx| {
-            workspace.open_path((worktree_id, rel_path("lib.rs")), None, true, window, cx)
-        })
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-
-    pull_diagnostics_handle.next().await.unwrap();
-    assert_eq!(
-        3,
-        diagnostics_pulls_made.load(atomic::Ordering::Acquire),
-        "Client should query pull diagnostics when its another editor is opened"
-    );
-    executor.run_until_parked();
-    assert_eq!(
-        workspace_diagnostic_start_count,
-        workspace_diagnostics_pulls_made.load(atomic::Ordering::Acquire),
-        "The remote client still did not anything to trigger the workspace diagnostics pull"
-    );
-    editor_b_lib.update(cx_b, |editor, cx| {
-        let snapshot = editor.buffer().read(cx).snapshot(cx);
-        let all_diagnostics = snapshot
-            .diagnostics_in_range(MultiBufferOffset(0)..snapshot.len())
-            .collect::<Vec<_>>();
-        let expected_messages = [
-            expected_pull_diagnostic_lib_message,
-            expected_push_diagnostic_lib_message,
-        ];
-        assert_eq!(
-            all_diagnostics.len(),
-            2,
-            "Expected pull and push diagnostics, but got: {all_diagnostics:?}"
-        );
-        for diagnostic in all_diagnostics {
-            assert!(
-                expected_messages.contains(&diagnostic.diagnostic.message.as_str()),
-                "The client should get both push and pull messages: {expected_messages:?}, but got: {}",
-                diagnostic.diagnostic.message
-            );
-        }
-    });
-
-    if should_stream_workspace_diagnostic {
-        fake_language_server.notify::<lsp::notification::Progress>(lsp::ProgressParams {
-            token: expected_workspace_diagnostic_token.clone(),
-            value: lsp::ProgressParamsValue::WorkspaceDiagnostic(
-                lsp::WorkspaceDiagnosticReportResult::Report(lsp::WorkspaceDiagnosticReport {
-                    items: vec![lsp::WorkspaceDocumentDiagnosticReport::Full(
-                        lsp::WorkspaceFullDocumentDiagnosticReport {
-                            uri: lsp::Uri::from_file_path(path!("/a/lib.rs")).unwrap(),
-                            version: None,
-                            full_document_diagnostic_report: lsp::FullDocumentDiagnosticReport {
-                                result_id: Some(format!(
-                                    "workspace_{}",
-                                    workspace_diagnostics_pulls_made
-                                        .fetch_add(1, atomic::Ordering::Release)
-                                        + 1
-                                )),
-                                items: vec![lsp::Diagnostic {
-                                    range: lsp::Range {
-                                        start: lsp::Position {
-                                            line: 0,
-                                            character: 1,
-                                        },
-                                        end: lsp::Position {
-                                            line: 0,
-                                            character: 2,
-                                        },
-                                    },
-                                    severity: Some(lsp::DiagnosticSeverity::ERROR),
-                                    message: expected_workspace_pull_diagnostics_lib_message
-                                        .to_string(),
-                                    ..lsp::Diagnostic::default()
-                                }],
-                            },
-                        },
-                    )],
-                }),
-            ),
-        });
-        workspace_diagnostic_start_count =
-            workspace_diagnostics_pulls_made.load(atomic::Ordering::Acquire);
-        workspace_diagnostic_cancel_tx.send(()).await.unwrap();
-        workspace_diagnostics_pulls_handle.next().await.unwrap();
-        executor.run_until_parked();
-        editor_b_lib.update(cx_b, |editor, cx| {
-            let snapshot = editor.buffer().read(cx).snapshot(cx);
-            let all_diagnostics = snapshot
-                .diagnostics_in_range(MultiBufferOffset(0)..snapshot.len())
-                .collect::<Vec<_>>();
-            let expected_messages = [
-                // Despite workspace diagnostics provided,
-                // the currently open file's diagnostics should be preferred, as LSP suggests.
-                expected_pull_diagnostic_lib_message,
-                expected_push_diagnostic_lib_message,
-            ];
-            assert_eq!(
-                all_diagnostics.len(),
-                2,
-                "Expected pull and push diagnostics, but got: {all_diagnostics:?}"
-            );
-            for diagnostic in all_diagnostics {
-                assert!(
-                    expected_messages.contains(&diagnostic.diagnostic.message.as_str()),
-                    "The client should get both push and pull messages: {expected_messages:?}, but got: {}",
-                    diagnostic.diagnostic.message
-                );
-            }
-        });
-    };
-
-    {
-        assert!(
-            !diagnostics_pulls_result_ids.lock().await.is_empty(),
-            "Initial diagnostics pulls should report None at least"
-        );
-        assert_eq!(
-            0,
-            workspace_diagnostics_pulls_result_ids
-                .lock()
-                .await
-                .deref()
-                .len(),
-            "After the initial workspace request, opening files should not reuse any result ids"
-        );
-    }
-
-    editor_b_lib.update_in(cx_b, |editor, window, cx| {
-        editor.move_to_end(&MoveToEnd, window, cx);
-        editor.handle_input(":", window, cx);
-    });
-    pull_diagnostics_handle.next().await.unwrap();
-    assert_eq!(
-        4,
-        diagnostics_pulls_made.load(atomic::Ordering::Acquire),
-        "Client lib.rs edits should trigger another diagnostics pull for a buffer"
-    );
-    workspace_diagnostics_pulls_handle.next().await.unwrap();
-    assert_eq!(
-        workspace_diagnostic_start_count + 1,
-        workspace_diagnostics_pulls_made.load(atomic::Ordering::Acquire),
-        "After client lib.rs edits, the workspace diagnostics request should follow"
-    );
-    executor.run_until_parked();
-
-    editor_b_main.update_in(cx_b, |editor, window, cx| {
-        editor.move_to_end(&MoveToEnd, window, cx);
-        editor.handle_input(":", window, cx);
-    });
-    pull_diagnostics_handle.next().await.unwrap();
-    pull_diagnostics_handle.next().await.unwrap();
-    assert_eq!(
-        6,
-        diagnostics_pulls_made.load(atomic::Ordering::Acquire),
-        "Client main.rs edits should trigger another diagnostics pull by both client and host as they share the buffer"
-    );
-    workspace_diagnostics_pulls_handle.next().await.unwrap();
-    assert_eq!(
-        workspace_diagnostic_start_count + 2,
-        workspace_diagnostics_pulls_made.load(atomic::Ordering::Acquire),
-        "After client main.rs edits, the workspace diagnostics pull should follow"
-    );
-    executor.run_until_parked();
-
-    editor_a_main.update_in(cx_a, |editor, window, cx| {
-        editor.move_to_end(&MoveToEnd, window, cx);
-        editor.handle_input(":", window, cx);
-    });
-    pull_diagnostics_handle.next().await.unwrap();
-    pull_diagnostics_handle.next().await.unwrap();
-    assert_eq!(
-        8,
-        diagnostics_pulls_made.load(atomic::Ordering::Acquire),
-        "Host main.rs edits should trigger another diagnostics pull by both client and host as they share the buffer"
-    );
-    workspace_diagnostics_pulls_handle.next().await.unwrap();
-    assert_eq!(
-        workspace_diagnostic_start_count + 3,
-        workspace_diagnostics_pulls_made.load(atomic::Ordering::Acquire),
-        "After host main.rs edits, the workspace diagnostics pull should follow"
-    );
-    executor.run_until_parked();
-    let diagnostic_pulls_result_ids = diagnostics_pulls_result_ids.lock().await.len();
-    let workspace_pulls_result_ids = workspace_diagnostics_pulls_result_ids.lock().await.len();
-    {
-        assert!(
-            diagnostic_pulls_result_ids > 1,
-            "Should have sent result ids when pulling diagnostics"
-        );
-        assert!(
-            workspace_pulls_result_ids > 1,
-            "Should have sent result ids when pulling workspace diagnostics"
-        );
-    }
-
-    fake_language_server
-        .request::<lsp::request::WorkspaceDiagnosticRefresh>(())
-        .await
-        .into_response()
-        .expect("workspace diagnostics refresh request failed");
-    assert_eq!(
-        8,
-        diagnostics_pulls_made.load(atomic::Ordering::Acquire),
-        "No single file pulls should happen after the diagnostics refresh server request"
-    );
-    workspace_diagnostics_pulls_handle.next().await.unwrap();
-    assert_eq!(
-        workspace_diagnostic_start_count + 4,
-        workspace_diagnostics_pulls_made.load(atomic::Ordering::Acquire),
-        "Another workspace diagnostics pull should happen after the diagnostics refresh server request"
-    );
-    {
-        assert_eq!(
-            diagnostics_pulls_result_ids.lock().await.len(),
-            diagnostic_pulls_result_ids,
-            "Pulls should not happen hence no extra ids should appear"
-        );
-        assert!(
-            workspace_diagnostics_pulls_result_ids.lock().await.len() > workspace_pulls_result_ids,
-            "More workspace diagnostics should be pulled"
-        );
-    }
-    editor_b_lib.update(cx_b, |editor, cx| {
-        let snapshot = editor.buffer().read(cx).snapshot(cx);
-        let all_diagnostics = snapshot
-            .diagnostics_in_range(MultiBufferOffset(0)..snapshot.len())
-            .collect::<Vec<_>>();
-        let expected_messages = [
-            expected_workspace_pull_diagnostics_lib_message,
-            expected_pull_diagnostic_lib_message,
-            expected_push_diagnostic_lib_message,
-        ];
-        assert_eq!(all_diagnostics.len(), 2);
-        for diagnostic in &all_diagnostics {
-            assert!(
-                expected_messages.contains(&diagnostic.diagnostic.message.as_str()),
-                "Unexpected diagnostics: {all_diagnostics:?}"
-            );
-        }
-    });
-    editor_b_main.update(cx_b, |editor, cx| {
-        let snapshot = editor.buffer().read(cx).snapshot(cx);
-        let all_diagnostics = snapshot
-            .diagnostics_in_range(MultiBufferOffset(0)..snapshot.len())
-            .collect::<Vec<_>>();
-        assert_eq!(all_diagnostics.len(), 2);
-
-        let expected_messages = [
-            expected_workspace_pull_diagnostics_main_message,
-            expected_pull_diagnostic_main_message,
-            expected_push_diagnostic_main_message,
-        ];
-        for diagnostic in &all_diagnostics {
-            assert!(
-                expected_messages.contains(&diagnostic.diagnostic.message.as_str()),
-                "Unexpected diagnostics: {all_diagnostics:?}"
-            );
-        }
-    });
-    editor_a_main.update(cx_a, |editor, cx| {
-        let snapshot = editor.buffer().read(cx).snapshot(cx);
-        let all_diagnostics = snapshot
-            .diagnostics_in_range(MultiBufferOffset(0)..snapshot.len())
-            .collect::<Vec<_>>();
-        assert_eq!(all_diagnostics.len(), 2);
-        let expected_messages = [
-            expected_workspace_pull_diagnostics_main_message,
-            expected_pull_diagnostic_main_message,
-            expected_push_diagnostic_main_message,
-        ];
-        for diagnostic in &all_diagnostics {
-            assert!(
-                expected_messages.contains(&diagnostic.diagnostic.message.as_str()),
-                "Unexpected diagnostics: {all_diagnostics:?}"
-            );
-        }
-    });
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_non_streamed_lsp_pull_diagnostics(
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    test_lsp_pull_diagnostics(false, cx_a, cx_b).await;
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_streamed_lsp_pull_diagnostics(cx_a: &mut TestAppContext, cx_b: &mut TestAppContext) {
-    test_lsp_pull_diagnostics(true, cx_a, cx_b).await;
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_git_blame_is_forwarded(cx_a: &mut TestAppContext, cx_b: &mut TestAppContext) {
-    let mut server = TestServer::start(cx_a.executor()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-
-    cx_a.update(editor::init);
-    cx_b.update(editor::init);
-    // Turn inline-blame-off by default so no state is transferred without us explicitly doing so
-    let inline_blame_off_settings = Some(InlineBlameSettings {
-        enabled: Some(false),
-        ..Default::default()
-    });
-    cx_a.update(|cx| {
-        SettingsStore::update_global(cx, |store, cx| {
-            store.update_user_settings(cx, |settings| {
-                settings.git.get_or_insert_default().inline_blame = inline_blame_off_settings;
-            });
-        });
-    });
-    cx_b.update(|cx| {
-        SettingsStore::update_global(cx, |store, cx| {
-            store.update_user_settings(cx, |settings| {
-                settings.git.get_or_insert_default().inline_blame = inline_blame_off_settings;
-            });
-        });
-    });
-
-    client_a
-        .fs()
-        .insert_tree(
-            path!("/my-repo"),
-            json!({
-                ".git": {},
-                "file.txt": "line1\nline2\nline3\nline\n",
-            }),
-        )
-        .await;
-
-    let blame = git::blame::Blame {
-        entries: vec![
-            blame_entry("1b1b1b", 0..1),
-            blame_entry("0d0d0d", 1..2),
-            blame_entry("3a3a3a", 2..3),
-            blame_entry("4c4c4c", 3..4),
-        ],
-        messages: [
-            ("1b1b1b", "message for idx-0"),
-            ("0d0d0d", "message for idx-1"),
-            ("3a3a3a", "message for idx-2"),
-            ("4c4c4c", "message for idx-3"),
-        ]
-        .into_iter()
-        .map(|(sha, message)| (sha.parse().unwrap(), message.into()))
-        .collect(),
-    };
-    client_a.fs().set_blame_for_repo(
-        Path::new(path!("/my-repo/.git")),
-        vec![(repo_path("file.txt"), blame)],
-    );
-
-    let (project_a, worktree_id) = client_a.build_local_project(path!("/my-repo"), cx_a).await;
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-
-    // Create editor_a
-    let (workspace_a, cx_a) = client_a.build_workspace(&project_a, cx_a);
-    let editor_a = workspace_a
-        .update_in(cx_a, |workspace, window, cx| {
-            workspace.open_path((worktree_id, rel_path("file.txt")), None, true, window, cx)
-        })
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-
-    // Join the project as client B.
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-    let (workspace_b, cx_b) = client_b.build_workspace(&project_b, cx_b);
-    let editor_b = workspace_b
-        .update_in(cx_b, |workspace, window, cx| {
-            workspace.open_path((worktree_id, rel_path("file.txt")), None, true, window, cx)
-        })
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-    let buffer_id_b = editor_b.update(cx_b, |editor_b, cx| {
-        editor_b
-            .buffer()
-            .read(cx)
-            .as_singleton()
-            .unwrap()
-            .read(cx)
-            .remote_id()
-    });
-
-    // client_b now requests git blame for the open buffer
-    editor_b.update_in(cx_b, |editor_b, window, cx| {
-        assert!(editor_b.blame().is_none());
-        editor_b.toggle_git_blame(&git::Blame {}, window, cx);
-    });
-
-    cx_a.executor().run_until_parked();
-    cx_b.executor().run_until_parked();
-
-    editor_b.update(cx_b, |editor_b, cx| {
-        let blame = editor_b.blame().expect("editor_b should have blame now");
-        let entries = blame.update(cx, |blame, cx| {
-            blame
-                .blame_for_rows(
-                    &(0..4)
-                        .map(|row| RowInfo {
-                            buffer_row: Some(row),
-                            buffer_id: Some(buffer_id_b),
-                            ..Default::default()
-                        })
-                        .collect::<Vec<_>>(),
-                    cx,
-                )
-                .collect::<Vec<_>>()
-        });
-
-        assert_eq!(
-            entries,
-            vec![
-                Some((buffer_id_b, blame_entry("1b1b1b", 0..1))),
-                Some((buffer_id_b, blame_entry("0d0d0d", 1..2))),
-                Some((buffer_id_b, blame_entry("3a3a3a", 2..3))),
-                Some((buffer_id_b, blame_entry("4c4c4c", 3..4))),
-            ]
-        );
-
-        blame.update(cx, |blame, _| {
-            for (idx, (buffer, entry)) in entries.iter().flatten().enumerate() {
-                let details = blame.details_for_entry(*buffer, entry).unwrap();
-                assert_eq!(details.message, format!("message for idx-{}", idx));
-            }
-        });
-    });
-
-    // editor_b updates the file, which gets sent to client_a, which updates git blame,
-    // which gets back to client_b.
-    editor_b.update_in(cx_b, |editor_b, _, cx| {
-        editor_b.edit([(Point::new(0, 3)..Point::new(0, 3), "FOO")], cx);
-    });
-
-    cx_a.executor().run_until_parked();
-    cx_b.executor().run_until_parked();
-
-    editor_b.update(cx_b, |editor_b, cx| {
-        let blame = editor_b.blame().expect("editor_b should have blame now");
-        let entries = blame.update(cx, |blame, cx| {
-            blame
-                .blame_for_rows(
-                    &(0..4)
-                        .map(|row| RowInfo {
-                            buffer_row: Some(row),
-                            buffer_id: Some(buffer_id_b),
-                            ..Default::default()
-                        })
-                        .collect::<Vec<_>>(),
-                    cx,
-                )
-                .collect::<Vec<_>>()
-        });
-
-        assert_eq!(
-            entries,
-            vec![
-                None,
-                Some((buffer_id_b, blame_entry("0d0d0d", 1..2))),
-                Some((buffer_id_b, blame_entry("3a3a3a", 2..3))),
-                Some((buffer_id_b, blame_entry("4c4c4c", 3..4))),
-            ]
-        );
-    });
-
-    // Now editor_a also updates the file
-    editor_a.update_in(cx_a, |editor_a, _, cx| {
-        editor_a.edit([(Point::new(1, 3)..Point::new(1, 3), "FOO")], cx);
-    });
-
-    cx_a.executor().run_until_parked();
-    cx_b.executor().run_until_parked();
-
-    editor_b.update(cx_b, |editor_b, cx| {
-        let blame = editor_b.blame().expect("editor_b should have blame now");
-        let entries = blame.update(cx, |blame, cx| {
-            blame
-                .blame_for_rows(
-                    &(0..4)
-                        .map(|row| RowInfo {
-                            buffer_row: Some(row),
-                            buffer_id: Some(buffer_id_b),
-                            ..Default::default()
-                        })
-                        .collect::<Vec<_>>(),
-                    cx,
-                )
-                .collect::<Vec<_>>()
-        });
-
-        assert_eq!(
-            entries,
-            vec![
-                None,
-                None,
-                Some((buffer_id_b, blame_entry("3a3a3a", 2..3))),
-                Some((buffer_id_b, blame_entry("4c4c4c", 3..4))),
-            ]
-        );
-    });
-}
-
-#[gpui::test(iterations = 30)]
-async fn test_collaborating_with_editorconfig(
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(cx_a.executor()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-
-    cx_b.update(editor::init);
-
-    // Set up a fake language server.
-    client_a.language_registry().add(rust_lang());
-    client_a
-        .fs()
-        .insert_tree(
-            path!("/a"),
-            json!({
-                "src": {
-                    "main.rs": "mod other;\nfn main() { let foo = other::foo(); }",
-                    "other_mod": {
-                        "other.rs": "pub fn foo() -> usize {\n    4\n}",
-                        ".editorconfig": "",
-                    },
-                },
-                ".editorconfig": "[*]\ntab_width = 2\n",
-            }),
-        )
-        .await;
-    let (project_a, worktree_id) = client_a.build_local_project(path!("/a"), cx_a).await;
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-    let main_buffer_a = project_a
-        .update(cx_a, |p, cx| {
-            p.open_buffer((worktree_id, rel_path("src/main.rs")), cx)
-        })
-        .await
-        .unwrap();
-    let other_buffer_a = project_a
-        .update(cx_a, |p, cx| {
-            p.open_buffer((worktree_id, rel_path("src/other_mod/other.rs")), cx)
-        })
-        .await
-        .unwrap();
-    let cx_a = cx_a.add_empty_window();
-    let main_editor_a = cx_a.new_window_entity(|window, cx| {
-        Editor::for_buffer(main_buffer_a, Some(project_a.clone()), window, cx)
-    });
-    let other_editor_a = cx_a.new_window_entity(|window, cx| {
-        Editor::for_buffer(other_buffer_a, Some(project_a), window, cx)
-    });
-    let mut main_editor_cx_a = EditorTestContext {
-        cx: cx_a.clone(),
-        window: cx_a.window_handle(),
-        editor: main_editor_a,
-        assertion_cx: AssertionContextManager::new(),
-    };
-    let mut other_editor_cx_a = EditorTestContext {
-        cx: cx_a.clone(),
-        window: cx_a.window_handle(),
-        editor: other_editor_a,
-        assertion_cx: AssertionContextManager::new(),
-    };
-
-    // Join the project as client B.
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-    let main_buffer_b = project_b
-        .update(cx_b, |p, cx| {
-            p.open_buffer((worktree_id, rel_path("src/main.rs")), cx)
-        })
-        .await
-        .unwrap();
-    let other_buffer_b = project_b
-        .update(cx_b, |p, cx| {
-            p.open_buffer((worktree_id, rel_path("src/other_mod/other.rs")), cx)
-        })
-        .await
-        .unwrap();
-    let cx_b = cx_b.add_empty_window();
-    let main_editor_b = cx_b.new_window_entity(|window, cx| {
-        Editor::for_buffer(main_buffer_b, Some(project_b.clone()), window, cx)
-    });
-    let other_editor_b = cx_b.new_window_entity(|window, cx| {
-        Editor::for_buffer(other_buffer_b, Some(project_b.clone()), window, cx)
-    });
-    let mut main_editor_cx_b = EditorTestContext {
-        cx: cx_b.clone(),
-        window: cx_b.window_handle(),
-        editor: main_editor_b,
-        assertion_cx: AssertionContextManager::new(),
-    };
-    let mut other_editor_cx_b = EditorTestContext {
-        cx: cx_b.clone(),
-        window: cx_b.window_handle(),
-        editor: other_editor_b,
-        assertion_cx: AssertionContextManager::new(),
-    };
-
-    let initial_main = indoc! {"
-ˇmod other;
-fn main() { let foo = other::foo(); }"};
-    let initial_other = indoc! {"
-ˇpub fn foo() -> usize {
-    4
-}"};
-
-    let first_tabbed_main = indoc! {"
-  ˇmod other;
-fn main() { let foo = other::foo(); }"};
-    tab_undo_assert(
-        &mut main_editor_cx_a,
-        &mut main_editor_cx_b,
-        initial_main,
-        first_tabbed_main,
-        true,
-    );
-    tab_undo_assert(
-        &mut main_editor_cx_a,
-        &mut main_editor_cx_b,
-        initial_main,
-        first_tabbed_main,
-        false,
-    );
-
-    let first_tabbed_other = indoc! {"
-  ˇpub fn foo() -> usize {
-    4
-}"};
-    tab_undo_assert(
-        &mut other_editor_cx_a,
-        &mut other_editor_cx_b,
-        initial_other,
-        first_tabbed_other,
-        true,
-    );
-    tab_undo_assert(
-        &mut other_editor_cx_a,
-        &mut other_editor_cx_b,
-        initial_other,
-        first_tabbed_other,
-        false,
-    );
-
-    client_a
-        .fs()
-        .atomic_write(
-            PathBuf::from(path!("/a/src/.editorconfig")),
-            "[*]\ntab_width = 3\n".to_owned(),
-        )
-        .await
-        .unwrap();
-    cx_a.run_until_parked();
-    cx_b.run_until_parked();
-
-    let second_tabbed_main = indoc! {"
-   ˇmod other;
-fn main() { let foo = other::foo(); }"};
-    tab_undo_assert(
-        &mut main_editor_cx_a,
-        &mut main_editor_cx_b,
-        initial_main,
-        second_tabbed_main,
-        true,
-    );
-    tab_undo_assert(
-        &mut main_editor_cx_a,
-        &mut main_editor_cx_b,
-        initial_main,
-        second_tabbed_main,
-        false,
-    );
-
-    let second_tabbed_other = indoc! {"
-   ˇpub fn foo() -> usize {
-    4
-}"};
-    tab_undo_assert(
-        &mut other_editor_cx_a,
-        &mut other_editor_cx_b,
-        initial_other,
-        second_tabbed_other,
-        true,
-    );
-    tab_undo_assert(
-        &mut other_editor_cx_a,
-        &mut other_editor_cx_b,
-        initial_other,
-        second_tabbed_other,
-        false,
-    );
-
-    let editorconfig_buffer_b = project_b
-        .update(cx_b, |p, cx| {
-            p.open_buffer((worktree_id, rel_path("src/other_mod/.editorconfig")), cx)
-        })
-        .await
-        .unwrap();
-    editorconfig_buffer_b.update(cx_b, |buffer, cx| {
-        buffer.set_text("[*.rs]\ntab_width = 6\n", cx);
-    });
-    project_b
-        .update(cx_b, |project, cx| {
-            project.save_buffer(editorconfig_buffer_b.clone(), cx)
-        })
-        .await
-        .unwrap();
-    cx_a.run_until_parked();
-    cx_b.run_until_parked();
-
-    tab_undo_assert(
-        &mut main_editor_cx_a,
-        &mut main_editor_cx_b,
-        initial_main,
-        second_tabbed_main,
-        true,
-    );
-    tab_undo_assert(
-        &mut main_editor_cx_a,
-        &mut main_editor_cx_b,
-        initial_main,
-        second_tabbed_main,
-        false,
-    );
-
-    let third_tabbed_other = indoc! {"
-      ˇpub fn foo() -> usize {
-    4
-}"};
-    tab_undo_assert(
-        &mut other_editor_cx_a,
-        &mut other_editor_cx_b,
-        initial_other,
-        third_tabbed_other,
-        true,
-    );
-
-    tab_undo_assert(
-        &mut other_editor_cx_a,
-        &mut other_editor_cx_b,
-        initial_other,
-        third_tabbed_other,
-        false,
-    );
-}
-
-#[gpui::test]
-async fn test_add_breakpoints(cx_a: &mut TestAppContext, cx_b: &mut TestAppContext) {
-    let executor = cx_a.executor();
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-    let active_call_b = cx_b.read(ActiveCall::global);
-    cx_a.update(editor::init);
-    cx_b.update(editor::init);
-    client_a
-        .fs()
-        .insert_tree(
-            "/a",
-            json!({
-                "test.txt": "one\ntwo\nthree\nfour\nfive",
-            }),
-        )
-        .await;
-    let (project_a, worktree_id) = client_a.build_local_project("/a", cx_a).await;
-    let project_path = ProjectPath {
-        worktree_id,
-        path: rel_path(&"test.txt").into(),
-    };
-    let abs_path = project_a.read_with(cx_a, |project, cx| {
-        project
-            .absolute_path(&project_path, cx)
-            .map(Arc::from)
-            .unwrap()
-    });
-
-    active_call_a
-        .update(cx_a, |call, cx| call.set_location(Some(&project_a), cx))
-        .await
-        .unwrap();
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-    active_call_b
-        .update(cx_b, |call, cx| call.set_location(Some(&project_b), cx))
-        .await
-        .unwrap();
-    let (workspace_a, cx_a) = client_a.build_workspace(&project_a, cx_a);
-    let (workspace_b, cx_b) = client_b.build_workspace(&project_b, cx_b);
-
-    // Client A opens an editor.
-    let editor_a = workspace_a
-        .update_in(cx_a, |workspace, window, cx| {
-            workspace.open_path(project_path.clone(), None, true, window, cx)
-        })
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-
-    // Client B opens same editor as A.
-    let editor_b = workspace_b
-        .update_in(cx_b, |workspace, window, cx| {
-            workspace.open_path(project_path.clone(), None, true, window, cx)
-        })
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-
-    cx_a.run_until_parked();
-    cx_b.run_until_parked();
-
-    // Client A adds breakpoint on line (1)
-    editor_a.update_in(cx_a, |editor, window, cx| {
-        editor.toggle_breakpoint(&editor::actions::ToggleBreakpoint, window, cx);
-    });
-
-    cx_a.run_until_parked();
-    cx_b.run_until_parked();
-
-    let breakpoints_a = editor_a.update(cx_a, |editor, cx| {
-        editor
-            .breakpoint_store()
-            .unwrap()
-            .read(cx)
-            .all_source_breakpoints(cx)
-    });
-    let breakpoints_b = editor_b.update(cx_b, |editor, cx| {
-        editor
-            .breakpoint_store()
-            .unwrap()
-            .read(cx)
-            .all_source_breakpoints(cx)
-    });
-
-    assert_eq!(1, breakpoints_a.len());
-    assert_eq!(1, breakpoints_a.get(&abs_path).unwrap().len());
-    assert_eq!(breakpoints_a, breakpoints_b);
-
-    // Client B adds breakpoint on line(2)
-    editor_b.update_in(cx_b, |editor, window, cx| {
-        editor.move_down(&editor::actions::MoveDown, window, cx);
-        editor.move_down(&editor::actions::MoveDown, window, cx);
-        editor.toggle_breakpoint(&editor::actions::ToggleBreakpoint, window, cx);
-    });
-
-    cx_a.run_until_parked();
-    cx_b.run_until_parked();
-
-    let breakpoints_a = editor_a.update(cx_a, |editor, cx| {
-        editor
-            .breakpoint_store()
-            .unwrap()
-            .read(cx)
-            .all_source_breakpoints(cx)
-    });
-    let breakpoints_b = editor_b.update(cx_b, |editor, cx| {
-        editor
-            .breakpoint_store()
-            .unwrap()
-            .read(cx)
-            .all_source_breakpoints(cx)
-    });
-
-    assert_eq!(1, breakpoints_a.len());
-    assert_eq!(breakpoints_a, breakpoints_b);
-    assert_eq!(2, breakpoints_a.get(&abs_path).unwrap().len());
-
-    // Client A removes last added breakpoint from client B
-    editor_a.update_in(cx_a, |editor, window, cx| {
-        editor.move_down(&editor::actions::MoveDown, window, cx);
-        editor.move_down(&editor::actions::MoveDown, window, cx);
-        editor.toggle_breakpoint(&editor::actions::ToggleBreakpoint, window, cx);
-    });
-
-    cx_a.run_until_parked();
-    cx_b.run_until_parked();
-
-    let breakpoints_a = editor_a.update(cx_a, |editor, cx| {
-        editor
-            .breakpoint_store()
-            .unwrap()
-            .read(cx)
-            .all_source_breakpoints(cx)
-    });
-    let breakpoints_b = editor_b.update(cx_b, |editor, cx| {
-        editor
-            .breakpoint_store()
-            .unwrap()
-            .read(cx)
-            .all_source_breakpoints(cx)
-    });
-
-    assert_eq!(1, breakpoints_a.len());
-    assert_eq!(breakpoints_a, breakpoints_b);
-    assert_eq!(1, breakpoints_a.get(&abs_path).unwrap().len());
-
-    // Client B removes first added breakpoint by client A
-    editor_b.update_in(cx_b, |editor, window, cx| {
-        editor.move_up(&editor::actions::MoveUp, window, cx);
-        editor.move_up(&editor::actions::MoveUp, window, cx);
-        editor.toggle_breakpoint(&editor::actions::ToggleBreakpoint, window, cx);
-    });
-
-    cx_a.run_until_parked();
-    cx_b.run_until_parked();
-
-    let breakpoints_a = editor_a.update(cx_a, |editor, cx| {
-        editor
-            .breakpoint_store()
-            .unwrap()
-            .read(cx)
-            .all_source_breakpoints(cx)
-    });
-    let breakpoints_b = editor_b.update(cx_b, |editor, cx| {
-        editor
-            .breakpoint_store()
-            .unwrap()
-            .read(cx)
-            .all_source_breakpoints(cx)
-    });
-
-    assert_eq!(0, breakpoints_a.len());
-    assert_eq!(breakpoints_a, breakpoints_b);
-}
-
-#[gpui::test]
-async fn test_client_can_query_lsp_ext(cx_a: &mut TestAppContext, cx_b: &mut TestAppContext) {
-    let mut server = TestServer::start(cx_a.executor()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-    let active_call_b = cx_b.read(ActiveCall::global);
-
-    cx_a.update(editor::init);
-    cx_b.update(editor::init);
-
-    client_a.language_registry().add(rust_lang());
-    let mut fake_language_servers = client_a.language_registry().register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            name: "rust-analyzer",
-            ..FakeLspAdapter::default()
-        },
-    );
-    client_b.language_registry().add(rust_lang());
-    client_b.language_registry().register_fake_lsp_adapter(
-        "Rust",
-        FakeLspAdapter {
-            name: "rust-analyzer",
-            ..FakeLspAdapter::default()
-        },
-    );
-
-    client_a
-        .fs()
-        .insert_tree(
-            path!("/a"),
-            json!({
-                "main.rs": "fn main() {}",
-            }),
-        )
-        .await;
-    let (project_a, worktree_id) = client_a.build_local_project(path!("/a"), cx_a).await;
-    active_call_a
-        .update(cx_a, |call, cx| call.set_location(Some(&project_a), cx))
-        .await
-        .unwrap();
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-    active_call_b
-        .update(cx_b, |call, cx| call.set_location(Some(&project_b), cx))
-        .await
-        .unwrap();
-
-    let (workspace_a, cx_a) = client_a.build_workspace(&project_a, cx_a);
-    let (workspace_b, cx_b) = client_b.build_workspace(&project_b, cx_b);
-
-    let editor_a = workspace_a
-        .update_in(cx_a, |workspace, window, cx| {
-            workspace.open_path((worktree_id, rel_path("main.rs")), None, true, window, cx)
-        })
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-
-    let editor_b = workspace_b
-        .update_in(cx_b, |workspace, window, cx| {
-            workspace.open_path((worktree_id, rel_path("main.rs")), None, true, window, cx)
-        })
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-
-    let fake_language_server = fake_language_servers.next().await.unwrap();
-
-    // host
-    let mut expand_request_a = fake_language_server.set_request_handler::<LspExtExpandMacro, _, _>(
-        |params, _| async move {
-            assert_eq!(
-                params.text_document.uri,
-                lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap(),
-            );
-            assert_eq!(params.position, lsp::Position::new(0, 0));
-            Ok(Some(ExpandedMacro {
-                name: "test_macro_name".to_string(),
-                expansion: "test_macro_expansion on the host".to_string(),
-            }))
-        },
-    );
-
-    editor_a.update_in(cx_a, |editor, window, cx| {
-        expand_macro_recursively(editor, &ExpandMacroRecursively, window, cx)
-    });
-    expand_request_a.next().await.unwrap();
-    cx_a.run_until_parked();
-
-    workspace_a.update(cx_a, |workspace, cx| {
-        workspace.active_pane().update(cx, |pane, cx| {
-            assert_eq!(
-                pane.items_len(),
-                2,
-                "Should have added a macro expansion to the host's pane"
-            );
-            let new_editor = pane.active_item().unwrap().downcast::<Editor>().unwrap();
-            new_editor.update(cx, |editor, cx| {
-                assert_eq!(editor.text(cx), "test_macro_expansion on the host");
-            });
-        })
-    });
-
-    // client
-    let mut expand_request_b = fake_language_server.set_request_handler::<LspExtExpandMacro, _, _>(
-        |params, _| async move {
-            assert_eq!(
-                params.text_document.uri,
-                lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap(),
-            );
-            assert_eq!(
-                params.position,
-                lsp::Position::new(0, 12),
-                "editor_b has selected the entire text and should query for a different position"
-            );
-            Ok(Some(ExpandedMacro {
-                name: "test_macro_name".to_string(),
-                expansion: "test_macro_expansion on the client".to_string(),
-            }))
-        },
-    );
-
-    editor_b.update_in(cx_b, |editor, window, cx| {
-        editor.select_all(&SelectAll, window, cx);
-        expand_macro_recursively(editor, &ExpandMacroRecursively, window, cx)
-    });
-    expand_request_b.next().await.unwrap();
-    cx_b.run_until_parked();
-
-    workspace_b.update(cx_b, |workspace, cx| {
-        workspace.active_pane().update(cx, |pane, cx| {
-            assert_eq!(
-                pane.items_len(),
-                2,
-                "Should have added a macro expansion to the client's pane"
-            );
-            let new_editor = pane.active_item().unwrap().downcast::<Editor>().unwrap();
-            new_editor.update(cx, |editor, cx| {
-                assert_eq!(editor.text(cx), "test_macro_expansion on the client");
-            });
-        })
-    });
-}
-
-#[gpui::test]
-async fn test_copy_file_name_without_extension(
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(cx_a.executor()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-
-    cx_b.update(editor::init);
-
-    client_a
-        .fs()
-        .insert_tree(
-            path!("/root"),
-            json!({
-                "src": {
-                    "main.rs": indoc! {"
-                        fn main() {
-                            println!(\"Hello, world!\");
-                        }
-                    "},
-                }
-            }),
-        )
-        .await;
-
-    let (project_a, worktree_id) = client_a.build_local_project(path!("/root"), cx_a).await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-
-    let (workspace_a, cx_a) = client_a.build_workspace(&project_a, cx_a);
-    let (workspace_b, cx_b) = client_b.build_workspace(&project_b, cx_b);
-
-    let editor_a = workspace_a
-        .update_in(cx_a, |workspace, window, cx| {
-            workspace.open_path(
-                (worktree_id, rel_path("src/main.rs")),
-                None,
-                true,
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-
-    let editor_b = workspace_b
-        .update_in(cx_b, |workspace, window, cx| {
-            workspace.open_path(
-                (worktree_id, rel_path("src/main.rs")),
-                None,
-                true,
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-
-    cx_a.run_until_parked();
-    cx_b.run_until_parked();
-
-    editor_a.update_in(cx_a, |editor, window, cx| {
-        editor.copy_file_name_without_extension(&CopyFileNameWithoutExtension, window, cx);
-    });
-
-    assert_eq!(
-        cx_a.read_from_clipboard().and_then(|item| item.text()),
-        Some("main".to_string())
-    );
-
-    editor_b.update_in(cx_b, |editor, window, cx| {
-        editor.copy_file_name_without_extension(&CopyFileNameWithoutExtension, window, cx);
-    });
-
-    assert_eq!(
-        cx_b.read_from_clipboard().and_then(|item| item.text()),
-        Some("main".to_string())
-    );
-}
-
-#[gpui::test]
-async fn test_copy_file_name(cx_a: &mut TestAppContext, cx_b: &mut TestAppContext) {
-    let mut server = TestServer::start(cx_a.executor()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-
-    cx_b.update(editor::init);
-
-    client_a
-        .fs()
-        .insert_tree(
-            path!("/root"),
-            json!({
-                "src": {
-                    "main.rs": indoc! {"
-                        fn main() {
-                            println!(\"Hello, world!\");
-                        }
-                    "},
-                }
-            }),
-        )
-        .await;
-
-    let (project_a, worktree_id) = client_a.build_local_project(path!("/root"), cx_a).await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-
-    let (workspace_a, cx_a) = client_a.build_workspace(&project_a, cx_a);
-    let (workspace_b, cx_b) = client_b.build_workspace(&project_b, cx_b);
-
-    let editor_a = workspace_a
-        .update_in(cx_a, |workspace, window, cx| {
-            workspace.open_path(
-                (worktree_id, rel_path("src/main.rs")),
-                None,
-                true,
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-
-    let editor_b = workspace_b
-        .update_in(cx_b, |workspace, window, cx| {
-            workspace.open_path(
-                (worktree_id, rel_path("src/main.rs")),
-                None,
-                true,
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-
-    cx_a.run_until_parked();
-    cx_b.run_until_parked();
-
-    editor_a.update_in(cx_a, |editor, window, cx| {
-        editor.copy_file_name(&CopyFileName, window, cx);
-    });
-
-    assert_eq!(
-        cx_a.read_from_clipboard().and_then(|item| item.text()),
-        Some("main.rs".to_string())
-    );
-
-    editor_b.update_in(cx_b, |editor, window, cx| {
-        editor.copy_file_name(&CopyFileName, window, cx);
-    });
-
-    assert_eq!(
-        cx_b.read_from_clipboard().and_then(|item| item.text()),
-        Some("main.rs".to_string())
-    );
-}
-
-#[gpui::test]
-async fn test_copy_file_location(cx_a: &mut TestAppContext, cx_b: &mut TestAppContext) {
-    let mut server = TestServer::start(cx_a.executor()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-
-    cx_b.update(editor::init);
-
-    client_a
-        .fs()
-        .insert_tree(
-            path!("/root"),
-            json!({
-                "src": {
-                    "main.rs": indoc! {"
-                        fn main() {
-                            println!(\"Hello, world!\");
-                        }
-                    "},
-                }
-            }),
-        )
-        .await;
-
-    let (project_a, worktree_id) = client_a.build_local_project(path!("/root"), cx_a).await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-
-    let (workspace_a, cx_a) = client_a.build_workspace(&project_a, cx_a);
-    let (workspace_b, cx_b) = client_b.build_workspace(&project_b, cx_b);
-
-    let editor_a = workspace_a
-        .update_in(cx_a, |workspace, window, cx| {
-            workspace.open_path(
-                (worktree_id, rel_path("src/main.rs")),
-                None,
-                true,
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-
-    let editor_b = workspace_b
-        .update_in(cx_b, |workspace, window, cx| {
-            workspace.open_path(
-                (worktree_id, rel_path("src/main.rs")),
-                None,
-                true,
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-
-    cx_a.run_until_parked();
-    cx_b.run_until_parked();
-
-    editor_a.update_in(cx_a, |editor, window, cx| {
-        editor.change_selections(Default::default(), window, cx, |s| {
-            s.select_ranges([MultiBufferOffset(16)..MultiBufferOffset(16)]);
-        });
-        editor.copy_file_location(&CopyFileLocation, window, cx);
-    });
-
-    assert_eq!(
-        cx_a.read_from_clipboard().and_then(|item| item.text()),
-        Some(format!("{}:2", path!("src/main.rs")))
-    );
-
-    editor_b.update_in(cx_b, |editor, window, cx| {
-        editor.change_selections(Default::default(), window, cx, |s| {
-            s.select_ranges([MultiBufferOffset(16)..MultiBufferOffset(16)]);
-        });
-        editor.copy_file_location(&CopyFileLocation, window, cx);
-    });
-
-    assert_eq!(
-        cx_b.read_from_clipboard().and_then(|item| item.text()),
-        Some(format!("{}:2", path!("src/main.rs")))
-    );
-}
-
-#[track_caller]
-fn tab_undo_assert(
-    cx_a: &mut EditorTestContext,
-    cx_b: &mut EditorTestContext,
-    expected_initial: &str,
-    expected_tabbed: &str,
-    a_tabs: bool,
-) {
-    cx_a.assert_editor_state(expected_initial);
-    cx_b.assert_editor_state(expected_initial);
-
-    if a_tabs {
-        cx_a.update_editor(|editor, window, cx| {
-            editor.tab(&editor::actions::Tab, window, cx);
-        });
-    } else {
-        cx_b.update_editor(|editor, window, cx| {
-            editor.tab(&editor::actions::Tab, window, cx);
-        });
-    }
-
-    cx_a.run_until_parked();
-    cx_b.run_until_parked();
-
-    cx_a.assert_editor_state(expected_tabbed);
-    cx_b.assert_editor_state(expected_tabbed);
-
-    if a_tabs {
-        cx_a.update_editor(|editor, window, cx| {
-            editor.undo(&editor::actions::Undo, window, cx);
-        });
-    } else {
-        cx_b.update_editor(|editor, window, cx| {
-            editor.undo(&editor::actions::Undo, window, cx);
-        });
-    }
-    cx_a.run_until_parked();
-    cx_b.run_until_parked();
-    cx_a.assert_editor_state(expected_initial);
-    cx_b.assert_editor_state(expected_initial);
-}
-
-fn extract_hint_labels(editor: &Editor, cx: &mut App) -> Vec<String> {
-    let lsp_store = editor.project().unwrap().read(cx).lsp_store();
-
-    let mut all_cached_labels = Vec::new();
-    let mut all_fetched_hints = Vec::new();
-    for buffer in editor.buffer().read(cx).all_buffers() {
-        lsp_store.update(cx, |lsp_store, cx| {
-            let hints = &lsp_store.latest_lsp_data(&buffer, cx).inlay_hints();
-            all_cached_labels.extend(hints.all_cached_hints().into_iter().map(|hint| {
-                let mut label = hint.text().to_string();
-                if hint.padding_left {
-                    label.insert(0, ' ');
-                }
-                if hint.padding_right {
-                    label.push_str(" ");
-                }
-                label
-            }));
-            all_fetched_hints.extend(hints.all_fetched_hints());
-        });
-    }
-
-    assert!(
-        all_fetched_hints.is_empty(),
-        "Did not expect background hints fetch tasks, but got {} of them",
-        all_fetched_hints.len()
-    );
-
-    all_cached_labels
-}
-
-#[track_caller]
-fn extract_color_inlays(editor: &Editor, cx: &App) -> Vec<Rgba> {
-    editor
-        .all_inlays(cx)
-        .into_iter()
-        .filter_map(|inlay| inlay.get_color())
-        .map(Rgba::from)
-        .collect()
-}
-
-fn blame_entry(sha: &str, range: Range<u32>) -> git::blame::BlameEntry {
-    git::blame::BlameEntry {
-        sha: sha.parse().unwrap(),
-        range,
-        ..Default::default()
-    }
-}
diff --git a/crates/collab/src/tests/following_tests.rs b/crates/collab/src/tests/following_tests.rs
deleted file mode 100644
index ec654e0634..0000000000
--- a/crates/collab/src/tests/following_tests.rs
+++ /dev/null
@@ -1,2364 +0,0 @@
-#![allow(clippy::reversed_empty_ranges)]
-use crate::tests::TestServer;
-use call::{ActiveCall, ParticipantLocation};
-use client::ChannelId;
-use collab_ui::{
-    channel_view::ChannelView,
-    notifications::project_shared_notification::ProjectSharedNotification,
-};
-use editor::{Editor, MultiBuffer, MultiBufferOffset, PathKey, SelectionEffects};
-use gpui::{
-    AppContext as _, BackgroundExecutor, BorrowAppContext, Entity, SharedString, TestAppContext,
-    VisualContext, VisualTestContext, point,
-};
-use language::Capability;
-use rpc::proto::PeerId;
-use serde_json::json;
-use settings::SettingsStore;
-use text::{Point, ToPoint};
-use util::{path, rel_path::rel_path, test::sample_text};
-use workspace::{CollaboratorId, SplitDirection, Workspace, item::ItemHandle as _};
-
-use super::TestClient;
-
-#[gpui::test(iterations = 10)]
-async fn test_basic_following(
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-    cx_c: &mut TestAppContext,
-    cx_d: &mut TestAppContext,
-) {
-    let executor = cx_a.executor();
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    let client_c = server.create_client(cx_c, "user_c").await;
-    let client_d = server.create_client(cx_d, "user_d").await;
-    server
-        .create_room(&mut [
-            (&client_a, cx_a),
-            (&client_b, cx_b),
-            (&client_c, cx_c),
-            (&client_d, cx_d),
-        ])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-    let active_call_b = cx_b.read(ActiveCall::global);
-
-    cx_a.update(editor::init);
-    cx_b.update(editor::init);
-
-    client_a
-        .fs()
-        .insert_tree(
-            path!("/a"),
-            json!({
-                "1.txt": "one\none\none",
-                "2.txt": "two\ntwo\ntwo",
-                "3.txt": "three\nthree\nthree",
-            }),
-        )
-        .await;
-    let (project_a, worktree_id) = client_a.build_local_project(path!("/a"), cx_a).await;
-    active_call_a
-        .update(cx_a, |call, cx| call.set_location(Some(&project_a), cx))
-        .await
-        .unwrap();
-
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-    active_call_b
-        .update(cx_b, |call, cx| call.set_location(Some(&project_b), cx))
-        .await
-        .unwrap();
-
-    let (workspace_a, cx_a) = client_a.build_workspace(&project_a, cx_a);
-    let (workspace_b, cx_b) = client_b.build_workspace(&project_b, cx_b);
-
-    cx_b.update(|window, _| {
-        assert!(window.is_window_active());
-    });
-
-    // Client A opens some editors.
-    let pane_a = workspace_a.update(cx_a, |workspace, _| workspace.active_pane().clone());
-    let editor_a1 = workspace_a
-        .update_in(cx_a, |workspace, window, cx| {
-            workspace.open_path((worktree_id, rel_path("1.txt")), None, true, window, cx)
-        })
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-    let editor_a2 = workspace_a
-        .update_in(cx_a, |workspace, window, cx| {
-            workspace.open_path((worktree_id, rel_path("2.txt")), None, true, window, cx)
-        })
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-
-    // Client B opens an editor.
-    let editor_b1 = workspace_b
-        .update_in(cx_b, |workspace, window, cx| {
-            workspace.open_path((worktree_id, rel_path("1.txt")), None, true, window, cx)
-        })
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-
-    let peer_id_a = client_a.peer_id().unwrap();
-    let peer_id_b = client_b.peer_id().unwrap();
-    let peer_id_c = client_c.peer_id().unwrap();
-    let peer_id_d = client_d.peer_id().unwrap();
-
-    // Client A updates their selections in those editors
-    editor_a1.update_in(cx_a, |editor, window, cx| {
-        editor.handle_input("a", window, cx);
-        editor.handle_input("b", window, cx);
-        editor.handle_input("c", window, cx);
-        editor.select_left(&Default::default(), window, cx);
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            vec![MultiBufferOffset(3)..MultiBufferOffset(2)]
-        );
-    });
-    editor_a2.update_in(cx_a, |editor, window, cx| {
-        editor.handle_input("d", window, cx);
-        editor.handle_input("e", window, cx);
-        editor.select_left(&Default::default(), window, cx);
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            vec![MultiBufferOffset(2)..MultiBufferOffset(1)]
-        );
-    });
-
-    // When client B starts following client A, only the active view state is replicated to client B.
-    workspace_b.update_in(cx_b, |workspace, window, cx| {
-        workspace.follow(peer_id_a, window, cx)
-    });
-
-    cx_c.executor().run_until_parked();
-    let editor_b2 = workspace_b.update(cx_b, |workspace, cx| {
-        workspace
-            .active_item(cx)
-            .unwrap()
-            .downcast::<Editor>()
-            .unwrap()
-    });
-    assert_eq!(
-        cx_b.read(|cx| editor_b2.project_path(cx)),
-        Some((worktree_id, rel_path("2.txt")).into())
-    );
-    assert_eq!(
-        editor_b2.update(cx_b, |editor, cx| editor
-            .selections
-            .ranges(&editor.display_snapshot(cx))),
-        vec![MultiBufferOffset(2)..MultiBufferOffset(1)]
-    );
-    assert_eq!(
-        editor_b1.update(cx_b, |editor, cx| editor
-            .selections
-            .ranges(&editor.display_snapshot(cx))),
-        vec![MultiBufferOffset(3)..MultiBufferOffset(3)]
-    );
-
-    executor.run_until_parked();
-    let active_call_c = cx_c.read(ActiveCall::global);
-    let project_c = client_c.join_remote_project(project_id, cx_c).await;
-    let (workspace_c, cx_c) = client_c.build_workspace(&project_c, cx_c);
-    active_call_c
-        .update(cx_c, |call, cx| call.set_location(Some(&project_c), cx))
-        .await
-        .unwrap();
-    drop(project_c);
-
-    // Client C also follows client A.
-    workspace_c.update_in(cx_c, |workspace, window, cx| {
-        workspace.follow(peer_id_a, window, cx)
-    });
-
-    cx_d.executor().run_until_parked();
-    let active_call_d = cx_d.read(ActiveCall::global);
-    let project_d = client_d.join_remote_project(project_id, cx_d).await;
-    let (workspace_d, cx_d) = client_d.build_workspace(&project_d, cx_d);
-    active_call_d
-        .update(cx_d, |call, cx| call.set_location(Some(&project_d), cx))
-        .await
-        .unwrap();
-    drop(project_d);
-
-    // All clients see that clients B and C are following client A.
-    cx_c.executor().run_until_parked();
-    for (name, cx) in [("A", &cx_a), ("B", &cx_b), ("C", &cx_c), ("D", &cx_d)] {
-        assert_eq!(
-            followers_by_leader(project_id, cx),
-            &[(peer_id_a, vec![peer_id_b, peer_id_c])],
-            "followers seen by {name}"
-        );
-    }
-
-    // Client C unfollows client A.
-    workspace_c.update_in(cx_c, |workspace, window, cx| {
-        workspace.unfollow(peer_id_a, window, cx).unwrap();
-    });
-
-    // All clients see that clients B is following client A.
-    cx_c.executor().run_until_parked();
-    for (name, cx) in [("A", &cx_a), ("B", &cx_b), ("C", &cx_c), ("D", &cx_d)] {
-        assert_eq!(
-            followers_by_leader(project_id, cx),
-            &[(peer_id_a, vec![peer_id_b])],
-            "followers seen by {name}"
-        );
-    }
-
-    // Client C re-follows client A.
-    workspace_c.update_in(cx_c, |workspace, window, cx| {
-        workspace.follow(peer_id_a, window, cx)
-    });
-
-    // All clients see that clients B and C are following client A.
-    cx_c.executor().run_until_parked();
-    for (name, cx) in [("A", &cx_a), ("B", &cx_b), ("C", &cx_c), ("D", &cx_d)] {
-        assert_eq!(
-            followers_by_leader(project_id, cx),
-            &[(peer_id_a, vec![peer_id_b, peer_id_c])],
-            "followers seen by {name}"
-        );
-    }
-
-    // Client D follows client B, then switches to following client C.
-    workspace_d.update_in(cx_d, |workspace, window, cx| {
-        workspace.follow(peer_id_b, window, cx)
-    });
-    cx_a.executor().run_until_parked();
-    workspace_d.update_in(cx_d, |workspace, window, cx| {
-        workspace.follow(peer_id_c, window, cx)
-    });
-
-    // All clients see that D is following C
-    cx_a.executor().run_until_parked();
-    for (name, cx) in [("A", &cx_a), ("B", &cx_b), ("C", &cx_c), ("D", &cx_d)] {
-        assert_eq!(
-            followers_by_leader(project_id, cx),
-            &[
-                (peer_id_a, vec![peer_id_b, peer_id_c]),
-                (peer_id_c, vec![peer_id_d])
-            ],
-            "followers seen by {name}"
-        );
-    }
-
-    // Client C closes the project.
-    let weak_workspace_c = workspace_c.downgrade();
-    workspace_c.update_in(cx_c, |workspace, window, cx| {
-        workspace.close_window(&Default::default(), window, cx);
-    });
-    executor.run_until_parked();
-    // are you sure you want to leave the call?
-    cx_c.simulate_prompt_answer("Close window and hang up");
-    cx_c.cx.update(|_| {
-        drop(workspace_c);
-    });
-    executor.run_until_parked();
-    cx_c.cx.update(|_| {});
-
-    weak_workspace_c.assert_released();
-
-    // Clients A and B see that client B is following A, and client C is not present in the followers.
-    executor.run_until_parked();
-    for (name, cx) in [("A", &cx_a), ("B", &cx_b), ("D", &cx_d)] {
-        assert_eq!(
-            followers_by_leader(project_id, cx),
-            &[(peer_id_a, vec![peer_id_b]),],
-            "followers seen by {name}"
-        );
-    }
-
-    // When client A activates a different editor, client B does so as well.
-    workspace_a.update_in(cx_a, |workspace, window, cx| {
-        workspace.activate_item(&editor_a1, true, true, window, cx)
-    });
-    executor.run_until_parked();
-    workspace_b.update(cx_b, |workspace, cx| {
-        assert_eq!(
-            workspace.active_item(cx).unwrap().item_id(),
-            editor_b1.item_id()
-        );
-    });
-
-    // When client A opens a multibuffer, client B does so as well.
-    let multibuffer_a = cx_a.new(|cx| {
-        let buffer_a1 = project_a.update(cx, |project, cx| {
-            project
-                .get_open_buffer(&(worktree_id, rel_path("1.txt")).into(), cx)
-                .unwrap()
-        });
-        let buffer_a2 = project_a.update(cx, |project, cx| {
-            project
-                .get_open_buffer(&(worktree_id, rel_path("2.txt")).into(), cx)
-                .unwrap()
-        });
-        let mut result = MultiBuffer::new(Capability::ReadWrite);
-        result.set_excerpts_for_path(
-            PathKey::for_buffer(&buffer_a1, cx),
-            buffer_a1,
-            [Point::row_range(1..2)],
-            1,
-            cx,
-        );
-        result.set_excerpts_for_path(
-            PathKey::for_buffer(&buffer_a2, cx),
-            buffer_a2,
-            [Point::row_range(5..6)],
-            1,
-            cx,
-        );
-        result
-    });
-    let multibuffer_editor_a = workspace_a.update_in(cx_a, |workspace, window, cx| {
-        let editor = cx
-            .new(|cx| Editor::for_multibuffer(multibuffer_a, Some(project_a.clone()), window, cx));
-        workspace.add_item_to_active_pane(Box::new(editor.clone()), None, true, window, cx);
-        editor
-    });
-    executor.run_until_parked();
-    let multibuffer_editor_b = workspace_b.update(cx_b, |workspace, cx| {
-        workspace
-            .active_item(cx)
-            .unwrap()
-            .downcast::<Editor>()
-            .unwrap()
-    });
-    assert_eq!(
-        multibuffer_editor_a.update(cx_a, |editor, cx| editor.text(cx)),
-        multibuffer_editor_b.update(cx_b, |editor, cx| editor.text(cx)),
-    );
-
-    // When client A navigates back and forth, client B does so as well.
-    workspace_a
-        .update_in(cx_a, |workspace, window, cx| {
-            workspace.go_back(workspace.active_pane().downgrade(), window, cx)
-        })
-        .await
-        .unwrap();
-    executor.run_until_parked();
-    workspace_b.update(cx_b, |workspace, cx| {
-        assert_eq!(
-            workspace.active_item(cx).unwrap().item_id(),
-            editor_b1.item_id()
-        );
-    });
-
-    workspace_a
-        .update_in(cx_a, |workspace, window, cx| {
-            workspace.go_back(workspace.active_pane().downgrade(), window, cx)
-        })
-        .await
-        .unwrap();
-    executor.run_until_parked();
-    workspace_b.update(cx_b, |workspace, cx| {
-        assert_eq!(
-            workspace.active_item(cx).unwrap().item_id(),
-            editor_b2.item_id()
-        );
-    });
-
-    workspace_a
-        .update_in(cx_a, |workspace, window, cx| {
-            workspace.go_forward(workspace.active_pane().downgrade(), window, cx)
-        })
-        .await
-        .unwrap();
-    executor.run_until_parked();
-    workspace_b.update(cx_b, |workspace, cx| {
-        assert_eq!(
-            workspace.active_item(cx).unwrap().item_id(),
-            editor_b1.item_id()
-        );
-    });
-
-    // Changes to client A's editor are reflected on client B.
-    editor_a1.update_in(cx_a, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([
-                MultiBufferOffset(1)..MultiBufferOffset(1),
-                MultiBufferOffset(2)..MultiBufferOffset(2),
-            ])
-        });
-    });
-    executor.advance_clock(workspace::item::LEADER_UPDATE_THROTTLE);
-    executor.run_until_parked();
-    cx_b.background_executor.run_until_parked();
-
-    editor_b1.update(cx_b, |editor, cx| {
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            &[
-                MultiBufferOffset(1)..MultiBufferOffset(1),
-                MultiBufferOffset(2)..MultiBufferOffset(2)
-            ]
-        );
-    });
-
-    editor_a1.update_in(cx_a, |editor, window, cx| {
-        editor.set_text("TWO", window, cx)
-    });
-    executor.run_until_parked();
-    editor_b1.update(cx_b, |editor, cx| assert_eq!(editor.text(cx), "TWO"));
-
-    editor_a1.update_in(cx_a, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([MultiBufferOffset(3)..MultiBufferOffset(3)])
-        });
-        editor.set_scroll_position(point(0., 100.), window, cx);
-    });
-    executor.advance_clock(workspace::item::LEADER_UPDATE_THROTTLE);
-    executor.run_until_parked();
-    editor_b1.update(cx_b, |editor, cx| {
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            &[MultiBufferOffset(3)..MultiBufferOffset(3)]
-        );
-    });
-
-    // After unfollowing, client B stops receiving updates from client A.
-    workspace_b.update_in(cx_b, |workspace, window, cx| {
-        workspace.unfollow(peer_id_a, window, cx).unwrap()
-    });
-    workspace_a.update_in(cx_a, |workspace, window, cx| {
-        workspace.activate_item(&editor_a2, true, true, window, cx)
-    });
-    executor.run_until_parked();
-    assert_eq!(
-        workspace_b.update(cx_b, |workspace, cx| workspace
-            .active_item(cx)
-            .unwrap()
-            .item_id()),
-        editor_b1.item_id()
-    );
-
-    // Client A starts following client B.
-    workspace_a.update_in(cx_a, |workspace, window, cx| {
-        workspace.follow(peer_id_b, window, cx)
-    });
-    executor.run_until_parked();
-    assert_eq!(
-        workspace_a.update(cx_a, |workspace, _| workspace.leader_for_pane(&pane_a)),
-        Some(peer_id_b.into())
-    );
-    assert_eq!(
-        workspace_a.update_in(cx_a, |workspace, _, cx| workspace
-            .active_item(cx)
-            .unwrap()
-            .item_id()),
-        editor_a1.item_id()
-    );
-
-    // #[cfg(all(not(target_os = "macos"), not(target_os = "windows")))]
-    {
-        use crate::rpc::RECONNECT_TIMEOUT;
-        use gpui::TestScreenCaptureSource;
-        use workspace::{
-            dock::{DockPosition, test::TestPanel},
-            item::test::TestItem,
-            shared_screen::SharedScreen,
-        };
-
-        // Client B activates an external window, which causes a new screen-sharing item to be added to the pane.
-        let display = TestScreenCaptureSource::new();
-        active_call_b
-            .update(cx_b, |call, cx| call.set_location(None, cx))
-            .await
-            .unwrap();
-        cx_b.set_screen_capture_sources(vec![display]);
-        let source = cx_b
-            .read(|cx| cx.screen_capture_sources())
-            .await
-            .unwrap()
-            .unwrap()
-            .into_iter()
-            .next()
-            .unwrap();
-        active_call_b
-            .update(cx_b, |call, cx| {
-                call.room()
-                    .unwrap()
-                    .update(cx, |room, cx| room.share_screen(source, cx))
-            })
-            .await
-            .unwrap();
-        executor.run_until_parked();
-
-        let shared_screen = workspace_a.update(cx_a, |workspace, cx| {
-            workspace
-                .active_item(cx)
-                .expect("no active item")
-                .downcast::<SharedScreen>()
-                .expect("active item isn't a shared screen")
-        });
-
-        // Client B activates Zed again, which causes the previous editor to become focused again.
-        active_call_b
-            .update(cx_b, |call, cx| call.set_location(Some(&project_b), cx))
-            .await
-            .unwrap();
-        executor.run_until_parked();
-        workspace_a.update(cx_a, |workspace, cx| {
-            assert_eq!(
-                workspace.active_item(cx).unwrap().item_id(),
-                editor_a1.item_id()
-            )
-        });
-
-        // Client B activates a multibuffer that was created by following client A. Client A returns to that multibuffer.
-        workspace_b.update_in(cx_b, |workspace, window, cx| {
-            workspace.activate_item(&multibuffer_editor_b, true, true, window, cx)
-        });
-        executor.run_until_parked();
-        workspace_a.update(cx_a, |workspace, cx| {
-            assert_eq!(
-                workspace.active_item(cx).unwrap().item_id(),
-                multibuffer_editor_a.item_id()
-            )
-        });
-
-        // Client B activates a panel, and the previously-opened screen-sharing item gets activated.
-        let panel = cx_b.new(|cx| TestPanel::new(DockPosition::Left, 100, cx));
-        workspace_b.update_in(cx_b, |workspace, window, cx| {
-            workspace.add_panel(panel, window, cx);
-            workspace.toggle_panel_focus::<TestPanel>(window, cx);
-        });
-        executor.run_until_parked();
-        assert_eq!(
-            workspace_a.update(cx_a, |workspace, cx| workspace
-                .active_item(cx)
-                .unwrap()
-                .item_id()),
-            shared_screen.item_id()
-        );
-
-        // Toggling the focus back to the pane causes client A to return to the multibuffer.
-        workspace_b.update_in(cx_b, |workspace, window, cx| {
-            workspace.toggle_panel_focus::<TestPanel>(window, cx);
-        });
-        executor.run_until_parked();
-        workspace_a.update(cx_a, |workspace, cx| {
-            assert_eq!(
-                workspace.active_item(cx).unwrap().item_id(),
-                multibuffer_editor_a.item_id()
-            )
-        });
-
-        // Client B activates an item that doesn't implement following,
-        // so the previously-opened screen-sharing item gets activated.
-        let unfollowable_item = cx_b.new(TestItem::new);
-        workspace_b.update_in(cx_b, |workspace, window, cx| {
-            workspace.active_pane().update(cx, |pane, cx| {
-                pane.add_item(Box::new(unfollowable_item), true, true, None, window, cx)
-            })
-        });
-        executor.run_until_parked();
-        assert_eq!(
-            workspace_a.update(cx_a, |workspace, cx| workspace
-                .active_item(cx)
-                .unwrap()
-                .item_id()),
-            shared_screen.item_id()
-        );
-
-        // Following interrupts when client B disconnects.
-        client_b.disconnect(&cx_b.to_async());
-        executor.advance_clock(RECONNECT_TIMEOUT);
-        assert_eq!(
-            workspace_a.update(cx_a, |workspace, _| workspace.leader_for_pane(&pane_a)),
-            None
-        );
-    }
-}
-
-#[gpui::test]
-async fn test_following_tab_order(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-    let active_call_b = cx_b.read(ActiveCall::global);
-
-    cx_a.update(editor::init);
-    cx_b.update(editor::init);
-
-    client_a
-        .fs()
-        .insert_tree(
-            path!("/a"),
-            json!({
-                "1.txt": "one",
-                "2.txt": "two",
-                "3.txt": "three",
-            }),
-        )
-        .await;
-    let (project_a, worktree_id) = client_a.build_local_project(path!("/a"), cx_a).await;
-    active_call_a
-        .update(cx_a, |call, cx| call.set_location(Some(&project_a), cx))
-        .await
-        .unwrap();
-
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-    active_call_b
-        .update(cx_b, |call, cx| call.set_location(Some(&project_b), cx))
-        .await
-        .unwrap();
-
-    let (workspace_a, cx_a) = client_a.build_workspace(&project_a, cx_a);
-    let pane_a = workspace_a.update(cx_a, |workspace, _| workspace.active_pane().clone());
-
-    let (workspace_b, cx_b) = client_b.build_workspace(&project_b, cx_b);
-    let pane_b = workspace_b.update(cx_b, |workspace, _| workspace.active_pane().clone());
-
-    let client_b_id = project_a.update(cx_a, |project, _| {
-        project.collaborators().values().next().unwrap().peer_id
-    });
-
-    //Open 1, 3 in that order on client A
-    workspace_a
-        .update_in(cx_a, |workspace, window, cx| {
-            workspace.open_path((worktree_id, rel_path("1.txt")), None, true, window, cx)
-        })
-        .await
-        .unwrap();
-    workspace_a
-        .update_in(cx_a, |workspace, window, cx| {
-            workspace.open_path((worktree_id, rel_path("3.txt")), None, true, window, cx)
-        })
-        .await
-        .unwrap();
-
-    let pane_paths = |pane: &Entity<workspace::Pane>, cx: &mut VisualTestContext| {
-        pane.update(cx, |pane, cx| {
-            pane.items()
-                .map(|item| item.project_path(cx).unwrap().path)
-                .collect::<Vec<_>>()
-        })
-    };
-
-    //Verify that the tabs opened in the order we expect
-    assert_eq!(
-        &pane_paths(&pane_a, cx_a),
-        &[rel_path("1.txt").into(), rel_path("3.txt").into()]
-    );
-
-    //Follow client B as client A
-    workspace_a.update_in(cx_a, |workspace, window, cx| {
-        workspace.follow(client_b_id, window, cx)
-    });
-    executor.run_until_parked();
-
-    //Open just 2 on client B
-    workspace_b
-        .update_in(cx_b, |workspace, window, cx| {
-            workspace.open_path((worktree_id, rel_path("2.txt")), None, true, window, cx)
-        })
-        .await
-        .unwrap();
-    executor.run_until_parked();
-
-    // Verify that newly opened followed file is at the end
-    assert_eq!(
-        &pane_paths(&pane_a, cx_a),
-        &[
-            rel_path("1.txt").into(),
-            rel_path("3.txt").into(),
-            rel_path("2.txt").into()
-        ]
-    );
-
-    //Open just 1 on client B
-    workspace_b
-        .update_in(cx_b, |workspace, window, cx| {
-            workspace.open_path((worktree_id, rel_path("1.txt")), None, true, window, cx)
-        })
-        .await
-        .unwrap();
-    assert_eq!(
-        &pane_paths(&pane_b, cx_b),
-        &[rel_path("2.txt").into(), rel_path("1.txt").into()]
-    );
-    executor.run_until_parked();
-
-    // Verify that following into 1 did not reorder
-    assert_eq!(
-        &pane_paths(&pane_a, cx_a),
-        &[
-            rel_path("1.txt").into(),
-            rel_path("3.txt").into(),
-            rel_path("2.txt").into()
-        ]
-    );
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_peers_following_each_other(cx_a: &mut TestAppContext, cx_b: &mut TestAppContext) {
-    let executor = cx_a.executor();
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-    let active_call_b = cx_b.read(ActiveCall::global);
-
-    cx_a.update(editor::init);
-    cx_b.update(editor::init);
-
-    // Client A shares a project.
-    client_a
-        .fs()
-        .insert_tree(
-            path!("/a"),
-            json!({
-                "1.txt": "one",
-                "2.txt": "two",
-                "3.txt": "three",
-                "4.txt": "four",
-            }),
-        )
-        .await;
-    let (project_a, worktree_id) = client_a.build_local_project(path!("/a"), cx_a).await;
-    active_call_a
-        .update(cx_a, |call, cx| call.set_location(Some(&project_a), cx))
-        .await
-        .unwrap();
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-
-    // Client B joins the project.
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-    active_call_b
-        .update(cx_b, |call, cx| call.set_location(Some(&project_b), cx))
-        .await
-        .unwrap();
-
-    // Client A opens a file.
-    let (workspace_a, cx_a) = client_a.build_workspace(&project_a, cx_a);
-    workspace_a
-        .update_in(cx_a, |workspace, window, cx| {
-            workspace.open_path((worktree_id, rel_path("1.txt")), None, true, window, cx)
-        })
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-
-    // Client B opens a different file.
-    let (workspace_b, cx_b) = client_b.build_workspace(&project_b, cx_b);
-    workspace_b
-        .update_in(cx_b, |workspace, window, cx| {
-            workspace.open_path((worktree_id, rel_path("2.txt")), None, true, window, cx)
-        })
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-
-    // Clients A and B follow each other in split panes
-    workspace_a
-        .update_in(cx_a, |workspace, window, cx| {
-            workspace.split_and_clone(
-                workspace.active_pane().clone(),
-                SplitDirection::Right,
-                window,
-                cx,
-            )
-        })
-        .await;
-    workspace_a.update_in(cx_a, |workspace, window, cx| {
-        workspace.follow(client_b.peer_id().unwrap(), window, cx)
-    });
-    executor.run_until_parked();
-    workspace_b
-        .update_in(cx_b, |workspace, window, cx| {
-            workspace.split_and_clone(
-                workspace.active_pane().clone(),
-                SplitDirection::Right,
-                window,
-                cx,
-            )
-        })
-        .await;
-    workspace_b.update_in(cx_b, |workspace, window, cx| {
-        workspace.follow(client_a.peer_id().unwrap(), window, cx)
-    });
-    executor.run_until_parked();
-
-    // Clients A and B return focus to the original files they had open
-    workspace_a.update_in(cx_a, |workspace, window, cx| {
-        workspace.activate_next_pane(window, cx)
-    });
-    workspace_b.update_in(cx_b, |workspace, window, cx| {
-        workspace.activate_next_pane(window, cx)
-    });
-    executor.run_until_parked();
-
-    // Both clients see the other client's focused file in their right pane.
-    assert_eq!(
-        pane_summaries(&workspace_a, cx_a),
-        &[
-            PaneSummary {
-                active: true,
-                leader: None,
-                items: vec![(true, "1.txt".into())]
-            },
-            PaneSummary {
-                active: false,
-                leader: client_b.peer_id(),
-                items: vec![(false, "1.txt".into()), (true, "2.txt".into())]
-            },
-        ]
-    );
-    assert_eq!(
-        pane_summaries(&workspace_b, cx_b),
-        &[
-            PaneSummary {
-                active: true,
-                leader: None,
-                items: vec![(true, "2.txt".into())]
-            },
-            PaneSummary {
-                active: false,
-                leader: client_a.peer_id(),
-                items: vec![(false, "2.txt".into()), (true, "1.txt".into())]
-            },
-        ]
-    );
-
-    // Clients A and B each open a new file.
-    workspace_a
-        .update_in(cx_a, |workspace, window, cx| {
-            workspace.open_path((worktree_id, rel_path("3.txt")), None, true, window, cx)
-        })
-        .await
-        .unwrap();
-
-    workspace_b
-        .update_in(cx_b, |workspace, window, cx| {
-            workspace.open_path((worktree_id, rel_path("4.txt")), None, true, window, cx)
-        })
-        .await
-        .unwrap();
-    executor.run_until_parked();
-
-    // Both client's see the other client open the new file, but keep their
-    // focus on their own active pane.
-    assert_eq!(
-        pane_summaries(&workspace_a, cx_a),
-        &[
-            PaneSummary {
-                active: true,
-                leader: None,
-                items: vec![(false, "1.txt".into()), (true, "3.txt".into())]
-            },
-            PaneSummary {
-                active: false,
-                leader: client_b.peer_id(),
-                items: vec![
-                    (false, "1.txt".into()),
-                    (false, "2.txt".into()),
-                    (true, "4.txt".into())
-                ]
-            },
-        ]
-    );
-    assert_eq!(
-        pane_summaries(&workspace_b, cx_b),
-        &[
-            PaneSummary {
-                active: true,
-                leader: None,
-                items: vec![(false, "2.txt".into()), (true, "4.txt".into())]
-            },
-            PaneSummary {
-                active: false,
-                leader: client_a.peer_id(),
-                items: vec![
-                    (false, "2.txt".into()),
-                    (false, "1.txt".into()),
-                    (true, "3.txt".into())
-                ]
-            },
-        ]
-    );
-
-    // Client A focuses their right pane, in which they're following client B.
-    workspace_a.update_in(cx_a, |workspace, window, cx| {
-        workspace.activate_next_pane(window, cx)
-    });
-    executor.run_until_parked();
-
-    // Client B sees that client A is now looking at the same file as them.
-    assert_eq!(
-        pane_summaries(&workspace_a, cx_a),
-        &[
-            PaneSummary {
-                active: false,
-                leader: None,
-                items: vec![(false, "1.txt".into()), (true, "3.txt".into())]
-            },
-            PaneSummary {
-                active: true,
-                leader: client_b.peer_id(),
-                items: vec![
-                    (false, "1.txt".into()),
-                    (false, "2.txt".into()),
-                    (true, "4.txt".into())
-                ]
-            },
-        ]
-    );
-    assert_eq!(
-        pane_summaries(&workspace_b, cx_b),
-        &[
-            PaneSummary {
-                active: true,
-                leader: None,
-                items: vec![(false, "2.txt".into()), (true, "4.txt".into())]
-            },
-            PaneSummary {
-                active: false,
-                leader: client_a.peer_id(),
-                items: vec![
-                    (false, "2.txt".into()),
-                    (false, "1.txt".into()),
-                    (false, "3.txt".into()),
-                    (true, "4.txt".into())
-                ]
-            },
-        ]
-    );
-
-    // Client B focuses their right pane, in which they're following client A,
-    // who is following them.
-    workspace_b.update_in(cx_b, |workspace, window, cx| {
-        workspace.activate_next_pane(window, cx)
-    });
-    executor.run_until_parked();
-
-    // Client A sees that client B is now looking at the same file as them.
-    assert_eq!(
-        pane_summaries(&workspace_b, cx_b),
-        &[
-            PaneSummary {
-                active: false,
-                leader: None,
-                items: vec![(false, "2.txt".into()), (true, "4.txt".into())]
-            },
-            PaneSummary {
-                active: true,
-                leader: client_a.peer_id(),
-                items: vec![
-                    (false, "2.txt".into()),
-                    (false, "1.txt".into()),
-                    (false, "3.txt".into()),
-                    (true, "4.txt".into())
-                ]
-            },
-        ]
-    );
-    assert_eq!(
-        pane_summaries(&workspace_a, cx_a),
-        &[
-            PaneSummary {
-                active: false,
-                leader: None,
-                items: vec![(false, "1.txt".into()), (true, "3.txt".into())]
-            },
-            PaneSummary {
-                active: true,
-                leader: client_b.peer_id(),
-                items: vec![
-                    (false, "1.txt".into()),
-                    (false, "2.txt".into()),
-                    (true, "4.txt".into())
-                ]
-            },
-        ]
-    );
-
-    // Client B focuses a file that they previously followed A to, breaking
-    // the follow.
-    workspace_b.update_in(cx_b, |workspace, window, cx| {
-        workspace.active_pane().update(cx, |pane, cx| {
-            pane.activate_previous_item(&Default::default(), window, cx);
-        });
-    });
-    executor.run_until_parked();
-
-    // Both clients see that client B is looking at that previous file.
-    assert_eq!(
-        pane_summaries(&workspace_b, cx_b),
-        &[
-            PaneSummary {
-                active: false,
-                leader: None,
-                items: vec![(false, "2.txt".into()), (true, "4.txt".into())]
-            },
-            PaneSummary {
-                active: true,
-                leader: None,
-                items: vec![
-                    (false, "2.txt".into()),
-                    (false, "1.txt".into()),
-                    (true, "3.txt".into()),
-                    (false, "4.txt".into())
-                ]
-            },
-        ]
-    );
-    assert_eq!(
-        pane_summaries(&workspace_a, cx_a),
-        &[
-            PaneSummary {
-                active: false,
-                leader: None,
-                items: vec![(false, "1.txt".into()), (true, "3.txt".into())]
-            },
-            PaneSummary {
-                active: true,
-                leader: client_b.peer_id(),
-                items: vec![
-                    (false, "1.txt".into()),
-                    (false, "2.txt".into()),
-                    (false, "4.txt".into()),
-                    (true, "3.txt".into()),
-                ]
-            },
-        ]
-    );
-
-    // Client B closes tabs, some of which were originally opened by client A,
-    // and some of which were originally opened by client B.
-    workspace_b.update_in(cx_b, |workspace, window, cx| {
-        workspace.active_pane().update(cx, |pane, cx| {
-            pane.close_other_items(&Default::default(), None, window, cx)
-                .detach();
-        });
-    });
-
-    executor.run_until_parked();
-
-    // Both clients see that Client B is looking at the previous tab.
-    assert_eq!(
-        pane_summaries(&workspace_b, cx_b),
-        &[
-            PaneSummary {
-                active: false,
-                leader: None,
-                items: vec![(false, "2.txt".into()), (true, "4.txt".into())]
-            },
-            PaneSummary {
-                active: true,
-                leader: None,
-                items: vec![(true, "3.txt".into()),]
-            },
-        ]
-    );
-    assert_eq!(
-        pane_summaries(&workspace_a, cx_a),
-        &[
-            PaneSummary {
-                active: false,
-                leader: None,
-                items: vec![(false, "1.txt".into()), (true, "3.txt".into())]
-            },
-            PaneSummary {
-                active: true,
-                leader: client_b.peer_id(),
-                items: vec![
-                    (false, "1.txt".into()),
-                    (false, "2.txt".into()),
-                    (false, "4.txt".into()),
-                    (true, "3.txt".into()),
-                ]
-            },
-        ]
-    );
-
-    // Client B follows client A again.
-    workspace_b.update_in(cx_b, |workspace, window, cx| {
-        workspace.follow(client_a.peer_id().unwrap(), window, cx)
-    });
-    executor.run_until_parked();
-    // Client A cycles through some tabs.
-    workspace_a.update_in(cx_a, |workspace, window, cx| {
-        workspace.active_pane().update(cx, |pane, cx| {
-            pane.activate_previous_item(&Default::default(), window, cx);
-        });
-    });
-    executor.run_until_parked();
-
-    // Client B follows client A into those tabs.
-    assert_eq!(
-        pane_summaries(&workspace_a, cx_a),
-        &[
-            PaneSummary {
-                active: false,
-                leader: None,
-                items: vec![(false, "1.txt".into()), (true, "3.txt".into())]
-            },
-            PaneSummary {
-                active: true,
-                leader: None,
-                items: vec![
-                    (false, "1.txt".into()),
-                    (false, "2.txt".into()),
-                    (true, "4.txt".into()),
-                    (false, "3.txt".into()),
-                ]
-            },
-        ]
-    );
-    assert_eq!(
-        pane_summaries(&workspace_b, cx_b),
-        &[
-            PaneSummary {
-                active: false,
-                leader: None,
-                items: vec![(false, "2.txt".into()), (true, "4.txt".into())]
-            },
-            PaneSummary {
-                active: true,
-                leader: client_a.peer_id(),
-                items: vec![(false, "3.txt".into()), (true, "4.txt".into())]
-            },
-        ]
-    );
-
-    workspace_a.update_in(cx_a, |workspace, window, cx| {
-        workspace.active_pane().update(cx, |pane, cx| {
-            pane.activate_previous_item(&Default::default(), window, cx);
-        });
-    });
-    executor.run_until_parked();
-
-    assert_eq!(
-        pane_summaries(&workspace_a, cx_a),
-        &[
-            PaneSummary {
-                active: false,
-                leader: None,
-                items: vec![(false, "1.txt".into()), (true, "3.txt".into())]
-            },
-            PaneSummary {
-                active: true,
-                leader: None,
-                items: vec![
-                    (false, "1.txt".into()),
-                    (true, "2.txt".into()),
-                    (false, "4.txt".into()),
-                    (false, "3.txt".into()),
-                ]
-            },
-        ]
-    );
-    assert_eq!(
-        pane_summaries(&workspace_b, cx_b),
-        &[
-            PaneSummary {
-                active: false,
-                leader: None,
-                items: vec![(false, "2.txt".into()), (true, "4.txt".into())]
-            },
-            PaneSummary {
-                active: true,
-                leader: client_a.peer_id(),
-                items: vec![
-                    (false, "3.txt".into()),
-                    (false, "4.txt".into()),
-                    (true, "2.txt".into())
-                ]
-            },
-        ]
-    );
-
-    workspace_a.update_in(cx_a, |workspace, window, cx| {
-        workspace.active_pane().update(cx, |pane, cx| {
-            pane.activate_previous_item(&Default::default(), window, cx);
-        });
-    });
-    executor.run_until_parked();
-
-    assert_eq!(
-        pane_summaries(&workspace_a, cx_a),
-        &[
-            PaneSummary {
-                active: false,
-                leader: None,
-                items: vec![(false, "1.txt".into()), (true, "3.txt".into())]
-            },
-            PaneSummary {
-                active: true,
-                leader: None,
-                items: vec![
-                    (true, "1.txt".into()),
-                    (false, "2.txt".into()),
-                    (false, "4.txt".into()),
-                    (false, "3.txt".into()),
-                ]
-            },
-        ]
-    );
-    assert_eq!(
-        pane_summaries(&workspace_b, cx_b),
-        &[
-            PaneSummary {
-                active: false,
-                leader: None,
-                items: vec![(false, "2.txt".into()), (true, "4.txt".into())]
-            },
-            PaneSummary {
-                active: true,
-                leader: client_a.peer_id(),
-                items: vec![
-                    (false, "3.txt".into()),
-                    (false, "4.txt".into()),
-                    (false, "2.txt".into()),
-                    (true, "1.txt".into()),
-                ]
-            },
-        ]
-    );
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_auto_unfollowing(cx_a: &mut TestAppContext, cx_b: &mut TestAppContext) {
-    // 2 clients connect to a server.
-    let executor = cx_a.executor();
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-    let active_call_b = cx_b.read(ActiveCall::global);
-
-    cx_a.update(editor::init);
-    cx_b.update(editor::init);
-
-    // Client A shares a project.
-    client_a
-        .fs()
-        .insert_tree(
-            path!("/a"),
-            json!({
-                "1.txt": "one",
-                "2.txt": "two",
-                "3.txt": "three",
-            }),
-        )
-        .await;
-    let (project_a, worktree_id) = client_a.build_local_project(path!("/a"), cx_a).await;
-    active_call_a
-        .update(cx_a, |call, cx| call.set_location(Some(&project_a), cx))
-        .await
-        .unwrap();
-
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-    active_call_b
-        .update(cx_b, |call, cx| call.set_location(Some(&project_b), cx))
-        .await
-        .unwrap();
-
-    let (workspace_a, cx_a) = client_a.build_workspace(&project_a, cx_a);
-    let (workspace_b, cx_b) = client_b.build_workspace(&project_b, cx_b);
-
-    let _editor_a1 = workspace_a
-        .update_in(cx_a, |workspace, window, cx| {
-            workspace.open_path((worktree_id, rel_path("1.txt")), None, true, window, cx)
-        })
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-
-    // Client B starts following client A.
-    let pane_b = workspace_b.update(cx_b, |workspace, _| workspace.active_pane().clone());
-    let leader_id = project_b.update(cx_b, |project, _| {
-        project.collaborators().values().next().unwrap().peer_id
-    });
-    workspace_b.update_in(cx_b, |workspace, window, cx| {
-        workspace.follow(leader_id, window, cx)
-    });
-    executor.run_until_parked();
-    assert_eq!(
-        workspace_b.update(cx_b, |workspace, _| workspace.leader_for_pane(&pane_b)),
-        Some(leader_id.into())
-    );
-    let editor_b2 = workspace_b.update(cx_b, |workspace, cx| {
-        workspace
-            .active_item(cx)
-            .unwrap()
-            .downcast::<Editor>()
-            .unwrap()
-    });
-
-    // When client B moves, it automatically stops following client A.
-    editor_b2.update_in(cx_b, |editor, window, cx| {
-        editor.move_right(&editor::actions::MoveRight, window, cx)
-    });
-    assert_eq!(
-        workspace_b.update(cx_b, |workspace, _| workspace.leader_for_pane(&pane_b)),
-        None
-    );
-
-    workspace_b.update_in(cx_b, |workspace, window, cx| {
-        workspace.follow(leader_id, window, cx)
-    });
-    executor.run_until_parked();
-    assert_eq!(
-        workspace_b.update(cx_b, |workspace, _| workspace.leader_for_pane(&pane_b)),
-        Some(leader_id.into())
-    );
-
-    // When client B edits, it automatically stops following client A.
-    editor_b2.update_in(cx_b, |editor, window, cx| editor.insert("X", window, cx));
-    assert_eq!(
-        workspace_b.update_in(cx_b, |workspace, _, _| workspace.leader_for_pane(&pane_b)),
-        None
-    );
-
-    workspace_b.update_in(cx_b, |workspace, window, cx| {
-        workspace.follow(leader_id, window, cx)
-    });
-    executor.run_until_parked();
-    assert_eq!(
-        workspace_b.update(cx_b, |workspace, _| workspace.leader_for_pane(&pane_b)),
-        Some(leader_id.into())
-    );
-
-    // When client B scrolls, it automatically stops following client A.
-    editor_b2.update_in(cx_b, |editor, window, cx| {
-        editor.set_scroll_position(point(0., 3.), window, cx)
-    });
-    assert_eq!(
-        workspace_b.update(cx_b, |workspace, _| workspace.leader_for_pane(&pane_b)),
-        None
-    );
-
-    workspace_b.update_in(cx_b, |workspace, window, cx| {
-        workspace.follow(leader_id, window, cx)
-    });
-    executor.run_until_parked();
-    assert_eq!(
-        workspace_b.update(cx_b, |workspace, _| workspace.leader_for_pane(&pane_b)),
-        Some(leader_id.into())
-    );
-
-    // When client B activates a different pane, it continues following client A in the original pane.
-    workspace_b
-        .update_in(cx_b, |workspace, window, cx| {
-            workspace.split_and_clone(pane_b.clone(), SplitDirection::Right, window, cx)
-        })
-        .await;
-    assert_eq!(
-        workspace_b.update(cx_b, |workspace, _| workspace.leader_for_pane(&pane_b)),
-        Some(leader_id.into())
-    );
-
-    workspace_b.update_in(cx_b, |workspace, window, cx| {
-        workspace.activate_next_pane(window, cx)
-    });
-    assert_eq!(
-        workspace_b.update(cx_b, |workspace, _| workspace.leader_for_pane(&pane_b)),
-        Some(leader_id.into())
-    );
-
-    // When client B activates a different item in the original pane, it automatically stops following client A.
-    workspace_b
-        .update_in(cx_b, |workspace, window, cx| {
-            workspace.open_path((worktree_id, rel_path("2.txt")), None, true, window, cx)
-        })
-        .await
-        .unwrap();
-    assert_eq!(
-        workspace_b.update(cx_b, |workspace, _| workspace.leader_for_pane(&pane_b)),
-        None
-    );
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_peers_simultaneously_following_each_other(
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let executor = cx_a.executor();
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-
-    cx_a.update(editor::init);
-    cx_b.update(editor::init);
-
-    client_a.fs().insert_tree("/a", json!({})).await;
-    let (project_a, _) = client_a.build_local_project("/a", cx_a).await;
-    let (workspace_a, cx_a) = client_a.build_workspace(&project_a, cx_a);
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-    let (workspace_b, cx_b) = client_b.build_workspace(&project_b, cx_b);
-
-    executor.run_until_parked();
-    let client_a_id = project_b.update(cx_b, |project, _| {
-        project.collaborators().values().next().unwrap().peer_id
-    });
-    let client_b_id = project_a.update(cx_a, |project, _| {
-        project.collaborators().values().next().unwrap().peer_id
-    });
-
-    workspace_a.update_in(cx_a, |workspace, window, cx| {
-        workspace.follow(client_b_id, window, cx)
-    });
-    workspace_b.update_in(cx_b, |workspace, window, cx| {
-        workspace.follow(client_a_id, window, cx)
-    });
-    executor.run_until_parked();
-
-    workspace_a.update(cx_a, |workspace, _| {
-        assert_eq!(
-            workspace.leader_for_pane(workspace.active_pane()),
-            Some(client_b_id.into())
-        );
-    });
-    workspace_b.update(cx_b, |workspace, _| {
-        assert_eq!(
-            workspace.leader_for_pane(workspace.active_pane()),
-            Some(client_a_id.into())
-        );
-    });
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_following_across_workspaces(cx_a: &mut TestAppContext, cx_b: &mut TestAppContext) {
-    // a and b join a channel/call
-    // a shares project 1
-    // b shares project 2
-    //
-    // b follows a: causes project 2 to be joined, and b to follow a.
-    // b opens a different file in project 2, a follows b
-    // b opens a different file in project 1, a cannot follow b
-    // b shares the project, a joins the project and follows b
-    let executor = cx_a.executor();
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-
-    client_a
-        .fs()
-        .insert_tree(
-            path!("/a"),
-            json!({
-                "w.rs": "",
-                "x.rs": "",
-            }),
-        )
-        .await;
-
-    client_b
-        .fs()
-        .insert_tree(
-            path!("/b"),
-            json!({
-                "y.rs": "",
-                "z.rs": "",
-            }),
-        )
-        .await;
-
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-    let active_call_b = cx_b.read(ActiveCall::global);
-
-    let (project_a, worktree_id_a) = client_a.build_local_project(path!("/a"), cx_a).await;
-    let (project_b, worktree_id_b) = client_b.build_local_project(path!("/b"), cx_b).await;
-
-    let (workspace_a, cx_a) = client_a.build_workspace(&project_a, cx_a);
-    let (workspace_b, cx_b) = client_b.build_workspace(&project_b, cx_b);
-
-    active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-
-    active_call_a
-        .update(cx_a, |call, cx| call.set_location(Some(&project_a), cx))
-        .await
-        .unwrap();
-    active_call_b
-        .update(cx_b, |call, cx| call.set_location(Some(&project_b), cx))
-        .await
-        .unwrap();
-
-    workspace_a
-        .update_in(cx_a, |workspace, window, cx| {
-            workspace.open_path((worktree_id_a, rel_path("w.rs")), None, true, window, cx)
-        })
-        .await
-        .unwrap();
-
-    executor.run_until_parked();
-    assert_eq!(visible_push_notifications(cx_b).len(), 1);
-
-    workspace_b.update_in(cx_b, |workspace, window, cx| {
-        workspace.follow(client_a.peer_id().unwrap(), window, cx)
-    });
-
-    executor.run_until_parked();
-    let window_b_project_a = *cx_b
-        .windows()
-        .iter()
-        .max_by_key(|window| window.window_id())
-        .unwrap();
-
-    let mut cx_b2 = VisualTestContext::from_window(window_b_project_a, cx_b);
-
-    let workspace_b_project_a = window_b_project_a
-        .downcast::<Workspace>()
-        .unwrap()
-        .root(cx_b)
-        .unwrap();
-
-    // assert that b is following a in project a in w.rs
-    workspace_b_project_a.update(&mut cx_b2, |workspace, cx| {
-        assert!(workspace.is_being_followed(client_a.peer_id().unwrap()));
-        assert_eq!(
-            client_a.peer_id().map(Into::into),
-            workspace.leader_for_pane(workspace.active_pane())
-        );
-        let item = workspace.active_item(cx).unwrap();
-        assert_eq!(item.tab_content_text(0, cx), SharedString::from("w.rs"));
-    });
-
-    // TODO: in app code, this would be done by the collab_ui.
-    active_call_b
-        .update(&mut cx_b2, |call, cx| {
-            let project = workspace_b_project_a.read(cx).project().clone();
-            call.set_location(Some(&project), cx)
-        })
-        .await
-        .unwrap();
-
-    // assert that there are no share notifications open
-    assert_eq!(visible_push_notifications(cx_b).len(), 0);
-
-    // b moves to x.rs in a's project, and a follows
-    workspace_b_project_a
-        .update_in(&mut cx_b2, |workspace, window, cx| {
-            workspace.open_path((worktree_id_a, rel_path("x.rs")), None, true, window, cx)
-        })
-        .await
-        .unwrap();
-
-    executor.run_until_parked();
-    workspace_b_project_a.update(&mut cx_b2, |workspace, cx| {
-        let item = workspace.active_item(cx).unwrap();
-        assert_eq!(item.tab_content_text(0, cx), SharedString::from("x.rs"));
-    });
-
-    workspace_a.update_in(cx_a, |workspace, window, cx| {
-        workspace.follow(client_b.peer_id().unwrap(), window, cx)
-    });
-
-    executor.run_until_parked();
-    workspace_a.update(cx_a, |workspace, cx| {
-        assert!(workspace.is_being_followed(client_b.peer_id().unwrap()));
-        assert_eq!(
-            client_b.peer_id().map(Into::into),
-            workspace.leader_for_pane(workspace.active_pane())
-        );
-        let item = workspace.active_pane().read(cx).active_item().unwrap();
-        assert_eq!(item.tab_content_text(0, cx), "x.rs");
-    });
-
-    // b moves to y.rs in b's project, a is still following but can't yet see
-    workspace_b
-        .update_in(cx_b, |workspace, window, cx| {
-            workspace.open_path((worktree_id_b, rel_path("y.rs")), None, true, window, cx)
-        })
-        .await
-        .unwrap();
-
-    // TODO: in app code, this would be done by the collab_ui.
-    active_call_b
-        .update(cx_b, |call, cx| {
-            let project = workspace_b.read(cx).project().clone();
-            call.set_location(Some(&project), cx)
-        })
-        .await
-        .unwrap();
-
-    let project_b_id = active_call_b
-        .update(cx_b, |call, cx| call.share_project(project_b.clone(), cx))
-        .await
-        .unwrap();
-
-    executor.run_until_parked();
-    assert_eq!(visible_push_notifications(cx_a).len(), 1);
-    cx_a.update(|_, cx| {
-        workspace::join_in_room_project(
-            project_b_id,
-            client_b.user_id().unwrap(),
-            client_a.app_state.clone(),
-            cx,
-        )
-    })
-    .await
-    .unwrap();
-
-    executor.run_until_parked();
-
-    assert_eq!(visible_push_notifications(cx_a).len(), 0);
-    let window_a_project_b = *cx_a
-        .windows()
-        .iter()
-        .max_by_key(|window| window.window_id())
-        .unwrap();
-    let cx_a2 = &mut VisualTestContext::from_window(window_a_project_b, cx_a);
-    let workspace_a_project_b = window_a_project_b
-        .downcast::<Workspace>()
-        .unwrap()
-        .root(cx_a)
-        .unwrap();
-
-    executor.run_until_parked();
-
-    workspace_a_project_b.update(cx_a2, |workspace, cx| {
-        assert_eq!(workspace.project().read(cx).remote_id(), Some(project_b_id));
-        assert!(workspace.is_being_followed(client_b.peer_id().unwrap()));
-        assert_eq!(
-            client_b.peer_id().map(Into::into),
-            workspace.leader_for_pane(workspace.active_pane())
-        );
-        let item = workspace.active_item(cx).unwrap();
-        assert_eq!(item.tab_content_text(0, cx), SharedString::from("y.rs"));
-    });
-}
-
-#[gpui::test]
-async fn test_following_stops_on_unshare(cx_a: &mut TestAppContext, cx_b: &mut TestAppContext) {
-    let (_server, client_a, client_b, channel_id) = TestServer::start2(cx_a, cx_b).await;
-
-    let (workspace_a, cx_a) = client_a.build_test_workspace(cx_a).await;
-    client_a
-        .host_workspace(&workspace_a, channel_id, cx_a)
-        .await;
-    let (workspace_b, cx_b) = client_b.join_workspace(channel_id, cx_b).await;
-
-    cx_a.simulate_keystrokes("cmd-p");
-    cx_a.run_until_parked();
-    cx_a.simulate_keystrokes("2 enter");
-
-    let editor_a = workspace_a.update(cx_a, |workspace, cx| {
-        workspace.active_item_as::<Editor>(cx).unwrap()
-    });
-    let editor_b = workspace_b.update(cx_b, |workspace, cx| {
-        workspace.active_item_as::<Editor>(cx).unwrap()
-    });
-
-    // b should follow a to position 1
-    editor_a.update_in(cx_a, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([MultiBufferOffset(1)..MultiBufferOffset(1)])
-        })
-    });
-    cx_a.executor()
-        .advance_clock(workspace::item::LEADER_UPDATE_THROTTLE);
-    cx_a.run_until_parked();
-    editor_b.update(cx_b, |editor, cx| {
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            vec![MultiBufferOffset(1)..MultiBufferOffset(1)]
-        )
-    });
-
-    // a unshares the project
-    cx_a.update(|_, cx| {
-        let project = workspace_a.read(cx).project().clone();
-        ActiveCall::global(cx).update(cx, |call, cx| {
-            call.unshare_project(project, cx).unwrap();
-        })
-    });
-    cx_a.run_until_parked();
-
-    // b should not follow a to position 2
-    editor_a.update_in(cx_a, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([MultiBufferOffset(2)..MultiBufferOffset(2)])
-        })
-    });
-    cx_a.executor()
-        .advance_clock(workspace::item::LEADER_UPDATE_THROTTLE);
-    cx_a.run_until_parked();
-    editor_b.update(cx_b, |editor, cx| {
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            vec![MultiBufferOffset(1)..MultiBufferOffset(1)]
-        )
-    });
-    cx_b.update(|_, cx| {
-        let room = ActiveCall::global(cx).read(cx).room().unwrap().read(cx);
-        let participant = room.remote_participants().get(&client_a.id()).unwrap();
-        assert_eq!(participant.location, ParticipantLocation::UnsharedProject)
-    })
-}
-
-#[gpui::test]
-async fn test_following_into_excluded_file(
-    mut cx_a: &mut TestAppContext,
-    mut cx_b: &mut TestAppContext,
-) {
-    let executor = cx_a.executor();
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    for cx in [&mut cx_a, &mut cx_b] {
-        cx.update(|cx| {
-            cx.update_global::<SettingsStore, _>(|store, cx| {
-                store.update_user_settings(cx, |settings| {
-                    settings.project.worktree.file_scan_exclusions =
-                        Some(vec!["**/.git".to_string()]);
-                });
-            });
-        });
-    }
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-    let active_call_b = cx_b.read(ActiveCall::global);
-    let peer_id_a = client_a.peer_id().unwrap();
-
-    client_a
-        .fs()
-        .insert_tree(
-            path!("/a"),
-            json!({
-                ".git": {
-                    "COMMIT_EDITMSG": "write your commit message here",
-                },
-                "1.txt": "one\none\none",
-                "2.txt": "two\ntwo\ntwo",
-                "3.txt": "three\nthree\nthree",
-            }),
-        )
-        .await;
-    let (project_a, worktree_id) = client_a.build_local_project(path!("/a"), cx_a).await;
-    active_call_a
-        .update(cx_a, |call, cx| call.set_location(Some(&project_a), cx))
-        .await
-        .unwrap();
-
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-    active_call_b
-        .update(cx_b, |call, cx| call.set_location(Some(&project_b), cx))
-        .await
-        .unwrap();
-
-    let (workspace_a, cx_a) = client_a.build_workspace(&project_a, cx_a);
-    let (workspace_b, cx_b) = client_b.build_workspace(&project_b, cx_b);
-
-    // Client A opens editors for a regular file and an excluded file.
-    let editor_for_regular = workspace_a
-        .update_in(cx_a, |workspace, window, cx| {
-            workspace.open_path((worktree_id, rel_path("1.txt")), None, true, window, cx)
-        })
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-    let editor_for_excluded_a = workspace_a
-        .update_in(cx_a, |workspace, window, cx| {
-            workspace.open_path(
-                (worktree_id, rel_path(".git/COMMIT_EDITMSG")),
-                None,
-                true,
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-
-    // Client A updates their selections in those editors
-    editor_for_regular.update_in(cx_a, |editor, window, cx| {
-        editor.handle_input("a", window, cx);
-        editor.handle_input("b", window, cx);
-        editor.handle_input("c", window, cx);
-        editor.select_left(&Default::default(), window, cx);
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            vec![MultiBufferOffset(3)..MultiBufferOffset(2)]
-        );
-    });
-    editor_for_excluded_a.update_in(cx_a, |editor, window, cx| {
-        editor.select_all(&Default::default(), window, cx);
-        editor.handle_input("new commit message", window, cx);
-        editor.select_left(&Default::default(), window, cx);
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            vec![MultiBufferOffset(18)..MultiBufferOffset(17)]
-        );
-    });
-
-    // When client B starts following client A, currently visible file is replicated
-    workspace_b.update_in(cx_b, |workspace, window, cx| {
-        workspace.follow(peer_id_a, window, cx)
-    });
-    executor.advance_clock(workspace::item::LEADER_UPDATE_THROTTLE);
-    executor.run_until_parked();
-
-    let editor_for_excluded_b = workspace_b.update(cx_b, |workspace, cx| {
-        workspace
-            .active_item(cx)
-            .unwrap()
-            .downcast::<Editor>()
-            .unwrap()
-    });
-    assert_eq!(
-        cx_b.read(|cx| editor_for_excluded_b.project_path(cx)),
-        Some((worktree_id, rel_path(".git/COMMIT_EDITMSG")).into())
-    );
-    assert_eq!(
-        editor_for_excluded_b.update(cx_b, |editor, cx| editor
-            .selections
-            .ranges(&editor.display_snapshot(cx))),
-        vec![MultiBufferOffset(18)..MultiBufferOffset(17)]
-    );
-
-    editor_for_excluded_a.update_in(cx_a, |editor, window, cx| {
-        editor.select_right(&Default::default(), window, cx);
-    });
-    executor.advance_clock(workspace::item::LEADER_UPDATE_THROTTLE);
-    executor.run_until_parked();
-
-    // Changes from B to the excluded file are replicated in A's editor
-    editor_for_excluded_b.update_in(cx_b, |editor, window, cx| {
-        editor.handle_input("\nCo-Authored-By: B <b@b.b>", window, cx);
-    });
-    executor.run_until_parked();
-    editor_for_excluded_a.update(cx_a, |editor, cx| {
-        assert_eq!(
-            editor.text(cx),
-            "new commit message\nCo-Authored-By: B <b@b.b>"
-        );
-    });
-}
-
-fn visible_push_notifications(cx: &mut TestAppContext) -> Vec<Entity<ProjectSharedNotification>> {
-    let mut ret = Vec::new();
-    for window in cx.windows() {
-        window
-            .update(cx, |window, _, _| {
-                if let Ok(handle) = window.downcast::<ProjectSharedNotification>() {
-                    ret.push(handle)
-                }
-            })
-            .unwrap();
-    }
-    ret
-}
-
-#[derive(Debug, PartialEq, Eq)]
-struct PaneSummary {
-    active: bool,
-    leader: Option<PeerId>,
-    items: Vec<(bool, String)>,
-}
-
-fn followers_by_leader(project_id: u64, cx: &TestAppContext) -> Vec<(PeerId, Vec<PeerId>)> {
-    cx.read(|cx| {
-        let active_call = ActiveCall::global(cx).read(cx);
-        let peer_id = active_call.client().peer_id();
-        let room = active_call.room().unwrap().read(cx);
-        let mut result = room
-            .remote_participants()
-            .values()
-            .map(|participant| participant.peer_id)
-            .chain(peer_id)
-            .filter_map(|peer_id| {
-                let followers = room.followers_for(peer_id, project_id);
-                if followers.is_empty() {
-                    None
-                } else {
-                    Some((peer_id, followers.to_vec()))
-                }
-            })
-            .collect::<Vec<_>>();
-        result.sort_by_key(|e| e.0);
-        result
-    })
-}
-
-fn pane_summaries(workspace: &Entity<Workspace>, cx: &mut VisualTestContext) -> Vec<PaneSummary> {
-    workspace.update(cx, |workspace, cx| {
-        let active_pane = workspace.active_pane();
-        workspace
-            .panes()
-            .iter()
-            .map(|pane| {
-                let leader = match workspace.leader_for_pane(pane) {
-                    Some(CollaboratorId::PeerId(peer_id)) => Some(peer_id),
-                    Some(CollaboratorId::Agent) => unimplemented!(),
-                    None => None,
-                };
-                let active = pane == active_pane;
-                let pane = pane.read(cx);
-                let active_ix = pane.active_item_index();
-                PaneSummary {
-                    active,
-                    leader,
-                    items: pane
-                        .items()
-                        .enumerate()
-                        .map(|(ix, item)| (ix == active_ix, item.tab_content_text(0, cx).into()))
-                        .collect(),
-                }
-            })
-            .collect()
-    })
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_following_to_channel_notes_without_a_shared_project(
-    deterministic: BackgroundExecutor,
-    mut cx_a: &mut TestAppContext,
-    mut cx_b: &mut TestAppContext,
-    mut cx_c: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(deterministic.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    let client_c = server.create_client(cx_c, "user_c").await;
-
-    cx_a.update(editor::init);
-    cx_b.update(editor::init);
-    cx_c.update(editor::init);
-    cx_a.update(collab_ui::channel_view::init);
-    cx_b.update(collab_ui::channel_view::init);
-    cx_c.update(collab_ui::channel_view::init);
-
-    let channel_1_id = server
-        .make_channel(
-            "channel-1",
-            None,
-            (&client_a, cx_a),
-            &mut [(&client_b, cx_b), (&client_c, cx_c)],
-        )
-        .await;
-    let channel_2_id = server
-        .make_channel(
-            "channel-2",
-            None,
-            (&client_a, cx_a),
-            &mut [(&client_b, cx_b), (&client_c, cx_c)],
-        )
-        .await;
-
-    // Clients A, B, and C join a channel.
-    let active_call_a = cx_a.read(ActiveCall::global);
-    let active_call_b = cx_b.read(ActiveCall::global);
-    let active_call_c = cx_c.read(ActiveCall::global);
-    for (call, cx) in [
-        (&active_call_a, &mut cx_a),
-        (&active_call_b, &mut cx_b),
-        (&active_call_c, &mut cx_c),
-    ] {
-        call.update(*cx, |call, cx| call.join_channel(channel_1_id, cx))
-            .await
-            .unwrap();
-    }
-    deterministic.run_until_parked();
-
-    // Clients A, B, and C all open their own unshared projects.
-    client_a
-        .fs()
-        .insert_tree("/a", json!({ "1.txt": "" }))
-        .await;
-    client_b.fs().insert_tree("/b", json!({})).await;
-    client_c.fs().insert_tree("/c", json!({})).await;
-    let (project_a, worktree_id) = client_a.build_local_project("/a", cx_a).await;
-    let (project_b, _) = client_b.build_local_project("/b", cx_b).await;
-    let (project_c, _) = client_b.build_local_project("/c", cx_c).await;
-    let (workspace_a, cx_a) = client_a.build_workspace(&project_a, cx_a);
-    let (workspace_b, cx_b) = client_b.build_workspace(&project_b, cx_b);
-    let (_workspace_c, _cx_c) = client_c.build_workspace(&project_c, cx_c);
-
-    active_call_a
-        .update(cx_a, |call, cx| call.set_location(Some(&project_a), cx))
-        .await
-        .unwrap();
-
-    // Client A opens the notes for channel 1.
-    let channel_notes_1_a = cx_a
-        .update(|window, cx| ChannelView::open(channel_1_id, None, workspace_a.clone(), window, cx))
-        .await
-        .unwrap();
-    channel_notes_1_a.update_in(cx_a, |notes, window, cx| {
-        assert_eq!(notes.channel(cx).unwrap().name, "channel-1");
-        notes.editor.update(cx, |editor, cx| {
-            editor.insert("Hello from A.", window, cx);
-            editor.change_selections(SelectionEffects::no_scroll(), window, cx, |selections| {
-                selections.select_ranges(vec![MultiBufferOffset(3)..MultiBufferOffset(4)]);
-            });
-        });
-    });
-
-    // Client B follows client A.
-    workspace_b
-        .update_in(cx_b, |workspace, window, cx| {
-            workspace
-                .start_following(client_a.peer_id().unwrap(), window, cx)
-                .unwrap()
-        })
-        .await
-        .unwrap();
-
-    // Client B is taken to the notes for channel 1, with the same
-    // text selected as client A.
-    deterministic.run_until_parked();
-    let channel_notes_1_b = workspace_b.update(cx_b, |workspace, cx| {
-        assert_eq!(
-            workspace.leader_for_pane(workspace.active_pane()),
-            Some(client_a.peer_id().unwrap().into())
-        );
-        workspace
-            .active_item(cx)
-            .expect("no active item")
-            .downcast::<ChannelView>()
-            .expect("active item is not a channel view")
-    });
-    channel_notes_1_b.update(cx_b, |notes, cx| {
-        assert_eq!(notes.channel(cx).unwrap().name, "channel-1");
-        notes.editor.update(cx, |editor, cx| {
-            assert_eq!(editor.text(cx), "Hello from A.");
-            assert_eq!(
-                editor
-                    .selections
-                    .ranges::<MultiBufferOffset>(&editor.display_snapshot(cx)),
-                &[MultiBufferOffset(3)..MultiBufferOffset(4)]
-            );
-        })
-    });
-
-    //  Client A opens the notes for channel 2.
-    let channel_notes_2_a = cx_a
-        .update(|window, cx| ChannelView::open(channel_2_id, None, workspace_a.clone(), window, cx))
-        .await
-        .unwrap();
-    channel_notes_2_a.update(cx_a, |notes, cx| {
-        assert_eq!(notes.channel(cx).unwrap().name, "channel-2");
-    });
-
-    // Client B is taken to the notes for channel 2.
-    deterministic.run_until_parked();
-    let channel_notes_2_b = workspace_b.update(cx_b, |workspace, cx| {
-        assert_eq!(
-            workspace.leader_for_pane(workspace.active_pane()),
-            Some(client_a.peer_id().unwrap().into())
-        );
-        workspace
-            .active_item(cx)
-            .expect("no active item")
-            .downcast::<ChannelView>()
-            .expect("active item is not a channel view")
-    });
-    channel_notes_2_b.update(cx_b, |notes, cx| {
-        assert_eq!(notes.channel(cx).unwrap().name, "channel-2");
-    });
-
-    // Client A opens a local buffer in their unshared project.
-    let _unshared_editor_a1 = workspace_a
-        .update_in(cx_a, |workspace, window, cx| {
-            workspace.open_path((worktree_id, rel_path("1.txt")), None, true, window, cx)
-        })
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-
-    // This does not send any leader update message to client B.
-    // If it did, an error would occur on client B, since this buffer
-    // is not shared with them.
-    deterministic.run_until_parked();
-    workspace_b.update(cx_b, |workspace, cx| {
-        assert_eq!(
-            workspace.active_item(cx).expect("no active item").item_id(),
-            channel_notes_2_b.entity_id()
-        );
-    });
-}
-
-pub(crate) async fn join_channel(
-    channel_id: ChannelId,
-    client: &TestClient,
-    cx: &mut TestAppContext,
-) -> anyhow::Result<()> {
-    cx.update(|cx| workspace::join_channel(channel_id, client.app_state.clone(), None, cx))
-        .await
-}
-
-async fn share_workspace(
-    workspace: &Entity<Workspace>,
-    cx: &mut VisualTestContext,
-) -> anyhow::Result<u64> {
-    let project = workspace.read_with(cx, |workspace, _| workspace.project().clone());
-    cx.read(ActiveCall::global)
-        .update(cx, |call, cx| call.share_project(project, cx))
-        .await
-}
-
-#[gpui::test]
-async fn test_following_after_replacement(cx_a: &mut TestAppContext, cx_b: &mut TestAppContext) {
-    let (_server, client_a, client_b, channel) = TestServer::start2(cx_a, cx_b).await;
-
-    let (workspace, cx_a) = client_a.build_test_workspace(cx_a).await;
-    join_channel(channel, &client_a, cx_a).await.unwrap();
-    share_workspace(&workspace, cx_a).await.unwrap();
-    let buffer = workspace.update(cx_a, |workspace, cx| {
-        workspace.project().update(cx, |project, cx| {
-            project.create_local_buffer(&sample_text(26, 5, 'a'), None, false, cx)
-        })
-    });
-    let multibuffer = cx_a.new(|cx| {
-        let mut mb = MultiBuffer::new(Capability::ReadWrite);
-        mb.set_excerpts_for_path(
-            PathKey::for_buffer(&buffer, cx),
-            buffer.clone(),
-            [Point::row_range(1..1), Point::row_range(5..5)],
-            1,
-            cx,
-        );
-        mb
-    });
-    let snapshot = buffer.update(cx_a, |buffer, _| buffer.snapshot());
-    let editor: Entity<Editor> = cx_a.new_window_entity(|window, cx| {
-        Editor::for_multibuffer(
-            multibuffer.clone(),
-            Some(workspace.read(cx).project().clone()),
-            window,
-            cx,
-        )
-    });
-    workspace.update_in(cx_a, |workspace, window, cx| {
-        workspace.add_item_to_center(Box::new(editor.clone()) as _, window, cx)
-    });
-    editor.update_in(cx_a, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([Point::row_range(4..4)]);
-        })
-    });
-    let positions = editor.update(cx_a, |editor, _| {
-        editor
-            .selections
-            .disjoint_anchor_ranges()
-            .map(|range| range.start.text_anchor.to_point(&snapshot))
-            .collect::<Vec<_>>()
-    });
-    multibuffer.update(cx_a, |multibuffer, cx| {
-        multibuffer.set_excerpts_for_path(
-            PathKey::for_buffer(&buffer, cx),
-            buffer,
-            [Point::row_range(1..5)],
-            1,
-            cx,
-        );
-    });
-
-    let (workspace_b, cx_b) = client_b.join_workspace(channel, cx_b).await;
-    cx_b.run_until_parked();
-    let editor_b = workspace_b
-        .update(cx_b, |workspace, cx| {
-            workspace
-                .active_item(cx)
-                .and_then(|item| item.downcast::<Editor>())
-        })
-        .unwrap();
-
-    let new_positions = editor_b.update(cx_b, |editor, _| {
-        editor
-            .selections
-            .disjoint_anchor_ranges()
-            .map(|range| range.start.text_anchor.to_point(&snapshot))
-            .collect::<Vec<_>>()
-    });
-    assert_eq!(positions, new_positions);
-}
-
-#[gpui::test]
-async fn test_following_to_channel_notes_other_workspace(
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let (_server, client_a, client_b, channel) = TestServer::start2(cx_a, cx_b).await;
-
-    let mut cx_a2 = cx_a.clone();
-    let (workspace_a, cx_a) = client_a.build_test_workspace(cx_a).await;
-    join_channel(channel, &client_a, cx_a).await.unwrap();
-    share_workspace(&workspace_a, cx_a).await.unwrap();
-
-    // a opens 1.txt
-    cx_a.simulate_keystrokes("cmd-p");
-    cx_a.run_until_parked();
-    cx_a.simulate_keystrokes("1 enter");
-    cx_a.run_until_parked();
-    workspace_a.update(cx_a, |workspace, cx| {
-        let editor = workspace.active_item(cx).unwrap();
-        assert_eq!(editor.tab_content_text(0, cx), "1.txt");
-    });
-
-    // b joins channel and is following a
-    join_channel(channel, &client_b, cx_b).await.unwrap();
-    cx_b.run_until_parked();
-    let (workspace_b, cx_b) = client_b.active_workspace(cx_b);
-    workspace_b.update(cx_b, |workspace, cx| {
-        let editor = workspace.active_item(cx).unwrap();
-        assert_eq!(editor.tab_content_text(0, cx), "1.txt");
-    });
-
-    // a opens a second workspace and the channel notes
-    let (workspace_a2, cx_a2) = client_a.build_test_workspace(&mut cx_a2).await;
-    cx_a2.update(|window, _| window.activate_window());
-    cx_a2
-        .update(|window, cx| ChannelView::open(channel, None, workspace_a2, window, cx))
-        .await
-        .unwrap();
-    cx_a2.run_until_parked();
-
-    // b should follow a to the channel notes
-    workspace_b.update(cx_b, |workspace, cx| {
-        let editor = workspace.active_item_as::<ChannelView>(cx).unwrap();
-        assert_eq!(editor.read(cx).channel(cx).unwrap().id, channel);
-    });
-
-    // a returns to the shared project
-    cx_a.update(|window, _| window.activate_window());
-    cx_a.run_until_parked();
-
-    workspace_a.update(cx_a, |workspace, cx| {
-        let editor = workspace.active_item(cx).unwrap();
-        assert_eq!(editor.tab_content_text(0, cx), "1.txt");
-    });
-
-    // b should follow a back
-    workspace_b.update(cx_b, |workspace, cx| {
-        let editor = workspace.active_item_as::<Editor>(cx).unwrap();
-        assert_eq!(editor.tab_content_text(0, cx), "1.txt");
-    });
-}
-
-#[gpui::test]
-async fn test_following_while_deactivated(cx_a: &mut TestAppContext, cx_b: &mut TestAppContext) {
-    let (_server, client_a, client_b, channel) = TestServer::start2(cx_a, cx_b).await;
-
-    let mut cx_a2 = cx_a.clone();
-    let (workspace_a, cx_a) = client_a.build_test_workspace(cx_a).await;
-    join_channel(channel, &client_a, cx_a).await.unwrap();
-    share_workspace(&workspace_a, cx_a).await.unwrap();
-
-    // a opens 1.txt
-    cx_a.simulate_keystrokes("cmd-p");
-    cx_a.run_until_parked();
-    cx_a.simulate_keystrokes("1 enter");
-    cx_a.run_until_parked();
-    workspace_a.update(cx_a, |workspace, cx| {
-        let editor = workspace.active_item(cx).unwrap();
-        assert_eq!(editor.tab_content_text(0, cx), "1.txt");
-    });
-
-    // b joins channel and is following a
-    join_channel(channel, &client_b, cx_b).await.unwrap();
-    cx_b.run_until_parked();
-    let (workspace_b, cx_b) = client_b.active_workspace(cx_b);
-    workspace_b.update(cx_b, |workspace, cx| {
-        let editor = workspace.active_item(cx).unwrap();
-        assert_eq!(editor.tab_content_text(0, cx), "1.txt");
-    });
-
-    // stop following
-    cx_b.simulate_keystrokes("down");
-
-    // a opens a different file while not followed
-    cx_a.simulate_keystrokes("cmd-p");
-    cx_a.run_until_parked();
-    cx_a.simulate_keystrokes("2 enter");
-
-    workspace_b.update(cx_b, |workspace, cx| {
-        let editor = workspace.active_item_as::<Editor>(cx).unwrap();
-        assert_eq!(editor.tab_content_text(0, cx), "1.txt");
-    });
-
-    // a opens a file in a new window
-    let (_, cx_a2) = client_a.build_test_workspace(&mut cx_a2).await;
-    cx_a2.update(|window, _| window.activate_window());
-    cx_a2.simulate_keystrokes("cmd-p");
-    cx_a2.run_until_parked();
-    cx_a2.simulate_keystrokes("3 enter");
-    cx_a2.run_until_parked();
-
-    // b starts following a again
-    cx_b.simulate_keystrokes("cmd-ctrl-alt-f");
-    cx_a.run_until_parked();
-
-    // a returns to the shared project
-    cx_a.update(|window, _| window.activate_window());
-    cx_a.run_until_parked();
-
-    workspace_a.update(cx_a, |workspace, cx| {
-        let editor = workspace.active_item(cx).unwrap();
-        assert_eq!(editor.tab_content_text(0, cx), "2.js");
-    });
-
-    // b should follow a back
-    workspace_b.update(cx_b, |workspace, cx| {
-        let editor = workspace.active_item_as::<Editor>(cx).unwrap();
-        assert_eq!(editor.tab_content_text(0, cx), "2.js");
-    });
-}
diff --git a/crates/collab/src/tests/git_tests.rs b/crates/collab/src/tests/git_tests.rs
deleted file mode 100644
index 6843c4a22a..0000000000
--- a/crates/collab/src/tests/git_tests.rs
+++ /dev/null
@@ -1,135 +0,0 @@
-use std::path::Path;
-
-use call::ActiveCall;
-use git::status::{FileStatus, StatusCode, TrackedStatus};
-use git_ui::project_diff::ProjectDiff;
-use gpui::{TestAppContext, VisualTestContext};
-use project::ProjectPath;
-use serde_json::json;
-use util::{path, rel_path::rel_path};
-use workspace::Workspace;
-
-//
-use crate::tests::TestServer;
-
-#[gpui::test]
-async fn test_project_diff(cx_a: &mut TestAppContext, cx_b: &mut TestAppContext) {
-    let mut server = TestServer::start(cx_a.background_executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    cx_a.set_name("cx_a");
-    cx_b.set_name("cx_b");
-
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-
-    client_a
-        .fs()
-        .insert_tree(
-            path!("/a"),
-            json!({
-                ".git": {},
-                "changed.txt": "after\n",
-                "unchanged.txt": "unchanged\n",
-                "created.txt": "created\n",
-                "secret.pem": "secret-changed\n",
-            }),
-        )
-        .await;
-
-    client_a.fs().set_head_and_index_for_repo(
-        Path::new(path!("/a/.git")),
-        &[
-            ("changed.txt", "before\n".to_string()),
-            ("unchanged.txt", "unchanged\n".to_string()),
-            ("deleted.txt", "deleted\n".to_string()),
-            ("secret.pem", "shh\n".to_string()),
-        ],
-    );
-    let (project_a, worktree_id) = client_a.build_local_project(path!("/a"), cx_a).await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-
-    cx_b.update(editor::init);
-    cx_b.update(git_ui::init);
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-    let workspace_b = cx_b.add_window(|window, cx| {
-        Workspace::new(
-            None,
-            project_b.clone(),
-            client_b.app_state.clone(),
-            window,
-            cx,
-        )
-    });
-    let cx_b = &mut VisualTestContext::from_window(*workspace_b, cx_b);
-    let workspace_b = workspace_b.root(cx_b).unwrap();
-
-    cx_b.update(|window, cx| {
-        window
-            .focused(cx)
-            .unwrap()
-            .dispatch_action(&git_ui::project_diff::Diff, window, cx)
-    });
-    let diff = workspace_b.update(cx_b, |workspace, cx| {
-        workspace.active_item(cx).unwrap().act_as::<ProjectDiff>(cx)
-    });
-    let diff = diff.unwrap();
-    cx_b.run_until_parked();
-
-    diff.update(cx_b, |diff, cx| {
-        assert_eq!(
-            diff.excerpt_paths(cx),
-            vec![
-                rel_path("changed.txt").into_arc(),
-                rel_path("deleted.txt").into_arc(),
-                rel_path("created.txt").into_arc()
-            ]
-        );
-    });
-
-    client_a
-        .fs()
-        .insert_tree(
-            path!("/a"),
-            json!({
-                ".git": {},
-                "changed.txt": "before\n",
-                "unchanged.txt": "changed\n",
-                "created.txt": "created\n",
-                "secret.pem": "secret-changed\n",
-            }),
-        )
-        .await;
-    cx_b.run_until_parked();
-
-    project_b.update(cx_b, |project, cx| {
-        let project_path = ProjectPath {
-            worktree_id,
-            path: rel_path("unchanged.txt").into(),
-        };
-        let status = project.project_path_git_status(&project_path, cx);
-        assert_eq!(
-            status.unwrap(),
-            FileStatus::Tracked(TrackedStatus {
-                worktree_status: StatusCode::Modified,
-                index_status: StatusCode::Unmodified,
-            })
-        );
-    });
-
-    diff.update(cx_b, |diff, cx| {
-        assert_eq!(
-            diff.excerpt_paths(cx),
-            vec![
-                rel_path("deleted.txt").into_arc(),
-                rel_path("unchanged.txt").into_arc(),
-                rel_path("created.txt").into_arc()
-            ]
-        );
-    });
-}
diff --git a/crates/collab/src/tests/integration_tests.rs b/crates/collab/src/tests/integration_tests.rs
deleted file mode 100644
index 391e7355ea..0000000000
--- a/crates/collab/src/tests/integration_tests.rs
+++ /dev/null
@@ -1,7102 +0,0 @@
-use crate::{
-    rpc::{CLEANUP_TIMEOUT, RECONNECT_TIMEOUT},
-    tests::{
-        RoomParticipants, TestClient, TestServer, channel_id, following_tests::join_channel,
-        room_participants,
-    },
-};
-use anyhow::{Result, anyhow};
-use assistant_slash_command::SlashCommandWorkingSet;
-use assistant_text_thread::TextThreadStore;
-use buffer_diff::{DiffHunkSecondaryStatus, DiffHunkStatus, assert_hunks};
-use call::{ActiveCall, ParticipantLocation, Room, room};
-use client::{RECEIVE_TIMEOUT, User};
-use collections::{HashMap, HashSet};
-use fs::{FakeFs, Fs as _, RemoveOptions};
-use futures::{StreamExt as _, channel::mpsc};
-use git::{
-    repository::repo_path,
-    status::{FileStatus, StatusCode, TrackedStatus, UnmergedStatus, UnmergedStatusCode},
-};
-use gpui::{
-    App, BackgroundExecutor, Entity, Modifiers, MouseButton, MouseDownEvent, TestAppContext,
-    UpdateGlobal, px, size,
-};
-use language::{
-    Diagnostic, DiagnosticEntry, DiagnosticSourceKind, FakeLspAdapter, Language, LanguageConfig,
-    LanguageMatcher, LineEnding, OffsetRangeExt, Point, Rope,
-    language_settings::{Formatter, FormatterList},
-    rust_lang, tree_sitter_rust, tree_sitter_typescript,
-};
-use lsp::{LanguageServerId, OneOf};
-use parking_lot::Mutex;
-use pretty_assertions::assert_eq;
-use project::{
-    DiagnosticSummary, HoverBlockKind, Project, ProjectPath,
-    lsp_store::{FormatTrigger, LspFormatTarget, SymbolLocation},
-    search::{SearchQuery, SearchResult},
-};
-use prompt_store::PromptBuilder;
-use rand::prelude::*;
-use serde_json::json;
-use settings::{LanguageServerFormatterSpecifier, PrettierSettingsContent, SettingsStore};
-use std::{
-    cell::{Cell, RefCell},
-    env, future, mem,
-    path::{Path, PathBuf},
-    rc::Rc,
-    sync::{
-        Arc,
-        atomic::{AtomicBool, Ordering::SeqCst},
-    },
-    time::Duration,
-};
-use unindent::Unindent as _;
-use util::{path, rel_path::rel_path, uri};
-use workspace::Pane;
-
-#[ctor::ctor]
-fn init_logger() {
-    zlog::init_test();
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_database_failure_during_client_reconnection(
-    executor: BackgroundExecutor,
-    cx: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client = server.create_client(cx, "user_a").await;
-
-    // Keep disconnecting the client until a database failure prevents it from
-    // reconnecting.
-    server.test_db.set_query_failure_probability(0.3);
-    loop {
-        server.disconnect_client(client.peer_id().unwrap());
-        executor.advance_clock(RECEIVE_TIMEOUT + RECONNECT_TIMEOUT);
-        if !client.status().borrow().is_connected() {
-            break;
-        }
-    }
-
-    // Make the database healthy again and ensure the client can finally connect.
-    server.test_db.set_query_failure_probability(0.);
-    executor.advance_clock(RECEIVE_TIMEOUT + RECONNECT_TIMEOUT);
-    assert!(
-        matches!(*client.status().borrow(), client::Status::Connected { .. }),
-        "status was {:?}",
-        *client.status().borrow()
-    );
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_basic_calls(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-    cx_b2: &mut TestAppContext,
-    cx_c: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    let client_c = server.create_client(cx_c, "user_c").await;
-    server
-        .make_contacts(&mut [(&client_a, cx_a), (&client_b, cx_b), (&client_c, cx_c)])
-        .await;
-
-    let active_call_a = cx_a.read(ActiveCall::global);
-    let active_call_b = cx_b.read(ActiveCall::global);
-    let active_call_c = cx_c.read(ActiveCall::global);
-
-    // Call user B from client A.
-    active_call_a
-        .update(cx_a, |call, cx| {
-            call.invite(client_b.user_id().unwrap(), None, cx)
-        })
-        .await
-        .unwrap();
-    let room_a = active_call_a.read_with(cx_a, |call, _| call.room().unwrap().clone());
-    executor.run_until_parked();
-    assert_eq!(
-        room_participants(&room_a, cx_a),
-        RoomParticipants {
-            remote: Default::default(),
-            pending: vec!["user_b".to_string()]
-        }
-    );
-
-    // User B receives the call.
-
-    let mut incoming_call_b = active_call_b.read_with(cx_b, |call, _| call.incoming());
-    let call_b = incoming_call_b.next().await.unwrap().unwrap();
-    assert_eq!(call_b.calling_user.github_login, "user_a");
-
-    // User B connects via another client and also receives a ring on the newly-connected client.
-    let _client_b2 = server.create_client(cx_b2, "user_b").await;
-    let active_call_b2 = cx_b2.read(ActiveCall::global);
-
-    let mut incoming_call_b2 = active_call_b2.read_with(cx_b2, |call, _| call.incoming());
-    executor.run_until_parked();
-    let call_b2 = incoming_call_b2.next().await.unwrap().unwrap();
-    assert_eq!(call_b2.calling_user.github_login, "user_a");
-
-    // User B joins the room using the first client.
-    active_call_b
-        .update(cx_b, |call, cx| call.accept_incoming(cx))
-        .await
-        .unwrap();
-
-    let room_b = active_call_b.read_with(cx_b, |call, _| call.room().unwrap().clone());
-    assert!(incoming_call_b.next().await.unwrap().is_none());
-
-    executor.run_until_parked();
-    assert_eq!(
-        room_participants(&room_a, cx_a),
-        RoomParticipants {
-            remote: vec!["user_b".to_string()],
-            pending: Default::default()
-        }
-    );
-    assert_eq!(
-        room_participants(&room_b, cx_b),
-        RoomParticipants {
-            remote: vec!["user_a".to_string()],
-            pending: Default::default()
-        }
-    );
-
-    // Call user C from client B.
-
-    let mut incoming_call_c = active_call_c.read_with(cx_c, |call, _| call.incoming());
-    active_call_b
-        .update(cx_b, |call, cx| {
-            call.invite(client_c.user_id().unwrap(), None, cx)
-        })
-        .await
-        .unwrap();
-
-    executor.run_until_parked();
-    assert_eq!(
-        room_participants(&room_a, cx_a),
-        RoomParticipants {
-            remote: vec!["user_b".to_string()],
-            pending: vec!["user_c".to_string()]
-        }
-    );
-    assert_eq!(
-        room_participants(&room_b, cx_b),
-        RoomParticipants {
-            remote: vec!["user_a".to_string()],
-            pending: vec!["user_c".to_string()]
-        }
-    );
-
-    // User C receives the call, but declines it.
-    let call_c = incoming_call_c.next().await.unwrap().unwrap();
-    assert_eq!(call_c.calling_user.github_login, "user_b");
-    active_call_c.update(cx_c, |call, cx| call.decline_incoming(cx).unwrap());
-    assert!(incoming_call_c.next().await.unwrap().is_none());
-
-    executor.run_until_parked();
-    assert_eq!(
-        room_participants(&room_a, cx_a),
-        RoomParticipants {
-            remote: vec!["user_b".to_string()],
-            pending: Default::default()
-        }
-    );
-    assert_eq!(
-        room_participants(&room_b, cx_b),
-        RoomParticipants {
-            remote: vec!["user_a".to_string()],
-            pending: Default::default()
-        }
-    );
-
-    // Call user C again from user A.
-    active_call_a
-        .update(cx_a, |call, cx| {
-            call.invite(client_c.user_id().unwrap(), None, cx)
-        })
-        .await
-        .unwrap();
-
-    executor.run_until_parked();
-    assert_eq!(
-        room_participants(&room_a, cx_a),
-        RoomParticipants {
-            remote: vec!["user_b".to_string()],
-            pending: vec!["user_c".to_string()]
-        }
-    );
-    assert_eq!(
-        room_participants(&room_b, cx_b),
-        RoomParticipants {
-            remote: vec!["user_a".to_string()],
-            pending: vec!["user_c".to_string()]
-        }
-    );
-
-    // User C accepts the call.
-    let call_c = incoming_call_c.next().await.unwrap().unwrap();
-    assert_eq!(call_c.calling_user.github_login, "user_a");
-    active_call_c
-        .update(cx_c, |call, cx| call.accept_incoming(cx))
-        .await
-        .unwrap();
-    assert!(incoming_call_c.next().await.unwrap().is_none());
-
-    let room_c = active_call_c.read_with(cx_c, |call, _| call.room().unwrap().clone());
-
-    executor.run_until_parked();
-    assert_eq!(
-        room_participants(&room_a, cx_a),
-        RoomParticipants {
-            remote: vec!["user_b".to_string(), "user_c".to_string()],
-            pending: Default::default()
-        }
-    );
-    assert_eq!(
-        room_participants(&room_b, cx_b),
-        RoomParticipants {
-            remote: vec!["user_a".to_string(), "user_c".to_string()],
-            pending: Default::default()
-        }
-    );
-    assert_eq!(
-        room_participants(&room_c, cx_c),
-        RoomParticipants {
-            remote: vec!["user_a".to_string(), "user_b".to_string()],
-            pending: Default::default()
-        }
-    );
-
-    // User A shares their screen
-    let display = gpui::TestScreenCaptureSource::new();
-    let events_b = active_call_events(cx_b);
-    let events_c = active_call_events(cx_c);
-    cx_a.set_screen_capture_sources(vec![display]);
-    let screen_a = cx_a
-        .update(|cx| cx.screen_capture_sources())
-        .await
-        .unwrap()
-        .unwrap()
-        .into_iter()
-        .next()
-        .unwrap();
-    active_call_a
-        .update(cx_a, |call, cx| {
-            call.room()
-                .unwrap()
-                .update(cx, |room, cx| room.share_screen(screen_a, cx))
-        })
-        .await
-        .unwrap();
-
-    executor.run_until_parked();
-
-    // User B observes the remote screen sharing track.
-    assert_eq!(events_b.borrow().len(), 1);
-    let event_b = events_b.borrow().first().unwrap().clone();
-    if let call::room::Event::RemoteVideoTracksChanged { participant_id } = event_b {
-        assert_eq!(participant_id, client_a.peer_id().unwrap());
-
-        room_b.read_with(cx_b, |room, _| {
-            assert_eq!(
-                room.remote_participants()[&client_a.user_id().unwrap()]
-                    .video_tracks
-                    .len(),
-                1
-            );
-        });
-    } else {
-        panic!("unexpected event")
-    }
-
-    // User C observes the remote screen sharing track.
-    assert_eq!(events_c.borrow().len(), 1);
-    let event_c = events_c.borrow().first().unwrap().clone();
-    if let call::room::Event::RemoteVideoTracksChanged { participant_id } = event_c {
-        assert_eq!(participant_id, client_a.peer_id().unwrap());
-
-        room_c.read_with(cx_c, |room, _| {
-            assert_eq!(
-                room.remote_participants()[&client_a.user_id().unwrap()]
-                    .video_tracks
-                    .len(),
-                1
-            );
-        });
-    } else {
-        panic!("unexpected event")
-    }
-
-    // User A leaves the room.
-    active_call_a
-        .update(cx_a, |call, cx| {
-            let hang_up = call.hang_up(cx);
-            assert!(call.room().is_none());
-            hang_up
-        })
-        .await
-        .unwrap();
-    executor.run_until_parked();
-    assert_eq!(
-        room_participants(&room_a, cx_a),
-        RoomParticipants {
-            remote: Default::default(),
-            pending: Default::default()
-        }
-    );
-    assert_eq!(
-        room_participants(&room_b, cx_b),
-        RoomParticipants {
-            remote: vec!["user_c".to_string()],
-            pending: Default::default()
-        }
-    );
-    assert_eq!(
-        room_participants(&room_c, cx_c),
-        RoomParticipants {
-            remote: vec!["user_b".to_string()],
-            pending: Default::default()
-        }
-    );
-
-    // User B gets disconnected from the LiveKit server, which causes them
-    // to automatically leave the room. User C leaves the room as well because
-    // nobody else is in there.
-    server
-        .test_livekit_server
-        .disconnect_client(client_b.user_id().unwrap().to_string())
-        .await;
-    executor.run_until_parked();
-
-    active_call_b.read_with(cx_b, |call, _| assert!(call.room().is_none()));
-
-    active_call_c.read_with(cx_c, |call, _| assert!(call.room().is_none()));
-    assert_eq!(
-        room_participants(&room_a, cx_a),
-        RoomParticipants {
-            remote: Default::default(),
-            pending: Default::default()
-        }
-    );
-    assert_eq!(
-        room_participants(&room_b, cx_b),
-        RoomParticipants {
-            remote: Default::default(),
-            pending: Default::default()
-        }
-    );
-    assert_eq!(
-        room_participants(&room_c, cx_c),
-        RoomParticipants {
-            remote: Default::default(),
-            pending: Default::default()
-        }
-    );
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_calling_multiple_users_simultaneously(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-    cx_c: &mut TestAppContext,
-    cx_d: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    let client_c = server.create_client(cx_c, "user_c").await;
-    let client_d = server.create_client(cx_d, "user_d").await;
-    server
-        .make_contacts(&mut [
-            (&client_a, cx_a),
-            (&client_b, cx_b),
-            (&client_c, cx_c),
-            (&client_d, cx_d),
-        ])
-        .await;
-
-    let active_call_a = cx_a.read(ActiveCall::global);
-    let active_call_b = cx_b.read(ActiveCall::global);
-    let active_call_c = cx_c.read(ActiveCall::global);
-    let active_call_d = cx_d.read(ActiveCall::global);
-
-    // Simultaneously call user B and user C from client A.
-    let b_invite = active_call_a.update(cx_a, |call, cx| {
-        call.invite(client_b.user_id().unwrap(), None, cx)
-    });
-    let c_invite = active_call_a.update(cx_a, |call, cx| {
-        call.invite(client_c.user_id().unwrap(), None, cx)
-    });
-    b_invite.await.unwrap();
-    c_invite.await.unwrap();
-
-    let room_a = active_call_a.read_with(cx_a, |call, _| call.room().unwrap().clone());
-    executor.run_until_parked();
-    assert_eq!(
-        room_participants(&room_a, cx_a),
-        RoomParticipants {
-            remote: Default::default(),
-            pending: vec!["user_b".to_string(), "user_c".to_string()]
-        }
-    );
-
-    // Call client D from client A.
-    active_call_a
-        .update(cx_a, |call, cx| {
-            call.invite(client_d.user_id().unwrap(), None, cx)
-        })
-        .await
-        .unwrap();
-    executor.run_until_parked();
-    assert_eq!(
-        room_participants(&room_a, cx_a),
-        RoomParticipants {
-            remote: Default::default(),
-            pending: vec![
-                "user_b".to_string(),
-                "user_c".to_string(),
-                "user_d".to_string()
-            ]
-        }
-    );
-
-    // Accept the call on all clients simultaneously.
-    let accept_b = active_call_b.update(cx_b, |call, cx| call.accept_incoming(cx));
-    let accept_c = active_call_c.update(cx_c, |call, cx| call.accept_incoming(cx));
-    let accept_d = active_call_d.update(cx_d, |call, cx| call.accept_incoming(cx));
-    accept_b.await.unwrap();
-    accept_c.await.unwrap();
-    accept_d.await.unwrap();
-
-    executor.run_until_parked();
-
-    let room_b = active_call_b.read_with(cx_b, |call, _| call.room().unwrap().clone());
-
-    let room_c = active_call_c.read_with(cx_c, |call, _| call.room().unwrap().clone());
-
-    let room_d = active_call_d.read_with(cx_d, |call, _| call.room().unwrap().clone());
-    assert_eq!(
-        room_participants(&room_a, cx_a),
-        RoomParticipants {
-            remote: vec![
-                "user_b".to_string(),
-                "user_c".to_string(),
-                "user_d".to_string(),
-            ],
-            pending: Default::default()
-        }
-    );
-    assert_eq!(
-        room_participants(&room_b, cx_b),
-        RoomParticipants {
-            remote: vec![
-                "user_a".to_string(),
-                "user_c".to_string(),
-                "user_d".to_string(),
-            ],
-            pending: Default::default()
-        }
-    );
-    assert_eq!(
-        room_participants(&room_c, cx_c),
-        RoomParticipants {
-            remote: vec![
-                "user_a".to_string(),
-                "user_b".to_string(),
-                "user_d".to_string(),
-            ],
-            pending: Default::default()
-        }
-    );
-    assert_eq!(
-        room_participants(&room_d, cx_d),
-        RoomParticipants {
-            remote: vec![
-                "user_a".to_string(),
-                "user_b".to_string(),
-                "user_c".to_string(),
-            ],
-            pending: Default::default()
-        }
-    );
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_joining_channels_and_calling_multiple_users_simultaneously(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-    cx_c: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    let client_c = server.create_client(cx_c, "user_c").await;
-    server
-        .make_contacts(&mut [(&client_a, cx_a), (&client_b, cx_b), (&client_c, cx_c)])
-        .await;
-
-    let channel_1 = server
-        .make_channel(
-            "channel1",
-            None,
-            (&client_a, cx_a),
-            &mut [(&client_b, cx_b), (&client_c, cx_c)],
-        )
-        .await;
-
-    let channel_2 = server
-        .make_channel(
-            "channel2",
-            None,
-            (&client_a, cx_a),
-            &mut [(&client_b, cx_b), (&client_c, cx_c)],
-        )
-        .await;
-
-    let active_call_a = cx_a.read(ActiveCall::global);
-
-    // Simultaneously join channel 1 and then channel 2
-    active_call_a
-        .update(cx_a, |call, cx| call.join_channel(channel_1, cx))
-        .detach();
-    let join_channel_2 = active_call_a.update(cx_a, |call, cx| call.join_channel(channel_2, cx));
-
-    join_channel_2.await.unwrap();
-
-    let room_a = active_call_a.read_with(cx_a, |call, _| call.room().unwrap().clone());
-    executor.run_until_parked();
-
-    assert_eq!(channel_id(&room_a, cx_a), Some(channel_2));
-
-    // Leave the room
-    active_call_a
-        .update(cx_a, |call, cx| call.hang_up(cx))
-        .await
-        .unwrap();
-
-    // Initiating invites and then joining a channel should fail gracefully
-    let b_invite = active_call_a.update(cx_a, |call, cx| {
-        call.invite(client_b.user_id().unwrap(), None, cx)
-    });
-    let c_invite = active_call_a.update(cx_a, |call, cx| {
-        call.invite(client_c.user_id().unwrap(), None, cx)
-    });
-
-    let join_channel = active_call_a.update(cx_a, |call, cx| call.join_channel(channel_1, cx));
-
-    b_invite.await.unwrap();
-    c_invite.await.unwrap();
-    join_channel.await.unwrap();
-
-    let room_a = active_call_a.read_with(cx_a, |call, _| call.room().unwrap().clone());
-    executor.run_until_parked();
-
-    assert_eq!(
-        room_participants(&room_a, cx_a),
-        RoomParticipants {
-            remote: Default::default(),
-            pending: vec!["user_b".to_string(), "user_c".to_string()]
-        }
-    );
-
-    assert_eq!(channel_id(&room_a, cx_a), None);
-
-    // Leave the room
-    active_call_a
-        .update(cx_a, |call, cx| call.hang_up(cx))
-        .await
-        .unwrap();
-
-    // Simultaneously join channel 1 and call user B and user C from client A.
-    let join_channel = active_call_a.update(cx_a, |call, cx| call.join_channel(channel_1, cx));
-
-    let b_invite = active_call_a.update(cx_a, |call, cx| {
-        call.invite(client_b.user_id().unwrap(), None, cx)
-    });
-    let c_invite = active_call_a.update(cx_a, |call, cx| {
-        call.invite(client_c.user_id().unwrap(), None, cx)
-    });
-
-    join_channel.await.unwrap();
-    b_invite.await.unwrap();
-    c_invite.await.unwrap();
-
-    active_call_a.read_with(cx_a, |call, _| call.room().unwrap().clone());
-    executor.run_until_parked();
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_room_uniqueness(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_a2: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-    cx_b2: &mut TestAppContext,
-    cx_c: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let _client_a2 = server.create_client(cx_a2, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    let _client_b2 = server.create_client(cx_b2, "user_b").await;
-    let client_c = server.create_client(cx_c, "user_c").await;
-    server
-        .make_contacts(&mut [(&client_a, cx_a), (&client_b, cx_b), (&client_c, cx_c)])
-        .await;
-
-    let active_call_a = cx_a.read(ActiveCall::global);
-    let active_call_a2 = cx_a2.read(ActiveCall::global);
-    let active_call_b = cx_b.read(ActiveCall::global);
-    let active_call_b2 = cx_b2.read(ActiveCall::global);
-    let active_call_c = cx_c.read(ActiveCall::global);
-
-    // Call user B from client A.
-    active_call_a
-        .update(cx_a, |call, cx| {
-            call.invite(client_b.user_id().unwrap(), None, cx)
-        })
-        .await
-        .unwrap();
-
-    // Ensure a new room can't be created given user A just created one.
-    active_call_a2
-        .update(cx_a2, |call, cx| {
-            call.invite(client_c.user_id().unwrap(), None, cx)
-        })
-        .await
-        .unwrap_err();
-
-    active_call_a2.read_with(cx_a2, |call, _| assert!(call.room().is_none()));
-
-    // User B receives the call from user A.
-
-    let mut incoming_call_b = active_call_b.read_with(cx_b, |call, _| call.incoming());
-    let call_b1 = incoming_call_b.next().await.unwrap().unwrap();
-    assert_eq!(call_b1.calling_user.github_login, "user_a");
-
-    // Ensure calling users A and B from client C fails.
-    active_call_c
-        .update(cx_c, |call, cx| {
-            call.invite(client_a.user_id().unwrap(), None, cx)
-        })
-        .await
-        .unwrap_err();
-    active_call_c
-        .update(cx_c, |call, cx| {
-            call.invite(client_b.user_id().unwrap(), None, cx)
-        })
-        .await
-        .unwrap_err();
-
-    // Ensure User B can't create a room while they still have an incoming call.
-    active_call_b2
-        .update(cx_b2, |call, cx| {
-            call.invite(client_c.user_id().unwrap(), None, cx)
-        })
-        .await
-        .unwrap_err();
-
-    active_call_b2.read_with(cx_b2, |call, _| assert!(call.room().is_none()));
-
-    // User B joins the room and calling them after they've joined still fails.
-    active_call_b
-        .update(cx_b, |call, cx| call.accept_incoming(cx))
-        .await
-        .unwrap();
-    active_call_c
-        .update(cx_c, |call, cx| {
-            call.invite(client_b.user_id().unwrap(), None, cx)
-        })
-        .await
-        .unwrap_err();
-
-    // Ensure User B can't create a room while they belong to another room.
-    active_call_b2
-        .update(cx_b2, |call, cx| {
-            call.invite(client_c.user_id().unwrap(), None, cx)
-        })
-        .await
-        .unwrap_err();
-
-    active_call_b2.read_with(cx_b2, |call, _| assert!(call.room().is_none()));
-
-    // Client C can successfully call client B after client B leaves the room.
-    active_call_b
-        .update(cx_b, |call, cx| call.hang_up(cx))
-        .await
-        .unwrap();
-    executor.run_until_parked();
-    active_call_c
-        .update(cx_c, |call, cx| {
-            call.invite(client_b.user_id().unwrap(), None, cx)
-        })
-        .await
-        .unwrap();
-    executor.run_until_parked();
-    let call_b2 = incoming_call_b.next().await.unwrap().unwrap();
-    assert_eq!(call_b2.calling_user.github_login, "user_c");
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_client_disconnecting_from_room(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .make_contacts(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-
-    let active_call_a = cx_a.read(ActiveCall::global);
-    let active_call_b = cx_b.read(ActiveCall::global);
-
-    // Call user B from client A.
-    active_call_a
-        .update(cx_a, |call, cx| {
-            call.invite(client_b.user_id().unwrap(), None, cx)
-        })
-        .await
-        .unwrap();
-
-    let room_a = active_call_a.read_with(cx_a, |call, _| call.room().unwrap().clone());
-
-    // User B receives the call and joins the room.
-
-    let mut incoming_call_b = active_call_b.read_with(cx_b, |call, _| call.incoming());
-    incoming_call_b.next().await.unwrap().unwrap();
-    active_call_b
-        .update(cx_b, |call, cx| call.accept_incoming(cx))
-        .await
-        .unwrap();
-
-    let room_b = active_call_b.read_with(cx_b, |call, _| call.room().unwrap().clone());
-    executor.run_until_parked();
-    assert_eq!(
-        room_participants(&room_a, cx_a),
-        RoomParticipants {
-            remote: vec!["user_b".to_string()],
-            pending: Default::default()
-        }
-    );
-    assert_eq!(
-        room_participants(&room_b, cx_b),
-        RoomParticipants {
-            remote: vec!["user_a".to_string()],
-            pending: Default::default()
-        }
-    );
-
-    // User A automatically reconnects to the room upon disconnection.
-    server.disconnect_client(client_a.peer_id().unwrap());
-    executor.advance_clock(RECEIVE_TIMEOUT);
-    executor.run_until_parked();
-    assert_eq!(
-        room_participants(&room_a, cx_a),
-        RoomParticipants {
-            remote: vec!["user_b".to_string()],
-            pending: Default::default()
-        }
-    );
-    assert_eq!(
-        room_participants(&room_b, cx_b),
-        RoomParticipants {
-            remote: vec!["user_a".to_string()],
-            pending: Default::default()
-        }
-    );
-
-    // When user A disconnects, both client A and B clear their room on the active call.
-    server.forbid_connections();
-    server.disconnect_client(client_a.peer_id().unwrap());
-    executor.advance_clock(RECEIVE_TIMEOUT + RECONNECT_TIMEOUT);
-
-    active_call_a.read_with(cx_a, |call, _| assert!(call.room().is_none()));
-
-    active_call_b.read_with(cx_b, |call, _| assert!(call.room().is_none()));
-    assert_eq!(
-        room_participants(&room_a, cx_a),
-        RoomParticipants {
-            remote: Default::default(),
-            pending: Default::default()
-        }
-    );
-    assert_eq!(
-        room_participants(&room_b, cx_b),
-        RoomParticipants {
-            remote: Default::default(),
-            pending: Default::default()
-        }
-    );
-
-    // Allow user A to reconnect to the server.
-    server.allow_connections();
-    executor.advance_clock(RECONNECT_TIMEOUT);
-
-    // Call user B again from client A.
-    active_call_a
-        .update(cx_a, |call, cx| {
-            call.invite(client_b.user_id().unwrap(), None, cx)
-        })
-        .await
-        .unwrap();
-
-    let room_a = active_call_a.read_with(cx_a, |call, _| call.room().unwrap().clone());
-
-    // User B receives the call and joins the room.
-
-    let mut incoming_call_b = active_call_b.read_with(cx_b, |call, _| call.incoming());
-    incoming_call_b.next().await.unwrap().unwrap();
-    active_call_b
-        .update(cx_b, |call, cx| call.accept_incoming(cx))
-        .await
-        .unwrap();
-
-    let room_b = active_call_b.read_with(cx_b, |call, _| call.room().unwrap().clone());
-    executor.run_until_parked();
-    assert_eq!(
-        room_participants(&room_a, cx_a),
-        RoomParticipants {
-            remote: vec!["user_b".to_string()],
-            pending: Default::default()
-        }
-    );
-    assert_eq!(
-        room_participants(&room_b, cx_b),
-        RoomParticipants {
-            remote: vec!["user_a".to_string()],
-            pending: Default::default()
-        }
-    );
-
-    // User B gets disconnected from the LiveKit server, which causes it
-    // to automatically leave the room.
-    server
-        .test_livekit_server
-        .disconnect_client(client_b.user_id().unwrap().to_string())
-        .await;
-    executor.run_until_parked();
-    active_call_a.update(cx_a, |call, _| assert!(call.room().is_none()));
-    active_call_b.update(cx_b, |call, _| assert!(call.room().is_none()));
-    assert_eq!(
-        room_participants(&room_a, cx_a),
-        RoomParticipants {
-            remote: Default::default(),
-            pending: Default::default()
-        }
-    );
-    assert_eq!(
-        room_participants(&room_b, cx_b),
-        RoomParticipants {
-            remote: Default::default(),
-            pending: Default::default()
-        }
-    );
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_server_restarts(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-    cx_c: &mut TestAppContext,
-    cx_d: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    client_a
-        .fs()
-        .insert_tree("/a", json!({ "a.txt": "a-contents" }))
-        .await;
-
-    // Invite client B to collaborate on a project
-    let (project_a, _) = client_a.build_local_project("/a", cx_a).await;
-
-    let client_b = server.create_client(cx_b, "user_b").await;
-    let client_c = server.create_client(cx_c, "user_c").await;
-    let client_d = server.create_client(cx_d, "user_d").await;
-    server
-        .make_contacts(&mut [
-            (&client_a, cx_a),
-            (&client_b, cx_b),
-            (&client_c, cx_c),
-            (&client_d, cx_d),
-        ])
-        .await;
-
-    let active_call_a = cx_a.read(ActiveCall::global);
-    let active_call_b = cx_b.read(ActiveCall::global);
-    let active_call_c = cx_c.read(ActiveCall::global);
-    let active_call_d = cx_d.read(ActiveCall::global);
-
-    // User A calls users B, C, and D.
-    active_call_a
-        .update(cx_a, |call, cx| {
-            call.invite(client_b.user_id().unwrap(), Some(project_a.clone()), cx)
-        })
-        .await
-        .unwrap();
-    active_call_a
-        .update(cx_a, |call, cx| {
-            call.invite(client_c.user_id().unwrap(), Some(project_a.clone()), cx)
-        })
-        .await
-        .unwrap();
-    active_call_a
-        .update(cx_a, |call, cx| {
-            call.invite(client_d.user_id().unwrap(), Some(project_a.clone()), cx)
-        })
-        .await
-        .unwrap();
-
-    let room_a = active_call_a.read_with(cx_a, |call, _| call.room().unwrap().clone());
-
-    // User B receives the call and joins the room.
-
-    let mut incoming_call_b = active_call_b.read_with(cx_b, |call, _| call.incoming());
-    assert!(incoming_call_b.next().await.unwrap().is_some());
-    active_call_b
-        .update(cx_b, |call, cx| call.accept_incoming(cx))
-        .await
-        .unwrap();
-
-    let room_b = active_call_b.read_with(cx_b, |call, _| call.room().unwrap().clone());
-
-    // User C receives the call and joins the room.
-
-    let mut incoming_call_c = active_call_c.read_with(cx_c, |call, _| call.incoming());
-    assert!(incoming_call_c.next().await.unwrap().is_some());
-    active_call_c
-        .update(cx_c, |call, cx| call.accept_incoming(cx))
-        .await
-        .unwrap();
-
-    let room_c = active_call_c.read_with(cx_c, |call, _| call.room().unwrap().clone());
-
-    // User D receives the call but doesn't join the room yet.
-
-    let mut incoming_call_d = active_call_d.read_with(cx_d, |call, _| call.incoming());
-    assert!(incoming_call_d.next().await.unwrap().is_some());
-
-    executor.run_until_parked();
-    assert_eq!(
-        room_participants(&room_a, cx_a),
-        RoomParticipants {
-            remote: vec!["user_b".to_string(), "user_c".to_string()],
-            pending: vec!["user_d".to_string()]
-        }
-    );
-    assert_eq!(
-        room_participants(&room_b, cx_b),
-        RoomParticipants {
-            remote: vec!["user_a".to_string(), "user_c".to_string()],
-            pending: vec!["user_d".to_string()]
-        }
-    );
-    assert_eq!(
-        room_participants(&room_c, cx_c),
-        RoomParticipants {
-            remote: vec!["user_a".to_string(), "user_b".to_string()],
-            pending: vec!["user_d".to_string()]
-        }
-    );
-
-    // The server is torn down.
-    server.reset().await;
-
-    // Users A and B reconnect to the call. User C has troubles reconnecting, so it leaves the room.
-    client_c.override_establish_connection(|_, cx| cx.spawn(async |_| future::pending().await));
-    executor.advance_clock(RECONNECT_TIMEOUT);
-    assert_eq!(
-        room_participants(&room_a, cx_a),
-        RoomParticipants {
-            remote: vec!["user_b".to_string(), "user_c".to_string()],
-            pending: vec!["user_d".to_string()]
-        }
-    );
-    assert_eq!(
-        room_participants(&room_b, cx_b),
-        RoomParticipants {
-            remote: vec!["user_a".to_string(), "user_c".to_string()],
-            pending: vec!["user_d".to_string()]
-        }
-    );
-    assert_eq!(
-        room_participants(&room_c, cx_c),
-        RoomParticipants {
-            remote: vec![],
-            pending: vec![]
-        }
-    );
-
-    // User D is notified again of the incoming call and accepts it.
-    assert!(incoming_call_d.next().await.unwrap().is_some());
-    active_call_d
-        .update(cx_d, |call, cx| call.accept_incoming(cx))
-        .await
-        .unwrap();
-    executor.run_until_parked();
-
-    let room_d = active_call_d.read_with(cx_d, |call, _| call.room().unwrap().clone());
-    assert_eq!(
-        room_participants(&room_a, cx_a),
-        RoomParticipants {
-            remote: vec![
-                "user_b".to_string(),
-                "user_c".to_string(),
-                "user_d".to_string(),
-            ],
-            pending: vec![]
-        }
-    );
-    assert_eq!(
-        room_participants(&room_b, cx_b),
-        RoomParticipants {
-            remote: vec![
-                "user_a".to_string(),
-                "user_c".to_string(),
-                "user_d".to_string(),
-            ],
-            pending: vec![]
-        }
-    );
-    assert_eq!(
-        room_participants(&room_c, cx_c),
-        RoomParticipants {
-            remote: vec![],
-            pending: vec![]
-        }
-    );
-    assert_eq!(
-        room_participants(&room_d, cx_d),
-        RoomParticipants {
-            remote: vec![
-                "user_a".to_string(),
-                "user_b".to_string(),
-                "user_c".to_string(),
-            ],
-            pending: vec![]
-        }
-    );
-
-    // The server finishes restarting, cleaning up stale connections.
-    server.start().await.unwrap();
-    executor.advance_clock(CLEANUP_TIMEOUT);
-    assert_eq!(
-        room_participants(&room_a, cx_a),
-        RoomParticipants {
-            remote: vec!["user_b".to_string(), "user_d".to_string()],
-            pending: vec![]
-        }
-    );
-    assert_eq!(
-        room_participants(&room_b, cx_b),
-        RoomParticipants {
-            remote: vec!["user_a".to_string(), "user_d".to_string()],
-            pending: vec![]
-        }
-    );
-    assert_eq!(
-        room_participants(&room_c, cx_c),
-        RoomParticipants {
-            remote: vec![],
-            pending: vec![]
-        }
-    );
-    assert_eq!(
-        room_participants(&room_d, cx_d),
-        RoomParticipants {
-            remote: vec!["user_a".to_string(), "user_b".to_string()],
-            pending: vec![]
-        }
-    );
-
-    // User D hangs up.
-    active_call_d
-        .update(cx_d, |call, cx| call.hang_up(cx))
-        .await
-        .unwrap();
-    executor.run_until_parked();
-    assert_eq!(
-        room_participants(&room_a, cx_a),
-        RoomParticipants {
-            remote: vec!["user_b".to_string()],
-            pending: vec![]
-        }
-    );
-    assert_eq!(
-        room_participants(&room_b, cx_b),
-        RoomParticipants {
-            remote: vec!["user_a".to_string()],
-            pending: vec![]
-        }
-    );
-    assert_eq!(
-        room_participants(&room_c, cx_c),
-        RoomParticipants {
-            remote: vec![],
-            pending: vec![]
-        }
-    );
-    assert_eq!(
-        room_participants(&room_d, cx_d),
-        RoomParticipants {
-            remote: vec![],
-            pending: vec![]
-        }
-    );
-
-    // User B calls user D again.
-    active_call_b
-        .update(cx_b, |call, cx| {
-            call.invite(client_d.user_id().unwrap(), None, cx)
-        })
-        .await
-        .unwrap();
-
-    // User D receives the call but doesn't join the room yet.
-
-    let mut incoming_call_d = active_call_d.read_with(cx_d, |call, _| call.incoming());
-    assert!(incoming_call_d.next().await.unwrap().is_some());
-    executor.run_until_parked();
-    assert_eq!(
-        room_participants(&room_a, cx_a),
-        RoomParticipants {
-            remote: vec!["user_b".to_string()],
-            pending: vec!["user_d".to_string()]
-        }
-    );
-    assert_eq!(
-        room_participants(&room_b, cx_b),
-        RoomParticipants {
-            remote: vec!["user_a".to_string()],
-            pending: vec!["user_d".to_string()]
-        }
-    );
-
-    // The server is torn down.
-    server.reset().await;
-
-    // Users A and B have troubles reconnecting, so they leave the room.
-    client_a.override_establish_connection(|_, cx| cx.spawn(async |_| future::pending().await));
-    client_b.override_establish_connection(|_, cx| cx.spawn(async |_| future::pending().await));
-    client_c.override_establish_connection(|_, cx| cx.spawn(async |_| future::pending().await));
-    executor.advance_clock(RECONNECT_TIMEOUT);
-    assert_eq!(
-        room_participants(&room_a, cx_a),
-        RoomParticipants {
-            remote: vec![],
-            pending: vec![]
-        }
-    );
-    assert_eq!(
-        room_participants(&room_b, cx_b),
-        RoomParticipants {
-            remote: vec![],
-            pending: vec![]
-        }
-    );
-
-    // User D is notified again of the incoming call but doesn't accept it.
-    assert!(incoming_call_d.next().await.unwrap().is_some());
-
-    // The server finishes restarting, cleaning up stale connections and canceling the
-    // call to user D because the room has become empty.
-    server.start().await.unwrap();
-    executor.advance_clock(CLEANUP_TIMEOUT);
-    assert!(incoming_call_d.next().await.unwrap().is_none());
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_calls_on_multiple_connections(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b1: &mut TestAppContext,
-    cx_b2: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b1 = server.create_client(cx_b1, "user_b").await;
-    let client_b2 = server.create_client(cx_b2, "user_b").await;
-    server
-        .make_contacts(&mut [(&client_a, cx_a), (&client_b1, cx_b1)])
-        .await;
-
-    let active_call_a = cx_a.read(ActiveCall::global);
-    let active_call_b1 = cx_b1.read(ActiveCall::global);
-    let active_call_b2 = cx_b2.read(ActiveCall::global);
-
-    let mut incoming_call_b1 = active_call_b1.read_with(cx_b1, |call, _| call.incoming());
-
-    let mut incoming_call_b2 = active_call_b2.read_with(cx_b2, |call, _| call.incoming());
-    assert!(incoming_call_b1.next().await.unwrap().is_none());
-    assert!(incoming_call_b2.next().await.unwrap().is_none());
-
-    // Call user B from client A, ensuring both clients for user B ring.
-    active_call_a
-        .update(cx_a, |call, cx| {
-            call.invite(client_b1.user_id().unwrap(), None, cx)
-        })
-        .await
-        .unwrap();
-    executor.run_until_parked();
-    assert!(incoming_call_b1.next().await.unwrap().is_some());
-    assert!(incoming_call_b2.next().await.unwrap().is_some());
-
-    // User B declines the call on one of the two connections, causing both connections
-    // to stop ringing.
-    active_call_b2.update(cx_b2, |call, cx| call.decline_incoming(cx).unwrap());
-    executor.run_until_parked();
-    assert!(incoming_call_b1.next().await.unwrap().is_none());
-    assert!(incoming_call_b2.next().await.unwrap().is_none());
-
-    // Call user B again from client A.
-    active_call_a
-        .update(cx_a, |call, cx| {
-            call.invite(client_b1.user_id().unwrap(), None, cx)
-        })
-        .await
-        .unwrap();
-    executor.run_until_parked();
-    assert!(incoming_call_b1.next().await.unwrap().is_some());
-    assert!(incoming_call_b2.next().await.unwrap().is_some());
-
-    // User B accepts the call on one of the two connections, causing both connections
-    // to stop ringing.
-    active_call_b2
-        .update(cx_b2, |call, cx| call.accept_incoming(cx))
-        .await
-        .unwrap();
-    executor.run_until_parked();
-    assert!(incoming_call_b1.next().await.unwrap().is_none());
-    assert!(incoming_call_b2.next().await.unwrap().is_none());
-
-    // User B disconnects the client that is not on the call. Everything should be fine.
-    client_b1.disconnect(&cx_b1.to_async());
-    executor.advance_clock(RECEIVE_TIMEOUT);
-    client_b1
-        .connect(false, &cx_b1.to_async())
-        .await
-        .into_response()
-        .unwrap();
-
-    // User B hangs up, and user A calls them again.
-    active_call_b2
-        .update(cx_b2, |call, cx| call.hang_up(cx))
-        .await
-        .unwrap();
-    executor.run_until_parked();
-    active_call_a
-        .update(cx_a, |call, cx| {
-            call.invite(client_b1.user_id().unwrap(), None, cx)
-        })
-        .await
-        .unwrap();
-    executor.run_until_parked();
-    assert!(incoming_call_b1.next().await.unwrap().is_some());
-    assert!(incoming_call_b2.next().await.unwrap().is_some());
-
-    // User A cancels the call, causing both connections to stop ringing.
-    active_call_a
-        .update(cx_a, |call, cx| {
-            call.cancel_invite(client_b1.user_id().unwrap(), cx)
-        })
-        .await
-        .unwrap();
-    executor.run_until_parked();
-    assert!(incoming_call_b1.next().await.unwrap().is_none());
-    assert!(incoming_call_b2.next().await.unwrap().is_none());
-
-    // User A calls user B again.
-    active_call_a
-        .update(cx_a, |call, cx| {
-            call.invite(client_b1.user_id().unwrap(), None, cx)
-        })
-        .await
-        .unwrap();
-    executor.run_until_parked();
-    assert!(incoming_call_b1.next().await.unwrap().is_some());
-    assert!(incoming_call_b2.next().await.unwrap().is_some());
-
-    // User A hangs up, causing both connections to stop ringing.
-    active_call_a
-        .update(cx_a, |call, cx| call.hang_up(cx))
-        .await
-        .unwrap();
-    executor.run_until_parked();
-    assert!(incoming_call_b1.next().await.unwrap().is_none());
-    assert!(incoming_call_b2.next().await.unwrap().is_none());
-
-    // User A calls user B again.
-    active_call_a
-        .update(cx_a, |call, cx| {
-            call.invite(client_b1.user_id().unwrap(), None, cx)
-        })
-        .await
-        .unwrap();
-    executor.run_until_parked();
-    assert!(incoming_call_b1.next().await.unwrap().is_some());
-    assert!(incoming_call_b2.next().await.unwrap().is_some());
-
-    // User A disconnects, causing both connections to stop ringing.
-    server.forbid_connections();
-    server.disconnect_client(client_a.peer_id().unwrap());
-    executor.advance_clock(RECEIVE_TIMEOUT + RECONNECT_TIMEOUT);
-    assert!(incoming_call_b1.next().await.unwrap().is_none());
-    assert!(incoming_call_b2.next().await.unwrap().is_none());
-
-    // User A reconnects automatically, then calls user B again.
-    server.allow_connections();
-    executor.advance_clock(RECONNECT_TIMEOUT);
-    active_call_a
-        .update(cx_a, |call, cx| {
-            call.invite(client_b1.user_id().unwrap(), None, cx)
-        })
-        .await
-        .unwrap();
-    executor.run_until_parked();
-    assert!(incoming_call_b1.next().await.unwrap().is_some());
-    assert!(incoming_call_b2.next().await.unwrap().is_some());
-
-    // User B disconnects all clients, causing user A to no longer see a pending call for them.
-    server.forbid_connections();
-    server.disconnect_client(client_b1.peer_id().unwrap());
-    server.disconnect_client(client_b2.peer_id().unwrap());
-    executor.advance_clock(RECEIVE_TIMEOUT + RECONNECT_TIMEOUT);
-
-    active_call_a.read_with(cx_a, |call, _| assert!(call.room().is_none()));
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_unshare_project(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-    cx_c: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    let client_c = server.create_client(cx_c, "user_c").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b), (&client_c, cx_c)])
-        .await;
-
-    let active_call_a = cx_a.read(ActiveCall::global);
-    let active_call_b = cx_b.read(ActiveCall::global);
-
-    client_a
-        .fs()
-        .insert_tree(
-            "/a",
-            json!({
-                "a.txt": "a-contents",
-                "b.txt": "b-contents",
-            }),
-        )
-        .await;
-
-    let (project_a, worktree_id) = client_a.build_local_project("/a", cx_a).await;
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-
-    let worktree_a = project_a.read_with(cx_a, |project, cx| project.worktrees(cx).next().unwrap());
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-    executor.run_until_parked();
-
-    assert!(worktree_a.read_with(cx_a, |tree, _| tree.has_update_observer()));
-
-    project_b
-        .update(cx_b, |p, cx| {
-            p.open_buffer((worktree_id, rel_path("a.txt")), cx)
-        })
-        .await
-        .unwrap();
-
-    // When client B leaves the room, the project becomes read-only.
-    active_call_b
-        .update(cx_b, |call, cx| call.hang_up(cx))
-        .await
-        .unwrap();
-    executor.run_until_parked();
-
-    assert!(project_b.read_with(cx_b, |project, cx| project.is_disconnected(cx)));
-
-    // Client C opens the project.
-    let project_c = client_c.join_remote_project(project_id, cx_c).await;
-
-    // When client A unshares the project, client C's project becomes read-only.
-    project_a
-        .update(cx_a, |project, cx| project.unshare(cx))
-        .unwrap();
-    executor.run_until_parked();
-
-    assert!(worktree_a.read_with(cx_a, |tree, _| !tree.has_update_observer()));
-
-    assert!(project_c.read_with(cx_c, |project, cx| project.is_disconnected(cx)));
-
-    // Client C can open the project again after client A re-shares.
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-    let project_c2 = client_c.join_remote_project(project_id, cx_c).await;
-    executor.run_until_parked();
-
-    assert!(worktree_a.read_with(cx_a, |tree, _| tree.has_update_observer()));
-    project_c2
-        .update(cx_c, |p, cx| {
-            p.open_buffer((worktree_id, rel_path("a.txt")), cx)
-        })
-        .await
-        .unwrap();
-
-    // When client A (the host) leaves the room, the project gets unshared and guests are notified.
-    active_call_a
-        .update(cx_a, |call, cx| call.hang_up(cx))
-        .await
-        .unwrap();
-    executor.run_until_parked();
-
-    project_a.read_with(cx_a, |project, _| assert!(!project.is_shared()));
-
-    project_c2.read_with(cx_c, |project, cx| {
-        assert!(project.is_disconnected(cx));
-        assert!(project.collaborators().is_empty());
-    });
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_project_reconnect(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-
-    cx_b.update(editor::init);
-
-    client_a
-        .fs()
-        .insert_tree(
-            path!("/root-1"),
-            json!({
-                "dir1": {
-                    "a.txt": "a",
-                    "b.txt": "b",
-                    "subdir1": {
-                        "c.txt": "c",
-                        "d.txt": "d",
-                        "e.txt": "e",
-                    }
-                },
-                "dir2": {
-                    "v.txt": "v",
-                },
-                "dir3": {
-                    "w.txt": "w",
-                    "x.txt": "x",
-                    "y.txt": "y",
-                },
-                "dir4": {
-                    "z.txt": "z",
-                },
-            }),
-        )
-        .await;
-    client_a
-        .fs()
-        .insert_tree(
-            path!("/root-2"),
-            json!({
-                "2.txt": "2",
-            }),
-        )
-        .await;
-    client_a
-        .fs()
-        .insert_tree(
-            path!("/root-3"),
-            json!({
-                "3.txt": "3",
-            }),
-        )
-        .await;
-
-    let active_call_a = cx_a.read(ActiveCall::global);
-    let (project_a1, _) = client_a
-        .build_local_project(path!("/root-1/dir1"), cx_a)
-        .await;
-    let (project_a2, _) = client_a.build_local_project(path!("/root-2"), cx_a).await;
-    let (project_a3, _) = client_a.build_local_project(path!("/root-3"), cx_a).await;
-    let worktree_a1 =
-        project_a1.read_with(cx_a, |project, cx| project.worktrees(cx).next().unwrap());
-    let project1_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a1.clone(), cx))
-        .await
-        .unwrap();
-    let project2_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a2.clone(), cx))
-        .await
-        .unwrap();
-    let project3_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a3.clone(), cx))
-        .await
-        .unwrap();
-
-    let project_b1 = client_b.join_remote_project(project1_id, cx_b).await;
-    let project_b2 = client_b.join_remote_project(project2_id, cx_b).await;
-    let project_b3 = client_b.join_remote_project(project3_id, cx_b).await;
-    executor.run_until_parked();
-
-    let worktree1_id = worktree_a1.read_with(cx_a, |worktree, _| {
-        assert!(worktree.has_update_observer());
-        worktree.id()
-    });
-    let (worktree_a2, _) = project_a1
-        .update(cx_a, |p, cx| {
-            p.find_or_create_worktree(path!("/root-1/dir2"), true, cx)
-        })
-        .await
-        .unwrap();
-    executor.run_until_parked();
-
-    let worktree2_id = worktree_a2.read_with(cx_a, |tree, _| {
-        assert!(tree.has_update_observer());
-        tree.id()
-    });
-    executor.run_until_parked();
-
-    project_b1.read_with(cx_b, |project, cx| {
-        assert!(project.worktree_for_id(worktree2_id, cx).is_some())
-    });
-
-    let buffer_a1 = project_a1
-        .update(cx_a, |p, cx| {
-            p.open_buffer((worktree1_id, rel_path("a.txt")), cx)
-        })
-        .await
-        .unwrap();
-    let buffer_b1 = project_b1
-        .update(cx_b, |p, cx| {
-            p.open_buffer((worktree1_id, rel_path("a.txt")), cx)
-        })
-        .await
-        .unwrap();
-
-    // Drop client A's connection.
-    server.forbid_connections();
-    server.disconnect_client(client_a.peer_id().unwrap());
-    executor.advance_clock(RECEIVE_TIMEOUT);
-
-    project_a1.read_with(cx_a, |project, _| {
-        assert!(project.is_shared());
-        assert_eq!(project.collaborators().len(), 1);
-    });
-
-    project_b1.read_with(cx_b, |project, cx| {
-        assert!(!project.is_disconnected(cx));
-        assert_eq!(project.collaborators().len(), 1);
-    });
-
-    worktree_a1.read_with(cx_a, |tree, _| assert!(tree.has_update_observer()));
-
-    // While client A is disconnected, add and remove files from client A's project.
-    client_a
-        .fs()
-        .insert_tree(
-            path!("/root-1/dir1/subdir2"),
-            json!({
-                "f.txt": "f-contents",
-                "g.txt": "g-contents",
-                "h.txt": "h-contents",
-                "i.txt": "i-contents",
-            }),
-        )
-        .await;
-    client_a
-        .fs()
-        .remove_dir(
-            path!("/root-1/dir1/subdir1").as_ref(),
-            RemoveOptions {
-                recursive: true,
-                ..Default::default()
-            },
-        )
-        .await
-        .unwrap();
-
-    // While client A is disconnected, add and remove worktrees from client A's project.
-    project_a1.update(cx_a, |project, cx| {
-        project.remove_worktree(worktree2_id, cx)
-    });
-    let (worktree_a3, _) = project_a1
-        .update(cx_a, |p, cx| {
-            p.find_or_create_worktree(path!("/root-1/dir3"), true, cx)
-        })
-        .await
-        .unwrap();
-    worktree_a3
-        .read_with(cx_a, |tree, _| tree.as_local().unwrap().scan_complete())
-        .await;
-
-    let worktree3_id = worktree_a3.read_with(cx_a, |tree, _| {
-        assert!(!tree.has_update_observer());
-        tree.id()
-    });
-    executor.run_until_parked();
-
-    // While client A is disconnected, close project 2
-    cx_a.update(|_| drop(project_a2));
-
-    // While client A is disconnected, mutate a buffer on both the host and the guest.
-    buffer_a1.update(cx_a, |buf, cx| buf.edit([(0..0, "W")], None, cx));
-    buffer_b1.update(cx_b, |buf, cx| buf.edit([(1..1, "Z")], None, cx));
-    executor.run_until_parked();
-
-    // Client A reconnects. Their project is re-shared, and client B re-joins it.
-    server.allow_connections();
-    client_a
-        .connect(false, &cx_a.to_async())
-        .await
-        .into_response()
-        .unwrap();
-    executor.run_until_parked();
-
-    project_a1.read_with(cx_a, |project, cx| {
-        assert!(project.is_shared());
-        assert!(worktree_a1.read(cx).has_update_observer());
-        assert_eq!(
-            worktree_a1.read(cx).snapshot().paths().collect::<Vec<_>>(),
-            vec![
-                rel_path("a.txt"),
-                rel_path("b.txt"),
-                rel_path("subdir2"),
-                rel_path("subdir2/f.txt"),
-                rel_path("subdir2/g.txt"),
-                rel_path("subdir2/h.txt"),
-                rel_path("subdir2/i.txt")
-            ]
-        );
-        assert!(worktree_a3.read(cx).has_update_observer());
-        assert_eq!(
-            worktree_a3.read(cx).snapshot().paths().collect::<Vec<_>>(),
-            vec![rel_path("w.txt"), rel_path("x.txt"), rel_path("y.txt")]
-        );
-    });
-
-    project_b1.read_with(cx_b, |project, cx| {
-        assert!(!project.is_disconnected(cx));
-        assert_eq!(
-            project
-                .worktree_for_id(worktree1_id, cx)
-                .unwrap()
-                .read(cx)
-                .snapshot()
-                .paths()
-                .collect::<Vec<_>>(),
-            vec![
-                rel_path("a.txt"),
-                rel_path("b.txt"),
-                rel_path("subdir2"),
-                rel_path("subdir2/f.txt"),
-                rel_path("subdir2/g.txt"),
-                rel_path("subdir2/h.txt"),
-                rel_path("subdir2/i.txt")
-            ]
-        );
-        assert!(project.worktree_for_id(worktree2_id, cx).is_none());
-        assert_eq!(
-            project
-                .worktree_for_id(worktree3_id, cx)
-                .unwrap()
-                .read(cx)
-                .snapshot()
-                .paths()
-                .collect::<Vec<_>>(),
-            vec![rel_path("w.txt"), rel_path("x.txt"), rel_path("y.txt")]
-        );
-    });
-
-    project_b2.read_with(cx_b, |project, cx| assert!(project.is_disconnected(cx)));
-
-    project_b3.read_with(cx_b, |project, cx| assert!(!project.is_disconnected(cx)));
-
-    buffer_a1.read_with(cx_a, |buffer, _| assert_eq!(buffer.text(), "WaZ"));
-
-    buffer_b1.read_with(cx_b, |buffer, _| assert_eq!(buffer.text(), "WaZ"));
-
-    // Drop client B's connection.
-    server.forbid_connections();
-    server.disconnect_client(client_b.peer_id().unwrap());
-    executor.advance_clock(RECEIVE_TIMEOUT);
-
-    // While client B is disconnected, add and remove files from client A's project
-    client_a
-        .fs()
-        .insert_file(path!("/root-1/dir1/subdir2/j.txt"), "j-contents".into())
-        .await;
-    client_a
-        .fs()
-        .remove_file(
-            path!("/root-1/dir1/subdir2/i.txt").as_ref(),
-            Default::default(),
-        )
-        .await
-        .unwrap();
-
-    // While client B is disconnected, add and remove worktrees from client A's project.
-    let (worktree_a4, _) = project_a1
-        .update(cx_a, |p, cx| {
-            p.find_or_create_worktree(path!("/root-1/dir4"), true, cx)
-        })
-        .await
-        .unwrap();
-    executor.run_until_parked();
-
-    let worktree4_id = worktree_a4.read_with(cx_a, |tree, _| {
-        assert!(tree.has_update_observer());
-        tree.id()
-    });
-    project_a1.update(cx_a, |project, cx| {
-        project.remove_worktree(worktree3_id, cx)
-    });
-    executor.run_until_parked();
-
-    // While client B is disconnected, mutate a buffer on both the host and the guest.
-    buffer_a1.update(cx_a, |buf, cx| buf.edit([(1..1, "X")], None, cx));
-    buffer_b1.update(cx_b, |buf, cx| buf.edit([(2..2, "Y")], None, cx));
-    executor.run_until_parked();
-
-    // While disconnected, close project 3
-    cx_a.update(|_| drop(project_a3));
-
-    // Client B reconnects. They re-join the room and the remaining shared project.
-    server.allow_connections();
-    client_b
-        .connect(false, &cx_b.to_async())
-        .await
-        .into_response()
-        .unwrap();
-    executor.run_until_parked();
-
-    project_b1.read_with(cx_b, |project, cx| {
-        assert!(!project.is_disconnected(cx));
-        assert_eq!(
-            project
-                .worktree_for_id(worktree1_id, cx)
-                .unwrap()
-                .read(cx)
-                .snapshot()
-                .paths()
-                .collect::<Vec<_>>(),
-            vec![
-                rel_path("a.txt"),
-                rel_path("b.txt"),
-                rel_path("subdir2"),
-                rel_path("subdir2/f.txt"),
-                rel_path("subdir2/g.txt"),
-                rel_path("subdir2/h.txt"),
-                rel_path("subdir2/j.txt")
-            ]
-        );
-        assert!(project.worktree_for_id(worktree2_id, cx).is_none());
-        assert_eq!(
-            project
-                .worktree_for_id(worktree4_id, cx)
-                .unwrap()
-                .read(cx)
-                .snapshot()
-                .paths()
-                .map(|p| p.as_unix_str())
-                .collect::<Vec<_>>(),
-            vec!["z.txt"]
-        );
-    });
-
-    project_b3.read_with(cx_b, |project, cx| assert!(project.is_disconnected(cx)));
-
-    buffer_a1.read_with(cx_a, |buffer, _| assert_eq!(buffer.text(), "WXaYZ"));
-
-    buffer_b1.read_with(cx_b, |buffer, _| assert_eq!(buffer.text(), "WXaYZ"));
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_active_call_events(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    client_a.fs().insert_tree("/a", json!({})).await;
-    client_b.fs().insert_tree("/b", json!({})).await;
-
-    let (project_a, _) = client_a.build_local_project("/a", cx_a).await;
-    let (project_b, _) = client_b.build_local_project("/b", cx_b).await;
-
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-    executor.run_until_parked();
-
-    let active_call_a = cx_a.read(ActiveCall::global);
-    let active_call_b = cx_b.read(ActiveCall::global);
-
-    let events_a = active_call_events(cx_a);
-    let events_b = active_call_events(cx_b);
-
-    let project_a_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-    executor.run_until_parked();
-    assert_eq!(mem::take(&mut *events_a.borrow_mut()), vec![]);
-    assert_eq!(
-        mem::take(&mut *events_b.borrow_mut()),
-        vec![room::Event::RemoteProjectShared {
-            owner: Arc::new(User {
-                id: client_a.user_id().unwrap(),
-                github_login: "user_a".into(),
-                avatar_uri: "avatar_a".into(),
-                name: None,
-            }),
-            project_id: project_a_id,
-            worktree_root_names: vec!["a".to_string()],
-        }]
-    );
-
-    let project_b_id = active_call_b
-        .update(cx_b, |call, cx| call.share_project(project_b.clone(), cx))
-        .await
-        .unwrap();
-    executor.run_until_parked();
-    assert_eq!(
-        mem::take(&mut *events_a.borrow_mut()),
-        vec![room::Event::RemoteProjectShared {
-            owner: Arc::new(User {
-                id: client_b.user_id().unwrap(),
-                github_login: "user_b".into(),
-                avatar_uri: "avatar_b".into(),
-                name: None,
-            }),
-            project_id: project_b_id,
-            worktree_root_names: vec!["b".to_string()]
-        }]
-    );
-    assert_eq!(mem::take(&mut *events_b.borrow_mut()), vec![]);
-
-    // Sharing a project twice is idempotent.
-    let project_b_id_2 = active_call_b
-        .update(cx_b, |call, cx| call.share_project(project_b.clone(), cx))
-        .await
-        .unwrap();
-    assert_eq!(project_b_id_2, project_b_id);
-    executor.run_until_parked();
-    assert_eq!(mem::take(&mut *events_a.borrow_mut()), vec![]);
-    assert_eq!(mem::take(&mut *events_b.borrow_mut()), vec![]);
-
-    // Unsharing a project should dispatch the RemoteProjectUnshared event.
-    active_call_a
-        .update(cx_a, |call, cx| call.hang_up(cx))
-        .await
-        .unwrap();
-    executor.run_until_parked();
-
-    assert_eq!(
-        mem::take(&mut *events_a.borrow_mut()),
-        vec![room::Event::RoomLeft { channel_id: None }]
-    );
-    assert_eq!(
-        mem::take(&mut *events_b.borrow_mut()),
-        vec![room::Event::RemoteProjectUnshared {
-            project_id: project_a_id,
-        }]
-    );
-}
-
-fn active_call_events(cx: &mut TestAppContext) -> Rc<RefCell<Vec<room::Event>>> {
-    let events = Rc::new(RefCell::new(Vec::new()));
-    let active_call = cx.read(ActiveCall::global);
-    cx.update({
-        let events = events.clone();
-        |cx| {
-            cx.subscribe(&active_call, move |_, event, _| {
-                events.borrow_mut().push(event.clone())
-            })
-            .detach()
-        }
-    });
-    events
-}
-
-#[gpui::test]
-async fn test_mute_deafen(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-    cx_c: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    let client_c = server.create_client(cx_c, "user_c").await;
-
-    server
-        .make_contacts(&mut [(&client_a, cx_a), (&client_b, cx_b), (&client_c, cx_c)])
-        .await;
-
-    let active_call_a = cx_a.read(ActiveCall::global);
-    let active_call_b = cx_b.read(ActiveCall::global);
-    let active_call_c = cx_c.read(ActiveCall::global);
-
-    // User A calls user B, B answers.
-    active_call_a
-        .update(cx_a, |call, cx| {
-            call.invite(client_b.user_id().unwrap(), None, cx)
-        })
-        .await
-        .unwrap();
-    executor.run_until_parked();
-    active_call_b
-        .update(cx_b, |call, cx| call.accept_incoming(cx))
-        .await
-        .unwrap();
-    executor.run_until_parked();
-
-    let room_a = active_call_a.read_with(cx_a, |call, _| call.room().unwrap().clone());
-    let room_b = active_call_b.read_with(cx_b, |call, _| call.room().unwrap().clone());
-
-    room_a.read_with(cx_a, |room, _| assert!(!room.is_muted()));
-    room_b.read_with(cx_b, |room, _| assert!(!room.is_muted()));
-
-    // Users A and B are both unmuted.
-    assert_eq!(
-        participant_audio_state(&room_a, cx_a),
-        &[ParticipantAudioState {
-            user_id: client_b.user_id().unwrap(),
-            is_muted: false,
-            audio_tracks_playing: vec![true],
-        }]
-    );
-    assert_eq!(
-        participant_audio_state(&room_b, cx_b),
-        &[ParticipantAudioState {
-            user_id: client_a.user_id().unwrap(),
-            is_muted: false,
-            audio_tracks_playing: vec![true],
-        }]
-    );
-
-    // User A mutes
-    room_a.update(cx_a, |room, cx| room.toggle_mute(cx));
-    executor.run_until_parked();
-
-    // User A hears user B, but B doesn't hear A.
-    room_a.read_with(cx_a, |room, _| assert!(room.is_muted()));
-    room_b.read_with(cx_b, |room, _| assert!(!room.is_muted()));
-    assert_eq!(
-        participant_audio_state(&room_a, cx_a),
-        &[ParticipantAudioState {
-            user_id: client_b.user_id().unwrap(),
-            is_muted: false,
-            audio_tracks_playing: vec![true],
-        }]
-    );
-    assert_eq!(
-        participant_audio_state(&room_b, cx_b),
-        &[ParticipantAudioState {
-            user_id: client_a.user_id().unwrap(),
-            is_muted: true,
-            audio_tracks_playing: vec![true],
-        }]
-    );
-
-    // User A deafens
-    room_a.update(cx_a, |room, cx| room.toggle_deafen(cx));
-    executor.run_until_parked();
-
-    // User A does not hear user B.
-    room_a.read_with(cx_a, |room, _| assert!(room.is_muted()));
-    room_b.read_with(cx_b, |room, _| assert!(!room.is_muted()));
-    assert_eq!(
-        participant_audio_state(&room_a, cx_a),
-        &[ParticipantAudioState {
-            user_id: client_b.user_id().unwrap(),
-            is_muted: false,
-            audio_tracks_playing: vec![false],
-        }]
-    );
-    assert_eq!(
-        participant_audio_state(&room_b, cx_b),
-        &[ParticipantAudioState {
-            user_id: client_a.user_id().unwrap(),
-            is_muted: true,
-            audio_tracks_playing: vec![true],
-        }]
-    );
-
-    // User B calls user C, C joins.
-    active_call_b
-        .update(cx_b, |call, cx| {
-            call.invite(client_c.user_id().unwrap(), None, cx)
-        })
-        .await
-        .unwrap();
-    executor.run_until_parked();
-    active_call_c
-        .update(cx_c, |call, cx| call.accept_incoming(cx))
-        .await
-        .unwrap();
-    executor.run_until_parked();
-
-    // User A does not hear users B or C.
-    assert_eq!(
-        participant_audio_state(&room_a, cx_a),
-        &[
-            ParticipantAudioState {
-                user_id: client_b.user_id().unwrap(),
-                is_muted: false,
-                audio_tracks_playing: vec![false],
-            },
-            ParticipantAudioState {
-                user_id: client_c.user_id().unwrap(),
-                is_muted: false,
-                audio_tracks_playing: vec![false],
-            }
-        ]
-    );
-    assert_eq!(
-        participant_audio_state(&room_b, cx_b),
-        &[
-            ParticipantAudioState {
-                user_id: client_a.user_id().unwrap(),
-                is_muted: true,
-                audio_tracks_playing: vec![true],
-            },
-            ParticipantAudioState {
-                user_id: client_c.user_id().unwrap(),
-                is_muted: false,
-                audio_tracks_playing: vec![true],
-            }
-        ]
-    );
-
-    #[derive(PartialEq, Eq, Debug)]
-    struct ParticipantAudioState {
-        user_id: u64,
-        is_muted: bool,
-        audio_tracks_playing: Vec<bool>,
-    }
-
-    fn participant_audio_state(
-        room: &Entity<Room>,
-        cx: &TestAppContext,
-    ) -> Vec<ParticipantAudioState> {
-        room.read_with(cx, |room, _| {
-            room.remote_participants()
-                .iter()
-                .map(|(user_id, participant)| ParticipantAudioState {
-                    user_id: *user_id,
-                    is_muted: participant.muted,
-                    audio_tracks_playing: participant
-                        .audio_tracks
-                        .values()
-                        .map(|(track, _)| track.enabled())
-                        .collect(),
-                })
-                .collect::<Vec<_>>()
-        })
-    }
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_room_location(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    client_a.fs().insert_tree("/a", json!({})).await;
-    client_b.fs().insert_tree("/b", json!({})).await;
-
-    let active_call_a = cx_a.read(ActiveCall::global);
-    let active_call_b = cx_b.read(ActiveCall::global);
-
-    let a_notified = Rc::new(Cell::new(false));
-    cx_a.update({
-        let notified = a_notified.clone();
-        |cx| {
-            cx.observe(&active_call_a, move |_, _| notified.set(true))
-                .detach()
-        }
-    });
-
-    let b_notified = Rc::new(Cell::new(false));
-    cx_b.update({
-        let b_notified = b_notified.clone();
-        |cx| {
-            cx.observe(&active_call_b, move |_, _| b_notified.set(true))
-                .detach()
-        }
-    });
-
-    let (project_a, _) = client_a.build_local_project("/a", cx_a).await;
-    active_call_a
-        .update(cx_a, |call, cx| call.set_location(Some(&project_a), cx))
-        .await
-        .unwrap();
-    let (project_b, _) = client_b.build_local_project("/b", cx_b).await;
-
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-
-    let room_a = active_call_a.read_with(cx_a, |call, _| call.room().unwrap().clone());
-
-    let room_b = active_call_b.read_with(cx_b, |call, _| call.room().unwrap().clone());
-    executor.run_until_parked();
-    assert!(a_notified.take());
-    assert_eq!(
-        participant_locations(&room_a, cx_a),
-        vec![("user_b".to_string(), ParticipantLocation::External)]
-    );
-    assert!(b_notified.take());
-    assert_eq!(
-        participant_locations(&room_b, cx_b),
-        vec![("user_a".to_string(), ParticipantLocation::UnsharedProject)]
-    );
-
-    let project_a_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-    executor.run_until_parked();
-    assert!(a_notified.take());
-    assert_eq!(
-        participant_locations(&room_a, cx_a),
-        vec![("user_b".to_string(), ParticipantLocation::External)]
-    );
-    assert!(b_notified.take());
-    assert_eq!(
-        participant_locations(&room_b, cx_b),
-        vec![(
-            "user_a".to_string(),
-            ParticipantLocation::SharedProject {
-                project_id: project_a_id
-            }
-        )]
-    );
-
-    let project_b_id = active_call_b
-        .update(cx_b, |call, cx| call.share_project(project_b.clone(), cx))
-        .await
-        .unwrap();
-    executor.run_until_parked();
-    assert!(a_notified.take());
-    assert_eq!(
-        participant_locations(&room_a, cx_a),
-        vec![("user_b".to_string(), ParticipantLocation::External)]
-    );
-    assert!(b_notified.take());
-    assert_eq!(
-        participant_locations(&room_b, cx_b),
-        vec![(
-            "user_a".to_string(),
-            ParticipantLocation::SharedProject {
-                project_id: project_a_id
-            }
-        )]
-    );
-
-    active_call_b
-        .update(cx_b, |call, cx| call.set_location(Some(&project_b), cx))
-        .await
-        .unwrap();
-    executor.run_until_parked();
-    assert!(a_notified.take());
-    assert_eq!(
-        participant_locations(&room_a, cx_a),
-        vec![(
-            "user_b".to_string(),
-            ParticipantLocation::SharedProject {
-                project_id: project_b_id
-            }
-        )]
-    );
-    assert!(b_notified.take());
-    assert_eq!(
-        participant_locations(&room_b, cx_b),
-        vec![(
-            "user_a".to_string(),
-            ParticipantLocation::SharedProject {
-                project_id: project_a_id
-            }
-        )]
-    );
-
-    active_call_b
-        .update(cx_b, |call, cx| call.set_location(None, cx))
-        .await
-        .unwrap();
-    executor.run_until_parked();
-    assert!(a_notified.take());
-    assert_eq!(
-        participant_locations(&room_a, cx_a),
-        vec![("user_b".to_string(), ParticipantLocation::External)]
-    );
-    assert!(b_notified.take());
-    assert_eq!(
-        participant_locations(&room_b, cx_b),
-        vec![(
-            "user_a".to_string(),
-            ParticipantLocation::SharedProject {
-                project_id: project_a_id
-            }
-        )]
-    );
-
-    fn participant_locations(
-        room: &Entity<Room>,
-        cx: &TestAppContext,
-    ) -> Vec<(String, ParticipantLocation)> {
-        room.read_with(cx, |room, _| {
-            room.remote_participants()
-                .values()
-                .map(|participant| {
-                    (
-                        participant.user.github_login.to_string(),
-                        participant.location,
-                    )
-                })
-                .collect()
-        })
-    }
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_propagate_saves_and_fs_changes(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-    cx_c: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    let client_c = server.create_client(cx_c, "user_c").await;
-
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b), (&client_c, cx_c)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-
-    let rust = Arc::new(Language::new(
-        LanguageConfig {
-            name: "Rust".into(),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["rs".to_string()],
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-        Some(tree_sitter_rust::LANGUAGE.into()),
-    ));
-    let javascript = Arc::new(Language::new(
-        LanguageConfig {
-            name: "JavaScript".into(),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["js".to_string()],
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-        Some(tree_sitter_rust::LANGUAGE.into()),
-    ));
-    for client in [&client_a, &client_b, &client_c] {
-        client.language_registry().add(rust.clone());
-        client.language_registry().add(javascript.clone());
-    }
-
-    client_a
-        .fs()
-        .insert_tree(
-            path!("/a"),
-            json!({
-                "file1.rs": "",
-                "file2": ""
-            }),
-        )
-        .await;
-    let (project_a, worktree_id) = client_a.build_local_project(path!("/a"), cx_a).await;
-
-    let worktree_a = project_a.read_with(cx_a, |p, cx| p.worktrees(cx).next().unwrap());
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-
-    // Join that worktree as clients B and C.
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-    let project_c = client_c.join_remote_project(project_id, cx_c).await;
-
-    let worktree_b = project_b.read_with(cx_b, |p, cx| p.worktrees(cx).next().unwrap());
-
-    let worktree_c = project_c.read_with(cx_c, |p, cx| p.worktrees(cx).next().unwrap());
-
-    // Open and edit a buffer as both guests B and C.
-    let buffer_b = project_b
-        .update(cx_b, |p, cx| {
-            p.open_buffer((worktree_id, rel_path("file1.rs")), cx)
-        })
-        .await
-        .unwrap();
-    let buffer_c = project_c
-        .update(cx_c, |p, cx| {
-            p.open_buffer((worktree_id, rel_path("file1.rs")), cx)
-        })
-        .await
-        .unwrap();
-
-    buffer_b.read_with(cx_b, |buffer, _| {
-        assert_eq!(buffer.language().unwrap().name(), "Rust".into());
-    });
-
-    buffer_c.read_with(cx_c, |buffer, _| {
-        assert_eq!(buffer.language().unwrap().name(), "Rust".into());
-    });
-    buffer_b.update(cx_b, |buf, cx| buf.edit([(0..0, "i-am-b, ")], None, cx));
-    buffer_c.update(cx_c, |buf, cx| buf.edit([(0..0, "i-am-c, ")], None, cx));
-
-    // Open and edit that buffer as the host.
-    let buffer_a = project_a
-        .update(cx_a, |p, cx| {
-            p.open_buffer((worktree_id, rel_path("file1.rs")), cx)
-        })
-        .await
-        .unwrap();
-
-    executor.run_until_parked();
-
-    buffer_a.read_with(cx_a, |buf, _| assert_eq!(buf.text(), "i-am-c, i-am-b, "));
-    buffer_a.update(cx_a, |buf, cx| {
-        buf.edit([(buf.len()..buf.len(), "i-am-a")], None, cx)
-    });
-
-    executor.run_until_parked();
-
-    buffer_a.read_with(cx_a, |buf, _| {
-        assert_eq!(buf.text(), "i-am-c, i-am-b, i-am-a");
-    });
-
-    buffer_b.read_with(cx_b, |buf, _| {
-        assert_eq!(buf.text(), "i-am-c, i-am-b, i-am-a");
-    });
-
-    buffer_c.read_with(cx_c, |buf, _| {
-        assert_eq!(buf.text(), "i-am-c, i-am-b, i-am-a");
-    });
-
-    // Edit the buffer as the host and concurrently save as guest B.
-    let save_b = project_b.update(cx_b, |project, cx| {
-        project.save_buffer(buffer_b.clone(), cx)
-    });
-    buffer_a.update(cx_a, |buf, cx| buf.edit([(0..0, "hi-a, ")], None, cx));
-    save_b.await.unwrap();
-    assert_eq!(
-        client_a.fs().load("/a/file1.rs".as_ref()).await.unwrap(),
-        "hi-a, i-am-c, i-am-b, i-am-a"
-    );
-
-    executor.run_until_parked();
-
-    buffer_a.read_with(cx_a, |buf, _| assert!(!buf.is_dirty()));
-
-    buffer_b.read_with(cx_b, |buf, _| assert!(!buf.is_dirty()));
-
-    buffer_c.read_with(cx_c, |buf, _| assert!(!buf.is_dirty()));
-
-    // Make changes on host's file system, see those changes on guest worktrees.
-    client_a
-        .fs()
-        .rename(
-            path!("/a/file1.rs").as_ref(),
-            path!("/a/file1.js").as_ref(),
-            Default::default(),
-        )
-        .await
-        .unwrap();
-    client_a
-        .fs()
-        .rename(
-            path!("/a/file2").as_ref(),
-            path!("/a/file3").as_ref(),
-            Default::default(),
-        )
-        .await
-        .unwrap();
-    client_a
-        .fs()
-        .insert_file(path!("/a/file4"), "4".into())
-        .await;
-    executor.run_until_parked();
-
-    worktree_a.read_with(cx_a, |tree, _| {
-        assert_eq!(
-            tree.paths().collect::<Vec<_>>(),
-            [rel_path("file1.js"), rel_path("file3"), rel_path("file4")]
-        )
-    });
-
-    worktree_b.read_with(cx_b, |tree, _| {
-        assert_eq!(
-            tree.paths().collect::<Vec<_>>(),
-            [rel_path("file1.js"), rel_path("file3"), rel_path("file4")]
-        )
-    });
-
-    worktree_c.read_with(cx_c, |tree, _| {
-        assert_eq!(
-            tree.paths().collect::<Vec<_>>(),
-            [rel_path("file1.js"), rel_path("file3"), rel_path("file4")]
-        )
-    });
-
-    // Ensure buffer files are updated as well.
-
-    buffer_a.read_with(cx_a, |buffer, _| {
-        assert_eq!(buffer.file().unwrap().path().as_ref(), rel_path("file1.js"));
-        assert_eq!(buffer.language().unwrap().name(), "JavaScript".into());
-    });
-
-    buffer_b.read_with(cx_b, |buffer, _| {
-        assert_eq!(buffer.file().unwrap().path().as_ref(), rel_path("file1.js"));
-        assert_eq!(buffer.language().unwrap().name(), "JavaScript".into());
-    });
-
-    buffer_c.read_with(cx_c, |buffer, _| {
-        assert_eq!(buffer.file().unwrap().path().as_ref(), rel_path("file1.js"));
-        assert_eq!(buffer.language().unwrap().name(), "JavaScript".into());
-    });
-
-    let new_buffer_a = project_a
-        .update(cx_a, |p, cx| p.create_buffer(false, cx))
-        .await
-        .unwrap();
-
-    let new_buffer_id = new_buffer_a.read_with(cx_a, |buffer, _| buffer.remote_id());
-    let new_buffer_b = project_b
-        .update(cx_b, |p, cx| p.open_buffer_by_id(new_buffer_id, cx))
-        .await
-        .unwrap();
-
-    new_buffer_b.read_with(cx_b, |buffer, _| {
-        assert!(buffer.file().is_none());
-    });
-
-    new_buffer_a.update(cx_a, |buffer, cx| {
-        buffer.edit([(0..0, "ok")], None, cx);
-    });
-    project_a
-        .update(cx_a, |project, cx| {
-            let path = ProjectPath {
-                path: rel_path("file3.rs").into(),
-                worktree_id: worktree_a.read(cx).id(),
-            };
-
-            project.save_buffer_as(new_buffer_a.clone(), path, cx)
-        })
-        .await
-        .unwrap();
-
-    executor.run_until_parked();
-
-    new_buffer_b.read_with(cx_b, |buffer_b, _| {
-        assert_eq!(
-            buffer_b.file().unwrap().path().as_ref(),
-            rel_path("file3.rs")
-        );
-
-        new_buffer_a.read_with(cx_a, |buffer_a, _| {
-            assert_eq!(buffer_b.saved_mtime(), buffer_a.saved_mtime());
-            assert_eq!(buffer_b.saved_version(), buffer_a.saved_version());
-        });
-    });
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_git_diff_base_change(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-
-    client_a
-        .fs()
-        .insert_tree(
-            "/dir",
-            json!({
-            ".git": {},
-            "sub": {
-                ".git": {},
-                "b.txt": "
-                    one
-                    two
-                    three
-                ".unindent(),
-            },
-            "a.txt": "
-                    one
-                    two
-                    three
-                ".unindent(),
-            }),
-        )
-        .await;
-
-    let (project_local, worktree_id) = client_a.build_local_project("/dir", cx_a).await;
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| {
-            call.share_project(project_local.clone(), cx)
-        })
-        .await
-        .unwrap();
-
-    let project_remote = client_b.join_remote_project(project_id, cx_b).await;
-
-    let staged_text = "
-        one
-        three
-    "
-    .unindent();
-
-    let committed_text = "
-        one
-        TWO
-        three
-    "
-    .unindent();
-
-    let new_committed_text = "
-        one
-        TWO_HUNDRED
-        three
-    "
-    .unindent();
-
-    let new_staged_text = "
-        one
-        two
-    "
-    .unindent();
-
-    client_a
-        .fs()
-        .set_index_for_repo(Path::new("/dir/.git"), &[("a.txt", staged_text.clone())]);
-    client_a.fs().set_head_for_repo(
-        Path::new("/dir/.git"),
-        &[("a.txt", committed_text.clone())],
-        "deadbeef",
-    );
-
-    // Create the buffer
-    let buffer_local_a = project_local
-        .update(cx_a, |p, cx| {
-            p.open_buffer((worktree_id, rel_path("a.txt")), cx)
-        })
-        .await
-        .unwrap();
-    let local_unstaged_diff_a = project_local
-        .update(cx_a, |p, cx| {
-            p.open_unstaged_diff(buffer_local_a.clone(), cx)
-        })
-        .await
-        .unwrap();
-
-    // Wait for it to catch up to the new diff
-    executor.run_until_parked();
-    local_unstaged_diff_a.read_with(cx_a, |diff, cx| {
-        let buffer = buffer_local_a.read(cx);
-        assert_eq!(
-            diff.base_text_string().as_deref(),
-            Some(staged_text.as_str())
-        );
-        assert_hunks(
-            diff.hunks_in_row_range(0..4, buffer, cx),
-            buffer,
-            &diff.base_text_string().unwrap(),
-            &[(1..2, "", "two\n", DiffHunkStatus::added_none())],
-        );
-    });
-
-    // Create remote buffer
-    let remote_buffer_a = project_remote
-        .update(cx_b, |p, cx| {
-            p.open_buffer((worktree_id, rel_path("a.txt")), cx)
-        })
-        .await
-        .unwrap();
-    let remote_unstaged_diff_a = project_remote
-        .update(cx_b, |p, cx| {
-            p.open_unstaged_diff(remote_buffer_a.clone(), cx)
-        })
-        .await
-        .unwrap();
-
-    // Wait remote buffer to catch up to the new diff
-    executor.run_until_parked();
-    remote_unstaged_diff_a.read_with(cx_b, |diff, cx| {
-        let buffer = remote_buffer_a.read(cx);
-        assert_eq!(
-            diff.base_text_string().as_deref(),
-            Some(staged_text.as_str())
-        );
-        assert_hunks(
-            diff.hunks_in_row_range(0..4, buffer, cx),
-            buffer,
-            &diff.base_text_string().unwrap(),
-            &[(1..2, "", "two\n", DiffHunkStatus::added_none())],
-        );
-    });
-
-    // Open uncommitted changes on the guest, without opening them on the host first
-    let remote_uncommitted_diff_a = project_remote
-        .update(cx_b, |p, cx| {
-            p.open_uncommitted_diff(remote_buffer_a.clone(), cx)
-        })
-        .await
-        .unwrap();
-    executor.run_until_parked();
-    remote_uncommitted_diff_a.read_with(cx_b, |diff, cx| {
-        let buffer = remote_buffer_a.read(cx);
-        assert_eq!(
-            diff.base_text_string().as_deref(),
-            Some(committed_text.as_str())
-        );
-        assert_hunks(
-            diff.hunks_in_row_range(0..4, buffer, cx),
-            buffer,
-            &diff.base_text_string().unwrap(),
-            &[(
-                1..2,
-                "TWO\n",
-                "two\n",
-                DiffHunkStatus::modified(DiffHunkSecondaryStatus::HasSecondaryHunk),
-            )],
-        );
-    });
-
-    // Update the index text of the open buffer
-    client_a.fs().set_index_for_repo(
-        Path::new("/dir/.git"),
-        &[("a.txt", new_staged_text.clone())],
-    );
-    client_a.fs().set_head_for_repo(
-        Path::new("/dir/.git"),
-        &[("a.txt", new_committed_text.clone())],
-        "deadbeef",
-    );
-
-    // Wait for buffer_local_a to receive it
-    executor.run_until_parked();
-    local_unstaged_diff_a.read_with(cx_a, |diff, cx| {
-        let buffer = buffer_local_a.read(cx);
-        assert_eq!(
-            diff.base_text_string().as_deref(),
-            Some(new_staged_text.as_str())
-        );
-        assert_hunks(
-            diff.hunks_in_row_range(0..4, buffer, cx),
-            buffer,
-            &diff.base_text_string().unwrap(),
-            &[(2..3, "", "three\n", DiffHunkStatus::added_none())],
-        );
-    });
-
-    // Guest receives index text update
-    remote_unstaged_diff_a.read_with(cx_b, |diff, cx| {
-        let buffer = remote_buffer_a.read(cx);
-        assert_eq!(
-            diff.base_text_string().as_deref(),
-            Some(new_staged_text.as_str())
-        );
-        assert_hunks(
-            diff.hunks_in_row_range(0..4, buffer, cx),
-            buffer,
-            &diff.base_text_string().unwrap(),
-            &[(2..3, "", "three\n", DiffHunkStatus::added_none())],
-        );
-    });
-
-    remote_uncommitted_diff_a.read_with(cx_b, |diff, cx| {
-        let buffer = remote_buffer_a.read(cx);
-        assert_eq!(
-            diff.base_text_string().as_deref(),
-            Some(new_committed_text.as_str())
-        );
-        assert_hunks(
-            diff.hunks_in_row_range(0..4, buffer, cx),
-            buffer,
-            &diff.base_text_string().unwrap(),
-            &[(
-                1..2,
-                "TWO_HUNDRED\n",
-                "two\n",
-                DiffHunkStatus::modified(DiffHunkSecondaryStatus::OverlapsWithSecondaryHunk),
-            )],
-        );
-    });
-
-    // Nested git dir
-    let staged_text = "
-        one
-        three
-    "
-    .unindent();
-
-    let new_staged_text = "
-        one
-        two
-    "
-    .unindent();
-
-    client_a.fs().set_index_for_repo(
-        Path::new("/dir/sub/.git"),
-        &[("b.txt", staged_text.clone())],
-    );
-
-    // Create the buffer
-    let buffer_local_b = project_local
-        .update(cx_a, |p, cx| {
-            p.open_buffer((worktree_id, rel_path("sub/b.txt")), cx)
-        })
-        .await
-        .unwrap();
-    let local_unstaged_diff_b = project_local
-        .update(cx_a, |p, cx| {
-            p.open_unstaged_diff(buffer_local_b.clone(), cx)
-        })
-        .await
-        .unwrap();
-
-    // Wait for it to catch up to the new diff
-    executor.run_until_parked();
-    local_unstaged_diff_b.read_with(cx_a, |diff, cx| {
-        let buffer = buffer_local_b.read(cx);
-        assert_eq!(
-            diff.base_text_string().as_deref(),
-            Some(staged_text.as_str())
-        );
-        assert_hunks(
-            diff.hunks_in_row_range(0..4, buffer, cx),
-            buffer,
-            &diff.base_text_string().unwrap(),
-            &[(1..2, "", "two\n", DiffHunkStatus::added_none())],
-        );
-    });
-
-    // Create remote buffer
-    let remote_buffer_b = project_remote
-        .update(cx_b, |p, cx| {
-            p.open_buffer((worktree_id, rel_path("sub/b.txt")), cx)
-        })
-        .await
-        .unwrap();
-    let remote_unstaged_diff_b = project_remote
-        .update(cx_b, |p, cx| {
-            p.open_unstaged_diff(remote_buffer_b.clone(), cx)
-        })
-        .await
-        .unwrap();
-
-    executor.run_until_parked();
-    remote_unstaged_diff_b.read_with(cx_b, |diff, cx| {
-        let buffer = remote_buffer_b.read(cx);
-        assert_eq!(
-            diff.base_text_string().as_deref(),
-            Some(staged_text.as_str())
-        );
-        assert_hunks(
-            diff.hunks_in_row_range(0..4, buffer, cx),
-            buffer,
-            &staged_text,
-            &[(1..2, "", "two\n", DiffHunkStatus::added_none())],
-        );
-    });
-
-    // Updatet the staged text
-    client_a.fs().set_index_for_repo(
-        Path::new("/dir/sub/.git"),
-        &[("b.txt", new_staged_text.clone())],
-    );
-
-    // Wait for buffer_local_b to receive it
-    executor.run_until_parked();
-    local_unstaged_diff_b.read_with(cx_a, |diff, cx| {
-        let buffer = buffer_local_b.read(cx);
-        assert_eq!(
-            diff.base_text_string().as_deref(),
-            Some(new_staged_text.as_str())
-        );
-        assert_hunks(
-            diff.hunks_in_row_range(0..4, buffer, cx),
-            buffer,
-            &new_staged_text,
-            &[(2..3, "", "three\n", DiffHunkStatus::added_none())],
-        );
-    });
-
-    remote_unstaged_diff_b.read_with(cx_b, |diff, cx| {
-        let buffer = remote_buffer_b.read(cx);
-        assert_eq!(
-            diff.base_text_string().as_deref(),
-            Some(new_staged_text.as_str())
-        );
-        assert_hunks(
-            diff.hunks_in_row_range(0..4, buffer, cx),
-            buffer,
-            &new_staged_text,
-            &[(2..3, "", "three\n", DiffHunkStatus::added_none())],
-        );
-    });
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_git_branch_name(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-    cx_c: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    let client_c = server.create_client(cx_c, "user_c").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b), (&client_c, cx_c)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-
-    client_a
-        .fs()
-        .insert_tree(
-            "/dir",
-            json!({
-            ".git": {},
-            }),
-        )
-        .await;
-
-    let (project_local, _worktree_id) = client_a.build_local_project("/dir", cx_a).await;
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| {
-            call.share_project(project_local.clone(), cx)
-        })
-        .await
-        .unwrap();
-
-    let project_remote = client_b.join_remote_project(project_id, cx_b).await;
-    client_a
-        .fs()
-        .set_branch_name(Path::new("/dir/.git"), Some("branch-1"));
-
-    // Wait for it to catch up to the new branch
-    executor.run_until_parked();
-
-    #[track_caller]
-    fn assert_branch(branch_name: Option<impl Into<String>>, project: &Project, cx: &App) {
-        let branch_name = branch_name.map(Into::into);
-        let repositories = project.repositories(cx).values().collect::<Vec<_>>();
-        assert_eq!(repositories.len(), 1);
-        let repository = repositories[0].clone();
-        assert_eq!(
-            repository
-                .read(cx)
-                .branch
-                .as_ref()
-                .map(|branch| branch.name().to_owned()),
-            branch_name
-        )
-    }
-
-    // Smoke test branch reading
-
-    project_local.read_with(cx_a, |project, cx| {
-        assert_branch(Some("branch-1"), project, cx)
-    });
-
-    project_remote.read_with(cx_b, |project, cx| {
-        assert_branch(Some("branch-1"), project, cx)
-    });
-
-    client_a
-        .fs()
-        .set_branch_name(Path::new("/dir/.git"), Some("branch-2"));
-
-    // Wait for buffer_local_a to receive it
-    executor.run_until_parked();
-
-    // Smoke test branch reading
-
-    project_local.read_with(cx_a, |project, cx| {
-        assert_branch(Some("branch-2"), project, cx)
-    });
-
-    project_remote.read_with(cx_b, |project, cx| {
-        assert_branch(Some("branch-2"), project, cx)
-    });
-
-    let project_remote_c = client_c.join_remote_project(project_id, cx_c).await;
-    executor.run_until_parked();
-
-    project_remote_c.read_with(cx_c, |project, cx| {
-        assert_branch(Some("branch-2"), project, cx)
-    });
-}
-
-#[gpui::test]
-async fn test_git_status_sync(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-    cx_c: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    let client_c = server.create_client(cx_c, "user_c").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b), (&client_c, cx_c)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-
-    client_a
-        .fs()
-        .insert_tree(
-            path!("/dir"),
-            json!({
-                ".git": {},
-                "a.txt": "a",
-                "b.txt": "b",
-                "c.txt": "c",
-            }),
-        )
-        .await;
-
-    // Initially, a.txt is uncommitted, but present in the index,
-    // and b.txt is unmerged.
-    client_a.fs().set_head_for_repo(
-        path!("/dir/.git").as_ref(),
-        &[("b.txt", "B".into()), ("c.txt", "c".into())],
-        "deadbeef",
-    );
-    client_a.fs().set_index_for_repo(
-        path!("/dir/.git").as_ref(),
-        &[
-            ("a.txt", "".into()),
-            ("b.txt", "B".into()),
-            ("c.txt", "c".into()),
-        ],
-    );
-    client_a.fs().set_unmerged_paths_for_repo(
-        path!("/dir/.git").as_ref(),
-        &[(
-            repo_path("b.txt"),
-            UnmergedStatus {
-                first_head: UnmergedStatusCode::Updated,
-                second_head: UnmergedStatusCode::Deleted,
-            },
-        )],
-    );
-
-    const A_STATUS_START: FileStatus = FileStatus::Tracked(TrackedStatus {
-        index_status: StatusCode::Added,
-        worktree_status: StatusCode::Modified,
-    });
-    const B_STATUS_START: FileStatus = FileStatus::Unmerged(UnmergedStatus {
-        first_head: UnmergedStatusCode::Updated,
-        second_head: UnmergedStatusCode::Deleted,
-    });
-
-    let (project_local, _worktree_id) = client_a.build_local_project(path!("/dir"), cx_a).await;
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| {
-            call.share_project(project_local.clone(), cx)
-        })
-        .await
-        .unwrap();
-
-    let project_remote = client_b.join_remote_project(project_id, cx_b).await;
-
-    // Wait for it to catch up to the new status
-    executor.run_until_parked();
-
-    #[track_caller]
-    fn assert_status(file: &str, status: Option<FileStatus>, project: &Project, cx: &App) {
-        let file = repo_path(file);
-        let repos = project
-            .repositories(cx)
-            .values()
-            .cloned()
-            .collect::<Vec<_>>();
-        assert_eq!(repos.len(), 1);
-        let repo = repos.into_iter().next().unwrap();
-        assert_eq!(
-            repo.read(cx)
-                .status_for_path(&file)
-                .map(|entry| entry.status),
-            status
-        );
-    }
-
-    project_local.read_with(cx_a, |project, cx| {
-        assert_status("a.txt", Some(A_STATUS_START), project, cx);
-        assert_status("b.txt", Some(B_STATUS_START), project, cx);
-        assert_status("c.txt", None, project, cx);
-    });
-
-    project_remote.read_with(cx_b, |project, cx| {
-        assert_status("a.txt", Some(A_STATUS_START), project, cx);
-        assert_status("b.txt", Some(B_STATUS_START), project, cx);
-        assert_status("c.txt", None, project, cx);
-    });
-
-    const A_STATUS_END: FileStatus = FileStatus::Tracked(TrackedStatus {
-        index_status: StatusCode::Added,
-        worktree_status: StatusCode::Unmodified,
-    });
-    const B_STATUS_END: FileStatus = FileStatus::Tracked(TrackedStatus {
-        index_status: StatusCode::Deleted,
-        worktree_status: StatusCode::Added,
-    });
-    const C_STATUS_END: FileStatus = FileStatus::Tracked(TrackedStatus {
-        index_status: StatusCode::Unmodified,
-        worktree_status: StatusCode::Modified,
-    });
-
-    // Delete b.txt from the index, mark conflict as resolved,
-    // and modify c.txt in the working copy.
-    client_a.fs().set_index_for_repo(
-        path!("/dir/.git").as_ref(),
-        &[("a.txt", "a".into()), ("c.txt", "c".into())],
-    );
-    client_a
-        .fs()
-        .set_unmerged_paths_for_repo(path!("/dir/.git").as_ref(), &[]);
-    client_a
-        .fs()
-        .atomic_write(path!("/dir/c.txt").into(), "CC".into())
-        .await
-        .unwrap();
-
-    // Wait for buffer_local_a to receive it
-    executor.run_until_parked();
-
-    // Smoke test status reading
-    project_local.read_with(cx_a, |project, cx| {
-        assert_status("a.txt", Some(A_STATUS_END), project, cx);
-        assert_status("b.txt", Some(B_STATUS_END), project, cx);
-        assert_status("c.txt", Some(C_STATUS_END), project, cx);
-    });
-
-    project_remote.read_with(cx_b, |project, cx| {
-        assert_status("a.txt", Some(A_STATUS_END), project, cx);
-        assert_status("b.txt", Some(B_STATUS_END), project, cx);
-        assert_status("c.txt", Some(C_STATUS_END), project, cx);
-    });
-
-    // And synchronization while joining
-    let project_remote_c = client_c.join_remote_project(project_id, cx_c).await;
-    executor.run_until_parked();
-
-    project_remote_c.read_with(cx_c, |project, cx| {
-        assert_status("a.txt", Some(A_STATUS_END), project, cx);
-        assert_status("b.txt", Some(B_STATUS_END), project, cx);
-        assert_status("c.txt", Some(C_STATUS_END), project, cx);
-    });
-
-    // Now remove the original git repository and check that collaborators are notified.
-    client_a
-        .fs()
-        .remove_dir(path!("/dir/.git").as_ref(), RemoveOptions::default())
-        .await
-        .unwrap();
-
-    executor.run_until_parked();
-    project_remote.update(cx_b, |project, cx| {
-        pretty_assertions::assert_eq!(
-            project.git_store().read(cx).repo_snapshots(cx),
-            HashMap::default()
-        );
-    });
-    project_remote_c.update(cx_c, |project, cx| {
-        pretty_assertions::assert_eq!(
-            project.git_store().read(cx).repo_snapshots(cx),
-            HashMap::default()
-        );
-    });
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_fs_operations(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-
-    client_a
-        .fs()
-        .insert_tree(
-            path!("/dir"),
-            json!({
-                "a.txt": "a-contents",
-                "b.txt": "b-contents",
-            }),
-        )
-        .await;
-    let (project_a, worktree_id) = client_a.build_local_project(path!("/dir"), cx_a).await;
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-
-    let worktree_a = project_a.read_with(cx_a, |project, cx| project.worktrees(cx).next().unwrap());
-    let worktree_b = project_b.read_with(cx_b, |project, cx| project.worktrees(cx).next().unwrap());
-
-    let entry = project_b
-        .update(cx_b, |project, cx| {
-            project.create_entry((worktree_id, rel_path("c.txt")), false, cx)
-        })
-        .await
-        .unwrap()
-        .into_included()
-        .unwrap();
-
-    worktree_a.read_with(cx_a, |worktree, _| {
-        assert_eq!(
-            worktree.paths().collect::<Vec<_>>(),
-            [rel_path("a.txt"), rel_path("b.txt"), rel_path("c.txt")]
-        );
-    });
-
-    worktree_b.read_with(cx_b, |worktree, _| {
-        assert_eq!(
-            worktree.paths().collect::<Vec<_>>(),
-            [rel_path("a.txt"), rel_path("b.txt"), rel_path("c.txt")]
-        );
-    });
-
-    project_b
-        .update(cx_b, |project, cx| {
-            project.rename_entry(entry.id, (worktree_id, rel_path("d.txt")).into(), cx)
-        })
-        .await
-        .unwrap()
-        .into_included()
-        .unwrap();
-
-    worktree_a.read_with(cx_a, |worktree, _| {
-        assert_eq!(
-            worktree.paths().collect::<Vec<_>>(),
-            [rel_path("a.txt"), rel_path("b.txt"), rel_path("d.txt")]
-        );
-    });
-
-    worktree_b.read_with(cx_b, |worktree, _| {
-        assert_eq!(
-            worktree
-                .paths()
-                .map(|p| p.as_unix_str())
-                .collect::<Vec<_>>(),
-            ["a.txt", "b.txt", "d.txt"]
-        );
-    });
-
-    let dir_entry = project_b
-        .update(cx_b, |project, cx| {
-            project.create_entry((worktree_id, rel_path("DIR")), true, cx)
-        })
-        .await
-        .unwrap()
-        .into_included()
-        .unwrap();
-
-    worktree_a.read_with(cx_a, |worktree, _| {
-        assert_eq!(
-            worktree
-                .paths()
-                .map(|p| p.as_unix_str())
-                .collect::<Vec<_>>(),
-            ["DIR", "a.txt", "b.txt", "d.txt"]
-        );
-    });
-
-    worktree_b.read_with(cx_b, |worktree, _| {
-        assert_eq!(
-            worktree
-                .paths()
-                .map(|p| p.as_unix_str())
-                .collect::<Vec<_>>(),
-            ["DIR", "a.txt", "b.txt", "d.txt"]
-        );
-    });
-
-    project_b
-        .update(cx_b, |project, cx| {
-            project.create_entry((worktree_id, rel_path("DIR/e.txt")), false, cx)
-        })
-        .await
-        .unwrap()
-        .into_included()
-        .unwrap();
-
-    project_b
-        .update(cx_b, |project, cx| {
-            project.create_entry((worktree_id, rel_path("DIR/SUBDIR")), true, cx)
-        })
-        .await
-        .unwrap()
-        .into_included()
-        .unwrap();
-
-    project_b
-        .update(cx_b, |project, cx| {
-            project.create_entry((worktree_id, rel_path("DIR/SUBDIR/f.txt")), false, cx)
-        })
-        .await
-        .unwrap()
-        .into_included()
-        .unwrap();
-
-    worktree_a.read_with(cx_a, |worktree, _| {
-        assert_eq!(
-            worktree.paths().collect::<Vec<_>>(),
-            [
-                rel_path("DIR"),
-                rel_path("DIR/SUBDIR"),
-                rel_path("DIR/SUBDIR/f.txt"),
-                rel_path("DIR/e.txt"),
-                rel_path("a.txt"),
-                rel_path("b.txt"),
-                rel_path("d.txt")
-            ]
-        );
-    });
-
-    worktree_b.read_with(cx_b, |worktree, _| {
-        assert_eq!(
-            worktree.paths().collect::<Vec<_>>(),
-            [
-                rel_path("DIR"),
-                rel_path("DIR/SUBDIR"),
-                rel_path("DIR/SUBDIR/f.txt"),
-                rel_path("DIR/e.txt"),
-                rel_path("a.txt"),
-                rel_path("b.txt"),
-                rel_path("d.txt")
-            ]
-        );
-    });
-
-    project_b
-        .update(cx_b, |project, cx| {
-            project.copy_entry(
-                entry.id,
-                (worktree_b.read(cx).id(), rel_path("f.txt")).into(),
-                cx,
-            )
-        })
-        .await
-        .unwrap()
-        .unwrap();
-
-    worktree_a.read_with(cx_a, |worktree, _| {
-        assert_eq!(
-            worktree.paths().collect::<Vec<_>>(),
-            [
-                rel_path("DIR"),
-                rel_path("DIR/SUBDIR"),
-                rel_path("DIR/SUBDIR/f.txt"),
-                rel_path("DIR/e.txt"),
-                rel_path("a.txt"),
-                rel_path("b.txt"),
-                rel_path("d.txt"),
-                rel_path("f.txt")
-            ]
-        );
-    });
-
-    worktree_b.read_with(cx_b, |worktree, _| {
-        assert_eq!(
-            worktree.paths().collect::<Vec<_>>(),
-            [
-                rel_path("DIR"),
-                rel_path("DIR/SUBDIR"),
-                rel_path("DIR/SUBDIR/f.txt"),
-                rel_path("DIR/e.txt"),
-                rel_path("a.txt"),
-                rel_path("b.txt"),
-                rel_path("d.txt"),
-                rel_path("f.txt")
-            ]
-        );
-    });
-
-    project_b
-        .update(cx_b, |project, cx| {
-            project.delete_entry(dir_entry.id, false, cx).unwrap()
-        })
-        .await
-        .unwrap();
-    executor.run_until_parked();
-
-    worktree_a.read_with(cx_a, |worktree, _| {
-        assert_eq!(
-            worktree
-                .paths()
-                .map(|p| p.as_unix_str())
-                .collect::<Vec<_>>(),
-            ["a.txt", "b.txt", "d.txt", "f.txt"]
-        );
-    });
-
-    worktree_b.read_with(cx_b, |worktree, _| {
-        assert_eq!(
-            worktree
-                .paths()
-                .map(|p| p.as_unix_str())
-                .collect::<Vec<_>>(),
-            ["a.txt", "b.txt", "d.txt", "f.txt"]
-        );
-    });
-
-    project_b
-        .update(cx_b, |project, cx| {
-            project.delete_entry(entry.id, false, cx).unwrap()
-        })
-        .await
-        .unwrap();
-
-    worktree_a.read_with(cx_a, |worktree, _| {
-        assert_eq!(
-            worktree
-                .paths()
-                .map(|p| p.as_unix_str())
-                .collect::<Vec<_>>(),
-            ["a.txt", "b.txt", "f.txt"]
-        );
-    });
-
-    worktree_b.read_with(cx_b, |worktree, _| {
-        assert_eq!(
-            worktree
-                .paths()
-                .map(|p| p.as_unix_str())
-                .collect::<Vec<_>>(),
-            ["a.txt", "b.txt", "f.txt"]
-        );
-    });
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_local_settings(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-
-    // As client A, open a project that contains some local settings files
-    client_a
-        .fs()
-        .insert_tree(
-            "/dir",
-            json!({
-                ".zed": {
-                    "settings.json": r#"{ "tab_size": 2 }"#
-                },
-                "a": {
-                    ".zed": {
-                        "settings.json": r#"{ "tab_size": 8 }"#
-                    },
-                    "a.txt": "a-contents",
-                },
-                "b": {
-                    "b.txt": "b-contents",
-                }
-            }),
-        )
-        .await;
-    let (project_a, _) = client_a.build_local_project("/dir", cx_a).await;
-    executor.run_until_parked();
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-    executor.run_until_parked();
-
-    // As client B, join that project and observe the local settings.
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-
-    let worktree_b = project_b.read_with(cx_b, |project, cx| project.worktrees(cx).next().unwrap());
-    executor.run_until_parked();
-    cx_b.read(|cx| {
-        let store = cx.global::<SettingsStore>();
-        assert_eq!(
-            store
-                .local_settings(worktree_b.read(cx).id())
-                .map(|(path, content)| (
-                    path,
-                    content.all_languages.defaults.tab_size.map(Into::into)
-                ))
-                .collect::<Vec<_>>(),
-            &[
-                (rel_path("").into(), Some(2)),
-                (rel_path("a").into(), Some(8)),
-            ]
-        )
-    });
-
-    // As client A, update a settings file. As Client B, see the changed settings.
-    client_a
-        .fs()
-        .insert_file("/dir/.zed/settings.json", r#"{}"#.into())
-        .await;
-    executor.run_until_parked();
-    cx_b.read(|cx| {
-        let store = cx.global::<SettingsStore>();
-        assert_eq!(
-            store
-                .local_settings(worktree_b.read(cx).id())
-                .map(|(path, content)| (
-                    path,
-                    content.all_languages.defaults.tab_size.map(Into::into)
-                ))
-                .collect::<Vec<_>>(),
-            &[(rel_path("").into(), None), (rel_path("a").into(), Some(8)),]
-        )
-    });
-
-    // As client A, create and remove some settings files. As client B, see the changed settings.
-    client_a
-        .fs()
-        .remove_file("/dir/.zed/settings.json".as_ref(), Default::default())
-        .await
-        .unwrap();
-    client_a
-        .fs()
-        .create_dir("/dir/b/.zed".as_ref())
-        .await
-        .unwrap();
-    client_a
-        .fs()
-        .insert_file("/dir/b/.zed/settings.json", r#"{"tab_size": 4}"#.into())
-        .await;
-    executor.run_until_parked();
-    cx_b.read(|cx| {
-        let store = cx.global::<SettingsStore>();
-        assert_eq!(
-            store
-                .local_settings(worktree_b.read(cx).id())
-                .map(|(path, content)| (
-                    path,
-                    content.all_languages.defaults.tab_size.map(Into::into)
-                ))
-                .collect::<Vec<_>>(),
-            &[
-                (rel_path("a").into(), Some(8)),
-                (rel_path("b").into(), Some(4)),
-            ]
-        )
-    });
-
-    // As client B, disconnect.
-    server.forbid_connections();
-    server.disconnect_client(client_b.peer_id().unwrap());
-
-    // As client A, change and remove settings files while client B is disconnected.
-    client_a
-        .fs()
-        .insert_file("/dir/a/.zed/settings.json", r#"{"hard_tabs":true}"#.into())
-        .await;
-    client_a
-        .fs()
-        .remove_file("/dir/b/.zed/settings.json".as_ref(), Default::default())
-        .await
-        .unwrap();
-    executor.run_until_parked();
-
-    // As client B, reconnect and see the changed settings.
-    server.allow_connections();
-    executor.advance_clock(RECEIVE_TIMEOUT);
-    cx_b.read(|cx| {
-        let store = cx.global::<SettingsStore>();
-        assert_eq!(
-            store
-                .local_settings(worktree_b.read(cx).id())
-                .map(|(path, content)| (path, content.all_languages.defaults.hard_tabs))
-                .collect::<Vec<_>>(),
-            &[(rel_path("a").into(), Some(true))],
-        )
-    });
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_buffer_conflict_after_save(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-
-    client_a
-        .fs()
-        .insert_tree(
-            path!("/dir"),
-            json!({
-                "a.txt": "a-contents",
-            }),
-        )
-        .await;
-    let (project_a, worktree_id) = client_a.build_local_project(path!("/dir"), cx_a).await;
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-
-    // Open a buffer as client B
-    let buffer_b = project_b
-        .update(cx_b, |p, cx| {
-            p.open_buffer((worktree_id, rel_path("a.txt")), cx)
-        })
-        .await
-        .unwrap();
-
-    buffer_b.update(cx_b, |buf, cx| buf.edit([(0..0, "world ")], None, cx));
-
-    buffer_b.read_with(cx_b, |buf, _| {
-        assert!(buf.is_dirty());
-        assert!(!buf.has_conflict());
-    });
-
-    project_b
-        .update(cx_b, |project, cx| {
-            project.save_buffer(buffer_b.clone(), cx)
-        })
-        .await
-        .unwrap();
-
-    buffer_b.read_with(cx_b, |buffer_b, _| assert!(!buffer_b.is_dirty()));
-
-    buffer_b.read_with(cx_b, |buf, _| {
-        assert!(!buf.has_conflict());
-    });
-
-    buffer_b.update(cx_b, |buf, cx| buf.edit([(0..0, "hello ")], None, cx));
-
-    buffer_b.read_with(cx_b, |buf, _| {
-        assert!(buf.is_dirty());
-        assert!(!buf.has_conflict());
-    });
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_buffer_reloading(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-
-    client_a
-        .fs()
-        .insert_tree(
-            path!("/dir"),
-            json!({
-                "a.txt": "a\nb\nc",
-            }),
-        )
-        .await;
-    let (project_a, worktree_id) = client_a.build_local_project(path!("/dir"), cx_a).await;
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-
-    // Open a buffer as client B
-    let buffer_b = project_b
-        .update(cx_b, |p, cx| {
-            p.open_buffer((worktree_id, rel_path("a.txt")), cx)
-        })
-        .await
-        .unwrap();
-
-    buffer_b.read_with(cx_b, |buf, _| {
-        assert!(!buf.is_dirty());
-        assert!(!buf.has_conflict());
-        assert_eq!(buf.line_ending(), LineEnding::Unix);
-    });
-
-    let new_contents = Rope::from("d\ne\nf");
-    client_a
-        .fs()
-        .save(
-            path!("/dir/a.txt").as_ref(),
-            &new_contents,
-            LineEnding::Windows,
-        )
-        .await
-        .unwrap();
-
-    executor.run_until_parked();
-
-    buffer_b.read_with(cx_b, |buf, _| {
-        assert_eq!(buf.text(), new_contents.to_string());
-        assert!(!buf.is_dirty());
-        assert!(!buf.has_conflict());
-        assert_eq!(buf.line_ending(), LineEnding::Windows);
-    });
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_editing_while_guest_opens_buffer(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-
-    client_a
-        .fs()
-        .insert_tree(path!("/dir"), json!({ "a.txt": "a-contents" }))
-        .await;
-    let (project_a, worktree_id) = client_a.build_local_project(path!("/dir"), cx_a).await;
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-
-    // Open a buffer as client A
-    let buffer_a = project_a
-        .update(cx_a, |p, cx| {
-            p.open_buffer((worktree_id, rel_path("a.txt")), cx)
-        })
-        .await
-        .unwrap();
-
-    // Start opening the same buffer as client B
-    let open_buffer = project_b.update(cx_b, |p, cx| {
-        p.open_buffer((worktree_id, rel_path("a.txt")), cx)
-    });
-    let buffer_b = cx_b.executor().spawn(open_buffer);
-
-    // Edit the buffer as client A while client B is still opening it.
-    cx_b.executor().simulate_random_delay().await;
-    buffer_a.update(cx_a, |buf, cx| buf.edit([(0..0, "X")], None, cx));
-    cx_b.executor().simulate_random_delay().await;
-    buffer_a.update(cx_a, |buf, cx| buf.edit([(1..1, "Y")], None, cx));
-
-    let text = buffer_a.read_with(cx_a, |buf, _| buf.text());
-    let buffer_b = buffer_b.await.unwrap();
-    executor.run_until_parked();
-
-    buffer_b.read_with(cx_b, |buf, _| assert_eq!(buf.text(), text));
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_leaving_worktree_while_opening_buffer(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-
-    client_a
-        .fs()
-        .insert_tree("/dir", json!({ "a.txt": "a-contents" }))
-        .await;
-    let (project_a, worktree_id) = client_a.build_local_project("/dir", cx_a).await;
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-
-    // See that a guest has joined as client A.
-    executor.run_until_parked();
-
-    project_a.read_with(cx_a, |p, _| assert_eq!(p.collaborators().len(), 1));
-
-    // Begin opening a buffer as client B, but leave the project before the open completes.
-    let open_buffer = project_b.update(cx_b, |p, cx| {
-        p.open_buffer((worktree_id, rel_path("a.txt")), cx)
-    });
-    let buffer_b = cx_b.executor().spawn(open_buffer);
-    cx_b.update(|_| drop(project_b));
-    drop(buffer_b);
-
-    // See that the guest has left.
-    executor.run_until_parked();
-
-    project_a.read_with(cx_a, |p, _| assert!(p.collaborators().is_empty()));
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_canceling_buffer_opening(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-
-    client_a
-        .fs()
-        .insert_tree(
-            "/dir",
-            json!({
-                "a.txt": "abc",
-            }),
-        )
-        .await;
-    let (project_a, worktree_id) = client_a.build_local_project("/dir", cx_a).await;
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-
-    let buffer_a = project_a
-        .update(cx_a, |p, cx| {
-            p.open_buffer((worktree_id, rel_path("a.txt")), cx)
-        })
-        .await
-        .unwrap();
-
-    // Open a buffer as client B but cancel after a random amount of time.
-    let buffer_b = project_b.update(cx_b, |p, cx| {
-        p.open_buffer_by_id(buffer_a.read_with(cx_a, |a, _| a.remote_id()), cx)
-    });
-    executor.simulate_random_delay().await;
-    drop(buffer_b);
-
-    // Try opening the same buffer again as client B, and ensure we can
-    // still do it despite the cancellation above.
-    let buffer_b = project_b
-        .update(cx_b, |p, cx| {
-            p.open_buffer_by_id(buffer_a.read_with(cx_a, |a, _| a.remote_id()), cx)
-        })
-        .await
-        .unwrap();
-
-    buffer_b.read_with(cx_b, |buf, _| assert_eq!(buf.text(), "abc"));
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_leaving_project(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-    cx_c: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    let client_c = server.create_client(cx_c, "user_c").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b), (&client_c, cx_c)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-
-    client_a
-        .fs()
-        .insert_tree(
-            "/a",
-            json!({
-                "a.txt": "a-contents",
-                "b.txt": "b-contents",
-            }),
-        )
-        .await;
-    let (project_a, _) = client_a.build_local_project("/a", cx_a).await;
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-    let project_b1 = client_b.join_remote_project(project_id, cx_b).await;
-    let project_c = client_c.join_remote_project(project_id, cx_c).await;
-
-    // Client A sees that a guest has joined.
-    executor.run_until_parked();
-
-    project_a.read_with(cx_a, |project, _| {
-        assert_eq!(project.collaborators().len(), 2);
-    });
-
-    project_b1.read_with(cx_b, |project, _| {
-        assert_eq!(project.collaborators().len(), 2);
-    });
-
-    project_c.read_with(cx_c, |project, _| {
-        assert_eq!(project.collaborators().len(), 2);
-    });
-
-    // Client B opens a buffer.
-    let buffer_b1 = project_b1
-        .update(cx_b, |project, cx| {
-            let worktree_id = project.worktrees(cx).next().unwrap().read(cx).id();
-            project.open_buffer((worktree_id, rel_path("a.txt")), cx)
-        })
-        .await
-        .unwrap();
-
-    buffer_b1.read_with(cx_b, |buffer, _| assert_eq!(buffer.text(), "a-contents"));
-
-    // Drop client B's project and ensure client A and client C observe client B leaving.
-    cx_b.update(|_| drop(project_b1));
-    executor.run_until_parked();
-
-    project_a.read_with(cx_a, |project, _| {
-        assert_eq!(project.collaborators().len(), 1);
-    });
-
-    project_c.read_with(cx_c, |project, _| {
-        assert_eq!(project.collaborators().len(), 1);
-    });
-
-    // Client B re-joins the project and can open buffers as before.
-    let project_b2 = client_b.join_remote_project(project_id, cx_b).await;
-    executor.run_until_parked();
-
-    project_a.read_with(cx_a, |project, _| {
-        assert_eq!(project.collaborators().len(), 2);
-    });
-
-    project_b2.read_with(cx_b, |project, _| {
-        assert_eq!(project.collaborators().len(), 2);
-    });
-
-    project_c.read_with(cx_c, |project, _| {
-        assert_eq!(project.collaborators().len(), 2);
-    });
-
-    let buffer_b2 = project_b2
-        .update(cx_b, |project, cx| {
-            let worktree_id = project.worktrees(cx).next().unwrap().read(cx).id();
-            project.open_buffer((worktree_id, rel_path("a.txt")), cx)
-        })
-        .await
-        .unwrap();
-
-    buffer_b2.read_with(cx_b, |buffer, _| assert_eq!(buffer.text(), "a-contents"));
-
-    project_a.read_with(cx_a, |project, _| {
-        assert_eq!(project.collaborators().len(), 2);
-    });
-
-    // Drop client B's connection and ensure client A and client C observe client B leaving.
-    client_b.disconnect(&cx_b.to_async());
-    executor.advance_clock(RECONNECT_TIMEOUT);
-
-    project_a.read_with(cx_a, |project, _| {
-        assert_eq!(project.collaborators().len(), 1);
-    });
-
-    project_b2.read_with(cx_b, |project, cx| {
-        assert!(project.is_disconnected(cx));
-    });
-
-    project_c.read_with(cx_c, |project, _| {
-        assert_eq!(project.collaborators().len(), 1);
-    });
-
-    // Client B can't join the project, unless they re-join the room.
-    cx_b.spawn(|cx| {
-        Project::in_room(
-            project_id,
-            client_b.app_state.client.clone(),
-            client_b.user_store().clone(),
-            client_b.language_registry().clone(),
-            FakeFs::new(cx.background_executor().clone()),
-            cx,
-        )
-    })
-    .await
-    .unwrap_err();
-
-    // Simulate connection loss for client C and ensure client A observes client C leaving the project.
-    client_c.wait_for_current_user(cx_c).await;
-    server.forbid_connections();
-    server.disconnect_client(client_c.peer_id().unwrap());
-    executor.advance_clock(RECEIVE_TIMEOUT + RECONNECT_TIMEOUT);
-    executor.run_until_parked();
-
-    project_a.read_with(cx_a, |project, _| {
-        assert_eq!(project.collaborators().len(), 0);
-    });
-
-    project_b2.read_with(cx_b, |project, cx| {
-        assert!(project.is_disconnected(cx));
-    });
-
-    project_c.read_with(cx_c, |project, cx| {
-        assert!(project.is_disconnected(cx));
-    });
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_collaborating_with_diagnostics(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-    cx_c: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    let client_c = server.create_client(cx_c, "user_c").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b), (&client_c, cx_c)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-
-    client_a.language_registry().add(Arc::new(Language::new(
-        LanguageConfig {
-            name: "Rust".into(),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["rs".to_string()],
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-        Some(tree_sitter_rust::LANGUAGE.into()),
-    )));
-    let mut fake_language_servers = client_a
-        .language_registry()
-        .register_fake_lsp("Rust", Default::default());
-
-    // Share a project as client A
-    client_a
-        .fs()
-        .insert_tree(
-            path!("/a"),
-            json!({
-                "a.rs": "let one = two",
-                "other.rs": "",
-            }),
-        )
-        .await;
-    let (project_a, worktree_id) = client_a.build_local_project(path!("/a"), cx_a).await;
-
-    // Cause the language server to start.
-    let _buffer = project_a
-        .update(cx_a, |project, cx| {
-            project.open_local_buffer_with_lsp(path!("/a/other.rs"), cx)
-        })
-        .await
-        .unwrap();
-
-    // Simulate a language server reporting errors for a file.
-    let mut fake_language_server = fake_language_servers.next().await.unwrap();
-    fake_language_server
-        .receive_notification::<lsp::notification::DidOpenTextDocument>()
-        .await;
-    fake_language_server.notify::<lsp::notification::PublishDiagnostics>(
-        lsp::PublishDiagnosticsParams {
-            uri: lsp::Uri::from_file_path(path!("/a/a.rs")).unwrap(),
-            version: None,
-            diagnostics: vec![lsp::Diagnostic {
-                severity: Some(lsp::DiagnosticSeverity::WARNING),
-                range: lsp::Range::new(lsp::Position::new(0, 4), lsp::Position::new(0, 7)),
-                message: "message 0".to_string(),
-                ..Default::default()
-            }],
-        },
-    );
-
-    // Client A shares the project and, simultaneously, the language server
-    // publishes a diagnostic. This is done to ensure that the server always
-    // observes the latest diagnostics for a worktree.
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-    fake_language_server.notify::<lsp::notification::PublishDiagnostics>(
-        lsp::PublishDiagnosticsParams {
-            uri: lsp::Uri::from_file_path(path!("/a/a.rs")).unwrap(),
-            version: None,
-            diagnostics: vec![lsp::Diagnostic {
-                severity: Some(lsp::DiagnosticSeverity::ERROR),
-                range: lsp::Range::new(lsp::Position::new(0, 4), lsp::Position::new(0, 7)),
-                message: "message 1".to_string(),
-                ..Default::default()
-            }],
-        },
-    );
-
-    // Join the worktree as client B.
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-
-    // Wait for server to see the diagnostics update.
-    executor.run_until_parked();
-
-    // Ensure client B observes the new diagnostics.
-
-    project_b.read_with(cx_b, |project, cx| {
-        assert_eq!(
-            project.diagnostic_summaries(false, cx).collect::<Vec<_>>(),
-            &[(
-                ProjectPath {
-                    worktree_id,
-                    path: rel_path("a.rs").into(),
-                },
-                LanguageServerId(0),
-                DiagnosticSummary {
-                    error_count: 1,
-                    warning_count: 0,
-                },
-            )]
-        )
-    });
-
-    // Join project as client C and observe the diagnostics.
-    let project_c = client_c.join_remote_project(project_id, cx_c).await;
-    executor.run_until_parked();
-    let project_c_diagnostic_summaries =
-        Rc::new(RefCell::new(project_c.read_with(cx_c, |project, cx| {
-            project.diagnostic_summaries(false, cx).collect::<Vec<_>>()
-        })));
-    project_c.update(cx_c, |_, cx| {
-        let summaries = project_c_diagnostic_summaries.clone();
-        cx.subscribe(&project_c, {
-            move |p, _, event, cx| {
-                if let project::Event::DiskBasedDiagnosticsFinished { .. } = event {
-                    *summaries.borrow_mut() = p.diagnostic_summaries(false, cx).collect();
-                }
-            }
-        })
-        .detach();
-    });
-
-    executor.run_until_parked();
-    assert_eq!(
-        project_c_diagnostic_summaries.borrow().as_slice(),
-        &[(
-            ProjectPath {
-                worktree_id,
-                path: rel_path("a.rs").into(),
-            },
-            LanguageServerId(0),
-            DiagnosticSummary {
-                error_count: 1,
-                warning_count: 0,
-            },
-        )]
-    );
-
-    // Simulate a language server reporting more errors for a file.
-    fake_language_server.notify::<lsp::notification::PublishDiagnostics>(
-        lsp::PublishDiagnosticsParams {
-            uri: lsp::Uri::from_file_path(path!("/a/a.rs")).unwrap(),
-            version: None,
-            diagnostics: vec![
-                lsp::Diagnostic {
-                    severity: Some(lsp::DiagnosticSeverity::ERROR),
-                    range: lsp::Range::new(lsp::Position::new(0, 4), lsp::Position::new(0, 7)),
-                    message: "message 1".to_string(),
-                    ..Default::default()
-                },
-                lsp::Diagnostic {
-                    severity: Some(lsp::DiagnosticSeverity::WARNING),
-                    range: lsp::Range::new(lsp::Position::new(0, 10), lsp::Position::new(0, 13)),
-                    message: "message 2".to_string(),
-                    ..Default::default()
-                },
-            ],
-        },
-    );
-
-    // Clients B and C get the updated summaries
-    executor.run_until_parked();
-
-    project_b.read_with(cx_b, |project, cx| {
-        assert_eq!(
-            project.diagnostic_summaries(false, cx).collect::<Vec<_>>(),
-            [(
-                ProjectPath {
-                    worktree_id,
-                    path: rel_path("a.rs").into(),
-                },
-                LanguageServerId(0),
-                DiagnosticSummary {
-                    error_count: 1,
-                    warning_count: 1,
-                },
-            )]
-        );
-    });
-
-    project_c.read_with(cx_c, |project, cx| {
-        assert_eq!(
-            project.diagnostic_summaries(false, cx).collect::<Vec<_>>(),
-            [(
-                ProjectPath {
-                    worktree_id,
-                    path: rel_path("a.rs").into(),
-                },
-                LanguageServerId(0),
-                DiagnosticSummary {
-                    error_count: 1,
-                    warning_count: 1,
-                },
-            )]
-        );
-    });
-
-    // Open the file with the errors on client B. They should be present.
-    let open_buffer = project_b.update(cx_b, |p, cx| {
-        p.open_buffer((worktree_id, rel_path("a.rs")), cx)
-    });
-    let buffer_b = cx_b.executor().spawn(open_buffer).await.unwrap();
-
-    buffer_b.read_with(cx_b, |buffer, _| {
-        assert_eq!(
-            buffer
-                .snapshot()
-                .diagnostics_in_range::<_, Point>(0..buffer.len(), false)
-                .collect::<Vec<_>>(),
-            &[
-                DiagnosticEntry {
-                    range: Point::new(0, 4)..Point::new(0, 7),
-                    diagnostic: Diagnostic {
-                        group_id: 2,
-                        message: "message 1".to_string(),
-                        severity: lsp::DiagnosticSeverity::ERROR,
-                        is_primary: true,
-                        source_kind: DiagnosticSourceKind::Pushed,
-                        ..Diagnostic::default()
-                    }
-                },
-                DiagnosticEntry {
-                    range: Point::new(0, 10)..Point::new(0, 13),
-                    diagnostic: Diagnostic {
-                        group_id: 3,
-                        severity: lsp::DiagnosticSeverity::WARNING,
-                        message: "message 2".to_string(),
-                        is_primary: true,
-                        source_kind: DiagnosticSourceKind::Pushed,
-                        ..Diagnostic::default()
-                    }
-                }
-            ]
-        );
-    });
-
-    // Simulate a language server reporting no errors for a file.
-    fake_language_server.notify::<lsp::notification::PublishDiagnostics>(
-        lsp::PublishDiagnosticsParams {
-            uri: lsp::Uri::from_file_path(path!("/a/a.rs")).unwrap(),
-            version: None,
-            diagnostics: Vec::new(),
-        },
-    );
-    executor.run_until_parked();
-
-    project_a.read_with(cx_a, |project, cx| {
-        assert_eq!(
-            project.diagnostic_summaries(false, cx).collect::<Vec<_>>(),
-            []
-        )
-    });
-
-    project_b.read_with(cx_b, |project, cx| {
-        assert_eq!(
-            project.diagnostic_summaries(false, cx).collect::<Vec<_>>(),
-            []
-        )
-    });
-
-    project_c.read_with(cx_c, |project, cx| {
-        assert_eq!(
-            project.diagnostic_summaries(false, cx).collect::<Vec<_>>(),
-            []
-        )
-    });
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_collaborating_with_lsp_progress_updates_and_diagnostics_ordering(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-
-    client_a.language_registry().add(rust_lang());
-    let mut fake_language_servers = client_a.language_registry().register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            disk_based_diagnostics_progress_token: Some("the-disk-based-token".into()),
-            disk_based_diagnostics_sources: vec!["the-disk-based-diagnostics-source".into()],
-            ..Default::default()
-        },
-    );
-
-    let file_names = &["one.rs", "two.rs", "three.rs", "four.rs", "five.rs"];
-    client_a
-        .fs()
-        .insert_tree(
-            path!("/test"),
-            json!({
-                "one.rs": "const ONE: usize = 1;",
-                "two.rs": "const TWO: usize = 2;",
-                "three.rs": "const THREE: usize = 3;",
-                "four.rs": "const FOUR: usize = 3;",
-                "five.rs": "const FIVE: usize = 3;",
-            }),
-        )
-        .await;
-
-    let (project_a, worktree_id) = client_a.build_local_project(path!("/test"), cx_a).await;
-
-    // Share a project as client A
-    let active_call_a = cx_a.read(ActiveCall::global);
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-
-    // Join the project as client B and open all three files.
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-    let guest_buffers = futures::future::try_join_all(file_names.iter().map(|file_name| {
-        project_b.update(cx_b, |p, cx| {
-            p.open_buffer_with_lsp((worktree_id, rel_path(file_name)), cx)
-        })
-    }))
-    .await
-    .unwrap();
-
-    // Simulate a language server reporting errors for a file.
-    let fake_language_server = fake_language_servers.next().await.unwrap();
-    fake_language_server
-        .request::<lsp::request::WorkDoneProgressCreate>(lsp::WorkDoneProgressCreateParams {
-            token: lsp::NumberOrString::String("the-disk-based-token".to_string()),
-        })
-        .await
-        .into_response()
-        .unwrap();
-    fake_language_server.notify::<lsp::notification::Progress>(lsp::ProgressParams {
-        token: lsp::NumberOrString::String("the-disk-based-token".to_string()),
-        value: lsp::ProgressParamsValue::WorkDone(lsp::WorkDoneProgress::Begin(
-            lsp::WorkDoneProgressBegin {
-                title: "Progress Began".into(),
-                ..Default::default()
-            },
-        )),
-    });
-    for file_name in file_names {
-        fake_language_server.notify::<lsp::notification::PublishDiagnostics>(
-            lsp::PublishDiagnosticsParams {
-                uri: lsp::Uri::from_file_path(Path::new(path!("/test")).join(file_name)).unwrap(),
-                version: None,
-                diagnostics: vec![lsp::Diagnostic {
-                    severity: Some(lsp::DiagnosticSeverity::WARNING),
-                    source: Some("the-disk-based-diagnostics-source".into()),
-                    range: lsp::Range::new(lsp::Position::new(0, 0), lsp::Position::new(0, 0)),
-                    message: "message one".to_string(),
-                    ..Default::default()
-                }],
-            },
-        );
-    }
-    fake_language_server.notify::<lsp::notification::Progress>(lsp::ProgressParams {
-        token: lsp::NumberOrString::String("the-disk-based-token".to_string()),
-        value: lsp::ProgressParamsValue::WorkDone(lsp::WorkDoneProgress::End(
-            lsp::WorkDoneProgressEnd { message: None },
-        )),
-    });
-
-    // When the "disk base diagnostics finished" message is received, the buffers'
-    // diagnostics are expected to be present.
-    let disk_based_diagnostics_finished = Arc::new(AtomicBool::new(false));
-    project_b.update(cx_b, {
-        let project_b = project_b.clone();
-        let disk_based_diagnostics_finished = disk_based_diagnostics_finished.clone();
-        move |_, cx| {
-            cx.subscribe(&project_b, move |_, _, event, cx| {
-                if let project::Event::DiskBasedDiagnosticsFinished { .. } = event {
-                    disk_based_diagnostics_finished.store(true, SeqCst);
-                    for (buffer, _) in &guest_buffers {
-                        assert_eq!(
-                            buffer
-                                .read(cx)
-                                .snapshot()
-                                .diagnostics_in_range::<_, usize>(0..5, false)
-                                .count(),
-                            1,
-                            "expected a diagnostic for buffer {:?}",
-                            buffer.read(cx).file().unwrap().path(),
-                        );
-                    }
-                }
-            })
-            .detach();
-        }
-    });
-
-    executor.run_until_parked();
-    assert!(disk_based_diagnostics_finished.load(SeqCst));
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_reloading_buffer_manually(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-
-    client_a
-        .fs()
-        .insert_tree(path!("/a"), json!({ "a.rs": "let one = 1;" }))
-        .await;
-    let (project_a, worktree_id) = client_a.build_local_project(path!("/a"), cx_a).await;
-    let buffer_a = project_a
-        .update(cx_a, |p, cx| {
-            p.open_buffer((worktree_id, rel_path("a.rs")), cx)
-        })
-        .await
-        .unwrap();
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-
-    let open_buffer = project_b.update(cx_b, |p, cx| {
-        p.open_buffer((worktree_id, rel_path("a.rs")), cx)
-    });
-    let buffer_b = cx_b.executor().spawn(open_buffer).await.unwrap();
-    buffer_b.update(cx_b, |buffer, cx| {
-        buffer.edit([(4..7, "six")], None, cx);
-        buffer.edit([(10..11, "6")], None, cx);
-        assert_eq!(buffer.text(), "let six = 6;");
-        assert!(buffer.is_dirty());
-        assert!(!buffer.has_conflict());
-    });
-    executor.run_until_parked();
-
-    buffer_a.read_with(cx_a, |buffer, _| assert_eq!(buffer.text(), "let six = 6;"));
-
-    client_a
-        .fs()
-        .save(
-            path!("/a/a.rs").as_ref(),
-            &Rope::from("let seven = 7;"),
-            LineEnding::Unix,
-        )
-        .await
-        .unwrap();
-    executor.run_until_parked();
-
-    buffer_a.read_with(cx_a, |buffer, _| assert!(buffer.has_conflict()));
-
-    buffer_b.read_with(cx_b, |buffer, _| assert!(buffer.has_conflict()));
-
-    project_b
-        .update(cx_b, |project, cx| {
-            project.reload_buffers(HashSet::from_iter([buffer_b.clone()]), true, cx)
-        })
-        .await
-        .unwrap();
-
-    buffer_a.read_with(cx_a, |buffer, _| {
-        assert_eq!(buffer.text(), "let seven = 7;");
-        assert!(!buffer.is_dirty());
-        assert!(!buffer.has_conflict());
-    });
-
-    buffer_b.read_with(cx_b, |buffer, _| {
-        assert_eq!(buffer.text(), "let seven = 7;");
-        assert!(!buffer.is_dirty());
-        assert!(!buffer.has_conflict());
-    });
-
-    buffer_a.update(cx_a, |buffer, cx| {
-        // Undoing on the host is a no-op when the reload was initiated by the guest.
-        buffer.undo(cx);
-        assert_eq!(buffer.text(), "let seven = 7;");
-        assert!(!buffer.is_dirty());
-        assert!(!buffer.has_conflict());
-    });
-    buffer_b.update(cx_b, |buffer, cx| {
-        // Undoing on the guest rolls back the buffer to before it was reloaded but the conflict gets cleared.
-        buffer.undo(cx);
-        assert_eq!(buffer.text(), "let six = 6;");
-        assert!(buffer.is_dirty());
-        assert!(!buffer.has_conflict());
-    });
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_formatting_buffer(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-
-    client_a.language_registry().add(rust_lang());
-    let mut fake_language_servers = client_a
-        .language_registry()
-        .register_fake_lsp("Rust", FakeLspAdapter::default());
-
-    // Here we insert a fake tree with a directory that exists on disk. This is needed
-    // because later we'll invoke a command, which requires passing a working directory
-    // that points to a valid location on disk.
-    let directory = env::current_dir().unwrap();
-    client_a
-        .fs()
-        .insert_tree(&directory, json!({ "a.rs": "let one = \"two\"" }))
-        .await;
-    let (project_a, worktree_id) = client_a.build_local_project(&directory, cx_a).await;
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-
-    let buffer_b = project_b
-        .update(cx_b, |p, cx| {
-            p.open_buffer((worktree_id, rel_path("a.rs")), cx)
-        })
-        .await
-        .unwrap();
-
-    let _handle = project_b.update(cx_b, |project, cx| {
-        project.register_buffer_with_language_servers(&buffer_b, cx)
-    });
-    let fake_language_server = fake_language_servers.next().await.unwrap();
-    fake_language_server.set_request_handler::<lsp::request::Formatting, _, _>(|_, _| async move {
-        Ok(Some(vec![
-            lsp::TextEdit {
-                range: lsp::Range::new(lsp::Position::new(0, 4), lsp::Position::new(0, 4)),
-                new_text: "h".to_string(),
-            },
-            lsp::TextEdit {
-                range: lsp::Range::new(lsp::Position::new(0, 7), lsp::Position::new(0, 7)),
-                new_text: "y".to_string(),
-            },
-        ]))
-    });
-
-    project_b
-        .update(cx_b, |project, cx| {
-            project.format(
-                HashSet::from_iter([buffer_b.clone()]),
-                LspFormatTarget::Buffers,
-                true,
-                FormatTrigger::Save,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-
-    // The edits from the LSP are applied, and a final newline is added.
-    assert_eq!(
-        buffer_b.read_with(cx_b, |buffer, _| buffer.text()),
-        "let honey = \"two\"\n"
-    );
-
-    // There is no `awk` command on Windows.
-    #[cfg(not(target_os = "windows"))]
-    {
-        // Ensure buffer can be formatted using an external command. Notice how the
-        // host's configuration is honored as opposed to using the guest's settings.
-        cx_a.update(|cx| {
-            SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |file| {
-                    file.project.all_languages.defaults.formatter =
-                        Some(FormatterList::Single(Formatter::External {
-                            command: "awk".into(),
-                            arguments: Some(
-                                vec!["{sub(/two/,\"{buffer_path}\")}1".to_string()].into(),
-                            ),
-                        }));
-                });
-            });
-        });
-
-        executor.allow_parking();
-        project_b
-            .update(cx_b, |project, cx| {
-                project.format(
-                    HashSet::from_iter([buffer_b.clone()]),
-                    LspFormatTarget::Buffers,
-                    true,
-                    FormatTrigger::Save,
-                    cx,
-                )
-            })
-            .await
-            .unwrap();
-        assert_eq!(
-            buffer_b.read_with(cx_b, |buffer, _| buffer.text()),
-            format!("let honey = \"{}/a.rs\"\n", directory.to_str().unwrap())
-        );
-    }
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_prettier_formatting_buffer(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-
-    let test_plugin = "test_plugin";
-
-    client_a.language_registry().add(Arc::new(Language::new(
-        LanguageConfig {
-            name: "TypeScript".into(),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["ts".to_string()],
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-        Some(tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into()),
-    )));
-    let mut fake_language_servers = client_a.language_registry().register_fake_lsp(
-        "TypeScript",
-        FakeLspAdapter {
-            prettier_plugins: vec![test_plugin],
-            ..Default::default()
-        },
-    );
-
-    // Here we insert a fake tree with a directory that exists on disk. This is needed
-    // because later we'll invoke a command, which requires passing a working directory
-    // that points to a valid location on disk.
-    let directory = env::current_dir().unwrap();
-    let buffer_text = "let one = \"two\"";
-    client_a
-        .fs()
-        .insert_tree(&directory, json!({ "a.ts": buffer_text }))
-        .await;
-    let (project_a, worktree_id) = client_a.build_local_project(&directory, cx_a).await;
-    let prettier_format_suffix = project::TEST_PRETTIER_FORMAT_SUFFIX;
-    let open_buffer = project_a.update(cx_a, |p, cx| {
-        p.open_buffer((worktree_id, rel_path("a.ts")), cx)
-    });
-    let buffer_a = cx_a.executor().spawn(open_buffer).await.unwrap();
-
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-    let (buffer_b, _) = project_b
-        .update(cx_b, |p, cx| {
-            p.open_buffer_with_lsp((worktree_id, rel_path("a.ts")), cx)
-        })
-        .await
-        .unwrap();
-
-    cx_a.update(|cx| {
-        SettingsStore::update_global(cx, |store, cx| {
-            store.update_user_settings(cx, |file| {
-                file.project.all_languages.defaults.formatter = Some(FormatterList::default());
-                file.project.all_languages.defaults.prettier = Some(PrettierSettingsContent {
-                    allowed: Some(true),
-                    ..Default::default()
-                });
-            });
-        });
-    });
-    cx_b.update(|cx| {
-        SettingsStore::update_global(cx, |store, cx| {
-            store.update_user_settings(cx, |file| {
-                file.project.all_languages.defaults.formatter = Some(FormatterList::Single(
-                    Formatter::LanguageServer(LanguageServerFormatterSpecifier::Current),
-                ));
-                file.project.all_languages.defaults.prettier = Some(PrettierSettingsContent {
-                    allowed: Some(true),
-                    ..Default::default()
-                });
-            });
-        });
-    });
-    let fake_language_server = fake_language_servers.next().await.unwrap();
-    fake_language_server.set_request_handler::<lsp::request::Formatting, _, _>(|_, _| async move {
-        panic!(
-            "Unexpected: prettier should be preferred since it's enabled and language supports it"
-        )
-    });
-
-    project_b
-        .update(cx_b, |project, cx| {
-            project.format(
-                HashSet::from_iter([buffer_b.clone()]),
-                LspFormatTarget::Buffers,
-                true,
-                FormatTrigger::Save,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-
-    executor.run_until_parked();
-    assert_eq!(
-        buffer_b.read_with(cx_b, |buffer, _| buffer.text()),
-        buffer_text.to_string() + "\n" + prettier_format_suffix,
-        "Prettier formatting was not applied to client buffer after client's request"
-    );
-
-    project_a
-        .update(cx_a, |project, cx| {
-            project.format(
-                HashSet::from_iter([buffer_a.clone()]),
-                LspFormatTarget::Buffers,
-                true,
-                FormatTrigger::Manual,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-
-    executor.run_until_parked();
-    assert_eq!(
-        buffer_b.read_with(cx_b, |buffer, _| buffer.text()),
-        buffer_text.to_string() + "\n" + prettier_format_suffix + "\n" + prettier_format_suffix,
-        "Prettier formatting was not applied to client buffer after host's request"
-    );
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_definition(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-
-    let capabilities = lsp::ServerCapabilities {
-        definition_provider: Some(OneOf::Left(true)),
-        type_definition_provider: Some(lsp::TypeDefinitionProviderCapability::Simple(true)),
-        ..lsp::ServerCapabilities::default()
-    };
-    client_a.language_registry().add(rust_lang());
-    let mut fake_language_servers = client_a.language_registry().register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            capabilities: capabilities.clone(),
-            ..FakeLspAdapter::default()
-        },
-    );
-    client_b.language_registry().add(rust_lang());
-    client_b.language_registry().register_fake_lsp_adapter(
-        "Rust",
-        FakeLspAdapter {
-            capabilities,
-            ..FakeLspAdapter::default()
-        },
-    );
-
-    client_a
-        .fs()
-        .insert_tree(
-            path!("/root"),
-            json!({
-                "dir-1": {
-                    "a.rs": "const ONE: usize = b::TWO + b::THREE;",
-                },
-                "dir-2": {
-                    "b.rs": "const TWO: c::T2 = 2;\nconst THREE: usize = 3;",
-                    "c.rs": "type T2 = usize;",
-                }
-            }),
-        )
-        .await;
-    let (project_a, worktree_id) = client_a
-        .build_local_project(path!("/root/dir-1"), cx_a)
-        .await;
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-
-    // Open the file on client B.
-    let (buffer_b, _handle) = project_b
-        .update(cx_b, |p, cx| {
-            p.open_buffer_with_lsp((worktree_id, rel_path("a.rs")), cx)
-        })
-        .await
-        .unwrap();
-
-    // Request the definition of a symbol as the guest.
-    let fake_language_server = fake_language_servers.next().await.unwrap();
-    fake_language_server.set_request_handler::<lsp::request::GotoDefinition, _, _>(
-        |_, _| async move {
-            Ok(Some(lsp::GotoDefinitionResponse::Scalar(
-                lsp::Location::new(
-                    lsp::Uri::from_file_path(path!("/root/dir-2/b.rs")).unwrap(),
-                    lsp::Range::new(lsp::Position::new(0, 6), lsp::Position::new(0, 9)),
-                ),
-            )))
-        },
-    );
-    cx_a.run_until_parked();
-    cx_b.run_until_parked();
-
-    let definitions_1 = project_b
-        .update(cx_b, |p, cx| p.definitions(&buffer_b, 23, cx))
-        .await
-        .unwrap()
-        .unwrap();
-    cx_b.read(|cx| {
-        assert_eq!(
-            definitions_1.len(),
-            1,
-            "Unexpected definitions: {definitions_1:?}"
-        );
-        assert_eq!(project_b.read(cx).worktrees(cx).count(), 2);
-        let target_buffer = definitions_1[0].target.buffer.read(cx);
-        assert_eq!(
-            target_buffer.text(),
-            "const TWO: c::T2 = 2;\nconst THREE: usize = 3;"
-        );
-        assert_eq!(
-            definitions_1[0].target.range.to_point(target_buffer),
-            Point::new(0, 6)..Point::new(0, 9)
-        );
-    });
-
-    // Try getting more definitions for the same buffer, ensuring the buffer gets reused from
-    // the previous call to `definition`.
-    fake_language_server.set_request_handler::<lsp::request::GotoDefinition, _, _>(
-        |_, _| async move {
-            Ok(Some(lsp::GotoDefinitionResponse::Scalar(
-                lsp::Location::new(
-                    lsp::Uri::from_file_path(path!("/root/dir-2/b.rs")).unwrap(),
-                    lsp::Range::new(lsp::Position::new(1, 6), lsp::Position::new(1, 11)),
-                ),
-            )))
-        },
-    );
-
-    let definitions_2 = project_b
-        .update(cx_b, |p, cx| p.definitions(&buffer_b, 33, cx))
-        .await
-        .unwrap()
-        .unwrap();
-    cx_b.read(|cx| {
-        assert_eq!(definitions_2.len(), 1);
-        assert_eq!(project_b.read(cx).worktrees(cx).count(), 2);
-        let target_buffer = definitions_2[0].target.buffer.read(cx);
-        assert_eq!(
-            target_buffer.text(),
-            "const TWO: c::T2 = 2;\nconst THREE: usize = 3;"
-        );
-        assert_eq!(
-            definitions_2[0].target.range.to_point(target_buffer),
-            Point::new(1, 6)..Point::new(1, 11)
-        );
-    });
-    assert_eq!(
-        definitions_1[0].target.buffer,
-        definitions_2[0].target.buffer
-    );
-
-    fake_language_server.set_request_handler::<lsp::request::GotoTypeDefinition, _, _>(
-        |req, _| async move {
-            assert_eq!(
-                req.text_document_position_params.position,
-                lsp::Position::new(0, 7)
-            );
-            Ok(Some(lsp::GotoDefinitionResponse::Scalar(
-                lsp::Location::new(
-                    lsp::Uri::from_file_path(path!("/root/dir-2/c.rs")).unwrap(),
-                    lsp::Range::new(lsp::Position::new(0, 5), lsp::Position::new(0, 7)),
-                ),
-            )))
-        },
-    );
-
-    let type_definitions = project_b
-        .update(cx_b, |p, cx| p.type_definitions(&buffer_b, 7, cx))
-        .await
-        .unwrap()
-        .unwrap();
-    cx_b.read(|cx| {
-        assert_eq!(
-            type_definitions.len(),
-            1,
-            "Unexpected type definitions: {type_definitions:?}"
-        );
-        let target_buffer = type_definitions[0].target.buffer.read(cx);
-        assert_eq!(target_buffer.text(), "type T2 = usize;");
-        assert_eq!(
-            type_definitions[0].target.range.to_point(target_buffer),
-            Point::new(0, 5)..Point::new(0, 7)
-        );
-    });
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_references(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-
-    let capabilities = lsp::ServerCapabilities {
-        references_provider: Some(lsp::OneOf::Left(true)),
-        ..lsp::ServerCapabilities::default()
-    };
-    client_a.language_registry().add(rust_lang());
-    let mut fake_language_servers = client_a.language_registry().register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            name: "my-fake-lsp-adapter",
-            capabilities: capabilities.clone(),
-            ..FakeLspAdapter::default()
-        },
-    );
-    client_b.language_registry().add(rust_lang());
-    client_b.language_registry().register_fake_lsp_adapter(
-        "Rust",
-        FakeLspAdapter {
-            name: "my-fake-lsp-adapter",
-            capabilities,
-            ..FakeLspAdapter::default()
-        },
-    );
-
-    client_a
-        .fs()
-        .insert_tree(
-            path!("/root"),
-            json!({
-                "dir-1": {
-                    "one.rs": "const ONE: usize = 1;",
-                    "two.rs": "const TWO: usize = one::ONE + one::ONE;",
-                },
-                "dir-2": {
-                    "three.rs": "const THREE: usize = two::TWO + one::ONE;",
-                }
-            }),
-        )
-        .await;
-    let (project_a, worktree_id) = client_a
-        .build_local_project(path!("/root/dir-1"), cx_a)
-        .await;
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-
-    // Open the file on client B.
-    let (buffer_b, _handle) = project_b
-        .update(cx_b, |p, cx| {
-            p.open_buffer_with_lsp((worktree_id, rel_path("one.rs")), cx)
-        })
-        .await
-        .unwrap();
-
-    // Request references to a symbol as the guest.
-    let fake_language_server = fake_language_servers.next().await.unwrap();
-    let (lsp_response_tx, rx) = mpsc::unbounded::<Result<Option<Vec<lsp::Location>>>>();
-    fake_language_server.set_request_handler::<lsp::request::References, _, _>({
-        let rx = Arc::new(Mutex::new(Some(rx)));
-        move |params, _| {
-            assert_eq!(
-                params.text_document_position.text_document.uri.as_str(),
-                uri!("file:///root/dir-1/one.rs")
-            );
-            let rx = rx.clone();
-            async move {
-                let mut response_rx = rx.lock().take().unwrap();
-                let result = response_rx.next().await.unwrap();
-                *rx.lock() = Some(response_rx);
-                result
-            }
-        }
-    });
-    cx_a.run_until_parked();
-    cx_b.run_until_parked();
-
-    let references = project_b.update(cx_b, |p, cx| p.references(&buffer_b, 7, cx));
-
-    // User is informed that a request is pending.
-    executor.run_until_parked();
-    project_b.read_with(cx_b, |project, cx| {
-        let status = project.language_server_statuses(cx).next().unwrap().1;
-        assert_eq!(status.name.0, "my-fake-lsp-adapter");
-        assert_eq!(
-            status.pending_work.values().next().unwrap().message,
-            Some("Finding references...".into())
-        );
-    });
-
-    // Cause the language server to respond.
-    lsp_response_tx
-        .unbounded_send(Ok(Some(vec![
-            lsp::Location {
-                uri: lsp::Uri::from_file_path(path!("/root/dir-1/two.rs")).unwrap(),
-                range: lsp::Range::new(lsp::Position::new(0, 24), lsp::Position::new(0, 27)),
-            },
-            lsp::Location {
-                uri: lsp::Uri::from_file_path(path!("/root/dir-1/two.rs")).unwrap(),
-                range: lsp::Range::new(lsp::Position::new(0, 35), lsp::Position::new(0, 38)),
-            },
-            lsp::Location {
-                uri: lsp::Uri::from_file_path(path!("/root/dir-2/three.rs")).unwrap(),
-                range: lsp::Range::new(lsp::Position::new(0, 37), lsp::Position::new(0, 40)),
-            },
-        ])))
-        .unwrap();
-
-    let references = references.await.unwrap().unwrap();
-    executor.run_until_parked();
-    project_b.read_with(cx_b, |project, cx| {
-        // User is informed that a request is no longer pending.
-        let status = project.language_server_statuses(cx).next().unwrap().1;
-        assert!(status.pending_work.is_empty());
-
-        assert_eq!(references.len(), 3);
-        assert_eq!(project.worktrees(cx).count(), 2);
-
-        let two_buffer = references[0].buffer.read(cx);
-        let three_buffer = references[2].buffer.read(cx);
-        assert_eq!(
-            two_buffer.file().unwrap().path().as_ref(),
-            rel_path("two.rs")
-        );
-        assert_eq!(references[1].buffer, references[0].buffer);
-        assert_eq!(
-            three_buffer.file().unwrap().full_path(cx),
-            Path::new(path!("/root/dir-2/three.rs"))
-        );
-
-        assert_eq!(references[0].range.to_offset(two_buffer), 24..27);
-        assert_eq!(references[1].range.to_offset(two_buffer), 35..38);
-        assert_eq!(references[2].range.to_offset(three_buffer), 37..40);
-    });
-
-    let references = project_b.update(cx_b, |p, cx| p.references(&buffer_b, 7, cx));
-
-    // User is informed that a request is pending.
-    executor.run_until_parked();
-    project_b.read_with(cx_b, |project, cx| {
-        let status = project.language_server_statuses(cx).next().unwrap().1;
-        assert_eq!(status.name.0, "my-fake-lsp-adapter");
-        assert_eq!(
-            status.pending_work.values().next().unwrap().message,
-            Some("Finding references...".into())
-        );
-    });
-
-    // Cause the LSP request to fail.
-    lsp_response_tx
-        .unbounded_send(Err(anyhow!("can't find references")))
-        .unwrap();
-    assert_eq!(references.await.unwrap().unwrap(), []);
-
-    // User is informed that the request is no longer pending.
-    executor.run_until_parked();
-    project_b.read_with(cx_b, |project, cx| {
-        let status = project.language_server_statuses(cx).next().unwrap().1;
-        assert!(status.pending_work.is_empty());
-    });
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_project_search(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-
-    client_a
-        .fs()
-        .insert_tree(
-            "/root",
-            json!({
-                "dir-1": {
-                    "a": "hello world",
-                    "b": "goodnight moon",
-                    "c": "a world of goo",
-                    "d": "world champion of clown world",
-                },
-                "dir-2": {
-                    "e": "disney world is fun",
-                }
-            }),
-        )
-        .await;
-    let (project_a, _) = client_a.build_local_project("/root/dir-1", cx_a).await;
-    let (worktree_2, _) = project_a
-        .update(cx_a, |p, cx| {
-            p.find_or_create_worktree("/root/dir-2", true, cx)
-        })
-        .await
-        .unwrap();
-    worktree_2
-        .read_with(cx_a, |tree, _| tree.as_local().unwrap().scan_complete())
-        .await;
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-
-    // Perform a search as the guest.
-    let mut results = HashMap::default();
-    let search_rx = project_b.update(cx_b, |project, cx| {
-        project.search(
-            SearchQuery::text(
-                "world",
-                false,
-                false,
-                false,
-                Default::default(),
-                Default::default(),
-                false,
-                None,
-            )
-            .unwrap(),
-            cx,
-        )
-    });
-    while let Ok(result) = search_rx.recv().await {
-        match result {
-            SearchResult::Buffer { buffer, ranges } => {
-                results.entry(buffer).or_insert(ranges);
-            }
-            SearchResult::LimitReached => {
-                panic!(
-                    "Unexpectedly reached search limit in tests. If you do want to assert limit-reached, change this panic call."
-                )
-            }
-        };
-    }
-
-    let mut ranges_by_path = results
-        .into_iter()
-        .map(|(buffer, ranges)| {
-            buffer.read_with(cx_b, |buffer, cx| {
-                let path = buffer.file().unwrap().full_path(cx);
-                let offset_ranges = ranges
-                    .into_iter()
-                    .map(|range| range.to_offset(buffer))
-                    .collect::<Vec<_>>();
-                (path, offset_ranges)
-            })
-        })
-        .collect::<Vec<_>>();
-    ranges_by_path.sort_by_key(|(path, _)| path.clone());
-
-    assert_eq!(
-        ranges_by_path,
-        &[
-            (PathBuf::from("dir-1/a"), vec![6..11]),
-            (PathBuf::from("dir-1/c"), vec![2..7]),
-            (PathBuf::from("dir-1/d"), vec![0..5, 24..29]),
-            (PathBuf::from("dir-2/e"), vec![7..12]),
-        ]
-    );
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_document_highlights(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-
-    client_a
-        .fs()
-        .insert_tree(
-            path!("/root-1"),
-            json!({
-                "main.rs": "fn double(number: i32) -> i32 { number + number }",
-            }),
-        )
-        .await;
-
-    client_a.language_registry().add(rust_lang());
-    let capabilities = lsp::ServerCapabilities {
-        document_highlight_provider: Some(lsp::OneOf::Left(true)),
-        ..lsp::ServerCapabilities::default()
-    };
-    let mut fake_language_servers = client_a.language_registry().register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            capabilities: capabilities.clone(),
-            ..FakeLspAdapter::default()
-        },
-    );
-    client_b.language_registry().add(rust_lang());
-    client_b.language_registry().register_fake_lsp_adapter(
-        "Rust",
-        FakeLspAdapter {
-            capabilities,
-            ..FakeLspAdapter::default()
-        },
-    );
-
-    let (project_a, worktree_id) = client_a.build_local_project(path!("/root-1"), cx_a).await;
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-
-    // Open the file on client B.
-    let (buffer_b, _handle) = project_b
-        .update(cx_b, |p, cx| {
-            p.open_buffer_with_lsp((worktree_id, rel_path("main.rs")), cx)
-        })
-        .await
-        .unwrap();
-
-    // Request document highlights as the guest.
-    let fake_language_server = fake_language_servers.next().await.unwrap();
-    fake_language_server.set_request_handler::<lsp::request::DocumentHighlightRequest, _, _>(
-        |params, _| async move {
-            assert_eq!(
-                params
-                    .text_document_position_params
-                    .text_document
-                    .uri
-                    .as_str(),
-                uri!("file:///root-1/main.rs")
-            );
-            assert_eq!(
-                params.text_document_position_params.position,
-                lsp::Position::new(0, 34)
-            );
-            Ok(Some(vec![
-                lsp::DocumentHighlight {
-                    kind: Some(lsp::DocumentHighlightKind::WRITE),
-                    range: lsp::Range::new(lsp::Position::new(0, 10), lsp::Position::new(0, 16)),
-                },
-                lsp::DocumentHighlight {
-                    kind: Some(lsp::DocumentHighlightKind::READ),
-                    range: lsp::Range::new(lsp::Position::new(0, 32), lsp::Position::new(0, 38)),
-                },
-                lsp::DocumentHighlight {
-                    kind: Some(lsp::DocumentHighlightKind::READ),
-                    range: lsp::Range::new(lsp::Position::new(0, 41), lsp::Position::new(0, 47)),
-                },
-            ]))
-        },
-    );
-    cx_a.run_until_parked();
-    cx_b.run_until_parked();
-
-    let highlights = project_b
-        .update(cx_b, |p, cx| p.document_highlights(&buffer_b, 34, cx))
-        .await
-        .unwrap();
-
-    buffer_b.read_with(cx_b, |buffer, _| {
-        let snapshot = buffer.snapshot();
-
-        let highlights = highlights
-            .into_iter()
-            .map(|highlight| (highlight.kind, highlight.range.to_offset(&snapshot)))
-            .collect::<Vec<_>>();
-        assert_eq!(
-            highlights,
-            &[
-                (lsp::DocumentHighlightKind::WRITE, 10..16),
-                (lsp::DocumentHighlightKind::READ, 32..38),
-                (lsp::DocumentHighlightKind::READ, 41..47)
-            ]
-        )
-    });
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_lsp_hover(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-
-    client_a
-        .fs()
-        .insert_tree(
-            path!("/root-1"),
-            json!({
-                "main.rs": "use std::collections::HashMap;",
-            }),
-        )
-        .await;
-
-    client_a.language_registry().add(rust_lang());
-    let language_server_names = ["rust-analyzer", "CrabLang-ls"];
-    let capabilities_1 = lsp::ServerCapabilities {
-        hover_provider: Some(lsp::HoverProviderCapability::Simple(true)),
-        ..lsp::ServerCapabilities::default()
-    };
-    let capabilities_2 = lsp::ServerCapabilities {
-        hover_provider: Some(lsp::HoverProviderCapability::Simple(true)),
-        ..lsp::ServerCapabilities::default()
-    };
-    let mut language_servers = [
-        client_a.language_registry().register_fake_lsp(
-            "Rust",
-            FakeLspAdapter {
-                name: language_server_names[0],
-                capabilities: capabilities_1.clone(),
-                ..FakeLspAdapter::default()
-            },
-        ),
-        client_a.language_registry().register_fake_lsp(
-            "Rust",
-            FakeLspAdapter {
-                name: language_server_names[1],
-                capabilities: capabilities_2.clone(),
-                ..FakeLspAdapter::default()
-            },
-        ),
-    ];
-    client_b.language_registry().add(rust_lang());
-    client_b.language_registry().register_fake_lsp_adapter(
-        "Rust",
-        FakeLspAdapter {
-            name: language_server_names[0],
-            capabilities: capabilities_1,
-            ..FakeLspAdapter::default()
-        },
-    );
-    client_b.language_registry().register_fake_lsp_adapter(
-        "Rust",
-        FakeLspAdapter {
-            name: language_server_names[1],
-            capabilities: capabilities_2,
-            ..FakeLspAdapter::default()
-        },
-    );
-
-    let (project_a, worktree_id) = client_a.build_local_project(path!("/root-1"), cx_a).await;
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-
-    // Open the file as the guest
-    let (buffer_b, _handle) = project_b
-        .update(cx_b, |p, cx| {
-            p.open_buffer_with_lsp((worktree_id, rel_path("main.rs")), cx)
-        })
-        .await
-        .unwrap();
-
-    let mut servers_with_hover_requests = HashMap::default();
-    for i in 0..language_server_names.len() {
-        let new_server = language_servers[i].next().await.unwrap_or_else(|| {
-            panic!(
-                "Failed to get language server #{i} with name {}",
-                &language_server_names[i]
-            )
-        });
-        let new_server_name = new_server.server.name();
-        assert!(
-            !servers_with_hover_requests.contains_key(&new_server_name),
-            "Unexpected: initialized server with the same name twice. Name: `{new_server_name}`"
-        );
-        match new_server_name.as_ref() {
-            "CrabLang-ls" => {
-                servers_with_hover_requests.insert(
-                    new_server_name.clone(),
-                    new_server.set_request_handler::<lsp::request::HoverRequest, _, _>(
-                        move |params, _| {
-                            assert_eq!(
-                                params
-                                    .text_document_position_params
-                                    .text_document
-                                    .uri
-                                    .as_str(),
-                                uri!("file:///root-1/main.rs")
-                            );
-                            let name = new_server_name.clone();
-                            async move {
-                                Ok(Some(lsp::Hover {
-                                    contents: lsp::HoverContents::Scalar(
-                                        lsp::MarkedString::String(format!("{name} hover")),
-                                    ),
-                                    range: None,
-                                }))
-                            }
-                        },
-                    ),
-                );
-            }
-            "rust-analyzer" => {
-                servers_with_hover_requests.insert(
-                    new_server_name.clone(),
-                    new_server.set_request_handler::<lsp::request::HoverRequest, _, _>(
-                        |params, _| async move {
-                            assert_eq!(
-                                params
-                                    .text_document_position_params
-                                    .text_document
-                                    .uri
-                                    .as_str(),
-                                uri!("file:///root-1/main.rs")
-                            );
-                            assert_eq!(
-                                params.text_document_position_params.position,
-                                lsp::Position::new(0, 22)
-                            );
-                            Ok(Some(lsp::Hover {
-                                contents: lsp::HoverContents::Array(vec![
-                                    lsp::MarkedString::String("Test hover content.".to_string()),
-                                    lsp::MarkedString::LanguageString(lsp::LanguageString {
-                                        language: "Rust".to_string(),
-                                        value: "let foo = 42;".to_string(),
-                                    }),
-                                ]),
-                                range: Some(lsp::Range::new(
-                                    lsp::Position::new(0, 22),
-                                    lsp::Position::new(0, 29),
-                                )),
-                            }))
-                        },
-                    ),
-                );
-            }
-            unexpected => panic!("Unexpected server name: {unexpected}"),
-        }
-    }
-    cx_a.run_until_parked();
-    cx_b.run_until_parked();
-
-    // Request hover information as the guest.
-    let mut hovers = project_b
-        .update(cx_b, |p, cx| p.hover(&buffer_b, 22, cx))
-        .await
-        .unwrap();
-    assert_eq!(
-        hovers.len(),
-        2,
-        "Expected two hovers from both language servers, but got: {hovers:?}"
-    );
-
-    let _: Vec<()> = futures::future::join_all(servers_with_hover_requests.into_values().map(
-        |mut hover_request| async move {
-            hover_request
-                .next()
-                .await
-                .expect("All hover requests should have been triggered")
-        },
-    ))
-    .await;
-
-    hovers.sort_by_key(|hover| hover.contents.len());
-    let first_hover = hovers.first().cloned().unwrap();
-    assert_eq!(
-        first_hover.contents,
-        vec![project::HoverBlock {
-            text: "CrabLang-ls hover".to_string(),
-            kind: HoverBlockKind::Markdown,
-        },]
-    );
-    let second_hover = hovers.last().cloned().unwrap();
-    assert_eq!(
-        second_hover.contents,
-        vec![
-            project::HoverBlock {
-                text: "Test hover content.".to_string(),
-                kind: HoverBlockKind::Markdown,
-            },
-            project::HoverBlock {
-                text: "let foo = 42;".to_string(),
-                kind: HoverBlockKind::Code {
-                    language: "Rust".to_string()
-                },
-            }
-        ]
-    );
-    buffer_b.read_with(cx_b, |buffer, _| {
-        let snapshot = buffer.snapshot();
-        assert_eq!(second_hover.range.unwrap().to_offset(&snapshot), 22..29);
-    });
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_project_symbols(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-
-    client_a.language_registry().add(rust_lang());
-    let mut fake_language_servers = client_a.language_registry().register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            capabilities: lsp::ServerCapabilities {
-                workspace_symbol_provider: Some(OneOf::Left(true)),
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-    );
-
-    client_a
-        .fs()
-        .insert_tree(
-            path!("/code"),
-            json!({
-                "crate-1": {
-                    "one.rs": "const ONE: usize = 1;",
-                },
-                "crate-2": {
-                    "two.rs": "const TWO: usize = 2; const THREE: usize = 3;",
-                },
-                "private": {
-                    "passwords.txt": "the-password",
-                }
-            }),
-        )
-        .await;
-    let (project_a, worktree_id) = client_a
-        .build_local_project(path!("/code/crate-1"), cx_a)
-        .await;
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-
-    // Cause the language server to start.
-    let _buffer = project_b
-        .update(cx_b, |p, cx| {
-            p.open_buffer_with_lsp((worktree_id, rel_path("one.rs")), cx)
-        })
-        .await
-        .unwrap();
-
-    let fake_language_server = fake_language_servers.next().await.unwrap();
-    fake_language_server.set_request_handler::<lsp::WorkspaceSymbolRequest, _, _>(
-        |_, _| async move {
-            Ok(Some(lsp::WorkspaceSymbolResponse::Flat(vec![
-                #[allow(deprecated)]
-                lsp::SymbolInformation {
-                    name: "TWO".into(),
-                    location: lsp::Location {
-                        uri: lsp::Uri::from_file_path(path!("/code/crate-2/two.rs")).unwrap(),
-                        range: lsp::Range::new(lsp::Position::new(0, 6), lsp::Position::new(0, 9)),
-                    },
-                    kind: lsp::SymbolKind::CONSTANT,
-                    tags: None,
-                    container_name: None,
-                    deprecated: None,
-                },
-            ])))
-        },
-    );
-
-    // Request the definition of a symbol as the guest.
-    let symbols = project_b
-        .update(cx_b, |p, cx| p.symbols("two", cx))
-        .await
-        .unwrap();
-    assert_eq!(symbols.len(), 1);
-    assert_eq!(symbols[0].name, "TWO");
-
-    // Open one of the returned symbols.
-    let buffer_b_2 = project_b
-        .update(cx_b, |project, cx| {
-            project.open_buffer_for_symbol(&symbols[0], cx)
-        })
-        .await
-        .unwrap();
-
-    buffer_b_2.read_with(cx_b, |buffer, cx| {
-        assert_eq!(
-            buffer.file().unwrap().full_path(cx),
-            Path::new(path!("/code/crate-2/two.rs"))
-        );
-    });
-
-    // Attempt to craft a symbol and violate host's privacy by opening an arbitrary file.
-    let mut fake_symbol = symbols[0].clone();
-    fake_symbol.path = SymbolLocation::OutsideProject {
-        abs_path: Path::new(path!("/code/secrets")).into(),
-        signature: [0x17; 32],
-    };
-    let error = project_b
-        .update(cx_b, |project, cx| {
-            project.open_buffer_for_symbol(&fake_symbol, cx)
-        })
-        .await
-        .unwrap_err();
-    assert!(error.to_string().contains("invalid symbol signature"));
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_open_buffer_while_getting_definition_pointing_to_it(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-    mut rng: StdRng,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-
-    let capabilities = lsp::ServerCapabilities {
-        definition_provider: Some(OneOf::Left(true)),
-        ..lsp::ServerCapabilities::default()
-    };
-    client_a.language_registry().add(rust_lang());
-    let mut fake_language_servers = client_a.language_registry().register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            capabilities: capabilities.clone(),
-            ..FakeLspAdapter::default()
-        },
-    );
-    client_b.language_registry().add(rust_lang());
-    client_b.language_registry().register_fake_lsp_adapter(
-        "Rust",
-        FakeLspAdapter {
-            capabilities,
-            ..FakeLspAdapter::default()
-        },
-    );
-
-    client_a
-        .fs()
-        .insert_tree(
-            path!("/root"),
-            json!({
-                "a.rs": "const ONE: usize = b::TWO;",
-                "b.rs": "const TWO: usize = 2",
-            }),
-        )
-        .await;
-    let (project_a, worktree_id) = client_a.build_local_project(path!("/root"), cx_a).await;
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-
-    let (buffer_b1, _lsp) = project_b
-        .update(cx_b, |p, cx| {
-            p.open_buffer_with_lsp((worktree_id, rel_path("a.rs")), cx)
-        })
-        .await
-        .unwrap();
-
-    let fake_language_server = fake_language_servers.next().await.unwrap();
-    fake_language_server.set_request_handler::<lsp::request::GotoDefinition, _, _>(
-        |_, _| async move {
-            Ok(Some(lsp::GotoDefinitionResponse::Scalar(
-                lsp::Location::new(
-                    lsp::Uri::from_file_path(path!("/root/b.rs")).unwrap(),
-                    lsp::Range::new(lsp::Position::new(0, 6), lsp::Position::new(0, 9)),
-                ),
-            )))
-        },
-    );
-
-    let definitions;
-    let buffer_b2;
-    if rng.random() {
-        cx_a.run_until_parked();
-        cx_b.run_until_parked();
-        definitions = project_b.update(cx_b, |p, cx| p.definitions(&buffer_b1, 23, cx));
-        (buffer_b2, _) = project_b
-            .update(cx_b, |p, cx| {
-                p.open_buffer_with_lsp((worktree_id, rel_path("b.rs")), cx)
-            })
-            .await
-            .unwrap();
-    } else {
-        (buffer_b2, _) = project_b
-            .update(cx_b, |p, cx| {
-                p.open_buffer_with_lsp((worktree_id, rel_path("b.rs")), cx)
-            })
-            .await
-            .unwrap();
-        cx_a.run_until_parked();
-        cx_b.run_until_parked();
-        definitions = project_b.update(cx_b, |p, cx| p.definitions(&buffer_b1, 23, cx));
-    }
-
-    let definitions = definitions.await.unwrap().unwrap();
-    assert_eq!(
-        definitions.len(),
-        1,
-        "Unexpected definitions: {definitions:?}"
-    );
-    assert_eq!(definitions[0].target.buffer, buffer_b2);
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_contacts(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-    cx_c: &mut TestAppContext,
-    cx_d: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    let client_c = server.create_client(cx_c, "user_c").await;
-    let client_d = server.create_client(cx_d, "user_d").await;
-    server
-        .make_contacts(&mut [(&client_a, cx_a), (&client_b, cx_b), (&client_c, cx_c)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-    let active_call_b = cx_b.read(ActiveCall::global);
-    let active_call_c = cx_c.read(ActiveCall::global);
-    let _active_call_d = cx_d.read(ActiveCall::global);
-
-    executor.run_until_parked();
-    assert_eq!(
-        contacts(&client_a, cx_a),
-        [
-            ("user_b".to_string(), "online", "free"),
-            ("user_c".to_string(), "online", "free")
-        ]
-    );
-    assert_eq!(
-        contacts(&client_b, cx_b),
-        [
-            ("user_a".to_string(), "online", "free"),
-            ("user_c".to_string(), "online", "free")
-        ]
-    );
-    assert_eq!(
-        contacts(&client_c, cx_c),
-        [
-            ("user_a".to_string(), "online", "free"),
-            ("user_b".to_string(), "online", "free")
-        ]
-    );
-    assert_eq!(contacts(&client_d, cx_d), []);
-
-    server.disconnect_client(client_c.peer_id().unwrap());
-    server.forbid_connections();
-    executor.advance_clock(RECEIVE_TIMEOUT + RECONNECT_TIMEOUT);
-    assert_eq!(
-        contacts(&client_a, cx_a),
-        [
-            ("user_b".to_string(), "online", "free"),
-            ("user_c".to_string(), "offline", "free")
-        ]
-    );
-    assert_eq!(
-        contacts(&client_b, cx_b),
-        [
-            ("user_a".to_string(), "online", "free"),
-            ("user_c".to_string(), "offline", "free")
-        ]
-    );
-    assert_eq!(contacts(&client_c, cx_c), []);
-    assert_eq!(contacts(&client_d, cx_d), []);
-
-    server.allow_connections();
-    client_c
-        .connect(false, &cx_c.to_async())
-        .await
-        .into_response()
-        .unwrap();
-
-    executor.run_until_parked();
-    assert_eq!(
-        contacts(&client_a, cx_a),
-        [
-            ("user_b".to_string(), "online", "free"),
-            ("user_c".to_string(), "online", "free")
-        ]
-    );
-    assert_eq!(
-        contacts(&client_b, cx_b),
-        [
-            ("user_a".to_string(), "online", "free"),
-            ("user_c".to_string(), "online", "free")
-        ]
-    );
-    assert_eq!(
-        contacts(&client_c, cx_c),
-        [
-            ("user_a".to_string(), "online", "free"),
-            ("user_b".to_string(), "online", "free")
-        ]
-    );
-    assert_eq!(contacts(&client_d, cx_d), []);
-
-    active_call_a
-        .update(cx_a, |call, cx| {
-            call.invite(client_b.user_id().unwrap(), None, cx)
-        })
-        .await
-        .unwrap();
-    executor.run_until_parked();
-    assert_eq!(
-        contacts(&client_a, cx_a),
-        [
-            ("user_b".to_string(), "online", "busy"),
-            ("user_c".to_string(), "online", "free")
-        ]
-    );
-    assert_eq!(
-        contacts(&client_b, cx_b),
-        [
-            ("user_a".to_string(), "online", "busy"),
-            ("user_c".to_string(), "online", "free")
-        ]
-    );
-    assert_eq!(
-        contacts(&client_c, cx_c),
-        [
-            ("user_a".to_string(), "online", "busy"),
-            ("user_b".to_string(), "online", "busy")
-        ]
-    );
-    assert_eq!(contacts(&client_d, cx_d), []);
-
-    // Client B and client D become contacts while client B is being called.
-    server
-        .make_contacts(&mut [(&client_b, cx_b), (&client_d, cx_d)])
-        .await;
-    executor.run_until_parked();
-    assert_eq!(
-        contacts(&client_a, cx_a),
-        [
-            ("user_b".to_string(), "online", "busy"),
-            ("user_c".to_string(), "online", "free")
-        ]
-    );
-    assert_eq!(
-        contacts(&client_b, cx_b),
-        [
-            ("user_a".to_string(), "online", "busy"),
-            ("user_c".to_string(), "online", "free"),
-            ("user_d".to_string(), "online", "free"),
-        ]
-    );
-    assert_eq!(
-        contacts(&client_c, cx_c),
-        [
-            ("user_a".to_string(), "online", "busy"),
-            ("user_b".to_string(), "online", "busy")
-        ]
-    );
-    assert_eq!(
-        contacts(&client_d, cx_d),
-        [("user_b".to_string(), "online", "busy")]
-    );
-
-    active_call_b.update(cx_b, |call, cx| call.decline_incoming(cx).unwrap());
-    executor.run_until_parked();
-    assert_eq!(
-        contacts(&client_a, cx_a),
-        [
-            ("user_b".to_string(), "online", "free"),
-            ("user_c".to_string(), "online", "free")
-        ]
-    );
-    assert_eq!(
-        contacts(&client_b, cx_b),
-        [
-            ("user_a".to_string(), "online", "free"),
-            ("user_c".to_string(), "online", "free"),
-            ("user_d".to_string(), "online", "free")
-        ]
-    );
-    assert_eq!(
-        contacts(&client_c, cx_c),
-        [
-            ("user_a".to_string(), "online", "free"),
-            ("user_b".to_string(), "online", "free")
-        ]
-    );
-    assert_eq!(
-        contacts(&client_d, cx_d),
-        [("user_b".to_string(), "online", "free")]
-    );
-
-    active_call_c
-        .update(cx_c, |call, cx| {
-            call.invite(client_a.user_id().unwrap(), None, cx)
-        })
-        .await
-        .unwrap();
-    executor.run_until_parked();
-    assert_eq!(
-        contacts(&client_a, cx_a),
-        [
-            ("user_b".to_string(), "online", "free"),
-            ("user_c".to_string(), "online", "busy")
-        ]
-    );
-    assert_eq!(
-        contacts(&client_b, cx_b),
-        [
-            ("user_a".to_string(), "online", "busy"),
-            ("user_c".to_string(), "online", "busy"),
-            ("user_d".to_string(), "online", "free")
-        ]
-    );
-    assert_eq!(
-        contacts(&client_c, cx_c),
-        [
-            ("user_a".to_string(), "online", "busy"),
-            ("user_b".to_string(), "online", "free")
-        ]
-    );
-    assert_eq!(
-        contacts(&client_d, cx_d),
-        [("user_b".to_string(), "online", "free")]
-    );
-
-    active_call_a
-        .update(cx_a, |call, cx| call.accept_incoming(cx))
-        .await
-        .unwrap();
-    executor.run_until_parked();
-    assert_eq!(
-        contacts(&client_a, cx_a),
-        [
-            ("user_b".to_string(), "online", "free"),
-            ("user_c".to_string(), "online", "busy")
-        ]
-    );
-    assert_eq!(
-        contacts(&client_b, cx_b),
-        [
-            ("user_a".to_string(), "online", "busy"),
-            ("user_c".to_string(), "online", "busy"),
-            ("user_d".to_string(), "online", "free")
-        ]
-    );
-    assert_eq!(
-        contacts(&client_c, cx_c),
-        [
-            ("user_a".to_string(), "online", "busy"),
-            ("user_b".to_string(), "online", "free")
-        ]
-    );
-    assert_eq!(
-        contacts(&client_d, cx_d),
-        [("user_b".to_string(), "online", "free")]
-    );
-
-    active_call_a
-        .update(cx_a, |call, cx| {
-            call.invite(client_b.user_id().unwrap(), None, cx)
-        })
-        .await
-        .unwrap();
-    executor.run_until_parked();
-    assert_eq!(
-        contacts(&client_a, cx_a),
-        [
-            ("user_b".to_string(), "online", "busy"),
-            ("user_c".to_string(), "online", "busy")
-        ]
-    );
-    assert_eq!(
-        contacts(&client_b, cx_b),
-        [
-            ("user_a".to_string(), "online", "busy"),
-            ("user_c".to_string(), "online", "busy"),
-            ("user_d".to_string(), "online", "free")
-        ]
-    );
-    assert_eq!(
-        contacts(&client_c, cx_c),
-        [
-            ("user_a".to_string(), "online", "busy"),
-            ("user_b".to_string(), "online", "busy")
-        ]
-    );
-    assert_eq!(
-        contacts(&client_d, cx_d),
-        [("user_b".to_string(), "online", "busy")]
-    );
-
-    active_call_a
-        .update(cx_a, |call, cx| call.hang_up(cx))
-        .await
-        .unwrap();
-    executor.run_until_parked();
-    assert_eq!(
-        contacts(&client_a, cx_a),
-        [
-            ("user_b".to_string(), "online", "free"),
-            ("user_c".to_string(), "online", "free")
-        ]
-    );
-    assert_eq!(
-        contacts(&client_b, cx_b),
-        [
-            ("user_a".to_string(), "online", "free"),
-            ("user_c".to_string(), "online", "free"),
-            ("user_d".to_string(), "online", "free")
-        ]
-    );
-    assert_eq!(
-        contacts(&client_c, cx_c),
-        [
-            ("user_a".to_string(), "online", "free"),
-            ("user_b".to_string(), "online", "free")
-        ]
-    );
-    assert_eq!(
-        contacts(&client_d, cx_d),
-        [("user_b".to_string(), "online", "free")]
-    );
-
-    active_call_a
-        .update(cx_a, |call, cx| {
-            call.invite(client_b.user_id().unwrap(), None, cx)
-        })
-        .await
-        .unwrap();
-    executor.run_until_parked();
-    assert_eq!(
-        contacts(&client_a, cx_a),
-        [
-            ("user_b".to_string(), "online", "busy"),
-            ("user_c".to_string(), "online", "free")
-        ]
-    );
-    assert_eq!(
-        contacts(&client_b, cx_b),
-        [
-            ("user_a".to_string(), "online", "busy"),
-            ("user_c".to_string(), "online", "free"),
-            ("user_d".to_string(), "online", "free")
-        ]
-    );
-    assert_eq!(
-        contacts(&client_c, cx_c),
-        [
-            ("user_a".to_string(), "online", "busy"),
-            ("user_b".to_string(), "online", "busy")
-        ]
-    );
-    assert_eq!(
-        contacts(&client_d, cx_d),
-        [("user_b".to_string(), "online", "busy")]
-    );
-
-    server.forbid_connections();
-    server.disconnect_client(client_a.peer_id().unwrap());
-    executor.advance_clock(RECEIVE_TIMEOUT + RECONNECT_TIMEOUT);
-    assert_eq!(contacts(&client_a, cx_a), []);
-    assert_eq!(
-        contacts(&client_b, cx_b),
-        [
-            ("user_a".to_string(), "offline", "free"),
-            ("user_c".to_string(), "online", "free"),
-            ("user_d".to_string(), "online", "free")
-        ]
-    );
-    assert_eq!(
-        contacts(&client_c, cx_c),
-        [
-            ("user_a".to_string(), "offline", "free"),
-            ("user_b".to_string(), "online", "free")
-        ]
-    );
-    assert_eq!(
-        contacts(&client_d, cx_d),
-        [("user_b".to_string(), "online", "free")]
-    );
-
-    // Test removing a contact
-    client_b
-        .user_store()
-        .update(cx_b, |store, cx| {
-            store.remove_contact(client_c.user_id().unwrap(), cx)
-        })
-        .await
-        .unwrap();
-    executor.run_until_parked();
-    assert_eq!(
-        contacts(&client_b, cx_b),
-        [
-            ("user_a".to_string(), "offline", "free"),
-            ("user_d".to_string(), "online", "free")
-        ]
-    );
-    assert_eq!(
-        contacts(&client_c, cx_c),
-        [("user_a".to_string(), "offline", "free"),]
-    );
-
-    fn contacts(
-        client: &TestClient,
-        cx: &TestAppContext,
-    ) -> Vec<(String, &'static str, &'static str)> {
-        client.user_store().read_with(cx, |store, _| {
-            store
-                .contacts()
-                .iter()
-                .map(|contact| {
-                    (
-                        contact.user.github_login.clone().to_string(),
-                        if contact.online { "online" } else { "offline" },
-                        if contact.busy { "busy" } else { "free" },
-                    )
-                })
-                .collect()
-        })
-    }
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_contact_requests(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_a2: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-    cx_b2: &mut TestAppContext,
-    cx_c: &mut TestAppContext,
-    cx_c2: &mut TestAppContext,
-) {
-    // Connect to a server as 3 clients.
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_a2 = server.create_client(cx_a2, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    let client_b2 = server.create_client(cx_b2, "user_b").await;
-    let client_c = server.create_client(cx_c, "user_c").await;
-    let client_c2 = server.create_client(cx_c2, "user_c").await;
-
-    assert_eq!(client_a.user_id().unwrap(), client_a2.user_id().unwrap());
-    assert_eq!(client_b.user_id().unwrap(), client_b2.user_id().unwrap());
-    assert_eq!(client_c.user_id().unwrap(), client_c2.user_id().unwrap());
-
-    // User A and User C request that user B become their contact.
-    client_a
-        .user_store()
-        .update(cx_a, |store, cx| {
-            store.request_contact(client_b.user_id().unwrap(), cx)
-        })
-        .await
-        .unwrap();
-    client_c
-        .user_store()
-        .update(cx_c, |store, cx| {
-            store.request_contact(client_b.user_id().unwrap(), cx)
-        })
-        .await
-        .unwrap();
-    executor.run_until_parked();
-
-    // All users see the pending request appear in all their clients.
-    assert_eq!(
-        client_a.summarize_contacts(cx_a).outgoing_requests,
-        &["user_b"]
-    );
-    assert_eq!(
-        client_a2.summarize_contacts(cx_a2).outgoing_requests,
-        &["user_b"]
-    );
-    assert_eq!(
-        client_b.summarize_contacts(cx_b).incoming_requests,
-        &["user_a", "user_c"]
-    );
-    assert_eq!(
-        client_b2.summarize_contacts(cx_b2).incoming_requests,
-        &["user_a", "user_c"]
-    );
-    assert_eq!(
-        client_c.summarize_contacts(cx_c).outgoing_requests,
-        &["user_b"]
-    );
-    assert_eq!(
-        client_c2.summarize_contacts(cx_c2).outgoing_requests,
-        &["user_b"]
-    );
-
-    // Contact requests are present upon connecting (tested here via disconnect/reconnect)
-    disconnect_and_reconnect(&client_a, cx_a).await;
-    disconnect_and_reconnect(&client_b, cx_b).await;
-    disconnect_and_reconnect(&client_c, cx_c).await;
-    executor.run_until_parked();
-    assert_eq!(
-        client_a.summarize_contacts(cx_a).outgoing_requests,
-        &["user_b"]
-    );
-    assert_eq!(
-        client_b.summarize_contacts(cx_b).incoming_requests,
-        &["user_a", "user_c"]
-    );
-    assert_eq!(
-        client_c.summarize_contacts(cx_c).outgoing_requests,
-        &["user_b"]
-    );
-
-    // User B accepts the request from user A.
-    client_b
-        .user_store()
-        .update(cx_b, |store, cx| {
-            store.respond_to_contact_request(client_a.user_id().unwrap(), true, cx)
-        })
-        .await
-        .unwrap();
-
-    executor.run_until_parked();
-
-    // User B sees user A as their contact now in all client, and the incoming request from them is removed.
-    let contacts_b = client_b.summarize_contacts(cx_b);
-    assert_eq!(contacts_b.current, &["user_a"]);
-    assert_eq!(contacts_b.incoming_requests, &["user_c"]);
-    let contacts_b2 = client_b2.summarize_contacts(cx_b2);
-    assert_eq!(contacts_b2.current, &["user_a"]);
-    assert_eq!(contacts_b2.incoming_requests, &["user_c"]);
-
-    // User A sees user B as their contact now in all clients, and the outgoing request to them is removed.
-    let contacts_a = client_a.summarize_contacts(cx_a);
-    assert_eq!(contacts_a.current, &["user_b"]);
-    assert!(contacts_a.outgoing_requests.is_empty());
-    let contacts_a2 = client_a2.summarize_contacts(cx_a2);
-    assert_eq!(contacts_a2.current, &["user_b"]);
-    assert!(contacts_a2.outgoing_requests.is_empty());
-
-    // Contacts are present upon connecting (tested here via disconnect/reconnect)
-    disconnect_and_reconnect(&client_a, cx_a).await;
-    disconnect_and_reconnect(&client_b, cx_b).await;
-    disconnect_and_reconnect(&client_c, cx_c).await;
-    executor.run_until_parked();
-    assert_eq!(client_a.summarize_contacts(cx_a).current, &["user_b"]);
-    assert_eq!(client_b.summarize_contacts(cx_b).current, &["user_a"]);
-    assert_eq!(
-        client_b.summarize_contacts(cx_b).incoming_requests,
-        &["user_c"]
-    );
-    assert!(client_c.summarize_contacts(cx_c).current.is_empty());
-    assert_eq!(
-        client_c.summarize_contacts(cx_c).outgoing_requests,
-        &["user_b"]
-    );
-
-    // User B rejects the request from user C.
-    client_b
-        .user_store()
-        .update(cx_b, |store, cx| {
-            store.respond_to_contact_request(client_c.user_id().unwrap(), false, cx)
-        })
-        .await
-        .unwrap();
-
-    executor.run_until_parked();
-
-    // User B doesn't see user C as their contact, and the incoming request from them is removed.
-    let contacts_b = client_b.summarize_contacts(cx_b);
-    assert_eq!(contacts_b.current, &["user_a"]);
-    assert!(contacts_b.incoming_requests.is_empty());
-    let contacts_b2 = client_b2.summarize_contacts(cx_b2);
-    assert_eq!(contacts_b2.current, &["user_a"]);
-    assert!(contacts_b2.incoming_requests.is_empty());
-
-    // User C doesn't see user B as their contact, and the outgoing request to them is removed.
-    let contacts_c = client_c.summarize_contacts(cx_c);
-    assert!(contacts_c.current.is_empty());
-    assert!(contacts_c.outgoing_requests.is_empty());
-    let contacts_c2 = client_c2.summarize_contacts(cx_c2);
-    assert!(contacts_c2.current.is_empty());
-    assert!(contacts_c2.outgoing_requests.is_empty());
-
-    // Incoming/outgoing requests are not present upon connecting (tested here via disconnect/reconnect)
-    disconnect_and_reconnect(&client_a, cx_a).await;
-    disconnect_and_reconnect(&client_b, cx_b).await;
-    disconnect_and_reconnect(&client_c, cx_c).await;
-    executor.run_until_parked();
-    assert_eq!(client_a.summarize_contacts(cx_a).current, &["user_b"]);
-    assert_eq!(client_b.summarize_contacts(cx_b).current, &["user_a"]);
-    assert!(
-        client_b
-            .summarize_contacts(cx_b)
-            .incoming_requests
-            .is_empty()
-    );
-    assert!(client_c.summarize_contacts(cx_c).current.is_empty());
-    assert!(
-        client_c
-            .summarize_contacts(cx_c)
-            .outgoing_requests
-            .is_empty()
-    );
-
-    async fn disconnect_and_reconnect(client: &TestClient, cx: &mut TestAppContext) {
-        client.disconnect(&cx.to_async());
-        client.clear_contacts(cx).await;
-        client
-            .connect(false, &cx.to_async())
-            .await
-            .into_response()
-            .unwrap();
-    }
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_join_call_after_screen_was_shared(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .make_contacts(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-
-    let active_call_a = cx_a.read(ActiveCall::global);
-    let active_call_b = cx_b.read(ActiveCall::global);
-
-    // Call users B and C from client A.
-    active_call_a
-        .update(cx_a, |call, cx| {
-            call.invite(client_b.user_id().unwrap(), None, cx)
-        })
-        .await
-        .unwrap();
-
-    let room_a = active_call_a.read_with(cx_a, |call, _| call.room().unwrap().clone());
-    executor.run_until_parked();
-    assert_eq!(
-        room_participants(&room_a, cx_a),
-        RoomParticipants {
-            remote: Default::default(),
-            pending: vec!["user_b".to_string()]
-        }
-    );
-
-    // User B receives the call.
-
-    let mut incoming_call_b = active_call_b.read_with(cx_b, |call, _| call.incoming());
-    let call_b = incoming_call_b.next().await.unwrap().unwrap();
-    assert_eq!(call_b.calling_user.github_login, "user_a");
-
-    // User A shares their screen
-    let display = gpui::TestScreenCaptureSource::new();
-    cx_a.set_screen_capture_sources(vec![display]);
-    let screen_a = cx_a
-        .update(|cx| cx.screen_capture_sources())
-        .await
-        .unwrap()
-        .unwrap()
-        .into_iter()
-        .next()
-        .unwrap();
-
-    active_call_a
-        .update(cx_a, |call, cx| {
-            call.room()
-                .unwrap()
-                .update(cx, |room, cx| room.share_screen(screen_a, cx))
-        })
-        .await
-        .unwrap();
-
-    client_b.user_store().update(cx_b, |user_store, _| {
-        user_store.clear_cache();
-    });
-
-    // User B joins the room
-    active_call_b
-        .update(cx_b, |call, cx| call.accept_incoming(cx))
-        .await
-        .unwrap();
-
-    let room_b = active_call_b.read_with(cx_b, |call, _| call.room().unwrap().clone());
-    assert!(incoming_call_b.next().await.unwrap().is_none());
-
-    executor.run_until_parked();
-    assert_eq!(
-        room_participants(&room_a, cx_a),
-        RoomParticipants {
-            remote: vec!["user_b".to_string()],
-            pending: vec![],
-        }
-    );
-    assert_eq!(
-        room_participants(&room_b, cx_b),
-        RoomParticipants {
-            remote: vec!["user_a".to_string()],
-            pending: vec![],
-        }
-    );
-
-    // Ensure User B sees User A's screenshare.
-
-    room_b.read_with(cx_b, |room, _| {
-        assert_eq!(
-            room.remote_participants()
-                .get(&client_a.user_id().unwrap())
-                .unwrap()
-                .video_tracks
-                .len(),
-            1
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_right_click_menu_behind_collab_panel(cx: &mut TestAppContext) {
-    let mut server = TestServer::start(cx.executor().clone()).await;
-    let client_a = server.create_client(cx, "user_a").await;
-    let (_workspace_a, cx) = client_a.build_test_workspace(cx).await;
-
-    cx.simulate_resize(size(px(300.), px(300.)));
-
-    cx.simulate_keystrokes("cmd-n cmd-n cmd-n");
-    cx.update(|window, _cx| window.refresh());
-
-    let new_tab_button_bounds = cx.debug_bounds("ICON-Plus").unwrap();
-
-    cx.simulate_event(MouseDownEvent {
-        button: MouseButton::Right,
-        position: new_tab_button_bounds.center(),
-        modifiers: Modifiers::default(),
-        click_count: 1,
-        first_mouse: false,
-    });
-
-    // regression test that the right click menu for tabs does not open.
-    assert!(cx.debug_bounds("MENU_ITEM-Close").is_none());
-
-    let tab_bounds = cx.debug_bounds("TAB-1").unwrap();
-    cx.simulate_event(MouseDownEvent {
-        button: MouseButton::Right,
-        position: tab_bounds.center(),
-        modifiers: Modifiers::default(),
-        click_count: 1,
-        first_mouse: false,
-    });
-    assert!(cx.debug_bounds("MENU_ITEM-Close").is_some());
-}
-
-#[gpui::test]
-async fn test_pane_split_left(cx: &mut TestAppContext) {
-    let (_, client) = TestServer::start1(cx).await;
-    let (workspace, cx) = client.build_test_workspace(cx).await;
-
-    cx.simulate_keystrokes("cmd-n");
-    workspace.update(cx, |workspace, cx| {
-        assert!(workspace.items(cx).collect::<Vec<_>>().len() == 1);
-    });
-    cx.simulate_keystrokes("cmd-k left");
-    workspace.update(cx, |workspace, cx| {
-        assert!(workspace.items(cx).collect::<Vec<_>>().len() == 2);
-    });
-    cx.simulate_keystrokes("cmd-k");
-    // Sleep past the historical timeout to ensure the multi-stroke binding
-    // still fires now that unambiguous prefixes no longer auto-expire.
-    cx.executor().advance_clock(Duration::from_secs(2));
-    cx.simulate_keystrokes("left");
-    workspace.update(cx, |workspace, cx| {
-        assert!(workspace.items(cx).collect::<Vec<_>>().len() == 3);
-    });
-}
-
-#[gpui::test]
-async fn test_join_after_restart(cx1: &mut TestAppContext, cx2: &mut TestAppContext) {
-    let (mut server, client) = TestServer::start1(cx1).await;
-    let channel1 = server.make_public_channel("channel1", &client, cx1).await;
-    let channel2 = server.make_public_channel("channel2", &client, cx1).await;
-
-    join_channel(channel1, &client, cx1).await.unwrap();
-    drop(client);
-
-    let client2 = server.create_client(cx2, "user_a").await;
-    join_channel(channel2, &client2, cx2).await.unwrap();
-}
-
-#[gpui::test]
-async fn test_preview_tabs(cx: &mut TestAppContext) {
-    let (_server, client) = TestServer::start1(cx).await;
-    let (workspace, cx) = client.build_test_workspace(cx).await;
-    let project = workspace.read_with(cx, |workspace, _| workspace.project().clone());
-
-    let worktree_id = project.update(cx, |project, cx| {
-        project.worktrees(cx).next().unwrap().read(cx).id()
-    });
-
-    let path_1 = ProjectPath {
-        worktree_id,
-        path: rel_path("1.txt").into(),
-    };
-    let path_2 = ProjectPath {
-        worktree_id,
-        path: rel_path("2.js").into(),
-    };
-    let path_3 = ProjectPath {
-        worktree_id,
-        path: rel_path("3.rs").into(),
-    };
-
-    let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-    let get_path = |pane: &Pane, idx: usize, cx: &App| {
-        pane.item_for_index(idx).unwrap().project_path(cx).unwrap()
-    };
-
-    // Opening item 3 as a "permanent" tab
-    workspace
-        .update_in(cx, |workspace, window, cx| {
-            workspace.open_path(path_3.clone(), None, false, window, cx)
-        })
-        .await
-        .unwrap();
-
-    pane.update(cx, |pane, cx| {
-        assert_eq!(pane.items_len(), 1);
-        assert_eq!(get_path(pane, 0, cx), path_3.clone());
-        assert_eq!(pane.preview_item_id(), None);
-
-        assert!(!pane.can_navigate_backward());
-        assert!(!pane.can_navigate_forward());
-    });
-
-    // Open item 1 as preview
-    workspace
-        .update_in(cx, |workspace, window, cx| {
-            workspace.open_path_preview(path_1.clone(), None, true, true, true, window, cx)
-        })
-        .await
-        .unwrap();
-
-    pane.update(cx, |pane, cx| {
-        assert_eq!(pane.items_len(), 2);
-        assert_eq!(get_path(pane, 0, cx), path_3.clone());
-        assert_eq!(get_path(pane, 1, cx), path_1.clone());
-        assert_eq!(
-            pane.preview_item_id(),
-            Some(pane.items().nth(1).unwrap().item_id())
-        );
-
-        assert!(pane.can_navigate_backward());
-        assert!(!pane.can_navigate_forward());
-    });
-
-    // Open item 2 as preview
-    workspace
-        .update_in(cx, |workspace, window, cx| {
-            workspace.open_path_preview(path_2.clone(), None, true, true, true, window, cx)
-        })
-        .await
-        .unwrap();
-
-    pane.update(cx, |pane, cx| {
-        assert_eq!(pane.items_len(), 2);
-        assert_eq!(get_path(pane, 0, cx), path_3.clone());
-        assert_eq!(get_path(pane, 1, cx), path_2.clone());
-        assert_eq!(
-            pane.preview_item_id(),
-            Some(pane.items().nth(1).unwrap().item_id())
-        );
-
-        assert!(pane.can_navigate_backward());
-        assert!(!pane.can_navigate_forward());
-    });
-
-    // Going back should show item 1 as preview
-    workspace
-        .update_in(cx, |workspace, window, cx| {
-            workspace.go_back(pane.downgrade(), window, cx)
-        })
-        .await
-        .unwrap();
-
-    pane.update(cx, |pane, cx| {
-        assert_eq!(pane.items_len(), 2);
-        assert_eq!(get_path(pane, 0, cx), path_3.clone());
-        assert_eq!(get_path(pane, 1, cx), path_1.clone());
-        assert_eq!(
-            pane.preview_item_id(),
-            Some(pane.items().nth(1).unwrap().item_id())
-        );
-
-        assert!(pane.can_navigate_backward());
-        assert!(pane.can_navigate_forward());
-    });
-
-    // Closing item 1
-    pane.update_in(cx, |pane, window, cx| {
-        pane.close_item_by_id(
-            pane.active_item().unwrap().item_id(),
-            workspace::SaveIntent::Skip,
-            window,
-            cx,
-        )
-    })
-    .await
-    .unwrap();
-
-    pane.update(cx, |pane, cx| {
-        assert_eq!(pane.items_len(), 1);
-        assert_eq!(get_path(pane, 0, cx), path_3.clone());
-        assert_eq!(pane.preview_item_id(), None);
-
-        assert!(pane.can_navigate_backward());
-        assert!(!pane.can_navigate_forward());
-    });
-
-    // Going back should show item 1 as preview
-    workspace
-        .update_in(cx, |workspace, window, cx| {
-            workspace.go_back(pane.downgrade(), window, cx)
-        })
-        .await
-        .unwrap();
-
-    pane.update(cx, |pane, cx| {
-        assert_eq!(pane.items_len(), 2);
-        assert_eq!(get_path(pane, 0, cx), path_3.clone());
-        assert_eq!(get_path(pane, 1, cx), path_1.clone());
-        assert_eq!(
-            pane.preview_item_id(),
-            Some(pane.items().nth(1).unwrap().item_id())
-        );
-
-        assert!(pane.can_navigate_backward());
-        assert!(pane.can_navigate_forward());
-    });
-
-    // Close permanent tab
-    pane.update_in(cx, |pane, window, cx| {
-        let id = pane.items().next().unwrap().item_id();
-        pane.close_item_by_id(id, workspace::SaveIntent::Skip, window, cx)
-    })
-    .await
-    .unwrap();
-
-    pane.update(cx, |pane, cx| {
-        assert_eq!(pane.items_len(), 1);
-        assert_eq!(get_path(pane, 0, cx), path_1.clone());
-        assert_eq!(
-            pane.preview_item_id(),
-            Some(pane.items().next().unwrap().item_id())
-        );
-
-        assert!(pane.can_navigate_backward());
-        assert!(pane.can_navigate_forward());
-    });
-
-    // Split pane to the right
-    pane.update(cx, |pane, cx| {
-        pane.split(workspace::SplitDirection::Right, cx);
-    });
-    cx.run_until_parked();
-    let right_pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-    pane.update(cx, |pane, cx| {
-        assert_eq!(pane.items_len(), 1);
-        assert_eq!(get_path(pane, 0, cx), path_1.clone());
-        assert_eq!(
-            pane.preview_item_id(),
-            Some(pane.items().next().unwrap().item_id())
-        );
-
-        assert!(pane.can_navigate_backward());
-        assert!(pane.can_navigate_forward());
-    });
-
-    right_pane.update(cx, |pane, cx| {
-        assert_eq!(pane.items_len(), 1);
-        assert_eq!(get_path(pane, 0, cx), path_1.clone());
-        assert_eq!(pane.preview_item_id(), None);
-
-        assert!(!pane.can_navigate_backward());
-        assert!(!pane.can_navigate_forward());
-    });
-
-    // Open item 2 as preview in right pane
-    workspace
-        .update_in(cx, |workspace, window, cx| {
-            workspace.open_path_preview(path_2.clone(), None, true, true, true, window, cx)
-        })
-        .await
-        .unwrap();
-
-    pane.update(cx, |pane, cx| {
-        assert_eq!(pane.items_len(), 1);
-        assert_eq!(get_path(pane, 0, cx), path_1.clone());
-        assert_eq!(
-            pane.preview_item_id(),
-            Some(pane.items().next().unwrap().item_id())
-        );
-
-        assert!(pane.can_navigate_backward());
-        assert!(pane.can_navigate_forward());
-    });
-
-    right_pane.update(cx, |pane, cx| {
-        assert_eq!(pane.items_len(), 2);
-        assert_eq!(get_path(pane, 0, cx), path_1.clone());
-        assert_eq!(get_path(pane, 1, cx), path_2.clone());
-        assert_eq!(
-            pane.preview_item_id(),
-            Some(pane.items().nth(1).unwrap().item_id())
-        );
-
-        assert!(pane.can_navigate_backward());
-        assert!(!pane.can_navigate_forward());
-    });
-
-    // Focus left pane
-    workspace.update_in(cx, |workspace, window, cx| {
-        workspace.activate_pane_in_direction(workspace::SplitDirection::Left, window, cx)
-    });
-
-    // Open item 2 as preview in left pane
-    workspace
-        .update_in(cx, |workspace, window, cx| {
-            workspace.open_path_preview(path_2.clone(), None, true, true, true, window, cx)
-        })
-        .await
-        .unwrap();
-
-    pane.update(cx, |pane, cx| {
-        assert_eq!(pane.items_len(), 1);
-        assert_eq!(get_path(pane, 0, cx), path_2.clone());
-        assert_eq!(
-            pane.preview_item_id(),
-            Some(pane.items().next().unwrap().item_id())
-        );
-
-        assert!(pane.can_navigate_backward());
-        assert!(!pane.can_navigate_forward());
-    });
-
-    right_pane.update(cx, |pane, cx| {
-        assert_eq!(pane.items_len(), 2);
-        assert_eq!(get_path(pane, 0, cx), path_1.clone());
-        assert_eq!(get_path(pane, 1, cx), path_2.clone());
-        assert_eq!(
-            pane.preview_item_id(),
-            Some(pane.items().nth(1).unwrap().item_id())
-        );
-
-        assert!(pane.can_navigate_backward());
-        assert!(!pane.can_navigate_forward());
-    });
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_context_collaboration_with_reconnect(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-
-    client_a.fs().insert_tree("/a", Default::default()).await;
-    let (project_a, _) = client_a.build_local_project("/a", cx_a).await;
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-
-    // Client A sees that a guest has joined.
-    executor.run_until_parked();
-
-    project_a.read_with(cx_a, |project, _| {
-        assert_eq!(project.collaborators().len(), 1);
-    });
-    project_b.read_with(cx_b, |project, _| {
-        assert_eq!(project.collaborators().len(), 1);
-    });
-
-    let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
-    let text_thread_store_a = cx_a
-        .update(|cx| {
-            TextThreadStore::new(
-                project_a.clone(),
-                prompt_builder.clone(),
-                Arc::new(SlashCommandWorkingSet::default()),
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-    let text_thread_store_b = cx_b
-        .update(|cx| {
-            TextThreadStore::new(
-                project_b.clone(),
-                prompt_builder.clone(),
-                Arc::new(SlashCommandWorkingSet::default()),
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-
-    // Client A creates a new chats.
-    let text_thread_a = text_thread_store_a.update(cx_a, |store, cx| store.create(cx));
-    executor.run_until_parked();
-
-    // Client B retrieves host's contexts and joins one.
-    let text_thread_b = text_thread_store_b
-        .update(cx_b, |store, cx| {
-            let host_text_threads = store.host_text_threads().collect::<Vec<_>>();
-            assert_eq!(host_text_threads.len(), 1);
-            store.open_remote(host_text_threads[0].id.clone(), cx)
-        })
-        .await
-        .unwrap();
-
-    // Host and guest make changes
-    text_thread_a.update(cx_a, |text_thread, cx| {
-        text_thread.buffer().update(cx, |buffer, cx| {
-            buffer.edit([(0..0, "Host change\n")], None, cx)
-        })
-    });
-    text_thread_b.update(cx_b, |text_thread, cx| {
-        text_thread.buffer().update(cx, |buffer, cx| {
-            buffer.edit([(0..0, "Guest change\n")], None, cx)
-        })
-    });
-    executor.run_until_parked();
-    assert_eq!(
-        text_thread_a.read_with(cx_a, |text_thread, cx| text_thread.buffer().read(cx).text()),
-        "Guest change\nHost change\n"
-    );
-    assert_eq!(
-        text_thread_b.read_with(cx_b, |text_thread, cx| text_thread.buffer().read(cx).text()),
-        "Guest change\nHost change\n"
-    );
-
-    // Disconnect client A and make some changes while disconnected.
-    server.disconnect_client(client_a.peer_id().unwrap());
-    server.forbid_connections();
-    text_thread_a.update(cx_a, |text_thread, cx| {
-        text_thread.buffer().update(cx, |buffer, cx| {
-            buffer.edit([(0..0, "Host offline change\n")], None, cx)
-        })
-    });
-    text_thread_b.update(cx_b, |text_thread, cx| {
-        text_thread.buffer().update(cx, |buffer, cx| {
-            buffer.edit([(0..0, "Guest offline change\n")], None, cx)
-        })
-    });
-    executor.run_until_parked();
-    assert_eq!(
-        text_thread_a.read_with(cx_a, |text_thread, cx| text_thread.buffer().read(cx).text()),
-        "Host offline change\nGuest change\nHost change\n"
-    );
-    assert_eq!(
-        text_thread_b.read_with(cx_b, |text_thread, cx| text_thread.buffer().read(cx).text()),
-        "Guest offline change\nGuest change\nHost change\n"
-    );
-
-    // Allow client A to reconnect and verify that contexts converge.
-    server.allow_connections();
-    executor.advance_clock(RECEIVE_TIMEOUT);
-    assert_eq!(
-        text_thread_a.read_with(cx_a, |text_thread, cx| text_thread.buffer().read(cx).text()),
-        "Guest offline change\nHost offline change\nGuest change\nHost change\n"
-    );
-    assert_eq!(
-        text_thread_b.read_with(cx_b, |text_thread, cx| text_thread.buffer().read(cx).text()),
-        "Guest offline change\nHost offline change\nGuest change\nHost change\n"
-    );
-
-    // Client A disconnects without being able to reconnect. Context B becomes readonly.
-    server.forbid_connections();
-    server.disconnect_client(client_a.peer_id().unwrap());
-    executor.advance_clock(RECEIVE_TIMEOUT + RECONNECT_TIMEOUT);
-    text_thread_b.read_with(cx_b, |text_thread, cx| {
-        assert!(text_thread.buffer().read(cx).read_only());
-    });
-}
-
-#[gpui::test]
-async fn test_remote_git_branches(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-
-    client_a
-        .fs()
-        .insert_tree("/project", serde_json::json!({ ".git":{} }))
-        .await;
-    let branches = ["main", "dev", "feature-1"];
-    client_a
-        .fs()
-        .insert_branches(Path::new("/project/.git"), &branches);
-    let branches_set = branches
-        .into_iter()
-        .map(ToString::to_string)
-        .collect::<HashSet<_>>();
-
-    let (project_a, _) = client_a.build_local_project("/project", cx_a).await;
-
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-
-    // Client A sees that a guest has joined and the repo has been populated
-    executor.run_until_parked();
-
-    let repo_b = cx_b.update(|cx| project_b.read(cx).active_repository(cx).unwrap());
-
-    let branches_b = cx_b
-        .update(|cx| repo_b.update(cx, |repository, _| repository.branches()))
-        .await
-        .unwrap()
-        .unwrap();
-
-    let new_branch = branches[2];
-
-    let branches_b = branches_b
-        .into_iter()
-        .map(|branch| branch.name().to_string())
-        .collect::<HashSet<_>>();
-
-    assert_eq!(branches_b, branches_set);
-
-    cx_b.update(|cx| {
-        repo_b.update(cx, |repository, _cx| {
-            repository.change_branch(new_branch.to_string())
-        })
-    })
-    .await
-    .unwrap()
-    .unwrap();
-
-    executor.run_until_parked();
-
-    let host_branch = cx_a.update(|cx| {
-        project_a.update(cx, |project, cx| {
-            project
-                .repositories(cx)
-                .values()
-                .next()
-                .unwrap()
-                .read(cx)
-                .branch
-                .as_ref()
-                .unwrap()
-                .clone()
-        })
-    });
-
-    assert_eq!(host_branch.name(), branches[2]);
-
-    // Also try creating a new branch
-    cx_b.update(|cx| {
-        repo_b.update(cx, |repository, _cx| {
-            repository.create_branch("totally-new-branch".to_string(), None)
-        })
-    })
-    .await
-    .unwrap()
-    .unwrap();
-
-    cx_b.update(|cx| {
-        repo_b.update(cx, |repository, _cx| {
-            repository.change_branch("totally-new-branch".to_string())
-        })
-    })
-    .await
-    .unwrap()
-    .unwrap();
-
-    executor.run_until_parked();
-
-    let host_branch = cx_a.update(|cx| {
-        project_a.update(cx, |project, cx| {
-            project
-                .repositories(cx)
-                .values()
-                .next()
-                .unwrap()
-                .read(cx)
-                .branch
-                .as_ref()
-                .unwrap()
-                .clone()
-        })
-    });
-
-    assert_eq!(host_branch.name(), "totally-new-branch");
-}
diff --git a/crates/collab/src/tests/notification_tests.rs b/crates/collab/src/tests/notification_tests.rs
deleted file mode 100644
index 9bf906694e..0000000000
--- a/crates/collab/src/tests/notification_tests.rs
+++ /dev/null
@@ -1,164 +0,0 @@
-use std::sync::Arc;
-
-use gpui::{BackgroundExecutor, TestAppContext};
-use notifications::NotificationEvent;
-use parking_lot::Mutex;
-use pretty_assertions::assert_eq;
-use rpc::{Notification, proto};
-
-use crate::tests::TestServer;
-
-#[gpui::test]
-async fn test_notifications(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-
-    // Wait for authentication/connection to Collab to be established.
-    executor.run_until_parked();
-
-    let notification_events_a = Arc::new(Mutex::new(Vec::new()));
-    let notification_events_b = Arc::new(Mutex::new(Vec::new()));
-    client_a.notification_store().update(cx_a, |_, cx| {
-        let events = notification_events_a.clone();
-        cx.subscribe(&cx.entity(), move |_, _, event, _| {
-            events.lock().push(event.clone());
-        })
-        .detach()
-    });
-    client_b.notification_store().update(cx_b, |_, cx| {
-        let events = notification_events_b.clone();
-        cx.subscribe(&cx.entity(), move |_, _, event, _| {
-            events.lock().push(event.clone());
-        })
-        .detach()
-    });
-
-    // Client A sends a contact request to client B.
-    client_a
-        .user_store()
-        .update(cx_a, |store, cx| store.request_contact(client_b.id(), cx))
-        .await
-        .unwrap();
-
-    // Client B receives a contact request notification and responds to the
-    // request, accepting it.
-    executor.run_until_parked();
-    client_b.notification_store().update(cx_b, |store, cx| {
-        assert_eq!(store.notification_count(), 1);
-        assert_eq!(store.unread_notification_count(), 1);
-
-        let entry = store.notification_at(0).unwrap();
-        assert_eq!(
-            entry.notification,
-            Notification::ContactRequest {
-                sender_id: client_a.id()
-            }
-        );
-        assert!(!entry.is_read);
-        assert_eq!(
-            &notification_events_b.lock()[0..],
-            &[
-                NotificationEvent::NewNotification {
-                    entry: entry.clone(),
-                },
-                NotificationEvent::NotificationsUpdated {
-                    old_range: 0..0,
-                    new_count: 1
-                }
-            ]
-        );
-
-        store.respond_to_notification(entry.notification.clone(), true, cx);
-    });
-
-    // Client B sees the notification is now read, and that they responded.
-    executor.run_until_parked();
-    client_b.notification_store().read_with(cx_b, |store, _| {
-        assert_eq!(store.notification_count(), 1);
-        assert_eq!(store.unread_notification_count(), 0);
-
-        let entry = store.notification_at(0).unwrap();
-        assert!(entry.is_read);
-        assert_eq!(entry.response, Some(true));
-        assert_eq!(
-            &notification_events_b.lock()[2..],
-            &[
-                NotificationEvent::NotificationRead {
-                    entry: entry.clone(),
-                },
-                NotificationEvent::NotificationsUpdated {
-                    old_range: 0..1,
-                    new_count: 1
-                }
-            ]
-        );
-    });
-
-    // Client A receives a notification that client B accepted their request.
-    client_a.notification_store().read_with(cx_a, |store, _| {
-        assert_eq!(store.notification_count(), 1);
-        assert_eq!(store.unread_notification_count(), 1);
-
-        let entry = store.notification_at(0).unwrap();
-        assert_eq!(
-            entry.notification,
-            Notification::ContactRequestAccepted {
-                responder_id: client_b.id()
-            }
-        );
-        assert!(!entry.is_read);
-    });
-
-    // Client A creates a channel and invites client B to be a member.
-    let channel_id = client_a
-        .channel_store()
-        .update(cx_a, |store, cx| {
-            store.create_channel("the-channel", None, cx)
-        })
-        .await
-        .unwrap();
-    client_a
-        .channel_store()
-        .update(cx_a, |store, cx| {
-            store.invite_member(channel_id, client_b.id(), proto::ChannelRole::Member, cx)
-        })
-        .await
-        .unwrap();
-
-    // Client B receives a channel invitation notification and responds to the
-    // invitation, accepting it.
-    executor.run_until_parked();
-    client_b.notification_store().update(cx_b, |store, cx| {
-        assert_eq!(store.notification_count(), 2);
-        assert_eq!(store.unread_notification_count(), 1);
-
-        let entry = store.notification_at(0).unwrap();
-        assert_eq!(
-            entry.notification,
-            Notification::ChannelInvitation {
-                channel_id: channel_id.0,
-                channel_name: "the-channel".to_string(),
-                inviter_id: client_a.id()
-            }
-        );
-        assert!(!entry.is_read);
-
-        store.respond_to_notification(entry.notification.clone(), true, cx);
-    });
-
-    // Client B sees the notification is now read, and that they responded.
-    executor.run_until_parked();
-    client_b.notification_store().read_with(cx_b, |store, _| {
-        assert_eq!(store.notification_count(), 2);
-        assert_eq!(store.unread_notification_count(), 0);
-
-        let entry = store.notification_at(0).unwrap();
-        assert!(entry.is_read);
-        assert_eq!(entry.response, Some(true));
-    });
-}
diff --git a/crates/collab/src/tests/random_channel_buffer_tests.rs b/crates/collab/src/tests/random_channel_buffer_tests.rs
deleted file mode 100644
index cd4a575bb2..0000000000
--- a/crates/collab/src/tests/random_channel_buffer_tests.rs
+++ /dev/null
@@ -1,288 +0,0 @@
-use crate::db::ChannelRole;
-
-use super::{RandomizedTest, TestClient, TestError, TestServer, UserTestPlan, run_randomized_test};
-use anyhow::Result;
-use async_trait::async_trait;
-use gpui::{BackgroundExecutor, SharedString, TestAppContext};
-use rand::prelude::*;
-use serde::{Deserialize, Serialize};
-use std::{
-    ops::{Deref, DerefMut, Range},
-    rc::Rc,
-    sync::Arc,
-};
-use text::Bias;
-
-#[gpui::test(
-    iterations = 100,
-    on_failure = "crate::tests::save_randomized_test_plan"
-)]
-async fn test_random_channel_buffers(
-    cx: &mut TestAppContext,
-    executor: BackgroundExecutor,
-    rng: StdRng,
-) {
-    run_randomized_test::<RandomChannelBufferTest>(cx, executor, rng).await;
-}
-
-struct RandomChannelBufferTest;
-
-#[derive(Clone, Serialize, Deserialize)]
-enum ChannelBufferOperation {
-    JoinChannelNotes {
-        channel_name: SharedString,
-    },
-    LeaveChannelNotes {
-        channel_name: SharedString,
-    },
-    EditChannelNotes {
-        channel_name: SharedString,
-        edits: Vec<(Range<usize>, Arc<str>)>,
-    },
-    Noop,
-}
-
-const CHANNEL_COUNT: usize = 3;
-
-#[async_trait(?Send)]
-impl RandomizedTest for RandomChannelBufferTest {
-    type Operation = ChannelBufferOperation;
-
-    async fn initialize(server: &mut TestServer, users: &[UserTestPlan]) {
-        let db = &server.app_state.db;
-        for ix in 0..CHANNEL_COUNT {
-            let id = db
-                .create_root_channel(&format!("channel-{ix}"), users[0].user_id)
-                .await
-                .unwrap();
-            for user in &users[1..] {
-                db.invite_channel_member(id, user.user_id, users[0].user_id, ChannelRole::Member)
-                    .await
-                    .unwrap();
-                db.respond_to_channel_invite(id, user.user_id, true)
-                    .await
-                    .unwrap();
-            }
-        }
-    }
-
-    fn generate_operation(
-        client: &TestClient,
-        rng: &mut StdRng,
-        _: &mut UserTestPlan,
-        cx: &TestAppContext,
-    ) -> ChannelBufferOperation {
-        let channel_store = client.channel_store().clone();
-        let mut channel_buffers = client.channel_buffers();
-
-        // When signed out, we can't do anything unless a channel buffer is
-        // already open.
-        if channel_buffers.deref_mut().is_empty()
-            && channel_store.read_with(cx, |store, _| store.channel_count() == 0)
-        {
-            return ChannelBufferOperation::Noop;
-        }
-
-        loop {
-            match rng.random_range(0..100_u32) {
-                0..=29 => {
-                    let channel_name = client.channel_store().read_with(cx, |store, cx| {
-                        store.ordered_channels().find_map(|(_, channel)| {
-                            if store.has_open_channel_buffer(channel.id, cx) {
-                                None
-                            } else {
-                                Some(channel.name.clone())
-                            }
-                        })
-                    });
-                    if let Some(channel_name) = channel_name {
-                        break ChannelBufferOperation::JoinChannelNotes { channel_name };
-                    }
-                }
-
-                30..=40 => {
-                    if let Some(buffer) = channel_buffers.deref().iter().choose(rng) {
-                        let channel_name =
-                            buffer.read_with(cx, |b, cx| b.channel(cx).unwrap().name.clone());
-                        break ChannelBufferOperation::LeaveChannelNotes { channel_name };
-                    }
-                }
-
-                _ => {
-                    if let Some(buffer) = channel_buffers.deref().iter().choose(rng) {
-                        break buffer.read_with(cx, |b, cx| {
-                            let channel_name = b.channel(cx).unwrap().name.clone();
-                            let edits = b
-                                .buffer()
-                                .read_with(cx, |buffer, _| buffer.get_random_edits(rng, 3));
-                            ChannelBufferOperation::EditChannelNotes {
-                                channel_name,
-                                edits,
-                            }
-                        });
-                    }
-                }
-            }
-        }
-    }
-
-    async fn apply_operation(
-        client: &TestClient,
-        operation: ChannelBufferOperation,
-        cx: &mut TestAppContext,
-    ) -> Result<(), TestError> {
-        match operation {
-            ChannelBufferOperation::JoinChannelNotes { channel_name } => {
-                let buffer = client.channel_store().update(cx, |store, cx| {
-                    let channel_id = store
-                        .ordered_channels()
-                        .find(|(_, c)| c.name == channel_name)
-                        .unwrap()
-                        .1
-                        .id;
-                    if store.has_open_channel_buffer(channel_id, cx) {
-                        Err(TestError::Inapplicable)
-                    } else {
-                        Ok(store.open_channel_buffer(channel_id, cx))
-                    }
-                })?;
-
-                log::info!(
-                    "{}: opening notes for channel {channel_name}",
-                    client.username
-                );
-                client.channel_buffers().deref_mut().insert(buffer.await?);
-            }
-
-            ChannelBufferOperation::LeaveChannelNotes { channel_name } => {
-                let buffer = cx.update(|cx| {
-                    let mut left_buffer = Err(TestError::Inapplicable);
-                    client.channel_buffers().deref_mut().retain(|buffer| {
-                        if buffer.read(cx).channel(cx).unwrap().name == channel_name {
-                            left_buffer = Ok(buffer.clone());
-                            false
-                        } else {
-                            true
-                        }
-                    });
-                    left_buffer
-                })?;
-
-                log::info!(
-                    "{}: closing notes for channel {channel_name}",
-                    client.username
-                );
-                cx.update(|_| drop(buffer));
-            }
-
-            ChannelBufferOperation::EditChannelNotes {
-                channel_name,
-                edits,
-            } => {
-                let channel_buffer = cx
-                    .read(|cx| {
-                        client
-                            .channel_buffers()
-                            .deref()
-                            .iter()
-                            .find(|buffer| {
-                                buffer.read(cx).channel(cx).unwrap().name == channel_name
-                            })
-                            .cloned()
-                    })
-                    .ok_or_else(|| TestError::Inapplicable)?;
-
-                log::info!(
-                    "{}: editing notes for channel {channel_name} with {:?}",
-                    client.username,
-                    edits
-                );
-
-                channel_buffer.update(cx, |buffer, cx| {
-                    let buffer = buffer.buffer();
-                    buffer.update(cx, |buffer, cx| {
-                        let snapshot = buffer.snapshot();
-                        buffer.edit(
-                            edits.into_iter().map(|(range, text)| {
-                                let start = snapshot.clip_offset(range.start, Bias::Left);
-                                let end = snapshot.clip_offset(range.end, Bias::Right);
-                                (start..end, text)
-                            }),
-                            None,
-                            cx,
-                        );
-                    });
-                });
-            }
-
-            ChannelBufferOperation::Noop => Err(TestError::Inapplicable)?,
-        }
-        Ok(())
-    }
-
-    async fn on_quiesce(server: &mut TestServer, clients: &mut [(Rc<TestClient>, TestAppContext)]) {
-        let channels = server.app_state.db.all_channels().await.unwrap();
-
-        for (client, client_cx) in clients.iter_mut() {
-            client_cx.update(|cx| {
-                client
-                    .channel_buffers()
-                    .deref_mut()
-                    .retain(|b| b.read(cx).is_connected());
-            });
-        }
-
-        for (channel_id, channel_name) in channels {
-            let mut prev_text: Option<(u64, String)> = None;
-
-            let mut collaborator_user_ids = server
-                .app_state
-                .db
-                .get_channel_buffer_collaborators(channel_id)
-                .await
-                .unwrap()
-                .into_iter()
-                .map(|id| id.to_proto())
-                .collect::<Vec<_>>();
-            collaborator_user_ids.sort();
-
-            for (client, client_cx) in clients.iter() {
-                let user_id = client.user_id().unwrap();
-                client_cx.read(|cx| {
-                    if let Some(channel_buffer) = client
-                        .channel_buffers()
-                        .deref()
-                        .iter()
-                        .find(|b| b.read(cx).channel_id.0 == channel_id.to_proto())
-                    {
-                        let channel_buffer = channel_buffer.read(cx);
-
-                        // Assert that channel buffer's text matches other clients' copies.
-                        let text = channel_buffer.buffer().read(cx).text();
-                        if let Some((prev_user_id, prev_text)) = &prev_text {
-                            assert_eq!(
-                                &text,
-                                prev_text,
-                                "client {user_id} has different text than client {prev_user_id} for channel {channel_name}",
-                            );
-                        } else {
-                            prev_text = Some((user_id, text));
-                        }
-
-                        // Assert that all clients and the server agree about who is present in the
-                        // channel buffer.
-                        let collaborators = channel_buffer.collaborators();
-                        let mut user_ids =
-                            collaborators.values().map(|c| c.user_id).collect::<Vec<_>>();
-                        user_ids.sort();
-                        assert_eq!(
-                            user_ids,
-                            collaborator_user_ids,
-                            "client {user_id} has different user ids for channel {channel_name} than the server",
-                        );
-                    }
-                });
-            }
-        }
-    }
-}
diff --git a/crates/collab/src/tests/random_project_collaboration_tests.rs b/crates/collab/src/tests/random_project_collaboration_tests.rs
deleted file mode 100644
index 7e9b84c057..0000000000
--- a/crates/collab/src/tests/random_project_collaboration_tests.rs
+++ /dev/null
@@ -1,1689 +0,0 @@
-use super::{RandomizedTest, TestClient, TestError, TestServer, UserTestPlan};
-use crate::{db::UserId, tests::run_randomized_test};
-use anyhow::{Context as _, Result};
-use async_trait::async_trait;
-use call::ActiveCall;
-use collections::{BTreeMap, HashMap};
-use editor::Bias;
-use fs::{FakeFs, Fs as _};
-use git::status::{FileStatus, StatusCode, TrackedStatus, UnmergedStatus, UnmergedStatusCode};
-use gpui::{BackgroundExecutor, Entity, TestAppContext};
-use language::{
-    FakeLspAdapter, Language, LanguageConfig, LanguageMatcher, PointUtf16, range_to_lsp,
-};
-use lsp::FakeLanguageServer;
-use pretty_assertions::assert_eq;
-use project::{
-    DEFAULT_COMPLETION_CONTEXT, Project, ProjectPath, search::SearchQuery, search::SearchResult,
-};
-use rand::{
-    distr::{self, SampleString},
-    prelude::*,
-};
-use serde::{Deserialize, Serialize};
-use std::{
-    ops::{Deref, Range},
-    path::{Path, PathBuf},
-    rc::Rc,
-    sync::Arc,
-};
-use util::{
-    ResultExt, path,
-    paths::PathStyle,
-    rel_path::{RelPath, RelPathBuf, rel_path},
-};
-
-#[gpui::test(
-    iterations = 100,
-    on_failure = "crate::tests::save_randomized_test_plan"
-)]
-async fn test_random_project_collaboration(
-    cx: &mut TestAppContext,
-    executor: BackgroundExecutor,
-    rng: StdRng,
-) {
-    run_randomized_test::<ProjectCollaborationTest>(cx, executor, rng).await;
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-enum ClientOperation {
-    AcceptIncomingCall,
-    RejectIncomingCall,
-    LeaveCall,
-    InviteContactToCall {
-        user_id: UserId,
-    },
-    OpenLocalProject {
-        first_root_name: String,
-    },
-    OpenRemoteProject {
-        host_id: UserId,
-        first_root_name: String,
-    },
-    AddWorktreeToProject {
-        project_root_name: String,
-        new_root_path: PathBuf,
-    },
-    CloseRemoteProject {
-        project_root_name: String,
-    },
-    OpenBuffer {
-        project_root_name: String,
-        is_local: bool,
-        full_path: RelPathBuf,
-    },
-    SearchProject {
-        project_root_name: String,
-        is_local: bool,
-        query: String,
-        detach: bool,
-    },
-    EditBuffer {
-        project_root_name: String,
-        is_local: bool,
-        full_path: RelPathBuf,
-        edits: Vec<(Range<usize>, Arc<str>)>,
-    },
-    CloseBuffer {
-        project_root_name: String,
-        is_local: bool,
-        full_path: RelPathBuf,
-    },
-    SaveBuffer {
-        project_root_name: String,
-        is_local: bool,
-        full_path: RelPathBuf,
-        detach: bool,
-    },
-    RequestLspDataInBuffer {
-        project_root_name: String,
-        is_local: bool,
-        full_path: RelPathBuf,
-        offset: usize,
-        kind: LspRequestKind,
-        detach: bool,
-    },
-    CreateWorktreeEntry {
-        project_root_name: String,
-        is_local: bool,
-        full_path: RelPathBuf,
-        is_dir: bool,
-    },
-    WriteFsEntry {
-        path: PathBuf,
-        is_dir: bool,
-        content: String,
-    },
-    GitOperation {
-        operation: GitOperation,
-    },
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-enum GitOperation {
-    WriteGitIndex {
-        repo_path: PathBuf,
-        contents: Vec<(RelPathBuf, String)>,
-    },
-    WriteGitBranch {
-        repo_path: PathBuf,
-        new_branch: Option<String>,
-    },
-    WriteGitStatuses {
-        repo_path: PathBuf,
-        statuses: Vec<(RelPathBuf, FileStatus)>,
-    },
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-enum LspRequestKind {
-    Rename,
-    Completion,
-    CodeAction,
-    Definition,
-    Highlights,
-}
-
-struct ProjectCollaborationTest;
-
-#[async_trait(?Send)]
-impl RandomizedTest for ProjectCollaborationTest {
-    type Operation = ClientOperation;
-
-    async fn initialize(server: &mut TestServer, users: &[UserTestPlan]) {
-        let db = &server.app_state.db;
-        for (ix, user_a) in users.iter().enumerate() {
-            for user_b in &users[ix + 1..] {
-                db.send_contact_request(user_a.user_id, user_b.user_id)
-                    .await
-                    .unwrap();
-                db.respond_to_contact_request(user_b.user_id, user_a.user_id, true)
-                    .await
-                    .unwrap();
-            }
-        }
-    }
-
-    fn generate_operation(
-        client: &TestClient,
-        rng: &mut StdRng,
-        plan: &mut UserTestPlan,
-        cx: &TestAppContext,
-    ) -> ClientOperation {
-        let call = cx.read(ActiveCall::global);
-        loop {
-            match rng.random_range(0..100_u32) {
-                // Mutate the call
-                0..=29 => {
-                    // Respond to an incoming call
-                    if call.read_with(cx, |call, _| call.incoming().borrow().is_some()) {
-                        break if rng.random_bool(0.7) {
-                            ClientOperation::AcceptIncomingCall
-                        } else {
-                            ClientOperation::RejectIncomingCall
-                        };
-                    }
-
-                    match rng.random_range(0..100_u32) {
-                        // Invite a contact to the current call
-                        0..=70 => {
-                            let available_contacts =
-                                client.user_store().read_with(cx, |user_store, _| {
-                                    user_store
-                                        .contacts()
-                                        .iter()
-                                        .filter(|contact| contact.online && !contact.busy)
-                                        .cloned()
-                                        .collect::<Vec<_>>()
-                                });
-                            if !available_contacts.is_empty() {
-                                let contact = available_contacts.choose(rng).unwrap();
-                                break ClientOperation::InviteContactToCall {
-                                    user_id: UserId(contact.user.id as i32),
-                                };
-                            }
-                        }
-
-                        // Leave the current call
-                        71.. => {
-                            if plan.allow_client_disconnection
-                                && call.read_with(cx, |call, _| call.room().is_some())
-                            {
-                                break ClientOperation::LeaveCall;
-                            }
-                        }
-                    }
-                }
-
-                // Mutate projects
-                30..=59 => match rng.random_range(0..100_u32) {
-                    // Open a new project
-                    0..=70 => {
-                        // Open a remote project
-                        if let Some(room) = call.read_with(cx, |call, _| call.room().cloned()) {
-                            let existing_dev_server_project_ids = cx.read(|cx| {
-                                client
-                                    .dev_server_projects()
-                                    .iter()
-                                    .map(|p| p.read(cx).remote_id().unwrap())
-                                    .collect::<Vec<_>>()
-                            });
-                            let new_dev_server_projects = room.read_with(cx, |room, _| {
-                                room.remote_participants()
-                                    .values()
-                                    .flat_map(|participant| {
-                                        participant.projects.iter().filter_map(|project| {
-                                            if existing_dev_server_project_ids.contains(&project.id)
-                                            {
-                                                None
-                                            } else {
-                                                Some((
-                                                    UserId::from_proto(participant.user.id),
-                                                    project.worktree_root_names[0].clone(),
-                                                ))
-                                            }
-                                        })
-                                    })
-                                    .collect::<Vec<_>>()
-                            });
-                            if !new_dev_server_projects.is_empty() {
-                                let (host_id, first_root_name) =
-                                    new_dev_server_projects.choose(rng).unwrap().clone();
-                                break ClientOperation::OpenRemoteProject {
-                                    host_id,
-                                    first_root_name,
-                                };
-                            }
-                        }
-                        // Open a local project
-                        else {
-                            let first_root_name = plan.next_root_dir_name();
-                            break ClientOperation::OpenLocalProject { first_root_name };
-                        }
-                    }
-
-                    // Close a remote project
-                    71..=80 => {
-                        if !client.dev_server_projects().is_empty() {
-                            let project = client.dev_server_projects().choose(rng).unwrap().clone();
-                            let first_root_name = root_name_for_project(&project, cx);
-                            break ClientOperation::CloseRemoteProject {
-                                project_root_name: first_root_name,
-                            };
-                        }
-                    }
-
-                    // Mutate project worktrees
-                    81.. => match rng.random_range(0..100_u32) {
-                        // Add a worktree to a local project
-                        0..=50 => {
-                            let Some(project) = client.local_projects().choose(rng).cloned() else {
-                                continue;
-                            };
-                            let project_root_name = root_name_for_project(&project, cx);
-                            let mut paths = client.fs().paths(false);
-                            paths.remove(0);
-                            let new_root_path = if paths.is_empty() || rng.random() {
-                                Path::new(path!("/")).join(plan.next_root_dir_name())
-                            } else {
-                                paths.choose(rng).unwrap().clone()
-                            };
-                            break ClientOperation::AddWorktreeToProject {
-                                project_root_name,
-                                new_root_path,
-                            };
-                        }
-
-                        // Add an entry to a worktree
-                        _ => {
-                            let Some(project) = choose_random_project(client, rng) else {
-                                continue;
-                            };
-                            let project_root_name = root_name_for_project(&project, cx);
-                            let is_local = project.read_with(cx, |project, _| project.is_local());
-                            let worktree = project.read_with(cx, |project, cx| {
-                                project
-                                    .worktrees(cx)
-                                    .filter(|worktree| {
-                                        let worktree = worktree.read(cx);
-                                        worktree.is_visible()
-                                            && worktree.entries(false, 0).any(|e| e.is_file())
-                                            && worktree.root_entry().is_some_and(|e| e.is_dir())
-                                    })
-                                    .choose(rng)
-                            });
-                            let Some(worktree) = worktree else { continue };
-                            let is_dir = rng.random::<bool>();
-                            let mut full_path =
-                                worktree.read_with(cx, |w, _| w.root_name().to_rel_path_buf());
-                            full_path.push(rel_path(&gen_file_name(rng)));
-                            if !is_dir {
-                                full_path.set_extension("rs");
-                            }
-                            break ClientOperation::CreateWorktreeEntry {
-                                project_root_name,
-                                is_local,
-                                full_path,
-                                is_dir,
-                            };
-                        }
-                    },
-                },
-
-                // Query and mutate buffers
-                60..=90 => {
-                    let Some(project) = choose_random_project(client, rng) else {
-                        continue;
-                    };
-                    let project_root_name = root_name_for_project(&project, cx);
-                    let is_local = project.read_with(cx, |project, _| project.is_local());
-
-                    match rng.random_range(0..100_u32) {
-                        // Manipulate an existing buffer
-                        0..=70 => {
-                            let Some(buffer) = client
-                                .buffers_for_project(&project)
-                                .iter()
-                                .choose(rng)
-                                .cloned()
-                            else {
-                                continue;
-                            };
-
-                            let full_path = buffer.read_with(cx, |buffer, cx| {
-                                let file = buffer.file().unwrap();
-                                let worktree = project
-                                    .read(cx)
-                                    .worktree_for_id(file.worktree_id(cx), cx)
-                                    .unwrap();
-                                worktree
-                                    .read(cx)
-                                    .root_name()
-                                    .join(file.path())
-                                    .to_rel_path_buf()
-                            });
-
-                            match rng.random_range(0..100_u32) {
-                                // Close the buffer
-                                0..=15 => {
-                                    break ClientOperation::CloseBuffer {
-                                        project_root_name,
-                                        is_local,
-                                        full_path,
-                                    };
-                                }
-                                // Save the buffer
-                                16..=29 if buffer.read_with(cx, |b, _| b.is_dirty()) => {
-                                    let detach = rng.random_bool(0.3);
-                                    break ClientOperation::SaveBuffer {
-                                        project_root_name,
-                                        is_local,
-                                        full_path,
-                                        detach,
-                                    };
-                                }
-                                // Edit the buffer
-                                30..=69 => {
-                                    let edits = buffer
-                                        .read_with(cx, |buffer, _| buffer.get_random_edits(rng, 3));
-                                    break ClientOperation::EditBuffer {
-                                        project_root_name,
-                                        is_local,
-                                        full_path,
-                                        edits,
-                                    };
-                                }
-                                // Make an LSP request
-                                _ => {
-                                    let offset = buffer.read_with(cx, |buffer, _| {
-                                        buffer.clip_offset(
-                                            rng.random_range(0..=buffer.len()),
-                                            language::Bias::Left,
-                                        )
-                                    });
-                                    let detach = rng.random();
-                                    break ClientOperation::RequestLspDataInBuffer {
-                                        project_root_name,
-                                        full_path,
-                                        offset,
-                                        is_local,
-                                        kind: match rng.random_range(0..5_u32) {
-                                            0 => LspRequestKind::Rename,
-                                            1 => LspRequestKind::Highlights,
-                                            2 => LspRequestKind::Definition,
-                                            3 => LspRequestKind::CodeAction,
-                                            4.. => LspRequestKind::Completion,
-                                        },
-                                        detach,
-                                    };
-                                }
-                            }
-                        }
-
-                        71..=80 => {
-                            let query = rng.random_range('a'..='z').to_string();
-                            let detach = rng.random_bool(0.3);
-                            break ClientOperation::SearchProject {
-                                project_root_name,
-                                is_local,
-                                query,
-                                detach,
-                            };
-                        }
-
-                        // Open a buffer
-                        81.. => {
-                            let worktree = project.read_with(cx, |project, cx| {
-                                project
-                                    .worktrees(cx)
-                                    .filter(|worktree| {
-                                        let worktree = worktree.read(cx);
-                                        worktree.is_visible()
-                                            && worktree.entries(false, 0).any(|e| e.is_file())
-                                    })
-                                    .choose(rng)
-                            });
-                            let Some(worktree) = worktree else { continue };
-                            let full_path = worktree.read_with(cx, |worktree, _| {
-                                let entry = worktree
-                                    .entries(false, 0)
-                                    .filter(|e| e.is_file())
-                                    .choose(rng)
-                                    .unwrap();
-                                if entry.path.as_ref().is_empty() {
-                                    worktree.root_name().into()
-                                } else {
-                                    worktree.root_name().join(&entry.path)
-                                }
-                            });
-                            break ClientOperation::OpenBuffer {
-                                project_root_name,
-                                is_local,
-                                full_path: full_path.to_rel_path_buf(),
-                            };
-                        }
-                    }
-                }
-
-                // Update a git related action
-                91..=95 => {
-                    break ClientOperation::GitOperation {
-                        operation: generate_git_operation(rng, client),
-                    };
-                }
-
-                // Create or update a file or directory
-                96.. => {
-                    let is_dir = rng.random::<bool>();
-                    let content;
-                    let mut path;
-                    let dir_paths = client.fs().directories(false);
-
-                    if is_dir {
-                        content = String::new();
-                        path = dir_paths.choose(rng).unwrap().clone();
-                        path.push(gen_file_name(rng));
-                    } else {
-                        content = distr::Alphanumeric.sample_string(rng, 16);
-
-                        // Create a new file or overwrite an existing file
-                        let file_paths = client.fs().files();
-                        if file_paths.is_empty() || rng.random_bool(0.5) {
-                            path = dir_paths.choose(rng).unwrap().clone();
-                            path.push(gen_file_name(rng));
-                            path.set_extension("rs");
-                        } else {
-                            path = file_paths.choose(rng).unwrap().clone()
-                        };
-                    }
-                    break ClientOperation::WriteFsEntry {
-                        path,
-                        is_dir,
-                        content,
-                    };
-                }
-            }
-        }
-    }
-
-    async fn apply_operation(
-        client: &TestClient,
-        operation: ClientOperation,
-        cx: &mut TestAppContext,
-    ) -> Result<(), TestError> {
-        match operation {
-            ClientOperation::AcceptIncomingCall => {
-                let active_call = cx.read(ActiveCall::global);
-                if active_call.read_with(cx, |call, _| call.incoming().borrow().is_none()) {
-                    Err(TestError::Inapplicable)?;
-                }
-
-                log::info!("{}: accepting incoming call", client.username);
-                active_call
-                    .update(cx, |call, cx| call.accept_incoming(cx))
-                    .await?;
-            }
-
-            ClientOperation::RejectIncomingCall => {
-                let active_call = cx.read(ActiveCall::global);
-                if active_call.read_with(cx, |call, _| call.incoming().borrow().is_none()) {
-                    Err(TestError::Inapplicable)?;
-                }
-
-                log::info!("{}: declining incoming call", client.username);
-                active_call.update(cx, |call, cx| call.decline_incoming(cx))?;
-            }
-
-            ClientOperation::LeaveCall => {
-                let active_call = cx.read(ActiveCall::global);
-                if active_call.read_with(cx, |call, _| call.room().is_none()) {
-                    Err(TestError::Inapplicable)?;
-                }
-
-                log::info!("{}: hanging up", client.username);
-                active_call.update(cx, |call, cx| call.hang_up(cx)).await?;
-            }
-
-            ClientOperation::InviteContactToCall { user_id } => {
-                let active_call = cx.read(ActiveCall::global);
-
-                log::info!("{}: inviting {}", client.username, user_id,);
-                active_call
-                    .update(cx, |call, cx| call.invite(user_id.to_proto(), None, cx))
-                    .await
-                    .log_err();
-            }
-
-            ClientOperation::OpenLocalProject { first_root_name } => {
-                log::info!(
-                    "{}: opening local project at {:?}",
-                    client.username,
-                    first_root_name
-                );
-
-                let root_path = Path::new(path!("/")).join(&first_root_name);
-                client.fs().create_dir(&root_path).await.unwrap();
-                client
-                    .fs()
-                    .create_file(&root_path.join("main.rs"), Default::default())
-                    .await
-                    .unwrap();
-                let project = client.build_local_project(root_path, cx).await.0;
-                ensure_project_shared(&project, client, cx).await;
-                client.local_projects_mut().push(project.clone());
-            }
-
-            ClientOperation::AddWorktreeToProject {
-                project_root_name,
-                new_root_path,
-            } => {
-                let project = project_for_root_name(client, &project_root_name, cx)
-                    .ok_or(TestError::Inapplicable)?;
-
-                log::info!(
-                    "{}: finding/creating local worktree at {:?} to project with root path {}",
-                    client.username,
-                    new_root_path,
-                    project_root_name
-                );
-
-                ensure_project_shared(&project, client, cx).await;
-                if !client.fs().paths(false).contains(&new_root_path) {
-                    client.fs().create_dir(&new_root_path).await.unwrap();
-                }
-                project
-                    .update(cx, |project, cx| {
-                        project.find_or_create_worktree(&new_root_path, true, cx)
-                    })
-                    .await
-                    .unwrap();
-            }
-
-            ClientOperation::CloseRemoteProject { project_root_name } => {
-                let project = project_for_root_name(client, &project_root_name, cx)
-                    .ok_or(TestError::Inapplicable)?;
-
-                log::info!(
-                    "{}: closing remote project with root path {}",
-                    client.username,
-                    project_root_name,
-                );
-
-                let ix = client
-                    .dev_server_projects()
-                    .iter()
-                    .position(|p| p == &project)
-                    .unwrap();
-                cx.update(|_| {
-                    client.dev_server_projects_mut().remove(ix);
-                    client.buffers().retain(|p, _| *p != project);
-                    drop(project);
-                });
-            }
-
-            ClientOperation::OpenRemoteProject {
-                host_id,
-                first_root_name,
-            } => {
-                let active_call = cx.read(ActiveCall::global);
-                let project = active_call
-                    .update(cx, |call, cx| {
-                        let room = call.room().cloned()?;
-                        let participant = room
-                            .read(cx)
-                            .remote_participants()
-                            .get(&host_id.to_proto())?;
-                        let project_id = participant
-                            .projects
-                            .iter()
-                            .find(|project| project.worktree_root_names[0] == first_root_name)?
-                            .id;
-                        Some(room.update(cx, |room, cx| {
-                            room.join_project(
-                                project_id,
-                                client.language_registry().clone(),
-                                FakeFs::new(cx.background_executor().clone()),
-                                cx,
-                            )
-                        }))
-                    })
-                    .ok_or(TestError::Inapplicable)?;
-
-                log::info!(
-                    "{}: joining remote project of user {}, root name {}",
-                    client.username,
-                    host_id,
-                    first_root_name,
-                );
-
-                let project = project.await?;
-                client.dev_server_projects_mut().push(project);
-            }
-
-            ClientOperation::CreateWorktreeEntry {
-                project_root_name,
-                is_local,
-                full_path,
-                is_dir,
-            } => {
-                let project = project_for_root_name(client, &project_root_name, cx)
-                    .ok_or(TestError::Inapplicable)?;
-                let project_path = project_path_for_full_path(&project, &full_path, cx)
-                    .ok_or(TestError::Inapplicable)?;
-
-                log::info!(
-                    "{}: creating {} at path {:?} in {} project {}",
-                    client.username,
-                    if is_dir { "dir" } else { "file" },
-                    full_path,
-                    if is_local { "local" } else { "remote" },
-                    project_root_name,
-                );
-
-                ensure_project_shared(&project, client, cx).await;
-                project
-                    .update(cx, |p, cx| p.create_entry(project_path, is_dir, cx))
-                    .await?;
-            }
-
-            ClientOperation::OpenBuffer {
-                project_root_name,
-                is_local,
-                full_path,
-            } => {
-                let project = project_for_root_name(client, &project_root_name, cx)
-                    .ok_or(TestError::Inapplicable)?;
-                let project_path = project_path_for_full_path(&project, &full_path, cx)
-                    .ok_or(TestError::Inapplicable)?;
-
-                log::info!(
-                    "{}: opening buffer {:?} in {} project {}",
-                    client.username,
-                    full_path,
-                    if is_local { "local" } else { "remote" },
-                    project_root_name,
-                );
-
-                ensure_project_shared(&project, client, cx).await;
-                let buffer = project
-                    .update(cx, |project, cx| project.open_buffer(project_path, cx))
-                    .await?;
-                client.buffers_for_project(&project).insert(buffer);
-            }
-
-            ClientOperation::EditBuffer {
-                project_root_name,
-                is_local,
-                full_path,
-                edits,
-            } => {
-                let project = project_for_root_name(client, &project_root_name, cx)
-                    .ok_or(TestError::Inapplicable)?;
-                let buffer = buffer_for_full_path(client, &project, &full_path, cx)
-                    .ok_or(TestError::Inapplicable)?;
-
-                log::info!(
-                    "{}: editing buffer {:?} in {} project {} with {:?}",
-                    client.username,
-                    full_path,
-                    if is_local { "local" } else { "remote" },
-                    project_root_name,
-                    edits
-                );
-
-                ensure_project_shared(&project, client, cx).await;
-                buffer.update(cx, |buffer, cx| {
-                    let snapshot = buffer.snapshot();
-                    buffer.edit(
-                        edits.into_iter().map(|(range, text)| {
-                            let start = snapshot.clip_offset(range.start, Bias::Left);
-                            let end = snapshot.clip_offset(range.end, Bias::Right);
-                            (start..end, text)
-                        }),
-                        None,
-                        cx,
-                    );
-                });
-            }
-
-            ClientOperation::CloseBuffer {
-                project_root_name,
-                is_local,
-                full_path,
-            } => {
-                let project = project_for_root_name(client, &project_root_name, cx)
-                    .ok_or(TestError::Inapplicable)?;
-                let buffer = buffer_for_full_path(client, &project, &full_path, cx)
-                    .ok_or(TestError::Inapplicable)?;
-
-                log::info!(
-                    "{}: closing buffer {:?} in {} project {}",
-                    client.username,
-                    full_path,
-                    if is_local { "local" } else { "remote" },
-                    project_root_name
-                );
-
-                ensure_project_shared(&project, client, cx).await;
-                cx.update(|_| {
-                    client.buffers_for_project(&project).remove(&buffer);
-                    drop(buffer);
-                });
-            }
-
-            ClientOperation::SaveBuffer {
-                project_root_name,
-                is_local,
-                full_path,
-                detach,
-            } => {
-                let project = project_for_root_name(client, &project_root_name, cx)
-                    .ok_or(TestError::Inapplicable)?;
-                let buffer = buffer_for_full_path(client, &project, &full_path, cx)
-                    .ok_or(TestError::Inapplicable)?;
-
-                log::info!(
-                    "{}: saving buffer {:?} in {} project {}, {}",
-                    client.username,
-                    full_path,
-                    if is_local { "local" } else { "remote" },
-                    project_root_name,
-                    if detach { "detaching" } else { "awaiting" }
-                );
-
-                ensure_project_shared(&project, client, cx).await;
-                let requested_version = buffer.read_with(cx, |buffer, _| buffer.version());
-                let save =
-                    project.update(cx, |project, cx| project.save_buffer(buffer.clone(), cx));
-                let save = cx.spawn(|cx| async move {
-                    save.await.context("save request failed")?;
-                    assert!(
-                        buffer
-                            .read_with(&cx, |buffer, _| { buffer.saved_version().to_owned() })
-                            .expect("App should not be dropped")
-                            .observed_all(&requested_version)
-                    );
-                    anyhow::Ok(())
-                });
-                if detach {
-                    cx.update(|cx| save.detach_and_log_err(cx));
-                } else {
-                    save.await?;
-                }
-            }
-
-            ClientOperation::RequestLspDataInBuffer {
-                project_root_name,
-                is_local,
-                full_path,
-                offset,
-                kind,
-                detach,
-            } => {
-                let project = project_for_root_name(client, &project_root_name, cx)
-                    .ok_or(TestError::Inapplicable)?;
-                let buffer = buffer_for_full_path(client, &project, &full_path, cx)
-                    .ok_or(TestError::Inapplicable)?;
-
-                log::info!(
-                    "{}: request LSP {:?} for buffer {:?} in {} project {}, {}",
-                    client.username,
-                    kind,
-                    full_path,
-                    if is_local { "local" } else { "remote" },
-                    project_root_name,
-                    if detach { "detaching" } else { "awaiting" }
-                );
-
-                use futures::{FutureExt as _, TryFutureExt as _};
-                let offset = buffer.read_with(cx, |b, _| b.clip_offset(offset, Bias::Left));
-
-                let process_lsp_request = project.update(cx, |project, cx| match kind {
-                    LspRequestKind::Rename => project
-                        .prepare_rename(buffer, offset, cx)
-                        .map_ok(|_| ())
-                        .boxed(),
-                    LspRequestKind::Completion => project
-                        .completions(&buffer, offset, DEFAULT_COMPLETION_CONTEXT, cx)
-                        .map_ok(|_| ())
-                        .boxed(),
-                    LspRequestKind::CodeAction => project
-                        .code_actions(&buffer, offset..offset, None, cx)
-                        .map(|_| Ok(()))
-                        .boxed(),
-                    LspRequestKind::Definition => project
-                        .definitions(&buffer, offset, cx)
-                        .map_ok(|_| ())
-                        .boxed(),
-                    LspRequestKind::Highlights => project
-                        .document_highlights(&buffer, offset, cx)
-                        .map_ok(|_| ())
-                        .boxed(),
-                });
-                let request = cx.foreground_executor().spawn(process_lsp_request);
-                if detach {
-                    request.detach();
-                } else {
-                    request.await?;
-                }
-            }
-
-            ClientOperation::SearchProject {
-                project_root_name,
-                is_local,
-                query,
-                detach,
-            } => {
-                let project = project_for_root_name(client, &project_root_name, cx)
-                    .ok_or(TestError::Inapplicable)?;
-
-                log::info!(
-                    "{}: search {} project {} for {:?}, {}",
-                    client.username,
-                    if is_local { "local" } else { "remote" },
-                    project_root_name,
-                    query,
-                    if detach { "detaching" } else { "awaiting" }
-                );
-
-                let search = project.update(cx, |project, cx| {
-                    project.search(
-                        SearchQuery::text(
-                            query,
-                            false,
-                            false,
-                            false,
-                            Default::default(),
-                            Default::default(),
-                            false,
-                            None,
-                        )
-                        .unwrap(),
-                        cx,
-                    )
-                });
-                drop(project);
-                let search = cx.executor().spawn(async move {
-                    let mut results = HashMap::default();
-                    while let Ok(result) = search.recv().await {
-                        if let SearchResult::Buffer { buffer, ranges } = result {
-                            results.entry(buffer).or_insert(ranges);
-                        }
-                    }
-                    results
-                });
-                search.await;
-            }
-
-            ClientOperation::WriteFsEntry {
-                path,
-                is_dir,
-                content,
-            } => {
-                if !client
-                    .fs()
-                    .directories(false)
-                    .contains(&path.parent().unwrap().to_owned())
-                {
-                    return Err(TestError::Inapplicable);
-                }
-
-                if is_dir {
-                    log::info!("{}: creating dir at {:?}", client.username, path);
-                    client.fs().create_dir(&path).await.unwrap();
-                } else {
-                    let exists = client.fs().metadata(&path).await?.is_some();
-                    let verb = if exists { "updating" } else { "creating" };
-                    log::info!("{}: {} file at {:?}", verb, client.username, path);
-
-                    client
-                        .fs()
-                        .save(&path, &content.as_str().into(), text::LineEnding::Unix)
-                        .await
-                        .unwrap();
-                }
-            }
-
-            ClientOperation::GitOperation { operation } => match operation {
-                GitOperation::WriteGitIndex {
-                    repo_path,
-                    contents,
-                } => {
-                    if !client.fs().directories(false).contains(&repo_path) {
-                        return Err(TestError::Inapplicable);
-                    }
-
-                    for (path, _) in contents.iter() {
-                        if !client
-                            .fs()
-                            .files()
-                            .contains(&repo_path.join(path.as_std_path()))
-                        {
-                            return Err(TestError::Inapplicable);
-                        }
-                    }
-
-                    log::info!(
-                        "{}: writing git index for repo {:?}: {:?}",
-                        client.username,
-                        repo_path,
-                        contents
-                    );
-
-                    let dot_git_dir = repo_path.join(".git");
-                    let contents = contents
-                        .iter()
-                        .map(|(path, contents)| (path.as_unix_str(), contents.clone()))
-                        .collect::<Vec<_>>();
-                    if client.fs().metadata(&dot_git_dir).await?.is_none() {
-                        client.fs().create_dir(&dot_git_dir).await?;
-                    }
-                    client.fs().set_index_for_repo(&dot_git_dir, &contents);
-                }
-                GitOperation::WriteGitBranch {
-                    repo_path,
-                    new_branch,
-                } => {
-                    if !client.fs().directories(false).contains(&repo_path) {
-                        return Err(TestError::Inapplicable);
-                    }
-
-                    log::info!(
-                        "{}: writing git branch for repo {:?}: {:?}",
-                        client.username,
-                        repo_path,
-                        new_branch
-                    );
-
-                    let dot_git_dir = repo_path.join(".git");
-                    if client.fs().metadata(&dot_git_dir).await?.is_none() {
-                        client.fs().create_dir(&dot_git_dir).await?;
-                    }
-                    client
-                        .fs()
-                        .set_branch_name(&dot_git_dir, new_branch.clone());
-                }
-                GitOperation::WriteGitStatuses {
-                    repo_path,
-                    statuses,
-                } => {
-                    if !client.fs().directories(false).contains(&repo_path) {
-                        return Err(TestError::Inapplicable);
-                    }
-                    for (path, _) in statuses.iter() {
-                        if !client
-                            .fs()
-                            .files()
-                            .contains(&repo_path.join(path.as_std_path()))
-                        {
-                            return Err(TestError::Inapplicable);
-                        }
-                    }
-
-                    log::info!(
-                        "{}: writing git statuses for repo {:?}: {:?}",
-                        client.username,
-                        repo_path,
-                        statuses
-                    );
-
-                    let dot_git_dir = repo_path.join(".git");
-
-                    let statuses = statuses
-                        .iter()
-                        .map(|(path, val)| (path.as_unix_str(), *val))
-                        .collect::<Vec<_>>();
-
-                    if client.fs().metadata(&dot_git_dir).await?.is_none() {
-                        client.fs().create_dir(&dot_git_dir).await?;
-                    }
-
-                    client
-                        .fs()
-                        .set_status_for_repo(&dot_git_dir, statuses.as_slice());
-                }
-            },
-        }
-        Ok(())
-    }
-
-    async fn on_client_added(client: &Rc<TestClient>, _: &mut TestAppContext) {
-        client.language_registry().add(Arc::new(Language::new(
-            LanguageConfig {
-                name: "Rust".into(),
-                matcher: LanguageMatcher {
-                    path_suffixes: vec!["rs".to_string()],
-                    ..Default::default()
-                },
-                ..Default::default()
-            },
-            None,
-        )));
-        client.language_registry().register_fake_lsp(
-            "Rust",
-            FakeLspAdapter {
-                name: "the-fake-language-server",
-                capabilities: lsp::LanguageServer::full_capabilities(),
-                initializer: Some(Box::new({
-                    let fs = client.app_state.fs.clone();
-                    move |fake_server: &mut FakeLanguageServer| {
-                        fake_server.set_request_handler::<lsp::request::Completion, _, _>(
-                            |_, _| async move {
-                                Ok(Some(lsp::CompletionResponse::Array(vec![
-                                    lsp::CompletionItem {
-                                        text_edit: Some(lsp::CompletionTextEdit::Edit(
-                                            lsp::TextEdit {
-                                                range: lsp::Range::new(
-                                                    lsp::Position::new(0, 0),
-                                                    lsp::Position::new(0, 0),
-                                                ),
-                                                new_text: "the-new-text".to_string(),
-                                            },
-                                        )),
-                                        ..Default::default()
-                                    },
-                                ])))
-                            },
-                        );
-
-                        fake_server.set_request_handler::<lsp::request::CodeActionRequest, _, _>(
-                            |_, _| async move {
-                                Ok(Some(vec![lsp::CodeActionOrCommand::CodeAction(
-                                    lsp::CodeAction {
-                                        title: "the-code-action".to_string(),
-                                        ..Default::default()
-                                    },
-                                )]))
-                            },
-                        );
-
-                        fake_server
-                            .set_request_handler::<lsp::request::PrepareRenameRequest, _, _>(
-                                |params, _| async move {
-                                    Ok(Some(lsp::PrepareRenameResponse::Range(lsp::Range::new(
-                                        params.position,
-                                        params.position,
-                                    ))))
-                                },
-                            );
-
-                        fake_server.set_request_handler::<lsp::request::GotoDefinition, _, _>({
-                            let fs = fs.clone();
-                            move |_, cx| {
-                                let background = cx.background_executor();
-                                let mut rng = background.rng();
-                                let count = rng.random_range::<usize, _>(1..3);
-                                let files = fs.as_fake().files();
-                                let files = (0..count)
-                                    .map(|_| files.choose(&mut rng).unwrap().clone())
-                                    .collect::<Vec<_>>();
-                                async move {
-                                    log::info!("LSP: Returning definitions in files {:?}", &files);
-                                    Ok(Some(lsp::GotoDefinitionResponse::Array(
-                                        files
-                                            .into_iter()
-                                            .map(|file| lsp::Location {
-                                                uri: lsp::Uri::from_file_path(file).unwrap(),
-                                                range: Default::default(),
-                                            })
-                                            .collect(),
-                                    )))
-                                }
-                            }
-                        });
-
-                        fake_server
-                            .set_request_handler::<lsp::request::DocumentHighlightRequest, _, _>(
-                                move |_, cx| {
-                                    let mut highlights = Vec::new();
-                                    let background = cx.background_executor();
-                                    let mut rng = background.rng();
-
-                                    let highlight_count = rng.random_range(1..=5);
-                                    for _ in 0..highlight_count {
-                                        let start_row = rng.random_range(0..100);
-                                        let start_column = rng.random_range(0..100);
-                                        let end_row = rng.random_range(0..100);
-                                        let end_column = rng.random_range(0..100);
-                                        let start = PointUtf16::new(start_row, start_column);
-                                        let end = PointUtf16::new(end_row, end_column);
-                                        let range =
-                                            if start > end { end..start } else { start..end };
-                                        highlights.push(lsp::DocumentHighlight {
-                                            range: range_to_lsp(range.clone()).unwrap(),
-                                            kind: Some(lsp::DocumentHighlightKind::READ),
-                                        });
-                                    }
-                                    highlights.sort_unstable_by_key(|highlight| {
-                                        (highlight.range.start, highlight.range.end)
-                                    });
-                                    async move { Ok(Some(highlights)) }
-                                },
-                            );
-                    }
-                })),
-                ..Default::default()
-            },
-        );
-    }
-
-    async fn on_quiesce(_: &mut TestServer, clients: &mut [(Rc<TestClient>, TestAppContext)]) {
-        for (client, client_cx) in clients.iter() {
-            for guest_project in client.dev_server_projects().iter() {
-                guest_project.read_with(client_cx, |guest_project, cx| {
-                        let host_project = clients.iter().find_map(|(client, cx)| {
-                            let project = client
-                                .local_projects()
-                                .iter()
-                                .find(|host_project| {
-                                    host_project.read_with(cx, |host_project, _| {
-                                        host_project.remote_id() == guest_project.remote_id()
-                                    })
-                                })?
-                                .clone();
-                            Some((project, cx))
-                        });
-
-                        if !guest_project.is_disconnected(cx)
-                            && let Some((host_project, host_cx)) = host_project {
-                                let host_worktree_snapshots =
-                                    host_project.read_with(host_cx, |host_project, cx| {
-                                        host_project
-                                            .worktrees(cx)
-                                            .map(|worktree| {
-                                                let worktree = worktree.read(cx);
-                                                (worktree.id(), worktree.snapshot())
-                                            })
-                                            .collect::<BTreeMap<_, _>>()
-                                    });
-                                let guest_worktree_snapshots = guest_project
-                                    .worktrees(cx)
-                                    .map(|worktree| {
-                                        let worktree = worktree.read(cx);
-                                        (worktree.id(), worktree.snapshot())
-                                    })
-                                    .collect::<BTreeMap<_, _>>();
-                                let host_repository_snapshots = host_project.read_with(host_cx, |host_project, cx| {
-                                    host_project.git_store().read(cx).repo_snapshots(cx)
-                                });
-                                let guest_repository_snapshots = guest_project.git_store().read(cx).repo_snapshots(cx);
-
-                                assert_eq!(
-                                    guest_worktree_snapshots.values().map(|w| w.abs_path()).collect::<Vec<_>>(),
-                                    host_worktree_snapshots.values().map(|w| w.abs_path()).collect::<Vec<_>>(),
-                                    "{} has different worktrees than the host for project {:?}",
-                                    client.username, guest_project.remote_id(),
-                                );
-
-                                assert_eq!(
-                                    guest_repository_snapshots.values().collect::<Vec<_>>(),
-                                    host_repository_snapshots.values().collect::<Vec<_>>(),
-                                    "{} has different repositories than the host for project {:?}",
-                                    client.username, guest_project.remote_id(),
-                                );
-
-                                for (id, host_snapshot) in &host_worktree_snapshots {
-                                    let guest_snapshot = &guest_worktree_snapshots[id];
-                                    assert_eq!(
-                                        guest_snapshot.root_name(),
-                                        host_snapshot.root_name(),
-                                        "{} has different root name than the host for worktree {}, project {:?}",
-                                        client.username,
-                                        id,
-                                        guest_project.remote_id(),
-                                    );
-                                    assert_eq!(
-                                        guest_snapshot.abs_path(),
-                                        host_snapshot.abs_path(),
-                                        "{} has different abs path than the host for worktree {}, project: {:?}",
-                                        client.username,
-                                        id,
-                                        guest_project.remote_id(),
-                                    );
-                                    assert_eq!(
-                                        guest_snapshot.entries(false, 0).map(null_out_entry_size).collect::<Vec<_>>(),
-                                        host_snapshot.entries(false, 0).map(null_out_entry_size).collect::<Vec<_>>(),
-                                        "{} has different snapshot than the host for worktree {:?} ({:?}) and project {:?}",
-                                        client.username,
-                                        host_snapshot.abs_path(),
-                                        id,
-                                        guest_project.remote_id(),
-                                    );
-                                    assert_eq!(guest_snapshot.scan_id(), host_snapshot.scan_id(),
-                                        "{} has different scan id than the host for worktree {:?} and project {:?}",
-                                        client.username,
-                                        host_snapshot.abs_path(),
-                                        guest_project.remote_id(),
-                                    );
-                                }
-                            }
-
-                        for buffer in guest_project.opened_buffers(cx) {
-                            let buffer = buffer.read(cx);
-                            assert_eq!(
-                                buffer.deferred_ops_len(),
-                                0,
-                                "{} has deferred operations for buffer {:?} in project {:?}",
-                                client.username,
-                                buffer.file().unwrap().full_path(cx),
-                                guest_project.remote_id(),
-                            );
-                        }
-                    });
-
-                // A hack to work around a hack in
-                // https://github.com/zed-industries/zed/pull/16696 that wasn't
-                // detected until we upgraded the rng crate. This whole crate is
-                // going away with DeltaDB soon, so we hold our nose and
-                // continue.
-                fn null_out_entry_size(entry: &project::Entry) -> project::Entry {
-                    project::Entry {
-                        size: 0,
-                        ..entry.clone()
-                    }
-                }
-            }
-
-            let buffers = client.buffers().clone();
-            for (guest_project, guest_buffers) in &buffers {
-                let project_id = if guest_project.read_with(client_cx, |project, cx| {
-                    project.is_local() || project.is_disconnected(cx)
-                }) {
-                    continue;
-                } else {
-                    guest_project
-                        .read_with(client_cx, |project, _| project.remote_id())
-                        .unwrap()
-                };
-                let guest_user_id = client.user_id().unwrap();
-
-                let host_project = clients.iter().find_map(|(client, cx)| {
-                    let project = client
-                        .local_projects()
-                        .iter()
-                        .find(|host_project| {
-                            host_project.read_with(cx, |host_project, _| {
-                                host_project.remote_id() == Some(project_id)
-                            })
-                        })?
-                        .clone();
-                    Some((client.user_id().unwrap(), project, cx))
-                });
-
-                let (host_user_id, host_project, host_cx) =
-                    if let Some((host_user_id, host_project, host_cx)) = host_project {
-                        (host_user_id, host_project, host_cx)
-                    } else {
-                        continue;
-                    };
-
-                for guest_buffer in guest_buffers {
-                    let buffer_id =
-                        guest_buffer.read_with(client_cx, |buffer, _| buffer.remote_id());
-                    let host_buffer = host_project.read_with(host_cx, |project, cx| {
-                        project.buffer_for_id(buffer_id, cx).unwrap_or_else(|| {
-                            panic!(
-                                "host does not have buffer for guest:{}, peer:{:?}, id:{}",
-                                client.username,
-                                client.peer_id(),
-                                buffer_id
-                            )
-                        })
-                    });
-                    let path = host_buffer
-                        .read_with(host_cx, |buffer, cx| buffer.file().unwrap().full_path(cx));
-
-                    assert_eq!(
-                        guest_buffer.read_with(client_cx, |buffer, _| buffer.deferred_ops_len()),
-                        0,
-                        "{}, buffer {}, path {:?} has deferred operations",
-                        client.username,
-                        buffer_id,
-                        path,
-                    );
-                    assert_eq!(
-                        guest_buffer.read_with(client_cx, |buffer, _| buffer.text()),
-                        host_buffer.read_with(host_cx, |buffer, _| buffer.text()),
-                        "{}, buffer {}, path {:?}, differs from the host's buffer",
-                        client.username,
-                        buffer_id,
-                        path
-                    );
-
-                    let host_file = host_buffer.read_with(host_cx, |b, _| b.file().cloned());
-                    let guest_file = guest_buffer.read_with(client_cx, |b, _| b.file().cloned());
-                    match (host_file, guest_file) {
-                        (Some(host_file), Some(guest_file)) => {
-                            assert_eq!(guest_file.path(), host_file.path());
-                            assert_eq!(
-                                guest_file.disk_state(),
-                                host_file.disk_state(),
-                                "guest {} disk_state does not match host {} for path {:?} in project {}",
-                                guest_user_id,
-                                host_user_id,
-                                guest_file.path(),
-                                project_id,
-                            );
-                        }
-                        (None, None) => {}
-                        (None, _) => panic!("host's file is None, guest's isn't"),
-                        (_, None) => panic!("guest's file is None, hosts's isn't"),
-                    }
-
-                    let host_diff_base = host_project.read_with(host_cx, |project, cx| {
-                        project
-                            .git_store()
-                            .read(cx)
-                            .get_unstaged_diff(host_buffer.read(cx).remote_id(), cx)
-                            .unwrap()
-                            .read(cx)
-                            .base_text_string()
-                    });
-                    let guest_diff_base = guest_project.read_with(client_cx, |project, cx| {
-                        project
-                            .git_store()
-                            .read(cx)
-                            .get_unstaged_diff(guest_buffer.read(cx).remote_id(), cx)
-                            .unwrap()
-                            .read(cx)
-                            .base_text_string()
-                    });
-                    assert_eq!(
-                        guest_diff_base, host_diff_base,
-                        "guest {} diff base does not match host's for path {path:?} in project {project_id}",
-                        client.username
-                    );
-
-                    let host_saved_version =
-                        host_buffer.read_with(host_cx, |b, _| b.saved_version().clone());
-                    let guest_saved_version =
-                        guest_buffer.read_with(client_cx, |b, _| b.saved_version().clone());
-                    assert_eq!(
-                        guest_saved_version, host_saved_version,
-                        "guest {} saved version does not match host's for path {path:?} in project {project_id}",
-                        client.username
-                    );
-
-                    let host_is_dirty = host_buffer.read_with(host_cx, |b, _| b.is_dirty());
-                    let guest_is_dirty = guest_buffer.read_with(client_cx, |b, _| b.is_dirty());
-                    assert_eq!(
-                        guest_is_dirty, host_is_dirty,
-                        "guest {} dirty state does not match host's for path {path:?} in project {project_id}",
-                        client.username
-                    );
-
-                    let host_saved_mtime = host_buffer.read_with(host_cx, |b, _| b.saved_mtime());
-                    let guest_saved_mtime =
-                        guest_buffer.read_with(client_cx, |b, _| b.saved_mtime());
-                    assert_eq!(
-                        guest_saved_mtime, host_saved_mtime,
-                        "guest {} saved mtime does not match host's for path {path:?} in project {project_id}",
-                        client.username
-                    );
-
-                    let host_is_dirty = host_buffer.read_with(host_cx, |b, _| b.is_dirty());
-                    let guest_is_dirty = guest_buffer.read_with(client_cx, |b, _| b.is_dirty());
-                    assert_eq!(
-                        guest_is_dirty, host_is_dirty,
-                        "guest {} dirty status does not match host's for path {path:?} in project {project_id}",
-                        client.username
-                    );
-
-                    let host_has_conflict = host_buffer.read_with(host_cx, |b, _| b.has_conflict());
-                    let guest_has_conflict =
-                        guest_buffer.read_with(client_cx, |b, _| b.has_conflict());
-                    assert_eq!(
-                        guest_has_conflict, host_has_conflict,
-                        "guest {} conflict status does not match host's for path {path:?} in project {project_id}",
-                        client.username
-                    );
-                }
-            }
-        }
-    }
-}
-
-fn generate_git_operation(rng: &mut StdRng, client: &TestClient) -> GitOperation {
-    fn generate_file_paths(
-        repo_path: &Path,
-        rng: &mut StdRng,
-        client: &TestClient,
-    ) -> Vec<RelPathBuf> {
-        let mut paths = client
-            .fs()
-            .files()
-            .into_iter()
-            .filter(|path| path.starts_with(repo_path))
-            .collect::<Vec<_>>();
-
-        let count = rng.random_range(0..=paths.len());
-        paths.shuffle(rng);
-        paths.truncate(count);
-
-        paths
-            .iter()
-            .map(|path| {
-                RelPath::new(path.strip_prefix(repo_path).unwrap(), PathStyle::local())
-                    .unwrap()
-                    .to_rel_path_buf()
-            })
-            .collect::<Vec<_>>()
-    }
-
-    let repo_path = client.fs().directories(false).choose(rng).unwrap().clone();
-
-    match rng.random_range(0..100_u32) {
-        0..=25 => {
-            let file_paths = generate_file_paths(&repo_path, rng, client);
-
-            let contents = file_paths
-                .into_iter()
-                .map(|path| (path, distr::Alphanumeric.sample_string(rng, 16)))
-                .collect();
-
-            GitOperation::WriteGitIndex {
-                repo_path,
-                contents,
-            }
-        }
-        26..=63 => {
-            let new_branch =
-                (rng.random_range(0..10) > 3).then(|| distr::Alphanumeric.sample_string(rng, 8));
-
-            GitOperation::WriteGitBranch {
-                repo_path,
-                new_branch,
-            }
-        }
-        64..=100 => {
-            let file_paths = generate_file_paths(&repo_path, rng, client);
-            let statuses = file_paths
-                .into_iter()
-                .map(|path| (path, gen_status(rng)))
-                .collect::<Vec<_>>();
-            GitOperation::WriteGitStatuses {
-                repo_path,
-                statuses,
-            }
-        }
-        _ => unreachable!(),
-    }
-}
-
-fn buffer_for_full_path(
-    client: &TestClient,
-    project: &Entity<Project>,
-    full_path: &RelPath,
-    cx: &TestAppContext,
-) -> Option<Entity<language::Buffer>> {
-    client
-        .buffers_for_project(project)
-        .iter()
-        .find(|buffer| {
-            buffer.read_with(cx, |buffer, cx| {
-                let file = buffer.file().unwrap();
-                let Some(worktree) = project.read(cx).worktree_for_id(file.worktree_id(cx), cx)
-                else {
-                    return false;
-                };
-                worktree.read(cx).root_name().join(&file.path()).as_ref() == full_path
-            })
-        })
-        .cloned()
-}
-
-fn project_for_root_name(
-    client: &TestClient,
-    root_name: &str,
-    cx: &TestAppContext,
-) -> Option<Entity<Project>> {
-    if let Some(ix) = project_ix_for_root_name(client.local_projects().deref(), root_name, cx) {
-        return Some(client.local_projects()[ix].clone());
-    }
-    if let Some(ix) = project_ix_for_root_name(client.dev_server_projects().deref(), root_name, cx)
-    {
-        return Some(client.dev_server_projects()[ix].clone());
-    }
-    None
-}
-
-fn project_ix_for_root_name(
-    projects: &[Entity<Project>],
-    root_name: &str,
-    cx: &TestAppContext,
-) -> Option<usize> {
-    projects.iter().position(|project| {
-        project.read_with(cx, |project, cx| {
-            let worktree = project.visible_worktrees(cx).next().unwrap();
-            worktree.read(cx).root_name() == root_name
-        })
-    })
-}
-
-fn root_name_for_project(project: &Entity<Project>, cx: &TestAppContext) -> String {
-    project.read_with(cx, |project, cx| {
-        project
-            .visible_worktrees(cx)
-            .next()
-            .unwrap()
-            .read(cx)
-            .root_name_str()
-            .to_string()
-    })
-}
-
-fn project_path_for_full_path(
-    project: &Entity<Project>,
-    full_path: &RelPath,
-    cx: &TestAppContext,
-) -> Option<ProjectPath> {
-    let mut components = full_path.components();
-    let root_name = components.next().unwrap();
-    let path = components.rest().into();
-    let worktree_id = project.read_with(cx, |project, cx| {
-        project.worktrees(cx).find_map(|worktree| {
-            let worktree = worktree.read(cx);
-            if worktree.root_name_str() == root_name {
-                Some(worktree.id())
-            } else {
-                None
-            }
-        })
-    })?;
-    Some(ProjectPath { worktree_id, path })
-}
-
-async fn ensure_project_shared(
-    project: &Entity<Project>,
-    client: &TestClient,
-    cx: &mut TestAppContext,
-) {
-    let first_root_name = root_name_for_project(project, cx);
-    let active_call = cx.read(ActiveCall::global);
-    if active_call.read_with(cx, |call, _| call.room().is_some())
-        && project.read_with(cx, |project, _| project.is_local() && !project.is_shared())
-    {
-        match active_call
-            .update(cx, |call, cx| call.share_project(project.clone(), cx))
-            .await
-        {
-            Ok(project_id) => {
-                log::info!(
-                    "{}: shared project {} with id {}",
-                    client.username,
-                    first_root_name,
-                    project_id
-                );
-            }
-            Err(error) => {
-                log::error!(
-                    "{}: error sharing project {}: {:?}",
-                    client.username,
-                    first_root_name,
-                    error
-                );
-            }
-        }
-    }
-}
-
-fn choose_random_project(client: &TestClient, rng: &mut StdRng) -> Option<Entity<Project>> {
-    client
-        .local_projects()
-        .deref()
-        .iter()
-        .chain(client.dev_server_projects().iter())
-        .choose(rng)
-        .cloned()
-}
-
-fn gen_file_name(rng: &mut StdRng) -> String {
-    let mut name = String::new();
-    for _ in 0..10 {
-        let letter = rng.random_range('a'..='z');
-        name.push(letter);
-    }
-    name
-}
-
-fn gen_status(rng: &mut StdRng) -> FileStatus {
-    fn gen_tracked_status(rng: &mut StdRng) -> TrackedStatus {
-        match rng.random_range(0..3) {
-            0 => TrackedStatus {
-                index_status: StatusCode::Unmodified,
-                worktree_status: StatusCode::Unmodified,
-            },
-            1 => TrackedStatus {
-                index_status: StatusCode::Modified,
-                worktree_status: StatusCode::Modified,
-            },
-            2 => TrackedStatus {
-                index_status: StatusCode::Added,
-                worktree_status: StatusCode::Modified,
-            },
-            3 => TrackedStatus {
-                index_status: StatusCode::Added,
-                worktree_status: StatusCode::Unmodified,
-            },
-            _ => unreachable!(),
-        }
-    }
-
-    fn gen_unmerged_status_code(rng: &mut StdRng) -> UnmergedStatusCode {
-        match rng.random_range(0..3) {
-            0 => UnmergedStatusCode::Updated,
-            1 => UnmergedStatusCode::Added,
-            2 => UnmergedStatusCode::Deleted,
-            _ => unreachable!(),
-        }
-    }
-
-    match rng.random_range(0..2) {
-        0 => FileStatus::Unmerged(UnmergedStatus {
-            first_head: gen_unmerged_status_code(rng),
-            second_head: gen_unmerged_status_code(rng),
-        }),
-        1 => FileStatus::Tracked(gen_tracked_status(rng)),
-        _ => unreachable!(),
-    }
-}
diff --git a/crates/collab/src/tests/randomized_test_helpers.rs b/crates/collab/src/tests/randomized_test_helpers.rs
deleted file mode 100644
index 11c9f1c338..0000000000
--- a/crates/collab/src/tests/randomized_test_helpers.rs
+++ /dev/null
@@ -1,692 +0,0 @@
-use crate::{
-    db::{self, NewUserParams, UserId},
-    rpc::{CLEANUP_TIMEOUT, RECONNECT_TIMEOUT},
-    tests::{TestClient, TestServer},
-};
-use async_trait::async_trait;
-use futures::StreamExt;
-use gpui::{BackgroundExecutor, Task, TestAppContext};
-use parking_lot::Mutex;
-use rand::prelude::*;
-use rpc::RECEIVE_TIMEOUT;
-use serde::{Deserialize, Serialize, de::DeserializeOwned};
-use settings::SettingsStore;
-use std::sync::OnceLock;
-use std::{
-    env,
-    path::PathBuf,
-    rc::Rc,
-    sync::{
-        Arc,
-        atomic::{AtomicBool, Ordering::SeqCst},
-    },
-};
-
-fn plan_load_path() -> &'static Option<PathBuf> {
-    static PLAN_LOAD_PATH: OnceLock<Option<PathBuf>> = OnceLock::new();
-    PLAN_LOAD_PATH.get_or_init(|| path_env_var("LOAD_PLAN"))
-}
-
-fn plan_save_path() -> &'static Option<PathBuf> {
-    static PLAN_SAVE_PATH: OnceLock<Option<PathBuf>> = OnceLock::new();
-    PLAN_SAVE_PATH.get_or_init(|| path_env_var("SAVE_PLAN"))
-}
-
-fn max_peers() -> usize {
-    static MAX_PEERS: OnceLock<usize> = OnceLock::new();
-    *MAX_PEERS.get_or_init(|| {
-        env::var("MAX_PEERS")
-            .map(|i| i.parse().expect("invalid `MAX_PEERS` variable"))
-            .unwrap_or(3)
-    })
-}
-
-fn max_operations() -> usize {
-    static MAX_OPERATIONS: OnceLock<usize> = OnceLock::new();
-    *MAX_OPERATIONS.get_or_init(|| {
-        env::var("OPERATIONS")
-            .map(|i| i.parse().expect("invalid `OPERATIONS` variable"))
-            .unwrap_or(10)
-    })
-}
-
-static LOADED_PLAN_JSON: Mutex<Option<Vec<u8>>> = Mutex::new(None);
-static LAST_PLAN: Mutex<Option<Box<dyn Send + FnOnce() -> Vec<u8>>>> = Mutex::new(None);
-
-struct TestPlan<T: RandomizedTest> {
-    rng: StdRng,
-    replay: bool,
-    stored_operations: Vec<(StoredOperation<T::Operation>, Arc<AtomicBool>)>,
-    max_operations: usize,
-    operation_ix: usize,
-    users: Vec<UserTestPlan>,
-    next_batch_id: usize,
-    allow_server_restarts: bool,
-    allow_client_reconnection: bool,
-    allow_client_disconnection: bool,
-}
-
-pub struct UserTestPlan {
-    pub user_id: UserId,
-    pub username: String,
-    pub allow_client_disconnection: bool,
-    next_root_id: usize,
-    operation_ix: usize,
-    online: bool,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-#[serde(untagged)]
-enum StoredOperation<T> {
-    Server(ServerOperation),
-    Client {
-        user_id: UserId,
-        batch_id: usize,
-        operation: T,
-    },
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-enum ServerOperation {
-    AddConnection {
-        user_id: UserId,
-    },
-    RemoveConnection {
-        user_id: UserId,
-    },
-    BounceConnection {
-        user_id: UserId,
-    },
-    RestartServer,
-    MutateClients {
-        batch_id: usize,
-        #[serde(skip_serializing)]
-        #[serde(skip_deserializing)]
-        user_ids: Vec<UserId>,
-        quiesce: bool,
-    },
-}
-
-pub enum TestError {
-    Inapplicable,
-    Other(anyhow::Error),
-}
-
-#[async_trait(?Send)]
-pub trait RandomizedTest: 'static + Sized {
-    type Operation: Send + Clone + Serialize + DeserializeOwned;
-
-    fn generate_operation(
-        client: &TestClient,
-        rng: &mut StdRng,
-        plan: &mut UserTestPlan,
-        cx: &TestAppContext,
-    ) -> Self::Operation;
-
-    async fn apply_operation(
-        client: &TestClient,
-        operation: Self::Operation,
-        cx: &mut TestAppContext,
-    ) -> Result<(), TestError>;
-
-    async fn initialize(server: &mut TestServer, users: &[UserTestPlan]);
-
-    async fn on_client_added(_client: &Rc<TestClient>, _cx: &mut TestAppContext) {}
-
-    async fn on_quiesce(server: &mut TestServer, client: &mut [(Rc<TestClient>, TestAppContext)]);
-}
-
-pub async fn run_randomized_test<T: RandomizedTest>(
-    cx: &mut TestAppContext,
-    executor: BackgroundExecutor,
-    rng: StdRng,
-) {
-    let mut server = TestServer::start(executor.clone()).await;
-    let plan = TestPlan::<T>::new(&mut server, rng).await;
-
-    LAST_PLAN.lock().replace({
-        let plan = plan.clone();
-        Box::new(move || plan.lock().serialize())
-    });
-
-    let mut clients = Vec::new();
-    let mut client_tasks = Vec::new();
-    let mut operation_channels = Vec::new();
-    loop {
-        let Some((next_operation, applied)) = plan.lock().next_server_operation(&clients) else {
-            break;
-        };
-        applied.store(true, SeqCst);
-        let did_apply = TestPlan::apply_server_operation(
-            plan.clone(),
-            executor.clone(),
-            &mut server,
-            &mut clients,
-            &mut client_tasks,
-            &mut operation_channels,
-            next_operation,
-            cx,
-        )
-        .await;
-        if !did_apply {
-            applied.store(false, SeqCst);
-        }
-    }
-
-    drop(operation_channels);
-    executor.start_waiting();
-    futures::future::join_all(client_tasks).await;
-    executor.finish_waiting();
-
-    executor.run_until_parked();
-    T::on_quiesce(&mut server, &mut clients).await;
-
-    for (client, cx) in clients {
-        cx.update(|cx| {
-            let settings = cx.remove_global::<SettingsStore>();
-            cx.clear_globals();
-            cx.set_global(settings);
-            theme::init(theme::LoadThemes::JustBase, cx);
-            drop(client);
-        });
-    }
-    executor.run_until_parked();
-
-    if let Some(path) = plan_save_path() {
-        eprintln!("saved test plan to path {:?}", path);
-        std::fs::write(path, plan.lock().serialize()).unwrap();
-    }
-}
-
-pub fn save_randomized_test_plan() {
-    if let Some(serialize_plan) = LAST_PLAN.lock().take()
-        && let Some(path) = plan_save_path()
-    {
-        eprintln!("saved test plan to path {:?}", path);
-        std::fs::write(path, serialize_plan()).unwrap();
-    }
-}
-
-impl<T: RandomizedTest> TestPlan<T> {
-    pub async fn new(server: &mut TestServer, mut rng: StdRng) -> Arc<Mutex<Self>> {
-        let allow_server_restarts = rng.random_bool(0.7);
-        let allow_client_reconnection = rng.random_bool(0.7);
-        let allow_client_disconnection = rng.random_bool(0.1);
-
-        let mut users = Vec::new();
-        for ix in 0..max_peers() {
-            let username = format!("user-{}", ix + 1);
-            let user_id = server
-                .app_state
-                .db
-                .create_user(
-                    &format!("{username}@example.com"),
-                    None,
-                    false,
-                    NewUserParams {
-                        github_login: username.clone(),
-                        github_user_id: ix as i32,
-                    },
-                )
-                .await
-                .unwrap()
-                .user_id;
-            users.push(UserTestPlan {
-                user_id,
-                username,
-                online: false,
-                next_root_id: 0,
-                operation_ix: 0,
-                allow_client_disconnection,
-            });
-        }
-
-        T::initialize(server, &users).await;
-
-        let plan = Arc::new(Mutex::new(Self {
-            replay: false,
-            allow_server_restarts,
-            allow_client_reconnection,
-            allow_client_disconnection,
-            stored_operations: Vec::new(),
-            operation_ix: 0,
-            next_batch_id: 0,
-            max_operations: max_operations(),
-            users,
-            rng,
-        }));
-
-        if let Some(path) = plan_load_path() {
-            let json = LOADED_PLAN_JSON
-                .lock()
-                .get_or_insert_with(|| {
-                    eprintln!("loaded test plan from path {:?}", path);
-                    std::fs::read(path).unwrap()
-                })
-                .clone();
-            plan.lock().deserialize(json);
-        }
-
-        plan
-    }
-
-    fn deserialize(&mut self, json: Vec<u8>) {
-        let stored_operations: Vec<StoredOperation<T::Operation>> =
-            serde_json::from_slice(&json).unwrap();
-        self.replay = true;
-        self.stored_operations = stored_operations
-            .iter()
-            .cloned()
-            .enumerate()
-            .map(|(i, mut operation)| {
-                let did_apply = Arc::new(AtomicBool::new(false));
-                if let StoredOperation::Server(ServerOperation::MutateClients {
-                    batch_id: current_batch_id,
-                    user_ids,
-                    ..
-                }) = &mut operation
-                {
-                    assert!(user_ids.is_empty());
-                    user_ids.extend(stored_operations[i + 1..].iter().filter_map(|operation| {
-                        if let StoredOperation::Client {
-                            user_id, batch_id, ..
-                        } = operation
-                            && batch_id == current_batch_id
-                        {
-                            return Some(user_id);
-                        }
-                        None
-                    }));
-                    user_ids.sort_unstable();
-                }
-                (operation, did_apply)
-            })
-            .collect()
-    }
-
-    fn serialize(&mut self) -> Vec<u8> {
-        // Format each operation as one line
-        let mut json = Vec::new();
-        json.push(b'[');
-        for (operation, applied) in &self.stored_operations {
-            if !applied.load(SeqCst) {
-                continue;
-            }
-            if json.len() > 1 {
-                json.push(b',');
-            }
-            json.extend_from_slice(b"\n  ");
-            serde_json::to_writer(&mut json, operation).unwrap();
-        }
-        json.extend_from_slice(b"\n]\n");
-        json
-    }
-
-    fn next_server_operation(
-        &mut self,
-        clients: &[(Rc<TestClient>, TestAppContext)],
-    ) -> Option<(ServerOperation, Arc<AtomicBool>)> {
-        if self.replay {
-            while let Some(stored_operation) = self.stored_operations.get(self.operation_ix) {
-                self.operation_ix += 1;
-                if let (StoredOperation::Server(operation), applied) = stored_operation {
-                    return Some((operation.clone(), applied.clone()));
-                }
-            }
-            None
-        } else {
-            let operation = self.generate_server_operation(clients)?;
-            let applied = Arc::new(AtomicBool::new(false));
-            self.stored_operations
-                .push((StoredOperation::Server(operation.clone()), applied.clone()));
-            Some((operation, applied))
-        }
-    }
-
-    fn next_client_operation(
-        &mut self,
-        client: &TestClient,
-        current_batch_id: usize,
-        cx: &TestAppContext,
-    ) -> Option<(T::Operation, Arc<AtomicBool>)> {
-        let current_user_id = client.current_user_id(cx);
-        let user_ix = self
-            .users
-            .iter()
-            .position(|user| user.user_id == current_user_id)
-            .unwrap();
-        let user_plan = &mut self.users[user_ix];
-
-        if self.replay {
-            while let Some(stored_operation) = self.stored_operations.get(user_plan.operation_ix) {
-                user_plan.operation_ix += 1;
-                if let (
-                    StoredOperation::Client {
-                        user_id, operation, ..
-                    },
-                    applied,
-                ) = stored_operation
-                    && user_id == &current_user_id
-                {
-                    return Some((operation.clone(), applied.clone()));
-                }
-            }
-            None
-        } else {
-            if self.operation_ix == self.max_operations {
-                return None;
-            }
-            self.operation_ix += 1;
-            let operation = T::generate_operation(
-                client,
-                &mut self.rng,
-                self.users
-                    .iter_mut()
-                    .find(|user| user.user_id == current_user_id)
-                    .unwrap(),
-                cx,
-            );
-            let applied = Arc::new(AtomicBool::new(false));
-            self.stored_operations.push((
-                StoredOperation::Client {
-                    user_id: current_user_id,
-                    batch_id: current_batch_id,
-                    operation: operation.clone(),
-                },
-                applied.clone(),
-            ));
-            Some((operation, applied))
-        }
-    }
-
-    fn generate_server_operation(
-        &mut self,
-        clients: &[(Rc<TestClient>, TestAppContext)],
-    ) -> Option<ServerOperation> {
-        if self.operation_ix == self.max_operations {
-            return None;
-        }
-
-        Some(loop {
-            break match self.rng.random_range(0..100) {
-                0..=29 if clients.len() < self.users.len() => {
-                    let user = self
-                        .users
-                        .iter()
-                        .filter(|u| !u.online)
-                        .choose(&mut self.rng)
-                        .unwrap();
-                    self.operation_ix += 1;
-                    ServerOperation::AddConnection {
-                        user_id: user.user_id,
-                    }
-                }
-                30..=34 if clients.len() > 1 && self.allow_client_disconnection => {
-                    let (client, cx) = &clients[self.rng.random_range(0..clients.len())];
-                    let user_id = client.current_user_id(cx);
-                    self.operation_ix += 1;
-                    ServerOperation::RemoveConnection { user_id }
-                }
-                35..=39 if clients.len() > 1 && self.allow_client_reconnection => {
-                    let (client, cx) = &clients[self.rng.random_range(0..clients.len())];
-                    let user_id = client.current_user_id(cx);
-                    self.operation_ix += 1;
-                    ServerOperation::BounceConnection { user_id }
-                }
-                40..=44 if self.allow_server_restarts && clients.len() > 1 => {
-                    self.operation_ix += 1;
-                    ServerOperation::RestartServer
-                }
-                _ if !clients.is_empty() => {
-                    let count = self
-                        .rng
-                        .random_range(1..10)
-                        .min(self.max_operations - self.operation_ix);
-                    let batch_id = util::post_inc(&mut self.next_batch_id);
-                    let mut user_ids = (0..count)
-                        .map(|_| {
-                            let ix = self.rng.random_range(0..clients.len());
-                            let (client, cx) = &clients[ix];
-                            client.current_user_id(cx)
-                        })
-                        .collect::<Vec<_>>();
-                    user_ids.sort_unstable();
-                    ServerOperation::MutateClients {
-                        user_ids,
-                        batch_id,
-                        quiesce: self.rng.random_bool(0.7),
-                    }
-                }
-                _ => continue,
-            };
-        })
-    }
-
-    async fn apply_server_operation(
-        plan: Arc<Mutex<Self>>,
-        deterministic: BackgroundExecutor,
-        server: &mut TestServer,
-        clients: &mut Vec<(Rc<TestClient>, TestAppContext)>,
-        client_tasks: &mut Vec<Task<()>>,
-        operation_channels: &mut Vec<futures::channel::mpsc::UnboundedSender<usize>>,
-        operation: ServerOperation,
-        cx: &mut TestAppContext,
-    ) -> bool {
-        match operation {
-            ServerOperation::AddConnection { user_id } => {
-                let username;
-                {
-                    let mut plan = plan.lock();
-                    let user = plan.user(user_id);
-                    if user.online {
-                        return false;
-                    }
-                    user.online = true;
-                    username = user.username.clone();
-                };
-                log::info!("adding new connection for {}", username);
-
-                let mut client_cx = cx.new_app();
-
-                let (operation_tx, operation_rx) = futures::channel::mpsc::unbounded();
-                let client = Rc::new(server.create_client(&mut client_cx, &username).await);
-                operation_channels.push(operation_tx);
-                clients.push((client.clone(), client_cx.clone()));
-
-                let foreground_executor = client_cx.foreground_executor().clone();
-                let simulate_client =
-                    Self::simulate_client(plan.clone(), client, operation_rx, client_cx);
-                client_tasks.push(foreground_executor.spawn(simulate_client));
-
-                log::info!("added connection for {}", username);
-            }
-
-            ServerOperation::RemoveConnection {
-                user_id: removed_user_id,
-            } => {
-                log::info!("simulating full disconnection of user {}", removed_user_id);
-                let client_ix = clients
-                    .iter()
-                    .position(|(client, cx)| client.current_user_id(cx) == removed_user_id);
-                let Some(client_ix) = client_ix else {
-                    return false;
-                };
-                let user_connection_ids = server
-                    .connection_pool
-                    .lock()
-                    .user_connection_ids(removed_user_id)
-                    .collect::<Vec<_>>();
-                assert_eq!(user_connection_ids.len(), 1);
-                let removed_peer_id = user_connection_ids[0].into();
-                let (client, client_cx) = clients.remove(client_ix);
-                let client_task = client_tasks.remove(client_ix);
-                operation_channels.remove(client_ix);
-                server.forbid_connections();
-                server.disconnect_client(removed_peer_id);
-                deterministic.advance_clock(RECEIVE_TIMEOUT + RECONNECT_TIMEOUT);
-                deterministic.start_waiting();
-                log::info!("waiting for user {} to exit...", removed_user_id);
-                client_task.await;
-                deterministic.finish_waiting();
-                server.allow_connections();
-
-                for project in client.dev_server_projects().iter() {
-                    project.read_with(&client_cx, |project, cx| {
-                        assert!(
-                            project.is_disconnected(cx),
-                            "project {:?} should be read only",
-                            project.remote_id()
-                        )
-                    });
-                }
-
-                for (client, cx) in clients {
-                    let contacts = server
-                        .app_state
-                        .db
-                        .get_contacts(client.current_user_id(cx))
-                        .await
-                        .unwrap();
-                    let pool = server.connection_pool.lock();
-                    for contact in contacts {
-                        if let db::Contact::Accepted { user_id, busy, .. } = contact
-                            && user_id == removed_user_id
-                        {
-                            assert!(!pool.is_user_online(user_id));
-                            assert!(!busy);
-                        }
-                    }
-                }
-
-                log::info!("{} removed", client.username);
-                plan.lock().user(removed_user_id).online = false;
-                client_cx.update(|cx| {
-                    cx.clear_globals();
-                    drop(client);
-                });
-            }
-
-            ServerOperation::BounceConnection { user_id } => {
-                log::info!("simulating temporary disconnection of user {}", user_id);
-                let user_connection_ids = server
-                    .connection_pool
-                    .lock()
-                    .user_connection_ids(user_id)
-                    .collect::<Vec<_>>();
-                if user_connection_ids.is_empty() {
-                    return false;
-                }
-                assert_eq!(user_connection_ids.len(), 1);
-                let peer_id = user_connection_ids[0].into();
-                server.disconnect_client(peer_id);
-                deterministic.advance_clock(RECEIVE_TIMEOUT + RECONNECT_TIMEOUT);
-            }
-
-            ServerOperation::RestartServer => {
-                log::info!("simulating server restart");
-                server.reset().await;
-                deterministic.advance_clock(RECEIVE_TIMEOUT);
-                server.start().await.unwrap();
-                deterministic.advance_clock(CLEANUP_TIMEOUT);
-                let environment = &server.app_state.config.zed_environment;
-                let (stale_room_ids, _) = server
-                    .app_state
-                    .db
-                    .stale_server_resource_ids(environment, server.id())
-                    .await
-                    .unwrap();
-                assert_eq!(stale_room_ids, vec![]);
-            }
-
-            ServerOperation::MutateClients {
-                user_ids,
-                batch_id,
-                quiesce,
-            } => {
-                let mut applied = false;
-                for user_id in user_ids {
-                    let client_ix = clients
-                        .iter()
-                        .position(|(client, cx)| client.current_user_id(cx) == user_id);
-                    let Some(client_ix) = client_ix else { continue };
-                    applied = true;
-                    if let Err(err) = operation_channels[client_ix].unbounded_send(batch_id) {
-                        log::error!("error signaling user {user_id}: {err}");
-                    }
-                }
-
-                if quiesce && applied {
-                    deterministic.run_until_parked();
-                    T::on_quiesce(server, clients).await;
-                }
-
-                return applied;
-            }
-        }
-        true
-    }
-
-    async fn simulate_client(
-        plan: Arc<Mutex<Self>>,
-        client: Rc<TestClient>,
-        mut operation_rx: futures::channel::mpsc::UnboundedReceiver<usize>,
-        mut cx: TestAppContext,
-    ) {
-        T::on_client_added(&client, &mut cx).await;
-
-        while let Some(batch_id) = operation_rx.next().await {
-            let Some((operation, applied)) =
-                plan.lock().next_client_operation(&client, batch_id, &cx)
-            else {
-                break;
-            };
-            applied.store(true, SeqCst);
-            match T::apply_operation(&client, operation, &mut cx).await {
-                Ok(()) => {}
-                Err(TestError::Inapplicable) => {
-                    applied.store(false, SeqCst);
-                    log::info!("skipped operation");
-                }
-                Err(TestError::Other(error)) => {
-                    log::error!("{} error: {}", client.username, error);
-                }
-            }
-            cx.executor().simulate_random_delay().await;
-        }
-        log::info!("{}: done", client.username);
-    }
-
-    fn user(&mut self, user_id: UserId) -> &mut UserTestPlan {
-        self.users
-            .iter_mut()
-            .find(|user| user.user_id == user_id)
-            .unwrap()
-    }
-}
-
-impl UserTestPlan {
-    pub fn next_root_dir_name(&mut self) -> String {
-        let user_id = self.user_id;
-        let root_id = util::post_inc(&mut self.next_root_id);
-        format!("dir-{user_id}-{root_id}")
-    }
-}
-
-impl From<anyhow::Error> for TestError {
-    fn from(value: anyhow::Error) -> Self {
-        Self::Other(value)
-    }
-}
-
-fn path_env_var(name: &str) -> Option<PathBuf> {
-    let value = env::var(name).ok()?;
-    let mut path = PathBuf::from(value);
-    if path.is_relative() {
-        let mut abs_path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-        abs_path.pop();
-        abs_path.pop();
-        abs_path.push(path);
-        path = abs_path
-    }
-    Some(path)
-}
diff --git a/crates/collab/src/tests/remote_editing_collaboration_tests.rs b/crates/collab/src/tests/remote_editing_collaboration_tests.rs
deleted file mode 100644
index 04403de9fa..0000000000
--- a/crates/collab/src/tests/remote_editing_collaboration_tests.rs
+++ /dev/null
@@ -1,840 +0,0 @@
-use crate::tests::TestServer;
-use call::ActiveCall;
-use collections::{HashMap, HashSet};
-
-use dap::{Capabilities, adapters::DebugTaskDefinition, transport::RequestHandling};
-use debugger_ui::debugger_panel::DebugPanel;
-use extension::ExtensionHostProxy;
-use fs::{FakeFs, Fs as _, RemoveOptions};
-use futures::StreamExt as _;
-use gpui::{AppContext as _, BackgroundExecutor, TestAppContext, UpdateGlobal as _, VisualContext};
-use http_client::BlockedHttpClient;
-use language::{
-    FakeLspAdapter, Language, LanguageConfig, LanguageMatcher, LanguageRegistry,
-    language_settings::{Formatter, FormatterList, language_settings},
-    tree_sitter_typescript,
-};
-use node_runtime::NodeRuntime;
-use project::{
-    ProjectPath,
-    debugger::session::ThreadId,
-    lsp_store::{FormatTrigger, LspFormatTarget},
-};
-use remote::RemoteClient;
-use remote_server::{HeadlessAppState, HeadlessProject};
-use rpc::proto;
-use serde_json::json;
-use settings::{LanguageServerFormatterSpecifier, PrettierSettingsContent, SettingsStore};
-use std::{
-    path::Path,
-    sync::{Arc, atomic::AtomicUsize},
-};
-use task::TcpArgumentsTemplate;
-use util::{path, rel_path::rel_path};
-
-#[gpui::test(iterations = 10)]
-async fn test_sharing_an_ssh_remote_project(
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-    server_cx: &mut TestAppContext,
-) {
-    let executor = cx_a.executor();
-    cx_a.update(|cx| {
-        release_channel::init(semver::Version::new(0, 0, 0), cx);
-    });
-    server_cx.update(|cx| {
-        release_channel::init(semver::Version::new(0, 0, 0), cx);
-    });
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-
-    // Set up project on remote FS
-    let (opts, server_ssh) = RemoteClient::fake_server(cx_a, server_cx);
-    let remote_fs = FakeFs::new(server_cx.executor());
-    remote_fs
-        .insert_tree(
-            path!("/code"),
-            json!({
-                "project1": {
-                    ".zed": {
-                        "settings.json": r#"{"languages":{"Rust":{"language_servers":["override-rust-analyzer"]}}}"#
-                    },
-                    "README.md": "# project 1",
-                    "src": {
-                        "lib.rs": "fn one() -> usize { 1 }"
-                    }
-                },
-                "project2": {
-                    "README.md": "# project 2",
-                },
-            }),
-        )
-        .await;
-
-    // User A connects to the remote project via SSH.
-    server_cx.update(HeadlessProject::init);
-    let remote_http_client = Arc::new(BlockedHttpClient);
-    let node = NodeRuntime::unavailable();
-    let languages = Arc::new(LanguageRegistry::new(server_cx.executor()));
-    let _headless_project = server_cx.new(|cx| {
-        HeadlessProject::new(
-            HeadlessAppState {
-                session: server_ssh,
-                fs: remote_fs.clone(),
-                http_client: remote_http_client,
-                node_runtime: node,
-                languages,
-                extension_host_proxy: Arc::new(ExtensionHostProxy::new()),
-            },
-            cx,
-        )
-    });
-
-    let client_ssh = RemoteClient::fake_client(opts, cx_a).await;
-    let (project_a, worktree_id) = client_a
-        .build_ssh_project(path!("/code/project1"), client_ssh, cx_a)
-        .await;
-
-    // While the SSH worktree is being scanned, user A shares the remote project.
-    let active_call_a = cx_a.read(ActiveCall::global);
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-
-    // User B joins the project.
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-    let worktree_b = project_b
-        .update(cx_b, |project, cx| project.worktree_for_id(worktree_id, cx))
-        .unwrap();
-
-    let worktree_a = project_a
-        .update(cx_a, |project, cx| project.worktree_for_id(worktree_id, cx))
-        .unwrap();
-
-    executor.run_until_parked();
-
-    worktree_a.update(cx_a, |worktree, _cx| {
-        assert_eq!(
-            worktree.paths().collect::<Vec<_>>(),
-            vec![
-                rel_path(".zed"),
-                rel_path(".zed/settings.json"),
-                rel_path("README.md"),
-                rel_path("src"),
-                rel_path("src/lib.rs"),
-            ]
-        );
-    });
-
-    worktree_b.update(cx_b, |worktree, _cx| {
-        assert_eq!(
-            worktree.paths().collect::<Vec<_>>(),
-            vec![
-                rel_path(".zed"),
-                rel_path(".zed/settings.json"),
-                rel_path("README.md"),
-                rel_path("src"),
-                rel_path("src/lib.rs"),
-            ]
-        );
-    });
-
-    // User B can open buffers in the remote project.
-    let buffer_b = project_b
-        .update(cx_b, |project, cx| {
-            project.open_buffer((worktree_id, rel_path("src/lib.rs")), cx)
-        })
-        .await
-        .unwrap();
-    buffer_b.update(cx_b, |buffer, cx| {
-        assert_eq!(buffer.text(), "fn one() -> usize { 1 }");
-        let ix = buffer.text().find('1').unwrap();
-        buffer.edit([(ix..ix + 1, "100")], None, cx);
-    });
-
-    executor.run_until_parked();
-
-    cx_b.read(|cx| {
-        let file = buffer_b.read(cx).file();
-        assert_eq!(
-            language_settings(Some("Rust".into()), file, cx).language_servers,
-            ["override-rust-analyzer".to_string()]
-        )
-    });
-
-    project_b
-        .update(cx_b, |project, cx| {
-            project.save_buffer_as(
-                buffer_b.clone(),
-                ProjectPath {
-                    worktree_id: worktree_id.to_owned(),
-                    path: rel_path("src/renamed.rs").into(),
-                },
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-    assert_eq!(
-        remote_fs
-            .load(path!("/code/project1/src/renamed.rs").as_ref())
-            .await
-            .unwrap(),
-        "fn one() -> usize { 100 }"
-    );
-    cx_b.run_until_parked();
-    cx_b.update(|cx| {
-        assert_eq!(
-            buffer_b.read(cx).file().unwrap().path().as_ref(),
-            rel_path("src/renamed.rs")
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_ssh_collaboration_git_branches(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-    server_cx: &mut TestAppContext,
-) {
-    cx_a.set_name("a");
-    cx_b.set_name("b");
-    server_cx.set_name("server");
-
-    cx_a.update(|cx| {
-        release_channel::init(semver::Version::new(0, 0, 0), cx);
-    });
-    server_cx.update(|cx| {
-        release_channel::init(semver::Version::new(0, 0, 0), cx);
-    });
-
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-
-    // Set up project on remote FS
-    let (opts, server_ssh) = RemoteClient::fake_server(cx_a, server_cx);
-    let remote_fs = FakeFs::new(server_cx.executor());
-    remote_fs
-        .insert_tree("/project", serde_json::json!({ ".git":{} }))
-        .await;
-
-    let branches = ["main", "dev", "feature-1"];
-    let branches_set = branches
-        .iter()
-        .map(ToString::to_string)
-        .collect::<HashSet<_>>();
-    remote_fs.insert_branches(Path::new("/project/.git"), &branches);
-
-    // User A connects to the remote project via SSH.
-    server_cx.update(HeadlessProject::init);
-    let remote_http_client = Arc::new(BlockedHttpClient);
-    let node = NodeRuntime::unavailable();
-    let languages = Arc::new(LanguageRegistry::new(server_cx.executor()));
-    let headless_project = server_cx.new(|cx| {
-        HeadlessProject::new(
-            HeadlessAppState {
-                session: server_ssh,
-                fs: remote_fs.clone(),
-                http_client: remote_http_client,
-                node_runtime: node,
-                languages,
-                extension_host_proxy: Arc::new(ExtensionHostProxy::new()),
-            },
-            cx,
-        )
-    });
-
-    let client_ssh = RemoteClient::fake_client(opts, cx_a).await;
-    let (project_a, _) = client_a
-        .build_ssh_project("/project", client_ssh, cx_a)
-        .await;
-
-    // While the SSH worktree is being scanned, user A shares the remote project.
-    let active_call_a = cx_a.read(ActiveCall::global);
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-
-    // User B joins the project.
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-
-    // Give client A sometime to see that B has joined, and that the headless server
-    // has some git repositories
-    executor.run_until_parked();
-
-    let repo_b = cx_b.update(|cx| project_b.read(cx).active_repository(cx).unwrap());
-
-    let branches_b = cx_b
-        .update(|cx| repo_b.update(cx, |repo_b, _cx| repo_b.branches()))
-        .await
-        .unwrap()
-        .unwrap();
-
-    let new_branch = branches[2];
-
-    let branches_b = branches_b
-        .into_iter()
-        .map(|branch| branch.name().to_string())
-        .collect::<HashSet<_>>();
-
-    assert_eq!(&branches_b, &branches_set);
-
-    cx_b.update(|cx| {
-        repo_b.update(cx, |repo_b, _cx| {
-            repo_b.change_branch(new_branch.to_string())
-        })
-    })
-    .await
-    .unwrap()
-    .unwrap();
-
-    executor.run_until_parked();
-
-    let server_branch = server_cx.update(|cx| {
-        headless_project.update(cx, |headless_project, cx| {
-            headless_project.git_store.update(cx, |git_store, cx| {
-                git_store
-                    .repositories()
-                    .values()
-                    .next()
-                    .unwrap()
-                    .read(cx)
-                    .branch
-                    .as_ref()
-                    .unwrap()
-                    .clone()
-            })
-        })
-    });
-
-    assert_eq!(server_branch.name(), branches[2]);
-
-    // Also try creating a new branch
-    cx_b.update(|cx| {
-        repo_b.update(cx, |repo_b, _cx| {
-            repo_b.create_branch("totally-new-branch".to_string(), None)
-        })
-    })
-    .await
-    .unwrap()
-    .unwrap();
-
-    cx_b.update(|cx| {
-        repo_b.update(cx, |repo_b, _cx| {
-            repo_b.change_branch("totally-new-branch".to_string())
-        })
-    })
-    .await
-    .unwrap()
-    .unwrap();
-
-    executor.run_until_parked();
-
-    let server_branch = server_cx.update(|cx| {
-        headless_project.update(cx, |headless_project, cx| {
-            headless_project.git_store.update(cx, |git_store, cx| {
-                git_store
-                    .repositories()
-                    .values()
-                    .next()
-                    .unwrap()
-                    .read(cx)
-                    .branch
-                    .as_ref()
-                    .unwrap()
-                    .clone()
-            })
-        })
-    });
-
-    assert_eq!(server_branch.name(), "totally-new-branch");
-
-    // Remove the git repository and check that all participants get the update.
-    remote_fs
-        .remove_dir("/project/.git".as_ref(), RemoveOptions::default())
-        .await
-        .unwrap();
-    executor.run_until_parked();
-
-    project_a.update(cx_a, |project, cx| {
-        pretty_assertions::assert_eq!(
-            project.git_store().read(cx).repo_snapshots(cx),
-            HashMap::default()
-        );
-    });
-    project_b.update(cx_b, |project, cx| {
-        pretty_assertions::assert_eq!(
-            project.git_store().read(cx).repo_snapshots(cx),
-            HashMap::default()
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_ssh_collaboration_formatting_with_prettier(
-    executor: BackgroundExecutor,
-    cx_a: &mut TestAppContext,
-    cx_b: &mut TestAppContext,
-    server_cx: &mut TestAppContext,
-) {
-    cx_a.set_name("a");
-    cx_b.set_name("b");
-    server_cx.set_name("server");
-
-    cx_a.update(|cx| {
-        release_channel::init(semver::Version::new(0, 0, 0), cx);
-    });
-    server_cx.update(|cx| {
-        release_channel::init(semver::Version::new(0, 0, 0), cx);
-    });
-
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-
-    let (opts, server_ssh) = RemoteClient::fake_server(cx_a, server_cx);
-    let remote_fs = FakeFs::new(server_cx.executor());
-    let buffer_text = "let one = \"two\"";
-    let prettier_format_suffix = project::TEST_PRETTIER_FORMAT_SUFFIX;
-    remote_fs
-        .insert_tree(
-            path!("/project"),
-            serde_json::json!({ "a.ts": buffer_text }),
-        )
-        .await;
-
-    let test_plugin = "test_plugin";
-    let ts_lang = Arc::new(Language::new(
-        LanguageConfig {
-            name: "TypeScript".into(),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["ts".to_string()],
-                ..LanguageMatcher::default()
-            },
-            ..LanguageConfig::default()
-        },
-        Some(tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into()),
-    ));
-    client_a.language_registry().add(ts_lang.clone());
-    client_b.language_registry().add(ts_lang.clone());
-
-    let languages = Arc::new(LanguageRegistry::new(server_cx.executor()));
-    let mut fake_language_servers = languages.register_fake_lsp(
-        "TypeScript",
-        FakeLspAdapter {
-            prettier_plugins: vec![test_plugin],
-            ..Default::default()
-        },
-    );
-
-    // User A connects to the remote project via SSH.
-    server_cx.update(HeadlessProject::init);
-    let remote_http_client = Arc::new(BlockedHttpClient);
-    let _headless_project = server_cx.new(|cx| {
-        HeadlessProject::new(
-            HeadlessAppState {
-                session: server_ssh,
-                fs: remote_fs.clone(),
-                http_client: remote_http_client,
-                node_runtime: NodeRuntime::unavailable(),
-                languages,
-                extension_host_proxy: Arc::new(ExtensionHostProxy::new()),
-            },
-            cx,
-        )
-    });
-
-    let client_ssh = RemoteClient::fake_client(opts, cx_a).await;
-    let (project_a, worktree_id) = client_a
-        .build_ssh_project(path!("/project"), client_ssh, cx_a)
-        .await;
-
-    // While the SSH worktree is being scanned, user A shares the remote project.
-    let active_call_a = cx_a.read(ActiveCall::global);
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-
-    // User B joins the project.
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-    executor.run_until_parked();
-
-    // Opens the buffer and formats it
-    let (buffer_b, _handle) = project_b
-        .update(cx_b, |p, cx| {
-            p.open_buffer_with_lsp((worktree_id, rel_path("a.ts")), cx)
-        })
-        .await
-        .expect("user B opens buffer for formatting");
-
-    cx_a.update(|cx| {
-        SettingsStore::update_global(cx, |store, cx| {
-            store.update_user_settings(cx, |file| {
-                file.project.all_languages.defaults.formatter = Some(FormatterList::default());
-                file.project.all_languages.defaults.prettier = Some(PrettierSettingsContent {
-                    allowed: Some(true),
-                    ..Default::default()
-                });
-            });
-        });
-    });
-    cx_b.update(|cx| {
-        SettingsStore::update_global(cx, |store, cx| {
-            store.update_user_settings(cx, |file| {
-                file.project.all_languages.defaults.formatter = Some(FormatterList::Single(
-                    Formatter::LanguageServer(LanguageServerFormatterSpecifier::Current),
-                ));
-                file.project.all_languages.defaults.prettier = Some(PrettierSettingsContent {
-                    allowed: Some(true),
-                    ..Default::default()
-                });
-            });
-        });
-    });
-    let fake_language_server = fake_language_servers.next().await.unwrap();
-    fake_language_server.set_request_handler::<lsp::request::Formatting, _, _>(|_, _| async move {
-        panic!(
-            "Unexpected: prettier should be preferred since it's enabled and language supports it"
-        )
-    });
-
-    project_b
-        .update(cx_b, |project, cx| {
-            project.format(
-                HashSet::from_iter([buffer_b.clone()]),
-                LspFormatTarget::Buffers,
-                true,
-                FormatTrigger::Save,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-
-    executor.run_until_parked();
-    assert_eq!(
-        buffer_b.read_with(cx_b, |buffer, _| buffer.text()),
-        buffer_text.to_string() + "\n" + prettier_format_suffix,
-        "Prettier formatting was not applied to client buffer after client's request"
-    );
-
-    // User A opens and formats the same buffer too
-    let buffer_a = project_a
-        .update(cx_a, |p, cx| {
-            p.open_buffer((worktree_id, rel_path("a.ts")), cx)
-        })
-        .await
-        .expect("user A opens buffer for formatting");
-
-    cx_a.update(|cx| {
-        SettingsStore::update_global(cx, |store, cx| {
-            store.update_user_settings(cx, |file| {
-                file.project.all_languages.defaults.formatter = Some(FormatterList::default());
-                file.project.all_languages.defaults.prettier = Some(PrettierSettingsContent {
-                    allowed: Some(true),
-                    ..Default::default()
-                });
-            });
-        });
-    });
-    project_a
-        .update(cx_a, |project, cx| {
-            project.format(
-                HashSet::from_iter([buffer_a.clone()]),
-                LspFormatTarget::Buffers,
-                true,
-                FormatTrigger::Manual,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-
-    executor.run_until_parked();
-    assert_eq!(
-        buffer_b.read_with(cx_b, |buffer, _| buffer.text()),
-        buffer_text.to_string() + "\n" + prettier_format_suffix + "\n" + prettier_format_suffix,
-        "Prettier formatting was not applied to client buffer after host's request"
-    );
-}
-
-#[gpui::test]
-async fn test_remote_server_debugger(
-    cx_a: &mut TestAppContext,
-    server_cx: &mut TestAppContext,
-    executor: BackgroundExecutor,
-) {
-    cx_a.update(|cx| {
-        release_channel::init(semver::Version::new(0, 0, 0), cx);
-        command_palette_hooks::init(cx);
-        zlog::init_test();
-        dap_adapters::init(cx);
-    });
-    server_cx.update(|cx| {
-        release_channel::init(semver::Version::new(0, 0, 0), cx);
-        dap_adapters::init(cx);
-    });
-    let (opts, server_ssh) = RemoteClient::fake_server(cx_a, server_cx);
-    let remote_fs = FakeFs::new(server_cx.executor());
-    remote_fs
-        .insert_tree(
-            path!("/code"),
-            json!({
-                "lib.rs": "fn one() -> usize { 1 }"
-            }),
-        )
-        .await;
-
-    // User A connects to the remote project via SSH.
-    server_cx.update(HeadlessProject::init);
-    let remote_http_client = Arc::new(BlockedHttpClient);
-    let node = NodeRuntime::unavailable();
-    let languages = Arc::new(LanguageRegistry::new(server_cx.executor()));
-    let _headless_project = server_cx.new(|cx| {
-        HeadlessProject::new(
-            HeadlessAppState {
-                session: server_ssh,
-                fs: remote_fs.clone(),
-                http_client: remote_http_client,
-                node_runtime: node,
-                languages,
-                extension_host_proxy: Arc::new(ExtensionHostProxy::new()),
-            },
-            cx,
-        )
-    });
-
-    let client_ssh = RemoteClient::fake_client(opts, cx_a).await;
-    let mut server = TestServer::start(server_cx.executor()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    cx_a.update(|cx| {
-        debugger_ui::init(cx);
-        command_palette_hooks::init(cx);
-    });
-    let (project_a, _) = client_a
-        .build_ssh_project(path!("/code"), client_ssh.clone(), cx_a)
-        .await;
-
-    let (workspace, cx_a) = client_a.build_workspace(&project_a, cx_a);
-
-    let debugger_panel = workspace
-        .update_in(cx_a, |_workspace, window, cx| {
-            cx.spawn_in(window, DebugPanel::load)
-        })
-        .await
-        .unwrap();
-
-    workspace.update_in(cx_a, |workspace, window, cx| {
-        workspace.add_panel(debugger_panel, window, cx);
-    });
-
-    cx_a.run_until_parked();
-    let debug_panel = workspace
-        .update(cx_a, |workspace, cx| workspace.panel::<DebugPanel>(cx))
-        .unwrap();
-
-    let workspace_window = cx_a
-        .window_handle()
-        .downcast::<workspace::Workspace>()
-        .unwrap();
-
-    let session = debugger_ui::tests::start_debug_session(&workspace_window, cx_a, |_| {}).unwrap();
-    cx_a.run_until_parked();
-    debug_panel.update(cx_a, |debug_panel, cx| {
-        assert_eq!(
-            debug_panel.active_session().unwrap().read(cx).session(cx),
-            session
-        )
-    });
-
-    session.update(cx_a, |session, _| {
-        assert_eq!(session.binary().unwrap().command.as_deref(), Some("ssh"));
-    });
-
-    let shutdown_session = workspace.update(cx_a, |workspace, cx| {
-        workspace.project().update(cx, |project, cx| {
-            project.dap_store().update(cx, |dap_store, cx| {
-                dap_store.shutdown_session(session.read(cx).session_id(), cx)
-            })
-        })
-    });
-
-    client_ssh.update(cx_a, |a, _| {
-        a.shutdown_processes(Some(proto::ShutdownRemoteServer {}), executor)
-    });
-
-    shutdown_session.await.unwrap();
-}
-
-#[gpui::test]
-async fn test_slow_adapter_startup_retries(
-    cx_a: &mut TestAppContext,
-    server_cx: &mut TestAppContext,
-    executor: BackgroundExecutor,
-) {
-    cx_a.update(|cx| {
-        release_channel::init(semver::Version::new(0, 0, 0), cx);
-        command_palette_hooks::init(cx);
-        zlog::init_test();
-        dap_adapters::init(cx);
-    });
-    server_cx.update(|cx| {
-        release_channel::init(semver::Version::new(0, 0, 0), cx);
-        dap_adapters::init(cx);
-    });
-    let (opts, server_ssh) = RemoteClient::fake_server(cx_a, server_cx);
-    let remote_fs = FakeFs::new(server_cx.executor());
-    remote_fs
-        .insert_tree(
-            path!("/code"),
-            json!({
-                "lib.rs": "fn one() -> usize { 1 }"
-            }),
-        )
-        .await;
-
-    // User A connects to the remote project via SSH.
-    server_cx.update(HeadlessProject::init);
-    let remote_http_client = Arc::new(BlockedHttpClient);
-    let node = NodeRuntime::unavailable();
-    let languages = Arc::new(LanguageRegistry::new(server_cx.executor()));
-    let _headless_project = server_cx.new(|cx| {
-        HeadlessProject::new(
-            HeadlessAppState {
-                session: server_ssh,
-                fs: remote_fs.clone(),
-                http_client: remote_http_client,
-                node_runtime: node,
-                languages,
-                extension_host_proxy: Arc::new(ExtensionHostProxy::new()),
-            },
-            cx,
-        )
-    });
-
-    let client_ssh = RemoteClient::fake_client(opts, cx_a).await;
-    let mut server = TestServer::start(server_cx.executor()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    cx_a.update(|cx| {
-        debugger_ui::init(cx);
-        command_palette_hooks::init(cx);
-    });
-    let (project_a, _) = client_a
-        .build_ssh_project(path!("/code"), client_ssh.clone(), cx_a)
-        .await;
-
-    let (workspace, cx_a) = client_a.build_workspace(&project_a, cx_a);
-
-    let debugger_panel = workspace
-        .update_in(cx_a, |_workspace, window, cx| {
-            cx.spawn_in(window, DebugPanel::load)
-        })
-        .await
-        .unwrap();
-
-    workspace.update_in(cx_a, |workspace, window, cx| {
-        workspace.add_panel(debugger_panel, window, cx);
-    });
-
-    cx_a.run_until_parked();
-    let debug_panel = workspace
-        .update(cx_a, |workspace, cx| workspace.panel::<DebugPanel>(cx))
-        .unwrap();
-
-    let workspace_window = cx_a
-        .window_handle()
-        .downcast::<workspace::Workspace>()
-        .unwrap();
-
-    let count = Arc::new(AtomicUsize::new(0));
-    let session = debugger_ui::tests::start_debug_session_with(
-        &workspace_window,
-        cx_a,
-        DebugTaskDefinition {
-            adapter: "fake-adapter".into(),
-            label: "test".into(),
-            config: json!({
-                "request": "launch"
-            }),
-            tcp_connection: Some(TcpArgumentsTemplate {
-                port: None,
-                host: None,
-                timeout: None,
-            }),
-        },
-        move |client| {
-            let count = count.clone();
-            client.on_request_ext::<dap::requests::Initialize, _>(move |_seq, _request| {
-                if count.fetch_add(1, std::sync::atomic::Ordering::SeqCst) < 5 {
-                    return RequestHandling::Exit;
-                }
-                RequestHandling::Respond(Ok(Capabilities::default()))
-            });
-        },
-    )
-    .unwrap();
-    cx_a.run_until_parked();
-
-    let client = session.update(cx_a, |session, _| session.adapter_client().unwrap());
-    client
-        .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-            reason: dap::StoppedEventReason::Pause,
-            description: None,
-            thread_id: Some(1),
-            preserve_focus_hint: None,
-            text: None,
-            all_threads_stopped: None,
-            hit_breakpoint_ids: None,
-        }))
-        .await;
-
-    cx_a.run_until_parked();
-
-    let active_session = debug_panel
-        .update(cx_a, |this, _| this.active_session())
-        .unwrap();
-
-    let running_state = active_session.update(cx_a, |active_session, _| {
-        active_session.running_state().clone()
-    });
-
-    assert_eq!(
-        client.id(),
-        running_state.read_with(cx_a, |running_state, _| running_state.session_id())
-    );
-    assert_eq!(
-        ThreadId(1),
-        running_state.read_with(cx_a, |running_state, _| running_state
-            .selected_thread_id()
-            .unwrap())
-    );
-
-    let shutdown_session = workspace.update(cx_a, |workspace, cx| {
-        workspace.project().update(cx, |project, cx| {
-            project.dap_store().update(cx, |dap_store, cx| {
-                dap_store.shutdown_session(session.read(cx).session_id(), cx)
-            })
-        })
-    });
-
-    client_ssh.update(cx_a, |a, _| {
-        a.shutdown_processes(Some(proto::ShutdownRemoteServer {}), executor)
-    });
-
-    shutdown_session.await.unwrap();
-}
diff --git a/crates/collab/src/tests/test_server.rs b/crates/collab/src/tests/test_server.rs
deleted file mode 100644
index 959d54cf08..0000000000
--- a/crates/collab/src/tests/test_server.rs
+++ /dev/null
@@ -1,915 +0,0 @@
-use crate::{
-    AppState, Config,
-    db::{NewUserParams, UserId, tests::TestDb},
-    executor::Executor,
-    rpc::{CLEANUP_TIMEOUT, Principal, RECONNECT_TIMEOUT, Server, ZedVersion},
-};
-use anyhow::anyhow;
-use call::ActiveCall;
-use channel::{ChannelBuffer, ChannelStore};
-use client::test::{make_get_authenticated_user_response, parse_authorization_header};
-use client::{
-    self, ChannelId, Client, Connection, Credentials, EstablishConnectionError, UserStore,
-    proto::PeerId,
-};
-use clock::FakeSystemClock;
-use collab_ui::channel_view::ChannelView;
-use collections::{HashMap, HashSet};
-
-use fs::FakeFs;
-use futures::{StreamExt as _, channel::oneshot};
-use git::GitHostingProviderRegistry;
-use gpui::{AppContext as _, BackgroundExecutor, Entity, Task, TestAppContext, VisualTestContext};
-use http_client::{FakeHttpClient, Method};
-use language::LanguageRegistry;
-use node_runtime::NodeRuntime;
-use notifications::NotificationStore;
-use parking_lot::Mutex;
-use project::{Project, WorktreeId};
-use remote::RemoteClient;
-use rpc::{
-    RECEIVE_TIMEOUT,
-    proto::{self, ChannelRole},
-};
-use serde_json::json;
-use session::{AppSession, Session};
-use settings::SettingsStore;
-use std::{
-    cell::{Ref, RefCell, RefMut},
-    env,
-    ops::{Deref, DerefMut},
-    path::Path,
-    sync::{
-        Arc,
-        atomic::{AtomicBool, AtomicUsize, Ordering::SeqCst},
-    },
-};
-use util::path;
-use workspace::{Workspace, WorkspaceStore};
-
-use livekit_client::test::TestServer as LivekitTestServer;
-
-pub struct TestServer {
-    pub app_state: Arc<AppState>,
-    pub test_livekit_server: Arc<LivekitTestServer>,
-    pub test_db: TestDb,
-    server: Arc<Server>,
-    next_github_user_id: i32,
-    connection_killers: Arc<Mutex<HashMap<PeerId, Arc<AtomicBool>>>>,
-    forbid_connections: Arc<AtomicBool>,
-}
-
-pub struct TestClient {
-    pub username: String,
-    pub app_state: Arc<workspace::AppState>,
-    channel_store: Entity<ChannelStore>,
-    notification_store: Entity<NotificationStore>,
-    state: RefCell<TestClientState>,
-}
-
-#[derive(Default)]
-struct TestClientState {
-    local_projects: Vec<Entity<Project>>,
-    dev_server_projects: Vec<Entity<Project>>,
-    buffers: HashMap<Entity<Project>, HashSet<Entity<language::Buffer>>>,
-    channel_buffers: HashSet<Entity<ChannelBuffer>>,
-}
-
-pub struct ContactsSummary {
-    pub current: Vec<String>,
-    pub outgoing_requests: Vec<String>,
-    pub incoming_requests: Vec<String>,
-}
-
-impl TestServer {
-    pub async fn start(deterministic: BackgroundExecutor) -> Self {
-        static NEXT_LIVEKIT_SERVER_ID: AtomicUsize = AtomicUsize::new(0);
-
-        let use_postgres = env::var("USE_POSTGRES").ok();
-        let use_postgres = use_postgres.as_deref();
-        let test_db = if use_postgres == Some("true") || use_postgres == Some("1") {
-            TestDb::postgres(deterministic.clone())
-        } else {
-            TestDb::sqlite(deterministic.clone())
-        };
-        let livekit_server_id = NEXT_LIVEKIT_SERVER_ID.fetch_add(1, SeqCst);
-        let livekit_server = LivekitTestServer::create(
-            format!("http://livekit.{}.test", livekit_server_id),
-            format!("devkey-{}", livekit_server_id),
-            format!("secret-{}", livekit_server_id),
-            deterministic.clone(),
-        )
-        .unwrap();
-        let executor = Executor::Deterministic(deterministic.clone());
-        let app_state = Self::build_app_state(&test_db, &livekit_server, executor.clone()).await;
-        let epoch = app_state
-            .db
-            .create_server(&app_state.config.zed_environment)
-            .await
-            .unwrap();
-        let server = Server::new(epoch, app_state.clone());
-        server.start().await.unwrap();
-        // Advance clock to ensure the server's cleanup task is finished.
-        deterministic.advance_clock(CLEANUP_TIMEOUT);
-        Self {
-            app_state,
-            server,
-            connection_killers: Default::default(),
-            forbid_connections: Default::default(),
-            next_github_user_id: 0,
-            test_db,
-            test_livekit_server: livekit_server,
-        }
-    }
-
-    pub async fn start2(
-        cx_a: &mut TestAppContext,
-        cx_b: &mut TestAppContext,
-    ) -> (TestServer, TestClient, TestClient, ChannelId) {
-        let mut server = Self::start(cx_a.executor()).await;
-        let client_a = server.create_client(cx_a, "user_a").await;
-        let client_b = server.create_client(cx_b, "user_b").await;
-        let channel_id = server
-            .make_channel(
-                "test-channel",
-                None,
-                (&client_a, cx_a),
-                &mut [(&client_b, cx_b)],
-            )
-            .await;
-        cx_a.run_until_parked();
-
-        (server, client_a, client_b, channel_id)
-    }
-
-    pub async fn start1(cx: &mut TestAppContext) -> (TestServer, TestClient) {
-        let mut server = Self::start(cx.executor().clone()).await;
-        let client = server.create_client(cx, "user_a").await;
-        (server, client)
-    }
-
-    pub async fn reset(&self) {
-        self.app_state.db.reset();
-        let epoch = self
-            .app_state
-            .db
-            .create_server(&self.app_state.config.zed_environment)
-            .await
-            .unwrap();
-        self.server.reset(epoch);
-    }
-
-    pub async fn create_client(&mut self, cx: &mut TestAppContext, name: &str) -> TestClient {
-        const ACCESS_TOKEN: &str = "the-token";
-
-        let fs = FakeFs::new(cx.executor());
-
-        cx.update(|cx| {
-            gpui_tokio::init(cx);
-            if cx.has_global::<SettingsStore>() {
-                panic!("Same cx used to create two test clients")
-            }
-            let settings = SettingsStore::test(cx);
-            cx.set_global(settings);
-            theme::init(theme::LoadThemes::JustBase, cx);
-            release_channel::init(semver::Version::new(0, 0, 0), cx);
-        });
-
-        let clock = Arc::new(FakeSystemClock::new());
-
-        let user_id = if let Ok(Some(user)) = self.app_state.db.get_user_by_github_login(name).await
-        {
-            user.id
-        } else {
-            let github_user_id = self.next_github_user_id;
-            self.next_github_user_id += 1;
-            self.app_state
-                .db
-                .create_user(
-                    &format!("{name}@example.com"),
-                    None,
-                    false,
-                    NewUserParams {
-                        github_login: name.into(),
-                        github_user_id,
-                    },
-                )
-                .await
-                .expect("creating user failed")
-                .user_id
-        };
-
-        let http = FakeHttpClient::create({
-            let name = name.to_string();
-            move |req| {
-                let name = name.clone();
-                async move {
-                    match (req.method(), req.uri().path()) {
-                        (&Method::GET, "/client/users/me") => {
-                            let credentials = parse_authorization_header(&req);
-                            if credentials
-                                != Some(Credentials {
-                                    user_id: user_id.to_proto(),
-                                    access_token: ACCESS_TOKEN.into(),
-                                })
-                            {
-                                return Ok(http_client::Response::builder()
-                                    .status(401)
-                                    .body("Unauthorized".into())
-                                    .unwrap());
-                            }
-
-                            Ok(http_client::Response::builder()
-                                .status(200)
-                                .body(
-                                    serde_json::to_string(&make_get_authenticated_user_response(
-                                        user_id.0, name,
-                                    ))
-                                    .unwrap()
-                                    .into(),
-                                )
-                                .unwrap())
-                        }
-                        _ => Ok(http_client::Response::builder()
-                            .status(404)
-                            .body("Not Found".into())
-                            .unwrap()),
-                    }
-                }
-            }
-        });
-
-        let client_name = name.to_string();
-        let mut client = cx.update(|cx| Client::new(clock, http.clone(), cx));
-        let server = self.server.clone();
-        let db = self.app_state.db.clone();
-        let connection_killers = self.connection_killers.clone();
-        let forbid_connections = self.forbid_connections.clone();
-
-        Arc::get_mut(&mut client)
-            .unwrap()
-            .set_id(user_id.to_proto())
-            .override_authenticate(move |cx| {
-                cx.spawn(async move |_| {
-                    Ok(Credentials {
-                        user_id: user_id.to_proto(),
-                        access_token: ACCESS_TOKEN.into(),
-                    })
-                })
-            })
-            .override_establish_connection(move |credentials, cx| {
-                assert_eq!(
-                    credentials,
-                    &Credentials {
-                        user_id: user_id.0 as u64,
-                        access_token: ACCESS_TOKEN.into(),
-                    }
-                );
-
-                let server = server.clone();
-                let db = db.clone();
-                let connection_killers = connection_killers.clone();
-                let forbid_connections = forbid_connections.clone();
-                let client_name = client_name.clone();
-                cx.spawn(async move |cx| {
-                    if forbid_connections.load(SeqCst) {
-                        Err(EstablishConnectionError::other(anyhow!(
-                            "server is forbidding connections"
-                        )))
-                    } else {
-                        let (client_conn, server_conn, killed) =
-                            Connection::in_memory(cx.background_executor().clone());
-                        let (connection_id_tx, connection_id_rx) = oneshot::channel();
-                        let user = db
-                            .get_user_by_id(user_id)
-                            .await
-                            .map_err(|e| {
-                                EstablishConnectionError::Other(anyhow!(
-                                    "retrieving user failed: {}",
-                                    e
-                                ))
-                            })?
-                            .unwrap();
-                        cx.background_spawn(server.handle_connection(
-                            server_conn,
-                            client_name,
-                            Principal::User(user),
-                            ZedVersion(semver::Version::new(1, 0, 0)),
-                            Some("test".to_string()),
-                            None,
-                            None,
-                            None,
-                            Some(connection_id_tx),
-                            Executor::Deterministic(cx.background_executor().clone()),
-                            None,
-                        ))
-                        .detach();
-                        let connection_id = connection_id_rx.await.map_err(|e| {
-                            EstablishConnectionError::Other(anyhow!(
-                                "{} (is server shutting down?)",
-                                e
-                            ))
-                        })?;
-                        connection_killers
-                            .lock()
-                            .insert(connection_id.into(), killed);
-                        Ok(client_conn)
-                    }
-                })
-            });
-
-        let git_hosting_provider_registry = cx.update(GitHostingProviderRegistry::default_global);
-        git_hosting_provider_registry
-            .register_hosting_provider(Arc::new(git_hosting_providers::Github::public_instance()));
-
-        let user_store = cx.new(|cx| UserStore::new(client.clone(), cx));
-        let workspace_store = cx.new(|cx| WorkspaceStore::new(client.clone(), cx));
-        let language_registry = Arc::new(LanguageRegistry::test(cx.executor()));
-        let session = cx.new(|cx| AppSession::new(Session::test(), cx));
-        let app_state = Arc::new(workspace::AppState {
-            client: client.clone(),
-            user_store: user_store.clone(),
-            workspace_store,
-            languages: language_registry,
-            fs: fs.clone(),
-            build_window_options: |_, _| Default::default(),
-            node_runtime: NodeRuntime::unavailable(),
-            session,
-        });
-
-        let os_keymap = "keymaps/default-macos.json";
-
-        cx.update(|cx| {
-            theme::init(theme::LoadThemes::JustBase, cx);
-            Project::init(&client, cx);
-            client::init(&client, cx);
-            editor::init(cx);
-            workspace::init(app_state.clone(), cx);
-            call::init(client.clone(), user_store.clone(), cx);
-            channel::init(&client, user_store.clone(), cx);
-            notifications::init(client.clone(), user_store, cx);
-            collab_ui::init(&app_state, cx);
-            file_finder::init(cx);
-            menu::init();
-            cx.bind_keys(
-                settings::KeymapFile::load_asset_allow_partial_failure(os_keymap, cx).unwrap(),
-            );
-            language_model::LanguageModelRegistry::test(cx);
-            assistant_text_thread::init(client.clone(), cx);
-        });
-
-        client
-            .connect(false, &cx.to_async())
-            .await
-            .into_response()
-            .unwrap();
-
-        let client = TestClient {
-            app_state,
-            username: name.to_string(),
-            channel_store: cx.read(ChannelStore::global),
-            notification_store: cx.read(NotificationStore::global),
-            state: Default::default(),
-        };
-        client.wait_for_current_user(cx).await;
-        client
-    }
-
-    pub fn disconnect_client(&self, peer_id: PeerId) {
-        self.connection_killers
-            .lock()
-            .remove(&peer_id)
-            .unwrap()
-            .store(true, SeqCst);
-    }
-
-    pub fn simulate_long_connection_interruption(
-        &self,
-        peer_id: PeerId,
-        deterministic: BackgroundExecutor,
-    ) {
-        self.forbid_connections();
-        self.disconnect_client(peer_id);
-        deterministic.advance_clock(RECEIVE_TIMEOUT + RECONNECT_TIMEOUT);
-        self.allow_connections();
-        deterministic.advance_clock(RECEIVE_TIMEOUT + RECONNECT_TIMEOUT);
-        deterministic.run_until_parked();
-    }
-
-    pub fn forbid_connections(&self) {
-        self.forbid_connections.store(true, SeqCst);
-    }
-
-    pub fn allow_connections(&self) {
-        self.forbid_connections.store(false, SeqCst);
-    }
-
-    pub async fn make_contacts(&self, clients: &mut [(&TestClient, &mut TestAppContext)]) {
-        for ix in 1..clients.len() {
-            let (left, right) = clients.split_at_mut(ix);
-            let (client_a, cx_a) = left.last_mut().unwrap();
-            for (client_b, cx_b) in right {
-                client_a
-                    .app_state
-                    .user_store
-                    .update(*cx_a, |store, cx| {
-                        store.request_contact(client_b.user_id().unwrap(), cx)
-                    })
-                    .await
-                    .unwrap();
-                cx_a.executor().run_until_parked();
-                client_b
-                    .app_state
-                    .user_store
-                    .update(*cx_b, |store, cx| {
-                        store.respond_to_contact_request(client_a.user_id().unwrap(), true, cx)
-                    })
-                    .await
-                    .unwrap();
-            }
-        }
-    }
-
-    pub async fn make_channel(
-        &self,
-        channel: &str,
-        parent: Option<ChannelId>,
-        admin: (&TestClient, &mut TestAppContext),
-        members: &mut [(&TestClient, &mut TestAppContext)],
-    ) -> ChannelId {
-        let (_, admin_cx) = admin;
-        let channel_id = admin_cx
-            .read(ChannelStore::global)
-            .update(admin_cx, |channel_store, cx| {
-                channel_store.create_channel(channel, parent, cx)
-            })
-            .await
-            .unwrap();
-
-        for (member_client, member_cx) in members {
-            admin_cx
-                .read(ChannelStore::global)
-                .update(admin_cx, |channel_store, cx| {
-                    channel_store.invite_member(
-                        channel_id,
-                        member_client.user_id().unwrap(),
-                        ChannelRole::Member,
-                        cx,
-                    )
-                })
-                .await
-                .unwrap();
-
-            admin_cx.executor().run_until_parked();
-
-            member_cx
-                .read(ChannelStore::global)
-                .update(*member_cx, |channels, cx| {
-                    channels.respond_to_channel_invite(channel_id, true, cx)
-                })
-                .await
-                .unwrap();
-        }
-
-        channel_id
-    }
-
-    pub async fn make_public_channel(
-        &self,
-        channel: &str,
-        client: &TestClient,
-        cx: &mut TestAppContext,
-    ) -> ChannelId {
-        let channel_id = self
-            .make_channel(channel, None, (client, cx), &mut [])
-            .await;
-
-        client
-            .channel_store()
-            .update(cx, |channel_store, cx| {
-                channel_store.set_channel_visibility(
-                    channel_id,
-                    proto::ChannelVisibility::Public,
-                    cx,
-                )
-            })
-            .await
-            .unwrap();
-
-        channel_id
-    }
-
-    pub async fn make_channel_tree(
-        &self,
-        channels: &[(&str, Option<&str>)],
-        creator: (&TestClient, &mut TestAppContext),
-    ) -> Vec<ChannelId> {
-        let mut observed_channels = HashMap::default();
-        let mut result = Vec::new();
-        for (channel, parent) in channels {
-            let id;
-            if let Some(parent) = parent {
-                if let Some(parent_id) = observed_channels.get(parent) {
-                    id = self
-                        .make_channel(channel, Some(*parent_id), (creator.0, creator.1), &mut [])
-                        .await;
-                } else {
-                    panic!(
-                        "Edge {}->{} referenced before {} was created",
-                        parent, channel, parent
-                    )
-                }
-            } else {
-                id = self
-                    .make_channel(channel, None, (creator.0, creator.1), &mut [])
-                    .await;
-            }
-
-            observed_channels.insert(channel, id);
-            result.push(id);
-        }
-
-        result
-    }
-
-    pub async fn create_room(&self, clients: &mut [(&TestClient, &mut TestAppContext)]) {
-        self.make_contacts(clients).await;
-
-        let (left, right) = clients.split_at_mut(1);
-        let (_client_a, cx_a) = &mut left[0];
-        let active_call_a = cx_a.read(ActiveCall::global);
-
-        for (client_b, cx_b) in right {
-            let user_id_b = client_b.current_user_id(cx_b).to_proto();
-            active_call_a
-                .update(*cx_a, |call, cx| call.invite(user_id_b, None, cx))
-                .await
-                .unwrap();
-
-            cx_b.executor().run_until_parked();
-            let active_call_b = cx_b.read(ActiveCall::global);
-            active_call_b
-                .update(*cx_b, |call, cx| call.accept_incoming(cx))
-                .await
-                .unwrap();
-        }
-    }
-
-    pub async fn build_app_state(
-        test_db: &TestDb,
-        livekit_test_server: &LivekitTestServer,
-        executor: Executor,
-    ) -> Arc<AppState> {
-        Arc::new(AppState {
-            db: test_db.db().clone(),
-            livekit_client: Some(Arc::new(livekit_test_server.create_api_client())),
-            blob_store_client: None,
-            executor,
-            kinesis_client: None,
-            config: Config {
-                http_port: 0,
-                database_url: "".into(),
-                database_max_connections: 0,
-                api_token: "".into(),
-                invite_link_prefix: "".into(),
-                livekit_server: None,
-                livekit_key: None,
-                livekit_secret: None,
-                llm_database_url: None,
-                llm_database_max_connections: None,
-                llm_database_migrations_path: None,
-                llm_api_secret: None,
-                rust_log: None,
-                log_json: None,
-                zed_environment: "test".into(),
-                blob_store_url: None,
-                blob_store_region: None,
-                blob_store_access_key: None,
-                blob_store_secret_key: None,
-                blob_store_bucket: None,
-                openai_api_key: None,
-                google_ai_api_key: None,
-                anthropic_api_key: None,
-                anthropic_staff_api_key: None,
-                llm_closed_beta_model_name: None,
-                prediction_api_url: None,
-                prediction_api_key: None,
-                prediction_model: None,
-                zed_client_checksum_seed: None,
-                auto_join_channel_id: None,
-                migrations_path: None,
-                seed_path: None,
-                supermaven_admin_api_key: None,
-                kinesis_region: None,
-                kinesis_stream: None,
-                kinesis_access_key: None,
-                kinesis_secret_key: None,
-            },
-        })
-    }
-}
-
-impl Deref for TestServer {
-    type Target = Server;
-
-    fn deref(&self) -> &Self::Target {
-        &self.server
-    }
-}
-
-impl Drop for TestServer {
-    fn drop(&mut self) {
-        self.server.teardown();
-        self.test_livekit_server.teardown().unwrap();
-    }
-}
-
-impl Deref for TestClient {
-    type Target = Arc<Client>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.app_state.client
-    }
-}
-
-impl TestClient {
-    pub fn fs(&self) -> Arc<FakeFs> {
-        self.app_state.fs.as_fake()
-    }
-
-    pub fn channel_store(&self) -> &Entity<ChannelStore> {
-        &self.channel_store
-    }
-
-    pub fn notification_store(&self) -> &Entity<NotificationStore> {
-        &self.notification_store
-    }
-
-    pub fn user_store(&self) -> &Entity<UserStore> {
-        &self.app_state.user_store
-    }
-
-    pub fn language_registry(&self) -> &Arc<LanguageRegistry> {
-        &self.app_state.languages
-    }
-
-    pub fn client(&self) -> &Arc<Client> {
-        &self.app_state.client
-    }
-
-    pub fn current_user_id(&self, cx: &TestAppContext) -> UserId {
-        UserId::from_proto(
-            self.app_state
-                .user_store
-                .read_with(cx, |user_store, _| user_store.current_user().unwrap().id),
-        )
-    }
-
-    pub async fn wait_for_current_user(&self, cx: &TestAppContext) {
-        let mut authed_user = self
-            .app_state
-            .user_store
-            .read_with(cx, |user_store, _| user_store.watch_current_user());
-        while authed_user.next().await.unwrap().is_none() {}
-    }
-
-    pub async fn clear_contacts(&self, cx: &mut TestAppContext) {
-        self.app_state
-            .user_store
-            .update(cx, |store, _| store.clear_contacts())
-            .await;
-    }
-
-    pub fn local_projects(&self) -> impl Deref<Target = Vec<Entity<Project>>> + '_ {
-        Ref::map(self.state.borrow(), |state| &state.local_projects)
-    }
-
-    pub fn dev_server_projects(&self) -> impl Deref<Target = Vec<Entity<Project>>> + '_ {
-        Ref::map(self.state.borrow(), |state| &state.dev_server_projects)
-    }
-
-    pub fn local_projects_mut(&self) -> impl DerefMut<Target = Vec<Entity<Project>>> + '_ {
-        RefMut::map(self.state.borrow_mut(), |state| &mut state.local_projects)
-    }
-
-    pub fn dev_server_projects_mut(&self) -> impl DerefMut<Target = Vec<Entity<Project>>> + '_ {
-        RefMut::map(self.state.borrow_mut(), |state| {
-            &mut state.dev_server_projects
-        })
-    }
-
-    pub fn buffers_for_project<'a>(
-        &'a self,
-        project: &Entity<Project>,
-    ) -> impl DerefMut<Target = HashSet<Entity<language::Buffer>>> + 'a {
-        RefMut::map(self.state.borrow_mut(), |state| {
-            state.buffers.entry(project.clone()).or_default()
-        })
-    }
-
-    pub fn buffers(
-        &self,
-    ) -> impl DerefMut<Target = HashMap<Entity<Project>, HashSet<Entity<language::Buffer>>>> + '_
-    {
-        RefMut::map(self.state.borrow_mut(), |state| &mut state.buffers)
-    }
-
-    pub fn channel_buffers(&self) -> impl DerefMut<Target = HashSet<Entity<ChannelBuffer>>> + '_ {
-        RefMut::map(self.state.borrow_mut(), |state| &mut state.channel_buffers)
-    }
-
-    pub fn summarize_contacts(&self, cx: &TestAppContext) -> ContactsSummary {
-        self.app_state
-            .user_store
-            .read_with(cx, |store, _| ContactsSummary {
-                current: store
-                    .contacts()
-                    .iter()
-                    .map(|contact| contact.user.github_login.clone().to_string())
-                    .collect(),
-                outgoing_requests: store
-                    .outgoing_contact_requests()
-                    .iter()
-                    .map(|user| user.github_login.clone().to_string())
-                    .collect(),
-                incoming_requests: store
-                    .incoming_contact_requests()
-                    .iter()
-                    .map(|user| user.github_login.clone().to_string())
-                    .collect(),
-            })
-    }
-
-    pub async fn build_local_project(
-        &self,
-        root_path: impl AsRef<Path>,
-        cx: &mut TestAppContext,
-    ) -> (Entity<Project>, WorktreeId) {
-        let project = self.build_empty_local_project(cx);
-        let (worktree, _) = project
-            .update(cx, |p, cx| p.find_or_create_worktree(root_path, true, cx))
-            .await
-            .unwrap();
-        worktree
-            .read_with(cx, |tree, _| tree.as_local().unwrap().scan_complete())
-            .await;
-        cx.run_until_parked();
-        (project, worktree.read_with(cx, |tree, _| tree.id()))
-    }
-
-    pub async fn build_ssh_project(
-        &self,
-        root_path: impl AsRef<Path>,
-        ssh: Entity<RemoteClient>,
-        cx: &mut TestAppContext,
-    ) -> (Entity<Project>, WorktreeId) {
-        let project = cx.update(|cx| {
-            Project::remote(
-                ssh,
-                self.client().clone(),
-                self.app_state.node_runtime.clone(),
-                self.app_state.user_store.clone(),
-                self.app_state.languages.clone(),
-                self.app_state.fs.clone(),
-                cx,
-            )
-        });
-        let (worktree, _) = project
-            .update(cx, |p, cx| p.find_or_create_worktree(root_path, true, cx))
-            .await
-            .unwrap();
-        (project, worktree.read_with(cx, |tree, _| tree.id()))
-    }
-
-    pub async fn build_test_project(&self, cx: &mut TestAppContext) -> Entity<Project> {
-        self.fs()
-            .insert_tree(
-                path!("/a"),
-                json!({
-                    "1.txt": "one\none\none",
-                    "2.js": "function two() { return 2; }",
-                    "3.rs": "mod test",
-                }),
-            )
-            .await;
-        self.build_local_project(path!("/a"), cx).await.0
-    }
-
-    pub async fn host_workspace(
-        &self,
-        workspace: &Entity<Workspace>,
-        channel_id: ChannelId,
-        cx: &mut VisualTestContext,
-    ) {
-        cx.update(|_, cx| {
-            let active_call = ActiveCall::global(cx);
-            active_call.update(cx, |call, cx| call.join_channel(channel_id, cx))
-        })
-        .await
-        .unwrap();
-        cx.update(|_, cx| {
-            let active_call = ActiveCall::global(cx);
-            let project = workspace.read(cx).project().clone();
-            active_call.update(cx, |call, cx| call.share_project(project, cx))
-        })
-        .await
-        .unwrap();
-        cx.executor().run_until_parked();
-    }
-
-    pub async fn join_workspace<'a>(
-        &'a self,
-        channel_id: ChannelId,
-        cx: &'a mut TestAppContext,
-    ) -> (Entity<Workspace>, &'a mut VisualTestContext) {
-        cx.update(|cx| workspace::join_channel(channel_id, self.app_state.clone(), None, cx))
-            .await
-            .unwrap();
-        cx.run_until_parked();
-
-        self.active_workspace(cx)
-    }
-
-    pub fn build_empty_local_project(&self, cx: &mut TestAppContext) -> Entity<Project> {
-        cx.update(|cx| {
-            Project::local(
-                self.client().clone(),
-                self.app_state.node_runtime.clone(),
-                self.app_state.user_store.clone(),
-                self.app_state.languages.clone(),
-                self.app_state.fs.clone(),
-                None,
-                cx,
-            )
-        })
-    }
-
-    pub async fn join_remote_project(
-        &self,
-        host_project_id: u64,
-        guest_cx: &mut TestAppContext,
-    ) -> Entity<Project> {
-        let active_call = guest_cx.read(ActiveCall::global);
-        let room = active_call.read_with(guest_cx, |call, _| call.room().unwrap().clone());
-        room.update(guest_cx, |room, cx| {
-            room.join_project(
-                host_project_id,
-                self.app_state.languages.clone(),
-                self.app_state.fs.clone(),
-                cx,
-            )
-        })
-        .await
-        .unwrap()
-    }
-
-    pub fn build_workspace<'a>(
-        &'a self,
-        project: &Entity<Project>,
-        cx: &'a mut TestAppContext,
-    ) -> (Entity<Workspace>, &'a mut VisualTestContext) {
-        cx.add_window_view(|window, cx| {
-            window.activate_window();
-            Workspace::new(None, project.clone(), self.app_state.clone(), window, cx)
-        })
-    }
-
-    pub async fn build_test_workspace<'a>(
-        &'a self,
-        cx: &'a mut TestAppContext,
-    ) -> (Entity<Workspace>, &'a mut VisualTestContext) {
-        let project = self.build_test_project(cx).await;
-        cx.add_window_view(|window, cx| {
-            window.activate_window();
-            Workspace::new(None, project.clone(), self.app_state.clone(), window, cx)
-        })
-    }
-
-    pub fn active_workspace<'a>(
-        &'a self,
-        cx: &'a mut TestAppContext,
-    ) -> (Entity<Workspace>, &'a mut VisualTestContext) {
-        let window = cx.update(|cx| cx.active_window().unwrap().downcast::<Workspace>().unwrap());
-
-        let entity = window.root(cx).unwrap();
-        let cx = VisualTestContext::from_window(*window.deref(), cx).into_mut();
-        // it might be nice to try and cleanup these at the end of each test.
-        (entity, cx)
-    }
-}
-
-pub fn open_channel_notes(
-    channel_id: ChannelId,
-    cx: &mut VisualTestContext,
-) -> Task<anyhow::Result<Entity<ChannelView>>> {
-    let window = cx.update(|_, cx| cx.active_window().unwrap().downcast::<Workspace>().unwrap());
-    let entity = window.root(cx).unwrap();
-
-    cx.update(|window, cx| ChannelView::open(channel_id, None, entity.clone(), window, cx))
-}
-
-impl Drop for TestClient {
-    fn drop(&mut self) {
-        self.app_state.client.teardown();
-    }
-}
diff --git a/crates/collab_ui/Cargo.toml b/crates/collab_ui/Cargo.toml
deleted file mode 100644
index 4abeb1324c..0000000000
--- a/crates/collab_ui/Cargo.toml
+++ /dev/null
@@ -1,78 +0,0 @@
-[package]
-name = "collab_ui"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/collab_ui.rs"
-doctest = false
-
-[features]
-default = []
-stories = ["dep:story"]
-test-support = [
-    "call/test-support",
-    "client/test-support",
-    "collections/test-support",
-    "editor/test-support",
-    "gpui/test-support",
-    "project/test-support",
-    "settings/test-support",
-    "util/test-support",
-    "workspace/test-support",
-    "http_client/test-support",
-]
-
-[dependencies]
-anyhow.workspace = true
-call.workspace = true
-channel.workspace = true
-chrono.workspace = true
-client.workspace = true
-collections.workspace = true
-db.workspace = true
-editor.workspace = true
-futures.workspace = true
-fuzzy.workspace = true
-gpui.workspace = true
-log.workspace = true
-menu.workspace = true
-notifications.workspace = true
-picker.workspace = true
-project.workspace = true
-release_channel.workspace = true
-rpc.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-smallvec.workspace = true
-story = { workspace = true, optional = true }
-telemetry.workspace = true
-theme.workspace = true
-time.workspace = true
-time_format.workspace = true
-title_bar.workspace = true
-ui.workspace = true
-util.workspace = true
-workspace.workspace = true
-
-[dev-dependencies]
-call = { workspace = true, features = ["test-support"] }
-client = { workspace = true, features = ["test-support"] }
-collections = { workspace = true, features = ["test-support"] }
-editor = { workspace = true, features = ["test-support"] }
-gpui = { workspace = true, features = ["test-support"] }
-notifications = { workspace = true, features = ["test-support"] }
-pretty_assertions.workspace = true
-project = { workspace = true, features = ["test-support"] }
-rpc = { workspace = true, features = ["test-support"] }
-settings = { workspace = true, features = ["test-support"] }
-tree-sitter-md.workspace = true
-util = { workspace = true, features = ["test-support"] }
-http_client = { workspace = true, features = ["test-support"] }
-workspace = { workspace = true, features = ["test-support"] }
diff --git a/crates/collab_ui/LICENSE-GPL b/crates/collab_ui/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/collab_ui/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/collab_ui/src/channel_view.rs b/crates/collab_ui/src/channel_view.rs
deleted file mode 100644
index 8959c6ccbe..0000000000
--- a/crates/collab_ui/src/channel_view.rs
+++ /dev/null
@@ -1,712 +0,0 @@
-use anyhow::Result;
-use call::ActiveCall;
-use channel::{Channel, ChannelBuffer, ChannelBufferEvent, ChannelStore};
-use client::{
-    ChannelId, Collaborator, ParticipantIndex,
-    proto::{self, PeerId},
-};
-use collections::HashMap;
-use editor::{
-    CollaborationHub, DisplayPoint, Editor, EditorEvent, SelectionEffects,
-    display_map::ToDisplayPoint, scroll::Autoscroll,
-};
-use gpui::{
-    App, ClipboardItem, Context, Entity, EventEmitter, Focusable, Pixels, Point, Render,
-    Subscription, Task, VisualContext as _, WeakEntity, Window, actions,
-};
-use project::Project;
-use rpc::proto::ChannelVisibility;
-use std::{
-    any::{Any, TypeId},
-    sync::Arc,
-};
-use ui::prelude::*;
-use util::ResultExt;
-use workspace::{CollaboratorId, item::TabContentParams};
-use workspace::{
-    ItemNavHistory, Pane, SaveIntent, Toast, ViewId, Workspace, WorkspaceId,
-    item::{FollowableItem, Item, ItemEvent},
-    searchable::SearchableItemHandle,
-};
-use workspace::{item::Dedup, notifications::NotificationId};
-
-actions!(
-    collab,
-    [
-        /// Copies a link to the current position in the channel buffer.
-        CopyLink
-    ]
-);
-
-pub fn init(cx: &mut App) {
-    workspace::FollowableViewRegistry::register::<ChannelView>(cx)
-}
-
-pub struct ChannelView {
-    pub editor: Entity<Editor>,
-    workspace: WeakEntity<Workspace>,
-    project: Entity<Project>,
-    channel_store: Entity<ChannelStore>,
-    channel_buffer: Entity<ChannelBuffer>,
-    remote_id: Option<ViewId>,
-    _editor_event_subscription: Subscription,
-    _reparse_subscription: Option<Subscription>,
-}
-
-impl ChannelView {
-    pub fn open(
-        channel_id: ChannelId,
-        link_position: Option<String>,
-        workspace: Entity<Workspace>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<Entity<Self>>> {
-        let pane = workspace.read(cx).active_pane().clone();
-        let channel_view = Self::open_in_pane(
-            channel_id,
-            link_position,
-            pane.clone(),
-            workspace,
-            window,
-            cx,
-        );
-        window.spawn(cx, async move |cx| {
-            let channel_view = channel_view.await?;
-            pane.update_in(cx, |pane, window, cx| {
-                telemetry::event!(
-                    "Channel Notes Opened",
-                    channel_id,
-                    room_id = ActiveCall::global(cx)
-                        .read(cx)
-                        .room()
-                        .map(|r| r.read(cx).id())
-                );
-                pane.add_item(Box::new(channel_view.clone()), true, true, None, window, cx);
-            })?;
-            anyhow::Ok(channel_view)
-        })
-    }
-
-    pub fn open_in_pane(
-        channel_id: ChannelId,
-        link_position: Option<String>,
-        pane: Entity<Pane>,
-        workspace: Entity<Workspace>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<Entity<Self>>> {
-        let channel_view = Self::load(channel_id, workspace, window, cx);
-        window.spawn(cx, async move |cx| {
-            let channel_view = channel_view.await?;
-
-            pane.update_in(cx, |pane, window, cx| {
-                let buffer_id = channel_view.read(cx).channel_buffer.read(cx).remote_id(cx);
-
-                let existing_view = pane
-                    .items_of_type::<Self>()
-                    .find(|view| view.read(cx).channel_buffer.read(cx).remote_id(cx) == buffer_id);
-
-                // If this channel buffer is already open in this pane, just return it.
-                if let Some(existing_view) = existing_view.clone()
-                    && existing_view.read(cx).channel_buffer == channel_view.read(cx).channel_buffer
-                {
-                    if let Some(link_position) = link_position {
-                        existing_view.update(cx, |channel_view, cx| {
-                            channel_view.focus_position_from_link(link_position, true, window, cx)
-                        });
-                    }
-                    return existing_view;
-                }
-
-                // If the pane contained a disconnected view for this channel buffer,
-                // replace that.
-                if let Some(existing_item) = existing_view
-                    && let Some(ix) = pane.index_for_item(&existing_item)
-                {
-                    pane.close_item_by_id(existing_item.entity_id(), SaveIntent::Skip, window, cx)
-                        .detach();
-                    pane.add_item(
-                        Box::new(channel_view.clone()),
-                        true,
-                        true,
-                        Some(ix),
-                        window,
-                        cx,
-                    );
-                }
-
-                if let Some(link_position) = link_position {
-                    channel_view.update(cx, |channel_view, cx| {
-                        channel_view.focus_position_from_link(link_position, true, window, cx)
-                    });
-                }
-
-                channel_view
-            })
-        })
-    }
-
-    pub fn load(
-        channel_id: ChannelId,
-        workspace: Entity<Workspace>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<Entity<Self>>> {
-        let weak_workspace = workspace.downgrade();
-        let workspace = workspace.read(cx);
-        let project = workspace.project().to_owned();
-        let channel_store = ChannelStore::global(cx);
-        let language_registry = workspace.app_state().languages.clone();
-        let markdown = language_registry.language_for_name("Markdown");
-        let channel_buffer =
-            channel_store.update(cx, |store, cx| store.open_channel_buffer(channel_id, cx));
-
-        window.spawn(cx, async move |cx| {
-            let channel_buffer = channel_buffer.await?;
-            let markdown = markdown.await.log_err();
-
-            channel_buffer.update(cx, |channel_buffer, cx| {
-                channel_buffer.buffer().update(cx, |buffer, cx| {
-                    buffer.set_language_registry(language_registry);
-                    let Some(markdown) = markdown else {
-                        return;
-                    };
-                    buffer.set_language(Some(markdown), cx);
-                })
-            })?;
-
-            cx.new_window_entity(|window, cx| {
-                let mut this = Self::new(
-                    project,
-                    weak_workspace,
-                    channel_store,
-                    channel_buffer,
-                    window,
-                    cx,
-                );
-                this.acknowledge_buffer_version(cx);
-                this
-            })
-        })
-    }
-
-    pub fn new(
-        project: Entity<Project>,
-        workspace: WeakEntity<Workspace>,
-        channel_store: Entity<ChannelStore>,
-        channel_buffer: Entity<ChannelBuffer>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let buffer = channel_buffer.read(cx).buffer();
-        let this = cx.entity().downgrade();
-        let editor = cx.new(|cx| {
-            let mut editor = Editor::for_buffer(buffer, None, window, cx);
-            editor.set_collaboration_hub(Box::new(ChannelBufferCollaborationHub(
-                channel_buffer.clone(),
-            )));
-            editor.set_custom_context_menu(move |_, position, window, cx| {
-                let this = this.clone();
-                Some(ui::ContextMenu::build(window, cx, move |menu, _, _| {
-                    menu.entry("Copy link to section", None, move |window, cx| {
-                        this.update(cx, |this, cx| {
-                            this.copy_link_for_position(position, window, cx)
-                        })
-                        .ok();
-                    })
-                }))
-            });
-            editor
-        });
-        let _editor_event_subscription =
-            cx.subscribe(&editor, |_, _, e: &EditorEvent, cx| cx.emit(e.clone()));
-
-        cx.subscribe_in(&channel_buffer, window, Self::handle_channel_buffer_event)
-            .detach();
-
-        Self {
-            editor,
-            workspace,
-            project,
-            channel_store,
-            channel_buffer,
-            remote_id: None,
-            _editor_event_subscription,
-            _reparse_subscription: None,
-        }
-    }
-
-    fn focus_position_from_link(
-        &mut self,
-        position: String,
-        first_attempt: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let position = Channel::slug(&position).to_lowercase();
-        let snapshot = self
-            .editor
-            .update(cx, |editor, cx| editor.snapshot(window, cx));
-
-        if let Some(outline) = snapshot.buffer_snapshot().outline(None)
-            && let Some(item) = outline
-                .items
-                .iter()
-                .find(|item| &Channel::slug(&item.text).to_lowercase() == &position)
-        {
-            self.editor.update(cx, |editor, cx| {
-                editor.change_selections(
-                    SelectionEffects::scroll(Autoscroll::focused()),
-                    window,
-                    cx,
-                    |s| s.replace_cursors_with(|map| vec![item.range.start.to_display_point(map)]),
-                )
-            });
-            return;
-        }
-
-        if !first_attempt {
-            return;
-        }
-        self._reparse_subscription = Some(cx.subscribe_in(
-            &self.editor,
-            window,
-            move |this, _, e: &EditorEvent, window, cx| {
-                match e {
-                    EditorEvent::Reparsed(_) => {
-                        this.focus_position_from_link(position.clone(), false, window, cx);
-                        this._reparse_subscription.take();
-                    }
-                    EditorEvent::Edited { .. } | EditorEvent::SelectionsChanged { local: true } => {
-                        this._reparse_subscription.take();
-                    }
-                    _ => {}
-                };
-            },
-        ));
-    }
-
-    fn copy_link(&mut self, _: &CopyLink, window: &mut Window, cx: &mut Context<Self>) {
-        let position = self.editor.update(cx, |editor, cx| {
-            editor
-                .selections
-                .newest_display(&editor.display_snapshot(cx))
-                .start
-        });
-        self.copy_link_for_position(position, window, cx)
-    }
-
-    fn copy_link_for_position(
-        &self,
-        position: DisplayPoint,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let snapshot = self
-            .editor
-            .update(cx, |editor, cx| editor.snapshot(window, cx));
-
-        let mut closest_heading = None;
-
-        if let Some(outline) = snapshot.buffer_snapshot().outline(None) {
-            for item in outline.items {
-                if item.range.start.to_display_point(&snapshot) > position {
-                    break;
-                }
-                closest_heading = Some(item);
-            }
-        }
-
-        let Some(channel) = self.channel(cx) else {
-            return;
-        };
-
-        let link = channel.notes_link(closest_heading.map(|heading| heading.text), cx);
-        cx.write_to_clipboard(ClipboardItem::new_string(link));
-        self.workspace
-            .update(cx, |workspace, cx| {
-                struct CopyLinkForPositionToast;
-
-                workspace.show_toast(
-                    Toast::new(
-                        NotificationId::unique::<CopyLinkForPositionToast>(),
-                        "Link copied to clipboard",
-                    ),
-                    cx,
-                );
-            })
-            .ok();
-    }
-
-    pub fn channel(&self, cx: &App) -> Option<Arc<Channel>> {
-        self.channel_buffer.read(cx).channel(cx)
-    }
-
-    fn handle_channel_buffer_event(
-        &mut self,
-        _: &Entity<ChannelBuffer>,
-        event: &ChannelBufferEvent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            ChannelBufferEvent::Disconnected => self.editor.update(cx, |editor, cx| {
-                editor.set_read_only(true);
-                cx.notify();
-            }),
-            ChannelBufferEvent::Connected => self.editor.update(cx, |editor, cx| {
-                editor.set_read_only(false);
-                cx.notify();
-            }),
-            ChannelBufferEvent::ChannelChanged => {
-                self.editor.update(cx, |_, cx| {
-                    cx.emit(editor::EditorEvent::TitleChanged);
-                    cx.notify()
-                });
-            }
-            ChannelBufferEvent::BufferEdited => {
-                if self.editor.read(cx).is_focused(window) {
-                    self.acknowledge_buffer_version(cx);
-                } else {
-                    self.channel_store.update(cx, |store, cx| {
-                        let channel_buffer = self.channel_buffer.read(cx);
-                        store.update_latest_notes_version(
-                            channel_buffer.channel_id,
-                            channel_buffer.epoch(),
-                            &channel_buffer.buffer().read(cx).version(),
-                            cx,
-                        )
-                    });
-                }
-            }
-            ChannelBufferEvent::CollaboratorsChanged => {}
-        }
-    }
-
-    fn acknowledge_buffer_version(&mut self, cx: &mut Context<ChannelView>) {
-        self.channel_store.update(cx, |store, cx| {
-            let channel_buffer = self.channel_buffer.read(cx);
-            store.acknowledge_notes_version(
-                channel_buffer.channel_id,
-                channel_buffer.epoch(),
-                &channel_buffer.buffer().read(cx).version(),
-                cx,
-            )
-        });
-        self.channel_buffer.update(cx, |buffer, cx| {
-            buffer.acknowledge_buffer_version(cx);
-        });
-    }
-
-    fn get_channel(&self, cx: &App) -> (SharedString, Option<SharedString>) {
-        if let Some(channel) = self.channel(cx) {
-            let status = match (
-                self.channel_buffer.read(cx).buffer().read(cx).read_only(),
-                self.channel_buffer.read(cx).is_connected(),
-            ) {
-                (false, true) => None,
-                (true, true) => Some("read-only"),
-                (_, false) => Some("disconnected"),
-            };
-
-            (channel.name.clone(), status.map(Into::into))
-        } else {
-            ("<unknown>".into(), Some("disconnected".into()))
-        }
-    }
-}
-
-impl EventEmitter<EditorEvent> for ChannelView {}
-
-impl Render for ChannelView {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        div()
-            .size_full()
-            .on_action(cx.listener(Self::copy_link))
-            .child(self.editor.clone())
-    }
-}
-
-impl Focusable for ChannelView {
-    fn focus_handle(&self, cx: &App) -> gpui::FocusHandle {
-        self.editor.read(cx).focus_handle(cx)
-    }
-}
-
-impl Item for ChannelView {
-    type Event = EditorEvent;
-
-    fn act_as_type<'a>(
-        &'a self,
-        type_id: TypeId,
-        self_handle: &'a Entity<Self>,
-        _: &'a App,
-    ) -> Option<gpui::AnyEntity> {
-        if type_id == TypeId::of::<Self>() {
-            Some(self_handle.clone().into())
-        } else if type_id == TypeId::of::<Editor>() {
-            Some(self.editor.clone().into())
-        } else {
-            None
-        }
-    }
-
-    fn tab_icon(&self, _: &Window, cx: &App) -> Option<Icon> {
-        let channel = self.channel(cx)?;
-        let icon = match channel.visibility {
-            ChannelVisibility::Public => IconName::Public,
-            ChannelVisibility::Members => IconName::Hash,
-        };
-
-        Some(Icon::new(icon))
-    }
-
-    fn tab_content_text(&self, _detail: usize, cx: &App) -> SharedString {
-        let (name, status) = self.get_channel(cx);
-        if let Some(status) = status {
-            format!("{name} - {status}").into()
-        } else {
-            name
-        }
-    }
-
-    fn tab_content(&self, params: TabContentParams, _: &Window, cx: &App) -> gpui::AnyElement {
-        let (name, status) = self.get_channel(cx);
-        h_flex()
-            .gap_2()
-            .child(
-                Label::new(name)
-                    .color(params.text_color())
-                    .when(params.preview, |this| this.italic()),
-            )
-            .when_some(status, |element, status| {
-                element.child(
-                    Label::new(status)
-                        .size(LabelSize::XSmall)
-                        .color(Color::Muted),
-                )
-            })
-            .into_any_element()
-    }
-
-    fn telemetry_event_text(&self) -> Option<&'static str> {
-        None
-    }
-
-    fn can_split(&self) -> bool {
-        true
-    }
-
-    fn clone_on_split(
-        &self,
-        _: Option<WorkspaceId>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Option<Entity<Self>>> {
-        Task::ready(Some(cx.new(|cx| {
-            Self::new(
-                self.project.clone(),
-                self.workspace.clone(),
-                self.channel_store.clone(),
-                self.channel_buffer.clone(),
-                window,
-                cx,
-            )
-        })))
-    }
-
-    fn navigate(
-        &mut self,
-        data: Box<dyn Any>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> bool {
-        self.editor
-            .update(cx, |editor, cx| editor.navigate(data, window, cx))
-    }
-
-    fn deactivated(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.editor
-            .update(cx, |item, cx| item.deactivated(window, cx))
-    }
-
-    fn set_nav_history(
-        &mut self,
-        history: ItemNavHistory,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.editor.update(cx, |editor, cx| {
-            Item::set_nav_history(editor, history, window, cx)
-        })
-    }
-
-    fn as_searchable(&self, _: &Entity<Self>, _: &App) -> Option<Box<dyn SearchableItemHandle>> {
-        Some(Box::new(self.editor.clone()))
-    }
-
-    fn show_toolbar(&self) -> bool {
-        true
-    }
-
-    fn pixel_position_of_cursor(&self, cx: &App) -> Option<Point<Pixels>> {
-        self.editor.read(cx).pixel_position_of_cursor(cx)
-    }
-
-    fn to_item_events(event: &EditorEvent, f: impl FnMut(ItemEvent)) {
-        Editor::to_item_events(event, f)
-    }
-}
-
-impl FollowableItem for ChannelView {
-    fn remote_id(&self) -> Option<workspace::ViewId> {
-        self.remote_id
-    }
-
-    fn to_state_proto(&self, window: &Window, cx: &App) -> Option<proto::view::Variant> {
-        let channel_buffer = self.channel_buffer.read(cx);
-        if !channel_buffer.is_connected() {
-            return None;
-        }
-
-        Some(proto::view::Variant::ChannelView(
-            proto::view::ChannelView {
-                channel_id: channel_buffer.channel_id.0,
-                editor: if let Some(proto::view::Variant::Editor(proto)) =
-                    self.editor.read(cx).to_state_proto(window, cx)
-                {
-                    Some(proto)
-                } else {
-                    None
-                },
-            },
-        ))
-    }
-
-    fn from_state_proto(
-        workspace: Entity<workspace::Workspace>,
-        remote_id: workspace::ViewId,
-        state: &mut Option<proto::view::Variant>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<gpui::Task<anyhow::Result<Entity<Self>>>> {
-        let Some(proto::view::Variant::ChannelView(_)) = state else {
-            return None;
-        };
-        let Some(proto::view::Variant::ChannelView(state)) = state.take() else {
-            unreachable!()
-        };
-
-        let open = ChannelView::load(ChannelId(state.channel_id), workspace, window, cx);
-
-        Some(window.spawn(cx, async move |cx| {
-            let this = open.await?;
-
-            let task = this.update_in(cx, |this, window, cx| {
-                this.remote_id = Some(remote_id);
-
-                if let Some(state) = state.editor {
-                    Some(this.editor.update(cx, |editor, cx| {
-                        editor.apply_update_proto(
-                            &this.project,
-                            proto::update_view::Variant::Editor(proto::update_view::Editor {
-                                selections: state.selections,
-                                pending_selection: state.pending_selection,
-                                scroll_top_anchor: state.scroll_top_anchor,
-                                scroll_x: state.scroll_x,
-                                scroll_y: state.scroll_y,
-                                ..Default::default()
-                            }),
-                            window,
-                            cx,
-                        )
-                    }))
-                } else {
-                    None
-                }
-            })?;
-
-            if let Some(task) = task {
-                task.await?;
-            }
-
-            Ok(this)
-        }))
-    }
-
-    fn add_event_to_update_proto(
-        &self,
-        event: &EditorEvent,
-        update: &mut Option<proto::update_view::Variant>,
-        window: &Window,
-        cx: &App,
-    ) -> bool {
-        self.editor
-            .read(cx)
-            .add_event_to_update_proto(event, update, window, cx)
-    }
-
-    fn apply_update_proto(
-        &mut self,
-        project: &Entity<Project>,
-        message: proto::update_view::Variant,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> gpui::Task<anyhow::Result<()>> {
-        self.editor.update(cx, |editor, cx| {
-            editor.apply_update_proto(project, message, window, cx)
-        })
-    }
-
-    fn set_leader_id(
-        &mut self,
-        leader_id: Option<CollaboratorId>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.editor
-            .update(cx, |editor, cx| editor.set_leader_id(leader_id, window, cx))
-    }
-
-    fn is_project_item(&self, _window: &Window, _cx: &App) -> bool {
-        false
-    }
-
-    fn to_follow_event(event: &Self::Event) -> Option<workspace::item::FollowEvent> {
-        Editor::to_follow_event(event)
-    }
-
-    fn dedup(&self, existing: &Self, _: &Window, cx: &App) -> Option<Dedup> {
-        let existing = existing.channel_buffer.read(cx);
-        if self.channel_buffer.read(cx).channel_id == existing.channel_id {
-            if existing.is_connected() {
-                Some(Dedup::KeepExisting)
-            } else {
-                Some(Dedup::ReplaceExisting)
-            }
-        } else {
-            None
-        }
-    }
-}
-
-struct ChannelBufferCollaborationHub(Entity<ChannelBuffer>);
-
-impl CollaborationHub for ChannelBufferCollaborationHub {
-    fn collaborators<'a>(&self, cx: &'a App) -> &'a HashMap<PeerId, Collaborator> {
-        self.0.read(cx).collaborators()
-    }
-
-    fn user_participant_indices<'a>(&self, cx: &'a App) -> &'a HashMap<u64, ParticipantIndex> {
-        self.0.read(cx).user_store().read(cx).participant_indices()
-    }
-
-    fn user_names(&self, cx: &App) -> HashMap<u64, SharedString> {
-        let user_ids = self.collaborators(cx).values().map(|c| c.user_id);
-        self.0
-            .read(cx)
-            .user_store()
-            .read(cx)
-            .participant_names(user_ids, cx)
-    }
-}
diff --git a/crates/collab_ui/src/collab_panel.rs b/crates/collab_ui/src/collab_panel.rs
deleted file mode 100644
index 2f1e2842cb..0000000000
--- a/crates/collab_ui/src/collab_panel.rs
+++ /dev/null
@@ -1,3303 +0,0 @@
-mod channel_modal;
-mod contact_finder;
-
-use self::channel_modal::ChannelModal;
-use crate::{CollaborationPanelSettings, channel_view::ChannelView};
-use anyhow::Context as _;
-use call::ActiveCall;
-use channel::{Channel, ChannelEvent, ChannelStore};
-use client::{ChannelId, Client, Contact, User, UserStore};
-use collections::{HashMap, HashSet};
-use contact_finder::ContactFinder;
-use db::kvp::KEY_VALUE_STORE;
-use editor::{Editor, EditorElement, EditorStyle};
-use fuzzy::{StringMatch, StringMatchCandidate, match_strings};
-use gpui::{
-    AnyElement, App, AsyncWindowContext, Bounds, ClickEvent, ClipboardItem, Context, DismissEvent,
-    Div, Entity, EventEmitter, FocusHandle, Focusable, FontStyle, InteractiveElement, IntoElement,
-    KeyContext, ListOffset, ListState, MouseDownEvent, ParentElement, Pixels, Point, PromptLevel,
-    Render, SharedString, Styled, Subscription, Task, TextStyle, WeakEntity, Window, actions,
-    anchored, canvas, deferred, div, fill, list, point, prelude::*, px,
-};
-use menu::{Cancel, Confirm, SecondaryConfirm, SelectNext, SelectPrevious};
-use project::{Fs, Project};
-use rpc::{
-    ErrorCode, ErrorExt,
-    proto::{self, ChannelVisibility, PeerId},
-};
-use serde::{Deserialize, Serialize};
-use settings::Settings;
-use smallvec::SmallVec;
-use std::{mem, sync::Arc};
-use theme::{ActiveTheme, ThemeSettings};
-use ui::{
-    Avatar, AvatarAvailabilityIndicator, Button, Color, ContextMenu, Facepile, HighlightedLabel,
-    Icon, IconButton, IconName, IconSize, Indicator, Label, ListHeader, ListItem, Tab, Tooltip,
-    prelude::*, tooltip_container,
-};
-use util::{ResultExt, TryFutureExt, maybe};
-use workspace::{
-    CopyRoomId, Deafen, LeaveCall, Mute, OpenChannelNotes, ScreenShare, ShareProject, Workspace,
-    dock::{DockPosition, Panel, PanelEvent},
-    notifications::{DetachAndPromptErr, NotifyResultExt},
-};
-
-actions!(
-    collab_panel,
-    [
-        /// Toggles focus on the collaboration panel.
-        ToggleFocus,
-        /// Removes the selected channel or contact.
-        Remove,
-        /// Opens the context menu for the selected item.
-        Secondary,
-        /// Collapses the selected channel in the tree view.
-        CollapseSelectedChannel,
-        /// Expands the selected channel in the tree view.
-        ExpandSelectedChannel,
-        /// Opens the meeting notes for the selected channel in the panel.
-        ///
-        /// Use `collab::OpenChannelNotes` to open the channel notes for the current call.
-        OpenSelectedChannelNotes,
-        /// Starts moving a channel to a new location.
-        StartMoveChannel,
-        /// Moves the selected item to the current location.
-        MoveSelected,
-        /// Inserts a space character in the filter input.
-        InsertSpace,
-        /// Moves the selected channel up in the list.
-        MoveChannelUp,
-        /// Moves the selected channel down in the list.
-        MoveChannelDown,
-    ]
-);
-
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
-struct ChannelMoveClipboard {
-    channel_id: ChannelId,
-}
-
-const COLLABORATION_PANEL_KEY: &str = "CollaborationPanel";
-
-pub fn init(cx: &mut App) {
-    cx.observe_new(|workspace: &mut Workspace, _, _| {
-        workspace.register_action(|workspace, _: &ToggleFocus, window, cx| {
-            workspace.toggle_panel_focus::<CollabPanel>(window, cx);
-            if let Some(collab_panel) = workspace.panel::<CollabPanel>(cx) {
-                collab_panel.update(cx, |panel, cx| {
-                    panel.filter_editor.update(cx, |editor, cx| {
-                        if editor.snapshot(window, cx).is_focused() {
-                            editor.select_all(&Default::default(), window, cx);
-                        }
-                    });
-                })
-            }
-        });
-        workspace.register_action(|_, _: &OpenChannelNotes, window, cx| {
-            let channel_id = ActiveCall::global(cx)
-                .read(cx)
-                .room()
-                .and_then(|room| room.read(cx).channel_id());
-
-            if let Some(channel_id) = channel_id {
-                let workspace = cx.entity();
-                window.defer(cx, move |window, cx| {
-                    ChannelView::open(channel_id, None, workspace, window, cx)
-                        .detach_and_log_err(cx)
-                });
-            }
-        });
-        // TODO: make it possible to bind this one to a held key for push to talk?
-        // how to make "toggle_on_modifiers_press" contextual?
-        workspace.register_action(|_, _: &Mute, _, cx| title_bar::collab::toggle_mute(cx));
-        workspace.register_action(|_, _: &Deafen, _, cx| title_bar::collab::toggle_deafen(cx));
-        workspace.register_action(|_, _: &LeaveCall, window, cx| {
-            CollabPanel::leave_call(window, cx);
-        });
-        workspace.register_action(|workspace, _: &CopyRoomId, window, cx| {
-            use workspace::notifications::{NotificationId, NotifyTaskExt as _};
-
-            struct RoomIdCopiedToast;
-
-            if let Some(room) = ActiveCall::global(cx).read(cx).room() {
-                let romo_id_fut = room.read(cx).room_id();
-                cx.spawn(async move |workspace, cx| {
-                    let room_id = romo_id_fut.await.context("Failed to get livekit room")?;
-                    workspace.update(cx, |workspace, cx| {
-                        cx.write_to_clipboard(ClipboardItem::new_string(room_id));
-                        workspace.show_toast(
-                            workspace::Toast::new(
-                                NotificationId::unique::<RoomIdCopiedToast>(),
-                                "Room ID copied to clipboard",
-                            )
-                            .autohide(),
-                            cx,
-                        );
-                    })
-                })
-                .detach_and_notify_err(window, cx);
-            } else {
-                workspace.show_error(&"There’s no active call; join one first.", cx);
-            }
-        });
-        workspace.register_action(|workspace, _: &ShareProject, window, cx| {
-            let project = workspace.project().clone();
-            println!("{project:?}");
-            window.defer(cx, move |_window, cx| {
-                ActiveCall::global(cx).update(cx, move |call, cx| {
-                    if let Some(room) = call.room() {
-                        println!("{room:?}");
-                        if room.read(cx).is_sharing_project() {
-                            call.unshare_project(project, cx).ok();
-                        } else {
-                            call.share_project(project, cx).detach_and_log_err(cx);
-                        }
-                    }
-                });
-            });
-        });
-        workspace.register_action(|_, _: &ScreenShare, window, cx| {
-            let room = ActiveCall::global(cx).read(cx).room().cloned();
-            if let Some(room) = room {
-                window.defer(cx, move |_window, cx| {
-                    room.update(cx, |room, cx| {
-                        if room.is_sharing_screen() {
-                            room.unshare_screen(true, cx).ok();
-                        } else {
-                            let sources = cx.screen_capture_sources();
-
-                            cx.spawn(async move |room, cx| {
-                                let sources = sources.await??;
-                                let first = sources.into_iter().next();
-                                if let Some(first) = first {
-                                    room.update(cx, |room, cx| room.share_screen(first, cx))?
-                                        .await
-                                } else {
-                                    Ok(())
-                                }
-                            })
-                            .detach_and_log_err(cx);
-                        };
-                    });
-                });
-            }
-        });
-    })
-    .detach();
-}
-
-#[derive(Debug)]
-pub enum ChannelEditingState {
-    Create {
-        location: Option<ChannelId>,
-        pending_name: Option<String>,
-    },
-    Rename {
-        location: ChannelId,
-        pending_name: Option<String>,
-    },
-}
-
-impl ChannelEditingState {
-    fn pending_name(&self) -> Option<String> {
-        match self {
-            ChannelEditingState::Create { pending_name, .. } => pending_name.clone(),
-            ChannelEditingState::Rename { pending_name, .. } => pending_name.clone(),
-        }
-    }
-}
-
-pub struct CollabPanel {
-    width: Option<Pixels>,
-    fs: Arc<dyn Fs>,
-    focus_handle: FocusHandle,
-    channel_clipboard: Option<ChannelMoveClipboard>,
-    pending_serialization: Task<Option<()>>,
-    context_menu: Option<(Entity<ContextMenu>, Point<Pixels>, Subscription)>,
-    list_state: ListState,
-    filter_editor: Entity<Editor>,
-    channel_name_editor: Entity<Editor>,
-    channel_editing_state: Option<ChannelEditingState>,
-    entries: Vec<ListEntry>,
-    selection: Option<usize>,
-    channel_store: Entity<ChannelStore>,
-    user_store: Entity<UserStore>,
-    client: Arc<Client>,
-    project: Entity<Project>,
-    match_candidates: Vec<StringMatchCandidate>,
-    subscriptions: Vec<Subscription>,
-    collapsed_sections: Vec<Section>,
-    collapsed_channels: Vec<ChannelId>,
-    workspace: WeakEntity<Workspace>,
-}
-
-#[derive(Serialize, Deserialize)]
-struct SerializedCollabPanel {
-    width: Option<Pixels>,
-    collapsed_channels: Option<Vec<u64>>,
-}
-
-#[derive(Clone, Copy, PartialEq, Eq, Debug, PartialOrd, Ord)]
-enum Section {
-    ActiveCall,
-    Channels,
-    ChannelInvites,
-    ContactRequests,
-    Contacts,
-    Online,
-    Offline,
-}
-
-#[derive(Clone, Debug)]
-enum ListEntry {
-    Header(Section),
-    CallParticipant {
-        user: Arc<User>,
-        peer_id: Option<PeerId>,
-        is_pending: bool,
-        role: proto::ChannelRole,
-    },
-    ParticipantProject {
-        project_id: u64,
-        worktree_root_names: Vec<String>,
-        host_user_id: u64,
-        is_last: bool,
-    },
-    ParticipantScreen {
-        peer_id: Option<PeerId>,
-        is_last: bool,
-    },
-    IncomingRequest(Arc<User>),
-    OutgoingRequest(Arc<User>),
-    ChannelInvite(Arc<Channel>),
-    Channel {
-        channel: Arc<Channel>,
-        depth: usize,
-        has_children: bool,
-        // `None` when the channel is a parent of a matched channel.
-        string_match: Option<StringMatch>,
-    },
-    ChannelNotes {
-        channel_id: ChannelId,
-    },
-    ChannelEditor {
-        depth: usize,
-    },
-    Contact {
-        contact: Arc<Contact>,
-        calling: bool,
-    },
-    ContactPlaceholder,
-}
-
-impl CollabPanel {
-    pub fn new(
-        workspace: &mut Workspace,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) -> Entity<Self> {
-        cx.new(|cx| {
-            let filter_editor = cx.new(|cx| {
-                let mut editor = Editor::single_line(window, cx);
-                editor.set_placeholder_text("Search channels…", window, cx);
-                editor
-            });
-
-            cx.subscribe(&filter_editor, |this: &mut Self, _, event, cx| {
-                if let editor::EditorEvent::BufferEdited = event {
-                    let query = this.filter_editor.read(cx).text(cx);
-                    if !query.is_empty() {
-                        this.selection.take();
-                    }
-                    this.update_entries(true, cx);
-                    if !query.is_empty() {
-                        this.selection = this
-                            .entries
-                            .iter()
-                            .position(|entry| !matches!(entry, ListEntry::Header(_)));
-                    }
-                }
-            })
-            .detach();
-
-            let channel_name_editor = cx.new(|cx| Editor::single_line(window, cx));
-
-            cx.subscribe_in(
-                &channel_name_editor,
-                window,
-                |this: &mut Self, _, event, window, cx| {
-                    if let editor::EditorEvent::Blurred = event {
-                        if let Some(state) = &this.channel_editing_state
-                            && state.pending_name().is_some()
-                        {
-                            return;
-                        }
-                        this.take_editing_state(window, cx);
-                        this.update_entries(false, cx);
-                        cx.notify();
-                    }
-                },
-            )
-            .detach();
-
-            let mut this = Self {
-                width: None,
-                focus_handle: cx.focus_handle(),
-                channel_clipboard: None,
-                fs: workspace.app_state().fs.clone(),
-                pending_serialization: Task::ready(None),
-                context_menu: None,
-                list_state: ListState::new(0, gpui::ListAlignment::Top, px(1000.)),
-                channel_name_editor,
-                filter_editor,
-                entries: Vec::default(),
-                channel_editing_state: None,
-                selection: None,
-                channel_store: ChannelStore::global(cx),
-                user_store: workspace.user_store().clone(),
-                project: workspace.project().clone(),
-                subscriptions: Vec::default(),
-                match_candidates: Vec::default(),
-                collapsed_sections: vec![Section::Offline],
-                collapsed_channels: Vec::default(),
-                workspace: workspace.weak_handle(),
-                client: workspace.app_state().client.clone(),
-            };
-
-            this.update_entries(false, cx);
-
-            let active_call = ActiveCall::global(cx);
-            this.subscriptions
-                .push(cx.observe(&this.user_store, |this, _, cx| {
-                    this.update_entries(true, cx)
-                }));
-            this.subscriptions
-                .push(cx.observe(&this.channel_store, move |this, _, cx| {
-                    this.update_entries(true, cx)
-                }));
-            this.subscriptions
-                .push(cx.observe(&active_call, |this, _, cx| this.update_entries(true, cx)));
-            this.subscriptions.push(cx.subscribe_in(
-                &this.channel_store,
-                window,
-                |this, _channel_store, e, window, cx| match e {
-                    ChannelEvent::ChannelCreated(channel_id)
-                    | ChannelEvent::ChannelRenamed(channel_id) => {
-                        if this.take_editing_state(window, cx) {
-                            this.update_entries(false, cx);
-                            this.selection = this.entries.iter().position(|entry| {
-                                if let ListEntry::Channel { channel, .. } = entry {
-                                    channel.id == *channel_id
-                                } else {
-                                    false
-                                }
-                            });
-                        }
-                    }
-                },
-            ));
-
-            this
-        })
-    }
-
-    pub async fn load(
-        workspace: WeakEntity<Workspace>,
-        mut cx: AsyncWindowContext,
-    ) -> anyhow::Result<Entity<Self>> {
-        let serialized_panel = match workspace
-            .read_with(&cx, |workspace, _| {
-                CollabPanel::serialization_key(workspace)
-            })
-            .ok()
-            .flatten()
-        {
-            Some(serialization_key) => cx
-                .background_spawn(async move { KEY_VALUE_STORE.read_kvp(&serialization_key) })
-                .await
-                .context("reading collaboration panel from key value store")
-                .log_err()
-                .flatten()
-                .map(|panel| serde_json::from_str::<SerializedCollabPanel>(&panel))
-                .transpose()
-                .log_err()
-                .flatten(),
-            None => None,
-        };
-
-        workspace.update_in(&mut cx, |workspace, window, cx| {
-            let panel = CollabPanel::new(workspace, window, cx);
-            if let Some(serialized_panel) = serialized_panel {
-                panel.update(cx, |panel, cx| {
-                    panel.width = serialized_panel.width.map(|w| w.round());
-                    panel.collapsed_channels = serialized_panel
-                        .collapsed_channels
-                        .unwrap_or_else(Vec::new)
-                        .iter()
-                        .map(|cid| ChannelId(*cid))
-                        .collect();
-                    cx.notify();
-                });
-            }
-            panel
-        })
-    }
-
-    fn serialization_key(workspace: &Workspace) -> Option<String> {
-        workspace
-            .database_id()
-            .map(|id| i64::from(id).to_string())
-            .or(workspace.session_id())
-            .map(|id| format!("{}-{:?}", COLLABORATION_PANEL_KEY, id))
-    }
-
-    fn serialize(&mut self, cx: &mut Context<Self>) {
-        let Some(serialization_key) = self
-            .workspace
-            .read_with(cx, |workspace, _| CollabPanel::serialization_key(workspace))
-            .ok()
-            .flatten()
-        else {
-            return;
-        };
-        let width = self.width;
-        let collapsed_channels = self.collapsed_channels.clone();
-        self.pending_serialization = cx.background_spawn(
-            async move {
-                KEY_VALUE_STORE
-                    .write_kvp(
-                        serialization_key,
-                        serde_json::to_string(&SerializedCollabPanel {
-                            width,
-                            collapsed_channels: Some(
-                                collapsed_channels.iter().map(|cid| cid.0).collect(),
-                            ),
-                        })?,
-                    )
-                    .await?;
-                anyhow::Ok(())
-            }
-            .log_err(),
-        );
-    }
-
-    fn scroll_to_item(&mut self, ix: usize) {
-        self.list_state.scroll_to_reveal_item(ix)
-    }
-
-    fn update_entries(&mut self, select_same_item: bool, cx: &mut Context<Self>) {
-        let channel_store = self.channel_store.read(cx);
-        let user_store = self.user_store.read(cx);
-        let query = self.filter_editor.read(cx).text(cx);
-        let executor = cx.background_executor().clone();
-
-        let prev_selected_entry = self.selection.and_then(|ix| self.entries.get(ix).cloned());
-        let old_entries = mem::take(&mut self.entries);
-        let mut scroll_to_top = false;
-
-        if let Some(room) = ActiveCall::global(cx).read(cx).room() {
-            self.entries.push(ListEntry::Header(Section::ActiveCall));
-            if !old_entries
-                .iter()
-                .any(|entry| matches!(entry, ListEntry::Header(Section::ActiveCall)))
-            {
-                scroll_to_top = true;
-            }
-
-            if !self.collapsed_sections.contains(&Section::ActiveCall) {
-                let room = room.read(cx);
-
-                if query.is_empty()
-                    && let Some(channel_id) = room.channel_id()
-                {
-                    self.entries.push(ListEntry::ChannelNotes { channel_id });
-                }
-
-                // Populate the active user.
-                if let Some(user) = user_store.current_user() {
-                    self.match_candidates.clear();
-                    self.match_candidates
-                        .push(StringMatchCandidate::new(0, &user.github_login));
-                    let matches = executor.block(match_strings(
-                        &self.match_candidates,
-                        &query,
-                        true,
-                        true,
-                        usize::MAX,
-                        &Default::default(),
-                        executor.clone(),
-                    ));
-                    if !matches.is_empty() {
-                        let user_id = user.id;
-                        self.entries.push(ListEntry::CallParticipant {
-                            user,
-                            peer_id: None,
-                            is_pending: false,
-                            role: room.local_participant().role,
-                        });
-                        let mut projects = room.local_participant().projects.iter().peekable();
-                        while let Some(project) = projects.next() {
-                            self.entries.push(ListEntry::ParticipantProject {
-                                project_id: project.id,
-                                worktree_root_names: project.worktree_root_names.clone(),
-                                host_user_id: user_id,
-                                is_last: projects.peek().is_none() && !room.is_sharing_screen(),
-                            });
-                        }
-                        if room.is_sharing_screen() {
-                            self.entries.push(ListEntry::ParticipantScreen {
-                                peer_id: None,
-                                is_last: true,
-                            });
-                        }
-                    }
-                }
-
-                // Populate remote participants.
-                self.match_candidates.clear();
-                self.match_candidates
-                    .extend(room.remote_participants().values().map(|participant| {
-                        StringMatchCandidate::new(
-                            participant.user.id as usize,
-                            &participant.user.github_login,
-                        )
-                    }));
-                let mut matches = executor.block(match_strings(
-                    &self.match_candidates,
-                    &query,
-                    true,
-                    true,
-                    usize::MAX,
-                    &Default::default(),
-                    executor.clone(),
-                ));
-                matches.sort_by(|a, b| {
-                    let a_is_guest = room.role_for_user(a.candidate_id as u64)
-                        == Some(proto::ChannelRole::Guest);
-                    let b_is_guest = room.role_for_user(b.candidate_id as u64)
-                        == Some(proto::ChannelRole::Guest);
-                    a_is_guest
-                        .cmp(&b_is_guest)
-                        .then_with(|| a.string.cmp(&b.string))
-                });
-                for mat in matches {
-                    let user_id = mat.candidate_id as u64;
-                    let participant = &room.remote_participants()[&user_id];
-                    self.entries.push(ListEntry::CallParticipant {
-                        user: participant.user.clone(),
-                        peer_id: Some(participant.peer_id),
-                        is_pending: false,
-                        role: participant.role,
-                    });
-                    let mut projects = participant.projects.iter().peekable();
-                    while let Some(project) = projects.next() {
-                        self.entries.push(ListEntry::ParticipantProject {
-                            project_id: project.id,
-                            worktree_root_names: project.worktree_root_names.clone(),
-                            host_user_id: participant.user.id,
-                            is_last: projects.peek().is_none() && !participant.has_video_tracks(),
-                        });
-                    }
-                    if participant.has_video_tracks() {
-                        self.entries.push(ListEntry::ParticipantScreen {
-                            peer_id: Some(participant.peer_id),
-                            is_last: true,
-                        });
-                    }
-                }
-
-                // Populate pending participants.
-                self.match_candidates.clear();
-                self.match_candidates
-                    .extend(room.pending_participants().iter().enumerate().map(
-                        |(id, participant)| {
-                            StringMatchCandidate::new(id, &participant.github_login)
-                        },
-                    ));
-                let matches = executor.block(match_strings(
-                    &self.match_candidates,
-                    &query,
-                    true,
-                    true,
-                    usize::MAX,
-                    &Default::default(),
-                    executor.clone(),
-                ));
-                self.entries
-                    .extend(matches.iter().map(|mat| ListEntry::CallParticipant {
-                        user: room.pending_participants()[mat.candidate_id].clone(),
-                        peer_id: None,
-                        is_pending: true,
-                        role: proto::ChannelRole::Member,
-                    }));
-            }
-        }
-
-        let mut request_entries = Vec::new();
-
-        self.entries.push(ListEntry::Header(Section::Channels));
-
-        if channel_store.channel_count() > 0 || self.channel_editing_state.is_some() {
-            self.match_candidates.clear();
-            self.match_candidates.extend(
-                channel_store
-                    .ordered_channels()
-                    .enumerate()
-                    .map(|(ix, (_, channel))| StringMatchCandidate::new(ix, &channel.name)),
-            );
-            let mut channels = channel_store
-                .ordered_channels()
-                .map(|(_, chan)| chan)
-                .collect::<Vec<_>>();
-            let matches = executor.block(match_strings(
-                &self.match_candidates,
-                &query,
-                true,
-                true,
-                usize::MAX,
-                &Default::default(),
-                executor.clone(),
-            ));
-
-            let matches_by_id: HashMap<_, _> = matches
-                .iter()
-                .map(|mat| (channels[mat.candidate_id].id, mat.clone()))
-                .collect();
-
-            let channel_ids_of_matches_or_parents: HashSet<_> = matches
-                .iter()
-                .flat_map(|mat| {
-                    let match_channel = channels[mat.candidate_id];
-
-                    match_channel
-                        .parent_path
-                        .iter()
-                        .copied()
-                        .chain(Some(match_channel.id))
-                })
-                .collect();
-
-            channels.retain(|chan| channel_ids_of_matches_or_parents.contains(&chan.id));
-
-            if let Some(state) = &self.channel_editing_state
-                && matches!(state, ChannelEditingState::Create { location: None, .. })
-            {
-                self.entries.push(ListEntry::ChannelEditor { depth: 0 });
-            }
-
-            let should_respect_collapse = query.is_empty();
-            let mut collapse_depth = None;
-
-            for (idx, channel) in channels.into_iter().enumerate() {
-                let depth = channel.parent_path.len();
-
-                if should_respect_collapse {
-                    if collapse_depth.is_none() && self.is_channel_collapsed(channel.id) {
-                        collapse_depth = Some(depth);
-                    } else if let Some(collapsed_depth) = collapse_depth {
-                        if depth > collapsed_depth {
-                            continue;
-                        }
-                        if self.is_channel_collapsed(channel.id) {
-                            collapse_depth = Some(depth);
-                        } else {
-                            collapse_depth = None;
-                        }
-                    }
-                }
-
-                let has_children = channel_store
-                    .channel_at_index(idx + 1)
-                    .is_some_and(|next_channel| next_channel.parent_path.ends_with(&[channel.id]));
-
-                match &self.channel_editing_state {
-                    Some(ChannelEditingState::Create {
-                        location: parent_id,
-                        ..
-                    }) if *parent_id == Some(channel.id) => {
-                        self.entries.push(ListEntry::Channel {
-                            channel: channel.clone(),
-                            depth,
-                            has_children: false,
-                            string_match: matches_by_id.get(&channel.id).map(|mat| (*mat).clone()),
-                        });
-                        self.entries
-                            .push(ListEntry::ChannelEditor { depth: depth + 1 });
-                    }
-                    Some(ChannelEditingState::Rename {
-                        location: parent_id,
-                        ..
-                    }) if parent_id == &channel.id => {
-                        self.entries.push(ListEntry::ChannelEditor { depth });
-                    }
-                    _ => {
-                        self.entries.push(ListEntry::Channel {
-                            channel: channel.clone(),
-                            depth,
-                            has_children,
-                            string_match: matches_by_id.get(&channel.id).map(|mat| (*mat).clone()),
-                        });
-                    }
-                }
-            }
-        }
-
-        let channel_invites = channel_store.channel_invitations();
-        if !channel_invites.is_empty() {
-            self.match_candidates.clear();
-            self.match_candidates.extend(
-                channel_invites
-                    .iter()
-                    .enumerate()
-                    .map(|(ix, channel)| StringMatchCandidate::new(ix, &channel.name)),
-            );
-            let matches = executor.block(match_strings(
-                &self.match_candidates,
-                &query,
-                true,
-                true,
-                usize::MAX,
-                &Default::default(),
-                executor.clone(),
-            ));
-            request_entries.extend(
-                matches
-                    .iter()
-                    .map(|mat| ListEntry::ChannelInvite(channel_invites[mat.candidate_id].clone())),
-            );
-
-            if !request_entries.is_empty() {
-                self.entries
-                    .push(ListEntry::Header(Section::ChannelInvites));
-                if !self.collapsed_sections.contains(&Section::ChannelInvites) {
-                    self.entries.append(&mut request_entries);
-                }
-            }
-        }
-
-        self.entries.push(ListEntry::Header(Section::Contacts));
-
-        request_entries.clear();
-        let incoming = user_store.incoming_contact_requests();
-        if !incoming.is_empty() {
-            self.match_candidates.clear();
-            self.match_candidates.extend(
-                incoming
-                    .iter()
-                    .enumerate()
-                    .map(|(ix, user)| StringMatchCandidate::new(ix, &user.github_login)),
-            );
-            let matches = executor.block(match_strings(
-                &self.match_candidates,
-                &query,
-                true,
-                true,
-                usize::MAX,
-                &Default::default(),
-                executor.clone(),
-            ));
-            request_entries.extend(
-                matches
-                    .iter()
-                    .map(|mat| ListEntry::IncomingRequest(incoming[mat.candidate_id].clone())),
-            );
-        }
-
-        let outgoing = user_store.outgoing_contact_requests();
-        if !outgoing.is_empty() {
-            self.match_candidates.clear();
-            self.match_candidates.extend(
-                outgoing
-                    .iter()
-                    .enumerate()
-                    .map(|(ix, user)| StringMatchCandidate::new(ix, &user.github_login)),
-            );
-            let matches = executor.block(match_strings(
-                &self.match_candidates,
-                &query,
-                true,
-                true,
-                usize::MAX,
-                &Default::default(),
-                executor.clone(),
-            ));
-            request_entries.extend(
-                matches
-                    .iter()
-                    .map(|mat| ListEntry::OutgoingRequest(outgoing[mat.candidate_id].clone())),
-            );
-        }
-
-        if !request_entries.is_empty() {
-            self.entries
-                .push(ListEntry::Header(Section::ContactRequests));
-            if !self.collapsed_sections.contains(&Section::ContactRequests) {
-                self.entries.append(&mut request_entries);
-            }
-        }
-
-        let contacts = user_store.contacts();
-        if !contacts.is_empty() {
-            self.match_candidates.clear();
-            self.match_candidates.extend(
-                contacts
-                    .iter()
-                    .enumerate()
-                    .map(|(ix, contact)| StringMatchCandidate::new(ix, &contact.user.github_login)),
-            );
-
-            let matches = executor.block(match_strings(
-                &self.match_candidates,
-                &query,
-                true,
-                true,
-                usize::MAX,
-                &Default::default(),
-                executor.clone(),
-            ));
-
-            let (online_contacts, offline_contacts) = matches
-                .iter()
-                .partition::<Vec<_>, _>(|mat| contacts[mat.candidate_id].online);
-
-            for (matches, section) in [
-                (online_contacts, Section::Online),
-                (offline_contacts, Section::Offline),
-            ] {
-                if !matches.is_empty() {
-                    self.entries.push(ListEntry::Header(section));
-                    if !self.collapsed_sections.contains(&section) {
-                        let active_call = &ActiveCall::global(cx).read(cx);
-                        for mat in matches {
-                            let contact = &contacts[mat.candidate_id];
-                            self.entries.push(ListEntry::Contact {
-                                contact: contact.clone(),
-                                calling: active_call.pending_invites().contains(&contact.user.id),
-                            });
-                        }
-                    }
-                }
-            }
-        }
-
-        if incoming.is_empty() && outgoing.is_empty() && contacts.is_empty() {
-            self.entries.push(ListEntry::ContactPlaceholder);
-        }
-
-        if select_same_item {
-            if let Some(prev_selected_entry) = prev_selected_entry {
-                self.selection.take();
-                for (ix, entry) in self.entries.iter().enumerate() {
-                    if *entry == prev_selected_entry {
-                        self.selection = Some(ix);
-                        break;
-                    }
-                }
-            }
-        } else {
-            self.selection = self.selection.and_then(|prev_selection| {
-                if self.entries.is_empty() {
-                    None
-                } else {
-                    Some(prev_selection.min(self.entries.len() - 1))
-                }
-            });
-        }
-
-        let old_scroll_top = self.list_state.logical_scroll_top();
-        self.list_state.reset(self.entries.len());
-
-        if scroll_to_top {
-            self.list_state.scroll_to(ListOffset::default());
-        } else {
-            // Attempt to maintain the same scroll position.
-            if let Some(old_top_entry) = old_entries.get(old_scroll_top.item_ix) {
-                let new_scroll_top = self
-                    .entries
-                    .iter()
-                    .position(|entry| entry == old_top_entry)
-                    .map(|item_ix| ListOffset {
-                        item_ix,
-                        offset_in_item: old_scroll_top.offset_in_item,
-                    })
-                    .or_else(|| {
-                        let entry_after_old_top = old_entries.get(old_scroll_top.item_ix + 1)?;
-                        let item_ix = self
-                            .entries
-                            .iter()
-                            .position(|entry| entry == entry_after_old_top)?;
-                        Some(ListOffset {
-                            item_ix,
-                            offset_in_item: Pixels::ZERO,
-                        })
-                    })
-                    .or_else(|| {
-                        let entry_before_old_top =
-                            old_entries.get(old_scroll_top.item_ix.saturating_sub(1))?;
-                        let item_ix = self
-                            .entries
-                            .iter()
-                            .position(|entry| entry == entry_before_old_top)?;
-                        Some(ListOffset {
-                            item_ix,
-                            offset_in_item: Pixels::ZERO,
-                        })
-                    });
-
-                self.list_state
-                    .scroll_to(new_scroll_top.unwrap_or(old_scroll_top));
-            }
-        }
-
-        cx.notify();
-    }
-
-    fn render_call_participant(
-        &self,
-        user: &Arc<User>,
-        peer_id: Option<PeerId>,
-        is_pending: bool,
-        role: proto::ChannelRole,
-        is_selected: bool,
-        cx: &mut Context<Self>,
-    ) -> ListItem {
-        let user_id = user.id;
-        let is_current_user =
-            self.user_store.read(cx).current_user().map(|user| user.id) == Some(user_id);
-        let tooltip = format!("Follow {}", user.github_login);
-
-        let is_call_admin = ActiveCall::global(cx).read(cx).room().is_some_and(|room| {
-            room.read(cx).local_participant().role == proto::ChannelRole::Admin
-        });
-
-        ListItem::new(user.github_login.clone())
-            .start_slot(Avatar::new(user.avatar_uri.clone()))
-            .child(render_participant_name_and_handle(user))
-            .toggle_state(is_selected)
-            .end_slot(if is_pending {
-                Label::new("Calling").color(Color::Muted).into_any_element()
-            } else if is_current_user {
-                IconButton::new("leave-call", IconName::Exit)
-                    .style(ButtonStyle::Subtle)
-                    .on_click(move |_, window, cx| Self::leave_call(window, cx))
-                    .tooltip(Tooltip::text("Leave Call"))
-                    .into_any_element()
-            } else if role == proto::ChannelRole::Guest {
-                Label::new("Guest").color(Color::Muted).into_any_element()
-            } else if role == proto::ChannelRole::Talker {
-                Label::new("Mic only")
-                    .color(Color::Muted)
-                    .into_any_element()
-            } else {
-                div().into_any_element()
-            })
-            .when_some(peer_id, |el, peer_id| {
-                if role == proto::ChannelRole::Guest {
-                    return el;
-                }
-                el.tooltip(Tooltip::text(tooltip.clone()))
-                    .on_click(cx.listener(move |this, _, window, cx| {
-                        this.workspace
-                            .update(cx, |workspace, cx| workspace.follow(peer_id, window, cx))
-                            .ok();
-                    }))
-            })
-            .when(is_call_admin, |el| {
-                el.on_secondary_mouse_down(cx.listener(
-                    move |this, event: &MouseDownEvent, window, cx| {
-                        this.deploy_participant_context_menu(
-                            event.position,
-                            user_id,
-                            role,
-                            window,
-                            cx,
-                        )
-                    },
-                ))
-            })
-    }
-
-    fn render_participant_project(
-        &self,
-        project_id: u64,
-        worktree_root_names: &[String],
-        host_user_id: u64,
-        is_last: bool,
-        is_selected: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let project_name: SharedString = if worktree_root_names.is_empty() {
-            "untitled".to_string()
-        } else {
-            worktree_root_names.join(", ")
-        }
-        .into();
-
-        ListItem::new(project_id as usize)
-            .toggle_state(is_selected)
-            .on_click(cx.listener(move |this, _, window, cx| {
-                this.workspace
-                    .update(cx, |workspace, cx| {
-                        let app_state = workspace.app_state().clone();
-                        workspace::join_in_room_project(project_id, host_user_id, app_state, cx)
-                            .detach_and_prompt_err(
-                                "Failed to join project",
-                                window,
-                                cx,
-                                |_, _, _| None,
-                            );
-                    })
-                    .ok();
-            }))
-            .start_slot(
-                h_flex()
-                    .gap_1()
-                    .child(render_tree_branch(is_last, false, window, cx))
-                    .child(IconButton::new(0, IconName::Folder)),
-            )
-            .child(Label::new(project_name.clone()))
-            .tooltip(Tooltip::text(format!("Open {}", project_name)))
-    }
-
-    fn render_participant_screen(
-        &self,
-        peer_id: Option<PeerId>,
-        is_last: bool,
-        is_selected: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let id = peer_id.map_or(usize::MAX, |id| id.as_u64() as usize);
-
-        ListItem::new(("screen", id))
-            .toggle_state(is_selected)
-            .start_slot(
-                h_flex()
-                    .gap_1()
-                    .child(render_tree_branch(is_last, false, window, cx))
-                    .child(IconButton::new(0, IconName::Screen)),
-            )
-            .child(Label::new("Screen"))
-            .when_some(peer_id, |this, _| {
-                this.on_click(cx.listener(move |this, _, window, cx| {
-                    this.workspace
-                        .update(cx, |workspace, cx| {
-                            workspace.open_shared_screen(peer_id.unwrap(), window, cx)
-                        })
-                        .ok();
-                }))
-                .tooltip(Tooltip::text("Open shared screen"))
-            })
-    }
-
-    fn take_editing_state(&mut self, window: &mut Window, cx: &mut Context<Self>) -> bool {
-        if self.channel_editing_state.take().is_some() {
-            self.channel_name_editor.update(cx, |editor, cx| {
-                editor.set_text("", window, cx);
-            });
-            true
-        } else {
-            false
-        }
-    }
-
-    fn render_channel_notes(
-        &self,
-        channel_id: ChannelId,
-        is_selected: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let channel_store = self.channel_store.read(cx);
-        let has_channel_buffer_changed = channel_store.has_channel_buffer_changed(channel_id);
-        ListItem::new("channel-notes")
-            .toggle_state(is_selected)
-            .on_click(cx.listener(move |this, _, window, cx| {
-                this.open_channel_notes(channel_id, window, cx);
-            }))
-            .start_slot(
-                h_flex()
-                    .relative()
-                    .gap_1()
-                    .child(render_tree_branch(false, true, window, cx))
-                    .child(IconButton::new(0, IconName::File))
-                    .children(has_channel_buffer_changed.then(|| {
-                        div()
-                            .w_1p5()
-                            .absolute()
-                            .right(px(2.))
-                            .top(px(2.))
-                            .child(Indicator::dot().color(Color::Info))
-                    })),
-            )
-            .child(Label::new("notes"))
-            .tooltip(Tooltip::text("Open Channel Notes"))
-    }
-
-    fn has_subchannels(&self, ix: usize) -> bool {
-        self.entries.get(ix).is_some_and(|entry| {
-            if let ListEntry::Channel { has_children, .. } = entry {
-                *has_children
-            } else {
-                false
-            }
-        })
-    }
-
-    fn deploy_participant_context_menu(
-        &mut self,
-        position: Point<Pixels>,
-        user_id: u64,
-        role: proto::ChannelRole,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let this = cx.entity();
-        if !(role == proto::ChannelRole::Guest
-            || role == proto::ChannelRole::Talker
-            || role == proto::ChannelRole::Member)
-        {
-            return;
-        }
-
-        let context_menu = ContextMenu::build(window, cx, |mut context_menu, window, _| {
-            if role == proto::ChannelRole::Guest {
-                context_menu = context_menu.entry(
-                    "Grant Mic Access",
-                    None,
-                    window.handler_for(&this, move |_, window, cx| {
-                        ActiveCall::global(cx)
-                            .update(cx, |call, cx| {
-                                let Some(room) = call.room() else {
-                                    return Task::ready(Ok(()));
-                                };
-                                room.update(cx, |room, cx| {
-                                    room.set_participant_role(
-                                        user_id,
-                                        proto::ChannelRole::Talker,
-                                        cx,
-                                    )
-                                })
-                            })
-                            .detach_and_prompt_err(
-                                "Failed to grant mic access",
-                                window,
-                                cx,
-                                |_, _, _| None,
-                            )
-                    }),
-                );
-            }
-            if role == proto::ChannelRole::Guest || role == proto::ChannelRole::Talker {
-                context_menu = context_menu.entry(
-                    "Grant Write Access",
-                    None,
-                    window.handler_for(&this, move |_, window, cx| {
-                        ActiveCall::global(cx)
-                            .update(cx, |call, cx| {
-                                let Some(room) = call.room() else {
-                                    return Task::ready(Ok(()));
-                                };
-                                room.update(cx, |room, cx| {
-                                    room.set_participant_role(
-                                        user_id,
-                                        proto::ChannelRole::Member,
-                                        cx,
-                                    )
-                                })
-                            })
-                            .detach_and_prompt_err("Failed to grant write access", window, cx, |e, _, _| {
-                                match e.error_code() {
-                                    ErrorCode::NeedsCla => Some("This user has not yet signed the CLA at https://zed.dev/cla.".into()),
-                                    _ => None,
-                                }
-                            })
-                    }),
-                );
-            }
-            if role == proto::ChannelRole::Member || role == proto::ChannelRole::Talker {
-                let label = if role == proto::ChannelRole::Talker {
-                    "Mute"
-                } else {
-                    "Revoke Access"
-                };
-                context_menu = context_menu.entry(
-                    label,
-                    None,
-                    window.handler_for(&this, move |_, window, cx| {
-                        ActiveCall::global(cx)
-                            .update(cx, |call, cx| {
-                                let Some(room) = call.room() else {
-                                    return Task::ready(Ok(()));
-                                };
-                                room.update(cx, |room, cx| {
-                                    room.set_participant_role(
-                                        user_id,
-                                        proto::ChannelRole::Guest,
-                                        cx,
-                                    )
-                                })
-                            })
-                            .detach_and_prompt_err(
-                                "Failed to revoke access",
-                                window,
-                                cx,
-                                |_, _, _| None,
-                            )
-                    }),
-                );
-            }
-
-            context_menu
-        });
-
-        window.focus(&context_menu.focus_handle(cx));
-        let subscription = cx.subscribe_in(
-            &context_menu,
-            window,
-            |this, _, _: &DismissEvent, window, cx| {
-                if this.context_menu.as_ref().is_some_and(|context_menu| {
-                    context_menu.0.focus_handle(cx).contains_focused(window, cx)
-                }) {
-                    cx.focus_self(window);
-                }
-                this.context_menu.take();
-                cx.notify();
-            },
-        );
-        self.context_menu = Some((context_menu, position, subscription));
-    }
-
-    fn deploy_channel_context_menu(
-        &mut self,
-        position: Point<Pixels>,
-        channel_id: ChannelId,
-        ix: usize,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let clipboard_channel_name = self.channel_clipboard.as_ref().and_then(|clipboard| {
-            self.channel_store
-                .read(cx)
-                .channel_for_id(clipboard.channel_id)
-                .map(|channel| channel.name.clone())
-        });
-        let this = cx.entity();
-
-        let context_menu = ContextMenu::build(window, cx, |mut context_menu, window, cx| {
-            if self.has_subchannels(ix) {
-                let expand_action_name = if self.is_channel_collapsed(channel_id) {
-                    "Expand Subchannels"
-                } else {
-                    "Collapse Subchannels"
-                };
-                context_menu = context_menu.entry(
-                    expand_action_name,
-                    None,
-                    window.handler_for(&this, move |this, window, cx| {
-                        this.toggle_channel_collapsed(channel_id, window, cx)
-                    }),
-                );
-            }
-
-            context_menu = context_menu
-                .entry(
-                    "Open Notes",
-                    None,
-                    window.handler_for(&this, move |this, window, cx| {
-                        this.open_channel_notes(channel_id, window, cx)
-                    }),
-                )
-                .entry(
-                    "Copy Channel Link",
-                    None,
-                    window.handler_for(&this, move |this, _, cx| {
-                        this.copy_channel_link(channel_id, cx)
-                    }),
-                )
-                .entry(
-                    "Copy Channel Notes Link",
-                    None,
-                    window.handler_for(&this, move |this, _, cx| {
-                        this.copy_channel_notes_link(channel_id, cx)
-                    }),
-                );
-
-            let mut has_destructive_actions = false;
-            if self.channel_store.read(cx).is_channel_admin(channel_id) {
-                has_destructive_actions = true;
-                context_menu = context_menu
-                    .separator()
-                    .entry(
-                        "New Subchannel",
-                        None,
-                        window.handler_for(&this, move |this, window, cx| {
-                            this.new_subchannel(channel_id, window, cx)
-                        }),
-                    )
-                    .entry(
-                        "Rename",
-                        Some(Box::new(SecondaryConfirm)),
-                        window.handler_for(&this, move |this, window, cx| {
-                            this.rename_channel(channel_id, window, cx)
-                        }),
-                    );
-
-                if let Some(channel_name) = clipboard_channel_name {
-                    context_menu = context_menu.separator().entry(
-                        format!("Move '#{}' here", channel_name),
-                        None,
-                        window.handler_for(&this, move |this, window, cx| {
-                            this.move_channel_on_clipboard(channel_id, window, cx)
-                        }),
-                    );
-                }
-
-                if self.channel_store.read(cx).is_root_channel(channel_id) {
-                    context_menu = context_menu.separator().entry(
-                        "Manage Members",
-                        None,
-                        window.handler_for(&this, move |this, window, cx| {
-                            this.manage_members(channel_id, window, cx)
-                        }),
-                    )
-                } else {
-                    context_menu = context_menu.entry(
-                        "Move this channel",
-                        None,
-                        window.handler_for(&this, move |this, window, cx| {
-                            this.start_move_channel(channel_id, window, cx)
-                        }),
-                    );
-                    if self.channel_store.read(cx).is_public_channel(channel_id) {
-                        context_menu = context_menu.separator().entry(
-                            "Make Channel Private",
-                            None,
-                            window.handler_for(&this, move |this, window, cx| {
-                                this.set_channel_visibility(
-                                    channel_id,
-                                    ChannelVisibility::Members,
-                                    window,
-                                    cx,
-                                )
-                            }),
-                        )
-                    } else {
-                        context_menu = context_menu.separator().entry(
-                            "Make Channel Public",
-                            None,
-                            window.handler_for(&this, move |this, window, cx| {
-                                this.set_channel_visibility(
-                                    channel_id,
-                                    ChannelVisibility::Public,
-                                    window,
-                                    cx,
-                                )
-                            }),
-                        )
-                    }
-                }
-
-                context_menu = context_menu.entry(
-                    "Delete",
-                    None,
-                    window.handler_for(&this, move |this, window, cx| {
-                        this.remove_channel(channel_id, window, cx)
-                    }),
-                );
-            }
-
-            if self.channel_store.read(cx).is_root_channel(channel_id) {
-                if !has_destructive_actions {
-                    context_menu = context_menu.separator()
-                }
-                context_menu = context_menu.entry(
-                    "Leave Channel",
-                    None,
-                    window.handler_for(&this, move |this, window, cx| {
-                        this.leave_channel(channel_id, window, cx)
-                    }),
-                );
-            }
-
-            context_menu
-        });
-
-        window.focus(&context_menu.focus_handle(cx));
-        let subscription = cx.subscribe_in(
-            &context_menu,
-            window,
-            |this, _, _: &DismissEvent, window, cx| {
-                if this.context_menu.as_ref().is_some_and(|context_menu| {
-                    context_menu.0.focus_handle(cx).contains_focused(window, cx)
-                }) {
-                    cx.focus_self(window);
-                }
-                this.context_menu.take();
-                cx.notify();
-            },
-        );
-        self.context_menu = Some((context_menu, position, subscription));
-
-        cx.notify();
-    }
-
-    fn deploy_contact_context_menu(
-        &mut self,
-        position: Point<Pixels>,
-        contact: Arc<Contact>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let this = cx.entity();
-        let in_room = ActiveCall::global(cx).read(cx).room().is_some();
-
-        let context_menu = ContextMenu::build(window, cx, |mut context_menu, _, _| {
-            let user_id = contact.user.id;
-
-            if contact.online && !contact.busy {
-                let label = if in_room {
-                    format!("Invite {} to join", contact.user.github_login)
-                } else {
-                    format!("Call {}", contact.user.github_login)
-                };
-                context_menu = context_menu.entry(label, None, {
-                    let this = this.clone();
-                    move |window, cx| {
-                        this.update(cx, |this, cx| {
-                            this.call(user_id, window, cx);
-                        });
-                    }
-                });
-            }
-
-            context_menu.entry("Remove Contact", None, {
-                let this = this.clone();
-                move |window, cx| {
-                    this.update(cx, |this, cx| {
-                        this.remove_contact(
-                            contact.user.id,
-                            &contact.user.github_login,
-                            window,
-                            cx,
-                        );
-                    });
-                }
-            })
-        });
-
-        window.focus(&context_menu.focus_handle(cx));
-        let subscription = cx.subscribe_in(
-            &context_menu,
-            window,
-            |this, _, _: &DismissEvent, window, cx| {
-                if this.context_menu.as_ref().is_some_and(|context_menu| {
-                    context_menu.0.focus_handle(cx).contains_focused(window, cx)
-                }) {
-                    cx.focus_self(window);
-                }
-                this.context_menu.take();
-                cx.notify();
-            },
-        );
-        self.context_menu = Some((context_menu, position, subscription));
-
-        cx.notify();
-    }
-
-    fn reset_filter_editor_text(&mut self, window: &mut Window, cx: &mut Context<Self>) -> bool {
-        self.filter_editor.update(cx, |editor, cx| {
-            if editor.buffer().read(cx).len(cx).0 > 0 {
-                editor.set_text("", window, cx);
-                true
-            } else {
-                false
-            }
-        })
-    }
-
-    fn cancel(&mut self, _: &Cancel, window: &mut Window, cx: &mut Context<Self>) {
-        if cx.stop_active_drag(window) {
-            return;
-        } else if self.take_editing_state(window, cx) {
-            window.focus(&self.filter_editor.focus_handle(cx));
-        } else if !self.reset_filter_editor_text(window, cx) {
-            self.focus_handle.focus(window);
-        }
-
-        if self.context_menu.is_some() {
-            self.context_menu.take();
-            cx.notify();
-        }
-
-        self.update_entries(false, cx);
-    }
-
-    fn select_next(&mut self, _: &SelectNext, _: &mut Window, cx: &mut Context<Self>) {
-        let ix = self.selection.map_or(0, |ix| ix + 1);
-        if ix < self.entries.len() {
-            self.selection = Some(ix);
-        }
-
-        if let Some(ix) = self.selection {
-            self.scroll_to_item(ix)
-        }
-        cx.notify();
-    }
-
-    fn select_previous(&mut self, _: &SelectPrevious, _: &mut Window, cx: &mut Context<Self>) {
-        let ix = self.selection.take().unwrap_or(0);
-        if ix > 0 {
-            self.selection = Some(ix - 1);
-        }
-
-        if let Some(ix) = self.selection {
-            self.scroll_to_item(ix)
-        }
-        cx.notify();
-    }
-
-    fn confirm(&mut self, _: &Confirm, window: &mut Window, cx: &mut Context<Self>) {
-        if self.confirm_channel_edit(window, cx) {
-            return;
-        }
-
-        if let Some(selection) = self.selection
-            && let Some(entry) = self.entries.get(selection)
-        {
-            match entry {
-                ListEntry::Header(section) => match section {
-                    Section::ActiveCall => Self::leave_call(window, cx),
-                    Section::Channels => self.new_root_channel(window, cx),
-                    Section::Contacts => self.toggle_contact_finder(window, cx),
-                    Section::ContactRequests
-                    | Section::Online
-                    | Section::Offline
-                    | Section::ChannelInvites => {
-                        self.toggle_section_expanded(*section, cx);
-                    }
-                },
-                ListEntry::Contact { contact, calling } => {
-                    if contact.online && !contact.busy && !calling {
-                        self.call(contact.user.id, window, cx);
-                    }
-                }
-                ListEntry::ParticipantProject {
-                    project_id,
-                    host_user_id,
-                    ..
-                } => {
-                    if let Some(workspace) = self.workspace.upgrade() {
-                        let app_state = workspace.read(cx).app_state().clone();
-                        workspace::join_in_room_project(*project_id, *host_user_id, app_state, cx)
-                            .detach_and_prompt_err(
-                                "Failed to join project",
-                                window,
-                                cx,
-                                |_, _, _| None,
-                            );
-                    }
-                }
-                ListEntry::ParticipantScreen { peer_id, .. } => {
-                    let Some(peer_id) = peer_id else {
-                        return;
-                    };
-                    if let Some(workspace) = self.workspace.upgrade() {
-                        workspace.update(cx, |workspace, cx| {
-                            workspace.open_shared_screen(*peer_id, window, cx)
-                        });
-                    }
-                }
-                ListEntry::Channel { channel, .. } => {
-                    let is_active = maybe!({
-                        let call_channel = ActiveCall::global(cx)
-                            .read(cx)
-                            .room()?
-                            .read(cx)
-                            .channel_id()?;
-
-                        Some(call_channel == channel.id)
-                    })
-                    .unwrap_or(false);
-                    if is_active {
-                        self.open_channel_notes(channel.id, window, cx)
-                    } else {
-                        self.join_channel(channel.id, window, cx)
-                    }
-                }
-                ListEntry::ContactPlaceholder => self.toggle_contact_finder(window, cx),
-                ListEntry::CallParticipant { user, peer_id, .. } => {
-                    if Some(user) == self.user_store.read(cx).current_user().as_ref() {
-                        Self::leave_call(window, cx);
-                    } else if let Some(peer_id) = peer_id {
-                        self.workspace
-                            .update(cx, |workspace, cx| workspace.follow(*peer_id, window, cx))
-                            .ok();
-                    }
-                }
-                ListEntry::IncomingRequest(user) => {
-                    self.respond_to_contact_request(user.id, true, window, cx)
-                }
-                ListEntry::ChannelInvite(channel) => {
-                    self.respond_to_channel_invite(channel.id, true, cx)
-                }
-                ListEntry::ChannelNotes { channel_id } => {
-                    self.open_channel_notes(*channel_id, window, cx)
-                }
-                ListEntry::OutgoingRequest(_) => {}
-                ListEntry::ChannelEditor { .. } => {}
-            }
-        }
-    }
-
-    fn insert_space(&mut self, _: &InsertSpace, window: &mut Window, cx: &mut Context<Self>) {
-        if self.channel_editing_state.is_some() {
-            self.channel_name_editor.update(cx, |editor, cx| {
-                editor.insert(" ", window, cx);
-            });
-        } else if self.filter_editor.focus_handle(cx).is_focused(window) {
-            self.filter_editor.update(cx, |editor, cx| {
-                editor.insert(" ", window, cx);
-            });
-        }
-    }
-
-    fn confirm_channel_edit(&mut self, window: &mut Window, cx: &mut Context<CollabPanel>) -> bool {
-        if let Some(editing_state) = &mut self.channel_editing_state {
-            match editing_state {
-                ChannelEditingState::Create {
-                    location,
-                    pending_name,
-                    ..
-                } => {
-                    if pending_name.is_some() {
-                        return false;
-                    }
-                    let channel_name = self.channel_name_editor.read(cx).text(cx);
-
-                    *pending_name = Some(channel_name.clone());
-
-                    let create = self.channel_store.update(cx, |channel_store, cx| {
-                        channel_store.create_channel(&channel_name, *location, cx)
-                    });
-                    if location.is_none() {
-                        cx.spawn_in(window, async move |this, cx| {
-                            let channel_id = create.await?;
-                            this.update_in(cx, |this, window, cx| {
-                                this.show_channel_modal(
-                                    channel_id,
-                                    channel_modal::Mode::InviteMembers,
-                                    window,
-                                    cx,
-                                )
-                            })
-                        })
-                        .detach_and_prompt_err(
-                            "Failed to create channel",
-                            window,
-                            cx,
-                            |_, _, _| None,
-                        );
-                    } else {
-                        create.detach_and_prompt_err(
-                            "Failed to create channel",
-                            window,
-                            cx,
-                            |_, _, _| None,
-                        );
-                    }
-                    cx.notify();
-                }
-                ChannelEditingState::Rename {
-                    location,
-                    pending_name,
-                } => {
-                    if pending_name.is_some() {
-                        return false;
-                    }
-                    let channel_name = self.channel_name_editor.read(cx).text(cx);
-                    *pending_name = Some(channel_name.clone());
-
-                    self.channel_store
-                        .update(cx, |channel_store, cx| {
-                            channel_store.rename(*location, &channel_name, cx)
-                        })
-                        .detach();
-                    cx.notify();
-                }
-            }
-            cx.focus_self(window);
-            true
-        } else {
-            false
-        }
-    }
-
-    fn toggle_section_expanded(&mut self, section: Section, cx: &mut Context<Self>) {
-        if let Some(ix) = self.collapsed_sections.iter().position(|s| *s == section) {
-            self.collapsed_sections.remove(ix);
-        } else {
-            self.collapsed_sections.push(section);
-        }
-        self.update_entries(false, cx);
-    }
-
-    fn collapse_selected_channel(
-        &mut self,
-        _: &CollapseSelectedChannel,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(channel_id) = self.selected_channel().map(|channel| channel.id) else {
-            return;
-        };
-
-        if self.is_channel_collapsed(channel_id) {
-            return;
-        }
-
-        self.toggle_channel_collapsed(channel_id, window, cx);
-    }
-
-    fn expand_selected_channel(
-        &mut self,
-        _: &ExpandSelectedChannel,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(id) = self.selected_channel().map(|channel| channel.id) else {
-            return;
-        };
-
-        if !self.is_channel_collapsed(id) {
-            return;
-        }
-
-        self.toggle_channel_collapsed(id, window, cx)
-    }
-
-    fn toggle_channel_collapsed(
-        &mut self,
-        channel_id: ChannelId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        match self.collapsed_channels.binary_search(&channel_id) {
-            Ok(ix) => {
-                self.collapsed_channels.remove(ix);
-            }
-            Err(ix) => {
-                self.collapsed_channels.insert(ix, channel_id);
-            }
-        };
-        self.serialize(cx);
-        self.update_entries(true, cx);
-        cx.notify();
-        cx.focus_self(window);
-    }
-
-    fn is_channel_collapsed(&self, channel_id: ChannelId) -> bool {
-        self.collapsed_channels.binary_search(&channel_id).is_ok()
-    }
-
-    fn leave_call(window: &mut Window, cx: &mut App) {
-        ActiveCall::global(cx)
-            .update(cx, |call, cx| call.hang_up(cx))
-            .detach_and_prompt_err("Failed to hang up", window, cx, |_, _, _| None);
-    }
-
-    fn toggle_contact_finder(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(workspace) = self.workspace.upgrade() {
-            workspace.update(cx, |workspace, cx| {
-                workspace.toggle_modal(window, cx, |window, cx| {
-                    let mut finder = ContactFinder::new(self.user_store.clone(), window, cx);
-                    finder.set_query(self.filter_editor.read(cx).text(cx), window, cx);
-                    finder
-                });
-            });
-        }
-    }
-
-    fn new_root_channel(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.channel_editing_state = Some(ChannelEditingState::Create {
-            location: None,
-            pending_name: None,
-        });
-        self.update_entries(false, cx);
-        self.select_channel_editor();
-        window.focus(&self.channel_name_editor.focus_handle(cx));
-        cx.notify();
-    }
-
-    fn select_channel_editor(&mut self) {
-        self.selection = self
-            .entries
-            .iter()
-            .position(|entry| matches!(entry, ListEntry::ChannelEditor { .. }));
-    }
-
-    fn new_subchannel(
-        &mut self,
-        channel_id: ChannelId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.collapsed_channels
-            .retain(|channel| *channel != channel_id);
-        self.channel_editing_state = Some(ChannelEditingState::Create {
-            location: Some(channel_id),
-            pending_name: None,
-        });
-        self.update_entries(false, cx);
-        self.select_channel_editor();
-        window.focus(&self.channel_name_editor.focus_handle(cx));
-        cx.notify();
-    }
-
-    fn manage_members(
-        &mut self,
-        channel_id: ChannelId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.show_channel_modal(channel_id, channel_modal::Mode::ManageMembers, window, cx);
-    }
-
-    fn remove_selected_channel(&mut self, _: &Remove, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(channel) = self.selected_channel() {
-            self.remove_channel(channel.id, window, cx)
-        }
-    }
-
-    fn rename_selected_channel(
-        &mut self,
-        _: &SecondaryConfirm,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(channel) = self.selected_channel() {
-            self.rename_channel(channel.id, window, cx);
-        }
-    }
-
-    fn rename_channel(
-        &mut self,
-        channel_id: ChannelId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let channel_store = self.channel_store.read(cx);
-        if !channel_store.is_channel_admin(channel_id) {
-            return;
-        }
-        if let Some(channel) = channel_store.channel_for_id(channel_id).cloned() {
-            self.channel_editing_state = Some(ChannelEditingState::Rename {
-                location: channel_id,
-                pending_name: None,
-            });
-            self.channel_name_editor.update(cx, |editor, cx| {
-                editor.set_text(channel.name.clone(), window, cx);
-                editor.select_all(&Default::default(), window, cx);
-            });
-            window.focus(&self.channel_name_editor.focus_handle(cx));
-            self.update_entries(false, cx);
-            self.select_channel_editor();
-        }
-    }
-
-    fn open_selected_channel_notes(
-        &mut self,
-        _: &OpenSelectedChannelNotes,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(channel) = self.selected_channel() {
-            self.open_channel_notes(channel.id, window, cx);
-        }
-    }
-
-    fn set_channel_visibility(
-        &mut self,
-        channel_id: ChannelId,
-        visibility: ChannelVisibility,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.channel_store
-            .update(cx, |channel_store, cx| {
-                channel_store.set_channel_visibility(channel_id, visibility, cx)
-            })
-            .detach_and_prompt_err("Failed to set channel visibility", window, cx, |e, _, _| match e.error_code() {
-                ErrorCode::BadPublicNesting =>
-                    if e.error_tag("direction") == Some("parent") {
-                        Some("To make a channel public, its parent channel must be public.".to_string())
-                    } else {
-                        Some("To make a channel private, all of its subchannels must be private.".to_string())
-                    },
-                _ => None
-            });
-    }
-
-    fn start_move_channel(
-        &mut self,
-        channel_id: ChannelId,
-        _window: &mut Window,
-        _cx: &mut Context<Self>,
-    ) {
-        self.channel_clipboard = Some(ChannelMoveClipboard { channel_id });
-    }
-
-    fn start_move_selected_channel(
-        &mut self,
-        _: &StartMoveChannel,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(channel) = self.selected_channel() {
-            self.start_move_channel(channel.id, window, cx);
-        }
-    }
-
-    fn move_channel_on_clipboard(
-        &mut self,
-        to_channel_id: ChannelId,
-        window: &mut Window,
-        cx: &mut Context<CollabPanel>,
-    ) {
-        if let Some(clipboard) = self.channel_clipboard.take() {
-            self.move_channel(clipboard.channel_id, to_channel_id, window, cx)
-        }
-    }
-
-    fn move_channel(
-        &self,
-        channel_id: ChannelId,
-        to: ChannelId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.channel_store
-            .update(cx, |channel_store, cx| {
-                channel_store.move_channel(channel_id, to, cx)
-            })
-            .detach_and_prompt_err("Failed to move channel", window, cx, |e, _, _| {
-                match e.error_code() {
-                    ErrorCode::BadPublicNesting => {
-                        Some("Public channels must have public parents".into())
-                    }
-                    ErrorCode::CircularNesting => {
-                        Some("You cannot move a channel into itself".into())
-                    }
-                    ErrorCode::WrongMoveTarget => {
-                        Some("You cannot move a channel into a different root channel".into())
-                    }
-                    _ => None,
-                }
-            })
-    }
-
-    fn move_channel_up(&mut self, _: &MoveChannelUp, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(channel) = self.selected_channel() {
-            self.channel_store.update(cx, |store, cx| {
-                store
-                    .reorder_channel(channel.id, proto::reorder_channel::Direction::Up, cx)
-                    .detach_and_prompt_err("Failed to move channel up", window, cx, |_, _, _| None)
-            });
-        }
-    }
-
-    fn move_channel_down(
-        &mut self,
-        _: &MoveChannelDown,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(channel) = self.selected_channel() {
-            self.channel_store.update(cx, |store, cx| {
-                store
-                    .reorder_channel(channel.id, proto::reorder_channel::Direction::Down, cx)
-                    .detach_and_prompt_err("Failed to move channel down", window, cx, |_, _, _| {
-                        None
-                    })
-            });
-        }
-    }
-
-    fn open_channel_notes(
-        &mut self,
-        channel_id: ChannelId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(workspace) = self.workspace.upgrade() {
-            ChannelView::open(channel_id, None, workspace, window, cx).detach();
-        }
-    }
-
-    fn show_inline_context_menu(
-        &mut self,
-        _: &Secondary,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(bounds) = self
-            .selection
-            .and_then(|ix| self.list_state.bounds_for_item(ix))
-        else {
-            return;
-        };
-
-        if let Some(channel) = self.selected_channel() {
-            self.deploy_channel_context_menu(
-                bounds.center(),
-                channel.id,
-                self.selection.unwrap(),
-                window,
-                cx,
-            );
-            cx.stop_propagation();
-            return;
-        };
-
-        if let Some(contact) = self.selected_contact() {
-            self.deploy_contact_context_menu(bounds.center(), contact, window, cx);
-            cx.stop_propagation();
-        }
-    }
-
-    fn dispatch_context(&self, window: &Window, cx: &Context<Self>) -> KeyContext {
-        let mut dispatch_context = KeyContext::new_with_defaults();
-        dispatch_context.add("CollabPanel");
-        dispatch_context.add("menu");
-
-        let identifier = if self.channel_name_editor.focus_handle(cx).is_focused(window)
-            || self.filter_editor.focus_handle(cx).is_focused(window)
-        {
-            "editing"
-        } else {
-            "not_editing"
-        };
-
-        dispatch_context.add(identifier);
-        dispatch_context
-    }
-
-    fn selected_channel(&self) -> Option<&Arc<Channel>> {
-        self.selection
-            .and_then(|ix| self.entries.get(ix))
-            .and_then(|entry| match entry {
-                ListEntry::Channel { channel, .. } => Some(channel),
-                _ => None,
-            })
-    }
-
-    fn selected_contact(&self) -> Option<Arc<Contact>> {
-        self.selection
-            .and_then(|ix| self.entries.get(ix))
-            .and_then(|entry| match entry {
-                ListEntry::Contact { contact, .. } => Some(contact.clone()),
-                _ => None,
-            })
-    }
-
-    fn show_channel_modal(
-        &mut self,
-        channel_id: ChannelId,
-        mode: channel_modal::Mode,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let workspace = self.workspace.clone();
-        let user_store = self.user_store.clone();
-        let channel_store = self.channel_store.clone();
-
-        cx.spawn_in(window, async move |_, cx| {
-            workspace.update_in(cx, |workspace, window, cx| {
-                workspace.toggle_modal(window, cx, |window, cx| {
-                    ChannelModal::new(
-                        user_store.clone(),
-                        channel_store.clone(),
-                        channel_id,
-                        mode,
-                        window,
-                        cx,
-                    )
-                });
-            })
-        })
-        .detach();
-    }
-
-    fn leave_channel(&self, channel_id: ChannelId, window: &mut Window, cx: &mut Context<Self>) {
-        let Some(user_id) = self.user_store.read(cx).current_user().map(|u| u.id) else {
-            return;
-        };
-        let Some(channel) = self.channel_store.read(cx).channel_for_id(channel_id) else {
-            return;
-        };
-        let prompt_message = format!("Are you sure you want to leave \"#{}\"?", channel.name);
-        let answer = window.prompt(
-            PromptLevel::Warning,
-            &prompt_message,
-            None,
-            &["Leave", "Cancel"],
-            cx,
-        );
-        cx.spawn_in(window, async move |this, cx| {
-            if answer.await? != 0 {
-                return Ok(());
-            }
-            this.update(cx, |this, cx| {
-                this.channel_store.update(cx, |channel_store, cx| {
-                    channel_store.remove_member(channel_id, user_id, cx)
-                })
-            })?
-            .await
-        })
-        .detach_and_prompt_err("Failed to leave channel", window, cx, |_, _, _| None)
-    }
-
-    fn remove_channel(
-        &mut self,
-        channel_id: ChannelId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let channel_store = self.channel_store.clone();
-        if let Some(channel) = channel_store.read(cx).channel_for_id(channel_id) {
-            let prompt_message = format!(
-                "Are you sure you want to remove the channel \"{}\"?",
-                channel.name
-            );
-            let answer = window.prompt(
-                PromptLevel::Warning,
-                &prompt_message,
-                None,
-                &["Remove", "Cancel"],
-                cx,
-            );
-            cx.spawn_in(window, async move |this, cx| {
-                if answer.await? == 0 {
-                    channel_store
-                        .update(cx, |channels, _| channels.remove_channel(channel_id))?
-                        .await
-                        .notify_async_err(cx);
-                    this.update_in(cx, |_, window, cx| cx.focus_self(window))
-                        .ok();
-                }
-                anyhow::Ok(())
-            })
-            .detach();
-        }
-    }
-
-    fn remove_contact(
-        &mut self,
-        user_id: u64,
-        github_login: &str,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let user_store = self.user_store.clone();
-        let prompt_message = format!(
-            "Are you sure you want to remove \"{}\" from your contacts?",
-            github_login
-        );
-        let answer = window.prompt(
-            PromptLevel::Warning,
-            &prompt_message,
-            None,
-            &["Remove", "Cancel"],
-            cx,
-        );
-        cx.spawn_in(window, async move |_, cx| {
-            if answer.await? == 0 {
-                user_store
-                    .update(cx, |store, cx| store.remove_contact(user_id, cx))?
-                    .await
-                    .notify_async_err(cx);
-            }
-            anyhow::Ok(())
-        })
-        .detach_and_prompt_err("Failed to remove contact", window, cx, |_, _, _| None);
-    }
-
-    fn respond_to_contact_request(
-        &mut self,
-        user_id: u64,
-        accept: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.user_store
-            .update(cx, |store, cx| {
-                store.respond_to_contact_request(user_id, accept, cx)
-            })
-            .detach_and_prompt_err(
-                "Failed to respond to contact request",
-                window,
-                cx,
-                |_, _, _| None,
-            );
-    }
-
-    fn respond_to_channel_invite(
-        &mut self,
-        channel_id: ChannelId,
-        accept: bool,
-        cx: &mut Context<Self>,
-    ) {
-        self.channel_store
-            .update(cx, |store, cx| {
-                store.respond_to_channel_invite(channel_id, accept, cx)
-            })
-            .detach();
-    }
-
-    fn call(&mut self, recipient_user_id: u64, window: &mut Window, cx: &mut Context<Self>) {
-        ActiveCall::global(cx)
-            .update(cx, |call, cx| {
-                call.invite(recipient_user_id, Some(self.project.clone()), cx)
-            })
-            .detach_and_prompt_err("Call failed", window, cx, |_, _, _| None);
-    }
-
-    fn join_channel(&self, channel_id: ChannelId, window: &mut Window, cx: &mut Context<Self>) {
-        let Some(workspace) = self.workspace.upgrade() else {
-            return;
-        };
-        let Some(handle) = window.window_handle().downcast::<Workspace>() else {
-            return;
-        };
-        workspace::join_channel(
-            channel_id,
-            workspace.read(cx).app_state().clone(),
-            Some(handle),
-            cx,
-        )
-        .detach_and_prompt_err("Failed to join channel", window, cx, |_, _, _| None)
-    }
-
-    fn copy_channel_link(&mut self, channel_id: ChannelId, cx: &mut Context<Self>) {
-        let channel_store = self.channel_store.read(cx);
-        let Some(channel) = channel_store.channel_for_id(channel_id) else {
-            return;
-        };
-        let item = ClipboardItem::new_string(channel.link(cx));
-        cx.write_to_clipboard(item)
-    }
-
-    fn copy_channel_notes_link(&mut self, channel_id: ChannelId, cx: &mut Context<Self>) {
-        let channel_store = self.channel_store.read(cx);
-        let Some(channel) = channel_store.channel_for_id(channel_id) else {
-            return;
-        };
-        let item = ClipboardItem::new_string(channel.notes_link(None, cx));
-        cx.write_to_clipboard(item)
-    }
-
-    fn render_signed_out(&mut self, cx: &mut Context<Self>) -> Div {
-        let collab_blurb = "Work with your team in realtime with collaborative editing, voice, shared notes and more.";
-
-        v_flex()
-            .gap_6()
-            .p_4()
-            .child(Label::new(collab_blurb))
-            .child(
-                v_flex()
-                    .gap_2()
-                    .child(
-                        Button::new("sign_in", "Sign in")
-                            .icon_color(Color::Muted)
-                            .icon(IconName::Github)
-                            .icon_position(IconPosition::Start)
-                            .style(ButtonStyle::Filled)
-                            .full_width()
-                            .on_click(cx.listener(|this, _, window, cx| {
-                                let client = this.client.clone();
-                                cx.spawn_in(window, async move |_, cx| {
-                                    client
-                                        .connect(true, cx)
-                                        .await
-                                        .into_response()
-                                        .notify_async_err(cx);
-                                })
-                                .detach()
-                            })),
-                    )
-                    .child(
-                        v_flex().w_full().items_center().child(
-                            Label::new("Sign in to enable collaboration.")
-                                .color(Color::Muted)
-                                .size(LabelSize::Small),
-                        ),
-                    ),
-            )
-    }
-
-    fn render_list_entry(
-        &mut self,
-        ix: usize,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> AnyElement {
-        let entry = &self.entries[ix];
-
-        let is_selected = self.selection == Some(ix);
-        match entry {
-            ListEntry::Header(section) => {
-                let is_collapsed = self.collapsed_sections.contains(section);
-                self.render_header(*section, is_selected, is_collapsed, cx)
-                    .into_any_element()
-            }
-            ListEntry::Contact { contact, calling } => self
-                .render_contact(contact, *calling, is_selected, cx)
-                .into_any_element(),
-            ListEntry::ContactPlaceholder => self
-                .render_contact_placeholder(is_selected, cx)
-                .into_any_element(),
-            ListEntry::IncomingRequest(user) => self
-                .render_contact_request(user, true, is_selected, cx)
-                .into_any_element(),
-            ListEntry::OutgoingRequest(user) => self
-                .render_contact_request(user, false, is_selected, cx)
-                .into_any_element(),
-            ListEntry::Channel {
-                channel,
-                depth,
-                has_children,
-                string_match,
-            } => self
-                .render_channel(
-                    channel,
-                    *depth,
-                    *has_children,
-                    is_selected,
-                    ix,
-                    string_match.as_ref(),
-                    cx,
-                )
-                .into_any_element(),
-            ListEntry::ChannelEditor { depth } => self
-                .render_channel_editor(*depth, window, cx)
-                .into_any_element(),
-            ListEntry::ChannelInvite(channel) => self
-                .render_channel_invite(channel, is_selected, cx)
-                .into_any_element(),
-            ListEntry::CallParticipant {
-                user,
-                peer_id,
-                is_pending,
-                role,
-            } => self
-                .render_call_participant(user, *peer_id, *is_pending, *role, is_selected, cx)
-                .into_any_element(),
-            ListEntry::ParticipantProject {
-                project_id,
-                worktree_root_names,
-                host_user_id,
-                is_last,
-            } => self
-                .render_participant_project(
-                    *project_id,
-                    worktree_root_names,
-                    *host_user_id,
-                    *is_last,
-                    is_selected,
-                    window,
-                    cx,
-                )
-                .into_any_element(),
-            ListEntry::ParticipantScreen { peer_id, is_last } => self
-                .render_participant_screen(*peer_id, *is_last, is_selected, window, cx)
-                .into_any_element(),
-            ListEntry::ChannelNotes { channel_id } => self
-                .render_channel_notes(*channel_id, is_selected, window, cx)
-                .into_any_element(),
-        }
-    }
-
-    fn render_signed_in(&mut self, _: &mut Window, cx: &mut Context<Self>) -> Div {
-        self.channel_store.update(cx, |channel_store, _| {
-            channel_store.initialize();
-        });
-        v_flex()
-            .size_full()
-            .gap_1()
-            .child(
-                h_flex()
-                    .p_2()
-                    .h(Tab::container_height(cx))
-                    .gap_1p5()
-                    .border_b_1()
-                    .border_color(cx.theme().colors().border)
-                    .child(
-                        Icon::new(IconName::MagnifyingGlass)
-                            .size(IconSize::Small)
-                            .color(Color::Muted),
-                    )
-                    .child(self.render_filter_input(&self.filter_editor, cx)),
-            )
-            .child(
-                list(
-                    self.list_state.clone(),
-                    cx.processor(Self::render_list_entry),
-                )
-                .size_full(),
-            )
-    }
-
-    fn render_filter_input(
-        &self,
-        editor: &Entity<Editor>,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let settings = ThemeSettings::get_global(cx);
-        let text_style = TextStyle {
-            color: if editor.read(cx).read_only(cx) {
-                cx.theme().colors().text_disabled
-            } else {
-                cx.theme().colors().text
-            },
-            font_family: settings.ui_font.family.clone(),
-            font_features: settings.ui_font.features.clone(),
-            font_fallbacks: settings.ui_font.fallbacks.clone(),
-            font_size: rems(0.875).into(),
-            font_weight: settings.ui_font.weight,
-            font_style: FontStyle::Normal,
-            line_height: relative(1.3),
-            ..Default::default()
-        };
-
-        EditorElement::new(
-            editor,
-            EditorStyle {
-                local_player: cx.theme().players().local(),
-                text: text_style,
-                ..Default::default()
-            },
-        )
-    }
-
-    fn render_header(
-        &self,
-        section: Section,
-        is_selected: bool,
-        is_collapsed: bool,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let mut channel_link = None;
-        let mut channel_tooltip_text = None;
-        let mut channel_icon = None;
-
-        let text = match section {
-            Section::ActiveCall => {
-                let channel_name = maybe!({
-                    let channel_id = ActiveCall::global(cx).read(cx).channel_id(cx)?;
-
-                    let channel = self.channel_store.read(cx).channel_for_id(channel_id)?;
-
-                    channel_link = Some(channel.link(cx));
-                    (channel_icon, channel_tooltip_text) = match channel.visibility {
-                        proto::ChannelVisibility::Public => {
-                            (Some("icons/public.svg"), Some("Copy public channel link."))
-                        }
-                        proto::ChannelVisibility::Members => {
-                            (Some("icons/hash.svg"), Some("Copy private channel link."))
-                        }
-                    };
-
-                    Some(channel.name.as_ref())
-                });
-
-                if let Some(name) = channel_name {
-                    SharedString::from(name.to_string())
-                } else {
-                    SharedString::from("Current Call")
-                }
-            }
-            Section::ContactRequests => SharedString::from("Requests"),
-            Section::Contacts => SharedString::from("Contacts"),
-            Section::Channels => SharedString::from("Channels"),
-            Section::ChannelInvites => SharedString::from("Invites"),
-            Section::Online => SharedString::from("Online"),
-            Section::Offline => SharedString::from("Offline"),
-        };
-
-        let button = match section {
-            Section::ActiveCall => channel_link.map(|channel_link| {
-                let channel_link_copy = channel_link;
-                IconButton::new("channel-link", IconName::Copy)
-                    .icon_size(IconSize::Small)
-                    .size(ButtonSize::None)
-                    .visible_on_hover("section-header")
-                    .on_click(move |_, _, cx| {
-                        let item = ClipboardItem::new_string(channel_link_copy.clone());
-                        cx.write_to_clipboard(item)
-                    })
-                    .tooltip(Tooltip::text("Copy channel link"))
-                    .into_any_element()
-            }),
-            Section::Contacts => Some(
-                IconButton::new("add-contact", IconName::Plus)
-                    .on_click(
-                        cx.listener(|this, _, window, cx| this.toggle_contact_finder(window, cx)),
-                    )
-                    .tooltip(Tooltip::text("Search for new contact"))
-                    .into_any_element(),
-            ),
-            Section::Channels => Some(
-                IconButton::new("add-channel", IconName::Plus)
-                    .on_click(cx.listener(|this, _, window, cx| this.new_root_channel(window, cx)))
-                    .tooltip(Tooltip::text("Create a channel"))
-                    .into_any_element(),
-            ),
-            _ => None,
-        };
-
-        let can_collapse = match section {
-            Section::ActiveCall | Section::Channels | Section::Contacts => false,
-            Section::ChannelInvites
-            | Section::ContactRequests
-            | Section::Online
-            | Section::Offline => true,
-        };
-
-        h_flex().w_full().group("section-header").child(
-            ListHeader::new(text)
-                .when(can_collapse, |header| {
-                    header.toggle(Some(!is_collapsed)).on_toggle(cx.listener(
-                        move |this, _, _, cx| {
-                            this.toggle_section_expanded(section, cx);
-                        },
-                    ))
-                })
-                .inset(true)
-                .end_slot::<AnyElement>(button)
-                .toggle_state(is_selected),
-        )
-    }
-
-    fn render_contact(
-        &self,
-        contact: &Arc<Contact>,
-        calling: bool,
-        is_selected: bool,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let online = contact.online;
-        let busy = contact.busy || calling;
-        let github_login = contact.user.github_login.clone();
-        let item = ListItem::new(github_login.clone())
-            .indent_level(1)
-            .indent_step_size(px(20.))
-            .toggle_state(is_selected)
-            .child(
-                h_flex()
-                    .w_full()
-                    .justify_between()
-                    .child(render_participant_name_and_handle(&contact.user))
-                    .when(calling, |el| {
-                        el.child(Label::new("Calling").color(Color::Muted))
-                    })
-                    .when(!calling, |el| {
-                        el.child(
-                            IconButton::new("contact context menu", IconName::Ellipsis)
-                                .icon_color(Color::Muted)
-                                .visible_on_hover("")
-                                .on_click(cx.listener({
-                                    let contact = contact.clone();
-                                    move |this, event: &ClickEvent, window, cx| {
-                                        this.deploy_contact_context_menu(
-                                            event.position(),
-                                            contact.clone(),
-                                            window,
-                                            cx,
-                                        );
-                                    }
-                                })),
-                        )
-                    }),
-            )
-            .on_secondary_mouse_down(cx.listener({
-                let contact = contact.clone();
-                move |this, event: &MouseDownEvent, window, cx| {
-                    this.deploy_contact_context_menu(event.position, contact.clone(), window, cx);
-                }
-            }))
-            .start_slot(
-                // todo handle contacts with no avatar
-                Avatar::new(contact.user.avatar_uri.clone())
-                    .indicator::<AvatarAvailabilityIndicator>(if online {
-                        Some(AvatarAvailabilityIndicator::new(match busy {
-                            true => ui::CollaboratorAvailability::Busy,
-                            false => ui::CollaboratorAvailability::Free,
-                        }))
-                    } else {
-                        None
-                    }),
-            );
-
-        div()
-            .id(github_login.clone())
-            .group("")
-            .child(item)
-            .tooltip(move |_, cx| {
-                let text = if !online {
-                    format!(" {} is offline", &github_login)
-                } else if busy {
-                    format!(" {} is on a call", &github_login)
-                } else {
-                    let room = ActiveCall::global(cx).read(cx).room();
-                    if room.is_some() {
-                        format!("Invite {} to join call", &github_login)
-                    } else {
-                        format!("Call {}", &github_login)
-                    }
-                };
-                Tooltip::simple(text, cx)
-            })
-    }
-
-    fn render_contact_request(
-        &self,
-        user: &Arc<User>,
-        is_incoming: bool,
-        is_selected: bool,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let github_login = user.github_login.clone();
-        let user_id = user.id;
-        let is_response_pending = self.user_store.read(cx).is_contact_request_pending(user);
-        let color = if is_response_pending {
-            Color::Muted
-        } else {
-            Color::Default
-        };
-
-        let controls = if is_incoming {
-            vec![
-                IconButton::new("decline-contact", IconName::Close)
-                    .on_click(cx.listener(move |this, _, window, cx| {
-                        this.respond_to_contact_request(user_id, false, window, cx);
-                    }))
-                    .icon_color(color)
-                    .tooltip(Tooltip::text("Decline invite")),
-                IconButton::new("accept-contact", IconName::Check)
-                    .on_click(cx.listener(move |this, _, window, cx| {
-                        this.respond_to_contact_request(user_id, true, window, cx);
-                    }))
-                    .icon_color(color)
-                    .tooltip(Tooltip::text("Accept invite")),
-            ]
-        } else {
-            let github_login = github_login.clone();
-            vec![
-                IconButton::new("remove_contact", IconName::Close)
-                    .on_click(cx.listener(move |this, _, window, cx| {
-                        this.remove_contact(user_id, &github_login, window, cx);
-                    }))
-                    .icon_color(color)
-                    .tooltip(Tooltip::text("Cancel invite")),
-            ]
-        };
-
-        ListItem::new(github_login.clone())
-            .indent_level(1)
-            .indent_step_size(px(20.))
-            .toggle_state(is_selected)
-            .child(
-                h_flex()
-                    .w_full()
-                    .justify_between()
-                    .child(Label::new(github_login))
-                    .child(h_flex().children(controls)),
-            )
-            .start_slot(Avatar::new(user.avatar_uri.clone()))
-    }
-
-    fn render_channel_invite(
-        &self,
-        channel: &Arc<Channel>,
-        is_selected: bool,
-        cx: &mut Context<Self>,
-    ) -> ListItem {
-        let channel_id = channel.id;
-        let response_is_pending = self
-            .channel_store
-            .read(cx)
-            .has_pending_channel_invite_response(channel);
-        let color = if response_is_pending {
-            Color::Muted
-        } else {
-            Color::Default
-        };
-
-        let controls = [
-            IconButton::new("reject-invite", IconName::Close)
-                .on_click(cx.listener(move |this, _, _, cx| {
-                    this.respond_to_channel_invite(channel_id, false, cx);
-                }))
-                .icon_color(color)
-                .tooltip(Tooltip::text("Decline invite")),
-            IconButton::new("accept-invite", IconName::Check)
-                .on_click(cx.listener(move |this, _, _, cx| {
-                    this.respond_to_channel_invite(channel_id, true, cx);
-                }))
-                .icon_color(color)
-                .tooltip(Tooltip::text("Accept invite")),
-        ];
-
-        ListItem::new(("channel-invite", channel.id.0 as usize))
-            .toggle_state(is_selected)
-            .child(
-                h_flex()
-                    .w_full()
-                    .justify_between()
-                    .child(Label::new(channel.name.clone()))
-                    .child(h_flex().children(controls)),
-            )
-            .start_slot(
-                Icon::new(IconName::Hash)
-                    .size(IconSize::Small)
-                    .color(Color::Muted),
-            )
-    }
-
-    fn render_contact_placeholder(&self, is_selected: bool, cx: &mut Context<Self>) -> ListItem {
-        ListItem::new("contact-placeholder")
-            .child(Icon::new(IconName::Plus))
-            .child(Label::new("Add a Contact"))
-            .toggle_state(is_selected)
-            .on_click(cx.listener(|this, _, window, cx| this.toggle_contact_finder(window, cx)))
-    }
-
-    fn render_channel(
-        &self,
-        channel: &Channel,
-        depth: usize,
-        has_children: bool,
-        is_selected: bool,
-        ix: usize,
-        string_match: Option<&StringMatch>,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let channel_id = channel.id;
-
-        let is_active = maybe!({
-            let call_channel = ActiveCall::global(cx)
-                .read(cx)
-                .room()?
-                .read(cx)
-                .channel_id()?;
-            Some(call_channel == channel_id)
-        })
-        .unwrap_or(false);
-        let channel_store = self.channel_store.read(cx);
-        let is_public = channel_store
-            .channel_for_id(channel_id)
-            .map(|channel| channel.visibility)
-            == Some(proto::ChannelVisibility::Public);
-        let disclosed =
-            has_children.then(|| self.collapsed_channels.binary_search(&channel.id).is_err());
-
-        let has_notes_notification = channel_store.has_channel_buffer_changed(channel_id);
-
-        const FACEPILE_LIMIT: usize = 3;
-        let participants = self.channel_store.read(cx).channel_participants(channel_id);
-
-        let face_pile = if participants.is_empty() {
-            None
-        } else {
-            let extra_count = participants.len().saturating_sub(FACEPILE_LIMIT);
-            let result = Facepile::new(
-                participants
-                    .iter()
-                    .map(|user| Avatar::new(user.avatar_uri.clone()).into_any_element())
-                    .take(FACEPILE_LIMIT)
-                    .chain(if extra_count > 0 {
-                        Some(
-                            Label::new(format!("+{extra_count}"))
-                                .ml_2()
-                                .into_any_element(),
-                        )
-                    } else {
-                        None
-                    })
-                    .collect::<SmallVec<_>>(),
-            );
-
-            Some(result)
-        };
-
-        let width = self.width.unwrap_or(px(240.));
-        let root_id = channel.root_id();
-
-        div()
-            .h_6()
-            .id(channel_id.0 as usize)
-            .group("")
-            .flex()
-            .w_full()
-            .when(!channel.is_root_channel(), |el| {
-                el.on_drag(channel.clone(), move |channel, _, _, cx| {
-                    cx.new(|_| DraggedChannelView {
-                        channel: channel.clone(),
-                        width,
-                    })
-                })
-            })
-            .drag_over::<Channel>({
-                move |style, dragged_channel: &Channel, _window, cx| {
-                    if dragged_channel.root_id() == root_id {
-                        style.bg(cx.theme().colors().ghost_element_hover)
-                    } else {
-                        style
-                    }
-                }
-            })
-            .on_drop(
-                cx.listener(move |this, dragged_channel: &Channel, window, cx| {
-                    if dragged_channel.root_id() != root_id {
-                        return;
-                    }
-                    this.move_channel(dragged_channel.id, channel_id, window, cx);
-                }),
-            )
-            .child(
-                ListItem::new(channel_id.0 as usize)
-                    // Add one level of depth for the disclosure arrow.
-                    .indent_level(depth + 1)
-                    .indent_step_size(px(20.))
-                    .toggle_state(is_selected || is_active)
-                    .toggle(disclosed)
-                    .on_toggle(cx.listener(move |this, _, window, cx| {
-                        this.toggle_channel_collapsed(channel_id, window, cx)
-                    }))
-                    .on_click(cx.listener(move |this, _, window, cx| {
-                        if is_active {
-                            this.open_channel_notes(channel_id, window, cx)
-                        } else {
-                            this.join_channel(channel_id, window, cx)
-                        }
-                    }))
-                    .on_secondary_mouse_down(cx.listener(
-                        move |this, event: &MouseDownEvent, window, cx| {
-                            this.deploy_channel_context_menu(
-                                event.position,
-                                channel_id,
-                                ix,
-                                window,
-                                cx,
-                            )
-                        },
-                    ))
-                    .start_slot(
-                        div()
-                            .relative()
-                            .child(
-                                Icon::new(if is_public {
-                                    IconName::Public
-                                } else {
-                                    IconName::Hash
-                                })
-                                .size(IconSize::Small)
-                                .color(Color::Muted),
-                            )
-                            .children(has_notes_notification.then(|| {
-                                div()
-                                    .w_1p5()
-                                    .absolute()
-                                    .right(px(-1.))
-                                    .top(px(-1.))
-                                    .child(Indicator::dot().color(Color::Info))
-                            })),
-                    )
-                    .child(
-                        h_flex()
-                            .id(channel_id.0 as usize)
-                            .child(match string_match {
-                                None => Label::new(channel.name.clone()).into_any_element(),
-                                Some(string_match) => HighlightedLabel::new(
-                                    channel.name.clone(),
-                                    string_match.positions.clone(),
-                                )
-                                .into_any_element(),
-                            })
-                            .children(face_pile.map(|face_pile| face_pile.p_1())),
-                    ),
-            )
-            .child(
-                h_flex().absolute().right(rems(0.)).h_full().child(
-                    h_flex()
-                        .h_full()
-                        .bg(cx.theme().colors().background)
-                        .rounded_l_sm()
-                        .gap_1()
-                        .px_1()
-                        .child(
-                            IconButton::new("channel_notes", IconName::Reader)
-                                .style(ButtonStyle::Filled)
-                                .shape(ui::IconButtonShape::Square)
-                                .icon_size(IconSize::Small)
-                                .icon_color(if has_notes_notification {
-                                    Color::Default
-                                } else {
-                                    Color::Muted
-                                })
-                                .on_click(cx.listener(move |this, _, window, cx| {
-                                    this.open_channel_notes(channel_id, window, cx)
-                                }))
-                                .tooltip(Tooltip::text("Open channel notes")),
-                        )
-                        .visible_on_hover(""),
-                ),
-            )
-            .tooltip({
-                let channel_store = self.channel_store.clone();
-                move |_window, cx| {
-                    cx.new(|_| JoinChannelTooltip {
-                        channel_store: channel_store.clone(),
-                        channel_id,
-                        has_notes_notification,
-                    })
-                    .into()
-                }
-            })
-    }
-
-    fn render_channel_editor(
-        &self,
-        depth: usize,
-        _window: &mut Window,
-        _cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let item = ListItem::new("channel-editor")
-            .inset(false)
-            // Add one level of depth for the disclosure arrow.
-            .indent_level(depth + 1)
-            .indent_step_size(px(20.))
-            .start_slot(
-                Icon::new(IconName::Hash)
-                    .size(IconSize::Small)
-                    .color(Color::Muted),
-            );
-
-        if let Some(pending_name) = self
-            .channel_editing_state
-            .as_ref()
-            .and_then(|state| state.pending_name())
-        {
-            item.child(Label::new(pending_name))
-        } else {
-            item.child(self.channel_name_editor.clone())
-        }
-    }
-}
-
-fn render_tree_branch(
-    is_last: bool,
-    overdraw: bool,
-    window: &mut Window,
-    cx: &mut App,
-) -> impl IntoElement {
-    let rem_size = window.rem_size();
-    let line_height = window.text_style().line_height_in_pixels(rem_size);
-    let width = rem_size * 1.5;
-    let thickness = px(1.);
-    let color = cx.theme().colors().text;
-
-    canvas(
-        |_, _, _| {},
-        move |bounds, _, window, _| {
-            let start_x = (bounds.left() + bounds.right() - thickness) / 2.;
-            let start_y = (bounds.top() + bounds.bottom() - thickness) / 2.;
-            let right = bounds.right();
-            let top = bounds.top();
-
-            window.paint_quad(fill(
-                Bounds::from_corners(
-                    point(start_x, top),
-                    point(
-                        start_x + thickness,
-                        if is_last {
-                            start_y
-                        } else {
-                            bounds.bottom() + if overdraw { px(1.) } else { px(0.) }
-                        },
-                    ),
-                ),
-                color,
-            ));
-            window.paint_quad(fill(
-                Bounds::from_corners(point(start_x, start_y), point(right, start_y + thickness)),
-                color,
-            ));
-        },
-    )
-    .w(width)
-    .h(line_height)
-}
-
-fn render_participant_name_and_handle(user: &User) -> impl IntoElement {
-    Label::new(if let Some(ref display_name) = user.name {
-        format!("{display_name} ({})", user.github_login)
-    } else {
-        user.github_login.to_string()
-    })
-}
-
-impl Render for CollabPanel {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .key_context(self.dispatch_context(window, cx))
-            .on_action(cx.listener(CollabPanel::cancel))
-            .on_action(cx.listener(CollabPanel::select_next))
-            .on_action(cx.listener(CollabPanel::select_previous))
-            .on_action(cx.listener(CollabPanel::confirm))
-            .on_action(cx.listener(CollabPanel::insert_space))
-            .on_action(cx.listener(CollabPanel::remove_selected_channel))
-            .on_action(cx.listener(CollabPanel::show_inline_context_menu))
-            .on_action(cx.listener(CollabPanel::rename_selected_channel))
-            .on_action(cx.listener(CollabPanel::open_selected_channel_notes))
-            .on_action(cx.listener(CollabPanel::collapse_selected_channel))
-            .on_action(cx.listener(CollabPanel::expand_selected_channel))
-            .on_action(cx.listener(CollabPanel::start_move_selected_channel))
-            .on_action(cx.listener(CollabPanel::move_channel_up))
-            .on_action(cx.listener(CollabPanel::move_channel_down))
-            .track_focus(&self.focus_handle)
-            .size_full()
-            .child(if !self.client.status().borrow().is_or_was_connected() {
-                self.render_signed_out(cx)
-            } else {
-                self.render_signed_in(window, cx)
-            })
-            .children(self.context_menu.as_ref().map(|(menu, position, _)| {
-                deferred(
-                    anchored()
-                        .position(*position)
-                        .anchor(gpui::Corner::TopLeft)
-                        .child(menu.clone()),
-                )
-                .with_priority(1)
-            }))
-    }
-}
-
-impl EventEmitter<PanelEvent> for CollabPanel {}
-
-impl Panel for CollabPanel {
-    fn position(&self, _window: &Window, cx: &App) -> DockPosition {
-        CollaborationPanelSettings::get_global(cx).dock
-    }
-
-    fn position_is_valid(&self, position: DockPosition) -> bool {
-        matches!(position, DockPosition::Left | DockPosition::Right)
-    }
-
-    fn set_position(
-        &mut self,
-        position: DockPosition,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        settings::update_settings_file(self.fs.clone(), cx, move |settings, _| {
-            settings.collaboration_panel.get_or_insert_default().dock = Some(position.into())
-        });
-    }
-
-    fn size(&self, _window: &Window, cx: &App) -> Pixels {
-        self.width
-            .unwrap_or_else(|| CollaborationPanelSettings::get_global(cx).default_width)
-    }
-
-    fn set_size(&mut self, size: Option<Pixels>, window: &mut Window, cx: &mut Context<Self>) {
-        self.width = size;
-        cx.notify();
-        cx.defer_in(window, |this, _, cx| {
-            this.serialize(cx);
-        });
-    }
-
-    fn icon(&self, _window: &Window, cx: &App) -> Option<ui::IconName> {
-        CollaborationPanelSettings::get_global(cx)
-            .button
-            .then_some(ui::IconName::UserGroup)
-    }
-
-    fn icon_tooltip(&self, _window: &Window, _cx: &App) -> Option<&'static str> {
-        Some("Collab Panel")
-    }
-
-    fn toggle_action(&self) -> Box<dyn gpui::Action> {
-        Box::new(ToggleFocus)
-    }
-
-    fn persistent_name() -> &'static str {
-        "CollabPanel"
-    }
-
-    fn panel_key() -> &'static str {
-        COLLABORATION_PANEL_KEY
-    }
-
-    fn activation_priority(&self) -> u32 {
-        6
-    }
-}
-
-impl Focusable for CollabPanel {
-    fn focus_handle(&self, cx: &App) -> gpui::FocusHandle {
-        self.filter_editor.focus_handle(cx)
-    }
-}
-
-impl PartialEq for ListEntry {
-    fn eq(&self, other: &Self) -> bool {
-        match self {
-            ListEntry::Header(section_1) => {
-                if let ListEntry::Header(section_2) = other {
-                    return section_1 == section_2;
-                }
-            }
-            ListEntry::CallParticipant { user: user_1, .. } => {
-                if let ListEntry::CallParticipant { user: user_2, .. } = other {
-                    return user_1.id == user_2.id;
-                }
-            }
-            ListEntry::ParticipantProject {
-                project_id: project_id_1,
-                ..
-            } => {
-                if let ListEntry::ParticipantProject {
-                    project_id: project_id_2,
-                    ..
-                } = other
-                {
-                    return project_id_1 == project_id_2;
-                }
-            }
-            ListEntry::ParticipantScreen {
-                peer_id: peer_id_1, ..
-            } => {
-                if let ListEntry::ParticipantScreen {
-                    peer_id: peer_id_2, ..
-                } = other
-                {
-                    return peer_id_1 == peer_id_2;
-                }
-            }
-            ListEntry::Channel {
-                channel: channel_1, ..
-            } => {
-                if let ListEntry::Channel {
-                    channel: channel_2, ..
-                } = other
-                {
-                    return channel_1.id == channel_2.id;
-                }
-            }
-            ListEntry::ChannelNotes { channel_id } => {
-                if let ListEntry::ChannelNotes {
-                    channel_id: other_id,
-                } = other
-                {
-                    return channel_id == other_id;
-                }
-            }
-            ListEntry::ChannelInvite(channel_1) => {
-                if let ListEntry::ChannelInvite(channel_2) = other {
-                    return channel_1.id == channel_2.id;
-                }
-            }
-            ListEntry::IncomingRequest(user_1) => {
-                if let ListEntry::IncomingRequest(user_2) = other {
-                    return user_1.id == user_2.id;
-                }
-            }
-            ListEntry::OutgoingRequest(user_1) => {
-                if let ListEntry::OutgoingRequest(user_2) = other {
-                    return user_1.id == user_2.id;
-                }
-            }
-            ListEntry::Contact {
-                contact: contact_1, ..
-            } => {
-                if let ListEntry::Contact {
-                    contact: contact_2, ..
-                } = other
-                {
-                    return contact_1.user.id == contact_2.user.id;
-                }
-            }
-            ListEntry::ChannelEditor { depth } => {
-                if let ListEntry::ChannelEditor { depth: other_depth } = other {
-                    return depth == other_depth;
-                }
-            }
-            ListEntry::ContactPlaceholder => {
-                if let ListEntry::ContactPlaceholder = other {
-                    return true;
-                }
-            }
-        }
-        false
-    }
-}
-
-struct DraggedChannelView {
-    channel: Channel,
-    width: Pixels,
-}
-
-impl Render for DraggedChannelView {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let ui_font = ThemeSettings::get_global(cx).ui_font.family.clone();
-        h_flex()
-            .font_family(ui_font)
-            .bg(cx.theme().colors().background)
-            .w(self.width)
-            .p_1()
-            .gap_1()
-            .child(
-                Icon::new(
-                    if self.channel.visibility == proto::ChannelVisibility::Public {
-                        IconName::Public
-                    } else {
-                        IconName::Hash
-                    },
-                )
-                .size(IconSize::Small)
-                .color(Color::Muted),
-            )
-            .child(Label::new(self.channel.name.clone()))
-    }
-}
-
-struct JoinChannelTooltip {
-    channel_store: Entity<ChannelStore>,
-    channel_id: ChannelId,
-    #[allow(unused)]
-    has_notes_notification: bool,
-}
-
-impl Render for JoinChannelTooltip {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        tooltip_container(cx, |container, cx| {
-            let participants = self
-                .channel_store
-                .read(cx)
-                .channel_participants(self.channel_id);
-
-            container
-                .child(Label::new("Join channel"))
-                .children(participants.iter().map(|participant| {
-                    h_flex()
-                        .gap_2()
-                        .child(Avatar::new(participant.avatar_uri.clone()))
-                        .child(render_participant_name_and_handle(participant))
-                }))
-        })
-    }
-}
diff --git a/crates/collab_ui/src/collab_panel/channel_modal.rs b/crates/collab_ui/src/collab_panel/channel_modal.rs
deleted file mode 100644
index 9d882562ca..0000000000
--- a/crates/collab_ui/src/collab_panel/channel_modal.rs
+++ /dev/null
@@ -1,657 +0,0 @@
-use channel::{ChannelMembership, ChannelStore};
-use client::{
-    ChannelId, User, UserId, UserStore,
-    proto::{self, ChannelRole, ChannelVisibility},
-};
-use fuzzy::{StringMatchCandidate, match_strings};
-use gpui::{
-    App, ClipboardItem, Context, DismissEvent, Entity, EventEmitter, Focusable, ParentElement,
-    Render, Styled, Subscription, Task, WeakEntity, Window, actions, anchored, deferred, div,
-};
-use picker::{Picker, PickerDelegate};
-use std::sync::Arc;
-use ui::{Avatar, Checkbox, ContextMenu, ListItem, ListItemSpacing, prelude::*};
-use util::TryFutureExt;
-use workspace::{ModalView, notifications::DetachAndPromptErr};
-
-actions!(
-    channel_modal,
-    [
-        /// Selects the next control in the channel modal.
-        SelectNextControl,
-        /// Toggles between invite members and manage members mode.
-        ToggleMode,
-        /// Toggles admin status for the selected member.
-        ToggleMemberAdmin,
-        /// Removes the selected member from the channel.
-        RemoveMember
-    ]
-);
-
-pub struct ChannelModal {
-    picker: Entity<Picker<ChannelModalDelegate>>,
-    channel_store: Entity<ChannelStore>,
-    channel_id: ChannelId,
-}
-
-impl ChannelModal {
-    pub fn new(
-        user_store: Entity<UserStore>,
-        channel_store: Entity<ChannelStore>,
-        channel_id: ChannelId,
-        mode: Mode,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        cx.observe(&channel_store, |_, _, cx| cx.notify()).detach();
-        let channel_modal = cx.entity().downgrade();
-        let picker = cx.new(|cx| {
-            Picker::uniform_list(
-                ChannelModalDelegate {
-                    channel_modal,
-                    matching_users: Vec::new(),
-                    matching_member_indices: Vec::new(),
-                    selected_index: 0,
-                    user_store: user_store.clone(),
-                    channel_store: channel_store.clone(),
-                    channel_id,
-                    match_candidates: Vec::new(),
-                    context_menu: None,
-                    members: Vec::new(),
-                    has_all_members: false,
-                    mode,
-                },
-                window,
-                cx,
-            )
-            .modal(false)
-        });
-
-        Self {
-            picker,
-            channel_store,
-            channel_id,
-        }
-    }
-
-    fn toggle_mode(&mut self, _: &ToggleMode, window: &mut Window, cx: &mut Context<Self>) {
-        let mode = match self.picker.read(cx).delegate.mode {
-            Mode::ManageMembers => Mode::InviteMembers,
-            Mode::InviteMembers => Mode::ManageMembers,
-        };
-        self.set_mode(mode, window, cx);
-    }
-
-    fn set_mode(&mut self, mode: Mode, window: &mut Window, cx: &mut Context<Self>) {
-        self.picker.update(cx, |picker, cx| {
-            let delegate = &mut picker.delegate;
-            delegate.mode = mode;
-            delegate.selected_index = 0;
-            picker.set_query("", window, cx);
-            picker.update_matches(picker.query(cx), window, cx);
-            cx.notify()
-        });
-        cx.notify()
-    }
-
-    fn set_channel_visibility(
-        &mut self,
-        selection: &ToggleState,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.channel_store.update(cx, |channel_store, cx| {
-            channel_store
-                .set_channel_visibility(
-                    self.channel_id,
-                    match selection {
-                        ToggleState::Unselected => ChannelVisibility::Members,
-                        ToggleState::Selected => ChannelVisibility::Public,
-                        ToggleState::Indeterminate => return,
-                    },
-                    cx,
-                )
-                .detach_and_log_err(cx)
-        });
-    }
-
-    fn dismiss(&mut self, _: &menu::Cancel, _: &mut Window, cx: &mut Context<Self>) {
-        cx.emit(DismissEvent);
-    }
-}
-
-impl EventEmitter<DismissEvent> for ChannelModal {}
-impl ModalView for ChannelModal {}
-
-impl Focusable for ChannelModal {
-    fn focus_handle(&self, cx: &App) -> gpui::FocusHandle {
-        self.picker.focus_handle(cx)
-    }
-}
-
-impl Render for ChannelModal {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let channel_store = self.channel_store.read(cx);
-        let Some(channel) = channel_store.channel_for_id(self.channel_id) else {
-            return div();
-        };
-        let channel_name = channel.name.clone();
-        let channel_id = channel.id;
-        let visibility = channel.visibility;
-        let mode = self.picker.read(cx).delegate.mode;
-
-        v_flex()
-            .key_context("ChannelModal")
-            .on_action(cx.listener(Self::toggle_mode))
-            .on_action(cx.listener(Self::dismiss))
-            .elevation_3(cx)
-            .w(rems(34.))
-            .child(
-                v_flex()
-                    .px_2()
-                    .py_1()
-                    .gap_2()
-                    .child(
-                        h_flex()
-                            .w_px()
-                            .flex_1()
-                            .gap_1()
-                            .child(Icon::new(IconName::Hash).size(IconSize::Medium))
-                            .child(Label::new(channel_name)),
-                    )
-                    .child(
-                        h_flex()
-                            .w_full()
-                            .h(rems_from_px(22.))
-                            .justify_between()
-                            .line_height(rems(1.25))
-                            .child(
-                                Checkbox::new(
-                                    "is-public",
-                                    if visibility == ChannelVisibility::Public {
-                                        ui::ToggleState::Selected
-                                    } else {
-                                        ui::ToggleState::Unselected
-                                    },
-                                )
-                                .label("Public")
-                                .on_click(cx.listener(Self::set_channel_visibility)),
-                            )
-                            .children(
-                                Some(
-                                    Button::new("copy-link", "Copy Link")
-                                        .label_size(LabelSize::Small)
-                                        .on_click(cx.listener(move |this, _, _, cx| {
-                                            if let Some(channel) = this
-                                                .channel_store
-                                                .read(cx)
-                                                .channel_for_id(channel_id)
-                                            {
-                                                let item =
-                                                    ClipboardItem::new_string(channel.link(cx));
-                                                cx.write_to_clipboard(item);
-                                            }
-                                        })),
-                                )
-                                .filter(|_| visibility == ChannelVisibility::Public),
-                            ),
-                    )
-                    .child(
-                        h_flex()
-                            .child(
-                                div()
-                                    .id("manage-members")
-                                    .px_2()
-                                    .py_1()
-                                    .cursor_pointer()
-                                    .border_b_2()
-                                    .when(mode == Mode::ManageMembers, |this| {
-                                        this.border_color(cx.theme().colors().border)
-                                    })
-                                    .child(Label::new("Manage Members"))
-                                    .on_click(cx.listener(|this, _, window, cx| {
-                                        this.set_mode(Mode::ManageMembers, window, cx);
-                                    })),
-                            )
-                            .child(
-                                div()
-                                    .id("invite-members")
-                                    .px_2()
-                                    .py_1()
-                                    .cursor_pointer()
-                                    .border_b_2()
-                                    .when(mode == Mode::InviteMembers, |this| {
-                                        this.border_color(cx.theme().colors().border)
-                                    })
-                                    .child(Label::new("Invite Members"))
-                                    .on_click(cx.listener(|this, _, window, cx| {
-                                        this.set_mode(Mode::InviteMembers, window, cx);
-                                    })),
-                            ),
-                    ),
-            )
-            .child(self.picker.clone())
-    }
-}
-
-#[derive(Copy, Clone, PartialEq)]
-pub enum Mode {
-    ManageMembers,
-    InviteMembers,
-}
-
-pub struct ChannelModalDelegate {
-    channel_modal: WeakEntity<ChannelModal>,
-    matching_users: Vec<Arc<User>>,
-    matching_member_indices: Vec<usize>,
-    user_store: Entity<UserStore>,
-    channel_store: Entity<ChannelStore>,
-    channel_id: ChannelId,
-    selected_index: usize,
-    mode: Mode,
-    match_candidates: Vec<StringMatchCandidate>,
-    members: Vec<ChannelMembership>,
-    has_all_members: bool,
-    context_menu: Option<(Entity<ContextMenu>, Subscription)>,
-}
-
-impl PickerDelegate for ChannelModalDelegate {
-    type ListItem = ListItem;
-
-    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
-        "Search collaborator by username...".into()
-    }
-
-    fn match_count(&self) -> usize {
-        match self.mode {
-            Mode::ManageMembers => self.matching_member_indices.len(),
-            Mode::InviteMembers => self.matching_users.len(),
-        }
-    }
-
-    fn selected_index(&self) -> usize {
-        self.selected_index
-    }
-
-    fn set_selected_index(
-        &mut self,
-        ix: usize,
-        _window: &mut Window,
-        _: &mut Context<Picker<Self>>,
-    ) {
-        self.selected_index = ix;
-    }
-
-    fn update_matches(
-        &mut self,
-        query: String,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Task<()> {
-        match self.mode {
-            Mode::ManageMembers => {
-                if self.has_all_members {
-                    self.match_candidates.clear();
-                    self.match_candidates
-                        .extend(self.members.iter().enumerate().map(|(id, member)| {
-                            StringMatchCandidate::new(id, &member.user.github_login)
-                        }));
-
-                    let matches = cx.background_executor().block(match_strings(
-                        &self.match_candidates,
-                        &query,
-                        true,
-                        true,
-                        usize::MAX,
-                        &Default::default(),
-                        cx.background_executor().clone(),
-                    ));
-
-                    cx.spawn_in(window, async move |picker, cx| {
-                        picker
-                            .update(cx, |picker, cx| {
-                                let delegate = &mut picker.delegate;
-                                delegate.matching_member_indices.clear();
-                                delegate
-                                    .matching_member_indices
-                                    .extend(matches.into_iter().map(|m| m.candidate_id));
-                                cx.notify();
-                            })
-                            .ok();
-                    })
-                } else {
-                    let search_members = self.channel_store.update(cx, |store, cx| {
-                        store.fuzzy_search_members(self.channel_id, query.clone(), 100, cx)
-                    });
-                    cx.spawn_in(window, async move |picker, cx| {
-                        async {
-                            let members = search_members.await?;
-                            picker.update(cx, |picker, cx| {
-                                picker.delegate.has_all_members =
-                                    query.is_empty() && members.len() < 100;
-                                picker.delegate.matching_member_indices =
-                                    (0..members.len()).collect();
-                                picker.delegate.members = members;
-                                cx.notify();
-                            })?;
-                            anyhow::Ok(())
-                        }
-                        .log_err()
-                        .await;
-                    })
-                }
-            }
-            Mode::InviteMembers => {
-                let search_users = self
-                    .user_store
-                    .update(cx, |store, cx| store.fuzzy_search_users(query, cx));
-                cx.spawn_in(window, async move |picker, cx| {
-                    async {
-                        let users = search_users.await?;
-                        picker.update(cx, |picker, cx| {
-                            picker.delegate.matching_users = users;
-                            cx.notify();
-                        })?;
-                        anyhow::Ok(())
-                    }
-                    .log_err()
-                    .await;
-                })
-            }
-        }
-    }
-
-    fn confirm(&mut self, _: bool, window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        if let Some(selected_user) = self.user_at_index(self.selected_index) {
-            if Some(selected_user.id) == self.user_store.read(cx).current_user().map(|user| user.id)
-            {
-                return;
-            }
-            match self.mode {
-                Mode::ManageMembers => self.show_context_menu(self.selected_index, window, cx),
-                Mode::InviteMembers => match self.member_status(selected_user.id, cx) {
-                    Some(proto::channel_member::Kind::Invitee) => {
-                        self.remove_member(selected_user.id, window, cx);
-                    }
-                    Some(proto::channel_member::Kind::Member) => {}
-                    None => self.invite_member(selected_user, window, cx),
-                },
-            }
-        }
-    }
-
-    fn dismissed(&mut self, _: &mut Window, cx: &mut Context<Picker<Self>>) {
-        if self.context_menu.is_none() {
-            self.channel_modal
-                .update(cx, |_, cx| {
-                    cx.emit(DismissEvent);
-                })
-                .ok();
-        }
-    }
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        _: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<Self::ListItem> {
-        let user = self.user_at_index(ix)?;
-        let membership = self.member_at_index(ix);
-        let request_status = self.member_status(user.id, cx);
-        let is_me = self.user_store.read(cx).current_user().map(|user| user.id) == Some(user.id);
-
-        Some(
-            ListItem::new(ix)
-                .inset(true)
-                .spacing(ListItemSpacing::Sparse)
-                .toggle_state(selected)
-                .start_slot(Avatar::new(user.avatar_uri.clone()))
-                .child(Label::new(user.github_login.clone()))
-                .end_slot(h_flex().gap_2().map(|slot| {
-                    match self.mode {
-                        Mode::ManageMembers => slot
-                            .children(
-                                if request_status == Some(proto::channel_member::Kind::Invitee) {
-                                    Some(Label::new("Invited"))
-                                } else {
-                                    None
-                                },
-                            )
-                            .children(match membership.map(|m| m.role) {
-                                Some(ChannelRole::Admin) => Some(Label::new("Admin")),
-                                Some(ChannelRole::Guest) => Some(Label::new("Guest")),
-                                _ => None,
-                            })
-                            .when(!is_me, |el| {
-                                el.child(IconButton::new("ellipsis", IconName::Ellipsis))
-                            })
-                            .when(is_me, |el| el.child(Label::new("You").color(Color::Muted)))
-                            .children(
-                                if let (Some((menu, _)), true) = (&self.context_menu, selected) {
-                                    Some(
-                                        deferred(
-                                            anchored()
-                                                .anchor(gpui::Corner::TopRight)
-                                                .child(menu.clone()),
-                                        )
-                                        .with_priority(1),
-                                    )
-                                } else {
-                                    None
-                                },
-                            ),
-                        Mode::InviteMembers => match request_status {
-                            Some(proto::channel_member::Kind::Invitee) => {
-                                slot.children(Some(Label::new("Invited")))
-                            }
-                            Some(proto::channel_member::Kind::Member) => {
-                                slot.children(Some(Label::new("Member")))
-                            }
-                            _ => slot,
-                        },
-                    }
-                })),
-        )
-    }
-}
-
-impl ChannelModalDelegate {
-    fn member_status(&self, user_id: UserId, cx: &App) -> Option<proto::channel_member::Kind> {
-        self.members
-            .iter()
-            .find_map(|membership| (membership.user.id == user_id).then_some(membership.kind))
-            .or_else(|| {
-                self.channel_store
-                    .read(cx)
-                    .has_pending_channel_invite(self.channel_id, user_id)
-                    .then_some(proto::channel_member::Kind::Invitee)
-            })
-    }
-
-    fn member_at_index(&self, ix: usize) -> Option<&ChannelMembership> {
-        self.matching_member_indices
-            .get(ix)
-            .and_then(|ix| self.members.get(*ix))
-    }
-
-    fn user_at_index(&self, ix: usize) -> Option<Arc<User>> {
-        match self.mode {
-            Mode::ManageMembers => self.matching_member_indices.get(ix).and_then(|ix| {
-                let channel_membership = self.members.get(*ix)?;
-                Some(channel_membership.user.clone())
-            }),
-            Mode::InviteMembers => self.matching_users.get(ix).cloned(),
-        }
-    }
-
-    fn set_user_role(
-        &mut self,
-        user_id: UserId,
-        new_role: ChannelRole,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<()> {
-        let update = self.channel_store.update(cx, |store, cx| {
-            store.set_member_role(self.channel_id, user_id, new_role, cx)
-        });
-        cx.spawn_in(window, async move |picker, cx| {
-            update.await?;
-            picker.update_in(cx, |picker, window, cx| {
-                let this = &mut picker.delegate;
-                if let Some(member) = this.members.iter_mut().find(|m| m.user.id == user_id) {
-                    member.role = new_role;
-                }
-                cx.focus_self(window);
-                cx.notify();
-            })
-        })
-        .detach_and_prompt_err("Failed to update role", window, cx, |_, _, _| None);
-        Some(())
-    }
-
-    fn remove_member(
-        &mut self,
-        user_id: UserId,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<()> {
-        let update = self.channel_store.update(cx, |store, cx| {
-            store.remove_member(self.channel_id, user_id, cx)
-        });
-        cx.spawn_in(window, async move |picker, cx| {
-            update.await?;
-            picker.update_in(cx, |picker, window, cx| {
-                let this = &mut picker.delegate;
-                if let Some(ix) = this.members.iter_mut().position(|m| m.user.id == user_id) {
-                    this.members.remove(ix);
-                    this.matching_member_indices.retain_mut(|member_ix| {
-                        if *member_ix == ix {
-                            return false;
-                        } else if *member_ix > ix {
-                            *member_ix -= 1;
-                        }
-                        true
-                    })
-                }
-
-                this.selected_index = this
-                    .selected_index
-                    .min(this.matching_member_indices.len().saturating_sub(1));
-
-                picker.focus(window, cx);
-                cx.notify();
-            })
-        })
-        .detach_and_prompt_err("Failed to remove member", window, cx, |_, _, _| None);
-        Some(())
-    }
-
-    fn invite_member(
-        &mut self,
-        user: Arc<User>,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) {
-        let invite_member = self.channel_store.update(cx, |store, cx| {
-            store.invite_member(self.channel_id, user.id, ChannelRole::Member, cx)
-        });
-
-        cx.spawn_in(window, async move |this, cx| {
-            invite_member.await?;
-
-            this.update(cx, |this, cx| {
-                let new_member = ChannelMembership {
-                    user,
-                    kind: proto::channel_member::Kind::Invitee,
-                    role: ChannelRole::Member,
-                };
-                let members = &mut this.delegate.members;
-                match members.binary_search_by_key(&new_member.sort_key(), |k| k.sort_key()) {
-                    Ok(ix) | Err(ix) => members.insert(ix, new_member),
-                }
-
-                cx.notify();
-            })
-        })
-        .detach_and_prompt_err("Failed to invite member", window, cx, |_, _, _| None);
-    }
-
-    fn show_context_menu(
-        &mut self,
-        ix: usize,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) {
-        let Some(membership) = self.member_at_index(ix) else {
-            return;
-        };
-        let user_id = membership.user.id;
-        let picker = cx.entity();
-        let context_menu = ContextMenu::build(window, cx, |mut menu, _window, _cx| {
-            let role = membership.role;
-
-            if role == ChannelRole::Admin || role == ChannelRole::Member {
-                let picker = picker.clone();
-                menu = menu.entry("Demote to Guest", None, move |window, cx| {
-                    picker.update(cx, |picker, cx| {
-                        picker
-                            .delegate
-                            .set_user_role(user_id, ChannelRole::Guest, window, cx);
-                    })
-                });
-            }
-
-            if role == ChannelRole::Admin || role == ChannelRole::Guest {
-                let picker = picker.clone();
-                let label = if role == ChannelRole::Guest {
-                    "Promote to Member"
-                } else {
-                    "Demote to Member"
-                };
-
-                menu = menu.entry(label, None, move |window, cx| {
-                    picker.update(cx, |picker, cx| {
-                        picker
-                            .delegate
-                            .set_user_role(user_id, ChannelRole::Member, window, cx);
-                    })
-                });
-            }
-
-            if role == ChannelRole::Member || role == ChannelRole::Guest {
-                let picker = picker.clone();
-                menu = menu.entry("Promote to Admin", None, move |window, cx| {
-                    picker.update(cx, |picker, cx| {
-                        picker
-                            .delegate
-                            .set_user_role(user_id, ChannelRole::Admin, window, cx);
-                    })
-                });
-            };
-
-            menu = menu.separator();
-            menu = menu.entry("Remove from Channel", None, {
-                let picker = picker.clone();
-                move |window, cx| {
-                    picker.update(cx, |picker, cx| {
-                        picker.delegate.remove_member(user_id, window, cx);
-                    })
-                }
-            });
-            menu
-        });
-        window.focus(&context_menu.focus_handle(cx));
-        let subscription = cx.subscribe_in(
-            &context_menu,
-            window,
-            |picker, _, _: &DismissEvent, window, cx| {
-                picker.delegate.context_menu = None;
-                picker.focus(window, cx);
-                cx.notify();
-            },
-        );
-        self.context_menu = Some((context_menu, subscription));
-    }
-}
diff --git a/crates/collab_ui/src/collab_panel/contact_finder.rs b/crates/collab_ui/src/collab_panel/contact_finder.rs
deleted file mode 100644
index e5823d0e78..0000000000
--- a/crates/collab_ui/src/collab_panel/contact_finder.rs
+++ /dev/null
@@ -1,171 +0,0 @@
-use client::{ContactRequestStatus, User, UserStore};
-use gpui::{
-    App, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, ParentElement as _,
-    Render, Styled, Task, WeakEntity, Window,
-};
-use picker::{Picker, PickerDelegate};
-use std::sync::Arc;
-use ui::{Avatar, ListItem, ListItemSpacing, prelude::*};
-use util::{ResultExt as _, TryFutureExt};
-use workspace::ModalView;
-
-pub struct ContactFinder {
-    picker: Entity<Picker<ContactFinderDelegate>>,
-}
-
-impl ContactFinder {
-    pub fn new(user_store: Entity<UserStore>, window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let delegate = ContactFinderDelegate {
-            parent: cx.entity().downgrade(),
-            user_store,
-            potential_contacts: Arc::from([]),
-            selected_index: 0,
-        };
-        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx).modal(false));
-
-        Self { picker }
-    }
-
-    pub fn set_query(&mut self, query: String, window: &mut Window, cx: &mut Context<Self>) {
-        self.picker.update(cx, |picker, cx| {
-            picker.set_query(query, window, cx);
-        });
-    }
-}
-
-impl Render for ContactFinder {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .elevation_3(cx)
-            .child(
-                v_flex()
-                    .px_2()
-                    .py_1()
-                    .bg(cx.theme().colors().element_background)
-                    // HACK: Prevent the background color from overflowing the parent container.
-                    .rounded_t(px(8.))
-                    .child(Label::new("Contacts"))
-                    .child(h_flex().child(Label::new("Invite new contacts"))),
-            )
-            .child(self.picker.clone())
-            .w(rems(34.))
-    }
-}
-
-pub struct ContactFinderDelegate {
-    parent: WeakEntity<ContactFinder>,
-    potential_contacts: Arc<[Arc<User>]>,
-    user_store: Entity<UserStore>,
-    selected_index: usize,
-}
-
-impl EventEmitter<DismissEvent> for ContactFinder {}
-impl ModalView for ContactFinder {}
-
-impl Focusable for ContactFinder {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        self.picker.focus_handle(cx)
-    }
-}
-
-impl PickerDelegate for ContactFinderDelegate {
-    type ListItem = ListItem;
-
-    fn match_count(&self) -> usize {
-        self.potential_contacts.len()
-    }
-
-    fn selected_index(&self) -> usize {
-        self.selected_index
-    }
-
-    fn set_selected_index(
-        &mut self,
-        ix: usize,
-        _window: &mut Window,
-        _: &mut Context<Picker<Self>>,
-    ) {
-        self.selected_index = ix;
-    }
-
-    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
-        "Search collaborator by username...".into()
-    }
-
-    fn update_matches(
-        &mut self,
-        query: String,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Task<()> {
-        let search_users = self
-            .user_store
-            .update(cx, |store, cx| store.fuzzy_search_users(query, cx));
-
-        cx.spawn_in(window, async move |picker, cx| {
-            async {
-                let potential_contacts = search_users.await?;
-                picker.update(cx, |picker, cx| {
-                    picker.delegate.potential_contacts = potential_contacts.into();
-                    cx.notify();
-                })?;
-                anyhow::Ok(())
-            }
-            .log_err()
-            .await;
-        })
-    }
-
-    fn confirm(&mut self, _: bool, _: &mut Window, cx: &mut Context<Picker<Self>>) {
-        if let Some(user) = self.potential_contacts.get(self.selected_index) {
-            let user_store = self.user_store.read(cx);
-            match user_store.contact_request_status(user) {
-                ContactRequestStatus::None | ContactRequestStatus::RequestReceived => {
-                    self.user_store
-                        .update(cx, |store, cx| store.request_contact(user.id, cx))
-                        .detach();
-                }
-                ContactRequestStatus::RequestSent => {
-                    self.user_store
-                        .update(cx, |store, cx| store.remove_contact(user.id, cx))
-                        .detach();
-                }
-                _ => {}
-            }
-        }
-    }
-
-    fn dismissed(&mut self, _: &mut Window, cx: &mut Context<Picker<Self>>) {
-        self.parent
-            .update(cx, |_, cx| cx.emit(DismissEvent))
-            .log_err();
-    }
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        _: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<Self::ListItem> {
-        let user = &self.potential_contacts.get(ix)?;
-        let request_status = self.user_store.read(cx).contact_request_status(user);
-
-        let icon_path = match request_status {
-            ContactRequestStatus::None | ContactRequestStatus::RequestReceived => {
-                Some("icons/check.svg")
-            }
-            ContactRequestStatus::RequestSent => Some("icons/x.svg"),
-            ContactRequestStatus::RequestAccepted => None,
-        };
-        Some(
-            ListItem::new(ix)
-                .inset(true)
-                .spacing(ListItemSpacing::Sparse)
-                .toggle_state(selected)
-                .start_slot(Avatar::new(user.avatar_uri.clone()))
-                .child(Label::new(user.github_login.clone()))
-                .end_slot::<Icon>(icon_path.map(Icon::from_path)),
-        )
-    }
-}
diff --git a/crates/collab_ui/src/collab_ui.rs b/crates/collab_ui/src/collab_ui.rs
deleted file mode 100644
index 6a4b2b93d7..0000000000
--- a/crates/collab_ui/src/collab_ui.rs
+++ /dev/null
@@ -1,61 +0,0 @@
-pub mod channel_view;
-pub mod collab_panel;
-pub mod notification_panel;
-pub mod notifications;
-mod panel_settings;
-
-use std::{rc::Rc, sync::Arc};
-
-pub use collab_panel::CollabPanel;
-use gpui::{
-    App, Pixels, PlatformDisplay, Size, WindowBackgroundAppearance, WindowBounds,
-    WindowDecorations, WindowKind, WindowOptions, point,
-};
-pub use panel_settings::{CollaborationPanelSettings, NotificationPanelSettings};
-use release_channel::ReleaseChannel;
-use ui::px;
-use workspace::AppState;
-
-pub fn init(app_state: &Arc<AppState>, cx: &mut App) {
-    channel_view::init(cx);
-    collab_panel::init(cx);
-    notification_panel::init(cx);
-    notifications::init(app_state, cx);
-    title_bar::init(cx);
-}
-
-fn notification_window_options(
-    screen: Rc<dyn PlatformDisplay>,
-    size: Size<Pixels>,
-    cx: &App,
-) -> WindowOptions {
-    let notification_margin_width = px(16.);
-    let notification_margin_height = px(-48.);
-
-    let bounds = gpui::Bounds::<Pixels> {
-        origin: screen.bounds().top_right()
-            - point(
-                size.width + notification_margin_width,
-                notification_margin_height,
-            ),
-        size,
-    };
-
-    let app_id = ReleaseChannel::global(cx).app_id();
-
-    WindowOptions {
-        window_bounds: Some(WindowBounds::Windowed(bounds)),
-        titlebar: None,
-        focus: false,
-        show: true,
-        kind: WindowKind::PopUp,
-        is_movable: false,
-        display_id: Some(screen.id()),
-        window_background: WindowBackgroundAppearance::Transparent,
-        app_id: Some(app_id.to_owned()),
-        window_min_size: None,
-        window_decorations: Some(WindowDecorations::Client),
-        tabbing_identifier: None,
-        ..Default::default()
-    }
-}
diff --git a/crates/collab_ui/src/notification_panel.rs b/crates/collab_ui/src/notification_panel.rs
deleted file mode 100644
index 99203bc867..0000000000
--- a/crates/collab_ui/src/notification_panel.rs
+++ /dev/null
@@ -1,772 +0,0 @@
-use crate::NotificationPanelSettings;
-use anyhow::Result;
-use channel::ChannelStore;
-use client::{ChannelId, Client, Notification, User, UserStore};
-use collections::HashMap;
-use db::kvp::KEY_VALUE_STORE;
-use futures::StreamExt;
-use gpui::{
-    AnyElement, App, AsyncWindowContext, ClickEvent, Context, DismissEvent, Element, Entity,
-    EventEmitter, FocusHandle, Focusable, InteractiveElement, IntoElement, ListAlignment,
-    ListScrollEvent, ListState, ParentElement, Render, StatefulInteractiveElement, Styled, Task,
-    WeakEntity, Window, actions, div, img, list, px,
-};
-use notifications::{NotificationEntry, NotificationEvent, NotificationStore};
-use project::Fs;
-use rpc::proto;
-use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsStore};
-use std::{sync::Arc, time::Duration};
-use time::{OffsetDateTime, UtcOffset};
-use ui::{
-    Avatar, Button, Icon, IconButton, IconName, Label, Tab, Tooltip, h_flex, prelude::*, v_flex,
-};
-use util::{ResultExt, TryFutureExt};
-use workspace::notifications::{
-    Notification as WorkspaceNotification, NotificationId, SuppressEvent,
-};
-use workspace::{
-    Workspace,
-    dock::{DockPosition, Panel, PanelEvent},
-};
-
-const LOADING_THRESHOLD: usize = 30;
-const MARK_AS_READ_DELAY: Duration = Duration::from_secs(1);
-const TOAST_DURATION: Duration = Duration::from_secs(5);
-const NOTIFICATION_PANEL_KEY: &str = "NotificationPanel";
-
-pub struct NotificationPanel {
-    client: Arc<Client>,
-    user_store: Entity<UserStore>,
-    channel_store: Entity<ChannelStore>,
-    notification_store: Entity<NotificationStore>,
-    fs: Arc<dyn Fs>,
-    width: Option<Pixels>,
-    active: bool,
-    notification_list: ListState,
-    pending_serialization: Task<Option<()>>,
-    subscriptions: Vec<gpui::Subscription>,
-    workspace: WeakEntity<Workspace>,
-    current_notification_toast: Option<(u64, Task<()>)>,
-    local_timezone: UtcOffset,
-    focus_handle: FocusHandle,
-    mark_as_read_tasks: HashMap<u64, Task<Result<()>>>,
-    unseen_notifications: Vec<NotificationEntry>,
-}
-
-#[derive(Serialize, Deserialize)]
-struct SerializedNotificationPanel {
-    width: Option<Pixels>,
-}
-
-#[derive(Debug)]
-pub enum Event {
-    DockPositionChanged,
-    Focus,
-    Dismissed,
-}
-
-pub struct NotificationPresenter {
-    pub actor: Option<Arc<client::User>>,
-    pub text: String,
-    pub icon: &'static str,
-    pub needs_response: bool,
-}
-
-actions!(
-    notification_panel,
-    [
-        /// Toggles focus on the notification panel.
-        ToggleFocus
-    ]
-);
-
-pub fn init(cx: &mut App) {
-    cx.observe_new(|workspace: &mut Workspace, _, _| {
-        workspace.register_action(|workspace, _: &ToggleFocus, window, cx| {
-            workspace.toggle_panel_focus::<NotificationPanel>(window, cx);
-        });
-    })
-    .detach();
-}
-
-impl NotificationPanel {
-    pub fn new(
-        workspace: &mut Workspace,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) -> Entity<Self> {
-        let fs = workspace.app_state().fs.clone();
-        let client = workspace.app_state().client.clone();
-        let user_store = workspace.app_state().user_store.clone();
-        let workspace_handle = workspace.weak_handle();
-
-        cx.new(|cx| {
-            let mut status = client.status();
-            cx.spawn_in(window, async move |this, cx| {
-                while (status.next().await).is_some() {
-                    if this
-                        .update(cx, |_: &mut Self, cx| {
-                            cx.notify();
-                        })
-                        .is_err()
-                    {
-                        break;
-                    }
-                }
-            })
-            .detach();
-
-            let notification_list = ListState::new(0, ListAlignment::Top, px(1000.));
-            notification_list.set_scroll_handler(cx.listener(
-                |this, event: &ListScrollEvent, _, cx| {
-                    if event.count.saturating_sub(event.visible_range.end) < LOADING_THRESHOLD
-                        && let Some(task) = this
-                            .notification_store
-                            .update(cx, |store, cx| store.load_more_notifications(false, cx))
-                    {
-                        task.detach();
-                    }
-                },
-            ));
-
-            let local_offset = chrono::Local::now().offset().local_minus_utc();
-            let mut this = Self {
-                fs,
-                client,
-                user_store,
-                local_timezone: UtcOffset::from_whole_seconds(local_offset).unwrap(),
-                channel_store: ChannelStore::global(cx),
-                notification_store: NotificationStore::global(cx),
-                notification_list,
-                pending_serialization: Task::ready(None),
-                workspace: workspace_handle,
-                focus_handle: cx.focus_handle(),
-                current_notification_toast: None,
-                subscriptions: Vec::new(),
-                active: false,
-                mark_as_read_tasks: HashMap::default(),
-                width: None,
-                unseen_notifications: Vec::new(),
-            };
-
-            let mut old_dock_position = this.position(window, cx);
-            this.subscriptions.extend([
-                cx.observe(&this.notification_store, |_, _, cx| cx.notify()),
-                cx.subscribe_in(
-                    &this.notification_store,
-                    window,
-                    Self::on_notification_event,
-                ),
-                cx.observe_global_in::<SettingsStore>(
-                    window,
-                    move |this: &mut Self, window, cx| {
-                        let new_dock_position = this.position(window, cx);
-                        if new_dock_position != old_dock_position {
-                            old_dock_position = new_dock_position;
-                            cx.emit(Event::DockPositionChanged);
-                        }
-                        cx.notify();
-                    },
-                ),
-            ]);
-            this
-        })
-    }
-
-    pub fn load(
-        workspace: WeakEntity<Workspace>,
-        cx: AsyncWindowContext,
-    ) -> Task<Result<Entity<Self>>> {
-        cx.spawn(async move |cx| {
-            let serialized_panel = if let Some(panel) = cx
-                .background_spawn(async move { KEY_VALUE_STORE.read_kvp(NOTIFICATION_PANEL_KEY) })
-                .await
-                .log_err()
-                .flatten()
-            {
-                Some(serde_json::from_str::<SerializedNotificationPanel>(&panel)?)
-            } else {
-                None
-            };
-
-            workspace.update_in(cx, |workspace, window, cx| {
-                let panel = Self::new(workspace, window, cx);
-                if let Some(serialized_panel) = serialized_panel {
-                    panel.update(cx, |panel, cx| {
-                        panel.width = serialized_panel.width.map(|w| w.round());
-                        cx.notify();
-                    });
-                }
-                panel
-            })
-        })
-    }
-
-    fn serialize(&mut self, cx: &mut Context<Self>) {
-        let width = self.width;
-        self.pending_serialization = cx.background_spawn(
-            async move {
-                KEY_VALUE_STORE
-                    .write_kvp(
-                        NOTIFICATION_PANEL_KEY.into(),
-                        serde_json::to_string(&SerializedNotificationPanel { width })?,
-                    )
-                    .await?;
-                anyhow::Ok(())
-            }
-            .log_err(),
-        );
-    }
-
-    fn render_notification(
-        &mut self,
-        ix: usize,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<AnyElement> {
-        let entry = self.notification_store.read(cx).notification_at(ix)?;
-        let notification_id = entry.id;
-        let now = OffsetDateTime::now_utc();
-        let timestamp = entry.timestamp;
-        let NotificationPresenter {
-            actor,
-            text,
-            needs_response,
-            ..
-        } = self.present_notification(entry, cx)?;
-
-        let response = entry.response;
-        let notification = entry.notification.clone();
-
-        if self.active && !entry.is_read {
-            self.did_render_notification(notification_id, &notification, window, cx);
-        }
-
-        let relative_timestamp = time_format::format_localized_timestamp(
-            timestamp,
-            now,
-            self.local_timezone,
-            time_format::TimestampFormat::Relative,
-        );
-
-        let absolute_timestamp = time_format::format_localized_timestamp(
-            timestamp,
-            now,
-            self.local_timezone,
-            time_format::TimestampFormat::Absolute,
-        );
-
-        Some(
-            div()
-                .id(ix)
-                .flex()
-                .flex_row()
-                .size_full()
-                .px_2()
-                .py_1()
-                .gap_2()
-                .hover(|style| style.bg(cx.theme().colors().element_hover))
-                .children(actor.map(|actor| {
-                    img(actor.avatar_uri.clone())
-                        .flex_none()
-                        .w_8()
-                        .h_8()
-                        .rounded_full()
-                }))
-                .child(
-                    v_flex()
-                        .gap_1()
-                        .size_full()
-                        .overflow_hidden()
-                        .child(Label::new(text))
-                        .child(
-                            h_flex()
-                                .child(
-                                    div()
-                                        .id("notification_timestamp")
-                                        .hover(|style| {
-                                            style
-                                                .bg(cx.theme().colors().element_selected)
-                                                .rounded_sm()
-                                        })
-                                        .child(Label::new(relative_timestamp).color(Color::Muted))
-                                        .tooltip(move |_, cx| {
-                                            Tooltip::simple(absolute_timestamp.clone(), cx)
-                                        }),
-                                )
-                                .children(if let Some(is_accepted) = response {
-                                    Some(div().flex().flex_grow().justify_end().child(Label::new(
-                                        if is_accepted {
-                                            "You accepted"
-                                        } else {
-                                            "You declined"
-                                        },
-                                    )))
-                                } else if needs_response {
-                                    Some(
-                                        h_flex()
-                                            .flex_grow()
-                                            .justify_end()
-                                            .child(Button::new("decline", "Decline").on_click({
-                                                let notification = notification.clone();
-                                                let entity = cx.entity();
-                                                move |_, _, cx| {
-                                                    entity.update(cx, |this, cx| {
-                                                        this.respond_to_notification(
-                                                            notification.clone(),
-                                                            false,
-                                                            cx,
-                                                        )
-                                                    });
-                                                }
-                                            }))
-                                            .child(Button::new("accept", "Accept").on_click({
-                                                let notification = notification.clone();
-                                                let entity = cx.entity();
-                                                move |_, _, cx| {
-                                                    entity.update(cx, |this, cx| {
-                                                        this.respond_to_notification(
-                                                            notification.clone(),
-                                                            true,
-                                                            cx,
-                                                        )
-                                                    });
-                                                }
-                                            })),
-                                    )
-                                } else {
-                                    None
-                                }),
-                        ),
-                )
-                .into_any(),
-        )
-    }
-
-    fn present_notification(
-        &self,
-        entry: &NotificationEntry,
-        cx: &App,
-    ) -> Option<NotificationPresenter> {
-        let user_store = self.user_store.read(cx);
-        let channel_store = self.channel_store.read(cx);
-        match entry.notification {
-            Notification::ContactRequest { sender_id } => {
-                let requester = user_store.get_cached_user(sender_id)?;
-                Some(NotificationPresenter {
-                    icon: "icons/plus.svg",
-                    text: format!("{} wants to add you as a contact", requester.github_login),
-                    needs_response: user_store.has_incoming_contact_request(requester.id),
-                    actor: Some(requester),
-                })
-            }
-            Notification::ContactRequestAccepted { responder_id } => {
-                let responder = user_store.get_cached_user(responder_id)?;
-                Some(NotificationPresenter {
-                    icon: "icons/plus.svg",
-                    text: format!("{} accepted your contact invite", responder.github_login),
-                    needs_response: false,
-                    actor: Some(responder),
-                })
-            }
-            Notification::ChannelInvitation {
-                ref channel_name,
-                channel_id,
-                inviter_id,
-            } => {
-                let inviter = user_store.get_cached_user(inviter_id)?;
-                Some(NotificationPresenter {
-                    icon: "icons/hash.svg",
-                    text: format!(
-                        "{} invited you to join the #{channel_name} channel",
-                        inviter.github_login
-                    ),
-                    needs_response: channel_store.has_channel_invitation(ChannelId(channel_id)),
-                    actor: Some(inviter),
-                })
-            }
-        }
-    }
-
-    fn did_render_notification(
-        &mut self,
-        notification_id: u64,
-        notification: &Notification,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let should_mark_as_read = match notification {
-            Notification::ContactRequestAccepted { .. } => true,
-            Notification::ContactRequest { .. } | Notification::ChannelInvitation { .. } => false,
-        };
-
-        if should_mark_as_read {
-            self.mark_as_read_tasks
-                .entry(notification_id)
-                .or_insert_with(|| {
-                    let client = self.client.clone();
-                    cx.spawn_in(window, async move |this, cx| {
-                        cx.background_executor().timer(MARK_AS_READ_DELAY).await;
-                        client
-                            .request(proto::MarkNotificationRead { notification_id })
-                            .await?;
-                        this.update(cx, |this, _| {
-                            this.mark_as_read_tasks.remove(&notification_id);
-                        })?;
-                        Ok(())
-                    })
-                });
-        }
-    }
-
-    fn on_notification_event(
-        &mut self,
-        _: &Entity<NotificationStore>,
-        event: &NotificationEvent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            NotificationEvent::NewNotification { entry } => {
-                self.unseen_notifications.push(entry.clone());
-                self.add_toast(entry, window, cx);
-            }
-            NotificationEvent::NotificationRemoved { entry }
-            | NotificationEvent::NotificationRead { entry } => {
-                self.unseen_notifications.retain(|n| n.id != entry.id);
-                self.remove_toast(entry.id, cx);
-            }
-            NotificationEvent::NotificationsUpdated {
-                old_range,
-                new_count,
-            } => {
-                self.notification_list.splice(old_range.clone(), *new_count);
-                cx.notify();
-            }
-        }
-    }
-
-    fn add_toast(
-        &mut self,
-        entry: &NotificationEntry,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(NotificationPresenter { actor, text, .. }) = self.present_notification(entry, cx)
-        else {
-            return;
-        };
-
-        let notification_id = entry.id;
-        self.current_notification_toast = Some((
-            notification_id,
-            cx.spawn_in(window, async move |this, cx| {
-                cx.background_executor().timer(TOAST_DURATION).await;
-                this.update(cx, |this, cx| this.remove_toast(notification_id, cx))
-                    .ok();
-            }),
-        ));
-
-        self.workspace
-            .update(cx, |workspace, cx| {
-                let id = NotificationId::unique::<NotificationToast>();
-
-                workspace.dismiss_notification(&id, cx);
-                workspace.show_notification(id, cx, |cx| {
-                    let workspace = cx.entity().downgrade();
-                    cx.new(|cx| NotificationToast {
-                        actor,
-                        text,
-                        workspace,
-                        focus_handle: cx.focus_handle(),
-                    })
-                })
-            })
-            .ok();
-    }
-
-    fn remove_toast(&mut self, notification_id: u64, cx: &mut Context<Self>) {
-        if let Some((current_id, _)) = &self.current_notification_toast
-            && *current_id == notification_id
-        {
-            self.current_notification_toast.take();
-            self.workspace
-                .update(cx, |workspace, cx| {
-                    let id = NotificationId::unique::<NotificationToast>();
-                    workspace.dismiss_notification(&id, cx)
-                })
-                .ok();
-        }
-    }
-
-    fn respond_to_notification(
-        &mut self,
-        notification: Notification,
-        response: bool,
-
-        cx: &mut Context<Self>,
-    ) {
-        self.notification_store.update(cx, |store, cx| {
-            store.respond_to_notification(notification, response, cx);
-        });
-    }
-}
-
-impl Render for NotificationPanel {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .size_full()
-            .child(
-                h_flex()
-                    .justify_between()
-                    .px_2()
-                    .py_1()
-                    // Match the height of the tab bar so they line up.
-                    .h(Tab::container_height(cx))
-                    .border_b_1()
-                    .border_color(cx.theme().colors().border)
-                    .child(Label::new("Notifications"))
-                    .child(Icon::new(IconName::Envelope)),
-            )
-            .map(|this| {
-                if !self.client.status().borrow().is_connected() {
-                    this.child(
-                        v_flex()
-                            .gap_2()
-                            .p_4()
-                            .child(
-                                Button::new("connect_prompt_button", "Connect")
-                                    .icon_color(Color::Muted)
-                                    .icon(IconName::Github)
-                                    .icon_position(IconPosition::Start)
-                                    .style(ButtonStyle::Filled)
-                                    .full_width()
-                                    .on_click({
-                                        let client = self.client.clone();
-                                        move |_, window, cx| {
-                                            let client = client.clone();
-                                            window
-                                                .spawn(cx, async move |cx| {
-                                                    match client.connect(true, cx).await {
-                                                        util::ConnectionResult::Timeout => {
-                                                            log::error!("Connection timeout");
-                                                        }
-                                                        util::ConnectionResult::ConnectionReset => {
-                                                            log::error!("Connection reset");
-                                                        }
-                                                        util::ConnectionResult::Result(r) => {
-                                                            r.log_err();
-                                                        }
-                                                    }
-                                                })
-                                                .detach()
-                                        }
-                                    }),
-                            )
-                            .child(
-                                div().flex().w_full().items_center().child(
-                                    Label::new("Connect to view notifications.")
-                                        .color(Color::Muted)
-                                        .size(LabelSize::Small),
-                                ),
-                            ),
-                    )
-                } else if self.notification_list.item_count() == 0 {
-                    this.child(
-                        v_flex().p_4().child(
-                            div().flex().w_full().items_center().child(
-                                Label::new("You have no notifications.")
-                                    .color(Color::Muted)
-                                    .size(LabelSize::Small),
-                            ),
-                        ),
-                    )
-                } else {
-                    this.child(
-                        list(
-                            self.notification_list.clone(),
-                            cx.processor(|this, ix, window, cx| {
-                                this.render_notification(ix, window, cx)
-                                    .unwrap_or_else(|| div().into_any())
-                            }),
-                        )
-                        .size_full(),
-                    )
-                }
-            })
-    }
-}
-
-impl Focusable for NotificationPanel {
-    fn focus_handle(&self, _: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl EventEmitter<Event> for NotificationPanel {}
-impl EventEmitter<PanelEvent> for NotificationPanel {}
-
-impl Panel for NotificationPanel {
-    fn persistent_name() -> &'static str {
-        "NotificationPanel"
-    }
-
-    fn panel_key() -> &'static str {
-        NOTIFICATION_PANEL_KEY
-    }
-
-    fn position(&self, _: &Window, cx: &App) -> DockPosition {
-        NotificationPanelSettings::get_global(cx).dock
-    }
-
-    fn position_is_valid(&self, position: DockPosition) -> bool {
-        matches!(position, DockPosition::Left | DockPosition::Right)
-    }
-
-    fn set_position(&mut self, position: DockPosition, _: &mut Window, cx: &mut Context<Self>) {
-        settings::update_settings_file(self.fs.clone(), cx, move |settings, _| {
-            settings.notification_panel.get_or_insert_default().dock = Some(position.into())
-        });
-    }
-
-    fn size(&self, _: &Window, cx: &App) -> Pixels {
-        self.width
-            .unwrap_or_else(|| NotificationPanelSettings::get_global(cx).default_width)
-    }
-
-    fn set_size(&mut self, size: Option<Pixels>, _: &mut Window, cx: &mut Context<Self>) {
-        self.width = size;
-        self.serialize(cx);
-        cx.notify();
-    }
-
-    fn set_active(&mut self, active: bool, _: &mut Window, cx: &mut Context<Self>) {
-        self.active = active;
-
-        if self.active {
-            self.unseen_notifications = Vec::new();
-            cx.notify();
-        }
-
-        if self.notification_store.read(cx).notification_count() == 0 {
-            cx.emit(Event::Dismissed);
-        }
-    }
-
-    fn icon(&self, _: &Window, cx: &App) -> Option<IconName> {
-        let show_button = NotificationPanelSettings::get_global(cx).button;
-        if !show_button {
-            return None;
-        }
-
-        if self.unseen_notifications.is_empty() {
-            return Some(IconName::Bell);
-        }
-
-        Some(IconName::BellDot)
-    }
-
-    fn icon_tooltip(&self, _window: &Window, _cx: &App) -> Option<&'static str> {
-        Some("Notification Panel")
-    }
-
-    fn icon_label(&self, _window: &Window, cx: &App) -> Option<String> {
-        let count = self.notification_store.read(cx).unread_notification_count();
-        if count == 0 {
-            None
-        } else {
-            Some(count.to_string())
-        }
-    }
-
-    fn toggle_action(&self) -> Box<dyn gpui::Action> {
-        Box::new(ToggleFocus)
-    }
-
-    fn activation_priority(&self) -> u32 {
-        8
-    }
-}
-
-pub struct NotificationToast {
-    actor: Option<Arc<User>>,
-    text: String,
-    workspace: WeakEntity<Workspace>,
-    focus_handle: FocusHandle,
-}
-
-impl Focusable for NotificationToast {
-    fn focus_handle(&self, _cx: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl WorkspaceNotification for NotificationToast {}
-
-impl NotificationToast {
-    fn focus_notification_panel(&self, window: &mut Window, cx: &mut Context<Self>) {
-        let workspace = self.workspace.clone();
-        window.defer(cx, move |window, cx| {
-            workspace
-                .update(cx, |workspace, cx| {
-                    workspace.focus_panel::<NotificationPanel>(window, cx)
-                })
-                .ok();
-        })
-    }
-}
-
-impl Render for NotificationToast {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let user = self.actor.clone();
-
-        let suppress = window.modifiers().shift;
-        let (close_id, close_icon) = if suppress {
-            ("suppress", IconName::Minimize)
-        } else {
-            ("close", IconName::Close)
-        };
-
-        h_flex()
-            .id("notification_panel_toast")
-            .elevation_3(cx)
-            .p_2()
-            .justify_between()
-            .children(user.map(|user| Avatar::new(user.avatar_uri.clone())))
-            .child(Label::new(self.text.clone()))
-            .on_modifiers_changed(cx.listener(|_, _, _, cx| cx.notify()))
-            .child(
-                IconButton::new(close_id, close_icon)
-                    .tooltip(move |_window, cx| {
-                        if suppress {
-                            Tooltip::for_action(
-                                "Suppress.\nClose with click.",
-                                &workspace::SuppressNotification,
-                                cx,
-                            )
-                        } else {
-                            Tooltip::for_action(
-                                "Close.\nSuppress with shift-click",
-                                &menu::Cancel,
-                                cx,
-                            )
-                        }
-                    })
-                    .on_click(cx.listener(move |_, _: &ClickEvent, _, cx| {
-                        if suppress {
-                            cx.emit(SuppressEvent);
-                        } else {
-                            cx.emit(DismissEvent);
-                        }
-                    })),
-            )
-            .on_click(cx.listener(|this, _, window, cx| {
-                this.focus_notification_panel(window, cx);
-                cx.emit(DismissEvent);
-            }))
-    }
-}
-
-impl EventEmitter<DismissEvent> for NotificationToast {}
-impl EventEmitter<SuppressEvent> for NotificationToast {}
diff --git a/crates/collab_ui/src/notifications.rs b/crates/collab_ui/src/notifications.rs
deleted file mode 100644
index f5597895dd..0000000000
--- a/crates/collab_ui/src/notifications.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-mod collab_notification;
-pub mod incoming_call_notification;
-pub mod project_shared_notification;
-
-#[cfg(feature = "stories")]
-mod stories;
-
-use gpui::App;
-use std::sync::Arc;
-use workspace::AppState;
-
-#[cfg(feature = "stories")]
-pub use stories::*;
-
-pub fn init(app_state: &Arc<AppState>, cx: &mut App) {
-    incoming_call_notification::init(app_state, cx);
-    project_shared_notification::init(app_state, cx);
-}
diff --git a/crates/collab_ui/src/notifications/collab_notification.rs b/crates/collab_ui/src/notifications/collab_notification.rs
deleted file mode 100644
index 9d5541d9c2..0000000000
--- a/crates/collab_ui/src/notifications/collab_notification.rs
+++ /dev/null
@@ -1,52 +0,0 @@
-use gpui::{AnyElement, SharedUri, img, prelude::*};
-use smallvec::SmallVec;
-use ui::prelude::*;
-
-#[derive(IntoElement)]
-pub struct CollabNotification {
-    avatar_uri: SharedUri,
-    accept_button: Button,
-    dismiss_button: Button,
-    children: SmallVec<[AnyElement; 2]>,
-}
-
-impl CollabNotification {
-    pub fn new(
-        avatar_uri: impl Into<SharedUri>,
-        accept_button: Button,
-        dismiss_button: Button,
-    ) -> Self {
-        Self {
-            avatar_uri: avatar_uri.into(),
-            accept_button,
-            dismiss_button,
-            children: SmallVec::new(),
-        }
-    }
-}
-
-impl ParentElement for CollabNotification {
-    fn extend(&mut self, elements: impl IntoIterator<Item = AnyElement>) {
-        self.children.extend(elements)
-    }
-}
-
-impl RenderOnce for CollabNotification {
-    fn render(self, _: &mut Window, cx: &mut App) -> impl IntoElement {
-        h_flex()
-            .text_ui(cx)
-            .justify_between()
-            .size_full()
-            .overflow_hidden()
-            .elevation_3(cx)
-            .p_2()
-            .gap_2()
-            .child(img(self.avatar_uri).w_12().h_12().rounded_full())
-            .child(v_flex().overflow_hidden().children(self.children))
-            .child(
-                v_flex()
-                    .child(self.accept_button)
-                    .child(self.dismiss_button),
-            )
-    }
-}
diff --git a/crates/collab_ui/src/notifications/incoming_call_notification.rs b/crates/collab_ui/src/notifications/incoming_call_notification.rs
deleted file mode 100644
index 0bf71ce614..0000000000
--- a/crates/collab_ui/src/notifications/incoming_call_notification.rs
+++ /dev/null
@@ -1,135 +0,0 @@
-use crate::notification_window_options;
-use crate::notifications::collab_notification::CollabNotification;
-use call::{ActiveCall, IncomingCall};
-use futures::StreamExt;
-use gpui::{App, WindowHandle, prelude::*};
-
-use std::sync::{Arc, Weak};
-use ui::{Button, Label, prelude::*};
-use util::ResultExt;
-use workspace::AppState;
-
-pub fn init(app_state: &Arc<AppState>, cx: &mut App) {
-    let app_state = Arc::downgrade(app_state);
-    let mut incoming_call = ActiveCall::global(cx).read(cx).incoming();
-    cx.spawn(async move |cx| {
-        let mut notification_windows: Vec<WindowHandle<IncomingCallNotification>> = Vec::new();
-        while let Some(incoming_call) = incoming_call.next().await {
-            for window in notification_windows.drain(..) {
-                window
-                    .update(cx, |_, window, _| {
-                        window.remove_window();
-                    })
-                    .log_err();
-            }
-
-            if let Some(incoming_call) = incoming_call {
-                let unique_screens = cx.update(|cx| cx.displays()).unwrap();
-                let window_size = gpui::Size {
-                    width: px(400.),
-                    height: px(72.),
-                };
-
-                for screen in unique_screens {
-                    if let Some(options) = cx
-                        .update(|cx| notification_window_options(screen, window_size, cx))
-                        .log_err()
-                    {
-                        let window = cx
-                            .open_window(options, |_, cx| {
-                                cx.new(|_| {
-                                    IncomingCallNotification::new(
-                                        incoming_call.clone(),
-                                        app_state.clone(),
-                                    )
-                                })
-                            })
-                            .unwrap();
-                        notification_windows.push(window);
-                    }
-                }
-            }
-        }
-    })
-    .detach();
-}
-
-struct IncomingCallNotificationState {
-    call: IncomingCall,
-    app_state: Weak<AppState>,
-}
-
-pub struct IncomingCallNotification {
-    state: Arc<IncomingCallNotificationState>,
-}
-impl IncomingCallNotificationState {
-    pub fn new(call: IncomingCall, app_state: Weak<AppState>) -> Self {
-        Self { call, app_state }
-    }
-
-    fn respond(&self, accept: bool, cx: &mut App) {
-        let active_call = ActiveCall::global(cx);
-        if accept {
-            let join = active_call.update(cx, |active_call, cx| active_call.accept_incoming(cx));
-            let caller_user_id = self.call.calling_user.id;
-            let initial_project_id = self.call.initial_project.as_ref().map(|project| project.id);
-            let app_state = self.app_state.clone();
-            let cx: &mut App = cx;
-            cx.spawn(async move |cx| {
-                join.await?;
-                if let Some(project_id) = initial_project_id {
-                    cx.update(|cx| {
-                        if let Some(app_state) = app_state.upgrade() {
-                            workspace::join_in_room_project(
-                                project_id,
-                                caller_user_id,
-                                app_state,
-                                cx,
-                            )
-                            .detach_and_log_err(cx);
-                        }
-                    })
-                    .log_err();
-                }
-                anyhow::Ok(())
-            })
-            .detach_and_log_err(cx);
-        } else {
-            active_call.update(cx, |active_call, cx| {
-                active_call.decline_incoming(cx).log_err();
-            });
-        }
-    }
-}
-
-impl IncomingCallNotification {
-    pub fn new(call: IncomingCall, app_state: Weak<AppState>) -> Self {
-        Self {
-            state: Arc::new(IncomingCallNotificationState::new(call, app_state)),
-        }
-    }
-}
-
-impl Render for IncomingCallNotification {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let ui_font = theme::setup_ui_font(window, cx);
-
-        div().size_full().font(ui_font).child(
-            CollabNotification::new(
-                self.state.call.calling_user.avatar_uri.clone(),
-                Button::new("accept", "Accept").on_click({
-                    let state = self.state.clone();
-                    move |_, _, cx| state.respond(true, cx)
-                }),
-                Button::new("decline", "Decline").on_click({
-                    let state = self.state.clone();
-                    move |_, _, cx| state.respond(false, cx)
-                }),
-            )
-            .child(v_flex().overflow_hidden().child(Label::new(format!(
-                "{} is sharing a project in Zed",
-                self.state.call.calling_user.github_login
-            )))),
-        )
-    }
-}
diff --git a/crates/collab_ui/src/notifications/project_shared_notification.rs b/crates/collab_ui/src/notifications/project_shared_notification.rs
deleted file mode 100644
index b21a2dfcb7..0000000000
--- a/crates/collab_ui/src/notifications/project_shared_notification.rs
+++ /dev/null
@@ -1,154 +0,0 @@
-use crate::notification_window_options;
-use crate::notifications::collab_notification::CollabNotification;
-use call::{ActiveCall, room};
-use client::User;
-use collections::HashMap;
-use gpui::{App, Size};
-use std::sync::{Arc, Weak};
-
-use ui::{Button, Label, prelude::*};
-use util::ResultExt;
-use workspace::AppState;
-
-pub fn init(app_state: &Arc<AppState>, cx: &mut App) {
-    let app_state = Arc::downgrade(app_state);
-    let active_call = ActiveCall::global(cx);
-    let mut notification_windows = HashMap::default();
-    cx.subscribe(&active_call, move |_, event, cx| match event {
-        room::Event::RemoteProjectShared {
-            owner,
-            project_id,
-            worktree_root_names,
-        } => {
-            let window_size = Size {
-                width: px(400.),
-                height: px(72.),
-            };
-
-            for screen in cx.displays() {
-                let options = notification_window_options(screen, window_size, cx);
-                let Some(window) = cx
-                    .open_window(options, |_, cx| {
-                        cx.new(|_| {
-                            ProjectSharedNotification::new(
-                                owner.clone(),
-                                *project_id,
-                                worktree_root_names.clone(),
-                                app_state.clone(),
-                            )
-                        })
-                    })
-                    .log_err()
-                else {
-                    continue;
-                };
-                notification_windows
-                    .entry(*project_id)
-                    .or_insert(Vec::new())
-                    .push(window);
-            }
-        }
-
-        room::Event::RemoteProjectUnshared { project_id }
-        | room::Event::RemoteProjectJoined { project_id }
-        | room::Event::RemoteProjectInvitationDiscarded { project_id } => {
-            if let Some(windows) = notification_windows.remove(project_id) {
-                for window in windows {
-                    window
-                        .update(cx, |_, window, _| {
-                            window.remove_window();
-                        })
-                        .ok();
-                }
-            }
-        }
-
-        room::Event::RoomLeft { .. } => {
-            for (_, windows) in notification_windows.drain() {
-                for window in windows {
-                    window
-                        .update(cx, |_, window, _| {
-                            window.remove_window();
-                        })
-                        .ok();
-                }
-            }
-        }
-        _ => {}
-    })
-    .detach();
-}
-
-pub struct ProjectSharedNotification {
-    project_id: u64,
-    worktree_root_names: Vec<String>,
-    owner: Arc<User>,
-    app_state: Weak<AppState>,
-}
-
-impl ProjectSharedNotification {
-    fn new(
-        owner: Arc<User>,
-        project_id: u64,
-        worktree_root_names: Vec<String>,
-        app_state: Weak<AppState>,
-    ) -> Self {
-        Self {
-            project_id,
-            worktree_root_names,
-            owner,
-            app_state,
-        }
-    }
-
-    fn join(&mut self, cx: &mut Context<Self>) {
-        if let Some(app_state) = self.app_state.upgrade() {
-            workspace::join_in_room_project(self.project_id, self.owner.id, app_state, cx)
-                .detach_and_log_err(cx);
-        }
-    }
-
-    fn dismiss(&mut self, cx: &mut Context<Self>) {
-        if let Some(active_room) = ActiveCall::global(cx).read(cx).room().cloned() {
-            active_room.update(cx, |_, cx| {
-                cx.emit(room::Event::RemoteProjectInvitationDiscarded {
-                    project_id: self.project_id,
-                });
-            });
-        }
-    }
-}
-
-impl Render for ProjectSharedNotification {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let ui_font = theme::setup_ui_font(window, cx);
-
-        div().size_full().font(ui_font).child(
-            CollabNotification::new(
-                self.owner.avatar_uri.clone(),
-                Button::new("open", "Open").on_click(cx.listener(move |this, _event, _, cx| {
-                    this.join(cx);
-                })),
-                Button::new("dismiss", "Dismiss").on_click(cx.listener(
-                    move |this, _event, _, cx| {
-                        this.dismiss(cx);
-                    },
-                )),
-            )
-            .child(Label::new(self.owner.github_login.clone()))
-            .child(Label::new(format!(
-                "is sharing a project in Zed{}",
-                if self.worktree_root_names.is_empty() {
-                    ""
-                } else {
-                    ":"
-                }
-            )))
-            .children(if self.worktree_root_names.is_empty() {
-                None
-            } else {
-                Some(Label::new(self.worktree_root_names.join(", ")))
-            }),
-        )
-    }
-}
diff --git a/crates/collab_ui/src/notifications/stories.rs b/crates/collab_ui/src/notifications/stories.rs
deleted file mode 100644
index 36518679c6..0000000000
--- a/crates/collab_ui/src/notifications/stories.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-mod collab_notification;
-
-pub use collab_notification::*;
diff --git a/crates/collab_ui/src/notifications/stories/collab_notification.rs b/crates/collab_ui/src/notifications/stories/collab_notification.rs
deleted file mode 100644
index 8dc602a320..0000000000
--- a/crates/collab_ui/src/notifications/stories/collab_notification.rs
+++ /dev/null
@@ -1,48 +0,0 @@
-use gpui::prelude::*;
-use story::{Story, StoryItem, StorySection};
-use ui::prelude::*;
-
-use crate::notifications::collab_notification::CollabNotification;
-
-pub struct CollabNotificationStory;
-
-impl Render for CollabNotificationStory {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let window_container = |width, height| div().w(px(width)).h(px(height));
-
-        Story::container(cx)
-            .child(Story::title_for::<CollabNotification>(cx))
-            .child(
-                StorySection::new().child(StoryItem::new(
-                    "Incoming Call Notification",
-                    window_container(400., 72.).child(
-                        CollabNotification::new(
-                            "https://avatars.githubusercontent.com/u/1486634?v=4",
-                            Button::new("accept", "Accept"),
-                            Button::new("decline", "Decline"),
-                        )
-                        .child(
-                            v_flex()
-                                .overflow_hidden()
-                                .child(Label::new("maxdeviant is sharing a project in Zed")),
-                        ),
-                    ),
-                )),
-            )
-            .child(
-                StorySection::new().child(StoryItem::new(
-                    "Project Shared Notification",
-                    window_container(400., 72.).child(
-                        CollabNotification::new(
-                            "https://avatars.githubusercontent.com/u/1714999?v=4",
-                            Button::new("open", "Open"),
-                            Button::new("dismiss", "Dismiss"),
-                        )
-                        .child(Label::new("iamnbutler"))
-                        .child(Label::new("is sharing a project in Zed:"))
-                        .child(Label::new("zed")),
-                    ),
-                )),
-            )
-    }
-}
diff --git a/crates/collab_ui/src/panel_settings.rs b/crates/collab_ui/src/panel_settings.rs
deleted file mode 100644
index ebd021be4b..0000000000
--- a/crates/collab_ui/src/panel_settings.rs
+++ /dev/null
@@ -1,41 +0,0 @@
-use gpui::Pixels;
-use settings::{RegisterSetting, Settings};
-use ui::px;
-use workspace::dock::DockPosition;
-
-#[derive(Debug, RegisterSetting)]
-pub struct CollaborationPanelSettings {
-    pub button: bool,
-    pub dock: DockPosition,
-    pub default_width: Pixels,
-}
-
-#[derive(Debug, RegisterSetting)]
-pub struct NotificationPanelSettings {
-    pub button: bool,
-    pub dock: DockPosition,
-    pub default_width: Pixels,
-}
-
-impl Settings for CollaborationPanelSettings {
-    fn from_settings(content: &settings::SettingsContent) -> Self {
-        let panel = content.collaboration_panel.as_ref().unwrap();
-
-        Self {
-            button: panel.button.unwrap(),
-            dock: panel.dock.unwrap().into(),
-            default_width: panel.default_width.map(px).unwrap(),
-        }
-    }
-}
-
-impl Settings for NotificationPanelSettings {
-    fn from_settings(content: &settings::SettingsContent) -> Self {
-        let panel = content.notification_panel.as_ref().unwrap();
-        return Self {
-            button: panel.button.unwrap(),
-            dock: panel.dock.unwrap().into(),
-            default_width: panel.default_width.map(px).unwrap(),
-        };
-    }
-}
diff --git a/crates/command_palette/Cargo.toml b/crates/command_palette/Cargo.toml
deleted file mode 100644
index bd86c10a80..0000000000
--- a/crates/command_palette/Cargo.toml
+++ /dev/null
@@ -1,51 +0,0 @@
-[package]
-name = "command_palette"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[features]
-test-support = ["db/test-support"]
-
-[lib]
-path = "src/command_palette.rs"
-doctest = false
-
-[dependencies]
-anyhow.workspace = true
-client.workspace = true
-collections.workspace = true
-command_palette_hooks.workspace = true
-db.workspace = true
-fuzzy.workspace = true
-gpui.workspace = true
-menu.workspace = true
-log.workspace = true
-picker.workspace = true
-postage.workspace = true
-serde.workspace = true
-settings.workspace = true
-theme.workspace = true
-time.workspace = true
-ui.workspace = true
-util.workspace = true
-telemetry.workspace = true
-workspace.workspace = true
-zed_actions.workspace = true
-
-[dev-dependencies]
-ctor.workspace = true
-db = { workspace = true, features = ["test-support"] }
-editor = { workspace = true, features = ["test-support"] }
-env_logger.workspace = true
-go_to_line.workspace = true
-gpui = { workspace = true, features = ["test-support"] }
-language = { workspace = true, features = ["test-support"] }
-menu.workspace = true
-project = { workspace = true, features = ["test-support"] }
-serde_json.workspace = true
-workspace = { workspace = true, features = ["test-support"] }
diff --git a/crates/command_palette/LICENSE-GPL b/crates/command_palette/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/command_palette/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/command_palette/src/command_palette.rs b/crates/command_palette/src/command_palette.rs
deleted file mode 100644
index daf97bf676..0000000000
--- a/crates/command_palette/src/command_palette.rs
+++ /dev/null
@@ -1,1204 +0,0 @@
-mod persistence;
-
-use std::{
-    cmp::{self, Reverse},
-    collections::{HashMap, VecDeque},
-    sync::Arc,
-    time::Duration,
-};
-
-use client::parse_zed_link;
-use command_palette_hooks::{
-    CommandInterceptItem, CommandInterceptResult, CommandPaletteFilter,
-    GlobalCommandPaletteInterceptor,
-};
-
-use fuzzy::{StringMatch, StringMatchCandidate};
-use gpui::{
-    Action, App, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable,
-    ParentElement, Render, Styled, Task, WeakEntity, Window,
-};
-use persistence::COMMAND_PALETTE_HISTORY;
-use picker::Direction;
-use picker::{Picker, PickerDelegate};
-use postage::{sink::Sink, stream::Stream};
-use settings::Settings;
-use ui::{HighlightedLabel, KeyBinding, ListItem, ListItemSpacing, prelude::*};
-use util::ResultExt;
-use workspace::{ModalView, Workspace, WorkspaceSettings};
-use zed_actions::{OpenZedUrl, command_palette::Toggle};
-
-pub fn init(cx: &mut App) {
-    command_palette_hooks::init(cx);
-    cx.observe_new(CommandPalette::register).detach();
-}
-
-impl ModalView for CommandPalette {}
-
-pub struct CommandPalette {
-    picker: Entity<Picker<CommandPaletteDelegate>>,
-}
-
-/// Removes subsequent whitespace characters and double colons from the query.
-///
-/// This improves the likelihood of a match by either humanized name or keymap-style name.
-pub fn normalize_action_query(input: &str) -> String {
-    let mut result = String::with_capacity(input.len());
-    let mut last_char = None;
-
-    for char in input.trim().chars() {
-        match (last_char, char) {
-            (Some(':'), ':') => continue,
-            (Some(last_char), char) if last_char.is_whitespace() && char.is_whitespace() => {
-                continue;
-            }
-            _ => {
-                last_char = Some(char);
-            }
-        }
-        result.push(char);
-    }
-
-    result
-}
-
-impl CommandPalette {
-    fn register(
-        workspace: &mut Workspace,
-        _window: Option<&mut Window>,
-        _: &mut Context<Workspace>,
-    ) {
-        workspace.register_action(|workspace, _: &Toggle, window, cx| {
-            Self::toggle(workspace, "", window, cx)
-        });
-    }
-
-    pub fn toggle(
-        workspace: &mut Workspace,
-        query: &str,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        let Some(previous_focus_handle) = window.focused(cx) else {
-            return;
-        };
-
-        let entity = cx.weak_entity();
-        workspace.toggle_modal(window, cx, move |window, cx| {
-            CommandPalette::new(previous_focus_handle, query, entity, window, cx)
-        });
-    }
-
-    fn new(
-        previous_focus_handle: FocusHandle,
-        query: &str,
-        entity: WeakEntity<Workspace>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let filter = CommandPaletteFilter::try_global(cx);
-
-        let commands = window
-            .available_actions(cx)
-            .into_iter()
-            .filter_map(|action| {
-                if filter.is_some_and(|filter| filter.is_hidden(&*action)) {
-                    return None;
-                }
-
-                Some(Command {
-                    name: humanize_action_name(action.name()),
-                    action,
-                })
-            })
-            .collect();
-
-        let delegate = CommandPaletteDelegate::new(
-            cx.entity().downgrade(),
-            entity,
-            commands,
-            previous_focus_handle,
-        );
-
-        let picker = cx.new(|cx| {
-            let picker = Picker::uniform_list(delegate, window, cx);
-            picker.set_query(query, window, cx);
-            picker
-        });
-        Self { picker }
-    }
-
-    pub fn set_query(&mut self, query: &str, window: &mut Window, cx: &mut Context<Self>) {
-        self.picker
-            .update(cx, |picker, cx| picker.set_query(query, window, cx))
-    }
-}
-
-impl EventEmitter<DismissEvent> for CommandPalette {}
-
-impl Focusable for CommandPalette {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        self.picker.focus_handle(cx)
-    }
-}
-
-impl Render for CommandPalette {
-    fn render(&mut self, _window: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .key_context("CommandPalette")
-            .w(rems(34.))
-            .child(self.picker.clone())
-    }
-}
-
-pub struct CommandPaletteDelegate {
-    latest_query: String,
-    command_palette: WeakEntity<CommandPalette>,
-    workspace: WeakEntity<Workspace>,
-    all_commands: Vec<Command>,
-    commands: Vec<Command>,
-    matches: Vec<StringMatch>,
-    selected_ix: usize,
-    previous_focus_handle: FocusHandle,
-    updating_matches: Option<(
-        Task<()>,
-        postage::dispatch::Receiver<(Vec<Command>, Vec<StringMatch>, CommandInterceptResult)>,
-    )>,
-    query_history: QueryHistory,
-}
-
-struct Command {
-    name: String,
-    action: Box<dyn Action>,
-}
-
-#[derive(Default)]
-struct QueryHistory {
-    history: Option<VecDeque<String>>,
-    cursor: Option<usize>,
-    prefix: Option<String>,
-}
-
-impl QueryHistory {
-    fn history(&mut self) -> &mut VecDeque<String> {
-        self.history.get_or_insert_with(|| {
-            COMMAND_PALETTE_HISTORY
-                .list_recent_queries()
-                .unwrap_or_default()
-                .into_iter()
-                .collect()
-        })
-    }
-
-    fn add(&mut self, query: String) {
-        if let Some(pos) = self.history().iter().position(|h| h == &query) {
-            self.history().remove(pos);
-        }
-        self.history().push_back(query);
-        self.cursor = None;
-        self.prefix = None;
-    }
-
-    fn validate_cursor(&mut self, current_query: &str) -> Option<usize> {
-        if let Some(pos) = self.cursor {
-            if self.history().get(pos).map(|s| s.as_str()) != Some(current_query) {
-                self.cursor = None;
-                self.prefix = None;
-            }
-        }
-        self.cursor
-    }
-
-    fn previous(&mut self, current_query: &str) -> Option<&str> {
-        if self.validate_cursor(current_query).is_none() {
-            self.prefix = Some(current_query.to_string());
-        }
-
-        let prefix = self.prefix.clone().unwrap_or_default();
-        let start_index = self.cursor.unwrap_or(self.history().len());
-
-        for i in (0..start_index).rev() {
-            if self
-                .history()
-                .get(i)
-                .is_some_and(|e| e.starts_with(&prefix))
-            {
-                self.cursor = Some(i);
-                return self.history().get(i).map(|s| s.as_str());
-            }
-        }
-        None
-    }
-
-    fn next(&mut self, current_query: &str) -> Option<&str> {
-        let selected = self.validate_cursor(current_query)?;
-        let prefix = self.prefix.clone().unwrap_or_default();
-
-        for i in (selected + 1)..self.history().len() {
-            if self
-                .history()
-                .get(i)
-                .is_some_and(|e| e.starts_with(&prefix))
-            {
-                self.cursor = Some(i);
-                return self.history().get(i).map(|s| s.as_str());
-            }
-        }
-        None
-    }
-
-    fn reset_cursor(&mut self) {
-        self.cursor = None;
-        self.prefix = None;
-    }
-
-    fn is_navigating(&self) -> bool {
-        self.cursor.is_some()
-    }
-}
-
-impl Clone for Command {
-    fn clone(&self) -> Self {
-        Self {
-            name: self.name.clone(),
-            action: self.action.boxed_clone(),
-        }
-    }
-}
-
-impl CommandPaletteDelegate {
-    fn new(
-        command_palette: WeakEntity<CommandPalette>,
-        workspace: WeakEntity<Workspace>,
-        commands: Vec<Command>,
-        previous_focus_handle: FocusHandle,
-    ) -> Self {
-        Self {
-            command_palette,
-            workspace,
-            all_commands: commands.clone(),
-            matches: vec![],
-            commands,
-            selected_ix: 0,
-            previous_focus_handle,
-            latest_query: String::new(),
-            updating_matches: None,
-            query_history: Default::default(),
-        }
-    }
-
-    fn matches_updated(
-        &mut self,
-        query: String,
-        mut commands: Vec<Command>,
-        mut matches: Vec<StringMatch>,
-        intercept_result: CommandInterceptResult,
-        _: &mut Context<Picker<Self>>,
-    ) {
-        self.updating_matches.take();
-        self.latest_query = query;
-
-        let mut new_matches = Vec::new();
-
-        for CommandInterceptItem {
-            action,
-            string,
-            positions,
-        } in intercept_result.results
-        {
-            if let Some(idx) = matches
-                .iter()
-                .position(|m| commands[m.candidate_id].action.partial_eq(&*action))
-            {
-                matches.remove(idx);
-            }
-            commands.push(Command {
-                name: string.clone(),
-                action,
-            });
-            new_matches.push(StringMatch {
-                candidate_id: commands.len() - 1,
-                string,
-                positions,
-                score: 0.0,
-            })
-        }
-        if !intercept_result.exclusive {
-            new_matches.append(&mut matches);
-        }
-        self.commands = commands;
-        self.matches = new_matches;
-        if self.matches.is_empty() {
-            self.selected_ix = 0;
-        } else {
-            self.selected_ix = cmp::min(self.selected_ix, self.matches.len() - 1);
-        }
-    }
-
-    /// Hit count for each command in the palette.
-    /// We only account for commands triggered directly via command palette and not by e.g. keystrokes because
-    /// if a user already knows a keystroke for a command, they are unlikely to use a command palette to look for it.
-    fn hit_counts(&self) -> HashMap<String, u16> {
-        if let Ok(commands) = COMMAND_PALETTE_HISTORY.list_commands_used() {
-            commands
-                .into_iter()
-                .map(|command| (command.command_name, command.invocations))
-                .collect()
-        } else {
-            HashMap::new()
-        }
-    }
-
-    fn selected_command(&self) -> Option<&Command> {
-        let action_ix = self
-            .matches
-            .get(self.selected_ix)
-            .map(|m| m.candidate_id)
-            .unwrap_or(self.selected_ix);
-        // this gets called in headless tests where there are no commands loaded
-        // so we need to return an Option here
-        self.commands.get(action_ix)
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn seed_history(&mut self, queries: &[&str]) {
-        self.query_history.history = Some(queries.iter().map(|s| s.to_string()).collect());
-    }
-}
-
-impl PickerDelegate for CommandPaletteDelegate {
-    type ListItem = ListItem;
-
-    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
-        "Execute a command...".into()
-    }
-
-    fn select_history(
-        &mut self,
-        direction: Direction,
-        query: &str,
-        _window: &mut Window,
-        _cx: &mut App,
-    ) -> Option<String> {
-        match direction {
-            Direction::Up => {
-                let should_use_history =
-                    self.selected_ix == 0 || self.query_history.is_navigating();
-                if should_use_history {
-                    if let Some(query) = self.query_history.previous(query).map(|s| s.to_string()) {
-                        return Some(query);
-                    }
-                }
-            }
-            Direction::Down => {
-                if self.query_history.is_navigating() {
-                    if let Some(query) = self.query_history.next(query).map(|s| s.to_string()) {
-                        return Some(query);
-                    } else {
-                        let prefix = self.query_history.prefix.take().unwrap_or_default();
-                        self.query_history.reset_cursor();
-                        return Some(prefix);
-                    }
-                }
-            }
-        }
-        None
-    }
-
-    fn match_count(&self) -> usize {
-        self.matches.len()
-    }
-
-    fn selected_index(&self) -> usize {
-        self.selected_ix
-    }
-
-    fn set_selected_index(
-        &mut self,
-        ix: usize,
-        _window: &mut Window,
-        _: &mut Context<Picker<Self>>,
-    ) {
-        self.selected_ix = ix;
-    }
-
-    fn update_matches(
-        &mut self,
-        mut query: String,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> gpui::Task<()> {
-        let settings = WorkspaceSettings::get_global(cx);
-        if let Some(alias) = settings.command_aliases.get(&query) {
-            query = alias.to_string();
-        }
-
-        let workspace = self.workspace.clone();
-
-        let intercept_task = GlobalCommandPaletteInterceptor::intercept(&query, workspace, cx);
-
-        let (mut tx, mut rx) = postage::dispatch::channel(1);
-
-        let query_str = query.as_str();
-        let is_zed_link = parse_zed_link(query_str, cx).is_some();
-
-        let task = cx.background_spawn({
-            let mut commands = self.all_commands.clone();
-            let hit_counts = self.hit_counts();
-            let executor = cx.background_executor().clone();
-            let query = normalize_action_query(query_str);
-            let query_for_link = query_str.to_string();
-            async move {
-                commands.sort_by_key(|action| {
-                    (
-                        Reverse(hit_counts.get(&action.name).cloned()),
-                        action.name.clone(),
-                    )
-                });
-
-                let candidates = commands
-                    .iter()
-                    .enumerate()
-                    .map(|(ix, command)| StringMatchCandidate::new(ix, &command.name))
-                    .collect::<Vec<_>>();
-
-                let matches = fuzzy::match_strings(
-                    &candidates,
-                    &query,
-                    true,
-                    true,
-                    10000,
-                    &Default::default(),
-                    executor,
-                )
-                .await;
-
-                let intercept_result = if is_zed_link {
-                    CommandInterceptResult {
-                        results: vec![CommandInterceptItem {
-                            action: OpenZedUrl {
-                                url: query_for_link.clone(),
-                            }
-                            .boxed_clone(),
-                            string: query_for_link,
-                            positions: vec![],
-                        }],
-                        exclusive: false,
-                    }
-                } else if let Some(task) = intercept_task {
-                    task.await
-                } else {
-                    CommandInterceptResult::default()
-                };
-
-                tx.send((commands, matches, intercept_result))
-                    .await
-                    .log_err();
-            }
-        });
-
-        self.updating_matches = Some((task, rx.clone()));
-
-        cx.spawn_in(window, async move |picker, cx| {
-            let Some((commands, matches, intercept_result)) = rx.recv().await else {
-                return;
-            };
-
-            picker
-                .update(cx, |picker, cx| {
-                    picker
-                        .delegate
-                        .matches_updated(query, commands, matches, intercept_result, cx)
-                })
-                .log_err();
-        })
-    }
-
-    fn finalize_update_matches(
-        &mut self,
-        query: String,
-        duration: Duration,
-        _: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> bool {
-        let Some((task, rx)) = self.updating_matches.take() else {
-            return true;
-        };
-
-        match cx
-            .background_executor()
-            .block_with_timeout(duration, rx.clone().recv())
-        {
-            Ok(Some((commands, matches, interceptor_result))) => {
-                self.matches_updated(query, commands, matches, interceptor_result, cx);
-                true
-            }
-            _ => {
-                self.updating_matches = Some((task, rx));
-                false
-            }
-        }
-    }
-
-    fn dismissed(&mut self, _window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        self.command_palette
-            .update(cx, |_, cx| cx.emit(DismissEvent))
-            .log_err();
-    }
-
-    fn confirm(&mut self, secondary: bool, window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        if secondary {
-            let Some(selected_command) = self.selected_command() else {
-                return;
-            };
-            let action_name = selected_command.action.name();
-            let open_keymap = Box::new(zed_actions::ChangeKeybinding {
-                action: action_name.to_string(),
-            });
-            window.dispatch_action(open_keymap, cx);
-            self.dismissed(window, cx);
-            return;
-        }
-
-        if self.matches.is_empty() {
-            self.dismissed(window, cx);
-            return;
-        }
-
-        if !self.latest_query.is_empty() {
-            self.query_history.add(self.latest_query.clone());
-            self.query_history.reset_cursor();
-        }
-
-        let action_ix = self.matches[self.selected_ix].candidate_id;
-        let command = self.commands.swap_remove(action_ix);
-        telemetry::event!(
-            "Action Invoked",
-            source = "command palette",
-            action = command.name
-        );
-        self.matches.clear();
-        self.commands.clear();
-        let command_name = command.name.clone();
-        let latest_query = self.latest_query.clone();
-        cx.background_spawn(async move {
-            COMMAND_PALETTE_HISTORY
-                .write_command_invocation(command_name, latest_query)
-                .await
-        })
-        .detach_and_log_err(cx);
-        let action = command.action;
-        window.focus(&self.previous_focus_handle);
-        self.dismissed(window, cx);
-        window.dispatch_action(action, cx);
-    }
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        _: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<Self::ListItem> {
-        let matching_command = self.matches.get(ix)?;
-        let command = self.commands.get(matching_command.candidate_id)?;
-
-        Some(
-            ListItem::new(ix)
-                .inset(true)
-                .spacing(ListItemSpacing::Sparse)
-                .toggle_state(selected)
-                .child(
-                    h_flex()
-                        .w_full()
-                        .py_px()
-                        .justify_between()
-                        .child(HighlightedLabel::new(
-                            command.name.clone(),
-                            matching_command.positions.clone(),
-                        ))
-                        .child(KeyBinding::for_action_in(
-                            &*command.action,
-                            &self.previous_focus_handle,
-                            cx,
-                        )),
-                ),
-        )
-    }
-
-    fn render_footer(
-        &self,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<AnyElement> {
-        let selected_command = self.selected_command()?;
-        let keybind =
-            KeyBinding::for_action_in(&*selected_command.action, &self.previous_focus_handle, cx);
-
-        let focus_handle = &self.previous_focus_handle;
-        let keybinding_buttons = if keybind.has_binding(window) {
-            Button::new("change", "Change Keybinding…")
-                .key_binding(
-                    KeyBinding::for_action_in(&menu::SecondaryConfirm, focus_handle, cx)
-                        .map(|kb| kb.size(rems_from_px(12.))),
-                )
-                .on_click(move |_, window, cx| {
-                    window.dispatch_action(menu::SecondaryConfirm.boxed_clone(), cx);
-                })
-        } else {
-            Button::new("add", "Add Keybinding…")
-                .key_binding(
-                    KeyBinding::for_action_in(&menu::SecondaryConfirm, focus_handle, cx)
-                        .map(|kb| kb.size(rems_from_px(12.))),
-                )
-                .on_click(move |_, window, cx| {
-                    window.dispatch_action(menu::SecondaryConfirm.boxed_clone(), cx);
-                })
-        };
-
-        Some(
-            h_flex()
-                .w_full()
-                .p_1p5()
-                .gap_1()
-                .justify_end()
-                .border_t_1()
-                .border_color(cx.theme().colors().border_variant)
-                .child(keybinding_buttons)
-                .child(
-                    Button::new("run-action", "Run")
-                        .key_binding(
-                            KeyBinding::for_action_in(&menu::Confirm, &focus_handle, cx)
-                                .map(|kb| kb.size(rems_from_px(12.))),
-                        )
-                        .on_click(|_, window, cx| {
-                            window.dispatch_action(menu::Confirm.boxed_clone(), cx)
-                        }),
-                )
-                .into_any(),
-        )
-    }
-}
-
-pub fn humanize_action_name(name: &str) -> String {
-    let capacity = name.len() + name.chars().filter(|c| c.is_uppercase()).count();
-    let mut result = String::with_capacity(capacity);
-    for char in name.chars() {
-        if char == ':' {
-            if result.ends_with(':') {
-                result.push(' ');
-            } else {
-                result.push(':');
-            }
-        } else if char == '_' {
-            result.push(' ');
-        } else if char.is_uppercase() {
-            if !result.ends_with(' ') {
-                result.push(' ');
-            }
-            result.extend(char.to_lowercase());
-        } else {
-            result.push(char);
-        }
-    }
-    result
-}
-
-impl std::fmt::Debug for Command {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("Command")
-            .field("name", &self.name)
-            .finish_non_exhaustive()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::sync::Arc;
-
-    use super::*;
-    use editor::Editor;
-    use go_to_line::GoToLine;
-    use gpui::{TestAppContext, VisualTestContext};
-    use language::Point;
-    use project::Project;
-    use settings::KeymapFile;
-    use workspace::{AppState, Workspace};
-
-    #[test]
-    fn test_humanize_action_name() {
-        assert_eq!(
-            humanize_action_name("editor::GoToDefinition"),
-            "editor: go to definition"
-        );
-        assert_eq!(
-            humanize_action_name("editor::Backspace"),
-            "editor: backspace"
-        );
-        assert_eq!(
-            humanize_action_name("go_to_line::Deploy"),
-            "go to line: deploy"
-        );
-    }
-
-    #[test]
-    fn test_normalize_query() {
-        assert_eq!(
-            normalize_action_query("editor: backspace"),
-            "editor: backspace"
-        );
-        assert_eq!(
-            normalize_action_query("editor:  backspace"),
-            "editor: backspace"
-        );
-        assert_eq!(
-            normalize_action_query("editor:    backspace"),
-            "editor: backspace"
-        );
-        assert_eq!(
-            normalize_action_query("editor::GoToDefinition"),
-            "editor:GoToDefinition"
-        );
-        assert_eq!(
-            normalize_action_query("editor::::GoToDefinition"),
-            "editor:GoToDefinition"
-        );
-        assert_eq!(
-            normalize_action_query("editor: :GoToDefinition"),
-            "editor: :GoToDefinition"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_command_palette(cx: &mut TestAppContext) {
-        let app_state = init_test(cx);
-        let project = Project::test(app_state.fs.clone(), [], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-        let editor = cx.new_window_entity(|window, cx| {
-            let mut editor = Editor::single_line(window, cx);
-            editor.set_text("abc", window, cx);
-            editor
-        });
-
-        workspace.update_in(cx, |workspace, window, cx| {
-            workspace.add_item_to_active_pane(Box::new(editor.clone()), None, true, window, cx);
-            editor.update(cx, |editor, cx| window.focus(&editor.focus_handle(cx)))
-        });
-
-        cx.simulate_keystrokes("cmd-shift-p");
-
-        let palette = workspace.update(cx, |workspace, cx| {
-            workspace
-                .active_modal::<CommandPalette>(cx)
-                .unwrap()
-                .read(cx)
-                .picker
-                .clone()
-        });
-
-        palette.read_with(cx, |palette, _| {
-            assert!(palette.delegate.commands.len() > 5);
-            let is_sorted =
-                |actions: &[Command]| actions.windows(2).all(|pair| pair[0].name <= pair[1].name);
-            assert!(is_sorted(&palette.delegate.commands));
-        });
-
-        cx.simulate_input("bcksp");
-
-        palette.read_with(cx, |palette, _| {
-            assert_eq!(palette.delegate.matches[0].string, "editor: backspace");
-        });
-
-        cx.simulate_keystrokes("enter");
-
-        workspace.update(cx, |workspace, cx| {
-            assert!(workspace.active_modal::<CommandPalette>(cx).is_none());
-            assert_eq!(editor.read(cx).text(cx), "ab")
-        });
-
-        // Add namespace filter, and redeploy the palette
-        cx.update(|_window, cx| {
-            CommandPaletteFilter::update_global(cx, |filter, _| {
-                filter.hide_namespace("editor");
-            });
-        });
-
-        cx.simulate_keystrokes("cmd-shift-p");
-        cx.simulate_input("bcksp");
-
-        let palette = workspace.update(cx, |workspace, cx| {
-            workspace
-                .active_modal::<CommandPalette>(cx)
-                .unwrap()
-                .read(cx)
-                .picker
-                .clone()
-        });
-        palette.read_with(cx, |palette, _| {
-            assert!(palette.delegate.matches.is_empty())
-        });
-    }
-    #[gpui::test]
-    async fn test_normalized_matches(cx: &mut TestAppContext) {
-        let app_state = init_test(cx);
-        let project = Project::test(app_state.fs.clone(), [], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-        let editor = cx.new_window_entity(|window, cx| {
-            let mut editor = Editor::single_line(window, cx);
-            editor.set_text("abc", window, cx);
-            editor
-        });
-
-        workspace.update_in(cx, |workspace, window, cx| {
-            workspace.add_item_to_active_pane(Box::new(editor.clone()), None, true, window, cx);
-            editor.update(cx, |editor, cx| window.focus(&editor.focus_handle(cx)))
-        });
-
-        // Test normalize (trimming whitespace and double colons)
-        cx.simulate_keystrokes("cmd-shift-p");
-
-        let palette = workspace.update(cx, |workspace, cx| {
-            workspace
-                .active_modal::<CommandPalette>(cx)
-                .unwrap()
-                .read(cx)
-                .picker
-                .clone()
-        });
-
-        cx.simulate_input("Editor::    Backspace");
-        palette.read_with(cx, |palette, _| {
-            assert_eq!(palette.delegate.matches[0].string, "editor: backspace");
-        });
-    }
-
-    #[gpui::test]
-    async fn test_go_to_line(cx: &mut TestAppContext) {
-        let app_state = init_test(cx);
-        let project = Project::test(app_state.fs.clone(), [], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-        cx.simulate_keystrokes("cmd-n");
-
-        let editor = workspace.update(cx, |workspace, cx| {
-            workspace.active_item_as::<Editor>(cx).unwrap()
-        });
-        editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("1\n2\n3\n4\n5\n6\n", window, cx)
-        });
-
-        cx.simulate_keystrokes("cmd-shift-p");
-        cx.simulate_input("go to line: Toggle");
-        cx.simulate_keystrokes("enter");
-
-        workspace.update(cx, |workspace, cx| {
-            assert!(workspace.active_modal::<GoToLine>(cx).is_some())
-        });
-
-        cx.simulate_keystrokes("3 enter");
-
-        editor.update_in(cx, |editor, window, cx| {
-            assert!(editor.focus_handle(cx).is_focused(window));
-            assert_eq!(
-                editor
-                    .selections
-                    .last::<Point>(&editor.display_snapshot(cx))
-                    .range()
-                    .start,
-                Point::new(2, 0)
-            );
-        });
-    }
-
-    fn init_test(cx: &mut TestAppContext) -> Arc<AppState> {
-        cx.update(|cx| {
-            let app_state = AppState::test(cx);
-            theme::init(theme::LoadThemes::JustBase, cx);
-            editor::init(cx);
-            menu::init();
-            go_to_line::init(cx);
-            workspace::init(app_state.clone(), cx);
-            init(cx);
-            cx.bind_keys(KeymapFile::load_panic_on_failure(
-                r#"[
-                    {
-                        "bindings": {
-                            "cmd-n": "workspace::NewFile",
-                            "enter": "menu::Confirm",
-                            "cmd-shift-p": "command_palette::Toggle",
-                            "up": "menu::SelectPrevious",
-                            "down": "menu::SelectNext"
-                        }
-                    }
-                ]"#,
-                cx,
-            ));
-            app_state
-        })
-    }
-
-    fn open_palette_with_history(
-        workspace: &Entity<Workspace>,
-        history: &[&str],
-        cx: &mut VisualTestContext,
-    ) -> Entity<Picker<CommandPaletteDelegate>> {
-        cx.simulate_keystrokes("cmd-shift-p");
-        cx.run_until_parked();
-
-        let palette = workspace.update(cx, |workspace, cx| {
-            workspace
-                .active_modal::<CommandPalette>(cx)
-                .unwrap()
-                .read(cx)
-                .picker
-                .clone()
-        });
-
-        palette.update(cx, |palette, _cx| {
-            palette.delegate.seed_history(history);
-        });
-
-        palette
-    }
-
-    #[gpui::test]
-    async fn test_history_navigation_basic(cx: &mut TestAppContext) {
-        let app_state = init_test(cx);
-        let project = Project::test(app_state.fs.clone(), [], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-        let palette = open_palette_with_history(&workspace, &["backspace", "select all"], cx);
-
-        // Query should be empty initially
-        palette.read_with(cx, |palette, cx| {
-            assert_eq!(palette.query(cx), "");
-        });
-
-        // Press up - should load most recent query "select all"
-        cx.simulate_keystrokes("up");
-        cx.background_executor.run_until_parked();
-        palette.read_with(cx, |palette, cx| {
-            assert_eq!(palette.query(cx), "select all");
-        });
-
-        // Press up again - should load "backspace"
-        cx.simulate_keystrokes("up");
-        cx.background_executor.run_until_parked();
-        palette.read_with(cx, |palette, cx| {
-            assert_eq!(palette.query(cx), "backspace");
-        });
-
-        // Press down - should go back to "select all"
-        cx.simulate_keystrokes("down");
-        cx.background_executor.run_until_parked();
-        palette.read_with(cx, |palette, cx| {
-            assert_eq!(palette.query(cx), "select all");
-        });
-
-        // Press down again - should clear query (exit history mode)
-        cx.simulate_keystrokes("down");
-        cx.background_executor.run_until_parked();
-        palette.read_with(cx, |palette, cx| {
-            assert_eq!(palette.query(cx), "");
-        });
-    }
-
-    #[gpui::test]
-    async fn test_history_mode_exit_on_typing(cx: &mut TestAppContext) {
-        let app_state = init_test(cx);
-        let project = Project::test(app_state.fs.clone(), [], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-        let palette = open_palette_with_history(&workspace, &["backspace"], cx);
-
-        // Press up to enter history mode
-        cx.simulate_keystrokes("up");
-        cx.background_executor.run_until_parked();
-        palette.read_with(cx, |palette, cx| {
-            assert_eq!(palette.query(cx), "backspace");
-        });
-
-        // Type something - should append to the history query
-        cx.simulate_input("x");
-        cx.background_executor.run_until_parked();
-        palette.read_with(cx, |palette, cx| {
-            assert_eq!(palette.query(cx), "backspacex");
-        });
-    }
-
-    #[gpui::test]
-    async fn test_history_navigation_with_suggestions(cx: &mut TestAppContext) {
-        let app_state = init_test(cx);
-        let project = Project::test(app_state.fs.clone(), [], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-        let palette = open_palette_with_history(&workspace, &["editor: close", "editor: open"], cx);
-
-        // Open palette with a query that has multiple matches
-        cx.simulate_input("editor");
-        cx.background_executor.run_until_parked();
-
-        // Should have multiple matches, selected_ix should be 0
-        palette.read_with(cx, |palette, _| {
-            assert!(palette.delegate.matches.len() > 1);
-            assert_eq!(palette.delegate.selected_ix, 0);
-        });
-
-        // Press down - should navigate to next suggestion (not history)
-        cx.simulate_keystrokes("down");
-        cx.background_executor.run_until_parked();
-        palette.read_with(cx, |palette, _| {
-            assert_eq!(palette.delegate.selected_ix, 1);
-        });
-
-        // Press up - should go back to first suggestion
-        cx.simulate_keystrokes("up");
-        cx.background_executor.run_until_parked();
-        palette.read_with(cx, |palette, _| {
-            assert_eq!(palette.delegate.selected_ix, 0);
-        });
-
-        // Press up again at top - should enter history mode and show previous query
-        // that matches the "editor" prefix
-        cx.simulate_keystrokes("up");
-        cx.background_executor.run_until_parked();
-        palette.read_with(cx, |palette, cx| {
-            assert_eq!(palette.query(cx), "editor: open");
-        });
-    }
-
-    #[gpui::test]
-    async fn test_history_prefix_search(cx: &mut TestAppContext) {
-        let app_state = init_test(cx);
-        let project = Project::test(app_state.fs.clone(), [], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-        let palette = open_palette_with_history(
-            &workspace,
-            &["open file", "select all", "select line", "backspace"],
-            cx,
-        );
-
-        // Type "sel" as a prefix
-        cx.simulate_input("sel");
-        cx.background_executor.run_until_parked();
-
-        // Press up - should get "select line" (most recent matching "sel")
-        cx.simulate_keystrokes("up");
-        cx.background_executor.run_until_parked();
-        palette.read_with(cx, |palette, cx| {
-            assert_eq!(palette.query(cx), "select line");
-        });
-
-        // Press up again - should get "select all" (next matching "sel")
-        cx.simulate_keystrokes("up");
-        cx.background_executor.run_until_parked();
-        palette.read_with(cx, |palette, cx| {
-            assert_eq!(palette.query(cx), "select all");
-        });
-
-        // Press up again - should stay at "select all" (no more matches for "sel")
-        cx.simulate_keystrokes("up");
-        cx.background_executor.run_until_parked();
-        palette.read_with(cx, |palette, cx| {
-            assert_eq!(palette.query(cx), "select all");
-        });
-
-        // Press down - should go back to "select line"
-        cx.simulate_keystrokes("down");
-        cx.background_executor.run_until_parked();
-        palette.read_with(cx, |palette, cx| {
-            assert_eq!(palette.query(cx), "select line");
-        });
-
-        // Press down again - should return to original prefix "sel"
-        cx.simulate_keystrokes("down");
-        cx.background_executor.run_until_parked();
-        palette.read_with(cx, |palette, cx| {
-            assert_eq!(palette.query(cx), "sel");
-        });
-    }
-
-    #[gpui::test]
-    async fn test_history_prefix_search_no_matches(cx: &mut TestAppContext) {
-        let app_state = init_test(cx);
-        let project = Project::test(app_state.fs.clone(), [], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-        let palette =
-            open_palette_with_history(&workspace, &["open file", "backspace", "select all"], cx);
-
-        // Type "xyz" as a prefix that doesn't match anything
-        cx.simulate_input("xyz");
-        cx.background_executor.run_until_parked();
-
-        // Press up - should stay at "xyz" (no matches)
-        cx.simulate_keystrokes("up");
-        cx.background_executor.run_until_parked();
-        palette.read_with(cx, |palette, cx| {
-            assert_eq!(palette.query(cx), "xyz");
-        });
-    }
-
-    #[gpui::test]
-    async fn test_history_empty_prefix_searches_all(cx: &mut TestAppContext) {
-        let app_state = init_test(cx);
-        let project = Project::test(app_state.fs.clone(), [], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-        let palette = open_palette_with_history(&workspace, &["alpha", "beta", "gamma"], cx);
-
-        // With empty query, press up - should get "gamma" (most recent)
-        cx.simulate_keystrokes("up");
-        cx.background_executor.run_until_parked();
-        palette.read_with(cx, |palette, cx| {
-            assert_eq!(palette.query(cx), "gamma");
-        });
-
-        // Press up - should get "beta"
-        cx.simulate_keystrokes("up");
-        cx.background_executor.run_until_parked();
-        palette.read_with(cx, |palette, cx| {
-            assert_eq!(palette.query(cx), "beta");
-        });
-
-        // Press up - should get "alpha"
-        cx.simulate_keystrokes("up");
-        cx.background_executor.run_until_parked();
-        palette.read_with(cx, |palette, cx| {
-            assert_eq!(palette.query(cx), "alpha");
-        });
-
-        // Press down - should get "beta"
-        cx.simulate_keystrokes("down");
-        cx.background_executor.run_until_parked();
-        palette.read_with(cx, |palette, cx| {
-            assert_eq!(palette.query(cx), "beta");
-        });
-
-        // Press down - should get "gamma"
-        cx.simulate_keystrokes("down");
-        cx.background_executor.run_until_parked();
-        palette.read_with(cx, |palette, cx| {
-            assert_eq!(palette.query(cx), "gamma");
-        });
-
-        // Press down - should return to empty string (exit history mode)
-        cx.simulate_keystrokes("down");
-        cx.background_executor.run_until_parked();
-        palette.read_with(cx, |palette, cx| {
-            assert_eq!(palette.query(cx), "");
-        });
-    }
-}
diff --git a/crates/command_palette/src/persistence.rs b/crates/command_palette/src/persistence.rs
deleted file mode 100644
index 4556079b4f..0000000000
--- a/crates/command_palette/src/persistence.rs
+++ /dev/null
@@ -1,236 +0,0 @@
-use anyhow::Result;
-use db::{
-    query,
-    sqlez::{
-        bindable::Column, domain::Domain, statement::Statement,
-        thread_safe_connection::ThreadSafeConnection,
-    },
-    sqlez_macros::sql,
-};
-use serde::{Deserialize, Serialize};
-use time::OffsetDateTime;
-
-#[cfg(test)]
-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq)]
-pub(crate) struct SerializedCommandInvocation {
-    pub(crate) command_name: String,
-    pub(crate) user_query: String,
-    pub(crate) last_invoked: OffsetDateTime,
-}
-
-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq)]
-pub(crate) struct SerializedCommandUsage {
-    pub(crate) command_name: String,
-    pub(crate) invocations: u16,
-    pub(crate) last_invoked: OffsetDateTime,
-}
-
-impl Column for SerializedCommandUsage {
-    fn column(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
-        let (command_name, next_index): (String, i32) = Column::column(statement, start_index)?;
-        let (invocations, next_index): (u16, i32) = Column::column(statement, next_index)?;
-        let (last_invoked_raw, next_index): (i64, i32) = Column::column(statement, next_index)?;
-
-        let usage = Self {
-            command_name,
-            invocations,
-            last_invoked: OffsetDateTime::from_unix_timestamp(last_invoked_raw)?,
-        };
-        Ok((usage, next_index))
-    }
-}
-
-#[cfg(test)]
-impl Column for SerializedCommandInvocation {
-    fn column(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
-        let (command_name, next_index): (String, i32) = Column::column(statement, start_index)?;
-        let (user_query, next_index): (String, i32) = Column::column(statement, next_index)?;
-        let (last_invoked_raw, next_index): (i64, i32) = Column::column(statement, next_index)?;
-        let command_invocation = Self {
-            command_name,
-            user_query,
-            last_invoked: OffsetDateTime::from_unix_timestamp(last_invoked_raw)?,
-        };
-        Ok((command_invocation, next_index))
-    }
-}
-
-pub struct CommandPaletteDB(ThreadSafeConnection);
-
-impl Domain for CommandPaletteDB {
-    const NAME: &str = stringify!(CommandPaletteDB);
-    const MIGRATIONS: &[&str] = &[sql!(
-        CREATE TABLE IF NOT EXISTS command_invocations(
-            id INTEGER PRIMARY KEY AUTOINCREMENT,
-            command_name TEXT NOT NULL,
-            user_query TEXT NOT NULL,
-            last_invoked INTEGER DEFAULT (unixepoch())  NOT NULL
-        ) STRICT;
-    )];
-}
-
-db::static_connection!(COMMAND_PALETTE_HISTORY, CommandPaletteDB, []);
-
-impl CommandPaletteDB {
-    pub async fn write_command_invocation(
-        &self,
-        command_name: impl Into<String>,
-        user_query: impl Into<String>,
-    ) -> Result<()> {
-        let command_name = command_name.into();
-        let user_query = user_query.into();
-        log::debug!(
-            "Writing command invocation: command_name={command_name}, user_query={user_query}"
-        );
-        self.write_command_invocation_internal(command_name, user_query)
-            .await
-    }
-
-    #[cfg(test)]
-    query! {
-        pub(crate) fn get_last_invoked(command: &str) -> Result<Option<SerializedCommandInvocation>> {
-            SELECT
-            command_name,
-            user_query,
-            last_invoked FROM command_invocations
-            WHERE command_name=(?)
-            ORDER BY last_invoked DESC
-            LIMIT 1
-        }
-    }
-
-    query! {
-        pub fn get_command_usage(command: &str) -> Result<Option<SerializedCommandUsage>> {
-            SELECT command_name, COUNT(1), MAX(last_invoked)
-            FROM command_invocations
-            WHERE command_name=(?)
-            GROUP BY command_name
-        }
-    }
-
-    query! {
-        async fn write_command_invocation_internal(command_name: String, user_query: String) -> Result<()> {
-            INSERT INTO command_invocations (command_name, user_query) VALUES ((?), (?));
-            DELETE FROM command_invocations WHERE id IN (SELECT MIN(id) FROM command_invocations HAVING COUNT(1) > 1000);
-        }
-    }
-
-    query! {
-        pub fn list_commands_used() -> Result<Vec<SerializedCommandUsage>> {
-            SELECT command_name, COUNT(1), MAX(last_invoked)
-            FROM command_invocations
-            GROUP BY command_name
-            ORDER BY COUNT(1) DESC
-        }
-    }
-
-    query! {
-        pub fn list_recent_queries() -> Result<Vec<String>> {
-            SELECT user_query
-            FROM command_invocations
-            WHERE user_query != ""
-            GROUP BY user_query
-            ORDER BY MAX(last_invoked) ASC
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-
-    use crate::persistence::{CommandPaletteDB, SerializedCommandUsage};
-
-    #[gpui::test]
-    async fn test_saves_and_retrieves_command_invocation() {
-        let db =
-            CommandPaletteDB::open_test_db("test_saves_and_retrieves_command_invocation").await;
-
-        let retrieved_cmd = db.get_last_invoked("editor: backspace").unwrap();
-
-        assert!(retrieved_cmd.is_none());
-
-        db.write_command_invocation("editor: backspace", "")
-            .await
-            .unwrap();
-
-        let retrieved_cmd = db.get_last_invoked("editor: backspace").unwrap();
-
-        assert!(retrieved_cmd.is_some());
-        let retrieved_cmd = retrieved_cmd.expect("is some");
-        assert_eq!(retrieved_cmd.command_name, "editor: backspace".to_string());
-        assert_eq!(retrieved_cmd.user_query, "".to_string());
-    }
-
-    #[gpui::test]
-    async fn test_gets_usage_history() {
-        let db = CommandPaletteDB::open_test_db("test_gets_usage_history").await;
-        db.write_command_invocation("go to line: toggle", "200")
-            .await
-            .unwrap();
-        db.write_command_invocation("go to line: toggle", "201")
-            .await
-            .unwrap();
-
-        let retrieved_cmd = db.get_last_invoked("go to line: toggle").unwrap();
-
-        assert!(retrieved_cmd.is_some());
-        let retrieved_cmd = retrieved_cmd.expect("is some");
-
-        let command_usage = db.get_command_usage("go to line: toggle").unwrap();
-
-        assert!(command_usage.is_some());
-        let command_usage: SerializedCommandUsage = command_usage.expect("is some");
-
-        assert_eq!(command_usage.command_name, "go to line: toggle");
-        assert_eq!(command_usage.invocations, 2);
-        assert_eq!(command_usage.last_invoked, retrieved_cmd.last_invoked);
-    }
-
-    #[gpui::test]
-    async fn test_lists_ordered_by_usage() {
-        let db = CommandPaletteDB::open_test_db("test_lists_ordered_by_usage").await;
-
-        let empty_commands = db.list_commands_used();
-        match &empty_commands {
-            Ok(_) => (),
-            Err(e) => println!("Error: {:?}", e),
-        }
-        assert!(empty_commands.is_ok());
-        assert_eq!(empty_commands.expect("is ok").len(), 0);
-
-        db.write_command_invocation("go to line: toggle", "200")
-            .await
-            .unwrap();
-        db.write_command_invocation("editor: backspace", "")
-            .await
-            .unwrap();
-        db.write_command_invocation("editor: backspace", "")
-            .await
-            .unwrap();
-
-        let commands = db.list_commands_used();
-
-        assert!(commands.is_ok());
-        let commands = commands.expect("is ok");
-        assert_eq!(commands.len(), 2);
-        assert_eq!(commands.as_slice()[0].command_name, "editor: backspace");
-        assert_eq!(commands.as_slice()[0].invocations, 2);
-        assert_eq!(commands.as_slice()[1].command_name, "go to line: toggle");
-        assert_eq!(commands.as_slice()[1].invocations, 1);
-    }
-
-    #[gpui::test]
-    async fn test_handles_max_invocation_entries() {
-        let db = CommandPaletteDB::open_test_db("test_handles_max_invocation_entries").await;
-
-        for i in 1..=1001 {
-            db.write_command_invocation("some-command", &i.to_string())
-                .await
-                .unwrap();
-        }
-        let some_command = db.get_command_usage("some-command").unwrap();
-
-        assert!(some_command.is_some());
-        assert_eq!(some_command.expect("is some").invocations, 1000);
-    }
-}
diff --git a/crates/command_palette_hooks/Cargo.toml b/crates/command_palette_hooks/Cargo.toml
deleted file mode 100644
index 6ba771562d..0000000000
--- a/crates/command_palette_hooks/Cargo.toml
+++ /dev/null
@@ -1,19 +0,0 @@
-[package]
-name = "command_palette_hooks"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/command_palette_hooks.rs"
-doctest = false
-
-[dependencies]
-collections.workspace = true
-derive_more.workspace = true
-gpui.workspace = true
-workspace.workspace = true
diff --git a/crates/command_palette_hooks/LICENSE-GPL b/crates/command_palette_hooks/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/command_palette_hooks/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/command_palette_hooks/src/command_palette_hooks.rs b/crates/command_palette_hooks/src/command_palette_hooks.rs
deleted file mode 100644
index bd8f9375b7..0000000000
--- a/crates/command_palette_hooks/src/command_palette_hooks.rs
+++ /dev/null
@@ -1,153 +0,0 @@
-//! Provides hooks for customizing the behavior of the command palette.
-
-#![deny(missing_docs)]
-
-use std::{any::TypeId, rc::Rc};
-
-use collections::HashSet;
-use derive_more::{Deref, DerefMut};
-use gpui::{Action, App, BorrowAppContext, Global, Task, WeakEntity};
-use workspace::Workspace;
-
-/// Initializes the command palette hooks.
-pub fn init(cx: &mut App) {
-    cx.set_global(GlobalCommandPaletteFilter::default());
-}
-
-/// A filter for the command palette.
-#[derive(Default)]
-pub struct CommandPaletteFilter {
-    hidden_namespaces: HashSet<&'static str>,
-    hidden_action_types: HashSet<TypeId>,
-    /// Actions that have explicitly been shown. These should be shown even if
-    /// they are in a hidden namespace.
-    shown_action_types: HashSet<TypeId>,
-}
-
-#[derive(Deref, DerefMut, Default)]
-struct GlobalCommandPaletteFilter(CommandPaletteFilter);
-
-impl Global for GlobalCommandPaletteFilter {}
-
-impl CommandPaletteFilter {
-    /// Returns the global [`CommandPaletteFilter`], if one is set.
-    pub fn try_global(cx: &App) -> Option<&CommandPaletteFilter> {
-        cx.try_global::<GlobalCommandPaletteFilter>()
-            .map(|filter| &filter.0)
-    }
-
-    /// Returns a mutable reference to the global [`CommandPaletteFilter`].
-    pub fn global_mut(cx: &mut App) -> &mut Self {
-        cx.global_mut::<GlobalCommandPaletteFilter>()
-    }
-
-    /// Updates the global [`CommandPaletteFilter`] using the given closure.
-    pub fn update_global<F>(cx: &mut App, update: F)
-    where
-        F: FnOnce(&mut Self, &mut App),
-    {
-        if cx.has_global::<GlobalCommandPaletteFilter>() {
-            cx.update_global(|this: &mut GlobalCommandPaletteFilter, cx| update(&mut this.0, cx))
-        }
-    }
-
-    /// Returns whether the given [`Action`] is hidden by the filter.
-    pub fn is_hidden(&self, action: &dyn Action) -> bool {
-        let name = action.name();
-        let namespace = name.split("::").next().unwrap_or("malformed action name");
-
-        // If this action has specifically been shown then it should be visible.
-        if self.shown_action_types.contains(&action.type_id()) {
-            return false;
-        }
-
-        self.hidden_namespaces.contains(namespace)
-            || self.hidden_action_types.contains(&action.type_id())
-    }
-
-    /// Hides all actions in the given namespace.
-    pub fn hide_namespace(&mut self, namespace: &'static str) {
-        self.hidden_namespaces.insert(namespace);
-    }
-
-    /// Shows all actions in the given namespace.
-    pub fn show_namespace(&mut self, namespace: &'static str) {
-        self.hidden_namespaces.remove(namespace);
-    }
-
-    /// Hides all actions with the given types.
-    pub fn hide_action_types<'a>(&mut self, action_types: impl IntoIterator<Item = &'a TypeId>) {
-        for action_type in action_types {
-            self.hidden_action_types.insert(*action_type);
-            self.shown_action_types.remove(action_type);
-        }
-    }
-
-    /// Shows all actions with the given types.
-    pub fn show_action_types<'a>(&mut self, action_types: impl IntoIterator<Item = &'a TypeId>) {
-        for action_type in action_types {
-            self.shown_action_types.insert(*action_type);
-            self.hidden_action_types.remove(action_type);
-        }
-    }
-}
-
-/// The result of intercepting a command palette command.
-#[derive(Debug)]
-pub struct CommandInterceptItem {
-    /// The action produced as a result of the interception.
-    pub action: Box<dyn Action>,
-    /// The display string to show in the command palette for this result.
-    pub string: String,
-    /// The character positions in the string that match the query.
-    /// Used for highlighting matched characters in the command palette UI.
-    pub positions: Vec<usize>,
-}
-
-/// The result of intercepting a command palette command.
-#[derive(Default, Debug)]
-pub struct CommandInterceptResult {
-    /// The items
-    pub results: Vec<CommandInterceptItem>,
-    /// Whether or not to continue to show the normal matches
-    pub exclusive: bool,
-}
-
-/// An interceptor for the command palette.
-#[derive(Clone)]
-pub struct GlobalCommandPaletteInterceptor(
-    Rc<dyn Fn(&str, WeakEntity<Workspace>, &mut App) -> Task<CommandInterceptResult>>,
-);
-
-impl Global for GlobalCommandPaletteInterceptor {}
-
-impl GlobalCommandPaletteInterceptor {
-    /// Sets the global interceptor.
-    ///
-    /// This will override the previous interceptor, if it exists.
-    pub fn set(
-        cx: &mut App,
-        interceptor: impl Fn(&str, WeakEntity<Workspace>, &mut App) -> Task<CommandInterceptResult>
-        + 'static,
-    ) {
-        cx.set_global(Self(Rc::new(interceptor)));
-    }
-
-    /// Clears the global interceptor.
-    pub fn clear(cx: &mut App) {
-        if cx.has_global::<Self>() {
-            cx.remove_global::<Self>();
-        }
-    }
-
-    /// Intercepts the given query from the command palette.
-    pub fn intercept(
-        query: &str,
-        workspace: WeakEntity<Workspace>,
-        cx: &mut App,
-    ) -> Option<Task<CommandInterceptResult>> {
-        let interceptor = cx.try_global::<Self>()?;
-        let handler = interceptor.0.clone();
-        Some(handler(query, workspace, cx))
-    }
-}
diff --git a/crates/component/Cargo.toml b/crates/component/Cargo.toml
deleted file mode 100644
index 4ca95cbbbd..0000000000
--- a/crates/component/Cargo.toml
+++ /dev/null
@@ -1,26 +0,0 @@
-[package]
-name = "component"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/component.rs"
-
-[dependencies]
-collections.workspace = true
-gpui.workspace = true
-inventory.workspace = true
-parking_lot.workspace = true
-strum.workspace = true
-theme.workspace = true
-
-[dev-dependencies]
-documented.workspace = true
-
-[features]
-default = []
diff --git a/crates/component/LICENSE-GPL b/crates/component/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/component/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/component/src/component.rs b/crates/component/src/component.rs
deleted file mode 100644
index 8c7b7ea4d7..0000000000
--- a/crates/component/src/component.rs
+++ /dev/null
@@ -1,329 +0,0 @@
-//! # Component
-//!
-//! This module provides the Component trait, which is used to define
-//! components for visual testing and debugging.
-//!
-//! Additionally, it includes layouts for rendering component examples
-//! and example groups, as well as the distributed slice mechanism for
-//! registering components.
-
-mod component_layout;
-
-use std::sync::LazyLock;
-
-pub use component_layout::*;
-
-use collections::HashMap;
-use gpui::{AnyElement, App, SharedString, Window};
-use parking_lot::RwLock;
-use strum::{Display, EnumString};
-
-pub fn components() -> ComponentRegistry {
-    COMPONENT_DATA.read().clone()
-}
-
-pub fn init() {
-    for f in inventory::iter::<ComponentFn>() {
-        (f.0)();
-    }
-}
-
-pub struct ComponentFn(fn());
-
-impl ComponentFn {
-    pub const fn new(f: fn()) -> Self {
-        Self(f)
-    }
-}
-
-inventory::collect!(ComponentFn);
-
-/// Private internals for macros.
-#[doc(hidden)]
-pub mod __private {
-    pub use inventory;
-}
-
-pub fn register_component<T: Component>() {
-    let id = T::id();
-    let metadata = ComponentMetadata {
-        id: id.clone(),
-        description: T::description().map(Into::into),
-        name: SharedString::new_static(T::name()),
-        preview: Some(T::preview),
-        scope: T::scope(),
-        sort_name: SharedString::new_static(T::sort_name()),
-        status: T::status(),
-    };
-
-    let mut data = COMPONENT_DATA.write();
-    data.components.insert(id, metadata);
-}
-
-pub static COMPONENT_DATA: LazyLock<RwLock<ComponentRegistry>> =
-    LazyLock::new(|| RwLock::new(ComponentRegistry::default()));
-
-#[derive(Default, Clone)]
-pub struct ComponentRegistry {
-    components: HashMap<ComponentId, ComponentMetadata>,
-}
-
-impl ComponentRegistry {
-    pub fn previews(&self) -> Vec<&ComponentMetadata> {
-        self.components
-            .values()
-            .filter(|c| c.preview.is_some())
-            .collect()
-    }
-
-    pub fn sorted_previews(&self) -> Vec<ComponentMetadata> {
-        let mut previews: Vec<ComponentMetadata> = self.previews().into_iter().cloned().collect();
-        previews.sort_by_key(|a| a.name());
-        previews
-    }
-
-    pub fn components(&self) -> Vec<&ComponentMetadata> {
-        self.components.values().collect()
-    }
-
-    pub fn sorted_components(&self) -> Vec<ComponentMetadata> {
-        let mut components: Vec<ComponentMetadata> =
-            self.components().into_iter().cloned().collect();
-        components.sort_by_key(|a| a.name());
-        components
-    }
-
-    pub fn component_map(&self) -> HashMap<ComponentId, ComponentMetadata> {
-        self.components.clone()
-    }
-
-    pub fn get(&self, id: &ComponentId) -> Option<&ComponentMetadata> {
-        self.components.get(id)
-    }
-
-    pub fn len(&self) -> usize {
-        self.components.len()
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ComponentId(pub &'static str);
-
-#[derive(Clone)]
-pub struct ComponentMetadata {
-    id: ComponentId,
-    description: Option<SharedString>,
-    name: SharedString,
-    preview: Option<fn(&mut Window, &mut App) -> Option<AnyElement>>,
-    scope: ComponentScope,
-    sort_name: SharedString,
-    status: ComponentStatus,
-}
-
-impl ComponentMetadata {
-    pub fn id(&self) -> ComponentId {
-        self.id.clone()
-    }
-
-    pub fn description(&self) -> Option<SharedString> {
-        self.description.clone()
-    }
-
-    pub fn name(&self) -> SharedString {
-        self.name.clone()
-    }
-
-    pub fn preview(&self) -> Option<fn(&mut Window, &mut App) -> Option<AnyElement>> {
-        self.preview
-    }
-
-    pub fn scope(&self) -> ComponentScope {
-        self.scope.clone()
-    }
-
-    pub fn sort_name(&self) -> SharedString {
-        self.sort_name.clone()
-    }
-
-    pub fn scopeless_name(&self) -> SharedString {
-        self.name
-            .clone()
-            .split("::")
-            .last()
-            .unwrap_or(&self.name)
-            .to_string()
-            .into()
-    }
-
-    pub fn status(&self) -> ComponentStatus {
-        self.status.clone()
-    }
-}
-
-/// Implement this trait to define a UI component. This will allow you to
-/// derive `RegisterComponent` on it, in turn allowing you to preview the
-/// contents of the preview fn in `workspace: open component preview`.
-///
-/// This can be useful for visual debugging and testing, documenting UI
-/// patterns, or simply showing all the variants of a component.
-///
-/// Generally you will want to implement at least `scope` and `preview`
-/// from this trait, so you can preview the component, and it will show up
-/// in a section that makes sense.
-pub trait Component {
-    /// The component's unique identifier.
-    ///
-    /// Used to access previews, or state for more
-    /// complex, stateful components.
-    fn id() -> ComponentId {
-        ComponentId(Self::name())
-    }
-    /// Returns the scope of the component.
-    ///
-    /// This scope is used to determine how components and
-    /// their previews are displayed and organized.
-    fn scope() -> ComponentScope {
-        ComponentScope::None
-    }
-    /// The ready status of this component.
-    ///
-    /// Use this to mark when components are:
-    /// - `WorkInProgress`: Still being designed or are partially implemented.
-    /// - `EngineeringReady`: Ready to be implemented.
-    /// - `Deprecated`: No longer recommended for use.
-    ///
-    /// Defaults to [`Live`](ComponentStatus::Live).
-    fn status() -> ComponentStatus {
-        ComponentStatus::Live
-    }
-    /// The name of the component.
-    ///
-    /// This name is used to identify the component
-    /// and is usually derived from the component's type.
-    fn name() -> &'static str {
-        std::any::type_name::<Self>()
-    }
-    /// Returns a name that the component should be sorted by.
-    ///
-    /// Implement this if the component should be sorted in an alternate order than its name.
-    ///
-    /// Example:
-    ///
-    /// For example, to group related components together when sorted:
-    ///
-    /// - Button      -> ButtonA
-    /// - IconButton  -> ButtonBIcon
-    /// - ToggleButton -> ButtonCToggle
-    ///
-    /// This naming scheme keeps these components together and allows them to /// be sorted in a logical order.
-    fn sort_name() -> &'static str {
-        Self::name()
-    }
-    /// An optional description of the component.
-    ///
-    /// This will be displayed in the component's preview. To show a
-    /// component's doc comment as it's description, derive `Documented`.
-    ///
-    /// Example:
-    ///
-    /// ```
-    /// use documented::Documented;
-    ///
-    /// /// This is a doc comment.
-    /// #[derive(Documented)]
-    /// struct MyComponent;
-    ///
-    /// impl MyComponent {
-    ///     fn description() -> Option<&'static str> {
-    ///         Some(Self::DOCS)
-    ///     }
-    /// }
-    /// ```
-    ///
-    /// This will result in "This is a doc comment." being passed
-    /// to the component's description.
-    fn description() -> Option<&'static str> {
-        None
-    }
-    /// The component's preview.
-    ///
-    /// An element returned here will be shown in the component's preview.
-    ///
-    /// Useful component helpers:
-    /// - [`component::single_example`]
-    /// - [`component::component_group`]
-    /// - [`component::component_group_with_title`]
-    ///
-    /// Note: Any arbitrary element can be returned here.
-    ///
-    /// This is useful for displaying related UI to the component you are
-    /// trying to preview, such as a button that opens a modal or shows a
-    /// tooltip on hover, or a grid of icons showcasing all the icons available.
-    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
-        None
-    }
-}
-
-/// The ready status of this component.
-///
-/// Use this to mark when components are:
-/// - `WorkInProgress`: Still being designed or are partially implemented.
-/// - `EngineeringReady`: Ready to be implemented.
-/// - `Deprecated`: No longer recommended for use.
-///
-/// Defaults to [`Live`](ComponentStatus::Live).
-#[derive(Debug, Clone, PartialEq, Eq, Hash, Display, EnumString)]
-pub enum ComponentStatus {
-    #[strum(serialize = "Work In Progress")]
-    WorkInProgress,
-    #[strum(serialize = "Ready To Build")]
-    EngineeringReady,
-    Live,
-    Deprecated,
-}
-
-impl ComponentStatus {
-    pub fn description(&self) -> &str {
-        match self {
-            ComponentStatus::WorkInProgress => {
-                "These components are still being designed or refined. They shouldn't be used in the app yet."
-            }
-            ComponentStatus::EngineeringReady => {
-                "These components are design complete or partially implemented, and are ready for an engineer to complete their implementation."
-            }
-            ComponentStatus::Live => "These components are ready for use in the app.",
-            ComponentStatus::Deprecated => {
-                "These components are no longer recommended for use in the app, and may be removed in a future release."
-            }
-        }
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Hash, Display, EnumString)]
-pub enum ComponentScope {
-    Agent,
-    Collaboration,
-    #[strum(serialize = "Data Display")]
-    DataDisplay,
-    Editor,
-    #[strum(serialize = "Images & Icons")]
-    Images,
-    #[strum(serialize = "Forms & Input")]
-    Input,
-    #[strum(serialize = "Layout & Structure")]
-    Layout,
-    #[strum(serialize = "Loading & Progress")]
-    Loading,
-    Navigation,
-    #[strum(serialize = "Unsorted")]
-    None,
-    Notification,
-    #[strum(serialize = "Overlays & Layering")]
-    Overlays,
-    Onboarding,
-    Status,
-    Typography,
-    Utilities,
-    #[strum(serialize = "Version Control")]
-    VersionControl,
-}
diff --git a/crates/component/src/component_layout.rs b/crates/component/src/component_layout.rs
deleted file mode 100644
index a840d520a6..0000000000
--- a/crates/component/src/component_layout.rs
+++ /dev/null
@@ -1,205 +0,0 @@
-use gpui::{
-    AnyElement, App, IntoElement, Pixels, RenderOnce, SharedString, Window, div, pattern_slash,
-    prelude::*, px, rems,
-};
-use theme::ActiveTheme;
-
-/// A single example of a component.
-#[derive(IntoElement)]
-pub struct ComponentExample {
-    pub variant_name: SharedString,
-    pub description: Option<SharedString>,
-    pub element: AnyElement,
-    pub width: Option<Pixels>,
-}
-
-impl RenderOnce for ComponentExample {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        div()
-            .pt_2()
-            .map(|this| {
-                if let Some(width) = self.width {
-                    this.w(width)
-                } else {
-                    this.w_full()
-                }
-            })
-            .flex()
-            .flex_col()
-            .gap_3()
-            .child(
-                div()
-                    .flex()
-                    .flex_col()
-                    .child(
-                        div()
-                            .child(self.variant_name.clone())
-                            .text_size(rems(1.0))
-                            .text_color(cx.theme().colors().text),
-                    )
-                    .when_some(self.description, |this, description| {
-                        this.child(
-                            div()
-                                .text_size(rems(0.875))
-                                .text_color(cx.theme().colors().text_muted)
-                                .child(description),
-                        )
-                    }),
-            )
-            .child(
-                div()
-                    .min_h(px(100.))
-                    .w_full()
-                    .p_8()
-                    .flex()
-                    .items_center()
-                    .justify_center()
-                    .rounded_xl()
-                    .border_1()
-                    .border_color(cx.theme().colors().border.opacity(0.5))
-                    .bg(pattern_slash(
-                        cx.theme().colors().surface_background.opacity(0.25),
-                        12.0,
-                        12.0,
-                    ))
-                    .child(self.element),
-            )
-            .into_any_element()
-    }
-}
-
-impl ComponentExample {
-    pub fn new(variant_name: impl Into<SharedString>, element: AnyElement) -> Self {
-        Self {
-            variant_name: variant_name.into(),
-            element,
-            description: None,
-            width: None,
-        }
-    }
-
-    pub fn description(mut self, description: impl Into<SharedString>) -> Self {
-        self.description = Some(description.into());
-        self
-    }
-
-    pub fn width(mut self, width: Pixels) -> Self {
-        self.width = Some(width);
-        self
-    }
-}
-
-/// A group of component examples.
-#[derive(IntoElement)]
-pub struct ComponentExampleGroup {
-    pub title: Option<SharedString>,
-    pub examples: Vec<ComponentExample>,
-    pub width: Option<Pixels>,
-    pub grow: bool,
-    pub vertical: bool,
-}
-
-impl RenderOnce for ComponentExampleGroup {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        div()
-            .flex_col()
-            .text_sm()
-            .text_color(cx.theme().colors().text_muted)
-            .map(|this| {
-                if let Some(width) = self.width {
-                    this.w(width)
-                } else {
-                    this.w_full()
-                }
-            })
-            .when_some(self.title, |this, title| {
-                this.gap_4().child(
-                    div()
-                        .flex()
-                        .items_center()
-                        .gap_3()
-                        .mt_4()
-                        .mb_1()
-                        .child(
-                            div()
-                                .flex_none()
-                                .text_size(px(10.))
-                                .child(title.to_uppercase()),
-                        )
-                        .child(
-                            div()
-                                .h_px()
-                                .w_full()
-                                .flex_1()
-                                .bg(cx.theme().colors().border),
-                        ),
-                )
-            })
-            .child(
-                div()
-                    .flex()
-                    .flex_col()
-                    .items_start()
-                    .w_full()
-                    .gap_6()
-                    .children(self.examples)
-                    .into_any_element(),
-            )
-            .into_any_element()
-    }
-}
-
-impl ComponentExampleGroup {
-    pub fn new(examples: Vec<ComponentExample>) -> Self {
-        Self {
-            title: None,
-            examples,
-            width: None,
-            grow: false,
-            vertical: false,
-        }
-    }
-    pub fn with_title(title: impl Into<SharedString>, examples: Vec<ComponentExample>) -> Self {
-        Self {
-            title: Some(title.into()),
-            examples,
-            width: None,
-            grow: false,
-            vertical: false,
-        }
-    }
-    pub fn width(mut self, width: Pixels) -> Self {
-        self.width = Some(width);
-        self
-    }
-    pub fn grow(mut self) -> Self {
-        self.grow = true;
-        self
-    }
-    pub fn vertical(mut self) -> Self {
-        self.vertical = true;
-        self
-    }
-}
-
-pub fn single_example(
-    variant_name: impl Into<SharedString>,
-    example: AnyElement,
-) -> ComponentExample {
-    ComponentExample::new(variant_name, example)
-}
-
-pub fn empty_example(variant_name: impl Into<SharedString>) -> ComponentExample {
-    ComponentExample::new(variant_name, div().w_full().text_center().items_center().text_xs().opacity(0.4).child("This space is intentionally left blank. It indicates a case that should render nothing.").into_any_element())
-}
-
-pub fn example_group(examples: Vec<ComponentExample>) -> ComponentExampleGroup {
-    ComponentExampleGroup::new(examples)
-}
-
-pub fn example_group_with_title(
-    title: impl Into<SharedString>,
-    examples: Vec<ComponentExample>,
-) -> ComponentExampleGroup {
-    ComponentExampleGroup::with_title(title, examples)
-}
diff --git a/crates/context_server/Cargo.toml b/crates/context_server/Cargo.toml
deleted file mode 100644
index cb48b7e6f7..0000000000
--- a/crates/context_server/Cargo.toml
+++ /dev/null
@@ -1,39 +0,0 @@
-[package]
-name = "context_server"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/context_server.rs"
-
-[features]
-test-support = ["gpui/test-support"]
-
-[dependencies]
-anyhow.workspace = true
-async-trait.workspace = true
-collections.workspace = true
-futures.workspace = true
-gpui.workspace = true
-http_client = { workspace = true, features = ["test-support"] }
-log.workspace = true
-net.workspace = true
-parking_lot.workspace = true
-postage.workspace = true
-schemars.workspace = true
-serde_json.workspace = true
-serde.workspace = true
-settings.workspace = true
-smol.workspace = true
-tempfile.workspace = true
-url = { workspace = true, features = ["serde"] }
-util.workspace = true
-terminal.workspace = true
-
-[dev-dependencies]
-gpui = { workspace = true, features = ["test-support"] }
diff --git a/crates/context_server/LICENSE-GPL b/crates/context_server/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/context_server/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/context_server/src/client.rs b/crates/context_server/src/client.rs
deleted file mode 100644
index f891e96250..0000000000
--- a/crates/context_server/src/client.rs
+++ /dev/null
@@ -1,487 +0,0 @@
-use anyhow::{Context as _, Result, anyhow};
-use collections::HashMap;
-use futures::{FutureExt, StreamExt, channel::oneshot, future, select};
-use gpui::{AppContext as _, AsyncApp, BackgroundExecutor, Task};
-use parking_lot::Mutex;
-use postage::barrier;
-use serde::{Deserialize, Serialize, de::DeserializeOwned};
-use serde_json::{Value, value::RawValue};
-use smol::channel;
-use std::{
-    fmt,
-    path::PathBuf,
-    pin::pin,
-    sync::{
-        Arc,
-        atomic::{AtomicI32, Ordering::SeqCst},
-    },
-    time::{Duration, Instant},
-};
-use util::{ResultExt, TryFutureExt};
-
-use crate::{
-    transport::{StdioTransport, Transport},
-    types::{CancelledParams, ClientNotification, Notification as _, notifications::Cancelled},
-};
-
-const JSON_RPC_VERSION: &str = "2.0";
-const DEFAULT_REQUEST_TIMEOUT: Duration = Duration::from_secs(60);
-
-// Standard JSON-RPC error codes
-pub const PARSE_ERROR: i32 = -32700;
-pub const INVALID_REQUEST: i32 = -32600;
-pub const METHOD_NOT_FOUND: i32 = -32601;
-pub const INVALID_PARAMS: i32 = -32602;
-pub const INTERNAL_ERROR: i32 = -32603;
-
-type ResponseHandler = Box<dyn Send + FnOnce(Result<String, Error>)>;
-type NotificationHandler = Box<dyn Send + FnMut(Value, AsyncApp)>;
-type RequestHandler = Box<dyn Send + FnMut(RequestId, &RawValue, AsyncApp)>;
-
-#[derive(Debug, Clone, Eq, PartialEq, Hash, Serialize, Deserialize)]
-#[serde(untagged)]
-pub enum RequestId {
-    Int(i32),
-    Str(String),
-}
-
-pub(crate) struct Client {
-    server_id: ContextServerId,
-    next_id: AtomicI32,
-    outbound_tx: channel::Sender<String>,
-    name: Arc<str>,
-    notification_handlers: Arc<Mutex<HashMap<&'static str, NotificationHandler>>>,
-    response_handlers: Arc<Mutex<Option<HashMap<RequestId, ResponseHandler>>>>,
-    #[allow(clippy::type_complexity)]
-    #[allow(dead_code)]
-    io_tasks: Mutex<Option<(Task<Option<()>>, Task<Option<()>>)>>,
-    #[allow(dead_code)]
-    output_done_rx: Mutex<Option<barrier::Receiver>>,
-    executor: BackgroundExecutor,
-    #[allow(dead_code)]
-    transport: Arc<dyn Transport>,
-    request_timeout: Option<Duration>,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-#[repr(transparent)]
-pub(crate) struct ContextServerId(pub Arc<str>);
-
-fn is_null_value<T: Serialize>(value: &T) -> bool {
-    matches!(serde_json::to_value(value), Ok(Value::Null))
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct Request<'a, T> {
-    pub jsonrpc: &'static str,
-    pub id: RequestId,
-    pub method: &'a str,
-    #[serde(skip_serializing_if = "is_null_value")]
-    pub params: T,
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct AnyRequest<'a> {
-    pub jsonrpc: &'a str,
-    pub id: RequestId,
-    pub method: &'a str,
-    #[serde(skip_serializing_if = "is_null_value")]
-    pub params: Option<&'a RawValue>,
-}
-
-#[derive(Serialize, Deserialize)]
-struct AnyResponse<'a> {
-    jsonrpc: &'a str,
-    id: RequestId,
-    #[serde(default)]
-    error: Option<Error>,
-    #[serde(borrow)]
-    result: Option<&'a RawValue>,
-}
-
-#[derive(Serialize, Deserialize)]
-#[allow(dead_code)]
-pub(crate) struct Response<T> {
-    pub jsonrpc: &'static str,
-    pub id: RequestId,
-    #[serde(flatten)]
-    pub value: CspResult<T>,
-}
-
-#[derive(Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub(crate) enum CspResult<T> {
-    #[serde(rename = "result")]
-    Ok(Option<T>),
-    #[allow(dead_code)]
-    Error(Option<Error>),
-}
-
-#[derive(Serialize, Deserialize)]
-struct Notification<'a, T> {
-    jsonrpc: &'static str,
-    #[serde(borrow)]
-    method: &'a str,
-    params: T,
-}
-
-#[derive(Debug, Clone, Deserialize)]
-struct AnyNotification<'a> {
-    #[expect(
-        unused,
-        reason = "Part of the JSON-RPC protocol - we expect the field to be present in a valid JSON-RPC notification"
-    )]
-    jsonrpc: &'a str,
-    method: String,
-    #[serde(default)]
-    params: Option<Value>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub(crate) struct Error {
-    pub message: String,
-    pub code: i32,
-}
-
-#[derive(Debug, Clone, Deserialize)]
-pub struct ModelContextServerBinary {
-    pub executable: PathBuf,
-    pub args: Vec<String>,
-    pub env: Option<HashMap<String, String>>,
-    pub timeout: Option<u64>,
-}
-
-impl Client {
-    /// Creates a new Client instance for a context server.
-    ///
-    /// This function initializes a new Client by spawning a child process for the context server,
-    /// setting up communication channels, and initializing handlers for input/output operations.
-    /// It takes a server ID, binary information, and an async app context as input.
-    pub fn stdio(
-        server_id: ContextServerId,
-        binary: ModelContextServerBinary,
-        working_directory: &Option<PathBuf>,
-        cx: AsyncApp,
-    ) -> Result<Self> {
-        log::debug!(
-            "starting context server (executable={:?}, args={:?})",
-            binary.executable,
-            &binary.args
-        );
-
-        let server_name = binary
-            .executable
-            .file_name()
-            .map(|name| name.to_string_lossy().into_owned())
-            .unwrap_or_else(String::new);
-
-        let timeout = binary.timeout.map(Duration::from_millis);
-        let transport = Arc::new(StdioTransport::new(binary, working_directory, &cx)?);
-        Self::new(server_id, server_name.into(), transport, timeout, cx)
-    }
-
-    /// Creates a new Client instance for a context server.
-    pub fn new(
-        server_id: ContextServerId,
-        server_name: Arc<str>,
-        transport: Arc<dyn Transport>,
-        request_timeout: Option<Duration>,
-        cx: AsyncApp,
-    ) -> Result<Self> {
-        let (outbound_tx, outbound_rx) = channel::unbounded::<String>();
-        let (output_done_tx, output_done_rx) = barrier::channel();
-
-        let notification_handlers =
-            Arc::new(Mutex::new(HashMap::<_, NotificationHandler>::default()));
-        let response_handlers =
-            Arc::new(Mutex::new(Some(HashMap::<_, ResponseHandler>::default())));
-        let request_handlers = Arc::new(Mutex::new(HashMap::<_, RequestHandler>::default()));
-
-        let receive_input_task = cx.spawn({
-            let notification_handlers = notification_handlers.clone();
-            let response_handlers = response_handlers.clone();
-            let request_handlers = request_handlers.clone();
-            let transport = transport.clone();
-            async move |cx| {
-                Self::handle_input(
-                    transport,
-                    notification_handlers,
-                    request_handlers,
-                    response_handlers,
-                    cx,
-                )
-                .log_err()
-                .await
-            }
-        });
-        let receive_err_task = cx.spawn({
-            let transport = transport.clone();
-            async move |_| Self::handle_err(transport).log_err().await
-        });
-        let input_task = cx.spawn(async move |_| {
-            let (input, err) = futures::join!(receive_input_task, receive_err_task);
-            input.or(err)
-        });
-
-        let output_task = cx.background_spawn({
-            let transport = transport.clone();
-            Self::handle_output(
-                transport,
-                outbound_rx,
-                output_done_tx,
-                response_handlers.clone(),
-            )
-            .log_err()
-        });
-
-        Ok(Self {
-            server_id,
-            notification_handlers,
-            response_handlers,
-            name: server_name,
-            next_id: Default::default(),
-            outbound_tx,
-            executor: cx.background_executor().clone(),
-            io_tasks: Mutex::new(Some((input_task, output_task))),
-            output_done_rx: Mutex::new(Some(output_done_rx)),
-            transport,
-            request_timeout,
-        })
-    }
-
-    /// Handles input from the server's stdout.
-    ///
-    /// This function continuously reads lines from the provided stdout stream,
-    /// parses them as JSON-RPC responses or notifications, and dispatches them
-    /// to the appropriate handlers. It processes both responses (which are matched
-    /// to pending requests) and notifications (which trigger registered handlers).
-    async fn handle_input(
-        transport: Arc<dyn Transport>,
-        notification_handlers: Arc<Mutex<HashMap<&'static str, NotificationHandler>>>,
-        request_handlers: Arc<Mutex<HashMap<&'static str, RequestHandler>>>,
-        response_handlers: Arc<Mutex<Option<HashMap<RequestId, ResponseHandler>>>>,
-        cx: &mut AsyncApp,
-    ) -> anyhow::Result<()> {
-        let mut receiver = transport.receive();
-
-        while let Some(message) = receiver.next().await {
-            log::trace!("recv: {}", &message);
-            if let Ok(request) = serde_json::from_str::<AnyRequest>(&message) {
-                let mut request_handlers = request_handlers.lock();
-                if let Some(handler) = request_handlers.get_mut(request.method) {
-                    handler(
-                        request.id,
-                        request.params.unwrap_or(RawValue::NULL),
-                        cx.clone(),
-                    );
-                }
-            } else if let Ok(response) = serde_json::from_str::<AnyResponse>(&message) {
-                if let Some(handlers) = response_handlers.lock().as_mut()
-                    && let Some(handler) = handlers.remove(&response.id)
-                {
-                    handler(Ok(message.to_string()));
-                }
-            } else if let Ok(notification) = serde_json::from_str::<AnyNotification>(&message) {
-                let mut notification_handlers = notification_handlers.lock();
-                if let Some(handler) = notification_handlers.get_mut(notification.method.as_str()) {
-                    handler(notification.params.unwrap_or(Value::Null), cx.clone());
-                }
-            } else {
-                log::error!("Unhandled JSON from context_server: {}", message);
-            }
-        }
-
-        smol::future::yield_now().await;
-
-        Ok(())
-    }
-
-    /// Handles the stderr output from the context server.
-    /// Continuously reads and logs any error messages from the server.
-    async fn handle_err(transport: Arc<dyn Transport>) -> anyhow::Result<()> {
-        while let Some(err) = transport.receive_err().next().await {
-            log::debug!("context server stderr: {}", err.trim());
-        }
-
-        Ok(())
-    }
-
-    /// Handles the output to the context server's stdin.
-    /// This function continuously receives messages from the outbound channel,
-    /// writes them to the server's stdin, and manages the lifecycle of response handlers.
-    async fn handle_output(
-        transport: Arc<dyn Transport>,
-        outbound_rx: channel::Receiver<String>,
-        output_done_tx: barrier::Sender,
-        response_handlers: Arc<Mutex<Option<HashMap<RequestId, ResponseHandler>>>>,
-    ) -> anyhow::Result<()> {
-        let _clear_response_handlers = util::defer({
-            let response_handlers = response_handlers.clone();
-            move || {
-                response_handlers.lock().take();
-            }
-        });
-        while let Ok(message) = outbound_rx.recv().await {
-            log::trace!("outgoing message: {}", message);
-            transport.send(message).await?;
-        }
-        drop(output_done_tx);
-        Ok(())
-    }
-
-    /// Sends a JSON-RPC request to the context server and waits for a response.
-    /// This function handles serialization, deserialization, timeout, and error handling.
-    pub async fn request<T: DeserializeOwned>(
-        &self,
-        method: &str,
-        params: impl Serialize,
-    ) -> Result<T> {
-        self.request_with(
-            method,
-            params,
-            None,
-            self.request_timeout.or(Some(DEFAULT_REQUEST_TIMEOUT)),
-        )
-        .await
-    }
-
-    pub async fn request_with<T: DeserializeOwned>(
-        &self,
-        method: &str,
-        params: impl Serialize,
-        cancel_rx: Option<oneshot::Receiver<()>>,
-        timeout: Option<Duration>,
-    ) -> Result<T> {
-        let id = self.next_id.fetch_add(1, SeqCst);
-        let request = serde_json::to_string(&Request {
-            jsonrpc: JSON_RPC_VERSION,
-            id: RequestId::Int(id),
-            method,
-            params,
-        })
-        .unwrap();
-
-        let (tx, rx) = oneshot::channel();
-        let handle_response = self
-            .response_handlers
-            .lock()
-            .as_mut()
-            .context("server shut down")
-            .map(|handlers| {
-                handlers.insert(
-                    RequestId::Int(id),
-                    Box::new(move |result| {
-                        let _ = tx.send(result);
-                    }),
-                );
-            });
-
-        let send = self
-            .outbound_tx
-            .try_send(request)
-            .context("failed to write to context server's stdin");
-
-        let executor = self.executor.clone();
-        let started = Instant::now();
-        handle_response?;
-        send?;
-
-        let mut timeout_fut = pin!(
-            match timeout {
-                Some(timeout) => future::Either::Left(executor.timer(timeout)),
-                None => future::Either::Right(future::pending()),
-            }
-            .fuse()
-        );
-        let mut cancel_fut = pin!(
-            match cancel_rx {
-                Some(rx) => future::Either::Left(async {
-                    rx.await.log_err();
-                }),
-                None => future::Either::Right(future::pending()),
-            }
-            .fuse()
-        );
-
-        select! {
-            response = rx.fuse() => {
-                let elapsed = started.elapsed();
-                log::trace!("took {elapsed:?} to receive response to {method:?} id {id}");
-                match response? {
-                    Ok(response) => {
-                        let parsed: AnyResponse = serde_json::from_str(&response)?;
-                        if let Some(error) = parsed.error {
-                            Err(anyhow!(error.message))
-                        } else if let Some(result) = parsed.result {
-                            Ok(serde_json::from_str(result.get())?)
-                        } else {
-                            anyhow::bail!("Invalid response: no result or error");
-                        }
-                    }
-                    Err(_) => anyhow::bail!("cancelled")
-                }
-            }
-            _ = cancel_fut => {
-                self.notify(
-                    Cancelled::METHOD,
-                    ClientNotification::Cancelled(CancelledParams {
-                        request_id: RequestId::Int(id),
-                        reason: None
-                    })
-                ).log_err();
-                anyhow::bail!(RequestCanceled)
-            }
-            _ = timeout_fut => {
-                log::error!("cancelled csp request task for {method:?} id {id} which took over {:?}", timeout.unwrap());
-                anyhow::bail!("Context server request timeout");
-            }
-        }
-    }
-
-    /// Sends a notification to the context server without expecting a response.
-    /// This function serializes the notification and sends it through the outbound channel.
-    pub fn notify(&self, method: &str, params: impl Serialize) -> Result<()> {
-        let notification = serde_json::to_string(&Notification {
-            jsonrpc: JSON_RPC_VERSION,
-            method,
-            params,
-        })
-        .unwrap();
-        self.outbound_tx.try_send(notification)?;
-        Ok(())
-    }
-
-    pub fn on_notification(
-        &self,
-        method: &'static str,
-        f: Box<dyn 'static + Send + FnMut(Value, AsyncApp)>,
-    ) {
-        self.notification_handlers.lock().insert(method, f);
-    }
-}
-
-#[derive(Debug)]
-pub struct RequestCanceled;
-
-impl std::error::Error for RequestCanceled {}
-
-impl std::fmt::Display for RequestCanceled {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.write_str("Context server request was canceled")
-    }
-}
-
-impl fmt::Display for ContextServerId {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        self.0.fmt(f)
-    }
-}
-
-impl fmt::Debug for Client {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("Context Server Client")
-            .field("id", &self.server_id.0)
-            .field("name", &self.name)
-            .finish_non_exhaustive()
-    }
-}
diff --git a/crates/context_server/src/context_server.rs b/crates/context_server/src/context_server.rs
deleted file mode 100644
index 553e845df8..0000000000
--- a/crates/context_server/src/context_server.rs
+++ /dev/null
@@ -1,164 +0,0 @@
-pub mod client;
-pub mod listener;
-pub mod protocol;
-#[cfg(any(test, feature = "test-support"))]
-pub mod test;
-pub mod transport;
-pub mod types;
-
-use collections::HashMap;
-use http_client::HttpClient;
-use std::path::Path;
-use std::sync::Arc;
-use std::{fmt::Display, path::PathBuf};
-
-use anyhow::Result;
-use client::Client;
-use gpui::AsyncApp;
-use parking_lot::RwLock;
-pub use settings::ContextServerCommand;
-use url::Url;
-
-use crate::transport::HttpTransport;
-
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ContextServerId(pub Arc<str>);
-
-impl Display for ContextServerId {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
-enum ContextServerTransport {
-    Stdio(ContextServerCommand, Option<PathBuf>),
-    Custom(Arc<dyn crate::transport::Transport>),
-}
-
-pub struct ContextServer {
-    id: ContextServerId,
-    client: RwLock<Option<Arc<crate::protocol::InitializedContextServerProtocol>>>,
-    configuration: ContextServerTransport,
-}
-
-impl ContextServer {
-    pub fn stdio(
-        id: ContextServerId,
-        command: ContextServerCommand,
-        working_directory: Option<Arc<Path>>,
-    ) -> Self {
-        Self {
-            id,
-            client: RwLock::new(None),
-            configuration: ContextServerTransport::Stdio(
-                command,
-                working_directory.map(|directory| directory.to_path_buf()),
-            ),
-        }
-    }
-
-    pub fn http(
-        id: ContextServerId,
-        endpoint: &Url,
-        headers: HashMap<String, String>,
-        http_client: Arc<dyn HttpClient>,
-        executor: gpui::BackgroundExecutor,
-    ) -> Result<Self> {
-        let transport = match endpoint.scheme() {
-            "http" | "https" => {
-                log::info!("Using HTTP transport for {}", endpoint);
-                let transport =
-                    HttpTransport::new(http_client, endpoint.to_string(), headers, executor);
-                Arc::new(transport) as _
-            }
-            _ => anyhow::bail!("unsupported MCP url scheme {}", endpoint.scheme()),
-        };
-        Ok(Self::new(id, transport))
-    }
-
-    pub fn new(id: ContextServerId, transport: Arc<dyn crate::transport::Transport>) -> Self {
-        Self {
-            id,
-            client: RwLock::new(None),
-            configuration: ContextServerTransport::Custom(transport),
-        }
-    }
-
-    pub fn id(&self) -> ContextServerId {
-        self.id.clone()
-    }
-
-    pub fn client(&self) -> Option<Arc<crate::protocol::InitializedContextServerProtocol>> {
-        self.client.read().clone()
-    }
-
-    pub async fn start(&self, cx: &AsyncApp) -> Result<()> {
-        self.initialize(self.new_client(cx)?).await
-    }
-
-    /// Starts the context server, making sure handlers are registered before initialization happens
-    pub async fn start_with_handlers(
-        &self,
-        notification_handlers: Vec<(
-            &'static str,
-            Box<dyn 'static + Send + FnMut(serde_json::Value, AsyncApp)>,
-        )>,
-        cx: &AsyncApp,
-    ) -> Result<()> {
-        let client = self.new_client(cx)?;
-        for (method, handler) in notification_handlers {
-            client.on_notification(method, handler);
-        }
-        self.initialize(client).await
-    }
-
-    fn new_client(&self, cx: &AsyncApp) -> Result<Client> {
-        Ok(match &self.configuration {
-            ContextServerTransport::Stdio(command, working_directory) => Client::stdio(
-                client::ContextServerId(self.id.0.clone()),
-                client::ModelContextServerBinary {
-                    executable: Path::new(&command.path).to_path_buf(),
-                    args: command.args.clone(),
-                    env: command.env.clone(),
-                    timeout: command.timeout,
-                },
-                working_directory,
-                cx.clone(),
-            )?,
-            ContextServerTransport::Custom(transport) => Client::new(
-                client::ContextServerId(self.id.0.clone()),
-                self.id().0,
-                transport.clone(),
-                None,
-                cx.clone(),
-            )?,
-        })
-    }
-
-    async fn initialize(&self, client: Client) -> Result<()> {
-        log::debug!("starting context server {}", self.id);
-        let protocol = crate::protocol::ModelContextProtocol::new(client);
-        let client_info = types::Implementation {
-            name: "Zed".to_string(),
-            version: env!("CARGO_PKG_VERSION").to_string(),
-        };
-        let initialized_protocol = protocol.initialize(client_info).await?;
-
-        log::debug!(
-            "context server {} initialized: {:?}",
-            self.id,
-            initialized_protocol.initialize,
-        );
-
-        *self.client.write() = Some(Arc::new(initialized_protocol));
-        Ok(())
-    }
-
-    pub fn stop(&self) -> Result<()> {
-        let mut client = self.client.write();
-        if let Some(protocol) = client.take() {
-            drop(protocol);
-        }
-        Ok(())
-    }
-}
diff --git a/crates/context_server/src/listener.rs b/crates/context_server/src/listener.rs
deleted file mode 100644
index b71d59d760..0000000000
--- a/crates/context_server/src/listener.rs
+++ /dev/null
@@ -1,440 +0,0 @@
-use ::serde::{Deserialize, Serialize};
-use anyhow::{Context as _, Result};
-use collections::HashMap;
-use futures::{
-    AsyncBufReadExt, AsyncRead, AsyncWrite, AsyncWriteExt, FutureExt,
-    channel::mpsc::{UnboundedReceiver, UnboundedSender, unbounded},
-    io::BufReader,
-    select_biased,
-};
-use gpui::{App, AppContext, AsyncApp, Task};
-use net::async_net::{UnixListener, UnixStream};
-use schemars::JsonSchema;
-use serde::de::DeserializeOwned;
-use serde_json::{json, value::RawValue};
-use smol::stream::StreamExt;
-use std::{
-    any::TypeId,
-    cell::RefCell,
-    path::{Path, PathBuf},
-    rc::Rc,
-};
-use util::ResultExt;
-
-use crate::{
-    client::{CspResult, RequestId, Response},
-    types::{
-        CallToolParams, CallToolResponse, ListToolsResponse, Request, Tool, ToolAnnotations,
-        ToolResponseContent,
-        requests::{CallTool, ListTools},
-    },
-};
-
-pub struct McpServer {
-    socket_path: PathBuf,
-    tools: Rc<RefCell<HashMap<&'static str, RegisteredTool>>>,
-    handlers: Rc<RefCell<HashMap<&'static str, RequestHandler>>>,
-    _server_task: Task<()>,
-}
-
-struct RegisteredTool {
-    tool: Tool,
-    handler: ToolHandler,
-}
-
-type ToolHandler = Box<
-    dyn Fn(
-        Option<serde_json::Value>,
-        &mut AsyncApp,
-    ) -> Task<Result<ToolResponse<serde_json::Value>>>,
->;
-type RequestHandler = Box<dyn Fn(RequestId, Option<Box<RawValue>>, &App) -> Task<String>>;
-
-impl McpServer {
-    pub fn new(cx: &AsyncApp) -> Task<Result<Self>> {
-        let task = cx.background_spawn(async move {
-            let temp_dir = tempfile::Builder::new().prefix("zed-mcp").tempdir()?;
-            let socket_path = temp_dir.path().join("mcp.sock");
-            let listener = UnixListener::bind(&socket_path).context("creating mcp socket")?;
-
-            anyhow::Ok((temp_dir, socket_path, listener))
-        });
-
-        cx.spawn(async move |cx| {
-            let (temp_dir, socket_path, listener) = task.await?;
-            let tools = Rc::new(RefCell::new(HashMap::default()));
-            let handlers = Rc::new(RefCell::new(HashMap::default()));
-            let server_task = cx.spawn({
-                let tools = tools.clone();
-                let handlers = handlers.clone();
-                async move |cx| {
-                    while let Ok((stream, _)) = listener.accept().await {
-                        Self::serve_connection(stream, tools.clone(), handlers.clone(), cx);
-                    }
-                    drop(temp_dir)
-                }
-            });
-            Ok(Self {
-                socket_path,
-                _server_task: server_task,
-                tools,
-                handlers,
-            })
-        })
-    }
-
-    pub fn add_tool<T: McpServerTool + Clone + 'static>(&mut self, tool: T) {
-        let mut settings = schemars::generate::SchemaSettings::draft07();
-        settings.inline_subschemas = true;
-        let mut generator = settings.into_generator();
-
-        let input_schema = generator.root_schema_for::<T::Input>();
-
-        let description = input_schema
-            .get("description")
-            .and_then(|desc| desc.as_str())
-            .map(|desc| desc.to_string());
-        debug_assert!(
-            description.is_some(),
-            "Input schema struct must include a doc comment for the tool description"
-        );
-
-        let registered_tool = RegisteredTool {
-            tool: Tool {
-                name: T::NAME.into(),
-                description,
-                input_schema: input_schema.into(),
-                output_schema: if TypeId::of::<T::Output>() == TypeId::of::<()>() {
-                    None
-                } else {
-                    Some(generator.root_schema_for::<T::Output>().into())
-                },
-                annotations: Some(tool.annotations()),
-            },
-            handler: Box::new({
-                move |input_value, cx| {
-                    let input = match input_value {
-                        Some(input) => serde_json::from_value(input),
-                        None => serde_json::from_value(serde_json::Value::Null),
-                    };
-
-                    let tool = tool.clone();
-                    match input {
-                        Ok(input) => cx.spawn(async move |cx| {
-                            let output = tool.run(input, cx).await?;
-
-                            Ok(ToolResponse {
-                                content: output.content,
-                                structured_content: serde_json::to_value(output.structured_content)
-                                    .unwrap_or_default(),
-                            })
-                        }),
-                        Err(err) => Task::ready(Err(err.into())),
-                    }
-                }
-            }),
-        };
-
-        self.tools.borrow_mut().insert(T::NAME, registered_tool);
-    }
-
-    pub fn handle_request<R: Request>(
-        &mut self,
-        f: impl Fn(R::Params, &App) -> Task<Result<R::Response>> + 'static,
-    ) {
-        let f = Box::new(f);
-        self.handlers.borrow_mut().insert(
-            R::METHOD,
-            Box::new(move |req_id, opt_params, cx| {
-                let result = match opt_params {
-                    Some(params) => serde_json::from_str(params.get()),
-                    None => serde_json::from_value(serde_json::Value::Null),
-                };
-
-                let params: R::Params = match result {
-                    Ok(params) => params,
-                    Err(e) => {
-                        return Task::ready(
-                            serde_json::to_string(&Response::<R::Response> {
-                                jsonrpc: "2.0",
-                                id: req_id,
-                                value: CspResult::Error(Some(crate::client::Error {
-                                    message: format!("{e}"),
-                                    code: -32700,
-                                })),
-                            })
-                            .unwrap(),
-                        );
-                    }
-                };
-                let task = f(params, cx);
-                cx.background_spawn(async move {
-                    match task.await {
-                        Ok(result) => serde_json::to_string(&Response {
-                            jsonrpc: "2.0",
-                            id: req_id,
-                            value: CspResult::Ok(Some(result)),
-                        })
-                        .unwrap(),
-                        Err(e) => serde_json::to_string(&Response {
-                            jsonrpc: "2.0",
-                            id: req_id,
-                            value: CspResult::Error::<R::Response>(Some(crate::client::Error {
-                                message: format!("{e}"),
-                                code: -32603,
-                            })),
-                        })
-                        .unwrap(),
-                    }
-                })
-            }),
-        );
-    }
-
-    pub fn socket_path(&self) -> &Path {
-        &self.socket_path
-    }
-
-    fn serve_connection(
-        stream: UnixStream,
-        tools: Rc<RefCell<HashMap<&'static str, RegisteredTool>>>,
-        handlers: Rc<RefCell<HashMap<&'static str, RequestHandler>>>,
-        cx: &mut AsyncApp,
-    ) {
-        let (read, write) = smol::io::split(stream);
-        let (incoming_tx, mut incoming_rx) = unbounded();
-        let (outgoing_tx, outgoing_rx) = unbounded();
-
-        cx.background_spawn(Self::handle_io(outgoing_rx, incoming_tx, write, read))
-            .detach();
-
-        cx.spawn(async move |cx| {
-            while let Some(request) = incoming_rx.next().await {
-                let Some(request_id) = request.id.clone() else {
-                    continue;
-                };
-
-                if request.method == CallTool::METHOD {
-                    Self::handle_call_tool(request_id, request.params, &tools, &outgoing_tx, cx)
-                        .await;
-                } else if request.method == ListTools::METHOD {
-                    Self::handle_list_tools(request.id.unwrap(), &tools, &outgoing_tx);
-                } else if let Some(handler) = handlers.borrow().get(&request.method.as_ref()) {
-                    let outgoing_tx = outgoing_tx.clone();
-
-                    if let Some(task) = cx
-                        .update(|cx| handler(request_id, request.params, cx))
-                        .log_err()
-                    {
-                        cx.spawn(async move |_| {
-                            let response = task.await;
-                            outgoing_tx.unbounded_send(response).ok();
-                        })
-                        .detach();
-                    }
-                } else {
-                    Self::send_err(
-                        request_id,
-                        format!("unhandled method {}", request.method),
-                        &outgoing_tx,
-                    );
-                }
-            }
-        })
-        .detach();
-    }
-
-    fn handle_list_tools(
-        request_id: RequestId,
-        tools: &Rc<RefCell<HashMap<&'static str, RegisteredTool>>>,
-        outgoing_tx: &UnboundedSender<String>,
-    ) {
-        let response = ListToolsResponse {
-            tools: tools.borrow().values().map(|t| t.tool.clone()).collect(),
-            next_cursor: None,
-            meta: None,
-        };
-
-        outgoing_tx
-            .unbounded_send(
-                serde_json::to_string(&Response {
-                    jsonrpc: "2.0",
-                    id: request_id,
-                    value: CspResult::Ok(Some(response)),
-                })
-                .unwrap_or_default(),
-            )
-            .ok();
-    }
-
-    async fn handle_call_tool(
-        request_id: RequestId,
-        params: Option<Box<RawValue>>,
-        tools: &Rc<RefCell<HashMap<&'static str, RegisteredTool>>>,
-        outgoing_tx: &UnboundedSender<String>,
-        cx: &mut AsyncApp,
-    ) {
-        let result: Result<CallToolParams, serde_json::Error> = match params.as_ref() {
-            Some(params) => serde_json::from_str(params.get()),
-            None => serde_json::from_value(serde_json::Value::Null),
-        };
-
-        match result {
-            Ok(params) => {
-                if let Some(tool) = tools.borrow().get(&params.name.as_ref()) {
-                    let outgoing_tx = outgoing_tx.clone();
-
-                    let task = (tool.handler)(params.arguments, cx);
-                    cx.spawn(async move |_| {
-                        let response = match task.await {
-                            Ok(result) => CallToolResponse {
-                                content: result.content,
-                                is_error: Some(false),
-                                meta: None,
-                                structured_content: if result.structured_content.is_null() {
-                                    None
-                                } else {
-                                    Some(result.structured_content)
-                                },
-                            },
-                            Err(err) => CallToolResponse {
-                                content: vec![ToolResponseContent::Text {
-                                    text: err.to_string(),
-                                }],
-                                is_error: Some(true),
-                                meta: None,
-                                structured_content: None,
-                            },
-                        };
-
-                        outgoing_tx
-                            .unbounded_send(
-                                serde_json::to_string(&Response {
-                                    jsonrpc: "2.0",
-                                    id: request_id,
-                                    value: CspResult::Ok(Some(response)),
-                                })
-                                .unwrap_or_default(),
-                            )
-                            .ok();
-                    })
-                    .detach();
-                } else {
-                    Self::send_err(
-                        request_id,
-                        format!("Tool not found: {}", params.name),
-                        outgoing_tx,
-                    );
-                }
-            }
-            Err(err) => {
-                Self::send_err(request_id, err.to_string(), outgoing_tx);
-            }
-        }
-    }
-
-    fn send_err(
-        request_id: RequestId,
-        message: impl Into<String>,
-        outgoing_tx: &UnboundedSender<String>,
-    ) {
-        outgoing_tx
-            .unbounded_send(
-                serde_json::to_string(&Response::<()> {
-                    jsonrpc: "2.0",
-                    id: request_id,
-                    value: CspResult::Error(Some(crate::client::Error {
-                        message: message.into(),
-                        code: -32601,
-                    })),
-                })
-                .unwrap(),
-            )
-            .ok();
-    }
-
-    async fn handle_io(
-        mut outgoing_rx: UnboundedReceiver<String>,
-        incoming_tx: UnboundedSender<RawRequest>,
-        mut outgoing_bytes: impl Unpin + AsyncWrite,
-        incoming_bytes: impl Unpin + AsyncRead,
-    ) -> Result<()> {
-        let mut output_reader = BufReader::new(incoming_bytes);
-        let mut incoming_line = String::new();
-        loop {
-            select_biased! {
-                message = outgoing_rx.next().fuse() => {
-                    if let Some(message) = message {
-                        log::trace!("send: {}", &message);
-                        outgoing_bytes.write_all(message.as_bytes()).await?;
-                        outgoing_bytes.write_all(&[b'\n']).await?;
-                    } else {
-                        break;
-                    }
-                }
-                bytes_read = output_reader.read_line(&mut incoming_line).fuse() => {
-                    if bytes_read? == 0 {
-                        break
-                    }
-                    log::trace!("recv: {}", &incoming_line);
-                    match serde_json::from_str(&incoming_line) {
-                        Ok(message) => {
-                            incoming_tx.unbounded_send(message).log_err();
-                        }
-                        Err(error) => {
-                            outgoing_bytes.write_all(serde_json::to_string(&json!({
-                                "jsonrpc": "2.0",
-                                "error": json!({
-                                    "code": -32603,
-                                    "message": format!("Failed to parse: {error}"),
-                                }),
-                            }))?.as_bytes()).await?;
-                            outgoing_bytes.write_all(&[b'\n']).await?;
-                            log::error!("failed to parse incoming message: {error}. Raw: {incoming_line}");
-                        }
-                    }
-                    incoming_line.clear();
-                }
-            }
-        }
-        Ok(())
-    }
-}
-
-pub trait McpServerTool {
-    type Input: DeserializeOwned + JsonSchema;
-    type Output: Serialize + JsonSchema;
-
-    const NAME: &'static str;
-
-    fn annotations(&self) -> ToolAnnotations {
-        ToolAnnotations {
-            title: None,
-            read_only_hint: None,
-            destructive_hint: None,
-            idempotent_hint: None,
-            open_world_hint: None,
-        }
-    }
-
-    fn run(
-        &self,
-        input: Self::Input,
-        cx: &mut AsyncApp,
-    ) -> impl Future<Output = Result<ToolResponse<Self::Output>>>;
-}
-
-#[derive(Debug)]
-pub struct ToolResponse<T> {
-    pub content: Vec<ToolResponseContent>,
-    pub structured_content: T,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-struct RawRequest {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    id: Option<RequestId>,
-    method: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    params: Option<Box<serde_json::value::RawValue>>,
-}
diff --git a/crates/context_server/src/protocol.rs b/crates/context_server/src/protocol.rs
deleted file mode 100644
index 5355f20f62..0000000000
--- a/crates/context_server/src/protocol.rs
+++ /dev/null
@@ -1,125 +0,0 @@
-//! This module implements parts of the Model Context Protocol.
-//!
-//! It handles the lifecycle messages, and provides a general interface to
-//! interacting with an MCP server. It uses the generic JSON-RPC client to
-//! read/write messages and the types from types.rs for serialization/deserialization
-//! of messages.
-
-use std::time::Duration;
-
-use anyhow::Result;
-use futures::channel::oneshot;
-use gpui::AsyncApp;
-use serde_json::Value;
-
-use crate::client::Client;
-use crate::types::{self, Notification, Request};
-
-pub struct ModelContextProtocol {
-    inner: Client,
-}
-
-impl ModelContextProtocol {
-    pub(crate) fn new(inner: Client) -> Self {
-        Self { inner }
-    }
-
-    fn supported_protocols() -> Vec<types::ProtocolVersion> {
-        vec![
-            types::ProtocolVersion(types::LATEST_PROTOCOL_VERSION.to_string()),
-            types::ProtocolVersion(types::VERSION_2024_11_05.to_string()),
-        ]
-    }
-
-    pub async fn initialize(
-        self,
-        client_info: types::Implementation,
-    ) -> Result<InitializedContextServerProtocol> {
-        let params = types::InitializeParams {
-            protocol_version: types::ProtocolVersion(types::LATEST_PROTOCOL_VERSION.to_string()),
-            capabilities: types::ClientCapabilities {
-                experimental: None,
-                sampling: None,
-                roots: None,
-            },
-            meta: None,
-            client_info,
-        };
-
-        let response: types::InitializeResponse = self
-            .inner
-            .request(types::requests::Initialize::METHOD, params)
-            .await?;
-
-        anyhow::ensure!(
-            Self::supported_protocols().contains(&response.protocol_version),
-            "Unsupported protocol version: {:?}",
-            response.protocol_version
-        );
-
-        log::trace!("mcp server info {:?}", response.server_info);
-
-        let initialized_protocol = InitializedContextServerProtocol {
-            inner: self.inner,
-            initialize: response,
-        };
-
-        initialized_protocol.notify::<types::notifications::Initialized>(())?;
-
-        Ok(initialized_protocol)
-    }
-}
-
-pub struct InitializedContextServerProtocol {
-    inner: Client,
-    pub initialize: types::InitializeResponse,
-}
-
-#[derive(Debug, PartialEq, Clone, Copy)]
-pub enum ServerCapability {
-    Experimental,
-    Logging,
-    Prompts,
-    Resources,
-    Tools,
-}
-
-impl InitializedContextServerProtocol {
-    /// Check if the server supports a specific capability
-    pub fn capable(&self, capability: ServerCapability) -> bool {
-        match capability {
-            ServerCapability::Experimental => self.initialize.capabilities.experimental.is_some(),
-            ServerCapability::Logging => self.initialize.capabilities.logging.is_some(),
-            ServerCapability::Prompts => self.initialize.capabilities.prompts.is_some(),
-            ServerCapability::Resources => self.initialize.capabilities.resources.is_some(),
-            ServerCapability::Tools => self.initialize.capabilities.tools.is_some(),
-        }
-    }
-
-    pub async fn request<T: Request>(&self, params: T::Params) -> Result<T::Response> {
-        self.inner.request(T::METHOD, params).await
-    }
-
-    pub async fn request_with<T: Request>(
-        &self,
-        params: T::Params,
-        cancel_rx: Option<oneshot::Receiver<()>>,
-        timeout: Option<Duration>,
-    ) -> Result<T::Response> {
-        self.inner
-            .request_with(T::METHOD, params, cancel_rx, timeout)
-            .await
-    }
-
-    pub fn notify<T: Notification>(&self, params: T::Params) -> Result<()> {
-        self.inner.notify(T::METHOD, params)
-    }
-
-    pub fn on_notification(
-        &self,
-        method: &'static str,
-        f: Box<dyn 'static + Send + FnMut(Value, AsyncApp)>,
-    ) {
-        self.inner.on_notification(method, f);
-    }
-}
diff --git a/crates/context_server/src/test.rs b/crates/context_server/src/test.rs
deleted file mode 100644
index 008542ab24..0000000000
--- a/crates/context_server/src/test.rs
+++ /dev/null
@@ -1,130 +0,0 @@
-use anyhow::Context as _;
-use collections::HashMap;
-use futures::{FutureExt, Stream, StreamExt as _, future::BoxFuture, lock::Mutex};
-use gpui::BackgroundExecutor;
-use std::{pin::Pin, sync::Arc};
-
-use crate::{
-    transport::Transport,
-    types::{Implementation, InitializeResponse, ProtocolVersion, ServerCapabilities},
-};
-
-pub fn create_fake_transport(
-    name: impl Into<String>,
-    executor: BackgroundExecutor,
-) -> FakeTransport {
-    let name = name.into();
-    FakeTransport::new(executor).on_request::<crate::types::requests::Initialize, _>(
-        move |_params| {
-            let name = name.clone();
-            async move { create_initialize_response(name.clone()) }
-        },
-    )
-}
-
-fn create_initialize_response(server_name: String) -> InitializeResponse {
-    InitializeResponse {
-        protocol_version: ProtocolVersion(crate::types::LATEST_PROTOCOL_VERSION.to_string()),
-        server_info: Implementation {
-            name: server_name,
-            version: "1.0.0".to_string(),
-        },
-        capabilities: ServerCapabilities::default(),
-        meta: None,
-    }
-}
-
-pub struct FakeTransport {
-    request_handlers: HashMap<
-        &'static str,
-        Arc<dyn Send + Sync + Fn(serde_json::Value) -> BoxFuture<'static, serde_json::Value>>,
-    >,
-    tx: futures::channel::mpsc::UnboundedSender<String>,
-    rx: Arc<Mutex<futures::channel::mpsc::UnboundedReceiver<String>>>,
-    executor: BackgroundExecutor,
-}
-
-impl FakeTransport {
-    pub fn new(executor: BackgroundExecutor) -> Self {
-        let (tx, rx) = futures::channel::mpsc::unbounded();
-        Self {
-            request_handlers: Default::default(),
-            tx,
-            rx: Arc::new(Mutex::new(rx)),
-            executor,
-        }
-    }
-
-    pub fn on_request<T, Fut>(
-        mut self,
-        handler: impl 'static + Send + Sync + Fn(T::Params) -> Fut,
-    ) -> Self
-    where
-        T: crate::types::Request,
-        Fut: 'static + Send + Future<Output = T::Response>,
-    {
-        self.request_handlers.insert(
-            T::METHOD,
-            Arc::new(move |value| {
-                let params = value
-                    .get("params")
-                    .cloned()
-                    .unwrap_or(serde_json::Value::Null);
-                let params: T::Params =
-                    serde_json::from_value(params).expect("Invalid parameters received");
-                let response = handler(params);
-                async move { serde_json::to_value(response.await).unwrap() }.boxed()
-            }),
-        );
-        self
-    }
-}
-
-#[async_trait::async_trait]
-impl Transport for FakeTransport {
-    async fn send(&self, message: String) -> anyhow::Result<()> {
-        if let Ok(msg) = serde_json::from_str::<serde_json::Value>(&message) {
-            let id = msg.get("id").and_then(|id| id.as_u64()).unwrap_or(0);
-
-            if let Some(method) = msg.get("method") {
-                let method = method.as_str().expect("Invalid method received");
-                if let Some(handler) = self.request_handlers.get(method) {
-                    let payload = handler(msg).await;
-                    let response = serde_json::json!({
-                        "jsonrpc": "2.0",
-                        "id": id,
-                        "result": payload
-                    });
-                    self.tx
-                        .unbounded_send(response.to_string())
-                        .context("sending a message")?;
-                } else {
-                    log::debug!("No handler registered for MCP request '{method}'");
-                }
-            }
-        }
-        Ok(())
-    }
-
-    fn receive(&self) -> Pin<Box<dyn Stream<Item = String> + Send>> {
-        let rx = self.rx.clone();
-        let executor = self.executor.clone();
-        Box::pin(futures::stream::unfold(rx, move |rx| {
-            let executor = executor.clone();
-            async move {
-                let mut rx_guard = rx.lock().await;
-                executor.simulate_random_delay().await;
-                if let Some(message) = rx_guard.next().await {
-                    drop(rx_guard);
-                    Some((message, rx))
-                } else {
-                    None
-                }
-            }
-        }))
-    }
-
-    fn receive_err(&self) -> Pin<Box<dyn Stream<Item = String> + Send>> {
-        Box::pin(futures::stream::empty())
-    }
-}
diff --git a/crates/context_server/src/transport.rs b/crates/context_server/src/transport.rs
deleted file mode 100644
index a3d6f998d4..0000000000
--- a/crates/context_server/src/transport.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-pub mod http;
-mod stdio_transport;
-
-use anyhow::Result;
-use async_trait::async_trait;
-use futures::Stream;
-use std::pin::Pin;
-
-pub use http::*;
-pub use stdio_transport::*;
-
-#[async_trait]
-pub trait Transport: Send + Sync {
-    async fn send(&self, message: String) -> Result<()>;
-    fn receive(&self) -> Pin<Box<dyn Stream<Item = String> + Send>>;
-    fn receive_err(&self) -> Pin<Box<dyn Stream<Item = String> + Send>>;
-}
diff --git a/crates/context_server/src/transport/http.rs b/crates/context_server/src/transport/http.rs
deleted file mode 100644
index 70248f0278..0000000000
--- a/crates/context_server/src/transport/http.rs
+++ /dev/null
@@ -1,259 +0,0 @@
-use anyhow::{Result, anyhow};
-use async_trait::async_trait;
-use collections::HashMap;
-use futures::{Stream, StreamExt};
-use gpui::BackgroundExecutor;
-use http_client::{AsyncBody, HttpClient, Request, Response, http::Method};
-use parking_lot::Mutex as SyncMutex;
-use smol::channel;
-use std::{pin::Pin, sync::Arc};
-
-use crate::transport::Transport;
-
-// Constants from MCP spec
-const HEADER_SESSION_ID: &str = "Mcp-Session-Id";
-const EVENT_STREAM_MIME_TYPE: &str = "text/event-stream";
-const JSON_MIME_TYPE: &str = "application/json";
-
-/// HTTP Transport with session management and SSE support
-pub struct HttpTransport {
-    http_client: Arc<dyn HttpClient>,
-    endpoint: String,
-    session_id: Arc<SyncMutex<Option<String>>>,
-    executor: BackgroundExecutor,
-    response_tx: channel::Sender<String>,
-    response_rx: channel::Receiver<String>,
-    error_tx: channel::Sender<String>,
-    error_rx: channel::Receiver<String>,
-    // Authentication headers to include in requests
-    headers: HashMap<String, String>,
-}
-
-impl HttpTransport {
-    pub fn new(
-        http_client: Arc<dyn HttpClient>,
-        endpoint: String,
-        headers: HashMap<String, String>,
-        executor: BackgroundExecutor,
-    ) -> Self {
-        let (response_tx, response_rx) = channel::unbounded();
-        let (error_tx, error_rx) = channel::unbounded();
-
-        Self {
-            http_client,
-            executor,
-            endpoint,
-            session_id: Arc::new(SyncMutex::new(None)),
-            response_tx,
-            response_rx,
-            error_tx,
-            error_rx,
-            headers,
-        }
-    }
-
-    /// Send a message and handle the response based on content type
-    async fn send_message(&self, message: String) -> Result<()> {
-        let is_notification =
-            !message.contains("\"id\":") || message.contains("notifications/initialized");
-
-        let mut request_builder = Request::builder()
-            .method(Method::POST)
-            .uri(&self.endpoint)
-            .header("Content-Type", JSON_MIME_TYPE)
-            .header(
-                "Accept",
-                format!("{}, {}", JSON_MIME_TYPE, EVENT_STREAM_MIME_TYPE),
-            );
-
-        for (key, value) in &self.headers {
-            request_builder = request_builder.header(key.as_str(), value.as_str());
-        }
-
-        // Add session ID if we have one (except for initialize)
-        if let Some(ref session_id) = *self.session_id.lock() {
-            request_builder = request_builder.header(HEADER_SESSION_ID, session_id.as_str());
-        }
-
-        let request = request_builder.body(AsyncBody::from(message.into_bytes()))?;
-        let mut response = self.http_client.send(request).await?;
-
-        // Handle different response types based on status and content-type
-        match response.status() {
-            status if status.is_success() => {
-                // Check content type
-                let content_type = response
-                    .headers()
-                    .get("content-type")
-                    .and_then(|v| v.to_str().ok());
-
-                // Extract session ID from response headers if present
-                if let Some(session_id) = response
-                    .headers()
-                    .get(HEADER_SESSION_ID)
-                    .and_then(|v| v.to_str().ok())
-                {
-                    *self.session_id.lock() = Some(session_id.to_string());
-                    log::debug!("Session ID set: {}", session_id);
-                }
-
-                match content_type {
-                    Some(ct) if ct.starts_with(JSON_MIME_TYPE) => {
-                        // JSON response - read and forward immediately
-                        let mut body = String::new();
-                        futures::AsyncReadExt::read_to_string(response.body_mut(), &mut body)
-                            .await?;
-
-                        // Only send non-empty responses
-                        if !body.is_empty() {
-                            self.response_tx
-                                .send(body)
-                                .await
-                                .map_err(|_| anyhow!("Failed to send JSON response"))?;
-                        }
-                    }
-                    Some(ct) if ct.starts_with(EVENT_STREAM_MIME_TYPE) => {
-                        // SSE stream - set up streaming
-                        self.setup_sse_stream(response).await?;
-                    }
-                    _ => {
-                        // For notifications, 202 Accepted with no content type is ok
-                        if is_notification && status.as_u16() == 202 {
-                            log::debug!("Notification accepted");
-                        } else {
-                            return Err(anyhow!("Unexpected content type: {:?}", content_type));
-                        }
-                    }
-                }
-            }
-            status if status.as_u16() == 202 => {
-                // Accepted - notification acknowledged, no response needed
-                log::debug!("Notification accepted");
-            }
-            _ => {
-                let mut error_body = String::new();
-                futures::AsyncReadExt::read_to_string(response.body_mut(), &mut error_body).await?;
-
-                self.error_tx
-                    .send(format!("HTTP {}: {}", response.status(), error_body))
-                    .await
-                    .map_err(|_| anyhow!("Failed to send error"))?;
-            }
-        }
-
-        Ok(())
-    }
-
-    /// Set up SSE streaming from the response
-    async fn setup_sse_stream(&self, mut response: Response<AsyncBody>) -> Result<()> {
-        let response_tx = self.response_tx.clone();
-        let error_tx = self.error_tx.clone();
-
-        // Spawn a task to handle the SSE stream
-        smol::spawn(async move {
-            let reader = futures::io::BufReader::new(response.body_mut());
-            let mut lines = futures::AsyncBufReadExt::lines(reader);
-
-            let mut data_buffer = Vec::new();
-            let mut in_message = false;
-
-            while let Some(line_result) = lines.next().await {
-                match line_result {
-                    Ok(line) => {
-                        if line.is_empty() {
-                            // Empty line signals end of event
-                            if !data_buffer.is_empty() {
-                                let message = data_buffer.join("\n");
-
-                                // Filter out ping messages and empty data
-                                if !message.trim().is_empty() && message != "ping" {
-                                    if let Err(e) = response_tx.send(message).await {
-                                        log::error!("Failed to send SSE message: {}", e);
-                                        break;
-                                    }
-                                }
-                                data_buffer.clear();
-                            }
-                            in_message = false;
-                        } else if let Some(data) = line.strip_prefix("data: ") {
-                            // Handle data lines
-                            let data = data.trim();
-                            if !data.is_empty() {
-                                // Check if this is a ping message
-                                if data == "ping" {
-                                    log::trace!("Received SSE ping");
-                                    continue;
-                                }
-                                data_buffer.push(data.to_string());
-                                in_message = true;
-                            }
-                        } else if line.starts_with("event:")
-                            || line.starts_with("id:")
-                            || line.starts_with("retry:")
-                        {
-                            // Ignore other SSE fields
-                            continue;
-                        } else if in_message {
-                            // Continuation of data
-                            data_buffer.push(line);
-                        }
-                    }
-                    Err(e) => {
-                        let _ = error_tx.send(format!("SSE stream error: {}", e)).await;
-                        break;
-                    }
-                }
-            }
-        })
-        .detach();
-
-        Ok(())
-    }
-}
-
-#[async_trait]
-impl Transport for HttpTransport {
-    async fn send(&self, message: String) -> Result<()> {
-        self.send_message(message).await
-    }
-
-    fn receive(&self) -> Pin<Box<dyn Stream<Item = String> + Send>> {
-        Box::pin(self.response_rx.clone())
-    }
-
-    fn receive_err(&self) -> Pin<Box<dyn Stream<Item = String> + Send>> {
-        Box::pin(self.error_rx.clone())
-    }
-}
-
-impl Drop for HttpTransport {
-    fn drop(&mut self) {
-        // Try to cleanup session on drop
-        let http_client = self.http_client.clone();
-        let endpoint = self.endpoint.clone();
-        let session_id = self.session_id.lock().clone();
-        let headers = self.headers.clone();
-
-        if let Some(session_id) = session_id {
-            self.executor
-                .spawn(async move {
-                    let mut request_builder = Request::builder()
-                        .method(Method::DELETE)
-                        .uri(&endpoint)
-                        .header(HEADER_SESSION_ID, &session_id);
-
-                    // Add authentication headers if present
-                    for (key, value) in headers {
-                        request_builder = request_builder.header(key.as_str(), value.as_str());
-                    }
-
-                    let request = request_builder.body(AsyncBody::empty());
-
-                    if let Ok(request) = request {
-                        let _ = http_client.send(request).await;
-                    }
-                })
-                .detach();
-        }
-    }
-}
diff --git a/crates/context_server/src/transport/stdio_transport.rs b/crates/context_server/src/transport/stdio_transport.rs
deleted file mode 100644
index 031f348294..0000000000
--- a/crates/context_server/src/transport/stdio_transport.rs
+++ /dev/null
@@ -1,152 +0,0 @@
-use std::path::PathBuf;
-use std::pin::Pin;
-
-use anyhow::{Context as _, Result};
-use async_trait::async_trait;
-use futures::io::{BufReader, BufWriter};
-use futures::{
-    AsyncBufReadExt as _, AsyncRead, AsyncWrite, AsyncWriteExt as _, Stream, StreamExt as _,
-};
-use gpui::AsyncApp;
-use settings::Settings as _;
-use smol::channel;
-use smol::process::Child;
-use terminal::terminal_settings::TerminalSettings;
-use util::TryFutureExt as _;
-use util::shell_builder::ShellBuilder;
-
-use crate::client::ModelContextServerBinary;
-use crate::transport::Transport;
-
-pub struct StdioTransport {
-    stdout_sender: channel::Sender<String>,
-    stdin_receiver: channel::Receiver<String>,
-    stderr_receiver: channel::Receiver<String>,
-    server: Child,
-}
-
-impl StdioTransport {
-    pub fn new(
-        binary: ModelContextServerBinary,
-        working_directory: &Option<PathBuf>,
-        cx: &AsyncApp,
-    ) -> Result<Self> {
-        let shell = cx.update(|cx| TerminalSettings::get(None, cx).shell.clone())?;
-        let builder = ShellBuilder::new(&shell, cfg!(windows));
-        let mut command =
-            builder.build_command(Some(binary.executable.display().to_string()), &binary.args);
-
-        command
-            .envs(binary.env.unwrap_or_default())
-            .stdin(std::process::Stdio::piped())
-            .stdout(std::process::Stdio::piped())
-            .stderr(std::process::Stdio::piped())
-            .kill_on_drop(true);
-
-        if let Some(working_directory) = working_directory {
-            command.current_dir(working_directory);
-        }
-
-        let mut server = command
-            .spawn()
-            .with_context(|| format!("failed to spawn command {command:?})",))?;
-
-        let stdin = server.stdin.take().unwrap();
-        let stdout = server.stdout.take().unwrap();
-        let stderr = server.stderr.take().unwrap();
-
-        let (stdin_sender, stdin_receiver) = channel::unbounded::<String>();
-        let (stdout_sender, stdout_receiver) = channel::unbounded::<String>();
-        let (stderr_sender, stderr_receiver) = channel::unbounded::<String>();
-
-        cx.spawn(async move |_| Self::handle_output(stdin, stdout_receiver).log_err().await)
-            .detach();
-
-        cx.spawn(async move |_| Self::handle_input(stdout, stdin_sender).await)
-            .detach();
-
-        cx.spawn(async move |_| Self::handle_err(stderr, stderr_sender).await)
-            .detach();
-
-        Ok(Self {
-            stdout_sender,
-            stdin_receiver,
-            stderr_receiver,
-            server,
-        })
-    }
-
-    async fn handle_input<Stdout>(stdin: Stdout, inbound_rx: channel::Sender<String>)
-    where
-        Stdout: AsyncRead + Unpin + Send + 'static,
-    {
-        let mut stdin = BufReader::new(stdin);
-        let mut line = String::new();
-        while let Ok(n) = stdin.read_line(&mut line).await {
-            if n == 0 {
-                break;
-            }
-            if inbound_rx.send(line.clone()).await.is_err() {
-                break;
-            }
-            line.clear();
-        }
-    }
-
-    async fn handle_output<Stdin>(
-        stdin: Stdin,
-        outbound_rx: channel::Receiver<String>,
-    ) -> Result<()>
-    where
-        Stdin: AsyncWrite + Unpin + Send + 'static,
-    {
-        let mut stdin = BufWriter::new(stdin);
-        let mut pinned_rx = Box::pin(outbound_rx);
-        while let Some(message) = pinned_rx.next().await {
-            log::trace!("outgoing message: {}", message);
-
-            stdin.write_all(message.as_bytes()).await?;
-            stdin.write_all(b"\n").await?;
-            stdin.flush().await?;
-        }
-        Ok(())
-    }
-
-    async fn handle_err<Stderr>(stderr: Stderr, stderr_tx: channel::Sender<String>)
-    where
-        Stderr: AsyncRead + Unpin + Send + 'static,
-    {
-        let mut stderr = BufReader::new(stderr);
-        let mut line = String::new();
-        while let Ok(n) = stderr.read_line(&mut line).await {
-            if n == 0 {
-                break;
-            }
-            if stderr_tx.send(line.clone()).await.is_err() {
-                break;
-            }
-            line.clear();
-        }
-    }
-}
-
-#[async_trait]
-impl Transport for StdioTransport {
-    async fn send(&self, message: String) -> Result<()> {
-        Ok(self.stdout_sender.send(message).await?)
-    }
-
-    fn receive(&self) -> Pin<Box<dyn Stream<Item = String> + Send>> {
-        Box::pin(self.stdin_receiver.clone())
-    }
-
-    fn receive_err(&self) -> Pin<Box<dyn Stream<Item = String> + Send>> {
-        Box::pin(self.stderr_receiver.clone())
-    }
-}
-
-impl Drop for StdioTransport {
-    fn drop(&mut self) {
-        let _ = self.server.kill();
-    }
-}
diff --git a/crates/context_server/src/types.rs b/crates/context_server/src/types.rs
deleted file mode 100644
index 03aca4f3ca..0000000000
--- a/crates/context_server/src/types.rs
+++ /dev/null
@@ -1,758 +0,0 @@
-use collections::HashMap;
-use serde::de::DeserializeOwned;
-use serde::{Deserialize, Serialize};
-use url::Url;
-
-use crate::client::RequestId;
-
-pub const LATEST_PROTOCOL_VERSION: &str = "2025-03-26";
-pub const VERSION_2024_11_05: &str = "2024-11-05";
-
-pub mod requests {
-    use super::*;
-
-    macro_rules! request {
-        ($method:expr, $name:ident, $params:ty, $response:ty) => {
-            pub struct $name;
-
-            impl Request for $name {
-                type Params = $params;
-                type Response = $response;
-                const METHOD: &'static str = $method;
-            }
-        };
-    }
-
-    request!(
-        "initialize",
-        Initialize,
-        InitializeParams,
-        InitializeResponse
-    );
-    request!("tools/call", CallTool, CallToolParams, CallToolResponse);
-    request!(
-        "resources/unsubscribe",
-        ResourcesUnsubscribe,
-        ResourcesUnsubscribeParams,
-        ()
-    );
-    request!(
-        "resources/subscribe",
-        ResourcesSubscribe,
-        ResourcesSubscribeParams,
-        ()
-    );
-    request!(
-        "resources/read",
-        ResourcesRead,
-        ResourcesReadParams,
-        ResourcesReadResponse
-    );
-    request!("resources/list", ResourcesList, (), ResourcesListResponse);
-    request!(
-        "logging/setLevel",
-        LoggingSetLevel,
-        LoggingSetLevelParams,
-        ()
-    );
-    request!(
-        "prompts/get",
-        PromptsGet,
-        PromptsGetParams,
-        PromptsGetResponse
-    );
-    request!("prompts/list", PromptsList, (), PromptsListResponse);
-    request!(
-        "completion/complete",
-        CompletionComplete,
-        CompletionCompleteParams,
-        CompletionCompleteResponse
-    );
-    request!("ping", Ping, (), ());
-    request!("tools/list", ListTools, (), ListToolsResponse);
-    request!(
-        "resources/templates/list",
-        ListResourceTemplates,
-        (),
-        ListResourceTemplatesResponse
-    );
-    request!("roots/list", ListRoots, (), ListRootsResponse);
-}
-
-pub trait Request {
-    type Params: DeserializeOwned + Serialize + Send + Sync + 'static;
-    type Response: DeserializeOwned + Serialize + Send + Sync + 'static;
-    const METHOD: &'static str;
-}
-
-pub mod notifications {
-    use super::*;
-
-    macro_rules! notification {
-        ($method:expr, $name:ident, $params:ty) => {
-            pub struct $name;
-
-            impl Notification for $name {
-                type Params = $params;
-                const METHOD: &'static str = $method;
-            }
-        };
-    }
-
-    notification!("notifications/initialized", Initialized, ());
-    notification!("notifications/progress", Progress, ProgressParams);
-    notification!("notifications/message", Message, MessageParams);
-    notification!("notifications/cancelled", Cancelled, CancelledParams);
-    notification!(
-        "notifications/resources/updated",
-        ResourcesUpdated,
-        ResourcesUpdatedParams
-    );
-    notification!(
-        "notifications/resources/list_changed",
-        ResourcesListChanged,
-        ()
-    );
-    notification!("notifications/tools/list_changed", ToolsListChanged, ());
-    notification!("notifications/prompts/list_changed", PromptsListChanged, ());
-    notification!("notifications/roots/list_changed", RootsListChanged, ());
-}
-
-pub trait Notification {
-    type Params: DeserializeOwned + Serialize + Send + Sync + 'static;
-    const METHOD: &'static str;
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct MessageParams {
-    pub level: LoggingLevel,
-    pub logger: Option<String>,
-    pub data: serde_json::Value,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ResourcesUpdatedParams {
-    pub uri: String,
-}
-
-#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(transparent)]
-pub struct ProtocolVersion(pub String);
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct InitializeParams {
-    pub protocol_version: ProtocolVersion,
-    pub capabilities: ClientCapabilities,
-    pub client_info: Implementation,
-    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
-    pub meta: Option<HashMap<String, serde_json::Value>>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct CallToolParams {
-    pub name: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub arguments: Option<serde_json::Value>,
-    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
-    pub meta: Option<HashMap<String, serde_json::Value>>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ResourcesUnsubscribeParams {
-    pub uri: Url,
-    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
-    pub meta: Option<HashMap<String, serde_json::Value>>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ResourcesSubscribeParams {
-    pub uri: Url,
-    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
-    pub meta: Option<HashMap<String, serde_json::Value>>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ResourcesReadParams {
-    pub uri: Url,
-    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
-    pub meta: Option<HashMap<String, serde_json::Value>>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct LoggingSetLevelParams {
-    pub level: LoggingLevel,
-    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
-    pub meta: Option<HashMap<String, serde_json::Value>>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct PromptsGetParams {
-    pub name: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub arguments: Option<HashMap<String, String>>,
-    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
-    pub meta: Option<HashMap<String, serde_json::Value>>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct CompletionCompleteParams {
-    #[serde(rename = "ref")]
-    pub reference: CompletionReference,
-    pub argument: CompletionArgument,
-    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
-    pub meta: Option<HashMap<String, serde_json::Value>>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(untagged)]
-pub enum CompletionReference {
-    Prompt(PromptReference),
-    Resource(ResourceReference),
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct PromptReference {
-    #[serde(rename = "type")]
-    pub ty: PromptReferenceType,
-    pub name: String,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ResourceReference {
-    #[serde(rename = "type")]
-    pub ty: PromptReferenceType,
-    pub uri: Url,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum PromptReferenceType {
-    #[serde(rename = "ref/prompt")]
-    Prompt,
-    #[serde(rename = "ref/resource")]
-    Resource,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct CompletionArgument {
-    pub name: String,
-    pub value: String,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct InitializeResponse {
-    pub protocol_version: ProtocolVersion,
-    pub capabilities: ServerCapabilities,
-    pub server_info: Implementation,
-    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
-    pub meta: Option<HashMap<String, serde_json::Value>>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ResourcesReadResponse {
-    pub contents: Vec<ResourceContentsType>,
-    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
-    pub meta: Option<HashMap<String, serde_json::Value>>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(untagged)]
-pub enum ResourceContentsType {
-    Text(TextResourceContents),
-    Blob(BlobResourceContents),
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ResourcesListResponse {
-    pub resources: Vec<Resource>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub next_cursor: Option<String>,
-    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
-    pub meta: Option<HashMap<String, serde_json::Value>>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SamplingMessage {
-    pub role: Role,
-    pub content: MessageContent,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct CreateMessageRequest {
-    pub messages: Vec<SamplingMessage>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub model_preferences: Option<ModelPreferences>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub system_prompt: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub include_context: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub temperature: Option<f64>,
-    pub max_tokens: u32,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub stop_sequences: Option<Vec<String>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub metadata: Option<serde_json::Value>,
-}
-
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct CreateMessageResult {
-    pub role: Role,
-    pub content: MessageContent,
-    pub model: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub stop_reason: Option<String>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct PromptMessage {
-    pub role: Role,
-    pub content: MessageContent,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "lowercase")]
-pub enum Role {
-    User,
-    Assistant,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(tag = "type")]
-pub enum MessageContent {
-    #[serde(rename = "text")]
-    Text {
-        text: String,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        annotations: Option<MessageAnnotations>,
-    },
-    #[serde(rename = "image", rename_all = "camelCase")]
-    Image {
-        data: String,
-        mime_type: String,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        annotations: Option<MessageAnnotations>,
-    },
-    #[serde(rename = "audio", rename_all = "camelCase")]
-    Audio {
-        data: String,
-        mime_type: String,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        annotations: Option<MessageAnnotations>,
-    },
-    #[serde(rename = "resource")]
-    Resource {
-        resource: ResourceContents,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        annotations: Option<MessageAnnotations>,
-    },
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct MessageAnnotations {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub audience: Option<Vec<Role>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub priority: Option<f64>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct PromptsGetResponse {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub description: Option<String>,
-    pub messages: Vec<PromptMessage>,
-    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
-    pub meta: Option<HashMap<String, serde_json::Value>>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct PromptsListResponse {
-    pub prompts: Vec<Prompt>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub next_cursor: Option<String>,
-    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
-    pub meta: Option<HashMap<String, serde_json::Value>>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct CompletionCompleteResponse {
-    pub completion: CompletionResult,
-    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
-    pub meta: Option<HashMap<String, serde_json::Value>>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct CompletionResult {
-    pub values: Vec<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub total: Option<u32>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub has_more: Option<bool>,
-    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
-    pub meta: Option<HashMap<String, serde_json::Value>>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Prompt {
-    pub name: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub description: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub arguments: Option<Vec<PromptArgument>>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct PromptArgument {
-    pub name: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub description: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub required: Option<bool>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ClientCapabilities {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub experimental: Option<HashMap<String, serde_json::Value>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub sampling: Option<serde_json::Value>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub roots: Option<RootsCapabilities>,
-}
-
-#[derive(Default, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ServerCapabilities {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub experimental: Option<HashMap<String, serde_json::Value>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub logging: Option<serde_json::Value>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub completions: Option<serde_json::Value>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub prompts: Option<PromptsCapabilities>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub resources: Option<ResourcesCapabilities>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub tools: Option<ToolsCapabilities>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct PromptsCapabilities {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub list_changed: Option<bool>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ResourcesCapabilities {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub subscribe: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub list_changed: Option<bool>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ToolsCapabilities {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub list_changed: Option<bool>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct RootsCapabilities {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub list_changed: Option<bool>,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Tool {
-    pub name: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub description: Option<String>,
-    pub input_schema: serde_json::Value,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub output_schema: Option<serde_json::Value>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub annotations: Option<ToolAnnotations>,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ToolAnnotations {
-    /// A human-readable title for the tool.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub title: Option<String>,
-    /// If true, the tool does not modify its environment.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub read_only_hint: Option<bool>,
-    /// If true, the tool may perform destructive updates to its environment.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub destructive_hint: Option<bool>,
-    /// If true, calling the tool repeatedly with the same arguments will have no additional effect on its environment.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub idempotent_hint: Option<bool>,
-    /// If true, this tool may interact with an "open world" of external entities.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub open_world_hint: Option<bool>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Implementation {
-    pub name: String,
-    pub version: String,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Resource {
-    pub uri: Url,
-    pub name: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub description: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub mime_type: Option<String>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ResourceContents {
-    pub uri: Url,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub mime_type: Option<String>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct TextResourceContents {
-    pub uri: Url,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub mime_type: Option<String>,
-    pub text: String,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct BlobResourceContents {
-    pub uri: Url,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub mime_type: Option<String>,
-    pub blob: String,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ResourceTemplate {
-    pub uri_template: String,
-    pub name: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub description: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub mime_type: Option<String>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "lowercase")]
-pub enum LoggingLevel {
-    Debug,
-    Info,
-    Notice,
-    Warning,
-    Error,
-    Critical,
-    Alert,
-    Emergency,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ModelPreferences {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub hints: Option<Vec<ModelHint>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub cost_priority: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub speed_priority: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub intelligence_priority: Option<f64>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ModelHint {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub name: Option<String>,
-}
-
-#[derive(Debug, Serialize)]
-#[serde(untagged)]
-pub enum ClientNotification {
-    Initialized,
-    Progress(ProgressParams),
-    RootsListChanged,
-    Cancelled(CancelledParams),
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct CancelledParams {
-    pub request_id: RequestId,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub reason: Option<String>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(untagged)]
-pub enum ProgressToken {
-    String(String),
-    Number(f64),
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ProgressParams {
-    pub progress_token: ProgressToken,
-    pub progress: f64,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub message: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub total: Option<f64>,
-    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
-    pub meta: Option<HashMap<String, serde_json::Value>>,
-}
-
-pub enum CompletionTotal {
-    Exact(u32),
-    HasMore,
-    Unknown,
-}
-
-impl CompletionTotal {
-    pub fn from_options(has_more: Option<bool>, total: Option<u32>) -> Self {
-        match (has_more, total) {
-            (_, Some(count)) => CompletionTotal::Exact(count),
-            (Some(true), _) => CompletionTotal::HasMore,
-            _ => CompletionTotal::Unknown,
-        }
-    }
-}
-
-pub struct Completion {
-    pub values: Vec<String>,
-    pub total: CompletionTotal,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct CallToolResponse {
-    pub content: Vec<ToolResponseContent>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub is_error: Option<bool>,
-    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
-    pub meta: Option<HashMap<String, serde_json::Value>>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub structured_content: Option<serde_json::Value>,
-}
-
-impl CallToolResponse {
-    pub fn text_contents(&self) -> String {
-        let mut text = String::new();
-        for chunk in &self.content {
-            if let ToolResponseContent::Text { text: chunk } = chunk {
-                text.push_str(chunk)
-            };
-        }
-        text
-    }
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(tag = "type")]
-pub enum ToolResponseContent {
-    #[serde(rename = "text")]
-    Text { text: String },
-    #[serde(rename = "image", rename_all = "camelCase")]
-    Image { data: String, mime_type: String },
-    #[serde(rename = "audio", rename_all = "camelCase")]
-    Audio { data: String, mime_type: String },
-    #[serde(rename = "resource")]
-    Resource { resource: ResourceContents },
-}
-
-impl ToolResponseContent {
-    pub fn text(&self) -> Option<&str> {
-        if let ToolResponseContent::Text { text } = self {
-            Some(text)
-        } else {
-            None
-        }
-    }
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ListToolsResponse {
-    pub tools: Vec<Tool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub next_cursor: Option<String>,
-    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
-    pub meta: Option<HashMap<String, serde_json::Value>>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ListResourceTemplatesResponse {
-    pub resource_templates: Vec<ResourceTemplate>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub next_cursor: Option<String>,
-    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
-    pub meta: Option<HashMap<String, serde_json::Value>>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ListRootsResponse {
-    pub roots: Vec<Root>,
-    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
-    pub meta: Option<HashMap<String, serde_json::Value>>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Root {
-    pub uri: Url,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub name: Option<String>,
-}
diff --git a/crates/copilot/Cargo.toml b/crates/copilot/Cargo.toml
deleted file mode 100644
index 459abda175..0000000000
--- a/crates/copilot/Cargo.toml
+++ /dev/null
@@ -1,79 +0,0 @@
-[package]
-name = "copilot"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/copilot.rs"
-doctest = false
-
-[features]
-default = []
-test-support = [
-    "collections/test-support",
-    "gpui/test-support",
-    "language/test-support",
-    "lsp/test-support",
-    "settings/test-support",
-    "util/test-support",
-]
-
-[dependencies]
-anyhow.workspace = true
-chrono.workspace = true
-collections.workspace = true
-command_palette_hooks.workspace = true
-dirs.workspace = true
-fs.workspace = true
-futures.workspace = true
-gpui.workspace = true
-http_client.workspace = true
-edit_prediction_types.workspace = true
-language.workspace = true
-log.workspace = true
-lsp.workspace = true
-menu.workspace = true
-node_runtime.workspace = true
-parking_lot.workspace = true
-paths.workspace = true
-project.workspace = true
-semver.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-sum_tree.workspace = true
-task.workspace = true
-ui.workspace = true
-util.workspace = true
-workspace.workspace = true
-itertools.workspace = true
-
-[target.'cfg(windows)'.dependencies]
-async-std = { version = "1.12.0", features = ["unstable"] }
-
-[dev-dependencies]
-client = { workspace = true, features = ["test-support"] }
-clock = { workspace = true, features = ["test-support"] }
-collections = { workspace = true, features = ["test-support"] }
-ctor.workspace = true
-editor = { workspace = true, features = ["test-support"] }
-fs = { workspace = true, features = ["test-support"] }
-gpui = { workspace = true, features = ["test-support"] }
-http_client = { workspace = true, features = ["test-support"] }
-indoc.workspace = true
-language = { workspace = true, features = ["test-support"] }
-lsp = { workspace = true, features = ["test-support"] }
-node_runtime = { workspace = true, features = ["test-support"] }
-project = { workspace = true, features = ["test-support"] }
-rpc = { workspace = true, features = ["test-support"] }
-serde_json.workspace = true
-settings = { workspace = true, features = ["test-support"] }
-theme = { workspace = true, features = ["test-support"] }
-util = { workspace = true, features = ["test-support"] }
-workspace = { workspace = true, features = ["test-support"] }
-zlog.workspace = true
diff --git a/crates/copilot/LICENSE-GPL b/crates/copilot/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/copilot/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/copilot/src/copilot.rs b/crates/copilot/src/copilot.rs
deleted file mode 100644
index 4e65209060..0000000000
--- a/crates/copilot/src/copilot.rs
+++ /dev/null
@@ -1,1472 +0,0 @@
-pub mod copilot_chat;
-mod copilot_edit_prediction_delegate;
-pub mod copilot_responses;
-pub mod request;
-mod sign_in;
-
-use crate::sign_in::initiate_sign_in_within_workspace;
-use ::fs::Fs;
-use anyhow::{Context as _, Result, anyhow};
-use collections::{HashMap, HashSet};
-use command_palette_hooks::CommandPaletteFilter;
-use futures::{Future, FutureExt, TryFutureExt, channel::oneshot, future::Shared};
-use gpui::{
-    App, AppContext as _, AsyncApp, Context, Entity, EntityId, EventEmitter, Global, Task,
-    WeakEntity, actions,
-};
-use http_client::HttpClient;
-use language::language_settings::CopilotSettings;
-use language::{
-    Anchor, Bias, Buffer, BufferSnapshot, Language, PointUtf16, ToPointUtf16,
-    language_settings::{EditPredictionProvider, all_language_settings, language_settings},
-    point_from_lsp, point_to_lsp,
-};
-use lsp::{LanguageServer, LanguageServerBinary, LanguageServerId, LanguageServerName};
-use node_runtime::{NodeRuntime, VersionStrategy};
-use parking_lot::Mutex;
-use project::DisableAiSettings;
-use request::StatusNotification;
-use semver::Version;
-use serde_json::json;
-use settings::Settings;
-use settings::SettingsStore;
-use sign_in::{reinstall_and_sign_in_within_workspace, sign_out_within_workspace};
-use std::collections::hash_map::Entry;
-use std::{
-    any::TypeId,
-    env,
-    ffi::OsString,
-    mem,
-    ops::Range,
-    path::{Path, PathBuf},
-    sync::Arc,
-};
-use sum_tree::Dimensions;
-use util::rel_path::RelPath;
-use util::{ResultExt, fs::remove_matching};
-use workspace::Workspace;
-
-pub use crate::copilot_edit_prediction_delegate::CopilotEditPredictionDelegate;
-pub use crate::sign_in::{CopilotCodeVerification, initiate_sign_in, reinstall_and_sign_in};
-
-actions!(
-    copilot,
-    [
-        /// Requests a code completion suggestion from Copilot.
-        Suggest,
-        /// Cycles to the next Copilot suggestion.
-        NextSuggestion,
-        /// Cycles to the previous Copilot suggestion.
-        PreviousSuggestion,
-        /// Reinstalls the Copilot language server.
-        Reinstall,
-        /// Signs in to GitHub Copilot.
-        SignIn,
-        /// Signs out of GitHub Copilot.
-        SignOut
-    ]
-);
-
-pub fn init(
-    new_server_id: LanguageServerId,
-    fs: Arc<dyn Fs>,
-    http: Arc<dyn HttpClient>,
-    node_runtime: NodeRuntime,
-    cx: &mut App,
-) {
-    let language_settings = all_language_settings(None, cx);
-    let configuration = copilot_chat::CopilotChatConfiguration {
-        enterprise_uri: language_settings
-            .edit_predictions
-            .copilot
-            .enterprise_uri
-            .clone(),
-    };
-    copilot_chat::init(fs.clone(), http.clone(), configuration, cx);
-
-    let copilot = cx.new(move |cx| Copilot::start(new_server_id, fs, node_runtime, cx));
-    Copilot::set_global(copilot.clone(), cx);
-    cx.observe(&copilot, |copilot, cx| {
-        copilot.update(cx, |copilot, cx| copilot.update_action_visibilities(cx));
-    })
-    .detach();
-    cx.observe_global::<SettingsStore>(|cx| {
-        if let Some(copilot) = Copilot::global(cx) {
-            copilot.update(cx, |copilot, cx| copilot.update_action_visibilities(cx));
-        }
-    })
-    .detach();
-
-    cx.observe_new(|workspace: &mut Workspace, _window, _cx| {
-        workspace.register_action(|workspace, _: &SignIn, window, cx| {
-            if let Some(copilot) = Copilot::global(cx) {
-                let is_reinstall = false;
-                initiate_sign_in_within_workspace(workspace, copilot, is_reinstall, window, cx);
-            }
-        });
-        workspace.register_action(|workspace, _: &Reinstall, window, cx| {
-            if let Some(copilot) = Copilot::global(cx) {
-                reinstall_and_sign_in_within_workspace(workspace, copilot, window, cx);
-            }
-        });
-        workspace.register_action(|workspace, _: &SignOut, _window, cx| {
-            if let Some(copilot) = Copilot::global(cx) {
-                sign_out_within_workspace(workspace, copilot, cx);
-            }
-        });
-    })
-    .detach();
-}
-
-enum CopilotServer {
-    Disabled,
-    Starting { task: Shared<Task<()>> },
-    Error(Arc<str>),
-    Running(RunningCopilotServer),
-}
-
-impl CopilotServer {
-    fn as_authenticated(&mut self) -> Result<&mut RunningCopilotServer> {
-        let server = self.as_running()?;
-        anyhow::ensure!(
-            matches!(server.sign_in_status, SignInStatus::Authorized),
-            "must sign in before using copilot"
-        );
-        Ok(server)
-    }
-
-    fn as_running(&mut self) -> Result<&mut RunningCopilotServer> {
-        match self {
-            CopilotServer::Starting { .. } => anyhow::bail!("copilot is still starting"),
-            CopilotServer::Disabled => anyhow::bail!("copilot is disabled"),
-            CopilotServer::Error(error) => {
-                anyhow::bail!("copilot was not started because of an error: {error}")
-            }
-            CopilotServer::Running(server) => Ok(server),
-        }
-    }
-}
-
-struct RunningCopilotServer {
-    lsp: Arc<LanguageServer>,
-    sign_in_status: SignInStatus,
-    registered_buffers: HashMap<EntityId, RegisteredBuffer>,
-}
-
-#[derive(Clone, Debug)]
-enum SignInStatus {
-    Authorized,
-    Unauthorized,
-    SigningIn {
-        prompt: Option<request::PromptUserDeviceFlow>,
-        task: Shared<Task<Result<(), Arc<anyhow::Error>>>>,
-    },
-    SignedOut {
-        awaiting_signing_in: bool,
-    },
-}
-
-#[derive(Debug, Clone)]
-pub enum Status {
-    Starting {
-        task: Shared<Task<()>>,
-    },
-    Error(Arc<str>),
-    Disabled,
-    SignedOut {
-        awaiting_signing_in: bool,
-    },
-    SigningIn {
-        prompt: Option<request::PromptUserDeviceFlow>,
-    },
-    Unauthorized,
-    Authorized,
-}
-
-impl Status {
-    pub fn is_authorized(&self) -> bool {
-        matches!(self, Status::Authorized)
-    }
-
-    pub fn is_configured(&self) -> bool {
-        matches!(
-            self,
-            Status::Starting { .. }
-                | Status::Error(_)
-                | Status::SigningIn { .. }
-                | Status::Authorized
-        )
-    }
-}
-
-struct RegisteredBuffer {
-    uri: lsp::Uri,
-    language_id: String,
-    snapshot: BufferSnapshot,
-    snapshot_version: i32,
-    _subscriptions: [gpui::Subscription; 2],
-    pending_buffer_change: Task<Option<()>>,
-}
-
-impl RegisteredBuffer {
-    fn report_changes(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        cx: &mut Context<Copilot>,
-    ) -> oneshot::Receiver<(i32, BufferSnapshot)> {
-        let (done_tx, done_rx) = oneshot::channel();
-
-        if buffer.read(cx).version() == self.snapshot.version {
-            let _ = done_tx.send((self.snapshot_version, self.snapshot.clone()));
-        } else {
-            let buffer = buffer.downgrade();
-            let id = buffer.entity_id();
-            let prev_pending_change =
-                mem::replace(&mut self.pending_buffer_change, Task::ready(None));
-            self.pending_buffer_change = cx.spawn(async move |copilot, cx| {
-                prev_pending_change.await;
-
-                let old_version = copilot
-                    .update(cx, |copilot, _| {
-                        let server = copilot.server.as_authenticated().log_err()?;
-                        let buffer = server.registered_buffers.get_mut(&id)?;
-                        Some(buffer.snapshot.version.clone())
-                    })
-                    .ok()??;
-                let new_snapshot = buffer.read_with(cx, |buffer, _| buffer.snapshot()).ok()?;
-
-                let content_changes = cx
-                    .background_spawn({
-                        let new_snapshot = new_snapshot.clone();
-                        async move {
-                            new_snapshot
-                                .edits_since::<Dimensions<PointUtf16, usize>>(&old_version)
-                                .map(|edit| {
-                                    let edit_start = edit.new.start.0;
-                                    let edit_end = edit_start + (edit.old.end.0 - edit.old.start.0);
-                                    let new_text = new_snapshot
-                                        .text_for_range(edit.new.start.1..edit.new.end.1)
-                                        .collect();
-                                    lsp::TextDocumentContentChangeEvent {
-                                        range: Some(lsp::Range::new(
-                                            point_to_lsp(edit_start),
-                                            point_to_lsp(edit_end),
-                                        )),
-                                        range_length: None,
-                                        text: new_text,
-                                    }
-                                })
-                                .collect::<Vec<_>>()
-                        }
-                    })
-                    .await;
-
-                copilot
-                    .update(cx, |copilot, _| {
-                        let server = copilot.server.as_authenticated().log_err()?;
-                        let buffer = server.registered_buffers.get_mut(&id)?;
-                        if !content_changes.is_empty() {
-                            buffer.snapshot_version += 1;
-                            buffer.snapshot = new_snapshot;
-                            server
-                                .lsp
-                                .notify::<lsp::notification::DidChangeTextDocument>(
-                                    lsp::DidChangeTextDocumentParams {
-                                        text_document: lsp::VersionedTextDocumentIdentifier::new(
-                                            buffer.uri.clone(),
-                                            buffer.snapshot_version,
-                                        ),
-                                        content_changes,
-                                    },
-                                )
-                                .ok();
-                        }
-                        let _ = done_tx.send((buffer.snapshot_version, buffer.snapshot.clone()));
-                        Some(())
-                    })
-                    .ok()?;
-
-                Some(())
-            });
-        }
-
-        done_rx
-    }
-}
-
-#[derive(Debug)]
-pub struct Completion {
-    pub uuid: String,
-    pub range: Range<Anchor>,
-    pub text: String,
-}
-
-pub struct Copilot {
-    fs: Arc<dyn Fs>,
-    node_runtime: NodeRuntime,
-    server: CopilotServer,
-    buffers: HashSet<WeakEntity<Buffer>>,
-    server_id: LanguageServerId,
-    _subscription: gpui::Subscription,
-}
-
-pub enum Event {
-    CopilotLanguageServerStarted,
-    CopilotAuthSignedIn,
-    CopilotAuthSignedOut,
-}
-
-impl EventEmitter<Event> for Copilot {}
-
-struct GlobalCopilot(Entity<Copilot>);
-
-impl Global for GlobalCopilot {}
-
-impl Copilot {
-    pub fn global(cx: &App) -> Option<Entity<Self>> {
-        cx.try_global::<GlobalCopilot>()
-            .map(|model| model.0.clone())
-    }
-
-    pub fn set_global(copilot: Entity<Self>, cx: &mut App) {
-        cx.set_global(GlobalCopilot(copilot));
-    }
-
-    fn start(
-        new_server_id: LanguageServerId,
-        fs: Arc<dyn Fs>,
-        node_runtime: NodeRuntime,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let mut this = Self {
-            server_id: new_server_id,
-            fs,
-            node_runtime,
-            server: CopilotServer::Disabled,
-            buffers: Default::default(),
-            _subscription: cx.on_app_quit(Self::shutdown_language_server),
-        };
-        this.start_copilot(true, false, cx);
-        cx.observe_global::<SettingsStore>(move |this, cx| {
-            this.start_copilot(true, false, cx);
-            if let Ok(server) = this.server.as_running() {
-                notify_did_change_config_to_server(&server.lsp, cx)
-                    .context("copilot setting change: did change configuration")
-                    .log_err();
-            }
-        })
-        .detach();
-        this
-    }
-
-    fn shutdown_language_server(
-        &mut self,
-        _cx: &mut Context<Self>,
-    ) -> impl Future<Output = ()> + use<> {
-        let shutdown = match mem::replace(&mut self.server, CopilotServer::Disabled) {
-            CopilotServer::Running(server) => Some(Box::pin(async move { server.lsp.shutdown() })),
-            _ => None,
-        };
-
-        async move {
-            if let Some(shutdown) = shutdown {
-                shutdown.await;
-            }
-        }
-    }
-
-    fn start_copilot(
-        &mut self,
-        check_edit_prediction_provider: bool,
-        awaiting_sign_in_after_start: bool,
-        cx: &mut Context<Self>,
-    ) {
-        if !matches!(self.server, CopilotServer::Disabled) {
-            return;
-        }
-        let language_settings = all_language_settings(None, cx);
-        if check_edit_prediction_provider
-            && language_settings.edit_predictions.provider != EditPredictionProvider::Copilot
-        {
-            return;
-        }
-        let server_id = self.server_id;
-        let fs = self.fs.clone();
-        let node_runtime = self.node_runtime.clone();
-        let env = self.build_env(&language_settings.edit_predictions.copilot);
-        let start_task = cx
-            .spawn(async move |this, cx| {
-                Self::start_language_server(
-                    server_id,
-                    fs,
-                    node_runtime,
-                    env,
-                    this,
-                    awaiting_sign_in_after_start,
-                    cx,
-                )
-                .await
-            })
-            .shared();
-        self.server = CopilotServer::Starting { task: start_task };
-        cx.notify();
-    }
-
-    fn build_env(&self, copilot_settings: &CopilotSettings) -> Option<HashMap<String, String>> {
-        let proxy_url = copilot_settings.proxy.clone()?;
-        let no_verify = copilot_settings.proxy_no_verify;
-        let http_or_https_proxy = if proxy_url.starts_with("http:") {
-            Some("HTTP_PROXY")
-        } else if proxy_url.starts_with("https:") {
-            Some("HTTPS_PROXY")
-        } else {
-            log::error!(
-                "Unsupported protocol scheme for language server proxy (must be http or https)"
-            );
-            None
-        };
-
-        let mut env = HashMap::default();
-
-        if let Some(proxy_type) = http_or_https_proxy {
-            env.insert(proxy_type.to_string(), proxy_url);
-            if let Some(true) = no_verify {
-                env.insert("NODE_TLS_REJECT_UNAUTHORIZED".to_string(), "0".to_string());
-            };
-        }
-
-        if let Ok(oauth_token) = env::var(copilot_chat::COPILOT_OAUTH_ENV_VAR) {
-            env.insert(copilot_chat::COPILOT_OAUTH_ENV_VAR.to_string(), oauth_token);
-        }
-
-        if env.is_empty() { None } else { Some(env) }
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn fake(cx: &mut gpui::TestAppContext) -> (Entity<Self>, lsp::FakeLanguageServer) {
-        use fs::FakeFs;
-        use lsp::FakeLanguageServer;
-        use node_runtime::NodeRuntime;
-
-        let (server, fake_server) = FakeLanguageServer::new(
-            LanguageServerId(0),
-            LanguageServerBinary {
-                path: "path/to/copilot".into(),
-                arguments: vec![],
-                env: None,
-            },
-            "copilot".into(),
-            Default::default(),
-            &mut cx.to_async(),
-        );
-        let node_runtime = NodeRuntime::unavailable();
-        let this = cx.new(|cx| Self {
-            server_id: LanguageServerId(0),
-            fs: FakeFs::new(cx.background_executor().clone()),
-            node_runtime,
-            server: CopilotServer::Running(RunningCopilotServer {
-                lsp: Arc::new(server),
-                sign_in_status: SignInStatus::Authorized,
-                registered_buffers: Default::default(),
-            }),
-            _subscription: cx.on_app_quit(Self::shutdown_language_server),
-            buffers: Default::default(),
-        });
-        (this, fake_server)
-    }
-
-    async fn start_language_server(
-        new_server_id: LanguageServerId,
-        fs: Arc<dyn Fs>,
-        node_runtime: NodeRuntime,
-        env: Option<HashMap<String, String>>,
-        this: WeakEntity<Self>,
-        awaiting_sign_in_after_start: bool,
-        cx: &mut AsyncApp,
-    ) {
-        let start_language_server = async {
-            let server_path = get_copilot_lsp(fs, node_runtime.clone()).await?;
-            let node_path = node_runtime.binary_path().await?;
-            ensure_node_version_for_copilot(&node_path).await?;
-
-            let arguments: Vec<OsString> = vec![
-                "--experimental-sqlite".into(),
-                server_path.into(),
-                "--stdio".into(),
-            ];
-            let binary = LanguageServerBinary {
-                path: node_path,
-                arguments,
-                env,
-            };
-
-            let root_path = if cfg!(target_os = "windows") {
-                Path::new("C:/")
-            } else {
-                Path::new("/")
-            };
-
-            let server_name = LanguageServerName("copilot".into());
-            let server = LanguageServer::new(
-                Arc::new(Mutex::new(None)),
-                new_server_id,
-                server_name,
-                binary,
-                root_path,
-                None,
-                Default::default(),
-                cx,
-            )?;
-
-            server
-                .on_notification::<StatusNotification, _>(|_, _| { /* Silence the notification */ })
-                .detach();
-
-            let configuration = lsp::DidChangeConfigurationParams {
-                settings: Default::default(),
-            };
-
-            let editor_info = request::SetEditorInfoParams {
-                editor_info: request::EditorInfo {
-                    name: "zed".into(),
-                    version: env!("CARGO_PKG_VERSION").into(),
-                },
-                editor_plugin_info: request::EditorPluginInfo {
-                    name: "zed-copilot".into(),
-                    version: "0.0.1".into(),
-                },
-            };
-            let editor_info_json = serde_json::to_value(&editor_info)?;
-
-            let server = cx
-                .update(|cx| {
-                    let mut params = server.default_initialize_params(false, cx);
-                    params.initialization_options = Some(editor_info_json);
-                    server.initialize(params, configuration.into(), cx)
-                })?
-                .await?;
-
-            this.update(cx, |_, cx| notify_did_change_config_to_server(&server, cx))?
-                .context("copilot: did change configuration")?;
-
-            let status = server
-                .request::<request::CheckStatus>(request::CheckStatusParams {
-                    local_checks_only: false,
-                })
-                .await
-                .into_response()
-                .context("copilot: check status")?;
-
-            anyhow::Ok((server, status))
-        };
-
-        let server = start_language_server.await;
-        this.update(cx, |this, cx| {
-            cx.notify();
-            match server {
-                Ok((server, status)) => {
-                    this.server = CopilotServer::Running(RunningCopilotServer {
-                        lsp: server,
-                        sign_in_status: SignInStatus::SignedOut {
-                            awaiting_signing_in: awaiting_sign_in_after_start,
-                        },
-                        registered_buffers: Default::default(),
-                    });
-                    cx.emit(Event::CopilotLanguageServerStarted);
-                    this.update_sign_in_status(status, cx);
-                }
-                Err(error) => {
-                    this.server = CopilotServer::Error(error.to_string().into());
-                    cx.notify()
-                }
-            }
-        })
-        .ok();
-    }
-
-    pub(crate) fn sign_in(&mut self, cx: &mut Context<Self>) -> Task<Result<()>> {
-        if let CopilotServer::Running(server) = &mut self.server {
-            let task = match &server.sign_in_status {
-                SignInStatus::Authorized => Task::ready(Ok(())).shared(),
-                SignInStatus::SigningIn { task, .. } => {
-                    cx.notify();
-                    task.clone()
-                }
-                SignInStatus::SignedOut { .. } | SignInStatus::Unauthorized => {
-                    let lsp = server.lsp.clone();
-                    let task = cx
-                        .spawn(async move |this, cx| {
-                            let sign_in = async {
-                                let sign_in = lsp
-                                    .request::<request::SignInInitiate>(
-                                        request::SignInInitiateParams {},
-                                    )
-                                    .await
-                                    .into_response()
-                                    .context("copilot sign-in")?;
-                                match sign_in {
-                                    request::SignInInitiateResult::AlreadySignedIn { user } => {
-                                        Ok(request::SignInStatus::Ok { user: Some(user) })
-                                    }
-                                    request::SignInInitiateResult::PromptUserDeviceFlow(flow) => {
-                                        this.update(cx, |this, cx| {
-                                            if let CopilotServer::Running(RunningCopilotServer {
-                                                sign_in_status: status,
-                                                ..
-                                            }) = &mut this.server
-                                                && let SignInStatus::SigningIn {
-                                                    prompt: prompt_flow,
-                                                    ..
-                                                } = status
-                                            {
-                                                *prompt_flow = Some(flow.clone());
-                                                cx.notify();
-                                            }
-                                        })?;
-                                        let response = lsp
-                                            .request::<request::SignInConfirm>(
-                                                request::SignInConfirmParams {
-                                                    user_code: flow.user_code,
-                                                },
-                                            )
-                                            .await
-                                            .into_response()
-                                            .context("copilot: sign in confirm")?;
-                                        Ok(response)
-                                    }
-                                }
-                            };
-
-                            let sign_in = sign_in.await;
-                            this.update(cx, |this, cx| match sign_in {
-                                Ok(status) => {
-                                    this.update_sign_in_status(status, cx);
-                                    Ok(())
-                                }
-                                Err(error) => {
-                                    this.update_sign_in_status(
-                                        request::SignInStatus::NotSignedIn,
-                                        cx,
-                                    );
-                                    Err(Arc::new(error))
-                                }
-                            })?
-                        })
-                        .shared();
-                    server.sign_in_status = SignInStatus::SigningIn {
-                        prompt: None,
-                        task: task.clone(),
-                    };
-                    cx.notify();
-                    task
-                }
-            };
-
-            cx.background_spawn(task.map_err(|err| anyhow!("{err:?}")))
-        } else {
-            // If we're downloading, wait until download is finished
-            // If we're in a stuck state, display to the user
-            Task::ready(Err(anyhow!("copilot hasn't started yet")))
-        }
-    }
-
-    pub(crate) fn sign_out(&mut self, cx: &mut Context<Self>) -> Task<Result<()>> {
-        self.update_sign_in_status(request::SignInStatus::NotSignedIn, cx);
-        match &self.server {
-            CopilotServer::Running(RunningCopilotServer { lsp: server, .. }) => {
-                let server = server.clone();
-                cx.background_spawn(async move {
-                    server
-                        .request::<request::SignOut>(request::SignOutParams {})
-                        .await
-                        .into_response()
-                        .context("copilot: sign in confirm")?;
-                    anyhow::Ok(())
-                })
-            }
-            CopilotServer::Disabled => cx.background_spawn(async {
-                clear_copilot_config_dir().await;
-                anyhow::Ok(())
-            }),
-            _ => Task::ready(Err(anyhow!("copilot hasn't started yet"))),
-        }
-    }
-
-    pub(crate) fn reinstall(&mut self, cx: &mut Context<Self>) -> Shared<Task<()>> {
-        let language_settings = all_language_settings(None, cx);
-        let env = self.build_env(&language_settings.edit_predictions.copilot);
-        let start_task = cx
-            .spawn({
-                let fs = self.fs.clone();
-                let node_runtime = self.node_runtime.clone();
-                let server_id = self.server_id;
-                async move |this, cx| {
-                    clear_copilot_dir().await;
-                    Self::start_language_server(server_id, fs, node_runtime, env, this, false, cx)
-                        .await
-                }
-            })
-            .shared();
-
-        self.server = CopilotServer::Starting {
-            task: start_task.clone(),
-        };
-
-        cx.notify();
-
-        start_task
-    }
-
-    pub fn language_server(&self) -> Option<&Arc<LanguageServer>> {
-        if let CopilotServer::Running(server) = &self.server {
-            Some(&server.lsp)
-        } else {
-            None
-        }
-    }
-
-    pub fn register_buffer(&mut self, buffer: &Entity<Buffer>, cx: &mut Context<Self>) {
-        let weak_buffer = buffer.downgrade();
-        self.buffers.insert(weak_buffer.clone());
-
-        if let CopilotServer::Running(RunningCopilotServer {
-            lsp: server,
-            sign_in_status: status,
-            registered_buffers,
-            ..
-        }) = &mut self.server
-        {
-            if !matches!(status, SignInStatus::Authorized) {
-                return;
-            }
-
-            let entry = registered_buffers.entry(buffer.entity_id());
-            if let Entry::Vacant(e) = entry {
-                let Ok(uri) = uri_for_buffer(buffer, cx) else {
-                    return;
-                };
-                let language_id = id_for_language(buffer.read(cx).language());
-                let snapshot = buffer.read(cx).snapshot();
-                server
-                    .notify::<lsp::notification::DidOpenTextDocument>(
-                        lsp::DidOpenTextDocumentParams {
-                            text_document: lsp::TextDocumentItem {
-                                uri: uri.clone(),
-                                language_id: language_id.clone(),
-                                version: 0,
-                                text: snapshot.text(),
-                            },
-                        },
-                    )
-                    .ok();
-
-                e.insert(RegisteredBuffer {
-                    uri,
-                    language_id,
-                    snapshot,
-                    snapshot_version: 0,
-                    pending_buffer_change: Task::ready(Some(())),
-                    _subscriptions: [
-                        cx.subscribe(buffer, |this, buffer, event, cx| {
-                            this.handle_buffer_event(buffer, event, cx).log_err();
-                        }),
-                        cx.observe_release(buffer, move |this, _buffer, _cx| {
-                            this.buffers.remove(&weak_buffer);
-                            this.unregister_buffer(&weak_buffer);
-                        }),
-                    ],
-                });
-            }
-        }
-    }
-
-    fn handle_buffer_event(
-        &mut self,
-        buffer: Entity<Buffer>,
-        event: &language::BufferEvent,
-        cx: &mut Context<Self>,
-    ) -> Result<()> {
-        if let Ok(server) = self.server.as_running()
-            && let Some(registered_buffer) = server.registered_buffers.get_mut(&buffer.entity_id())
-        {
-            match event {
-                language::BufferEvent::Edited => {
-                    drop(registered_buffer.report_changes(&buffer, cx));
-                }
-                language::BufferEvent::Saved => {
-                    server
-                        .lsp
-                        .notify::<lsp::notification::DidSaveTextDocument>(
-                            lsp::DidSaveTextDocumentParams {
-                                text_document: lsp::TextDocumentIdentifier::new(
-                                    registered_buffer.uri.clone(),
-                                ),
-                                text: None,
-                            },
-                        )
-                        .ok();
-                }
-                language::BufferEvent::FileHandleChanged
-                | language::BufferEvent::LanguageChanged(_) => {
-                    let new_language_id = id_for_language(buffer.read(cx).language());
-                    let Ok(new_uri) = uri_for_buffer(&buffer, cx) else {
-                        return Ok(());
-                    };
-                    if new_uri != registered_buffer.uri
-                        || new_language_id != registered_buffer.language_id
-                    {
-                        let old_uri = mem::replace(&mut registered_buffer.uri, new_uri);
-                        registered_buffer.language_id = new_language_id;
-                        server
-                            .lsp
-                            .notify::<lsp::notification::DidCloseTextDocument>(
-                                lsp::DidCloseTextDocumentParams {
-                                    text_document: lsp::TextDocumentIdentifier::new(old_uri),
-                                },
-                            )
-                            .ok();
-                        server
-                            .lsp
-                            .notify::<lsp::notification::DidOpenTextDocument>(
-                                lsp::DidOpenTextDocumentParams {
-                                    text_document: lsp::TextDocumentItem::new(
-                                        registered_buffer.uri.clone(),
-                                        registered_buffer.language_id.clone(),
-                                        registered_buffer.snapshot_version,
-                                        registered_buffer.snapshot.text(),
-                                    ),
-                                },
-                            )
-                            .ok();
-                    }
-                }
-                _ => {}
-            }
-        }
-
-        Ok(())
-    }
-
-    fn unregister_buffer(&mut self, buffer: &WeakEntity<Buffer>) {
-        if let Ok(server) = self.server.as_running()
-            && let Some(buffer) = server.registered_buffers.remove(&buffer.entity_id())
-        {
-            server
-                .lsp
-                .notify::<lsp::notification::DidCloseTextDocument>(
-                    lsp::DidCloseTextDocumentParams {
-                        text_document: lsp::TextDocumentIdentifier::new(buffer.uri),
-                    },
-                )
-                .ok();
-        }
-    }
-
-    pub fn completions<T>(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        position: T,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Vec<Completion>>>
-    where
-        T: ToPointUtf16,
-    {
-        self.request_completions::<request::GetCompletions, _>(buffer, position, cx)
-    }
-
-    pub fn completions_cycling<T>(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        position: T,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Vec<Completion>>>
-    where
-        T: ToPointUtf16,
-    {
-        self.request_completions::<request::GetCompletionsCycling, _>(buffer, position, cx)
-    }
-
-    pub fn accept_completion(
-        &mut self,
-        completion: &Completion,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let server = match self.server.as_authenticated() {
-            Ok(server) => server,
-            Err(error) => return Task::ready(Err(error)),
-        };
-        let request =
-            server
-                .lsp
-                .request::<request::NotifyAccepted>(request::NotifyAcceptedParams {
-                    uuid: completion.uuid.clone(),
-                });
-        cx.background_spawn(async move {
-            request
-                .await
-                .into_response()
-                .context("copilot: notify accepted")?;
-            Ok(())
-        })
-    }
-
-    pub fn discard_completions(
-        &mut self,
-        completions: &[Completion],
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let server = match self.server.as_authenticated() {
-            Ok(server) => server,
-            Err(_) => return Task::ready(Ok(())),
-        };
-        let request =
-            server
-                .lsp
-                .request::<request::NotifyRejected>(request::NotifyRejectedParams {
-                    uuids: completions
-                        .iter()
-                        .map(|completion| completion.uuid.clone())
-                        .collect(),
-                });
-        cx.background_spawn(async move {
-            request
-                .await
-                .into_response()
-                .context("copilot: notify rejected")?;
-            Ok(())
-        })
-    }
-
-    fn request_completions<R, T>(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        position: T,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Vec<Completion>>>
-    where
-        R: 'static
-            + lsp::request::Request<
-                Params = request::GetCompletionsParams,
-                Result = request::GetCompletionsResult,
-            >,
-        T: ToPointUtf16,
-    {
-        self.register_buffer(buffer, cx);
-
-        let server = match self.server.as_authenticated() {
-            Ok(server) => server,
-            Err(error) => return Task::ready(Err(error)),
-        };
-        let lsp = server.lsp.clone();
-        let registered_buffer = server
-            .registered_buffers
-            .get_mut(&buffer.entity_id())
-            .unwrap();
-        let snapshot = registered_buffer.report_changes(buffer, cx);
-        let buffer = buffer.read(cx);
-        let uri = registered_buffer.uri.clone();
-        let position = position.to_point_utf16(buffer);
-        let settings = language_settings(
-            buffer.language_at(position).map(|l| l.name()),
-            buffer.file(),
-            cx,
-        );
-        let tab_size = settings.tab_size;
-        let hard_tabs = settings.hard_tabs;
-        let relative_path = buffer
-            .file()
-            .map_or(RelPath::empty().into(), |file| file.path().clone());
-
-        cx.background_spawn(async move {
-            let (version, snapshot) = snapshot.await?;
-            let result = lsp
-                .request::<R>(request::GetCompletionsParams {
-                    doc: request::GetCompletionsDocument {
-                        uri,
-                        tab_size: tab_size.into(),
-                        indent_size: 1,
-                        insert_spaces: !hard_tabs,
-                        relative_path: relative_path.to_proto(),
-                        position: point_to_lsp(position),
-                        version: version.try_into().unwrap(),
-                    },
-                })
-                .await
-                .into_response()
-                .context("copilot: get completions")?;
-            let completions = result
-                .completions
-                .into_iter()
-                .map(|completion| {
-                    let start = snapshot
-                        .clip_point_utf16(point_from_lsp(completion.range.start), Bias::Left);
-                    let end =
-                        snapshot.clip_point_utf16(point_from_lsp(completion.range.end), Bias::Left);
-                    Completion {
-                        uuid: completion.uuid,
-                        range: snapshot.anchor_before(start)..snapshot.anchor_after(end),
-                        text: completion.text,
-                    }
-                })
-                .collect();
-            anyhow::Ok(completions)
-        })
-    }
-
-    pub fn status(&self) -> Status {
-        match &self.server {
-            CopilotServer::Starting { task } => Status::Starting { task: task.clone() },
-            CopilotServer::Disabled => Status::Disabled,
-            CopilotServer::Error(error) => Status::Error(error.clone()),
-            CopilotServer::Running(RunningCopilotServer { sign_in_status, .. }) => {
-                match sign_in_status {
-                    SignInStatus::Authorized => Status::Authorized,
-                    SignInStatus::Unauthorized => Status::Unauthorized,
-                    SignInStatus::SigningIn { prompt, .. } => Status::SigningIn {
-                        prompt: prompt.clone(),
-                    },
-                    SignInStatus::SignedOut {
-                        awaiting_signing_in,
-                    } => Status::SignedOut {
-                        awaiting_signing_in: *awaiting_signing_in,
-                    },
-                }
-            }
-        }
-    }
-
-    fn update_sign_in_status(&mut self, lsp_status: request::SignInStatus, cx: &mut Context<Self>) {
-        self.buffers.retain(|buffer| buffer.is_upgradable());
-
-        if let Ok(server) = self.server.as_running() {
-            match lsp_status {
-                request::SignInStatus::Ok { user: Some(_) }
-                | request::SignInStatus::MaybeOk { .. }
-                | request::SignInStatus::AlreadySignedIn { .. } => {
-                    server.sign_in_status = SignInStatus::Authorized;
-                    cx.emit(Event::CopilotAuthSignedIn);
-                    for buffer in self.buffers.iter().cloned().collect::<Vec<_>>() {
-                        if let Some(buffer) = buffer.upgrade() {
-                            self.register_buffer(&buffer, cx);
-                        }
-                    }
-                }
-                request::SignInStatus::NotAuthorized { .. } => {
-                    server.sign_in_status = SignInStatus::Unauthorized;
-                    for buffer in self.buffers.iter().cloned().collect::<Vec<_>>() {
-                        self.unregister_buffer(&buffer);
-                    }
-                }
-                request::SignInStatus::Ok { user: None } | request::SignInStatus::NotSignedIn => {
-                    if !matches!(server.sign_in_status, SignInStatus::SignedOut { .. }) {
-                        server.sign_in_status = SignInStatus::SignedOut {
-                            awaiting_signing_in: false,
-                        };
-                    }
-                    cx.emit(Event::CopilotAuthSignedOut);
-                    for buffer in self.buffers.iter().cloned().collect::<Vec<_>>() {
-                        self.unregister_buffer(&buffer);
-                    }
-                }
-            }
-
-            cx.notify();
-        }
-    }
-
-    fn update_action_visibilities(&self, cx: &mut App) {
-        let signed_in_actions = [
-            TypeId::of::<Suggest>(),
-            TypeId::of::<NextSuggestion>(),
-            TypeId::of::<PreviousSuggestion>(),
-            TypeId::of::<Reinstall>(),
-        ];
-        let auth_actions = [TypeId::of::<SignOut>()];
-        let no_auth_actions = [TypeId::of::<SignIn>()];
-        let status = self.status();
-
-        let is_ai_disabled = DisableAiSettings::get_global(cx).disable_ai;
-        let filter = CommandPaletteFilter::global_mut(cx);
-
-        if is_ai_disabled {
-            filter.hide_action_types(&signed_in_actions);
-            filter.hide_action_types(&auth_actions);
-            filter.hide_action_types(&no_auth_actions);
-        } else {
-            match status {
-                Status::Disabled => {
-                    filter.hide_action_types(&signed_in_actions);
-                    filter.hide_action_types(&auth_actions);
-                    filter.hide_action_types(&no_auth_actions);
-                }
-                Status::Authorized => {
-                    filter.hide_action_types(&no_auth_actions);
-                    filter.show_action_types(signed_in_actions.iter().chain(&auth_actions));
-                }
-                _ => {
-                    filter.hide_action_types(&signed_in_actions);
-                    filter.hide_action_types(&auth_actions);
-                    filter.show_action_types(&no_auth_actions);
-                }
-            }
-        }
-    }
-}
-
-fn id_for_language(language: Option<&Arc<Language>>) -> String {
-    language
-        .map(|language| language.lsp_id())
-        .unwrap_or_else(|| "plaintext".to_string())
-}
-
-fn uri_for_buffer(buffer: &Entity<Buffer>, cx: &App) -> Result<lsp::Uri, ()> {
-    if let Some(file) = buffer.read(cx).file().and_then(|file| file.as_local()) {
-        lsp::Uri::from_file_path(file.abs_path(cx))
-    } else {
-        format!("buffer://{}", buffer.entity_id())
-            .parse()
-            .map_err(|_| ())
-    }
-}
-
-fn notify_did_change_config_to_server(
-    server: &Arc<LanguageServer>,
-    cx: &mut Context<Copilot>,
-) -> std::result::Result<(), anyhow::Error> {
-    let copilot_settings = all_language_settings(None, cx)
-        .edit_predictions
-        .copilot
-        .clone();
-
-    if let Some(copilot_chat) = copilot_chat::CopilotChat::global(cx) {
-        copilot_chat.update(cx, |chat, cx| {
-            chat.set_configuration(
-                copilot_chat::CopilotChatConfiguration {
-                    enterprise_uri: copilot_settings.enterprise_uri.clone(),
-                },
-                cx,
-            );
-        });
-    }
-
-    let settings = json!({
-        "http": {
-            "proxy": copilot_settings.proxy,
-            "proxyStrictSSL": !copilot_settings.proxy_no_verify.unwrap_or(false)
-        },
-        "github-enterprise": {
-            "uri": copilot_settings.enterprise_uri
-        }
-    });
-
-    server
-        .notify::<lsp::notification::DidChangeConfiguration>(lsp::DidChangeConfigurationParams {
-            settings,
-        })
-        .ok();
-    Ok(())
-}
-
-async fn clear_copilot_dir() {
-    remove_matching(paths::copilot_dir(), |_| true).await
-}
-
-async fn clear_copilot_config_dir() {
-    remove_matching(copilot_chat::copilot_chat_config_dir(), |_| true).await
-}
-
-async fn ensure_node_version_for_copilot(node_path: &Path) -> anyhow::Result<()> {
-    const MIN_COPILOT_NODE_VERSION: Version = Version::new(20, 8, 0);
-
-    log::info!("Checking Node.js version for Copilot at: {:?}", node_path);
-
-    let output = util::command::new_smol_command(node_path)
-        .arg("--version")
-        .output()
-        .await
-        .with_context(|| format!("checking Node.js version at {:?}", node_path))?;
-
-    if !output.status.success() {
-        anyhow::bail!(
-            "failed to run node --version for Copilot. stdout: {}, stderr: {}",
-            String::from_utf8_lossy(&output.stdout),
-            String::from_utf8_lossy(&output.stderr),
-        );
-    }
-
-    let version_str = String::from_utf8_lossy(&output.stdout);
-    let version = Version::parse(version_str.trim().trim_start_matches('v'))
-        .with_context(|| format!("parsing Node.js version from '{}'", version_str.trim()))?;
-
-    if version < MIN_COPILOT_NODE_VERSION {
-        anyhow::bail!(
-            "GitHub Copilot language server requires Node.js {MIN_COPILOT_NODE_VERSION} or later, but found {version}. \
-            Please update your Node.js version or configure a different Node.js path in settings."
-        );
-    }
-
-    log::info!(
-        "Node.js version {} meets Copilot requirements (>= {})",
-        version,
-        MIN_COPILOT_NODE_VERSION
-    );
-    Ok(())
-}
-
-async fn get_copilot_lsp(fs: Arc<dyn Fs>, node_runtime: NodeRuntime) -> anyhow::Result<PathBuf> {
-    const PACKAGE_NAME: &str = "@github/copilot-language-server";
-    const SERVER_PATH: &str =
-        "node_modules/@github/copilot-language-server/dist/language-server.js";
-
-    let latest_version = node_runtime
-        .npm_package_latest_version(PACKAGE_NAME)
-        .await?;
-    let server_path = paths::copilot_dir().join(SERVER_PATH);
-
-    fs.create_dir(paths::copilot_dir()).await?;
-
-    let should_install = node_runtime
-        .should_install_npm_package(
-            PACKAGE_NAME,
-            &server_path,
-            paths::copilot_dir(),
-            VersionStrategy::Latest(&latest_version),
-        )
-        .await;
-    if should_install {
-        node_runtime
-            .npm_install_packages(paths::copilot_dir(), &[(PACKAGE_NAME, &latest_version)])
-            .await?;
-    }
-
-    Ok(server_path)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use gpui::TestAppContext;
-    use util::{path, paths::PathStyle, rel_path::rel_path};
-
-    #[gpui::test(iterations = 10)]
-    async fn test_buffer_management(cx: &mut TestAppContext) {
-        let (copilot, mut lsp) = Copilot::fake(cx);
-
-        let buffer_1 = cx.new(|cx| Buffer::local("Hello", cx));
-        let buffer_1_uri: lsp::Uri = format!("buffer://{}", buffer_1.entity_id().as_u64())
-            .parse()
-            .unwrap();
-        copilot.update(cx, |copilot, cx| copilot.register_buffer(&buffer_1, cx));
-        assert_eq!(
-            lsp.receive_notification::<lsp::notification::DidOpenTextDocument>()
-                .await,
-            lsp::DidOpenTextDocumentParams {
-                text_document: lsp::TextDocumentItem::new(
-                    buffer_1_uri.clone(),
-                    "plaintext".into(),
-                    0,
-                    "Hello".into()
-                ),
-            }
-        );
-
-        let buffer_2 = cx.new(|cx| Buffer::local("Goodbye", cx));
-        let buffer_2_uri: lsp::Uri = format!("buffer://{}", buffer_2.entity_id().as_u64())
-            .parse()
-            .unwrap();
-        copilot.update(cx, |copilot, cx| copilot.register_buffer(&buffer_2, cx));
-        assert_eq!(
-            lsp.receive_notification::<lsp::notification::DidOpenTextDocument>()
-                .await,
-            lsp::DidOpenTextDocumentParams {
-                text_document: lsp::TextDocumentItem::new(
-                    buffer_2_uri.clone(),
-                    "plaintext".into(),
-                    0,
-                    "Goodbye".into()
-                ),
-            }
-        );
-
-        buffer_1.update(cx, |buffer, cx| buffer.edit([(5..5, " world")], None, cx));
-        assert_eq!(
-            lsp.receive_notification::<lsp::notification::DidChangeTextDocument>()
-                .await,
-            lsp::DidChangeTextDocumentParams {
-                text_document: lsp::VersionedTextDocumentIdentifier::new(buffer_1_uri.clone(), 1),
-                content_changes: vec![lsp::TextDocumentContentChangeEvent {
-                    range: Some(lsp::Range::new(
-                        lsp::Position::new(0, 5),
-                        lsp::Position::new(0, 5)
-                    )),
-                    range_length: None,
-                    text: " world".into(),
-                }],
-            }
-        );
-
-        // Ensure updates to the file are reflected in the LSP.
-        buffer_1.update(cx, |buffer, cx| {
-            buffer.file_updated(
-                Arc::new(File {
-                    abs_path: path!("/root/child/buffer-1").into(),
-                    path: rel_path("child/buffer-1").into(),
-                }),
-                cx,
-            )
-        });
-        assert_eq!(
-            lsp.receive_notification::<lsp::notification::DidCloseTextDocument>()
-                .await,
-            lsp::DidCloseTextDocumentParams {
-                text_document: lsp::TextDocumentIdentifier::new(buffer_1_uri),
-            }
-        );
-        let buffer_1_uri = lsp::Uri::from_file_path(path!("/root/child/buffer-1")).unwrap();
-        assert_eq!(
-            lsp.receive_notification::<lsp::notification::DidOpenTextDocument>()
-                .await,
-            lsp::DidOpenTextDocumentParams {
-                text_document: lsp::TextDocumentItem::new(
-                    buffer_1_uri.clone(),
-                    "plaintext".into(),
-                    1,
-                    "Hello world".into()
-                ),
-            }
-        );
-
-        // Ensure all previously-registered buffers are closed when signing out.
-        lsp.set_request_handler::<request::SignOut, _, _>(|_, _| async {
-            Ok(request::SignOutResult {})
-        });
-        copilot
-            .update(cx, |copilot, cx| copilot.sign_out(cx))
-            .await
-            .unwrap();
-        assert_eq!(
-            lsp.receive_notification::<lsp::notification::DidCloseTextDocument>()
-                .await,
-            lsp::DidCloseTextDocumentParams {
-                text_document: lsp::TextDocumentIdentifier::new(buffer_1_uri.clone()),
-            }
-        );
-        assert_eq!(
-            lsp.receive_notification::<lsp::notification::DidCloseTextDocument>()
-                .await,
-            lsp::DidCloseTextDocumentParams {
-                text_document: lsp::TextDocumentIdentifier::new(buffer_2_uri.clone()),
-            }
-        );
-
-        // Ensure all previously-registered buffers are re-opened when signing in.
-        lsp.set_request_handler::<request::SignInInitiate, _, _>(|_, _| async {
-            Ok(request::SignInInitiateResult::AlreadySignedIn {
-                user: "user-1".into(),
-            })
-        });
-        copilot
-            .update(cx, |copilot, cx| copilot.sign_in(cx))
-            .await
-            .unwrap();
-
-        assert_eq!(
-            lsp.receive_notification::<lsp::notification::DidOpenTextDocument>()
-                .await,
-            lsp::DidOpenTextDocumentParams {
-                text_document: lsp::TextDocumentItem::new(
-                    buffer_1_uri.clone(),
-                    "plaintext".into(),
-                    0,
-                    "Hello world".into()
-                ),
-            }
-        );
-        assert_eq!(
-            lsp.receive_notification::<lsp::notification::DidOpenTextDocument>()
-                .await,
-            lsp::DidOpenTextDocumentParams {
-                text_document: lsp::TextDocumentItem::new(
-                    buffer_2_uri.clone(),
-                    "plaintext".into(),
-                    0,
-                    "Goodbye".into()
-                ),
-            }
-        );
-        // Dropping a buffer causes it to be closed on the LSP side as well.
-        cx.update(|_| drop(buffer_2));
-        assert_eq!(
-            lsp.receive_notification::<lsp::notification::DidCloseTextDocument>()
-                .await,
-            lsp::DidCloseTextDocumentParams {
-                text_document: lsp::TextDocumentIdentifier::new(buffer_2_uri),
-            }
-        );
-    }
-
-    struct File {
-        abs_path: PathBuf,
-        path: Arc<RelPath>,
-    }
-
-    impl language::File for File {
-        fn as_local(&self) -> Option<&dyn language::LocalFile> {
-            Some(self)
-        }
-
-        fn disk_state(&self) -> language::DiskState {
-            language::DiskState::Present {
-                mtime: ::fs::MTime::from_seconds_and_nanos(100, 42),
-            }
-        }
-
-        fn path(&self) -> &Arc<RelPath> {
-            &self.path
-        }
-
-        fn path_style(&self, _: &App) -> PathStyle {
-            PathStyle::local()
-        }
-
-        fn full_path(&self, _: &App) -> PathBuf {
-            unimplemented!()
-        }
-
-        fn file_name<'a>(&'a self, _: &'a App) -> &'a str {
-            unimplemented!()
-        }
-
-        fn to_proto(&self, _: &App) -> rpc::proto::File {
-            unimplemented!()
-        }
-
-        fn worktree_id(&self, _: &App) -> settings::WorktreeId {
-            settings::WorktreeId::from_usize(0)
-        }
-
-        fn is_private(&self) -> bool {
-            false
-        }
-    }
-
-    impl language::LocalFile for File {
-        fn abs_path(&self, _: &App) -> PathBuf {
-            self.abs_path.clone()
-        }
-
-        fn load(&self, _: &App) -> Task<Result<String>> {
-            unimplemented!()
-        }
-
-        fn load_bytes(&self, _cx: &App) -> Task<Result<Vec<u8>>> {
-            unimplemented!()
-        }
-    }
-}
-
-#[cfg(test)]
-#[ctor::ctor]
-fn init_logger() {
-    zlog::init_test();
-}
diff --git a/crates/copilot/src/copilot_chat.rs b/crates/copilot/src/copilot_chat.rs
deleted file mode 100644
index 52a3631791..0000000000
--- a/crates/copilot/src/copilot_chat.rs
+++ /dev/null
@@ -1,1013 +0,0 @@
-use std::path::PathBuf;
-use std::sync::Arc;
-use std::sync::OnceLock;
-
-use anyhow::Context as _;
-use anyhow::{Result, anyhow};
-use chrono::DateTime;
-use collections::HashSet;
-use fs::Fs;
-use futures::{AsyncBufReadExt, AsyncReadExt, StreamExt, io::BufReader, stream::BoxStream};
-use gpui::WeakEntity;
-use gpui::{App, AsyncApp, Global, prelude::*};
-use http_client::HttpRequestExt;
-use http_client::{AsyncBody, HttpClient, Method, Request as HttpRequest};
-use itertools::Itertools;
-use paths::home_dir;
-use serde::{Deserialize, Serialize};
-
-use crate::copilot_responses as responses;
-use settings::watch_config_dir;
-
-pub const COPILOT_OAUTH_ENV_VAR: &str = "GH_COPILOT_TOKEN";
-
-#[derive(Default, Clone, Debug, PartialEq)]
-pub struct CopilotChatConfiguration {
-    pub enterprise_uri: Option<String>,
-}
-
-impl CopilotChatConfiguration {
-    pub fn token_url(&self) -> String {
-        if let Some(enterprise_uri) = &self.enterprise_uri {
-            let domain = Self::parse_domain(enterprise_uri);
-            format!("https://api.{}/copilot_internal/v2/token", domain)
-        } else {
-            "https://api.github.com/copilot_internal/v2/token".to_string()
-        }
-    }
-
-    pub fn oauth_domain(&self) -> String {
-        if let Some(enterprise_uri) = &self.enterprise_uri {
-            Self::parse_domain(enterprise_uri)
-        } else {
-            "github.com".to_string()
-        }
-    }
-
-    pub fn chat_completions_url_from_endpoint(&self, endpoint: &str) -> String {
-        format!("{}/chat/completions", endpoint)
-    }
-
-    pub fn responses_url_from_endpoint(&self, endpoint: &str) -> String {
-        format!("{}/responses", endpoint)
-    }
-
-    pub fn models_url_from_endpoint(&self, endpoint: &str) -> String {
-        format!("{}/models", endpoint)
-    }
-
-    fn parse_domain(enterprise_uri: &str) -> String {
-        let uri = enterprise_uri.trim_end_matches('/');
-
-        if let Some(domain) = uri.strip_prefix("https://") {
-            domain.split('/').next().unwrap_or(domain).to_string()
-        } else if let Some(domain) = uri.strip_prefix("http://") {
-            domain.split('/').next().unwrap_or(domain).to_string()
-        } else {
-            uri.split('/').next().unwrap_or(uri).to_string()
-        }
-    }
-}
-
-#[derive(Clone, Copy, Serialize, Deserialize, Debug, Eq, PartialEq)]
-#[serde(rename_all = "lowercase")]
-pub enum Role {
-    User,
-    Assistant,
-    System,
-}
-
-#[derive(Deserialize, Serialize, Debug, Clone, PartialEq)]
-pub enum ModelSupportedEndpoint {
-    #[serde(rename = "/chat/completions")]
-    ChatCompletions,
-    #[serde(rename = "/responses")]
-    Responses,
-}
-
-#[derive(Deserialize)]
-struct ModelSchema {
-    #[serde(deserialize_with = "deserialize_models_skip_errors")]
-    data: Vec<Model>,
-}
-
-fn deserialize_models_skip_errors<'de, D>(deserializer: D) -> Result<Vec<Model>, D::Error>
-where
-    D: serde::Deserializer<'de>,
-{
-    let raw_values = Vec::<serde_json::Value>::deserialize(deserializer)?;
-    let models = raw_values
-        .into_iter()
-        .filter_map(|value| match serde_json::from_value::<Model>(value) {
-            Ok(model) => Some(model),
-            Err(err) => {
-                log::warn!("GitHub Copilot Chat model failed to deserialize: {:?}", err);
-                None
-            }
-        })
-        .collect();
-
-    Ok(models)
-}
-
-#[derive(Clone, Serialize, Deserialize, Debug, PartialEq)]
-pub struct Model {
-    billing: ModelBilling,
-    capabilities: ModelCapabilities,
-    id: String,
-    name: String,
-    policy: Option<ModelPolicy>,
-    vendor: ModelVendor,
-    is_chat_default: bool,
-    // The model with this value true is selected by VSCode copilot if a premium request limit is
-    // reached. Zed does not currently implement this behaviour
-    is_chat_fallback: bool,
-    model_picker_enabled: bool,
-    #[serde(default)]
-    supported_endpoints: Vec<ModelSupportedEndpoint>,
-}
-
-#[derive(Clone, Serialize, Deserialize, Debug, PartialEq)]
-struct ModelBilling {
-    is_premium: bool,
-    multiplier: f64,
-    // List of plans a model is restricted to
-    // Field is not present if a model is available for all plans
-    #[serde(default)]
-    restricted_to: Option<Vec<String>>,
-}
-
-#[derive(Clone, Serialize, Deserialize, Debug, Eq, PartialEq)]
-struct ModelCapabilities {
-    family: String,
-    #[serde(default)]
-    limits: ModelLimits,
-    supports: ModelSupportedFeatures,
-    #[serde(rename = "type")]
-    model_type: String,
-    #[serde(default)]
-    tokenizer: Option<String>,
-}
-
-#[derive(Default, Clone, Serialize, Deserialize, Debug, Eq, PartialEq)]
-struct ModelLimits {
-    #[serde(default)]
-    max_context_window_tokens: usize,
-    #[serde(default)]
-    max_output_tokens: usize,
-    #[serde(default)]
-    max_prompt_tokens: u64,
-}
-
-#[derive(Clone, Serialize, Deserialize, Debug, Eq, PartialEq)]
-struct ModelPolicy {
-    state: String,
-}
-
-#[derive(Clone, Serialize, Deserialize, Debug, Eq, PartialEq)]
-struct ModelSupportedFeatures {
-    #[serde(default)]
-    streaming: bool,
-    #[serde(default)]
-    tool_calls: bool,
-    #[serde(default)]
-    parallel_tool_calls: bool,
-    #[serde(default)]
-    vision: bool,
-}
-
-#[derive(Clone, Copy, Serialize, Deserialize, Debug, Eq, PartialEq)]
-pub enum ModelVendor {
-    // Azure OpenAI should have no functional difference from OpenAI in Copilot Chat
-    #[serde(alias = "Azure OpenAI")]
-    OpenAI,
-    Google,
-    Anthropic,
-    #[serde(rename = "xAI")]
-    XAI,
-    /// Unknown vendor that we don't explicitly support yet
-    #[serde(other)]
-    Unknown,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)]
-#[serde(tag = "type")]
-pub enum ChatMessagePart {
-    #[serde(rename = "text")]
-    Text { text: String },
-    #[serde(rename = "image_url")]
-    Image { image_url: ImageUrl },
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)]
-pub struct ImageUrl {
-    pub url: String,
-}
-
-impl Model {
-    pub fn uses_streaming(&self) -> bool {
-        self.capabilities.supports.streaming
-    }
-
-    pub fn id(&self) -> &str {
-        self.id.as_str()
-    }
-
-    pub fn display_name(&self) -> &str {
-        self.name.as_str()
-    }
-
-    pub fn max_token_count(&self) -> u64 {
-        self.capabilities.limits.max_prompt_tokens
-    }
-
-    pub fn supports_tools(&self) -> bool {
-        self.capabilities.supports.tool_calls
-    }
-
-    pub fn vendor(&self) -> ModelVendor {
-        self.vendor
-    }
-
-    pub fn supports_vision(&self) -> bool {
-        self.capabilities.supports.vision
-    }
-
-    pub fn supports_parallel_tool_calls(&self) -> bool {
-        self.capabilities.supports.parallel_tool_calls
-    }
-
-    pub fn tokenizer(&self) -> Option<&str> {
-        self.capabilities.tokenizer.as_deref()
-    }
-
-    pub fn supports_response(&self) -> bool {
-        self.supported_endpoints.len() > 0
-            && !self
-                .supported_endpoints
-                .contains(&ModelSupportedEndpoint::ChatCompletions)
-            && self
-                .supported_endpoints
-                .contains(&ModelSupportedEndpoint::Responses)
-    }
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct Request {
-    pub intent: bool,
-    pub n: usize,
-    pub stream: bool,
-    pub temperature: f32,
-    pub model: String,
-    pub messages: Vec<ChatMessage>,
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub tools: Vec<Tool>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub tool_choice: Option<ToolChoice>,
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct Function {
-    pub name: String,
-    pub description: String,
-    pub parameters: serde_json::Value,
-}
-
-#[derive(Serialize, Deserialize)]
-#[serde(tag = "type", rename_all = "snake_case")]
-pub enum Tool {
-    Function { function: Function },
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-#[serde(rename_all = "lowercase")]
-pub enum ToolChoice {
-    Auto,
-    Any,
-    None,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-#[serde(tag = "role", rename_all = "lowercase")]
-pub enum ChatMessage {
-    Assistant {
-        content: ChatMessageContent,
-        #[serde(default, skip_serializing_if = "Vec::is_empty")]
-        tool_calls: Vec<ToolCall>,
-        #[serde(default, skip_serializing_if = "Option::is_none")]
-        reasoning_opaque: Option<String>,
-        #[serde(default, skip_serializing_if = "Option::is_none")]
-        reasoning_text: Option<String>,
-    },
-    User {
-        content: ChatMessageContent,
-    },
-    System {
-        content: String,
-    },
-    Tool {
-        content: ChatMessageContent,
-        tool_call_id: String,
-    },
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(untagged)]
-pub enum ChatMessageContent {
-    Plain(String),
-    Multipart(Vec<ChatMessagePart>),
-}
-
-impl ChatMessageContent {
-    pub fn empty() -> Self {
-        ChatMessageContent::Multipart(vec![])
-    }
-}
-
-impl From<Vec<ChatMessagePart>> for ChatMessageContent {
-    fn from(mut parts: Vec<ChatMessagePart>) -> Self {
-        if let [ChatMessagePart::Text { text }] = parts.as_mut_slice() {
-            ChatMessageContent::Plain(std::mem::take(text))
-        } else {
-            ChatMessageContent::Multipart(parts)
-        }
-    }
-}
-
-impl From<String> for ChatMessageContent {
-    fn from(text: String) -> Self {
-        ChatMessageContent::Plain(text)
-    }
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-pub struct ToolCall {
-    pub id: String,
-    #[serde(flatten)]
-    pub content: ToolCallContent,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-#[serde(tag = "type", rename_all = "lowercase")]
-pub enum ToolCallContent {
-    Function { function: FunctionContent },
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-pub struct FunctionContent {
-    pub name: String,
-    pub arguments: String,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub thought_signature: Option<String>,
-}
-
-#[derive(Deserialize, Debug)]
-#[serde(tag = "type", rename_all = "snake_case")]
-pub struct ResponseEvent {
-    pub choices: Vec<ResponseChoice>,
-    pub id: String,
-    pub usage: Option<Usage>,
-}
-
-#[derive(Deserialize, Debug)]
-pub struct Usage {
-    pub completion_tokens: u64,
-    pub prompt_tokens: u64,
-    pub total_tokens: u64,
-}
-
-#[derive(Debug, Deserialize)]
-pub struct ResponseChoice {
-    pub index: Option<usize>,
-    pub finish_reason: Option<String>,
-    pub delta: Option<ResponseDelta>,
-    pub message: Option<ResponseDelta>,
-}
-
-#[derive(Debug, Deserialize)]
-pub struct ResponseDelta {
-    pub content: Option<String>,
-    pub role: Option<Role>,
-    #[serde(default)]
-    pub tool_calls: Vec<ToolCallChunk>,
-    pub reasoning_opaque: Option<String>,
-    pub reasoning_text: Option<String>,
-}
-#[derive(Deserialize, Debug, Eq, PartialEq)]
-pub struct ToolCallChunk {
-    pub index: Option<usize>,
-    pub id: Option<String>,
-    pub function: Option<FunctionChunk>,
-}
-
-#[derive(Deserialize, Debug, Eq, PartialEq)]
-pub struct FunctionChunk {
-    pub name: Option<String>,
-    pub arguments: Option<String>,
-    pub thought_signature: Option<String>,
-}
-
-#[derive(Deserialize)]
-struct ApiTokenResponse {
-    token: String,
-    expires_at: i64,
-    endpoints: ApiTokenResponseEndpoints,
-}
-
-#[derive(Deserialize)]
-struct ApiTokenResponseEndpoints {
-    api: String,
-}
-
-#[derive(Clone)]
-struct ApiToken {
-    api_key: String,
-    expires_at: DateTime<chrono::Utc>,
-    api_endpoint: String,
-}
-
-impl ApiToken {
-    pub fn remaining_seconds(&self) -> i64 {
-        self.expires_at
-            .timestamp()
-            .saturating_sub(chrono::Utc::now().timestamp())
-    }
-}
-
-impl TryFrom<ApiTokenResponse> for ApiToken {
-    type Error = anyhow::Error;
-
-    fn try_from(response: ApiTokenResponse) -> Result<Self, Self::Error> {
-        let expires_at =
-            DateTime::from_timestamp(response.expires_at, 0).context("invalid expires_at")?;
-
-        Ok(Self {
-            api_key: response.token,
-            expires_at,
-            api_endpoint: response.endpoints.api,
-        })
-    }
-}
-
-struct GlobalCopilotChat(gpui::Entity<CopilotChat>);
-
-impl Global for GlobalCopilotChat {}
-
-pub struct CopilotChat {
-    oauth_token: Option<String>,
-    api_token: Option<ApiToken>,
-    configuration: CopilotChatConfiguration,
-    models: Option<Vec<Model>>,
-    client: Arc<dyn HttpClient>,
-}
-
-pub fn init(
-    fs: Arc<dyn Fs>,
-    client: Arc<dyn HttpClient>,
-    configuration: CopilotChatConfiguration,
-    cx: &mut App,
-) {
-    let copilot_chat = cx.new(|cx| CopilotChat::new(fs, client, configuration, cx));
-    cx.set_global(GlobalCopilotChat(copilot_chat));
-}
-
-pub fn copilot_chat_config_dir() -> &'static PathBuf {
-    static COPILOT_CHAT_CONFIG_DIR: OnceLock<PathBuf> = OnceLock::new();
-
-    COPILOT_CHAT_CONFIG_DIR.get_or_init(|| {
-        let config_dir = if cfg!(target_os = "windows") {
-            dirs::data_local_dir().expect("failed to determine LocalAppData directory")
-        } else {
-            std::env::var("XDG_CONFIG_HOME")
-                .map(PathBuf::from)
-                .unwrap_or_else(|_| home_dir().join(".config"))
-        };
-
-        config_dir.join("github-copilot")
-    })
-}
-
-fn copilot_chat_config_paths() -> [PathBuf; 2] {
-    let base_dir = copilot_chat_config_dir();
-    [base_dir.join("hosts.json"), base_dir.join("apps.json")]
-}
-
-impl CopilotChat {
-    pub fn global(cx: &App) -> Option<gpui::Entity<Self>> {
-        cx.try_global::<GlobalCopilotChat>()
-            .map(|model| model.0.clone())
-    }
-
-    fn new(
-        fs: Arc<dyn Fs>,
-        client: Arc<dyn HttpClient>,
-        configuration: CopilotChatConfiguration,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let config_paths: HashSet<PathBuf> = copilot_chat_config_paths().into_iter().collect();
-        let dir_path = copilot_chat_config_dir();
-
-        cx.spawn(async move |this, cx| {
-            let mut parent_watch_rx = watch_config_dir(
-                cx.background_executor(),
-                fs.clone(),
-                dir_path.clone(),
-                config_paths,
-            );
-            while let Some(contents) = parent_watch_rx.next().await {
-                let oauth_domain =
-                    this.read_with(cx, |this, _| this.configuration.oauth_domain())?;
-                let oauth_token = extract_oauth_token(contents, &oauth_domain);
-
-                this.update(cx, |this, cx| {
-                    this.oauth_token = oauth_token.clone();
-                    cx.notify();
-                })?;
-
-                if oauth_token.is_some() {
-                    Self::update_models(&this, cx).await?;
-                }
-            }
-            anyhow::Ok(())
-        })
-        .detach_and_log_err(cx);
-
-        let this = Self {
-            oauth_token: std::env::var(COPILOT_OAUTH_ENV_VAR).ok(),
-            api_token: None,
-            models: None,
-            configuration,
-            client,
-        };
-
-        if this.oauth_token.is_some() {
-            cx.spawn(async move |this, cx| Self::update_models(&this, cx).await)
-                .detach_and_log_err(cx);
-        }
-
-        this
-    }
-
-    async fn update_models(this: &WeakEntity<Self>, cx: &mut AsyncApp) -> Result<()> {
-        let (oauth_token, client, configuration) = this.read_with(cx, |this, _| {
-            (
-                this.oauth_token.clone(),
-                this.client.clone(),
-                this.configuration.clone(),
-            )
-        })?;
-
-        let oauth_token = oauth_token
-            .ok_or_else(|| anyhow!("OAuth token is missing while updating Copilot Chat models"))?;
-
-        let token_url = configuration.token_url();
-        let api_token = request_api_token(&oauth_token, token_url.into(), client.clone()).await?;
-
-        let models_url = configuration.models_url_from_endpoint(&api_token.api_endpoint);
-        let models =
-            get_models(models_url.into(), api_token.api_key.clone(), client.clone()).await?;
-
-        this.update(cx, |this, cx| {
-            this.api_token = Some(api_token);
-            this.models = Some(models);
-            cx.notify();
-        })?;
-        anyhow::Ok(())
-    }
-
-    pub fn is_authenticated(&self) -> bool {
-        self.oauth_token.is_some()
-    }
-
-    pub fn models(&self) -> Option<&[Model]> {
-        self.models.as_deref()
-    }
-
-    pub async fn stream_completion(
-        request: Request,
-        is_user_initiated: bool,
-        mut cx: AsyncApp,
-    ) -> Result<BoxStream<'static, Result<ResponseEvent>>> {
-        let (client, token, configuration) = Self::get_auth_details(&mut cx).await?;
-
-        let api_url = configuration.chat_completions_url_from_endpoint(&token.api_endpoint);
-        stream_completion(
-            client.clone(),
-            token.api_key,
-            api_url.into(),
-            request,
-            is_user_initiated,
-        )
-        .await
-    }
-
-    pub async fn stream_response(
-        request: responses::Request,
-        is_user_initiated: bool,
-        mut cx: AsyncApp,
-    ) -> Result<BoxStream<'static, Result<responses::StreamEvent>>> {
-        let (client, token, configuration) = Self::get_auth_details(&mut cx).await?;
-
-        let api_url = configuration.responses_url_from_endpoint(&token.api_endpoint);
-        responses::stream_response(
-            client.clone(),
-            token.api_key,
-            api_url,
-            request,
-            is_user_initiated,
-        )
-        .await
-    }
-
-    async fn get_auth_details(
-        cx: &mut AsyncApp,
-    ) -> Result<(Arc<dyn HttpClient>, ApiToken, CopilotChatConfiguration)> {
-        let this = cx
-            .update(|cx| Self::global(cx))
-            .ok()
-            .flatten()
-            .context("Copilot chat is not enabled")?;
-
-        let (oauth_token, api_token, client, configuration) = this.read_with(cx, |this, _| {
-            (
-                this.oauth_token.clone(),
-                this.api_token.clone(),
-                this.client.clone(),
-                this.configuration.clone(),
-            )
-        })?;
-
-        let oauth_token = oauth_token.context("No OAuth token available")?;
-
-        let token = match api_token {
-            Some(api_token) if api_token.remaining_seconds() > 5 * 60 => api_token,
-            _ => {
-                let token_url = configuration.token_url();
-                let token =
-                    request_api_token(&oauth_token, token_url.into(), client.clone()).await?;
-                this.update(cx, |this, cx| {
-                    this.api_token = Some(token.clone());
-                    cx.notify();
-                })?;
-                token
-            }
-        };
-
-        Ok((client, token, configuration))
-    }
-
-    pub fn set_configuration(
-        &mut self,
-        configuration: CopilotChatConfiguration,
-        cx: &mut Context<Self>,
-    ) {
-        let same_configuration = self.configuration == configuration;
-        self.configuration = configuration;
-        if !same_configuration {
-            self.api_token = None;
-            cx.spawn(async move |this, cx| {
-                Self::update_models(&this, cx).await?;
-                Ok::<_, anyhow::Error>(())
-            })
-            .detach();
-        }
-    }
-}
-
-async fn get_models(
-    models_url: Arc<str>,
-    api_token: String,
-    client: Arc<dyn HttpClient>,
-) -> Result<Vec<Model>> {
-    let all_models = request_models(models_url, api_token, client).await?;
-
-    let mut models: Vec<Model> = all_models
-        .into_iter()
-        .filter(|model| {
-            model.model_picker_enabled
-                && model.capabilities.model_type.as_str() == "chat"
-                && model
-                    .policy
-                    .as_ref()
-                    .is_none_or(|policy| policy.state == "enabled")
-        })
-        .dedup_by(|a, b| a.capabilities.family == b.capabilities.family)
-        .collect();
-
-    if let Some(default_model_position) = models.iter().position(|model| model.is_chat_default) {
-        let default_model = models.remove(default_model_position);
-        models.insert(0, default_model);
-    }
-
-    Ok(models)
-}
-
-async fn request_models(
-    models_url: Arc<str>,
-    api_token: String,
-    client: Arc<dyn HttpClient>,
-) -> Result<Vec<Model>> {
-    let request_builder = HttpRequest::builder()
-        .method(Method::GET)
-        .uri(models_url.as_ref())
-        .header("Authorization", format!("Bearer {}", api_token))
-        .header("Content-Type", "application/json")
-        .header("Copilot-Integration-Id", "vscode-chat")
-        .header("Editor-Version", "vscode/1.103.2")
-        .header("x-github-api-version", "2025-05-01");
-
-    let request = request_builder.body(AsyncBody::empty())?;
-
-    let mut response = client.send(request).await?;
-
-    anyhow::ensure!(
-        response.status().is_success(),
-        "Failed to request models: {}",
-        response.status()
-    );
-    let mut body = Vec::new();
-    response.body_mut().read_to_end(&mut body).await?;
-
-    let body_str = std::str::from_utf8(&body)?;
-
-    let models = serde_json::from_str::<ModelSchema>(body_str)?.data;
-
-    Ok(models)
-}
-
-async fn request_api_token(
-    oauth_token: &str,
-    auth_url: Arc<str>,
-    client: Arc<dyn HttpClient>,
-) -> Result<ApiToken> {
-    let request_builder = HttpRequest::builder()
-        .method(Method::GET)
-        .uri(auth_url.as_ref())
-        .header("Authorization", format!("token {}", oauth_token))
-        .header("Accept", "application/json");
-
-    let request = request_builder.body(AsyncBody::empty())?;
-
-    let mut response = client.send(request).await?;
-
-    if response.status().is_success() {
-        let mut body = Vec::new();
-        response.body_mut().read_to_end(&mut body).await?;
-
-        let body_str = std::str::from_utf8(&body)?;
-
-        let parsed: ApiTokenResponse = serde_json::from_str(body_str)?;
-        ApiToken::try_from(parsed)
-    } else {
-        let mut body = Vec::new();
-        response.body_mut().read_to_end(&mut body).await?;
-
-        let body_str = std::str::from_utf8(&body)?;
-        anyhow::bail!("Failed to request API token: {body_str}");
-    }
-}
-
-fn extract_oauth_token(contents: String, domain: &str) -> Option<String> {
-    serde_json::from_str::<serde_json::Value>(&contents)
-        .map(|v| {
-            v.as_object().and_then(|obj| {
-                obj.iter().find_map(|(key, value)| {
-                    if key.starts_with(domain) {
-                        value["oauth_token"].as_str().map(|v| v.to_string())
-                    } else {
-                        None
-                    }
-                })
-            })
-        })
-        .ok()
-        .flatten()
-}
-
-async fn stream_completion(
-    client: Arc<dyn HttpClient>,
-    api_key: String,
-    completion_url: Arc<str>,
-    request: Request,
-    is_user_initiated: bool,
-) -> Result<BoxStream<'static, Result<ResponseEvent>>> {
-    let is_vision_request = request.messages.iter().any(|message| match message {
-        ChatMessage::User { content }
-        | ChatMessage::Assistant { content, .. }
-        | ChatMessage::Tool { content, .. } => {
-            matches!(content, ChatMessageContent::Multipart(parts) if parts.iter().any(|part| matches!(part, ChatMessagePart::Image { .. })))
-        }
-        _ => false,
-    });
-
-    let request_initiator = if is_user_initiated { "user" } else { "agent" };
-
-    let request_builder = HttpRequest::builder()
-        .method(Method::POST)
-        .uri(completion_url.as_ref())
-        .header(
-            "Editor-Version",
-            format!(
-                "Zed/{}",
-                option_env!("CARGO_PKG_VERSION").unwrap_or("unknown")
-            ),
-        )
-        .header("Authorization", format!("Bearer {}", api_key))
-        .header("Content-Type", "application/json")
-        .header("Copilot-Integration-Id", "vscode-chat")
-        .header("X-Initiator", request_initiator)
-        .when(is_vision_request, |builder| {
-            builder.header("Copilot-Vision-Request", is_vision_request.to_string())
-        });
-
-    let is_streaming = request.stream;
-
-    let json = serde_json::to_string(&request)?;
-    let request = request_builder.body(AsyncBody::from(json))?;
-    let mut response = client.send(request).await?;
-
-    if !response.status().is_success() {
-        let mut body = Vec::new();
-        response.body_mut().read_to_end(&mut body).await?;
-        let body_str = std::str::from_utf8(&body)?;
-        anyhow::bail!(
-            "Failed to connect to API: {} {}",
-            response.status(),
-            body_str
-        );
-    }
-
-    if is_streaming {
-        let reader = BufReader::new(response.into_body());
-        Ok(reader
-            .lines()
-            .filter_map(|line| async move {
-                match line {
-                    Ok(line) => {
-                        let line = line.strip_prefix("data: ")?;
-                        if line.starts_with("[DONE]") {
-                            return None;
-                        }
-
-                        match serde_json::from_str::<ResponseEvent>(line) {
-                            Ok(response) => {
-                                if response.choices.is_empty() {
-                                    None
-                                } else {
-                                    Some(Ok(response))
-                                }
-                            }
-                            Err(error) => Some(Err(anyhow!(error))),
-                        }
-                    }
-                    Err(error) => Some(Err(anyhow!(error))),
-                }
-            })
-            .boxed())
-    } else {
-        let mut body = Vec::new();
-        response.body_mut().read_to_end(&mut body).await?;
-        let body_str = std::str::from_utf8(&body)?;
-        let response: ResponseEvent = serde_json::from_str(body_str)?;
-
-        Ok(futures::stream::once(async move { Ok(response) }).boxed())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_resilient_model_schema_deserialize() {
-        let json = r#"{
-              "data": [
-                {
-                  "billing": {
-                    "is_premium": false,
-                    "multiplier": 0
-                  },
-                  "capabilities": {
-                    "family": "gpt-4",
-                    "limits": {
-                      "max_context_window_tokens": 32768,
-                      "max_output_tokens": 4096,
-                      "max_prompt_tokens": 32768
-                    },
-                    "object": "model_capabilities",
-                    "supports": { "streaming": true, "tool_calls": true },
-                    "tokenizer": "cl100k_base",
-                    "type": "chat"
-                  },
-                  "id": "gpt-4",
-                  "is_chat_default": false,
-                  "is_chat_fallback": false,
-                  "model_picker_enabled": false,
-                  "name": "GPT 4",
-                  "object": "model",
-                  "preview": false,
-                  "vendor": "Azure OpenAI",
-                  "version": "gpt-4-0613"
-                },
-                {
-                    "some-unknown-field": 123
-                },
-                {
-                  "billing": {
-                    "is_premium": true,
-                    "multiplier": 1,
-                    "restricted_to": [
-                      "pro",
-                      "pro_plus",
-                      "business",
-                      "enterprise"
-                    ]
-                  },
-                  "capabilities": {
-                    "family": "claude-3.7-sonnet",
-                    "limits": {
-                      "max_context_window_tokens": 200000,
-                      "max_output_tokens": 16384,
-                      "max_prompt_tokens": 90000,
-                      "vision": {
-                        "max_prompt_image_size": 3145728,
-                        "max_prompt_images": 1,
-                        "supported_media_types": ["image/jpeg", "image/png", "image/webp"]
-                      }
-                    },
-                    "object": "model_capabilities",
-                    "supports": {
-                      "parallel_tool_calls": true,
-                      "streaming": true,
-                      "tool_calls": true,
-                      "vision": true
-                    },
-                    "tokenizer": "o200k_base",
-                    "type": "chat"
-                  },
-                  "id": "claude-3.7-sonnet",
-                  "is_chat_default": false,
-                  "is_chat_fallback": false,
-                  "model_picker_enabled": true,
-                  "name": "Claude 3.7 Sonnet",
-                  "object": "model",
-                  "policy": {
-                    "state": "enabled",
-                    "terms": "Enable access to the latest Claude 3.7 Sonnet model from Anthropic. [Learn more about how GitHub Copilot serves Claude 3.7 Sonnet](https://docs.github.com/copilot/using-github-copilot/using-claude-sonnet-in-github-copilot)."
-                  },
-                  "preview": false,
-                  "vendor": "Anthropic",
-                  "version": "claude-3.7-sonnet"
-                }
-              ],
-              "object": "list"
-            }"#;
-
-        let schema: ModelSchema = serde_json::from_str(json).unwrap();
-
-        assert_eq!(schema.data.len(), 2);
-        assert_eq!(schema.data[0].id, "gpt-4");
-        assert_eq!(schema.data[1].id, "claude-3.7-sonnet");
-    }
-
-    #[test]
-    fn test_unknown_vendor_resilience() {
-        let json = r#"{
-              "data": [
-                {
-                  "billing": {
-                    "is_premium": false,
-                    "multiplier": 1
-                  },
-                  "capabilities": {
-                    "family": "future-model",
-                    "limits": {
-                      "max_context_window_tokens": 128000,
-                      "max_output_tokens": 8192,
-                      "max_prompt_tokens": 120000
-                    },
-                    "object": "model_capabilities",
-                    "supports": { "streaming": true, "tool_calls": true },
-                    "type": "chat"
-                  },
-                  "id": "future-model-v1",
-                  "is_chat_default": false,
-                  "is_chat_fallback": false,
-                  "model_picker_enabled": true,
-                  "name": "Future Model v1",
-                  "object": "model",
-                  "preview": false,
-                  "vendor": "SomeNewVendor",
-                  "version": "v1.0"
-                }
-              ],
-              "object": "list"
-            }"#;
-
-        let schema: ModelSchema = serde_json::from_str(json).unwrap();
-
-        assert_eq!(schema.data.len(), 1);
-        assert_eq!(schema.data[0].id, "future-model-v1");
-        assert_eq!(schema.data[0].vendor, ModelVendor::Unknown);
-    }
-}
diff --git a/crates/copilot/src/copilot_edit_prediction_delegate.rs b/crates/copilot/src/copilot_edit_prediction_delegate.rs
deleted file mode 100644
index 961154dbee..0000000000
--- a/crates/copilot/src/copilot_edit_prediction_delegate.rs
+++ /dev/null
@@ -1,1124 +0,0 @@
-use crate::{Completion, Copilot};
-use anyhow::Result;
-use edit_prediction_types::{Direction, EditPrediction, EditPredictionDelegate};
-use gpui::{App, Context, Entity, EntityId, Task};
-use language::{Buffer, OffsetRangeExt, ToOffset, language_settings::AllLanguageSettings};
-use settings::Settings;
-use std::{path::Path, time::Duration};
-
-pub const COPILOT_DEBOUNCE_TIMEOUT: Duration = Duration::from_millis(75);
-
-pub struct CopilotEditPredictionDelegate {
-    cycled: bool,
-    buffer_id: Option<EntityId>,
-    completions: Vec<Completion>,
-    active_completion_index: usize,
-    file_extension: Option<String>,
-    pending_refresh: Option<Task<Result<()>>>,
-    pending_cycling_refresh: Option<Task<Result<()>>>,
-    copilot: Entity<Copilot>,
-}
-
-impl CopilotEditPredictionDelegate {
-    pub fn new(copilot: Entity<Copilot>) -> Self {
-        Self {
-            cycled: false,
-            buffer_id: None,
-            completions: Vec::new(),
-            active_completion_index: 0,
-            file_extension: None,
-            pending_refresh: None,
-            pending_cycling_refresh: None,
-            copilot,
-        }
-    }
-
-    fn active_completion(&self) -> Option<&Completion> {
-        self.completions.get(self.active_completion_index)
-    }
-
-    fn push_completion(&mut self, new_completion: Completion) {
-        for completion in &self.completions {
-            if completion.text == new_completion.text && completion.range == new_completion.range {
-                return;
-            }
-        }
-        self.completions.push(new_completion);
-    }
-}
-
-impl EditPredictionDelegate for CopilotEditPredictionDelegate {
-    fn name() -> &'static str {
-        "copilot"
-    }
-
-    fn display_name() -> &'static str {
-        "Copilot"
-    }
-
-    fn show_predictions_in_menu() -> bool {
-        true
-    }
-
-    fn show_tab_accept_marker() -> bool {
-        true
-    }
-
-    fn supports_jump_to_edit() -> bool {
-        false
-    }
-
-    fn is_refreshing(&self, _cx: &App) -> bool {
-        self.pending_refresh.is_some() && self.completions.is_empty()
-    }
-
-    fn is_enabled(
-        &self,
-        _buffer: &Entity<Buffer>,
-        _cursor_position: language::Anchor,
-        cx: &App,
-    ) -> bool {
-        self.copilot.read(cx).status().is_authorized()
-    }
-
-    fn refresh(
-        &mut self,
-        buffer: Entity<Buffer>,
-        cursor_position: language::Anchor,
-        debounce: bool,
-        cx: &mut Context<Self>,
-    ) {
-        let copilot = self.copilot.clone();
-        self.pending_refresh = Some(cx.spawn(async move |this, cx| {
-            if debounce {
-                cx.background_executor()
-                    .timer(COPILOT_DEBOUNCE_TIMEOUT)
-                    .await;
-            }
-
-            let completions = copilot
-                .update(cx, |copilot, cx| {
-                    copilot.completions(&buffer, cursor_position, cx)
-                })?
-                .await?;
-
-            this.update(cx, |this, cx| {
-                if !completions.is_empty() {
-                    this.cycled = false;
-                    this.pending_refresh = None;
-                    this.pending_cycling_refresh = None;
-                    this.completions.clear();
-                    this.active_completion_index = 0;
-                    this.buffer_id = Some(buffer.entity_id());
-                    this.file_extension = buffer.read(cx).file().and_then(|file| {
-                        Some(
-                            Path::new(file.file_name(cx))
-                                .extension()?
-                                .to_str()?
-                                .to_string(),
-                        )
-                    });
-
-                    for completion in completions {
-                        this.push_completion(completion);
-                    }
-                    cx.notify();
-                }
-            })?;
-
-            Ok(())
-        }));
-    }
-
-    fn cycle(
-        &mut self,
-        buffer: Entity<Buffer>,
-        cursor_position: language::Anchor,
-        direction: Direction,
-        cx: &mut Context<Self>,
-    ) {
-        if self.cycled {
-            match direction {
-                Direction::Prev => {
-                    self.active_completion_index = if self.active_completion_index == 0 {
-                        self.completions.len().saturating_sub(1)
-                    } else {
-                        self.active_completion_index - 1
-                    };
-                }
-                Direction::Next => {
-                    if self.completions.is_empty() {
-                        self.active_completion_index = 0
-                    } else {
-                        self.active_completion_index =
-                            (self.active_completion_index + 1) % self.completions.len();
-                    }
-                }
-            }
-
-            cx.notify();
-        } else {
-            let copilot = self.copilot.clone();
-            self.pending_cycling_refresh = Some(cx.spawn(async move |this, cx| {
-                let completions = copilot
-                    .update(cx, |copilot, cx| {
-                        copilot.completions_cycling(&buffer, cursor_position, cx)
-                    })?
-                    .await?;
-
-                this.update(cx, |this, cx| {
-                    this.cycled = true;
-                    this.file_extension = buffer.read(cx).file().and_then(|file| {
-                        Some(
-                            Path::new(file.file_name(cx))
-                                .extension()?
-                                .to_str()?
-                                .to_string(),
-                        )
-                    });
-                    for completion in completions {
-                        this.push_completion(completion);
-                    }
-                    this.cycle(buffer, cursor_position, direction, cx);
-                })?;
-
-                Ok(())
-            }));
-        }
-    }
-
-    fn accept(&mut self, cx: &mut Context<Self>) {
-        if let Some(completion) = self.active_completion() {
-            self.copilot
-                .update(cx, |copilot, cx| copilot.accept_completion(completion, cx))
-                .detach_and_log_err(cx);
-        }
-    }
-
-    fn discard(&mut self, cx: &mut Context<Self>) {
-        let settings = AllLanguageSettings::get_global(cx);
-
-        let copilot_enabled = settings.show_edit_predictions(None, cx);
-
-        if !copilot_enabled {
-            return;
-        }
-
-        self.copilot
-            .update(cx, |copilot, cx| {
-                copilot.discard_completions(&self.completions, cx)
-            })
-            .detach_and_log_err(cx);
-    }
-
-    fn suggest(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        cursor_position: language::Anchor,
-        cx: &mut Context<Self>,
-    ) -> Option<EditPrediction> {
-        let buffer_id = buffer.entity_id();
-        let buffer = buffer.read(cx);
-        let completion = self.active_completion()?;
-        if Some(buffer_id) != self.buffer_id
-            || !completion.range.start.is_valid(buffer)
-            || !completion.range.end.is_valid(buffer)
-        {
-            return None;
-        }
-
-        let mut completion_range = completion.range.to_offset(buffer);
-        let prefix_len = common_prefix(
-            buffer.chars_for_range(completion_range.clone()),
-            completion.text.chars(),
-        );
-        completion_range.start += prefix_len;
-        let suffix_len = common_prefix(
-            buffer.reversed_chars_for_range(completion_range.clone()),
-            completion.text[prefix_len..].chars().rev(),
-        );
-        completion_range.end = completion_range.end.saturating_sub(suffix_len);
-
-        if completion_range.is_empty()
-            && completion_range.start == cursor_position.to_offset(buffer)
-        {
-            let completion_text = &completion.text[prefix_len..completion.text.len() - suffix_len];
-            if completion_text.trim().is_empty() {
-                None
-            } else {
-                let position = cursor_position.bias_right(buffer);
-                Some(EditPrediction::Local {
-                    id: None,
-                    edits: vec![(position..position, completion_text.into())],
-                    edit_preview: None,
-                })
-            }
-        } else {
-            None
-        }
-    }
-}
-
-fn common_prefix<T1: Iterator<Item = char>, T2: Iterator<Item = char>>(a: T1, b: T2) -> usize {
-    a.zip(b)
-        .take_while(|(a, b)| a == b)
-        .map(|(a, _)| a.len_utf8())
-        .sum()
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use editor::{
-        Editor, ExcerptRange, MultiBuffer, MultiBufferOffset, SelectionEffects,
-        test::editor_lsp_test_context::EditorLspTestContext,
-    };
-    use fs::FakeFs;
-    use futures::StreamExt;
-    use gpui::{AppContext as _, BackgroundExecutor, TestAppContext, UpdateGlobal};
-    use indoc::indoc;
-    use language::{
-        Point,
-        language_settings::{CompletionSettingsContent, LspInsertMode, WordsCompletionMode},
-    };
-    use project::Project;
-    use serde_json::json;
-    use settings::{AllLanguageSettingsContent, SettingsStore};
-    use std::future::Future;
-    use util::{
-        path,
-        test::{TextRangeMarker, marked_text_ranges_by},
-    };
-
-    #[gpui::test(iterations = 10)]
-    async fn test_copilot(executor: BackgroundExecutor, cx: &mut TestAppContext) {
-        // flaky
-        init_test(cx, |settings| {
-            settings.defaults.completions = Some(CompletionSettingsContent {
-                words: Some(WordsCompletionMode::Disabled),
-                words_min_length: Some(0),
-                lsp_insert_mode: Some(LspInsertMode::Insert),
-                ..Default::default()
-            });
-        });
-
-        let (copilot, copilot_lsp) = Copilot::fake(cx);
-        let mut cx = EditorLspTestContext::new_rust(
-            lsp::ServerCapabilities {
-                completion_provider: Some(lsp::CompletionOptions {
-                    trigger_characters: Some(vec![".".to_string(), ":".to_string()]),
-                    ..Default::default()
-                }),
-                ..Default::default()
-            },
-            cx,
-        )
-        .await;
-        let copilot_provider = cx.new(|_| CopilotEditPredictionDelegate::new(copilot));
-        cx.update_editor(|editor, window, cx| {
-            editor.set_edit_prediction_provider(Some(copilot_provider), window, cx)
-        });
-
-        cx.set_state(indoc! {"
-            oneˇ
-            two
-            three
-        "});
-        cx.simulate_keystroke(".");
-        drop(handle_completion_request(
-            &mut cx,
-            indoc! {"
-                one.|<>
-                two
-                three
-            "},
-            vec!["completion_a", "completion_b"],
-        ));
-        handle_copilot_completion_request(
-            &copilot_lsp,
-            vec![crate::request::Completion {
-                text: "one.copilot1".into(),
-                range: lsp::Range::new(lsp::Position::new(0, 0), lsp::Position::new(0, 4)),
-                ..Default::default()
-            }],
-            vec![],
-        );
-        executor.advance_clock(COPILOT_DEBOUNCE_TIMEOUT);
-        cx.update_editor(|editor, window, cx| {
-            assert!(editor.context_menu_visible());
-            assert!(editor.has_active_edit_prediction());
-            // Since we have both, the copilot suggestion is existing but does not show up as ghost text
-            assert_eq!(editor.text(cx), "one.\ntwo\nthree\n");
-            assert_eq!(editor.display_text(cx), "one.\ntwo\nthree\n");
-
-            // Confirming a non-copilot completion inserts it and hides the context menu, without showing
-            // the copilot suggestion afterwards.
-            editor
-                .confirm_completion(&Default::default(), window, cx)
-                .unwrap()
-                .detach();
-            assert!(!editor.context_menu_visible());
-            assert!(!editor.has_active_edit_prediction());
-            assert_eq!(editor.text(cx), "one.completion_a\ntwo\nthree\n");
-            assert_eq!(editor.display_text(cx), "one.completion_a\ntwo\nthree\n");
-        });
-
-        // Reset editor and only return copilot suggestions
-        cx.set_state(indoc! {"
-            oneˇ
-            two
-            three
-        "});
-        cx.simulate_keystroke(".");
-
-        drop(handle_completion_request(
-            &mut cx,
-            indoc! {"
-                one.|<>
-                two
-                three
-            "},
-            vec![],
-        ));
-        handle_copilot_completion_request(
-            &copilot_lsp,
-            vec![crate::request::Completion {
-                text: "one.copilot1".into(),
-                range: lsp::Range::new(lsp::Position::new(0, 0), lsp::Position::new(0, 4)),
-                ..Default::default()
-            }],
-            vec![],
-        );
-        executor.advance_clock(COPILOT_DEBOUNCE_TIMEOUT);
-        cx.update_editor(|editor, _, cx| {
-            assert!(!editor.context_menu_visible());
-            assert!(editor.has_active_edit_prediction());
-            // Since only the copilot is available, it's shown inline
-            assert_eq!(editor.display_text(cx), "one.copilot1\ntwo\nthree\n");
-            assert_eq!(editor.text(cx), "one.\ntwo\nthree\n");
-        });
-
-        // Ensure existing edit prediction is interpolated when inserting again.
-        cx.simulate_keystroke("c");
-        executor.run_until_parked();
-        cx.update_editor(|editor, _, cx| {
-            assert!(!editor.context_menu_visible());
-            assert!(editor.has_active_edit_prediction());
-            assert_eq!(editor.display_text(cx), "one.copilot1\ntwo\nthree\n");
-            assert_eq!(editor.text(cx), "one.c\ntwo\nthree\n");
-        });
-
-        // After debouncing, new Copilot completions should be requested.
-        handle_copilot_completion_request(
-            &copilot_lsp,
-            vec![crate::request::Completion {
-                text: "one.copilot2".into(),
-                range: lsp::Range::new(lsp::Position::new(0, 0), lsp::Position::new(0, 5)),
-                ..Default::default()
-            }],
-            vec![],
-        );
-        executor.advance_clock(COPILOT_DEBOUNCE_TIMEOUT);
-        cx.update_editor(|editor, window, cx| {
-            assert!(!editor.context_menu_visible());
-            assert!(editor.has_active_edit_prediction());
-            assert_eq!(editor.display_text(cx), "one.copilot2\ntwo\nthree\n");
-            assert_eq!(editor.text(cx), "one.c\ntwo\nthree\n");
-
-            // Canceling should remove the active Copilot suggestion.
-            editor.cancel(&Default::default(), window, cx);
-            assert!(!editor.has_active_edit_prediction());
-            assert_eq!(editor.display_text(cx), "one.c\ntwo\nthree\n");
-            assert_eq!(editor.text(cx), "one.c\ntwo\nthree\n");
-
-            // After canceling, tabbing shouldn't insert the previously shown suggestion.
-            editor.tab(&Default::default(), window, cx);
-            assert!(!editor.has_active_edit_prediction());
-            assert_eq!(editor.display_text(cx), "one.c   \ntwo\nthree\n");
-            assert_eq!(editor.text(cx), "one.c   \ntwo\nthree\n");
-
-            // When undoing the previously active suggestion is shown again.
-            editor.undo(&Default::default(), window, cx);
-            assert!(editor.has_active_edit_prediction());
-            assert_eq!(editor.display_text(cx), "one.copilot2\ntwo\nthree\n");
-            assert_eq!(editor.text(cx), "one.c\ntwo\nthree\n");
-        });
-
-        // If an edit occurs outside of this editor, the suggestion is still correctly interpolated.
-        cx.update_buffer(|buffer, cx| buffer.edit([(5..5, "o")], None, cx));
-        cx.update_editor(|editor, window, cx| {
-            assert!(editor.has_active_edit_prediction());
-            assert_eq!(editor.display_text(cx), "one.copilot2\ntwo\nthree\n");
-            assert_eq!(editor.text(cx), "one.co\ntwo\nthree\n");
-
-            // AcceptEditPrediction when there is an active suggestion inserts it.
-            editor.accept_edit_prediction(&Default::default(), window, cx);
-            assert!(!editor.has_active_edit_prediction());
-            assert_eq!(editor.display_text(cx), "one.copilot2\ntwo\nthree\n");
-            assert_eq!(editor.text(cx), "one.copilot2\ntwo\nthree\n");
-
-            // When undoing the previously active suggestion is shown again.
-            editor.undo(&Default::default(), window, cx);
-            assert!(editor.has_active_edit_prediction());
-            assert_eq!(editor.display_text(cx), "one.copilot2\ntwo\nthree\n");
-            assert_eq!(editor.text(cx), "one.co\ntwo\nthree\n");
-
-            // Hide suggestion.
-            editor.cancel(&Default::default(), window, cx);
-            assert!(!editor.has_active_edit_prediction());
-            assert_eq!(editor.display_text(cx), "one.co\ntwo\nthree\n");
-            assert_eq!(editor.text(cx), "one.co\ntwo\nthree\n");
-        });
-
-        // If an edit occurs outside of this editor but no suggestion is being shown,
-        // we won't make it visible.
-        cx.update_buffer(|buffer, cx| buffer.edit([(6..6, "p")], None, cx));
-        cx.update_editor(|editor, _, cx| {
-            assert!(!editor.has_active_edit_prediction());
-            assert_eq!(editor.display_text(cx), "one.cop\ntwo\nthree\n");
-            assert_eq!(editor.text(cx), "one.cop\ntwo\nthree\n");
-        });
-
-        // Reset the editor to verify how suggestions behave when tabbing on leading indentation.
-        cx.update_editor(|editor, window, cx| {
-            editor.set_text("fn foo() {\n  \n}", window, cx);
-            editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                s.select_ranges([Point::new(1, 2)..Point::new(1, 2)])
-            });
-        });
-        handle_copilot_completion_request(
-            &copilot_lsp,
-            vec![crate::request::Completion {
-                text: "    let x = 4;".into(),
-                range: lsp::Range::new(lsp::Position::new(1, 0), lsp::Position::new(1, 2)),
-                ..Default::default()
-            }],
-            vec![],
-        );
-
-        cx.update_editor(|editor, window, cx| {
-            editor.next_edit_prediction(&Default::default(), window, cx)
-        });
-        executor.advance_clock(COPILOT_DEBOUNCE_TIMEOUT);
-        cx.update_editor(|editor, window, cx| {
-            assert!(editor.has_active_edit_prediction());
-            assert_eq!(editor.display_text(cx), "fn foo() {\n    let x = 4;\n}");
-            assert_eq!(editor.text(cx), "fn foo() {\n  \n}");
-
-            // Tabbing inside of leading whitespace inserts indentation without accepting the suggestion.
-            editor.tab(&Default::default(), window, cx);
-            assert!(editor.has_active_edit_prediction());
-            assert_eq!(editor.text(cx), "fn foo() {\n    \n}");
-            assert_eq!(editor.display_text(cx), "fn foo() {\n    let x = 4;\n}");
-
-            // Using AcceptEditPrediction again accepts the suggestion.
-            editor.accept_edit_prediction(&Default::default(), window, cx);
-            assert!(!editor.has_active_edit_prediction());
-            assert_eq!(editor.text(cx), "fn foo() {\n    let x = 4;\n}");
-            assert_eq!(editor.display_text(cx), "fn foo() {\n    let x = 4;\n}");
-        });
-    }
-
-    #[gpui::test(iterations = 10)]
-    async fn test_accept_partial_copilot_suggestion(
-        executor: BackgroundExecutor,
-        cx: &mut TestAppContext,
-    ) {
-        // flaky
-        init_test(cx, |settings| {
-            settings.defaults.completions = Some(CompletionSettingsContent {
-                words: Some(WordsCompletionMode::Disabled),
-                words_min_length: Some(0),
-                lsp_insert_mode: Some(LspInsertMode::Insert),
-                ..Default::default()
-            });
-        });
-
-        let (copilot, copilot_lsp) = Copilot::fake(cx);
-        let mut cx = EditorLspTestContext::new_rust(
-            lsp::ServerCapabilities {
-                completion_provider: Some(lsp::CompletionOptions {
-                    trigger_characters: Some(vec![".".to_string(), ":".to_string()]),
-                    ..Default::default()
-                }),
-                ..Default::default()
-            },
-            cx,
-        )
-        .await;
-        let copilot_provider = cx.new(|_| CopilotEditPredictionDelegate::new(copilot));
-        cx.update_editor(|editor, window, cx| {
-            editor.set_edit_prediction_provider(Some(copilot_provider), window, cx)
-        });
-
-        // Setup the editor with a completion request.
-        cx.set_state(indoc! {"
-            oneˇ
-            two
-            three
-        "});
-        cx.simulate_keystroke(".");
-        drop(handle_completion_request(
-            &mut cx,
-            indoc! {"
-                one.|<>
-                two
-                three
-            "},
-            vec![],
-        ));
-        handle_copilot_completion_request(
-            &copilot_lsp,
-            vec![crate::request::Completion {
-                text: "one.copilot1".into(),
-                range: lsp::Range::new(lsp::Position::new(0, 0), lsp::Position::new(0, 4)),
-                ..Default::default()
-            }],
-            vec![],
-        );
-        executor.advance_clock(COPILOT_DEBOUNCE_TIMEOUT);
-        cx.update_editor(|editor, window, cx| {
-            assert!(editor.has_active_edit_prediction());
-
-            // Accepting the first word of the suggestion should only accept the first word and still show the rest.
-            editor.accept_partial_edit_prediction(&Default::default(), window, cx);
-            assert!(editor.has_active_edit_prediction());
-            assert_eq!(editor.text(cx), "one.copilot\ntwo\nthree\n");
-            assert_eq!(editor.display_text(cx), "one.copilot1\ntwo\nthree\n");
-
-            // Accepting next word should accept the non-word and copilot suggestion should be gone
-            editor.accept_partial_edit_prediction(&Default::default(), window, cx);
-            assert!(!editor.has_active_edit_prediction());
-            assert_eq!(editor.text(cx), "one.copilot1\ntwo\nthree\n");
-            assert_eq!(editor.display_text(cx), "one.copilot1\ntwo\nthree\n");
-        });
-
-        // Reset the editor and check non-word and whitespace completion
-        cx.set_state(indoc! {"
-            oneˇ
-            two
-            three
-        "});
-        cx.simulate_keystroke(".");
-        drop(handle_completion_request(
-            &mut cx,
-            indoc! {"
-                one.|<>
-                two
-                three
-            "},
-            vec![],
-        ));
-        handle_copilot_completion_request(
-            &copilot_lsp,
-            vec![crate::request::Completion {
-                text: "one.123. copilot\n 456".into(),
-                range: lsp::Range::new(lsp::Position::new(0, 0), lsp::Position::new(0, 4)),
-                ..Default::default()
-            }],
-            vec![],
-        );
-        executor.advance_clock(COPILOT_DEBOUNCE_TIMEOUT);
-        cx.update_editor(|editor, window, cx| {
-            assert!(editor.has_active_edit_prediction());
-
-            // Accepting the first word (non-word) of the suggestion should only accept the first word and still show the rest.
-            editor.accept_partial_edit_prediction(&Default::default(), window, cx);
-            assert!(editor.has_active_edit_prediction());
-            assert_eq!(editor.text(cx), "one.123. \ntwo\nthree\n");
-            assert_eq!(
-                editor.display_text(cx),
-                "one.123. copilot\n 456\ntwo\nthree\n"
-            );
-
-            // Accepting next word should accept the next word and copilot suggestion should still exist
-            editor.accept_partial_edit_prediction(&Default::default(), window, cx);
-            assert!(editor.has_active_edit_prediction());
-            assert_eq!(editor.text(cx), "one.123. copilot\ntwo\nthree\n");
-            assert_eq!(
-                editor.display_text(cx),
-                "one.123. copilot\n 456\ntwo\nthree\n"
-            );
-
-            // Accepting the whitespace should accept the non-word/whitespaces with newline and copilot suggestion should be gone
-            editor.accept_partial_edit_prediction(&Default::default(), window, cx);
-            assert!(!editor.has_active_edit_prediction());
-            assert_eq!(editor.text(cx), "one.123. copilot\n 456\ntwo\nthree\n");
-            assert_eq!(
-                editor.display_text(cx),
-                "one.123. copilot\n 456\ntwo\nthree\n"
-            );
-        });
-    }
-
-    #[gpui::test]
-    async fn test_copilot_completion_invalidation(
-        executor: BackgroundExecutor,
-        cx: &mut TestAppContext,
-    ) {
-        init_test(cx, |_| {});
-
-        let (copilot, copilot_lsp) = Copilot::fake(cx);
-        let mut cx = EditorLspTestContext::new_rust(
-            lsp::ServerCapabilities {
-                completion_provider: Some(lsp::CompletionOptions {
-                    trigger_characters: Some(vec![".".to_string(), ":".to_string()]),
-                    ..Default::default()
-                }),
-                ..Default::default()
-            },
-            cx,
-        )
-        .await;
-        let copilot_provider = cx.new(|_| CopilotEditPredictionDelegate::new(copilot));
-        cx.update_editor(|editor, window, cx| {
-            editor.set_edit_prediction_provider(Some(copilot_provider), window, cx)
-        });
-
-        cx.set_state(indoc! {"
-            one
-            twˇ
-            three
-        "});
-
-        handle_copilot_completion_request(
-            &copilot_lsp,
-            vec![crate::request::Completion {
-                text: "two.foo()".into(),
-                range: lsp::Range::new(lsp::Position::new(1, 0), lsp::Position::new(1, 2)),
-                ..Default::default()
-            }],
-            vec![],
-        );
-        cx.update_editor(|editor, window, cx| {
-            editor.next_edit_prediction(&Default::default(), window, cx)
-        });
-        executor.advance_clock(COPILOT_DEBOUNCE_TIMEOUT);
-        cx.update_editor(|editor, window, cx| {
-            assert!(editor.has_active_edit_prediction());
-            assert_eq!(editor.display_text(cx), "one\ntwo.foo()\nthree\n");
-            assert_eq!(editor.text(cx), "one\ntw\nthree\n");
-
-            editor.backspace(&Default::default(), window, cx);
-            assert!(editor.has_active_edit_prediction());
-            assert_eq!(editor.display_text(cx), "one\ntwo.foo()\nthree\n");
-            assert_eq!(editor.text(cx), "one\nt\nthree\n");
-
-            editor.backspace(&Default::default(), window, cx);
-            assert!(editor.has_active_edit_prediction());
-            assert_eq!(editor.display_text(cx), "one\ntwo.foo()\nthree\n");
-            assert_eq!(editor.text(cx), "one\n\nthree\n");
-
-            // Deleting across the original suggestion range invalidates it.
-            editor.backspace(&Default::default(), window, cx);
-            assert!(!editor.has_active_edit_prediction());
-            assert_eq!(editor.display_text(cx), "one\nthree\n");
-            assert_eq!(editor.text(cx), "one\nthree\n");
-
-            // Undoing the deletion restores the suggestion.
-            editor.undo(&Default::default(), window, cx);
-            assert!(editor.has_active_edit_prediction());
-            assert_eq!(editor.display_text(cx), "one\ntwo.foo()\nthree\n");
-            assert_eq!(editor.text(cx), "one\n\nthree\n");
-        });
-    }
-
-    #[gpui::test]
-    async fn test_copilot_multibuffer(executor: BackgroundExecutor, cx: &mut TestAppContext) {
-        init_test(cx, |_| {});
-
-        let (copilot, copilot_lsp) = Copilot::fake(cx);
-
-        let buffer_1 = cx.new(|cx| Buffer::local("a = 1\nb = 2\n", cx));
-        let buffer_2 = cx.new(|cx| Buffer::local("c = 3\nd = 4\n", cx));
-        let multibuffer = cx.new(|cx| {
-            let mut multibuffer = MultiBuffer::new(language::Capability::ReadWrite);
-            multibuffer.push_excerpts(
-                buffer_1.clone(),
-                [ExcerptRange::new(Point::new(0, 0)..Point::new(2, 0))],
-                cx,
-            );
-            multibuffer.push_excerpts(
-                buffer_2.clone(),
-                [ExcerptRange::new(Point::new(0, 0)..Point::new(2, 0))],
-                cx,
-            );
-            multibuffer
-        });
-        let editor =
-            cx.add_window(|window, cx| Editor::for_multibuffer(multibuffer, None, window, cx));
-        editor
-            .update(cx, |editor, window, cx| {
-                use gpui::Focusable;
-                window.focus(&editor.focus_handle(cx));
-            })
-            .unwrap();
-        let copilot_provider = cx.new(|_| CopilotEditPredictionDelegate::new(copilot));
-        editor
-            .update(cx, |editor, window, cx| {
-                editor.set_edit_prediction_provider(Some(copilot_provider), window, cx)
-            })
-            .unwrap();
-
-        handle_copilot_completion_request(
-            &copilot_lsp,
-            vec![crate::request::Completion {
-                text: "b = 2 + a".into(),
-                range: lsp::Range::new(lsp::Position::new(1, 0), lsp::Position::new(1, 5)),
-                ..Default::default()
-            }],
-            vec![],
-        );
-        _ = editor.update(cx, |editor, window, cx| {
-            // Ensure copilot suggestions are shown for the first excerpt.
-            editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                s.select_ranges([Point::new(1, 5)..Point::new(1, 5)])
-            });
-            editor.next_edit_prediction(&Default::default(), window, cx);
-        });
-        executor.advance_clock(COPILOT_DEBOUNCE_TIMEOUT);
-        _ = editor.update(cx, |editor, _, cx| {
-            assert!(editor.has_active_edit_prediction());
-            assert_eq!(
-                editor.display_text(cx),
-                "\n\na = 1\nb = 2 + a\n\n\n\nc = 3\nd = 4\n"
-            );
-            assert_eq!(editor.text(cx), "a = 1\nb = 2\n\nc = 3\nd = 4\n");
-        });
-
-        handle_copilot_completion_request(
-            &copilot_lsp,
-            vec![crate::request::Completion {
-                text: "d = 4 + c".into(),
-                range: lsp::Range::new(lsp::Position::new(1, 0), lsp::Position::new(1, 6)),
-                ..Default::default()
-            }],
-            vec![],
-        );
-        _ = editor.update(cx, |editor, window, cx| {
-            // Move to another excerpt, ensuring the suggestion gets cleared.
-            editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                s.select_ranges([Point::new(4, 5)..Point::new(4, 5)])
-            });
-            assert!(!editor.has_active_edit_prediction());
-            assert_eq!(
-                editor.display_text(cx),
-                "\n\na = 1\nb = 2\n\n\n\nc = 3\nd = 4\n"
-            );
-            assert_eq!(editor.text(cx), "a = 1\nb = 2\n\nc = 3\nd = 4\n");
-
-            // Type a character, ensuring we don't even try to interpolate the previous suggestion.
-            editor.handle_input(" ", window, cx);
-            assert!(!editor.has_active_edit_prediction());
-            assert_eq!(
-                editor.display_text(cx),
-                "\n\na = 1\nb = 2\n\n\n\nc = 3\nd = 4 \n"
-            );
-            assert_eq!(editor.text(cx), "a = 1\nb = 2\n\nc = 3\nd = 4 \n");
-        });
-
-        // Ensure the new suggestion is displayed when the debounce timeout expires.
-        executor.advance_clock(COPILOT_DEBOUNCE_TIMEOUT);
-        _ = editor.update(cx, |editor, _, cx| {
-            assert!(editor.has_active_edit_prediction());
-            assert_eq!(
-                editor.display_text(cx),
-                "\n\na = 1\nb = 2\n\n\n\nc = 3\nd = 4 + c\n"
-            );
-            assert_eq!(editor.text(cx), "a = 1\nb = 2\n\nc = 3\nd = 4 \n");
-        });
-    }
-
-    #[gpui::test]
-    async fn test_copilot_does_not_prevent_completion_triggers(
-        executor: BackgroundExecutor,
-        cx: &mut TestAppContext,
-    ) {
-        init_test(cx, |_| {});
-
-        let (copilot, copilot_lsp) = Copilot::fake(cx);
-        let mut cx = EditorLspTestContext::new_rust(
-            lsp::ServerCapabilities {
-                completion_provider: Some(lsp::CompletionOptions {
-                    trigger_characters: Some(vec![".".to_string(), ":".to_string()]),
-                    ..lsp::CompletionOptions::default()
-                }),
-                ..lsp::ServerCapabilities::default()
-            },
-            cx,
-        )
-        .await;
-        let copilot_provider = cx.new(|_| CopilotEditPredictionDelegate::new(copilot));
-        cx.update_editor(|editor, window, cx| {
-            editor.set_edit_prediction_provider(Some(copilot_provider), window, cx)
-        });
-
-        cx.set_state(indoc! {"
-                one
-                twˇ
-                three
-            "});
-
-        drop(handle_completion_request(
-            &mut cx,
-            indoc! {"
-                one
-                tw|<>
-                three
-            "},
-            vec!["completion_a", "completion_b"],
-        ));
-        handle_copilot_completion_request(
-            &copilot_lsp,
-            vec![crate::request::Completion {
-                text: "two.foo()".into(),
-                range: lsp::Range::new(lsp::Position::new(1, 0), lsp::Position::new(1, 2)),
-                ..Default::default()
-            }],
-            vec![],
-        );
-        cx.update_editor(|editor, window, cx| {
-            editor.next_edit_prediction(&Default::default(), window, cx)
-        });
-        executor.advance_clock(COPILOT_DEBOUNCE_TIMEOUT);
-        cx.update_editor(|editor, _, cx| {
-            assert!(!editor.context_menu_visible());
-            assert!(editor.has_active_edit_prediction());
-            assert_eq!(editor.display_text(cx), "one\ntwo.foo()\nthree\n");
-            assert_eq!(editor.text(cx), "one\ntw\nthree\n");
-        });
-
-        cx.simulate_keystroke("o");
-        drop(handle_completion_request(
-            &mut cx,
-            indoc! {"
-                one
-                two|<>
-                three
-            "},
-            vec!["completion_a_2", "completion_b_2"],
-        ));
-        handle_copilot_completion_request(
-            &copilot_lsp,
-            vec![crate::request::Completion {
-                text: "two.foo()".into(),
-                range: lsp::Range::new(lsp::Position::new(1, 0), lsp::Position::new(1, 3)),
-                ..Default::default()
-            }],
-            vec![],
-        );
-        executor.advance_clock(COPILOT_DEBOUNCE_TIMEOUT);
-        cx.update_editor(|editor, _, cx| {
-            assert!(!editor.context_menu_visible());
-            assert!(editor.has_active_edit_prediction());
-            assert_eq!(editor.display_text(cx), "one\ntwo.foo()\nthree\n");
-            assert_eq!(editor.text(cx), "one\ntwo\nthree\n");
-        });
-
-        cx.simulate_keystroke(".");
-        drop(handle_completion_request(
-            &mut cx,
-            indoc! {"
-                one
-                two.|<>
-                three
-            "},
-            vec!["something_else()"],
-        ));
-        handle_copilot_completion_request(
-            &copilot_lsp,
-            vec![crate::request::Completion {
-                text: "two.foo()".into(),
-                range: lsp::Range::new(lsp::Position::new(1, 0), lsp::Position::new(1, 4)),
-                ..Default::default()
-            }],
-            vec![],
-        );
-        executor.advance_clock(COPILOT_DEBOUNCE_TIMEOUT);
-        cx.update_editor(|editor, _, cx| {
-            assert!(editor.context_menu_visible());
-            assert!(editor.has_active_edit_prediction());
-            assert_eq!(editor.text(cx), "one\ntwo.\nthree\n");
-            assert_eq!(editor.display_text(cx), "one\ntwo.\nthree\n");
-        });
-    }
-
-    #[gpui::test]
-    async fn test_copilot_disabled_globs(executor: BackgroundExecutor, cx: &mut TestAppContext) {
-        init_test(cx, |settings| {
-            settings
-                .edit_predictions
-                .get_or_insert(Default::default())
-                .disabled_globs = Some(vec![".env*".to_string()]);
-        });
-
-        let (copilot, copilot_lsp) = Copilot::fake(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/test"),
-            json!({
-                ".env": "SECRET=something\n",
-                "README.md": "hello\nworld\nhow\nare\nyou\ntoday"
-            }),
-        )
-        .await;
-        let project = Project::test(fs, [path!("/test").as_ref()], cx).await;
-
-        let private_buffer = project
-            .update(cx, |project, cx| {
-                project.open_local_buffer(path!("/test/.env"), cx)
-            })
-            .await
-            .unwrap();
-        let public_buffer = project
-            .update(cx, |project, cx| {
-                project.open_local_buffer(path!("/test/README.md"), cx)
-            })
-            .await
-            .unwrap();
-
-        let multibuffer = cx.new(|cx| {
-            let mut multibuffer = MultiBuffer::new(language::Capability::ReadWrite);
-            multibuffer.push_excerpts(
-                private_buffer.clone(),
-                [ExcerptRange::new(Point::new(0, 0)..Point::new(1, 0))],
-                cx,
-            );
-            multibuffer.push_excerpts(
-                public_buffer.clone(),
-                [ExcerptRange::new(Point::new(0, 0)..Point::new(6, 0))],
-                cx,
-            );
-            multibuffer
-        });
-        let editor =
-            cx.add_window(|window, cx| Editor::for_multibuffer(multibuffer, None, window, cx));
-        editor
-            .update(cx, |editor, window, cx| {
-                use gpui::Focusable;
-                window.focus(&editor.focus_handle(cx))
-            })
-            .unwrap();
-        let copilot_provider = cx.new(|_| CopilotEditPredictionDelegate::new(copilot));
-        editor
-            .update(cx, |editor, window, cx| {
-                editor.set_edit_prediction_provider(Some(copilot_provider), window, cx)
-            })
-            .unwrap();
-
-        let mut copilot_requests = copilot_lsp
-            .set_request_handler::<crate::request::GetCompletions, _, _>(
-                move |_params, _cx| async move {
-                    Ok(crate::request::GetCompletionsResult {
-                        completions: vec![crate::request::Completion {
-                            text: "next line".into(),
-                            range: lsp::Range::new(
-                                lsp::Position::new(1, 0),
-                                lsp::Position::new(1, 0),
-                            ),
-                            ..Default::default()
-                        }],
-                    })
-                },
-            );
-
-        _ = editor.update(cx, |editor, window, cx| {
-            editor.change_selections(SelectionEffects::no_scroll(), window, cx, |selections| {
-                selections.select_ranges([Point::new(0, 0)..Point::new(0, 0)])
-            });
-            editor.refresh_edit_prediction(true, false, window, cx);
-        });
-
-        executor.advance_clock(COPILOT_DEBOUNCE_TIMEOUT);
-        assert!(copilot_requests.try_next().is_err());
-
-        _ = editor.update(cx, |editor, window, cx| {
-            editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                s.select_ranges([Point::new(5, 0)..Point::new(5, 0)])
-            });
-            editor.refresh_edit_prediction(true, false, window, cx);
-        });
-
-        executor.advance_clock(COPILOT_DEBOUNCE_TIMEOUT);
-        assert!(copilot_requests.try_next().is_ok());
-    }
-
-    fn handle_copilot_completion_request(
-        lsp: &lsp::FakeLanguageServer,
-        completions: Vec<crate::request::Completion>,
-        completions_cycling: Vec<crate::request::Completion>,
-    ) {
-        lsp.set_request_handler::<crate::request::GetCompletions, _, _>(move |_params, _cx| {
-            let completions = completions.clone();
-            async move {
-                Ok(crate::request::GetCompletionsResult {
-                    completions: completions.clone(),
-                })
-            }
-        });
-        lsp.set_request_handler::<crate::request::GetCompletionsCycling, _, _>(
-            move |_params, _cx| {
-                let completions_cycling = completions_cycling.clone();
-                async move {
-                    Ok(crate::request::GetCompletionsResult {
-                        completions: completions_cycling.clone(),
-                    })
-                }
-            },
-        );
-    }
-
-    fn handle_completion_request(
-        cx: &mut EditorLspTestContext,
-        marked_string: &str,
-        completions: Vec<&'static str>,
-    ) -> impl Future<Output = ()> {
-        let complete_from_marker: TextRangeMarker = '|'.into();
-        let replace_range_marker: TextRangeMarker = ('<', '>').into();
-        let (_, mut marked_ranges) = marked_text_ranges_by(
-            marked_string,
-            vec![complete_from_marker, replace_range_marker.clone()],
-        );
-
-        let range = marked_ranges.remove(&replace_range_marker).unwrap()[0].clone();
-        let replace_range =
-            cx.to_lsp_range(MultiBufferOffset(range.start)..MultiBufferOffset(range.end));
-
-        let mut request =
-            cx.set_request_handler::<lsp::request::Completion, _, _>(move |url, params, _| {
-                let completions = completions.clone();
-                async move {
-                    assert_eq!(params.text_document_position.text_document.uri, url.clone());
-                    Ok(Some(lsp::CompletionResponse::Array(
-                        completions
-                            .iter()
-                            .map(|completion_text| lsp::CompletionItem {
-                                label: completion_text.to_string(),
-                                text_edit: Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
-                                    range: replace_range,
-                                    new_text: completion_text.to_string(),
-                                })),
-                                ..Default::default()
-                            })
-                            .collect(),
-                    )))
-                }
-            });
-
-        async move {
-            request.next().await;
-        }
-    }
-
-    fn init_test(cx: &mut TestAppContext, f: fn(&mut AllLanguageSettingsContent)) {
-        cx.update(|cx| {
-            let store = SettingsStore::test(cx);
-            cx.set_global(store);
-            theme::init(theme::LoadThemes::JustBase, cx);
-            SettingsStore::update_global(cx, |store: &mut SettingsStore, cx| {
-                store.update_user_settings(cx, |settings| f(&mut settings.project.all_languages));
-            });
-        });
-    }
-}
diff --git a/crates/copilot/src/copilot_responses.rs b/crates/copilot/src/copilot_responses.rs
deleted file mode 100644
index 2da2eb394b..0000000000
--- a/crates/copilot/src/copilot_responses.rs
+++ /dev/null
@@ -1,419 +0,0 @@
-use super::*;
-use anyhow::{Result, anyhow};
-use futures::{AsyncBufReadExt, AsyncReadExt, StreamExt, io::BufReader, stream::BoxStream};
-use http_client::{AsyncBody, HttpClient, Method, Request as HttpRequest};
-use serde::{Deserialize, Serialize};
-use serde_json::Value;
-pub use settings::OpenAiReasoningEffort as ReasoningEffort;
-
-#[derive(Serialize, Debug)]
-pub struct Request {
-    pub model: String,
-    pub input: Vec<ResponseInputItem>,
-    #[serde(default)]
-    pub stream: bool,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub temperature: Option<f32>,
-    #[serde(skip_serializing_if = "Vec::is_empty")]
-    pub tools: Vec<ToolDefinition>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub tool_choice: Option<ToolChoice>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub reasoning: Option<ReasoningConfig>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub include: Option<Vec<ResponseIncludable>>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-#[serde(rename_all = "snake_case")]
-pub enum ResponseIncludable {
-    #[serde(rename = "reasoning.encrypted_content")]
-    ReasoningEncryptedContent,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-#[serde(tag = "type", rename_all = "snake_case")]
-pub enum ToolDefinition {
-    Function {
-        name: String,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        description: Option<String>,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        parameters: Option<Value>,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        strict: Option<bool>,
-    },
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-#[serde(rename_all = "lowercase")]
-pub enum ToolChoice {
-    Auto,
-    Any,
-    None,
-    #[serde(untagged)]
-    Other(ToolDefinition),
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-#[serde(rename_all = "lowercase")]
-pub enum ReasoningSummary {
-    Auto,
-    Concise,
-    Detailed,
-}
-
-#[derive(Serialize, Debug)]
-pub struct ReasoningConfig {
-    pub effort: ReasoningEffort,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub summary: Option<ReasoningSummary>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, Default)]
-#[serde(rename_all = "snake_case")]
-pub enum ResponseImageDetail {
-    Low,
-    High,
-    #[default]
-    Auto,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-#[serde(tag = "type", rename_all = "snake_case")]
-pub enum ResponseInputContent {
-    InputText {
-        text: String,
-    },
-    OutputText {
-        text: String,
-    },
-    InputImage {
-        #[serde(skip_serializing_if = "Option::is_none")]
-        image_url: Option<String>,
-        #[serde(default)]
-        detail: ResponseImageDetail,
-    },
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-#[serde(rename_all = "snake_case")]
-pub enum ItemStatus {
-    InProgress,
-    Completed,
-    Incomplete,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-#[serde(untagged)]
-pub enum ResponseFunctionOutput {
-    Text(String),
-    Content(Vec<ResponseInputContent>),
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-#[serde(tag = "type", rename_all = "snake_case")]
-pub enum ResponseInputItem {
-    Message {
-        role: String,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        content: Option<Vec<ResponseInputContent>>,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        status: Option<String>,
-    },
-    FunctionCall {
-        call_id: String,
-        name: String,
-        arguments: String,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        status: Option<ItemStatus>,
-        #[serde(default, skip_serializing_if = "Option::is_none")]
-        thought_signature: Option<String>,
-    },
-    FunctionCallOutput {
-        call_id: String,
-        output: ResponseFunctionOutput,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        status: Option<ItemStatus>,
-    },
-    Reasoning {
-        #[serde(skip_serializing_if = "Option::is_none")]
-        id: Option<String>,
-        summary: Vec<ResponseReasoningItem>,
-        encrypted_content: String,
-    },
-}
-
-#[derive(Deserialize, Debug, Clone)]
-#[serde(rename_all = "snake_case")]
-pub enum IncompleteReason {
-    #[serde(rename = "max_output_tokens")]
-    MaxOutputTokens,
-    #[serde(rename = "content_filter")]
-    ContentFilter,
-}
-
-#[derive(Deserialize, Debug, Clone)]
-pub struct IncompleteDetails {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub reason: Option<IncompleteReason>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct ResponseReasoningItem {
-    #[serde(rename = "type")]
-    pub kind: String,
-    pub text: String,
-}
-
-#[derive(Deserialize, Debug)]
-#[serde(tag = "type")]
-pub enum StreamEvent {
-    #[serde(rename = "error")]
-    GenericError { error: ResponseError },
-
-    #[serde(rename = "response.created")]
-    Created { response: Response },
-
-    #[serde(rename = "response.output_item.added")]
-    OutputItemAdded {
-        output_index: usize,
-        #[serde(default)]
-        sequence_number: Option<u64>,
-        item: ResponseOutputItem,
-    },
-
-    #[serde(rename = "response.output_text.delta")]
-    OutputTextDelta {
-        item_id: String,
-        output_index: usize,
-        delta: String,
-    },
-
-    #[serde(rename = "response.output_item.done")]
-    OutputItemDone {
-        output_index: usize,
-        #[serde(default)]
-        sequence_number: Option<u64>,
-        item: ResponseOutputItem,
-    },
-
-    #[serde(rename = "response.incomplete")]
-    Incomplete { response: Response },
-
-    #[serde(rename = "response.completed")]
-    Completed { response: Response },
-
-    #[serde(rename = "response.failed")]
-    Failed { response: Response },
-
-    #[serde(other)]
-    Unknown,
-}
-
-#[derive(Deserialize, Debug, Clone)]
-pub struct ResponseError {
-    pub code: String,
-    pub message: String,
-}
-
-#[derive(Deserialize, Debug, Default, Clone)]
-pub struct Response {
-    pub id: Option<String>,
-    pub status: Option<String>,
-    pub usage: Option<ResponseUsage>,
-    pub output: Vec<ResponseOutputItem>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub incomplete_details: Option<IncompleteDetails>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error: Option<ResponseError>,
-}
-
-#[derive(Deserialize, Debug, Default, Clone)]
-pub struct ResponseUsage {
-    pub input_tokens: Option<u64>,
-    pub output_tokens: Option<u64>,
-    pub total_tokens: Option<u64>,
-}
-
-#[derive(Deserialize, Debug, Clone)]
-#[serde(tag = "type", rename_all = "snake_case")]
-pub enum ResponseOutputItem {
-    Message {
-        id: String,
-        role: String,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        content: Option<Vec<ResponseOutputContent>>,
-    },
-    FunctionCall {
-        #[serde(skip_serializing_if = "Option::is_none")]
-        id: Option<String>,
-        call_id: String,
-        name: String,
-        arguments: String,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        status: Option<ItemStatus>,
-        #[serde(default, skip_serializing_if = "Option::is_none")]
-        thought_signature: Option<String>,
-    },
-    Reasoning {
-        id: String,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        summary: Option<Vec<ResponseReasoningItem>>,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        encrypted_content: Option<String>,
-    },
-}
-
-#[derive(Deserialize, Debug, Clone)]
-#[serde(tag = "type", rename_all = "snake_case")]
-pub enum ResponseOutputContent {
-    OutputText { text: String },
-    Refusal { refusal: String },
-}
-
-pub async fn stream_response(
-    client: Arc<dyn HttpClient>,
-    api_key: String,
-    api_url: String,
-    request: Request,
-    is_user_initiated: bool,
-) -> Result<BoxStream<'static, Result<StreamEvent>>> {
-    let is_vision_request = request.input.iter().any(|item| match item {
-        ResponseInputItem::Message {
-            content: Some(parts),
-            ..
-        } => parts
-            .iter()
-            .any(|p| matches!(p, ResponseInputContent::InputImage { .. })),
-        _ => false,
-    });
-
-    let request_initiator = if is_user_initiated { "user" } else { "agent" };
-
-    let request_builder = HttpRequest::builder()
-        .method(Method::POST)
-        .uri(&api_url)
-        .header(
-            "Editor-Version",
-            format!(
-                "Zed/{}",
-                option_env!("CARGO_PKG_VERSION").unwrap_or("unknown")
-            ),
-        )
-        .header("Authorization", format!("Bearer {}", api_key))
-        .header("Content-Type", "application/json")
-        .header("Copilot-Integration-Id", "vscode-chat")
-        .header("X-Initiator", request_initiator);
-
-    let request_builder = if is_vision_request {
-        request_builder.header("Copilot-Vision-Request", "true")
-    } else {
-        request_builder
-    };
-
-    let is_streaming = request.stream;
-    let json = serde_json::to_string(&request)?;
-    let request = request_builder.body(AsyncBody::from(json))?;
-    let mut response = client.send(request).await?;
-
-    if !response.status().is_success() {
-        let mut body = String::new();
-        response.body_mut().read_to_string(&mut body).await?;
-        anyhow::bail!("Failed to connect to API: {} {}", response.status(), body);
-    }
-
-    if is_streaming {
-        let reader = BufReader::new(response.into_body());
-        Ok(reader
-            .lines()
-            .filter_map(|line| async move {
-                match line {
-                    Ok(line) => {
-                        let line = line.strip_prefix("data: ")?;
-                        if line.starts_with("[DONE]") || line.is_empty() {
-                            return None;
-                        }
-
-                        match serde_json::from_str::<StreamEvent>(line) {
-                            Ok(event) => Some(Ok(event)),
-                            Err(error) => {
-                                log::error!(
-                                    "Failed to parse Copilot responses stream event: `{}`\nResponse: `{}`",
-                                    error,
-                                    line,
-                                );
-                                Some(Err(anyhow!(error)))
-                            }
-                        }
-                    }
-                    Err(error) => Some(Err(anyhow!(error))),
-                }
-            })
-            .boxed())
-    } else {
-        // Simulate streaming this makes the mapping of this function return more straight-forward to handle if all callers assume it streams.
-        // Removes the need of having a method to map StreamEvent and another to map Response to a LanguageCompletionEvent
-        let mut body = String::new();
-        response.body_mut().read_to_string(&mut body).await?;
-
-        match serde_json::from_str::<Response>(&body) {
-            Ok(response) => {
-                let events = vec![StreamEvent::Created {
-                    response: response.clone(),
-                }];
-
-                let mut all_events = events;
-                for (output_index, item) in response.output.iter().enumerate() {
-                    all_events.push(StreamEvent::OutputItemAdded {
-                        output_index,
-                        sequence_number: None,
-                        item: item.clone(),
-                    });
-
-                    if let ResponseOutputItem::Message {
-                        id,
-                        content: Some(content),
-                        ..
-                    } = item
-                    {
-                        for part in content {
-                            if let ResponseOutputContent::OutputText { text } = part {
-                                all_events.push(StreamEvent::OutputTextDelta {
-                                    item_id: id.clone(),
-                                    output_index,
-                                    delta: text.clone(),
-                                });
-                            }
-                        }
-                    }
-
-                    all_events.push(StreamEvent::OutputItemDone {
-                        output_index,
-                        sequence_number: None,
-                        item: item.clone(),
-                    });
-                }
-
-                let final_event = if response.error.is_some() {
-                    StreamEvent::Failed { response }
-                } else if response.incomplete_details.is_some() {
-                    StreamEvent::Incomplete { response }
-                } else {
-                    StreamEvent::Completed { response }
-                };
-                all_events.push(final_event);
-
-                Ok(futures::stream::iter(all_events.into_iter().map(Ok)).boxed())
-            }
-            Err(error) => {
-                log::error!(
-                    "Failed to parse Copilot non-streaming response: `{}`\nResponse: `{}`",
-                    error,
-                    body,
-                );
-                Err(anyhow!(error))
-            }
-        }
-    }
-}
diff --git a/crates/copilot/src/request.rs b/crates/copilot/src/request.rs
deleted file mode 100644
index 85d6254dc0..0000000000
--- a/crates/copilot/src/request.rs
+++ /dev/null
@@ -1,225 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-pub enum CheckStatus {}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct CheckStatusParams {
-    pub local_checks_only: bool,
-}
-
-impl lsp::request::Request for CheckStatus {
-    type Params = CheckStatusParams;
-    type Result = SignInStatus;
-    const METHOD: &'static str = "checkStatus";
-}
-
-pub enum SignInInitiate {}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct SignInInitiateParams {}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(tag = "status")]
-pub enum SignInInitiateResult {
-    AlreadySignedIn { user: String },
-    PromptUserDeviceFlow(PromptUserDeviceFlow),
-}
-
-#[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct PromptUserDeviceFlow {
-    pub user_code: String,
-    pub verification_uri: String,
-}
-
-impl lsp::request::Request for SignInInitiate {
-    type Params = SignInInitiateParams;
-    type Result = SignInInitiateResult;
-    const METHOD: &'static str = "signInInitiate";
-}
-
-pub enum SignInConfirm {}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SignInConfirmParams {
-    pub user_code: String,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(tag = "status")]
-pub enum SignInStatus {
-    #[serde(rename = "OK")]
-    Ok {
-        user: Option<String>,
-    },
-    MaybeOk {
-        user: String,
-    },
-    AlreadySignedIn {
-        user: String,
-    },
-    NotAuthorized {
-        user: String,
-    },
-    NotSignedIn,
-}
-
-impl lsp::request::Request for SignInConfirm {
-    type Params = SignInConfirmParams;
-    type Result = SignInStatus;
-    const METHOD: &'static str = "signInConfirm";
-}
-
-pub enum SignOut {}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SignOutParams {}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SignOutResult {}
-
-impl lsp::request::Request for SignOut {
-    type Params = SignOutParams;
-    type Result = SignOutResult;
-    const METHOD: &'static str = "signOut";
-}
-
-pub enum GetCompletions {}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct GetCompletionsParams {
-    pub doc: GetCompletionsDocument,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct GetCompletionsDocument {
-    pub tab_size: u32,
-    pub indent_size: u32,
-    pub insert_spaces: bool,
-    pub uri: lsp::Uri,
-    pub relative_path: String,
-    pub position: lsp::Position,
-    pub version: usize,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct GetCompletionsResult {
-    pub completions: Vec<Completion>,
-}
-
-#[derive(Clone, Debug, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Completion {
-    pub text: String,
-    pub position: lsp::Position,
-    pub uuid: String,
-    pub range: lsp::Range,
-    pub display_text: String,
-}
-
-impl lsp::request::Request for GetCompletions {
-    type Params = GetCompletionsParams;
-    type Result = GetCompletionsResult;
-    const METHOD: &'static str = "getCompletions";
-}
-
-pub enum GetCompletionsCycling {}
-
-impl lsp::request::Request for GetCompletionsCycling {
-    type Params = GetCompletionsParams;
-    type Result = GetCompletionsResult;
-    const METHOD: &'static str = "getCompletionsCycling";
-}
-
-pub enum LogMessage {}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct LogMessageParams {
-    pub level: u8,
-    pub message: String,
-    pub metadata_str: String,
-    pub extra: Vec<String>,
-}
-
-impl lsp::notification::Notification for LogMessage {
-    type Params = LogMessageParams;
-    const METHOD: &'static str = "LogMessage";
-}
-
-pub enum StatusNotification {}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct StatusNotificationParams {
-    pub message: String,
-    pub status: String, // One of Normal/InProgress
-}
-
-impl lsp::notification::Notification for StatusNotification {
-    type Params = StatusNotificationParams;
-    const METHOD: &'static str = "statusNotification";
-}
-
-pub enum SetEditorInfo {}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SetEditorInfoParams {
-    pub editor_info: EditorInfo,
-    pub editor_plugin_info: EditorPluginInfo,
-}
-
-impl lsp::request::Request for SetEditorInfo {
-    type Params = SetEditorInfoParams;
-    type Result = String;
-    const METHOD: &'static str = "setEditorInfo";
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct EditorInfo {
-    pub name: String,
-    pub version: String,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct EditorPluginInfo {
-    pub name: String,
-    pub version: String,
-}
-
-pub enum NotifyAccepted {}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct NotifyAcceptedParams {
-    pub uuid: String,
-}
-
-impl lsp::request::Request for NotifyAccepted {
-    type Params = NotifyAcceptedParams;
-    type Result = String;
-    const METHOD: &'static str = "notifyAccepted";
-}
-
-pub enum NotifyRejected {}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct NotifyRejectedParams {
-    pub uuids: Vec<String>,
-}
-
-impl lsp::request::Request for NotifyRejected {
-    type Params = NotifyRejectedParams;
-    type Result = String;
-    const METHOD: &'static str = "notifyRejected";
-}
diff --git a/crates/copilot/src/sign_in.rs b/crates/copilot/src/sign_in.rs
deleted file mode 100644
index 464a114d4e..0000000000
--- a/crates/copilot/src/sign_in.rs
+++ /dev/null
@@ -1,375 +0,0 @@
-use crate::{Copilot, Status, request::PromptUserDeviceFlow};
-use gpui::{
-    Animation, AnimationExt, App, ClipboardItem, Context, DismissEvent, Element, Entity,
-    EventEmitter, FocusHandle, Focusable, InteractiveElement, IntoElement, MouseDownEvent,
-    ParentElement, Render, Styled, Subscription, Transformation, Window, div, percentage, svg,
-};
-use std::time::Duration;
-use ui::{Button, Label, Vector, VectorName, prelude::*};
-use util::ResultExt as _;
-use workspace::notifications::NotificationId;
-use workspace::{ModalView, Toast, Workspace};
-
-const COPILOT_SIGN_UP_URL: &str = "https://github.com/features/copilot";
-
-struct CopilotStatusToast;
-
-pub fn initiate_sign_in(window: &mut Window, cx: &mut App) {
-    let Some(copilot) = Copilot::global(cx) else {
-        return;
-    };
-    let Some(workspace) = window.root::<Workspace>().flatten() else {
-        return;
-    };
-    workspace.update(cx, |workspace, cx| {
-        let is_reinstall = false;
-        initiate_sign_in_within_workspace(workspace, copilot, is_reinstall, window, cx)
-    });
-}
-
-pub fn reinstall_and_sign_in(window: &mut Window, cx: &mut App) {
-    let Some(copilot) = Copilot::global(cx) else {
-        return;
-    };
-    let Some(workspace) = window.root::<Workspace>().flatten() else {
-        return;
-    };
-    workspace.update(cx, |workspace, cx| {
-        reinstall_and_sign_in_within_workspace(workspace, copilot, window, cx);
-    });
-}
-
-pub fn reinstall_and_sign_in_within_workspace(
-    workspace: &mut Workspace,
-    copilot: Entity<Copilot>,
-    window: &mut Window,
-    cx: &mut Context<Workspace>,
-) {
-    let _ = copilot.update(cx, |copilot, cx| copilot.reinstall(cx));
-    let is_reinstall = true;
-    initiate_sign_in_within_workspace(workspace, copilot, is_reinstall, window, cx);
-}
-
-pub fn initiate_sign_in_within_workspace(
-    workspace: &mut Workspace,
-    copilot: Entity<Copilot>,
-    is_reinstall: bool,
-    window: &mut Window,
-    cx: &mut Context<Workspace>,
-) {
-    if matches!(copilot.read(cx).status(), Status::Disabled) {
-        copilot.update(cx, |copilot, cx| copilot.start_copilot(false, true, cx));
-    }
-    match copilot.read(cx).status() {
-        Status::Starting { task } => {
-            workspace.show_toast(
-                Toast::new(
-                    NotificationId::unique::<CopilotStatusToast>(),
-                    if is_reinstall {
-                        "Copilot is reinstalling..."
-                    } else {
-                        "Copilot is starting..."
-                    },
-                ),
-                cx,
-            );
-
-            cx.spawn_in(window, async move |workspace, cx| {
-                task.await;
-                if let Some(copilot) = cx.update(|_window, cx| Copilot::global(cx)).ok().flatten() {
-                    workspace
-                        .update_in(cx, |workspace, window, cx| {
-                            match copilot.read(cx).status() {
-                                Status::Authorized => workspace.show_toast(
-                                    Toast::new(
-                                        NotificationId::unique::<CopilotStatusToast>(),
-                                        "Copilot has started.",
-                                    ),
-                                    cx,
-                                ),
-                                _ => {
-                                    workspace.dismiss_toast(
-                                        &NotificationId::unique::<CopilotStatusToast>(),
-                                        cx,
-                                    );
-                                    copilot
-                                        .update(cx, |copilot, cx| copilot.sign_in(cx))
-                                        .detach_and_log_err(cx);
-                                    workspace.toggle_modal(window, cx, |_, cx| {
-                                        CopilotCodeVerification::new(&copilot, cx)
-                                    });
-                                }
-                            }
-                        })
-                        .log_err();
-                }
-            })
-            .detach();
-        }
-        _ => {
-            copilot
-                .update(cx, |copilot, cx| copilot.sign_in(cx))
-                .detach();
-            workspace.toggle_modal(window, cx, |_, cx| {
-                CopilotCodeVerification::new(&copilot, cx)
-            });
-        }
-    }
-}
-
-pub fn sign_out_within_workspace(
-    workspace: &mut Workspace,
-    copilot: Entity<Copilot>,
-    cx: &mut Context<Workspace>,
-) {
-    workspace.show_toast(
-        Toast::new(
-            NotificationId::unique::<CopilotStatusToast>(),
-            "Signing out of Copilot...",
-        ),
-        cx,
-    );
-    let sign_out_task = copilot.update(cx, |copilot, cx| copilot.sign_out(cx));
-    cx.spawn(async move |workspace, cx| match sign_out_task.await {
-        Ok(()) => {
-            workspace
-                .update(cx, |workspace, cx| {
-                    workspace.show_toast(
-                        Toast::new(
-                            NotificationId::unique::<CopilotStatusToast>(),
-                            "Signed out of Copilot.",
-                        ),
-                        cx,
-                    )
-                })
-                .ok();
-        }
-        Err(err) => {
-            workspace
-                .update(cx, |workspace, cx| {
-                    workspace.show_error(&err, cx);
-                })
-                .ok();
-        }
-    })
-    .detach();
-}
-
-pub struct CopilotCodeVerification {
-    status: Status,
-    connect_clicked: bool,
-    focus_handle: FocusHandle,
-    copilot: Entity<Copilot>,
-    _subscription: Subscription,
-}
-
-impl Focusable for CopilotCodeVerification {
-    fn focus_handle(&self, _: &App) -> gpui::FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl EventEmitter<DismissEvent> for CopilotCodeVerification {}
-impl ModalView for CopilotCodeVerification {
-    fn on_before_dismiss(
-        &mut self,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> workspace::DismissDecision {
-        self.copilot.update(cx, |copilot, cx| {
-            if matches!(copilot.status(), Status::SigningIn { .. }) {
-                copilot.sign_out(cx).detach_and_log_err(cx);
-            }
-        });
-        workspace::DismissDecision::Dismiss(true)
-    }
-}
-
-impl CopilotCodeVerification {
-    pub fn new(copilot: &Entity<Copilot>, cx: &mut Context<Self>) -> Self {
-        let status = copilot.read(cx).status();
-        Self {
-            status,
-            connect_clicked: false,
-            focus_handle: cx.focus_handle(),
-            copilot: copilot.clone(),
-            _subscription: cx.observe(copilot, |this, copilot, cx| {
-                let status = copilot.read(cx).status();
-                match status {
-                    Status::Authorized | Status::Unauthorized | Status::SigningIn { .. } => {
-                        this.set_status(status, cx)
-                    }
-                    _ => cx.emit(DismissEvent),
-                }
-            }),
-        }
-    }
-
-    pub fn set_status(&mut self, status: Status, cx: &mut Context<Self>) {
-        self.status = status;
-        cx.notify();
-    }
-
-    fn render_device_code(data: &PromptUserDeviceFlow, cx: &mut Context<Self>) -> impl IntoElement {
-        let copied = cx
-            .read_from_clipboard()
-            .map(|item| item.text().as_ref() == Some(&data.user_code))
-            .unwrap_or(false);
-        h_flex()
-            .w_full()
-            .p_1()
-            .border_1()
-            .border_muted(cx)
-            .rounded_sm()
-            .cursor_pointer()
-            .justify_between()
-            .on_mouse_down(gpui::MouseButton::Left, {
-                let user_code = data.user_code.clone();
-                move |_, window, cx| {
-                    cx.write_to_clipboard(ClipboardItem::new_string(user_code.clone()));
-                    window.refresh();
-                }
-            })
-            .child(div().flex_1().child(Label::new(data.user_code.clone())))
-            .child(div().flex_none().px_1().child(Label::new(if copied {
-                "Copied!"
-            } else {
-                "Copy"
-            })))
-    }
-
-    fn render_prompting_modal(
-        connect_clicked: bool,
-        data: &PromptUserDeviceFlow,
-
-        cx: &mut Context<Self>,
-    ) -> impl Element {
-        let connect_button_label = if connect_clicked {
-            "Waiting for connection..."
-        } else {
-            "Connect to GitHub"
-        };
-        v_flex()
-            .flex_1()
-            .gap_2()
-            .items_center()
-            .child(Headline::new("Use GitHub Copilot in Zed.").size(HeadlineSize::Large))
-            .child(
-                Label::new("Using Copilot requires an active subscription on GitHub.")
-                    .color(Color::Muted),
-            )
-            .child(Self::render_device_code(data, cx))
-            .child(
-                Label::new("Paste this code into GitHub after clicking the button below.")
-                    .size(ui::LabelSize::Small),
-            )
-            .child(
-                Button::new("connect-button", connect_button_label)
-                    .on_click({
-                        let verification_uri = data.verification_uri.clone();
-                        cx.listener(move |this, _, _window, cx| {
-                            cx.open_url(&verification_uri);
-                            this.connect_clicked = true;
-                        })
-                    })
-                    .full_width()
-                    .style(ButtonStyle::Filled),
-            )
-            .child(
-                Button::new("copilot-enable-cancel-button", "Cancel")
-                    .full_width()
-                    .on_click(cx.listener(|_, _, _, cx| {
-                        cx.emit(DismissEvent);
-                    })),
-            )
-    }
-
-    fn render_enabled_modal(cx: &mut Context<Self>) -> impl Element {
-        v_flex()
-            .gap_2()
-            .child(Headline::new("Copilot Enabled!").size(HeadlineSize::Large))
-            .child(Label::new(
-                "You can update your settings or sign out from the Copilot menu in the status bar.",
-            ))
-            .child(
-                Button::new("copilot-enabled-done-button", "Done")
-                    .full_width()
-                    .on_click(cx.listener(|_, _, _, cx| cx.emit(DismissEvent))),
-            )
-    }
-
-    fn render_unauthorized_modal(cx: &mut Context<Self>) -> impl Element {
-        v_flex()
-            .child(Headline::new("You must have an active GitHub Copilot subscription.").size(HeadlineSize::Large))
-
-            .child(Label::new(
-                "You can enable Copilot by connecting your existing license once you have subscribed or renewed your subscription.",
-            ).color(Color::Warning))
-            .child(
-                Button::new("copilot-subscribe-button", "Subscribe on GitHub")
-                    .full_width()
-                    .on_click(|_, _, cx| cx.open_url(COPILOT_SIGN_UP_URL)),
-            )
-            .child(
-                Button::new("copilot-subscribe-cancel-button", "Cancel")
-                    .full_width()
-                    .on_click(cx.listener(|_, _, _, cx| cx.emit(DismissEvent))),
-            )
-    }
-
-    fn render_loading(window: &mut Window, _: &mut Context<Self>) -> impl Element {
-        let loading_icon = svg()
-            .size_8()
-            .path(IconName::ArrowCircle.path())
-            .text_color(window.text_style().color)
-            .with_animation(
-                "icon_circle_arrow",
-                Animation::new(Duration::from_secs(2)).repeat(),
-                |svg, delta| svg.with_transformation(Transformation::rotate(percentage(delta))),
-            );
-
-        h_flex().justify_center().child(loading_icon)
-    }
-}
-
-impl Render for CopilotCodeVerification {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let prompt = match &self.status {
-            Status::SigningIn { prompt: None } => {
-                Self::render_loading(window, cx).into_any_element()
-            }
-            Status::SigningIn {
-                prompt: Some(prompt),
-            } => Self::render_prompting_modal(self.connect_clicked, prompt, cx).into_any_element(),
-            Status::Unauthorized => {
-                self.connect_clicked = false;
-                Self::render_unauthorized_modal(cx).into_any_element()
-            }
-            Status::Authorized => {
-                self.connect_clicked = false;
-                Self::render_enabled_modal(cx).into_any_element()
-            }
-            _ => div().into_any_element(),
-        };
-
-        v_flex()
-            .id("copilot code verification")
-            .track_focus(&self.focus_handle(cx))
-            .elevation_3(cx)
-            .w_96()
-            .items_center()
-            .p_4()
-            .gap_2()
-            .on_action(cx.listener(|_, _: &menu::Cancel, _, cx| {
-                cx.emit(DismissEvent);
-            }))
-            .on_any_mouse_down(cx.listener(|this, _: &MouseDownEvent, window, _| {
-                window.focus(&this.focus_handle);
-            }))
-            .child(
-                Vector::new(VectorName::ZedXCopilot, rems(8.), rems(4.))
-                    .color(Color::Custom(cx.theme().colors().icon)),
-            )
-            .child(prompt)
-    }
-}
diff --git a/crates/crashes/Cargo.toml b/crates/crashes/Cargo.toml
deleted file mode 100644
index bd1c112184..0000000000
--- a/crates/crashes/Cargo.toml
+++ /dev/null
@@ -1,33 +0,0 @@
-[package]
-name = "crashes"
-version = "0.1.0"
-publish.workspace = true
-edition.workspace = true
-license = "GPL-3.0-or-later"
-
-[dependencies]
-bincode.workspace = true
-cfg-if.workspace = true
-crash-handler.workspace = true
-extension_host.workspace = true
-log.workspace = true
-minidumper.workspace = true
-paths.workspace = true
-release_channel.workspace = true
-smol.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-system_specs.workspace = true
-zstd.workspace = true
-
-[target.'cfg(target_os = "macos")'.dependencies]
-mach2.workspace = true
-
-[target.'cfg(target_os = "windows")'.dependencies]
-windows.workspace = true
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/crashes.rs"
diff --git a/crates/crashes/LICENSE-GPL b/crates/crashes/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/crashes/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/crashes/src/crashes.rs b/crates/crashes/src/crashes.rs
deleted file mode 100644
index 4c601c3930..0000000000
--- a/crates/crashes/src/crashes.rs
+++ /dev/null
@@ -1,438 +0,0 @@
-use crash_handler::{CrashEventResult, CrashHandler};
-use log::info;
-use minidumper::{Client, LoopAction, MinidumpBinary};
-use release_channel::{RELEASE_CHANNEL, ReleaseChannel};
-use serde::{Deserialize, Serialize};
-
-#[cfg(not(target_os = "windows"))]
-use smol::process::Command;
-
-#[cfg(target_os = "macos")]
-use std::sync::atomic::AtomicU32;
-use std::{
-    env,
-    fs::{self, File},
-    io,
-    panic::{self, PanicHookInfo},
-    path::{Path, PathBuf},
-    process::{self},
-    sync::{
-        Arc, OnceLock,
-        atomic::{AtomicBool, Ordering},
-    },
-    thread,
-    time::Duration,
-};
-
-// set once the crash handler has initialized and the client has connected to it
-pub static CRASH_HANDLER: OnceLock<Arc<Client>> = OnceLock::new();
-// set when the first minidump request is made to avoid generating duplicate crash reports
-pub static REQUESTED_MINIDUMP: AtomicBool = AtomicBool::new(false);
-const CRASH_HANDLER_PING_TIMEOUT: Duration = Duration::from_secs(60);
-const CRASH_HANDLER_CONNECT_TIMEOUT: Duration = Duration::from_secs(10);
-
-#[cfg(target_os = "macos")]
-static PANIC_THREAD_ID: AtomicU32 = AtomicU32::new(0);
-
-pub async fn init(crash_init: InitCrashHandler) {
-    let gen_var = match env::var("ZED_GENERATE_MINIDUMPS") {
-        Ok(v) => {
-            if v == "false" || v == "0" {
-                Some(false)
-            } else {
-                Some(true)
-            }
-        }
-        Err(_) => None,
-    };
-
-    match (gen_var, *RELEASE_CHANNEL) {
-        (Some(false), _) | (None, ReleaseChannel::Dev) => {
-            let old_hook = panic::take_hook();
-            panic::set_hook(Box::new(move |info| {
-                unsafe { env::set_var("RUST_BACKTRACE", "1") };
-                old_hook(info);
-                // prevent the macOS crash dialog from popping up
-                if cfg!(target_os = "macos") {
-                    std::process::exit(1);
-                }
-            }));
-            return;
-        }
-        _ => {
-            panic::set_hook(Box::new(panic_hook));
-        }
-    }
-
-    let exe = env::current_exe().expect("unable to find ourselves");
-    let zed_pid = process::id();
-    // TODO: we should be able to get away with using 1 crash-handler process per machine,
-    // but for now we append the PID of the current process which makes it unique per remote
-    // server or interactive zed instance. This solves an issue where occasionally the socket
-    // used by the crash handler isn't destroyed correctly which causes it to stay on the file
-    // system and block further attempts to initialize crash handlers with that socket path.
-    let socket_name = paths::temp_dir().join(format!("zed-crash-handler-{zed_pid}"));
-    #[cfg(not(target_os = "windows"))]
-    let _crash_handler = Command::new(exe)
-        .arg("--crash-handler")
-        .arg(&socket_name)
-        .spawn()
-        .expect("unable to spawn server process");
-
-    #[cfg(target_os = "windows")]
-    spawn_crash_handler_windows(&exe, &socket_name);
-
-    #[cfg(target_os = "linux")]
-    let server_pid = _crash_handler.id();
-    info!("spawning crash handler process");
-
-    let mut elapsed = Duration::ZERO;
-    let retry_frequency = Duration::from_millis(100);
-    let mut maybe_client = None;
-    while maybe_client.is_none() {
-        if let Ok(client) = Client::with_name(socket_name.as_path()) {
-            maybe_client = Some(client);
-            info!("connected to crash handler process after {elapsed:?}");
-            break;
-        }
-        elapsed += retry_frequency;
-        smol::Timer::after(retry_frequency).await;
-    }
-    let client = maybe_client.unwrap();
-    client
-        .send_message(1, serde_json::to_vec(&crash_init).unwrap())
-        .unwrap();
-
-    let client = Arc::new(client);
-    let handler = CrashHandler::attach(unsafe {
-        let client = client.clone();
-        crash_handler::make_crash_event(move |crash_context: &crash_handler::CrashContext| {
-            // only request a minidump once
-            let res = if REQUESTED_MINIDUMP
-                .compare_exchange(false, true, Ordering::Acquire, Ordering::Relaxed)
-                .is_ok()
-            {
-                #[cfg(target_os = "macos")]
-                suspend_all_other_threads();
-
-                // on macos this "ping" is needed to ensure that all our
-                // `client.send_message` calls have been processed before we trigger the
-                // minidump request.
-                client.ping().ok();
-                client.request_dump(crash_context).is_ok()
-            } else {
-                true
-            };
-            CrashEventResult::Handled(res)
-        })
-    })
-    .expect("failed to attach signal handler");
-
-    #[cfg(target_os = "linux")]
-    {
-        handler.set_ptracer(Some(server_pid));
-    }
-    CRASH_HANDLER.set(client.clone()).ok();
-    std::mem::forget(handler);
-    info!("crash handler registered");
-
-    loop {
-        client.ping().ok();
-        smol::Timer::after(Duration::from_secs(10)).await;
-    }
-}
-
-#[cfg(target_os = "macos")]
-unsafe fn suspend_all_other_threads() {
-    let task = unsafe { mach2::traps::current_task() };
-    let mut threads: mach2::mach_types::thread_act_array_t = std::ptr::null_mut();
-    let mut count = 0;
-    unsafe {
-        mach2::task::task_threads(task, &raw mut threads, &raw mut count);
-    }
-    let current = unsafe { mach2::mach_init::mach_thread_self() };
-    let panic_thread = PANIC_THREAD_ID.load(Ordering::SeqCst);
-    for i in 0..count {
-        let t = unsafe { *threads.add(i as usize) };
-        if t != current && t != panic_thread {
-            unsafe { mach2::thread_act::thread_suspend(t) };
-        }
-    }
-}
-
-pub struct CrashServer {
-    initialization_params: OnceLock<InitCrashHandler>,
-    panic_info: OnceLock<CrashPanic>,
-    active_gpu: OnceLock<system_specs::GpuSpecs>,
-    has_connection: Arc<AtomicBool>,
-}
-
-#[derive(Debug, Deserialize, Serialize, Clone)]
-pub struct CrashInfo {
-    pub init: InitCrashHandler,
-    pub panic: Option<CrashPanic>,
-    pub minidump_error: Option<String>,
-    pub gpus: Vec<system_specs::GpuInfo>,
-    pub active_gpu: Option<system_specs::GpuSpecs>,
-}
-
-#[derive(Debug, Deserialize, Serialize, Clone)]
-pub struct InitCrashHandler {
-    pub session_id: String,
-    pub zed_version: String,
-    pub binary: String,
-    pub release_channel: String,
-    pub commit_sha: String,
-}
-
-#[derive(Deserialize, Serialize, Debug, Clone)]
-pub struct CrashPanic {
-    pub message: String,
-    pub span: String,
-}
-
-impl minidumper::ServerHandler for CrashServer {
-    fn create_minidump_file(&self) -> Result<(File, PathBuf), io::Error> {
-        let err_message = "Missing initialization data";
-        let dump_path = paths::logs_dir()
-            .join(
-                &self
-                    .initialization_params
-                    .get()
-                    .expect(err_message)
-                    .session_id,
-            )
-            .with_extension("dmp");
-        let file = File::create(&dump_path)?;
-        Ok((file, dump_path))
-    }
-
-    fn on_minidump_created(&self, result: Result<MinidumpBinary, minidumper::Error>) -> LoopAction {
-        let minidump_error = match result {
-            Ok(MinidumpBinary { mut file, path, .. }) => {
-                use io::Write;
-                file.flush().ok();
-                // TODO: clean this up once https://github.com/EmbarkStudios/crash-handling/issues/101 is addressed
-                drop(file);
-                let original_file = File::open(&path).unwrap();
-                let compressed_path = path.with_extension("zstd");
-                let compressed_file = File::create(&compressed_path).unwrap();
-                zstd::stream::copy_encode(original_file, compressed_file, 0).ok();
-                fs::rename(&compressed_path, path).unwrap();
-                None
-            }
-            Err(e) => Some(format!("{e:?}")),
-        };
-
-        #[cfg(not(any(target_os = "linux", target_os = "freebsd")))]
-        let gpus = vec![];
-
-        #[cfg(any(target_os = "linux", target_os = "freebsd"))]
-        let gpus = match system_specs::read_gpu_info_from_sys_class_drm() {
-            Ok(gpus) => gpus,
-            Err(err) => {
-                log::warn!("Failed to collect GPU information for crash report: {err}");
-                vec![]
-            }
-        };
-
-        let crash_info = CrashInfo {
-            init: self
-                .initialization_params
-                .get()
-                .expect("not initialized")
-                .clone(),
-            panic: self.panic_info.get().cloned(),
-            minidump_error,
-            active_gpu: self.active_gpu.get().cloned(),
-            gpus,
-        };
-
-        let crash_data_path = paths::logs_dir()
-            .join(&crash_info.init.session_id)
-            .with_extension("json");
-
-        fs::write(crash_data_path, serde_json::to_vec(&crash_info).unwrap()).ok();
-
-        LoopAction::Exit
-    }
-
-    fn on_message(&self, kind: u32, buffer: Vec<u8>) {
-        match kind {
-            1 => {
-                let init_data =
-                    serde_json::from_slice::<InitCrashHandler>(&buffer).expect("invalid init data");
-                self.initialization_params
-                    .set(init_data)
-                    .expect("already initialized");
-            }
-            2 => {
-                let panic_data =
-                    serde_json::from_slice::<CrashPanic>(&buffer).expect("invalid panic data");
-                self.panic_info.set(panic_data).expect("already panicked");
-            }
-            3 => {
-                let gpu_specs: system_specs::GpuSpecs =
-                    bincode::deserialize(&buffer).expect("gpu specs");
-                // we ignore the case where it was already set because this message is sent
-                // on each new window. in theory all zed windows should be using the same
-                // GPU so this is fine.
-                self.active_gpu.set(gpu_specs).ok();
-            }
-            _ => {
-                panic!("invalid message kind");
-            }
-        }
-    }
-
-    fn on_client_disconnected(&self, _clients: usize) -> LoopAction {
-        LoopAction::Exit
-    }
-
-    fn on_client_connected(&self, _clients: usize) -> LoopAction {
-        self.has_connection.store(true, Ordering::SeqCst);
-        LoopAction::Continue
-    }
-}
-
-pub fn panic_hook(info: &PanicHookInfo) {
-    // Don't handle a panic on threads that are not relevant to the main execution.
-    if extension_host::wasm_host::IS_WASM_THREAD.with(|v| v.load(Ordering::Acquire)) {
-        log::error!("wasm thread panicked!");
-        return;
-    }
-
-    let message = info.payload_as_str().unwrap_or("Box<Any>").to_owned();
-
-    let span = info
-        .location()
-        .map(|loc| format!("{}:{}", loc.file(), loc.line()))
-        .unwrap_or_default();
-
-    let current_thread = std::thread::current();
-    let thread_name = current_thread.name().unwrap_or("<unnamed>");
-
-    // wait 500ms for the crash handler process to start up
-    // if it's still not there just write panic info and no minidump
-    let retry_frequency = Duration::from_millis(100);
-    for _ in 0..5 {
-        if let Some(client) = CRASH_HANDLER.get() {
-            let location = info
-                .location()
-                .map_or_else(|| "<unknown>".to_owned(), |location| location.to_string());
-            log::error!("thread '{thread_name}' panicked at {location}:\n{message}...");
-            client
-                .send_message(
-                    2,
-                    serde_json::to_vec(&CrashPanic { message, span }).unwrap(),
-                )
-                .ok();
-            log::error!("triggering a crash to generate a minidump...");
-
-            #[cfg(target_os = "macos")]
-            PANIC_THREAD_ID.store(
-                unsafe { mach2::mach_init::mach_thread_self() },
-                Ordering::SeqCst,
-            );
-
-            cfg_if::cfg_if! {
-                if #[cfg(target_os = "windows")] {
-                    // https://learn.microsoft.com/en-us/windows/win32/debug/system-error-codes--0-499-
-                    CrashHandler.simulate_exception(Some(234)); // (MORE_DATA_AVAILABLE)
-                    break;
-                } else {
-                    std::process::abort();
-                }
-            }
-        }
-        thread::sleep(retry_frequency);
-    }
-}
-
-#[cfg(target_os = "windows")]
-fn spawn_crash_handler_windows(exe: &Path, socket_name: &Path) {
-    use std::ffi::OsStr;
-    use std::iter::once;
-    use std::os::windows::ffi::OsStrExt;
-    use windows::Win32::System::Threading::{
-        CreateProcessW, PROCESS_CREATION_FLAGS, PROCESS_INFORMATION, STARTF_FORCEOFFFEEDBACK,
-        STARTUPINFOW,
-    };
-    use windows::core::PWSTR;
-
-    let mut command_line: Vec<u16> = OsStr::new(&format!(
-        "\"{}\" --crash-handler \"{}\"",
-        exe.display(),
-        socket_name.display()
-    ))
-    .encode_wide()
-    .chain(once(0))
-    .collect();
-
-    let mut startup_info = STARTUPINFOW::default();
-    startup_info.cb = std::mem::size_of::<STARTUPINFOW>() as u32;
-
-    // By default, Windows enables a "busy" cursor when a GUI application is launched.
-    // This cursor is disabled once the application starts processing window messages.
-    // Since the crash handler process doesn't process messages, this "busy" cursor stays enabled for a long time.
-    // Disable the cursor feedback to prevent this from happening.
-    startup_info.dwFlags = STARTF_FORCEOFFFEEDBACK;
-
-    let mut process_info = PROCESS_INFORMATION::default();
-
-    unsafe {
-        CreateProcessW(
-            None,
-            Some(PWSTR(command_line.as_mut_ptr())),
-            None,
-            None,
-            false,
-            PROCESS_CREATION_FLAGS(0),
-            None,
-            None,
-            &startup_info,
-            &mut process_info,
-        )
-        .expect("unable to spawn server process");
-
-        windows::Win32::Foundation::CloseHandle(process_info.hProcess).ok();
-        windows::Win32::Foundation::CloseHandle(process_info.hThread).ok();
-    }
-}
-
-pub fn crash_server(socket: &Path) {
-    let Ok(mut server) = minidumper::Server::with_name(socket) else {
-        log::info!("Couldn't create socket, there may already be a running crash server");
-        return;
-    };
-
-    let shutdown = Arc::new(AtomicBool::new(false));
-    let has_connection = Arc::new(AtomicBool::new(false));
-
-    thread::Builder::new()
-        .name("CrashServerTimeout".to_owned())
-        .spawn({
-            let shutdown = shutdown.clone();
-            let has_connection = has_connection.clone();
-            move || {
-                std::thread::sleep(CRASH_HANDLER_CONNECT_TIMEOUT);
-                if !has_connection.load(Ordering::SeqCst) {
-                    shutdown.store(true, Ordering::SeqCst);
-                }
-            }
-        })
-        .unwrap();
-
-    server
-        .run(
-            Box::new(CrashServer {
-                initialization_params: OnceLock::new(),
-                panic_info: OnceLock::new(),
-                has_connection,
-                active_gpu: OnceLock::new(),
-            }),
-            &shutdown,
-            Some(CRASH_HANDLER_PING_TIMEOUT),
-        )
-        .expect("failed to run server");
-}
diff --git a/crates/credentials_provider/Cargo.toml b/crates/credentials_provider/Cargo.toml
deleted file mode 100644
index bf47bb24b1..0000000000
--- a/crates/credentials_provider/Cargo.toml
+++ /dev/null
@@ -1,21 +0,0 @@
-[package]
-name = "credentials_provider"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/credentials_provider.rs"
-
-[dependencies]
-anyhow.workspace = true
-futures.workspace = true
-gpui.workspace = true
-paths.workspace = true
-release_channel.workspace = true
-serde.workspace = true
-serde_json.workspace = true
diff --git a/crates/credentials_provider/LICENSE-GPL b/crates/credentials_provider/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/credentials_provider/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/credentials_provider/src/credentials_provider.rs b/crates/credentials_provider/src/credentials_provider.rs
deleted file mode 100644
index 2c8dd6fc81..0000000000
--- a/crates/credentials_provider/src/credentials_provider.rs
+++ /dev/null
@@ -1,199 +0,0 @@
-use std::collections::HashMap;
-use std::future::Future;
-use std::path::PathBuf;
-use std::pin::Pin;
-use std::sync::{Arc, LazyLock};
-
-use anyhow::Result;
-use futures::FutureExt as _;
-use gpui::{App, AsyncApp};
-use release_channel::ReleaseChannel;
-
-/// An environment variable whose presence indicates that the system keychain
-/// should be used in development.
-///
-/// By default, running Zed in development uses the development credentials
-/// provider. Setting this environment variable allows you to interact with the
-/// system keychain (for instance, if you need to test something).
-///
-/// Only works in development. Setting this environment variable in other
-/// release channels is a no-op.
-static ZED_DEVELOPMENT_USE_KEYCHAIN: LazyLock<bool> = LazyLock::new(|| {
-    std::env::var("ZED_DEVELOPMENT_USE_KEYCHAIN").is_ok_and(|value| !value.is_empty())
-});
-
-/// A provider for credentials.
-///
-/// Used to abstract over reading and writing credentials to some form of
-/// persistence (like the system keychain).
-pub trait CredentialsProvider: Send + Sync {
-    /// Reads the credentials from the provider.
-    fn read_credentials<'a>(
-        &'a self,
-        url: &'a str,
-        cx: &'a AsyncApp,
-    ) -> Pin<Box<dyn Future<Output = Result<Option<(String, Vec<u8>)>>> + 'a>>;
-
-    /// Writes the credentials to the provider.
-    fn write_credentials<'a>(
-        &'a self,
-        url: &'a str,
-        username: &'a str,
-        password: &'a [u8],
-        cx: &'a AsyncApp,
-    ) -> Pin<Box<dyn Future<Output = Result<()>> + 'a>>;
-
-    /// Deletes the credentials from the provider.
-    fn delete_credentials<'a>(
-        &'a self,
-        url: &'a str,
-        cx: &'a AsyncApp,
-    ) -> Pin<Box<dyn Future<Output = Result<()>> + 'a>>;
-}
-
-impl dyn CredentialsProvider {
-    /// Returns the global [`CredentialsProvider`].
-    pub fn global(cx: &App) -> Arc<Self> {
-        // The `CredentialsProvider` trait has `Send + Sync` bounds on it, so it
-        // seems like this is a false positive from Clippy.
-        #[allow(clippy::arc_with_non_send_sync)]
-        Self::new(cx)
-    }
-
-    fn new(cx: &App) -> Arc<Self> {
-        let use_development_provider = match ReleaseChannel::try_global(cx) {
-            Some(ReleaseChannel::Dev) => {
-                // In development we default to using the development
-                // credentials provider to avoid getting spammed by relentless
-                // keychain access prompts.
-                //
-                // However, if the `ZED_DEVELOPMENT_USE_KEYCHAIN` environment
-                // variable is set, we will use the actual keychain.
-                !*ZED_DEVELOPMENT_USE_KEYCHAIN
-            }
-            Some(ReleaseChannel::Nightly | ReleaseChannel::Preview | ReleaseChannel::Stable)
-            | None => false,
-        };
-
-        if use_development_provider {
-            Arc::new(DevelopmentCredentialsProvider::new())
-        } else {
-            Arc::new(KeychainCredentialsProvider)
-        }
-    }
-}
-
-/// A credentials provider that stores credentials in the system keychain.
-struct KeychainCredentialsProvider;
-
-impl CredentialsProvider for KeychainCredentialsProvider {
-    fn read_credentials<'a>(
-        &'a self,
-        url: &'a str,
-        cx: &'a AsyncApp,
-    ) -> Pin<Box<dyn Future<Output = Result<Option<(String, Vec<u8>)>>> + 'a>> {
-        async move { cx.update(|cx| cx.read_credentials(url))?.await }.boxed_local()
-    }
-
-    fn write_credentials<'a>(
-        &'a self,
-        url: &'a str,
-        username: &'a str,
-        password: &'a [u8],
-        cx: &'a AsyncApp,
-    ) -> Pin<Box<dyn Future<Output = Result<()>> + 'a>> {
-        async move {
-            cx.update(move |cx| cx.write_credentials(url, username, password))?
-                .await
-        }
-        .boxed_local()
-    }
-
-    fn delete_credentials<'a>(
-        &'a self,
-        url: &'a str,
-        cx: &'a AsyncApp,
-    ) -> Pin<Box<dyn Future<Output = Result<()>> + 'a>> {
-        async move { cx.update(move |cx| cx.delete_credentials(url))?.await }.boxed_local()
-    }
-}
-
-/// A credentials provider that stores credentials in a local file.
-///
-/// This MUST only be used in development, as this is not a secure way of storing
-/// credentials on user machines.
-///
-/// Its existence is purely to work around the annoyance of having to constantly
-/// re-allow access to the system keychain when developing Zed.
-struct DevelopmentCredentialsProvider {
-    path: PathBuf,
-}
-
-impl DevelopmentCredentialsProvider {
-    fn new() -> Self {
-        let path = paths::config_dir().join("development_credentials");
-
-        Self { path }
-    }
-
-    fn load_credentials(&self) -> Result<HashMap<String, (String, Vec<u8>)>> {
-        let json = std::fs::read(&self.path)?;
-        let credentials: HashMap<String, (String, Vec<u8>)> = serde_json::from_slice(&json)?;
-
-        Ok(credentials)
-    }
-
-    fn save_credentials(&self, credentials: &HashMap<String, (String, Vec<u8>)>) -> Result<()> {
-        let json = serde_json::to_string(credentials)?;
-        std::fs::write(&self.path, json)?;
-
-        Ok(())
-    }
-}
-
-impl CredentialsProvider for DevelopmentCredentialsProvider {
-    fn read_credentials<'a>(
-        &'a self,
-        url: &'a str,
-        _cx: &'a AsyncApp,
-    ) -> Pin<Box<dyn Future<Output = Result<Option<(String, Vec<u8>)>>> + 'a>> {
-        async move {
-            Ok(self
-                .load_credentials()
-                .unwrap_or_default()
-                .get(url)
-                .cloned())
-        }
-        .boxed_local()
-    }
-
-    fn write_credentials<'a>(
-        &'a self,
-        url: &'a str,
-        username: &'a str,
-        password: &'a [u8],
-        _cx: &'a AsyncApp,
-    ) -> Pin<Box<dyn Future<Output = Result<()>> + 'a>> {
-        async move {
-            let mut credentials = self.load_credentials().unwrap_or_default();
-            credentials.insert(url.to_string(), (username.to_string(), password.to_vec()));
-
-            self.save_credentials(&credentials)
-        }
-        .boxed_local()
-    }
-
-    fn delete_credentials<'a>(
-        &'a self,
-        url: &'a str,
-        _cx: &'a AsyncApp,
-    ) -> Pin<Box<dyn Future<Output = Result<()>> + 'a>> {
-        async move {
-            let mut credentials = self.load_credentials()?;
-            credentials.remove(url);
-
-            self.save_credentials(&credentials)
-        }
-        .boxed_local()
-    }
-}
diff --git a/crates/dap/Cargo.toml b/crates/dap/Cargo.toml
deleted file mode 100644
index d856ae0164..0000000000
--- a/crates/dap/Cargo.toml
+++ /dev/null
@@ -1,64 +0,0 @@
-[package]
-name = "dap"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/dap.rs"
-doctest = false
-
-[features]
-test-support = [
-    "gpui/test-support",
-    "util/test-support",
-    "task/test-support",
-    "async-pipe",
-    "settings/test-support",
-]
-
-[dependencies]
-anyhow.workspace = true
-async-compression.workspace = true
-async-pipe = { workspace = true, optional = true }
-async-tar.workspace = true
-async-trait.workspace = true
-client.workspace = true
-collections.workspace = true
-dap-types.workspace = true
-fs.workspace = true
-futures.workspace = true
-gpui.workspace = true
-http_client.workspace = true
-language.workspace = true
-log.workspace = true
-node_runtime.workspace = true
-parking_lot.workspace = true
-paths.workspace = true
-proto.workspace = true
-schemars.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-smallvec.workspace = true
-smol.workspace = true
-task.workspace = true
-telemetry.workspace = true
-util.workspace = true
-
-[target.'cfg(not(windows))'.dependencies]
-libc.workspace = true
-
-[dev-dependencies]
-async-pipe.workspace = true
-gpui = { workspace = true, features = ["test-support"] }
-settings = { workspace = true, features = ["test-support"] }
-task = { workspace = true, features = ["test-support"] }
-tree-sitter.workspace = true
-tree-sitter-go.workspace = true
-util = { workspace = true, features = ["test-support"] }
-zlog.workspace = true
diff --git a/crates/dap/LICENSE-GPL b/crates/dap/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/dap/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/dap/docs/breakpoints.md b/crates/dap/docs/breakpoints.md
deleted file mode 100644
index 8b819b089b..0000000000
--- a/crates/dap/docs/breakpoints.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Overview
-
-The active `Project` is responsible for maintain opened and closed breakpoints
-as well as serializing breakpoints to save. At a high level project serializes
-the positions of breakpoints that don't belong to any active buffers and handles
-converting breakpoints from serializing to active whenever a buffer is opened/closed.
-
-`Project` also handles sending all relevant breakpoint information to debug adapter's
-during debugging or when starting a debugger.
diff --git a/crates/dap/src/adapters.rs b/crates/dap/src/adapters.rs
deleted file mode 100644
index 96a35bc8ab..0000000000
--- a/crates/dap/src/adapters.rs
+++ /dev/null
@@ -1,483 +0,0 @@
-use anyhow::{Context as _, Result, anyhow};
-use async_compression::futures::bufread::GzipDecoder;
-use async_tar::Archive;
-use async_trait::async_trait;
-use collections::HashMap;
-pub use dap_types::{StartDebuggingRequestArguments, StartDebuggingRequestArgumentsRequest};
-use fs::Fs;
-use futures::io::BufReader;
-use gpui::{AsyncApp, SharedString};
-pub use http_client::{HttpClient, github::latest_github_release};
-use language::{LanguageName, LanguageToolchainStore};
-use node_runtime::NodeRuntime;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use settings::WorktreeId;
-use smol::fs::File;
-use std::{
-    borrow::Borrow,
-    ffi::OsStr,
-    fmt::Debug,
-    net::Ipv4Addr,
-    ops::Deref,
-    path::{Path, PathBuf},
-    sync::Arc,
-};
-use task::{DebugScenario, TcpArgumentsTemplate, ZedDebugConfig};
-use util::{archive::extract_zip, rel_path::RelPath};
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum DapStatus {
-    None,
-    CheckingForUpdate,
-    Downloading,
-    Failed { error: String },
-}
-
-#[async_trait]
-pub trait DapDelegate: Send + Sync + 'static {
-    fn worktree_id(&self) -> WorktreeId;
-    fn worktree_root_path(&self) -> &Path;
-    fn http_client(&self) -> Arc<dyn HttpClient>;
-    fn node_runtime(&self) -> NodeRuntime;
-    fn toolchain_store(&self) -> Arc<dyn LanguageToolchainStore>;
-    fn fs(&self) -> Arc<dyn Fs>;
-    fn output_to_console(&self, msg: String);
-    async fn which(&self, command: &OsStr) -> Option<PathBuf>;
-    async fn read_text_file(&self, path: &RelPath) -> Result<String>;
-    async fn shell_env(&self) -> collections::HashMap<String, String>;
-    fn is_headless(&self) -> bool;
-}
-
-#[derive(
-    Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Deserialize, Serialize, JsonSchema,
-)]
-#[serde(transparent)]
-pub struct DebugAdapterName(pub SharedString);
-
-impl Deref for DebugAdapterName {
-    type Target = str;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl AsRef<str> for DebugAdapterName {
-    fn as_ref(&self) -> &str {
-        &self.0
-    }
-}
-
-impl Borrow<str> for DebugAdapterName {
-    fn borrow(&self) -> &str {
-        &self.0
-    }
-}
-
-impl Borrow<SharedString> for DebugAdapterName {
-    fn borrow(&self) -> &SharedString {
-        &self.0
-    }
-}
-
-impl std::fmt::Display for DebugAdapterName {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.0, f)
-    }
-}
-
-impl From<DebugAdapterName> for SharedString {
-    fn from(name: DebugAdapterName) -> Self {
-        name.0
-    }
-}
-impl From<SharedString> for DebugAdapterName {
-    fn from(name: SharedString) -> Self {
-        DebugAdapterName(name)
-    }
-}
-
-impl<'a> From<&'a str> for DebugAdapterName {
-    fn from(str: &'a str) -> DebugAdapterName {
-        DebugAdapterName(str.to_string().into())
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Serialize)]
-pub struct TcpArguments {
-    pub host: Ipv4Addr,
-    pub port: u16,
-    pub timeout: Option<u64>,
-}
-
-impl TcpArguments {
-    pub fn from_proto(proto: proto::TcpHost) -> anyhow::Result<Self> {
-        let host = TcpArgumentsTemplate::from_proto(proto)?;
-        Ok(TcpArguments {
-            host: host.host.context("missing host")?,
-            port: host.port.context("missing port")?,
-            timeout: host.timeout,
-        })
-    }
-
-    pub fn to_proto(&self) -> proto::TcpHost {
-        TcpArgumentsTemplate {
-            host: Some(self.host),
-            port: Some(self.port),
-            timeout: self.timeout,
-        }
-        .to_proto()
-    }
-}
-
-/// Represents a debuggable binary/process (what process is going to be debugged and with what arguments).
-///
-/// We start off with a [DebugScenario], a user-facing type that additionally defines how a debug target is built; once
-/// an optional build step is completed, we turn it's result into a DebugTaskDefinition by running a locator (or using a user-provided task) and resolving task variables.
-/// Finally, a [DebugTaskDefinition] has to be turned into a concrete debugger invocation ([DebugAdapterBinary]).
-#[derive(Clone, Debug, PartialEq)]
-#[cfg_attr(
-    any(feature = "test-support", test),
-    derive(serde::Deserialize, serde::Serialize)
-)]
-pub struct DebugTaskDefinition {
-    /// The name of this debug task
-    pub label: SharedString,
-    /// The debug adapter to use
-    pub adapter: DebugAdapterName,
-    /// The configuration to send to the debug adapter
-    pub config: serde_json::Value,
-    /// Optional TCP connection information
-    ///
-    /// If provided, this will be used to connect to the debug adapter instead of
-    /// spawning a new debug adapter process. This is useful for connecting to a debug adapter
-    /// that is already running or is started by another process.
-    pub tcp_connection: Option<TcpArgumentsTemplate>,
-}
-
-impl DebugTaskDefinition {
-    pub fn to_scenario(&self) -> DebugScenario {
-        DebugScenario {
-            label: self.label.clone(),
-            adapter: self.adapter.clone().into(),
-            build: None,
-            tcp_connection: self.tcp_connection.clone(),
-            config: self.config.clone(),
-        }
-    }
-
-    pub fn to_proto(&self) -> proto::DebugTaskDefinition {
-        proto::DebugTaskDefinition {
-            label: self.label.clone().into(),
-            config: self.config.to_string(),
-            tcp_connection: self.tcp_connection.clone().map(|v| v.to_proto()),
-            adapter: self.adapter.clone().0.into(),
-        }
-    }
-
-    pub fn from_proto(proto: proto::DebugTaskDefinition) -> Result<Self> {
-        Ok(Self {
-            label: proto.label.into(),
-            config: serde_json::from_str(&proto.config)?,
-            tcp_connection: proto
-                .tcp_connection
-                .map(TcpArgumentsTemplate::from_proto)
-                .transpose()?,
-            adapter: DebugAdapterName(proto.adapter.into()),
-        })
-    }
-}
-
-/// Created from a [DebugTaskDefinition], this struct describes how to spawn the debugger to create a previously-configured debug session.
-#[derive(Debug, Clone, PartialEq, Serialize)]
-pub struct DebugAdapterBinary {
-    pub command: Option<String>,
-    pub arguments: Vec<String>,
-    pub envs: HashMap<String, String>,
-    pub cwd: Option<PathBuf>,
-    pub connection: Option<TcpArguments>,
-    pub request_args: StartDebuggingRequestArguments,
-}
-
-impl DebugAdapterBinary {
-    pub fn from_proto(binary: proto::DebugAdapterBinary) -> anyhow::Result<Self> {
-        let request = match binary.launch_type() {
-            proto::debug_adapter_binary::LaunchType::Launch => {
-                StartDebuggingRequestArgumentsRequest::Launch
-            }
-            proto::debug_adapter_binary::LaunchType::Attach => {
-                StartDebuggingRequestArgumentsRequest::Attach
-            }
-        };
-
-        Ok(DebugAdapterBinary {
-            command: binary.command,
-            arguments: binary.arguments,
-            envs: binary.envs.into_iter().collect(),
-            connection: binary
-                .connection
-                .map(TcpArguments::from_proto)
-                .transpose()?,
-            request_args: StartDebuggingRequestArguments {
-                configuration: serde_json::from_str(&binary.configuration)?,
-                request,
-            },
-            cwd: binary.cwd.map(|cwd| cwd.into()),
-        })
-    }
-
-    pub fn to_proto(&self) -> proto::DebugAdapterBinary {
-        proto::DebugAdapterBinary {
-            command: self.command.clone(),
-            arguments: self.arguments.clone(),
-            envs: self
-                .envs
-                .iter()
-                .map(|(k, v)| (k.clone(), v.clone()))
-                .collect(),
-            cwd: self
-                .cwd
-                .as_ref()
-                .map(|cwd| cwd.to_string_lossy().into_owned()),
-            connection: self.connection.as_ref().map(|c| c.to_proto()),
-            launch_type: match self.request_args.request {
-                StartDebuggingRequestArgumentsRequest::Launch => {
-                    proto::debug_adapter_binary::LaunchType::Launch.into()
-                }
-                StartDebuggingRequestArgumentsRequest::Attach => {
-                    proto::debug_adapter_binary::LaunchType::Attach.into()
-                }
-            },
-            configuration: self.request_args.configuration.to_string(),
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct AdapterVersion {
-    pub tag_name: String,
-    pub url: String,
-}
-
-pub enum DownloadedFileType {
-    Vsix,
-    GzipTar,
-    Zip,
-}
-
-pub struct GithubRepo {
-    pub repo_name: String,
-    pub repo_owner: String,
-}
-
-pub async fn download_adapter_from_github(
-    adapter_name: DebugAdapterName,
-    github_version: AdapterVersion,
-    file_type: DownloadedFileType,
-    delegate: &dyn DapDelegate,
-) -> Result<PathBuf> {
-    let adapter_path = paths::debug_adapters_dir().join(&adapter_name.as_ref());
-    let version_path = adapter_path.join(format!("{}_{}", adapter_name, github_version.tag_name));
-    let fs = delegate.fs();
-
-    if version_path.exists() {
-        return Ok(version_path);
-    }
-
-    if !adapter_path.exists() {
-        fs.create_dir(adapter_path.as_path())
-            .await
-            .context("Failed creating adapter path")?;
-    }
-
-    log::debug!(
-        "Downloading adapter {} from {}",
-        adapter_name,
-        &github_version.url,
-    );
-    delegate.output_to_console(format!("Downloading from {}...", github_version.url));
-
-    let mut response = delegate
-        .http_client()
-        .get(&github_version.url, Default::default(), true)
-        .await
-        .context("Error downloading release")?;
-    anyhow::ensure!(
-        response.status().is_success(),
-        "download failed with status {}",
-        response.status()
-    );
-
-    delegate.output_to_console("Download complete".to_owned());
-    match file_type {
-        DownloadedFileType::GzipTar => {
-            let decompressed_bytes = GzipDecoder::new(BufReader::new(response.body_mut()));
-            let archive = Archive::new(decompressed_bytes);
-            archive.unpack(&version_path).await?;
-        }
-        DownloadedFileType::Zip | DownloadedFileType::Vsix => {
-            let zip_path = version_path.with_extension("zip");
-            let mut file = File::create(&zip_path).await?;
-            futures::io::copy(response.body_mut(), &mut file).await?;
-            let file = File::open(&zip_path).await?;
-            extract_zip(&version_path, file)
-                .await
-                // we cannot check the status as some adapter include files with names that trigger `Illegal byte sequence`
-                .inspect_err(|e| log::warn!("ZIP extraction error: {}. Ignoring...", e))
-                .ok();
-
-            util::fs::remove_matching(&adapter_path, |entry| {
-                entry
-                    .file_name()
-                    .is_some_and(|file| file.to_string_lossy().ends_with(".zip"))
-            })
-            .await;
-        }
-    }
-
-    // remove older versions
-    util::fs::remove_matching(&adapter_path, |entry| {
-        entry.to_string_lossy() != version_path.to_string_lossy()
-    })
-    .await;
-
-    Ok(version_path)
-}
-
-#[async_trait(?Send)]
-pub trait DebugAdapter: 'static + Send + Sync {
-    fn name(&self) -> DebugAdapterName;
-
-    async fn config_from_zed_format(&self, zed_scenario: ZedDebugConfig) -> Result<DebugScenario>;
-
-    async fn get_binary(
-        &self,
-        delegate: &Arc<dyn DapDelegate>,
-        config: &DebugTaskDefinition,
-        user_installed_path: Option<PathBuf>,
-        user_args: Option<Vec<String>>,
-        user_env: Option<HashMap<String, String>>,
-        cx: &mut AsyncApp,
-    ) -> Result<DebugAdapterBinary>;
-
-    /// Returns the language name of an adapter if it only supports one language
-    fn adapter_language_name(&self) -> Option<LanguageName> {
-        None
-    }
-
-    /// Extracts the kind (attach/launch) of debug configuration from the given JSON config.
-    /// This method should only return error when the kind cannot be determined for a given configuration;
-    /// in particular, it *should not* validate whether the request as a whole is valid, because that's best left to the debug adapter itself to decide.
-    async fn request_kind(
-        &self,
-        config: &serde_json::Value,
-    ) -> Result<StartDebuggingRequestArgumentsRequest> {
-        match config.get("request") {
-            Some(val) if val == "launch" => Ok(StartDebuggingRequestArgumentsRequest::Launch),
-            Some(val) if val == "attach" => Ok(StartDebuggingRequestArgumentsRequest::Attach),
-            _ => Err(anyhow!(
-                "missing or invalid `request` field in config. Expected 'launch' or 'attach'"
-            )),
-        }
-    }
-
-    fn dap_schema(&self) -> serde_json::Value;
-
-    fn label_for_child_session(&self, _args: &StartDebuggingRequestArguments) -> Option<String> {
-        None
-    }
-
-    fn compact_child_session(&self) -> bool {
-        false
-    }
-
-    fn prefer_thread_name(&self) -> bool {
-        false
-    }
-}
-
-#[cfg(any(test, feature = "test-support"))]
-pub struct FakeAdapter {}
-
-#[cfg(any(test, feature = "test-support"))]
-impl FakeAdapter {
-    pub const ADAPTER_NAME: &'static str = "fake-adapter";
-
-    pub fn new() -> Self {
-        Self {}
-    }
-}
-
-#[cfg(any(test, feature = "test-support"))]
-#[async_trait(?Send)]
-impl DebugAdapter for FakeAdapter {
-    fn name(&self) -> DebugAdapterName {
-        DebugAdapterName(Self::ADAPTER_NAME.into())
-    }
-
-    fn dap_schema(&self) -> serde_json::Value {
-        serde_json::Value::Null
-    }
-
-    async fn request_kind(
-        &self,
-        config: &serde_json::Value,
-    ) -> Result<StartDebuggingRequestArgumentsRequest> {
-        let request = config.as_object().unwrap()["request"].as_str().unwrap();
-
-        let request = match request {
-            "launch" => dap_types::StartDebuggingRequestArgumentsRequest::Launch,
-            "attach" => dap_types::StartDebuggingRequestArgumentsRequest::Attach,
-            _ => unreachable!("Wrong fake adapter input for request field"),
-        };
-
-        Ok(request)
-    }
-
-    fn adapter_language_name(&self) -> Option<LanguageName> {
-        None
-    }
-
-    async fn config_from_zed_format(&self, zed_scenario: ZedDebugConfig) -> Result<DebugScenario> {
-        let config = serde_json::to_value(zed_scenario.request).unwrap();
-
-        Ok(DebugScenario {
-            adapter: zed_scenario.adapter,
-            label: zed_scenario.label,
-            build: None,
-            config,
-            tcp_connection: None,
-        })
-    }
-
-    async fn get_binary(
-        &self,
-        _: &Arc<dyn DapDelegate>,
-        task_definition: &DebugTaskDefinition,
-        _: Option<PathBuf>,
-        _: Option<Vec<String>>,
-        _: Option<HashMap<String, String>>,
-        _: &mut AsyncApp,
-    ) -> Result<DebugAdapterBinary> {
-        let connection = task_definition
-            .tcp_connection
-            .as_ref()
-            .map(|connection| TcpArguments {
-                host: connection.host(),
-                port: connection.port.unwrap_or(17),
-                timeout: connection.timeout,
-            });
-        Ok(DebugAdapterBinary {
-            command: Some("command".into()),
-            arguments: vec![],
-            connection,
-            envs: HashMap::default(),
-            cwd: None,
-            request_args: StartDebuggingRequestArguments {
-                request: self.request_kind(&task_definition.config).await?,
-                configuration: task_definition.config.clone(),
-            },
-        })
-    }
-}
diff --git a/crates/dap/src/client.rs b/crates/dap/src/client.rs
deleted file mode 100644
index 0e3db35107..0000000000
--- a/crates/dap/src/client.rs
+++ /dev/null
@@ -1,462 +0,0 @@
-use crate::{
-    adapters::DebugAdapterBinary,
-    transport::{IoKind, LogKind, TransportDelegate},
-};
-use anyhow::Result;
-use dap_types::{
-    messages::{Message, Response},
-    requests::Request,
-};
-use futures::channel::oneshot;
-use gpui::AsyncApp;
-use std::{
-    hash::Hash,
-    sync::atomic::{AtomicU64, Ordering},
-};
-
-#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-#[repr(transparent)]
-pub struct SessionId(pub u32);
-
-impl SessionId {
-    pub fn from_proto(client_id: u64) -> Self {
-        Self(client_id as u32)
-    }
-
-    pub fn to_proto(self) -> u64 {
-        self.0 as u64
-    }
-}
-
-/// Represents a connection to the debug adapter process, either via stdout/stdin or a socket.
-pub struct DebugAdapterClient {
-    id: SessionId,
-    sequence_count: AtomicU64,
-    binary: DebugAdapterBinary,
-    transport_delegate: TransportDelegate,
-}
-
-pub type DapMessageHandler = Box<dyn FnMut(Message) + 'static + Send + Sync>;
-
-impl DebugAdapterClient {
-    pub async fn start(
-        id: SessionId,
-        binary: DebugAdapterBinary,
-        message_handler: DapMessageHandler,
-        cx: &mut AsyncApp,
-    ) -> Result<Self> {
-        let transport_delegate = TransportDelegate::start(&binary, cx).await?;
-        let this = Self {
-            id,
-            binary,
-            transport_delegate,
-            sequence_count: AtomicU64::new(1),
-        };
-        this.connect(message_handler, cx).await?;
-
-        Ok(this)
-    }
-
-    pub fn should_reconnect_for_ssh(&self) -> bool {
-        self.transport_delegate.tcp_arguments().is_some()
-            && self.binary.command.as_deref() == Some("ssh")
-    }
-
-    pub async fn connect(
-        &self,
-        message_handler: DapMessageHandler,
-        cx: &mut AsyncApp,
-    ) -> Result<()> {
-        self.transport_delegate.connect(message_handler, cx).await
-    }
-
-    pub async fn create_child_connection(
-        &self,
-        session_id: SessionId,
-        binary: DebugAdapterBinary,
-        message_handler: DapMessageHandler,
-        cx: &mut AsyncApp,
-    ) -> Result<Self> {
-        let binary = if let Some(connection) = self.transport_delegate.tcp_arguments() {
-            DebugAdapterBinary {
-                command: None,
-                arguments: Default::default(),
-                envs: Default::default(),
-                cwd: Default::default(),
-                connection: Some(connection),
-                request_args: binary.request_args,
-            }
-        } else {
-            self.binary.clone()
-        };
-
-        Self::start(session_id, binary, message_handler, cx).await
-    }
-
-    /// Send a request to an adapter and get a response back
-    /// Note: This function will block until a response is sent back from the adapter
-    pub async fn request<R: Request>(&self, arguments: R::Arguments) -> Result<R::Response> {
-        let serialized_arguments = serde_json::to_value(arguments)?;
-
-        let (callback_tx, callback_rx) = oneshot::channel::<Result<Response>>();
-
-        let sequence_id = self.next_sequence_id();
-
-        let request = crate::messages::Request {
-            seq: sequence_id,
-            command: R::COMMAND.to_string(),
-            arguments: Some(serialized_arguments),
-        };
-        self.transport_delegate
-            .pending_requests
-            .lock()
-            .insert(sequence_id, callback_tx)?;
-
-        log::debug!(
-            "Client {} send `{}` request with sequence_id: {}",
-            self.id.0,
-            R::COMMAND,
-            sequence_id
-        );
-        log::debug!("  request: {request:?}");
-
-        self.send_message(Message::Request(request)).await?;
-
-        let command = R::COMMAND.to_string();
-
-        let response = callback_rx.await??;
-        log::debug!(
-            "Client {} received response for: `{}` sequence_id: {}",
-            self.id.0,
-            command,
-            sequence_id
-        );
-        log::debug!("  response: {response:?}");
-
-        match response.success {
-            true => {
-                if let Some(json) = response.body {
-                    Ok(serde_json::from_value(json)?)
-                // Note: dap types configure themselves to return `None` when an empty object is received,
-                // which then fails here...
-                } else if let Ok(result) =
-                    serde_json::from_value(serde_json::Value::Object(Default::default()))
-                {
-                    Ok(result)
-                } else {
-                    Ok(serde_json::from_value(Default::default())?)
-                }
-            }
-            false => anyhow::bail!("Request failed: {}", response.message.unwrap_or_default()),
-        }
-    }
-
-    pub async fn send_message(&self, message: Message) -> Result<()> {
-        self.transport_delegate.send_message(message).await
-    }
-
-    pub fn id(&self) -> SessionId {
-        self.id
-    }
-
-    pub fn binary(&self) -> &DebugAdapterBinary {
-        &self.binary
-    }
-
-    /// Get the next sequence id to be used in a request
-    pub fn next_sequence_id(&self) -> u64 {
-        self.sequence_count.fetch_add(1, Ordering::Relaxed)
-    }
-
-    pub fn kill(&self) {
-        log::debug!("Killing DAP process");
-        self.transport_delegate.transport.lock().kill();
-        self.transport_delegate.pending_requests.lock().shutdown();
-    }
-
-    pub fn has_adapter_logs(&self) -> bool {
-        self.transport_delegate.has_adapter_logs()
-    }
-
-    pub fn add_log_handler<F>(&self, f: F, kind: LogKind)
-    where
-        F: 'static + Send + FnMut(IoKind, Option<&str>, &str),
-    {
-        self.transport_delegate.add_log_handler(f, kind);
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn on_request<R: dap_types::requests::Request, F>(&self, mut handler: F)
-    where
-        F: 'static
-            + Send
-            + FnMut(u64, R::Arguments) -> Result<R::Response, dap_types::ErrorResponse>,
-    {
-        use crate::transport::RequestHandling;
-
-        self.transport_delegate
-            .transport
-            .lock()
-            .as_fake()
-            .on_request::<R, _>(move |seq, request| {
-                RequestHandling::Respond(handler(seq, request))
-            });
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn on_request_ext<R: dap_types::requests::Request, F>(&self, handler: F)
-    where
-        F: 'static
-            + Send
-            + FnMut(
-                u64,
-                R::Arguments,
-            ) -> crate::transport::RequestHandling<
-                Result<R::Response, dap_types::ErrorResponse>,
-            >,
-    {
-        self.transport_delegate
-            .transport
-            .lock()
-            .as_fake()
-            .on_request::<R, F>(handler);
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub async fn fake_reverse_request<R: dap_types::requests::Request>(&self, args: R::Arguments) {
-        self.send_message(Message::Request(dap_types::messages::Request {
-            seq: self.sequence_count.load(Ordering::Relaxed),
-            command: R::COMMAND.into(),
-            arguments: serde_json::to_value(args).ok(),
-        }))
-        .await
-        .unwrap();
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub async fn on_response<R: dap_types::requests::Request, F>(&self, handler: F)
-    where
-        F: 'static + Send + Fn(Response),
-    {
-        self.transport_delegate
-            .transport
-            .lock()
-            .as_fake()
-            .on_response::<R, F>(handler);
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub async fn fake_event(&self, event: dap_types::messages::Events) {
-        self.send_message(Message::Event(Box::new(event)))
-            .await
-            .unwrap();
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::client::DebugAdapterClient;
-    use dap_types::{
-        Capabilities, InitializeRequestArguments, InitializeRequestArgumentsPathFormat,
-        RunInTerminalRequestArguments, StartDebuggingRequestArguments,
-        messages::Events,
-        requests::{Initialize, Request, RunInTerminal},
-    };
-    use gpui::TestAppContext;
-    use serde_json::json;
-    use settings::SettingsStore;
-    use std::sync::{
-        Arc,
-        atomic::{AtomicBool, Ordering},
-    };
-
-    pub fn init_test(cx: &mut gpui::TestAppContext) {
-        zlog::init_test();
-
-        cx.update(|cx| {
-            let settings = SettingsStore::test(cx);
-            cx.set_global(settings);
-        });
-    }
-
-    #[gpui::test]
-    pub async fn test_initialize_client(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let client = DebugAdapterClient::start(
-            crate::client::SessionId(1),
-            DebugAdapterBinary {
-                command: Some("command".into()),
-                arguments: Default::default(),
-                envs: Default::default(),
-                connection: None,
-                cwd: None,
-                request_args: StartDebuggingRequestArguments {
-                    configuration: serde_json::Value::Null,
-                    request: dap_types::StartDebuggingRequestArgumentsRequest::Launch,
-                },
-            },
-            Box::new(|_| {}),
-            &mut cx.to_async(),
-        )
-        .await
-        .unwrap();
-
-        client.on_request::<Initialize, _>(move |_, _| {
-            Ok(dap_types::Capabilities {
-                supports_configuration_done_request: Some(true),
-                ..Default::default()
-            })
-        });
-
-        cx.run_until_parked();
-
-        let response = client
-            .request::<Initialize>(InitializeRequestArguments {
-                client_id: Some("zed".to_owned()),
-                client_name: Some("Zed".to_owned()),
-                adapter_id: "fake-adapter".to_owned(),
-                locale: Some("en-US".to_owned()),
-                path_format: Some(InitializeRequestArgumentsPathFormat::Path),
-                supports_variable_type: Some(true),
-                supports_variable_paging: Some(false),
-                supports_run_in_terminal_request: Some(true),
-                supports_memory_references: Some(true),
-                supports_progress_reporting: Some(false),
-                supports_invalidated_event: Some(false),
-                lines_start_at1: Some(true),
-                columns_start_at1: Some(true),
-                supports_memory_event: Some(false),
-                supports_args_can_be_interpreted_by_shell: Some(false),
-                supports_start_debugging_request: Some(true),
-                supports_ansistyling: Some(false),
-            })
-            .await
-            .unwrap();
-
-        cx.run_until_parked();
-
-        assert_eq!(
-            dap_types::Capabilities {
-                supports_configuration_done_request: Some(true),
-                ..Default::default()
-            },
-            response
-        );
-    }
-
-    #[gpui::test]
-    pub async fn test_calls_event_handler(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let called_event_handler = Arc::new(AtomicBool::new(false));
-
-        let client = DebugAdapterClient::start(
-            crate::client::SessionId(1),
-            DebugAdapterBinary {
-                command: Some("command".into()),
-                arguments: Default::default(),
-                envs: Default::default(),
-                connection: None,
-                cwd: None,
-                request_args: StartDebuggingRequestArguments {
-                    configuration: serde_json::Value::Null,
-                    request: dap_types::StartDebuggingRequestArgumentsRequest::Launch,
-                },
-            },
-            Box::new({
-                let called_event_handler = called_event_handler.clone();
-                move |event| {
-                    called_event_handler.store(true, Ordering::SeqCst);
-
-                    assert_eq!(
-                        Message::Event(Box::new(Events::Initialized(
-                            Some(Capabilities::default())
-                        ))),
-                        event
-                    );
-                }
-            }),
-            &mut cx.to_async(),
-        )
-        .await
-        .unwrap();
-
-        cx.run_until_parked();
-
-        client
-            .fake_event(Events::Initialized(Some(Capabilities::default())))
-            .await;
-
-        cx.run_until_parked();
-
-        assert!(
-            called_event_handler.load(std::sync::atomic::Ordering::SeqCst),
-            "Event handler was not called"
-        );
-    }
-
-    #[gpui::test]
-    pub async fn test_calls_event_handler_for_reverse_request(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let called_event_handler = Arc::new(AtomicBool::new(false));
-
-        let client = DebugAdapterClient::start(
-            crate::client::SessionId(1),
-            DebugAdapterBinary {
-                command: Some("command".into()),
-                arguments: Default::default(),
-                envs: Default::default(),
-                connection: None,
-                cwd: None,
-                request_args: dap_types::StartDebuggingRequestArguments {
-                    configuration: serde_json::Value::Null,
-                    request: dap_types::StartDebuggingRequestArgumentsRequest::Launch,
-                },
-            },
-            Box::new({
-                let called_event_handler = called_event_handler.clone();
-                move |event| {
-                    called_event_handler.store(true, Ordering::SeqCst);
-
-                    assert_eq!(
-                        Message::Request(dap_types::messages::Request {
-                            seq: 1,
-                            command: RunInTerminal::COMMAND.into(),
-                            arguments: Some(json!({
-                                "cwd": "/project/path/src",
-                                "args": ["node", "test.js"],
-                            }))
-                        }),
-                        event
-                    );
-                }
-            }),
-            &mut cx.to_async(),
-        )
-        .await
-        .unwrap();
-
-        cx.run_until_parked();
-
-        client
-            .fake_reverse_request::<RunInTerminal>(RunInTerminalRequestArguments {
-                kind: None,
-                title: None,
-                cwd: "/project/path/src".into(),
-                args: vec!["node".into(), "test.js".into()],
-                env: None,
-                args_can_be_interpreted_by_shell: None,
-            })
-            .await;
-
-        cx.run_until_parked();
-
-        assert!(
-            called_event_handler.load(std::sync::atomic::Ordering::SeqCst),
-            "Event handler was not called"
-        );
-    }
-}
diff --git a/crates/dap/src/dap.rs b/crates/dap/src/dap.rs
deleted file mode 100644
index 10a584e61b..0000000000
--- a/crates/dap/src/dap.rs
+++ /dev/null
@@ -1,76 +0,0 @@
-pub mod adapters;
-pub mod client;
-pub mod debugger_settings;
-pub mod inline_value;
-pub mod proto_conversions;
-mod registry;
-pub mod transport;
-
-use std::net::Ipv4Addr;
-
-pub use dap_types::*;
-use debugger_settings::DebuggerSettings;
-use gpui::App;
-pub use registry::{DapLocator, DapRegistry};
-use serde::Serialize;
-use settings::Settings;
-pub use task::DebugRequest;
-
-pub type ScopeId = u64;
-pub type VariableReference = u64;
-pub type StackFrameId = u64;
-
-#[cfg(any(test, feature = "test-support"))]
-pub use adapters::FakeAdapter;
-use task::{DebugScenario, TcpArgumentsTemplate};
-
-pub async fn configure_tcp_connection(
-    tcp_connection: TcpArgumentsTemplate,
-) -> anyhow::Result<(Ipv4Addr, u16, Option<u64>)> {
-    let host = tcp_connection.host();
-    let timeout = tcp_connection.timeout;
-
-    let port = if let Some(port) = tcp_connection.port {
-        port
-    } else {
-        transport::TcpTransport::port(&tcp_connection).await?
-    };
-
-    Ok((host, port, timeout))
-}
-
-#[derive(Clone, Copy, Serialize)]
-#[serde(rename_all = "snake_case")]
-pub enum TelemetrySpawnLocation {
-    Gutter,
-    ScenarioList,
-    Custom,
-}
-
-pub fn send_telemetry(scenario: &DebugScenario, location: TelemetrySpawnLocation, cx: &App) {
-    let Some(adapter) = cx.global::<DapRegistry>().adapter(&scenario.adapter) else {
-        return;
-    };
-    let dock = DebuggerSettings::get_global(cx).dock;
-    let config = scenario.config.clone();
-    let with_build_task = scenario.build.is_some();
-    let adapter_name = scenario.adapter.clone();
-    cx.spawn(async move |_| {
-        let kind = adapter
-            .request_kind(&config)
-            .await
-            .ok()
-            .map(serde_json::to_value)
-            .and_then(Result::ok);
-
-        telemetry::event!(
-            "Debugger Session Started",
-            spawn_location = location,
-            with_build_task = with_build_task,
-            kind = kind,
-            adapter = adapter_name,
-            dock_position = dock,
-        );
-    })
-    .detach();
-}
diff --git a/crates/dap/src/debugger_settings.rs b/crates/dap/src/debugger_settings.rs
deleted file mode 100644
index 8b2f1bf8d6..0000000000
--- a/crates/dap/src/debugger_settings.rs
+++ /dev/null
@@ -1,61 +0,0 @@
-use dap_types::SteppingGranularity;
-use settings::{RegisterSetting, Settings, SettingsContent};
-
-#[derive(Debug, RegisterSetting)]
-pub struct DebuggerSettings {
-    /// Determines the stepping granularity.
-    ///
-    /// Default: line
-    pub stepping_granularity: SteppingGranularity,
-    /// Whether the breakpoints should be reused across Zed sessions.
-    ///
-    /// Default: true
-    pub save_breakpoints: bool,
-    /// Whether to show the debug button in the status bar.
-    ///
-    /// Default: true
-    pub button: bool,
-    /// Time in milliseconds until timeout error when connecting to a TCP debug adapter
-    ///
-    /// Default: 2000ms
-    pub timeout: u64,
-    /// Whether to log messages between active debug adapters and Zed
-    ///
-    /// Default: true
-    pub log_dap_communications: bool,
-    /// Whether to format dap messages in when adding them to debug adapter logger
-    ///
-    /// Default: true
-    pub format_dap_log_messages: bool,
-    /// The dock position of the debug panel
-    ///
-    /// Default: Bottom
-    pub dock: settings::DockPosition,
-}
-
-impl Settings for DebuggerSettings {
-    fn from_settings(content: &SettingsContent) -> Self {
-        let content = content.debugger.clone().unwrap();
-        Self {
-            stepping_granularity: dap_granularity_from_settings(
-                content.stepping_granularity.unwrap(),
-            ),
-            save_breakpoints: content.save_breakpoints.unwrap(),
-            button: content.button.unwrap(),
-            timeout: content.timeout.unwrap(),
-            log_dap_communications: content.log_dap_communications.unwrap(),
-            format_dap_log_messages: content.format_dap_log_messages.unwrap(),
-            dock: content.dock.unwrap(),
-        }
-    }
-}
-
-fn dap_granularity_from_settings(
-    granularity: settings::SteppingGranularity,
-) -> dap_types::SteppingGranularity {
-    match granularity {
-        settings::SteppingGranularity::Instruction => dap_types::SteppingGranularity::Instruction,
-        settings::SteppingGranularity::Line => dap_types::SteppingGranularity::Line,
-        settings::SteppingGranularity::Statement => dap_types::SteppingGranularity::Statement,
-    }
-}
diff --git a/crates/dap/src/inline_value.rs b/crates/dap/src/inline_value.rs
deleted file mode 100644
index 47d7833085..0000000000
--- a/crates/dap/src/inline_value.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum VariableLookupKind {
-    Variable,
-    Expression,
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum VariableScope {
-    Local,
-    Global,
-}
-
-#[derive(Debug, Clone)]
-pub struct InlineValueLocation {
-    pub variable_name: String,
-    pub scope: VariableScope,
-    pub lookup: VariableLookupKind,
-    pub row: usize,
-    pub column: usize,
-}
diff --git a/crates/dap/src/proto_conversions.rs b/crates/dap/src/proto_conversions.rs
deleted file mode 100644
index 7b7324644b..0000000000
--- a/crates/dap/src/proto_conversions.rs
+++ /dev/null
@@ -1,591 +0,0 @@
-use anyhow::{Context as _, Result};
-use client::proto::{
-    self, DapChecksum, DapChecksumAlgorithm, DapEvaluateContext, DapModule, DapScope,
-    DapScopePresentationHint, DapSource, DapSourcePresentationHint, DapStackFrame, DapVariable,
-};
-use dap_types::{OutputEventCategory, OutputEventGroup, ScopePresentationHint, Source};
-
-pub trait ProtoConversion {
-    type ProtoType;
-    type Output;
-
-    fn to_proto(&self) -> Self::ProtoType;
-    fn from_proto(payload: Self::ProtoType) -> Self::Output;
-}
-
-impl<T> ProtoConversion for Vec<T>
-where
-    T: ProtoConversion<Output = T>,
-{
-    type ProtoType = Vec<T::ProtoType>;
-    type Output = Self;
-
-    fn to_proto(&self) -> Self::ProtoType {
-        self.iter().map(|item| item.to_proto()).collect()
-    }
-
-    fn from_proto(payload: Self::ProtoType) -> Self {
-        payload
-            .into_iter()
-            .map(|item| T::from_proto(item))
-            .collect()
-    }
-}
-
-impl ProtoConversion for dap_types::Scope {
-    type ProtoType = DapScope;
-    type Output = Self;
-
-    fn to_proto(&self) -> Self::ProtoType {
-        Self::ProtoType {
-            name: self.name.clone(),
-            presentation_hint: self
-                .presentation_hint
-                .as_ref()
-                .map(|hint| hint.to_proto().into()),
-            variables_reference: self.variables_reference,
-            named_variables: self.named_variables,
-            indexed_variables: self.indexed_variables,
-            expensive: self.expensive,
-            source: self.source.as_ref().map(Source::to_proto),
-            line: self.line,
-            end_line: self.end_line,
-            column: self.column,
-            end_column: self.end_column,
-        }
-    }
-
-    fn from_proto(payload: Self::ProtoType) -> Self {
-        let presentation_hint = payload
-            .presentation_hint
-            .and_then(DapScopePresentationHint::from_i32);
-        Self {
-            name: payload.name,
-            presentation_hint: presentation_hint.map(ScopePresentationHint::from_proto),
-            variables_reference: payload.variables_reference,
-            named_variables: payload.named_variables,
-            indexed_variables: payload.indexed_variables,
-            expensive: payload.expensive,
-            source: payload.source.map(dap_types::Source::from_proto),
-            line: payload.line,
-            end_line: payload.end_line,
-            column: payload.column,
-            end_column: payload.end_column,
-        }
-    }
-}
-
-impl ProtoConversion for dap_types::Variable {
-    type ProtoType = DapVariable;
-    type Output = Self;
-
-    fn to_proto(&self) -> Self::ProtoType {
-        Self::ProtoType {
-            name: self.name.clone(),
-            value: self.value.clone(),
-            r#type: self.type_.clone(),
-            evaluate_name: self.evaluate_name.clone(),
-            variables_reference: self.variables_reference,
-            named_variables: self.named_variables,
-            indexed_variables: self.indexed_variables,
-            memory_reference: self.memory_reference.clone(),
-        }
-    }
-
-    fn from_proto(payload: Self::ProtoType) -> Self {
-        Self {
-            name: payload.name,
-            value: payload.value,
-            type_: payload.r#type,
-            evaluate_name: payload.evaluate_name,
-            presentation_hint: None, // TODO Debugger Collab Add this
-            variables_reference: payload.variables_reference,
-            named_variables: payload.named_variables,
-            indexed_variables: payload.indexed_variables,
-            memory_reference: payload.memory_reference,
-            declaration_location_reference: None, // TODO
-            value_location_reference: None,       // TODO
-        }
-    }
-}
-
-impl ProtoConversion for dap_types::ScopePresentationHint {
-    type ProtoType = DapScopePresentationHint;
-    type Output = Self;
-
-    fn to_proto(&self) -> Self::ProtoType {
-        match self {
-            dap_types::ScopePresentationHint::Locals => DapScopePresentationHint::Locals,
-            dap_types::ScopePresentationHint::Arguments => DapScopePresentationHint::Arguments,
-            dap_types::ScopePresentationHint::Registers => DapScopePresentationHint::Registers,
-            dap_types::ScopePresentationHint::ReturnValue => DapScopePresentationHint::ReturnValue,
-            dap_types::ScopePresentationHint::Unknown => DapScopePresentationHint::ScopeUnknown,
-            &_ => unreachable!(),
-        }
-    }
-
-    fn from_proto(payload: Self::ProtoType) -> Self {
-        match payload {
-            DapScopePresentationHint::Locals => dap_types::ScopePresentationHint::Locals,
-            DapScopePresentationHint::Arguments => dap_types::ScopePresentationHint::Arguments,
-            DapScopePresentationHint::Registers => dap_types::ScopePresentationHint::Registers,
-            DapScopePresentationHint::ReturnValue => dap_types::ScopePresentationHint::ReturnValue,
-            DapScopePresentationHint::ScopeUnknown => dap_types::ScopePresentationHint::Unknown,
-        }
-    }
-}
-
-impl ProtoConversion for dap_types::SourcePresentationHint {
-    type ProtoType = DapSourcePresentationHint;
-    type Output = Self;
-
-    fn to_proto(&self) -> Self::ProtoType {
-        match self {
-            dap_types::SourcePresentationHint::Normal => DapSourcePresentationHint::SourceNormal,
-            dap_types::SourcePresentationHint::Emphasize => DapSourcePresentationHint::Emphasize,
-            dap_types::SourcePresentationHint::Deemphasize => {
-                DapSourcePresentationHint::Deemphasize
-            }
-            dap_types::SourcePresentationHint::Unknown => DapSourcePresentationHint::SourceUnknown,
-        }
-    }
-
-    fn from_proto(payload: Self::ProtoType) -> Self {
-        match payload {
-            DapSourcePresentationHint::SourceNormal => dap_types::SourcePresentationHint::Normal,
-            DapSourcePresentationHint::Emphasize => dap_types::SourcePresentationHint::Emphasize,
-            DapSourcePresentationHint::Deemphasize => {
-                dap_types::SourcePresentationHint::Deemphasize
-            }
-            DapSourcePresentationHint::SourceUnknown => dap_types::SourcePresentationHint::Unknown,
-        }
-    }
-}
-
-impl ProtoConversion for dap_types::Checksum {
-    type ProtoType = DapChecksum;
-    type Output = Self;
-
-    fn to_proto(&self) -> Self::ProtoType {
-        DapChecksum {
-            algorithm: self.algorithm.to_proto().into(),
-            checksum: self.checksum.clone(),
-        }
-    }
-
-    fn from_proto(payload: Self::ProtoType) -> Self {
-        Self {
-            algorithm: dap_types::ChecksumAlgorithm::from_proto(payload.algorithm()),
-            checksum: payload.checksum,
-        }
-    }
-}
-
-impl ProtoConversion for dap_types::ChecksumAlgorithm {
-    type ProtoType = DapChecksumAlgorithm;
-    type Output = Self;
-
-    fn to_proto(&self) -> Self::ProtoType {
-        match self {
-            dap_types::ChecksumAlgorithm::Md5 => DapChecksumAlgorithm::Md5,
-            dap_types::ChecksumAlgorithm::Sha1 => DapChecksumAlgorithm::Sha1,
-            dap_types::ChecksumAlgorithm::Sha256 => DapChecksumAlgorithm::Sha256,
-            dap_types::ChecksumAlgorithm::Timestamp => DapChecksumAlgorithm::Timestamp,
-        }
-    }
-
-    fn from_proto(payload: Self::ProtoType) -> Self {
-        match payload {
-            DapChecksumAlgorithm::Md5 => dap_types::ChecksumAlgorithm::Md5,
-            DapChecksumAlgorithm::Sha1 => dap_types::ChecksumAlgorithm::Sha1,
-            DapChecksumAlgorithm::Sha256 => dap_types::ChecksumAlgorithm::Sha256,
-            DapChecksumAlgorithm::Timestamp => dap_types::ChecksumAlgorithm::Timestamp,
-            DapChecksumAlgorithm::ChecksumAlgorithmUnspecified => unreachable!(),
-        }
-    }
-}
-
-impl ProtoConversion for dap_types::Source {
-    type ProtoType = DapSource;
-    type Output = Self;
-
-    fn to_proto(&self) -> Self::ProtoType {
-        Self::ProtoType {
-            name: self.name.clone(),
-            path: self.path.clone(),
-            source_reference: self.source_reference,
-            presentation_hint: self.presentation_hint.map(|hint| hint.to_proto().into()),
-            origin: self.origin.clone(),
-            sources: self
-                .sources
-                .clone()
-                .map(|src| src.to_proto())
-                .unwrap_or_default(),
-            adapter_data: Default::default(), // TODO Debugger Collab
-            checksums: self
-                .checksums
-                .clone()
-                .map(|c| c.to_proto())
-                .unwrap_or_default(),
-        }
-    }
-
-    fn from_proto(payload: Self::ProtoType) -> Self {
-        Self {
-            name: payload.name.clone(),
-            path: payload.path.clone(),
-            source_reference: payload.source_reference,
-            presentation_hint: payload
-                .presentation_hint
-                .and_then(DapSourcePresentationHint::from_i32)
-                .map(dap_types::SourcePresentationHint::from_proto),
-            origin: payload.origin.clone(),
-            sources: Some(Vec::<dap_types::Source>::from_proto(payload.sources)),
-            checksums: Some(Vec::<dap_types::Checksum>::from_proto(payload.checksums)),
-            adapter_data: None, // TODO Debugger Collab
-        }
-    }
-}
-
-impl ProtoConversion for dap_types::StackFrame {
-    type ProtoType = DapStackFrame;
-    type Output = Self;
-
-    fn to_proto(&self) -> Self::ProtoType {
-        Self::ProtoType {
-            id: self.id,
-            name: self.name.clone(),
-            source: self.source.as_ref().map(|src| src.to_proto()),
-            line: self.line,
-            column: self.column,
-            end_line: self.end_line,
-            end_column: self.end_column,
-            can_restart: self.can_restart,
-            instruction_pointer_reference: self.instruction_pointer_reference.clone(),
-            module_id: None,         // TODO Debugger Collab
-            presentation_hint: None, // TODO Debugger Collab
-        }
-    }
-
-    fn from_proto(payload: Self::ProtoType) -> Self {
-        Self {
-            id: payload.id,
-            name: payload.name,
-            source: payload.source.map(dap_types::Source::from_proto),
-            line: payload.line,
-            column: payload.column,
-            end_line: payload.end_line,
-            end_column: payload.end_column,
-            can_restart: payload.can_restart,
-            instruction_pointer_reference: payload.instruction_pointer_reference,
-            module_id: None,         // TODO Debugger Collab
-            presentation_hint: None, // TODO Debugger Collab
-        }
-    }
-}
-
-impl ProtoConversion for dap_types::Module {
-    type ProtoType = DapModule;
-    type Output = Result<Self>;
-
-    fn to_proto(&self) -> Self::ProtoType {
-        let id = match &self.id {
-            dap_types::ModuleId::Number(num) => proto::dap_module_id::Id::Number(*num),
-            dap_types::ModuleId::String(string) => proto::dap_module_id::Id::String(string.clone()),
-        };
-
-        DapModule {
-            id: Some(proto::DapModuleId { id: Some(id) }),
-            name: self.name.clone(),
-            path: self.path.clone(),
-            is_optimized: self.is_optimized,
-            is_user_code: self.is_user_code,
-            version: self.version.clone(),
-            symbol_status: self.symbol_status.clone(),
-            symbol_file_path: self.symbol_file_path.clone(),
-            date_time_stamp: self.date_time_stamp.clone(),
-            address_range: self.address_range.clone(),
-        }
-    }
-
-    fn from_proto(payload: Self::ProtoType) -> Result<Self> {
-        let id = match payload
-            .id
-            .context("All DapModule proto messages must have an id")?
-            .id
-            .context("All DapModuleID proto messages must have an id")?
-        {
-            proto::dap_module_id::Id::String(string) => dap_types::ModuleId::String(string),
-            proto::dap_module_id::Id::Number(num) => dap_types::ModuleId::Number(num),
-        };
-
-        Ok(Self {
-            id,
-            name: payload.name,
-            path: payload.path,
-            is_optimized: payload.is_optimized,
-            is_user_code: payload.is_user_code,
-            version: payload.version,
-            symbol_status: payload.symbol_status,
-            symbol_file_path: payload.symbol_file_path,
-            date_time_stamp: payload.date_time_stamp,
-            address_range: payload.address_range,
-        })
-    }
-}
-
-impl ProtoConversion for dap_types::SteppingGranularity {
-    type ProtoType = proto::SteppingGranularity;
-    type Output = Self;
-
-    fn to_proto(&self) -> Self::ProtoType {
-        match self {
-            dap_types::SteppingGranularity::Statement => proto::SteppingGranularity::Statement,
-            dap_types::SteppingGranularity::Line => proto::SteppingGranularity::Line,
-            dap_types::SteppingGranularity::Instruction => proto::SteppingGranularity::Instruction,
-        }
-    }
-
-    fn from_proto(payload: Self::ProtoType) -> Self {
-        match payload {
-            proto::SteppingGranularity::Line => dap_types::SteppingGranularity::Line,
-            proto::SteppingGranularity::Instruction => dap_types::SteppingGranularity::Instruction,
-            proto::SteppingGranularity::Statement => dap_types::SteppingGranularity::Statement,
-        }
-    }
-}
-
-impl ProtoConversion for dap_types::OutputEventCategory {
-    type ProtoType = proto::DapOutputCategory;
-    type Output = Self;
-
-    fn to_proto(&self) -> Self::ProtoType {
-        match self {
-            Self::Console => proto::DapOutputCategory::ConsoleOutput,
-            Self::Important => proto::DapOutputCategory::Important,
-            Self::Stdout => proto::DapOutputCategory::Stdout,
-            Self::Stderr => proto::DapOutputCategory::Stderr,
-            _ => proto::DapOutputCategory::Unknown,
-        }
-    }
-
-    fn from_proto(payload: Self::ProtoType) -> Self {
-        match payload {
-            proto::DapOutputCategory::ConsoleOutput => Self::Console,
-            proto::DapOutputCategory::Important => Self::Important,
-            proto::DapOutputCategory::Stdout => Self::Stdout,
-            proto::DapOutputCategory::Stderr => Self::Stderr,
-            proto::DapOutputCategory::Unknown => Self::Unknown,
-        }
-    }
-}
-
-impl ProtoConversion for dap_types::OutputEvent {
-    type ProtoType = proto::DapOutputEvent;
-    type Output = Self;
-
-    fn to_proto(&self) -> Self::ProtoType {
-        proto::DapOutputEvent {
-            category: self
-                .category
-                .as_ref()
-                .map(|category| category.to_proto().into()),
-            output: self.output.clone(),
-            variables_reference: self.variables_reference,
-            source: self.source.as_ref().map(|source| source.to_proto()),
-            line: self.line.map(|line| line as u32),
-            column: self.column.map(|column| column as u32),
-            group: self.group.map(|group| group.to_proto().into()),
-        }
-    }
-
-    fn from_proto(payload: Self::ProtoType) -> Self {
-        dap_types::OutputEvent {
-            category: payload
-                .category
-                .and_then(proto::DapOutputCategory::from_i32)
-                .map(OutputEventCategory::from_proto),
-            output: payload.output.clone(),
-            variables_reference: payload.variables_reference,
-            source: payload.source.map(Source::from_proto),
-            line: payload.line.map(|line| line as u64),
-            column: payload.column.map(|column| column as u64),
-            group: payload
-                .group
-                .and_then(proto::DapOutputEventGroup::from_i32)
-                .map(OutputEventGroup::from_proto),
-            data: None,
-            location_reference: None,
-        }
-    }
-}
-
-impl ProtoConversion for dap_types::OutputEventGroup {
-    type ProtoType = proto::DapOutputEventGroup;
-    type Output = Self;
-
-    fn to_proto(&self) -> Self::ProtoType {
-        match self {
-            dap_types::OutputEventGroup::Start => proto::DapOutputEventGroup::Start,
-            dap_types::OutputEventGroup::StartCollapsed => {
-                proto::DapOutputEventGroup::StartCollapsed
-            }
-            dap_types::OutputEventGroup::End => proto::DapOutputEventGroup::End,
-        }
-    }
-
-    fn from_proto(payload: Self::ProtoType) -> Self {
-        match payload {
-            proto::DapOutputEventGroup::Start => Self::Start,
-            proto::DapOutputEventGroup::StartCollapsed => Self::StartCollapsed,
-            proto::DapOutputEventGroup::End => Self::End,
-        }
-    }
-}
-
-impl ProtoConversion for dap_types::CompletionItem {
-    type ProtoType = proto::DapCompletionItem;
-    type Output = Self;
-
-    fn to_proto(&self) -> Self::ProtoType {
-        proto::DapCompletionItem {
-            label: self.label.clone(),
-            text: self.text.clone(),
-            detail: self.detail.clone(),
-            typ: self
-                .type_
-                .as_ref()
-                .map(ProtoConversion::to_proto)
-                .map(|typ| typ.into()),
-            start: self.start,
-            length: self.length,
-            selection_start: self.selection_start,
-            selection_length: self.selection_length,
-            sort_text: self.sort_text.clone(),
-        }
-    }
-
-    fn from_proto(payload: Self::ProtoType) -> Self {
-        let typ = payload.typ(); // todo(debugger): This might be a potential issue/bug because it defaults to a type when it's None
-
-        Self {
-            label: payload.label,
-            detail: payload.detail,
-            sort_text: payload.sort_text,
-            text: payload.text.clone(),
-            type_: Some(dap_types::CompletionItemType::from_proto(typ)),
-            start: payload.start,
-            length: payload.length,
-            selection_start: payload.selection_start,
-            selection_length: payload.selection_length,
-        }
-    }
-}
-
-impl ProtoConversion for dap_types::EvaluateArgumentsContext {
-    type ProtoType = DapEvaluateContext;
-    type Output = Self;
-
-    fn to_proto(&self) -> Self::ProtoType {
-        match self {
-            dap_types::EvaluateArgumentsContext::Variables => {
-                proto::DapEvaluateContext::EvaluateVariables
-            }
-            dap_types::EvaluateArgumentsContext::Watch => proto::DapEvaluateContext::Watch,
-            dap_types::EvaluateArgumentsContext::Hover => proto::DapEvaluateContext::Hover,
-            dap_types::EvaluateArgumentsContext::Repl => proto::DapEvaluateContext::Repl,
-            dap_types::EvaluateArgumentsContext::Clipboard => proto::DapEvaluateContext::Clipboard,
-            dap_types::EvaluateArgumentsContext::Unknown => {
-                proto::DapEvaluateContext::EvaluateUnknown
-            }
-            _ => proto::DapEvaluateContext::EvaluateUnknown,
-        }
-    }
-
-    fn from_proto(payload: Self::ProtoType) -> Self {
-        match payload {
-            proto::DapEvaluateContext::EvaluateVariables => {
-                dap_types::EvaluateArgumentsContext::Variables
-            }
-            proto::DapEvaluateContext::Watch => dap_types::EvaluateArgumentsContext::Watch,
-            proto::DapEvaluateContext::Hover => dap_types::EvaluateArgumentsContext::Hover,
-            proto::DapEvaluateContext::Repl => dap_types::EvaluateArgumentsContext::Repl,
-            proto::DapEvaluateContext::Clipboard => dap_types::EvaluateArgumentsContext::Clipboard,
-            proto::DapEvaluateContext::EvaluateUnknown => {
-                dap_types::EvaluateArgumentsContext::Unknown
-            }
-        }
-    }
-}
-
-impl ProtoConversion for dap_types::CompletionItemType {
-    type ProtoType = proto::DapCompletionItemType;
-    type Output = Self;
-
-    fn to_proto(&self) -> Self::ProtoType {
-        match self {
-            dap_types::CompletionItemType::Class => proto::DapCompletionItemType::Class,
-            dap_types::CompletionItemType::Color => proto::DapCompletionItemType::Color,
-            dap_types::CompletionItemType::Constructor => proto::DapCompletionItemType::Constructor,
-            dap_types::CompletionItemType::Customcolor => proto::DapCompletionItemType::Customcolor,
-            dap_types::CompletionItemType::Enum => proto::DapCompletionItemType::Enum,
-            dap_types::CompletionItemType::Field => proto::DapCompletionItemType::Field,
-            dap_types::CompletionItemType::File => proto::DapCompletionItemType::CompletionItemFile,
-            dap_types::CompletionItemType::Function => proto::DapCompletionItemType::Function,
-            dap_types::CompletionItemType::Interface => proto::DapCompletionItemType::Interface,
-            dap_types::CompletionItemType::Keyword => proto::DapCompletionItemType::Keyword,
-            dap_types::CompletionItemType::Method => proto::DapCompletionItemType::Method,
-            dap_types::CompletionItemType::Module => proto::DapCompletionItemType::Module,
-            dap_types::CompletionItemType::Property => proto::DapCompletionItemType::Property,
-            dap_types::CompletionItemType::Reference => proto::DapCompletionItemType::Reference,
-            dap_types::CompletionItemType::Snippet => proto::DapCompletionItemType::Snippet,
-            dap_types::CompletionItemType::Text => proto::DapCompletionItemType::Text,
-            dap_types::CompletionItemType::Unit => proto::DapCompletionItemType::Unit,
-            dap_types::CompletionItemType::Value => proto::DapCompletionItemType::Value,
-            dap_types::CompletionItemType::Variable => proto::DapCompletionItemType::Variable,
-        }
-    }
-
-    fn from_proto(payload: Self::ProtoType) -> Self {
-        match payload {
-            proto::DapCompletionItemType::Class => dap_types::CompletionItemType::Class,
-            proto::DapCompletionItemType::Color => dap_types::CompletionItemType::Color,
-            proto::DapCompletionItemType::CompletionItemFile => dap_types::CompletionItemType::File,
-            proto::DapCompletionItemType::Constructor => dap_types::CompletionItemType::Constructor,
-            proto::DapCompletionItemType::Customcolor => dap_types::CompletionItemType::Customcolor,
-            proto::DapCompletionItemType::Enum => dap_types::CompletionItemType::Enum,
-            proto::DapCompletionItemType::Field => dap_types::CompletionItemType::Field,
-            proto::DapCompletionItemType::Function => dap_types::CompletionItemType::Function,
-            proto::DapCompletionItemType::Interface => dap_types::CompletionItemType::Interface,
-            proto::DapCompletionItemType::Keyword => dap_types::CompletionItemType::Keyword,
-            proto::DapCompletionItemType::Method => dap_types::CompletionItemType::Method,
-            proto::DapCompletionItemType::Module => dap_types::CompletionItemType::Module,
-            proto::DapCompletionItemType::Property => dap_types::CompletionItemType::Property,
-            proto::DapCompletionItemType::Reference => dap_types::CompletionItemType::Reference,
-            proto::DapCompletionItemType::Snippet => dap_types::CompletionItemType::Snippet,
-            proto::DapCompletionItemType::Text => dap_types::CompletionItemType::Text,
-            proto::DapCompletionItemType::Unit => dap_types::CompletionItemType::Unit,
-            proto::DapCompletionItemType::Value => dap_types::CompletionItemType::Value,
-            proto::DapCompletionItemType::Variable => dap_types::CompletionItemType::Variable,
-        }
-    }
-}
-
-impl ProtoConversion for dap_types::Thread {
-    type ProtoType = proto::DapThread;
-    type Output = Self;
-
-    fn to_proto(&self) -> Self::ProtoType {
-        proto::DapThread {
-            id: self.id,
-            name: self.name.clone(),
-        }
-    }
-
-    fn from_proto(payload: Self::ProtoType) -> Self {
-        Self {
-            id: payload.id,
-            name: payload.name,
-        }
-    }
-}
diff --git a/crates/dap/src/registry.rs b/crates/dap/src/registry.rs
deleted file mode 100644
index d578b41762..0000000000
--- a/crates/dap/src/registry.rs
+++ /dev/null
@@ -1,93 +0,0 @@
-use anyhow::Result;
-use async_trait::async_trait;
-use collections::FxHashMap;
-use gpui::{App, Global, SharedString};
-use language::LanguageName;
-use parking_lot::RwLock;
-use task::{
-    AdapterSchema, AdapterSchemas, DebugRequest, DebugScenario, SpawnInTerminal, TaskTemplate,
-};
-
-use crate::adapters::{DebugAdapter, DebugAdapterName};
-use std::{collections::BTreeMap, sync::Arc};
-
-/// Given a user build configuration, locator creates a fill-in debug target ([DebugScenario]) on behalf of the user.
-#[async_trait]
-pub trait DapLocator: Send + Sync {
-    fn name(&self) -> SharedString;
-    /// Determines whether this locator can generate debug target for given task.
-    async fn create_scenario(
-        &self,
-        build_config: &TaskTemplate,
-        resolved_label: &str,
-        adapter: &DebugAdapterName,
-    ) -> Option<DebugScenario>;
-
-    async fn run(&self, build_config: SpawnInTerminal) -> Result<DebugRequest>;
-}
-
-#[derive(Default)]
-struct DapRegistryState {
-    adapters: BTreeMap<DebugAdapterName, Arc<dyn DebugAdapter>>,
-    locators: FxHashMap<SharedString, Arc<dyn DapLocator>>,
-}
-
-#[derive(Clone, Default)]
-/// Stores available debug adapters.
-pub struct DapRegistry(Arc<RwLock<DapRegistryState>>);
-impl Global for DapRegistry {}
-
-impl DapRegistry {
-    pub fn global(cx: &mut App) -> &mut Self {
-        cx.default_global::<Self>()
-    }
-
-    pub fn add_adapter(&self, adapter: Arc<dyn DebugAdapter>) {
-        let name = adapter.name();
-        let _previous_value = self.0.write().adapters.insert(name, adapter);
-    }
-
-    pub fn add_locator(&self, locator: Arc<dyn DapLocator>) {
-        self.0.write().locators.insert(locator.name(), locator);
-    }
-
-    pub fn remove_adapter(&self, name: &str) {
-        self.0.write().adapters.remove(name);
-    }
-
-    pub fn remove_locator(&self, locator: &str) {
-        self.0.write().locators.remove(locator);
-    }
-
-    pub fn adapter_language(&self, adapter_name: &str) -> Option<LanguageName> {
-        self.adapter(adapter_name)
-            .and_then(|adapter| adapter.adapter_language_name())
-    }
-
-    pub fn adapters_schema(&self) -> task::AdapterSchemas {
-        let mut schemas = vec![];
-
-        let adapters = &self.0.read().adapters;
-
-        for (name, adapter) in adapters.into_iter() {
-            schemas.push(AdapterSchema {
-                adapter: name.clone().into(),
-                schema: adapter.dap_schema(),
-            });
-        }
-
-        AdapterSchemas(schemas)
-    }
-
-    pub fn locators(&self) -> FxHashMap<SharedString, Arc<dyn DapLocator>> {
-        self.0.read().locators.clone()
-    }
-
-    pub fn adapter(&self, name: &str) -> Option<Arc<dyn DebugAdapter>> {
-        self.0.read().adapters.get(name).cloned()
-    }
-
-    pub fn enumerate_adapters<B: FromIterator<DebugAdapterName>>(&self) -> B {
-        self.0.read().adapters.keys().cloned().collect()
-    }
-}
diff --git a/crates/dap/src/transport.rs b/crates/dap/src/transport.rs
deleted file mode 100644
index e6f8d0bce1..0000000000
--- a/crates/dap/src/transport.rs
+++ /dev/null
@@ -1,1091 +0,0 @@
-use anyhow::{Context as _, Result, anyhow, bail};
-#[cfg(any(test, feature = "test-support"))]
-use async_pipe::{PipeReader, PipeWriter};
-use dap_types::{
-    ErrorResponse,
-    messages::{Message, Response},
-};
-use futures::{AsyncRead, AsyncReadExt as _, AsyncWrite, FutureExt as _, channel::oneshot, select};
-use gpui::{AppContext as _, AsyncApp, BackgroundExecutor, Task};
-use parking_lot::Mutex;
-use proto::ErrorExt;
-use settings::Settings as _;
-use smallvec::SmallVec;
-use smol::{
-    channel::{Receiver, Sender, unbounded},
-    io::{AsyncBufReadExt as _, AsyncWriteExt, BufReader},
-    net::{TcpListener, TcpStream},
-};
-use std::{
-    collections::HashMap,
-    net::{Ipv4Addr, SocketAddrV4},
-    process::Stdio,
-    sync::Arc,
-    time::Duration,
-};
-use task::TcpArgumentsTemplate;
-use util::ConnectionResult;
-
-use crate::{
-    adapters::{DebugAdapterBinary, TcpArguments},
-    client::DapMessageHandler,
-    debugger_settings::DebuggerSettings,
-};
-
-pub(crate) type IoMessage = str;
-pub(crate) type Command = str;
-pub type IoHandler = Box<dyn Send + FnMut(IoKind, Option<&Command>, &IoMessage)>;
-
-#[derive(PartialEq, Eq, Clone, Copy)]
-pub enum LogKind {
-    Adapter,
-    Rpc,
-}
-
-#[derive(Clone, Copy)]
-pub enum IoKind {
-    StdIn,
-    StdOut,
-    StdErr,
-}
-
-#[cfg(any(test, feature = "test-support"))]
-pub enum RequestHandling<T> {
-    Respond(T),
-    Exit,
-}
-
-type LogHandlers = Arc<Mutex<SmallVec<[(LogKind, IoHandler); 2]>>>;
-
-pub trait Transport: Send + Sync {
-    fn has_adapter_logs(&self) -> bool;
-    fn tcp_arguments(&self) -> Option<TcpArguments>;
-    fn connect(
-        &mut self,
-    ) -> Task<
-        Result<(
-            Box<dyn AsyncWrite + Unpin + Send + 'static>,
-            Box<dyn AsyncRead + Unpin + Send + 'static>,
-        )>,
-    >;
-    fn kill(&mut self);
-    #[cfg(any(test, feature = "test-support"))]
-    fn as_fake(&self) -> &FakeTransport {
-        unreachable!()
-    }
-}
-
-async fn start(
-    binary: &DebugAdapterBinary,
-    log_handlers: LogHandlers,
-    cx: &mut AsyncApp,
-) -> Result<Box<dyn Transport>> {
-    #[cfg(any(test, feature = "test-support"))]
-    if cfg!(any(test, feature = "test-support")) {
-        if let Some(connection) = binary.connection.clone() {
-            return Ok(Box::new(FakeTransport::start_tcp(connection, cx).await?));
-        } else {
-            return Ok(Box::new(FakeTransport::start_stdio(cx).await?));
-        }
-    }
-
-    if binary.connection.is_some() {
-        Ok(Box::new(
-            TcpTransport::start(binary, log_handlers, cx).await?,
-        ))
-    } else {
-        Ok(Box::new(
-            StdioTransport::start(binary, log_handlers, cx).await?,
-        ))
-    }
-}
-
-pub(crate) struct PendingRequests {
-    inner: Option<HashMap<u64, oneshot::Sender<Result<Response>>>>,
-}
-
-impl PendingRequests {
-    fn new() -> Self {
-        Self {
-            inner: Some(HashMap::default()),
-        }
-    }
-
-    fn flush(&mut self, e: anyhow::Error) {
-        let Some(inner) = self.inner.as_mut() else {
-            return;
-        };
-        for (_, sender) in inner.drain() {
-            sender.send(Err(e.cloned())).ok();
-        }
-    }
-
-    pub(crate) fn insert(
-        &mut self,
-        sequence_id: u64,
-        callback_tx: oneshot::Sender<Result<Response>>,
-    ) -> anyhow::Result<()> {
-        let Some(inner) = self.inner.as_mut() else {
-            bail!("client is closed")
-        };
-        inner.insert(sequence_id, callback_tx);
-        Ok(())
-    }
-
-    pub(crate) fn remove(
-        &mut self,
-        sequence_id: u64,
-    ) -> anyhow::Result<Option<oneshot::Sender<Result<Response>>>> {
-        let Some(inner) = self.inner.as_mut() else {
-            bail!("client is closed");
-        };
-        Ok(inner.remove(&sequence_id))
-    }
-
-    pub(crate) fn shutdown(&mut self) {
-        self.flush(anyhow!("transport shutdown"));
-        self.inner = None;
-    }
-}
-
-pub(crate) struct TransportDelegate {
-    log_handlers: LogHandlers,
-    pub(crate) pending_requests: Arc<Mutex<PendingRequests>>,
-    pub(crate) transport: Mutex<Box<dyn Transport>>,
-    pub(crate) server_tx: smol::lock::Mutex<Option<Sender<Message>>>,
-    tasks: Mutex<Vec<Task<()>>>,
-}
-
-impl TransportDelegate {
-    pub(crate) async fn start(binary: &DebugAdapterBinary, cx: &mut AsyncApp) -> Result<Self> {
-        let log_handlers: LogHandlers = Default::default();
-        let transport = start(binary, log_handlers.clone(), cx).await?;
-        Ok(Self {
-            transport: Mutex::new(transport),
-            log_handlers,
-            server_tx: Default::default(),
-            pending_requests: Arc::new(Mutex::new(PendingRequests::new())),
-            tasks: Default::default(),
-        })
-    }
-
-    pub async fn connect(
-        &self,
-        message_handler: DapMessageHandler,
-        cx: &mut AsyncApp,
-    ) -> Result<()> {
-        let (server_tx, client_rx) = unbounded::<Message>();
-        self.tasks.lock().clear();
-
-        let log_dap_communications =
-            cx.update(|cx| DebuggerSettings::get_global(cx).log_dap_communications)
-                .with_context(|| "Failed to get Debugger Setting log dap communications error in transport::start_handlers. Defaulting to false")
-                .unwrap_or(false);
-
-        let connect = self.transport.lock().connect();
-        let (input, output) = connect.await?;
-
-        let log_handler = if log_dap_communications {
-            Some(self.log_handlers.clone())
-        } else {
-            None
-        };
-
-        let pending_requests = self.pending_requests.clone();
-        let output_log_handler = log_handler.clone();
-        {
-            let mut tasks = self.tasks.lock();
-            tasks.push(cx.background_spawn(async move {
-                match Self::recv_from_server(
-                    output,
-                    message_handler,
-                    pending_requests.clone(),
-                    output_log_handler,
-                )
-                .await
-                {
-                    Ok(()) => {
-                        pending_requests
-                            .lock()
-                            .flush(anyhow!("debugger shutdown unexpectedly"));
-                    }
-                    Err(e) => {
-                        pending_requests.lock().flush(e);
-                    }
-                }
-            }));
-
-            tasks.push(cx.background_spawn(async move {
-                match Self::send_to_server(input, client_rx, log_handler).await {
-                    Ok(()) => {}
-                    Err(e) => log::error!("Error handling debugger input: {e}"),
-                }
-            }));
-        }
-
-        {
-            let mut lock = self.server_tx.lock().await;
-            *lock = Some(server_tx.clone());
-        }
-
-        Ok(())
-    }
-
-    pub(crate) fn tcp_arguments(&self) -> Option<TcpArguments> {
-        self.transport.lock().tcp_arguments()
-    }
-
-    pub(crate) async fn send_message(&self, message: Message) -> Result<()> {
-        if let Some(server_tx) = self.server_tx.lock().await.as_ref() {
-            server_tx.send(message).await.context("sending message")
-        } else {
-            anyhow::bail!("Server tx already dropped")
-        }
-    }
-
-    async fn handle_adapter_log(
-        stdout: impl AsyncRead + Unpin + Send + 'static,
-        iokind: IoKind,
-        log_handlers: LogHandlers,
-    ) {
-        let mut reader = BufReader::new(stdout);
-        let mut line = String::new();
-
-        loop {
-            line.truncate(0);
-
-            match reader.read_line(&mut line).await {
-                Ok(0) => break,
-                Ok(_) => {}
-                Err(e) => {
-                    log::debug!("handle_adapter_log: {}", e);
-                    break;
-                }
-            }
-
-            // Clean up logs by trimming unnecessary whitespace/newlines before inserting into log.
-            let line = line.trim();
-
-            log::debug!("stderr: {line}");
-
-            for (kind, handler) in log_handlers.lock().iter_mut() {
-                if matches!(kind, LogKind::Adapter) {
-                    handler(iokind, None, line);
-                }
-            }
-        }
-    }
-
-    fn build_rpc_message(message: String) -> String {
-        format!("Content-Length: {}\r\n\r\n{}", message.len(), message)
-    }
-
-    async fn send_to_server<Stdin>(
-        mut server_stdin: Stdin,
-        client_rx: Receiver<Message>,
-        log_handlers: Option<LogHandlers>,
-    ) -> Result<()>
-    where
-        Stdin: AsyncWrite + Unpin + Send + 'static,
-    {
-        let result = loop {
-            match client_rx.recv().await {
-                Ok(message) => {
-                    let command = match &message {
-                        Message::Request(request) => Some(request.command.as_str()),
-                        Message::Response(response) => Some(response.command.as_str()),
-                        _ => None,
-                    };
-
-                    let message = match serde_json::to_string(&message) {
-                        Ok(message) => message,
-                        Err(e) => break Err(e.into()),
-                    };
-
-                    if let Some(log_handlers) = log_handlers.as_ref() {
-                        for (kind, log_handler) in log_handlers.lock().iter_mut() {
-                            if matches!(kind, LogKind::Rpc) {
-                                log_handler(IoKind::StdIn, command, &message);
-                            }
-                        }
-                    }
-
-                    if let Err(e) = server_stdin
-                        .write_all(Self::build_rpc_message(message).as_bytes())
-                        .await
-                    {
-                        break Err(e.into());
-                    }
-
-                    if let Err(e) = server_stdin.flush().await {
-                        break Err(e.into());
-                    }
-                }
-                Err(error) => break Err(error.into()),
-            }
-        };
-
-        log::debug!("Handle adapter input dropped");
-
-        result
-    }
-
-    async fn recv_from_server<Stdout>(
-        server_stdout: Stdout,
-        mut message_handler: DapMessageHandler,
-        pending_requests: Arc<Mutex<PendingRequests>>,
-        log_handlers: Option<LogHandlers>,
-    ) -> Result<()>
-    where
-        Stdout: AsyncRead + Unpin + Send + 'static,
-    {
-        let mut recv_buffer = String::new();
-        let mut reader = BufReader::new(server_stdout);
-
-        let result = loop {
-            let result =
-                Self::receive_server_message(&mut reader, &mut recv_buffer, log_handlers.as_ref())
-                    .await;
-            match result {
-                ConnectionResult::Timeout => anyhow::bail!("Timed out when connecting to debugger"),
-                ConnectionResult::ConnectionReset => {
-                    log::info!("Debugger closed the connection");
-                    return Ok(());
-                }
-                ConnectionResult::Result(Ok(Message::Response(res))) => {
-                    let tx = pending_requests.lock().remove(res.request_seq)?;
-                    if let Some(tx) = tx {
-                        if let Err(e) = tx.send(Self::process_response(res)) {
-                            log::trace!("Did not send response `{:?}` for a cancelled", e);
-                        }
-                    } else {
-                        message_handler(Message::Response(res))
-                    }
-                }
-                ConnectionResult::Result(Ok(message)) => message_handler(message),
-                ConnectionResult::Result(Err(e)) => break Err(e),
-            }
-        };
-
-        log::debug!("Handle adapter output dropped");
-
-        result
-    }
-
-    fn process_response(response: Response) -> Result<Response> {
-        if response.success {
-            Ok(response)
-        } else {
-            if let Some(error_message) = response
-                .body
-                .clone()
-                .and_then(|body| serde_json::from_value::<ErrorResponse>(body).ok())
-                .and_then(|response| response.error.map(|msg| msg.format))
-                .or_else(|| response.message.clone())
-            {
-                anyhow::bail!(error_message);
-            };
-
-            anyhow::bail!(
-                "Received error response from adapter. Response: {:?}",
-                response
-            );
-        }
-    }
-
-    async fn receive_server_message<Stdout>(
-        reader: &mut BufReader<Stdout>,
-        buffer: &mut String,
-        log_handlers: Option<&LogHandlers>,
-    ) -> ConnectionResult<Message>
-    where
-        Stdout: AsyncRead + Unpin + Send + 'static,
-    {
-        let mut content_length = None;
-        loop {
-            buffer.truncate(0);
-            match reader.read_line(buffer).await {
-                Ok(0) => return ConnectionResult::ConnectionReset,
-                Ok(_) => {}
-                Err(e) => return ConnectionResult::Result(Err(e.into())),
-            };
-
-            if buffer == "\r\n" {
-                break;
-            }
-
-            if let Some(("Content-Length", value)) = buffer.trim().split_once(": ") {
-                match value.parse().context("invalid content length") {
-                    Ok(length) => content_length = Some(length),
-                    Err(e) => return ConnectionResult::Result(Err(e)),
-                }
-            }
-        }
-
-        let content_length = match content_length.context("missing content length") {
-            Ok(length) => length,
-            Err(e) => return ConnectionResult::Result(Err(e)),
-        };
-
-        let mut content = vec![0; content_length];
-        if let Err(e) = reader
-            .read_exact(&mut content)
-            .await
-            .with_context(|| "reading after a loop")
-        {
-            return ConnectionResult::Result(Err(e));
-        }
-
-        let message_str = match std::str::from_utf8(&content).context("invalid utf8 from server") {
-            Ok(str) => str,
-            Err(e) => return ConnectionResult::Result(Err(e)),
-        };
-
-        let message =
-            serde_json::from_str::<Message>(message_str).context("deserializing server message");
-
-        if let Some(log_handlers) = log_handlers {
-            let command = match &message {
-                Ok(Message::Request(request)) => Some(request.command.as_str()),
-                Ok(Message::Response(response)) => Some(response.command.as_str()),
-                _ => None,
-            };
-
-            for (kind, log_handler) in log_handlers.lock().iter_mut() {
-                if matches!(kind, LogKind::Rpc) {
-                    log_handler(IoKind::StdOut, command, message_str);
-                }
-            }
-        }
-
-        ConnectionResult::Result(message)
-    }
-
-    pub fn has_adapter_logs(&self) -> bool {
-        self.transport.lock().has_adapter_logs()
-    }
-
-    pub fn add_log_handler<F>(&self, f: F, kind: LogKind)
-    where
-        F: 'static + Send + FnMut(IoKind, Option<&Command>, &IoMessage),
-    {
-        let mut log_handlers = self.log_handlers.lock();
-        log_handlers.push((kind, Box::new(f)));
-    }
-}
-
-pub struct TcpTransport {
-    executor: BackgroundExecutor,
-    pub port: u16,
-    pub host: Ipv4Addr,
-    pub timeout: u64,
-    process: Arc<Mutex<Option<Child>>>,
-    _stderr_task: Option<Task<()>>,
-    _stdout_task: Option<Task<()>>,
-}
-
-impl TcpTransport {
-    /// Get an open port to use with the tcp client when not supplied by debug config
-    pub async fn port(host: &TcpArgumentsTemplate) -> Result<u16> {
-        if let Some(port) = host.port {
-            Ok(port)
-        } else {
-            Self::unused_port(host.host()).await
-        }
-    }
-
-    pub async fn unused_port(host: Ipv4Addr) -> Result<u16> {
-        Ok(TcpListener::bind(SocketAddrV4::new(host, 0))
-            .await?
-            .local_addr()?
-            .port())
-    }
-
-    async fn start(
-        binary: &DebugAdapterBinary,
-        log_handlers: LogHandlers,
-        cx: &mut AsyncApp,
-    ) -> Result<Self> {
-        let connection_args = binary
-            .connection
-            .as_ref()
-            .context("No connection arguments provided")?;
-
-        let host = connection_args.host;
-        let port = connection_args.port;
-
-        let mut process = None;
-        let mut stdout_task = None;
-        let mut stderr_task = None;
-
-        if let Some(command) = &binary.command {
-            let mut command = util::command::new_std_command(&command);
-
-            if let Some(cwd) = &binary.cwd {
-                command.current_dir(cwd);
-            }
-
-            command.args(&binary.arguments);
-            command.envs(&binary.envs);
-
-            let mut p = Child::spawn(command, Stdio::null())
-                .with_context(|| "failed to start debug adapter.")?;
-
-            stdout_task = p.stdout.take().map(|stdout| {
-                cx.background_executor()
-                    .spawn(TransportDelegate::handle_adapter_log(
-                        stdout,
-                        IoKind::StdOut,
-                        log_handlers.clone(),
-                    ))
-            });
-            stderr_task = p.stderr.take().map(|stderr| {
-                cx.background_executor()
-                    .spawn(TransportDelegate::handle_adapter_log(
-                        stderr,
-                        IoKind::StdErr,
-                        log_handlers,
-                    ))
-            });
-            process = Some(p);
-        };
-
-        let timeout = connection_args.timeout.unwrap_or_else(|| {
-            cx.update(|cx| DebuggerSettings::get_global(cx).timeout)
-                .unwrap_or(20000u64)
-        });
-
-        log::info!(
-            "Debug adapter has connected to TCP server {}:{}",
-            host,
-            port
-        );
-
-        let this = Self {
-            executor: cx.background_executor().clone(),
-            port,
-            host,
-            process: Arc::new(Mutex::new(process)),
-            timeout,
-            _stdout_task: stdout_task,
-            _stderr_task: stderr_task,
-        };
-
-        Ok(this)
-    }
-}
-
-impl Transport for TcpTransport {
-    fn has_adapter_logs(&self) -> bool {
-        true
-    }
-
-    fn kill(&mut self) {
-        if let Some(process) = &mut *self.process.lock() {
-            process.kill();
-        }
-    }
-
-    fn tcp_arguments(&self) -> Option<TcpArguments> {
-        Some(TcpArguments {
-            host: self.host,
-            port: self.port,
-            timeout: Some(self.timeout),
-        })
-    }
-
-    fn connect(
-        &mut self,
-    ) -> Task<
-        Result<(
-            Box<dyn AsyncWrite + Unpin + Send + 'static>,
-            Box<dyn AsyncRead + Unpin + Send + 'static>,
-        )>,
-    > {
-        let executor = self.executor.clone();
-        let timeout = self.timeout;
-        let address = SocketAddrV4::new(self.host, self.port);
-        let process = self.process.clone();
-        executor.clone().spawn(async move {
-            select! {
-                _ = executor.timer(Duration::from_millis(timeout)).fuse() => {
-                    anyhow::bail!("Connection to TCP DAP timeout {address}");
-                },
-                result = executor.clone().spawn(async move {
-                    loop {
-                        match TcpStream::connect(address).await {
-                            Ok(stream) => {
-                                let (read, write) = stream.split();
-                                return Ok((Box::new(write) as _, Box::new(read) as _))
-                            },
-                            Err(_) => {
-                                let has_process = process.lock().is_some();
-                                if has_process {
-                                    let status = process.lock().as_mut().unwrap().try_status();
-                                    if let Ok(Some(_)) = status {
-                                        let process = process.lock().take().unwrap().into_inner();
-                                        let output = process.output().await?;
-                                        let output = if output.stderr.is_empty() {
-                                            String::from_utf8_lossy(&output.stdout).to_string()
-                                        } else {
-                                            String::from_utf8_lossy(&output.stderr).to_string()
-                                        };
-                                        anyhow::bail!("{output}\nerror: process exited before debugger attached.");
-                                    }
-                                }
-
-                                executor.timer(Duration::from_millis(100)).await;
-                            }
-                        }
-                    }
-                }).fuse() => result
-            }
-        })
-    }
-}
-
-impl Drop for TcpTransport {
-    fn drop(&mut self) {
-        if let Some(mut p) = self.process.lock().take() {
-            p.kill()
-        }
-    }
-}
-
-pub struct StdioTransport {
-    process: Mutex<Child>,
-    _stderr_task: Option<Task<()>>,
-}
-
-impl StdioTransport {
-    // #[allow(dead_code, reason = "This is used in non test builds of Zed")]
-    async fn start(
-        binary: &DebugAdapterBinary,
-        log_handlers: LogHandlers,
-        cx: &mut AsyncApp,
-    ) -> Result<Self> {
-        let Some(binary_command) = &binary.command else {
-            bail!(
-                "When using the `stdio` transport, the path to a debug adapter binary must be set by Zed."
-            );
-        };
-        let mut command = util::command::new_std_command(&binary_command);
-
-        if let Some(cwd) = &binary.cwd {
-            command.current_dir(cwd);
-        }
-
-        command.args(&binary.arguments);
-        command.envs(&binary.envs);
-
-        let mut process = Child::spawn(command, Stdio::piped())?;
-
-        let _stderr_task = process.stderr.take().map(|stderr| {
-            cx.background_spawn(TransportDelegate::handle_adapter_log(
-                stderr,
-                IoKind::StdErr,
-                log_handlers,
-            ))
-        });
-
-        let process = Mutex::new(process);
-
-        Ok(Self {
-            process,
-            _stderr_task,
-        })
-    }
-}
-
-impl Transport for StdioTransport {
-    fn has_adapter_logs(&self) -> bool {
-        true
-    }
-
-    fn kill(&mut self) {
-        self.process.lock().kill();
-    }
-
-    fn connect(
-        &mut self,
-    ) -> Task<
-        Result<(
-            Box<dyn AsyncWrite + Unpin + Send + 'static>,
-            Box<dyn AsyncRead + Unpin + Send + 'static>,
-        )>,
-    > {
-        let result = util::maybe!({
-            let mut process = self.process.lock();
-            Ok((
-                Box::new(process.stdin.take().context("Cannot reconnect")?) as _,
-                Box::new(process.stdout.take().context("Cannot reconnect")?) as _,
-            ))
-        });
-        Task::ready(result)
-    }
-
-    fn tcp_arguments(&self) -> Option<TcpArguments> {
-        None
-    }
-}
-
-impl Drop for StdioTransport {
-    fn drop(&mut self) {
-        self.process.lock().kill();
-    }
-}
-
-#[cfg(any(test, feature = "test-support"))]
-type RequestHandler = Box<dyn Send + FnMut(u64, serde_json::Value) -> RequestHandling<Response>>;
-
-#[cfg(any(test, feature = "test-support"))]
-type ResponseHandler = Box<dyn Send + Fn(Response)>;
-
-#[cfg(any(test, feature = "test-support"))]
-pub struct FakeTransport {
-    // for sending fake response back from adapter side
-    request_handlers: Arc<Mutex<HashMap<&'static str, RequestHandler>>>,
-    // for reverse request responses
-    response_handlers: Arc<Mutex<HashMap<&'static str, ResponseHandler>>>,
-    message_handler: Option<Task<Result<()>>>,
-    kind: FakeTransportKind,
-}
-
-#[cfg(any(test, feature = "test-support"))]
-pub enum FakeTransportKind {
-    Stdio {
-        stdin_writer: Option<PipeWriter>,
-        stdout_reader: Option<PipeReader>,
-    },
-    Tcp {
-        connection: TcpArguments,
-        executor: BackgroundExecutor,
-    },
-}
-
-#[cfg(any(test, feature = "test-support"))]
-impl FakeTransport {
-    pub fn on_request<R: dap_types::requests::Request, F>(&self, mut handler: F)
-    where
-        F: 'static
-            + Send
-            + FnMut(u64, R::Arguments) -> RequestHandling<Result<R::Response, ErrorResponse>>,
-    {
-        self.request_handlers.lock().insert(
-            R::COMMAND,
-            Box::new(move |seq, args| {
-                let result = handler(seq, serde_json::from_value(args).unwrap());
-                let RequestHandling::Respond(response) = result else {
-                    return RequestHandling::Exit;
-                };
-                let response = match response {
-                    Ok(response) => Response {
-                        seq: seq + 1,
-                        request_seq: seq,
-                        success: true,
-                        command: R::COMMAND.into(),
-                        body: Some(serde_json::to_value(response).unwrap()),
-                        message: None,
-                    },
-                    Err(response) => Response {
-                        seq: seq + 1,
-                        request_seq: seq,
-                        success: false,
-                        command: R::COMMAND.into(),
-                        body: Some(serde_json::to_value(response).unwrap()),
-                        message: None,
-                    },
-                };
-                RequestHandling::Respond(response)
-            }),
-        );
-    }
-
-    pub fn on_response<R: dap_types::requests::Request, F>(&self, handler: F)
-    where
-        F: 'static + Send + Fn(Response),
-    {
-        self.response_handlers
-            .lock()
-            .insert(R::COMMAND, Box::new(handler));
-    }
-
-    async fn start_tcp(connection: TcpArguments, cx: &mut AsyncApp) -> Result<Self> {
-        Ok(Self {
-            request_handlers: Arc::new(Mutex::new(HashMap::default())),
-            response_handlers: Arc::new(Mutex::new(HashMap::default())),
-            message_handler: None,
-            kind: FakeTransportKind::Tcp {
-                connection,
-                executor: cx.background_executor().clone(),
-            },
-        })
-    }
-
-    async fn handle_messages(
-        request_handlers: Arc<Mutex<HashMap<&'static str, RequestHandler>>>,
-        response_handlers: Arc<Mutex<HashMap<&'static str, ResponseHandler>>>,
-        stdin_reader: PipeReader,
-        stdout_writer: PipeWriter,
-    ) -> Result<()> {
-        use dap_types::requests::{Request, RunInTerminal, StartDebugging};
-        use serde_json::json;
-
-        let mut reader = BufReader::new(stdin_reader);
-        let stdout_writer = Arc::new(smol::lock::Mutex::new(stdout_writer));
-        let mut buffer = String::new();
-
-        loop {
-            match TransportDelegate::receive_server_message(&mut reader, &mut buffer, None).await {
-                ConnectionResult::Timeout => {
-                    anyhow::bail!("Timed out when connecting to debugger");
-                }
-                ConnectionResult::ConnectionReset => {
-                    log::info!("Debugger closed the connection");
-                    break Ok(());
-                }
-                ConnectionResult::Result(Err(e)) => break Err(e),
-                ConnectionResult::Result(Ok(message)) => {
-                    match message {
-                        Message::Request(request) => {
-                            // redirect reverse requests to stdout writer/reader
-                            if request.command == RunInTerminal::COMMAND
-                                || request.command == StartDebugging::COMMAND
-                            {
-                                let message =
-                                    serde_json::to_string(&Message::Request(request)).unwrap();
-
-                                let mut writer = stdout_writer.lock().await;
-                                writer
-                                    .write_all(
-                                        TransportDelegate::build_rpc_message(message).as_bytes(),
-                                    )
-                                    .await
-                                    .unwrap();
-                                writer.flush().await.unwrap();
-                            } else {
-                                let response = if let Some(handle) =
-                                    request_handlers.lock().get_mut(request.command.as_str())
-                                {
-                                    handle(request.seq, request.arguments.unwrap_or(json!({})))
-                                } else {
-                                    panic!("No request handler for {}", request.command);
-                                };
-                                let response = match response {
-                                    RequestHandling::Respond(response) => response,
-                                    RequestHandling::Exit => {
-                                        break Err(anyhow!("exit in response to request"));
-                                    }
-                                };
-                                let success = response.success;
-                                let message =
-                                    serde_json::to_string(&Message::Response(response)).unwrap();
-
-                                let mut writer = stdout_writer.lock().await;
-                                writer
-                                    .write_all(
-                                        TransportDelegate::build_rpc_message(message).as_bytes(),
-                                    )
-                                    .await
-                                    .unwrap();
-
-                                if request.command == dap_types::requests::Initialize::COMMAND
-                                    && success
-                                {
-                                    let message = serde_json::to_string(&Message::Event(Box::new(
-                                        dap_types::messages::Events::Initialized(Some(
-                                            Default::default(),
-                                        )),
-                                    )))
-                                    .unwrap();
-                                    writer
-                                        .write_all(
-                                            TransportDelegate::build_rpc_message(message)
-                                                .as_bytes(),
-                                        )
-                                        .await
-                                        .unwrap();
-                                }
-
-                                writer.flush().await.unwrap();
-                            }
-                        }
-                        Message::Event(event) => {
-                            let message = serde_json::to_string(&Message::Event(event)).unwrap();
-
-                            let mut writer = stdout_writer.lock().await;
-                            writer
-                                .write_all(TransportDelegate::build_rpc_message(message).as_bytes())
-                                .await
-                                .unwrap();
-                            writer.flush().await.unwrap();
-                        }
-                        Message::Response(response) => {
-                            if let Some(handle) =
-                                response_handlers.lock().get(response.command.as_str())
-                            {
-                                handle(response);
-                            } else {
-                                log::error!("No response handler for {}", response.command);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    async fn start_stdio(cx: &mut AsyncApp) -> Result<Self> {
-        let (stdin_writer, stdin_reader) = async_pipe::pipe();
-        let (stdout_writer, stdout_reader) = async_pipe::pipe();
-        let kind = FakeTransportKind::Stdio {
-            stdin_writer: Some(stdin_writer),
-            stdout_reader: Some(stdout_reader),
-        };
-
-        let mut this = Self {
-            request_handlers: Arc::new(Mutex::new(HashMap::default())),
-            response_handlers: Arc::new(Mutex::new(HashMap::default())),
-            message_handler: None,
-            kind,
-        };
-
-        let request_handlers = this.request_handlers.clone();
-        let response_handlers = this.response_handlers.clone();
-
-        this.message_handler = Some(cx.background_spawn(Self::handle_messages(
-            request_handlers,
-            response_handlers,
-            stdin_reader,
-            stdout_writer,
-        )));
-
-        Ok(this)
-    }
-}
-
-#[cfg(any(test, feature = "test-support"))]
-impl Transport for FakeTransport {
-    fn tcp_arguments(&self) -> Option<TcpArguments> {
-        match &self.kind {
-            FakeTransportKind::Stdio { .. } => None,
-            FakeTransportKind::Tcp { connection, .. } => Some(connection.clone()),
-        }
-    }
-
-    fn connect(
-        &mut self,
-    ) -> Task<
-        Result<(
-            Box<dyn AsyncWrite + Unpin + Send + 'static>,
-            Box<dyn AsyncRead + Unpin + Send + 'static>,
-        )>,
-    > {
-        let result = match &mut self.kind {
-            FakeTransportKind::Stdio {
-                stdin_writer,
-                stdout_reader,
-            } => util::maybe!({
-                Ok((
-                    Box::new(stdin_writer.take().context("Cannot reconnect")?) as _,
-                    Box::new(stdout_reader.take().context("Cannot reconnect")?) as _,
-                ))
-            }),
-            FakeTransportKind::Tcp { executor, .. } => {
-                let (stdin_writer, stdin_reader) = async_pipe::pipe();
-                let (stdout_writer, stdout_reader) = async_pipe::pipe();
-
-                let request_handlers = self.request_handlers.clone();
-                let response_handlers = self.response_handlers.clone();
-
-                self.message_handler = Some(executor.spawn(Self::handle_messages(
-                    request_handlers,
-                    response_handlers,
-                    stdin_reader,
-                    stdout_writer,
-                )));
-
-                Ok((Box::new(stdin_writer) as _, Box::new(stdout_reader) as _))
-            }
-        };
-        Task::ready(result)
-    }
-
-    fn has_adapter_logs(&self) -> bool {
-        false
-    }
-
-    fn kill(&mut self) {
-        self.message_handler.take();
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    fn as_fake(&self) -> &FakeTransport {
-        self
-    }
-}
-
-struct Child {
-    process: smol::process::Child,
-}
-
-impl std::ops::Deref for Child {
-    type Target = smol::process::Child;
-
-    fn deref(&self) -> &Self::Target {
-        &self.process
-    }
-}
-
-impl std::ops::DerefMut for Child {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.process
-    }
-}
-
-impl Child {
-    fn into_inner(self) -> smol::process::Child {
-        self.process
-    }
-
-    #[cfg(not(windows))]
-    fn spawn(mut command: std::process::Command, stdin: Stdio) -> Result<Self> {
-        util::set_pre_exec_to_start_new_session(&mut command);
-        let mut command = smol::process::Command::from(command);
-        let process = command
-            .stdin(stdin)
-            .stdout(Stdio::piped())
-            .stderr(Stdio::piped())
-            .spawn()
-            .with_context(|| format!("failed to spawn command `{command:?}`",))?;
-        Ok(Self { process })
-    }
-
-    #[cfg(windows)]
-    fn spawn(command: std::process::Command, stdin: Stdio) -> Result<Self> {
-        // TODO(windows): create a job object and add the child process handle to it,
-        // see https://learn.microsoft.com/en-us/windows/win32/procthread/job-objects
-        let mut command = smol::process::Command::from(command);
-        let process = command
-            .stdin(stdin)
-            .stdout(Stdio::piped())
-            .stderr(Stdio::piped())
-            .spawn()
-            .with_context(|| format!("failed to spawn command `{command:?}`",))?;
-        Ok(Self { process })
-    }
-
-    #[cfg(not(windows))]
-    fn kill(&mut self) {
-        let pid = self.process.id();
-        unsafe {
-            libc::killpg(pid as i32, libc::SIGKILL);
-        }
-    }
-
-    #[cfg(windows)]
-    fn kill(&mut self) {
-        // TODO(windows): terminate the job object in kill
-        let _ = self.process.kill();
-    }
-}
diff --git a/crates/dap_adapters/Cargo.toml b/crates/dap_adapters/Cargo.toml
deleted file mode 100644
index 7bdf39c74a..0000000000
--- a/crates/dap_adapters/Cargo.toml
+++ /dev/null
@@ -1,50 +0,0 @@
-[package]
-name = "dap_adapters"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[features]
-test-support = [
-    "dap/test-support",
-    "gpui/test-support",
-    "task/test-support",
-    "util/test-support",
-]
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/dap_adapters.rs"
-doctest = false
-
-[dependencies]
-anyhow.workspace = true
-async-trait.workspace = true
-collections.workspace = true
-dap.workspace = true
-dotenvy.workspace = true
-futures.workspace = true
-fs.workspace = true
-gpui.workspace = true
-json_dotpath.workspace = true
-language.workspace = true
-log.workspace = true
-paths.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-smol.workspace = true
-task.workspace = true
-util.workspace = true
-
-[dev-dependencies]
-dap = { workspace = true, features = ["test-support"] }
-fs = { workspace = true, features = ["test-support"] }
-gpui = { workspace = true, features = ["test-support"] }
-http_client.workspace = true
-node_runtime.workspace = true
-settings = { workspace = true, features = ["test-support"] }
-task = { workspace = true, features = ["test-support"] }
-util = { workspace = true, features = ["test-support"] }
diff --git a/crates/dap_adapters/LICENSE-GPL b/crates/dap_adapters/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/dap_adapters/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/dap_adapters/src/codelldb.rs b/crates/dap_adapters/src/codelldb.rs
deleted file mode 100644
index 05aca2225a..0000000000
--- a/crates/dap_adapters/src/codelldb.rs
+++ /dev/null
@@ -1,411 +0,0 @@
-use std::{path::PathBuf, sync::OnceLock};
-
-use anyhow::{Context as _, Result};
-use async_trait::async_trait;
-use collections::HashMap;
-use dap::adapters::{DebugTaskDefinition, latest_github_release};
-use futures::StreamExt;
-use gpui::AsyncApp;
-use serde_json::Value;
-use task::{DebugRequest, DebugScenario, ZedDebugConfig};
-use util::fs::remove_matching;
-
-use crate::*;
-
-#[derive(Default)]
-pub(crate) struct CodeLldbDebugAdapter {
-    path_to_codelldb: OnceLock<String>,
-}
-
-impl CodeLldbDebugAdapter {
-    const ADAPTER_NAME: &'static str = "CodeLLDB";
-
-    async fn request_args(
-        &self,
-        delegate: &Arc<dyn DapDelegate>,
-        mut configuration: Value,
-        label: &str,
-    ) -> Result<dap::StartDebuggingRequestArguments> {
-        let obj = configuration
-            .as_object_mut()
-            .context("CodeLLDB is not a valid json object")?;
-
-        // CodeLLDB uses `name` for a terminal label.
-        obj.entry("name")
-            .or_insert(Value::String(String::from(label)));
-
-        obj.entry("cwd")
-            .or_insert(delegate.worktree_root_path().to_string_lossy().into());
-
-        let request = self.request_kind(&configuration).await?;
-
-        Ok(dap::StartDebuggingRequestArguments {
-            request,
-            configuration,
-        })
-    }
-
-    async fn fetch_latest_adapter_version(
-        &self,
-        delegate: &Arc<dyn DapDelegate>,
-    ) -> Result<AdapterVersion> {
-        let release =
-            latest_github_release("vadimcn/codelldb", true, false, delegate.http_client()).await?;
-
-        let arch = match std::env::consts::ARCH {
-            "aarch64" => "arm64",
-            "x86_64" => "x64",
-            unsupported => {
-                anyhow::bail!("unsupported architecture {unsupported}");
-            }
-        };
-        let platform = match std::env::consts::OS {
-            "macos" => "darwin",
-            "linux" => "linux",
-            "windows" => "win32",
-            unsupported => {
-                anyhow::bail!("unsupported operating system {unsupported}");
-            }
-        };
-        let asset_name = format!("codelldb-{platform}-{arch}.vsix");
-        let ret = AdapterVersion {
-            tag_name: release.tag_name,
-            url: release
-                .assets
-                .iter()
-                .find(|asset| asset.name == asset_name)
-                .with_context(|| format!("no asset found matching {asset_name:?}"))?
-                .browser_download_url
-                .clone(),
-        };
-
-        Ok(ret)
-    }
-}
-
-#[async_trait(?Send)]
-impl DebugAdapter for CodeLldbDebugAdapter {
-    fn name(&self) -> DebugAdapterName {
-        DebugAdapterName(Self::ADAPTER_NAME.into())
-    }
-
-    async fn config_from_zed_format(&self, zed_scenario: ZedDebugConfig) -> Result<DebugScenario> {
-        let mut configuration = json!({
-            "request": match zed_scenario.request {
-                DebugRequest::Launch(_) => "launch",
-                DebugRequest::Attach(_) => "attach",
-            },
-        });
-        let map = configuration.as_object_mut().unwrap();
-        // CodeLLDB uses `name` for a terminal label.
-        map.insert(
-            "name".into(),
-            Value::String(String::from(zed_scenario.label.as_ref())),
-        );
-        match &zed_scenario.request {
-            DebugRequest::Attach(attach) => {
-                map.insert("pid".into(), attach.process_id.into());
-            }
-            DebugRequest::Launch(launch) => {
-                map.insert("program".into(), launch.program.clone().into());
-
-                if !launch.args.is_empty() {
-                    map.insert("args".into(), launch.args.clone().into());
-                }
-                if !launch.env.is_empty() {
-                    map.insert("env".into(), launch.env_json());
-                }
-                if let Some(stop_on_entry) = zed_scenario.stop_on_entry {
-                    map.insert("stopOnEntry".into(), stop_on_entry.into());
-                }
-                if let Some(cwd) = launch.cwd.as_ref() {
-                    map.insert("cwd".into(), cwd.to_string_lossy().into_owned().into());
-                }
-            }
-        }
-
-        Ok(DebugScenario {
-            adapter: zed_scenario.adapter,
-            label: zed_scenario.label,
-            config: configuration,
-            build: None,
-            tcp_connection: None,
-        })
-    }
-
-    fn dap_schema(&self) -> serde_json::Value {
-        json!({
-            "properties": {
-                "request": {
-                    "type": "string",
-                    "enum": ["attach", "launch"],
-                    "description": "Debug adapter request type"
-                },
-                "program": {
-                    "type": "string",
-                    "description": "Path to the program to debug or attach to"
-                },
-                "args": {
-                    "type": ["array", "string"],
-                    "description": "Program arguments"
-                },
-                "cwd": {
-                    "type": "string",
-                    "description": "Program working directory"
-                },
-                "env": {
-                    "type": "object",
-                    "description": "Additional environment variables",
-                    "patternProperties": {
-                        ".*": {
-                            "type": "string"
-                        }
-                    }
-                },
-                "envFile": {
-                    "type": "string",
-                    "description": "File to read the environment variables from"
-                },
-                "stdio": {
-                    "type": ["null", "string", "array", "object"],
-                    "description": "Destination for stdio streams: null = send to debugger console or a terminal, \"<path>\" = attach to a file/tty/fifo"
-                },
-                "terminal": {
-                    "type": "string",
-                    "enum": ["integrated", "console"],
-                    "description": "Terminal type to use",
-                    "default": "integrated"
-                },
-                "console": {
-                    "type": "string",
-                    "enum": ["integratedTerminal", "internalConsole"],
-                    "description": "Terminal type to use (compatibility alias of 'terminal')"
-                },
-                "stopOnEntry": {
-                    "type": "boolean",
-                    "description": "Automatically stop debuggee after launch",
-                    "default": false
-                },
-                "initCommands": {
-                    "type": "array",
-                    "description": "Initialization commands executed upon debugger startup",
-                    "items": {
-                        "type": "string"
-                    }
-                },
-                "targetCreateCommands": {
-                    "type": "array",
-                    "description": "Commands that create the debug target",
-                    "items": {
-                        "type": "string"
-                    }
-                },
-                "preRunCommands": {
-                    "type": "array",
-                    "description": "Commands executed just before the program is launched",
-                    "items": {
-                        "type": "string"
-                    }
-                },
-                "processCreateCommands": {
-                    "type": "array",
-                    "description": "Commands that create the debuggee process",
-                    "items": {
-                        "type": "string"
-                    }
-                },
-                "postRunCommands": {
-                    "type": "array",
-                    "description": "Commands executed just after the program has been launched",
-                    "items": {
-                        "type": "string"
-                    }
-                },
-                "preTerminateCommands": {
-                    "type": "array",
-                    "description": "Commands executed just before the debuggee is terminated or disconnected from",
-                    "items": {
-                        "type": "string"
-                    }
-                },
-                "exitCommands": {
-                    "type": "array",
-                    "description": "Commands executed at the end of debugging session",
-                    "items": {
-                        "type": "string"
-                    }
-                },
-                "expressions": {
-                    "type": "string",
-                    "enum": ["simple", "python", "native"],
-                    "description": "The default evaluator type used for expressions"
-                },
-                "sourceMap": {
-                    "type": "object",
-                    "description": "Source path remapping between the build machine and the local machine",
-                    "patternProperties": {
-                        ".*": {
-                            "type": ["string", "null"]
-                        }
-                    }
-                },
-                "relativePathBase": {
-                    "type": "string",
-                    "description": "Base directory used for resolution of relative source paths. Defaults to the workspace folder"
-                },
-                "sourceLanguages": {
-                    "type": "array",
-                    "description": "A list of source languages to enable language-specific features for",
-                    "items": {
-                        "type": "string"
-                    }
-                },
-                "reverseDebugging": {
-                    "type": "boolean",
-                    "description": "Enable reverse debugging",
-                    "default": false
-                },
-                "breakpointMode": {
-                    "type": "string",
-                    "enum": ["path", "file"],
-                    "description": "Specifies how source breakpoints should be set"
-                },
-                "pid": {
-                    "type": ["integer", "string"],
-                    "description": "Process id to attach to"
-                },
-                "waitFor": {
-                    "type": "boolean",
-                    "description": "Wait for the process to launch (MacOS only)",
-                    "default": false
-                }
-            },
-            "required": ["request"],
-            "allOf": [
-                {
-                    "if": {
-                        "properties": {
-                            "request": {
-                                "enum": ["launch"]
-                            }
-                        }
-                    },
-                    "then": {
-                        "oneOf": [
-                            {
-                                "required": ["program"]
-                            },
-                            {
-                                "required": ["targetCreateCommands"]
-                            }
-                        ]
-                    }
-                },
-                {
-                    "if": {
-                        "properties": {
-                            "request": {
-                                "enum": ["attach"]
-                            }
-                        }
-                    },
-                    "then": {
-                        "oneOf": [
-                            {
-                                "required": ["pid"]
-                            },
-                            {
-                                "required": ["program"]
-                            }
-                        ]
-                    }
-                }
-            ]
-        })
-    }
-
-    async fn get_binary(
-        &self,
-        delegate: &Arc<dyn DapDelegate>,
-        config: &DebugTaskDefinition,
-        user_installed_path: Option<PathBuf>,
-        user_args: Option<Vec<String>>,
-        user_env: Option<HashMap<String, String>>,
-        _: &mut AsyncApp,
-    ) -> Result<DebugAdapterBinary> {
-        let mut command = user_installed_path
-            .map(|p| p.to_string_lossy().into_owned())
-            .or(self.path_to_codelldb.get().cloned());
-
-        if command.is_none() {
-            delegate.output_to_console(format!("Checking latest version of {}...", self.name()));
-            let adapter_path = paths::debug_adapters_dir().join(&Self::ADAPTER_NAME);
-            let version_path = match self.fetch_latest_adapter_version(delegate).await {
-                Ok(version) => {
-                    adapters::download_adapter_from_github(
-                        self.name(),
-                        version.clone(),
-                        adapters::DownloadedFileType::Vsix,
-                        delegate.as_ref(),
-                    )
-                    .await?;
-                    let version_path =
-                        adapter_path.join(format!("{}_{}", Self::ADAPTER_NAME, version.tag_name));
-                    remove_matching(&adapter_path, |entry| entry != version_path).await;
-                    version_path
-                }
-                Err(e) => {
-                    delegate.output_to_console("Unable to fetch latest version".to_string());
-                    log::error!("Error fetching latest version of {}: {}", self.name(), e);
-                    delegate.output_to_console(format!(
-                        "Searching for adapters in: {}",
-                        adapter_path.display()
-                    ));
-                    let mut paths = delegate
-                        .fs()
-                        .read_dir(&adapter_path)
-                        .await
-                        .context("No cached adapter directory")?;
-                    paths
-                        .next()
-                        .await
-                        .context("No cached adapter found")?
-                        .context("No cached adapter found")?
-                }
-            };
-            let adapter_dir = version_path.join("extension").join("adapter");
-            let path = adapter_dir.join("codelldb").to_string_lossy().into_owned();
-            self.path_to_codelldb.set(path.clone()).ok();
-            command = Some(path);
-        };
-        let mut json_config = config.config.clone();
-
-        Ok(DebugAdapterBinary {
-            command: Some(command.unwrap()),
-            cwd: Some(delegate.worktree_root_path().to_path_buf()),
-            arguments: user_args.unwrap_or_else(|| {
-                if let Some(config) = json_config.as_object_mut()
-                    && let Some(source_languages) = config.get("sourceLanguages").filter(|value| {
-                        value
-                            .as_array()
-                            .is_some_and(|array| array.iter().all(Value::is_string))
-                    })
-                {
-                    let ret = vec![
-                        "--settings".into(),
-                        json!({"sourceLanguages": source_languages}).to_string(),
-                    ];
-                    config.remove("sourceLanguages");
-                    ret
-                } else {
-                    vec![]
-                }
-            }),
-            request_args: self
-                .request_args(delegate, json_config, &config.label)
-                .await?,
-            envs: user_env.unwrap_or_default(),
-            connection: None,
-        })
-    }
-}
diff --git a/crates/dap_adapters/src/dap_adapters.rs b/crates/dap_adapters/src/dap_adapters.rs
deleted file mode 100644
index 2ab9cabc19..0000000000
--- a/crates/dap_adapters/src/dap_adapters.rs
+++ /dev/null
@@ -1,104 +0,0 @@
-mod codelldb;
-mod gdb;
-mod go;
-mod javascript;
-mod python;
-
-#[cfg(test)]
-use std::path::PathBuf;
-use std::sync::Arc;
-
-use anyhow::Result;
-use async_trait::async_trait;
-use codelldb::CodeLldbDebugAdapter;
-use dap::{
-    DapRegistry,
-    adapters::{
-        self, AdapterVersion, DapDelegate, DebugAdapter, DebugAdapterBinary, DebugAdapterName,
-    },
-    configure_tcp_connection,
-};
-use gdb::GdbDebugAdapter;
-use go::GoDebugAdapter;
-use gpui::{App, BorrowAppContext};
-use javascript::JsDebugAdapter;
-use python::PythonDebugAdapter;
-use serde_json::json;
-use task::{DebugScenario, ZedDebugConfig};
-
-pub fn init(cx: &mut App) {
-    cx.update_default_global(|registry: &mut DapRegistry, _cx| {
-        registry.add_adapter(Arc::from(CodeLldbDebugAdapter::default()));
-        registry.add_adapter(Arc::from(PythonDebugAdapter::default()));
-        registry.add_adapter(Arc::from(JsDebugAdapter::default()));
-        registry.add_adapter(Arc::from(GoDebugAdapter::default()));
-        registry.add_adapter(Arc::from(GdbDebugAdapter));
-
-        #[cfg(any(test, feature = "test-support"))]
-        {
-            registry.add_adapter(Arc::from(dap::FakeAdapter {}));
-        }
-    })
-}
-
-#[cfg(test)]
-mod test_mocks {
-    use super::*;
-
-    pub(crate) struct MockDelegate {
-        worktree_root: PathBuf,
-    }
-
-    impl MockDelegate {
-        pub(crate) fn new() -> Arc<dyn adapters::DapDelegate> {
-            Arc::new(Self {
-                worktree_root: PathBuf::from("/tmp/test"),
-            })
-        }
-    }
-
-    #[async_trait::async_trait]
-    impl adapters::DapDelegate for MockDelegate {
-        fn worktree_id(&self) -> settings::WorktreeId {
-            settings::WorktreeId::from_usize(0)
-        }
-
-        fn worktree_root_path(&self) -> &std::path::Path {
-            &self.worktree_root
-        }
-
-        fn http_client(&self) -> Arc<dyn http_client::HttpClient> {
-            unimplemented!("Not needed for tests")
-        }
-
-        fn node_runtime(&self) -> node_runtime::NodeRuntime {
-            unimplemented!("Not needed for tests")
-        }
-
-        fn toolchain_store(&self) -> Arc<dyn language::LanguageToolchainStore> {
-            unimplemented!("Not needed for tests")
-        }
-
-        fn fs(&self) -> Arc<dyn fs::Fs> {
-            unimplemented!("Not needed for tests")
-        }
-
-        fn output_to_console(&self, _msg: String) {}
-
-        async fn which(&self, _command: &std::ffi::OsStr) -> Option<PathBuf> {
-            None
-        }
-
-        async fn read_text_file(&self, _path: &util::rel_path::RelPath) -> Result<String> {
-            Ok(String::new())
-        }
-
-        async fn shell_env(&self) -> collections::HashMap<String, String> {
-            collections::HashMap::default()
-        }
-
-        fn is_headless(&self) -> bool {
-            false
-        }
-    }
-}
diff --git a/crates/dap_adapters/src/gdb.rs b/crates/dap_adapters/src/gdb.rs
deleted file mode 100644
index 46488cd550..0000000000
--- a/crates/dap_adapters/src/gdb.rs
+++ /dev/null
@@ -1,265 +0,0 @@
-use anyhow::{Context as _, Result, bail};
-use async_trait::async_trait;
-use collections::HashMap;
-use dap::{StartDebuggingRequestArguments, adapters::DebugTaskDefinition};
-use gpui::AsyncApp;
-use std::ffi::OsStr;
-use task::{DebugScenario, ZedDebugConfig};
-
-use crate::*;
-
-#[derive(Default)]
-pub(crate) struct GdbDebugAdapter;
-
-impl GdbDebugAdapter {
-    const ADAPTER_NAME: &'static str = "GDB";
-}
-
-/// Ensures that "-i=dap" is present in the GDB argument list.
-fn ensure_dap_interface(mut gdb_args: Vec<String>) -> Vec<String> {
-    if !gdb_args.iter().any(|arg| arg.trim() == "-i=dap") {
-        gdb_args.insert(0, "-i=dap".to_string());
-    }
-    gdb_args
-}
-
-#[async_trait(?Send)]
-impl DebugAdapter for GdbDebugAdapter {
-    fn name(&self) -> DebugAdapterName {
-        DebugAdapterName(Self::ADAPTER_NAME.into())
-    }
-
-    async fn config_from_zed_format(&self, zed_scenario: ZedDebugConfig) -> Result<DebugScenario> {
-        let mut obj = serde_json::Map::default();
-
-        match &zed_scenario.request {
-            dap::DebugRequest::Attach(attach) => {
-                obj.insert("request".into(), "attach".into());
-                obj.insert("pid".into(), attach.process_id.into());
-            }
-
-            dap::DebugRequest::Launch(launch) => {
-                obj.insert("request".into(), "launch".into());
-                obj.insert("program".into(), launch.program.clone().into());
-
-                if !launch.args.is_empty() {
-                    obj.insert("args".into(), launch.args.clone().into());
-                }
-
-                if !launch.env.is_empty() {
-                    obj.insert("env".into(), launch.env_json());
-                }
-
-                if let Some(stop_on_entry) = zed_scenario.stop_on_entry {
-                    obj.insert(
-                        "stopAtBeginningOfMainSubprogram".into(),
-                        stop_on_entry.into(),
-                    );
-                }
-                if let Some(cwd) = launch.cwd.as_ref() {
-                    obj.insert("cwd".into(), cwd.to_string_lossy().into_owned().into());
-                }
-            }
-        }
-
-        Ok(DebugScenario {
-            adapter: zed_scenario.adapter,
-            label: zed_scenario.label,
-            build: None,
-            config: serde_json::Value::Object(obj),
-            tcp_connection: None,
-        })
-    }
-
-    fn dap_schema(&self) -> serde_json::Value {
-        json!({
-            "oneOf": [
-                {
-                    "allOf": [
-                        {
-                            "type": "object",
-                            "required": ["request"],
-                            "properties": {
-                                "request": {
-                                    "type": "string",
-                                    "enum": ["launch"],
-                                    "description": "Request to launch a new process"
-                                }
-                            }
-                        },
-                        {
-                            "type": "object",
-                            "properties": {
-                                "program": {
-                                    "type": "string",
-                                    "description": "The program to debug. This corresponds to the GDB 'file' command."
-                                },
-                                "args": {
-                                    "type": "array",
-                                    "items": {
-                                        "type": "string"
-                                    },
-                                    "description": "Command line arguments passed to the program. These strings are provided as command-line arguments to the inferior.",
-                                    "default": []
-                                },
-                                "cwd": {
-                                    "type": "string",
-                                    "description": "Working directory for the debugged program. GDB will change its working directory to this directory."
-                                },
-                                "gdb_path": {
-                                    "type": "string",
-                                    "description": "Alternative path to the GDB executable, if the one in standard path is not desirable"
-                                },
-                                "gdb_args": {
-                                    "type": "array",
-                                    "items": {
-                                        "type":"string"
-                                    },
-                                    "description": "additional arguments given to GDB at startup, not the program debugged",
-                                    "default": []
-                                },
-                                "env": {
-                                    "type": "object",
-                                    "description": "Environment variables for the debugged program. Each key is the name of an environment variable; each value is the value of that variable."
-                                },
-                                "stopAtBeginningOfMainSubprogram": {
-                                    "type": "boolean",
-                                    "description": "When true, GDB will set a temporary breakpoint at the program's main procedure, like the 'start' command.",
-                                    "default": false
-                                },
-                                "stopOnEntry": {
-                                    "type": "boolean",
-                                    "description": "When true, GDB will set a temporary breakpoint at the program's first instruction, like the 'starti' command.",
-                                    "default": false
-                                }
-                            },
-                            "required": ["program"]
-                        }
-                    ]
-                },
-                {
-                    "allOf": [
-                        {
-                            "type": "object",
-                            "required": ["request"],
-                            "properties": {
-                                "request": {
-                                    "type": "string",
-                                    "enum": ["attach"],
-                                    "description": "Request to attach to an existing process"
-                                }
-                            }
-                        },
-                        {
-                            "type": "object",
-                            "properties": {
-                                "pid": {
-                                    "type": "number",
-                                    "description": "The process ID to which GDB should attach."
-                                },
-                                "program": {
-                                    "type": "string",
-                                    "description": "The program to debug (optional). This corresponds to the GDB 'file' command. In many cases, GDB can determine which program is running automatically."
-                                },
-                                "target": {
-                                    "type": "string",
-                                    "description": "The target to which GDB should connect. This is passed to the 'target remote' command."
-                                }
-                            },
-                            "required": ["pid"]
-                        }
-                    ]
-                }
-            ]
-        })
-    }
-
-    async fn get_binary(
-        &self,
-        delegate: &Arc<dyn DapDelegate>,
-        config: &DebugTaskDefinition,
-        user_installed_path: Option<std::path::PathBuf>,
-        user_args: Option<Vec<String>>,
-        user_env: Option<HashMap<String, String>>,
-        _: &mut AsyncApp,
-    ) -> Result<DebugAdapterBinary> {
-        // Try to get gdb_path from config
-        let gdb_path_from_config = config
-            .config
-            .get("gdb_path")
-            .and_then(|v| v.as_str())
-            .map(|s| s.to_string());
-
-        let gdb_path = if let Some(path) = gdb_path_from_config {
-            path
-        } else {
-            // Original logic: use user_installed_path or search in system path
-            let user_setting_path = user_installed_path
-                .filter(|p| p.exists())
-                .and_then(|p| p.to_str().map(|s| s.to_string()));
-
-            let gdb_path_result = delegate
-                .which(OsStr::new("gdb"))
-                .await
-                .and_then(|p| p.to_str().map(|s| s.to_string()))
-                .context("Could not find gdb in path");
-
-            if gdb_path_result.is_err() && user_setting_path.is_none() {
-                bail!("Could not find gdb path or it's not installed");
-            }
-
-            user_setting_path.unwrap_or_else(|| gdb_path_result.unwrap())
-        };
-
-        // Arguments: use gdb_args from config if present, else user_args, else default
-        let gdb_args = {
-            let args = config
-                .config
-                .get("gdb_args")
-                .and_then(|v| v.as_array())
-                .map(|arr| {
-                    arr.iter()
-                        .filter_map(|v| v.as_str().map(|s| s.to_string()))
-                        .collect::<Vec<_>>()
-                })
-                .or(user_args.clone())
-                .unwrap_or_else(|| vec!["-i=dap".into()]);
-            ensure_dap_interface(args)
-        };
-
-        let mut configuration = config.config.clone();
-        if let Some(configuration) = configuration.as_object_mut() {
-            configuration
-                .entry("cwd")
-                .or_insert_with(|| delegate.worktree_root_path().to_string_lossy().into());
-        }
-
-        let mut base_env = delegate.shell_env().await;
-        base_env.extend(user_env.unwrap_or_default());
-
-        let config_env: HashMap<String, String> = config
-            .config
-            .get("env")
-            .and_then(|v| v.as_object())
-            .map(|obj| {
-                obj.iter()
-                    .filter_map(|(k, v)| v.as_str().map(|s| (k.clone(), s.to_string())))
-                    .collect::<HashMap<String, String>>()
-            })
-            .unwrap_or_else(HashMap::default);
-
-        base_env.extend(config_env);
-
-        Ok(DebugAdapterBinary {
-            command: Some(gdb_path),
-            arguments: gdb_args,
-            envs: base_env,
-            cwd: Some(delegate.worktree_root_path().to_path_buf()),
-            connection: None,
-            request_args: StartDebuggingRequestArguments {
-                request: self.request_kind(&config.config).await?,
-                configuration,
-            },
-        })
-    }
-}
diff --git a/crates/dap_adapters/src/go.rs b/crates/dap_adapters/src/go.rs
deleted file mode 100644
index d3253d5fe2..0000000000
--- a/crates/dap_adapters/src/go.rs
+++ /dev/null
@@ -1,590 +0,0 @@
-use anyhow::{Context as _, bail};
-use collections::HashMap;
-use dap::{
-    StartDebuggingRequestArguments,
-    adapters::{
-        DebugTaskDefinition, DownloadedFileType, TcpArguments, download_adapter_from_github,
-        latest_github_release,
-    },
-};
-use fs::Fs;
-use gpui::{AsyncApp, SharedString};
-use language::LanguageName;
-use log::warn;
-use serde_json::{Map, Value};
-use task::TcpArgumentsTemplate;
-use util;
-
-use std::{
-    env::consts,
-    ffi::OsStr,
-    path::{Path, PathBuf},
-    str::FromStr,
-    sync::OnceLock,
-};
-
-use crate::*;
-
-#[derive(Default, Debug)]
-pub(crate) struct GoDebugAdapter {
-    shim_path: OnceLock<PathBuf>,
-}
-
-impl GoDebugAdapter {
-    const ADAPTER_NAME: &'static str = "Delve";
-    async fn fetch_latest_adapter_version(
-        delegate: &Arc<dyn DapDelegate>,
-    ) -> Result<AdapterVersion> {
-        let release = latest_github_release(
-            "zed-industries/delve-shim-dap",
-            true,
-            false,
-            delegate.http_client(),
-        )
-        .await?;
-
-        let os = match consts::OS {
-            "macos" => "apple-darwin",
-            "linux" => "unknown-linux-gnu",
-            "windows" => "pc-windows-msvc",
-            other => bail!("Running on unsupported os: {other}"),
-        };
-        let suffix = if consts::OS == "windows" {
-            ".zip"
-        } else {
-            ".tar.gz"
-        };
-        let asset_name = format!("delve-shim-dap-{}-{os}{suffix}", consts::ARCH);
-        let asset = release
-            .assets
-            .iter()
-            .find(|asset| asset.name == asset_name)
-            .with_context(|| format!("no asset found matching `{asset_name:?}`"))?;
-
-        Ok(AdapterVersion {
-            tag_name: release.tag_name,
-            url: asset.browser_download_url.clone(),
-        })
-    }
-    async fn install_shim(&self, delegate: &Arc<dyn DapDelegate>) -> anyhow::Result<PathBuf> {
-        if let Some(path) = self.shim_path.get().cloned() {
-            return Ok(path);
-        }
-
-        let asset = Self::fetch_latest_adapter_version(delegate).await?;
-        let ty = if consts::OS == "windows" {
-            DownloadedFileType::Zip
-        } else {
-            DownloadedFileType::GzipTar
-        };
-        download_adapter_from_github(
-            "delve-shim-dap".into(),
-            asset.clone(),
-            ty,
-            delegate.as_ref(),
-        )
-        .await?;
-
-        let path = paths::debug_adapters_dir()
-            .join("delve-shim-dap")
-            .join(format!("delve-shim-dap_{}", asset.tag_name))
-            .join(format!("delve-shim-dap{}", std::env::consts::EXE_SUFFIX));
-        self.shim_path.set(path.clone()).ok();
-
-        Ok(path)
-    }
-}
-
-#[async_trait(?Send)]
-impl DebugAdapter for GoDebugAdapter {
-    fn name(&self) -> DebugAdapterName {
-        DebugAdapterName(Self::ADAPTER_NAME.into())
-    }
-
-    fn adapter_language_name(&self) -> Option<LanguageName> {
-        Some(SharedString::new_static("Go").into())
-    }
-
-    fn dap_schema(&self) -> serde_json::Value {
-        // Create common properties shared between launch and attach
-        let common_properties = json!({
-            "debugAdapter": {
-                "enum": ["legacy", "dlv-dap"],
-                "description": "Select which debug adapter to use with this configuration.",
-                "default": "dlv-dap"
-            },
-            "stopOnEntry": {
-                "type": "boolean",
-                "description": "Automatically stop program after launch or attach.",
-                "default": false
-            },
-            "showLog": {
-                "type": "boolean",
-                "description": "Show log output from the delve debugger. Maps to dlv's `--log` flag.",
-                "default": false
-            },
-            "cwd": {
-                "type": "string",
-                "description": "Workspace relative or absolute path to the working directory of the program being debugged.",
-                "default": "${ZED_WORKTREE_ROOT}"
-            },
-            "dlvFlags": {
-                "type": "array",
-                "description": "Extra flags for `dlv`. See `dlv help` for the full list of supported flags.",
-                "items": {
-                    "type": "string"
-                },
-                "default": []
-            },
-            "port": {
-                "type": "number",
-                "description": "Debug server port. For remote configurations, this is where to connect.",
-                "default": 2345
-            },
-            "host": {
-                "type": "string",
-                "description": "Debug server host. For remote configurations, this is where to connect.",
-                "default": "127.0.0.1"
-            },
-            "substitutePath": {
-                "type": "array",
-                "items": {
-                    "type": "object",
-                    "properties": {
-                        "from": {
-                            "type": "string",
-                            "description": "The absolute local path to be replaced."
-                        },
-                        "to": {
-                            "type": "string",
-                            "description": "The absolute remote path to replace with."
-                        }
-                    }
-                },
-                "description": "Mappings from local to remote paths for debugging.",
-                "default": []
-            },
-            "trace": {
-                "type": "string",
-                "enum": ["verbose", "trace", "log", "info", "warn", "error"],
-                "default": "error",
-                "description": "Debug logging level."
-            },
-            "backend": {
-                "type": "string",
-                "enum": ["default", "native", "lldb", "rr"],
-                "description": "Backend used by delve. Maps to `dlv`'s `--backend` flag."
-            },
-            "logOutput": {
-                "type": "string",
-                "enum": ["debugger", "gdbwire", "lldbout", "debuglineerr", "rpc", "dap"],
-                "description": "Components that should produce debug output.",
-                "default": "debugger"
-            },
-            "logDest": {
-                "type": "string",
-                "description": "Log destination for delve."
-            },
-            "stackTraceDepth": {
-                "type": "number",
-                "description": "Maximum depth of stack traces.",
-                "default": 50
-            },
-            "showGlobalVariables": {
-                "type": "boolean",
-                "default": false,
-                "description": "Show global package variables in variables pane."
-            },
-            "showRegisters": {
-                "type": "boolean",
-                "default": false,
-                "description": "Show register variables in variables pane."
-            },
-            "hideSystemGoroutines": {
-                "type": "boolean",
-                "default": false,
-                "description": "Hide system goroutines from call stack view."
-            },
-            "console": {
-                "default": "internalConsole",
-                "description": "Where to launch the debugger.",
-                "enum": ["internalConsole", "integratedTerminal"]
-            },
-            "asRoot": {
-                "default": false,
-                "description": "Debug with elevated permissions (on Unix).",
-                "type": "boolean"
-            }
-        });
-
-        // Create launch-specific properties
-        let launch_properties = json!({
-            "program": {
-                "type": "string",
-                "description": "Path to the program folder or file to debug.",
-                "default": "${ZED_WORKTREE_ROOT}"
-            },
-            "args": {
-                "type": ["array", "string"],
-                "description": "Command line arguments for the program.",
-                "items": {
-                    "type": "string"
-                },
-                "default": []
-            },
-            "env": {
-                "type": "object",
-                "description": "Environment variables for the debugged program.",
-                "default": {}
-            },
-            "envFile": {
-                "type": ["string", "array"],
-                "items": {
-                    "type": "string"
-                },
-                "description": "Path(s) to files with environment variables.",
-                "default": ""
-            },
-            "buildFlags": {
-                "type": ["string", "array"],
-                "items": {
-                    "type": "string"
-                },
-                "description": "Flags for the Go compiler.",
-                "default": []
-            },
-            "output": {
-                "type": "string",
-                "description": "Output path for the binary.",
-                "default": "debug"
-            },
-            "mode": {
-                "enum": [ "debug", "test", "exec", "replay", "core"],
-                "description": "Debug mode for launch configuration.",
-            },
-            "traceDirPath": {
-                "type": "string",
-                "description": "Directory for record trace (for 'replay' mode).",
-                "default": ""
-            },
-            "coreFilePath": {
-                "type": "string",
-                "description": "Path to core dump file (for 'core' mode).",
-                "default": ""
-            }
-        });
-
-        // Create attach-specific properties
-        let attach_properties = json!({
-            "processId": {
-                "anyOf": [
-                    {
-                        "enum": ["${command:pickProcess}", "${command:pickGoProcess}"],
-                        "description": "Use process picker to select a process."
-                    },
-                    {
-                        "type": "string",
-                        "description": "Process name to attach to."
-                    },
-                    {
-                        "type": "number",
-                        "description": "Process ID to attach to."
-                    }
-                ],
-                "default": 0
-            },
-            "mode": {
-                "enum": ["local", "remote"],
-                "description": "Local or remote debugging.",
-                "default": "local"
-            },
-            "remotePath": {
-                "type": "string",
-                "description": "Path to source on remote machine.",
-                "markdownDeprecationMessage": "Use `substitutePath` instead.",
-                "default": ""
-            }
-        });
-
-        // Create the final schema
-        json!({
-            "oneOf": [
-                {
-                    "allOf": [
-                        {
-                            "type": "object",
-                            "required": ["request"],
-                            "properties": {
-                                "request": {
-                                    "type": "string",
-                                    "enum": ["launch"],
-                                    "description": "Request to launch a new process"
-                                }
-                            }
-                        },
-                        {
-                            "type": "object",
-                            "properties": common_properties
-                        },
-                        {
-                            "type": "object",
-                            "required": ["program", "mode"],
-                            "properties": launch_properties
-                        }
-                    ]
-                },
-                {
-                    "allOf": [
-                        {
-                            "type": "object",
-                            "required": ["request"],
-                            "properties": {
-                                "request": {
-                                    "type": "string",
-                                    "enum": ["attach"],
-                                    "description": "Request to attach to an existing process"
-                                }
-                            }
-                        },
-                        {
-                            "type": "object",
-                            "properties": common_properties
-                        },
-                        {
-                            "type": "object",
-                            "required": ["mode"],
-                            "properties": attach_properties
-                        }
-                    ]
-                }
-            ]
-        })
-    }
-
-    async fn config_from_zed_format(&self, zed_scenario: ZedDebugConfig) -> Result<DebugScenario> {
-        let mut args = match &zed_scenario.request {
-            dap::DebugRequest::Attach(attach_config) => {
-                json!({
-                    "request": "attach",
-                    "mode": "local",
-                    "processId": attach_config.process_id,
-                })
-            }
-            dap::DebugRequest::Launch(launch_config) => {
-                let mode = if launch_config.program != "." {
-                    "exec"
-                } else {
-                    "debug"
-                };
-
-                json!({
-                    "request": "launch",
-                    "mode": mode,
-                    "program": launch_config.program,
-                    "cwd": launch_config.cwd,
-                    "args": launch_config.args,
-                    "env": launch_config.env_json()
-                })
-            }
-        };
-
-        let map = args.as_object_mut().unwrap();
-
-        if let Some(stop_on_entry) = zed_scenario.stop_on_entry {
-            map.insert("stopOnEntry".into(), stop_on_entry.into());
-        }
-
-        Ok(DebugScenario {
-            adapter: zed_scenario.adapter,
-            label: zed_scenario.label,
-            build: None,
-            config: args,
-            tcp_connection: None,
-        })
-    }
-
-    async fn get_binary(
-        &self,
-        delegate: &Arc<dyn DapDelegate>,
-        task_definition: &DebugTaskDefinition,
-        user_installed_path: Option<PathBuf>,
-        user_args: Option<Vec<String>>,
-        user_env: Option<HashMap<String, String>>,
-        _cx: &mut AsyncApp,
-    ) -> Result<DebugAdapterBinary> {
-        let adapter_path = paths::debug_adapters_dir().join(&Self::ADAPTER_NAME);
-        let dlv_path = adapter_path.join("dlv");
-
-        let delve_path = if let Some(path) = user_installed_path {
-            path.to_string_lossy().into_owned()
-        } else if let Some(path) = delegate.which(OsStr::new("dlv")).await {
-            path.to_string_lossy().into_owned()
-        } else if delegate.fs().is_file(&dlv_path).await {
-            dlv_path.to_string_lossy().into_owned()
-        } else {
-            let go = delegate
-                .which(OsStr::new("go"))
-                .await
-                .context("Go not found in path. Please install Go first, then Dlv will be installed automatically.")?;
-
-            let adapter_path = paths::debug_adapters_dir().join(&Self::ADAPTER_NAME);
-
-            let install_output = util::command::new_smol_command(&go)
-                .env("GO111MODULE", "on")
-                .env("GOBIN", &adapter_path)
-                .args(&["install", "github.com/go-delve/delve/cmd/dlv@latest"])
-                .output()
-                .await?;
-
-            if !install_output.status.success() {
-                bail!(
-                    "failed to install dlv via `go install`. stdout: {:?}, stderr: {:?}\n Please try installing it manually using 'go install github.com/go-delve/delve/cmd/dlv@latest'",
-                    String::from_utf8_lossy(&install_output.stdout),
-                    String::from_utf8_lossy(&install_output.stderr)
-                );
-            }
-
-            adapter_path.join("dlv").to_string_lossy().into_owned()
-        };
-
-        let cwd = Some(
-            task_definition
-                .config
-                .get("cwd")
-                .and_then(|s| s.as_str())
-                .map(PathBuf::from)
-                .unwrap_or_else(|| delegate.worktree_root_path().to_path_buf()),
-        );
-
-        let arguments;
-        let command;
-        let connection;
-
-        let mut configuration = task_definition.config.clone();
-        let mut envs = user_env.unwrap_or_default();
-
-        if let Some(configuration) = configuration.as_object_mut() {
-            configuration
-                .entry("cwd")
-                .or_insert_with(|| delegate.worktree_root_path().to_string_lossy().into());
-
-            handle_envs(
-                configuration,
-                &mut envs,
-                cwd.as_deref(),
-                delegate.fs().clone(),
-            )
-            .await;
-        }
-
-        if let Some(connection_options) = &task_definition.tcp_connection {
-            command = None;
-            arguments = vec![];
-            let (host, port, timeout) =
-                crate::configure_tcp_connection(connection_options.clone()).await?;
-            connection = Some(TcpArguments {
-                host,
-                port,
-                timeout,
-            });
-        } else {
-            let minidelve_path = self.install_shim(delegate).await?;
-            let (host, port, _) =
-                crate::configure_tcp_connection(TcpArgumentsTemplate::default()).await?;
-            command = Some(minidelve_path.to_string_lossy().into_owned());
-            connection = None;
-            arguments = if let Some(mut args) = user_args {
-                args.insert(0, delve_path);
-                args
-            } else if cfg!(windows) {
-                vec![
-                    delve_path,
-                    "dap".into(),
-                    "--listen".into(),
-                    format!("{}:{}", host, port),
-                    "--headless".into(),
-                ]
-            } else {
-                vec![
-                    delve_path,
-                    "dap".into(),
-                    "--listen".into(),
-                    format!("{}:{}", host, port),
-                ]
-            };
-        }
-        Ok(DebugAdapterBinary {
-            command,
-            arguments,
-            cwd,
-            envs,
-            connection,
-            request_args: StartDebuggingRequestArguments {
-                configuration,
-                request: self.request_kind(&task_definition.config).await?,
-            },
-        })
-    }
-}
-
-// delve doesn't do anything with the envFile setting, so we intercept it
-async fn handle_envs(
-    config: &mut Map<String, Value>,
-    envs: &mut HashMap<String, String>,
-    cwd: Option<&Path>,
-    fs: Arc<dyn Fs>,
-) -> Option<()> {
-    let env_files = match config.get("envFile")? {
-        Value::Array(arr) => arr.iter().map(|v| v.as_str()).collect::<Vec<_>>(),
-        Value::String(s) => vec![Some(s.as_str())],
-        _ => return None,
-    };
-
-    let rebase_path = |path: PathBuf| {
-        if path.is_absolute() {
-            Some(path)
-        } else {
-            cwd.map(|p| p.join(path))
-        }
-    };
-
-    let mut env_vars = HashMap::default();
-    for path in env_files {
-        let Some(path) = path
-            .and_then(|s| PathBuf::from_str(s).ok())
-            .and_then(rebase_path)
-        else {
-            continue;
-        };
-
-        if let Ok(file) = fs.open_sync(&path).await {
-            let file_envs: HashMap<String, String> = dotenvy::from_read_iter(file)
-                .filter_map(Result::ok)
-                .collect();
-            envs.extend(file_envs.iter().map(|(k, v)| (k.clone(), v.clone())));
-            env_vars.extend(file_envs);
-        } else {
-            warn!("While starting Go debug session: failed to read env file {path:?}");
-        };
-    }
-
-    let mut env_obj: serde_json::Map<String, Value> = serde_json::Map::new();
-
-    for (k, v) in env_vars {
-        env_obj.insert(k, Value::String(v));
-    }
-
-    if let Some(existing_env) = config.get("env").and_then(|v| v.as_object()) {
-        for (k, v) in existing_env {
-            env_obj.insert(k.clone(), v.clone());
-        }
-    }
-
-    if !env_obj.is_empty() {
-        config.insert("env".to_string(), Value::Object(env_obj));
-    }
-
-    // remove envFile now that it's been handled
-    config.remove("envFile");
-    Some(())
-}
diff --git a/crates/dap_adapters/src/javascript.rs b/crates/dap_adapters/src/javascript.rs
deleted file mode 100644
index 68f5ca7e79..0000000000
--- a/crates/dap_adapters/src/javascript.rs
+++ /dev/null
@@ -1,569 +0,0 @@
-use adapters::latest_github_release;
-use anyhow::Context as _;
-use collections::HashMap;
-use dap::{StartDebuggingRequestArguments, adapters::DebugTaskDefinition};
-use gpui::AsyncApp;
-use serde_json::Value;
-use std::{path::PathBuf, sync::OnceLock};
-use task::DebugRequest;
-use util::{ResultExt, maybe, shell::ShellKind};
-
-use crate::*;
-
-#[derive(Debug, Default)]
-pub(crate) struct JsDebugAdapter {
-    checked: OnceLock<()>,
-}
-
-impl JsDebugAdapter {
-    const ADAPTER_NAME: &'static str = "JavaScript";
-    const ADAPTER_NPM_NAME: &'static str = "vscode-js-debug";
-    const ADAPTER_PATH: &'static str = "js-debug/src/dapDebugServer.js";
-
-    async fn fetch_latest_adapter_version(
-        &self,
-        delegate: &Arc<dyn DapDelegate>,
-    ) -> Result<AdapterVersion> {
-        let release = latest_github_release(
-            &format!("microsoft/{}", Self::ADAPTER_NPM_NAME),
-            true,
-            false,
-            delegate.http_client(),
-        )
-        .await?;
-
-        let asset_name = format!("js-debug-dap-{}.tar.gz", release.tag_name);
-
-        Ok(AdapterVersion {
-            tag_name: release.tag_name,
-            url: release
-                .assets
-                .iter()
-                .find(|asset| asset.name == asset_name)
-                .with_context(|| format!("no asset found matching {asset_name:?}"))?
-                .browser_download_url
-                .clone(),
-        })
-    }
-
-    async fn get_installed_binary(
-        &self,
-        delegate: &Arc<dyn DapDelegate>,
-        task_definition: &DebugTaskDefinition,
-        user_installed_path: Option<PathBuf>,
-        user_args: Option<Vec<String>>,
-        user_env: Option<HashMap<String, String>>,
-        _: &mut AsyncApp,
-    ) -> Result<DebugAdapterBinary> {
-        let tcp_connection = task_definition.tcp_connection.clone().unwrap_or_default();
-        let (host, port, timeout) = crate::configure_tcp_connection(tcp_connection).await?;
-
-        let mut envs = user_env.unwrap_or_default();
-
-        let mut configuration = task_definition.config.clone();
-        if let Some(configuration) = configuration.as_object_mut() {
-            maybe!({
-                configuration
-                    .get("type")
-                    .filter(|value| value == &"node-terminal")?;
-                let command = configuration.get("command")?.as_str()?.to_owned();
-                let mut args = ShellKind::Posix.split(&command)?.into_iter();
-                let program = args.next()?;
-                configuration.insert("runtimeExecutable".to_owned(), program.into());
-                configuration.insert(
-                    "runtimeArgs".to_owned(),
-                    args.map(Value::from).collect::<Vec<_>>().into(),
-                );
-                configuration.insert("console".to_owned(), "externalTerminal".into());
-                Some(())
-            });
-
-            configuration.entry("type").and_modify(normalize_task_type);
-
-            if let Some(program) = configuration
-                .get("program")
-                .cloned()
-                .and_then(|value| value.as_str().map(str::to_owned))
-            {
-                match program.as_str() {
-                    "npm" | "pnpm" | "yarn" | "bun"
-                        if !configuration.contains_key("runtimeExecutable")
-                            && !configuration.contains_key("runtimeArgs") =>
-                    {
-                        configuration.remove("program");
-                        configuration.insert("runtimeExecutable".to_owned(), program.into());
-                        if let Some(args) = configuration.remove("args") {
-                            configuration.insert("runtimeArgs".to_owned(), args);
-                        }
-                    }
-                    _ => {}
-                }
-            }
-
-            if let Some(env) = configuration.get("env").cloned()
-                && let Ok(env) = serde_json::from_value::<HashMap<String, String>>(env)
-            {
-                envs.extend(env.into_iter());
-            }
-
-            configuration
-                .entry("cwd")
-                .or_insert(delegate.worktree_root_path().to_string_lossy().into());
-
-            configuration
-                .entry("console")
-                .or_insert("externalTerminal".into());
-
-            configuration.entry("sourceMaps").or_insert(true.into());
-            configuration
-                .entry("pauseForSourceMap")
-                .or_insert(true.into());
-            configuration
-                .entry("sourceMapRenames")
-                .or_insert(true.into());
-
-            // Set up remote browser debugging
-            if delegate.is_headless() {
-                configuration
-                    .entry("browserLaunchLocation")
-                    .or_insert("ui".into());
-            }
-        }
-
-        let adapter_path = if let Some(user_installed_path) = user_installed_path {
-            user_installed_path
-        } else {
-            let adapter_path = paths::debug_adapters_dir().join(self.name().as_ref());
-
-            let file_name_prefix = format!("{}_", self.name());
-
-            util::fs::find_file_name_in_dir(adapter_path.as_path(), |file_name| {
-                file_name.starts_with(&file_name_prefix)
-            })
-            .await
-            .context("Couldn't find JavaScript dap directory")?
-            .join(Self::ADAPTER_PATH)
-        };
-
-        let arguments = if let Some(mut args) = user_args {
-            args.insert(0, adapter_path.to_string_lossy().into_owned());
-            args
-        } else {
-            vec![
-                adapter_path.to_string_lossy().into_owned(),
-                port.to_string(),
-                host.to_string(),
-            ]
-        };
-
-        Ok(DebugAdapterBinary {
-            command: Some(
-                delegate
-                    .node_runtime()
-                    .binary_path()
-                    .await?
-                    .to_string_lossy()
-                    .into_owned(),
-            ),
-            arguments,
-            cwd: Some(delegate.worktree_root_path().to_path_buf()),
-            envs,
-            connection: Some(adapters::TcpArguments {
-                host,
-                port,
-                timeout,
-            }),
-            request_args: StartDebuggingRequestArguments {
-                configuration,
-                request: self.request_kind(&task_definition.config).await?,
-            },
-        })
-    }
-}
-
-#[async_trait(?Send)]
-impl DebugAdapter for JsDebugAdapter {
-    fn name(&self) -> DebugAdapterName {
-        DebugAdapterName(Self::ADAPTER_NAME.into())
-    }
-
-    async fn config_from_zed_format(&self, zed_scenario: ZedDebugConfig) -> Result<DebugScenario> {
-        let mut args = json!({
-            "type": "pwa-node",
-            "request": match zed_scenario.request {
-                DebugRequest::Launch(_) => "launch",
-                DebugRequest::Attach(_) => "attach",
-            },
-        });
-
-        let map = args.as_object_mut().unwrap();
-        match &zed_scenario.request {
-            DebugRequest::Attach(attach) => {
-                map.insert("processId".into(), attach.process_id.into());
-            }
-            DebugRequest::Launch(launch) => {
-                if launch.program.starts_with("http://") {
-                    map.insert("url".into(), launch.program.clone().into());
-                } else {
-                    map.insert("program".into(), launch.program.clone().into());
-                }
-
-                if !launch.args.is_empty() {
-                    map.insert("args".into(), launch.args.clone().into());
-                }
-                if !launch.env.is_empty() {
-                    map.insert("env".into(), launch.env_json());
-                }
-
-                if let Some(stop_on_entry) = zed_scenario.stop_on_entry {
-                    map.insert("stopOnEntry".into(), stop_on_entry.into());
-                }
-                if let Some(cwd) = launch.cwd.as_ref() {
-                    map.insert("cwd".into(), cwd.to_string_lossy().into_owned().into());
-                }
-            }
-        };
-
-        Ok(DebugScenario {
-            adapter: zed_scenario.adapter,
-            label: zed_scenario.label,
-            build: None,
-            config: args,
-            tcp_connection: None,
-        })
-    }
-
-    fn dap_schema(&self) -> serde_json::Value {
-        json!({
-            "oneOf": [
-                {
-                    "allOf": [
-                        {
-                            "type": "object",
-                            "required": ["request"],
-                            "properties": {
-                                "request": {
-                                    "type": "string",
-                                    "enum": ["launch"],
-                                    "description": "Request to launch a new process"
-                                }
-                            }
-                        },
-                        {
-                            "type": "object",
-                            "properties": {
-                                "type": {
-                                    "type": "string",
-                                    "enum": ["pwa-node", "node", "chrome", "pwa-chrome", "msedge", "pwa-msedge", "node-terminal"],
-                                    "description": "The type of debug session",
-                                    "default": "pwa-node"
-                                },
-                                "program": {
-                                    "type": "string",
-                                    "description": "Path to the program or file to debug"
-                                },
-                                "cwd": {
-                                    "type": "string",
-                                    "description": "Absolute path to the working directory of the program being debugged"
-                                },
-                                "args": {
-                                    "type": ["array", "string"],
-                                    "description": "Command line arguments passed to the program",
-                                    "items": {
-                                        "type": "string"
-                                    },
-                                    "default": []
-                                },
-                                "env": {
-                                    "type": "object",
-                                    "description": "Environment variables passed to the program",
-                                    "default": {}
-                                },
-                                "envFile": {
-                                    "type": ["string", "array"],
-                                    "description": "Path to a file containing environment variable definitions",
-                                    "items": {
-                                        "type": "string"
-                                    }
-                                },
-                                "stopOnEntry": {
-                                    "type": "boolean",
-                                    "description": "Automatically stop program after launch",
-                                    "default": false
-                                },
-                                "attachSimplePort": {
-                                    "type": "number",
-                                    "description": "If set, attaches to the process via the given port. This is generally no longer necessary for Node.js programs and loses the ability to debug child processes, but can be useful in more esoteric scenarios such as with Deno and Docker launches. If set to 0, a random port will be chosen and --inspect-brk added to the launch arguments automatically."
-                                },
-                                "runtimeExecutable": {
-                                    "type": ["string", "null"],
-                                    "description": "Runtime to use, an absolute path or the name of a runtime available on PATH",
-                                    "default": "node"
-                                },
-                                "runtimeArgs": {
-                                    "type": ["array", "null"],
-                                    "description": "Arguments passed to the runtime executable",
-                                    "items": {
-                                        "type": "string"
-                                    },
-                                    "default": []
-                                },
-                                "outFiles": {
-                                    "type": "array",
-                                    "description": "Glob patterns for locating generated JavaScript files",
-                                    "items": {
-                                        "type": "string"
-                                    },
-                                    "default": ["${ZED_WORKTREE_ROOT}/**/*.js", "!**/node_modules/**"]
-                                },
-                                "sourceMaps": {
-                                    "type": "boolean",
-                                    "description": "Use JavaScript source maps if they exist",
-                                    "default": true
-                                },
-                                "pauseForSourceMap": {
-                                    "type": "boolean",
-                                    "description": "Wait for source maps to load before setting breakpoints.",
-                                    "default": true
-                                },
-                                "sourceMapRenames": {
-                                    "type": "boolean",
-                                    "description": "Whether to use the \"names\" mapping in sourcemaps.",
-                                    "default": true
-                                },
-                                "sourceMapPathOverrides": {
-                                    "type": "object",
-                                    "description": "Rewrites the locations of source files from what the sourcemap says to their locations on disk",
-                                    "default": {}
-                                },
-                                "restart": {
-                                    "type": ["boolean", "object"],
-                                    "description": "Restart session after Node.js has terminated",
-                                    "default": false
-                                },
-                                "trace": {
-                                    "type": ["boolean", "object"],
-                                    "description": "Enables logging of the Debug Adapter",
-                                    "default": false
-                                },
-                                "console": {
-                                    "type": "string",
-                                    "enum": ["internalConsole", "integratedTerminal"],
-                                    "description": "Where to launch the debug target",
-                                    "default": "internalConsole"
-                                },
-                                // Browser-specific
-                                "url": {
-                                    "type": ["string", "null"],
-                                    "description": "Will navigate to this URL and attach to it (browser debugging)"
-                                },
-                                "webRoot": {
-                                    "type": "string",
-                                    "description": "Workspace absolute path to the webserver root",
-                                    "default": "${ZED_WORKTREE_ROOT}"
-                                },
-                                "userDataDir": {
-                                    "type": ["string", "boolean"],
-                                    "description": "Path to a custom Chrome user profile (browser debugging)",
-                                    "default": true
-                                },
-                                "skipFiles": {
-                                    "type": "array",
-                                    "description": "An array of glob patterns for files to skip when debugging",
-                                    "items": {
-                                        "type": "string"
-                                    },
-                                    "default": ["<node_internals>/**"]
-                                },
-                                "timeout": {
-                                    "type": "number",
-                                    "description": "Retry for this number of milliseconds to connect to the debug adapter",
-                                    "default": 10000
-                                },
-                                "resolveSourceMapLocations": {
-                                    "type": ["array", "null"],
-                                    "description": "A list of minimatch patterns for source map resolution",
-                                    "items": {
-                                        "type": "string"
-                                    }
-                                }
-                            },
-                        }
-                    ]
-                },
-                {
-                    "allOf": [
-                        {
-                            "type": "object",
-                            "required": ["request"],
-                            "properties": {
-                                "request": {
-                                    "type": "string",
-                                    "enum": ["attach"],
-                                    "description": "Request to attach to an existing process"
-                                }
-                            }
-                        },
-                        {
-                            "type": "object",
-                            "properties": {
-                                "type": {
-                                    "type": "string",
-                                    "enum": ["pwa-node", "node", "chrome", "pwa-chrome", "edge", "pwa-edge"],
-                                    "description": "The type of debug session",
-                                    "default": "pwa-node"
-                                },
-                                "processId": {
-                                    "type": ["string", "number"],
-                                    "description": "ID of process to attach to (Node.js debugging)"
-                                },
-                                "port": {
-                                    "type": "number",
-                                    "description": "Debug port to attach to",
-                                    "default": 9229
-                                },
-                                "address": {
-                                    "type": "string",
-                                    "description": "TCP/IP address of the process to be debugged",
-                                    "default": "localhost"
-                                },
-                                "restart": {
-                                    "type": ["boolean", "object"],
-                                    "description": "Restart session after Node.js has terminated",
-                                    "default": false
-                                },
-                                "sourceMaps": {
-                                    "type": "boolean",
-                                    "description": "Use JavaScript source maps if they exist",
-                                    "default": true
-                                },
-                                "sourceMapPathOverrides": {
-                                    "type": "object",
-                                    "description": "Rewrites the locations of source files from what the sourcemap says to their locations on disk",
-                                    "default": {}
-                                },
-                                "outFiles": {
-                                    "type": "array",
-                                    "description": "Glob patterns for locating generated JavaScript files",
-                                    "items": {
-                                        "type": "string"
-                                    },
-                                    "default": ["${ZED_WORKTREE_ROOT}/**/*.js", "!**/node_modules/**"]
-                                },
-                                "url": {
-                                    "type": "string",
-                                    "description": "Will search for a page with this URL and attach to it (browser debugging)"
-                                },
-                                "webRoot": {
-                                    "type": "string",
-                                    "description": "Workspace absolute path to the webserver root",
-                                    "default": "${ZED_WORKTREE_ROOT}"
-                                },
-                                "skipFiles": {
-                                    "type": "array",
-                                    "description": "An array of glob patterns for files to skip when debugging",
-                                    "items": {
-                                        "type": "string"
-                                    },
-                                    "default": ["<node_internals>/**"]
-                                },
-                                "timeout": {
-                                    "type": "number",
-                                    "description": "Retry for this number of milliseconds to connect to the debug adapter",
-                                    "default": 10000
-                                },
-                                "resolveSourceMapLocations": {
-                                    "type": ["array", "null"],
-                                    "description": "A list of minimatch patterns for source map resolution",
-                                    "items": {
-                                        "type": "string"
-                                    }
-                                },
-                                "remoteRoot": {
-                                    "type": ["string", "null"],
-                                    "description": "Path to the remote directory containing the program"
-                                },
-                                "localRoot": {
-                                    "type": ["string", "null"],
-                                    "description": "Path to the local directory containing the program"
-                                }
-                            },
-                            "oneOf": [
-                                { "required": ["processId"] },
-                                { "required": ["port"] }
-                            ]
-                        }
-                    ]
-                }
-            ]
-        })
-    }
-
-    async fn get_binary(
-        &self,
-        delegate: &Arc<dyn DapDelegate>,
-        config: &DebugTaskDefinition,
-        user_installed_path: Option<PathBuf>,
-        user_args: Option<Vec<String>>,
-        user_env: Option<HashMap<String, String>>,
-        cx: &mut AsyncApp,
-    ) -> Result<DebugAdapterBinary> {
-        if self.checked.set(()).is_ok() {
-            delegate.output_to_console(format!("Checking latest version of {}...", self.name()));
-            if let Some(version) = self.fetch_latest_adapter_version(delegate).await.log_err() {
-                adapters::download_adapter_from_github(
-                    self.name(),
-                    version,
-                    adapters::DownloadedFileType::GzipTar,
-                    delegate.as_ref(),
-                )
-                .await?;
-            } else {
-                delegate.output_to_console(format!("{} debug adapter is up to date", self.name()));
-            }
-        }
-
-        self.get_installed_binary(
-            delegate,
-            config,
-            user_installed_path,
-            user_args,
-            user_env,
-            cx,
-        )
-        .await
-    }
-
-    fn label_for_child_session(&self, args: &StartDebuggingRequestArguments) -> Option<String> {
-        let label = args
-            .configuration
-            .get("name")?
-            .as_str()
-            .filter(|name| !name.is_empty())?;
-        Some(label.to_owned())
-    }
-
-    fn compact_child_session(&self) -> bool {
-        true
-    }
-
-    fn prefer_thread_name(&self) -> bool {
-        true
-    }
-}
-
-fn normalize_task_type(task_type: &mut Value) {
-    let Some(task_type_str) = task_type.as_str() else {
-        return;
-    };
-
-    let new_name = match task_type_str {
-        "node" | "pwa-node" | "node-terminal" => "pwa-node",
-        "chrome" | "pwa-chrome" => "pwa-chrome",
-        "edge" | "msedge" | "pwa-edge" | "pwa-msedge" => "pwa-msedge",
-        _ => task_type_str,
-    }
-    .to_owned();
-
-    *task_type = Value::String(new_name);
-}
diff --git a/crates/dap_adapters/src/python.rs b/crates/dap_adapters/src/python.rs
deleted file mode 100644
index a45e16dc32..0000000000
--- a/crates/dap_adapters/src/python.rs
+++ /dev/null
@@ -1,1125 +0,0 @@
-use crate::*;
-use anyhow::{Context as _, bail};
-use collections::HashMap;
-use dap::{DebugRequest, StartDebuggingRequestArguments, adapters::DebugTaskDefinition};
-use fs::RemoveOptions;
-use futures::{StreamExt, TryStreamExt};
-use gpui::http_client::AsyncBody;
-use gpui::{AsyncApp, SharedString};
-use json_dotpath::DotPaths;
-use language::{LanguageName, Toolchain};
-use paths::debug_adapters_dir;
-use serde_json::Value;
-use smol::fs::File;
-use smol::io::AsyncReadExt;
-use smol::lock::OnceCell;
-use std::ffi::OsString;
-use std::net::Ipv4Addr;
-use std::str::FromStr;
-use std::{
-    ffi::OsStr,
-    path::{Path, PathBuf},
-};
-use util::command::new_smol_command;
-use util::{ResultExt, paths::PathStyle, rel_path::RelPath};
-
-enum DebugpyLaunchMode<'a> {
-    Normal,
-    AttachWithConnect { host: Option<&'a str> },
-}
-
-#[derive(Default)]
-pub(crate) struct PythonDebugAdapter {
-    base_venv_path: OnceCell<Result<Arc<Path>, String>>,
-    debugpy_whl_base_path: OnceCell<Result<Arc<Path>, String>>,
-}
-
-impl PythonDebugAdapter {
-    const ADAPTER_NAME: &'static str = "Debugpy";
-    const DEBUG_ADAPTER_NAME: DebugAdapterName =
-        DebugAdapterName(SharedString::new_static(Self::ADAPTER_NAME));
-
-    const LANGUAGE_NAME: &'static str = "Python";
-
-    async fn generate_debugpy_arguments<'a>(
-        host: &'a Ipv4Addr,
-        port: u16,
-        launch_mode: DebugpyLaunchMode<'a>,
-        user_installed_path: Option<&'a Path>,
-        user_args: Option<Vec<String>>,
-    ) -> Result<Vec<String>> {
-        let mut args = if let Some(user_installed_path) = user_installed_path {
-            log::debug!(
-                "Using user-installed debugpy adapter from: {}",
-                user_installed_path.display()
-            );
-            vec![user_installed_path.to_string_lossy().into_owned()]
-        } else {
-            let adapter_path = paths::debug_adapters_dir().join(Self::DEBUG_ADAPTER_NAME.as_ref());
-            let path = adapter_path
-                .join("debugpy")
-                .join("adapter")
-                .to_string_lossy()
-                .into_owned();
-            log::debug!("Using pip debugpy adapter from: {path}");
-            vec![path]
-        };
-
-        args.extend(if let Some(args) = user_args {
-            args
-        } else {
-            match launch_mode {
-                DebugpyLaunchMode::Normal => {
-                    vec![format!("--host={}", host), format!("--port={}", port)]
-                }
-                DebugpyLaunchMode::AttachWithConnect { host } => {
-                    let mut args = vec!["connect".to_string()];
-
-                    if let Some(host) = host {
-                        args.push(format!("{host}:"));
-                    }
-                    args.push(format!("{port}"));
-                    args
-                }
-            }
-        });
-        Ok(args)
-    }
-
-    async fn request_args(
-        &self,
-        delegate: &Arc<dyn DapDelegate>,
-        task_definition: &DebugTaskDefinition,
-    ) -> Result<StartDebuggingRequestArguments> {
-        let request = self.request_kind(&task_definition.config).await?;
-
-        let mut configuration = task_definition.config.clone();
-        if let Ok(console) = configuration.dot_get_mut("console") {
-            // Use built-in Zed terminal if user did not explicitly provide a setting for console.
-            if console.is_null() {
-                *console = Value::String("integratedTerminal".into());
-            }
-        }
-
-        if let Some(obj) = configuration.as_object_mut() {
-            obj.entry("cwd")
-                .or_insert(delegate.worktree_root_path().to_string_lossy().into());
-        }
-
-        Ok(StartDebuggingRequestArguments {
-            configuration,
-            request,
-        })
-    }
-
-    async fn fetch_wheel(
-        &self,
-        toolchain: Option<Toolchain>,
-        delegate: &Arc<dyn DapDelegate>,
-    ) -> Result<Arc<Path>> {
-        let download_dir = debug_adapters_dir().join(Self::ADAPTER_NAME).join("wheels");
-        std::fs::create_dir_all(&download_dir)?;
-        let venv_python = self.base_venv_path(toolchain, delegate).await?;
-
-        let installation_succeeded = util::command::new_smol_command(venv_python.as_ref())
-            .args([
-                "-m",
-                "pip",
-                "download",
-                "debugpy",
-                "--only-binary=:all:",
-                "-d",
-                download_dir.to_string_lossy().as_ref(),
-            ])
-            .output()
-            .await
-            .context("spawn system python")?
-            .status
-            .success();
-        if !installation_succeeded {
-            bail!("debugpy installation failed (could not fetch Debugpy's wheel)");
-        }
-
-        let wheel_path = std::fs::read_dir(&download_dir)?
-            .find_map(|entry| {
-                entry.ok().filter(|e| {
-                    e.file_type().is_ok_and(|typ| typ.is_file())
-                        && Path::new(&e.file_name()).extension() == Some("whl".as_ref())
-                })
-            })
-            .with_context(|| format!("Did not find a .whl in {download_dir:?}"))?;
-
-        util::archive::extract_zip(
-            &debug_adapters_dir().join(Self::ADAPTER_NAME),
-            File::open(&wheel_path.path()).await?,
-        )
-        .await?;
-
-        Ok(Arc::from(wheel_path.path()))
-    }
-
-    async fn maybe_fetch_new_wheel(
-        &self,
-        toolchain: Option<Toolchain>,
-        delegate: &Arc<dyn DapDelegate>,
-    ) -> Result<()> {
-        let latest_release = delegate
-            .http_client()
-            .get(
-                "https://pypi.org/pypi/debugpy/json",
-                AsyncBody::empty(),
-                false,
-            )
-            .await
-            .log_err();
-        let response = latest_release
-            .filter(|response| response.status().is_success())
-            .context("getting latest release")?;
-
-        let download_dir = debug_adapters_dir().join(Self::ADAPTER_NAME);
-        std::fs::create_dir_all(&download_dir)?;
-
-        let mut output = String::new();
-        response.into_body().read_to_string(&mut output).await?;
-        let as_json = serde_json::Value::from_str(&output)?;
-        let latest_version = as_json
-            .get("info")
-            .and_then(|info| {
-                info.get("version")
-                    .and_then(|version| version.as_str())
-                    .map(ToOwned::to_owned)
-            })
-            .context("parsing latest release information")?;
-        let dist_info_dirname: OsString = format!("debugpy-{latest_version}.dist-info").into();
-        let is_up_to_date = delegate
-            .fs()
-            .read_dir(&debug_adapters_dir().join(Self::ADAPTER_NAME))
-            .await?
-            .into_stream()
-            .any(async |entry| {
-                entry.is_ok_and(|e| e.file_name().is_some_and(|name| name == dist_info_dirname))
-            })
-            .await;
-
-        if !is_up_to_date {
-            delegate
-                .fs()
-                .remove_dir(
-                    &debug_adapters_dir().join(Self::ADAPTER_NAME),
-                    RemoveOptions {
-                        recursive: true,
-                        ignore_if_not_exists: true,
-                    },
-                )
-                .await?;
-            self.fetch_wheel(toolchain, delegate).await?;
-        }
-        anyhow::Ok(())
-    }
-
-    async fn fetch_debugpy_whl(
-        &self,
-        toolchain: Option<Toolchain>,
-        delegate: &Arc<dyn DapDelegate>,
-    ) -> Result<Arc<Path>, String> {
-        self.debugpy_whl_base_path
-            .get_or_init(|| async move {
-                self.maybe_fetch_new_wheel(toolchain, delegate)
-                    .await
-                    .map_err(|e| format!("{e}"))?;
-                Ok(Arc::from(
-                    debug_adapters_dir()
-                        .join(Self::ADAPTER_NAME)
-                        .join("debugpy")
-                        .join("adapter")
-                        .as_ref(),
-                ))
-            })
-            .await
-            .clone()
-    }
-
-    async fn base_venv_path(
-        &self,
-        toolchain: Option<Toolchain>,
-        delegate: &Arc<dyn DapDelegate>,
-    ) -> Result<Arc<Path>> {
-        let result = self.base_venv_path
-            .get_or_init(|| async {
-                let base_python = if let Some(toolchain) = toolchain {
-                    toolchain.path.to_string()
-                } else {
-                    Self::system_python_name(delegate).await.ok_or_else(|| {
-                        let mut message = "Could not find a Python installation".to_owned();
-                        if cfg!(windows){
-                            message.push_str(". Install Python from the Microsoft Store, or manually from https://www.python.org/downloads/windows.")
-                        }
-                        message
-                    })?
-                };
-
-                let debug_adapter_path = paths::debug_adapters_dir().join(Self::DEBUG_ADAPTER_NAME.as_ref());
-                let output = util::command::new_smol_command(&base_python)
-                    .args(["-m", "venv", "zed_base_venv"])
-                    .current_dir(
-                        &debug_adapter_path,
-                    )
-                    .spawn()
-                    .map_err(|e| format!("{e:#?}"))?
-                    .output()
-                    .await
-                    .map_err(|e| format!("{e:#?}"))?;
-
-                if !output.status.success() {
-                    let stderr = String::from_utf8_lossy(&output.stderr);
-                    let stdout = String::from_utf8_lossy(&output.stdout);
-                    let debug_adapter_path = debug_adapter_path.display();
-                    return Err(format!("Failed to create base virtual environment with {base_python} in:\n{debug_adapter_path}\nstderr:\n{stderr}\nstdout:\n{stdout}\n"));
-                }
-
-                const PYTHON_PATH: &str = if cfg!(target_os = "windows") {
-                    "Scripts/python.exe"
-                } else {
-                    "bin/python3"
-                };
-                Ok(Arc::from(
-                    paths::debug_adapters_dir()
-                        .join(Self::DEBUG_ADAPTER_NAME.as_ref())
-                        .join("zed_base_venv")
-                        .join(PYTHON_PATH)
-                        .as_ref(),
-                ))
-            })
-            .await
-            .clone();
-        match result {
-            Ok(path) => Ok(path),
-            Err(e) => Err(anyhow::anyhow!("{e}")),
-        }
-    }
-    async fn system_python_name(delegate: &Arc<dyn DapDelegate>) -> Option<String> {
-        const BINARY_NAMES: [&str; 3] = ["python3", "python", "py"];
-        let mut name = None;
-
-        for cmd in BINARY_NAMES {
-            let Some(path) = delegate.which(OsStr::new(cmd)).await else {
-                continue;
-            };
-            // Try to detect situations where `python3` exists but is not a real Python interpreter.
-            // Notably, on fresh Windows installs, `python3` is a shim that opens the Microsoft Store app
-            // when run with no arguments, and just fails otherwise.
-            let Some(output) = new_smol_command(&path)
-                .args(["-c", "print(1 + 2)"])
-                .output()
-                .await
-                .ok()
-            else {
-                continue;
-            };
-            if output.stdout.trim_ascii() != b"3" {
-                continue;
-            }
-            name = Some(path.to_string_lossy().into_owned());
-            break;
-        }
-        name
-    }
-
-    async fn get_installed_binary(
-        &self,
-        delegate: &Arc<dyn DapDelegate>,
-        config: &DebugTaskDefinition,
-        user_installed_path: Option<PathBuf>,
-        user_args: Option<Vec<String>>,
-        user_env: Option<HashMap<String, String>>,
-        python_from_toolchain: Option<String>,
-    ) -> Result<DebugAdapterBinary> {
-        let mut tcp_connection = config.tcp_connection.clone().unwrap_or_default();
-
-        let (config_port, config_host) = config
-            .config
-            .get("connect")
-            .map(|value| {
-                (
-                    value
-                        .get("port")
-                        .and_then(|val| val.as_u64().map(|p| p as u16)),
-                    value.get("host").and_then(|val| val.as_str()),
-                )
-            })
-            .unwrap_or_else(|| {
-                (
-                    config
-                        .config
-                        .get("port")
-                        .and_then(|port| port.as_u64().map(|p| p as u16)),
-                    config.config.get("host").and_then(|host| host.as_str()),
-                )
-            });
-
-        let is_attach_with_connect = if config
-            .config
-            .get("request")
-            .is_some_and(|val| val.as_str().is_some_and(|request| request == "attach"))
-        {
-            if tcp_connection.host.is_some() && config_host.is_some() {
-                bail!("Cannot have two different hosts in debug configuration")
-            } else if tcp_connection.port.is_some() && config_port.is_some() {
-                bail!("Cannot have two different ports in debug configuration")
-            }
-
-            if let Some(hostname) = config_host {
-                tcp_connection.host = Some(hostname.parse().context("hostname must be IPv4")?);
-            }
-            tcp_connection.port = config_port;
-            DebugpyLaunchMode::AttachWithConnect { host: config_host }
-        } else {
-            DebugpyLaunchMode::Normal
-        };
-
-        let (host, port, timeout) = crate::configure_tcp_connection(tcp_connection).await?;
-
-        let python_path = if let Some(toolchain) = python_from_toolchain {
-            Some(toolchain)
-        } else {
-            Self::system_python_name(delegate).await
-        };
-
-        let python_command = python_path.context("failed to find binary path for Python")?;
-        log::debug!("Using Python executable: {}", python_command);
-
-        let arguments = Self::generate_debugpy_arguments(
-            &host,
-            port,
-            is_attach_with_connect,
-            user_installed_path.as_deref(),
-            user_args,
-        )
-        .await?;
-
-        log::debug!(
-            "Starting debugpy adapter with command: {} {}",
-            python_command,
-            arguments.join(" ")
-        );
-
-        Ok(DebugAdapterBinary {
-            command: Some(python_command),
-            arguments,
-            connection: Some(adapters::TcpArguments {
-                host,
-                port,
-                timeout,
-            }),
-            cwd: Some(delegate.worktree_root_path().to_path_buf()),
-            envs: user_env.unwrap_or_default(),
-            request_args: self.request_args(delegate, config).await?,
-        })
-    }
-}
-
-#[async_trait(?Send)]
-impl DebugAdapter for PythonDebugAdapter {
-    fn name(&self) -> DebugAdapterName {
-        Self::DEBUG_ADAPTER_NAME
-    }
-
-    fn adapter_language_name(&self) -> Option<LanguageName> {
-        Some(SharedString::new_static("Python").into())
-    }
-
-    async fn config_from_zed_format(&self, zed_scenario: ZedDebugConfig) -> Result<DebugScenario> {
-        let mut args = json!({
-            "request": match zed_scenario.request {
-                DebugRequest::Launch(_) => "launch",
-                DebugRequest::Attach(_) => "attach",
-            },
-            "subProcess": true,
-            "redirectOutput": true,
-        });
-
-        let map = args.as_object_mut().unwrap();
-        match &zed_scenario.request {
-            DebugRequest::Attach(attach) => {
-                map.insert("processId".into(), attach.process_id.into());
-            }
-            DebugRequest::Launch(launch) => {
-                map.insert("program".into(), launch.program.clone().into());
-                map.insert("args".into(), launch.args.clone().into());
-                if !launch.env.is_empty() {
-                    map.insert("env".into(), launch.env_json());
-                }
-
-                if let Some(stop_on_entry) = zed_scenario.stop_on_entry {
-                    map.insert("stopOnEntry".into(), stop_on_entry.into());
-                }
-                if let Some(cwd) = launch.cwd.as_ref() {
-                    map.insert("cwd".into(), cwd.to_string_lossy().into_owned().into());
-                }
-            }
-        }
-
-        Ok(DebugScenario {
-            adapter: zed_scenario.adapter,
-            label: zed_scenario.label,
-            config: args,
-            build: None,
-            tcp_connection: None,
-        })
-    }
-
-    fn dap_schema(&self) -> serde_json::Value {
-        json!({
-            "properties": {
-                "request": {
-                    "type": "string",
-                    "enum": ["attach", "launch"],
-                    "description": "Debug adapter request type"
-                },
-                "autoReload": {
-                    "default": {},
-                    "description": "Configures automatic reload of code on edit.",
-                    "properties": {
-                        "enable": {
-                            "default": false,
-                            "description": "Automatically reload code on edit.",
-                            "type": "boolean"
-                        },
-                        "exclude": {
-                            "default": [
-                                "**/.git/**",
-                                "**/.metadata/**",
-                                "**/__pycache__/**",
-                                "**/node_modules/**",
-                                "**/site-packages/**"
-                            ],
-                            "description": "Glob patterns of paths to exclude from auto reload.",
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "include": {
-                            "default": [
-                                "**/*.py",
-                                "**/*.pyw"
-                            ],
-                            "description": "Glob patterns of paths to include in auto reload.",
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "type": "object"
-                },
-                "debugAdapterPath": {
-                    "description": "Path (fully qualified) to the python debug adapter executable.",
-                    "type": "string"
-                },
-                "django": {
-                    "default": false,
-                    "description": "Django debugging.",
-                    "type": "boolean"
-                },
-                "jinja": {
-                    "default": null,
-                    "description": "Jinja template debugging (e.g. Flask).",
-                    "enum": [
-                        false,
-                        null,
-                        true
-                    ]
-                },
-                "justMyCode": {
-                    "default": true,
-                    "description": "If true, show and debug only user-written code. If false, show and debug all code, including library calls.",
-                    "type": "boolean"
-                },
-                "logToFile": {
-                    "default": false,
-                    "description": "Enable logging of debugger events to a log file. This file can be found in the debugpy extension install folder.",
-                    "type": "boolean"
-                },
-                "pathMappings": {
-                    "default": [],
-                    "items": {
-                        "label": "Path mapping",
-                        "properties": {
-                            "localRoot": {
-                                "default": "${ZED_WORKTREE_ROOT}",
-                                "label": "Local source root.",
-                                "type": "string"
-                            },
-                            "remoteRoot": {
-                                "default": "",
-                                "label": "Remote source root.",
-                                "type": "string"
-                            }
-                        },
-                        "required": [
-                            "localRoot",
-                            "remoteRoot"
-                        ],
-                        "type": "object"
-                    },
-                    "label": "Path mappings.",
-                    "type": "array"
-                },
-                "redirectOutput": {
-                    "default": true,
-                    "description": "Redirect output.",
-                    "type": "boolean"
-                },
-                "showReturnValue": {
-                    "default": true,
-                    "description": "Show return value of functions when stepping.",
-                    "type": "boolean"
-                },
-                "subProcess": {
-                    "default": false,
-                    "description": "Whether to enable Sub Process debugging",
-                    "type": "boolean"
-                },
-                "consoleName": {
-                    "default": "Python Debug Console",
-                    "description": "Display name of the debug console or terminal",
-                    "type": "string"
-                },
-                "clientOS": {
-                    "default": null,
-                    "description": "OS that VS code is using.",
-                    "enum": [
-                        "windows",
-                        null,
-                        "unix"
-                    ]
-                }
-            },
-            "required": ["request"],
-            "allOf": [
-                {
-                    "if": {
-                        "properties": {
-                            "request": {
-                                "enum": ["attach"]
-                            }
-                        }
-                    },
-                    "then": {
-                        "properties": {
-                            "connect": {
-                                "label": "Attach by connecting to debugpy over a socket.",
-                                "properties": {
-                                    "host": {
-                                        "default": "127.0.0.1",
-                                        "description": "Hostname or IP address to connect to.",
-                                        "type": "string"
-                                    },
-                                    "port": {
-                                        "description": "Port to connect to.",
-                                        "type": [
-                                            "number",
-                                            "string"
-                                        ]
-                                    }
-                                },
-                                "required": [
-                                    "port"
-                                ],
-                                "type": "object"
-                            },
-                            "listen": {
-                                "label": "Attach by listening for incoming socket connection from debugpy",
-                                "properties": {
-                                    "host": {
-                                        "default": "127.0.0.1",
-                                        "description": "Hostname or IP address of the interface to listen on.",
-                                        "type": "string"
-                                    },
-                                    "port": {
-                                        "description": "Port to listen on.",
-                                        "type": [
-                                            "number",
-                                            "string"
-                                        ]
-                                    }
-                                },
-                                "required": [
-                                    "port"
-                                ],
-                                "type": "object"
-                            },
-                            "processId": {
-                                "anyOf": [
-                                    {
-                                        "default": "${command:pickProcess}",
-                                        "description": "Use process picker to select a process to attach, or Process ID as integer.",
-                                        "enum": [
-                                            "${command:pickProcess}"
-                                        ]
-                                    },
-                                    {
-                                        "description": "ID of the local process to attach to.",
-                                        "type": "integer"
-                                    }
-                                ]
-                            }
-                        }
-                    }
-                },
-                {
-                    "if": {
-                        "properties": {
-                            "request": {
-                                "enum": ["launch"]
-                            }
-                        }
-                    },
-                    "then": {
-                        "properties": {
-                            "args": {
-                                "default": [],
-                                "description": "Command line arguments passed to the program. For string type arguments, it will pass through the shell as is, and therefore all shell variable expansions will apply. But for the array type, the values will be shell-escaped.",
-                                "items": {
-                                    "type": "string"
-                                },
-                                "anyOf": [
-                                    {
-                                        "default": "${command:pickArgs}",
-                                        "enum": [
-                                            "${command:pickArgs}"
-                                        ]
-                                    },
-                                    {
-                                        "type": [
-                                            "array",
-                                            "string"
-                                        ]
-                                    }
-                                ]
-                            },
-                            "console": {
-                                "default": "integratedTerminal",
-                                "description": "Where to launch the debug target: internal console, integrated terminal, or external terminal.",
-                                "enum": [
-                                    "externalTerminal",
-                                    "integratedTerminal",
-                                    "internalConsole"
-                                ]
-                            },
-                            "cwd": {
-                                "default": "${ZED_WORKTREE_ROOT}",
-                                "description": "Absolute path to the working directory of the program being debugged. Default is the root directory of the file (leave empty).",
-                                "type": "string"
-                            },
-                            "autoStartBrowser": {
-                                "default": false,
-                                "description": "Open external browser to launch the application",
-                                "type": "boolean"
-                            },
-                            "env": {
-                                "additionalProperties": {
-                                    "type": "string"
-                                },
-                                "default": {},
-                                "description": "Environment variables defined as a key value pair. Property ends up being the Environment Variable and the value of the property ends up being the value of the Env Variable.",
-                                "type": "object"
-                            },
-                            "envFile": {
-                                "default": "${ZED_WORKTREE_ROOT}/.env",
-                                "description": "Absolute path to a file containing environment variable definitions.",
-                                "type": "string"
-                            },
-                            "gevent": {
-                                "default": false,
-                                "description": "Enable debugging of gevent monkey-patched code.",
-                                "type": "boolean"
-                            },
-                            "module": {
-                                "default": "",
-                                "description": "Name of the module to be debugged.",
-                                "type": "string"
-                            },
-                            "program": {
-                                "default": "${ZED_FILE}",
-                                "description": "Absolute path to the program.",
-                                "type": "string"
-                            },
-                            "purpose": {
-                                "default": [],
-                                "description": "Tells extension to use this configuration for test debugging, or when using debug-in-terminal command.",
-                                "items": {
-                                    "enum": [
-                                        "debug-test",
-                                        "debug-in-terminal"
-                                    ],
-                                    "enumDescriptions": [
-                                        "Use this configuration while debugging tests using test view or test debug commands.",
-                                        "Use this configuration while debugging a file using debug in terminal button in the editor."
-                                    ]
-                                },
-                                "type": "array"
-                            },
-                            "pyramid": {
-                                "default": false,
-                                "description": "Whether debugging Pyramid applications.",
-                                "type": "boolean"
-                            },
-                            "python": {
-                                "default": "${command:python.interpreterPath}",
-                                "description": "Absolute path to the Python interpreter executable; overrides workspace configuration if set.",
-                                "type": "string"
-                            },
-                            "pythonArgs": {
-                                "default": [],
-                                "description": "Command-line arguments passed to the Python interpreter. To pass arguments to the debug target, use \"args\".",
-                                "items": {
-                                    "type": "string"
-                                },
-                                "type": "array"
-                            },
-                            "stopOnEntry": {
-                                "default": false,
-                                "description": "Automatically stop after launch.",
-                                "type": "boolean"
-                            },
-                            "sudo": {
-                                "default": false,
-                                "description": "Running debug program under elevated permissions (on Unix).",
-                                "type": "boolean"
-                            },
-                            "guiEventLoop": {
-                                "default": "matplotlib",
-                                "description": "The GUI event loop that's going to run. Possible values: \"matplotlib\", \"wx\", \"qt\", \"none\", or a custom function that'll be imported and run.",
-                                "type": "string"
-                            }
-                        }
-                    }
-                }
-            ]
-        })
-    }
-
-    async fn get_binary(
-        &self,
-        delegate: &Arc<dyn DapDelegate>,
-        config: &DebugTaskDefinition,
-        user_installed_path: Option<PathBuf>,
-        user_args: Option<Vec<String>>,
-        user_env: Option<HashMap<String, String>>,
-        cx: &mut AsyncApp,
-    ) -> Result<DebugAdapterBinary> {
-        if let Some(local_path) = &user_installed_path {
-            log::debug!(
-                "Using user-installed debugpy adapter from: {}",
-                local_path.display()
-            );
-            return self
-                .get_installed_binary(
-                    delegate,
-                    config,
-                    Some(local_path.clone()),
-                    user_args,
-                    user_env,
-                    None,
-                )
-                .await;
-        }
-
-        let base_paths = ["cwd", "program", "module"]
-            .into_iter()
-            .filter_map(|key| {
-                config.config.get(key).and_then(|cwd| {
-                    RelPath::new(
-                        cwd.as_str()
-                            .map(Path::new)?
-                            .strip_prefix(delegate.worktree_root_path())
-                            .ok()?,
-                        PathStyle::local(),
-                    )
-                    .ok()
-                })
-            })
-            .chain(
-                // While Debugpy's wiki saids absolute paths are required, but it actually supports relative paths when cwd is passed in.
-                // (Which should always be the case because Zed defaults to the cwd worktree root)
-                // So we want to check that these relative paths find toolchains as well. Otherwise, they won't be checked
-                // because the strip prefix in the iteration above will return an error
-                config
-                    .config
-                    .get("cwd")
-                    .map(|_| {
-                        ["program", "module"].into_iter().filter_map(|key| {
-                            config.config.get(key).and_then(|value| {
-                                let path = Path::new(value.as_str()?);
-                                RelPath::new(path, PathStyle::local()).ok()
-                            })
-                        })
-                    })
-                    .into_iter()
-                    .flatten(),
-            )
-            .chain([RelPath::empty().into()]);
-
-        let mut toolchain = None;
-
-        for base_path in base_paths {
-            if let Some(found_toolchain) = delegate
-                .toolchain_store()
-                .active_toolchain(
-                    delegate.worktree_id(),
-                    base_path.into_arc(),
-                    language::LanguageName::new_static(Self::LANGUAGE_NAME),
-                    cx,
-                )
-                .await
-            {
-                toolchain = Some(found_toolchain);
-                break;
-            }
-        }
-
-        self.fetch_debugpy_whl(toolchain.clone(), delegate)
-            .await
-            .map_err(|e| anyhow::anyhow!("{e}"))?;
-        if let Some(toolchain) = &toolchain {
-            return self
-                .get_installed_binary(
-                    delegate,
-                    config,
-                    None,
-                    user_args,
-                    user_env,
-                    Some(toolchain.path.to_string()),
-                )
-                .await;
-        }
-
-        self.get_installed_binary(delegate, config, None, user_args, user_env, None)
-            .await
-    }
-
-    fn label_for_child_session(&self, args: &StartDebuggingRequestArguments) -> Option<String> {
-        let label = args
-            .configuration
-            .get("name")?
-            .as_str()
-            .filter(|label| !label.is_empty())?;
-        Some(label.to_owned())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use util::path;
-
-    use super::*;
-    use task::TcpArgumentsTemplate;
-
-    #[gpui::test]
-    async fn test_tcp_connection_conflict_with_connect_args() {
-        let adapter = PythonDebugAdapter {
-            base_venv_path: OnceCell::new(),
-            debugpy_whl_base_path: OnceCell::new(),
-        };
-
-        let config_with_port_conflict = json!({
-            "request": "attach",
-            "connect": {
-                "port": 5679
-            }
-        });
-
-        let tcp_connection = TcpArgumentsTemplate {
-            host: None,
-            port: Some(5678),
-            timeout: None,
-        };
-
-        let task_def = DebugTaskDefinition {
-            label: "test".into(),
-            adapter: PythonDebugAdapter::ADAPTER_NAME.into(),
-            config: config_with_port_conflict,
-            tcp_connection: Some(tcp_connection.clone()),
-        };
-
-        let result = adapter
-            .get_installed_binary(
-                &test_mocks::MockDelegate::new(),
-                &task_def,
-                None,
-                None,
-                None,
-                Some("python3".to_string()),
-            )
-            .await;
-
-        assert!(result.is_err());
-        assert!(
-            result
-                .unwrap_err()
-                .to_string()
-                .contains("Cannot have two different ports")
-        );
-
-        let host = Ipv4Addr::new(127, 0, 0, 1);
-        let config_with_host_conflict = json!({
-            "request": "attach",
-            "connect": {
-                "host": "192.168.1.1",
-                "port": 5678
-            }
-        });
-
-        let tcp_connection_with_host = TcpArgumentsTemplate {
-            host: Some(host),
-            port: None,
-            timeout: None,
-        };
-
-        let task_def_host = DebugTaskDefinition {
-            label: "test".into(),
-            adapter: PythonDebugAdapter::ADAPTER_NAME.into(),
-            config: config_with_host_conflict,
-            tcp_connection: Some(tcp_connection_with_host),
-        };
-
-        let result_host = adapter
-            .get_installed_binary(
-                &test_mocks::MockDelegate::new(),
-                &task_def_host,
-                None,
-                None,
-                None,
-                Some("python3".to_string()),
-            )
-            .await;
-
-        assert!(result_host.is_err());
-        assert!(
-            result_host
-                .unwrap_err()
-                .to_string()
-                .contains("Cannot have two different hosts")
-        );
-    }
-
-    #[gpui::test]
-    async fn test_attach_with_connect_mode_generates_correct_arguments() {
-        let host = Ipv4Addr::new(127, 0, 0, 1);
-        let port = 5678;
-
-        let args_without_host = PythonDebugAdapter::generate_debugpy_arguments(
-            &host,
-            port,
-            DebugpyLaunchMode::AttachWithConnect { host: None },
-            None,
-            None,
-        )
-        .await
-        .unwrap();
-
-        let expected_suffix = path!("debug_adapters/Debugpy/debugpy/adapter");
-        assert!(args_without_host[0].ends_with(expected_suffix));
-        assert_eq!(args_without_host[1], "connect");
-        assert_eq!(args_without_host[2], "5678");
-
-        let args_with_host = PythonDebugAdapter::generate_debugpy_arguments(
-            &host,
-            port,
-            DebugpyLaunchMode::AttachWithConnect {
-                host: Some("192.168.1.100"),
-            },
-            None,
-            None,
-        )
-        .await
-        .unwrap();
-
-        assert!(args_with_host[0].ends_with(expected_suffix));
-        assert_eq!(args_with_host[1], "connect");
-        assert_eq!(args_with_host[2], "192.168.1.100:");
-        assert_eq!(args_with_host[3], "5678");
-
-        let args_normal = PythonDebugAdapter::generate_debugpy_arguments(
-            &host,
-            port,
-            DebugpyLaunchMode::Normal,
-            None,
-            None,
-        )
-        .await
-        .unwrap();
-
-        assert!(args_normal[0].ends_with(expected_suffix));
-        assert_eq!(args_normal[1], "--host=127.0.0.1");
-        assert_eq!(args_normal[2], "--port=5678");
-        assert!(!args_normal.contains(&"connect".to_string()));
-    }
-
-    #[gpui::test]
-    async fn test_debugpy_install_path_cases() {
-        let host = Ipv4Addr::new(127, 0, 0, 1);
-        let port = 5678;
-
-        // Case 1: User-defined debugpy path (highest precedence)
-        let user_path = PathBuf::from("/custom/path/to/debugpy/src/debugpy/adapter");
-        let user_args = PythonDebugAdapter::generate_debugpy_arguments(
-            &host,
-            port,
-            DebugpyLaunchMode::Normal,
-            Some(&user_path),
-            None,
-        )
-        .await
-        .unwrap();
-
-        let venv_args = PythonDebugAdapter::generate_debugpy_arguments(
-            &host,
-            port,
-            DebugpyLaunchMode::Normal,
-            None,
-            None,
-        )
-        .await
-        .unwrap();
-
-        assert_eq!(user_args[0], "/custom/path/to/debugpy/src/debugpy/adapter");
-        assert_eq!(user_args[1], "--host=127.0.0.1");
-        assert_eq!(user_args[2], "--port=5678");
-
-        let expected_suffix = path!("debug_adapters/Debugpy/debugpy/adapter");
-        assert!(venv_args[0].ends_with(expected_suffix));
-        assert_eq!(venv_args[1], "--host=127.0.0.1");
-        assert_eq!(venv_args[2], "--port=5678");
-
-        // The same cases, with arguments overridden by the user
-        let user_args = PythonDebugAdapter::generate_debugpy_arguments(
-            &host,
-            port,
-            DebugpyLaunchMode::Normal,
-            Some(&user_path),
-            Some(vec!["foo".into()]),
-        )
-        .await
-        .unwrap();
-        let venv_args = PythonDebugAdapter::generate_debugpy_arguments(
-            &host,
-            port,
-            DebugpyLaunchMode::Normal,
-            None,
-            Some(vec!["foo".into()]),
-        )
-        .await
-        .unwrap();
-
-        assert!(user_args[0].ends_with("src/debugpy/adapter"));
-        assert_eq!(user_args[1], "foo");
-
-        assert!(venv_args[0].ends_with(expected_suffix));
-        assert_eq!(venv_args[1], "foo");
-
-        // Note: Case 3 (GitHub-downloaded debugpy) is not tested since this requires mocking the Github API.
-    }
-}
diff --git a/crates/db/Cargo.toml b/crates/db/Cargo.toml
deleted file mode 100644
index 3bcfefec03..0000000000
--- a/crates/db/Cargo.toml
+++ /dev/null
@@ -1,33 +0,0 @@
-[package]
-name = "db"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/db.rs"
-doctest = false
-
-[features]
-test-support = []
-
-[dependencies]
-anyhow.workspace = true
-gpui.workspace = true
-indoc.workspace = true
-log.workspace = true
-paths.workspace = true
-release_channel.workspace = true
-smol.workspace = true
-sqlez.workspace = true
-sqlez_macros.workspace = true
-util.workspace = true
-zed_env_vars.workspace = true
-
-[dev-dependencies]
-gpui = { workspace = true, features = ["test-support"] }
-tempfile.workspace = true
diff --git a/crates/db/LICENSE-GPL b/crates/db/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/db/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/db/README.md b/crates/db/README.md
deleted file mode 100644
index b734a2e3a3..0000000000
--- a/crates/db/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Building Queries
-
-First, craft your test data. The examples folder shows a template for building a test-db, and can be ran with `cargo run --example [your-example]`.
-
-To actually use and test your queries, import the generated DB file into https://sqliteonline.com/
diff --git a/crates/db/src/db.rs b/crates/db/src/db.rs
deleted file mode 100644
index eab2f115d8..0000000000
--- a/crates/db/src/db.rs
+++ /dev/null
@@ -1,298 +0,0 @@
-pub mod kvp;
-pub mod query;
-
-// Re-export
-pub use anyhow;
-use anyhow::Context as _;
-use gpui::{App, AppContext};
-pub use indoc::indoc;
-pub use paths::database_dir;
-pub use smol;
-pub use sqlez;
-pub use sqlez_macros;
-
-pub use release_channel::RELEASE_CHANNEL;
-use sqlez::domain::Migrator;
-use sqlez::thread_safe_connection::ThreadSafeConnection;
-use sqlez_macros::sql;
-use std::future::Future;
-use std::path::Path;
-use std::sync::atomic::AtomicBool;
-use std::sync::{LazyLock, atomic::Ordering};
-use util::{ResultExt, maybe};
-use zed_env_vars::ZED_STATELESS;
-
-const CONNECTION_INITIALIZE_QUERY: &str = sql!(
-    PRAGMA foreign_keys=TRUE;
-);
-
-const DB_INITIALIZE_QUERY: &str = sql!(
-    PRAGMA journal_mode=WAL;
-    PRAGMA busy_timeout=1;
-    PRAGMA case_sensitive_like=TRUE;
-    PRAGMA synchronous=NORMAL;
-);
-
-const FALLBACK_DB_NAME: &str = "FALLBACK_MEMORY_DB";
-
-const DB_FILE_NAME: &str = "db.sqlite";
-
-pub static ALL_FILE_DB_FAILED: LazyLock<AtomicBool> = LazyLock::new(|| AtomicBool::new(false));
-
-/// Open or create a database at the given directory path.
-/// This will retry a couple times if there are failures. If opening fails once, the db directory
-/// is moved to a backup folder and a new one is created. If that fails, a shared in memory db is created.
-/// In either case, static variables are set so that the user can be notified.
-pub async fn open_db<M: Migrator + 'static>(db_dir: &Path, scope: &str) -> ThreadSafeConnection {
-    if *ZED_STATELESS {
-        return open_fallback_db::<M>().await;
-    }
-
-    let main_db_dir = db_dir.join(format!("0-{}", scope));
-
-    let connection = maybe!(async {
-        smol::fs::create_dir_all(&main_db_dir)
-            .await
-            .context("Could not create db directory")
-            .log_err()?;
-        let db_path = main_db_dir.join(Path::new(DB_FILE_NAME));
-        open_main_db::<M>(&db_path).await
-    })
-    .await;
-
-    if let Some(connection) = connection {
-        return connection;
-    }
-
-    // Set another static ref so that we can escalate the notification
-    ALL_FILE_DB_FAILED.store(true, Ordering::Release);
-
-    // If still failed, create an in memory db with a known name
-    open_fallback_db::<M>().await
-}
-
-async fn open_main_db<M: Migrator>(db_path: &Path) -> Option<ThreadSafeConnection> {
-    log::trace!("Opening database {}", db_path.display());
-    ThreadSafeConnection::builder::<M>(db_path.to_string_lossy().as_ref(), true)
-        .with_db_initialization_query(DB_INITIALIZE_QUERY)
-        .with_connection_initialize_query(CONNECTION_INITIALIZE_QUERY)
-        .build()
-        .await
-        .log_err()
-}
-
-async fn open_fallback_db<M: Migrator>() -> ThreadSafeConnection {
-    log::warn!("Opening fallback in-memory database");
-    ThreadSafeConnection::builder::<M>(FALLBACK_DB_NAME, false)
-        .with_db_initialization_query(DB_INITIALIZE_QUERY)
-        .with_connection_initialize_query(CONNECTION_INITIALIZE_QUERY)
-        .build()
-        .await
-        .expect(
-            "Fallback in memory database failed. Likely initialization queries or migrations have fundamental errors",
-        )
-}
-
-#[cfg(any(test, feature = "test-support"))]
-pub async fn open_test_db<M: Migrator>(db_name: &str) -> ThreadSafeConnection {
-    use sqlez::thread_safe_connection::locking_queue;
-
-    ThreadSafeConnection::builder::<M>(db_name, false)
-        .with_db_initialization_query(DB_INITIALIZE_QUERY)
-        .with_connection_initialize_query(CONNECTION_INITIALIZE_QUERY)
-        // Serialize queued writes via a mutex and run them synchronously
-        .with_write_queue_constructor(locking_queue())
-        .build()
-        .await
-        .unwrap()
-}
-
-/// Implements a basic DB wrapper for a given domain
-///
-/// Arguments:
-/// - static variable name for connection
-/// - type of connection wrapper
-/// - dependencies, whose migrations should be run prior to this domain's migrations
-#[macro_export]
-macro_rules! static_connection {
-    ($id:ident, $t:ident, [ $($d:ty),* ] $(, $global:ident)?) => {
-        impl ::std::ops::Deref for $t {
-            type Target = $crate::sqlez::thread_safe_connection::ThreadSafeConnection;
-
-            fn deref(&self) -> &Self::Target {
-                &self.0
-            }
-        }
-
-        impl $t {
-            #[cfg(any(test, feature = "test-support"))]
-            pub async fn open_test_db(name: &'static str) -> Self {
-                $t($crate::open_test_db::<$t>(name).await)
-            }
-        }
-
-        #[cfg(any(test, feature = "test-support"))]
-        pub static $id: std::sync::LazyLock<$t> = std::sync::LazyLock::new(|| {
-            #[allow(unused_parens)]
-            $t($crate::smol::block_on($crate::open_test_db::<($($d,)* $t)>(stringify!($id))))
-        });
-
-        #[cfg(not(any(test, feature = "test-support")))]
-        pub static $id: std::sync::LazyLock<$t> = std::sync::LazyLock::new(|| {
-            let db_dir = $crate::database_dir();
-            let scope = if false $(|| stringify!($global) == "global")? {
-                "global"
-            } else {
-                $crate::RELEASE_CHANNEL.dev_name()
-            };
-            #[allow(unused_parens)]
-            $t($crate::smol::block_on($crate::open_db::<($($d,)* $t)>(db_dir, scope)))
-        });
-    }
-}
-
-pub fn write_and_log<F>(cx: &App, db_write: impl FnOnce() -> F + Send + 'static)
-where
-    F: Future<Output = anyhow::Result<()>> + Send,
-{
-    cx.background_spawn(async move { db_write().await.log_err() })
-        .detach()
-}
-
-#[cfg(test)]
-mod tests {
-    use std::thread;
-
-    use sqlez::domain::Domain;
-    use sqlez_macros::sql;
-
-    use crate::open_db;
-
-    // Test bad migration panics
-    #[gpui::test]
-    #[should_panic]
-    async fn test_bad_migration_panics() {
-        enum BadDB {}
-
-        impl Domain for BadDB {
-            const NAME: &str = "db_tests";
-            const MIGRATIONS: &[&str] = &[
-                sql!(CREATE TABLE test(value);),
-                // failure because test already exists
-                sql!(CREATE TABLE test(value);),
-            ];
-        }
-
-        let tempdir = tempfile::Builder::new()
-            .prefix("DbTests")
-            .tempdir()
-            .unwrap();
-        let _bad_db = open_db::<BadDB>(
-            tempdir.path(),
-            release_channel::ReleaseChannel::Dev.dev_name(),
-        )
-        .await;
-    }
-
-    /// Test that DB exists but corrupted (causing recreate)
-    #[gpui::test]
-    async fn test_db_corruption(cx: &mut gpui::TestAppContext) {
-        cx.executor().allow_parking();
-
-        enum CorruptedDB {}
-
-        impl Domain for CorruptedDB {
-            const NAME: &str = "db_tests";
-            const MIGRATIONS: &[&str] = &[sql!(CREATE TABLE test(value);)];
-        }
-
-        enum GoodDB {}
-
-        impl Domain for GoodDB {
-            const NAME: &str = "db_tests"; //Notice same name
-            const MIGRATIONS: &[&str] = &[sql!(CREATE TABLE test2(value);)];
-        }
-
-        let tempdir = tempfile::Builder::new()
-            .prefix("DbTests")
-            .tempdir()
-            .unwrap();
-        {
-            let corrupt_db = open_db::<CorruptedDB>(
-                tempdir.path(),
-                release_channel::ReleaseChannel::Dev.dev_name(),
-            )
-            .await;
-            assert!(corrupt_db.persistent());
-        }
-
-        let good_db = open_db::<GoodDB>(
-            tempdir.path(),
-            release_channel::ReleaseChannel::Dev.dev_name(),
-        )
-        .await;
-        assert!(
-            good_db.select_row::<usize>("SELECT * FROM test2").unwrap()()
-                .unwrap()
-                .is_none()
-        );
-    }
-
-    /// Test that DB exists but corrupted (causing recreate)
-    #[gpui::test(iterations = 30)]
-    async fn test_simultaneous_db_corruption(cx: &mut gpui::TestAppContext) {
-        cx.executor().allow_parking();
-
-        enum CorruptedDB {}
-
-        impl Domain for CorruptedDB {
-            const NAME: &str = "db_tests";
-
-            const MIGRATIONS: &[&str] = &[sql!(CREATE TABLE test(value);)];
-        }
-
-        enum GoodDB {}
-
-        impl Domain for GoodDB {
-            const NAME: &str = "db_tests"; //Notice same name
-            const MIGRATIONS: &[&str] = &[sql!(CREATE TABLE test2(value);)]; // But different migration
-        }
-
-        let tempdir = tempfile::Builder::new()
-            .prefix("DbTests")
-            .tempdir()
-            .unwrap();
-        {
-            // Setup the bad database
-            let corrupt_db = open_db::<CorruptedDB>(
-                tempdir.path(),
-                release_channel::ReleaseChannel::Dev.dev_name(),
-            )
-            .await;
-            assert!(corrupt_db.persistent());
-        }
-
-        // Try to connect to it a bunch of times at once
-        let mut guards = vec![];
-        for _ in 0..10 {
-            let tmp_path = tempdir.path().to_path_buf();
-            let guard = thread::spawn(move || {
-                let good_db = smol::block_on(open_db::<GoodDB>(
-                    tmp_path.as_path(),
-                    release_channel::ReleaseChannel::Dev.dev_name(),
-                ));
-                assert!(
-                    good_db.select_row::<usize>("SELECT * FROM test2").unwrap()()
-                        .unwrap()
-                        .is_none()
-                );
-            });
-
-            guards.push(guard);
-        }
-
-        for guard in guards.into_iter() {
-            assert!(guard.join().is_ok());
-        }
-    }
-}
diff --git a/crates/db/src/kvp.rs b/crates/db/src/kvp.rs
deleted file mode 100644
index 8ea877b35b..0000000000
--- a/crates/db/src/kvp.rs
+++ /dev/null
@@ -1,141 +0,0 @@
-use gpui::App;
-use sqlez_macros::sql;
-use util::ResultExt as _;
-
-use crate::{
-    query,
-    sqlez::{domain::Domain, thread_safe_connection::ThreadSafeConnection},
-    write_and_log,
-};
-
-pub struct KeyValueStore(crate::sqlez::thread_safe_connection::ThreadSafeConnection);
-
-impl Domain for KeyValueStore {
-    const NAME: &str = stringify!(KeyValueStore);
-
-    const MIGRATIONS: &[&str] = &[sql!(
-        CREATE TABLE IF NOT EXISTS kv_store(
-            key TEXT PRIMARY KEY,
-            value TEXT NOT NULL
-        ) STRICT;
-    )];
-}
-
-crate::static_connection!(KEY_VALUE_STORE, KeyValueStore, []);
-
-pub trait Dismissable {
-    const KEY: &'static str;
-
-    fn dismissed() -> bool {
-        KEY_VALUE_STORE
-            .read_kvp(Self::KEY)
-            .log_err()
-            .is_some_and(|s| s.is_some())
-    }
-
-    fn set_dismissed(is_dismissed: bool, cx: &mut App) {
-        write_and_log(cx, move || async move {
-            if is_dismissed {
-                KEY_VALUE_STORE
-                    .write_kvp(Self::KEY.into(), "1".into())
-                    .await
-            } else {
-                KEY_VALUE_STORE.delete_kvp(Self::KEY.into()).await
-            }
-        })
-    }
-}
-
-impl KeyValueStore {
-    query! {
-        pub fn read_kvp(key: &str) -> Result<Option<String>> {
-            SELECT value FROM kv_store WHERE key = (?)
-        }
-    }
-
-    pub async fn write_kvp(&self, key: String, value: String) -> anyhow::Result<()> {
-        log::debug!("Writing key-value pair for key {key}");
-        self.write_kvp_inner(key, value).await
-    }
-
-    query! {
-        async fn write_kvp_inner(key: String, value: String) -> Result<()> {
-            INSERT OR REPLACE INTO kv_store(key, value) VALUES ((?), (?))
-        }
-    }
-
-    query! {
-        pub async fn delete_kvp(key: String) -> Result<()> {
-            DELETE FROM kv_store WHERE key = (?)
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::kvp::KeyValueStore;
-
-    #[gpui::test]
-    async fn test_kvp() {
-        let db = KeyValueStore::open_test_db("test_kvp").await;
-
-        assert_eq!(db.read_kvp("key-1").unwrap(), None);
-
-        db.write_kvp("key-1".to_string(), "one".to_string())
-            .await
-            .unwrap();
-        assert_eq!(db.read_kvp("key-1").unwrap(), Some("one".to_string()));
-
-        db.write_kvp("key-1".to_string(), "one-2".to_string())
-            .await
-            .unwrap();
-        assert_eq!(db.read_kvp("key-1").unwrap(), Some("one-2".to_string()));
-
-        db.write_kvp("key-2".to_string(), "two".to_string())
-            .await
-            .unwrap();
-        assert_eq!(db.read_kvp("key-2").unwrap(), Some("two".to_string()));
-
-        db.delete_kvp("key-1".to_string()).await.unwrap();
-        assert_eq!(db.read_kvp("key-1").unwrap(), None);
-    }
-}
-
-pub struct GlobalKeyValueStore(ThreadSafeConnection);
-
-impl Domain for GlobalKeyValueStore {
-    const NAME: &str = stringify!(GlobalKeyValueStore);
-    const MIGRATIONS: &[&str] = &[sql!(
-        CREATE TABLE IF NOT EXISTS kv_store(
-            key TEXT PRIMARY KEY,
-            value TEXT NOT NULL
-        ) STRICT;
-    )];
-}
-
-crate::static_connection!(GLOBAL_KEY_VALUE_STORE, GlobalKeyValueStore, [], global);
-
-impl GlobalKeyValueStore {
-    query! {
-        pub fn read_kvp(key: &str) -> Result<Option<String>> {
-            SELECT value FROM kv_store WHERE key = (?)
-        }
-    }
-
-    pub async fn write_kvp(&self, key: String, value: String) -> anyhow::Result<()> {
-        log::debug!("Writing global key-value pair for key {key}");
-        self.write_kvp_inner(key, value).await
-    }
-
-    query! {
-        async fn write_kvp_inner(key: String, value: String) -> Result<()> {
-            INSERT OR REPLACE INTO kv_store(key, value) VALUES ((?), (?))
-        }
-    }
-
-    query! {
-        pub async fn delete_kvp(key: String) -> Result<()> {
-            DELETE FROM kv_store WHERE key = (?)
-        }
-    }
-}
diff --git a/crates/db/src/query.rs b/crates/db/src/query.rs
deleted file mode 100644
index 932db250e6..0000000000
--- a/crates/db/src/query.rs
+++ /dev/null
@@ -1,314 +0,0 @@
-#[macro_export]
-macro_rules! query {
-    ($vis:vis fn $id:ident() -> Result<()> { $($sql:tt)+ }) => {
-        $vis fn $id(&self) -> $crate::anyhow::Result<()> {
-            use $crate::anyhow::Context;
-
-            let sql_stmt = $crate::sqlez_macros::sql!($($sql)+);
-
-            self.exec(sql_stmt)?().context(::std::format!(
-                "Error in {}, exec failed to execute or parse for: {}",
-                ::std::stringify!($id),
-                sql_stmt,
-            ))
-        }
-    };
-    ($vis:vis async fn $id:ident() -> Result<()> { $($sql:tt)+ }) => {
-        $vis async fn $id(&self) -> $crate::anyhow::Result<()> {
-            use $crate::anyhow::Context;
-
-            self.write(|connection| {
-                let sql_stmt = $crate::sqlez_macros::sql!($($sql)+);
-
-                connection.exec(sql_stmt)?().context(::std::format!(
-                    "Error in {}, exec failed to execute or parse for: {}",
-                    ::std::stringify!($id),
-                    sql_stmt
-                ))
-            }).await
-        }
-    };
-    ($vis:vis fn $id:ident($($arg:ident: $arg_type:ty),+) -> Result<()> { $($sql:tt)+ }) => {
-        $vis fn $id(&self, $($arg: $arg_type),+) -> $crate::anyhow::Result<()> {
-            use $crate::anyhow::Context;
-
-            let sql_stmt = $crate::sqlez_macros::sql!($($sql)+);
-
-            self.exec_bound::<($($arg_type),+)>(sql_stmt)?(($($arg),+))
-                .context(::std::format!(
-                    "Error in {}, exec_bound failed to execute or parse for: {}",
-                    ::std::stringify!($id),
-                    sql_stmt
-                ))
-        }
-    };
-    ($vis:vis async fn $id:ident($arg:ident: $arg_type:ty) -> Result<()> { $($sql:tt)+ }) => {
-        $vis async fn $id(&self, $arg: $arg_type) -> $crate::anyhow::Result<()> {
-            use $crate::anyhow::Context;
-
-            self.write(move |connection| {
-                let sql_stmt = $crate::sqlez_macros::sql!($($sql)+);
-
-                connection.exec_bound::<$arg_type>(sql_stmt)?($arg)
-                    .context(::std::format!(
-                        "Error in {}, exec_bound failed to execute or parse for: {}",
-                        ::std::stringify!($id),
-                        sql_stmt
-                    ))
-            }).await
-        }
-    };
-    ($vis:vis async fn $id:ident($($arg:ident: $arg_type:ty),+) -> Result<()> { $($sql:tt)+ }) => {
-        $vis async fn $id(&self, $($arg: $arg_type),+) -> $crate::anyhow::Result<()> {
-            use $crate::anyhow::Context;
-
-            self.write(move |connection| {
-                let sql_stmt = $crate::sqlez_macros::sql!($($sql)+);
-
-                connection.exec_bound::<($($arg_type),+)>(sql_stmt)?(($($arg),+))
-                    .context(::std::format!(
-                        "Error in {}, exec_bound failed to execute or parse for: {}",
-                        ::std::stringify!($id),
-                        sql_stmt
-                    ))
-            }).await
-        }
-    };
-    ($vis:vis fn $id:ident() ->  Result<Vec<$return_type:ty>> { $($sql:tt)+ }) => {
-        $vis fn $id(&self) -> $crate::anyhow::Result<Vec<$return_type>> {
-            use $crate::anyhow::Context;
-
-            let sql_stmt = $crate::sqlez_macros::sql!($($sql)+);
-
-            self.select::<$return_type>(sql_stmt)?()
-                .context(::std::format!(
-                    "Error in {}, select_row failed to execute or parse for: {}",
-                    ::std::stringify!($id),
-                    sql_stmt
-                ))
-        }
-    };
-    ($vis:vis async fn $id:ident() -> Result<Vec<$return_type:ty>> { $($sql:tt)+ }) => {
-        pub async fn $id(&self) -> $crate::anyhow::Result<Vec<$return_type>> {
-            use $crate::anyhow::Context;
-
-            self.write(|connection| {
-                let sql_stmt = $crate::sqlez_macros::sql!($($sql)+);
-
-                connection.select::<$return_type>(sql_stmt)?()
-                    .context(::std::format!(
-                        "Error in {}, select_row failed to execute or parse for: {}",
-                        ::std::stringify!($id),
-                        sql_stmt
-                    ))
-            }).await
-        }
-    };
-    ($vis:vis fn $id:ident($($arg:ident: $arg_type:ty),+) -> Result<Vec<$return_type:ty>> { $($sql:tt)+ }) => {
-        $vis fn $id(&self, $($arg: $arg_type),+) -> $crate::anyhow::Result<Vec<$return_type>> {
-            use $crate::anyhow::Context;
-
-            let sql_stmt = $crate::sqlez_macros::sql!($($sql)+);
-
-            self.select_bound::<($($arg_type),+), $return_type>(sql_stmt)?(($($arg),+))
-                .context(::std::format!(
-                    "Error in {}, exec_bound failed to execute or parse for: {}",
-                    ::std::stringify!($id),
-                    sql_stmt
-                ))
-        }
-    };
-    ($vis:vis async fn $id:ident($($arg:ident: $arg_type:ty),+) -> Result<Vec<$return_type:ty>> { $($sql:tt)+ }) => {
-        $vis async fn $id(&self, $($arg: $arg_type),+) -> $crate::anyhow::Result<Vec<$return_type>> {
-            use $crate::anyhow::Context;
-
-            self.write(|connection| {
-                let sql_stmt = $crate::sqlez_macros::sql!($($sql)+);
-
-                connection.select_bound::<($($arg_type),+), $return_type>(sql_stmt)?(($($arg),+))
-                    .context(::std::format!(
-                        "Error in {}, exec_bound failed to execute or parse for: {}",
-                        ::std::stringify!($id),
-                        sql_stmt
-                    ))
-            }).await
-        }
-    };
-    ($vis:vis fn $id:ident() ->  Result<Option<$return_type:ty>> { $($sql:tt)+ }) => {
-        $vis fn $id(&self) -> $crate::anyhow::Result<Option<$return_type>> {
-            use $crate::anyhow::Context;
-
-            let sql_stmt = $crate::sqlez_macros::sql!($($sql)+);
-
-            self.select_row::<$return_type>(sql_stmt)?()
-                .context(::std::format!(
-                    "Error in {}, select_row failed to execute or parse for: {}",
-                    ::std::stringify!($id),
-                    sql_stmt
-                ))
-        }
-    };
-    ($vis:vis async fn $id:ident() ->  Result<Option<$return_type:ty>> { $($sql:tt)+ }) => {
-        $vis async fn $id(&self) -> $crate::anyhow::Result<Option<$return_type>> {
-            use $crate::anyhow::Context;
-
-            self.write(|connection| {
-                let sql_stmt = $crate::sqlez_macros::sql!($($sql)+);
-
-                connection.select_row::<$return_type>(sql_stmt)?()
-                    .context(::std::format!(
-                        "Error in {}, select_row failed to execute or parse for: {}",
-                        ::std::stringify!($id),
-                        sql_stmt
-                    ))
-            }).await
-        }
-    };
-    ($vis:vis fn $id:ident($arg:ident: $arg_type:ty) ->  Result<Option<$return_type:ty>> { $($sql:tt)+ }) => {
-        $vis fn $id(&self, $arg: $arg_type) -> $crate::anyhow::Result<Option<$return_type>>  {
-            use $crate::anyhow::Context;
-
-            let sql_stmt = $crate::sqlez_macros::sql!($($sql)+);
-
-            self.select_row_bound::<$arg_type, $return_type>(sql_stmt)?($arg)
-                .context(::std::format!(
-                    "Error in {}, select_row_bound failed to execute or parse for: {}",
-                    ::std::stringify!($id),
-                    sql_stmt
-                ))
-
-        }
-    };
-    ($vis:vis fn $id:ident($($arg:ident: $arg_type:ty),+) ->  Result<Option<$return_type:ty>> { $($sql:tt)+ }) => {
-        $vis fn $id(&self, $($arg: $arg_type),+) -> $crate::anyhow::Result<Option<$return_type>>  {
-            use $crate::anyhow::Context;
-
-            let sql_stmt = $crate::sqlez_macros::sql!($($sql)+);
-
-            self.select_row_bound::<($($arg_type),+), $return_type>(sql_stmt)?(($($arg),+))
-                .context(::std::format!(
-                    "Error in {}, select_row_bound failed to execute or parse for: {}",
-                    ::std::stringify!($id),
-                    sql_stmt
-                ))
-
-        }
-    };
-    ($vis:vis async fn $id:ident($($arg:ident: $arg_type:ty),+) ->  Result<Option<$return_type:ty>> { $($sql:tt)+ }) => {
-        $vis async fn $id(&self, $($arg: $arg_type),+) -> $crate::anyhow::Result<Option<$return_type>>  {
-            use $crate::anyhow::Context;
-
-
-            self.write(move |connection| {
-                let sql_stmt = $crate::sqlez_macros::sql!($($sql)+);
-
-                connection.select_row_bound::<($($arg_type),+), $return_type>(sql_stmt)?(($($arg),+))
-                    .context(::std::format!(
-                        "Error in {}, select_row_bound failed to execute or parse for: {}",
-                        ::std::stringify!($id),
-                        sql_stmt
-                    ))
-            }).await
-        }
-    };
-    ($vis:vis fn $id:ident() ->  Result<$return_type:ty> { $($sql:tt)+ }) => {
-        $vis fn $id(&self) ->  $crate::anyhow::Result<$return_type>  {
-            use $crate::anyhow::Context;
-
-            let sql_stmt = $crate::sqlez_macros::sql!($($sql)+);
-
-            self.select_row::<$return_type>(sql_stmt)?()
-                .context(::std::format!(
-                    "Error in {}, select_row_bound failed to execute or parse for: {}",
-                    ::std::stringify!($id),
-                    sql_stmt
-                ))?
-                .context(::std::format!(
-                    "Error in {}, select_row_bound expected single row result but found none for: {}",
-                    ::std::stringify!($id),
-                    sql_stmt
-                ))
-        }
-    };
-    ($vis:vis async fn $id:ident() ->  Result<$return_type:ty> { $($sql:tt)+ }) => {
-        $vis async fn $id(&self) ->  $crate::anyhow::Result<$return_type>  {
-            use $crate::anyhow::Context;
-
-            self.write(|connection| {
-                let sql_stmt = $crate::sqlez_macros::sql!($($sql)+);
-
-                connection.select_row::<$return_type>(sql_stmt)?()
-                    .context(::std::format!(
-                        "Error in {}, select_row_bound failed to execute or parse for: {}",
-                        ::std::stringify!($id),
-                        sql_stmt
-                    ))?
-                    .context(::std::format!(
-                        "Error in {}, select_row_bound expected single row result but found none for: {}",
-                        ::std::stringify!($id),
-                        sql_stmt
-                    ))
-            }).await
-        }
-    };
-    ($vis:vis fn $id:ident($arg:ident: $arg_type:ty) ->  Result<$return_type:ty> { $($sql:tt)+ }) => {
-        pub fn $id(&self, $arg: $arg_type) ->  $crate::anyhow::Result<$return_type>  {
-            use $crate::anyhow::Context;
-
-            let sql_stmt = $crate::sqlez_macros::sql!($($sql)+);
-
-            self.select_row_bound::<$arg_type, $return_type>(sql_stmt)?($arg)
-                .context(::std::format!(
-                    "Error in {}, select_row_bound failed to execute or parse for: {}",
-                    ::std::stringify!($id),
-                    sql_stmt
-                ))?
-                .context(::std::format!(
-                    "Error in {}, select_row_bound expected single row result but found none for: {}",
-                    ::std::stringify!($id),
-                    sql_stmt
-                ))
-        }
-    };
-    ($vis:vis fn $id:ident($($arg:ident: $arg_type:ty),+) ->  Result<$return_type:ty> { $($sql:tt)+ }) => {
-        $vis fn $id(&self, $($arg: $arg_type),+) ->  $crate::anyhow::Result<$return_type>  {
-            use $crate::anyhow::Context;
-
-            let sql_stmt = $crate::sqlez_macros::sql!($($sql)+);
-
-            self.select_row_bound::<($($arg_type),+), $return_type>(sql_stmt)?(($($arg),+))
-                .context(::std::format!(
-                    "Error in {}, select_row_bound failed to execute or parse for: {}",
-                    ::std::stringify!($id),
-                    sql_stmt
-                ))?
-                .context(::std::format!(
-                    "Error in {}, select_row_bound expected single row result but found none for: {}",
-                    ::std::stringify!($id),
-                    sql_stmt
-                ))
-        }
-    };
-    ($vis:vis fn async $id:ident($($arg:ident: $arg_type:ty),+) ->  Result<$return_type:ty> { $($sql:tt)+ }) => {
-        $vis async fn $id(&self, $($arg: $arg_type),+) ->  $crate::anyhow::Result<$return_type>  {
-            use $crate::anyhow::Context;
-
-
-            self.write(|connection| {
-                let sql_stmt = $crate::sqlez_macros::sql!($($sql)+);
-
-                connection.select_row_bound::<($($arg_type),+), $return_type>(sql_stmt)?(($($arg),+))
-                    .context(::std::format!(
-                        "Error in {}, select_row_bound failed to execute or parse for: {}",
-                        ::std::stringify!($id),
-                        sql_stmt
-                    ))?
-                    .context(::std::format!(
-                        "Error in {}, select_row_bound expected single row result but found none for: {}",
-                        ::std::stringify!($id),
-                        sql_stmt
-                    ))
-            }).await
-        }
-    };
-}
diff --git a/crates/debug_adapter_extension/Cargo.toml b/crates/debug_adapter_extension/Cargo.toml
deleted file mode 100644
index 08f916eb9e..0000000000
--- a/crates/debug_adapter_extension/Cargo.toml
+++ /dev/null
@@ -1,23 +0,0 @@
-[package]
-name = "debug_adapter_extension"
-version = "0.1.0"
-license = "GPL-3.0-or-later"
-publish.workspace = true
-edition.workspace = true
-
-[dependencies]
-anyhow.workspace = true
-async-trait.workspace = true
-collections.workspace = true
-dap.workspace = true
-extension.workspace = true
-gpui.workspace = true
-serde_json.workspace = true
-util.workspace = true
-task.workspace = true
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/debug_adapter_extension.rs"
diff --git a/crates/debug_adapter_extension/LICENSE-GPL b/crates/debug_adapter_extension/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/debug_adapter_extension/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/debug_adapter_extension/src/debug_adapter_extension.rs b/crates/debug_adapter_extension/src/debug_adapter_extension.rs
deleted file mode 100644
index 2f8e3dc50e..0000000000
--- a/crates/debug_adapter_extension/src/debug_adapter_extension.rs
+++ /dev/null
@@ -1,66 +0,0 @@
-mod extension_dap_adapter;
-mod extension_locator_adapter;
-
-use std::{path::Path, sync::Arc};
-
-use dap::DapRegistry;
-use extension::{ExtensionDebugAdapterProviderProxy, ExtensionHostProxy};
-use extension_dap_adapter::ExtensionDapAdapter;
-use gpui::App;
-use util::ResultExt;
-
-use crate::extension_locator_adapter::ExtensionLocatorAdapter;
-
-pub fn init(extension_host_proxy: Arc<ExtensionHostProxy>, cx: &mut App) {
-    let language_server_registry_proxy = DebugAdapterRegistryProxy::new(cx);
-    extension_host_proxy.register_debug_adapter_proxy(language_server_registry_proxy);
-}
-
-#[derive(Clone)]
-struct DebugAdapterRegistryProxy {
-    debug_adapter_registry: DapRegistry,
-}
-
-impl DebugAdapterRegistryProxy {
-    fn new(cx: &mut App) -> Self {
-        Self {
-            debug_adapter_registry: DapRegistry::global(cx).clone(),
-        }
-    }
-}
-
-impl ExtensionDebugAdapterProviderProxy for DebugAdapterRegistryProxy {
-    fn register_debug_adapter(
-        &self,
-        extension: Arc<dyn extension::Extension>,
-        debug_adapter_name: Arc<str>,
-        schema_path: &Path,
-    ) {
-        if let Some(adapter) =
-            ExtensionDapAdapter::new(extension, debug_adapter_name, schema_path).log_err()
-        {
-            self.debug_adapter_registry.add_adapter(Arc::new(adapter));
-        }
-    }
-
-    fn register_debug_locator(
-        &self,
-        extension: Arc<dyn extension::Extension>,
-        locator_name: Arc<str>,
-    ) {
-        self.debug_adapter_registry
-            .add_locator(Arc::new(ExtensionLocatorAdapter::new(
-                extension,
-                locator_name,
-            )));
-    }
-
-    fn unregister_debug_adapter(&self, debug_adapter_name: Arc<str>) {
-        self.debug_adapter_registry
-            .remove_adapter(&debug_adapter_name);
-    }
-
-    fn unregister_debug_locator(&self, locator_name: Arc<str>) {
-        self.debug_adapter_registry.remove_locator(&locator_name);
-    }
-}
diff --git a/crates/debug_adapter_extension/src/extension_dap_adapter.rs b/crates/debug_adapter_extension/src/extension_dap_adapter.rs
deleted file mode 100644
index abc0fbac19..0000000000
--- a/crates/debug_adapter_extension/src/extension_dap_adapter.rs
+++ /dev/null
@@ -1,121 +0,0 @@
-use std::{
-    path::{Path, PathBuf},
-    str::FromStr,
-    sync::Arc,
-};
-
-use anyhow::{Context, Result};
-use async_trait::async_trait;
-use collections::HashMap;
-use dap::{
-    StartDebuggingRequestArgumentsRequest,
-    adapters::{
-        DapDelegate, DebugAdapter, DebugAdapterBinary, DebugAdapterName, DebugTaskDefinition,
-    },
-};
-use extension::{Extension, WorktreeDelegate};
-use gpui::AsyncApp;
-use task::{DebugScenario, ZedDebugConfig};
-use util::rel_path::RelPath;
-
-pub(crate) struct ExtensionDapAdapter {
-    extension: Arc<dyn Extension>,
-    debug_adapter_name: Arc<str>,
-    schema: serde_json::Value,
-}
-
-impl ExtensionDapAdapter {
-    pub(crate) fn new(
-        extension: Arc<dyn extension::Extension>,
-        debug_adapter_name: Arc<str>,
-        schema_path: &Path,
-    ) -> Result<Self> {
-        let schema = std::fs::read_to_string(&schema_path).with_context(|| {
-            format!(
-                "Failed to read debug adapter schema for {debug_adapter_name} (from path: `{schema_path:?}`)"
-            )
-        })?;
-        let schema = serde_json::Value::from_str(&schema).with_context(|| {
-            format!("Debug adapter schema for {debug_adapter_name} is not a valid JSON")
-        })?;
-        Ok(Self {
-            extension,
-            debug_adapter_name,
-            schema,
-        })
-    }
-}
-
-/// An adapter that allows an [`dap::adapters::DapDelegate`] to be used as a [`WorktreeDelegate`].
-struct WorktreeDelegateAdapter(pub Arc<dyn DapDelegate>);
-
-#[async_trait]
-impl WorktreeDelegate for WorktreeDelegateAdapter {
-    fn id(&self) -> u64 {
-        self.0.worktree_id().to_proto()
-    }
-
-    fn root_path(&self) -> String {
-        self.0.worktree_root_path().to_string_lossy().into_owned()
-    }
-
-    async fn read_text_file(&self, path: &RelPath) -> Result<String> {
-        self.0.read_text_file(path).await
-    }
-
-    async fn which(&self, binary_name: String) -> Option<String> {
-        self.0
-            .which(binary_name.as_ref())
-            .await
-            .map(|path| path.to_string_lossy().into_owned())
-    }
-
-    async fn shell_env(&self) -> Vec<(String, String)> {
-        self.0.shell_env().await.into_iter().collect()
-    }
-}
-
-#[async_trait(?Send)]
-impl DebugAdapter for ExtensionDapAdapter {
-    fn name(&self) -> DebugAdapterName {
-        self.debug_adapter_name.as_ref().into()
-    }
-
-    fn dap_schema(&self) -> serde_json::Value {
-        self.schema.clone()
-    }
-
-    async fn get_binary(
-        &self,
-        delegate: &Arc<dyn DapDelegate>,
-        config: &DebugTaskDefinition,
-        user_installed_path: Option<PathBuf>,
-        // TODO support user args in the extension API
-        _user_args: Option<Vec<String>>,
-        // TODO support user env in the extension API
-        _user_env: Option<HashMap<String, String>>,
-        _cx: &mut AsyncApp,
-    ) -> Result<DebugAdapterBinary> {
-        self.extension
-            .get_dap_binary(
-                self.debug_adapter_name.clone(),
-                config.clone(),
-                user_installed_path,
-                Arc::new(WorktreeDelegateAdapter(delegate.clone())),
-            )
-            .await
-    }
-
-    async fn config_from_zed_format(&self, zed_scenario: ZedDebugConfig) -> Result<DebugScenario> {
-        self.extension.dap_config_to_scenario(zed_scenario).await
-    }
-
-    async fn request_kind(
-        &self,
-        config: &serde_json::Value,
-    ) -> Result<StartDebuggingRequestArgumentsRequest> {
-        self.extension
-            .dap_request_kind(self.debug_adapter_name.clone(), config.clone())
-            .await
-    }
-}
diff --git a/crates/debug_adapter_extension/src/extension_locator_adapter.rs b/crates/debug_adapter_extension/src/extension_locator_adapter.rs
deleted file mode 100644
index 55094ea7de..0000000000
--- a/crates/debug_adapter_extension/src/extension_locator_adapter.rs
+++ /dev/null
@@ -1,52 +0,0 @@
-use anyhow::Result;
-use async_trait::async_trait;
-use dap::{DapLocator, DebugRequest, adapters::DebugAdapterName};
-use extension::Extension;
-use gpui::SharedString;
-use std::sync::Arc;
-use task::{DebugScenario, SpawnInTerminal, TaskTemplate};
-
-pub(crate) struct ExtensionLocatorAdapter {
-    extension: Arc<dyn Extension>,
-    locator_name: SharedString,
-}
-
-impl ExtensionLocatorAdapter {
-    pub(crate) fn new(extension: Arc<dyn extension::Extension>, locator_name: Arc<str>) -> Self {
-        Self {
-            extension,
-            locator_name: SharedString::from(locator_name),
-        }
-    }
-}
-
-#[async_trait]
-impl DapLocator for ExtensionLocatorAdapter {
-    fn name(&self) -> SharedString {
-        self.locator_name.clone()
-    }
-    /// Determines whether this locator can generate debug target for given task.
-    async fn create_scenario(
-        &self,
-        build_config: &TaskTemplate,
-        resolved_label: &str,
-        adapter: &DebugAdapterName,
-    ) -> Option<DebugScenario> {
-        self.extension
-            .dap_locator_create_scenario(
-                self.locator_name.as_ref().to_owned(),
-                build_config.clone(),
-                resolved_label.to_owned(),
-                adapter.0.as_ref().to_owned(),
-            )
-            .await
-            .ok()
-            .flatten()
-    }
-
-    async fn run(&self, build_config: SpawnInTerminal) -> Result<DebugRequest> {
-        self.extension
-            .run_dap_locator(self.locator_name.as_ref().to_owned(), build_config)
-            .await
-    }
-}
diff --git a/crates/debugger_tools/Cargo.toml b/crates/debugger_tools/Cargo.toml
deleted file mode 100644
index c3f6dd9338..0000000000
--- a/crates/debugger_tools/Cargo.toml
+++ /dev/null
@@ -1,29 +0,0 @@
-[package]
-name = "debugger_tools"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/debugger_tools.rs"
-doctest = false
-
-[features]
-test-support = []
-
-[dependencies]
-anyhow.workspace = true
-dap.workspace = true
-editor.workspace = true
-futures.workspace = true
-gpui.workspace = true
-project.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-smol.workspace = true
-util.workspace = true
-workspace.workspace = true
diff --git a/crates/debugger_tools/LICENSE-GPL b/crates/debugger_tools/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/debugger_tools/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/debugger_tools/src/dap_log.rs b/crates/debugger_tools/src/dap_log.rs
deleted file mode 100644
index 317ce8b4c6..0000000000
--- a/crates/debugger_tools/src/dap_log.rs
+++ /dev/null
@@ -1,1146 +0,0 @@
-use dap::{
-    adapters::DebugAdapterName,
-    client::SessionId,
-    debugger_settings::DebuggerSettings,
-    transport::{IoKind, LogKind},
-};
-use editor::{Editor, EditorEvent};
-use futures::{
-    StreamExt,
-    channel::mpsc::{UnboundedSender, unbounded},
-};
-use gpui::{
-    App, AppContext, Context, Empty, Entity, EventEmitter, FocusHandle, Focusable, IntoElement,
-    ParentElement, Render, SharedString, Styled, Subscription, WeakEntity, Window, actions, div,
-};
-use project::{
-    Project,
-    debugger::{dap_store, session::Session},
-    search::SearchQuery,
-};
-use settings::Settings as _;
-use std::{
-    borrow::Cow,
-    collections::{BTreeMap, HashMap, VecDeque},
-    sync::Arc,
-};
-use util::maybe;
-use workspace::{
-    ToolbarItemEvent, ToolbarItemView, Workspace,
-    item::Item,
-    searchable::{Direction, SearchEvent, SearchableItem, SearchableItemHandle},
-    ui::{Button, Clickable, ContextMenu, Label, LabelCommon, PopoverMenu, h_flex},
-};
-
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
-enum View {
-    AdapterLogs,
-    RpcMessages,
-    InitializationSequence,
-}
-
-struct DapLogView {
-    editor: Entity<Editor>,
-    focus_handle: FocusHandle,
-    log_store: Entity<LogStore>,
-    editor_subscriptions: Vec<Subscription>,
-    current_view: Option<(SessionId, View)>,
-    project: Entity<Project>,
-    _subscriptions: Vec<Subscription>,
-}
-
-struct LogStoreEntryIdentifier<'a> {
-    session_id: SessionId,
-    project: Cow<'a, WeakEntity<Project>>,
-}
-impl LogStoreEntryIdentifier<'_> {
-    fn to_owned(&self) -> LogStoreEntryIdentifier<'static> {
-        LogStoreEntryIdentifier {
-            session_id: self.session_id,
-            project: Cow::Owned(self.project.as_ref().clone()),
-        }
-    }
-}
-
-struct LogStoreMessage {
-    id: LogStoreEntryIdentifier<'static>,
-    kind: IoKind,
-    command: Option<SharedString>,
-    message: SharedString,
-}
-
-pub struct LogStore {
-    projects: HashMap<WeakEntity<Project>, ProjectState>,
-    rpc_tx: UnboundedSender<LogStoreMessage>,
-    adapter_log_tx: UnboundedSender<LogStoreMessage>,
-}
-
-struct ProjectState {
-    debug_sessions: BTreeMap<SessionId, DebugAdapterState>,
-    _subscriptions: [gpui::Subscription; 2],
-}
-
-struct DebugAdapterState {
-    id: SessionId,
-    log_messages: VecDeque<SharedString>,
-    rpc_messages: RpcMessages,
-    session_label: SharedString,
-    adapter_name: DebugAdapterName,
-    has_adapter_logs: bool,
-    is_terminated: bool,
-}
-
-struct RpcMessages {
-    messages: VecDeque<SharedString>,
-    last_message_kind: Option<MessageKind>,
-    initialization_sequence: Vec<SharedString>,
-    last_init_message_kind: Option<MessageKind>,
-}
-
-impl RpcMessages {
-    const MESSAGE_QUEUE_LIMIT: usize = 255;
-
-    fn new() -> Self {
-        Self {
-            last_message_kind: None,
-            last_init_message_kind: None,
-            messages: VecDeque::with_capacity(Self::MESSAGE_QUEUE_LIMIT),
-            initialization_sequence: Vec::new(),
-        }
-    }
-}
-
-const SEND: &str = "// Send";
-const RECEIVE: &str = "// Receive";
-
-#[derive(Clone, Copy, PartialEq, Eq)]
-enum MessageKind {
-    Send,
-    Receive,
-}
-
-impl MessageKind {
-    fn label(&self) -> &'static str {
-        match self {
-            Self::Send => SEND,
-            Self::Receive => RECEIVE,
-        }
-    }
-}
-
-impl DebugAdapterState {
-    fn new(
-        id: SessionId,
-        adapter_name: DebugAdapterName,
-        session_label: SharedString,
-        has_adapter_logs: bool,
-    ) -> Self {
-        Self {
-            id,
-            log_messages: VecDeque::new(),
-            rpc_messages: RpcMessages::new(),
-            adapter_name,
-            session_label,
-            has_adapter_logs,
-            is_terminated: false,
-        }
-    }
-}
-
-impl LogStore {
-    pub fn new(cx: &Context<Self>) -> Self {
-        let (rpc_tx, mut rpc_rx) = unbounded::<LogStoreMessage>();
-        cx.spawn(async move |this, cx| {
-            while let Some(message) = rpc_rx.next().await {
-                if let Some(this) = this.upgrade() {
-                    this.update(cx, |this, cx| {
-                        this.add_debug_adapter_message(message, cx);
-                    })?;
-                }
-
-                smol::future::yield_now().await;
-            }
-            anyhow::Ok(())
-        })
-        .detach_and_log_err(cx);
-
-        let (adapter_log_tx, mut adapter_log_rx) = unbounded::<LogStoreMessage>();
-        cx.spawn(async move |this, cx| {
-            while let Some(message) = adapter_log_rx.next().await {
-                if let Some(this) = this.upgrade() {
-                    this.update(cx, |this, cx| {
-                        this.add_debug_adapter_log(message, cx);
-                    })?;
-                }
-
-                smol::future::yield_now().await;
-            }
-            anyhow::Ok(())
-        })
-        .detach_and_log_err(cx);
-        Self {
-            rpc_tx,
-            adapter_log_tx,
-            projects: HashMap::new(),
-        }
-    }
-
-    pub fn add_project(&mut self, project: &Entity<Project>, cx: &mut Context<Self>) {
-        self.projects.insert(
-            project.downgrade(),
-            ProjectState {
-                _subscriptions: [
-                    cx.observe_release(project, {
-                        let weak_project = project.downgrade();
-                        move |this, _, _| {
-                            this.projects.remove(&weak_project);
-                        }
-                    }),
-                    cx.subscribe(&project.read(cx).dap_store(), {
-                        let weak_project = project.downgrade();
-                        move |this, dap_store, event, cx| match event {
-                            dap_store::DapStoreEvent::DebugClientStarted(session_id) => {
-                                let session = dap_store.read(cx).session_by_id(session_id);
-                                if let Some(session) = session {
-                                    this.add_debug_session(
-                                        LogStoreEntryIdentifier {
-                                            project: Cow::Owned(weak_project.clone()),
-                                            session_id: *session_id,
-                                        },
-                                        session,
-                                        cx,
-                                    );
-                                }
-                            }
-                            dap_store::DapStoreEvent::DebugClientShutdown(session_id) => {
-                                let id = LogStoreEntryIdentifier {
-                                    project: Cow::Borrowed(&weak_project),
-                                    session_id: *session_id,
-                                };
-                                if let Some(state) = this.get_debug_adapter_state(&id) {
-                                    state.is_terminated = true;
-                                }
-
-                                this.clean_sessions(cx);
-                            }
-                            _ => {}
-                        }
-                    }),
-                ],
-                debug_sessions: Default::default(),
-            },
-        );
-    }
-
-    fn get_debug_adapter_state(
-        &mut self,
-        id: &LogStoreEntryIdentifier<'_>,
-    ) -> Option<&mut DebugAdapterState> {
-        self.projects
-            .get_mut(&id.project)
-            .and_then(|state| state.debug_sessions.get_mut(&id.session_id))
-    }
-
-    fn add_debug_adapter_message(
-        &mut self,
-        LogStoreMessage {
-            id,
-            kind: io_kind,
-            command,
-            message,
-        }: LogStoreMessage,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(debug_client_state) = self.get_debug_adapter_state(&id) else {
-            return;
-        };
-
-        let is_init_seq = command.as_ref().is_some_and(|command| {
-            matches!(
-                command.as_ref(),
-                "attach" | "launch" | "initialize" | "configurationDone"
-            )
-        });
-
-        let kind = match io_kind {
-            IoKind::StdOut | IoKind::StdErr => MessageKind::Receive,
-            IoKind::StdIn => MessageKind::Send,
-        };
-
-        let rpc_messages = &mut debug_client_state.rpc_messages;
-
-        // Push a separator if the kind has changed
-        if rpc_messages.last_message_kind != Some(kind) {
-            Self::get_debug_adapter_entry(
-                &mut rpc_messages.messages,
-                id.to_owned(),
-                kind.label().into(),
-                LogKind::Rpc,
-                cx,
-            );
-            rpc_messages.last_message_kind = Some(kind);
-        }
-
-        let entry = Self::get_debug_adapter_entry(
-            &mut rpc_messages.messages,
-            id.to_owned(),
-            message,
-            LogKind::Rpc,
-            cx,
-        );
-
-        if is_init_seq {
-            if rpc_messages.last_init_message_kind != Some(kind) {
-                rpc_messages
-                    .initialization_sequence
-                    .push(SharedString::from(kind.label()));
-                rpc_messages.last_init_message_kind = Some(kind);
-            }
-            rpc_messages.initialization_sequence.push(entry);
-        }
-
-        cx.notify();
-    }
-
-    fn add_debug_adapter_log(
-        &mut self,
-        LogStoreMessage {
-            id,
-            kind: io_kind,
-            message,
-            ..
-        }: LogStoreMessage,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(debug_adapter_state) = self.get_debug_adapter_state(&id) else {
-            return;
-        };
-
-        let message = match io_kind {
-            IoKind::StdErr => format!("stderr: {message}").into(),
-            _ => message,
-        };
-
-        Self::get_debug_adapter_entry(
-            &mut debug_adapter_state.log_messages,
-            id.to_owned(),
-            message,
-            LogKind::Adapter,
-            cx,
-        );
-        cx.notify();
-    }
-
-    fn get_debug_adapter_entry(
-        log_lines: &mut VecDeque<SharedString>,
-        id: LogStoreEntryIdentifier<'static>,
-        message: SharedString,
-        kind: LogKind,
-        cx: &mut Context<Self>,
-    ) -> SharedString {
-        if let Some(excess) = log_lines
-            .len()
-            .checked_sub(RpcMessages::MESSAGE_QUEUE_LIMIT)
-            && excess > 0
-        {
-            log_lines.drain(..excess);
-        }
-
-        let format_messages = DebuggerSettings::get_global(cx).format_dap_log_messages;
-
-        let entry = if format_messages {
-            maybe!({
-                serde_json::to_string_pretty::<serde_json::Value>(
-                    &serde_json::from_str(&message).ok()?,
-                )
-                .ok()
-            })
-            .map(SharedString::from)
-            .unwrap_or(message)
-        } else {
-            message
-        };
-        log_lines.push_back(entry.clone());
-
-        cx.emit(Event::NewLogEntry {
-            id,
-            entry: entry.clone(),
-            kind,
-        });
-
-        entry
-    }
-
-    fn add_debug_session(
-        &mut self,
-        id: LogStoreEntryIdentifier<'static>,
-        session: Entity<Session>,
-        cx: &mut Context<Self>,
-    ) {
-        maybe!({
-            let project_entry = self.projects.get_mut(&id.project)?;
-            let std::collections::btree_map::Entry::Vacant(state) =
-                project_entry.debug_sessions.entry(id.session_id)
-            else {
-                return None;
-            };
-
-            let (adapter_name, session_label, has_adapter_logs) =
-                session.read_with(cx, |session, _| {
-                    (
-                        session.adapter(),
-                        session.label(),
-                        session
-                            .adapter_client()
-                            .is_some_and(|client| client.has_adapter_logs()),
-                    )
-                });
-
-            state.insert(DebugAdapterState::new(
-                id.session_id,
-                adapter_name,
-                session_label
-                    .unwrap_or_else(|| format!("Session {} (child)", id.session_id.0).into()),
-                has_adapter_logs,
-            ));
-
-            self.clean_sessions(cx);
-
-            let io_tx = self.rpc_tx.clone();
-
-            let client = session.read(cx).adapter_client()?;
-            let project = id.project.clone();
-            let session_id = id.session_id;
-            client.add_log_handler(
-                move |kind, command, message| {
-                    io_tx
-                        .unbounded_send(LogStoreMessage {
-                            id: LogStoreEntryIdentifier {
-                                session_id,
-                                project: project.clone(),
-                            },
-                            kind,
-                            command: command.map(|command| command.to_owned().into()),
-                            message: message.to_owned().into(),
-                        })
-                        .ok();
-                },
-                LogKind::Rpc,
-            );
-
-            let log_io_tx = self.adapter_log_tx.clone();
-            let project = id.project;
-            client.add_log_handler(
-                move |kind, command, message| {
-                    log_io_tx
-                        .unbounded_send(LogStoreMessage {
-                            id: LogStoreEntryIdentifier {
-                                session_id,
-                                project: project.clone(),
-                            },
-                            kind,
-                            command: command.map(|command| command.to_owned().into()),
-                            message: message.to_owned().into(),
-                        })
-                        .ok();
-                },
-                LogKind::Adapter,
-            );
-            Some(())
-        });
-    }
-
-    fn clean_sessions(&mut self, cx: &mut Context<Self>) {
-        self.projects.values_mut().for_each(|project| {
-            let mut allowed_terminated_sessions = 10u32;
-            project.debug_sessions.retain(|_, session| {
-                if !session.is_terminated {
-                    return true;
-                }
-                allowed_terminated_sessions = allowed_terminated_sessions.saturating_sub(1);
-                allowed_terminated_sessions > 0
-            });
-        });
-
-        cx.notify();
-    }
-
-    fn log_messages_for_session(
-        &mut self,
-        id: &LogStoreEntryIdentifier<'_>,
-    ) -> Option<&mut VecDeque<SharedString>> {
-        self.get_debug_adapter_state(id)
-            .map(|state| &mut state.log_messages)
-    }
-
-    fn rpc_messages_for_session(
-        &mut self,
-        id: &LogStoreEntryIdentifier<'_>,
-    ) -> Option<&mut VecDeque<SharedString>> {
-        self.get_debug_adapter_state(id)
-            .map(|state| &mut state.rpc_messages.messages)
-    }
-
-    fn initialization_sequence_for_session(
-        &mut self,
-        id: &LogStoreEntryIdentifier<'_>,
-    ) -> Option<&Vec<SharedString>> {
-        self.get_debug_adapter_state(id)
-            .map(|state| &state.rpc_messages.initialization_sequence)
-    }
-}
-
-pub struct DapLogToolbarItemView {
-    log_view: Option<Entity<DapLogView>>,
-}
-
-impl DapLogToolbarItemView {
-    pub fn new() -> Self {
-        Self { log_view: None }
-    }
-}
-
-impl Render for DapLogToolbarItemView {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let Some(log_view) = self.log_view.clone() else {
-            return Empty.into_any_element();
-        };
-
-        let (menu_rows, current_session_id, project) = log_view.update(cx, |log_view, cx| {
-            (
-                log_view.menu_items(cx),
-                log_view.current_view.map(|(session_id, _)| session_id),
-                log_view.project.downgrade(),
-            )
-        });
-
-        let current_client = current_session_id
-            .and_then(|session_id| menu_rows.iter().find(|row| row.session_id == session_id));
-
-        let dap_menu: PopoverMenu<_> = PopoverMenu::new("DapLogView")
-            .anchor(gpui::Corner::TopLeft)
-            .trigger(Button::new(
-                "debug_client_menu_header",
-                current_client
-                    .map(|sub_item| {
-                        Cow::Owned(format!(
-                            "{} - {} - {}",
-                            sub_item.adapter_name,
-                            sub_item.session_label,
-                            match sub_item.selected_entry {
-                                View::AdapterLogs => ADAPTER_LOGS,
-                                View::RpcMessages => RPC_MESSAGES,
-                                View::InitializationSequence => INITIALIZATION_SEQUENCE,
-                            }
-                        ))
-                    })
-                    .unwrap_or_else(|| "No adapter selected".into()),
-            ))
-            .menu(move |window, cx| {
-                let log_view = log_view.clone();
-                let menu_rows = menu_rows.clone();
-                let project = project.clone();
-                ContextMenu::build(window, cx, move |mut menu, window, _cx| {
-                    for row in menu_rows.into_iter() {
-                        menu = menu.custom_row(move |_window, _cx| {
-                            div()
-                                .w_full()
-                                .pl_2()
-                                .child(
-                                    Label::new(format!(
-                                        "{} - {}",
-                                        row.adapter_name, row.session_label
-                                    ))
-                                    .color(workspace::ui::Color::Muted),
-                                )
-                                .into_any_element()
-                        });
-
-                        if row.has_adapter_logs {
-                            menu = menu.custom_entry(
-                                move |_window, _cx| {
-                                    div()
-                                        .w_full()
-                                        .pl_4()
-                                        .child(Label::new(ADAPTER_LOGS))
-                                        .into_any_element()
-                                },
-                                window.handler_for(&log_view, {
-                                    let project = project.clone();
-                                    let id = LogStoreEntryIdentifier {
-                                        project: Cow::Owned(project),
-                                        session_id: row.session_id,
-                                    };
-                                    move |view, window, cx| {
-                                        view.show_log_messages_for_adapter(&id, window, cx);
-                                    }
-                                }),
-                            );
-                        }
-
-                        menu = menu
-                            .custom_entry(
-                                move |_window, _cx| {
-                                    div()
-                                        .w_full()
-                                        .pl_4()
-                                        .child(Label::new(RPC_MESSAGES))
-                                        .into_any_element()
-                                },
-                                window.handler_for(&log_view, {
-                                    let project = project.clone();
-                                    let id = LogStoreEntryIdentifier {
-                                        project: Cow::Owned(project),
-                                        session_id: row.session_id,
-                                    };
-                                    move |view, window, cx| {
-                                        view.show_rpc_trace_for_server(&id, window, cx);
-                                    }
-                                }),
-                            )
-                            .custom_entry(
-                                move |_window, _cx| {
-                                    div()
-                                        .w_full()
-                                        .pl_4()
-                                        .child(Label::new(INITIALIZATION_SEQUENCE))
-                                        .into_any_element()
-                                },
-                                window.handler_for(&log_view, {
-                                    let project = project.clone();
-                                    let id = LogStoreEntryIdentifier {
-                                        project: Cow::Owned(project),
-                                        session_id: row.session_id,
-                                    };
-                                    move |view, window, cx| {
-                                        view.show_initialization_sequence_for_server(
-                                            &id, window, cx,
-                                        );
-                                    }
-                                }),
-                            );
-                    }
-
-                    menu
-                })
-                .into()
-            });
-
-        h_flex()
-            .size_full()
-            .child(dap_menu)
-            .child(
-                div()
-                    .child(
-                        Button::new("clear_log_button", "Clear").on_click(cx.listener(
-                            |this, _, window, cx| {
-                                if let Some(log_view) = this.log_view.as_ref() {
-                                    log_view.update(cx, |log_view, cx| {
-                                        log_view.editor.update(cx, |editor, cx| {
-                                            editor.set_read_only(false);
-                                            editor.clear(window, cx);
-                                            editor.set_read_only(true);
-                                        });
-                                    })
-                                }
-                            },
-                        )),
-                    )
-                    .ml_2(),
-            )
-            .into_any_element()
-    }
-}
-
-impl EventEmitter<ToolbarItemEvent> for DapLogToolbarItemView {}
-
-impl ToolbarItemView for DapLogToolbarItemView {
-    fn set_active_pane_item(
-        &mut self,
-        active_pane_item: Option<&dyn workspace::item::ItemHandle>,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> workspace::ToolbarItemLocation {
-        if let Some(item) = active_pane_item
-            && let Some(log_view) = item.downcast::<DapLogView>()
-        {
-            self.log_view = Some(log_view);
-            return workspace::ToolbarItemLocation::PrimaryLeft;
-        }
-        self.log_view = None;
-
-        cx.notify();
-
-        workspace::ToolbarItemLocation::Hidden
-    }
-}
-
-impl DapLogView {
-    pub fn new(
-        project: Entity<Project>,
-        log_store: Entity<LogStore>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let (editor, editor_subscriptions) = Self::editor_for_logs(String::new(), window, cx);
-
-        let focus_handle = cx.focus_handle();
-
-        let events_subscriptions = cx.subscribe(&log_store, |log_view, _, event, cx| match event {
-            Event::NewLogEntry { id, entry, kind } => {
-                let is_current_view = match (log_view.current_view, *kind) {
-                    (Some((i, View::AdapterLogs)), LogKind::Adapter)
-                    | (Some((i, View::RpcMessages)), LogKind::Rpc)
-                        if i == id.session_id =>
-                    {
-                        log_view.project == *id.project
-                    }
-                    _ => false,
-                };
-                if is_current_view {
-                    log_view.editor.update(cx, |editor, cx| {
-                        editor.set_read_only(false);
-                        let last_point = editor.buffer().read(cx).len(cx);
-                        editor.edit(
-                            vec![
-                                (last_point..last_point, entry.trim()),
-                                (last_point..last_point, "\n"),
-                            ],
-                            cx,
-                        );
-                        editor.set_read_only(true);
-                    });
-                }
-            }
-        });
-        let weak_project = project.downgrade();
-        let state_info = log_store
-            .read(cx)
-            .projects
-            .get(&weak_project)
-            .and_then(|project| {
-                project
-                    .debug_sessions
-                    .values()
-                    .next_back()
-                    .map(|session| (session.id, session.has_adapter_logs))
-            });
-
-        let mut this = Self {
-            editor,
-            focus_handle,
-            project,
-            log_store,
-            editor_subscriptions,
-            current_view: None,
-            _subscriptions: vec![events_subscriptions],
-        };
-
-        if let Some((session_id, have_adapter_logs)) = state_info {
-            let id = LogStoreEntryIdentifier {
-                session_id,
-                project: Cow::Owned(weak_project),
-            };
-            if have_adapter_logs {
-                this.show_log_messages_for_adapter(&id, window, cx);
-            } else {
-                this.show_rpc_trace_for_server(&id, window, cx);
-            }
-        }
-
-        this
-    }
-
-    fn editor_for_logs(
-        log_contents: String,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> (Entity<Editor>, Vec<Subscription>) {
-        let editor = cx.new(|cx| {
-            let mut editor = Editor::multi_line(window, cx);
-            editor.set_text(log_contents, window, cx);
-            editor.move_to_end(&editor::actions::MoveToEnd, window, cx);
-            editor.set_show_code_actions(false, cx);
-            editor.set_show_breakpoints(false, cx);
-            editor.set_show_git_diff_gutter(false, cx);
-            editor.set_show_runnables(false, cx);
-            editor.set_input_enabled(false);
-            editor.set_use_autoclose(false);
-            editor.set_read_only(true);
-            editor.set_show_edit_predictions(Some(false), window, cx);
-            editor
-        });
-        let editor_subscription = cx.subscribe(
-            &editor,
-            |_, _, event: &EditorEvent, cx: &mut Context<DapLogView>| cx.emit(event.clone()),
-        );
-        let search_subscription = cx.subscribe(
-            &editor,
-            |_, _, event: &SearchEvent, cx: &mut Context<DapLogView>| cx.emit(event.clone()),
-        );
-        (editor, vec![editor_subscription, search_subscription])
-    }
-
-    fn menu_items(&self, cx: &App) -> Vec<DapMenuItem> {
-        self.log_store
-            .read(cx)
-            .projects
-            .get(&self.project.downgrade())
-            .map_or_else(Vec::new, |state| {
-                state
-                    .debug_sessions
-                    .values()
-                    .rev()
-                    .map(|state| DapMenuItem {
-                        session_id: state.id,
-                        adapter_name: state.adapter_name.clone(),
-                        session_label: state.session_label.clone(),
-                        has_adapter_logs: state.has_adapter_logs,
-                        selected_entry: self
-                            .current_view
-                            .map_or(View::AdapterLogs, |(_, kind)| kind),
-                    })
-                    .collect::<Vec<_>>()
-            })
-    }
-
-    fn show_rpc_trace_for_server(
-        &mut self,
-        id: &LogStoreEntryIdentifier<'_>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let rpc_log = self.log_store.update(cx, |log_store, _| {
-            log_store
-                .rpc_messages_for_session(id)
-                .map(|state| log_contents(state.iter().cloned()))
-        });
-        if let Some(rpc_log) = rpc_log {
-            self.current_view = Some((id.session_id, View::RpcMessages));
-            let (editor, editor_subscriptions) = Self::editor_for_logs(rpc_log, window, cx);
-            let language = self.project.read(cx).languages().language_for_name("JSON");
-            editor
-                .read(cx)
-                .buffer()
-                .read(cx)
-                .as_singleton()
-                .expect("log buffer should be a singleton")
-                .update(cx, |_, cx| {
-                    cx.spawn({
-                        async move |buffer, cx| {
-                            let language = language.await.ok();
-                            buffer.update(cx, |buffer, cx| {
-                                buffer.set_language(language, cx);
-                            })
-                        }
-                    })
-                    .detach_and_log_err(cx);
-                });
-
-            self.editor = editor;
-            self.editor_subscriptions = editor_subscriptions;
-            cx.notify();
-        }
-
-        cx.focus_self(window);
-    }
-
-    fn show_log_messages_for_adapter(
-        &mut self,
-        id: &LogStoreEntryIdentifier<'_>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let message_log = self.log_store.update(cx, |log_store, _| {
-            log_store
-                .log_messages_for_session(id)
-                .map(|state| log_contents(state.iter().cloned()))
-        });
-        if let Some(message_log) = message_log {
-            self.current_view = Some((id.session_id, View::AdapterLogs));
-            let (editor, editor_subscriptions) = Self::editor_for_logs(message_log, window, cx);
-            editor
-                .read(cx)
-                .buffer()
-                .read(cx)
-                .as_singleton()
-                .expect("log buffer should be a singleton");
-
-            self.editor = editor;
-            self.editor_subscriptions = editor_subscriptions;
-            cx.notify();
-        }
-
-        cx.focus_self(window);
-    }
-
-    fn show_initialization_sequence_for_server(
-        &mut self,
-        id: &LogStoreEntryIdentifier<'_>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let rpc_log = self.log_store.update(cx, |log_store, _| {
-            log_store
-                .initialization_sequence_for_session(id)
-                .map(|state| log_contents(state.iter().cloned()))
-        });
-        if let Some(rpc_log) = rpc_log {
-            self.current_view = Some((id.session_id, View::InitializationSequence));
-            let (editor, editor_subscriptions) = Self::editor_for_logs(rpc_log, window, cx);
-            let language = self.project.read(cx).languages().language_for_name("JSON");
-            editor
-                .read(cx)
-                .buffer()
-                .read(cx)
-                .as_singleton()
-                .expect("log buffer should be a singleton")
-                .update(cx, |_, cx| {
-                    cx.spawn({
-                        let buffer = cx.entity();
-                        async move |_, cx| {
-                            let language = language.await.ok();
-                            buffer.update(cx, |buffer, cx| {
-                                buffer.set_language(language, cx);
-                            })
-                        }
-                    })
-                    .detach_and_log_err(cx);
-                });
-
-            self.editor = editor;
-            self.editor_subscriptions = editor_subscriptions;
-            cx.notify();
-        }
-
-        cx.focus_self(window);
-    }
-}
-
-fn log_contents(lines: impl Iterator<Item = SharedString>) -> String {
-    lines.fold(String::new(), |mut acc, el| {
-        acc.push_str(&el);
-        acc.push('\n');
-        acc
-    })
-}
-
-#[derive(Clone, PartialEq)]
-struct DapMenuItem {
-    session_id: SessionId,
-    session_label: SharedString,
-    adapter_name: DebugAdapterName,
-    has_adapter_logs: bool,
-    selected_entry: View,
-}
-
-const ADAPTER_LOGS: &str = "Adapter Logs";
-const RPC_MESSAGES: &str = "RPC Messages";
-const INITIALIZATION_SEQUENCE: &str = "Initialization Sequence";
-
-impl Render for DapLogView {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        self.editor.update(cx, |editor, cx| {
-            editor.render(window, cx).into_any_element()
-        })
-    }
-}
-
-actions!(
-    dev,
-    [
-        /// Opens the debug adapter protocol logs viewer.
-        OpenDebugAdapterLogs
-    ]
-);
-
-pub fn init(cx: &mut App) {
-    let log_store = cx.new(|cx| LogStore::new(cx));
-
-    cx.observe_new(move |workspace: &mut Workspace, window, cx| {
-        let Some(_window) = window else {
-            return;
-        };
-
-        let project = workspace.project();
-        log_store.update(cx, |store, cx| {
-            store.add_project(project, cx);
-        });
-
-        let log_store = log_store.clone();
-        workspace.register_action(move |workspace, _: &OpenDebugAdapterLogs, window, cx| {
-            workspace.add_item_to_active_pane(
-                Box::new(cx.new(|cx| {
-                    DapLogView::new(workspace.project().clone(), log_store.clone(), window, cx)
-                })),
-                None,
-                true,
-                window,
-                cx,
-            );
-        });
-    })
-    .detach();
-}
-
-impl Item for DapLogView {
-    type Event = EditorEvent;
-
-    fn to_item_events(event: &Self::Event, f: impl FnMut(workspace::item::ItemEvent)) {
-        Editor::to_item_events(event, f)
-    }
-
-    fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString {
-        "DAP Logs".into()
-    }
-
-    fn telemetry_event_text(&self) -> Option<&'static str> {
-        None
-    }
-
-    fn as_searchable(
-        &self,
-        handle: &Entity<Self>,
-        _: &App,
-    ) -> Option<Box<dyn SearchableItemHandle>> {
-        Some(Box::new(handle.clone()))
-    }
-}
-
-impl SearchableItem for DapLogView {
-    type Match = <Editor as SearchableItem>::Match;
-
-    fn clear_matches(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.editor.update(cx, |e, cx| e.clear_matches(window, cx))
-    }
-
-    fn update_matches(
-        &mut self,
-        matches: &[Self::Match],
-        active_match_index: Option<usize>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.editor.update(cx, |e, cx| {
-            e.update_matches(matches, active_match_index, window, cx)
-        })
-    }
-
-    fn query_suggestion(&mut self, window: &mut Window, cx: &mut Context<Self>) -> String {
-        self.editor
-            .update(cx, |e, cx| e.query_suggestion(window, cx))
-    }
-
-    fn activate_match(
-        &mut self,
-        index: usize,
-        matches: &[Self::Match],
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.editor
-            .update(cx, |e, cx| e.activate_match(index, matches, window, cx))
-    }
-
-    fn select_matches(
-        &mut self,
-        matches: &[Self::Match],
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.editor
-            .update(cx, |e, cx| e.select_matches(matches, window, cx))
-    }
-
-    fn find_matches(
-        &mut self,
-        query: Arc<project::search::SearchQuery>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> gpui::Task<Vec<Self::Match>> {
-        self.editor
-            .update(cx, |e, cx| e.find_matches(query, window, cx))
-    }
-
-    fn replace(
-        &mut self,
-        _: &Self::Match,
-        _: &SearchQuery,
-        _window: &mut Window,
-        _: &mut Context<Self>,
-    ) {
-        // Since DAP Log is read-only, it doesn't make sense to support replace operation.
-    }
-
-    fn supported_options(&self) -> workspace::searchable::SearchOptions {
-        workspace::searchable::SearchOptions {
-            case: true,
-            word: true,
-            regex: true,
-            find_in_results: true,
-            // DAP log is read-only.
-            replacement: false,
-            selection: false,
-        }
-    }
-    fn active_match_index(
-        &mut self,
-        direction: Direction,
-        matches: &[Self::Match],
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<usize> {
-        self.editor.update(cx, |e, cx| {
-            e.active_match_index(direction, matches, window, cx)
-        })
-    }
-}
-
-impl Focusable for DapLogView {
-    fn focus_handle(&self, _cx: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-enum Event {
-    NewLogEntry {
-        id: LogStoreEntryIdentifier<'static>,
-        entry: SharedString,
-        kind: LogKind,
-    },
-}
-
-impl EventEmitter<Event> for LogStore {}
-impl EventEmitter<Event> for DapLogView {}
-impl EventEmitter<EditorEvent> for DapLogView {}
-impl EventEmitter<SearchEvent> for DapLogView {}
-
-#[cfg(any(test, feature = "test-support"))]
-impl LogStore {
-    pub fn has_projects(&self) -> bool {
-        !self.projects.is_empty()
-    }
-
-    pub fn contained_session_ids(&self, project: &WeakEntity<Project>) -> Vec<SessionId> {
-        self.projects.get(project).map_or(vec![], |state| {
-            state.debug_sessions.keys().copied().collect()
-        })
-    }
-
-    pub fn rpc_messages_for_session_id(
-        &self,
-        project: &WeakEntity<Project>,
-        session_id: SessionId,
-    ) -> Vec<SharedString> {
-        self.projects.get(project).map_or(vec![], |state| {
-            state
-                .debug_sessions
-                .get(&session_id)
-                .expect("This session should exist if a test is calling")
-                .rpc_messages
-                .messages
-                .clone()
-                .into()
-        })
-    }
-}
diff --git a/crates/debugger_tools/src/debugger_tools.rs b/crates/debugger_tools/src/debugger_tools.rs
deleted file mode 100644
index da7a43b53b..0000000000
--- a/crates/debugger_tools/src/debugger_tools.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-mod dap_log;
-pub use dap_log::*;
-
-use gpui::App;
-
-pub fn init(cx: &mut App) {
-    dap_log::init(cx);
-}
diff --git a/crates/debugger_ui/Cargo.toml b/crates/debugger_ui/Cargo.toml
deleted file mode 100644
index fb79b1b079..0000000000
--- a/crates/debugger_ui/Cargo.toml
+++ /dev/null
@@ -1,92 +0,0 @@
-[package]
-name = "debugger_ui"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/debugger_ui.rs"
-doctest = false
-
-[features]
-test-support = [
-    "dap/test-support",
-    "dap_adapters/test-support",
-    "debugger_tools/test-support",
-    "editor/test-support",
-    "gpui/test-support",
-    "project/test-support",
-    "util/test-support",
-    "workspace/test-support",
-    "unindent",
-]
-
-[dependencies]
-alacritty_terminal.workspace = true
-anyhow.workspace = true
-bitflags.workspace = true
-client.workspace = true
-collections.workspace = true
-command_palette_hooks.workspace = true
-dap.workspace = true
-dap_adapters = { workspace = true, optional = true }
-db.workspace = true
-debugger_tools.workspace = true
-editor.workspace = true
-feature_flags.workspace = true
-file_icons.workspace = true
-futures.workspace = true
-fuzzy.workspace = true
-gpui.workspace = true
-hex.workspace = true
-indoc.workspace = true
-itertools.workspace = true
-language.workspace = true
-log.workspace = true
-menu.workspace = true
-notifications.workspace = true
-parking_lot.workspace = true
-parse_int.workspace = true
-paths.workspace = true
-picker.workspace = true
-pretty_assertions.workspace = true
-project.workspace = true
-rpc.workspace = true
-schemars.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-serde_json_lenient.workspace = true
-settings.workspace = true
-sysinfo.workspace = true
-task.workspace = true
-tasks_ui.workspace = true
-telemetry.workspace = true
-terminal_view.workspace = true
-text.workspace = true
-theme.workspace = true
-tree-sitter-json.workspace = true
-tree-sitter.workspace = true
-ui.workspace = true
-ui_input.workspace = true
-unindent = { workspace = true, optional = true }
-util.workspace = true
-workspace.workspace = true
-zed_actions.workspace = true
-
-[dev-dependencies]
-dap = { workspace = true, features = ["test-support"] }
-dap_adapters = { workspace = true, features = ["test-support"] }
-debugger_tools = { workspace = true, features = ["test-support"] }
-editor = { workspace = true, features = ["test-support"] }
-gpui = { workspace = true, features = ["test-support"] }
-language = { workspace = true, features = ["test-support"] }
-project = { workspace = true, features = ["test-support"] }
-tree-sitter-go.workspace = true
-unindent.workspace = true
-util = { workspace = true, features = ["test-support"] }
-workspace = { workspace = true, features = ["test-support"] }
-zlog.workspace = true
diff --git a/crates/debugger_ui/LICENSE-GPL b/crates/debugger_ui/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/debugger_ui/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/debugger_ui/src/attach_modal.rs b/crates/debugger_ui/src/attach_modal.rs
deleted file mode 100644
index 6e537ae0c6..0000000000
--- a/crates/debugger_ui/src/attach_modal.rs
+++ /dev/null
@@ -1,439 +0,0 @@
-use dap::{DapRegistry, DebugRequest};
-use futures::channel::oneshot;
-use fuzzy::{StringMatch, StringMatchCandidate};
-use gpui::{AppContext, DismissEvent, Entity, EventEmitter, Focusable, Render, Task};
-use gpui::{Subscription, WeakEntity};
-use picker::{Picker, PickerDelegate};
-use project::Project;
-use rpc::proto;
-use task::ZedDebugConfig;
-use util::debug_panic;
-
-use std::sync::Arc;
-
-use sysinfo::{ProcessRefreshKind, RefreshKind, System, UpdateKind};
-use ui::{Context, Tooltip, prelude::*};
-use ui::{ListItem, ListItemSpacing};
-use workspace::{ModalView, Workspace};
-
-use crate::debugger_panel::DebugPanel;
-
-#[derive(Debug, Clone)]
-pub(super) struct Candidate {
-    pub(super) pid: u32,
-    pub(super) name: SharedString,
-    pub(super) command: Vec<String>,
-}
-
-pub(crate) enum ModalIntent {
-    ResolveProcessId(Option<oneshot::Sender<Option<i32>>>),
-    AttachToProcess(ZedDebugConfig),
-}
-
-pub(crate) struct AttachModalDelegate {
-    selected_index: usize,
-    matches: Vec<StringMatch>,
-    placeholder_text: Arc<str>,
-    pub(crate) intent: ModalIntent,
-    workspace: WeakEntity<Workspace>,
-    candidates: Arc<[Candidate]>,
-}
-
-impl AttachModalDelegate {
-    fn new(
-        workspace: WeakEntity<Workspace>,
-        intent: ModalIntent,
-        candidates: Arc<[Candidate]>,
-    ) -> Self {
-        Self {
-            workspace,
-            candidates,
-            intent,
-            selected_index: 0,
-            matches: Vec::default(),
-            placeholder_text: Arc::from("Select the process you want to attach the debugger to"),
-        }
-    }
-}
-
-pub struct AttachModal {
-    _subscription: Subscription,
-    pub(crate) picker: Entity<Picker<AttachModalDelegate>>,
-}
-
-impl AttachModal {
-    pub(crate) fn new(
-        intent: ModalIntent,
-        workspace: WeakEntity<Workspace>,
-        project: Entity<Project>,
-        modal: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let processes_task = get_processes_for_project(&project, cx);
-
-        let modal = Self::with_processes(workspace, Arc::new([]), modal, intent, window, cx);
-
-        cx.spawn_in(window, async move |this, cx| {
-            let processes = processes_task.await;
-            this.update_in(cx, |modal, window, cx| {
-                modal.picker.update(cx, |picker, cx| {
-                    picker.delegate.candidates = processes;
-                    picker.refresh(window, cx);
-                });
-            })?;
-            anyhow::Ok(())
-        })
-        .detach_and_log_err(cx);
-
-        modal
-    }
-
-    pub(super) fn with_processes(
-        workspace: WeakEntity<Workspace>,
-        processes: Arc<[Candidate]>,
-        modal: bool,
-        intent: ModalIntent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let picker = cx.new(|cx| {
-            Picker::uniform_list(
-                AttachModalDelegate::new(workspace, intent, processes),
-                window,
-                cx,
-            )
-            .modal(modal)
-        });
-        Self {
-            _subscription: cx.subscribe(&picker, |_, _, _, cx| {
-                cx.emit(DismissEvent);
-            }),
-            picker,
-        }
-    }
-}
-
-impl Render for AttachModal {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl ui::IntoElement {
-        v_flex()
-            .key_context("AttachModal")
-            .track_focus(&self.focus_handle(cx))
-            .w(rems(34.))
-            .child(self.picker.clone())
-    }
-}
-
-impl EventEmitter<DismissEvent> for AttachModal {}
-
-impl Focusable for AttachModal {
-    fn focus_handle(&self, cx: &App) -> gpui::FocusHandle {
-        self.picker.read(cx).focus_handle(cx)
-    }
-}
-
-impl ModalView for AttachModal {}
-
-impl PickerDelegate for AttachModalDelegate {
-    type ListItem = ListItem;
-
-    fn match_count(&self) -> usize {
-        self.matches.len()
-    }
-
-    fn selected_index(&self) -> usize {
-        self.selected_index
-    }
-
-    fn set_selected_index(
-        &mut self,
-        ix: usize,
-        _window: &mut Window,
-        _: &mut Context<Picker<Self>>,
-    ) {
-        self.selected_index = ix;
-    }
-
-    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> std::sync::Arc<str> {
-        self.placeholder_text.clone()
-    }
-
-    fn update_matches(
-        &mut self,
-        query: String,
-        _window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> gpui::Task<()> {
-        cx.spawn(async move |this, cx| {
-            let Some(processes) = this
-                .read_with(cx, |this, _| this.delegate.candidates.clone())
-                .ok()
-            else {
-                return;
-            };
-
-            let matches = fuzzy::match_strings(
-                &processes
-                    .iter()
-                    .enumerate()
-                    .map(|(id, candidate)| {
-                        StringMatchCandidate::new(
-                            id,
-                            format!(
-                                "{} {} {}",
-                                candidate.command.join(" "),
-                                candidate.pid,
-                                candidate.name
-                            )
-                            .as_str(),
-                        )
-                    })
-                    .collect::<Vec<_>>(),
-                &query,
-                true,
-                true,
-                100,
-                &Default::default(),
-                cx.background_executor().clone(),
-            )
-            .await;
-
-            this.update(cx, |this, _| {
-                let delegate = &mut this.delegate;
-
-                delegate.matches = matches;
-
-                if delegate.matches.is_empty() {
-                    delegate.selected_index = 0;
-                } else {
-                    delegate.selected_index =
-                        delegate.selected_index.min(delegate.matches.len() - 1);
-                }
-            })
-            .ok();
-        })
-    }
-
-    fn confirm(&mut self, _secondary: bool, window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        let candidate = self
-            .matches
-            .get(self.selected_index())
-            .and_then(|current_match| {
-                let ix = current_match.candidate_id;
-                self.candidates.get(ix)
-            });
-
-        match &mut self.intent {
-            ModalIntent::ResolveProcessId(sender) => {
-                cx.emit(DismissEvent);
-
-                if let Some(sender) = sender.take() {
-                    sender
-                        .send(candidate.map(|candidate| candidate.pid as i32))
-                        .ok();
-                }
-            }
-            ModalIntent::AttachToProcess(definition) => {
-                let Some(candidate) = candidate else {
-                    return cx.emit(DismissEvent);
-                };
-
-                match &mut definition.request {
-                    DebugRequest::Attach(config) => {
-                        config.process_id = Some(candidate.pid);
-                    }
-                    DebugRequest::Launch(_) => {
-                        debug_panic!("Debugger attach modal used on launch debug config");
-                        return;
-                    }
-                }
-
-                let workspace = self.workspace.clone();
-                let Some(panel) = workspace
-                    .update(cx, |workspace, cx| workspace.panel::<DebugPanel>(cx))
-                    .ok()
-                    .flatten()
-                else {
-                    return;
-                };
-
-                let Some(adapter) = cx.read_global::<DapRegistry, _>(|registry, _| {
-                    registry.adapter(&definition.adapter)
-                }) else {
-                    return;
-                };
-
-                let definition = definition.clone();
-                cx.spawn_in(window, async move |this, cx| {
-                    let Ok(scenario) = adapter.config_from_zed_format(definition).await else {
-                        return;
-                    };
-
-                    panel
-                        .update_in(cx, |panel, window, cx| {
-                            panel.start_session(
-                                scenario,
-                                Default::default(),
-                                None,
-                                None,
-                                window,
-                                cx,
-                            );
-                        })
-                        .ok();
-                    this.update(cx, |_, cx| {
-                        cx.emit(DismissEvent);
-                    })
-                    .ok();
-                })
-                .detach();
-            }
-        }
-    }
-
-    fn dismissed(&mut self, _window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        self.selected_index = 0;
-
-        match &mut self.intent {
-            ModalIntent::ResolveProcessId(sender) => {
-                if let Some(sender) = sender.take() {
-                    sender.send(None).ok();
-                }
-            }
-            ModalIntent::AttachToProcess(_) => {}
-        }
-
-        cx.emit(DismissEvent);
-    }
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        _window: &mut Window,
-        _: &mut Context<Picker<Self>>,
-    ) -> Option<Self::ListItem> {
-        let hit = &self.matches.get(ix)?;
-        let candidate = self.candidates.get(hit.candidate_id)?;
-
-        Some(
-            ListItem::new(format!("process-entry-{ix}"))
-                .inset(true)
-                .spacing(ListItemSpacing::Sparse)
-                .toggle_state(selected)
-                .child(
-                    v_flex()
-                        .items_start()
-                        .child(Label::new(format!("{} {}", candidate.name, candidate.pid)))
-                        .child(
-                            div()
-                                .id(format!("process-entry-{ix}-command"))
-                                .tooltip(Tooltip::text(
-                                    candidate
-                                        .command
-                                        .clone()
-                                        .into_iter()
-                                        .collect::<Vec<_>>()
-                                        .join(" "),
-                                ))
-                                .child(
-                                    Label::new(format!(
-                                        "{} {}",
-                                        candidate.name,
-                                        candidate
-                                            .command
-                                            .clone()
-                                            .into_iter()
-                                            .skip(1)
-                                            .collect::<Vec<_>>()
-                                            .join(" ")
-                                    ))
-                                    .size(LabelSize::Small)
-                                    .color(Color::Muted),
-                                ),
-                        ),
-                ),
-        )
-    }
-}
-
-fn get_processes_for_project(project: &Entity<Project>, cx: &mut App) -> Task<Arc<[Candidate]>> {
-    let project = project.read(cx);
-
-    if let Some(remote_client) = project.remote_client() {
-        let proto_client = remote_client.read(cx).proto_client();
-        cx.background_spawn(async move {
-            let response = proto_client
-                .request(proto::GetProcesses {
-                    project_id: proto::REMOTE_SERVER_PROJECT_ID,
-                })
-                .await
-                .unwrap_or_else(|_| proto::GetProcessesResponse {
-                    processes: Vec::new(),
-                });
-
-            let mut processes: Vec<Candidate> = response
-                .processes
-                .into_iter()
-                .map(|p| Candidate {
-                    pid: p.pid,
-                    name: p.name.into(),
-                    command: p.command,
-                })
-                .collect();
-
-            processes.sort_by_key(|k| k.name.clone());
-            Arc::from(processes.into_boxed_slice())
-        })
-    } else {
-        let refresh_kind = RefreshKind::nothing().with_processes(
-            ProcessRefreshKind::nothing()
-                .without_tasks()
-                .with_cmd(UpdateKind::Always),
-        );
-        let mut processes: Box<[_]> = System::new_with_specifics(refresh_kind)
-            .processes()
-            .values()
-            .map(|process| {
-                let name = process.name().to_string_lossy().into_owned();
-                Candidate {
-                    name: name.into(),
-                    pid: process.pid().as_u32(),
-                    command: process
-                        .cmd()
-                        .iter()
-                        .map(|s| s.to_string_lossy().into_owned())
-                        .collect::<Vec<_>>(),
-                }
-            })
-            .collect();
-        processes.sort_by_key(|k| k.name.clone());
-        let processes = processes.into_iter().collect();
-        Task::ready(processes)
-    }
-}
-
-#[cfg(test)]
-pub(crate) fn set_candidates(
-    modal: &AttachModal,
-    candidates: Arc<[Candidate]>,
-    window: &mut Window,
-    cx: &mut Context<AttachModal>,
-) {
-    modal.picker.update(cx, |picker, cx| {
-        picker.delegate.candidates = candidates;
-        picker.refresh(window, cx);
-    });
-}
-
-#[cfg(test)]
-pub(crate) fn process_names(modal: &AttachModal, cx: &mut Context<AttachModal>) -> Vec<String> {
-    modal.picker.read_with(cx, |picker, _| {
-        picker
-            .delegate
-            .matches
-            .iter()
-            .map(|hit| hit.string.clone())
-            .collect::<Vec<_>>()
-    })
-}
diff --git a/crates/debugger_ui/src/debugger_panel.rs b/crates/debugger_ui/src/debugger_panel.rs
deleted file mode 100644
index bdb308aafd..0000000000
--- a/crates/debugger_ui/src/debugger_panel.rs
+++ /dev/null
@@ -1,2003 +0,0 @@
-use crate::persistence::DebuggerPaneItem;
-use crate::session::DebugSession;
-use crate::session::running::RunningState;
-use crate::session::running::breakpoint_list::BreakpointList;
-
-use crate::{
-    ClearAllBreakpoints, Continue, CopyDebugAdapterArguments, Detach, FocusBreakpointList,
-    FocusConsole, FocusFrames, FocusLoadedSources, FocusModules, FocusTerminal, FocusVariables,
-    NewProcessModal, NewProcessMode, Pause, RerunSession, StepInto, StepOut, StepOver, Stop,
-    ToggleExpandItem, ToggleSessionPicker, ToggleThreadPicker, persistence, spawn_task_or_modal,
-};
-use anyhow::{Context as _, Result, anyhow};
-use collections::IndexMap;
-use dap::adapters::DebugAdapterName;
-use dap::{DapRegistry, StartDebuggingRequestArguments};
-use dap::{client::SessionId, debugger_settings::DebuggerSettings};
-use editor::{Editor, MultiBufferOffset, ToPoint};
-use feature_flags::{FeatureFlag, FeatureFlagAppExt as _};
-use gpui::{
-    Action, App, AsyncWindowContext, ClipboardItem, Context, Corner, DismissEvent, Entity,
-    EntityId, EventEmitter, FocusHandle, Focusable, MouseButton, MouseDownEvent, Point,
-    Subscription, Task, WeakEntity, anchored, deferred,
-};
-
-use itertools::Itertools as _;
-use language::Buffer;
-use project::debugger::session::{Session, SessionQuirks, SessionState, SessionStateEvent};
-use project::{DebugScenarioContext, Fs, ProjectPath, TaskSourceKind, WorktreeId};
-use project::{Project, debugger::session::ThreadStatus};
-use rpc::proto::{self};
-use settings::Settings;
-use std::sync::{Arc, LazyLock};
-use task::{DebugScenario, TaskContext};
-use tree_sitter::{Query, StreamingIterator as _};
-use ui::{
-    ContextMenu, Divider, PopoverMenu, PopoverMenuHandle, SplitButton, Tab, Tooltip, prelude::*,
-};
-use util::rel_path::RelPath;
-use util::{ResultExt, debug_panic, maybe};
-use workspace::SplitDirection;
-use workspace::item::SaveOptions;
-use workspace::{
-    Item, Pane, Workspace,
-    dock::{DockPosition, Panel, PanelEvent},
-};
-use zed_actions::ToggleFocus;
-
-pub struct DebuggerHistoryFeatureFlag;
-
-impl FeatureFlag for DebuggerHistoryFeatureFlag {
-    const NAME: &'static str = "debugger-history";
-}
-
-const DEBUG_PANEL_KEY: &str = "DebugPanel";
-
-pub struct DebugPanel {
-    size: Pixels,
-    active_session: Option<Entity<DebugSession>>,
-    project: Entity<Project>,
-    workspace: WeakEntity<Workspace>,
-    focus_handle: FocusHandle,
-    context_menu: Option<(Entity<ContextMenu>, Point<Pixels>, Subscription)>,
-    debug_scenario_scheduled_last: bool,
-    pub(crate) sessions_with_children:
-        IndexMap<Entity<DebugSession>, Vec<WeakEntity<DebugSession>>>,
-    pub(crate) thread_picker_menu_handle: PopoverMenuHandle<ContextMenu>,
-    pub(crate) session_picker_menu_handle: PopoverMenuHandle<ContextMenu>,
-    fs: Arc<dyn Fs>,
-    is_zoomed: bool,
-    _subscriptions: [Subscription; 1],
-    breakpoint_list: Entity<BreakpointList>,
-}
-
-impl DebugPanel {
-    pub fn new(
-        workspace: &Workspace,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) -> Entity<Self> {
-        cx.new(|cx| {
-            let project = workspace.project().clone();
-            let focus_handle = cx.focus_handle();
-            let thread_picker_menu_handle = PopoverMenuHandle::default();
-            let session_picker_menu_handle = PopoverMenuHandle::default();
-
-            let focus_subscription = cx.on_focus(
-                &focus_handle,
-                window,
-                |this: &mut DebugPanel, window, cx| {
-                    this.focus_active_item(window, cx);
-                },
-            );
-
-            Self {
-                size: px(300.),
-                sessions_with_children: Default::default(),
-                active_session: None,
-                focus_handle,
-                breakpoint_list: BreakpointList::new(
-                    None,
-                    workspace.weak_handle(),
-                    &project,
-                    window,
-                    cx,
-                ),
-                project,
-                workspace: workspace.weak_handle(),
-                context_menu: None,
-                fs: workspace.app_state().fs.clone(),
-                thread_picker_menu_handle,
-                session_picker_menu_handle,
-                is_zoomed: false,
-                _subscriptions: [focus_subscription],
-                debug_scenario_scheduled_last: true,
-            }
-        })
-    }
-
-    pub(crate) fn focus_active_item(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let Some(session) = self.active_session.clone() else {
-            return;
-        };
-        let active_pane = session
-            .read(cx)
-            .running_state()
-            .read(cx)
-            .active_pane()
-            .clone();
-        active_pane.update(cx, |pane, cx| {
-            pane.focus_active_item(window, cx);
-        });
-    }
-
-    #[cfg(test)]
-    pub(crate) fn sessions(&self) -> impl Iterator<Item = Entity<DebugSession>> {
-        self.sessions_with_children.keys().cloned()
-    }
-
-    pub fn active_session(&self) -> Option<Entity<DebugSession>> {
-        self.active_session.clone()
-    }
-
-    pub(crate) fn running_state(&self, cx: &mut App) -> Option<Entity<RunningState>> {
-        self.active_session()
-            .map(|session| session.read(cx).running_state().clone())
-    }
-
-    pub fn project(&self) -> &Entity<Project> {
-        &self.project
-    }
-
-    pub fn load(
-        workspace: WeakEntity<Workspace>,
-        cx: &mut AsyncWindowContext,
-    ) -> Task<Result<Entity<Self>>> {
-        cx.spawn(async move |cx| {
-            workspace.update_in(cx, |workspace, window, cx| {
-                let debug_panel = DebugPanel::new(workspace, window, cx);
-
-                workspace.register_action(|workspace, _: &ClearAllBreakpoints, _, cx| {
-                    workspace.project().read(cx).breakpoint_store().update(
-                        cx,
-                        |breakpoint_store, cx| {
-                            breakpoint_store.clear_breakpoints(cx);
-                        },
-                    )
-                });
-
-                workspace.set_debugger_provider(DebuggerProvider(debug_panel.clone()));
-
-                debug_panel
-            })
-        })
-    }
-
-    pub fn start_session(
-        &mut self,
-        scenario: DebugScenario,
-        task_context: TaskContext,
-        active_buffer: Option<Entity<Buffer>>,
-        worktree_id: Option<WorktreeId>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let dap_store = self.project.read(cx).dap_store();
-        let Some(adapter) = DapRegistry::global(cx).adapter(&scenario.adapter) else {
-            return;
-        };
-        let quirks = SessionQuirks {
-            compact: adapter.compact_child_session(),
-            prefer_thread_name: adapter.prefer_thread_name(),
-        };
-        let session = dap_store.update(cx, |dap_store, cx| {
-            dap_store.new_session(
-                Some(scenario.label.clone()),
-                DebugAdapterName(scenario.adapter.clone()),
-                task_context.clone(),
-                None,
-                quirks,
-                cx,
-            )
-        });
-        let worktree = worktree_id.or_else(|| {
-            active_buffer
-                .as_ref()
-                .and_then(|buffer| buffer.read(cx).file())
-                .map(|f| f.worktree_id(cx))
-        });
-
-        let Some(worktree) = worktree
-            .and_then(|id| self.project.read(cx).worktree_for_id(id, cx))
-            .or_else(|| self.project.read(cx).visible_worktrees(cx).next())
-        else {
-            log::debug!("Could not find a worktree to spawn the debug session in");
-            return;
-        };
-
-        self.debug_scenario_scheduled_last = true;
-        if let Some(inventory) = self
-            .project
-            .read(cx)
-            .task_store()
-            .read(cx)
-            .task_inventory()
-            .cloned()
-        {
-            inventory.update(cx, |inventory, _| {
-                inventory.scenario_scheduled(
-                    scenario.clone(),
-                    // todo(debugger): Task context is cloned three times
-                    // once in Session,inventory, and in resolve scenario
-                    // we should wrap it in an RC instead to save some memory
-                    task_context.clone(),
-                    worktree_id,
-                    active_buffer.as_ref().map(|buffer| buffer.downgrade()),
-                );
-            })
-        }
-        let task = cx.spawn_in(window, {
-            let session = session.clone();
-            async move |this, cx| {
-                let debug_session =
-                    Self::register_session(this.clone(), session.clone(), true, cx).await?;
-                let definition = debug_session
-                    .update_in(cx, |debug_session, window, cx| {
-                        debug_session.running_state().update(cx, |running, cx| {
-                            if scenario.build.is_some() {
-                                running.scenario = Some(scenario.clone());
-                                running.scenario_context = Some(DebugScenarioContext {
-                                    active_buffer: active_buffer
-                                        .as_ref()
-                                        .map(|entity| entity.downgrade()),
-                                    task_context: task_context.clone(),
-                                    worktree_id,
-                                });
-                            };
-                            running.resolve_scenario(
-                                scenario,
-                                task_context,
-                                active_buffer,
-                                worktree_id,
-                                window,
-                                cx,
-                            )
-                        })
-                    })?
-                    .await?;
-                dap_store
-                    .update(cx, |dap_store, cx| {
-                        dap_store.boot_session(session.clone(), definition, worktree, cx)
-                    })?
-                    .await
-            }
-        });
-
-        let boot_task = cx.spawn({
-            let session = session.clone();
-
-            async move |_, cx| {
-                if let Err(error) = task.await {
-                    log::error!("{error:#}");
-                    session
-                        .update(cx, |session, cx| {
-                            session
-                                .console_output(cx)
-                                .unbounded_send(format!("error: {:#}", error))
-                                .ok();
-                            session.shutdown(cx)
-                        })?
-                        .await;
-                }
-                anyhow::Ok(())
-            }
-        });
-
-        session.update(cx, |session, _| match &mut session.state {
-            SessionState::Booting(state_task) => {
-                *state_task = Some(boot_task);
-            }
-            SessionState::Running(_) => {
-                debug_panic!("Session state should be in building because we are just starting it");
-            }
-        });
-    }
-
-    pub(crate) fn rerun_last_session(
-        &mut self,
-        workspace: &mut Workspace,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let task_store = workspace.project().read(cx).task_store().clone();
-        let Some(task_inventory) = task_store.read(cx).task_inventory() else {
-            return;
-        };
-        let workspace = self.workspace.clone();
-        let Some((scenario, context)) = task_inventory.read(cx).last_scheduled_scenario().cloned()
-        else {
-            window.defer(cx, move |window, cx| {
-                workspace
-                    .update(cx, |workspace, cx| {
-                        NewProcessModal::show(workspace, window, NewProcessMode::Debug, None, cx);
-                    })
-                    .ok();
-            });
-            return;
-        };
-
-        let DebugScenarioContext {
-            task_context,
-            worktree_id,
-            active_buffer,
-        } = context;
-
-        let active_buffer = active_buffer.and_then(|buffer| buffer.upgrade());
-
-        self.start_session(
-            scenario,
-            task_context,
-            active_buffer,
-            worktree_id,
-            window,
-            cx,
-        );
-    }
-
-    pub(crate) async fn register_session(
-        this: WeakEntity<Self>,
-        session: Entity<Session>,
-        focus: bool,
-        cx: &mut AsyncWindowContext,
-    ) -> Result<Entity<DebugSession>> {
-        let debug_session = register_session_inner(&this, session, cx).await?;
-
-        let workspace = this.update_in(cx, |this, window, cx| {
-            if focus {
-                this.activate_session(debug_session.clone(), window, cx);
-            }
-
-            this.workspace.clone()
-        })?;
-        workspace.update_in(cx, |workspace, window, cx| {
-            workspace.focus_panel::<Self>(window, cx);
-        })?;
-        Ok(debug_session)
-    }
-
-    pub(crate) fn handle_restart_request(
-        &mut self,
-        mut curr_session: Entity<Session>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        while let Some(parent_session) = curr_session.read(cx).parent_session().cloned() {
-            curr_session = parent_session;
-        }
-
-        let Some(worktree) = curr_session.read(cx).worktree() else {
-            log::error!("Attempted to restart a non-running session");
-            return;
-        };
-
-        let dap_store_handle = self.project.read(cx).dap_store();
-        let label = curr_session.read(cx).label();
-        let quirks = curr_session.read(cx).quirks();
-        let adapter = curr_session.read(cx).adapter();
-        let binary = curr_session.read(cx).binary().cloned().unwrap();
-        let task_context = curr_session.read(cx).task_context().clone();
-
-        let curr_session_id = curr_session.read(cx).session_id();
-        self.sessions_with_children
-            .retain(|session, _| session.read(cx).session_id(cx) != curr_session_id);
-        let task = dap_store_handle.update(cx, |dap_store, cx| {
-            dap_store.shutdown_session(curr_session_id, cx)
-        });
-
-        cx.spawn_in(window, async move |this, cx| {
-            task.await.log_err();
-
-            let (session, task) = dap_store_handle.update(cx, |dap_store, cx| {
-                let session = dap_store.new_session(label, adapter, task_context, None, quirks, cx);
-
-                let task = session.update(cx, |session, cx| {
-                    session.boot(binary, worktree, dap_store_handle.downgrade(), cx)
-                });
-                (session, task)
-            })?;
-            Self::register_session(this.clone(), session.clone(), true, cx).await?;
-
-            if let Err(error) = task.await {
-                session
-                    .update(cx, |session, cx| {
-                        session
-                            .console_output(cx)
-                            .unbounded_send(format!(
-                                "Session failed to restart with error: {}",
-                                error
-                            ))
-                            .ok();
-                        session.shutdown(cx)
-                    })?
-                    .await;
-
-                return Err(error);
-            };
-
-            Ok(())
-        })
-        .detach_and_log_err(cx);
-    }
-
-    pub fn handle_start_debugging_request(
-        &mut self,
-        request: &StartDebuggingRequestArguments,
-        parent_session: Entity<Session>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(worktree) = parent_session.read(cx).worktree() else {
-            log::error!("Attempted to start a child-session from a non-running session");
-            return;
-        };
-
-        let dap_store_handle = self.project.read(cx).dap_store();
-        let label = self.label_for_child_session(&parent_session, request, cx);
-        let adapter = parent_session.read(cx).adapter();
-        let quirks = parent_session.read(cx).quirks();
-        let Some(mut binary) = parent_session.read(cx).binary().cloned() else {
-            log::error!("Attempted to start a child-session without a binary");
-            return;
-        };
-        let task_context = parent_session.read(cx).task_context().clone();
-        binary.request_args = request.clone();
-        cx.spawn_in(window, async move |this, cx| {
-            let (session, task) = dap_store_handle.update(cx, |dap_store, cx| {
-                let session = dap_store.new_session(
-                    label,
-                    adapter,
-                    task_context,
-                    Some(parent_session.clone()),
-                    quirks,
-                    cx,
-                );
-
-                let task = session.update(cx, |session, cx| {
-                    session.boot(binary, worktree, dap_store_handle.downgrade(), cx)
-                });
-                (session, task)
-            })?;
-            // Focus child sessions if the parent has never emitted a stopped event;
-            // this improves our JavaScript experience, as it always spawns a "main" session that then spawns subsessions.
-            let parent_ever_stopped =
-                parent_session.update(cx, |this, _| this.has_ever_stopped())?;
-            Self::register_session(this, session, !parent_ever_stopped, cx).await?;
-            task.await
-        })
-        .detach_and_log_err(cx);
-    }
-
-    pub(crate) fn close_session(
-        &mut self,
-        entity_id: EntityId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(session) = self
-            .sessions_with_children
-            .keys()
-            .find(|other| entity_id == other.entity_id())
-            .cloned()
-        else {
-            return;
-        };
-        session.update(cx, |this, cx| {
-            this.running_state().update(cx, |this, cx| {
-                this.serialize_layout(window, cx);
-            });
-        });
-        let session_id = session.update(cx, |this, cx| this.session_id(cx));
-        let should_prompt = self
-            .project
-            .update(cx, |this, cx| {
-                let session = this.dap_store().read(cx).session_by_id(session_id);
-                session.map(|session| !session.read(cx).is_terminated())
-            })
-            .unwrap_or_default();
-
-        cx.spawn_in(window, async move |this, cx| {
-            if should_prompt {
-                let response = cx.prompt(
-                    gpui::PromptLevel::Warning,
-                    "This Debug Session is still running. Are you sure you want to terminate it?",
-                    None,
-                    &["Yes", "No"],
-                );
-                if response.await == Ok(1) {
-                    return;
-                }
-            }
-            session.update(cx, |session, cx| session.shutdown(cx)).ok();
-            this.update(cx, |this, cx| {
-                this.retain_sessions(|other| entity_id != other.entity_id());
-                if let Some(active_session_id) = this
-                    .active_session
-                    .as_ref()
-                    .map(|session| session.entity_id())
-                    && active_session_id == entity_id
-                {
-                    this.active_session = this.sessions_with_children.keys().next().cloned();
-                }
-                cx.notify()
-            })
-            .ok();
-        })
-        .detach();
-    }
-
-    pub(crate) fn deploy_context_menu(
-        &mut self,
-        position: Point<Pixels>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(running_state) = self
-            .active_session
-            .as_ref()
-            .map(|session| session.read(cx).running_state().clone())
-        {
-            let pane_items_status = running_state.read(cx).pane_items_status(cx);
-            let this = cx.weak_entity();
-
-            let context_menu = ContextMenu::build(window, cx, |mut menu, _window, _cx| {
-                for (item_kind, is_visible) in pane_items_status.into_iter() {
-                    menu = menu.toggleable_entry(item_kind, is_visible, IconPosition::End, None, {
-                        let this = this.clone();
-                        move |window, cx| {
-                            this.update(cx, |this, cx| {
-                                if let Some(running_state) = this
-                                    .active_session
-                                    .as_ref()
-                                    .map(|session| session.read(cx).running_state().clone())
-                                {
-                                    running_state.update(cx, |state, cx| {
-                                        if is_visible {
-                                            state.remove_pane_item(item_kind, window, cx);
-                                        } else {
-                                            state.add_pane_item(item_kind, position, window, cx);
-                                        }
-                                    })
-                                }
-                            })
-                            .ok();
-                        }
-                    });
-                }
-
-                menu
-            });
-
-            window.focus(&context_menu.focus_handle(cx));
-            let subscription = cx.subscribe(&context_menu, |this, _, _: &DismissEvent, cx| {
-                this.context_menu.take();
-                cx.notify();
-            });
-            self.context_menu = Some((context_menu, position, subscription));
-        }
-    }
-
-    fn copy_debug_adapter_arguments(
-        &mut self,
-        _: &CopyDebugAdapterArguments,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let content = maybe!({
-            let mut session = self.active_session()?.read(cx).session(cx);
-            while let Some(parent) = session.read(cx).parent_session().cloned() {
-                session = parent;
-            }
-            let binary = session.read(cx).binary()?;
-            let content = serde_json::to_string_pretty(&binary).ok()?;
-            Some(content)
-        });
-        if let Some(content) = content {
-            cx.write_to_clipboard(ClipboardItem::new_string(content));
-        }
-    }
-
-    pub(crate) fn top_controls_strip(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Div> {
-        let active_session = self.active_session.clone();
-        let focus_handle = self.focus_handle.clone();
-        let is_side = self.position(window, cx).axis() == gpui::Axis::Horizontal;
-        let div = if is_side { v_flex() } else { h_flex() };
-
-        let new_session_button = || {
-            IconButton::new("debug-new-session", IconName::Plus)
-                .icon_size(IconSize::Small)
-                .on_click({
-                    move |_, window, cx| window.dispatch_action(crate::Start.boxed_clone(), cx)
-                })
-                .tooltip({
-                    let focus_handle = focus_handle.clone();
-                    move |_window, cx| {
-                        Tooltip::for_action_in(
-                            "Start Debug Session",
-                            &crate::Start,
-                            &focus_handle,
-                            cx,
-                        )
-                    }
-                })
-        };
-
-        let edit_debug_json_button = || {
-            IconButton::new("debug-edit-debug-json", IconName::Code)
-                .icon_size(IconSize::Small)
-                .on_click(|_, window, cx| {
-                    window.dispatch_action(zed_actions::OpenProjectDebugTasks.boxed_clone(), cx);
-                })
-                .tooltip(Tooltip::text("Edit debug.json"))
-        };
-
-        let documentation_button = || {
-            IconButton::new("debug-open-documentation", IconName::CircleHelp)
-                .icon_size(IconSize::Small)
-                .on_click(move |_, _, cx| cx.open_url("https://zed.dev/docs/debugger"))
-                .tooltip(Tooltip::text("Open Documentation"))
-        };
-
-        let logs_button = || {
-            IconButton::new("debug-open-logs", IconName::Notepad)
-                .icon_size(IconSize::Small)
-                .on_click(move |_, window, cx| {
-                    window.dispatch_action(debugger_tools::OpenDebugAdapterLogs.boxed_clone(), cx)
-                })
-                .tooltip(Tooltip::text("Open Debug Adapter Logs"))
-        };
-
-        let close_bottom_panel_button = {
-            h_flex().pl_0p5().gap_1().child(Divider::vertical()).child(
-                IconButton::new("debug-close-panel", IconName::Close)
-                    .icon_size(IconSize::Small)
-                    .on_click(move |_, window, cx| {
-                        window.dispatch_action(workspace::ToggleBottomDock.boxed_clone(), cx)
-                    })
-                    .tooltip(Tooltip::text("Close Panel")),
-            )
-        };
-
-        let thread_status = active_session
-            .as_ref()
-            .map(|session| session.read(cx).running_state())
-            .and_then(|state| state.read(cx).thread_status(cx))
-            .unwrap_or(project::debugger::session::ThreadStatus::Exited);
-
-        Some(
-            div.w_full()
-                .py_1()
-                .px_1p5()
-                .justify_between()
-                .border_b_1()
-                .border_color(cx.theme().colors().border)
-                .when(is_side, |this| this.gap_1().h(Tab::container_height(cx)))
-                .child(
-                    h_flex()
-                        .justify_between()
-                        .child(
-                            h_flex().gap_1().w_full().when_some(
-                                active_session
-                                    .as_ref()
-                                    .map(|session| session.read(cx).running_state()),
-                                |this, running_state| {
-                                    let capabilities = running_state.read(cx).capabilities(cx);
-                                    let supports_detach =
-                                        running_state.read(cx).session().read(cx).is_attached();
-
-                                    this.map(|this| {
-                                        if thread_status == ThreadStatus::Running {
-                                            this.child(
-                                                IconButton::new(
-                                                    "debug-pause",
-                                                    IconName::DebugPause,
-                                                )
-                                                .icon_size(IconSize::Small)
-                                                .on_click(window.listener_for(
-                                                    running_state,
-                                                    |this, _, _window, cx| {
-                                                        this.pause_thread(cx);
-                                                    },
-                                                ))
-                                                .tooltip({
-                                                    let focus_handle = focus_handle.clone();
-                                                    move |_window, cx| {
-                                                        Tooltip::for_action_in(
-                                                            "Pause Program",
-                                                            &Pause,
-                                                            &focus_handle,
-                                                            cx,
-                                                        )
-                                                    }
-                                                }),
-                                            )
-                                        } else {
-                                            this.child(
-                                                IconButton::new(
-                                                    "debug-continue",
-                                                    IconName::DebugContinue,
-                                                )
-                                                .icon_size(IconSize::Small)
-                                                .on_click(window.listener_for(
-                                                    running_state,
-                                                    |this, _, _window, cx| this.continue_thread(cx),
-                                                ))
-                                                .disabled(thread_status != ThreadStatus::Stopped)
-                                                .tooltip({
-                                                    let focus_handle = focus_handle.clone();
-                                                    move |_window, cx| {
-                                                        Tooltip::for_action_in(
-                                                            "Continue Program",
-                                                            &Continue,
-                                                            &focus_handle,
-                                                            cx,
-                                                        )
-                                                    }
-                                                }),
-                                            )
-                                        }
-                                    })
-                                    .child(
-                                        IconButton::new("step-over", IconName::DebugStepOver)
-                                            .icon_size(IconSize::Small)
-                                            .on_click(window.listener_for(
-                                                running_state,
-                                                |this, _, _window, cx| {
-                                                    this.step_over(cx);
-                                                },
-                                            ))
-                                            .disabled(thread_status != ThreadStatus::Stopped)
-                                            .tooltip({
-                                                let focus_handle = focus_handle.clone();
-                                                move |_window, cx| {
-                                                    Tooltip::for_action_in(
-                                                        "Step Over",
-                                                        &StepOver,
-                                                        &focus_handle,
-                                                        cx,
-                                                    )
-                                                }
-                                            }),
-                                    )
-                                    .child(
-                                        IconButton::new("step-into", IconName::DebugStepInto)
-                                            .icon_size(IconSize::Small)
-                                            .on_click(window.listener_for(
-                                                running_state,
-                                                |this, _, _window, cx| {
-                                                    this.step_in(cx);
-                                                },
-                                            ))
-                                            .disabled(thread_status != ThreadStatus::Stopped)
-                                            .tooltip({
-                                                let focus_handle = focus_handle.clone();
-                                                move |_window, cx| {
-                                                    Tooltip::for_action_in(
-                                                        "Step In",
-                                                        &StepInto,
-                                                        &focus_handle,
-                                                        cx,
-                                                    )
-                                                }
-                                            }),
-                                    )
-                                    .child(
-                                        IconButton::new("step-out", IconName::DebugStepOut)
-                                            .icon_size(IconSize::Small)
-                                            .on_click(window.listener_for(
-                                                running_state,
-                                                |this, _, _window, cx| {
-                                                    this.step_out(cx);
-                                                },
-                                            ))
-                                            .disabled(thread_status != ThreadStatus::Stopped)
-                                            .tooltip({
-                                                let focus_handle = focus_handle.clone();
-                                                move |_window, cx| {
-                                                    Tooltip::for_action_in(
-                                                        "Step Out",
-                                                        &StepOut,
-                                                        &focus_handle,
-                                                        cx,
-                                                    )
-                                                }
-                                            }),
-                                    )
-                                    .child(Divider::vertical())
-                                    .child(
-                                        IconButton::new("debug-restart", IconName::RotateCcw)
-                                            .icon_size(IconSize::Small)
-                                            .on_click(window.listener_for(
-                                                running_state,
-                                                |this, _, window, cx| {
-                                                    this.rerun_session(window, cx);
-                                                },
-                                            ))
-                                            .tooltip({
-                                                let focus_handle = focus_handle.clone();
-                                                move |_window, cx| {
-                                                    Tooltip::for_action_in(
-                                                        "Rerun Session",
-                                                        &RerunSession,
-                                                        &focus_handle,
-                                                        cx,
-                                                    )
-                                                }
-                                            }),
-                                    )
-                                    .child(
-                                        IconButton::new("debug-stop", IconName::Power)
-                                            .icon_size(IconSize::Small)
-                                            .on_click(window.listener_for(
-                                                running_state,
-                                                |this, _, _window, cx| {
-                                                    if this.session().read(cx).is_building() {
-                                                        this.session().update(cx, |session, cx| {
-                                                            session.shutdown(cx).detach()
-                                                        });
-                                                    } else {
-                                                        this.stop_thread(cx);
-                                                    }
-                                                },
-                                            ))
-                                            .disabled(active_session.as_ref().is_none_or(
-                                                |session| {
-                                                    session
-                                                        .read(cx)
-                                                        .session(cx)
-                                                        .read(cx)
-                                                        .is_terminated()
-                                                },
-                                            ))
-                                            .tooltip({
-                                                let focus_handle = focus_handle.clone();
-                                                let label = if capabilities
-                                                    .supports_terminate_threads_request
-                                                    .unwrap_or_default()
-                                                {
-                                                    "Terminate Thread"
-                                                } else {
-                                                    "Terminate All Threads"
-                                                };
-                                                move |_window, cx| {
-                                                    Tooltip::for_action_in(
-                                                        label,
-                                                        &Stop,
-                                                        &focus_handle,
-                                                        cx,
-                                                    )
-                                                }
-                                            }),
-                                    )
-                                    .when(supports_detach, |div| {
-                                        div.child(
-                                            IconButton::new(
-                                                "debug-disconnect",
-                                                IconName::DebugDetach,
-                                            )
-                                            .disabled(
-                                                thread_status != ThreadStatus::Stopped
-                                                    && thread_status != ThreadStatus::Running,
-                                            )
-                                            .icon_size(IconSize::Small)
-                                            .on_click(window.listener_for(
-                                                running_state,
-                                                |this, _, _, cx| {
-                                                    this.detach_client(cx);
-                                                },
-                                            ))
-                                            .tooltip({
-                                                let focus_handle = focus_handle.clone();
-                                                move |_window, cx| {
-                                                    Tooltip::for_action_in(
-                                                        "Detach",
-                                                        &Detach,
-                                                        &focus_handle,
-                                                        cx,
-                                                    )
-                                                }
-                                            }),
-                                        )
-                                    })
-                                    .when(
-                                        cx.has_flag::<DebuggerHistoryFeatureFlag>(),
-                                        |this| {
-                                            this.child(Divider::vertical()).child(
-                                                SplitButton::new(
-                                                    self.render_history_button(
-                                                        &running_state,
-                                                        thread_status,
-                                                        window,
-                                                    ),
-                                                    self.render_history_toggle_button(
-                                                        thread_status,
-                                                        &running_state,
-                                                    )
-                                                    .into_any_element(),
-                                                )
-                                                .style(ui::SplitButtonStyle::Outlined),
-                                            )
-                                        },
-                                    )
-                                },
-                            ),
-                        )
-                        .when(is_side, |this| {
-                            this.child(new_session_button())
-                                .child(edit_debug_json_button())
-                                .child(documentation_button())
-                                .child(logs_button())
-                        }),
-                )
-                .child(
-                    h_flex()
-                        .gap_0p5()
-                        .when(is_side, |this| this.justify_between())
-                        .child(
-                            h_flex().when_some(
-                                active_session
-                                    .as_ref()
-                                    .map(|session| session.read(cx).running_state())
-                                    .cloned(),
-                                |this, running_state| {
-                                    this.children({
-                                        let threads =
-                                            running_state.update(cx, |running_state, cx| {
-                                                let session = running_state.session();
-                                                session.read(cx).is_started().then(|| {
-                                                    session.update(cx, |session, cx| {
-                                                        session.threads(cx)
-                                                    })
-                                                })
-                                            });
-
-                                        threads.and_then(|threads| {
-                                            self.render_thread_dropdown(
-                                                &running_state,
-                                                threads,
-                                                window,
-                                                cx,
-                                            )
-                                        })
-                                    })
-                                    .when(!is_side, |this| {
-                                        this.gap_0p5().child(Divider::vertical())
-                                    })
-                                },
-                            ),
-                        )
-                        .child(
-                            h_flex()
-                                .gap_0p5()
-                                .children(self.render_session_menu(
-                                    self.active_session(),
-                                    self.running_state(cx),
-                                    window,
-                                    cx,
-                                ))
-                                .when(!is_side, |this| {
-                                    this.child(new_session_button())
-                                        .child(edit_debug_json_button())
-                                        .child(documentation_button())
-                                        .child(logs_button())
-                                        .child(close_bottom_panel_button)
-                                }),
-                        ),
-                ),
-        )
-    }
-
-    pub(crate) fn activate_pane_in_direction(
-        &mut self,
-        direction: SplitDirection,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(session) = self.active_session() {
-            session.update(cx, |session, cx| {
-                session.running_state().update(cx, |running, cx| {
-                    running.activate_pane_in_direction(direction, window, cx);
-                })
-            });
-        }
-    }
-
-    pub(crate) fn activate_item(
-        &mut self,
-        item: DebuggerPaneItem,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(session) = self.active_session() {
-            session.update(cx, |session, cx| {
-                session.running_state().update(cx, |running, cx| {
-                    running.activate_item(item, window, cx);
-                });
-            });
-        }
-    }
-
-    pub(crate) fn activate_session_by_id(
-        &mut self,
-        session_id: SessionId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(session) = self
-            .sessions_with_children
-            .keys()
-            .find(|session| session.read(cx).session_id(cx) == session_id)
-        {
-            self.activate_session(session.clone(), window, cx);
-        }
-    }
-
-    pub(crate) fn activate_session(
-        &mut self,
-        session_item: Entity<DebugSession>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        debug_assert!(self.sessions_with_children.contains_key(&session_item));
-        session_item.focus_handle(cx).focus(window);
-        session_item.update(cx, |this, cx| {
-            this.running_state().update(cx, |this, cx| {
-                this.go_to_selected_stack_frame(window, cx);
-            });
-        });
-        self.active_session = Some(session_item);
-        cx.notify();
-    }
-
-    pub(crate) fn go_to_scenario_definition(
-        &self,
-        kind: TaskSourceKind,
-        scenario: DebugScenario,
-        worktree_id: WorktreeId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let Some(workspace) = self.workspace.upgrade() else {
-            return Task::ready(Ok(()));
-        };
-        let project_path = match kind {
-            TaskSourceKind::AbsPath { abs_path, .. } => {
-                let Some(project_path) = workspace
-                    .read(cx)
-                    .project()
-                    .read(cx)
-                    .project_path_for_absolute_path(&abs_path, cx)
-                else {
-                    return Task::ready(Err(anyhow!("no abs path")));
-                };
-
-                project_path
-            }
-            TaskSourceKind::Worktree {
-                id,
-                directory_in_worktree: dir,
-                ..
-            } => {
-                let relative_path = if dir.ends_with(RelPath::unix(".vscode").unwrap()) {
-                    dir.join(RelPath::unix("launch.json").unwrap())
-                } else {
-                    dir.join(RelPath::unix("debug.json").unwrap())
-                };
-                ProjectPath {
-                    worktree_id: id,
-                    path: relative_path,
-                }
-            }
-            _ => return self.save_scenario(scenario, worktree_id, window, cx),
-        };
-
-        let editor = workspace.update(cx, |workspace, cx| {
-            workspace.open_path(project_path, None, true, window, cx)
-        });
-        cx.spawn_in(window, async move |_, cx| {
-            let editor = editor.await?;
-            let editor = cx
-                .update(|_, cx| editor.act_as::<Editor>(cx))?
-                .context("expected editor")?;
-
-            // unfortunately debug tasks don't have an easy way to globally
-            // identify them. to jump to the one that you just created or an
-            // old one that you're choosing to edit we use a heuristic of searching for a line with `label:  <your label>` from the end rather than the start so we bias towards more renctly
-            editor.update_in(cx, |editor, window, cx| {
-                let row = editor.text(cx).lines().enumerate().find_map(|(row, text)| {
-                    if text.contains(scenario.label.as_ref()) && text.contains("\"label\": ") {
-                        Some(row)
-                    } else {
-                        None
-                    }
-                });
-                if let Some(row) = row {
-                    editor.go_to_singleton_buffer_point(
-                        text::Point::new(row as u32, 4),
-                        window,
-                        cx,
-                    );
-                }
-            })?;
-
-            Ok(())
-        })
-    }
-
-    pub(crate) fn save_scenario(
-        &self,
-        scenario: DebugScenario,
-        worktree_id: WorktreeId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let this = cx.weak_entity();
-        let project = self.project.clone();
-        self.workspace
-            .update(cx, |workspace, cx| {
-                let Some(mut path) = workspace.absolute_path_of_worktree(worktree_id, cx) else {
-                    return Task::ready(Err(anyhow!("Couldn't get worktree path")));
-                };
-
-                let serialized_scenario = serde_json::to_value(scenario);
-
-                cx.spawn_in(window, async move |workspace, cx| {
-                    let serialized_scenario = serialized_scenario?;
-                    let fs =
-                        workspace.read_with(cx, |workspace, _| workspace.app_state().fs.clone())?;
-
-                    path.push(paths::local_settings_folder_name());
-                    if !fs.is_dir(path.as_path()).await {
-                        fs.create_dir(path.as_path()).await?;
-                    }
-                    path.pop();
-
-                    path.push(paths::local_debug_file_relative_path().as_std_path());
-                    let path = path.as_path();
-
-                    if !fs.is_file(path).await {
-                        fs.create_file(path, Default::default()).await?;
-                        fs.write(
-                            path,
-                            settings::initial_local_debug_tasks_content()
-                                .to_string()
-                                .as_bytes(),
-                        )
-                        .await?;
-                    }
-                    let project_path = workspace.update(cx, |workspace, cx| {
-                        workspace
-                            .project()
-                            .read(cx)
-                            .project_path_for_absolute_path(path, cx)
-                            .context(
-                                "Couldn't get project path for .zed/debug.json in active worktree",
-                            )
-                    })??;
-
-                    let editor = this
-                        .update_in(cx, |this, window, cx| {
-                            this.workspace.update(cx, |workspace, cx| {
-                                workspace.open_path(project_path, None, true, window, cx)
-                            })
-                        })??
-                        .await?;
-                    let editor = cx
-                        .update(|_, cx| editor.act_as::<Editor>(cx))?
-                        .context("expected editor")?;
-
-                    let new_scenario = serde_json_lenient::to_string_pretty(&serialized_scenario)?
-                        .lines()
-                        .map(|l| format!("  {l}"))
-                        .join("\n");
-
-                    editor
-                        .update_in(cx, |editor, window, cx| {
-                            Self::insert_task_into_editor(editor, new_scenario, project, window, cx)
-                        })??
-                        .await
-                })
-            })
-            .unwrap_or_else(|err| Task::ready(Err(err)))
-    }
-
-    pub fn insert_task_into_editor(
-        editor: &mut Editor,
-        new_scenario: String,
-        project: Entity<Project>,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) -> Result<Task<Result<()>>> {
-        static LAST_ITEM_QUERY: LazyLock<Query> = LazyLock::new(|| {
-            Query::new(
-                &tree_sitter_json::LANGUAGE.into(),
-                "(document (array (object) @object))", // TODO: use "." anchor to only match last object
-            )
-            .expect("Failed to create LAST_ITEM_QUERY")
-        });
-        static EMPTY_ARRAY_QUERY: LazyLock<Query> = LazyLock::new(|| {
-            Query::new(
-                &tree_sitter_json::LANGUAGE.into(),
-                "(document (array) @array)",
-            )
-            .expect("Failed to create EMPTY_ARRAY_QUERY")
-        });
-
-        let content = editor.text(cx);
-        let mut parser = tree_sitter::Parser::new();
-        parser.set_language(&tree_sitter_json::LANGUAGE.into())?;
-        let mut cursor = tree_sitter::QueryCursor::new();
-        let syntax_tree = parser
-            .parse(&content, None)
-            .context("could not parse debug.json")?;
-        let mut matches = cursor.matches(
-            &LAST_ITEM_QUERY,
-            syntax_tree.root_node(),
-            content.as_bytes(),
-        );
-
-        let mut last_offset = None;
-        while let Some(mat) = matches.next() {
-            if let Some(pos) = mat.captures.first().map(|m| m.node.byte_range().end) {
-                last_offset = Some(MultiBufferOffset(pos))
-            }
-        }
-        let mut edits = Vec::new();
-        let mut cursor_position = MultiBufferOffset(0);
-
-        if let Some(pos) = last_offset {
-            edits.push((pos..pos, format!(",\n{new_scenario}")));
-            cursor_position = pos + ",\n  ".len();
-        } else {
-            let mut matches = cursor.matches(
-                &EMPTY_ARRAY_QUERY,
-                syntax_tree.root_node(),
-                content.as_bytes(),
-            );
-
-            if let Some(mat) = matches.next() {
-                if let Some(pos) = mat.captures.first().map(|m| m.node.byte_range().end - 1) {
-                    edits.push((
-                        MultiBufferOffset(pos)..MultiBufferOffset(pos),
-                        format!("\n{new_scenario}\n"),
-                    ));
-                    cursor_position = MultiBufferOffset(pos) + "\n  ".len();
-                }
-            } else {
-                edits.push((
-                    MultiBufferOffset(0)..MultiBufferOffset(0),
-                    format!("[\n{}\n]", new_scenario),
-                ));
-                cursor_position = MultiBufferOffset("[\n  ".len());
-            }
-        }
-        editor.transact(window, cx, |editor, window, cx| {
-            editor.edit(edits, cx);
-            let snapshot = editor.buffer().read(cx).read(cx);
-            let point = cursor_position.to_point(&snapshot);
-            drop(snapshot);
-            editor.go_to_singleton_buffer_point(point, window, cx);
-        });
-        Ok(editor.save(SaveOptions::default(), project, window, cx))
-    }
-
-    pub(crate) fn toggle_thread_picker(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.thread_picker_menu_handle.toggle(window, cx);
-    }
-
-    pub(crate) fn toggle_session_picker(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.session_picker_menu_handle.toggle(window, cx);
-    }
-
-    fn toggle_zoom(
-        &mut self,
-        _: &workspace::ToggleZoom,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.is_zoomed {
-            cx.emit(PanelEvent::ZoomOut);
-        } else {
-            if !self.focus_handle(cx).contains_focused(window, cx) {
-                cx.focus_self(window);
-            }
-            cx.emit(PanelEvent::ZoomIn);
-        }
-    }
-
-    fn label_for_child_session(
-        &self,
-        parent_session: &Entity<Session>,
-        request: &StartDebuggingRequestArguments,
-        cx: &mut Context<'_, Self>,
-    ) -> Option<SharedString> {
-        let adapter = parent_session.read(cx).adapter();
-        if let Some(adapter) = DapRegistry::global(cx).adapter(&adapter)
-            && let Some(label) = adapter.label_for_child_session(request)
-        {
-            return Some(label.into());
-        }
-        None
-    }
-
-    fn retain_sessions(&mut self, keep: impl Fn(&Entity<DebugSession>) -> bool) {
-        self.sessions_with_children
-            .retain(|session, _| keep(session));
-        for children in self.sessions_with_children.values_mut() {
-            children.retain(|child| {
-                let Some(child) = child.upgrade() else {
-                    return false;
-                };
-                keep(&child)
-            });
-        }
-    }
-
-    fn render_history_button(
-        &self,
-        running_state: &Entity<RunningState>,
-        thread_status: ThreadStatus,
-        window: &mut Window,
-    ) -> IconButton {
-        IconButton::new("debug-back-in-history", IconName::HistoryRerun)
-            .icon_size(IconSize::Small)
-            .on_click(window.listener_for(running_state, |this, _, _window, cx| {
-                this.session().update(cx, |session, cx| {
-                    let ix = session
-                        .active_snapshot_index()
-                        .unwrap_or_else(|| session.historic_snapshots().len());
-
-                    session.select_historic_snapshot(Some(ix.saturating_sub(1)), cx);
-                })
-            }))
-            .disabled(
-                thread_status == ThreadStatus::Running || thread_status == ThreadStatus::Stepping,
-            )
-    }
-
-    fn render_history_toggle_button(
-        &self,
-        thread_status: ThreadStatus,
-        running_state: &Entity<RunningState>,
-    ) -> impl IntoElement {
-        PopoverMenu::new("debug-back-in-history-menu")
-            .trigger(
-                ui::ButtonLike::new_rounded_right("debug-back-in-history-menu-trigger")
-                    .layer(ui::ElevationIndex::ModalSurface)
-                    .size(ui::ButtonSize::None)
-                    .child(
-                        div()
-                            .px_1()
-                            .child(Icon::new(IconName::ChevronDown).size(IconSize::XSmall)),
-                    )
-                    .disabled(
-                        thread_status == ThreadStatus::Running
-                            || thread_status == ThreadStatus::Stepping,
-                    ),
-            )
-            .menu({
-                let running_state = running_state.clone();
-                move |window, cx| {
-                    let handler =
-                        |ix: Option<usize>, running_state: Entity<RunningState>, cx: &mut App| {
-                            running_state.update(cx, |state, cx| {
-                                state.session().update(cx, |session, cx| {
-                                    session.select_historic_snapshot(ix, cx);
-                                })
-                            })
-                        };
-
-                    let running_state = running_state.clone();
-                    Some(ContextMenu::build(
-                        window,
-                        cx,
-                        move |mut context_menu, _window, cx| {
-                            let history = running_state
-                                .read(cx)
-                                .session()
-                                .read(cx)
-                                .historic_snapshots();
-
-                            context_menu = context_menu.entry("Current State", None, {
-                                let running_state = running_state.clone();
-                                move |_window, cx| {
-                                    handler(None, running_state.clone(), cx);
-                                }
-                            });
-                            context_menu = context_menu.separator();
-
-                            for (ix, _) in history.iter().enumerate().rev() {
-                                context_menu =
-                                    context_menu.entry(format!("history-{}", ix + 1), None, {
-                                        let running_state = running_state.clone();
-                                        move |_window, cx| {
-                                            handler(Some(ix), running_state.clone(), cx);
-                                        }
-                                    });
-                            }
-
-                            context_menu
-                        },
-                    ))
-                }
-            })
-            .anchor(Corner::TopRight)
-    }
-}
-
-async fn register_session_inner(
-    this: &WeakEntity<DebugPanel>,
-    session: Entity<Session>,
-    cx: &mut AsyncWindowContext,
-) -> Result<Entity<DebugSession>> {
-    let adapter_name = session.read_with(cx, |session, _| session.adapter())?;
-    this.update_in(cx, |_, window, cx| {
-        cx.subscribe_in(
-            &session,
-            window,
-            move |this, session, event: &SessionStateEvent, window, cx| match event {
-                SessionStateEvent::Restart => {
-                    this.handle_restart_request(session.clone(), window, cx);
-                }
-                SessionStateEvent::SpawnChildSession { request } => {
-                    this.handle_start_debugging_request(request, session.clone(), window, cx);
-                }
-                _ => {}
-            },
-        )
-        .detach();
-    })
-    .ok();
-    let serialized_layout = persistence::get_serialized_layout(adapter_name).await;
-    let debug_session = this.update_in(cx, |this, window, cx| {
-        let parent_session = this
-            .sessions_with_children
-            .keys()
-            .find(|p| Some(p.read(cx).session_id(cx)) == session.read(cx).parent_id(cx))
-            .cloned();
-        this.retain_sessions(|session| {
-            !session
-                .read(cx)
-                .running_state()
-                .read(cx)
-                .session()
-                .read(cx)
-                .is_terminated()
-        });
-
-        let debug_session = DebugSession::running(
-            this.project.clone(),
-            this.workspace.clone(),
-            parent_session
-                .as_ref()
-                .map(|p| p.read(cx).running_state().read(cx).debug_terminal.clone()),
-            session,
-            serialized_layout,
-            this.position(window, cx).axis(),
-            window,
-            cx,
-        );
-
-        // We might want to make this an event subscription and only notify when a new thread is selected
-        // This is used to filter the command menu correctly
-        cx.observe(
-            &debug_session.read(cx).running_state().clone(),
-            |_, _, cx| cx.notify(),
-        )
-        .detach();
-        let insert_position = this
-            .sessions_with_children
-            .keys()
-            .position(|session| Some(session) == parent_session.as_ref())
-            .map(|position| position + 1)
-            .unwrap_or(this.sessions_with_children.len());
-        // Maintain topological sort order of sessions
-        let (_, old) = this.sessions_with_children.insert_before(
-            insert_position,
-            debug_session.clone(),
-            Default::default(),
-        );
-        debug_assert!(old.is_none());
-        if let Some(parent_session) = parent_session {
-            this.sessions_with_children
-                .entry(parent_session)
-                .and_modify(|children| children.push(debug_session.downgrade()));
-        }
-
-        debug_session
-    })?;
-    Ok(debug_session)
-}
-
-impl EventEmitter<PanelEvent> for DebugPanel {}
-
-impl Focusable for DebugPanel {
-    fn focus_handle(&self, _: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl Panel for DebugPanel {
-    fn persistent_name() -> &'static str {
-        "DebugPanel"
-    }
-
-    fn panel_key() -> &'static str {
-        DEBUG_PANEL_KEY
-    }
-
-    fn position(&self, _window: &Window, cx: &App) -> DockPosition {
-        DebuggerSettings::get_global(cx).dock.into()
-    }
-
-    fn position_is_valid(&self, _: DockPosition) -> bool {
-        true
-    }
-
-    fn set_position(
-        &mut self,
-        position: DockPosition,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if position.axis() != self.position(window, cx).axis() {
-            self.sessions_with_children.keys().for_each(|session_item| {
-                session_item.update(cx, |item, cx| {
-                    item.running_state()
-                        .update(cx, |state, _| state.invert_axies())
-                })
-            });
-        }
-
-        settings::update_settings_file(self.fs.clone(), cx, move |settings, _| {
-            settings.debugger.get_or_insert_default().dock = Some(position.into());
-        });
-    }
-
-    fn size(&self, _window: &Window, _: &App) -> Pixels {
-        self.size
-    }
-
-    fn set_size(&mut self, size: Option<Pixels>, _window: &mut Window, _cx: &mut Context<Self>) {
-        self.size = size.unwrap_or(px(300.));
-    }
-
-    fn remote_id() -> Option<proto::PanelId> {
-        Some(proto::PanelId::DebugPanel)
-    }
-
-    fn icon(&self, _window: &Window, _cx: &App) -> Option<IconName> {
-        Some(IconName::Debug)
-    }
-
-    fn icon_tooltip(&self, _window: &Window, cx: &App) -> Option<&'static str> {
-        if DebuggerSettings::get_global(cx).button {
-            Some("Debug Panel")
-        } else {
-            None
-        }
-    }
-
-    fn toggle_action(&self) -> Box<dyn Action> {
-        Box::new(ToggleFocus)
-    }
-
-    fn pane(&self) -> Option<Entity<Pane>> {
-        None
-    }
-
-    fn activation_priority(&self) -> u32 {
-        9
-    }
-
-    fn set_active(&mut self, _: bool, _: &mut Window, _: &mut Context<Self>) {}
-
-    fn is_zoomed(&self, _window: &Window, _cx: &App) -> bool {
-        self.is_zoomed
-    }
-
-    fn set_zoomed(&mut self, zoomed: bool, _window: &mut Window, cx: &mut Context<Self>) {
-        self.is_zoomed = zoomed;
-        cx.notify();
-    }
-}
-
-impl Render for DebugPanel {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let this = cx.weak_entity();
-
-        if self
-            .active_session
-            .as_ref()
-            .map(|session| session.read(cx).running_state())
-            .map(|state| state.read(cx).has_open_context_menu(cx))
-            .unwrap_or(false)
-        {
-            self.context_menu.take();
-        }
-
-        v_flex()
-            .when(!self.is_zoomed, |this| {
-                this.when_else(
-                    self.position(window, cx) == DockPosition::Bottom,
-                    |this| this.max_h(self.size),
-                    |this| this.max_w(self.size),
-                )
-            })
-            .size_full()
-            .key_context("DebugPanel")
-            .child(h_flex().children(self.top_controls_strip(window, cx)))
-            .track_focus(&self.focus_handle(cx))
-            .on_action({
-                let this = this.clone();
-                move |_: &workspace::ActivatePaneLeft, window, cx| {
-                    this.update(cx, |this, cx| {
-                        this.activate_pane_in_direction(SplitDirection::Left, window, cx);
-                    })
-                    .ok();
-                }
-            })
-            .on_action({
-                let this = this.clone();
-                move |_: &workspace::ActivatePaneRight, window, cx| {
-                    this.update(cx, |this, cx| {
-                        this.activate_pane_in_direction(SplitDirection::Right, window, cx);
-                    })
-                    .ok();
-                }
-            })
-            .on_action({
-                let this = this.clone();
-                move |_: &workspace::ActivatePaneUp, window, cx| {
-                    this.update(cx, |this, cx| {
-                        this.activate_pane_in_direction(SplitDirection::Up, window, cx);
-                    })
-                    .ok();
-                }
-            })
-            .on_action({
-                let this = this.clone();
-                move |_: &workspace::ActivatePaneDown, window, cx| {
-                    this.update(cx, |this, cx| {
-                        this.activate_pane_in_direction(SplitDirection::Down, window, cx);
-                    })
-                    .ok();
-                }
-            })
-            .on_action({
-                let this = this.clone();
-                move |_: &FocusConsole, window, cx| {
-                    this.update(cx, |this, cx| {
-                        this.activate_item(DebuggerPaneItem::Console, window, cx);
-                    })
-                    .ok();
-                }
-            })
-            .on_action({
-                let this = this.clone();
-                move |_: &FocusVariables, window, cx| {
-                    this.update(cx, |this, cx| {
-                        this.activate_item(DebuggerPaneItem::Variables, window, cx);
-                    })
-                    .ok();
-                }
-            })
-            .on_action({
-                let this = this.clone();
-                move |_: &FocusBreakpointList, window, cx| {
-                    this.update(cx, |this, cx| {
-                        this.activate_item(DebuggerPaneItem::BreakpointList, window, cx);
-                    })
-                    .ok();
-                }
-            })
-            .on_action({
-                let this = this.clone();
-                move |_: &FocusFrames, window, cx| {
-                    this.update(cx, |this, cx| {
-                        this.activate_item(DebuggerPaneItem::Frames, window, cx);
-                    })
-                    .ok();
-                }
-            })
-            .on_action({
-                let this = this.clone();
-                move |_: &FocusModules, window, cx| {
-                    this.update(cx, |this, cx| {
-                        this.activate_item(DebuggerPaneItem::Modules, window, cx);
-                    })
-                    .ok();
-                }
-            })
-            .on_action({
-                let this = this.clone();
-                move |_: &FocusLoadedSources, window, cx| {
-                    this.update(cx, |this, cx| {
-                        this.activate_item(DebuggerPaneItem::LoadedSources, window, cx);
-                    })
-                    .ok();
-                }
-            })
-            .on_action({
-                let this = this.clone();
-                move |_: &FocusTerminal, window, cx| {
-                    this.update(cx, |this, cx| {
-                        this.activate_item(DebuggerPaneItem::Terminal, window, cx);
-                    })
-                    .ok();
-                }
-            })
-            .on_action({
-                let this = this.clone();
-                move |_: &ToggleThreadPicker, window, cx| {
-                    this.update(cx, |this, cx| {
-                        this.toggle_thread_picker(window, cx);
-                    })
-                    .ok();
-                }
-            })
-            .on_action({
-                move |_: &ToggleSessionPicker, window, cx| {
-                    this.update(cx, |this, cx| {
-                        this.toggle_session_picker(window, cx);
-                    })
-                    .ok();
-                }
-            })
-            .on_action(cx.listener(Self::toggle_zoom))
-            .on_action(cx.listener(|panel, _: &ToggleExpandItem, _, cx| {
-                let Some(session) = panel.active_session() else {
-                    return;
-                };
-                let active_pane = session
-                    .read(cx)
-                    .running_state()
-                    .read(cx)
-                    .active_pane()
-                    .clone();
-                active_pane.update(cx, |pane, cx| {
-                    let is_zoomed = pane.is_zoomed();
-                    pane.set_zoomed(!is_zoomed, cx);
-                });
-                cx.notify();
-            }))
-            .on_action(cx.listener(Self::copy_debug_adapter_arguments))
-            .when(self.active_session.is_some(), |this| {
-                this.on_mouse_down(
-                    MouseButton::Right,
-                    cx.listener(|this, event: &MouseDownEvent, window, cx| {
-                        if this
-                            .active_session
-                            .as_ref()
-                            .map(|session| {
-                                let state = session.read(cx).running_state();
-                                state.read(cx).has_pane_at_position(event.position)
-                            })
-                            .unwrap_or(false)
-                        {
-                            this.deploy_context_menu(event.position, window, cx);
-                        }
-                    }),
-                )
-                .children(self.context_menu.as_ref().map(|(menu, position, _)| {
-                    deferred(
-                        anchored()
-                            .position(*position)
-                            .anchor(gpui::Corner::TopLeft)
-                            .child(menu.clone()),
-                    )
-                    .with_priority(1)
-                }))
-            })
-            .map(|this| {
-                if let Some(active_session) = self.active_session.clone() {
-                    this.child(active_session)
-                } else {
-                    let docked_to_bottom = self.position(window, cx) == DockPosition::Bottom;
-
-                    let welcome_experience = v_flex()
-                        .when_else(
-                            docked_to_bottom,
-                            |this| this.w_2_3().h_full().pr_8(),
-                            |this| this.w_full().h_1_3(),
-                        )
-                        .items_center()
-                        .justify_center()
-                        .gap_2()
-                        .child(
-                            Button::new("spawn-new-session-empty-state", "New Session")
-                                .icon(IconName::Plus)
-                                .icon_size(IconSize::Small)
-                                .icon_color(Color::Muted)
-                                .icon_position(IconPosition::Start)
-                                .on_click(|_, window, cx| {
-                                    window.dispatch_action(crate::Start.boxed_clone(), cx);
-                                }),
-                        )
-                        .child(
-                            Button::new("edit-debug-settings", "Edit debug.json")
-                                .icon(IconName::Code)
-                                .icon_size(IconSize::Small)
-                                .icon_color(Color::Muted)
-                                .icon_position(IconPosition::Start)
-                                .on_click(|_, window, cx| {
-                                    window.dispatch_action(
-                                        zed_actions::OpenProjectDebugTasks.boxed_clone(),
-                                        cx,
-                                    );
-                                }),
-                        )
-                        .child(
-                            Button::new("open-debugger-docs", "Debugger Docs")
-                                .icon(IconName::Book)
-                                .icon_size(IconSize::Small)
-                                .icon_color(Color::Muted)
-                                .icon_position(IconPosition::Start)
-                                .on_click(|_, _, cx| cx.open_url("https://zed.dev/docs/debugger")),
-                        )
-                        .child(
-                            Button::new(
-                                "spawn-new-session-install-extensions",
-                                "Debugger Extensions",
-                            )
-                            .icon(IconName::Blocks)
-                            .icon_size(IconSize::Small)
-                            .icon_color(Color::Muted)
-                            .icon_position(IconPosition::Start)
-                            .on_click(|_, window, cx| {
-                                window.dispatch_action(
-                                    zed_actions::Extensions {
-                                        category_filter: Some(
-                                            zed_actions::ExtensionCategoryFilter::DebugAdapters,
-                                        ),
-                                        id: None,
-                                    }
-                                    .boxed_clone(),
-                                    cx,
-                                );
-                            }),
-                        );
-
-                    let has_breakpoints = self
-                        .project
-                        .read(cx)
-                        .breakpoint_store()
-                        .read(cx)
-                        .all_source_breakpoints(cx)
-                        .values()
-                        .any(|breakpoints| !breakpoints.is_empty());
-
-                    let breakpoint_list = v_flex()
-                        .group("base-breakpoint-list")
-                        .when_else(
-                            docked_to_bottom,
-                            |this| this.min_w_1_3().h_full(),
-                            |this| this.size_full().h_2_3(),
-                        )
-                        .child(
-                            h_flex()
-                                .track_focus(&self.breakpoint_list.focus_handle(cx))
-                                .h(Tab::container_height(cx))
-                                .p_1p5()
-                                .w_full()
-                                .justify_between()
-                                .border_b_1()
-                                .border_color(cx.theme().colors().border_variant)
-                                .child(Label::new("Breakpoints").size(LabelSize::Small))
-                                .child(
-                                    h_flex().visible_on_hover("base-breakpoint-list").child(
-                                        self.breakpoint_list.read(cx).render_control_strip(),
-                                    ),
-                                ),
-                        )
-                        .when(has_breakpoints, |this| {
-                            this.child(self.breakpoint_list.clone())
-                        })
-                        .when(!has_breakpoints, |this| {
-                            this.child(
-                                v_flex().size_full().items_center().justify_center().child(
-                                    Label::new("No Breakpoints Set")
-                                        .size(LabelSize::Small)
-                                        .color(Color::Muted),
-                                ),
-                            )
-                        });
-
-                    this.child(
-                        v_flex()
-                            .size_full()
-                            .overflow_hidden()
-                            .gap_1()
-                            .items_center()
-                            .justify_center()
-                            .map(|this| {
-                                if docked_to_bottom {
-                                    this.child(
-                                        h_flex()
-                                            .size_full()
-                                            .child(breakpoint_list)
-                                            .child(Divider::vertical())
-                                            .child(welcome_experience)
-                                            .child(Divider::vertical()),
-                                    )
-                                } else {
-                                    this.child(
-                                        v_flex()
-                                            .size_full()
-                                            .child(welcome_experience)
-                                            .child(Divider::horizontal())
-                                            .child(breakpoint_list),
-                                    )
-                                }
-                            }),
-                    )
-                }
-            })
-            .into_any()
-    }
-}
-
-struct DebuggerProvider(Entity<DebugPanel>);
-
-impl workspace::DebuggerProvider for DebuggerProvider {
-    fn start_session(
-        &self,
-        definition: DebugScenario,
-        context: TaskContext,
-        buffer: Option<Entity<Buffer>>,
-        worktree_id: Option<WorktreeId>,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        self.0.update(cx, |_, cx| {
-            cx.defer_in(window, move |this, window, cx| {
-                this.start_session(definition, context, buffer, worktree_id, window, cx);
-            })
-        })
-    }
-
-    fn spawn_task_or_modal(
-        &self,
-        workspace: &mut Workspace,
-        action: &tasks_ui::Spawn,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        spawn_task_or_modal(workspace, action, window, cx);
-    }
-
-    fn debug_scenario_scheduled(&self, cx: &mut App) {
-        self.0.update(cx, |this, _| {
-            this.debug_scenario_scheduled_last = true;
-        });
-    }
-
-    fn task_scheduled(&self, cx: &mut App) {
-        self.0.update(cx, |this, _| {
-            this.debug_scenario_scheduled_last = false;
-        })
-    }
-
-    fn debug_scenario_scheduled_last(&self, cx: &App) -> bool {
-        self.0.read(cx).debug_scenario_scheduled_last
-    }
-
-    fn active_thread_state(&self, cx: &App) -> Option<ThreadStatus> {
-        let session = self.0.read(cx).active_session()?;
-        let thread = session.read(cx).running_state().read(cx).thread_id()?;
-        session.read(cx).session(cx).read(cx).thread_state(thread)
-    }
-}
diff --git a/crates/debugger_ui/src/debugger_ui.rs b/crates/debugger_ui/src/debugger_ui.rs
deleted file mode 100644
index bd5a7cda4a..0000000000
--- a/crates/debugger_ui/src/debugger_ui.rs
+++ /dev/null
@@ -1,483 +0,0 @@
-use std::any::TypeId;
-
-use debugger_panel::DebugPanel;
-use editor::{Editor, MultiBufferOffsetUtf16};
-use gpui::{Action, App, DispatchPhase, EntityInputHandler, actions};
-use new_process_modal::{NewProcessModal, NewProcessMode};
-use onboarding_modal::DebuggerOnboardingModal;
-use project::debugger::{self, breakpoint_store::SourceBreakpoint, session::ThreadStatus};
-use schemars::JsonSchema;
-use serde::Deserialize;
-use session::DebugSession;
-use stack_trace_view::StackTraceView;
-use tasks_ui::{Spawn, TaskOverrides};
-use ui::{FluentBuilder, InteractiveElement};
-use util::maybe;
-use workspace::{ItemHandle, ShutdownDebugAdapters, Workspace};
-use zed_actions::ToggleFocus;
-use zed_actions::debugger::OpenOnboardingModal;
-
-pub mod attach_modal;
-pub mod debugger_panel;
-mod dropdown_menus;
-mod new_process_modal;
-mod onboarding_modal;
-mod persistence;
-pub(crate) mod session;
-mod stack_trace_view;
-
-#[cfg(any(test, feature = "test-support"))]
-pub mod tests;
-
-actions!(
-    debugger,
-    [
-        /// Starts a new debugging session.
-        Start,
-        /// Continues execution until the next breakpoint.
-        Continue,
-        /// Detaches the debugger from the running process.
-        Detach,
-        /// Pauses the currently running program.
-        Pause,
-        /// Restarts the current debugging session.
-        Restart,
-        /// Reruns the current debugging session with the same configuration.
-        RerunSession,
-        /// Steps into the next function call.
-        StepInto,
-        /// Steps over the current line.
-        StepOver,
-        /// Steps out of the current function.
-        StepOut,
-        /// Steps back to the previous statement.
-        StepBack,
-        /// Stops the debugging session.
-        Stop,
-        /// Toggles whether to ignore all breakpoints.
-        ToggleIgnoreBreakpoints,
-        /// Clears all breakpoints in the project.
-        ClearAllBreakpoints,
-        /// Focuses on the debugger console panel.
-        FocusConsole,
-        /// Focuses on the variables panel.
-        FocusVariables,
-        /// Focuses on the breakpoint list panel.
-        FocusBreakpointList,
-        /// Focuses on the call stack frames panel.
-        FocusFrames,
-        /// Focuses on the loaded modules panel.
-        FocusModules,
-        /// Focuses on the loaded sources panel.
-        FocusLoadedSources,
-        /// Focuses on the terminal panel.
-        FocusTerminal,
-        /// Shows the stack trace for the current thread.
-        ShowStackTrace,
-        /// Toggles the thread picker dropdown.
-        ToggleThreadPicker,
-        /// Toggles the session picker dropdown.
-        ToggleSessionPicker,
-        /// Reruns the last debugging session.
-        #[action(deprecated_aliases = ["debugger::RerunLastSession"])]
-        Rerun,
-        /// Toggles expansion of the selected item in the debugger UI.
-        ToggleExpandItem,
-        /// Toggle the user frame filter in the stack frame list
-        /// When toggled on, only frames from the user's code are shown
-        /// When toggled off, all frames are shown
-        ToggleUserFrames,
-    ]
-);
-
-/// Extends selection down by a specified number of lines.
-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema, Action)]
-#[action(namespace = debugger)]
-#[serde(deny_unknown_fields)]
-/// Set a data breakpoint on the selected variable or memory region.
-pub struct ToggleDataBreakpoint {
-    /// The type of data breakpoint
-    /// Read & Write
-    /// Read
-    /// Write
-    #[serde(default)]
-    pub access_type: Option<dap::DataBreakpointAccessType>,
-}
-
-actions!(
-    dev,
-    [
-        /// Copies debug adapter launch arguments to clipboard.
-        CopyDebugAdapterArguments
-    ]
-);
-
-pub fn init(cx: &mut App) {
-    workspace::FollowableViewRegistry::register::<DebugSession>(cx);
-
-    cx.observe_new(|workspace: &mut Workspace, _, _| {
-        workspace
-            .register_action(spawn_task_or_modal)
-            .register_action(|workspace, _: &ToggleFocus, window, cx| {
-                workspace.toggle_panel_focus::<DebugPanel>(window, cx);
-            })
-            .register_action(|workspace: &mut Workspace, _: &Start, window, cx| {
-                NewProcessModal::show(workspace, window, NewProcessMode::Debug, None, cx);
-            })
-            .register_action(|workspace: &mut Workspace, _: &Rerun, window, cx| {
-                let Some(debug_panel) = workspace.panel::<DebugPanel>(cx) else {
-                    return;
-                };
-
-                debug_panel.update(cx, |debug_panel, cx| {
-                    debug_panel.rerun_last_session(workspace, window, cx);
-                })
-            })
-            .register_action(
-                |workspace: &mut Workspace, _: &ShutdownDebugAdapters, _window, cx| {
-                    workspace.project().update(cx, |project, cx| {
-                        project.dap_store().update(cx, |store, cx| {
-                            store.shutdown_sessions(cx).detach();
-                        })
-                    })
-                },
-            )
-            .register_action(|workspace, _: &OpenOnboardingModal, window, cx| {
-                DebuggerOnboardingModal::toggle(workspace, window, cx)
-            })
-            .register_action_renderer(|div, workspace, _, cx| {
-                let Some(debug_panel) = workspace.panel::<DebugPanel>(cx) else {
-                    return div;
-                };
-                let Some(active_item) = debug_panel
-                    .read(cx)
-                    .active_session()
-                    .map(|session| session.read(cx).running_state().clone())
-                else {
-                    return div;
-                };
-                let running_state = active_item.read(cx);
-                if running_state.session().read(cx).is_terminated() {
-                    return div;
-                }
-
-                let caps = running_state.capabilities(cx);
-                let supports_step_back = caps.supports_step_back.unwrap_or_default();
-                let supports_detach = running_state.session().read(cx).is_attached();
-                let status = running_state.thread_status(cx);
-
-                let active_item = active_item.downgrade();
-                div.when(status == Some(ThreadStatus::Running), |div| {
-                    let active_item = active_item.clone();
-                    div.on_action(move |_: &Pause, _, cx| {
-                        active_item
-                            .update(cx, |item, cx| item.pause_thread(cx))
-                            .ok();
-                    })
-                })
-                .when(status == Some(ThreadStatus::Stopped), |div| {
-                    div.on_action({
-                        let active_item = active_item.clone();
-                        move |_: &StepInto, _, cx| {
-                            active_item.update(cx, |item, cx| item.step_in(cx)).ok();
-                        }
-                    })
-                    .on_action({
-                        let active_item = active_item.clone();
-                        move |_: &StepOver, _, cx| {
-                            active_item.update(cx, |item, cx| item.step_over(cx)).ok();
-                        }
-                    })
-                    .on_action({
-                        let active_item = active_item.clone();
-                        move |_: &StepOut, _, cx| {
-                            active_item.update(cx, |item, cx| item.step_out(cx)).ok();
-                        }
-                    })
-                    .when(supports_step_back, |div| {
-                        let active_item = active_item.clone();
-                        div.on_action(move |_: &StepBack, _, cx| {
-                            active_item.update(cx, |item, cx| item.step_back(cx)).ok();
-                        })
-                    })
-                    .on_action({
-                        let active_item = active_item.clone();
-                        move |_: &Continue, _, cx| {
-                            active_item
-                                .update(cx, |item, cx| item.continue_thread(cx))
-                                .ok();
-                        }
-                    })
-                    .on_action(cx.listener(
-                        |workspace, _: &ShowStackTrace, window, cx| {
-                            let Some(debug_panel) = workspace.panel::<DebugPanel>(cx) else {
-                                return;
-                            };
-
-                            if let Some(existing) = workspace.item_of_type::<StackTraceView>(cx) {
-                                let is_active = workspace
-                                    .active_item(cx)
-                                    .is_some_and(|item| item.item_id() == existing.item_id());
-                                workspace.activate_item(&existing, true, !is_active, window, cx);
-                            } else {
-                                let Some(active_session) = debug_panel.read(cx).active_session()
-                                else {
-                                    return;
-                                };
-
-                                let project = workspace.project();
-
-                                let stack_trace_view = active_session.update(cx, |session, cx| {
-                                    session.stack_trace_view(project, window, cx).clone()
-                                });
-
-                                workspace.add_item_to_active_pane(
-                                    Box::new(stack_trace_view),
-                                    None,
-                                    true,
-                                    window,
-                                    cx,
-                                );
-                            }
-                        },
-                    ))
-                })
-                .when(supports_detach, |div| {
-                    let active_item = active_item.clone();
-                    div.on_action(move |_: &Detach, _, cx| {
-                        active_item
-                            .update(cx, |item, cx| item.detach_client(cx))
-                            .ok();
-                    })
-                })
-                .on_action({
-                    let active_item = active_item.clone();
-                    move |_: &Restart, _, cx| {
-                        active_item
-                            .update(cx, |item, cx| item.restart_session(cx))
-                            .ok();
-                    }
-                })
-                .on_action({
-                    let active_item = active_item.clone();
-                    move |_: &RerunSession, window, cx| {
-                        active_item
-                            .update(cx, |item, cx| item.rerun_session(window, cx))
-                            .ok();
-                    }
-                })
-                .on_action({
-                    let active_item = active_item.clone();
-                    move |_: &Stop, _, cx| {
-                        active_item.update(cx, |item, cx| item.stop_thread(cx)).ok();
-                    }
-                })
-                .on_action({
-                    let active_item = active_item.clone();
-                    move |_: &ToggleIgnoreBreakpoints, _, cx| {
-                        active_item
-                            .update(cx, |item, cx| item.toggle_ignore_breakpoints(cx))
-                            .ok();
-                    }
-                })
-                .on_action(move |_: &ToggleUserFrames, _, cx| {
-                    if let Some((thread_status, stack_frame_list)) = active_item
-                        .read_with(cx, |item, cx| {
-                            (item.thread_status(cx), item.stack_frame_list().clone())
-                        })
-                        .ok()
-                    {
-                        stack_frame_list.update(cx, |stack_frame_list, cx| {
-                            stack_frame_list.toggle_frame_filter(thread_status, cx);
-                        })
-                    }
-                })
-            });
-    })
-    .detach();
-
-    cx.observe_new({
-        move |editor: &mut Editor, _, _| {
-            editor
-                .register_action_renderer(move |editor, window, cx| {
-                    let Some(workspace) = editor.workspace() else {
-                        return;
-                    };
-                    let Some(debug_panel) = workspace.read(cx).panel::<DebugPanel>(cx) else {
-                        return;
-                    };
-                    let Some(active_session) =
-                        debug_panel.update(cx, |panel, _| panel.active_session())
-                    else {
-                        return;
-                    };
-
-                    let session = active_session
-                        .read(cx)
-                        .running_state
-                        .read(cx)
-                        .session()
-                        .read(cx);
-
-                    if session.is_terminated() {
-                        return;
-                    }
-
-                    let editor = cx.entity().downgrade();
-
-                    window.on_action_when(
-                        session.any_stopped_thread(),
-                        TypeId::of::<editor::actions::RunToCursor>(),
-                        {
-                            let editor = editor.clone();
-                            let active_session = active_session.clone();
-                            move |_, phase, _, cx| {
-                                if phase != DispatchPhase::Bubble {
-                                    return;
-                                }
-                                maybe!({
-                                    let (buffer, position, _) = editor
-                                        .update(cx, |editor, cx| {
-                                            let cursor_point: language::Point = editor
-                                                .selections
-                                                .newest(&editor.display_snapshot(cx))
-                                                .head();
-
-                                            editor
-                                                .buffer()
-                                                .read(cx)
-                                                .point_to_buffer_point(cursor_point, cx)
-                                        })
-                                        .ok()??;
-
-                                    let path =
-                                debugger::breakpoint_store::BreakpointStore::abs_path_from_buffer(
-                                    &buffer, cx,
-                                )?;
-
-                                    let source_breakpoint = SourceBreakpoint {
-                                        row: position.row,
-                                        path,
-                                        message: None,
-                                        condition: None,
-                                        hit_condition: None,
-                                        state: debugger::breakpoint_store::BreakpointState::Enabled,
-                                    };
-
-                                    active_session.update(cx, |session, cx| {
-                                        session.running_state().update(cx, |state, cx| {
-                                            if let Some(thread_id) = state.selected_thread_id() {
-                                                state.session().update(cx, |session, cx| {
-                                                    session.run_to_position(
-                                                        source_breakpoint,
-                                                        thread_id,
-                                                        cx,
-                                                    );
-                                                })
-                                            }
-                                        });
-                                    });
-
-                                    Some(())
-                                });
-                            }
-                        },
-                    );
-
-                    window.on_action(
-                        TypeId::of::<editor::actions::EvaluateSelectedText>(),
-                        move |_, _, window, cx| {
-                            let status = maybe!({
-                                let text = editor
-                                    .update(cx, |editor, cx| {
-                                        let range = editor
-                                            .selections
-                                            .newest::<MultiBufferOffsetUtf16>(
-                                                &editor.display_snapshot(cx),
-                                            )
-                                            .range();
-                                        editor.text_for_range(
-                                            range.start.0.0..range.end.0.0,
-                                            &mut None,
-                                            window,
-                                            cx,
-                                        )
-                                    })
-                                    .ok()??;
-
-                                active_session.update(cx, |session, cx| {
-                                    session.running_state().update(cx, |state, cx| {
-                                        let stack_id = state.selected_stack_frame_id(cx);
-
-                                        state.session().update(cx, |session, cx| {
-                                            session
-                                                .evaluate(
-                                                    text,
-                                                    Some(dap::EvaluateArgumentsContext::Repl),
-                                                    stack_id,
-                                                    None,
-                                                    cx,
-                                                )
-                                                .detach();
-                                        });
-                                    });
-                                });
-
-                                Some(())
-                            });
-                            if status.is_some() {
-                                cx.stop_propagation();
-                            }
-                        },
-                    );
-                })
-                .detach();
-        }
-    })
-    .detach();
-}
-
-fn spawn_task_or_modal(
-    workspace: &mut Workspace,
-    action: &Spawn,
-    window: &mut ui::Window,
-    cx: &mut ui::Context<Workspace>,
-) {
-    match action {
-        Spawn::ByName {
-            task_name,
-            reveal_target,
-        } => {
-            let overrides = reveal_target.map(|reveal_target| TaskOverrides {
-                reveal_target: Some(reveal_target),
-            });
-            let name = task_name.clone();
-            tasks_ui::spawn_tasks_filtered(
-                move |(_, task)| task.label.eq(&name),
-                overrides,
-                window,
-                cx,
-            )
-            .detach_and_log_err(cx)
-        }
-        Spawn::ByTag {
-            task_tag,
-            reveal_target,
-        } => {
-            let overrides = reveal_target.map(|reveal_target| TaskOverrides {
-                reveal_target: Some(reveal_target),
-            });
-            let tag = task_tag.clone();
-            tasks_ui::spawn_tasks_filtered(
-                move |(_, task)| task.tags.contains(&tag),
-                overrides,
-                window,
-                cx,
-            )
-            .detach_and_log_err(cx)
-        }
-        Spawn::ViaModal { reveal_target } => {
-            NewProcessModal::show(workspace, window, NewProcessMode::Task, *reveal_target, cx);
-        }
-    }
-}
diff --git a/crates/debugger_ui/src/dropdown_menus.rs b/crates/debugger_ui/src/dropdown_menus.rs
deleted file mode 100644
index e0c3628f4f..0000000000
--- a/crates/debugger_ui/src/dropdown_menus.rs
+++ /dev/null
@@ -1,335 +0,0 @@
-use std::rc::Rc;
-
-use collections::HashMap;
-use gpui::{Corner, Entity, WeakEntity};
-use project::debugger::session::{ThreadId, ThreadStatus};
-use ui::{CommonAnimationExt, ContextMenu, DropdownMenu, DropdownStyle, Indicator, prelude::*};
-use util::{maybe, truncate_and_trailoff};
-
-use crate::{
-    debugger_panel::DebugPanel,
-    session::{DebugSession, running::RunningState},
-};
-
-struct SessionListEntry {
-    ancestors: Vec<Entity<DebugSession>>,
-    leaf: Entity<DebugSession>,
-}
-
-impl SessionListEntry {
-    pub(crate) fn label_element(&self, depth: usize, cx: &mut App) -> AnyElement {
-        const MAX_LABEL_CHARS: usize = 150;
-
-        let mut label = String::new();
-        for ancestor in &self.ancestors {
-            label.push_str(&ancestor.update(cx, |ancestor, cx| {
-                ancestor.label(cx).unwrap_or("(child)".into())
-            }));
-            label.push_str(" » ");
-        }
-        label.push_str(
-            &self
-                .leaf
-                .update(cx, |leaf, cx| leaf.label(cx).unwrap_or("(child)".into())),
-        );
-        let label = truncate_and_trailoff(&label, MAX_LABEL_CHARS);
-
-        let is_terminated = self
-            .leaf
-            .read(cx)
-            .running_state
-            .read(cx)
-            .session()
-            .read(cx)
-            .is_terminated();
-        let icon = {
-            if is_terminated {
-                Some(Indicator::dot().color(Color::Error))
-            } else {
-                match self
-                    .leaf
-                    .read(cx)
-                    .running_state
-                    .read(cx)
-                    .thread_status(cx)
-                    .unwrap_or_default()
-                {
-                    project::debugger::session::ThreadStatus::Stopped => {
-                        Some(Indicator::dot().color(Color::Conflict))
-                    }
-                    _ => Some(Indicator::dot().color(Color::Success)),
-                }
-            }
-        };
-
-        h_flex()
-            .id("session-label")
-            .ml(depth * px(16.0))
-            .gap_2()
-            .when_some(icon, |this, indicator| this.child(indicator))
-            .justify_between()
-            .child(
-                Label::new(label)
-                    .size(LabelSize::Small)
-                    .when(is_terminated, |this| this.strikethrough()),
-            )
-            .into_any_element()
-    }
-}
-
-impl DebugPanel {
-    fn dropdown_label(label: impl Into<SharedString>) -> Label {
-        const MAX_LABEL_CHARS: usize = 50;
-        let label = truncate_and_trailoff(&label.into(), MAX_LABEL_CHARS);
-        Label::new(label).size(LabelSize::Small)
-    }
-
-    pub fn render_session_menu(
-        &mut self,
-        active_session: Option<Entity<DebugSession>>,
-        running_state: Option<Entity<RunningState>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<impl IntoElement> {
-        let running_state = running_state?;
-
-        let mut session_entries = Vec::with_capacity(self.sessions_with_children.len() * 3);
-        let mut sessions_with_children = self.sessions_with_children.iter().peekable();
-
-        while let Some((root, children)) = sessions_with_children.next() {
-            let root_entry = if let Ok([single_child]) = <&[_; 1]>::try_from(children.as_slice())
-                && let Some(single_child) = single_child.upgrade()
-                && single_child.read(cx).quirks.compact
-            {
-                sessions_with_children.next();
-                SessionListEntry {
-                    leaf: single_child.clone(),
-                    ancestors: vec![root.clone()],
-                }
-            } else {
-                SessionListEntry {
-                    leaf: root.clone(),
-                    ancestors: Vec::new(),
-                }
-            };
-            session_entries.push(root_entry);
-        }
-
-        let weak = cx.weak_entity();
-        let trigger_label = if let Some(active_session) = active_session.clone() {
-            active_session.update(cx, |active_session, cx| {
-                active_session.label(cx).unwrap_or("(child)".into())
-            })
-        } else {
-            SharedString::new_static("Unknown Session")
-        };
-        let running_state = running_state.read(cx);
-
-        let is_terminated = running_state.session().read(cx).is_terminated();
-        let is_started = active_session
-            .is_some_and(|session| session.read(cx).session(cx).read(cx).is_started());
-
-        let session_state_indicator = if is_terminated {
-            Indicator::dot().color(Color::Error).into_any_element()
-        } else if !is_started {
-            Icon::new(IconName::ArrowCircle)
-                .size(IconSize::Small)
-                .color(Color::Muted)
-                .with_rotate_animation(2)
-                .into_any_element()
-        } else {
-            match running_state.thread_status(cx).unwrap_or_default() {
-                ThreadStatus::Stopped => Indicator::dot().color(Color::Conflict).into_any_element(),
-                _ => Indicator::dot().color(Color::Success).into_any_element(),
-            }
-        };
-
-        let trigger = h_flex()
-            .gap_2()
-            .child(session_state_indicator)
-            .justify_between()
-            .child(
-                DebugPanel::dropdown_label(trigger_label)
-                    .when(is_terminated, |this| this.strikethrough()),
-            )
-            .into_any_element();
-
-        let menu = DropdownMenu::new_with_element(
-            "debugger-session-list",
-            trigger,
-            ContextMenu::build(window, cx, move |mut this, _, cx| {
-                let context_menu = cx.weak_entity();
-                let mut session_depths = HashMap::default();
-                for session_entry in session_entries {
-                    let session_id = session_entry.leaf.read(cx).session_id(cx);
-                    let parent_depth = session_entry
-                        .ancestors
-                        .first()
-                        .unwrap_or(&session_entry.leaf)
-                        .read(cx)
-                        .session(cx)
-                        .read(cx)
-                        .parent_id(cx)
-                        .and_then(|parent_id| session_depths.get(&parent_id).cloned());
-                    let self_depth = *session_depths
-                        .entry(session_id)
-                        .or_insert_with(|| parent_depth.map(|depth| depth + 1).unwrap_or(0usize));
-                    this = this.custom_entry(
-                        {
-                            let weak = weak.clone();
-                            let context_menu = context_menu.clone();
-                            let ancestors: Rc<[_]> = session_entry
-                                .ancestors
-                                .iter()
-                                .map(|session| session.downgrade())
-                                .collect();
-                            let leaf = session_entry.leaf.downgrade();
-                            move |window, cx| {
-                                Self::render_session_menu_entry(
-                                    weak.clone(),
-                                    context_menu.clone(),
-                                    ancestors.clone(),
-                                    leaf.clone(),
-                                    self_depth,
-                                    window,
-                                    cx,
-                                )
-                            }
-                        },
-                        {
-                            let weak = weak.clone();
-                            let leaf = session_entry.leaf.clone();
-                            move |window, cx| {
-                                weak.update(cx, |panel, cx| {
-                                    panel.activate_session(leaf.clone(), window, cx);
-                                })
-                                .ok();
-                            }
-                        },
-                    );
-                }
-                this
-            }),
-        )
-        .attach(Corner::BottomLeft)
-        .style(DropdownStyle::Ghost)
-        .handle(self.session_picker_menu_handle.clone());
-
-        Some(menu)
-    }
-
-    fn render_session_menu_entry(
-        weak: WeakEntity<DebugPanel>,
-        context_menu: WeakEntity<ContextMenu>,
-        ancestors: Rc<[WeakEntity<DebugSession>]>,
-        leaf: WeakEntity<DebugSession>,
-        self_depth: usize,
-        _window: &mut Window,
-        cx: &mut App,
-    ) -> AnyElement {
-        let Some(session_entry) = maybe!({
-            let ancestors = ancestors
-                .iter()
-                .map(|ancestor| ancestor.upgrade())
-                .collect::<Option<Vec<_>>>()?;
-            let leaf = leaf.upgrade()?;
-            Some(SessionListEntry { ancestors, leaf })
-        }) else {
-            return div().into_any_element();
-        };
-
-        let id: SharedString = format!(
-            "debug-session-{}",
-            session_entry.leaf.read(cx).session_id(cx).0
-        )
-        .into();
-        let session_entity_id = session_entry.leaf.entity_id();
-
-        h_flex()
-            .w_full()
-            .group(id.clone())
-            .justify_between()
-            .child(session_entry.label_element(self_depth, cx))
-            .child(
-                IconButton::new("close-debug-session", IconName::Close)
-                    .visible_on_hover(id)
-                    .icon_size(IconSize::Small)
-                    .on_click({
-                        move |_, window, cx| {
-                            weak.update(cx, |panel, cx| {
-                                panel.close_session(session_entity_id, window, cx);
-                            })
-                            .ok();
-                            context_menu
-                                .update(cx, |this, cx| {
-                                    this.cancel(&Default::default(), window, cx);
-                                })
-                                .ok();
-                        }
-                    }),
-            )
-            .into_any_element()
-    }
-
-    pub(crate) fn render_thread_dropdown(
-        &self,
-        running_state: &Entity<RunningState>,
-        threads: Vec<(dap::Thread, ThreadStatus)>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<DropdownMenu> {
-        const MAX_LABEL_CHARS: usize = 150;
-
-        let running_state = running_state.clone();
-        let running_state_read = running_state.read(cx);
-        let thread_id = running_state_read.thread_id();
-        let session = running_state_read.session();
-        let session_id = session.read(cx).session_id();
-        let session_terminated = session.read(cx).is_terminated();
-        let selected_thread_name = threads
-            .iter()
-            .find(|(thread, _)| thread_id.map(|id| id.0) == Some(thread.id))
-            .map(|(thread, _)| {
-                thread
-                    .name
-                    .is_empty()
-                    .then(|| format!("Tid: {}", thread.id))
-                    .unwrap_or_else(|| thread.name.clone())
-            });
-
-        if let Some(selected_thread_name) = selected_thread_name {
-            let trigger = DebugPanel::dropdown_label(selected_thread_name).into_any_element();
-            Some(
-                DropdownMenu::new_with_element(
-                    ("thread-list", session_id.0),
-                    trigger,
-                    ContextMenu::build(window, cx, move |mut this, _, _| {
-                        for (thread, _) in threads {
-                            let running_state = running_state.clone();
-                            let thread_id = thread.id;
-                            let entry_name = thread
-                                .name
-                                .is_empty()
-                                .then(|| format!("Tid: {}", thread.id))
-                                .unwrap_or_else(|| thread.name);
-                            let entry_name = truncate_and_trailoff(&entry_name, MAX_LABEL_CHARS);
-
-                            this = this.entry(entry_name, None, move |window, cx| {
-                                running_state.update(cx, |running_state, cx| {
-                                    running_state.select_thread(ThreadId(thread_id), window, cx);
-                                });
-                            });
-                        }
-                        this
-                    }),
-                )
-                .attach(Corner::BottomLeft)
-                .disabled(session_terminated)
-                .style(DropdownStyle::Ghost)
-                .handle(self.thread_picker_menu_handle.clone()),
-            )
-        } else {
-            None
-        }
-    }
-}
diff --git a/crates/debugger_ui/src/new_process_modal.rs b/crates/debugger_ui/src/new_process_modal.rs
deleted file mode 100644
index 8aaa61aad6..0000000000
--- a/crates/debugger_ui/src/new_process_modal.rs
+++ /dev/null
@@ -1,1600 +0,0 @@
-use anyhow::{Context as _, bail};
-use collections::{FxHashMap, HashMap, HashSet};
-use language::{LanguageName, LanguageRegistry};
-use std::{
-    borrow::Cow,
-    path::{Path, PathBuf},
-    sync::Arc,
-    usize,
-};
-use tasks_ui::{TaskOverrides, TasksModal};
-
-use dap::{
-    DapRegistry, DebugRequest, TelemetrySpawnLocation, adapters::DebugAdapterName, send_telemetry,
-};
-use editor::Editor;
-use fuzzy::{StringMatch, StringMatchCandidate};
-use gpui::{
-    Action, App, AppContext, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable,
-    KeyContext, Render, Subscription, Task, WeakEntity,
-};
-use itertools::Itertools as _;
-use picker::{Picker, PickerDelegate, highlighted_match_with_paths::HighlightedMatch};
-use project::{DebugScenarioContext, Project, TaskContexts, TaskSourceKind, task_store::TaskStore};
-use task::{DebugScenario, RevealTarget, VariableName, ZedDebugConfig};
-use ui::{
-    ContextMenu, DropdownMenu, FluentBuilder, IconWithIndicator, Indicator, KeyBinding, ListItem,
-    ListItemSpacing, Switch, SwitchLabelPosition, ToggleButtonGroup, ToggleButtonSimple,
-    ToggleState, Tooltip, prelude::*,
-};
-use ui_input::InputField;
-use util::{ResultExt, debug_panic, rel_path::RelPath, shell::ShellKind};
-use workspace::{ModalView, Workspace, notifications::DetachAndPromptErr, pane};
-
-use crate::{
-    attach_modal::{AttachModal, ModalIntent},
-    debugger_panel::DebugPanel,
-};
-
-pub(super) struct NewProcessModal {
-    workspace: WeakEntity<Workspace>,
-    debug_panel: WeakEntity<DebugPanel>,
-    mode: NewProcessMode,
-    debug_picker: Entity<Picker<DebugDelegate>>,
-    attach_mode: Entity<AttachMode>,
-    configure_mode: Entity<ConfigureMode>,
-    task_mode: TaskMode,
-    debugger: Option<DebugAdapterName>,
-    _subscriptions: [Subscription; 3],
-}
-
-fn suggested_label(request: &DebugRequest, debugger: &str) -> SharedString {
-    match request {
-        DebugRequest::Launch(config) => {
-            let last_path_component = Path::new(&config.program)
-                .file_name()
-                .map(|name| name.to_string_lossy())
-                .unwrap_or_else(|| Cow::Borrowed(&config.program));
-
-            format!("{} ({debugger})", last_path_component).into()
-        }
-        DebugRequest::Attach(config) => format!(
-            "pid: {} ({debugger})",
-            config.process_id.unwrap_or(u32::MAX)
-        )
-        .into(),
-    }
-}
-
-impl NewProcessModal {
-    pub(super) fn show(
-        workspace: &mut Workspace,
-        window: &mut Window,
-        mode: NewProcessMode,
-        reveal_target: Option<RevealTarget>,
-        cx: &mut Context<Workspace>,
-    ) {
-        let Some(debug_panel) = workspace.panel::<DebugPanel>(cx) else {
-            return;
-        };
-        let task_store = workspace.project().read(cx).task_store().clone();
-        let languages = workspace.app_state().languages.clone();
-
-        cx.spawn_in(window, async move |workspace, cx| {
-            let task_contexts = workspace.update_in(cx, |workspace, window, cx| {
-                // todo(debugger): get the buffer here (if the active item is an editor) and store it so we can pass it to start_session later
-                tasks_ui::task_contexts(workspace, window, cx)
-            })?;
-            workspace.update_in(cx, |workspace, window, cx| {
-                let workspace_handle = workspace.weak_handle();
-                let project = workspace.project().clone();
-                workspace.toggle_modal(window, cx, |window, cx| {
-                    let attach_mode =
-                        AttachMode::new(None, workspace_handle.clone(), project, window, cx);
-
-                    let debug_picker = cx.new(|cx| {
-                        let delegate =
-                            DebugDelegate::new(debug_panel.downgrade(), task_store.clone());
-                        Picker::list(delegate, window, cx)
-                            .modal(false)
-                            .list_measure_all()
-                    });
-
-                    let configure_mode = ConfigureMode::new(window, cx);
-
-                    let task_overrides = Some(TaskOverrides { reveal_target });
-
-                    let task_mode = TaskMode {
-                        task_modal: cx.new(|cx| {
-                            TasksModal::new(
-                                task_store.clone(),
-                                Arc::new(TaskContexts::default()),
-                                task_overrides,
-                                false,
-                                workspace_handle.clone(),
-                                window,
-                                cx,
-                            )
-                        }),
-                    };
-
-                    let _subscriptions = [
-                        cx.subscribe(&debug_picker, |_, _, _, cx| {
-                            cx.emit(DismissEvent);
-                        }),
-                        cx.subscribe(
-                            &attach_mode.read(cx).attach_picker.clone(),
-                            |_, _, _, cx| {
-                                cx.emit(DismissEvent);
-                            },
-                        ),
-                        cx.subscribe(&task_mode.task_modal, |_, _, _: &DismissEvent, cx| {
-                            cx.emit(DismissEvent)
-                        }),
-                    ];
-
-                    cx.spawn_in(window, {
-                        let debug_picker = debug_picker.downgrade();
-                        let configure_mode = configure_mode.downgrade();
-                        let task_modal = task_mode.task_modal.downgrade();
-                        let workspace = workspace_handle.clone();
-
-                        async move |this, cx| {
-                            let task_contexts = task_contexts.await;
-                            let task_contexts = Arc::new(task_contexts);
-                            let lsp_task_sources = task_contexts.lsp_task_sources.clone();
-                            let task_position = task_contexts.latest_selection;
-                            // Get LSP tasks and filter out based on language vs lsp preference
-                            let (lsp_tasks, prefer_lsp) =
-                                workspace.update(cx, |workspace, cx| {
-                                    let lsp_tasks = editor::lsp_tasks(
-                                        workspace.project().clone(),
-                                        &lsp_task_sources,
-                                        task_position,
-                                        cx,
-                                    );
-                                    let prefer_lsp = workspace
-                                        .active_item(cx)
-                                        .and_then(|item| item.downcast::<Editor>())
-                                        .map(|editor| {
-                                            editor
-                                                .read(cx)
-                                                .buffer()
-                                                .read(cx)
-                                                .language_settings(cx)
-                                                .tasks
-                                                .prefer_lsp
-                                        })
-                                        .unwrap_or(false);
-                                    (lsp_tasks, prefer_lsp)
-                                })?;
-
-                            let lsp_tasks = lsp_tasks.await;
-                            let add_current_language_tasks = !prefer_lsp || lsp_tasks.is_empty();
-
-                            let lsp_tasks = lsp_tasks
-                                .into_iter()
-                                .flat_map(|(kind, tasks_with_locations)| {
-                                    tasks_with_locations
-                                        .into_iter()
-                                        .sorted_by_key(|(location, task)| {
-                                            (location.is_none(), task.resolved_label.clone())
-                                        })
-                                        .map(move |(_, task)| (kind.clone(), task))
-                                })
-                                .collect::<Vec<_>>();
-
-                            let Some(task_inventory) = task_store
-                                .update(cx, |task_store, _| task_store.task_inventory().cloned())?
-                            else {
-                                return Ok(());
-                            };
-
-                            let (used_tasks, current_resolved_tasks) = task_inventory
-                                .update(cx, |task_inventory, cx| {
-                                    task_inventory
-                                        .used_and_current_resolved_tasks(task_contexts.clone(), cx)
-                                })?
-                                .await;
-
-                            if let Ok(task) = debug_picker.update(cx, |picker, cx| {
-                                picker.delegate.tasks_loaded(
-                                    task_contexts.clone(),
-                                    languages,
-                                    lsp_tasks.clone(),
-                                    current_resolved_tasks.clone(),
-                                    add_current_language_tasks,
-                                    cx,
-                                )
-                            }) {
-                                task.await;
-                                debug_picker
-                                    .update_in(cx, |picker, window, cx| {
-                                        picker.refresh(window, cx);
-                                        cx.notify();
-                                    })
-                                    .ok();
-                            }
-
-                            if let Some(active_cwd) = task_contexts
-                                .active_context()
-                                .and_then(|context| context.cwd.clone())
-                            {
-                                configure_mode
-                                    .update_in(cx, |configure_mode, window, cx| {
-                                        configure_mode.load(active_cwd, window, cx);
-                                    })
-                                    .ok();
-                            }
-
-                            task_modal
-                                .update_in(cx, |task_modal, window, cx| {
-                                    task_modal.tasks_loaded(
-                                        task_contexts,
-                                        lsp_tasks,
-                                        used_tasks,
-                                        current_resolved_tasks,
-                                        add_current_language_tasks,
-                                        window,
-                                        cx,
-                                    );
-                                })
-                                .ok();
-
-                            this.update(cx, |_, cx| {
-                                cx.notify();
-                            })
-                            .ok();
-
-                            anyhow::Ok(())
-                        }
-                    })
-                    .detach();
-
-                    Self {
-                        debug_picker,
-                        attach_mode,
-                        configure_mode,
-                        task_mode,
-                        debugger: None,
-                        mode,
-                        debug_panel: debug_panel.downgrade(),
-                        workspace: workspace_handle,
-                        _subscriptions,
-                    }
-                });
-            })?;
-
-            anyhow::Ok(())
-        })
-        .detach();
-    }
-
-    fn render_mode(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl ui::IntoElement {
-        let dap_menu = self.adapter_drop_down_menu(window, cx);
-        match self.mode {
-            NewProcessMode::Task => self
-                .task_mode
-                .task_modal
-                .read(cx)
-                .picker
-                .clone()
-                .into_any_element(),
-            NewProcessMode::Attach => self.attach_mode.update(cx, |this, cx| {
-                this.clone().render(window, cx).into_any_element()
-            }),
-            NewProcessMode::Launch => self.configure_mode.update(cx, |this, cx| {
-                this.clone().render(dap_menu, window, cx).into_any_element()
-            }),
-            NewProcessMode::Debug => v_flex()
-                .w(rems(34.))
-                .child(self.debug_picker.clone())
-                .into_any_element(),
-        }
-    }
-
-    fn mode_focus_handle(&self, cx: &App) -> FocusHandle {
-        match self.mode {
-            NewProcessMode::Task => self.task_mode.task_modal.focus_handle(cx),
-            NewProcessMode::Attach => self.attach_mode.read(cx).attach_picker.focus_handle(cx),
-            NewProcessMode::Launch => self.configure_mode.read(cx).program.focus_handle(cx),
-            NewProcessMode::Debug => self.debug_picker.focus_handle(cx),
-        }
-    }
-
-    fn debug_scenario(&self, debugger: &str, cx: &App) -> Task<Option<DebugScenario>> {
-        let request = match self.mode {
-            NewProcessMode::Launch => {
-                DebugRequest::Launch(self.configure_mode.read(cx).debug_request(cx))
-            }
-            NewProcessMode::Attach => {
-                DebugRequest::Attach(self.attach_mode.read(cx).debug_request())
-            }
-            _ => return Task::ready(None),
-        };
-        let label = suggested_label(&request, debugger);
-
-        let stop_on_entry = if let NewProcessMode::Launch = &self.mode {
-            Some(self.configure_mode.read(cx).stop_on_entry.selected())
-        } else {
-            None
-        };
-
-        let session_scenario = ZedDebugConfig {
-            adapter: debugger.to_owned().into(),
-            label,
-            request,
-            stop_on_entry,
-        };
-
-        let adapter = cx
-            .global::<DapRegistry>()
-            .adapter(&session_scenario.adapter);
-
-        cx.spawn(async move |_| adapter?.config_from_zed_format(session_scenario).await.ok())
-    }
-
-    fn start_new_session(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if self.debugger.as_ref().is_none() {
-            return;
-        }
-
-        if let NewProcessMode::Debug = &self.mode {
-            self.debug_picker.update(cx, |picker, cx| {
-                picker.delegate.confirm(false, window, cx);
-            });
-            return;
-        }
-
-        if let NewProcessMode::Launch = &self.mode
-            && self.configure_mode.read(cx).save_to_debug_json.selected()
-        {
-            self.save_debug_scenario(window, cx);
-        }
-
-        let Some(debugger) = self.debugger.clone() else {
-            return;
-        };
-
-        let debug_panel = self.debug_panel.clone();
-        let Some(task_contexts) = self.task_contexts(cx) else {
-            return;
-        };
-
-        let task_context = task_contexts.active_context().cloned().unwrap_or_default();
-        let worktree_id = task_contexts.worktree();
-        let mode = self.mode;
-        cx.spawn_in(window, async move |this, cx| {
-            let Some(config) = this
-                .update(cx, |this, cx| this.debug_scenario(&debugger, cx))?
-                .await
-            else {
-                bail!("debug config not found in mode: {mode}");
-            };
-
-            debug_panel.update_in(cx, |debug_panel, window, cx| {
-                send_telemetry(&config, TelemetrySpawnLocation::Custom, cx);
-                debug_panel.start_session(config, task_context, None, worktree_id, window, cx)
-            })?;
-            this.update(cx, |_, cx| {
-                cx.emit(DismissEvent);
-            })
-            .ok();
-            anyhow::Ok(())
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn update_attach_picker(
-        attach: &Entity<AttachMode>,
-        adapter: &DebugAdapterName,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        attach.update(cx, |this, cx| {
-            if adapter.0 != this.definition.adapter {
-                this.definition.adapter = adapter.0.clone();
-
-                this.attach_picker.update(cx, |this, cx| {
-                    this.picker.update(cx, |this, cx| {
-                        match &mut this.delegate.intent {
-                            ModalIntent::AttachToProcess(definition) => {
-                                definition.adapter = adapter.0.clone();
-                                this.focus(window, cx);
-                            },
-                            ModalIntent::ResolveProcessId(_) => {
-                                debug_panic!("Attach picker attempted to update config when in resolve Process ID mode");
-                            }
-                        }
-                    })
-                });
-            }
-
-            cx.notify();
-        })
-    }
-
-    fn task_contexts(&self, cx: &App) -> Option<Arc<TaskContexts>> {
-        self.debug_picker.read(cx).delegate.task_contexts.clone()
-    }
-
-    pub fn save_debug_scenario(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let task_contexts = self.task_contexts(cx);
-        let Some(adapter) = self.debugger.as_ref() else {
-            return;
-        };
-        let scenario = self.debug_scenario(adapter, cx);
-        cx.spawn_in(window, async move |this, cx| {
-            let scenario = scenario.await.context("no scenario to save")?;
-            let worktree_id = task_contexts
-                .context("no task contexts")?
-                .worktree()
-                .context("no active worktree")?;
-            this.update_in(cx, |this, window, cx| {
-                this.debug_panel.update(cx, |panel, cx| {
-                    panel.save_scenario(scenario, worktree_id, window, cx)
-                })
-            })??
-            .await?;
-            this.update_in(cx, |_, _, cx| {
-                cx.emit(DismissEvent);
-            })
-        })
-        .detach_and_prompt_err("Failed to edit debug.json", window, cx, |_, _, _| None);
-    }
-
-    fn adapter_drop_down_menu(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> DropdownMenu {
-        let workspace = self.workspace.clone();
-        let weak = cx.weak_entity();
-        let active_buffer = self.task_contexts(cx).and_then(|tc| {
-            tc.active_item_context
-                .as_ref()
-                .and_then(|aic| aic.1.as_ref().map(|l| l.buffer.clone()))
-        });
-
-        let active_buffer_language = active_buffer
-            .and_then(|buffer| buffer.read(cx).language())
-            .cloned();
-
-        let mut available_adapters: Vec<_> = workspace
-            .update(cx, |_, cx| DapRegistry::global(cx).enumerate_adapters())
-            .unwrap_or_default();
-        if let Some(language) = active_buffer_language {
-            available_adapters.sort_by_key(|adapter| {
-                language
-                    .config()
-                    .debuggers
-                    .get_index_of(adapter.0.as_ref())
-                    .unwrap_or(usize::MAX)
-            });
-            if self.debugger.is_none() {
-                self.debugger = available_adapters.first().cloned();
-            }
-        }
-
-        let label = self
-            .debugger
-            .as_ref()
-            .map(|d| d.0.clone())
-            .unwrap_or_else(|| SELECT_DEBUGGER_LABEL.clone());
-
-        DropdownMenu::new(
-            "dap-adapter-picker",
-            label,
-            ContextMenu::build(window, cx, move |mut menu, _, _| {
-                let setter_for_name = |name: DebugAdapterName| {
-                    let weak = weak.clone();
-                    move |window: &mut Window, cx: &mut App| {
-                        weak.update(cx, |this, cx| {
-                            this.debugger = Some(name.clone());
-                            cx.notify();
-                            if let NewProcessMode::Attach = &this.mode {
-                                Self::update_attach_picker(&this.attach_mode, &name, window, cx);
-                            }
-                        })
-                        .ok();
-                    }
-                };
-
-                for adapter in available_adapters.into_iter() {
-                    menu = menu.entry(adapter.0.clone(), None, setter_for_name(adapter.clone()));
-                }
-
-                menu
-            }),
-        )
-        .style(ui::DropdownStyle::Outlined)
-        .tab_index(0)
-        .attach(gpui::Corner::BottomLeft)
-        .offset(gpui::Point {
-            x: px(0.0),
-            y: px(2.0),
-        })
-    }
-}
-
-static SELECT_DEBUGGER_LABEL: SharedString = SharedString::new_static("Select Debugger");
-
-#[derive(Clone, Copy)]
-pub(crate) enum NewProcessMode {
-    Task,
-    Launch,
-    Attach,
-    Debug,
-}
-
-impl std::fmt::Display for NewProcessMode {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let mode = match self {
-            NewProcessMode::Task => "Run",
-            NewProcessMode::Debug => "Debug",
-            NewProcessMode::Attach => "Attach",
-            NewProcessMode::Launch => "Launch",
-        };
-
-        write!(f, "{}", mode)
-    }
-}
-
-impl Focusable for NewProcessMode {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        cx.focus_handle()
-    }
-}
-
-impl Render for NewProcessModal {
-    fn render(
-        &mut self,
-        window: &mut ui::Window,
-        cx: &mut ui::Context<Self>,
-    ) -> impl ui::IntoElement {
-        v_flex()
-            .key_context({
-                let mut key_context = KeyContext::new_with_defaults();
-                key_context.add("Pane");
-                key_context.add("RunModal");
-                key_context
-            })
-            .size_full()
-            .w(rems(34.))
-            .elevation_3(cx)
-            .overflow_hidden()
-            .on_action(cx.listener(|_, _: &menu::Cancel, _, cx| {
-                cx.emit(DismissEvent);
-            }))
-            .on_action(cx.listener(|this, _: &pane::ActivateNextItem, window, cx| {
-                this.mode = match this.mode {
-                    NewProcessMode::Task => NewProcessMode::Debug,
-                    NewProcessMode::Debug => NewProcessMode::Attach,
-                    NewProcessMode::Attach => NewProcessMode::Launch,
-                    NewProcessMode::Launch => NewProcessMode::Task,
-                };
-
-                this.mode_focus_handle(cx).focus(window);
-            }))
-            .on_action(
-                cx.listener(|this, _: &pane::ActivatePreviousItem, window, cx| {
-                    this.mode = match this.mode {
-                        NewProcessMode::Task => NewProcessMode::Launch,
-                        NewProcessMode::Debug => NewProcessMode::Task,
-                        NewProcessMode::Attach => NewProcessMode::Debug,
-                        NewProcessMode::Launch => NewProcessMode::Attach,
-                    };
-
-                    this.mode_focus_handle(cx).focus(window);
-                }),
-            )
-            .child(
-                h_flex()
-                    .p_2()
-                    .w_full()
-                    .border_b_1()
-                    .border_color(cx.theme().colors().border_variant)
-                    .child(
-                        ToggleButtonGroup::single_row(
-                            "debugger-mode-buttons",
-                            [
-                                ToggleButtonSimple::new(
-                                    NewProcessMode::Task.to_string(),
-                                    cx.listener(|this, _, window, cx| {
-                                        this.mode = NewProcessMode::Task;
-                                        this.mode_focus_handle(cx).focus(window);
-                                        cx.notify();
-                                    }),
-                                )
-                                .tooltip(Tooltip::text("Run predefined task")),
-                                ToggleButtonSimple::new(
-                                    NewProcessMode::Debug.to_string(),
-                                    cx.listener(|this, _, window, cx| {
-                                        this.mode = NewProcessMode::Debug;
-                                        this.mode_focus_handle(cx).focus(window);
-                                        cx.notify();
-                                    }),
-                                )
-                                .tooltip(Tooltip::text("Start a predefined debug scenario")),
-                                ToggleButtonSimple::new(
-                                    NewProcessMode::Attach.to_string(),
-                                    cx.listener(|this, _, window, cx| {
-                                        this.mode = NewProcessMode::Attach;
-
-                                        if let Some(debugger) = this.debugger.as_ref() {
-                                            Self::update_attach_picker(
-                                                &this.attach_mode,
-                                                debugger,
-                                                window,
-                                                cx,
-                                            );
-                                        }
-                                        this.mode_focus_handle(cx).focus(window);
-                                        cx.notify();
-                                    }),
-                                )
-                                .tooltip(Tooltip::text("Attach the debugger to a running process")),
-                                ToggleButtonSimple::new(
-                                    NewProcessMode::Launch.to_string(),
-                                    cx.listener(|this, _, window, cx| {
-                                        this.mode = NewProcessMode::Launch;
-                                        this.mode_focus_handle(cx).focus(window);
-                                        cx.notify();
-                                    }),
-                                )
-                                .tooltip(Tooltip::text("Launch a new process with a debugger")),
-                            ],
-                        )
-                        .label_size(LabelSize::Default)
-                        .auto_width()
-                        .selected_index(match self.mode {
-                            NewProcessMode::Task => 0,
-                            NewProcessMode::Debug => 1,
-                            NewProcessMode::Attach => 2,
-                            NewProcessMode::Launch => 3,
-                        }),
-                    ),
-            )
-            .child(v_flex().child(self.render_mode(window, cx)))
-            .map(|el| {
-                let container = h_flex()
-                    .w_full()
-                    .p_1p5()
-                    .gap_2()
-                    .justify_between()
-                    .border_t_1()
-                    .border_color(cx.theme().colors().border_variant);
-                let secondary_action = menu::SecondaryConfirm.boxed_clone();
-                match self.mode {
-                    NewProcessMode::Launch => el.child(
-                        container
-                            .child(
-                                h_flex().child(
-                                    Button::new("edit-custom-debug", "Edit in debug.json")
-                                        .on_click(cx.listener(|this, _, window, cx| {
-                                            this.save_debug_scenario(window, cx);
-                                        }))
-                                        .key_binding(KeyBinding::for_action(&*secondary_action, cx))
-                                        .disabled(
-                                            self.debugger.is_none()
-                                                || self
-                                                    .configure_mode
-                                                    .read(cx)
-                                                    .program
-                                                    .read(cx)
-                                                    .is_empty(cx),
-                                        ),
-                                ),
-                            )
-                            .child(
-                                Button::new("debugger-spawn", "Start")
-                                    .on_click(cx.listener(|this, _, window, cx| {
-                                        this.start_new_session(window, cx)
-                                    }))
-                                    .disabled(
-                                        self.debugger.is_none()
-                                            || self
-                                                .configure_mode
-                                                .read(cx)
-                                                .program
-                                                .read(cx)
-                                                .is_empty(cx),
-                                    ),
-                            ),
-                    ),
-                    NewProcessMode::Attach => el.child({
-                        let disabled = self.debugger.is_none()
-                            || self
-                                .attach_mode
-                                .read(cx)
-                                .attach_picker
-                                .read(cx)
-                                .picker
-                                .read(cx)
-                                .delegate
-                                .match_count()
-                                == 0;
-                        let secondary_action = menu::SecondaryConfirm.boxed_clone();
-                        container
-                            .child(div().child({
-                                Button::new("edit-attach-task", "Edit in debug.json")
-                                    .key_binding(KeyBinding::for_action(&*secondary_action, cx))
-                                    .on_click(move |_, window, cx| {
-                                        window.dispatch_action(secondary_action.boxed_clone(), cx)
-                                    })
-                                    .disabled(disabled)
-                            }))
-                            .child(
-                                h_flex()
-                                    .child(div().child(self.adapter_drop_down_menu(window, cx))),
-                            )
-                    }),
-                    NewProcessMode::Debug => el,
-                    NewProcessMode::Task => el,
-                }
-            })
-    }
-}
-
-impl EventEmitter<DismissEvent> for NewProcessModal {}
-impl Focusable for NewProcessModal {
-    fn focus_handle(&self, cx: &ui::App) -> gpui::FocusHandle {
-        self.mode_focus_handle(cx)
-    }
-}
-
-impl ModalView for NewProcessModal {}
-
-impl RenderOnce for AttachMode {
-    fn render(self, _: &mut Window, cx: &mut App) -> impl IntoElement {
-        v_flex()
-            .w_full()
-            .track_focus(&self.attach_picker.focus_handle(cx))
-            .child(self.attach_picker)
-    }
-}
-
-#[derive(Clone)]
-pub(super) struct ConfigureMode {
-    program: Entity<InputField>,
-    cwd: Entity<InputField>,
-    stop_on_entry: ToggleState,
-    save_to_debug_json: ToggleState,
-}
-
-impl ConfigureMode {
-    pub(super) fn new(window: &mut Window, cx: &mut App) -> Entity<Self> {
-        let program = cx.new(|cx| {
-            InputField::new(window, cx, "ENV=Zed ~/bin/program --option")
-                .label("Program")
-                .tab_stop(true)
-                .tab_index(1)
-        });
-
-        let cwd = cx.new(|cx| {
-            InputField::new(window, cx, "Ex: $ZED_WORKTREE_ROOT")
-                .label("Working Directory")
-                .tab_stop(true)
-                .tab_index(2)
-        });
-
-        cx.new(|_| Self {
-            program,
-            cwd,
-            stop_on_entry: ToggleState::Unselected,
-            save_to_debug_json: ToggleState::Unselected,
-        })
-    }
-
-    fn load(&mut self, cwd: PathBuf, window: &mut Window, cx: &mut App) {
-        self.cwd.update(cx, |input_field, cx| {
-            if input_field.is_empty(cx) {
-                input_field.set_text(cwd.to_string_lossy(), window, cx);
-            }
-        });
-    }
-
-    pub(super) fn debug_request(&self, cx: &App) -> task::LaunchRequest {
-        let cwd_text = self.cwd.read(cx).text(cx);
-        let cwd = if cwd_text.is_empty() {
-            None
-        } else {
-            Some(PathBuf::from(cwd_text))
-        };
-
-        if cfg!(windows) {
-            return task::LaunchRequest {
-                program: self.program.read(cx).text(cx),
-                cwd,
-                args: Default::default(),
-                env: Default::default(),
-            };
-        }
-        let command = self.program.read(cx).text(cx);
-        let mut args = ShellKind::Posix
-            .split(&command)
-            .into_iter()
-            .flatten()
-            .peekable();
-        let mut env = FxHashMap::default();
-        while args.peek().is_some_and(|arg| arg.contains('=')) {
-            let arg = args.next().unwrap();
-            let (lhs, rhs) = arg.split_once('=').unwrap();
-            env.insert(lhs.to_string(), rhs.to_string());
-        }
-
-        let program = if let Some(program) = args.next() {
-            program
-        } else {
-            env = FxHashMap::default();
-            command
-        };
-
-        let args = args.collect::<Vec<_>>();
-
-        task::LaunchRequest {
-            program,
-            cwd,
-            args,
-            env,
-        }
-    }
-
-    fn on_tab(&mut self, _: &menu::SelectNext, window: &mut Window, _: &mut Context<Self>) {
-        window.focus_next();
-    }
-
-    fn on_tab_prev(
-        &mut self,
-        _: &menu::SelectPrevious,
-        window: &mut Window,
-        _: &mut Context<Self>,
-    ) {
-        window.focus_prev();
-    }
-
-    fn render(
-        &mut self,
-        adapter_menu: DropdownMenu,
-        _: &mut Window,
-        cx: &mut ui::Context<Self>,
-    ) -> impl IntoElement {
-        v_flex()
-            .tab_group()
-            .track_focus(&self.program.focus_handle(cx))
-            .on_action(cx.listener(Self::on_tab))
-            .on_action(cx.listener(Self::on_tab_prev))
-            .p_2()
-            .w_full()
-            .gap_3()
-            .child(
-                h_flex()
-                    .gap_1()
-                    .child(Label::new("Debugger:").color(Color::Muted))
-                    .child(adapter_menu),
-            )
-            .child(self.program.clone())
-            .child(self.cwd.clone())
-            .child(
-                Switch::new("debugger-stop-on-entry", self.stop_on_entry)
-                    .tab_index(3_isize)
-                    .label("Stop on Entry")
-                    .label_position(SwitchLabelPosition::Start)
-                    .label_size(LabelSize::Default)
-                    .on_click({
-                        let this = cx.weak_entity();
-                        move |state, _, cx| {
-                            this.update(cx, |this, _| {
-                                this.stop_on_entry = *state;
-                            })
-                            .ok();
-                        }
-                    }),
-            )
-    }
-}
-
-#[derive(Clone)]
-pub(super) struct AttachMode {
-    pub(super) definition: ZedDebugConfig,
-    pub(super) attach_picker: Entity<AttachModal>,
-}
-
-impl AttachMode {
-    pub(super) fn new(
-        debugger: Option<DebugAdapterName>,
-        workspace: WeakEntity<Workspace>,
-        project: Entity<Project>,
-        window: &mut Window,
-        cx: &mut Context<NewProcessModal>,
-    ) -> Entity<Self> {
-        let definition = ZedDebugConfig {
-            adapter: debugger.unwrap_or(DebugAdapterName("".into())).0,
-            label: "Attach New Session Setup".into(),
-            request: dap::DebugRequest::Attach(task::AttachRequest { process_id: None }),
-            stop_on_entry: Some(false),
-        };
-        let attach_picker = cx.new(|cx| {
-            let modal = AttachModal::new(
-                ModalIntent::AttachToProcess(definition.clone()),
-                workspace,
-                project,
-                false,
-                window,
-                cx,
-            );
-            window.focus(&modal.focus_handle(cx));
-
-            modal
-        });
-
-        cx.new(|_| Self {
-            definition,
-            attach_picker,
-        })
-    }
-    pub(super) fn debug_request(&self) -> task::AttachRequest {
-        task::AttachRequest { process_id: None }
-    }
-}
-
-#[derive(Clone)]
-pub(super) struct TaskMode {
-    pub(super) task_modal: Entity<TasksModal>,
-}
-
-pub(super) struct DebugDelegate {
-    task_store: Entity<TaskStore>,
-    candidates: Vec<(
-        Option<TaskSourceKind>,
-        Option<LanguageName>,
-        DebugScenario,
-        Option<DebugScenarioContext>,
-    )>,
-    selected_index: usize,
-    matches: Vec<StringMatch>,
-    prompt: String,
-    debug_panel: WeakEntity<DebugPanel>,
-    task_contexts: Option<Arc<TaskContexts>>,
-    divider_index: Option<usize>,
-    last_used_candidate_index: Option<usize>,
-}
-
-impl DebugDelegate {
-    pub(super) fn new(debug_panel: WeakEntity<DebugPanel>, task_store: Entity<TaskStore>) -> Self {
-        Self {
-            task_store,
-            candidates: Vec::default(),
-            selected_index: 0,
-            matches: Vec::new(),
-            prompt: String::new(),
-            debug_panel,
-            task_contexts: None,
-            divider_index: None,
-            last_used_candidate_index: None,
-        }
-    }
-
-    fn get_task_subtitle(
-        &self,
-        task_kind: &Option<TaskSourceKind>,
-        context: &Option<DebugScenarioContext>,
-        cx: &mut App,
-    ) -> Option<String> {
-        match task_kind {
-            Some(TaskSourceKind::Worktree {
-                id: worktree_id,
-                directory_in_worktree,
-                ..
-            }) => self
-                .debug_panel
-                .update(cx, |debug_panel, cx| {
-                    let project = debug_panel.project().read(cx);
-                    let worktrees: Vec<_> = project.visible_worktrees(cx).collect();
-
-                    let mut path = if worktrees.len() > 1
-                        && let Some(worktree) = project.worktree_for_id(*worktree_id, cx)
-                    {
-                        worktree
-                            .read(cx)
-                            .root_name()
-                            .join(directory_in_worktree)
-                            .to_rel_path_buf()
-                    } else {
-                        directory_in_worktree.to_rel_path_buf()
-                    };
-
-                    match path.components().next_back() {
-                        Some(".zed") => {
-                            path.push(RelPath::unix("debug.json").unwrap());
-                        }
-                        Some(".vscode") => {
-                            path.push(RelPath::unix("launch.json").unwrap());
-                        }
-                        _ => {}
-                    }
-                    path.display(project.path_style(cx)).to_string()
-                })
-                .ok(),
-            Some(TaskSourceKind::AbsPath { abs_path, .. }) => {
-                Some(abs_path.to_string_lossy().into_owned())
-            }
-            Some(TaskSourceKind::Lsp { language_name, .. }) => {
-                Some(format!("LSP: {language_name}"))
-            }
-            Some(TaskSourceKind::Language { name }) => Some(format!("Language: {name}")),
-            _ => context.clone().and_then(|ctx| {
-                ctx.task_context
-                    .task_variables
-                    .get(&VariableName::RelativeFile)
-                    .map(|f| format!("in {f}"))
-                    .or_else(|| {
-                        ctx.task_context
-                            .task_variables
-                            .get(&VariableName::Dirname)
-                            .map(|d| format!("in {d}/"))
-                    })
-            }),
-        }
-    }
-
-    fn get_scenario_language(
-        languages: &Arc<LanguageRegistry>,
-        dap_registry: &DapRegistry,
-        scenario: DebugScenario,
-    ) -> (Option<LanguageName>, DebugScenario) {
-        let language_names = languages.language_names();
-        let language_name = dap_registry.adapter_language(&scenario.adapter);
-
-        let language_name = language_name.or_else(|| {
-            scenario.label.split_whitespace().find_map(|word| {
-                language_names
-                    .iter()
-                    .find(|name| name.as_ref().eq_ignore_ascii_case(word))
-                    .cloned()
-            })
-        });
-
-        (language_name, scenario)
-    }
-
-    pub fn tasks_loaded(
-        &mut self,
-        task_contexts: Arc<TaskContexts>,
-        languages: Arc<LanguageRegistry>,
-        lsp_tasks: Vec<(TaskSourceKind, task::ResolvedTask)>,
-        current_resolved_tasks: Vec<(TaskSourceKind, task::ResolvedTask)>,
-        add_current_language_tasks: bool,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Task<()> {
-        self.task_contexts = Some(task_contexts.clone());
-        let task = self.task_store.update(cx, |task_store, cx| {
-            task_store.task_inventory().map(|inventory| {
-                inventory.update(cx, |inventory, cx| {
-                    inventory.list_debug_scenarios(
-                        &task_contexts,
-                        lsp_tasks,
-                        current_resolved_tasks,
-                        add_current_language_tasks,
-                        cx,
-                    )
-                })
-            })
-        });
-
-        let valid_adapters: HashSet<_> = cx.global::<DapRegistry>().enumerate_adapters();
-
-        cx.spawn(async move |this, cx| {
-            let (recent, scenarios) = if let Some(task) = task {
-                task.await
-            } else {
-                (Vec::new(), Vec::new())
-            };
-
-            this.update(cx, |this, cx| {
-                if !recent.is_empty() {
-                    this.delegate.last_used_candidate_index = Some(recent.len() - 1);
-                }
-
-                let dap_registry = cx.global::<DapRegistry>();
-                let hide_vscode = scenarios.iter().any(|(kind, _)| match kind {
-                    TaskSourceKind::Worktree {
-                        id: _,
-                        directory_in_worktree: dir,
-                        id_base: _,
-                    } => dir.ends_with(RelPath::unix(".zed").unwrap()),
-                    _ => false,
-                });
-
-                this.delegate.candidates = recent
-                    .into_iter()
-                    .map(|(scenario, context)| {
-                        let (language_name, scenario) =
-                            Self::get_scenario_language(&languages, dap_registry, scenario);
-                        (None, language_name, scenario, Some(context))
-                    })
-                    .chain(
-                        scenarios
-                            .into_iter()
-                            .filter(|(kind, _)| match kind {
-                                TaskSourceKind::Worktree {
-                                    id: _,
-                                    directory_in_worktree: dir,
-                                    id_base: _,
-                                } => {
-                                    !(hide_vscode
-                                        && dir.ends_with(RelPath::unix(".vscode").unwrap()))
-                                }
-                                _ => true,
-                            })
-                            .filter(|(_, scenario)| valid_adapters.contains(&scenario.adapter))
-                            .map(|(kind, scenario)| {
-                                let (language_name, scenario) =
-                                    Self::get_scenario_language(&languages, dap_registry, scenario);
-                                (Some(kind), language_name, scenario, None)
-                            }),
-                    )
-                    .collect();
-            })
-            .ok();
-        })
-    }
-}
-
-impl PickerDelegate for DebugDelegate {
-    type ListItem = ui::ListItem;
-
-    fn match_count(&self) -> usize {
-        self.matches.len()
-    }
-
-    fn selected_index(&self) -> usize {
-        self.selected_index
-    }
-
-    fn set_selected_index(
-        &mut self,
-        ix: usize,
-        _window: &mut Window,
-        _cx: &mut Context<picker::Picker<Self>>,
-    ) {
-        self.selected_index = ix;
-    }
-
-    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> std::sync::Arc<str> {
-        "Find a debug task, or debug a command".into()
-    }
-
-    fn update_matches(
-        &mut self,
-        query: String,
-        window: &mut Window,
-        cx: &mut Context<picker::Picker<Self>>,
-    ) -> gpui::Task<()> {
-        let candidates = self.candidates.clone();
-
-        cx.spawn_in(window, async move |picker, cx| {
-            let candidates: Vec<_> = candidates
-                .into_iter()
-                .enumerate()
-                .map(|(index, (_, _, candidate, _))| {
-                    StringMatchCandidate::new(index, candidate.label.as_ref())
-                })
-                .collect();
-
-            let matches = fuzzy::match_strings(
-                &candidates,
-                &query,
-                true,
-                true,
-                1000,
-                &Default::default(),
-                cx.background_executor().clone(),
-            )
-            .await;
-
-            picker
-                .update(cx, |picker, _| {
-                    let delegate = &mut picker.delegate;
-
-                    delegate.matches = matches;
-                    delegate.prompt = query;
-
-                    delegate.divider_index = delegate.last_used_candidate_index.and_then(|index| {
-                        let index = delegate
-                            .matches
-                            .partition_point(|matching_task| matching_task.candidate_id <= index);
-                        Some(index).and_then(|index| (index != 0).then(|| index - 1))
-                    });
-
-                    if delegate.matches.is_empty() {
-                        delegate.selected_index = 0;
-                    } else {
-                        delegate.selected_index =
-                            delegate.selected_index.min(delegate.matches.len() - 1);
-                    }
-                })
-                .log_err();
-        })
-    }
-
-    fn separators_after_indices(&self) -> Vec<usize> {
-        if let Some(i) = self.divider_index {
-            vec![i]
-        } else {
-            Vec::new()
-        }
-    }
-
-    fn confirm_input(&mut self, _: bool, window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        let text = self.prompt.clone();
-        let (task_context, worktree_id) = self
-            .task_contexts
-            .as_ref()
-            .and_then(|task_contexts| {
-                Some((
-                    task_contexts.active_context().cloned()?,
-                    task_contexts.worktree(),
-                ))
-            })
-            .unwrap_or_default();
-
-        let mut args = ShellKind::Posix
-            .split(&text)
-            .into_iter()
-            .flatten()
-            .peekable();
-        let mut env = HashMap::default();
-        while args.peek().is_some_and(|arg| arg.contains('=')) {
-            let arg = args.next().unwrap();
-            let (lhs, rhs) = arg.split_once('=').unwrap();
-            env.insert(lhs.to_string(), rhs.to_string());
-        }
-
-        let program = if let Some(program) = args.next() {
-            program
-        } else {
-            env = HashMap::default();
-            text
-        };
-
-        let args = args.collect::<Vec<_>>();
-        let task = task::TaskTemplate {
-            label: "one-off".to_owned(), // TODO: rename using command as label
-            env,
-            command: program,
-            args,
-            ..Default::default()
-        };
-
-        let Some(location) = self
-            .task_contexts
-            .as_ref()
-            .and_then(|cx| cx.location().cloned())
-        else {
-            return;
-        };
-        let file = location.buffer.read(cx).file();
-        let language = location.buffer.read(cx).language();
-        let language_name = language.as_ref().map(|l| l.name());
-        let Some(adapter): Option<DebugAdapterName> =
-            language::language_settings::language_settings(language_name, file, cx)
-                .debuggers
-                .first()
-                .map(SharedString::from)
-                .map(Into::into)
-                .or_else(|| {
-                    language.and_then(|l| {
-                        l.config()
-                            .debuggers
-                            .first()
-                            .map(SharedString::from)
-                            .map(Into::into)
-                    })
-                })
-        else {
-            return;
-        };
-        let locators = cx.global::<DapRegistry>().locators();
-        cx.spawn_in(window, async move |this, cx| {
-            let Some(debug_scenario) = cx
-                .background_spawn(async move {
-                    for locator in locators {
-                        if let Some(scenario) =
-                            // TODO: use a more informative label than "one-off"
-                            locator
-                                .1
-                                .create_scenario(&task, &task.label, &adapter)
-                                .await
-                        {
-                            return Some(scenario);
-                        }
-                    }
-                    None
-                })
-                .await
-            else {
-                return;
-            };
-
-            this.update_in(cx, |this, window, cx| {
-                send_telemetry(&debug_scenario, TelemetrySpawnLocation::ScenarioList, cx);
-                this.delegate
-                    .debug_panel
-                    .update(cx, |panel, cx| {
-                        panel.start_session(
-                            debug_scenario,
-                            task_context,
-                            None,
-                            worktree_id,
-                            window,
-                            cx,
-                        );
-                    })
-                    .ok();
-                cx.emit(DismissEvent);
-            })
-            .ok();
-        })
-        .detach();
-    }
-
-    fn confirm(
-        &mut self,
-        secondary: bool,
-        window: &mut Window,
-        cx: &mut Context<picker::Picker<Self>>,
-    ) {
-        let debug_scenario = self
-            .matches
-            .get(self.selected_index())
-            .and_then(|match_candidate| self.candidates.get(match_candidate.candidate_id).cloned());
-
-        let Some((kind, _, debug_scenario, context)) = debug_scenario else {
-            return;
-        };
-
-        let context = context.unwrap_or_else(|| {
-            self.task_contexts
-                .as_ref()
-                .and_then(|task_contexts| {
-                    Some(DebugScenarioContext {
-                        task_context: task_contexts.active_context().cloned()?,
-                        active_buffer: None,
-                        worktree_id: task_contexts.worktree(),
-                    })
-                })
-                .unwrap_or_default()
-        });
-        let DebugScenarioContext {
-            task_context,
-            active_buffer: _,
-            worktree_id,
-        } = context;
-
-        if secondary {
-            let Some(kind) = kind else { return };
-            let Some(id) = worktree_id else { return };
-            let debug_panel = self.debug_panel.clone();
-            cx.spawn_in(window, async move |_, cx| {
-                debug_panel
-                    .update_in(cx, |debug_panel, window, cx| {
-                        debug_panel.go_to_scenario_definition(kind, debug_scenario, id, window, cx)
-                    })?
-                    .await?;
-                anyhow::Ok(())
-            })
-            .detach();
-        } else {
-            send_telemetry(&debug_scenario, TelemetrySpawnLocation::ScenarioList, cx);
-            self.debug_panel
-                .update(cx, |panel, cx| {
-                    panel.start_session(
-                        debug_scenario,
-                        task_context,
-                        None,
-                        worktree_id,
-                        window,
-                        cx,
-                    );
-                })
-                .ok();
-        }
-
-        cx.emit(DismissEvent);
-    }
-
-    fn dismissed(&mut self, _: &mut Window, cx: &mut Context<picker::Picker<Self>>) {
-        cx.emit(DismissEvent);
-    }
-
-    fn render_footer(
-        &self,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<ui::AnyElement> {
-        let current_modifiers = window.modifiers();
-        let footer = h_flex()
-            .w_full()
-            .p_1p5()
-            .justify_between()
-            .border_t_1()
-            .border_color(cx.theme().colors().border_variant)
-            .child({
-                let action = menu::SecondaryConfirm.boxed_clone();
-                if self.matches.is_empty() {
-                    Button::new("edit-debug-json", "Edit debug.json").on_click(cx.listener(
-                        |_picker, _, window, cx| {
-                            window.dispatch_action(
-                                zed_actions::OpenProjectDebugTasks.boxed_clone(),
-                                cx,
-                            );
-                            cx.emit(DismissEvent);
-                        },
-                    ))
-                } else {
-                    Button::new("edit-debug-task", "Edit in debug.json")
-                        .key_binding(KeyBinding::for_action(&*action, cx))
-                        .on_click(move |_, window, cx| {
-                            window.dispatch_action(action.boxed_clone(), cx)
-                        })
-                }
-            })
-            .map(|this| {
-                if (current_modifiers.alt || self.matches.is_empty()) && !self.prompt.is_empty() {
-                    let action = picker::ConfirmInput { secondary: false }.boxed_clone();
-                    this.child({
-                        Button::new("launch-custom", "Launch Custom")
-                            .key_binding(KeyBinding::for_action(&*action, cx))
-                            .on_click(move |_, window, cx| {
-                                window.dispatch_action(action.boxed_clone(), cx)
-                            })
-                    })
-                } else {
-                    this.child({
-                        let is_recent_selected = self.divider_index >= Some(self.selected_index);
-                        let run_entry_label = if is_recent_selected { "Rerun" } else { "Spawn" };
-
-                        Button::new("spawn", run_entry_label)
-                            .key_binding(KeyBinding::for_action(&menu::Confirm, cx))
-                            .on_click(|_, window, cx| {
-                                window.dispatch_action(menu::Confirm.boxed_clone(), cx);
-                            })
-                    })
-                }
-            });
-        Some(footer.into_any_element())
-    }
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        window: &mut Window,
-        cx: &mut Context<picker::Picker<Self>>,
-    ) -> Option<Self::ListItem> {
-        let hit = &self.matches.get(ix)?;
-        let (task_kind, language_name, _scenario, context) = &self.candidates[hit.candidate_id];
-
-        let highlighted_location = HighlightedMatch {
-            text: hit.string.clone(),
-            highlight_positions: hit.positions.clone(),
-            color: Color::Default,
-        };
-
-        let subtitle = self.get_task_subtitle(task_kind, context, cx);
-
-        let language_icon = language_name.as_ref().and_then(|lang| {
-            file_icons::FileIcons::get(cx)
-                .get_icon_for_type(&lang.0.to_lowercase(), cx)
-                .map(Icon::from_path)
-        });
-
-        let (icon, indicator) = match task_kind {
-            Some(TaskSourceKind::UserInput) => (Some(Icon::new(IconName::Terminal)), None),
-            Some(TaskSourceKind::AbsPath { .. }) => (Some(Icon::new(IconName::Settings)), None),
-            Some(TaskSourceKind::Worktree { .. }) => (Some(Icon::new(IconName::FileTree)), None),
-            Some(TaskSourceKind::Lsp { language_name, .. }) => (
-                file_icons::FileIcons::get(cx)
-                    .get_icon_for_type(&language_name.to_lowercase(), cx)
-                    .map(Icon::from_path),
-                Some(Indicator::icon(
-                    Icon::new(IconName::BoltFilled)
-                        .color(Color::Muted)
-                        .size(IconSize::Small),
-                )),
-            ),
-            Some(TaskSourceKind::Language { name }) => (
-                file_icons::FileIcons::get(cx)
-                    .get_icon_for_type(&name.to_lowercase(), cx)
-                    .map(Icon::from_path),
-                None,
-            ),
-            None => (Some(Icon::new(IconName::HistoryRerun)), None),
-        };
-
-        let icon = language_icon.or(icon).map(|icon| {
-            IconWithIndicator::new(icon.color(Color::Muted).size(IconSize::Small), indicator)
-                .indicator_border_color(Some(cx.theme().colors().border_transparent))
-        });
-
-        Some(
-            ListItem::new(format!("debug-scenario-selection-{ix}"))
-                .inset(true)
-                .start_slot::<IconWithIndicator>(icon)
-                .spacing(ListItemSpacing::Sparse)
-                .toggle_state(selected)
-                .child(
-                    v_flex()
-                        .items_start()
-                        .child(highlighted_location.render(window, cx))
-                        .when_some(subtitle, |this, subtitle_text| {
-                            this.child(
-                                Label::new(subtitle_text)
-                                    .size(LabelSize::Small)
-                                    .color(Color::Muted),
-                            )
-                        }),
-                ),
-        )
-    }
-}
-
-pub(crate) fn resolve_path(path: &mut String) {
-    if path.starts_with('~') {
-        let home = paths::home_dir().to_string_lossy().into_owned();
-        let trimmed_path = path.trim().to_owned();
-        *path = trimmed_path.replacen('~', &home, 1);
-    } else if let Some(strip_path) = path.strip_prefix(&format!(".{}", std::path::MAIN_SEPARATOR)) {
-        *path = format!(
-            "$ZED_WORKTREE_ROOT{}{}",
-            std::path::MAIN_SEPARATOR,
-            &strip_path
-        );
-    };
-}
-
-#[cfg(test)]
-impl NewProcessModal {
-    pub(crate) fn set_configure(
-        &mut self,
-        program: impl AsRef<str>,
-        cwd: impl AsRef<str>,
-        stop_on_entry: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.mode = NewProcessMode::Launch;
-        self.debugger = Some(dap::adapters::DebugAdapterName("fake-adapter".into()));
-
-        self.configure_mode.update(cx, |configure, cx| {
-            configure.program.update(cx, |editor, cx| {
-                editor.clear(window, cx);
-                editor.set_text(program.as_ref(), window, cx);
-            });
-
-            configure.cwd.update(cx, |editor, cx| {
-                editor.clear(window, cx);
-                editor.set_text(cwd.as_ref(), window, cx);
-            });
-
-            configure.stop_on_entry = match stop_on_entry {
-                true => ToggleState::Selected,
-                _ => ToggleState::Unselected,
-            }
-        })
-    }
-
-    pub(crate) fn debug_picker_candidate_subtitles(&self, cx: &mut App) -> Vec<String> {
-        self.debug_picker.update(cx, |picker, cx| {
-            picker
-                .delegate
-                .candidates
-                .iter()
-                .filter_map(|(task_kind, _, _, context)| {
-                    picker.delegate.get_task_subtitle(task_kind, context, cx)
-                })
-                .collect()
-        })
-    }
-}
diff --git a/crates/debugger_ui/src/onboarding_modal.rs b/crates/debugger_ui/src/onboarding_modal.rs
deleted file mode 100644
index 1820520998..0000000000
--- a/crates/debugger_ui/src/onboarding_modal.rs
+++ /dev/null
@@ -1,166 +0,0 @@
-use gpui::{
-    ClickEvent, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, MouseDownEvent, Render,
-};
-use ui::{TintColor, Vector, VectorName, prelude::*};
-use workspace::{ModalView, Workspace};
-
-use crate::DebugPanel;
-
-macro_rules! debugger_onboarding_event {
-    ($name:expr) => {
-        telemetry::event!($name, source = "Debugger Onboarding");
-    };
-    ($name:expr, $($key:ident $(= $value:expr)?),+ $(,)?) => {
-        telemetry::event!($name, source = "Debugger Onboarding", $($key $(= $value)?),+);
-    };
-}
-
-pub struct DebuggerOnboardingModal {
-    focus_handle: FocusHandle,
-    workspace: Entity<Workspace>,
-}
-
-impl DebuggerOnboardingModal {
-    pub fn toggle(workspace: &mut Workspace, window: &mut Window, cx: &mut Context<Workspace>) {
-        let workspace_entity = cx.entity();
-        workspace.toggle_modal(window, cx, |_window, cx| Self {
-            workspace: workspace_entity,
-            focus_handle: cx.focus_handle(),
-        });
-    }
-
-    fn open_panel(&mut self, _: &ClickEvent, window: &mut Window, cx: &mut Context<Self>) {
-        self.workspace.update(cx, |workspace, cx| {
-            workspace.focus_panel::<DebugPanel>(window, cx);
-        });
-
-        cx.emit(DismissEvent);
-
-        debugger_onboarding_event!("Open Panel Clicked");
-    }
-
-    fn view_blog(&mut self, _: &ClickEvent, _: &mut Window, cx: &mut Context<Self>) {
-        cx.open_url("https://zed.dev/blog/debugger");
-        cx.notify();
-
-        debugger_onboarding_event!("Blog Link Clicked");
-    }
-
-    fn cancel(&mut self, _: &menu::Cancel, _: &mut Window, cx: &mut Context<Self>) {
-        cx.emit(DismissEvent);
-    }
-}
-
-impl EventEmitter<DismissEvent> for DebuggerOnboardingModal {}
-
-impl Focusable for DebuggerOnboardingModal {
-    fn focus_handle(&self, _cx: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl ModalView for DebuggerOnboardingModal {}
-
-impl Render for DebuggerOnboardingModal {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let window_height = window.viewport_size().height;
-        let max_height = window_height - px(200.);
-
-        let base = v_flex()
-            .id("debugger-onboarding")
-            .key_context("DebuggerOnboardingModal")
-            .relative()
-            .w(px(450.))
-            .h_full()
-            .max_h(max_height)
-            .p_4()
-            .gap_2()
-            .elevation_3(cx)
-            .track_focus(&self.focus_handle(cx))
-            .overflow_hidden()
-            .on_action(cx.listener(Self::cancel))
-            .on_action(cx.listener(|_, _: &menu::Cancel, _window, cx| {
-                debugger_onboarding_event!("Canceled", trigger = "Action");
-                cx.emit(DismissEvent);
-            }))
-            .on_any_mouse_down(cx.listener(|this, _: &MouseDownEvent, window, _cx| {
-                this.focus_handle.focus(window);
-            }))
-            .child(
-                div()
-                    .absolute()
-                    .top(px(-8.0))
-                    .right_0()
-                    .w(px(400.))
-                    .h(px(92.))
-                    .child(
-                        Vector::new(
-                            VectorName::DebuggerGrid,
-                            rems_from_px(400.),
-                            rems_from_px(92.),
-                        )
-                        .color(ui::Color::Custom(cx.theme().colors().text.alpha(0.32))),
-                    ),
-            )
-            .child(
-                div()
-                    .absolute()
-                    .inset_0()
-                    .size_full()
-                    .bg(gpui::linear_gradient(
-                        175.,
-                        gpui::linear_color_stop(
-                            cx.theme().colors().elevated_surface_background,
-                            0.,
-                        ),
-                        gpui::linear_color_stop(
-                            cx.theme().colors().elevated_surface_background.opacity(0.),
-                            0.8,
-                        ),
-                    )),
-            )
-            .child(
-                v_flex()
-                    .w_full()
-                    .gap_1()
-                    .child(
-                        Label::new("Introducing")
-                            .size(LabelSize::Small)
-                            .color(Color::Muted),
-                    )
-                    .child(Headline::new("Zed's Debugger").size(HeadlineSize::Large)),
-            )
-            .child(h_flex().absolute().top_2().right_2().child(
-                IconButton::new("cancel", IconName::Close).on_click(cx.listener(
-                    |_, _: &ClickEvent, _window, cx| {
-                        debugger_onboarding_event!("Cancelled", trigger = "X click");
-                        cx.emit(DismissEvent);
-                    },
-                )),
-            ));
-
-        let open_panel_button = Button::new("open-panel", "Get Started with the Debugger")
-            .icon_size(IconSize::Indicator)
-            .style(ButtonStyle::Tinted(TintColor::Accent))
-            .full_width()
-            .on_click(cx.listener(Self::open_panel));
-
-        let blog_post_button = Button::new("view-blog", "Check out the Blog Post")
-            .icon(IconName::ArrowUpRight)
-            .icon_size(IconSize::Indicator)
-            .icon_color(Color::Muted)
-            .full_width()
-            .on_click(cx.listener(Self::view_blog));
-
-        let copy = "It's finally here: Native support for debugging across multiple programming languages.";
-
-        base.child(Label::new(copy).color(Color::Muted)).child(
-            v_flex()
-                .w_full()
-                .mt_2()
-                .gap_2()
-                .child(open_panel_button)
-                .child(blog_post_button),
-        )
-    }
-}
diff --git a/crates/debugger_ui/src/persistence.rs b/crates/debugger_ui/src/persistence.rs
deleted file mode 100644
index ab68fea115..0000000000
--- a/crates/debugger_ui/src/persistence.rs
+++ /dev/null
@@ -1,359 +0,0 @@
-use anyhow::Context as _;
-use collections::HashMap;
-use dap::{Capabilities, adapters::DebugAdapterName};
-use db::kvp::KEY_VALUE_STORE;
-use gpui::{Axis, Context, Entity, EntityId, Focusable, Subscription, WeakEntity, Window};
-use project::Project;
-use serde::{Deserialize, Serialize};
-use ui::{App, SharedString};
-use util::ResultExt;
-use workspace::{Member, Pane, PaneAxis, Workspace};
-
-use crate::session::running::{
-    self, DebugTerminal, RunningState, SubView, breakpoint_list::BreakpointList, console::Console,
-    loaded_source_list::LoadedSourceList, memory_view::MemoryView, module_list::ModuleList,
-    stack_frame_list::StackFrameList, variable_list::VariableList,
-};
-
-#[derive(Clone, Hash, Copy, Debug, Serialize, Deserialize, PartialEq, Eq)]
-pub(crate) enum DebuggerPaneItem {
-    Console,
-    Variables,
-    BreakpointList,
-    Frames,
-    Modules,
-    LoadedSources,
-    Terminal,
-    MemoryView,
-}
-
-impl DebuggerPaneItem {
-    pub(crate) fn all() -> &'static [DebuggerPaneItem] {
-        static VARIANTS: &[DebuggerPaneItem] = &[
-            DebuggerPaneItem::Console,
-            DebuggerPaneItem::Variables,
-            DebuggerPaneItem::BreakpointList,
-            DebuggerPaneItem::Frames,
-            DebuggerPaneItem::Modules,
-            DebuggerPaneItem::LoadedSources,
-            DebuggerPaneItem::Terminal,
-            DebuggerPaneItem::MemoryView,
-        ];
-        VARIANTS
-    }
-
-    pub(crate) fn is_supported(&self, capabilities: &Capabilities) -> bool {
-        match self {
-            DebuggerPaneItem::Modules => capabilities.supports_modules_request.unwrap_or_default(),
-            DebuggerPaneItem::MemoryView => capabilities
-                .supports_read_memory_request
-                .unwrap_or_default(),
-            DebuggerPaneItem::LoadedSources => capabilities
-                .supports_loaded_sources_request
-                .unwrap_or_default(),
-            _ => true,
-        }
-    }
-
-    pub(crate) fn to_shared_string(self) -> SharedString {
-        match self {
-            DebuggerPaneItem::Console => SharedString::new_static("Console"),
-            DebuggerPaneItem::Variables => SharedString::new_static("Variables"),
-            DebuggerPaneItem::BreakpointList => SharedString::new_static("Breakpoints"),
-            DebuggerPaneItem::Frames => SharedString::new_static("Frames"),
-            DebuggerPaneItem::Modules => SharedString::new_static("Modules"),
-            DebuggerPaneItem::LoadedSources => SharedString::new_static("Sources"),
-            DebuggerPaneItem::Terminal => SharedString::new_static("Terminal"),
-            DebuggerPaneItem::MemoryView => SharedString::new_static("Memory View"),
-        }
-    }
-    pub(crate) fn tab_tooltip(self) -> SharedString {
-        let tooltip = match self {
-            DebuggerPaneItem::Console => {
-                "Displays program output and allows manual input of debugger commands."
-            }
-            DebuggerPaneItem::Variables => {
-                "Shows current values of local and global variables in the current stack frame."
-            }
-            DebuggerPaneItem::BreakpointList => "Lists all active breakpoints set in the code.",
-            DebuggerPaneItem::Frames => {
-                "Displays the call stack, letting you navigate between function calls."
-            }
-            DebuggerPaneItem::Modules => "Shows all modules or libraries loaded by the program.",
-            DebuggerPaneItem::LoadedSources => {
-                "Lists all source files currently loaded and used by the debugger."
-            }
-            DebuggerPaneItem::Terminal => {
-                "Provides an interactive terminal session within the debugging environment."
-            }
-            DebuggerPaneItem::MemoryView => "Allows inspection of memory contents.",
-        };
-        SharedString::new_static(tooltip)
-    }
-}
-
-impl From<DebuggerPaneItem> for SharedString {
-    fn from(item: DebuggerPaneItem) -> Self {
-        item.to_shared_string()
-    }
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub(crate) struct SerializedLayout {
-    pub(crate) panes: SerializedPaneLayout,
-    pub(crate) dock_axis: Axis,
-}
-
-#[derive(Debug, Serialize, Deserialize, Clone)]
-pub(crate) enum SerializedPaneLayout {
-    Pane(SerializedPane),
-    Group {
-        axis: Axis,
-        flexes: Option<Vec<f32>>,
-        children: Vec<SerializedPaneLayout>,
-    },
-}
-
-#[derive(Debug, Serialize, Deserialize, Clone)]
-pub(crate) struct SerializedPane {
-    pub children: Vec<DebuggerPaneItem>,
-    pub active_item: Option<DebuggerPaneItem>,
-}
-
-const DEBUGGER_PANEL_PREFIX: &str = "debugger_panel_";
-
-pub(crate) async fn serialize_pane_layout(
-    adapter_name: DebugAdapterName,
-    pane_group: SerializedLayout,
-) -> anyhow::Result<()> {
-    let serialized_pane_group = serde_json::to_string(&pane_group)
-        .context("Serializing pane group with serde_json as a string")?;
-    KEY_VALUE_STORE
-        .write_kvp(
-            format!("{DEBUGGER_PANEL_PREFIX}-{adapter_name}"),
-            serialized_pane_group,
-        )
-        .await
-}
-
-pub(crate) fn build_serialized_layout(
-    pane_group: &Member,
-    dock_axis: Axis,
-    cx: &App,
-) -> SerializedLayout {
-    SerializedLayout {
-        dock_axis,
-        panes: build_serialized_pane_layout(pane_group, cx),
-    }
-}
-
-pub(crate) fn build_serialized_pane_layout(pane_group: &Member, cx: &App) -> SerializedPaneLayout {
-    match pane_group {
-        Member::Axis(PaneAxis {
-            axis,
-            members,
-            flexes,
-            bounding_boxes: _,
-        }) => SerializedPaneLayout::Group {
-            axis: *axis,
-            children: members
-                .iter()
-                .map(|member| build_serialized_pane_layout(member, cx))
-                .collect::<Vec<_>>(),
-            flexes: Some(flexes.lock().clone()),
-        },
-        Member::Pane(pane_handle) => SerializedPaneLayout::Pane(serialize_pane(pane_handle, cx)),
-    }
-}
-
-fn serialize_pane(pane: &Entity<Pane>, cx: &App) -> SerializedPane {
-    let pane = pane.read(cx);
-    let children = pane
-        .items()
-        .filter_map(|item| {
-            item.act_as::<SubView>(cx)
-                .map(|view| view.read(cx).view_kind())
-        })
-        .collect::<Vec<_>>();
-
-    let active_item = pane
-        .active_item()
-        .and_then(|item| item.act_as::<SubView>(cx))
-        .map(|view| view.read(cx).view_kind());
-
-    SerializedPane {
-        children,
-        active_item,
-    }
-}
-
-pub(crate) async fn get_serialized_layout(
-    adapter_name: impl AsRef<str>,
-) -> Option<SerializedLayout> {
-    let key = format!("{DEBUGGER_PANEL_PREFIX}-{}", adapter_name.as_ref());
-
-    KEY_VALUE_STORE
-        .read_kvp(&key)
-        .log_err()
-        .flatten()
-        .and_then(|value| serde_json::from_str::<SerializedLayout>(&value).ok())
-}
-
-pub(crate) fn deserialize_pane_layout(
-    serialized: SerializedPaneLayout,
-    should_invert: bool,
-    workspace: &WeakEntity<Workspace>,
-    project: &Entity<Project>,
-    stack_frame_list: &Entity<StackFrameList>,
-    variable_list: &Entity<VariableList>,
-    module_list: &Entity<ModuleList>,
-    console: &Entity<Console>,
-    breakpoint_list: &Entity<BreakpointList>,
-    loaded_sources: &Entity<LoadedSourceList>,
-    terminal: &Entity<DebugTerminal>,
-    memory_view: &Entity<MemoryView>,
-    subscriptions: &mut HashMap<EntityId, Subscription>,
-    window: &mut Window,
-    cx: &mut Context<RunningState>,
-) -> Option<Member> {
-    match serialized {
-        SerializedPaneLayout::Group {
-            axis,
-            flexes,
-            children,
-        } => {
-            let mut members = Vec::new();
-            for child in children {
-                if let Some(new_member) = deserialize_pane_layout(
-                    child,
-                    should_invert,
-                    workspace,
-                    project,
-                    stack_frame_list,
-                    variable_list,
-                    module_list,
-                    console,
-                    breakpoint_list,
-                    loaded_sources,
-                    terminal,
-                    memory_view,
-                    subscriptions,
-                    window,
-                    cx,
-                ) {
-                    members.push(new_member);
-                }
-            }
-
-            if members.is_empty() {
-                return None;
-            }
-
-            if members.len() == 1 {
-                return Some(members.remove(0));
-            }
-
-            Some(Member::Axis(PaneAxis::load(
-                if should_invert { axis.invert() } else { axis },
-                members,
-                flexes,
-            )))
-        }
-        SerializedPaneLayout::Pane(serialized_pane) => {
-            let pane = running::new_debugger_pane(workspace.clone(), project.clone(), window, cx);
-            subscriptions.insert(
-                pane.entity_id(),
-                cx.subscribe_in(&pane, window, RunningState::handle_pane_event),
-            );
-
-            let sub_views: Vec<_> = serialized_pane
-                .children
-                .iter()
-                .map(|child| match child {
-                    DebuggerPaneItem::Frames => {
-                        Box::new(SubView::stack_frame_list(stack_frame_list.clone(), cx))
-                    }
-                    DebuggerPaneItem::Variables => Box::new(SubView::new(
-                        variable_list.focus_handle(cx),
-                        variable_list.clone().into(),
-                        DebuggerPaneItem::Variables,
-                        cx,
-                    )),
-                    DebuggerPaneItem::BreakpointList => {
-                        Box::new(SubView::breakpoint_list(breakpoint_list.clone(), cx))
-                    }
-                    DebuggerPaneItem::Modules => Box::new(SubView::new(
-                        module_list.focus_handle(cx),
-                        module_list.clone().into(),
-                        DebuggerPaneItem::Modules,
-                        cx,
-                    )),
-                    DebuggerPaneItem::LoadedSources => Box::new(SubView::new(
-                        loaded_sources.focus_handle(cx),
-                        loaded_sources.clone().into(),
-                        DebuggerPaneItem::LoadedSources,
-                        cx,
-                    )),
-                    DebuggerPaneItem::Console => {
-                        let view = SubView::console(console.clone(), cx);
-                        Box::new(view)
-                    }
-                    DebuggerPaneItem::Terminal => Box::new(SubView::new(
-                        terminal.focus_handle(cx),
-                        terminal.clone().into(),
-                        DebuggerPaneItem::Terminal,
-                        cx,
-                    )),
-                    DebuggerPaneItem::MemoryView => Box::new(SubView::new(
-                        memory_view.focus_handle(cx),
-                        memory_view.clone().into(),
-                        DebuggerPaneItem::MemoryView,
-                        cx,
-                    )),
-                })
-                .collect();
-
-            pane.update(cx, |pane, cx| {
-                let mut active_idx = 0;
-                for (idx, sub_view) in sub_views.into_iter().enumerate() {
-                    if serialized_pane
-                        .active_item
-                        .is_some_and(|active| active == sub_view.read(cx).view_kind())
-                    {
-                        active_idx = idx;
-                    }
-                    pane.add_item(sub_view, false, false, None, window, cx);
-                }
-
-                pane.activate_item(active_idx, false, false, window, cx);
-            });
-
-            Some(Member::Pane(pane.clone()))
-        }
-    }
-}
-
-#[cfg(test)]
-impl SerializedPaneLayout {
-    pub(crate) fn in_order(&self) -> Vec<SerializedPaneLayout> {
-        let mut panes = vec![];
-
-        Self::inner_in_order(self, &mut panes);
-        panes
-    }
-
-    fn inner_in_order(&self, panes: &mut Vec<SerializedPaneLayout>) {
-        match self {
-            SerializedPaneLayout::Pane(_) => panes.push((*self).clone()),
-            SerializedPaneLayout::Group {
-                axis: _,
-                flexes: _,
-                children,
-            } => {
-                for child in children {
-                    child.inner_in_order(panes);
-                }
-            }
-        }
-    }
-}
diff --git a/crates/debugger_ui/src/session.rs b/crates/debugger_ui/src/session.rs
deleted file mode 100644
index 40c9bd810f..0000000000
--- a/crates/debugger_ui/src/session.rs
+++ /dev/null
@@ -1,210 +0,0 @@
-pub mod running;
-
-use crate::{StackTraceView, persistence::SerializedLayout, session::running::DebugTerminal};
-use dap::client::SessionId;
-use gpui::{App, Axis, Entity, EventEmitter, FocusHandle, Focusable, Task, WeakEntity};
-use project::debugger::session::Session;
-use project::worktree_store::WorktreeStore;
-use project::{Project, debugger::session::SessionQuirks};
-use rpc::proto;
-use running::RunningState;
-use std::cell::OnceCell;
-use ui::prelude::*;
-use workspace::{
-    CollaboratorId, FollowableItem, ViewId, Workspace,
-    item::{self, Item},
-};
-
-pub struct DebugSession {
-    remote_id: Option<workspace::ViewId>,
-    pub(crate) running_state: Entity<RunningState>,
-    pub(crate) quirks: SessionQuirks,
-    stack_trace_view: OnceCell<Entity<StackTraceView>>,
-    _worktree_store: WeakEntity<WorktreeStore>,
-    workspace: WeakEntity<Workspace>,
-}
-
-impl DebugSession {
-    pub(crate) fn running(
-        project: Entity<Project>,
-        workspace: WeakEntity<Workspace>,
-        parent_terminal: Option<Entity<DebugTerminal>>,
-        session: Entity<Session>,
-        serialized_layout: Option<SerializedLayout>,
-        dock_axis: Axis,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Entity<Self> {
-        let running_state = cx.new(|cx| {
-            RunningState::new(
-                session.clone(),
-                project.clone(),
-                workspace.clone(),
-                parent_terminal,
-                serialized_layout,
-                dock_axis,
-                window,
-                cx,
-            )
-        });
-        let quirks = session.read(cx).quirks();
-
-        cx.new(|cx| Self {
-            remote_id: None,
-            running_state,
-            quirks,
-            stack_trace_view: OnceCell::new(),
-            _worktree_store: project.read(cx).worktree_store().downgrade(),
-            workspace,
-        })
-    }
-
-    pub(crate) fn session_id(&self, cx: &App) -> SessionId {
-        self.running_state.read(cx).session_id()
-    }
-
-    pub(crate) fn stack_trace_view(
-        &mut self,
-        project: &Entity<Project>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> &Entity<StackTraceView> {
-        let workspace = self.workspace.clone();
-        let running_state = self.running_state.clone();
-
-        self.stack_trace_view.get_or_init(|| {
-            let stackframe_list = running_state.read(cx).stack_frame_list().clone();
-
-            cx.new(|cx| {
-                StackTraceView::new(
-                    workspace.clone(),
-                    project.clone(),
-                    stackframe_list,
-                    window,
-                    cx,
-                )
-            })
-        })
-    }
-
-    pub fn session(&self, cx: &App) -> Entity<Session> {
-        self.running_state.read(cx).session().clone()
-    }
-
-    pub(crate) fn shutdown(&mut self, cx: &mut Context<Self>) {
-        self.running_state
-            .update(cx, |state, cx| state.shutdown(cx));
-    }
-
-    pub(crate) fn label(&self, cx: &mut App) -> Option<SharedString> {
-        let session = self.running_state.read(cx).session().clone();
-        session.update(cx, |session, cx| {
-            let session_label = session.label();
-            let quirks = session.quirks();
-            let mut single_thread_name = || {
-                let threads = session.threads(cx);
-                match threads.as_slice() {
-                    [(thread, _)] => Some(SharedString::from(&thread.name)),
-                    _ => None,
-                }
-            };
-            if quirks.prefer_thread_name {
-                single_thread_name().or(session_label)
-            } else {
-                session_label.or_else(single_thread_name)
-            }
-        })
-    }
-
-    pub fn running_state(&self) -> &Entity<RunningState> {
-        &self.running_state
-    }
-}
-
-impl EventEmitter<()> for DebugSession {}
-
-impl Focusable for DebugSession {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        self.running_state.focus_handle(cx)
-    }
-}
-
-impl Item for DebugSession {
-    type Event = ();
-    fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString {
-        "Debugger".into()
-    }
-}
-
-impl FollowableItem for DebugSession {
-    fn remote_id(&self) -> Option<workspace::ViewId> {
-        self.remote_id
-    }
-
-    fn to_state_proto(&self, _window: &Window, _cx: &App) -> Option<proto::view::Variant> {
-        None
-    }
-
-    fn from_state_proto(
-        _workspace: Entity<Workspace>,
-        _remote_id: ViewId,
-        _state: &mut Option<proto::view::Variant>,
-        _window: &mut Window,
-        _cx: &mut App,
-    ) -> Option<gpui::Task<anyhow::Result<Entity<Self>>>> {
-        None
-    }
-
-    fn add_event_to_update_proto(
-        &self,
-        _event: &Self::Event,
-        _update: &mut Option<proto::update_view::Variant>,
-        _window: &Window,
-        _cx: &App,
-    ) -> bool {
-        // update.get_or_insert_with(|| proto::update_view::Variant::DebugPanel(Default::default()));
-
-        true
-    }
-
-    fn apply_update_proto(
-        &mut self,
-        _project: &Entity<project::Project>,
-        _message: proto::update_view::Variant,
-        _window: &mut Window,
-        _cx: &mut Context<Self>,
-    ) -> gpui::Task<anyhow::Result<()>> {
-        Task::ready(Ok(()))
-    }
-
-    fn set_leader_id(
-        &mut self,
-        _leader_id: Option<CollaboratorId>,
-        _window: &mut Window,
-        _cx: &mut Context<Self>,
-    ) {
-    }
-
-    fn to_follow_event(_event: &Self::Event) -> Option<workspace::item::FollowEvent> {
-        None
-    }
-
-    fn dedup(&self, existing: &Self, _window: &Window, cx: &App) -> Option<workspace::item::Dedup> {
-        if existing.session_id(cx) == self.session_id(cx) {
-            Some(item::Dedup::KeepExisting)
-        } else {
-            None
-        }
-    }
-
-    fn is_project_item(&self, _window: &Window, _cx: &App) -> bool {
-        true
-    }
-}
-
-impl Render for DebugSession {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        self.running_state
-            .update(cx, |this, cx| this.render(window, cx).into_any_element())
-    }
-}
diff --git a/crates/debugger_ui/src/session/running.rs b/crates/debugger_ui/src/session/running.rs
deleted file mode 100644
index 66e9dd7b43..0000000000
--- a/crates/debugger_ui/src/session/running.rs
+++ /dev/null
@@ -1,1902 +0,0 @@
-pub(crate) mod breakpoint_list;
-pub(crate) mod console;
-pub(crate) mod loaded_source_list;
-pub(crate) mod memory_view;
-pub(crate) mod module_list;
-pub mod stack_frame_list;
-pub mod variable_list;
-use std::{
-    any::Any,
-    ops::ControlFlow,
-    path::PathBuf,
-    sync::{Arc, LazyLock},
-    time::Duration,
-};
-
-use crate::{
-    ToggleExpandItem,
-    attach_modal::{AttachModal, ModalIntent},
-    new_process_modal::resolve_path,
-    persistence::{self, DebuggerPaneItem, SerializedLayout},
-    session::running::memory_view::MemoryView,
-};
-
-use anyhow::{Context as _, Result, anyhow, bail};
-use breakpoint_list::BreakpointList;
-use collections::{HashMap, IndexMap};
-use console::Console;
-use dap::{
-    Capabilities, DapRegistry, RunInTerminalRequestArguments, Thread,
-    adapters::{DebugAdapterName, DebugTaskDefinition},
-    client::SessionId,
-    debugger_settings::DebuggerSettings,
-};
-use futures::{SinkExt, channel::mpsc};
-use gpui::{
-    Action as _, AnyView, AppContext, Axis, Entity, EntityId, EventEmitter, FocusHandle, Focusable,
-    NoAction, Pixels, Point, Subscription, Task, WeakEntity,
-};
-use language::Buffer;
-use loaded_source_list::LoadedSourceList;
-use module_list::ModuleList;
-use project::{
-    DebugScenarioContext, Project, WorktreeId,
-    debugger::session::{self, Session, SessionEvent, SessionStateEvent, ThreadId, ThreadStatus},
-};
-use rpc::proto::ViewId;
-use serde_json::Value;
-use settings::Settings;
-use stack_frame_list::StackFrameList;
-use task::{
-    BuildTaskDefinition, DebugScenario, Shell, ShellBuilder, SpawnInTerminal, TaskContext,
-    ZedDebugConfig, substitute_variables_in_str,
-};
-use terminal_view::TerminalView;
-use ui::{
-    FluentBuilder, IntoElement, Render, StatefulInteractiveElement, Tab, Tooltip, VisibleOnHover,
-    VisualContext, prelude::*,
-};
-use util::ResultExt;
-use variable_list::VariableList;
-use workspace::{
-    ActivePaneDecorator, DraggedTab, Item, ItemHandle, Member, Pane, PaneGroup, SplitDirection,
-    Workspace, item::TabContentParams, move_item, pane::Event,
-};
-
-static PROCESS_ID_PLACEHOLDER: LazyLock<String> =
-    LazyLock::new(|| task::VariableName::PickProcessId.template_value());
-
-pub struct RunningState {
-    session: Entity<Session>,
-    thread_id: Option<ThreadId>,
-    focus_handle: FocusHandle,
-    _remote_id: Option<ViewId>,
-    workspace: WeakEntity<Workspace>,
-    session_id: SessionId,
-    variable_list: Entity<variable_list::VariableList>,
-    _subscriptions: Vec<Subscription>,
-    stack_frame_list: Entity<stack_frame_list::StackFrameList>,
-    loaded_sources_list: Entity<LoadedSourceList>,
-    pub debug_terminal: Entity<DebugTerminal>,
-    module_list: Entity<module_list::ModuleList>,
-    console: Entity<Console>,
-    breakpoint_list: Entity<BreakpointList>,
-    panes: PaneGroup,
-    active_pane: Entity<Pane>,
-    pane_close_subscriptions: HashMap<EntityId, Subscription>,
-    dock_axis: Axis,
-    _schedule_serialize: Option<Task<()>>,
-    pub(crate) scenario: Option<DebugScenario>,
-    pub(crate) scenario_context: Option<DebugScenarioContext>,
-    memory_view: Entity<MemoryView>,
-}
-
-impl RunningState {
-    pub(crate) fn thread_id(&self) -> Option<ThreadId> {
-        self.thread_id
-    }
-
-    pub(crate) fn active_pane(&self) -> &Entity<Pane> {
-        &self.active_pane
-    }
-}
-
-impl Render for RunningState {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let zoomed_pane = self
-            .panes
-            .panes()
-            .into_iter()
-            .find(|pane| pane.read(cx).is_zoomed());
-
-        let active = self.panes.panes().into_iter().next();
-        let pane = if let Some(zoomed_pane) = zoomed_pane {
-            zoomed_pane.update(cx, |pane, cx| pane.render(window, cx).into_any_element())
-        } else if let Some(active) = active {
-            self.panes
-                .render(
-                    None,
-                    &ActivePaneDecorator::new(active, &self.workspace),
-                    window,
-                    cx,
-                )
-                .into_any_element()
-        } else {
-            div().into_any_element()
-        };
-        let thread_status = self
-            .thread_id
-            .map(|thread_id| self.session.read(cx).thread_status(thread_id))
-            .unwrap_or(ThreadStatus::Exited);
-
-        self.variable_list.update(cx, |this, cx| {
-            this.disabled(thread_status != ThreadStatus::Stopped, cx);
-        });
-        v_flex()
-            .size_full()
-            .key_context("DebugSessionItem")
-            .track_focus(&self.focus_handle(cx))
-            .child(h_flex().flex_1().child(pane))
-    }
-}
-
-pub(crate) struct SubView {
-    inner: AnyView,
-    item_focus_handle: FocusHandle,
-    kind: DebuggerPaneItem,
-    show_indicator: Box<dyn Fn(&App) -> bool>,
-    actions: Option<Box<dyn FnMut(&mut Window, &mut App) -> AnyElement>>,
-    hovered: bool,
-}
-
-impl SubView {
-    pub(crate) fn new(
-        item_focus_handle: FocusHandle,
-        view: AnyView,
-        kind: DebuggerPaneItem,
-        cx: &mut App,
-    ) -> Entity<Self> {
-        cx.new(|_| Self {
-            kind,
-            inner: view,
-            item_focus_handle,
-            show_indicator: Box::new(|_| false),
-            actions: None,
-            hovered: false,
-        })
-    }
-
-    pub(crate) fn stack_frame_list(
-        stack_frame_list: Entity<StackFrameList>,
-        cx: &mut App,
-    ) -> Entity<Self> {
-        let weak_list = stack_frame_list.downgrade();
-        let this = Self::new(
-            stack_frame_list.focus_handle(cx),
-            stack_frame_list.into(),
-            DebuggerPaneItem::Frames,
-            cx,
-        );
-
-        this.update(cx, |this, _| {
-            this.with_actions(Box::new(move |_, cx| {
-                weak_list
-                    .update(cx, |this, _| this.render_control_strip())
-                    .unwrap_or_else(|_| div().into_any_element())
-            }));
-        });
-
-        this
-    }
-
-    pub(crate) fn console(console: Entity<Console>, cx: &mut App) -> Entity<Self> {
-        let weak_console = console.downgrade();
-        let this = Self::new(
-            console.focus_handle(cx),
-            console.into(),
-            DebuggerPaneItem::Console,
-            cx,
-        );
-        this.update(cx, |this, _| {
-            this.with_indicator(Box::new(move |cx| {
-                weak_console
-                    .read_with(cx, |console, cx| console.show_indicator(cx))
-                    .unwrap_or_default()
-            }))
-        });
-        this
-    }
-
-    pub(crate) fn breakpoint_list(list: Entity<BreakpointList>, cx: &mut App) -> Entity<Self> {
-        let weak_list = list.downgrade();
-        let focus_handle = list.focus_handle(cx);
-        let this = Self::new(
-            focus_handle,
-            list.into(),
-            DebuggerPaneItem::BreakpointList,
-            cx,
-        );
-
-        this.update(cx, |this, _| {
-            this.with_actions(Box::new(move |_, cx| {
-                weak_list
-                    .update(cx, |this, _| this.render_control_strip())
-                    .unwrap_or_else(|_| div().into_any_element())
-            }));
-        });
-        this
-    }
-
-    pub(crate) fn view_kind(&self) -> DebuggerPaneItem {
-        self.kind
-    }
-    pub(crate) fn with_indicator(&mut self, indicator: Box<dyn Fn(&App) -> bool>) {
-        self.show_indicator = indicator;
-    }
-    pub(crate) fn with_actions(
-        &mut self,
-        actions: Box<dyn FnMut(&mut Window, &mut App) -> AnyElement>,
-    ) {
-        self.actions = Some(actions);
-    }
-}
-impl Focusable for SubView {
-    fn focus_handle(&self, _: &App) -> FocusHandle {
-        self.item_focus_handle.clone()
-    }
-}
-impl EventEmitter<()> for SubView {}
-impl Item for SubView {
-    type Event = ();
-
-    /// This is used to serialize debugger pane layouts
-    /// A SharedString gets converted to a enum and back during serialization/deserialization.
-    fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString {
-        self.kind.to_shared_string()
-    }
-
-    fn tab_tooltip_text(&self, _: &App) -> Option<SharedString> {
-        Some(self.kind.tab_tooltip())
-    }
-
-    fn tab_content(
-        &self,
-        params: workspace::item::TabContentParams,
-        _: &Window,
-        cx: &App,
-    ) -> AnyElement {
-        let label = Label::new(self.kind.to_shared_string())
-            .size(ui::LabelSize::Small)
-            .color(params.text_color())
-            .line_height_style(ui::LineHeightStyle::UiLabel);
-
-        if !params.selected && self.show_indicator.as_ref()(cx) {
-            return h_flex()
-                .justify_between()
-                .child(ui::Indicator::dot())
-                .gap_2()
-                .child(label)
-                .into_any_element();
-        }
-
-        label.into_any_element()
-    }
-}
-
-impl Render for SubView {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .id(format!(
-                "subview-container-{}",
-                self.kind.to_shared_string()
-            ))
-            .on_hover(cx.listener(|this, hovered, _, cx| {
-                this.hovered = *hovered;
-                cx.notify();
-            }))
-            .size_full()
-            // Add border unconditionally to prevent layout shifts on focus changes.
-            .border_1()
-            .when(self.item_focus_handle.contains_focused(window, cx), |el| {
-                el.border_color(cx.theme().colors().pane_focused_border)
-            })
-            .child(self.inner.clone())
-    }
-}
-
-pub(crate) fn new_debugger_pane(
-    workspace: WeakEntity<Workspace>,
-    project: Entity<Project>,
-    window: &mut Window,
-    cx: &mut Context<RunningState>,
-) -> Entity<Pane> {
-    let weak_running = cx.weak_entity();
-    let custom_drop_handle = {
-        let workspace = workspace.clone();
-        let project = project.downgrade();
-        let weak_running = weak_running.clone();
-        move |pane: &mut Pane, any: &dyn Any, window: &mut Window, cx: &mut Context<Pane>| {
-            let Some(tab) = any.downcast_ref::<DraggedTab>() else {
-                return ControlFlow::Break(());
-            };
-            let Some(project) = project.upgrade() else {
-                return ControlFlow::Break(());
-            };
-            let this_pane = cx.entity();
-            let item = if tab.pane == this_pane {
-                pane.item_for_index(tab.ix)
-            } else {
-                tab.pane.read(cx).item_for_index(tab.ix)
-            };
-            let Some(item) = item.filter(|item| item.downcast::<SubView>().is_some()) else {
-                return ControlFlow::Break(());
-            };
-
-            let source = tab.pane.clone();
-            let item_id_to_move = item.item_id();
-
-            let Ok(new_split_pane) = pane
-                .drag_split_direction()
-                .map(|split_direction| {
-                    weak_running.update(cx, |running, cx| {
-                        let new_pane =
-                            new_debugger_pane(workspace.clone(), project.clone(), window, cx);
-                        let _previous_subscription = running.pane_close_subscriptions.insert(
-                            new_pane.entity_id(),
-                            cx.subscribe_in(&new_pane, window, RunningState::handle_pane_event),
-                        );
-                        debug_assert!(_previous_subscription.is_none());
-                        running
-                            .panes
-                            .split(&this_pane, &new_pane, split_direction)?;
-                        anyhow::Ok(new_pane)
-                    })
-                })
-                .transpose()
-            else {
-                return ControlFlow::Break(());
-            };
-
-            match new_split_pane.transpose() {
-                // Source pane may be the one currently updated, so defer the move.
-                Ok(Some(new_pane)) => cx
-                    .spawn_in(window, async move |_, cx| {
-                        cx.update(|window, cx| {
-                            move_item(
-                                &source,
-                                &new_pane,
-                                item_id_to_move,
-                                new_pane.read(cx).active_item_index(),
-                                true,
-                                window,
-                                cx,
-                            );
-                        })
-                        .ok();
-                    })
-                    .detach(),
-                // If we drop into existing pane or current pane,
-                // regular pane drop handler will take care of it,
-                // using the right tab index for the operation.
-                Ok(None) => return ControlFlow::Continue(()),
-                err @ Err(_) => {
-                    err.log_err();
-                    return ControlFlow::Break(());
-                }
-            };
-
-            ControlFlow::Break(())
-        }
-    };
-
-    cx.new(move |cx| {
-        let mut pane = Pane::new(
-            workspace.clone(),
-            project.clone(),
-            Default::default(),
-            None,
-            NoAction.boxed_clone(),
-            true,
-            window,
-            cx,
-        );
-        let focus_handle = pane.focus_handle(cx);
-        pane.set_can_split(Some(Arc::new({
-            let weak_running = weak_running.clone();
-            move |pane, dragged_item, _window, cx| {
-                if let Some(tab) = dragged_item.downcast_ref::<DraggedTab>() {
-                    let is_current_pane = tab.pane == cx.entity();
-                    let Some(can_drag_away) = weak_running
-                        .read_with(cx, |running_state, _| {
-                            let current_panes = running_state.panes.panes();
-                            !current_panes.contains(&&tab.pane)
-                                || current_panes.len() > 1
-                                || (!is_current_pane || pane.items_len() > 1)
-                        })
-                        .ok()
-                    else {
-                        return false;
-                    };
-                    if can_drag_away {
-                        let item = if is_current_pane {
-                            pane.item_for_index(tab.ix)
-                        } else {
-                            tab.pane.read(cx).item_for_index(tab.ix)
-                        };
-                        if let Some(item) = item {
-                            return item.downcast::<SubView>().is_some();
-                        }
-                    }
-                }
-                false
-            }
-        })));
-        pane.set_can_toggle_zoom(false, cx);
-        pane.display_nav_history_buttons(None);
-        pane.set_custom_drop_handle(cx, custom_drop_handle);
-        pane.set_should_display_tab_bar(|_, _| true);
-        pane.set_render_tab_bar_buttons(cx, |_, _, _| (None, None));
-        pane.set_render_tab_bar(cx, {
-            move |pane, window, cx| {
-                let active_pane_item = pane.active_item();
-                let pane_group_id: SharedString =
-                    format!("pane-zoom-button-hover-{}", cx.entity_id()).into();
-                let as_subview = active_pane_item
-                    .as_ref()
-                    .and_then(|item| item.downcast::<SubView>());
-                let is_hovered = as_subview
-                    .as_ref()
-                    .is_some_and(|item| item.read(cx).hovered);
-
-                h_flex()
-                    .track_focus(&focus_handle)
-                    .group(pane_group_id.clone())
-                    .pl_1p5()
-                    .pr_1()
-                    .justify_between()
-                    .border_b_1()
-                    .border_color(cx.theme().colors().border)
-                    .bg(cx.theme().colors().tab_bar_background)
-                    .on_action(|_: &menu::Cancel, window, cx| {
-                        if cx.stop_active_drag(window) {
-                        } else {
-                            cx.propagate();
-                        }
-                    })
-                    .child(
-                        h_flex()
-                            .w_full()
-                            .gap_1()
-                            .h(Tab::container_height(cx))
-                            .drag_over::<DraggedTab>(|bar, _, _, cx| {
-                                bar.bg(cx.theme().colors().drop_target_background)
-                            })
-                            .on_drop(cx.listener(
-                                move |this, dragged_tab: &DraggedTab, window, cx| {
-                                    this.drag_split_direction = None;
-                                    this.handle_tab_drop(dragged_tab, this.items_len(), window, cx)
-                                },
-                            ))
-                            .children(pane.items().enumerate().map(|(ix, item)| {
-                                let selected = active_pane_item
-                                    .as_ref()
-                                    .is_some_and(|active| active.item_id() == item.item_id());
-                                let deemphasized = !pane.has_focus(window, cx);
-                                let item_ = item.boxed_clone();
-                                div()
-                                    .id(format!("debugger_tab_{}", item.item_id().as_u64()))
-                                    .p_1()
-                                    .rounded_md()
-                                    .cursor_pointer()
-                                    .when_some(item.tab_tooltip_text(cx), |this, tooltip| {
-                                        this.tooltip(Tooltip::text(tooltip))
-                                    })
-                                    .map(|this| {
-                                        let theme = cx.theme();
-                                        if selected {
-                                            let color = theme.colors().tab_active_background;
-                                            let color = if deemphasized {
-                                                color.opacity(0.5)
-                                            } else {
-                                                color
-                                            };
-                                            this.bg(color)
-                                        } else {
-                                            let hover_color = theme.colors().element_hover;
-                                            this.hover(|style| style.bg(hover_color))
-                                        }
-                                    })
-                                    .on_click(cx.listener(move |this, _, window, cx| {
-                                        let index = this.index_for_item(&*item_);
-                                        if let Some(index) = index {
-                                            this.activate_item(index, true, true, window, cx);
-                                        }
-                                    }))
-                                    .child(item.tab_content(
-                                        TabContentParams {
-                                            selected,
-                                            deemphasized,
-                                            ..Default::default()
-                                        },
-                                        window,
-                                        cx,
-                                    ))
-                                    .on_drop(cx.listener(
-                                        move |this, dragged_tab: &DraggedTab, window, cx| {
-                                            this.drag_split_direction = None;
-                                            this.handle_tab_drop(dragged_tab, ix, window, cx)
-                                        },
-                                    ))
-                                    .on_drag(
-                                        DraggedTab {
-                                            item: item.boxed_clone(),
-                                            pane: cx.entity(),
-                                            detail: 0,
-                                            is_active: selected,
-                                            ix,
-                                        },
-                                        |tab, _, _, cx| cx.new(|_| tab.clone()),
-                                    )
-                            })),
-                    )
-                    .child({
-                        let zoomed = pane.is_zoomed();
-
-                        h_flex()
-                            .visible_on_hover(pane_group_id)
-                            .when(is_hovered, |this| this.visible())
-                            .when_some(as_subview.as_ref(), |this, subview| {
-                                subview.update(cx, |view, cx| {
-                                    let Some(additional_actions) = view.actions.as_mut() else {
-                                        return this;
-                                    };
-                                    this.child(additional_actions(window, cx))
-                                })
-                            })
-                            .child(
-                                IconButton::new(
-                                    SharedString::from(format!(
-                                        "debug-toggle-zoom-{}",
-                                        cx.entity_id()
-                                    )),
-                                    if zoomed {
-                                        IconName::Minimize
-                                    } else {
-                                        IconName::Maximize
-                                    },
-                                )
-                                .icon_size(IconSize::Small)
-                                .on_click(cx.listener(move |pane, _, _, cx| {
-                                    let is_zoomed = pane.is_zoomed();
-                                    pane.set_zoomed(!is_zoomed, cx);
-                                    cx.notify();
-                                }))
-                                .tooltip({
-                                    let focus_handle = focus_handle.clone();
-                                    move |_window, cx| {
-                                        let zoomed_text =
-                                            if zoomed { "Minimize" } else { "Expand" };
-                                        Tooltip::for_action_in(
-                                            zoomed_text,
-                                            &ToggleExpandItem,
-                                            &focus_handle,
-                                            cx,
-                                        )
-                                    }
-                                }),
-                            )
-                    })
-                    .into_any_element()
-            }
-        });
-        pane
-    })
-}
-
-pub struct DebugTerminal {
-    pub terminal: Option<Entity<TerminalView>>,
-    focus_handle: FocusHandle,
-    _subscriptions: [Subscription; 1],
-}
-
-impl DebugTerminal {
-    fn empty(window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let focus_handle = cx.focus_handle();
-        let focus_subscription = cx.on_focus(&focus_handle, window, |this, window, cx| {
-            if let Some(terminal) = this.terminal.as_ref() {
-                terminal.focus_handle(cx).focus(window);
-            }
-        });
-
-        Self {
-            terminal: None,
-            focus_handle,
-            _subscriptions: [focus_subscription],
-        }
-    }
-}
-
-impl gpui::Render for DebugTerminal {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        div()
-            .track_focus(&self.focus_handle)
-            .size_full()
-            .bg(cx.theme().colors().editor_background)
-            .children(self.terminal.clone())
-    }
-}
-impl Focusable for DebugTerminal {
-    fn focus_handle(&self, _cx: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl RunningState {
-    // todo(debugger) move this to util and make it so you pass a closure to it that converts a string
-    pub(crate) fn substitute_variables_in_config(
-        config: &mut serde_json::Value,
-        context: &TaskContext,
-    ) {
-        match config {
-            serde_json::Value::Object(obj) => {
-                obj.values_mut()
-                    .for_each(|value| Self::substitute_variables_in_config(value, context));
-            }
-            serde_json::Value::Array(array) => {
-                array
-                    .iter_mut()
-                    .for_each(|value| Self::substitute_variables_in_config(value, context));
-            }
-            serde_json::Value::String(s) => {
-                // Some built-in zed tasks wrap their arguments in quotes as they might contain spaces.
-                if s.starts_with("\"$ZED_") && s.ends_with('"') {
-                    *s = s[1..s.len() - 1].to_string();
-                }
-                if let Some(substituted) = substitute_variables_in_str(s, context) {
-                    *s = substituted;
-                }
-            }
-            _ => {}
-        }
-    }
-
-    pub(crate) fn contains_substring(config: &serde_json::Value, substring: &str) -> bool {
-        match config {
-            serde_json::Value::Object(obj) => obj
-                .values()
-                .any(|value| Self::contains_substring(value, substring)),
-            serde_json::Value::Array(array) => array
-                .iter()
-                .any(|value| Self::contains_substring(value, substring)),
-            serde_json::Value::String(s) => s.contains(substring),
-            _ => false,
-        }
-    }
-
-    pub(crate) fn substitute_process_id_in_config(config: &mut serde_json::Value, process_id: i32) {
-        match config {
-            serde_json::Value::Object(obj) => {
-                obj.values_mut().for_each(|value| {
-                    Self::substitute_process_id_in_config(value, process_id);
-                });
-            }
-            serde_json::Value::Array(array) => {
-                array.iter_mut().for_each(|value| {
-                    Self::substitute_process_id_in_config(value, process_id);
-                });
-            }
-            serde_json::Value::String(s) => {
-                if s.contains(PROCESS_ID_PLACEHOLDER.as_str()) {
-                    *s = s.replace(PROCESS_ID_PLACEHOLDER.as_str(), &process_id.to_string());
-                }
-            }
-            _ => {}
-        }
-    }
-
-    pub(crate) fn relativize_paths(
-        key: Option<&str>,
-        config: &mut serde_json::Value,
-        context: &TaskContext,
-    ) {
-        match config {
-            serde_json::Value::Object(obj) => {
-                obj.iter_mut()
-                    .for_each(|(key, value)| Self::relativize_paths(Some(key), value, context));
-            }
-            serde_json::Value::Array(array) => {
-                array
-                    .iter_mut()
-                    .for_each(|value| Self::relativize_paths(None, value, context));
-            }
-            serde_json::Value::String(s) if key == Some("program") || key == Some("cwd") => {
-                // Some built-in zed tasks wrap their arguments in quotes as they might contain spaces.
-                if s.starts_with("\"$ZED_") && s.ends_with('"') {
-                    *s = s[1..s.len() - 1].to_string();
-                }
-                resolve_path(s);
-
-                if let Some(substituted) = substitute_variables_in_str(s, context) {
-                    *s = substituted;
-                }
-            }
-            _ => {}
-        }
-    }
-
-    pub(crate) fn new(
-        session: Entity<Session>,
-        project: Entity<Project>,
-        workspace: WeakEntity<Workspace>,
-        parent_terminal: Option<Entity<DebugTerminal>>,
-        serialized_pane_layout: Option<SerializedLayout>,
-        dock_axis: Axis,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let focus_handle = cx.focus_handle();
-        let session_id = session.read(cx).session_id();
-        let weak_state = cx.weak_entity();
-        let stack_frame_list = cx.new(|cx| {
-            StackFrameList::new(
-                workspace.clone(),
-                session.clone(),
-                weak_state.clone(),
-                window,
-                cx,
-            )
-        });
-
-        let debug_terminal =
-            parent_terminal.unwrap_or_else(|| cx.new(|cx| DebugTerminal::empty(window, cx)));
-        let memory_view = cx.new(|cx| {
-            MemoryView::new(
-                session.clone(),
-                workspace.clone(),
-                stack_frame_list.downgrade(),
-                window,
-                cx,
-            )
-        });
-        let variable_list = cx.new(|cx| {
-            VariableList::new(
-                session.clone(),
-                stack_frame_list.clone(),
-                memory_view.clone(),
-                weak_state.clone(),
-                window,
-                cx,
-            )
-        });
-
-        let module_list = cx.new(|cx| ModuleList::new(session.clone(), workspace.clone(), cx));
-
-        let loaded_source_list = cx.new(|cx| LoadedSourceList::new(session.clone(), cx));
-
-        let console = cx.new(|cx| {
-            Console::new(
-                session.clone(),
-                stack_frame_list.clone(),
-                variable_list.clone(),
-                window,
-                cx,
-            )
-        });
-
-        let breakpoint_list = BreakpointList::new(
-            Some(session.clone()),
-            workspace.clone(),
-            &project,
-            window,
-            cx,
-        );
-
-        let _subscriptions = vec![
-            cx.on_app_quit(move |this, cx| {
-                let shutdown = this
-                    .session
-                    .update(cx, |session, cx| session.on_app_quit(cx));
-                let terminal = this.debug_terminal.clone();
-                async move {
-                    shutdown.await;
-                    drop(terminal)
-                }
-            }),
-            cx.observe(&module_list, |_, _, cx| cx.notify()),
-            cx.subscribe_in(&session, window, |this, _, event, window, cx| {
-                match event {
-                    SessionEvent::Stopped(thread_id) => {
-                        let panel = this
-                            .workspace
-                            .update(cx, |workspace, cx| {
-                                workspace.open_panel::<crate::DebugPanel>(window, cx);
-                                workspace.panel::<crate::DebugPanel>(cx)
-                            })
-                            .log_err()
-                            .flatten();
-
-                        if let Some(thread_id) = thread_id {
-                            this.select_thread(*thread_id, window, cx);
-                        }
-                        if let Some(panel) = panel {
-                            let id = this.session_id;
-                            window.defer(cx, move |window, cx| {
-                                panel.update(cx, |this, cx| {
-                                    this.activate_session_by_id(id, window, cx);
-                                })
-                            })
-                        }
-                    }
-                    SessionEvent::Threads => {
-                        let threads = this.session.update(cx, |this, cx| this.threads(cx));
-                        this.select_current_thread(&threads, window, cx);
-                    }
-                    SessionEvent::CapabilitiesLoaded => {
-                        let capabilities = this.capabilities(cx);
-                        if !capabilities.supports_modules_request.unwrap_or(false) {
-                            this.remove_pane_item(DebuggerPaneItem::Modules, window, cx);
-                        }
-                        if !capabilities
-                            .supports_loaded_sources_request
-                            .unwrap_or(false)
-                        {
-                            this.remove_pane_item(DebuggerPaneItem::LoadedSources, window, cx);
-                        }
-                    }
-                    SessionEvent::RunInTerminal { request, sender } => this
-                        .handle_run_in_terminal(request, sender.clone(), window, cx)
-                        .detach_and_log_err(cx),
-
-                    _ => {}
-                }
-                cx.notify()
-            }),
-            cx.on_focus_out(&focus_handle, window, |this, _, window, cx| {
-                this.serialize_layout(window, cx);
-            }),
-            cx.subscribe(
-                &session,
-                |this, session, event: &SessionStateEvent, cx| match event {
-                    SessionStateEvent::Shutdown if session.read(cx).is_building() => {
-                        this.shutdown(cx);
-                    }
-                    _ => {}
-                },
-            ),
-        ];
-
-        let mut pane_close_subscriptions = HashMap::default();
-        let panes = if let Some(root) = serialized_pane_layout.and_then(|serialized_layout| {
-            persistence::deserialize_pane_layout(
-                serialized_layout.panes,
-                dock_axis != serialized_layout.dock_axis,
-                &workspace,
-                &project,
-                &stack_frame_list,
-                &variable_list,
-                &module_list,
-                &console,
-                &breakpoint_list,
-                &loaded_source_list,
-                &debug_terminal,
-                &memory_view,
-                &mut pane_close_subscriptions,
-                window,
-                cx,
-            )
-        }) {
-            workspace::PaneGroup::with_root(root)
-        } else {
-            pane_close_subscriptions.clear();
-
-            let root = Self::default_pane_layout(
-                project,
-                &workspace,
-                &stack_frame_list,
-                &variable_list,
-                &console,
-                &breakpoint_list,
-                &debug_terminal,
-                dock_axis,
-                &mut pane_close_subscriptions,
-                window,
-                cx,
-            );
-
-            workspace::PaneGroup::with_root(root)
-        };
-        let active_pane = panes.first_pane();
-
-        Self {
-            memory_view,
-            session,
-            workspace,
-            focus_handle,
-            variable_list,
-            _subscriptions,
-            thread_id: None,
-            _remote_id: None,
-            stack_frame_list,
-            session_id,
-            panes,
-            active_pane,
-            module_list,
-            console,
-            breakpoint_list,
-            loaded_sources_list: loaded_source_list,
-            pane_close_subscriptions,
-            debug_terminal,
-            dock_axis,
-            _schedule_serialize: None,
-            scenario: None,
-            scenario_context: None,
-        }
-    }
-
-    pub(crate) fn remove_pane_item(
-        &mut self,
-        item_kind: DebuggerPaneItem,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some((pane, item_id)) = self.panes.panes().iter().find_map(|pane| {
-            Some(pane).zip(
-                pane.read(cx)
-                    .items()
-                    .find(|item| {
-                        item.act_as::<SubView>(cx)
-                            .is_some_and(|view| view.read(cx).kind == item_kind)
-                    })
-                    .map(|item| item.item_id()),
-            )
-        }) {
-            pane.update(cx, |pane, cx| {
-                pane.remove_item(item_id, false, true, window, cx)
-            })
-        }
-    }
-
-    pub(crate) fn has_pane_at_position(&self, position: Point<Pixels>) -> bool {
-        self.panes.pane_at_pixel_position(position).is_some()
-    }
-
-    pub(crate) fn resolve_scenario(
-        &self,
-        scenario: DebugScenario,
-        task_context: TaskContext,
-        buffer: Option<Entity<Buffer>>,
-        worktree_id: Option<WorktreeId>,
-        window: &Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<DebugTaskDefinition>> {
-        let Some(workspace) = self.workspace.upgrade() else {
-            return Task::ready(Err(anyhow!("no workspace")));
-        };
-        let project = workspace.read(cx).project().clone();
-        let dap_store = project.read(cx).dap_store().downgrade();
-        let dap_registry = cx.global::<DapRegistry>().clone();
-        let task_store = project.read(cx).task_store().downgrade();
-        let weak_project = project.downgrade();
-        let weak_workspace = workspace.downgrade();
-        let is_windows = project.read(cx).path_style(cx).is_windows();
-        let remote_shell = project
-            .read(cx)
-            .remote_client()
-            .as_ref()
-            .and_then(|remote| remote.read(cx).shell());
-
-        cx.spawn_in(window, async move |this, cx| {
-            let DebugScenario {
-                adapter,
-                label,
-                build,
-                mut config,
-                tcp_connection,
-            } = scenario;
-            Self::relativize_paths(None, &mut config, &task_context);
-            Self::substitute_variables_in_config(&mut config, &task_context);
-
-            if Self::contains_substring(&config, PROCESS_ID_PLACEHOLDER.as_str()) || label.as_ref().contains(PROCESS_ID_PLACEHOLDER.as_str()) {
-                let (tx, rx) = futures::channel::oneshot::channel::<Option<i32>>();
-
-                let weak_workspace_clone = weak_workspace.clone();
-                weak_workspace.update_in(cx, |workspace, window, cx| {
-                    let project = workspace.project().clone();
-                    workspace.toggle_modal(window, cx, |window, cx| {
-                        AttachModal::new(
-                            ModalIntent::ResolveProcessId(Some(tx)),
-                            weak_workspace_clone,
-                            project,
-                            true,
-                            window,
-                            cx,
-                        )
-                    });
-                }).ok();
-
-                let Some(process_id) = rx.await.ok().flatten() else {
-                    bail!("No process selected with config that contains {}", PROCESS_ID_PLACEHOLDER.as_str())
-                };
-
-                Self::substitute_process_id_in_config(&mut config, process_id);
-            }
-
-            let request_type = match dap_registry
-                .adapter(&adapter)
-                .with_context(|| format!("{}: is not a valid adapter name", &adapter)) {
-                    Ok(adapter) => adapter.request_kind(&config).await,
-                    Err(e) => Err(e)
-                };
-
-
-            let config_is_valid = request_type.is_ok();
-            let mut extra_config = Value::Null;
-            let build_output = if let Some(build) = build {
-                let (task_template, locator_name) = match build {
-                    BuildTaskDefinition::Template {
-                        task_template,
-                        locator_name,
-                    } => (task_template, locator_name),
-                    BuildTaskDefinition::ByName(ref label) => {
-                        let task = task_store.update(cx, |this, cx| {
-                            this.task_inventory().map(|inventory| {
-                                inventory.read(cx).task_template_by_label(
-                                    buffer,
-                                    worktree_id,
-                                    label,
-                                    cx,
-                                )
-                            })
-                        })?;
-                        let task = match task {
-                            Some(task) => task.await,
-                            None => None,
-                        }.with_context(|| format!("Couldn't find task template for {build:?}"))?;
-                        (task, None)
-                    }
-                };
-                let Some(mut task) = task_template.resolve_task("debug-build-task", &task_context) else {
-                    anyhow::bail!("Could not resolve task variables within a debug scenario");
-                };
-
-                let locator_name = if let Some(locator_name) = locator_name {
-                    extra_config = config.clone();
-                    debug_assert!(!config_is_valid);
-                    Some(locator_name)
-                } else if !config_is_valid {
-                    let task = dap_store
-                        .update(cx, |this, cx| {
-                            this.debug_scenario_for_build_task(
-                                task.original_task().clone(),
-                                adapter.clone().into(),
-                                task.display_label().to_owned().into(),
-                                cx,
-                            )
-
-                        });
-                    if let Ok(t) = task {
-                        t.await.and_then(|scenario| {
-                            extra_config = scenario.config;
-                            match scenario.build {
-                                Some(BuildTaskDefinition::Template {
-                                    locator_name, ..
-                                }) => locator_name,
-                                _ => None,
-                            }
-                        })
-                    } else {
-                        None
-                    }
-
-                } else {
-                    None
-                };
-
-                if let Some(remote_shell) = remote_shell && task.resolved.shell == Shell::System {
-                    task.resolved.shell = Shell::Program(remote_shell);
-                }
-
-                let builder = ShellBuilder::new(&task.resolved.shell, is_windows);
-                let command_label = builder.command_label(task.resolved.command.as_deref().unwrap_or(""));
-                let (command, args) =
-                    builder.build(task.resolved.command.clone(), &task.resolved.args);
-
-                let task_with_shell = SpawnInTerminal {
-                    command_label,
-                    command: Some(command),
-                    args,
-                    ..task.resolved.clone()
-                };
-                let terminal = project
-                    .update(cx, |project, cx| {
-                        project.create_terminal_task(
-                            task_with_shell.clone(),
-                            cx,
-                        )
-                    })?.await?;
-
-                let terminal_view = cx.new_window_entity(|window, cx| {
-                    TerminalView::new(
-                        terminal.clone(),
-                        weak_workspace,
-                        None,
-                        weak_project,
-                        window,
-                        cx,
-                    )
-                })?;
-
-                this.update_in(cx, |this, window, cx| {
-                    this.ensure_pane_item(DebuggerPaneItem::Terminal, window, cx);
-                    this.debug_terminal.update(cx, |debug_terminal, cx| {
-                        debug_terminal.terminal = Some(terminal_view);
-                        cx.notify();
-                    });
-                })?;
-
-                let exit_status = terminal
-                    .read_with(cx, |terminal, cx| terminal.wait_for_completed_task(cx))?
-                    .await
-                    .context("Failed to wait for completed task")?;
-
-                if !exit_status.success() {
-                    anyhow::bail!("Build failed");
-                }
-                Some((task.resolved.clone(), locator_name, extra_config))
-            } else {
-                None
-            };
-
-            if config_is_valid {
-            } else if let Some((task, locator_name, extra_config)) = build_output {
-                let locator_name =
-                    locator_name.with_context(|| {
-                        format!("Could not find a valid locator for a build task and configure is invalid with error: {}", request_type.err()
-                            .map(|err| err.to_string())
-                            .unwrap_or_default())
-                    })?;
-                let request = dap_store
-                    .update(cx, |this, cx| {
-                        this.run_debug_locator(&locator_name, task, cx)
-                    })?
-                    .await?;
-
-                let zed_config = ZedDebugConfig {
-                    label: label.clone(),
-                    adapter: adapter.clone(),
-                    request,
-                    stop_on_entry: None,
-                };
-
-                let scenario = dap_registry
-                    .adapter(&adapter)
-                    .with_context(|| anyhow!("{}: is not a valid adapter name", &adapter))?.config_from_zed_format(zed_config)
-                    .await?;
-                config = scenario.config;
-                util::merge_non_null_json_value_into(extra_config, &mut config);
-
-                Self::substitute_variables_in_config(&mut config, &task_context);
-            } else {
-                let Err(e) = request_type else {
-                    unreachable!();
-                };
-                anyhow::bail!("Zed cannot determine how to run this debug scenario. `build` field was not provided and Debug Adapter won't accept provided configuration because: {e}");
-            };
-
-            Ok(DebugTaskDefinition {
-                label,
-                adapter: DebugAdapterName(adapter),
-                config,
-                tcp_connection,
-            })
-        })
-    }
-
-    fn handle_run_in_terminal(
-        &self,
-        request: &RunInTerminalRequestArguments,
-        mut sender: mpsc::Sender<Result<u32>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let running = cx.entity();
-        let Ok(project) = self
-            .workspace
-            .read_with(cx, |workspace, _| workspace.project().clone())
-        else {
-            return Task::ready(Err(anyhow!("no workspace")));
-        };
-        let session = self.session.read(cx);
-
-        let cwd = (!request.cwd.is_empty())
-            .then(|| PathBuf::from(&request.cwd))
-            .or_else(|| session.binary().unwrap().cwd.clone());
-
-        let mut envs: HashMap<String, String> =
-            self.session.read(cx).task_context().project_env.clone();
-        if let Some(Value::Object(env)) = &request.env {
-            for (key, value) in env {
-                let value_str = match (key.as_str(), value) {
-                    (_, Value::String(value)) => value,
-                    _ => continue,
-                };
-
-                envs.insert(key.clone(), value_str.clone());
-            }
-        }
-
-        let mut args = request.args.clone();
-        let command = if envs.contains_key("VSCODE_INSPECTOR_OPTIONS") {
-            // Handle special case for NodeJS debug adapter
-            // If the Node binary path is provided (possibly with arguments like --experimental-network-inspection),
-            // we set the command to None
-            // This prevents the NodeJS REPL from appearing, which is not the desired behavior
-            // The expected usage is for users to provide their own Node command, e.g., `node test.js`
-            // This allows the NodeJS debug client to attach correctly
-            if args
-                .iter()
-                .filter(|arg| !arg.starts_with("--"))
-                .collect::<Vec<_>>()
-                .len()
-                > 1
-            {
-                Some(args.remove(0))
-            } else {
-                None
-            }
-        } else if !args.is_empty() {
-            Some(args.remove(0))
-        } else {
-            None
-        };
-
-        let shell = project.read(cx).terminal_settings(&cwd, cx).shell.clone();
-        let title = request
-            .title
-            .clone()
-            .filter(|title| !title.is_empty())
-            .or_else(|| command.clone())
-            .unwrap_or_else(|| "Debug terminal".to_string());
-        let kind = task::SpawnInTerminal {
-            id: task::TaskId("debug".to_string()),
-            full_label: title.clone(),
-            label: title.clone(),
-            command,
-            args,
-            command_label: title,
-            cwd,
-            env: envs,
-            use_new_terminal: true,
-            allow_concurrent_runs: true,
-            reveal: task::RevealStrategy::NoFocus,
-            reveal_target: task::RevealTarget::Dock,
-            hide: task::HideStrategy::Never,
-            shell,
-            show_summary: false,
-            show_command: false,
-            show_rerun: false,
-        };
-
-        let workspace = self.workspace.clone();
-        let weak_project = project.downgrade();
-
-        let terminal_task =
-            project.update(cx, |project, cx| project.create_terminal_task(kind, cx));
-        let terminal_task = cx.spawn_in(window, async move |_, cx| {
-            let terminal = terminal_task.await?;
-
-            let terminal_view = cx.new_window_entity(|window, cx| {
-                TerminalView::new(terminal.clone(), workspace, None, weak_project, window, cx)
-            })?;
-
-            running.update_in(cx, |running, window, cx| {
-                running.ensure_pane_item(DebuggerPaneItem::Terminal, window, cx);
-                running.debug_terminal.update(cx, |debug_terminal, cx| {
-                    debug_terminal.terminal = Some(terminal_view);
-                    cx.notify();
-                });
-            })?;
-
-            terminal.read_with(cx, |terminal, _| {
-                terminal
-                    .pid()
-                    .map(|pid| pid.as_u32())
-                    .context("Terminal was spawned but PID was not available")
-            })?
-        });
-
-        cx.background_spawn(async move { anyhow::Ok(sender.send(terminal_task.await).await?) })
-    }
-
-    fn create_sub_view(
-        &self,
-        item_kind: DebuggerPaneItem,
-        _pane: &Entity<Pane>,
-        cx: &mut Context<Self>,
-    ) -> Box<dyn ItemHandle> {
-        match item_kind {
-            DebuggerPaneItem::Console => Box::new(SubView::console(self.console.clone(), cx)),
-            DebuggerPaneItem::Variables => Box::new(SubView::new(
-                self.variable_list.focus_handle(cx),
-                self.variable_list.clone().into(),
-                item_kind,
-                cx,
-            )),
-            DebuggerPaneItem::BreakpointList => {
-                Box::new(SubView::breakpoint_list(self.breakpoint_list.clone(), cx))
-            }
-            DebuggerPaneItem::Frames => Box::new(SubView::new(
-                self.stack_frame_list.focus_handle(cx),
-                self.stack_frame_list.clone().into(),
-                item_kind,
-                cx,
-            )),
-            DebuggerPaneItem::Modules => Box::new(SubView::new(
-                self.module_list.focus_handle(cx),
-                self.module_list.clone().into(),
-                item_kind,
-                cx,
-            )),
-            DebuggerPaneItem::LoadedSources => Box::new(SubView::new(
-                self.loaded_sources_list.focus_handle(cx),
-                self.loaded_sources_list.clone().into(),
-                item_kind,
-                cx,
-            )),
-            DebuggerPaneItem::Terminal => Box::new(SubView::new(
-                self.debug_terminal.focus_handle(cx),
-                self.debug_terminal.clone().into(),
-                item_kind,
-                cx,
-            )),
-            DebuggerPaneItem::MemoryView => Box::new(SubView::new(
-                self.memory_view.focus_handle(cx),
-                self.memory_view.clone().into(),
-                item_kind,
-                cx,
-            )),
-        }
-    }
-
-    pub(crate) fn ensure_pane_item(
-        &mut self,
-        item_kind: DebuggerPaneItem,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.pane_items_status(cx).get(&item_kind) == Some(&true) {
-            return;
-        };
-        let pane = self.panes.last_pane();
-        let sub_view = self.create_sub_view(item_kind, &pane, cx);
-
-        pane.update(cx, |pane, cx| {
-            pane.add_item_inner(sub_view, false, false, false, None, window, cx);
-        })
-    }
-
-    pub(crate) fn add_pane_item(
-        &mut self,
-        item_kind: DebuggerPaneItem,
-        position: Point<Pixels>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        debug_assert!(
-            item_kind.is_supported(self.session.read(cx).capabilities()),
-            "We should only allow adding supported item kinds"
-        );
-
-        if let Some(pane) = self.panes.pane_at_pixel_position(position) {
-            let sub_view = self.create_sub_view(item_kind, pane, cx);
-
-            pane.update(cx, |pane, cx| {
-                pane.add_item(sub_view, false, false, None, window, cx);
-            })
-        }
-    }
-
-    pub(crate) fn pane_items_status(&self, cx: &App) -> IndexMap<DebuggerPaneItem, bool> {
-        let caps = self.session.read(cx).capabilities();
-        let mut pane_item_status = IndexMap::from_iter(
-            DebuggerPaneItem::all()
-                .iter()
-                .filter(|kind| kind.is_supported(caps))
-                .map(|kind| (*kind, false)),
-        );
-        self.panes.panes().iter().for_each(|pane| {
-            pane.read(cx)
-                .items()
-                .filter_map(|item| item.act_as::<SubView>(cx))
-                .for_each(|view| {
-                    pane_item_status.insert(view.read(cx).kind, true);
-                });
-        });
-
-        pane_item_status
-    }
-
-    pub(crate) fn serialize_layout(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if self._schedule_serialize.is_none() {
-            self._schedule_serialize = Some(cx.spawn_in(window, async move |this, cx| {
-                cx.background_executor()
-                    .timer(Duration::from_millis(100))
-                    .await;
-
-                let Some((adapter_name, pane_layout)) = this
-                    .read_with(cx, |this, cx| {
-                        let adapter_name = this.session.read(cx).adapter();
-                        (
-                            adapter_name,
-                            persistence::build_serialized_layout(
-                                &this.panes.root,
-                                this.dock_axis,
-                                cx,
-                            ),
-                        )
-                    })
-                    .ok()
-                else {
-                    return;
-                };
-
-                persistence::serialize_pane_layout(adapter_name, pane_layout)
-                    .await
-                    .log_err();
-
-                this.update(cx, |this, _| {
-                    this._schedule_serialize.take();
-                })
-                .ok();
-            }));
-        }
-    }
-
-    pub(crate) fn handle_pane_event(
-        this: &mut RunningState,
-        source_pane: &Entity<Pane>,
-        event: &Event,
-        window: &mut Window,
-        cx: &mut Context<RunningState>,
-    ) {
-        this.serialize_layout(window, cx);
-        match event {
-            Event::Remove { .. } => {
-                let _did_find_pane = this.panes.remove(source_pane).is_ok();
-                debug_assert!(_did_find_pane);
-                cx.notify();
-            }
-            Event::Focus => {
-                this.active_pane = source_pane.clone();
-            }
-            _ => {}
-        }
-    }
-
-    pub(crate) fn activate_pane_in_direction(
-        &mut self,
-        direction: SplitDirection,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let active_pane = self.active_pane.clone();
-        if let Some(pane) = self
-            .panes
-            .find_pane_in_direction(&active_pane, direction, cx)
-        {
-            pane.update(cx, |pane, cx| {
-                pane.focus_active_item(window, cx);
-            })
-        } else {
-            self.workspace
-                .update(cx, |workspace, cx| {
-                    workspace.activate_pane_in_direction(direction, window, cx)
-                })
-                .ok();
-        }
-    }
-
-    pub(crate) fn go_to_selected_stack_frame(&self, window: &mut Window, cx: &mut Context<Self>) {
-        if self.thread_id.is_some() {
-            self.stack_frame_list
-                .update(cx, |list, cx| {
-                    let Some(stack_frame_id) = list.opened_stack_frame_id() else {
-                        return Task::ready(Ok(()));
-                    };
-                    list.go_to_stack_frame(stack_frame_id, window, cx)
-                })
-                .detach();
-        }
-    }
-
-    pub(crate) fn has_open_context_menu(&self, cx: &App) -> bool {
-        self.variable_list.read(cx).has_open_context_menu()
-    }
-
-    pub fn session(&self) -> &Entity<Session> {
-        &self.session
-    }
-
-    pub fn session_id(&self) -> SessionId {
-        self.session_id
-    }
-
-    pub(crate) fn selected_stack_frame_id(&self, cx: &App) -> Option<dap::StackFrameId> {
-        self.stack_frame_list.read(cx).opened_stack_frame_id()
-    }
-
-    pub(crate) fn stack_frame_list(&self) -> &Entity<StackFrameList> {
-        &self.stack_frame_list
-    }
-
-    #[cfg(test)]
-    pub fn console(&self) -> &Entity<Console> {
-        &self.console
-    }
-
-    #[cfg(test)]
-    pub(crate) fn module_list(&self) -> &Entity<ModuleList> {
-        &self.module_list
-    }
-
-    pub(crate) fn activate_item(
-        &mut self,
-        item: DebuggerPaneItem,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.ensure_pane_item(item, window, cx);
-
-        let (variable_list_position, pane) = self
-            .panes
-            .panes()
-            .into_iter()
-            .find_map(|pane| {
-                pane.read(cx)
-                    .items_of_type::<SubView>()
-                    .position(|view| view.read(cx).view_kind() == item)
-                    .map(|view| (view, pane))
-            })
-            .unwrap();
-
-        pane.update(cx, |this, cx| {
-            this.activate_item(variable_list_position, true, true, window, cx);
-        });
-    }
-
-    #[cfg(test)]
-    pub(crate) fn variable_list(&self) -> &Entity<VariableList> {
-        &self.variable_list
-    }
-
-    #[cfg(test)]
-    pub(crate) fn serialized_layout(&self, cx: &App) -> SerializedLayout {
-        persistence::build_serialized_layout(&self.panes.root, self.dock_axis, cx)
-    }
-
-    pub fn capabilities(&self, cx: &App) -> Capabilities {
-        self.session().read(cx).capabilities().clone()
-    }
-
-    pub fn select_current_thread(
-        &mut self,
-        threads: &Vec<(Thread, ThreadStatus)>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let selected_thread = self
-            .thread_id
-            .and_then(|thread_id| threads.iter().find(|(thread, _)| thread.id == thread_id.0))
-            .or_else(|| threads.first());
-
-        let Some((selected_thread, _)) = selected_thread else {
-            return;
-        };
-
-        if Some(ThreadId(selected_thread.id)) != self.thread_id {
-            self.select_thread(ThreadId(selected_thread.id), window, cx);
-        }
-    }
-
-    pub fn selected_thread_id(&self) -> Option<ThreadId> {
-        self.thread_id
-    }
-
-    pub fn thread_status(&self, cx: &App) -> Option<ThreadStatus> {
-        self.thread_id
-            .map(|id| self.session().read(cx).thread_status(id))
-    }
-
-    pub(crate) fn select_thread(
-        &mut self,
-        thread_id: ThreadId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.thread_id.is_some_and(|id| id == thread_id) {
-            return;
-        }
-
-        self.thread_id = Some(thread_id);
-
-        self.stack_frame_list
-            .update(cx, |list, cx| list.schedule_refresh(true, window, cx));
-    }
-
-    pub fn continue_thread(&mut self, cx: &mut Context<Self>) {
-        let Some(thread_id) = self.thread_id else {
-            return;
-        };
-
-        self.session().update(cx, |state, cx| {
-            state.continue_thread(thread_id, cx);
-        });
-    }
-
-    pub fn step_over(&mut self, cx: &mut Context<Self>) {
-        let Some(thread_id) = self.thread_id else {
-            return;
-        };
-
-        let granularity = DebuggerSettings::get_global(cx).stepping_granularity;
-
-        self.session().update(cx, |state, cx| {
-            state.step_over(thread_id, granularity, cx);
-        });
-    }
-
-    pub(crate) fn step_in(&mut self, cx: &mut Context<Self>) {
-        let Some(thread_id) = self.thread_id else {
-            return;
-        };
-
-        let granularity = DebuggerSettings::get_global(cx).stepping_granularity;
-
-        self.session().update(cx, |state, cx| {
-            state.step_in(thread_id, granularity, cx);
-        });
-    }
-
-    pub(crate) fn step_out(&mut self, cx: &mut Context<Self>) {
-        let Some(thread_id) = self.thread_id else {
-            return;
-        };
-
-        let granularity = DebuggerSettings::get_global(cx).stepping_granularity;
-
-        self.session().update(cx, |state, cx| {
-            state.step_out(thread_id, granularity, cx);
-        });
-    }
-
-    pub(crate) fn step_back(&mut self, cx: &mut Context<Self>) {
-        let Some(thread_id) = self.thread_id else {
-            return;
-        };
-
-        let granularity = DebuggerSettings::get_global(cx).stepping_granularity;
-
-        self.session().update(cx, |state, cx| {
-            state.step_back(thread_id, granularity, cx);
-        });
-    }
-
-    pub fn rerun_session(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some((scenario, context)) = self.scenario.take().zip(self.scenario_context.take())
-            && scenario.build.is_some()
-        {
-            let DebugScenarioContext {
-                task_context,
-                active_buffer,
-                worktree_id,
-            } = context;
-            let active_buffer = active_buffer.and_then(|buffer| buffer.upgrade());
-
-            self.workspace
-                .update(cx, |workspace, cx| {
-                    workspace.start_debug_session(
-                        scenario,
-                        task_context,
-                        active_buffer,
-                        worktree_id,
-                        window,
-                        cx,
-                    )
-                })
-                .ok();
-        } else {
-            self.restart_session(cx);
-        }
-    }
-
-    pub fn restart_session(&self, cx: &mut Context<Self>) {
-        self.session().update(cx, |state, cx| {
-            state.restart(None, cx);
-        });
-    }
-
-    pub fn pause_thread(&self, cx: &mut Context<Self>) {
-        let Some(thread_id) = self.thread_id else {
-            return;
-        };
-
-        self.session().update(cx, |state, cx| {
-            state.pause_thread(thread_id, cx);
-        });
-    }
-
-    pub(crate) fn shutdown(&mut self, cx: &mut Context<Self>) {
-        self.workspace
-            .update(cx, |workspace, cx| {
-                workspace
-                    .project()
-                    .read(cx)
-                    .breakpoint_store()
-                    .update(cx, |store, cx| {
-                        store.remove_active_position(Some(self.session_id), cx)
-                    })
-            })
-            .log_err();
-
-        let is_building = self.session.update(cx, |session, cx| {
-            session.shutdown(cx).detach();
-            matches!(session.state, session::SessionState::Booting(_))
-        });
-
-        if is_building {
-            self.debug_terminal.update(cx, |terminal, cx| {
-                if let Some(view) = terminal.terminal.as_ref() {
-                    view.update(cx, |view, cx| {
-                        view.terminal()
-                            .update(cx, |terminal, _| terminal.kill_active_task())
-                    })
-                }
-            })
-        }
-    }
-
-    pub fn stop_thread(&self, cx: &mut Context<Self>) {
-        let Some(thread_id) = self.thread_id else {
-            return;
-        };
-
-        self.workspace
-            .update(cx, |workspace, cx| {
-                workspace
-                    .project()
-                    .read(cx)
-                    .breakpoint_store()
-                    .update(cx, |store, cx| {
-                        store.remove_active_position(Some(self.session_id), cx)
-                    })
-            })
-            .log_err();
-
-        self.session().update(cx, |state, cx| {
-            state.terminate_threads(Some(vec![thread_id; 1]), cx);
-        });
-    }
-
-    pub fn detach_client(&self, cx: &mut Context<Self>) {
-        self.session().update(cx, |state, cx| {
-            state.disconnect_client(cx);
-        });
-    }
-
-    pub fn toggle_ignore_breakpoints(&mut self, cx: &mut Context<Self>) {
-        self.session.update(cx, |session, cx| {
-            session.toggle_ignore_breakpoints(cx).detach();
-        });
-    }
-
-    fn default_pane_layout(
-        project: Entity<Project>,
-        workspace: &WeakEntity<Workspace>,
-        stack_frame_list: &Entity<StackFrameList>,
-        variable_list: &Entity<VariableList>,
-        console: &Entity<Console>,
-        breakpoints: &Entity<BreakpointList>,
-        debug_terminal: &Entity<DebugTerminal>,
-        dock_axis: Axis,
-        subscriptions: &mut HashMap<EntityId, Subscription>,
-        window: &mut Window,
-        cx: &mut Context<'_, RunningState>,
-    ) -> Member {
-        let leftmost_pane = new_debugger_pane(workspace.clone(), project.clone(), window, cx);
-        leftmost_pane.update(cx, |this, cx| {
-            this.add_item(
-                Box::new(SubView::new(
-                    this.focus_handle(cx),
-                    stack_frame_list.clone().into(),
-                    DebuggerPaneItem::Frames,
-                    cx,
-                )),
-                true,
-                false,
-                None,
-                window,
-                cx,
-            );
-            this.add_item(
-                Box::new(SubView::breakpoint_list(breakpoints.clone(), cx)),
-                true,
-                false,
-                None,
-                window,
-                cx,
-            );
-            this.activate_item(0, false, false, window, cx);
-        });
-        let center_pane = new_debugger_pane(workspace.clone(), project.clone(), window, cx);
-
-        center_pane.update(cx, |this, cx| {
-            let view = SubView::console(console.clone(), cx);
-
-            this.add_item(Box::new(view), true, false, None, window, cx);
-
-            this.add_item(
-                Box::new(SubView::new(
-                    variable_list.focus_handle(cx),
-                    variable_list.clone().into(),
-                    DebuggerPaneItem::Variables,
-                    cx,
-                )),
-                true,
-                false,
-                None,
-                window,
-                cx,
-            );
-            this.activate_item(0, false, false, window, cx);
-        });
-
-        let rightmost_pane = new_debugger_pane(workspace.clone(), project, window, cx);
-        rightmost_pane.update(cx, |this, cx| {
-            this.add_item(
-                Box::new(SubView::new(
-                    debug_terminal.focus_handle(cx),
-                    debug_terminal.clone().into(),
-                    DebuggerPaneItem::Terminal,
-                    cx,
-                )),
-                false,
-                false,
-                None,
-                window,
-                cx,
-            );
-        });
-
-        subscriptions.extend(
-            [&leftmost_pane, &center_pane, &rightmost_pane]
-                .into_iter()
-                .map(|entity| {
-                    (
-                        entity.entity_id(),
-                        cx.subscribe_in(entity, window, Self::handle_pane_event),
-                    )
-                }),
-        );
-
-        let group_root = workspace::PaneAxis::new(
-            dock_axis.invert(),
-            [leftmost_pane, center_pane, rightmost_pane]
-                .into_iter()
-                .map(workspace::Member::Pane)
-                .collect(),
-        );
-
-        Member::Axis(group_root)
-    }
-
-    pub(crate) fn invert_axies(&mut self) {
-        self.dock_axis = self.dock_axis.invert();
-        self.panes.invert_axies();
-    }
-}
-
-impl Focusable for RunningState {
-    fn focus_handle(&self, _: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
diff --git a/crates/debugger_ui/src/session/running/breakpoint_list.rs b/crates/debugger_ui/src/session/running/breakpoint_list.rs
deleted file mode 100644
index 2c7e207467..0000000000
--- a/crates/debugger_ui/src/session/running/breakpoint_list.rs
+++ /dev/null
@@ -1,1516 +0,0 @@
-use std::{
-    ops::Range,
-    path::{Path, PathBuf},
-    sync::Arc,
-    time::Duration,
-};
-
-use dap::{Capabilities, ExceptionBreakpointsFilter, adapters::DebugAdapterName};
-use db::kvp::KEY_VALUE_STORE;
-use editor::Editor;
-use gpui::{
-    Action, AppContext, ClickEvent, Entity, FocusHandle, Focusable, MouseButton, ScrollStrategy,
-    Task, UniformListScrollHandle, WeakEntity, actions, uniform_list,
-};
-use itertools::Itertools;
-use language::Point;
-use project::{
-    Project,
-    debugger::{
-        breakpoint_store::{BreakpointEditAction, BreakpointStore, SourceBreakpoint},
-        dap_store::{DapStore, PersistedAdapterOptions},
-        session::Session,
-    },
-    worktree_store::WorktreeStore,
-};
-use ui::{
-    Divider, DividerColor, FluentBuilder as _, Indicator, IntoElement, ListItem, Render,
-    ScrollAxes, StatefulInteractiveElement, Tooltip, WithScrollbar, prelude::*,
-};
-use util::rel_path::RelPath;
-use workspace::Workspace;
-use zed_actions::{ToggleEnableBreakpoint, UnsetBreakpoint};
-
-actions!(
-    debugger,
-    [
-        /// Navigates to the previous breakpoint property in the list.
-        PreviousBreakpointProperty,
-        /// Navigates to the next breakpoint property in the list.
-        NextBreakpointProperty
-    ]
-);
-#[derive(Clone, Copy, PartialEq)]
-pub(crate) enum SelectedBreakpointKind {
-    Source,
-    Exception,
-    Data,
-}
-pub(crate) struct BreakpointList {
-    workspace: WeakEntity<Workspace>,
-    breakpoint_store: Entity<BreakpointStore>,
-    dap_store: Entity<DapStore>,
-    worktree_store: Entity<WorktreeStore>,
-    breakpoints: Vec<BreakpointEntry>,
-    session: Option<Entity<Session>>,
-    focus_handle: FocusHandle,
-    scroll_handle: UniformListScrollHandle,
-    selected_ix: Option<usize>,
-    max_width_index: Option<usize>,
-    input: Entity<Editor>,
-    strip_mode: Option<ActiveBreakpointStripMode>,
-    serialize_exception_breakpoints_task: Option<Task<anyhow::Result<()>>>,
-}
-
-impl Focusable for BreakpointList {
-    fn focus_handle(&self, _: &App) -> gpui::FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-#[derive(Clone, Copy, PartialEq)]
-enum ActiveBreakpointStripMode {
-    Log,
-    Condition,
-    HitCondition,
-}
-
-impl BreakpointList {
-    pub(crate) fn new(
-        session: Option<Entity<Session>>,
-        workspace: WeakEntity<Workspace>,
-        project: &Entity<Project>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Entity<Self> {
-        let project = project.read(cx);
-        let breakpoint_store = project.breakpoint_store();
-        let worktree_store = project.worktree_store();
-        let dap_store = project.dap_store();
-        let focus_handle = cx.focus_handle();
-        let scroll_handle = UniformListScrollHandle::new();
-
-        let adapter_name = session.as_ref().map(|session| session.read(cx).adapter());
-        cx.new(|cx| {
-            let this = Self {
-                breakpoint_store,
-                dap_store,
-                worktree_store,
-                breakpoints: Default::default(),
-                max_width_index: None,
-                workspace,
-                session,
-                focus_handle,
-                scroll_handle,
-                selected_ix: None,
-                input: cx.new(|cx| Editor::single_line(window, cx)),
-                strip_mode: None,
-                serialize_exception_breakpoints_task: None,
-            };
-            if let Some(name) = adapter_name {
-                _ = this.deserialize_exception_breakpoints(name, cx);
-            }
-            this
-        })
-    }
-
-    fn edit_line_breakpoint(
-        &self,
-        path: Arc<Path>,
-        row: u32,
-        action: BreakpointEditAction,
-        cx: &mut App,
-    ) {
-        Self::edit_line_breakpoint_inner(&self.breakpoint_store, path, row, action, cx);
-    }
-    fn edit_line_breakpoint_inner(
-        breakpoint_store: &Entity<BreakpointStore>,
-        path: Arc<Path>,
-        row: u32,
-        action: BreakpointEditAction,
-        cx: &mut App,
-    ) {
-        breakpoint_store.update(cx, |breakpoint_store, cx| {
-            if let Some((buffer, breakpoint)) = breakpoint_store.breakpoint_at_row(&path, row, cx) {
-                breakpoint_store.toggle_breakpoint(buffer, breakpoint, action, cx);
-            } else {
-                log::error!("Couldn't find breakpoint at row event though it exists: row {row}")
-            }
-        })
-    }
-
-    fn go_to_line_breakpoint(
-        &mut self,
-        path: Arc<Path>,
-        row: u32,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let task = self
-            .worktree_store
-            .update(cx, |this, cx| this.find_or_create_worktree(path, false, cx));
-        cx.spawn_in(window, async move |this, cx| {
-            let (worktree, relative_path) = task.await?;
-            let worktree_id = worktree.read_with(cx, |this, _| this.id())?;
-            let item = this
-                .update_in(cx, |this, window, cx| {
-                    this.workspace.update(cx, |this, cx| {
-                        this.open_path((worktree_id, relative_path), None, true, window, cx)
-                    })
-                })??
-                .await?;
-            if let Some(editor) = item.downcast::<Editor>() {
-                editor
-                    .update_in(cx, |this, window, cx| {
-                        this.go_to_singleton_buffer_point(Point { row, column: 0 }, window, cx);
-                    })
-                    .ok();
-            }
-            anyhow::Ok(())
-        })
-        .detach();
-    }
-
-    pub(crate) fn selection_kind(&self) -> Option<(SelectedBreakpointKind, bool)> {
-        self.selected_ix.and_then(|ix| {
-            self.breakpoints.get(ix).map(|bp| match &bp.kind {
-                BreakpointEntryKind::LineBreakpoint(bp) => (
-                    SelectedBreakpointKind::Source,
-                    bp.breakpoint.state
-                        == project::debugger::breakpoint_store::BreakpointState::Enabled,
-                ),
-                BreakpointEntryKind::ExceptionBreakpoint(bp) => {
-                    (SelectedBreakpointKind::Exception, bp.is_enabled)
-                }
-                BreakpointEntryKind::DataBreakpoint(bp) => {
-                    (SelectedBreakpointKind::Data, bp.0.is_enabled)
-                }
-            })
-        })
-    }
-
-    fn set_active_breakpoint_property(
-        &mut self,
-        prop: ActiveBreakpointStripMode,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        self.strip_mode = Some(prop);
-        let placeholder = match prop {
-            ActiveBreakpointStripMode::Log => "Set Log Message",
-            ActiveBreakpointStripMode::Condition => "Set Condition",
-            ActiveBreakpointStripMode::HitCondition => "Set Hit Condition",
-        };
-        let mut is_exception_breakpoint = true;
-        let active_value = self.selected_ix.and_then(|ix| {
-            self.breakpoints.get(ix).and_then(|bp| {
-                if let BreakpointEntryKind::LineBreakpoint(bp) = &bp.kind {
-                    is_exception_breakpoint = false;
-                    match prop {
-                        ActiveBreakpointStripMode::Log => bp.breakpoint.message.clone(),
-                        ActiveBreakpointStripMode::Condition => bp.breakpoint.condition.clone(),
-                        ActiveBreakpointStripMode::HitCondition => {
-                            bp.breakpoint.hit_condition.clone()
-                        }
-                    }
-                } else {
-                    None
-                }
-            })
-        });
-
-        self.input.update(cx, |this, cx| {
-            this.set_placeholder_text(placeholder, window, cx);
-            this.set_read_only(is_exception_breakpoint);
-            this.set_text(active_value.as_deref().unwrap_or(""), window, cx);
-        });
-    }
-
-    fn select_ix(&mut self, ix: Option<usize>, window: &mut Window, cx: &mut Context<Self>) {
-        self.selected_ix = ix;
-        if let Some(ix) = ix {
-            self.scroll_handle
-                .scroll_to_item(ix, ScrollStrategy::Center);
-        }
-        if let Some(mode) = self.strip_mode {
-            self.set_active_breakpoint_property(mode, window, cx);
-        }
-
-        cx.notify();
-    }
-
-    fn select_next(&mut self, _: &menu::SelectNext, window: &mut Window, cx: &mut Context<Self>) {
-        if self.strip_mode.is_some() && self.input.focus_handle(cx).contains_focused(window, cx) {
-            cx.propagate();
-            return;
-        }
-        let ix = match self.selected_ix {
-            _ if self.breakpoints.is_empty() => None,
-            None => Some(0),
-            Some(ix) => {
-                if ix == self.breakpoints.len() - 1 {
-                    Some(0)
-                } else {
-                    Some(ix + 1)
-                }
-            }
-        };
-        self.select_ix(ix, window, cx);
-    }
-
-    fn select_previous(
-        &mut self,
-        _: &menu::SelectPrevious,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.strip_mode.is_some() && self.input.focus_handle(cx).contains_focused(window, cx) {
-            cx.propagate();
-            return;
-        }
-        let ix = match self.selected_ix {
-            _ if self.breakpoints.is_empty() => None,
-            None => Some(self.breakpoints.len() - 1),
-            Some(ix) => {
-                if ix == 0 {
-                    Some(self.breakpoints.len() - 1)
-                } else {
-                    Some(ix - 1)
-                }
-            }
-        };
-        self.select_ix(ix, window, cx);
-    }
-
-    fn select_first(&mut self, _: &menu::SelectFirst, window: &mut Window, cx: &mut Context<Self>) {
-        if self.strip_mode.is_some() && self.input.focus_handle(cx).contains_focused(window, cx) {
-            cx.propagate();
-            return;
-        }
-        let ix = if !self.breakpoints.is_empty() {
-            Some(0)
-        } else {
-            None
-        };
-        self.select_ix(ix, window, cx);
-    }
-
-    fn select_last(&mut self, _: &menu::SelectLast, window: &mut Window, cx: &mut Context<Self>) {
-        if self.strip_mode.is_some() && self.input.focus_handle(cx).contains_focused(window, cx) {
-            cx.propagate();
-            return;
-        }
-        let ix = if !self.breakpoints.is_empty() {
-            Some(self.breakpoints.len() - 1)
-        } else {
-            None
-        };
-        self.select_ix(ix, window, cx);
-    }
-
-    fn dismiss(&mut self, _: &menu::Cancel, window: &mut Window, cx: &mut Context<Self>) {
-        if self.input.focus_handle(cx).contains_focused(window, cx) {
-            self.focus_handle.focus(window);
-        } else if self.strip_mode.is_some() {
-            self.strip_mode.take();
-            cx.notify();
-        } else {
-            cx.propagate();
-        }
-    }
-    fn confirm(&mut self, _: &menu::Confirm, window: &mut Window, cx: &mut Context<Self>) {
-        let Some(entry) = self.selected_ix.and_then(|ix| self.breakpoints.get_mut(ix)) else {
-            return;
-        };
-
-        if let Some(mode) = self.strip_mode {
-            let handle = self.input.focus_handle(cx);
-            if handle.is_focused(window) {
-                // Go back to the main strip. Save the result as well.
-                let text = self.input.read(cx).text(cx);
-
-                match mode {
-                    ActiveBreakpointStripMode::Log => {
-                        if let BreakpointEntryKind::LineBreakpoint(line_breakpoint) = &entry.kind {
-                            Self::edit_line_breakpoint_inner(
-                                &self.breakpoint_store,
-                                line_breakpoint.breakpoint.path.clone(),
-                                line_breakpoint.breakpoint.row,
-                                BreakpointEditAction::EditLogMessage(Arc::from(text)),
-                                cx,
-                            );
-                        }
-                    }
-                    ActiveBreakpointStripMode::Condition => {
-                        if let BreakpointEntryKind::LineBreakpoint(line_breakpoint) = &entry.kind {
-                            Self::edit_line_breakpoint_inner(
-                                &self.breakpoint_store,
-                                line_breakpoint.breakpoint.path.clone(),
-                                line_breakpoint.breakpoint.row,
-                                BreakpointEditAction::EditCondition(Arc::from(text)),
-                                cx,
-                            );
-                        }
-                    }
-                    ActiveBreakpointStripMode::HitCondition => {
-                        if let BreakpointEntryKind::LineBreakpoint(line_breakpoint) = &entry.kind {
-                            Self::edit_line_breakpoint_inner(
-                                &self.breakpoint_store,
-                                line_breakpoint.breakpoint.path.clone(),
-                                line_breakpoint.breakpoint.row,
-                                BreakpointEditAction::EditHitCondition(Arc::from(text)),
-                                cx,
-                            );
-                        }
-                    }
-                }
-                self.focus_handle.focus(window);
-            } else {
-                handle.focus(window);
-            }
-
-            return;
-        }
-        match &mut entry.kind {
-            BreakpointEntryKind::LineBreakpoint(line_breakpoint) => {
-                let path = line_breakpoint.breakpoint.path.clone();
-                let row = line_breakpoint.breakpoint.row;
-                self.go_to_line_breakpoint(path, row, window, cx);
-            }
-            BreakpointEntryKind::DataBreakpoint(_)
-            | BreakpointEntryKind::ExceptionBreakpoint(_) => {}
-        }
-    }
-
-    fn toggle_enable_breakpoint(
-        &mut self,
-        _: &ToggleEnableBreakpoint,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(entry) = self.selected_ix.and_then(|ix| self.breakpoints.get_mut(ix)) else {
-            return;
-        };
-        if self.strip_mode.is_some() && self.input.focus_handle(cx).contains_focused(window, cx) {
-            cx.propagate();
-            return;
-        }
-
-        match &mut entry.kind {
-            BreakpointEntryKind::LineBreakpoint(line_breakpoint) => {
-                let path = line_breakpoint.breakpoint.path.clone();
-                let row = line_breakpoint.breakpoint.row;
-                self.edit_line_breakpoint(path, row, BreakpointEditAction::InvertState, cx);
-            }
-            BreakpointEntryKind::ExceptionBreakpoint(exception_breakpoint) => {
-                let id = exception_breakpoint.id.clone();
-                self.toggle_exception_breakpoint(&id, cx);
-            }
-            BreakpointEntryKind::DataBreakpoint(data_breakpoint) => {
-                let id = data_breakpoint.0.dap.data_id.clone();
-                self.toggle_data_breakpoint(&id, cx);
-            }
-        }
-        cx.notify();
-    }
-
-    fn unset_breakpoint(
-        &mut self,
-        _: &UnsetBreakpoint,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(entry) = self.selected_ix.and_then(|ix| self.breakpoints.get_mut(ix)) else {
-            return;
-        };
-
-        if let BreakpointEntryKind::LineBreakpoint(line_breakpoint) = &mut entry.kind {
-            let path = line_breakpoint.breakpoint.path.clone();
-            let row = line_breakpoint.breakpoint.row;
-            self.edit_line_breakpoint(path, row, BreakpointEditAction::Toggle, cx);
-        }
-        cx.notify();
-    }
-
-    fn previous_breakpoint_property(
-        &mut self,
-        _: &PreviousBreakpointProperty,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let next_mode = match self.strip_mode {
-            Some(ActiveBreakpointStripMode::Log) => None,
-            Some(ActiveBreakpointStripMode::Condition) => Some(ActiveBreakpointStripMode::Log),
-            Some(ActiveBreakpointStripMode::HitCondition) => {
-                Some(ActiveBreakpointStripMode::Condition)
-            }
-            None => Some(ActiveBreakpointStripMode::HitCondition),
-        };
-        if let Some(mode) = next_mode {
-            self.set_active_breakpoint_property(mode, window, cx);
-        } else {
-            self.strip_mode.take();
-        }
-
-        cx.notify();
-    }
-    fn next_breakpoint_property(
-        &mut self,
-        _: &NextBreakpointProperty,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let next_mode = match self.strip_mode {
-            Some(ActiveBreakpointStripMode::Log) => Some(ActiveBreakpointStripMode::Condition),
-            Some(ActiveBreakpointStripMode::Condition) => {
-                Some(ActiveBreakpointStripMode::HitCondition)
-            }
-            Some(ActiveBreakpointStripMode::HitCondition) => None,
-            None => Some(ActiveBreakpointStripMode::Log),
-        };
-        if let Some(mode) = next_mode {
-            self.set_active_breakpoint_property(mode, window, cx);
-        } else {
-            self.strip_mode.take();
-        }
-        cx.notify();
-    }
-
-    fn toggle_data_breakpoint(&mut self, id: &str, cx: &mut Context<Self>) {
-        if let Some(session) = &self.session {
-            session.update(cx, |this, cx| {
-                this.toggle_data_breakpoint(id, cx);
-            });
-        }
-    }
-
-    fn toggle_exception_breakpoint(&mut self, id: &str, cx: &mut Context<Self>) {
-        if let Some(session) = &self.session {
-            session.update(cx, |this, cx| {
-                this.toggle_exception_breakpoint(id, cx);
-            });
-            cx.notify();
-            const EXCEPTION_SERIALIZATION_INTERVAL: Duration = Duration::from_secs(1);
-            self.serialize_exception_breakpoints_task = Some(cx.spawn(async move |this, cx| {
-                cx.background_executor()
-                    .timer(EXCEPTION_SERIALIZATION_INTERVAL)
-                    .await;
-                this.update(cx, |this, cx| this.serialize_exception_breakpoints(cx))?
-                    .await?;
-                Ok(())
-            }));
-        }
-    }
-
-    fn kvp_key(adapter_name: &str) -> String {
-        format!("debug_adapter_`{adapter_name}`_persistence")
-    }
-    fn serialize_exception_breakpoints(
-        &mut self,
-        cx: &mut Context<Self>,
-    ) -> Task<anyhow::Result<()>> {
-        if let Some(session) = self.session.as_ref() {
-            let key = {
-                let session = session.read(cx);
-                let name = session.adapter().0;
-                Self::kvp_key(&name)
-            };
-            let settings = self.dap_store.update(cx, |this, cx| {
-                this.sync_adapter_options(session, cx);
-            });
-            let value = serde_json::to_string(&settings);
-
-            cx.background_executor()
-                .spawn(async move { KEY_VALUE_STORE.write_kvp(key, value?).await })
-        } else {
-            Task::ready(Result::Ok(()))
-        }
-    }
-
-    fn deserialize_exception_breakpoints(
-        &self,
-        adapter_name: DebugAdapterName,
-        cx: &mut Context<Self>,
-    ) -> anyhow::Result<()> {
-        let Some(val) = KEY_VALUE_STORE.read_kvp(&Self::kvp_key(&adapter_name))? else {
-            return Ok(());
-        };
-        let value: PersistedAdapterOptions = serde_json::from_str(&val)?;
-        self.dap_store
-            .update(cx, |this, _| this.set_adapter_options(adapter_name, value));
-
-        Ok(())
-    }
-
-    fn render_list(&mut self, cx: &mut Context<Self>) -> impl IntoElement {
-        let selected_ix = self.selected_ix;
-        let focus_handle = self.focus_handle.clone();
-        let supported_breakpoint_properties = self
-            .session
-            .as_ref()
-            .map(|session| SupportedBreakpointProperties::from(session.read(cx).capabilities()))
-            .unwrap_or_else(SupportedBreakpointProperties::all);
-        let strip_mode = self.strip_mode;
-
-        uniform_list(
-            "breakpoint-list",
-            self.breakpoints.len(),
-            cx.processor(move |this, range: Range<usize>, _, _| {
-                range
-                    .clone()
-                    .zip(&mut this.breakpoints[range])
-                    .map(|(ix, breakpoint)| {
-                        breakpoint
-                            .render(
-                                strip_mode,
-                                supported_breakpoint_properties,
-                                ix,
-                                Some(ix) == selected_ix,
-                                focus_handle.clone(),
-                            )
-                            .into_any_element()
-                    })
-                    .collect()
-            }),
-        )
-        .with_horizontal_sizing_behavior(gpui::ListHorizontalSizingBehavior::Unconstrained)
-        .with_width_from_item(self.max_width_index)
-        .track_scroll(&self.scroll_handle)
-        .flex_1()
-    }
-
-    pub(crate) fn render_control_strip(&self) -> AnyElement {
-        let selection_kind = self.selection_kind();
-        let focus_handle = self.focus_handle.clone();
-
-        let remove_breakpoint_tooltip = selection_kind.map(|(kind, _)| match kind {
-            SelectedBreakpointKind::Source => "Remove breakpoint from a breakpoint list",
-            SelectedBreakpointKind::Exception => {
-                "Exception Breakpoints cannot be removed from the breakpoint list"
-            }
-            SelectedBreakpointKind::Data => "Remove data breakpoint from a breakpoint list",
-        });
-
-        let toggle_label = selection_kind.map(|(_, is_enabled)| {
-            if is_enabled {
-                (
-                    "Disable Breakpoint",
-                    "Disable a breakpoint without removing it from the list",
-                )
-            } else {
-                ("Enable Breakpoint", "Re-enable a breakpoint")
-            }
-        });
-
-        h_flex()
-            .child(
-                IconButton::new(
-                    "disable-breakpoint-breakpoint-list",
-                    IconName::DebugDisabledBreakpoint,
-                )
-                .icon_size(IconSize::Small)
-                .when_some(toggle_label, |this, (label, meta)| {
-                    this.tooltip({
-                        let focus_handle = focus_handle.clone();
-                        move |_window, cx| {
-                            Tooltip::with_meta_in(
-                                label,
-                                Some(&ToggleEnableBreakpoint),
-                                meta,
-                                &focus_handle,
-                                cx,
-                            )
-                        }
-                    })
-                })
-                .disabled(selection_kind.is_none())
-                .on_click({
-                    let focus_handle = focus_handle.clone();
-                    move |_, window, cx| {
-                        focus_handle.focus(window);
-                        window.dispatch_action(ToggleEnableBreakpoint.boxed_clone(), cx)
-                    }
-                }),
-            )
-            .child(
-                IconButton::new("remove-breakpoint-breakpoint-list", IconName::Trash)
-                    .icon_size(IconSize::Small)
-                    .when_some(remove_breakpoint_tooltip, |this, tooltip| {
-                        this.tooltip({
-                            let focus_handle = focus_handle.clone();
-                            move |_window, cx| {
-                                Tooltip::with_meta_in(
-                                    "Remove Breakpoint",
-                                    Some(&UnsetBreakpoint),
-                                    tooltip,
-                                    &focus_handle,
-                                    cx,
-                                )
-                            }
-                        })
-                    })
-                    .disabled(
-                        selection_kind.map(|kind| kind.0) != Some(SelectedBreakpointKind::Source),
-                    )
-                    .on_click({
-                        move |_, window, cx| {
-                            focus_handle.focus(window);
-                            window.dispatch_action(UnsetBreakpoint.boxed_clone(), cx)
-                        }
-                    }),
-            )
-            .into_any_element()
-    }
-}
-
-impl Render for BreakpointList {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl ui::IntoElement {
-        let breakpoints = self.breakpoint_store.read(cx).all_source_breakpoints(cx);
-        self.breakpoints.clear();
-        let path_style = self.worktree_store.read(cx).path_style();
-        let weak = cx.weak_entity();
-        let breakpoints = breakpoints.into_iter().flat_map(|(path, mut breakpoints)| {
-            let relative_worktree_path = self
-                .worktree_store
-                .read(cx)
-                .find_worktree(&path, cx)
-                .and_then(|(worktree, relative_path)| {
-                    worktree
-                        .read(cx)
-                        .is_visible()
-                        .then(|| worktree.read(cx).root_name().join(&relative_path))
-                });
-            breakpoints.sort_by_key(|breakpoint| breakpoint.row);
-            let weak = weak.clone();
-            breakpoints.into_iter().filter_map(move |breakpoint| {
-                debug_assert_eq!(&path, &breakpoint.path);
-                let file_name = breakpoint.path.file_name()?;
-                let breakpoint_path = RelPath::new(&breakpoint.path, path_style).ok();
-
-                let dir = relative_worktree_path
-                    .as_deref()
-                    .or(breakpoint_path.as_deref())?
-                    .parent()
-                    .map(|parent| SharedString::from(parent.display(path_style).to_string()));
-                let name = file_name
-                    .to_str()
-                    .map(ToOwned::to_owned)
-                    .map(SharedString::from)?;
-                let weak = weak.clone();
-                let line = breakpoint.row + 1;
-                Some(BreakpointEntry {
-                    kind: BreakpointEntryKind::LineBreakpoint(LineBreakpoint {
-                        name,
-                        dir,
-                        line,
-                        breakpoint,
-                    }),
-                    weak,
-                })
-            })
-        });
-        let exception_breakpoints = self.session.as_ref().into_iter().flat_map(|session| {
-            session
-                .read(cx)
-                .exception_breakpoints()
-                .map(|(data, is_enabled)| BreakpointEntry {
-                    kind: BreakpointEntryKind::ExceptionBreakpoint(ExceptionBreakpoint {
-                        id: data.filter.clone(),
-                        data: data.clone(),
-                        is_enabled: *is_enabled,
-                    }),
-                    weak: weak.clone(),
-                })
-        });
-        let data_breakpoints = self.session.as_ref().into_iter().flat_map(|session| {
-            session
-                .read(cx)
-                .data_breakpoints()
-                .map(|state| BreakpointEntry {
-                    kind: BreakpointEntryKind::DataBreakpoint(DataBreakpoint(state.clone())),
-                    weak: weak.clone(),
-                })
-        });
-        self.breakpoints.extend(
-            breakpoints
-                .chain(data_breakpoints)
-                .chain(exception_breakpoints),
-        );
-
-        let text_pixels = ui::TextSize::Default.pixels(cx).to_f64() as f32;
-
-        self.max_width_index = self
-            .breakpoints
-            .iter()
-            .map(|entry| match &entry.kind {
-                BreakpointEntryKind::LineBreakpoint(line_bp) => {
-                    let name_and_line = format!("{}:{}", line_bp.name, line_bp.line);
-                    let dir_len = line_bp.dir.as_ref().map(|d| d.len()).unwrap_or(0);
-                    (name_and_line.len() + dir_len) as f32 * text_pixels
-                }
-                BreakpointEntryKind::ExceptionBreakpoint(exc_bp) => {
-                    exc_bp.data.label.len() as f32 * text_pixels
-                }
-                BreakpointEntryKind::DataBreakpoint(data_bp) => {
-                    data_bp.0.context.human_readable_label().len() as f32 * text_pixels
-                }
-            })
-            .position_max_by(|left, right| left.total_cmp(right));
-
-        v_flex()
-            .id("breakpoint-list")
-            .key_context("BreakpointList")
-            .track_focus(&self.focus_handle)
-            .on_action(cx.listener(Self::select_next))
-            .on_action(cx.listener(Self::select_previous))
-            .on_action(cx.listener(Self::select_first))
-            .on_action(cx.listener(Self::select_last))
-            .on_action(cx.listener(Self::dismiss))
-            .on_action(cx.listener(Self::confirm))
-            .on_action(cx.listener(Self::toggle_enable_breakpoint))
-            .on_action(cx.listener(Self::unset_breakpoint))
-            .on_action(cx.listener(Self::next_breakpoint_property))
-            .on_action(cx.listener(Self::previous_breakpoint_property))
-            .size_full()
-            .pt_1()
-            .child(self.render_list(cx))
-            .custom_scrollbars(
-                ui::Scrollbars::new(ScrollAxes::Both)
-                    .tracked_scroll_handle(&self.scroll_handle)
-                    .with_track_along(ScrollAxes::Both, cx.theme().colors().panel_background)
-                    .tracked_entity(cx.entity_id()),
-                window,
-                cx,
-            )
-            .when_some(self.strip_mode, |this, _| {
-                this.child(Divider::horizontal().color(DividerColor::Border))
-                    .child(
-                        h_flex()
-                            .p_1()
-                            .rounded_sm()
-                            .bg(cx.theme().colors().editor_background)
-                            .border_1()
-                            .when(
-                                self.input.focus_handle(cx).contains_focused(window, cx),
-                                |this| {
-                                    let colors = cx.theme().colors();
-
-                                    let border_color = if self.input.read(cx).read_only(cx) {
-                                        colors.border_disabled
-                                    } else {
-                                        colors.border_transparent
-                                    };
-
-                                    this.border_color(border_color)
-                                },
-                            )
-                            .child(self.input.clone()),
-                    )
-            })
-    }
-}
-
-#[derive(Clone, Debug)]
-struct LineBreakpoint {
-    name: SharedString,
-    dir: Option<SharedString>,
-    line: u32,
-    breakpoint: SourceBreakpoint,
-}
-
-impl LineBreakpoint {
-    fn render(
-        &mut self,
-        props: SupportedBreakpointProperties,
-        strip_mode: Option<ActiveBreakpointStripMode>,
-        ix: usize,
-        is_selected: bool,
-        focus_handle: FocusHandle,
-        weak: WeakEntity<BreakpointList>,
-    ) -> ListItem {
-        let icon_name = if self.breakpoint.state.is_enabled() {
-            IconName::DebugBreakpoint
-        } else {
-            IconName::DebugDisabledBreakpoint
-        };
-        let path = self.breakpoint.path.clone();
-        let row = self.breakpoint.row;
-        let is_enabled = self.breakpoint.state.is_enabled();
-
-        let indicator = div()
-            .id(SharedString::from(format!(
-                "breakpoint-ui-toggle-{:?}/{}:{}",
-                self.dir, self.name, self.line
-            )))
-            .child(
-                Icon::new(icon_name)
-                    .color(Color::Debugger)
-                    .size(IconSize::XSmall),
-            )
-            .tooltip({
-                let focus_handle = focus_handle.clone();
-                move |_window, cx| {
-                    Tooltip::for_action_in(
-                        if is_enabled {
-                            "Disable Breakpoint"
-                        } else {
-                            "Enable Breakpoint"
-                        },
-                        &ToggleEnableBreakpoint,
-                        &focus_handle,
-                        cx,
-                    )
-                }
-            })
-            .on_click({
-                let weak = weak.clone();
-                let path = path.clone();
-                move |_, _, cx| {
-                    weak.update(cx, |breakpoint_list, cx| {
-                        breakpoint_list.edit_line_breakpoint(
-                            path.clone(),
-                            row,
-                            BreakpointEditAction::InvertState,
-                            cx,
-                        );
-                    })
-                    .ok();
-                }
-            })
-            .on_mouse_down(MouseButton::Left, move |_, _, _| {});
-
-        ListItem::new(SharedString::from(format!(
-            "breakpoint-ui-item-{:?}/{}:{}",
-            self.dir, self.name, self.line
-        )))
-        .toggle_state(is_selected)
-        .inset(true)
-        .on_click({
-            let weak = weak.clone();
-            move |_, window, cx| {
-                weak.update(cx, |breakpoint_list, cx| {
-                    breakpoint_list.select_ix(Some(ix), window, cx);
-                })
-                .ok();
-            }
-        })
-        .on_secondary_mouse_down(|_, _, cx| {
-            cx.stop_propagation();
-        })
-        .start_slot(indicator)
-        .child(
-            h_flex()
-                .id(SharedString::from(format!(
-                    "breakpoint-ui-on-click-go-to-line-{:?}/{}:{}",
-                    self.dir, self.name, self.line
-                )))
-                .w_full()
-                .gap_1()
-                .min_h(rems_from_px(26.))
-                .justify_between()
-                .on_click({
-                    let weak = weak.clone();
-                    move |_, window, cx| {
-                        weak.update(cx, |breakpoint_list, cx| {
-                            breakpoint_list.select_ix(Some(ix), window, cx);
-                            breakpoint_list.go_to_line_breakpoint(path.clone(), row, window, cx);
-                        })
-                        .ok();
-                    }
-                })
-                .child(
-                    h_flex()
-                        .id("label-container")
-                        .gap_0p5()
-                        .child(
-                            Label::new(format!("{}:{}", self.name, self.line))
-                                .size(LabelSize::Small)
-                                .line_height_style(ui::LineHeightStyle::UiLabel),
-                        )
-                        .children(self.dir.as_ref().and_then(|dir| {
-                            let path_without_root = Path::new(dir.as_ref())
-                                .components()
-                                .skip(1)
-                                .collect::<PathBuf>();
-                            path_without_root.components().next()?;
-                            Some(
-                                Label::new(path_without_root.to_string_lossy().into_owned())
-                                    .color(Color::Muted)
-                                    .size(LabelSize::Small)
-                                    .line_height_style(ui::LineHeightStyle::UiLabel)
-                                    .truncate(),
-                            )
-                        }))
-                        .when_some(self.dir.as_ref(), |this, parent_dir| {
-                            this.tooltip(Tooltip::text(format!(
-                                "Worktree parent path: {parent_dir}"
-                            )))
-                        }),
-                )
-                .child(BreakpointOptionsStrip {
-                    props,
-                    breakpoint: BreakpointEntry {
-                        kind: BreakpointEntryKind::LineBreakpoint(self.clone()),
-                        weak,
-                    },
-                    is_selected,
-                    focus_handle,
-                    strip_mode,
-                    index: ix,
-                }),
-        )
-    }
-}
-
-#[derive(Clone, Debug)]
-struct ExceptionBreakpoint {
-    id: String,
-    data: ExceptionBreakpointsFilter,
-    is_enabled: bool,
-}
-
-#[derive(Clone, Debug)]
-struct DataBreakpoint(project::debugger::session::DataBreakpointState);
-
-impl DataBreakpoint {
-    fn render(
-        &self,
-        props: SupportedBreakpointProperties,
-        strip_mode: Option<ActiveBreakpointStripMode>,
-        ix: usize,
-        is_selected: bool,
-        focus_handle: FocusHandle,
-        list: WeakEntity<BreakpointList>,
-    ) -> ListItem {
-        let color = if self.0.is_enabled {
-            Color::Debugger
-        } else {
-            Color::Muted
-        };
-        let is_enabled = self.0.is_enabled;
-        let id = self.0.dap.data_id.clone();
-
-        ListItem::new(SharedString::from(format!(
-            "data-breakpoint-ui-item-{}",
-            self.0.dap.data_id
-        )))
-        .toggle_state(is_selected)
-        .inset(true)
-        .start_slot(
-            div()
-                .id(SharedString::from(format!(
-                    "data-breakpoint-ui-item-{}-click-handler",
-                    self.0.dap.data_id
-                )))
-                .child(
-                    Icon::new(IconName::Binary)
-                        .color(color)
-                        .size(IconSize::Small),
-                )
-                .tooltip({
-                    let focus_handle = focus_handle.clone();
-                    move |_window, cx| {
-                        Tooltip::for_action_in(
-                            if is_enabled {
-                                "Disable Data Breakpoint"
-                            } else {
-                                "Enable Data Breakpoint"
-                            },
-                            &ToggleEnableBreakpoint,
-                            &focus_handle,
-                            cx,
-                        )
-                    }
-                })
-                .on_click({
-                    let list = list.clone();
-                    move |_, _, cx| {
-                        list.update(cx, |this, cx| {
-                            this.toggle_data_breakpoint(&id, cx);
-                        })
-                        .ok();
-                    }
-                }),
-        )
-        .child(
-            h_flex()
-                .w_full()
-                .gap_1()
-                .min_h(rems_from_px(26.))
-                .justify_between()
-                .child(
-                    v_flex()
-                        .py_1()
-                        .gap_1()
-                        .justify_center()
-                        .id(("data-breakpoint-label", ix))
-                        .child(
-                            Label::new(self.0.context.human_readable_label())
-                                .size(LabelSize::Small)
-                                .line_height_style(ui::LineHeightStyle::UiLabel),
-                        ),
-                )
-                .child(BreakpointOptionsStrip {
-                    props,
-                    breakpoint: BreakpointEntry {
-                        kind: BreakpointEntryKind::DataBreakpoint(self.clone()),
-                        weak: list,
-                    },
-                    is_selected,
-                    focus_handle,
-                    strip_mode,
-                    index: ix,
-                }),
-        )
-    }
-}
-
-impl ExceptionBreakpoint {
-    fn render(
-        &mut self,
-        props: SupportedBreakpointProperties,
-        strip_mode: Option<ActiveBreakpointStripMode>,
-        ix: usize,
-        is_selected: bool,
-        focus_handle: FocusHandle,
-        list: WeakEntity<BreakpointList>,
-    ) -> ListItem {
-        let color = if self.is_enabled {
-            Color::Debugger
-        } else {
-            Color::Muted
-        };
-        let id = SharedString::from(&self.id);
-        let is_enabled = self.is_enabled;
-        let weak = list.clone();
-
-        ListItem::new(SharedString::from(format!(
-            "exception-breakpoint-ui-item-{}",
-            self.id
-        )))
-        .toggle_state(is_selected)
-        .inset(true)
-        .on_click({
-            let list = list.clone();
-            move |_, window, cx| {
-                list.update(cx, |list, cx| list.select_ix(Some(ix), window, cx))
-                    .ok();
-            }
-        })
-        .on_secondary_mouse_down(|_, _, cx| {
-            cx.stop_propagation();
-        })
-        .start_slot(
-            div()
-                .id(SharedString::from(format!(
-                    "exception-breakpoint-ui-item-{}-click-handler",
-                    self.id
-                )))
-                .child(
-                    Icon::new(IconName::Flame)
-                        .color(color)
-                        .size(IconSize::Small),
-                )
-                .tooltip({
-                    let focus_handle = focus_handle.clone();
-                    move |_window, cx| {
-                        Tooltip::for_action_in(
-                            if is_enabled {
-                                "Disable Exception Breakpoint"
-                            } else {
-                                "Enable Exception Breakpoint"
-                            },
-                            &ToggleEnableBreakpoint,
-                            &focus_handle,
-                            cx,
-                        )
-                    }
-                })
-                .on_click({
-                    move |_, _, cx| {
-                        list.update(cx, |this, cx| {
-                            this.toggle_exception_breakpoint(&id, cx);
-                        })
-                        .ok();
-                    }
-                }),
-        )
-        .child(
-            h_flex()
-                .w_full()
-                .gap_1()
-                .min_h(rems_from_px(26.))
-                .justify_between()
-                .child(
-                    v_flex()
-                        .py_1()
-                        .gap_1()
-                        .justify_center()
-                        .id(("exception-breakpoint-label", ix))
-                        .child(
-                            Label::new(self.data.label.clone())
-                                .size(LabelSize::Small)
-                                .line_height_style(ui::LineHeightStyle::UiLabel),
-                        )
-                        .when_some(self.data.description.clone(), |el, description| {
-                            el.tooltip(Tooltip::text(description))
-                        }),
-                )
-                .child(BreakpointOptionsStrip {
-                    props,
-                    breakpoint: BreakpointEntry {
-                        kind: BreakpointEntryKind::ExceptionBreakpoint(self.clone()),
-                        weak,
-                    },
-                    is_selected,
-                    focus_handle,
-                    strip_mode,
-                    index: ix,
-                }),
-        )
-    }
-}
-#[derive(Clone, Debug)]
-enum BreakpointEntryKind {
-    LineBreakpoint(LineBreakpoint),
-    ExceptionBreakpoint(ExceptionBreakpoint),
-    DataBreakpoint(DataBreakpoint),
-}
-
-#[derive(Clone, Debug)]
-struct BreakpointEntry {
-    kind: BreakpointEntryKind,
-    weak: WeakEntity<BreakpointList>,
-}
-
-impl BreakpointEntry {
-    fn render(
-        &mut self,
-        strip_mode: Option<ActiveBreakpointStripMode>,
-        props: SupportedBreakpointProperties,
-        ix: usize,
-        is_selected: bool,
-        focus_handle: FocusHandle,
-    ) -> ListItem {
-        match &mut self.kind {
-            BreakpointEntryKind::LineBreakpoint(line_breakpoint) => line_breakpoint.render(
-                props,
-                strip_mode,
-                ix,
-                is_selected,
-                focus_handle,
-                self.weak.clone(),
-            ),
-            BreakpointEntryKind::ExceptionBreakpoint(exception_breakpoint) => exception_breakpoint
-                .render(
-                    props.for_exception_breakpoints(),
-                    strip_mode,
-                    ix,
-                    is_selected,
-                    focus_handle,
-                    self.weak.clone(),
-                ),
-            BreakpointEntryKind::DataBreakpoint(data_breakpoint) => data_breakpoint.render(
-                props.for_data_breakpoints(),
-                strip_mode,
-                ix,
-                is_selected,
-                focus_handle,
-                self.weak.clone(),
-            ),
-        }
-    }
-
-    fn id(&self) -> SharedString {
-        match &self.kind {
-            BreakpointEntryKind::LineBreakpoint(line_breakpoint) => format!(
-                "source-breakpoint-control-strip-{:?}:{}",
-                line_breakpoint.breakpoint.path, line_breakpoint.breakpoint.row
-            )
-            .into(),
-            BreakpointEntryKind::ExceptionBreakpoint(exception_breakpoint) => format!(
-                "exception-breakpoint-control-strip--{}",
-                exception_breakpoint.id
-            )
-            .into(),
-            BreakpointEntryKind::DataBreakpoint(data_breakpoint) => format!(
-                "data-breakpoint-control-strip--{}",
-                data_breakpoint.0.dap.data_id
-            )
-            .into(),
-        }
-    }
-
-    fn has_log(&self) -> bool {
-        match &self.kind {
-            BreakpointEntryKind::LineBreakpoint(line_breakpoint) => {
-                line_breakpoint.breakpoint.message.is_some()
-            }
-            _ => false,
-        }
-    }
-
-    fn has_condition(&self) -> bool {
-        match &self.kind {
-            BreakpointEntryKind::LineBreakpoint(line_breakpoint) => {
-                line_breakpoint.breakpoint.condition.is_some()
-            }
-            // We don't support conditions on exception/data breakpoints
-            _ => false,
-        }
-    }
-
-    fn has_hit_condition(&self) -> bool {
-        match &self.kind {
-            BreakpointEntryKind::LineBreakpoint(line_breakpoint) => {
-                line_breakpoint.breakpoint.hit_condition.is_some()
-            }
-            _ => false,
-        }
-    }
-}
-
-bitflags::bitflags! {
-    #[derive(Clone, Copy)]
-    pub struct SupportedBreakpointProperties: u32 {
-        const LOG = 1 << 0;
-        const CONDITION = 1 << 1;
-        const HIT_CONDITION = 1 << 2;
-        // Conditions for exceptions can be set only when exception filters are supported.
-        const EXCEPTION_FILTER_OPTIONS = 1 << 3;
-    }
-}
-
-impl From<&Capabilities> for SupportedBreakpointProperties {
-    fn from(caps: &Capabilities) -> Self {
-        let mut this = Self::empty();
-        for (prop, offset) in [
-            (caps.supports_log_points, Self::LOG),
-            (caps.supports_conditional_breakpoints, Self::CONDITION),
-            (
-                caps.supports_hit_conditional_breakpoints,
-                Self::HIT_CONDITION,
-            ),
-            (
-                caps.supports_exception_options,
-                Self::EXCEPTION_FILTER_OPTIONS,
-            ),
-        ] {
-            if prop.unwrap_or_default() {
-                this.insert(offset);
-            }
-        }
-        this
-    }
-}
-
-impl SupportedBreakpointProperties {
-    fn for_exception_breakpoints(self) -> Self {
-        // TODO: we don't yet support conditions for exception breakpoints at the data layer, hence all props are disabled here.
-        Self::empty()
-    }
-    fn for_data_breakpoints(self) -> Self {
-        // TODO: we don't yet support conditions for data breakpoints at the data layer, hence all props are disabled here.
-        Self::empty()
-    }
-}
-#[derive(IntoElement)]
-struct BreakpointOptionsStrip {
-    props: SupportedBreakpointProperties,
-    breakpoint: BreakpointEntry,
-    is_selected: bool,
-    focus_handle: FocusHandle,
-    strip_mode: Option<ActiveBreakpointStripMode>,
-    index: usize,
-}
-
-impl BreakpointOptionsStrip {
-    fn is_toggled(&self, expected_mode: ActiveBreakpointStripMode) -> bool {
-        self.is_selected && self.strip_mode == Some(expected_mode)
-    }
-
-    fn on_click_callback(
-        &self,
-        mode: ActiveBreakpointStripMode,
-    ) -> impl for<'a> Fn(&ClickEvent, &mut Window, &'a mut App) + use<> {
-        let list = self.breakpoint.weak.clone();
-        let ix = self.index;
-        move |_, window, cx| {
-            list.update(cx, |this, cx| {
-                if this.strip_mode != Some(mode) {
-                    this.set_active_breakpoint_property(mode, window, cx);
-                } else if this.selected_ix == Some(ix) {
-                    this.strip_mode.take();
-                } else {
-                    cx.propagate();
-                }
-            })
-            .ok();
-        }
-    }
-
-    fn add_focus_styles(
-        &self,
-        kind: ActiveBreakpointStripMode,
-        available: bool,
-        window: &Window,
-        cx: &App,
-    ) -> impl Fn(Div) -> Div {
-        move |this: Div| {
-            // Avoid layout shifts in case there's no colored border
-            let this = this.border_1().rounded_sm();
-            let color = cx.theme().colors();
-
-            if self.is_selected && self.strip_mode == Some(kind) {
-                if self.focus_handle.is_focused(window) {
-                    this.bg(color.editor_background)
-                        .border_color(color.border_focused)
-                } else {
-                    this.border_color(color.border)
-                }
-            } else if !available {
-                this.border_color(color.border_transparent)
-            } else {
-                this
-            }
-        }
-    }
-}
-
-impl RenderOnce for BreakpointOptionsStrip {
-    fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let id = self.breakpoint.id();
-        let supports_logs = self.props.contains(SupportedBreakpointProperties::LOG);
-        let supports_condition = self
-            .props
-            .contains(SupportedBreakpointProperties::CONDITION);
-        let supports_hit_condition = self
-            .props
-            .contains(SupportedBreakpointProperties::HIT_CONDITION);
-        let has_logs = self.breakpoint.has_log();
-        let has_condition = self.breakpoint.has_condition();
-        let has_hit_condition = self.breakpoint.has_hit_condition();
-        let style_for_toggle = |mode, is_enabled| {
-            if is_enabled && self.strip_mode == Some(mode) && self.is_selected {
-                ui::ButtonStyle::Filled
-            } else {
-                ui::ButtonStyle::Subtle
-            }
-        };
-        let color_for_toggle = |is_enabled| {
-            if is_enabled {
-                Color::Default
-            } else {
-                Color::Muted
-            }
-        };
-
-        h_flex()
-            .gap_px()
-            .justify_end()
-            .when(has_logs || self.is_selected, |this| {
-                this.child(
-                    div()
-                    .map(self.add_focus_styles(
-                        ActiveBreakpointStripMode::Log,
-                        supports_logs,
-                        window,
-                        cx,
-                    ))
-                    .child(
-                        IconButton::new(
-                            SharedString::from(format!("{id}-log-toggle")),
-                            IconName::Notepad,
-                        )
-                        .shape(ui::IconButtonShape::Square)
-                        .style(style_for_toggle(ActiveBreakpointStripMode::Log, has_logs))
-                        .icon_size(IconSize::Small)
-                        .icon_color(color_for_toggle(has_logs))
-                        .when(has_logs, |this| this.indicator(Indicator::dot().color(Color::Info)))
-                        .disabled(!supports_logs)
-                        .toggle_state(self.is_toggled(ActiveBreakpointStripMode::Log))
-                        .on_click(self.on_click_callback(ActiveBreakpointStripMode::Log))
-                        .tooltip(|_window, cx|  {
-                            Tooltip::with_meta(
-                                "Set Log Message",
-                                None,
-                                "Set log message to display (instead of stopping) when a breakpoint is hit.",
-                                cx,
-                            )
-                        }),
-                    )
-                )
-            })
-            .when(has_condition || self.is_selected, |this| {
-                this.child(
-                    div()
-                        .map(self.add_focus_styles(
-                            ActiveBreakpointStripMode::Condition,
-                            supports_condition,
-                            window,
-                            cx,
-                        ))
-                        .child(
-                            IconButton::new(
-                                SharedString::from(format!("{id}-condition-toggle")),
-                                IconName::SplitAlt,
-                            )
-                            .shape(ui::IconButtonShape::Square)
-                            .style(style_for_toggle(
-                                ActiveBreakpointStripMode::Condition,
-                                has_condition,
-                            ))
-                            .icon_size(IconSize::Small)
-                            .icon_color(color_for_toggle(has_condition))
-                            .when(has_condition, |this| this.indicator(Indicator::dot().color(Color::Info)))
-                            .disabled(!supports_condition)
-                            .toggle_state(self.is_toggled(ActiveBreakpointStripMode::Condition))
-                            .on_click(self.on_click_callback(ActiveBreakpointStripMode::Condition))
-                            .tooltip(|_window, cx|  {
-                                Tooltip::with_meta(
-                                    "Set Condition",
-                                    None,
-                                    "Set condition to evaluate when a breakpoint is hit. Program execution will stop only when the condition is met.",
-                                    cx,
-                                )
-                            }),
-                        )
-                )
-            })
-            .when(has_hit_condition || self.is_selected, |this| {
-                this.child(div()
-                    .map(self.add_focus_styles(
-                        ActiveBreakpointStripMode::HitCondition,
-                        supports_hit_condition,
-                        window,
-                        cx,
-                    ))
-                    .child(
-                        IconButton::new(
-                            SharedString::from(format!("{id}-hit-condition-toggle")),
-                            IconName::ArrowDown10,
-                        )
-                        .style(style_for_toggle(
-                            ActiveBreakpointStripMode::HitCondition,
-                            has_hit_condition,
-                        ))
-                        .shape(ui::IconButtonShape::Square)
-                        .icon_size(IconSize::Small)
-                        .icon_color(color_for_toggle(has_hit_condition))
-                        .when(has_hit_condition, |this| this.indicator(Indicator::dot().color(Color::Info)))
-                        .disabled(!supports_hit_condition)
-                        .toggle_state(self.is_toggled(ActiveBreakpointStripMode::HitCondition))
-                        .on_click(self.on_click_callback(ActiveBreakpointStripMode::HitCondition))
-                        .tooltip(|_window, cx|  {
-                            Tooltip::with_meta(
-                                "Set Hit Condition",
-                                None,
-                                "Set expression that controls how many hits of the breakpoint are ignored.",
-                                cx,
-                            )
-                        }),
-                    ))
-
-            })
-    }
-}
diff --git a/crates/debugger_ui/src/session/running/console.rs b/crates/debugger_ui/src/session/running/console.rs
deleted file mode 100644
index 927a57dc8b..0000000000
--- a/crates/debugger_ui/src/session/running/console.rs
+++ /dev/null
@@ -1,1012 +0,0 @@
-use super::{
-    stack_frame_list::{StackFrameList, StackFrameListEvent},
-    variable_list::VariableList,
-};
-use alacritty_terminal::vte::ansi;
-use anyhow::Result;
-use collections::HashMap;
-use dap::{CompletionItem, CompletionItemType, OutputEvent};
-use editor::{
-    Bias, CompletionProvider, Editor, EditorElement, EditorMode, EditorStyle, ExcerptId,
-    MultiBufferOffset, SizingBehavior,
-};
-use fuzzy::StringMatchCandidate;
-use gpui::{
-    Action as _, AppContext, Context, Corner, Entity, FocusHandle, Focusable, HighlightStyle, Hsla,
-    Render, Subscription, Task, TextStyle, WeakEntity, actions,
-};
-use language::{Anchor, Buffer, CharScopeContext, CodeLabel, TextBufferSnapshot, ToOffset};
-use menu::{Confirm, SelectNext, SelectPrevious};
-use project::{
-    CompletionDisplayOptions, CompletionResponse,
-    debugger::session::{CompletionsQuery, OutputToken, Session},
-    lsp_store::CompletionDocumentation,
-    search_history::{SearchHistory, SearchHistoryCursor},
-};
-use settings::Settings;
-use std::fmt::Write;
-use std::{ops::Range, rc::Rc, usize};
-use theme::{Theme, ThemeSettings};
-use ui::{ContextMenu, Divider, PopoverMenu, SplitButton, Tooltip, prelude::*};
-use util::ResultExt;
-
-actions!(
-    console,
-    [
-        /// Adds an expression to the watch list.
-        WatchExpression
-    ]
-);
-
-pub struct Console {
-    console: Entity<Editor>,
-    query_bar: Entity<Editor>,
-    session: Entity<Session>,
-    _subscriptions: Vec<Subscription>,
-    variable_list: Entity<VariableList>,
-    stack_frame_list: Entity<StackFrameList>,
-    last_token: OutputToken,
-    update_output_task: Option<Task<()>>,
-    focus_handle: FocusHandle,
-    history: SearchHistory,
-    cursor: SearchHistoryCursor,
-}
-
-impl Console {
-    pub fn new(
-        session: Entity<Session>,
-        stack_frame_list: Entity<StackFrameList>,
-        variable_list: Entity<VariableList>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let console = cx.new(|cx| {
-            let mut editor = Editor::multi_line(window, cx);
-            editor.set_mode(EditorMode::Full {
-                scale_ui_elements_with_buffer_font_size: true,
-                show_active_line_background: true,
-                sizing_behavior: SizingBehavior::ExcludeOverscrollMargin,
-            });
-            editor.move_to_end(&editor::actions::MoveToEnd, window, cx);
-            editor.set_read_only(true);
-            editor.disable_scrollbars_and_minimap(window, cx);
-            editor.set_show_gutter(false, cx);
-            editor.set_show_runnables(false, cx);
-            editor.set_show_breakpoints(false, cx);
-            editor.set_show_code_actions(false, cx);
-            editor.set_show_line_numbers(false, cx);
-            editor.set_show_git_diff_gutter(false, cx);
-            editor.set_autoindent(false);
-            editor.set_input_enabled(false);
-            editor.set_use_autoclose(false);
-            editor.set_show_wrap_guides(false, cx);
-            editor.set_show_indent_guides(false, cx);
-            editor.set_show_edit_predictions(Some(false), window, cx);
-            editor.set_use_modal_editing(false);
-            editor.set_soft_wrap_mode(language::language_settings::SoftWrap::EditorWidth, cx);
-            editor
-        });
-        let focus_handle = cx.focus_handle();
-
-        let this = cx.weak_entity();
-        let query_bar = cx.new(|cx| {
-            let mut editor = Editor::single_line(window, cx);
-            editor.set_placeholder_text("Evaluate an expression", window, cx);
-            editor.set_use_autoclose(false);
-            editor.set_show_gutter(false, cx);
-            editor.set_show_wrap_guides(false, cx);
-            editor.set_show_indent_guides(false, cx);
-            editor.set_completion_provider(Some(Rc::new(ConsoleQueryBarCompletionProvider(this))));
-
-            editor
-        });
-
-        let _subscriptions = vec![
-            cx.subscribe(&stack_frame_list, Self::handle_stack_frame_list_events),
-            cx.on_focus(&focus_handle, window, |console, window, cx| {
-                if console.is_running(cx) {
-                    console.query_bar.focus_handle(cx).focus(window);
-                }
-            }),
-        ];
-
-        Self {
-            session,
-            console,
-            query_bar,
-            variable_list,
-            _subscriptions,
-            stack_frame_list,
-            update_output_task: None,
-            last_token: OutputToken(0),
-            focus_handle,
-            history: SearchHistory::new(
-                None,
-                project::search_history::QueryInsertionBehavior::ReplacePreviousIfContains,
-            ),
-            cursor: Default::default(),
-        }
-    }
-
-    #[cfg(test)]
-    pub(crate) fn editor(&self) -> &Entity<Editor> {
-        &self.console
-    }
-
-    fn is_running(&self, cx: &Context<Self>) -> bool {
-        self.session.read(cx).is_started()
-    }
-
-    fn handle_stack_frame_list_events(
-        &mut self,
-        _: Entity<StackFrameList>,
-        event: &StackFrameListEvent,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            StackFrameListEvent::SelectedStackFrameChanged(_) => cx.notify(),
-            StackFrameListEvent::BuiltEntries => {}
-        }
-    }
-
-    pub(crate) fn show_indicator(&self, cx: &App) -> bool {
-        self.session.read(cx).has_new_output(self.last_token)
-    }
-
-    fn add_messages(
-        &mut self,
-        events: Vec<OutputEvent>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<()>> {
-        self.console.update(cx, |_, cx| {
-            cx.spawn_in(window, async move |console, cx| {
-                let mut len = console
-                    .update(cx, |this, cx| this.buffer().read(cx).len(cx))?
-                    .0;
-                let (output, spans, background_spans) = cx
-                    .background_spawn(async move {
-                        let mut all_spans = Vec::new();
-                        let mut all_background_spans = Vec::new();
-                        let mut to_insert = String::new();
-                        let mut scratch = String::new();
-
-                        for event in &events {
-                            scratch.clear();
-                            let mut ansi_handler = ConsoleHandler::default();
-                            let mut ansi_processor =
-                                ansi::Processor::<ansi::StdSyncHandler>::default();
-
-                            let trimmed_output = event.output.trim_end();
-                            let _ = writeln!(&mut scratch, "{trimmed_output}");
-                            ansi_processor.advance(&mut ansi_handler, scratch.as_bytes());
-                            let output = std::mem::take(&mut ansi_handler.output);
-                            to_insert.extend(output.chars());
-                            let mut spans = std::mem::take(&mut ansi_handler.spans);
-                            let mut background_spans =
-                                std::mem::take(&mut ansi_handler.background_spans);
-                            if ansi_handler.current_range_start < output.len() {
-                                spans.push((
-                                    ansi_handler.current_range_start..output.len(),
-                                    ansi_handler.current_color,
-                                ));
-                            }
-                            if ansi_handler.current_background_range_start < output.len() {
-                                background_spans.push((
-                                    ansi_handler.current_background_range_start..output.len(),
-                                    ansi_handler.current_background_color,
-                                ));
-                            }
-
-                            for (range, _) in spans.iter_mut() {
-                                let start_offset = len + range.start;
-                                *range = start_offset..len + range.end;
-                            }
-
-                            for (range, _) in background_spans.iter_mut() {
-                                let start_offset = len + range.start;
-                                *range = start_offset..len + range.end;
-                            }
-
-                            len += output.len();
-
-                            all_spans.extend(spans);
-                            all_background_spans.extend(background_spans);
-                        }
-                        (to_insert, all_spans, all_background_spans)
-                    })
-                    .await;
-                console.update_in(cx, |console, window, cx| {
-                    console.set_read_only(false);
-                    console.move_to_end(&editor::actions::MoveToEnd, window, cx);
-                    console.insert(&output, window, cx);
-                    console.set_read_only(true);
-
-                    struct ConsoleAnsiHighlight;
-
-                    let buffer = console.buffer().read(cx).snapshot(cx);
-
-                    for (range, color) in spans {
-                        let Some(color) = color else { continue };
-                        let start_offset = range.start;
-                        let range = buffer.anchor_after(MultiBufferOffset(range.start))
-                            ..buffer.anchor_before(MultiBufferOffset(range.end));
-                        let style = HighlightStyle {
-                            color: Some(terminal_view::terminal_element::convert_color(
-                                &color,
-                                cx.theme(),
-                            )),
-                            ..Default::default()
-                        };
-                        console.highlight_text_key::<ConsoleAnsiHighlight>(
-                            start_offset,
-                            vec![range],
-                            style,
-                            false,
-                            cx,
-                        );
-                    }
-
-                    for (range, color) in background_spans {
-                        let Some(color) = color else { continue };
-                        let start_offset = range.start;
-                        let range = buffer.anchor_after(MultiBufferOffset(range.start))
-                            ..buffer.anchor_before(MultiBufferOffset(range.end));
-                        let color_fn = color_fetcher(color);
-                        console.highlight_background_key::<ConsoleAnsiHighlight>(
-                            start_offset,
-                            &[range],
-                            move |_, theme| color_fn(theme),
-                            cx,
-                        );
-                    }
-
-                    cx.notify();
-                })?;
-
-                Ok(())
-            })
-        })
-    }
-
-    pub fn watch_expression(
-        &mut self,
-        _: &WatchExpression,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let expression = self.query_bar.update(cx, |editor, cx| {
-            let expression = editor.text(cx);
-            cx.defer_in(window, |editor, window, cx| {
-                editor.clear(window, cx);
-            });
-
-            expression
-        });
-        self.history.add(&mut self.cursor, expression.clone());
-        self.cursor.reset();
-        self.session.update(cx, |session, cx| {
-            session
-                .evaluate(
-                    expression.clone(),
-                    Some(dap::EvaluateArgumentsContext::Repl),
-                    self.stack_frame_list.read(cx).opened_stack_frame_id(),
-                    None,
-                    cx,
-                )
-                .detach();
-
-            if let Some(stack_frame_id) = self.stack_frame_list.read(cx).opened_stack_frame_id() {
-                session
-                    .add_watcher(expression.into(), stack_frame_id, cx)
-                    .detach();
-            }
-        });
-    }
-
-    fn previous_query(&mut self, _: &SelectPrevious, window: &mut Window, cx: &mut Context<Self>) {
-        let prev = self.history.previous(&mut self.cursor);
-        if let Some(prev) = prev {
-            self.query_bar.update(cx, |editor, cx| {
-                editor.set_text(prev, window, cx);
-            });
-        }
-    }
-
-    fn next_query(&mut self, _: &SelectNext, window: &mut Window, cx: &mut Context<Self>) {
-        let next = self.history.next(&mut self.cursor);
-        let query = next.unwrap_or_else(|| {
-            self.cursor.reset();
-            ""
-        });
-
-        self.query_bar.update(cx, |editor, cx| {
-            editor.set_text(query, window, cx);
-        });
-    }
-
-    fn evaluate(&mut self, _: &Confirm, window: &mut Window, cx: &mut Context<Self>) {
-        let expression = self.query_bar.update(cx, |editor, cx| {
-            let expression = editor.text(cx);
-            cx.defer_in(window, |editor, window, cx| {
-                editor.clear(window, cx);
-            });
-
-            expression
-        });
-
-        self.history.add(&mut self.cursor, expression.clone());
-        self.cursor.reset();
-        self.session.update(cx, |session, cx| {
-            session
-                .evaluate(
-                    expression,
-                    Some(dap::EvaluateArgumentsContext::Repl),
-                    self.stack_frame_list.read(cx).opened_stack_frame_id(),
-                    None,
-                    cx,
-                )
-                .detach();
-        });
-    }
-
-    fn render_submit_menu(
-        &self,
-        id: impl Into<ElementId>,
-        keybinding_target: Option<FocusHandle>,
-        cx: &App,
-    ) -> impl IntoElement {
-        PopoverMenu::new(id.into())
-            .trigger(
-                ui::ButtonLike::new_rounded_right("console-confirm-split-button-right")
-                    .layer(ui::ElevationIndex::ModalSurface)
-                    .size(ui::ButtonSize::None)
-                    .child(
-                        div()
-                            .px_1()
-                            .child(Icon::new(IconName::ChevronDown).size(IconSize::XSmall)),
-                    ),
-            )
-            .when(
-                self.stack_frame_list
-                    .read(cx)
-                    .opened_stack_frame_id()
-                    .is_some(),
-                |this| {
-                    this.menu(move |window, cx| {
-                        Some(ContextMenu::build(window, cx, |context_menu, _, _| {
-                            context_menu
-                                .when_some(keybinding_target.clone(), |el, keybinding_target| {
-                                    el.context(keybinding_target)
-                                })
-                                .action("Watch Expression", WatchExpression.boxed_clone())
-                        }))
-                    })
-                },
-            )
-            .anchor(Corner::TopRight)
-    }
-
-    fn render_console(&self, cx: &Context<Self>) -> impl IntoElement {
-        EditorElement::new(&self.console, Self::editor_style(&self.console, cx))
-    }
-
-    fn editor_style(editor: &Entity<Editor>, cx: &Context<Self>) -> EditorStyle {
-        let is_read_only = editor.read(cx).read_only(cx);
-        let settings = ThemeSettings::get_global(cx);
-        let theme = cx.theme();
-        let text_style = TextStyle {
-            color: if is_read_only {
-                theme.colors().text_muted
-            } else {
-                theme.colors().text
-            },
-            font_family: settings.buffer_font.family.clone(),
-            font_features: settings.buffer_font.features.clone(),
-            font_size: settings.buffer_font_size(cx).into(),
-            font_weight: settings.buffer_font.weight,
-            line_height: relative(settings.buffer_line_height.value()),
-            ..Default::default()
-        };
-        EditorStyle {
-            background: theme.colors().editor_background,
-            local_player: theme.players().local(),
-            text: text_style,
-            ..Default::default()
-        }
-    }
-
-    fn render_query_bar(&self, cx: &Context<Self>) -> impl IntoElement {
-        EditorElement::new(&self.query_bar, Self::editor_style(&self.query_bar, cx))
-    }
-
-    pub(crate) fn update_output(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if self.update_output_task.is_some() {
-            return;
-        }
-        let session = self.session.clone();
-        let token = self.last_token;
-        self.update_output_task = Some(cx.spawn_in(window, async move |this, cx| {
-            let Some((last_processed_token, task)) = session
-                .update_in(cx, |session, window, cx| {
-                    let (output, last_processed_token) = session.output(token);
-
-                    this.update(cx, |this, cx| {
-                        if last_processed_token == this.last_token {
-                            return None;
-                        }
-                        Some((
-                            last_processed_token,
-                            this.add_messages(output.cloned().collect(), window, cx),
-                        ))
-                    })
-                    .ok()
-                    .flatten()
-                })
-                .ok()
-                .flatten()
-            else {
-                _ = this.update(cx, |this, _| {
-                    this.update_output_task.take();
-                });
-                return;
-            };
-            _ = task.await.log_err();
-            _ = this.update(cx, |this, _| {
-                this.last_token = last_processed_token;
-                this.update_output_task.take();
-            });
-        }));
-    }
-}
-
-impl Render for Console {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let query_focus_handle = self.query_bar.focus_handle(cx);
-        self.update_output(window, cx);
-
-        v_flex()
-            .track_focus(&self.focus_handle)
-            .key_context("DebugConsole")
-            .on_action(cx.listener(Self::evaluate))
-            .on_action(cx.listener(Self::watch_expression))
-            .size_full()
-            .border_2()
-            .bg(cx.theme().colors().editor_background)
-            .child(self.render_console(cx))
-            .when(self.is_running(cx), |this| {
-                this.child(Divider::horizontal()).child(
-                    h_flex()
-                        .on_action(cx.listener(Self::previous_query))
-                        .on_action(cx.listener(Self::next_query))
-                        .p_1()
-                        .gap_1()
-                        .bg(cx.theme().colors().editor_background)
-                        .child(self.render_query_bar(cx))
-                        .child(SplitButton::new(
-                            ui::ButtonLike::new_rounded_all(ElementId::Name(
-                                "split-button-left-confirm-button".into(),
-                            ))
-                            .on_click(move |_, window, cx| {
-                                window.dispatch_action(Box::new(Confirm), cx)
-                            })
-                            .layer(ui::ElevationIndex::ModalSurface)
-                            .size(ui::ButtonSize::Compact)
-                            .child(Label::new("Evaluate"))
-                            .tooltip({
-                                let query_focus_handle = query_focus_handle.clone();
-
-                                move |_window, cx| {
-                                    Tooltip::for_action_in(
-                                        "Evaluate",
-                                        &Confirm,
-                                        &query_focus_handle,
-                                        cx,
-                                    )
-                                }
-                            }),
-                            self.render_submit_menu(
-                                ElementId::Name("split-button-right-confirm-button".into()),
-                                Some(query_focus_handle.clone()),
-                                cx,
-                            )
-                            .into_any_element(),
-                        )),
-                )
-            })
-    }
-}
-
-impl Focusable for Console {
-    fn focus_handle(&self, _cx: &App) -> gpui::FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-struct ConsoleQueryBarCompletionProvider(WeakEntity<Console>);
-
-impl CompletionProvider for ConsoleQueryBarCompletionProvider {
-    fn completions(
-        &self,
-        _excerpt_id: ExcerptId,
-        buffer: &Entity<Buffer>,
-        buffer_position: language::Anchor,
-        _trigger: editor::CompletionContext,
-        _window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) -> Task<Result<Vec<CompletionResponse>>> {
-        let Some(console) = self.0.upgrade() else {
-            return Task::ready(Ok(Vec::new()));
-        };
-
-        let support_completions = console
-            .read(cx)
-            .session
-            .read(cx)
-            .capabilities()
-            .supports_completions_request
-            .unwrap_or_default();
-
-        if support_completions {
-            self.client_completions(&console, buffer, buffer_position, cx)
-        } else {
-            self.variable_list_completions(&console, buffer, buffer_position, cx)
-        }
-    }
-
-    fn is_completion_trigger(
-        &self,
-        buffer: &Entity<Buffer>,
-        position: language::Anchor,
-        text: &str,
-        trigger_in_words: bool,
-        cx: &mut Context<Editor>,
-    ) -> bool {
-        let mut chars = text.chars();
-        let char = if let Some(char) = chars.next() {
-            char
-        } else {
-            return false;
-        };
-
-        let snapshot = buffer.read(cx).snapshot();
-
-        let classifier = snapshot
-            .char_classifier_at(position)
-            .scope_context(Some(CharScopeContext::Completion));
-        if trigger_in_words && classifier.is_word(char) {
-            return true;
-        }
-
-        self.0
-            .read_with(cx, |console, cx| {
-                console
-                    .session
-                    .read(cx)
-                    .capabilities()
-                    .completion_trigger_characters
-                    .as_ref()
-                    .map(|triggers| triggers.contains(&text.to_string()))
-            })
-            .ok()
-            .flatten()
-            .unwrap_or(true)
-    }
-}
-
-impl ConsoleQueryBarCompletionProvider {
-    fn variable_list_completions(
-        &self,
-        console: &Entity<Console>,
-        buffer: &Entity<Buffer>,
-        buffer_position: language::Anchor,
-        cx: &mut Context<Editor>,
-    ) -> Task<Result<Vec<CompletionResponse>>> {
-        let (variables, string_matches) = console.update(cx, |console, cx| {
-            let mut variables = HashMap::default();
-            let mut string_matches = Vec::default();
-
-            for variable in console.variable_list.update(cx, |variable_list, cx| {
-                variable_list.completion_variables(cx)
-            }) {
-                if let Some(evaluate_name) = &variable.evaluate_name
-                    && variables
-                        .insert(evaluate_name.clone(), variable.value.clone())
-                        .is_none()
-                {
-                    string_matches.push(StringMatchCandidate {
-                        id: 0,
-                        string: evaluate_name.clone(),
-                        char_bag: evaluate_name.chars().collect(),
-                    });
-                }
-
-                if variables
-                    .insert(variable.name.clone(), variable.value.clone())
-                    .is_none()
-                {
-                    string_matches.push(StringMatchCandidate {
-                        id: 0,
-                        string: variable.name.clone(),
-                        char_bag: variable.name.chars().collect(),
-                    });
-                }
-            }
-
-            (variables, string_matches)
-        });
-
-        let snapshot = buffer.read(cx).text_snapshot();
-        let buffer_text = snapshot.text();
-
-        cx.spawn(async move |_, cx| {
-            const LIMIT: usize = 10;
-            let matches = fuzzy::match_strings(
-                &string_matches,
-                &buffer_text,
-                true,
-                true,
-                LIMIT,
-                &Default::default(),
-                cx.background_executor().clone(),
-            )
-            .await;
-
-            let completions = matches
-                .iter()
-                .filter_map(|string_match| {
-                    let variable_value = variables.get(&string_match.string)?;
-
-                    Some(project::Completion {
-                        replace_range: Self::replace_range_for_completion(
-                            &buffer_text,
-                            buffer_position,
-                            string_match.string.as_bytes(),
-                            &snapshot,
-                        ),
-                        new_text: string_match.string.clone(),
-                        label: CodeLabel::plain(string_match.string.clone(), None),
-                        match_start: None,
-                        snippet_deduplication_key: None,
-                        icon_path: None,
-                        documentation: Some(CompletionDocumentation::MultiLineMarkdown(
-                            variable_value.into(),
-                        )),
-                        confirm: None,
-                        source: project::CompletionSource::Custom,
-                        insert_text_mode: None,
-                    })
-                })
-                .collect::<Vec<_>>();
-
-            Ok(vec![project::CompletionResponse {
-                is_incomplete: completions.len() >= LIMIT,
-                display_options: CompletionDisplayOptions::default(),
-                completions,
-            }])
-        })
-    }
-
-    fn replace_range_for_completion(
-        buffer_text: &String,
-        buffer_position: Anchor,
-        new_bytes: &[u8],
-        snapshot: &TextBufferSnapshot,
-    ) -> Range<Anchor> {
-        let buffer_offset = buffer_position.to_offset(snapshot);
-        let buffer_bytes = &buffer_text.as_bytes()[0..buffer_offset];
-
-        let mut prefix_len = 0;
-        for i in (0..new_bytes.len()).rev() {
-            if buffer_bytes.ends_with(&new_bytes[0..i]) {
-                prefix_len = i;
-                break;
-            }
-        }
-
-        let start = snapshot.clip_offset(buffer_offset - prefix_len, Bias::Left);
-
-        snapshot.anchor_before(start)..buffer_position
-    }
-
-    const fn completion_type_score(completion_type: CompletionItemType) -> usize {
-        match completion_type {
-            CompletionItemType::Field | CompletionItemType::Property => 0,
-            CompletionItemType::Variable | CompletionItemType::Value => 1,
-            CompletionItemType::Method
-            | CompletionItemType::Function
-            | CompletionItemType::Constructor => 2,
-            CompletionItemType::Class
-            | CompletionItemType::Interface
-            | CompletionItemType::Module => 3,
-            _ => 4,
-        }
-    }
-
-    fn completion_item_sort_text(completion_item: &CompletionItem) -> String {
-        completion_item.sort_text.clone().unwrap_or_else(|| {
-            format!(
-                "{:03}_{}",
-                Self::completion_type_score(
-                    completion_item.type_.unwrap_or(CompletionItemType::Text)
-                ),
-                completion_item.label.to_ascii_lowercase()
-            )
-        })
-    }
-
-    fn client_completions(
-        &self,
-        console: &Entity<Console>,
-        buffer: &Entity<Buffer>,
-        buffer_position: language::Anchor,
-        cx: &mut Context<Editor>,
-    ) -> Task<Result<Vec<CompletionResponse>>> {
-        let completion_task = console.update(cx, |console, cx| {
-            console.session.update(cx, |state, cx| {
-                let frame_id = console.stack_frame_list.read(cx).opened_stack_frame_id();
-
-                state.completions(
-                    CompletionsQuery::new(buffer.read(cx), buffer_position, frame_id),
-                    cx,
-                )
-            })
-        });
-        let snapshot = buffer.read(cx).text_snapshot();
-        cx.background_executor().spawn(async move {
-            let completions = completion_task.await?;
-
-            let buffer_text = snapshot.text();
-
-            let completions = completions
-                .into_iter()
-                .map(|completion| {
-                    let sort_text = Self::completion_item_sort_text(&completion);
-                    let new_text = completion
-                        .text
-                        .as_ref()
-                        .unwrap_or(&completion.label)
-                        .to_owned();
-
-                    project::Completion {
-                        replace_range: Self::replace_range_for_completion(
-                            &buffer_text,
-                            buffer_position,
-                            new_text.as_bytes(),
-                            &snapshot,
-                        ),
-                        new_text,
-                        label: CodeLabel::plain(completion.label, None),
-                        icon_path: None,
-                        documentation: completion.detail.map(|detail| {
-                            CompletionDocumentation::MultiLineMarkdown(detail.into())
-                        }),
-                        match_start: None,
-                        snippet_deduplication_key: None,
-                        confirm: None,
-                        source: project::CompletionSource::Dap { sort_text },
-                        insert_text_mode: None,
-                    }
-                })
-                .collect();
-
-            Ok(vec![project::CompletionResponse {
-                completions,
-                display_options: CompletionDisplayOptions::default(),
-                is_incomplete: false,
-            }])
-        })
-    }
-}
-
-#[derive(Default)]
-struct ConsoleHandler {
-    output: String,
-    spans: Vec<(Range<usize>, Option<ansi::Color>)>,
-    background_spans: Vec<(Range<usize>, Option<ansi::Color>)>,
-    current_range_start: usize,
-    current_background_range_start: usize,
-    current_color: Option<ansi::Color>,
-    current_background_color: Option<ansi::Color>,
-    pos: usize,
-}
-
-impl ConsoleHandler {
-    fn break_span(&mut self, color: Option<ansi::Color>) {
-        self.spans.push((
-            self.current_range_start..self.output.len(),
-            self.current_color,
-        ));
-        self.current_color = color;
-        self.current_range_start = self.pos;
-    }
-
-    fn break_background_span(&mut self, color: Option<ansi::Color>) {
-        self.background_spans.push((
-            self.current_background_range_start..self.output.len(),
-            self.current_background_color,
-        ));
-        self.current_background_color = color;
-        self.current_background_range_start = self.pos;
-    }
-}
-
-impl ansi::Handler for ConsoleHandler {
-    fn input(&mut self, c: char) {
-        self.output.push(c);
-        self.pos += c.len_utf8();
-    }
-
-    fn linefeed(&mut self) {
-        self.output.push('\n');
-        self.pos += 1;
-    }
-
-    fn put_tab(&mut self, count: u16) {
-        self.output
-            .extend(std::iter::repeat('\t').take(count as usize));
-        self.pos += count as usize;
-    }
-
-    fn terminal_attribute(&mut self, attr: ansi::Attr) {
-        match attr {
-            ansi::Attr::Foreground(color) => {
-                self.break_span(Some(color));
-            }
-            ansi::Attr::Background(color) => {
-                self.break_background_span(Some(color));
-            }
-            ansi::Attr::Reset => {
-                self.break_span(None);
-                self.break_background_span(None);
-            }
-            _ => {}
-        }
-    }
-}
-
-fn color_fetcher(color: ansi::Color) -> fn(&Theme) -> Hsla {
-    let color_fetcher: fn(&Theme) -> Hsla = match color {
-        // Named and theme defined colors
-        ansi::Color::Named(n) => match n {
-            ansi::NamedColor::Black => |theme| theme.colors().terminal_ansi_black,
-            ansi::NamedColor::Red => |theme| theme.colors().terminal_ansi_red,
-            ansi::NamedColor::Green => |theme| theme.colors().terminal_ansi_green,
-            ansi::NamedColor::Yellow => |theme| theme.colors().terminal_ansi_yellow,
-            ansi::NamedColor::Blue => |theme| theme.colors().terminal_ansi_blue,
-            ansi::NamedColor::Magenta => |theme| theme.colors().terminal_ansi_magenta,
-            ansi::NamedColor::Cyan => |theme| theme.colors().terminal_ansi_cyan,
-            ansi::NamedColor::White => |theme| theme.colors().terminal_ansi_white,
-            ansi::NamedColor::BrightBlack => |theme| theme.colors().terminal_ansi_bright_black,
-            ansi::NamedColor::BrightRed => |theme| theme.colors().terminal_ansi_bright_red,
-            ansi::NamedColor::BrightGreen => |theme| theme.colors().terminal_ansi_bright_green,
-            ansi::NamedColor::BrightYellow => |theme| theme.colors().terminal_ansi_bright_yellow,
-            ansi::NamedColor::BrightBlue => |theme| theme.colors().terminal_ansi_bright_blue,
-            ansi::NamedColor::BrightMagenta => |theme| theme.colors().terminal_ansi_bright_magenta,
-            ansi::NamedColor::BrightCyan => |theme| theme.colors().terminal_ansi_bright_cyan,
-            ansi::NamedColor::BrightWhite => |theme| theme.colors().terminal_ansi_bright_white,
-            ansi::NamedColor::Foreground => |theme| theme.colors().terminal_foreground,
-            ansi::NamedColor::Background => |theme| theme.colors().terminal_background,
-            ansi::NamedColor::Cursor => |theme| theme.players().local().cursor,
-            ansi::NamedColor::DimBlack => |theme| theme.colors().terminal_ansi_dim_black,
-            ansi::NamedColor::DimRed => |theme| theme.colors().terminal_ansi_dim_red,
-            ansi::NamedColor::DimGreen => |theme| theme.colors().terminal_ansi_dim_green,
-            ansi::NamedColor::DimYellow => |theme| theme.colors().terminal_ansi_dim_yellow,
-            ansi::NamedColor::DimBlue => |theme| theme.colors().terminal_ansi_dim_blue,
-            ansi::NamedColor::DimMagenta => |theme| theme.colors().terminal_ansi_dim_magenta,
-            ansi::NamedColor::DimCyan => |theme| theme.colors().terminal_ansi_dim_cyan,
-            ansi::NamedColor::DimWhite => |theme| theme.colors().terminal_ansi_dim_white,
-            ansi::NamedColor::BrightForeground => |theme| theme.colors().terminal_bright_foreground,
-            ansi::NamedColor::DimForeground => |theme| theme.colors().terminal_dim_foreground,
-        },
-        // 'True' colors
-        ansi::Color::Spec(_) => |theme| theme.colors().editor_background,
-        // 8 bit, indexed colors
-        ansi::Color::Indexed(i) => {
-            match i {
-                // 0-15 are the same as the named colors above
-                0 => |theme| theme.colors().terminal_ansi_black,
-                1 => |theme| theme.colors().terminal_ansi_red,
-                2 => |theme| theme.colors().terminal_ansi_green,
-                3 => |theme| theme.colors().terminal_ansi_yellow,
-                4 => |theme| theme.colors().terminal_ansi_blue,
-                5 => |theme| theme.colors().terminal_ansi_magenta,
-                6 => |theme| theme.colors().terminal_ansi_cyan,
-                7 => |theme| theme.colors().terminal_ansi_white,
-                8 => |theme| theme.colors().terminal_ansi_bright_black,
-                9 => |theme| theme.colors().terminal_ansi_bright_red,
-                10 => |theme| theme.colors().terminal_ansi_bright_green,
-                11 => |theme| theme.colors().terminal_ansi_bright_yellow,
-                12 => |theme| theme.colors().terminal_ansi_bright_blue,
-                13 => |theme| theme.colors().terminal_ansi_bright_magenta,
-                14 => |theme| theme.colors().terminal_ansi_bright_cyan,
-                15 => |theme| theme.colors().terminal_ansi_bright_white,
-                // 16-231 are a 6x6x6 RGB color cube, mapped to 0-255 using steps defined by XTerm.
-                // See: https://github.com/xterm-x11/xterm-snapshots/blob/master/256colres.pl
-                // 16..=231 => {
-                //     let (r, g, b) = rgb_for_index(index as u8);
-                //     rgba_color(
-                //         if r == 0 { 0 } else { r * 40 + 55 },
-                //         if g == 0 { 0 } else { g * 40 + 55 },
-                //         if b == 0 { 0 } else { b * 40 + 55 },
-                //     )
-                // }
-                // 232-255 are a 24-step grayscale ramp from (8, 8, 8) to (238, 238, 238).
-                // 232..=255 => {
-                //     let i = index as u8 - 232; // Align index to 0..24
-                //     let value = i * 10 + 8;
-                //     rgba_color(value, value, value)
-                // }
-                // For compatibility with the alacritty::Colors interface
-                // See: https://github.com/alacritty/alacritty/blob/master/alacritty_terminal/src/term/color.rs
-                _ => |_| gpui::black(),
-            }
-        }
-    };
-    color_fetcher
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::tests::init_test;
-    use editor::{MultiBufferOffset, test::editor_test_context::EditorTestContext};
-    use gpui::TestAppContext;
-    use language::Point;
-
-    #[track_caller]
-    fn assert_completion_range(
-        input: &str,
-        expect: &str,
-        replacement: &str,
-        cx: &mut EditorTestContext,
-    ) {
-        cx.set_state(input);
-
-        let buffer_position = cx.editor(|editor, _, cx| {
-            editor
-                .selections
-                .newest::<Point>(&editor.display_snapshot(cx))
-                .start
-        });
-
-        let snapshot = &cx.buffer_snapshot();
-
-        let replace_range = ConsoleQueryBarCompletionProvider::replace_range_for_completion(
-            &cx.buffer_text(),
-            snapshot.anchor_before(buffer_position),
-            replacement.as_bytes(),
-            snapshot,
-        );
-
-        cx.update_editor(|editor, _, cx| {
-            editor.edit(
-                vec![(
-                    MultiBufferOffset(snapshot.offset_for_anchor(&replace_range.start))
-                        ..MultiBufferOffset(snapshot.offset_for_anchor(&replace_range.end)),
-                    replacement,
-                )],
-                cx,
-            );
-        });
-
-        pretty_assertions::assert_eq!(expect, cx.display_text());
-    }
-
-    #[gpui::test]
-    async fn test_determine_completion_replace_range(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let mut cx = EditorTestContext::new(cx).await;
-
-        assert_completion_range("resˇ", "result", "result", &mut cx);
-        assert_completion_range("print(resˇ)", "print(result)", "result", &mut cx);
-        assert_completion_range("$author->nˇ", "$author->name", "$author->name", &mut cx);
-        assert_completion_range(
-            "$author->books[ˇ",
-            "$author->books[0]",
-            "$author->books[0]",
-            &mut cx,
-        );
-    }
-}
diff --git a/crates/debugger_ui/src/session/running/loaded_source_list.rs b/crates/debugger_ui/src/session/running/loaded_source_list.rs
deleted file mode 100644
index e55fad336b..0000000000
--- a/crates/debugger_ui/src/session/running/loaded_source_list.rs
+++ /dev/null
@@ -1,97 +0,0 @@
-use gpui::{AnyElement, Empty, Entity, FocusHandle, Focusable, ListState, Subscription, list};
-use project::debugger::session::{Session, SessionEvent};
-use ui::prelude::*;
-use util::maybe;
-
-pub(crate) struct LoadedSourceList {
-    list: ListState,
-    invalidate: bool,
-    focus_handle: FocusHandle,
-    _subscription: Subscription,
-    session: Entity<Session>,
-}
-
-impl LoadedSourceList {
-    pub fn new(session: Entity<Session>, cx: &mut Context<Self>) -> Self {
-        let focus_handle = cx.focus_handle();
-        let list = ListState::new(0, gpui::ListAlignment::Top, px(1000.));
-
-        let _subscription = cx.subscribe(&session, |this, _, event, cx| match event {
-            SessionEvent::Stopped(_)
-            | SessionEvent::HistoricSnapshotSelected
-            | SessionEvent::LoadedSources => {
-                this.invalidate = true;
-                cx.notify();
-            }
-            _ => {}
-        });
-
-        Self {
-            list,
-            session,
-            focus_handle,
-            _subscription,
-            invalidate: true,
-        }
-    }
-
-    fn render_entry(&mut self, ix: usize, cx: &mut Context<Self>) -> AnyElement {
-        let Some(source) = maybe!({
-            self.session
-                .update(cx, |state, cx| state.loaded_sources(cx).get(ix).cloned())
-        }) else {
-            return Empty.into_any();
-        };
-
-        v_flex()
-            .rounded_md()
-            .w_full()
-            .group("")
-            .p_1()
-            .hover(|s| s.bg(cx.theme().colors().element_hover))
-            .child(
-                h_flex()
-                    .gap_0p5()
-                    .text_ui_sm(cx)
-                    .when_some(source.name.clone(), |this, name| this.child(name)),
-            )
-            .child(
-                h_flex()
-                    .text_ui_xs(cx)
-                    .text_color(cx.theme().colors().text_muted)
-                    .when_some(source.path, |this, path| this.child(path)),
-            )
-            .into_any()
-    }
-}
-
-impl Focusable for LoadedSourceList {
-    fn focus_handle(&self, _: &gpui::App) -> gpui::FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl Render for LoadedSourceList {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        if self.invalidate {
-            let len = self
-                .session
-                .update(cx, |session, cx| session.loaded_sources(cx).len());
-            self.list.reset(len);
-            self.invalidate = false;
-            cx.notify();
-        }
-
-        div()
-            .track_focus(&self.focus_handle)
-            .size_full()
-            .p_1()
-            .child(
-                list(
-                    self.list.clone(),
-                    cx.processor(|this, ix, _window, cx| this.render_entry(ix, cx)),
-                )
-                .size_full(),
-            )
-    }
-}
diff --git a/crates/debugger_ui/src/session/running/memory_view.rs b/crates/debugger_ui/src/session/running/memory_view.rs
deleted file mode 100644
index 55a8e8429e..0000000000
--- a/crates/debugger_ui/src/session/running/memory_view.rs
+++ /dev/null
@@ -1,935 +0,0 @@
-use std::{
-    cell::{LazyCell, RefCell, RefMut},
-    fmt::Write,
-    ops::RangeInclusive,
-    rc::Rc,
-    sync::{Arc, LazyLock},
-    time::Duration,
-};
-
-use editor::{Editor, EditorElement, EditorStyle};
-use gpui::{
-    Action, Along, AppContext, Axis, DismissEvent, DragMoveEvent, Empty, Entity, FocusHandle,
-    Focusable, ListHorizontalSizingBehavior, MouseButton, Point, ScrollStrategy, ScrollWheelEvent,
-    Subscription, Task, TextStyle, UniformList, UniformListScrollHandle, WeakEntity, actions,
-    anchored, deferred, uniform_list,
-};
-use notifications::status_toast::{StatusToast, ToastIcon};
-use project::debugger::{MemoryCell, dap_command::DataBreakpointContext, session::Session};
-use settings::Settings;
-use theme::ThemeSettings;
-use ui::{
-    ContextMenu, Divider, DropdownMenu, FluentBuilder, IntoElement, PopoverMenuHandle, Render,
-    ScrollableHandle, StatefulInteractiveElement, Tooltip, WithScrollbar, prelude::*,
-};
-use workspace::Workspace;
-
-use crate::{ToggleDataBreakpoint, session::running::stack_frame_list::StackFrameList};
-
-actions!(debugger, [GoToSelectedAddress]);
-
-pub(crate) struct MemoryView {
-    workspace: WeakEntity<Workspace>,
-    stack_frame_list: WeakEntity<StackFrameList>,
-    focus_handle: FocusHandle,
-    view_state_handle: ViewStateHandle,
-    query_editor: Entity<Editor>,
-    session: Entity<Session>,
-    width_picker_handle: PopoverMenuHandle<ContextMenu>,
-    is_writing_memory: bool,
-    open_context_menu: Option<(Entity<ContextMenu>, Point<Pixels>, Subscription)>,
-}
-
-impl Focusable for MemoryView {
-    fn focus_handle(&self, _: &ui::App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-#[derive(Clone, Debug)]
-struct Drag {
-    start_address: u64,
-    end_address: u64,
-}
-
-impl Drag {
-    fn contains(&self, address: u64) -> bool {
-        let range = self.memory_range();
-        range.contains(&address)
-    }
-
-    fn memory_range(&self) -> RangeInclusive<u64> {
-        if self.start_address < self.end_address {
-            self.start_address..=self.end_address
-        } else {
-            self.end_address..=self.start_address
-        }
-    }
-}
-#[derive(Clone, Debug)]
-enum SelectedMemoryRange {
-    DragUnderway(Drag),
-    DragComplete(Drag),
-}
-
-impl SelectedMemoryRange {
-    fn contains(&self, address: u64) -> bool {
-        match self {
-            SelectedMemoryRange::DragUnderway(drag) => drag.contains(address),
-            SelectedMemoryRange::DragComplete(drag) => drag.contains(address),
-        }
-    }
-    fn is_dragging(&self) -> bool {
-        matches!(self, SelectedMemoryRange::DragUnderway(_))
-    }
-    fn drag(&self) -> &Drag {
-        match self {
-            SelectedMemoryRange::DragUnderway(drag) => drag,
-            SelectedMemoryRange::DragComplete(drag) => drag,
-        }
-    }
-}
-
-#[derive(Clone)]
-struct ViewStateHandle(Rc<RefCell<ViewState>>);
-
-impl ViewStateHandle {
-    fn new(base_row: u64, line_width: ViewWidth) -> Self {
-        Self(Rc::new(RefCell::new(ViewState::new(base_row, line_width))))
-    }
-}
-
-#[derive(Clone)]
-struct ViewState {
-    /// Uppermost row index
-    base_row: u64,
-    /// How many cells per row do we have?
-    line_width: ViewWidth,
-    scroll_handle: UniformListScrollHandle,
-    selection: Option<SelectedMemoryRange>,
-}
-
-impl ViewState {
-    fn new(base_row: u64, line_width: ViewWidth) -> Self {
-        Self {
-            scroll_handle: UniformListScrollHandle::new(),
-            base_row,
-            line_width,
-            selection: None,
-        }
-    }
-    fn row_count(&self) -> u64 {
-        // This was picked fully arbitrarily. There's no incentive for us to care about page sizes other than the fact that it seems to be a good
-        // middle ground for data size.
-        const PAGE_SIZE: u64 = 4096;
-        PAGE_SIZE / self.line_width.width as u64
-    }
-    fn schedule_scroll_down(&mut self) {
-        self.base_row = self.base_row.saturating_add(1)
-    }
-    fn schedule_scroll_up(&mut self) {
-        self.base_row = self.base_row.saturating_sub(1);
-    }
-
-    fn set_offset(&mut self, point: Point<Pixels>) {
-        if point.y >= -Pixels::ZERO {
-            self.schedule_scroll_up();
-        } else if point.y <= -self.scroll_handle.max_offset().height {
-            self.schedule_scroll_down();
-        }
-        self.scroll_handle.set_offset(point);
-    }
-}
-
-impl ScrollableHandle for ViewStateHandle {
-    fn max_offset(&self) -> gpui::Size<Pixels> {
-        self.0.borrow().scroll_handle.max_offset()
-    }
-
-    fn set_offset(&self, point: Point<Pixels>) {
-        self.0.borrow_mut().set_offset(point);
-    }
-
-    fn offset(&self) -> Point<Pixels> {
-        self.0.borrow().scroll_handle.offset()
-    }
-
-    fn viewport(&self) -> gpui::Bounds<Pixels> {
-        self.0.borrow().scroll_handle.viewport()
-    }
-}
-
-static HEX_BYTES_MEMOIZED: LazyLock<[SharedString; 256]> =
-    LazyLock::new(|| std::array::from_fn(|byte| SharedString::from(format!("{byte:02X}"))));
-static UNKNOWN_BYTE: SharedString = SharedString::new_static("??");
-
-impl MemoryView {
-    pub(crate) fn new(
-        session: Entity<Session>,
-        workspace: WeakEntity<Workspace>,
-        stack_frame_list: WeakEntity<StackFrameList>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let view_state_handle = ViewStateHandle::new(0, WIDTHS[4].clone());
-
-        let query_editor = cx.new(|cx| Editor::single_line(window, cx));
-
-        let mut this = Self {
-            workspace,
-            stack_frame_list,
-            focus_handle: cx.focus_handle(),
-            view_state_handle,
-            query_editor,
-            session,
-            width_picker_handle: Default::default(),
-            is_writing_memory: true,
-            open_context_menu: None,
-        };
-        this.change_query_bar_mode(false, window, cx);
-        cx.on_focus_out(&this.focus_handle, window, |this, _, window, cx| {
-            this.change_query_bar_mode(false, window, cx);
-            cx.notify();
-        })
-        .detach();
-        this
-    }
-
-    fn view_state(&self) -> RefMut<'_, ViewState> {
-        self.view_state_handle.0.borrow_mut()
-    }
-
-    fn render_memory(&self, cx: &mut Context<Self>) -> UniformList {
-        let weak = cx.weak_entity();
-        let session = self.session.clone();
-        let view_state = self.view_state_handle.0.borrow().clone();
-        uniform_list(
-            "debugger-memory-view",
-            view_state.row_count() as usize,
-            move |range, _, cx| {
-                let mut line_buffer = Vec::with_capacity(view_state.line_width.width as usize);
-                let memory_start =
-                    (view_state.base_row + range.start as u64) * view_state.line_width.width as u64;
-                let memory_end = (view_state.base_row + range.end as u64)
-                    * view_state.line_width.width as u64
-                    - 1;
-                let mut memory = session.update(cx, |this, cx| {
-                    this.read_memory(memory_start..=memory_end, cx)
-                });
-                let mut rows = Vec::with_capacity(range.end - range.start);
-                for ix in range {
-                    line_buffer.extend((&mut memory).take(view_state.line_width.width as usize));
-                    rows.push(render_single_memory_view_line(
-                        &line_buffer,
-                        ix as u64,
-                        weak.clone(),
-                        cx,
-                    ));
-                    line_buffer.clear();
-                }
-                rows
-            },
-        )
-        .track_scroll(&view_state.scroll_handle)
-        .with_horizontal_sizing_behavior(ListHorizontalSizingBehavior::Unconstrained)
-        .on_scroll_wheel(cx.listener(|this, evt: &ScrollWheelEvent, window, _| {
-            let mut view_state = this.view_state();
-            let delta = evt.delta.pixel_delta(window.line_height());
-            let current_offset = view_state.scroll_handle.offset();
-            view_state
-                .set_offset(current_offset.apply_along(Axis::Vertical, |offset| offset + delta.y));
-        }))
-    }
-    fn render_query_bar(&self, cx: &Context<Self>) -> impl IntoElement {
-        EditorElement::new(
-            &self.query_editor,
-            Self::editor_style(&self.query_editor, cx),
-        )
-    }
-    pub(super) fn go_to_memory_reference(
-        &mut self,
-        memory_reference: &str,
-        evaluate_name: Option<&str>,
-        stack_frame_id: Option<u64>,
-        cx: &mut Context<Self>,
-    ) {
-        use parse_int::parse;
-        let Ok(as_address) = parse::<u64>(memory_reference) else {
-            return;
-        };
-        let access_size = evaluate_name
-            .map(|typ| {
-                self.session.update(cx, |this, cx| {
-                    this.data_access_size(stack_frame_id, typ, cx)
-                })
-            })
-            .unwrap_or_else(|| Task::ready(None));
-        cx.spawn(async move |this, cx| {
-            let access_size = access_size.await.unwrap_or(1);
-            this.update(cx, |this, cx| {
-                this.view_state().selection = Some(SelectedMemoryRange::DragComplete(Drag {
-                    start_address: as_address,
-                    end_address: as_address + access_size - 1,
-                }));
-                this.jump_to_address(as_address, cx);
-            })
-            .ok();
-        })
-        .detach();
-    }
-
-    fn handle_memory_drag(&mut self, evt: &DragMoveEvent<Drag>) {
-        let mut view_state = self.view_state();
-        if !view_state
-            .selection
-            .as_ref()
-            .is_some_and(|selection| selection.is_dragging())
-        {
-            return;
-        }
-        let row_count = view_state.row_count();
-        debug_assert!(row_count > 1);
-        let scroll_handle = &view_state.scroll_handle;
-        let viewport = scroll_handle.viewport();
-
-        if viewport.bottom() < evt.event.position.y {
-            view_state.schedule_scroll_down();
-        } else if viewport.top() > evt.event.position.y {
-            view_state.schedule_scroll_up();
-        }
-    }
-
-    fn editor_style(editor: &Entity<Editor>, cx: &Context<Self>) -> EditorStyle {
-        let is_read_only = editor.read(cx).read_only(cx);
-        let settings = ThemeSettings::get_global(cx);
-        let theme = cx.theme();
-        let text_style = TextStyle {
-            color: if is_read_only {
-                theme.colors().text_muted
-            } else {
-                theme.colors().text
-            },
-            font_family: settings.buffer_font.family.clone(),
-            font_features: settings.buffer_font.features.clone(),
-            font_size: TextSize::Small.rems(cx).into(),
-            font_weight: settings.buffer_font.weight,
-
-            ..Default::default()
-        };
-        EditorStyle {
-            background: theme.colors().editor_background,
-            local_player: theme.players().local(),
-            text: text_style,
-            ..Default::default()
-        }
-    }
-
-    fn render_width_picker(&self, window: &mut Window, cx: &mut Context<Self>) -> DropdownMenu {
-        let weak = cx.weak_entity();
-        let selected_width = self.view_state().line_width.clone();
-        DropdownMenu::new(
-            "memory-view-width-picker",
-            selected_width.label.clone(),
-            ContextMenu::build(window, cx, |mut this, window, cx| {
-                for width in &WIDTHS {
-                    let weak = weak.clone();
-                    let width = width.clone();
-                    this = this.entry(width.label.clone(), None, move |_, cx| {
-                        _ = weak.update(cx, |this, _| {
-                            let mut view_state = this.view_state();
-                            // Convert base ix between 2 line widths to keep the shown memory address roughly the same.
-                            // All widths are powers of 2, so the conversion should be lossless.
-                            match view_state.line_width.width.cmp(&width.width) {
-                                std::cmp::Ordering::Less => {
-                                    // We're converting up.
-                                    let shift = width.width.trailing_zeros()
-                                        - view_state.line_width.width.trailing_zeros();
-                                    view_state.base_row >>= shift;
-                                }
-                                std::cmp::Ordering::Greater => {
-                                    // We're converting down.
-                                    let shift = view_state.line_width.width.trailing_zeros()
-                                        - width.width.trailing_zeros();
-                                    view_state.base_row <<= shift;
-                                }
-                                _ => {}
-                            }
-                            view_state.line_width = width.clone();
-                        });
-                    });
-                }
-                if let Some(ix) = WIDTHS
-                    .iter()
-                    .position(|width| width.width == selected_width.width)
-                {
-                    for _ in 0..=ix {
-                        this.select_next(&Default::default(), window, cx);
-                    }
-                }
-                this
-            }),
-        )
-        .handle(self.width_picker_handle.clone())
-    }
-
-    fn page_down(&mut self, _: &menu::SelectLast, _: &mut Window, cx: &mut Context<Self>) {
-        let mut view_state = self.view_state();
-        view_state.base_row = view_state
-            .base_row
-            .overflowing_add(view_state.row_count())
-            .0;
-        cx.notify();
-    }
-    fn page_up(&mut self, _: &menu::SelectFirst, _: &mut Window, cx: &mut Context<Self>) {
-        let mut view_state = self.view_state();
-        view_state.base_row = view_state
-            .base_row
-            .overflowing_sub(view_state.row_count())
-            .0;
-        cx.notify();
-    }
-
-    fn change_query_bar_mode(
-        &mut self,
-        is_writing_memory: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if is_writing_memory == self.is_writing_memory {
-            return;
-        }
-        if !self.is_writing_memory {
-            self.query_editor.update(cx, |this, cx| {
-                this.clear(window, cx);
-                this.set_placeholder_text("Write to Selected Memory Range", window, cx);
-            });
-            self.is_writing_memory = true;
-            self.query_editor.focus_handle(cx).focus(window);
-        } else {
-            self.query_editor.update(cx, |this, cx| {
-                this.clear(window, cx);
-                this.set_placeholder_text("Go to Memory Address / Expression", window, cx);
-            });
-            self.is_writing_memory = false;
-        }
-    }
-
-    fn toggle_data_breakpoint(
-        &mut self,
-        _: &crate::ToggleDataBreakpoint,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(SelectedMemoryRange::DragComplete(selection)) =
-            self.view_state().selection.clone()
-        else {
-            return;
-        };
-        let range = selection.memory_range();
-        let context = Arc::new(DataBreakpointContext::Address {
-            address: range.start().to_string(),
-            bytes: Some(*range.end() - *range.start()),
-        });
-
-        self.session.update(cx, |this, cx| {
-            let data_breakpoint_info = this.data_breakpoint_info(context.clone(), None, cx);
-            cx.spawn(async move |this, cx| {
-                if let Some(info) = data_breakpoint_info.await {
-                    let Some(data_id) = info.data_id else {
-                        return;
-                    };
-                    _ = this.update(cx, |this, cx| {
-                        this.create_data_breakpoint(
-                            context,
-                            data_id.clone(),
-                            dap::DataBreakpoint {
-                                data_id,
-                                access_type: None,
-                                condition: None,
-                                hit_condition: None,
-                            },
-                            cx,
-                        );
-                    });
-                }
-            })
-            .detach();
-        })
-    }
-
-    fn confirm(&mut self, _: &menu::Confirm, window: &mut Window, cx: &mut Context<Self>) {
-        let selection = self.view_state().selection.clone();
-        if let Some(SelectedMemoryRange::DragComplete(drag)) = selection {
-            // Go into memory writing mode.
-            if !self.is_writing_memory {
-                let should_return = self.session.update(cx, |session, cx| {
-                    if !session
-                        .capabilities()
-                        .supports_write_memory_request
-                        .unwrap_or_default()
-                    {
-                        let adapter_name = session.adapter();
-                        // We cannot write memory with this adapter.
-                        _ = self.workspace.update(cx, |this, cx| {
-                            this.toggle_status_toast(
-                                StatusToast::new(format!(
-                                    "Debug Adapter `{adapter_name}` does not support writing to memory"
-                                ), cx, |this, cx| {
-                                    cx.spawn(async move |this, cx| {
-                                        cx.background_executor().timer(Duration::from_secs(2)).await;
-                                        _ = this.update(cx, |_, cx| {
-                                            cx.emit(DismissEvent)
-                                        });
-                                    }).detach();
-                                    this.icon(ToastIcon::new(IconName::XCircle).color(Color::Error))
-                                }),
-                                cx,
-                            );
-                        });
-                        true
-                    } else {
-                        false
-                    }
-                });
-                if should_return {
-                    return;
-                }
-
-                self.change_query_bar_mode(true, window, cx);
-            } else if self.query_editor.focus_handle(cx).is_focused(window) {
-                let mut text = self.query_editor.read(cx).text(cx);
-                if text.chars().any(|c| !c.is_ascii_hexdigit()) {
-                    // Interpret this text as a string and oh-so-conveniently convert it.
-                    text = text.bytes().map(|byte| format!("{:02x}", byte)).collect();
-                }
-                self.session.update(cx, |this, cx| {
-                    let range = drag.memory_range();
-
-                    if let Ok(as_hex) = hex::decode(text) {
-                        this.write_memory(*range.start(), &as_hex, cx);
-                    }
-                });
-                self.change_query_bar_mode(false, window, cx);
-            }
-
-            cx.notify();
-            return;
-        }
-        // Just change the currently viewed address.
-        if !self.query_editor.focus_handle(cx).is_focused(window) {
-            return;
-        }
-        self.jump_to_query_bar_address(cx);
-    }
-
-    fn jump_to_query_bar_address(&mut self, cx: &mut Context<Self>) {
-        use parse_int::parse;
-        let text = self.query_editor.read(cx).text(cx);
-
-        let Ok(as_address) = parse::<u64>(&text) else {
-            return self.jump_to_expression(text, cx);
-        };
-        self.jump_to_address(as_address, cx);
-    }
-
-    fn jump_to_address(&mut self, address: u64, cx: &mut Context<Self>) {
-        let mut view_state = self.view_state();
-        view_state.base_row = (address & !0xfff) / view_state.line_width.width as u64;
-        let line_ix = (address & 0xfff) / view_state.line_width.width as u64;
-        view_state
-            .scroll_handle
-            .scroll_to_item(line_ix as usize, ScrollStrategy::Center);
-        cx.notify();
-    }
-
-    fn jump_to_expression(&mut self, expr: String, cx: &mut Context<Self>) {
-        let Ok(selected_frame) = self
-            .stack_frame_list
-            .update(cx, |this, _| this.opened_stack_frame_id())
-        else {
-            return;
-        };
-        let expr = format!("?${{{expr}}}");
-        let reference = self.session.update(cx, |this, cx| {
-            this.memory_reference_of_expr(selected_frame, expr, cx)
-        });
-        cx.spawn(async move |this, cx| {
-            if let Some((reference, typ)) = reference.await {
-                _ = this.update(cx, |this, cx| {
-                    let sizeof_expr = if typ.as_ref().is_some_and(|t| {
-                        t.chars()
-                            .all(|c| c.is_whitespace() || c.is_alphabetic() || c == '*')
-                    }) {
-                        typ.as_deref()
-                    } else {
-                        None
-                    };
-                    this.go_to_memory_reference(&reference, sizeof_expr, selected_frame, cx);
-                });
-            }
-        })
-        .detach();
-    }
-
-    fn cancel(&mut self, _: &menu::Cancel, _: &mut Window, cx: &mut Context<Self>) {
-        self.view_state().selection = None;
-        cx.notify();
-    }
-
-    /// Jump to memory pointed to by selected memory range.
-    fn go_to_address(
-        &mut self,
-        _: &GoToSelectedAddress,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(SelectedMemoryRange::DragComplete(drag)) = self.view_state().selection.clone()
-        else {
-            return;
-        };
-        let range = drag.memory_range();
-        let Some(memory): Option<Vec<u8>> = self.session.update(cx, |this, cx| {
-            this.read_memory(range, cx).map(|cell| cell.0).collect()
-        }) else {
-            return;
-        };
-        if memory.len() > 8 {
-            return;
-        }
-        let zeros_to_write = 8 - memory.len();
-        let mut acc = String::from("0x");
-        acc.extend(std::iter::repeat("00").take(zeros_to_write));
-        let as_query = memory.into_iter().rev().fold(acc, |mut acc, byte| {
-            _ = write!(&mut acc, "{:02x}", byte);
-            acc
-        });
-        self.query_editor.update(cx, |this, cx| {
-            this.set_text(as_query, window, cx);
-        });
-        self.jump_to_query_bar_address(cx);
-    }
-
-    fn deploy_memory_context_menu(
-        &mut self,
-        range: RangeInclusive<u64>,
-        position: Point<Pixels>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let session = self.session.clone();
-        let context_menu = ContextMenu::build(window, cx, |menu, _, cx| {
-            let range_too_large = range.end() - range.start() > std::mem::size_of::<u64>() as u64;
-            let caps = session.read(cx).capabilities();
-            let supports_data_breakpoints = caps.supports_data_breakpoints.unwrap_or_default()
-                && caps.supports_data_breakpoint_bytes.unwrap_or_default();
-            let memory_unreadable = LazyCell::new(|| {
-                session.update(cx, |this, cx| {
-                    this.read_memory(range.clone(), cx)
-                        .any(|cell| cell.0.is_none())
-                })
-            });
-
-            let mut menu = menu.action_disabled_when(
-                range_too_large || *memory_unreadable,
-                "Go To Selected Address",
-                GoToSelectedAddress.boxed_clone(),
-            );
-
-            if supports_data_breakpoints {
-                menu = menu.action_disabled_when(
-                    *memory_unreadable,
-                    "Set Data Breakpoint",
-                    ToggleDataBreakpoint { access_type: None }.boxed_clone(),
-                );
-            }
-            menu.context(self.focus_handle.clone())
-        });
-
-        cx.focus_view(&context_menu, window);
-        let subscription = cx.subscribe_in(
-            &context_menu,
-            window,
-            |this, _, _: &DismissEvent, window, cx| {
-                if this.open_context_menu.as_ref().is_some_and(|context_menu| {
-                    context_menu.0.focus_handle(cx).contains_focused(window, cx)
-                }) {
-                    cx.focus_self(window);
-                }
-                this.open_context_menu.take();
-                cx.notify();
-            },
-        );
-
-        self.open_context_menu = Some((context_menu, position, subscription));
-    }
-}
-
-#[derive(Clone)]
-struct ViewWidth {
-    width: u8,
-    label: SharedString,
-}
-
-impl ViewWidth {
-    const fn new(width: u8, label: &'static str) -> Self {
-        Self {
-            width,
-            label: SharedString::new_static(label),
-        }
-    }
-}
-
-static WIDTHS: [ViewWidth; 7] = [
-    ViewWidth::new(1, "1 byte"),
-    ViewWidth::new(2, "2 bytes"),
-    ViewWidth::new(4, "4 bytes"),
-    ViewWidth::new(8, "8 bytes"),
-    ViewWidth::new(16, "16 bytes"),
-    ViewWidth::new(32, "32 bytes"),
-    ViewWidth::new(64, "64 bytes"),
-];
-
-fn render_single_memory_view_line(
-    memory: &[MemoryCell],
-    ix: u64,
-    weak: gpui::WeakEntity<MemoryView>,
-    cx: &mut App,
-) -> AnyElement {
-    let Ok(view_state) = weak.update(cx, |this, _| this.view_state().clone()) else {
-        return div().into_any();
-    };
-    let base_address = (view_state.base_row + ix) * view_state.line_width.width as u64;
-
-    h_flex()
-        .id((
-            "memory-view-row-full",
-            ix * view_state.line_width.width as u64,
-        ))
-        .size_full()
-        .gap_x_2()
-        .child(
-            div()
-                .child(
-                    Label::new(format!("{:016X}", base_address))
-                        .buffer_font(cx)
-                        .size(ui::LabelSize::Small)
-                        .color(Color::Muted),
-                )
-                .px_1()
-                .border_r_1()
-                .border_color(Color::Muted.color(cx)),
-        )
-        .child(
-            h_flex()
-                .id((
-                    "memory-view-row-raw-memory",
-                    ix * view_state.line_width.width as u64,
-                ))
-                .px_1()
-                .children(memory.iter().enumerate().map(|(cell_ix, cell)| {
-                    let weak = weak.clone();
-                    div()
-                        .id(("memory-view-row-raw-memory-cell", cell_ix as u64))
-                        .px_0p5()
-                        .when_some(view_state.selection.as_ref(), |this, selection| {
-                            this.when(selection.contains(base_address + cell_ix as u64), |this| {
-                                let weak = weak.clone();
-
-                                this.bg(Color::Selected.color(cx).opacity(0.2)).when(
-                                    !selection.is_dragging(),
-                                    |this| {
-                                        let selection = selection.drag().memory_range();
-                                        this.on_mouse_down(
-                                            MouseButton::Right,
-                                            move |click, window, cx| {
-                                                _ = weak.update(cx, |this, cx| {
-                                                    this.deploy_memory_context_menu(
-                                                        selection.clone(),
-                                                        click.position,
-                                                        window,
-                                                        cx,
-                                                    )
-                                                });
-                                                cx.stop_propagation();
-                                            },
-                                        )
-                                    },
-                                )
-                            })
-                        })
-                        .child(
-                            Label::new(
-                                cell.0
-                                    .map(|val| HEX_BYTES_MEMOIZED[val as usize].clone())
-                                    .unwrap_or_else(|| UNKNOWN_BYTE.clone()),
-                            )
-                            .buffer_font(cx)
-                            .when(cell.0.is_none(), |this| this.color(Color::Muted))
-                            .size(ui::LabelSize::Small),
-                        )
-                        .on_drag(
-                            Drag {
-                                start_address: base_address + cell_ix as u64,
-                                end_address: base_address + cell_ix as u64,
-                            },
-                            {
-                                let weak = weak.clone();
-                                move |drag, _, _, cx| {
-                                    _ = weak.update(cx, |this, _| {
-                                        this.view_state().selection =
-                                            Some(SelectedMemoryRange::DragUnderway(drag.clone()));
-                                    });
-
-                                    cx.new(|_| Empty)
-                                }
-                            },
-                        )
-                        .on_drop({
-                            let weak = weak.clone();
-                            move |drag: &Drag, _, cx| {
-                                _ = weak.update(cx, |this, _| {
-                                    this.view_state().selection =
-                                        Some(SelectedMemoryRange::DragComplete(Drag {
-                                            start_address: drag.start_address,
-                                            end_address: base_address + cell_ix as u64,
-                                        }));
-                                });
-                            }
-                        })
-                        .drag_over(move |style, drag: &Drag, _, cx| {
-                            _ = weak.update(cx, |this, _| {
-                                this.view_state().selection =
-                                    Some(SelectedMemoryRange::DragUnderway(Drag {
-                                        start_address: drag.start_address,
-                                        end_address: base_address + cell_ix as u64,
-                                    }));
-                            });
-
-                            style
-                        })
-                })),
-        )
-        .child(
-            h_flex()
-                .id((
-                    "memory-view-row-ascii-memory",
-                    ix * view_state.line_width.width as u64,
-                ))
-                .h_full()
-                .px_1()
-                .mr_4()
-                // .gap_x_1p5()
-                .border_x_1()
-                .border_color(Color::Muted.color(cx))
-                .children(memory.iter().enumerate().map(|(ix, cell)| {
-                    let as_character = char::from(cell.0.unwrap_or(0));
-                    let as_visible = if as_character.is_ascii_graphic() {
-                        as_character
-                    } else {
-                        '·'
-                    };
-                    div()
-                        .px_0p5()
-                        .when_some(view_state.selection.as_ref(), |this, selection| {
-                            this.when(selection.contains(base_address + ix as u64), |this| {
-                                this.bg(Color::Selected.color(cx).opacity(0.2))
-                            })
-                        })
-                        .child(
-                            Label::new(format!("{as_visible}"))
-                                .buffer_font(cx)
-                                .when(cell.0.is_none(), |this| this.color(Color::Muted))
-                                .size(ui::LabelSize::Small),
-                        )
-                })),
-        )
-        .into_any()
-}
-
-impl Render for MemoryView {
-    fn render(
-        &mut self,
-        window: &mut ui::Window,
-        cx: &mut ui::Context<Self>,
-    ) -> impl ui::IntoElement {
-        let (icon, tooltip_text) = if self.is_writing_memory {
-            (IconName::Pencil, "Edit memory at a selected address")
-        } else {
-            (
-                IconName::LocationEdit,
-                "Change address of currently viewed memory",
-            )
-        };
-        v_flex()
-            .id("Memory-view")
-            .on_action(cx.listener(Self::cancel))
-            .on_action(cx.listener(Self::go_to_address))
-            .p_1()
-            .on_action(cx.listener(Self::confirm))
-            .on_action(cx.listener(Self::toggle_data_breakpoint))
-            .on_action(cx.listener(Self::page_down))
-            .on_action(cx.listener(Self::page_up))
-            .size_full()
-            .track_focus(&self.focus_handle)
-            .child(
-                h_flex()
-                    .w_full()
-                    .mb_0p5()
-                    .gap_1()
-                    .child(
-                        h_flex()
-                            .w_full()
-                            .rounded_md()
-                            .border_1()
-                            .gap_x_2()
-                            .px_2()
-                            .py_0p5()
-                            .mb_0p5()
-                            .bg(cx.theme().colors().editor_background)
-                            .when_else(
-                                self.query_editor
-                                    .focus_handle(cx)
-                                    .contains_focused(window, cx),
-                                |this| this.border_color(cx.theme().colors().border_focused),
-                                |this| this.border_color(cx.theme().colors().border_transparent),
-                            )
-                            .child(
-                                div()
-                                    .id("memory-view-editor-icon")
-                                    .child(Icon::new(icon).size(ui::IconSize::XSmall))
-                                    .tooltip(Tooltip::text(tooltip_text)),
-                            )
-                            .child(self.render_query_bar(cx)),
-                    )
-                    .child(self.render_width_picker(window, cx)),
-            )
-            .child(Divider::horizontal())
-            .child(
-                v_flex()
-                    .size_full()
-                    .on_drag_move(cx.listener(|this, evt, _, _| {
-                        this.handle_memory_drag(evt);
-                    }))
-                    .child(self.render_memory(cx).size_full())
-                    .children(self.open_context_menu.as_ref().map(|(menu, position, _)| {
-                        deferred(
-                            anchored()
-                                .position(*position)
-                                .anchor(gpui::Corner::TopLeft)
-                                .child(menu.clone()),
-                        )
-                        .with_priority(1)
-                    }))
-                    .custom_scrollbars(
-                        ui::Scrollbars::new(ui::ScrollAxes::Both)
-                            .tracked_scroll_handle(&self.view_state_handle)
-                            .with_track_along(
-                                ui::ScrollAxes::Both,
-                                cx.theme().colors().panel_background,
-                            )
-                            .tracked_entity(cx.entity_id()),
-                        window,
-                        cx,
-                    ),
-            )
-    }
-}
diff --git a/crates/debugger_ui/src/session/running/module_list.rs b/crates/debugger_ui/src/session/running/module_list.rs
deleted file mode 100644
index 7d0228fc68..0000000000
--- a/crates/debugger_ui/src/session/running/module_list.rs
+++ /dev/null
@@ -1,286 +0,0 @@
-use anyhow::anyhow;
-use dap::Module;
-use gpui::{
-    AnyElement, Entity, FocusHandle, Focusable, ScrollStrategy, Subscription, Task,
-    UniformListScrollHandle, WeakEntity, uniform_list,
-};
-use project::{
-    ProjectItem as _, ProjectPath,
-    debugger::session::{Session, SessionEvent},
-};
-use std::{ops::Range, path::Path, sync::Arc};
-use ui::{WithScrollbar, prelude::*};
-use workspace::Workspace;
-
-pub struct ModuleList {
-    scroll_handle: UniformListScrollHandle,
-    selected_ix: Option<usize>,
-    session: Entity<Session>,
-    workspace: WeakEntity<Workspace>,
-    focus_handle: FocusHandle,
-    entries: Vec<Module>,
-    _rebuild_task: Option<Task<()>>,
-    _subscription: Subscription,
-}
-
-impl ModuleList {
-    pub fn new(
-        session: Entity<Session>,
-        workspace: WeakEntity<Workspace>,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let focus_handle = cx.focus_handle();
-
-        let _subscription = cx.subscribe(&session, |this, _, event, cx| match event {
-            SessionEvent::Stopped(_)
-            | SessionEvent::HistoricSnapshotSelected
-            | SessionEvent::Modules => {
-                if this._rebuild_task.is_some() {
-                    this.schedule_rebuild(cx);
-                }
-            }
-            _ => {}
-        });
-
-        let scroll_handle = UniformListScrollHandle::new();
-
-        Self {
-            scroll_handle,
-            session,
-            workspace,
-            focus_handle,
-            entries: Vec::new(),
-            selected_ix: None,
-            _subscription,
-            _rebuild_task: None,
-        }
-    }
-
-    fn schedule_rebuild(&mut self, cx: &mut Context<Self>) {
-        self._rebuild_task = Some(cx.spawn(async move |this, cx| {
-            this.update(cx, |this, cx| {
-                let modules = this
-                    .session
-                    .update(cx, |session, cx| session.modules(cx).to_owned());
-                this.entries = modules;
-                cx.notify();
-            })
-            .ok();
-        }));
-    }
-
-    fn open_module(&mut self, path: Arc<Path>, window: &mut Window, cx: &mut Context<Self>) {
-        cx.spawn_in(window, async move |this, cx| {
-            let (worktree, relative_path) = this
-                .update(cx, |this, cx| {
-                    this.workspace.update(cx, |workspace, cx| {
-                        workspace.project().update(cx, |this, cx| {
-                            this.find_or_create_worktree(&path, false, cx)
-                        })
-                    })
-                })??
-                .await?;
-
-            let buffer = this
-                .update(cx, |this, cx| {
-                    this.workspace.update(cx, |this, cx| {
-                        this.project().update(cx, |this, cx| {
-                            let worktree_id = worktree.read(cx).id();
-                            this.open_buffer(
-                                ProjectPath {
-                                    worktree_id,
-                                    path: relative_path,
-                                },
-                                cx,
-                            )
-                        })
-                    })
-                })??
-                .await?;
-
-            this.update_in(cx, |this, window, cx| {
-                this.workspace.update(cx, |workspace, cx| {
-                    let project_path = buffer.read(cx).project_path(cx).ok_or_else(|| {
-                        anyhow!("Could not select a stack frame for unnamed buffer")
-                    })?;
-                    anyhow::Ok(workspace.open_path_preview(
-                        project_path,
-                        None,
-                        false,
-                        true,
-                        true,
-                        window,
-                        cx,
-                    ))
-                })
-            })???
-            .await?;
-
-            anyhow::Ok(())
-        })
-        .detach();
-    }
-
-    fn render_entry(&mut self, ix: usize, cx: &mut Context<Self>) -> AnyElement {
-        let module = self.entries[ix].clone();
-
-        v_flex()
-            .rounded_md()
-            .w_full()
-            .group("")
-            .id(("module-list", ix))
-            .on_any_mouse_down(|_, _, cx| {
-                cx.stop_propagation();
-            })
-            .when(module.path.is_some(), |this| {
-                this.on_click({
-                    let path = module
-                        .path
-                        .as_deref()
-                        .map(|path| Arc::<Path>::from(Path::new(path)));
-                    cx.listener(move |this, _, window, cx| {
-                        this.selected_ix = Some(ix);
-                        if let Some(path) = path.as_ref() {
-                            this.open_module(path.clone(), window, cx);
-                        }
-                        cx.notify();
-                    })
-                })
-            })
-            .p_1()
-            .hover(|s| s.bg(cx.theme().colors().element_hover))
-            .when(Some(ix) == self.selected_ix, |s| {
-                s.bg(cx.theme().colors().element_hover)
-            })
-            .child(h_flex().gap_0p5().text_ui_sm(cx).child(module.name.clone()))
-            .child(
-                h_flex()
-                    .text_ui_xs(cx)
-                    .text_color(cx.theme().colors().text_muted)
-                    .when_some(module.path, |this, path| this.child(path)),
-            )
-            .into_any()
-    }
-
-    #[cfg(test)]
-    pub(crate) fn modules(&self, cx: &mut Context<Self>) -> Vec<dap::Module> {
-        self.session
-            .update(cx, |session, cx| session.modules(cx).to_vec())
-    }
-
-    fn confirm(&mut self, _: &menu::Confirm, window: &mut Window, cx: &mut Context<Self>) {
-        let Some(ix) = self.selected_ix else { return };
-        let Some(entry) = self.entries.get(ix) else {
-            return;
-        };
-        let Some(path) = entry.path.as_deref() else {
-            return;
-        };
-        let path = Arc::from(Path::new(path));
-        self.open_module(path, window, cx);
-    }
-
-    fn select_ix(&mut self, ix: Option<usize>, cx: &mut Context<Self>) {
-        self.selected_ix = ix;
-        if let Some(ix) = ix {
-            self.scroll_handle
-                .scroll_to_item(ix, ScrollStrategy::Center);
-        }
-        cx.notify();
-    }
-
-    fn select_next(&mut self, _: &menu::SelectNext, _window: &mut Window, cx: &mut Context<Self>) {
-        let ix = match self.selected_ix {
-            _ if self.entries.is_empty() => None,
-            None => Some(0),
-            Some(ix) => {
-                if ix == self.entries.len() - 1 {
-                    Some(0)
-                } else {
-                    Some(ix + 1)
-                }
-            }
-        };
-        self.select_ix(ix, cx);
-    }
-
-    fn select_previous(
-        &mut self,
-        _: &menu::SelectPrevious,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let ix = match self.selected_ix {
-            _ if self.entries.is_empty() => None,
-            None => Some(self.entries.len() - 1),
-            Some(ix) => {
-                if ix == 0 {
-                    Some(self.entries.len() - 1)
-                } else {
-                    Some(ix - 1)
-                }
-            }
-        };
-        self.select_ix(ix, cx);
-    }
-
-    fn select_first(
-        &mut self,
-        _: &menu::SelectFirst,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let ix = if !self.entries.is_empty() {
-            Some(0)
-        } else {
-            None
-        };
-        self.select_ix(ix, cx);
-    }
-
-    fn select_last(&mut self, _: &menu::SelectLast, _window: &mut Window, cx: &mut Context<Self>) {
-        let ix = if !self.entries.is_empty() {
-            Some(self.entries.len() - 1)
-        } else {
-            None
-        };
-        self.select_ix(ix, cx);
-    }
-
-    fn render_list(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        uniform_list(
-            "module-list",
-            self.entries.len(),
-            cx.processor(|this, range: Range<usize>, _window, cx| {
-                range.map(|ix| this.render_entry(ix, cx)).collect()
-            }),
-        )
-        .track_scroll(&self.scroll_handle)
-        .size_full()
-    }
-}
-
-impl Focusable for ModuleList {
-    fn focus_handle(&self, _: &gpui::App) -> gpui::FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl Render for ModuleList {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        if self._rebuild_task.is_none() {
-            self.schedule_rebuild(cx);
-        }
-        div()
-            .track_focus(&self.focus_handle)
-            .on_action(cx.listener(Self::select_last))
-            .on_action(cx.listener(Self::select_first))
-            .on_action(cx.listener(Self::select_next))
-            .on_action(cx.listener(Self::select_previous))
-            .on_action(cx.listener(Self::confirm))
-            .size_full()
-            .p_1()
-            .child(self.render_list(window, cx))
-            .vertical_scrollbar_for(&self.scroll_handle, window, cx)
-    }
-}
diff --git a/crates/debugger_ui/src/session/running/stack_frame_list.rs b/crates/debugger_ui/src/session/running/stack_frame_list.rs
deleted file mode 100644
index 4dffb57a79..0000000000
--- a/crates/debugger_ui/src/session/running/stack_frame_list.rs
+++ /dev/null
@@ -1,933 +0,0 @@
-use std::path::Path;
-use std::sync::Arc;
-use std::time::Duration;
-
-use anyhow::{Context as _, Result, anyhow};
-use dap::StackFrameId;
-use dap::adapters::DebugAdapterName;
-use db::kvp::KEY_VALUE_STORE;
-use gpui::{
-    Action, AnyElement, Entity, EventEmitter, FocusHandle, Focusable, FontWeight, ListState,
-    Subscription, Task, WeakEntity, list,
-};
-use util::{
-    debug_panic,
-    paths::{PathStyle, is_absolute},
-};
-
-use crate::{StackTraceView, ToggleUserFrames};
-use language::PointUtf16;
-use project::debugger::breakpoint_store::ActiveStackFrame;
-use project::debugger::session::{Session, SessionEvent, StackFrame, ThreadStatus};
-use project::{ProjectItem, ProjectPath};
-use ui::{Tooltip, WithScrollbar, prelude::*};
-use workspace::{ItemHandle, Workspace, WorkspaceId};
-
-use super::RunningState;
-
-#[derive(Debug)]
-pub enum StackFrameListEvent {
-    SelectedStackFrameChanged(StackFrameId),
-    BuiltEntries,
-}
-
-/// Represents the filter applied to the stack frame list
-#[derive(PartialEq, Eq, Copy, Clone, Debug)]
-pub(crate) enum StackFrameFilter {
-    /// Show all frames
-    All,
-    /// Show only frames from the user's code
-    OnlyUserFrames,
-}
-
-impl StackFrameFilter {
-    fn from_str_or_default(s: impl AsRef<str>) -> Self {
-        match s.as_ref() {
-            "user" => StackFrameFilter::OnlyUserFrames,
-            "all" => StackFrameFilter::All,
-            _ => StackFrameFilter::All,
-        }
-    }
-}
-
-impl From<StackFrameFilter> for String {
-    fn from(filter: StackFrameFilter) -> Self {
-        match filter {
-            StackFrameFilter::All => "all".to_string(),
-            StackFrameFilter::OnlyUserFrames => "user".to_string(),
-        }
-    }
-}
-
-pub(crate) fn stack_frame_filter_key(
-    adapter_name: &DebugAdapterName,
-    workspace_id: WorkspaceId,
-) -> String {
-    let database_id: i64 = workspace_id.into();
-    format!("stack-frame-list-filter-{}-{}", adapter_name.0, database_id)
-}
-
-pub struct StackFrameList {
-    focus_handle: FocusHandle,
-    _subscription: Subscription,
-    session: Entity<Session>,
-    state: WeakEntity<RunningState>,
-    entries: Vec<StackFrameEntry>,
-    workspace: WeakEntity<Workspace>,
-    selected_ix: Option<usize>,
-    opened_stack_frame_id: Option<StackFrameId>,
-    list_state: ListState,
-    list_filter: StackFrameFilter,
-    filter_entries_indices: Vec<usize>,
-    error: Option<SharedString>,
-    _refresh_task: Task<()>,
-}
-
-#[derive(Debug, PartialEq, Eq)]
-pub enum StackFrameEntry {
-    Normal(dap::StackFrame),
-    /// Used to indicate that the frame is artificial and is a visual label or separator
-    Label(dap::StackFrame),
-    Collapsed(Vec<dap::StackFrame>),
-}
-
-impl StackFrameList {
-    pub fn new(
-        workspace: WeakEntity<Workspace>,
-        session: Entity<Session>,
-        state: WeakEntity<RunningState>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let focus_handle = cx.focus_handle();
-
-        let _subscription =
-            cx.subscribe_in(&session, window, |this, _, event, window, cx| match event {
-                SessionEvent::Threads => {
-                    this.schedule_refresh(false, window, cx);
-                }
-                SessionEvent::Stopped(..)
-                | SessionEvent::StackTrace
-                | SessionEvent::HistoricSnapshotSelected => {
-                    this.schedule_refresh(true, window, cx);
-                }
-                _ => {}
-            });
-
-        let list_state = ListState::new(0, gpui::ListAlignment::Top, px(1000.));
-
-        let list_filter = workspace
-            .read_with(cx, |workspace, _| workspace.database_id())
-            .ok()
-            .flatten()
-            .and_then(|database_id| {
-                let key = stack_frame_filter_key(&session.read(cx).adapter(), database_id);
-                KEY_VALUE_STORE
-                    .read_kvp(&key)
-                    .ok()
-                    .flatten()
-                    .map(StackFrameFilter::from_str_or_default)
-            })
-            .unwrap_or(StackFrameFilter::All);
-
-        let mut this = Self {
-            session,
-            workspace,
-            focus_handle,
-            state,
-            _subscription,
-            entries: Default::default(),
-            filter_entries_indices: Vec::default(),
-            error: None,
-            selected_ix: None,
-            opened_stack_frame_id: None,
-            list_filter,
-            list_state,
-            _refresh_task: Task::ready(()),
-        };
-        this.schedule_refresh(true, window, cx);
-        this
-    }
-
-    #[cfg(test)]
-    pub(crate) fn entries(&self) -> &Vec<StackFrameEntry> {
-        &self.entries
-    }
-
-    pub(crate) fn flatten_entries(
-        &self,
-        show_collapsed: bool,
-        show_labels: bool,
-    ) -> Vec<dap::StackFrame> {
-        self.entries
-            .iter()
-            .enumerate()
-            .filter(|(ix, _)| {
-                self.list_filter == StackFrameFilter::All
-                    || self
-                        .filter_entries_indices
-                        .binary_search_by_key(&ix, |ix| ix)
-                        .is_ok()
-            })
-            .flat_map(|(_, frame)| match frame {
-                StackFrameEntry::Normal(frame) => vec![frame.clone()],
-                StackFrameEntry::Label(frame) if show_labels => vec![frame.clone()],
-                StackFrameEntry::Collapsed(frames) if show_collapsed => frames.clone(),
-                _ => vec![],
-            })
-            .collect::<Vec<_>>()
-    }
-
-    fn stack_frames(&self, cx: &mut App) -> Result<Vec<StackFrame>> {
-        if let Ok(Some(thread_id)) = self.state.read_with(cx, |state, _| state.thread_id) {
-            self.session
-                .update(cx, |this, cx| this.stack_frames(thread_id, cx))
-        } else {
-            Ok(Vec::default())
-        }
-    }
-
-    #[cfg(test)]
-    pub(crate) fn dap_stack_frames(&self, cx: &mut App) -> Vec<dap::StackFrame> {
-        match self.list_filter {
-            StackFrameFilter::All => self
-                .stack_frames(cx)
-                .unwrap_or_default()
-                .into_iter()
-                .map(|stack_frame| stack_frame.dap)
-                .collect(),
-            StackFrameFilter::OnlyUserFrames => self
-                .filter_entries_indices
-                .iter()
-                .map(|ix| match &self.entries[*ix] {
-                    StackFrameEntry::Label(label) => label,
-                    StackFrameEntry::Collapsed(_) => panic!("Collapsed tabs should not be visible"),
-                    StackFrameEntry::Normal(frame) => frame,
-                })
-                .cloned()
-                .collect(),
-        }
-    }
-
-    #[cfg(test)]
-    pub(crate) fn list_filter(&self) -> StackFrameFilter {
-        self.list_filter
-    }
-
-    pub fn opened_stack_frame_id(&self) -> Option<StackFrameId> {
-        self.opened_stack_frame_id
-    }
-
-    pub(super) fn schedule_refresh(
-        &mut self,
-        select_first: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        const REFRESH_DEBOUNCE: Duration = Duration::from_millis(20);
-
-        self._refresh_task = cx.spawn_in(window, async move |this, cx| {
-            let debounce = this
-                .update(cx, |this, cx| {
-                    let new_stack_frames = this.stack_frames(cx);
-                    new_stack_frames.unwrap_or_default().is_empty() && !this.entries.is_empty()
-                })
-                .ok()
-                .unwrap_or_default();
-
-            if debounce {
-                cx.background_executor().timer(REFRESH_DEBOUNCE).await;
-            }
-            this.update_in(cx, |this, window, cx| {
-                this.build_entries(select_first, window, cx);
-            })
-            .ok();
-        })
-    }
-
-    pub fn build_entries(
-        &mut self,
-        open_first_stack_frame: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let old_selected_frame_id = self
-            .selected_ix
-            .and_then(|ix| self.entries.get(ix))
-            .and_then(|entry| match entry {
-                StackFrameEntry::Normal(stack_frame) => Some(stack_frame.id),
-                StackFrameEntry::Collapsed(_) | StackFrameEntry::Label(_) => None,
-            });
-        let mut entries = Vec::new();
-        let mut collapsed_entries = Vec::new();
-        let mut first_stack_frame = None;
-        let mut first_stack_frame_with_path = None;
-
-        let stack_frames = match self.stack_frames(cx) {
-            Ok(stack_frames) => stack_frames,
-            Err(e) => {
-                self.error = Some(format!("{}", e).into());
-                self.entries.clear();
-                self.selected_ix = None;
-                self.list_state.reset(0);
-                self.filter_entries_indices.clear();
-                cx.emit(StackFrameListEvent::BuiltEntries);
-                cx.notify();
-                return;
-            }
-        };
-
-        let worktree_prefixes: Vec<_> = self
-            .workspace
-            .read_with(cx, |workspace, cx| {
-                workspace
-                    .visible_worktrees(cx)
-                    .map(|tree| tree.read(cx).abs_path())
-                    .collect()
-            })
-            .unwrap_or_default();
-
-        let mut filter_entries_indices = Vec::default();
-        for stack_frame in stack_frames.iter() {
-            let frame_in_visible_worktree = stack_frame.dap.source.as_ref().is_some_and(|source| {
-                source.path.as_ref().is_some_and(|path| {
-                    worktree_prefixes
-                        .iter()
-                        .filter_map(|tree| tree.to_str())
-                        .any(|tree| path.starts_with(tree))
-                })
-            });
-
-            match stack_frame.dap.presentation_hint {
-                Some(dap::StackFramePresentationHint::Deemphasize)
-                | Some(dap::StackFramePresentationHint::Subtle) => {
-                    collapsed_entries.push(stack_frame.dap.clone());
-                }
-                Some(dap::StackFramePresentationHint::Label) => {
-                    entries.push(StackFrameEntry::Label(stack_frame.dap.clone()));
-                }
-                _ => {
-                    let collapsed_entries = std::mem::take(&mut collapsed_entries);
-                    if !collapsed_entries.is_empty() {
-                        entries.push(StackFrameEntry::Collapsed(collapsed_entries.clone()));
-                    }
-
-                    first_stack_frame.get_or_insert(entries.len());
-
-                    if stack_frame
-                        .dap
-                        .source
-                        .as_ref()
-                        .is_some_and(|source| source.path.is_some())
-                    {
-                        first_stack_frame_with_path.get_or_insert(entries.len());
-                    }
-                    entries.push(StackFrameEntry::Normal(stack_frame.dap.clone()));
-                    if frame_in_visible_worktree {
-                        filter_entries_indices.push(entries.len() - 1);
-                    }
-                }
-            }
-        }
-
-        let collapsed_entries = std::mem::take(&mut collapsed_entries);
-        if !collapsed_entries.is_empty() {
-            entries.push(StackFrameEntry::Collapsed(collapsed_entries));
-        }
-        self.entries = entries;
-        self.filter_entries_indices = filter_entries_indices;
-
-        if let Some(ix) = first_stack_frame_with_path
-            .or(first_stack_frame)
-            .filter(|_| open_first_stack_frame)
-        {
-            self.select_ix(Some(ix), cx);
-            self.activate_selected_entry(window, cx);
-        } else if let Some(old_selected_frame_id) = old_selected_frame_id {
-            let ix = self.entries.iter().position(|entry| match entry {
-                StackFrameEntry::Normal(frame) => frame.id == old_selected_frame_id,
-                StackFrameEntry::Collapsed(_) | StackFrameEntry::Label(_) => false,
-            });
-            self.selected_ix = ix;
-        }
-
-        match self.list_filter {
-            StackFrameFilter::All => {
-                self.list_state.reset(self.entries.len());
-            }
-            StackFrameFilter::OnlyUserFrames => {
-                self.list_state.reset(self.filter_entries_indices.len());
-            }
-        }
-        cx.emit(StackFrameListEvent::BuiltEntries);
-        cx.notify();
-    }
-
-    pub fn go_to_stack_frame(
-        &mut self,
-        stack_frame_id: StackFrameId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let Some(stack_frame) = self
-            .entries
-            .iter()
-            .flat_map(|entry| match entry {
-                StackFrameEntry::Label(stack_frame) => std::slice::from_ref(stack_frame),
-                StackFrameEntry::Normal(stack_frame) => std::slice::from_ref(stack_frame),
-                StackFrameEntry::Collapsed(stack_frames) => stack_frames.as_slice(),
-            })
-            .find(|stack_frame| stack_frame.id == stack_frame_id)
-            .cloned()
-        else {
-            return Task::ready(Err(anyhow!("No stack frame for ID")));
-        };
-        self.go_to_stack_frame_inner(stack_frame, window, cx)
-    }
-
-    fn go_to_stack_frame_inner(
-        &mut self,
-        stack_frame: dap::StackFrame,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let stack_frame_id = stack_frame.id;
-        self.opened_stack_frame_id = Some(stack_frame_id);
-        let Some(abs_path) = Self::abs_path_from_stack_frame(&stack_frame) else {
-            return Task::ready(Err(anyhow!("Project path not found")));
-        };
-        let row = stack_frame.line.saturating_sub(1) as u32;
-        cx.emit(StackFrameListEvent::SelectedStackFrameChanged(
-            stack_frame_id,
-        ));
-        cx.spawn_in(window, async move |this, cx| {
-            let (worktree, relative_path) = this
-                .update(cx, |this, cx| {
-                    this.workspace.update(cx, |workspace, cx| {
-                        workspace.project().update(cx, |this, cx| {
-                            this.find_or_create_worktree(&abs_path, false, cx)
-                        })
-                    })
-                })??
-                .await?;
-            let buffer = this
-                .update(cx, |this, cx| {
-                    this.workspace.update(cx, |this, cx| {
-                        this.project().update(cx, |this, cx| {
-                            let worktree_id = worktree.read(cx).id();
-                            this.open_buffer(
-                                ProjectPath {
-                                    worktree_id,
-                                    path: relative_path,
-                                },
-                                cx,
-                            )
-                        })
-                    })
-                })??
-                .await?;
-            let position = buffer.read_with(cx, |this, _| {
-                this.snapshot().anchor_after(PointUtf16::new(row, 0))
-            })?;
-            this.update_in(cx, |this, window, cx| {
-                this.workspace.update(cx, |workspace, cx| {
-                    let project_path = buffer
-                        .read(cx)
-                        .project_path(cx)
-                        .context("Could not select a stack frame for unnamed buffer")?;
-
-                    let open_preview = !workspace
-                        .item_of_type::<StackTraceView>(cx)
-                        .map(|viewer| {
-                            workspace
-                                .active_item(cx)
-                                .is_some_and(|item| item.item_id() == viewer.item_id())
-                        })
-                        .unwrap_or_default();
-
-                    anyhow::Ok(workspace.open_path_preview(
-                        project_path,
-                        None,
-                        true,
-                        true,
-                        open_preview,
-                        window,
-                        cx,
-                    ))
-                })
-            })???
-            .await?;
-
-            this.update(cx, |this, cx| {
-                let thread_id = this.state.read_with(cx, |state, _| {
-                    state.thread_id.context("No selected thread ID found")
-                })??;
-
-                this.workspace.update(cx, |workspace, cx| {
-                    let breakpoint_store = workspace.project().read(cx).breakpoint_store();
-
-                    breakpoint_store.update(cx, |store, cx| {
-                        store.set_active_position(
-                            ActiveStackFrame {
-                                session_id: this.session.read(cx).session_id(),
-                                thread_id,
-                                stack_frame_id,
-                                path: abs_path,
-                                position,
-                            },
-                            cx,
-                        );
-                    })
-                })
-            })?
-        })
-    }
-
-    pub(crate) fn abs_path_from_stack_frame(stack_frame: &dap::StackFrame) -> Option<Arc<Path>> {
-        stack_frame.source.as_ref().and_then(|s| {
-            s.path
-                .as_deref()
-                .filter(|path| {
-                    // Since we do not know if we are debugging on the host or (a remote/WSL) target,
-                    // we need to check if either the path is absolute as Posix or Windows.
-                    is_absolute(path, PathStyle::Posix) || is_absolute(path, PathStyle::Windows)
-                })
-                .map(|path| Arc::<Path>::from(Path::new(path)))
-        })
-    }
-
-    pub fn restart_stack_frame(&mut self, stack_frame_id: u64, cx: &mut Context<Self>) {
-        self.session.update(cx, |state, cx| {
-            state.restart_stack_frame(stack_frame_id, cx)
-        });
-    }
-
-    fn render_label_entry(
-        &self,
-        stack_frame: &dap::StackFrame,
-        _cx: &mut Context<Self>,
-    ) -> AnyElement {
-        h_flex()
-            .rounded_md()
-            .justify_between()
-            .w_full()
-            .group("")
-            .id(("label-stack-frame", stack_frame.id))
-            .p_1()
-            .on_any_mouse_down(|_, _, cx| {
-                cx.stop_propagation();
-            })
-            .child(
-                v_flex().justify_center().gap_0p5().child(
-                    Label::new(stack_frame.name.clone())
-                        .size(LabelSize::Small)
-                        .weight(FontWeight::BOLD)
-                        .truncate()
-                        .color(Color::Info),
-                ),
-            )
-            .into_any()
-    }
-
-    fn render_normal_entry(
-        &self,
-        ix: usize,
-        stack_frame: &dap::StackFrame,
-        cx: &mut Context<Self>,
-    ) -> AnyElement {
-        let source = stack_frame.source.clone();
-        let is_selected_frame = Some(ix) == self.selected_ix;
-
-        let path = source.and_then(|s| s.path.or(s.name));
-        let formatted_path = path.map(|path| format!("{}:{}", path, stack_frame.line,));
-        let formatted_path = formatted_path.map(|path| {
-            Label::new(path)
-                .size(LabelSize::XSmall)
-                .line_height_style(LineHeightStyle::UiLabel)
-                .truncate()
-                .color(Color::Muted)
-        });
-
-        let supports_frame_restart = self
-            .session
-            .read(cx)
-            .capabilities()
-            .supports_restart_frame
-            .unwrap_or_default();
-
-        let should_deemphasize = matches!(
-            stack_frame.presentation_hint,
-            Some(
-                dap::StackFramePresentationHint::Subtle
-                    | dap::StackFramePresentationHint::Deemphasize
-            )
-        );
-        h_flex()
-            .rounded_md()
-            .justify_between()
-            .w_full()
-            .group("")
-            .id(("stack-frame", stack_frame.id))
-            .p_1()
-            .when(is_selected_frame, |this| {
-                this.bg(cx.theme().colors().element_hover)
-            })
-            .on_any_mouse_down(|_, _, cx| {
-                cx.stop_propagation();
-            })
-            .on_click(cx.listener(move |this, _, window, cx| {
-                this.selected_ix = Some(ix);
-                this.activate_selected_entry(window, cx);
-            }))
-            .hover(|style| style.bg(cx.theme().colors().element_hover).cursor_pointer())
-            .overflow_x_scroll()
-            .child(
-                v_flex()
-                    .gap_0p5()
-                    .child(
-                        Label::new(stack_frame.name.clone())
-                            .size(LabelSize::Small)
-                            .truncate()
-                            .when(should_deemphasize, |this| this.color(Color::Muted)),
-                    )
-                    .children(formatted_path),
-            )
-            .when(
-                supports_frame_restart && stack_frame.can_restart.unwrap_or(true),
-                |this| {
-                    this.child(
-                        h_flex()
-                            .id(("restart-stack-frame", stack_frame.id))
-                            .visible_on_hover("")
-                            .absolute()
-                            .right_2()
-                            .overflow_hidden()
-                            .rounded_md()
-                            .border_1()
-                            .border_color(cx.theme().colors().element_selected)
-                            .bg(cx.theme().colors().element_background)
-                            .hover(|style| {
-                                style
-                                    .bg(cx.theme().colors().ghost_element_hover)
-                                    .cursor_pointer()
-                            })
-                            .child(
-                                IconButton::new(
-                                    ("restart-stack-frame", stack_frame.id),
-                                    IconName::RotateCcw,
-                                )
-                                .icon_size(IconSize::Small)
-                                .on_click(cx.listener({
-                                    let stack_frame_id = stack_frame.id;
-                                    move |this, _, _window, cx| {
-                                        this.restart_stack_frame(stack_frame_id, cx);
-                                    }
-                                }))
-                                .tooltip(move |window, cx| {
-                                    Tooltip::text("Restart Stack Frame")(window, cx)
-                                }),
-                            ),
-                    )
-                },
-            )
-            .into_any()
-    }
-
-    pub(crate) fn expand_collapsed_entry(&mut self, ix: usize, cx: &mut Context<Self>) {
-        let Some(StackFrameEntry::Collapsed(stack_frames)) = self.entries.get_mut(ix) else {
-            return;
-        };
-        let entries = std::mem::take(stack_frames)
-            .into_iter()
-            .map(StackFrameEntry::Normal);
-        // HERE
-        let entries_len = entries.len();
-        self.entries.splice(ix..ix + 1, entries);
-        let (Ok(filtered_indices_start) | Err(filtered_indices_start)) =
-            self.filter_entries_indices.binary_search(&ix);
-
-        for idx in &mut self.filter_entries_indices[filtered_indices_start..] {
-            *idx += entries_len - 1;
-        }
-
-        self.selected_ix = Some(ix);
-        self.list_state.reset(self.entries.len());
-        cx.emit(StackFrameListEvent::BuiltEntries);
-        cx.notify();
-    }
-
-    fn render_collapsed_entry(
-        &self,
-        ix: usize,
-        stack_frames: &Vec<dap::StackFrame>,
-        cx: &mut Context<Self>,
-    ) -> AnyElement {
-        let first_stack_frame = &stack_frames[0];
-        let is_selected = Some(ix) == self.selected_ix;
-
-        h_flex()
-            .rounded_md()
-            .justify_between()
-            .w_full()
-            .group("")
-            .id(("stack-frame", first_stack_frame.id))
-            .p_1()
-            .when(is_selected, |this| {
-                this.bg(cx.theme().colors().element_hover)
-            })
-            .on_any_mouse_down(|_, _, cx| {
-                cx.stop_propagation();
-            })
-            .on_click(cx.listener(move |this, _, window, cx| {
-                this.selected_ix = Some(ix);
-                this.activate_selected_entry(window, cx);
-            }))
-            .hover(|style| style.bg(cx.theme().colors().element_hover).cursor_pointer())
-            .child(
-                v_flex()
-                    .text_ui_sm(cx)
-                    .truncate()
-                    .text_color(cx.theme().colors().text_muted)
-                    .child(format!(
-                        "Show {} more{}",
-                        stack_frames.len(),
-                        first_stack_frame
-                            .source
-                            .as_ref()
-                            .and_then(|source| source.origin.as_ref())
-                            .map_or(String::new(), |origin| format!(": {}", origin))
-                    )),
-            )
-            .into_any()
-    }
-
-    fn render_entry(&self, ix: usize, cx: &mut Context<Self>) -> AnyElement {
-        let ix = match self.list_filter {
-            StackFrameFilter::All => ix,
-            StackFrameFilter::OnlyUserFrames => self.filter_entries_indices[ix],
-        };
-
-        match &self.entries[ix] {
-            StackFrameEntry::Label(stack_frame) => self.render_label_entry(stack_frame, cx),
-            StackFrameEntry::Normal(stack_frame) => self.render_normal_entry(ix, stack_frame, cx),
-            StackFrameEntry::Collapsed(stack_frames) => {
-                self.render_collapsed_entry(ix, stack_frames, cx)
-            }
-        }
-    }
-
-    fn select_ix(&mut self, ix: Option<usize>, cx: &mut Context<Self>) {
-        self.selected_ix = ix;
-        cx.notify();
-    }
-
-    fn select_next(&mut self, _: &menu::SelectNext, _window: &mut Window, cx: &mut Context<Self>) {
-        let ix = match self.selected_ix {
-            _ if self.entries.is_empty() => None,
-            None => Some(0),
-            Some(ix) => {
-                if ix == self.entries.len() - 1 {
-                    Some(0)
-                } else {
-                    Some(ix + 1)
-                }
-            }
-        };
-        self.select_ix(ix, cx);
-    }
-
-    fn select_previous(
-        &mut self,
-        _: &menu::SelectPrevious,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let ix = match self.selected_ix {
-            _ if self.entries.is_empty() => None,
-            None => Some(self.entries.len() - 1),
-            Some(ix) => {
-                if ix == 0 {
-                    Some(self.entries.len() - 1)
-                } else {
-                    Some(ix - 1)
-                }
-            }
-        };
-        self.select_ix(ix, cx);
-    }
-
-    fn select_first(
-        &mut self,
-        _: &menu::SelectFirst,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let ix = if !self.entries.is_empty() {
-            Some(0)
-        } else {
-            None
-        };
-        self.select_ix(ix, cx);
-    }
-
-    fn select_last(&mut self, _: &menu::SelectLast, _window: &mut Window, cx: &mut Context<Self>) {
-        let ix = if !self.entries.is_empty() {
-            Some(self.entries.len() - 1)
-        } else {
-            None
-        };
-        self.select_ix(ix, cx);
-    }
-
-    fn activate_selected_entry(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let Some(ix) = self.selected_ix else {
-            return;
-        };
-        let Some(entry) = self.entries.get_mut(ix) else {
-            return;
-        };
-        match entry {
-            StackFrameEntry::Normal(stack_frame) => {
-                let stack_frame = stack_frame.clone();
-                self.go_to_stack_frame_inner(stack_frame, window, cx)
-                    .detach_and_log_err(cx)
-            }
-            StackFrameEntry::Label(_) => {
-                debug_panic!("You should not be able to select a label stack frame")
-            }
-            StackFrameEntry::Collapsed(_) => self.expand_collapsed_entry(ix, cx),
-        }
-        cx.notify();
-    }
-
-    fn confirm(&mut self, _: &menu::Confirm, window: &mut Window, cx: &mut Context<Self>) {
-        self.activate_selected_entry(window, cx);
-    }
-
-    pub(crate) fn toggle_frame_filter(
-        &mut self,
-        thread_status: Option<ThreadStatus>,
-        cx: &mut Context<Self>,
-    ) {
-        self.list_filter = match self.list_filter {
-            StackFrameFilter::All => StackFrameFilter::OnlyUserFrames,
-            StackFrameFilter::OnlyUserFrames => StackFrameFilter::All,
-        };
-
-        if let Some(database_id) = self
-            .workspace
-            .read_with(cx, |workspace, _| workspace.database_id())
-            .ok()
-            .flatten()
-        {
-            let key = stack_frame_filter_key(&self.session.read(cx).adapter(), database_id);
-            let save_task = KEY_VALUE_STORE.write_kvp(key, self.list_filter.into());
-            cx.background_spawn(save_task).detach();
-        }
-
-        if let Some(ThreadStatus::Stopped) = thread_status {
-            match self.list_filter {
-                StackFrameFilter::All => {
-                    self.list_state.reset(self.entries.len());
-                }
-                StackFrameFilter::OnlyUserFrames => {
-                    self.list_state.reset(self.filter_entries_indices.len());
-                    if !self
-                        .selected_ix
-                        .map(|ix| self.filter_entries_indices.contains(&ix))
-                        .unwrap_or_default()
-                    {
-                        self.selected_ix = None;
-                    }
-                }
-            }
-
-            if let Some(ix) = self.selected_ix {
-                let scroll_to = match self.list_filter {
-                    StackFrameFilter::All => ix,
-                    StackFrameFilter::OnlyUserFrames => self
-                        .filter_entries_indices
-                        .binary_search_by_key(&ix, |ix| *ix)
-                        .expect("This index will always exist"),
-                };
-                self.list_state.scroll_to_reveal_item(scroll_to);
-            }
-
-            cx.emit(StackFrameListEvent::BuiltEntries);
-            cx.notify();
-        }
-    }
-
-    fn render_list(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        div().p_1().size_full().child(
-            list(
-                self.list_state.clone(),
-                cx.processor(|this, ix, _window, cx| this.render_entry(ix, cx)),
-            )
-            .size_full(),
-        )
-    }
-
-    pub(crate) fn render_control_strip(&self) -> AnyElement {
-        let tooltip_title = match self.list_filter {
-            StackFrameFilter::All => "Show stack frames from your project",
-            StackFrameFilter::OnlyUserFrames => "Show all stack frames",
-        };
-
-        h_flex()
-            .child(
-                IconButton::new(
-                    "filter-by-visible-worktree-stack-frame-list",
-                    IconName::ListFilter,
-                )
-                .tooltip(move |_window, cx| {
-                    Tooltip::for_action(tooltip_title, &ToggleUserFrames, cx)
-                })
-                .toggle_state(self.list_filter == StackFrameFilter::OnlyUserFrames)
-                .icon_size(IconSize::Small)
-                .on_click(|_, window, cx| {
-                    window.dispatch_action(ToggleUserFrames.boxed_clone(), cx)
-                }),
-            )
-            .into_any_element()
-    }
-}
-
-impl Render for StackFrameList {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        div()
-            .track_focus(&self.focus_handle)
-            .size_full()
-            .on_action(cx.listener(Self::select_next))
-            .on_action(cx.listener(Self::select_previous))
-            .on_action(cx.listener(Self::select_first))
-            .on_action(cx.listener(Self::select_last))
-            .on_action(cx.listener(Self::confirm))
-            .when_some(self.error.clone(), |el, error| {
-                el.child(
-                    h_flex()
-                        .bg(cx.theme().status().warning_background)
-                        .border_b_1()
-                        .border_color(cx.theme().status().warning_border)
-                        .pl_1()
-                        .child(Icon::new(IconName::Warning).color(Color::Warning))
-                        .gap_2()
-                        .child(
-                            Label::new(error)
-                                .size(LabelSize::Small)
-                                .color(Color::Warning),
-                        ),
-                )
-            })
-            .child(self.render_list(window, cx))
-            .vertical_scrollbar_for(&self.list_state, window, cx)
-    }
-}
-
-impl Focusable for StackFrameList {
-    fn focus_handle(&self, _: &gpui::App) -> gpui::FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl EventEmitter<StackFrameListEvent> for StackFrameList {}
diff --git a/crates/debugger_ui/src/session/running/variable_list.rs b/crates/debugger_ui/src/session/running/variable_list.rs
deleted file mode 100644
index 7b23cd685d..0000000000
--- a/crates/debugger_ui/src/session/running/variable_list.rs
+++ /dev/null
@@ -1,1658 +0,0 @@
-use crate::session::running::{RunningState, memory_view::MemoryView};
-
-use super::stack_frame_list::{StackFrameList, StackFrameListEvent};
-use dap::{
-    ScopePresentationHint, StackFrameId, VariablePresentationHint, VariablePresentationHintKind,
-    VariableReference,
-};
-use editor::Editor;
-use gpui::{
-    Action, AnyElement, ClickEvent, ClipboardItem, Context, DismissEvent, Empty, Entity,
-    FocusHandle, Focusable, Hsla, MouseDownEvent, Point, Subscription, TextStyleRefinement,
-    UniformListScrollHandle, WeakEntity, actions, anchored, deferred, uniform_list,
-};
-use itertools::Itertools;
-use menu::{SelectFirst, SelectLast, SelectNext, SelectPrevious};
-use project::debugger::{
-    dap_command::DataBreakpointContext,
-    session::{Session, SessionEvent, Watcher},
-};
-use std::{collections::HashMap, ops::Range, sync::Arc};
-use ui::{ContextMenu, ListItem, ScrollAxes, ScrollableHandle, Tooltip, WithScrollbar, prelude::*};
-use util::{debug_panic, maybe};
-
-static INDENT_STEP_SIZE: Pixels = px(10.0);
-
-actions!(
-    variable_list,
-    [
-        /// Expands the selected variable entry to show its children.
-        ExpandSelectedEntry,
-        /// Collapses the selected variable entry to hide its children.
-        CollapseSelectedEntry,
-        /// Copies the variable name to the clipboard.
-        CopyVariableName,
-        /// Copies the variable value to the clipboard.
-        CopyVariableValue,
-        /// Edits the value of the selected variable.
-        EditVariable,
-        /// Adds the selected variable to the watch list.
-        AddWatch,
-        /// Removes the selected variable from the watch list.
-        RemoveWatch,
-        /// Jump to variable's memory location.
-        GoToMemory,
-    ]
-);
-
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
-pub(crate) struct EntryState {
-    depth: usize,
-    is_expanded: bool,
-    has_children: bool,
-    parent_reference: VariableReference,
-}
-
-#[derive(Debug, PartialEq, Eq, Hash, Clone)]
-pub(crate) struct EntryPath {
-    pub leaf_name: Option<SharedString>,
-    pub indices: Arc<[SharedString]>,
-}
-
-impl EntryPath {
-    fn for_watcher(expression: impl Into<SharedString>) -> Self {
-        Self {
-            leaf_name: Some(expression.into()),
-            indices: Arc::new([]),
-        }
-    }
-
-    fn for_scope(scope_name: impl Into<SharedString>) -> Self {
-        Self {
-            leaf_name: Some(scope_name.into()),
-            indices: Arc::new([]),
-        }
-    }
-
-    fn with_name(&self, name: SharedString) -> Self {
-        Self {
-            leaf_name: Some(name),
-            indices: self.indices.clone(),
-        }
-    }
-
-    /// Create a new child of this variable path
-    fn with_child(&self, name: SharedString) -> Self {
-        Self {
-            leaf_name: None,
-            indices: self
-                .indices
-                .iter()
-                .cloned()
-                .chain(std::iter::once(name))
-                .collect(),
-        }
-    }
-}
-
-#[derive(Debug, Clone, PartialEq)]
-enum DapEntry {
-    Watcher(Watcher),
-    Variable(dap::Variable),
-    Scope(dap::Scope),
-}
-
-impl DapEntry {
-    fn as_watcher(&self) -> Option<&Watcher> {
-        match self {
-            DapEntry::Watcher(watcher) => Some(watcher),
-            _ => None,
-        }
-    }
-
-    fn as_variable(&self) -> Option<&dap::Variable> {
-        match self {
-            DapEntry::Variable(dap) => Some(dap),
-            _ => None,
-        }
-    }
-
-    fn as_scope(&self) -> Option<&dap::Scope> {
-        match self {
-            DapEntry::Scope(dap) => Some(dap),
-            _ => None,
-        }
-    }
-
-    #[cfg(test)]
-    fn name(&self) -> &str {
-        match self {
-            DapEntry::Watcher(watcher) => &watcher.expression,
-            DapEntry::Variable(dap) => &dap.name,
-            DapEntry::Scope(dap) => &dap.name,
-        }
-    }
-}
-
-#[derive(Debug, Clone, PartialEq)]
-struct ListEntry {
-    entry: DapEntry,
-    path: EntryPath,
-}
-
-impl ListEntry {
-    fn as_watcher(&self) -> Option<&Watcher> {
-        self.entry.as_watcher()
-    }
-
-    fn as_variable(&self) -> Option<&dap::Variable> {
-        self.entry.as_variable()
-    }
-
-    fn as_scope(&self) -> Option<&dap::Scope> {
-        self.entry.as_scope()
-    }
-
-    fn item_id(&self) -> ElementId {
-        use std::fmt::Write;
-        let mut id = match &self.entry {
-            DapEntry::Watcher(watcher) => format!("watcher-{}", watcher.expression),
-            DapEntry::Variable(dap) => format!("variable-{}", dap.name),
-            DapEntry::Scope(dap) => format!("scope-{}", dap.name),
-        };
-        for name in self.path.indices.iter() {
-            _ = write!(id, "-{}", name);
-        }
-        SharedString::from(id).into()
-    }
-
-    fn item_value_id(&self) -> ElementId {
-        use std::fmt::Write;
-        let mut id = match &self.entry {
-            DapEntry::Watcher(watcher) => format!("watcher-{}", watcher.expression),
-            DapEntry::Variable(dap) => format!("variable-{}", dap.name),
-            DapEntry::Scope(dap) => format!("scope-{}", dap.name),
-        };
-        for name in self.path.indices.iter() {
-            _ = write!(id, "-{}", name);
-        }
-        _ = write!(id, "-value");
-        SharedString::from(id).into()
-    }
-}
-
-struct VariableColor {
-    name: Option<Hsla>,
-    value: Option<Hsla>,
-}
-
-pub struct VariableList {
-    entries: Vec<ListEntry>,
-    max_width_index: Option<usize>,
-    entry_states: HashMap<EntryPath, EntryState>,
-    selected_stack_frame_id: Option<StackFrameId>,
-    list_handle: UniformListScrollHandle,
-    session: Entity<Session>,
-    selection: Option<EntryPath>,
-    open_context_menu: Option<(Entity<ContextMenu>, Point<Pixels>, Subscription)>,
-    focus_handle: FocusHandle,
-    edited_path: Option<(EntryPath, Entity<Editor>)>,
-    disabled: bool,
-    memory_view: Entity<MemoryView>,
-    weak_running: WeakEntity<RunningState>,
-    _subscriptions: Vec<Subscription>,
-}
-
-impl VariableList {
-    pub(crate) fn new(
-        session: Entity<Session>,
-        stack_frame_list: Entity<StackFrameList>,
-        memory_view: Entity<MemoryView>,
-        weak_running: WeakEntity<RunningState>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let focus_handle = cx.focus_handle();
-
-        let _subscriptions = vec![
-            cx.subscribe(&stack_frame_list, Self::handle_stack_frame_list_events),
-            cx.subscribe(&session, |this, _, event, cx| match event {
-                SessionEvent::HistoricSnapshotSelected => {
-                    this.selection.take();
-                    this.edited_path.take();
-                    this.selected_stack_frame_id.take();
-                    this.build_entries(cx);
-                }
-                SessionEvent::Stopped(_) => {
-                    this.selection.take();
-                    this.edited_path.take();
-                    this.selected_stack_frame_id.take();
-                }
-                SessionEvent::Variables | SessionEvent::Watchers => {
-                    this.build_entries(cx);
-                }
-                _ => {}
-            }),
-            cx.on_focus_out(&focus_handle, window, |this, _, _, cx| {
-                this.edited_path.take();
-                cx.notify();
-            }),
-        ];
-
-        let list_state = UniformListScrollHandle::default();
-
-        Self {
-            list_handle: list_state,
-            session,
-            focus_handle,
-            _subscriptions,
-            selected_stack_frame_id: None,
-            selection: None,
-            open_context_menu: None,
-            disabled: false,
-            edited_path: None,
-            entries: Default::default(),
-            max_width_index: None,
-            entry_states: Default::default(),
-            weak_running,
-            memory_view,
-        }
-    }
-
-    pub(super) fn disabled(&mut self, disabled: bool, cx: &mut Context<Self>) {
-        let old_disabled = std::mem::take(&mut self.disabled);
-        self.disabled = disabled;
-        if old_disabled != disabled {
-            cx.notify();
-        }
-    }
-
-    pub(super) fn has_open_context_menu(&self) -> bool {
-        self.open_context_menu.is_some()
-    }
-
-    fn build_entries(&mut self, cx: &mut Context<Self>) {
-        let Some(stack_frame_id) = self.selected_stack_frame_id else {
-            return;
-        };
-
-        let mut entries = vec![];
-
-        let scopes: Vec<_> = self.session.update(cx, |session, cx| {
-            session.scopes(stack_frame_id, cx).to_vec()
-        });
-
-        let mut contains_local_scope = false;
-
-        let mut stack = scopes
-            .into_iter()
-            .rev()
-            .filter(|scope| {
-                if scope
-                    .presentation_hint
-                    .as_ref()
-                    .map(|hint| *hint == ScopePresentationHint::Locals)
-                    .unwrap_or(scope.name.to_lowercase().starts_with("local"))
-                {
-                    contains_local_scope = true;
-                }
-
-                self.session.update(cx, |session, cx| {
-                    !session.variables(scope.variables_reference, cx).is_empty()
-                })
-            })
-            .map(|scope| {
-                (
-                    scope.variables_reference,
-                    scope.variables_reference,
-                    EntryPath::for_scope(&scope.name),
-                    DapEntry::Scope(scope),
-                )
-            })
-            .collect::<Vec<_>>();
-
-        let watches = self.session.read(cx).watchers().clone();
-        stack.extend(
-            watches
-                .into_values()
-                .map(|watcher| {
-                    (
-                        watcher.variables_reference,
-                        watcher.variables_reference,
-                        EntryPath::for_watcher(watcher.expression.clone()),
-                        DapEntry::Watcher(watcher),
-                    )
-                })
-                .collect::<Vec<_>>(),
-        );
-
-        let scopes_count = stack.len();
-
-        while let Some((container_reference, variables_reference, mut path, dap_kind)) = stack.pop()
-        {
-            match &dap_kind {
-                DapEntry::Watcher(watcher) => path = path.with_child(watcher.expression.clone()),
-                DapEntry::Variable(dap) => path = path.with_name(dap.name.clone().into()),
-                DapEntry::Scope(dap) => path = path.with_child(dap.name.clone().into()),
-            }
-
-            let var_state = self
-                .entry_states
-                .entry(path.clone())
-                .and_modify(|state| {
-                    state.parent_reference = container_reference;
-                    state.has_children = variables_reference != 0;
-                })
-                .or_insert(EntryState {
-                    depth: path.indices.len(),
-                    is_expanded: dap_kind.as_scope().is_some_and(|scope| {
-                        (scopes_count == 1 && !contains_local_scope)
-                            || scope
-                                .presentation_hint
-                                .as_ref()
-                                .map(|hint| *hint == ScopePresentationHint::Locals)
-                                .unwrap_or(scope.name.to_lowercase().starts_with("local"))
-                    }),
-                    parent_reference: container_reference,
-                    has_children: variables_reference != 0,
-                });
-
-            entries.push(ListEntry {
-                entry: dap_kind,
-                path: path.clone(),
-            });
-
-            if var_state.is_expanded {
-                let children = self
-                    .session
-                    .update(cx, |session, cx| session.variables(variables_reference, cx));
-                stack.extend(children.into_iter().rev().map(|child| {
-                    (
-                        variables_reference,
-                        child.variables_reference,
-                        path.with_child(child.name.clone().into()),
-                        DapEntry::Variable(child),
-                    )
-                }));
-            }
-        }
-
-        self.entries = entries;
-
-        let text_pixels = ui::TextSize::Default.pixels(cx).to_f64() as f32;
-        let indent_size = INDENT_STEP_SIZE.to_f64() as f32;
-
-        self.max_width_index = self
-            .entries
-            .iter()
-            .map(|entry| match &entry.entry {
-                DapEntry::Scope(scope) => scope.name.len() as f32 * text_pixels,
-                DapEntry::Variable(variable) => {
-                    (variable.value.len() + variable.name.len()) as f32 * text_pixels
-                        + (entry.path.indices.len() as f32 * indent_size)
-                }
-                DapEntry::Watcher(watcher) => {
-                    (watcher.value.len() + watcher.expression.len()) as f32 * text_pixels
-                        + (entry.path.indices.len() as f32 * indent_size)
-                }
-            })
-            .position_max_by(|left, right| left.total_cmp(right));
-
-        cx.notify();
-    }
-
-    fn handle_stack_frame_list_events(
-        &mut self,
-        _: Entity<StackFrameList>,
-        event: &StackFrameListEvent,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            StackFrameListEvent::SelectedStackFrameChanged(stack_frame_id) => {
-                self.selected_stack_frame_id = Some(*stack_frame_id);
-                self.session.update(cx, |session, cx| {
-                    session.refresh_watchers(*stack_frame_id, cx);
-                });
-                self.build_entries(cx);
-            }
-            StackFrameListEvent::BuiltEntries => {}
-        }
-    }
-
-    pub fn completion_variables(&self, _cx: &mut Context<Self>) -> Vec<dap::Variable> {
-        self.entries
-            .iter()
-            .filter_map(|entry| match &entry.entry {
-                DapEntry::Variable(dap) => Some(dap.clone()),
-                DapEntry::Scope(_) | DapEntry::Watcher { .. } => None,
-            })
-            .collect()
-    }
-
-    fn render_entries(
-        &mut self,
-        ix: Range<usize>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Vec<AnyElement> {
-        ix.into_iter()
-            .filter_map(|ix| {
-                let (entry, state) = self
-                    .entries
-                    .get(ix)
-                    .and_then(|entry| Some(entry).zip(self.entry_states.get(&entry.path)))?;
-
-                match &entry.entry {
-                    DapEntry::Watcher { .. } => {
-                        Some(self.render_watcher(entry, *state, window, cx))
-                    }
-                    DapEntry::Variable(_) => Some(self.render_variable(entry, *state, window, cx)),
-                    DapEntry::Scope(_) => Some(self.render_scope(entry, *state, cx)),
-                }
-            })
-            .collect()
-    }
-
-    pub(crate) fn toggle_entry(&mut self, var_path: &EntryPath, cx: &mut Context<Self>) {
-        let Some(entry) = self.entry_states.get_mut(var_path) else {
-            log::error!("Could not find variable list entry state to toggle");
-            return;
-        };
-
-        entry.is_expanded = !entry.is_expanded;
-        self.build_entries(cx);
-    }
-
-    fn select_first(&mut self, _: &SelectFirst, window: &mut Window, cx: &mut Context<Self>) {
-        self.cancel(&Default::default(), window, cx);
-        if let Some(variable) = self.entries.first() {
-            self.selection = Some(variable.path.clone());
-            self.build_entries(cx);
-        }
-    }
-
-    fn select_last(&mut self, _: &SelectLast, window: &mut Window, cx: &mut Context<Self>) {
-        self.cancel(&Default::default(), window, cx);
-        if let Some(variable) = self.entries.last() {
-            self.selection = Some(variable.path.clone());
-            self.build_entries(cx);
-        }
-    }
-
-    fn select_prev(&mut self, _: &SelectPrevious, window: &mut Window, cx: &mut Context<Self>) {
-        self.cancel(&Default::default(), window, cx);
-        if let Some(selection) = &self.selection {
-            let index = self.entries.iter().enumerate().find_map(|(ix, var)| {
-                if &var.path == selection && ix > 0 {
-                    Some(ix.saturating_sub(1))
-                } else {
-                    None
-                }
-            });
-
-            if let Some(new_selection) =
-                index.and_then(|ix| self.entries.get(ix).map(|var| var.path.clone()))
-            {
-                self.selection = Some(new_selection);
-                self.build_entries(cx);
-            } else {
-                self.select_last(&SelectLast, window, cx);
-            }
-        } else {
-            self.select_last(&SelectLast, window, cx);
-        }
-    }
-
-    fn select_next(&mut self, _: &SelectNext, window: &mut Window, cx: &mut Context<Self>) {
-        self.cancel(&Default::default(), window, cx);
-        if let Some(selection) = &self.selection {
-            let index = self.entries.iter().enumerate().find_map(|(ix, var)| {
-                if &var.path == selection {
-                    Some(ix.saturating_add(1))
-                } else {
-                    None
-                }
-            });
-
-            if let Some(new_selection) =
-                index.and_then(|ix| self.entries.get(ix).map(|var| var.path.clone()))
-            {
-                self.selection = Some(new_selection);
-                self.build_entries(cx);
-            } else {
-                self.select_first(&SelectFirst, window, cx);
-            }
-        } else {
-            self.select_first(&SelectFirst, window, cx);
-        }
-    }
-
-    fn cancel(&mut self, _: &menu::Cancel, window: &mut Window, cx: &mut Context<Self>) {
-        self.edited_path.take();
-        self.focus_handle.focus(window);
-        cx.notify();
-    }
-
-    fn confirm(&mut self, _: &menu::Confirm, _window: &mut Window, cx: &mut Context<Self>) {
-        if let Some((var_path, editor)) = self.edited_path.take() {
-            let Some(state) = self.entry_states.get(&var_path) else {
-                return;
-            };
-
-            let variables_reference = state.parent_reference;
-            let Some(name) = var_path.leaf_name else {
-                return;
-            };
-
-            let Some(stack_frame_id) = self.selected_stack_frame_id else {
-                return;
-            };
-
-            let value = editor.read(cx).text(cx);
-
-            self.session.update(cx, |session, cx| {
-                session.set_variable_value(
-                    stack_frame_id,
-                    variables_reference,
-                    name.into(),
-                    value,
-                    cx,
-                )
-            });
-        }
-    }
-
-    fn collapse_selected_entry(
-        &mut self,
-        _: &CollapseSelectedEntry,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(ref selected_entry) = self.selection {
-            let Some(entry_state) = self.entry_states.get_mut(selected_entry) else {
-                debug_panic!("Trying to toggle variable in variable list that has an no state");
-                return;
-            };
-
-            if !entry_state.is_expanded || !entry_state.has_children {
-                self.select_prev(&SelectPrevious, window, cx);
-            } else {
-                entry_state.is_expanded = false;
-                self.build_entries(cx);
-            }
-        }
-    }
-
-    fn expand_selected_entry(
-        &mut self,
-        _: &ExpandSelectedEntry,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(selected_entry) = &self.selection {
-            let Some(entry_state) = self.entry_states.get_mut(selected_entry) else {
-                debug_panic!("Trying to toggle variable in variable list that has an no state");
-                return;
-            };
-
-            if entry_state.is_expanded || !entry_state.has_children {
-                self.select_next(&SelectNext, window, cx);
-            } else {
-                entry_state.is_expanded = true;
-                self.build_entries(cx);
-            }
-        }
-    }
-
-    fn jump_to_variable_memory(
-        &mut self,
-        _: &GoToMemory,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        _ = maybe!({
-            let selection = self.selection.as_ref()?;
-            let entry = self.entries.iter().find(|entry| &entry.path == selection)?;
-            let var = entry.entry.as_variable()?;
-            let memory_reference = var.memory_reference.as_deref()?;
-
-            let sizeof_expr = if var.type_.as_ref().is_some_and(|t| {
-                t.chars()
-                    .all(|c| c.is_whitespace() || c.is_alphabetic() || c == '*')
-            }) {
-                var.type_.as_deref()
-            } else {
-                var.evaluate_name
-                    .as_deref()
-                    .map(|name| name.strip_prefix("/nat ").unwrap_or_else(|| name))
-            };
-            self.memory_view.update(cx, |this, cx| {
-                this.go_to_memory_reference(
-                    memory_reference,
-                    sizeof_expr,
-                    self.selected_stack_frame_id,
-                    cx,
-                );
-            });
-            let weak_panel = self.weak_running.clone();
-
-            window.defer(cx, move |window, cx| {
-                _ = weak_panel.update(cx, |this, cx| {
-                    this.activate_item(
-                        crate::persistence::DebuggerPaneItem::MemoryView,
-                        window,
-                        cx,
-                    );
-                });
-            });
-            Some(())
-        });
-    }
-
-    fn deploy_list_entry_context_menu(
-        &mut self,
-        entry: ListEntry,
-        position: Point<Pixels>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let (supports_set_variable, supports_data_breakpoints, supports_go_to_memory) =
-            self.session.read_with(cx, |session, _| {
-                (
-                    session
-                        .capabilities()
-                        .supports_set_variable
-                        .unwrap_or_default(),
-                    session
-                        .capabilities()
-                        .supports_data_breakpoints
-                        .unwrap_or_default(),
-                    session
-                        .capabilities()
-                        .supports_read_memory_request
-                        .unwrap_or_default(),
-                )
-            });
-        let can_toggle_data_breakpoint = entry
-            .as_variable()
-            .filter(|_| supports_data_breakpoints)
-            .and_then(|variable| {
-                let variables_reference = self
-                    .entry_states
-                    .get(&entry.path)
-                    .map(|state| state.parent_reference)?;
-                Some(self.session.update(cx, |session, cx| {
-                    session.data_breakpoint_info(
-                        Arc::new(DataBreakpointContext::Variable {
-                            variables_reference,
-                            name: variable.name.clone(),
-                            bytes: None,
-                        }),
-                        None,
-                        cx,
-                    )
-                }))
-            });
-
-        let focus_handle = self.focus_handle.clone();
-        cx.spawn_in(window, async move |this, cx| {
-            let can_toggle_data_breakpoint = if let Some(task) = can_toggle_data_breakpoint {
-                task.await
-            } else {
-                None
-            };
-            cx.update(|window, cx| {
-                let context_menu = ContextMenu::build(window, cx, |menu, _, _| {
-                    menu.when_some(entry.as_variable(), |menu, _| {
-                        menu.action("Copy Name", CopyVariableName.boxed_clone())
-                            .action("Copy Value", CopyVariableValue.boxed_clone())
-                            .when(supports_set_variable, |menu| {
-                                menu.action("Edit Value", EditVariable.boxed_clone())
-                            })
-                            .when(supports_go_to_memory, |menu| {
-                                menu.action("Go To Memory", GoToMemory.boxed_clone())
-                            })
-                            .action("Watch Variable", AddWatch.boxed_clone())
-                            .when_some(can_toggle_data_breakpoint, |mut menu, data_info| {
-                                menu = menu.separator();
-                                if let Some(access_types) = data_info.access_types {
-                                    for access in access_types {
-                                        menu = menu.action(
-                                            format!(
-                                                "Toggle {} Data Breakpoint",
-                                                match access {
-                                                    dap::DataBreakpointAccessType::Read => "Read",
-                                                    dap::DataBreakpointAccessType::Write => "Write",
-                                                    dap::DataBreakpointAccessType::ReadWrite =>
-                                                        "Read/Write",
-                                                }
-                                            ),
-                                            crate::ToggleDataBreakpoint {
-                                                access_type: Some(access),
-                                            }
-                                            .boxed_clone(),
-                                        );
-                                    }
-
-                                    menu
-                                } else {
-                                    menu.action(
-                                        "Toggle Data Breakpoint",
-                                        crate::ToggleDataBreakpoint { access_type: None }
-                                            .boxed_clone(),
-                                    )
-                                }
-                            })
-                    })
-                    .when(entry.as_watcher().is_some(), |menu| {
-                        menu.action("Copy Name", CopyVariableName.boxed_clone())
-                            .action("Copy Value", CopyVariableValue.boxed_clone())
-                            .when(supports_set_variable, |menu| {
-                                menu.action("Edit Value", EditVariable.boxed_clone())
-                            })
-                            .action("Remove Watch", RemoveWatch.boxed_clone())
-                    })
-                    .context(focus_handle.clone())
-                });
-
-                _ = this.update(cx, |this, cx| {
-                    cx.focus_view(&context_menu, window);
-                    let subscription = cx.subscribe_in(
-                        &context_menu,
-                        window,
-                        |this, _, _: &DismissEvent, window, cx| {
-                            if this.open_context_menu.as_ref().is_some_and(|context_menu| {
-                                context_menu.0.focus_handle(cx).contains_focused(window, cx)
-                            }) {
-                                cx.focus_self(window);
-                            }
-                            this.open_context_menu.take();
-                            cx.notify();
-                        },
-                    );
-
-                    this.open_context_menu = Some((context_menu, position, subscription));
-                });
-            })
-        })
-        .detach();
-    }
-
-    fn toggle_data_breakpoint(
-        &mut self,
-        data_info: &crate::ToggleDataBreakpoint,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(entry) = self
-            .selection
-            .as_ref()
-            .and_then(|selection| self.entries.iter().find(|entry| &entry.path == selection))
-        else {
-            return;
-        };
-
-        let Some((name, var_ref)) = entry.as_variable().map(|var| &var.name).zip(
-            self.entry_states
-                .get(&entry.path)
-                .map(|state| state.parent_reference),
-        ) else {
-            return;
-        };
-
-        let context = Arc::new(DataBreakpointContext::Variable {
-            variables_reference: var_ref,
-            name: name.clone(),
-            bytes: None,
-        });
-        let data_breakpoint = self.session.update(cx, |session, cx| {
-            session.data_breakpoint_info(context.clone(), None, cx)
-        });
-
-        let session = self.session.downgrade();
-        let access_type = data_info.access_type;
-        cx.spawn(async move |_, cx| {
-            let Some((data_id, access_types)) = data_breakpoint
-                .await
-                .and_then(|info| Some((info.data_id?, info.access_types)))
-            else {
-                return;
-            };
-
-            // Because user's can manually add this action to the keymap
-            // we check if access type is supported
-            let access_type = match access_types {
-                None => None,
-                Some(access_types) => {
-                    if access_type.is_some_and(|access_type| access_types.contains(&access_type)) {
-                        access_type
-                    } else {
-                        None
-                    }
-                }
-            };
-            _ = session.update(cx, |session, cx| {
-                session.create_data_breakpoint(
-                    context,
-                    data_id.clone(),
-                    dap::DataBreakpoint {
-                        data_id,
-                        access_type,
-                        condition: None,
-                        hit_condition: None,
-                    },
-                    cx,
-                );
-                cx.notify();
-            });
-        })
-        .detach();
-    }
-
-    fn copy_variable_name(
-        &mut self,
-        _: &CopyVariableName,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(selection) = self.selection.as_ref() else {
-            return;
-        };
-
-        let Some(entry) = self.entries.iter().find(|entry| &entry.path == selection) else {
-            return;
-        };
-
-        let variable_name = match &entry.entry {
-            DapEntry::Variable(dap) => dap.name.clone(),
-            DapEntry::Watcher(watcher) => watcher.expression.to_string(),
-            DapEntry::Scope(_) => return,
-        };
-
-        cx.write_to_clipboard(ClipboardItem::new_string(variable_name));
-    }
-
-    fn copy_variable_value(
-        &mut self,
-        _: &CopyVariableValue,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(selection) = self.selection.as_ref() else {
-            return;
-        };
-
-        let Some(entry) = self.entries.iter().find(|entry| &entry.path == selection) else {
-            return;
-        };
-
-        let variable_value = match &entry.entry {
-            DapEntry::Variable(dap) => dap.value.clone(),
-            DapEntry::Watcher(watcher) => watcher.value.to_string(),
-            DapEntry::Scope(_) => return,
-        };
-
-        cx.write_to_clipboard(ClipboardItem::new_string(variable_value));
-    }
-
-    fn edit_variable(&mut self, _: &EditVariable, window: &mut Window, cx: &mut Context<Self>) {
-        let Some(selection) = self.selection.as_ref() else {
-            return;
-        };
-
-        let Some(entry) = self.entries.iter().find(|entry| &entry.path == selection) else {
-            return;
-        };
-
-        let variable_value = match &entry.entry {
-            DapEntry::Watcher(watcher) => watcher.value.to_string(),
-            DapEntry::Variable(variable) => variable.value.clone(),
-            DapEntry::Scope(_) => return,
-        };
-
-        let editor = Self::create_variable_editor(&variable_value, window, cx);
-        self.edited_path = Some((entry.path.clone(), editor));
-
-        cx.notify();
-    }
-
-    fn add_watcher(&mut self, _: &AddWatch, _: &mut Window, cx: &mut Context<Self>) {
-        let Some(selection) = self.selection.as_ref() else {
-            return;
-        };
-
-        let Some(entry) = self.entries.iter().find(|entry| &entry.path == selection) else {
-            return;
-        };
-
-        let Some(variable) = entry.as_variable() else {
-            return;
-        };
-
-        let Some(stack_frame_id) = self.selected_stack_frame_id else {
-            return;
-        };
-
-        let add_watcher_task = self.session.update(cx, |session, cx| {
-            let expression = variable
-                .evaluate_name
-                .clone()
-                .unwrap_or_else(|| variable.name.clone());
-
-            session.add_watcher(expression.into(), stack_frame_id, cx)
-        });
-
-        cx.spawn(async move |this, cx| {
-            add_watcher_task.await?;
-
-            this.update(cx, |this, cx| {
-                this.build_entries(cx);
-            })
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn remove_watcher(&mut self, _: &RemoveWatch, _: &mut Window, cx: &mut Context<Self>) {
-        let Some(selection) = self.selection.as_ref() else {
-            return;
-        };
-
-        let Some(entry) = self.entries.iter().find(|entry| &entry.path == selection) else {
-            return;
-        };
-
-        let Some(watcher) = entry.as_watcher() else {
-            return;
-        };
-
-        self.session.update(cx, |session, _| {
-            session.remove_watcher(watcher.expression.clone());
-        });
-        self.build_entries(cx);
-    }
-
-    #[track_caller]
-    #[cfg(test)]
-    pub(crate) fn assert_visual_entries(&self, expected: Vec<&str>) {
-        const INDENT: &str = "    ";
-
-        let entries = &self.entries;
-        let mut visual_entries = Vec::with_capacity(entries.len());
-        for entry in entries {
-            let state = self
-                .entry_states
-                .get(&entry.path)
-                .expect("If there's a variable entry there has to be a state that goes with it");
-
-            visual_entries.push(format!(
-                "{}{} {}{}",
-                INDENT.repeat(state.depth - 1),
-                if state.is_expanded { "v" } else { ">" },
-                entry.entry.name(),
-                if self.selection.as_ref() == Some(&entry.path) {
-                    " <=== selected"
-                } else {
-                    ""
-                }
-            ));
-        }
-
-        pretty_assertions::assert_eq!(expected, visual_entries);
-    }
-
-    #[track_caller]
-    #[cfg(test)]
-    pub(crate) fn scopes(&self) -> Vec<dap::Scope> {
-        self.entries
-            .iter()
-            .filter_map(|entry| match &entry.entry {
-                DapEntry::Scope(scope) => Some(scope),
-                _ => None,
-            })
-            .cloned()
-            .collect()
-    }
-
-    #[track_caller]
-    #[cfg(test)]
-    pub(crate) fn variables_per_scope(&self) -> Vec<(dap::Scope, Vec<dap::Variable>)> {
-        let mut scopes: Vec<(dap::Scope, Vec<_>)> = Vec::new();
-        let mut idx = 0;
-
-        for entry in self.entries.iter() {
-            match &entry.entry {
-                DapEntry::Watcher { .. } => continue,
-                DapEntry::Variable(dap) => scopes[idx].1.push(dap.clone()),
-                DapEntry::Scope(scope) => {
-                    if !scopes.is_empty() {
-                        idx += 1;
-                    }
-
-                    scopes.push((scope.clone(), Vec::new()));
-                }
-            }
-        }
-
-        scopes
-    }
-
-    #[track_caller]
-    #[cfg(test)]
-    pub(crate) fn variables(&self) -> Vec<dap::Variable> {
-        self.entries
-            .iter()
-            .filter_map(|entry| match &entry.entry {
-                DapEntry::Variable(variable) => Some(variable),
-                _ => None,
-            })
-            .cloned()
-            .collect()
-    }
-
-    fn create_variable_editor(default: &str, window: &mut Window, cx: &mut App) -> Entity<Editor> {
-        let editor = cx.new(|cx| {
-            let mut editor = Editor::single_line(window, cx);
-
-            let refinement = TextStyleRefinement {
-                font_size: Some(
-                    TextSize::XSmall
-                        .rems(cx)
-                        .to_pixels(window.rem_size())
-                        .into(),
-                ),
-                ..Default::default()
-            };
-            editor.set_text_style_refinement(refinement);
-            editor.set_text(default, window, cx);
-            editor.select_all(&editor::actions::SelectAll, window, cx);
-            editor
-        });
-        editor.focus_handle(cx).focus(window);
-        editor
-    }
-
-    fn variable_color(
-        &self,
-        presentation_hint: Option<&VariablePresentationHint>,
-        cx: &Context<Self>,
-    ) -> VariableColor {
-        let syntax_color_for = |name| cx.theme().syntax().get(name).color;
-        let name = if self.disabled {
-            Some(Color::Disabled.color(cx))
-        } else {
-            match presentation_hint
-                .as_ref()
-                .and_then(|hint| hint.kind.as_ref())
-                .unwrap_or(&VariablePresentationHintKind::Unknown)
-            {
-                VariablePresentationHintKind::Class
-                | VariablePresentationHintKind::BaseClass
-                | VariablePresentationHintKind::InnerClass
-                | VariablePresentationHintKind::MostDerivedClass => syntax_color_for("type"),
-                VariablePresentationHintKind::Data => syntax_color_for("variable"),
-                VariablePresentationHintKind::Unknown | _ => syntax_color_for("variable"),
-            }
-        };
-        let value = self
-            .disabled
-            .then(|| Color::Disabled.color(cx))
-            .or_else(|| syntax_color_for("variable.special"));
-
-        VariableColor { name, value }
-    }
-
-    fn render_variable_value(
-        &self,
-        entry: &ListEntry,
-        variable_color: &VariableColor,
-        value: String,
-        cx: &mut Context<Self>,
-    ) -> AnyElement {
-        if !value.is_empty() {
-            div()
-                .w_full()
-                .id(entry.item_value_id())
-                .map(|this| {
-                    if let Some((_, editor)) = self
-                        .edited_path
-                        .as_ref()
-                        .filter(|(path, _)| path == &entry.path)
-                    {
-                        this.child(div().size_full().px_2().child(editor.clone()))
-                    } else {
-                        this.text_color(cx.theme().colors().text_muted)
-                            .when(
-                                !self.disabled
-                                    && self
-                                        .session
-                                        .read(cx)
-                                        .capabilities()
-                                        .supports_set_variable
-                                        .unwrap_or_default(),
-                                |this| {
-                                    let path = entry.path.clone();
-                                    let variable_value = value.clone();
-                                    this.on_click(cx.listener(
-                                        move |this, click: &ClickEvent, window, cx| {
-                                            if click.click_count() < 2 {
-                                                return;
-                                            }
-                                            let editor = Self::create_variable_editor(
-                                                &variable_value,
-                                                window,
-                                                cx,
-                                            );
-                                            this.edited_path = Some((path.clone(), editor));
-
-                                            cx.notify();
-                                        },
-                                    ))
-                                },
-                            )
-                            .child(
-                                Label::new(format!("=  {}", &value))
-                                    .single_line()
-                                    .truncate()
-                                    .size(LabelSize::Small)
-                                    .color(Color::Muted)
-                                    .when_some(variable_color.value, |this, color| {
-                                        this.color(Color::from(color))
-                                    }),
-                            )
-                            .tooltip(Tooltip::text(value))
-                    }
-                })
-                .into_any_element()
-        } else {
-            Empty.into_any_element()
-        }
-    }
-
-    fn center_truncate_string(s: &str, mut max_chars: usize) -> String {
-        const ELLIPSIS: &str = "...";
-        const MIN_LENGTH: usize = 3;
-
-        max_chars = max_chars.max(MIN_LENGTH);
-
-        let char_count = s.chars().count();
-        if char_count <= max_chars {
-            return s.to_string();
-        }
-
-        if ELLIPSIS.len() + MIN_LENGTH > max_chars {
-            return s.chars().take(MIN_LENGTH).collect();
-        }
-
-        let available_chars = max_chars - ELLIPSIS.len();
-
-        let start_chars = available_chars / 2;
-        let end_chars = available_chars - start_chars;
-        let skip_chars = char_count - end_chars;
-
-        let mut start_boundary = 0;
-        let mut end_boundary = s.len();
-
-        for (i, (byte_idx, _)) in s.char_indices().enumerate() {
-            if i == start_chars {
-                start_boundary = byte_idx.max(MIN_LENGTH);
-            }
-
-            if i == skip_chars {
-                end_boundary = byte_idx;
-            }
-        }
-
-        if start_boundary >= end_boundary {
-            return s.chars().take(MIN_LENGTH).collect();
-        }
-
-        format!("{}{}{}", &s[..start_boundary], ELLIPSIS, &s[end_boundary..])
-    }
-
-    fn render_watcher(
-        &self,
-        entry: &ListEntry,
-        state: EntryState,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> AnyElement {
-        let Some(watcher) = &entry.as_watcher() else {
-            debug_panic!("Called render watcher on non watcher variable list entry variant");
-            return div().into_any_element();
-        };
-
-        let variable_color = self.variable_color(watcher.presentation_hint.as_ref(), cx);
-
-        let is_selected = self
-            .selection
-            .as_ref()
-            .is_some_and(|selection| selection == &entry.path);
-        let var_ref = watcher.variables_reference;
-
-        let colors = get_entry_color(cx);
-        let bg_hover_color = if !is_selected {
-            colors.hover
-        } else {
-            colors.default
-        };
-        let border_color = if is_selected {
-            colors.marked_active
-        } else {
-            colors.default
-        };
-        let path = entry.path.clone();
-
-        let weak = cx.weak_entity();
-        let focus_handle = self.focus_handle.clone();
-        let watcher_len = (f32::from(self.list_handle.content_size().width / 12.0).floor()) - 3.0;
-        let watcher_len = watcher_len as usize;
-
-        div()
-            .id(entry.item_id())
-            .group("variable_list_entry")
-            .pl_2()
-            .border_1()
-            .border_r_2()
-            .border_color(border_color)
-            .flex()
-            .w_full()
-            .h_full()
-            .hover(|style| style.bg(bg_hover_color))
-            .on_click(cx.listener({
-                let path = path.clone();
-                move |this, _, _window, cx| {
-                    this.selection = Some(path.clone());
-                    cx.notify();
-                }
-            }))
-            .child(
-                ListItem::new(SharedString::from(format!(
-                    "watcher-{}",
-                    watcher.expression
-                )))
-                .selectable(false)
-                .disabled(self.disabled)
-                .selectable(false)
-                .indent_level(state.depth)
-                .indent_step_size(INDENT_STEP_SIZE)
-                .always_show_disclosure_icon(true)
-                .when(var_ref > 0, |list_item| {
-                    list_item.toggle(state.is_expanded).on_toggle(cx.listener({
-                        let var_path = entry.path.clone();
-                        move |this, _, _, cx| {
-                            this.session.update(cx, |session, cx| {
-                                session.variables(var_ref, cx);
-                            });
-
-                            this.toggle_entry(&var_path, cx);
-                        }
-                    }))
-                })
-                .on_secondary_mouse_down(cx.listener({
-                    let path = path.clone();
-                    let entry = entry.clone();
-                    move |this, event: &MouseDownEvent, window, cx| {
-                        this.selection = Some(path.clone());
-                        this.deploy_list_entry_context_menu(
-                            entry.clone(),
-                            event.position,
-                            window,
-                            cx,
-                        );
-                        cx.stop_propagation();
-                    }
-                }))
-                .child(
-                    h_flex()
-                        .gap_1()
-                        .text_ui_sm(cx)
-                        .w_full()
-                        .child(
-                            Label::new(&Self::center_truncate_string(
-                                watcher.expression.as_ref(),
-                                watcher_len,
-                            ))
-                            .when_some(variable_color.name, |this, color| {
-                                this.color(Color::from(color))
-                            }),
-                        )
-                        .child(self.render_variable_value(
-                            entry,
-                            &variable_color,
-                            watcher.value.to_string(),
-                            cx,
-                        )),
-                )
-                .end_slot(
-                    IconButton::new(
-                        SharedString::from(format!("watcher-{}-remove-button", watcher.expression)),
-                        IconName::Close,
-                    )
-                    .on_click({
-                        move |_, window, cx| {
-                            weak.update(cx, |variable_list, cx| {
-                                variable_list.selection = Some(path.clone());
-                                variable_list.remove_watcher(&RemoveWatch, window, cx);
-                            })
-                            .ok();
-                        }
-                    })
-                    .tooltip(move |_window, cx| {
-                        Tooltip::for_action_in("Remove Watch", &RemoveWatch, &focus_handle, cx)
-                    })
-                    .icon_size(ui::IconSize::Indicator),
-                ),
-            )
-            .into_any()
-    }
-
-    fn render_scope(
-        &self,
-        entry: &ListEntry,
-        state: EntryState,
-        cx: &mut Context<Self>,
-    ) -> AnyElement {
-        let Some(scope) = entry.as_scope() else {
-            debug_panic!("Called render scope on non scope variable list entry variant");
-            return div().into_any_element();
-        };
-
-        let var_ref = scope.variables_reference;
-        let is_selected = self
-            .selection
-            .as_ref()
-            .is_some_and(|selection| selection == &entry.path);
-
-        let colors = get_entry_color(cx);
-        let bg_hover_color = if !is_selected {
-            colors.hover
-        } else {
-            colors.default
-        };
-        let border_color = if is_selected {
-            colors.marked_active
-        } else {
-            colors.default
-        };
-        let path = entry.path.clone();
-
-        div()
-            .id(var_ref as usize)
-            .group("variable_list_entry")
-            .pl_2()
-            .border_1()
-            .border_r_2()
-            .border_color(border_color)
-            .flex()
-            .w_full()
-            .h_full()
-            .hover(|style| style.bg(bg_hover_color))
-            .on_click(cx.listener({
-                move |this, _, _window, cx| {
-                    this.selection = Some(path.clone());
-                    cx.notify();
-                }
-            }))
-            .child(
-                ListItem::new(SharedString::from(format!("scope-{}", var_ref)))
-                    .selectable(false)
-                    .disabled(self.disabled)
-                    .indent_level(state.depth)
-                    .indent_step_size(px(10.))
-                    .always_show_disclosure_icon(true)
-                    .toggle(state.is_expanded)
-                    .on_toggle({
-                        let var_path = entry.path.clone();
-                        cx.listener(move |this, _, _, cx| this.toggle_entry(&var_path, cx))
-                    })
-                    .child(
-                        div()
-                            .text_ui(cx)
-                            .w_full()
-                            .truncate()
-                            .when(self.disabled, |this| {
-                                this.text_color(Color::Disabled.color(cx))
-                            })
-                            .child(scope.name.clone()),
-                    ),
-            )
-            .into_any()
-    }
-
-    fn render_variable(
-        &self,
-        variable: &ListEntry,
-        state: EntryState,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> AnyElement {
-        let Some(dap) = &variable.as_variable() else {
-            debug_panic!("Called render variable on non variable variable list entry variant");
-            return div().into_any_element();
-        };
-
-        let variable_color = self.variable_color(dap.presentation_hint.as_ref(), cx);
-
-        let var_ref = dap.variables_reference;
-        let colors = get_entry_color(cx);
-        let is_selected = self
-            .selection
-            .as_ref()
-            .is_some_and(|selected_path| *selected_path == variable.path);
-
-        let bg_hover_color = if !is_selected {
-            colors.hover
-        } else {
-            colors.default
-        };
-        let border_color = if is_selected && self.focus_handle.contains_focused(window, cx) {
-            colors.marked_active
-        } else {
-            colors.default
-        };
-        let path = variable.path.clone();
-        div()
-            .id(variable.item_id())
-            .group("variable_list_entry")
-            .pl_2()
-            .border_1()
-            .border_r_2()
-            .border_color(border_color)
-            .h_4()
-            .size_full()
-            .hover(|style| style.bg(bg_hover_color))
-            .on_click(cx.listener({
-                let path = path.clone();
-                move |this, _, _window, cx| {
-                    this.selection = Some(path.clone());
-                    cx.notify();
-                }
-            }))
-            .child(
-                ListItem::new(SharedString::from(format!(
-                    "variable-item-{}-{}",
-                    dap.name, state.depth
-                )))
-                .disabled(self.disabled)
-                .selectable(false)
-                .indent_level(state.depth)
-                .indent_step_size(INDENT_STEP_SIZE)
-                .always_show_disclosure_icon(true)
-                .when(var_ref > 0, |list_item| {
-                    list_item.toggle(state.is_expanded).on_toggle(cx.listener({
-                        let var_path = variable.path.clone();
-                        move |this, _, _, cx| {
-                            this.session.update(cx, |session, cx| {
-                                session.variables(var_ref, cx);
-                            });
-
-                            this.toggle_entry(&var_path, cx);
-                        }
-                    }))
-                })
-                .on_secondary_mouse_down(cx.listener({
-                    let entry = variable.clone();
-                    move |this, event: &MouseDownEvent, window, cx| {
-                        this.selection = Some(path.clone());
-                        this.deploy_list_entry_context_menu(
-                            entry.clone(),
-                            event.position,
-                            window,
-                            cx,
-                        );
-                        cx.stop_propagation();
-                    }
-                }))
-                .child(
-                    h_flex()
-                        .gap_1()
-                        .text_ui_sm(cx)
-                        .w_full()
-                        .child(
-                            Label::new(&dap.name).when_some(variable_color.name, |this, color| {
-                                this.color(Color::from(color))
-                            }),
-                        )
-                        .child(self.render_variable_value(
-                            variable,
-                            &variable_color,
-                            dap.value.clone(),
-                            cx,
-                        )),
-                ),
-            )
-            .into_any()
-    }
-}
-
-impl Focusable for VariableList {
-    fn focus_handle(&self, _: &App) -> gpui::FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl Render for VariableList {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .track_focus(&self.focus_handle)
-            .key_context("VariableList")
-            .id("variable-list")
-            .group("variable-list")
-            .size_full()
-            .on_action(cx.listener(Self::select_first))
-            .on_action(cx.listener(Self::select_last))
-            .on_action(cx.listener(Self::select_prev))
-            .on_action(cx.listener(Self::select_next))
-            .on_action(cx.listener(Self::cancel))
-            .on_action(cx.listener(Self::confirm))
-            .on_action(cx.listener(Self::expand_selected_entry))
-            .on_action(cx.listener(Self::collapse_selected_entry))
-            .on_action(cx.listener(Self::copy_variable_name))
-            .on_action(cx.listener(Self::copy_variable_value))
-            .on_action(cx.listener(Self::edit_variable))
-            .on_action(cx.listener(Self::add_watcher))
-            .on_action(cx.listener(Self::remove_watcher))
-            .on_action(cx.listener(Self::toggle_data_breakpoint))
-            .on_action(cx.listener(Self::jump_to_variable_memory))
-            .child(
-                uniform_list(
-                    "variable-list",
-                    self.entries.len(),
-                    cx.processor(move |this, range: Range<usize>, window, cx| {
-                        this.render_entries(range, window, cx)
-                    }),
-                )
-                .track_scroll(&self.list_handle)
-                .with_width_from_item(self.max_width_index)
-                .with_sizing_behavior(gpui::ListSizingBehavior::Auto)
-                .with_horizontal_sizing_behavior(gpui::ListHorizontalSizingBehavior::Unconstrained)
-                .gap_1_5()
-                .size_full()
-                .flex_grow(),
-            )
-            .children(self.open_context_menu.as_ref().map(|(menu, position, _)| {
-                deferred(
-                    anchored()
-                        .position(*position)
-                        .anchor(gpui::Corner::TopLeft)
-                        .child(menu.clone()),
-                )
-                .with_priority(1)
-            }))
-            // .vertical_scrollbar_for(&self.list_handle, window, cx)
-            .custom_scrollbars(
-                ui::Scrollbars::new(ScrollAxes::Both)
-                    .tracked_scroll_handle(&self.list_handle)
-                    .with_track_along(ScrollAxes::Both, cx.theme().colors().panel_background)
-                    .tracked_entity(cx.entity_id()),
-                window,
-                cx,
-            )
-    }
-}
-
-struct EntryColors {
-    default: Hsla,
-    hover: Hsla,
-    marked_active: Hsla,
-}
-
-fn get_entry_color(cx: &Context<VariableList>) -> EntryColors {
-    let colors = cx.theme().colors();
-
-    EntryColors {
-        default: colors.panel_background,
-        hover: colors.ghost_element_hover,
-        marked_active: colors.ghost_element_selected,
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_center_truncate_string() {
-        // Test string shorter than limit - should not be truncated
-        assert_eq!(VariableList::center_truncate_string("short", 10), "short");
-
-        // Test exact length - should not be truncated
-        assert_eq!(
-            VariableList::center_truncate_string("exactly_10", 10),
-            "exactly_10"
-        );
-
-        // Test simple truncation
-        assert_eq!(
-            VariableList::center_truncate_string("value->value2->value3->value4", 20),
-            "value->v...3->value4"
-        );
-
-        // Test with very long expression
-        assert_eq!(
-            VariableList::center_truncate_string(
-                "object->property1->property2->property3->property4->property5",
-                30
-            ),
-            "object->prope...ty4->property5"
-        );
-
-        // Test edge case with limit equal to ellipsis length
-        assert_eq!(VariableList::center_truncate_string("anything", 3), "any");
-
-        // Test edge case with limit less than ellipsis length
-        assert_eq!(VariableList::center_truncate_string("anything", 2), "any");
-
-        // Test with UTF-8 characters
-        assert_eq!(
-            VariableList::center_truncate_string("café->résumé->naïve->voilà", 15),
-            "café->...>voilà"
-        );
-
-        // Test with emoji (multi-byte UTF-8)
-        assert_eq!(
-            VariableList::center_truncate_string("😀->happy->face->😎->cool", 15),
-            "😀->hap...->cool"
-        );
-    }
-}
diff --git a/crates/debugger_ui/src/stack_trace_view.rs b/crates/debugger_ui/src/stack_trace_view.rs
deleted file mode 100644
index 70b88d203e..0000000000
--- a/crates/debugger_ui/src/stack_trace_view.rs
+++ /dev/null
@@ -1,453 +0,0 @@
-use std::any::{Any, TypeId};
-
-use collections::HashMap;
-use dap::StackFrameId;
-use editor::{
-    Anchor, Bias, DebugStackFrameLine, Editor, EditorEvent, ExcerptId, ExcerptRange, MultiBuffer,
-    RowHighlightOptions, SelectionEffects, ToPoint, scroll::Autoscroll,
-};
-use gpui::{
-    App, AppContext, Entity, EventEmitter, Focusable, IntoElement, Render, SharedString,
-    Subscription, Task, WeakEntity, Window,
-};
-use language::{BufferSnapshot, Capability, Point, Selection, SelectionGoal, TreeSitterOptions};
-use project::{Project, ProjectPath};
-use ui::{ActiveTheme as _, Context, ParentElement as _, Styled as _, div};
-use util::ResultExt as _;
-use workspace::{
-    Item, ItemHandle as _, ItemNavHistory, ToolbarItemLocation, Workspace,
-    item::{BreadcrumbText, ItemEvent, SaveOptions},
-    searchable::SearchableItemHandle,
-};
-
-use crate::session::running::stack_frame_list::{StackFrameList, StackFrameListEvent};
-use anyhow::Result;
-
-pub(crate) struct StackTraceView {
-    editor: Entity<Editor>,
-    multibuffer: Entity<MultiBuffer>,
-    workspace: WeakEntity<Workspace>,
-    project: Entity<Project>,
-    stack_frame_list: Entity<StackFrameList>,
-    selected_stack_frame_id: Option<StackFrameId>,
-    highlights: Vec<(StackFrameId, Anchor)>,
-    excerpt_for_frames: collections::HashMap<ExcerptId, StackFrameId>,
-    refresh_task: Option<Task<Result<()>>>,
-    _subscription: Option<Subscription>,
-}
-
-impl StackTraceView {
-    pub(crate) fn new(
-        workspace: WeakEntity<Workspace>,
-        project: Entity<Project>,
-        stack_frame_list: Entity<StackFrameList>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let multibuffer = cx.new(|_| MultiBuffer::new(Capability::ReadWrite));
-        let editor = cx.new(|cx| {
-            let mut editor =
-                Editor::for_multibuffer(multibuffer.clone(), Some(project.clone()), window, cx);
-            editor.set_vertical_scroll_margin(5, cx);
-            editor
-        });
-
-        cx.subscribe_in(&editor, window, |this, editor, event, window, cx| {
-            if let EditorEvent::SelectionsChanged { local: true } = event {
-                let excerpt_id = editor.update(cx, |editor, cx| {
-                    let position: Point = editor
-                        .selections
-                        .newest(&editor.display_snapshot(cx))
-                        .head();
-
-                    editor
-                        .snapshot(window, cx)
-                        .buffer_snapshot()
-                        .excerpt_containing(position..position)
-                        .map(|excerpt| excerpt.id())
-                });
-
-                if let Some(stack_frame_id) = excerpt_id
-                    .and_then(|id| this.excerpt_for_frames.get(&id))
-                    .filter(|id| Some(**id) != this.selected_stack_frame_id)
-                {
-                    this.stack_frame_list.update(cx, |list, cx| {
-                        list.go_to_stack_frame(*stack_frame_id, window, cx).detach();
-                    });
-                }
-            }
-        })
-        .detach();
-
-        cx.subscribe_in(
-            &stack_frame_list,
-            window,
-            |this, stack_frame_list, event, window, cx| match event {
-                StackFrameListEvent::BuiltEntries => {
-                    this.selected_stack_frame_id =
-                        stack_frame_list.read(cx).opened_stack_frame_id();
-                    this.update_excerpts(window, cx);
-                }
-                StackFrameListEvent::SelectedStackFrameChanged(selected_frame_id) => {
-                    this.selected_stack_frame_id = Some(*selected_frame_id);
-                    this.update_highlights(window, cx);
-
-                    if let Some(frame_anchor) = this
-                        .highlights
-                        .iter()
-                        .find(|(frame_id, _)| frame_id == selected_frame_id)
-                        .map(|highlight| highlight.1)
-                    {
-                        this.editor.update(cx, |editor, cx| {
-                            if frame_anchor.excerpt_id
-                                != editor.selections.newest_anchor().head().excerpt_id
-                            {
-                                let effects = SelectionEffects::scroll(
-                                    Autoscroll::center().for_anchor(frame_anchor),
-                                );
-
-                                editor.change_selections(effects, window, cx, |selections| {
-                                    let selection_id = selections.new_selection_id();
-
-                                    let selection = Selection {
-                                        id: selection_id,
-                                        start: frame_anchor,
-                                        end: frame_anchor,
-                                        goal: SelectionGoal::None,
-                                        reversed: false,
-                                    };
-
-                                    selections.select_anchors(vec![selection]);
-                                })
-                            }
-                        });
-                    }
-                }
-            },
-        )
-        .detach();
-
-        let mut this = Self {
-            editor,
-            multibuffer,
-            workspace,
-            project,
-            excerpt_for_frames: HashMap::default(),
-            highlights: Vec::default(),
-            stack_frame_list,
-            selected_stack_frame_id: None,
-            refresh_task: None,
-            _subscription: None,
-        };
-
-        this.update_excerpts(window, cx);
-        this
-    }
-
-    fn update_excerpts(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.refresh_task.take();
-        self.editor.update(cx, |editor, cx| {
-            editor.clear_highlights::<DebugStackFrameLine>(cx)
-        });
-
-        let stack_frames = self
-            .stack_frame_list
-            .read_with(cx, |list, _| list.flatten_entries(false, false));
-
-        let frames_to_open: Vec<_> = stack_frames
-            .into_iter()
-            .filter_map(|frame| {
-                Some((
-                    frame.id,
-                    frame.line as u32 - 1,
-                    StackFrameList::abs_path_from_stack_frame(&frame)?,
-                ))
-            })
-            .collect();
-
-        self.multibuffer
-            .update(cx, |multi_buffer, cx| multi_buffer.clear(cx));
-
-        let task = cx.spawn_in(window, async move |this, cx| {
-            let mut to_highlights = Vec::default();
-
-            for (stack_frame_id, line, abs_path) in frames_to_open {
-                let (worktree, relative_path) = this
-                    .update(cx, |this, cx| {
-                        this.workspace.update(cx, |workspace, cx| {
-                            workspace.project().update(cx, |this, cx| {
-                                this.find_or_create_worktree(&abs_path, false, cx)
-                            })
-                        })
-                    })??
-                    .await?;
-
-                let project_path = ProjectPath {
-                    worktree_id: worktree.read_with(cx, |tree, _| tree.id())?,
-                    path: relative_path,
-                };
-
-                if let Some(buffer) = this
-                    .read_with(cx, |this, _| this.project.clone())?
-                    .update(cx, |project, cx| project.open_buffer(project_path, cx))?
-                    .await
-                    .log_err()
-                {
-                    this.update(cx, |this, cx| {
-                        this.multibuffer.update(cx, |multi_buffer, cx| {
-                            let line_point = Point::new(line, 0);
-                            let start_context = Self::heuristic_syntactic_expand(
-                                &buffer.read(cx).snapshot(),
-                                line_point,
-                            );
-
-                            // Users will want to see what happened before an active debug line in most cases
-                            let range = ExcerptRange {
-                                context: start_context..Point::new(line.saturating_add(1), 0),
-                                primary: line_point..line_point,
-                            };
-                            multi_buffer.push_excerpts(buffer.clone(), vec![range], cx);
-
-                            let line_anchor =
-                                multi_buffer.buffer_point_to_anchor(&buffer, line_point, cx);
-
-                            if let Some(line_anchor) = line_anchor {
-                                this.excerpt_for_frames
-                                    .insert(line_anchor.excerpt_id, stack_frame_id);
-                                to_highlights.push((stack_frame_id, line_anchor));
-                            }
-                        });
-                    })
-                    .ok();
-                }
-            }
-
-            this.update_in(cx, |this, window, cx| {
-                this.highlights = to_highlights;
-                this.update_highlights(window, cx);
-            })
-            .ok();
-
-            anyhow::Ok(())
-        });
-
-        self.refresh_task = Some(task);
-    }
-
-    fn update_highlights(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.editor.update(cx, |editor, _| {
-            editor.clear_row_highlights::<DebugStackFrameLine>()
-        });
-
-        let stack_frames = self
-            .stack_frame_list
-            .read_with(cx, |session, _| session.flatten_entries(false, false));
-
-        let active_idx = self
-            .selected_stack_frame_id
-            .and_then(|id| {
-                stack_frames
-                    .iter()
-                    .enumerate()
-                    .find_map(|(idx, frame)| if frame.id == id { Some(idx) } else { None })
-            })
-            .unwrap_or(0);
-
-        self.editor.update(cx, |editor, cx| {
-            let snapshot = editor.snapshot(window, cx).display_snapshot;
-            let first_color = cx.theme().colors().editor_debugger_active_line_background;
-
-            let color = first_color.opacity(0.5);
-
-            let mut is_first = true;
-
-            for (_, highlight) in self.highlights.iter().skip(active_idx) {
-                let position = highlight.to_point(&snapshot.buffer_snapshot());
-                let color = if is_first {
-                    is_first = false;
-                    first_color
-                } else {
-                    color
-                };
-
-                let start = snapshot
-                    .buffer_snapshot()
-                    .clip_point(Point::new(position.row, 0), Bias::Left);
-                let end = start + Point::new(1, 0);
-                let start = snapshot.buffer_snapshot().anchor_before(start);
-                let end = snapshot.buffer_snapshot().anchor_before(end);
-                editor.highlight_rows::<DebugStackFrameLine>(
-                    start..end,
-                    color,
-                    RowHighlightOptions::default(),
-                    cx,
-                );
-            }
-        })
-    }
-
-    fn heuristic_syntactic_expand(snapshot: &BufferSnapshot, selected_point: Point) -> Point {
-        let mut text_objects = snapshot.text_object_ranges(
-            selected_point..selected_point,
-            TreeSitterOptions::max_start_depth(4),
-        );
-
-        let mut start_position = text_objects
-            .find(|(_, obj)| matches!(obj, language::TextObject::AroundFunction))
-            .map(|(range, _)| snapshot.offset_to_point(range.start))
-            .map(|point| Point::new(point.row.max(selected_point.row.saturating_sub(8)), 0))
-            .unwrap_or(selected_point);
-
-        if start_position.row == selected_point.row {
-            start_position.row = start_position.row.saturating_sub(1);
-        }
-
-        start_position
-    }
-}
-
-impl Render for StackTraceView {
-    fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
-        div().size_full().child(self.editor.clone())
-    }
-}
-
-impl EventEmitter<EditorEvent> for StackTraceView {}
-impl Focusable for StackTraceView {
-    fn focus_handle(&self, cx: &App) -> gpui::FocusHandle {
-        self.editor.focus_handle(cx)
-    }
-}
-
-impl Item for StackTraceView {
-    type Event = EditorEvent;
-
-    fn to_item_events(event: &EditorEvent, f: impl FnMut(ItemEvent)) {
-        Editor::to_item_events(event, f)
-    }
-
-    fn deactivated(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.editor
-            .update(cx, |editor, cx| editor.deactivated(window, cx));
-    }
-
-    fn navigate(
-        &mut self,
-        data: Box<dyn Any>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> bool {
-        self.editor
-            .update(cx, |editor, cx| editor.navigate(data, window, cx))
-    }
-
-    fn tab_tooltip_text(&self, _: &App) -> Option<SharedString> {
-        Some("Stack Frame Viewer".into())
-    }
-
-    fn tab_content_text(&self, _detail: usize, _: &App) -> SharedString {
-        "Stack Frames".into()
-    }
-
-    fn for_each_project_item(
-        &self,
-        cx: &App,
-        f: &mut dyn FnMut(gpui::EntityId, &dyn project::ProjectItem),
-    ) {
-        self.editor.for_each_project_item(cx, f)
-    }
-
-    fn set_nav_history(
-        &mut self,
-        nav_history: ItemNavHistory,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.editor.update(cx, |editor, _| {
-            editor.set_nav_history(Some(nav_history));
-        });
-    }
-
-    fn is_dirty(&self, cx: &App) -> bool {
-        self.multibuffer.read(cx).is_dirty(cx)
-    }
-
-    fn has_deleted_file(&self, cx: &App) -> bool {
-        self.multibuffer.read(cx).has_deleted_file(cx)
-    }
-
-    fn has_conflict(&self, cx: &App) -> bool {
-        self.multibuffer.read(cx).has_conflict(cx)
-    }
-
-    fn can_save(&self, _: &App) -> bool {
-        true
-    }
-
-    fn save(
-        &mut self,
-        options: SaveOptions,
-        project: Entity<Project>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        self.editor.save(options, project, window, cx)
-    }
-
-    fn save_as(
-        &mut self,
-        _: Entity<Project>,
-        _: ProjectPath,
-        _window: &mut Window,
-        _: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        unreachable!()
-    }
-
-    fn reload(
-        &mut self,
-        project: Entity<Project>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        self.editor.reload(project, window, cx)
-    }
-
-    fn act_as_type<'a>(
-        &'a self,
-        type_id: TypeId,
-        self_handle: &'a Entity<Self>,
-        _: &'a App,
-    ) -> Option<gpui::AnyEntity> {
-        if type_id == TypeId::of::<Self>() {
-            Some(self_handle.clone().into())
-        } else if type_id == TypeId::of::<Editor>() {
-            Some(self.editor.clone().into())
-        } else {
-            None
-        }
-    }
-
-    fn as_searchable(&self, _: &Entity<Self>, _: &App) -> Option<Box<dyn SearchableItemHandle>> {
-        Some(Box::new(self.editor.clone()))
-    }
-
-    fn breadcrumb_location(&self, _: &App) -> ToolbarItemLocation {
-        ToolbarItemLocation::PrimaryLeft
-    }
-
-    fn breadcrumbs(&self, theme: &theme::Theme, cx: &App) -> Option<Vec<BreadcrumbText>> {
-        self.editor.breadcrumbs(theme, cx)
-    }
-
-    fn added_to_workspace(
-        &mut self,
-        workspace: &mut Workspace,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.editor.update(cx, |editor, cx| {
-            editor.added_to_workspace(workspace, window, cx)
-        });
-    }
-}
diff --git a/crates/debugger_ui/src/tests.rs b/crates/debugger_ui/src/tests.rs
deleted file mode 100644
index 4f020e7cd4..0000000000
--- a/crates/debugger_ui/src/tests.rs
+++ /dev/null
@@ -1,153 +0,0 @@
-use std::sync::Arc;
-
-use anyhow::{Context as _, Result};
-use dap::adapters::DebugTaskDefinition;
-use dap::client::DebugAdapterClient;
-use gpui::{Entity, TestAppContext, WindowHandle};
-use project::{Project, debugger::session::Session};
-use settings::SettingsStore;
-use task::TaskContext;
-use terminal_view::terminal_panel::TerminalPanel;
-use workspace::Workspace;
-
-use crate::{debugger_panel::DebugPanel, session::DebugSession};
-
-#[cfg(test)]
-mod attach_modal;
-#[cfg(test)]
-mod console;
-#[cfg(test)]
-mod dap_logger;
-#[cfg(test)]
-mod debugger_panel;
-#[cfg(test)]
-mod inline_values;
-#[cfg(test)]
-mod module_list;
-#[cfg(test)]
-mod new_process_modal;
-#[cfg(test)]
-mod persistence;
-#[cfg(test)]
-mod stack_frame_list;
-#[cfg(test)]
-mod variable_list;
-
-pub fn init_test(cx: &mut gpui::TestAppContext) {
-    #[cfg(test)]
-    zlog::init_test();
-
-    cx.update(|cx| {
-        let settings = SettingsStore::test(cx);
-        cx.set_global(settings);
-        terminal_view::init(cx);
-        theme::init(theme::LoadThemes::JustBase, cx);
-        command_palette_hooks::init(cx);
-        editor::init(cx);
-        crate::init(cx);
-        dap_adapters::init(cx);
-    });
-}
-
-pub async fn init_test_workspace(
-    project: &Entity<Project>,
-    cx: &mut TestAppContext,
-) -> WindowHandle<Workspace> {
-    let workspace_handle =
-        cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-    let debugger_panel = workspace_handle
-        .update(cx, |_, window, cx| {
-            cx.spawn_in(window, async move |this, cx| {
-                DebugPanel::load(this, cx).await
-            })
-        })
-        .unwrap()
-        .await
-        .expect("Failed to load debug panel");
-
-    let terminal_panel = workspace_handle
-        .update(cx, |_, window, cx| {
-            cx.spawn_in(window, async |this, cx| {
-                TerminalPanel::load(this, cx.clone()).await
-            })
-        })
-        .unwrap()
-        .await
-        .expect("Failed to load terminal panel");
-
-    workspace_handle
-        .update(cx, |workspace, window, cx| {
-            workspace.add_panel(debugger_panel, window, cx);
-            workspace.add_panel(terminal_panel, window, cx);
-        })
-        .unwrap();
-    workspace_handle
-}
-
-#[track_caller]
-pub fn active_debug_session_panel(
-    workspace: WindowHandle<Workspace>,
-    cx: &mut TestAppContext,
-) -> Entity<DebugSession> {
-    workspace
-        .update(cx, |workspace, _window, cx| {
-            let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap();
-            debug_panel
-                .update(cx, |this, _| this.active_session())
-                .unwrap()
-        })
-        .unwrap()
-}
-
-pub fn start_debug_session_with<T: Fn(&Arc<DebugAdapterClient>) + 'static>(
-    workspace: &WindowHandle<Workspace>,
-    cx: &mut gpui::TestAppContext,
-    config: DebugTaskDefinition,
-    configure: T,
-) -> Result<Entity<Session>> {
-    let _subscription = project::debugger::test::intercept_debug_sessions(cx, configure);
-    workspace.update(cx, |workspace, window, cx| {
-        workspace.start_debug_session(
-            config.to_scenario(),
-            TaskContext::default(),
-            None,
-            None,
-            window,
-            cx,
-        )
-    })?;
-    cx.run_until_parked();
-    let session = workspace.read_with(cx, |workspace, cx| {
-        workspace
-            .panel::<DebugPanel>(cx)
-            .and_then(|panel| panel.read(cx).active_session())
-            .map(|session| session.read(cx).running_state().read(cx).session())
-            .cloned()
-            .context("Failed to get active session")
-    })??;
-
-    Ok(session)
-}
-
-pub fn start_debug_session<T: Fn(&Arc<DebugAdapterClient>) + 'static>(
-    workspace: &WindowHandle<Workspace>,
-    cx: &mut gpui::TestAppContext,
-    configure: T,
-) -> Result<Entity<Session>> {
-    use serde_json::json;
-
-    start_debug_session_with(
-        workspace,
-        cx,
-        DebugTaskDefinition {
-            adapter: "fake-adapter".into(),
-            label: "test".into(),
-            config: json!({
-                "request": "launch"
-            }),
-            tcp_connection: None,
-        },
-        configure,
-    )
-}
diff --git a/crates/debugger_ui/src/tests/attach_modal.rs b/crates/debugger_ui/src/tests/attach_modal.rs
deleted file mode 100644
index 4df3ebf519..0000000000
--- a/crates/debugger_ui/src/tests/attach_modal.rs
+++ /dev/null
@@ -1,311 +0,0 @@
-use crate::{
-    attach_modal::{Candidate, ModalIntent},
-    tests::start_debug_session_with,
-    *,
-};
-use attach_modal::AttachModal;
-use dap::{FakeAdapter, adapters::DebugTaskDefinition};
-use gpui::{BackgroundExecutor, TestAppContext, VisualTestContext};
-use menu::Confirm;
-use project::{FakeFs, Project};
-use serde_json::json;
-use task::AttachRequest;
-use tests::{init_test, init_test_workspace};
-use util::path;
-
-#[gpui::test]
-async fn test_direct_attach_to_process(executor: BackgroundExecutor, cx: &mut TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(executor.clone());
-
-    fs.insert_tree(
-        path!("/project"),
-        json!({
-            "main.rs": "First line\nSecond line\nThird line\nFourth line",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
-    let workspace = init_test_workspace(&project, cx).await;
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-    let _session = start_debug_session_with(
-        &workspace,
-        cx,
-        DebugTaskDefinition {
-            adapter: "fake-adapter".into(),
-            label: "label".into(),
-            config: json!({
-               "request": "attach",
-              "process_id": 10,
-            }),
-            tcp_connection: None,
-        },
-        |client| {
-            client.on_request::<dap::requests::Attach, _>(move |_, args| {
-                let raw = &args.raw;
-                assert_eq!(raw["request"], "attach");
-                assert_eq!(raw["process_id"], 10);
-
-                Ok(())
-            });
-        },
-    )
-    .unwrap();
-
-    cx.run_until_parked();
-
-    // assert we didn't show the attach modal
-    workspace
-        .update(cx, |workspace, _window, cx| {
-            assert!(workspace.active_modal::<AttachModal>(cx).is_none());
-        })
-        .unwrap();
-}
-
-#[gpui::test]
-async fn test_show_attach_modal_and_select_process(
-    executor: BackgroundExecutor,
-    cx: &mut TestAppContext,
-) {
-    init_test(cx);
-
-    let fs = FakeFs::new(executor.clone());
-
-    fs.insert_tree(
-        path!("/project"),
-        json!({
-            "main.rs": "First line\nSecond line\nThird line\nFourth line",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
-    let workspace = init_test_workspace(&project, cx).await;
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    // Set up handlers for sessions spawned via modal.
-    let _initialize_subscription =
-        project::debugger::test::intercept_debug_sessions(cx, |client| {
-            client.on_request::<dap::requests::Attach, _>(move |_, args| {
-                let raw = &args.raw;
-                assert_eq!(raw["request"], "attach");
-                assert_eq!(raw["process_id"], 1);
-
-                Ok(())
-            });
-        });
-    let attach_modal = workspace
-        .update(cx, |workspace, window, cx| {
-            let workspace_handle = cx.weak_entity();
-            workspace.toggle_modal(window, cx, |window, cx| {
-                AttachModal::with_processes(
-                    workspace_handle,
-                    vec![
-                        Candidate {
-                            pid: 0,
-                            name: "fake-binary-1".into(),
-                            command: vec![],
-                        },
-                        Candidate {
-                            pid: 3,
-                            name: "real-binary-1".into(),
-                            command: vec![],
-                        },
-                        Candidate {
-                            pid: 1,
-                            name: "fake-binary-2".into(),
-                            command: vec![],
-                        },
-                    ]
-                    .into_iter()
-                    .collect(),
-                    true,
-                    ModalIntent::AttachToProcess(task::ZedDebugConfig {
-                        adapter: FakeAdapter::ADAPTER_NAME.into(),
-                        request: dap::DebugRequest::Attach(AttachRequest::default()),
-                        label: "attach example".into(),
-                        stop_on_entry: None,
-                    }),
-                    window,
-                    cx,
-                )
-            });
-
-            workspace.active_modal::<AttachModal>(cx).unwrap()
-        })
-        .unwrap();
-
-    cx.run_until_parked();
-
-    // assert we got the expected processes
-    workspace
-        .update(cx, |_, window, cx| {
-            let names = attach_modal.update(cx, |modal, cx| attach_modal::process_names(modal, cx));
-            // Initially all processes are visible.
-            assert_eq!(3, names.len());
-            attach_modal.update(cx, |this, cx| {
-                this.picker.update(cx, |this, cx| {
-                    this.set_query("fakb", window, cx);
-                })
-            })
-        })
-        .unwrap();
-    cx.run_until_parked();
-    // assert we got the expected processes
-    workspace
-        .update(cx, |_, _, cx| {
-            let names = attach_modal.update(cx, |modal, cx| attach_modal::process_names(modal, cx));
-            // Initially all processes are visible.
-            assert_eq!(2, names.len());
-        })
-        .unwrap();
-    // select the only existing process
-    cx.dispatch_action(Confirm);
-
-    cx.run_until_parked();
-
-    // assert attach modal was dismissed
-    workspace
-        .update(cx, |workspace, _window, cx| {
-            assert!(workspace.active_modal::<AttachModal>(cx).is_none());
-        })
-        .unwrap();
-}
-
-#[gpui::test]
-async fn test_attach_with_pick_pid_variable(executor: BackgroundExecutor, cx: &mut TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(executor.clone());
-
-    fs.insert_tree(
-        path!("/project"),
-        json!({
-            "main.rs": "First line\nSecond line\nThird line\nFourth line",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
-    let workspace = init_test_workspace(&project, cx).await;
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-    let _initialize_subscription =
-        project::debugger::test::intercept_debug_sessions(cx, |client| {
-            client.on_request::<dap::requests::Attach, _>(move |_, args| {
-                let raw = &args.raw;
-                assert_eq!(raw["request"], "attach");
-                assert_eq!(
-                    raw["process_id"], "42",
-                    "verify process id has been replaced"
-                );
-
-                Ok(())
-            });
-        });
-
-    let pick_pid_placeholder = task::VariableName::PickProcessId.template_value();
-    workspace
-        .update(cx, |workspace, window, cx| {
-            workspace.start_debug_session(
-                DebugTaskDefinition {
-                    adapter: FakeAdapter::ADAPTER_NAME.into(),
-                    label: "attach with picker".into(),
-                    config: json!({
-                        "request": "attach",
-                        "process_id": pick_pid_placeholder,
-                    }),
-                    tcp_connection: None,
-                }
-                .to_scenario(),
-                task::TaskContext::default(),
-                None,
-                None,
-                window,
-                cx,
-            )
-        })
-        .unwrap();
-
-    cx.run_until_parked();
-
-    let attach_modal = workspace
-        .update(cx, |workspace, _window, cx| {
-            workspace.active_modal::<AttachModal>(cx)
-        })
-        .unwrap();
-
-    assert!(
-        attach_modal.is_some(),
-        "Attach modal should open when config contains ZED_PICK_PID"
-    );
-
-    let attach_modal = attach_modal.unwrap();
-
-    workspace
-        .update(cx, |_, window, cx| {
-            attach_modal.update(cx, |modal, cx| {
-                attach_modal::set_candidates(
-                    modal,
-                    vec![
-                        Candidate {
-                            pid: 10,
-                            name: "process-1".into(),
-                            command: vec![],
-                        },
-                        Candidate {
-                            pid: 42,
-                            name: "target-process".into(),
-                            command: vec![],
-                        },
-                        Candidate {
-                            pid: 99,
-                            name: "process-3".into(),
-                            command: vec![],
-                        },
-                    ]
-                    .into_iter()
-                    .collect(),
-                    window,
-                    cx,
-                )
-            })
-        })
-        .unwrap();
-
-    cx.run_until_parked();
-
-    workspace
-        .update(cx, |_, window, cx| {
-            attach_modal.update(cx, |modal, cx| {
-                modal.picker.update(cx, |picker, cx| {
-                    picker.set_query("target", window, cx);
-                })
-            })
-        })
-        .unwrap();
-
-    cx.run_until_parked();
-
-    workspace
-        .update(cx, |_, _, cx| {
-            let names = attach_modal.update(cx, |modal, cx| attach_modal::process_names(modal, cx));
-            assert_eq!(names.len(), 1);
-            assert_eq!(names[0], " 42 target-process");
-        })
-        .unwrap();
-
-    cx.dispatch_action(Confirm);
-    cx.run_until_parked();
-
-    workspace
-        .update(cx, |workspace, _window, cx| {
-            assert!(
-                workspace.active_modal::<AttachModal>(cx).is_none(),
-                "Attach modal should be dismissed after selection"
-            );
-        })
-        .unwrap();
-}
diff --git a/crates/debugger_ui/src/tests/console.rs b/crates/debugger_ui/src/tests/console.rs
deleted file mode 100644
index fad483b0f4..0000000000
--- a/crates/debugger_ui/src/tests/console.rs
+++ /dev/null
@@ -1,1094 +0,0 @@
-use crate::{
-    tests::{active_debug_session_panel, start_debug_session},
-    *,
-};
-use dap::requests::StackTrace;
-use editor::{DisplayPoint, display_map::DisplayRow};
-use gpui::{BackgroundExecutor, TestAppContext, VisualTestContext};
-use project::{FakeFs, Project};
-use serde_json::json;
-use tests::{init_test, init_test_workspace};
-use util::path;
-
-#[gpui::test]
-async fn test_handle_output_event(executor: BackgroundExecutor, cx: &mut TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(executor.clone());
-
-    fs.insert_tree(
-        path!("/project"),
-        json!({
-            "main.rs": "First line\nSecond line\nThird line\nFourth line",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
-    let workspace = init_test_workspace(&project, cx).await;
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    workspace
-        .update(cx, |workspace, window, cx| {
-            workspace.focus_panel::<DebugPanel>(window, cx);
-        })
-        .unwrap();
-
-    let session = start_debug_session(&workspace, cx, |_| {}).unwrap();
-    let client = session.read_with(cx, |session, _| session.adapter_client().unwrap());
-
-    client.on_request::<StackTrace, _>(move |_, _| {
-        Ok(dap::StackTraceResponse {
-            stack_frames: Vec::default(),
-            total_frames: None,
-        })
-    });
-
-    client
-        .fake_event(dap::messages::Events::Output(dap::OutputEvent {
-            category: None,
-            output: "First console output line before thread stopped!".to_string(),
-            data: None,
-            variables_reference: None,
-            source: None,
-            line: None,
-            column: None,
-            group: None,
-            location_reference: None,
-        }))
-        .await;
-
-    client
-        .fake_event(dap::messages::Events::Output(dap::OutputEvent {
-            category: Some(dap::OutputEventCategory::Stdout),
-            output: "First output line before thread stopped!".to_string(),
-            data: None,
-            variables_reference: None,
-            source: None,
-            line: None,
-            column: None,
-            group: None,
-            location_reference: None,
-        }))
-        .await;
-
-    client
-        .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-            reason: dap::StoppedEventReason::Pause,
-            description: None,
-            thread_id: Some(1),
-            preserve_focus_hint: None,
-            text: None,
-            all_threads_stopped: None,
-            hit_breakpoint_ids: None,
-        }))
-        .await;
-
-    cx.run_until_parked();
-
-    let running_state =
-        active_debug_session_panel(workspace, cx).update_in(cx, |item, window, cx| {
-            cx.focus_self(window);
-            item.running_state().clone()
-        });
-
-    cx.run_until_parked();
-
-    // assert we have output from before the thread stopped
-    workspace
-        .update(cx, |workspace, _window, cx| {
-            let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap();
-            let active_debug_session_panel = debug_panel
-                .update(cx, |this, _| this.active_session())
-                .unwrap();
-
-            assert_eq!(
-                "First console output line before thread stopped!\nFirst output line before thread stopped!\n",
-                active_debug_session_panel.read(cx).running_state().read(cx).console().read(cx).editor().read(cx).text(cx).as_str()
-            );
-        })
-        .unwrap();
-
-    client
-        .fake_event(dap::messages::Events::Output(dap::OutputEvent {
-            category: Some(dap::OutputEventCategory::Stdout),
-            output: "\tSecond output line after thread stopped!".to_string(),
-            data: None,
-            variables_reference: None,
-            source: None,
-            line: None,
-            column: None,
-            group: None,
-            location_reference: None,
-        }))
-        .await;
-
-    client
-        .fake_event(dap::messages::Events::Output(dap::OutputEvent {
-            category: Some(dap::OutputEventCategory::Console),
-            output: "\tSecond console output line after thread stopped!".to_string(),
-            data: None,
-            variables_reference: None,
-            source: None,
-            line: None,
-            column: None,
-            group: None,
-            location_reference: None,
-        }))
-        .await;
-
-    cx.run_until_parked();
-    running_state.update(cx, |_, cx| {
-        cx.refresh_windows();
-    });
-    cx.run_until_parked();
-
-    // assert we have output from before and after the thread stopped
-    workspace
-        .update(cx, |workspace, _window, cx| {
-            let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap();
-            let active_session_panel = debug_panel
-                .update(cx, |this, _| this.active_session())
-                .unwrap();
-
-            assert_eq!(
-                "First console output line before thread stopped!\nFirst output line before thread stopped!\n\tSecond output line after thread stopped!\n\tSecond console output line after thread stopped!\n",
-                active_session_panel.read(cx).running_state().read(cx).console().read(cx).editor().read(cx).text(cx).as_str()
-            );
-        })
-        .unwrap();
-}
-
-#[gpui::test]
-async fn test_escape_code_processing(executor: BackgroundExecutor, cx: &mut TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(executor.clone());
-
-    fs.insert_tree(
-        path!("/project"),
-        json!({
-            "main.rs": "First line\nSecond line\nThird line\nFourth line",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
-    let workspace = init_test_workspace(&project, cx).await;
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    workspace
-        .update(cx, |workspace, window, cx| {
-            workspace.focus_panel::<DebugPanel>(window, cx);
-        })
-        .unwrap();
-
-    let session = start_debug_session(&workspace, cx, |_| {}).unwrap();
-    let client = session.read_with(cx, |session, _| session.adapter_client().unwrap());
-
-    client.on_request::<StackTrace, _>(move |_, _| {
-        Ok(dap::StackTraceResponse {
-            stack_frames: Vec::default(),
-            total_frames: None,
-        })
-    });
-
-    client
-        .fake_event(dap::messages::Events::Output(dap::OutputEvent {
-            category: None,
-            output: "Checking latest version of JavaScript...".to_string(),
-            data: None,
-            variables_reference: None,
-            source: None,
-            line: None,
-            column: None,
-            group: None,
-            location_reference: None,
-        }))
-        .await;
-    client
-        .fake_event(dap::messages::Events::Output(dap::OutputEvent {
-            category: None,
-            output: "   \u{1b}[1m\u{1b}[38;2;173;127;168m▲ Next.js 15.1.5\u{1b}[39m\u{1b}[22m"
-                .to_string(),
-            data: None,
-            variables_reference: None,
-            source: None,
-            line: None,
-            column: None,
-            group: None,
-            location_reference: None,
-        }))
-        .await;
-    client
-        .fake_event(dap::messages::Events::Output(dap::OutputEvent {
-            category: None,
-            output: "   - Local:        http://localhost:3000\n   - Network:      http://192.168.1.144:3000\n\n \u{1b}[32m\u{1b}[1m✓\u{1b}[22m\u{1b}[39m Starting..."
-                .to_string(),
-            data: None,
-            variables_reference: None,
-            source: None,
-            line: None,
-            column: None,
-            group: None,
-            location_reference: None,
-        }))
-        .await;
-    client
-        .fake_event(dap::messages::Events::Output(dap::OutputEvent {
-            category: None,
-            output: "Something else...".to_string(),
-            data: None,
-            variables_reference: None,
-            source: None,
-            line: None,
-            column: None,
-            group: None,
-            location_reference: None,
-        }))
-        .await;
-    client
-        .fake_event(dap::messages::Events::Output(dap::OutputEvent {
-            category: None,
-            output: " \u{1b}[32m\u{1b}[1m✓\u{1b}[22m\u{1b}[39m Ready in 1009ms\n".to_string(),
-            data: None,
-            variables_reference: None,
-            source: None,
-            line: None,
-            column: None,
-            group: None,
-            location_reference: None,
-        }))
-        .await;
-
-    client
-        .fake_event(dap::messages::Events::Output(dap::OutputEvent {
-            category: None,
-            output: "\u{1b}[41m\u{1b}[37mBoth background and foreground!".to_string(),
-            data: None,
-            variables_reference: None,
-            source: None,
-            line: None,
-            column: None,
-            group: None,
-            location_reference: None,
-        }))
-        .await;
-    client
-        .fake_event(dap::messages::Events::Output(dap::OutputEvent {
-            category: None,
-            output: "Even more...".to_string(),
-            data: None,
-            variables_reference: None,
-            source: None,
-            line: None,
-            column: None,
-            group: None,
-            location_reference: None,
-        }))
-        .await;
-
-    cx.run_until_parked();
-
-    let _running_state =
-        active_debug_session_panel(workspace, cx).update_in(cx, |item, window, cx| {
-            cx.focus_self(window);
-            item.running_state().update(cx, |this, cx| {
-                this.console()
-                    .update(cx, |this, cx| this.update_output(window, cx));
-            });
-
-            item.running_state().clone()
-        });
-
-    cx.run_until_parked();
-
-    workspace
-        .update(cx, |workspace, window, cx| {
-            let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap();
-            let active_debug_session_panel = debug_panel
-                .update(cx, |this, _| this.active_session())
-                .unwrap();
-
-            let editor =
-                active_debug_session_panel
-                    .read(cx)
-                    .running_state()
-                    .read(cx)
-                    .console()
-                    .read(cx)
-                    .editor().clone();
-
-            assert_eq!(
-                "Checking latest version of JavaScript...\n   ▲ Next.js 15.1.5\n   - Local:        http://localhost:3000\n   - Network:      http://192.168.1.144:3000\n\n ✓ Starting...\nSomething else...\n ✓ Ready in 1009ms\nBoth background and foreground!\nEven more...\n",
-                editor
-                    .read(cx)
-                    .text(cx)
-                    .as_str()
-            );
-
-            let text_highlights = editor.update(cx, |editor, cx| {
-                let mut text_highlights = editor.all_text_highlights(window, cx).into_iter().flat_map(|(_, ranges)| ranges).collect::<Vec<_>>();
-                text_highlights.sort_by(|a, b| a.start.cmp(&b.start));
-                text_highlights
-            });
-            pretty_assertions::assert_eq!(
-                text_highlights,
-                [
-                    DisplayPoint::new(DisplayRow(1), 3)..DisplayPoint::new(DisplayRow(1), 21),
-                    DisplayPoint::new(DisplayRow(1), 21)..DisplayPoint::new(DisplayRow(2), 0),
-                    DisplayPoint::new(DisplayRow(5), 1)..DisplayPoint::new(DisplayRow(5), 4),
-                    DisplayPoint::new(DisplayRow(5), 4)..DisplayPoint::new(DisplayRow(6), 0),
-                    DisplayPoint::new(DisplayRow(7), 1)..DisplayPoint::new(DisplayRow(7), 4),
-                    DisplayPoint::new(DisplayRow(7), 4)..DisplayPoint::new(DisplayRow(8), 0),
-                    DisplayPoint::new(DisplayRow(8), 0)..DisplayPoint::new(DisplayRow(9), 0),
-                ]
-            );
-
-            let background_highlights = editor.update(cx, |editor, cx| {
-                editor.all_text_background_highlights(window, cx).into_iter().map(|(range, _)| range).collect::<Vec<_>>()
-            });
-            pretty_assertions::assert_eq!(
-                background_highlights,
-                [
-                    DisplayPoint::new(DisplayRow(8), 0)..DisplayPoint::new(DisplayRow(9), 0),
-                ]
-            )
-        })
-        .unwrap();
-}
-
-// #[gpui::test]
-// async fn test_grouped_output(executor: BackgroundExecutor, cx: &mut TestAppContext) {
-//     init_test(cx);
-
-//     let fs = FakeFs::new(executor.clone());
-
-//     fs.insert_tree(
-//         "/project",
-//         json!({
-//             "main.rs": "First line\nSecond line\nThird line\nFourth line",
-//         }),
-//     )
-//     .await;
-
-//     let project = Project::test(fs, ["/project".as_ref()], cx).await;
-//     let workspace = init_test_workspace(&project, cx).await;
-//     let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-//     let task = project.update(cx, |project, cx| {
-//         project.start_debug_session(
-//             dap::test_config(dap::DebugRequestType::Launch, None, None),
-//             cx,
-//         )
-//     });
-
-//     let session = task.await.unwrap();
-//     let client = session.update(cx, |session, _| session.adapter_client().unwrap());
-
-//     client
-//         .on_request::<StackTrace, _>(move |_, _| {
-//             Ok(dap::StackTraceResponse {
-//                 stack_frames: Vec::default(),
-//                 total_frames: None,
-//             })
-//         })
-//         .await;
-
-//     client
-//         .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-//             reason: dap::StoppedEventReason::Pause,
-//             description: None,
-//             thread_id: Some(1),
-//             preserve_focus_hint: None,
-//             text: None,
-//             all_threads_stopped: None,
-//             hit_breakpoint_ids: None,
-//         }))
-//         .await;
-
-//     client
-//         .fake_event(dap::messages::Events::Output(dap::OutputEvent {
-//             category: None,
-//             output: "First line".to_string(),
-//             data: None,
-//             variables_reference: None,
-//             source: None,
-//             line: None,
-//             column: None,
-//             group: None,
-//             location_reference: None,
-//         }))
-//         .await;
-
-//     client
-//         .fake_event(dap::messages::Events::Output(dap::OutputEvent {
-//             category: Some(dap::OutputEventCategory::Stdout),
-//             output: "First group".to_string(),
-//             data: None,
-//             variables_reference: None,
-//             source: None,
-//             line: None,
-//             column: None,
-//             group: Some(dap::OutputEventGroup::Start),
-//             location_reference: None,
-//         }))
-//         .await;
-
-//     client
-//         .fake_event(dap::messages::Events::Output(dap::OutputEvent {
-//             category: Some(dap::OutputEventCategory::Stdout),
-//             output: "First item in group 1".to_string(),
-//             data: None,
-//             variables_reference: None,
-//             source: None,
-//             line: None,
-//             column: None,
-//             group: None,
-//             location_reference: None,
-//         }))
-//         .await;
-
-//     client
-//         .fake_event(dap::messages::Events::Output(dap::OutputEvent {
-//             category: Some(dap::OutputEventCategory::Stdout),
-//             output: "Second item in group 1".to_string(),
-//             data: None,
-//             variables_reference: None,
-//             source: None,
-//             line: None,
-//             column: None,
-//             group: None,
-//             location_reference: None,
-//         }))
-//         .await;
-
-//     client
-//         .fake_event(dap::messages::Events::Output(dap::OutputEvent {
-//             category: Some(dap::OutputEventCategory::Stdout),
-//             output: "Second group".to_string(),
-//             data: None,
-//             variables_reference: None,
-//             source: None,
-//             line: None,
-//             column: None,
-//             group: Some(dap::OutputEventGroup::Start),
-//             location_reference: None,
-//         }))
-//         .await;
-
-//     client
-//         .fake_event(dap::messages::Events::Output(dap::OutputEvent {
-//             category: Some(dap::OutputEventCategory::Stdout),
-//             output: "First item in group 2".to_string(),
-//             data: None,
-//             variables_reference: None,
-//             source: None,
-//             line: None,
-//             column: None,
-//             group: None,
-//             location_reference: None,
-//         }))
-//         .await;
-
-//     client
-//         .fake_event(dap::messages::Events::Output(dap::OutputEvent {
-//             category: Some(dap::OutputEventCategory::Stdout),
-//             output: "Second item in group 2".to_string(),
-//             data: None,
-//             variables_reference: None,
-//             source: None,
-//             line: None,
-//             column: None,
-//             group: None,
-//             location_reference: None,
-//         }))
-//         .await;
-
-//     client
-//         .fake_event(dap::messages::Events::Output(dap::OutputEvent {
-//             category: Some(dap::OutputEventCategory::Stdout),
-//             output: "End group 2".to_string(),
-//             data: None,
-//             variables_reference: None,
-//             source: None,
-//             line: None,
-//             column: None,
-//             group: Some(dap::OutputEventGroup::End),
-//             location_reference: None,
-//         }))
-//         .await;
-
-//     client
-//         .fake_event(dap::messages::Events::Output(dap::OutputEvent {
-//             category: Some(dap::OutputEventCategory::Stdout),
-//             output: "Third group".to_string(),
-//             data: None,
-//             variables_reference: None,
-//             source: None,
-//             line: None,
-//             column: None,
-//             group: Some(dap::OutputEventGroup::StartCollapsed),
-//             location_reference: None,
-//         }))
-//         .await;
-
-//     client
-//         .fake_event(dap::messages::Events::Output(dap::OutputEvent {
-//             category: Some(dap::OutputEventCategory::Stdout),
-//             output: "First item in group 3".to_string(),
-//             data: None,
-//             variables_reference: None,
-//             source: None,
-//             line: None,
-//             column: None,
-//             group: None,
-//             location_reference: None,
-//         }))
-//         .await;
-
-//     client
-//         .fake_event(dap::messages::Events::Output(dap::OutputEvent {
-//             category: Some(dap::OutputEventCategory::Stdout),
-//             output: "Second item in group 3".to_string(),
-//             data: None,
-//             variables_reference: None,
-//             source: None,
-//             line: None,
-//             column: None,
-//             group: None,
-//             location_reference: None,
-//         }))
-//         .await;
-
-//     client
-//         .fake_event(dap::messages::Events::Output(dap::OutputEvent {
-//             category: Some(dap::OutputEventCategory::Stdout),
-//             output: "End group 3".to_string(),
-//             data: None,
-//             variables_reference: None,
-//             source: None,
-//             line: None,
-//             column: None,
-//             group: Some(dap::OutputEventGroup::End),
-//             location_reference: None,
-//         }))
-//         .await;
-
-//     client
-//         .fake_event(dap::messages::Events::Output(dap::OutputEvent {
-//             category: Some(dap::OutputEventCategory::Stdout),
-//             output: "Third item in group 1".to_string(),
-//             data: None,
-//             variables_reference: None,
-//             source: None,
-//             line: None,
-//             column: None,
-//             group: None,
-//             location_reference: None,
-//         }))
-//         .await;
-
-//     client
-//         .fake_event(dap::messages::Events::Output(dap::OutputEvent {
-//             category: Some(dap::OutputEventCategory::Stdout),
-//             output: "Second item".to_string(),
-//             data: None,
-//             variables_reference: None,
-//             source: None,
-//             line: None,
-//             column: None,
-//             group: Some(dap::OutputEventGroup::End),
-//             location_reference: None,
-//         }))
-//         .await;
-
-//     cx.run_until_parked();
-
-//     active_debug_session_panel(workspace, cx).update(cx, |debug_panel_item, cx| {
-//         debug_panel_item
-//             .mode()
-//             .as_running()
-//             .unwrap()
-//             .update(cx, |running_state, cx| {
-//                 running_state.console().update(cx, |console, cx| {
-//                     console.editor().update(cx, |editor, cx| {
-//                         pretty_assertions::assert_eq!(
-//                             "
-//                         First line
-//                         First group
-//                             First item in group 1
-//                             Second item in group 1
-//                             Second group
-//                                 First item in group 2
-//                                 Second item in group 2
-//                             End group 2
-//                         ⋯    End group 3
-//                             Third item in group 1
-//                         Second item
-//                     "
-//                             .unindent(),
-//                             editor.display_text(cx)
-//                         );
-//                     })
-//                 });
-//             });
-//     });
-
-//     let shutdown_session = project.update(cx, |project, cx| {
-//         project.dap_store().update(cx, |dap_store, cx| {
-//             dap_store.shutdown_session(session.read(cx).session_id(), cx)
-//         })
-//     });
-
-//     shutdown_session.await.unwrap();
-// }
-
-// todo(debugger): enable this again
-// #[gpui::test]
-// async fn test_evaluate_expression(executor: BackgroundExecutor, cx: &mut TestAppContext) {
-//     init_test(cx);
-
-//     const NEW_VALUE: &str = "{nested1: \"Nested 1 updated\", nested2: \"Nested 2 updated\"}";
-
-//     let called_evaluate = Arc::new(AtomicBool::new(false));
-
-//     let fs = FakeFs::new(executor.clone());
-
-//     let test_file_content = r#"
-//         const variable1 = {
-//             nested1: "Nested 1",
-//             nested2: "Nested 2",
-//         };
-//         const variable2 = "Value 2";
-//         const variable3 = "Value 3";
-//     "#
-//     .unindent();
-
-//     fs.insert_tree(
-//         "/project",
-//         json!({
-//            "src": {
-//                "test.js": test_file_content,
-//            }
-//         }),
-//     )
-//     .await;
-
-//     let project = Project::test(fs, ["/project".as_ref()], cx).await;
-//     let workspace = init_test_workspace(&project, cx).await;
-//     let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-//     let task = project.update(cx, |project, cx| {
-//         project.start_debug_session(dap::test_config(None), cx)
-//     });
-
-//     let session = task.await.unwrap();
-//     let client = session.update(cx, |session, _| session.adapter_client().unwrap());
-
-//     client
-//         .on_request::<Threads, _>(move |_, _| {
-//             Ok(dap::ThreadsResponse {
-//                 threads: vec![dap::Thread {
-//                     id: 1,
-//                     name: "Thread 1".into(),
-//                 }],
-//             })
-//         })
-//         .await;
-
-//     let stack_frames = vec![StackFrame {
-//         id: 1,
-//         name: "Stack Frame 1".into(),
-//         source: Some(dap::Source {
-//             name: Some("test.js".into()),
-//             path: Some("/project/src/test.js".into()),
-//             source_reference: None,
-//             presentation_hint: None,
-//             origin: None,
-//             sources: None,
-//             adapter_data: None,
-//             checksums: None,
-//         }),
-//         line: 3,
-//         column: 1,
-//         end_line: None,
-//         end_column: None,
-//         can_restart: None,
-//         instruction_pointer_reference: None,
-//         module_id: None,
-//         presentation_hint: None,
-//     }];
-
-//     client
-//         .on_request::<StackTrace, _>({
-//             let stack_frames = Arc::new(stack_frames.clone());
-//             move |_, args| {
-//                 assert_eq!(1, args.thread_id);
-
-//                 Ok(dap::StackTraceResponse {
-//                     stack_frames: (*stack_frames).clone(),
-//                     total_frames: None,
-//                 })
-//             }
-//         })
-//         .await;
-
-//     let scopes = vec![
-//         Scope {
-//             name: "Scope 1".into(),
-//             presentation_hint: None,
-//             variables_reference: 2,
-//             named_variables: None,
-//             indexed_variables: None,
-//             expensive: false,
-//             source: None,
-//             line: None,
-//             column: None,
-//             end_line: None,
-//             end_column: None,
-//         },
-//         Scope {
-//             name: "Scope 2".into(),
-//             presentation_hint: None,
-//             variables_reference: 4,
-//             named_variables: None,
-//             indexed_variables: None,
-//             expensive: false,
-//             source: None,
-//             line: None,
-//             column: None,
-//             end_line: None,
-//             end_column: None,
-//         },
-//     ];
-
-//     client
-//         .on_request::<Scopes, _>({
-//             let scopes = Arc::new(scopes.clone());
-//             move |_, args| {
-//                 assert_eq!(1, args.frame_id);
-
-//                 Ok(dap::ScopesResponse {
-//                     scopes: (*scopes).clone(),
-//                 })
-//             }
-//         })
-//         .await;
-
-//     let scope1_variables = Arc::new(Mutex::new(vec![
-//         Variable {
-//             name: "variable1".into(),
-//             value: "{nested1: \"Nested 1\", nested2: \"Nested 2\"}".into(),
-//             type_: None,
-//             presentation_hint: None,
-//             evaluate_name: None,
-//             variables_reference: 3,
-//             named_variables: None,
-//             indexed_variables: None,
-//             memory_reference: None,
-//             declaration_location_reference: None,
-//             value_location_reference: None,
-//         },
-//         Variable {
-//             name: "variable2".into(),
-//             value: "Value 2".into(),
-//             type_: None,
-//             presentation_hint: None,
-//             evaluate_name: None,
-//             variables_reference: 0,
-//             named_variables: None,
-//             indexed_variables: None,
-//             memory_reference: None,
-//             declaration_location_reference: None,
-//             value_location_reference: None,
-//         },
-//     ]));
-
-//     let nested_variables = vec![
-//         Variable {
-//             name: "nested1".into(),
-//             value: "Nested 1".into(),
-//             type_: None,
-//             presentation_hint: None,
-//             evaluate_name: None,
-//             variables_reference: 0,
-//             named_variables: None,
-//             indexed_variables: None,
-//             memory_reference: None,
-//             declaration_location_reference: None,
-//             value_location_reference: None,
-//         },
-//         Variable {
-//             name: "nested2".into(),
-//             value: "Nested 2".into(),
-//             type_: None,
-//             presentation_hint: None,
-//             evaluate_name: None,
-//             variables_reference: 0,
-//             named_variables: None,
-//             indexed_variables: None,
-//             memory_reference: None,
-//             declaration_location_reference: None,
-//             value_location_reference: None,
-//         },
-//     ];
-
-//     let scope2_variables = vec![Variable {
-//         name: "variable3".into(),
-//         value: "Value 3".into(),
-//         type_: None,
-//         presentation_hint: None,
-//         evaluate_name: None,
-//         variables_reference: 0,
-//         named_variables: None,
-//         indexed_variables: None,
-//         memory_reference: None,
-//         declaration_location_reference: None,
-//         value_location_reference: None,
-//     }];
-
-//     client
-//         .on_request::<Variables, _>({
-//             let scope1_variables = scope1_variables.clone();
-//             let nested_variables = Arc::new(nested_variables.clone());
-//             let scope2_variables = Arc::new(scope2_variables.clone());
-//             move |_, args| match args.variables_reference {
-//                 4 => Ok(dap::VariablesResponse {
-//                     variables: (*scope2_variables).clone(),
-//                 }),
-//                 3 => Ok(dap::VariablesResponse {
-//                     variables: (*nested_variables).clone(),
-//                 }),
-//                 2 => Ok(dap::VariablesResponse {
-//                     variables: scope1_variables.lock().unwrap().clone(),
-//                 }),
-//                 id => unreachable!("unexpected variables reference {id}"),
-//             }
-//         })
-//         .await;
-
-//     client
-//         .on_request::<Evaluate, _>({
-//             let called_evaluate = called_evaluate.clone();
-//             let scope1_variables = scope1_variables.clone();
-//             move |_, args| {
-//                 called_evaluate.store(true, Ordering::SeqCst);
-
-//                 assert_eq!(format!("$variable1 = {}", NEW_VALUE), args.expression);
-//                 assert_eq!(Some(1), args.frame_id);
-//                 assert_eq!(Some(dap::EvaluateArgumentsContext::Variables), args.context);
-
-//                 scope1_variables.lock().unwrap()[0].value = NEW_VALUE.to_string();
-
-//                 Ok(dap::EvaluateResponse {
-//                     result: NEW_VALUE.into(),
-//                     type_: None,
-//                     presentation_hint: None,
-//                     variables_reference: 0,
-//                     named_variables: None,
-//                     indexed_variables: None,
-//                     memory_reference: None,
-//                     value_location_reference: None,
-//                 })
-//             }
-//         })
-//         .await;
-
-//     client
-//         .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-//             reason: dap::StoppedEventReason::Pause,
-//             description: None,
-//             thread_id: Some(1),
-//             preserve_focus_hint: None,
-//             text: None,
-//             all_threads_stopped: None,
-//             hit_breakpoint_ids: None,
-//         }))
-//         .await;
-
-//     cx.run_until_parked();
-
-//     // toggle nested variables for scope 1
-//     active_debug_session_panel(workspace, cx).update(cx, |debug_panel_item, cx| {
-//         debug_panel_item
-//             .mode()
-//             .as_running()
-//             .unwrap()
-//             .update(cx, |running_state, cx| {
-//                 running_state
-//                     .variable_list()
-//                     .update(cx, |variable_list, cx| {
-//                         variable_list.toggle_variable(
-//                             &VariablePath {
-//                                 indices: Arc::from([scopes[0].variables_reference]),
-//                             },
-//                             cx,
-//                         );
-//                     });
-//             });
-//     });
-
-//     cx.run_until_parked();
-
-//     active_debug_session_panel(workspace, cx).update_in(cx, |debug_panel_item, window, cx| {
-//         debug_panel_item
-//             .mode()
-//             .as_running()
-//             .unwrap()
-//             .update(cx, |running_state, cx| {
-//                 running_state.console().update(cx, |console, item_cx| {
-//                     console
-//                         .query_bar()
-//                         .update(item_cx, |query_bar, console_cx| {
-//                             query_bar.set_text(
-//                                 format!("$variable1 = {}", NEW_VALUE),
-//                                 window,
-//                                 console_cx,
-//                             );
-//                         });
-
-//                     console.evaluate(&menu::Confirm, window, item_cx);
-//                 });
-//             });
-//     });
-
-//     cx.run_until_parked();
-
-//     active_debug_session_panel(workspace, cx).update(cx, |debug_panel_item, cx| {
-//         assert_eq!(
-//             "",
-//             debug_panel_item
-//                 .mode()
-//                 .as_running()
-//                 .unwrap()
-//                 .read(cx)
-//                 .console()
-//                 .read(cx)
-//                 .query_bar()
-//                 .read(cx)
-//                 .text(cx)
-//                 .as_str()
-//         );
-
-//         assert_eq!(
-//             format!("{}\n", NEW_VALUE),
-//             debug_panel_item
-//                 .mode()
-//                 .as_running()
-//                 .unwrap()
-//                 .read(cx)
-//                 .console()
-//                 .read(cx)
-//                 .editor()
-//                 .read(cx)
-//                 .text(cx)
-//                 .as_str()
-//         );
-
-//         debug_panel_item
-//             .mode()
-//             .as_running()
-//             .unwrap()
-//             .update(cx, |running_state, cx| {
-//                 running_state
-//                     .variable_list()
-//                     .update(cx, |variable_list, _| {
-//                         let scope1_variables = scope1_variables.lock().unwrap().clone();
-
-//                         // scope 1
-//                         // assert_eq!(
-//                         //     vec![
-//                         //         VariableContainer {
-//                         //             container_reference: scopes[0].variables_reference,
-//                         //             variable: scope1_variables[0].clone(),
-//                         //             depth: 1,
-//                         //         },
-//                         //         VariableContainer {
-//                         //             container_reference: scope1_variables[0].variables_reference,
-//                         //             variable: nested_variables[0].clone(),
-//                         //             depth: 2,
-//                         //         },
-//                         //         VariableContainer {
-//                         //             container_reference: scope1_variables[0].variables_reference,
-//                         //             variable: nested_variables[1].clone(),
-//                         //             depth: 2,
-//                         //         },
-//                         //         VariableContainer {
-//                         //             container_reference: scopes[0].variables_reference,
-//                         //             variable: scope1_variables[1].clone(),
-//                         //             depth: 1,
-//                         //         },
-//                         //     ],
-//                         //     variable_list.variables_by_scope(1, 2).unwrap().variables()
-//                         // );
-
-//                         // scope 2
-//                         // assert_eq!(
-//                         //     vec![VariableContainer {
-//                         //         container_reference: scopes[1].variables_reference,
-//                         //         variable: scope2_variables[0].clone(),
-//                         //         depth: 1,
-//                         //     }],
-//                         //     variable_list.variables_by_scope(1, 4).unwrap().variables()
-//                         // );
-
-//                         variable_list.assert_visual_entries(vec![
-//                             "v Scope 1",
-//                             "    v variable1",
-//                             "       > nested1",
-//                             "       > nested2",
-//                             "    > variable2",
-//                         ]);
-
-//                         // assert visual entries
-//                         // assert_eq!(
-//                         //     vec![
-//                         //         VariableListEntry::Scope(scopes[0].clone()),
-//                         //         VariableListEntry::Variable {
-//                         //             depth: 1,
-//                         //             scope: Arc::new(scopes[0].clone()),
-//                         //             has_children: true,
-//                         //             variable: Arc::new(scope1_variables[0].clone()),
-//                         //             container_reference: scopes[0].variables_reference,
-//                         //         },
-//                         //         VariableListEntry::Variable {
-//                         //             depth: 2,
-//                         //             scope: Arc::new(scopes[0].clone()),
-//                         //             has_children: false,
-//                         //             variable: Arc::new(nested_variables[0].clone()),
-//                         //             container_reference: scope1_variables[0].variables_reference,
-//                         //         },
-//                         //         VariableListEntry::Variable {
-//                         //             depth: 2,
-//                         //             scope: Arc::new(scopes[0].clone()),
-//                         //             has_children: false,
-//                         //             variable: Arc::new(nested_variables[1].clone()),
-//                         //             container_reference: scope1_variables[0].variables_reference,
-//                         //         },
-//                         //         VariableListEntry::Variable {
-//                         //             depth: 1,
-//                         //             scope: Arc::new(scopes[0].clone()),
-//                         //             has_children: false,
-//                         //             variable: Arc::new(scope1_variables[1].clone()),
-//                         //             container_reference: scopes[0].variables_reference,
-//                         //         },
-//                         //         VariableListEntry::Scope(scopes[1].clone()),
-//                         //     ],
-//                         //     variable_list.entries().get(&1).unwrap().clone()
-//                         // );
-//                     });
-//             });
-//     });
-
-//     assert!(
-//         called_evaluate.load(std::sync::atomic::Ordering::SeqCst),
-//         "Expected evaluate request to be called"
-//     );
-
-//     let shutdown_session = project.update(cx, |project, cx| {
-//         project.dap_store().update(cx, |dap_store, cx| {
-//             dap_store.shutdown_session(&session.read(cx).session_id(), cx)
-//         })
-//     });
-
-//     shutdown_session.await.unwrap();
-// }
diff --git a/crates/debugger_ui/src/tests/dap_logger.rs b/crates/debugger_ui/src/tests/dap_logger.rs
deleted file mode 100644
index ff2b0f695f..0000000000
--- a/crates/debugger_ui/src/tests/dap_logger.rs
+++ /dev/null
@@ -1,117 +0,0 @@
-use crate::tests::{init_test, init_test_workspace, start_debug_session};
-use dap::requests::{StackTrace, Threads};
-use debugger_tools::LogStore;
-use gpui::{BackgroundExecutor, TestAppContext, VisualTestContext};
-use project::Project;
-use serde_json::json;
-use std::cell::OnceCell;
-use util::path;
-
-#[gpui::test]
-async fn test_dap_logger_captures_all_session_rpc_messages(
-    executor: BackgroundExecutor,
-    cx: &mut TestAppContext,
-) {
-    let log_store_cell = std::rc::Rc::new(OnceCell::new());
-
-    cx.update(|cx| {
-        let log_store_cell = log_store_cell.clone();
-        cx.observe_new::<LogStore>(move |_, _, cx| {
-            log_store_cell.set(cx.entity()).unwrap();
-        })
-        .detach();
-        debugger_tools::init(cx);
-    });
-    init_test(cx);
-
-    let log_store = log_store_cell.get().unwrap().clone();
-
-    // Create a filesystem with a simple project
-    let fs = project::FakeFs::new(executor.clone());
-    fs.insert_tree(
-        path!("/project"),
-        json!({
-            "main.rs": "fn main() {\n    println!(\"Hello, world!\");\n}"
-        }),
-    )
-    .await;
-
-    assert!(
-        log_store.read_with(cx, |log_store, _| !log_store.has_projects()),
-        "log_store shouldn't contain any projects before any projects were created"
-    );
-
-    let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
-
-    let workspace = init_test_workspace(&project, cx).await;
-    assert!(
-        log_store.read_with(cx, |log_store, _| log_store.has_projects()),
-        "log_store shouldn't contain any projects before any projects were created"
-    );
-    assert!(
-        log_store.read_with(cx, |log_store, _| log_store
-            .contained_session_ids(&project.downgrade())
-            .is_empty()),
-        "log_store shouldn't contain any projects before any projects were created"
-    );
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-    // Start a debug session
-    let session = start_debug_session(&workspace, cx, |_| {}).unwrap();
-    let session_id = session.read_with(cx, |session, _| session.session_id());
-    let client = session.update(cx, |session, _| session.adapter_client().unwrap());
-
-    assert_eq!(
-        log_store.read_with(cx, |log_store, _| log_store
-            .contained_session_ids(&project.downgrade())
-            .len()),
-        1,
-    );
-
-    assert!(
-        log_store.read_with(cx, |log_store, _| log_store
-            .contained_session_ids(&project.downgrade())
-            .contains(&session_id)),
-        "log_store should contain the session IDs of the started session"
-    );
-
-    assert!(
-        !log_store.read_with(cx, |log_store, _| log_store
-            .rpc_messages_for_session_id(&project.downgrade(), session_id)
-            .is_empty()),
-        "We should have the initialization sequence in the log store"
-    );
-
-    // Set up basic responses for common requests
-    client.on_request::<Threads, _>(move |_, _| {
-        Ok(dap::ThreadsResponse {
-            threads: vec![dap::Thread {
-                id: 1,
-                name: "Thread 1".into(),
-            }],
-        })
-    });
-
-    client.on_request::<StackTrace, _>(move |_, _| {
-        Ok(dap::StackTraceResponse {
-            stack_frames: Vec::default(),
-            total_frames: None,
-        })
-    });
-
-    // Run until all pending tasks are executed
-    cx.run_until_parked();
-
-    // Simulate a stopped event to generate more DAP messages
-    client
-        .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-            reason: dap::StoppedEventReason::Pause,
-            description: None,
-            thread_id: Some(1),
-            preserve_focus_hint: None,
-            text: None,
-            all_threads_stopped: None,
-            hit_breakpoint_ids: None,
-        }))
-        .await;
-}
diff --git a/crates/debugger_ui/src/tests/debugger_panel.rs b/crates/debugger_ui/src/tests/debugger_panel.rs
deleted file mode 100644
index c0f8c0a065..0000000000
--- a/crates/debugger_ui/src/tests/debugger_panel.rs
+++ /dev/null
@@ -1,1946 +0,0 @@
-use crate::{
-    persistence::DebuggerPaneItem,
-    tests::{start_debug_session, start_debug_session_with},
-    *,
-};
-use dap::{
-    ErrorResponse, Message, RunInTerminalRequestArguments, SourceBreakpoint,
-    StartDebuggingRequestArguments, StartDebuggingRequestArgumentsRequest,
-    adapters::DebugTaskDefinition,
-    client::SessionId,
-    requests::{
-        Continue, Disconnect, Launch, Next, RunInTerminal, SetBreakpoints, StackTrace,
-        StartDebugging, StepBack, StepIn, StepOut, Threads,
-    },
-};
-use editor::{
-    ActiveDebugLine, Editor, EditorMode, MultiBuffer,
-    actions::{self},
-};
-use gpui::{BackgroundExecutor, TestAppContext, VisualTestContext};
-use project::{
-    FakeFs, Project,
-    debugger::session::{ThreadId, ThreadStatus},
-};
-use serde_json::json;
-use std::{
-    path::Path,
-    sync::{
-        Arc,
-        atomic::{AtomicBool, Ordering},
-    },
-};
-use terminal_view::terminal_panel::TerminalPanel;
-use tests::{active_debug_session_panel, init_test, init_test_workspace};
-use util::{path, rel_path::rel_path};
-use workspace::item::SaveOptions;
-use workspace::{Item, dock::Panel};
-
-#[gpui::test]
-async fn test_basic_show_debug_panel(executor: BackgroundExecutor, cx: &mut TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(executor.clone());
-
-    fs.insert_tree(
-        path!("/project"),
-        json!({
-            "main.rs": "First line\nSecond line\nThird line\nFourth line",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
-    let workspace = init_test_workspace(&project, cx).await;
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-    let session = start_debug_session(&workspace, cx, |_| {}).unwrap();
-    let client = session.update(cx, |session, _| session.adapter_client().unwrap());
-
-    client.on_request::<Threads, _>(move |_, _| {
-        Ok(dap::ThreadsResponse {
-            threads: vec![dap::Thread {
-                id: 1,
-                name: "Thread 1".into(),
-            }],
-        })
-    });
-
-    client.on_request::<StackTrace, _>(move |_, _| {
-        Ok(dap::StackTraceResponse {
-            stack_frames: Vec::default(),
-            total_frames: None,
-        })
-    });
-
-    cx.run_until_parked();
-
-    // assert we have a debug panel item before the session has stopped
-    workspace
-        .update(cx, |workspace, _window, cx| {
-            let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap();
-            let active_session =
-                debug_panel.update(cx, |debug_panel, _| debug_panel.active_session().unwrap());
-
-            let running_state = active_session.update(cx, |active_session, _| {
-                active_session.running_state().clone()
-            });
-
-            debug_panel.update(cx, |this, cx| {
-                assert!(this.active_session().is_some());
-                assert!(running_state.read(cx).selected_thread_id().is_none());
-            });
-        })
-        .unwrap();
-
-    client
-        .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-            reason: dap::StoppedEventReason::Pause,
-            description: None,
-            thread_id: Some(1),
-            preserve_focus_hint: None,
-            text: None,
-            all_threads_stopped: None,
-            hit_breakpoint_ids: None,
-        }))
-        .await;
-
-    cx.run_until_parked();
-
-    workspace
-        .update(cx, |workspace, _window, cx| {
-            let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap();
-            let active_session = debug_panel
-                .update(cx, |this, _| this.active_session())
-                .unwrap();
-
-            let running_state = active_session.update(cx, |active_session, _| {
-                active_session.running_state().clone()
-            });
-
-            assert_eq!(client.id(), running_state.read(cx).session_id());
-            assert_eq!(
-                ThreadId(1),
-                running_state.read(cx).selected_thread_id().unwrap()
-            );
-        })
-        .unwrap();
-
-    let shutdown_session = project.update(cx, |project, cx| {
-        project.dap_store().update(cx, |dap_store, cx| {
-            dap_store.shutdown_session(session.read(cx).session_id(), cx)
-        })
-    });
-
-    shutdown_session.await.unwrap();
-
-    // assert we still have a debug panel item after the client shutdown
-    workspace
-        .update(cx, |workspace, _window, cx| {
-            let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap();
-
-            let active_session = debug_panel
-                .update(cx, |this, _| this.active_session())
-                .unwrap();
-
-            let running_state = active_session.update(cx, |active_session, _| {
-                active_session.running_state().clone()
-            });
-
-            debug_panel.update(cx, |this, cx| {
-                assert!(this.active_session().is_some());
-                assert_eq!(
-                    ThreadId(1),
-                    running_state.read(cx).selected_thread_id().unwrap()
-                );
-            });
-        })
-        .unwrap();
-}
-
-#[gpui::test]
-async fn test_we_can_only_have_one_panel_per_debug_session(
-    executor: BackgroundExecutor,
-    cx: &mut TestAppContext,
-) {
-    init_test(cx);
-
-    let fs = FakeFs::new(executor.clone());
-
-    fs.insert_tree(
-        path!("/project"),
-        json!({
-            "main.rs": "First line\nSecond line\nThird line\nFourth line",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
-    let workspace = init_test_workspace(&project, cx).await;
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-    let session = start_debug_session(&workspace, cx, |_| {}).unwrap();
-    let client = session.update(cx, |session, _| session.adapter_client().unwrap());
-
-    client.on_request::<Threads, _>(move |_, _| {
-        Ok(dap::ThreadsResponse {
-            threads: vec![dap::Thread {
-                id: 1,
-                name: "Thread 1".into(),
-            }],
-        })
-    });
-
-    client.on_request::<StackTrace, _>(move |_, _| {
-        Ok(dap::StackTraceResponse {
-            stack_frames: Vec::default(),
-            total_frames: None,
-        })
-    });
-
-    cx.run_until_parked();
-
-    // assert we have a debug panel item before the session has stopped
-    workspace
-        .update(cx, |workspace, _window, cx| {
-            let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap();
-
-            debug_panel.update(cx, |this, _| {
-                assert!(this.active_session().is_some());
-            });
-        })
-        .unwrap();
-
-    client
-        .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-            reason: dap::StoppedEventReason::Pause,
-            description: None,
-            thread_id: Some(1),
-            preserve_focus_hint: None,
-            text: None,
-            all_threads_stopped: None,
-            hit_breakpoint_ids: None,
-        }))
-        .await;
-
-    cx.run_until_parked();
-
-    // assert we added a debug panel item
-    workspace
-        .update(cx, |workspace, _window, cx| {
-            let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap();
-            let active_session = debug_panel
-                .update(cx, |this, _| this.active_session())
-                .unwrap();
-
-            let running_state = active_session.update(cx, |active_session, _| {
-                active_session.running_state().clone()
-            });
-
-            assert_eq!(client.id(), active_session.read(cx).session_id(cx));
-            assert_eq!(
-                ThreadId(1),
-                running_state.read(cx).selected_thread_id().unwrap()
-            );
-        })
-        .unwrap();
-
-    client
-        .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-            reason: dap::StoppedEventReason::Pause,
-            description: None,
-            thread_id: Some(2),
-            preserve_focus_hint: None,
-            text: None,
-            all_threads_stopped: None,
-            hit_breakpoint_ids: None,
-        }))
-        .await;
-
-    cx.run_until_parked();
-
-    workspace
-        .update(cx, |workspace, _window, cx| {
-            let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap();
-            let active_session = debug_panel
-                .update(cx, |this, _| this.active_session())
-                .unwrap();
-
-            let running_state = active_session.update(cx, |active_session, _| {
-                active_session.running_state().clone()
-            });
-
-            assert_eq!(client.id(), active_session.read(cx).session_id(cx));
-            assert_eq!(
-                ThreadId(1),
-                running_state.read(cx).selected_thread_id().unwrap()
-            );
-        })
-        .unwrap();
-
-    let shutdown_session = project.update(cx, |project, cx| {
-        project.dap_store().update(cx, |dap_store, cx| {
-            dap_store.shutdown_session(session.read(cx).session_id(), cx)
-        })
-    });
-
-    shutdown_session.await.unwrap();
-
-    // assert we still have a debug panel item after the client shutdown
-    workspace
-        .update(cx, |workspace, _window, cx| {
-            let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap();
-            let active_session = debug_panel
-                .update(cx, |this, _| this.active_session())
-                .unwrap();
-
-            let running_state = active_session.update(cx, |active_session, _| {
-                active_session.running_state().clone()
-            });
-
-            debug_panel.update(cx, |this, cx| {
-                assert!(this.active_session().is_some());
-                assert_eq!(
-                    ThreadId(1),
-                    running_state.read(cx).selected_thread_id().unwrap()
-                );
-            });
-        })
-        .unwrap();
-}
-
-#[gpui::test]
-async fn test_handle_successful_run_in_terminal_reverse_request(
-    executor: BackgroundExecutor,
-    cx: &mut TestAppContext,
-) {
-    init_test(cx);
-
-    let send_response = Arc::new(AtomicBool::new(false));
-
-    let fs = FakeFs::new(executor.clone());
-
-    fs.insert_tree(
-        path!("/project"),
-        json!({
-            "main.rs": "First line\nSecond line\nThird line\nFourth line",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
-    let workspace = init_test_workspace(&project, cx).await;
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-    let session = start_debug_session(&workspace, cx, |_| {}).unwrap();
-    let client = session.update(cx, |session, _| session.adapter_client().unwrap());
-
-    client
-        .on_response::<RunInTerminal, _>({
-            let send_response = send_response.clone();
-            move |response| {
-                send_response.store(true, Ordering::SeqCst);
-
-                assert!(response.success);
-                assert!(response.body.is_some());
-            }
-        })
-        .await;
-
-    client
-        .fake_reverse_request::<RunInTerminal>(RunInTerminalRequestArguments {
-            kind: None,
-            title: None,
-            cwd: std::env::temp_dir().to_string_lossy().into_owned(),
-            args: vec![],
-            env: None,
-            args_can_be_interpreted_by_shell: None,
-        })
-        .await;
-
-    cx.run_until_parked();
-
-    assert!(
-        send_response.load(std::sync::atomic::Ordering::SeqCst),
-        "Expected to receive response from reverse request"
-    );
-
-    workspace
-        .update(cx, |workspace, _window, cx| {
-            let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap();
-            let session = debug_panel.read(cx).active_session().unwrap();
-            let running = session.read(cx).running_state();
-            assert_eq!(
-                running
-                    .read(cx)
-                    .pane_items_status(cx)
-                    .get(&DebuggerPaneItem::Terminal),
-                Some(&true)
-            );
-            assert!(running.read(cx).debug_terminal.read(cx).terminal.is_some());
-        })
-        .unwrap();
-}
-
-#[gpui::test]
-async fn test_handle_start_debugging_request(
-    executor: BackgroundExecutor,
-    cx: &mut TestAppContext,
-) {
-    init_test(cx);
-
-    let fs = FakeFs::new(executor.clone());
-
-    fs.insert_tree(
-        path!("/project"),
-        json!({
-            "main.rs": "First line\nSecond line\nThird line\nFourth line",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
-    let workspace = init_test_workspace(&project, cx).await;
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-    let session = start_debug_session(&workspace, cx, |_| {}).unwrap();
-    let client = session.update(cx, |session, _| session.adapter_client().unwrap());
-
-    let fake_config = json!({"one": "two"});
-    let launched_with = Arc::new(parking_lot::Mutex::new(None));
-
-    let _subscription = project::debugger::test::intercept_debug_sessions(cx, {
-        let launched_with = launched_with.clone();
-        move |client| {
-            let launched_with = launched_with.clone();
-            client.on_request::<dap::requests::Launch, _>(move |_, args| {
-                launched_with.lock().replace(args.raw);
-                Ok(())
-            });
-            client.on_request::<dap::requests::Attach, _>(move |_, _| {
-                assert!(false, "should not get attach request");
-                Ok(())
-            });
-        }
-    });
-
-    let sessions = workspace
-        .update(cx, |workspace, _window, cx| {
-            let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap();
-            debug_panel.read(cx).sessions().collect::<Vec<_>>()
-        })
-        .unwrap();
-    assert_eq!(sessions.len(), 1);
-    client
-        .fake_reverse_request::<StartDebugging>(StartDebuggingRequestArguments {
-            request: StartDebuggingRequestArgumentsRequest::Launch,
-            configuration: fake_config.clone(),
-        })
-        .await;
-
-    cx.run_until_parked();
-
-    workspace
-        .update(cx, |workspace, _window, cx| {
-            let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap();
-
-            // Active session changes on spawn, as the parent has never stopped.
-            let active_session = debug_panel
-                .read(cx)
-                .active_session()
-                .unwrap()
-                .read(cx)
-                .session(cx);
-            let current_sessions = debug_panel.read(cx).sessions().collect::<Vec<_>>();
-            assert_eq!(active_session, current_sessions[1].read(cx).session(cx));
-            assert_eq!(
-                active_session.read(cx).parent_session(),
-                Some(&current_sessions[0].read(cx).session(cx))
-            );
-
-            assert_eq!(current_sessions.len(), 2);
-            assert_eq!(current_sessions[0], sessions[0]);
-
-            let parent_session = current_sessions[1]
-                .read(cx)
-                .session(cx)
-                .read(cx)
-                .parent_session()
-                .unwrap();
-            assert_eq!(parent_session, &sessions[0].read(cx).session(cx));
-
-            // We should preserve the original binary (params to spawn process etc.) except for launch params
-            // (as they come from reverse spawn request).
-            let mut original_binary = parent_session.read(cx).binary().cloned().unwrap();
-            original_binary.request_args = StartDebuggingRequestArguments {
-                request: StartDebuggingRequestArgumentsRequest::Launch,
-                configuration: fake_config.clone(),
-            };
-
-            assert_eq!(
-                current_sessions[1]
-                    .read(cx)
-                    .session(cx)
-                    .read(cx)
-                    .binary()
-                    .unwrap(),
-                &original_binary
-            );
-        })
-        .unwrap();
-
-    assert_eq!(&fake_config, launched_with.lock().as_ref().unwrap());
-}
-
-// // covers that we always send a response back, if something when wrong,
-// // while spawning the terminal
-#[gpui::test]
-async fn test_handle_error_run_in_terminal_reverse_request(
-    executor: BackgroundExecutor,
-    cx: &mut TestAppContext,
-) {
-    init_test(cx);
-
-    let send_response = Arc::new(AtomicBool::new(false));
-
-    let fs = FakeFs::new(executor.clone());
-
-    fs.insert_tree(
-        path!("/project"),
-        json!({
-            "main.rs": "First line\nSecond line\nThird line\nFourth line",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
-    let workspace = init_test_workspace(&project, cx).await;
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-    let session = start_debug_session(&workspace, cx, |_| {}).unwrap();
-    let client = session.update(cx, |session, _| session.adapter_client().unwrap());
-
-    client
-        .on_response::<RunInTerminal, _>({
-            let send_response = send_response.clone();
-            move |response| {
-                send_response.store(true, Ordering::SeqCst);
-
-                assert!(!response.success);
-                assert!(response.body.is_some());
-            }
-        })
-        .await;
-
-    client
-        .fake_reverse_request::<RunInTerminal>(RunInTerminalRequestArguments {
-            kind: None,
-            title: None,
-            cwd: "".into(),
-            args: vec!["oops".into(), "oops".into()],
-            env: None,
-            args_can_be_interpreted_by_shell: None,
-        })
-        .await;
-
-    cx.run_until_parked();
-
-    assert!(
-        send_response.load(std::sync::atomic::Ordering::SeqCst),
-        "Expected to receive response from reverse request"
-    );
-
-    workspace
-        .update(cx, |workspace, _window, cx| {
-            let terminal_panel = workspace.panel::<TerminalPanel>(cx).unwrap();
-
-            assert_eq!(
-                0,
-                terminal_panel.read(cx).pane().unwrap().read(cx).items_len()
-            );
-        })
-        .unwrap();
-}
-
-#[gpui::test]
-async fn test_handle_start_debugging_reverse_request(
-    executor: BackgroundExecutor,
-    cx: &mut TestAppContext,
-) {
-    init_test(cx);
-
-    let send_response = Arc::new(AtomicBool::new(false));
-
-    let fs = FakeFs::new(executor.clone());
-
-    fs.insert_tree(
-        path!("/project"),
-        json!({
-            "main.rs": "First line\nSecond line\nThird line\nFourth line",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
-    let workspace = init_test_workspace(&project, cx).await;
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-    let session = start_debug_session(&workspace, cx, |_| {}).unwrap();
-    let client = session.update(cx, |session, _| session.adapter_client().unwrap());
-
-    client.on_request::<dap::requests::Threads, _>(move |_, _| {
-        Ok(dap::ThreadsResponse {
-            threads: vec![dap::Thread {
-                id: 1,
-                name: "Thread 1".into(),
-            }],
-        })
-    });
-
-    client
-        .on_response::<StartDebugging, _>({
-            let send_response = send_response.clone();
-            move |response| {
-                send_response.store(true, Ordering::SeqCst);
-
-                assert!(response.success);
-                assert!(response.body.is_some());
-            }
-        })
-        .await;
-    // Set up handlers for sessions spawned with reverse request too.
-    let _reverse_request_subscription =
-        project::debugger::test::intercept_debug_sessions(cx, |_| {});
-    client
-        .fake_reverse_request::<StartDebugging>(StartDebuggingRequestArguments {
-            configuration: json!({}),
-            request: StartDebuggingRequestArgumentsRequest::Launch,
-        })
-        .await;
-
-    cx.run_until_parked();
-
-    let child_session = project.update(cx, |project, cx| {
-        project
-            .dap_store()
-            .read(cx)
-            .session_by_id(SessionId(1))
-            .unwrap()
-    });
-    let child_client = child_session.update(cx, |session, _| session.adapter_client().unwrap());
-
-    child_client.on_request::<dap::requests::Threads, _>(move |_, _| {
-        Ok(dap::ThreadsResponse {
-            threads: vec![dap::Thread {
-                id: 1,
-                name: "Thread 1".into(),
-            }],
-        })
-    });
-
-    child_client.on_request::<Disconnect, _>(move |_, _| Ok(()));
-
-    child_client
-        .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-            reason: dap::StoppedEventReason::Pause,
-            description: None,
-            thread_id: Some(2),
-            preserve_focus_hint: None,
-            text: None,
-            all_threads_stopped: None,
-            hit_breakpoint_ids: None,
-        }))
-        .await;
-
-    cx.run_until_parked();
-
-    assert!(
-        send_response.load(std::sync::atomic::Ordering::SeqCst),
-        "Expected to receive response from reverse request"
-    );
-}
-
-#[gpui::test]
-async fn test_shutdown_children_when_parent_session_shutdown(
-    executor: BackgroundExecutor,
-    cx: &mut TestAppContext,
-) {
-    init_test(cx);
-
-    let fs = FakeFs::new(executor.clone());
-
-    fs.insert_tree(
-        path!("/project"),
-        json!({
-            "main.rs": "First line\nSecond line\nThird line\nFourth line",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
-    let dap_store = project.update(cx, |project, _| project.dap_store());
-    let workspace = init_test_workspace(&project, cx).await;
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-    let parent_session = start_debug_session(&workspace, cx, |_| {}).unwrap();
-    let client = parent_session.update(cx, |session, _| session.adapter_client().unwrap());
-
-    client.on_request::<dap::requests::Threads, _>(move |_, _| {
-        Ok(dap::ThreadsResponse {
-            threads: vec![dap::Thread {
-                id: 1,
-                name: "Thread 1".into(),
-            }],
-        })
-    });
-
-    client.on_response::<StartDebugging, _>(move |_| {}).await;
-    // Set up handlers for sessions spawned with reverse request too.
-    let _reverse_request_subscription =
-        project::debugger::test::intercept_debug_sessions(cx, |_| {});
-    // start first child session
-    client
-        .fake_reverse_request::<StartDebugging>(StartDebuggingRequestArguments {
-            configuration: json!({}),
-            request: StartDebuggingRequestArgumentsRequest::Launch,
-        })
-        .await;
-
-    cx.run_until_parked();
-
-    // start second child session
-    client
-        .fake_reverse_request::<StartDebugging>(StartDebuggingRequestArguments {
-            configuration: json!({}),
-            request: StartDebuggingRequestArgumentsRequest::Launch,
-        })
-        .await;
-
-    cx.run_until_parked();
-
-    // configure first child session
-    let first_child_session = dap_store.read_with(cx, |dap_store, _| {
-        dap_store.session_by_id(SessionId(1)).unwrap()
-    });
-    let first_child_client =
-        first_child_session.update(cx, |session, _| session.adapter_client().unwrap());
-
-    first_child_client.on_request::<Disconnect, _>(move |_, _| Ok(()));
-
-    // configure second child session
-    let second_child_session = dap_store.read_with(cx, |dap_store, _| {
-        dap_store.session_by_id(SessionId(2)).unwrap()
-    });
-    let second_child_client =
-        second_child_session.update(cx, |session, _| session.adapter_client().unwrap());
-
-    second_child_client.on_request::<Disconnect, _>(move |_, _| Ok(()));
-
-    cx.run_until_parked();
-
-    // shutdown parent session
-    dap_store
-        .update(cx, |dap_store, cx| {
-            dap_store.shutdown_session(parent_session.read(cx).session_id(), cx)
-        })
-        .await
-        .unwrap();
-
-    // assert parent session and all children sessions are shutdown
-    dap_store.update(cx, |dap_store, cx| {
-        assert!(
-            dap_store
-                .session_by_id(parent_session.read(cx).session_id())
-                .is_none()
-        );
-        assert!(
-            dap_store
-                .session_by_id(first_child_session.read(cx).session_id())
-                .is_none()
-        );
-        assert!(
-            dap_store
-                .session_by_id(second_child_session.read(cx).session_id())
-                .is_none()
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_shutdown_parent_session_if_all_children_are_shutdown(
-    executor: BackgroundExecutor,
-    cx: &mut TestAppContext,
-) {
-    init_test(cx);
-
-    let fs = FakeFs::new(executor.clone());
-
-    fs.insert_tree(
-        path!("/project"),
-        json!({
-            "main.rs": "First line\nSecond line\nThird line\nFourth line",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
-    let dap_store = project.update(cx, |project, _| project.dap_store());
-    let workspace = init_test_workspace(&project, cx).await;
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-    let parent_session = start_debug_session(&workspace, cx, |_| {}).unwrap();
-    let client = parent_session.update(cx, |session, _| session.adapter_client().unwrap());
-
-    client.on_response::<StartDebugging, _>(move |_| {}).await;
-    // Set up handlers for sessions spawned with reverse request too.
-    let _reverse_request_subscription =
-        project::debugger::test::intercept_debug_sessions(cx, |_| {});
-    // start first child session
-    client
-        .fake_reverse_request::<StartDebugging>(StartDebuggingRequestArguments {
-            configuration: json!({}),
-            request: StartDebuggingRequestArgumentsRequest::Launch,
-        })
-        .await;
-
-    cx.run_until_parked();
-
-    // start second child session
-    client
-        .fake_reverse_request::<StartDebugging>(StartDebuggingRequestArguments {
-            configuration: json!({}),
-            request: StartDebuggingRequestArgumentsRequest::Launch,
-        })
-        .await;
-
-    cx.run_until_parked();
-
-    // configure first child session
-    let first_child_session = dap_store.read_with(cx, |dap_store, _| {
-        dap_store.session_by_id(SessionId(1)).unwrap()
-    });
-    let first_child_client =
-        first_child_session.update(cx, |session, _| session.adapter_client().unwrap());
-
-    first_child_client.on_request::<Disconnect, _>(move |_, _| Ok(()));
-
-    // configure second child session
-    let second_child_session = dap_store.read_with(cx, |dap_store, _| {
-        dap_store.session_by_id(SessionId(2)).unwrap()
-    });
-    let second_child_client =
-        second_child_session.update(cx, |session, _| session.adapter_client().unwrap());
-
-    second_child_client.on_request::<Disconnect, _>(move |_, _| Ok(()));
-
-    cx.run_until_parked();
-
-    // shutdown first child session
-    dap_store
-        .update(cx, |dap_store, cx| {
-            dap_store.shutdown_session(first_child_session.read(cx).session_id(), cx)
-        })
-        .await
-        .unwrap();
-
-    // assert parent session and second child session still exist
-    dap_store.update(cx, |dap_store, cx| {
-        assert!(
-            dap_store
-                .session_by_id(parent_session.read(cx).session_id())
-                .is_some()
-        );
-        assert!(
-            dap_store
-                .session_by_id(first_child_session.read(cx).session_id())
-                .is_none()
-        );
-        assert!(
-            dap_store
-                .session_by_id(second_child_session.read(cx).session_id())
-                .is_some()
-        );
-    });
-
-    // shutdown first child session
-    dap_store
-        .update(cx, |dap_store, cx| {
-            dap_store.shutdown_session(second_child_session.read(cx).session_id(), cx)
-        })
-        .await
-        .unwrap();
-
-    // assert parent session got shutdown by second child session
-    // because it was the last child
-    dap_store.update(cx, |dap_store, cx| {
-        assert!(
-            dap_store
-                .session_by_id(parent_session.read(cx).session_id())
-                .is_none()
-        );
-        assert!(
-            dap_store
-                .session_by_id(second_child_session.read(cx).session_id())
-                .is_none()
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_debug_panel_item_thread_status_reset_on_failure(
-    executor: BackgroundExecutor,
-    cx: &mut TestAppContext,
-) {
-    init_test(cx);
-
-    let fs = FakeFs::new(executor.clone());
-
-    fs.insert_tree(
-        path!("/project"),
-        json!({
-            "main.rs": "First line\nSecond line\nThird line\nFourth line",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
-    let workspace = init_test_workspace(&project, cx).await;
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-    let session = start_debug_session(&workspace, cx, |client| {
-        client.on_request::<dap::requests::Initialize, _>(move |_, _| {
-            Ok(dap::Capabilities {
-                supports_step_back: Some(true),
-                ..Default::default()
-            })
-        });
-    })
-    .unwrap();
-
-    let client = session.update(cx, |session, _| session.adapter_client().unwrap());
-    const THREAD_ID_NUM: i64 = 1;
-
-    client.on_request::<dap::requests::Threads, _>(move |_, _| {
-        Ok(dap::ThreadsResponse {
-            threads: vec![dap::Thread {
-                id: THREAD_ID_NUM,
-                name: "Thread 1".into(),
-            }],
-        })
-    });
-
-    client.on_request::<Launch, _>(move |_, _| Ok(()));
-
-    client.on_request::<StackTrace, _>(move |_, _| {
-        Ok(dap::StackTraceResponse {
-            stack_frames: Vec::default(),
-            total_frames: None,
-        })
-    });
-
-    client.on_request::<Next, _>(move |_, _| {
-        Err(ErrorResponse {
-            error: Some(dap::Message {
-                id: 1,
-                format: "error".into(),
-                variables: None,
-                send_telemetry: None,
-                show_user: None,
-                url: None,
-                url_label: None,
-            }),
-        })
-    });
-
-    client.on_request::<StepOut, _>(move |_, _| {
-        Err(ErrorResponse {
-            error: Some(dap::Message {
-                id: 1,
-                format: "error".into(),
-                variables: None,
-                send_telemetry: None,
-                show_user: None,
-                url: None,
-                url_label: None,
-            }),
-        })
-    });
-
-    client.on_request::<StepIn, _>(move |_, _| {
-        Err(ErrorResponse {
-            error: Some(dap::Message {
-                id: 1,
-                format: "error".into(),
-                variables: None,
-                send_telemetry: None,
-                show_user: None,
-                url: None,
-                url_label: None,
-            }),
-        })
-    });
-
-    client.on_request::<StepBack, _>(move |_, _| {
-        Err(ErrorResponse {
-            error: Some(dap::Message {
-                id: 1,
-                format: "error".into(),
-                variables: None,
-                send_telemetry: None,
-                show_user: None,
-                url: None,
-                url_label: None,
-            }),
-        })
-    });
-
-    client.on_request::<Continue, _>(move |_, _| {
-        Err(ErrorResponse {
-            error: Some(dap::Message {
-                id: 1,
-                format: "error".into(),
-                variables: None,
-                send_telemetry: None,
-                show_user: None,
-                url: None,
-                url_label: None,
-            }),
-        })
-    });
-
-    client
-        .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-            reason: dap::StoppedEventReason::Pause,
-            description: None,
-            thread_id: Some(1),
-            preserve_focus_hint: None,
-            text: None,
-            all_threads_stopped: None,
-            hit_breakpoint_ids: None,
-        }))
-        .await;
-
-    cx.run_until_parked();
-
-    let running_state = active_debug_session_panel(workspace, cx)
-        .read_with(cx, |item, _| item.running_state().clone());
-
-    cx.run_until_parked();
-    let thread_id = ThreadId(1);
-
-    for operation in &[
-        "step_over",
-        "continue_thread",
-        "step_back",
-        "step_in",
-        "step_out",
-    ] {
-        running_state.update(cx, |running_state, cx| match *operation {
-            "step_over" => running_state.step_over(cx),
-            "continue_thread" => running_state.continue_thread(cx),
-            "step_back" => running_state.step_back(cx),
-            "step_in" => running_state.step_in(cx),
-            "step_out" => running_state.step_out(cx),
-            _ => unreachable!(),
-        });
-
-        // Check that we step the thread status to the correct intermediate state
-        running_state.update(cx, |running_state, cx| {
-            assert_eq!(
-                running_state
-                    .thread_status(cx)
-                    .expect("There should be an active thread selected"),
-                match *operation {
-                    "continue_thread" => ThreadStatus::Running,
-                    _ => ThreadStatus::Stepping,
-                },
-                "Thread status was not set to correct intermediate state after {} request",
-                operation
-            );
-        });
-
-        cx.run_until_parked();
-
-        running_state.update(cx, |running_state, cx| {
-            assert_eq!(
-                running_state
-                    .thread_status(cx)
-                    .expect("There should be an active thread selected"),
-                ThreadStatus::Stopped,
-                "Thread status not reset to Stopped after failed {}",
-                operation
-            );
-
-            // update state to running, so we can test it actually changes the status back to stopped
-            running_state
-                .session()
-                .update(cx, |session, cx| session.continue_thread(thread_id, cx));
-        });
-    }
-}
-
-#[gpui::test]
-async fn test_send_breakpoints_when_editor_has_been_saved(
-    executor: BackgroundExecutor,
-    cx: &mut TestAppContext,
-) {
-    init_test(cx);
-
-    let fs = FakeFs::new(executor.clone());
-
-    fs.insert_tree(
-        path!("/project"),
-        json!({
-            "main.rs": "First line\nSecond line\nThird line\nFourth line",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
-    let workspace = init_test_workspace(&project, cx).await;
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let project_path = Path::new(path!("/project"));
-    let worktree = project
-        .update(cx, |project, cx| project.find_worktree(project_path, cx))
-        .expect("This worktree should exist in project")
-        .0;
-
-    let worktree_id = workspace
-        .update(cx, |_, _, cx| worktree.read(cx).id())
-        .unwrap();
-
-    let session = start_debug_session(&workspace, cx, |_| {}).unwrap();
-    let client = session.update(cx, |session, _| session.adapter_client().unwrap());
-
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_buffer((worktree_id, rel_path("main.rs")), cx)
-        })
-        .await
-        .unwrap();
-
-    let (editor, cx) = cx.add_window_view(|window, cx| {
-        Editor::new(
-            EditorMode::full(),
-            MultiBuffer::build_from_buffer(buffer, cx),
-            Some(project.clone()),
-            window,
-            cx,
-        )
-    });
-
-    client.on_request::<Launch, _>(move |_, _| Ok(()));
-
-    client.on_request::<StackTrace, _>(move |_, _| {
-        Ok(dap::StackTraceResponse {
-            stack_frames: Vec::default(),
-            total_frames: None,
-        })
-    });
-
-    client
-        .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-            reason: dap::StoppedEventReason::Pause,
-            description: None,
-            thread_id: Some(1),
-            preserve_focus_hint: None,
-            text: None,
-            all_threads_stopped: None,
-            hit_breakpoint_ids: None,
-        }))
-        .await;
-
-    let called_set_breakpoints = Arc::new(AtomicBool::new(false));
-    client.on_request::<SetBreakpoints, _>({
-        let called_set_breakpoints = called_set_breakpoints.clone();
-        move |_, args| {
-            assert_eq!(path!("/project/main.rs"), args.source.path.unwrap());
-            assert_eq!(
-                vec![SourceBreakpoint {
-                    line: 2,
-                    column: None,
-                    condition: None,
-                    hit_condition: None,
-                    log_message: None,
-                    mode: None
-                }],
-                args.breakpoints.unwrap()
-            );
-            assert!(!args.source_modified.unwrap());
-
-            called_set_breakpoints.store(true, Ordering::SeqCst);
-
-            Ok(dap::SetBreakpointsResponse {
-                breakpoints: Vec::default(),
-            })
-        }
-    });
-
-    editor.update_in(cx, |editor, window, cx| {
-        editor.move_down(&actions::MoveDown, window, cx);
-        editor.toggle_breakpoint(&actions::ToggleBreakpoint, window, cx);
-    });
-
-    cx.run_until_parked();
-
-    assert!(
-        called_set_breakpoints.load(std::sync::atomic::Ordering::SeqCst),
-        "SetBreakpoint request must be called"
-    );
-
-    let called_set_breakpoints = Arc::new(AtomicBool::new(false));
-    client.on_request::<SetBreakpoints, _>({
-        let called_set_breakpoints = called_set_breakpoints.clone();
-        move |_, args| {
-            assert_eq!(path!("/project/main.rs"), args.source.path.unwrap());
-            assert_eq!(
-                vec![SourceBreakpoint {
-                    line: 3,
-                    column: None,
-                    condition: None,
-                    hit_condition: None,
-                    log_message: None,
-                    mode: None
-                }],
-                args.breakpoints.unwrap()
-            );
-            assert!(args.source_modified.unwrap());
-
-            called_set_breakpoints.store(true, Ordering::SeqCst);
-
-            Ok(dap::SetBreakpointsResponse {
-                breakpoints: Vec::default(),
-            })
-        }
-    });
-
-    editor.update_in(cx, |editor, window, cx| {
-        editor.move_up(&actions::MoveUp, window, cx);
-        editor.insert("new text\n", window, cx);
-    });
-
-    editor
-        .update_in(cx, |editor, window, cx| {
-            editor.save(
-                SaveOptions {
-                    format: true,
-                    autosave: false,
-                },
-                project.clone(),
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-
-    cx.run_until_parked();
-
-    assert!(
-        called_set_breakpoints.load(std::sync::atomic::Ordering::SeqCst),
-        "SetBreakpoint request must be called after editor is saved"
-    );
-}
-
-#[gpui::test]
-async fn test_unsetting_breakpoints_on_clear_breakpoint_action(
-    executor: BackgroundExecutor,
-    cx: &mut TestAppContext,
-) {
-    init_test(cx);
-
-    let fs = FakeFs::new(executor.clone());
-
-    fs.insert_tree(
-        path!("/project"),
-        json!({
-            "main.rs": "First line\nSecond line\nThird line\nFourth line",
-            "second.rs": "First line\nSecond line\nThird line\nFourth line",
-            "no_breakpoints.rs": "Used to ensure that we don't unset breakpoint in files with no breakpoints"
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
-    let workspace = init_test_workspace(&project, cx).await;
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let project_path = Path::new(path!("/project"));
-    let worktree = project
-        .update(cx, |project, cx| project.find_worktree(project_path, cx))
-        .expect("This worktree should exist in project")
-        .0;
-
-    let worktree_id = workspace
-        .update(cx, |_, _, cx| worktree.read(cx).id())
-        .unwrap();
-
-    let first = project
-        .update(cx, |project, cx| {
-            project.open_buffer((worktree_id, rel_path("main.rs")), cx)
-        })
-        .await
-        .unwrap();
-
-    let second = project
-        .update(cx, |project, cx| {
-            project.open_buffer((worktree_id, rel_path("second.rs")), cx)
-        })
-        .await
-        .unwrap();
-
-    let (first_editor, cx) = cx.add_window_view(|window, cx| {
-        Editor::new(
-            EditorMode::full(),
-            MultiBuffer::build_from_buffer(first, cx),
-            Some(project.clone()),
-            window,
-            cx,
-        )
-    });
-
-    let (second_editor, cx) = cx.add_window_view(|window, cx| {
-        Editor::new(
-            EditorMode::full(),
-            MultiBuffer::build_from_buffer(second, cx),
-            Some(project.clone()),
-            window,
-            cx,
-        )
-    });
-
-    first_editor.update_in(cx, |editor, window, cx| {
-        editor.move_down(&actions::MoveDown, window, cx);
-        editor.toggle_breakpoint(&actions::ToggleBreakpoint, window, cx);
-        editor.move_down(&actions::MoveDown, window, cx);
-        editor.move_down(&actions::MoveDown, window, cx);
-        editor.toggle_breakpoint(&actions::ToggleBreakpoint, window, cx);
-    });
-
-    second_editor.update_in(cx, |editor, window, cx| {
-        editor.toggle_breakpoint(&actions::ToggleBreakpoint, window, cx);
-        editor.move_down(&actions::MoveDown, window, cx);
-        editor.move_down(&actions::MoveDown, window, cx);
-        editor.move_down(&actions::MoveDown, window, cx);
-        editor.toggle_breakpoint(&actions::ToggleBreakpoint, window, cx);
-    });
-
-    let session = start_debug_session(&workspace, cx, |_| {}).unwrap();
-    let client = session.update(cx, |session, _| session.adapter_client().unwrap());
-
-    let called_set_breakpoints = Arc::new(AtomicBool::new(false));
-
-    client.on_request::<SetBreakpoints, _>({
-        move |_, args| {
-            assert!(
-                args.breakpoints.is_none_or(|bps| bps.is_empty()),
-                "Send empty breakpoint sets to clear them from DAP servers"
-            );
-
-            match args
-                .source
-                .path
-                .expect("We should always send a breakpoint's path")
-                .as_str()
-            {
-                path!("/project/main.rs") | path!("/project/second.rs") => {}
-                _ => {
-                    panic!("Unset breakpoints for path that doesn't have any")
-                }
-            }
-
-            called_set_breakpoints.store(true, Ordering::SeqCst);
-
-            Ok(dap::SetBreakpointsResponse {
-                breakpoints: Vec::default(),
-            })
-        }
-    });
-
-    cx.dispatch_action(crate::ClearAllBreakpoints);
-    cx.run_until_parked();
-}
-
-#[gpui::test]
-async fn test_debug_session_is_shutdown_when_attach_and_launch_request_fails(
-    executor: BackgroundExecutor,
-    cx: &mut TestAppContext,
-) {
-    init_test(cx);
-
-    let fs = FakeFs::new(executor.clone());
-
-    fs.insert_tree(
-        path!("/project"),
-        json!({
-            "main.rs": "First line\nSecond line\nThird line\nFourth line",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
-    let workspace = init_test_workspace(&project, cx).await;
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-    start_debug_session(&workspace, cx, |client| {
-        client.on_request::<dap::requests::Initialize, _>(|_, _| {
-            Err(ErrorResponse {
-                error: Some(Message {
-                    format: "failed to launch".to_string(),
-                    id: 1,
-                    variables: None,
-                    send_telemetry: None,
-                    show_user: None,
-                    url: None,
-                    url_label: None,
-                }),
-            })
-        });
-    })
-    .ok();
-
-    cx.run_until_parked();
-
-    project.update(cx, |project, cx| {
-        assert!(
-            project.dap_store().read(cx).sessions().count() == 0,
-            "Session wouldn't exist if it was shutdown"
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_we_send_arguments_from_user_config(
-    executor: BackgroundExecutor,
-    cx: &mut TestAppContext,
-) {
-    init_test(cx);
-
-    let fs = FakeFs::new(executor.clone());
-
-    fs.insert_tree(
-        path!("/project"),
-        json!({
-            "main.rs": "First line\nSecond line\nThird line\nFourth line",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
-    let workspace = init_test_workspace(&project, cx).await;
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let debug_definition = DebugTaskDefinition {
-        adapter: "fake-adapter".into(),
-        config: json!({
-            "request": "launch",
-            "program": "main.rs".to_owned(),
-            "args": vec!["arg1".to_owned(), "arg2".to_owned()],
-            "cwd": path!("/Random_path"),
-            "env": json!({ "KEY": "VALUE" }),
-        }),
-        label: "test".into(),
-        tcp_connection: None,
-    };
-
-    let launch_handler_called = Arc::new(AtomicBool::new(false));
-
-    start_debug_session_with(&workspace, cx, debug_definition.clone(), {
-        let launch_handler_called = launch_handler_called.clone();
-
-        move |client| {
-            let debug_definition = debug_definition.clone();
-            let launch_handler_called = launch_handler_called.clone();
-
-            client.on_request::<dap::requests::Launch, _>(move |_, args| {
-                launch_handler_called.store(true, Ordering::SeqCst);
-
-                assert_eq!(args.raw, debug_definition.config);
-
-                Ok(())
-            });
-        }
-    })
-    .ok();
-
-    cx.run_until_parked();
-
-    assert!(
-        launch_handler_called.load(Ordering::SeqCst),
-        "Launch request handler was not called"
-    );
-}
-
-#[gpui::test]
-async fn test_active_debug_line_setting(executor: BackgroundExecutor, cx: &mut TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(executor.clone());
-
-    fs.insert_tree(
-        path!("/project"),
-        json!({
-            "main.rs": "First line\nSecond line\nThird line\nFourth line",
-            "second.rs": "First line\nSecond line\nThird line\nFourth line",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
-    let workspace = init_test_workspace(&project, cx).await;
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let project_path = Path::new(path!("/project"));
-    let worktree = project
-        .update(cx, |project, cx| project.find_worktree(project_path, cx))
-        .expect("This worktree should exist in project")
-        .0;
-
-    let worktree_id = workspace
-        .update(cx, |_, _, cx| worktree.read(cx).id())
-        .unwrap();
-
-    let main_buffer = project
-        .update(cx, |project, cx| {
-            project.open_buffer((worktree_id, rel_path("main.rs")), cx)
-        })
-        .await
-        .unwrap();
-
-    let second_buffer = project
-        .update(cx, |project, cx| {
-            project.open_buffer((worktree_id, rel_path("second.rs")), cx)
-        })
-        .await
-        .unwrap();
-
-    let (main_editor, cx) = cx.add_window_view(|window, cx| {
-        Editor::new(
-            EditorMode::full(),
-            MultiBuffer::build_from_buffer(main_buffer, cx),
-            Some(project.clone()),
-            window,
-            cx,
-        )
-    });
-
-    let (second_editor, cx) = cx.add_window_view(|window, cx| {
-        Editor::new(
-            EditorMode::full(),
-            MultiBuffer::build_from_buffer(second_buffer, cx),
-            Some(project.clone()),
-            window,
-            cx,
-        )
-    });
-
-    let session = start_debug_session(&workspace, cx, |_| {}).unwrap();
-    let client = session.update(cx, |session, _| session.adapter_client().unwrap());
-
-    client.on_request::<dap::requests::Threads, _>(move |_, _| {
-        Ok(dap::ThreadsResponse {
-            threads: vec![dap::Thread {
-                id: 1,
-                name: "Thread 1".into(),
-            }],
-        })
-    });
-
-    client.on_request::<dap::requests::Scopes, _>(move |_, _| {
-        Ok(dap::ScopesResponse {
-            scopes: Vec::default(),
-        })
-    });
-
-    client.on_request::<StackTrace, _>(move |_, args| {
-        assert_eq!(args.thread_id, 1);
-
-        Ok(dap::StackTraceResponse {
-            stack_frames: vec![dap::StackFrame {
-                id: 1,
-                name: "frame 1".into(),
-                source: Some(dap::Source {
-                    name: Some("main.rs".into()),
-                    path: Some(path!("/project/main.rs").into()),
-                    source_reference: None,
-                    presentation_hint: None,
-                    origin: None,
-                    sources: None,
-                    adapter_data: None,
-                    checksums: None,
-                }),
-                line: 2,
-                column: 0,
-                end_line: None,
-                end_column: None,
-                can_restart: None,
-                instruction_pointer_reference: None,
-                module_id: None,
-                presentation_hint: None,
-            }],
-            total_frames: None,
-        })
-    });
-
-    client
-        .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-            reason: dap::StoppedEventReason::Breakpoint,
-            description: None,
-            thread_id: Some(1),
-            preserve_focus_hint: None,
-            text: None,
-            all_threads_stopped: None,
-            hit_breakpoint_ids: None,
-        }))
-        .await;
-
-    cx.run_until_parked();
-
-    main_editor.update_in(cx, |editor, window, cx| {
-        let active_debug_lines: Vec<_> = editor.highlighted_rows::<ActiveDebugLine>().collect();
-
-        assert_eq!(
-            active_debug_lines.len(),
-            1,
-            "There should be only one active debug line"
-        );
-
-        let point = editor
-            .snapshot(window, cx)
-            .buffer_snapshot()
-            .summary_for_anchor::<language::Point>(&active_debug_lines.first().unwrap().0.start);
-
-        assert_eq!(point.row, 1);
-    });
-
-    second_editor.update(cx, |editor, _| {
-        let active_debug_lines: Vec<_> = editor.highlighted_rows::<ActiveDebugLine>().collect();
-
-        assert!(
-            active_debug_lines.is_empty(),
-            "There shouldn't be any active debug lines"
-        );
-    });
-
-    let handled_second_stacktrace = Arc::new(AtomicBool::new(false));
-    client.on_request::<StackTrace, _>({
-        let handled_second_stacktrace = handled_second_stacktrace.clone();
-        move |_, args| {
-            handled_second_stacktrace.store(true, Ordering::SeqCst);
-            assert_eq!(args.thread_id, 1);
-
-            Ok(dap::StackTraceResponse {
-                stack_frames: vec![dap::StackFrame {
-                    id: 2,
-                    name: "frame 2".into(),
-                    source: Some(dap::Source {
-                        name: Some("second.rs".into()),
-                        path: Some(path!("/project/second.rs").into()),
-                        source_reference: None,
-                        presentation_hint: None,
-                        origin: None,
-                        sources: None,
-                        adapter_data: None,
-                        checksums: None,
-                    }),
-                    line: 3,
-                    column: 0,
-                    end_line: None,
-                    end_column: None,
-                    can_restart: None,
-                    instruction_pointer_reference: None,
-                    module_id: None,
-                    presentation_hint: None,
-                }],
-                total_frames: None,
-            })
-        }
-    });
-
-    client
-        .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-            reason: dap::StoppedEventReason::Breakpoint,
-            description: None,
-            thread_id: Some(1),
-            preserve_focus_hint: None,
-            text: None,
-            all_threads_stopped: None,
-            hit_breakpoint_ids: None,
-        }))
-        .await;
-
-    cx.run_until_parked();
-
-    second_editor.update_in(cx, |editor, window, cx| {
-        let active_debug_lines: Vec<_> = editor.highlighted_rows::<ActiveDebugLine>().collect();
-
-        assert_eq!(
-            active_debug_lines.len(),
-            1,
-            "There should be only one active debug line"
-        );
-
-        let point = editor
-            .snapshot(window, cx)
-            .buffer_snapshot()
-            .summary_for_anchor::<language::Point>(&active_debug_lines.first().unwrap().0.start);
-
-        assert_eq!(point.row, 2);
-    });
-
-    main_editor.update(cx, |editor, _| {
-        let active_debug_lines: Vec<_> = editor.highlighted_rows::<ActiveDebugLine>().collect();
-
-        assert!(
-            active_debug_lines.is_empty(),
-            "There shouldn't be any active debug lines"
-        );
-    });
-
-    assert!(
-        handled_second_stacktrace.load(Ordering::SeqCst),
-        "Second stacktrace request handler was not called"
-    );
-
-    client
-        .fake_event(dap::messages::Events::Continued(dap::ContinuedEvent {
-            thread_id: 0,
-            all_threads_continued: Some(true),
-        }))
-        .await;
-
-    cx.run_until_parked();
-
-    second_editor.update(cx, |editor, _| {
-        let active_debug_lines: Vec<_> = editor.highlighted_rows::<ActiveDebugLine>().collect();
-
-        assert!(
-            active_debug_lines.is_empty(),
-            "There shouldn't be any active debug lines"
-        );
-    });
-
-    main_editor.update(cx, |editor, _| {
-        let active_debug_lines: Vec<_> = editor.highlighted_rows::<ActiveDebugLine>().collect();
-
-        assert!(
-            active_debug_lines.is_empty(),
-            "There shouldn't be any active debug lines"
-        );
-    });
-
-    // Clean up
-    let shutdown_session = project.update(cx, |project, cx| {
-        project.dap_store().update(cx, |dap_store, cx| {
-            dap_store.shutdown_session(session.read(cx).session_id(), cx)
-        })
-    });
-
-    shutdown_session.await.unwrap();
-
-    main_editor.update(cx, |editor, _| {
-        let active_debug_lines: Vec<_> = editor.highlighted_rows::<ActiveDebugLine>().collect();
-
-        assert!(
-            active_debug_lines.is_empty(),
-            "There shouldn't be any active debug lines after session shutdown"
-        );
-    });
-
-    second_editor.update(cx, |editor, _| {
-        let active_debug_lines: Vec<_> = editor.highlighted_rows::<ActiveDebugLine>().collect();
-
-        assert!(
-            active_debug_lines.is_empty(),
-            "There shouldn't be any active debug lines after session shutdown"
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_debug_adapters_shutdown_on_app_quit(
-    executor: BackgroundExecutor,
-    cx: &mut TestAppContext,
-) {
-    init_test(cx);
-
-    let fs = FakeFs::new(executor.clone());
-
-    fs.insert_tree(
-        path!("/project"),
-        json!({
-            "main.rs": "First line\nSecond line\nThird line\nFourth line",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
-    let workspace = init_test_workspace(&project, cx).await;
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-    let session = start_debug_session(&workspace, cx, |_| {}).unwrap();
-    let client = session.update(cx, |session, _| session.adapter_client().unwrap());
-
-    let disconnect_request_received = Arc::new(AtomicBool::new(false));
-    let disconnect_clone = disconnect_request_received.clone();
-
-    client.on_request::<Disconnect, _>(move |_, _| {
-        disconnect_clone.store(true, Ordering::SeqCst);
-        Ok(())
-    });
-
-    executor.run_until_parked();
-
-    workspace
-        .update(cx, |workspace, _, cx| {
-            let panel = workspace.panel::<DebugPanel>(cx).unwrap();
-            panel.read_with(cx, |panel, _| {
-                assert!(
-                    panel.sessions().next().is_some(),
-                    "Debug session should be active"
-                );
-            });
-        })
-        .unwrap();
-
-    cx.update(|_, cx| cx.defer(|cx| cx.shutdown()));
-
-    executor.run_until_parked();
-
-    assert!(
-        disconnect_request_received.load(Ordering::SeqCst),
-        "Disconnect request should have been sent to the adapter on app shutdown"
-    );
-}
-
-#[gpui::test]
-async fn test_adapter_shutdown_with_child_sessions_on_app_quit(
-    executor: BackgroundExecutor,
-    cx: &mut TestAppContext,
-) {
-    init_test(cx);
-
-    let fs = FakeFs::new(executor.clone());
-
-    fs.insert_tree(
-        path!("/project"),
-        json!({
-            "main.rs": "First line\nSecond line\nThird line\nFourth line",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
-    let workspace = init_test_workspace(&project, cx).await;
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-    let parent_session = start_debug_session(&workspace, cx, |_| {}).unwrap();
-    let parent_session_id = cx.read(|cx| parent_session.read(cx).session_id());
-    let parent_client = parent_session.update(cx, |session, _| session.adapter_client().unwrap());
-
-    let disconnect_count = Arc::new(std::sync::atomic::AtomicUsize::new(0));
-    let parent_disconnect_called = Arc::new(AtomicBool::new(false));
-    let parent_disconnect_clone = parent_disconnect_called.clone();
-    let disconnect_count_clone = disconnect_count.clone();
-
-    parent_client.on_request::<Disconnect, _>(move |_, _| {
-        parent_disconnect_clone.store(true, Ordering::SeqCst);
-        disconnect_count_clone.fetch_add(1, Ordering::SeqCst);
-
-        for _ in 0..50 {
-            if disconnect_count_clone.load(Ordering::SeqCst) >= 2 {
-                break;
-            }
-            std::thread::sleep(std::time::Duration::from_millis(1));
-        }
-
-        Ok(())
-    });
-
-    parent_client
-        .on_response::<StartDebugging, _>(move |_| {})
-        .await;
-    let _subscription = project::debugger::test::intercept_debug_sessions(cx, |_| {});
-
-    parent_client
-        .fake_reverse_request::<StartDebugging>(StartDebuggingRequestArguments {
-            configuration: json!({}),
-            request: StartDebuggingRequestArgumentsRequest::Launch,
-        })
-        .await;
-
-    cx.run_until_parked();
-
-    let child_session = project.update(cx, |project, cx| {
-        project
-            .dap_store()
-            .read(cx)
-            .session_by_id(SessionId(1))
-            .unwrap()
-    });
-    let child_session_id = cx.read(|cx| child_session.read(cx).session_id());
-    let child_client = child_session.update(cx, |session, _| session.adapter_client().unwrap());
-
-    let child_disconnect_called = Arc::new(AtomicBool::new(false));
-    let child_disconnect_clone = child_disconnect_called.clone();
-    let disconnect_count_clone = disconnect_count.clone();
-
-    child_client.on_request::<Disconnect, _>(move |_, _| {
-        child_disconnect_clone.store(true, Ordering::SeqCst);
-        disconnect_count_clone.fetch_add(1, Ordering::SeqCst);
-
-        for _ in 0..50 {
-            if disconnect_count_clone.load(Ordering::SeqCst) >= 2 {
-                break;
-            }
-            std::thread::sleep(std::time::Duration::from_millis(1));
-        }
-
-        Ok(())
-    });
-
-    executor.run_until_parked();
-
-    project.update(cx, |project, cx| {
-        let store = project.dap_store().read(cx);
-        assert!(store.session_by_id(parent_session_id).is_some());
-        assert!(store.session_by_id(child_session_id).is_some());
-    });
-
-    cx.update(|_, cx| cx.defer(|cx| cx.shutdown()));
-
-    executor.run_until_parked();
-
-    let parent_disconnect_check = parent_disconnect_called.clone();
-    let child_disconnect_check = child_disconnect_called.clone();
-    let both_disconnected = executor
-        .spawn(async move {
-            let parent_disconnect = parent_disconnect_check;
-            let child_disconnect = child_disconnect_check;
-
-            // We only have 100ms to shutdown the app
-            for _ in 0..100 {
-                if parent_disconnect.load(Ordering::SeqCst)
-                    && child_disconnect.load(Ordering::SeqCst)
-                {
-                    return true;
-                }
-
-                gpui::Timer::after(std::time::Duration::from_millis(1)).await;
-            }
-
-            false
-        })
-        .await;
-
-    assert!(
-        both_disconnected,
-        "Both parent and child sessions should receive disconnect requests"
-    );
-
-    assert!(
-        parent_disconnect_called.load(Ordering::SeqCst),
-        "Parent session should have received disconnect request"
-    );
-    assert!(
-        child_disconnect_called.load(Ordering::SeqCst),
-        "Child session should have received disconnect request"
-    );
-}
diff --git a/crates/debugger_ui/src/tests/inline_values.rs b/crates/debugger_ui/src/tests/inline_values.rs
deleted file mode 100644
index 379bc4c98f..0000000000
--- a/crates/debugger_ui/src/tests/inline_values.rs
+++ /dev/null
@@ -1,2522 +0,0 @@
-use std::{path::Path, sync::Arc};
-
-use dap::{Scope, StackFrame, Variable, requests::Variables};
-use editor::{Editor, EditorMode, MultiBuffer};
-use gpui::{BackgroundExecutor, TestAppContext, VisualTestContext};
-use language::{
-    Language, LanguageConfig, LanguageMatcher, rust_lang, tree_sitter_python,
-    tree_sitter_typescript,
-};
-use project::{FakeFs, Project};
-use serde_json::json;
-use unindent::Unindent as _;
-use util::{path, rel_path::rel_path};
-
-use crate::{
-    debugger_panel::DebugPanel,
-    tests::{active_debug_session_panel, init_test, init_test_workspace, start_debug_session},
-};
-
-#[gpui::test]
-async fn test_rust_inline_values(executor: BackgroundExecutor, cx: &mut TestAppContext) {
-    init_test(cx);
-
-    fn stack_frame_for_line(line: u64) -> dap::StackFrame {
-        StackFrame {
-            id: 1,
-            name: "Stack Frame 1".into(),
-            source: Some(dap::Source {
-                name: Some("main.rs".into()),
-                path: Some(path!("/project/main.rs").into()),
-                source_reference: None,
-                presentation_hint: None,
-                origin: None,
-                sources: None,
-                adapter_data: None,
-                checksums: None,
-            }),
-            line,
-            column: 1,
-            end_line: None,
-            end_column: None,
-            can_restart: None,
-            instruction_pointer_reference: None,
-            module_id: None,
-            presentation_hint: None,
-        }
-    }
-
-    let fs = FakeFs::new(executor.clone());
-    let source_code = r#"
-static mut GLOBAL: usize = 1;
-
-fn main() {
-    let x = 10;
-    let value = 42;
-    let y = 4;
-    let tester = {
-        let y = 10;
-        let y = 5;
-        let b = 3;
-        vec![y, 20, 30]
-    };
-
-    let caller = || {
-        let x = 3;
-        println!("x={}", x);
-    };
-
-    caller();
-
-    unsafe {
-        GLOBAL = 2;
-    }
-
-    let result = value * 2 * x;
-    println!("Simple test executed: value={}, result={}", value, result);
-    assert!(true);
-}
-"#
-    .unindent();
-    fs.insert_tree(path!("/project"), json!({ "main.rs": source_code }))
-        .await;
-
-    let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
-    let workspace = init_test_workspace(&project, cx).await;
-    workspace
-        .update(cx, |workspace, window, cx| {
-            workspace.focus_panel::<DebugPanel>(window, cx);
-        })
-        .unwrap();
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-    let session = start_debug_session(&workspace, cx, |_| {}).unwrap();
-    let client = session.update(cx, |session, _| session.adapter_client().unwrap());
-
-    client.on_request::<dap::requests::Threads, _>(move |_, _| {
-        Ok(dap::ThreadsResponse {
-            threads: vec![dap::Thread {
-                id: 1,
-                name: "Thread 1".into(),
-            }],
-        })
-    });
-
-    client.on_request::<dap::requests::StackTrace, _>(move |_, _| {
-        Ok(dap::StackTraceResponse {
-            stack_frames: vec![stack_frame_for_line(4)],
-            total_frames: None,
-        })
-    });
-
-    client.on_request::<dap::requests::Evaluate, _>(move |_, args| {
-        assert_eq!("GLOBAL", args.expression);
-        Ok(dap::EvaluateResponse {
-            result: "1".into(),
-            type_: None,
-            presentation_hint: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            value_location_reference: None,
-        })
-    });
-
-    let local_variables = vec![
-        Variable {
-            name: "x".into(),
-            value: "10".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-        Variable {
-            name: "y".into(),
-            value: "4".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-        Variable {
-            name: "value".into(),
-            value: "42".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-    ];
-
-    client.on_request::<Variables, _>({
-        let local_variables = Arc::new(local_variables.clone());
-        move |_, _| {
-            Ok(dap::VariablesResponse {
-                variables: (*local_variables).clone(),
-            })
-        }
-    });
-
-    client.on_request::<dap::requests::Scopes, _>(move |_, _| {
-        Ok(dap::ScopesResponse {
-            scopes: vec![Scope {
-                name: "Locale".into(),
-                presentation_hint: None,
-                variables_reference: 2,
-                named_variables: None,
-                indexed_variables: None,
-                expensive: false,
-                source: None,
-                line: None,
-                column: None,
-                end_line: None,
-                end_column: None,
-            }],
-        })
-    });
-
-    client
-        .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-            reason: dap::StoppedEventReason::Pause,
-            description: None,
-            thread_id: Some(1),
-            preserve_focus_hint: None,
-            text: None,
-            all_threads_stopped: None,
-            hit_breakpoint_ids: None,
-        }))
-        .await;
-
-    cx.run_until_parked();
-
-    let project_path = Path::new(path!("/project"));
-    let worktree = project
-        .update(cx, |project, cx| project.find_worktree(project_path, cx))
-        .expect("This worktree should exist in project")
-        .0;
-
-    let worktree_id = workspace
-        .update(cx, |_, _, cx| worktree.read(cx).id())
-        .unwrap();
-
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_buffer((worktree_id, rel_path("main.rs")), cx)
-        })
-        .await
-        .unwrap();
-
-    buffer.update(cx, |buffer, cx| {
-        buffer.set_language(Some(rust_lang()), cx);
-    });
-
-    let (editor, cx) = cx.add_window_view(|window, cx| {
-        Editor::new(
-            EditorMode::full(),
-            MultiBuffer::build_from_buffer(buffer, cx),
-            Some(project),
-            window,
-            cx,
-        )
-    });
-
-    active_debug_session_panel(workspace, cx).update_in(cx, |_, window, cx| {
-        cx.focus_self(window);
-    });
-    cx.run_until_parked();
-
-    editor.update(cx, |editor, cx| editor.refresh_inline_values(cx));
-
-    cx.run_until_parked();
-
-    editor.update_in(cx, |editor, window, cx| {
-        pretty_assertions::assert_eq!(
-            r#"
-    static mut GLOBAL: usize = 1;
-
-    fn main() {
-        let x: 10 = 10;
-        let value = 42;
-        let y = 4;
-        let tester = {
-            let y = 10;
-            let y = 5;
-            let b = 3;
-            vec![y, 20, 30]
-        };
-
-        let caller = || {
-            let x = 3;
-            println!("x={}", x);
-        };
-
-        caller();
-
-        unsafe {
-            GLOBAL = 2;
-        }
-
-        let result = value * 2 * x;
-        println!("Simple test executed: value={}, result={}", value, result);
-        assert!(true);
-    }
-    "#
-            .unindent(),
-            editor.snapshot(window, cx).text()
-        );
-    });
-
-    client.on_request::<dap::requests::StackTrace, _>(move |_, _| {
-        Ok(dap::StackTraceResponse {
-            stack_frames: vec![stack_frame_for_line(5)],
-            total_frames: None,
-        })
-    });
-    client
-        .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-            reason: dap::StoppedEventReason::Pause,
-            description: None,
-            thread_id: Some(1),
-            preserve_focus_hint: None,
-            text: None,
-            all_threads_stopped: None,
-            hit_breakpoint_ids: None,
-        }))
-        .await;
-
-    cx.run_until_parked();
-
-    editor.update_in(cx, |editor, window, cx| {
-        pretty_assertions::assert_eq!(
-            r#"
-    static mut GLOBAL: usize = 1;
-
-    fn main() {
-        let x: 10 = 10;
-        let value: 42 = 42;
-        let y = 4;
-        let tester = {
-            let y = 10;
-            let y = 5;
-            let b = 3;
-            vec![y, 20, 30]
-        };
-
-        let caller = || {
-            let x = 3;
-            println!("x={}", x);
-        };
-
-        caller();
-
-        unsafe {
-            GLOBAL = 2;
-        }
-
-        let result = value * 2 * x;
-        println!("Simple test executed: value={}, result={}", value, result);
-        assert!(true);
-    }
-    "#
-            .unindent(),
-            editor.snapshot(window, cx).text()
-        );
-    });
-
-    client.on_request::<dap::requests::StackTrace, _>(move |_, _| {
-        Ok(dap::StackTraceResponse {
-            stack_frames: vec![stack_frame_for_line(6)],
-            total_frames: None,
-        })
-    });
-    client
-        .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-            reason: dap::StoppedEventReason::Pause,
-            description: None,
-            thread_id: Some(1),
-            preserve_focus_hint: None,
-            text: None,
-            all_threads_stopped: None,
-            hit_breakpoint_ids: None,
-        }))
-        .await;
-
-    cx.run_until_parked();
-
-    editor.update_in(cx, |editor, window, cx| {
-        pretty_assertions::assert_eq!(
-            r#"
-    static mut GLOBAL: usize = 1;
-
-    fn main() {
-        let x: 10 = 10;
-        let value: 42 = 42;
-        let y: 4 = 4;
-        let tester = {
-            let y = 10;
-            let y = 5;
-            let b = 3;
-            vec![y, 20, 30]
-        };
-
-        let caller = || {
-            let x = 3;
-            println!("x={}", x);
-        };
-
-        caller();
-
-        unsafe {
-            GLOBAL = 2;
-        }
-
-        let result = value * 2 * x;
-        println!("Simple test executed: value={}, result={}", value, result);
-        assert!(true);
-    }
-    "#
-            .unindent(),
-            editor.snapshot(window, cx).text()
-        );
-    });
-
-    client.on_request::<dap::requests::StackTrace, _>(move |_, _| {
-        Ok(dap::StackTraceResponse {
-            stack_frames: vec![stack_frame_for_line(7)],
-            total_frames: None,
-        })
-    });
-    client
-        .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-            reason: dap::StoppedEventReason::Pause,
-            description: None,
-            thread_id: Some(1),
-            preserve_focus_hint: None,
-            text: None,
-            all_threads_stopped: None,
-            hit_breakpoint_ids: None,
-        }))
-        .await;
-
-    cx.run_until_parked();
-
-    editor.update_in(cx, |editor, window, cx| {
-        pretty_assertions::assert_eq!(
-            r#"
-    static mut GLOBAL: usize = 1;
-
-    fn main() {
-        let x: 10 = 10;
-        let value: 42 = 42;
-        let y: 4 = 4;
-        let tester = {
-            let y = 10;
-            let y = 5;
-            let b = 3;
-            vec![y, 20, 30]
-        };
-
-        let caller = || {
-            let x = 3;
-            println!("x={}", x);
-        };
-
-        caller();
-
-        unsafe {
-            GLOBAL = 2;
-        }
-
-        let result = value * 2 * x;
-        println!("Simple test executed: value={}, result={}", value, result);
-        assert!(true);
-    }
-    "#
-            .unindent(),
-            editor.snapshot(window, cx).text()
-        );
-    });
-
-    client.on_request::<dap::requests::StackTrace, _>(move |_, _| {
-        Ok(dap::StackTraceResponse {
-            stack_frames: vec![stack_frame_for_line(8)],
-            total_frames: None,
-        })
-    });
-    client
-        .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-            reason: dap::StoppedEventReason::Pause,
-            description: None,
-            thread_id: Some(1),
-            preserve_focus_hint: None,
-            text: None,
-            all_threads_stopped: None,
-            hit_breakpoint_ids: None,
-        }))
-        .await;
-
-    cx.run_until_parked();
-
-    editor.update_in(cx, |editor, window, cx| {
-        pretty_assertions::assert_eq!(
-            r#"
-    static mut GLOBAL: usize = 1;
-
-    fn main() {
-        let x: 10 = 10;
-        let value: 42 = 42;
-        let y: 4 = 4;
-        let tester = {
-            let y: 4 = 10;
-            let y = 5;
-            let b = 3;
-            vec![y, 20, 30]
-        };
-
-        let caller = || {
-            let x = 3;
-            println!("x={}", x);
-        };
-
-        caller();
-
-        unsafe {
-            GLOBAL = 2;
-        }
-
-        let result = value * 2 * x;
-        println!("Simple test executed: value={}, result={}", value, result);
-        assert!(true);
-    }
-    "#
-            .unindent(),
-            editor.snapshot(window, cx).text()
-        );
-    });
-
-    let local_variables = vec![
-        Variable {
-            name: "x".into(),
-            value: "10".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-        Variable {
-            name: "y".into(),
-            value: "10".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-        Variable {
-            name: "value".into(),
-            value: "42".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-    ];
-
-    client.on_request::<Variables, _>({
-        let local_variables = Arc::new(local_variables.clone());
-        move |_, _| {
-            Ok(dap::VariablesResponse {
-                variables: (*local_variables).clone(),
-            })
-        }
-    });
-    client.on_request::<dap::requests::StackTrace, _>(move |_, _| {
-        Ok(dap::StackTraceResponse {
-            stack_frames: vec![stack_frame_for_line(9)],
-            total_frames: None,
-        })
-    });
-    client
-        .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-            reason: dap::StoppedEventReason::Pause,
-            description: None,
-            thread_id: Some(1),
-            preserve_focus_hint: None,
-            text: None,
-            all_threads_stopped: None,
-            hit_breakpoint_ids: None,
-        }))
-        .await;
-
-    cx.run_until_parked();
-
-    editor.update_in(cx, |editor, window, cx| {
-        pretty_assertions::assert_eq!(
-            r#"
-    static mut GLOBAL: usize = 1;
-
-    fn main() {
-        let x: 10 = 10;
-        let value: 42 = 42;
-        let y: 10 = 4;
-        let tester = {
-            let y: 10 = 10;
-            let y: 10 = 5;
-            let b = 3;
-            vec![y, 20, 30]
-        };
-
-        let caller = || {
-            let x = 3;
-            println!("x={}", x);
-        };
-
-        caller();
-
-        unsafe {
-            GLOBAL = 2;
-        }
-
-        let result = value * 2 * x;
-        println!("Simple test executed: value={}, result={}", value, result);
-        assert!(true);
-    }
-    "#
-            .unindent(),
-            editor.snapshot(window, cx).text()
-        );
-    });
-
-    let local_variables = vec![
-        Variable {
-            name: "x".into(),
-            value: "10".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-        Variable {
-            name: "y".into(),
-            value: "5".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-        Variable {
-            name: "value".into(),
-            value: "42".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-    ];
-
-    client.on_request::<Variables, _>({
-        let local_variables = Arc::new(local_variables.clone());
-        move |_, _| {
-            Ok(dap::VariablesResponse {
-                variables: (*local_variables).clone(),
-            })
-        }
-    });
-    client.on_request::<dap::requests::StackTrace, _>(move |_, _| {
-        Ok(dap::StackTraceResponse {
-            stack_frames: vec![stack_frame_for_line(10)],
-            total_frames: None,
-        })
-    });
-    client
-        .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-            reason: dap::StoppedEventReason::Pause,
-            description: None,
-            thread_id: Some(1),
-            preserve_focus_hint: None,
-            text: None,
-            all_threads_stopped: None,
-            hit_breakpoint_ids: None,
-        }))
-        .await;
-
-    cx.run_until_parked();
-
-    editor.update_in(cx, |editor, window, cx| {
-        pretty_assertions::assert_eq!(
-            r#"
-    static mut GLOBAL: usize = 1;
-
-    fn main() {
-        let x: 10 = 10;
-        let value: 42 = 42;
-        let y: 5 = 4;
-        let tester = {
-            let y: 5 = 10;
-            let y: 5 = 5;
-            let b = 3;
-            vec![y, 20, 30]
-        };
-
-        let caller = || {
-            let x = 3;
-            println!("x={}", x);
-        };
-
-        caller();
-
-        unsafe {
-            GLOBAL = 2;
-        }
-
-        let result = value * 2 * x;
-        println!("Simple test executed: value={}, result={}", value, result);
-        assert!(true);
-    }
-    "#
-            .unindent(),
-            editor.snapshot(window, cx).text()
-        );
-    });
-
-    let local_variables = vec![
-        Variable {
-            name: "x".into(),
-            value: "10".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-        Variable {
-            name: "y".into(),
-            value: "5".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-        Variable {
-            name: "value".into(),
-            value: "42".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-        Variable {
-            name: "b".into(),
-            value: "3".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-    ];
-    client.on_request::<Variables, _>({
-        let local_variables = Arc::new(local_variables.clone());
-        move |_, _| {
-            Ok(dap::VariablesResponse {
-                variables: (*local_variables).clone(),
-            })
-        }
-    });
-    client.on_request::<dap::requests::StackTrace, _>(move |_, _| {
-        Ok(dap::StackTraceResponse {
-            stack_frames: vec![stack_frame_for_line(11)],
-            total_frames: None,
-        })
-    });
-    client
-        .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-            reason: dap::StoppedEventReason::Pause,
-            description: None,
-            thread_id: Some(1),
-            preserve_focus_hint: None,
-            text: None,
-            all_threads_stopped: None,
-            hit_breakpoint_ids: None,
-        }))
-        .await;
-
-    cx.run_until_parked();
-
-    editor.update_in(cx, |editor, window, cx| {
-        pretty_assertions::assert_eq!(
-            r#"
-    static mut GLOBAL: usize = 1;
-
-    fn main() {
-        let x: 10 = 10;
-        let value: 42 = 42;
-        let y: 5 = 4;
-        let tester = {
-            let y: 5 = 10;
-            let y: 5 = 5;
-            let b: 3 = 3;
-            vec![y: 5, 20, 30]
-        };
-
-        let caller = || {
-            let x = 3;
-            println!("x={}", x);
-        };
-
-        caller();
-
-        unsafe {
-            GLOBAL = 2;
-        }
-
-        let result = value * 2 * x;
-        println!("Simple test executed: value={}, result={}", value, result);
-        assert!(true);
-    }
-    "#
-            .unindent(),
-            editor.snapshot(window, cx).text()
-        );
-    });
-
-    let local_variables = vec![
-        Variable {
-            name: "x".into(),
-            value: "10".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-        Variable {
-            name: "y".into(),
-            value: "4".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-        Variable {
-            name: "value".into(),
-            value: "42".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-        Variable {
-            name: "tester".into(),
-            value: "size=3".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-    ];
-    client.on_request::<Variables, _>({
-        let local_variables = Arc::new(local_variables.clone());
-        move |_, _| {
-            Ok(dap::VariablesResponse {
-                variables: (*local_variables).clone(),
-            })
-        }
-    });
-    client.on_request::<dap::requests::StackTrace, _>(move |_, _| {
-        Ok(dap::StackTraceResponse {
-            stack_frames: vec![stack_frame_for_line(14)],
-            total_frames: None,
-        })
-    });
-    client
-        .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-            reason: dap::StoppedEventReason::Pause,
-            description: None,
-            thread_id: Some(1),
-            preserve_focus_hint: None,
-            text: None,
-            all_threads_stopped: None,
-            hit_breakpoint_ids: None,
-        }))
-        .await;
-
-    cx.run_until_parked();
-
-    editor.update_in(cx, |editor, window, cx| {
-        pretty_assertions::assert_eq!(
-            r#"
-    static mut GLOBAL: usize = 1;
-
-    fn main() {
-        let x: 10 = 10;
-        let value: 42 = 42;
-        let y: 4 = 4;
-        let tester: size=3 = {
-            let y = 10;
-            let y = 5;
-            let b = 3;
-            vec![y, 20, 30]
-        };
-
-        let caller = || {
-            let x = 3;
-            println!("x={}", x);
-        };
-
-        caller();
-
-        unsafe {
-            GLOBAL = 2;
-        }
-
-        let result = value * 2 * x;
-        println!("Simple test executed: value={}, result={}", value, result);
-        assert!(true);
-    }
-    "#
-            .unindent(),
-            editor.snapshot(window, cx).text()
-        );
-    });
-
-    let local_variables = vec![
-        Variable {
-            name: "x".into(),
-            value: "10".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-        Variable {
-            name: "y".into(),
-            value: "4".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-        Variable {
-            name: "value".into(),
-            value: "42".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-        Variable {
-            name: "tester".into(),
-            value: "size=3".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-        Variable {
-            name: "caller".into(),
-            value: "<not available>".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-    ];
-    client.on_request::<Variables, _>({
-        let local_variables = Arc::new(local_variables.clone());
-        move |_, _| {
-            Ok(dap::VariablesResponse {
-                variables: (*local_variables).clone(),
-            })
-        }
-    });
-    client.on_request::<dap::requests::StackTrace, _>(move |_, _| {
-        Ok(dap::StackTraceResponse {
-            stack_frames: vec![stack_frame_for_line(19)],
-            total_frames: None,
-        })
-    });
-    client
-        .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-            reason: dap::StoppedEventReason::Pause,
-            description: None,
-            thread_id: Some(1),
-            preserve_focus_hint: None,
-            text: None,
-            all_threads_stopped: None,
-            hit_breakpoint_ids: None,
-        }))
-        .await;
-
-    cx.run_until_parked();
-
-    editor.update_in(cx, |editor, window, cx| {
-        pretty_assertions::assert_eq!(
-            r#"
-    static mut GLOBAL: usize = 1;
-
-    fn main() {
-        let x: 10 = 10;
-        let value: 42 = 42;
-        let y: 4 = 4;
-        let tester: size=3 = {
-            let y = 10;
-            let y = 5;
-            let b = 3;
-            vec![y, 20, 30]
-        };
-
-        let caller: <not available> = || {
-            let x = 3;
-            println!("x={}", x);
-        };
-
-        caller();
-
-        unsafe {
-            GLOBAL = 2;
-        }
-
-        let result = value * 2 * x;
-        println!("Simple test executed: value={}, result={}", value, result);
-        assert!(true);
-    }
-    "#
-            .unindent(),
-            editor.snapshot(window, cx).text()
-        );
-    });
-
-    client.on_request::<dap::requests::StackTrace, _>(move |_, _| {
-        Ok(dap::StackTraceResponse {
-            stack_frames: vec![stack_frame_for_line(15)],
-            total_frames: None,
-        })
-    });
-    client
-        .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-            reason: dap::StoppedEventReason::Pause,
-            description: None,
-            thread_id: Some(1),
-            preserve_focus_hint: None,
-            text: None,
-            all_threads_stopped: None,
-            hit_breakpoint_ids: None,
-        }))
-        .await;
-
-    cx.run_until_parked();
-
-    editor.update_in(cx, |editor, window, cx| {
-        pretty_assertions::assert_eq!(
-            r#"
-    static mut GLOBAL: usize = 1;
-
-    fn main() {
-        let x: 10 = 10;
-        let value: 42 = 42;
-        let y: 4 = 4;
-        let tester: size=3 = {
-            let y = 10;
-            let y = 5;
-            let b = 3;
-            vec![y, 20, 30]
-        };
-
-        let caller: <not available> = || {
-            let x: 10 = 3;
-            println!("x={}", x);
-        };
-
-        caller();
-
-        unsafe {
-            GLOBAL = 2;
-        }
-
-        let result = value * 2 * x;
-        println!("Simple test executed: value={}, result={}", value, result);
-        assert!(true);
-    }
-    "#
-            .unindent(),
-            editor.snapshot(window, cx).text()
-        );
-    });
-
-    let local_variables = vec![Variable {
-        name: "x".into(),
-        value: "3".into(),
-        type_: None,
-        presentation_hint: None,
-        evaluate_name: None,
-        variables_reference: 0,
-        named_variables: None,
-        indexed_variables: None,
-        memory_reference: None,
-        declaration_location_reference: None,
-        value_location_reference: None,
-    }];
-    client.on_request::<Variables, _>({
-        let local_variables = Arc::new(local_variables.clone());
-        move |_, _| {
-            Ok(dap::VariablesResponse {
-                variables: (*local_variables).clone(),
-            })
-        }
-    });
-    client.on_request::<dap::requests::StackTrace, _>(move |_, _| {
-        Ok(dap::StackTraceResponse {
-            stack_frames: vec![stack_frame_for_line(16)],
-            total_frames: None,
-        })
-    });
-    client
-        .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-            reason: dap::StoppedEventReason::Pause,
-            description: None,
-            thread_id: Some(1),
-            preserve_focus_hint: None,
-            text: None,
-            all_threads_stopped: None,
-            hit_breakpoint_ids: None,
-        }))
-        .await;
-
-    cx.run_until_parked();
-
-    editor.update_in(cx, |editor, window, cx| {
-        pretty_assertions::assert_eq!(
-            r#"
-    static mut GLOBAL: usize = 1;
-
-    fn main() {
-        let x: 3 = 10;
-        let value = 42;
-        let y = 4;
-        let tester = {
-            let y = 10;
-            let y = 5;
-            let b = 3;
-            vec![y, 20, 30]
-        };
-
-        let caller = || {
-            let x: 3 = 3;
-            println!("x={}", x: 3);
-        };
-
-        caller();
-
-        unsafe {
-            GLOBAL = 2;
-        }
-
-        let result = value * 2 * x;
-        println!("Simple test executed: value={}, result={}", value, result);
-        assert!(true);
-    }
-    "#
-            .unindent(),
-            editor.snapshot(window, cx).text()
-        );
-    });
-
-    let local_variables = vec![
-        Variable {
-            name: "x".into(),
-            value: "10".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-        Variable {
-            name: "y".into(),
-            value: "4".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-        Variable {
-            name: "value".into(),
-            value: "42".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-        Variable {
-            name: "tester".into(),
-            value: "size=3".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-        Variable {
-            name: "caller".into(),
-            value: "<not available>".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-    ];
-    client.on_request::<Variables, _>({
-        let local_variables = Arc::new(local_variables.clone());
-        move |_, _| {
-            Ok(dap::VariablesResponse {
-                variables: (*local_variables).clone(),
-            })
-        }
-    });
-    client.on_request::<dap::requests::Evaluate, _>(move |_, args| {
-        assert_eq!("GLOBAL", args.expression);
-        Ok(dap::EvaluateResponse {
-            result: "2".into(),
-            type_: None,
-            presentation_hint: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            value_location_reference: None,
-        })
-    });
-    client.on_request::<dap::requests::StackTrace, _>(move |_, _| {
-        Ok(dap::StackTraceResponse {
-            stack_frames: vec![stack_frame_for_line(25)],
-            total_frames: None,
-        })
-    });
-    client
-        .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-            reason: dap::StoppedEventReason::Pause,
-            description: None,
-            thread_id: Some(1),
-            preserve_focus_hint: None,
-            text: None,
-            all_threads_stopped: None,
-            hit_breakpoint_ids: None,
-        }))
-        .await;
-
-    cx.run_until_parked();
-
-    editor.update_in(cx, |editor, window, cx| {
-        pretty_assertions::assert_eq!(
-            r#"
-    static mut GLOBAL: usize = 1;
-
-    fn main() {
-        let x: 10 = 10;
-        let value: 42 = 42;
-        let y: 4 = 4;
-        let tester: size=3 = {
-            let y = 10;
-            let y = 5;
-            let b = 3;
-            vec![y, 20, 30]
-        };
-
-        let caller: <not available> = || {
-            let x = 3;
-            println!("x={}", x);
-        };
-
-        caller();
-
-        unsafe {
-            GLOBAL = 2;
-        }
-
-        let result = value: 42 * 2 * x: 10;
-        println!("Simple test executed: value={}, result={}", value, result);
-        assert!(true);
-    }
-    "#
-            .unindent(),
-            editor.snapshot(window, cx).text()
-        );
-    });
-
-    let local_variables = vec![
-        Variable {
-            name: "x".into(),
-            value: "10".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-        Variable {
-            name: "y".into(),
-            value: "4".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-        Variable {
-            name: "value".into(),
-            value: "42".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-        Variable {
-            name: "tester".into(),
-            value: "size=3".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-        Variable {
-            name: "caller".into(),
-            value: "<not available>".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-        Variable {
-            name: "result".into(),
-            value: "840".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-    ];
-    client.on_request::<Variables, _>({
-        let local_variables = Arc::new(local_variables.clone());
-        move |_, _| {
-            Ok(dap::VariablesResponse {
-                variables: (*local_variables).clone(),
-            })
-        }
-    });
-    client.on_request::<dap::requests::StackTrace, _>(move |_, _| {
-        Ok(dap::StackTraceResponse {
-            stack_frames: vec![stack_frame_for_line(26)],
-            total_frames: None,
-        })
-    });
-    client
-        .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-            reason: dap::StoppedEventReason::Pause,
-            description: None,
-            thread_id: Some(1),
-            preserve_focus_hint: None,
-            text: None,
-            all_threads_stopped: None,
-            hit_breakpoint_ids: None,
-        }))
-        .await;
-
-    cx.run_until_parked();
-
-    editor.update_in(cx, |editor, window, cx| {
-        pretty_assertions::assert_eq!(
-            r#"
-    static mut GLOBAL: usize = 1;
-
-    fn main() {
-        let x: 10 = 10;
-        let value: 42 = 42;
-        let y: 4 = 4;
-        let tester: size=3 = {
-            let y = 10;
-            let y = 5;
-            let b = 3;
-            vec![y, 20, 30]
-        };
-
-        let caller: <not available> = || {
-            let x = 3;
-            println!("x={}", x);
-        };
-
-        caller();
-
-        unsafe {
-            GLOBAL = 2;
-        }
-
-        let result: 840 = value: 42 * 2 * x: 10;
-        println!("Simple test executed: value={}, result={}", value: 42, result: 840);
-        assert!(true);
-    }
-    "#
-            .unindent(),
-            editor.snapshot(window, cx).text()
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_python_inline_values(executor: BackgroundExecutor, cx: &mut TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(executor.clone());
-    let source_code = r#"
-def process_data(untyped_param, typed_param: int, another_typed: str):
-    # Local variables
-    x = 10
-    result = typed_param * 2
-    text = "Hello, " + another_typed
-
-    # For loop with range
-    sum_value = 0
-    for i in range(5):
-        sum_value += i
-
-    # Final result
-    final_result = x + result + sum_value
-    return final_result
-"#
-    .unindent();
-    fs.insert_tree(path!("/project"), json!({ "main.py": source_code }))
-        .await;
-
-    let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
-    let workspace = init_test_workspace(&project, cx).await;
-    workspace
-        .update(cx, |workspace, window, cx| {
-            workspace.focus_panel::<DebugPanel>(window, cx);
-        })
-        .unwrap();
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-    let session = start_debug_session(&workspace, cx, |_| {}).unwrap();
-    let client = session.update(cx, |session, _| session.adapter_client().unwrap());
-
-    let project_path = Path::new(path!("/project"));
-    let worktree = project
-        .update(cx, |project, cx| project.find_worktree(project_path, cx))
-        .expect("This worktree should exist in project")
-        .0;
-
-    let worktree_id = workspace
-        .update(cx, |_, _, cx| worktree.read(cx).id())
-        .unwrap();
-
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_buffer((worktree_id, rel_path("main.py")), cx)
-        })
-        .await
-        .unwrap();
-
-    buffer.update(cx, |buffer, cx| {
-        buffer.set_language(Some(Arc::new(python_lang())), cx);
-    });
-
-    let (editor, cx) = cx.add_window_view(|window, cx| {
-        Editor::new(
-            EditorMode::full(),
-            MultiBuffer::build_from_buffer(buffer, cx),
-            Some(project),
-            window,
-            cx,
-        )
-    });
-
-    editor.update(cx, |editor, cx| editor.refresh_inline_values(cx));
-
-    client.on_request::<dap::requests::Threads, _>(move |_, _| {
-        Ok(dap::ThreadsResponse {
-            threads: vec![dap::Thread {
-                id: 1,
-                name: "Thread 1".into(),
-            }],
-        })
-    });
-
-    client.on_request::<dap::requests::StackTrace, _>(move |_, args| {
-        assert_eq!(args.thread_id, 1);
-        Ok(dap::StackTraceResponse {
-            stack_frames: vec![StackFrame {
-                id: 1,
-                name: "Stack Frame 1".into(),
-                source: Some(dap::Source {
-                    name: Some("main.py".into()),
-                    path: Some(path!("/project/main.py").into()),
-                    source_reference: None,
-                    presentation_hint: None,
-                    origin: None,
-                    sources: None,
-                    adapter_data: None,
-                    checksums: None,
-                }),
-                line: 12,
-                column: 1,
-                end_line: None,
-                end_column: None,
-                can_restart: None,
-                instruction_pointer_reference: None,
-                module_id: None,
-                presentation_hint: None,
-            }],
-            total_frames: None,
-        })
-    });
-
-    client.on_request::<dap::requests::Scopes, _>(move |_, _| {
-        Ok(dap::ScopesResponse {
-            scopes: vec![
-                Scope {
-                    name: "Local".into(),
-                    presentation_hint: None,
-                    variables_reference: 1,
-                    named_variables: None,
-                    indexed_variables: None,
-                    expensive: false,
-                    source: None,
-                    line: None,
-                    column: None,
-                    end_line: None,
-                    end_column: None,
-                },
-                Scope {
-                    name: "Global".into(),
-                    presentation_hint: None,
-                    variables_reference: 2,
-                    named_variables: None,
-                    indexed_variables: None,
-                    expensive: false,
-                    source: None,
-                    line: None,
-                    column: None,
-                    end_line: None,
-                    end_column: None,
-                },
-            ],
-        })
-    });
-
-    client.on_request::<Variables, _>(move |_, args| match args.variables_reference {
-        1 => Ok(dap::VariablesResponse {
-            variables: vec![
-                Variable {
-                    name: "untyped_param".into(),
-                    value: "test_value".into(),
-                    type_: Some("str".into()),
-                    presentation_hint: None,
-                    evaluate_name: None,
-                    variables_reference: 0,
-                    named_variables: None,
-                    indexed_variables: None,
-                    memory_reference: None,
-                    declaration_location_reference: None,
-                    value_location_reference: None,
-                },
-                Variable {
-                    name: "typed_param".into(),
-                    value: "42".into(),
-                    type_: Some("int".into()),
-                    presentation_hint: None,
-                    evaluate_name: None,
-                    variables_reference: 0,
-                    named_variables: None,
-                    indexed_variables: None,
-                    memory_reference: None,
-                    declaration_location_reference: None,
-                    value_location_reference: None,
-                },
-                Variable {
-                    name: "another_typed".into(),
-                    value: "world".into(),
-                    type_: Some("str".into()),
-                    presentation_hint: None,
-                    evaluate_name: None,
-                    variables_reference: 0,
-                    named_variables: None,
-                    indexed_variables: None,
-                    memory_reference: None,
-                    declaration_location_reference: None,
-                    value_location_reference: None,
-                },
-                Variable {
-                    name: "x".into(),
-                    value: "10".into(),
-                    type_: Some("int".into()),
-                    presentation_hint: None,
-                    evaluate_name: None,
-                    variables_reference: 0,
-                    named_variables: None,
-                    indexed_variables: None,
-                    memory_reference: None,
-                    declaration_location_reference: None,
-                    value_location_reference: None,
-                },
-                Variable {
-                    name: "result".into(),
-                    value: "84".into(),
-                    type_: Some("int".into()),
-                    presentation_hint: None,
-                    evaluate_name: None,
-                    variables_reference: 0,
-                    named_variables: None,
-                    indexed_variables: None,
-                    memory_reference: None,
-                    declaration_location_reference: None,
-                    value_location_reference: None,
-                },
-                Variable {
-                    name: "text".into(),
-                    value: "Hello, world".into(),
-                    type_: Some("str".into()),
-                    presentation_hint: None,
-                    evaluate_name: None,
-                    variables_reference: 0,
-                    named_variables: None,
-                    indexed_variables: None,
-                    memory_reference: None,
-                    declaration_location_reference: None,
-                    value_location_reference: None,
-                },
-                Variable {
-                    name: "sum_value".into(),
-                    value: "10".into(),
-                    type_: Some("int".into()),
-                    presentation_hint: None,
-                    evaluate_name: None,
-                    variables_reference: 0,
-                    named_variables: None,
-                    indexed_variables: None,
-                    memory_reference: None,
-                    declaration_location_reference: None,
-                    value_location_reference: None,
-                },
-                Variable {
-                    name: "i".into(),
-                    value: "4".into(),
-                    type_: Some("int".into()),
-                    presentation_hint: None,
-                    evaluate_name: None,
-                    variables_reference: 0,
-                    named_variables: None,
-                    indexed_variables: None,
-                    memory_reference: None,
-                    declaration_location_reference: None,
-                    value_location_reference: None,
-                },
-                Variable {
-                    name: "final_result".into(),
-                    value: "104".into(),
-                    type_: Some("int".into()),
-                    presentation_hint: None,
-                    evaluate_name: None,
-                    variables_reference: 0,
-                    named_variables: None,
-                    indexed_variables: None,
-                    memory_reference: None,
-                    declaration_location_reference: None,
-                    value_location_reference: None,
-                },
-            ],
-        }),
-        _ => Ok(dap::VariablesResponse { variables: vec![] }),
-    });
-
-    client
-        .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-            reason: dap::StoppedEventReason::Pause,
-            description: None,
-            thread_id: Some(1),
-            preserve_focus_hint: None,
-            text: None,
-            all_threads_stopped: None,
-            hit_breakpoint_ids: None,
-        }))
-        .await;
-
-    cx.run_until_parked();
-
-    editor.update_in(cx, |editor, window, cx| {
-        pretty_assertions::assert_eq!(
-            r#"
-        def process_data(untyped_param: test_value, typed_param: 42: int, another_typed: world: str):
-            # Local variables
-            x: 10 = 10
-            result: 84 = typed_param: 42 * 2
-            text: Hello, world = "Hello, " + another_typed: world
-
-            # For loop with range
-            sum_value: 10 = 0
-            for i: 4 in range(5):
-                sum_value += i
-
-            # Final result
-            final_result = x + result + sum_value
-            return final_result
-        "#
-            .unindent(),
-            editor.snapshot(window, cx).text()
-        );
-    });
-}
-
-fn python_lang() -> Language {
-    let debug_variables_query = include_str!("../../../languages/src/python/debugger.scm");
-    Language::new(
-        LanguageConfig {
-            name: "Python".into(),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["py".to_string()],
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-        Some(tree_sitter_python::LANGUAGE.into()),
-    )
-    .with_debug_variables_query(debug_variables_query)
-    .unwrap()
-}
-
-fn go_lang() -> Arc<Language> {
-    let debug_variables_query = include_str!("../../../languages/src/go/debugger.scm");
-    Arc::new(
-        Language::new(
-            LanguageConfig {
-                name: "Go".into(),
-                matcher: LanguageMatcher {
-                    path_suffixes: vec!["go".to_string()],
-                    ..Default::default()
-                },
-                ..Default::default()
-            },
-            Some(tree_sitter_go::LANGUAGE.into()),
-        )
-        .with_debug_variables_query(debug_variables_query)
-        .unwrap(),
-    )
-}
-
-/// Test utility function for inline values testing
-///
-/// # Arguments
-/// * `variables` - List of tuples containing (variable_name, variable_value)
-/// * `before` - Source code before inline values are applied
-/// * `after` - Expected source code after inline values are applied
-/// * `language` - Language configuration to use for parsing
-/// * `executor` - Background executor for async operations
-/// * `cx` - Test app context
-async fn test_inline_values_util(
-    local_variables: &[(&str, &str)],
-    global_variables: &[(&str, &str)],
-    before: &str,
-    after: &str,
-    active_debug_line: Option<usize>,
-    language: Arc<Language>,
-    executor: BackgroundExecutor,
-    cx: &mut TestAppContext,
-) {
-    init_test(cx);
-
-    let lines_count = before.lines().count();
-    let stop_line =
-        active_debug_line.unwrap_or_else(|| if lines_count > 6 { 6 } else { lines_count - 1 });
-
-    let fs = FakeFs::new(executor.clone());
-    fs.insert_tree(path!("/project"), json!({ "main.rs": before.to_string() }))
-        .await;
-
-    let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
-    let workspace = init_test_workspace(&project, cx).await;
-    workspace
-        .update(cx, |workspace, window, cx| {
-            workspace.focus_panel::<DebugPanel>(window, cx);
-        })
-        .unwrap();
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-    let session = start_debug_session(&workspace, cx, |_| {}).unwrap();
-    let client = session.update(cx, |session, _| session.adapter_client().unwrap());
-
-    client.on_request::<dap::requests::Threads, _>(|_, _| {
-        Ok(dap::ThreadsResponse {
-            threads: vec![dap::Thread {
-                id: 1,
-                name: "main".into(),
-            }],
-        })
-    });
-
-    client.on_request::<dap::requests::StackTrace, _>(move |_, _| {
-        Ok(dap::StackTraceResponse {
-            stack_frames: vec![dap::StackFrame {
-                id: 1,
-                name: "main".into(),
-                source: Some(dap::Source {
-                    name: Some("main.rs".into()),
-                    path: Some(path!("/project/main.rs").into()),
-                    source_reference: None,
-                    presentation_hint: None,
-                    origin: None,
-                    sources: None,
-                    adapter_data: None,
-                    checksums: None,
-                }),
-                line: stop_line as u64,
-                column: 1,
-                end_line: None,
-                end_column: None,
-                can_restart: None,
-                instruction_pointer_reference: None,
-                module_id: None,
-                presentation_hint: None,
-            }],
-            total_frames: None,
-        })
-    });
-
-    let local_vars: Vec<Variable> = local_variables
-        .iter()
-        .map(|(name, value)| Variable {
-            name: (*name).into(),
-            value: (*value).into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        })
-        .collect();
-
-    let global_vars: Vec<Variable> = global_variables
-        .iter()
-        .map(|(name, value)| Variable {
-            name: (*name).into(),
-            value: (*value).into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        })
-        .collect();
-
-    client.on_request::<Variables, _>({
-        let local_vars = Arc::new(local_vars.clone());
-        let global_vars = Arc::new(global_vars.clone());
-        move |_, args| {
-            let variables = match args.variables_reference {
-                2 => (*local_vars).clone(),
-                3 => (*global_vars).clone(),
-                _ => vec![],
-            };
-            Ok(dap::VariablesResponse { variables })
-        }
-    });
-
-    client.on_request::<dap::requests::Scopes, _>(move |_, _| {
-        Ok(dap::ScopesResponse {
-            scopes: vec![
-                Scope {
-                    name: "Local".into(),
-                    presentation_hint: None,
-                    variables_reference: 2,
-                    named_variables: None,
-                    indexed_variables: None,
-                    expensive: false,
-                    source: None,
-                    line: None,
-                    column: None,
-                    end_line: None,
-                    end_column: None,
-                },
-                Scope {
-                    name: "Global".into(),
-                    presentation_hint: None,
-                    variables_reference: 3,
-                    named_variables: None,
-                    indexed_variables: None,
-                    expensive: false,
-                    source: None,
-                    line: None,
-                    column: None,
-                    end_line: None,
-                    end_column: None,
-                },
-            ],
-        })
-    });
-
-    if !global_variables.is_empty() {
-        let global_evaluate_map: std::collections::HashMap<String, String> = global_variables
-            .iter()
-            .map(|(name, value)| (name.to_string(), value.to_string()))
-            .collect();
-
-        client.on_request::<dap::requests::Evaluate, _>(move |_, args| {
-            let value = global_evaluate_map
-                .get(&args.expression)
-                .unwrap_or(&"undefined".to_string())
-                .clone();
-
-            Ok(dap::EvaluateResponse {
-                result: value,
-                type_: None,
-                presentation_hint: None,
-                variables_reference: 0,
-                named_variables: None,
-                indexed_variables: None,
-                memory_reference: None,
-                value_location_reference: None,
-            })
-        });
-    }
-
-    client
-        .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-            reason: dap::StoppedEventReason::Pause,
-            description: None,
-            thread_id: Some(1),
-            preserve_focus_hint: None,
-            text: None,
-            all_threads_stopped: None,
-            hit_breakpoint_ids: None,
-        }))
-        .await;
-
-    cx.run_until_parked();
-
-    let project_path = Path::new(path!("/project"));
-    let worktree = project
-        .update(cx, |project, cx| project.find_worktree(project_path, cx))
-        .expect("This worktree should exist in project")
-        .0;
-
-    let worktree_id = workspace
-        .update(cx, |_, _, cx| worktree.read(cx).id())
-        .unwrap();
-
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_buffer((worktree_id, rel_path("main.rs")), cx)
-        })
-        .await
-        .unwrap();
-
-    buffer.update(cx, |buffer, cx| {
-        buffer.set_language(Some(language), cx);
-    });
-
-    let (editor, cx) = cx.add_window_view(|window, cx| {
-        Editor::new(
-            EditorMode::full(),
-            MultiBuffer::build_from_buffer(buffer, cx),
-            Some(project),
-            window,
-            cx,
-        )
-    });
-
-    active_debug_session_panel(workspace, cx).update_in(cx, |_, window, cx| {
-        cx.focus_self(window);
-    });
-    cx.run_until_parked();
-
-    editor.update(cx, |editor, cx| editor.refresh_inline_values(cx));
-
-    cx.run_until_parked();
-
-    editor.update_in(cx, |editor, window, cx| {
-        pretty_assertions::assert_eq!(after, editor.snapshot(window, cx).text());
-    });
-}
-
-#[gpui::test]
-async fn test_inline_values_example(executor: BackgroundExecutor, cx: &mut TestAppContext) {
-    let variables = [("x", "10"), ("y", "20"), ("result", "30")];
-
-    let before = r#"
-fn main() {
-    let x = 10;
-    let y = 20;
-    let result = x + y;
-    println!("Result: {}", result);
-}
-"#
-    .unindent();
-
-    let after = r#"
-fn main() {
-    let x: 10 = 10;
-    let y: 20 = 20;
-    let result: 30 = x: 10 + y: 20;
-    println!("Result: {}", result: 30);
-}
-"#
-    .unindent();
-
-    test_inline_values_util(
-        &variables,
-        &[],
-        &before,
-        &after,
-        None,
-        rust_lang(),
-        executor,
-        cx,
-    )
-    .await;
-}
-
-#[gpui::test]
-async fn test_inline_values_with_globals(executor: BackgroundExecutor, cx: &mut TestAppContext) {
-    let variables = [("x", "5"), ("y", "10")];
-
-    let before = r#"
-static mut GLOBAL_COUNTER: usize = 42;
-
-fn main() {
-    let x = 5;
-    let y = 10;
-    unsafe {
-        GLOBAL_COUNTER += 1;
-    }
-    println!("x={}, y={}, global={}", x, y, unsafe { GLOBAL_COUNTER });
-}
-"#
-    .unindent();
-
-    let after = r#"
-static mut GLOBAL_COUNTER: 42: usize = 42;
-
-fn main() {
-    let x: 5 = 5;
-    let y: 10 = 10;
-    unsafe {
-        GLOBAL_COUNTER += 1;
-    }
-    println!("x={}, y={}, global={}", x, y, unsafe { GLOBAL_COUNTER });
-}
-"#
-    .unindent();
-
-    test_inline_values_util(
-        &variables,
-        &[("GLOBAL_COUNTER", "42")],
-        &before,
-        &after,
-        None,
-        rust_lang(),
-        executor,
-        cx,
-    )
-    .await;
-}
-
-#[gpui::test]
-async fn test_go_inline_values(executor: BackgroundExecutor, cx: &mut TestAppContext) {
-    let variables = [("x", "42"), ("y", "hello")];
-
-    let before = r#"
-package main
-
-var globalCounter int = 100
-
-func main() {
-    x := 42
-    y := "hello"
-    z := x + 10
-    println(x, y, z)
-}
-"#
-    .unindent();
-
-    let after = r#"
-package main
-
-var globalCounter: 100 int = 100
-
-func main() {
-    x: 42 := 42
-    y := "hello"
-    z := x + 10
-    println(x, y, z)
-}
-"#
-    .unindent();
-
-    test_inline_values_util(
-        &variables,
-        &[("globalCounter", "100")],
-        &before,
-        &after,
-        None,
-        go_lang(),
-        executor,
-        cx,
-    )
-    .await;
-}
-
-#[gpui::test]
-async fn test_trim_multi_line_inline_value(executor: BackgroundExecutor, cx: &mut TestAppContext) {
-    let variables = [("y", "hello\n world")];
-
-    let before = r#"
-fn main() {
-    let y = "hello\n world";
-}
-"#
-    .unindent();
-
-    let after = r#"
-fn main() {
-    let y: hello… = "hello\n world";
-}
-"#
-    .unindent();
-
-    test_inline_values_util(
-        &variables,
-        &[],
-        &before,
-        &after,
-        None,
-        rust_lang(),
-        executor,
-        cx,
-    )
-    .await;
-}
-
-fn javascript_lang() -> Arc<Language> {
-    let debug_variables_query = include_str!("../../../languages/src/javascript/debugger.scm");
-    Arc::new(
-        Language::new(
-            LanguageConfig {
-                name: "JavaScript".into(),
-                matcher: LanguageMatcher {
-                    path_suffixes: vec!["js".to_string()],
-                    ..Default::default()
-                },
-                ..Default::default()
-            },
-            Some(tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into()),
-        )
-        .with_debug_variables_query(debug_variables_query)
-        .unwrap(),
-    )
-}
-
-fn typescript_lang() -> Arc<Language> {
-    let debug_variables_query = include_str!("../../../languages/src/typescript/debugger.scm");
-    Arc::new(
-        Language::new(
-            LanguageConfig {
-                name: "TypeScript".into(),
-                matcher: LanguageMatcher {
-                    path_suffixes: vec!["ts".to_string()],
-                    ..Default::default()
-                },
-                ..Default::default()
-            },
-            Some(tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into()),
-        )
-        .with_debug_variables_query(debug_variables_query)
-        .unwrap(),
-    )
-}
-
-fn tsx_lang() -> Arc<Language> {
-    let debug_variables_query = include_str!("../../../languages/src/tsx/debugger.scm");
-    Arc::new(
-        Language::new(
-            LanguageConfig {
-                name: "TSX".into(),
-                matcher: LanguageMatcher {
-                    path_suffixes: vec!["tsx".to_string()],
-                    ..Default::default()
-                },
-                ..Default::default()
-            },
-            Some(tree_sitter_typescript::LANGUAGE_TSX.into()),
-        )
-        .with_debug_variables_query(debug_variables_query)
-        .unwrap(),
-    )
-}
-
-#[gpui::test]
-async fn test_javascript_inline_values(executor: BackgroundExecutor, cx: &mut TestAppContext) {
-    let variables = [
-        ("x", "10"),
-        ("y", "20"),
-        ("sum", "30"),
-        ("message", "Hello"),
-    ];
-
-    let before = r#"
-function calculate() {
-    const x = 10;
-    const y = 20;
-    const sum = x + y;
-    const message = "Hello";
-    console.log(message, "Sum:", sum);
-}
-"#
-    .unindent();
-
-    let after = r#"
-function calculate() {
-    const x: 10 = 10;
-    const y: 20 = 20;
-    const sum: 30 = x: 10 + y: 20;
-    const message: Hello = "Hello";
-    console.log(message, "Sum:", sum);
-}
-"#
-    .unindent();
-
-    test_inline_values_util(
-        &variables,
-        &[],
-        &before,
-        &after,
-        None,
-        javascript_lang(),
-        executor,
-        cx,
-    )
-    .await;
-}
-
-#[gpui::test]
-async fn test_typescript_inline_values(executor: BackgroundExecutor, cx: &mut TestAppContext) {
-    let variables = [
-        ("count", "42"),
-        ("name", "Alice"),
-        ("result", "84"),
-        ("i", "3"),
-    ];
-
-    let before = r#"
-function processData(count: number, name: string): number {
-    let result = count * 2;
-    for (let i = 0; i < 5; i++) {
-        console.log(i);
-    }
-    return result;
-}
-"#
-    .unindent();
-
-    let after = r#"
-function processData(count: number, name: string): number {
-    let result: 84 = count: 42 * 2;
-    for (let i: 3 = 0; i: 3 < 5; i: 3++) {
-        console.log(i);
-    }
-    return result: 84;
-}
-"#
-    .unindent();
-
-    test_inline_values_util(
-        &variables,
-        &[],
-        &before,
-        &after,
-        None,
-        typescript_lang(),
-        executor,
-        cx,
-    )
-    .await;
-}
-
-#[gpui::test]
-async fn test_tsx_inline_values(executor: BackgroundExecutor, cx: &mut TestAppContext) {
-    let variables = [("count", "5"), ("message", "Hello React")];
-
-    let before = r#"
-const Counter = () => {
-    const count = 5;
-    const message = "Hello React";
-    return (
-        <div>
-            <p>{message}</p>
-            <span>{count}</span>
-        </div>
-    );
-};
-"#
-    .unindent();
-
-    let after = r#"
-const Counter = () => {
-    const count: 5 = 5;
-    const message: Hello React = "Hello React";
-    return (
-        <div>
-            <p>{message: Hello React}</p>
-            <span>{count}</span>
-        </div>
-    );
-};
-"#
-    .unindent();
-
-    test_inline_values_util(
-        &variables,
-        &[],
-        &before,
-        &after,
-        None,
-        tsx_lang(),
-        executor,
-        cx,
-    )
-    .await;
-}
-
-#[gpui::test]
-async fn test_javascript_arrow_functions(executor: BackgroundExecutor, cx: &mut TestAppContext) {
-    let variables = [("x", "42"), ("result", "84")];
-
-    let before = r#"
-const double = (x) => {
-    const result = x * 2;
-    return result;
-};
-"#
-    .unindent();
-
-    let after = r#"
-const double = (x) => {
-    const result: 84 = x: 42 * 2;
-    return result: 84;
-};
-"#
-    .unindent();
-
-    test_inline_values_util(
-        &variables,
-        &[],
-        &before,
-        &after,
-        None,
-        javascript_lang(),
-        executor,
-        cx,
-    )
-    .await;
-}
-
-#[gpui::test]
-async fn test_typescript_for_in_loop(executor: BackgroundExecutor, cx: &mut TestAppContext) {
-    let variables = [("key", "name"), ("obj", "{name: 'test'}")];
-
-    let before = r#"
-function iterate() {
-    const obj = {name: 'test'};
-    for (const key in obj) {
-        console.log(key);
-    }
-}
-"#
-    .unindent();
-
-    let after = r#"
-function iterate() {
-    const obj: {name: 'test'} = {name: 'test'};
-    for (const key: name in obj) {
-        console.log(key);
-    }
-}
-"#
-    .unindent();
-
-    test_inline_values_util(
-        &variables,
-        &[],
-        &before,
-        &after,
-        None,
-        typescript_lang(),
-        executor,
-        cx,
-    )
-    .await;
-}
diff --git a/crates/debugger_ui/src/tests/module_list.rs b/crates/debugger_ui/src/tests/module_list.rs
deleted file mode 100644
index 09c90cbc4a..0000000000
--- a/crates/debugger_ui/src/tests/module_list.rs
+++ /dev/null
@@ -1,216 +0,0 @@
-use crate::{
-    debugger_panel::DebugPanel,
-    persistence::DebuggerPaneItem,
-    tests::{active_debug_session_panel, init_test, init_test_workspace, start_debug_session},
-};
-use dap::{
-    StoppedEvent,
-    requests::{Initialize, Modules},
-};
-use gpui::{BackgroundExecutor, TestAppContext, VisualTestContext};
-use project::{FakeFs, Project};
-use std::sync::{
-    Arc,
-    atomic::{AtomicBool, AtomicI32, Ordering},
-};
-use util::path;
-
-#[gpui::test]
-async fn test_module_list(executor: BackgroundExecutor, cx: &mut TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(executor.clone());
-
-    let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
-    let workspace = init_test_workspace(&project, cx).await;
-    workspace
-        .update(cx, |workspace, window, cx| {
-            workspace.focus_panel::<DebugPanel>(window, cx);
-        })
-        .unwrap();
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-    let session = start_debug_session(&workspace, cx, |client| {
-        client.on_request::<Initialize, _>(move |_, _| {
-            Ok(dap::Capabilities {
-                supports_modules_request: Some(true),
-                ..Default::default()
-            })
-        });
-    })
-    .unwrap();
-
-    let client = session.update(cx, |session, _| session.adapter_client().unwrap());
-
-    let called_modules = Arc::new(AtomicBool::new(false));
-    let modules = vec![
-        dap::Module {
-            id: dap::ModuleId::Number(1),
-            name: "First Module".into(),
-            address_range: None,
-            date_time_stamp: None,
-            path: None,
-            symbol_file_path: None,
-            symbol_status: None,
-            version: None,
-            is_optimized: None,
-            is_user_code: None,
-        },
-        dap::Module {
-            id: dap::ModuleId::Number(2),
-            name: "Second Module".into(),
-            address_range: None,
-            date_time_stamp: None,
-            path: None,
-            symbol_file_path: None,
-            symbol_status: None,
-            version: None,
-            is_optimized: None,
-            is_user_code: None,
-        },
-    ];
-
-    client.on_request::<Modules, _>({
-        let called_modules = called_modules.clone();
-        let modules_request_count = AtomicI32::new(0);
-        let modules = modules.clone();
-        move |_, _| {
-            modules_request_count.fetch_add(1, Ordering::SeqCst);
-            assert_eq!(
-                1,
-                modules_request_count.load(Ordering::SeqCst),
-                "This request should only be called once from the host"
-            );
-            called_modules.store(true, Ordering::SeqCst);
-
-            Ok(dap::ModulesResponse {
-                modules: modules.clone(),
-                total_modules: Some(2u64),
-            })
-        }
-    });
-
-    client
-        .fake_event(dap::messages::Events::Stopped(StoppedEvent {
-            reason: dap::StoppedEventReason::Pause,
-            description: None,
-            thread_id: Some(1),
-            preserve_focus_hint: None,
-            text: None,
-            all_threads_stopped: None,
-            hit_breakpoint_ids: None,
-        }))
-        .await;
-
-    cx.run_until_parked();
-
-    let running_state =
-        active_debug_session_panel(workspace, cx).update_in(cx, |item, window, cx| {
-            cx.focus_self(window);
-            item.running_state().clone()
-        });
-
-    running_state.update_in(cx, |this, window, cx| {
-        this.activate_item(DebuggerPaneItem::Modules, window, cx);
-        cx.refresh_windows();
-    });
-
-    cx.run_until_parked();
-
-    assert!(
-        called_modules.load(std::sync::atomic::Ordering::SeqCst),
-        "Request Modules should be called because a user clicked on the module list"
-    );
-
-    active_debug_session_panel(workspace, cx).update(cx, |_, cx| {
-        let actual_modules = running_state.update(cx, |state, cx| {
-            state.module_list().update(cx, |list, cx| list.modules(cx))
-        });
-
-        assert_eq!(modules, actual_modules);
-    });
-
-    // Test all module events now
-    // New Module
-    // Changed
-    // Removed
-
-    let new_module = dap::Module {
-        id: dap::ModuleId::Number(3),
-        name: "Third Module".into(),
-        address_range: None,
-        date_time_stamp: None,
-        path: None,
-        symbol_file_path: None,
-        symbol_status: None,
-        version: None,
-        is_optimized: None,
-        is_user_code: None,
-    };
-
-    client
-        .fake_event(dap::messages::Events::Module(dap::ModuleEvent {
-            reason: dap::ModuleEventReason::New,
-            module: new_module.clone(),
-        }))
-        .await;
-
-    cx.run_until_parked();
-
-    active_debug_session_panel(workspace, cx).update(cx, |_, cx| {
-        let actual_modules = running_state.update(cx, |state, cx| {
-            state.module_list().update(cx, |list, cx| list.modules(cx))
-        });
-        assert_eq!(actual_modules.len(), 3);
-        assert!(actual_modules.contains(&new_module));
-    });
-
-    let changed_module = dap::Module {
-        id: dap::ModuleId::Number(2),
-        name: "Modified Second Module".into(),
-        address_range: None,
-        date_time_stamp: None,
-        path: None,
-        symbol_file_path: None,
-        symbol_status: None,
-        version: None,
-        is_optimized: None,
-        is_user_code: None,
-    };
-
-    client
-        .fake_event(dap::messages::Events::Module(dap::ModuleEvent {
-            reason: dap::ModuleEventReason::Changed,
-            module: changed_module.clone(),
-        }))
-        .await;
-
-    cx.run_until_parked();
-
-    active_debug_session_panel(workspace, cx).update(cx, |_, cx| {
-        let actual_modules = running_state.update(cx, |state, cx| {
-            state.module_list().update(cx, |list, cx| list.modules(cx))
-        });
-
-        assert_eq!(actual_modules.len(), 3);
-        assert!(actual_modules.contains(&changed_module));
-    });
-
-    client
-        .fake_event(dap::messages::Events::Module(dap::ModuleEvent {
-            reason: dap::ModuleEventReason::Removed,
-            module: changed_module.clone(),
-        }))
-        .await;
-
-    cx.run_until_parked();
-
-    active_debug_session_panel(workspace, cx).update(cx, |_, cx| {
-        let actual_modules = running_state.update(cx, |state, cx| {
-            state.module_list().update(cx, |list, cx| list.modules(cx))
-        });
-
-        assert_eq!(actual_modules.len(), 2);
-        assert!(!actual_modules.contains(&changed_module));
-    });
-}
diff --git a/crates/debugger_ui/src/tests/new_process_modal.rs b/crates/debugger_ui/src/tests/new_process_modal.rs
deleted file mode 100644
index 2f470560d5..0000000000
--- a/crates/debugger_ui/src/tests/new_process_modal.rs
+++ /dev/null
@@ -1,437 +0,0 @@
-use dap::DapRegistry;
-use editor::Editor;
-use gpui::{BackgroundExecutor, TestAppContext, VisualTestContext};
-use project::{FakeFs, Fs as _, Project};
-use serde_json::json;
-use std::sync::Arc;
-use std::sync::atomic::{AtomicBool, Ordering};
-use task::{DebugRequest, DebugScenario, LaunchRequest, TaskContext, VariableName, ZedDebugConfig};
-use text::Point;
-use util::path;
-
-use crate::NewProcessMode;
-use crate::new_process_modal::NewProcessModal;
-use crate::tests::{init_test, init_test_workspace};
-
-#[gpui::test]
-async fn test_debug_session_substitutes_variables_and_relativizes_paths(
-    executor: BackgroundExecutor,
-    cx: &mut TestAppContext,
-) {
-    init_test(cx);
-
-    let fs = FakeFs::new(executor.clone());
-    fs.insert_tree(
-        path!("/project"),
-        json!({
-            "main.rs": "fn main() {}"
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
-    let workspace = init_test_workspace(&project, cx).await;
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-    let test_variables = vec![(
-        VariableName::WorktreeRoot,
-        path!("/test/worktree/path").to_string(),
-    )]
-    .into_iter()
-    .collect();
-
-    let task_context = TaskContext {
-        cwd: None,
-        task_variables: test_variables,
-        project_env: Default::default(),
-    };
-
-    let home_dir = paths::home_dir();
-
-    let test_cases: Vec<(&'static str, &'static str)> = vec![
-        // Absolute path - should not be relativized
-        (
-            path!("/absolute/path/to/program"),
-            path!("/absolute/path/to/program"),
-        ),
-        // Relative path - should be prefixed with worktree root
-        (
-            format!(".{0}src{0}program", std::path::MAIN_SEPARATOR).leak(),
-            path!("/test/worktree/path/src/program"),
-        ),
-        // Home directory path - should be expanded to full home directory path
-        (
-            format!("~{0}src{0}program", std::path::MAIN_SEPARATOR).leak(),
-            home_dir
-                .join("src")
-                .join("program")
-                .to_string_lossy()
-                .to_string()
-                .leak(),
-        ),
-        // Path with $ZED_WORKTREE_ROOT - should be substituted without double appending
-        (
-            format!(
-                "$ZED_WORKTREE_ROOT{0}src{0}program",
-                std::path::MAIN_SEPARATOR
-            )
-            .leak(),
-            path!("/test/worktree/path/src/program"),
-        ),
-    ];
-
-    let called_launch = Arc::new(AtomicBool::new(false));
-
-    for (input_path, expected_path) in test_cases {
-        let _subscription = project::debugger::test::intercept_debug_sessions(cx, {
-            let called_launch = called_launch.clone();
-            move |client| {
-                client.on_request::<dap::requests::Launch, _>({
-                    let called_launch = called_launch.clone();
-
-                    move |_, args| {
-                        let config = args.raw.as_object().unwrap();
-
-                        assert_eq!(
-                            config["program"].as_str().unwrap(),
-                            expected_path,
-                            "Program path was not correctly substituted for input: {}",
-                            input_path
-                        );
-
-                        assert_eq!(
-                            config["cwd"].as_str().unwrap(),
-                            expected_path,
-                            "CWD path was not correctly substituted for input: {}",
-                            input_path
-                        );
-
-                        let expected_other_field = if input_path.contains("$ZED_WORKTREE_ROOT") {
-                            input_path.replace("$ZED_WORKTREE_ROOT", path!("/test/worktree/path"))
-                        } else {
-                            input_path.to_string()
-                        };
-
-                        assert_eq!(
-                            config["otherField"].as_str().unwrap(),
-                            &expected_other_field,
-                            "Other field was incorrectly modified for input: {}",
-                            input_path
-                        );
-
-                        called_launch.store(true, Ordering::SeqCst);
-
-                        Ok(())
-                    }
-                });
-            }
-        });
-
-        let scenario = DebugScenario {
-            adapter: "fake-adapter".into(),
-            label: "test-debug-session".into(),
-            build: None,
-            config: json!({
-                "request": "launch",
-                "program": input_path,
-                "cwd": input_path,
-                "otherField": input_path
-            }),
-            tcp_connection: None,
-        };
-
-        workspace
-            .update(cx, |workspace, window, cx| {
-                workspace.start_debug_session(
-                    scenario,
-                    task_context.clone(),
-                    None,
-                    None,
-                    window,
-                    cx,
-                )
-            })
-            .unwrap();
-
-        cx.run_until_parked();
-
-        assert!(called_launch.load(Ordering::SeqCst));
-        called_launch.store(false, Ordering::SeqCst);
-    }
-}
-
-#[gpui::test]
-async fn test_save_debug_scenario_to_file(executor: BackgroundExecutor, cx: &mut TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(executor.clone());
-    fs.insert_tree(
-        path!("/project"),
-        json!({
-            "main.rs": "fn main() {}"
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
-    let workspace = init_test_workspace(&project, cx).await;
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-    workspace
-        .update(cx, |workspace, window, cx| {
-            NewProcessModal::show(workspace, window, NewProcessMode::Debug, None, cx);
-        })
-        .unwrap();
-
-    cx.run_until_parked();
-
-    let modal = workspace
-        .update(cx, |workspace, _, cx| {
-            workspace.active_modal::<NewProcessModal>(cx)
-        })
-        .unwrap()
-        .expect("Modal should be active");
-
-    modal.update_in(cx, |modal, window, cx| {
-        modal.set_configure("/project/main", "/project", false, window, cx);
-        modal.save_debug_scenario(window, cx);
-    });
-
-    cx.executor().run_until_parked();
-
-    let editor = workspace
-        .update(cx, |workspace, _window, cx| {
-            workspace.active_item_as::<Editor>(cx).unwrap()
-        })
-        .unwrap();
-
-    let debug_json_content = fs
-        .load(path!("/project/.zed/debug.json").as_ref())
-        .await
-        .expect("debug.json should exist")
-        .lines()
-        .filter(|line| !line.starts_with("//"))
-        .collect::<Vec<_>>()
-        .join("\n");
-
-    let expected_content = indoc::indoc! {r#"
-        [
-          {
-            "adapter": "fake-adapter",
-            "label": "main (fake-adapter)",
-            "request": "launch",
-            "program": "/project/main",
-            "cwd": "/project",
-            "args": [],
-            "env": {}
-          }
-        ]"#};
-
-    pretty_assertions::assert_eq!(expected_content, debug_json_content);
-
-    editor.update(cx, |editor, cx| {
-        assert_eq!(
-            editor
-                .selections
-                .newest::<Point>(&editor.display_snapshot(cx))
-                .head(),
-            Point::new(5, 2)
-        )
-    });
-
-    modal.update_in(cx, |modal, window, cx| {
-        modal.set_configure("/project/other", "/project", true, window, cx);
-        modal.save_debug_scenario(window, cx);
-    });
-
-    cx.executor().run_until_parked();
-
-    let expected_content = indoc::indoc! {r#"
-        [
-          {
-            "adapter": "fake-adapter",
-            "label": "main (fake-adapter)",
-            "request": "launch",
-            "program": "/project/main",
-            "cwd": "/project",
-            "args": [],
-            "env": {}
-          },
-          {
-            "adapter": "fake-adapter",
-            "label": "other (fake-adapter)",
-            "request": "launch",
-            "program": "/project/other",
-            "cwd": "/project",
-            "args": [],
-            "env": {}
-          }
-        ]"#};
-
-    let debug_json_content = fs
-        .load(path!("/project/.zed/debug.json").as_ref())
-        .await
-        .expect("debug.json should exist")
-        .lines()
-        .filter(|line| !line.starts_with("//"))
-        .collect::<Vec<_>>()
-        .join("\n");
-    pretty_assertions::assert_eq!(expected_content, debug_json_content);
-}
-
-#[gpui::test]
-async fn test_debug_modal_subtitles_with_multiple_worktrees(
-    executor: BackgroundExecutor,
-    cx: &mut TestAppContext,
-) {
-    init_test(cx);
-
-    let fs = FakeFs::new(executor.clone());
-
-    fs.insert_tree(
-        path!("/workspace1"),
-        json!({
-            ".zed": {
-                "debug.json": r#"[
-                    {
-                        "adapter": "fake-adapter",
-                        "label": "Debug App 1",
-                        "request": "launch",
-                        "program": "./app1",
-                        "cwd": "."
-                    },
-                    {
-                        "adapter": "fake-adapter",
-                        "label": "Debug Tests 1",
-                        "request": "launch",
-                        "program": "./test1",
-                        "cwd": "."
-                    }
-                ]"#
-            },
-            "main.rs": "fn main() {}"
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), [path!("/workspace1").as_ref()], cx).await;
-
-    let workspace = init_test_workspace(&project, cx).await;
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-    workspace
-        .update(cx, |workspace, window, cx| {
-            NewProcessModal::show(workspace, window, NewProcessMode::Debug, None, cx);
-        })
-        .unwrap();
-
-    cx.run_until_parked();
-
-    let modal = workspace
-        .update(cx, |workspace, _, cx| {
-            workspace.active_modal::<NewProcessModal>(cx)
-        })
-        .unwrap()
-        .expect("Modal should be active");
-
-    cx.executor().run_until_parked();
-
-    let subtitles = modal.update_in(cx, |modal, _, cx| {
-        modal.debug_picker_candidate_subtitles(cx)
-    });
-
-    assert_eq!(
-        subtitles.as_slice(),
-        [path!(".zed/debug.json"), path!(".zed/debug.json")]
-    );
-}
-
-#[gpui::test]
-async fn test_dap_adapter_config_conversion_and_validation(cx: &mut TestAppContext) {
-    init_test(cx);
-
-    let mut expected_adapters = vec![
-        "CodeLLDB",
-        "Debugpy",
-        "JavaScript",
-        "Delve",
-        "GDB",
-        "fake-adapter",
-    ];
-
-    let adapter_names = cx.update(|cx| {
-        let registry = DapRegistry::global(cx);
-        registry.enumerate_adapters::<Vec<_>>()
-    });
-
-    let zed_config = ZedDebugConfig {
-        label: "test_debug_session".into(),
-        adapter: "test_adapter".into(),
-        request: DebugRequest::Launch(LaunchRequest {
-            program: "test_program".into(),
-            cwd: None,
-            args: vec![],
-            env: Default::default(),
-        }),
-        stop_on_entry: Some(true),
-    };
-
-    for adapter_name in adapter_names {
-        let adapter_str = adapter_name.to_string();
-        if let Some(pos) = expected_adapters.iter().position(|&x| x == adapter_str) {
-            expected_adapters.remove(pos);
-        }
-
-        let adapter = cx
-            .update(|cx| {
-                let registry = DapRegistry::global(cx);
-                registry.adapter(adapter_name.as_ref())
-            })
-            .unwrap_or_else(|| panic!("Adapter {} should exist", adapter_name));
-
-        let mut adapter_specific_config = zed_config.clone();
-        adapter_specific_config.adapter = adapter_name.to_string().into();
-
-        let debug_scenario = adapter
-            .config_from_zed_format(adapter_specific_config)
-            .await
-            .unwrap_or_else(|_| {
-                panic!(
-                    "Adapter {} should successfully convert from Zed format",
-                    adapter_name
-                )
-            });
-
-        assert!(
-            debug_scenario.config.is_object(),
-            "Adapter {} should produce a JSON object for config",
-            adapter_name
-        );
-
-        let request_type = adapter
-            .request_kind(&debug_scenario.config)
-            .await
-            .unwrap_or_else(|_| {
-                panic!(
-                    "Adapter {} should validate the config successfully",
-                    adapter_name
-                )
-            });
-
-        match request_type {
-            dap::StartDebuggingRequestArgumentsRequest::Launch => {}
-            dap::StartDebuggingRequestArgumentsRequest::Attach => {
-                panic!(
-                    "Expected Launch request but got Attach for adapter {}",
-                    adapter_name
-                );
-            }
-        }
-    }
-
-    assert!(
-        expected_adapters.is_empty(),
-        "The following expected adapters were not found in the registry: {:?}",
-        expected_adapters
-    );
-}
diff --git a/crates/debugger_ui/src/tests/persistence.rs b/crates/debugger_ui/src/tests/persistence.rs
deleted file mode 100644
index f5fb4f0ab2..0000000000
--- a/crates/debugger_ui/src/tests/persistence.rs
+++ /dev/null
@@ -1,131 +0,0 @@
-use std::iter::zip;
-
-use crate::{
-    debugger_panel::DebugPanel,
-    persistence::SerializedPaneLayout,
-    tests::{init_test, init_test_workspace, start_debug_session},
-};
-use dap::{StoppedEvent, StoppedEventReason, messages::Events};
-use gpui::{BackgroundExecutor, TestAppContext, VisualTestContext};
-use project::{FakeFs, Project};
-use serde_json::json;
-use util::path;
-use workspace::{Panel, dock::DockPosition};
-
-#[gpui::test]
-async fn test_invert_axis_on_panel_position_change(
-    executor: BackgroundExecutor,
-    cx: &mut TestAppContext,
-) {
-    init_test(cx);
-
-    let fs = FakeFs::new(executor.clone());
-    fs.insert_tree(
-        path!("/project"),
-        json!({
-            "main.rs": "fn main() {\n    println!(\"Hello, world!\");\n}",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
-    let workspace = init_test_workspace(&project, cx).await;
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-    // Start a debug session
-    let session = start_debug_session(&workspace, cx, |_| {}).unwrap();
-    let client = session.update(cx, |session, _| session.adapter_client().unwrap());
-
-    // Setup thread response
-    client.on_request::<dap::requests::Threads, _>(move |_, _| {
-        Ok(dap::ThreadsResponse { threads: vec![] })
-    });
-
-    cx.run_until_parked();
-
-    client
-        .fake_event(Events::Stopped(StoppedEvent {
-            reason: StoppedEventReason::Pause,
-            description: None,
-            thread_id: Some(1),
-            preserve_focus_hint: None,
-            text: None,
-            all_threads_stopped: None,
-            hit_breakpoint_ids: None,
-        }))
-        .await;
-
-    cx.run_until_parked();
-
-    let (debug_panel, dock_position) = workspace
-        .update(cx, |workspace, window, cx| {
-            let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap();
-            let dock_position = debug_panel.read(cx).position(window, cx);
-            (debug_panel, dock_position)
-        })
-        .unwrap();
-
-    assert_eq!(
-        dock_position,
-        DockPosition::Bottom,
-        "Default dock position should be bottom for debug panel"
-    );
-
-    let pre_serialized_layout = debug_panel
-        .read_with(cx, |panel, cx| {
-            panel
-                .active_session()
-                .unwrap()
-                .read(cx)
-                .running_state()
-                .read(cx)
-                .serialized_layout(cx)
-        })
-        .panes;
-
-    let post_serialized_layout = debug_panel
-        .update_in(cx, |panel, window, cx| {
-            panel.set_position(DockPosition::Right, window, cx);
-
-            panel
-                .active_session()
-                .unwrap()
-                .read(cx)
-                .running_state()
-                .read(cx)
-                .serialized_layout(cx)
-        })
-        .panes;
-
-    let pre_panes = pre_serialized_layout.in_order();
-    let post_panes = post_serialized_layout.in_order();
-
-    assert_eq!(pre_panes.len(), post_panes.len());
-
-    for (pre, post) in zip(pre_panes, post_panes) {
-        match (pre, post) {
-            (
-                SerializedPaneLayout::Group {
-                    axis: pre_axis,
-                    flexes: pre_flexes,
-                    children: _,
-                },
-                SerializedPaneLayout::Group {
-                    axis: post_axis,
-                    flexes: post_flexes,
-                    children: _,
-                },
-            ) => {
-                assert_ne!(pre_axis, post_axis);
-                assert_eq!(pre_flexes, post_flexes);
-            }
-            (SerializedPaneLayout::Pane(pre_pane), SerializedPaneLayout::Pane(post_pane)) => {
-                assert_eq!(pre_pane.children, post_pane.children);
-                assert_eq!(pre_pane.active_item, post_pane.active_item);
-            }
-            _ => {
-                panic!("Variants don't match")
-            }
-        }
-    }
-}
diff --git a/crates/debugger_ui/src/tests/stack_frame_list.rs b/crates/debugger_ui/src/tests/stack_frame_list.rs
deleted file mode 100644
index 445d5a01d9..0000000000
--- a/crates/debugger_ui/src/tests/stack_frame_list.rs
+++ /dev/null
@@ -1,1267 +0,0 @@
-use crate::{
-    debugger_panel::DebugPanel,
-    session::running::stack_frame_list::{
-        StackFrameEntry, StackFrameFilter, stack_frame_filter_key,
-    },
-    tests::{active_debug_session_panel, init_test, init_test_workspace, start_debug_session},
-};
-use dap::{
-    StackFrame,
-    requests::{Scopes, StackTrace, Threads},
-};
-use db::kvp::KEY_VALUE_STORE;
-use editor::{Editor, ToPoint as _};
-use gpui::{BackgroundExecutor, TestAppContext, VisualTestContext};
-use project::{FakeFs, Project};
-use serde_json::json;
-use std::sync::Arc;
-use unindent::Unindent as _;
-use util::{path, rel_path::rel_path};
-
-#[gpui::test]
-async fn test_fetch_initial_stack_frames_and_go_to_stack_frame(
-    executor: BackgroundExecutor,
-    cx: &mut TestAppContext,
-) {
-    init_test(cx);
-
-    let fs = FakeFs::new(executor.clone());
-
-    let test_file_content = r#"
-        import { SOME_VALUE } './module.js';
-
-        console.log(SOME_VALUE);
-    "#
-    .unindent();
-
-    let module_file_content = r#"
-        export SOME_VALUE = 'some value';
-    "#
-    .unindent();
-
-    fs.insert_tree(
-        path!("/project"),
-        json!({
-           "src": {
-               "test.js": test_file_content,
-               "module.js": module_file_content,
-           }
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
-    let workspace = init_test_workspace(&project, cx).await;
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let session = start_debug_session(&workspace, cx, |_| {}).unwrap();
-    let client = session.update(cx, |session, _| session.adapter_client().unwrap());
-    client.on_request::<Scopes, _>(move |_, _| Ok(dap::ScopesResponse { scopes: vec![] }));
-
-    client.on_request::<Threads, _>(move |_, _| {
-        Ok(dap::ThreadsResponse {
-            threads: vec![dap::Thread {
-                id: 1,
-                name: "Thread 1".into(),
-            }],
-        })
-    });
-
-    let stack_frames = vec![
-        StackFrame {
-            id: 1,
-            name: "Stack Frame 1".into(),
-            source: Some(dap::Source {
-                name: Some("test.js".into()),
-                path: Some(path!("/project/src/test.js").into()),
-                source_reference: None,
-                presentation_hint: None,
-                origin: None,
-                sources: None,
-                adapter_data: None,
-                checksums: None,
-            }),
-            line: 3,
-            column: 1,
-            end_line: None,
-            end_column: None,
-            can_restart: None,
-            instruction_pointer_reference: None,
-            module_id: None,
-            presentation_hint: None,
-        },
-        StackFrame {
-            id: 2,
-            name: "Stack Frame 2".into(),
-            source: Some(dap::Source {
-                name: Some("module.js".into()),
-                path: Some(path!("/project/src/module.js").into()),
-                source_reference: None,
-                presentation_hint: None,
-                origin: None,
-                sources: None,
-                adapter_data: None,
-                checksums: None,
-            }),
-            line: 1,
-            column: 1,
-            end_line: None,
-            end_column: None,
-            can_restart: None,
-            instruction_pointer_reference: None,
-            module_id: None,
-            presentation_hint: None,
-        },
-    ];
-
-    client.on_request::<StackTrace, _>({
-        let stack_frames = Arc::new(stack_frames.clone());
-        move |_, args| {
-            assert_eq!(1, args.thread_id);
-
-            Ok(dap::StackTraceResponse {
-                stack_frames: (*stack_frames).clone(),
-                total_frames: None,
-            })
-        }
-    });
-
-    client
-        .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-            reason: dap::StoppedEventReason::Pause,
-            description: None,
-            thread_id: Some(1),
-            preserve_focus_hint: None,
-            text: None,
-            all_threads_stopped: None,
-            hit_breakpoint_ids: None,
-        }))
-        .await;
-
-    cx.run_until_parked();
-
-    // trigger to load threads
-    active_debug_session_panel(workspace, cx).update(cx, |session, cx| {
-        session.running_state().update(cx, |running_state, cx| {
-            running_state
-                .session()
-                .update(cx, |session, cx| session.threads(cx));
-        });
-    });
-
-    cx.run_until_parked();
-
-    // select first thread
-    active_debug_session_panel(workspace, cx).update_in(cx, |session, window, cx| {
-        session.running_state().update(cx, |running_state, cx| {
-            running_state.select_current_thread(
-                &running_state
-                    .session()
-                    .update(cx, |session, cx| session.threads(cx)),
-                window,
-                cx,
-            );
-        });
-    });
-
-    cx.run_until_parked();
-
-    active_debug_session_panel(workspace, cx).update(cx, |session, cx| {
-        let stack_frame_list = session
-            .running_state()
-            .update(cx, |state, _| state.stack_frame_list().clone());
-
-        stack_frame_list.update(cx, |stack_frame_list, cx| {
-            assert_eq!(Some(1), stack_frame_list.opened_stack_frame_id());
-            assert_eq!(stack_frames, stack_frame_list.dap_stack_frames(cx));
-        });
-    });
-}
-
-#[gpui::test]
-async fn test_select_stack_frame(executor: BackgroundExecutor, cx: &mut TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(executor.clone());
-
-    let test_file_content = r#"
-        import { SOME_VALUE } './module.js';
-
-        console.log(SOME_VALUE);
-    "#
-    .unindent();
-
-    let module_file_content = r#"
-        export SOME_VALUE = 'some value';
-    "#
-    .unindent();
-
-    fs.insert_tree(
-        path!("/project"),
-        json!({
-           "src": {
-               "test.js": test_file_content,
-               "module.js": module_file_content,
-           }
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
-    let workspace = init_test_workspace(&project, cx).await;
-    let _ = workspace.update(cx, |workspace, window, cx| {
-        workspace.toggle_dock(workspace::dock::DockPosition::Bottom, window, cx);
-    });
-
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let session = start_debug_session(&workspace, cx, |_| {}).unwrap();
-    let client = session.update(cx, |session, _| session.adapter_client().unwrap());
-
-    client.on_request::<Threads, _>(move |_, _| {
-        Ok(dap::ThreadsResponse {
-            threads: vec![dap::Thread {
-                id: 1,
-                name: "Thread 1".into(),
-            }],
-        })
-    });
-
-    client.on_request::<Scopes, _>(move |_, _| Ok(dap::ScopesResponse { scopes: vec![] }));
-
-    let stack_frames = vec![
-        StackFrame {
-            id: 1,
-            name: "Stack Frame 1".into(),
-            source: Some(dap::Source {
-                name: Some("test.js".into()),
-                path: Some(path!("/project/src/test.js").into()),
-                source_reference: None,
-                presentation_hint: None,
-                origin: None,
-                sources: None,
-                adapter_data: None,
-                checksums: None,
-            }),
-            line: 3,
-            column: 1,
-            end_line: None,
-            end_column: None,
-            can_restart: None,
-            instruction_pointer_reference: None,
-            module_id: None,
-            presentation_hint: None,
-        },
-        StackFrame {
-            id: 2,
-            name: "Stack Frame 2".into(),
-            source: Some(dap::Source {
-                name: Some("module.js".into()),
-                path: Some(path!("/project/src/module.js").into()),
-                source_reference: None,
-                presentation_hint: None,
-                origin: None,
-                sources: None,
-                adapter_data: None,
-                checksums: None,
-            }),
-            line: 1,
-            column: 1,
-            end_line: None,
-            end_column: None,
-            can_restart: None,
-            instruction_pointer_reference: None,
-            module_id: None,
-            presentation_hint: None,
-        },
-    ];
-
-    client.on_request::<StackTrace, _>({
-        let stack_frames = Arc::new(stack_frames.clone());
-        move |_, args| {
-            assert_eq!(1, args.thread_id);
-
-            Ok(dap::StackTraceResponse {
-                stack_frames: (*stack_frames).clone(),
-                total_frames: None,
-            })
-        }
-    });
-
-    client
-        .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-            reason: dap::StoppedEventReason::Pause,
-            description: None,
-            thread_id: Some(1),
-            preserve_focus_hint: None,
-            text: None,
-            all_threads_stopped: None,
-            hit_breakpoint_ids: None,
-        }))
-        .await;
-
-    cx.run_until_parked();
-
-    // trigger threads to load
-    active_debug_session_panel(workspace, cx).update(cx, |session, cx| {
-        session.running_state().update(cx, |running_state, cx| {
-            running_state
-                .session()
-                .update(cx, |session, cx| session.threads(cx));
-        });
-    });
-
-    cx.run_until_parked();
-
-    // select first thread
-    active_debug_session_panel(workspace, cx).update_in(cx, |session, window, cx| {
-        session.running_state().update(cx, |running_state, cx| {
-            running_state.select_current_thread(
-                &running_state
-                    .session()
-                    .update(cx, |session, cx| session.threads(cx)),
-                window,
-                cx,
-            );
-        });
-    });
-
-    cx.run_until_parked();
-
-    workspace
-        .update(cx, |workspace, window, cx| {
-            let editors = workspace.items_of_type::<Editor>(cx).collect::<Vec<_>>();
-            assert_eq!(1, editors.len());
-
-            let project_path = editors[0]
-                .update(cx, |editor, cx| editor.project_path(cx))
-                .unwrap();
-            assert_eq!(rel_path("src/test.js"), project_path.path.as_ref());
-            assert_eq!(test_file_content, editors[0].read(cx).text(cx));
-            assert_eq!(
-                vec![2..3],
-                editors[0].update(cx, |editor, cx| {
-                    let snapshot = editor.snapshot(window, cx);
-
-                    editor
-                        .highlighted_rows::<editor::ActiveDebugLine>()
-                        .map(|(range, _)| {
-                            let start = range.start.to_point(&snapshot.buffer_snapshot());
-                            let end = range.end.to_point(&snapshot.buffer_snapshot());
-                            start.row..end.row
-                        })
-                        .collect::<Vec<_>>()
-                })
-            );
-        })
-        .unwrap();
-
-    let stack_frame_list = workspace
-        .update(cx, |workspace, _window, cx| {
-            let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap();
-            let active_debug_panel_item = debug_panel
-                .update(cx, |this, _| this.active_session())
-                .unwrap();
-
-            active_debug_panel_item
-                .read(cx)
-                .running_state()
-                .read(cx)
-                .stack_frame_list()
-                .clone()
-        })
-        .unwrap();
-
-    stack_frame_list.update(cx, |stack_frame_list, cx| {
-        assert_eq!(Some(1), stack_frame_list.opened_stack_frame_id());
-        assert_eq!(stack_frames, stack_frame_list.dap_stack_frames(cx));
-    });
-
-    // select second stack frame
-    stack_frame_list
-        .update_in(cx, |stack_frame_list, window, cx| {
-            stack_frame_list.go_to_stack_frame(stack_frames[1].id, window, cx)
-        })
-        .await
-        .unwrap();
-
-    cx.run_until_parked();
-
-    stack_frame_list.update(cx, |stack_frame_list, cx| {
-        assert_eq!(Some(2), stack_frame_list.opened_stack_frame_id());
-        assert_eq!(stack_frames, stack_frame_list.dap_stack_frames(cx));
-    });
-
-    let _ = workspace.update(cx, |workspace, window, cx| {
-        let editors = workspace.items_of_type::<Editor>(cx).collect::<Vec<_>>();
-        assert_eq!(1, editors.len());
-
-        let project_path = editors[0]
-            .update(cx, |editor, cx| editor.project_path(cx))
-            .unwrap();
-        assert_eq!(rel_path("src/module.js"), project_path.path.as_ref());
-        assert_eq!(module_file_content, editors[0].read(cx).text(cx));
-        assert_eq!(
-            vec![0..1],
-            editors[0].update(cx, |editor, cx| {
-                let snapshot = editor.snapshot(window, cx);
-
-                editor
-                    .highlighted_rows::<editor::ActiveDebugLine>()
-                    .map(|(range, _)| {
-                        let start = range.start.to_point(&snapshot.buffer_snapshot());
-                        let end = range.end.to_point(&snapshot.buffer_snapshot());
-                        start.row..end.row
-                    })
-                    .collect::<Vec<_>>()
-            })
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_collapsed_entries(executor: BackgroundExecutor, cx: &mut TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(executor.clone());
-
-    let test_file_content = r#"
-        import { SOME_VALUE } './module.js';
-
-        console.log(SOME_VALUE);
-    "#
-    .unindent();
-
-    let module_file_content = r#"
-        export SOME_VALUE = 'some value';
-    "#
-    .unindent();
-
-    fs.insert_tree(
-        path!("/project"),
-        json!({
-           "src": {
-               "test.js": test_file_content,
-               "module.js": module_file_content,
-           }
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
-    let workspace = init_test_workspace(&project, cx).await;
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-    let session = start_debug_session(&workspace, cx, |_| {}).unwrap();
-    let client = session.update(cx, |session, _| session.adapter_client().unwrap());
-
-    client.on_request::<Threads, _>(move |_, _| {
-        Ok(dap::ThreadsResponse {
-            threads: vec![dap::Thread {
-                id: 1,
-                name: "Thread 1".into(),
-            }],
-        })
-    });
-
-    client.on_request::<Scopes, _>(move |_, _| Ok(dap::ScopesResponse { scopes: vec![] }));
-
-    let stack_frames = vec![
-        StackFrame {
-            id: 1,
-            name: "Stack Frame 1".into(),
-            source: Some(dap::Source {
-                name: Some("test.js".into()),
-                path: Some(path!("/project/src/test.js").into()),
-                source_reference: None,
-                presentation_hint: None,
-                origin: None,
-                sources: None,
-                adapter_data: None,
-                checksums: None,
-            }),
-            line: 3,
-            column: 1,
-            end_line: None,
-            end_column: None,
-            can_restart: None,
-            instruction_pointer_reference: None,
-            module_id: None,
-            presentation_hint: None,
-        },
-        StackFrame {
-            id: 2,
-            name: "Stack Frame 2".into(),
-            source: Some(dap::Source {
-                name: Some("module.js".into()),
-                path: Some(path!("/project/src/module.js").into()),
-                source_reference: None,
-                presentation_hint: None,
-                origin: Some("ignored".into()),
-                sources: None,
-                adapter_data: None,
-                checksums: None,
-            }),
-            line: 1,
-            column: 1,
-            end_line: None,
-            end_column: None,
-            can_restart: None,
-            instruction_pointer_reference: None,
-            module_id: None,
-            presentation_hint: Some(dap::StackFramePresentationHint::Deemphasize),
-        },
-        StackFrame {
-            id: 3,
-            name: "Stack Frame 3".into(),
-            source: Some(dap::Source {
-                name: Some("module.js".into()),
-                path: Some(path!("/project/src/module.js").into()),
-                source_reference: None,
-                presentation_hint: None,
-                origin: Some("ignored".into()),
-                sources: None,
-                adapter_data: None,
-                checksums: None,
-            }),
-            line: 1,
-            column: 1,
-            end_line: None,
-            end_column: None,
-            can_restart: None,
-            instruction_pointer_reference: None,
-            module_id: None,
-            presentation_hint: Some(dap::StackFramePresentationHint::Deemphasize),
-        },
-        StackFrame {
-            id: 4,
-            name: "Stack Frame 4".into(),
-            source: Some(dap::Source {
-                name: Some("module.js".into()),
-                path: Some(path!("/project/src/module.js").into()),
-                source_reference: None,
-                presentation_hint: None,
-                origin: None,
-                sources: None,
-                adapter_data: None,
-                checksums: None,
-            }),
-            line: 1,
-            column: 1,
-            end_line: None,
-            end_column: None,
-            can_restart: None,
-            instruction_pointer_reference: None,
-            module_id: None,
-            presentation_hint: None,
-        },
-        StackFrame {
-            id: 5,
-            name: "Stack Frame 5".into(),
-            source: Some(dap::Source {
-                name: Some("module.js".into()),
-                path: Some(path!("/project/src/module.js").into()),
-                source_reference: None,
-                presentation_hint: None,
-                origin: None,
-                sources: None,
-                adapter_data: None,
-                checksums: None,
-            }),
-            line: 1,
-            column: 1,
-            end_line: None,
-            end_column: None,
-            can_restart: None,
-            instruction_pointer_reference: None,
-            module_id: None,
-            presentation_hint: Some(dap::StackFramePresentationHint::Deemphasize),
-        },
-        StackFrame {
-            id: 6,
-            name: "Stack Frame 6".into(),
-            source: Some(dap::Source {
-                name: Some("module.js".into()),
-                path: Some(path!("/project/src/module.js").into()),
-                source_reference: None,
-                presentation_hint: None,
-                origin: None,
-                sources: None,
-                adapter_data: None,
-                checksums: None,
-            }),
-            line: 1,
-            column: 1,
-            end_line: None,
-            end_column: None,
-            can_restart: None,
-            instruction_pointer_reference: None,
-            module_id: None,
-            presentation_hint: Some(dap::StackFramePresentationHint::Deemphasize),
-        },
-        StackFrame {
-            id: 7,
-            name: "Stack Frame 7".into(),
-            source: Some(dap::Source {
-                name: Some("module.js".into()),
-                path: Some(path!("/project/src/module.js").into()),
-                source_reference: None,
-                presentation_hint: None,
-                origin: None,
-                sources: None,
-                adapter_data: None,
-                checksums: None,
-            }),
-            line: 1,
-            column: 1,
-            end_line: None,
-            end_column: None,
-            can_restart: None,
-            instruction_pointer_reference: None,
-            module_id: None,
-            presentation_hint: None,
-        },
-    ];
-
-    client.on_request::<StackTrace, _>({
-        let stack_frames = Arc::new(stack_frames.clone());
-        move |_, args| {
-            assert_eq!(1, args.thread_id);
-
-            Ok(dap::StackTraceResponse {
-                stack_frames: (*stack_frames).clone(),
-                total_frames: None,
-            })
-        }
-    });
-
-    client
-        .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-            reason: dap::StoppedEventReason::Pause,
-            description: None,
-            thread_id: Some(1),
-            preserve_focus_hint: None,
-            text: None,
-            all_threads_stopped: None,
-            hit_breakpoint_ids: None,
-        }))
-        .await;
-
-    cx.run_until_parked();
-
-    // trigger threads to load
-    active_debug_session_panel(workspace, cx).update(cx, |session, cx| {
-        session.running_state().update(cx, |running_state, cx| {
-            running_state
-                .session()
-                .update(cx, |session, cx| session.threads(cx));
-        });
-    });
-
-    cx.run_until_parked();
-
-    // select first thread
-    active_debug_session_panel(workspace, cx).update_in(cx, |session, window, cx| {
-        session.running_state().update(cx, |running_state, cx| {
-            running_state.select_current_thread(
-                &running_state
-                    .session()
-                    .update(cx, |session, cx| session.threads(cx)),
-                window,
-                cx,
-            );
-        });
-    });
-
-    cx.run_until_parked();
-
-    // trigger stack frames to loaded
-    active_debug_session_panel(workspace, cx).update(cx, |debug_panel_item, cx| {
-        let stack_frame_list = debug_panel_item
-            .running_state()
-            .update(cx, |state, _| state.stack_frame_list().clone());
-
-        stack_frame_list.update(cx, |stack_frame_list, cx| {
-            stack_frame_list.dap_stack_frames(cx);
-        });
-    });
-
-    cx.run_until_parked();
-
-    active_debug_session_panel(workspace, cx).update_in(cx, |debug_panel_item, window, cx| {
-        let stack_frame_list = debug_panel_item
-            .running_state()
-            .update(cx, |state, _| state.stack_frame_list().clone());
-
-        stack_frame_list.update(cx, |stack_frame_list, cx| {
-            stack_frame_list.build_entries(true, window, cx);
-
-            assert_eq!(
-                &vec![
-                    StackFrameEntry::Normal(stack_frames[0].clone()),
-                    StackFrameEntry::Collapsed(vec![
-                        stack_frames[1].clone(),
-                        stack_frames[2].clone()
-                    ]),
-                    StackFrameEntry::Normal(stack_frames[3].clone()),
-                    StackFrameEntry::Collapsed(vec![
-                        stack_frames[4].clone(),
-                        stack_frames[5].clone()
-                    ]),
-                    StackFrameEntry::Normal(stack_frames[6].clone()),
-                ],
-                stack_frame_list.entries()
-            );
-
-            stack_frame_list.expand_collapsed_entry(1, cx);
-
-            assert_eq!(
-                &vec![
-                    StackFrameEntry::Normal(stack_frames[0].clone()),
-                    StackFrameEntry::Normal(stack_frames[1].clone()),
-                    StackFrameEntry::Normal(stack_frames[2].clone()),
-                    StackFrameEntry::Normal(stack_frames[3].clone()),
-                    StackFrameEntry::Collapsed(vec![
-                        stack_frames[4].clone(),
-                        stack_frames[5].clone()
-                    ]),
-                    StackFrameEntry::Normal(stack_frames[6].clone()),
-                ],
-                stack_frame_list.entries()
-            );
-
-            stack_frame_list.expand_collapsed_entry(4, cx);
-
-            assert_eq!(
-                &vec![
-                    StackFrameEntry::Normal(stack_frames[0].clone()),
-                    StackFrameEntry::Normal(stack_frames[1].clone()),
-                    StackFrameEntry::Normal(stack_frames[2].clone()),
-                    StackFrameEntry::Normal(stack_frames[3].clone()),
-                    StackFrameEntry::Normal(stack_frames[4].clone()),
-                    StackFrameEntry::Normal(stack_frames[5].clone()),
-                    StackFrameEntry::Normal(stack_frames[6].clone()),
-                ],
-                stack_frame_list.entries()
-            );
-        });
-    });
-}
-
-#[gpui::test]
-async fn test_stack_frame_filter(executor: BackgroundExecutor, cx: &mut TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(executor.clone());
-
-    let test_file_content = r#"
-        function main() {
-            doSomething();
-        }
-
-        function doSomething() {
-            console.log('doing something');
-        }
-    "#
-    .unindent();
-
-    fs.insert_tree(
-        path!("/project"),
-        json!({
-           "src": {
-               "test.js": test_file_content,
-           }
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
-    let workspace = init_test_workspace(&project, cx).await;
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-    let session = start_debug_session(&workspace, cx, |_| {}).unwrap();
-    let client = session.update(cx, |session, _| session.adapter_client().unwrap());
-
-    client.on_request::<Threads, _>(move |_, _| {
-        Ok(dap::ThreadsResponse {
-            threads: vec![dap::Thread {
-                id: 1,
-                name: "Thread 1".into(),
-            }],
-        })
-    });
-
-    client.on_request::<Scopes, _>(move |_, _| Ok(dap::ScopesResponse { scopes: vec![] }));
-
-    let stack_frames = vec![
-        StackFrame {
-            id: 1,
-            name: "main".into(),
-            source: Some(dap::Source {
-                name: Some("test.js".into()),
-                path: Some(path!("/project/src/test.js").into()),
-                source_reference: None,
-                presentation_hint: None,
-                origin: None,
-                sources: None,
-                adapter_data: None,
-                checksums: None,
-            }),
-            line: 2,
-            column: 1,
-            end_line: None,
-            end_column: None,
-            can_restart: None,
-            instruction_pointer_reference: None,
-            module_id: None,
-            presentation_hint: None,
-        },
-        StackFrame {
-            id: 2,
-            name: "node:internal/modules/cjs/loader".into(),
-            source: Some(dap::Source {
-                name: Some("loader.js".into()),
-                path: Some(path!("/usr/lib/node/internal/modules/cjs/loader.js").into()),
-                source_reference: None,
-                presentation_hint: None,
-                origin: None,
-                sources: None,
-                adapter_data: None,
-                checksums: None,
-            }),
-            line: 100,
-            column: 1,
-            end_line: None,
-            end_column: None,
-            can_restart: None,
-            instruction_pointer_reference: None,
-            module_id: None,
-            presentation_hint: Some(dap::StackFramePresentationHint::Deemphasize),
-        },
-        StackFrame {
-            id: 3,
-            name: "node:internal/modules/run_main".into(),
-            source: Some(dap::Source {
-                name: Some("run_main.js".into()),
-                path: Some(path!("/usr/lib/node/internal/modules/run_main.js").into()),
-                source_reference: None,
-                presentation_hint: None,
-                origin: None,
-                sources: None,
-                adapter_data: None,
-                checksums: None,
-            }),
-            line: 50,
-            column: 1,
-            end_line: None,
-            end_column: None,
-            can_restart: None,
-            instruction_pointer_reference: None,
-            module_id: None,
-            presentation_hint: Some(dap::StackFramePresentationHint::Deemphasize),
-        },
-        StackFrame {
-            id: 4,
-            name: "node:internal/modules/run_main2".into(),
-            source: Some(dap::Source {
-                name: Some("run_main.js".into()),
-                path: Some(path!("/usr/lib/node/internal/modules/run_main2.js").into()),
-                source_reference: None,
-                presentation_hint: None,
-                origin: None,
-                sources: None,
-                adapter_data: None,
-                checksums: None,
-            }),
-            line: 50,
-            column: 1,
-            end_line: None,
-            end_column: None,
-            can_restart: None,
-            instruction_pointer_reference: None,
-            module_id: None,
-            presentation_hint: Some(dap::StackFramePresentationHint::Deemphasize),
-        },
-        StackFrame {
-            id: 5,
-            name: "doSomething".into(),
-            source: Some(dap::Source {
-                name: Some("test.js".into()),
-                path: Some(path!("/project/src/test.js").into()),
-                source_reference: None,
-                presentation_hint: None,
-                origin: None,
-                sources: None,
-                adapter_data: None,
-                checksums: None,
-            }),
-            line: 3,
-            column: 1,
-            end_line: None,
-            end_column: None,
-            can_restart: None,
-            instruction_pointer_reference: None,
-            module_id: None,
-            presentation_hint: None,
-        },
-    ];
-
-    // Store a copy for assertions
-    let stack_frames_for_assertions = stack_frames.clone();
-
-    client.on_request::<StackTrace, _>({
-        let stack_frames = Arc::new(stack_frames.clone());
-        move |_, args| {
-            assert_eq!(1, args.thread_id);
-
-            Ok(dap::StackTraceResponse {
-                stack_frames: (*stack_frames).clone(),
-                total_frames: None,
-            })
-        }
-    });
-
-    client
-        .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-            reason: dap::StoppedEventReason::Pause,
-            description: None,
-            thread_id: Some(1),
-            preserve_focus_hint: None,
-            text: None,
-            all_threads_stopped: None,
-            hit_breakpoint_ids: None,
-        }))
-        .await;
-
-    cx.run_until_parked();
-
-    // trigger threads to load
-    active_debug_session_panel(workspace, cx).update(cx, |session, cx| {
-        session.running_state().update(cx, |running_state, cx| {
-            running_state
-                .session()
-                .update(cx, |session, cx| session.threads(cx));
-        });
-    });
-
-    cx.run_until_parked();
-
-    // select first thread
-    active_debug_session_panel(workspace, cx).update_in(cx, |session, window, cx| {
-        session.running_state().update(cx, |running_state, cx| {
-            running_state.select_current_thread(
-                &running_state
-                    .session()
-                    .update(cx, |session, cx| session.threads(cx)),
-                window,
-                cx,
-            );
-        });
-    });
-
-    cx.run_until_parked();
-
-    // trigger stack frames to load
-    active_debug_session_panel(workspace, cx).update(cx, |debug_panel_item, cx| {
-        let stack_frame_list = debug_panel_item
-            .running_state()
-            .update(cx, |state, _| state.stack_frame_list().clone());
-
-        stack_frame_list.update(cx, |stack_frame_list, cx| {
-            stack_frame_list.dap_stack_frames(cx);
-        });
-    });
-
-    cx.run_until_parked();
-
-    let stack_frame_list =
-        active_debug_session_panel(workspace, cx).update_in(cx, |debug_panel_item, window, cx| {
-            let stack_frame_list = debug_panel_item
-                .running_state()
-                .update(cx, |state, _| state.stack_frame_list().clone());
-
-            stack_frame_list.update(cx, |stack_frame_list, cx| {
-                stack_frame_list.build_entries(true, window, cx);
-
-                // Verify we have the expected collapsed structure
-                assert_eq!(
-                    stack_frame_list.entries(),
-                    &vec![
-                        StackFrameEntry::Normal(stack_frames_for_assertions[0].clone()),
-                        StackFrameEntry::Collapsed(vec![
-                            stack_frames_for_assertions[1].clone(),
-                            stack_frames_for_assertions[2].clone(),
-                            stack_frames_for_assertions[3].clone()
-                        ]),
-                        StackFrameEntry::Normal(stack_frames_for_assertions[4].clone()),
-                    ]
-                );
-            });
-
-            stack_frame_list
-        });
-
-    stack_frame_list.update(cx, |stack_frame_list, cx| {
-        let all_frames = stack_frame_list.flatten_entries(true, false);
-        assert_eq!(all_frames.len(), 5, "Should see all 5 frames initially");
-
-        stack_frame_list
-            .toggle_frame_filter(Some(project::debugger::session::ThreadStatus::Stopped), cx);
-        assert_eq!(
-            stack_frame_list.list_filter(),
-            StackFrameFilter::OnlyUserFrames
-        );
-    });
-
-    stack_frame_list.update(cx, |stack_frame_list, cx| {
-        let user_frames = stack_frame_list.dap_stack_frames(cx);
-        assert_eq!(user_frames.len(), 2, "Should only see 2 user frames");
-        assert_eq!(user_frames[0].name, "main");
-        assert_eq!(user_frames[1].name, "doSomething");
-
-        // Toggle back to all frames
-        stack_frame_list
-            .toggle_frame_filter(Some(project::debugger::session::ThreadStatus::Stopped), cx);
-        assert_eq!(stack_frame_list.list_filter(), StackFrameFilter::All);
-    });
-
-    stack_frame_list.update(cx, |stack_frame_list, cx| {
-        let all_frames_again = stack_frame_list.flatten_entries(true, false);
-        assert_eq!(
-            all_frames_again.len(),
-            5,
-            "Should see all 5 frames after toggling back"
-        );
-
-        // Test 3: Verify collapsed entries stay expanded
-        stack_frame_list.expand_collapsed_entry(1, cx);
-        assert_eq!(
-            stack_frame_list.entries(),
-            &vec![
-                StackFrameEntry::Normal(stack_frames_for_assertions[0].clone()),
-                StackFrameEntry::Normal(stack_frames_for_assertions[1].clone()),
-                StackFrameEntry::Normal(stack_frames_for_assertions[2].clone()),
-                StackFrameEntry::Normal(stack_frames_for_assertions[3].clone()),
-                StackFrameEntry::Normal(stack_frames_for_assertions[4].clone()),
-            ]
-        );
-
-        stack_frame_list
-            .toggle_frame_filter(Some(project::debugger::session::ThreadStatus::Stopped), cx);
-        assert_eq!(
-            stack_frame_list.list_filter(),
-            StackFrameFilter::OnlyUserFrames
-        );
-    });
-
-    stack_frame_list.update(cx, |stack_frame_list, cx| {
-        stack_frame_list
-            .toggle_frame_filter(Some(project::debugger::session::ThreadStatus::Stopped), cx);
-        assert_eq!(stack_frame_list.list_filter(), StackFrameFilter::All);
-    });
-
-    stack_frame_list.update(cx, |stack_frame_list, cx| {
-        stack_frame_list
-            .toggle_frame_filter(Some(project::debugger::session::ThreadStatus::Stopped), cx);
-        assert_eq!(
-            stack_frame_list.list_filter(),
-            StackFrameFilter::OnlyUserFrames
-        );
-
-        assert_eq!(
-            stack_frame_list.dap_stack_frames(cx).as_slice(),
-            &[
-                stack_frames_for_assertions[0].clone(),
-                stack_frames_for_assertions[4].clone()
-            ]
-        );
-
-        // Verify entries remain expanded
-        assert_eq!(
-            stack_frame_list.entries(),
-            &vec![
-                StackFrameEntry::Normal(stack_frames_for_assertions[0].clone()),
-                StackFrameEntry::Normal(stack_frames_for_assertions[1].clone()),
-                StackFrameEntry::Normal(stack_frames_for_assertions[2].clone()),
-                StackFrameEntry::Normal(stack_frames_for_assertions[3].clone()),
-                StackFrameEntry::Normal(stack_frames_for_assertions[4].clone()),
-            ],
-            "Expanded entries should remain expanded after toggling filter"
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_stack_frame_filter_persistence(
-    executor: BackgroundExecutor,
-    cx: &mut TestAppContext,
-) {
-    init_test(cx);
-
-    let fs = FakeFs::new(executor.clone());
-
-    fs.insert_tree(
-        path!("/project"),
-        json!({
-           "src": {
-               "test.js": "function main() { console.log('hello'); }",
-           }
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
-    let workspace = init_test_workspace(&project, cx).await;
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    workspace
-        .update(cx, |workspace, _, _| {
-            workspace.set_random_database_id();
-        })
-        .unwrap();
-
-    let threads_response = dap::ThreadsResponse {
-        threads: vec![dap::Thread {
-            id: 1,
-            name: "Thread 1".into(),
-        }],
-    };
-
-    let stack_trace_response = dap::StackTraceResponse {
-        stack_frames: vec![StackFrame {
-            id: 1,
-            name: "main".into(),
-            source: Some(dap::Source {
-                name: Some("test.js".into()),
-                path: Some(path!("/project/src/test.js").into()),
-                source_reference: None,
-                presentation_hint: None,
-                origin: None,
-                sources: None,
-                adapter_data: None,
-                checksums: None,
-            }),
-            line: 1,
-            column: 1,
-            end_line: None,
-            end_column: None,
-            can_restart: None,
-            instruction_pointer_reference: None,
-            module_id: None,
-            presentation_hint: None,
-        }],
-        total_frames: None,
-    };
-
-    let stopped_event = dap::StoppedEvent {
-        reason: dap::StoppedEventReason::Pause,
-        description: None,
-        thread_id: Some(1),
-        preserve_focus_hint: None,
-        text: None,
-        all_threads_stopped: None,
-        hit_breakpoint_ids: None,
-    };
-
-    let session = start_debug_session(&workspace, cx, |_| {}).unwrap();
-    let client = session.update(cx, |session, _| session.adapter_client().unwrap());
-    let adapter_name = session.update(cx, |session, _| session.adapter());
-
-    client.on_request::<Threads, _>({
-        let threads_response = threads_response.clone();
-        move |_, _| Ok(threads_response.clone())
-    });
-
-    client.on_request::<Scopes, _>(move |_, _| Ok(dap::ScopesResponse { scopes: vec![] }));
-
-    client.on_request::<StackTrace, _>({
-        let stack_trace_response = stack_trace_response.clone();
-        move |_, _| Ok(stack_trace_response.clone())
-    });
-
-    client
-        .fake_event(dap::messages::Events::Stopped(stopped_event.clone()))
-        .await;
-
-    cx.run_until_parked();
-
-    let stack_frame_list =
-        active_debug_session_panel(workspace, cx).update(cx, |debug_panel_item, cx| {
-            debug_panel_item
-                .running_state()
-                .update(cx, |state, _| state.stack_frame_list().clone())
-        });
-
-    stack_frame_list.update(cx, |stack_frame_list, _cx| {
-        assert_eq!(
-            stack_frame_list.list_filter(),
-            StackFrameFilter::All,
-            "Initial filter should be All"
-        );
-    });
-
-    stack_frame_list.update(cx, |stack_frame_list, cx| {
-        stack_frame_list
-            .toggle_frame_filter(Some(project::debugger::session::ThreadStatus::Stopped), cx);
-        assert_eq!(
-            stack_frame_list.list_filter(),
-            StackFrameFilter::OnlyUserFrames,
-            "Filter should be OnlyUserFrames after toggle"
-        );
-    });
-
-    cx.run_until_parked();
-
-    let workspace_id = workspace
-        .update(cx, |workspace, _window, _cx| workspace.database_id())
-        .ok()
-        .flatten()
-        .expect("workspace id has to be some for this test to work properly");
-
-    let key = stack_frame_filter_key(&adapter_name, workspace_id);
-    let stored_value = KEY_VALUE_STORE.read_kvp(&key).unwrap();
-    assert_eq!(
-        stored_value,
-        Some(StackFrameFilter::OnlyUserFrames.into()),
-        "Filter should be persisted in KVP store with key: {}",
-        key
-    );
-
-    client
-        .fake_event(dap::messages::Events::Terminated(None))
-        .await;
-    cx.run_until_parked();
-
-    let session2 = start_debug_session(&workspace, cx, |_| {}).unwrap();
-    let client2 = session2.update(cx, |session, _| session.adapter_client().unwrap());
-
-    client2.on_request::<Threads, _>({
-        let threads_response = threads_response.clone();
-        move |_, _| Ok(threads_response.clone())
-    });
-
-    client2.on_request::<Scopes, _>(move |_, _| Ok(dap::ScopesResponse { scopes: vec![] }));
-
-    client2.on_request::<StackTrace, _>({
-        let stack_trace_response = stack_trace_response.clone();
-        move |_, _| Ok(stack_trace_response.clone())
-    });
-
-    client2
-        .fake_event(dap::messages::Events::Stopped(stopped_event.clone()))
-        .await;
-
-    cx.run_until_parked();
-
-    let stack_frame_list2 =
-        active_debug_session_panel(workspace, cx).update(cx, |debug_panel_item, cx| {
-            debug_panel_item
-                .running_state()
-                .update(cx, |state, _| state.stack_frame_list().clone())
-        });
-
-    stack_frame_list2.update(cx, |stack_frame_list, _cx| {
-        assert_eq!(
-            stack_frame_list.list_filter(),
-            StackFrameFilter::OnlyUserFrames,
-            "Filter should be restored from KVP store in new session"
-        );
-    });
-}
diff --git a/crates/debugger_ui/src/tests/variable_list.rs b/crates/debugger_ui/src/tests/variable_list.rs
deleted file mode 100644
index 4cfdae093f..0000000000
--- a/crates/debugger_ui/src/tests/variable_list.rs
+++ /dev/null
@@ -1,2342 +0,0 @@
-use std::sync::{
-    Arc,
-    atomic::{AtomicBool, Ordering},
-};
-
-use crate::{
-    DebugPanel,
-    persistence::DebuggerPaneItem,
-    session::running::variable_list::{
-        AddWatch, CollapseSelectedEntry, ExpandSelectedEntry, RemoveWatch,
-    },
-    tests::{active_debug_session_panel, init_test, init_test_workspace, start_debug_session},
-};
-use collections::HashMap;
-use dap::{
-    Scope, StackFrame, Variable,
-    requests::{Evaluate, Initialize, Launch, Scopes, StackTrace, Variables},
-};
-use gpui::{BackgroundExecutor, TestAppContext, VisualTestContext};
-use menu::{SelectFirst, SelectNext, SelectPrevious};
-use project::{FakeFs, Project};
-use serde_json::json;
-use ui::SharedString;
-use unindent::Unindent as _;
-use util::path;
-
-/// This only tests fetching one scope and 2 variables for a single stackframe
-#[gpui::test]
-async fn test_basic_fetch_initial_scope_and_variables(
-    executor: BackgroundExecutor,
-    cx: &mut TestAppContext,
-) {
-    init_test(cx);
-
-    let fs = FakeFs::new(executor.clone());
-
-    let test_file_content = r#"
-        const variable1 = "Value 1";
-        const variable2 = "Value 2";
-    "#
-    .unindent();
-
-    fs.insert_tree(
-        path!("/project"),
-        json!({
-           "src": {
-               "test.js": test_file_content,
-           }
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
-    let workspace = init_test_workspace(&project, cx).await;
-    workspace
-        .update(cx, |workspace, window, cx| {
-            workspace.focus_panel::<DebugPanel>(window, cx);
-        })
-        .unwrap();
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let session = start_debug_session(&workspace, cx, |_| {}).unwrap();
-    let client = session.update(cx, |session, _| session.adapter_client().unwrap());
-
-    client.on_request::<dap::requests::Threads, _>(move |_, _| {
-        Ok(dap::ThreadsResponse {
-            threads: vec![dap::Thread {
-                id: 1,
-                name: "Thread 1".into(),
-            }],
-        })
-    });
-
-    let stack_frames = vec![StackFrame {
-        id: 1,
-        name: "Stack Frame 1".into(),
-        source: Some(dap::Source {
-            name: Some("test.js".into()),
-            path: Some(path!("/project/src/test.js").into()),
-            source_reference: None,
-            presentation_hint: None,
-            origin: None,
-            sources: None,
-            adapter_data: None,
-            checksums: None,
-        }),
-        line: 1,
-        column: 1,
-        end_line: None,
-        end_column: None,
-        can_restart: None,
-        instruction_pointer_reference: None,
-        module_id: None,
-        presentation_hint: None,
-    }];
-
-    client.on_request::<StackTrace, _>({
-        let stack_frames = Arc::new(stack_frames.clone());
-        move |_, args| {
-            assert_eq!(1, args.thread_id);
-
-            Ok(dap::StackTraceResponse {
-                stack_frames: (*stack_frames).clone(),
-                total_frames: None,
-            })
-        }
-    });
-
-    let scopes = vec![Scope {
-        name: "Scope 1".into(),
-        presentation_hint: None,
-        variables_reference: 2,
-        named_variables: None,
-        indexed_variables: None,
-        expensive: false,
-        source: None,
-        line: None,
-        column: None,
-        end_line: None,
-        end_column: None,
-    }];
-
-    client.on_request::<Scopes, _>({
-        let scopes = Arc::new(scopes.clone());
-        move |_, args| {
-            assert_eq!(1, args.frame_id);
-
-            Ok(dap::ScopesResponse {
-                scopes: (*scopes).clone(),
-            })
-        }
-    });
-
-    let variables = vec![
-        Variable {
-            name: "variable1".into(),
-            value: "value 1".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-        Variable {
-            name: "variable2".into(),
-            value: "value 2".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-    ];
-
-    client.on_request::<Variables, _>({
-        let variables = Arc::new(variables.clone());
-        move |_, args| {
-            assert_eq!(2, args.variables_reference);
-
-            Ok(dap::VariablesResponse {
-                variables: (*variables).clone(),
-            })
-        }
-    });
-
-    client
-        .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-            reason: dap::StoppedEventReason::Pause,
-            description: None,
-            thread_id: Some(1),
-            preserve_focus_hint: None,
-            text: None,
-            all_threads_stopped: None,
-            hit_breakpoint_ids: None,
-        }))
-        .await;
-
-    cx.run_until_parked();
-
-    let running_state =
-        active_debug_session_panel(workspace, cx).update_in(cx, |item, window, cx| {
-            cx.focus_self(window);
-            item.running_state().clone()
-        });
-    cx.run_until_parked();
-
-    running_state.update(cx, |running_state, cx| {
-        let (stack_frame_list, stack_frame_id) =
-            running_state.stack_frame_list().update(cx, |list, _| {
-                (
-                    list.flatten_entries(true, true),
-                    list.opened_stack_frame_id(),
-                )
-            });
-
-        assert_eq!(stack_frames, stack_frame_list);
-        assert_eq!(Some(1), stack_frame_id);
-
-        running_state
-            .variable_list()
-            .update(cx, |variable_list, _| {
-                assert_eq!(scopes, variable_list.scopes());
-                assert_eq!(
-                    vec![variables[0].clone(), variables[1].clone(),],
-                    variable_list.variables()
-                );
-
-                variable_list.assert_visual_entries(vec![
-                    "v Scope 1",
-                    "    > variable1",
-                    "    > variable2",
-                ]);
-            });
-    });
-}
-
-/// This tests fetching multiple scopes and variables for them with a single stackframe
-#[gpui::test]
-async fn test_fetch_variables_for_multiple_scopes(
-    executor: BackgroundExecutor,
-    cx: &mut TestAppContext,
-) {
-    init_test(cx);
-
-    let fs = FakeFs::new(executor.clone());
-
-    let test_file_content = r#"
-        const variable1 = {
-            nested1: "Nested 1",
-            nested2: "Nested 2",
-        };
-        const variable2 = "Value 2";
-        const variable3 = "Value 3";
-    "#
-    .unindent();
-
-    fs.insert_tree(
-        path!("/project"),
-        json!({
-           "src": {
-               "test.js": test_file_content,
-           }
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
-    let workspace = init_test_workspace(&project, cx).await;
-    workspace
-        .update(cx, |workspace, window, cx| {
-            workspace.focus_panel::<DebugPanel>(window, cx);
-        })
-        .unwrap();
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-    let session = start_debug_session(&workspace, cx, |_| {}).unwrap();
-    let client = session.update(cx, |session, _| session.adapter_client().unwrap());
-
-    client.on_request::<dap::requests::Threads, _>(move |_, _| {
-        Ok(dap::ThreadsResponse {
-            threads: vec![dap::Thread {
-                id: 1,
-                name: "Thread 1".into(),
-            }],
-        })
-    });
-
-    client.on_request::<Initialize, _>(move |_, _| {
-        Ok(dap::Capabilities {
-            supports_step_back: Some(false),
-            ..Default::default()
-        })
-    });
-
-    client.on_request::<Launch, _>(move |_, _| Ok(()));
-
-    let stack_frames = vec![StackFrame {
-        id: 1,
-        name: "Stack Frame 1".into(),
-        source: Some(dap::Source {
-            name: Some("test.js".into()),
-            path: Some(path!("/project/src/test.js").into()),
-            source_reference: None,
-            presentation_hint: None,
-            origin: None,
-            sources: None,
-            adapter_data: None,
-            checksums: None,
-        }),
-        line: 1,
-        column: 1,
-        end_line: None,
-        end_column: None,
-        can_restart: None,
-        instruction_pointer_reference: None,
-        module_id: None,
-        presentation_hint: None,
-    }];
-
-    client.on_request::<StackTrace, _>({
-        let stack_frames = Arc::new(stack_frames.clone());
-        move |_, args| {
-            assert_eq!(1, args.thread_id);
-
-            Ok(dap::StackTraceResponse {
-                stack_frames: (*stack_frames).clone(),
-                total_frames: None,
-            })
-        }
-    });
-
-    let scopes = vec![
-        Scope {
-            name: "Scope 1".into(),
-            presentation_hint: Some(dap::ScopePresentationHint::Locals),
-            variables_reference: 2,
-            named_variables: None,
-            indexed_variables: None,
-            expensive: false,
-            source: None,
-            line: None,
-            column: None,
-            end_line: None,
-            end_column: None,
-        },
-        Scope {
-            name: "Scope 2".into(),
-            presentation_hint: None,
-            variables_reference: 3,
-            named_variables: None,
-            indexed_variables: None,
-            expensive: false,
-            source: None,
-            line: None,
-            column: None,
-            end_line: None,
-            end_column: None,
-        },
-    ];
-
-    client.on_request::<Scopes, _>({
-        let scopes = Arc::new(scopes.clone());
-        move |_, args| {
-            assert_eq!(1, args.frame_id);
-
-            Ok(dap::ScopesResponse {
-                scopes: (*scopes).clone(),
-            })
-        }
-    });
-
-    let mut variables = HashMap::default();
-    variables.insert(
-        2,
-        vec![
-            Variable {
-                name: "variable1".into(),
-                value: "{nested1: \"Nested 1\", nested2: \"Nested 2\"}".into(),
-                type_: None,
-                presentation_hint: None,
-                evaluate_name: None,
-                variables_reference: 0,
-                named_variables: None,
-                indexed_variables: None,
-                memory_reference: None,
-                declaration_location_reference: None,
-                value_location_reference: None,
-            },
-            Variable {
-                name: "variable2".into(),
-                value: "Value 2".into(),
-                type_: None,
-                presentation_hint: None,
-                evaluate_name: None,
-                variables_reference: 0,
-                named_variables: None,
-                indexed_variables: None,
-                memory_reference: None,
-                declaration_location_reference: None,
-                value_location_reference: None,
-            },
-        ],
-    );
-    variables.insert(
-        3,
-        vec![Variable {
-            name: "variable3".into(),
-            value: "Value 3".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        }],
-    );
-
-    client.on_request::<Variables, _>({
-        let variables = Arc::new(variables.clone());
-        move |_, args| {
-            Ok(dap::VariablesResponse {
-                variables: variables.get(&args.variables_reference).unwrap().clone(),
-            })
-        }
-    });
-
-    client
-        .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-            reason: dap::StoppedEventReason::Pause,
-            description: None,
-            thread_id: Some(1),
-            preserve_focus_hint: None,
-            text: None,
-            all_threads_stopped: None,
-            hit_breakpoint_ids: None,
-        }))
-        .await;
-
-    cx.run_until_parked();
-
-    let running_state =
-        active_debug_session_panel(workspace, cx).update_in(cx, |item, window, cx| {
-            cx.focus_self(window);
-            item.running_state().clone()
-        });
-    cx.run_until_parked();
-
-    running_state.update(cx, |running_state, cx| {
-        let (stack_frame_list, stack_frame_id) =
-            running_state.stack_frame_list().update(cx, |list, _| {
-                (
-                    list.flatten_entries(true, true),
-                    list.opened_stack_frame_id(),
-                )
-            });
-
-        assert_eq!(Some(1), stack_frame_id);
-        assert_eq!(stack_frames, stack_frame_list);
-
-        running_state
-            .variable_list()
-            .update(cx, |variable_list, _| {
-                assert_eq!(2, variable_list.scopes().len());
-                assert_eq!(scopes, variable_list.scopes());
-                let variables_by_scope = variable_list.variables_per_scope();
-
-                // scope 1
-                assert_eq!(
-                    vec![
-                        variables.get(&2).unwrap()[0].clone(),
-                        variables.get(&2).unwrap()[1].clone(),
-                    ],
-                    variables_by_scope[0].1
-                );
-
-                // scope 2
-                let empty_vec: Vec<dap::Variable> = vec![];
-                assert_eq!(empty_vec, variables_by_scope[1].1);
-
-                variable_list.assert_visual_entries(vec![
-                    "v Scope 1",
-                    "    > variable1",
-                    "    > variable2",
-                    "> Scope 2",
-                ]);
-            });
-    });
-}
-
-// tests that toggling a variable will fetch its children and shows it
-#[gpui::test]
-async fn test_keyboard_navigation(executor: BackgroundExecutor, cx: &mut TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(executor.clone());
-
-    let test_file_content = r#"
-        const variable1 = {
-            nested1: "Nested 1",
-            nested2: "Nested 2",
-        };
-        const variable2 = "Value 2";
-        const variable3 = "Value 3";
-    "#
-    .unindent();
-
-    fs.insert_tree(
-        path!("/project"),
-        json!({
-           "src": {
-               "test.js": test_file_content,
-           }
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
-    let workspace = init_test_workspace(&project, cx).await;
-    workspace
-        .update(cx, |workspace, window, cx| {
-            workspace.focus_panel::<DebugPanel>(window, cx);
-        })
-        .unwrap();
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let session = start_debug_session(&workspace, cx, |_| {}).unwrap();
-    let client = session.update(cx, |session, _| session.adapter_client().unwrap());
-
-    client.on_request::<dap::requests::Threads, _>(move |_, _| {
-        Ok(dap::ThreadsResponse {
-            threads: vec![dap::Thread {
-                id: 1,
-                name: "Thread 1".into(),
-            }],
-        })
-    });
-
-    client.on_request::<Initialize, _>(move |_, _| {
-        Ok(dap::Capabilities {
-            supports_step_back: Some(false),
-            ..Default::default()
-        })
-    });
-
-    client.on_request::<Launch, _>(move |_, _| Ok(()));
-
-    let stack_frames = vec![StackFrame {
-        id: 1,
-        name: "Stack Frame 1".into(),
-        source: Some(dap::Source {
-            name: Some("test.js".into()),
-            path: Some(path!("/project/src/test.js").into()),
-            source_reference: None,
-            presentation_hint: None,
-            origin: None,
-            sources: None,
-            adapter_data: None,
-            checksums: None,
-        }),
-        line: 1,
-        column: 1,
-        end_line: None,
-        end_column: None,
-        can_restart: None,
-        instruction_pointer_reference: None,
-        module_id: None,
-        presentation_hint: None,
-    }];
-
-    client.on_request::<StackTrace, _>({
-        let stack_frames = Arc::new(stack_frames.clone());
-        move |_, args| {
-            assert_eq!(1, args.thread_id);
-
-            Ok(dap::StackTraceResponse {
-                stack_frames: (*stack_frames).clone(),
-                total_frames: None,
-            })
-        }
-    });
-
-    let scopes = vec![
-        Scope {
-            name: "Scope 1".into(),
-            presentation_hint: Some(dap::ScopePresentationHint::Locals),
-            variables_reference: 2,
-            named_variables: None,
-            indexed_variables: None,
-            expensive: false,
-            source: None,
-            line: None,
-            column: None,
-            end_line: None,
-            end_column: None,
-        },
-        Scope {
-            name: "Scope 2".into(),
-            presentation_hint: None,
-            variables_reference: 4,
-            named_variables: None,
-            indexed_variables: None,
-            expensive: false,
-            source: None,
-            line: None,
-            column: None,
-            end_line: None,
-            end_column: None,
-        },
-    ];
-
-    client.on_request::<Scopes, _>({
-        let scopes = Arc::new(scopes.clone());
-        move |_, args| {
-            assert_eq!(1, args.frame_id);
-
-            Ok(dap::ScopesResponse {
-                scopes: (*scopes).clone(),
-            })
-        }
-    });
-
-    let scope1_variables = vec![
-        Variable {
-            name: "variable1".into(),
-            value: "{nested1: \"Nested 1\", nested2: \"Nested 2\"}".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 3,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-        Variable {
-            name: "variable2".into(),
-            value: "Value 2".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-    ];
-
-    let nested_variables = vec![
-        Variable {
-            name: "nested1".into(),
-            value: "Nested 1".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-        Variable {
-            name: "nested2".into(),
-            value: "Nested 2".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-    ];
-
-    let scope2_variables = vec![Variable {
-        name: "variable3".into(),
-        value: "Value 3".into(),
-        type_: None,
-        presentation_hint: None,
-        evaluate_name: None,
-        variables_reference: 0,
-        named_variables: None,
-        indexed_variables: None,
-        memory_reference: None,
-        declaration_location_reference: None,
-        value_location_reference: None,
-    }];
-
-    client.on_request::<Variables, _>({
-        let scope1_variables = Arc::new(scope1_variables.clone());
-        let nested_variables = Arc::new(nested_variables.clone());
-        let scope2_variables = Arc::new(scope2_variables.clone());
-        move |_, args| match args.variables_reference {
-            4 => Ok(dap::VariablesResponse {
-                variables: (*scope2_variables).clone(),
-            }),
-            3 => Ok(dap::VariablesResponse {
-                variables: (*nested_variables).clone(),
-            }),
-            2 => Ok(dap::VariablesResponse {
-                variables: (*scope1_variables).clone(),
-            }),
-            id => unreachable!("unexpected variables reference {id}"),
-        }
-    });
-
-    client
-        .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-            reason: dap::StoppedEventReason::Pause,
-            description: None,
-            thread_id: Some(1),
-            preserve_focus_hint: None,
-            text: None,
-            all_threads_stopped: None,
-            hit_breakpoint_ids: None,
-        }))
-        .await;
-
-    cx.run_until_parked();
-    let running_state =
-        active_debug_session_panel(workspace, cx).update_in(cx, |item, window, cx| {
-            cx.focus_self(window);
-            let running = item.running_state().clone();
-
-            let variable_list = running.update(cx, |state, cx| {
-                // have to do this because the variable list pane should be shown/active
-                // for testing keyboard navigation
-                state.activate_item(DebuggerPaneItem::Variables, window, cx);
-
-                state.variable_list().clone()
-            });
-            variable_list.update(cx, |_, cx| cx.focus_self(window));
-            running
-        });
-    cx.dispatch_action(SelectFirst);
-    cx.dispatch_action(SelectFirst);
-    cx.run_until_parked();
-
-    running_state.update(cx, |running_state, cx| {
-        running_state
-            .variable_list()
-            .update(cx, |variable_list, _| {
-                variable_list.assert_visual_entries(vec![
-                    "v Scope 1 <=== selected",
-                    "    > variable1",
-                    "    > variable2",
-                    "> Scope 2",
-                ]);
-            });
-    });
-
-    cx.dispatch_action(SelectNext);
-    cx.run_until_parked();
-
-    running_state.update(cx, |running_state, cx| {
-        running_state
-            .variable_list()
-            .update(cx, |variable_list, _| {
-                variable_list.assert_visual_entries(vec![
-                    "v Scope 1",
-                    "    > variable1 <=== selected",
-                    "    > variable2",
-                    "> Scope 2",
-                ]);
-            });
-    });
-
-    // expand the nested variables of variable 1
-    cx.dispatch_action(ExpandSelectedEntry);
-    cx.run_until_parked();
-    running_state.update(cx, |running_state, cx| {
-        running_state
-            .variable_list()
-            .update(cx, |variable_list, _| {
-                variable_list.assert_visual_entries(vec![
-                    "v Scope 1",
-                    "    v variable1 <=== selected",
-                    "        > nested1",
-                    "        > nested2",
-                    "    > variable2",
-                    "> Scope 2",
-                ]);
-            });
-    });
-
-    // select the first nested variable of variable 1
-    cx.dispatch_action(SelectNext);
-    cx.run_until_parked();
-    running_state.update(cx, |debug_panel_item, cx| {
-        debug_panel_item
-            .variable_list()
-            .update(cx, |variable_list, _| {
-                variable_list.assert_visual_entries(vec![
-                    "v Scope 1",
-                    "    v variable1",
-                    "        > nested1 <=== selected",
-                    "        > nested2",
-                    "    > variable2",
-                    "> Scope 2",
-                ]);
-            });
-    });
-
-    // select the second nested variable of variable 1
-    cx.dispatch_action(SelectNext);
-    cx.run_until_parked();
-    running_state.update(cx, |debug_panel_item, cx| {
-        debug_panel_item
-            .variable_list()
-            .update(cx, |variable_list, _| {
-                variable_list.assert_visual_entries(vec![
-                    "v Scope 1",
-                    "    v variable1",
-                    "        > nested1",
-                    "        > nested2 <=== selected",
-                    "    > variable2",
-                    "> Scope 2",
-                ]);
-            });
-    });
-
-    // select variable 2 of scope 1
-    cx.dispatch_action(SelectNext);
-    cx.run_until_parked();
-    running_state.update(cx, |debug_panel_item, cx| {
-        debug_panel_item
-            .variable_list()
-            .update(cx, |variable_list, _| {
-                variable_list.assert_visual_entries(vec![
-                    "v Scope 1",
-                    "    v variable1",
-                    "        > nested1",
-                    "        > nested2",
-                    "    > variable2 <=== selected",
-                    "> Scope 2",
-                ]);
-            });
-    });
-
-    // select scope 2
-    cx.dispatch_action(SelectNext);
-    cx.run_until_parked();
-    running_state.update(cx, |debug_panel_item, cx| {
-        debug_panel_item
-            .variable_list()
-            .update(cx, |variable_list, _| {
-                variable_list.assert_visual_entries(vec![
-                    "v Scope 1",
-                    "    v variable1",
-                    "        > nested1",
-                    "        > nested2",
-                    "    > variable2",
-                    "> Scope 2 <=== selected",
-                ]);
-            });
-    });
-
-    // expand the nested variables of scope 2
-    cx.dispatch_action(ExpandSelectedEntry);
-    cx.run_until_parked();
-    running_state.update(cx, |debug_panel_item, cx| {
-        debug_panel_item
-            .variable_list()
-            .update(cx, |variable_list, _| {
-                variable_list.assert_visual_entries(vec![
-                    "v Scope 1",
-                    "    v variable1",
-                    "        > nested1",
-                    "        > nested2",
-                    "    > variable2",
-                    "v Scope 2 <=== selected",
-                    "    > variable3",
-                ]);
-            });
-    });
-
-    // select variable 3 of scope 2
-    cx.dispatch_action(SelectNext);
-    cx.run_until_parked();
-    running_state.update(cx, |debug_panel_item, cx| {
-        debug_panel_item
-            .variable_list()
-            .update(cx, |variable_list, _| {
-                variable_list.assert_visual_entries(vec![
-                    "v Scope 1",
-                    "    v variable1",
-                    "        > nested1",
-                    "        > nested2",
-                    "    > variable2",
-                    "v Scope 2",
-                    "    > variable3 <=== selected",
-                ]);
-            });
-    });
-
-    // select scope 2
-    cx.dispatch_action(SelectPrevious);
-    cx.run_until_parked();
-    running_state.update(cx, |debug_panel_item, cx| {
-        debug_panel_item
-            .variable_list()
-            .update(cx, |variable_list, _| {
-                variable_list.assert_visual_entries(vec![
-                    "v Scope 1",
-                    "    v variable1",
-                    "        > nested1",
-                    "        > nested2",
-                    "    > variable2",
-                    "v Scope 2 <=== selected",
-                    "    > variable3",
-                ]);
-            });
-    });
-
-    // collapse variables of scope 2
-    cx.dispatch_action(CollapseSelectedEntry);
-    cx.run_until_parked();
-    running_state.update(cx, |debug_panel_item, cx| {
-        debug_panel_item
-            .variable_list()
-            .update(cx, |variable_list, _| {
-                variable_list.assert_visual_entries(vec![
-                    "v Scope 1",
-                    "    v variable1",
-                    "        > nested1",
-                    "        > nested2",
-                    "    > variable2",
-                    "> Scope 2 <=== selected",
-                ]);
-            });
-    });
-
-    // select variable 2 of scope 1
-    cx.dispatch_action(SelectPrevious);
-    cx.run_until_parked();
-    running_state.update(cx, |debug_panel_item, cx| {
-        debug_panel_item
-            .variable_list()
-            .update(cx, |variable_list, _| {
-                variable_list.assert_visual_entries(vec![
-                    "v Scope 1",
-                    "    v variable1",
-                    "        > nested1",
-                    "        > nested2",
-                    "    > variable2 <=== selected",
-                    "> Scope 2",
-                ]);
-            });
-    });
-
-    // select nested2 of variable 1
-    cx.dispatch_action(SelectPrevious);
-    cx.run_until_parked();
-    running_state.update(cx, |debug_panel_item, cx| {
-        debug_panel_item
-            .variable_list()
-            .update(cx, |variable_list, _| {
-                variable_list.assert_visual_entries(vec![
-                    "v Scope 1",
-                    "    v variable1",
-                    "        > nested1",
-                    "        > nested2 <=== selected",
-                    "    > variable2",
-                    "> Scope 2",
-                ]);
-            });
-    });
-
-    // select nested1 of variable 1
-    cx.dispatch_action(SelectPrevious);
-    cx.run_until_parked();
-    running_state.update(cx, |debug_panel_item, cx| {
-        debug_panel_item
-            .variable_list()
-            .update(cx, |variable_list, _| {
-                variable_list.assert_visual_entries(vec![
-                    "v Scope 1",
-                    "    v variable1",
-                    "        > nested1 <=== selected",
-                    "        > nested2",
-                    "    > variable2",
-                    "> Scope 2",
-                ]);
-            });
-    });
-
-    // select variable 1 of scope 1
-    cx.dispatch_action(SelectPrevious);
-    cx.run_until_parked();
-    running_state.update(cx, |debug_panel_item, cx| {
-        debug_panel_item
-            .variable_list()
-            .update(cx, |variable_list, _| {
-                variable_list.assert_visual_entries(vec![
-                    "v Scope 1",
-                    "    v variable1 <=== selected",
-                    "        > nested1",
-                    "        > nested2",
-                    "    > variable2",
-                    "> Scope 2",
-                ]);
-            });
-    });
-
-    // collapse variables of variable 1
-    cx.dispatch_action(CollapseSelectedEntry);
-    cx.run_until_parked();
-    running_state.update(cx, |debug_panel_item, cx| {
-        debug_panel_item
-            .variable_list()
-            .update(cx, |variable_list, _| {
-                variable_list.assert_visual_entries(vec![
-                    "v Scope 1",
-                    "    > variable1 <=== selected",
-                    "    > variable2",
-                    "> Scope 2",
-                ]);
-            });
-    });
-
-    // select scope 1
-    cx.dispatch_action(SelectPrevious);
-    cx.run_until_parked();
-    running_state.update(cx, |running_state, cx| {
-        running_state
-            .variable_list()
-            .update(cx, |variable_list, _| {
-                variable_list.assert_visual_entries(vec![
-                    "v Scope 1 <=== selected",
-                    "    > variable1",
-                    "    > variable2",
-                    "> Scope 2",
-                ]);
-            });
-    });
-
-    // collapse variables of scope 1
-    cx.dispatch_action(CollapseSelectedEntry);
-    cx.run_until_parked();
-    running_state.update(cx, |debug_panel_item, cx| {
-        debug_panel_item
-            .variable_list()
-            .update(cx, |variable_list, _| {
-                variable_list.assert_visual_entries(vec!["> Scope 1 <=== selected", "> Scope 2"]);
-            });
-    });
-
-    // select scope 2 backwards
-    cx.dispatch_action(SelectPrevious);
-    cx.run_until_parked();
-    running_state.update(cx, |debug_panel_item, cx| {
-        debug_panel_item
-            .variable_list()
-            .update(cx, |variable_list, _| {
-                variable_list.assert_visual_entries(vec!["> Scope 1", "> Scope 2 <=== selected"]);
-            });
-    });
-
-    // select scope 1 backwards
-    cx.dispatch_action(SelectNext);
-    cx.run_until_parked();
-    running_state.update(cx, |debug_panel_item, cx| {
-        debug_panel_item
-            .variable_list()
-            .update(cx, |variable_list, _| {
-                variable_list.assert_visual_entries(vec!["> Scope 1 <=== selected", "> Scope 2"]);
-            });
-    });
-
-    // test stepping through nested with ExpandSelectedEntry/CollapseSelectedEntry actions
-
-    cx.dispatch_action(ExpandSelectedEntry);
-    cx.run_until_parked();
-    running_state.update(cx, |debug_panel_item, cx| {
-        debug_panel_item
-            .variable_list()
-            .update(cx, |variable_list, _| {
-                variable_list.assert_visual_entries(vec![
-                    "v Scope 1 <=== selected",
-                    "    > variable1",
-                    "    > variable2",
-                    "> Scope 2",
-                ]);
-            });
-    });
-
-    cx.dispatch_action(ExpandSelectedEntry);
-    cx.run_until_parked();
-    running_state.update(cx, |debug_panel_item, cx| {
-        debug_panel_item
-            .variable_list()
-            .update(cx, |variable_list, _| {
-                variable_list.assert_visual_entries(vec![
-                    "v Scope 1",
-                    "    > variable1 <=== selected",
-                    "    > variable2",
-                    "> Scope 2",
-                ]);
-            });
-    });
-
-    cx.dispatch_action(ExpandSelectedEntry);
-    cx.run_until_parked();
-    running_state.update(cx, |debug_panel_item, cx| {
-        debug_panel_item
-            .variable_list()
-            .update(cx, |variable_list, _| {
-                variable_list.assert_visual_entries(vec![
-                    "v Scope 1",
-                    "    v variable1 <=== selected",
-                    "        > nested1",
-                    "        > nested2",
-                    "    > variable2",
-                    "> Scope 2",
-                ]);
-            });
-    });
-
-    cx.dispatch_action(ExpandSelectedEntry);
-    cx.run_until_parked();
-    running_state.update(cx, |debug_panel_item, cx| {
-        debug_panel_item
-            .variable_list()
-            .update(cx, |variable_list, _| {
-                variable_list.assert_visual_entries(vec![
-                    "v Scope 1",
-                    "    v variable1",
-                    "        > nested1 <=== selected",
-                    "        > nested2",
-                    "    > variable2",
-                    "> Scope 2",
-                ]);
-            });
-    });
-
-    cx.dispatch_action(ExpandSelectedEntry);
-    cx.run_until_parked();
-    running_state.update(cx, |debug_panel_item, cx| {
-        debug_panel_item
-            .variable_list()
-            .update(cx, |variable_list, _| {
-                variable_list.assert_visual_entries(vec![
-                    "v Scope 1",
-                    "    v variable1",
-                    "        > nested1",
-                    "        > nested2 <=== selected",
-                    "    > variable2",
-                    "> Scope 2",
-                ]);
-            });
-    });
-
-    cx.dispatch_action(ExpandSelectedEntry);
-    cx.run_until_parked();
-    running_state.update(cx, |debug_panel_item, cx| {
-        debug_panel_item
-            .variable_list()
-            .update(cx, |variable_list, _| {
-                variable_list.assert_visual_entries(vec![
-                    "v Scope 1",
-                    "    v variable1",
-                    "        > nested1",
-                    "        > nested2",
-                    "    > variable2 <=== selected",
-                    "> Scope 2",
-                ]);
-            });
-    });
-
-    cx.dispatch_action(CollapseSelectedEntry);
-    cx.run_until_parked();
-    running_state.update(cx, |debug_panel_item, cx| {
-        debug_panel_item
-            .variable_list()
-            .update(cx, |variable_list, _| {
-                variable_list.assert_visual_entries(vec![
-                    "v Scope 1",
-                    "    v variable1",
-                    "        > nested1",
-                    "        > nested2 <=== selected",
-                    "    > variable2",
-                    "> Scope 2",
-                ]);
-            });
-    });
-
-    cx.dispatch_action(CollapseSelectedEntry);
-    cx.run_until_parked();
-    running_state.update(cx, |debug_panel_item, cx| {
-        debug_panel_item
-            .variable_list()
-            .update(cx, |variable_list, _| {
-                variable_list.assert_visual_entries(vec![
-                    "v Scope 1",
-                    "    v variable1",
-                    "        > nested1 <=== selected",
-                    "        > nested2",
-                    "    > variable2",
-                    "> Scope 2",
-                ]);
-            });
-    });
-
-    cx.dispatch_action(CollapseSelectedEntry);
-    cx.run_until_parked();
-    running_state.update(cx, |debug_panel_item, cx| {
-        debug_panel_item
-            .variable_list()
-            .update(cx, |variable_list, _| {
-                variable_list.assert_visual_entries(vec![
-                    "v Scope 1",
-                    "    v variable1 <=== selected",
-                    "        > nested1",
-                    "        > nested2",
-                    "    > variable2",
-                    "> Scope 2",
-                ]);
-            });
-    });
-
-    cx.dispatch_action(CollapseSelectedEntry);
-    cx.run_until_parked();
-    running_state.update(cx, |debug_panel_item, cx| {
-        debug_panel_item
-            .variable_list()
-            .update(cx, |variable_list, _| {
-                variable_list.assert_visual_entries(vec![
-                    "v Scope 1",
-                    "    > variable1 <=== selected",
-                    "    > variable2",
-                    "> Scope 2",
-                ]);
-            });
-    });
-
-    cx.dispatch_action(CollapseSelectedEntry);
-    cx.run_until_parked();
-    running_state.update(cx, |debug_panel_item, cx| {
-        debug_panel_item
-            .variable_list()
-            .update(cx, |variable_list, _| {
-                variable_list.assert_visual_entries(vec![
-                    "v Scope 1 <=== selected",
-                    "    > variable1",
-                    "    > variable2",
-                    "> Scope 2",
-                ]);
-            });
-    });
-
-    cx.dispatch_action(CollapseSelectedEntry);
-    cx.run_until_parked();
-    running_state.update(cx, |debug_panel_item, cx| {
-        debug_panel_item
-            .variable_list()
-            .update(cx, |variable_list, _| {
-                variable_list.assert_visual_entries(vec!["> Scope 1 <=== selected", "> Scope 2"]);
-            });
-    });
-}
-
-#[gpui::test]
-async fn test_variable_list_only_sends_requests_when_rendering(
-    executor: BackgroundExecutor,
-    cx: &mut TestAppContext,
-) {
-    init_test(cx);
-
-    let fs = FakeFs::new(executor.clone());
-
-    let test_file_content = r#"
-        import { SOME_VALUE } './module.js';
-
-        console.log(SOME_VALUE);
-    "#
-    .unindent();
-
-    let module_file_content = r#"
-        export SOME_VALUE = 'some value';
-    "#
-    .unindent();
-
-    fs.insert_tree(
-        path!("/project"),
-        json!({
-           "src": {
-               "test.js": test_file_content,
-               "module.js": module_file_content,
-           }
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
-    let workspace = init_test_workspace(&project, cx).await;
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-    let session = start_debug_session(&workspace, cx, |_| {}).unwrap();
-    let client = session.update(cx, |session, _| session.adapter_client().unwrap());
-
-    client.on_request::<dap::requests::Threads, _>(move |_, _| {
-        Ok(dap::ThreadsResponse {
-            threads: vec![dap::Thread {
-                id: 1,
-                name: "Thread 1".into(),
-            }],
-        })
-    });
-
-    client.on_request::<Initialize, _>(move |_, _| {
-        Ok(dap::Capabilities {
-            supports_step_back: Some(false),
-            ..Default::default()
-        })
-    });
-
-    client.on_request::<Launch, _>(move |_, _| Ok(()));
-
-    let stack_frames = vec![
-        StackFrame {
-            id: 1,
-            name: "Stack Frame 1".into(),
-            source: Some(dap::Source {
-                name: Some("test.js".into()),
-                path: Some(path!("/project/src/test.js").into()),
-                source_reference: None,
-                presentation_hint: None,
-                origin: None,
-                sources: None,
-                adapter_data: None,
-                checksums: None,
-            }),
-            line: 3,
-            column: 1,
-            end_line: None,
-            end_column: None,
-            can_restart: None,
-            instruction_pointer_reference: None,
-            module_id: None,
-            presentation_hint: None,
-        },
-        StackFrame {
-            id: 2,
-            name: "Stack Frame 2".into(),
-            source: Some(dap::Source {
-                name: Some("module.js".into()),
-                path: Some(path!("/project/src/module.js").into()),
-                source_reference: None,
-                presentation_hint: None,
-                origin: None,
-                sources: None,
-                adapter_data: None,
-                checksums: None,
-            }),
-            line: 1,
-            column: 1,
-            end_line: None,
-            end_column: None,
-            can_restart: None,
-            instruction_pointer_reference: None,
-            module_id: None,
-            presentation_hint: None,
-        },
-    ];
-
-    client.on_request::<StackTrace, _>({
-        let stack_frames = Arc::new(stack_frames.clone());
-        move |_, args| {
-            assert_eq!(1, args.thread_id);
-
-            Ok(dap::StackTraceResponse {
-                stack_frames: (*stack_frames).clone(),
-                total_frames: None,
-            })
-        }
-    });
-
-    let frame_1_scopes = vec![Scope {
-        name: "Frame 1 Scope 1".into(),
-        presentation_hint: None,
-        variables_reference: 2,
-        named_variables: None,
-        indexed_variables: None,
-        expensive: false,
-        source: None,
-        line: None,
-        column: None,
-        end_line: None,
-        end_column: None,
-    }];
-
-    let made_scopes_request = Arc::new(AtomicBool::new(false));
-
-    client.on_request::<Scopes, _>({
-        let frame_1_scopes = Arc::new(frame_1_scopes.clone());
-        let made_scopes_request = made_scopes_request.clone();
-        move |_, args| {
-            assert_eq!(1, args.frame_id);
-            assert!(
-                !made_scopes_request.load(Ordering::SeqCst),
-                "We should be caching the scope request"
-            );
-
-            made_scopes_request.store(true, Ordering::SeqCst);
-
-            Ok(dap::ScopesResponse {
-                scopes: (*frame_1_scopes).clone(),
-            })
-        }
-    });
-
-    let frame_1_variables = vec![
-        Variable {
-            name: "variable1".into(),
-            value: "value 1".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-        Variable {
-            name: "variable2".into(),
-            value: "value 2".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-    ];
-
-    client.on_request::<Variables, _>({
-        let frame_1_variables = Arc::new(frame_1_variables.clone());
-        move |_, args| {
-            assert_eq!(2, args.variables_reference);
-
-            Ok(dap::VariablesResponse {
-                variables: (*frame_1_variables).clone(),
-            })
-        }
-    });
-
-    cx.run_until_parked();
-
-    let running_state = active_debug_session_panel(workspace, cx)
-        .update_in(cx, |item, _, _| item.running_state().clone());
-
-    client
-        .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-            reason: dap::StoppedEventReason::Pause,
-            description: None,
-            thread_id: Some(1),
-            preserve_focus_hint: None,
-            text: None,
-            all_threads_stopped: None,
-            hit_breakpoint_ids: None,
-        }))
-        .await;
-
-    cx.run_until_parked();
-
-    running_state.update(cx, |running_state, cx| {
-        let (stack_frame_list, stack_frame_id) =
-            running_state.stack_frame_list().update(cx, |list, _| {
-                (
-                    list.flatten_entries(true, true),
-                    list.opened_stack_frame_id(),
-                )
-            });
-
-        assert_eq!(Some(1), stack_frame_id);
-        assert_eq!(stack_frames, stack_frame_list);
-
-        let variable_list = running_state.variable_list().read(cx);
-
-        assert_eq!(frame_1_variables, variable_list.variables());
-        assert!(made_scopes_request.load(Ordering::SeqCst));
-    });
-}
-
-#[gpui::test]
-async fn test_it_fetches_scopes_variables_when_you_select_a_stack_frame(
-    executor: BackgroundExecutor,
-    cx: &mut TestAppContext,
-) {
-    init_test(cx);
-
-    let fs = FakeFs::new(executor.clone());
-
-    let test_file_content = r#"
-        import { SOME_VALUE } './module.js';
-
-        console.log(SOME_VALUE);
-    "#
-    .unindent();
-
-    let module_file_content = r#"
-        export SOME_VALUE = 'some value';
-    "#
-    .unindent();
-
-    fs.insert_tree(
-        path!("/project"),
-        json!({
-           "src": {
-               "test.js": test_file_content,
-               "module.js": module_file_content,
-           }
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
-    let workspace = init_test_workspace(&project, cx).await;
-    workspace
-        .update(cx, |workspace, window, cx| {
-            workspace.focus_panel::<DebugPanel>(window, cx);
-        })
-        .unwrap();
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-    let session = start_debug_session(&workspace, cx, |_| {}).unwrap();
-    let client = session.update(cx, |session, _| session.adapter_client().unwrap());
-
-    client.on_request::<dap::requests::Threads, _>(move |_, _| {
-        Ok(dap::ThreadsResponse {
-            threads: vec![dap::Thread {
-                id: 1,
-                name: "Thread 1".into(),
-            }],
-        })
-    });
-
-    client.on_request::<Initialize, _>(move |_, _| {
-        Ok(dap::Capabilities {
-            supports_step_back: Some(false),
-            ..Default::default()
-        })
-    });
-
-    client.on_request::<Launch, _>(move |_, _| Ok(()));
-
-    let stack_frames = vec![
-        StackFrame {
-            id: 1,
-            name: "Stack Frame 1".into(),
-            source: Some(dap::Source {
-                name: Some("test.js".into()),
-                path: Some(path!("/project/src/test.js").into()),
-                source_reference: None,
-                presentation_hint: None,
-                origin: None,
-                sources: None,
-                adapter_data: None,
-                checksums: None,
-            }),
-            line: 3,
-            column: 1,
-            end_line: None,
-            end_column: None,
-            can_restart: None,
-            instruction_pointer_reference: None,
-            module_id: None,
-            presentation_hint: None,
-        },
-        StackFrame {
-            id: 2,
-            name: "Stack Frame 2".into(),
-            source: Some(dap::Source {
-                name: Some("module.js".into()),
-                path: Some(path!("/project/src/module.js").into()),
-                source_reference: None,
-                presentation_hint: None,
-                origin: None,
-                sources: None,
-                adapter_data: None,
-                checksums: None,
-            }),
-            line: 1,
-            column: 1,
-            end_line: None,
-            end_column: None,
-            can_restart: None,
-            instruction_pointer_reference: None,
-            module_id: None,
-            presentation_hint: None,
-        },
-    ];
-
-    client.on_request::<StackTrace, _>({
-        let stack_frames = Arc::new(stack_frames.clone());
-        move |_, args| {
-            assert_eq!(1, args.thread_id);
-
-            Ok(dap::StackTraceResponse {
-                stack_frames: (*stack_frames).clone(),
-                total_frames: None,
-            })
-        }
-    });
-
-    let frame_1_scopes = vec![Scope {
-        name: "Frame 1 Scope 1".into(),
-        presentation_hint: None,
-        variables_reference: 2,
-        named_variables: None,
-        indexed_variables: None,
-        expensive: false,
-        source: None,
-        line: None,
-        column: None,
-        end_line: None,
-        end_column: None,
-    }];
-
-    // add handlers for fetching the second stack frame's scopes and variables
-    // after the user clicked the stack frame
-    let frame_2_scopes = vec![Scope {
-        name: "Frame 2 Scope 1".into(),
-        presentation_hint: None,
-        variables_reference: 3,
-        named_variables: None,
-        indexed_variables: None,
-        expensive: false,
-        source: None,
-        line: None,
-        column: None,
-        end_line: None,
-        end_column: None,
-    }];
-
-    let called_second_stack_frame = Arc::new(AtomicBool::new(false));
-    let called_first_stack_frame = Arc::new(AtomicBool::new(false));
-
-    client.on_request::<Scopes, _>({
-        let frame_1_scopes = Arc::new(frame_1_scopes.clone());
-        let frame_2_scopes = Arc::new(frame_2_scopes.clone());
-        let called_first_stack_frame = called_first_stack_frame.clone();
-        let called_second_stack_frame = called_second_stack_frame.clone();
-        move |_, args| match args.frame_id {
-            1 => {
-                called_first_stack_frame.store(true, Ordering::SeqCst);
-                Ok(dap::ScopesResponse {
-                    scopes: (*frame_1_scopes).clone(),
-                })
-            }
-            2 => {
-                called_second_stack_frame.store(true, Ordering::SeqCst);
-
-                Ok(dap::ScopesResponse {
-                    scopes: (*frame_2_scopes).clone(),
-                })
-            }
-            _ => panic!("Made a scopes request with an invalid frame id"),
-        }
-    });
-
-    let frame_1_variables = vec![
-        Variable {
-            name: "variable1".into(),
-            value: "value 1".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-        Variable {
-            name: "variable2".into(),
-            value: "value 2".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-    ];
-
-    let frame_2_variables = vec![
-        Variable {
-            name: "variable3".into(),
-            value: "old value 1".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-        Variable {
-            name: "variable4".into(),
-            value: "old value 2".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-    ];
-
-    client.on_request::<Variables, _>({
-        let frame_1_variables = Arc::new(frame_1_variables.clone());
-        move |_, args| {
-            assert_eq!(2, args.variables_reference);
-
-            Ok(dap::VariablesResponse {
-                variables: (*frame_1_variables).clone(),
-            })
-        }
-    });
-
-    client
-        .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-            reason: dap::StoppedEventReason::Pause,
-            description: None,
-            thread_id: Some(1),
-            preserve_focus_hint: None,
-            text: None,
-            all_threads_stopped: None,
-            hit_breakpoint_ids: None,
-        }))
-        .await;
-
-    cx.run_until_parked();
-
-    let running_state =
-        active_debug_session_panel(workspace, cx).update_in(cx, |item, window, cx| {
-            cx.focus_self(window);
-            item.running_state().clone()
-        });
-
-    running_state.update(cx, |running_state, cx| {
-        let (stack_frame_list, stack_frame_id) =
-            running_state.stack_frame_list().update(cx, |list, _| {
-                (
-                    list.flatten_entries(true, true),
-                    list.opened_stack_frame_id(),
-                )
-            });
-
-        let variable_list = running_state.variable_list().read(cx);
-        let variables = variable_list.variables();
-
-        assert_eq!(Some(1), stack_frame_id);
-        assert_eq!(
-            running_state
-                .stack_frame_list()
-                .read(cx)
-                .opened_stack_frame_id(),
-            Some(1)
-        );
-
-        assert!(
-            called_first_stack_frame.load(std::sync::atomic::Ordering::SeqCst),
-            "Request scopes shouldn't be called before it's needed"
-        );
-        assert!(
-            !called_second_stack_frame.load(std::sync::atomic::Ordering::SeqCst),
-            "Request scopes shouldn't be called before it's needed"
-        );
-
-        assert_eq!(stack_frames, stack_frame_list);
-        assert_eq!(frame_1_variables, variables);
-    });
-
-    client.on_request::<Variables, _>({
-        let frame_2_variables = Arc::new(frame_2_variables.clone());
-        move |_, args| {
-            assert_eq!(3, args.variables_reference);
-
-            Ok(dap::VariablesResponse {
-                variables: (*frame_2_variables).clone(),
-            })
-        }
-    });
-
-    running_state
-        .update_in(cx, |running_state, window, cx| {
-            running_state
-                .stack_frame_list()
-                .update(cx, |stack_frame_list, cx| {
-                    stack_frame_list.go_to_stack_frame(stack_frames[1].id, window, cx)
-                })
-        })
-        .await
-        .unwrap();
-
-    cx.run_until_parked();
-
-    running_state.update(cx, |running_state, cx| {
-        let (stack_frame_list, stack_frame_id) =
-            running_state.stack_frame_list().update(cx, |list, _| {
-                (
-                    list.flatten_entries(true, true),
-                    list.opened_stack_frame_id(),
-                )
-            });
-
-        let variable_list = running_state.variable_list().read(cx);
-        let variables = variable_list.variables();
-
-        assert_eq!(Some(2), stack_frame_id);
-        assert!(
-            called_second_stack_frame.load(std::sync::atomic::Ordering::SeqCst),
-            "Request scopes shouldn't be called before it's needed"
-        );
-
-        assert_eq!(stack_frames, stack_frame_list);
-
-        assert_eq!(variables, frame_2_variables,);
-    });
-}
-
-#[gpui::test]
-async fn test_add_and_remove_watcher(executor: BackgroundExecutor, cx: &mut TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(executor.clone());
-
-    let test_file_content = r#"
-        const variable1 = "Value 1";
-        const variable2 = "Value 2";
-    "#
-    .unindent();
-
-    fs.insert_tree(
-        path!("/project"),
-        json!({
-           "src": {
-               "test.js": test_file_content,
-           }
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
-    let workspace = init_test_workspace(&project, cx).await;
-    workspace
-        .update(cx, |workspace, window, cx| {
-            workspace.focus_panel::<DebugPanel>(window, cx);
-        })
-        .unwrap();
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let session = start_debug_session(&workspace, cx, |_| {}).unwrap();
-    let client = session.update(cx, |session, _| session.adapter_client().unwrap());
-
-    client.on_request::<dap::requests::Threads, _>(move |_, _| {
-        Ok(dap::ThreadsResponse {
-            threads: vec![dap::Thread {
-                id: 1,
-                name: "Thread 1".into(),
-            }],
-        })
-    });
-
-    let stack_frames = vec![StackFrame {
-        id: 1,
-        name: "Stack Frame 1".into(),
-        source: Some(dap::Source {
-            name: Some("test.js".into()),
-            path: Some(path!("/project/src/test.js").into()),
-            source_reference: None,
-            presentation_hint: None,
-            origin: None,
-            sources: None,
-            adapter_data: None,
-            checksums: None,
-        }),
-        line: 1,
-        column: 1,
-        end_line: None,
-        end_column: None,
-        can_restart: None,
-        instruction_pointer_reference: None,
-        module_id: None,
-        presentation_hint: None,
-    }];
-
-    client.on_request::<StackTrace, _>({
-        let stack_frames = Arc::new(stack_frames.clone());
-        move |_, args| {
-            assert_eq!(1, args.thread_id);
-
-            Ok(dap::StackTraceResponse {
-                stack_frames: (*stack_frames).clone(),
-                total_frames: None,
-            })
-        }
-    });
-
-    let scopes = vec![Scope {
-        name: "Scope 1".into(),
-        presentation_hint: None,
-        variables_reference: 2,
-        named_variables: None,
-        indexed_variables: None,
-        expensive: false,
-        source: None,
-        line: None,
-        column: None,
-        end_line: None,
-        end_column: None,
-    }];
-
-    client.on_request::<Scopes, _>({
-        let scopes = Arc::new(scopes.clone());
-        move |_, args| {
-            assert_eq!(1, args.frame_id);
-
-            Ok(dap::ScopesResponse {
-                scopes: (*scopes).clone(),
-            })
-        }
-    });
-
-    let variables = vec![
-        Variable {
-            name: "variable1".into(),
-            value: "value 1".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-        Variable {
-            name: "variable2".into(),
-            value: "value 2".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-    ];
-
-    client.on_request::<Variables, _>({
-        let variables = Arc::new(variables.clone());
-        move |_, args| {
-            assert_eq!(2, args.variables_reference);
-
-            Ok(dap::VariablesResponse {
-                variables: (*variables).clone(),
-            })
-        }
-    });
-
-    client.on_request::<Evaluate, _>({
-        move |_, args| {
-            assert_eq!("variable1", args.expression);
-
-            Ok(dap::EvaluateResponse {
-                result: "value1".to_owned(),
-                type_: None,
-                presentation_hint: None,
-                variables_reference: 2,
-                named_variables: None,
-                indexed_variables: None,
-                memory_reference: None,
-                value_location_reference: None,
-            })
-        }
-    });
-
-    client
-        .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-            reason: dap::StoppedEventReason::Pause,
-            description: None,
-            thread_id: Some(1),
-            preserve_focus_hint: None,
-            text: None,
-            all_threads_stopped: None,
-            hit_breakpoint_ids: None,
-        }))
-        .await;
-
-    cx.run_until_parked();
-
-    let running_state =
-        active_debug_session_panel(workspace, cx).update_in(cx, |item, window, cx| {
-            cx.focus_self(window);
-            let running = item.running_state().clone();
-
-            let variable_list = running.update(cx, |state, cx| {
-                // have to do this because the variable list pane should be shown/active
-                // for testing the variable list
-                state.activate_item(DebuggerPaneItem::Variables, window, cx);
-
-                state.variable_list().clone()
-            });
-            variable_list.update(cx, |_, cx| cx.focus_self(window));
-            running
-        });
-    cx.run_until_parked();
-
-    // select variable 1 from first scope
-    running_state.update(cx, |running_state, cx| {
-        running_state.variable_list().update(cx, |_, cx| {
-            cx.dispatch_action(&SelectFirst);
-            cx.dispatch_action(&SelectNext);
-        });
-    });
-    cx.run_until_parked();
-
-    running_state.update(cx, |running_state, cx| {
-        running_state.variable_list().update(cx, |_, cx| {
-            cx.dispatch_action(&AddWatch);
-        });
-    });
-    cx.run_until_parked();
-
-    // assert watcher for variable1 was added
-    running_state.update(cx, |running_state, cx| {
-        running_state.variable_list().update(cx, |list, _| {
-            list.assert_visual_entries(vec![
-                "> variable1",
-                "v Scope 1",
-                "    > variable1 <=== selected",
-                "    > variable2",
-            ]);
-        });
-    });
-
-    session.update(cx, |session, _| {
-        let watcher = session
-            .watchers()
-            .get(&SharedString::from("variable1"))
-            .unwrap();
-
-        assert_eq!("value1", watcher.value.to_string());
-        assert_eq!("variable1", watcher.expression.to_string());
-        assert_eq!(2, watcher.variables_reference);
-    });
-
-    // select added watcher for variable1
-    running_state.update(cx, |running_state, cx| {
-        running_state.variable_list().update(cx, |_, cx| {
-            cx.dispatch_action(&SelectFirst);
-        });
-    });
-    cx.run_until_parked();
-
-    running_state.update(cx, |running_state, cx| {
-        running_state.variable_list().update(cx, |_, cx| {
-            cx.dispatch_action(&RemoveWatch);
-        });
-    });
-    cx.run_until_parked();
-
-    // assert watcher for variable1 was removed
-    running_state.update(cx, |running_state, cx| {
-        running_state.variable_list().update(cx, |list, _| {
-            list.assert_visual_entries(vec!["v Scope 1", "    > variable1", "    > variable2"]);
-        });
-    });
-}
-
-#[gpui::test]
-async fn test_refresh_watchers(executor: BackgroundExecutor, cx: &mut TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(executor.clone());
-
-    let test_file_content = r#"
-        const variable1 = "Value 1";
-        const variable2 = "Value 2";
-    "#
-    .unindent();
-
-    fs.insert_tree(
-        path!("/project"),
-        json!({
-           "src": {
-               "test.js": test_file_content,
-           }
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
-    let workspace = init_test_workspace(&project, cx).await;
-    workspace
-        .update(cx, |workspace, window, cx| {
-            workspace.focus_panel::<DebugPanel>(window, cx);
-        })
-        .unwrap();
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let session = start_debug_session(&workspace, cx, |_| {}).unwrap();
-    let client = session.update(cx, |session, _| session.adapter_client().unwrap());
-
-    client.on_request::<dap::requests::Threads, _>(move |_, _| {
-        Ok(dap::ThreadsResponse {
-            threads: vec![dap::Thread {
-                id: 1,
-                name: "Thread 1".into(),
-            }],
-        })
-    });
-
-    let stack_frames = vec![StackFrame {
-        id: 1,
-        name: "Stack Frame 1".into(),
-        source: Some(dap::Source {
-            name: Some("test.js".into()),
-            path: Some(path!("/project/src/test.js").into()),
-            source_reference: None,
-            presentation_hint: None,
-            origin: None,
-            sources: None,
-            adapter_data: None,
-            checksums: None,
-        }),
-        line: 1,
-        column: 1,
-        end_line: None,
-        end_column: None,
-        can_restart: None,
-        instruction_pointer_reference: None,
-        module_id: None,
-        presentation_hint: None,
-    }];
-
-    client.on_request::<StackTrace, _>({
-        let stack_frames = Arc::new(stack_frames.clone());
-        move |_, args| {
-            assert_eq!(1, args.thread_id);
-
-            Ok(dap::StackTraceResponse {
-                stack_frames: (*stack_frames).clone(),
-                total_frames: None,
-            })
-        }
-    });
-
-    let scopes = vec![Scope {
-        name: "Scope 1".into(),
-        presentation_hint: None,
-        variables_reference: 2,
-        named_variables: None,
-        indexed_variables: None,
-        expensive: false,
-        source: None,
-        line: None,
-        column: None,
-        end_line: None,
-        end_column: None,
-    }];
-
-    client.on_request::<Scopes, _>({
-        let scopes = Arc::new(scopes.clone());
-        move |_, args| {
-            assert_eq!(1, args.frame_id);
-
-            Ok(dap::ScopesResponse {
-                scopes: (*scopes).clone(),
-            })
-        }
-    });
-
-    let variables = vec![
-        Variable {
-            name: "variable1".into(),
-            value: "value 1".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-        Variable {
-            name: "variable2".into(),
-            value: "value 2".into(),
-            type_: None,
-            presentation_hint: None,
-            evaluate_name: None,
-            variables_reference: 0,
-            named_variables: None,
-            indexed_variables: None,
-            memory_reference: None,
-            declaration_location_reference: None,
-            value_location_reference: None,
-        },
-    ];
-
-    client.on_request::<Variables, _>({
-        let variables = Arc::new(variables.clone());
-        move |_, args| {
-            assert_eq!(2, args.variables_reference);
-
-            Ok(dap::VariablesResponse {
-                variables: (*variables).clone(),
-            })
-        }
-    });
-
-    client.on_request::<Evaluate, _>({
-        move |_, args| {
-            assert_eq!("variable1", args.expression);
-
-            Ok(dap::EvaluateResponse {
-                result: "value1".to_owned(),
-                type_: None,
-                presentation_hint: None,
-                variables_reference: 2,
-                named_variables: None,
-                indexed_variables: None,
-                memory_reference: None,
-                value_location_reference: None,
-            })
-        }
-    });
-
-    client
-        .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-            reason: dap::StoppedEventReason::Pause,
-            description: None,
-            thread_id: Some(1),
-            preserve_focus_hint: None,
-            text: None,
-            all_threads_stopped: None,
-            hit_breakpoint_ids: None,
-        }))
-        .await;
-
-    cx.run_until_parked();
-
-    let running_state =
-        active_debug_session_panel(workspace, cx).update_in(cx, |item, window, cx| {
-            cx.focus_self(window);
-            let running = item.running_state().clone();
-
-            let variable_list = running.update(cx, |state, cx| {
-                // have to do this because the variable list pane should be shown/active
-                // for testing the variable list
-                state.activate_item(DebuggerPaneItem::Variables, window, cx);
-
-                state.variable_list().clone()
-            });
-            variable_list.update(cx, |_, cx| cx.focus_self(window));
-            running
-        });
-    cx.run_until_parked();
-
-    // select variable 1 from first scope
-    running_state.update(cx, |running_state, cx| {
-        running_state.variable_list().update(cx, |_, cx| {
-            cx.dispatch_action(&SelectFirst);
-            cx.dispatch_action(&SelectNext);
-        });
-    });
-    cx.run_until_parked();
-
-    running_state.update(cx, |running_state, cx| {
-        running_state.variable_list().update(cx, |_, cx| {
-            cx.dispatch_action(&AddWatch);
-        });
-    });
-    cx.run_until_parked();
-
-    session.update(cx, |session, _| {
-        let watcher = session
-            .watchers()
-            .get(&SharedString::from("variable1"))
-            .unwrap();
-
-        assert_eq!("value1", watcher.value.to_string());
-        assert_eq!("variable1", watcher.expression.to_string());
-        assert_eq!(2, watcher.variables_reference);
-    });
-
-    client.on_request::<Evaluate, _>({
-        move |_, args| {
-            assert_eq!("variable1", args.expression);
-
-            Ok(dap::EvaluateResponse {
-                result: "value updated".to_owned(),
-                type_: None,
-                presentation_hint: None,
-                variables_reference: 3,
-                named_variables: None,
-                indexed_variables: None,
-                memory_reference: None,
-                value_location_reference: None,
-            })
-        }
-    });
-
-    client
-        .fake_event(dap::messages::Events::Stopped(dap::StoppedEvent {
-            reason: dap::StoppedEventReason::Pause,
-            description: None,
-            thread_id: Some(1),
-            preserve_focus_hint: None,
-            text: None,
-            all_threads_stopped: None,
-            hit_breakpoint_ids: None,
-        }))
-        .await;
-
-    cx.run_until_parked();
-
-    session.update(cx, |session, _| {
-        let watcher = session
-            .watchers()
-            .get(&SharedString::from("variable1"))
-            .unwrap();
-
-        assert_eq!("value updated", watcher.value.to_string());
-        assert_eq!("variable1", watcher.expression.to_string());
-        assert_eq!(3, watcher.variables_reference);
-    });
-}
diff --git a/crates/deepseek/Cargo.toml b/crates/deepseek/Cargo.toml
deleted file mode 100644
index 25e8f2f25c..0000000000
--- a/crates/deepseek/Cargo.toml
+++ /dev/null
@@ -1,24 +0,0 @@
-[package]
-name = "deepseek"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/deepseek.rs"
-
-[features]
-default = []
-schemars = ["dep:schemars"]
-
-[dependencies]
-anyhow.workspace = true
-futures.workspace = true
-http_client.workspace = true
-schemars = { workspace = true, optional = true }
-serde.workspace = true
-serde_json.workspace = true
diff --git a/crates/deepseek/LICENSE-GPL b/crates/deepseek/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/deepseek/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/deepseek/src/deepseek.rs b/crates/deepseek/src/deepseek.rs
deleted file mode 100644
index e978aa0804..0000000000
--- a/crates/deepseek/src/deepseek.rs
+++ /dev/null
@@ -1,308 +0,0 @@
-use anyhow::{Result, anyhow};
-use futures::{
-    AsyncBufReadExt, AsyncReadExt,
-    io::BufReader,
-    stream::{BoxStream, StreamExt},
-};
-use http_client::{AsyncBody, HttpClient, Method, Request as HttpRequest};
-use serde::{Deserialize, Serialize};
-use serde_json::Value;
-use std::convert::TryFrom;
-
-pub const DEEPSEEK_API_URL: &str = "https://api.deepseek.com/v1";
-
-#[derive(Clone, Copy, Serialize, Deserialize, Debug, Eq, PartialEq)]
-#[serde(rename_all = "lowercase")]
-pub enum Role {
-    User,
-    Assistant,
-    System,
-    Tool,
-}
-
-impl TryFrom<String> for Role {
-    type Error = anyhow::Error;
-
-    fn try_from(value: String) -> Result<Self> {
-        match value.as_str() {
-            "user" => Ok(Self::User),
-            "assistant" => Ok(Self::Assistant),
-            "system" => Ok(Self::System),
-            "tool" => Ok(Self::Tool),
-            _ => anyhow::bail!("invalid role '{value}'"),
-        }
-    }
-}
-
-impl From<Role> for String {
-    fn from(val: Role) -> Self {
-        match val {
-            Role::User => "user".to_owned(),
-            Role::Assistant => "assistant".to_owned(),
-            Role::System => "system".to_owned(),
-            Role::Tool => "tool".to_owned(),
-        }
-    }
-}
-
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
-#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq)]
-pub enum Model {
-    #[serde(rename = "deepseek-chat")]
-    #[default]
-    Chat,
-    #[serde(rename = "deepseek-reasoner")]
-    Reasoner,
-    #[serde(rename = "custom")]
-    Custom {
-        name: String,
-        /// The name displayed in the UI, such as in the assistant panel model dropdown menu.
-        display_name: Option<String>,
-        max_tokens: u64,
-        max_output_tokens: Option<u64>,
-    },
-}
-
-impl Model {
-    pub fn default_fast() -> Self {
-        Model::Chat
-    }
-
-    pub fn from_id(id: &str) -> Result<Self> {
-        match id {
-            "deepseek-chat" => Ok(Self::Chat),
-            "deepseek-reasoner" => Ok(Self::Reasoner),
-            _ => anyhow::bail!("invalid model id {id}"),
-        }
-    }
-
-    pub fn id(&self) -> &str {
-        match self {
-            Self::Chat => "deepseek-chat",
-            Self::Reasoner => "deepseek-reasoner",
-            Self::Custom { name, .. } => name,
-        }
-    }
-
-    pub fn display_name(&self) -> &str {
-        match self {
-            Self::Chat => "DeepSeek Chat",
-            Self::Reasoner => "DeepSeek Reasoner",
-            Self::Custom {
-                name, display_name, ..
-            } => display_name.as_ref().unwrap_or(name).as_str(),
-        }
-    }
-
-    pub fn max_token_count(&self) -> u64 {
-        match self {
-            Self::Chat | Self::Reasoner => 128_000,
-            Self::Custom { max_tokens, .. } => *max_tokens,
-        }
-    }
-
-    pub fn max_output_tokens(&self) -> Option<u64> {
-        match self {
-            Self::Chat => Some(8_192),
-            Self::Reasoner => Some(64_000),
-            Self::Custom {
-                max_output_tokens, ..
-            } => *max_output_tokens,
-        }
-    }
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct Request {
-    pub model: String,
-    pub messages: Vec<RequestMessage>,
-    pub stream: bool,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub max_tokens: Option<u64>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub temperature: Option<f32>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub response_format: Option<ResponseFormat>,
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub tools: Vec<ToolDefinition>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum ResponseFormat {
-    Text,
-    #[serde(rename = "json_object")]
-    JsonObject,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(tag = "type", rename_all = "snake_case")]
-pub enum ToolDefinition {
-    Function { function: FunctionDefinition },
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct FunctionDefinition {
-    pub name: String,
-    pub description: Option<String>,
-    pub parameters: Option<Value>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-#[serde(tag = "role", rename_all = "lowercase")]
-pub enum RequestMessage {
-    Assistant {
-        content: Option<String>,
-        #[serde(default, skip_serializing_if = "Vec::is_empty")]
-        tool_calls: Vec<ToolCall>,
-        #[serde(default, skip_serializing_if = "Option::is_none")]
-        reasoning_content: Option<String>,
-    },
-    User {
-        content: String,
-    },
-    System {
-        content: String,
-    },
-    Tool {
-        content: String,
-        tool_call_id: String,
-    },
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-pub struct ToolCall {
-    pub id: String,
-    #[serde(flatten)]
-    pub content: ToolCallContent,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-#[serde(tag = "type", rename_all = "lowercase")]
-pub enum ToolCallContent {
-    Function { function: FunctionContent },
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-pub struct FunctionContent {
-    pub name: String,
-    pub arguments: String,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct Response {
-    pub id: String,
-    pub object: String,
-    pub created: u64,
-    pub model: String,
-    pub choices: Vec<Choice>,
-    pub usage: Usage,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub reasoning_content: Option<String>,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct Usage {
-    pub prompt_tokens: u64,
-    pub completion_tokens: u64,
-    pub total_tokens: u64,
-    #[serde(default)]
-    pub prompt_cache_hit_tokens: u64,
-    #[serde(default)]
-    pub prompt_cache_miss_tokens: u64,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct Choice {
-    pub index: u32,
-    pub message: RequestMessage,
-    pub finish_reason: Option<String>,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct StreamResponse {
-    pub id: String,
-    pub object: String,
-    pub created: u64,
-    pub model: String,
-    pub choices: Vec<StreamChoice>,
-    pub usage: Option<Usage>,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct StreamChoice {
-    pub index: u32,
-    pub delta: StreamDelta,
-    pub finish_reason: Option<String>,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct StreamDelta {
-    pub role: Option<Role>,
-    pub content: Option<String>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub tool_calls: Option<Vec<ToolCallChunk>>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub reasoning_content: Option<String>,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct ToolCallChunk {
-    pub index: usize,
-    pub id: Option<String>,
-    pub function: Option<FunctionChunk>,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct FunctionChunk {
-    pub name: Option<String>,
-    pub arguments: Option<String>,
-}
-
-pub async fn stream_completion(
-    client: &dyn HttpClient,
-    api_url: &str,
-    api_key: &str,
-    request: Request,
-) -> Result<BoxStream<'static, Result<StreamResponse>>> {
-    let uri = format!("{api_url}/chat/completions");
-    let request_builder = HttpRequest::builder()
-        .method(Method::POST)
-        .uri(uri)
-        .header("Content-Type", "application/json")
-        .header("Authorization", format!("Bearer {}", api_key.trim()));
-
-    let request = request_builder.body(AsyncBody::from(serde_json::to_string(&request)?))?;
-    let mut response = client.send(request).await?;
-
-    if response.status().is_success() {
-        let reader = BufReader::new(response.into_body());
-        Ok(reader
-            .lines()
-            .filter_map(|line| async move {
-                match line {
-                    Ok(line) => {
-                        let line = line.strip_prefix("data: ")?;
-                        if line == "[DONE]" {
-                            None
-                        } else {
-                            match serde_json::from_str(line) {
-                                Ok(response) => Some(Ok(response)),
-                                Err(error) => Some(Err(anyhow!(error))),
-                            }
-                        }
-                    }
-                    Err(error) => Some(Err(anyhow!(error))),
-                }
-            })
-            .boxed())
-    } else {
-        let mut body = String::new();
-        response.body_mut().read_to_string(&mut body).await?;
-        anyhow::bail!(
-            "Failed to connect to DeepSeek API: {} {}",
-            response.status(),
-            body,
-        );
-    }
-}
diff --git a/crates/denoise/Cargo.toml b/crates/denoise/Cargo.toml
deleted file mode 100644
index 7d4644a610..0000000000
--- a/crates/denoise/Cargo.toml
+++ /dev/null
@@ -1,20 +0,0 @@
-[package]
-name = "denoise"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[dependencies]
-candle-core = { version = "0.9.1", git ="https://github.com/zed-industries/candle", branch = "9.1-patched" }
-candle-onnx = { version = "0.9.1", git ="https://github.com/zed-industries/candle", branch = "9.1-patched" }
-log.workspace = true
-
-rodio = { workspace = true, features = ["wav_output"] }
-
-rustfft = { version = "6.2.0", features = ["avx"] }
-realfft = "3.4.0"
-thiserror.workspace = true
diff --git a/crates/denoise/LICENSE-GPL b/crates/denoise/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/denoise/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/denoise/README.md b/crates/denoise/README.md
deleted file mode 100644
index d7486da36e..0000000000
--- a/crates/denoise/README.md
+++ /dev/null
@@ -1,20 +0,0 @@
-Real time streaming audio denoising using a [Dual-Signal Transformation LSTM Network for Real-Time Noise Suppression](https://arxiv.org/abs/2005.07551).
-
-Trivial to build as it uses the native rust Candle crate for inference. Easy to integrate into any Rodio pipeline.
-
-```rust
-    # use rodio::{nz, source::UniformSourceIterator, wav_to_file};
-    let file = std::fs::File::open("clips_airconditioning.wav")?;
-    let decoder = rodio::Decoder::try_from(file)?;
-    let resampled = UniformSourceIterator::new(decoder, nz!(1), nz!(16_000));
-
-    let mut denoised = denoise::Denoiser::try_new(resampled)?;
-    wav_to_file(&mut denoised, "denoised.wav")?;
-    Result::Ok<(), Box<dyn std::error::Error>>
-```
-
-## Acknowledgements & License
-
-The trained models in this repo are optimized versions of the models in the [breizhn/DTLN](https://github.com/breizhn/DTLN?tab=readme-ov-file#model-conversion-and-real-time-processing-with-onnx). These are licensed under MIT.
-
-The FFT code was adapted from Datadog's [dtln-rs Repo](https://github.com/DataDog/dtln-rs/tree/main) also licensed under MIT.
diff --git a/crates/denoise/examples/denoise.rs b/crates/denoise/examples/denoise.rs
deleted file mode 100644
index a4d89d7e51..0000000000
--- a/crates/denoise/examples/denoise.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-use rodio::{nz, source::UniformSourceIterator, wav_to_file};
-
-fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let file = std::fs::File::open("airconditioning.wav")?;
-    let decoder = rodio::Decoder::try_from(file)?;
-    let resampled = UniformSourceIterator::new(decoder, nz!(1), nz!(16_000));
-
-    let mut denoised = denoise::Denoiser::try_new(resampled)?;
-    wav_to_file(&mut denoised, "denoised.wav")?;
-    Ok(())
-}
diff --git a/crates/denoise/examples/enable_disable.rs b/crates/denoise/examples/enable_disable.rs
deleted file mode 100644
index 1cffadbce2..0000000000
--- a/crates/denoise/examples/enable_disable.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-use std::time::Duration;
-
-use rodio::Source;
-use rodio::wav_to_file;
-use rodio::{nz, source::UniformSourceIterator};
-
-fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let file = std::fs::File::open("clips_airconditioning.wav")?;
-    let decoder = rodio::Decoder::try_from(file)?;
-    let resampled = UniformSourceIterator::new(decoder, nz!(1), nz!(16_000));
-
-    let mut enabled = true;
-    let denoised = denoise::Denoiser::try_new(resampled)?.periodic_access(
-        Duration::from_secs(2),
-        |denoised| {
-            enabled = !enabled;
-            denoised.set_enabled(enabled);
-        },
-    );
-
-    wav_to_file(denoised, "processed.wav")?;
-    Ok(())
-}
diff --git a/crates/denoise/models/model_1_converted_simplified.onnx b/crates/denoise/models/model_1_converted_simplified.onnx
deleted file mode 100644
index 821cb73bd7..0000000000
Binary files a/crates/denoise/models/model_1_converted_simplified.onnx and /dev/null differ
diff --git a/crates/denoise/models/model_2_converted_simplified.onnx b/crates/denoise/models/model_2_converted_simplified.onnx
deleted file mode 100644
index a83023ab22..0000000000
Binary files a/crates/denoise/models/model_2_converted_simplified.onnx and /dev/null differ
diff --git a/crates/denoise/src/engine.rs b/crates/denoise/src/engine.rs
deleted file mode 100644
index be0548c689..0000000000
--- a/crates/denoise/src/engine.rs
+++ /dev/null
@@ -1,204 +0,0 @@
-/// use something like https://netron.app/ to inspect the models and understand
-/// the flow
-use std::collections::HashMap;
-
-use candle_core::{Device, IndexOp, Tensor};
-use candle_onnx::onnx::ModelProto;
-use candle_onnx::prost::Message;
-use realfft::RealFftPlanner;
-use rustfft::num_complex::Complex;
-
-pub struct Engine {
-    spectral_model: ModelProto,
-    signal_model: ModelProto,
-
-    fft_planner: RealFftPlanner<f32>,
-    fft_scratch: Vec<Complex<f32>>,
-    spectrum: [Complex<f32>; FFT_OUT_SIZE],
-    signal: [f32; BLOCK_LEN],
-
-    in_magnitude: [f32; FFT_OUT_SIZE],
-    in_phase: [f32; FFT_OUT_SIZE],
-
-    spectral_memory: Tensor,
-    signal_memory: Tensor,
-
-    in_buffer: [f32; BLOCK_LEN],
-    out_buffer: [f32; BLOCK_LEN],
-}
-
-// 32 ms @ 16khz per DTLN docs: https://github.com/breizhn/DTLN
-pub const BLOCK_LEN: usize = 512;
-// 8 ms @ 16khz per DTLN docs.
-pub const BLOCK_SHIFT: usize = 128;
-pub const FFT_OUT_SIZE: usize = BLOCK_LEN / 2 + 1;
-
-impl Engine {
-    pub fn new() -> Self {
-        let mut fft_planner = RealFftPlanner::new();
-        let fft_planned = fft_planner.plan_fft_forward(BLOCK_LEN);
-        let scratch_len = fft_planned.get_scratch_len();
-        Self {
-            // Models are 1.5MB and 2.5MB respectively. Its worth the binary
-            // size increase not to have to distribute the models separately.
-            spectral_model: ModelProto::decode(
-                include_bytes!("../models/model_1_converted_simplified.onnx").as_slice(),
-            )
-            .expect("The model should decode"),
-            signal_model: ModelProto::decode(
-                include_bytes!("../models/model_2_converted_simplified.onnx").as_slice(),
-            )
-            .expect("The model should decode"),
-            fft_planner,
-            fft_scratch: vec![Complex::ZERO; scratch_len],
-            spectrum: [Complex::ZERO; FFT_OUT_SIZE],
-            signal: [0f32; BLOCK_LEN],
-
-            in_magnitude: [0f32; FFT_OUT_SIZE],
-            in_phase: [0f32; FFT_OUT_SIZE],
-
-            spectral_memory: Tensor::from_slice::<_, f32>(
-                &[0f32; 512],
-                (1, 2, BLOCK_SHIFT, 2),
-                &Device::Cpu,
-            )
-            .expect("Tensor has the correct dimensions"),
-            signal_memory: Tensor::from_slice::<_, f32>(
-                &[0f32; 512],
-                (1, 2, BLOCK_SHIFT, 2),
-                &Device::Cpu,
-            )
-            .expect("Tensor has the correct dimensions"),
-            out_buffer: [0f32; BLOCK_LEN],
-            in_buffer: [0f32; BLOCK_LEN],
-        }
-    }
-
-    /// Add a clunk of samples and get the denoised chunk 4 feeds later
-    pub fn feed(&mut self, samples: &[f32]) -> [f32; BLOCK_SHIFT] {
-        /// The name of the output node of the onnx network
-        /// [Dual-Signal Transformation LSTM Network for Real-Time Noise Suppression](https://arxiv.org/abs/2005.07551).
-        const MEMORY_OUTPUT: &'static str = "Identity_1";
-
-        debug_assert_eq!(samples.len(), BLOCK_SHIFT);
-
-        // place new samples at the end of the `in_buffer`
-        self.in_buffer.copy_within(BLOCK_SHIFT.., 0);
-        self.in_buffer[(BLOCK_LEN - BLOCK_SHIFT)..].copy_from_slice(&samples);
-
-        // run inference
-        let inputs = self.spectral_inputs();
-        let mut spectral_outputs = candle_onnx::simple_eval(&self.spectral_model, inputs)
-            .expect("The embedded file must be valid");
-        self.spectral_memory = spectral_outputs
-            .remove(MEMORY_OUTPUT)
-            .expect("The model has an output named Identity_1");
-        let inputs = self.signal_inputs(spectral_outputs);
-        let mut signal_outputs = candle_onnx::simple_eval(&self.signal_model, inputs)
-            .expect("The embedded file must be valid");
-        self.signal_memory = signal_outputs
-            .remove(MEMORY_OUTPUT)
-            .expect("The model has an output named Identity_1");
-        let model_output = model_outputs(signal_outputs);
-
-        // place processed samples at the start of the `out_buffer`
-        // shift the rest left, fill the end with zeros. Zeros are needed as
-        // the out buffer is part of the input of the network
-        self.out_buffer.copy_within(BLOCK_SHIFT.., 0);
-        self.out_buffer[BLOCK_LEN - BLOCK_SHIFT..].fill(0f32);
-        for (a, b) in self.out_buffer.iter_mut().zip(model_output) {
-            *a += b;
-        }
-
-        // samples at the front of the `out_buffer` are now denoised
-        self.out_buffer[..BLOCK_SHIFT]
-            .try_into()
-            .expect("len is correct")
-    }
-
-    fn spectral_inputs(&mut self) -> HashMap<String, Tensor> {
-        // Prepare FFT input
-        let fft = self.fft_planner.plan_fft_forward(BLOCK_LEN);
-
-        // Perform real-to-complex FFT
-        let mut fft_in = self.in_buffer;
-        fft.process_with_scratch(&mut fft_in, &mut self.spectrum, &mut self.fft_scratch)
-            .expect("The fft should run, there is enough scratch space");
-
-        // Generate magnitude and phase
-        for ((magnitude, phase), complex) in self
-            .in_magnitude
-            .iter_mut()
-            .zip(self.in_phase.iter_mut())
-            .zip(self.spectrum)
-        {
-            *magnitude = complex.norm();
-            *phase = complex.arg();
-        }
-
-        const SPECTRUM_INPUT: &str = "input_2";
-        const MEMORY_INPUT: &str = "input_3";
-        let spectrum =
-            Tensor::from_slice::<_, f32>(&self.in_magnitude, (1, 1, FFT_OUT_SIZE), &Device::Cpu)
-                .expect("the in magnitude has enough elements to fill the Tensor");
-
-        let inputs = HashMap::from([
-            (SPECTRUM_INPUT.to_string(), spectrum),
-            (MEMORY_INPUT.to_string(), self.spectral_memory.clone()),
-        ]);
-        inputs
-    }
-
-    fn signal_inputs(&mut self, outputs: HashMap<String, Tensor>) -> HashMap<String, Tensor> {
-        let magnitude_weight = model_outputs(outputs);
-
-        // Apply mask and reconstruct complex spectrum
-        let mut spectrum = [Complex::I; FFT_OUT_SIZE];
-        for i in 0..FFT_OUT_SIZE {
-            let magnitude = self.in_magnitude[i] * magnitude_weight[i];
-            let phase = self.in_phase[i];
-            let real = magnitude * phase.cos();
-            let imag = magnitude * phase.sin();
-            spectrum[i] = Complex::new(real, imag);
-        }
-
-        // Handle DC component (i = 0)
-        let magnitude = self.in_magnitude[0] * magnitude_weight[0];
-        spectrum[0] = Complex::new(magnitude, 0.0);
-
-        // Handle Nyquist component (i = N/2)
-        let magnitude = self.in_magnitude[FFT_OUT_SIZE - 1] * magnitude_weight[FFT_OUT_SIZE - 1];
-        spectrum[FFT_OUT_SIZE - 1] = Complex::new(magnitude, 0.0);
-
-        // Perform complex-to-real IFFT
-        let ifft = self.fft_planner.plan_fft_inverse(BLOCK_LEN);
-        ifft.process_with_scratch(&mut spectrum, &mut self.signal, &mut self.fft_scratch)
-            .expect("The fft should run, there is enough scratch space");
-
-        // Normalize the IFFT output
-        for real in &mut self.signal {
-            *real /= BLOCK_LEN as f32;
-        }
-
-        const SIGNAL_INPUT: &str = "input_4";
-        const SIGNAL_MEMORY: &str = "input_5";
-        let signal_input =
-            Tensor::from_slice::<_, f32>(&self.signal, (1, 1, BLOCK_LEN), &Device::Cpu).unwrap();
-
-        HashMap::from([
-            (SIGNAL_INPUT.to_string(), signal_input),
-            (SIGNAL_MEMORY.to_string(), self.signal_memory.clone()),
-        ])
-    }
-}
-
-// Both models put their outputs in the same location
-fn model_outputs(mut outputs: HashMap<String, Tensor>) -> Vec<f32> {
-    const NON_MEMORY_OUTPUT: &str = "Identity";
-    outputs
-        .remove(NON_MEMORY_OUTPUT)
-        .expect("The model has this output")
-        .i((0, 0))
-        .and_then(|tensor| tensor.to_vec1())
-        .expect("The tensor has the correct dimensions")
-}
diff --git a/crates/denoise/src/lib.rs b/crates/denoise/src/lib.rs
deleted file mode 100644
index f6cbf0fadf..0000000000
--- a/crates/denoise/src/lib.rs
+++ /dev/null
@@ -1,273 +0,0 @@
-mod engine;
-
-use core::fmt;
-use std::{collections::VecDeque, sync::mpsc, thread};
-
-pub use engine::Engine;
-use rodio::{ChannelCount, Sample, SampleRate, Source, nz};
-
-use crate::engine::BLOCK_SHIFT;
-
-const SUPPORTED_SAMPLE_RATE: SampleRate = nz!(16_000);
-const SUPPORTED_CHANNEL_COUNT: ChannelCount = nz!(1);
-
-pub struct Denoiser<S: Source> {
-    inner: S,
-    input_tx: mpsc::Sender<[Sample; BLOCK_SHIFT]>,
-    denoised_rx: mpsc::Receiver<[Sample; BLOCK_SHIFT]>,
-    ready: [Sample; BLOCK_SHIFT],
-    next: usize,
-    state: IterState,
-    // When disabled instead of reading denoised sub-blocks from the engine through
-    // `denoised_rx` we read unprocessed from this queue. This maintains the same
-    // latency so we can 'trivially' re-enable
-    queued: Queue,
-}
-
-impl<S: Source> fmt::Debug for Denoiser<S> {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("Denoiser")
-            .field("state", &self.state)
-            .finish_non_exhaustive()
-    }
-}
-
-struct Queue(VecDeque<[Sample; BLOCK_SHIFT]>);
-
-impl Queue {
-    fn new() -> Self {
-        Self(VecDeque::new())
-    }
-    fn push(&mut self, block: [Sample; BLOCK_SHIFT]) {
-        self.0.push_back(block);
-        self.0.resize(4, [0f32; BLOCK_SHIFT]);
-    }
-    fn pop(&mut self) -> [Sample; BLOCK_SHIFT] {
-        debug_assert!(self.0.len() == 4);
-        self.0.pop_front().expect(
-            "There is no State where the queue is popped while there are less then 4 entries",
-        )
-    }
-}
-
-#[derive(Debug, Clone, Copy)]
-pub enum IterState {
-    Enabled,
-    StartingMidAudio { fed_to_denoiser: usize },
-    Disabled,
-    Startup { enabled: bool },
-}
-
-#[derive(Debug, thiserror::Error)]
-pub enum DenoiserError {
-    #[error("This denoiser only works on sources with samplerate 16000")]
-    UnsupportedSampleRate,
-    #[error("This denoiser only works on mono sources (1 channel)")]
-    UnsupportedChannelCount,
-}
-
-// todo dvdsk needs constant source upstream in rodio
-impl<S: Source> Denoiser<S> {
-    pub fn try_new(source: S) -> Result<Self, DenoiserError> {
-        if source.sample_rate() != SUPPORTED_SAMPLE_RATE {
-            return Err(DenoiserError::UnsupportedSampleRate);
-        }
-        if source.channels() != SUPPORTED_CHANNEL_COUNT {
-            return Err(DenoiserError::UnsupportedChannelCount);
-        }
-
-        let (input_tx, input_rx) = mpsc::channel();
-        let (denoised_tx, denoised_rx) = mpsc::channel();
-
-        thread::Builder::new()
-            .name("NeuralDenoiser".to_owned())
-            .spawn(move || {
-                run_neural_denoiser(denoised_tx, input_rx);
-            })
-            .expect("Should be ablet to spawn threads");
-
-        Ok(Self {
-            inner: source,
-            input_tx,
-            denoised_rx,
-            ready: [0.0; BLOCK_SHIFT],
-            state: IterState::Startup { enabled: true },
-            next: BLOCK_SHIFT,
-            queued: Queue::new(),
-        })
-    }
-
-    pub fn set_enabled(&mut self, enabled: bool) {
-        self.state = match (enabled, self.state) {
-            (false, IterState::StartingMidAudio { .. }) | (false, IterState::Enabled) => {
-                IterState::Disabled
-            }
-            (false, IterState::Startup { enabled: true }) => IterState::Startup { enabled: false },
-            (true, IterState::Disabled) => IterState::StartingMidAudio { fed_to_denoiser: 0 },
-            (_, state) => state,
-        };
-    }
-
-    fn feed(&self, sub_block: [f32; BLOCK_SHIFT]) {
-        self.input_tx.send(sub_block).unwrap();
-    }
-}
-
-fn run_neural_denoiser(
-    denoised_tx: mpsc::Sender<[f32; BLOCK_SHIFT]>,
-    input_rx: mpsc::Receiver<[f32; BLOCK_SHIFT]>,
-) {
-    let mut engine = Engine::new();
-    loop {
-        let Ok(sub_block) = input_rx.recv() else {
-            // tx must have dropped, stop thread
-            break;
-        };
-
-        let denoised_sub_block = engine.feed(&sub_block);
-        if denoised_tx.send(denoised_sub_block).is_err() {
-            break;
-        }
-    }
-}
-
-impl<S: Source> Source for Denoiser<S> {
-    fn current_span_len(&self) -> Option<usize> {
-        self.inner.current_span_len()
-    }
-
-    fn channels(&self) -> rodio::ChannelCount {
-        self.inner.channels()
-    }
-
-    fn sample_rate(&self) -> rodio::SampleRate {
-        self.inner.sample_rate()
-    }
-
-    fn total_duration(&self) -> Option<std::time::Duration> {
-        self.inner.total_duration()
-    }
-}
-
-impl<S: Source> Iterator for Denoiser<S> {
-    type Item = Sample;
-
-    #[inline]
-    fn next(&mut self) -> Option<Self::Item> {
-        self.next += 1;
-        if self.next < self.ready.len() {
-            let sample = self.ready[self.next];
-            return Some(sample);
-        }
-
-        // This is a separate function to prevent it from being inlined
-        // as this code only runs once every 128 samples
-        self.prepare_next_ready()
-            .inspect_err(|_| {
-                log::error!("Denoise engine crashed");
-            })
-            .ok()
-            .flatten()
-    }
-}
-
-#[derive(Debug, thiserror::Error)]
-#[error("Could not send or receive from denoise thread. It must have crashed")]
-struct DenoiseEngineCrashed;
-
-impl<S: Source> Denoiser<S> {
-    #[cold]
-    fn prepare_next_ready(&mut self) -> Result<Option<f32>, DenoiseEngineCrashed> {
-        self.state = match self.state {
-            IterState::Startup { enabled } => {
-                // guaranteed to be coming from silence
-                for _ in 0..3 {
-                    let Some(sub_block) = read_sub_block(&mut self.inner) else {
-                        return Ok(None);
-                    };
-                    self.queued.push(sub_block);
-                    self.input_tx
-                        .send(sub_block)
-                        .map_err(|_| DenoiseEngineCrashed)?;
-                }
-                let Some(sub_block) = read_sub_block(&mut self.inner) else {
-                    return Ok(None);
-                };
-                self.queued.push(sub_block);
-                self.input_tx
-                    .send(sub_block)
-                    .map_err(|_| DenoiseEngineCrashed)?;
-                // throw out old blocks that are denoised silence
-                let _ = self.denoised_rx.iter().take(3).count();
-                self.ready = self.denoised_rx.recv().map_err(|_| DenoiseEngineCrashed)?;
-
-                let Some(sub_block) = read_sub_block(&mut self.inner) else {
-                    return Ok(None);
-                };
-                self.queued.push(sub_block);
-                self.feed(sub_block);
-
-                if enabled {
-                    IterState::Enabled
-                } else {
-                    IterState::Disabled
-                }
-            }
-            IterState::Enabled => {
-                self.ready = self.denoised_rx.recv().map_err(|_| DenoiseEngineCrashed)?;
-                let Some(sub_block) = read_sub_block(&mut self.inner) else {
-                    return Ok(None);
-                };
-                self.queued.push(sub_block);
-                self.input_tx
-                    .send(sub_block)
-                    .map_err(|_| DenoiseEngineCrashed)?;
-                IterState::Enabled
-            }
-            IterState::Disabled => {
-                // Need to maintain the same 512 samples delay such that
-                // we can re-enable at any point.
-                self.ready = self.queued.pop();
-                let Some(sub_block) = read_sub_block(&mut self.inner) else {
-                    return Ok(None);
-                };
-                self.queued.push(sub_block);
-                IterState::Disabled
-            }
-            IterState::StartingMidAudio {
-                fed_to_denoiser: mut sub_blocks_fed,
-            } => {
-                self.ready = self.queued.pop();
-                let Some(sub_block) = read_sub_block(&mut self.inner) else {
-                    return Ok(None);
-                };
-                self.queued.push(sub_block);
-                self.input_tx
-                    .send(sub_block)
-                    .map_err(|_| DenoiseEngineCrashed)?;
-                sub_blocks_fed += 1;
-                if sub_blocks_fed > 4 {
-                    // throw out partially denoised blocks,
-                    // next will be correctly denoised
-                    let _ = self.denoised_rx.iter().take(3).count();
-                    IterState::Enabled
-                } else {
-                    IterState::StartingMidAudio {
-                        fed_to_denoiser: sub_blocks_fed,
-                    }
-                }
-            }
-        };
-
-        self.next = 0;
-        Ok(Some(self.ready[0]))
-    }
-}
-
-fn read_sub_block(s: &mut impl Source) -> Option<[f32; BLOCK_SHIFT]> {
-    let mut res = [0f32; BLOCK_SHIFT];
-    for sample in &mut res {
-        *sample = s.next()?;
-    }
-    Some(res)
-}
diff --git a/crates/diagnostics/Cargo.toml b/crates/diagnostics/Cargo.toml
deleted file mode 100644
index 0eccf44c35..0000000000
--- a/crates/diagnostics/Cargo.toml
+++ /dev/null
@@ -1,51 +0,0 @@
-[package]
-name = "diagnostics"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/diagnostics.rs"
-doctest = false
-
-[dependencies]
-anyhow.workspace = true
-collections.workspace = true
-component.workspace = true
-ctor.workspace = true
-editor.workspace = true
-gpui.workspace = true
-indoc.workspace = true
-language.workspace = true
-log.workspace = true
-lsp.workspace = true
-markdown.workspace = true
-project.workspace = true
-rand.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-text.workspace = true
-theme.workspace = true
-ui.workspace = true
-util.workspace = true
-workspace.workspace = true
-itertools.workspace = true
-
-[dev-dependencies]
-client = { workspace = true, features = ["test-support"] }
-editor = { workspace = true, features = ["test-support"] }
-gpui = { workspace = true, features = ["test-support"] }
-language = { workspace = true, features = ["test-support"] }
-markdown = { workspace = true, features = ["test-support"] }
-lsp = { workspace = true, features=["test-support"] }
-serde_json.workspace = true
-theme = { workspace = true, features = ["test-support"] }
-unindent.workspace = true
-workspace = { workspace = true, features = ["test-support"] }
-pretty_assertions.workspace = true
-zlog.workspace = true
diff --git a/crates/diagnostics/LICENSE-GPL b/crates/diagnostics/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/diagnostics/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/diagnostics/src/buffer_diagnostics.rs b/crates/diagnostics/src/buffer_diagnostics.rs
deleted file mode 100644
index 0fd8783dd5..0000000000
--- a/crates/diagnostics/src/buffer_diagnostics.rs
+++ /dev/null
@@ -1,1008 +0,0 @@
-use crate::{
-    DIAGNOSTICS_UPDATE_DEBOUNCE, IncludeWarnings, ToggleWarnings, context_range_for_entry,
-    diagnostic_renderer::{DiagnosticBlock, DiagnosticRenderer},
-    toolbar_controls::DiagnosticsToolbarEditor,
-};
-use anyhow::Result;
-use collections::HashMap;
-use editor::{
-    Editor, EditorEvent, ExcerptRange, MultiBuffer, PathKey,
-    display_map::{BlockPlacement, BlockProperties, BlockStyle, CustomBlockId},
-    multibuffer_context_lines,
-};
-use gpui::{
-    AnyElement, App, AppContext, Context, Entity, EntityId, EventEmitter, FocusHandle, Focusable,
-    InteractiveElement, IntoElement, ParentElement, Render, SharedString, Styled, Subscription,
-    Task, WeakEntity, Window, actions, div,
-};
-use language::{Buffer, DiagnosticEntry, DiagnosticEntryRef, Point};
-use project::{
-    DiagnosticSummary, Event, Project, ProjectItem, ProjectPath,
-    project_settings::{DiagnosticSeverity, ProjectSettings},
-};
-use settings::Settings;
-use std::{
-    any::{Any, TypeId},
-    cmp::{self, Ordering},
-    sync::Arc,
-};
-use text::{Anchor, BufferSnapshot, OffsetRangeExt};
-use ui::{Button, ButtonStyle, Icon, IconName, Label, Tooltip, h_flex, prelude::*};
-use workspace::{
-    ItemHandle, ItemNavHistory, ToolbarItemLocation, Workspace,
-    item::{BreadcrumbText, Item, ItemEvent, TabContentParams},
-};
-
-actions!(
-    diagnostics,
-    [
-        /// Opens the project diagnostics view for the currently focused file.
-        DeployCurrentFile,
-    ]
-);
-
-/// The `BufferDiagnosticsEditor` is meant to be used when dealing specifically
-/// with diagnostics for a single buffer, as only the excerpts of the buffer
-/// where diagnostics are available are displayed.
-pub(crate) struct BufferDiagnosticsEditor {
-    pub project: Entity<Project>,
-    focus_handle: FocusHandle,
-    editor: Entity<Editor>,
-    /// The current diagnostic entries in the `BufferDiagnosticsEditor`. Used to
-    /// allow quick comparison of updated diagnostics, to confirm if anything
-    /// has changed.
-    pub(crate) diagnostics: Vec<DiagnosticEntry<Anchor>>,
-    /// The blocks used to display the diagnostics' content in the editor, next
-    /// to the excerpts where the diagnostic originated.
-    blocks: Vec<CustomBlockId>,
-    /// Multibuffer to contain all excerpts that contain diagnostics, which are
-    /// to be rendered in the editor.
-    multibuffer: Entity<MultiBuffer>,
-    /// The buffer for which the editor is displaying diagnostics and excerpts
-    /// for.
-    buffer: Option<Entity<Buffer>>,
-    /// The path for which the editor is displaying diagnostics for.
-    project_path: ProjectPath,
-    /// Summary of the number of warnings and errors for the path. Used to
-    /// display the number of warnings and errors in the tab's content.
-    summary: DiagnosticSummary,
-    /// Whether to include warnings in the list of diagnostics shown in the
-    /// editor.
-    pub(crate) include_warnings: bool,
-    /// Keeps track of whether there's a background task already running to
-    /// update the excerpts, in order to avoid firing multiple tasks for this purpose.
-    pub(crate) update_excerpts_task: Option<Task<Result<()>>>,
-    /// The project's subscription, responsible for processing events related to
-    /// diagnostics.
-    _subscription: Subscription,
-}
-
-impl BufferDiagnosticsEditor {
-    /// Creates new instance of the `BufferDiagnosticsEditor` which can then be
-    /// displayed by adding it to a pane.
-    pub fn new(
-        project_path: ProjectPath,
-        project_handle: Entity<Project>,
-        buffer: Option<Entity<Buffer>>,
-        include_warnings: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        // Subscribe to project events related to diagnostics so the
-        // `BufferDiagnosticsEditor` can update its state accordingly.
-        let project_event_subscription = cx.subscribe_in(
-            &project_handle,
-            window,
-            |buffer_diagnostics_editor, _project, event, window, cx| match event {
-                Event::DiskBasedDiagnosticsStarted { .. } => {
-                    cx.notify();
-                }
-                Event::DiskBasedDiagnosticsFinished { .. } => {
-                    buffer_diagnostics_editor.update_all_excerpts(window, cx);
-                }
-                Event::DiagnosticsUpdated {
-                    paths,
-                    language_server_id,
-                } => {
-                    // When diagnostics have been updated, the
-                    // `BufferDiagnosticsEditor` should update its state only if
-                    // one of the paths matches its `project_path`, otherwise
-                    // the event should be ignored.
-                    if paths.contains(&buffer_diagnostics_editor.project_path) {
-                        buffer_diagnostics_editor.update_diagnostic_summary(cx);
-
-                        if buffer_diagnostics_editor.editor.focus_handle(cx).contains_focused(window, cx) || buffer_diagnostics_editor.focus_handle.contains_focused(window, cx) {
-                            log::debug!("diagnostics updated for server {language_server_id}. recording change");
-                        } else {
-                            log::debug!("diagnostics updated for server {language_server_id}. updating excerpts");
-                            buffer_diagnostics_editor.update_all_excerpts(window, cx);
-                        }
-                    }
-                }
-                _ => {}
-            },
-        );
-
-        let focus_handle = cx.focus_handle();
-
-        cx.on_focus_in(
-            &focus_handle,
-            window,
-            |buffer_diagnostics_editor, window, cx| buffer_diagnostics_editor.focus_in(window, cx),
-        )
-        .detach();
-
-        cx.on_focus_out(
-            &focus_handle,
-            window,
-            |buffer_diagnostics_editor, _event, window, cx| {
-                buffer_diagnostics_editor.focus_out(window, cx)
-            },
-        )
-        .detach();
-
-        let summary = project_handle
-            .read(cx)
-            .diagnostic_summary_for_path(&project_path, cx);
-
-        let multibuffer = cx.new(|cx| MultiBuffer::new(project_handle.read(cx).capability()));
-        let max_severity = Self::max_diagnostics_severity(include_warnings);
-        let editor = cx.new(|cx| {
-            let mut editor = Editor::for_multibuffer(
-                multibuffer.clone(),
-                Some(project_handle.clone()),
-                window,
-                cx,
-            );
-            editor.set_vertical_scroll_margin(5, cx);
-            editor.disable_inline_diagnostics();
-            editor.set_max_diagnostics_severity(max_severity, cx);
-            editor.set_all_diagnostics_active(cx);
-            editor
-        });
-
-        // Subscribe to events triggered by the editor in order to correctly
-        // update the buffer's excerpts.
-        cx.subscribe_in(
-            &editor,
-            window,
-            |buffer_diagnostics_editor, _editor, event: &EditorEvent, window, cx| {
-                cx.emit(event.clone());
-
-                match event {
-                    // If the user tries to focus on the editor but there's actually
-                    // no excerpts for the buffer, focus back on the
-                    // `BufferDiagnosticsEditor` instance.
-                    EditorEvent::Focused => {
-                        if buffer_diagnostics_editor.multibuffer.read(cx).is_empty() {
-                            window.focus(&buffer_diagnostics_editor.focus_handle);
-                        }
-                    }
-                    EditorEvent::Blurred => {
-                        buffer_diagnostics_editor.update_all_excerpts(window, cx)
-                    }
-                    _ => {}
-                }
-            },
-        )
-        .detach();
-
-        let diagnostics = vec![];
-        let update_excerpts_task = None;
-        let mut buffer_diagnostics_editor = Self {
-            project: project_handle,
-            focus_handle,
-            editor,
-            diagnostics,
-            blocks: Default::default(),
-            multibuffer,
-            buffer,
-            project_path,
-            summary,
-            include_warnings,
-            update_excerpts_task,
-            _subscription: project_event_subscription,
-        };
-
-        buffer_diagnostics_editor.update_all_diagnostics(window, cx);
-        buffer_diagnostics_editor
-    }
-
-    fn deploy(
-        workspace: &mut Workspace,
-        _: &DeployCurrentFile,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        // Determine the currently opened path by finding the active editor and
-        // finding the project path for the buffer.
-        // If there's no active editor with a project path, avoiding deploying
-        // the buffer diagnostics view.
-        if let Some(editor) = workspace.active_item_as::<Editor>(cx)
-            && let Some(project_path) = editor.project_path(cx)
-        {
-            // Check if there's already a `BufferDiagnosticsEditor` tab for this
-            // same path, and if so, focus on that one instead of creating a new
-            // one.
-            let existing_editor = workspace
-                .items_of_type::<BufferDiagnosticsEditor>(cx)
-                .find(|editor| editor.read(cx).project_path == project_path);
-
-            if let Some(editor) = existing_editor {
-                workspace.activate_item(&editor, true, true, window, cx);
-            } else {
-                let include_warnings = match cx.try_global::<IncludeWarnings>() {
-                    Some(include_warnings) => include_warnings.0,
-                    None => ProjectSettings::get_global(cx).diagnostics.include_warnings,
-                };
-
-                let item = cx.new(|cx| {
-                    Self::new(
-                        project_path,
-                        workspace.project().clone(),
-                        editor.read(cx).buffer().read(cx).as_singleton(),
-                        include_warnings,
-                        window,
-                        cx,
-                    )
-                });
-
-                workspace.add_item_to_active_pane(Box::new(item), None, true, window, cx);
-            }
-        }
-    }
-
-    pub fn register(
-        workspace: &mut Workspace,
-        _window: Option<&mut Window>,
-        _: &mut Context<Workspace>,
-    ) {
-        workspace.register_action(Self::deploy);
-    }
-
-    fn update_all_diagnostics(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.update_all_excerpts(window, cx);
-    }
-
-    fn update_diagnostic_summary(&mut self, cx: &mut Context<Self>) {
-        let project = self.project.read(cx);
-
-        self.summary = project.diagnostic_summary_for_path(&self.project_path, cx);
-    }
-
-    /// Enqueue an update to the excerpts and diagnostic blocks being shown in
-    /// the editor.
-    pub(crate) fn update_all_excerpts(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        // If there's already a task updating the excerpts, early return and let
-        // the other task finish.
-        if self.update_excerpts_task.is_some() {
-            return;
-        }
-
-        let buffer = self.buffer.clone();
-
-        self.update_excerpts_task = Some(cx.spawn_in(window, async move |editor, cx| {
-            cx.background_executor()
-                .timer(DIAGNOSTICS_UPDATE_DEBOUNCE)
-                .await;
-
-            if let Some(buffer) = buffer {
-                editor
-                    .update_in(cx, |editor, window, cx| {
-                        editor.update_excerpts(buffer, window, cx)
-                    })?
-                    .await?;
-            };
-
-            let _ = editor.update(cx, |editor, cx| {
-                editor.update_excerpts_task = None;
-                cx.notify();
-            });
-
-            Ok(())
-        }));
-    }
-
-    /// Updates the excerpts in the `BufferDiagnosticsEditor` for a single
-    /// buffer.
-    fn update_excerpts(
-        &mut self,
-        buffer: Entity<Buffer>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let was_empty = self.multibuffer.read(cx).is_empty();
-        let multibuffer_context = multibuffer_context_lines(cx);
-        let buffer_snapshot = buffer.read(cx).snapshot();
-        let buffer_snapshot_max = buffer_snapshot.max_point();
-        let max_severity = Self::max_diagnostics_severity(self.include_warnings)
-            .into_lsp()
-            .unwrap_or(lsp::DiagnosticSeverity::WARNING);
-
-        cx.spawn_in(window, async move |buffer_diagnostics_editor, mut cx| {
-            // Fetch the diagnostics for the whole of the buffer
-            // (`Point::zero()..buffer_snapshot.max_point()`) so we can confirm
-            // if the diagnostics changed, if it didn't, early return as there's
-            // nothing to update.
-            let diagnostics = buffer_snapshot
-                .diagnostics_in_range::<_, Anchor>(Point::zero()..buffer_snapshot_max, false)
-                .collect::<Vec<_>>();
-
-            let unchanged =
-                buffer_diagnostics_editor.update(cx, |buffer_diagnostics_editor, _cx| {
-                    if buffer_diagnostics_editor
-                        .diagnostics_are_unchanged(&diagnostics, &buffer_snapshot)
-                    {
-                        return true;
-                    }
-
-                    buffer_diagnostics_editor.set_diagnostics(&diagnostics);
-                    return false;
-                })?;
-
-            if unchanged {
-                return Ok(());
-            }
-
-            // Mapping between the Group ID and a vector of DiagnosticEntry.
-            let mut grouped: HashMap<usize, Vec<_>> = HashMap::default();
-            for entry in diagnostics {
-                grouped
-                    .entry(entry.diagnostic.group_id)
-                    .or_default()
-                    .push(DiagnosticEntryRef {
-                        range: entry.range.to_point(&buffer_snapshot),
-                        diagnostic: entry.diagnostic,
-                    })
-            }
-
-            let mut blocks: Vec<DiagnosticBlock> = Vec::new();
-            for (_, group) in grouped {
-                // If the minimum severity of the group is higher than the
-                // maximum severity, or it doesn't even have severity, skip this
-                // group.
-                if group
-                    .iter()
-                    .map(|d| d.diagnostic.severity)
-                    .min()
-                    .is_none_or(|severity| severity > max_severity)
-                {
-                    continue;
-                }
-
-                let languages = buffer_diagnostics_editor
-                    .read_with(cx, |b, cx| b.project.read(cx).languages().clone())
-                    .ok();
-
-                let diagnostic_blocks = cx.update(|_window, cx| {
-                    DiagnosticRenderer::diagnostic_blocks_for_group(
-                        group,
-                        buffer_snapshot.remote_id(),
-                        Some(Arc::new(buffer_diagnostics_editor.clone())),
-                        languages,
-                        cx,
-                    )
-                })?;
-
-                // For each of the diagnostic blocks to be displayed in the
-                // editor, figure out its index in the list of blocks.
-                //
-                // The following rules are used to determine the order:
-                // 1. Blocks with a lower start position should come first.
-                // 2. If two blocks have the same start position, the one with
-                // the higher end position should come first.
-                for diagnostic_block in diagnostic_blocks {
-                    let index = blocks.partition_point(|probe| {
-                        match probe
-                            .initial_range
-                            .start
-                            .cmp(&diagnostic_block.initial_range.start)
-                        {
-                            Ordering::Less => true,
-                            Ordering::Greater => false,
-                            Ordering::Equal => {
-                                probe.initial_range.end > diagnostic_block.initial_range.end
-                            }
-                        }
-                    });
-
-                    blocks.insert(index, diagnostic_block);
-                }
-            }
-
-            // Build the excerpt ranges for this specific buffer's diagnostics,
-            // so those excerpts can later be used to update the excerpts shown
-            // in the editor.
-            // This is done by iterating over the list of diagnostic blocks and
-            // determine what range does the diagnostic block span.
-            let mut excerpt_ranges: Vec<ExcerptRange<_>> = Vec::new();
-
-            for diagnostic_block in blocks.iter() {
-                let excerpt_range = context_range_for_entry(
-                    diagnostic_block.initial_range.clone(),
-                    multibuffer_context,
-                    buffer_snapshot.clone(),
-                    &mut cx,
-                )
-                .await;
-                let initial_range = buffer_snapshot
-                    .anchor_after(diagnostic_block.initial_range.start)
-                    ..buffer_snapshot.anchor_before(diagnostic_block.initial_range.end);
-
-                let bin_search = |probe: &ExcerptRange<text::Anchor>| {
-                    let context_start = || {
-                        probe
-                            .context
-                            .start
-                            .cmp(&excerpt_range.start, &buffer_snapshot)
-                    };
-                    let context_end =
-                        || probe.context.end.cmp(&excerpt_range.end, &buffer_snapshot);
-                    let primary_start = || {
-                        probe
-                            .primary
-                            .start
-                            .cmp(&initial_range.start, &buffer_snapshot)
-                    };
-                    let primary_end =
-                        || probe.primary.end.cmp(&initial_range.end, &buffer_snapshot);
-                    context_start()
-                        .then_with(context_end)
-                        .then_with(primary_start)
-                        .then_with(primary_end)
-                        .then(cmp::Ordering::Greater)
-                };
-
-                let index = excerpt_ranges
-                    .binary_search_by(bin_search)
-                    .unwrap_or_else(|i| i);
-
-                excerpt_ranges.insert(
-                    index,
-                    ExcerptRange {
-                        context: excerpt_range,
-                        primary: initial_range,
-                    },
-                )
-            }
-
-            // Finally, update the editor's content with the new excerpt ranges
-            // for this editor, as well as the diagnostic blocks.
-            buffer_diagnostics_editor.update_in(cx, |buffer_diagnostics_editor, window, cx| {
-                // Remove the list of `CustomBlockId` from the editor's display
-                // map, ensuring that if any diagnostics have been solved, the
-                // associated block stops being shown.
-                let block_ids = buffer_diagnostics_editor.blocks.clone();
-
-                buffer_diagnostics_editor.editor.update(cx, |editor, cx| {
-                    editor.display_map.update(cx, |display_map, cx| {
-                        display_map.remove_blocks(block_ids.into_iter().collect(), cx);
-                    })
-                });
-
-                let (anchor_ranges, _) =
-                    buffer_diagnostics_editor
-                        .multibuffer
-                        .update(cx, |multibuffer, cx| {
-                            let excerpt_ranges = excerpt_ranges
-                                .into_iter()
-                                .map(|range| ExcerptRange {
-                                    context: range.context.to_point(&buffer_snapshot),
-                                    primary: range.primary.to_point(&buffer_snapshot),
-                                })
-                                .collect();
-                            multibuffer.set_excerpt_ranges_for_path(
-                                PathKey::for_buffer(&buffer, cx),
-                                buffer.clone(),
-                                &buffer_snapshot,
-                                excerpt_ranges,
-                                cx,
-                            )
-                        });
-
-                if was_empty {
-                    if let Some(anchor_range) = anchor_ranges.first() {
-                        let range_to_select = anchor_range.start..anchor_range.start;
-
-                        buffer_diagnostics_editor.editor.update(cx, |editor, cx| {
-                            editor.change_selections(Default::default(), window, cx, |selection| {
-                                selection.select_anchor_ranges([range_to_select])
-                            })
-                        });
-
-                        // If the `BufferDiagnosticsEditor` is currently
-                        // focused, move focus to its editor.
-                        if buffer_diagnostics_editor.focus_handle.is_focused(window) {
-                            buffer_diagnostics_editor
-                                .editor
-                                .read(cx)
-                                .focus_handle(cx)
-                                .focus(window);
-                        }
-                    }
-                }
-
-                // Cloning the blocks before moving ownership so these can later
-                // be used to set the block contents for testing purposes.
-                #[cfg(test)]
-                let cloned_blocks = blocks.clone();
-
-                // Build new diagnostic blocks to be added to the editor's
-                // display map for the new diagnostics. Update the `blocks`
-                // property before finishing, to ensure the blocks are removed
-                // on the next execution.
-                let editor_blocks =
-                    anchor_ranges
-                        .into_iter()
-                        .zip(blocks.into_iter())
-                        .map(|(anchor, block)| {
-                            let editor = buffer_diagnostics_editor.editor.downgrade();
-
-                            BlockProperties {
-                                placement: BlockPlacement::Near(anchor.start),
-                                height: Some(1),
-                                style: BlockStyle::Flex,
-                                render: Arc::new(move |block_context| {
-                                    block.render_block(editor.clone(), block_context)
-                                }),
-                                priority: 1,
-                            }
-                        });
-
-                let block_ids = buffer_diagnostics_editor.editor.update(cx, |editor, cx| {
-                    editor.display_map.update(cx, |display_map, cx| {
-                        display_map.insert_blocks(editor_blocks, cx)
-                    })
-                });
-
-                // In order to be able to verify which diagnostic blocks are
-                // rendered in the editor, the `set_block_content_for_tests`
-                // function must be used, so that the
-                // `editor::test::editor_content_with_blocks` function can then
-                // be called to fetch these blocks.
-                #[cfg(test)]
-                {
-                    for (block_id, block) in block_ids.iter().zip(cloned_blocks.iter()) {
-                        let markdown = block.markdown.clone();
-                        editor::test::set_block_content_for_tests(
-                            &buffer_diagnostics_editor.editor,
-                            *block_id,
-                            cx,
-                            move |cx| {
-                                markdown::MarkdownElement::rendered_text(
-                                    markdown.clone(),
-                                    cx,
-                                    editor::hover_popover::diagnostics_markdown_style,
-                                )
-                            },
-                        );
-                    }
-                }
-
-                buffer_diagnostics_editor.blocks = block_ids;
-                cx.notify()
-            })
-        })
-    }
-
-    fn set_diagnostics(&mut self, diagnostics: &[DiagnosticEntryRef<'_, Anchor>]) {
-        self.diagnostics = diagnostics
-            .iter()
-            .map(DiagnosticEntryRef::to_owned)
-            .collect();
-    }
-
-    fn diagnostics_are_unchanged(
-        &self,
-        diagnostics: &Vec<DiagnosticEntryRef<'_, Anchor>>,
-        snapshot: &BufferSnapshot,
-    ) -> bool {
-        if self.diagnostics.len() != diagnostics.len() {
-            return false;
-        }
-
-        self.diagnostics
-            .iter()
-            .zip(diagnostics.iter())
-            .all(|(existing, new)| {
-                existing.diagnostic.message == new.diagnostic.message
-                    && existing.diagnostic.severity == new.diagnostic.severity
-                    && existing.diagnostic.is_primary == new.diagnostic.is_primary
-                    && existing.range.to_offset(snapshot) == new.range.to_offset(snapshot)
-            })
-    }
-
-    fn focus_in(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        // If the `BufferDiagnosticsEditor` is focused and the multibuffer is
-        // not empty, focus on the editor instead, which will allow the user to
-        // start interacting and editing the buffer's contents.
-        if self.focus_handle.is_focused(window) && !self.multibuffer.read(cx).is_empty() {
-            self.editor.focus_handle(cx).focus(window)
-        }
-    }
-
-    fn focus_out(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if !self.focus_handle.is_focused(window) && !self.editor.focus_handle(cx).is_focused(window)
-        {
-            self.update_all_excerpts(window, cx);
-        }
-    }
-
-    pub fn toggle_warnings(
-        &mut self,
-        _: &ToggleWarnings,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let include_warnings = !self.include_warnings;
-        let max_severity = Self::max_diagnostics_severity(include_warnings);
-
-        self.editor.update(cx, |editor, cx| {
-            editor.set_max_diagnostics_severity(max_severity, cx);
-        });
-
-        self.include_warnings = include_warnings;
-        self.diagnostics.clear();
-        self.update_all_diagnostics(window, cx);
-    }
-
-    fn max_diagnostics_severity(include_warnings: bool) -> DiagnosticSeverity {
-        match include_warnings {
-            true => DiagnosticSeverity::Warning,
-            false => DiagnosticSeverity::Error,
-        }
-    }
-
-    #[cfg(test)]
-    pub fn editor(&self) -> &Entity<Editor> {
-        &self.editor
-    }
-
-    #[cfg(test)]
-    pub fn summary(&self) -> &DiagnosticSummary {
-        &self.summary
-    }
-}
-
-impl Focusable for BufferDiagnosticsEditor {
-    fn focus_handle(&self, _: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl EventEmitter<EditorEvent> for BufferDiagnosticsEditor {}
-
-impl Item for BufferDiagnosticsEditor {
-    type Event = EditorEvent;
-
-    fn act_as_type<'a>(
-        &'a self,
-        type_id: std::any::TypeId,
-        self_handle: &'a Entity<Self>,
-        _: &'a App,
-    ) -> Option<gpui::AnyEntity> {
-        if type_id == TypeId::of::<Self>() {
-            Some(self_handle.clone().into())
-        } else if type_id == TypeId::of::<Editor>() {
-            Some(self.editor.clone().into())
-        } else {
-            None
-        }
-    }
-
-    fn added_to_workspace(
-        &mut self,
-        workspace: &mut Workspace,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.editor.update(cx, |editor, cx| {
-            editor.added_to_workspace(workspace, window, cx)
-        });
-    }
-
-    fn breadcrumb_location(&self, _: &App) -> ToolbarItemLocation {
-        ToolbarItemLocation::PrimaryLeft
-    }
-
-    fn breadcrumbs(&self, theme: &theme::Theme, cx: &App) -> Option<Vec<BreadcrumbText>> {
-        self.editor.breadcrumbs(theme, cx)
-    }
-
-    fn can_save(&self, _cx: &App) -> bool {
-        true
-    }
-
-    fn can_split(&self) -> bool {
-        true
-    }
-
-    fn clone_on_split(
-        &self,
-        _workspace_id: Option<workspace::WorkspaceId>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Option<Entity<Self>>>
-    where
-        Self: Sized,
-    {
-        Task::ready(Some(cx.new(|cx| {
-            BufferDiagnosticsEditor::new(
-                self.project_path.clone(),
-                self.project.clone(),
-                self.buffer.clone(),
-                self.include_warnings,
-                window,
-                cx,
-            )
-        })))
-    }
-
-    fn deactivated(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.editor
-            .update(cx, |editor, cx| editor.deactivated(window, cx));
-    }
-
-    fn for_each_project_item(&self, cx: &App, f: &mut dyn FnMut(EntityId, &dyn ProjectItem)) {
-        self.editor.for_each_project_item(cx, f);
-    }
-
-    fn has_conflict(&self, cx: &App) -> bool {
-        self.multibuffer.read(cx).has_conflict(cx)
-    }
-
-    fn has_deleted_file(&self, cx: &App) -> bool {
-        self.multibuffer.read(cx).has_deleted_file(cx)
-    }
-
-    fn is_dirty(&self, cx: &App) -> bool {
-        self.multibuffer.read(cx).is_dirty(cx)
-    }
-
-    fn navigate(
-        &mut self,
-        data: Box<dyn Any>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> bool {
-        self.editor
-            .update(cx, |editor, cx| editor.navigate(data, window, cx))
-    }
-
-    fn reload(
-        &mut self,
-        project: Entity<Project>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        self.editor.reload(project, window, cx)
-    }
-
-    fn save(
-        &mut self,
-        options: workspace::item::SaveOptions,
-        project: Entity<Project>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        self.editor.save(options, project, window, cx)
-    }
-
-    fn save_as(
-        &mut self,
-        _project: Entity<Project>,
-        _path: ProjectPath,
-        _window: &mut Window,
-        _cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        unreachable!()
-    }
-
-    fn set_nav_history(
-        &mut self,
-        nav_history: ItemNavHistory,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.editor.update(cx, |editor, _| {
-            editor.set_nav_history(Some(nav_history));
-        })
-    }
-
-    // Builds the content to be displayed in the tab.
-    fn tab_content(&self, params: TabContentParams, _window: &Window, cx: &App) -> AnyElement {
-        let path_style = self.project.read(cx).path_style(cx);
-        let error_count = self.summary.error_count;
-        let warning_count = self.summary.warning_count;
-        let label = Label::new(
-            self.project_path
-                .path
-                .file_name()
-                .map(|s| s.to_string())
-                .unwrap_or_else(|| self.project_path.path.display(path_style).to_string()),
-        );
-
-        h_flex()
-            .gap_1()
-            .child(label)
-            .when(error_count == 0 && warning_count == 0, |parent| {
-                parent.child(
-                    h_flex()
-                        .gap_1()
-                        .child(Icon::new(IconName::Check).color(Color::Success)),
-                )
-            })
-            .when(error_count > 0, |parent| {
-                parent.child(
-                    h_flex()
-                        .gap_1()
-                        .child(Icon::new(IconName::XCircle).color(Color::Error))
-                        .child(Label::new(error_count.to_string()).color(params.text_color())),
-                )
-            })
-            .when(warning_count > 0, |parent| {
-                parent.child(
-                    h_flex()
-                        .gap_1()
-                        .child(Icon::new(IconName::Warning).color(Color::Warning))
-                        .child(Label::new(warning_count.to_string()).color(params.text_color())),
-                )
-            })
-            .into_any_element()
-    }
-
-    fn tab_content_text(&self, _detail: usize, _app: &App) -> SharedString {
-        "Buffer Diagnostics".into()
-    }
-
-    fn tab_tooltip_text(&self, cx: &App) -> Option<SharedString> {
-        let path_style = self.project.read(cx).path_style(cx);
-        Some(
-            format!(
-                "Buffer Diagnostics - {}",
-                self.project_path.path.display(path_style)
-            )
-            .into(),
-        )
-    }
-
-    fn telemetry_event_text(&self) -> Option<&'static str> {
-        Some("Buffer Diagnostics Opened")
-    }
-
-    fn to_item_events(event: &EditorEvent, f: impl FnMut(ItemEvent)) {
-        Editor::to_item_events(event, f)
-    }
-}
-
-impl Render for BufferDiagnosticsEditor {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let path_style = self.project.read(cx).path_style(cx);
-        let filename = self.project_path.path.display(path_style).to_string();
-        let error_count = self.summary.error_count;
-        let warning_count = match self.include_warnings {
-            true => self.summary.warning_count,
-            false => 0,
-        };
-
-        let child = if error_count + warning_count == 0 {
-            let label = match warning_count {
-                0 => "No problems in",
-                _ => "No errors in",
-            };
-
-            v_flex()
-                .key_context("EmptyPane")
-                .size_full()
-                .gap_1()
-                .justify_center()
-                .items_center()
-                .text_center()
-                .bg(cx.theme().colors().editor_background)
-                .child(
-                    div()
-                        .h_flex()
-                        .child(Label::new(label).color(Color::Muted))
-                        .child(
-                            Button::new("open-file", filename)
-                                .style(ButtonStyle::Transparent)
-                                .tooltip(Tooltip::text("Open File"))
-                                .on_click(cx.listener(|buffer_diagnostics, _, window, cx| {
-                                    if let Some(workspace) = window.root::<Workspace>().flatten() {
-                                        workspace.update(cx, |workspace, cx| {
-                                            workspace
-                                                .open_path(
-                                                    buffer_diagnostics.project_path.clone(),
-                                                    None,
-                                                    true,
-                                                    window,
-                                                    cx,
-                                                )
-                                                .detach_and_log_err(cx);
-                                        })
-                                    }
-                                })),
-                        ),
-                )
-                .when(self.summary.warning_count > 0, |div| {
-                    let label = match self.summary.warning_count {
-                        1 => "Show 1 warning".into(),
-                        warning_count => format!("Show {} warnings", warning_count),
-                    };
-
-                    div.child(
-                        Button::new("diagnostics-show-warning-label", label).on_click(cx.listener(
-                            |buffer_diagnostics_editor, _, window, cx| {
-                                buffer_diagnostics_editor.toggle_warnings(
-                                    &Default::default(),
-                                    window,
-                                    cx,
-                                );
-                                cx.notify();
-                            },
-                        )),
-                    )
-                })
-        } else {
-            div().size_full().child(self.editor.clone())
-        };
-
-        div()
-            .key_context("Diagnostics")
-            .track_focus(&self.focus_handle(cx))
-            .size_full()
-            .child(child)
-    }
-}
-
-impl DiagnosticsToolbarEditor for WeakEntity<BufferDiagnosticsEditor> {
-    fn include_warnings(&self, cx: &App) -> bool {
-        self.read_with(cx, |buffer_diagnostics_editor, _cx| {
-            buffer_diagnostics_editor.include_warnings
-        })
-        .unwrap_or(false)
-    }
-
-    fn is_updating(&self, cx: &App) -> bool {
-        self.read_with(cx, |buffer_diagnostics_editor, cx| {
-            buffer_diagnostics_editor.update_excerpts_task.is_some()
-                || buffer_diagnostics_editor
-                    .project
-                    .read(cx)
-                    .language_servers_running_disk_based_diagnostics(cx)
-                    .next()
-                    .is_some()
-        })
-        .unwrap_or(false)
-    }
-
-    fn stop_updating(&self, cx: &mut App) {
-        let _ = self.update(cx, |buffer_diagnostics_editor, cx| {
-            buffer_diagnostics_editor.update_excerpts_task = None;
-            cx.notify();
-        });
-    }
-
-    fn refresh_diagnostics(&self, window: &mut Window, cx: &mut App) {
-        let _ = self.update(cx, |buffer_diagnostics_editor, cx| {
-            buffer_diagnostics_editor.update_all_excerpts(window, cx);
-        });
-    }
-
-    fn toggle_warnings(&self, window: &mut Window, cx: &mut App) {
-        let _ = self.update(cx, |buffer_diagnostics_editor, cx| {
-            buffer_diagnostics_editor.toggle_warnings(&Default::default(), window, cx);
-        });
-    }
-
-    fn get_diagnostics_for_buffer(
-        &self,
-        _buffer_id: text::BufferId,
-        cx: &App,
-    ) -> Vec<language::DiagnosticEntry<text::Anchor>> {
-        self.read_with(cx, |buffer_diagnostics_editor, _cx| {
-            buffer_diagnostics_editor.diagnostics.clone()
-        })
-        .unwrap_or_default()
-    }
-}
diff --git a/crates/diagnostics/src/diagnostic_renderer.rs b/crates/diagnostics/src/diagnostic_renderer.rs
deleted file mode 100644
index 72ad7b5914..0000000000
--- a/crates/diagnostics/src/diagnostic_renderer.rs
+++ /dev/null
@@ -1,320 +0,0 @@
-use std::{ops::Range, sync::Arc};
-
-use editor::{
-    Anchor, Editor, EditorSnapshot, ToOffset,
-    display_map::{BlockContext, BlockPlacement, BlockProperties, BlockStyle},
-    hover_popover::diagnostics_markdown_style,
-};
-use gpui::{AppContext, Entity, Focusable, WeakEntity};
-use language::{BufferId, Diagnostic, DiagnosticEntryRef, LanguageRegistry};
-use lsp::DiagnosticSeverity;
-use markdown::{Markdown, MarkdownElement};
-use settings::Settings;
-use text::{AnchorRangeExt, Point};
-use theme::ThemeSettings;
-use ui::{
-    ActiveTheme, AnyElement, App, Context, IntoElement, ParentElement, SharedString, Styled,
-    Window, div,
-};
-use util::maybe;
-
-use crate::toolbar_controls::DiagnosticsToolbarEditor;
-
-pub struct DiagnosticRenderer;
-
-impl DiagnosticRenderer {
-    pub fn diagnostic_blocks_for_group(
-        diagnostic_group: Vec<DiagnosticEntryRef<'_, Point>>,
-        buffer_id: BufferId,
-        diagnostics_editor: Option<Arc<dyn DiagnosticsToolbarEditor>>,
-        language_registry: Option<Arc<LanguageRegistry>>,
-        cx: &mut App,
-    ) -> Vec<DiagnosticBlock> {
-        let Some(primary_ix) = diagnostic_group
-            .iter()
-            .position(|d| d.diagnostic.is_primary)
-        else {
-            return Vec::new();
-        };
-        let primary = &diagnostic_group[primary_ix];
-        let group_id = primary.diagnostic.group_id;
-        let mut results = vec![];
-        for entry in diagnostic_group.iter() {
-            let mut markdown = Self::markdown(&entry.diagnostic);
-            if entry.diagnostic.is_primary {
-                let diagnostic = &primary.diagnostic;
-                if diagnostic.source.is_some() || diagnostic.code.is_some() {
-                    markdown.push_str(" (");
-                }
-                if let Some(source) = diagnostic.source.as_ref() {
-                    markdown.push_str(&Markdown::escape(source));
-                }
-                if diagnostic.source.is_some() && diagnostic.code.is_some() {
-                    markdown.push(' ');
-                }
-                if let Some(code) = diagnostic.code.as_ref() {
-                    if let Some(description) = diagnostic.code_description.as_ref() {
-                        markdown.push('[');
-                        markdown.push_str(&Markdown::escape(&code.to_string()));
-                        markdown.push_str("](");
-                        markdown.push_str(&Markdown::escape(description.as_ref()));
-                        markdown.push(')');
-                    } else {
-                        markdown.push_str(&Markdown::escape(&code.to_string()));
-                    }
-                }
-                if diagnostic.source.is_some() || diagnostic.code.is_some() {
-                    markdown.push(')');
-                }
-
-                for (ix, entry) in diagnostic_group.iter().enumerate() {
-                    if entry.range.start.row.abs_diff(primary.range.start.row) >= 5 {
-                        markdown.push_str("\n- hint: [");
-                        markdown.push_str(&Markdown::escape(&entry.diagnostic.message));
-                        markdown.push_str(&format!(
-                            "](file://#diagnostic-{buffer_id}-{group_id}-{ix})\n",
-                        ))
-                    }
-                }
-
-                results.push(DiagnosticBlock {
-                    initial_range: primary.range.clone(),
-                    severity: primary.diagnostic.severity,
-                    diagnostics_editor: diagnostics_editor.clone(),
-                    markdown: cx.new(|cx| {
-                        Markdown::new(markdown.into(), language_registry.clone(), None, cx)
-                    }),
-                });
-            } else {
-                if entry.range.start.row.abs_diff(primary.range.start.row) >= 5 {
-                    markdown.push_str(&format!(
-                        " ([back](file://#diagnostic-{buffer_id}-{group_id}-{primary_ix}))"
-                    ));
-                }
-                results.push(DiagnosticBlock {
-                    initial_range: entry.range.clone(),
-                    severity: entry.diagnostic.severity,
-                    diagnostics_editor: diagnostics_editor.clone(),
-                    markdown: cx.new(|cx| {
-                        Markdown::new(markdown.into(), language_registry.clone(), None, cx)
-                    }),
-                });
-            }
-        }
-
-        results
-    }
-
-    fn markdown(diagnostic: &Diagnostic) -> String {
-        let mut markdown = String::new();
-
-        if let Some(md) = &diagnostic.markdown {
-            markdown.push_str(md);
-        } else {
-            markdown.push_str(&Markdown::escape(&diagnostic.message));
-        };
-        markdown
-    }
-}
-
-impl editor::DiagnosticRenderer for DiagnosticRenderer {
-    fn render_group(
-        &self,
-        diagnostic_group: Vec<DiagnosticEntryRef<'_, Point>>,
-        buffer_id: BufferId,
-        snapshot: EditorSnapshot,
-        editor: WeakEntity<Editor>,
-        language_registry: Option<Arc<LanguageRegistry>>,
-        cx: &mut App,
-    ) -> Vec<BlockProperties<Anchor>> {
-        let blocks = Self::diagnostic_blocks_for_group(
-            diagnostic_group,
-            buffer_id,
-            None,
-            language_registry,
-            cx,
-        );
-
-        blocks
-            .into_iter()
-            .map(|block| {
-                let editor = editor.clone();
-                BlockProperties {
-                    placement: BlockPlacement::Near(
-                        snapshot
-                            .buffer_snapshot()
-                            .anchor_after(block.initial_range.start),
-                    ),
-                    height: Some(1),
-                    style: BlockStyle::Flex,
-                    render: Arc::new(move |bcx| block.render_block(editor.clone(), bcx)),
-                    priority: 1,
-                }
-            })
-            .collect()
-    }
-
-    fn render_hover(
-        &self,
-        diagnostic_group: Vec<DiagnosticEntryRef<'_, Point>>,
-        range: Range<Point>,
-        buffer_id: BufferId,
-        language_registry: Option<Arc<LanguageRegistry>>,
-        cx: &mut App,
-    ) -> Option<Entity<Markdown>> {
-        let blocks = Self::diagnostic_blocks_for_group(
-            diagnostic_group,
-            buffer_id,
-            None,
-            language_registry,
-            cx,
-        );
-        blocks
-            .into_iter()
-            .find_map(|block| (block.initial_range == range).then(|| block.markdown))
-    }
-
-    fn open_link(
-        &self,
-        editor: &mut Editor,
-        link: SharedString,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) {
-        DiagnosticBlock::open_link(editor, &None, link, window, cx);
-    }
-}
-
-#[derive(Clone)]
-pub(crate) struct DiagnosticBlock {
-    pub(crate) initial_range: Range<Point>,
-    pub(crate) severity: DiagnosticSeverity,
-    pub(crate) markdown: Entity<Markdown>,
-    pub(crate) diagnostics_editor: Option<Arc<dyn DiagnosticsToolbarEditor>>,
-}
-
-impl DiagnosticBlock {
-    pub fn render_block(&self, editor: WeakEntity<Editor>, bcx: &BlockContext) -> AnyElement {
-        let cx = &bcx.app;
-        let status_colors = cx.theme().status();
-
-        let max_width = bcx.em_width * 120.;
-
-        let (background_color, border_color) = match self.severity {
-            DiagnosticSeverity::ERROR => (status_colors.error_background, status_colors.error),
-            DiagnosticSeverity::WARNING => {
-                (status_colors.warning_background, status_colors.warning)
-            }
-            DiagnosticSeverity::INFORMATION => (status_colors.info_background, status_colors.info),
-            DiagnosticSeverity::HINT => (status_colors.hint_background, status_colors.info),
-            _ => (status_colors.ignored_background, status_colors.ignored),
-        };
-        let settings = ThemeSettings::get_global(cx);
-        let editor_line_height = (settings.line_height() * settings.buffer_font_size(cx)).round();
-        let line_height = editor_line_height;
-        let diagnostics_editor = self.diagnostics_editor.clone();
-
-        div()
-            .border_l_2()
-            .px_2()
-            .line_height(line_height)
-            .bg(background_color)
-            .border_color(border_color)
-            .max_w(max_width)
-            .child(
-                MarkdownElement::new(
-                    self.markdown.clone(),
-                    diagnostics_markdown_style(bcx.window, cx),
-                )
-                .code_block_renderer(markdown::CodeBlockRenderer::Default {
-                    copy_button: false,
-                    copy_button_on_hover: false,
-                    border: false,
-                })
-                .on_url_click({
-                    move |link, window, cx| {
-                        editor
-                            .update(cx, |editor, cx| {
-                                Self::open_link(editor, &diagnostics_editor, link, window, cx)
-                            })
-                            .ok();
-                    }
-                }),
-            )
-            .into_any_element()
-    }
-
-    pub fn open_link(
-        editor: &mut Editor,
-        diagnostics_editor: &Option<Arc<dyn DiagnosticsToolbarEditor>>,
-        link: SharedString,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) {
-        let Some(diagnostic_link) = link.strip_prefix("file://#diagnostic-") else {
-            editor::hover_popover::open_markdown_url(link, window, cx);
-            return;
-        };
-        let Some((buffer_id, group_id, ix)) = maybe!({
-            let mut parts = diagnostic_link.split('-');
-            let buffer_id: u64 = parts.next()?.parse().ok()?;
-            let group_id: usize = parts.next()?.parse().ok()?;
-            let ix: usize = parts.next()?.parse().ok()?;
-            Some((BufferId::new(buffer_id).ok()?, group_id, ix))
-        }) else {
-            return;
-        };
-
-        if let Some(diagnostics_editor) = diagnostics_editor {
-            if let Some(diagnostic) = diagnostics_editor
-                .get_diagnostics_for_buffer(buffer_id, cx)
-                .into_iter()
-                .filter(|d| d.diagnostic.group_id == group_id)
-                .nth(ix)
-            {
-                let multibuffer = editor.buffer().read(cx);
-                let Some(snapshot) = multibuffer
-                    .buffer(buffer_id)
-                    .map(|entity| entity.read(cx).snapshot())
-                else {
-                    return;
-                };
-
-                for (excerpt_id, range) in multibuffer.excerpts_for_buffer(buffer_id, cx) {
-                    if range.context.overlaps(&diagnostic.range, &snapshot) {
-                        Self::jump_to(
-                            editor,
-                            Anchor::range_in_buffer(excerpt_id, diagnostic.range),
-                            window,
-                            cx,
-                        );
-                        return;
-                    }
-                }
-            }
-        } else if let Some(diagnostic) = editor
-            .snapshot(window, cx)
-            .buffer_snapshot()
-            .diagnostic_group(buffer_id, group_id)
-            .nth(ix)
-        {
-            Self::jump_to(editor, diagnostic.range, window, cx)
-        };
-    }
-
-    fn jump_to<I: ToOffset>(
-        editor: &mut Editor,
-        range: Range<I>,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) {
-        let snapshot = &editor.buffer().read(cx).snapshot(cx);
-        let range = range.start.to_offset(snapshot)..range.end.to_offset(snapshot);
-
-        editor.unfold_ranges(&[range.start..range.end], true, false, cx);
-        editor.change_selections(Default::default(), window, cx, |s| {
-            s.select_ranges([range.start..range.start]);
-        });
-        window.focus(&editor.focus_handle(cx));
-    }
-}
diff --git a/crates/diagnostics/src/diagnostics.rs b/crates/diagnostics/src/diagnostics.rs
deleted file mode 100644
index 76edf4f9b4..0000000000
--- a/crates/diagnostics/src/diagnostics.rs
+++ /dev/null
@@ -1,1149 +0,0 @@
-pub mod items;
-mod toolbar_controls;
-
-mod buffer_diagnostics;
-mod diagnostic_renderer;
-
-#[cfg(test)]
-mod diagnostics_tests;
-
-use anyhow::Result;
-use buffer_diagnostics::BufferDiagnosticsEditor;
-use collections::{BTreeSet, HashMap, HashSet};
-use diagnostic_renderer::DiagnosticBlock;
-use editor::{
-    Editor, EditorEvent, ExcerptRange, MultiBuffer, PathKey,
-    display_map::{BlockPlacement, BlockProperties, BlockStyle, CustomBlockId},
-    multibuffer_context_lines,
-};
-use gpui::{
-    AnyElement, App, AsyncApp, Context, Entity, EventEmitter, FocusHandle, FocusOutEvent,
-    Focusable, Global, InteractiveElement, IntoElement, ParentElement, Render, SharedString,
-    Styled, Subscription, Task, WeakEntity, Window, actions, div,
-};
-use itertools::Itertools as _;
-use language::{
-    Bias, Buffer, BufferRow, BufferSnapshot, DiagnosticEntry, DiagnosticEntryRef, Point,
-    ToTreeSitterPoint,
-};
-use project::{
-    DiagnosticSummary, Project, ProjectPath,
-    project_settings::{DiagnosticSeverity, ProjectSettings},
-};
-use settings::Settings;
-use std::{
-    any::{Any, TypeId},
-    cmp,
-    ops::{Range, RangeInclusive},
-    sync::Arc,
-    time::Duration,
-};
-use text::{BufferId, OffsetRangeExt};
-use theme::ActiveTheme;
-use toolbar_controls::DiagnosticsToolbarEditor;
-pub use toolbar_controls::ToolbarControls;
-use ui::{Icon, IconName, Label, h_flex, prelude::*};
-use util::ResultExt;
-use workspace::{
-    ItemNavHistory, ToolbarItemLocation, Workspace,
-    item::{BreadcrumbText, Item, ItemEvent, ItemHandle, SaveOptions, TabContentParams},
-    searchable::SearchableItemHandle,
-};
-
-actions!(
-    diagnostics,
-    [
-        /// Opens the project diagnostics view.
-        Deploy,
-        /// Toggles the display of warning-level diagnostics.
-        ToggleWarnings,
-        /// Toggles automatic refresh of diagnostics.
-        ToggleDiagnosticsRefresh
-    ]
-);
-
-#[derive(Default)]
-pub(crate) struct IncludeWarnings(bool);
-impl Global for IncludeWarnings {}
-
-pub fn init(cx: &mut App) {
-    editor::set_diagnostic_renderer(diagnostic_renderer::DiagnosticRenderer {}, cx);
-    cx.observe_new(ProjectDiagnosticsEditor::register).detach();
-    cx.observe_new(BufferDiagnosticsEditor::register).detach();
-}
-
-pub(crate) struct ProjectDiagnosticsEditor {
-    pub project: Entity<Project>,
-    workspace: WeakEntity<Workspace>,
-    focus_handle: FocusHandle,
-    editor: Entity<Editor>,
-    diagnostics: HashMap<BufferId, Vec<DiagnosticEntry<text::Anchor>>>,
-    blocks: HashMap<BufferId, Vec<CustomBlockId>>,
-    summary: DiagnosticSummary,
-    multibuffer: Entity<MultiBuffer>,
-    paths_to_update: BTreeSet<ProjectPath>,
-    include_warnings: bool,
-    update_excerpts_task: Option<Task<Result<()>>>,
-    diagnostic_summary_update: Task<()>,
-    _subscription: Subscription,
-}
-
-impl EventEmitter<EditorEvent> for ProjectDiagnosticsEditor {}
-
-const DIAGNOSTICS_UPDATE_DEBOUNCE: Duration = Duration::from_millis(50);
-const DIAGNOSTICS_SUMMARY_UPDATE_DEBOUNCE: Duration = Duration::from_millis(30);
-
-impl Render for ProjectDiagnosticsEditor {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let warning_count = if self.include_warnings {
-            self.summary.warning_count
-        } else {
-            0
-        };
-
-        let child =
-            if warning_count + self.summary.error_count == 0 && self.editor.read(cx).is_empty(cx) {
-                let label = if self.summary.warning_count == 0 {
-                    SharedString::new_static("No problems in workspace")
-                } else {
-                    SharedString::new_static("No errors in workspace")
-                };
-                v_flex()
-                    .key_context("EmptyPane")
-                    .size_full()
-                    .gap_1()
-                    .justify_center()
-                    .items_center()
-                    .text_center()
-                    .bg(cx.theme().colors().editor_background)
-                    .child(Label::new(label).color(Color::Muted))
-                    .when(self.summary.warning_count > 0, |this| {
-                        let plural_suffix = if self.summary.warning_count > 1 {
-                            "s"
-                        } else {
-                            ""
-                        };
-                        let label = format!(
-                            "Show {} warning{}",
-                            self.summary.warning_count, plural_suffix
-                        );
-                        this.child(
-                            Button::new("diagnostics-show-warning-label", label).on_click(
-                                cx.listener(|this, _, window, cx| {
-                                    this.toggle_warnings(&Default::default(), window, cx);
-                                    cx.notify();
-                                }),
-                            ),
-                        )
-                    })
-            } else {
-                div().size_full().child(self.editor.clone())
-            };
-
-        div()
-            .key_context("Diagnostics")
-            .track_focus(&self.focus_handle(cx))
-            .size_full()
-            .on_action(cx.listener(Self::toggle_warnings))
-            .on_action(cx.listener(Self::toggle_diagnostics_refresh))
-            .child(child)
-    }
-}
-
-#[derive(PartialEq, Eq, Copy, Clone, Debug)]
-enum RetainExcerpts {
-    All,
-    Dirty,
-}
-
-impl ProjectDiagnosticsEditor {
-    pub fn register(
-        workspace: &mut Workspace,
-        _window: Option<&mut Window>,
-        _: &mut Context<Workspace>,
-    ) {
-        workspace.register_action(Self::deploy);
-    }
-
-    fn new(
-        include_warnings: bool,
-        project_handle: Entity<Project>,
-        workspace: WeakEntity<Workspace>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let project_event_subscription = cx.subscribe_in(
-            &project_handle,
-            window,
-            |this, _project, event, window, cx| match event {
-                project::Event::DiskBasedDiagnosticsStarted { .. } => {
-                    cx.notify();
-                }
-                project::Event::DiskBasedDiagnosticsFinished { language_server_id } => {
-                    log::debug!("disk based diagnostics finished for server {language_server_id}");
-                    this.close_diagnosticless_buffers(
-                        cx,
-                        this.editor.focus_handle(cx).contains_focused(window, cx)
-                            || this.focus_handle.contains_focused(window, cx),
-                    );
-                }
-                project::Event::DiagnosticsUpdated {
-                    language_server_id,
-                    paths,
-                } => {
-                    this.paths_to_update.extend(paths.clone());
-                    this.diagnostic_summary_update = cx.spawn(async move |this, cx| {
-                        cx.background_executor()
-                            .timer(DIAGNOSTICS_SUMMARY_UPDATE_DEBOUNCE)
-                            .await;
-                        this.update(cx, |this, cx| {
-                            this.update_diagnostic_summary(cx);
-                        })
-                        .log_err();
-                    });
-
-                    log::debug!(
-                        "diagnostics updated for server {language_server_id}, \
-                        paths {paths:?}. updating excerpts"
-                    );
-                    this.update_stale_excerpts(window, cx);
-                }
-                _ => {}
-            },
-        );
-
-        let focus_handle = cx.focus_handle();
-        cx.on_focus_in(&focus_handle, window, Self::focus_in)
-            .detach();
-        cx.on_focus_out(&focus_handle, window, Self::focus_out)
-            .detach();
-
-        let excerpts = cx.new(|cx| MultiBuffer::new(project_handle.read(cx).capability()));
-        let editor = cx.new(|cx| {
-            let mut editor =
-                Editor::for_multibuffer(excerpts.clone(), Some(project_handle.clone()), window, cx);
-            editor.set_vertical_scroll_margin(5, cx);
-            editor.disable_inline_diagnostics();
-            editor.set_max_diagnostics_severity(
-                if include_warnings {
-                    DiagnosticSeverity::Warning
-                } else {
-                    DiagnosticSeverity::Error
-                },
-                cx,
-            );
-            editor.set_all_diagnostics_active(cx);
-            editor
-        });
-        cx.subscribe_in(
-            &editor,
-            window,
-            |this, _editor, event: &EditorEvent, window, cx| {
-                cx.emit(event.clone());
-                match event {
-                    EditorEvent::Focused => {
-                        if this.multibuffer.read(cx).is_empty() {
-                            window.focus(&this.focus_handle);
-                        }
-                    }
-                    EditorEvent::Blurred => this.close_diagnosticless_buffers(cx, false),
-                    EditorEvent::Saved => this.close_diagnosticless_buffers(cx, true),
-                    EditorEvent::SelectionsChanged { .. } => {
-                        this.close_diagnosticless_buffers(cx, true)
-                    }
-                    _ => {}
-                }
-            },
-        )
-        .detach();
-        cx.observe_global_in::<IncludeWarnings>(window, |this, window, cx| {
-            let include_warnings = cx.global::<IncludeWarnings>().0;
-            this.include_warnings = include_warnings;
-            this.editor.update(cx, |editor, cx| {
-                editor.set_max_diagnostics_severity(
-                    if include_warnings {
-                        DiagnosticSeverity::Warning
-                    } else {
-                        DiagnosticSeverity::Error
-                    },
-                    cx,
-                )
-            });
-            this.refresh(window, cx);
-        })
-        .detach();
-
-        let project = project_handle.read(cx);
-        let mut this = Self {
-            project: project_handle.clone(),
-            summary: project.diagnostic_summary(false, cx),
-            diagnostics: Default::default(),
-            blocks: Default::default(),
-            include_warnings,
-            workspace,
-            multibuffer: excerpts,
-            focus_handle,
-            editor,
-            paths_to_update: Default::default(),
-            update_excerpts_task: None,
-            diagnostic_summary_update: Task::ready(()),
-            _subscription: project_event_subscription,
-        };
-        this.refresh(window, cx);
-        this
-    }
-
-    /// Closes all excerpts of buffers that:
-    ///  - have no diagnostics anymore
-    ///  - are saved (not dirty)
-    ///  - and, if `retain_selections` is true, do not have selections within them
-    fn close_diagnosticless_buffers(&mut self, cx: &mut Context<Self>, retain_selections: bool) {
-        let snapshot = self
-            .editor
-            .update(cx, |editor, cx| editor.display_snapshot(cx));
-        let buffer = self.multibuffer.read(cx);
-        let buffer_ids = buffer.all_buffer_ids();
-        let selected_buffers = self.editor.update(cx, |editor, _| {
-            editor
-                .selections
-                .all_anchors(&snapshot)
-                .iter()
-                .filter_map(|anchor| anchor.start.text_anchor.buffer_id)
-                .collect::<HashSet<_>>()
-        });
-        for buffer_id in buffer_ids {
-            if retain_selections && selected_buffers.contains(&buffer_id) {
-                continue;
-            }
-            let has_no_blocks = self
-                .blocks
-                .get(&buffer_id)
-                .is_none_or(|blocks| blocks.is_empty());
-            if !has_no_blocks {
-                continue;
-            }
-            let is_dirty = self
-                .multibuffer
-                .read(cx)
-                .buffer(buffer_id)
-                .is_none_or(|buffer| buffer.read(cx).is_dirty());
-            if is_dirty {
-                continue;
-            }
-            self.multibuffer.update(cx, |b, cx| {
-                b.remove_excerpts_for_buffer(buffer_id, cx);
-            });
-        }
-    }
-
-    fn update_stale_excerpts(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if self.update_excerpts_task.is_some() {
-            return;
-        }
-
-        let project_handle = self.project.clone();
-        self.update_excerpts_task = Some(cx.spawn_in(window, async move |this, cx| {
-            cx.background_executor()
-                .timer(DIAGNOSTICS_UPDATE_DEBOUNCE)
-                .await;
-            loop {
-                let Some(path) = this.update(cx, |this, cx| {
-                    let Some(path) = this.paths_to_update.pop_first() else {
-                        this.update_excerpts_task = None;
-                        cx.notify();
-                        return None;
-                    };
-                    Some(path)
-                })?
-                else {
-                    break;
-                };
-
-                if let Some(buffer) = project_handle
-                    .update(cx, |project, cx| project.open_buffer(path.clone(), cx))?
-                    .await
-                    .log_err()
-                {
-                    this.update_in(cx, |this, window, cx| {
-                        let focused = this.editor.focus_handle(cx).contains_focused(window, cx)
-                            || this.focus_handle.contains_focused(window, cx);
-                        let retain_excerpts = if focused {
-                            RetainExcerpts::All
-                        } else {
-                            RetainExcerpts::Dirty
-                        };
-                        this.update_excerpts(buffer, retain_excerpts, window, cx)
-                    })?
-                    .await?;
-                }
-            }
-            Ok(())
-        }));
-    }
-
-    fn deploy(
-        workspace: &mut Workspace,
-        _: &Deploy,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        if let Some(existing) = workspace.item_of_type::<ProjectDiagnosticsEditor>(cx) {
-            let is_active = workspace
-                .active_item(cx)
-                .is_some_and(|item| item.item_id() == existing.item_id());
-
-            workspace.activate_item(&existing, true, !is_active, window, cx);
-        } else {
-            let workspace_handle = cx.entity().downgrade();
-
-            let include_warnings = match cx.try_global::<IncludeWarnings>() {
-                Some(include_warnings) => include_warnings.0,
-                None => ProjectSettings::get_global(cx).diagnostics.include_warnings,
-            };
-
-            let diagnostics = cx.new(|cx| {
-                ProjectDiagnosticsEditor::new(
-                    include_warnings,
-                    workspace.project().clone(),
-                    workspace_handle,
-                    window,
-                    cx,
-                )
-            });
-            workspace.add_item_to_active_pane(Box::new(diagnostics), None, true, window, cx);
-        }
-    }
-
-    fn toggle_warnings(&mut self, _: &ToggleWarnings, _: &mut Window, cx: &mut Context<Self>) {
-        cx.set_global(IncludeWarnings(!self.include_warnings));
-    }
-
-    fn toggle_diagnostics_refresh(
-        &mut self,
-        _: &ToggleDiagnosticsRefresh,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.update_excerpts_task.is_some() {
-            self.update_excerpts_task = None;
-        } else {
-            self.refresh(window, cx);
-        }
-        cx.notify();
-    }
-
-    fn focus_in(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if self.focus_handle.is_focused(window) && !self.multibuffer.read(cx).is_empty() {
-            self.editor.focus_handle(cx).focus(window)
-        }
-    }
-
-    fn focus_out(&mut self, _: FocusOutEvent, window: &mut Window, cx: &mut Context<Self>) {
-        if !self.focus_handle.is_focused(window) && !self.editor.focus_handle(cx).is_focused(window)
-        {
-            self.close_diagnosticless_buffers(cx, false);
-        }
-    }
-
-    /// Clears all diagnostics in this view, and refetches them from the project.
-    fn refresh(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.diagnostics.clear();
-        self.editor.update(cx, |editor, cx| {
-            for (_, block_ids) in self.blocks.drain() {
-                editor.display_map.update(cx, |display_map, cx| {
-                    display_map.remove_blocks(block_ids.into_iter().collect(), cx)
-                });
-            }
-        });
-        self.close_diagnosticless_buffers(cx, false);
-        self.project.update(cx, |project, cx| {
-            self.paths_to_update = project
-                .diagnostic_summaries(false, cx)
-                .map(|(project_path, _, _)| project_path)
-                .collect::<BTreeSet<_>>();
-        });
-
-        self.update_stale_excerpts(window, cx);
-    }
-
-    fn diagnostics_are_unchanged(
-        &self,
-        existing: &[DiagnosticEntry<text::Anchor>],
-        new: &[DiagnosticEntryRef<'_, text::Anchor>],
-        snapshot: &BufferSnapshot,
-    ) -> bool {
-        if existing.len() != new.len() {
-            return false;
-        }
-        existing.iter().zip(new.iter()).all(|(existing, new)| {
-            existing.diagnostic.message == new.diagnostic.message
-                && existing.diagnostic.severity == new.diagnostic.severity
-                && existing.diagnostic.is_primary == new.diagnostic.is_primary
-                && existing.range.to_offset(snapshot) == new.range.to_offset(snapshot)
-        })
-    }
-
-    fn update_excerpts(
-        &mut self,
-        buffer: Entity<Buffer>,
-        retain_excerpts: RetainExcerpts,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let was_empty = self.multibuffer.read(cx).is_empty();
-        let buffer_snapshot = buffer.read(cx).snapshot();
-        let buffer_id = buffer_snapshot.remote_id();
-
-        let max_severity = if self.include_warnings {
-            lsp::DiagnosticSeverity::WARNING
-        } else {
-            lsp::DiagnosticSeverity::ERROR
-        };
-
-        cx.spawn_in(window, async move |this, cx| {
-            let diagnostics = buffer_snapshot
-                .diagnostics_in_range::<_, text::Anchor>(
-                    Point::zero()..buffer_snapshot.max_point(),
-                    false,
-                )
-                .collect::<Vec<_>>();
-
-            let unchanged = this.update(cx, |this, _| {
-                if this.diagnostics.get(&buffer_id).is_some_and(|existing| {
-                    this.diagnostics_are_unchanged(existing, &diagnostics, &buffer_snapshot)
-                }) {
-                    return true;
-                }
-                this.diagnostics.insert(
-                    buffer_id,
-                    diagnostics
-                        .iter()
-                        .map(DiagnosticEntryRef::to_owned)
-                        .collect(),
-                );
-                false
-            })?;
-            if unchanged {
-                return Ok(());
-            }
-
-            let mut grouped: HashMap<usize, Vec<_>> = HashMap::default();
-            for entry in diagnostics {
-                grouped
-                    .entry(entry.diagnostic.group_id)
-                    .or_default()
-                    .push(DiagnosticEntryRef {
-                        range: entry.range.to_point(&buffer_snapshot),
-                        diagnostic: entry.diagnostic,
-                    })
-            }
-            let mut blocks: Vec<DiagnosticBlock> = Vec::new();
-
-            let diagnostics_toolbar_editor = Arc::new(this.clone());
-            for (_, group) in grouped {
-                let group_severity = group.iter().map(|d| d.diagnostic.severity).min();
-                if group_severity.is_none_or(|s| s > max_severity) {
-                    continue;
-                }
-                let languages = this
-                    .read_with(cx, |t, cx| t.project.read(cx).languages().clone())
-                    .ok();
-                let more = cx.update(|_, cx| {
-                    crate::diagnostic_renderer::DiagnosticRenderer::diagnostic_blocks_for_group(
-                        group,
-                        buffer_snapshot.remote_id(),
-                        Some(diagnostics_toolbar_editor.clone()),
-                        languages,
-                        cx,
-                    )
-                })?;
-
-                blocks.extend(more);
-            }
-
-            let cmp_excerpts = |buffer_snapshot: &BufferSnapshot,
-                                a: &ExcerptRange<text::Anchor>,
-                                b: &ExcerptRange<text::Anchor>| {
-                let context_start = || a.context.start.cmp(&b.context.start, buffer_snapshot);
-                let context_end = || a.context.end.cmp(&b.context.end, buffer_snapshot);
-                let primary_start = || a.primary.start.cmp(&b.primary.start, buffer_snapshot);
-                let primary_end = || a.primary.end.cmp(&b.primary.end, buffer_snapshot);
-                context_start()
-                    .then_with(context_end)
-                    .then_with(primary_start)
-                    .then_with(primary_end)
-                    .then(cmp::Ordering::Greater)
-            };
-
-            let mut excerpt_ranges: Vec<ExcerptRange<_>> = this.update(cx, |this, cx| {
-                this.multibuffer.update(cx, |multi_buffer, cx| {
-                    let is_dirty = multi_buffer
-                        .buffer(buffer_id)
-                        .is_none_or(|buffer| buffer.read(cx).is_dirty());
-                    match retain_excerpts {
-                        RetainExcerpts::Dirty if !is_dirty => Vec::new(),
-                        RetainExcerpts::All | RetainExcerpts::Dirty => multi_buffer
-                            .excerpts_for_buffer(buffer_id, cx)
-                            .into_iter()
-                            .map(|(_, range)| range)
-                            .sorted_by(|a, b| cmp_excerpts(&buffer_snapshot, a, b))
-                            .collect(),
-                    }
-                })
-            })?;
-
-            let mut result_blocks = vec![None; excerpt_ranges.len()];
-            let context_lines = cx.update(|_, cx| multibuffer_context_lines(cx))?;
-            for b in blocks {
-                let excerpt_range = context_range_for_entry(
-                    b.initial_range.clone(),
-                    context_lines,
-                    buffer_snapshot.clone(),
-                    cx,
-                )
-                .await;
-                let initial_range = buffer_snapshot.anchor_after(b.initial_range.start)
-                    ..buffer_snapshot.anchor_before(b.initial_range.end);
-                let excerpt_range = ExcerptRange {
-                    context: excerpt_range,
-                    primary: initial_range,
-                };
-                let i = excerpt_ranges
-                    .binary_search_by(|probe| cmp_excerpts(&buffer_snapshot, probe, &excerpt_range))
-                    .unwrap_or_else(|i| i);
-                excerpt_ranges.insert(i, excerpt_range);
-                result_blocks.insert(i, Some(b));
-            }
-
-            this.update_in(cx, |this, window, cx| {
-                if let Some(block_ids) = this.blocks.remove(&buffer_id) {
-                    this.editor.update(cx, |editor, cx| {
-                        editor.display_map.update(cx, |display_map, cx| {
-                            display_map.remove_blocks(block_ids.into_iter().collect(), cx)
-                        });
-                    })
-                }
-                let (anchor_ranges, _) = this.multibuffer.update(cx, |multi_buffer, cx| {
-                    let excerpt_ranges = excerpt_ranges
-                        .into_iter()
-                        .map(|range| ExcerptRange {
-                            context: range.context.to_point(&buffer_snapshot),
-                            primary: range.primary.to_point(&buffer_snapshot),
-                        })
-                        .collect();
-                    multi_buffer.set_excerpt_ranges_for_path(
-                        PathKey::for_buffer(&buffer, cx),
-                        buffer.clone(),
-                        &buffer_snapshot,
-                        excerpt_ranges,
-                        cx,
-                    )
-                });
-                #[cfg(test)]
-                let cloned_blocks = result_blocks.clone();
-
-                if was_empty && let Some(anchor_range) = anchor_ranges.first() {
-                    let range_to_select = anchor_range.start..anchor_range.start;
-                    this.editor.update(cx, |editor, cx| {
-                        editor.change_selections(Default::default(), window, cx, |s| {
-                            s.select_anchor_ranges([range_to_select]);
-                        })
-                    });
-                    if this.focus_handle.is_focused(window) {
-                        this.editor.read(cx).focus_handle(cx).focus(window);
-                    }
-                }
-
-                let editor_blocks = anchor_ranges
-                    .into_iter()
-                    .zip_eq(result_blocks.into_iter())
-                    .filter_map(|(anchor, block)| {
-                        let block = block?;
-                        let editor = this.editor.downgrade();
-                        Some(BlockProperties {
-                            placement: BlockPlacement::Near(anchor.start),
-                            height: Some(1),
-                            style: BlockStyle::Flex,
-                            render: Arc::new(move |bcx| block.render_block(editor.clone(), bcx)),
-                            priority: 1,
-                        })
-                    });
-
-                let block_ids = this.editor.update(cx, |editor, cx| {
-                    editor.display_map.update(cx, |display_map, cx| {
-                        display_map.insert_blocks(editor_blocks, cx)
-                    })
-                });
-
-                #[cfg(test)]
-                {
-                    for (block_id, block) in
-                        block_ids.iter().zip(cloned_blocks.into_iter().flatten())
-                    {
-                        let markdown = block.markdown.clone();
-                        editor::test::set_block_content_for_tests(
-                            &this.editor,
-                            *block_id,
-                            cx,
-                            move |cx| {
-                                markdown::MarkdownElement::rendered_text(
-                                    markdown.clone(),
-                                    cx,
-                                    editor::hover_popover::diagnostics_markdown_style,
-                                )
-                            },
-                        );
-                    }
-                }
-
-                this.blocks.insert(buffer_id, block_ids);
-                cx.notify()
-            })
-        })
-    }
-
-    fn update_diagnostic_summary(&mut self, cx: &mut Context<Self>) {
-        self.summary = self.project.read(cx).diagnostic_summary(false, cx);
-        cx.emit(EditorEvent::TitleChanged);
-    }
-}
-
-impl Focusable for ProjectDiagnosticsEditor {
-    fn focus_handle(&self, _: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl Item for ProjectDiagnosticsEditor {
-    type Event = EditorEvent;
-
-    fn to_item_events(event: &EditorEvent, f: impl FnMut(ItemEvent)) {
-        Editor::to_item_events(event, f)
-    }
-
-    fn deactivated(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.editor
-            .update(cx, |editor, cx| editor.deactivated(window, cx));
-    }
-
-    fn navigate(
-        &mut self,
-        data: Box<dyn Any>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> bool {
-        self.editor
-            .update(cx, |editor, cx| editor.navigate(data, window, cx))
-    }
-
-    fn tab_tooltip_text(&self, _: &App) -> Option<SharedString> {
-        Some("Project Diagnostics".into())
-    }
-
-    fn tab_content_text(&self, _detail: usize, _: &App) -> SharedString {
-        "Diagnostics".into()
-    }
-
-    fn tab_content(&self, params: TabContentParams, _window: &Window, _: &App) -> AnyElement {
-        h_flex()
-            .gap_1()
-            .when(
-                self.summary.error_count == 0 && self.summary.warning_count == 0,
-                |then| {
-                    then.child(
-                        h_flex()
-                            .gap_1()
-                            .child(Icon::new(IconName::Check).color(Color::Success))
-                            .child(Label::new("No problems").color(params.text_color())),
-                    )
-                },
-            )
-            .when(self.summary.error_count > 0, |then| {
-                then.child(
-                    h_flex()
-                        .gap_1()
-                        .child(Icon::new(IconName::XCircle).color(Color::Error))
-                        .child(
-                            Label::new(self.summary.error_count.to_string())
-                                .color(params.text_color()),
-                        ),
-                )
-            })
-            .when(self.summary.warning_count > 0, |then| {
-                then.child(
-                    h_flex()
-                        .gap_1()
-                        .child(Icon::new(IconName::Warning).color(Color::Warning))
-                        .child(
-                            Label::new(self.summary.warning_count.to_string())
-                                .color(params.text_color()),
-                        ),
-                )
-            })
-            .into_any_element()
-    }
-
-    fn telemetry_event_text(&self) -> Option<&'static str> {
-        Some("Project Diagnostics Opened")
-    }
-
-    fn for_each_project_item(
-        &self,
-        cx: &App,
-        f: &mut dyn FnMut(gpui::EntityId, &dyn project::ProjectItem),
-    ) {
-        self.editor.for_each_project_item(cx, f)
-    }
-
-    fn set_nav_history(
-        &mut self,
-        nav_history: ItemNavHistory,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.editor.update(cx, |editor, _| {
-            editor.set_nav_history(Some(nav_history));
-        });
-    }
-
-    fn can_split(&self) -> bool {
-        true
-    }
-
-    fn clone_on_split(
-        &self,
-        _workspace_id: Option<workspace::WorkspaceId>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Option<Entity<Self>>>
-    where
-        Self: Sized,
-    {
-        Task::ready(Some(cx.new(|cx| {
-            ProjectDiagnosticsEditor::new(
-                self.include_warnings,
-                self.project.clone(),
-                self.workspace.clone(),
-                window,
-                cx,
-            )
-        })))
-    }
-
-    fn is_dirty(&self, cx: &App) -> bool {
-        self.multibuffer.read(cx).is_dirty(cx)
-    }
-
-    fn has_deleted_file(&self, cx: &App) -> bool {
-        self.multibuffer.read(cx).has_deleted_file(cx)
-    }
-
-    fn has_conflict(&self, cx: &App) -> bool {
-        self.multibuffer.read(cx).has_conflict(cx)
-    }
-
-    fn can_save(&self, _: &App) -> bool {
-        true
-    }
-
-    fn save(
-        &mut self,
-        options: SaveOptions,
-        project: Entity<Project>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        self.editor.save(options, project, window, cx)
-    }
-
-    fn save_as(
-        &mut self,
-        _: Entity<Project>,
-        _: ProjectPath,
-        _window: &mut Window,
-        _: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        unreachable!()
-    }
-
-    fn reload(
-        &mut self,
-        project: Entity<Project>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        self.editor.reload(project, window, cx)
-    }
-
-    fn act_as_type<'a>(
-        &'a self,
-        type_id: TypeId,
-        self_handle: &'a Entity<Self>,
-        _: &'a App,
-    ) -> Option<gpui::AnyEntity> {
-        if type_id == TypeId::of::<Self>() {
-            Some(self_handle.clone().into())
-        } else if type_id == TypeId::of::<Editor>() {
-            Some(self.editor.clone().into())
-        } else {
-            None
-        }
-    }
-
-    fn as_searchable(&self, _: &Entity<Self>, _: &App) -> Option<Box<dyn SearchableItemHandle>> {
-        Some(Box::new(self.editor.clone()))
-    }
-
-    fn breadcrumb_location(&self, _: &App) -> ToolbarItemLocation {
-        ToolbarItemLocation::PrimaryLeft
-    }
-
-    fn breadcrumbs(&self, theme: &theme::Theme, cx: &App) -> Option<Vec<BreadcrumbText>> {
-        self.editor.breadcrumbs(theme, cx)
-    }
-
-    fn added_to_workspace(
-        &mut self,
-        workspace: &mut Workspace,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.editor.update(cx, |editor, cx| {
-            editor.added_to_workspace(workspace, window, cx)
-        });
-    }
-}
-
-impl DiagnosticsToolbarEditor for WeakEntity<ProjectDiagnosticsEditor> {
-    fn include_warnings(&self, cx: &App) -> bool {
-        self.read_with(cx, |project_diagnostics_editor, _cx| {
-            project_diagnostics_editor.include_warnings
-        })
-        .unwrap_or(false)
-    }
-
-    fn is_updating(&self, cx: &App) -> bool {
-        self.read_with(cx, |project_diagnostics_editor, cx| {
-            project_diagnostics_editor.update_excerpts_task.is_some()
-                || project_diagnostics_editor
-                    .project
-                    .read(cx)
-                    .language_servers_running_disk_based_diagnostics(cx)
-                    .next()
-                    .is_some()
-        })
-        .unwrap_or(false)
-    }
-
-    fn stop_updating(&self, cx: &mut App) {
-        let _ = self.update(cx, |project_diagnostics_editor, cx| {
-            project_diagnostics_editor.update_excerpts_task = None;
-            cx.notify();
-        });
-    }
-
-    fn refresh_diagnostics(&self, window: &mut Window, cx: &mut App) {
-        let _ = self.update(cx, |project_diagnostics_editor, cx| {
-            project_diagnostics_editor.refresh(window, cx);
-        });
-    }
-
-    fn toggle_warnings(&self, window: &mut Window, cx: &mut App) {
-        let _ = self.update(cx, |project_diagnostics_editor, cx| {
-            project_diagnostics_editor.toggle_warnings(&Default::default(), window, cx);
-        });
-    }
-
-    fn get_diagnostics_for_buffer(
-        &self,
-        buffer_id: text::BufferId,
-        cx: &App,
-    ) -> Vec<language::DiagnosticEntry<text::Anchor>> {
-        self.read_with(cx, |project_diagnostics_editor, _cx| {
-            project_diagnostics_editor
-                .diagnostics
-                .get(&buffer_id)
-                .cloned()
-                .unwrap_or_default()
-        })
-        .unwrap_or_default()
-    }
-}
-const DIAGNOSTIC_EXPANSION_ROW_LIMIT: u32 = 32;
-
-async fn context_range_for_entry(
-    range: Range<Point>,
-    context: u32,
-    snapshot: BufferSnapshot,
-    cx: &mut AsyncApp,
-) -> Range<text::Anchor> {
-    let range = if let Some(rows) = heuristic_syntactic_expand(
-        range.clone(),
-        DIAGNOSTIC_EXPANSION_ROW_LIMIT,
-        snapshot.clone(),
-        cx,
-    )
-    .await
-    {
-        Range {
-            start: Point::new(*rows.start(), 0),
-            end: snapshot.clip_point(Point::new(*rows.end(), u32::MAX), Bias::Left),
-        }
-    } else {
-        Range {
-            start: Point::new(range.start.row.saturating_sub(context), 0),
-            end: snapshot.clip_point(Point::new(range.end.row + context, u32::MAX), Bias::Left),
-        }
-    };
-    snapshot.anchor_after(range.start)..snapshot.anchor_before(range.end)
-}
-
-/// Expands the input range using syntax information from TreeSitter. This expansion will be limited
-/// to the specified `max_row_count`.
-///
-/// If there is a containing outline item that is less than `max_row_count`, it will be returned.
-/// Otherwise fairly arbitrary heuristics are applied to attempt to return a logical block of code.
-async fn heuristic_syntactic_expand(
-    input_range: Range<Point>,
-    max_row_count: u32,
-    snapshot: BufferSnapshot,
-    cx: &mut AsyncApp,
-) -> Option<RangeInclusive<BufferRow>> {
-    let start = snapshot.clip_point(input_range.start, Bias::Right);
-    let end = snapshot.clip_point(input_range.end, Bias::Left);
-    let input_row_count = input_range.end.row - input_range.start.row;
-    if input_row_count > max_row_count {
-        return None;
-    }
-
-    let input_range = start..end;
-    // If the outline node contains the diagnostic and is small enough, just use that.
-    let outline_range = snapshot.outline_range_containing(input_range.clone());
-    if let Some(outline_range) = outline_range.clone() {
-        // Remove blank lines from start and end
-        if let Some(start_row) = (outline_range.start.row..outline_range.end.row)
-            .find(|row| !snapshot.line_indent_for_row(*row).is_line_blank())
-            && let Some(end_row) = (outline_range.start.row..outline_range.end.row + 1)
-                .rev()
-                .find(|row| !snapshot.line_indent_for_row(*row).is_line_blank())
-        {
-            let row_count = end_row.saturating_sub(start_row);
-            if row_count <= max_row_count {
-                return Some(RangeInclusive::new(
-                    outline_range.start.row,
-                    outline_range.end.row,
-                ));
-            }
-        }
-    }
-
-    let mut node = snapshot.syntax_ancestor(input_range.clone())?;
-
-    loop {
-        let node_start = Point::from_ts_point(node.start_position());
-        let node_end = Point::from_ts_point(node.end_position());
-        let node_range = node_start..node_end;
-        let row_count = node_end.row - node_start.row + 1;
-        let mut ancestor_range = None;
-        cx.background_executor()
-            .await_on_background(async {
-                // Stop if we've exceeded the row count or reached an outline node. Then, find the interval
-                // of node children which contains the query range. For example, this allows just returning
-                // the header of a declaration rather than the entire declaration.
-                if row_count > max_row_count || outline_range == Some(node_range.clone()) {
-                    let mut cursor = node.walk();
-                    let mut included_child_start = None;
-                    let mut included_child_end = None;
-                    let mut previous_end = node_start;
-                    if cursor.goto_first_child() {
-                        loop {
-                            let child_node = cursor.node();
-                            let child_range =
-                                previous_end..Point::from_ts_point(child_node.end_position());
-                            if included_child_start.is_none()
-                                && child_range.contains(&input_range.start)
-                            {
-                                included_child_start = Some(child_range.start);
-                            }
-                            if child_range.contains(&input_range.end) {
-                                included_child_end = Some(child_range.end);
-                            }
-                            previous_end = child_range.end;
-                            if !cursor.goto_next_sibling() {
-                                break;
-                            }
-                        }
-                    }
-                    let end = included_child_end.unwrap_or(node_range.end);
-                    if let Some(start) = included_child_start {
-                        let row_count = end.row - start.row;
-                        if row_count < max_row_count {
-                            ancestor_range = Some(Some(RangeInclusive::new(start.row, end.row)));
-                            return;
-                        }
-                    }
-                    ancestor_range = Some(None);
-                }
-            })
-            .await;
-        if let Some(node) = ancestor_range {
-            return node;
-        }
-
-        let node_name = node.grammar_name();
-        let node_row_range = RangeInclusive::new(node_range.start.row, node_range.end.row);
-        if node_name.ends_with("block") {
-            return Some(node_row_range);
-        } else if node_name.ends_with("statement") || node_name.ends_with("declaration") {
-            // Expand to the nearest dedent or blank line for statements and declarations.
-            let tab_size = cx
-                .update(|cx| snapshot.settings_at(node_range.start, cx).tab_size.get())
-                .ok()?;
-            let indent_level = snapshot
-                .line_indent_for_row(node_range.start.row)
-                .len(tab_size);
-            let rows_remaining = max_row_count.saturating_sub(row_count);
-            let Some(start_row) = (node_range.start.row.saturating_sub(rows_remaining)
-                ..node_range.start.row)
-                .rev()
-                .find(|row| {
-                    is_line_blank_or_indented_less(indent_level, *row, tab_size, &snapshot.clone())
-                })
-            else {
-                return Some(node_row_range);
-            };
-            let rows_remaining = max_row_count.saturating_sub(node_range.end.row - start_row);
-            let Some(end_row) = (node_range.end.row + 1
-                ..cmp::min(
-                    node_range.end.row + rows_remaining + 1,
-                    snapshot.row_count(),
-                ))
-                .find(|row| {
-                    is_line_blank_or_indented_less(indent_level, *row, tab_size, &snapshot.clone())
-                })
-            else {
-                return Some(node_row_range);
-            };
-            return Some(RangeInclusive::new(start_row, end_row));
-        }
-
-        // TODO: doing this instead of walking a cursor as that doesn't work - why?
-        let Some(parent) = node.parent() else {
-            log::info!(
-                "Expanding to ancestor reached the top node, so using default context line count.",
-            );
-            return None;
-        };
-        node = parent;
-    }
-}
-
-fn is_line_blank_or_indented_less(
-    indent_level: u32,
-    row: u32,
-    tab_size: u32,
-    snapshot: &BufferSnapshot,
-) -> bool {
-    let line_indent = snapshot.line_indent_for_row(row);
-    line_indent.is_line_blank() || line_indent.len(tab_size) < indent_level
-}
diff --git a/crates/diagnostics/src/diagnostics_tests.rs b/crates/diagnostics/src/diagnostics_tests.rs
deleted file mode 100644
index d2504fde4a..0000000000
--- a/crates/diagnostics/src/diagnostics_tests.rs
+++ /dev/null
@@ -1,2141 +0,0 @@
-use super::*;
-use collections::{HashMap, HashSet};
-use editor::{
-    DisplayPoint, EditorSettings, Inlay, MultiBufferOffset,
-    actions::{GoToDiagnostic, GoToPreviousDiagnostic, Hover, MoveToBeginning},
-    display_map::DisplayRow,
-    test::{
-        editor_content_with_blocks, editor_lsp_test_context::EditorLspTestContext,
-        editor_test_context::EditorTestContext,
-    },
-};
-use gpui::{TestAppContext, VisualTestContext};
-use indoc::indoc;
-use language::{DiagnosticSourceKind, Rope};
-use lsp::LanguageServerId;
-use pretty_assertions::assert_eq;
-use project::{
-    FakeFs,
-    project_settings::{GoToDiagnosticSeverity, GoToDiagnosticSeverityFilter},
-};
-use rand::{Rng, rngs::StdRng, seq::IteratorRandom as _};
-use serde_json::json;
-use settings::SettingsStore;
-use std::{
-    env,
-    path::{Path, PathBuf},
-    str::FromStr,
-};
-use unindent::Unindent as _;
-use util::{RandomCharIter, path, post_inc, rel_path::rel_path};
-
-#[ctor::ctor]
-fn init_logger() {
-    zlog::init_test();
-}
-
-#[gpui::test]
-async fn test_diagnostics(cx: &mut TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/test"),
-        json!({
-            "consts.rs": "
-                const a: i32 = 'a';
-                const b: i32 = c;
-            "
-            .unindent(),
-
-            "main.rs": "
-                fn main() {
-                    let x = vec![];
-                    let y = vec![];
-                    a(x);
-                    b(y);
-                    // comment 1
-                    // comment 2
-                    c(y);
-                    d(x);
-                }
-            "
-            .unindent(),
-        }),
-    )
-    .await;
-
-    let language_server_id = LanguageServerId(0);
-    let project = Project::test(fs.clone(), [path!("/test").as_ref()], cx).await;
-    let lsp_store = project.read_with(cx, |project, _| project.lsp_store());
-    let window = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*window, cx);
-    let workspace = window.root(cx).unwrap();
-    let uri = lsp::Uri::from_file_path(path!("/test/main.rs")).unwrap();
-
-    // Create some diagnostics
-    lsp_store.update(cx, |lsp_store, cx| {
-        lsp_store.update_diagnostics(language_server_id, lsp::PublishDiagnosticsParams {
-            uri: uri.clone(),
-            diagnostics: vec![lsp::Diagnostic{
-                range: lsp::Range::new(lsp::Position::new(7, 6),lsp::Position::new(7, 7)),
-                severity:Some(lsp::DiagnosticSeverity::ERROR),
-                message: "use of moved value\nvalue used here after move".to_string(),
-                related_information: Some(vec![lsp::DiagnosticRelatedInformation {
-                    location: lsp::Location::new(uri.clone(), lsp::Range::new(lsp::Position::new(2,8),lsp::Position::new(2,9))),
-                    message: "move occurs because `y` has type `Vec<char>`, which does not implement the `Copy` trait".to_string()
-                },
-                lsp::DiagnosticRelatedInformation {
-                    location: lsp::Location::new(uri.clone(), lsp::Range::new(lsp::Position::new(4,6),lsp::Position::new(4,7))),
-                    message: "value moved here".to_string()
-                },
-                ]),
-                ..Default::default()
-            },
-            lsp::Diagnostic{
-                range: lsp::Range::new(lsp::Position::new(8, 6),lsp::Position::new(8, 7)),
-                severity:Some(lsp::DiagnosticSeverity::ERROR),
-                message: "use of moved value\nvalue used here after move".to_string(),
-                related_information: Some(vec![lsp::DiagnosticRelatedInformation {
-                    location: lsp::Location::new(uri.clone(), lsp::Range::new(lsp::Position::new(1,8),lsp::Position::new(1,9))),
-                    message: "move occurs because `x` has type `Vec<char>`, which does not implement the `Copy` trait".to_string()
-                },
-                lsp::DiagnosticRelatedInformation {
-                    location: lsp::Location::new(uri.clone(), lsp::Range::new(lsp::Position::new(3,6),lsp::Position::new(3,7))),
-                    message: "value moved here".to_string()
-                },
-                ]),
-                ..Default::default()
-            }
-            ],
-            version: None
-        }, None, DiagnosticSourceKind::Pushed, &[], cx).unwrap();
-    });
-
-    // Open the project diagnostics view while there are already diagnostics.
-    let diagnostics = window.build_entity(cx, |window, cx| {
-        ProjectDiagnosticsEditor::new(true, project.clone(), workspace.downgrade(), window, cx)
-    });
-    let editor = diagnostics.update(cx, |diagnostics, _| diagnostics.editor.clone());
-
-    diagnostics
-        .next_notification(DIAGNOSTICS_UPDATE_DEBOUNCE + Duration::from_millis(10), cx)
-        .await;
-
-    pretty_assertions::assert_eq!(
-        editor_content_with_blocks(&editor, cx),
-        indoc::indoc! {
-            "§ main.rs
-             § -----
-             fn main() {
-                 let x = vec![];
-             § move occurs because `x` has type `Vec<char>`, which does not implement
-             § the `Copy` trait (back)
-                 let y = vec![];
-             § move occurs because `y` has type `Vec<char>`, which does not implement
-             § the `Copy` trait (back)
-                 a(x); § value moved here (back)
-                 b(y); § value moved here
-                 // comment 1
-                 // comment 2
-                 c(y);
-             § use of moved value
-             § value used here after move
-             § hint: move occurs because `y` has type `Vec<char>`, which does not
-             § implement the `Copy` trait
-                 d(x);
-             § use of moved value
-             § value used here after move
-             § hint: move occurs because `x` has type `Vec<char>`, which does not
-             § implement the `Copy` trait
-             § hint: value moved here
-             }"
-        }
-    );
-
-    // Cursor is at the first diagnostic
-    editor.update(cx, |editor, cx| {
-        assert_eq!(
-            editor
-                .selections
-                .display_ranges(&editor.display_snapshot(cx)),
-            [DisplayPoint::new(DisplayRow(3), 8)..DisplayPoint::new(DisplayRow(3), 8)]
-        );
-    });
-
-    // Diagnostics are added for another earlier path.
-    lsp_store.update(cx, |lsp_store, cx| {
-        lsp_store.disk_based_diagnostics_started(language_server_id, cx);
-        lsp_store
-            .update_diagnostics(
-                language_server_id,
-                lsp::PublishDiagnosticsParams {
-                    uri: lsp::Uri::from_file_path(path!("/test/consts.rs")).unwrap(),
-                    diagnostics: vec![lsp::Diagnostic {
-                        range: lsp::Range::new(
-                            lsp::Position::new(0, 15),
-                            lsp::Position::new(0, 15),
-                        ),
-                        severity: Some(lsp::DiagnosticSeverity::ERROR),
-                        message: "mismatched types expected `usize`, found `char`".to_string(),
-                        ..Default::default()
-                    }],
-                    version: None,
-                },
-                None,
-                DiagnosticSourceKind::Pushed,
-                &[],
-                cx,
-            )
-            .unwrap();
-        lsp_store.disk_based_diagnostics_finished(language_server_id, cx);
-    });
-
-    diagnostics
-        .next_notification(DIAGNOSTICS_UPDATE_DEBOUNCE + Duration::from_millis(10), cx)
-        .await;
-
-    pretty_assertions::assert_eq!(
-        editor_content_with_blocks(&editor, cx),
-        indoc::indoc! {
-            "§ consts.rs
-             § -----
-             const a: i32 = 'a'; § mismatched types expected `usize`, found `char`
-             const b: i32 = c;
-
-             § main.rs
-             § -----
-             fn main() {
-                 let x = vec![];
-             § move occurs because `x` has type `Vec<char>`, which does not implement
-             § the `Copy` trait (back)
-                 let y = vec![];
-             § move occurs because `y` has type `Vec<char>`, which does not implement
-             § the `Copy` trait (back)
-                 a(x); § value moved here (back)
-                 b(y); § value moved here
-                 // comment 1
-                 // comment 2
-                 c(y);
-             § use of moved value
-             § value used here after move
-             § hint: move occurs because `y` has type `Vec<char>`, which does not
-             § implement the `Copy` trait
-                 d(x);
-             § use of moved value
-             § value used here after move
-             § hint: move occurs because `x` has type `Vec<char>`, which does not
-             § implement the `Copy` trait
-             § hint: value moved here
-             }"
-        }
-    );
-
-    // Cursor keeps its position.
-    editor.update(cx, |editor, cx| {
-        assert_eq!(
-            editor
-                .selections
-                .display_ranges(&editor.display_snapshot(cx)),
-            [DisplayPoint::new(DisplayRow(8), 8)..DisplayPoint::new(DisplayRow(8), 8)]
-        );
-    });
-
-    // Diagnostics are added to the first path
-    lsp_store.update(cx, |lsp_store, cx| {
-        lsp_store.disk_based_diagnostics_started(language_server_id, cx);
-        lsp_store
-            .update_diagnostics(
-                language_server_id,
-                lsp::PublishDiagnosticsParams {
-                    uri: lsp::Uri::from_file_path(path!("/test/consts.rs")).unwrap(),
-                    diagnostics: vec![
-                        lsp::Diagnostic {
-                            range: lsp::Range::new(
-                                lsp::Position::new(0, 15),
-                                lsp::Position::new(0, 15),
-                            ),
-                            severity: Some(lsp::DiagnosticSeverity::ERROR),
-                            message: "mismatched types expected `usize`, found `char`".to_string(),
-                            ..Default::default()
-                        },
-                        lsp::Diagnostic {
-                            range: lsp::Range::new(
-                                lsp::Position::new(1, 15),
-                                lsp::Position::new(1, 15),
-                            ),
-                            severity: Some(lsp::DiagnosticSeverity::ERROR),
-                            message: "unresolved name `c`".to_string(),
-                            ..Default::default()
-                        },
-                    ],
-                    version: None,
-                },
-                None,
-                DiagnosticSourceKind::Pushed,
-                &[],
-                cx,
-            )
-            .unwrap();
-        lsp_store.disk_based_diagnostics_finished(language_server_id, cx);
-    });
-
-    diagnostics
-        .next_notification(DIAGNOSTICS_UPDATE_DEBOUNCE + Duration::from_millis(10), cx)
-        .await;
-
-    pretty_assertions::assert_eq!(
-        editor_content_with_blocks(&editor, cx),
-        indoc::indoc! {
-            "§ consts.rs
-             § -----
-             const a: i32 = 'a'; § mismatched types expected `usize`, found `char`
-             const b: i32 = c; § unresolved name `c`
-
-             § main.rs
-             § -----
-             fn main() {
-                 let x = vec![];
-             § move occurs because `x` has type `Vec<char>`, which does not implement
-             § the `Copy` trait (back)
-                 let y = vec![];
-             § move occurs because `y` has type `Vec<char>`, which does not implement
-             § the `Copy` trait (back)
-                 a(x); § value moved here (back)
-                 b(y); § value moved here
-                 // comment 1
-                 // comment 2
-                 c(y);
-             § use of moved value
-             § value used here after move
-             § hint: move occurs because `y` has type `Vec<char>`, which does not
-             § implement the `Copy` trait
-                 d(x);
-             § use of moved value
-             § value used here after move
-             § hint: move occurs because `x` has type `Vec<char>`, which does not
-             § implement the `Copy` trait
-             § hint: value moved here
-             }"
-        }
-    );
-}
-
-#[gpui::test]
-async fn test_diagnostics_with_folds(cx: &mut TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/test"),
-        json!({
-            "main.js": "
-            function test() {
-                return 1
-            };
-
-            tset();
-            ".unindent()
-        }),
-    )
-    .await;
-
-    let server_id_1 = LanguageServerId(100);
-    let server_id_2 = LanguageServerId(101);
-    let project = Project::test(fs.clone(), [path!("/test").as_ref()], cx).await;
-    let lsp_store = project.read_with(cx, |project, _| project.lsp_store());
-    let window = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*window, cx);
-    let workspace = window.root(cx).unwrap();
-
-    let diagnostics = window.build_entity(cx, |window, cx| {
-        ProjectDiagnosticsEditor::new(true, project.clone(), workspace.downgrade(), window, cx)
-    });
-    let editor = diagnostics.update(cx, |diagnostics, _| diagnostics.editor.clone());
-
-    // Two language servers start updating diagnostics
-    lsp_store.update(cx, |lsp_store, cx| {
-        lsp_store.disk_based_diagnostics_started(server_id_1, cx);
-        lsp_store.disk_based_diagnostics_started(server_id_2, cx);
-        lsp_store
-            .update_diagnostics(
-                server_id_1,
-                lsp::PublishDiagnosticsParams {
-                    uri: lsp::Uri::from_file_path(path!("/test/main.js")).unwrap(),
-                    diagnostics: vec![lsp::Diagnostic {
-                        range: lsp::Range::new(lsp::Position::new(4, 0), lsp::Position::new(4, 4)),
-                        severity: Some(lsp::DiagnosticSeverity::WARNING),
-                        message: "no method `tset`".to_string(),
-                        related_information: Some(vec![lsp::DiagnosticRelatedInformation {
-                            location: lsp::Location::new(
-                                lsp::Uri::from_file_path(path!("/test/main.js")).unwrap(),
-                                lsp::Range::new(
-                                    lsp::Position::new(0, 9),
-                                    lsp::Position::new(0, 13),
-                                ),
-                            ),
-                            message: "method `test` defined here".to_string(),
-                        }]),
-                        ..Default::default()
-                    }],
-                    version: None,
-                },
-                None,
-                DiagnosticSourceKind::Pushed,
-                &[],
-                cx,
-            )
-            .unwrap();
-    });
-
-    // The first language server finishes
-    lsp_store.update(cx, |lsp_store, cx| {
-        lsp_store.disk_based_diagnostics_finished(server_id_1, cx);
-    });
-
-    // Only the first language server's diagnostics are shown.
-    cx.executor()
-        .advance_clock(DIAGNOSTICS_UPDATE_DEBOUNCE + Duration::from_millis(10));
-    cx.executor().run_until_parked();
-    editor.update_in(cx, |editor, window, cx| {
-        editor.fold_ranges(vec![Point::new(0, 0)..Point::new(3, 0)], false, window, cx);
-    });
-
-    pretty_assertions::assert_eq!(
-        editor_content_with_blocks(&editor, cx),
-        indoc::indoc! {
-            "§ main.js
-             § -----
-             ⋯
-
-             tset(); § no method `tset`"
-        }
-    );
-
-    editor.update(cx, |editor, cx| {
-        editor.unfold_ranges(&[Point::new(0, 0)..Point::new(3, 0)], false, false, cx);
-    });
-
-    pretty_assertions::assert_eq!(
-        editor_content_with_blocks(&editor, cx),
-        indoc::indoc! {
-            "§ main.js
-             § -----
-             function test() { § method `test` defined here
-                 return 1
-             };
-
-             tset(); § no method `tset`"
-        }
-    );
-}
-
-#[gpui::test]
-async fn test_diagnostics_multiple_servers(cx: &mut TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/test"),
-        json!({
-            "main.js": "
-                a();
-                b();
-                c();
-                d();
-                e();
-            ".unindent()
-        }),
-    )
-    .await;
-
-    let server_id_1 = LanguageServerId(100);
-    let server_id_2 = LanguageServerId(101);
-    let project = Project::test(fs.clone(), [path!("/test").as_ref()], cx).await;
-    let lsp_store = project.read_with(cx, |project, _| project.lsp_store());
-    let window = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*window, cx);
-    let workspace = window.root(cx).unwrap();
-
-    let diagnostics = window.build_entity(cx, |window, cx| {
-        ProjectDiagnosticsEditor::new(true, project.clone(), workspace.downgrade(), window, cx)
-    });
-    let editor = diagnostics.update(cx, |diagnostics, _| diagnostics.editor.clone());
-
-    // Two language servers start updating diagnostics
-    lsp_store.update(cx, |lsp_store, cx| {
-        lsp_store.disk_based_diagnostics_started(server_id_1, cx);
-        lsp_store.disk_based_diagnostics_started(server_id_2, cx);
-        lsp_store
-            .update_diagnostics(
-                server_id_1,
-                lsp::PublishDiagnosticsParams {
-                    uri: lsp::Uri::from_file_path(path!("/test/main.js")).unwrap(),
-                    diagnostics: vec![lsp::Diagnostic {
-                        range: lsp::Range::new(lsp::Position::new(0, 0), lsp::Position::new(0, 1)),
-                        severity: Some(lsp::DiagnosticSeverity::WARNING),
-                        message: "error 1".to_string(),
-                        ..Default::default()
-                    }],
-                    version: None,
-                },
-                None,
-                DiagnosticSourceKind::Pushed,
-                &[],
-                cx,
-            )
-            .unwrap();
-    });
-
-    // The first language server finishes
-    lsp_store.update(cx, |lsp_store, cx| {
-        lsp_store.disk_based_diagnostics_finished(server_id_1, cx);
-    });
-
-    // Only the first language server's diagnostics are shown.
-    cx.executor()
-        .advance_clock(DIAGNOSTICS_UPDATE_DEBOUNCE + Duration::from_millis(10));
-    cx.executor().run_until_parked();
-
-    pretty_assertions::assert_eq!(
-        editor_content_with_blocks(&editor, cx),
-        indoc::indoc! {
-            "§ main.js
-             § -----
-             a(); § error 1
-             b();
-             c();"
-        }
-    );
-
-    // The second language server finishes
-    lsp_store.update(cx, |lsp_store, cx| {
-        lsp_store
-            .update_diagnostics(
-                server_id_2,
-                lsp::PublishDiagnosticsParams {
-                    uri: lsp::Uri::from_file_path(path!("/test/main.js")).unwrap(),
-                    diagnostics: vec![lsp::Diagnostic {
-                        range: lsp::Range::new(lsp::Position::new(1, 0), lsp::Position::new(1, 1)),
-                        severity: Some(lsp::DiagnosticSeverity::ERROR),
-                        message: "warning 1".to_string(),
-                        ..Default::default()
-                    }],
-                    version: None,
-                },
-                None,
-                DiagnosticSourceKind::Pushed,
-                &[],
-                cx,
-            )
-            .unwrap();
-        lsp_store.disk_based_diagnostics_finished(server_id_2, cx);
-    });
-
-    // Both language server's diagnostics are shown.
-    cx.executor()
-        .advance_clock(DIAGNOSTICS_UPDATE_DEBOUNCE + Duration::from_millis(10));
-    cx.executor().run_until_parked();
-
-    pretty_assertions::assert_eq!(
-        editor_content_with_blocks(&editor, cx),
-        indoc::indoc! {
-            "§ main.js
-             § -----
-             a(); § error 1
-             b(); § warning 1
-             c();
-             d();"
-        }
-    );
-
-    // Both language servers start updating diagnostics, and the first server finishes.
-    lsp_store.update(cx, |lsp_store, cx| {
-        lsp_store.disk_based_diagnostics_started(server_id_1, cx);
-        lsp_store.disk_based_diagnostics_started(server_id_2, cx);
-        lsp_store
-            .update_diagnostics(
-                server_id_1,
-                lsp::PublishDiagnosticsParams {
-                    uri: lsp::Uri::from_file_path(path!("/test/main.js")).unwrap(),
-                    diagnostics: vec![lsp::Diagnostic {
-                        range: lsp::Range::new(lsp::Position::new(2, 0), lsp::Position::new(2, 1)),
-                        severity: Some(lsp::DiagnosticSeverity::WARNING),
-                        message: "warning 2".to_string(),
-                        ..Default::default()
-                    }],
-                    version: None,
-                },
-                None,
-                DiagnosticSourceKind::Pushed,
-                &[],
-                cx,
-            )
-            .unwrap();
-        lsp_store
-            .update_diagnostics(
-                server_id_2,
-                lsp::PublishDiagnosticsParams {
-                    uri: lsp::Uri::from_file_path(path!("/test/main.rs")).unwrap(),
-                    diagnostics: vec![],
-                    version: None,
-                },
-                None,
-                DiagnosticSourceKind::Pushed,
-                &[],
-                cx,
-            )
-            .unwrap();
-        lsp_store.disk_based_diagnostics_finished(server_id_1, cx);
-    });
-
-    // Only the first language server's diagnostics are updated.
-    cx.executor()
-        .advance_clock(DIAGNOSTICS_UPDATE_DEBOUNCE + Duration::from_millis(10));
-    cx.executor().run_until_parked();
-
-    pretty_assertions::assert_eq!(
-        editor_content_with_blocks(&editor, cx),
-        indoc::indoc! {
-            "§ main.js
-             § -----
-             a();
-             b(); § warning 1
-             c(); § warning 2
-             d();
-             e();"
-        }
-    );
-
-    // The second language server finishes.
-    lsp_store.update(cx, |lsp_store, cx| {
-        lsp_store
-            .update_diagnostics(
-                server_id_2,
-                lsp::PublishDiagnosticsParams {
-                    uri: lsp::Uri::from_file_path(path!("/test/main.js")).unwrap(),
-                    diagnostics: vec![lsp::Diagnostic {
-                        range: lsp::Range::new(lsp::Position::new(3, 0), lsp::Position::new(3, 1)),
-                        severity: Some(lsp::DiagnosticSeverity::WARNING),
-                        message: "warning 2".to_string(),
-                        ..Default::default()
-                    }],
-                    version: None,
-                },
-                None,
-                DiagnosticSourceKind::Pushed,
-                &[],
-                cx,
-            )
-            .unwrap();
-        lsp_store.disk_based_diagnostics_finished(server_id_2, cx);
-    });
-
-    // Both language servers' diagnostics are updated.
-    cx.executor()
-        .advance_clock(DIAGNOSTICS_UPDATE_DEBOUNCE + Duration::from_millis(10));
-    cx.executor().run_until_parked();
-
-    pretty_assertions::assert_eq!(
-        editor_content_with_blocks(&editor, cx),
-        indoc::indoc! {
-            "§ main.js
-                 § -----
-                 a();
-                 b();
-                 c(); § warning 2
-                 d(); § warning 2
-                 e();"
-        }
-    );
-}
-
-#[gpui::test(iterations = 20)]
-async fn test_random_diagnostics_blocks(cx: &mut TestAppContext, mut rng: StdRng) {
-    init_test(cx);
-
-    let operations = env::var("OPERATIONS")
-        .map(|i| i.parse().expect("invalid `OPERATIONS` variable"))
-        .unwrap_or(10);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(path!("/test"), json!({})).await;
-
-    let project = Project::test(fs.clone(), [path!("/test").as_ref()], cx).await;
-    let lsp_store = project.read_with(cx, |project, _| project.lsp_store());
-    let window = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*window, cx);
-    let workspace = window.root(cx).unwrap();
-
-    let mutated_diagnostics = window.build_entity(cx, |window, cx| {
-        ProjectDiagnosticsEditor::new(true, project.clone(), workspace.downgrade(), window, cx)
-    });
-
-    workspace.update_in(cx, |workspace, window, cx| {
-        workspace.add_item_to_center(Box::new(mutated_diagnostics.clone()), window, cx);
-    });
-    mutated_diagnostics.update_in(cx, |diagnostics, window, _cx| {
-        assert!(diagnostics.focus_handle.is_focused(window));
-    });
-
-    let mut next_id = 0;
-    let mut next_filename = 0;
-    let mut language_server_ids = vec![LanguageServerId(0)];
-    let mut updated_language_servers = HashSet::default();
-    let mut current_diagnostics: HashMap<(PathBuf, LanguageServerId), Vec<lsp::Diagnostic>> =
-        Default::default();
-
-    for _ in 0..operations {
-        match rng.random_range(0..100) {
-            // language server completes its diagnostic check
-            0..=20 if !updated_language_servers.is_empty() => {
-                let server_id = *updated_language_servers.iter().choose(&mut rng).unwrap();
-                log::info!("finishing diagnostic check for language server {server_id}");
-                lsp_store.update(cx, |lsp_store, cx| {
-                    lsp_store.disk_based_diagnostics_finished(server_id, cx)
-                });
-
-                if rng.random_bool(0.5) {
-                    cx.run_until_parked();
-                }
-            }
-
-            // language server updates diagnostics
-            _ => {
-                let (path, server_id, diagnostics) =
-                    match current_diagnostics.iter_mut().choose(&mut rng) {
-                        // update existing set of diagnostics
-                        Some(((path, server_id), diagnostics)) if rng.random_bool(0.5) => {
-                            (path.clone(), *server_id, diagnostics)
-                        }
-
-                        // insert a set of diagnostics for a new path
-                        _ => {
-                            let path: PathBuf =
-                                format!(path!("/test/{}.rs"), post_inc(&mut next_filename)).into();
-                            let len = rng.random_range(128..256);
-                            let content =
-                                RandomCharIter::new(&mut rng).take(len).collect::<String>();
-                            fs.insert_file(&path, content.into_bytes()).await;
-
-                            let server_id = match language_server_ids.iter().choose(&mut rng) {
-                                Some(server_id) if rng.random_bool(0.5) => *server_id,
-                                _ => {
-                                    let id = LanguageServerId(language_server_ids.len());
-                                    language_server_ids.push(id);
-                                    id
-                                }
-                            };
-
-                            (
-                                path.clone(),
-                                server_id,
-                                current_diagnostics.entry((path, server_id)).or_default(),
-                            )
-                        }
-                    };
-
-                updated_language_servers.insert(server_id);
-
-                lsp_store.update(cx, |lsp_store, cx| {
-                    log::info!("updating diagnostics. language server {server_id} path {path:?}");
-                    randomly_update_diagnostics_for_path(
-                        &fs,
-                        &path,
-                        diagnostics,
-                        &mut next_id,
-                        &mut rng,
-                    );
-                    lsp_store
-                        .update_diagnostics(
-                            server_id,
-                            lsp::PublishDiagnosticsParams {
-                                uri: lsp::Uri::from_file_path(&path).unwrap_or_else(|_| {
-                                    lsp::Uri::from_str("file:///test/fallback.rs").unwrap()
-                                }),
-                                diagnostics: diagnostics.clone(),
-                                version: None,
-                            },
-                            None,
-                            DiagnosticSourceKind::Pushed,
-                            &[],
-                            cx,
-                        )
-                        .unwrap()
-                });
-                cx.executor()
-                    .advance_clock(DIAGNOSTICS_UPDATE_DEBOUNCE + Duration::from_millis(10));
-
-                cx.run_until_parked();
-            }
-        }
-    }
-
-    log::info!("updating mutated diagnostics view");
-    mutated_diagnostics.update_in(cx, |diagnostics, window, cx| {
-        diagnostics.update_stale_excerpts(window, cx)
-    });
-
-    log::info!("constructing reference diagnostics view");
-    let reference_diagnostics = window.build_entity(cx, |window, cx| {
-        ProjectDiagnosticsEditor::new(true, project.clone(), workspace.downgrade(), window, cx)
-    });
-    cx.executor()
-        .advance_clock(DIAGNOSTICS_UPDATE_DEBOUNCE + Duration::from_millis(10));
-    cx.run_until_parked();
-
-    let mutated_excerpts =
-        editor_content_with_blocks(&mutated_diagnostics.update(cx, |d, _| d.editor.clone()), cx);
-    let reference_excerpts = editor_content_with_blocks(
-        &reference_diagnostics.update(cx, |d, _| d.editor.clone()),
-        cx,
-    );
-
-    // The mutated view may contain more than the reference view as
-    // we don't currently shrink excerpts when diagnostics were removed.
-    let mut ref_iter = reference_excerpts.lines().filter(|line| {
-        // ignore $ ---- and $ <file>.rs
-        !line.starts_with('§')
-            || line.starts_with("§ diagnostic")
-            || line.starts_with("§ related info")
-    });
-    let mut next_ref_line = ref_iter.next();
-    let mut skipped_block = false;
-
-    for mut_line in mutated_excerpts.lines() {
-        if let Some(ref_line) = next_ref_line {
-            if mut_line == ref_line {
-                next_ref_line = ref_iter.next();
-            } else if mut_line.contains('§')
-                // ignore $ ---- and $ <file>.rs
-                && (!mut_line.starts_with('§')
-                    || mut_line.starts_with("§ diagnostic")
-                    || mut_line.starts_with("§ related info"))
-            {
-                skipped_block = true;
-            }
-        }
-    }
-
-    if next_ref_line.is_some() || skipped_block {
-        pretty_assertions::assert_eq!(mutated_excerpts, reference_excerpts);
-    }
-}
-
-// similar to above, but with inlays. Used to find panics when mixing diagnostics and inlays.
-#[gpui::test]
-async fn test_random_diagnostics_with_inlays(cx: &mut TestAppContext, mut rng: StdRng) {
-    init_test(cx);
-
-    let operations = env::var("OPERATIONS")
-        .map(|i| i.parse().expect("invalid `OPERATIONS` variable"))
-        .unwrap_or(10);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(path!("/test"), json!({})).await;
-
-    let project = Project::test(fs.clone(), [path!("/test").as_ref()], cx).await;
-    let lsp_store = project.read_with(cx, |project, _| project.lsp_store());
-    let window = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*window, cx);
-    let workspace = window.root(cx).unwrap();
-
-    let mutated_diagnostics = window.build_entity(cx, |window, cx| {
-        ProjectDiagnosticsEditor::new(true, project.clone(), workspace.downgrade(), window, cx)
-    });
-
-    workspace.update_in(cx, |workspace, window, cx| {
-        workspace.add_item_to_center(Box::new(mutated_diagnostics.clone()), window, cx);
-    });
-    mutated_diagnostics.update_in(cx, |diagnostics, window, _cx| {
-        assert!(diagnostics.focus_handle.is_focused(window));
-    });
-
-    let mut next_id = 0;
-    let mut next_filename = 0;
-    let mut language_server_ids = vec![LanguageServerId(0)];
-    let mut updated_language_servers = HashSet::default();
-    let mut current_diagnostics: HashMap<(PathBuf, LanguageServerId), Vec<lsp::Diagnostic>> =
-        Default::default();
-    let mut next_inlay_id = 0;
-
-    for _ in 0..operations {
-        match rng.random_range(0..100) {
-            // language server completes its diagnostic check
-            0..=20 if !updated_language_servers.is_empty() => {
-                let server_id = *updated_language_servers.iter().choose(&mut rng).unwrap();
-                log::info!("finishing diagnostic check for language server {server_id}");
-                lsp_store.update(cx, |lsp_store, cx| {
-                    lsp_store.disk_based_diagnostics_finished(server_id, cx)
-                });
-
-                if rng.random_bool(0.5) {
-                    cx.run_until_parked();
-                }
-            }
-
-            21..=50 => mutated_diagnostics.update_in(cx, |diagnostics, window, cx| {
-                diagnostics.editor.update(cx, |editor, cx| {
-                    let snapshot = editor.snapshot(window, cx);
-                    if !snapshot.buffer_snapshot().is_empty() {
-                        let position = rng
-                            .random_range(MultiBufferOffset(0)..snapshot.buffer_snapshot().len());
-                        let position = snapshot.buffer_snapshot().clip_offset(position, Bias::Left);
-                        log::info!(
-                            "adding inlay at {position}/{}: {:?}",
-                            snapshot.buffer_snapshot().len(),
-                            snapshot.buffer_snapshot().text(),
-                        );
-
-                        editor.splice_inlays(
-                            &[],
-                            vec![Inlay::edit_prediction(
-                                post_inc(&mut next_inlay_id),
-                                snapshot.buffer_snapshot().anchor_before(position),
-                                Rope::from_iter(["Test inlay ", "next_inlay_id"]),
-                            )],
-                            cx,
-                        );
-                    }
-                });
-            }),
-
-            // language server updates diagnostics
-            _ => {
-                let (path, server_id, diagnostics) =
-                    match current_diagnostics.iter_mut().choose(&mut rng) {
-                        // update existing set of diagnostics
-                        Some(((path, server_id), diagnostics)) if rng.random_bool(0.5) => {
-                            (path.clone(), *server_id, diagnostics)
-                        }
-
-                        // insert a set of diagnostics for a new path
-                        _ => {
-                            let path: PathBuf =
-                                format!(path!("/test/{}.rs"), post_inc(&mut next_filename)).into();
-                            let len = rng.random_range(128..256);
-                            let content =
-                                RandomCharIter::new(&mut rng).take(len).collect::<String>();
-                            fs.insert_file(&path, content.into_bytes()).await;
-
-                            let server_id = match language_server_ids.iter().choose(&mut rng) {
-                                Some(server_id) if rng.random_bool(0.5) => *server_id,
-                                _ => {
-                                    let id = LanguageServerId(language_server_ids.len());
-                                    language_server_ids.push(id);
-                                    id
-                                }
-                            };
-
-                            (
-                                path.clone(),
-                                server_id,
-                                current_diagnostics.entry((path, server_id)).or_default(),
-                            )
-                        }
-                    };
-
-                updated_language_servers.insert(server_id);
-
-                lsp_store.update(cx, |lsp_store, cx| {
-                    log::info!("updating diagnostics. language server {server_id} path {path:?}");
-                    randomly_update_diagnostics_for_path(
-                        &fs,
-                        &path,
-                        diagnostics,
-                        &mut next_id,
-                        &mut rng,
-                    );
-                    lsp_store
-                        .update_diagnostics(
-                            server_id,
-                            lsp::PublishDiagnosticsParams {
-                                uri: lsp::Uri::from_file_path(&path).unwrap_or_else(|_| {
-                                    lsp::Uri::from_str("file:///test/fallback.rs").unwrap()
-                                }),
-                                diagnostics: diagnostics.clone(),
-                                version: None,
-                            },
-                            None,
-                            DiagnosticSourceKind::Pushed,
-                            &[],
-                            cx,
-                        )
-                        .unwrap()
-                });
-                cx.executor()
-                    .advance_clock(DIAGNOSTICS_UPDATE_DEBOUNCE + Duration::from_millis(10));
-
-                cx.run_until_parked();
-            }
-        }
-    }
-
-    log::info!("updating mutated diagnostics view");
-    mutated_diagnostics.update_in(cx, |diagnostics, window, cx| {
-        diagnostics.update_stale_excerpts(window, cx)
-    });
-
-    cx.executor()
-        .advance_clock(DIAGNOSTICS_UPDATE_DEBOUNCE + Duration::from_millis(10));
-    cx.run_until_parked();
-}
-
-#[gpui::test]
-async fn active_diagnostics_dismiss_after_invalidation(cx: &mut TestAppContext) {
-    init_test(cx);
-
-    let mut cx = EditorTestContext::new(cx).await;
-    let lsp_store =
-        cx.update_editor(|editor, _, cx| editor.project().unwrap().read(cx).lsp_store());
-
-    cx.set_state(indoc! {"
-        ˇfn func(abc def: i32) -> u32 {
-        }
-    "});
-
-    let message = "Something's wrong!";
-    cx.update(|_, cx| {
-        lsp_store.update(cx, |lsp_store, cx| {
-            lsp_store
-                .update_diagnostics(
-                    LanguageServerId(0),
-                    lsp::PublishDiagnosticsParams {
-                        uri: lsp::Uri::from_file_path(path!("/root/file")).unwrap(),
-                        version: None,
-                        diagnostics: vec![lsp::Diagnostic {
-                            range: lsp::Range::new(
-                                lsp::Position::new(0, 11),
-                                lsp::Position::new(0, 12),
-                            ),
-                            severity: Some(lsp::DiagnosticSeverity::ERROR),
-                            message: message.to_string(),
-                            ..Default::default()
-                        }],
-                    },
-                    None,
-                    DiagnosticSourceKind::Pushed,
-                    &[],
-                    cx,
-                )
-                .unwrap()
-        });
-    });
-    cx.run_until_parked();
-
-    cx.update_editor(|editor, window, cx| {
-        editor.go_to_diagnostic(&GoToDiagnostic::default(), window, cx);
-        assert_eq!(
-            editor
-                .active_diagnostic_group()
-                .map(|diagnostics_group| diagnostics_group.active_message.as_str()),
-            Some(message),
-            "Should have a diagnostics group activated"
-        );
-    });
-    cx.assert_editor_state(indoc! {"
-        fn func(abcˇ def: i32) -> u32 {
-        }
-    "});
-
-    cx.update(|_, cx| {
-        lsp_store.update(cx, |lsp_store, cx| {
-            lsp_store
-                .update_diagnostics(
-                    LanguageServerId(0),
-                    lsp::PublishDiagnosticsParams {
-                        uri: lsp::Uri::from_file_path(path!("/root/file")).unwrap(),
-                        version: None,
-                        diagnostics: Vec::new(),
-                    },
-                    None,
-                    DiagnosticSourceKind::Pushed,
-                    &[],
-                    cx,
-                )
-                .unwrap()
-        });
-    });
-    cx.run_until_parked();
-    cx.update_editor(|editor, _, _| {
-        assert_eq!(editor.active_diagnostic_group(), None);
-    });
-    cx.assert_editor_state(indoc! {"
-        fn func(abcˇ def: i32) -> u32 {
-        }
-    "});
-
-    cx.update_editor(|editor, window, cx| {
-        editor.go_to_diagnostic(&GoToDiagnostic::default(), window, cx);
-        assert_eq!(editor.active_diagnostic_group(), None);
-    });
-    cx.assert_editor_state(indoc! {"
-        fn func(abcˇ def: i32) -> u32 {
-        }
-    "});
-}
-
-#[gpui::test]
-async fn cycle_through_same_place_diagnostics(cx: &mut TestAppContext) {
-    init_test(cx);
-
-    let mut cx = EditorTestContext::new(cx).await;
-    let lsp_store =
-        cx.update_editor(|editor, _, cx| editor.project().unwrap().read(cx).lsp_store());
-
-    cx.set_state(indoc! {"
-        ˇfn func(abc def: i32) -> u32 {
-        }
-    "});
-
-    cx.update(|_, cx| {
-        lsp_store.update(cx, |lsp_store, cx| {
-            lsp_store
-                .update_diagnostics(
-                    LanguageServerId(0),
-                    lsp::PublishDiagnosticsParams {
-                        uri: lsp::Uri::from_file_path(path!("/root/file")).unwrap(),
-                        version: None,
-                        diagnostics: vec![
-                            lsp::Diagnostic {
-                                range: lsp::Range::new(
-                                    lsp::Position::new(0, 11),
-                                    lsp::Position::new(0, 12),
-                                ),
-                                severity: Some(lsp::DiagnosticSeverity::ERROR),
-                                ..Default::default()
-                            },
-                            lsp::Diagnostic {
-                                range: lsp::Range::new(
-                                    lsp::Position::new(0, 12),
-                                    lsp::Position::new(0, 15),
-                                ),
-                                severity: Some(lsp::DiagnosticSeverity::ERROR),
-                                ..Default::default()
-                            },
-                            lsp::Diagnostic {
-                                range: lsp::Range::new(
-                                    lsp::Position::new(0, 12),
-                                    lsp::Position::new(0, 15),
-                                ),
-                                severity: Some(lsp::DiagnosticSeverity::ERROR),
-                                ..Default::default()
-                            },
-                            lsp::Diagnostic {
-                                range: lsp::Range::new(
-                                    lsp::Position::new(0, 25),
-                                    lsp::Position::new(0, 28),
-                                ),
-                                severity: Some(lsp::DiagnosticSeverity::ERROR),
-                                ..Default::default()
-                            },
-                        ],
-                    },
-                    None,
-                    DiagnosticSourceKind::Pushed,
-                    &[],
-                    cx,
-                )
-                .unwrap()
-        });
-    });
-    cx.run_until_parked();
-
-    //// Backward
-
-    // Fourth diagnostic
-    cx.update_editor(|editor, window, cx| {
-        editor.go_to_prev_diagnostic(&GoToPreviousDiagnostic::default(), window, cx);
-    });
-    cx.assert_editor_state(indoc! {"
-        fn func(abc def: i32) -> ˇu32 {
-        }
-    "});
-
-    // Third diagnostic
-    cx.update_editor(|editor, window, cx| {
-        editor.go_to_prev_diagnostic(&GoToPreviousDiagnostic::default(), window, cx);
-    });
-    cx.assert_editor_state(indoc! {"
-        fn func(abc ˇdef: i32) -> u32 {
-        }
-    "});
-
-    // Second diagnostic, same place
-    cx.update_editor(|editor, window, cx| {
-        editor.go_to_prev_diagnostic(&GoToPreviousDiagnostic::default(), window, cx);
-    });
-    cx.assert_editor_state(indoc! {"
-        fn func(abc ˇdef: i32) -> u32 {
-        }
-    "});
-
-    // First diagnostic
-    cx.update_editor(|editor, window, cx| {
-        editor.go_to_prev_diagnostic(&GoToPreviousDiagnostic::default(), window, cx);
-    });
-    cx.assert_editor_state(indoc! {"
-        fn func(abcˇ def: i32) -> u32 {
-        }
-    "});
-
-    // Wrapped over, fourth diagnostic
-    cx.update_editor(|editor, window, cx| {
-        editor.go_to_prev_diagnostic(&GoToPreviousDiagnostic::default(), window, cx);
-    });
-    cx.assert_editor_state(indoc! {"
-        fn func(abc def: i32) -> ˇu32 {
-        }
-    "});
-
-    cx.update_editor(|editor, window, cx| {
-        editor.move_to_beginning(&MoveToBeginning, window, cx);
-    });
-    cx.assert_editor_state(indoc! {"
-        ˇfn func(abc def: i32) -> u32 {
-        }
-    "});
-
-    //// Forward
-
-    // First diagnostic
-    cx.update_editor(|editor, window, cx| {
-        editor.go_to_diagnostic(&GoToDiagnostic::default(), window, cx);
-    });
-    cx.assert_editor_state(indoc! {"
-        fn func(abcˇ def: i32) -> u32 {
-        }
-    "});
-
-    // Second diagnostic
-    cx.update_editor(|editor, window, cx| {
-        editor.go_to_diagnostic(&GoToDiagnostic::default(), window, cx);
-    });
-    cx.assert_editor_state(indoc! {"
-        fn func(abc ˇdef: i32) -> u32 {
-        }
-    "});
-
-    // Third diagnostic, same place
-    cx.update_editor(|editor, window, cx| {
-        editor.go_to_diagnostic(&GoToDiagnostic::default(), window, cx);
-    });
-    cx.assert_editor_state(indoc! {"
-        fn func(abc ˇdef: i32) -> u32 {
-        }
-    "});
-
-    // Fourth diagnostic
-    cx.update_editor(|editor, window, cx| {
-        editor.go_to_diagnostic(&GoToDiagnostic::default(), window, cx);
-    });
-    cx.assert_editor_state(indoc! {"
-        fn func(abc def: i32) -> ˇu32 {
-        }
-    "});
-
-    // Wrapped around, first diagnostic
-    cx.update_editor(|editor, window, cx| {
-        editor.go_to_diagnostic(&GoToDiagnostic::default(), window, cx);
-    });
-    cx.assert_editor_state(indoc! {"
-        fn func(abcˇ def: i32) -> u32 {
-        }
-    "});
-}
-
-#[gpui::test]
-async fn test_diagnostics_with_links(cx: &mut TestAppContext) {
-    init_test(cx);
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    cx.set_state(indoc! {"
-        fn func(abˇc def: i32) -> u32 {
-        }
-    "});
-    let lsp_store =
-        cx.update_editor(|editor, _, cx| editor.project().unwrap().read(cx).lsp_store());
-
-    cx.update(|_, cx| {
-        lsp_store.update(cx, |lsp_store, cx| {
-            lsp_store.update_diagnostics(
-                LanguageServerId(0),
-                lsp::PublishDiagnosticsParams {
-                    uri: lsp::Uri::from_file_path(path!("/root/file")).unwrap(),
-                    version: None,
-                    diagnostics: vec![lsp::Diagnostic {
-                        range: lsp::Range::new(lsp::Position::new(0, 8), lsp::Position::new(0, 12)),
-                        severity: Some(lsp::DiagnosticSeverity::ERROR),
-                        message: "we've had problems with <https://link.one>, and <https://link.two> is broken".to_string(),
-                        ..Default::default()
-                    }],
-                },
-                None,
-                DiagnosticSourceKind::Pushed,
-                &[],
-                cx,
-            )
-        })
-    }).unwrap();
-    cx.run_until_parked();
-    cx.update_editor(|editor, window, cx| {
-        editor::hover_popover::hover(editor, &Default::default(), window, cx)
-    });
-    cx.run_until_parked();
-    cx.update_editor(|editor, _, _| assert!(editor.hover_state.diagnostic_popover.is_some()))
-}
-
-#[gpui::test]
-async fn test_hover_diagnostic_and_info_popovers(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let mut cx = EditorLspTestContext::new_rust(
-        lsp::ServerCapabilities {
-            hover_provider: Some(lsp::HoverProviderCapability::Simple(true)),
-            ..Default::default()
-        },
-        cx,
-    )
-    .await;
-
-    // Hover with just diagnostic, pops DiagnosticPopover immediately and then
-    // info popover once request completes
-    cx.set_state(indoc! {"
-        fn teˇst() { println!(); }
-    "});
-    // Send diagnostic to client
-    let range = cx.lsp_range(indoc! {"
-        fn «test»() { println!(); }
-    "});
-    let lsp_store =
-        cx.update_editor(|editor, _, cx| editor.project().unwrap().read(cx).lsp_store());
-    cx.update(|_, cx| {
-        lsp_store.update(cx, |lsp_store, cx| {
-            lsp_store.update_diagnostics(
-                LanguageServerId(0),
-                lsp::PublishDiagnosticsParams {
-                    uri: lsp::Uri::from_file_path(path!("/root/dir/file.rs")).unwrap(),
-                    version: None,
-                    diagnostics: vec![lsp::Diagnostic {
-                        range,
-                        severity: Some(lsp::DiagnosticSeverity::ERROR),
-                        message: "A test diagnostic message.".to_string(),
-                        ..Default::default()
-                    }],
-                },
-                None,
-                DiagnosticSourceKind::Pushed,
-                &[],
-                cx,
-            )
-        })
-    })
-    .unwrap();
-    cx.run_until_parked();
-
-    // Hover pops diagnostic immediately
-    cx.update_editor(|editor, window, cx| editor::hover_popover::hover(editor, &Hover, window, cx));
-    cx.background_executor.run_until_parked();
-
-    cx.editor(|Editor { hover_state, .. }, _, _| {
-        assert!(hover_state.diagnostic_popover.is_some());
-        assert!(hover_state.info_popovers.is_empty());
-    });
-
-    // Info Popover shows after request responded to
-    let range = cx.lsp_range(indoc! {"
-            fn «test»() { println!(); }
-        "});
-    cx.set_request_handler::<lsp::request::HoverRequest, _, _>(move |_, _, _| async move {
-        Ok(Some(lsp::Hover {
-            contents: lsp::HoverContents::Markup(lsp::MarkupContent {
-                kind: lsp::MarkupKind::Markdown,
-                value: "some new docs".to_string(),
-            }),
-            range: Some(range),
-        }))
-    });
-    let delay = cx.update(|_, cx| EditorSettings::get_global(cx).hover_popover_delay.0 + 1);
-    cx.background_executor
-        .advance_clock(Duration::from_millis(delay));
-
-    cx.background_executor.run_until_parked();
-    cx.editor(|Editor { hover_state, .. }, _, _| {
-        hover_state.diagnostic_popover.is_some() && hover_state.info_task.is_some()
-    });
-}
-#[gpui::test]
-async fn test_diagnostics_with_code(cx: &mut TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/root"),
-        json!({
-            "main.js": "
-                function test() {
-                    const x = 10;
-                    const y = 20;
-                    return 1;
-                }
-                test();
-            "
-            .unindent(),
-        }),
-    )
-    .await;
-
-    let language_server_id = LanguageServerId(0);
-    let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-    let lsp_store = project.read_with(cx, |project, _| project.lsp_store());
-    let window = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*window, cx);
-    let workspace = window.root(cx).unwrap();
-    let uri = lsp::Uri::from_file_path(path!("/root/main.js")).unwrap();
-
-    // Create diagnostics with code fields
-    lsp_store.update(cx, |lsp_store, cx| {
-        lsp_store
-            .update_diagnostics(
-                language_server_id,
-                lsp::PublishDiagnosticsParams {
-                    uri: uri.clone(),
-                    diagnostics: vec![
-                        lsp::Diagnostic {
-                            range: lsp::Range::new(
-                                lsp::Position::new(1, 4),
-                                lsp::Position::new(1, 14),
-                            ),
-                            severity: Some(lsp::DiagnosticSeverity::WARNING),
-                            code: Some(lsp::NumberOrString::String("no-unused-vars".to_string())),
-                            source: Some("eslint".to_string()),
-                            message: "'x' is assigned a value but never used".to_string(),
-                            ..Default::default()
-                        },
-                        lsp::Diagnostic {
-                            range: lsp::Range::new(
-                                lsp::Position::new(2, 4),
-                                lsp::Position::new(2, 14),
-                            ),
-                            severity: Some(lsp::DiagnosticSeverity::WARNING),
-                            code: Some(lsp::NumberOrString::String("no-unused-vars".to_string())),
-                            source: Some("eslint".to_string()),
-                            message: "'y' is assigned a value but never used".to_string(),
-                            ..Default::default()
-                        },
-                    ],
-                    version: None,
-                },
-                None,
-                DiagnosticSourceKind::Pushed,
-                &[],
-                cx,
-            )
-            .unwrap();
-    });
-
-    // Open the project diagnostics view
-    let diagnostics = window.build_entity(cx, |window, cx| {
-        ProjectDiagnosticsEditor::new(true, project.clone(), workspace.downgrade(), window, cx)
-    });
-    let editor = diagnostics.update(cx, |diagnostics, _| diagnostics.editor.clone());
-
-    diagnostics
-        .next_notification(DIAGNOSTICS_UPDATE_DEBOUNCE + Duration::from_millis(10), cx)
-        .await;
-
-    // Verify that the diagnostic codes are displayed correctly
-    pretty_assertions::assert_eq!(
-        editor_content_with_blocks(&editor, cx),
-        indoc::indoc! {
-            "§ main.js
-             § -----
-             function test() {
-                 const x = 10; § 'x' is assigned a value but never used (eslint no-unused-vars)
-                 const y = 20; § 'y' is assigned a value but never used (eslint no-unused-vars)
-                 return 1;
-             }"
-        }
-    );
-}
-
-#[gpui::test]
-async fn go_to_diagnostic_with_severity(cx: &mut TestAppContext) {
-    init_test(cx);
-
-    let mut cx = EditorTestContext::new(cx).await;
-    let lsp_store =
-        cx.update_editor(|editor, _, cx| editor.project().unwrap().read(cx).lsp_store());
-
-    cx.set_state(indoc! {"error warning info hiˇnt"});
-
-    cx.update(|_, cx| {
-        lsp_store.update(cx, |lsp_store, cx| {
-            lsp_store
-                .update_diagnostics(
-                    LanguageServerId(0),
-                    lsp::PublishDiagnosticsParams {
-                        uri: lsp::Uri::from_file_path(path!("/root/file")).unwrap(),
-                        version: None,
-                        diagnostics: vec![
-                            lsp::Diagnostic {
-                                range: lsp::Range::new(
-                                    lsp::Position::new(0, 0),
-                                    lsp::Position::new(0, 5),
-                                ),
-                                severity: Some(lsp::DiagnosticSeverity::ERROR),
-                                ..Default::default()
-                            },
-                            lsp::Diagnostic {
-                                range: lsp::Range::new(
-                                    lsp::Position::new(0, 6),
-                                    lsp::Position::new(0, 13),
-                                ),
-                                severity: Some(lsp::DiagnosticSeverity::WARNING),
-                                ..Default::default()
-                            },
-                            lsp::Diagnostic {
-                                range: lsp::Range::new(
-                                    lsp::Position::new(0, 14),
-                                    lsp::Position::new(0, 18),
-                                ),
-                                severity: Some(lsp::DiagnosticSeverity::INFORMATION),
-                                ..Default::default()
-                            },
-                            lsp::Diagnostic {
-                                range: lsp::Range::new(
-                                    lsp::Position::new(0, 19),
-                                    lsp::Position::new(0, 23),
-                                ),
-                                severity: Some(lsp::DiagnosticSeverity::HINT),
-                                ..Default::default()
-                            },
-                        ],
-                    },
-                    None,
-                    DiagnosticSourceKind::Pushed,
-                    &[],
-                    cx,
-                )
-                .unwrap()
-        });
-    });
-    cx.run_until_parked();
-
-    macro_rules! go {
-        ($severity:expr) => {
-            cx.update_editor(|editor, window, cx| {
-                editor.go_to_diagnostic(
-                    &GoToDiagnostic {
-                        severity: $severity,
-                    },
-                    window,
-                    cx,
-                );
-            });
-        };
-    }
-
-    // Default, should cycle through all diagnostics
-    go!(GoToDiagnosticSeverityFilter::default());
-    cx.assert_editor_state(indoc! {"ˇerror warning info hint"});
-    go!(GoToDiagnosticSeverityFilter::default());
-    cx.assert_editor_state(indoc! {"error ˇwarning info hint"});
-    go!(GoToDiagnosticSeverityFilter::default());
-    cx.assert_editor_state(indoc! {"error warning ˇinfo hint"});
-    go!(GoToDiagnosticSeverityFilter::default());
-    cx.assert_editor_state(indoc! {"error warning info ˇhint"});
-    go!(GoToDiagnosticSeverityFilter::default());
-    cx.assert_editor_state(indoc! {"ˇerror warning info hint"});
-
-    let only_info = GoToDiagnosticSeverityFilter::Only(GoToDiagnosticSeverity::Information);
-    go!(only_info);
-    cx.assert_editor_state(indoc! {"error warning ˇinfo hint"});
-    go!(only_info);
-    cx.assert_editor_state(indoc! {"error warning ˇinfo hint"});
-
-    let no_hints = GoToDiagnosticSeverityFilter::Range {
-        min: GoToDiagnosticSeverity::Information,
-        max: GoToDiagnosticSeverity::Error,
-    };
-
-    go!(no_hints);
-    cx.assert_editor_state(indoc! {"ˇerror warning info hint"});
-    go!(no_hints);
-    cx.assert_editor_state(indoc! {"error ˇwarning info hint"});
-    go!(no_hints);
-    cx.assert_editor_state(indoc! {"error warning ˇinfo hint"});
-    go!(no_hints);
-    cx.assert_editor_state(indoc! {"ˇerror warning info hint"});
-
-    let warning_info = GoToDiagnosticSeverityFilter::Range {
-        min: GoToDiagnosticSeverity::Information,
-        max: GoToDiagnosticSeverity::Warning,
-    };
-
-    go!(warning_info);
-    cx.assert_editor_state(indoc! {"error ˇwarning info hint"});
-    go!(warning_info);
-    cx.assert_editor_state(indoc! {"error warning ˇinfo hint"});
-    go!(warning_info);
-    cx.assert_editor_state(indoc! {"error ˇwarning info hint"});
-}
-
-#[gpui::test]
-async fn test_buffer_diagnostics(cx: &mut TestAppContext) {
-    init_test(cx);
-
-    // We'll be creating two different files, both with diagnostics, so we can
-    // later verify that, since the `BufferDiagnosticsEditor` only shows
-    // diagnostics for the provided path, the diagnostics for the other file
-    // will not be shown, contrary to what happens with
-    // `ProjectDiagnosticsEditor`.
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/test"),
-        json!({
-            "main.rs": "
-                fn main() {
-                    let x = vec![];
-                    let y = vec![];
-                    a(x);
-                    b(y);
-                    c(y);
-                    d(x);
-                }
-            "
-            .unindent(),
-            "other.rs": "
-                fn other() {
-                    let unused = 42;
-                    undefined_function();
-                }
-            "
-            .unindent(),
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), [path!("/test").as_ref()], cx).await;
-    let window = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*window, cx);
-    let project_path = project::ProjectPath {
-        worktree_id: project.read_with(cx, |project, cx| {
-            project.worktrees(cx).next().unwrap().read(cx).id()
-        }),
-        path: rel_path("main.rs").into(),
-    };
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_buffer(project_path.clone(), cx)
-        })
-        .await
-        .ok();
-
-    // Create the diagnostics for `main.rs`.
-    let language_server_id = LanguageServerId(0);
-    let uri = lsp::Uri::from_file_path(path!("/test/main.rs")).unwrap();
-    let lsp_store = project.read_with(cx, |project, _| project.lsp_store());
-
-    lsp_store.update(cx, |lsp_store, cx| {
-        lsp_store.update_diagnostics(language_server_id, lsp::PublishDiagnosticsParams {
-            uri: uri.clone(),
-            diagnostics: vec![
-                lsp::Diagnostic{
-                    range: lsp::Range::new(lsp::Position::new(5, 6), lsp::Position::new(5, 7)),
-                    severity: Some(lsp::DiagnosticSeverity::WARNING),
-                    message: "use of moved value\nvalue used here after move".to_string(),
-                    related_information: Some(vec![
-                        lsp::DiagnosticRelatedInformation {
-                            location: lsp::Location::new(uri.clone(), lsp::Range::new(lsp::Position::new(2, 8), lsp::Position::new(2, 9))),
-                            message: "move occurs because `y` has type `Vec<char>`, which does not implement the `Copy` trait".to_string()
-                        },
-                        lsp::DiagnosticRelatedInformation {
-                            location: lsp::Location::new(uri.clone(), lsp::Range::new(lsp::Position::new(4, 6), lsp::Position::new(4, 7))),
-                            message: "value moved here".to_string()
-                        },
-                    ]),
-                    ..Default::default()
-                },
-                lsp::Diagnostic{
-                    range: lsp::Range::new(lsp::Position::new(6, 6), lsp::Position::new(6, 7)),
-                    severity: Some(lsp::DiagnosticSeverity::ERROR),
-                    message: "use of moved value\nvalue used here after move".to_string(),
-                    related_information: Some(vec![
-                        lsp::DiagnosticRelatedInformation {
-                            location: lsp::Location::new(uri.clone(), lsp::Range::new(lsp::Position::new(1, 8), lsp::Position::new(1, 9))),
-                            message: "move occurs because `x` has type `Vec<char>`, which does not implement the `Copy` trait".to_string()
-                        },
-                        lsp::DiagnosticRelatedInformation {
-                            location: lsp::Location::new(uri.clone(), lsp::Range::new(lsp::Position::new(3, 6), lsp::Position::new(3, 7))),
-                            message: "value moved here".to_string()
-                        },
-                    ]),
-                    ..Default::default()
-                }
-            ],
-            version: None
-        }, None, DiagnosticSourceKind::Pushed, &[], cx).unwrap();
-
-        // Create diagnostics for other.rs to ensure that the file and
-        // diagnostics are not included in `BufferDiagnosticsEditor` when it is
-        // deployed for main.rs.
-        lsp_store.update_diagnostics(language_server_id, lsp::PublishDiagnosticsParams {
-            uri: lsp::Uri::from_file_path(path!("/test/other.rs")).unwrap(),
-            diagnostics: vec![
-                lsp::Diagnostic{
-                    range: lsp::Range::new(lsp::Position::new(1, 8), lsp::Position::new(1, 14)),
-                    severity: Some(lsp::DiagnosticSeverity::WARNING),
-                    message: "unused variable: `unused`".to_string(),
-                    ..Default::default()
-                },
-                lsp::Diagnostic{
-                    range: lsp::Range::new(lsp::Position::new(2, 4), lsp::Position::new(2, 22)),
-                    severity: Some(lsp::DiagnosticSeverity::ERROR),
-                    message: "cannot find function `undefined_function` in this scope".to_string(),
-                    ..Default::default()
-                }
-            ],
-            version: None
-        }, None, DiagnosticSourceKind::Pushed, &[], cx).unwrap();
-    });
-
-    let buffer_diagnostics = window.build_entity(cx, |window, cx| {
-        BufferDiagnosticsEditor::new(
-            project_path.clone(),
-            project.clone(),
-            buffer,
-            true,
-            window,
-            cx,
-        )
-    });
-    let editor = buffer_diagnostics.update(cx, |buffer_diagnostics, _| {
-        buffer_diagnostics.editor().clone()
-    });
-
-    // Since the excerpt updates is handled by a background task, we need to
-    // wait a little bit to ensure that the buffer diagnostic's editor content
-    // is rendered.
-    cx.executor()
-        .advance_clock(DIAGNOSTICS_UPDATE_DEBOUNCE + Duration::from_millis(10));
-
-    pretty_assertions::assert_eq!(
-        editor_content_with_blocks(&editor, cx),
-        indoc::indoc! {
-            "§ main.rs
-             § -----
-             fn main() {
-                 let x = vec![];
-             § move occurs because `x` has type `Vec<char>`, which does not implement
-             § the `Copy` trait (back)
-                 let y = vec![];
-             § move occurs because `y` has type `Vec<char>`, which does not implement
-             § the `Copy` trait
-                 a(x); § value moved here
-                 b(y); § value moved here
-                 c(y);
-             § use of moved value
-             § value used here after move
-                 d(x);
-             § use of moved value
-             § value used here after move
-             § hint: move occurs because `x` has type `Vec<char>`, which does not
-             § implement the `Copy` trait
-             }"
-        }
-    );
-}
-
-#[gpui::test]
-async fn test_buffer_diagnostics_without_warnings(cx: &mut TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/test"),
-        json!({
-            "main.rs": "
-                fn main() {
-                    let x = vec![];
-                    let y = vec![];
-                    a(x);
-                    b(y);
-                    c(y);
-                    d(x);
-                }
-            "
-            .unindent(),
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), [path!("/test").as_ref()], cx).await;
-    let window = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*window, cx);
-    let project_path = project::ProjectPath {
-        worktree_id: project.read_with(cx, |project, cx| {
-            project.worktrees(cx).next().unwrap().read(cx).id()
-        }),
-        path: rel_path("main.rs").into(),
-    };
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_buffer(project_path.clone(), cx)
-        })
-        .await
-        .ok();
-
-    let language_server_id = LanguageServerId(0);
-    let uri = lsp::Uri::from_file_path(path!("/test/main.rs")).unwrap();
-    let lsp_store = project.read_with(cx, |project, _| project.lsp_store());
-
-    lsp_store.update(cx, |lsp_store, cx| {
-        lsp_store.update_diagnostics(language_server_id, lsp::PublishDiagnosticsParams {
-            uri: uri.clone(),
-            diagnostics: vec![
-                lsp::Diagnostic{
-                    range: lsp::Range::new(lsp::Position::new(5, 6), lsp::Position::new(5, 7)),
-                    severity: Some(lsp::DiagnosticSeverity::WARNING),
-                    message: "use of moved value\nvalue used here after move".to_string(),
-                    related_information: Some(vec![
-                        lsp::DiagnosticRelatedInformation {
-                            location: lsp::Location::new(uri.clone(), lsp::Range::new(lsp::Position::new(2, 8), lsp::Position::new(2, 9))),
-                            message: "move occurs because `y` has type `Vec<char>`, which does not implement the `Copy` trait".to_string()
-                        },
-                        lsp::DiagnosticRelatedInformation {
-                            location: lsp::Location::new(uri.clone(), lsp::Range::new(lsp::Position::new(4, 6), lsp::Position::new(4, 7))),
-                            message: "value moved here".to_string()
-                        },
-                    ]),
-                    ..Default::default()
-                },
-                lsp::Diagnostic{
-                    range: lsp::Range::new(lsp::Position::new(6, 6), lsp::Position::new(6, 7)),
-                    severity: Some(lsp::DiagnosticSeverity::ERROR),
-                    message: "use of moved value\nvalue used here after move".to_string(),
-                    related_information: Some(vec![
-                        lsp::DiagnosticRelatedInformation {
-                            location: lsp::Location::new(uri.clone(), lsp::Range::new(lsp::Position::new(1, 8), lsp::Position::new(1, 9))),
-                            message: "move occurs because `x` has type `Vec<char>`, which does not implement the `Copy` trait".to_string()
-                        },
-                        lsp::DiagnosticRelatedInformation {
-                            location: lsp::Location::new(uri.clone(), lsp::Range::new(lsp::Position::new(3, 6), lsp::Position::new(3, 7))),
-                            message: "value moved here".to_string()
-                        },
-                    ]),
-                    ..Default::default()
-                }
-            ],
-            version: None
-        }, None, DiagnosticSourceKind::Pushed, &[], cx).unwrap();
-    });
-
-    let include_warnings = false;
-    let buffer_diagnostics = window.build_entity(cx, |window, cx| {
-        BufferDiagnosticsEditor::new(
-            project_path.clone(),
-            project.clone(),
-            buffer,
-            include_warnings,
-            window,
-            cx,
-        )
-    });
-
-    let editor = buffer_diagnostics.update(cx, |buffer_diagnostics, _cx| {
-        buffer_diagnostics.editor().clone()
-    });
-
-    // Since the excerpt updates is handled by a background task, we need to
-    // wait a little bit to ensure that the buffer diagnostic's editor content
-    // is rendered.
-    cx.executor()
-        .advance_clock(DIAGNOSTICS_UPDATE_DEBOUNCE + Duration::from_millis(10));
-
-    pretty_assertions::assert_eq!(
-        editor_content_with_blocks(&editor, cx),
-        indoc::indoc! {
-            "§ main.rs
-             § -----
-             fn main() {
-                 let x = vec![];
-             § move occurs because `x` has type `Vec<char>`, which does not implement
-             § the `Copy` trait (back)
-                 let y = vec![];
-                 a(x); § value moved here
-                 b(y);
-                 c(y);
-                 d(x);
-             § use of moved value
-             § value used here after move
-             § hint: move occurs because `x` has type `Vec<char>`, which does not
-             § implement the `Copy` trait
-             }"
-        }
-    );
-}
-
-#[gpui::test]
-async fn test_buffer_diagnostics_multiple_servers(cx: &mut TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/test"),
-        json!({
-            "main.rs": "
-                fn main() {
-                    let x = vec![];
-                    let y = vec![];
-                    a(x);
-                    b(y);
-                    c(y);
-                    d(x);
-                }
-            "
-            .unindent(),
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), [path!("/test").as_ref()], cx).await;
-    let window = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*window, cx);
-    let project_path = project::ProjectPath {
-        worktree_id: project.read_with(cx, |project, cx| {
-            project.worktrees(cx).next().unwrap().read(cx).id()
-        }),
-        path: rel_path("main.rs").into(),
-    };
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_buffer(project_path.clone(), cx)
-        })
-        .await
-        .ok();
-
-    // Create the diagnostics for `main.rs`.
-    // Two warnings are being created, one for each language server, in order to
-    // assert that both warnings are rendered in the editor.
-    let language_server_id_a = LanguageServerId(0);
-    let language_server_id_b = LanguageServerId(1);
-    let uri = lsp::Uri::from_file_path(path!("/test/main.rs")).unwrap();
-    let lsp_store = project.read_with(cx, |project, _| project.lsp_store());
-
-    lsp_store.update(cx, |lsp_store, cx| {
-        lsp_store
-            .update_diagnostics(
-                language_server_id_a,
-                lsp::PublishDiagnosticsParams {
-                    uri: uri.clone(),
-                    diagnostics: vec![lsp::Diagnostic {
-                        range: lsp::Range::new(lsp::Position::new(5, 6), lsp::Position::new(5, 7)),
-                        severity: Some(lsp::DiagnosticSeverity::WARNING),
-                        message: "use of moved value\nvalue used here after move".to_string(),
-                        related_information: None,
-                        ..Default::default()
-                    }],
-                    version: None,
-                },
-                None,
-                DiagnosticSourceKind::Pushed,
-                &[],
-                cx,
-            )
-            .unwrap();
-
-        lsp_store
-            .update_diagnostics(
-                language_server_id_b,
-                lsp::PublishDiagnosticsParams {
-                    uri: uri.clone(),
-                    diagnostics: vec![lsp::Diagnostic {
-                        range: lsp::Range::new(lsp::Position::new(6, 6), lsp::Position::new(6, 7)),
-                        severity: Some(lsp::DiagnosticSeverity::WARNING),
-                        message: "use of moved value\nvalue used here after move".to_string(),
-                        related_information: None,
-                        ..Default::default()
-                    }],
-                    version: None,
-                },
-                None,
-                DiagnosticSourceKind::Pushed,
-                &[],
-                cx,
-            )
-            .unwrap();
-    });
-
-    let buffer_diagnostics = window.build_entity(cx, |window, cx| {
-        BufferDiagnosticsEditor::new(
-            project_path.clone(),
-            project.clone(),
-            buffer,
-            true,
-            window,
-            cx,
-        )
-    });
-    let editor = buffer_diagnostics.update(cx, |buffer_diagnostics, _| {
-        buffer_diagnostics.editor().clone()
-    });
-
-    // Since the excerpt updates is handled by a background task, we need to
-    // wait a little bit to ensure that the buffer diagnostic's editor content
-    // is rendered.
-    cx.executor()
-        .advance_clock(DIAGNOSTICS_UPDATE_DEBOUNCE + Duration::from_millis(10));
-
-    pretty_assertions::assert_eq!(
-        editor_content_with_blocks(&editor, cx),
-        indoc::indoc! {
-            "§ main.rs
-             § -----
-                 a(x);
-                 b(y);
-                 c(y);
-             § use of moved value
-             § value used here after move
-                 d(x);
-             § use of moved value
-             § value used here after move
-             }"
-        }
-    );
-
-    buffer_diagnostics.update(cx, |buffer_diagnostics, _cx| {
-        assert_eq!(
-            *buffer_diagnostics.summary(),
-            DiagnosticSummary {
-                warning_count: 2,
-                error_count: 0
-            }
-        );
-    })
-}
-
-fn init_test(cx: &mut TestAppContext) {
-    cx.update(|cx| {
-        zlog::init_test();
-        let settings = SettingsStore::test(cx);
-        cx.set_global(settings);
-        theme::init(theme::LoadThemes::JustBase, cx);
-        crate::init(cx);
-        editor::init(cx);
-    });
-}
-
-fn randomly_update_diagnostics_for_path(
-    fs: &FakeFs,
-    path: &Path,
-    diagnostics: &mut Vec<lsp::Diagnostic>,
-    next_id: &mut usize,
-    rng: &mut impl Rng,
-) {
-    let mutation_count = rng.random_range(1..=3);
-    for _ in 0..mutation_count {
-        if rng.random_bool(0.3) && !diagnostics.is_empty() {
-            let idx = rng.random_range(0..diagnostics.len());
-            log::info!("  removing diagnostic at index {idx}");
-            diagnostics.remove(idx);
-        } else {
-            let unique_id = *next_id;
-            *next_id += 1;
-
-            let new_diagnostic = random_lsp_diagnostic(rng, fs, path, unique_id);
-
-            let ix = rng.random_range(0..=diagnostics.len());
-            log::info!(
-                "  inserting {} at index {ix}. {},{}..{},{}",
-                new_diagnostic.message,
-                new_diagnostic.range.start.line,
-                new_diagnostic.range.start.character,
-                new_diagnostic.range.end.line,
-                new_diagnostic.range.end.character,
-            );
-            for related in new_diagnostic.related_information.iter().flatten() {
-                log::info!(
-                    "   {}. {},{}..{},{}",
-                    related.message,
-                    related.location.range.start.line,
-                    related.location.range.start.character,
-                    related.location.range.end.line,
-                    related.location.range.end.character,
-                );
-            }
-            diagnostics.insert(ix, new_diagnostic);
-        }
-    }
-}
-
-fn random_lsp_diagnostic(
-    rng: &mut impl Rng,
-    fs: &FakeFs,
-    path: &Path,
-    unique_id: usize,
-) -> lsp::Diagnostic {
-    // Intentionally allow erroneous ranges some of the time (that run off the end of the file),
-    // because language servers can potentially give us those, and we should handle them gracefully.
-    const ERROR_MARGIN: usize = 10;
-
-    let file_content = fs.read_file_sync(path).unwrap();
-    let file_text = Rope::from(String::from_utf8_lossy(&file_content).as_ref());
-
-    let start = rng.random_range(0..file_text.len().saturating_add(ERROR_MARGIN));
-    let end = rng.random_range(start..file_text.len().saturating_add(ERROR_MARGIN));
-
-    let start_point = file_text.offset_to_point_utf16(start);
-    let end_point = file_text.offset_to_point_utf16(end);
-
-    let range = lsp::Range::new(
-        lsp::Position::new(start_point.row, start_point.column),
-        lsp::Position::new(end_point.row, end_point.column),
-    );
-
-    let severity = if rng.random_bool(0.5) {
-        Some(lsp::DiagnosticSeverity::ERROR)
-    } else {
-        Some(lsp::DiagnosticSeverity::WARNING)
-    };
-
-    let message = format!("diagnostic {unique_id}");
-
-    let related_information = if rng.random_bool(0.3) {
-        let info_count = rng.random_range(1..=3);
-        let mut related_info = Vec::with_capacity(info_count);
-
-        for i in 0..info_count {
-            let info_start = rng.random_range(0..file_text.len().saturating_add(ERROR_MARGIN));
-            let info_end =
-                rng.random_range(info_start..file_text.len().saturating_add(ERROR_MARGIN));
-
-            let info_start_point = file_text.offset_to_point_utf16(info_start);
-            let info_end_point = file_text.offset_to_point_utf16(info_end);
-
-            let info_range = lsp::Range::new(
-                lsp::Position::new(info_start_point.row, info_start_point.column),
-                lsp::Position::new(info_end_point.row, info_end_point.column),
-            );
-
-            related_info.push(lsp::DiagnosticRelatedInformation {
-                location: lsp::Location::new(lsp::Uri::from_file_path(path).unwrap(), info_range),
-                message: format!("related info {i} for diagnostic {unique_id}"),
-            });
-        }
-
-        Some(related_info)
-    } else {
-        None
-    };
-
-    lsp::Diagnostic {
-        range,
-        severity,
-        message,
-        related_information,
-        data: None,
-        ..Default::default()
-    }
-}
diff --git a/crates/diagnostics/src/items.rs b/crates/diagnostics/src/items.rs
deleted file mode 100644
index b4ca52ea72..0000000000
--- a/crates/diagnostics/src/items.rs
+++ /dev/null
@@ -1,226 +0,0 @@
-use std::time::Duration;
-
-use editor::{Editor, MultiBufferOffset};
-use gpui::{
-    Context, Entity, EventEmitter, IntoElement, ParentElement, Render, Styled, Subscription, Task,
-    WeakEntity, Window,
-};
-use language::Diagnostic;
-use project::project_settings::{GoToDiagnosticSeverityFilter, ProjectSettings};
-use settings::Settings;
-use ui::{Button, ButtonLike, Color, Icon, IconName, Label, Tooltip, h_flex, prelude::*};
-use util::ResultExt;
-use workspace::{StatusItemView, ToolbarItemEvent, Workspace, item::ItemHandle};
-
-use crate::{Deploy, IncludeWarnings, ProjectDiagnosticsEditor};
-
-/// The status bar item that displays diagnostic counts.
-pub struct DiagnosticIndicator {
-    summary: project::DiagnosticSummary,
-    workspace: WeakEntity<Workspace>,
-    current_diagnostic: Option<Diagnostic>,
-    active_editor: Option<WeakEntity<Editor>>,
-    _observe_active_editor: Option<Subscription>,
-
-    diagnostics_update: Task<()>,
-    diagnostic_summary_update: Task<()>,
-}
-
-impl Render for DiagnosticIndicator {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let indicator = h_flex().gap_2();
-        if !ProjectSettings::get_global(cx).diagnostics.button {
-            return indicator.hidden();
-        }
-
-        let diagnostic_indicator = match (self.summary.error_count, self.summary.warning_count) {
-            (0, 0) => h_flex().child(
-                Icon::new(IconName::Check)
-                    .size(IconSize::Small)
-                    .color(Color::Default),
-            ),
-            (error_count, warning_count) => h_flex()
-                .gap_1()
-                .when(error_count > 0, |this| {
-                    this.child(
-                        Icon::new(IconName::XCircle)
-                            .size(IconSize::Small)
-                            .color(Color::Error),
-                    )
-                    .child(Label::new(error_count.to_string()).size(LabelSize::Small))
-                })
-                .when(warning_count > 0, |this| {
-                    this.child(
-                        Icon::new(IconName::Warning)
-                            .size(IconSize::Small)
-                            .color(Color::Warning),
-                    )
-                    .child(Label::new(warning_count.to_string()).size(LabelSize::Small))
-                }),
-        };
-
-        let status = if let Some(diagnostic) = &self.current_diagnostic {
-            let message = diagnostic
-                .message
-                .split_once('\n')
-                .map_or(&*diagnostic.message, |(first, _)| first);
-            Some(
-                Button::new("diagnostic_message", SharedString::new(message))
-                    .label_size(LabelSize::Small)
-                    .tooltip(|_window, cx| {
-                        Tooltip::for_action(
-                            "Next Diagnostic",
-                            &editor::actions::GoToDiagnostic::default(),
-                            cx,
-                        )
-                    })
-                    .on_click(
-                        cx.listener(|this, _, window, cx| this.go_to_next_diagnostic(window, cx)),
-                    ),
-            )
-        } else {
-            None
-        };
-
-        indicator
-            .child(
-                ButtonLike::new("diagnostic-indicator")
-                    .child(diagnostic_indicator)
-                    .tooltip(move |_window, cx| {
-                        Tooltip::for_action("Project Diagnostics", &Deploy, cx)
-                    })
-                    .on_click(cx.listener(|this, _, window, cx| {
-                        if let Some(workspace) = this.workspace.upgrade() {
-                            if this.summary.error_count == 0 && this.summary.warning_count > 0 {
-                                cx.update_default_global(
-                                    |show_warnings: &mut IncludeWarnings, _| show_warnings.0 = true,
-                                );
-                            }
-                            workspace.update(cx, |workspace, cx| {
-                                ProjectDiagnosticsEditor::deploy(
-                                    workspace,
-                                    &Default::default(),
-                                    window,
-                                    cx,
-                                )
-                            })
-                        }
-                    })),
-            )
-            .children(status)
-    }
-}
-
-impl DiagnosticIndicator {
-    pub fn new(workspace: &Workspace, cx: &mut Context<Self>) -> Self {
-        let project = workspace.project();
-        cx.subscribe(project, |this, project, event, cx| match event {
-            project::Event::DiskBasedDiagnosticsStarted { .. } => {
-                cx.notify();
-            }
-
-            project::Event::DiskBasedDiagnosticsFinished { .. }
-            | project::Event::LanguageServerRemoved(_) => {
-                this.summary = project.read(cx).diagnostic_summary(false, cx);
-                cx.notify();
-            }
-
-            project::Event::DiagnosticsUpdated { .. } => {
-                this.diagnostic_summary_update = cx.spawn(async move |this, cx| {
-                    cx.background_executor()
-                        .timer(Duration::from_millis(30))
-                        .await;
-                    this.update(cx, |this, cx| {
-                        this.summary = project.read(cx).diagnostic_summary(false, cx);
-                        cx.notify();
-                    })
-                    .log_err();
-                });
-            }
-
-            _ => {}
-        })
-        .detach();
-
-        Self {
-            summary: project.read(cx).diagnostic_summary(false, cx),
-            active_editor: None,
-            workspace: workspace.weak_handle(),
-            current_diagnostic: None,
-            _observe_active_editor: None,
-            diagnostics_update: Task::ready(()),
-            diagnostic_summary_update: Task::ready(()),
-        }
-    }
-
-    fn go_to_next_diagnostic(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(editor) = self.active_editor.as_ref().and_then(|e| e.upgrade()) {
-            editor.update(cx, |editor, cx| {
-                editor.go_to_diagnostic_impl(
-                    editor::Direction::Next,
-                    GoToDiagnosticSeverityFilter::default(),
-                    window,
-                    cx,
-                );
-            })
-        }
-    }
-
-    fn update(&mut self, editor: Entity<Editor>, window: &mut Window, cx: &mut Context<Self>) {
-        let (buffer, cursor_position) = editor.update(cx, |editor, cx| {
-            let buffer = editor.buffer().read(cx).snapshot(cx);
-            let cursor_position = editor
-                .selections
-                .newest::<MultiBufferOffset>(&editor.display_snapshot(cx))
-                .head();
-            (buffer, cursor_position)
-        });
-        let new_diagnostic = buffer
-            .diagnostics_in_range::<MultiBufferOffset>(cursor_position..cursor_position)
-            .filter(|entry| !entry.range.is_empty())
-            .min_by_key(|entry| {
-                (
-                    entry.diagnostic.severity,
-                    entry.range.end - entry.range.start,
-                )
-            })
-            .map(|entry| entry.diagnostic);
-        if new_diagnostic != self.current_diagnostic.as_ref() {
-            let new_diagnostic = new_diagnostic.cloned();
-            self.diagnostics_update =
-                cx.spawn_in(window, async move |diagnostics_indicator, cx| {
-                    cx.background_executor()
-                        .timer(Duration::from_millis(50))
-                        .await;
-                    diagnostics_indicator
-                        .update(cx, |diagnostics_indicator, cx| {
-                            diagnostics_indicator.current_diagnostic = new_diagnostic;
-                            cx.notify();
-                        })
-                        .ok();
-                });
-        }
-    }
-}
-
-impl EventEmitter<ToolbarItemEvent> for DiagnosticIndicator {}
-
-impl StatusItemView for DiagnosticIndicator {
-    fn set_active_pane_item(
-        &mut self,
-        active_pane_item: Option<&dyn ItemHandle>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(editor) = active_pane_item.and_then(|item| item.downcast::<Editor>()) {
-            self.active_editor = Some(editor.downgrade());
-            self._observe_active_editor = Some(cx.observe_in(&editor, window, Self::update));
-            self.update(editor, window, cx);
-        } else {
-            self.active_editor = None;
-            self.current_diagnostic = None;
-            self._observe_active_editor = None;
-        }
-        cx.notify();
-    }
-}
diff --git a/crates/diagnostics/src/toolbar_controls.rs b/crates/diagnostics/src/toolbar_controls.rs
deleted file mode 100644
index 2ba64d39df..0000000000
--- a/crates/diagnostics/src/toolbar_controls.rs
+++ /dev/null
@@ -1,151 +0,0 @@
-use crate::{BufferDiagnosticsEditor, ProjectDiagnosticsEditor, ToggleDiagnosticsRefresh};
-use gpui::{Context, EventEmitter, ParentElement, Render, Window};
-use language::DiagnosticEntry;
-use text::{Anchor, BufferId};
-use ui::prelude::*;
-use ui::{IconButton, IconButtonShape, IconName, Tooltip};
-use workspace::{ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView, item::ItemHandle};
-
-pub struct ToolbarControls {
-    editor: Option<Box<dyn DiagnosticsToolbarEditor>>,
-}
-
-pub(crate) trait DiagnosticsToolbarEditor: Send + Sync {
-    /// Informs the toolbar whether warnings are included in the diagnostics.
-    fn include_warnings(&self, cx: &App) -> bool;
-    /// Toggles whether warning diagnostics should be displayed by the
-    /// diagnostics editor.
-    fn toggle_warnings(&self, window: &mut Window, cx: &mut App);
-    /// Indicates whether the diagnostics editor is currently updating the
-    /// diagnostics.
-    fn is_updating(&self, cx: &App) -> bool;
-    /// Requests that the diagnostics editor stop updating the diagnostics.
-    fn stop_updating(&self, cx: &mut App);
-    /// Requests that the diagnostics editor updates the displayed diagnostics
-    /// with the latest information.
-    fn refresh_diagnostics(&self, window: &mut Window, cx: &mut App);
-    /// Returns a list of diagnostics for the provided buffer id.
-    fn get_diagnostics_for_buffer(
-        &self,
-        buffer_id: BufferId,
-        cx: &App,
-    ) -> Vec<DiagnosticEntry<Anchor>>;
-}
-
-impl Render for ToolbarControls {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let mut include_warnings = false;
-        let mut is_updating = false;
-
-        match &self.editor {
-            Some(editor) => {
-                include_warnings = editor.include_warnings(cx);
-                is_updating = editor.is_updating(cx);
-            }
-            None => {}
-        }
-
-        let warning_tooltip = if include_warnings {
-            "Exclude Warnings"
-        } else {
-            "Include Warnings"
-        };
-
-        let warning_color = if include_warnings {
-            Color::Warning
-        } else {
-            Color::Muted
-        };
-
-        h_flex()
-            .gap_1()
-            .map(|div| {
-                if is_updating {
-                    div.child(
-                        IconButton::new("stop-updating", IconName::Stop)
-                            .icon_color(Color::Info)
-                            .shape(IconButtonShape::Square)
-                            .tooltip(Tooltip::for_action_title(
-                                "Stop diagnostics update",
-                                &ToggleDiagnosticsRefresh,
-                            ))
-                            .on_click(cx.listener(move |toolbar_controls, _, _, cx| {
-                                if let Some(editor) = toolbar_controls.editor() {
-                                    editor.stop_updating(cx);
-                                    cx.notify();
-                                }
-                            })),
-                    )
-                } else {
-                    div.child(
-                        IconButton::new("refresh-diagnostics", IconName::ArrowCircle)
-                            .icon_color(Color::Info)
-                            .shape(IconButtonShape::Square)
-                            .tooltip(Tooltip::for_action_title(
-                                "Refresh diagnostics",
-                                &ToggleDiagnosticsRefresh,
-                            ))
-                            .on_click(cx.listener({
-                                move |toolbar_controls, _, window, cx| {
-                                    if let Some(editor) = toolbar_controls.editor() {
-                                        editor.refresh_diagnostics(window, cx)
-                                    }
-                                }
-                            })),
-                    )
-                }
-            })
-            .child(
-                IconButton::new("toggle-warnings", IconName::Warning)
-                    .icon_color(warning_color)
-                    .shape(IconButtonShape::Square)
-                    .tooltip(Tooltip::text(warning_tooltip))
-                    .on_click(cx.listener(|this, _, window, cx| {
-                        if let Some(editor) = &this.editor {
-                            editor.toggle_warnings(window, cx)
-                        }
-                    })),
-            )
-    }
-}
-
-impl EventEmitter<ToolbarItemEvent> for ToolbarControls {}
-
-impl ToolbarItemView for ToolbarControls {
-    fn set_active_pane_item(
-        &mut self,
-        active_pane_item: Option<&dyn ItemHandle>,
-        _window: &mut Window,
-        _: &mut Context<Self>,
-    ) -> ToolbarItemLocation {
-        if let Some(pane_item) = active_pane_item.as_ref() {
-            if let Some(editor) = pane_item.downcast::<ProjectDiagnosticsEditor>() {
-                self.editor = Some(Box::new(editor.downgrade()));
-                ToolbarItemLocation::PrimaryRight
-            } else if let Some(editor) = pane_item.downcast::<BufferDiagnosticsEditor>() {
-                self.editor = Some(Box::new(editor.downgrade()));
-                ToolbarItemLocation::PrimaryRight
-            } else {
-                ToolbarItemLocation::Hidden
-            }
-        } else {
-            ToolbarItemLocation::Hidden
-        }
-    }
-}
-
-impl Default for ToolbarControls {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl ToolbarControls {
-    pub fn new() -> Self {
-        ToolbarControls { editor: None }
-    }
-
-    fn editor(&self) -> Option<&dyn DiagnosticsToolbarEditor> {
-        self.editor.as_deref()
-    }
-}
diff --git a/crates/docs_preprocessor/Cargo.toml b/crates/docs_preprocessor/Cargo.toml
deleted file mode 100644
index e71f9ae3f3..0000000000
--- a/crates/docs_preprocessor/Cargo.toml
+++ /dev/null
@@ -1,30 +0,0 @@
-[package]
-name = "docs_preprocessor"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[dependencies]
-anyhow.workspace = true
-command_palette.workspace = true
-gpui.workspace = true
-# We are specifically pinning this version of mdbook, as later versions introduce issues with double-nested subdirectories.
-# Ask @maxdeviant about this before bumping.
-mdbook = "= 0.4.40"
-regex.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-util.workspace = true
-zed.workspace = true
-zlog.workspace = true
-task.workspace = true
-theme.workspace = true
-
-[lints]
-workspace = true
-
-[[bin]]
-name = "docs_preprocessor"
-path = "src/main.rs"
diff --git a/crates/docs_preprocessor/LICENSE-GPL b/crates/docs_preprocessor/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/docs_preprocessor/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/docs_preprocessor/src/main.rs b/crates/docs_preprocessor/src/main.rs
deleted file mode 100644
index b614a82511..0000000000
--- a/crates/docs_preprocessor/src/main.rs
+++ /dev/null
@@ -1,694 +0,0 @@
-use anyhow::{Context, Result};
-use mdbook::BookItem;
-use mdbook::book::{Book, Chapter};
-use mdbook::preprocess::CmdPreprocessor;
-use regex::Regex;
-use settings::KeymapFile;
-use std::borrow::Cow;
-use std::collections::{HashMap, HashSet};
-use std::io::{self, Read};
-use std::process;
-use std::sync::{LazyLock, OnceLock};
-
-static KEYMAP_MACOS: LazyLock<KeymapFile> = LazyLock::new(|| {
-    load_keymap("keymaps/default-macos.json").expect("Failed to load MacOS keymap")
-});
-
-static KEYMAP_LINUX: LazyLock<KeymapFile> = LazyLock::new(|| {
-    load_keymap("keymaps/default-linux.json").expect("Failed to load Linux keymap")
-});
-
-static KEYMAP_WINDOWS: LazyLock<KeymapFile> = LazyLock::new(|| {
-    load_keymap("keymaps/default-windows.json").expect("Failed to load Windows keymap")
-});
-
-static ALL_ACTIONS: LazyLock<Vec<ActionDef>> = LazyLock::new(dump_all_gpui_actions);
-
-const FRONT_MATTER_COMMENT: &str = "<!-- ZED_META {} -->";
-
-fn main() -> Result<()> {
-    zlog::init();
-    zlog::init_output_stderr();
-    // call a zed:: function so everything in `zed` crate is linked and
-    // all actions in the actual app are registered
-    zed::stdout_is_a_pty();
-    let args = std::env::args().skip(1).collect::<Vec<_>>();
-
-    match args.get(0).map(String::as_str) {
-        Some("supports") => {
-            let renderer = args.get(1).expect("Required argument");
-            let supported = renderer != "not-supported";
-            if supported {
-                process::exit(0);
-            } else {
-                process::exit(1);
-            }
-        }
-        Some("postprocess") => handle_postprocessing()?,
-        _ => handle_preprocessing()?,
-    }
-
-    Ok(())
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-enum PreprocessorError {
-    ActionNotFound {
-        action_name: String,
-    },
-    DeprecatedActionUsed {
-        used: String,
-        should_be: String,
-    },
-    InvalidFrontmatterLine(String),
-    InvalidSettingsJson {
-        file: std::path::PathBuf,
-        line: usize,
-        snippet: String,
-        error: String,
-    },
-}
-
-impl PreprocessorError {
-    fn new_for_not_found_action(action_name: String) -> Self {
-        for action in &*ALL_ACTIONS {
-            for alias in action.deprecated_aliases {
-                if alias == &action_name {
-                    return PreprocessorError::DeprecatedActionUsed {
-                        used: action_name,
-                        should_be: action.name.to_string(),
-                    };
-                }
-            }
-        }
-        PreprocessorError::ActionNotFound { action_name }
-    }
-
-    fn new_for_invalid_settings_json(
-        chapter: &Chapter,
-        location: usize,
-        snippet: String,
-        error: String,
-    ) -> Self {
-        PreprocessorError::InvalidSettingsJson {
-            file: chapter.path.clone().expect("chapter has path"),
-            line: chapter.content[..location].lines().count() + 1,
-            snippet,
-            error,
-        }
-    }
-}
-
-impl std::fmt::Display for PreprocessorError {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            PreprocessorError::InvalidFrontmatterLine(line) => {
-                write!(f, "Invalid frontmatter line: {}", line)
-            }
-            PreprocessorError::ActionNotFound { action_name } => {
-                write!(f, "Action not found: {}", action_name)
-            }
-            PreprocessorError::DeprecatedActionUsed { used, should_be } => write!(
-                f,
-                "Deprecated action used: {} should be {}",
-                used, should_be
-            ),
-            PreprocessorError::InvalidSettingsJson {
-                file,
-                line,
-                snippet,
-                error,
-            } => {
-                write!(
-                    f,
-                    "Invalid settings JSON at {}:{}\nError: {}\n\n{}",
-                    file.display(),
-                    line,
-                    error,
-                    snippet
-                )
-            }
-        }
-    }
-}
-
-fn handle_preprocessing() -> Result<()> {
-    let mut stdin = io::stdin();
-    let mut input = String::new();
-    stdin.read_to_string(&mut input)?;
-
-    let (_ctx, mut book) = CmdPreprocessor::parse_input(input.as_bytes())?;
-
-    let mut errors = HashSet::<PreprocessorError>::new();
-    handle_frontmatter(&mut book, &mut errors);
-    template_big_table_of_actions(&mut book);
-    template_and_validate_keybindings(&mut book, &mut errors);
-    template_and_validate_actions(&mut book, &mut errors);
-    template_and_validate_json_snippets(&mut book, &mut errors);
-
-    if !errors.is_empty() {
-        const ANSI_RED: &str = "\x1b[31m";
-        const ANSI_RESET: &str = "\x1b[0m";
-        for error in &errors {
-            eprintln!("{ANSI_RED}ERROR{ANSI_RESET}: {}", error);
-        }
-        return Err(anyhow::anyhow!("Found {} errors in docs", errors.len()));
-    }
-
-    serde_json::to_writer(io::stdout(), &book)?;
-
-    Ok(())
-}
-
-fn handle_frontmatter(book: &mut Book, errors: &mut HashSet<PreprocessorError>) {
-    let frontmatter_regex = Regex::new(r"(?s)^\s*---(.*?)---").unwrap();
-    for_each_chapter_mut(book, |chapter| {
-        let new_content = frontmatter_regex.replace(&chapter.content, |caps: &regex::Captures| {
-            let frontmatter = caps[1].trim();
-            let frontmatter = frontmatter.trim_matches(&[' ', '-', '\n']);
-            let mut metadata = HashMap::<String, String>::default();
-            for line in frontmatter.lines() {
-                let Some((name, value)) = line.split_once(':') else {
-                    errors.insert(PreprocessorError::InvalidFrontmatterLine(format!(
-                        "{}: {}",
-                        chapter_breadcrumbs(chapter),
-                        line
-                    )));
-                    continue;
-                };
-                let name = name.trim();
-                let value = value.trim();
-                metadata.insert(name.to_string(), value.to_string());
-            }
-            FRONT_MATTER_COMMENT.replace(
-                "{}",
-                &serde_json::to_string(&metadata).expect("Failed to serialize metadata"),
-            )
-        });
-        if let Cow::Owned(content) = new_content {
-            chapter.content = content;
-        }
-    });
-}
-
-fn template_big_table_of_actions(book: &mut Book) {
-    for_each_chapter_mut(book, |chapter| {
-        let needle = "{#ACTIONS_TABLE#}";
-        if let Some(start) = chapter.content.rfind(needle) {
-            chapter.content.replace_range(
-                start..start + needle.len(),
-                &generate_big_table_of_actions(),
-            );
-        }
-    });
-}
-
-fn format_binding(binding: String) -> String {
-    binding.replace("\\", "\\\\")
-}
-
-fn template_and_validate_keybindings(book: &mut Book, errors: &mut HashSet<PreprocessorError>) {
-    let regex = Regex::new(r"\{#kb (.*?)\}").unwrap();
-
-    for_each_chapter_mut(book, |chapter| {
-        chapter.content = regex
-            .replace_all(&chapter.content, |caps: &regex::Captures| {
-                let action = caps[1].trim();
-                if find_action_by_name(action).is_none() {
-                    errors.insert(PreprocessorError::new_for_not_found_action(
-                        action.to_string(),
-                    ));
-                    return String::new();
-                }
-                let macos_binding = find_binding("macos", action).unwrap_or_default();
-                let linux_binding = find_binding("linux", action).unwrap_or_default();
-
-                if macos_binding.is_empty() && linux_binding.is_empty() {
-                    return "<div>No default binding</div>".to_string();
-                }
-
-                let formatted_macos_binding = format_binding(macos_binding);
-                let formatted_linux_binding = format_binding(linux_binding);
-
-                format!("<kbd class=\"keybinding\">{formatted_macos_binding}|{formatted_linux_binding}</kbd>")
-            })
-            .into_owned()
-    });
-}
-
-fn template_and_validate_actions(book: &mut Book, errors: &mut HashSet<PreprocessorError>) {
-    let regex = Regex::new(r"\{#action (.*?)\}").unwrap();
-
-    for_each_chapter_mut(book, |chapter| {
-        chapter.content = regex
-            .replace_all(&chapter.content, |caps: &regex::Captures| {
-                let name = caps[1].trim();
-                let Some(action) = find_action_by_name(name) else {
-                    errors.insert(PreprocessorError::new_for_not_found_action(
-                        name.to_string(),
-                    ));
-                    return String::new();
-                };
-                format!("<code class=\"hljs\">{}</code>", &action.human_name)
-            })
-            .into_owned()
-    });
-}
-
-fn find_action_by_name(name: &str) -> Option<&ActionDef> {
-    ALL_ACTIONS
-        .binary_search_by(|action| action.name.cmp(name))
-        .ok()
-        .map(|index| &ALL_ACTIONS[index])
-}
-
-fn find_binding(os: &str, action: &str) -> Option<String> {
-    let keymap = match os {
-        "macos" => &KEYMAP_MACOS,
-        "linux" | "freebsd" => &KEYMAP_LINUX,
-        "windows" => &KEYMAP_WINDOWS,
-        _ => unreachable!("Not a valid OS: {}", os),
-    };
-
-    // Find the binding in reverse order, as the last binding takes precedence.
-    keymap.sections().rev().find_map(|section| {
-        section.bindings().rev().find_map(|(keystroke, a)| {
-            if name_for_action(a.to_string()) == action {
-                Some(keystroke.to_string())
-            } else {
-                None
-            }
-        })
-    })
-}
-
-fn template_and_validate_json_snippets(book: &mut Book, errors: &mut HashSet<PreprocessorError>) {
-    fn for_each_labeled_code_block_mut(
-        book: &mut Book,
-        errors: &mut HashSet<PreprocessorError>,
-        f: impl Fn(&str, &str) -> anyhow::Result<()>,
-    ) {
-        const TAGGED_JSON_BLOCK_START: &'static str = "```json [";
-        const JSON_BLOCK_END: &'static str = "```";
-
-        for_each_chapter_mut(book, |chapter| {
-            let mut offset = 0;
-            while let Some(loc) = chapter.content[offset..].find(TAGGED_JSON_BLOCK_START) {
-                let loc = loc + offset;
-                let tag_start = loc + TAGGED_JSON_BLOCK_START.len();
-                offset = tag_start;
-                let Some(tag_end) = chapter.content[tag_start..].find(']') else {
-                    errors.insert(PreprocessorError::new_for_invalid_settings_json(
-                        chapter,
-                        loc,
-                        chapter.content[loc..tag_start].to_string(),
-                        "Unclosed JSON block tag".to_string(),
-                    ));
-                    continue;
-                };
-                let tag_end = tag_end + tag_start;
-
-                let tag = &chapter.content[tag_start..tag_end];
-
-                if tag.contains('\n') {
-                    errors.insert(PreprocessorError::new_for_invalid_settings_json(
-                        chapter,
-                        loc,
-                        chapter.content[loc..tag_start].to_string(),
-                        "Unclosed JSON block tag".to_string(),
-                    ));
-                    continue;
-                }
-
-                let snippet_start = tag_end + 1;
-                offset = snippet_start;
-
-                let Some(snippet_end) = chapter.content[snippet_start..].find(JSON_BLOCK_END)
-                else {
-                    errors.insert(PreprocessorError::new_for_invalid_settings_json(
-                        chapter,
-                        loc,
-                        chapter.content[loc..tag_end + 1].to_string(),
-                        "Missing closing code block".to_string(),
-                    ));
-                    continue;
-                };
-                let snippet_end = snippet_start + snippet_end;
-                let snippet_json = &chapter.content[snippet_start..snippet_end];
-                offset = snippet_end + 3;
-
-                if let Err(err) = f(tag, snippet_json) {
-                    errors.insert(PreprocessorError::new_for_invalid_settings_json(
-                        chapter,
-                        loc,
-                        chapter.content[loc..snippet_end + 3].to_string(),
-                        err.to_string(),
-                    ));
-                    continue;
-                };
-                let tag_range_complete = tag_start - 1..tag_end + 1;
-                offset -= tag_range_complete.len();
-                chapter.content.replace_range(tag_range_complete, "");
-            }
-        });
-    }
-
-    for_each_labeled_code_block_mut(book, errors, |label, snippet_json| {
-        let mut snippet_json_fixed = snippet_json
-            .to_string()
-            .replace("\n>", "\n")
-            .trim()
-            .to_string();
-        while snippet_json_fixed.starts_with("//") {
-            if let Some(line_end) = snippet_json_fixed.find('\n') {
-                snippet_json_fixed.replace_range(0..line_end, "");
-                snippet_json_fixed = snippet_json_fixed.trim().to_string();
-            }
-        }
-        match label {
-            "settings" => {
-                if !snippet_json_fixed.starts_with('{') || !snippet_json_fixed.ends_with('}') {
-                    snippet_json_fixed.insert(0, '{');
-                    snippet_json_fixed.push_str("\n}");
-                }
-                settings::parse_json_with_comments::<settings::SettingsContent>(
-                    &snippet_json_fixed,
-                )?;
-            }
-            "keymap" => {
-                if !snippet_json_fixed.starts_with('[') || !snippet_json_fixed.ends_with(']') {
-                    snippet_json_fixed.insert(0, '[');
-                    snippet_json_fixed.push_str("\n]");
-                }
-
-                let keymap = settings::KeymapFile::parse(&snippet_json_fixed)
-                    .context("Failed to parse keymap JSON")?;
-                for section in keymap.sections() {
-                    for (keystrokes, action) in section.bindings() {
-                        keystrokes
-                            .split_whitespace()
-                            .map(|source| gpui::Keystroke::parse(source))
-                            .collect::<std::result::Result<Vec<_>, _>>()
-                            .context("Failed to parse keystroke")?;
-                        if let Some((action_name, _)) = settings::KeymapFile::parse_action(action)
-                            .map_err(|err| anyhow::format_err!(err))
-                            .context("Failed to parse action")?
-                        {
-                            anyhow::ensure!(
-                                find_action_by_name(action_name).is_some(),
-                                "Action not found: {}",
-                                action_name
-                            );
-                        }
-                    }
-                }
-            }
-            "debug" => {
-                if !snippet_json_fixed.starts_with('[') || !snippet_json_fixed.ends_with(']') {
-                    snippet_json_fixed.insert(0, '[');
-                    snippet_json_fixed.push_str("\n]");
-                }
-
-                settings::parse_json_with_comments::<task::DebugTaskFile>(&snippet_json_fixed)?;
-            }
-            "tasks" => {
-                if !snippet_json_fixed.starts_with('[') || !snippet_json_fixed.ends_with(']') {
-                    snippet_json_fixed.insert(0, '[');
-                    snippet_json_fixed.push_str("\n]");
-                }
-
-                settings::parse_json_with_comments::<task::TaskTemplates>(&snippet_json_fixed)?;
-            }
-            "icon-theme" => {
-                if !snippet_json_fixed.starts_with('{') || !snippet_json_fixed.ends_with('}') {
-                    snippet_json_fixed.insert(0, '{');
-                    snippet_json_fixed.push_str("\n}");
-                }
-
-                settings::parse_json_with_comments::<theme::IconThemeFamilyContent>(
-                    &snippet_json_fixed,
-                )?;
-            }
-            label => {
-                anyhow::bail!("Unexpected JSON code block tag: {}", label)
-            }
-        };
-        Ok(())
-    });
-}
-
-/// Removes any configurable options from the stringified action if existing,
-/// ensuring that only the actual action name is returned. If the action consists
-/// only of a string and nothing else, the string is returned as-is.
-///
-/// Example:
-///
-/// This will return the action name unmodified.
-///
-/// ```
-/// let action_as_str = "assistant::Assist";
-/// let action_name = name_for_action(action_as_str);
-/// assert_eq!(action_name, "assistant::Assist");
-/// ```
-///
-/// This will return the action name with any trailing options removed.
-///
-///
-/// ```
-/// let action_as_str = "\"editor::ToggleComments\", {\"advance_downwards\":false}";
-/// let action_name = name_for_action(action_as_str);
-/// assert_eq!(action_name, "editor::ToggleComments");
-/// ```
-fn name_for_action(action_as_str: String) -> String {
-    action_as_str
-        .split(",")
-        .next()
-        .map(|name| name.trim_matches('"').to_string())
-        .unwrap_or(action_as_str)
-}
-
-fn chapter_breadcrumbs(chapter: &Chapter) -> String {
-    let mut breadcrumbs = Vec::with_capacity(chapter.parent_names.len() + 1);
-    breadcrumbs.extend(chapter.parent_names.iter().map(String::as_str));
-    breadcrumbs.push(chapter.name.as_str());
-    format!("[{:?}] {}", chapter.source_path, breadcrumbs.join(" > "))
-}
-
-fn load_keymap(asset_path: &str) -> Result<KeymapFile> {
-    let content = util::asset_str::<settings::SettingsAssets>(asset_path);
-    KeymapFile::parse(content.as_ref())
-}
-
-fn for_each_chapter_mut<F>(book: &mut Book, mut func: F)
-where
-    F: FnMut(&mut Chapter),
-{
-    book.for_each_mut(|item| {
-        let BookItem::Chapter(chapter) = item else {
-            return;
-        };
-        func(chapter);
-    });
-}
-
-#[derive(Debug, serde::Serialize)]
-struct ActionDef {
-    name: &'static str,
-    human_name: String,
-    deprecated_aliases: &'static [&'static str],
-    docs: Option<&'static str>,
-}
-
-fn dump_all_gpui_actions() -> Vec<ActionDef> {
-    let mut actions = gpui::generate_list_of_all_registered_actions()
-        .map(|action| ActionDef {
-            name: action.name,
-            human_name: command_palette::humanize_action_name(action.name),
-            deprecated_aliases: action.deprecated_aliases,
-            docs: action.documentation,
-        })
-        .collect::<Vec<ActionDef>>();
-
-    actions.sort_by_key(|a| a.name);
-
-    actions
-}
-
-fn handle_postprocessing() -> Result<()> {
-    let logger = zlog::scoped!("render");
-    let mut ctx = mdbook::renderer::RenderContext::from_json(io::stdin())?;
-    let output = ctx
-        .config
-        .get_mut("output")
-        .expect("has output")
-        .as_table_mut()
-        .expect("output is table");
-    let zed_html = output.remove("zed-html").expect("zed-html output defined");
-    let default_description = zed_html
-        .get("default-description")
-        .expect("Default description not found")
-        .as_str()
-        .expect("Default description not a string")
-        .to_string();
-    let default_title = zed_html
-        .get("default-title")
-        .expect("Default title not found")
-        .as_str()
-        .expect("Default title not a string")
-        .to_string();
-    let amplitude_key = std::env::var("DOCS_AMPLITUDE_API_KEY").unwrap_or_default();
-
-    output.insert("html".to_string(), zed_html);
-    mdbook::Renderer::render(&mdbook::renderer::HtmlHandlebars::new(), &ctx)?;
-    let ignore_list = ["toc.html"];
-
-    let root_dir = ctx.destination.clone();
-    let mut files = Vec::with_capacity(128);
-    let mut queue = Vec::with_capacity(64);
-    queue.push(root_dir.clone());
-    while let Some(dir) = queue.pop() {
-        for entry in std::fs::read_dir(&dir).context("failed to read docs dir")? {
-            let Ok(entry) = entry else {
-                continue;
-            };
-            let file_type = entry.file_type().context("Failed to determine file type")?;
-            if file_type.is_dir() {
-                queue.push(entry.path());
-            }
-            if file_type.is_file()
-                && matches!(
-                    entry.path().extension().and_then(std::ffi::OsStr::to_str),
-                    Some("html")
-                )
-            {
-                if ignore_list.contains(&&*entry.file_name().to_string_lossy()) {
-                    zlog::info!(logger => "Ignoring {}", entry.path().to_string_lossy());
-                } else {
-                    files.push(entry.path());
-                }
-            }
-        }
-    }
-
-    zlog::info!(logger => "Processing {} `.html` files", files.len());
-    let meta_regex = Regex::new(&FRONT_MATTER_COMMENT.replace("{}", "(.*)")).unwrap();
-    for file in files {
-        let contents = std::fs::read_to_string(&file)?;
-        let mut meta_description = None;
-        let mut meta_title = None;
-        let contents = meta_regex.replace(&contents, |caps: &regex::Captures| {
-            let metadata: HashMap<String, String> = serde_json::from_str(&caps[1]).with_context(|| format!("JSON Metadata: {:?}", &caps[1])).expect("Failed to deserialize metadata");
-            for (kind, content) in metadata {
-                match kind.as_str() {
-                    "description" => {
-                        meta_description = Some(content);
-                    }
-                    "title" => {
-                        meta_title = Some(content);
-                    }
-                    _ => {
-                        zlog::warn!(logger => "Unrecognized frontmatter key: {} in {:?}", kind, pretty_path(&file, &root_dir));
-                    }
-                }
-            }
-            String::new()
-        });
-        let meta_description = meta_description.as_ref().unwrap_or_else(|| {
-            zlog::warn!(logger => "No meta description found for {:?}", pretty_path(&file, &root_dir));
-            &default_description
-        });
-        let page_title = extract_title_from_page(&contents, pretty_path(&file, &root_dir));
-        let meta_title = meta_title.as_ref().unwrap_or_else(|| {
-            zlog::debug!(logger => "No meta title found for {:?}", pretty_path(&file, &root_dir));
-            &default_title
-        });
-        let meta_title = format!("{} | {}", page_title, meta_title);
-        zlog::trace!(logger => "Updating {:?}", pretty_path(&file, &root_dir));
-        let contents = contents.replace("#description#", meta_description);
-        let contents = contents.replace("#amplitude_key#", &amplitude_key);
-        let contents = title_regex()
-            .replace(&contents, |_: &regex::Captures| {
-                format!("<title>{}</title>", meta_title)
-            })
-            .to_string();
-        // let contents = contents.replace("#title#", &meta_title);
-        std::fs::write(file, contents)?;
-    }
-    return Ok(());
-
-    fn pretty_path<'a>(
-        path: &'a std::path::PathBuf,
-        root: &'a std::path::PathBuf,
-    ) -> &'a std::path::Path {
-        path.strip_prefix(&root).unwrap_or(path)
-    }
-    fn extract_title_from_page(contents: &str, pretty_path: &std::path::Path) -> String {
-        let title_tag_contents = &title_regex()
-            .captures(contents)
-            .with_context(|| format!("Failed to find title in {:?}", pretty_path))
-            .expect("Page has <title> element")[1];
-
-        title_tag_contents
-            .trim()
-            .strip_suffix("- Zed")
-            .unwrap_or(title_tag_contents)
-            .trim()
-            .to_string()
-    }
-}
-
-fn title_regex() -> &'static Regex {
-    static TITLE_REGEX: OnceLock<Regex> = OnceLock::new();
-    TITLE_REGEX.get_or_init(|| Regex::new(r"<title>\s*(.*?)\s*</title>").unwrap())
-}
-
-fn generate_big_table_of_actions() -> String {
-    let actions = &*ALL_ACTIONS;
-    let mut output = String::new();
-
-    let mut actions_sorted = actions.iter().collect::<Vec<_>>();
-    actions_sorted.sort_by_key(|a| a.name);
-
-    // Start the definition list with custom styling for better spacing
-    output.push_str("<dl style=\"line-height: 1.8;\">\n");
-
-    for action in actions_sorted.into_iter() {
-        // Add the humanized action name as the term with margin
-        output.push_str(
-            "<dt style=\"margin-top: 1.5em; margin-bottom: 0.5em; font-weight: bold;\"><code>",
-        );
-        output.push_str(&action.human_name);
-        output.push_str("</code></dt>\n");
-
-        // Add the definition with keymap name and description
-        output.push_str("<dd style=\"margin-left: 2em; margin-bottom: 1em;\">\n");
-
-        // Add the description, escaping HTML if needed
-        if let Some(description) = action.docs {
-            output.push_str(
-                &description
-                    .replace("&", "&amp;")
-                    .replace("<", "&lt;")
-                    .replace(">", "&gt;"),
-            );
-            output.push_str("<br>\n");
-        }
-        output.push_str("Keymap Name: <code>");
-        output.push_str(action.name);
-        output.push_str("</code><br>\n");
-        if !action.deprecated_aliases.is_empty() {
-            output.push_str("Deprecated Alias(es): ");
-            for alias in action.deprecated_aliases.iter() {
-                output.push_str("<code>");
-                output.push_str(alias);
-                output.push_str("</code>, ");
-            }
-        }
-        output.push_str("\n</dd>\n");
-    }
-
-    // Close the definition list
-    output.push_str("</dl>\n");
-
-    output
-}
diff --git a/crates/edit_prediction/Cargo.toml b/crates/edit_prediction/Cargo.toml
deleted file mode 100644
index 53ddb99bd3..0000000000
--- a/crates/edit_prediction/Cargo.toml
+++ /dev/null
@@ -1,77 +0,0 @@
-[package]
-name = "edit_prediction"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/edit_prediction.rs"
-
-[features]
-cli-support = []
-
-[dependencies]
-ai_onboarding.workspace = true
-anyhow.workspace = true
-arrayvec.workspace = true
-brotli.workspace = true
-client.workspace = true
-cloud_llm_client.workspace = true
-collections.workspace = true
-copilot.workspace = true
-credentials_provider.workspace = true
-db.workspace = true
-edit_prediction_types.workspace = true
-edit_prediction_context.workspace = true
-feature_flags.workspace = true
-fs.workspace = true
-futures.workspace = true
-gpui.workspace = true
-indoc.workspace = true
-itertools.workspace = true
-language.workspace = true
-language_model.workspace = true
-log.workspace = true
-lsp.workspace = true
-menu.workspace = true
-open_ai.workspace = true
-postage.workspace = true
-pretty_assertions.workspace = true
-project.workspace = true
-rand.workspace = true
-regex.workspace = true
-release_channel.workspace = true
-semver.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-strum.workspace = true
-telemetry.workspace = true
-telemetry_events.workspace = true
-thiserror.workspace = true
-ui.workspace = true
-util.workspace = true
-uuid.workspace = true
-workspace.workspace = true
-worktree.workspace = true
-zed_actions.workspace = true
-zeta_prompt.workspace = true
-
-[dev-dependencies]
-clock = { workspace = true, features = ["test-support"] }
-cloud_api_types.workspace = true
-cloud_llm_client = { workspace = true, features = ["test-support"] }
-ctor.workspace = true
-gpui = { workspace = true, features = ["test-support"] }
-indoc.workspace = true
-language = { workspace = true, features = ["test-support"] }
-language_model = { workspace = true, features = ["test-support"] }
-lsp.workspace = true
-parking_lot.workspace = true
-project = { workspace = true, features = ["test-support"] }
-settings = { workspace = true, features = ["test-support"] }
-zlog.workspace = true
diff --git a/crates/edit_prediction/LICENSE-GPL b/crates/edit_prediction/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/edit_prediction/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/edit_prediction/license_examples/0bsd.txt b/crates/edit_prediction/license_examples/0bsd.txt
deleted file mode 100644
index d3061a372f..0000000000
--- a/crates/edit_prediction/license_examples/0bsd.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Zero-Clause BSD
-=============
-
-Permission to use, copy, modify, and/or distribute this software for
-any purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED “AS IS” AND THE AUTHOR DISCLAIMS ALL
-WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE
-FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY
-DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/crates/edit_prediction/license_examples/apache-2.0-ex0.txt b/crates/edit_prediction/license_examples/apache-2.0-ex0.txt
deleted file mode 100644
index dd5b3a58aa..0000000000
--- a/crates/edit_prediction/license_examples/apache-2.0-ex0.txt
+++ /dev/null
@@ -1,174 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
diff --git a/crates/edit_prediction/license_examples/apache-2.0-ex1.txt b/crates/edit_prediction/license_examples/apache-2.0-ex1.txt
deleted file mode 100644
index 2df8c87fda..0000000000
--- a/crates/edit_prediction/license_examples/apache-2.0-ex1.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-Apache License
-
-Version 2.0, January 2004
-
-http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
-
-"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
-
-"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-
-"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
-
-"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
-
-"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
-
-"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
-
-"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
-
-"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
-
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
-
-You must give any other recipients of the Work or Derivative Works a copy of this License; and
-
-You must cause any modified files to carry prominent notices stating that You changed the files; and
-
-You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
-
-If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
diff --git a/crates/edit_prediction/license_examples/apache-2.0-ex2.txt b/crates/edit_prediction/license_examples/apache-2.0-ex2.txt
deleted file mode 100644
index 016b1bc2e6..0000000000
--- a/crates/edit_prediction/license_examples/apache-2.0-ex2.txt
+++ /dev/null
@@ -1,189 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/crates/edit_prediction/license_examples/apache-2.0-ex3.txt b/crates/edit_prediction/license_examples/apache-2.0-ex3.txt
deleted file mode 100644
index 243448ceb5..0000000000
--- a/crates/edit_prediction/license_examples/apache-2.0-ex3.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Copyright 2011 Someone
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   https://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/crates/edit_prediction/license_examples/apache-2.0-ex4.txt b/crates/edit_prediction/license_examples/apache-2.0-ex4.txt
deleted file mode 100644
index 8c004949ee..0000000000
--- a/crates/edit_prediction/license_examples/apache-2.0-ex4.txt
+++ /dev/null
@@ -1,187 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   Copyright (c) 2017, The Android Open Source Project
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/crates/edit_prediction/license_examples/bsd-1-clause.txt b/crates/edit_prediction/license_examples/bsd-1-clause.txt
deleted file mode 100644
index 1ae6f9d5ff..0000000000
--- a/crates/edit_prediction/license_examples/bsd-1-clause.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2024 John Doe
-Some Organization
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this list
-of conditions and the following disclaimer.
-
-THIS SOFTWARE IS PROVIDED BY [Name of Organization] “AS IS” AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
-SHALL [Name of Organisation] BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
-OF SUCH DAMAGE.
diff --git a/crates/edit_prediction/license_examples/bsd-2-clause-ex0.txt b/crates/edit_prediction/license_examples/bsd-2-clause-ex0.txt
deleted file mode 100644
index bbf946465e..0000000000
--- a/crates/edit_prediction/license_examples/bsd-2-clause-ex0.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-Copyright (c) 2024
-
-John Doe (john.doe@gmail.com)
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation and/or
-other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/crates/edit_prediction/license_examples/bsd-3-clause-ex0.txt b/crates/edit_prediction/license_examples/bsd-3-clause-ex0.txt
deleted file mode 100644
index 0edcde7462..0000000000
--- a/crates/edit_prediction/license_examples/bsd-3-clause-ex0.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-BSD 3-Clause License
-
-Copyright (c) 2025, John Doe
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation and/or
-other materials provided with the distribution.
-
-* Neither the name of the copyright holder nor the names of its contributors
-may be used to endorse or promote products derived from this software without
-specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/crates/edit_prediction/license_examples/bsd-3-clause-ex1.txt b/crates/edit_prediction/license_examples/bsd-3-clause-ex1.txt
deleted file mode 100644
index d460f67375..0000000000
--- a/crates/edit_prediction/license_examples/bsd-3-clause-ex1.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2024 (this is copy modified from chromium)
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of da company nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/crates/edit_prediction/license_examples/bsd-3-clause-ex2.txt b/crates/edit_prediction/license_examples/bsd-3-clause-ex2.txt
deleted file mode 100644
index 99fa52679d..0000000000
--- a/crates/edit_prediction/license_examples/bsd-3-clause-ex2.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-The Glasgow Haskell Compiler License
-
-Copyright 2002, The University Court of the University of Glasgow.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-
-- Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
-
-- Neither name of the University nor the names of its contributors may be
-used to endorse or promote products derived from this software without
-specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY COURT OF THE UNIVERSITY OF
-GLASGOW AND THE CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-UNIVERSITY COURT OF THE UNIVERSITY OF GLASGOW OR THE CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
diff --git a/crates/edit_prediction/license_examples/bsd-3-clause-ex3.txt b/crates/edit_prediction/license_examples/bsd-3-clause-ex3.txt
deleted file mode 100644
index 68a181b5a7..0000000000
--- a/crates/edit_prediction/license_examples/bsd-3-clause-ex3.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-Copyright (c) 2019 Someone
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-
-    * Neither the name of Someone nor the names of other
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/crates/edit_prediction/license_examples/bsd-3-clause-ex4.txt b/crates/edit_prediction/license_examples/bsd-3-clause-ex4.txt
deleted file mode 100644
index 259c59ff90..0000000000
--- a/crates/edit_prediction/license_examples/bsd-3-clause-ex4.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2009-2011, Mozilla Foundation and contributors
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the names of the Mozilla Foundation nor the names of project
-  contributors may be used to endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/crates/edit_prediction/license_examples/isc.txt b/crates/edit_prediction/license_examples/isc.txt
deleted file mode 100644
index 97fda7f975..0000000000
--- a/crates/edit_prediction/license_examples/isc.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-ISC License
-
-Copyright (c) 2024, John Doe
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/crates/edit_prediction/license_examples/mit-ex0.txt b/crates/edit_prediction/license_examples/mit-ex0.txt
deleted file mode 100644
index 2b8f73ab0d..0000000000
--- a/crates/edit_prediction/license_examples/mit-ex0.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2024 John Doe
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/crates/edit_prediction/license_examples/mit-ex1.txt b/crates/edit_prediction/license_examples/mit-ex1.txt
deleted file mode 100644
index d3642458dc..0000000000
--- a/crates/edit_prediction/license_examples/mit-ex1.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-Copyright (c) 2006-2009 Someone
-Copyright (c) 2009-2013 Some organization
-
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff --git a/crates/edit_prediction/license_examples/mit-ex2.txt b/crates/edit_prediction/license_examples/mit-ex2.txt
deleted file mode 100644
index 31ec7bf0e8..0000000000
--- a/crates/edit_prediction/license_examples/mit-ex2.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-(The MIT License)
-
-Copyright (c) someone
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/crates/edit_prediction/license_examples/mit-ex3.txt b/crates/edit_prediction/license_examples/mit-ex3.txt
deleted file mode 100644
index ed5c991402..0000000000
--- a/crates/edit_prediction/license_examples/mit-ex3.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-    MIT License
-
-    Copyright (c) Someone.
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in all
-    copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-    SOFTWARE
diff --git a/crates/edit_prediction/license_examples/upl-1.0.txt b/crates/edit_prediction/license_examples/upl-1.0.txt
deleted file mode 100644
index 6193e80270..0000000000
--- a/crates/edit_prediction/license_examples/upl-1.0.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-Copyright (c) 2025, John Doe
-
-The Universal Permissive License (UPL), Version 1.0
-
-Subject to the condition set forth below, permission is hereby granted to any person
-obtaining a copy of this software, associated documentation and/or data (collectively
-the "Software"), free of charge and under any and all copyright rights in the
-Software, and any and all patent rights owned or freely licensable by each licensor
-hereunder covering either (i) the unmodified Software as contributed to or provided
-by such licensor, or (ii) the Larger Works (as defined below), to deal in both
-
-(a) the Software, and
-
-(b) any piece of software and/or hardware listed in the lrgrwrks.txt file if one is
-    included with the Software (each a "Larger Work" to which the Software is
-    contributed by such licensors),
-
-without restriction, including without limitation the rights to copy, create
-derivative works of, display, perform, and distribute the Software and make, use,
-sell, offer for sale, import, export, have made, and have sold the Software and the
-Larger Work(s), and to sublicense the foregoing rights on either these or other
-terms.
-
-This license is subject to the following condition:
-
-The above copyright notice and either this complete permission notice or at a minimum
-a reference to the UPL must be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
-OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/crates/edit_prediction/license_examples/zlib-ex0.txt b/crates/edit_prediction/license_examples/zlib-ex0.txt
deleted file mode 100644
index 84a3048c69..0000000000
--- a/crates/edit_prediction/license_examples/zlib-ex0.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2021 Someone
-
-This software is provided 'as-is', without any express or implied warranty. In
-no event will the authors be held liable for any damages arising from the use of
-this software.
-
-Permission is granted to anyone to use this software for any purpose, including
-commercial applications, and to alter it and redistribute it freely, subject to
-the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not claim
-    that you wrote the original software. If you use this software in a product,
-    an acknowledgment in the product documentation would be appreciated but is
-    not required.
-
- 2. Altered source versions must be plainly marked as such, and must not be
-    misrepresented as being the original software.
-
- 3. This notice may not be removed or altered from any source distribution.
diff --git a/crates/edit_prediction/license_patterns/0bsd-pattern b/crates/edit_prediction/license_patterns/0bsd-pattern
deleted file mode 100644
index 8b7f610042..0000000000
--- a/crates/edit_prediction/license_patterns/0bsd-pattern
+++ /dev/null
@@ -1,11 +0,0 @@
--- 0..512
-Permission to use, copy, modify, and/or distribute this software for
-any purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED “AS IS” AND THE AUTHOR DISCLAIMS ALL
-WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE
-FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY
-DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/crates/edit_prediction/license_patterns/apache-2.0-pattern b/crates/edit_prediction/license_patterns/apache-2.0-pattern
deleted file mode 100644
index 39e2d10c25..0000000000
--- a/crates/edit_prediction/license_patterns/apache-2.0-pattern
+++ /dev/null
@@ -1,109 +0,0 @@
--- 0..512
--- 0..0 optional:
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http
--- 0..1 optional:
-://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
--- 0..5
-Apache License
-
-Version 2.0, January 2004
-
-http
--- 0..1
-://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
-
-"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
-
-"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-
-"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
-
-"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
-
-"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
-
-"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
-
-"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
-
-"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
-
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
-
--- 1..5
-You must give any other recipients of the Work or Derivative Works a copy of this License; and
-
--- 1..5
-You must cause any modified files to carry prominent notices stating that You changed the files; and
-
--- 1..5
-You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
-
--- 1..5
-If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
-
--- 1..1 optional:
-END OF TERMS AND CONDITIONS
-
--- 1..1 optional:
-APPENDIX How to apply the Apache License to your work
-
-To apply the Apache License to your work attach the following
-boilerplate notice with the fields enclosed by brackets
-replaced with your own identifying information Dont include
-the brackets  The text should be enclosed in the appropriate
-comment syntax for the file format We also recommend that a
-file or class name and description of purpose be included on the
-same printed page as the copyright notice for easier
-identification within thirdparty archives
-
--- 1..512 optional:
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-
--- 1..5 optional:
-You may obtain a copy of the License at
-
-http
--- 0..1 optional:
-://www.apache.org/licenses/LICENSE-2.0
-
--- 1..5 optional:
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/crates/edit_prediction/license_patterns/apache-2.0-reference-pattern b/crates/edit_prediction/license_patterns/apache-2.0-reference-pattern
deleted file mode 100644
index 192148fc7a..0000000000
--- a/crates/edit_prediction/license_patterns/apache-2.0-reference-pattern
+++ /dev/null
@@ -1,14 +0,0 @@
--- 0..512
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http
--- 0..1
-://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/crates/edit_prediction/license_patterns/bsd-pattern b/crates/edit_prediction/license_patterns/bsd-pattern
deleted file mode 100644
index 917b7e3c44..0000000000
--- a/crates/edit_prediction/license_patterns/bsd-pattern
+++ /dev/null
@@ -1,32 +0,0 @@
--- 0..512
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
--- 1..5
-Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
-
--- 1..5 optional:
-Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation and/or
-other materials provided with the distribution.
-
--- 1..128 optional:
-may be used to endorse or promote products derived from this software without
-specific prior written permission.
-
--- 1..5
-THIS SOFTWARE IS PROVIDED
--- 1..128
-“AS IS” AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL
--- 1..128
-BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/crates/edit_prediction/license_patterns/isc-pattern b/crates/edit_prediction/license_patterns/isc-pattern
deleted file mode 100644
index 8a47a1339f..0000000000
--- a/crates/edit_prediction/license_patterns/isc-pattern
+++ /dev/null
@@ -1,12 +0,0 @@
--- 0..512
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/crates/edit_prediction/license_patterns/mit-pattern b/crates/edit_prediction/license_patterns/mit-pattern
deleted file mode 100644
index 6e21baa00c..0000000000
--- a/crates/edit_prediction/license_patterns/mit-pattern
+++ /dev/null
@@ -1,18 +0,0 @@
--- 0..512
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/crates/edit_prediction/license_patterns/upl-1.0-pattern b/crates/edit_prediction/license_patterns/upl-1.0-pattern
deleted file mode 100644
index da9d26ca3f..0000000000
--- a/crates/edit_prediction/license_patterns/upl-1.0-pattern
+++ /dev/null
@@ -1,32 +0,0 @@
--- 0..512
-Subject to the condition set forth below, permission is hereby granted to any person
-obtaining a copy of this software, associated documentation and/or data (collectively
-the "Software"), free of charge and under any and all copyright rights in the
-Software, and any and all patent rights owned or freely licensable by each licensor
-hereunder covering either (i) the unmodified Software as contributed to or provided
-by such licensor, or (ii) the Larger Works (as defined below), to deal in both
-
-(a) the Software, and
-
-(b) any piece of software and/or hardware listed in the lrgrwrks.txt file if one is
-    included with the Software (each a "Larger Work" to which the Software is
-    contributed by such licensors),
-
-without restriction, including without limitation the rights to copy, create
-derivative works of, display, perform, and distribute the Software and make, use,
-sell, offer for sale, import, export, have made, and have sold the Software and the
-Larger Work(s), and to sublicense the foregoing rights on either these or other
-terms.
-
-This license is subject to the following condition:
-
-The above copyright notice and either this complete permission notice or at a minimum
-a reference to the UPL must be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
-OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/crates/edit_prediction/license_patterns/zlib-pattern b/crates/edit_prediction/license_patterns/zlib-pattern
deleted file mode 100644
index 121b5409cc..0000000000
--- a/crates/edit_prediction/license_patterns/zlib-pattern
+++ /dev/null
@@ -1,21 +0,0 @@
--- 0..512
-This software is provided 'as-is', without any express or implied warranty. In
-no event will the authors be held liable for any damages arising from the use of
-this software.
-
-Permission is granted to anyone to use this software for any purpose, including
-commercial applications, and to alter it and redistribute it freely, subject to
-the following restrictions:
-
--- 1..5
-The origin of this software must not be misrepresented; you must not claim
-that you wrote the original software. If you use this software in a product,
-an acknowledgment in the product documentation would be appreciated but is
-not required.
-
--- 1..5
-Altered source versions must be plainly marked as such, and must not be
-misrepresented as being the original software.
-
--- 1..5
-This notice may not be removed or altered from any source distribution.
diff --git a/crates/edit_prediction/src/cursor_excerpt.rs b/crates/edit_prediction/src/cursor_excerpt.rs
deleted file mode 100644
index 1f2f1d32eb..0000000000
--- a/crates/edit_prediction/src/cursor_excerpt.rs
+++ /dev/null
@@ -1,78 +0,0 @@
-use language::{BufferSnapshot, Point};
-use std::ops::Range;
-
-pub fn editable_and_context_ranges_for_cursor_position(
-    position: Point,
-    snapshot: &BufferSnapshot,
-    editable_region_token_limit: usize,
-    context_token_limit: usize,
-) -> (Range<Point>, Range<Point>) {
-    let mut scope_range = position..position;
-    let mut remaining_edit_tokens = editable_region_token_limit;
-
-    while let Some(parent) = snapshot.syntax_ancestor(scope_range.clone()) {
-        let parent_tokens = guess_token_count(parent.byte_range().len());
-        let parent_point_range = Point::new(
-            parent.start_position().row as u32,
-            parent.start_position().column as u32,
-        )
-            ..Point::new(
-                parent.end_position().row as u32,
-                parent.end_position().column as u32,
-            );
-        if parent_point_range == scope_range {
-            break;
-        } else if parent_tokens <= editable_region_token_limit {
-            scope_range = parent_point_range;
-            remaining_edit_tokens = editable_region_token_limit - parent_tokens;
-        } else {
-            break;
-        }
-    }
-
-    let editable_range = expand_range(snapshot, scope_range, remaining_edit_tokens);
-    let context_range = expand_range(snapshot, editable_range.clone(), context_token_limit);
-    (editable_range, context_range)
-}
-
-fn expand_range(
-    snapshot: &BufferSnapshot,
-    range: Range<Point>,
-    mut remaining_tokens: usize,
-) -> Range<Point> {
-    let mut expanded_range = range;
-    expanded_range.start.column = 0;
-    expanded_range.end.column = snapshot.line_len(expanded_range.end.row);
-    loop {
-        let mut expanded = false;
-
-        if remaining_tokens > 0 && expanded_range.start.row > 0 {
-            expanded_range.start.row -= 1;
-            let line_tokens =
-                guess_token_count(snapshot.line_len(expanded_range.start.row) as usize);
-            remaining_tokens = remaining_tokens.saturating_sub(line_tokens);
-            expanded = true;
-        }
-
-        if remaining_tokens > 0 && expanded_range.end.row < snapshot.max_point().row {
-            expanded_range.end.row += 1;
-            expanded_range.end.column = snapshot.line_len(expanded_range.end.row);
-            let line_tokens = guess_token_count(expanded_range.end.column as usize);
-            remaining_tokens = remaining_tokens.saturating_sub(line_tokens);
-            expanded = true;
-        }
-
-        if !expanded {
-            break;
-        }
-    }
-    expanded_range
-}
-
-/// Typical number of string bytes per token for the purposes of limiting model input. This is
-/// intentionally low to err on the side of underestimating limits.
-pub(crate) const BYTES_PER_TOKEN_GUESS: usize = 3;
-
-pub fn guess_token_count(bytes: usize) -> usize {
-    bytes / BYTES_PER_TOKEN_GUESS
-}
diff --git a/crates/edit_prediction/src/edit_prediction.rs b/crates/edit_prediction/src/edit_prediction.rs
deleted file mode 100644
index 6a7c6232d0..0000000000
--- a/crates/edit_prediction/src/edit_prediction.rs
+++ /dev/null
@@ -1,2025 +0,0 @@
-use anyhow::Result;
-use arrayvec::ArrayVec;
-use client::{Client, EditPredictionUsage, UserStore};
-use cloud_llm_client::predict_edits_v3::{self, PromptFormat};
-use cloud_llm_client::{
-    AcceptEditPredictionBody, EXPIRED_LLM_TOKEN_HEADER_NAME, EditPredictionRejectReason,
-    EditPredictionRejection, MAX_EDIT_PREDICTION_REJECTIONS_PER_REQUEST,
-    MINIMUM_REQUIRED_VERSION_HEADER_NAME, PredictEditsRequestTrigger, RejectEditPredictionsBodyRef,
-    ZED_VERSION_HEADER_NAME,
-};
-use collections::{HashMap, HashSet};
-use db::kvp::{Dismissable, KEY_VALUE_STORE};
-use edit_prediction_context::EditPredictionExcerptOptions;
-use edit_prediction_context::{RelatedExcerptStore, RelatedExcerptStoreEvent, RelatedFile};
-use feature_flags::{FeatureFlag, FeatureFlagAppExt as _};
-use futures::{
-    AsyncReadExt as _, FutureExt as _, StreamExt as _,
-    channel::mpsc::{self, UnboundedReceiver},
-    select_biased,
-};
-use gpui::BackgroundExecutor;
-use gpui::{
-    App, AsyncApp, Entity, EntityId, Global, SharedString, Subscription, Task, WeakEntity, actions,
-    http_client::{self, AsyncBody, Method},
-    prelude::*,
-};
-use language::language_settings::all_language_settings;
-use language::{Anchor, Buffer, File, Point, ToPoint};
-use language::{BufferSnapshot, OffsetRangeExt};
-use language_model::{LlmApiToken, RefreshLlmTokenListener};
-use project::{Project, ProjectPath, WorktreeId};
-use release_channel::AppVersion;
-use semver::Version;
-use serde::de::DeserializeOwned;
-use settings::{EditPredictionProvider, SettingsStore, update_settings_file};
-use std::collections::{VecDeque, hash_map};
-use workspace::Workspace;
-
-use std::ops::Range;
-use std::path::Path;
-use std::rc::Rc;
-use std::str::FromStr as _;
-use std::sync::{Arc, LazyLock};
-use std::time::{Duration, Instant};
-use std::{env, mem};
-use thiserror::Error;
-use util::{RangeExt as _, ResultExt as _};
-use workspace::notifications::{ErrorMessagePrompt, NotificationId, show_app_notification};
-
-mod cursor_excerpt;
-mod license_detection;
-pub mod mercury;
-mod onboarding_modal;
-pub mod open_ai_response;
-mod prediction;
-pub mod sweep_ai;
-
-#[cfg(any(test, feature = "test-support", feature = "cli-support"))]
-pub mod udiff;
-
-mod zed_edit_prediction_delegate;
-pub mod zeta1;
-pub mod zeta2;
-
-#[cfg(test)]
-mod edit_prediction_tests;
-
-use crate::license_detection::LicenseDetectionWatcher;
-use crate::mercury::Mercury;
-use crate::onboarding_modal::ZedPredictModal;
-pub use crate::prediction::EditPrediction;
-pub use crate::prediction::EditPredictionId;
-use crate::prediction::EditPredictionResult;
-pub use crate::sweep_ai::SweepAi;
-pub use telemetry_events::EditPredictionRating;
-pub use zed_edit_prediction_delegate::ZedEditPredictionDelegate;
-
-actions!(
-    edit_prediction,
-    [
-        /// Resets the edit prediction onboarding state.
-        ResetOnboarding,
-        /// Clears the edit prediction history.
-        ClearHistory,
-    ]
-);
-
-/// Maximum number of events to track.
-const EVENT_COUNT_MAX: usize = 6;
-const CHANGE_GROUPING_LINE_SPAN: u32 = 8;
-const ZED_PREDICT_DATA_COLLECTION_CHOICE: &str = "zed_predict_data_collection_choice";
-const REJECT_REQUEST_DEBOUNCE: Duration = Duration::from_secs(15);
-
-pub struct SweepFeatureFlag;
-
-impl FeatureFlag for SweepFeatureFlag {
-    const NAME: &str = "sweep-ai";
-}
-
-pub struct MercuryFeatureFlag;
-
-impl FeatureFlag for MercuryFeatureFlag {
-    const NAME: &str = "mercury";
-}
-
-pub const DEFAULT_OPTIONS: ZetaOptions = ZetaOptions {
-    context: EditPredictionExcerptOptions {
-        max_bytes: 512,
-        min_bytes: 128,
-        target_before_cursor_over_total_bytes: 0.5,
-    },
-    prompt_format: PromptFormat::DEFAULT,
-};
-
-static USE_OLLAMA: LazyLock<bool> =
-    LazyLock::new(|| env::var("ZED_ZETA2_OLLAMA").is_ok_and(|var| !var.is_empty()));
-
-static EDIT_PREDICTIONS_MODEL_ID: LazyLock<String> = LazyLock::new(|| {
-    match env::var("ZED_ZETA2_MODEL").as_deref() {
-        Ok("zeta2-exp") => "4w5n28vw", // Fine-tuned model @ Baseten
-        Ok(model) => model,
-        Err(_) if *USE_OLLAMA => "qwen3-coder:30b",
-        Err(_) => "yqvev8r3", // Vanilla qwen3-coder @ Baseten
-    }
-    .to_string()
-});
-static PREDICT_EDITS_URL: LazyLock<Option<String>> = LazyLock::new(|| {
-    env::var("ZED_PREDICT_EDITS_URL").ok().or_else(|| {
-        if *USE_OLLAMA {
-            Some("http://localhost:11434/v1/chat/completions".into())
-        } else {
-            None
-        }
-    })
-});
-
-pub struct Zeta2FeatureFlag;
-
-impl FeatureFlag for Zeta2FeatureFlag {
-    const NAME: &'static str = "zeta2";
-
-    fn enabled_for_staff() -> bool {
-        true
-    }
-}
-
-#[derive(Clone)]
-struct EditPredictionStoreGlobal(Entity<EditPredictionStore>);
-
-impl Global for EditPredictionStoreGlobal {}
-
-pub struct EditPredictionStore {
-    client: Arc<Client>,
-    user_store: Entity<UserStore>,
-    llm_token: LlmApiToken,
-    _llm_token_subscription: Subscription,
-    projects: HashMap<EntityId, ProjectState>,
-    use_context: bool,
-    options: ZetaOptions,
-    update_required: bool,
-    #[cfg(feature = "cli-support")]
-    eval_cache: Option<Arc<dyn EvalCache>>,
-    edit_prediction_model: EditPredictionModel,
-    pub sweep_ai: SweepAi,
-    pub mercury: Mercury,
-    data_collection_choice: DataCollectionChoice,
-    reject_predictions_tx: mpsc::UnboundedSender<EditPredictionRejection>,
-    shown_predictions: VecDeque<EditPrediction>,
-    rated_predictions: HashSet<EditPredictionId>,
-}
-
-#[derive(Copy, Clone, Default, PartialEq, Eq)]
-pub enum EditPredictionModel {
-    #[default]
-    Zeta1,
-    Zeta2,
-    Sweep,
-    Mercury,
-}
-
-pub struct EditPredictionModelInput {
-    project: Entity<Project>,
-    buffer: Entity<Buffer>,
-    snapshot: BufferSnapshot,
-    position: Anchor,
-    events: Vec<Arc<zeta_prompt::Event>>,
-    related_files: Arc<[RelatedFile]>,
-    recent_paths: VecDeque<ProjectPath>,
-    trigger: PredictEditsRequestTrigger,
-    diagnostic_search_range: Range<Point>,
-    debug_tx: Option<mpsc::UnboundedSender<DebugEvent>>,
-}
-
-#[derive(Debug, Clone, PartialEq)]
-pub struct ZetaOptions {
-    pub context: EditPredictionExcerptOptions,
-    pub prompt_format: predict_edits_v3::PromptFormat,
-}
-
-#[derive(Debug)]
-pub enum DebugEvent {
-    ContextRetrievalStarted(ContextRetrievalStartedDebugEvent),
-    ContextRetrievalFinished(ContextRetrievalFinishedDebugEvent),
-    EditPredictionStarted(EditPredictionStartedDebugEvent),
-    EditPredictionFinished(EditPredictionFinishedDebugEvent),
-}
-
-#[derive(Debug)]
-pub struct ContextRetrievalStartedDebugEvent {
-    pub project_entity_id: EntityId,
-    pub timestamp: Instant,
-    pub search_prompt: String,
-}
-
-#[derive(Debug)]
-pub struct ContextRetrievalFinishedDebugEvent {
-    pub project_entity_id: EntityId,
-    pub timestamp: Instant,
-    pub metadata: Vec<(&'static str, SharedString)>,
-}
-
-#[derive(Debug)]
-pub struct EditPredictionStartedDebugEvent {
-    pub buffer: WeakEntity<Buffer>,
-    pub position: Anchor,
-    pub prompt: Option<String>,
-}
-
-#[derive(Debug)]
-pub struct EditPredictionFinishedDebugEvent {
-    pub buffer: WeakEntity<Buffer>,
-    pub position: Anchor,
-    pub model_output: Option<String>,
-}
-
-pub type RequestDebugInfo = predict_edits_v3::DebugInfo;
-
-struct ProjectState {
-    events: VecDeque<Arc<zeta_prompt::Event>>,
-    last_event: Option<LastEvent>,
-    recent_paths: VecDeque<ProjectPath>,
-    registered_buffers: HashMap<gpui::EntityId, RegisteredBuffer>,
-    current_prediction: Option<CurrentEditPrediction>,
-    next_pending_prediction_id: usize,
-    pending_predictions: ArrayVec<PendingPrediction, 2>,
-    debug_tx: Option<mpsc::UnboundedSender<DebugEvent>>,
-    last_prediction_refresh: Option<(EntityId, Instant)>,
-    cancelled_predictions: HashSet<usize>,
-    context: Entity<RelatedExcerptStore>,
-    license_detection_watchers: HashMap<WorktreeId, Rc<LicenseDetectionWatcher>>,
-    _subscription: gpui::Subscription,
-}
-
-impl ProjectState {
-    pub fn events(&self, cx: &App) -> Vec<Arc<zeta_prompt::Event>> {
-        self.events
-            .iter()
-            .cloned()
-            .chain(
-                self.last_event
-                    .as_ref()
-                    .and_then(|event| event.finalize(&self.license_detection_watchers, cx)),
-            )
-            .collect()
-    }
-
-    fn cancel_pending_prediction(
-        &mut self,
-        pending_prediction: PendingPrediction,
-        cx: &mut Context<EditPredictionStore>,
-    ) {
-        self.cancelled_predictions.insert(pending_prediction.id);
-
-        cx.spawn(async move |this, cx| {
-            let Some(prediction_id) = pending_prediction.task.await else {
-                return;
-            };
-
-            this.update(cx, |this, _cx| {
-                this.reject_prediction(prediction_id, EditPredictionRejectReason::Canceled, false);
-            })
-            .ok();
-        })
-        .detach()
-    }
-
-    fn active_buffer(
-        &self,
-        project: &Entity<Project>,
-        cx: &App,
-    ) -> Option<(Entity<Buffer>, Option<Anchor>)> {
-        let project = project.read(cx);
-        let active_path = project.path_for_entry(project.active_entry()?, cx)?;
-        let active_buffer = project.buffer_store().read(cx).get_by_path(&active_path)?;
-        let registered_buffer = self.registered_buffers.get(&active_buffer.entity_id())?;
-        Some((active_buffer, registered_buffer.last_position))
-    }
-}
-
-#[derive(Debug, Clone)]
-struct CurrentEditPrediction {
-    pub requested_by: PredictionRequestedBy,
-    pub prediction: EditPrediction,
-    pub was_shown: bool,
-}
-
-impl CurrentEditPrediction {
-    fn should_replace_prediction(&self, old_prediction: &Self, cx: &App) -> bool {
-        let Some(new_edits) = self
-            .prediction
-            .interpolate(&self.prediction.buffer.read(cx))
-        else {
-            return false;
-        };
-
-        if self.prediction.buffer != old_prediction.prediction.buffer {
-            return true;
-        }
-
-        let Some(old_edits) = old_prediction
-            .prediction
-            .interpolate(&old_prediction.prediction.buffer.read(cx))
-        else {
-            return true;
-        };
-
-        let requested_by_buffer_id = self.requested_by.buffer_id();
-
-        // This reduces the occurrence of UI thrash from replacing edits
-        //
-        // TODO: This is fairly arbitrary - should have a more general heuristic that handles multiple edits.
-        if requested_by_buffer_id == Some(self.prediction.buffer.entity_id())
-            && requested_by_buffer_id == Some(old_prediction.prediction.buffer.entity_id())
-            && old_edits.len() == 1
-            && new_edits.len() == 1
-        {
-            let (old_range, old_text) = &old_edits[0];
-            let (new_range, new_text) = &new_edits[0];
-            new_range == old_range && new_text.starts_with(old_text.as_ref())
-        } else {
-            true
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-enum PredictionRequestedBy {
-    DiagnosticsUpdate,
-    Buffer(EntityId),
-}
-
-impl PredictionRequestedBy {
-    pub fn buffer_id(&self) -> Option<EntityId> {
-        match self {
-            PredictionRequestedBy::DiagnosticsUpdate => None,
-            PredictionRequestedBy::Buffer(buffer_id) => Some(*buffer_id),
-        }
-    }
-}
-
-#[derive(Debug)]
-struct PendingPrediction {
-    id: usize,
-    task: Task<Option<EditPredictionId>>,
-}
-
-/// A prediction from the perspective of a buffer.
-#[derive(Debug)]
-enum BufferEditPrediction<'a> {
-    Local { prediction: &'a EditPrediction },
-    Jump { prediction: &'a EditPrediction },
-}
-
-#[cfg(test)]
-impl std::ops::Deref for BufferEditPrediction<'_> {
-    type Target = EditPrediction;
-
-    fn deref(&self) -> &Self::Target {
-        match self {
-            BufferEditPrediction::Local { prediction } => prediction,
-            BufferEditPrediction::Jump { prediction } => prediction,
-        }
-    }
-}
-
-struct RegisteredBuffer {
-    snapshot: BufferSnapshot,
-    last_position: Option<Anchor>,
-    _subscriptions: [gpui::Subscription; 2],
-}
-
-struct LastEvent {
-    old_snapshot: BufferSnapshot,
-    new_snapshot: BufferSnapshot,
-    end_edit_anchor: Option<Anchor>,
-}
-
-impl LastEvent {
-    pub fn finalize(
-        &self,
-        license_detection_watchers: &HashMap<WorktreeId, Rc<LicenseDetectionWatcher>>,
-        cx: &App,
-    ) -> Option<Arc<zeta_prompt::Event>> {
-        let path = buffer_path_with_id_fallback(&self.new_snapshot, cx);
-        let old_path = buffer_path_with_id_fallback(&self.old_snapshot, cx);
-
-        let file = self.new_snapshot.file();
-        let old_file = self.old_snapshot.file();
-
-        let in_open_source_repo = [file, old_file].iter().all(|file| {
-            file.is_some_and(|file| {
-                license_detection_watchers
-                    .get(&file.worktree_id(cx))
-                    .is_some_and(|watcher| watcher.is_project_open_source())
-            })
-        });
-
-        let diff = language::unified_diff(&self.old_snapshot.text(), &self.new_snapshot.text());
-
-        if path == old_path && diff.is_empty() {
-            None
-        } else {
-            Some(Arc::new(zeta_prompt::Event::BufferChange {
-                old_path,
-                path,
-                diff,
-                in_open_source_repo,
-                // TODO: Actually detect if this edit was predicted or not
-                predicted: false,
-            }))
-        }
-    }
-}
-
-fn buffer_path_with_id_fallback(snapshot: &BufferSnapshot, cx: &App) -> Arc<Path> {
-    if let Some(file) = snapshot.file() {
-        file.full_path(cx).into()
-    } else {
-        Path::new(&format!("untitled-{}", snapshot.remote_id())).into()
-    }
-}
-
-impl EditPredictionStore {
-    pub fn try_global(cx: &App) -> Option<Entity<Self>> {
-        cx.try_global::<EditPredictionStoreGlobal>()
-            .map(|global| global.0.clone())
-    }
-
-    pub fn global(
-        client: &Arc<Client>,
-        user_store: &Entity<UserStore>,
-        cx: &mut App,
-    ) -> Entity<Self> {
-        cx.try_global::<EditPredictionStoreGlobal>()
-            .map(|global| global.0.clone())
-            .unwrap_or_else(|| {
-                let ep_store = cx.new(|cx| Self::new(client.clone(), user_store.clone(), cx));
-                cx.set_global(EditPredictionStoreGlobal(ep_store.clone()));
-                ep_store
-            })
-    }
-
-    pub fn new(client: Arc<Client>, user_store: Entity<UserStore>, cx: &mut Context<Self>) -> Self {
-        let refresh_llm_token_listener = RefreshLlmTokenListener::global(cx);
-        let data_collection_choice = Self::load_data_collection_choice();
-
-        let llm_token = LlmApiToken::default();
-
-        let (reject_tx, reject_rx) = mpsc::unbounded();
-        cx.background_spawn({
-            let client = client.clone();
-            let llm_token = llm_token.clone();
-            let app_version = AppVersion::global(cx);
-            let background_executor = cx.background_executor().clone();
-            async move {
-                Self::handle_rejected_predictions(
-                    reject_rx,
-                    client,
-                    llm_token,
-                    app_version,
-                    background_executor,
-                )
-                .await
-            }
-        })
-        .detach();
-
-        let mut this = Self {
-            projects: HashMap::default(),
-            client,
-            user_store,
-            options: DEFAULT_OPTIONS,
-            use_context: false,
-            llm_token,
-            _llm_token_subscription: cx.subscribe(
-                &refresh_llm_token_listener,
-                |this, _listener, _event, cx| {
-                    let client = this.client.clone();
-                    let llm_token = this.llm_token.clone();
-                    cx.spawn(async move |_this, _cx| {
-                        llm_token.refresh(&client).await?;
-                        anyhow::Ok(())
-                    })
-                    .detach_and_log_err(cx);
-                },
-            ),
-            update_required: false,
-            #[cfg(feature = "cli-support")]
-            eval_cache: None,
-            edit_prediction_model: EditPredictionModel::Zeta2,
-            sweep_ai: SweepAi::new(cx),
-            mercury: Mercury::new(cx),
-            data_collection_choice,
-            reject_predictions_tx: reject_tx,
-            rated_predictions: Default::default(),
-            shown_predictions: Default::default(),
-        };
-
-        this.configure_context_retrieval(cx);
-        let weak_this = cx.weak_entity();
-        cx.on_flags_ready(move |_, cx| {
-            weak_this
-                .update(cx, |this, cx| this.configure_context_retrieval(cx))
-                .ok();
-        })
-        .detach();
-        cx.observe_global::<SettingsStore>(|this, cx| {
-            this.configure_context_retrieval(cx);
-        })
-        .detach();
-
-        this
-    }
-
-    pub fn set_edit_prediction_model(&mut self, model: EditPredictionModel) {
-        self.edit_prediction_model = model;
-    }
-
-    pub fn has_sweep_api_token(&self) -> bool {
-        self.sweep_ai
-            .api_token
-            .clone()
-            .now_or_never()
-            .flatten()
-            .is_some()
-    }
-
-    pub fn has_mercury_api_token(&self) -> bool {
-        self.mercury
-            .api_token
-            .clone()
-            .now_or_never()
-            .flatten()
-            .is_some()
-    }
-
-    #[cfg(feature = "cli-support")]
-    pub fn with_eval_cache(&mut self, cache: Arc<dyn EvalCache>) {
-        self.eval_cache = Some(cache);
-    }
-
-    pub fn options(&self) -> &ZetaOptions {
-        &self.options
-    }
-
-    pub fn set_options(&mut self, options: ZetaOptions) {
-        self.options = options;
-    }
-
-    pub fn set_use_context(&mut self, use_context: bool) {
-        self.use_context = use_context;
-    }
-
-    pub fn clear_history(&mut self) {
-        for project_state in self.projects.values_mut() {
-            project_state.events.clear();
-        }
-    }
-
-    pub fn clear_history_for_project(&mut self, project: &Entity<Project>) {
-        if let Some(project_state) = self.projects.get_mut(&project.entity_id()) {
-            project_state.events.clear();
-        }
-    }
-
-    pub fn edit_history_for_project(
-        &self,
-        project: &Entity<Project>,
-    ) -> Vec<Arc<zeta_prompt::Event>> {
-        self.projects
-            .get(&project.entity_id())
-            .map(|project_state| project_state.events.iter().cloned().collect())
-            .unwrap_or_default()
-    }
-
-    pub fn context_for_project<'a>(
-        &'a self,
-        project: &Entity<Project>,
-        cx: &'a App,
-    ) -> Arc<[RelatedFile]> {
-        self.projects
-            .get(&project.entity_id())
-            .map(|project| project.context.read(cx).related_files())
-            .unwrap_or_else(|| vec![].into())
-    }
-
-    pub fn context_for_project_with_buffers<'a>(
-        &'a self,
-        project: &Entity<Project>,
-        cx: &'a App,
-    ) -> Option<impl 'a + Iterator<Item = (RelatedFile, Entity<Buffer>)>> {
-        self.projects
-            .get(&project.entity_id())
-            .map(|project| project.context.read(cx).related_files_with_buffers())
-    }
-
-    pub fn usage(&self, cx: &App) -> Option<EditPredictionUsage> {
-        if self.edit_prediction_model == EditPredictionModel::Zeta2 {
-            self.user_store.read(cx).edit_prediction_usage()
-        } else {
-            None
-        }
-    }
-
-    pub fn register_project(&mut self, project: &Entity<Project>, cx: &mut Context<Self>) {
-        self.get_or_init_project(project, cx);
-    }
-
-    pub fn register_buffer(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        project: &Entity<Project>,
-        cx: &mut Context<Self>,
-    ) {
-        let project_state = self.get_or_init_project(project, cx);
-        Self::register_buffer_impl(project_state, buffer, project, cx);
-    }
-
-    fn get_or_init_project(
-        &mut self,
-        project: &Entity<Project>,
-        cx: &mut Context<Self>,
-    ) -> &mut ProjectState {
-        let entity_id = project.entity_id();
-        self.projects
-            .entry(entity_id)
-            .or_insert_with(|| ProjectState {
-                context: {
-                    let related_excerpt_store = cx.new(|cx| RelatedExcerptStore::new(project, cx));
-                    cx.subscribe(&related_excerpt_store, move |this, _, event, _| {
-                        this.handle_excerpt_store_event(entity_id, event);
-                    })
-                    .detach();
-                    related_excerpt_store
-                },
-                events: VecDeque::new(),
-                last_event: None,
-                recent_paths: VecDeque::new(),
-                debug_tx: None,
-                registered_buffers: HashMap::default(),
-                current_prediction: None,
-                cancelled_predictions: HashSet::default(),
-                pending_predictions: ArrayVec::new(),
-                next_pending_prediction_id: 0,
-                last_prediction_refresh: None,
-                license_detection_watchers: HashMap::default(),
-                _subscription: cx.subscribe(&project, Self::handle_project_event),
-            })
-    }
-
-    pub fn remove_project(&mut self, project: &Entity<Project>) {
-        self.projects.remove(&project.entity_id());
-    }
-
-    fn handle_excerpt_store_event(
-        &mut self,
-        project_entity_id: EntityId,
-        event: &RelatedExcerptStoreEvent,
-    ) {
-        if let Some(project_state) = self.projects.get(&project_entity_id) {
-            if let Some(debug_tx) = project_state.debug_tx.clone() {
-                match event {
-                    RelatedExcerptStoreEvent::StartedRefresh => {
-                        debug_tx
-                            .unbounded_send(DebugEvent::ContextRetrievalStarted(
-                                ContextRetrievalStartedDebugEvent {
-                                    project_entity_id: project_entity_id,
-                                    timestamp: Instant::now(),
-                                    search_prompt: String::new(),
-                                },
-                            ))
-                            .ok();
-                    }
-                    RelatedExcerptStoreEvent::FinishedRefresh {
-                        cache_hit_count,
-                        cache_miss_count,
-                        mean_definition_latency,
-                        max_definition_latency,
-                    } => {
-                        debug_tx
-                            .unbounded_send(DebugEvent::ContextRetrievalFinished(
-                                ContextRetrievalFinishedDebugEvent {
-                                    project_entity_id: project_entity_id,
-                                    timestamp: Instant::now(),
-                                    metadata: vec![
-                                        (
-                                            "Cache Hits",
-                                            format!(
-                                                "{}/{}",
-                                                cache_hit_count,
-                                                cache_hit_count + cache_miss_count
-                                            )
-                                            .into(),
-                                        ),
-                                        (
-                                            "Max LSP Time",
-                                            format!("{} ms", max_definition_latency.as_millis())
-                                                .into(),
-                                        ),
-                                        (
-                                            "Mean LSP Time",
-                                            format!("{} ms", mean_definition_latency.as_millis())
-                                                .into(),
-                                        ),
-                                    ],
-                                },
-                            ))
-                            .ok();
-                    }
-                }
-            }
-        }
-    }
-
-    pub fn debug_info(
-        &mut self,
-        project: &Entity<Project>,
-        cx: &mut Context<Self>,
-    ) -> mpsc::UnboundedReceiver<DebugEvent> {
-        let project_state = self.get_or_init_project(project, cx);
-        let (debug_watch_tx, debug_watch_rx) = mpsc::unbounded();
-        project_state.debug_tx = Some(debug_watch_tx);
-        debug_watch_rx
-    }
-
-    fn handle_project_event(
-        &mut self,
-        project: Entity<Project>,
-        event: &project::Event,
-        cx: &mut Context<Self>,
-    ) {
-        // TODO [zeta2] init with recent paths
-        match event {
-            project::Event::ActiveEntryChanged(Some(active_entry_id)) => {
-                let Some(project_state) = self.projects.get_mut(&project.entity_id()) else {
-                    return;
-                };
-                let path = project.read(cx).path_for_entry(*active_entry_id, cx);
-                if let Some(path) = path {
-                    if let Some(ix) = project_state
-                        .recent_paths
-                        .iter()
-                        .position(|probe| probe == &path)
-                    {
-                        project_state.recent_paths.remove(ix);
-                    }
-                    project_state.recent_paths.push_front(path);
-                }
-            }
-            project::Event::DiagnosticsUpdated { .. } => {
-                if cx.has_flag::<Zeta2FeatureFlag>() {
-                    self.refresh_prediction_from_diagnostics(project, cx);
-                }
-            }
-            _ => (),
-        }
-    }
-
-    fn register_buffer_impl<'a>(
-        project_state: &'a mut ProjectState,
-        buffer: &Entity<Buffer>,
-        project: &Entity<Project>,
-        cx: &mut Context<Self>,
-    ) -> &'a mut RegisteredBuffer {
-        let buffer_id = buffer.entity_id();
-
-        if let Some(file) = buffer.read(cx).file() {
-            let worktree_id = file.worktree_id(cx);
-            if let Some(worktree) = project.read(cx).worktree_for_id(worktree_id, cx) {
-                project_state
-                    .license_detection_watchers
-                    .entry(worktree_id)
-                    .or_insert_with(|| {
-                        let project_entity_id = project.entity_id();
-                        cx.observe_release(&worktree, move |this, _worktree, _cx| {
-                            let Some(project_state) = this.projects.get_mut(&project_entity_id)
-                            else {
-                                return;
-                            };
-                            project_state
-                                .license_detection_watchers
-                                .remove(&worktree_id);
-                        })
-                        .detach();
-                        Rc::new(LicenseDetectionWatcher::new(&worktree, cx))
-                    });
-            }
-        }
-
-        match project_state.registered_buffers.entry(buffer_id) {
-            hash_map::Entry::Occupied(entry) => entry.into_mut(),
-            hash_map::Entry::Vacant(entry) => {
-                let snapshot = buffer.read(cx).snapshot();
-                let project_entity_id = project.entity_id();
-                entry.insert(RegisteredBuffer {
-                    snapshot,
-                    last_position: None,
-                    _subscriptions: [
-                        cx.subscribe(buffer, {
-                            let project = project.downgrade();
-                            move |this, buffer, event, cx| {
-                                if let language::BufferEvent::Edited = event
-                                    && let Some(project) = project.upgrade()
-                                {
-                                    this.report_changes_for_buffer(&buffer, &project, cx);
-                                }
-                            }
-                        }),
-                        cx.observe_release(buffer, move |this, _buffer, _cx| {
-                            let Some(project_state) = this.projects.get_mut(&project_entity_id)
-                            else {
-                                return;
-                            };
-                            project_state.registered_buffers.remove(&buffer_id);
-                        }),
-                    ],
-                })
-            }
-        }
-    }
-
-    fn report_changes_for_buffer(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        project: &Entity<Project>,
-        cx: &mut Context<Self>,
-    ) {
-        let project_state = self.get_or_init_project(project, cx);
-        let registered_buffer = Self::register_buffer_impl(project_state, buffer, project, cx);
-
-        let new_snapshot = buffer.read(cx).snapshot();
-        if new_snapshot.version == registered_buffer.snapshot.version {
-            return;
-        }
-
-        let old_snapshot = mem::replace(&mut registered_buffer.snapshot, new_snapshot.clone());
-        let end_edit_anchor = new_snapshot
-            .anchored_edits_since::<Point>(&old_snapshot.version)
-            .last()
-            .map(|(_, range)| range.end);
-        let events = &mut project_state.events;
-
-        if let Some(LastEvent {
-            new_snapshot: last_new_snapshot,
-            end_edit_anchor: last_end_edit_anchor,
-            ..
-        }) = project_state.last_event.as_mut()
-        {
-            let is_next_snapshot_of_same_buffer = old_snapshot.remote_id()
-                == last_new_snapshot.remote_id()
-                && old_snapshot.version == last_new_snapshot.version;
-
-            let should_coalesce = is_next_snapshot_of_same_buffer
-                && end_edit_anchor
-                    .as_ref()
-                    .zip(last_end_edit_anchor.as_ref())
-                    .is_some_and(|(a, b)| {
-                        let a = a.to_point(&new_snapshot);
-                        let b = b.to_point(&new_snapshot);
-                        a.row.abs_diff(b.row) <= CHANGE_GROUPING_LINE_SPAN
-                    });
-
-            if should_coalesce {
-                *last_end_edit_anchor = end_edit_anchor;
-                *last_new_snapshot = new_snapshot;
-                return;
-            }
-        }
-
-        if events.len() + 1 >= EVENT_COUNT_MAX {
-            events.pop_front();
-        }
-
-        if let Some(event) = project_state.last_event.take() {
-            events.extend(event.finalize(&project_state.license_detection_watchers, cx));
-        }
-
-        project_state.last_event = Some(LastEvent {
-            old_snapshot,
-            new_snapshot,
-            end_edit_anchor,
-        });
-    }
-
-    fn prediction_at(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        position: Option<language::Anchor>,
-        project: &Entity<Project>,
-        cx: &App,
-    ) -> Option<BufferEditPrediction<'_>> {
-        let project_state = self.projects.get_mut(&project.entity_id())?;
-        if let Some(position) = position
-            && let Some(buffer) = project_state
-                .registered_buffers
-                .get_mut(&buffer.entity_id())
-        {
-            buffer.last_position = Some(position);
-        }
-
-        let CurrentEditPrediction {
-            requested_by,
-            prediction,
-            ..
-        } = project_state.current_prediction.as_ref()?;
-
-        if prediction.targets_buffer(buffer.read(cx)) {
-            Some(BufferEditPrediction::Local { prediction })
-        } else {
-            let show_jump = match requested_by {
-                PredictionRequestedBy::Buffer(requested_by_buffer_id) => {
-                    requested_by_buffer_id == &buffer.entity_id()
-                }
-                PredictionRequestedBy::DiagnosticsUpdate => true,
-            };
-
-            if show_jump {
-                Some(BufferEditPrediction::Jump { prediction })
-            } else {
-                None
-            }
-        }
-    }
-
-    fn accept_current_prediction(&mut self, project: &Entity<Project>, cx: &mut Context<Self>) {
-        match self.edit_prediction_model {
-            EditPredictionModel::Zeta1 | EditPredictionModel::Zeta2 => {}
-            EditPredictionModel::Sweep | EditPredictionModel::Mercury => return,
-        }
-
-        let Some(project_state) = self.projects.get_mut(&project.entity_id()) else {
-            return;
-        };
-
-        let Some(prediction) = project_state.current_prediction.take() else {
-            return;
-        };
-        let request_id = prediction.prediction.id.to_string();
-        for pending_prediction in mem::take(&mut project_state.pending_predictions) {
-            project_state.cancel_pending_prediction(pending_prediction, cx);
-        }
-
-        let client = self.client.clone();
-        let llm_token = self.llm_token.clone();
-        let app_version = AppVersion::global(cx);
-        cx.spawn(async move |this, cx| {
-            let url = if let Ok(predict_edits_url) = env::var("ZED_ACCEPT_PREDICTION_URL") {
-                http_client::Url::parse(&predict_edits_url)?
-            } else {
-                client
-                    .http_client()
-                    .build_zed_llm_url("/predict_edits/accept", &[])?
-            };
-
-            let response = cx
-                .background_spawn(Self::send_api_request::<()>(
-                    move |builder| {
-                        let req = builder.uri(url.as_ref()).body(
-                            serde_json::to_string(&AcceptEditPredictionBody {
-                                request_id: request_id.clone(),
-                            })?
-                            .into(),
-                        );
-                        Ok(req?)
-                    },
-                    client,
-                    llm_token,
-                    app_version,
-                ))
-                .await;
-
-            Self::handle_api_response(&this, response, cx)?;
-            anyhow::Ok(())
-        })
-        .detach_and_log_err(cx);
-    }
-
-    async fn handle_rejected_predictions(
-        rx: UnboundedReceiver<EditPredictionRejection>,
-        client: Arc<Client>,
-        llm_token: LlmApiToken,
-        app_version: Version,
-        background_executor: BackgroundExecutor,
-    ) {
-        let mut rx = std::pin::pin!(rx.peekable());
-        let mut batched = Vec::new();
-
-        while let Some(rejection) = rx.next().await {
-            batched.push(rejection);
-
-            if batched.len() < MAX_EDIT_PREDICTION_REJECTIONS_PER_REQUEST / 2 {
-                select_biased! {
-                    next = rx.as_mut().peek().fuse() => {
-                        if next.is_some() {
-                            continue;
-                        }
-                    }
-                    () = background_executor.timer(REJECT_REQUEST_DEBOUNCE).fuse() => {},
-                }
-            }
-
-            let url = client
-                .http_client()
-                .build_zed_llm_url("/predict_edits/reject", &[])
-                .unwrap();
-
-            let flush_count = batched
-                .len()
-                // in case items have accumulated after failure
-                .min(MAX_EDIT_PREDICTION_REJECTIONS_PER_REQUEST);
-            let start = batched.len() - flush_count;
-
-            let body = RejectEditPredictionsBodyRef {
-                rejections: &batched[start..],
-            };
-
-            let result = Self::send_api_request::<()>(
-                |builder| {
-                    let req = builder
-                        .uri(url.as_ref())
-                        .body(serde_json::to_string(&body)?.into());
-                    anyhow::Ok(req?)
-                },
-                client.clone(),
-                llm_token.clone(),
-                app_version.clone(),
-            )
-            .await;
-
-            if result.log_err().is_some() {
-                batched.drain(start..);
-            }
-        }
-    }
-
-    fn reject_current_prediction(
-        &mut self,
-        reason: EditPredictionRejectReason,
-        project: &Entity<Project>,
-    ) {
-        if let Some(project_state) = self.projects.get_mut(&project.entity_id()) {
-            project_state.pending_predictions.clear();
-            if let Some(prediction) = project_state.current_prediction.take() {
-                self.reject_prediction(prediction.prediction.id, reason, prediction.was_shown);
-            }
-        };
-    }
-
-    fn did_show_current_prediction(&mut self, project: &Entity<Project>, _cx: &mut Context<Self>) {
-        if let Some(project_state) = self.projects.get_mut(&project.entity_id()) {
-            if let Some(current_prediction) = project_state.current_prediction.as_mut() {
-                if !current_prediction.was_shown {
-                    current_prediction.was_shown = true;
-                    self.shown_predictions
-                        .push_front(current_prediction.prediction.clone());
-                    if self.shown_predictions.len() > 50 {
-                        let completion = self.shown_predictions.pop_back().unwrap();
-                        self.rated_predictions.remove(&completion.id);
-                    }
-                }
-            }
-        }
-    }
-
-    fn reject_prediction(
-        &mut self,
-        prediction_id: EditPredictionId,
-        reason: EditPredictionRejectReason,
-        was_shown: bool,
-    ) {
-        match self.edit_prediction_model {
-            EditPredictionModel::Zeta1 | EditPredictionModel::Zeta2 => {}
-            EditPredictionModel::Sweep | EditPredictionModel::Mercury => return,
-        }
-
-        self.reject_predictions_tx
-            .unbounded_send(EditPredictionRejection {
-                request_id: prediction_id.to_string(),
-                reason,
-                was_shown,
-            })
-            .log_err();
-    }
-
-    fn is_refreshing(&self, project: &Entity<Project>) -> bool {
-        self.projects
-            .get(&project.entity_id())
-            .is_some_and(|project_state| !project_state.pending_predictions.is_empty())
-    }
-
-    pub fn refresh_prediction_from_buffer(
-        &mut self,
-        project: Entity<Project>,
-        buffer: Entity<Buffer>,
-        position: language::Anchor,
-        cx: &mut Context<Self>,
-    ) {
-        self.queue_prediction_refresh(project.clone(), buffer.entity_id(), cx, move |this, cx| {
-            let Some(request_task) = this
-                .update(cx, |this, cx| {
-                    this.request_prediction(
-                        &project,
-                        &buffer,
-                        position,
-                        PredictEditsRequestTrigger::Other,
-                        cx,
-                    )
-                })
-                .log_err()
-            else {
-                return Task::ready(anyhow::Ok(None));
-            };
-
-            cx.spawn(async move |_cx| {
-                request_task.await.map(|prediction_result| {
-                    prediction_result.map(|prediction_result| {
-                        (
-                            prediction_result,
-                            PredictionRequestedBy::Buffer(buffer.entity_id()),
-                        )
-                    })
-                })
-            })
-        })
-    }
-
-    pub fn refresh_prediction_from_diagnostics(
-        &mut self,
-        project: Entity<Project>,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(project_state) = self.projects.get_mut(&project.entity_id()) else {
-            return;
-        };
-
-        // Prefer predictions from buffer
-        if project_state.current_prediction.is_some() {
-            return;
-        };
-
-        self.queue_prediction_refresh(project.clone(), project.entity_id(), cx, move |this, cx| {
-            let Some((active_buffer, snapshot, cursor_point)) = this
-                .read_with(cx, |this, cx| {
-                    let project_state = this.projects.get(&project.entity_id())?;
-                    let (buffer, position) = project_state.active_buffer(&project, cx)?;
-                    let snapshot = buffer.read(cx).snapshot();
-
-                    if !Self::predictions_enabled_at(&snapshot, position, cx) {
-                        return None;
-                    }
-
-                    let cursor_point = position
-                        .map(|pos| pos.to_point(&snapshot))
-                        .unwrap_or_default();
-
-                    Some((buffer, snapshot, cursor_point))
-                })
-                .log_err()
-                .flatten()
-            else {
-                return Task::ready(anyhow::Ok(None));
-            };
-
-            cx.spawn(async move |cx| {
-                let Some((jump_buffer, jump_position)) = Self::next_diagnostic_location(
-                    active_buffer,
-                    &snapshot,
-                    Default::default(),
-                    cursor_point,
-                    &project,
-                    cx,
-                )
-                .await?
-                else {
-                    return anyhow::Ok(None);
-                };
-
-                let Some(prediction_result) = this
-                    .update(cx, |this, cx| {
-                        this.request_prediction(
-                            &project,
-                            &jump_buffer,
-                            jump_position,
-                            PredictEditsRequestTrigger::Diagnostics,
-                            cx,
-                        )
-                    })?
-                    .await?
-                else {
-                    return anyhow::Ok(None);
-                };
-
-                this.update(cx, |this, cx| {
-                    Some((
-                        if this
-                            .get_or_init_project(&project, cx)
-                            .current_prediction
-                            .is_none()
-                        {
-                            prediction_result
-                        } else {
-                            EditPredictionResult {
-                                id: prediction_result.id,
-                                prediction: Err(EditPredictionRejectReason::CurrentPreferred),
-                            }
-                        },
-                        PredictionRequestedBy::DiagnosticsUpdate,
-                    ))
-                })
-            })
-        });
-    }
-
-    fn predictions_enabled_at(
-        snapshot: &BufferSnapshot,
-        position: Option<language::Anchor>,
-        cx: &App,
-    ) -> bool {
-        let file = snapshot.file();
-        let all_settings = all_language_settings(file, cx);
-        if !all_settings.show_edit_predictions(snapshot.language(), cx)
-            || file.is_some_and(|file| !all_settings.edit_predictions_enabled_for_file(file, cx))
-        {
-            return false;
-        }
-
-        if let Some(last_position) = position {
-            let settings = snapshot.settings_at(last_position, cx);
-
-            if !settings.edit_predictions_disabled_in.is_empty()
-                && let Some(scope) = snapshot.language_scope_at(last_position)
-                && let Some(scope_name) = scope.override_name()
-                && settings
-                    .edit_predictions_disabled_in
-                    .iter()
-                    .any(|s| s == scope_name)
-            {
-                return false;
-            }
-        }
-
-        true
-    }
-
-    #[cfg(not(test))]
-    pub const THROTTLE_TIMEOUT: Duration = Duration::from_millis(300);
-    #[cfg(test)]
-    pub const THROTTLE_TIMEOUT: Duration = Duration::ZERO;
-
-    fn queue_prediction_refresh(
-        &mut self,
-        project: Entity<Project>,
-        throttle_entity: EntityId,
-        cx: &mut Context<Self>,
-        do_refresh: impl FnOnce(
-            WeakEntity<Self>,
-            &mut AsyncApp,
-        )
-            -> Task<Result<Option<(EditPredictionResult, PredictionRequestedBy)>>>
-        + 'static,
-    ) {
-        let project_state = self.get_or_init_project(&project, cx);
-        let pending_prediction_id = project_state.next_pending_prediction_id;
-        project_state.next_pending_prediction_id += 1;
-        let last_request = project_state.last_prediction_refresh;
-
-        let task = cx.spawn(async move |this, cx| {
-            if let Some((last_entity, last_timestamp)) = last_request
-                && throttle_entity == last_entity
-                && let Some(timeout) =
-                    (last_timestamp + Self::THROTTLE_TIMEOUT).checked_duration_since(Instant::now())
-            {
-                cx.background_executor().timer(timeout).await;
-            }
-
-            // If this task was cancelled before the throttle timeout expired,
-            // do not perform a request.
-            let mut is_cancelled = true;
-            this.update(cx, |this, cx| {
-                let project_state = this.get_or_init_project(&project, cx);
-                if !project_state
-                    .cancelled_predictions
-                    .remove(&pending_prediction_id)
-                {
-                    project_state.last_prediction_refresh = Some((throttle_entity, Instant::now()));
-                    is_cancelled = false;
-                }
-            })
-            .ok();
-            if is_cancelled {
-                return None;
-            }
-
-            let new_prediction_result = do_refresh(this.clone(), cx).await.log_err().flatten();
-            let new_prediction_id = new_prediction_result
-                .as_ref()
-                .map(|(prediction, _)| prediction.id.clone());
-
-            // When a prediction completes, remove it from the pending list, and cancel
-            // any pending predictions that were enqueued before it.
-            this.update(cx, |this, cx| {
-                let project_state = this.get_or_init_project(&project, cx);
-
-                let is_cancelled = project_state
-                    .cancelled_predictions
-                    .remove(&pending_prediction_id);
-
-                let new_current_prediction = if !is_cancelled
-                    && let Some((prediction_result, requested_by)) = new_prediction_result
-                {
-                    match prediction_result.prediction {
-                        Ok(prediction) => {
-                            let new_prediction = CurrentEditPrediction {
-                                requested_by,
-                                prediction,
-                                was_shown: false,
-                            };
-
-                            if let Some(current_prediction) =
-                                project_state.current_prediction.as_ref()
-                            {
-                                if new_prediction.should_replace_prediction(&current_prediction, cx)
-                                {
-                                    this.reject_current_prediction(
-                                        EditPredictionRejectReason::Replaced,
-                                        &project,
-                                    );
-
-                                    Some(new_prediction)
-                                } else {
-                                    this.reject_prediction(
-                                        new_prediction.prediction.id,
-                                        EditPredictionRejectReason::CurrentPreferred,
-                                        false,
-                                    );
-                                    None
-                                }
-                            } else {
-                                Some(new_prediction)
-                            }
-                        }
-                        Err(reject_reason) => {
-                            this.reject_prediction(prediction_result.id, reject_reason, false);
-                            None
-                        }
-                    }
-                } else {
-                    None
-                };
-
-                let project_state = this.get_or_init_project(&project, cx);
-
-                if let Some(new_prediction) = new_current_prediction {
-                    project_state.current_prediction = Some(new_prediction);
-                }
-
-                let mut pending_predictions = mem::take(&mut project_state.pending_predictions);
-                for (ix, pending_prediction) in pending_predictions.iter().enumerate() {
-                    if pending_prediction.id == pending_prediction_id {
-                        pending_predictions.remove(ix);
-                        for pending_prediction in pending_predictions.drain(0..ix) {
-                            project_state.cancel_pending_prediction(pending_prediction, cx)
-                        }
-                        break;
-                    }
-                }
-                this.get_or_init_project(&project, cx).pending_predictions = pending_predictions;
-                cx.notify();
-            })
-            .ok();
-
-            new_prediction_id
-        });
-
-        if project_state.pending_predictions.len() <= 1 {
-            project_state.pending_predictions.push(PendingPrediction {
-                id: pending_prediction_id,
-                task,
-            });
-        } else if project_state.pending_predictions.len() == 2 {
-            let pending_prediction = project_state.pending_predictions.pop().unwrap();
-            project_state.pending_predictions.push(PendingPrediction {
-                id: pending_prediction_id,
-                task,
-            });
-            project_state.cancel_pending_prediction(pending_prediction, cx);
-        }
-    }
-
-    pub fn request_prediction(
-        &mut self,
-        project: &Entity<Project>,
-        active_buffer: &Entity<Buffer>,
-        position: language::Anchor,
-        trigger: PredictEditsRequestTrigger,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Option<EditPredictionResult>>> {
-        self.request_prediction_internal(
-            project.clone(),
-            active_buffer.clone(),
-            position,
-            trigger,
-            cx.has_flag::<Zeta2FeatureFlag>(),
-            cx,
-        )
-    }
-
-    fn request_prediction_internal(
-        &mut self,
-        project: Entity<Project>,
-        active_buffer: Entity<Buffer>,
-        position: language::Anchor,
-        trigger: PredictEditsRequestTrigger,
-        allow_jump: bool,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Option<EditPredictionResult>>> {
-        const DIAGNOSTIC_LINES_RANGE: u32 = 20;
-
-        self.get_or_init_project(&project, cx);
-        let project_state = self.projects.get(&project.entity_id()).unwrap();
-        let events = project_state.events(cx);
-        let has_events = !events.is_empty();
-        let debug_tx = project_state.debug_tx.clone();
-
-        let snapshot = active_buffer.read(cx).snapshot();
-        let cursor_point = position.to_point(&snapshot);
-        let diagnostic_search_start = cursor_point.row.saturating_sub(DIAGNOSTIC_LINES_RANGE);
-        let diagnostic_search_end = cursor_point.row + DIAGNOSTIC_LINES_RANGE;
-        let diagnostic_search_range =
-            Point::new(diagnostic_search_start, 0)..Point::new(diagnostic_search_end, 0);
-
-        let related_files = if self.use_context {
-            self.context_for_project(&project, cx)
-        } else {
-            Vec::new().into()
-        };
-
-        let inputs = EditPredictionModelInput {
-            project: project.clone(),
-            buffer: active_buffer.clone(),
-            snapshot: snapshot.clone(),
-            position,
-            events,
-            related_files,
-            recent_paths: project_state.recent_paths.clone(),
-            trigger,
-            diagnostic_search_range: diagnostic_search_range.clone(),
-            debug_tx,
-        };
-
-        let task = match self.edit_prediction_model {
-            EditPredictionModel::Zeta1 => zeta1::request_prediction_with_zeta1(self, inputs, cx),
-            EditPredictionModel::Zeta2 => zeta2::request_prediction_with_zeta2(self, inputs, cx),
-            EditPredictionModel::Sweep => self.sweep_ai.request_prediction_with_sweep(inputs, cx),
-            EditPredictionModel::Mercury => self.mercury.request_prediction(inputs, cx),
-        };
-
-        cx.spawn(async move |this, cx| {
-            let prediction = task.await?;
-
-            if prediction.is_none() && allow_jump {
-                let cursor_point = position.to_point(&snapshot);
-                if has_events
-                    && let Some((jump_buffer, jump_position)) = Self::next_diagnostic_location(
-                        active_buffer.clone(),
-                        &snapshot,
-                        diagnostic_search_range,
-                        cursor_point,
-                        &project,
-                        cx,
-                    )
-                    .await?
-                {
-                    return this
-                        .update(cx, |this, cx| {
-                            this.request_prediction_internal(
-                                project,
-                                jump_buffer,
-                                jump_position,
-                                trigger,
-                                false,
-                                cx,
-                            )
-                        })?
-                        .await;
-                }
-
-                return anyhow::Ok(None);
-            }
-
-            Ok(prediction)
-        })
-    }
-
-    async fn next_diagnostic_location(
-        active_buffer: Entity<Buffer>,
-        active_buffer_snapshot: &BufferSnapshot,
-        active_buffer_diagnostic_search_range: Range<Point>,
-        active_buffer_cursor_point: Point,
-        project: &Entity<Project>,
-        cx: &mut AsyncApp,
-    ) -> Result<Option<(Entity<Buffer>, language::Anchor)>> {
-        // find the closest diagnostic to the cursor that wasn't close enough to be included in the last request
-        let mut jump_location = active_buffer_snapshot
-            .diagnostic_groups(None)
-            .into_iter()
-            .filter_map(|(_, group)| {
-                let range = &group.entries[group.primary_ix]
-                    .range
-                    .to_point(&active_buffer_snapshot);
-                if range.overlaps(&active_buffer_diagnostic_search_range) {
-                    None
-                } else {
-                    Some(range.start)
-                }
-            })
-            .min_by_key(|probe| probe.row.abs_diff(active_buffer_cursor_point.row))
-            .map(|position| {
-                (
-                    active_buffer.clone(),
-                    active_buffer_snapshot.anchor_before(position),
-                )
-            });
-
-        if jump_location.is_none() {
-            let active_buffer_path = active_buffer.read_with(cx, |buffer, cx| {
-                let file = buffer.file()?;
-
-                Some(ProjectPath {
-                    worktree_id: file.worktree_id(cx),
-                    path: file.path().clone(),
-                })
-            })?;
-
-            let buffer_task = project.update(cx, |project, cx| {
-                let (path, _, _) = project
-                    .diagnostic_summaries(false, cx)
-                    .filter(|(path, _, _)| Some(path) != active_buffer_path.as_ref())
-                    .max_by_key(|(path, _, _)| {
-                        // find the buffer with errors that shares most parent directories
-                        path.path
-                            .components()
-                            .zip(
-                                active_buffer_path
-                                    .as_ref()
-                                    .map(|p| p.path.components())
-                                    .unwrap_or_default(),
-                            )
-                            .take_while(|(a, b)| a == b)
-                            .count()
-                    })?;
-
-                Some(project.open_buffer(path, cx))
-            })?;
-
-            if let Some(buffer_task) = buffer_task {
-                let closest_buffer = buffer_task.await?;
-
-                jump_location = closest_buffer
-                    .read_with(cx, |buffer, _cx| {
-                        buffer
-                            .buffer_diagnostics(None)
-                            .into_iter()
-                            .min_by_key(|entry| entry.diagnostic.severity)
-                            .map(|entry| entry.range.start)
-                    })?
-                    .map(|position| (closest_buffer, position));
-            }
-        }
-
-        anyhow::Ok(jump_location)
-    }
-
-    async fn send_raw_llm_request(
-        request: open_ai::Request,
-        client: Arc<Client>,
-        llm_token: LlmApiToken,
-        app_version: Version,
-        #[cfg(feature = "cli-support")] eval_cache: Option<Arc<dyn EvalCache>>,
-        #[cfg(feature = "cli-support")] eval_cache_kind: EvalCacheEntryKind,
-    ) -> Result<(open_ai::Response, Option<EditPredictionUsage>)> {
-        let url = if let Some(predict_edits_url) = PREDICT_EDITS_URL.as_ref() {
-            http_client::Url::parse(&predict_edits_url)?
-        } else {
-            client
-                .http_client()
-                .build_zed_llm_url("/predict_edits/raw", &[])?
-        };
-
-        #[cfg(feature = "cli-support")]
-        let cache_key = if let Some(cache) = eval_cache {
-            use collections::FxHasher;
-            use std::hash::{Hash, Hasher};
-
-            let mut hasher = FxHasher::default();
-            url.hash(&mut hasher);
-            let request_str = serde_json::to_string_pretty(&request)?;
-            request_str.hash(&mut hasher);
-            let hash = hasher.finish();
-
-            let key = (eval_cache_kind, hash);
-            if let Some(response_str) = cache.read(key) {
-                return Ok((serde_json::from_str(&response_str)?, None));
-            }
-
-            Some((cache, request_str, key))
-        } else {
-            None
-        };
-
-        let (response, usage) = Self::send_api_request(
-            |builder| {
-                let req = builder
-                    .uri(url.as_ref())
-                    .body(serde_json::to_string(&request)?.into());
-                Ok(req?)
-            },
-            client,
-            llm_token,
-            app_version,
-        )
-        .await?;
-
-        #[cfg(feature = "cli-support")]
-        if let Some((cache, request, key)) = cache_key {
-            cache.write(key, &request, &serde_json::to_string_pretty(&response)?);
-        }
-
-        Ok((response, usage))
-    }
-
-    fn handle_api_response<T>(
-        this: &WeakEntity<Self>,
-        response: Result<(T, Option<EditPredictionUsage>)>,
-        cx: &mut gpui::AsyncApp,
-    ) -> Result<T> {
-        match response {
-            Ok((data, usage)) => {
-                if let Some(usage) = usage {
-                    this.update(cx, |this, cx| {
-                        this.user_store.update(cx, |user_store, cx| {
-                            user_store.update_edit_prediction_usage(usage, cx);
-                        });
-                    })
-                    .ok();
-                }
-                Ok(data)
-            }
-            Err(err) => {
-                if err.is::<ZedUpdateRequiredError>() {
-                    cx.update(|cx| {
-                        this.update(cx, |this, _cx| {
-                            this.update_required = true;
-                        })
-                        .ok();
-
-                        let error_message: SharedString = err.to_string().into();
-                        show_app_notification(
-                            NotificationId::unique::<ZedUpdateRequiredError>(),
-                            cx,
-                            move |cx| {
-                                cx.new(|cx| {
-                                    ErrorMessagePrompt::new(error_message.clone(), cx)
-                                        .with_link_button("Update Zed", "https://zed.dev/releases")
-                                })
-                            },
-                        );
-                    })
-                    .ok();
-                }
-                Err(err)
-            }
-        }
-    }
-
-    async fn send_api_request<Res>(
-        build: impl Fn(http_client::http::request::Builder) -> Result<http_client::Request<AsyncBody>>,
-        client: Arc<Client>,
-        llm_token: LlmApiToken,
-        app_version: Version,
-    ) -> Result<(Res, Option<EditPredictionUsage>)>
-    where
-        Res: DeserializeOwned,
-    {
-        let http_client = client.http_client();
-        let mut token = llm_token.acquire(&client).await?;
-        let mut did_retry = false;
-
-        loop {
-            let request_builder = http_client::Request::builder().method(Method::POST);
-
-            let request = build(
-                request_builder
-                    .header("Content-Type", "application/json")
-                    .header("Authorization", format!("Bearer {}", token))
-                    .header(ZED_VERSION_HEADER_NAME, app_version.to_string()),
-            )?;
-
-            let mut response = http_client.send(request).await?;
-
-            if let Some(minimum_required_version) = response
-                .headers()
-                .get(MINIMUM_REQUIRED_VERSION_HEADER_NAME)
-                .and_then(|version| Version::from_str(version.to_str().ok()?).ok())
-            {
-                anyhow::ensure!(
-                    app_version >= minimum_required_version,
-                    ZedUpdateRequiredError {
-                        minimum_version: minimum_required_version
-                    }
-                );
-            }
-
-            if response.status().is_success() {
-                let usage = EditPredictionUsage::from_headers(response.headers()).ok();
-
-                let mut body = Vec::new();
-                response.body_mut().read_to_end(&mut body).await?;
-                return Ok((serde_json::from_slice(&body)?, usage));
-            } else if !did_retry
-                && response
-                    .headers()
-                    .get(EXPIRED_LLM_TOKEN_HEADER_NAME)
-                    .is_some()
-            {
-                did_retry = true;
-                token = llm_token.refresh(&client).await?;
-            } else {
-                let mut body = String::new();
-                response.body_mut().read_to_string(&mut body).await?;
-                anyhow::bail!(
-                    "Request failed with status: {:?}\nBody: {}",
-                    response.status(),
-                    body
-                );
-            }
-        }
-    }
-
-    pub fn refresh_context(
-        &mut self,
-        project: &Entity<Project>,
-        buffer: &Entity<language::Buffer>,
-        cursor_position: language::Anchor,
-        cx: &mut Context<Self>,
-    ) {
-        if self.use_context {
-            self.get_or_init_project(project, cx)
-                .context
-                .update(cx, |store, cx| {
-                    store.refresh(buffer.clone(), cursor_position, cx);
-                });
-        }
-    }
-
-    #[cfg(feature = "cli-support")]
-    pub fn set_context_for_buffer(
-        &mut self,
-        project: &Entity<Project>,
-        related_files: Vec<RelatedFile>,
-        cx: &mut Context<Self>,
-    ) {
-        self.get_or_init_project(project, cx)
-            .context
-            .update(cx, |store, _| {
-                store.set_related_files(related_files);
-            });
-    }
-
-    fn is_file_open_source(
-        &self,
-        project: &Entity<Project>,
-        file: &Arc<dyn File>,
-        cx: &App,
-    ) -> bool {
-        if !file.is_local() || file.is_private() {
-            return false;
-        }
-        let Some(project_state) = self.projects.get(&project.entity_id()) else {
-            return false;
-        };
-        project_state
-            .license_detection_watchers
-            .get(&file.worktree_id(cx))
-            .as_ref()
-            .is_some_and(|watcher| watcher.is_project_open_source())
-    }
-
-    fn can_collect_file(&self, project: &Entity<Project>, file: &Arc<dyn File>, cx: &App) -> bool {
-        self.data_collection_choice.is_enabled() && self.is_file_open_source(project, file, cx)
-    }
-
-    fn can_collect_events(&self, events: &[Arc<zeta_prompt::Event>]) -> bool {
-        if !self.data_collection_choice.is_enabled() {
-            return false;
-        }
-        events.iter().all(|event| {
-            matches!(
-                event.as_ref(),
-                zeta_prompt::Event::BufferChange {
-                    in_open_source_repo: true,
-                    ..
-                }
-            )
-        })
-    }
-
-    fn load_data_collection_choice() -> DataCollectionChoice {
-        let choice = KEY_VALUE_STORE
-            .read_kvp(ZED_PREDICT_DATA_COLLECTION_CHOICE)
-            .log_err()
-            .flatten();
-
-        match choice.as_deref() {
-            Some("true") => DataCollectionChoice::Enabled,
-            Some("false") => DataCollectionChoice::Disabled,
-            Some(_) => {
-                log::error!("unknown value in '{ZED_PREDICT_DATA_COLLECTION_CHOICE}'");
-                DataCollectionChoice::NotAnswered
-            }
-            None => DataCollectionChoice::NotAnswered,
-        }
-    }
-
-    fn toggle_data_collection_choice(&mut self, cx: &mut Context<Self>) {
-        self.data_collection_choice = self.data_collection_choice.toggle();
-        let new_choice = self.data_collection_choice;
-        db::write_and_log(cx, move || {
-            KEY_VALUE_STORE.write_kvp(
-                ZED_PREDICT_DATA_COLLECTION_CHOICE.into(),
-                new_choice.is_enabled().to_string(),
-            )
-        });
-    }
-
-    pub fn shown_predictions(&self) -> impl DoubleEndedIterator<Item = &EditPrediction> {
-        self.shown_predictions.iter()
-    }
-
-    pub fn shown_completions_len(&self) -> usize {
-        self.shown_predictions.len()
-    }
-
-    pub fn is_prediction_rated(&self, id: &EditPredictionId) -> bool {
-        self.rated_predictions.contains(id)
-    }
-
-    pub fn rate_prediction(
-        &mut self,
-        prediction: &EditPrediction,
-        rating: EditPredictionRating,
-        feedback: String,
-        cx: &mut Context<Self>,
-    ) {
-        self.rated_predictions.insert(prediction.id.clone());
-        telemetry::event!(
-            "Edit Prediction Rated",
-            rating,
-            inputs = prediction.inputs,
-            output = prediction.edit_preview.as_unified_diff(&prediction.edits),
-            feedback
-        );
-        self.client.telemetry().flush_events().detach();
-        cx.notify();
-    }
-
-    fn configure_context_retrieval(&mut self, cx: &mut Context<'_, EditPredictionStore>) {
-        self.use_context = cx.has_flag::<Zeta2FeatureFlag>()
-            && all_language_settings(None, cx).edit_predictions.use_context;
-    }
-}
-
-#[derive(Error, Debug)]
-#[error(
-    "You must update to Zed version {minimum_version} or higher to continue using edit predictions."
-)]
-pub struct ZedUpdateRequiredError {
-    minimum_version: Version,
-}
-
-#[cfg(feature = "cli-support")]
-pub type EvalCacheKey = (EvalCacheEntryKind, u64);
-
-#[cfg(feature = "cli-support")]
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub enum EvalCacheEntryKind {
-    Context,
-    Search,
-    Prediction,
-}
-
-#[cfg(feature = "cli-support")]
-impl std::fmt::Display for EvalCacheEntryKind {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            EvalCacheEntryKind::Search => write!(f, "search"),
-            EvalCacheEntryKind::Context => write!(f, "context"),
-            EvalCacheEntryKind::Prediction => write!(f, "prediction"),
-        }
-    }
-}
-
-#[cfg(feature = "cli-support")]
-pub trait EvalCache: Send + Sync {
-    fn read(&self, key: EvalCacheKey) -> Option<String>;
-    fn write(&self, key: EvalCacheKey, input: &str, value: &str);
-}
-
-#[derive(Debug, Clone, Copy)]
-pub enum DataCollectionChoice {
-    NotAnswered,
-    Enabled,
-    Disabled,
-}
-
-impl DataCollectionChoice {
-    pub fn is_enabled(self) -> bool {
-        match self {
-            Self::Enabled => true,
-            Self::NotAnswered | Self::Disabled => false,
-        }
-    }
-
-    pub fn is_answered(self) -> bool {
-        match self {
-            Self::Enabled | Self::Disabled => true,
-            Self::NotAnswered => false,
-        }
-    }
-
-    #[must_use]
-    pub fn toggle(&self) -> DataCollectionChoice {
-        match self {
-            Self::Enabled => Self::Disabled,
-            Self::Disabled => Self::Enabled,
-            Self::NotAnswered => Self::Enabled,
-        }
-    }
-}
-
-impl From<bool> for DataCollectionChoice {
-    fn from(value: bool) -> Self {
-        match value {
-            true => DataCollectionChoice::Enabled,
-            false => DataCollectionChoice::Disabled,
-        }
-    }
-}
-
-struct ZedPredictUpsell;
-
-impl Dismissable for ZedPredictUpsell {
-    const KEY: &'static str = "dismissed-edit-predict-upsell";
-
-    fn dismissed() -> bool {
-        // To make this backwards compatible with older versions of Zed, we
-        // check if the user has seen the previous Edit Prediction Onboarding
-        // before, by checking the data collection choice which was written to
-        // the database once the user clicked on "Accept and Enable"
-        if KEY_VALUE_STORE
-            .read_kvp(ZED_PREDICT_DATA_COLLECTION_CHOICE)
-            .log_err()
-            .is_some_and(|s| s.is_some())
-        {
-            return true;
-        }
-
-        KEY_VALUE_STORE
-            .read_kvp(Self::KEY)
-            .log_err()
-            .is_some_and(|s| s.is_some())
-    }
-}
-
-pub fn should_show_upsell_modal() -> bool {
-    !ZedPredictUpsell::dismissed()
-}
-
-pub fn init(cx: &mut App) {
-    cx.observe_new(move |workspace: &mut Workspace, _, _cx| {
-        workspace.register_action(
-            move |workspace, _: &zed_actions::OpenZedPredictOnboarding, window, cx| {
-                ZedPredictModal::toggle(
-                    workspace,
-                    workspace.user_store().clone(),
-                    workspace.client().clone(),
-                    window,
-                    cx,
-                )
-            },
-        );
-
-        workspace.register_action(|workspace, _: &ResetOnboarding, _window, cx| {
-            update_settings_file(workspace.app_state().fs.clone(), cx, move |settings, _| {
-                settings
-                    .project
-                    .all_languages
-                    .features
-                    .get_or_insert_default()
-                    .edit_prediction_provider = Some(EditPredictionProvider::None)
-            });
-        });
-    })
-    .detach();
-}
diff --git a/crates/edit_prediction/src/edit_prediction_tests.rs b/crates/edit_prediction/src/edit_prediction_tests.rs
deleted file mode 100644
index 9e4baa78ef..0000000000
--- a/crates/edit_prediction/src/edit_prediction_tests.rs
+++ /dev/null
@@ -1,1829 +0,0 @@
-use super::*;
-use crate::{udiff::apply_diff_to_string, zeta1::MAX_EVENT_TOKENS};
-use client::{UserStore, test::FakeServer};
-use clock::{FakeSystemClock, ReplicaId};
-use cloud_api_types::{CreateLlmTokenResponse, LlmToken};
-use cloud_llm_client::{
-    EditPredictionRejectReason, EditPredictionRejection, PredictEditsBody, PredictEditsResponse,
-    RejectEditPredictionsBody,
-};
-use futures::{
-    AsyncReadExt, StreamExt,
-    channel::{mpsc, oneshot},
-};
-use gpui::{
-    Entity, TestAppContext,
-    http_client::{FakeHttpClient, Response},
-};
-use indoc::indoc;
-use language::{Point, ToOffset as _};
-use lsp::LanguageServerId;
-use open_ai::Usage;
-use parking_lot::Mutex;
-use pretty_assertions::{assert_eq, assert_matches};
-use project::{FakeFs, Project};
-use serde_json::json;
-use settings::SettingsStore;
-use std::{path::Path, sync::Arc, time::Duration};
-use util::{path, rel_path::rel_path};
-use uuid::Uuid;
-use zeta_prompt::ZetaPromptInput;
-
-use crate::{BufferEditPrediction, EditPredictionId, EditPredictionStore, REJECT_REQUEST_DEBOUNCE};
-
-#[gpui::test]
-async fn test_current_state(cx: &mut TestAppContext) {
-    let (ep_store, mut requests) = init_test_with_fake_client(cx);
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/root",
-        json!({
-            "1.txt": "Hello!\nHow\nBye\n",
-            "2.txt": "Hola!\nComo\nAdios\n"
-        }),
-    )
-    .await;
-    let project = Project::test(fs, vec![path!("/root").as_ref()], cx).await;
-
-    let buffer1 = project
-        .update(cx, |project, cx| {
-            let path = project.find_project_path(path!("/root/1.txt"), cx).unwrap();
-            project.set_active_path(Some(path.clone()), cx);
-            project.open_buffer(path, cx)
-        })
-        .await
-        .unwrap();
-    let snapshot1 = buffer1.read_with(cx, |buffer, _cx| buffer.snapshot());
-    let position = snapshot1.anchor_before(language::Point::new(1, 3));
-
-    ep_store.update(cx, |ep_store, cx| {
-        ep_store.register_project(&project, cx);
-        ep_store.register_buffer(&buffer1, &project, cx);
-    });
-
-    // Prediction for current file
-
-    ep_store.update(cx, |ep_store, cx| {
-        ep_store.refresh_prediction_from_buffer(project.clone(), buffer1.clone(), position, cx)
-    });
-    let (request, respond_tx) = requests.predict.next().await.unwrap();
-
-    respond_tx
-        .send(model_response(
-            request,
-            indoc! {r"
-                --- a/root/1.txt
-                +++ b/root/1.txt
-                @@ ... @@
-                 Hello!
-                -How
-                +How are you?
-                 Bye
-            "},
-        ))
-        .unwrap();
-
-    cx.run_until_parked();
-
-    ep_store.update(cx, |ep_store, cx| {
-        let prediction = ep_store
-            .prediction_at(&buffer1, None, &project, cx)
-            .unwrap();
-        assert_matches!(prediction, BufferEditPrediction::Local { .. });
-    });
-
-    ep_store.update(cx, |ep_store, _cx| {
-        ep_store.reject_current_prediction(EditPredictionRejectReason::Discarded, &project);
-    });
-
-    // Prediction for diagnostic in another file
-
-    let diagnostic = lsp::Diagnostic {
-        range: lsp::Range::new(lsp::Position::new(1, 1), lsp::Position::new(1, 5)),
-        severity: Some(lsp::DiagnosticSeverity::ERROR),
-        message: "Sentence is incomplete".to_string(),
-        ..Default::default()
-    };
-
-    project.update(cx, |project, cx| {
-        project.lsp_store().update(cx, |lsp_store, cx| {
-            lsp_store
-                .update_diagnostics(
-                    LanguageServerId(0),
-                    lsp::PublishDiagnosticsParams {
-                        uri: lsp::Uri::from_file_path(path!("/root/2.txt")).unwrap(),
-                        diagnostics: vec![diagnostic],
-                        version: None,
-                    },
-                    None,
-                    language::DiagnosticSourceKind::Pushed,
-                    &[],
-                    cx,
-                )
-                .unwrap();
-        });
-    });
-
-    let (request, respond_tx) = requests.predict.next().await.unwrap();
-    respond_tx
-        .send(model_response(
-            request,
-            indoc! {r#"
-                --- a/root/2.txt
-                +++ b/root/2.txt
-                @@ ... @@
-                 Hola!
-                -Como
-                +Como estas?
-                 Adios
-            "#},
-        ))
-        .unwrap();
-    cx.run_until_parked();
-
-    ep_store.update(cx, |ep_store, cx| {
-        let prediction = ep_store
-            .prediction_at(&buffer1, None, &project, cx)
-            .unwrap();
-        assert_matches!(
-            prediction,
-            BufferEditPrediction::Jump { prediction } if prediction.snapshot.file().unwrap().full_path(cx) == Path::new(path!("root/2.txt"))
-        );
-    });
-
-    let buffer2 = project
-        .update(cx, |project, cx| {
-            let path = project.find_project_path(path!("root/2.txt"), cx).unwrap();
-            project.open_buffer(path, cx)
-        })
-        .await
-        .unwrap();
-
-    ep_store.update(cx, |ep_store, cx| {
-        let prediction = ep_store
-            .prediction_at(&buffer2, None, &project, cx)
-            .unwrap();
-        assert_matches!(prediction, BufferEditPrediction::Local { .. });
-    });
-}
-
-#[gpui::test]
-async fn test_simple_request(cx: &mut TestAppContext) {
-    let (ep_store, mut requests) = init_test_with_fake_client(cx);
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/root",
-        json!({
-            "foo.md":  "Hello!\nHow\nBye\n"
-        }),
-    )
-    .await;
-    let project = Project::test(fs, vec![path!("/root").as_ref()], cx).await;
-
-    let buffer = project
-        .update(cx, |project, cx| {
-            let path = project.find_project_path(path!("root/foo.md"), cx).unwrap();
-            project.open_buffer(path, cx)
-        })
-        .await
-        .unwrap();
-    let snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot());
-    let position = snapshot.anchor_before(language::Point::new(1, 3));
-
-    let prediction_task = ep_store.update(cx, |ep_store, cx| {
-        ep_store.request_prediction(&project, &buffer, position, Default::default(), cx)
-    });
-
-    let (request, respond_tx) = requests.predict.next().await.unwrap();
-
-    // TODO Put back when we have a structured request again
-    // assert_eq!(
-    //     request.excerpt_path.as_ref(),
-    //     Path::new(path!("root/foo.md"))
-    // );
-    // assert_eq!(
-    //     request.cursor_point,
-    //     Point {
-    //         line: Line(1),
-    //         column: 3
-    //     }
-    // );
-
-    respond_tx
-        .send(model_response(
-            request,
-            indoc! { r"
-                --- a/root/foo.md
-                +++ b/root/foo.md
-                @@ ... @@
-                 Hello!
-                -How
-                +How are you?
-                 Bye
-            "},
-        ))
-        .unwrap();
-
-    let prediction = prediction_task.await.unwrap().unwrap().prediction.unwrap();
-
-    assert_eq!(prediction.edits.len(), 1);
-    assert_eq!(
-        prediction.edits[0].0.to_point(&snapshot).start,
-        language::Point::new(1, 3)
-    );
-    assert_eq!(prediction.edits[0].1.as_ref(), " are you?");
-}
-
-#[gpui::test]
-async fn test_request_events(cx: &mut TestAppContext) {
-    let (ep_store, mut requests) = init_test_with_fake_client(cx);
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/root",
-        json!({
-            "foo.md": "Hello!\n\nBye\n"
-        }),
-    )
-    .await;
-    let project = Project::test(fs, vec![path!("/root").as_ref()], cx).await;
-
-    let buffer = project
-        .update(cx, |project, cx| {
-            let path = project.find_project_path(path!("root/foo.md"), cx).unwrap();
-            project.open_buffer(path, cx)
-        })
-        .await
-        .unwrap();
-
-    ep_store.update(cx, |ep_store, cx| {
-        ep_store.register_buffer(&buffer, &project, cx);
-    });
-
-    buffer.update(cx, |buffer, cx| {
-        buffer.edit(vec![(7..7, "How")], None, cx);
-    });
-
-    let snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot());
-    let position = snapshot.anchor_before(language::Point::new(1, 3));
-
-    let prediction_task = ep_store.update(cx, |ep_store, cx| {
-        ep_store.request_prediction(&project, &buffer, position, Default::default(), cx)
-    });
-
-    let (request, respond_tx) = requests.predict.next().await.unwrap();
-
-    let prompt = prompt_from_request(&request);
-    assert!(
-        prompt.contains(indoc! {"
-        --- a/root/foo.md
-        +++ b/root/foo.md
-        @@ -1,3 +1,3 @@
-         Hello!
-        -
-        +How
-         Bye
-    "}),
-        "{prompt}"
-    );
-
-    respond_tx
-        .send(model_response(
-            request,
-            indoc! {r#"
-                --- a/root/foo.md
-                +++ b/root/foo.md
-                @@ ... @@
-                 Hello!
-                -How
-                +How are you?
-                 Bye
-        "#},
-        ))
-        .unwrap();
-
-    let prediction = prediction_task.await.unwrap().unwrap().prediction.unwrap();
-
-    assert_eq!(prediction.edits.len(), 1);
-    assert_eq!(
-        prediction.edits[0].0.to_point(&snapshot).start,
-        language::Point::new(1, 3)
-    );
-    assert_eq!(prediction.edits[0].1.as_ref(), " are you?");
-}
-
-#[gpui::test]
-async fn test_empty_prediction(cx: &mut TestAppContext) {
-    let (ep_store, mut requests) = init_test_with_fake_client(cx);
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/root",
-        json!({
-            "foo.md":  "Hello!\nHow\nBye\n"
-        }),
-    )
-    .await;
-    let project = Project::test(fs, vec![path!("/root").as_ref()], cx).await;
-
-    let buffer = project
-        .update(cx, |project, cx| {
-            let path = project.find_project_path(path!("root/foo.md"), cx).unwrap();
-            project.open_buffer(path, cx)
-        })
-        .await
-        .unwrap();
-    let snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot());
-    let position = snapshot.anchor_before(language::Point::new(1, 3));
-
-    ep_store.update(cx, |ep_store, cx| {
-        ep_store.refresh_prediction_from_buffer(project.clone(), buffer.clone(), position, cx);
-    });
-
-    let (request, respond_tx) = requests.predict.next().await.unwrap();
-    let response = model_response(request, "");
-    let id = response.id.clone();
-    respond_tx.send(response).unwrap();
-
-    cx.run_until_parked();
-
-    ep_store.update(cx, |ep_store, cx| {
-        assert!(
-            ep_store
-                .prediction_at(&buffer, None, &project, cx)
-                .is_none()
-        );
-    });
-
-    // prediction is reported as rejected
-    let (reject_request, _) = requests.reject.next().await.unwrap();
-
-    assert_eq!(
-        &reject_request.rejections,
-        &[EditPredictionRejection {
-            request_id: id,
-            reason: EditPredictionRejectReason::Empty,
-            was_shown: false
-        }]
-    );
-}
-
-#[gpui::test]
-async fn test_interpolated_empty(cx: &mut TestAppContext) {
-    let (ep_store, mut requests) = init_test_with_fake_client(cx);
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/root",
-        json!({
-            "foo.md":  "Hello!\nHow\nBye\n"
-        }),
-    )
-    .await;
-    let project = Project::test(fs, vec![path!("/root").as_ref()], cx).await;
-
-    let buffer = project
-        .update(cx, |project, cx| {
-            let path = project.find_project_path(path!("root/foo.md"), cx).unwrap();
-            project.open_buffer(path, cx)
-        })
-        .await
-        .unwrap();
-    let snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot());
-    let position = snapshot.anchor_before(language::Point::new(1, 3));
-
-    ep_store.update(cx, |ep_store, cx| {
-        ep_store.refresh_prediction_from_buffer(project.clone(), buffer.clone(), position, cx);
-    });
-
-    let (request, respond_tx) = requests.predict.next().await.unwrap();
-
-    buffer.update(cx, |buffer, cx| {
-        buffer.set_text("Hello!\nHow are you?\nBye", cx);
-    });
-
-    let response = model_response(request, SIMPLE_DIFF);
-    let id = response.id.clone();
-    respond_tx.send(response).unwrap();
-
-    cx.run_until_parked();
-
-    ep_store.update(cx, |ep_store, cx| {
-        assert!(
-            ep_store
-                .prediction_at(&buffer, None, &project, cx)
-                .is_none()
-        );
-    });
-
-    // prediction is reported as rejected
-    let (reject_request, _) = requests.reject.next().await.unwrap();
-
-    assert_eq!(
-        &reject_request.rejections,
-        &[EditPredictionRejection {
-            request_id: id,
-            reason: EditPredictionRejectReason::InterpolatedEmpty,
-            was_shown: false
-        }]
-    );
-}
-
-const SIMPLE_DIFF: &str = indoc! { r"
-    --- a/root/foo.md
-    +++ b/root/foo.md
-    @@ ... @@
-     Hello!
-    -How
-    +How are you?
-     Bye
-"};
-
-#[gpui::test]
-async fn test_replace_current(cx: &mut TestAppContext) {
-    let (ep_store, mut requests) = init_test_with_fake_client(cx);
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/root",
-        json!({
-            "foo.md":  "Hello!\nHow\nBye\n"
-        }),
-    )
-    .await;
-    let project = Project::test(fs, vec![path!("/root").as_ref()], cx).await;
-
-    let buffer = project
-        .update(cx, |project, cx| {
-            let path = project.find_project_path(path!("root/foo.md"), cx).unwrap();
-            project.open_buffer(path, cx)
-        })
-        .await
-        .unwrap();
-    let snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot());
-    let position = snapshot.anchor_before(language::Point::new(1, 3));
-
-    ep_store.update(cx, |ep_store, cx| {
-        ep_store.refresh_prediction_from_buffer(project.clone(), buffer.clone(), position, cx);
-    });
-
-    let (request, respond_tx) = requests.predict.next().await.unwrap();
-    let first_response = model_response(request, SIMPLE_DIFF);
-    let first_id = first_response.id.clone();
-    respond_tx.send(first_response).unwrap();
-
-    cx.run_until_parked();
-
-    ep_store.update(cx, |ep_store, cx| {
-        assert_eq!(
-            ep_store
-                .prediction_at(&buffer, None, &project, cx)
-                .unwrap()
-                .id
-                .0,
-            first_id
-        );
-    });
-
-    // a second request is triggered
-    ep_store.update(cx, |ep_store, cx| {
-        ep_store.refresh_prediction_from_buffer(project.clone(), buffer.clone(), position, cx);
-    });
-
-    let (request, respond_tx) = requests.predict.next().await.unwrap();
-    let second_response = model_response(request, SIMPLE_DIFF);
-    let second_id = second_response.id.clone();
-    respond_tx.send(second_response).unwrap();
-
-    cx.run_until_parked();
-
-    ep_store.update(cx, |ep_store, cx| {
-        // second replaces first
-        assert_eq!(
-            ep_store
-                .prediction_at(&buffer, None, &project, cx)
-                .unwrap()
-                .id
-                .0,
-            second_id
-        );
-    });
-
-    // first is reported as replaced
-    let (reject_request, _) = requests.reject.next().await.unwrap();
-
-    assert_eq!(
-        &reject_request.rejections,
-        &[EditPredictionRejection {
-            request_id: first_id,
-            reason: EditPredictionRejectReason::Replaced,
-            was_shown: false
-        }]
-    );
-}
-
-#[gpui::test]
-async fn test_current_preferred(cx: &mut TestAppContext) {
-    let (ep_store, mut requests) = init_test_with_fake_client(cx);
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/root",
-        json!({
-            "foo.md":  "Hello!\nHow\nBye\n"
-        }),
-    )
-    .await;
-    let project = Project::test(fs, vec![path!("/root").as_ref()], cx).await;
-
-    let buffer = project
-        .update(cx, |project, cx| {
-            let path = project.find_project_path(path!("root/foo.md"), cx).unwrap();
-            project.open_buffer(path, cx)
-        })
-        .await
-        .unwrap();
-    let snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot());
-    let position = snapshot.anchor_before(language::Point::new(1, 3));
-
-    ep_store.update(cx, |ep_store, cx| {
-        ep_store.refresh_prediction_from_buffer(project.clone(), buffer.clone(), position, cx);
-    });
-
-    let (request, respond_tx) = requests.predict.next().await.unwrap();
-    let first_response = model_response(request, SIMPLE_DIFF);
-    let first_id = first_response.id.clone();
-    respond_tx.send(first_response).unwrap();
-
-    cx.run_until_parked();
-
-    ep_store.update(cx, |ep_store, cx| {
-        assert_eq!(
-            ep_store
-                .prediction_at(&buffer, None, &project, cx)
-                .unwrap()
-                .id
-                .0,
-            first_id
-        );
-    });
-
-    // a second request is triggered
-    ep_store.update(cx, |ep_store, cx| {
-        ep_store.refresh_prediction_from_buffer(project.clone(), buffer.clone(), position, cx);
-    });
-
-    let (request, respond_tx) = requests.predict.next().await.unwrap();
-    // worse than current prediction
-    let second_response = model_response(
-        request,
-        indoc! { r"
-            --- a/root/foo.md
-            +++ b/root/foo.md
-            @@ ... @@
-             Hello!
-            -How
-            +How are
-             Bye
-        "},
-    );
-    let second_id = second_response.id.clone();
-    respond_tx.send(second_response).unwrap();
-
-    cx.run_until_parked();
-
-    ep_store.update(cx, |ep_store, cx| {
-        // first is preferred over second
-        assert_eq!(
-            ep_store
-                .prediction_at(&buffer, None, &project, cx)
-                .unwrap()
-                .id
-                .0,
-            first_id
-        );
-    });
-
-    // second is reported as rejected
-    let (reject_request, _) = requests.reject.next().await.unwrap();
-
-    assert_eq!(
-        &reject_request.rejections,
-        &[EditPredictionRejection {
-            request_id: second_id,
-            reason: EditPredictionRejectReason::CurrentPreferred,
-            was_shown: false
-        }]
-    );
-}
-
-#[gpui::test]
-async fn test_cancel_earlier_pending_requests(cx: &mut TestAppContext) {
-    let (ep_store, mut requests) = init_test_with_fake_client(cx);
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/root",
-        json!({
-            "foo.md":  "Hello!\nHow\nBye\n"
-        }),
-    )
-    .await;
-    let project = Project::test(fs, vec![path!("/root").as_ref()], cx).await;
-
-    let buffer = project
-        .update(cx, |project, cx| {
-            let path = project.find_project_path(path!("root/foo.md"), cx).unwrap();
-            project.open_buffer(path, cx)
-        })
-        .await
-        .unwrap();
-    let snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot());
-    let position = snapshot.anchor_before(language::Point::new(1, 3));
-
-    // start two refresh tasks
-    ep_store.update(cx, |ep_store, cx| {
-        ep_store.refresh_prediction_from_buffer(project.clone(), buffer.clone(), position, cx);
-    });
-
-    let (request1, respond_first) = requests.predict.next().await.unwrap();
-
-    ep_store.update(cx, |ep_store, cx| {
-        ep_store.refresh_prediction_from_buffer(project.clone(), buffer.clone(), position, cx);
-    });
-
-    let (request, respond_second) = requests.predict.next().await.unwrap();
-
-    // wait for throttle
-    cx.run_until_parked();
-
-    // second responds first
-    let second_response = model_response(request, SIMPLE_DIFF);
-    let second_id = second_response.id.clone();
-    respond_second.send(second_response).unwrap();
-
-    cx.run_until_parked();
-
-    ep_store.update(cx, |ep_store, cx| {
-        // current prediction is second
-        assert_eq!(
-            ep_store
-                .prediction_at(&buffer, None, &project, cx)
-                .unwrap()
-                .id
-                .0,
-            second_id
-        );
-    });
-
-    let first_response = model_response(request1, SIMPLE_DIFF);
-    let first_id = first_response.id.clone();
-    respond_first.send(first_response).unwrap();
-
-    cx.run_until_parked();
-
-    ep_store.update(cx, |ep_store, cx| {
-        // current prediction is still second, since first was cancelled
-        assert_eq!(
-            ep_store
-                .prediction_at(&buffer, None, &project, cx)
-                .unwrap()
-                .id
-                .0,
-            second_id
-        );
-    });
-
-    // first is reported as rejected
-    let (reject_request, _) = requests.reject.next().await.unwrap();
-
-    cx.run_until_parked();
-
-    assert_eq!(
-        &reject_request.rejections,
-        &[EditPredictionRejection {
-            request_id: first_id,
-            reason: EditPredictionRejectReason::Canceled,
-            was_shown: false
-        }]
-    );
-}
-
-#[gpui::test]
-async fn test_cancel_second_on_third_request(cx: &mut TestAppContext) {
-    let (ep_store, mut requests) = init_test_with_fake_client(cx);
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/root",
-        json!({
-            "foo.md":  "Hello!\nHow\nBye\n"
-        }),
-    )
-    .await;
-    let project = Project::test(fs, vec![path!("/root").as_ref()], cx).await;
-
-    let buffer = project
-        .update(cx, |project, cx| {
-            let path = project.find_project_path(path!("root/foo.md"), cx).unwrap();
-            project.open_buffer(path, cx)
-        })
-        .await
-        .unwrap();
-    let snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot());
-    let position = snapshot.anchor_before(language::Point::new(1, 3));
-
-    // start two refresh tasks
-    ep_store.update(cx, |ep_store, cx| {
-        ep_store.refresh_prediction_from_buffer(project.clone(), buffer.clone(), position, cx);
-    });
-
-    let (request1, respond_first) = requests.predict.next().await.unwrap();
-
-    ep_store.update(cx, |ep_store, cx| {
-        ep_store.refresh_prediction_from_buffer(project.clone(), buffer.clone(), position, cx);
-    });
-
-    let (request2, respond_second) = requests.predict.next().await.unwrap();
-
-    // wait for throttle, so requests are sent
-    cx.run_until_parked();
-
-    ep_store.update(cx, |ep_store, cx| {
-        // start a third request
-        ep_store.refresh_prediction_from_buffer(project.clone(), buffer.clone(), position, cx);
-
-        // 2 are pending, so 2nd is cancelled
-        assert_eq!(
-            ep_store
-                .get_or_init_project(&project, cx)
-                .cancelled_predictions
-                .iter()
-                .copied()
-                .collect::<Vec<_>>(),
-            [1]
-        );
-    });
-
-    // wait for throttle
-    cx.run_until_parked();
-
-    let (request3, respond_third) = requests.predict.next().await.unwrap();
-
-    let first_response = model_response(request1, SIMPLE_DIFF);
-    let first_id = first_response.id.clone();
-    respond_first.send(first_response).unwrap();
-
-    cx.run_until_parked();
-
-    ep_store.update(cx, |ep_store, cx| {
-        // current prediction is first
-        assert_eq!(
-            ep_store
-                .prediction_at(&buffer, None, &project, cx)
-                .unwrap()
-                .id
-                .0,
-            first_id
-        );
-    });
-
-    let cancelled_response = model_response(request2, SIMPLE_DIFF);
-    let cancelled_id = cancelled_response.id.clone();
-    respond_second.send(cancelled_response).unwrap();
-
-    cx.run_until_parked();
-
-    ep_store.update(cx, |ep_store, cx| {
-        // current prediction is still first, since second was cancelled
-        assert_eq!(
-            ep_store
-                .prediction_at(&buffer, None, &project, cx)
-                .unwrap()
-                .id
-                .0,
-            first_id
-        );
-    });
-
-    let third_response = model_response(request3, SIMPLE_DIFF);
-    let third_response_id = third_response.id.clone();
-    respond_third.send(third_response).unwrap();
-
-    cx.run_until_parked();
-
-    ep_store.update(cx, |ep_store, cx| {
-        // third completes and replaces first
-        assert_eq!(
-            ep_store
-                .prediction_at(&buffer, None, &project, cx)
-                .unwrap()
-                .id
-                .0,
-            third_response_id
-        );
-    });
-
-    // second is reported as rejected
-    let (reject_request, _) = requests.reject.next().await.unwrap();
-
-    cx.run_until_parked();
-
-    assert_eq!(
-        &reject_request.rejections,
-        &[
-            EditPredictionRejection {
-                request_id: cancelled_id,
-                reason: EditPredictionRejectReason::Canceled,
-                was_shown: false
-            },
-            EditPredictionRejection {
-                request_id: first_id,
-                reason: EditPredictionRejectReason::Replaced,
-                was_shown: false
-            }
-        ]
-    );
-}
-
-#[gpui::test]
-async fn test_rejections_flushing(cx: &mut TestAppContext) {
-    let (ep_store, mut requests) = init_test_with_fake_client(cx);
-
-    ep_store.update(cx, |ep_store, _cx| {
-        ep_store.reject_prediction(
-            EditPredictionId("test-1".into()),
-            EditPredictionRejectReason::Discarded,
-            false,
-        );
-        ep_store.reject_prediction(
-            EditPredictionId("test-2".into()),
-            EditPredictionRejectReason::Canceled,
-            true,
-        );
-    });
-
-    cx.executor().advance_clock(REJECT_REQUEST_DEBOUNCE);
-    cx.run_until_parked();
-
-    let (reject_request, respond_tx) = requests.reject.next().await.unwrap();
-    respond_tx.send(()).unwrap();
-
-    // batched
-    assert_eq!(reject_request.rejections.len(), 2);
-    assert_eq!(
-        reject_request.rejections[0],
-        EditPredictionRejection {
-            request_id: "test-1".to_string(),
-            reason: EditPredictionRejectReason::Discarded,
-            was_shown: false
-        }
-    );
-    assert_eq!(
-        reject_request.rejections[1],
-        EditPredictionRejection {
-            request_id: "test-2".to_string(),
-            reason: EditPredictionRejectReason::Canceled,
-            was_shown: true
-        }
-    );
-
-    // Reaching batch size limit sends without debounce
-    ep_store.update(cx, |ep_store, _cx| {
-        for i in 0..70 {
-            ep_store.reject_prediction(
-                EditPredictionId(format!("batch-{}", i).into()),
-                EditPredictionRejectReason::Discarded,
-                false,
-            );
-        }
-    });
-
-    // First MAX/2 items are sent immediately
-    cx.run_until_parked();
-    let (reject_request, respond_tx) = requests.reject.next().await.unwrap();
-    respond_tx.send(()).unwrap();
-
-    assert_eq!(reject_request.rejections.len(), 50);
-    assert_eq!(reject_request.rejections[0].request_id, "batch-0");
-    assert_eq!(reject_request.rejections[49].request_id, "batch-49");
-
-    // Remaining items are debounced with the next batch
-    cx.executor().advance_clock(Duration::from_secs(15));
-    cx.run_until_parked();
-
-    let (reject_request, respond_tx) = requests.reject.next().await.unwrap();
-    respond_tx.send(()).unwrap();
-
-    assert_eq!(reject_request.rejections.len(), 20);
-    assert_eq!(reject_request.rejections[0].request_id, "batch-50");
-    assert_eq!(reject_request.rejections[19].request_id, "batch-69");
-
-    // Request failure
-    ep_store.update(cx, |ep_store, _cx| {
-        ep_store.reject_prediction(
-            EditPredictionId("retry-1".into()),
-            EditPredictionRejectReason::Discarded,
-            false,
-        );
-    });
-
-    cx.executor().advance_clock(REJECT_REQUEST_DEBOUNCE);
-    cx.run_until_parked();
-
-    let (reject_request, _respond_tx) = requests.reject.next().await.unwrap();
-    assert_eq!(reject_request.rejections.len(), 1);
-    assert_eq!(reject_request.rejections[0].request_id, "retry-1");
-    // Simulate failure
-    drop(_respond_tx);
-
-    // Add another rejection
-    ep_store.update(cx, |ep_store, _cx| {
-        ep_store.reject_prediction(
-            EditPredictionId("retry-2".into()),
-            EditPredictionRejectReason::Discarded,
-            false,
-        );
-    });
-
-    cx.executor().advance_clock(REJECT_REQUEST_DEBOUNCE);
-    cx.run_until_parked();
-
-    // Retry should include both the failed item and the new one
-    let (reject_request, respond_tx) = requests.reject.next().await.unwrap();
-    respond_tx.send(()).unwrap();
-
-    assert_eq!(reject_request.rejections.len(), 2);
-    assert_eq!(reject_request.rejections[0].request_id, "retry-1");
-    assert_eq!(reject_request.rejections[1].request_id, "retry-2");
-}
-
-// Skipped until we start including diagnostics in prompt
-// #[gpui::test]
-// async fn test_request_diagnostics(cx: &mut TestAppContext) {
-//     let (ep_store, mut req_rx) = init_test_with_fake_client(cx);
-//     let fs = FakeFs::new(cx.executor());
-//     fs.insert_tree(
-//         "/root",
-//         json!({
-//             "foo.md": "Hello!\nBye"
-//         }),
-//     )
-//     .await;
-//     let project = Project::test(fs, vec![path!("/root").as_ref()], cx).await;
-
-//     let path_to_buffer_uri = lsp::Uri::from_file_path(path!("/root/foo.md")).unwrap();
-//     let diagnostic = lsp::Diagnostic {
-//         range: lsp::Range::new(lsp::Position::new(1, 1), lsp::Position::new(1, 5)),
-//         severity: Some(lsp::DiagnosticSeverity::ERROR),
-//         message: "\"Hello\" deprecated. Use \"Hi\" instead".to_string(),
-//         ..Default::default()
-//     };
-
-//     project.update(cx, |project, cx| {
-//         project.lsp_store().update(cx, |lsp_store, cx| {
-//             // Create some diagnostics
-//             lsp_store
-//                 .update_diagnostics(
-//                     LanguageServerId(0),
-//                     lsp::PublishDiagnosticsParams {
-//                         uri: path_to_buffer_uri.clone(),
-//                         diagnostics: vec![diagnostic],
-//                         version: None,
-//                     },
-//                     None,
-//                     language::DiagnosticSourceKind::Pushed,
-//                     &[],
-//                     cx,
-//                 )
-//                 .unwrap();
-//         });
-//     });
-
-//     let buffer = project
-//         .update(cx, |project, cx| {
-//             let path = project.find_project_path(path!("root/foo.md"), cx).unwrap();
-//             project.open_buffer(path, cx)
-//         })
-//         .await
-//         .unwrap();
-
-//     let snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot());
-//     let position = snapshot.anchor_before(language::Point::new(0, 0));
-
-//     let _prediction_task = ep_store.update(cx, |ep_store, cx| {
-//         ep_store.request_prediction(&project, &buffer, position, cx)
-//     });
-
-//     let (request, _respond_tx) = req_rx.next().await.unwrap();
-
-//     assert_eq!(request.diagnostic_groups.len(), 1);
-//     let value = serde_json::from_str::<serde_json::Value>(request.diagnostic_groups[0].0.get())
-//         .unwrap();
-//     // We probably don't need all of this. TODO define a specific diagnostic type in predict_edits_v3
-//     assert_eq!(
-//         value,
-//         json!({
-//             "entries": [{
-//                 "range": {
-//                     "start": 8,
-//                     "end": 10
-//                 },
-//                 "diagnostic": {
-//                     "source": null,
-//                     "code": null,
-//                     "code_description": null,
-//                     "severity": 1,
-//                     "message": "\"Hello\" deprecated. Use \"Hi\" instead",
-//                     "markdown": null,
-//                     "group_id": 0,
-//                     "is_primary": true,
-//                     "is_disk_based": false,
-//                     "is_unnecessary": false,
-//                     "source_kind": "Pushed",
-//                     "data": null,
-//                     "underline": true
-//                 }
-//             }],
-//             "primary_ix": 0
-//         })
-//     );
-// }
-
-// Generate a model response that would apply the given diff to the active file.
-fn model_response(request: open_ai::Request, diff_to_apply: &str) -> open_ai::Response {
-    let prompt = match &request.messages[0] {
-        open_ai::RequestMessage::User {
-            content: open_ai::MessageContent::Plain(content),
-        } => content,
-        _ => panic!("unexpected request {request:?}"),
-    };
-
-    let open = "<editable_region>\n";
-    let close = "</editable_region>";
-    let cursor = "<|user_cursor|>";
-
-    let start_ix = open.len() + prompt.find(open).unwrap();
-    let end_ix = start_ix + &prompt[start_ix..].find(close).unwrap();
-    let excerpt = prompt[start_ix..end_ix].replace(cursor, "");
-    let new_excerpt = apply_diff_to_string(diff_to_apply, &excerpt).unwrap();
-
-    open_ai::Response {
-        id: Uuid::new_v4().to_string(),
-        object: "response".into(),
-        created: 0,
-        model: "model".into(),
-        choices: vec![open_ai::Choice {
-            index: 0,
-            message: open_ai::RequestMessage::Assistant {
-                content: Some(open_ai::MessageContent::Plain(new_excerpt)),
-                tool_calls: vec![],
-            },
-            finish_reason: None,
-        }],
-        usage: Usage {
-            prompt_tokens: 0,
-            completion_tokens: 0,
-            total_tokens: 0,
-        },
-    }
-}
-
-fn prompt_from_request(request: &open_ai::Request) -> &str {
-    assert_eq!(request.messages.len(), 1);
-    let open_ai::RequestMessage::User {
-        content: open_ai::MessageContent::Plain(content),
-        ..
-    } = &request.messages[0]
-    else {
-        panic!(
-            "Request does not have single user message of type Plain. {:#?}",
-            request
-        );
-    };
-    content
-}
-
-struct RequestChannels {
-    predict: mpsc::UnboundedReceiver<(open_ai::Request, oneshot::Sender<open_ai::Response>)>,
-    reject: mpsc::UnboundedReceiver<(RejectEditPredictionsBody, oneshot::Sender<()>)>,
-}
-
-fn init_test_with_fake_client(
-    cx: &mut TestAppContext,
-) -> (Entity<EditPredictionStore>, RequestChannels) {
-    cx.update(move |cx| {
-        let settings_store = SettingsStore::test(cx);
-        cx.set_global(settings_store);
-        zlog::init_test();
-
-        let (predict_req_tx, predict_req_rx) = mpsc::unbounded();
-        let (reject_req_tx, reject_req_rx) = mpsc::unbounded();
-
-        let http_client = FakeHttpClient::create({
-            move |req| {
-                let uri = req.uri().path().to_string();
-                let mut body = req.into_body();
-                let predict_req_tx = predict_req_tx.clone();
-                let reject_req_tx = reject_req_tx.clone();
-                async move {
-                    let resp = match uri.as_str() {
-                        "/client/llm_tokens" => serde_json::to_string(&json!({
-                            "token": "test"
-                        }))
-                        .unwrap(),
-                        "/predict_edits/raw" => {
-                            let mut buf = Vec::new();
-                            body.read_to_end(&mut buf).await.ok();
-                            let req = serde_json::from_slice(&buf).unwrap();
-
-                            let (res_tx, res_rx) = oneshot::channel();
-                            predict_req_tx.unbounded_send((req, res_tx)).unwrap();
-                            serde_json::to_string(&res_rx.await?).unwrap()
-                        }
-                        "/predict_edits/reject" => {
-                            let mut buf = Vec::new();
-                            body.read_to_end(&mut buf).await.ok();
-                            let req = serde_json::from_slice(&buf).unwrap();
-
-                            let (res_tx, res_rx) = oneshot::channel();
-                            reject_req_tx.unbounded_send((req, res_tx)).unwrap();
-                            serde_json::to_string(&res_rx.await?).unwrap()
-                        }
-                        _ => {
-                            panic!("Unexpected path: {}", uri)
-                        }
-                    };
-
-                    Ok(Response::builder().body(resp.into()).unwrap())
-                }
-            }
-        });
-
-        let client = client::Client::new(Arc::new(FakeSystemClock::new()), http_client, cx);
-        client.cloud_client().set_credentials(1, "test".into());
-
-        language_model::init(client.clone(), cx);
-
-        let user_store = cx.new(|cx| UserStore::new(client.clone(), cx));
-        let ep_store = EditPredictionStore::global(&client, &user_store, cx);
-
-        (
-            ep_store,
-            RequestChannels {
-                predict: predict_req_rx,
-                reject: reject_req_rx,
-            },
-        )
-    })
-}
-
-const BSD_0_TXT: &str = include_str!("../license_examples/0bsd.txt");
-
-#[gpui::test]
-async fn test_edit_prediction_basic_interpolation(cx: &mut TestAppContext) {
-    let buffer = cx.new(|cx| Buffer::local("Lorem ipsum dolor", cx));
-    let edits: Arc<[(Range<Anchor>, Arc<str>)]> = cx.update(|cx| {
-        to_completion_edits([(2..5, "REM".into()), (9..11, "".into())], &buffer, cx).into()
-    });
-
-    let edit_preview = cx
-        .read(|cx| buffer.read(cx).preview_edits(edits.clone(), cx))
-        .await;
-
-    let prediction = EditPrediction {
-        edits,
-        edit_preview,
-        buffer: buffer.clone(),
-        snapshot: cx.read(|cx| buffer.read(cx).snapshot()),
-        id: EditPredictionId("the-id".into()),
-        inputs: ZetaPromptInput {
-            events: Default::default(),
-            related_files: Default::default(),
-            cursor_path: Path::new("").into(),
-            cursor_excerpt: "".into(),
-            editable_range_in_excerpt: 0..0,
-            cursor_offset_in_excerpt: 0,
-        },
-        buffer_snapshotted_at: Instant::now(),
-        response_received_at: Instant::now(),
-    };
-
-    cx.update(|cx| {
-        assert_eq!(
-            from_completion_edits(
-                &prediction.interpolate(&buffer.read(cx).snapshot()).unwrap(),
-                &buffer,
-                cx
-            ),
-            vec![(2..5, "REM".into()), (9..11, "".into())]
-        );
-
-        buffer.update(cx, |buffer, cx| buffer.edit([(2..5, "")], None, cx));
-        assert_eq!(
-            from_completion_edits(
-                &prediction.interpolate(&buffer.read(cx).snapshot()).unwrap(),
-                &buffer,
-                cx
-            ),
-            vec![(2..2, "REM".into()), (6..8, "".into())]
-        );
-
-        buffer.update(cx, |buffer, cx| buffer.undo(cx));
-        assert_eq!(
-            from_completion_edits(
-                &prediction.interpolate(&buffer.read(cx).snapshot()).unwrap(),
-                &buffer,
-                cx
-            ),
-            vec![(2..5, "REM".into()), (9..11, "".into())]
-        );
-
-        buffer.update(cx, |buffer, cx| buffer.edit([(2..5, "R")], None, cx));
-        assert_eq!(
-            from_completion_edits(
-                &prediction.interpolate(&buffer.read(cx).snapshot()).unwrap(),
-                &buffer,
-                cx
-            ),
-            vec![(3..3, "EM".into()), (7..9, "".into())]
-        );
-
-        buffer.update(cx, |buffer, cx| buffer.edit([(3..3, "E")], None, cx));
-        assert_eq!(
-            from_completion_edits(
-                &prediction.interpolate(&buffer.read(cx).snapshot()).unwrap(),
-                &buffer,
-                cx
-            ),
-            vec![(4..4, "M".into()), (8..10, "".into())]
-        );
-
-        buffer.update(cx, |buffer, cx| buffer.edit([(4..4, "M")], None, cx));
-        assert_eq!(
-            from_completion_edits(
-                &prediction.interpolate(&buffer.read(cx).snapshot()).unwrap(),
-                &buffer,
-                cx
-            ),
-            vec![(9..11, "".into())]
-        );
-
-        buffer.update(cx, |buffer, cx| buffer.edit([(4..5, "")], None, cx));
-        assert_eq!(
-            from_completion_edits(
-                &prediction.interpolate(&buffer.read(cx).snapshot()).unwrap(),
-                &buffer,
-                cx
-            ),
-            vec![(4..4, "M".into()), (8..10, "".into())]
-        );
-
-        buffer.update(cx, |buffer, cx| buffer.edit([(8..10, "")], None, cx));
-        assert_eq!(
-            from_completion_edits(
-                &prediction.interpolate(&buffer.read(cx).snapshot()).unwrap(),
-                &buffer,
-                cx
-            ),
-            vec![(4..4, "M".into())]
-        );
-
-        buffer.update(cx, |buffer, cx| buffer.edit([(4..6, "")], None, cx));
-        assert_eq!(prediction.interpolate(&buffer.read(cx).snapshot()), None);
-    })
-}
-
-#[gpui::test]
-async fn test_clean_up_diff(cx: &mut TestAppContext) {
-    init_test(cx);
-
-    assert_eq!(
-        apply_edit_prediction(
-            indoc! {"
-                    fn main() {
-                        let word_1 = \"lorem\";
-                        let range = word.len()..word.len();
-                    }
-                "},
-            indoc! {"
-                    <|editable_region_start|>
-                    fn main() {
-                        let word_1 = \"lorem\";
-                        let range = word_1.len()..word_1.len();
-                    }
-
-                    <|editable_region_end|>
-                "},
-            cx,
-        )
-        .await,
-        indoc! {"
-                fn main() {
-                    let word_1 = \"lorem\";
-                    let range = word_1.len()..word_1.len();
-                }
-            "},
-    );
-
-    assert_eq!(
-        apply_edit_prediction(
-            indoc! {"
-                    fn main() {
-                        let story = \"the quick\"
-                    }
-                "},
-            indoc! {"
-                    <|editable_region_start|>
-                    fn main() {
-                        let story = \"the quick brown fox jumps over the lazy dog\";
-                    }
-
-                    <|editable_region_end|>
-                "},
-            cx,
-        )
-        .await,
-        indoc! {"
-                fn main() {
-                    let story = \"the quick brown fox jumps over the lazy dog\";
-                }
-            "},
-    );
-}
-
-#[gpui::test]
-async fn test_edit_prediction_end_of_buffer(cx: &mut TestAppContext) {
-    init_test(cx);
-
-    let buffer_content = "lorem\n";
-    let completion_response = indoc! {"
-            ```animals.js
-            <|start_of_file|>
-            <|editable_region_start|>
-            lorem
-            ipsum
-            <|editable_region_end|>
-            ```"};
-
-    assert_eq!(
-        apply_edit_prediction(buffer_content, completion_response, cx).await,
-        "lorem\nipsum"
-    );
-}
-
-#[gpui::test]
-async fn test_can_collect_data(cx: &mut TestAppContext) {
-    init_test(cx);
-
-    let fs = project::FakeFs::new(cx.executor());
-    fs.insert_tree(path!("/project"), json!({ "LICENSE": BSD_0_TXT }))
-        .await;
-
-    let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer(path!("/project/src/main.rs"), cx)
-        })
-        .await
-        .unwrap();
-
-    let (ep_store, captured_request, _) = make_test_ep_store(&project, cx).await;
-    ep_store.update(cx, |ep_store, _cx| {
-        ep_store.data_collection_choice = DataCollectionChoice::Enabled
-    });
-
-    run_edit_prediction(&buffer, &project, &ep_store, cx).await;
-    assert_eq!(
-        captured_request.lock().clone().unwrap().can_collect_data,
-        true
-    );
-
-    ep_store.update(cx, |ep_store, _cx| {
-        ep_store.data_collection_choice = DataCollectionChoice::Disabled
-    });
-
-    run_edit_prediction(&buffer, &project, &ep_store, cx).await;
-    assert_eq!(
-        captured_request.lock().clone().unwrap().can_collect_data,
-        false
-    );
-}
-
-#[gpui::test]
-async fn test_no_data_collection_for_remote_file(cx: &mut TestAppContext) {
-    init_test(cx);
-
-    let fs = project::FakeFs::new(cx.executor());
-    let project = Project::test(fs.clone(), [], cx).await;
-
-    let buffer = cx.new(|_cx| {
-        Buffer::remote(
-            language::BufferId::new(1).unwrap(),
-            ReplicaId::new(1),
-            language::Capability::ReadWrite,
-            "fn main() {\n    println!(\"Hello\");\n}",
-        )
-    });
-
-    let (ep_store, captured_request, _) = make_test_ep_store(&project, cx).await;
-    ep_store.update(cx, |ep_store, _cx| {
-        ep_store.data_collection_choice = DataCollectionChoice::Enabled
-    });
-
-    run_edit_prediction(&buffer, &project, &ep_store, cx).await;
-    assert_eq!(
-        captured_request.lock().clone().unwrap().can_collect_data,
-        false
-    );
-}
-
-#[gpui::test]
-async fn test_no_data_collection_for_private_file(cx: &mut TestAppContext) {
-    init_test(cx);
-
-    let fs = project::FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/project"),
-        json!({
-            "LICENSE": BSD_0_TXT,
-            ".env": "SECRET_KEY=secret"
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer("/project/.env", cx)
-        })
-        .await
-        .unwrap();
-
-    let (ep_store, captured_request, _) = make_test_ep_store(&project, cx).await;
-    ep_store.update(cx, |ep_store, _cx| {
-        ep_store.data_collection_choice = DataCollectionChoice::Enabled
-    });
-
-    run_edit_prediction(&buffer, &project, &ep_store, cx).await;
-    assert_eq!(
-        captured_request.lock().clone().unwrap().can_collect_data,
-        false
-    );
-}
-
-#[gpui::test]
-async fn test_no_data_collection_for_untitled_buffer(cx: &mut TestAppContext) {
-    init_test(cx);
-
-    let fs = project::FakeFs::new(cx.executor());
-    let project = Project::test(fs.clone(), [], cx).await;
-    let buffer = cx.new(|cx| Buffer::local("", cx));
-
-    let (ep_store, captured_request, _) = make_test_ep_store(&project, cx).await;
-    ep_store.update(cx, |ep_store, _cx| {
-        ep_store.data_collection_choice = DataCollectionChoice::Enabled
-    });
-
-    run_edit_prediction(&buffer, &project, &ep_store, cx).await;
-    assert_eq!(
-        captured_request.lock().clone().unwrap().can_collect_data,
-        false
-    );
-}
-
-#[gpui::test]
-async fn test_no_data_collection_when_closed_source(cx: &mut TestAppContext) {
-    init_test(cx);
-
-    let fs = project::FakeFs::new(cx.executor());
-    fs.insert_tree(path!("/project"), json!({ "main.rs": "fn main() {}" }))
-        .await;
-
-    let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer("/project/main.rs", cx)
-        })
-        .await
-        .unwrap();
-
-    let (ep_store, captured_request, _) = make_test_ep_store(&project, cx).await;
-    ep_store.update(cx, |ep_store, _cx| {
-        ep_store.data_collection_choice = DataCollectionChoice::Enabled
-    });
-
-    run_edit_prediction(&buffer, &project, &ep_store, cx).await;
-    assert_eq!(
-        captured_request.lock().clone().unwrap().can_collect_data,
-        false
-    );
-}
-
-#[gpui::test]
-async fn test_data_collection_status_changes_on_move(cx: &mut TestAppContext) {
-    init_test(cx);
-
-    let fs = project::FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/open_source_worktree"),
-        json!({ "LICENSE": BSD_0_TXT, "main.rs": "" }),
-    )
-    .await;
-    fs.insert_tree(path!("/closed_source_worktree"), json!({ "main.rs": "" }))
-        .await;
-
-    let project = Project::test(
-        fs.clone(),
-        [
-            path!("/open_source_worktree").as_ref(),
-            path!("/closed_source_worktree").as_ref(),
-        ],
-        cx,
-    )
-    .await;
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer(path!("/open_source_worktree/main.rs"), cx)
-        })
-        .await
-        .unwrap();
-
-    let (ep_store, captured_request, _) = make_test_ep_store(&project, cx).await;
-    ep_store.update(cx, |ep_store, _cx| {
-        ep_store.data_collection_choice = DataCollectionChoice::Enabled
-    });
-
-    run_edit_prediction(&buffer, &project, &ep_store, cx).await;
-    assert_eq!(
-        captured_request.lock().clone().unwrap().can_collect_data,
-        true
-    );
-
-    let closed_source_file = project
-        .update(cx, |project, cx| {
-            let worktree2 = project
-                .worktree_for_root_name("closed_source_worktree", cx)
-                .unwrap();
-            worktree2.update(cx, |worktree2, cx| {
-                worktree2.load_file(rel_path("main.rs"), cx)
-            })
-        })
-        .await
-        .unwrap()
-        .file;
-
-    buffer.update(cx, |buffer, cx| {
-        buffer.file_updated(closed_source_file, cx);
-    });
-
-    run_edit_prediction(&buffer, &project, &ep_store, cx).await;
-    assert_eq!(
-        captured_request.lock().clone().unwrap().can_collect_data,
-        false
-    );
-}
-
-#[gpui::test]
-async fn test_no_data_collection_for_events_in_uncollectable_buffers(cx: &mut TestAppContext) {
-    init_test(cx);
-
-    let fs = project::FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/worktree1"),
-        json!({ "LICENSE": BSD_0_TXT, "main.rs": "", "other.rs": "" }),
-    )
-    .await;
-    fs.insert_tree(path!("/worktree2"), json!({ "private.rs": "" }))
-        .await;
-
-    let project = Project::test(
-        fs.clone(),
-        [path!("/worktree1").as_ref(), path!("/worktree2").as_ref()],
-        cx,
-    )
-    .await;
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer(path!("/worktree1/main.rs"), cx)
-        })
-        .await
-        .unwrap();
-    let private_buffer = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer(path!("/worktree2/file.rs"), cx)
-        })
-        .await
-        .unwrap();
-
-    let (ep_store, captured_request, _) = make_test_ep_store(&project, cx).await;
-    ep_store.update(cx, |ep_store, _cx| {
-        ep_store.data_collection_choice = DataCollectionChoice::Enabled
-    });
-
-    run_edit_prediction(&buffer, &project, &ep_store, cx).await;
-    assert_eq!(
-        captured_request.lock().clone().unwrap().can_collect_data,
-        true
-    );
-
-    // this has a side effect of registering the buffer to watch for edits
-    run_edit_prediction(&private_buffer, &project, &ep_store, cx).await;
-    assert_eq!(
-        captured_request.lock().clone().unwrap().can_collect_data,
-        false
-    );
-
-    private_buffer.update(cx, |private_buffer, cx| {
-        private_buffer.edit([(0..0, "An edit for the history!")], None, cx);
-    });
-
-    run_edit_prediction(&buffer, &project, &ep_store, cx).await;
-    assert_eq!(
-        captured_request.lock().clone().unwrap().can_collect_data,
-        false
-    );
-
-    // make an edit that uses too many bytes, causing private_buffer edit to not be able to be
-    // included
-    buffer.update(cx, |buffer, cx| {
-        buffer.edit(
-            [(
-                0..0,
-                " ".repeat(MAX_EVENT_TOKENS * cursor_excerpt::BYTES_PER_TOKEN_GUESS),
-            )],
-            None,
-            cx,
-        );
-    });
-
-    run_edit_prediction(&buffer, &project, &ep_store, cx).await;
-    assert_eq!(
-        captured_request.lock().clone().unwrap().can_collect_data,
-        true
-    );
-}
-
-fn init_test(cx: &mut TestAppContext) {
-    cx.update(|cx| {
-        let settings_store = SettingsStore::test(cx);
-        cx.set_global(settings_store);
-    });
-}
-
-async fn apply_edit_prediction(
-    buffer_content: &str,
-    completion_response: &str,
-    cx: &mut TestAppContext,
-) -> String {
-    let fs = project::FakeFs::new(cx.executor());
-    let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
-    let buffer = cx.new(|cx| Buffer::local(buffer_content, cx));
-    let (ep_store, _, response) = make_test_ep_store(&project, cx).await;
-    *response.lock() = completion_response.to_string();
-    let edit_prediction = run_edit_prediction(&buffer, &project, &ep_store, cx).await;
-    buffer.update(cx, |buffer, cx| {
-        buffer.edit(edit_prediction.edits.iter().cloned(), None, cx)
-    });
-    buffer.read_with(cx, |buffer, _| buffer.text())
-}
-
-async fn run_edit_prediction(
-    buffer: &Entity<Buffer>,
-    project: &Entity<Project>,
-    ep_store: &Entity<EditPredictionStore>,
-    cx: &mut TestAppContext,
-) -> EditPrediction {
-    let cursor = buffer.read_with(cx, |buffer, _| buffer.anchor_before(Point::new(1, 0)));
-    ep_store.update(cx, |ep_store, cx| {
-        ep_store.register_buffer(buffer, &project, cx)
-    });
-    cx.background_executor.run_until_parked();
-    let prediction_task = ep_store.update(cx, |ep_store, cx| {
-        ep_store.request_prediction(&project, buffer, cursor, Default::default(), cx)
-    });
-    prediction_task.await.unwrap().unwrap().prediction.unwrap()
-}
-
-async fn make_test_ep_store(
-    project: &Entity<Project>,
-    cx: &mut TestAppContext,
-) -> (
-    Entity<EditPredictionStore>,
-    Arc<Mutex<Option<PredictEditsBody>>>,
-    Arc<Mutex<String>>,
-) {
-    let default_response = indoc! {"
-            ```main.rs
-            <|start_of_file|>
-            <|editable_region_start|>
-            hello world
-            <|editable_region_end|>
-            ```"
-    };
-    let captured_request: Arc<Mutex<Option<PredictEditsBody>>> = Arc::new(Mutex::new(None));
-    let completion_response: Arc<Mutex<String>> =
-        Arc::new(Mutex::new(default_response.to_string()));
-    let http_client = FakeHttpClient::create({
-        let captured_request = captured_request.clone();
-        let completion_response = completion_response.clone();
-        let mut next_request_id = 0;
-        move |req| {
-            let captured_request = captured_request.clone();
-            let completion_response = completion_response.clone();
-            async move {
-                match (req.method(), req.uri().path()) {
-                    (&Method::POST, "/client/llm_tokens") => Ok(http_client::Response::builder()
-                        .status(200)
-                        .body(
-                            serde_json::to_string(&CreateLlmTokenResponse {
-                                token: LlmToken("the-llm-token".to_string()),
-                            })
-                            .unwrap()
-                            .into(),
-                        )
-                        .unwrap()),
-                    (&Method::POST, "/predict_edits/v2") => {
-                        let mut request_body = String::new();
-                        req.into_body().read_to_string(&mut request_body).await?;
-                        *captured_request.lock() =
-                            Some(serde_json::from_str(&request_body).unwrap());
-                        next_request_id += 1;
-                        Ok(http_client::Response::builder()
-                            .status(200)
-                            .body(
-                                serde_json::to_string(&PredictEditsResponse {
-                                    request_id: format!("request-{next_request_id}"),
-                                    output_excerpt: completion_response.lock().clone(),
-                                })
-                                .unwrap()
-                                .into(),
-                            )
-                            .unwrap())
-                    }
-                    _ => Ok(http_client::Response::builder()
-                        .status(404)
-                        .body("Not Found".into())
-                        .unwrap()),
-                }
-            }
-        }
-    });
-
-    let client = cx.update(|cx| Client::new(Arc::new(FakeSystemClock::new()), http_client, cx));
-    cx.update(|cx| {
-        RefreshLlmTokenListener::register(client.clone(), cx);
-    });
-    let _server = FakeServer::for_client(42, &client, cx).await;
-
-    let ep_store = cx.new(|cx| {
-        let mut ep_store = EditPredictionStore::new(client, project.read(cx).user_store(), cx);
-        ep_store.set_edit_prediction_model(EditPredictionModel::Zeta1);
-
-        let worktrees = project.read(cx).worktrees(cx).collect::<Vec<_>>();
-        for worktree in worktrees {
-            let worktree_id = worktree.read(cx).id();
-            ep_store
-                .get_or_init_project(project, cx)
-                .license_detection_watchers
-                .entry(worktree_id)
-                .or_insert_with(|| Rc::new(LicenseDetectionWatcher::new(&worktree, cx)));
-        }
-
-        ep_store
-    });
-
-    (ep_store, captured_request, completion_response)
-}
-
-fn to_completion_edits(
-    iterator: impl IntoIterator<Item = (Range<usize>, Arc<str>)>,
-    buffer: &Entity<Buffer>,
-    cx: &App,
-) -> Vec<(Range<Anchor>, Arc<str>)> {
-    let buffer = buffer.read(cx);
-    iterator
-        .into_iter()
-        .map(|(range, text)| {
-            (
-                buffer.anchor_after(range.start)..buffer.anchor_before(range.end),
-                text,
-            )
-        })
-        .collect()
-}
-
-fn from_completion_edits(
-    editor_edits: &[(Range<Anchor>, Arc<str>)],
-    buffer: &Entity<Buffer>,
-    cx: &App,
-) -> Vec<(Range<usize>, Arc<str>)> {
-    let buffer = buffer.read(cx);
-    editor_edits
-        .iter()
-        .map(|(range, text)| {
-            (
-                range.start.to_offset(buffer)..range.end.to_offset(buffer),
-                text.clone(),
-            )
-        })
-        .collect()
-}
-
-#[ctor::ctor]
-fn init_logger() {
-    zlog::init_test();
-}
diff --git a/crates/edit_prediction/src/license_detection.rs b/crates/edit_prediction/src/license_detection.rs
deleted file mode 100644
index 3ad34e7e6d..0000000000
--- a/crates/edit_prediction/src/license_detection.rs
+++ /dev/null
@@ -1,846 +0,0 @@
-use std::{
-    collections::BTreeSet,
-    fmt::{Display, Formatter},
-    ops::Range,
-    path::PathBuf,
-    sync::{Arc, LazyLock},
-};
-
-use anyhow::{Result, anyhow};
-use fs::Fs;
-use futures::StreamExt as _;
-use gpui::{App, AppContext as _, Entity, Subscription, Task};
-use itertools::Itertools;
-use postage::watch;
-use project::Worktree;
-use strum::VariantArray;
-use util::{ResultExt as _, maybe, rel_path::RelPath};
-use worktree::ChildEntriesOptions;
-
-/// Matches the most common license locations, with US and UK English spelling.
-static LICENSE_FILE_NAME_REGEX: LazyLock<regex::bytes::Regex> = LazyLock::new(|| {
-    regex::bytes::RegexBuilder::new(
-        "^ \
-        (?: license | licence)? \
-        (?: [\\-._]? \
-            (?: apache (?: [\\-._] (?: 2.0 | 2 ))? | \
-                0? bsd (?: [\\-._] [0123])? (?: [\\-._] clause)? | \
-                isc | \
-                mit | \
-                upl | \
-                zlib))? \
-        (?: [\\-._]? (?: license | licence))? \
-        (?: \\.txt | \\.md)? \
-        $",
-    )
-    .ignore_whitespace(true)
-    .case_insensitive(true)
-    .build()
-    .unwrap()
-});
-
-#[derive(Debug, Clone, Copy, Eq, Ord, PartialOrd, PartialEq, VariantArray)]
-pub enum OpenSourceLicense {
-    Apache2_0,
-    BSDZero,
-    BSD,
-    ISC,
-    MIT,
-    UPL1_0,
-    Zlib,
-}
-
-impl Display for OpenSourceLicense {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.spdx_identifier())
-    }
-}
-
-impl OpenSourceLicense {
-    /// These are SPDX identifiers for the licenses, except for BSD, where the variants are not
-    /// distinguished.
-    pub fn spdx_identifier(&self) -> &'static str {
-        match self {
-            OpenSourceLicense::Apache2_0 => "apache-2.0",
-            OpenSourceLicense::BSDZero => "0bsd",
-            OpenSourceLicense::BSD => "bsd",
-            OpenSourceLicense::ISC => "isc",
-            OpenSourceLicense::MIT => "mit",
-            OpenSourceLicense::UPL1_0 => "upl-1.0",
-            OpenSourceLicense::Zlib => "zlib",
-        }
-    }
-
-    pub fn patterns(&self) -> &'static [&'static str] {
-        match self {
-            OpenSourceLicense::Apache2_0 => &[
-                include_str!("../license_patterns/apache-2.0-pattern"),
-                include_str!("../license_patterns/apache-2.0-reference-pattern"),
-            ],
-            OpenSourceLicense::BSDZero => &[include_str!("../license_patterns/0bsd-pattern")],
-            OpenSourceLicense::BSD => &[include_str!("../license_patterns/bsd-pattern")],
-            OpenSourceLicense::ISC => &[include_str!("../license_patterns/isc-pattern")],
-            OpenSourceLicense::MIT => &[include_str!("../license_patterns/mit-pattern")],
-            OpenSourceLicense::UPL1_0 => &[include_str!("../license_patterns/upl-1.0-pattern")],
-            OpenSourceLicense::Zlib => &[include_str!("../license_patterns/zlib-pattern")],
-        }
-    }
-}
-
-// TODO: Consider using databake or similar to not parse at runtime.
-static LICENSE_PATTERNS: LazyLock<LicensePatterns> = LazyLock::new(|| {
-    let mut approximate_max_length = 0;
-    let mut patterns = Vec::new();
-    for license in OpenSourceLicense::VARIANTS {
-        for pattern in license.patterns() {
-            let (pattern, length) = parse_pattern(pattern).unwrap();
-            patterns.push((*license, pattern));
-            approximate_max_length = approximate_max_length.max(length);
-        }
-    }
-    LicensePatterns {
-        patterns,
-        approximate_max_length,
-    }
-});
-
-fn detect_license(text: &str) -> Option<OpenSourceLicense> {
-    let text = canonicalize_license_text(text);
-    for (license, pattern) in LICENSE_PATTERNS.patterns.iter() {
-        log::trace!("Checking if license is {}", license);
-        if check_pattern(&pattern, &text) {
-            return Some(*license);
-        }
-    }
-
-    None
-}
-
-struct LicensePatterns {
-    patterns: Vec<(OpenSourceLicense, Vec<PatternPart>)>,
-    approximate_max_length: usize,
-}
-
-#[derive(Debug, Clone, Default, PartialEq, Eq)]
-struct PatternPart {
-    /// Indicates that matching `text` is optional. Skipping `match_any_chars` is conditional on
-    /// matching `text`.
-    optional: bool,
-    /// Indicates the number of characters that can be skipped before matching `text`.
-    match_any_chars: Range<usize>,
-    /// The text to match, may be empty.
-    text: String,
-}
-
-/// Lines that start with "-- " begin a `PatternPart`. `-- 1..10` specifies `match_any_chars:
-/// 1..10`. `-- 1..10 optional:` additionally specifies `optional: true`. It's a parse error for a
-/// line to start with `--` without matching this format.
-///
-/// Text that does not have `--` prefixes participate in the `text` field and are canonicalized by
-/// lowercasing, replacing all runs of whitespace with a single space, and otherwise only keeping
-/// ascii alphanumeric characters.
-fn parse_pattern(pattern_source: &str) -> Result<(Vec<PatternPart>, usize)> {
-    let mut pattern = Vec::new();
-    let mut part = PatternPart::default();
-    let mut approximate_max_length = 0;
-    for line in pattern_source.lines() {
-        if let Some(directive) = line.trim().strip_prefix("--") {
-            if part != PatternPart::default() {
-                pattern.push(part);
-                part = PatternPart::default();
-            }
-            let valid = maybe!({
-                let directive_chunks = directive.split_whitespace().collect::<Vec<_>>();
-                if !(1..=2).contains(&directive_chunks.len()) {
-                    return None;
-                }
-                if directive_chunks.len() == 2 {
-                    part.optional = true;
-                }
-                let range_chunks = directive_chunks[0].split("..").collect::<Vec<_>>();
-                if range_chunks.len() != 2 {
-                    return None;
-                }
-                part.match_any_chars.start = range_chunks[0].parse::<usize>().ok()?;
-                part.match_any_chars.end = range_chunks[1].parse::<usize>().ok()?;
-                if part.match_any_chars.start > part.match_any_chars.end {
-                    return None;
-                }
-                approximate_max_length += part.match_any_chars.end;
-                Some(())
-            });
-            if valid.is_none() {
-                return Err(anyhow!("Invalid pattern directive: {}", line));
-            }
-            continue;
-        }
-        approximate_max_length += line.len() + 1;
-        let line = canonicalize_license_text(line);
-        if line.is_empty() {
-            continue;
-        }
-        if !part.text.is_empty() {
-            part.text.push(' ');
-        }
-        part.text.push_str(&line);
-    }
-    if part != PatternPart::default() {
-        pattern.push(part);
-    }
-    Ok((pattern, approximate_max_length))
-}
-
-/// Checks a pattern against text by iterating over the pattern parts in reverse order, and checking
-/// matches with the end of a prefix of the input. Assumes that `canonicalize_license_text` has
-/// already been applied to the input.
-fn check_pattern(pattern: &[PatternPart], input: &str) -> bool {
-    let mut input_ix = input.len();
-    let mut match_any_chars = 0..0;
-    for part in pattern.iter().rev() {
-        if part.text.is_empty() {
-            match_any_chars.start += part.match_any_chars.start;
-            match_any_chars.end += part.match_any_chars.end;
-            continue;
-        }
-
-        let search_range_end = n_chars_before_offset(match_any_chars.start, input_ix, input);
-        let search_range_start = n_chars_before_offset(
-            match_any_chars.len() + part.text.len(),
-            search_range_end,
-            input,
-        );
-        let found_ix = input[search_range_start..search_range_end].rfind(&part.text);
-
-        if let Some(found_ix) = found_ix {
-            input_ix = search_range_start + found_ix;
-            match_any_chars = part.match_any_chars.clone();
-        } else if !part.optional {
-            log::trace!(
-                "Failed to match pattern\n`...{}`\nagainst input\n`...{}`",
-                &part.text[n_chars_before_offset(128, part.text.len(), &part.text)..],
-                &input[n_chars_before_offset(128, search_range_end, input)..search_range_end],
-            );
-            return false;
-        }
-    }
-    is_char_count_within_range(&input[..input_ix], match_any_chars)
-}
-
-fn n_chars_before_offset(char_count: usize, offset: usize, string: &str) -> usize {
-    if char_count == 0 {
-        return offset;
-    }
-    string[..offset]
-        .char_indices()
-        .nth_back(char_count.saturating_sub(1))
-        .map_or(0, |(byte_ix, _)| byte_ix)
-}
-
-fn is_char_count_within_range(string: &str, char_count_range: Range<usize>) -> bool {
-    if string.len() >= char_count_range.start * 4 && string.len() < char_count_range.end {
-        return true;
-    }
-    if string.len() < char_count_range.start || string.len() >= char_count_range.end * 4 {
-        return false;
-    }
-    char_count_range.contains(&string.chars().count())
-}
-
-/// Canonicalizes license text by removing all non-alphanumeric characters, lowercasing, and turning
-/// runs of whitespace into a single space. Unicode alphanumeric characters are intentionally
-/// preserved since these should cause license mismatch when not within a portion of the license
-/// where arbitrary text is allowed.
-fn canonicalize_license_text(license: &str) -> String {
-    license
-        .chars()
-        .filter(|c| c.is_ascii_whitespace() || c.is_alphanumeric())
-        .map(|c| c.to_ascii_lowercase())
-        .collect::<String>()
-        .split_ascii_whitespace()
-        .join(" ")
-}
-
-pub enum LicenseDetectionWatcher {
-    Local {
-        is_open_source_rx: watch::Receiver<bool>,
-        _is_open_source_task: Task<()>,
-        _worktree_subscription: Subscription,
-    },
-    SingleFile,
-    Remote,
-}
-
-impl LicenseDetectionWatcher {
-    pub fn new(worktree: &Entity<Worktree>, cx: &mut App) -> Self {
-        let worktree_ref = worktree.read(cx);
-        if worktree_ref.is_single_file() {
-            return Self::SingleFile;
-        }
-
-        let (files_to_check_tx, mut files_to_check_rx) = futures::channel::mpsc::unbounded();
-
-        let Worktree::Local(local_worktree) = worktree_ref else {
-            return Self::Remote;
-        };
-        let fs = local_worktree.fs().clone();
-
-        let options = ChildEntriesOptions {
-            include_files: true,
-            include_dirs: false,
-            include_ignored: true,
-        };
-        for top_file in local_worktree.child_entries_with_options(RelPath::empty(), options) {
-            let path_bytes = top_file.path.as_unix_str().as_bytes();
-            if top_file.is_created() && LICENSE_FILE_NAME_REGEX.is_match(path_bytes) {
-                let rel_path = top_file.path.clone();
-                files_to_check_tx.unbounded_send(rel_path).ok();
-            }
-        }
-
-        let _worktree_subscription =
-            cx.subscribe(worktree, move |_worktree, event, _cx| match event {
-                worktree::Event::UpdatedEntries(updated_entries) => {
-                    for updated_entry in updated_entries.iter() {
-                        let rel_path = &updated_entry.0;
-                        let path_bytes = rel_path.as_unix_str().as_bytes();
-                        if LICENSE_FILE_NAME_REGEX.is_match(path_bytes) {
-                            files_to_check_tx.unbounded_send(rel_path.clone()).ok();
-                        }
-                    }
-                }
-                worktree::Event::DeletedEntry(_) | worktree::Event::UpdatedGitRepositories(_) => {}
-            });
-
-        let worktree_snapshot = worktree.read(cx).snapshot();
-        let (mut is_open_source_tx, is_open_source_rx) = watch::channel_with::<bool>(false);
-
-        let _is_open_source_task = cx.background_spawn(async move {
-            let mut eligible_licenses = BTreeSet::new();
-            while let Some(rel_path) = files_to_check_rx.next().await {
-                let abs_path = worktree_snapshot.absolutize(&rel_path);
-                let was_open_source = !eligible_licenses.is_empty();
-                if Self::is_path_eligible(&fs, abs_path).await.unwrap_or(false) {
-                    eligible_licenses.insert(rel_path);
-                } else {
-                    eligible_licenses.remove(&rel_path);
-                }
-                let is_open_source = !eligible_licenses.is_empty();
-                if is_open_source != was_open_source {
-                    *is_open_source_tx.borrow_mut() = is_open_source;
-                }
-            }
-        });
-
-        Self::Local {
-            is_open_source_rx,
-            _is_open_source_task,
-            _worktree_subscription,
-        }
-    }
-
-    async fn is_path_eligible(fs: &Arc<dyn Fs>, abs_path: PathBuf) -> Option<bool> {
-        log::debug!("checking if `{abs_path:?}` is an open source license");
-        // resolve symlinks so that the file size from metadata is correct
-        let Some(abs_path) = fs.canonicalize(&abs_path).await.ok() else {
-            log::debug!(
-                "`{abs_path:?}` license file probably deleted (error canonicalizing the path)"
-            );
-            return None;
-        };
-        let metadata = fs.metadata(&abs_path).await.log_err()??;
-        if metadata.len > LICENSE_PATTERNS.approximate_max_length as u64 {
-            log::debug!(
-                "`{abs_path:?}` license file was skipped \
-                because its size of {} bytes was larger than the max size of {} bytes",
-                metadata.len,
-                LICENSE_PATTERNS.approximate_max_length
-            );
-            return None;
-        }
-        let text = fs.load(&abs_path).await.log_err()?;
-        let is_eligible = detect_license(&text).is_some();
-        if is_eligible {
-            log::debug!(
-                "`{abs_path:?}` matches a license that is eligible for data collection (if enabled)"
-            );
-        } else {
-            log::debug!(
-                "`{abs_path:?}` does not match a license that is eligible for data collection"
-            );
-        }
-        Some(is_eligible)
-    }
-
-    /// Answers false until we find out it's open source
-    pub fn is_project_open_source(&self) -> bool {
-        match self {
-            Self::Local {
-                is_open_source_rx, ..
-            } => *is_open_source_rx.borrow(),
-            Self::SingleFile | Self::Remote => false,
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::path::Path;
-
-    use fs::FakeFs;
-    use gpui::TestAppContext;
-    use rand::Rng as _;
-    use serde_json::json;
-    use settings::SettingsStore;
-
-    use super::*;
-
-    const APACHE_2_0_TXT: &str = include_str!("../license_examples/apache-2.0-ex0.txt");
-    const ISC_TXT: &str = include_str!("../license_examples/isc.txt");
-    const MIT_TXT: &str = include_str!("../license_examples/mit-ex0.txt");
-    const UPL_1_0_TXT: &str = include_str!("../license_examples/upl-1.0.txt");
-    const BSD_0_TXT: &str = include_str!("../license_examples/0bsd.txt");
-
-    #[track_caller]
-    fn assert_matches_license(text: &str, license: OpenSourceLicense) {
-        assert_eq!(detect_license(text), Some(license));
-        assert!(text.len() < LICENSE_PATTERNS.approximate_max_length);
-    }
-
-    /*
-    // Uncomment this and run with `cargo test -p zeta -- --no-capture &> licenses-output` to
-    // traverse your entire home directory and run license detection on every file that has a
-    // license-like name.
-    #[test]
-    fn test_check_all_licenses_in_home_dir() {
-        let mut detected = Vec::new();
-        let mut unrecognized = Vec::new();
-        let mut walked_entries = 0;
-        let homedir = std::env::home_dir().unwrap();
-        for entry in walkdir::WalkDir::new(&homedir) {
-            walked_entries += 1;
-            if walked_entries % 10000 == 0 {
-                println!(
-                    "So far visited {} files in {}",
-                    walked_entries,
-                    homedir.display()
-                );
-            }
-            let Ok(entry) = entry else {
-                continue;
-            };
-            if !LICENSE_FILE_NAME_REGEX.is_match(entry.file_name().as_encoded_bytes()) {
-                continue;
-            }
-            let Ok(contents) = std::fs::read_to_string(entry.path()) else {
-                continue;
-            };
-            let path_string = entry.path().to_string_lossy().into_owned();
-            let license = detect_license(&contents);
-            match license {
-                Some(license) => detected.push((license, path_string)),
-                None => unrecognized.push(path_string),
-            }
-        }
-        println!("\nDetected licenses:\n");
-        detected.sort();
-        for (license, path) in &detected {
-            println!("{}: {}", license.spdx_identifier(), path);
-        }
-        println!("\nUnrecognized licenses:\n");
-        for path in &unrecognized {
-            println!("{}", path);
-        }
-        panic!(
-            "{} licenses detected, {} unrecognized",
-            detected.len(),
-            unrecognized.len()
-        );
-        println!("This line has a warning to make sure this test is always commented out");
-    }
-    */
-
-    #[test]
-    fn test_apache_positive_detection() {
-        assert_matches_license(APACHE_2_0_TXT, OpenSourceLicense::Apache2_0);
-        assert_matches_license(
-            include_str!("../license_examples/apache-2.0-ex1.txt"),
-            OpenSourceLicense::Apache2_0,
-        );
-        assert_matches_license(
-            include_str!("../license_examples/apache-2.0-ex2.txt"),
-            OpenSourceLicense::Apache2_0,
-        );
-        assert_matches_license(
-            include_str!("../license_examples/apache-2.0-ex3.txt"),
-            OpenSourceLicense::Apache2_0,
-        );
-        assert_matches_license(
-            include_str!("../license_examples/apache-2.0-ex4.txt"),
-            OpenSourceLicense::Apache2_0,
-        );
-        assert_matches_license(
-            include_str!("../../../LICENSE-APACHE"),
-            OpenSourceLicense::Apache2_0,
-        );
-    }
-
-    #[test]
-    fn test_apache_negative_detection() {
-        assert_eq!(
-            detect_license(&format!(
-                "{APACHE_2_0_TXT}\n\nThe terms in this license are void if P=NP."
-            )),
-            None
-        );
-    }
-
-    #[test]
-    fn test_bsd_1_clause_positive_detection() {
-        assert_matches_license(
-            include_str!("../license_examples/bsd-1-clause.txt"),
-            OpenSourceLicense::BSD,
-        );
-    }
-
-    #[test]
-    fn test_bsd_2_clause_positive_detection() {
-        assert_matches_license(
-            include_str!("../license_examples/bsd-2-clause-ex0.txt"),
-            OpenSourceLicense::BSD,
-        );
-    }
-
-    #[test]
-    fn test_bsd_3_clause_positive_detection() {
-        assert_matches_license(
-            include_str!("../license_examples/bsd-3-clause-ex0.txt"),
-            OpenSourceLicense::BSD,
-        );
-        assert_matches_license(
-            include_str!("../license_examples/bsd-3-clause-ex1.txt"),
-            OpenSourceLicense::BSD,
-        );
-        assert_matches_license(
-            include_str!("../license_examples/bsd-3-clause-ex2.txt"),
-            OpenSourceLicense::BSD,
-        );
-        assert_matches_license(
-            include_str!("../license_examples/bsd-3-clause-ex3.txt"),
-            OpenSourceLicense::BSD,
-        );
-        assert_matches_license(
-            include_str!("../license_examples/bsd-3-clause-ex4.txt"),
-            OpenSourceLicense::BSD,
-        );
-    }
-
-    #[test]
-    fn test_bsd_0_positive_detection() {
-        assert_matches_license(BSD_0_TXT, OpenSourceLicense::BSDZero);
-    }
-
-    #[test]
-    fn test_isc_positive_detection() {
-        assert_matches_license(ISC_TXT, OpenSourceLicense::ISC);
-    }
-
-    #[test]
-    fn test_isc_negative_detection() {
-        let license_text = format!(
-            r#"{ISC_TXT}
-
-            This project is dual licensed under the ISC License and the MIT License."#
-        );
-
-        assert_eq!(detect_license(&license_text), None);
-    }
-
-    #[test]
-    fn test_mit_positive_detection() {
-        assert_matches_license(MIT_TXT, OpenSourceLicense::MIT);
-        assert_matches_license(
-            include_str!("../license_examples/mit-ex1.txt"),
-            OpenSourceLicense::MIT,
-        );
-        assert_matches_license(
-            include_str!("../license_examples/mit-ex2.txt"),
-            OpenSourceLicense::MIT,
-        );
-        assert_matches_license(
-            include_str!("../license_examples/mit-ex3.txt"),
-            OpenSourceLicense::MIT,
-        );
-    }
-
-    #[test]
-    fn test_mit_negative_detection() {
-        let license_text = format!(
-            r#"{MIT_TXT}
-
-            This project is dual licensed under the MIT License and the Apache License, Version 2.0."#
-        );
-        assert_eq!(detect_license(&license_text), None);
-    }
-
-    #[test]
-    fn test_upl_positive_detection() {
-        assert_matches_license(UPL_1_0_TXT, OpenSourceLicense::UPL1_0);
-    }
-
-    #[test]
-    fn test_upl_negative_detection() {
-        let license_text = format!(
-            r#"{UPL_1_0_TXT}
-
-            This project is dual licensed under the UPL License and the MIT License."#
-        );
-
-        assert_eq!(detect_license(&license_text), None);
-    }
-
-    #[test]
-    fn test_zlib_positive_detection() {
-        assert_matches_license(
-            include_str!("../license_examples/zlib-ex0.txt"),
-            OpenSourceLicense::Zlib,
-        );
-    }
-
-    #[test]
-    fn random_strings_negative_detection() {
-        for _i in 0..20 {
-            let random_string = rand::rng()
-                .sample_iter::<char, _>(rand::distr::StandardUniform)
-                .take(512)
-                .collect::<String>();
-            assert_eq!(detect_license(&random_string), None);
-        }
-    }
-
-    #[test]
-    fn test_n_chars_before_offset() {
-        assert_eq!(n_chars_before_offset(2, 4, "hello"), 2);
-
-        let input = "ㄒ乇丂ㄒ";
-        assert_eq!(n_chars_before_offset(2, input.len(), input), "ㄒ乇".len());
-    }
-
-    #[test]
-    fn test_is_char_count_within_range() {
-        // TODO: make this into a proper property test.
-        for _i in 0..20 {
-            let mut rng = rand::rng();
-            let random_char_count = rng.random_range(0..64);
-            let random_string = rand::rng()
-                .sample_iter::<char, _>(rand::distr::StandardUniform)
-                .take(random_char_count)
-                .collect::<String>();
-            let min_chars = rng.random_range(0..10);
-            let max_chars = rng.random_range(min_chars..32);
-            let char_count_range = min_chars..max_chars;
-            assert_eq!(
-                is_char_count_within_range(&random_string, char_count_range.clone()),
-                char_count_range.contains(&random_char_count),
-            );
-        }
-    }
-
-    #[test]
-    fn test_license_file_name_regex() {
-        // Test basic license file names
-        assert!(LICENSE_FILE_NAME_REGEX.is_match(b"LICENSE"));
-        assert!(LICENSE_FILE_NAME_REGEX.is_match(b"LICENCE"));
-        assert!(LICENSE_FILE_NAME_REGEX.is_match(b"license"));
-        assert!(LICENSE_FILE_NAME_REGEX.is_match(b"licence"));
-
-        // Test with extensions
-        assert!(LICENSE_FILE_NAME_REGEX.is_match(b"LICENSE.txt"));
-        assert!(LICENSE_FILE_NAME_REGEX.is_match(b"LICENSE.md"));
-        assert!(LICENSE_FILE_NAME_REGEX.is_match(b"LICENCE.txt"));
-        assert!(LICENSE_FILE_NAME_REGEX.is_match(b"LICENCE.md"));
-
-        // Test with specific license types
-        assert!(LICENSE_FILE_NAME_REGEX.is_match(b"LICENSE-APACHE"));
-        assert!(LICENSE_FILE_NAME_REGEX.is_match(b"LICENSE-MIT"));
-        assert!(LICENSE_FILE_NAME_REGEX.is_match(b"LICENSE.MIT"));
-        assert!(LICENSE_FILE_NAME_REGEX.is_match(b"LICENSE_MIT"));
-        assert!(LICENSE_FILE_NAME_REGEX.is_match(b"LICENSE-ISC"));
-        assert!(LICENSE_FILE_NAME_REGEX.is_match(b"LICENSE-UPL"));
-
-        // Test with "license" coming after
-        assert!(LICENSE_FILE_NAME_REGEX.is_match(b"APACHE-LICENSE"));
-
-        // Test version numbers
-        assert!(LICENSE_FILE_NAME_REGEX.is_match(b"APACHE-2"));
-        assert!(LICENSE_FILE_NAME_REGEX.is_match(b"APACHE-2.0"));
-        assert!(LICENSE_FILE_NAME_REGEX.is_match(b"BSD-1"));
-        assert!(LICENSE_FILE_NAME_REGEX.is_match(b"BSD-2"));
-        assert!(LICENSE_FILE_NAME_REGEX.is_match(b"BSD-3"));
-        assert!(LICENSE_FILE_NAME_REGEX.is_match(b"BSD-3-CLAUSE"));
-
-        // Test combinations
-        assert!(LICENSE_FILE_NAME_REGEX.is_match(b"LICENSE-MIT.txt"));
-        assert!(LICENSE_FILE_NAME_REGEX.is_match(b"LICENCE.ISC.md"));
-        assert!(LICENSE_FILE_NAME_REGEX.is_match(b"license_upl"));
-        assert!(LICENSE_FILE_NAME_REGEX.is_match(b"LICENSE.APACHE.2.0"));
-
-        // Test case insensitive
-        assert!(LICENSE_FILE_NAME_REGEX.is_match(b"License"));
-        assert!(LICENSE_FILE_NAME_REGEX.is_match(b"license-mit.TXT"));
-        assert!(LICENSE_FILE_NAME_REGEX.is_match(b"LICENCE_isc.MD"));
-
-        // Test edge cases that should match
-        assert!(LICENSE_FILE_NAME_REGEX.is_match(b"license.mit"));
-        assert!(LICENSE_FILE_NAME_REGEX.is_match(b"licence-upl.txt"));
-
-        // Test non-matching patterns
-        assert!(!LICENSE_FILE_NAME_REGEX.is_match(b"COPYING"));
-        assert!(!LICENSE_FILE_NAME_REGEX.is_match(b"LICENSE.html"));
-        assert!(!LICENSE_FILE_NAME_REGEX.is_match(b"MYLICENSE"));
-        assert!(!LICENSE_FILE_NAME_REGEX.is_match(b"src/LICENSE"));
-        assert!(!LICENSE_FILE_NAME_REGEX.is_match(b"LICENSE.old"));
-        assert!(!LICENSE_FILE_NAME_REGEX.is_match(b"LICENSE-GPL"));
-        assert!(!LICENSE_FILE_NAME_REGEX.is_match(b"LICENSEABC"));
-    }
-
-    #[test]
-    fn test_canonicalize_license_text() {
-        let input = "  Paragraph 1\nwith multiple lines\n\n\n\nParagraph 2\nwith more lines\n  ";
-        let expected = "paragraph 1 with multiple lines paragraph 2 with more lines";
-        assert_eq!(canonicalize_license_text(input), expected);
-
-        // Test tabs and mixed whitespace
-        let input = "Word1\t\tWord2\n\n   Word3\r\n\r\n\r\nWord4   ";
-        let expected = "word1 word2 word3 word4";
-        assert_eq!(canonicalize_license_text(input), expected);
-    }
-
-    fn init_test(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-        });
-    }
-
-    #[gpui::test]
-    async fn test_watcher_single_file(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree("/root", json!({ "main.rs": "fn main() {}" }))
-            .await;
-
-        let worktree = Worktree::local(
-            Path::new("/root/main.rs"),
-            true,
-            fs.clone(),
-            Default::default(),
-            true,
-            &mut cx.to_async(),
-        )
-        .await
-        .unwrap();
-
-        let watcher = cx.update(|cx| LicenseDetectionWatcher::new(&worktree, cx));
-        assert!(matches!(watcher, LicenseDetectionWatcher::SingleFile));
-        assert!(!watcher.is_project_open_source());
-    }
-
-    #[gpui::test]
-    async fn test_watcher_updates_on_changes(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree("/root", json!({ "main.rs": "fn main() {}" }))
-            .await;
-
-        let worktree = Worktree::local(
-            Path::new("/root"),
-            true,
-            fs.clone(),
-            Default::default(),
-            true,
-            &mut cx.to_async(),
-        )
-        .await
-        .unwrap();
-
-        let watcher = cx.update(|cx| LicenseDetectionWatcher::new(&worktree, cx));
-        assert!(matches!(watcher, LicenseDetectionWatcher::Local { .. }));
-        assert!(!watcher.is_project_open_source());
-
-        fs.write(Path::new("/root/LICENSE-MIT"), MIT_TXT.as_bytes())
-            .await
-            .unwrap();
-
-        cx.background_executor.run_until_parked();
-        assert!(watcher.is_project_open_source());
-
-        fs.write(Path::new("/root/LICENSE-APACHE"), APACHE_2_0_TXT.as_bytes())
-            .await
-            .unwrap();
-
-        cx.background_executor.run_until_parked();
-        assert!(watcher.is_project_open_source());
-
-        fs.write(Path::new("/root/LICENSE-MIT"), "Nevermind".as_bytes())
-            .await
-            .unwrap();
-
-        // Still considered open source as LICENSE-APACHE is present
-        cx.background_executor.run_until_parked();
-        assert!(watcher.is_project_open_source());
-
-        fs.write(
-            Path::new("/root/LICENSE-APACHE"),
-            "Also nevermind".as_bytes(),
-        )
-        .await
-        .unwrap();
-
-        cx.background_executor.run_until_parked();
-        assert!(!watcher.is_project_open_source());
-    }
-
-    #[gpui::test]
-    async fn test_watcher_initially_opensource_and_then_deleted(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(
-            "/root",
-            json!({ "main.rs": "fn main() {}", "LICENSE-MIT": MIT_TXT }),
-        )
-        .await;
-
-        let worktree = Worktree::local(
-            Path::new("/root"),
-            true,
-            fs.clone(),
-            Default::default(),
-            true,
-            &mut cx.to_async(),
-        )
-        .await
-        .unwrap();
-
-        let watcher = cx.update(|cx| LicenseDetectionWatcher::new(&worktree, cx));
-        assert!(matches!(watcher, LicenseDetectionWatcher::Local { .. }));
-
-        cx.background_executor.run_until_parked();
-        assert!(watcher.is_project_open_source());
-
-        fs.remove_file(
-            Path::new("/root/LICENSE-MIT"),
-            fs::RemoveOptions {
-                recursive: false,
-                ignore_if_not_exists: false,
-            },
-        )
-        .await
-        .unwrap();
-
-        cx.background_executor.run_until_parked();
-        assert!(!watcher.is_project_open_source());
-    }
-}
diff --git a/crates/edit_prediction/src/mercury.rs b/crates/edit_prediction/src/mercury.rs
deleted file mode 100644
index f3a3afc53f..0000000000
--- a/crates/edit_prediction/src/mercury.rs
+++ /dev/null
@@ -1,343 +0,0 @@
-use anyhow::{Context as _, Result};
-use credentials_provider::CredentialsProvider;
-use futures::{AsyncReadExt as _, FutureExt, future::Shared};
-use gpui::{
-    App, AppContext as _, Task,
-    http_client::{self, AsyncBody, Method},
-};
-use language::{OffsetRangeExt as _, ToOffset, ToPoint as _};
-use std::{mem, ops::Range, path::Path, sync::Arc, time::Instant};
-use zeta_prompt::ZetaPromptInput;
-
-use crate::{
-    DebugEvent, EditPredictionFinishedDebugEvent, EditPredictionId, EditPredictionModelInput,
-    EditPredictionStartedDebugEvent, open_ai_response::text_from_response,
-    prediction::EditPredictionResult,
-};
-
-const MERCURY_API_URL: &str = "https://api.inceptionlabs.ai/v1/edit/completions";
-const MAX_CONTEXT_TOKENS: usize = 150;
-const MAX_REWRITE_TOKENS: usize = 350;
-
-pub struct Mercury {
-    pub api_token: Shared<Task<Option<String>>>,
-}
-
-impl Mercury {
-    pub fn new(cx: &App) -> Self {
-        Mercury {
-            api_token: load_api_token(cx).shared(),
-        }
-    }
-
-    pub fn set_api_token(&mut self, api_token: Option<String>, cx: &mut App) -> Task<Result<()>> {
-        self.api_token = Task::ready(api_token.clone()).shared();
-        store_api_token_in_keychain(api_token, cx)
-    }
-
-    pub(crate) fn request_prediction(
-        &self,
-        EditPredictionModelInput {
-            buffer,
-            snapshot,
-            position,
-            events,
-            related_files,
-            debug_tx,
-            ..
-        }: EditPredictionModelInput,
-        cx: &mut App,
-    ) -> Task<Result<Option<EditPredictionResult>>> {
-        let Some(api_token) = self.api_token.clone().now_or_never().flatten() else {
-            return Task::ready(Ok(None));
-        };
-        let full_path: Arc<Path> = snapshot
-            .file()
-            .map(|file| file.full_path(cx))
-            .unwrap_or_else(|| "untitled".into())
-            .into();
-
-        let http_client = cx.http_client();
-        let cursor_point = position.to_point(&snapshot);
-        let buffer_snapshotted_at = Instant::now();
-        let active_buffer = buffer.clone();
-
-        let result = cx.background_spawn(async move {
-            let (editable_range, context_range) =
-                crate::cursor_excerpt::editable_and_context_ranges_for_cursor_position(
-                    cursor_point,
-                    &snapshot,
-                    MAX_CONTEXT_TOKENS,
-                    MAX_REWRITE_TOKENS,
-                );
-
-            let context_offset_range = context_range.to_offset(&snapshot);
-
-            let editable_offset_range = editable_range.to_offset(&snapshot);
-
-            let inputs = zeta_prompt::ZetaPromptInput {
-                events,
-                related_files,
-                cursor_offset_in_excerpt: cursor_point.to_offset(&snapshot)
-                    - context_range.start.to_offset(&snapshot),
-                cursor_path: full_path.clone(),
-                cursor_excerpt: snapshot
-                    .text_for_range(context_range)
-                    .collect::<String>()
-                    .into(),
-                editable_range_in_excerpt: (editable_offset_range.start
-                    - context_offset_range.start)
-                    ..(editable_offset_range.end - context_offset_range.start),
-            };
-
-            let prompt = build_prompt(&inputs);
-
-            if let Some(debug_tx) = &debug_tx {
-                debug_tx
-                    .unbounded_send(DebugEvent::EditPredictionStarted(
-                        EditPredictionStartedDebugEvent {
-                            buffer: active_buffer.downgrade(),
-                            prompt: Some(prompt.clone()),
-                            position,
-                        },
-                    ))
-                    .ok();
-            }
-
-            let request_body = open_ai::Request {
-                model: "mercury-coder".into(),
-                messages: vec![open_ai::RequestMessage::User {
-                    content: open_ai::MessageContent::Plain(prompt),
-                }],
-                stream: false,
-                max_completion_tokens: None,
-                stop: vec![],
-                temperature: None,
-                tool_choice: None,
-                parallel_tool_calls: None,
-                tools: vec![],
-                prompt_cache_key: None,
-                reasoning_effort: None,
-            };
-
-            let buf = serde_json::to_vec(&request_body)?;
-            let body: AsyncBody = buf.into();
-
-            let request = http_client::Request::builder()
-                .uri(MERCURY_API_URL)
-                .header("Content-Type", "application/json")
-                .header("Authorization", format!("Bearer {}", api_token))
-                .header("Connection", "keep-alive")
-                .method(Method::POST)
-                .body(body)
-                .context("Failed to create request")?;
-
-            let mut response = http_client
-                .send(request)
-                .await
-                .context("Failed to send request")?;
-
-            let mut body: Vec<u8> = Vec::new();
-            response
-                .body_mut()
-                .read_to_end(&mut body)
-                .await
-                .context("Failed to read response body")?;
-
-            let response_received_at = Instant::now();
-            if !response.status().is_success() {
-                anyhow::bail!(
-                    "Request failed with status: {:?}\nBody: {}",
-                    response.status(),
-                    String::from_utf8_lossy(&body),
-                );
-            };
-
-            let mut response: open_ai::Response =
-                serde_json::from_slice(&body).context("Failed to parse response")?;
-
-            let id = mem::take(&mut response.id);
-            let response_str = text_from_response(response).unwrap_or_default();
-
-            if let Some(debug_tx) = &debug_tx {
-                debug_tx
-                    .unbounded_send(DebugEvent::EditPredictionFinished(
-                        EditPredictionFinishedDebugEvent {
-                            buffer: active_buffer.downgrade(),
-                            model_output: Some(response_str.clone()),
-                            position,
-                        },
-                    ))
-                    .ok();
-            }
-
-            let response_str = response_str.strip_prefix("```\n").unwrap_or(&response_str);
-            let response_str = response_str.strip_suffix("\n```").unwrap_or(&response_str);
-
-            let mut edits = Vec::new();
-            const NO_PREDICTION_OUTPUT: &str = "None";
-
-            if response_str != NO_PREDICTION_OUTPUT {
-                let old_text = snapshot
-                    .text_for_range(editable_offset_range.clone())
-                    .collect::<String>();
-                edits.extend(
-                    language::text_diff(&old_text, &response_str)
-                        .into_iter()
-                        .map(|(range, text)| {
-                            (
-                                snapshot.anchor_after(editable_offset_range.start + range.start)
-                                    ..snapshot
-                                        .anchor_before(editable_offset_range.start + range.end),
-                                text,
-                            )
-                        }),
-                );
-            }
-
-            anyhow::Ok((id, edits, snapshot, response_received_at, inputs))
-        });
-
-        cx.spawn(async move |cx| {
-            let (id, edits, old_snapshot, response_received_at, inputs) =
-                result.await.context("Mercury edit prediction failed")?;
-            anyhow::Ok(Some(
-                EditPredictionResult::new(
-                    EditPredictionId(id.into()),
-                    &buffer,
-                    &old_snapshot,
-                    edits.into(),
-                    buffer_snapshotted_at,
-                    response_received_at,
-                    inputs,
-                    cx,
-                )
-                .await,
-            ))
-        })
-    }
-}
-
-fn build_prompt(inputs: &ZetaPromptInput) -> String {
-    const RECENTLY_VIEWED_SNIPPETS_START: &str = "<|recently_viewed_code_snippets|>\n";
-    const RECENTLY_VIEWED_SNIPPETS_END: &str = "<|/recently_viewed_code_snippets|>\n";
-    const RECENTLY_VIEWED_SNIPPET_START: &str = "<|recently_viewed_code_snippet|>\n";
-    const RECENTLY_VIEWED_SNIPPET_END: &str = "<|/recently_viewed_code_snippet|>\n";
-    const CURRENT_FILE_CONTENT_START: &str = "<|current_file_content|>\n";
-    const CURRENT_FILE_CONTENT_END: &str = "<|/current_file_content|>\n";
-    const CODE_TO_EDIT_START: &str = "<|code_to_edit|>\n";
-    const CODE_TO_EDIT_END: &str = "<|/code_to_edit|>\n";
-    const EDIT_DIFF_HISTORY_START: &str = "<|edit_diff_history|>\n";
-    const EDIT_DIFF_HISTORY_END: &str = "<|/edit_diff_history|>\n";
-    const CURSOR_TAG: &str = "<|cursor|>";
-    const CODE_SNIPPET_FILE_PATH_PREFIX: &str = "code_snippet_file_path: ";
-    const CURRENT_FILE_PATH_PREFIX: &str = "current_file_path: ";
-
-    let mut prompt = String::new();
-
-    push_delimited(
-        &mut prompt,
-        RECENTLY_VIEWED_SNIPPETS_START..RECENTLY_VIEWED_SNIPPETS_END,
-        |prompt| {
-            for related_file in inputs.related_files.iter() {
-                for related_excerpt in &related_file.excerpts {
-                    push_delimited(
-                        prompt,
-                        RECENTLY_VIEWED_SNIPPET_START..RECENTLY_VIEWED_SNIPPET_END,
-                        |prompt| {
-                            prompt.push_str(CODE_SNIPPET_FILE_PATH_PREFIX);
-                            prompt.push_str(related_file.path.to_string_lossy().as_ref());
-                            prompt.push('\n');
-                            prompt.push_str(&related_excerpt.text.to_string());
-                        },
-                    );
-                }
-            }
-        },
-    );
-
-    push_delimited(
-        &mut prompt,
-        CURRENT_FILE_CONTENT_START..CURRENT_FILE_CONTENT_END,
-        |prompt| {
-            prompt.push_str(CURRENT_FILE_PATH_PREFIX);
-            prompt.push_str(inputs.cursor_path.as_os_str().to_string_lossy().as_ref());
-            prompt.push('\n');
-
-            prompt.push_str(&inputs.cursor_excerpt[0..inputs.editable_range_in_excerpt.start]);
-            push_delimited(prompt, CODE_TO_EDIT_START..CODE_TO_EDIT_END, |prompt| {
-                prompt.push_str(
-                    &inputs.cursor_excerpt
-                        [inputs.editable_range_in_excerpt.start..inputs.cursor_offset_in_excerpt],
-                );
-                prompt.push_str(CURSOR_TAG);
-                prompt.push_str(
-                    &inputs.cursor_excerpt
-                        [inputs.cursor_offset_in_excerpt..inputs.editable_range_in_excerpt.end],
-                );
-            });
-            prompt.push_str(&inputs.cursor_excerpt[inputs.editable_range_in_excerpt.end..]);
-        },
-    );
-
-    push_delimited(
-        &mut prompt,
-        EDIT_DIFF_HISTORY_START..EDIT_DIFF_HISTORY_END,
-        |prompt| {
-            for event in inputs.events.iter() {
-                zeta_prompt::write_event(prompt, &event);
-            }
-        },
-    );
-
-    prompt
-}
-
-fn push_delimited(prompt: &mut String, delimiters: Range<&str>, cb: impl FnOnce(&mut String)) {
-    prompt.push_str(delimiters.start);
-    cb(prompt);
-    prompt.push_str(delimiters.end);
-}
-
-pub const MERCURY_CREDENTIALS_URL: &str = "https://api.inceptionlabs.ai/v1/edit/completions";
-pub const MERCURY_CREDENTIALS_USERNAME: &str = "mercury-api-token";
-
-pub fn load_api_token(cx: &App) -> Task<Option<String>> {
-    if let Some(api_token) = std::env::var("MERCURY_AI_TOKEN")
-        .ok()
-        .filter(|value| !value.is_empty())
-    {
-        return Task::ready(Some(api_token));
-    }
-    let credentials_provider = <dyn CredentialsProvider>::global(cx);
-    cx.spawn(async move |cx| {
-        let (_, credentials) = credentials_provider
-            .read_credentials(MERCURY_CREDENTIALS_URL, &cx)
-            .await
-            .ok()??;
-        String::from_utf8(credentials).ok()
-    })
-}
-
-fn store_api_token_in_keychain(api_token: Option<String>, cx: &App) -> Task<Result<()>> {
-    let credentials_provider = <dyn CredentialsProvider>::global(cx);
-
-    cx.spawn(async move |cx| {
-        if let Some(api_token) = api_token {
-            credentials_provider
-                .write_credentials(
-                    MERCURY_CREDENTIALS_URL,
-                    MERCURY_CREDENTIALS_USERNAME,
-                    api_token.as_bytes(),
-                    cx,
-                )
-                .await
-                .context("Failed to save Mercury API token to system keychain")
-        } else {
-            credentials_provider
-                .delete_credentials(MERCURY_CREDENTIALS_URL, cx)
-                .await
-                .context("Failed to delete Mercury API token from system keychain")
-        }
-    })
-}
diff --git a/crates/edit_prediction/src/onboarding_modal.rs b/crates/edit_prediction/src/onboarding_modal.rs
deleted file mode 100644
index ed7adfc754..0000000000
--- a/crates/edit_prediction/src/onboarding_modal.rs
+++ /dev/null
@@ -1,174 +0,0 @@
-use std::sync::Arc;
-
-use crate::ZedPredictUpsell;
-use ai_onboarding::EditPredictionOnboarding;
-use client::{Client, UserStore};
-use db::kvp::Dismissable;
-use fs::Fs;
-use gpui::{
-    ClickEvent, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, MouseDownEvent, Render,
-    linear_color_stop, linear_gradient,
-};
-use language::language_settings::EditPredictionProvider;
-use settings::update_settings_file;
-use ui::{Vector, VectorName, prelude::*};
-use workspace::{ModalView, Workspace};
-
-#[macro_export]
-macro_rules! onboarding_event {
-    ($name:expr) => {
-        telemetry::event!($name, source = "Edit Prediction Onboarding");
-    };
-    ($name:expr, $($key:ident $(= $value:expr)?),+ $(,)?) => {
-        telemetry::event!($name, source = "Edit Prediction Onboarding", $($key $(= $value)?),+);
-    };
-}
-
-/// Introduces user to Zed's Edit Prediction feature
-pub struct ZedPredictModal {
-    onboarding: Entity<EditPredictionOnboarding>,
-    focus_handle: FocusHandle,
-}
-
-pub(crate) fn set_edit_prediction_provider(provider: EditPredictionProvider, cx: &mut App) {
-    let fs = <dyn Fs>::global(cx);
-    update_settings_file(fs, cx, move |settings, _| {
-        settings
-            .project
-            .all_languages
-            .features
-            .get_or_insert(Default::default())
-            .edit_prediction_provider = Some(provider);
-    });
-}
-
-impl ZedPredictModal {
-    pub fn toggle(
-        workspace: &mut Workspace,
-        user_store: Entity<UserStore>,
-        client: Arc<Client>,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        workspace.toggle_modal(window, cx, |_window, cx| {
-            let weak_entity = cx.weak_entity();
-            Self {
-                onboarding: cx.new(|cx| {
-                    EditPredictionOnboarding::new(
-                        user_store.clone(),
-                        client.clone(),
-                        copilot::Copilot::global(cx)
-                            .is_some_and(|copilot| copilot.read(cx).status().is_configured()),
-                        Arc::new({
-                            let this = weak_entity.clone();
-                            move |_window, cx| {
-                                ZedPredictUpsell::set_dismissed(true, cx);
-                                set_edit_prediction_provider(EditPredictionProvider::Zed, cx);
-                                this.update(cx, |_, cx| cx.emit(DismissEvent)).ok();
-                            }
-                        }),
-                        Arc::new({
-                            let this = weak_entity.clone();
-                            move |window, cx| {
-                                ZedPredictUpsell::set_dismissed(true, cx);
-                                set_edit_prediction_provider(EditPredictionProvider::Copilot, cx);
-                                this.update(cx, |_, cx| cx.emit(DismissEvent)).ok();
-                                copilot::initiate_sign_in(window, cx);
-                            }
-                        }),
-                        cx,
-                    )
-                }),
-                focus_handle: cx.focus_handle(),
-            }
-        });
-    }
-
-    fn cancel(&mut self, _: &menu::Cancel, _: &mut Window, cx: &mut Context<Self>) {
-        ZedPredictUpsell::set_dismissed(true, cx);
-        cx.emit(DismissEvent);
-    }
-}
-
-impl EventEmitter<DismissEvent> for ZedPredictModal {}
-
-impl Focusable for ZedPredictModal {
-    fn focus_handle(&self, _cx: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl ModalView for ZedPredictModal {
-    fn on_before_dismiss(
-        &mut self,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> workspace::DismissDecision {
-        ZedPredictUpsell::set_dismissed(true, cx);
-        workspace::DismissDecision::Dismiss(true)
-    }
-}
-
-impl Render for ZedPredictModal {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let window_height = window.viewport_size().height;
-        let max_height = window_height - px(200.);
-
-        v_flex()
-            .id("edit-prediction-onboarding")
-            .key_context("ZedPredictModal")
-            .relative()
-            .w(px(550.))
-            .h_full()
-            .max_h(max_height)
-            .p_4()
-            .gap_2()
-            .elevation_3(cx)
-            .track_focus(&self.focus_handle(cx))
-            .overflow_hidden()
-            .on_action(cx.listener(Self::cancel))
-            .on_action(cx.listener(|_, _: &menu::Cancel, _window, cx| {
-                onboarding_event!("Cancelled", trigger = "Action");
-                cx.emit(DismissEvent);
-            }))
-            .on_any_mouse_down(cx.listener(|this, _: &MouseDownEvent, window, _cx| {
-                this.focus_handle.focus(window);
-            }))
-            .child(
-                div()
-                    .opacity(0.5)
-                    .absolute()
-                    .top(px(-8.0))
-                    .right_0()
-                    .w(px(400.))
-                    .h(px(92.))
-                    .child(
-                        Vector::new(VectorName::AiGrid, rems_from_px(400.), rems_from_px(92.))
-                            .color(Color::Custom(cx.theme().colors().text.alpha(0.32))),
-                    ),
-            )
-            .child(
-                div()
-                    .absolute()
-                    .top_0()
-                    .right_0()
-                    .w(px(660.))
-                    .h(px(401.))
-                    .overflow_hidden()
-                    .bg(linear_gradient(
-                        75.,
-                        linear_color_stop(cx.theme().colors().panel_background.alpha(0.01), 1.0),
-                        linear_color_stop(cx.theme().colors().panel_background, 0.45),
-                    )),
-            )
-            .child(h_flex().absolute().top_2().right_2().child(
-                IconButton::new("cancel", IconName::Close).on_click(cx.listener(
-                    |_, _: &ClickEvent, _window, cx| {
-                        onboarding_event!("Cancelled", trigger = "X click");
-                        cx.emit(DismissEvent);
-                    },
-                )),
-            ))
-            .child(self.onboarding.clone())
-    }
-}
diff --git a/crates/edit_prediction/src/open_ai_response.rs b/crates/edit_prediction/src/open_ai_response.rs
deleted file mode 100644
index c7e3350936..0000000000
--- a/crates/edit_prediction/src/open_ai_response.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-pub fn text_from_response(mut res: open_ai::Response) -> Option<String> {
-    let choice = res.choices.pop()?;
-    let output_text = match choice.message {
-        open_ai::RequestMessage::Assistant {
-            content: Some(open_ai::MessageContent::Plain(content)),
-            ..
-        } => content,
-        open_ai::RequestMessage::Assistant {
-            content: Some(open_ai::MessageContent::Multipart(mut content)),
-            ..
-        } => {
-            if content.is_empty() {
-                log::error!("No output from Baseten completion response");
-                return None;
-            }
-
-            match content.remove(0) {
-                open_ai::MessagePart::Text { text } => text,
-                open_ai::MessagePart::Image { .. } => {
-                    log::error!("Expected text, got an image");
-                    return None;
-                }
-            }
-        }
-        _ => {
-            log::error!("Invalid response message: {:?}", choice.message);
-            return None;
-        }
-    };
-    Some(output_text)
-}
diff --git a/crates/edit_prediction/src/prediction.rs b/crates/edit_prediction/src/prediction.rs
deleted file mode 100644
index c63640ccd0..0000000000
--- a/crates/edit_prediction/src/prediction.rs
+++ /dev/null
@@ -1,281 +0,0 @@
-use std::{
-    ops::Range,
-    sync::Arc,
-    time::{Duration, Instant},
-};
-
-use cloud_llm_client::EditPredictionRejectReason;
-use edit_prediction_types::interpolate_edits;
-use gpui::{AsyncApp, Entity, SharedString};
-use language::{Anchor, Buffer, BufferSnapshot, EditPreview, TextBufferSnapshot};
-use zeta_prompt::ZetaPromptInput;
-
-#[derive(Clone, Default, Debug, PartialEq, Eq, Hash)]
-pub struct EditPredictionId(pub SharedString);
-
-impl From<EditPredictionId> for gpui::ElementId {
-    fn from(value: EditPredictionId) -> Self {
-        gpui::ElementId::Name(value.0)
-    }
-}
-
-impl std::fmt::Display for EditPredictionId {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
-/// A prediction response that was returned from the provider, whether it was ultimately valid or not.
-pub struct EditPredictionResult {
-    pub id: EditPredictionId,
-    pub prediction: Result<EditPrediction, EditPredictionRejectReason>,
-}
-
-impl EditPredictionResult {
-    pub async fn new(
-        id: EditPredictionId,
-        edited_buffer: &Entity<Buffer>,
-        edited_buffer_snapshot: &BufferSnapshot,
-        edits: Arc<[(Range<Anchor>, Arc<str>)]>,
-        buffer_snapshotted_at: Instant,
-        response_received_at: Instant,
-        inputs: ZetaPromptInput,
-        cx: &mut AsyncApp,
-    ) -> Self {
-        if edits.is_empty() {
-            return Self {
-                id,
-                prediction: Err(EditPredictionRejectReason::Empty),
-            };
-        }
-
-        let Some((edits, snapshot, edit_preview_task)) = edited_buffer
-            .read_with(cx, |buffer, cx| {
-                let new_snapshot = buffer.snapshot();
-                let edits: Arc<[_]> =
-                    interpolate_edits(&edited_buffer_snapshot, &new_snapshot, &edits)?.into();
-
-                Some((edits.clone(), new_snapshot, buffer.preview_edits(edits, cx)))
-            })
-            .ok()
-            .flatten()
-        else {
-            return Self {
-                id,
-                prediction: Err(EditPredictionRejectReason::InterpolatedEmpty),
-            };
-        };
-
-        let edit_preview = edit_preview_task.await;
-
-        Self {
-            id: id.clone(),
-            prediction: Ok(EditPrediction {
-                id,
-                edits,
-                snapshot,
-                edit_preview,
-                inputs,
-                buffer: edited_buffer.clone(),
-                buffer_snapshotted_at,
-                response_received_at,
-            }),
-        }
-    }
-}
-
-#[derive(Clone)]
-pub struct EditPrediction {
-    pub id: EditPredictionId,
-    pub edits: Arc<[(Range<Anchor>, Arc<str>)]>,
-    pub snapshot: BufferSnapshot,
-    pub edit_preview: EditPreview,
-    pub buffer: Entity<Buffer>,
-    pub buffer_snapshotted_at: Instant,
-    pub response_received_at: Instant,
-    pub inputs: zeta_prompt::ZetaPromptInput,
-}
-
-impl EditPrediction {
-    pub fn interpolate(
-        &self,
-        new_snapshot: &TextBufferSnapshot,
-    ) -> Option<Vec<(Range<Anchor>, Arc<str>)>> {
-        interpolate_edits(&self.snapshot, new_snapshot, &self.edits)
-    }
-
-    pub fn targets_buffer(&self, buffer: &Buffer) -> bool {
-        self.snapshot.remote_id() == buffer.remote_id()
-    }
-
-    pub fn latency(&self) -> Duration {
-        self.response_received_at - self.buffer_snapshotted_at
-    }
-}
-
-impl std::fmt::Debug for EditPrediction {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("EditPrediction")
-            .field("id", &self.id)
-            .field("edits", &self.edits)
-            .finish()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::path::Path;
-
-    use super::*;
-    use gpui::{App, Entity, TestAppContext, prelude::*};
-    use language::{Buffer, ToOffset as _};
-    use zeta_prompt::ZetaPromptInput;
-
-    #[gpui::test]
-    async fn test_edit_prediction_basic_interpolation(cx: &mut TestAppContext) {
-        let buffer = cx.new(|cx| Buffer::local("Lorem ipsum dolor", cx));
-        let edits: Arc<[(Range<Anchor>, Arc<str>)]> = cx.update(|cx| {
-            to_prediction_edits([(2..5, "REM".into()), (9..11, "".into())], &buffer, cx).into()
-        });
-
-        let edit_preview = cx
-            .read(|cx| buffer.read(cx).preview_edits(edits.clone(), cx))
-            .await;
-
-        let prediction = EditPrediction {
-            id: EditPredictionId("prediction-1".into()),
-            edits,
-            snapshot: cx.read(|cx| buffer.read(cx).snapshot()),
-            buffer: buffer.clone(),
-            edit_preview,
-            inputs: ZetaPromptInput {
-                events: vec![],
-                related_files: vec![].into(),
-                cursor_path: Path::new("path.txt").into(),
-                cursor_offset_in_excerpt: 0,
-                cursor_excerpt: "".into(),
-                editable_range_in_excerpt: 0..0,
-            },
-            buffer_snapshotted_at: Instant::now(),
-            response_received_at: Instant::now(),
-        };
-
-        cx.update(|cx| {
-            assert_eq!(
-                from_prediction_edits(
-                    &prediction.interpolate(&buffer.read(cx).snapshot()).unwrap(),
-                    &buffer,
-                    cx
-                ),
-                vec![(2..5, "REM".into()), (9..11, "".into())]
-            );
-
-            buffer.update(cx, |buffer, cx| buffer.edit([(2..5, "")], None, cx));
-            assert_eq!(
-                from_prediction_edits(
-                    &prediction.interpolate(&buffer.read(cx).snapshot()).unwrap(),
-                    &buffer,
-                    cx
-                ),
-                vec![(2..2, "REM".into()), (6..8, "".into())]
-            );
-
-            buffer.update(cx, |buffer, cx| buffer.undo(cx));
-            assert_eq!(
-                from_prediction_edits(
-                    &prediction.interpolate(&buffer.read(cx).snapshot()).unwrap(),
-                    &buffer,
-                    cx
-                ),
-                vec![(2..5, "REM".into()), (9..11, "".into())]
-            );
-
-            buffer.update(cx, |buffer, cx| buffer.edit([(2..5, "R")], None, cx));
-            assert_eq!(
-                from_prediction_edits(
-                    &prediction.interpolate(&buffer.read(cx).snapshot()).unwrap(),
-                    &buffer,
-                    cx
-                ),
-                vec![(3..3, "EM".into()), (7..9, "".into())]
-            );
-
-            buffer.update(cx, |buffer, cx| buffer.edit([(3..3, "E")], None, cx));
-            assert_eq!(
-                from_prediction_edits(
-                    &prediction.interpolate(&buffer.read(cx).snapshot()).unwrap(),
-                    &buffer,
-                    cx
-                ),
-                vec![(4..4, "M".into()), (8..10, "".into())]
-            );
-
-            buffer.update(cx, |buffer, cx| buffer.edit([(4..4, "M")], None, cx));
-            assert_eq!(
-                from_prediction_edits(
-                    &prediction.interpolate(&buffer.read(cx).snapshot()).unwrap(),
-                    &buffer,
-                    cx
-                ),
-                vec![(9..11, "".into())]
-            );
-
-            buffer.update(cx, |buffer, cx| buffer.edit([(4..5, "")], None, cx));
-            assert_eq!(
-                from_prediction_edits(
-                    &prediction.interpolate(&buffer.read(cx).snapshot()).unwrap(),
-                    &buffer,
-                    cx
-                ),
-                vec![(4..4, "M".into()), (8..10, "".into())]
-            );
-
-            buffer.update(cx, |buffer, cx| buffer.edit([(8..10, "")], None, cx));
-            assert_eq!(
-                from_prediction_edits(
-                    &prediction.interpolate(&buffer.read(cx).snapshot()).unwrap(),
-                    &buffer,
-                    cx
-                ),
-                vec![(4..4, "M".into())]
-            );
-
-            buffer.update(cx, |buffer, cx| buffer.edit([(4..6, "")], None, cx));
-            assert_eq!(prediction.interpolate(&buffer.read(cx).snapshot()), None);
-        })
-    }
-
-    fn to_prediction_edits(
-        iterator: impl IntoIterator<Item = (Range<usize>, Arc<str>)>,
-        buffer: &Entity<Buffer>,
-        cx: &App,
-    ) -> Vec<(Range<Anchor>, Arc<str>)> {
-        let buffer = buffer.read(cx);
-        iterator
-            .into_iter()
-            .map(|(range, text)| {
-                (
-                    buffer.anchor_after(range.start)..buffer.anchor_before(range.end),
-                    text,
-                )
-            })
-            .collect()
-    }
-
-    fn from_prediction_edits(
-        editor_edits: &[(Range<Anchor>, Arc<str>)],
-        buffer: &Entity<Buffer>,
-        cx: &App,
-    ) -> Vec<(Range<usize>, Arc<str>)> {
-        let buffer = buffer.read(cx);
-        editor_edits
-            .iter()
-            .map(|(range, text)| {
-                (
-                    range.start.to_offset(buffer)..range.end.to_offset(buffer),
-                    text.clone(),
-                )
-            })
-            .collect()
-    }
-}
diff --git a/crates/edit_prediction/src/sweep_ai.rs b/crates/edit_prediction/src/sweep_ai.rs
deleted file mode 100644
index f65749cead..0000000000
--- a/crates/edit_prediction/src/sweep_ai.rs
+++ /dev/null
@@ -1,426 +0,0 @@
-use anyhow::{Context as _, Result};
-use credentials_provider::CredentialsProvider;
-use futures::{AsyncReadExt as _, FutureExt, future::Shared};
-use gpui::{
-    App, AppContext as _, Task,
-    http_client::{self, AsyncBody, Method},
-};
-use language::{Point, ToOffset as _};
-use lsp::DiagnosticSeverity;
-use serde::{Deserialize, Serialize};
-use std::{
-    fmt::{self, Write as _},
-    path::Path,
-    sync::Arc,
-    time::Instant,
-};
-
-use crate::{EditPredictionId, EditPredictionModelInput, prediction::EditPredictionResult};
-
-const SWEEP_API_URL: &str = "https://autocomplete.sweep.dev/backend/next_edit_autocomplete";
-
-pub struct SweepAi {
-    pub api_token: Shared<Task<Option<String>>>,
-    pub debug_info: Arc<str>,
-}
-
-impl SweepAi {
-    pub fn new(cx: &App) -> Self {
-        SweepAi {
-            api_token: load_api_token(cx).shared(),
-            debug_info: debug_info(cx),
-        }
-    }
-
-    pub fn set_api_token(&mut self, api_token: Option<String>, cx: &mut App) -> Task<Result<()>> {
-        self.api_token = Task::ready(api_token.clone()).shared();
-        store_api_token_in_keychain(api_token, cx)
-    }
-
-    pub fn request_prediction_with_sweep(
-        &self,
-        inputs: EditPredictionModelInput,
-        cx: &mut App,
-    ) -> Task<Result<Option<EditPredictionResult>>> {
-        let debug_info = self.debug_info.clone();
-        let Some(api_token) = self.api_token.clone().now_or_never().flatten() else {
-            return Task::ready(Ok(None));
-        };
-        let full_path: Arc<Path> = inputs
-            .snapshot
-            .file()
-            .map(|file| file.full_path(cx))
-            .unwrap_or_else(|| "untitled".into())
-            .into();
-
-        let project_file = project::File::from_dyn(inputs.snapshot.file());
-        let repo_name = project_file
-            .map(|file| file.worktree.read(cx).root_name_str())
-            .unwrap_or("untitled")
-            .into();
-        let offset = inputs.position.to_offset(&inputs.snapshot);
-
-        let recent_buffers = inputs.recent_paths.iter().cloned();
-        let http_client = cx.http_client();
-
-        let recent_buffer_snapshots = recent_buffers
-            .filter_map(|project_path| {
-                let buffer = inputs.project.read(cx).get_open_buffer(&project_path, cx)?;
-                if inputs.buffer == buffer {
-                    None
-                } else {
-                    Some(buffer.read(cx).snapshot())
-                }
-            })
-            .take(3)
-            .collect::<Vec<_>>();
-
-        let buffer_snapshotted_at = Instant::now();
-
-        let result = cx.background_spawn(async move {
-            let text = inputs.snapshot.text();
-
-            let mut recent_changes = String::new();
-            for event in &inputs.events {
-                write_event(event.as_ref(), &mut recent_changes).unwrap();
-            }
-
-            let mut file_chunks = recent_buffer_snapshots
-                .into_iter()
-                .map(|snapshot| {
-                    let end_point = Point::new(30, 0).min(snapshot.max_point());
-                    FileChunk {
-                        content: snapshot.text_for_range(Point::zero()..end_point).collect(),
-                        file_path: snapshot
-                            .file()
-                            .map(|f| f.path().as_unix_str())
-                            .unwrap_or("untitled")
-                            .to_string(),
-                        start_line: 0,
-                        end_line: end_point.row as usize,
-                        timestamp: snapshot.file().and_then(|file| {
-                            Some(
-                                file.disk_state()
-                                    .mtime()?
-                                    .to_seconds_and_nanos_for_persistence()?
-                                    .0,
-                            )
-                        }),
-                    }
-                })
-                .collect::<Vec<_>>();
-
-            let retrieval_chunks = inputs
-                .related_files
-                .iter()
-                .flat_map(|related_file| {
-                    related_file.excerpts.iter().map(|excerpt| FileChunk {
-                        file_path: related_file.path.to_string_lossy().to_string(),
-                        start_line: excerpt.row_range.start as usize,
-                        end_line: excerpt.row_range.end as usize,
-                        content: excerpt.text.to_string(),
-                        timestamp: None,
-                    })
-                })
-                .collect();
-
-            let diagnostic_entries = inputs
-                .snapshot
-                .diagnostics_in_range(inputs.diagnostic_search_range, false);
-            let mut diagnostic_content = String::new();
-            let mut diagnostic_count = 0;
-
-            for entry in diagnostic_entries {
-                let start_point: Point = entry.range.start;
-
-                let severity = match entry.diagnostic.severity {
-                    DiagnosticSeverity::ERROR => "error",
-                    DiagnosticSeverity::WARNING => "warning",
-                    DiagnosticSeverity::INFORMATION => "info",
-                    DiagnosticSeverity::HINT => "hint",
-                    _ => continue,
-                };
-
-                diagnostic_count += 1;
-
-                writeln!(
-                    &mut diagnostic_content,
-                    "{} at line {}: {}",
-                    severity,
-                    start_point.row + 1,
-                    entry.diagnostic.message
-                )?;
-            }
-
-            if !diagnostic_content.is_empty() {
-                file_chunks.push(FileChunk {
-                    file_path: format!("Diagnostics for {}", full_path.display()),
-                    start_line: 0,
-                    end_line: diagnostic_count,
-                    content: diagnostic_content,
-                    timestamp: None,
-                });
-            }
-
-            let request_body = AutocompleteRequest {
-                debug_info,
-                repo_name,
-                file_path: full_path.clone(),
-                file_contents: text.clone(),
-                original_file_contents: text,
-                cursor_position: offset,
-                recent_changes: recent_changes.clone(),
-                changes_above_cursor: true,
-                multiple_suggestions: false,
-                branch: None,
-                file_chunks,
-                retrieval_chunks,
-                recent_user_actions: vec![],
-                use_bytes: true,
-                // TODO
-                privacy_mode_enabled: false,
-            };
-
-            let mut buf: Vec<u8> = Vec::new();
-            let writer = brotli::CompressorWriter::new(&mut buf, 4096, 11, 22);
-            serde_json::to_writer(writer, &request_body)?;
-            let body: AsyncBody = buf.into();
-
-            let ep_inputs = zeta_prompt::ZetaPromptInput {
-                events: inputs.events,
-                related_files: inputs.related_files.clone(),
-                cursor_path: full_path.clone(),
-                cursor_excerpt: request_body.file_contents.into(),
-                // we actually don't know
-                editable_range_in_excerpt: 0..inputs.snapshot.len(),
-                cursor_offset_in_excerpt: request_body.cursor_position,
-            };
-
-            let request = http_client::Request::builder()
-                .uri(SWEEP_API_URL)
-                .header("Content-Type", "application/json")
-                .header("Authorization", format!("Bearer {}", api_token))
-                .header("Connection", "keep-alive")
-                .header("Content-Encoding", "br")
-                .method(Method::POST)
-                .body(body)?;
-
-            let mut response = http_client.send(request).await?;
-
-            let mut body: Vec<u8> = Vec::new();
-            response.body_mut().read_to_end(&mut body).await?;
-
-            let response_received_at = Instant::now();
-            if !response.status().is_success() {
-                anyhow::bail!(
-                    "Request failed with status: {:?}\nBody: {}",
-                    response.status(),
-                    String::from_utf8_lossy(&body),
-                );
-            };
-
-            let response: AutocompleteResponse = serde_json::from_slice(&body)?;
-
-            let old_text = inputs
-                .snapshot
-                .text_for_range(response.start_index..response.end_index)
-                .collect::<String>();
-            let edits = language::text_diff(&old_text, &response.completion)
-                .into_iter()
-                .map(|(range, text)| {
-                    (
-                        inputs
-                            .snapshot
-                            .anchor_after(response.start_index + range.start)
-                            ..inputs
-                                .snapshot
-                                .anchor_before(response.start_index + range.end),
-                        text,
-                    )
-                })
-                .collect::<Vec<_>>();
-
-            anyhow::Ok((
-                response.autocomplete_id,
-                edits,
-                inputs.snapshot,
-                response_received_at,
-                ep_inputs,
-            ))
-        });
-
-        let buffer = inputs.buffer.clone();
-
-        cx.spawn(async move |cx| {
-            let (id, edits, old_snapshot, response_received_at, inputs) = result.await?;
-            anyhow::Ok(Some(
-                EditPredictionResult::new(
-                    EditPredictionId(id.into()),
-                    &buffer,
-                    &old_snapshot,
-                    edits.into(),
-                    buffer_snapshotted_at,
-                    response_received_at,
-                    inputs,
-                    cx,
-                )
-                .await,
-            ))
-        })
-    }
-}
-
-pub const SWEEP_CREDENTIALS_URL: &str = "https://autocomplete.sweep.dev";
-pub const SWEEP_CREDENTIALS_USERNAME: &str = "sweep-api-token";
-
-pub fn load_api_token(cx: &App) -> Task<Option<String>> {
-    if let Some(api_token) = std::env::var("SWEEP_AI_TOKEN")
-        .ok()
-        .filter(|value| !value.is_empty())
-    {
-        return Task::ready(Some(api_token));
-    }
-    let credentials_provider = <dyn CredentialsProvider>::global(cx);
-    cx.spawn(async move |cx| {
-        let (_, credentials) = credentials_provider
-            .read_credentials(SWEEP_CREDENTIALS_URL, &cx)
-            .await
-            .ok()??;
-        String::from_utf8(credentials).ok()
-    })
-}
-
-fn store_api_token_in_keychain(api_token: Option<String>, cx: &App) -> Task<Result<()>> {
-    let credentials_provider = <dyn CredentialsProvider>::global(cx);
-
-    cx.spawn(async move |cx| {
-        if let Some(api_token) = api_token {
-            credentials_provider
-                .write_credentials(
-                    SWEEP_CREDENTIALS_URL,
-                    SWEEP_CREDENTIALS_USERNAME,
-                    api_token.as_bytes(),
-                    cx,
-                )
-                .await
-                .context("Failed to save Sweep API token to system keychain")
-        } else {
-            credentials_provider
-                .delete_credentials(SWEEP_CREDENTIALS_URL, cx)
-                .await
-                .context("Failed to delete Sweep API token from system keychain")
-        }
-    })
-}
-
-#[derive(Debug, Clone, Serialize)]
-struct AutocompleteRequest {
-    pub debug_info: Arc<str>,
-    pub repo_name: String,
-    pub branch: Option<String>,
-    pub file_path: Arc<Path>,
-    pub file_contents: String,
-    pub recent_changes: String,
-    pub cursor_position: usize,
-    pub original_file_contents: String,
-    pub file_chunks: Vec<FileChunk>,
-    pub retrieval_chunks: Vec<FileChunk>,
-    pub recent_user_actions: Vec<UserAction>,
-    pub multiple_suggestions: bool,
-    pub privacy_mode_enabled: bool,
-    pub changes_above_cursor: bool,
-    pub use_bytes: bool,
-}
-
-#[derive(Debug, Clone, Serialize)]
-struct FileChunk {
-    pub file_path: String,
-    pub start_line: usize,
-    pub end_line: usize,
-    pub content: String,
-    pub timestamp: Option<u64>,
-}
-
-#[derive(Debug, Clone, Serialize)]
-struct UserAction {
-    pub action_type: ActionType,
-    pub line_number: usize,
-    pub offset: usize,
-    pub file_path: String,
-    pub timestamp: u64,
-}
-
-#[allow(dead_code)]
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize)]
-#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
-enum ActionType {
-    CursorMovement,
-    InsertChar,
-    DeleteChar,
-    InsertSelection,
-    DeleteSelection,
-}
-
-#[derive(Debug, Clone, Deserialize)]
-struct AutocompleteResponse {
-    pub autocomplete_id: String,
-    pub start_index: usize,
-    pub end_index: usize,
-    pub completion: String,
-    #[allow(dead_code)]
-    pub confidence: f64,
-    #[allow(dead_code)]
-    pub logprobs: Option<serde_json::Value>,
-    #[allow(dead_code)]
-    pub finish_reason: Option<String>,
-    #[allow(dead_code)]
-    pub elapsed_time_ms: u64,
-    #[allow(dead_code)]
-    #[serde(default, rename = "completions")]
-    pub additional_completions: Vec<AdditionalCompletion>,
-}
-
-#[allow(dead_code)]
-#[derive(Debug, Clone, Deserialize)]
-struct AdditionalCompletion {
-    pub start_index: usize,
-    pub end_index: usize,
-    pub completion: String,
-    pub confidence: f64,
-    pub autocomplete_id: String,
-    pub logprobs: Option<serde_json::Value>,
-    pub finish_reason: Option<String>,
-}
-
-fn write_event(event: &zeta_prompt::Event, f: &mut impl fmt::Write) -> fmt::Result {
-    match event {
-        zeta_prompt::Event::BufferChange {
-            old_path,
-            path,
-            diff,
-            ..
-        } => {
-            if old_path != path {
-                // TODO confirm how to do this for sweep
-                // writeln!(f, "User renamed {:?} to {:?}\n", old_path, new_path)?;
-            }
-
-            if !diff.is_empty() {
-                write!(f, "File: {}:\n{}\n", path.display(), diff)?
-            }
-
-            fmt::Result::Ok(())
-        }
-    }
-}
-
-fn debug_info(cx: &gpui::App) -> Arc<str> {
-    format!(
-        "Zed v{version} ({sha}) - OS: {os} - Zed v{version}",
-        version = release_channel::AppVersion::global(cx),
-        sha = release_channel::AppCommitSha::try_global(cx)
-            .map_or("unknown".to_string(), |sha| sha.full()),
-        os = client::telemetry::os_name(),
-    )
-    .into()
-}
diff --git a/crates/edit_prediction/src/udiff.rs b/crates/edit_prediction/src/udiff.rs
deleted file mode 100644
index 78fec03dd7..0000000000
--- a/crates/edit_prediction/src/udiff.rs
+++ /dev/null
@@ -1,876 +0,0 @@
-use std::borrow::Cow;
-use std::fmt::Display;
-use std::sync::Arc;
-use std::{
-    fmt::{Debug, Write},
-    mem,
-    ops::Range,
-    path::Path,
-};
-
-use anyhow::Context as _;
-use anyhow::Result;
-use anyhow::anyhow;
-use collections::HashMap;
-use gpui::AsyncApp;
-use gpui::Entity;
-use language::{Anchor, Buffer, OffsetRangeExt as _, TextBufferSnapshot};
-use project::{Project, ProjectPath};
-use util::paths::PathStyle;
-use util::rel_path::RelPath;
-
-#[derive(Clone, Debug)]
-pub struct OpenedBuffers(#[allow(unused)] HashMap<String, Entity<Buffer>>);
-
-#[must_use]
-pub async fn apply_diff(
-    diff_str: &str,
-    project: &Entity<Project>,
-    cx: &mut AsyncApp,
-) -> Result<OpenedBuffers> {
-    let mut included_files = HashMap::default();
-
-    let worktree_id = project.read_with(cx, |project, cx| {
-        anyhow::Ok(
-            project
-                .visible_worktrees(cx)
-                .next()
-                .context("no worktrees")?
-                .read(cx)
-                .id(),
-        )
-    })??;
-
-    for line in diff_str.lines() {
-        let diff_line = DiffLine::parse(line);
-
-        if let DiffLine::OldPath { path } = diff_line {
-            let buffer = project
-                .update(cx, |project, cx| {
-                    let project_path = ProjectPath {
-                        worktree_id,
-                        path: RelPath::new(Path::new(path.as_ref()), PathStyle::Posix)?.into_arc(),
-                    };
-                    anyhow::Ok(project.open_buffer(project_path, cx))
-                })??
-                .await?;
-
-            included_files.insert(path.to_string(), buffer);
-        }
-    }
-
-    let ranges = [Anchor::MIN..Anchor::MAX];
-
-    let mut diff = DiffParser::new(diff_str);
-    let mut current_file = None;
-    let mut edits = vec![];
-
-    while let Some(event) = diff.next()? {
-        match event {
-            DiffEvent::Hunk {
-                path: file_path,
-                hunk,
-            } => {
-                let (buffer, ranges) = match current_file {
-                    None => {
-                        let buffer = included_files
-                            .get_mut(file_path.as_ref())
-                            .expect("Opened all files in diff");
-
-                        current_file = Some((buffer, ranges.as_slice()));
-                        current_file.as_ref().unwrap()
-                    }
-                    Some(ref current) => current,
-                };
-
-                buffer.read_with(cx, |buffer, _| {
-                    edits.extend(
-                        resolve_hunk_edits_in_buffer(hunk, buffer, ranges)
-                            .with_context(|| format!("Diff:\n{diff_str}"))?,
-                    );
-                    anyhow::Ok(())
-                })??;
-            }
-            DiffEvent::FileEnd { renamed_to } => {
-                let (buffer, _) = current_file
-                    .take()
-                    .context("Got a FileEnd event before an Hunk event")?;
-
-                if let Some(renamed_to) = renamed_to {
-                    project
-                        .update(cx, |project, cx| {
-                            let new_project_path = project
-                                .find_project_path(Path::new(renamed_to.as_ref()), cx)
-                                .with_context(|| {
-                                    format!("Failed to find worktree for new path: {}", renamed_to)
-                                })?;
-
-                            let project_file = project::File::from_dyn(buffer.read(cx).file())
-                                .expect("Wrong file type");
-
-                            anyhow::Ok(project.rename_entry(
-                                project_file.entry_id.unwrap(),
-                                new_project_path,
-                                cx,
-                            ))
-                        })??
-                        .await?;
-                }
-
-                let edits = mem::take(&mut edits);
-                buffer.update(cx, |buffer, cx| {
-                    buffer.edit(edits, None, cx);
-                })?;
-            }
-        }
-    }
-
-    Ok(OpenedBuffers(included_files))
-}
-
-pub fn apply_diff_to_string(diff_str: &str, text: &str) -> Result<String> {
-    let mut diff = DiffParser::new(diff_str);
-
-    let mut text = text.to_string();
-
-    while let Some(event) = diff.next()? {
-        match event {
-            DiffEvent::Hunk { hunk, .. } => {
-                let hunk_offset = text
-                    .find(&hunk.context)
-                    .ok_or_else(|| anyhow!("couldn't resolve hunk {:?}", hunk.context))?;
-                for edit in hunk.edits.iter().rev() {
-                    let range = (hunk_offset + edit.range.start)..(hunk_offset + edit.range.end);
-                    text.replace_range(range, &edit.text);
-                }
-            }
-            DiffEvent::FileEnd { .. } => {}
-        }
-    }
-
-    Ok(text)
-}
-
-struct PatchFile<'a> {
-    old_path: Cow<'a, str>,
-    new_path: Cow<'a, str>,
-}
-
-struct DiffParser<'a> {
-    current_file: Option<PatchFile<'a>>,
-    current_line: Option<(&'a str, DiffLine<'a>)>,
-    hunk: Hunk,
-    diff: std::str::Lines<'a>,
-}
-
-#[derive(Debug, PartialEq)]
-enum DiffEvent<'a> {
-    Hunk { path: Cow<'a, str>, hunk: Hunk },
-    FileEnd { renamed_to: Option<Cow<'a, str>> },
-}
-
-#[derive(Debug, Default, PartialEq)]
-struct Hunk {
-    context: String,
-    edits: Vec<Edit>,
-}
-
-impl Hunk {
-    fn is_empty(&self) -> bool {
-        self.context.is_empty() && self.edits.is_empty()
-    }
-}
-
-#[derive(Debug, PartialEq)]
-struct Edit {
-    range: Range<usize>,
-    text: String,
-}
-
-impl<'a> DiffParser<'a> {
-    fn new(diff: &'a str) -> Self {
-        let mut diff = diff.lines();
-        let current_line = diff.next().map(|line| (line, DiffLine::parse(line)));
-        DiffParser {
-            current_file: None,
-            hunk: Hunk::default(),
-            current_line,
-            diff,
-        }
-    }
-
-    fn next(&mut self) -> Result<Option<DiffEvent<'a>>> {
-        loop {
-            let (hunk_done, file_done) = match self.current_line.as_ref().map(|e| &e.1) {
-                Some(DiffLine::OldPath { .. }) | Some(DiffLine::Garbage(_)) | None => (true, true),
-                Some(DiffLine::HunkHeader(_)) => (true, false),
-                _ => (false, false),
-            };
-
-            if hunk_done {
-                if let Some(file) = &self.current_file
-                    && !self.hunk.is_empty()
-                {
-                    return Ok(Some(DiffEvent::Hunk {
-                        path: file.old_path.clone(),
-                        hunk: mem::take(&mut self.hunk),
-                    }));
-                }
-            }
-
-            if file_done {
-                if let Some(PatchFile { old_path, new_path }) = self.current_file.take() {
-                    return Ok(Some(DiffEvent::FileEnd {
-                        renamed_to: if old_path != new_path {
-                            Some(new_path)
-                        } else {
-                            None
-                        },
-                    }));
-                }
-            }
-
-            let Some((line, parsed_line)) = self.current_line.take() else {
-                break;
-            };
-
-            util::maybe!({
-                match parsed_line {
-                    DiffLine::OldPath { path } => {
-                        self.current_file = Some(PatchFile {
-                            old_path: path,
-                            new_path: "".into(),
-                        });
-                    }
-                    DiffLine::NewPath { path } => {
-                        if let Some(current_file) = &mut self.current_file {
-                            current_file.new_path = path
-                        }
-                    }
-                    DiffLine::HunkHeader(_) => {}
-                    DiffLine::Context(ctx) => {
-                        if self.current_file.is_some() {
-                            writeln!(&mut self.hunk.context, "{ctx}")?;
-                        }
-                    }
-                    DiffLine::Deletion(del) => {
-                        if self.current_file.is_some() {
-                            let range = self.hunk.context.len()
-                                ..self.hunk.context.len() + del.len() + '\n'.len_utf8();
-                            if let Some(last_edit) = self.hunk.edits.last_mut()
-                                && last_edit.range.end == range.start
-                            {
-                                last_edit.range.end = range.end;
-                            } else {
-                                self.hunk.edits.push(Edit {
-                                    range,
-                                    text: String::new(),
-                                });
-                            }
-                            writeln!(&mut self.hunk.context, "{del}")?;
-                        }
-                    }
-                    DiffLine::Addition(add) => {
-                        if self.current_file.is_some() {
-                            let range = self.hunk.context.len()..self.hunk.context.len();
-                            if let Some(last_edit) = self.hunk.edits.last_mut()
-                                && last_edit.range.end == range.start
-                            {
-                                writeln!(&mut last_edit.text, "{add}").unwrap();
-                            } else {
-                                self.hunk.edits.push(Edit {
-                                    range,
-                                    text: format!("{add}\n"),
-                                });
-                            }
-                        }
-                    }
-                    DiffLine::Garbage(_) => {}
-                }
-
-                anyhow::Ok(())
-            })
-            .with_context(|| format!("on line:\n\n```\n{}```", line))?;
-
-            self.current_line = self.diff.next().map(|line| (line, DiffLine::parse(line)));
-        }
-
-        anyhow::Ok(None)
-    }
-}
-
-fn resolve_hunk_edits_in_buffer(
-    hunk: Hunk,
-    buffer: &TextBufferSnapshot,
-    ranges: &[Range<Anchor>],
-) -> Result<impl Iterator<Item = (Range<Anchor>, Arc<str>)>, anyhow::Error> {
-    let context_offset = if hunk.context.is_empty() {
-        Ok(0)
-    } else {
-        let mut offset = None;
-        for range in ranges {
-            let range = range.to_offset(buffer);
-            let text = buffer.text_for_range(range.clone()).collect::<String>();
-            for (ix, _) in text.match_indices(&hunk.context) {
-                if offset.is_some() {
-                    anyhow::bail!("Context is not unique enough:\n{}", hunk.context);
-                }
-                offset = Some(range.start + ix);
-            }
-        }
-        offset.ok_or_else(|| anyhow!("Failed to match context:\n{}", hunk.context))
-    }?;
-    let iter = hunk.edits.into_iter().flat_map(move |edit| {
-        let old_text = buffer
-            .text_for_range(context_offset + edit.range.start..context_offset + edit.range.end)
-            .collect::<String>();
-        let edits_within_hunk = language::text_diff(&old_text, &edit.text);
-        edits_within_hunk
-            .into_iter()
-            .map(move |(inner_range, inner_text)| {
-                (
-                    buffer.anchor_after(context_offset + edit.range.start + inner_range.start)
-                        ..buffer.anchor_before(context_offset + edit.range.start + inner_range.end),
-                    inner_text,
-                )
-            })
-    });
-    Ok(iter)
-}
-
-#[derive(Debug, PartialEq)]
-pub enum DiffLine<'a> {
-    OldPath { path: Cow<'a, str> },
-    NewPath { path: Cow<'a, str> },
-    HunkHeader(Option<HunkLocation>),
-    Context(&'a str),
-    Deletion(&'a str),
-    Addition(&'a str),
-    Garbage(&'a str),
-}
-
-#[derive(Debug, PartialEq)]
-pub struct HunkLocation {
-    start_line_old: u32,
-    count_old: u32,
-    start_line_new: u32,
-    count_new: u32,
-}
-
-impl<'a> DiffLine<'a> {
-    pub fn parse(line: &'a str) -> Self {
-        Self::try_parse(line).unwrap_or(Self::Garbage(line))
-    }
-
-    fn try_parse(line: &'a str) -> Option<Self> {
-        if let Some(header) = line.strip_prefix("---").and_then(eat_required_whitespace) {
-            let path = parse_header_path("a/", header);
-            Some(Self::OldPath { path })
-        } else if let Some(header) = line.strip_prefix("+++").and_then(eat_required_whitespace) {
-            Some(Self::NewPath {
-                path: parse_header_path("b/", header),
-            })
-        } else if let Some(header) = line.strip_prefix("@@").and_then(eat_required_whitespace) {
-            if header.starts_with("...") {
-                return Some(Self::HunkHeader(None));
-            }
-
-            let mut tokens = header.split_whitespace();
-            let old_range = tokens.next()?.strip_prefix('-')?;
-            let new_range = tokens.next()?.strip_prefix('+')?;
-
-            let (start_line_old, count_old) = old_range.split_once(',').unwrap_or((old_range, "1"));
-            let (start_line_new, count_new) = new_range.split_once(',').unwrap_or((new_range, "1"));
-
-            Some(Self::HunkHeader(Some(HunkLocation {
-                start_line_old: start_line_old.parse::<u32>().ok()?.saturating_sub(1),
-                count_old: count_old.parse().ok()?,
-                start_line_new: start_line_new.parse::<u32>().ok()?.saturating_sub(1),
-                count_new: count_new.parse().ok()?,
-            })))
-        } else if let Some(deleted_header) = line.strip_prefix("-") {
-            Some(Self::Deletion(deleted_header))
-        } else if line.is_empty() {
-            Some(Self::Context(""))
-        } else if let Some(context) = line.strip_prefix(" ") {
-            Some(Self::Context(context))
-        } else {
-            Some(Self::Addition(line.strip_prefix("+")?))
-        }
-    }
-}
-
-impl<'a> Display for DiffLine<'a> {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            DiffLine::OldPath { path } => write!(f, "--- {path}"),
-            DiffLine::NewPath { path } => write!(f, "+++ {path}"),
-            DiffLine::HunkHeader(Some(hunk_location)) => {
-                write!(
-                    f,
-                    "@@ -{},{} +{},{} @@",
-                    hunk_location.start_line_old + 1,
-                    hunk_location.count_old,
-                    hunk_location.start_line_new + 1,
-                    hunk_location.count_new
-                )
-            }
-            DiffLine::HunkHeader(None) => write!(f, "@@ ... @@"),
-            DiffLine::Context(content) => write!(f, " {content}"),
-            DiffLine::Deletion(content) => write!(f, "-{content}"),
-            DiffLine::Addition(content) => write!(f, "+{content}"),
-            DiffLine::Garbage(line) => write!(f, "{line}"),
-        }
-    }
-}
-
-fn parse_header_path<'a>(strip_prefix: &'static str, header: &'a str) -> Cow<'a, str> {
-    if !header.contains(['"', '\\']) {
-        let path = header.split_ascii_whitespace().next().unwrap_or(header);
-        return Cow::Borrowed(path.strip_prefix(strip_prefix).unwrap_or(path));
-    }
-
-    let mut path = String::with_capacity(header.len());
-    let mut in_quote = false;
-    let mut chars = header.chars().peekable();
-    let mut strip_prefix = Some(strip_prefix);
-
-    while let Some(char) = chars.next() {
-        if char == '"' {
-            in_quote = !in_quote;
-        } else if char == '\\' {
-            let Some(&next_char) = chars.peek() else {
-                break;
-            };
-            chars.next();
-            path.push(next_char);
-        } else if char.is_ascii_whitespace() && !in_quote {
-            break;
-        } else {
-            path.push(char);
-        }
-
-        if let Some(prefix) = strip_prefix
-            && path == prefix
-        {
-            strip_prefix.take();
-            path.clear();
-        }
-    }
-
-    Cow::Owned(path)
-}
-
-fn eat_required_whitespace(header: &str) -> Option<&str> {
-    let trimmed = header.trim_ascii_start();
-
-    if trimmed.len() == header.len() {
-        None
-    } else {
-        Some(trimmed)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use gpui::TestAppContext;
-    use indoc::indoc;
-    use pretty_assertions::assert_eq;
-    use project::{FakeFs, Project};
-    use serde_json::json;
-    use settings::SettingsStore;
-    use util::path;
-
-    #[test]
-    fn parse_lines_simple() {
-        let input = indoc! {"
-            diff --git a/text.txt b/text.txt
-            index 86c770d..a1fd855 100644
-            --- a/file.txt
-            +++ b/file.txt
-            @@ -1,2 +1,3 @@
-             context
-            -deleted
-            +inserted
-            garbage
-
-            --- b/file.txt
-            +++ a/file.txt
-        "};
-
-        let lines = input.lines().map(DiffLine::parse).collect::<Vec<_>>();
-
-        pretty_assertions::assert_eq!(
-            lines,
-            &[
-                DiffLine::Garbage("diff --git a/text.txt b/text.txt"),
-                DiffLine::Garbage("index 86c770d..a1fd855 100644"),
-                DiffLine::OldPath {
-                    path: "file.txt".into()
-                },
-                DiffLine::NewPath {
-                    path: "file.txt".into()
-                },
-                DiffLine::HunkHeader(Some(HunkLocation {
-                    start_line_old: 0,
-                    count_old: 2,
-                    start_line_new: 0,
-                    count_new: 3
-                })),
-                DiffLine::Context("context"),
-                DiffLine::Deletion("deleted"),
-                DiffLine::Addition("inserted"),
-                DiffLine::Garbage("garbage"),
-                DiffLine::Context(""),
-                DiffLine::OldPath {
-                    path: "b/file.txt".into()
-                },
-                DiffLine::NewPath {
-                    path: "a/file.txt".into()
-                },
-            ]
-        );
-    }
-
-    #[test]
-    fn file_header_extra_space() {
-        let options = ["--- file", "---   file", "---\tfile"];
-
-        for option in options {
-            pretty_assertions::assert_eq!(
-                DiffLine::parse(option),
-                DiffLine::OldPath {
-                    path: "file".into()
-                },
-                "{option}",
-            );
-        }
-    }
-
-    #[test]
-    fn hunk_header_extra_space() {
-        let options = [
-            "@@ -1,2 +1,3 @@",
-            "@@  -1,2  +1,3 @@",
-            "@@\t-1,2\t+1,3\t@@",
-            "@@ -1,2  +1,3 @@",
-            "@@ -1,2   +1,3 @@",
-            "@@ -1,2 +1,3   @@",
-            "@@ -1,2 +1,3 @@ garbage",
-        ];
-
-        for option in options {
-            pretty_assertions::assert_eq!(
-                DiffLine::parse(option),
-                DiffLine::HunkHeader(Some(HunkLocation {
-                    start_line_old: 0,
-                    count_old: 2,
-                    start_line_new: 0,
-                    count_new: 3
-                })),
-                "{option}",
-            );
-        }
-    }
-
-    #[test]
-    fn hunk_header_without_location() {
-        pretty_assertions::assert_eq!(DiffLine::parse("@@ ... @@"), DiffLine::HunkHeader(None));
-    }
-
-    #[test]
-    fn test_parse_path() {
-        assert_eq!(parse_header_path("a/", "foo.txt"), "foo.txt");
-        assert_eq!(
-            parse_header_path("a/", "foo/bar/baz.txt"),
-            "foo/bar/baz.txt"
-        );
-        assert_eq!(parse_header_path("a/", "a/foo.txt"), "foo.txt");
-        assert_eq!(
-            parse_header_path("a/", "a/foo/bar/baz.txt"),
-            "foo/bar/baz.txt"
-        );
-
-        // Extra
-        assert_eq!(
-            parse_header_path("a/", "a/foo/bar/baz.txt  2025"),
-            "foo/bar/baz.txt"
-        );
-        assert_eq!(
-            parse_header_path("a/", "a/foo/bar/baz.txt\t2025"),
-            "foo/bar/baz.txt"
-        );
-        assert_eq!(
-            parse_header_path("a/", "a/foo/bar/baz.txt \""),
-            "foo/bar/baz.txt"
-        );
-
-        // Quoted
-        assert_eq!(
-            parse_header_path("a/", "a/foo/bar/\"baz quox.txt\""),
-            "foo/bar/baz quox.txt"
-        );
-        assert_eq!(
-            parse_header_path("a/", "\"a/foo/bar/baz quox.txt\""),
-            "foo/bar/baz quox.txt"
-        );
-        assert_eq!(
-            parse_header_path("a/", "\"foo/bar/baz quox.txt\""),
-            "foo/bar/baz quox.txt"
-        );
-        assert_eq!(parse_header_path("a/", "\"whatever 🤷\""), "whatever 🤷");
-        assert_eq!(
-            parse_header_path("a/", "\"foo/bar/baz quox.txt\"  2025"),
-            "foo/bar/baz quox.txt"
-        );
-        // unescaped quotes are dropped
-        assert_eq!(parse_header_path("a/", "foo/\"bar\""), "foo/bar");
-
-        // Escaped
-        assert_eq!(
-            parse_header_path("a/", "\"foo/\\\"bar\\\"/baz.txt\""),
-            "foo/\"bar\"/baz.txt"
-        );
-        assert_eq!(
-            parse_header_path("a/", "\"C:\\\\Projects\\\\My App\\\\old file.txt\""),
-            "C:\\Projects\\My App\\old file.txt"
-        );
-    }
-
-    #[test]
-    fn test_parse_diff_with_leading_and_trailing_garbage() {
-        let diff = indoc! {"
-            I need to make some changes.
-
-            I'll change the following things:
-            - one
-              - two
-            - three
-
-            ```
-            --- a/file.txt
-            +++ b/file.txt
-             one
-            +AND
-             two
-            ```
-
-            Summary of what I did:
-            - one
-              - two
-            - three
-
-            That's about it.
-        "};
-
-        let mut events = Vec::new();
-        let mut parser = DiffParser::new(diff);
-        while let Some(event) = parser.next().unwrap() {
-            events.push(event);
-        }
-
-        assert_eq!(
-            events,
-            &[
-                DiffEvent::Hunk {
-                    path: "file.txt".into(),
-                    hunk: Hunk {
-                        context: "one\ntwo\n".into(),
-                        edits: vec![Edit {
-                            range: 4..4,
-                            text: "AND\n".into()
-                        }],
-                    }
-                },
-                DiffEvent::FileEnd { renamed_to: None }
-            ],
-        )
-    }
-
-    #[gpui::test]
-    async fn test_apply_diff_successful(cx: &mut TestAppContext) {
-        let fs = init_test(cx);
-
-        let buffer_1_text = indoc! {r#"
-            one
-            two
-            three
-            four
-            five
-        "# };
-
-        let buffer_1_text_final = indoc! {r#"
-            3
-            4
-            5
-        "# };
-
-        let buffer_2_text = indoc! {r#"
-            six
-            seven
-            eight
-            nine
-            ten
-        "# };
-
-        let buffer_2_text_final = indoc! {r#"
-            5
-            six
-            seven
-            7.5
-            eight
-            nine
-            ten
-            11
-        "# };
-
-        fs.insert_tree(
-            path!("/root"),
-            json!({
-                "file1": buffer_1_text,
-                "file2": buffer_2_text,
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs, [path!("/root").as_ref()], cx).await;
-
-        let diff = indoc! {r#"
-            --- a/file1
-            +++ b/file1
-             one
-             two
-            -three
-            +3
-             four
-             five
-            --- a/file1
-            +++ b/file1
-             3
-            -four
-            -five
-            +4
-            +5
-            --- a/file1
-            +++ b/file1
-            -one
-            -two
-             3
-             4
-            --- a/file2
-            +++ b/file2
-            +5
-             six
-            --- a/file2
-            +++ b/file2
-             seven
-            +7.5
-             eight
-            --- a/file2
-            +++ b/file2
-             ten
-            +11
-        "#};
-
-        let _buffers = apply_diff(diff, &project, &mut cx.to_async())
-            .await
-            .unwrap();
-        let buffer_1 = project
-            .update(cx, |project, cx| {
-                let project_path = project.find_project_path(path!("/root/file1"), cx).unwrap();
-                project.open_buffer(project_path, cx)
-            })
-            .await
-            .unwrap();
-
-        buffer_1.read_with(cx, |buffer, _cx| {
-            assert_eq!(buffer.text(), buffer_1_text_final);
-        });
-        let buffer_2 = project
-            .update(cx, |project, cx| {
-                let project_path = project.find_project_path(path!("/root/file2"), cx).unwrap();
-                project.open_buffer(project_path, cx)
-            })
-            .await
-            .unwrap();
-
-        buffer_2.read_with(cx, |buffer, _cx| {
-            assert_eq!(buffer.text(), buffer_2_text_final);
-        });
-    }
-
-    #[gpui::test]
-    async fn test_apply_diff_unique_via_previous_context(cx: &mut TestAppContext) {
-        let fs = init_test(cx);
-
-        let start = indoc! {r#"
-            one
-            two
-            three
-            four
-            five
-
-            four
-            five
-        "# };
-
-        let end = indoc! {r#"
-            one
-            two
-            3
-            four
-            5
-
-            four
-            five
-        "# };
-
-        fs.insert_tree(
-            path!("/root"),
-            json!({
-                "file1": start,
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs, [path!("/root").as_ref()], cx).await;
-
-        let diff = indoc! {r#"
-            --- a/file1
-            +++ b/file1
-             one
-             two
-            -three
-            +3
-             four
-            -five
-            +5
-        "#};
-
-        let _buffers = apply_diff(diff, &project, &mut cx.to_async())
-            .await
-            .unwrap();
-
-        let buffer_1 = project
-            .update(cx, |project, cx| {
-                let project_path = project.find_project_path(path!("/root/file1"), cx).unwrap();
-                project.open_buffer(project_path, cx)
-            })
-            .await
-            .unwrap();
-
-        buffer_1.read_with(cx, |buffer, _cx| {
-            assert_eq!(buffer.text(), end);
-        });
-    }
-
-    fn init_test(cx: &mut TestAppContext) -> Arc<FakeFs> {
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-        });
-
-        FakeFs::new(cx.background_executor.clone())
-    }
-}
diff --git a/crates/edit_prediction/src/zed_edit_prediction_delegate.rs b/crates/edit_prediction/src/zed_edit_prediction_delegate.rs
deleted file mode 100644
index 6dcf709224..0000000000
--- a/crates/edit_prediction/src/zed_edit_prediction_delegate.rs
+++ /dev/null
@@ -1,239 +0,0 @@
-use std::{cmp, sync::Arc};
-
-use client::{Client, UserStore};
-use cloud_llm_client::EditPredictionRejectReason;
-use edit_prediction_types::{DataCollectionState, Direction, EditPredictionDelegate};
-use gpui::{App, Entity, prelude::*};
-use language::{Buffer, ToPoint as _};
-use project::Project;
-
-use crate::{BufferEditPrediction, EditPredictionModel, EditPredictionStore};
-
-pub struct ZedEditPredictionDelegate {
-    store: Entity<EditPredictionStore>,
-    project: Entity<Project>,
-    singleton_buffer: Option<Entity<Buffer>>,
-}
-
-impl ZedEditPredictionDelegate {
-    pub fn new(
-        project: Entity<Project>,
-        singleton_buffer: Option<Entity<Buffer>>,
-        client: &Arc<Client>,
-        user_store: &Entity<UserStore>,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let store = EditPredictionStore::global(client, user_store, cx);
-        store.update(cx, |store, cx| {
-            store.register_project(&project, cx);
-        });
-
-        cx.observe(&store, |_this, _ep_store, cx| {
-            cx.notify();
-        })
-        .detach();
-
-        Self {
-            project: project,
-            store: store,
-            singleton_buffer,
-        }
-    }
-}
-
-impl EditPredictionDelegate for ZedEditPredictionDelegate {
-    fn name() -> &'static str {
-        "zed-predict"
-    }
-
-    fn display_name() -> &'static str {
-        "Zed's Edit Predictions"
-    }
-
-    fn show_predictions_in_menu() -> bool {
-        true
-    }
-
-    fn show_tab_accept_marker() -> bool {
-        true
-    }
-
-    fn data_collection_state(&self, cx: &App) -> DataCollectionState {
-        if let Some(buffer) = &self.singleton_buffer
-            && let Some(file) = buffer.read(cx).file()
-        {
-            let is_project_open_source =
-                self.store
-                    .read(cx)
-                    .is_file_open_source(&self.project, file, cx);
-            if self.store.read(cx).data_collection_choice.is_enabled() {
-                DataCollectionState::Enabled {
-                    is_project_open_source,
-                }
-            } else {
-                DataCollectionState::Disabled {
-                    is_project_open_source,
-                }
-            }
-        } else {
-            return DataCollectionState::Disabled {
-                is_project_open_source: false,
-            };
-        }
-    }
-
-    fn toggle_data_collection(&mut self, cx: &mut App) {
-        self.store.update(cx, |store, cx| {
-            store.toggle_data_collection_choice(cx);
-        });
-    }
-
-    fn usage(&self, cx: &App) -> Option<client::EditPredictionUsage> {
-        self.store.read(cx).usage(cx)
-    }
-
-    fn is_enabled(
-        &self,
-        _buffer: &Entity<language::Buffer>,
-        _cursor_position: language::Anchor,
-        cx: &App,
-    ) -> bool {
-        let store = self.store.read(cx);
-        if store.edit_prediction_model == EditPredictionModel::Sweep {
-            store.has_sweep_api_token()
-        } else {
-            true
-        }
-    }
-
-    fn is_refreshing(&self, cx: &App) -> bool {
-        self.store.read(cx).is_refreshing(&self.project)
-    }
-
-    fn refresh(
-        &mut self,
-        buffer: Entity<language::Buffer>,
-        cursor_position: language::Anchor,
-        _debounce: bool,
-        cx: &mut Context<Self>,
-    ) {
-        let store = self.store.read(cx);
-
-        if store.user_store.read_with(cx, |user_store, _cx| {
-            user_store.account_too_young() || user_store.has_overdue_invoices()
-        }) {
-            return;
-        }
-
-        self.store.update(cx, |store, cx| {
-            if let Some(current) =
-                store.prediction_at(&buffer, Some(cursor_position), &self.project, cx)
-                && let BufferEditPrediction::Local { prediction } = current
-                && prediction.interpolate(buffer.read(cx)).is_some()
-            {
-                return;
-            }
-
-            store.refresh_context(&self.project, &buffer, cursor_position, cx);
-            store.refresh_prediction_from_buffer(self.project.clone(), buffer, cursor_position, cx)
-        });
-    }
-
-    fn cycle(
-        &mut self,
-        _buffer: Entity<language::Buffer>,
-        _cursor_position: language::Anchor,
-        _direction: Direction,
-        _cx: &mut Context<Self>,
-    ) {
-    }
-
-    fn accept(&mut self, cx: &mut Context<Self>) {
-        self.store.update(cx, |store, cx| {
-            store.accept_current_prediction(&self.project, cx);
-        });
-    }
-
-    fn discard(&mut self, cx: &mut Context<Self>) {
-        self.store.update(cx, |store, _cx| {
-            store.reject_current_prediction(EditPredictionRejectReason::Discarded, &self.project);
-        });
-    }
-
-    fn did_show(&mut self, cx: &mut Context<Self>) {
-        self.store.update(cx, |store, cx| {
-            store.did_show_current_prediction(&self.project, cx);
-        });
-    }
-
-    fn suggest(
-        &mut self,
-        buffer: &Entity<language::Buffer>,
-        cursor_position: language::Anchor,
-        cx: &mut Context<Self>,
-    ) -> Option<edit_prediction_types::EditPrediction> {
-        self.store.update(cx, |store, cx| {
-            let prediction =
-                store.prediction_at(buffer, Some(cursor_position), &self.project, cx)?;
-
-            let prediction = match prediction {
-                BufferEditPrediction::Local { prediction } => prediction,
-                BufferEditPrediction::Jump { prediction } => {
-                    return Some(edit_prediction_types::EditPrediction::Jump {
-                        id: Some(prediction.id.to_string().into()),
-                        snapshot: prediction.snapshot.clone(),
-                        target: prediction.edits.first().unwrap().0.start,
-                    });
-                }
-            };
-
-            let buffer = buffer.read(cx);
-            let snapshot = buffer.snapshot();
-
-            let Some(edits) = prediction.interpolate(&snapshot) else {
-                store.reject_current_prediction(
-                    EditPredictionRejectReason::InterpolatedEmpty,
-                    &self.project,
-                );
-                return None;
-            };
-
-            let cursor_row = cursor_position.to_point(&snapshot).row;
-            let (closest_edit_ix, (closest_edit_range, _)) =
-                edits.iter().enumerate().min_by_key(|(_, (range, _))| {
-                    let distance_from_start =
-                        cursor_row.abs_diff(range.start.to_point(&snapshot).row);
-                    let distance_from_end = cursor_row.abs_diff(range.end.to_point(&snapshot).row);
-                    cmp::min(distance_from_start, distance_from_end)
-                })?;
-
-            let mut edit_start_ix = closest_edit_ix;
-            for (range, _) in edits[..edit_start_ix].iter().rev() {
-                let distance_from_closest_edit = closest_edit_range.start.to_point(&snapshot).row
-                    - range.end.to_point(&snapshot).row;
-                if distance_from_closest_edit <= 1 {
-                    edit_start_ix -= 1;
-                } else {
-                    break;
-                }
-            }
-
-            let mut edit_end_ix = closest_edit_ix + 1;
-            for (range, _) in &edits[edit_end_ix..] {
-                let distance_from_closest_edit = range.start.to_point(buffer).row
-                    - closest_edit_range.end.to_point(&snapshot).row;
-                if distance_from_closest_edit <= 1 {
-                    edit_end_ix += 1;
-                } else {
-                    break;
-                }
-            }
-
-            Some(edit_prediction_types::EditPrediction::Local {
-                id: Some(prediction.id.to_string().into()),
-                edits: edits[edit_start_ix..edit_end_ix].to_vec(),
-                edit_preview: Some(prediction.edit_preview.clone()),
-            })
-        })
-    }
-}
diff --git a/crates/edit_prediction/src/zeta1.rs b/crates/edit_prediction/src/zeta1.rs
deleted file mode 100644
index ed531749cb..0000000000
--- a/crates/edit_prediction/src/zeta1.rs
+++ /dev/null
@@ -1,667 +0,0 @@
-use std::{fmt::Write, ops::Range, path::Path, sync::Arc, time::Instant};
-
-use crate::{
-    DebugEvent, EditPredictionFinishedDebugEvent, EditPredictionId, EditPredictionModelInput,
-    EditPredictionStartedDebugEvent, EditPredictionStore, ZedUpdateRequiredError,
-    cursor_excerpt::{editable_and_context_ranges_for_cursor_position, guess_token_count},
-    prediction::EditPredictionResult,
-};
-use anyhow::{Context as _, Result};
-use cloud_llm_client::{
-    PredictEditsBody, PredictEditsGitInfo, PredictEditsRequestTrigger, PredictEditsResponse,
-};
-use gpui::{App, AppContext as _, AsyncApp, Context, Entity, SharedString, Task};
-use language::{
-    Anchor, Buffer, BufferSnapshot, OffsetRangeExt as _, Point, ToOffset, ToPoint as _, text_diff,
-};
-use project::{Project, ProjectPath};
-use release_channel::AppVersion;
-use workspace::notifications::{ErrorMessagePrompt, NotificationId, show_app_notification};
-use zeta_prompt::{Event, ZetaPromptInput};
-
-const CURSOR_MARKER: &str = "<|user_cursor_is_here|>";
-const START_OF_FILE_MARKER: &str = "<|start_of_file|>";
-const EDITABLE_REGION_START_MARKER: &str = "<|editable_region_start|>";
-const EDITABLE_REGION_END_MARKER: &str = "<|editable_region_end|>";
-
-pub(crate) const MAX_CONTEXT_TOKENS: usize = 150;
-pub(crate) const MAX_REWRITE_TOKENS: usize = 350;
-pub(crate) const MAX_EVENT_TOKENS: usize = 500;
-
-pub(crate) fn request_prediction_with_zeta1(
-    store: &mut EditPredictionStore,
-    EditPredictionModelInput {
-        project,
-        buffer,
-        snapshot,
-        position,
-        events,
-        trigger,
-        debug_tx,
-        ..
-    }: EditPredictionModelInput,
-    cx: &mut Context<EditPredictionStore>,
-) -> Task<Result<Option<EditPredictionResult>>> {
-    let buffer_snapshotted_at = Instant::now();
-    let client = store.client.clone();
-    let llm_token = store.llm_token.clone();
-    let app_version = AppVersion::global(cx);
-
-    let (git_info, can_collect_file) = if let Some(file) = snapshot.file() {
-        let can_collect_file = store.can_collect_file(&project, file, cx);
-        let git_info = if can_collect_file {
-            git_info_for_file(&project, &ProjectPath::from_file(file.as_ref(), cx), cx)
-        } else {
-            None
-        };
-        (git_info, can_collect_file)
-    } else {
-        (None, false)
-    };
-
-    let full_path: Arc<Path> = snapshot
-        .file()
-        .map(|f| Arc::from(f.full_path(cx).as_path()))
-        .unwrap_or_else(|| Arc::from(Path::new("untitled")));
-    let full_path_str = full_path.to_string_lossy().into_owned();
-    let cursor_point = position.to_point(&snapshot);
-    let prompt_for_events = {
-        let events = events.clone();
-        move || prompt_for_events_impl(&events, MAX_EVENT_TOKENS)
-    };
-    let gather_task = gather_context(
-        full_path_str,
-        &snapshot,
-        cursor_point,
-        prompt_for_events,
-        trigger,
-        cx,
-    );
-
-    cx.spawn(async move |this, cx| {
-        let GatherContextOutput {
-            mut body,
-            context_range,
-            editable_range,
-            included_events_count,
-        } = gather_task.await?;
-        let done_gathering_context_at = Instant::now();
-
-        let included_events = &events[events.len() - included_events_count..events.len()];
-        body.can_collect_data = can_collect_file
-            && this
-                .read_with(cx, |this, _| this.can_collect_events(included_events))
-                .unwrap_or(false);
-        if body.can_collect_data {
-            body.git_info = git_info;
-        }
-
-        log::debug!(
-            "Events:\n{}\nExcerpt:\n{:?}",
-            body.input_events,
-            body.input_excerpt
-        );
-
-        let http_client = client.http_client();
-
-        let response = EditPredictionStore::send_api_request::<PredictEditsResponse>(
-            |request| {
-                let uri = if let Ok(predict_edits_url) = std::env::var("ZED_PREDICT_EDITS_URL") {
-                    predict_edits_url
-                } else {
-                    http_client
-                        .build_zed_llm_url("/predict_edits/v2", &[])?
-                        .as_str()
-                        .into()
-                };
-                Ok(request
-                    .uri(uri)
-                    .body(serde_json::to_string(&body)?.into())?)
-            },
-            client,
-            llm_token,
-            app_version,
-        )
-        .await;
-
-        let context_start_offset = context_range.start.to_offset(&snapshot);
-        let editable_offset_range = editable_range.to_offset(&snapshot);
-
-        let inputs = ZetaPromptInput {
-            events: included_events.into(),
-            related_files: vec![].into(),
-            cursor_path: full_path,
-            cursor_excerpt: snapshot
-                .text_for_range(context_range)
-                .collect::<String>()
-                .into(),
-            editable_range_in_excerpt: (editable_range.start - context_start_offset)
-                ..(editable_offset_range.end - context_start_offset),
-            cursor_offset_in_excerpt: cursor_point.to_offset(&snapshot) - context_start_offset,
-        };
-
-        if let Some(debug_tx) = &debug_tx {
-            debug_tx
-                .unbounded_send(DebugEvent::EditPredictionStarted(
-                    EditPredictionStartedDebugEvent {
-                        buffer: buffer.downgrade(),
-                        prompt: Some(serde_json::to_string(&inputs).unwrap()),
-                        position,
-                    },
-                ))
-                .ok();
-        }
-
-        let (response, usage) = match response {
-            Ok(response) => response,
-            Err(err) => {
-                if err.is::<ZedUpdateRequiredError>() {
-                    cx.update(|cx| {
-                        this.update(cx, |ep_store, _cx| {
-                            ep_store.update_required = true;
-                        })
-                        .ok();
-
-                        let error_message: SharedString = err.to_string().into();
-                        show_app_notification(
-                            NotificationId::unique::<ZedUpdateRequiredError>(),
-                            cx,
-                            move |cx| {
-                                cx.new(|cx| {
-                                    ErrorMessagePrompt::new(error_message.clone(), cx)
-                                        .with_link_button("Update Zed", "https://zed.dev/releases")
-                                })
-                            },
-                        );
-                    })
-                    .ok();
-                }
-
-                return Err(err);
-            }
-        };
-
-        let received_response_at = Instant::now();
-        log::debug!("completion response: {}", &response.output_excerpt);
-
-        if let Some(usage) = usage {
-            this.update(cx, |this, cx| {
-                this.user_store.update(cx, |user_store, cx| {
-                    user_store.update_edit_prediction_usage(usage, cx);
-                });
-            })
-            .ok();
-        }
-
-        if let Some(debug_tx) = &debug_tx {
-            debug_tx
-                .unbounded_send(DebugEvent::EditPredictionFinished(
-                    EditPredictionFinishedDebugEvent {
-                        buffer: buffer.downgrade(),
-                        model_output: Some(response.output_excerpt.clone()),
-                        position,
-                    },
-                ))
-                .ok();
-        }
-
-        let edit_prediction = process_completion_response(
-            response,
-            buffer,
-            &snapshot,
-            editable_range,
-            inputs,
-            buffer_snapshotted_at,
-            received_response_at,
-            cx,
-        )
-        .await;
-
-        let finished_at = Instant::now();
-
-        // record latency for ~1% of requests
-        if rand::random::<u8>() <= 2 {
-            telemetry::event!(
-                "Edit Prediction Request",
-                context_latency = done_gathering_context_at
-                    .duration_since(buffer_snapshotted_at)
-                    .as_millis(),
-                request_latency = received_response_at
-                    .duration_since(done_gathering_context_at)
-                    .as_millis(),
-                process_latency = finished_at.duration_since(received_response_at).as_millis()
-            );
-        }
-
-        edit_prediction.map(Some)
-    })
-}
-
-fn process_completion_response(
-    prediction_response: PredictEditsResponse,
-    buffer: Entity<Buffer>,
-    snapshot: &BufferSnapshot,
-    editable_range: Range<usize>,
-    inputs: ZetaPromptInput,
-    buffer_snapshotted_at: Instant,
-    received_response_at: Instant,
-    cx: &AsyncApp,
-) -> Task<Result<EditPredictionResult>> {
-    let snapshot = snapshot.clone();
-    let request_id = prediction_response.request_id;
-    let output_excerpt = prediction_response.output_excerpt;
-    cx.spawn(async move |cx| {
-        let output_excerpt: Arc<str> = output_excerpt.into();
-
-        let edits: Arc<[(Range<Anchor>, Arc<str>)]> = cx
-            .background_spawn({
-                let output_excerpt = output_excerpt.clone();
-                let editable_range = editable_range.clone();
-                let snapshot = snapshot.clone();
-                async move { parse_edits(output_excerpt, editable_range, &snapshot) }
-            })
-            .await?
-            .into();
-
-        let id = EditPredictionId(request_id.into());
-        Ok(EditPredictionResult::new(
-            id,
-            &buffer,
-            &snapshot,
-            edits,
-            buffer_snapshotted_at,
-            received_response_at,
-            inputs,
-            cx,
-        )
-        .await)
-    })
-}
-
-fn parse_edits(
-    output_excerpt: Arc<str>,
-    editable_range: Range<usize>,
-    snapshot: &BufferSnapshot,
-) -> Result<Vec<(Range<Anchor>, Arc<str>)>> {
-    let content = output_excerpt.replace(CURSOR_MARKER, "");
-
-    let start_markers = content
-        .match_indices(EDITABLE_REGION_START_MARKER)
-        .collect::<Vec<_>>();
-    anyhow::ensure!(
-        start_markers.len() == 1,
-        "expected exactly one start marker, found {}",
-        start_markers.len()
-    );
-
-    let end_markers = content
-        .match_indices(EDITABLE_REGION_END_MARKER)
-        .collect::<Vec<_>>();
-    anyhow::ensure!(
-        end_markers.len() == 1,
-        "expected exactly one end marker, found {}",
-        end_markers.len()
-    );
-
-    let sof_markers = content
-        .match_indices(START_OF_FILE_MARKER)
-        .collect::<Vec<_>>();
-    anyhow::ensure!(
-        sof_markers.len() <= 1,
-        "expected at most one start-of-file marker, found {}",
-        sof_markers.len()
-    );
-
-    let codefence_start = start_markers[0].0;
-    let content = &content[codefence_start..];
-
-    let newline_ix = content.find('\n').context("could not find newline")?;
-    let content = &content[newline_ix + 1..];
-
-    let codefence_end = content
-        .rfind(&format!("\n{EDITABLE_REGION_END_MARKER}"))
-        .context("could not find end marker")?;
-    let new_text = &content[..codefence_end];
-
-    let old_text = snapshot
-        .text_for_range(editable_range.clone())
-        .collect::<String>();
-
-    Ok(compute_edits(
-        old_text,
-        new_text,
-        editable_range.start,
-        snapshot,
-    ))
-}
-
-pub fn compute_edits(
-    old_text: String,
-    new_text: &str,
-    offset: usize,
-    snapshot: &BufferSnapshot,
-) -> Vec<(Range<Anchor>, Arc<str>)> {
-    text_diff(&old_text, new_text)
-        .into_iter()
-        .map(|(mut old_range, new_text)| {
-            old_range.start += offset;
-            old_range.end += offset;
-
-            let prefix_len = common_prefix(
-                snapshot.chars_for_range(old_range.clone()),
-                new_text.chars(),
-            );
-            old_range.start += prefix_len;
-
-            let suffix_len = common_prefix(
-                snapshot.reversed_chars_for_range(old_range.clone()),
-                new_text[prefix_len..].chars().rev(),
-            );
-            old_range.end = old_range.end.saturating_sub(suffix_len);
-
-            let new_text = new_text[prefix_len..new_text.len() - suffix_len].into();
-            let range = if old_range.is_empty() {
-                let anchor = snapshot.anchor_after(old_range.start);
-                anchor..anchor
-            } else {
-                snapshot.anchor_after(old_range.start)..snapshot.anchor_before(old_range.end)
-            };
-            (range, new_text)
-        })
-        .collect()
-}
-
-fn common_prefix<T1: Iterator<Item = char>, T2: Iterator<Item = char>>(a: T1, b: T2) -> usize {
-    a.zip(b)
-        .take_while(|(a, b)| a == b)
-        .map(|(a, _)| a.len_utf8())
-        .sum()
-}
-
-fn git_info_for_file(
-    project: &Entity<Project>,
-    project_path: &ProjectPath,
-    cx: &App,
-) -> Option<PredictEditsGitInfo> {
-    let git_store = project.read(cx).git_store().read(cx);
-    if let Some((repository, _repo_path)) =
-        git_store.repository_and_path_for_project_path(project_path, cx)
-    {
-        let repository = repository.read(cx);
-        let head_sha = repository
-            .head_commit
-            .as_ref()
-            .map(|head_commit| head_commit.sha.to_string());
-        let remote_origin_url = repository.remote_origin_url.clone();
-        let remote_upstream_url = repository.remote_upstream_url.clone();
-        if head_sha.is_none() && remote_origin_url.is_none() && remote_upstream_url.is_none() {
-            return None;
-        }
-        Some(PredictEditsGitInfo {
-            head_sha,
-            remote_origin_url,
-            remote_upstream_url,
-        })
-    } else {
-        None
-    }
-}
-
-pub struct GatherContextOutput {
-    pub body: PredictEditsBody,
-    pub context_range: Range<Point>,
-    pub editable_range: Range<usize>,
-    pub included_events_count: usize,
-}
-
-pub fn gather_context(
-    full_path_str: String,
-    snapshot: &BufferSnapshot,
-    cursor_point: language::Point,
-    prompt_for_events: impl FnOnce() -> (String, usize) + Send + 'static,
-    trigger: PredictEditsRequestTrigger,
-    cx: &App,
-) -> Task<Result<GatherContextOutput>> {
-    cx.background_spawn({
-        let snapshot = snapshot.clone();
-        async move {
-            let input_excerpt = excerpt_for_cursor_position(
-                cursor_point,
-                &full_path_str,
-                &snapshot,
-                MAX_REWRITE_TOKENS,
-                MAX_CONTEXT_TOKENS,
-            );
-            let (input_events, included_events_count) = prompt_for_events();
-            let editable_range = input_excerpt.editable_range.to_offset(&snapshot);
-
-            let body = PredictEditsBody {
-                input_events,
-                input_excerpt: input_excerpt.prompt,
-                can_collect_data: false,
-                diagnostic_groups: None,
-                git_info: None,
-                outline: None,
-                speculated_output: None,
-                trigger,
-            };
-
-            Ok(GatherContextOutput {
-                body,
-                context_range: input_excerpt.context_range,
-                editable_range,
-                included_events_count,
-            })
-        }
-    })
-}
-
-fn prompt_for_events_impl(events: &[Arc<Event>], mut remaining_tokens: usize) -> (String, usize) {
-    let mut result = String::new();
-    for (ix, event) in events.iter().rev().enumerate() {
-        let event_string = format_event(event.as_ref());
-        let event_tokens = guess_token_count(event_string.len());
-        if event_tokens > remaining_tokens {
-            return (result, ix);
-        }
-
-        if !result.is_empty() {
-            result.insert_str(0, "\n\n");
-        }
-        result.insert_str(0, &event_string);
-        remaining_tokens -= event_tokens;
-    }
-    return (result, events.len());
-}
-
-pub fn format_event(event: &Event) -> String {
-    match event {
-        Event::BufferChange {
-            path,
-            old_path,
-            diff,
-            ..
-        } => {
-            let mut prompt = String::new();
-
-            if old_path != path {
-                writeln!(
-                    prompt,
-                    "User renamed {} to {}\n",
-                    old_path.display(),
-                    path.display()
-                )
-                .unwrap();
-            }
-
-            if !diff.is_empty() {
-                write!(
-                    prompt,
-                    "User edited {}:\n```diff\n{}\n```",
-                    path.display(),
-                    diff
-                )
-                .unwrap();
-            }
-
-            prompt
-        }
-    }
-}
-
-#[derive(Debug)]
-pub struct InputExcerpt {
-    pub context_range: Range<Point>,
-    pub editable_range: Range<Point>,
-    pub prompt: String,
-}
-
-pub fn excerpt_for_cursor_position(
-    position: Point,
-    path: &str,
-    snapshot: &BufferSnapshot,
-    editable_region_token_limit: usize,
-    context_token_limit: usize,
-) -> InputExcerpt {
-    let (editable_range, context_range) = editable_and_context_ranges_for_cursor_position(
-        position,
-        snapshot,
-        editable_region_token_limit,
-        context_token_limit,
-    );
-
-    let mut prompt = String::new();
-
-    writeln!(&mut prompt, "```{path}").unwrap();
-    if context_range.start == Point::zero() {
-        writeln!(&mut prompt, "{START_OF_FILE_MARKER}").unwrap();
-    }
-
-    for chunk in snapshot.chunks(context_range.start..editable_range.start, false) {
-        prompt.push_str(chunk.text);
-    }
-
-    push_editable_range(position, snapshot, editable_range.clone(), &mut prompt);
-
-    for chunk in snapshot.chunks(editable_range.end..context_range.end, false) {
-        prompt.push_str(chunk.text);
-    }
-    write!(prompt, "\n```").unwrap();
-
-    InputExcerpt {
-        context_range,
-        editable_range,
-        prompt,
-    }
-}
-
-fn push_editable_range(
-    cursor_position: Point,
-    snapshot: &BufferSnapshot,
-    editable_range: Range<Point>,
-    prompt: &mut String,
-) {
-    writeln!(prompt, "{EDITABLE_REGION_START_MARKER}").unwrap();
-    for chunk in snapshot.chunks(editable_range.start..cursor_position, false) {
-        prompt.push_str(chunk.text);
-    }
-    prompt.push_str(CURSOR_MARKER);
-    for chunk in snapshot.chunks(cursor_position..editable_range.end, false) {
-        prompt.push_str(chunk.text);
-    }
-    write!(prompt, "\n{EDITABLE_REGION_END_MARKER}").unwrap();
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use gpui::{App, AppContext};
-    use indoc::indoc;
-    use language::Buffer;
-
-    #[gpui::test]
-    fn test_excerpt_for_cursor_position(cx: &mut App) {
-        let text = indoc! {r#"
-            fn foo() {
-                let x = 42;
-                println!("Hello, world!");
-            }
-
-            fn bar() {
-                let x = 42;
-                let mut sum = 0;
-                for i in 0..x {
-                    sum += i;
-                }
-                println!("Sum: {}", sum);
-                return sum;
-            }
-
-            fn generate_random_numbers() -> Vec<i32> {
-                let mut rng = rand::thread_rng();
-                let mut numbers = Vec::new();
-                for _ in 0..5 {
-                    numbers.push(rng.random_range(1..101));
-                }
-                numbers
-            }
-        "#};
-        let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(language::rust_lang(), cx));
-        let snapshot = buffer.read(cx).snapshot();
-
-        // Ensure we try to fit the largest possible syntax scope, resorting to line-based expansion
-        // when a larger scope doesn't fit the editable region.
-        let excerpt = excerpt_for_cursor_position(Point::new(12, 5), "main.rs", &snapshot, 50, 32);
-        assert_eq!(
-            excerpt.prompt,
-            indoc! {r#"
-            ```main.rs
-                let x = 42;
-                println!("Hello, world!");
-            <|editable_region_start|>
-            }
-
-            fn bar() {
-                let x = 42;
-                let mut sum = 0;
-                for i in 0..x {
-                    sum += i;
-                }
-                println!("Sum: {}", sum);
-                r<|user_cursor_is_here|>eturn sum;
-            }
-
-            fn generate_random_numbers() -> Vec<i32> {
-            <|editable_region_end|>
-                let mut rng = rand::thread_rng();
-                let mut numbers = Vec::new();
-            ```"#}
-        );
-
-        // The `bar` function won't fit within the editable region, so we resort to line-based expansion.
-        let excerpt = excerpt_for_cursor_position(Point::new(12, 5), "main.rs", &snapshot, 40, 32);
-        assert_eq!(
-            excerpt.prompt,
-            indoc! {r#"
-            ```main.rs
-            fn bar() {
-                let x = 42;
-                let mut sum = 0;
-            <|editable_region_start|>
-                for i in 0..x {
-                    sum += i;
-                }
-                println!("Sum: {}", sum);
-                r<|user_cursor_is_here|>eturn sum;
-            }
-
-            fn generate_random_numbers() -> Vec<i32> {
-                let mut rng = rand::thread_rng();
-            <|editable_region_end|>
-                let mut numbers = Vec::new();
-                for _ in 0..5 {
-                    numbers.push(rng.random_range(1..101));
-            ```"#}
-        );
-    }
-}
diff --git a/crates/edit_prediction/src/zeta2.rs b/crates/edit_prediction/src/zeta2.rs
deleted file mode 100644
index 8586e6caae..0000000000
--- a/crates/edit_prediction/src/zeta2.rs
+++ /dev/null
@@ -1,240 +0,0 @@
-#[cfg(feature = "cli-support")]
-use crate::EvalCacheEntryKind;
-use crate::open_ai_response::text_from_response;
-use crate::prediction::EditPredictionResult;
-use crate::{
-    DebugEvent, EDIT_PREDICTIONS_MODEL_ID, EditPredictionFinishedDebugEvent, EditPredictionId,
-    EditPredictionModelInput, EditPredictionStartedDebugEvent, EditPredictionStore,
-};
-use anyhow::{Result, anyhow};
-use cloud_llm_client::EditPredictionRejectReason;
-use gpui::{Task, prelude::*};
-use language::{OffsetRangeExt as _, ToOffset as _, ToPoint};
-use release_channel::AppVersion;
-use std::{path::Path, sync::Arc, time::Instant};
-use zeta_prompt::CURSOR_MARKER;
-use zeta_prompt::format_zeta_prompt;
-
-const MAX_CONTEXT_TOKENS: usize = 150;
-const MAX_REWRITE_TOKENS: usize = 350;
-
-pub fn request_prediction_with_zeta2(
-    store: &mut EditPredictionStore,
-    EditPredictionModelInput {
-        buffer,
-        snapshot,
-        position,
-        related_files,
-        events,
-        debug_tx,
-        ..
-    }: EditPredictionModelInput,
-    cx: &mut Context<EditPredictionStore>,
-) -> Task<Result<Option<EditPredictionResult>>> {
-    let buffer_snapshotted_at = Instant::now();
-
-    let Some(excerpt_path) = snapshot
-        .file()
-        .map(|file| -> Arc<Path> { file.full_path(cx).into() })
-    else {
-        return Task::ready(Err(anyhow!("No file path for excerpt")));
-    };
-
-    let client = store.client.clone();
-    let llm_token = store.llm_token.clone();
-    let app_version = AppVersion::global(cx);
-
-    #[cfg(feature = "cli-support")]
-    let eval_cache = store.eval_cache.clone();
-
-    let request_task = cx.background_spawn({
-        async move {
-            let cursor_offset = position.to_offset(&snapshot);
-            let (editable_offset_range, prompt_input) = zeta2_prompt_input(
-                &snapshot,
-                related_files,
-                events,
-                excerpt_path,
-                cursor_offset,
-            );
-
-            let prompt = format_zeta_prompt(&prompt_input);
-
-            if let Some(debug_tx) = &debug_tx {
-                debug_tx
-                    .unbounded_send(DebugEvent::EditPredictionStarted(
-                        EditPredictionStartedDebugEvent {
-                            buffer: buffer.downgrade(),
-                            prompt: Some(prompt.clone()),
-                            position,
-                        },
-                    ))
-                    .ok();
-            }
-
-            let request = open_ai::Request {
-                model: EDIT_PREDICTIONS_MODEL_ID.clone(),
-                messages: vec![open_ai::RequestMessage::User {
-                    content: open_ai::MessageContent::Plain(prompt),
-                }],
-                stream: false,
-                max_completion_tokens: None,
-                stop: Default::default(),
-                temperature: Default::default(),
-                tool_choice: None,
-                parallel_tool_calls: None,
-                tools: vec![],
-                prompt_cache_key: None,
-                reasoning_effort: None,
-            };
-
-            log::trace!("Sending edit prediction request");
-
-            let response = EditPredictionStore::send_raw_llm_request(
-                request,
-                client,
-                llm_token,
-                app_version,
-                #[cfg(feature = "cli-support")]
-                eval_cache,
-                #[cfg(feature = "cli-support")]
-                EvalCacheEntryKind::Prediction,
-            )
-            .await;
-            let received_response_at = Instant::now();
-
-            log::trace!("Got edit prediction response");
-
-            let (res, usage) = response?;
-            let request_id = EditPredictionId(res.id.clone().into());
-            let Some(mut output_text) = text_from_response(res) else {
-                return Ok((Some((request_id, None)), usage));
-            };
-
-            if let Some(debug_tx) = &debug_tx {
-                debug_tx
-                    .unbounded_send(DebugEvent::EditPredictionFinished(
-                        EditPredictionFinishedDebugEvent {
-                            buffer: buffer.downgrade(),
-                            position,
-                            model_output: Some(output_text.clone()),
-                        },
-                    ))
-                    .ok();
-            }
-
-            if output_text.contains(CURSOR_MARKER) {
-                log::trace!("Stripping out {CURSOR_MARKER} from response");
-                output_text = output_text.replace(CURSOR_MARKER, "");
-            }
-
-            let old_text = snapshot
-                .text_for_range(editable_offset_range.clone())
-                .collect::<String>();
-            let edits: Vec<_> = language::text_diff(&old_text, &output_text)
-                .into_iter()
-                .map(|(range, text)| {
-                    (
-                        snapshot.anchor_after(editable_offset_range.start + range.start)
-                            ..snapshot.anchor_before(editable_offset_range.start + range.end),
-                        text,
-                    )
-                })
-                .collect();
-
-            anyhow::Ok((
-                Some((
-                    request_id,
-                    Some((
-                        prompt_input,
-                        buffer,
-                        snapshot.clone(),
-                        edits,
-                        received_response_at,
-                    )),
-                )),
-                usage,
-            ))
-        }
-    });
-
-    cx.spawn(async move |this, cx| {
-        let Some((id, prediction)) =
-            EditPredictionStore::handle_api_response(&this, request_task.await, cx)?
-        else {
-            return Ok(None);
-        };
-
-        let Some((inputs, edited_buffer, edited_buffer_snapshot, edits, received_response_at)) =
-            prediction
-        else {
-            return Ok(Some(EditPredictionResult {
-                id,
-                prediction: Err(EditPredictionRejectReason::Empty),
-            }));
-        };
-
-        Ok(Some(
-            EditPredictionResult::new(
-                id,
-                &edited_buffer,
-                &edited_buffer_snapshot,
-                edits.into(),
-                buffer_snapshotted_at,
-                received_response_at,
-                inputs,
-                cx,
-            )
-            .await,
-        ))
-    })
-}
-
-pub fn zeta2_prompt_input(
-    snapshot: &language::BufferSnapshot,
-    related_files: Arc<[zeta_prompt::RelatedFile]>,
-    events: Vec<Arc<zeta_prompt::Event>>,
-    excerpt_path: Arc<Path>,
-    cursor_offset: usize,
-) -> (std::ops::Range<usize>, zeta_prompt::ZetaPromptInput) {
-    let cursor_point = cursor_offset.to_point(snapshot);
-
-    let (editable_range, context_range) =
-        crate::cursor_excerpt::editable_and_context_ranges_for_cursor_position(
-            cursor_point,
-            snapshot,
-            MAX_CONTEXT_TOKENS,
-            MAX_REWRITE_TOKENS,
-        );
-
-    let context_start_offset = context_range.start.to_offset(snapshot);
-    let editable_offset_range = editable_range.to_offset(snapshot);
-    let cursor_offset_in_excerpt = cursor_offset - context_start_offset;
-    let editable_range_in_excerpt = (editable_offset_range.start - context_start_offset)
-        ..(editable_offset_range.end - context_start_offset);
-
-    let prompt_input = zeta_prompt::ZetaPromptInput {
-        cursor_path: excerpt_path,
-        cursor_excerpt: snapshot
-            .text_for_range(context_range)
-            .collect::<String>()
-            .into(),
-        editable_range_in_excerpt,
-        cursor_offset_in_excerpt,
-        events,
-        related_files,
-    };
-    (editable_offset_range, prompt_input)
-}
-
-#[cfg(feature = "cli-support")]
-pub fn zeta2_output_for_patch(input: &zeta_prompt::ZetaPromptInput, patch: &str) -> String {
-    eprintln!("{}", patch);
-    eprintln!("---------------------");
-    eprintln!("{}", input.cursor_excerpt);
-    crate::udiff::apply_diff_to_string(
-        patch,
-        &input.cursor_excerpt[input.editable_range_in_excerpt.clone()],
-    )
-    .unwrap()
-}
diff --git a/crates/edit_prediction_cli/Cargo.toml b/crates/edit_prediction_cli/Cargo.toml
deleted file mode 100644
index 811808c723..0000000000
--- a/crates/edit_prediction_cli/Cargo.toml
+++ /dev/null
@@ -1,72 +0,0 @@
-[package]
-name = "edit_prediction_cli"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[[bin]]
-name = "ep"
-path = "src/main.rs"
-
-[dependencies]
-anyhow.workspace = true
-anthropic.workspace = true
-http_client.workspace = true
-chrono.workspace = true
-clap.workspace = true
-client.workspace = true
-cloud_llm_client.workspace= true
-collections.workspace = true
-debug_adapter_extension.workspace = true
-dirs.workspace = true
-extension.workspace = true
-fs.workspace = true
-futures.workspace = true
-gpui.workspace = true
-gpui_tokio.workspace = true
-indoc.workspace = true
-language.workspace = true
-language_extension.workspace = true
-language_model.workspace = true
-language_models.workspace = true
-languages = { workspace = true, features = ["load-grammars"] }
-libc.workspace = true
-log.workspace = true
-node_runtime.workspace = true
-paths.workspace = true
-project.workspace = true
-prompt_store.workspace = true
-pulldown-cmark.workspace = true
-release_channel.workspace = true
-reqwest_client.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-shellexpand.workspace = true
-smol.workspace = true
-sqlez.workspace = true
-sqlez_macros.workspace = true
-terminal_view.workspace = true
-util.workspace = true
-watch.workspace = true
-edit_prediction = { workspace = true, features = ["cli-support"] }
-wasmtime.workspace = true
-zeta_prompt.workspace = true
-
-# Wasmtime is included as a dependency in order to enable the same
-# features that are enabled in Zed.
-#
-# If we don't enable these features we get crashes when creating
-# a Tree-sitter WasmStore.
-[package.metadata.cargo-machete]
-ignored = ["wasmtime"]
-
-[dev-dependencies]
-indoc.workspace = true
-gpui = { workspace = true, features = ["test-support"] }
-project = { workspace = true, features = ["test-support"] }
-pretty_assertions.workspace = true
diff --git a/crates/edit_prediction_cli/LICENSE-GPL b/crates/edit_prediction_cli/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/edit_prediction_cli/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/edit_prediction_cli/build.rs b/crates/edit_prediction_cli/build.rs
deleted file mode 100644
index 9ab40da0fb..0000000000
--- a/crates/edit_prediction_cli/build.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-fn main() {
-    let cargo_toml =
-        std::fs::read_to_string("../zed/Cargo.toml").expect("Failed to read crates/zed/Cargo.toml");
-    let version = cargo_toml
-        .lines()
-        .find(|line| line.starts_with("version = "))
-        .expect("Version not found in crates/zed/Cargo.toml")
-        .split('=')
-        .nth(1)
-        .expect("Invalid version format")
-        .trim()
-        .trim_matches('"');
-    println!("cargo:rustc-env=ZED_PKG_VERSION={}", version);
-}
diff --git a/crates/edit_prediction_cli/src/anthropic_client.rs b/crates/edit_prediction_cli/src/anthropic_client.rs
deleted file mode 100644
index 8afc4d1c03..0000000000
--- a/crates/edit_prediction_cli/src/anthropic_client.rs
+++ /dev/null
@@ -1,418 +0,0 @@
-use anthropic::{
-    ANTHROPIC_API_URL, Message, Request as AnthropicRequest, RequestContent,
-    Response as AnthropicResponse, Role, non_streaming_completion,
-};
-use anyhow::Result;
-use http_client::HttpClient;
-use indoc::indoc;
-use reqwest_client::ReqwestClient;
-use sqlez::bindable::Bind;
-use sqlez::bindable::StaticColumnCount;
-use sqlez_macros::sql;
-use std::hash::Hash;
-use std::hash::Hasher;
-use std::path::Path;
-use std::sync::Arc;
-
-pub struct PlainLlmClient {
-    http_client: Arc<dyn HttpClient>,
-    api_key: String,
-}
-
-impl PlainLlmClient {
-    fn new() -> Result<Self> {
-        let http_client: Arc<dyn http_client::HttpClient> = Arc::new(ReqwestClient::new());
-        let api_key = std::env::var("ANTHROPIC_API_KEY")
-            .map_err(|_| anyhow::anyhow!("ANTHROPIC_API_KEY environment variable not set"))?;
-        Ok(Self {
-            http_client,
-            api_key,
-        })
-    }
-
-    async fn generate(
-        &self,
-        model: &str,
-        max_tokens: u64,
-        messages: Vec<Message>,
-    ) -> Result<AnthropicResponse> {
-        let request = AnthropicRequest {
-            model: model.to_string(),
-            max_tokens,
-            messages,
-            tools: Vec::new(),
-            thinking: None,
-            tool_choice: None,
-            system: None,
-            metadata: None,
-            stop_sequences: Vec::new(),
-            temperature: None,
-            top_k: None,
-            top_p: None,
-        };
-
-        let response = non_streaming_completion(
-            self.http_client.as_ref(),
-            ANTHROPIC_API_URL,
-            &self.api_key,
-            request,
-            None,
-        )
-        .await
-        .map_err(|e| anyhow::anyhow!("{:?}", e))?;
-
-        Ok(response)
-    }
-}
-
-pub struct BatchingLlmClient {
-    connection: sqlez::connection::Connection,
-    http_client: Arc<dyn HttpClient>,
-    api_key: String,
-}
-
-struct CacheRow {
-    request_hash: String,
-    request: Option<String>,
-    response: Option<String>,
-    batch_id: Option<String>,
-}
-
-impl StaticColumnCount for CacheRow {
-    fn column_count() -> usize {
-        4
-    }
-}
-
-impl Bind for CacheRow {
-    fn bind(&self, statement: &sqlez::statement::Statement, start_index: i32) -> Result<i32> {
-        let next_index = statement.bind(&self.request_hash, start_index)?;
-        let next_index = statement.bind(&self.request, next_index)?;
-        let next_index = statement.bind(&self.response, next_index)?;
-        let next_index = statement.bind(&self.batch_id, next_index)?;
-        Ok(next_index)
-    }
-}
-
-#[derive(serde::Serialize, serde::Deserialize)]
-struct SerializableRequest {
-    model: String,
-    max_tokens: u64,
-    messages: Vec<SerializableMessage>,
-}
-
-#[derive(serde::Serialize, serde::Deserialize)]
-struct SerializableMessage {
-    role: String,
-    content: String,
-}
-
-impl BatchingLlmClient {
-    fn new(cache_path: &Path) -> Result<Self> {
-        let http_client: Arc<dyn http_client::HttpClient> = Arc::new(ReqwestClient::new());
-        let api_key = std::env::var("ANTHROPIC_API_KEY")
-            .map_err(|_| anyhow::anyhow!("ANTHROPIC_API_KEY environment variable not set"))?;
-
-        let connection = sqlez::connection::Connection::open_file(&cache_path.to_str().unwrap());
-        let mut statement = sqlez::statement::Statement::prepare(
-            &connection,
-            indoc! {"
-                CREATE TABLE IF NOT EXISTS cache (
-                    request_hash TEXT PRIMARY KEY,
-                    request TEXT,
-                    response TEXT,
-                    batch_id TEXT
-                );
-                "},
-        )?;
-        statement.exec()?;
-        drop(statement);
-
-        Ok(Self {
-            connection,
-            http_client,
-            api_key,
-        })
-    }
-
-    pub fn lookup(
-        &self,
-        model: &str,
-        max_tokens: u64,
-        messages: &[Message],
-    ) -> Result<Option<AnthropicResponse>> {
-        let request_hash_str = Self::request_hash(model, max_tokens, messages);
-        let response: Vec<String> = self.connection.select_bound(
-            &sql!(SELECT response FROM cache WHERE request_hash = ?1 AND response IS NOT NULL;),
-        )?(request_hash_str.as_str())?;
-        Ok(response
-            .into_iter()
-            .next()
-            .and_then(|text| serde_json::from_str(&text).ok()))
-    }
-
-    pub fn mark_for_batch(&self, model: &str, max_tokens: u64, messages: &[Message]) -> Result<()> {
-        let request_hash = Self::request_hash(model, max_tokens, messages);
-
-        let serializable_messages: Vec<SerializableMessage> = messages
-            .iter()
-            .map(|msg| SerializableMessage {
-                role: match msg.role {
-                    Role::User => "user".to_string(),
-                    Role::Assistant => "assistant".to_string(),
-                },
-                content: message_content_to_string(&msg.content),
-            })
-            .collect();
-
-        let serializable_request = SerializableRequest {
-            model: model.to_string(),
-            max_tokens,
-            messages: serializable_messages,
-        };
-
-        let request = Some(serde_json::to_string(&serializable_request)?);
-        let cache_row = CacheRow {
-            request_hash,
-            request,
-            response: None,
-            batch_id: None,
-        };
-        self.connection.exec_bound(sql!(
-            INSERT OR IGNORE INTO cache(request_hash, request, response, batch_id) VALUES (?, ?, ?, ?)))?(
-            cache_row,
-        )
-    }
-
-    async fn generate(
-        &self,
-        model: &str,
-        max_tokens: u64,
-        messages: Vec<Message>,
-    ) -> Result<Option<AnthropicResponse>> {
-        let response = self.lookup(model, max_tokens, &messages)?;
-        if let Some(response) = response {
-            return Ok(Some(response));
-        }
-
-        self.mark_for_batch(model, max_tokens, &messages)?;
-
-        Ok(None)
-    }
-
-    /// Uploads pending requests as a new batch; downloads finished batches if any.
-    async fn sync_batches(&self) -> Result<()> {
-        self.upload_pending_requests().await?;
-        self.download_finished_batches().await
-    }
-
-    async fn download_finished_batches(&self) -> Result<()> {
-        let q = sql!(SELECT DISTINCT batch_id FROM cache WHERE batch_id IS NOT NULL AND response IS NULL);
-        let batch_ids: Vec<String> = self.connection.select(q)?()?;
-
-        for batch_id in batch_ids {
-            let batch_status = anthropic::batches::retrieve_batch(
-                self.http_client.as_ref(),
-                ANTHROPIC_API_URL,
-                &self.api_key,
-                &batch_id,
-            )
-            .await
-            .map_err(|e| anyhow::anyhow!("{:?}", e))?;
-
-            log::info!(
-                "Batch {} status: {}",
-                batch_id,
-                batch_status.processing_status
-            );
-
-            if batch_status.processing_status == "ended" {
-                let results = anthropic::batches::retrieve_batch_results(
-                    self.http_client.as_ref(),
-                    ANTHROPIC_API_URL,
-                    &self.api_key,
-                    &batch_id,
-                )
-                .await
-                .map_err(|e| anyhow::anyhow!("{:?}", e))?;
-
-                let mut success_count = 0;
-                for result in results {
-                    let request_hash = result
-                        .custom_id
-                        .strip_prefix("req_hash_")
-                        .unwrap_or(&result.custom_id)
-                        .to_string();
-
-                    match result.result {
-                        anthropic::batches::BatchResult::Succeeded { message } => {
-                            let response_json = serde_json::to_string(&message)?;
-                            let q = sql!(UPDATE cache SET response = ? WHERE request_hash = ?);
-                            self.connection.exec_bound(q)?((response_json, request_hash))?;
-                            success_count += 1;
-                        }
-                        anthropic::batches::BatchResult::Errored { error } => {
-                            log::error!("Batch request {} failed: {:?}", request_hash, error);
-                        }
-                        anthropic::batches::BatchResult::Canceled => {
-                            log::warn!("Batch request {} was canceled", request_hash);
-                        }
-                        anthropic::batches::BatchResult::Expired => {
-                            log::warn!("Batch request {} expired", request_hash);
-                        }
-                    }
-                }
-                log::info!("Downloaded {} successful requests", success_count);
-            }
-        }
-
-        Ok(())
-    }
-
-    async fn upload_pending_requests(&self) -> Result<String> {
-        let q = sql!(
-        SELECT request_hash, request FROM cache WHERE batch_id IS NULL AND response IS NULL
-        );
-
-        let rows: Vec<(String, String)> = self.connection.select(q)?()?;
-
-        if rows.is_empty() {
-            return Ok(String::new());
-        }
-
-        let batch_requests = rows
-            .iter()
-            .map(|(hash, request_str)| {
-                let serializable_request: SerializableRequest =
-                    serde_json::from_str(&request_str).unwrap();
-
-                let messages: Vec<Message> = serializable_request
-                    .messages
-                    .into_iter()
-                    .map(|msg| Message {
-                        role: match msg.role.as_str() {
-                            "user" => Role::User,
-                            "assistant" => Role::Assistant,
-                            _ => Role::User,
-                        },
-                        content: vec![RequestContent::Text {
-                            text: msg.content,
-                            cache_control: None,
-                        }],
-                    })
-                    .collect();
-
-                let params = AnthropicRequest {
-                    model: serializable_request.model,
-                    max_tokens: serializable_request.max_tokens,
-                    messages,
-                    tools: Vec::new(),
-                    thinking: None,
-                    tool_choice: None,
-                    system: None,
-                    metadata: None,
-                    stop_sequences: Vec::new(),
-                    temperature: None,
-                    top_k: None,
-                    top_p: None,
-                };
-
-                let custom_id = format!("req_hash_{}", hash);
-                anthropic::batches::BatchRequest { custom_id, params }
-            })
-            .collect::<Vec<_>>();
-
-        let batch_len = batch_requests.len();
-        let batch = anthropic::batches::create_batch(
-            self.http_client.as_ref(),
-            ANTHROPIC_API_URL,
-            &self.api_key,
-            anthropic::batches::CreateBatchRequest {
-                requests: batch_requests,
-            },
-        )
-        .await
-        .map_err(|e| anyhow::anyhow!("{:?}", e))?;
-
-        let q = sql!(
-            UPDATE cache SET batch_id = ? WHERE batch_id is NULL
-        );
-        self.connection.exec_bound(q)?(batch.id.as_str())?;
-
-        log::info!("Uploaded batch with {} requests", batch_len);
-
-        Ok(batch.id)
-    }
-
-    fn request_hash(model: &str, max_tokens: u64, messages: &[Message]) -> String {
-        let mut hasher = std::hash::DefaultHasher::new();
-        model.hash(&mut hasher);
-        max_tokens.hash(&mut hasher);
-        for msg in messages {
-            message_content_to_string(&msg.content).hash(&mut hasher);
-        }
-        let request_hash = hasher.finish();
-        format!("{request_hash:016x}")
-    }
-}
-
-fn message_content_to_string(content: &[RequestContent]) -> String {
-    content
-        .iter()
-        .filter_map(|c| match c {
-            RequestContent::Text { text, .. } => Some(text.clone()),
-            _ => None,
-        })
-        .collect::<Vec<String>>()
-        .join("\n")
-}
-
-pub enum AnthropicClient {
-    // No batching
-    Plain(PlainLlmClient),
-    Batch(BatchingLlmClient),
-    Dummy,
-}
-
-impl AnthropicClient {
-    pub fn plain() -> Result<Self> {
-        Ok(Self::Plain(PlainLlmClient::new()?))
-    }
-
-    pub fn batch(cache_path: &Path) -> Result<Self> {
-        Ok(Self::Batch(BatchingLlmClient::new(cache_path)?))
-    }
-
-    #[allow(dead_code)]
-    pub fn dummy() -> Self {
-        Self::Dummy
-    }
-
-    pub async fn generate(
-        &self,
-        model: &str,
-        max_tokens: u64,
-        messages: Vec<Message>,
-    ) -> Result<Option<AnthropicResponse>> {
-        match self {
-            AnthropicClient::Plain(plain_llm_client) => plain_llm_client
-                .generate(model, max_tokens, messages)
-                .await
-                .map(Some),
-            AnthropicClient::Batch(batching_llm_client) => {
-                batching_llm_client
-                    .generate(model, max_tokens, messages)
-                    .await
-            }
-            AnthropicClient::Dummy => panic!("Dummy LLM client is not expected to be used"),
-        }
-    }
-
-    pub async fn sync_batches(&self) -> Result<()> {
-        match self {
-            AnthropicClient::Plain(_) => Ok(()),
-            AnthropicClient::Batch(batching_llm_client) => batching_llm_client.sync_batches().await,
-            AnthropicClient::Dummy => panic!("Dummy LLM client is not expected to be used"),
-        }
-    }
-}
diff --git a/crates/edit_prediction_cli/src/distill.rs b/crates/edit_prediction_cli/src/distill.rs
deleted file mode 100644
index 085c5f744a..0000000000
--- a/crates/edit_prediction_cli/src/distill.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-use anyhow::{Result, anyhow};
-use std::mem;
-
-use crate::example::Example;
-
-pub async fn run_distill(example: &mut Example) -> Result<()> {
-    let [prediction]: [_; 1] =
-        mem::take(&mut example.predictions)
-            .try_into()
-            .map_err(|preds: Vec<_>| {
-                anyhow!(
-                    "Example has {} predictions, but it should have exactly one",
-                    preds.len()
-                )
-            })?;
-
-    example.expected_patch = prediction.actual_patch;
-    example.prompt = None;
-    example.predictions = Vec::new();
-    example.score = Vec::new();
-    Ok(())
-}
diff --git a/crates/edit_prediction_cli/src/example.rs b/crates/edit_prediction_cli/src/example.rs
deleted file mode 100644
index 9499aae0c1..0000000000
--- a/crates/edit_prediction_cli/src/example.rs
+++ /dev/null
@@ -1,379 +0,0 @@
-use crate::{PredictionProvider, PromptFormat, metrics::ClassificationMetrics};
-use anyhow::{Context as _, Result};
-use collections::HashMap;
-use edit_prediction::udiff::OpenedBuffers;
-use gpui::Entity;
-use http_client::Url;
-use language::{Anchor, Buffer};
-use project::Project;
-use serde::{Deserialize, Serialize};
-use std::sync::Arc;
-use std::{
-    borrow::Cow,
-    io::{Read, Write},
-    mem,
-    path::{Path, PathBuf},
-};
-use zeta_prompt::RelatedFile;
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct Example {
-    #[serde(default)]
-    pub name: String,
-    pub repository_url: String,
-    pub revision: String,
-    #[serde(default)]
-    pub uncommitted_diff: String,
-    pub cursor_path: Arc<Path>,
-    pub cursor_position: String,
-    pub edit_history: String,
-    pub expected_patch: String,
-
-    /// The full content of the file where an edit is being predicted, and the
-    /// actual cursor offset.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub buffer: Option<ExampleBuffer>,
-
-    /// The context retrieved for the prediction. This requires the worktree to
-    /// be loaded and the language server to be started.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub context: Option<ExampleContext>,
-
-    /// The input and expected output from the edit prediction model.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub prompt: Option<ExamplePrompt>,
-
-    /// The actual predictions from the model.
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub predictions: Vec<ExamplePrediction>,
-
-    /// The scores, for how well the actual predictions match the expected
-    /// predictions.
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub score: Vec<ExampleScore>,
-
-    /// The application state used to process this example.
-    #[serde(skip)]
-    pub state: Option<ExampleState>,
-}
-
-#[derive(Clone, Debug)]
-pub struct ExampleState {
-    pub project: Entity<Project>,
-    pub buffer: Entity<Buffer>,
-    pub cursor_position: Anchor,
-    pub _open_buffers: OpenedBuffers,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct ExampleContext {
-    pub files: Arc<[RelatedFile]>,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct ExampleBuffer {
-    pub content: String,
-    pub cursor_row: u32,
-    pub cursor_column: u32,
-    pub cursor_offset: usize,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct ExamplePrompt {
-    pub input: String,
-    pub expected_output: String,
-    pub format: PromptFormat,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct ExamplePrediction {
-    pub actual_patch: String,
-    pub actual_output: String,
-    pub provider: PredictionProvider,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct ExampleScore {
-    pub delta_chr_f: f32,
-    pub line_match: ClassificationMetrics,
-}
-
-impl Example {
-    pub fn repo_name(&self) -> Result<(Cow<'_, str>, Cow<'_, str>)> {
-        // git@github.com:owner/repo.git
-        if self.repository_url.contains('@') {
-            let (owner, repo) = self
-                .repository_url
-                .split_once(':')
-                .context("expected : in git url")?
-                .1
-                .split_once('/')
-                .context("expected / in git url")?;
-            Ok((
-                Cow::Borrowed(owner),
-                Cow::Borrowed(repo.trim_end_matches(".git")),
-            ))
-        // http://github.com/owner/repo.git
-        } else {
-            let url = Url::parse(&self.repository_url)?;
-            let mut segments = url.path_segments().context("empty http url")?;
-            let owner = segments
-                .next()
-                .context("expected owner path segment")?
-                .to_string();
-            let repo = segments
-                .next()
-                .context("expected repo path segment")?
-                .trim_end_matches(".git")
-                .to_string();
-            assert!(segments.next().is_none());
-
-            Ok((owner.into(), repo.into()))
-        }
-    }
-}
-
-pub fn read_examples(inputs: &[PathBuf]) -> Vec<Example> {
-    let mut examples = Vec::new();
-
-    let stdin_path: PathBuf = PathBuf::from("-");
-
-    let inputs = if inputs.is_empty() {
-        &[stdin_path]
-    } else {
-        inputs
-    };
-
-    for path in inputs {
-        let is_stdin = path.as_path() == Path::new("-");
-        let content = if is_stdin {
-            let mut buffer = String::new();
-            std::io::stdin()
-                .read_to_string(&mut buffer)
-                .expect("Failed to read from stdin");
-            buffer
-        } else {
-            std::fs::read_to_string(path)
-                .unwrap_or_else(|_| panic!("Failed to read path: {:?}", &path))
-        };
-        let filename = path.file_stem().unwrap().to_string_lossy().to_string();
-        let ext = if !is_stdin {
-            path.extension()
-                .map(|ext| ext.to_string_lossy().to_string())
-                .unwrap_or_else(|| panic!("{} should have an extension", path.display()))
-        } else {
-            "jsonl".to_string()
-        };
-
-        match ext.as_ref() {
-            "json" => {
-                let mut example =
-                    serde_json::from_str::<Example>(&content).unwrap_or_else(|error| {
-                        panic!("Failed to parse example file: {}\n{error}", path.display())
-                    });
-                if example.name.is_empty() {
-                    example.name = filename;
-                }
-                examples.push(example);
-            }
-            "jsonl" => examples.extend(
-                content
-                    .lines()
-                    .enumerate()
-                    .map(|(line_ix, line)| {
-                        let mut example =
-                            serde_json::from_str::<Example>(line).unwrap_or_else(|error| {
-                                panic!(
-                                    "Failed to parse example on {}:{}\n{error}",
-                                    path.display(),
-                                    line_ix + 1
-                                )
-                            });
-                        if example.name.is_empty() {
-                            example.name = format!("{filename}-{line_ix}")
-                        }
-                        example
-                    })
-                    .collect::<Vec<Example>>(),
-            ),
-            "md" => {
-                examples.push(parse_markdown_example(filename, &content).unwrap());
-            }
-            ext => {
-                panic!("{} has invalid example extension `{ext}`", path.display())
-            }
-        }
-    }
-
-    sort_examples_by_repo_and_rev(&mut examples);
-    examples
-}
-
-pub fn write_examples(examples: &[Example], output_path: Option<&PathBuf>) {
-    let mut content = String::new();
-    for example in examples {
-        let line = serde_json::to_string(example).unwrap();
-        content.push_str(&line);
-        content.push('\n');
-    }
-    if let Some(output_path) = output_path {
-        std::fs::write(output_path, content).expect("Failed to write examples");
-    } else {
-        std::io::stdout().write_all(&content.as_bytes()).unwrap();
-    }
-}
-
-pub fn sort_examples_by_repo_and_rev(examples: &mut [Example]) {
-    examples.sort_by(|a, b| {
-        a.repository_url
-            .cmp(&b.repository_url)
-            .then(b.revision.cmp(&a.revision))
-    });
-}
-
-pub fn group_examples_by_repo(examples: &mut [Example]) -> Vec<Vec<&mut Example>> {
-    let mut examples_by_repo = HashMap::default();
-    for example in examples.iter_mut() {
-        examples_by_repo
-            .entry(example.repository_url.clone())
-            .or_insert_with(Vec::new)
-            .push(example);
-    }
-    examples_by_repo.into_values().collect()
-}
-
-fn parse_markdown_example(id: String, input: &str) -> Result<Example> {
-    use pulldown_cmark::{CodeBlockKind, CowStr, Event, HeadingLevel, Parser, Tag, TagEnd};
-
-    const UNCOMMITTED_DIFF_HEADING: &str = "Uncommitted Diff";
-    const EDIT_HISTORY_HEADING: &str = "Edit History";
-    const CURSOR_POSITION_HEADING: &str = "Cursor Position";
-    const EXPECTED_PATCH_HEADING: &str = "Expected Patch";
-    const EXPECTED_CONTEXT_HEADING: &str = "Expected Context";
-    const REPOSITORY_URL_FIELD: &str = "repository_url";
-    const REVISION_FIELD: &str = "revision";
-
-    let parser = Parser::new(input);
-
-    let mut example = Example {
-        name: id,
-        repository_url: String::new(),
-        revision: String::new(),
-        uncommitted_diff: String::new(),
-        cursor_path: PathBuf::new().into(),
-        cursor_position: String::new(),
-        edit_history: String::new(),
-        expected_patch: String::new(),
-        buffer: None,
-        context: None,
-        prompt: None,
-        predictions: Vec::new(),
-        score: Vec::new(),
-        state: None,
-    };
-
-    let mut text = String::new();
-    let mut block_info: CowStr = "".into();
-
-    #[derive(PartialEq)]
-    enum Section {
-        Start,
-        UncommittedDiff,
-        EditHistory,
-        CursorPosition,
-        ExpectedExcerpts,
-        ExpectedPatch,
-        Other,
-    }
-
-    let mut current_section = Section::Start;
-
-    for event in parser {
-        match event {
-            Event::Text(line) => {
-                text.push_str(&line);
-
-                if let Section::Start = current_section
-                    && let Some((field, value)) = line.split_once('=')
-                {
-                    match field.trim() {
-                        REPOSITORY_URL_FIELD => {
-                            example.repository_url = value.trim().to_string();
-                        }
-                        REVISION_FIELD => {
-                            example.revision = value.trim().to_string();
-                        }
-                        _ => {}
-                    }
-                }
-            }
-            Event::End(TagEnd::Heading(HeadingLevel::H2)) => {
-                let title = mem::take(&mut text);
-                current_section = if title.eq_ignore_ascii_case(UNCOMMITTED_DIFF_HEADING) {
-                    Section::UncommittedDiff
-                } else if title.eq_ignore_ascii_case(EDIT_HISTORY_HEADING) {
-                    Section::EditHistory
-                } else if title.eq_ignore_ascii_case(CURSOR_POSITION_HEADING) {
-                    Section::CursorPosition
-                } else if title.eq_ignore_ascii_case(EXPECTED_PATCH_HEADING) {
-                    Section::ExpectedPatch
-                } else if title.eq_ignore_ascii_case(EXPECTED_CONTEXT_HEADING) {
-                    Section::ExpectedExcerpts
-                } else {
-                    Section::Other
-                };
-            }
-            Event::End(TagEnd::Heading(HeadingLevel::H3)) => {
-                mem::take(&mut text);
-            }
-            Event::End(TagEnd::Heading(HeadingLevel::H4)) => {
-                mem::take(&mut text);
-            }
-            Event::End(TagEnd::Heading(level)) => {
-                anyhow::bail!("Unexpected heading level: {level}");
-            }
-            Event::Start(Tag::CodeBlock(kind)) => {
-                match kind {
-                    CodeBlockKind::Fenced(info) => {
-                        block_info = info;
-                    }
-                    CodeBlockKind::Indented => {
-                        anyhow::bail!("Unexpected indented codeblock");
-                    }
-                };
-            }
-            Event::Start(_) => {
-                text.clear();
-                block_info = "".into();
-            }
-            Event::End(TagEnd::CodeBlock) => {
-                let block_info = block_info.trim();
-                match current_section {
-                    Section::UncommittedDiff => {
-                        example.uncommitted_diff = mem::take(&mut text);
-                    }
-                    Section::EditHistory => {
-                        example.edit_history.push_str(&mem::take(&mut text));
-                    }
-                    Section::CursorPosition => {
-                        example.cursor_path = Path::new(block_info).into();
-                        example.cursor_position = mem::take(&mut text);
-                    }
-                    Section::ExpectedExcerpts => {
-                        mem::take(&mut text);
-                    }
-                    Section::ExpectedPatch => {
-                        example.expected_patch = mem::take(&mut text);
-                    }
-                    Section::Start | Section::Other => {}
-                }
-            }
-            _ => {}
-        }
-    }
-    if example.cursor_path.as_ref() == Path::new("") || example.cursor_position.is_empty() {
-        anyhow::bail!("Missing cursor position codeblock");
-    }
-
-    Ok(example)
-}
diff --git a/crates/edit_prediction_cli/src/format_prompt.rs b/crates/edit_prediction_cli/src/format_prompt.rs
deleted file mode 100644
index f8fd9b2023..0000000000
--- a/crates/edit_prediction_cli/src/format_prompt.rs
+++ /dev/null
@@ -1,287 +0,0 @@
-use crate::{
-    PromptFormat,
-    example::{Example, ExamplePrompt},
-    headless::EpAppState,
-    load_project::run_load_project,
-    progress::{Progress, Step},
-    retrieve_context::run_context_retrieval,
-};
-use anyhow::{Context as _, Result, ensure};
-use edit_prediction::{
-    EditPredictionStore,
-    zeta2::{zeta2_output_for_patch, zeta2_prompt_input},
-};
-use gpui::AsyncApp;
-use std::sync::Arc;
-use zeta_prompt::format_zeta_prompt;
-
-pub async fn run_format_prompt(
-    example: &mut Example,
-    prompt_format: PromptFormat,
-    app_state: Arc<EpAppState>,
-    mut cx: AsyncApp,
-) -> Result<()> {
-    run_context_retrieval(example, app_state.clone(), cx.clone()).await?;
-
-    let _step_progress = Progress::global().start(Step::FormatPrompt, &example.name);
-
-    match prompt_format {
-        PromptFormat::Teacher => {
-            let prompt = TeacherPrompt::format_prompt(example);
-            example.prompt = Some(ExamplePrompt {
-                input: prompt,
-                expected_output: example.expected_patch.clone(), // TODO
-                format: prompt_format,
-            });
-        }
-        PromptFormat::Zeta2 => {
-            run_load_project(example, app_state, cx.clone()).await?;
-
-            let ep_store = cx.update(|cx| {
-                EditPredictionStore::try_global(cx).context("EditPredictionStore not initialized")
-            })??;
-
-            let state = example.state.as_ref().context("state must be set")?;
-            let snapshot = state.buffer.read_with(&cx, |buffer, _| buffer.snapshot())?;
-            let project = state.project.clone();
-            let (_, input) = ep_store.update(&mut cx, |ep_store, _cx| {
-                anyhow::Ok(zeta2_prompt_input(
-                    &snapshot,
-                    example
-                        .context
-                        .as_ref()
-                        .context("context must be set")?
-                        .files
-                        .clone(),
-                    ep_store.edit_history_for_project(&project),
-                    example.cursor_path.clone(),
-                    example
-                        .buffer
-                        .as_ref()
-                        .context("buffer must be set")?
-                        .cursor_offset,
-                ))
-            })??;
-            let prompt = format_zeta_prompt(&input);
-            let expected_output = zeta2_output_for_patch(&input, &example.expected_patch.clone());
-            example.prompt = Some(ExamplePrompt {
-                input: prompt,
-                expected_output,
-                format: prompt_format,
-            });
-        }
-    };
-    Ok(())
-}
-
-pub struct TeacherPrompt;
-
-impl TeacherPrompt {
-    const PROMPT: &str = include_str!("teacher.prompt.md");
-    pub(crate) const EDITABLE_REGION_START: &str = "<|editable_region_start|>\n";
-    pub(crate) const EDITABLE_REGION_END: &str = "<|editable_region_end|>";
-
-    /// Truncate edit history to this number of last lines
-    const MAX_HISTORY_LINES: usize = 128;
-
-    pub fn format_prompt(example: &Example) -> String {
-        let edit_history = Self::format_edit_history(&example.edit_history);
-        let context = Self::format_context(example);
-        let editable_region = Self::format_editable_region(example);
-
-        let prompt = Self::PROMPT
-            .replace("{{context}}", &context)
-            .replace("{{edit_history}}", &edit_history)
-            .replace("{{editable_region}}", &editable_region);
-
-        prompt
-    }
-
-    pub fn parse(example: &Example, response: &str) -> Result<String> {
-        // Ideally, we should always be able to find cursor position in the retrieved context.
-        // In reality, sometimes we don't find it for these reasons:
-        // 1. `example.cursor_position` contains _more_ context than included in the retrieved context
-        //    (can be fixed by getting cursor coordinates at the load_example stage)
-        // 2. Context retriever just didn't include cursor line.
-        //
-        // In that case, fallback to using `cursor_position` as excerpt.
-        let cursor_file = &example
-            .buffer
-            .as_ref()
-            .context("`buffer` should be filled in in the context collection step")?
-            .content;
-
-        // Extract updated (new) editable region from the model response
-        let new_editable_region = extract_last_codeblock(response);
-
-        // Reconstruct old editable region we sent to the model
-        let old_editable_region = Self::format_editable_region(example);
-        let old_editable_region = Self::extract_editable_region(&old_editable_region);
-        ensure!(
-            cursor_file.contains(&old_editable_region),
-            "Something's wrong: editable_region is not found in the cursor file"
-        );
-
-        // Apply editable region to a larger context and compute diff.
-        // This is needed to get a better context lines around the editable region
-        let edited_file = cursor_file.replace(&old_editable_region, &new_editable_region);
-        let diff = language::unified_diff(&cursor_file, &edited_file);
-
-        let diff = indoc::formatdoc! {"
-            --- a/{path}
-            +++ b/{path}
-            {diff}",
-            path = example.cursor_path.to_string_lossy(),
-            diff = diff,
-        };
-
-        Ok(diff)
-    }
-
-    fn format_edit_history(edit_history: &str) -> String {
-        // Strip comments ("garbage lines") from edit history
-        let lines = edit_history
-            .lines()
-            .filter(|&s| Self::is_udiff_content_line(s))
-            .collect::<Vec<_>>();
-
-        let history_lines = if lines.len() > Self::MAX_HISTORY_LINES {
-            &lines[lines.len() - Self::MAX_HISTORY_LINES..]
-        } else {
-            &lines
-        };
-
-        if history_lines.is_empty() {
-            return "(No edit history)".to_string();
-        }
-
-        history_lines.join("\n")
-    }
-
-    fn format_context(example: &Example) -> String {
-        assert!(example.context.is_some(), "Missing context retriever step");
-
-        let mut prompt = String::new();
-        zeta_prompt::write_related_files(&mut prompt, &example.context.as_ref().unwrap().files);
-
-        prompt
-    }
-
-    fn format_editable_region(example: &Example) -> String {
-        let mut result = String::new();
-
-        let path_str = example.cursor_path.to_string_lossy();
-        result.push_str(&format!("`````path=\"{path_str}\"\n"));
-        result.push_str(Self::EDITABLE_REGION_START);
-
-        // TODO: control number of lines around cursor
-        result.push_str(&example.cursor_position);
-        if !example.cursor_position.ends_with('\n') {
-            result.push('\n');
-        }
-
-        result.push_str(&format!("{}\n", Self::EDITABLE_REGION_END));
-        result.push_str("`````");
-
-        result
-    }
-
-    fn extract_editable_region(text: &str) -> String {
-        let start = text
-            .find(Self::EDITABLE_REGION_START)
-            .map_or(0, |pos| pos + Self::EDITABLE_REGION_START.len());
-        let end = text.find(Self::EDITABLE_REGION_END).unwrap_or(text.len());
-
-        let region = &text[start..end];
-
-        region.replace("<|user_cursor|>", "")
-    }
-
-    fn is_udiff_content_line(s: &str) -> bool {
-        s.starts_with("-")
-            || s.starts_with("+")
-            || s.starts_with(" ")
-            || s.starts_with("---")
-            || s.starts_with("+++")
-            || s.starts_with("@@")
-    }
-}
-
-fn extract_last_codeblock(text: &str) -> String {
-    let mut last_block = None;
-    let mut search_start = 0;
-
-    while let Some(start) = text[search_start..].find("```") {
-        let start = start + search_start;
-        let bytes = text.as_bytes();
-        let mut backtick_end = start;
-
-        while backtick_end < bytes.len() && bytes[backtick_end] == b'`' {
-            backtick_end += 1;
-        }
-
-        let backtick_count = backtick_end - start;
-        let closing_backticks = "`".repeat(backtick_count);
-
-        while backtick_end < bytes.len() && bytes[backtick_end] != b'\n' {
-            backtick_end += 1;
-        }
-
-        if let Some(end_pos) = text[backtick_end..].find(&closing_backticks) {
-            let code_block = &text[backtick_end + 1..backtick_end + end_pos];
-            last_block = Some(code_block.to_string());
-            search_start = backtick_end + end_pos + backtick_count;
-        } else {
-            break;
-        }
-    }
-
-    last_block.unwrap_or_else(|| text.to_string())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_extract_last_code_block() {
-        let text = indoc::indoc! {"
-            Some thinking
-
-            ```
-            first block
-            ```
-
-            `````path='something' lines=1:2
-            last block
-            `````
-            "};
-        let last_block = extract_last_codeblock(text);
-        assert_eq!(last_block, "last block\n");
-    }
-
-    #[test]
-    fn test_extract_editable_region() {
-        let text = indoc::indoc! {"
-            some lines
-            are
-            here
-            <|editable_region_start|>
-            one
-            two three
-
-            <|editable_region_end|>
-            more
-            lines here
-            "};
-        let parsed = TeacherPrompt::extract_editable_region(text);
-        assert_eq!(
-            parsed,
-            indoc::indoc! {"
-            one
-            two three
-
-            "}
-        );
-    }
-}
diff --git a/crates/edit_prediction_cli/src/headless.rs b/crates/edit_prediction_cli/src/headless.rs
deleted file mode 100644
index 2deb96fdbf..0000000000
--- a/crates/edit_prediction_cli/src/headless.rs
+++ /dev/null
@@ -1,140 +0,0 @@
-use client::{Client, ProxySettings, UserStore};
-use collections::HashMap;
-use extension::ExtensionHostProxy;
-use fs::RealFs;
-use gpui::http_client::read_proxy_from_env;
-use gpui::{App, AppContext, Entity};
-use gpui_tokio::Tokio;
-use language::LanguageRegistry;
-use language_extension::LspAccess;
-use node_runtime::{NodeBinaryOptions, NodeRuntime};
-use project::Project;
-use project::project_settings::ProjectSettings;
-use release_channel::{AppCommitSha, AppVersion};
-use reqwest_client::ReqwestClient;
-use settings::{Settings, SettingsStore};
-use std::path::PathBuf;
-use std::sync::{Arc, Mutex};
-use util::ResultExt as _;
-
-/// Headless subset of `workspace::AppState`.
-pub struct EpAppState {
-    pub languages: Arc<LanguageRegistry>,
-    pub client: Arc<Client>,
-    pub user_store: Entity<UserStore>,
-    pub fs: Arc<dyn fs::Fs>,
-    pub node_runtime: NodeRuntime,
-    pub project_cache: ProjectCache,
-}
-
-#[derive(Default)]
-pub struct ProjectCache(Mutex<HashMap<String, Entity<Project>>>);
-
-impl ProjectCache {
-    pub fn insert(&self, repository_url: String, project: Entity<Project>) {
-        self.0.lock().unwrap().insert(repository_url, project);
-    }
-
-    pub fn get(&self, repository_url: &String) -> Option<Entity<Project>> {
-        self.0.lock().unwrap().get(repository_url).cloned()
-    }
-}
-
-pub fn init(cx: &mut App) -> EpAppState {
-    let app_commit_sha = option_env!("ZED_COMMIT_SHA").map(|s| AppCommitSha::new(s.to_owned()));
-
-    let app_version = AppVersion::load(
-        env!("ZED_PKG_VERSION"),
-        option_env!("ZED_BUILD_ID"),
-        app_commit_sha,
-    );
-    release_channel::init(app_version.clone(), cx);
-    gpui_tokio::init(cx);
-
-    let settings_store = SettingsStore::new(cx, &settings::default_settings());
-    cx.set_global(settings_store);
-
-    // Set User-Agent so we can download language servers from GitHub
-    let user_agent = format!(
-        "Zeta CLI/{} ({}; {})",
-        app_version,
-        std::env::consts::OS,
-        std::env::consts::ARCH
-    );
-    let proxy_str = ProxySettings::get_global(cx).proxy.to_owned();
-    let proxy_url = proxy_str
-        .as_ref()
-        .and_then(|input| input.parse().ok())
-        .or_else(read_proxy_from_env);
-    let http = {
-        let _guard = Tokio::handle(cx).enter();
-
-        ReqwestClient::proxy_and_user_agent(proxy_url, &user_agent)
-            .expect("could not start HTTP client")
-    };
-    cx.set_http_client(Arc::new(http));
-
-    let client = Client::production(cx);
-    cx.set_http_client(client.http_client());
-
-    let git_binary_path = None;
-    let fs = Arc::new(RealFs::new(
-        git_binary_path,
-        cx.background_executor().clone(),
-    ));
-
-    let mut languages = LanguageRegistry::new(cx.background_executor().clone());
-    languages.set_language_server_download_dir(paths::languages_dir().clone());
-    let languages = Arc::new(languages);
-
-    let user_store = cx.new(|cx| UserStore::new(client.clone(), cx));
-
-    extension::init(cx);
-
-    let (mut tx, rx) = watch::channel(None);
-    cx.observe_global::<SettingsStore>(move |cx| {
-        let settings = &ProjectSettings::get_global(cx).node;
-        let options = NodeBinaryOptions {
-            allow_path_lookup: !settings.ignore_system_version,
-            allow_binary_download: true,
-            use_paths: settings.path.as_ref().map(|node_path| {
-                let node_path = PathBuf::from(shellexpand::tilde(node_path).as_ref());
-                let npm_path = settings
-                    .npm_path
-                    .as_ref()
-                    .map(|path| PathBuf::from(shellexpand::tilde(&path).as_ref()));
-                (
-                    node_path.clone(),
-                    npm_path.unwrap_or_else(|| {
-                        let base_path = PathBuf::new();
-                        node_path.parent().unwrap_or(&base_path).join("npm")
-                    }),
-                )
-            }),
-        };
-        tx.send(Some(options)).log_err();
-    })
-    .detach();
-    let node_runtime = NodeRuntime::new(client.http_client(), None, rx);
-
-    let extension_host_proxy = ExtensionHostProxy::global(cx);
-
-    debug_adapter_extension::init(extension_host_proxy.clone(), cx);
-    language_extension::init(LspAccess::Noop, extension_host_proxy, languages.clone());
-    language_model::init(client.clone(), cx);
-    language_models::init(user_store.clone(), client.clone(), cx);
-    languages::init(languages.clone(), fs.clone(), node_runtime.clone(), cx);
-    prompt_store::init(cx);
-    terminal_view::init(cx);
-
-    let project_cache = ProjectCache::default();
-
-    EpAppState {
-        languages,
-        client,
-        user_store,
-        fs,
-        node_runtime,
-        project_cache,
-    }
-}
diff --git a/crates/edit_prediction_cli/src/load_project.rs b/crates/edit_prediction_cli/src/load_project.rs
deleted file mode 100644
index 4517e6ccbe..0000000000
--- a/crates/edit_prediction_cli/src/load_project.rs
+++ /dev/null
@@ -1,346 +0,0 @@
-use crate::{
-    example::{Example, ExampleBuffer, ExampleState},
-    headless::EpAppState,
-    paths::{REPOS_DIR, WORKTREES_DIR},
-    progress::{InfoStyle, Progress, Step, StepProgress},
-};
-use anyhow::{Context as _, Result};
-use collections::HashMap;
-use edit_prediction::EditPredictionStore;
-use edit_prediction::udiff::OpenedBuffers;
-use futures::{
-    AsyncWriteExt as _,
-    lock::{Mutex, OwnedMutexGuard},
-};
-use gpui::{AsyncApp, Entity};
-use language::{Anchor, Buffer, LanguageNotFound, ToOffset, ToPoint};
-use project::buffer_store::BufferStoreEvent;
-use project::{Project, ProjectPath};
-use std::{
-    cell::RefCell,
-    fs,
-    path::{Path, PathBuf},
-    sync::Arc,
-};
-use util::{paths::PathStyle, rel_path::RelPath};
-use zeta_prompt::CURSOR_MARKER;
-
-pub async fn run_load_project(
-    example: &mut Example,
-    app_state: Arc<EpAppState>,
-    mut cx: AsyncApp,
-) -> Result<()> {
-    if example.state.is_some() {
-        return Ok(());
-    }
-
-    let progress = Progress::global().start(Step::LoadProject, &example.name);
-
-    let project = setup_project(example, &app_state, &progress, &mut cx).await?;
-
-    let _open_buffers = apply_edit_history(example, &project, &mut cx).await?;
-
-    let (buffer, cursor_position) = cursor_position(example, &project, &mut cx).await?;
-    let (example_buffer, language_name) = buffer.read_with(&cx, |buffer, _cx| {
-        let cursor_point = cursor_position.to_point(&buffer);
-        let language_name = buffer
-            .language()
-            .map(|l| l.name().to_string())
-            .unwrap_or_else(|| "Unknown".to_string());
-        (
-            ExampleBuffer {
-                content: buffer.text(),
-                cursor_row: cursor_point.row,
-                cursor_column: cursor_point.column,
-                cursor_offset: cursor_position.to_offset(&buffer),
-            },
-            language_name,
-        )
-    })?;
-
-    progress.set_info(language_name, InfoStyle::Normal);
-
-    example.buffer = Some(example_buffer);
-    example.state = Some(ExampleState {
-        buffer,
-        project,
-        cursor_position,
-        _open_buffers,
-    });
-    Ok(())
-}
-
-async fn cursor_position(
-    example: &Example,
-    project: &Entity<Project>,
-    cx: &mut AsyncApp,
-) -> Result<(Entity<Buffer>, Anchor)> {
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone())?;
-    let result = language_registry
-        .load_language_for_file_path(&example.cursor_path)
-        .await;
-
-    if let Err(error) = result
-        && !error.is::<LanguageNotFound>()
-    {
-        return Err(error);
-    }
-
-    let worktree = project.read_with(cx, |project, cx| {
-        project
-            .visible_worktrees(cx)
-            .next()
-            .context("No visible worktrees")
-    })??;
-
-    let cursor_path = RelPath::new(&example.cursor_path, PathStyle::Posix)
-        .context("Failed to create RelPath")?
-        .into_arc();
-    let cursor_buffer = project
-        .update(cx, |project, cx| {
-            project.open_buffer(
-                ProjectPath {
-                    worktree_id: worktree.read(cx).id(),
-                    path: cursor_path,
-                },
-                cx,
-            )
-        })?
-        .await?;
-    let cursor_offset_within_excerpt = example
-        .cursor_position
-        .find(CURSOR_MARKER)
-        .context("missing cursor marker")?;
-    let mut cursor_excerpt = example.cursor_position.clone();
-    cursor_excerpt.replace_range(
-        cursor_offset_within_excerpt..(cursor_offset_within_excerpt + CURSOR_MARKER.len()),
-        "",
-    );
-    let excerpt_offset = cursor_buffer.read_with(cx, |buffer, _cx| {
-        let text = buffer.text();
-
-        let mut matches = text.match_indices(&cursor_excerpt);
-        let (excerpt_offset, _) = matches.next().with_context(|| {
-            format!(
-                "\nExcerpt:\n\n{cursor_excerpt}\nBuffer text:\n{text}\n.Example: {}\nCursor excerpt did not exist in buffer.",
-                example.name
-            )
-        })?;
-        anyhow::ensure!(matches.next().is_none(), "More than one cursor position match found for {}", &example.name);
-        Ok(excerpt_offset)
-    })??;
-
-    let cursor_offset = excerpt_offset + cursor_offset_within_excerpt;
-    let cursor_anchor =
-        cursor_buffer.read_with(cx, |buffer, _| buffer.anchor_after(cursor_offset))?;
-
-    Ok((cursor_buffer, cursor_anchor))
-}
-
-async fn setup_project(
-    example: &mut Example,
-    app_state: &Arc<EpAppState>,
-    step_progress: &StepProgress,
-    cx: &mut AsyncApp,
-) -> Result<Entity<Project>> {
-    let ep_store = cx
-        .update(|cx| EditPredictionStore::try_global(cx))?
-        .context("Store should be initialized at init")?;
-
-    let worktree_path = setup_worktree(example, step_progress).await?;
-
-    if let Some(project) = app_state.project_cache.get(&example.repository_url) {
-        ep_store.update(cx, |ep_store, _| {
-            ep_store.clear_history_for_project(&project);
-        })?;
-        let buffer_store = project.read_with(cx, |project, _| project.buffer_store().clone())?;
-        let buffers = buffer_store.read_with(cx, |buffer_store, _| {
-            buffer_store.buffers().collect::<Vec<_>>()
-        })?;
-        for buffer in buffers {
-            buffer
-                .update(cx, |buffer, cx| buffer.reload(cx))?
-                .await
-                .ok();
-        }
-        return Ok(project);
-    }
-
-    let project = cx.update(|cx| {
-        Project::local(
-            app_state.client.clone(),
-            app_state.node_runtime.clone(),
-            app_state.user_store.clone(),
-            app_state.languages.clone(),
-            app_state.fs.clone(),
-            None,
-            cx,
-        )
-    })?;
-
-    project
-        .update(cx, |project, cx| {
-            project.disable_worktree_scanner(cx);
-            project.create_worktree(&worktree_path, true, cx)
-        })?
-        .await?;
-
-    app_state
-        .project_cache
-        .insert(example.repository_url.clone(), project.clone());
-
-    let buffer_store = project.read_with(cx, |project, _| project.buffer_store().clone())?;
-    cx.subscribe(&buffer_store, {
-        let project = project.clone();
-        move |_, event, cx| match event {
-            BufferStoreEvent::BufferAdded(buffer) => {
-                ep_store.update(cx, |store, cx| store.register_buffer(&buffer, &project, cx));
-            }
-            _ => {}
-        }
-    })?
-    .detach();
-
-    Ok(project)
-}
-
-async fn setup_worktree(example: &Example, step_progress: &StepProgress) -> Result<PathBuf> {
-    let (repo_owner, repo_name) = example.repo_name().context("failed to get repo name")?;
-    let repo_dir = REPOS_DIR.join(repo_owner.as_ref()).join(repo_name.as_ref());
-    let worktree_path = WORKTREES_DIR
-        .join(repo_owner.as_ref())
-        .join(repo_name.as_ref());
-    let repo_lock = lock_repo(&repo_dir).await;
-
-    if !repo_dir.is_dir() {
-        step_progress.set_substatus(format!("cloning {}", repo_name));
-        fs::create_dir_all(&repo_dir)?;
-        run_git(&repo_dir, &["init"]).await?;
-        run_git(
-            &repo_dir,
-            &["remote", "add", "origin", &example.repository_url],
-        )
-        .await?;
-    }
-
-    // Resolve the example to a revision, fetching it if needed.
-    let revision = run_git(
-        &repo_dir,
-        &["rev-parse", &format!("{}^{{commit}}", example.revision)],
-    )
-    .await;
-    let revision = if let Ok(revision) = revision {
-        revision
-    } else {
-        step_progress.set_substatus("fetching");
-        if run_git(
-            &repo_dir,
-            &["fetch", "--depth", "1", "origin", &example.revision],
-        )
-        .await
-        .is_err()
-        {
-            run_git(&repo_dir, &["fetch", "origin"]).await?;
-        }
-        let revision = run_git(&repo_dir, &["rev-parse", "FETCH_HEAD"]).await?;
-        revision
-    };
-
-    // Create the worktree for this example if needed.
-    step_progress.set_substatus("preparing worktree");
-    if worktree_path.is_dir() {
-        run_git(&worktree_path, &["clean", "--force", "-d"]).await?;
-        run_git(&worktree_path, &["reset", "--hard", "HEAD"]).await?;
-        run_git(&worktree_path, &["checkout", revision.as_str()]).await?;
-    } else {
-        let worktree_path_string = worktree_path.to_string_lossy();
-        run_git(
-            &repo_dir,
-            &["branch", "-f", &example.name, revision.as_str()],
-        )
-        .await?;
-        run_git(
-            &repo_dir,
-            &[
-                "worktree",
-                "add",
-                "-f",
-                &worktree_path_string,
-                &example.name,
-            ],
-        )
-        .await?;
-    }
-    drop(repo_lock);
-
-    // Apply the uncommitted diff for this example.
-    if !example.uncommitted_diff.is_empty() {
-        step_progress.set_substatus("applying diff");
-        let mut apply_process = smol::process::Command::new("git")
-            .current_dir(&worktree_path)
-            .args(&["apply", "-"])
-            .stdin(std::process::Stdio::piped())
-            .spawn()?;
-
-        let mut stdin = apply_process.stdin.take().context("Failed to get stdin")?;
-        stdin.write_all(example.uncommitted_diff.as_bytes()).await?;
-        stdin.close().await?;
-        drop(stdin);
-
-        let apply_result = apply_process.output().await?;
-        anyhow::ensure!(
-            apply_result.status.success(),
-            "Failed to apply uncommitted diff patch with status: {}\nstderr:\n{}\nstdout:\n{}",
-            apply_result.status,
-            String::from_utf8_lossy(&apply_result.stderr),
-            String::from_utf8_lossy(&apply_result.stdout),
-        );
-    }
-
-    step_progress.clear_substatus();
-    Ok(worktree_path)
-}
-
-async fn apply_edit_history(
-    example: &Example,
-    project: &Entity<Project>,
-    cx: &mut AsyncApp,
-) -> Result<OpenedBuffers> {
-    edit_prediction::udiff::apply_diff(&example.edit_history, project, cx).await
-}
-
-thread_local! {
-    static REPO_LOCKS: RefCell<HashMap<PathBuf, Arc<Mutex<()>>>> = RefCell::new(HashMap::default());
-}
-
-#[must_use]
-pub async fn lock_repo(path: impl AsRef<Path>) -> OwnedMutexGuard<()> {
-    REPO_LOCKS
-        .with(|cell| {
-            cell.borrow_mut()
-                .entry(path.as_ref().to_path_buf())
-                .or_default()
-                .clone()
-        })
-        .lock_owned()
-        .await
-}
-
-async fn run_git(repo_path: &Path, args: &[&str]) -> Result<String> {
-    let output = smol::process::Command::new("git")
-        .current_dir(repo_path)
-        .args(args)
-        .output()
-        .await?;
-
-    anyhow::ensure!(
-        output.status.success(),
-        "`git {}` within `{}` failed with status: {}\nstderr:\n{}\nstdout:\n{}",
-        args.join(" "),
-        repo_path.display(),
-        output.status,
-        String::from_utf8_lossy(&output.stderr),
-        String::from_utf8_lossy(&output.stdout),
-    );
-    Ok(String::from_utf8(output.stdout)?.trim().to_string())
-}
diff --git a/crates/edit_prediction_cli/src/main.rs b/crates/edit_prediction_cli/src/main.rs
deleted file mode 100644
index 3b18510339..0000000000
--- a/crates/edit_prediction_cli/src/main.rs
+++ /dev/null
@@ -1,343 +0,0 @@
-mod anthropic_client;
-mod distill;
-mod example;
-mod format_prompt;
-mod headless;
-mod load_project;
-mod metrics;
-mod paths;
-mod predict;
-mod progress;
-mod retrieve_context;
-mod score;
-
-use clap::{Args, CommandFactory, Parser, Subcommand, ValueEnum};
-use edit_prediction::EditPredictionStore;
-use gpui::Application;
-use reqwest_client::ReqwestClient;
-use serde::{Deserialize, Serialize};
-use std::fmt::Display;
-use std::{path::PathBuf, sync::Arc};
-
-use crate::distill::run_distill;
-use crate::example::{group_examples_by_repo, read_examples, write_examples};
-use crate::format_prompt::run_format_prompt;
-use crate::load_project::run_load_project;
-use crate::paths::FAILED_EXAMPLES_DIR;
-use crate::predict::run_prediction;
-use crate::progress::Progress;
-use crate::retrieve_context::run_context_retrieval;
-use crate::score::run_scoring;
-
-#[derive(Parser, Debug)]
-#[command(name = "ep")]
-struct EpArgs {
-    #[arg(long, default_value_t = false)]
-    printenv: bool,
-    #[clap(long, default_value_t = 10, global = true)]
-    max_parallelism: usize,
-    #[command(subcommand)]
-    command: Option<Command>,
-    #[clap(global = true)]
-    inputs: Vec<PathBuf>,
-    #[arg(long, short, global = true)]
-    output: Option<PathBuf>,
-    #[arg(long, short, global = true)]
-    in_place: bool,
-    #[arg(long, short, global = true)]
-    failfast: bool,
-}
-
-#[derive(Subcommand, Debug)]
-enum Command {
-    /// Parse markdown examples and output a combined .jsonl file
-    ParseExample,
-    /// Create git worktrees for each example and load file contents
-    LoadProject,
-    /// Retrieve context for input examples.
-    Context,
-    /// Generate a prompt string for a specific model
-    FormatPrompt(FormatPromptArgs),
-    /// Runs edit prediction
-    Predict(PredictArgs),
-    /// Computes a score based on actual and expected patches
-    Score(PredictArgs),
-    /// Prepares a distillation dataset by copying expected outputs to
-    /// predicted outputs and removing actual outputs and prompts.
-    Distill,
-    /// Print aggregated scores
-    Eval(PredictArgs),
-    /// Remove git repositories and worktrees
-    Clean,
-}
-
-impl Display for Command {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Command::ParseExample => write!(f, "parse-example"),
-            Command::LoadProject => write!(f, "load-project"),
-            Command::Context => write!(f, "context"),
-            Command::FormatPrompt(format_prompt_args) => write!(
-                f,
-                "format-prompt --prompt-format={}",
-                format_prompt_args
-                    .prompt_format
-                    .to_possible_value()
-                    .unwrap()
-                    .get_name()
-            ),
-            Command::Predict(predict_args) => {
-                write!(
-                    f,
-                    "predict --provider={:?}",
-                    predict_args
-                        .provider
-                        .to_possible_value()
-                        .unwrap()
-                        .get_name()
-                )
-            }
-            Command::Score(predict_args) => {
-                write!(
-                    f,
-                    "score --provider={:?}",
-                    predict_args
-                        .provider
-                        .to_possible_value()
-                        .unwrap()
-                        .get_name()
-                )
-            }
-            Command::Distill => write!(f, "distill"),
-            Command::Eval(predict_args) => write!(
-                f,
-                "eval --provider={:?}",
-                predict_args
-                    .provider
-                    .to_possible_value()
-                    .unwrap()
-                    .get_name()
-            ),
-            Command::Clean => write!(f, "clean"),
-        }
-    }
-}
-
-#[derive(Debug, Args)]
-struct FormatPromptArgs {
-    #[clap(long)]
-    prompt_format: PromptFormat,
-}
-
-#[derive(Clone, Copy, Debug, ValueEnum, Serialize, Deserialize)]
-enum PromptFormat {
-    Teacher,
-    Zeta2,
-}
-
-#[derive(Debug, Args)]
-struct PredictArgs {
-    #[clap(long)]
-    provider: PredictionProvider,
-    #[clap(long, default_value_t = 1)]
-    repetitions: usize,
-}
-
-#[derive(Clone, Copy, Debug, ValueEnum, Serialize, Deserialize)]
-enum PredictionProvider {
-    Sweep,
-    Mercury,
-    Zeta1,
-    Zeta2,
-    Teacher,
-    TeacherNonBatching,
-}
-
-impl EpArgs {
-    fn output_path(&self) -> Option<PathBuf> {
-        if self.in_place {
-            if self.inputs.len() == 1 {
-                self.inputs.first().cloned()
-            } else {
-                panic!("--in-place requires exactly one input file")
-            }
-        } else {
-            self.output.clone()
-        }
-    }
-}
-
-fn main() {
-    let args = EpArgs::parse();
-
-    if args.printenv {
-        ::util::shell_env::print_env();
-        return;
-    }
-
-    let output = args.output_path();
-    let command = match args.command {
-        Some(cmd) => cmd,
-        None => {
-            EpArgs::command().print_help().unwrap();
-            return;
-        }
-    };
-
-    match &command {
-        Command::Clean => {
-            std::fs::remove_dir_all(&*paths::DATA_DIR).unwrap();
-            return;
-        }
-        _ => {}
-    }
-
-    let mut examples = read_examples(&args.inputs);
-    let http_client = Arc::new(ReqwestClient::new());
-    let app = Application::headless().with_http_client(http_client);
-
-    app.run(move |cx| {
-        let app_state = Arc::new(headless::init(cx));
-        EditPredictionStore::global(&app_state.client, &app_state.user_store, cx);
-
-        cx.spawn(async move |cx| {
-            let result = async {
-                if let Command::Predict(args) = &command {
-                    predict::sync_batches(&args.provider).await?;
-                }
-
-                let total_examples = examples.len();
-                Progress::global().set_total_examples(total_examples);
-
-                let mut grouped_examples = group_examples_by_repo(&mut examples);
-                let example_batches = grouped_examples.chunks_mut(args.max_parallelism);
-
-                for example_batch in example_batches {
-                    let futures = example_batch.into_iter().map(|repo_examples| async {
-                        for example in repo_examples.iter_mut() {
-                            let result = async {
-                                match &command {
-                                    Command::ParseExample => {}
-                                    Command::LoadProject => {
-                                        run_load_project(example, app_state.clone(), cx.clone())
-                                            .await?;
-                                    }
-                                    Command::Context => {
-                                        run_context_retrieval(
-                                            example,
-                                            app_state.clone(),
-                                            cx.clone(),
-                                        )
-                                        .await?;
-                                    }
-                                    Command::FormatPrompt(args) => {
-                                        run_format_prompt(
-                                            example,
-                                            args.prompt_format,
-                                            app_state.clone(),
-                                            cx.clone(),
-                                        )
-                                        .await?;
-                                    }
-                                    Command::Predict(args) => {
-                                        run_prediction(
-                                            example,
-                                            Some(args.provider),
-                                            args.repetitions,
-                                            app_state.clone(),
-                                            cx.clone(),
-                                        )
-                                        .await?;
-                                    }
-                                    Command::Distill => {
-                                        run_distill(example).await?;
-                                    }
-                                    Command::Score(args) | Command::Eval(args) => {
-                                        run_scoring(example, &args, app_state.clone(), cx.clone())
-                                            .await?;
-                                    }
-                                    Command::Clean => {
-                                        unreachable!()
-                                    }
-                                }
-                                anyhow::Ok(())
-                            }
-                            .await;
-
-                            if let Err(e) = result {
-                                Progress::global().increment_failed();
-                                let failed_example_path =
-                                    FAILED_EXAMPLES_DIR.join(format!("{}.json", example.name));
-                                app_state
-                                    .fs
-                                    .write(
-                                        &failed_example_path,
-                                        &serde_json::to_vec_pretty(&example).unwrap(),
-                                    )
-                                    .await
-                                    .unwrap();
-                                let err_path =
-                                    FAILED_EXAMPLES_DIR.join(format!("{}_err.txt", example.name));
-                                app_state
-                                    .fs
-                                    .write(&err_path, e.to_string().as_bytes())
-                                    .await
-                                    .unwrap();
-
-                                let msg = format!(
-                                    indoc::indoc! {"
-                                        While processing {}:
-
-                                        {:?}
-
-                                        Written to: \x1b[36m{}\x1b[0m
-
-                                        Explore this example data with:
-                                            fx \x1b[36m{}\x1b[0m
-
-                                        Re-run this example with:
-                                            cargo run -p edit_prediction_cli -- {} \x1b[36m{}\x1b[0m
-                                    "},
-                                    example.name,
-                                    e,
-                                    err_path.display(),
-                                    failed_example_path.display(),
-                                    command,
-                                    failed_example_path.display(),
-                                );
-                                if args.failfast || total_examples == 1 {
-                                    Progress::global().finalize();
-                                    panic!("{}", msg);
-                                } else {
-                                    log::error!("{}", msg);
-                                }
-                            }
-                        }
-                    });
-                    futures::future::join_all(futures).await;
-                }
-                Progress::global().finalize();
-
-                if args.output.is_some() || !matches!(command, Command::Eval(_)) {
-                    write_examples(&examples, output.as_ref());
-                }
-
-                match &command {
-                    Command::Predict(args) => predict::sync_batches(&args.provider).await?,
-                    Command::Eval(_) => score::print_report(&examples),
-                    _ => (),
-                };
-
-                anyhow::Ok(())
-            }
-            .await;
-
-            if let Err(e) = result {
-                panic!("Fatal error: {:?}", e);
-            }
-
-            let _ = cx.update(|cx| cx.quit());
-        })
-        .detach();
-    });
-}
diff --git a/crates/edit_prediction_cli/src/metrics.rs b/crates/edit_prediction_cli/src/metrics.rs
deleted file mode 100644
index b3e5eb8688..0000000000
--- a/crates/edit_prediction_cli/src/metrics.rs
+++ /dev/null
@@ -1,371 +0,0 @@
-use collections::{HashMap, HashSet};
-use edit_prediction::udiff::DiffLine;
-use serde::{Deserialize, Serialize};
-
-type Counts = HashMap<String, usize>;
-type CountsDelta = HashMap<String, isize>;
-
-#[derive(Default, Debug, Clone, Serialize, Deserialize)]
-pub struct ClassificationMetrics {
-    pub true_positives: usize,
-    pub false_positives: usize,
-    pub false_negatives: usize,
-}
-
-impl ClassificationMetrics {
-    pub fn from_sets(
-        expected: &HashSet<String>,
-        actual: &HashSet<String>,
-    ) -> ClassificationMetrics {
-        let true_positives = expected.intersection(actual).count();
-        let false_positives = actual.difference(expected).count();
-        let false_negatives = expected.difference(actual).count();
-
-        ClassificationMetrics {
-            true_positives,
-            false_positives,
-            false_negatives,
-        }
-    }
-
-    pub fn from_counts(expected: &Counts, actual: &Counts) -> ClassificationMetrics {
-        let mut true_positives = 0;
-        let mut false_positives = 0;
-        let mut false_negatives = 0;
-
-        for (ngram, &expected_count) in expected {
-            let actual_count = *actual.get(ngram).unwrap_or(&0);
-            if actual_count > expected_count {
-                false_positives += actual_count - expected_count;
-            } else {
-                false_negatives += expected_count - actual_count;
-            }
-            true_positives += expected_count.min(actual_count);
-        }
-
-        for (ngram, &actual_count) in actual {
-            if !expected.contains_key(ngram) {
-                false_positives += actual_count;
-            }
-        }
-
-        ClassificationMetrics {
-            true_positives,
-            false_positives,
-            false_negatives,
-        }
-    }
-
-    pub fn aggregate<'a>(
-        scores: impl Iterator<Item = &'a ClassificationMetrics>,
-    ) -> ClassificationMetrics {
-        let mut true_positives = 0;
-        let mut false_positives = 0;
-        let mut false_negatives = 0;
-
-        for score in scores {
-            true_positives += score.true_positives;
-            false_positives += score.false_positives;
-            false_negatives += score.false_negatives;
-        }
-
-        ClassificationMetrics {
-            true_positives,
-            false_positives,
-            false_negatives,
-        }
-    }
-
-    pub fn precision(&self) -> f64 {
-        if self.true_positives + self.false_positives == 0 {
-            0.0
-        } else {
-            self.true_positives as f64 / (self.true_positives + self.false_positives) as f64
-        }
-    }
-
-    pub fn recall(&self) -> f64 {
-        if self.true_positives + self.false_negatives == 0 {
-            0.0
-        } else {
-            self.true_positives as f64 / (self.true_positives + self.false_negatives) as f64
-        }
-    }
-
-    pub fn f1_score(&self) -> f64 {
-        let recall = self.recall();
-        let precision = self.precision();
-        if precision + recall == 0.0 {
-            0.0
-        } else {
-            2.0 * precision * recall / (precision + recall)
-        }
-    }
-}
-
-pub fn line_match_score(
-    expected_patch: &[DiffLine],
-    actual_patch: &[DiffLine],
-) -> ClassificationMetrics {
-    let expected_change_lines = expected_patch
-        .iter()
-        .filter(|line| matches!(line, DiffLine::Addition(_) | DiffLine::Deletion(_)))
-        .map(|line| line.to_string())
-        .collect();
-
-    let actual_change_lines = actual_patch
-        .iter()
-        .filter(|line| matches!(line, DiffLine::Addition(_) | DiffLine::Deletion(_)))
-        .map(|line| line.to_string())
-        .collect();
-
-    ClassificationMetrics::from_sets(&expected_change_lines, &actual_change_lines)
-}
-
-enum ChrfWhitespace {
-    #[allow(unused)]
-    Unchanged,
-    Ignore,
-}
-
-const CHR_F_CHAR_ORDER: usize = 6;
-const CHR_F_BETA: f64 = 2.0;
-const CHR_F_WHITESPACE: ChrfWhitespace = ChrfWhitespace::Ignore;
-
-/// Computes a delta-chrF score that compares two sets of edits.
-///
-/// This metric works by:
-/// 1. Reconstructing original, golden (expected result), and actual texts from diffs
-/// 2. Computing n-gram count differences (deltas) between original→golden and original→actual
-/// 3. Comparing these deltas to measure how well actual edits match expected edits
-pub fn delta_chr_f(expected: &[DiffLine], actual: &[DiffLine]) -> f64 {
-    // Reconstruct texts from diffs
-    let mut original_text = String::new(); // state of the text before any edits
-    let mut golden_text = String::new(); // text after applying golden edits
-    let mut actual_text = String::new(); // text after applying actual edits
-
-    for line in expected {
-        match line {
-            DiffLine::Context(s) => {
-                original_text.push_str(s);
-                golden_text.push_str(s);
-            }
-            DiffLine::Deletion(s) => {
-                original_text.push_str(s);
-            }
-            DiffLine::Addition(s) => {
-                golden_text.push_str(s);
-            }
-            _ => {}
-        }
-    }
-
-    for line in actual {
-        match line {
-            DiffLine::Context(s) | DiffLine::Addition(s) => {
-                actual_text.push_str(s);
-            }
-            _ => {}
-        }
-    }
-
-    // Edge case
-    if original_text == golden_text && golden_text == actual_text {
-        return 100.0;
-    }
-
-    // Compute the metric
-    let original_ngrams = chr_f_ngram_counts(&original_text);
-    let golden_ngrams = chr_f_ngram_counts(&golden_text);
-    let actual_ngrams = chr_f_ngram_counts(&actual_text);
-
-    let mut total_precision = 0.0;
-    let mut total_recall = 0.0;
-
-    for order in 0..CHR_F_CHAR_ORDER {
-        let expected_delta = compute_ngram_delta(&golden_ngrams[order], &original_ngrams[order]);
-        let actual_delta = compute_ngram_delta(&actual_ngrams[order], &original_ngrams[order]);
-
-        if expected_delta.is_empty() && actual_delta.is_empty() {
-            total_precision += 1.0;
-            total_recall += 1.0;
-            continue;
-        }
-
-        let expected_counts = ngram_delta_to_counts(&expected_delta);
-        let actual_counts = ngram_delta_to_counts(&actual_delta);
-
-        let score = ClassificationMetrics::from_counts(&expected_counts, &actual_counts);
-        total_precision += score.precision();
-        total_recall += score.recall();
-    }
-
-    let prec = total_precision / CHR_F_CHAR_ORDER as f64;
-    let recall = total_recall / CHR_F_CHAR_ORDER as f64;
-    let f_score = if prec + recall == 0.0 {
-        0.0
-    } else {
-        (1.0 + CHR_F_BETA * CHR_F_BETA) * prec * recall / (CHR_F_BETA * CHR_F_BETA * prec + recall)
-    };
-
-    f_score * 100.0
-}
-
-fn chr_f_ngram_counts(text: &str) -> Vec<Counts> {
-    // Ignore whitespace. The original chrF implementation skips all
-    // whitespace. We should consider compressing multiple consecutive
-    // spaces into one -- this may reflect our task more closely.
-    let text = match CHR_F_WHITESPACE {
-        ChrfWhitespace::Unchanged => text.to_string(),
-        ChrfWhitespace::Ignore => text
-            .chars()
-            .filter(|c| !c.is_whitespace())
-            .collect::<String>(),
-    };
-
-    (1..=CHR_F_CHAR_ORDER)
-        .map(|order| count_ngrams(&text, order))
-        .collect()
-}
-
-fn compute_ngram_delta(after: &Counts, before: &Counts) -> CountsDelta {
-    let mut delta = CountsDelta::default();
-
-    for (ngram, &before_count) in before {
-        let after_count = *after.get(ngram).unwrap_or(&0);
-        delta.insert(ngram.clone(), after_count as isize - before_count as isize);
-    }
-
-    for (ngram, &after_count) in after {
-        if !before.contains_key(ngram) {
-            delta.insert(ngram.clone(), after_count as isize);
-        }
-    }
-
-    delta
-}
-
-/// Convert negative counts to special deletion tokens.
-/// For example, if expected delta is {"foo": -1} and actual delta is {"bar": -1},
-/// we convert it to {"¬foo": +1} and {"¬bar": +1}. This way _not_ deleting "foo"
-/// will result in a false negative, and mistakenly deleting "bar" will result in a false positive.
-fn ngram_delta_to_counts(delta: &CountsDelta) -> Counts {
-    let mut counts = Counts::default();
-
-    for (ngram, &delta) in delta {
-        if delta > 0 {
-            counts.insert(ngram.clone(), delta as usize);
-        } else {
-            counts.insert(format!("¬{ngram}"), delta.unsigned_abs());
-        }
-    }
-
-    counts
-}
-
-fn count_ngrams(text: &str, n: usize) -> Counts {
-    let chars: Vec<char> = text.chars().collect();
-    let mut counts = Counts::default();
-
-    for window in chars.windows(n) {
-        let ngram: String = window.iter().collect();
-        *counts.entry(ngram).or_insert(0) += 1;
-    }
-
-    counts
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use edit_prediction::udiff::DiffLine;
-
-    #[test]
-    fn test_delta_chr_f_perfect_match() {
-        let diff = vec![
-            DiffLine::Context("fn main() {"),
-            DiffLine::Deletion("    println!(\"Hello\");"),
-            DiffLine::Addition("    println!(\"Hello, World!\");"),
-            DiffLine::Context("}"),
-        ];
-
-        let score = delta_chr_f(&diff, &diff);
-        assert!((score - 100.0).abs() < 1e-2);
-    }
-
-    #[test]
-    fn test_delta_chr_f_wrong_edit() {
-        // When the edit is wrong
-        let expected = vec![
-            DiffLine::Context("one "),
-            DiffLine::Deletion("two "),
-            DiffLine::Context("three"),
-        ];
-
-        let actual = vec![
-            DiffLine::Context("one "),
-            DiffLine::Context("two "),
-            DiffLine::Deletion("three"),
-            DiffLine::Addition("four"),
-        ];
-
-        // Then the score should be low
-        let score = delta_chr_f(&expected, &actual);
-        assert!(score > 20.0 && score < 40.0);
-    }
-
-    #[test]
-    fn test_delta_chr_f_partial_match() {
-        let expected = vec![
-            DiffLine::Deletion("let x = 42;"),
-            DiffLine::Addition("let x = 100;"),
-        ];
-
-        let actual = vec![
-            DiffLine::Deletion("let x = 42;"),
-            DiffLine::Addition("let x = 99;"),
-        ];
-
-        // We got the edit location right, but the replacement text is wrong.
-        // Deleted ngrams will match, bringing the score somewhere in the middle.
-        let score = delta_chr_f(&expected, &actual);
-        assert!(score > 40.0 && score < 60.0);
-    }
-
-    #[test]
-    fn test_delta_chr_f_missed_edit() {
-        // When predictions makes no changes
-        let expected = vec![
-            DiffLine::Context("prefix "),
-            DiffLine::Deletion("old"),
-            DiffLine::Addition("new"),
-            DiffLine::Context(" suffix"),
-        ];
-
-        let actual = vec![
-            DiffLine::Context("prefix "),
-            DiffLine::Context("old"),
-            DiffLine::Context(" suffix"),
-        ];
-
-        // Then the score should be low (all expected changes are false negatives)
-        let score = delta_chr_f(&expected, &actual);
-        assert!(score < 20.0);
-    }
-
-    #[test]
-    fn test_delta_chr_f_extra_edit() {
-        // When adding unexpected content
-        let expected = vec![DiffLine::Context("hello"), DiffLine::Context("world")];
-
-        let actual = vec![
-            DiffLine::Context("hello"),
-            DiffLine::Addition("extra"),
-            DiffLine::Context("world"),
-        ];
-
-        // Then the score should be low (all actual changes are false positives)
-        let score = delta_chr_f(&expected, &actual);
-        assert!(score < 20.0);
-    }
-}
diff --git a/crates/edit_prediction_cli/src/paths.rs b/crates/edit_prediction_cli/src/paths.rs
deleted file mode 100644
index e5d420d0e3..0000000000
--- a/crates/edit_prediction_cli/src/paths.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-use std::{
-    path::{Path, PathBuf},
-    sync::LazyLock,
-};
-
-pub static DATA_DIR: LazyLock<PathBuf> = LazyLock::new(|| {
-    let dir = dirs::home_dir().unwrap().join(".zed_ep");
-    ensure_dir(&dir)
-});
-pub static CACHE_DIR: LazyLock<PathBuf> = LazyLock::new(|| ensure_dir(&DATA_DIR.join("cache")));
-pub static REPOS_DIR: LazyLock<PathBuf> = LazyLock::new(|| ensure_dir(&DATA_DIR.join("repos")));
-pub static WORKTREES_DIR: LazyLock<PathBuf> =
-    LazyLock::new(|| ensure_dir(&DATA_DIR.join("worktrees")));
-pub static RUN_DIR: LazyLock<PathBuf> = LazyLock::new(|| {
-    DATA_DIR
-        .join("runs")
-        .join(chrono::Local::now().format("%d-%m-%y-%H_%M_%S").to_string())
-});
-pub static LATEST_EXAMPLE_RUN_DIR: LazyLock<PathBuf> = LazyLock::new(|| DATA_DIR.join("latest"));
-pub static LLM_CACHE_DB: LazyLock<PathBuf> = LazyLock::new(|| CACHE_DIR.join("llm_cache.sqlite"));
-pub static FAILED_EXAMPLES_DIR: LazyLock<PathBuf> =
-    LazyLock::new(|| ensure_dir(&RUN_DIR.join("failed")));
-
-fn ensure_dir(path: &Path) -> PathBuf {
-    std::fs::create_dir_all(path).expect("Failed to create directory");
-    path.to_path_buf()
-}
diff --git a/crates/edit_prediction_cli/src/predict.rs b/crates/edit_prediction_cli/src/predict.rs
deleted file mode 100644
index 3e6104e3a8..0000000000
--- a/crates/edit_prediction_cli/src/predict.rs
+++ /dev/null
@@ -1,291 +0,0 @@
-use crate::{
-    PredictionProvider, PromptFormat,
-    anthropic_client::AnthropicClient,
-    example::{Example, ExamplePrediction},
-    format_prompt::{TeacherPrompt, run_format_prompt},
-    headless::EpAppState,
-    load_project::run_load_project,
-    paths::{LATEST_EXAMPLE_RUN_DIR, RUN_DIR},
-    progress::{InfoStyle, Progress, Step},
-    retrieve_context::run_context_retrieval,
-};
-use anyhow::Context as _;
-use edit_prediction::{DebugEvent, EditPredictionStore};
-use futures::{FutureExt as _, StreamExt as _, future::Shared};
-use gpui::{AppContext as _, AsyncApp, Task};
-use std::{
-    fs,
-    sync::{
-        Arc, Mutex, OnceLock,
-        atomic::{AtomicUsize, Ordering::SeqCst},
-    },
-};
-
-pub async fn run_prediction(
-    example: &mut Example,
-    provider: Option<PredictionProvider>,
-    repetition_count: usize,
-    app_state: Arc<EpAppState>,
-    mut cx: AsyncApp,
-) -> anyhow::Result<()> {
-    if !example.predictions.is_empty() {
-        return Ok(());
-    }
-
-    let provider = provider.context("provider is required")?;
-
-    run_context_retrieval(example, app_state.clone(), cx.clone()).await?;
-
-    if matches!(
-        provider,
-        PredictionProvider::Teacher | PredictionProvider::TeacherNonBatching
-    ) {
-        let _step_progress = Progress::global().start(Step::Predict, &example.name);
-
-        if example.prompt.is_none() {
-            run_format_prompt(example, PromptFormat::Teacher, app_state.clone(), cx).await?;
-        }
-
-        let batched = matches!(provider, PredictionProvider::Teacher);
-        return predict_anthropic(example, repetition_count, batched).await;
-    }
-
-    run_load_project(example, app_state.clone(), cx.clone()).await?;
-
-    let _step_progress = Progress::global().start(Step::Predict, &example.name);
-
-    if matches!(
-        provider,
-        PredictionProvider::Zeta1 | PredictionProvider::Zeta2
-    ) {
-        static AUTHENTICATED: OnceLock<Shared<Task<()>>> = OnceLock::new();
-        AUTHENTICATED
-            .get_or_init(|| {
-                let client = app_state.client.clone();
-                cx.spawn(async move |cx| {
-                    if let Err(e) = client.sign_in_with_optional_connect(true, cx).await {
-                        eprintln!("Authentication failed: {}", e);
-                    }
-                })
-                .shared()
-            })
-            .clone()
-            .await;
-    }
-
-    let ep_store = cx.update(|cx| {
-        EditPredictionStore::try_global(cx).context("EditPredictionStore not initialized")
-    })??;
-
-    ep_store.update(&mut cx, |store, _cx| {
-        let model = match provider {
-            PredictionProvider::Zeta1 => edit_prediction::EditPredictionModel::Zeta1,
-            PredictionProvider::Zeta2 => edit_prediction::EditPredictionModel::Zeta2,
-            PredictionProvider::Sweep => edit_prediction::EditPredictionModel::Sweep,
-            PredictionProvider::Mercury => edit_prediction::EditPredictionModel::Mercury,
-            PredictionProvider::Teacher | PredictionProvider::TeacherNonBatching => {
-                unreachable!()
-            }
-        };
-        store.set_edit_prediction_model(model);
-    })?;
-    let state = example.state.as_ref().context("state must be set")?;
-    let run_dir = RUN_DIR.join(&example.name);
-
-    let updated_example = Arc::new(Mutex::new(example.clone()));
-    let current_run_ix = Arc::new(AtomicUsize::new(0));
-
-    let mut debug_rx =
-        ep_store.update(&mut cx, |store, cx| store.debug_info(&state.project, cx))?;
-    let debug_task = cx.background_spawn({
-        let updated_example = updated_example.clone();
-        let current_run_ix = current_run_ix.clone();
-        let run_dir = run_dir.clone();
-        async move {
-            while let Some(event) = debug_rx.next().await {
-                let run_ix = current_run_ix.load(SeqCst);
-                let mut updated_example = updated_example.lock().unwrap();
-
-                let run_dir = if repetition_count > 1 {
-                    run_dir.join(format!("{:03}", run_ix))
-                } else {
-                    run_dir.clone()
-                };
-
-                match event {
-                    DebugEvent::EditPredictionStarted(request) => {
-                        assert_eq!(updated_example.predictions.len(), run_ix + 1);
-
-                        if let Some(prompt) = request.prompt {
-                            fs::write(run_dir.join("prediction_prompt.md"), &prompt)?;
-                        }
-                    }
-                    DebugEvent::EditPredictionFinished(request) => {
-                        assert_eq!(updated_example.predictions.len(), run_ix + 1);
-
-                        if let Some(output) = request.model_output {
-                            fs::write(run_dir.join("prediction_response.md"), &output)?;
-                            updated_example
-                                .predictions
-                                .last_mut()
-                                .unwrap()
-                                .actual_output = output;
-                        }
-                        if run_ix >= repetition_count {
-                            break;
-                        }
-                    }
-                    _ => {}
-                }
-            }
-            anyhow::Ok(())
-        }
-    });
-
-    for ix in 0..repetition_count {
-        current_run_ix.store(ix, SeqCst);
-        let run_dir = if repetition_count > 1 {
-            run_dir.join(format!("{:03}", ix))
-        } else {
-            run_dir.clone()
-        };
-
-        fs::create_dir_all(&run_dir)?;
-        if LATEST_EXAMPLE_RUN_DIR.is_symlink() {
-            fs::remove_file(&*LATEST_EXAMPLE_RUN_DIR)?;
-        }
-        #[cfg(unix)]
-        std::os::unix::fs::symlink(&run_dir, &*LATEST_EXAMPLE_RUN_DIR)?;
-        #[cfg(windows)]
-        std::os::windows::fs::symlink_dir(&run_dir, &*LATEST_EXAMPLE_RUN_DIR)?;
-
-        updated_example
-            .lock()
-            .unwrap()
-            .predictions
-            .push(ExamplePrediction {
-                actual_patch: String::new(),
-                actual_output: String::new(),
-                provider,
-            });
-
-        let prediction = ep_store
-            .update(&mut cx, |store, cx| {
-                store.request_prediction(
-                    &state.project,
-                    &state.buffer,
-                    state.cursor_position,
-                    cloud_llm_client::PredictEditsRequestTrigger::Cli,
-                    cx,
-                )
-            })?
-            .await?;
-
-        let actual_patch = prediction
-            .and_then(|prediction| {
-                let prediction = prediction.prediction.ok()?;
-                prediction.edit_preview.as_unified_diff(&prediction.edits)
-            })
-            .unwrap_or_default();
-
-        let has_prediction = !actual_patch.is_empty();
-
-        updated_example
-            .lock()
-            .unwrap()
-            .predictions
-            .last_mut()
-            .unwrap()
-            .actual_patch = actual_patch;
-
-        if ix == repetition_count - 1 {
-            let (info, style) = if has_prediction {
-                ("predicted", InfoStyle::Normal)
-            } else {
-                ("no prediction", InfoStyle::Warning)
-            };
-            _step_progress.set_info(info, style);
-        }
-    }
-
-    ep_store.update(&mut cx, |store, _| {
-        store.remove_project(&state.project);
-    })?;
-    debug_task.await?;
-
-    *example = Arc::into_inner(updated_example)
-        .ok_or_else(|| anyhow::anyhow!("Failed to unwrap Arc"))?
-        .into_inner()
-        .map_err(|_| anyhow::anyhow!("Failed to unwrap Mutex"))?;
-    Ok(())
-}
-
-async fn predict_anthropic(
-    example: &mut Example,
-    _repetition_count: usize,
-    batched: bool,
-) -> anyhow::Result<()> {
-    let llm_model_name = "claude-sonnet-4-5";
-    let max_tokens = 16384;
-    let llm_client = if batched {
-        AnthropicClient::batch(&crate::paths::LLM_CACHE_DB.as_ref())
-    } else {
-        AnthropicClient::plain()
-    };
-    let llm_client = llm_client.context("Failed to create LLM client")?;
-
-    let prompt = example.prompt.as_ref().context("Prompt is required")?;
-
-    let messages = vec![anthropic::Message {
-        role: anthropic::Role::User,
-        content: vec![anthropic::RequestContent::Text {
-            text: prompt.input.clone(),
-            cache_control: None,
-        }],
-    }];
-
-    let Some(response) = llm_client
-        .generate(llm_model_name, max_tokens, messages)
-        .await?
-    else {
-        // Request stashed for batched processing
-        return Ok(());
-    };
-
-    let actual_output = response
-        .content
-        .into_iter()
-        .filter_map(|content| match content {
-            anthropic::ResponseContent::Text { text } => Some(text),
-            _ => None,
-        })
-        .collect::<Vec<String>>()
-        .join("\n");
-
-    let actual_patch = TeacherPrompt::parse(example, &actual_output)?;
-
-    let prediction = ExamplePrediction {
-        actual_patch,
-        actual_output,
-        provider: PredictionProvider::Teacher,
-    };
-
-    example.predictions.push(prediction);
-    Ok(())
-}
-
-pub async fn sync_batches(provider: &PredictionProvider) -> anyhow::Result<()> {
-    match provider {
-        PredictionProvider::Teacher => {
-            let cache_path = crate::paths::LLM_CACHE_DB.as_ref();
-            let llm_client =
-                AnthropicClient::batch(cache_path).context("Failed to create LLM client")?;
-            llm_client
-                .sync_batches()
-                .await
-                .context("Failed to sync batches")?;
-        }
-        _ => (),
-    };
-    Ok(())
-}
diff --git a/crates/edit_prediction_cli/src/progress.rs b/crates/edit_prediction_cli/src/progress.rs
deleted file mode 100644
index ddc710f202..0000000000
--- a/crates/edit_prediction_cli/src/progress.rs
+++ /dev/null
@@ -1,508 +0,0 @@
-use std::{
-    borrow::Cow,
-    collections::HashMap,
-    io::{IsTerminal, Write},
-    sync::{Arc, Mutex, OnceLock},
-    time::{Duration, Instant},
-};
-
-use log::{Level, Log, Metadata, Record};
-
-pub struct Progress {
-    inner: Mutex<ProgressInner>,
-}
-
-struct ProgressInner {
-    completed: Vec<CompletedTask>,
-    in_progress: HashMap<String, InProgressTask>,
-    is_tty: bool,
-    terminal_width: usize,
-    max_example_name_len: usize,
-    status_lines_displayed: usize,
-    total_examples: usize,
-    failed_examples: usize,
-    last_line_is_logging: bool,
-}
-
-#[derive(Clone)]
-struct InProgressTask {
-    step: Step,
-    started_at: Instant,
-    substatus: Option<String>,
-    info: Option<(String, InfoStyle)>,
-}
-
-struct CompletedTask {
-    step: Step,
-    example_name: String,
-    duration: Duration,
-    info: Option<(String, InfoStyle)>,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
-pub enum Step {
-    LoadProject,
-    Context,
-    FormatPrompt,
-    Predict,
-    Score,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum InfoStyle {
-    Normal,
-    Warning,
-}
-
-impl Step {
-    pub fn label(&self) -> &'static str {
-        match self {
-            Step::LoadProject => "Load",
-            Step::Context => "Context",
-            Step::FormatPrompt => "Format",
-            Step::Predict => "Predict",
-            Step::Score => "Score",
-        }
-    }
-
-    fn color_code(&self) -> &'static str {
-        match self {
-            Step::LoadProject => "\x1b[33m",
-            Step::Context => "\x1b[35m",
-            Step::FormatPrompt => "\x1b[34m",
-            Step::Predict => "\x1b[32m",
-            Step::Score => "\x1b[31m",
-        }
-    }
-}
-
-static GLOBAL: OnceLock<Arc<Progress>> = OnceLock::new();
-static LOGGER: ProgressLogger = ProgressLogger;
-
-const MARGIN: usize = 4;
-const MAX_STATUS_LINES: usize = 10;
-
-impl Progress {
-    /// Returns the global Progress instance, initializing it if necessary.
-    pub fn global() -> Arc<Progress> {
-        GLOBAL
-            .get_or_init(|| {
-                let progress = Arc::new(Self {
-                    inner: Mutex::new(ProgressInner {
-                        completed: Vec::new(),
-                        in_progress: HashMap::new(),
-                        is_tty: std::io::stderr().is_terminal(),
-                        terminal_width: get_terminal_width(),
-                        max_example_name_len: 0,
-                        status_lines_displayed: 0,
-                        total_examples: 0,
-                        failed_examples: 0,
-                        last_line_is_logging: false,
-                    }),
-                });
-                let _ = log::set_logger(&LOGGER);
-                log::set_max_level(log::LevelFilter::Error);
-                progress
-            })
-            .clone()
-    }
-
-    pub fn set_total_examples(&self, total: usize) {
-        let mut inner = self.inner.lock().unwrap();
-        inner.total_examples = total;
-    }
-
-    pub fn increment_failed(&self) {
-        let mut inner = self.inner.lock().unwrap();
-        inner.failed_examples += 1;
-    }
-
-    /// Prints a message to stderr, clearing and redrawing status lines to avoid corruption.
-    /// This should be used for any output that needs to appear above the status lines.
-    fn log(&self, message: &str) {
-        let mut inner = self.inner.lock().unwrap();
-        Self::clear_status_lines(&mut inner);
-
-        if !inner.last_line_is_logging {
-            let reset = "\x1b[0m";
-            let dim = "\x1b[2m";
-            let divider = "─".repeat(inner.terminal_width.saturating_sub(MARGIN));
-            eprintln!("{dim}{divider}{reset}");
-            inner.last_line_is_logging = true;
-        }
-
-        eprintln!("{}", message);
-    }
-
-    pub fn start(self: &Arc<Self>, step: Step, example_name: &str) -> StepProgress {
-        let mut inner = self.inner.lock().unwrap();
-
-        Self::clear_status_lines(&mut inner);
-
-        inner.max_example_name_len = inner.max_example_name_len.max(example_name.len());
-        inner.in_progress.insert(
-            example_name.to_string(),
-            InProgressTask {
-                step,
-                started_at: Instant::now(),
-                substatus: None,
-                info: None,
-            },
-        );
-
-        Self::print_status_lines(&mut inner);
-
-        StepProgress {
-            progress: self.clone(),
-            step,
-            example_name: example_name.to_string(),
-        }
-    }
-
-    fn finish(&self, step: Step, example_name: &str) {
-        let mut inner = self.inner.lock().unwrap();
-
-        let Some(task) = inner.in_progress.remove(example_name) else {
-            return;
-        };
-
-        if task.step == step {
-            inner.completed.push(CompletedTask {
-                step: task.step,
-                example_name: example_name.to_string(),
-                duration: task.started_at.elapsed(),
-                info: task.info,
-            });
-
-            Self::clear_status_lines(&mut inner);
-            Self::print_logging_closing_divider(&mut inner);
-            Self::print_completed(&inner, inner.completed.last().unwrap());
-            Self::print_status_lines(&mut inner);
-        } else {
-            inner.in_progress.insert(example_name.to_string(), task);
-        }
-    }
-
-    fn print_logging_closing_divider(inner: &mut ProgressInner) {
-        if inner.last_line_is_logging {
-            let reset = "\x1b[0m";
-            let dim = "\x1b[2m";
-            let divider = "─".repeat(inner.terminal_width.saturating_sub(MARGIN));
-            eprintln!("{dim}{divider}{reset}");
-            inner.last_line_is_logging = false;
-        }
-    }
-
-    fn clear_status_lines(inner: &mut ProgressInner) {
-        if inner.is_tty && inner.status_lines_displayed > 0 {
-            // Move up and clear each line we previously displayed
-            for _ in 0..inner.status_lines_displayed {
-                eprint!("\x1b[A\x1b[K");
-            }
-            let _ = std::io::stderr().flush();
-            inner.status_lines_displayed = 0;
-        }
-    }
-
-    fn print_completed(inner: &ProgressInner, task: &CompletedTask) {
-        let duration = format_duration(task.duration);
-        let name_width = inner.max_example_name_len;
-
-        if inner.is_tty {
-            let reset = "\x1b[0m";
-            let bold = "\x1b[1m";
-            let dim = "\x1b[2m";
-
-            let yellow = "\x1b[33m";
-            let info_part = task
-                .info
-                .as_ref()
-                .map(|(s, style)| {
-                    if *style == InfoStyle::Warning {
-                        format!("{yellow}{s}{reset}")
-                    } else {
-                        s.to_string()
-                    }
-                })
-                .unwrap_or_default();
-
-            let prefix = format!(
-                "{bold}{color}{label:>12}{reset} {name:<name_width$} {dim}│{reset} {info_part}",
-                color = task.step.color_code(),
-                label = task.step.label(),
-                name = task.example_name,
-            );
-
-            let duration_with_margin = format!("{duration} ");
-            let padding_needed = inner
-                .terminal_width
-                .saturating_sub(MARGIN)
-                .saturating_sub(duration_with_margin.len())
-                .saturating_sub(strip_ansi_len(&prefix));
-            let padding = " ".repeat(padding_needed);
-
-            eprintln!("{prefix}{padding}{dim}{duration_with_margin}{reset}");
-        } else {
-            let info_part = task
-                .info
-                .as_ref()
-                .map(|(s, _)| format!(" | {}", s))
-                .unwrap_or_default();
-
-            eprintln!(
-                "{label:>12} {name:<name_width$}{info_part} {duration}",
-                label = task.step.label(),
-                name = task.example_name,
-            );
-        }
-    }
-
-    fn print_status_lines(inner: &mut ProgressInner) {
-        if !inner.is_tty || inner.in_progress.is_empty() {
-            inner.status_lines_displayed = 0;
-            return;
-        }
-
-        let reset = "\x1b[0m";
-        let bold = "\x1b[1m";
-        let dim = "\x1b[2m";
-
-        // Build the done/in-progress/total label
-        let done_count = inner.completed.len();
-        let in_progress_count = inner.in_progress.len();
-        let failed_count = inner.failed_examples;
-
-        let failed_label = if failed_count > 0 {
-            format!(" {} failed ", failed_count)
-        } else {
-            String::new()
-        };
-
-        let range_label = format!(
-            " {}/{}/{} ",
-            done_count, in_progress_count, inner.total_examples
-        );
-
-        // Print a divider line with failed count on left, range label on right
-        let failed_visible_len = strip_ansi_len(&failed_label);
-        let range_visible_len = range_label.len();
-        let middle_divider_len = inner
-            .terminal_width
-            .saturating_sub(MARGIN * 2)
-            .saturating_sub(failed_visible_len)
-            .saturating_sub(range_visible_len);
-        let left_divider = "─".repeat(MARGIN);
-        let middle_divider = "─".repeat(middle_divider_len);
-        let right_divider = "─".repeat(MARGIN);
-        eprintln!(
-            "{dim}{left_divider}{reset}{failed_label}{dim}{middle_divider}{reset}{range_label}{dim}{right_divider}{reset}"
-        );
-
-        let mut tasks: Vec<_> = inner.in_progress.iter().collect();
-        tasks.sort_by_key(|(name, _)| *name);
-
-        let total_tasks = tasks.len();
-        let mut lines_printed = 0;
-
-        for (name, task) in tasks.iter().take(MAX_STATUS_LINES) {
-            let elapsed = format_duration(task.started_at.elapsed());
-            let substatus_part = task
-                .substatus
-                .as_ref()
-                .map(|s| truncate_with_ellipsis(s, 30))
-                .unwrap_or_default();
-
-            let step_label = task.step.label();
-            let step_color = task.step.color_code();
-            let name_width = inner.max_example_name_len;
-
-            let prefix = format!(
-                "{bold}{step_color}{step_label:>12}{reset} {name:<name_width$} {dim}│{reset} {substatus_part}",
-                name = name,
-            );
-
-            let duration_with_margin = format!("{elapsed} ");
-            let padding_needed = inner
-                .terminal_width
-                .saturating_sub(MARGIN)
-                .saturating_sub(duration_with_margin.len())
-                .saturating_sub(strip_ansi_len(&prefix));
-            let padding = " ".repeat(padding_needed);
-
-            eprintln!("{prefix}{padding}{dim}{duration_with_margin}{reset}");
-            lines_printed += 1;
-        }
-
-        // Show "+N more" on its own line if there are more tasks
-        if total_tasks > MAX_STATUS_LINES {
-            let remaining = total_tasks - MAX_STATUS_LINES;
-            eprintln!("{:>12} +{remaining} more", "");
-            lines_printed += 1;
-        }
-
-        inner.status_lines_displayed = lines_printed + 1; // +1 for the divider line
-        let _ = std::io::stderr().flush();
-    }
-
-    pub fn finalize(&self) {
-        let mut inner = self.inner.lock().unwrap();
-        Self::clear_status_lines(&mut inner);
-
-        // Print summary if there were failures
-        if inner.failed_examples > 0 {
-            let total_processed = inner.completed.len() + inner.failed_examples;
-            let percentage = if total_processed > 0 {
-                inner.failed_examples as f64 / total_processed as f64 * 100.0
-            } else {
-                0.0
-            };
-            eprintln!(
-                "\n{} of {} examples failed ({:.1}%)",
-                inner.failed_examples, total_processed, percentage
-            );
-        }
-    }
-}
-
-pub struct StepProgress {
-    progress: Arc<Progress>,
-    step: Step,
-    example_name: String,
-}
-
-impl StepProgress {
-    pub fn set_substatus(&self, substatus: impl Into<Cow<'static, str>>) {
-        let mut inner = self.progress.inner.lock().unwrap();
-        if let Some(task) = inner.in_progress.get_mut(&self.example_name) {
-            task.substatus = Some(substatus.into().into_owned());
-            Progress::clear_status_lines(&mut inner);
-            Progress::print_status_lines(&mut inner);
-        }
-    }
-
-    pub fn clear_substatus(&self) {
-        let mut inner = self.progress.inner.lock().unwrap();
-        if let Some(task) = inner.in_progress.get_mut(&self.example_name) {
-            task.substatus = None;
-            Progress::clear_status_lines(&mut inner);
-            Progress::print_status_lines(&mut inner);
-        }
-    }
-
-    pub fn set_info(&self, info: impl Into<String>, style: InfoStyle) {
-        let mut inner = self.progress.inner.lock().unwrap();
-        if let Some(task) = inner.in_progress.get_mut(&self.example_name) {
-            task.info = Some((info.into(), style));
-        }
-    }
-}
-
-impl Drop for StepProgress {
-    fn drop(&mut self) {
-        self.progress.finish(self.step, &self.example_name);
-    }
-}
-
-struct ProgressLogger;
-
-impl Log for ProgressLogger {
-    fn enabled(&self, metadata: &Metadata) -> bool {
-        metadata.level() <= Level::Info
-    }
-
-    fn log(&self, record: &Record) {
-        if !self.enabled(record.metadata()) {
-            return;
-        }
-
-        let level_color = match record.level() {
-            Level::Error => "\x1b[31m",
-            Level::Warn => "\x1b[33m",
-            Level::Info => "\x1b[32m",
-            Level::Debug => "\x1b[34m",
-            Level::Trace => "\x1b[35m",
-        };
-        let reset = "\x1b[0m";
-        let bold = "\x1b[1m";
-
-        let level_label = match record.level() {
-            Level::Error => "Error",
-            Level::Warn => "Warn",
-            Level::Info => "Info",
-            Level::Debug => "Debug",
-            Level::Trace => "Trace",
-        };
-
-        let message = format!(
-            "{bold}{level_color}{level_label:>12}{reset} {}",
-            record.args()
-        );
-
-        if let Some(progress) = GLOBAL.get() {
-            progress.log(&message);
-        } else {
-            eprintln!("{}", message);
-        }
-    }
-
-    fn flush(&self) {
-        let _ = std::io::stderr().flush();
-    }
-}
-
-#[cfg(unix)]
-fn get_terminal_width() -> usize {
-    unsafe {
-        let mut winsize: libc::winsize = std::mem::zeroed();
-        if libc::ioctl(libc::STDERR_FILENO, libc::TIOCGWINSZ, &mut winsize) == 0
-            && winsize.ws_col > 0
-        {
-            winsize.ws_col as usize
-        } else {
-            80
-        }
-    }
-}
-
-#[cfg(not(unix))]
-fn get_terminal_width() -> usize {
-    80
-}
-
-fn strip_ansi_len(s: &str) -> usize {
-    let mut len = 0;
-    let mut in_escape = false;
-    for c in s.chars() {
-        if c == '\x1b' {
-            in_escape = true;
-        } else if in_escape {
-            if c == 'm' {
-                in_escape = false;
-            }
-        } else {
-            len += 1;
-        }
-    }
-    len
-}
-
-fn truncate_with_ellipsis(s: &str, max_len: usize) -> String {
-    if s.len() <= max_len {
-        s.to_string()
-    } else {
-        format!("{}…", &s[..max_len.saturating_sub(1)])
-    }
-}
-
-fn format_duration(duration: Duration) -> String {
-    const MINUTE_IN_MILLIS: f32 = 60. * 1000.;
-
-    let millis = duration.as_millis() as f32;
-    if millis < 1000.0 {
-        format!("{}ms", millis)
-    } else if millis < MINUTE_IN_MILLIS {
-        format!("{:.1}s", millis / 1_000.0)
-    } else {
-        format!("{:.1}m", millis / MINUTE_IN_MILLIS)
-    }
-}
diff --git a/crates/edit_prediction_cli/src/retrieve_context.rs b/crates/edit_prediction_cli/src/retrieve_context.rs
deleted file mode 100644
index a07c7ec875..0000000000
--- a/crates/edit_prediction_cli/src/retrieve_context.rs
+++ /dev/null
@@ -1,192 +0,0 @@
-use crate::{
-    example::{Example, ExampleContext},
-    headless::EpAppState,
-    load_project::run_load_project,
-    progress::{InfoStyle, Progress, Step, StepProgress},
-};
-use anyhow::Context as _;
-use collections::HashSet;
-use edit_prediction::{DebugEvent, EditPredictionStore};
-use futures::{FutureExt as _, StreamExt as _, channel::mpsc};
-use gpui::{AsyncApp, Entity};
-use language::Buffer;
-use project::Project;
-use std::sync::Arc;
-use std::time::Duration;
-
-pub async fn run_context_retrieval(
-    example: &mut Example,
-    app_state: Arc<EpAppState>,
-    mut cx: AsyncApp,
-) -> anyhow::Result<()> {
-    if example.context.is_some() {
-        return Ok(());
-    }
-
-    run_load_project(example, app_state.clone(), cx.clone()).await?;
-
-    let step_progress: Arc<StepProgress> = Progress::global()
-        .start(Step::Context, &example.name)
-        .into();
-
-    let state = example.state.as_ref().unwrap();
-    let project = state.project.clone();
-
-    let _lsp_handle = project.update(&mut cx, |project, cx| {
-        project.register_buffer_with_language_servers(&state.buffer, cx)
-    })?;
-    wait_for_language_servers_to_start(&project, &state.buffer, &step_progress, &mut cx).await?;
-
-    let ep_store = cx.update(|cx| {
-        EditPredictionStore::try_global(cx).context("EditPredictionStore not initialized")
-    })??;
-
-    let mut events = ep_store.update(&mut cx, |store, cx| {
-        store.register_buffer(&state.buffer, &project, cx);
-        store.set_use_context(true);
-        store.refresh_context(&project, &state.buffer, state.cursor_position, cx);
-        store.debug_info(&project, cx)
-    })?;
-
-    while let Some(event) = events.next().await {
-        match event {
-            DebugEvent::ContextRetrievalFinished(_) => {
-                break;
-            }
-            _ => {}
-        }
-    }
-
-    let context_files =
-        ep_store.update(&mut cx, |store, cx| store.context_for_project(&project, cx))?;
-
-    let excerpt_count: usize = context_files.iter().map(|f| f.excerpts.len()).sum();
-    step_progress.set_info(format!("{} excerpts", excerpt_count), InfoStyle::Normal);
-
-    example.context = Some(ExampleContext {
-        files: context_files,
-    });
-    Ok(())
-}
-
-async fn wait_for_language_servers_to_start(
-    project: &Entity<Project>,
-    buffer: &Entity<Buffer>,
-    step_progress: &Arc<StepProgress>,
-    cx: &mut AsyncApp,
-) -> anyhow::Result<()> {
-    let lsp_store = project.read_with(cx, |project, _| project.lsp_store())?;
-
-    let (language_server_ids, mut starting_language_server_ids) = buffer
-        .update(cx, |buffer, cx| {
-            lsp_store.update(cx, |lsp_store, cx| {
-                let ids = lsp_store.language_servers_for_local_buffer(buffer, cx);
-                let starting_ids = ids
-                    .iter()
-                    .copied()
-                    .filter(|id| !lsp_store.language_server_statuses.contains_key(&id))
-                    .collect::<HashSet<_>>();
-                (ids, starting_ids)
-            })
-        })
-        .unwrap_or_default();
-
-    step_progress.set_substatus(format!("waiting for {} LSPs", language_server_ids.len()));
-
-    let timeout = cx
-        .background_executor()
-        .timer(Duration::from_secs(60 * 5))
-        .shared();
-
-    let (mut tx, mut rx) = mpsc::channel(language_server_ids.len());
-    let added_subscription = cx.subscribe(project, {
-        let step_progress = step_progress.clone();
-        move |_, event, _| match event {
-            project::Event::LanguageServerAdded(language_server_id, name, _) => {
-                step_progress.set_substatus(format!("LSP started: {}", name));
-                tx.try_send(*language_server_id).ok();
-            }
-            _ => {}
-        }
-    });
-
-    while !starting_language_server_ids.is_empty() {
-        futures::select! {
-            language_server_id = rx.next() => {
-                if let Some(id) = language_server_id {
-                    starting_language_server_ids.remove(&id);
-                }
-            },
-            _ = timeout.clone().fuse() => {
-                return Err(anyhow::anyhow!("LSP wait timed out after 5 minutes"));
-            }
-        }
-    }
-
-    drop(added_subscription);
-
-    if !language_server_ids.is_empty() {
-        project
-            .update(cx, |project, cx| project.save_buffer(buffer.clone(), cx))?
-            .detach();
-    }
-
-    let (mut tx, mut rx) = mpsc::channel(language_server_ids.len());
-    let subscriptions = [
-        cx.subscribe(&lsp_store, {
-            let step_progress = step_progress.clone();
-            move |_, event, _| {
-                if let project::LspStoreEvent::LanguageServerUpdate {
-                    message:
-                        client::proto::update_language_server::Variant::WorkProgress(
-                            client::proto::LspWorkProgress {
-                                message: Some(message),
-                                ..
-                            },
-                        ),
-                    ..
-                } = event
-                {
-                    step_progress.set_substatus(message.clone());
-                }
-            }
-        }),
-        cx.subscribe(project, {
-            let step_progress = step_progress.clone();
-            move |_, event, cx| match event {
-                project::Event::DiskBasedDiagnosticsFinished { language_server_id } => {
-                    let lsp_store = lsp_store.read(cx);
-                    let name = lsp_store
-                        .language_server_adapter_for_id(*language_server_id)
-                        .unwrap()
-                        .name();
-                    step_progress.set_substatus(format!("LSP idle: {}", name));
-                    tx.try_send(*language_server_id).ok();
-                }
-                _ => {}
-            }
-        }),
-    ];
-
-    project
-        .update(cx, |project, cx| project.save_buffer(buffer.clone(), cx))?
-        .await?;
-
-    let mut pending_language_server_ids = HashSet::from_iter(language_server_ids.into_iter());
-    while !pending_language_server_ids.is_empty() {
-        futures::select! {
-            language_server_id = rx.next() => {
-                if let Some(id) = language_server_id {
-                    pending_language_server_ids.remove(&id);
-                }
-            },
-            _ = timeout.clone().fuse() => {
-                return Err(anyhow::anyhow!("LSP wait timed out after 5 minutes"));
-            }
-        }
-    }
-
-    drop(subscriptions);
-    step_progress.clear_substatus();
-    Ok(())
-}
diff --git a/crates/edit_prediction_cli/src/score.rs b/crates/edit_prediction_cli/src/score.rs
deleted file mode 100644
index 314d19b672..0000000000
--- a/crates/edit_prediction_cli/src/score.rs
+++ /dev/null
@@ -1,123 +0,0 @@
-use crate::{
-    PredictArgs,
-    example::{Example, ExampleScore},
-    headless::EpAppState,
-    metrics::{self, ClassificationMetrics},
-    predict::run_prediction,
-    progress::{Progress, Step},
-};
-use edit_prediction::udiff::DiffLine;
-use gpui::AsyncApp;
-use std::sync::Arc;
-
-pub async fn run_scoring(
-    example: &mut Example,
-    args: &PredictArgs,
-    app_state: Arc<EpAppState>,
-    cx: AsyncApp,
-) -> anyhow::Result<()> {
-    run_prediction(
-        example,
-        Some(args.provider),
-        args.repetitions,
-        app_state,
-        cx,
-    )
-    .await?;
-
-    let _progress = Progress::global().start(Step::Score, &example.name);
-
-    let expected_patch = parse_patch(&example.expected_patch);
-
-    let mut scores = vec![];
-
-    for pred in &example.predictions {
-        let actual_patch = parse_patch(&pred.actual_patch);
-        let line_match = metrics::line_match_score(&expected_patch, &actual_patch);
-        let delta_chr_f = metrics::delta_chr_f(&expected_patch, &actual_patch) as f32;
-
-        scores.push(ExampleScore {
-            delta_chr_f,
-            line_match,
-        });
-    }
-
-    example.score = scores;
-    Ok(())
-}
-
-fn parse_patch(patch: &str) -> Vec<DiffLine<'_>> {
-    patch.lines().map(DiffLine::parse).collect()
-}
-
-pub fn print_report(examples: &[Example]) {
-    eprintln!(
-        "──────────────────────────────────────────────────────────────────────────────────────"
-    );
-    eprintln!(
-        "{:<30} {:>4} {:>4} {:>4} {:>10} {:>8} {:>8} {:>10}",
-        "Example name", "TP", "FP", "FN", "Precision", "Recall", "F1", "DeltaChrF"
-    );
-    eprintln!(
-        "──────────────────────────────────────────────────────────────────────────────────────"
-    );
-
-    let mut all_line_match_scores = Vec::new();
-    let mut all_delta_chr_f_scores = Vec::new();
-
-    for example in examples {
-        for score in example.score.iter() {
-            let line_match = &score.line_match;
-
-            eprintln!(
-                "{:<30} {:>4} {:>4} {:>4} {:>9.2}% {:>7.2}% {:>7.2}% {:>9.2}",
-                truncate_name(&example.name, 30),
-                line_match.true_positives,
-                line_match.false_positives,
-                line_match.false_negatives,
-                line_match.precision() * 100.0,
-                line_match.recall() * 100.0,
-                line_match.f1_score() * 100.0,
-                score.delta_chr_f
-            );
-
-            all_line_match_scores.push(line_match.clone());
-            all_delta_chr_f_scores.push(score.delta_chr_f);
-        }
-    }
-
-    eprintln!(
-        "──────────────────────────────────────────────────────────────────────────────────────"
-    );
-
-    if !all_line_match_scores.is_empty() {
-        let total_line_match = ClassificationMetrics::aggregate(all_line_match_scores.iter());
-        let avg_delta_chr_f: f32 =
-            all_delta_chr_f_scores.iter().sum::<f32>() / all_delta_chr_f_scores.len() as f32;
-
-        eprintln!(
-            "{:<30} {:>4} {:>4} {:>4} {:>9.2}% {:>7.2}% {:>7.2}% {:>9.2}",
-            "TOTAL",
-            total_line_match.true_positives,
-            total_line_match.false_positives,
-            total_line_match.false_negatives,
-            total_line_match.precision() * 100.0,
-            total_line_match.recall() * 100.0,
-            total_line_match.f1_score() * 100.0,
-            avg_delta_chr_f
-        );
-        eprintln!(
-            "──────────────────────────────────────────────────────────────────────────────────────"
-        );
-    }
-
-    eprintln!("\n");
-}
-
-fn truncate_name(name: &str, max_len: usize) -> String {
-    if name.len() <= max_len {
-        name.to_string()
-    } else {
-        format!("{}...", &name[..max_len - 3])
-    }
-}
diff --git a/crates/edit_prediction_cli/src/teacher.prompt.md b/crates/edit_prediction_cli/src/teacher.prompt.md
deleted file mode 100644
index d629152da6..0000000000
--- a/crates/edit_prediction_cli/src/teacher.prompt.md
+++ /dev/null
@@ -1,53 +0,0 @@
-# Instructions
-
-You are a code completion assistant helping a programmer finish their work. Your task is to:
-
-1. Analyze the edit history to understand what the programmer is trying to achieve
-2. Identify any incomplete refactoring or changes that need to be finished
-3. Make the remaining edits that a human programmer would logically make next (by rewriting the corresponding code sections)
-4. Apply systematic changes consistently across the entire codebase - if you see a pattern starting, complete it everywhere.
-
-Focus on:
-- Understanding the intent behind the changes (e.g., improving error handling, refactoring APIs, fixing bugs)
-- Completing any partially-applied changes across the codebase
-- Ensuring consistency with the programming style and patterns already established
-- Making edits that maintain or improve code quality
-- If the programmer started refactoring one instance of a pattern, find and update ALL similar instances
-- Don't write a lot of code if you're not sure what to do
-
-Rules:
-- Do not just mechanically apply patterns - reason about what changes make sense given the context and the programmer's apparent goals.
-- Do not just fix syntax errors - look for the broader refactoring pattern and apply it systematically throughout the code.
-- Keep existing formatting unless it's absolutely necessary 
-
-Input format:
-- You receive small code fragments called context (structs, field definitions, function signatures, etc.). They may or may not be relevant.
-- Never modify the context code.
-- You also receive a code snippet between <|editable_region_start|> and <|editable_region_end|>. This is the editable region.
-- The cursor position is marked with <|user_cursor|>.
-
-Output format:
-- Return the entire editable region, applying any edits you make.
-- Remove the <|user_cursor|> marker.
-- Wrap the edited code in a block of exactly five backticks.
-
-Output example:
-`````
-    // `zed --askpass` Makes zed operate in nc/netcat mode for use with askpass
-    if let Some(socket) = &args.askpass {{
-        askpass::main(socket);
-        return Ok(());
-    }}
-`````
-
-## User Edits History
-
-{{edit_history}}
-
-## Code Context
-
-{{context}}
-
-## Editable region
-
-{{editable_region}}
diff --git a/crates/edit_prediction_context/Cargo.toml b/crates/edit_prediction_context/Cargo.toml
deleted file mode 100644
index 731ffc85d1..0000000000
--- a/crates/edit_prediction_context/Cargo.toml
+++ /dev/null
@@ -1,44 +0,0 @@
-[package]
-name = "edit_prediction_context"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/edit_prediction_context.rs"
-
-[dependencies]
-parking_lot.workspace = true
-anyhow.workspace = true
-cloud_llm_client.workspace = true
-collections.workspace = true
-futures.workspace = true
-gpui.workspace = true
-language.workspace = true
-lsp.workspace = true
-project.workspace = true
-log.workspace = true
-serde.workspace = true
-smallvec.workspace = true
-tree-sitter.workspace = true
-util.workspace = true
-zeta_prompt.workspace = true
-
-[dev-dependencies]
-env_logger.workspace = true
-indoc.workspace = true
-futures.workspace = true
-gpui = { workspace = true, features = ["test-support"] }
-language = { workspace = true, features = ["test-support"] }
-lsp = { workspace = true, features = ["test-support"] }
-pretty_assertions.workspace = true
-project = {workspace= true, features = ["test-support"]}
-serde_json.workspace = true
-settings = {workspace= true, features = ["test-support"]}
-text = { workspace = true, features = ["test-support"] }
-util = { workspace = true, features = ["test-support"] }
-zlog.workspace = true
diff --git a/crates/edit_prediction_context/LICENSE-GPL b/crates/edit_prediction_context/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/edit_prediction_context/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/edit_prediction_context/src/assemble_excerpts.rs b/crates/edit_prediction_context/src/assemble_excerpts.rs
deleted file mode 100644
index e337211cf9..0000000000
--- a/crates/edit_prediction_context/src/assemble_excerpts.rs
+++ /dev/null
@@ -1,156 +0,0 @@
-use language::{BufferSnapshot, OffsetRangeExt as _, Point};
-use std::ops::Range;
-use zeta_prompt::RelatedExcerpt;
-
-#[cfg(not(test))]
-const MAX_OUTLINE_ITEM_BODY_SIZE: usize = 512;
-#[cfg(test)]
-const MAX_OUTLINE_ITEM_BODY_SIZE: usize = 24;
-
-pub fn assemble_excerpts(
-    buffer: &BufferSnapshot,
-    mut input_ranges: Vec<Range<Point>>,
-) -> Vec<RelatedExcerpt> {
-    merge_ranges(&mut input_ranges);
-
-    let mut outline_ranges = Vec::new();
-    let outline_items = buffer.outline_items_as_points_containing(0..buffer.len(), false, None);
-    let mut outline_ix = 0;
-    for input_range in &mut input_ranges {
-        *input_range = clip_range_to_lines(input_range, false, buffer);
-
-        while let Some(outline_item) = outline_items.get(outline_ix) {
-            let item_range = clip_range_to_lines(&outline_item.range, false, buffer);
-
-            if item_range.start > input_range.start {
-                break;
-            }
-
-            if item_range.end > input_range.start {
-                let body_range = outline_item
-                    .body_range(buffer)
-                    .map(|body| clip_range_to_lines(&body, true, buffer))
-                    .filter(|body_range| {
-                        body_range.to_offset(buffer).len() > MAX_OUTLINE_ITEM_BODY_SIZE
-                    });
-
-                add_outline_item(
-                    item_range.clone(),
-                    body_range.clone(),
-                    buffer,
-                    &mut outline_ranges,
-                );
-
-                if let Some(body_range) = body_range
-                    && input_range.start < body_range.start
-                {
-                    let mut child_outline_ix = outline_ix + 1;
-                    while let Some(next_outline_item) = outline_items.get(child_outline_ix) {
-                        if next_outline_item.range.end > body_range.end {
-                            break;
-                        }
-                        if next_outline_item.depth == outline_item.depth + 1 {
-                            let next_item_range =
-                                clip_range_to_lines(&next_outline_item.range, false, buffer);
-
-                            add_outline_item(
-                                next_item_range,
-                                next_outline_item
-                                    .body_range(buffer)
-                                    .map(|body| clip_range_to_lines(&body, true, buffer)),
-                                buffer,
-                                &mut outline_ranges,
-                            );
-                        }
-                        child_outline_ix += 1;
-                    }
-                }
-            }
-
-            outline_ix += 1;
-        }
-    }
-
-    input_ranges.extend_from_slice(&outline_ranges);
-    merge_ranges(&mut input_ranges);
-
-    input_ranges
-        .into_iter()
-        .map(|range| RelatedExcerpt {
-            row_range: range.start.row..range.end.row,
-            text: buffer.text_for_range(range).collect(),
-        })
-        .collect()
-}
-
-fn clip_range_to_lines(
-    range: &Range<Point>,
-    inward: bool,
-    buffer: &BufferSnapshot,
-) -> Range<Point> {
-    let mut range = range.clone();
-    if inward {
-        if range.start.column > 0 {
-            range.start.column = buffer.line_len(range.start.row);
-        }
-        range.end.column = 0;
-    } else {
-        range.start.column = 0;
-        if range.end.column > 0 {
-            range.end.column = buffer.line_len(range.end.row);
-        }
-    }
-    range
-}
-
-fn add_outline_item(
-    mut item_range: Range<Point>,
-    body_range: Option<Range<Point>>,
-    buffer: &BufferSnapshot,
-    outline_ranges: &mut Vec<Range<Point>>,
-) {
-    if let Some(mut body_range) = body_range {
-        if body_range.start.column > 0 {
-            body_range.start.column = buffer.line_len(body_range.start.row);
-        }
-        body_range.end.column = 0;
-
-        let head_range = item_range.start..body_range.start;
-        if head_range.start < head_range.end {
-            outline_ranges.push(head_range);
-        }
-
-        let tail_range = body_range.end..item_range.end;
-        if tail_range.start < tail_range.end {
-            outline_ranges.push(tail_range);
-        }
-    } else {
-        item_range.start.column = 0;
-        item_range.end.column = buffer.line_len(item_range.end.row);
-        outline_ranges.push(item_range);
-    }
-}
-
-pub fn merge_ranges(ranges: &mut Vec<Range<Point>>) {
-    ranges.sort_unstable_by(|a, b| a.start.cmp(&b.start).then(b.end.cmp(&a.end)));
-
-    let mut index = 1;
-    while index < ranges.len() {
-        let mut prev_range_end = ranges[index - 1].end;
-        if prev_range_end.column > 0 {
-            prev_range_end += Point::new(1, 0);
-        }
-
-        if (prev_range_end + Point::new(1, 0))
-            .cmp(&ranges[index].start)
-            .is_ge()
-        {
-            let removed = ranges.remove(index);
-            if removed.end.cmp(&ranges[index - 1].end).is_gt() {
-                ranges[index - 1].end = removed.end;
-            }
-        } else {
-            index += 1;
-        }
-    }
-}
diff --git a/crates/edit_prediction_context/src/edit_prediction_context.rs b/crates/edit_prediction_context/src/edit_prediction_context.rs
deleted file mode 100644
index 15576a835d..0000000000
--- a/crates/edit_prediction_context/src/edit_prediction_context.rs
+++ /dev/null
@@ -1,474 +0,0 @@
-use crate::assemble_excerpts::assemble_excerpts;
-use anyhow::Result;
-use collections::HashMap;
-use futures::{FutureExt, StreamExt as _, channel::mpsc, future};
-use gpui::{App, AppContext, AsyncApp, Context, Entity, EventEmitter, Task, WeakEntity};
-use language::{Anchor, Buffer, BufferSnapshot, OffsetRangeExt as _, Point, ToOffset as _};
-use project::{LocationLink, Project, ProjectPath};
-use smallvec::SmallVec;
-use std::{
-    collections::hash_map,
-    ops::Range,
-    path::Path,
-    sync::Arc,
-    time::{Duration, Instant},
-};
-use util::{RangeExt as _, ResultExt};
-
-mod assemble_excerpts;
-#[cfg(test)]
-mod edit_prediction_context_tests;
-mod excerpt;
-#[cfg(test)]
-mod fake_definition_lsp;
-
-pub use cloud_llm_client::predict_edits_v3::Line;
-pub use excerpt::{EditPredictionExcerpt, EditPredictionExcerptOptions, EditPredictionExcerptText};
-pub use zeta_prompt::{RelatedExcerpt, RelatedFile};
-
-const IDENTIFIER_LINE_COUNT: u32 = 3;
-
-pub struct RelatedExcerptStore {
-    project: WeakEntity<Project>,
-    related_files: Arc<[RelatedFile]>,
-    related_file_buffers: Vec<Entity<Buffer>>,
-    cache: HashMap<Identifier, Arc<CacheEntry>>,
-    update_tx: mpsc::UnboundedSender<(Entity<Buffer>, Anchor)>,
-    identifier_line_count: u32,
-}
-
-pub enum RelatedExcerptStoreEvent {
-    StartedRefresh,
-    FinishedRefresh {
-        cache_hit_count: usize,
-        cache_miss_count: usize,
-        mean_definition_latency: Duration,
-        max_definition_latency: Duration,
-    },
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Hash)]
-struct Identifier {
-    pub name: String,
-    pub range: Range<Anchor>,
-}
-
-enum DefinitionTask {
-    CacheHit(Arc<CacheEntry>),
-    CacheMiss(Task<Result<Option<Vec<LocationLink>>>>),
-}
-
-#[derive(Debug)]
-struct CacheEntry {
-    definitions: SmallVec<[CachedDefinition; 1]>,
-}
-
-#[derive(Clone, Debug)]
-struct CachedDefinition {
-    path: ProjectPath,
-    buffer: Entity<Buffer>,
-    anchor_range: Range<Anchor>,
-}
-
-const DEBOUNCE_DURATION: Duration = Duration::from_millis(100);
-
-impl EventEmitter<RelatedExcerptStoreEvent> for RelatedExcerptStore {}
-
-impl RelatedExcerptStore {
-    pub fn new(project: &Entity<Project>, cx: &mut Context<Self>) -> Self {
-        let (update_tx, mut update_rx) = mpsc::unbounded::<(Entity<Buffer>, Anchor)>();
-        cx.spawn(async move |this, cx| {
-            let executor = cx.background_executor().clone();
-            while let Some((mut buffer, mut position)) = update_rx.next().await {
-                let mut timer = executor.timer(DEBOUNCE_DURATION).fuse();
-                loop {
-                    futures::select_biased! {
-                        next = update_rx.next() => {
-                            if let Some((new_buffer, new_position)) = next {
-                                buffer = new_buffer;
-                                position = new_position;
-                                timer = executor.timer(DEBOUNCE_DURATION).fuse();
-                            } else {
-                                return anyhow::Ok(());
-                            }
-                        }
-                        _ = timer => break,
-                    }
-                }
-
-                Self::fetch_excerpts(this.clone(), buffer, position, cx).await?;
-            }
-            anyhow::Ok(())
-        })
-        .detach_and_log_err(cx);
-
-        RelatedExcerptStore {
-            project: project.downgrade(),
-            update_tx,
-            related_files: Vec::new().into(),
-            related_file_buffers: Vec::new(),
-            cache: Default::default(),
-            identifier_line_count: IDENTIFIER_LINE_COUNT,
-        }
-    }
-
-    pub fn set_identifier_line_count(&mut self, count: u32) {
-        self.identifier_line_count = count;
-    }
-
-    pub fn refresh(&mut self, buffer: Entity<Buffer>, position: Anchor, _: &mut Context<Self>) {
-        self.update_tx.unbounded_send((buffer, position)).ok();
-    }
-
-    pub fn related_files(&self) -> Arc<[RelatedFile]> {
-        self.related_files.clone()
-    }
-
-    pub fn related_files_with_buffers(
-        &self,
-    ) -> impl Iterator<Item = (RelatedFile, Entity<Buffer>)> {
-        self.related_files
-            .iter()
-            .cloned()
-            .zip(self.related_file_buffers.iter().cloned())
-    }
-
-    pub fn set_related_files(&mut self, files: Vec<RelatedFile>) {
-        self.related_files = files.into();
-    }
-
-    async fn fetch_excerpts(
-        this: WeakEntity<Self>,
-        buffer: Entity<Buffer>,
-        position: Anchor,
-        cx: &mut AsyncApp,
-    ) -> Result<()> {
-        let (project, snapshot, identifier_line_count) = this.read_with(cx, |this, cx| {
-            (
-                this.project.upgrade(),
-                buffer.read(cx).snapshot(),
-                this.identifier_line_count,
-            )
-        })?;
-        let Some(project) = project else {
-            return Ok(());
-        };
-
-        let file = snapshot.file().cloned();
-        if let Some(file) = &file {
-            log::debug!("retrieving_context buffer:{}", file.path().as_unix_str());
-        }
-
-        this.update(cx, |_, cx| {
-            cx.emit(RelatedExcerptStoreEvent::StartedRefresh);
-        })?;
-
-        let identifiers = cx
-            .background_spawn(async move {
-                identifiers_for_position(&snapshot, position, identifier_line_count)
-            })
-            .await;
-
-        let async_cx = cx.clone();
-        let start_time = Instant::now();
-        let futures = this.update(cx, |this, cx| {
-            identifiers
-                .into_iter()
-                .filter_map(|identifier| {
-                    let task = if let Some(entry) = this.cache.get(&identifier) {
-                        DefinitionTask::CacheHit(entry.clone())
-                    } else {
-                        DefinitionTask::CacheMiss(
-                            this.project
-                                .update(cx, |project, cx| {
-                                    project.definitions(&buffer, identifier.range.start, cx)
-                                })
-                                .ok()?,
-                        )
-                    };
-
-                    let cx = async_cx.clone();
-                    let project = project.clone();
-                    Some(async move {
-                        match task {
-                            DefinitionTask::CacheHit(cache_entry) => {
-                                Some((identifier, cache_entry, None))
-                            }
-                            DefinitionTask::CacheMiss(task) => {
-                                let locations = task.await.log_err()??;
-                                let duration = start_time.elapsed();
-                                cx.update(|cx| {
-                                    (
-                                        identifier,
-                                        Arc::new(CacheEntry {
-                                            definitions: locations
-                                                .into_iter()
-                                                .filter_map(|location| {
-                                                    process_definition(location, &project, cx)
-                                                })
-                                                .collect(),
-                                        }),
-                                        Some(duration),
-                                    )
-                                })
-                                .ok()
-                            }
-                        }
-                    })
-                })
-                .collect::<Vec<_>>()
-        })?;
-
-        let mut cache_hit_count = 0;
-        let mut cache_miss_count = 0;
-        let mut mean_definition_latency = Duration::ZERO;
-        let mut max_definition_latency = Duration::ZERO;
-        let mut new_cache = HashMap::default();
-        new_cache.reserve(futures.len());
-        for (identifier, entry, duration) in future::join_all(futures).await.into_iter().flatten() {
-            new_cache.insert(identifier, entry);
-            if let Some(duration) = duration {
-                cache_miss_count += 1;
-                mean_definition_latency += duration;
-                max_definition_latency = max_definition_latency.max(duration);
-            } else {
-                cache_hit_count += 1;
-            }
-        }
-        mean_definition_latency /= cache_miss_count.max(1) as u32;
-
-        let (new_cache, related_files, related_file_buffers) =
-            rebuild_related_files(&project, new_cache, cx).await?;
-
-        if let Some(file) = &file {
-            log::debug!(
-                "finished retrieving context buffer:{}, latency:{:?}",
-                file.path().as_unix_str(),
-                start_time.elapsed()
-            );
-        }
-
-        this.update(cx, |this, cx| {
-            this.cache = new_cache;
-            this.related_files = related_files.into();
-            this.related_file_buffers = related_file_buffers;
-            cx.emit(RelatedExcerptStoreEvent::FinishedRefresh {
-                cache_hit_count,
-                cache_miss_count,
-                mean_definition_latency,
-                max_definition_latency,
-            });
-        })?;
-
-        anyhow::Ok(())
-    }
-}
-
-async fn rebuild_related_files(
-    project: &Entity<Project>,
-    new_entries: HashMap<Identifier, Arc<CacheEntry>>,
-    cx: &mut AsyncApp,
-) -> Result<(
-    HashMap<Identifier, Arc<CacheEntry>>,
-    Vec<RelatedFile>,
-    Vec<Entity<Buffer>>,
-)> {
-    let mut snapshots = HashMap::default();
-    let mut worktree_root_names = HashMap::default();
-    for entry in new_entries.values() {
-        for definition in &entry.definitions {
-            if let hash_map::Entry::Vacant(e) = snapshots.entry(definition.buffer.entity_id()) {
-                definition
-                    .buffer
-                    .read_with(cx, |buffer, _| buffer.parsing_idle())?
-                    .await;
-                e.insert(
-                    definition
-                        .buffer
-                        .read_with(cx, |buffer, _| buffer.snapshot())?,
-                );
-            }
-            let worktree_id = definition.path.worktree_id;
-            if let hash_map::Entry::Vacant(e) =
-                worktree_root_names.entry(definition.path.worktree_id)
-            {
-                project.read_with(cx, |project, cx| {
-                    if let Some(worktree) = project.worktree_for_id(worktree_id, cx) {
-                        e.insert(worktree.read(cx).root_name().as_unix_str().to_string());
-                    }
-                })?;
-            }
-        }
-    }
-
-    Ok(cx
-        .background_spawn(async move {
-            let mut files = Vec::new();
-            let mut ranges_by_buffer = HashMap::<_, Vec<Range<Point>>>::default();
-            let mut paths_by_buffer = HashMap::default();
-            for entry in new_entries.values() {
-                for definition in &entry.definitions {
-                    let Some(snapshot) = snapshots.get(&definition.buffer.entity_id()) else {
-                        continue;
-                    };
-                    paths_by_buffer.insert(definition.buffer.entity_id(), definition.path.clone());
-                    ranges_by_buffer
-                        .entry(definition.buffer.clone())
-                        .or_default()
-                        .push(definition.anchor_range.to_point(snapshot));
-                }
-            }
-
-            for (buffer, ranges) in ranges_by_buffer {
-                let Some(snapshot) = snapshots.get(&buffer.entity_id()) else {
-                    continue;
-                };
-                let Some(project_path) = paths_by_buffer.get(&buffer.entity_id()) else {
-                    continue;
-                };
-                let excerpts = assemble_excerpts(snapshot, ranges);
-                let Some(root_name) = worktree_root_names.get(&project_path.worktree_id) else {
-                    continue;
-                };
-
-                let path = Path::new(&format!(
-                    "{}/{}",
-                    root_name,
-                    project_path.path.as_unix_str()
-                ))
-                .into();
-
-                files.push((
-                    buffer,
-                    RelatedFile {
-                        path,
-                        excerpts,
-                        max_row: snapshot.max_point().row,
-                    },
-                ));
-            }
-
-            files.sort_by_key(|(_, file)| file.path.clone());
-            let (related_buffers, related_files) = files.into_iter().unzip();
-
-            (new_entries, related_files, related_buffers)
-        })
-        .await)
-}
-
-const MAX_TARGET_LEN: usize = 128;
-
-fn process_definition(
-    location: LocationLink,
-    project: &Entity<Project>,
-    cx: &mut App,
-) -> Option<CachedDefinition> {
-    let buffer = location.target.buffer.read(cx);
-    let anchor_range = location.target.range;
-    let file = buffer.file()?;
-    let worktree = project.read(cx).worktree_for_id(file.worktree_id(cx), cx)?;
-    if worktree.read(cx).is_single_file() {
-        return None;
-    }
-
-    // If the target range is large, it likely means we requested the definition of an entire module.
-    // For individual definitions, the target range should be small as it only covers the symbol.
-    let buffer = location.target.buffer.read(cx);
-    let target_len = anchor_range.to_offset(&buffer).len();
-    if target_len > MAX_TARGET_LEN {
-        return None;
-    }
-
-    Some(CachedDefinition {
-        path: ProjectPath {
-            worktree_id: file.worktree_id(cx),
-            path: file.path().clone(),
-        },
-        buffer: location.target.buffer,
-        anchor_range,
-    })
-}
-
-/// Gets all of the identifiers that are present in the given line, and its containing
-/// outline items.
-fn identifiers_for_position(
-    buffer: &BufferSnapshot,
-    position: Anchor,
-    identifier_line_count: u32,
-) -> Vec<Identifier> {
-    let offset = position.to_offset(buffer);
-    let point = buffer.offset_to_point(offset);
-
-    // Search for identifiers on lines adjacent to the cursor.
-    let start = Point::new(point.row.saturating_sub(identifier_line_count), 0);
-    let end = Point::new(point.row + identifier_line_count + 1, 0).min(buffer.max_point());
-    let line_range = start..end;
-    let mut ranges = vec![line_range.to_offset(&buffer)];
-
-    // Search for identifiers mentioned in headers/signatures of containing outline items.
-    let outline_items = buffer.outline_items_as_offsets_containing(offset..offset, false, None);
-    for item in outline_items {
-        if let Some(body_range) = item.body_range(&buffer) {
-            ranges.push(item.range.start..body_range.start.to_offset(&buffer));
-        } else {
-            ranges.push(item.range.clone());
-        }
-    }
-
-    ranges.sort_by(|a, b| a.start.cmp(&b.start).then(b.end.cmp(&a.end)));
-    ranges.dedup_by(|a, b| {
-        if a.start <= b.end {
-            b.start = b.start.min(a.start);
-            b.end = b.end.max(a.end);
-            true
-        } else {
-            false
-        }
-    });
-
-    let mut identifiers = Vec::new();
-    let outer_range =
-        ranges.first().map_or(0, |r| r.start)..ranges.last().map_or(buffer.len(), |r| r.end);
-
-    let mut captures = buffer
-        .syntax
-        .captures(outer_range.clone(), &buffer.text, |grammar| {
-            grammar
-                .highlights_config
-                .as_ref()
-                .map(|config| &config.query)
-        });
-
-    for range in ranges {
-        captures.set_byte_range(range.start..outer_range.end);
-
-        let mut last_range = None;
-        while let Some(capture) = captures.peek() {
-            let node_range = capture.node.byte_range();
-            if node_range.start > range.end {
-                break;
-            }
-            let config = captures.grammars()[capture.grammar_index]
-                .highlights_config
-                .as_ref();
-
-            if let Some(config) = config
-                && config.identifier_capture_indices.contains(&capture.index)
-                && range.contains_inclusive(&node_range)
-                && Some(&node_range) != last_range.as_ref()
-            {
-                let name = buffer.text_for_range(node_range.clone()).collect();
-                identifiers.push(Identifier {
-                    range: buffer.anchor_after(node_range.start)
-                        ..buffer.anchor_before(node_range.end),
-                    name,
-                });
-                last_range = Some(node_range);
-            }
-
-            captures.advance();
-        }
-    }
-
-    identifiers
-}
diff --git a/crates/edit_prediction_context/src/edit_prediction_context_tests.rs b/crates/edit_prediction_context/src/edit_prediction_context_tests.rs
deleted file mode 100644
index d93a660811..0000000000
--- a/crates/edit_prediction_context/src/edit_prediction_context_tests.rs
+++ /dev/null
@@ -1,510 +0,0 @@
-use super::*;
-use futures::channel::mpsc::UnboundedReceiver;
-use gpui::TestAppContext;
-use indoc::indoc;
-use language::{Point, ToPoint as _, rust_lang};
-use lsp::FakeLanguageServer;
-use project::{FakeFs, LocationLink, Project};
-use serde_json::json;
-use settings::SettingsStore;
-use std::fmt::Write as _;
-use util::{path, test::marked_text_ranges};
-
-#[gpui::test]
-async fn test_edit_prediction_context(cx: &mut TestAppContext) {
-    init_test(cx);
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(path!("/root"), test_project_1()).await;
-
-    let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-    let mut servers = setup_fake_lsp(&project, cx);
-
-    let (buffer, _handle) = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer_with_lsp(path!("/root/src/main.rs"), cx)
-        })
-        .await
-        .unwrap();
-
-    let _server = servers.next().await.unwrap();
-    cx.run_until_parked();
-
-    let related_excerpt_store = cx.new(|cx| RelatedExcerptStore::new(&project, cx));
-    related_excerpt_store.update(cx, |store, cx| {
-        let position = {
-            let buffer = buffer.read(cx);
-            let offset = buffer.text().find("todo").unwrap();
-            buffer.anchor_before(offset)
-        };
-
-        store.set_identifier_line_count(0);
-        store.refresh(buffer.clone(), position, cx);
-    });
-
-    cx.executor().advance_clock(DEBOUNCE_DURATION);
-    related_excerpt_store.update(cx, |store, _| {
-        let excerpts = store.related_files();
-        assert_related_files(
-            &excerpts,
-            &[
-                (
-                    "root/src/company.rs",
-                    &[indoc! {"
-                        pub struct Company {
-                            owner: Arc<Person>,
-                            address: Address,
-                        }"}],
-                ),
-                (
-                    "root/src/main.rs",
-                    &[
-                        indoc! {"
-                        pub struct Session {
-                            company: Arc<Company>,
-                        }
-
-                        impl Session {
-                            pub fn set_company(&mut self, company: Arc<Company>) {"},
-                        indoc! {"
-                            }
-                        }"},
-                    ],
-                ),
-                (
-                    "root/src/person.rs",
-                    &[
-                        indoc! {"
-                        impl Person {
-                            pub fn get_first_name(&self) -> &str {
-                                &self.first_name
-                            }"},
-                        "}",
-                    ],
-                ),
-            ],
-        );
-    });
-}
-
-#[gpui::test]
-fn test_assemble_excerpts(cx: &mut TestAppContext) {
-    let table = [
-        (
-            indoc! {r#"
-                struct User {
-                    first_name: String,
-                    «last_name»: String,
-                    age: u32,
-                    email: String,
-                    create_at: Instant,
-                }
-
-                impl User {
-                    pub fn first_name(&self) -> String {
-                        self.first_name.clone()
-                    }
-
-                    pub fn full_name(&self) -> String {
-                «        format!("{} {}", self.first_name, self.last_name)
-                »    }
-                }
-            "#},
-            indoc! {r#"
-                struct User {
-                    first_name: String,
-                    last_name: String,
-                …
-                }
-
-                impl User {
-                …
-                    pub fn full_name(&self) -> String {
-                        format!("{} {}", self.first_name, self.last_name)
-                    }
-                }
-            "#},
-        ),
-        (
-            indoc! {r#"
-                struct «User» {
-                    first_name: String,
-                    last_name: String,
-                    age: u32,
-                }
-
-                impl User {
-                    // methods
-                }
-            "#},
-            indoc! {r#"
-                struct User {
-                    first_name: String,
-                    last_name: String,
-                    age: u32,
-                }
-                …
-            "#},
-        ),
-        (
-            indoc! {r#"
-                trait «FooProvider» {
-                    const NAME: &'static str;
-
-                    fn provide_foo(&self, id: usize) -> Foo;
-
-                    fn provide_foo_batched(&self, ids: &[usize]) -> Vec<Foo> {
-                            ids.iter()
-                            .map(|id| self.provide_foo(*id))
-                            .collect()
-                    }
-
-                    fn sync(&self);
-                }
-                "#
-            },
-            indoc! {r#"
-                trait FooProvider {
-                    const NAME: &'static str;
-
-                    fn provide_foo(&self, id: usize) -> Foo;
-
-                    fn provide_foo_batched(&self, ids: &[usize]) -> Vec<Foo> {
-                …
-                    }
-
-                    fn sync(&self);
-                }
-            "#},
-        ),
-        (
-            indoc! {r#"
-                trait «Something» {
-                    fn method1(&self, id: usize) -> Foo;
-
-                    fn method2(&self, ids: &[usize]) -> Vec<Foo> {
-                            struct Helper1 {
-                            field1: usize,
-                            }
-
-                            struct Helper2 {
-                            field2: usize,
-                            }
-
-                            struct Helper3 {
-                            filed2: usize,
-                        }
-                    }
-
-                    fn sync(&self);
-                }
-                "#
-            },
-            indoc! {r#"
-                trait Something {
-                    fn method1(&self, id: usize) -> Foo;
-
-                    fn method2(&self, ids: &[usize]) -> Vec<Foo> {
-                …
-                    }
-
-                    fn sync(&self);
-                }
-            "#},
-        ),
-    ];
-
-    for (input, expected_output) in table {
-        let (input, ranges) = marked_text_ranges(&input, false);
-        let buffer = cx.new(|cx| Buffer::local(input, cx).with_language(rust_lang(), cx));
-        buffer.read_with(cx, |buffer, _cx| {
-            let ranges: Vec<Range<Point>> = ranges
-                .into_iter()
-                .map(|range| range.to_point(&buffer))
-                .collect();
-
-            let excerpts = assemble_excerpts(&buffer.snapshot(), ranges);
-
-            let output = format_excerpts(buffer, &excerpts);
-            assert_eq!(output, expected_output);
-        });
-    }
-}
-
-#[gpui::test]
-async fn test_fake_definition_lsp(cx: &mut TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(path!("/root"), test_project_1()).await;
-
-    let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-    let mut servers = setup_fake_lsp(&project, cx);
-
-    let (buffer, _handle) = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer_with_lsp(path!("/root/src/main.rs"), cx)
-        })
-        .await
-        .unwrap();
-
-    let _server = servers.next().await.unwrap();
-    cx.run_until_parked();
-
-    let buffer_text = buffer.read_with(cx, |buffer, _| buffer.text());
-
-    let definitions = project
-        .update(cx, |project, cx| {
-            let offset = buffer_text.find("Address {").unwrap();
-            project.definitions(&buffer, offset, cx)
-        })
-        .await
-        .unwrap()
-        .unwrap();
-    assert_definitions(&definitions, &["pub struct Address {"], cx);
-
-    let definitions = project
-        .update(cx, |project, cx| {
-            let offset = buffer_text.find("State::CA").unwrap();
-            project.definitions(&buffer, offset, cx)
-        })
-        .await
-        .unwrap()
-        .unwrap();
-    assert_definitions(&definitions, &["pub enum State {"], cx);
-
-    let definitions = project
-        .update(cx, |project, cx| {
-            let offset = buffer_text.find("to_string()").unwrap();
-            project.definitions(&buffer, offset, cx)
-        })
-        .await
-        .unwrap()
-        .unwrap();
-    assert_definitions(&definitions, &["pub fn to_string(&self) -> String {"], cx);
-}
-
-fn init_test(cx: &mut TestAppContext) {
-    let settings_store = cx.update(|cx| SettingsStore::test(cx));
-    cx.set_global(settings_store);
-    env_logger::try_init().ok();
-}
-
-fn setup_fake_lsp(
-    project: &Entity<Project>,
-    cx: &mut TestAppContext,
-) -> UnboundedReceiver<FakeLanguageServer> {
-    let (language_registry, fs) = project.read_with(cx, |project, _| {
-        (project.languages().clone(), project.fs().clone())
-    });
-    let language = rust_lang();
-    language_registry.add(language.clone());
-    fake_definition_lsp::register_fake_definition_server(&language_registry, language, fs)
-}
-
-fn test_project_1() -> serde_json::Value {
-    let person_rs = indoc! {r#"
-        pub struct Person {
-            first_name: String,
-            last_name: String,
-            email: String,
-            age: u32,
-        }
-
-        impl Person {
-            pub fn get_first_name(&self) -> &str {
-                &self.first_name
-            }
-
-            pub fn get_last_name(&self) -> &str {
-                &self.last_name
-            }
-
-            pub fn get_email(&self) -> &str {
-                &self.email
-            }
-
-            pub fn get_age(&self) -> u32 {
-                self.age
-            }
-        }
-    "#};
-
-    let address_rs = indoc! {r#"
-        pub struct Address {
-            street: String,
-            city: String,
-            state: State,
-            zip: u32,
-        }
-
-        pub enum State {
-            CA,
-            OR,
-            WA,
-            TX,
-            // ...
-        }
-
-        impl Address {
-            pub fn get_street(&self) -> &str {
-                &self.street
-            }
-
-            pub fn get_city(&self) -> &str {
-                &self.city
-            }
-
-            pub fn get_state(&self) -> State {
-                self.state
-            }
-
-            pub fn get_zip(&self) -> u32 {
-                self.zip
-            }
-        }
-    "#};
-
-    let company_rs = indoc! {r#"
-        use super::person::Person;
-        use super::address::Address;
-
-        pub struct Company {
-            owner: Arc<Person>,
-            address: Address,
-        }
-
-        impl Company {
-            pub fn get_owner(&self) -> &Person {
-                &self.owner
-            }
-
-            pub fn get_address(&self) -> &Address {
-                &self.address
-            }
-
-            pub fn to_string(&self) -> String {
-                format!("{} ({})", self.owner.first_name, self.address.city)
-            }
-        }
-    "#};
-
-    let main_rs = indoc! {r#"
-        use std::sync::Arc;
-        use super::person::Person;
-        use super::address::Address;
-        use super::company::Company;
-
-        pub struct Session {
-            company: Arc<Company>,
-        }
-
-        impl Session {
-            pub fn set_company(&mut self, company: Arc<Company>) {
-                self.company = company;
-                if company.owner != self.company.owner {
-                    log("new owner", company.owner.get_first_name()); todo();
-                }
-            }
-        }
-
-        fn main() {
-            let company = Company {
-                owner: Arc::new(Person {
-                    first_name: "John".to_string(),
-                    last_name: "Doe".to_string(),
-                    email: "john@example.com".to_string(),
-                    age: 30,
-                }),
-                address: Address {
-                    street: "123 Main St".to_string(),
-                    city: "Anytown".to_string(),
-                    state: State::CA,
-                    zip: 12345,
-                },
-            };
-
-            println!("Company: {}", company.to_string());
-        }
-    "#};
-
-    json!({
-        "src": {
-            "person.rs": person_rs,
-            "address.rs": address_rs,
-            "company.rs": company_rs,
-            "main.rs": main_rs,
-        },
-    })
-}
-
-fn assert_related_files(actual_files: &[RelatedFile], expected_files: &[(&str, &[&str])]) {
-    let actual_files = actual_files
-        .iter()
-        .map(|file| {
-            let excerpts = file
-                .excerpts
-                .iter()
-                .map(|excerpt| excerpt.text.to_string())
-                .collect::<Vec<_>>();
-            (file.path.to_str().unwrap(), excerpts)
-        })
-        .collect::<Vec<_>>();
-    let expected_excerpts = expected_files
-        .iter()
-        .map(|(path, texts)| {
-            (
-                *path,
-                texts
-                    .iter()
-                    .map(|line| line.to_string())
-                    .collect::<Vec<_>>(),
-            )
-        })
-        .collect::<Vec<_>>();
-    pretty_assertions::assert_eq!(actual_files, expected_excerpts)
-}
-
-fn assert_definitions(definitions: &[LocationLink], first_lines: &[&str], cx: &mut TestAppContext) {
-    let actual_first_lines = definitions
-        .iter()
-        .map(|definition| {
-            definition.target.buffer.read_with(cx, |buffer, _| {
-                let mut start = definition.target.range.start.to_point(&buffer);
-                start.column = 0;
-                let end = Point::new(start.row, buffer.line_len(start.row));
-                buffer
-                    .text_for_range(start..end)
-                    .collect::<String>()
-                    .trim()
-                    .to_string()
-            })
-        })
-        .collect::<Vec<String>>();
-
-    assert_eq!(actual_first_lines, first_lines);
-}
-
-fn format_excerpts(buffer: &Buffer, excerpts: &[RelatedExcerpt]) -> String {
-    let mut output = String::new();
-    let file_line_count = buffer.max_point().row;
-    let mut current_row = 0;
-    for excerpt in excerpts {
-        if excerpt.text.is_empty() {
-            continue;
-        }
-        if current_row < excerpt.row_range.start {
-            writeln!(&mut output, "…").unwrap();
-        }
-        current_row = excerpt.row_range.start;
-
-        for line in excerpt.text.to_string().lines() {
-            output.push_str(line);
-            output.push('\n');
-            current_row += 1;
-        }
-    }
-    if current_row < file_line_count {
-        writeln!(&mut output, "…").unwrap();
-    }
-    output
-}
diff --git a/crates/edit_prediction_context/src/excerpt.rs b/crates/edit_prediction_context/src/excerpt.rs
deleted file mode 100644
index 3fc7eed4ac..0000000000
--- a/crates/edit_prediction_context/src/excerpt.rs
+++ /dev/null
@@ -1,556 +0,0 @@
-use cloud_llm_client::predict_edits_v3::Line;
-use language::{BufferSnapshot, LanguageId, Point, ToOffset as _, ToPoint as _};
-use std::ops::Range;
-use tree_sitter::{Node, TreeCursor};
-use util::RangeExt;
-
-// TODO:
-//
-// - Test parent signatures
-//
-// - Decide whether to count signatures against the excerpt size. Could instead defer this to prompt
-// planning.
-//
-// - Still return an excerpt even if the line around the cursor doesn't fit (e.g. for a markdown
-// paragraph).
-//
-// - Truncation of long lines.
-//
-// - Filter outer syntax layers that don't support edit prediction.
-
-#[derive(Debug, Clone, PartialEq)]
-pub struct EditPredictionExcerptOptions {
-    /// Limit for the number of bytes in the window around the cursor.
-    pub max_bytes: usize,
-    /// Minimum number of bytes in the window around the cursor. When syntax tree selection results
-    /// in an excerpt smaller than this, it will fall back on line-based selection.
-    pub min_bytes: usize,
-    /// Target ratio of bytes before the cursor divided by total bytes in the window.
-    pub target_before_cursor_over_total_bytes: f32,
-}
-
-#[derive(Debug, Clone)]
-pub struct EditPredictionExcerpt {
-    pub range: Range<usize>,
-    pub line_range: Range<Line>,
-    pub size: usize,
-}
-
-#[derive(Debug, Clone)]
-pub struct EditPredictionExcerptText {
-    pub body: String,
-    pub language_id: Option<LanguageId>,
-}
-
-impl EditPredictionExcerpt {
-    pub fn text(&self, buffer: &BufferSnapshot) -> EditPredictionExcerptText {
-        let body = buffer
-            .text_for_range(self.range.clone())
-            .collect::<String>();
-        let language_id = buffer.language().map(|l| l.id());
-        EditPredictionExcerptText { body, language_id }
-    }
-
-    /// Selects an excerpt around a buffer position, attempting to choose logical boundaries based
-    /// on TreeSitter structure and approximately targeting a goal ratio of bytesbefore vs after the
-    /// cursor.
-    ///
-    /// When `index` is provided, the excerpt will include the signatures of parent outline items.
-    ///
-    /// First tries to use AST node boundaries to select the excerpt, and falls back on line-based
-    /// expansion.
-    ///
-    /// Returns `None` if the line around the cursor doesn't fit.
-    pub fn select_from_buffer(
-        query_point: Point,
-        buffer: &BufferSnapshot,
-        options: &EditPredictionExcerptOptions,
-    ) -> Option<Self> {
-        if buffer.len() <= options.max_bytes {
-            log::debug!(
-                "using entire file for excerpt since source length ({}) <= window max bytes ({})",
-                buffer.len(),
-                options.max_bytes
-            );
-            let offset_range = 0..buffer.len();
-            let line_range = Line(0)..Line(buffer.max_point().row);
-            return Some(EditPredictionExcerpt::new(offset_range, line_range));
-        }
-
-        let query_offset = query_point.to_offset(buffer);
-        let query_line_range = query_point.row..query_point.row + 1;
-        let query_range = Point::new(query_line_range.start, 0).to_offset(buffer)
-            ..Point::new(query_line_range.end, 0).to_offset(buffer);
-        if query_range.len() >= options.max_bytes {
-            return None;
-        }
-
-        let excerpt_selector = ExcerptSelector {
-            query_offset,
-            query_range,
-            query_line_range: Line(query_line_range.start)..Line(query_line_range.end),
-            buffer,
-            options,
-        };
-
-        if let Some(excerpt) = excerpt_selector.select_tree_sitter_nodes() {
-            if excerpt.size >= options.min_bytes {
-                return Some(excerpt);
-            }
-            log::debug!(
-                "tree-sitter excerpt was {} bytes, smaller than min of {}, falling back on line-based selection",
-                excerpt.size,
-                options.min_bytes
-            );
-        } else {
-            log::debug!(
-                "couldn't find excerpt via tree-sitter, falling back on line-based selection"
-            );
-        }
-
-        excerpt_selector.select_lines()
-    }
-
-    fn new(range: Range<usize>, line_range: Range<Line>) -> Self {
-        Self {
-            size: range.len(),
-            range,
-            line_range,
-        }
-    }
-
-    fn with_expanded_range(&self, new_range: Range<usize>, new_line_range: Range<Line>) -> Self {
-        if !new_range.contains_inclusive(&self.range) {
-            // this is an issue because parent_signature_ranges may be incorrect
-            log::error!("bug: with_expanded_range called with disjoint range");
-        }
-        Self::new(new_range, new_line_range)
-    }
-
-    fn parent_signatures_size(&self) -> usize {
-        self.size - self.range.len()
-    }
-}
-
-struct ExcerptSelector<'a> {
-    query_offset: usize,
-    query_range: Range<usize>,
-    query_line_range: Range<Line>,
-    buffer: &'a BufferSnapshot,
-    options: &'a EditPredictionExcerptOptions,
-}
-
-impl<'a> ExcerptSelector<'a> {
-    /// Finds the largest node that is smaller than the window size and contains `query_range`.
-    fn select_tree_sitter_nodes(&self) -> Option<EditPredictionExcerpt> {
-        let selected_layer_root = self.select_syntax_layer()?;
-        let mut cursor = selected_layer_root.walk();
-
-        loop {
-            let line_start = node_line_start(cursor.node());
-            let line_end = node_line_end(cursor.node());
-            let line_range = Line(line_start.row)..Line(line_end.row);
-            let excerpt_range =
-                line_start.to_offset(&self.buffer)..line_end.to_offset(&self.buffer);
-            if excerpt_range.contains_inclusive(&self.query_range) {
-                let excerpt = self.make_excerpt(excerpt_range, line_range);
-                if excerpt.size <= self.options.max_bytes {
-                    return Some(self.expand_to_siblings(&mut cursor, excerpt));
-                }
-            } else {
-                // TODO: Should still be able to handle this case via AST nodes. For example, this
-                // can happen if the cursor is between two methods in a large class file.
-                return None;
-            }
-
-            if cursor
-                .goto_first_child_for_byte(self.query_range.start)
-                .is_none()
-            {
-                return None;
-            }
-        }
-    }
-
-    /// Select the smallest syntax layer that exceeds max_len, or the largest if none exceed max_len.
-    fn select_syntax_layer(&self) -> Option<Node<'_>> {
-        let mut smallest_exceeding_max_len: Option<Node<'_>> = None;
-        let mut largest: Option<Node<'_>> = None;
-        for layer in self
-            .buffer
-            .syntax_layers_for_range(self.query_range.start..self.query_range.start, true)
-        {
-            let layer_range = layer.node().byte_range();
-            if !layer_range.contains_inclusive(&self.query_range) {
-                continue;
-            }
-
-            if layer_range.len() > self.options.max_bytes {
-                match &smallest_exceeding_max_len {
-                    None => smallest_exceeding_max_len = Some(layer.node()),
-                    Some(existing) => {
-                        if layer_range.len() < existing.byte_range().len() {
-                            smallest_exceeding_max_len = Some(layer.node());
-                        }
-                    }
-                }
-            } else {
-                match &largest {
-                    None => largest = Some(layer.node()),
-                    Some(existing) if layer_range.len() > existing.byte_range().len() => {
-                        largest = Some(layer.node())
-                    }
-                    _ => {}
-                }
-            }
-        }
-
-        smallest_exceeding_max_len.or(largest)
-    }
-
-    // motivation for this and `goto_previous_named_sibling` is to avoid including things like
-    // trailing unnamed "}" in body nodes
-    fn goto_next_named_sibling(cursor: &mut TreeCursor) -> bool {
-        while cursor.goto_next_sibling() {
-            if cursor.node().is_named() {
-                return true;
-            }
-        }
-        false
-    }
-
-    fn goto_previous_named_sibling(cursor: &mut TreeCursor) -> bool {
-        while cursor.goto_previous_sibling() {
-            if cursor.node().is_named() {
-                return true;
-            }
-        }
-        false
-    }
-
-    fn expand_to_siblings(
-        &self,
-        cursor: &mut TreeCursor,
-        mut excerpt: EditPredictionExcerpt,
-    ) -> EditPredictionExcerpt {
-        let mut forward_cursor = cursor.clone();
-        let backward_cursor = cursor;
-        let mut forward_done = !Self::goto_next_named_sibling(&mut forward_cursor);
-        let mut backward_done = !Self::goto_previous_named_sibling(backward_cursor);
-        loop {
-            if backward_done && forward_done {
-                break;
-            }
-
-            let mut forward = None;
-            while !forward_done {
-                let new_end_point = node_line_end(forward_cursor.node());
-                let new_end = new_end_point.to_offset(&self.buffer);
-                if new_end > excerpt.range.end {
-                    let new_excerpt = excerpt.with_expanded_range(
-                        excerpt.range.start..new_end,
-                        excerpt.line_range.start..Line(new_end_point.row),
-                    );
-                    if new_excerpt.size <= self.options.max_bytes {
-                        forward = Some(new_excerpt);
-                        break;
-                    } else {
-                        log::debug!("halting forward expansion, as it doesn't fit");
-                        forward_done = true;
-                        break;
-                    }
-                }
-                forward_done = !Self::goto_next_named_sibling(&mut forward_cursor);
-            }
-
-            let mut backward = None;
-            while !backward_done {
-                let new_start_point = node_line_start(backward_cursor.node());
-                let new_start = new_start_point.to_offset(&self.buffer);
-                if new_start < excerpt.range.start {
-                    let new_excerpt = excerpt.with_expanded_range(
-                        new_start..excerpt.range.end,
-                        Line(new_start_point.row)..excerpt.line_range.end,
-                    );
-                    if new_excerpt.size <= self.options.max_bytes {
-                        backward = Some(new_excerpt);
-                        break;
-                    } else {
-                        log::debug!("halting backward expansion, as it doesn't fit");
-                        backward_done = true;
-                        break;
-                    }
-                }
-                backward_done = !Self::goto_previous_named_sibling(backward_cursor);
-            }
-
-            let go_forward = match (forward, backward) {
-                (Some(forward), Some(backward)) => {
-                    let go_forward = self.is_better_excerpt(&forward, &backward);
-                    if go_forward {
-                        excerpt = forward;
-                    } else {
-                        excerpt = backward;
-                    }
-                    go_forward
-                }
-                (Some(forward), None) => {
-                    log::debug!("expanding forward, since backward expansion has halted");
-                    excerpt = forward;
-                    true
-                }
-                (None, Some(backward)) => {
-                    log::debug!("expanding backward, since forward expansion has halted");
-                    excerpt = backward;
-                    false
-                }
-                (None, None) => break,
-            };
-
-            if go_forward {
-                forward_done = !Self::goto_next_named_sibling(&mut forward_cursor);
-            } else {
-                backward_done = !Self::goto_previous_named_sibling(backward_cursor);
-            }
-        }
-
-        excerpt
-    }
-
-    fn select_lines(&self) -> Option<EditPredictionExcerpt> {
-        // early return if line containing query_offset is already too large
-        let excerpt = self.make_excerpt(self.query_range.clone(), self.query_line_range.clone());
-        if excerpt.size > self.options.max_bytes {
-            log::debug!(
-                "excerpt for cursor line is {} bytes, which exceeds the window",
-                excerpt.size
-            );
-            return None;
-        }
-        let signatures_size = excerpt.parent_signatures_size();
-        let bytes_remaining = self.options.max_bytes.saturating_sub(signatures_size);
-
-        let before_bytes =
-            (self.options.target_before_cursor_over_total_bytes * bytes_remaining as f32) as usize;
-
-        let start_line = {
-            let offset = self.query_offset.saturating_sub(before_bytes);
-            let point = offset.to_point(self.buffer);
-            Line(point.row + 1)
-        };
-        let start_offset = Point::new(start_line.0, 0).to_offset(&self.buffer);
-        let end_line = {
-            let offset = start_offset + bytes_remaining;
-            let point = offset.to_point(self.buffer);
-            Line(point.row)
-        };
-        let end_offset = Point::new(end_line.0, 0).to_offset(&self.buffer);
-
-        // this could be expanded further since recalculated `signature_size` may be smaller, but
-        // skipping that for now for simplicity
-        //
-        // TODO: could also consider checking if lines immediately before / after fit.
-        let excerpt = self.make_excerpt(start_offset..end_offset, start_line..end_line);
-        if excerpt.size > self.options.max_bytes {
-            log::error!(
-                "bug: line-based excerpt selection has size {}, \
-                which is {} bytes larger than the max size",
-                excerpt.size,
-                excerpt.size - self.options.max_bytes
-            );
-        }
-        return Some(excerpt);
-    }
-
-    fn make_excerpt(&self, range: Range<usize>, line_range: Range<Line>) -> EditPredictionExcerpt {
-        EditPredictionExcerpt::new(range, line_range)
-    }
-
-    /// Returns `true` if the `forward` excerpt is a better choice than the `backward` excerpt.
-    fn is_better_excerpt(
-        &self,
-        forward: &EditPredictionExcerpt,
-        backward: &EditPredictionExcerpt,
-    ) -> bool {
-        let forward_ratio = self.excerpt_range_ratio(forward);
-        let backward_ratio = self.excerpt_range_ratio(backward);
-        let forward_delta =
-            (forward_ratio - self.options.target_before_cursor_over_total_bytes).abs();
-        let backward_delta =
-            (backward_ratio - self.options.target_before_cursor_over_total_bytes).abs();
-        let forward_is_better = forward_delta <= backward_delta;
-        if forward_is_better {
-            log::debug!(
-                "expanding forward since {} is closer than {} to {}",
-                forward_ratio,
-                backward_ratio,
-                self.options.target_before_cursor_over_total_bytes
-            );
-        } else {
-            log::debug!(
-                "expanding backward since {} is closer than {} to {}",
-                backward_ratio,
-                forward_ratio,
-                self.options.target_before_cursor_over_total_bytes
-            );
-        }
-        forward_is_better
-    }
-
-    /// Returns the ratio of bytes before the cursor over bytes within the range.
-    fn excerpt_range_ratio(&self, excerpt: &EditPredictionExcerpt) -> f32 {
-        let Some(bytes_before_cursor) = self.query_offset.checked_sub(excerpt.range.start) else {
-            log::error!("bug: edit prediction cursor offset is not outside the excerpt");
-            return 0.0;
-        };
-        bytes_before_cursor as f32 / excerpt.range.len() as f32
-    }
-}
-
-fn node_line_start(node: Node) -> Point {
-    Point::new(node.start_position().row as u32, 0)
-}
-
-fn node_line_end(node: Node) -> Point {
-    Point::new(node.end_position().row as u32 + 1, 0)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use gpui::{AppContext, TestAppContext};
-    use language::Buffer;
-    use util::test::{generate_marked_text, marked_text_offsets_by};
-
-    fn create_buffer(text: &str, cx: &mut TestAppContext) -> BufferSnapshot {
-        let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(language::rust_lang(), cx));
-        buffer.read_with(cx, |buffer, _| buffer.snapshot())
-    }
-
-    fn cursor_and_excerpt_range(text: &str) -> (String, usize, Range<usize>) {
-        let (text, offsets) = marked_text_offsets_by(text, vec!['ˇ', '«', '»']);
-        (text, offsets[&'ˇ'][0], offsets[&'«'][0]..offsets[&'»'][0])
-    }
-
-    fn check_example(options: EditPredictionExcerptOptions, text: &str, cx: &mut TestAppContext) {
-        let (text, cursor, expected_excerpt) = cursor_and_excerpt_range(text);
-
-        let buffer = create_buffer(&text, cx);
-        let cursor_point = cursor.to_point(&buffer);
-
-        let excerpt = EditPredictionExcerpt::select_from_buffer(cursor_point, &buffer, &options)
-            .expect("Should select an excerpt");
-        pretty_assertions::assert_eq!(
-            generate_marked_text(&text, std::slice::from_ref(&excerpt.range), false),
-            generate_marked_text(&text, &[expected_excerpt], false)
-        );
-        assert!(excerpt.size <= options.max_bytes);
-        assert!(excerpt.range.contains(&cursor));
-    }
-
-    #[gpui::test]
-    fn test_ast_based_selection_current_node(cx: &mut TestAppContext) {
-        zlog::init_test();
-        let text = r#"
-fn main() {
-    let x = 1;
-«    let ˇy = 2;
-»    let z = 3;
-}"#;
-
-        let options = EditPredictionExcerptOptions {
-            max_bytes: 20,
-            min_bytes: 10,
-            target_before_cursor_over_total_bytes: 0.5,
-        };
-
-        check_example(options, text, cx);
-    }
-
-    #[gpui::test]
-    fn test_ast_based_selection_parent_node(cx: &mut TestAppContext) {
-        zlog::init_test();
-        let text = r#"
-fn foo() {}
-
-«fn main() {
-    let x = 1;
-    let ˇy = 2;
-    let z = 3;
-}
-»
-fn bar() {}"#;
-
-        let options = EditPredictionExcerptOptions {
-            max_bytes: 65,
-            min_bytes: 10,
-            target_before_cursor_over_total_bytes: 0.5,
-        };
-
-        check_example(options, text, cx);
-    }
-
-    #[gpui::test]
-    fn test_ast_based_selection_expands_to_siblings(cx: &mut TestAppContext) {
-        zlog::init_test();
-        let text = r#"
-fn main() {
-«    let x = 1;
-    let ˇy = 2;
-    let z = 3;
-»}"#;
-
-        let options = EditPredictionExcerptOptions {
-            max_bytes: 50,
-            min_bytes: 10,
-            target_before_cursor_over_total_bytes: 0.5,
-        };
-
-        check_example(options, text, cx);
-    }
-
-    #[gpui::test]
-    fn test_line_based_selection(cx: &mut TestAppContext) {
-        zlog::init_test();
-        let text = r#"
-fn main() {
-    let x = 1;
-«    if true {
-        let ˇy = 2;
-    }
-    let z = 3;
-»}"#;
-
-        let options = EditPredictionExcerptOptions {
-            max_bytes: 60,
-            min_bytes: 45,
-            target_before_cursor_over_total_bytes: 0.5,
-        };
-
-        check_example(options, text, cx);
-    }
-
-    #[gpui::test]
-    fn test_line_based_selection_with_before_cursor_ratio(cx: &mut TestAppContext) {
-        zlog::init_test();
-        let text = r#"
-    fn main() {
-«        let a = 1;
-        let b = 2;
-        let c = 3;
-        let ˇd = 4;
-        let e = 5;
-        let f = 6;
-»
-        let g = 7;
-    }"#;
-
-        let options = EditPredictionExcerptOptions {
-            max_bytes: 120,
-            min_bytes: 10,
-            target_before_cursor_over_total_bytes: 0.6,
-        };
-
-        check_example(options, text, cx);
-    }
-}
diff --git a/crates/edit_prediction_context/src/fake_definition_lsp.rs b/crates/edit_prediction_context/src/fake_definition_lsp.rs
deleted file mode 100644
index 31fb681309..0000000000
--- a/crates/edit_prediction_context/src/fake_definition_lsp.rs
+++ /dev/null
@@ -1,329 +0,0 @@
-use collections::HashMap;
-use futures::channel::mpsc::UnboundedReceiver;
-use language::{Language, LanguageRegistry};
-use lsp::{
-    FakeLanguageServer, LanguageServerBinary, TextDocumentSyncCapability, TextDocumentSyncKind, Uri,
-};
-use parking_lot::Mutex;
-use project::Fs;
-use std::{ops::Range, path::PathBuf, sync::Arc};
-use tree_sitter::{Parser, QueryCursor, StreamingIterator, Tree};
-
-/// Registers a fake language server that implements go-to-definition using tree-sitter,
-/// making the assumption that all names are unique, and all variables' types are
-/// explicitly declared.
-pub fn register_fake_definition_server(
-    language_registry: &Arc<LanguageRegistry>,
-    language: Arc<Language>,
-    fs: Arc<dyn Fs>,
-) -> UnboundedReceiver<FakeLanguageServer> {
-    let index = Arc::new(Mutex::new(DefinitionIndex::new(language.clone())));
-
-    language_registry.register_fake_lsp(
-        language.name(),
-        language::FakeLspAdapter {
-            name: "fake-definition-lsp",
-            initialization_options: None,
-            prettier_plugins: Vec::new(),
-            disk_based_diagnostics_progress_token: None,
-            disk_based_diagnostics_sources: Vec::new(),
-            language_server_binary: LanguageServerBinary {
-                path: PathBuf::from("fake-definition-lsp"),
-                arguments: Vec::new(),
-                env: None,
-            },
-            capabilities: lsp::ServerCapabilities {
-                definition_provider: Some(lsp::OneOf::Left(true)),
-                text_document_sync: Some(TextDocumentSyncCapability::Kind(
-                    TextDocumentSyncKind::FULL,
-                )),
-                ..Default::default()
-            },
-            label_for_completion: None,
-            initializer: Some(Box::new({
-                move |server| {
-                    server.handle_notification::<lsp::notification::DidOpenTextDocument, _>({
-                        let index = index.clone();
-                        move |params, _cx| {
-                            index
-                                .lock()
-                                .open_buffer(params.text_document.uri, &params.text_document.text);
-                        }
-                    });
-
-                    server.handle_notification::<lsp::notification::DidCloseTextDocument, _>({
-                        let index = index.clone();
-                        let fs = fs.clone();
-                        move |params, cx| {
-                            let uri = params.text_document.uri;
-                            let path = uri.to_file_path().ok();
-                            index.lock().mark_buffer_closed(&uri);
-
-                            if let Some(path) = path {
-                                let index = index.clone();
-                                let fs = fs.clone();
-                                cx.spawn(async move |_cx| {
-                                    if let Ok(content) = fs.load(&path).await {
-                                        index.lock().index_file(uri, &content);
-                                    }
-                                })
-                                .detach();
-                            }
-                        }
-                    });
-
-                    server.handle_notification::<lsp::notification::DidChangeWatchedFiles, _>({
-                        let index = index.clone();
-                        let fs = fs.clone();
-                        move |params, cx| {
-                            let index = index.clone();
-                            let fs = fs.clone();
-                            cx.spawn(async move |_cx| {
-                                for event in params.changes {
-                                    if index.lock().is_buffer_open(&event.uri) {
-                                        continue;
-                                    }
-
-                                    match event.typ {
-                                        lsp::FileChangeType::DELETED => {
-                                            index.lock().remove_definitions_for_file(&event.uri);
-                                        }
-                                        lsp::FileChangeType::CREATED
-                                        | lsp::FileChangeType::CHANGED => {
-                                            if let Some(path) = event.uri.to_file_path().ok() {
-                                                if let Ok(content) = fs.load(&path).await {
-                                                    index.lock().index_file(event.uri, &content);
-                                                }
-                                            }
-                                        }
-                                        _ => {}
-                                    }
-                                }
-                            })
-                            .detach();
-                        }
-                    });
-
-                    server.handle_notification::<lsp::notification::DidChangeTextDocument, _>({
-                        let index = index.clone();
-                        move |params, _cx| {
-                            if let Some(change) = params.content_changes.into_iter().last() {
-                                index
-                                    .lock()
-                                    .index_file(params.text_document.uri, &change.text);
-                            }
-                        }
-                    });
-
-                    server.handle_notification::<lsp::notification::DidChangeWorkspaceFolders, _>(
-                        {
-                            let index = index.clone();
-                            let fs = fs.clone();
-                            move |params, cx| {
-                                let index = index.clone();
-                                let fs = fs.clone();
-                                let files = fs.as_fake().files();
-                                cx.spawn(async move |_cx| {
-                                    for folder in params.event.added {
-                                        let Ok(path) = folder.uri.to_file_path() else {
-                                            continue;
-                                        };
-                                        for file in &files {
-                                            if let Some(uri) = Uri::from_file_path(&file).ok()
-                                                && file.starts_with(&path)
-                                                && let Ok(content) = fs.load(&file).await
-                                            {
-                                                index.lock().index_file(uri, &content);
-                                            }
-                                        }
-                                    }
-                                })
-                                .detach();
-                            }
-                        },
-                    );
-
-                    server.set_request_handler::<lsp::request::GotoDefinition, _, _>({
-                        let index = index.clone();
-                        move |params, _cx| {
-                            let result = index.lock().get_definitions(
-                                params.text_document_position_params.text_document.uri,
-                                params.text_document_position_params.position,
-                            );
-                            async move { Ok(result) }
-                        }
-                    });
-                }
-            })),
-        },
-    )
-}
-
-struct DefinitionIndex {
-    language: Arc<Language>,
-    definitions: HashMap<String, Vec<lsp::Location>>,
-    files: HashMap<Uri, FileEntry>,
-}
-
-#[derive(Debug)]
-struct FileEntry {
-    contents: String,
-    is_open_in_buffer: bool,
-}
-
-impl DefinitionIndex {
-    fn new(language: Arc<Language>) -> Self {
-        Self {
-            language,
-            definitions: HashMap::default(),
-            files: HashMap::default(),
-        }
-    }
-
-    fn remove_definitions_for_file(&mut self, uri: &Uri) {
-        self.definitions.retain(|_, locations| {
-            locations.retain(|loc| &loc.uri != uri);
-            !locations.is_empty()
-        });
-        self.files.remove(uri);
-    }
-
-    fn open_buffer(&mut self, uri: Uri, content: &str) {
-        self.index_file_inner(uri, content, true);
-    }
-
-    fn mark_buffer_closed(&mut self, uri: &Uri) {
-        if let Some(entry) = self.files.get_mut(uri) {
-            entry.is_open_in_buffer = false;
-        }
-    }
-
-    fn is_buffer_open(&self, uri: &Uri) -> bool {
-        self.files
-            .get(uri)
-            .map(|entry| entry.is_open_in_buffer)
-            .unwrap_or(false)
-    }
-
-    fn index_file(&mut self, uri: Uri, content: &str) {
-        self.index_file_inner(uri, content, false);
-    }
-
-    fn index_file_inner(&mut self, uri: Uri, content: &str, is_open_in_buffer: bool) -> Option<()> {
-        self.remove_definitions_for_file(&uri);
-        let grammar = self.language.grammar()?;
-        let outline_config = grammar.outline_config.as_ref()?;
-        let mut parser = Parser::new();
-        parser.set_language(&grammar.ts_language).ok()?;
-        let tree = parser.parse(content, None)?;
-        let declarations = extract_declarations_from_tree(&tree, content, outline_config);
-        for (name, byte_range) in declarations {
-            let range = byte_range_to_lsp_range(content, byte_range);
-            let location = lsp::Location {
-                uri: uri.clone(),
-                range,
-            };
-            self.definitions
-                .entry(name)
-                .or_insert_with(Vec::new)
-                .push(location);
-        }
-        self.files.insert(
-            uri,
-            FileEntry {
-                contents: content.to_string(),
-                is_open_in_buffer,
-            },
-        );
-
-        Some(())
-    }
-
-    fn get_definitions(
-        &mut self,
-        uri: Uri,
-        position: lsp::Position,
-    ) -> Option<lsp::GotoDefinitionResponse> {
-        let entry = self.files.get(&uri)?;
-        let name = word_at_position(&entry.contents, position)?;
-        let locations = self.definitions.get(name).cloned()?;
-        Some(lsp::GotoDefinitionResponse::Array(locations))
-    }
-}
-
-fn extract_declarations_from_tree(
-    tree: &Tree,
-    content: &str,
-    outline_config: &language::OutlineConfig,
-) -> Vec<(String, Range<usize>)> {
-    let mut cursor = QueryCursor::new();
-    let mut declarations = Vec::new();
-    let mut matches = cursor.matches(&outline_config.query, tree.root_node(), content.as_bytes());
-    while let Some(query_match) = matches.next() {
-        let mut name_range: Option<Range<usize>> = None;
-        let mut has_item_range = false;
-
-        for capture in query_match.captures {
-            let range = capture.node.byte_range();
-            if capture.index == outline_config.name_capture_ix {
-                name_range = Some(range);
-            } else if capture.index == outline_config.item_capture_ix {
-                has_item_range = true;
-            }
-        }
-
-        if let Some(name_range) = name_range
-            && has_item_range
-        {
-            let name = content[name_range.clone()].to_string();
-            if declarations.iter().any(|(n, _)| n == &name) {
-                continue;
-            }
-            declarations.push((name, name_range));
-        }
-    }
-    declarations
-}
-
-fn byte_range_to_lsp_range(content: &str, byte_range: Range<usize>) -> lsp::Range {
-    let start = byte_offset_to_position(content, byte_range.start);
-    let end = byte_offset_to_position(content, byte_range.end);
-    lsp::Range { start, end }
-}
-
-fn byte_offset_to_position(content: &str, offset: usize) -> lsp::Position {
-    let mut line = 0;
-    let mut character = 0;
-    let mut current_offset = 0;
-    for ch in content.chars() {
-        if current_offset >= offset {
-            break;
-        }
-        if ch == '\n' {
-            line += 1;
-            character = 0;
-        } else {
-            character += 1;
-        }
-        current_offset += ch.len_utf8();
-    }
-    lsp::Position { line, character }
-}
-
-fn word_at_position(content: &str, position: lsp::Position) -> Option<&str> {
-    let mut lines = content.lines();
-    let line = lines.nth(position.line as usize)?;
-    let column = position.character as usize;
-    if column > line.len() {
-        return None;
-    }
-    let start = line[..column]
-        .rfind(|c: char| !c.is_alphanumeric() && c != '_')
-        .map(|i| i + 1)
-        .unwrap_or(0);
-    let end = line[column..]
-        .find(|c: char| !c.is_alphanumeric() && c != '_')
-        .map(|i| i + column)
-        .unwrap_or(line.len());
-    Some(&line[start..end]).filter(|word| !word.is_empty())
-}
diff --git a/crates/edit_prediction_types/Cargo.toml b/crates/edit_prediction_types/Cargo.toml
deleted file mode 100644
index 00a8577911..0000000000
--- a/crates/edit_prediction_types/Cargo.toml
+++ /dev/null
@@ -1,18 +0,0 @@
-[package]
-name = "edit_prediction_types"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/edit_prediction_types.rs"
-
-[dependencies]
-client.workspace = true
-gpui.workspace = true
-language.workspace = true
-text.workspace = true
diff --git a/crates/edit_prediction_types/LICENSE-GPL b/crates/edit_prediction_types/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/edit_prediction_types/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/edit_prediction_types/src/edit_prediction_types.rs b/crates/edit_prediction_types/src/edit_prediction_types.rs
deleted file mode 100644
index fbcb3c4c00..0000000000
--- a/crates/edit_prediction_types/src/edit_prediction_types.rs
+++ /dev/null
@@ -1,298 +0,0 @@
-use std::{ops::Range, sync::Arc};
-
-use client::EditPredictionUsage;
-use gpui::{App, Context, Entity, SharedString};
-use language::{Anchor, Buffer, OffsetRangeExt};
-
-// TODO: Find a better home for `Direction`.
-//
-// This should live in an ancestor crate of `editor` and `edit_prediction`,
-// but at time of writing there isn't an obvious spot.
-#[derive(Copy, Clone, PartialEq, Eq)]
-pub enum Direction {
-    Prev,
-    Next,
-}
-
-#[derive(Clone)]
-pub enum EditPrediction {
-    /// Edits within the buffer that requested the prediction
-    Local {
-        id: Option<SharedString>,
-        edits: Vec<(Range<language::Anchor>, Arc<str>)>,
-        edit_preview: Option<language::EditPreview>,
-    },
-    /// Jump to a different file from the one that requested the prediction
-    Jump {
-        id: Option<SharedString>,
-        snapshot: language::BufferSnapshot,
-        target: language::Anchor,
-    },
-}
-
-pub enum DataCollectionState {
-    /// The provider doesn't support data collection.
-    Unsupported,
-    /// Data collection is enabled.
-    Enabled { is_project_open_source: bool },
-    /// Data collection is disabled or unanswered.
-    Disabled { is_project_open_source: bool },
-}
-
-impl DataCollectionState {
-    pub fn is_supported(&self) -> bool {
-        !matches!(self, DataCollectionState::Unsupported)
-    }
-
-    pub fn is_enabled(&self) -> bool {
-        matches!(self, DataCollectionState::Enabled { .. })
-    }
-
-    pub fn is_project_open_source(&self) -> bool {
-        match self {
-            Self::Enabled {
-                is_project_open_source,
-            }
-            | Self::Disabled {
-                is_project_open_source,
-            } => *is_project_open_source,
-            _ => false,
-        }
-    }
-}
-
-pub trait EditPredictionDelegate: 'static + Sized {
-    fn name() -> &'static str;
-    fn display_name() -> &'static str;
-    fn show_predictions_in_menu() -> bool;
-    fn show_tab_accept_marker() -> bool {
-        false
-    }
-    fn supports_jump_to_edit() -> bool {
-        true
-    }
-
-    fn data_collection_state(&self, _cx: &App) -> DataCollectionState {
-        DataCollectionState::Unsupported
-    }
-
-    fn usage(&self, _cx: &App) -> Option<EditPredictionUsage> {
-        None
-    }
-
-    fn toggle_data_collection(&mut self, _cx: &mut App) {}
-    fn is_enabled(
-        &self,
-        buffer: &Entity<Buffer>,
-        cursor_position: language::Anchor,
-        cx: &App,
-    ) -> bool;
-    fn is_refreshing(&self, cx: &App) -> bool;
-    fn refresh(
-        &mut self,
-        buffer: Entity<Buffer>,
-        cursor_position: language::Anchor,
-        debounce: bool,
-        cx: &mut Context<Self>,
-    );
-    fn cycle(
-        &mut self,
-        buffer: Entity<Buffer>,
-        cursor_position: language::Anchor,
-        direction: Direction,
-        cx: &mut Context<Self>,
-    );
-    fn accept(&mut self, cx: &mut Context<Self>);
-    fn discard(&mut self, cx: &mut Context<Self>);
-    fn did_show(&mut self, _cx: &mut Context<Self>) {}
-    fn suggest(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        cursor_position: language::Anchor,
-        cx: &mut Context<Self>,
-    ) -> Option<EditPrediction>;
-}
-
-pub trait EditPredictionDelegateHandle {
-    fn name(&self) -> &'static str;
-    fn display_name(&self) -> &'static str;
-    fn is_enabled(
-        &self,
-        buffer: &Entity<Buffer>,
-        cursor_position: language::Anchor,
-        cx: &App,
-    ) -> bool;
-    fn show_predictions_in_menu(&self) -> bool;
-    fn show_tab_accept_marker(&self) -> bool;
-    fn supports_jump_to_edit(&self) -> bool;
-    fn data_collection_state(&self, cx: &App) -> DataCollectionState;
-    fn usage(&self, cx: &App) -> Option<EditPredictionUsage>;
-    fn toggle_data_collection(&self, cx: &mut App);
-    fn is_refreshing(&self, cx: &App) -> bool;
-    fn refresh(
-        &self,
-        buffer: Entity<Buffer>,
-        cursor_position: language::Anchor,
-        debounce: bool,
-        cx: &mut App,
-    );
-    fn cycle(
-        &self,
-        buffer: Entity<Buffer>,
-        cursor_position: language::Anchor,
-        direction: Direction,
-        cx: &mut App,
-    );
-    fn did_show(&self, cx: &mut App);
-    fn accept(&self, cx: &mut App);
-    fn discard(&self, cx: &mut App);
-    fn suggest(
-        &self,
-        buffer: &Entity<Buffer>,
-        cursor_position: language::Anchor,
-        cx: &mut App,
-    ) -> Option<EditPrediction>;
-}
-
-impl<T> EditPredictionDelegateHandle for Entity<T>
-where
-    T: EditPredictionDelegate,
-{
-    fn name(&self) -> &'static str {
-        T::name()
-    }
-
-    fn display_name(&self) -> &'static str {
-        T::display_name()
-    }
-
-    fn show_predictions_in_menu(&self) -> bool {
-        T::show_predictions_in_menu()
-    }
-
-    fn show_tab_accept_marker(&self) -> bool {
-        T::show_tab_accept_marker()
-    }
-
-    fn supports_jump_to_edit(&self) -> bool {
-        T::supports_jump_to_edit()
-    }
-
-    fn data_collection_state(&self, cx: &App) -> DataCollectionState {
-        self.read(cx).data_collection_state(cx)
-    }
-
-    fn usage(&self, cx: &App) -> Option<EditPredictionUsage> {
-        self.read(cx).usage(cx)
-    }
-
-    fn toggle_data_collection(&self, cx: &mut App) {
-        self.update(cx, |this, cx| this.toggle_data_collection(cx))
-    }
-
-    fn is_enabled(
-        &self,
-        buffer: &Entity<Buffer>,
-        cursor_position: language::Anchor,
-        cx: &App,
-    ) -> bool {
-        self.read(cx).is_enabled(buffer, cursor_position, cx)
-    }
-
-    fn is_refreshing(&self, cx: &App) -> bool {
-        self.read(cx).is_refreshing(cx)
-    }
-
-    fn refresh(
-        &self,
-        buffer: Entity<Buffer>,
-        cursor_position: language::Anchor,
-        debounce: bool,
-        cx: &mut App,
-    ) {
-        self.update(cx, |this, cx| {
-            this.refresh(buffer, cursor_position, debounce, cx)
-        })
-    }
-
-    fn cycle(
-        &self,
-        buffer: Entity<Buffer>,
-        cursor_position: language::Anchor,
-        direction: Direction,
-        cx: &mut App,
-    ) {
-        self.update(cx, |this, cx| {
-            this.cycle(buffer, cursor_position, direction, cx)
-        })
-    }
-
-    fn accept(&self, cx: &mut App) {
-        self.update(cx, |this, cx| this.accept(cx))
-    }
-
-    fn discard(&self, cx: &mut App) {
-        self.update(cx, |this, cx| this.discard(cx))
-    }
-
-    fn did_show(&self, cx: &mut App) {
-        self.update(cx, |this, cx| this.did_show(cx))
-    }
-
-    fn suggest(
-        &self,
-        buffer: &Entity<Buffer>,
-        cursor_position: language::Anchor,
-        cx: &mut App,
-    ) -> Option<EditPrediction> {
-        self.update(cx, |this, cx| this.suggest(buffer, cursor_position, cx))
-    }
-}
-
-/// Returns edits updated based on user edits since the old snapshot. None is returned if any user
-/// edit is not a prefix of a predicted insertion.
-pub fn interpolate_edits(
-    old_snapshot: &text::BufferSnapshot,
-    new_snapshot: &text::BufferSnapshot,
-    current_edits: &[(Range<Anchor>, Arc<str>)],
-) -> Option<Vec<(Range<Anchor>, Arc<str>)>> {
-    let mut edits = Vec::new();
-
-    let mut model_edits = current_edits.iter().peekable();
-    for user_edit in new_snapshot.edits_since::<usize>(&old_snapshot.version) {
-        while let Some((model_old_range, _)) = model_edits.peek() {
-            let model_old_range = model_old_range.to_offset(old_snapshot);
-            if model_old_range.end < user_edit.old.start {
-                let (model_old_range, model_new_text) = model_edits.next().unwrap();
-                edits.push((model_old_range.clone(), model_new_text.clone()));
-            } else {
-                break;
-            }
-        }
-
-        if let Some((model_old_range, model_new_text)) = model_edits.peek() {
-            let model_old_offset_range = model_old_range.to_offset(old_snapshot);
-            if user_edit.old == model_old_offset_range {
-                let user_new_text = new_snapshot
-                    .text_for_range(user_edit.new.clone())
-                    .collect::<String>();
-
-                if let Some(model_suffix) = model_new_text.strip_prefix(&user_new_text) {
-                    if !model_suffix.is_empty() {
-                        let anchor = old_snapshot.anchor_after(user_edit.old.end);
-                        edits.push((anchor..anchor, model_suffix.into()));
-                    }
-
-                    model_edits.next();
-                    continue;
-                }
-            }
-        }
-
-        return None;
-    }
-
-    edits.extend(model_edits.cloned());
-
-    if edits.is_empty() { None } else { Some(edits) }
-}
diff --git a/crates/edit_prediction_ui/Cargo.toml b/crates/edit_prediction_ui/Cargo.toml
deleted file mode 100644
index d6fc455121..0000000000
--- a/crates/edit_prediction_ui/Cargo.toml
+++ /dev/null
@@ -1,58 +0,0 @@
-[package]
-name = "edit_prediction_ui"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/edit_prediction_ui.rs"
-doctest = false
-
-[dependencies]
-anyhow.workspace = true
-buffer_diff.workspace = true
-client.workspace = true
-cloud_llm_client.workspace = true
-codestral.workspace = true
-command_palette_hooks.workspace = true
-copilot.workspace = true
-edit_prediction.workspace = true
-edit_prediction_types.workspace = true
-editor.workspace = true
-feature_flags.workspace = true
-fs.workspace = true
-futures.workspace = true
-gpui.workspace = true
-indoc.workspace = true
-language.workspace = true
-markdown.workspace = true
-menu.workspace = true
-multi_buffer.workspace = true
-paths.workspace = true
-project.workspace = true
-regex.workspace = true
-settings.workspace = true
-supermaven.workspace = true
-telemetry.workspace = true
-text.workspace = true
-theme.workspace = true
-ui.workspace = true
-ui_input.workspace = true
-util.workspace = true
-workspace.workspace = true
-zed_actions.workspace = true
-zeta_prompt.workspace = true
-
-[dev-dependencies]
-copilot = { workspace = true, features = ["test-support"] }
-editor = { workspace = true, features = ["test-support"] }
-futures.workspace = true
-indoc.workspace = true
-lsp = { workspace = true, features = ["test-support"] }
-project = { workspace = true, features = ["test-support"] }
-serde_json.workspace = true
-theme = { workspace = true, features = ["test-support"] }
diff --git a/crates/edit_prediction_ui/LICENSE-GPL b/crates/edit_prediction_ui/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/edit_prediction_ui/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/edit_prediction_ui/src/edit_prediction_button.rs b/crates/edit_prediction_ui/src/edit_prediction_button.rs
deleted file mode 100644
index 04c7614689..0000000000
--- a/crates/edit_prediction_ui/src/edit_prediction_button.rs
+++ /dev/null
@@ -1,1630 +0,0 @@
-use anyhow::Result;
-use client::{Client, UserStore, zed_urls};
-use cloud_llm_client::UsageLimit;
-use codestral::CodestralEditPredictionDelegate;
-use copilot::{Copilot, Status};
-use edit_prediction::{MercuryFeatureFlag, SweepFeatureFlag, Zeta2FeatureFlag};
-use edit_prediction_types::EditPredictionDelegateHandle;
-use editor::{
-    Editor, MultiBufferOffset, SelectionEffects, actions::ShowEditPrediction, scroll::Autoscroll,
-};
-use feature_flags::FeatureFlagAppExt;
-use fs::Fs;
-use gpui::{
-    Action, Animation, AnimationExt, App, AsyncWindowContext, Corner, Entity, FocusHandle,
-    Focusable, IntoElement, ParentElement, Render, Subscription, WeakEntity, actions, div,
-    ease_in_out, pulsating_between,
-};
-use indoc::indoc;
-use language::{
-    EditPredictionsMode, File, Language,
-    language_settings::{self, AllLanguageSettings, EditPredictionProvider, all_language_settings},
-};
-use project::DisableAiSettings;
-use regex::Regex;
-use settings::{
-    EXPERIMENTAL_MERCURY_EDIT_PREDICTION_PROVIDER_NAME,
-    EXPERIMENTAL_SWEEP_EDIT_PREDICTION_PROVIDER_NAME,
-    EXPERIMENTAL_ZETA2_EDIT_PREDICTION_PROVIDER_NAME, Settings, SettingsStore,
-    update_settings_file,
-};
-use std::{
-    sync::{Arc, LazyLock},
-    time::Duration,
-};
-use supermaven::{AccountStatus, Supermaven};
-use ui::{
-    Clickable, ContextMenu, ContextMenuEntry, DocumentationEdge, DocumentationSide, IconButton,
-    IconButtonShape, Indicator, PopoverMenu, PopoverMenuHandle, ProgressBar, Tooltip, prelude::*,
-};
-use util::ResultExt as _;
-use workspace::{
-    StatusItemView, Toast, Workspace, create_and_open_local_file, item::ItemHandle,
-    notifications::NotificationId,
-};
-use zed_actions::OpenBrowser;
-
-use crate::{
-    ExternalProviderApiKeyModal, RatePredictions,
-    rate_prediction_modal::PredictEditsRatePredictionsFeatureFlag,
-};
-
-actions!(
-    edit_prediction,
-    [
-        /// Toggles the edit prediction menu.
-        ToggleMenu
-    ]
-);
-
-const COPILOT_SETTINGS_PATH: &str = "/settings/copilot";
-const COPILOT_SETTINGS_URL: &str = concat!("https://github.com", "/settings/copilot");
-const PRIVACY_DOCS: &str = "https://zed.dev/docs/ai/privacy-and-security";
-
-struct CopilotErrorToast;
-
-pub struct EditPredictionButton {
-    editor_subscription: Option<(Subscription, usize)>,
-    editor_enabled: Option<bool>,
-    editor_show_predictions: bool,
-    editor_focus_handle: Option<FocusHandle>,
-    language: Option<Arc<Language>>,
-    file: Option<Arc<dyn File>>,
-    edit_prediction_provider: Option<Arc<dyn EditPredictionDelegateHandle>>,
-    fs: Arc<dyn Fs>,
-    user_store: Entity<UserStore>,
-    popover_menu_handle: PopoverMenuHandle<ContextMenu>,
-}
-
-enum SupermavenButtonStatus {
-    Ready,
-    Errored(String),
-    NeedsActivation(String),
-    Initializing,
-}
-
-impl Render for EditPredictionButton {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        // Return empty div if AI is disabled
-        if DisableAiSettings::get_global(cx).disable_ai {
-            return div().hidden();
-        }
-
-        let all_language_settings = all_language_settings(None, cx);
-
-        match all_language_settings.edit_predictions.provider {
-            EditPredictionProvider::Copilot => {
-                let Some(copilot) = Copilot::global(cx) else {
-                    return div().hidden();
-                };
-                let status = copilot.read(cx).status();
-
-                let enabled = self.editor_enabled.unwrap_or(false);
-
-                let icon = match status {
-                    Status::Error(_) => IconName::CopilotError,
-                    Status::Authorized => {
-                        if enabled {
-                            IconName::Copilot
-                        } else {
-                            IconName::CopilotDisabled
-                        }
-                    }
-                    _ => IconName::CopilotInit,
-                };
-
-                if let Status::Error(e) = status {
-                    return div().child(
-                        IconButton::new("copilot-error", icon)
-                            .icon_size(IconSize::Small)
-                            .on_click(cx.listener(move |_, _, window, cx| {
-                                if let Some(workspace) = window.root::<Workspace>().flatten() {
-                                    workspace.update(cx, |workspace, cx| {
-                                        workspace.show_toast(
-                                            Toast::new(
-                                                NotificationId::unique::<CopilotErrorToast>(),
-                                                format!("Copilot can't be started: {}", e),
-                                            )
-                                            .on_click(
-                                                "Reinstall Copilot",
-                                                |window, cx| {
-                                                    copilot::reinstall_and_sign_in(window, cx)
-                                                },
-                                            ),
-                                            cx,
-                                        );
-                                    });
-                                }
-                            }))
-                            .tooltip(|_window, cx| {
-                                Tooltip::for_action("GitHub Copilot", &ToggleMenu, cx)
-                            }),
-                    );
-                }
-                let this = cx.weak_entity();
-
-                div().child(
-                    PopoverMenu::new("copilot")
-                        .menu(move |window, cx| {
-                            let current_status = Copilot::global(cx)?.read(cx).status();
-                            match current_status {
-                                Status::Authorized => this.update(cx, |this, cx| {
-                                    this.build_copilot_context_menu(window, cx)
-                                }),
-                                _ => this.update(cx, |this, cx| {
-                                    this.build_copilot_start_menu(window, cx)
-                                }),
-                            }
-                            .ok()
-                        })
-                        .anchor(Corner::BottomRight)
-                        .trigger_with_tooltip(
-                            IconButton::new("copilot-icon", icon),
-                            |_window, cx| Tooltip::for_action("GitHub Copilot", &ToggleMenu, cx),
-                        )
-                        .with_handle(self.popover_menu_handle.clone()),
-                )
-            }
-
-            EditPredictionProvider::Supermaven => {
-                let Some(supermaven) = Supermaven::global(cx) else {
-                    return div();
-                };
-
-                let supermaven = supermaven.read(cx);
-
-                let status = match supermaven {
-                    Supermaven::Starting => SupermavenButtonStatus::Initializing,
-                    Supermaven::FailedDownload { error } => {
-                        SupermavenButtonStatus::Errored(error.to_string())
-                    }
-                    Supermaven::Spawned(agent) => {
-                        let account_status = agent.account_status.clone();
-                        match account_status {
-                            AccountStatus::NeedsActivation { activate_url } => {
-                                SupermavenButtonStatus::NeedsActivation(activate_url)
-                            }
-                            AccountStatus::Unknown => SupermavenButtonStatus::Initializing,
-                            AccountStatus::Ready => SupermavenButtonStatus::Ready,
-                        }
-                    }
-                    Supermaven::Error { error } => {
-                        SupermavenButtonStatus::Errored(error.to_string())
-                    }
-                };
-
-                let icon = status.to_icon();
-                let tooltip_text = status.to_tooltip();
-                let has_menu = status.has_menu();
-                let this = cx.weak_entity();
-                let fs = self.fs.clone();
-
-                div().child(
-                    PopoverMenu::new("supermaven")
-                        .menu(move |window, cx| match &status {
-                            SupermavenButtonStatus::NeedsActivation(activate_url) => {
-                                Some(ContextMenu::build(window, cx, |menu, _, _| {
-                                    let fs = fs.clone();
-                                    let activate_url = activate_url.clone();
-
-                                    menu.entry("Sign In", None, move |_, cx| {
-                                        cx.open_url(activate_url.as_str())
-                                    })
-                                    .entry(
-                                        "Use Zed AI",
-                                        None,
-                                        move |_, cx| {
-                                            set_completion_provider(
-                                                fs.clone(),
-                                                cx,
-                                                EditPredictionProvider::Zed,
-                                            )
-                                        },
-                                    )
-                                }))
-                            }
-                            SupermavenButtonStatus::Ready => this
-                                .update(cx, |this, cx| {
-                                    this.build_supermaven_context_menu(window, cx)
-                                })
-                                .ok(),
-                            _ => None,
-                        })
-                        .anchor(Corner::BottomRight)
-                        .trigger_with_tooltip(
-                            IconButton::new("supermaven-icon", icon),
-                            move |window, cx| {
-                                if has_menu {
-                                    Tooltip::for_action(tooltip_text.clone(), &ToggleMenu, cx)
-                                } else {
-                                    Tooltip::text(tooltip_text.clone())(window, cx)
-                                }
-                            },
-                        )
-                        .with_handle(self.popover_menu_handle.clone()),
-                )
-            }
-
-            EditPredictionProvider::Codestral => {
-                let enabled = self.editor_enabled.unwrap_or(true);
-                let has_api_key = CodestralEditPredictionDelegate::has_api_key(cx);
-                let fs = self.fs.clone();
-                let this = cx.weak_entity();
-
-                div().child(
-                    PopoverMenu::new("codestral")
-                        .menu(move |window, cx| {
-                            if has_api_key {
-                                this.update(cx, |this, cx| {
-                                    this.build_codestral_context_menu(window, cx)
-                                })
-                                .ok()
-                            } else {
-                                Some(ContextMenu::build(window, cx, |menu, _, _| {
-                                    let fs = fs.clone();
-
-                                    menu.entry(
-                                        "Configure Codestral API Key",
-                                        None,
-                                        move |window, cx| {
-                                            window.dispatch_action(
-                                                zed_actions::agent::OpenSettings.boxed_clone(),
-                                                cx,
-                                            );
-                                        },
-                                    )
-                                    .separator()
-                                    .entry(
-                                        "Use Zed AI instead",
-                                        None,
-                                        move |_, cx| {
-                                            set_completion_provider(
-                                                fs.clone(),
-                                                cx,
-                                                EditPredictionProvider::Zed,
-                                            )
-                                        },
-                                    )
-                                }))
-                            }
-                        })
-                        .anchor(Corner::BottomRight)
-                        .trigger_with_tooltip(
-                            IconButton::new("codestral-icon", IconName::AiMistral)
-                                .shape(IconButtonShape::Square)
-                                .when(!has_api_key, |this| {
-                                    this.indicator(Indicator::dot().color(Color::Error))
-                                        .indicator_border_color(Some(
-                                            cx.theme().colors().status_bar_background,
-                                        ))
-                                })
-                                .when(has_api_key && !enabled, |this| {
-                                    this.indicator(Indicator::dot().color(Color::Ignored))
-                                        .indicator_border_color(Some(
-                                            cx.theme().colors().status_bar_background,
-                                        ))
-                                }),
-                            move |_window, cx| Tooltip::for_action("Codestral", &ToggleMenu, cx),
-                        )
-                        .with_handle(self.popover_menu_handle.clone()),
-                )
-            }
-            provider @ (EditPredictionProvider::Experimental(_) | EditPredictionProvider::Zed) => {
-                let enabled = self.editor_enabled.unwrap_or(true);
-
-                let ep_icon;
-                let mut missing_token = false;
-
-                match provider {
-                    EditPredictionProvider::Experimental(
-                        EXPERIMENTAL_SWEEP_EDIT_PREDICTION_PROVIDER_NAME,
-                    ) => {
-                        ep_icon = IconName::SweepAi;
-                        missing_token = edit_prediction::EditPredictionStore::try_global(cx)
-                            .is_some_and(|ep_store| !ep_store.read(cx).has_sweep_api_token());
-                    }
-                    EditPredictionProvider::Experimental(
-                        EXPERIMENTAL_MERCURY_EDIT_PREDICTION_PROVIDER_NAME,
-                    ) => {
-                        ep_icon = IconName::Inception;
-                        missing_token = edit_prediction::EditPredictionStore::try_global(cx)
-                            .is_some_and(|ep_store| !ep_store.read(cx).has_mercury_api_token());
-                    }
-                    _ => {
-                        ep_icon = if enabled {
-                            IconName::ZedPredict
-                        } else {
-                            IconName::ZedPredictDisabled
-                        };
-                    }
-                };
-
-                if edit_prediction::should_show_upsell_modal() {
-                    let tooltip_meta = if self.user_store.read(cx).current_user().is_some() {
-                        "Choose a Plan"
-                    } else {
-                        "Sign In To Use"
-                    };
-
-                    return div().child(
-                        IconButton::new("zed-predict-pending-button", ep_icon)
-                            .shape(IconButtonShape::Square)
-                            .indicator(Indicator::dot().color(Color::Muted))
-                            .indicator_border_color(Some(cx.theme().colors().status_bar_background))
-                            .tooltip(move |_window, cx| {
-                                Tooltip::with_meta("Edit Predictions", None, tooltip_meta, cx)
-                            })
-                            .on_click(cx.listener(move |_, _, window, cx| {
-                                telemetry::event!(
-                                    "Pending ToS Clicked",
-                                    source = "Edit Prediction Status Button"
-                                );
-                                window.dispatch_action(
-                                    zed_actions::OpenZedPredictOnboarding.boxed_clone(),
-                                    cx,
-                                );
-                            })),
-                    );
-                }
-
-                let mut over_limit = false;
-
-                if let Some(usage) = self
-                    .edit_prediction_provider
-                    .as_ref()
-                    .and_then(|provider| provider.usage(cx))
-                {
-                    over_limit = usage.over_limit()
-                }
-
-                let show_editor_predictions = self.editor_show_predictions;
-                let user = self.user_store.read(cx).current_user();
-
-                let indicator_color = if missing_token {
-                    Some(Color::Error)
-                } else if enabled && (!show_editor_predictions || over_limit) {
-                    Some(if over_limit {
-                        Color::Error
-                    } else {
-                        Color::Muted
-                    })
-                } else {
-                    None
-                };
-
-                let icon_button = IconButton::new("zed-predict-pending-button", ep_icon)
-                    .shape(IconButtonShape::Square)
-                    .when_some(indicator_color, |this, color| {
-                        this.indicator(Indicator::dot().color(color))
-                            .indicator_border_color(Some(cx.theme().colors().status_bar_background))
-                    })
-                    .when(!self.popover_menu_handle.is_deployed(), |element| {
-                        let user = user.clone();
-                        element.tooltip(move |_window, cx| {
-                            if enabled {
-                                if show_editor_predictions {
-                                    Tooltip::for_action("Edit Prediction", &ToggleMenu, cx)
-                                } else if user.is_none() {
-                                    Tooltip::with_meta(
-                                        "Edit Prediction",
-                                        Some(&ToggleMenu),
-                                        "Sign In To Use",
-                                        cx,
-                                    )
-                                } else {
-                                    Tooltip::with_meta(
-                                        "Edit Prediction",
-                                        Some(&ToggleMenu),
-                                        "Hidden For This File",
-                                        cx,
-                                    )
-                                }
-                            } else {
-                                Tooltip::with_meta(
-                                    "Edit Prediction",
-                                    Some(&ToggleMenu),
-                                    "Disabled For This File",
-                                    cx,
-                                )
-                            }
-                        })
-                    });
-
-                let this = cx.weak_entity();
-
-                let mut popover_menu = PopoverMenu::new("edit-prediction")
-                    .when(user.is_some(), |popover_menu| {
-                        let this = this.clone();
-
-                        popover_menu.menu(move |window, cx| {
-                            this.update(cx, |this, cx| {
-                                this.build_edit_prediction_context_menu(provider, window, cx)
-                            })
-                            .ok()
-                        })
-                    })
-                    .when(user.is_none(), |popover_menu| {
-                        let this = this.clone();
-
-                        popover_menu.menu(move |window, cx| {
-                            this.update(cx, |this, cx| {
-                                this.build_zeta_upsell_context_menu(window, cx)
-                            })
-                            .ok()
-                        })
-                    })
-                    .anchor(Corner::BottomRight)
-                    .with_handle(self.popover_menu_handle.clone());
-
-                let is_refreshing = self
-                    .edit_prediction_provider
-                    .as_ref()
-                    .is_some_and(|provider| provider.is_refreshing(cx));
-
-                if is_refreshing {
-                    popover_menu = popover_menu.trigger(
-                        icon_button.with_animation(
-                            "pulsating-label",
-                            Animation::new(Duration::from_secs(2))
-                                .repeat()
-                                .with_easing(pulsating_between(0.2, 1.0)),
-                            |icon_button, delta| icon_button.alpha(delta),
-                        ),
-                    );
-                } else {
-                    popover_menu = popover_menu.trigger(icon_button);
-                }
-
-                div().child(popover_menu.into_any_element())
-            }
-
-            EditPredictionProvider::None => div().hidden(),
-        }
-    }
-}
-
-impl EditPredictionButton {
-    pub fn new(
-        fs: Arc<dyn Fs>,
-        user_store: Entity<UserStore>,
-        popover_menu_handle: PopoverMenuHandle<ContextMenu>,
-        client: Arc<Client>,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        if let Some(copilot) = Copilot::global(cx) {
-            cx.observe(&copilot, |_, _, cx| cx.notify()).detach()
-        }
-
-        cx.observe_global::<SettingsStore>(move |_, cx| cx.notify())
-            .detach();
-
-        CodestralEditPredictionDelegate::ensure_api_key_loaded(client.http_client(), cx);
-
-        Self {
-            editor_subscription: None,
-            editor_enabled: None,
-            editor_show_predictions: true,
-            editor_focus_handle: None,
-            language: None,
-            file: None,
-            edit_prediction_provider: None,
-            user_store,
-            popover_menu_handle,
-            fs,
-        }
-    }
-
-    fn get_available_providers(&self, cx: &App) -> Vec<EditPredictionProvider> {
-        let mut providers = Vec::new();
-
-        providers.push(EditPredictionProvider::Zed);
-
-        if let Some(copilot) = Copilot::global(cx) {
-            if matches!(copilot.read(cx).status(), Status::Authorized) {
-                providers.push(EditPredictionProvider::Copilot);
-            }
-        }
-
-        if let Some(supermaven) = Supermaven::global(cx) {
-            if let Supermaven::Spawned(agent) = supermaven.read(cx) {
-                if matches!(agent.account_status, AccountStatus::Ready) {
-                    providers.push(EditPredictionProvider::Supermaven);
-                }
-            }
-        }
-
-        if CodestralEditPredictionDelegate::has_api_key(cx) {
-            providers.push(EditPredictionProvider::Codestral);
-        }
-
-        if cx.has_flag::<SweepFeatureFlag>() {
-            providers.push(EditPredictionProvider::Experimental(
-                EXPERIMENTAL_SWEEP_EDIT_PREDICTION_PROVIDER_NAME,
-            ));
-        }
-
-        if cx.has_flag::<MercuryFeatureFlag>() {
-            providers.push(EditPredictionProvider::Experimental(
-                EXPERIMENTAL_MERCURY_EDIT_PREDICTION_PROVIDER_NAME,
-            ));
-        }
-
-        if cx.has_flag::<Zeta2FeatureFlag>() {
-            providers.push(EditPredictionProvider::Experimental(
-                EXPERIMENTAL_ZETA2_EDIT_PREDICTION_PROVIDER_NAME,
-            ));
-        }
-
-        providers
-    }
-
-    fn add_provider_switching_section(
-        &self,
-        mut menu: ContextMenu,
-        current_provider: EditPredictionProvider,
-        cx: &App,
-    ) -> ContextMenu {
-        let available_providers = self.get_available_providers(cx);
-
-        const ZED_AI_CALLOUT: &str =
-            "Zed's edit prediction is powered by Zeta, an open-source, dataset mode.";
-
-        let providers: Vec<_> = available_providers
-            .into_iter()
-            .filter(|p| *p != EditPredictionProvider::None)
-            .collect();
-
-        if !providers.is_empty() {
-            menu = menu.separator().header("Providers");
-
-            for provider in providers {
-                let is_current = provider == current_provider;
-                let fs = self.fs.clone();
-
-                menu = match provider {
-                    EditPredictionProvider::Zed => menu.item(
-                        ContextMenuEntry::new("Zed AI")
-                            .toggleable(IconPosition::Start, is_current)
-                            .documentation_aside(
-                                DocumentationSide::Left,
-                                DocumentationEdge::Bottom,
-                                |_| Label::new(ZED_AI_CALLOUT).into_any_element(),
-                            )
-                            .handler(move |_, cx| {
-                                set_completion_provider(fs.clone(), cx, provider);
-                            }),
-                    ),
-                    EditPredictionProvider::Copilot => menu.item(
-                        ContextMenuEntry::new("GitHub Copilot")
-                            .toggleable(IconPosition::Start, is_current)
-                            .handler(move |_, cx| {
-                                set_completion_provider(fs.clone(), cx, provider);
-                            }),
-                    ),
-                    EditPredictionProvider::Supermaven => menu.item(
-                        ContextMenuEntry::new("Supermaven")
-                            .toggleable(IconPosition::Start, is_current)
-                            .handler(move |_, cx| {
-                                set_completion_provider(fs.clone(), cx, provider);
-                            }),
-                    ),
-                    EditPredictionProvider::Codestral => menu.item(
-                        ContextMenuEntry::new("Codestral")
-                            .toggleable(IconPosition::Start, is_current)
-                            .handler(move |_, cx| {
-                                set_completion_provider(fs.clone(), cx, provider);
-                            }),
-                    ),
-                    EditPredictionProvider::Experimental(
-                        EXPERIMENTAL_SWEEP_EDIT_PREDICTION_PROVIDER_NAME,
-                    ) => {
-                        let has_api_token = edit_prediction::EditPredictionStore::try_global(cx)
-                            .map_or(false, |ep_store| ep_store.read(cx).has_sweep_api_token());
-
-                        let should_open_modal = !has_api_token || is_current;
-
-                        let entry = if has_api_token {
-                            ContextMenuEntry::new("Sweep")
-                                .toggleable(IconPosition::Start, is_current)
-                        } else {
-                            ContextMenuEntry::new("Sweep")
-                                .icon(IconName::XCircle)
-                                .icon_color(Color::Error)
-                                .documentation_aside(
-                                    DocumentationSide::Left,
-                                    DocumentationEdge::Bottom,
-                                    |_| {
-                                        Label::new("Click to configure your Sweep API token")
-                                            .into_any_element()
-                                    },
-                                )
-                        };
-
-                        let entry = entry.handler(move |window, cx| {
-                            if should_open_modal {
-                                if let Some(workspace) = window.root::<Workspace>().flatten() {
-                                    workspace.update(cx, |workspace, cx| {
-                                        workspace.toggle_modal(window, cx, |window, cx| {
-                                            ExternalProviderApiKeyModal::new(
-                                                window,
-                                                cx,
-                                                |api_key, store, cx| {
-                                                    store
-                                                        .sweep_ai
-                                                        .set_api_token(api_key, cx)
-                                                        .detach_and_log_err(cx);
-                                                },
-                                            )
-                                        });
-                                    });
-                                };
-                            } else {
-                                set_completion_provider(fs.clone(), cx, provider);
-                            }
-                        });
-
-                        menu.item(entry)
-                    }
-                    EditPredictionProvider::Experimental(
-                        EXPERIMENTAL_MERCURY_EDIT_PREDICTION_PROVIDER_NAME,
-                    ) => {
-                        let has_api_token = edit_prediction::EditPredictionStore::try_global(cx)
-                            .map_or(false, |ep_store| ep_store.read(cx).has_mercury_api_token());
-
-                        let should_open_modal = !has_api_token || is_current;
-
-                        let entry = if has_api_token {
-                            ContextMenuEntry::new("Mercury")
-                                .toggleable(IconPosition::Start, is_current)
-                        } else {
-                            ContextMenuEntry::new("Mercury")
-                                .icon(IconName::XCircle)
-                                .icon_color(Color::Error)
-                                .documentation_aside(
-                                    DocumentationSide::Left,
-                                    DocumentationEdge::Bottom,
-                                    |_| {
-                                        Label::new("Click to configure your Mercury API token")
-                                            .into_any_element()
-                                    },
-                                )
-                        };
-
-                        let entry = entry.handler(move |window, cx| {
-                            if should_open_modal {
-                                if let Some(workspace) = window.root::<Workspace>().flatten() {
-                                    workspace.update(cx, |workspace, cx| {
-                                        workspace.toggle_modal(window, cx, |window, cx| {
-                                            ExternalProviderApiKeyModal::new(
-                                                window,
-                                                cx,
-                                                |api_key, store, cx| {
-                                                    store
-                                                        .mercury
-                                                        .set_api_token(api_key, cx)
-                                                        .detach_and_log_err(cx);
-                                                },
-                                            )
-                                        });
-                                    });
-                                };
-                            } else {
-                                set_completion_provider(fs.clone(), cx, provider);
-                            }
-                        });
-
-                        menu.item(entry)
-                    }
-                    EditPredictionProvider::Experimental(
-                        EXPERIMENTAL_ZETA2_EDIT_PREDICTION_PROVIDER_NAME,
-                    ) => menu.item(
-                        ContextMenuEntry::new("Zeta2")
-                            .toggleable(IconPosition::Start, is_current)
-                            .handler(move |_, cx| {
-                                set_completion_provider(fs.clone(), cx, provider);
-                            }),
-                    ),
-                    EditPredictionProvider::None | EditPredictionProvider::Experimental(_) => {
-                        continue;
-                    }
-                };
-            }
-        }
-
-        menu
-    }
-
-    pub fn build_copilot_start_menu(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Entity<ContextMenu> {
-        let fs = self.fs.clone();
-        ContextMenu::build(window, cx, |menu, _, _| {
-            menu.entry("Sign In to Copilot", None, copilot::initiate_sign_in)
-                .entry("Disable Copilot", None, {
-                    let fs = fs.clone();
-                    move |_window, cx| hide_copilot(fs.clone(), cx)
-                })
-                .separator()
-                .entry("Use Zed AI", None, {
-                    let fs = fs.clone();
-                    move |_window, cx| {
-                        set_completion_provider(fs.clone(), cx, EditPredictionProvider::Zed)
-                    }
-                })
-        })
-    }
-
-    pub fn build_language_settings_menu(
-        &self,
-        mut menu: ContextMenu,
-        window: &Window,
-        cx: &mut App,
-    ) -> ContextMenu {
-        let fs = self.fs.clone();
-        let line_height = window.line_height();
-
-        menu = menu.header("Show Edit Predictions For");
-
-        let language_state = self.language.as_ref().map(|language| {
-            (
-                language.clone(),
-                language_settings::language_settings(Some(language.name()), None, cx)
-                    .show_edit_predictions,
-            )
-        });
-
-        if let Some(editor_focus_handle) = self.editor_focus_handle.clone() {
-            let entry = ContextMenuEntry::new("This Buffer")
-                .toggleable(IconPosition::Start, self.editor_show_predictions)
-                .action(Box::new(editor::actions::ToggleEditPrediction))
-                .handler(move |window, cx| {
-                    editor_focus_handle.dispatch_action(
-                        &editor::actions::ToggleEditPrediction,
-                        window,
-                        cx,
-                    );
-                });
-
-            match language_state.clone() {
-                Some((language, false)) => {
-                    menu = menu.item(
-                        entry
-                            .disabled(true)
-                            .documentation_aside(DocumentationSide::Left, DocumentationEdge::Top, move |_cx| {
-                                Label::new(format!("Edit predictions cannot be toggled for this buffer because they are disabled for {}", language.name()))
-                                    .into_any_element()
-                            })
-                    );
-                }
-                Some(_) | None => menu = menu.item(entry),
-            }
-        }
-
-        if let Some((language, language_enabled)) = language_state {
-            let fs = fs.clone();
-
-            menu = menu.toggleable_entry(
-                language.name(),
-                language_enabled,
-                IconPosition::Start,
-                None,
-                move |_, cx| {
-                    toggle_show_edit_predictions_for_language(language.clone(), fs.clone(), cx)
-                },
-            );
-        }
-
-        let settings = AllLanguageSettings::get_global(cx);
-
-        let globally_enabled = settings.show_edit_predictions(None, cx);
-        let entry = ContextMenuEntry::new("All Files")
-            .toggleable(IconPosition::Start, globally_enabled)
-            .action(workspace::ToggleEditPrediction.boxed_clone())
-            .handler(|window, cx| {
-                window.dispatch_action(workspace::ToggleEditPrediction.boxed_clone(), cx)
-            });
-        menu = menu.item(entry);
-
-        let provider = settings.edit_predictions.provider;
-        let current_mode = settings.edit_predictions_mode();
-        let subtle_mode = matches!(current_mode, EditPredictionsMode::Subtle);
-        let eager_mode = matches!(current_mode, EditPredictionsMode::Eager);
-
-        if matches!(
-            provider,
-            EditPredictionProvider::Zed
-                | EditPredictionProvider::Copilot
-                | EditPredictionProvider::Supermaven
-                | EditPredictionProvider::Codestral
-        ) {
-            menu = menu
-                .separator()
-                .header("Display Modes")
-                .item(
-                    ContextMenuEntry::new("Eager")
-                        .toggleable(IconPosition::Start, eager_mode)
-                        .documentation_aside(DocumentationSide::Left, DocumentationEdge::Top, move |_| {
-                            Label::new("Display predictions inline when there are no language server completions available.").into_any_element()
-                        })
-                        .handler({
-                            let fs = fs.clone();
-                            move |_, cx| {
-                                toggle_edit_prediction_mode(fs.clone(), EditPredictionsMode::Eager, cx)
-                            }
-                        }),
-                )
-                .item(
-                    ContextMenuEntry::new("Subtle")
-                        .toggleable(IconPosition::Start, subtle_mode)
-                        .documentation_aside(DocumentationSide::Left, DocumentationEdge::Top, move |_| {
-                            Label::new("Display predictions inline only when holding a modifier key (alt by default).").into_any_element()
-                        })
-                        .handler({
-                            let fs = fs.clone();
-                            move |_, cx| {
-                                toggle_edit_prediction_mode(fs.clone(), EditPredictionsMode::Subtle, cx)
-                            }
-                        }),
-                );
-        }
-
-        menu = menu.separator().header("Privacy");
-
-        if let Some(provider) = &self.edit_prediction_provider {
-            let data_collection = provider.data_collection_state(cx);
-
-            if data_collection.is_supported() {
-                let provider = provider.clone();
-                let enabled = data_collection.is_enabled();
-                let is_open_source = data_collection.is_project_open_source();
-                let is_collecting = data_collection.is_enabled();
-                let (icon_name, icon_color) = if is_open_source && is_collecting {
-                    (IconName::Check, Color::Success)
-                } else {
-                    (IconName::Check, Color::Accent)
-                };
-
-                menu = menu.item(
-                    ContextMenuEntry::new("Training Data Collection")
-                        .toggleable(IconPosition::Start, data_collection.is_enabled())
-                        .icon(icon_name)
-                        .icon_color(icon_color)
-                        .documentation_aside(DocumentationSide::Left, DocumentationEdge::Top, move |cx| {
-                            let (msg, label_color, icon_name, icon_color) = match (is_open_source, is_collecting) {
-                                (true, true) => (
-                                    "Project identified as open source, and you're sharing data.",
-                                    Color::Default,
-                                    IconName::Check,
-                                    Color::Success,
-                                ),
-                                (true, false) => (
-                                    "Project identified as open source, but you're not sharing data.",
-                                    Color::Muted,
-                                    IconName::Close,
-                                    Color::Muted,
-                                ),
-                                (false, true) => (
-                                    "Project not identified as open source. No data captured.",
-                                    Color::Muted,
-                                    IconName::Close,
-                                    Color::Muted,
-                                ),
-                                (false, false) => (
-                                    "Project not identified as open source, and setting turned off.",
-                                    Color::Muted,
-                                    IconName::Close,
-                                    Color::Muted,
-                                ),
-                            };
-                            v_flex()
-                                .gap_2()
-                                .child(
-                                    Label::new(indoc!{
-                                        "Help us improve our open dataset model by sharing data from open source repositories. \
-                                        Zed must detect a license file in your repo for this setting to take effect. \
-                                        Files with sensitive data and secrets are excluded by default."
-                                    })
-                                )
-                                .child(
-                                    h_flex()
-                                        .items_start()
-                                        .pt_2()
-                                        .pr_1()
-                                        .flex_1()
-                                        .gap_1p5()
-                                        .border_t_1()
-                                        .border_color(cx.theme().colors().border_variant)
-                                        .child(h_flex().flex_shrink_0().h(line_height).child(Icon::new(icon_name).size(IconSize::XSmall).color(icon_color)))
-                                        .child(div().child(msg).w_full().text_sm().text_color(label_color.color(cx)))
-                                )
-                                .into_any_element()
-                        })
-                        .handler(move |_, cx| {
-                            provider.toggle_data_collection(cx);
-
-                            if !enabled {
-                                telemetry::event!(
-                                    "Data Collection Enabled",
-                                    source = "Edit Prediction Status Menu"
-                                );
-                            } else {
-                                telemetry::event!(
-                                    "Data Collection Disabled",
-                                    source = "Edit Prediction Status Menu"
-                                );
-                            }
-                        })
-                );
-
-                if is_collecting && !is_open_source {
-                    menu = menu.item(
-                        ContextMenuEntry::new("No data captured.")
-                            .disabled(true)
-                            .icon(IconName::Close)
-                            .icon_color(Color::Error)
-                            .icon_size(IconSize::Small),
-                    );
-                }
-            }
-        }
-
-        menu = menu.item(
-            ContextMenuEntry::new("Configure Excluded Files")
-                .icon(IconName::LockOutlined)
-                .icon_color(Color::Muted)
-                .documentation_aside(DocumentationSide::Left, DocumentationEdge::Top, |_| {
-                    Label::new(indoc!{"
-                        Open your settings to add sensitive paths for which Zed will never predict edits."}).into_any_element()
-                })
-                .handler(move |window, cx| {
-                    if let Some(workspace) = window.root().flatten() {
-                        let workspace = workspace.downgrade();
-                        window
-                            .spawn(cx, async |cx| {
-                                open_disabled_globs_setting_in_editor(
-                                    workspace,
-                                    cx,
-                                ).await
-                            })
-                            .detach_and_log_err(cx);
-                    }
-                }),
-        ).item(
-            ContextMenuEntry::new("View Docs")
-                .icon(IconName::FileGeneric)
-                .icon_color(Color::Muted)
-                .handler(move |_, cx| {
-                    cx.open_url(PRIVACY_DOCS);
-                })
-        );
-
-        if !self.editor_enabled.unwrap_or(true) {
-            menu = menu.item(
-                ContextMenuEntry::new("This file is excluded.")
-                    .disabled(true)
-                    .icon(IconName::ZedPredictDisabled)
-                    .icon_size(IconSize::Small),
-            );
-        }
-
-        if let Some(editor_focus_handle) = self.editor_focus_handle.clone() {
-            menu = menu
-                .separator()
-                .header("Actions")
-                .entry(
-                    "Predict Edit at Cursor",
-                    Some(Box::new(ShowEditPrediction)),
-                    {
-                        let editor_focus_handle = editor_focus_handle.clone();
-                        move |window, cx| {
-                            editor_focus_handle.dispatch_action(&ShowEditPrediction, window, cx);
-                        }
-                    },
-                )
-                .context(editor_focus_handle)
-                .when(
-                    cx.has_flag::<PredictEditsRatePredictionsFeatureFlag>(),
-                    |this| this.action("Rate Predictions", RatePredictions.boxed_clone()),
-                );
-        }
-
-        menu
-    }
-
-    fn build_copilot_context_menu(
-        &self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Entity<ContextMenu> {
-        let all_language_settings = all_language_settings(None, cx);
-        let copilot_config = copilot::copilot_chat::CopilotChatConfiguration {
-            enterprise_uri: all_language_settings
-                .edit_predictions
-                .copilot
-                .enterprise_uri
-                .clone(),
-        };
-        let settings_url = copilot_settings_url(copilot_config.enterprise_uri.as_deref());
-
-        ContextMenu::build(window, cx, |menu, window, cx| {
-            let menu = self.build_language_settings_menu(menu, window, cx);
-            let menu =
-                self.add_provider_switching_section(menu, EditPredictionProvider::Copilot, cx);
-
-            menu.separator()
-                .link(
-                    "Go to Copilot Settings",
-                    OpenBrowser { url: settings_url }.boxed_clone(),
-                )
-                .action("Sign Out", copilot::SignOut.boxed_clone())
-        })
-    }
-
-    fn build_supermaven_context_menu(
-        &self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Entity<ContextMenu> {
-        ContextMenu::build(window, cx, |menu, window, cx| {
-            let menu = self.build_language_settings_menu(menu, window, cx);
-            let menu =
-                self.add_provider_switching_section(menu, EditPredictionProvider::Supermaven, cx);
-
-            menu.separator()
-                .action("Sign Out", supermaven::SignOut.boxed_clone())
-        })
-    }
-
-    fn build_codestral_context_menu(
-        &self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Entity<ContextMenu> {
-        ContextMenu::build(window, cx, |menu, window, cx| {
-            let menu = self.build_language_settings_menu(menu, window, cx);
-            let menu =
-                self.add_provider_switching_section(menu, EditPredictionProvider::Codestral, cx);
-
-            menu.separator()
-                .entry("Configure Codestral API Key", None, move |window, cx| {
-                    window.dispatch_action(zed_actions::agent::OpenSettings.boxed_clone(), cx);
-                })
-        })
-    }
-
-    fn build_edit_prediction_context_menu(
-        &self,
-        provider: EditPredictionProvider,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Entity<ContextMenu> {
-        ContextMenu::build(window, cx, |mut menu, window, cx| {
-            if let Some(usage) = self
-                .edit_prediction_provider
-                .as_ref()
-                .and_then(|provider| provider.usage(cx))
-            {
-                menu = menu.header("Usage");
-                menu = menu
-                    .custom_entry(
-                        move |_window, cx| {
-                            let used_percentage = match usage.limit {
-                                UsageLimit::Limited(limit) => {
-                                    Some((usage.amount as f32 / limit as f32) * 100.)
-                                }
-                                UsageLimit::Unlimited => None,
-                            };
-
-                            h_flex()
-                                .flex_1()
-                                .gap_1p5()
-                                .children(
-                                    used_percentage.map(|percent| {
-                                        ProgressBar::new("usage", percent, 100., cx)
-                                    }),
-                                )
-                                .child(
-                                    Label::new(match usage.limit {
-                                        UsageLimit::Limited(limit) => {
-                                            format!("{} / {limit}", usage.amount)
-                                        }
-                                        UsageLimit::Unlimited => format!("{} / ∞", usage.amount),
-                                    })
-                                    .size(LabelSize::Small)
-                                    .color(Color::Muted),
-                                )
-                                .into_any_element()
-                        },
-                        move |_, cx| cx.open_url(&zed_urls::account_url(cx)),
-                    )
-                    .when(usage.over_limit(), |menu| -> ContextMenu {
-                        menu.entry("Subscribe to increase your limit", None, |_window, cx| {
-                            cx.open_url(&zed_urls::account_url(cx))
-                        })
-                    })
-                    .separator();
-            } else if self.user_store.read(cx).account_too_young() {
-                menu = menu
-                    .custom_entry(
-                        |_window, _cx| {
-                            Label::new("Your GitHub account is less than 30 days old.")
-                                .size(LabelSize::Small)
-                                .color(Color::Warning)
-                                .into_any_element()
-                        },
-                        |_window, cx| cx.open_url(&zed_urls::account_url(cx)),
-                    )
-                    .entry("Upgrade to Zed Pro or contact us.", None, |_window, cx| {
-                        cx.open_url(&zed_urls::account_url(cx))
-                    })
-                    .separator();
-            } else if self.user_store.read(cx).has_overdue_invoices() {
-                menu = menu
-                    .custom_entry(
-                        |_window, _cx| {
-                            Label::new("You have an outstanding invoice")
-                                .size(LabelSize::Small)
-                                .color(Color::Warning)
-                                .into_any_element()
-                        },
-                        |_window, cx| {
-                            cx.open_url(&zed_urls::account_url(cx))
-                        },
-                    )
-                    .entry(
-                        "Check your payment status or contact us at billing-support@zed.dev to continue using this feature.",
-                        None,
-                        |_window, cx| {
-                            cx.open_url(&zed_urls::account_url(cx))
-                        },
-                    )
-                    .separator();
-            }
-
-            menu = self.build_language_settings_menu(menu, window, cx);
-
-            if cx.has_flag::<Zeta2FeatureFlag>() {
-                let settings = all_language_settings(None, cx);
-                let context_retrieval = settings.edit_predictions.use_context;
-                menu = menu.separator().header("Context Retrieval").item(
-                    ContextMenuEntry::new("Enable Context Retrieval")
-                        .toggleable(IconPosition::Start, context_retrieval)
-                        .action(workspace::ToggleEditPrediction.boxed_clone())
-                        .handler({
-                            let fs = self.fs.clone();
-                            move |_, cx| {
-                                update_settings_file(fs.clone(), cx, move |settings, _| {
-                                    settings
-                                        .project
-                                        .all_languages
-                                        .features
-                                        .get_or_insert_default()
-                                        .experimental_edit_prediction_context_retrieval =
-                                        Some(!context_retrieval)
-                                });
-                            }
-                        }),
-                );
-            }
-
-            menu = self.add_provider_switching_section(menu, provider, cx);
-            menu
-        })
-    }
-
-    fn build_zeta_upsell_context_menu(
-        &self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Entity<ContextMenu> {
-        ContextMenu::build(window, cx, |mut menu, _window, cx| {
-            menu = menu
-                .custom_row(move |_window, cx| {
-                    let description = indoc! {
-                        "You get 2,000 accepted suggestions at every keystroke for free, \
-                        powered by Zeta, our open-source, open-data model"
-                    };
-
-                    v_flex()
-                        .max_w_64()
-                        .h(rems_from_px(148.))
-                        .child(render_zeta_tab_animation(cx))
-                        .child(Label::new("Edit Prediction"))
-                        .child(
-                            Label::new(description)
-                                .color(Color::Muted)
-                                .size(LabelSize::Small),
-                        )
-                        .into_any_element()
-                })
-                .separator()
-                .entry("Sign In & Start Using", None, |window, cx| {
-                    let client = Client::global(cx);
-                    window
-                        .spawn(cx, async move |cx| {
-                            client
-                                .sign_in_with_optional_connect(true, &cx)
-                                .await
-                                .log_err();
-                        })
-                        .detach();
-                })
-                .link(
-                    "Learn More",
-                    OpenBrowser {
-                        url: zed_urls::edit_prediction_docs(cx),
-                    }
-                    .boxed_clone(),
-                );
-
-            menu
-        })
-    }
-
-    pub fn update_enabled(&mut self, editor: Entity<Editor>, cx: &mut Context<Self>) {
-        let editor = editor.read(cx);
-        let snapshot = editor.buffer().read(cx).snapshot(cx);
-        let suggestion_anchor = editor.selections.newest_anchor().start;
-        let language = snapshot.language_at(suggestion_anchor);
-        let file = snapshot.file_at(suggestion_anchor).cloned();
-        self.editor_enabled = {
-            let file = file.as_ref();
-            Some(
-                file.map(|file| {
-                    all_language_settings(Some(file), cx)
-                        .edit_predictions_enabled_for_file(file, cx)
-                })
-                .unwrap_or(true),
-            )
-        };
-        self.editor_show_predictions = editor.edit_predictions_enabled();
-        self.edit_prediction_provider = editor.edit_prediction_provider();
-        self.language = language.cloned();
-        self.file = file;
-        self.editor_focus_handle = Some(editor.focus_handle(cx));
-
-        cx.notify();
-    }
-}
-
-impl StatusItemView for EditPredictionButton {
-    fn set_active_pane_item(
-        &mut self,
-        item: Option<&dyn ItemHandle>,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(editor) = item.and_then(|item| item.act_as::<Editor>(cx)) {
-            self.editor_subscription = Some((
-                cx.observe(&editor, Self::update_enabled),
-                editor.entity_id().as_u64() as usize,
-            ));
-            self.update_enabled(editor, cx);
-        } else {
-            self.language = None;
-            self.editor_subscription = None;
-            self.editor_enabled = None;
-        }
-        cx.notify();
-    }
-}
-
-impl SupermavenButtonStatus {
-    fn to_icon(&self) -> IconName {
-        match self {
-            SupermavenButtonStatus::Ready => IconName::Supermaven,
-            SupermavenButtonStatus::Errored(_) => IconName::SupermavenError,
-            SupermavenButtonStatus::NeedsActivation(_) => IconName::SupermavenInit,
-            SupermavenButtonStatus::Initializing => IconName::SupermavenInit,
-        }
-    }
-
-    fn to_tooltip(&self) -> String {
-        match self {
-            SupermavenButtonStatus::Ready => "Supermaven is ready".to_string(),
-            SupermavenButtonStatus::Errored(error) => format!("Supermaven error: {}", error),
-            SupermavenButtonStatus::NeedsActivation(_) => "Supermaven needs activation".to_string(),
-            SupermavenButtonStatus::Initializing => "Supermaven initializing".to_string(),
-        }
-    }
-
-    fn has_menu(&self) -> bool {
-        match self {
-            SupermavenButtonStatus::Ready | SupermavenButtonStatus::NeedsActivation(_) => true,
-            SupermavenButtonStatus::Errored(_) | SupermavenButtonStatus::Initializing => false,
-        }
-    }
-}
-
-async fn open_disabled_globs_setting_in_editor(
-    workspace: WeakEntity<Workspace>,
-    cx: &mut AsyncWindowContext,
-) -> Result<()> {
-    let settings_editor = workspace
-        .update_in(cx, |_, window, cx| {
-            create_and_open_local_file(paths::settings_file(), window, cx, || {
-                settings::initial_user_settings_content().as_ref().into()
-            })
-        })?
-        .await?
-        .downcast::<Editor>()
-        .unwrap();
-
-    settings_editor
-        .downgrade()
-        .update_in(cx, |item, window, cx| {
-            let text = item.buffer().read(cx).snapshot(cx).text();
-
-            let settings = cx.global::<SettingsStore>();
-
-            // Ensure that we always have "edit_predictions { "disabled_globs": [] }"
-            let edits = settings.edits_for_update(&text, |file| {
-                file.project
-                    .all_languages
-                    .edit_predictions
-                    .get_or_insert_with(Default::default)
-                    .disabled_globs
-                    .get_or_insert_with(Vec::new);
-            });
-
-            if !edits.is_empty() {
-                item.edit(
-                    edits
-                        .into_iter()
-                        .map(|(r, s)| (MultiBufferOffset(r.start)..MultiBufferOffset(r.end), s)),
-                    cx,
-                );
-            }
-
-            let text = item.buffer().read(cx).snapshot(cx).text();
-
-            static DISABLED_GLOBS_REGEX: LazyLock<Regex> = LazyLock::new(|| {
-                Regex::new(r#""disabled_globs":\s*\[\s*(?P<content>(?:.|\n)*?)\s*\]"#).unwrap()
-            });
-            // Only capture [...]
-            let range = DISABLED_GLOBS_REGEX.captures(&text).and_then(|captures| {
-                captures
-                    .name("content")
-                    .map(|inner_match| inner_match.start()..inner_match.end())
-            });
-            if let Some(range) = range {
-                let range = MultiBufferOffset(range.start)..MultiBufferOffset(range.end);
-                item.change_selections(
-                    SelectionEffects::scroll(Autoscroll::newest()),
-                    window,
-                    cx,
-                    |selections| {
-                        selections.select_ranges(vec![range]);
-                    },
-                );
-            }
-        })?;
-
-    anyhow::Ok(())
-}
-
-fn set_completion_provider(fs: Arc<dyn Fs>, cx: &mut App, provider: EditPredictionProvider) {
-    update_settings_file(fs, cx, move |settings, _| {
-        settings
-            .project
-            .all_languages
-            .features
-            .get_or_insert_default()
-            .edit_prediction_provider = Some(provider);
-    });
-}
-
-fn toggle_show_edit_predictions_for_language(
-    language: Arc<Language>,
-    fs: Arc<dyn Fs>,
-    cx: &mut App,
-) {
-    let show_edit_predictions =
-        all_language_settings(None, cx).show_edit_predictions(Some(&language), cx);
-    update_settings_file(fs, cx, move |settings, _| {
-        settings
-            .project
-            .all_languages
-            .languages
-            .0
-            .entry(language.name().0)
-            .or_default()
-            .show_edit_predictions = Some(!show_edit_predictions);
-    });
-}
-
-fn hide_copilot(fs: Arc<dyn Fs>, cx: &mut App) {
-    update_settings_file(fs, cx, move |settings, _| {
-        settings
-            .project
-            .all_languages
-            .features
-            .get_or_insert(Default::default())
-            .edit_prediction_provider = Some(EditPredictionProvider::None);
-    });
-}
-
-fn toggle_edit_prediction_mode(fs: Arc<dyn Fs>, mode: EditPredictionsMode, cx: &mut App) {
-    let settings = AllLanguageSettings::get_global(cx);
-    let current_mode = settings.edit_predictions_mode();
-
-    if current_mode != mode {
-        update_settings_file(fs, cx, move |settings, _cx| {
-            if let Some(edit_predictions) = settings.project.all_languages.edit_predictions.as_mut()
-            {
-                edit_predictions.mode = Some(mode);
-            } else {
-                settings.project.all_languages.edit_predictions =
-                    Some(settings::EditPredictionSettingsContent {
-                        mode: Some(mode),
-                        ..Default::default()
-                    });
-            }
-        });
-    }
-}
-
-fn render_zeta_tab_animation(cx: &App) -> impl IntoElement {
-    let tab = |n: u64, inverted: bool| {
-        let text_color = cx.theme().colors().text;
-
-        h_flex().child(
-            h_flex()
-                .text_size(TextSize::XSmall.rems(cx))
-                .text_color(text_color)
-                .child("tab")
-                .with_animation(
-                    ElementId::Integer(n),
-                    Animation::new(Duration::from_secs(3)).repeat(),
-                    move |tab, delta| {
-                        let n_f32 = n as f32;
-
-                        let offset = if inverted {
-                            0.2 * (4.0 - n_f32)
-                        } else {
-                            0.2 * n_f32
-                        };
-
-                        let phase = (delta - offset + 1.0) % 1.0;
-                        let pulse = if phase < 0.6 {
-                            let t = phase / 0.6;
-                            1.0 - (0.5 - t).abs() * 2.0
-                        } else {
-                            0.0
-                        };
-
-                        let eased = ease_in_out(pulse);
-                        let opacity = 0.1 + 0.5 * eased;
-
-                        tab.text_color(text_color.opacity(opacity))
-                    },
-                ),
-        )
-    };
-
-    let tab_sequence = |inverted: bool| {
-        h_flex()
-            .gap_1()
-            .child(tab(0, inverted))
-            .child(tab(1, inverted))
-            .child(tab(2, inverted))
-            .child(tab(3, inverted))
-            .child(tab(4, inverted))
-    };
-
-    h_flex()
-        .my_1p5()
-        .p_4()
-        .justify_center()
-        .gap_2()
-        .rounded_xs()
-        .border_1()
-        .border_dashed()
-        .border_color(cx.theme().colors().border)
-        .bg(gpui::pattern_slash(
-            cx.theme().colors().border.opacity(0.5),
-            1.,
-            8.,
-        ))
-        .child(tab_sequence(true))
-        .child(Icon::new(IconName::ZedPredict))
-        .child(tab_sequence(false))
-}
-
-fn copilot_settings_url(enterprise_uri: Option<&str>) -> String {
-    match enterprise_uri {
-        Some(uri) => {
-            format!("{}{}", uri.trim_end_matches('/'), COPILOT_SETTINGS_PATH)
-        }
-        None => COPILOT_SETTINGS_URL.to_string(),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use gpui::TestAppContext;
-
-    #[gpui::test]
-    async fn test_copilot_settings_url_with_enterprise_uri(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-        });
-
-        cx.update_global(|settings_store: &mut SettingsStore, cx| {
-            settings_store
-                .set_user_settings(
-                    r#"{"edit_predictions":{"copilot":{"enterprise_uri":"https://my-company.ghe.com"}}}"#,
-                    cx,
-                )
-                .unwrap();
-        });
-
-        let url = cx.update(|cx| {
-            let all_language_settings = all_language_settings(None, cx);
-            copilot_settings_url(
-                all_language_settings
-                    .edit_predictions
-                    .copilot
-                    .enterprise_uri
-                    .as_deref(),
-            )
-        });
-
-        assert_eq!(url, "https://my-company.ghe.com/settings/copilot");
-    }
-
-    #[gpui::test]
-    async fn test_copilot_settings_url_with_enterprise_uri_trailing_slash(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-        });
-
-        cx.update_global(|settings_store: &mut SettingsStore, cx| {
-            settings_store
-                .set_user_settings(
-                    r#"{"edit_predictions":{"copilot":{"enterprise_uri":"https://my-company.ghe.com/"}}}"#,
-                    cx,
-                )
-                .unwrap();
-        });
-
-        let url = cx.update(|cx| {
-            let all_language_settings = all_language_settings(None, cx);
-            copilot_settings_url(
-                all_language_settings
-                    .edit_predictions
-                    .copilot
-                    .enterprise_uri
-                    .as_deref(),
-            )
-        });
-
-        assert_eq!(url, "https://my-company.ghe.com/settings/copilot");
-    }
-
-    #[gpui::test]
-    async fn test_copilot_settings_url_without_enterprise_uri(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-        });
-
-        let url = cx.update(|cx| {
-            let all_language_settings = all_language_settings(None, cx);
-            copilot_settings_url(
-                all_language_settings
-                    .edit_predictions
-                    .copilot
-                    .enterprise_uri
-                    .as_deref(),
-            )
-        });
-
-        assert_eq!(url, "https://github.com/settings/copilot");
-    }
-}
diff --git a/crates/edit_prediction_ui/src/edit_prediction_context_view.rs b/crates/edit_prediction_ui/src/edit_prediction_context_view.rs
deleted file mode 100644
index 92d66d2bec..0000000000
--- a/crates/edit_prediction_ui/src/edit_prediction_context_view.rs
+++ /dev/null
@@ -1,370 +0,0 @@
-use std::{
-    any::TypeId,
-    collections::VecDeque,
-    ops::Add,
-    sync::Arc,
-    time::{Duration, Instant},
-};
-
-use anyhow::Result;
-use client::{Client, UserStore};
-use editor::{Editor, PathKey};
-use futures::StreamExt as _;
-use gpui::{
-    Animation, AnimationExt, App, AppContext as _, Context, Entity, EventEmitter, FocusHandle,
-    Focusable, InteractiveElement as _, IntoElement as _, ParentElement as _, SharedString,
-    Styled as _, Task, TextAlign, Window, actions, div, pulsating_between,
-};
-use multi_buffer::MultiBuffer;
-use project::Project;
-use text::Point;
-use ui::{
-    ButtonCommon, Clickable, Disableable, FluentBuilder as _, IconButton, IconName,
-    StyledTypography as _, h_flex, v_flex,
-};
-
-use edit_prediction::{
-    ContextRetrievalFinishedDebugEvent, ContextRetrievalStartedDebugEvent, DebugEvent,
-    EditPredictionStore,
-};
-use workspace::Item;
-
-pub struct EditPredictionContextView {
-    empty_focus_handle: FocusHandle,
-    project: Entity<Project>,
-    store: Entity<EditPredictionStore>,
-    runs: VecDeque<RetrievalRun>,
-    current_ix: usize,
-    _update_task: Task<Result<()>>,
-}
-
-#[derive(Debug)]
-struct RetrievalRun {
-    editor: Entity<Editor>,
-    started_at: Instant,
-    metadata: Vec<(&'static str, SharedString)>,
-    finished_at: Option<Instant>,
-}
-
-actions!(
-    dev,
-    [
-        /// Go to the previous context retrieval run
-        EditPredictionContextGoBack,
-        /// Go to the next context retrieval run
-        EditPredictionContextGoForward
-    ]
-);
-
-impl EditPredictionContextView {
-    pub fn new(
-        project: Entity<Project>,
-        client: &Arc<Client>,
-        user_store: &Entity<UserStore>,
-        window: &mut gpui::Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let store = EditPredictionStore::global(client, user_store, cx);
-
-        let mut debug_rx = store.update(cx, |store, cx| store.debug_info(&project, cx));
-        let _update_task = cx.spawn_in(window, async move |this, cx| {
-            while let Some(event) = debug_rx.next().await {
-                this.update_in(cx, |this, window, cx| {
-                    this.handle_store_event(event, window, cx)
-                })?;
-            }
-            Ok(())
-        });
-
-        Self {
-            empty_focus_handle: cx.focus_handle(),
-            project,
-            runs: VecDeque::new(),
-            current_ix: 0,
-            store,
-            _update_task,
-        }
-    }
-
-    fn handle_store_event(
-        &mut self,
-        event: DebugEvent,
-        window: &mut gpui::Window,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            DebugEvent::ContextRetrievalStarted(info) => {
-                if info.project_entity_id == self.project.entity_id() {
-                    self.handle_context_retrieval_started(info, window, cx);
-                }
-            }
-            DebugEvent::ContextRetrievalFinished(info) => {
-                if info.project_entity_id == self.project.entity_id() {
-                    self.handle_context_retrieval_finished(info, window, cx);
-                }
-            }
-            DebugEvent::EditPredictionStarted(_) => {}
-            DebugEvent::EditPredictionFinished(_) => {}
-        }
-    }
-
-    fn handle_context_retrieval_started(
-        &mut self,
-        info: ContextRetrievalStartedDebugEvent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self
-            .runs
-            .back()
-            .is_some_and(|run| run.finished_at.is_none())
-        {
-            self.runs.pop_back();
-        }
-
-        let multibuffer = cx.new(|_| MultiBuffer::new(language::Capability::ReadOnly));
-        let editor = cx
-            .new(|cx| Editor::for_multibuffer(multibuffer, Some(self.project.clone()), window, cx));
-
-        if self.runs.len() == 32 {
-            self.runs.pop_front();
-        }
-
-        self.runs.push_back(RetrievalRun {
-            editor,
-            started_at: info.timestamp,
-            finished_at: None,
-            metadata: Vec::new(),
-        });
-
-        cx.notify();
-    }
-
-    fn handle_context_retrieval_finished(
-        &mut self,
-        info: ContextRetrievalFinishedDebugEvent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(run) = self.runs.back_mut() else {
-            return;
-        };
-
-        run.finished_at = Some(info.timestamp);
-        run.metadata = info.metadata;
-
-        let related_files = self
-            .store
-            .read(cx)
-            .context_for_project_with_buffers(&self.project, cx)
-            .map_or(Vec::new(), |files| files.collect());
-
-        let editor = run.editor.clone();
-        let multibuffer = run.editor.read(cx).buffer().clone();
-
-        if self.current_ix + 2 == self.runs.len() {
-            self.current_ix += 1;
-        }
-
-        cx.spawn_in(window, async move |this, cx| {
-            let mut paths = Vec::new();
-            for (related_file, buffer) in related_files {
-                let point_ranges = related_file
-                    .excerpts
-                    .iter()
-                    .map(|excerpt| {
-                        Point::new(excerpt.row_range.start, 0)..Point::new(excerpt.row_range.end, 0)
-                    })
-                    .collect::<Vec<_>>();
-                cx.update(|_, cx| {
-                    let path = PathKey::for_buffer(&buffer, cx);
-                    paths.push((path, buffer, point_ranges));
-                })?;
-            }
-
-            multibuffer.update(cx, |multibuffer, cx| {
-                multibuffer.clear(cx);
-
-                for (path, buffer, ranges) in paths {
-                    multibuffer.set_excerpts_for_path(path, buffer, ranges, 0, cx);
-                }
-            })?;
-
-            editor.update_in(cx, |editor, window, cx| {
-                editor.move_to_beginning(&Default::default(), window, cx);
-            })?;
-
-            this.update(cx, |_, cx| cx.notify())
-        })
-        .detach();
-    }
-
-    fn handle_go_back(
-        &mut self,
-        _: &EditPredictionContextGoBack,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.current_ix = self.current_ix.saturating_sub(1);
-        cx.focus_self(window);
-        cx.notify();
-    }
-
-    fn handle_go_forward(
-        &mut self,
-        _: &EditPredictionContextGoForward,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.current_ix = self
-            .current_ix
-            .add(1)
-            .min(self.runs.len().saturating_sub(1));
-        cx.focus_self(window);
-        cx.notify();
-    }
-
-    fn render_informational_footer(
-        &self,
-        cx: &mut Context<'_, EditPredictionContextView>,
-    ) -> ui::Div {
-        let run = &self.runs[self.current_ix];
-        let new_run_started = self
-            .runs
-            .back()
-            .map_or(false, |latest_run| latest_run.finished_at.is_none());
-
-        h_flex()
-            .p_2()
-            .w_full()
-            .font_buffer(cx)
-            .text_xs()
-            .border_t_1()
-            .gap_2()
-            .child(v_flex().h_full().flex_1().child({
-                let t0 = run.started_at;
-                let mut table = ui::Table::<2>::new().width(ui::px(300.)).no_ui_font();
-                for (key, value) in &run.metadata {
-                    table = table.row([key.into_any_element(), value.clone().into_any_element()])
-                }
-                table = table.row([
-                    "Total Time".into_any_element(),
-                    format!("{} ms", (run.finished_at.unwrap_or(t0) - t0).as_millis())
-                        .into_any_element(),
-                ]);
-                table
-            }))
-            .child(
-                v_flex().h_full().text_align(TextAlign::Right).child(
-                    h_flex()
-                        .justify_end()
-                        .child(
-                            IconButton::new("go-back", IconName::ChevronLeft)
-                                .disabled(self.current_ix == 0 || self.runs.len() < 2)
-                                .tooltip(ui::Tooltip::for_action_title(
-                                    "Go to previous run",
-                                    &EditPredictionContextGoBack,
-                                ))
-                                .on_click(cx.listener(|this, _, window, cx| {
-                                    this.handle_go_back(&EditPredictionContextGoBack, window, cx);
-                                })),
-                        )
-                        .child(
-                            div()
-                                .child(format!("{}/{}", self.current_ix + 1, self.runs.len()))
-                                .map(|this| {
-                                    if new_run_started {
-                                        this.with_animation(
-                                            "pulsating-count",
-                                            Animation::new(Duration::from_secs(2))
-                                                .repeat()
-                                                .with_easing(pulsating_between(0.4, 0.8)),
-                                            |label, delta| label.opacity(delta),
-                                        )
-                                        .into_any_element()
-                                    } else {
-                                        this.into_any_element()
-                                    }
-                                }),
-                        )
-                        .child(
-                            IconButton::new("go-forward", IconName::ChevronRight)
-                                .disabled(self.current_ix + 1 == self.runs.len())
-                                .tooltip(ui::Tooltip::for_action_title(
-                                    "Go to next run",
-                                    &EditPredictionContextGoBack,
-                                ))
-                                .on_click(cx.listener(|this, _, window, cx| {
-                                    this.handle_go_forward(
-                                        &EditPredictionContextGoForward,
-                                        window,
-                                        cx,
-                                    );
-                                })),
-                        ),
-                ),
-            )
-    }
-}
-
-impl Focusable for EditPredictionContextView {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        self.runs
-            .get(self.current_ix)
-            .map(|run| run.editor.read(cx).focus_handle(cx))
-            .unwrap_or_else(|| self.empty_focus_handle.clone())
-    }
-}
-
-impl EventEmitter<()> for EditPredictionContextView {}
-
-impl Item for EditPredictionContextView {
-    type Event = ();
-
-    fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString {
-        "Edit Prediction Context".into()
-    }
-
-    fn buffer_kind(&self, _cx: &App) -> workspace::item::ItemBufferKind {
-        workspace::item::ItemBufferKind::Multibuffer
-    }
-
-    fn act_as_type<'a>(
-        &'a self,
-        type_id: TypeId,
-        self_handle: &'a Entity<Self>,
-        _: &'a App,
-    ) -> Option<gpui::AnyEntity> {
-        if type_id == TypeId::of::<Self>() {
-            Some(self_handle.clone().into())
-        } else if type_id == TypeId::of::<Editor>() {
-            Some(self.runs.get(self.current_ix)?.editor.clone().into())
-        } else {
-            None
-        }
-    }
-}
-
-impl gpui::Render for EditPredictionContextView {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl ui::IntoElement {
-        v_flex()
-            .key_context("EditPredictionContext")
-            .on_action(cx.listener(Self::handle_go_back))
-            .on_action(cx.listener(Self::handle_go_forward))
-            .size_full()
-            .map(|this| {
-                if self.runs.is_empty() {
-                    this.child(
-                        v_flex()
-                            .size_full()
-                            .justify_center()
-                            .items_center()
-                            .child("No retrieval runs yet"),
-                    )
-                } else {
-                    this.child(self.runs[self.current_ix].editor.clone())
-                        .child(self.render_informational_footer(cx))
-                }
-            })
-    }
-}
diff --git a/crates/edit_prediction_ui/src/edit_prediction_ui.rs b/crates/edit_prediction_ui/src/edit_prediction_ui.rs
deleted file mode 100644
index c177b5233c..0000000000
--- a/crates/edit_prediction_ui/src/edit_prediction_ui.rs
+++ /dev/null
@@ -1,128 +0,0 @@
-mod edit_prediction_button;
-mod edit_prediction_context_view;
-mod external_provider_api_token_modal;
-mod rate_prediction_modal;
-
-use std::any::{Any as _, TypeId};
-
-use command_palette_hooks::CommandPaletteFilter;
-use edit_prediction::{ResetOnboarding, Zeta2FeatureFlag};
-use edit_prediction_context_view::EditPredictionContextView;
-use feature_flags::FeatureFlagAppExt as _;
-use gpui::actions;
-use project::DisableAiSettings;
-use rate_prediction_modal::RatePredictionsModal;
-use settings::{Settings as _, SettingsStore};
-use ui::{App, prelude::*};
-use workspace::{SplitDirection, Workspace};
-
-pub use edit_prediction_button::{EditPredictionButton, ToggleMenu};
-pub use external_provider_api_token_modal::ExternalProviderApiKeyModal;
-
-use crate::rate_prediction_modal::PredictEditsRatePredictionsFeatureFlag;
-
-actions!(
-    dev,
-    [
-        /// Opens the edit prediction context view.
-        OpenEditPredictionContextView,
-    ]
-);
-
-actions!(
-    edit_prediction,
-    [
-        /// Opens the rate completions modal.
-        RatePredictions,
-    ]
-);
-
-pub fn init(cx: &mut App) {
-    feature_gate_predict_edits_actions(cx);
-
-    cx.observe_new(move |workspace: &mut Workspace, _, _cx| {
-        workspace.register_action(|workspace, _: &RatePredictions, window, cx| {
-            if cx.has_flag::<PredictEditsRatePredictionsFeatureFlag>() {
-                RatePredictionsModal::toggle(workspace, window, cx);
-            }
-        });
-
-        workspace.register_action_renderer(|div, _, _, cx| {
-            let has_flag = cx.has_flag::<Zeta2FeatureFlag>();
-            div.when(has_flag, |div| {
-                div.on_action(cx.listener(
-                    move |workspace, _: &OpenEditPredictionContextView, window, cx| {
-                        let project = workspace.project();
-                        workspace.split_item(
-                            SplitDirection::Right,
-                            Box::new(cx.new(|cx| {
-                                EditPredictionContextView::new(
-                                    project.clone(),
-                                    workspace.client(),
-                                    workspace.user_store(),
-                                    window,
-                                    cx,
-                                )
-                            })),
-                            window,
-                            cx,
-                        );
-                    },
-                ))
-            })
-        });
-    })
-    .detach();
-}
-
-fn feature_gate_predict_edits_actions(cx: &mut App) {
-    let rate_completion_action_types = [TypeId::of::<RatePredictions>()];
-    let reset_onboarding_action_types = [TypeId::of::<ResetOnboarding>()];
-    let all_action_types = [
-        TypeId::of::<RatePredictions>(),
-        TypeId::of::<edit_prediction::ResetOnboarding>(),
-        zed_actions::OpenZedPredictOnboarding.type_id(),
-        TypeId::of::<edit_prediction::ClearHistory>(),
-        TypeId::of::<rate_prediction_modal::ThumbsUpActivePrediction>(),
-        TypeId::of::<rate_prediction_modal::ThumbsDownActivePrediction>(),
-        TypeId::of::<rate_prediction_modal::NextEdit>(),
-        TypeId::of::<rate_prediction_modal::PreviousEdit>(),
-    ];
-
-    CommandPaletteFilter::update_global(cx, |filter, _cx| {
-        filter.hide_action_types(&rate_completion_action_types);
-        filter.hide_action_types(&reset_onboarding_action_types);
-        filter.hide_action_types(&[zed_actions::OpenZedPredictOnboarding.type_id()]);
-    });
-
-    cx.observe_global::<SettingsStore>(move |cx| {
-        let is_ai_disabled = DisableAiSettings::get_global(cx).disable_ai;
-        let has_feature_flag = cx.has_flag::<PredictEditsRatePredictionsFeatureFlag>();
-
-        CommandPaletteFilter::update_global(cx, |filter, _cx| {
-            if is_ai_disabled {
-                filter.hide_action_types(&all_action_types);
-            } else if has_feature_flag {
-                filter.show_action_types(&rate_completion_action_types);
-            } else {
-                filter.hide_action_types(&rate_completion_action_types);
-            }
-        });
-    })
-    .detach();
-
-    cx.observe_flag::<PredictEditsRatePredictionsFeatureFlag, _>(move |is_enabled, cx| {
-        if !DisableAiSettings::get_global(cx).disable_ai {
-            if is_enabled {
-                CommandPaletteFilter::update_global(cx, |filter, _cx| {
-                    filter.show_action_types(&rate_completion_action_types);
-                });
-            } else {
-                CommandPaletteFilter::update_global(cx, |filter, _cx| {
-                    filter.hide_action_types(&rate_completion_action_types);
-                });
-            }
-        }
-    })
-    .detach();
-}
diff --git a/crates/edit_prediction_ui/src/external_provider_api_token_modal.rs b/crates/edit_prediction_ui/src/external_provider_api_token_modal.rs
deleted file mode 100644
index bc312836e9..0000000000
--- a/crates/edit_prediction_ui/src/external_provider_api_token_modal.rs
+++ /dev/null
@@ -1,86 +0,0 @@
-use edit_prediction::EditPredictionStore;
-use gpui::{
-    DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, IntoElement, ParentElement, Render,
-};
-use ui::{Button, ButtonStyle, Clickable, Headline, HeadlineSize, prelude::*};
-use ui_input::InputField;
-use workspace::ModalView;
-
-pub struct ExternalProviderApiKeyModal {
-    api_key_input: Entity<InputField>,
-    focus_handle: FocusHandle,
-    on_confirm: Box<dyn Fn(Option<String>, &mut EditPredictionStore, &mut App)>,
-}
-
-impl ExternalProviderApiKeyModal {
-    pub fn new(
-        window: &mut Window,
-        cx: &mut Context<Self>,
-        on_confirm: impl Fn(Option<String>, &mut EditPredictionStore, &mut App) + 'static,
-    ) -> Self {
-        let api_key_input = cx.new(|cx| InputField::new(window, cx, "Enter your API key"));
-
-        Self {
-            api_key_input,
-            focus_handle: cx.focus_handle(),
-            on_confirm: Box::new(on_confirm),
-        }
-    }
-
-    fn cancel(&mut self, _: &menu::Cancel, _window: &mut Window, cx: &mut Context<Self>) {
-        cx.emit(DismissEvent);
-    }
-
-    fn confirm(&mut self, _: &menu::Confirm, _window: &mut Window, cx: &mut Context<Self>) {
-        let api_key = self.api_key_input.read(cx).text(cx);
-        let api_key = (!api_key.trim().is_empty()).then_some(api_key);
-
-        if let Some(ep_store) = EditPredictionStore::try_global(cx) {
-            ep_store.update(cx, |ep_store, cx| (self.on_confirm)(api_key, ep_store, cx))
-        }
-
-        cx.emit(DismissEvent);
-    }
-}
-
-impl EventEmitter<DismissEvent> for ExternalProviderApiKeyModal {}
-
-impl ModalView for ExternalProviderApiKeyModal {}
-
-impl Focusable for ExternalProviderApiKeyModal {
-    fn focus_handle(&self, _cx: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl Render for ExternalProviderApiKeyModal {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .key_context("ExternalApiKeyModal")
-            .on_action(cx.listener(Self::cancel))
-            .on_action(cx.listener(Self::confirm))
-            .elevation_2(cx)
-            .w(px(400.))
-            .p_4()
-            .gap_3()
-            .child(Headline::new("API Token").size(HeadlineSize::Small))
-            .child(self.api_key_input.clone())
-            .child(
-                h_flex()
-                    .justify_end()
-                    .gap_2()
-                    .child(Button::new("cancel", "Cancel").on_click(cx.listener(
-                        |_, _, _window, cx| {
-                            cx.emit(DismissEvent);
-                        },
-                    )))
-                    .child(
-                        Button::new("save", "Save")
-                            .style(ButtonStyle::Filled)
-                            .on_click(cx.listener(|this, _, window, cx| {
-                                this.confirm(&menu::Confirm, window, cx);
-                            })),
-                    ),
-            )
-    }
-}
diff --git a/crates/edit_prediction_ui/src/rate_prediction_modal.rs b/crates/edit_prediction_ui/src/rate_prediction_modal.rs
deleted file mode 100644
index 54933fbf90..0000000000
--- a/crates/edit_prediction_ui/src/rate_prediction_modal.rs
+++ /dev/null
@@ -1,905 +0,0 @@
-use buffer_diff::{BufferDiff, BufferDiffSnapshot};
-use edit_prediction::{EditPrediction, EditPredictionRating, EditPredictionStore};
-use editor::{Editor, ExcerptRange, MultiBuffer};
-use feature_flags::FeatureFlag;
-use gpui::{
-    App, BorderStyle, DismissEvent, EdgesRefinement, Entity, EventEmitter, FocusHandle, Focusable,
-    Length, StyleRefinement, TextStyleRefinement, Window, actions, prelude::*,
-};
-use language::{LanguageRegistry, Point, language_settings};
-use markdown::{Markdown, MarkdownStyle};
-use settings::Settings as _;
-use std::{fmt::Write, sync::Arc, time::Duration};
-use theme::ThemeSettings;
-use ui::{KeyBinding, List, ListItem, ListItemSpacing, Tooltip, prelude::*};
-use workspace::{ModalView, Workspace};
-
-actions!(
-    zeta,
-    [
-        /// Rates the active completion with a thumbs up.
-        ThumbsUpActivePrediction,
-        /// Rates the active completion with a thumbs down.
-        ThumbsDownActivePrediction,
-        /// Navigates to the next edit in the completion history.
-        NextEdit,
-        /// Navigates to the previous edit in the completion history.
-        PreviousEdit,
-        /// Focuses on the completions list.
-        FocusPredictions,
-        /// Previews the selected completion.
-        PreviewPrediction,
-    ]
-);
-
-pub struct PredictEditsRatePredictionsFeatureFlag;
-
-impl FeatureFlag for PredictEditsRatePredictionsFeatureFlag {
-    const NAME: &'static str = "predict-edits-rate-completions";
-}
-
-pub struct RatePredictionsModal {
-    ep_store: Entity<EditPredictionStore>,
-    language_registry: Arc<LanguageRegistry>,
-    active_prediction: Option<ActivePrediction>,
-    selected_index: usize,
-    diff_editor: Entity<Editor>,
-    focus_handle: FocusHandle,
-    _subscription: gpui::Subscription,
-    current_view: RatePredictionView,
-}
-
-struct ActivePrediction {
-    prediction: EditPrediction,
-    feedback_editor: Entity<Editor>,
-    formatted_inputs: Entity<Markdown>,
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, PartialOrd)]
-enum RatePredictionView {
-    SuggestedEdits,
-    RawInput,
-}
-
-impl RatePredictionView {
-    pub fn name(&self) -> &'static str {
-        match self {
-            Self::SuggestedEdits => "Suggested Edits",
-            Self::RawInput => "Recorded Events & Input",
-        }
-    }
-}
-
-impl RatePredictionsModal {
-    pub fn toggle(workspace: &mut Workspace, window: &mut Window, cx: &mut Context<Workspace>) {
-        if let Some(ep_store) = EditPredictionStore::try_global(cx) {
-            let language_registry = workspace.app_state().languages.clone();
-            workspace.toggle_modal(window, cx, |window, cx| {
-                RatePredictionsModal::new(ep_store, language_registry, window, cx)
-            });
-
-            telemetry::event!("Rate Prediction Modal Open", source = "Edit Prediction");
-        }
-    }
-
-    pub fn new(
-        ep_store: Entity<EditPredictionStore>,
-        language_registry: Arc<LanguageRegistry>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let subscription = cx.observe(&ep_store, |_, _, cx| cx.notify());
-
-        Self {
-            ep_store,
-            language_registry,
-            selected_index: 0,
-            focus_handle: cx.focus_handle(),
-            active_prediction: None,
-            _subscription: subscription,
-            diff_editor: cx.new(|cx| {
-                let multibuffer = cx.new(|_| MultiBuffer::new(language::Capability::ReadOnly));
-                let mut editor = Editor::for_multibuffer(multibuffer, None, window, cx);
-                editor.disable_inline_diagnostics();
-                editor.set_expand_all_diff_hunks(cx);
-                editor.set_show_git_diff_gutter(false, cx);
-                editor
-            }),
-            current_view: RatePredictionView::SuggestedEdits,
-        }
-    }
-
-    fn dismiss(&mut self, _: &menu::Cancel, _: &mut Window, cx: &mut Context<Self>) {
-        cx.emit(DismissEvent);
-    }
-
-    fn select_next(&mut self, _: &menu::SelectNext, _: &mut Window, cx: &mut Context<Self>) {
-        self.selected_index += 1;
-        self.selected_index = usize::min(
-            self.selected_index,
-            self.ep_store.read(cx).shown_predictions().count(),
-        );
-        cx.notify();
-    }
-
-    fn select_previous(
-        &mut self,
-        _: &menu::SelectPrevious,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.selected_index = self.selected_index.saturating_sub(1);
-        cx.notify();
-    }
-
-    fn select_next_edit(&mut self, _: &NextEdit, _: &mut Window, cx: &mut Context<Self>) {
-        let next_index = self
-            .ep_store
-            .read(cx)
-            .shown_predictions()
-            .skip(self.selected_index)
-            .enumerate()
-            .skip(1) // Skip straight to the next item
-            .find(|(_, completion)| !completion.edits.is_empty())
-            .map(|(ix, _)| ix + self.selected_index);
-
-        if let Some(next_index) = next_index {
-            self.selected_index = next_index;
-            cx.notify();
-        }
-    }
-
-    fn select_prev_edit(&mut self, _: &PreviousEdit, _: &mut Window, cx: &mut Context<Self>) {
-        let ep_store = self.ep_store.read(cx);
-        let completions_len = ep_store.shown_completions_len();
-
-        let prev_index = self
-            .ep_store
-            .read(cx)
-            .shown_predictions()
-            .rev()
-            .skip((completions_len - 1) - self.selected_index)
-            .enumerate()
-            .skip(1) // Skip straight to the previous item
-            .find(|(_, completion)| !completion.edits.is_empty())
-            .map(|(ix, _)| self.selected_index - ix);
-
-        if let Some(prev_index) = prev_index {
-            self.selected_index = prev_index;
-            cx.notify();
-        }
-        cx.notify();
-    }
-
-    fn select_first(&mut self, _: &menu::SelectFirst, _: &mut Window, cx: &mut Context<Self>) {
-        self.selected_index = 0;
-        cx.notify();
-    }
-
-    fn select_last(&mut self, _: &menu::SelectLast, _window: &mut Window, cx: &mut Context<Self>) {
-        self.selected_index = self.ep_store.read(cx).shown_completions_len() - 1;
-        cx.notify();
-    }
-
-    pub fn thumbs_up_active(
-        &mut self,
-        _: &ThumbsUpActivePrediction,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.ep_store.update(cx, |ep_store, cx| {
-            if let Some(active) = &self.active_prediction {
-                ep_store.rate_prediction(
-                    &active.prediction,
-                    EditPredictionRating::Positive,
-                    active.feedback_editor.read(cx).text(cx),
-                    cx,
-                );
-            }
-        });
-
-        let current_completion = self
-            .active_prediction
-            .as_ref()
-            .map(|completion| completion.prediction.clone());
-        self.select_completion(current_completion, false, window, cx);
-        self.select_next_edit(&Default::default(), window, cx);
-        self.confirm(&Default::default(), window, cx);
-
-        cx.notify();
-    }
-
-    pub fn thumbs_down_active(
-        &mut self,
-        _: &ThumbsDownActivePrediction,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(active) = &self.active_prediction {
-            if active.feedback_editor.read(cx).text(cx).is_empty() {
-                return;
-            }
-
-            self.ep_store.update(cx, |ep_store, cx| {
-                ep_store.rate_prediction(
-                    &active.prediction,
-                    EditPredictionRating::Negative,
-                    active.feedback_editor.read(cx).text(cx),
-                    cx,
-                );
-            });
-        }
-
-        let current_completion = self
-            .active_prediction
-            .as_ref()
-            .map(|completion| completion.prediction.clone());
-        self.select_completion(current_completion, false, window, cx);
-        self.select_next_edit(&Default::default(), window, cx);
-        self.confirm(&Default::default(), window, cx);
-
-        cx.notify();
-    }
-
-    fn focus_completions(
-        &mut self,
-        _: &FocusPredictions,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        cx.focus_self(window);
-        cx.notify();
-    }
-
-    fn preview_completion(
-        &mut self,
-        _: &PreviewPrediction,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let completion = self
-            .ep_store
-            .read(cx)
-            .shown_predictions()
-            .skip(self.selected_index)
-            .take(1)
-            .next()
-            .cloned();
-
-        self.select_completion(completion, false, window, cx);
-    }
-
-    fn confirm(&mut self, _: &menu::Confirm, window: &mut Window, cx: &mut Context<Self>) {
-        let completion = self
-            .ep_store
-            .read(cx)
-            .shown_predictions()
-            .skip(self.selected_index)
-            .take(1)
-            .next()
-            .cloned();
-
-        self.select_completion(completion, true, window, cx);
-    }
-
-    pub fn select_completion(
-        &mut self,
-        prediction: Option<EditPrediction>,
-        focus: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        // Avoid resetting completion rating if it's already selected.
-        if let Some(prediction) = prediction {
-            self.selected_index = self
-                .ep_store
-                .read(cx)
-                .shown_predictions()
-                .enumerate()
-                .find(|(_, completion_b)| prediction.id == completion_b.id)
-                .map(|(ix, _)| ix)
-                .unwrap_or(self.selected_index);
-            cx.notify();
-
-            if let Some(prev_prediction) = self.active_prediction.as_ref()
-                && prediction.id == prev_prediction.prediction.id
-            {
-                if focus {
-                    window.focus(&prev_prediction.feedback_editor.focus_handle(cx));
-                }
-                return;
-            }
-
-            self.diff_editor.update(cx, |editor, cx| {
-                let new_buffer = prediction.edit_preview.build_result_buffer(cx);
-                let new_buffer_snapshot = new_buffer.read(cx).snapshot();
-                let old_buffer_snapshot = prediction.snapshot.clone();
-                let new_buffer_id = new_buffer_snapshot.remote_id();
-
-                let range = prediction
-                    .edit_preview
-                    .compute_visible_range(&prediction.edits)
-                    .unwrap_or(Point::zero()..Point::zero());
-                let start = Point::new(range.start.row.saturating_sub(5), 0);
-                let end = Point::new(range.end.row + 5, 0).min(new_buffer_snapshot.max_point());
-
-                let diff = cx.new::<BufferDiff>(|cx| {
-                    let diff_snapshot = BufferDiffSnapshot::new_with_base_buffer(
-                        new_buffer_snapshot.text.clone(),
-                        Some(old_buffer_snapshot.text().into()),
-                        old_buffer_snapshot.clone(),
-                        cx,
-                    );
-                    let diff = BufferDiff::new(&new_buffer_snapshot, cx);
-                    cx.spawn(async move |diff, cx| {
-                        let diff_snapshot = diff_snapshot.await;
-                        diff.update(cx, |diff, cx| {
-                            diff.set_snapshot(diff_snapshot, &new_buffer_snapshot.text, cx);
-                        })
-                    })
-                    .detach();
-                    diff
-                });
-
-                editor.disable_header_for_buffer(new_buffer_id, cx);
-                editor.buffer().update(cx, |multibuffer, cx| {
-                    multibuffer.clear(cx);
-                    multibuffer.push_excerpts(
-                        new_buffer,
-                        vec![ExcerptRange {
-                            context: start..end,
-                            primary: start..end,
-                        }],
-                        cx,
-                    );
-                    multibuffer.add_diff(diff, cx);
-                });
-            });
-
-            let mut formatted_inputs = String::new();
-
-            write!(&mut formatted_inputs, "## Events\n\n").unwrap();
-
-            for event in &prediction.inputs.events {
-                formatted_inputs.push_str("```diff\n");
-                zeta_prompt::write_event(&mut formatted_inputs, event.as_ref());
-                formatted_inputs.push_str("```\n\n");
-            }
-
-            write!(&mut formatted_inputs, "## Related files\n\n").unwrap();
-
-            for included_file in prediction.inputs.related_files.as_ref() {
-                write!(
-                    &mut formatted_inputs,
-                    "### {}\n\n",
-                    included_file.path.display()
-                )
-                .unwrap();
-
-                for excerpt in included_file.excerpts.iter() {
-                    write!(
-                        &mut formatted_inputs,
-                        "```{}\n{}\n```\n",
-                        included_file.path.display(),
-                        excerpt.text
-                    )
-                    .unwrap();
-                }
-            }
-
-            write!(&mut formatted_inputs, "## Cursor Excerpt\n\n").unwrap();
-
-            writeln!(
-                &mut formatted_inputs,
-                "```{}\n{}<CURSOR>{}\n```\n",
-                prediction.inputs.cursor_path.display(),
-                &prediction.inputs.cursor_excerpt[..prediction.inputs.cursor_offset_in_excerpt],
-                &prediction.inputs.cursor_excerpt[prediction.inputs.cursor_offset_in_excerpt..],
-            )
-            .unwrap();
-
-            self.active_prediction = Some(ActivePrediction {
-                prediction,
-                feedback_editor: cx.new(|cx| {
-                    let mut editor = Editor::multi_line(window, cx);
-                    editor.disable_scrollbars_and_minimap(window, cx);
-                    editor.set_soft_wrap_mode(language_settings::SoftWrap::EditorWidth, cx);
-                    editor.set_show_line_numbers(false, cx);
-                    editor.set_show_git_diff_gutter(false, cx);
-                    editor.set_show_code_actions(false, cx);
-                    editor.set_show_runnables(false, cx);
-                    editor.set_show_breakpoints(false, cx);
-                    editor.set_show_wrap_guides(false, cx);
-                    editor.set_show_indent_guides(false, cx);
-                    editor.set_show_edit_predictions(Some(false), window, cx);
-                    editor.set_placeholder_text("Add your feedback…", window, cx);
-                    if focus {
-                        cx.focus_self(window);
-                    }
-                    editor
-                }),
-                formatted_inputs: cx.new(|cx| {
-                    Markdown::new(
-                        formatted_inputs.into(),
-                        Some(self.language_registry.clone()),
-                        None,
-                        cx,
-                    )
-                }),
-            });
-        } else {
-            self.active_prediction = None;
-        }
-
-        cx.notify();
-    }
-
-    fn render_view_nav(&self, cx: &Context<Self>) -> impl IntoElement {
-        h_flex()
-            .h_8()
-            .px_1()
-            .border_b_1()
-            .border_color(cx.theme().colors().border)
-            .bg(cx.theme().colors().elevated_surface_background)
-            .gap_1()
-            .child(
-                Button::new(
-                    ElementId::Name("suggested-edits".into()),
-                    RatePredictionView::SuggestedEdits.name(),
-                )
-                .label_size(LabelSize::Small)
-                .on_click(cx.listener(move |this, _, _window, cx| {
-                    this.current_view = RatePredictionView::SuggestedEdits;
-                    cx.notify();
-                }))
-                .toggle_state(self.current_view == RatePredictionView::SuggestedEdits),
-            )
-            .child(
-                Button::new(
-                    ElementId::Name("raw-input".into()),
-                    RatePredictionView::RawInput.name(),
-                )
-                .label_size(LabelSize::Small)
-                .on_click(cx.listener(move |this, _, _window, cx| {
-                    this.current_view = RatePredictionView::RawInput;
-                    cx.notify();
-                }))
-                .toggle_state(self.current_view == RatePredictionView::RawInput),
-            )
-    }
-
-    fn render_suggested_edits(&self, cx: &mut Context<Self>) -> Option<gpui::Stateful<Div>> {
-        let bg_color = cx.theme().colors().editor_background;
-        Some(
-            div()
-                .id("diff")
-                .p_4()
-                .size_full()
-                .bg(bg_color)
-                .overflow_scroll()
-                .whitespace_nowrap()
-                .child(self.diff_editor.clone()),
-        )
-    }
-
-    fn render_raw_input(
-        &self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<gpui::Stateful<Div>> {
-        let theme_settings = ThemeSettings::get_global(cx);
-        let buffer_font_size = theme_settings.buffer_font_size(cx);
-
-        Some(
-            v_flex()
-                .size_full()
-                .overflow_hidden()
-                .relative()
-                .child(
-                    div()
-                        .id("raw-input")
-                        .py_4()
-                        .px_6()
-                        .size_full()
-                        .bg(cx.theme().colors().editor_background)
-                        .overflow_scroll()
-                        .child(if let Some(active_prediction) = &self.active_prediction {
-                            markdown::MarkdownElement::new(
-                                active_prediction.formatted_inputs.clone(),
-                                MarkdownStyle {
-                                    base_text_style: window.text_style(),
-                                    syntax: cx.theme().syntax().clone(),
-                                    code_block: StyleRefinement {
-                                        text: Some(TextStyleRefinement {
-                                            font_family: Some(
-                                                theme_settings.buffer_font.family.clone(),
-                                            ),
-                                            font_size: Some(buffer_font_size.into()),
-                                            ..Default::default()
-                                        }),
-                                        padding: EdgesRefinement {
-                                            top: Some(DefiniteLength::Absolute(
-                                                AbsoluteLength::Pixels(px(8.)),
-                                            )),
-                                            left: Some(DefiniteLength::Absolute(
-                                                AbsoluteLength::Pixels(px(8.)),
-                                            )),
-                                            right: Some(DefiniteLength::Absolute(
-                                                AbsoluteLength::Pixels(px(8.)),
-                                            )),
-                                            bottom: Some(DefiniteLength::Absolute(
-                                                AbsoluteLength::Pixels(px(8.)),
-                                            )),
-                                        },
-                                        margin: EdgesRefinement {
-                                            top: Some(Length::Definite(px(8.).into())),
-                                            left: Some(Length::Definite(px(0.).into())),
-                                            right: Some(Length::Definite(px(0.).into())),
-                                            bottom: Some(Length::Definite(px(12.).into())),
-                                        },
-                                        border_style: Some(BorderStyle::Solid),
-                                        border_widths: EdgesRefinement {
-                                            top: Some(AbsoluteLength::Pixels(px(1.))),
-                                            left: Some(AbsoluteLength::Pixels(px(1.))),
-                                            right: Some(AbsoluteLength::Pixels(px(1.))),
-                                            bottom: Some(AbsoluteLength::Pixels(px(1.))),
-                                        },
-                                        border_color: Some(cx.theme().colors().border_variant),
-                                        background: Some(
-                                            cx.theme().colors().editor_background.into(),
-                                        ),
-                                        ..Default::default()
-                                    },
-                                    ..Default::default()
-                                },
-                            )
-                            .into_any_element()
-                        } else {
-                            div()
-                                .child("No active completion".to_string())
-                                .into_any_element()
-                        }),
-                )
-                .id("raw-input-view"),
-        )
-    }
-
-    fn render_active_completion(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<impl IntoElement> {
-        let active_prediction = self.active_prediction.as_ref()?;
-        let completion_id = active_prediction.prediction.id.clone();
-        let focus_handle = &self.focus_handle(cx);
-
-        let border_color = cx.theme().colors().border;
-        let bg_color = cx.theme().colors().editor_background;
-
-        let rated = self.ep_store.read(cx).is_prediction_rated(&completion_id);
-        let feedback_empty = active_prediction
-            .feedback_editor
-            .read(cx)
-            .text(cx)
-            .is_empty();
-
-        let label_container = h_flex().pl_1().gap_1p5();
-
-        Some(
-            v_flex()
-                .size_full()
-                .overflow_hidden()
-                .relative()
-                .child(
-                    v_flex()
-                        .size_full()
-                        .overflow_hidden()
-                        .relative()
-                        .child(self.render_view_nav(cx))
-                        .when_some(
-                            match self.current_view {
-                                RatePredictionView::SuggestedEdits => {
-                                    self.render_suggested_edits(cx)
-                                }
-                                RatePredictionView::RawInput => self.render_raw_input(window, cx),
-                            },
-                            |this, element| this.child(element),
-                        ),
-                )
-                .when(!rated, |this| {
-                    this.child(
-                        h_flex()
-                            .p_2()
-                            .gap_2()
-                            .border_y_1()
-                            .border_color(border_color)
-                            .child(
-                                Icon::new(IconName::Info)
-                                    .size(IconSize::XSmall)
-                                    .color(Color::Muted),
-                            )
-                            .child(
-                                div().w_full().pr_2().flex_wrap().child(
-                                    Label::new(concat!(
-                                        "Explain why this completion is good or bad. ",
-                                        "If it's negative, describe what you expected instead."
-                                    ))
-                                    .size(LabelSize::Small)
-                                    .color(Color::Muted),
-                                ),
-                            ),
-                    )
-                })
-                .when(!rated, |this| {
-                    this.child(
-                        div()
-                            .h_40()
-                            .pt_1()
-                            .bg(bg_color)
-                            .child(active_prediction.feedback_editor.clone()),
-                    )
-                })
-                .child(
-                    h_flex()
-                        .p_1()
-                        .h_8()
-                        .max_h_8()
-                        .border_t_1()
-                        .border_color(border_color)
-                        .max_w_full()
-                        .justify_between()
-                        .children(if rated {
-                            Some(
-                                label_container
-                                    .child(
-                                        Icon::new(IconName::Check)
-                                            .size(IconSize::Small)
-                                            .color(Color::Success),
-                                    )
-                                    .child(Label::new("Rated completion.").color(Color::Muted)),
-                            )
-                        } else if active_prediction.prediction.edits.is_empty() {
-                            Some(
-                                label_container
-                                    .child(
-                                        Icon::new(IconName::Warning)
-                                            .size(IconSize::Small)
-                                            .color(Color::Warning),
-                                    )
-                                    .child(Label::new("No edits produced.").color(Color::Muted)),
-                            )
-                        } else {
-                            Some(label_container)
-                        })
-                        .child(
-                            h_flex()
-                                .gap_1()
-                                .child(
-                                    Button::new("bad", "Bad Prediction")
-                                        .icon(IconName::ThumbsDown)
-                                        .icon_size(IconSize::Small)
-                                        .icon_position(IconPosition::Start)
-                                        .disabled(rated || feedback_empty)
-                                        .when(feedback_empty, |this| {
-                                            this.tooltip(Tooltip::text(
-                                                "Explain what's bad about it before reporting it",
-                                            ))
-                                        })
-                                        .key_binding(KeyBinding::for_action_in(
-                                            &ThumbsDownActivePrediction,
-                                            focus_handle,
-                                            cx,
-                                        ))
-                                        .on_click(cx.listener(move |this, _, window, cx| {
-                                            if this.active_prediction.is_some() {
-                                                this.thumbs_down_active(
-                                                    &ThumbsDownActivePrediction,
-                                                    window,
-                                                    cx,
-                                                );
-                                            }
-                                        })),
-                                )
-                                .child(
-                                    Button::new("good", "Good Prediction")
-                                        .icon(IconName::ThumbsUp)
-                                        .icon_size(IconSize::Small)
-                                        .icon_position(IconPosition::Start)
-                                        .disabled(rated)
-                                        .key_binding(KeyBinding::for_action_in(
-                                            &ThumbsUpActivePrediction,
-                                            focus_handle,
-                                            cx,
-                                        ))
-                                        .on_click(cx.listener(move |this, _, window, cx| {
-                                            if this.active_prediction.is_some() {
-                                                this.thumbs_up_active(
-                                                    &ThumbsUpActivePrediction,
-                                                    window,
-                                                    cx,
-                                                );
-                                            }
-                                        })),
-                                ),
-                        ),
-                ),
-        )
-    }
-
-    fn render_shown_completions(&self, cx: &Context<Self>) -> impl Iterator<Item = ListItem> {
-        self.ep_store
-            .read(cx)
-            .shown_predictions()
-            .cloned()
-            .enumerate()
-            .map(|(index, completion)| {
-                let selected = self
-                    .active_prediction
-                    .as_ref()
-                    .is_some_and(|selected| selected.prediction.id == completion.id);
-                let rated = self.ep_store.read(cx).is_prediction_rated(&completion.id);
-
-                let (icon_name, icon_color, tooltip_text) =
-                    match (rated, completion.edits.is_empty()) {
-                        (true, _) => (IconName::Check, Color::Success, "Rated Prediction"),
-                        (false, true) => (IconName::File, Color::Muted, "No Edits Produced"),
-                        (false, false) => (IconName::FileDiff, Color::Accent, "Edits Available"),
-                    };
-
-                let file = completion.buffer.read(cx).file();
-                let file_name = file
-                    .as_ref()
-                    .map_or(SharedString::new_static("untitled"), |file| {
-                        file.file_name(cx).to_string().into()
-                    });
-                let file_path = file.map(|file| file.path().as_unix_str().to_string());
-
-                ListItem::new(completion.id.clone())
-                    .inset(true)
-                    .spacing(ListItemSpacing::Sparse)
-                    .focused(index == self.selected_index)
-                    .toggle_state(selected)
-                    .child(
-                        h_flex()
-                            .id("completion-content")
-                            .gap_3()
-                            .child(Icon::new(icon_name).color(icon_color).size(IconSize::Small))
-                            .child(
-                                v_flex()
-                                    .child(
-                                        h_flex()
-                                            .gap_1()
-                                            .child(Label::new(file_name).size(LabelSize::Small))
-                                            .when_some(file_path, |this, p| {
-                                                this.child(
-                                                    Label::new(p)
-                                                        .size(LabelSize::Small)
-                                                        .color(Color::Muted),
-                                                )
-                                            }),
-                                    )
-                                    .child(
-                                        Label::new(format!(
-                                            "{} ago, {:.2?}",
-                                            format_time_ago(
-                                                completion.response_received_at.elapsed()
-                                            ),
-                                            completion.latency()
-                                        ))
-                                        .color(Color::Muted)
-                                        .size(LabelSize::XSmall),
-                                    ),
-                            ),
-                    )
-                    .tooltip(Tooltip::text(tooltip_text))
-                    .on_click(cx.listener(move |this, _, window, cx| {
-                        this.select_completion(Some(completion.clone()), true, window, cx);
-                    }))
-            })
-    }
-}
-
-impl Render for RatePredictionsModal {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let border_color = cx.theme().colors().border;
-
-        h_flex()
-            .key_context("RatePredictionModal")
-            .track_focus(&self.focus_handle)
-            .on_action(cx.listener(Self::dismiss))
-            .on_action(cx.listener(Self::confirm))
-            .on_action(cx.listener(Self::select_previous))
-            .on_action(cx.listener(Self::select_prev_edit))
-            .on_action(cx.listener(Self::select_next))
-            .on_action(cx.listener(Self::select_next_edit))
-            .on_action(cx.listener(Self::select_first))
-            .on_action(cx.listener(Self::select_last))
-            .on_action(cx.listener(Self::thumbs_up_active))
-            .on_action(cx.listener(Self::thumbs_down_active))
-            .on_action(cx.listener(Self::focus_completions))
-            .on_action(cx.listener(Self::preview_completion))
-            .bg(cx.theme().colors().elevated_surface_background)
-            .border_1()
-            .border_color(border_color)
-            .w(window.viewport_size().width - px(320.))
-            .h(window.viewport_size().height - px(300.))
-            .rounded_lg()
-            .shadow_lg()
-            .child(
-                v_flex()
-                    .w_72()
-                    .h_full()
-                    .border_r_1()
-                    .border_color(border_color)
-                    .flex_shrink_0()
-                    .overflow_hidden()
-                    .child(
-                        h_flex()
-                            .h_8()
-                            .px_2()
-                            .justify_between()
-                            .border_b_1()
-                            .border_color(border_color)
-                            .child(Icon::new(IconName::ZedPredict).size(IconSize::Small))
-                            .child(
-                                Label::new("From most recent to oldest")
-                                    .color(Color::Muted)
-                                    .size(LabelSize::Small),
-                            ),
-                    )
-                    .child(
-                        div()
-                            .id("completion_list")
-                            .p_0p5()
-                            .h_full()
-                            .overflow_y_scroll()
-                            .child(
-                                List::new()
-                                    .empty_message(
-                                        div()
-                                            .p_2()
-                                            .child(
-                                                Label::new(concat!(
-                                                    "No completions yet. ",
-                                                    "Use the editor to generate some, ",
-                                                    "and make sure to rate them!"
-                                                ))
-                                                .color(Color::Muted),
-                                            )
-                                            .into_any_element(),
-                                    )
-                                    .children(self.render_shown_completions(cx)),
-                            ),
-                    ),
-            )
-            .children(self.render_active_completion(window, cx))
-            .on_mouse_down_out(cx.listener(|_, _, _, cx| cx.emit(DismissEvent)))
-    }
-}
-
-impl EventEmitter<DismissEvent> for RatePredictionsModal {}
-
-impl Focusable for RatePredictionsModal {
-    fn focus_handle(&self, _cx: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl ModalView for RatePredictionsModal {}
-
-fn format_time_ago(elapsed: Duration) -> String {
-    let seconds = elapsed.as_secs();
-    if seconds < 120 {
-        "1 minute".to_string()
-    } else if seconds < 3600 {
-        format!("{} minutes", seconds / 60)
-    } else if seconds < 7200 {
-        "1 hour".to_string()
-    } else if seconds < 86400 {
-        format!("{} hours", seconds / 3600)
-    } else if seconds < 172800 {
-        "1 day".to_string()
-    } else {
-        format!("{} days", seconds / 86400)
-    }
-}
diff --git a/crates/editor/Cargo.toml b/crates/editor/Cargo.toml
deleted file mode 100644
index f3ed28ab05..0000000000
--- a/crates/editor/Cargo.toml
+++ /dev/null
@@ -1,138 +0,0 @@
-[package]
-name = "editor"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/editor.rs"
-doctest = false
-
-[features]
-test-support = [
-    "text/test-support",
-    "language/test-support",
-    "gpui/test-support",
-    "multi_buffer/test-support",
-    "project/test-support",
-    "theme/test-support",
-    "util/test-support",
-    "workspace/test-support",
-    "tree-sitter-c",
-    "tree-sitter-rust",
-    "tree-sitter-typescript",
-    "tree-sitter-html",
-    "unindent",
-]
-
-[dependencies]
-aho-corasick.workspace = true
-anyhow.workspace = true
-assets.workspace = true
-client.workspace = true
-clock.workspace = true
-collections.workspace = true
-convert_case.workspace = true
-dap.workspace = true
-db.workspace = true
-buffer_diff.workspace = true
-emojis.workspace = true
-feature_flags.workspace = true
-file_icons.workspace = true
-futures.workspace = true
-fuzzy.workspace = true
-fs.workspace = true
-git.workspace = true
-gpui.workspace = true
-indoc.workspace = true
-edit_prediction_types.workspace = true
-itertools.workspace = true
-language.workspace = true
-linkify.workspace = true
-log.workspace = true
-lsp.workspace = true
-markdown.workspace = true
-menu.workspace = true
-multi_buffer.workspace = true
-ordered-float.workspace = true
-parking_lot.workspace = true
-pretty_assertions.workspace = true
-project.workspace = true
-rand.workspace = true
-regex.workspace = true
-rpc.workspace = true
-rope.workspace = true
-schemars.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-smallvec.workspace = true
-smol.workspace = true
-snippet.workspace = true
-sum_tree.workspace = true
-task.workspace = true
-telemetry.workspace = true
-text.workspace = true
-time.workspace = true
-theme.workspace = true
-tree-sitter-c = { workspace = true, optional = true }
-tree-sitter-html = { workspace = true, optional = true }
-tree-sitter-rust = { workspace = true, optional = true }
-tree-sitter-typescript = { workspace = true, optional = true }
-tree-sitter-python = { workspace = true, optional = true }
-ztracing.workspace = true
-tracing.workspace = true
-unicode-segmentation.workspace = true
-unicode-script.workspace = true
-unindent = { workspace = true, optional = true }
-ui.workspace = true
-url.workspace = true
-util.workspace = true
-uuid.workspace = true
-vim_mode_setting.workspace = true
-workspace.workspace = true
-zed_actions.workspace = true
-zlog.workspace = true
-
-[dev-dependencies]
-criterion.workspace = true
-ctor.workspace = true
-gpui = { workspace = true, features = ["test-support"] }
-language = { workspace = true, features = ["test-support"] }
-languages = {workspace = true, features = ["test-support"] }
-lsp = { workspace = true, features = ["test-support"] }
-markdown = { workspace = true, features = ["test-support"] }
-multi_buffer = { workspace = true, features = ["test-support"] }
-project = { workspace = true, features = ["test-support"] }
-release_channel.workspace = true
-rand.workspace = true
-semver.workspace = true
-settings = { workspace = true, features = ["test-support"] }
-tempfile.workspace = true
-text = { workspace = true, features = ["test-support"] }
-theme = { workspace = true, features = ["test-support"] }
-tree-sitter-c.workspace = true
-tree-sitter-html.workspace = true
-tree-sitter-rust.workspace = true
-tree-sitter-typescript.workspace = true
-tree-sitter-yaml.workspace = true
-tree-sitter-bash.workspace = true
-tree-sitter-md.workspace = true
-unindent.workspace = true
-util = { workspace = true, features = ["test-support"] }
-workspace = { workspace = true, features = ["test-support"] }
-http_client = { workspace = true, features = ["test-support"] }
-zlog.workspace = true
-
-
-[[bench]]
-name = "editor_render"
-harness = false
-
-[[bench]]
-name = "display_map"
-harness = false
diff --git a/crates/editor/LICENSE-GPL b/crates/editor/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/editor/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/editor/benches/display_map.rs b/crates/editor/benches/display_map.rs
deleted file mode 100644
index c443bdba1c..0000000000
--- a/crates/editor/benches/display_map.rs
+++ /dev/null
@@ -1,107 +0,0 @@
-use criterion::{BenchmarkId, Criterion, criterion_group, criterion_main};
-use editor::MultiBuffer;
-use gpui::TestDispatcher;
-use itertools::Itertools;
-use multi_buffer::MultiBufferOffset;
-use rand::{Rng, SeedableRng, rngs::StdRng};
-use std::num::NonZeroU32;
-use text::Bias;
-use util::RandomCharIter;
-
-fn to_tab_point_benchmark(c: &mut Criterion) {
-    let rng = StdRng::seed_from_u64(1);
-    let dispatcher = TestDispatcher::new(rng);
-    let cx = gpui::TestAppContext::build(dispatcher, None);
-
-    let create_tab_map = |length: usize| {
-        let mut rng = StdRng::seed_from_u64(1);
-        let text = RandomCharIter::new(&mut rng)
-            .take(length)
-            .collect::<String>();
-        let buffer = cx.update(|cx| MultiBuffer::build_simple(&text, cx));
-
-        let buffer_snapshot = cx.read(|cx| buffer.read(cx).snapshot(cx));
-        use editor::display_map::*;
-        let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot);
-        let (_, fold_snapshot) = FoldMap::new(inlay_snapshot.clone());
-        let fold_point = fold_snapshot.to_fold_point(
-            inlay_snapshot.to_point(InlayOffset(
-                rng.random_range(MultiBufferOffset(0)..MultiBufferOffset(length)),
-            )),
-            Bias::Left,
-        );
-        let (_, snapshot) = TabMap::new(fold_snapshot, NonZeroU32::new(4).unwrap());
-
-        (length, snapshot, fold_point)
-    };
-
-    let inputs = [1024].into_iter().map(create_tab_map).collect_vec();
-
-    let mut group = c.benchmark_group("To tab point");
-
-    for (batch_size, snapshot, fold_point) in inputs {
-        group.bench_with_input(
-            BenchmarkId::new("to_tab_point", batch_size),
-            &snapshot,
-            |bench, snapshot| {
-                bench.iter(|| {
-                    snapshot.fold_point_to_tab_point(fold_point);
-                });
-            },
-        );
-    }
-
-    group.finish();
-}
-
-fn to_fold_point_benchmark(c: &mut Criterion) {
-    let rng = StdRng::seed_from_u64(1);
-    let dispatcher = TestDispatcher::new(rng);
-    let cx = gpui::TestAppContext::build(dispatcher, None);
-
-    let create_tab_map = |length: usize| {
-        let mut rng = StdRng::seed_from_u64(1);
-        let text = RandomCharIter::new(&mut rng)
-            .take(length)
-            .collect::<String>();
-        let buffer = cx.update(|cx| MultiBuffer::build_simple(&text, cx));
-
-        let buffer_snapshot = cx.read(|cx| buffer.read(cx).snapshot(cx));
-        use editor::display_map::*;
-        let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot);
-        let (_, fold_snapshot) = FoldMap::new(inlay_snapshot.clone());
-
-        let fold_point = fold_snapshot.to_fold_point(
-            inlay_snapshot.to_point(InlayOffset(
-                rng.random_range(MultiBufferOffset(0)..MultiBufferOffset(length)),
-            )),
-            Bias::Left,
-        );
-
-        let (_, snapshot) = TabMap::new(fold_snapshot, NonZeroU32::new(4).unwrap());
-        let tab_point = snapshot.fold_point_to_tab_point(fold_point);
-
-        (length, snapshot, tab_point)
-    };
-
-    let inputs = [1024].into_iter().map(create_tab_map).collect_vec();
-
-    let mut group = c.benchmark_group("To fold point");
-
-    for (batch_size, snapshot, tab_point) in inputs {
-        group.bench_with_input(
-            BenchmarkId::new("to_fold_point", batch_size),
-            &snapshot,
-            |bench, snapshot| {
-                bench.iter(|| {
-                    snapshot.tab_point_to_fold_point(tab_point, Bias::Left);
-                });
-            },
-        );
-    }
-
-    group.finish();
-}
-
-criterion_group!(benches, to_tab_point_benchmark, to_fold_point_benchmark);
-criterion_main!(benches);
diff --git a/crates/editor/benches/editor_render.rs b/crates/editor/benches/editor_render.rs
deleted file mode 100644
index 4323c6c973..0000000000
--- a/crates/editor/benches/editor_render.rs
+++ /dev/null
@@ -1,167 +0,0 @@
-use criterion::{Bencher, BenchmarkId};
-use editor::{
-    Editor, EditorMode, MultiBuffer,
-    actions::{DeleteToPreviousWordStart, SelectAll, SplitSelectionIntoLines},
-};
-use gpui::{AppContext, Focusable as _, TestAppContext, TestDispatcher};
-use rand::{Rng as _, SeedableRng as _, rngs::StdRng};
-use settings::SettingsStore;
-use ui::IntoElement;
-use util::RandomCharIter;
-
-fn editor_input_with_1000_cursors(bencher: &mut Bencher<'_>, cx: &TestAppContext) {
-    let mut cx = cx.clone();
-    let text = String::from_iter(["line:\n"; 1000]);
-    let buffer = cx.update(|cx| MultiBuffer::build_simple(&text, cx));
-
-    let cx = cx.add_empty_window();
-    let editor = cx.update(|window, cx| {
-        let editor = cx.new(|cx| {
-            let mut editor = Editor::new(EditorMode::full(), buffer, None, window, cx);
-            editor.set_style(editor::EditorStyle::default(), window, cx);
-            editor.select_all(&SelectAll, window, cx);
-            editor.split_selection_into_lines(
-                &SplitSelectionIntoLines {
-                    keep_selections: true,
-                },
-                window,
-                cx,
-            );
-            editor
-        });
-        window.focus(&editor.focus_handle(cx));
-        editor
-    });
-
-    bencher.iter(|| {
-        cx.update(|window, cx| {
-            editor.update(cx, |editor, cx| {
-                editor.handle_input("hello world", window, cx);
-                editor.delete_to_previous_word_start(
-                    &DeleteToPreviousWordStart {
-                        ignore_newlines: false,
-                        ignore_brackets: false,
-                    },
-                    window,
-                    cx,
-                );
-                editor.delete_to_previous_word_start(
-                    &DeleteToPreviousWordStart {
-                        ignore_newlines: false,
-                        ignore_brackets: false,
-                    },
-                    window,
-                    cx,
-                );
-            });
-        })
-    });
-}
-
-fn open_editor_with_one_long_line(bencher: &mut Bencher<'_>, args: &(String, TestAppContext)) {
-    let (text, cx) = args;
-    let mut cx = cx.clone();
-
-    bencher.iter(|| {
-        let buffer = cx.update(|cx| MultiBuffer::build_simple(&text, cx));
-
-        let cx = cx.add_empty_window();
-        let _ = cx.update(|window, cx| {
-            let editor = cx.new(|cx| {
-                let mut editor = Editor::new(EditorMode::full(), buffer, None, window, cx);
-                editor.set_style(editor::EditorStyle::default(), window, cx);
-                editor
-            });
-            window.focus(&editor.focus_handle(cx));
-            editor
-        });
-    });
-}
-
-fn editor_render(bencher: &mut Bencher<'_>, cx: &TestAppContext) {
-    let mut cx = cx.clone();
-    let buffer = cx.update(|cx| {
-        let mut rng = StdRng::seed_from_u64(1);
-        let text_len = rng.random_range(10000..90000);
-        if rng.random() {
-            let text = RandomCharIter::new(&mut rng)
-                .take(text_len)
-                .collect::<String>();
-            MultiBuffer::build_simple(&text, cx)
-        } else {
-            MultiBuffer::build_random(&mut rng, cx)
-        }
-    });
-
-    let cx = cx.add_empty_window();
-    let editor = cx.update(|window, cx| {
-        let editor = cx.new(|cx| {
-            let mut editor = Editor::new(EditorMode::full(), buffer, None, window, cx);
-            editor.set_style(editor::EditorStyle::default(), window, cx);
-            editor
-        });
-        window.focus(&editor.focus_handle(cx));
-        editor
-    });
-
-    bencher.iter(|| {
-        cx.update(|window, cx| {
-            // editor.update(cx, |editor, cx| editor.move_down(&MoveDown, window, cx));
-            let mut view = editor.clone().into_any_element();
-            let _ = view.request_layout(window, cx);
-            let _ = view.prepaint(window, cx);
-            view.paint(window, cx);
-        });
-    })
-}
-
-pub fn benches() {
-    let dispatcher = TestDispatcher::new(StdRng::seed_from_u64(1));
-    let cx = gpui::TestAppContext::build(dispatcher, None);
-    cx.update(|cx| {
-        let store = SettingsStore::test(cx);
-        cx.set_global(store);
-        assets::Assets.load_test_fonts(cx);
-        theme::init(theme::LoadThemes::JustBase, cx);
-        // release_channel::init(semver::Version::new(0,0,0), cx);
-        editor::init(cx);
-    });
-
-    let mut criterion: criterion::Criterion<_> =
-        (criterion::Criterion::default()).configure_from_args();
-
-    // setup app context
-    let mut group = criterion.benchmark_group("Time to render");
-    group.bench_with_input(
-        BenchmarkId::new("editor_render", "TestAppContext"),
-        &cx,
-        editor_render,
-    );
-
-    group.finish();
-
-    let text = String::from_iter(["char"; 1000]);
-    let mut group = criterion.benchmark_group("Build buffer with one long line");
-    group.bench_with_input(
-        BenchmarkId::new("editor_with_one_long_line", "(String, TestAppContext )"),
-        &(text, cx.clone()),
-        open_editor_with_one_long_line,
-    );
-
-    group.finish();
-
-    let mut group = criterion.benchmark_group("multi cursor edits");
-    group.bench_with_input(
-        BenchmarkId::new("editor_input_with_1000_cursors", "TestAppContext"),
-        &cx,
-        editor_input_with_1000_cursors,
-    );
-    group.finish();
-}
-
-fn main() {
-    benches();
-    criterion::Criterion::default()
-        .configure_from_args()
-        .final_summary();
-}
diff --git a/crates/editor/src/actions.rs b/crates/editor/src/actions.rs
deleted file mode 100644
index fb058eb8d7..0000000000
--- a/crates/editor/src/actions.rs
+++ /dev/null
@@ -1,865 +0,0 @@
-//! This module contains all actions supported by [`Editor`].
-use super::*;
-use gpui::{Action, actions};
-use project::project_settings::GoToDiagnosticSeverityFilter;
-use schemars::JsonSchema;
-use util::serde::default_true;
-
-/// Selects the next occurrence of the current selection.
-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema, Action)]
-#[action(namespace = editor)]
-#[serde(deny_unknown_fields)]
-pub struct SelectNext {
-    #[serde(default)]
-    pub replace_newest: bool,
-}
-
-/// Selects the previous occurrence of the current selection.
-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema, Action)]
-#[action(namespace = editor)]
-#[serde(deny_unknown_fields)]
-pub struct SelectPrevious {
-    #[serde(default)]
-    pub replace_newest: bool,
-}
-
-/// Moves the cursor to the beginning of the current line.
-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema, Action)]
-#[action(namespace = editor)]
-#[serde(deny_unknown_fields)]
-pub struct MoveToBeginningOfLine {
-    #[serde(default = "default_true")]
-    pub stop_at_soft_wraps: bool,
-    #[serde(default)]
-    pub stop_at_indent: bool,
-}
-
-/// Selects from the cursor to the beginning of the current line.
-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema, Action)]
-#[action(namespace = editor)]
-#[serde(deny_unknown_fields)]
-pub struct SelectToBeginningOfLine {
-    #[serde(default)]
-    pub(super) stop_at_soft_wraps: bool,
-    #[serde(default)]
-    pub stop_at_indent: bool,
-}
-
-/// Deletes from the cursor to the beginning of the current line.
-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema, Action)]
-#[action(namespace = editor)]
-#[serde(deny_unknown_fields)]
-pub struct DeleteToBeginningOfLine {
-    #[serde(default)]
-    pub(super) stop_at_indent: bool,
-}
-
-/// Moves the cursor up by one page.
-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema, Action)]
-#[action(namespace = editor)]
-#[serde(deny_unknown_fields)]
-pub struct MovePageUp {
-    #[serde(default)]
-    pub(super) center_cursor: bool,
-}
-
-/// Moves the cursor down by one page.
-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema, Action)]
-#[action(namespace = editor)]
-#[serde(deny_unknown_fields)]
-pub struct MovePageDown {
-    #[serde(default)]
-    pub(super) center_cursor: bool,
-}
-
-/// Moves the cursor to the end of the current line.
-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema, Action)]
-#[action(namespace = editor)]
-#[serde(deny_unknown_fields)]
-pub struct MoveToEndOfLine {
-    #[serde(default = "default_true")]
-    pub stop_at_soft_wraps: bool,
-}
-
-/// Selects from the cursor to the end of the current line.
-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema, Action)]
-#[action(namespace = editor)]
-#[serde(deny_unknown_fields)]
-pub struct SelectToEndOfLine {
-    #[serde(default)]
-    pub(super) stop_at_soft_wraps: bool,
-}
-
-/// Toggles the display of available code actions at the cursor position.
-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema, Action)]
-#[action(namespace = editor)]
-#[serde(deny_unknown_fields)]
-pub struct ToggleCodeActions {
-    // Source from which the action was deployed.
-    #[serde(default)]
-    #[serde(skip)]
-    pub deployed_from: Option<CodeActionSource>,
-    // Run first available task if there is only one.
-    #[serde(default)]
-    #[serde(skip)]
-    pub quick_launch: bool,
-}
-
-#[derive(PartialEq, Clone, Debug)]
-pub enum CodeActionSource {
-    Indicator(DisplayRow),
-    RunMenu(DisplayRow),
-    QuickActionBar,
-}
-
-/// Confirms and accepts the currently selected completion suggestion.
-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema, Action)]
-#[action(namespace = editor)]
-#[serde(deny_unknown_fields)]
-pub struct ConfirmCompletion {
-    #[serde(default)]
-    pub item_ix: Option<usize>,
-}
-
-/// Composes multiple completion suggestions into a single completion.
-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema, Action)]
-#[action(namespace = editor)]
-#[serde(deny_unknown_fields)]
-pub struct ComposeCompletion {
-    #[serde(default)]
-    pub item_ix: Option<usize>,
-}
-
-/// Confirms and applies the currently selected code action.
-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema, Action)]
-#[action(namespace = editor)]
-#[serde(deny_unknown_fields)]
-pub struct ConfirmCodeAction {
-    #[serde(default)]
-    pub item_ix: Option<usize>,
-}
-
-/// Toggles comment markers for the selected lines.
-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema, Action)]
-#[action(namespace = editor)]
-#[serde(deny_unknown_fields)]
-pub struct ToggleComments {
-    #[serde(default)]
-    pub advance_downwards: bool,
-    #[serde(default)]
-    pub ignore_indent: bool,
-}
-
-/// Moves the cursor up by a specified number of lines.
-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema, Action)]
-#[action(namespace = editor)]
-#[serde(deny_unknown_fields)]
-pub struct MoveUpByLines {
-    #[serde(default)]
-    pub(super) lines: u32,
-}
-
-/// Moves the cursor down by a specified number of lines.
-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema, Action)]
-#[action(namespace = editor)]
-#[serde(deny_unknown_fields)]
-pub struct MoveDownByLines {
-    #[serde(default)]
-    pub(super) lines: u32,
-}
-
-/// Extends selection up by a specified number of lines.
-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema, Action)]
-#[action(namespace = editor)]
-#[serde(deny_unknown_fields)]
-pub struct SelectUpByLines {
-    #[serde(default)]
-    pub(super) lines: u32,
-}
-
-/// Extends selection down by a specified number of lines.
-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema, Action)]
-#[action(namespace = editor)]
-#[serde(deny_unknown_fields)]
-pub struct SelectDownByLines {
-    #[serde(default)]
-    pub(super) lines: u32,
-}
-
-/// Expands all excerpts in the editor.
-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema, Action)]
-#[action(namespace = editor)]
-#[serde(deny_unknown_fields)]
-pub struct ExpandExcerpts {
-    #[serde(default)]
-    pub(super) lines: u32,
-}
-
-/// Expands excerpts above the current position.
-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema, Action)]
-#[action(namespace = editor)]
-#[serde(deny_unknown_fields)]
-pub struct ExpandExcerptsUp {
-    #[serde(default)]
-    pub(super) lines: u32,
-}
-
-/// Expands excerpts below the current position.
-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema, Action)]
-#[action(namespace = editor)]
-#[serde(deny_unknown_fields)]
-pub struct ExpandExcerptsDown {
-    #[serde(default)]
-    pub(super) lines: u32,
-}
-
-/// Handles text input in the editor.
-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema, Action)]
-#[action(namespace = editor)]
-pub struct HandleInput(pub String);
-
-/// Deletes from the cursor to the end of the next word.
-/// Stops before the end of the next word, if whitespace sequences of length >= 2 are encountered.
-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema, Action)]
-#[action(namespace = editor)]
-#[serde(deny_unknown_fields)]
-pub struct DeleteToNextWordEnd {
-    #[serde(default)]
-    pub ignore_newlines: bool,
-    // Whether to stop before the end of the next word, if language-defined bracket is encountered.
-    #[serde(default)]
-    pub ignore_brackets: bool,
-}
-
-/// Deletes from the cursor to the start of the previous word.
-/// Stops before the start of the previous word, if whitespace sequences of length >= 2 are encountered.
-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema, Action)]
-#[action(namespace = editor)]
-#[serde(deny_unknown_fields)]
-pub struct DeleteToPreviousWordStart {
-    #[serde(default)]
-    pub ignore_newlines: bool,
-    // Whether to stop before the start of the previous word, if language-defined bracket is encountered.
-    #[serde(default)]
-    pub ignore_brackets: bool,
-}
-
-/// Cuts from cursor to end of line.
-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema, Action)]
-#[action(namespace = editor)]
-#[serde(deny_unknown_fields)]
-pub struct CutToEndOfLine {
-    #[serde(default)]
-    pub stop_at_newlines: bool,
-}
-
-/// Folds all code blocks at the specified indentation level.
-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema, Action)]
-#[action(namespace = editor)]
-pub struct FoldAtLevel(pub u32);
-
-/// Spawns the nearest available task from the current cursor position.
-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema, Action)]
-#[action(namespace = editor)]
-#[serde(deny_unknown_fields)]
-pub struct SpawnNearestTask {
-    #[serde(default)]
-    pub reveal: task::RevealStrategy,
-}
-
-#[derive(Clone, PartialEq, Action)]
-#[action(no_json, no_register)]
-pub struct DiffClipboardWithSelectionData {
-    pub clipboard_text: String,
-    pub editor: Entity<Editor>,
-}
-
-#[derive(Debug, PartialEq, Eq, Clone, Copy, Deserialize, Default)]
-pub enum UuidVersion {
-    #[default]
-    V4,
-    V7,
-}
-
-/// Splits selection into individual lines.
-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema, Action)]
-#[action(namespace = editor)]
-#[serde(deny_unknown_fields)]
-pub struct SplitSelectionIntoLines {
-    /// Keep the text selected after splitting instead of collapsing to cursors.
-    #[serde(default)]
-    pub keep_selections: bool,
-}
-
-/// Goes to the next diagnostic in the file.
-#[derive(PartialEq, Clone, Default, Debug, Deserialize, JsonSchema, Action)]
-#[action(namespace = editor)]
-#[serde(deny_unknown_fields)]
-pub struct GoToDiagnostic {
-    #[serde(default)]
-    pub severity: GoToDiagnosticSeverityFilter,
-}
-
-/// Goes to the previous diagnostic in the file.
-#[derive(PartialEq, Clone, Default, Debug, Deserialize, JsonSchema, Action)]
-#[action(namespace = editor)]
-#[serde(deny_unknown_fields)]
-pub struct GoToPreviousDiagnostic {
-    #[serde(default)]
-    pub severity: GoToDiagnosticSeverityFilter,
-}
-
-/// Adds a cursor above the current selection.
-#[derive(PartialEq, Clone, Default, Debug, Deserialize, JsonSchema, Action)]
-#[action(namespace = editor)]
-#[serde(deny_unknown_fields)]
-pub struct AddSelectionAbove {
-    #[serde(default = "default_true")]
-    pub skip_soft_wrap: bool,
-}
-
-/// Adds a cursor below the current selection.
-#[derive(PartialEq, Clone, Default, Debug, Deserialize, JsonSchema, Action)]
-#[action(namespace = editor)]
-#[serde(deny_unknown_fields)]
-pub struct AddSelectionBelow {
-    #[serde(default = "default_true")]
-    pub skip_soft_wrap: bool,
-}
-
-/// Inserts a snippet at the cursor.
-#[derive(PartialEq, Clone, Default, Debug, Deserialize, JsonSchema, Action)]
-#[action(namespace = editor)]
-#[serde(deny_unknown_fields)]
-pub struct InsertSnippet {
-    /// Language name if using a named snippet, or `None` for a global snippet
-    ///
-    /// This is typically lowercase and matches the filename containing the snippet, without the `.json` extension.
-    pub language: Option<String>,
-    /// Name if using a named snippet
-    pub name: Option<String>,
-
-    /// Snippet body, if not using a named snippet
-    // todo(andrew): use `ListOrDirect` or similar for multiline snippet body
-    pub snippet: Option<String>,
-}
-
-actions!(
-    debugger,
-    [
-        /// Runs program execution to the current cursor position.
-        RunToCursor,
-        /// Evaluates the selected text in the debugger context.
-        EvaluateSelectedText
-    ]
-);
-
-actions!(
-    go_to_line,
-    [
-        /// Toggles the go to line dialog.
-        #[action(name = "Toggle")]
-        ToggleGoToLine
-    ]
-);
-
-actions!(
-    editor,
-    [
-        /// Accepts the full edit prediction.
-        AcceptEditPrediction,
-        /// Accepts a partial edit prediction.
-        #[action(deprecated_aliases = ["editor::AcceptPartialCopilotSuggestion"])]
-        AcceptPartialEditPrediction,
-        /// Applies all diff hunks in the editor.
-        ApplyAllDiffHunks,
-        /// Applies the diff hunk at the current position.
-        ApplyDiffHunk,
-        /// Deletes the character before the cursor.
-        Backspace,
-        /// Shows git blame information for the current line.
-        BlameHover,
-        /// Cancels the current operation.
-        Cancel,
-        /// Cancels the running flycheck operation.
-        CancelFlycheck,
-        /// Cancels pending language server work.
-        CancelLanguageServerWork,
-        /// Clears flycheck results.
-        ClearFlycheck,
-        /// Confirms the rename operation.
-        ConfirmRename,
-        /// Confirms completion by inserting at cursor.
-        ConfirmCompletionInsert,
-        /// Confirms completion by replacing existing text.
-        ConfirmCompletionReplace,
-        /// Navigates to the first item in the context menu.
-        ContextMenuFirst,
-        /// Navigates to the last item in the context menu.
-        ContextMenuLast,
-        /// Navigates to the next item in the context menu.
-        ContextMenuNext,
-        /// Navigates to the previous item in the context menu.
-        ContextMenuPrevious,
-        /// Converts indentation from tabs to spaces.
-        ConvertIndentationToSpaces,
-        /// Converts indentation from spaces to tabs.
-        ConvertIndentationToTabs,
-        /// Converts selected text to kebab-case.
-        ConvertToKebabCase,
-        /// Converts selected text to lowerCamelCase.
-        ConvertToLowerCamelCase,
-        /// Converts selected text to lowercase.
-        ConvertToLowerCase,
-        /// Toggles the case of selected text.
-        ConvertToOppositeCase,
-        /// Converts selected text to sentence case.
-        ConvertToSentenceCase,
-        /// Converts selected text to snake_case.
-        ConvertToSnakeCase,
-        /// Converts selected text to Title Case.
-        ConvertToTitleCase,
-        /// Converts selected text to UpperCamelCase.
-        ConvertToUpperCamelCase,
-        /// Converts selected text to UPPERCASE.
-        ConvertToUpperCase,
-        /// Applies ROT13 cipher to selected text.
-        ConvertToRot13,
-        /// Applies ROT47 cipher to selected text.
-        ConvertToRot47,
-        /// Copies selected text to the clipboard.
-        Copy,
-        /// Copies selected text to the clipboard with leading/trailing whitespace trimmed.
-        CopyAndTrim,
-        /// Copies the current file location to the clipboard.
-        CopyFileLocation,
-        /// Copies the highlighted text as JSON.
-        CopyHighlightJson,
-        /// Copies the current file name to the clipboard.
-        CopyFileName,
-        /// Copies the file name without extension to the clipboard.
-        CopyFileNameWithoutExtension,
-        /// Copies a permalink to the current line.
-        CopyPermalinkToLine,
-        /// Cuts selected text to the clipboard.
-        Cut,
-        /// Deletes the character after the cursor.
-        Delete,
-        /// Deletes the current line.
-        DeleteLine,
-        /// Deletes from cursor to end of line.
-        DeleteToEndOfLine,
-        /// Deletes to the end of the next subword.
-        DeleteToNextSubwordEnd,
-        /// Deletes to the start of the previous subword.
-        DeleteToPreviousSubwordStart,
-        /// Diffs the text stored in the clipboard against the current selection.
-        DiffClipboardWithSelection,
-        /// Displays names of all active cursors.
-        DisplayCursorNames,
-        /// Duplicates the current line below.
-        DuplicateLineDown,
-        /// Duplicates the current line above.
-        DuplicateLineUp,
-        /// Duplicates the current selection.
-        DuplicateSelection,
-        /// Expands all diff hunks in the editor.
-        #[action(deprecated_aliases = ["editor::ExpandAllHunkDiffs"])]
-        ExpandAllDiffHunks,
-        /// Collapses all diff hunks in the editor.
-        CollapseAllDiffHunks,
-        /// Expands macros recursively at cursor position.
-        ExpandMacroRecursively,
-        /// Finds the next match in the search.
-        FindNextMatch,
-        /// Finds the previous match in the search.
-        FindPreviousMatch,
-        /// Folds the current code block.
-        Fold,
-        /// Folds all foldable regions in the editor.
-        FoldAll,
-        /// Folds all code blocks at indentation level 1.
-        #[action(name = "FoldAtLevel_1")]
-        FoldAtLevel1,
-        /// Folds all code blocks at indentation level 2.
-        #[action(name = "FoldAtLevel_2")]
-        FoldAtLevel2,
-        /// Folds all code blocks at indentation level 3.
-        #[action(name = "FoldAtLevel_3")]
-        FoldAtLevel3,
-        /// Folds all code blocks at indentation level 4.
-        #[action(name = "FoldAtLevel_4")]
-        FoldAtLevel4,
-        /// Folds all code blocks at indentation level 5.
-        #[action(name = "FoldAtLevel_5")]
-        FoldAtLevel5,
-        /// Folds all code blocks at indentation level 6.
-        #[action(name = "FoldAtLevel_6")]
-        FoldAtLevel6,
-        /// Folds all code blocks at indentation level 7.
-        #[action(name = "FoldAtLevel_7")]
-        FoldAtLevel7,
-        /// Folds all code blocks at indentation level 8.
-        #[action(name = "FoldAtLevel_8")]
-        FoldAtLevel8,
-        /// Folds all code blocks at indentation level 9.
-        #[action(name = "FoldAtLevel_9")]
-        FoldAtLevel9,
-        /// Folds all function bodies in the editor.
-        FoldFunctionBodies,
-        /// Folds the current code block and all its children.
-        FoldRecursive,
-        /// Folds the selected ranges.
-        FoldSelectedRanges,
-        /// Toggles focus back to the last active buffer.
-        ToggleFocus,
-        /// Toggles folding at the current position.
-        ToggleFold,
-        /// Toggles recursive folding at the current position.
-        ToggleFoldRecursive,
-        /// Toggles all folds in a buffer or all excerpts in multibuffer.
-        ToggleFoldAll,
-        /// Formats the entire document.
-        Format,
-        /// Formats only the selected text.
-        FormatSelections,
-        /// Goes to the declaration of the symbol at cursor.
-        GoToDeclaration,
-        /// Goes to declaration in a split pane.
-        GoToDeclarationSplit,
-        /// Goes to the definition of the symbol at cursor.
-        GoToDefinition,
-        /// Goes to definition in a split pane.
-        GoToDefinitionSplit,
-        /// Goes to the next diff hunk.
-        GoToHunk,
-        /// Goes to the previous diff hunk.
-        GoToPreviousHunk,
-        /// Goes to the implementation of the symbol at cursor.
-        GoToImplementation,
-        /// Goes to implementation in a split pane.
-        GoToImplementationSplit,
-        /// Goes to the next change in the file.
-        GoToNextChange,
-        /// Goes to the parent module of the current file.
-        GoToParentModule,
-        /// Goes to the previous change in the file.
-        GoToPreviousChange,
-        /// Goes to the next reference to the symbol under the cursor.
-        GoToNextReference,
-        /// Goes to the previous reference to the symbol under the cursor.
-        GoToPreviousReference,
-        /// Goes to the type definition of the symbol at cursor.
-        GoToTypeDefinition,
-        /// Goes to type definition in a split pane.
-        GoToTypeDefinitionSplit,
-        /// Goes to the next document highlight.
-        GoToNextDocumentHighlight,
-        /// Goes to the previous document highlight.
-        GoToPreviousDocumentHighlight,
-        /// Scrolls down by half a page.
-        HalfPageDown,
-        /// Scrolls up by half a page.
-        HalfPageUp,
-        /// Shows hover information for the symbol at cursor.
-        Hover,
-        /// Increases indentation of selected lines.
-        Indent,
-        /// Inserts a UUID v4 at cursor position.
-        InsertUuidV4,
-        /// Inserts a UUID v7 at cursor position.
-        InsertUuidV7,
-        /// Joins the current line with the next line.
-        JoinLines,
-        /// Cuts to kill ring (Emacs-style).
-        KillRingCut,
-        /// Yanks from kill ring (Emacs-style).
-        KillRingYank,
-        /// Moves cursor down one line.
-        LineDown,
-        /// Moves cursor up one line.
-        LineUp,
-        /// Moves cursor down.
-        MoveDown,
-        /// Moves cursor left.
-        MoveLeft,
-        /// Moves the current line down.
-        MoveLineDown,
-        /// Moves the current line up.
-        MoveLineUp,
-        /// Moves cursor right.
-        MoveRight,
-        /// Moves cursor to the beginning of the document.
-        MoveToBeginning,
-        /// Moves cursor to the enclosing bracket.
-        MoveToEnclosingBracket,
-        /// Moves cursor to the end of the document.
-        MoveToEnd,
-        /// Moves cursor to the end of the paragraph.
-        MoveToEndOfParagraph,
-        /// Moves cursor to the end of the next subword.
-        MoveToNextSubwordEnd,
-        /// Moves cursor to the end of the next word.
-        MoveToNextWordEnd,
-        /// Moves cursor to the start of the previous subword.
-        MoveToPreviousSubwordStart,
-        /// Moves cursor to the start of the previous word.
-        MoveToPreviousWordStart,
-        /// Moves cursor to the start of the paragraph.
-        MoveToStartOfParagraph,
-        /// Moves cursor to the start of the current excerpt.
-        MoveToStartOfExcerpt,
-        /// Moves cursor to the start of the next excerpt.
-        MoveToStartOfNextExcerpt,
-        /// Moves cursor to the end of the current excerpt.
-        MoveToEndOfExcerpt,
-        /// Moves cursor to the end of the previous excerpt.
-        MoveToEndOfPreviousExcerpt,
-        /// Moves cursor up.
-        MoveUp,
-        /// Inserts a new line and moves cursor to it.
-        Newline,
-        /// Inserts a new line above the current line.
-        NewlineAbove,
-        /// Inserts a new line below the current line.
-        NewlineBelow,
-        /// Navigates to the next edit prediction.
-        NextEditPrediction,
-        /// Scrolls to the next screen.
-        NextScreen,
-        /// Goes to the next snippet tabstop if one exists.
-        NextSnippetTabstop,
-        /// Opens the context menu at cursor position.
-        OpenContextMenu,
-        /// Opens excerpts from the current file.
-        OpenExcerpts,
-        /// Opens excerpts in a split pane.
-        OpenExcerptsSplit,
-        /// Opens the proposed changes editor.
-        OpenProposedChangesEditor,
-        /// Opens documentation for the symbol at cursor.
-        OpenDocs,
-        /// Opens a permalink to the current line.
-        OpenPermalinkToLine,
-        /// Opens the file whose name is selected in the editor.
-        #[action(deprecated_aliases = ["editor::OpenFile"])]
-        OpenSelectedFilename,
-        /// Opens all selections in a multibuffer.
-        OpenSelectionsInMultibuffer,
-        /// Opens the URL at cursor position.
-        OpenUrl,
-        /// Organizes import statements.
-        OrganizeImports,
-        /// Decreases indentation of selected lines.
-        Outdent,
-        /// Automatically adjusts indentation based on context.
-        AutoIndent,
-        /// Scrolls down by one page.
-        PageDown,
-        /// Scrolls up by one page.
-        PageUp,
-        /// Pastes from clipboard.
-        Paste,
-        /// Navigates to the previous edit prediction.
-        PreviousEditPrediction,
-        /// Goes to the previous snippet tabstop if one exists.
-        PreviousSnippetTabstop,
-        /// Redoes the last undone edit.
-        Redo,
-        /// Redoes the last selection change.
-        RedoSelection,
-        /// Renames the symbol at cursor.
-        Rename,
-        /// Restarts the language server for the current file.
-        RestartLanguageServer,
-        /// Reveals the current file in the system file manager.
-        RevealInFileManager,
-        /// Reverses the order of selected lines.
-        ReverseLines,
-        /// Reloads the file from disk.
-        ReloadFile,
-        /// Rewraps text to fit within the preferred line length.
-        Rewrap,
-        /// Rotates selections or lines backward.
-        RotateSelectionsBackward,
-        /// Rotates selections or lines forward.
-        RotateSelectionsForward,
-        /// Runs flycheck diagnostics.
-        RunFlycheck,
-        /// Scrolls the cursor to the bottom of the viewport.
-        ScrollCursorBottom,
-        /// Scrolls the cursor to the center of the viewport.
-        ScrollCursorCenter,
-        /// Cycles cursor position between center, top, and bottom.
-        ScrollCursorCenterTopBottom,
-        /// Scrolls the cursor to the top of the viewport.
-        ScrollCursorTop,
-        /// Selects all text in the editor.
-        SelectAll,
-        /// Selects all matches of the current selection.
-        SelectAllMatches,
-        /// Selects to the start of the current excerpt.
-        SelectToStartOfExcerpt,
-        /// Selects to the start of the next excerpt.
-        SelectToStartOfNextExcerpt,
-        /// Selects to the end of the current excerpt.
-        SelectToEndOfExcerpt,
-        /// Selects to the end of the previous excerpt.
-        SelectToEndOfPreviousExcerpt,
-        /// Extends selection down.
-        SelectDown,
-        /// Selects the enclosing symbol.
-        SelectEnclosingSymbol,
-        /// Selects the next larger syntax node.
-        SelectLargerSyntaxNode,
-        /// Selects the next syntax node sibling.
-        SelectNextSyntaxNode,
-        /// Selects the previous syntax node sibling.
-        SelectPreviousSyntaxNode,
-        /// Extends selection left.
-        SelectLeft,
-        /// Selects the current line.
-        SelectLine,
-        /// Extends selection down by one page.
-        SelectPageDown,
-        /// Extends selection up by one page.
-        SelectPageUp,
-        /// Extends selection right.
-        SelectRight,
-        /// Selects the next smaller syntax node.
-        SelectSmallerSyntaxNode,
-        /// Selects to the beginning of the document.
-        SelectToBeginning,
-        /// Selects to the end of the document.
-        SelectToEnd,
-        /// Selects to the end of the paragraph.
-        SelectToEndOfParagraph,
-        /// Selects to the end of the next subword.
-        SelectToNextSubwordEnd,
-        /// Selects to the end of the next word.
-        SelectToNextWordEnd,
-        /// Selects to the start of the previous subword.
-        SelectToPreviousSubwordStart,
-        /// Selects to the start of the previous word.
-        SelectToPreviousWordStart,
-        /// Selects to the start of the paragraph.
-        SelectToStartOfParagraph,
-        /// Extends selection up.
-        SelectUp,
-        /// Shows code completion suggestions at the cursor position.
-        ShowCompletions,
-        /// Shows the system character palette.
-        ShowCharacterPalette,
-        /// Shows edit prediction at cursor.
-        ShowEditPrediction,
-        /// Shows signature help for the current function.
-        ShowSignatureHelp,
-        /// Shows word completions.
-        ShowWordCompletions,
-        /// Randomly shuffles selected lines.
-        ShuffleLines,
-        /// Navigates to the next signature in the signature help popup.
-        SignatureHelpNext,
-        /// Navigates to the previous signature in the signature help popup.
-        SignatureHelpPrevious,
-        /// Sorts selected lines by length.
-        SortLinesByLength,
-        /// Sorts selected lines case-insensitively.
-        SortLinesCaseInsensitive,
-        /// Sorts selected lines case-sensitively.
-        SortLinesCaseSensitive,
-        /// Stops the language server for the current file.
-        StopLanguageServer,
-        /// Switches between source and header files.
-        SwitchSourceHeader,
-        /// Inserts a tab character or indents.
-        Tab,
-        /// Removes a tab character or outdents.
-        Backtab,
-        /// Toggles a breakpoint at the current line.
-        ToggleBreakpoint,
-        /// Toggles the case of selected text.
-        ToggleCase,
-        /// Disables the breakpoint at the current line.
-        DisableBreakpoint,
-        /// Enables the breakpoint at the current line.
-        EnableBreakpoint,
-        /// Edits the log message for a breakpoint.
-        EditLogBreakpoint,
-        /// Toggles automatic signature help.
-        ToggleAutoSignatureHelp,
-        /// Toggles inline git blame display.
-        ToggleGitBlameInline,
-        /// Opens the git commit for the blame at cursor.
-        OpenGitBlameCommit,
-        /// Toggles the diagnostics panel.
-        ToggleDiagnostics,
-        /// Toggles indent guides display.
-        ToggleIndentGuides,
-        /// Toggles inlay hints display.
-        ToggleInlayHints,
-        /// Toggles inline values display.
-        ToggleInlineValues,
-        /// Toggles inline diagnostics display.
-        ToggleInlineDiagnostics,
-        /// Toggles edit prediction feature.
-        ToggleEditPrediction,
-        /// Toggles line numbers display.
-        ToggleLineNumbers,
-        /// Toggles the minimap display.
-        ToggleMinimap,
-        /// Swaps the start and end of the current selection.
-        SwapSelectionEnds,
-        /// Sets a mark at the current position.
-        SetMark,
-        /// Toggles relative line numbers display.
-        ToggleRelativeLineNumbers,
-        /// Toggles diff display for selected hunks.
-        #[action(deprecated_aliases = ["editor::ToggleHunkDiff"])]
-        ToggleSelectedDiffHunks,
-        /// Toggles the selection menu.
-        ToggleSelectionMenu,
-        /// Toggles soft wrap mode.
-        ToggleSoftWrap,
-        /// Toggles the tab bar display.
-        ToggleTabBar,
-        /// Transposes characters around cursor.
-        Transpose,
-        /// Undoes the last edit.
-        Undo,
-        /// Undoes the last selection change.
-        UndoSelection,
-        /// Unfolds all folded regions.
-        UnfoldAll,
-        /// Unfolds lines at cursor.
-        UnfoldLines,
-        /// Unfolds recursively at cursor.
-        UnfoldRecursive,
-        /// Removes duplicate lines (case-insensitive).
-        UniqueLinesCaseInsensitive,
-        /// Removes duplicate lines (case-sensitive).
-        UniqueLinesCaseSensitive,
-        /// Removes the surrounding syntax node (for example brackets, or closures)
-        /// from the current selections.
-        UnwrapSyntaxNode,
-        /// Wraps selections in tag specified by language.
-        WrapSelectionsInTag
-    ]
-);
-
-/// Finds all references to the symbol at cursor.
-#[derive(PartialEq, Clone, Deserialize, JsonSchema, Action)]
-#[action(namespace = editor)]
-#[serde(deny_unknown_fields)]
-pub struct FindAllReferences {
-    #[serde(default = "default_true")]
-    pub always_open_multibuffer: bool,
-}
-
-impl Default for FindAllReferences {
-    fn default() -> Self {
-        Self {
-            always_open_multibuffer: true,
-        }
-    }
-}
diff --git a/crates/editor/src/blink_manager.rs b/crates/editor/src/blink_manager.rs
deleted file mode 100644
index d99cf6a7d5..0000000000
--- a/crates/editor/src/blink_manager.rs
+++ /dev/null
@@ -1,117 +0,0 @@
-use gpui::Context;
-use settings::SettingsStore;
-use smol::Timer;
-use std::time::Duration;
-use ui::App;
-
-pub struct BlinkManager {
-    blink_interval: Duration,
-    blink_epoch: usize,
-    /// Whether the blinking is paused.
-    blinking_paused: bool,
-    /// Whether the cursor should be visibly rendered or not.
-    visible: bool,
-    /// Whether the blinking currently enabled.
-    enabled: bool,
-    /// Whether the blinking is enabled in the settings.
-    blink_enabled_in_settings: fn(&App) -> bool,
-}
-
-impl BlinkManager {
-    pub fn new(
-        blink_interval: Duration,
-        blink_enabled_in_settings: fn(&App) -> bool,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        // Make sure we blink the cursors if the setting is re-enabled
-        cx.observe_global::<SettingsStore>(move |this, cx| {
-            this.blink_cursors(this.blink_epoch, cx)
-        })
-        .detach();
-
-        Self {
-            blink_interval,
-            blink_epoch: 0,
-            blinking_paused: false,
-            visible: true,
-            enabled: false,
-            blink_enabled_in_settings,
-        }
-    }
-
-    fn next_blink_epoch(&mut self) -> usize {
-        self.blink_epoch += 1;
-        self.blink_epoch
-    }
-
-    pub fn pause_blinking(&mut self, cx: &mut Context<Self>) {
-        self.show_cursor(cx);
-
-        let epoch = self.next_blink_epoch();
-        let interval = self.blink_interval;
-        cx.spawn(async move |this, cx| {
-            Timer::after(interval).await;
-            this.update(cx, |this, cx| this.resume_cursor_blinking(epoch, cx))
-        })
-        .detach();
-    }
-
-    fn resume_cursor_blinking(&mut self, epoch: usize, cx: &mut Context<Self>) {
-        if epoch == self.blink_epoch {
-            self.blinking_paused = false;
-            self.blink_cursors(epoch, cx);
-        }
-    }
-
-    fn blink_cursors(&mut self, epoch: usize, cx: &mut Context<Self>) {
-        if (self.blink_enabled_in_settings)(cx) {
-            if epoch == self.blink_epoch && self.enabled && !self.blinking_paused {
-                self.visible = !self.visible;
-                cx.notify();
-
-                let epoch = self.next_blink_epoch();
-                let interval = self.blink_interval;
-                cx.spawn(async move |this, cx| {
-                    Timer::after(interval).await;
-                    if let Some(this) = this.upgrade() {
-                        this.update(cx, |this, cx| this.blink_cursors(epoch, cx))
-                            .ok();
-                    }
-                })
-                .detach();
-            }
-        } else {
-            self.show_cursor(cx);
-        }
-    }
-
-    pub fn show_cursor(&mut self, cx: &mut Context<BlinkManager>) {
-        if !self.visible {
-            self.visible = true;
-            cx.notify();
-        }
-    }
-
-    /// Enable the blinking of the cursor.
-    pub fn enable(&mut self, cx: &mut Context<Self>) {
-        if self.enabled {
-            return;
-        }
-
-        self.enabled = true;
-        // Set cursors as invisible and start blinking: this causes cursors
-        // to be visible during the next render.
-        self.visible = false;
-        self.blink_cursors(self.blink_epoch, cx);
-    }
-
-    /// Disable the blinking of the cursor.
-    pub fn disable(&mut self, _cx: &mut Context<Self>) {
-        self.visible = false;
-        self.enabled = false;
-    }
-
-    pub fn visible(&self) -> bool {
-        self.visible
-    }
-}
diff --git a/crates/editor/src/bracket_colorization.rs b/crates/editor/src/bracket_colorization.rs
deleted file mode 100644
index 4879c5e9ce..0000000000
--- a/crates/editor/src/bracket_colorization.rs
+++ /dev/null
@@ -1,1374 +0,0 @@
-//! Bracket highlights, also known as "rainbow brackets".
-//! Uses tree-sitter queries from brackets.scm to capture bracket pairs,
-//! and theme accents to colorize those.
-
-use std::ops::Range;
-
-use crate::Editor;
-use collections::HashMap;
-use gpui::{Context, HighlightStyle};
-use itertools::Itertools;
-use language::language_settings;
-use multi_buffer::{Anchor, ExcerptId};
-use ui::{ActiveTheme, utils::ensure_minimum_contrast};
-
-struct ColorizedBracketsHighlight;
-
-impl Editor {
-    pub(crate) fn colorize_brackets(&mut self, invalidate: bool, cx: &mut Context<Editor>) {
-        if !self.mode.is_full() {
-            return;
-        }
-
-        if invalidate {
-            self.fetched_tree_sitter_chunks.clear();
-        }
-
-        let accents_count = cx.theme().accents().0.len();
-        let multi_buffer_snapshot = self.buffer().read(cx).snapshot(cx);
-        let all_excerpts = self.buffer().read(cx).excerpt_ids();
-        let anchors_in_multi_buffer = |current_excerpt: ExcerptId,
-                                       text_anchors: [text::Anchor; 4]|
-         -> Option<[Option<_>; 4]> {
-            multi_buffer_snapshot
-                .anchors_in_excerpt(current_excerpt, text_anchors)
-                .or_else(|| {
-                    all_excerpts
-                        .iter()
-                        .filter(|&&excerpt_id| excerpt_id != current_excerpt)
-                        .find_map(|&excerpt_id| {
-                            multi_buffer_snapshot.anchors_in_excerpt(excerpt_id, text_anchors)
-                        })
-                })?
-                .collect_array()
-        };
-
-        let bracket_matches_by_accent = self.visible_excerpts(false, cx).into_iter().fold(
-            HashMap::default(),
-            |mut acc, (excerpt_id, (buffer, _, buffer_range))| {
-                let buffer_snapshot = buffer.read(cx).snapshot();
-                if language_settings::language_settings(
-                    buffer_snapshot.language().map(|language| language.name()),
-                    buffer_snapshot.file(),
-                    cx,
-                )
-                .colorize_brackets
-                {
-                    let fetched_chunks = self
-                        .fetched_tree_sitter_chunks
-                        .entry(excerpt_id)
-                        .or_default();
-
-                    let brackets_by_accent = buffer_snapshot
-                        .fetch_bracket_ranges(
-                            buffer_range.start..buffer_range.end,
-                            Some(fetched_chunks),
-                        )
-                        .into_iter()
-                        .flat_map(|(chunk_range, pairs)| {
-                            if fetched_chunks.insert(chunk_range) {
-                                pairs
-                            } else {
-                                Vec::new()
-                            }
-                        })
-                        .filter_map(|pair| {
-                            let color_index = pair.color_index?;
-
-                            let buffer_open_range = buffer_snapshot
-                                .anchor_before(pair.open_range.start)
-                                ..buffer_snapshot.anchor_after(pair.open_range.end);
-                            let buffer_close_range = buffer_snapshot
-                                .anchor_before(pair.close_range.start)
-                                ..buffer_snapshot.anchor_after(pair.close_range.end);
-                            let [
-                                buffer_open_range_start,
-                                buffer_open_range_end,
-                                buffer_close_range_start,
-                                buffer_close_range_end,
-                            ] = anchors_in_multi_buffer(
-                                excerpt_id,
-                                [
-                                    buffer_open_range.start,
-                                    buffer_open_range.end,
-                                    buffer_close_range.start,
-                                    buffer_close_range.end,
-                                ],
-                            )?;
-                            let multi_buffer_open_range =
-                                buffer_open_range_start.zip(buffer_open_range_end);
-                            let multi_buffer_close_range =
-                                buffer_close_range_start.zip(buffer_close_range_end);
-
-                            let mut ranges = Vec::with_capacity(2);
-                            if let Some((open_start, open_end)) = multi_buffer_open_range {
-                                ranges.push(open_start..open_end);
-                            }
-                            if let Some((close_start, close_end)) = multi_buffer_close_range {
-                                ranges.push(close_start..close_end);
-                            }
-                            if ranges.is_empty() {
-                                None
-                            } else {
-                                Some((color_index % accents_count, ranges))
-                            }
-                        });
-
-                    for (accent_number, new_ranges) in brackets_by_accent {
-                        let ranges = acc
-                            .entry(accent_number)
-                            .or_insert_with(Vec::<Range<Anchor>>::new);
-
-                        for new_range in new_ranges {
-                            let i = ranges
-                                .binary_search_by(|probe| {
-                                    probe.start.cmp(&new_range.start, &multi_buffer_snapshot)
-                                })
-                                .unwrap_or_else(|i| i);
-                            ranges.insert(i, new_range);
-                        }
-                    }
-                }
-
-                acc
-            },
-        );
-
-        if invalidate {
-            self.clear_highlights::<ColorizedBracketsHighlight>(cx);
-        }
-
-        let editor_background = cx.theme().colors().editor_background;
-        for (accent_number, bracket_highlights) in bracket_matches_by_accent {
-            let bracket_color = cx.theme().accents().color_for_index(accent_number as u32);
-            let adjusted_color = ensure_minimum_contrast(bracket_color, editor_background, 55.0);
-            let style = HighlightStyle {
-                color: Some(adjusted_color),
-                ..HighlightStyle::default()
-            };
-
-            self.highlight_text_key::<ColorizedBracketsHighlight>(
-                accent_number,
-                bracket_highlights,
-                style,
-                true,
-                cx,
-            );
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::{cmp, sync::Arc, time::Duration};
-
-    use super::*;
-    use crate::{
-        DisplayPoint, EditorMode, EditorSnapshot, MoveToBeginning, MoveToEnd, MoveUp,
-        display_map::{DisplayRow, ToDisplayPoint},
-        editor_tests::init_test,
-        test::{
-            editor_lsp_test_context::EditorLspTestContext, editor_test_context::EditorTestContext,
-        },
-    };
-    use collections::HashSet;
-    use fs::FakeFs;
-    use gpui::{AppContext as _, UpdateGlobal as _};
-    use indoc::indoc;
-    use itertools::Itertools;
-    use language::{Capability, markdown_lang};
-    use languages::rust_lang;
-    use multi_buffer::{ExcerptRange, MultiBuffer};
-    use pretty_assertions::assert_eq;
-    use project::Project;
-    use rope::Point;
-    use serde_json::json;
-    use settings::{AccentContent, SettingsStore};
-    use text::{Bias, OffsetRangeExt, ToOffset};
-    use theme::ThemeStyleContent;
-    use ui::SharedString;
-    use util::{path, post_inc};
-
-    #[gpui::test]
-    async fn test_basic_bracket_colorization(cx: &mut gpui::TestAppContext) {
-        init_test(cx, |language_settings| {
-            language_settings.defaults.colorize_brackets = Some(true);
-        });
-        let mut cx = EditorLspTestContext::new(
-            Arc::into_inner(rust_lang()).unwrap(),
-            lsp::ServerCapabilities::default(),
-            cx,
-        )
-        .await;
-
-        cx.set_state(indoc! {r#"ˇuse std::{collections::HashMap, future::Future};
-
-fn main() {
-    let a = one((), { () }, ());
-    println!("{a}");
-    println!("{a}");
-    for i in 0..a {
-        println!("{i}");
-    }
-
-    let b = {
-        {
-            {
-                [([([([([([([([([([((), ())])])])])])])])])])]
-            }
-        }
-    };
-}
-
-#[rustfmt::skip]
-fn one(a: (), (): (), c: ()) -> usize { 1 }
-
-fn two<T>(a: HashMap<String, Vec<Option<T>>>) -> usize
-where
-    T: Future<Output = HashMap<String, Vec<Option<Box<()>>>>>,
-{
-    2
-}
-"#});
-        cx.executor().advance_clock(Duration::from_millis(100));
-        cx.executor().run_until_parked();
-
-        assert_eq!(
-            r#"use std::«1{collections::HashMap, future::Future}1»;
-
-fn main«1()1» «1{
-    let a = one«2(«3()3», «3{ «4()4» }3», «3()3»)2»;
-    println!«2("{a}")2»;
-    println!«2("{a}")2»;
-    for i in 0..a «2{
-        println!«3("{i}")3»;
-    }2»
-
-    let b = «2{
-        «3{
-            «4{
-                «5[«6(«7[«1(«2[«3(«4[«5(«6[«7(«1[«2(«3[«4(«5[«6(«7[«1(«2[«3(«4()4», «4()4»)3»]2»)1»]7»)6»]5»)4»]3»)2»]1»)7»]6»)5»]4»)3»]2»)1»]7»)6»]5»
-            }4»
-        }3»
-    }2»;
-}1»
-
-#«1[rustfmt::skip]1»
-fn one«1(a: «2()2», «2()2»: «2()2», c: «2()2»)1» -> usize «1{ 1 }1»
-
-fn two«1<T>1»«1(a: HashMap«2<String, Vec«3<Option«4<T>4»>3»>2»)1» -> usize
-where
-    T: Future«1<Output = HashMap«2<String, Vec«3<Option«4<Box«5<«6()6»>5»>4»>3»>2»>1»,
-«1{
-    2
-}1»
-
-1 hsla(207.80, 16.20%, 69.19%, 1.00)
-2 hsla(29.00, 54.00%, 65.88%, 1.00)
-3 hsla(286.00, 51.00%, 75.25%, 1.00)
-4 hsla(187.00, 47.00%, 59.22%, 1.00)
-5 hsla(355.00, 65.00%, 75.94%, 1.00)
-6 hsla(95.00, 38.00%, 62.00%, 1.00)
-7 hsla(39.00, 67.00%, 69.00%, 1.00)
-"#,
-            &bracket_colors_markup(&mut cx),
-            "All brackets should be colored based on their depth"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_file_less_file_colorization(cx: &mut gpui::TestAppContext) {
-        init_test(cx, |language_settings| {
-            language_settings.defaults.colorize_brackets = Some(true);
-        });
-        let editor = cx.add_window(|window, cx| {
-            let multi_buffer = MultiBuffer::build_simple("fn main() {}", cx);
-            multi_buffer.update(cx, |multi_buffer, cx| {
-                multi_buffer
-                    .as_singleton()
-                    .unwrap()
-                    .update(cx, |buffer, cx| {
-                        buffer.set_language(Some(rust_lang()), cx);
-                    });
-            });
-            Editor::new(EditorMode::full(), multi_buffer, None, window, cx)
-        });
-
-        cx.executor().advance_clock(Duration::from_millis(100));
-        cx.executor().run_until_parked();
-
-        assert_eq!(
-            "fn main«1()1» «1{}1»
-1 hsla(207.80, 16.20%, 69.19%, 1.00)
-",
-            editor
-                .update(cx, |editor, window, cx| {
-                    editor_bracket_colors_markup(&editor.snapshot(window, cx))
-                })
-                .unwrap(),
-            "File-less buffer should still have its brackets colorized"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_markdown_bracket_colorization(cx: &mut gpui::TestAppContext) {
-        init_test(cx, |language_settings| {
-            language_settings.defaults.colorize_brackets = Some(true);
-        });
-        let mut cx = EditorLspTestContext::new(
-            Arc::into_inner(markdown_lang()).unwrap(),
-            lsp::ServerCapabilities::default(),
-            cx,
-        )
-        .await;
-
-        cx.set_state(indoc! {r#"ˇ[LLM-powered features](./ai/overview.md), [bring and configure your own API keys](./ai/llm-providers.md#use-your-own-keys)"#});
-        cx.executor().advance_clock(Duration::from_millis(100));
-        cx.executor().run_until_parked();
-
-        assert_eq!(
-            r#"«1[LLM-powered features]1»«1(./ai/overview.md)1», «1[bring and configure your own API keys]1»«1(./ai/llm-providers.md#use-your-own-keys)1»
-1 hsla(207.80, 16.20%, 69.19%, 1.00)
-"#,
-            &bracket_colors_markup(&mut cx),
-            "All markdown brackets should be colored based on their depth"
-        );
-
-        cx.set_state(indoc! {r#"ˇ{{}}"#});
-        cx.executor().advance_clock(Duration::from_millis(100));
-        cx.executor().run_until_parked();
-
-        assert_eq!(
-            r#"«1{«2{}2»}1»
-1 hsla(207.80, 16.20%, 69.19%, 1.00)
-2 hsla(29.00, 54.00%, 65.88%, 1.00)
-"#,
-            &bracket_colors_markup(&mut cx),
-            "All markdown brackets should be colored based on their depth, again"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_bracket_colorization_when_editing(cx: &mut gpui::TestAppContext) {
-        init_test(cx, |language_settings| {
-            language_settings.defaults.colorize_brackets = Some(true);
-        });
-        let mut cx = EditorLspTestContext::new(
-            Arc::into_inner(rust_lang()).unwrap(),
-            lsp::ServerCapabilities::default(),
-            cx,
-        )
-        .await;
-
-        cx.set_state(indoc! {r#"
-struct Foo<'a, T> {
-    data: Vec<Option<&'a T>>,
-}
-
-fn process_data() {
-    let map:ˇ
-}
-"#});
-
-        cx.update_editor(|editor, window, cx| {
-            editor.handle_input(" Result<", window, cx);
-        });
-        cx.executor().advance_clock(Duration::from_millis(100));
-        cx.executor().run_until_parked();
-        assert_eq!(
-            indoc! {r#"
-struct Foo«1<'a, T>1» «1{
-    data: Vec«2<Option«3<&'a T>3»>2»,
-}1»
-
-fn process_data«1()1» «1{
-    let map: Result<
-}1»
-
-1 hsla(207.80, 16.20%, 69.19%, 1.00)
-2 hsla(29.00, 54.00%, 65.88%, 1.00)
-3 hsla(286.00, 51.00%, 75.25%, 1.00)
-"#},
-            &bracket_colors_markup(&mut cx),
-            "Brackets without pairs should be ignored and not colored"
-        );
-
-        cx.update_editor(|editor, window, cx| {
-            editor.handle_input("Option<Foo<'_, ()", window, cx);
-        });
-        cx.executor().advance_clock(Duration::from_millis(100));
-        cx.executor().run_until_parked();
-        assert_eq!(
-            indoc! {r#"
-struct Foo«1<'a, T>1» «1{
-    data: Vec«2<Option«3<&'a T>3»>2»,
-}1»
-
-fn process_data«1()1» «1{
-    let map: Result<Option<Foo<'_, «2()2»
-}1»
-
-1 hsla(207.80, 16.20%, 69.19%, 1.00)
-2 hsla(29.00, 54.00%, 65.88%, 1.00)
-3 hsla(286.00, 51.00%, 75.25%, 1.00)
-"#},
-            &bracket_colors_markup(&mut cx),
-        );
-
-        cx.update_editor(|editor, window, cx| {
-            editor.handle_input(">", window, cx);
-        });
-        cx.executor().advance_clock(Duration::from_millis(100));
-        cx.executor().run_until_parked();
-        assert_eq!(
-            indoc! {r#"
-struct Foo«1<'a, T>1» «1{
-    data: Vec«2<Option«3<&'a T>3»>2»,
-}1»
-
-fn process_data«1()1» «1{
-    let map: Result<Option<Foo«2<'_, «3()3»>2»
-}1»
-
-1 hsla(207.80, 16.20%, 69.19%, 1.00)
-2 hsla(29.00, 54.00%, 65.88%, 1.00)
-3 hsla(286.00, 51.00%, 75.25%, 1.00)
-"#},
-            &bracket_colors_markup(&mut cx),
-            "When brackets start to get closed, inner brackets are re-colored based on their depth"
-        );
-
-        cx.update_editor(|editor, window, cx| {
-            editor.handle_input(">", window, cx);
-        });
-        cx.executor().advance_clock(Duration::from_millis(100));
-        cx.executor().run_until_parked();
-        assert_eq!(
-            indoc! {r#"
-struct Foo«1<'a, T>1» «1{
-    data: Vec«2<Option«3<&'a T>3»>2»,
-}1»
-
-fn process_data«1()1» «1{
-    let map: Result<Option«2<Foo«3<'_, «4()4»>3»>2»
-}1»
-
-1 hsla(207.80, 16.20%, 69.19%, 1.00)
-2 hsla(29.00, 54.00%, 65.88%, 1.00)
-3 hsla(286.00, 51.00%, 75.25%, 1.00)
-4 hsla(187.00, 47.00%, 59.22%, 1.00)
-"#},
-            &bracket_colors_markup(&mut cx),
-        );
-
-        cx.update_editor(|editor, window, cx| {
-            editor.handle_input(", ()> = unimplemented!();", window, cx);
-        });
-        cx.executor().advance_clock(Duration::from_millis(100));
-        cx.executor().run_until_parked();
-        assert_eq!(
-            indoc! {r#"
-struct Foo«1<'a, T>1» «1{
-    data: Vec«2<Option«3<&'a T>3»>2»,
-}1»
-
-fn process_data«1()1» «1{
-    let map: Result«2<Option«3<Foo«4<'_, «5()5»>4»>3», «3()3»>2» = unimplemented!«2()2»;
-}1»
-
-1 hsla(207.80, 16.20%, 69.19%, 1.00)
-2 hsla(29.00, 54.00%, 65.88%, 1.00)
-3 hsla(286.00, 51.00%, 75.25%, 1.00)
-4 hsla(187.00, 47.00%, 59.22%, 1.00)
-5 hsla(355.00, 65.00%, 75.94%, 1.00)
-"#},
-            &bracket_colors_markup(&mut cx),
-        );
-    }
-
-    #[gpui::test]
-    async fn test_bracket_colorization_chunks(cx: &mut gpui::TestAppContext) {
-        let comment_lines = 100;
-
-        init_test(cx, |language_settings| {
-            language_settings.defaults.colorize_brackets = Some(true);
-        });
-        let mut cx = EditorLspTestContext::new(
-            Arc::into_inner(rust_lang()).unwrap(),
-            lsp::ServerCapabilities::default(),
-            cx,
-        )
-        .await;
-
-        cx.set_state(&separate_with_comment_lines(
-            indoc! {r#"
-mod foo {
-    ˇfn process_data_1() {
-        let map: Option<Vec<()>> = None;
-    }
-"#},
-            indoc! {r#"
-    fn process_data_2() {
-        let map: Option<Vec<()>> = None;
-    }
-}
-"#},
-            comment_lines,
-        ));
-
-        cx.executor().advance_clock(Duration::from_millis(100));
-        cx.executor().run_until_parked();
-        assert_eq!(
-            &separate_with_comment_lines(
-                indoc! {r#"
-mod foo «1{
-    fn process_data_1«2()2» «2{
-        let map: Option«3<Vec«4<«5()5»>4»>3» = None;
-    }2»
-"#},
-                indoc! {r#"
-    fn process_data_2() {
-        let map: Option<Vec<()>> = None;
-    }
-}1»
-
-1 hsla(207.80, 16.20%, 69.19%, 1.00)
-2 hsla(29.00, 54.00%, 65.88%, 1.00)
-3 hsla(286.00, 51.00%, 75.25%, 1.00)
-4 hsla(187.00, 47.00%, 59.22%, 1.00)
-5 hsla(355.00, 65.00%, 75.94%, 1.00)
-"#},
-                comment_lines,
-            ),
-            &bracket_colors_markup(&mut cx),
-            "First, the only visible chunk is getting the bracket highlights"
-        );
-
-        cx.update_editor(|editor, window, cx| {
-            editor.move_to_end(&MoveToEnd, window, cx);
-            editor.move_up(&MoveUp, window, cx);
-        });
-        cx.executor().advance_clock(Duration::from_millis(100));
-        cx.executor().run_until_parked();
-        assert_eq!(
-            &separate_with_comment_lines(
-                indoc! {r#"
-mod foo «1{
-    fn process_data_1«2()2» «2{
-        let map: Option«3<Vec«4<«5()5»>4»>3» = None;
-    }2»
-"#},
-                indoc! {r#"
-    fn process_data_2«2()2» «2{
-        let map: Option«3<Vec«4<«5()5»>4»>3» = None;
-    }2»
-}1»
-
-1 hsla(207.80, 16.20%, 69.19%, 1.00)
-2 hsla(29.00, 54.00%, 65.88%, 1.00)
-3 hsla(286.00, 51.00%, 75.25%, 1.00)
-4 hsla(187.00, 47.00%, 59.22%, 1.00)
-5 hsla(355.00, 65.00%, 75.94%, 1.00)
-"#},
-                comment_lines,
-            ),
-            &bracket_colors_markup(&mut cx),
-            "After scrolling to the bottom, both chunks should have the highlights"
-        );
-
-        cx.update_editor(|editor, window, cx| {
-            editor.handle_input("{{}}}", window, cx);
-        });
-        cx.executor().advance_clock(Duration::from_millis(100));
-        cx.executor().run_until_parked();
-        assert_eq!(
-            &separate_with_comment_lines(
-                indoc! {r#"
-mod foo «1{
-    fn process_data_1() {
-        let map: Option<Vec<()>> = None;
-    }
-"#},
-                indoc! {r#"
-    fn process_data_2«2()2» «2{
-        let map: Option«3<Vec«4<«5()5»>4»>3» = None;
-    }
-    «3{«4{}4»}3»}2»}1»
-
-1 hsla(207.80, 16.20%, 69.19%, 1.00)
-2 hsla(29.00, 54.00%, 65.88%, 1.00)
-3 hsla(286.00, 51.00%, 75.25%, 1.00)
-4 hsla(187.00, 47.00%, 59.22%, 1.00)
-5 hsla(355.00, 65.00%, 75.94%, 1.00)
-"#},
-                comment_lines,
-            ),
-            &bracket_colors_markup(&mut cx),
-            "First chunk's brackets are invalidated after an edit, and only 2nd (visible) chunk is re-colorized"
-        );
-
-        cx.update_editor(|editor, window, cx| {
-            editor.move_to_beginning(&MoveToBeginning, window, cx);
-        });
-        cx.executor().advance_clock(Duration::from_millis(100));
-        cx.executor().run_until_parked();
-        assert_eq!(
-            &separate_with_comment_lines(
-                indoc! {r#"
-mod foo «1{
-    fn process_data_1«2()2» «2{
-        let map: Option«3<Vec«4<«5()5»>4»>3» = None;
-    }2»
-"#},
-                indoc! {r#"
-    fn process_data_2«2()2» «2{
-        let map: Option«3<Vec«4<«5()5»>4»>3» = None;
-    }
-    «3{«4{}4»}3»}2»}1»
-
-1 hsla(207.80, 16.20%, 69.19%, 1.00)
-2 hsla(29.00, 54.00%, 65.88%, 1.00)
-3 hsla(286.00, 51.00%, 75.25%, 1.00)
-4 hsla(187.00, 47.00%, 59.22%, 1.00)
-5 hsla(355.00, 65.00%, 75.94%, 1.00)
-"#},
-                comment_lines,
-            ),
-            &bracket_colors_markup(&mut cx),
-            "Scrolling back to top should re-colorize all chunks' brackets"
-        );
-
-        cx.update(|_, cx| {
-            SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |settings| {
-                    settings.project.all_languages.defaults.colorize_brackets = Some(false);
-                });
-            });
-        });
-        assert_eq!(
-            &separate_with_comment_lines(
-                indoc! {r#"
-mod foo {
-    fn process_data_1() {
-        let map: Option<Vec<()>> = None;
-    }
-"#},
-                r#"    fn process_data_2() {
-        let map: Option<Vec<()>> = None;
-    }
-    {{}}}}
-
-"#,
-                comment_lines,
-            ),
-            &bracket_colors_markup(&mut cx),
-            "Turning bracket colorization off should remove all bracket colors"
-        );
-
-        cx.update(|_, cx| {
-            SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |settings| {
-                    settings.project.all_languages.defaults.colorize_brackets = Some(true);
-                });
-            });
-        });
-        assert_eq!(
-            &separate_with_comment_lines(
-                indoc! {r#"
-mod foo «1{
-    fn process_data_1«2()2» «2{
-        let map: Option«3<Vec«4<«5()5»>4»>3» = None;
-    }2»
-"#},
-                r#"    fn process_data_2() {
-        let map: Option<Vec<()>> = None;
-    }
-    {{}}}}1»
-
-1 hsla(207.80, 16.20%, 69.19%, 1.00)
-2 hsla(29.00, 54.00%, 65.88%, 1.00)
-3 hsla(286.00, 51.00%, 75.25%, 1.00)
-4 hsla(187.00, 47.00%, 59.22%, 1.00)
-5 hsla(355.00, 65.00%, 75.94%, 1.00)
-"#,
-                comment_lines,
-            ),
-            &bracket_colors_markup(&mut cx),
-            "Turning bracket colorization back on refreshes the visible excerpts' bracket colors"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_rainbow_bracket_highlights(cx: &mut gpui::TestAppContext) {
-        init_test(cx, |language_settings| {
-            language_settings.defaults.colorize_brackets = Some(true);
-        });
-        let mut cx = EditorLspTestContext::new(
-            Arc::into_inner(rust_lang()).unwrap(),
-            lsp::ServerCapabilities::default(),
-            cx,
-        )
-        .await;
-
-        // taken from r-a https://github.com/rust-lang/rust-analyzer/blob/d733c07552a2dc0ec0cc8f4df3f0ca969a93fd90/crates/ide/src/inlay_hints.rs#L81-L297
-        cx.set_state(indoc! {r#"ˇ
-            pub(crate) fn inlay_hints(
-                db: &RootDatabase,
-                file_id: FileId,
-                range_limit: Option<TextRange>,
-                config: &InlayHintsConfig,
-            ) -> Vec<InlayHint> {
-                let _p = tracing::info_span!("inlay_hints").entered();
-                let sema = Semantics::new(db);
-                let file_id = sema
-                    .attach_first_edition(file_id)
-                    .unwrap_or_else(|| EditionedFileId::current_edition(db, file_id));
-                let file = sema.parse(file_id);
-                let file = file.syntax();
-
-                let mut acc = Vec::new();
-
-                let Some(scope) = sema.scope(file) else {
-                    return acc;
-                };
-                let famous_defs = FamousDefs(&sema, scope.krate());
-                let display_target = famous_defs.1.to_display_target(sema.db);
-
-                let ctx = &mut InlayHintCtx::default();
-                let mut hints = |event| {
-                    if let Some(node) = handle_event(ctx, event) {
-                        hints(&mut acc, ctx, &famous_defs, config, file_id, display_target, node);
-                    }
-                };
-                let mut preorder = file.preorder();
-                salsa::attach(sema.db, || {
-                    while let Some(event) = preorder.next() {
-                        if matches!((&event, range_limit), (WalkEvent::Enter(node), Some(range)) if range.intersect(node.text_range()).is_none())
-                        {
-                            preorder.skip_subtree();
-                            continue;
-                        }
-                        hints(event);
-                    }
-                });
-                if let Some(range_limit) = range_limit {
-                    acc.retain(|hint| range_limit.contains_range(hint.range));
-                }
-                acc
-            }
-
-            #[derive(Default)]
-            struct InlayHintCtx {
-                lifetime_stacks: Vec<Vec<SmolStr>>,
-                extern_block_parent: Option<ast::ExternBlock>,
-            }
-
-            pub(crate) fn inlay_hints_resolve(
-                db: &RootDatabase,
-                file_id: FileId,
-                resolve_range: TextRange,
-                hash: u64,
-                config: &InlayHintsConfig,
-                hasher: impl Fn(&InlayHint) -> u64,
-            ) -> Option<InlayHint> {
-                let _p = tracing::info_span!("inlay_hints_resolve").entered();
-                let sema = Semantics::new(db);
-                let file_id = sema
-                    .attach_first_edition(file_id)
-                    .unwrap_or_else(|| EditionedFileId::current_edition(db, file_id));
-                let file = sema.parse(file_id);
-                let file = file.syntax();
-
-                let scope = sema.scope(file)?;
-                let famous_defs = FamousDefs(&sema, scope.krate());
-                let mut acc = Vec::new();
-
-                let display_target = famous_defs.1.to_display_target(sema.db);
-
-                let ctx = &mut InlayHintCtx::default();
-                let mut hints = |event| {
-                    if let Some(node) = handle_event(ctx, event) {
-                        hints(&mut acc, ctx, &famous_defs, config, file_id, display_target, node);
-                    }
-                };
-
-                let mut preorder = file.preorder();
-                while let Some(event) = preorder.next() {
-                    // This can miss some hints that require the parent of the range to calculate
-                    if matches!(&event, WalkEvent::Enter(node) if resolve_range.intersect(node.text_range()).is_none())
-                    {
-                        preorder.skip_subtree();
-                        continue;
-                    }
-                    hints(event);
-                }
-                acc.into_iter().find(|hint| hasher(hint) == hash)
-            }
-
-            fn handle_event(ctx: &mut InlayHintCtx, node: WalkEvent<SyntaxNode>) -> Option<SyntaxNode> {
-                match node {
-                    WalkEvent::Enter(node) => {
-                        if let Some(node) = ast::AnyHasGenericParams::cast(node.clone()) {
-                            let params = node
-                                .generic_param_list()
-                                .map(|it| {
-                                    it.lifetime_params()
-                                        .filter_map(|it| {
-                                            it.lifetime().map(|it| format_smolstr!("{}", &it.text()[1..]))
-                                        })
-                                        .collect()
-                                })
-                                .unwrap_or_default();
-                            ctx.lifetime_stacks.push(params);
-                        }
-                        if let Some(node) = ast::ExternBlock::cast(node.clone()) {
-                            ctx.extern_block_parent = Some(node);
-                        }
-                        Some(node)
-                    }
-                    WalkEvent::Leave(n) => {
-                        if ast::AnyHasGenericParams::can_cast(n.kind()) {
-                            ctx.lifetime_stacks.pop();
-                        }
-                        if ast::ExternBlock::can_cast(n.kind()) {
-                            ctx.extern_block_parent = None;
-                        }
-                        None
-                    }
-                }
-            }
-
-            // At some point when our hir infra is fleshed out enough we should flip this and traverse the
-            // HIR instead of the syntax tree.
-            fn hints(
-                hints: &mut Vec<InlayHint>,
-                ctx: &mut InlayHintCtx,
-                famous_defs @ FamousDefs(sema, _krate): &FamousDefs<'_, '_>,
-                config: &InlayHintsConfig,
-                file_id: EditionedFileId,
-                display_target: DisplayTarget,
-                node: SyntaxNode,
-            ) {
-                closing_brace::hints(
-                    hints,
-                    sema,
-                    config,
-                    display_target,
-                    InRealFile { file_id, value: node.clone() },
-                );
-                if let Some(any_has_generic_args) = ast::AnyHasGenericArgs::cast(node.clone()) {
-                    generic_param::hints(hints, famous_defs, config, any_has_generic_args);
-                }
-
-                match_ast! {
-                    match node {
-                        ast::Expr(expr) => {
-                            chaining::hints(hints, famous_defs, config, display_target, &expr);
-                            adjustment::hints(hints, famous_defs, config, display_target, &expr);
-                            match expr {
-                                ast::Expr::CallExpr(it) => param_name::hints(hints, famous_defs, config, file_id, ast::Expr::from(it)),
-                                ast::Expr::MethodCallExpr(it) => {
-                                    param_name::hints(hints, famous_defs, config, file_id, ast::Expr::from(it))
-                                }
-                                ast::Expr::ClosureExpr(it) => {
-                                    closure_captures::hints(hints, famous_defs, config, it.clone());
-                                    closure_ret::hints(hints, famous_defs, config, display_target, it)
-                                },
-                                ast::Expr::RangeExpr(it) => range_exclusive::hints(hints, famous_defs, config, it),
-                                _ => Some(()),
-                            }
-                        },
-                        ast::Pat(it) => {
-                            binding_mode::hints(hints, famous_defs, config, &it);
-                            match it {
-                                ast::Pat::IdentPat(it) => {
-                                    bind_pat::hints(hints, famous_defs, config, display_target, &it);
-                                }
-                                ast::Pat::RangePat(it) => {
-                                    range_exclusive::hints(hints, famous_defs, config, it);
-                                }
-                                _ => {}
-                            }
-                            Some(())
-                        },
-                        ast::Item(it) => match it {
-                            ast::Item::Fn(it) => {
-                                implicit_drop::hints(hints, famous_defs, config, display_target, &it);
-                                if let Some(extern_block) = &ctx.extern_block_parent {
-                                    extern_block::fn_hints(hints, famous_defs, config, &it, extern_block);
-                                }
-                                lifetime::fn_hints(hints, ctx, famous_defs, config,  it)
-                            },
-                            ast::Item::Static(it) => {
-                                if let Some(extern_block) = &ctx.extern_block_parent {
-                                    extern_block::static_hints(hints, famous_defs, config, &it, extern_block);
-                                }
-                                implicit_static::hints(hints, famous_defs, config,  Either::Left(it))
-                            },
-                            ast::Item::Const(it) => implicit_static::hints(hints, famous_defs, config, Either::Right(it)),
-                            ast::Item::Enum(it) => discriminant::enum_hints(hints, famous_defs, config, it),
-                            ast::Item::ExternBlock(it) => extern_block::extern_block_hints(hints, famous_defs, config, it),
-                            _ => None,
-                        },
-                        // trait object type elisions
-                        ast::Type(ty) => match ty {
-                            ast::Type::FnPtrType(ptr) => lifetime::fn_ptr_hints(hints, ctx, famous_defs, config,  ptr),
-                            ast::Type::PathType(path) => {
-                                lifetime::fn_path_hints(hints, ctx, famous_defs, config, &path);
-                                implied_dyn_trait::hints(hints, famous_defs, config, Either::Left(path));
-                                Some(())
-                            },
-                            ast::Type::DynTraitType(dyn_) => {
-                                implied_dyn_trait::hints(hints, famous_defs, config, Either::Right(dyn_));
-                                Some(())
-                            },
-                            _ => Some(()),
-                        },
-                        ast::GenericParamList(it) => bounds::hints(hints, famous_defs, config,  it),
-                        _ => Some(()),
-                    }
-                };
-            }
-        "#});
-        cx.executor().advance_clock(Duration::from_millis(100));
-        cx.executor().run_until_parked();
-
-        let actual_ranges = cx.update_editor(|editor, window, cx| {
-            editor
-                .snapshot(window, cx)
-                .all_text_highlight_ranges::<ColorizedBracketsHighlight>()
-        });
-
-        let mut highlighted_brackets = HashMap::default();
-        for (color, range) in actual_ranges.iter().cloned() {
-            highlighted_brackets.insert(range, color);
-        }
-
-        let last_bracket = actual_ranges
-            .iter()
-            .max_by_key(|(_, p)| p.end.row)
-            .unwrap()
-            .clone();
-
-        cx.update_editor(|editor, window, cx| {
-            let was_scrolled = editor.set_scroll_position(
-                gpui::Point::new(0.0, last_bracket.1.end.row as f64 * 2.0),
-                window,
-                cx,
-            );
-            assert!(was_scrolled.0);
-        });
-        cx.executor().advance_clock(Duration::from_millis(100));
-        cx.executor().run_until_parked();
-
-        let ranges_after_scrolling = cx.update_editor(|editor, window, cx| {
-            editor
-                .snapshot(window, cx)
-                .all_text_highlight_ranges::<ColorizedBracketsHighlight>()
-        });
-        let new_last_bracket = ranges_after_scrolling
-            .iter()
-            .max_by_key(|(_, p)| p.end.row)
-            .unwrap()
-            .clone();
-
-        assert_ne!(
-            last_bracket, new_last_bracket,
-            "After scrolling down, we should have highlighted more brackets"
-        );
-
-        cx.update_editor(|editor, window, cx| {
-            let was_scrolled = editor.set_scroll_position(gpui::Point::default(), window, cx);
-            assert!(was_scrolled.0);
-        });
-
-        for _ in 0..200 {
-            cx.update_editor(|editor, window, cx| {
-                editor.apply_scroll_delta(gpui::Point::new(0.0, 0.25), window, cx);
-            });
-            cx.executor().advance_clock(Duration::from_millis(100));
-            cx.executor().run_until_parked();
-
-            let colored_brackets = cx.update_editor(|editor, window, cx| {
-                editor
-                    .snapshot(window, cx)
-                    .all_text_highlight_ranges::<ColorizedBracketsHighlight>()
-            });
-            for (color, range) in colored_brackets.clone() {
-                assert!(
-                    highlighted_brackets.entry(range).or_insert(color) == &color,
-                    "Colors should stay consistent while scrolling!"
-                );
-            }
-
-            let snapshot = cx.update_editor(|editor, window, cx| editor.snapshot(window, cx));
-            let scroll_position = snapshot.scroll_position();
-            let visible_lines =
-                cx.update_editor(|editor, _, _| editor.visible_line_count().unwrap());
-            let visible_range = DisplayRow(scroll_position.y as u32)
-                ..DisplayRow((scroll_position.y + visible_lines) as u32);
-
-            let current_highlighted_bracket_set: HashSet<Point> = HashSet::from_iter(
-                colored_brackets
-                    .iter()
-                    .flat_map(|(_, range)| [range.start, range.end]),
-            );
-
-            for highlight_range in highlighted_brackets.keys().filter(|bracket_range| {
-                visible_range.contains(&bracket_range.start.to_display_point(&snapshot).row())
-                    || visible_range.contains(&bracket_range.end.to_display_point(&snapshot).row())
-            }) {
-                assert!(
-                    current_highlighted_bracket_set.contains(&highlight_range.start)
-                        || current_highlighted_bracket_set.contains(&highlight_range.end),
-                    "Should not lose highlights while scrolling in the visible range!"
-                );
-            }
-
-            let buffer_snapshot = snapshot.buffer().as_singleton().unwrap().2;
-            for bracket_match in buffer_snapshot
-                .fetch_bracket_ranges(
-                    snapshot
-                        .display_point_to_point(
-                            DisplayPoint::new(visible_range.start, 0),
-                            Bias::Left,
-                        )
-                        .to_offset(&buffer_snapshot)
-                        ..snapshot
-                            .display_point_to_point(
-                                DisplayPoint::new(
-                                    visible_range.end,
-                                    snapshot.line_len(visible_range.end),
-                                ),
-                                Bias::Right,
-                            )
-                            .to_offset(&buffer_snapshot),
-                    None,
-                )
-                .iter()
-                .flat_map(|entry| entry.1)
-                .filter(|bracket_match| bracket_match.color_index.is_some())
-            {
-                let start = bracket_match.open_range.to_point(buffer_snapshot);
-                let end = bracket_match.close_range.to_point(buffer_snapshot);
-                let start_bracket = colored_brackets.iter().find(|(_, range)| *range == start);
-                assert!(
-                    start_bracket.is_some(),
-                    "Existing bracket start in the visible range should be highlighted. Missing color for match: \"{}\" at position {:?}",
-                    buffer_snapshot
-                        .text_for_range(start.start..end.end)
-                        .collect::<String>(),
-                    start
-                );
-
-                let end_bracket = colored_brackets.iter().find(|(_, range)| *range == end);
-                assert!(
-                    end_bracket.is_some(),
-                    "Existing bracket end in the visible range should be highlighted. Missing color for match: \"{}\" at position {:?}",
-                    buffer_snapshot
-                        .text_for_range(start.start..end.end)
-                        .collect::<String>(),
-                    start
-                );
-
-                assert_eq!(
-                    start_bracket.unwrap().0,
-                    end_bracket.unwrap().0,
-                    "Bracket pair should be highlighted the same color!"
-                )
-            }
-        }
-    }
-
-    #[gpui::test]
-    async fn test_multi_buffer(cx: &mut gpui::TestAppContext) {
-        let comment_lines = 100;
-
-        init_test(cx, |language_settings| {
-            language_settings.defaults.colorize_brackets = Some(true);
-        });
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(
-            path!("/a"),
-            json!({
-                "main.rs": "fn main() {{()}}",
-                "lib.rs": separate_with_comment_lines(
-                    indoc! {r#"
-    mod foo {
-        fn process_data_1() {
-            let map: Option<Vec<()>> = None;
-            // a
-            // b
-            // c
-        }
-    "#},
-                    indoc! {r#"
-        fn process_data_2() {
-            let other_map: Option<Vec<()>> = None;
-        }
-    }
-    "#},
-                    comment_lines,
-                )
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
-        let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-        language_registry.add(rust_lang());
-
-        let buffer_1 = project
-            .update(cx, |project, cx| {
-                project.open_local_buffer(path!("/a/lib.rs"), cx)
-            })
-            .await
-            .unwrap();
-        let buffer_2 = project
-            .update(cx, |project, cx| {
-                project.open_local_buffer(path!("/a/main.rs"), cx)
-            })
-            .await
-            .unwrap();
-
-        let multi_buffer = cx.new(|cx| {
-            let mut multi_buffer = MultiBuffer::new(Capability::ReadWrite);
-            multi_buffer.push_excerpts(
-                buffer_2.clone(),
-                [ExcerptRange::new(Point::new(0, 0)..Point::new(1, 0))],
-                cx,
-            );
-
-            let excerpt_rows = 5;
-            let rest_of_first_except_rows = 3;
-            multi_buffer.push_excerpts(
-                buffer_1.clone(),
-                [
-                    ExcerptRange::new(Point::new(0, 0)..Point::new(excerpt_rows, 0)),
-                    ExcerptRange::new(
-                        Point::new(
-                            comment_lines as u32 + excerpt_rows + rest_of_first_except_rows,
-                            0,
-                        )
-                            ..Point::new(
-                                comment_lines as u32
-                                    + excerpt_rows
-                                    + rest_of_first_except_rows
-                                    + excerpt_rows,
-                                0,
-                            ),
-                    ),
-                ],
-                cx,
-            );
-            multi_buffer
-        });
-
-        let editor = cx.add_window(|window, cx| {
-            Editor::for_multibuffer(multi_buffer, Some(project.clone()), window, cx)
-        });
-        cx.executor().advance_clock(Duration::from_millis(100));
-        cx.executor().run_until_parked();
-
-        let editor_snapshot = editor
-            .update(cx, |editor, window, cx| editor.snapshot(window, cx))
-            .unwrap();
-        assert_eq!(
-            indoc! {r#"
-
-
-fn main«1()1» «1{«2{«3()3»}2»}1»
-
-
-mod foo «1{
-    fn process_data_1«2()2» «2{
-        let map: Option«3<Vec«4<«5()5»>4»>3» = None;
-        // a
-        // b
-
-
-    fn process_data_2«2()2» «2{
-        let other_map: Option«3<Vec«4<«5()5»>4»>3» = None;
-    }2»
-}1»
-
-1 hsla(207.80, 16.20%, 69.19%, 1.00)
-2 hsla(29.00, 54.00%, 65.88%, 1.00)
-3 hsla(286.00, 51.00%, 75.25%, 1.00)
-4 hsla(187.00, 47.00%, 59.22%, 1.00)
-5 hsla(355.00, 65.00%, 75.94%, 1.00)
-"#,},
-            &editor_bracket_colors_markup(&editor_snapshot),
-            "Multi buffers should have their brackets colored even if no excerpts contain the bracket counterpart (after fn `process_data_2()`) \
-or if the buffer pair spans across multiple excerpts (the one after `mod foo`)"
-        );
-
-        editor
-            .update(cx, |editor, window, cx| {
-                editor.handle_input("{[]", window, cx);
-            })
-            .unwrap();
-        cx.executor().advance_clock(Duration::from_millis(100));
-        cx.executor().run_until_parked();
-        let editor_snapshot = editor
-            .update(cx, |editor, window, cx| editor.snapshot(window, cx))
-            .unwrap();
-        assert_eq!(
-            indoc! {r#"
-
-
-{«1[]1»fn main«1()1» «1{«2{«3()3»}2»}1»
-
-
-mod foo «1{
-    fn process_data_1«2()2» «2{
-        let map: Option«3<Vec«4<«5()5»>4»>3» = None;
-        // a
-        // b
-
-
-    fn process_data_2«2()2» «2{
-        let other_map: Option«3<Vec«4<«5()5»>4»>3» = None;
-    }2»
-}1»
-
-1 hsla(207.80, 16.20%, 69.19%, 1.00)
-2 hsla(29.00, 54.00%, 65.88%, 1.00)
-3 hsla(286.00, 51.00%, 75.25%, 1.00)
-4 hsla(187.00, 47.00%, 59.22%, 1.00)
-5 hsla(355.00, 65.00%, 75.94%, 1.00)
-"#,},
-            &editor_bracket_colors_markup(&editor_snapshot),
-        );
-
-        cx.update(|cx| {
-            let theme = cx.theme().name.clone();
-            SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |settings| {
-                    settings.theme.theme_overrides = HashMap::from_iter([(
-                        theme.to_string(),
-                        ThemeStyleContent {
-                            accents: vec![
-                                AccentContent(Some(SharedString::new("#ff0000"))),
-                                AccentContent(Some(SharedString::new("#0000ff"))),
-                            ],
-                            ..ThemeStyleContent::default()
-                        },
-                    )]);
-                });
-            });
-        });
-        cx.executor().advance_clock(Duration::from_millis(100));
-        cx.executor().run_until_parked();
-        let editor_snapshot = editor
-            .update(cx, |editor, window, cx| editor.snapshot(window, cx))
-            .unwrap();
-        assert_eq!(
-            indoc! {r#"
-
-
-{«1[]1»fn main«1()1» «1{«2{«1()1»}2»}1»
-
-
-mod foo «1{
-    fn process_data_1«2()2» «2{
-        let map: Option«1<Vec«2<«1()1»>2»>1» = None;
-        // a
-        // b
-
-
-    fn process_data_2«2()2» «2{
-        let other_map: Option«1<Vec«2<«1()1»>2»>1» = None;
-    }2»
-}1»
-
-1 hsla(0.00, 100.00%, 78.12%, 1.00)
-2 hsla(240.00, 100.00%, 82.81%, 1.00)
-"#,},
-            &editor_bracket_colors_markup(&editor_snapshot),
-            "After updating theme accents, the editor should update the bracket coloring"
-        );
-    }
-
-    fn separate_with_comment_lines(head: &str, tail: &str, comment_lines: usize) -> String {
-        let mut result = head.to_string();
-        result.push_str("\n");
-        result.push_str(&"//\n".repeat(comment_lines));
-        result.push_str(tail);
-        result
-    }
-
-    fn bracket_colors_markup(cx: &mut EditorTestContext) -> String {
-        cx.update_editor(|editor, window, cx| {
-            editor_bracket_colors_markup(&editor.snapshot(window, cx))
-        })
-    }
-
-    fn editor_bracket_colors_markup(snapshot: &EditorSnapshot) -> String {
-        fn display_point_to_offset(text: &str, point: DisplayPoint) -> usize {
-            let mut offset = 0;
-            for (row_idx, line) in text.lines().enumerate() {
-                if row_idx < point.row().0 as usize {
-                    offset += line.len() + 1; // +1 for newline
-                } else {
-                    offset += point.column() as usize;
-                    break;
-                }
-            }
-            offset
-        }
-
-        let actual_ranges = snapshot.all_text_highlight_ranges::<ColorizedBracketsHighlight>();
-        let editor_text = snapshot.text();
-
-        let mut next_index = 1;
-        let mut color_to_index = HashMap::default();
-        let mut annotations = Vec::new();
-        for (color, range) in &actual_ranges {
-            let color_index = *color_to_index
-                .entry(*color)
-                .or_insert_with(|| post_inc(&mut next_index));
-            let start = snapshot.point_to_display_point(range.start, Bias::Left);
-            let end = snapshot.point_to_display_point(range.end, Bias::Right);
-            let start_offset = display_point_to_offset(&editor_text, start);
-            let end_offset = display_point_to_offset(&editor_text, end);
-            let bracket_text = &editor_text[start_offset..end_offset];
-            let bracket_char = bracket_text.chars().next().unwrap();
-
-            if matches!(bracket_char, '{' | '[' | '(' | '<') {
-                annotations.push((start_offset, format!("«{color_index}")));
-            } else {
-                annotations.push((end_offset, format!("{color_index}»")));
-            }
-        }
-
-        annotations.sort_by(|(pos_a, text_a), (pos_b, text_b)| {
-            pos_a.cmp(pos_b).reverse().then_with(|| {
-                let a_is_opening = text_a.starts_with('«');
-                let b_is_opening = text_b.starts_with('«');
-                match (a_is_opening, b_is_opening) {
-                    (true, false) => cmp::Ordering::Less,
-                    (false, true) => cmp::Ordering::Greater,
-                    _ => cmp::Ordering::Equal,
-                }
-            })
-        });
-        annotations.dedup();
-
-        let mut markup = editor_text;
-        for (offset, text) in annotations {
-            markup.insert_str(offset, &text);
-        }
-
-        markup.push_str("\n");
-        for (index, color) in color_to_index
-            .iter()
-            .map(|(color, index)| (*index, *color))
-            .sorted_by_key(|(index, _)| *index)
-        {
-            markup.push_str(&format!("{index} {color}\n"));
-        }
-
-        markup
-    }
-}
diff --git a/crates/editor/src/clangd_ext.rs b/crates/editor/src/clangd_ext.rs
deleted file mode 100644
index 4993658098..0000000000
--- a/crates/editor/src/clangd_ext.rs
+++ /dev/null
@@ -1,130 +0,0 @@
-use std::path::PathBuf;
-
-use anyhow::Context as _;
-use gpui::{App, Context, Entity, Window};
-use language::Language;
-use project::lsp_store::lsp_ext_command::SwitchSourceHeaderResult;
-use rpc::proto;
-use util::paths::PathStyle;
-use workspace::{OpenOptions, OpenVisible};
-
-use crate::lsp_ext::find_specific_language_server_in_selection;
-
-use crate::{Editor, SwitchSourceHeader, element::register_action};
-
-use project::lsp_store::clangd_ext::CLANGD_SERVER_NAME;
-
-fn is_c_language(language: &Language) -> bool {
-    language.name() == "C++".into() || language.name() == "C".into()
-}
-
-pub fn switch_source_header(
-    editor: &mut Editor,
-    _: &SwitchSourceHeader,
-    window: &mut Window,
-    cx: &mut Context<Editor>,
-) {
-    let Some(project) = &editor.project else {
-        return;
-    };
-    let Some(workspace) = editor.workspace() else {
-        return;
-    };
-
-    let Some((_, _, server_to_query, buffer)) =
-        find_specific_language_server_in_selection(editor, cx, is_c_language, CLANGD_SERVER_NAME)
-    else {
-        return;
-    };
-    let project = project.clone();
-    let upstream_client = project.read(cx).lsp_store().read(cx).upstream_client();
-    cx.spawn_in(window, async move |_editor, cx| {
-        let source_file = buffer.read_with(cx, |buffer, _| {
-            buffer
-                .file()
-                .map(|file| file.path())
-                .map(|path| path.display(PathStyle::local()).to_string())
-                .unwrap_or_else(|| "Unknown".to_string())
-        })?;
-
-        let switch_source_header = if let Some((client, project_id)) = upstream_client {
-            let buffer_id = buffer.read_with(cx, |buffer, _| buffer.remote_id())?;
-            let request = proto::LspExtSwitchSourceHeader {
-                project_id,
-                buffer_id: buffer_id.to_proto(),
-            };
-            let response = client
-                .request(request)
-                .await
-                .context("lsp ext switch source header proto request")?;
-            SwitchSourceHeaderResult(response.target_file)
-        } else {
-            project
-                .update(cx, |project, cx| {
-                    project.request_lsp(
-                        buffer,
-                        project::LanguageServerToQuery::Other(server_to_query),
-                        project::lsp_store::lsp_ext_command::SwitchSourceHeader,
-                        cx,
-                    )
-                })?
-                .await
-                .with_context(|| {
-                    format!("Switch source/header LSP request for path \"{source_file}\" failed")
-                })?
-        };
-
-        if switch_source_header.0.is_empty() {
-            return Ok(());
-        }
-
-        let goto = switch_source_header
-            .0
-            .strip_prefix("file://")
-            .with_context(|| {
-                format!(
-                    "Parsing file url \"{}\" returned from switch source/header failed",
-                    switch_source_header.0
-                )
-            })?;
-
-        workspace
-            .update_in(cx, |workspace, window, cx| {
-                let goto = if workspace.path_style(cx).is_windows() {
-                    goto.strip_prefix('/').unwrap_or(goto)
-                } else {
-                    goto
-                };
-                let path = PathBuf::from(goto);
-                workspace.open_abs_path(
-                    path,
-                    OpenOptions {
-                        visible: Some(OpenVisible::None),
-                        ..Default::default()
-                    },
-                    window,
-                    cx,
-                )
-            })
-            .with_context(|| {
-                format!("Switch source/header could not open \"{goto}\" in workspace")
-            })?
-            .await
-            .map(|_| ())
-    })
-    .detach_and_log_err(cx);
-}
-
-pub fn apply_related_actions(editor: &Entity<Editor>, window: &mut Window, cx: &mut App) {
-    if editor
-        .read(cx)
-        .buffer()
-        .read(cx)
-        .all_buffers()
-        .into_iter()
-        .filter_map(|buffer| buffer.read(cx).language())
-        .any(|language| is_c_language(language))
-    {
-        register_action(editor, window, switch_source_header);
-    }
-}
diff --git a/crates/editor/src/code_completion_tests.rs b/crates/editor/src/code_completion_tests.rs
deleted file mode 100644
index 4602824486..0000000000
--- a/crates/editor/src/code_completion_tests.rs
+++ /dev/null
@@ -1,446 +0,0 @@
-use crate::code_context_menus::CompletionsMenu;
-use fuzzy::{StringMatch, StringMatchCandidate};
-use gpui::TestAppContext;
-use language::CodeLabel;
-use lsp::{CompletionItem, CompletionItemKind, LanguageServerId};
-use project::{Completion, CompletionSource};
-use settings::SnippetSortOrder;
-use std::sync::Arc;
-use std::sync::atomic::AtomicBool;
-use text::Anchor;
-
-#[gpui::test]
-async fn test_sort_kind(cx: &mut TestAppContext) {
-    let completions = vec![
-        CompletionBuilder::function("floorf128", None, "80000000"),
-        CompletionBuilder::constant("foo_bar_baz", None, "80000000"),
-        CompletionBuilder::variable("foo_bar_qux", None, "80000000"),
-    ];
-    let matches =
-        filter_and_sort_matches("foo", &completions, SnippetSortOrder::default(), cx).await;
-
-    // variable takes precedence over constant
-    // constant take precedence over function
-    assert_eq!(
-        matches
-            .iter()
-            .map(|m| m.string.as_str())
-            .collect::<Vec<_>>(),
-        vec!["foo_bar_qux", "foo_bar_baz", "floorf128"]
-    );
-
-    // fuzzy score should match for first two items as query is common prefix
-    assert_eq!(matches[0].score, matches[1].score);
-}
-
-#[gpui::test]
-async fn test_fuzzy_score(cx: &mut TestAppContext) {
-    // first character sensitive over sort_text and sort_kind
-    {
-        let completions = vec![
-            CompletionBuilder::variable("element_type", None, "7ffffffe"),
-            CompletionBuilder::constant("ElementType", None, "7fffffff"),
-        ];
-        let matches =
-            filter_and_sort_matches("Elem", &completions, SnippetSortOrder::default(), cx).await;
-        assert_eq!(
-            matches
-                .iter()
-                .map(|m| m.string.as_str())
-                .collect::<Vec<_>>(),
-            vec!["ElementType", "element_type"]
-        );
-        assert!(matches[0].score > matches[1].score);
-    }
-
-    // fuzzy takes over sort_text and sort_kind
-    {
-        let completions = vec![
-            CompletionBuilder::function("onAbort?", None, "12"),
-            CompletionBuilder::function("onAuxClick?", None, "12"),
-            CompletionBuilder::variable("onPlay?", None, "12"),
-            CompletionBuilder::variable("onLoad?", None, "12"),
-            CompletionBuilder::variable("onDrag?", None, "12"),
-            CompletionBuilder::function("onPause?", None, "10"),
-            CompletionBuilder::function("onPaste?", None, "10"),
-            CompletionBuilder::function("onAnimationEnd?", None, "12"),
-            CompletionBuilder::function("onAbortCapture?", None, "12"),
-            CompletionBuilder::constant("onChange?", None, "12"),
-            CompletionBuilder::constant("onWaiting?", None, "12"),
-            CompletionBuilder::function("onCanPlay?", None, "12"),
-        ];
-        let matches =
-            filter_and_sort_matches("ona", &completions, SnippetSortOrder::default(), cx).await;
-        for i in 0..4 {
-            assert!(matches[i].string.to_lowercase().starts_with("ona"));
-        }
-    }
-
-    // plain fuzzy prefix match
-    {
-        let completions = vec![
-            CompletionBuilder::function("set_text", None, "7fffffff"),
-            CompletionBuilder::function("set_placeholder_text", None, "7fffffff"),
-            CompletionBuilder::function("set_text_style_refinement", None, "7fffffff"),
-            CompletionBuilder::function("set_context_menu_options", None, "7fffffff"),
-            CompletionBuilder::function("select_to_next_word_end", None, "7fffffff"),
-            CompletionBuilder::function("select_to_next_subword_end", None, "7fffffff"),
-            CompletionBuilder::function("set_custom_context_menu", None, "7fffffff"),
-            CompletionBuilder::function("select_to_end_of_excerpt", None, "7fffffff"),
-            CompletionBuilder::function("select_to_start_of_excerpt", None, "7fffffff"),
-            CompletionBuilder::function("select_to_start_of_next_excerpt", None, "7fffffff"),
-            CompletionBuilder::function("select_to_end_of_previous_excerpt", None, "7fffffff"),
-        ];
-        let matches =
-            filter_and_sort_matches("set_text", &completions, SnippetSortOrder::Top, cx).await;
-        assert_eq!(matches[0].string, "set_text");
-        assert_eq!(matches[1].string, "set_text_style_refinement");
-        assert_eq!(matches[2].string, "set_placeholder_text");
-    }
-
-    // fuzzy filter text over label, sort_text and sort_kind
-    {
-        // Case 1: "awa"
-        let completions = vec![
-            CompletionBuilder::method("await", Some("await"), "7fffffff"),
-            CompletionBuilder::method("await.ne", Some("ne"), "80000010"),
-            CompletionBuilder::method("await.eq", Some("eq"), "80000010"),
-            CompletionBuilder::method("await.or", Some("or"), "7ffffff8"),
-            CompletionBuilder::method("await.zip", Some("zip"), "80000006"),
-            CompletionBuilder::method("await.xor", Some("xor"), "7ffffff8"),
-            CompletionBuilder::method("await.and", Some("and"), "80000006"),
-            CompletionBuilder::method("await.map", Some("map"), "80000006"),
-        ];
-
-        test_for_each_prefix("await", &completions, cx, |matches| {
-            // for each prefix, first item should always be one with lower sort_text
-            assert_eq!(matches[0].string, "await");
-        })
-        .await;
-    }
-}
-
-#[gpui::test]
-async fn test_sort_text(cx: &mut TestAppContext) {
-    // sort text takes precedance over sort_kind, when fuzzy is same
-    {
-        let completions = vec![
-            CompletionBuilder::variable("unreachable", None, "80000000"),
-            CompletionBuilder::function("unreachable!(…)", None, "7fffffff"),
-            CompletionBuilder::function("unchecked_rem", None, "80000010"),
-            CompletionBuilder::function("unreachable_unchecked", None, "80000020"),
-        ];
-
-        test_for_each_prefix("unreachabl", &completions, cx, |matches| {
-            // for each prefix, first item should always be one with lower sort_text
-            assert_eq!(matches[0].string, "unreachable!(…)");
-            assert_eq!(matches[1].string, "unreachable");
-
-            // fuzzy score should match for first two items as query is common prefix
-            assert_eq!(matches[0].score, matches[1].score);
-        })
-        .await;
-
-        let matches =
-            filter_and_sort_matches("unreachable", &completions, SnippetSortOrder::Top, cx).await;
-        // exact match comes first
-        assert_eq!(matches[0].string, "unreachable");
-        assert_eq!(matches[1].string, "unreachable!(…)");
-
-        // fuzzy score should match for first two items as query is common prefix
-        assert_eq!(matches[0].score, matches[1].score);
-    }
-}
-
-#[gpui::test]
-async fn test_sort_snippet(cx: &mut TestAppContext) {
-    let completions = vec![
-        CompletionBuilder::constant("println", None, "7fffffff"),
-        CompletionBuilder::snippet("println!(…)", None, "80000000"),
-    ];
-    let matches = filter_and_sort_matches("prin", &completions, SnippetSortOrder::Top, cx).await;
-
-    // snippet take precedence over sort_text and sort_kind
-    assert_eq!(matches[0].string, "println!(…)");
-}
-
-#[gpui::test]
-async fn test_sort_exact(cx: &mut TestAppContext) {
-    // sort_text takes over if no exact match
-    let completions = vec![
-        CompletionBuilder::function("into", None, "80000004"),
-        CompletionBuilder::function("try_into", None, "80000004"),
-        CompletionBuilder::snippet("println", None, "80000004"),
-        CompletionBuilder::function("clone_into", None, "80000004"),
-        CompletionBuilder::function("into_searcher", None, "80000000"),
-        CompletionBuilder::snippet("eprintln", None, "80000004"),
-    ];
-    let matches =
-        filter_and_sort_matches("int", &completions, SnippetSortOrder::default(), cx).await;
-    assert_eq!(matches[0].string, "into_searcher");
-
-    // exact match takes over sort_text
-    let completions = vec![
-        CompletionBuilder::function("into", None, "80000004"),
-        CompletionBuilder::function("try_into", None, "80000004"),
-        CompletionBuilder::function("clone_into", None, "80000004"),
-        CompletionBuilder::function("into_searcher", None, "80000000"),
-        CompletionBuilder::function("split_terminator", None, "7fffffff"),
-        CompletionBuilder::function("rsplit_terminator", None, "7fffffff"),
-    ];
-    let matches =
-        filter_and_sort_matches("into", &completions, SnippetSortOrder::default(), cx).await;
-    assert_eq!(matches[0].string, "into");
-}
-
-#[gpui::test]
-async fn test_sort_positions(cx: &mut TestAppContext) {
-    // positions take precedence over fuzzy score and sort_text
-    let completions = vec![
-        CompletionBuilder::function("rounded-full", None, "15788"),
-        CompletionBuilder::variable("rounded-t-full", None, "15846"),
-        CompletionBuilder::variable("rounded-b-full", None, "15731"),
-        CompletionBuilder::function("rounded-tr-full", None, "15866"),
-    ];
-
-    let matches = filter_and_sort_matches(
-        "rounded-full",
-        &completions,
-        SnippetSortOrder::default(),
-        cx,
-    )
-    .await;
-    assert_eq!(matches[0].string, "rounded-full");
-
-    let matches =
-        filter_and_sort_matches("roundedfull", &completions, SnippetSortOrder::default(), cx).await;
-    assert_eq!(matches[0].string, "rounded-full");
-}
-
-#[gpui::test]
-async fn test_fuzzy_over_sort_positions(cx: &mut TestAppContext) {
-    let completions = vec![
-        CompletionBuilder::variable("lsp_document_colors", None, "7fffffff"), // 0.29 fuzzy score
-        CompletionBuilder::function(
-            "language_servers_running_disk_based_diagnostics",
-            None,
-            "7fffffff",
-        ), // 0.168 fuzzy score
-        CompletionBuilder::function("code_lens", None, "7fffffff"),           // 3.2 fuzzy score
-        CompletionBuilder::variable("lsp_code_lens", None, "7fffffff"),       // 3.2 fuzzy score
-        CompletionBuilder::function("fetch_code_lens", None, "7fffffff"),     // 3.2 fuzzy score
-    ];
-
-    let matches =
-        filter_and_sort_matches("lens", &completions, SnippetSortOrder::default(), cx).await;
-
-    assert_eq!(matches[0].string, "code_lens");
-    assert_eq!(matches[1].string, "lsp_code_lens");
-    assert_eq!(matches[2].string, "fetch_code_lens");
-}
-
-#[gpui::test]
-async fn test_semver_label_sort_by_latest_version(cx: &mut TestAppContext) {
-    let mut versions = [
-        "10.4.112",
-        "10.4.22",
-        "10.4.2",
-        "10.4.20",
-        "10.4.21",
-        "10.4.12",
-        // Pre-release versions
-        "10.4.22-alpha",
-        "10.4.22-beta.1",
-        "10.4.22-rc.1",
-        // Build metadata versions
-        "10.4.21+build.123",
-        "10.4.20+20210327",
-    ];
-    versions.sort_by(|a, b| {
-        match (
-            semver::Version::parse(a).ok(),
-            semver::Version::parse(b).ok(),
-        ) {
-            (Some(a_ver), Some(b_ver)) => b_ver.cmp(&a_ver),
-            _ => std::cmp::Ordering::Equal,
-        }
-    });
-    let completions: Vec<_> = versions
-        .iter()
-        .enumerate()
-        .map(|(i, version)| {
-            // This sort text would come from the LSP
-            let sort_text = format!("{:08}", i);
-            CompletionBuilder::new(version, None, &sort_text, None)
-        })
-        .collect();
-
-    // Case 1: User types just the major and minor version
-    let matches =
-        filter_and_sort_matches("10.4.", &completions, SnippetSortOrder::default(), cx).await;
-    // Versions are ordered by recency (latest first)
-    let expected_versions = [
-        "10.4.112",
-        "10.4.22",
-        "10.4.22-rc.1",
-        "10.4.22-beta.1",
-        "10.4.22-alpha",
-        "10.4.21+build.123",
-        "10.4.21",
-        "10.4.20+20210327",
-        "10.4.20",
-        "10.4.12",
-        "10.4.2",
-    ];
-    for (match_item, expected) in matches.iter().zip(expected_versions.iter()) {
-        assert_eq!(match_item.string.as_ref() as &str, *expected);
-    }
-
-    // Case 2: User types the major, minor, and patch version
-    let matches =
-        filter_and_sort_matches("10.4.2", &completions, SnippetSortOrder::default(), cx).await;
-    let expected_versions = [
-        // Exact match comes first
-        "10.4.2",
-        // Ordered by recency with exact major, minor, and patch versions
-        "10.4.22",
-        "10.4.22-rc.1",
-        "10.4.22-beta.1",
-        "10.4.22-alpha",
-        "10.4.21+build.123",
-        "10.4.21",
-        "10.4.20+20210327",
-        "10.4.20",
-        // Versions with non-exact patch versions are ordered by fuzzy score
-        // Higher fuzzy score than 112 patch version since "2" appears before "1"
-        // in "12", making it rank higher than "112"
-        "10.4.12",
-        "10.4.112",
-    ];
-    for (match_item, expected) in matches.iter().zip(expected_versions.iter()) {
-        assert_eq!(match_item.string.as_ref() as &str, *expected);
-    }
-}
-
-async fn test_for_each_prefix<F>(
-    target: &str,
-    completions: &Vec<Completion>,
-    cx: &mut TestAppContext,
-    mut test_fn: F,
-) where
-    F: FnMut(Vec<StringMatch>),
-{
-    for i in 1..=target.len() {
-        let prefix = &target[..i];
-        let matches =
-            filter_and_sort_matches(prefix, completions, SnippetSortOrder::default(), cx).await;
-        test_fn(matches);
-    }
-}
-
-struct CompletionBuilder;
-
-impl CompletionBuilder {
-    fn constant(label: &str, filter_text: Option<&str>, sort_text: &str) -> Completion {
-        Self::new(
-            label,
-            filter_text,
-            sort_text,
-            Some(CompletionItemKind::CONSTANT),
-        )
-    }
-
-    fn function(label: &str, filter_text: Option<&str>, sort_text: &str) -> Completion {
-        Self::new(
-            label,
-            filter_text,
-            sort_text,
-            Some(CompletionItemKind::FUNCTION),
-        )
-    }
-
-    fn method(label: &str, filter_text: Option<&str>, sort_text: &str) -> Completion {
-        Self::new(
-            label,
-            filter_text,
-            sort_text,
-            Some(CompletionItemKind::METHOD),
-        )
-    }
-
-    fn variable(label: &str, filter_text: Option<&str>, sort_text: &str) -> Completion {
-        Self::new(
-            label,
-            filter_text,
-            sort_text,
-            Some(CompletionItemKind::VARIABLE),
-        )
-    }
-
-    fn snippet(label: &str, filter_text: Option<&str>, sort_text: &str) -> Completion {
-        Self::new(
-            label,
-            filter_text,
-            sort_text,
-            Some(CompletionItemKind::SNIPPET),
-        )
-    }
-
-    fn new(
-        label: &str,
-        filter_text: Option<&str>,
-        sort_text: &str,
-        kind: Option<CompletionItemKind>,
-    ) -> Completion {
-        Completion {
-            replace_range: Anchor::MIN..Anchor::MAX,
-            new_text: label.to_string(),
-            label: CodeLabel::plain(label.to_string(), filter_text),
-            documentation: None,
-            source: CompletionSource::Lsp {
-                insert_range: None,
-                server_id: LanguageServerId(0),
-                lsp_completion: Box::new(CompletionItem {
-                    label: label.to_string(),
-                    kind: kind,
-                    sort_text: Some(sort_text.to_string()),
-                    filter_text: filter_text.map(|text| text.to_string()),
-                    ..Default::default()
-                }),
-                lsp_defaults: None,
-                resolved: false,
-            },
-            icon_path: None,
-            insert_text_mode: None,
-            confirm: None,
-            match_start: None,
-            snippet_deduplication_key: None,
-        }
-    }
-}
-
-async fn filter_and_sort_matches(
-    query: &str,
-    completions: &Vec<Completion>,
-    snippet_sort_order: SnippetSortOrder,
-    cx: &mut TestAppContext,
-) -> Vec<StringMatch> {
-    let candidates: Arc<[StringMatchCandidate]> = completions
-        .iter()
-        .enumerate()
-        .map(|(id, completion)| StringMatchCandidate::new(id, completion.label.filter_text()))
-        .collect();
-    let cancel_flag = Arc::new(AtomicBool::new(false));
-    let background_executor = cx.executor();
-    let matches = fuzzy::match_strings(
-        &candidates,
-        query,
-        query.chars().any(|c| c.is_uppercase()),
-        false,
-        100,
-        &cancel_flag,
-        background_executor,
-    )
-    .await;
-    CompletionsMenu::sort_string_matches(matches, Some(query), snippet_sort_order, completions)
-}
diff --git a/crates/editor/src/code_context_menus.rs b/crates/editor/src/code_context_menus.rs
deleted file mode 100644
index d255effdb7..0000000000
--- a/crates/editor/src/code_context_menus.rs
+++ /dev/null
@@ -1,1638 +0,0 @@
-use crate::scroll::ScrollAmount;
-use fuzzy::{StringMatch, StringMatchCandidate};
-use gpui::{
-    AnyElement, Entity, Focusable, FontWeight, ListSizingBehavior, ScrollHandle, ScrollStrategy,
-    SharedString, Size, StrikethroughStyle, StyledText, Task, UniformListScrollHandle, div, px,
-    uniform_list,
-};
-use itertools::Itertools;
-use language::CodeLabel;
-use language::{Buffer, LanguageName, LanguageRegistry};
-use lsp::CompletionItemTag;
-use markdown::{Markdown, MarkdownElement};
-use multi_buffer::{Anchor, ExcerptId};
-use ordered_float::OrderedFloat;
-use project::lsp_store::CompletionDocumentation;
-use project::{CodeAction, Completion, TaskSourceKind};
-use project::{CompletionDisplayOptions, CompletionSource};
-use task::DebugScenario;
-use task::TaskContext;
-
-use std::sync::Arc;
-use std::sync::atomic::{AtomicBool, Ordering};
-use std::{
-    cell::RefCell,
-    cmp::{Reverse, min},
-    iter,
-    ops::Range,
-    rc::Rc,
-};
-use task::ResolvedTask;
-use ui::{
-    Color, IntoElement, ListItem, Pixels, Popover, ScrollAxes, Scrollbars, Styled, WithScrollbar,
-    prelude::*,
-};
-use util::ResultExt;
-
-use crate::hover_popover::{hover_markdown_style, open_markdown_url};
-use crate::{
-    CodeActionProvider, CompletionId, CompletionProvider, DisplayRow, Editor, EditorStyle,
-    ResolvedTasks,
-    actions::{ConfirmCodeAction, ConfirmCompletion},
-    split_words, styled_runs_for_code_label,
-};
-use crate::{CodeActionSource, EditorSettings};
-use collections::{HashSet, VecDeque};
-use settings::{Settings, SnippetSortOrder};
-
-pub const MENU_GAP: Pixels = px(4.);
-pub const MENU_ASIDE_X_PADDING: Pixels = px(16.);
-pub const MENU_ASIDE_MIN_WIDTH: Pixels = px(260.);
-pub const MENU_ASIDE_MAX_WIDTH: Pixels = px(500.);
-pub const COMPLETION_MENU_MIN_WIDTH: Pixels = px(280.);
-pub const COMPLETION_MENU_MAX_WIDTH: Pixels = px(540.);
-
-// Constants for the markdown cache. The purpose of this cache is to reduce flickering due to
-// documentation not yet being parsed.
-//
-// The size of the cache is set to 16, which is roughly 3 times more than the number of items
-// fetched around the current selection. This way documentation is more often ready for render when
-// revisiting previous entries, such as when pressing backspace.
-const MARKDOWN_CACHE_MAX_SIZE: usize = 16;
-const MARKDOWN_CACHE_BEFORE_ITEMS: usize = 2;
-const MARKDOWN_CACHE_AFTER_ITEMS: usize = 2;
-
-// Number of items beyond the visible items to resolve documentation.
-const RESOLVE_BEFORE_ITEMS: usize = 4;
-const RESOLVE_AFTER_ITEMS: usize = 4;
-
-pub enum CodeContextMenu {
-    Completions(CompletionsMenu),
-    CodeActions(CodeActionsMenu),
-}
-
-impl CodeContextMenu {
-    pub fn select_first(
-        &mut self,
-        provider: Option<&dyn CompletionProvider>,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) -> bool {
-        if self.visible() {
-            match self {
-                CodeContextMenu::Completions(menu) => menu.select_first(provider, window, cx),
-                CodeContextMenu::CodeActions(menu) => menu.select_first(cx),
-            }
-            true
-        } else {
-            false
-        }
-    }
-
-    pub fn select_prev(
-        &mut self,
-        provider: Option<&dyn CompletionProvider>,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) -> bool {
-        if self.visible() {
-            match self {
-                CodeContextMenu::Completions(menu) => menu.select_prev(provider, window, cx),
-                CodeContextMenu::CodeActions(menu) => menu.select_prev(cx),
-            }
-            true
-        } else {
-            false
-        }
-    }
-
-    pub fn select_next(
-        &mut self,
-        provider: Option<&dyn CompletionProvider>,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) -> bool {
-        if self.visible() {
-            match self {
-                CodeContextMenu::Completions(menu) => menu.select_next(provider, window, cx),
-                CodeContextMenu::CodeActions(menu) => menu.select_next(cx),
-            }
-            true
-        } else {
-            false
-        }
-    }
-
-    pub fn select_last(
-        &mut self,
-        provider: Option<&dyn CompletionProvider>,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) -> bool {
-        if self.visible() {
-            match self {
-                CodeContextMenu::Completions(menu) => menu.select_last(provider, window, cx),
-                CodeContextMenu::CodeActions(menu) => menu.select_last(cx),
-            }
-            true
-        } else {
-            false
-        }
-    }
-
-    pub fn visible(&self) -> bool {
-        match self {
-            CodeContextMenu::Completions(menu) => menu.visible(),
-            CodeContextMenu::CodeActions(menu) => menu.visible(),
-        }
-    }
-
-    pub fn origin(&self) -> ContextMenuOrigin {
-        match self {
-            CodeContextMenu::Completions(menu) => menu.origin(),
-            CodeContextMenu::CodeActions(menu) => menu.origin(),
-        }
-    }
-
-    pub fn render(
-        &self,
-        style: &EditorStyle,
-        max_height_in_lines: u32,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) -> AnyElement {
-        match self {
-            CodeContextMenu::Completions(menu) => {
-                menu.render(style, max_height_in_lines, window, cx)
-            }
-            CodeContextMenu::CodeActions(menu) => {
-                menu.render(style, max_height_in_lines, window, cx)
-            }
-        }
-    }
-
-    pub fn render_aside(
-        &mut self,
-        max_size: Size<Pixels>,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) -> Option<AnyElement> {
-        match self {
-            CodeContextMenu::Completions(menu) => menu.render_aside(max_size, window, cx),
-            CodeContextMenu::CodeActions(_) => None,
-        }
-    }
-
-    pub fn focused(&self, window: &mut Window, cx: &mut Context<Editor>) -> bool {
-        match self {
-            CodeContextMenu::Completions(completions_menu) => completions_menu
-                .get_or_create_entry_markdown(completions_menu.selected_item, cx)
-                .as_ref()
-                .is_some_and(|markdown| markdown.focus_handle(cx).contains_focused(window, cx)),
-            CodeContextMenu::CodeActions(_) => false,
-        }
-    }
-
-    pub fn scroll_aside(
-        &mut self,
-        scroll_amount: ScrollAmount,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) {
-        match self {
-            CodeContextMenu::Completions(completions_menu) => {
-                completions_menu.scroll_aside(scroll_amount, window, cx)
-            }
-            CodeContextMenu::CodeActions(_) => (),
-        }
-    }
-
-    pub fn primary_scroll_handle(&self) -> UniformListScrollHandle {
-        match self {
-            CodeContextMenu::Completions(menu) => menu.scroll_handle.clone(),
-            CodeContextMenu::CodeActions(menu) => menu.scroll_handle.clone(),
-        }
-    }
-}
-
-pub enum ContextMenuOrigin {
-    Cursor,
-    GutterIndicator(DisplayRow),
-    QuickActionBar,
-}
-
-pub struct CompletionsMenu {
-    pub id: CompletionId,
-    pub source: CompletionsMenuSource,
-    sort_completions: bool,
-    pub initial_position: Anchor,
-    pub initial_query: Option<Arc<String>>,
-    pub is_incomplete: bool,
-    pub buffer: Entity<Buffer>,
-    pub completions: Rc<RefCell<Box<[Completion]>>>,
-    /// String match candidate for each completion, grouped by `match_start`.
-    match_candidates: Arc<[(Option<text::Anchor>, Vec<StringMatchCandidate>)]>,
-    /// Entries displayed in the menu, which is a filtered and sorted subset of `match_candidates`.
-    pub entries: Rc<RefCell<Box<[StringMatch]>>>,
-    pub selected_item: usize,
-    filter_task: Task<()>,
-    cancel_filter: Arc<AtomicBool>,
-    scroll_handle: UniformListScrollHandle,
-    // The `ScrollHandle` used on the Markdown documentation rendered on the
-    // side of the completions menu.
-    pub scroll_handle_aside: ScrollHandle,
-    resolve_completions: bool,
-    show_completion_documentation: bool,
-    last_rendered_range: Rc<RefCell<Option<Range<usize>>>>,
-    markdown_cache: Rc<RefCell<VecDeque<(MarkdownCacheKey, Entity<Markdown>)>>>,
-    language_registry: Option<Arc<LanguageRegistry>>,
-    language: Option<LanguageName>,
-    display_options: CompletionDisplayOptions,
-    snippet_sort_order: SnippetSortOrder,
-}
-
-#[derive(Clone, Debug, PartialEq)]
-enum MarkdownCacheKey {
-    ForCandidate {
-        candidate_id: usize,
-    },
-    ForCompletionMatch {
-        new_text: String,
-        markdown_source: SharedString,
-    },
-}
-
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub enum CompletionsMenuSource {
-    /// Show all completions (words, snippets, LSP)
-    Normal,
-    /// Show only snippets (not words or LSP)
-    ///
-    /// Used after typing a non-word character
-    SnippetsOnly,
-    /// Tab stops within a snippet that have a predefined finite set of choices
-    SnippetChoices,
-    /// Show only words (not snippets or LSP)
-    ///
-    /// Used when word completions are explicitly triggered
-    Words { ignore_threshold: bool },
-}
-
-// TODO: There should really be a wrapper around fuzzy match tasks that does this.
-impl Drop for CompletionsMenu {
-    fn drop(&mut self) {
-        self.cancel_filter.store(true, Ordering::Relaxed);
-    }
-}
-
-struct CompletionMenuScrollBarSetting;
-
-impl ui::scrollbars::GlobalSetting for CompletionMenuScrollBarSetting {
-    fn get_value(_cx: &App) -> &Self {
-        &Self
-    }
-}
-
-impl ui::scrollbars::ScrollbarVisibility for CompletionMenuScrollBarSetting {
-    fn visibility(&self, cx: &App) -> ui::scrollbars::ShowScrollbar {
-        EditorSettings::get_global(cx).completion_menu_scrollbar
-    }
-}
-
-impl CompletionsMenu {
-    pub fn new(
-        id: CompletionId,
-        source: CompletionsMenuSource,
-        sort_completions: bool,
-        show_completion_documentation: bool,
-        initial_position: Anchor,
-        initial_query: Option<Arc<String>>,
-        is_incomplete: bool,
-        buffer: Entity<Buffer>,
-        completions: Box<[Completion]>,
-        scroll_handle: Option<UniformListScrollHandle>,
-        display_options: CompletionDisplayOptions,
-        snippet_sort_order: SnippetSortOrder,
-        language_registry: Option<Arc<LanguageRegistry>>,
-        language: Option<LanguageName>,
-        cx: &mut Context<Editor>,
-    ) -> Self {
-        let match_candidates = completions
-            .iter()
-            .enumerate()
-            .map(|(id, completion)| StringMatchCandidate::new(id, completion.label.filter_text()))
-            .into_group_map_by(|candidate| completions[candidate.id].match_start)
-            .into_iter()
-            .collect();
-
-        let completions_menu = Self {
-            id,
-            source,
-            sort_completions,
-            initial_position,
-            initial_query,
-            is_incomplete,
-            buffer,
-            show_completion_documentation,
-            completions: RefCell::new(completions).into(),
-            match_candidates,
-            entries: Rc::new(RefCell::new(Box::new([]))),
-            selected_item: 0,
-            filter_task: Task::ready(()),
-            cancel_filter: Arc::new(AtomicBool::new(false)),
-            scroll_handle: scroll_handle.unwrap_or_else(UniformListScrollHandle::new),
-            scroll_handle_aside: ScrollHandle::new(),
-            resolve_completions: true,
-            last_rendered_range: RefCell::new(None).into(),
-            markdown_cache: RefCell::new(VecDeque::new()).into(),
-            language_registry,
-            language,
-            display_options,
-            snippet_sort_order,
-        };
-
-        completions_menu.start_markdown_parse_for_nearby_entries(cx);
-
-        completions_menu
-    }
-
-    pub fn new_snippet_choices(
-        id: CompletionId,
-        sort_completions: bool,
-        choices: &Vec<String>,
-        selection: Range<Anchor>,
-        buffer: Entity<Buffer>,
-        scroll_handle: Option<UniformListScrollHandle>,
-        snippet_sort_order: SnippetSortOrder,
-    ) -> Self {
-        let completions = choices
-            .iter()
-            .map(|choice| Completion {
-                replace_range: selection.start.text_anchor..selection.end.text_anchor,
-                new_text: choice.to_string(),
-                label: CodeLabel::plain(choice.to_string(), None),
-                match_start: None,
-                snippet_deduplication_key: None,
-                icon_path: None,
-                documentation: None,
-                confirm: None,
-                insert_text_mode: None,
-                source: CompletionSource::Custom,
-            })
-            .collect();
-
-        let match_candidates = Arc::new([(
-            None,
-            choices
-                .iter()
-                .enumerate()
-                .map(|(id, completion)| StringMatchCandidate::new(id, completion))
-                .collect(),
-        )]);
-        let entries = choices
-            .iter()
-            .enumerate()
-            .map(|(id, completion)| StringMatch {
-                candidate_id: id,
-                score: 1.,
-                positions: vec![],
-                string: completion.clone(),
-            })
-            .collect();
-        Self {
-            id,
-            source: CompletionsMenuSource::SnippetChoices,
-            sort_completions,
-            initial_position: selection.start,
-            initial_query: None,
-            is_incomplete: false,
-            buffer,
-            completions: RefCell::new(completions).into(),
-            match_candidates,
-            entries: RefCell::new(entries).into(),
-            selected_item: 0,
-            filter_task: Task::ready(()),
-            cancel_filter: Arc::new(AtomicBool::new(false)),
-            scroll_handle: scroll_handle.unwrap_or_else(UniformListScrollHandle::new),
-            scroll_handle_aside: ScrollHandle::new(),
-            resolve_completions: false,
-            show_completion_documentation: false,
-            last_rendered_range: RefCell::new(None).into(),
-            markdown_cache: RefCell::new(VecDeque::new()).into(),
-            language_registry: None,
-            language: None,
-            display_options: CompletionDisplayOptions::default(),
-            snippet_sort_order,
-        }
-    }
-
-    fn select_first(
-        &mut self,
-        provider: Option<&dyn CompletionProvider>,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) {
-        let index = if self.scroll_handle.y_flipped() {
-            self.entries.borrow().len() - 1
-        } else {
-            0
-        };
-        self.update_selection_index(index, provider, window, cx);
-    }
-
-    fn select_last(
-        &mut self,
-        provider: Option<&dyn CompletionProvider>,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) {
-        let index = if self.scroll_handle.y_flipped() {
-            0
-        } else {
-            self.entries.borrow().len() - 1
-        };
-        self.update_selection_index(index, provider, window, cx);
-    }
-
-    fn select_prev(
-        &mut self,
-        provider: Option<&dyn CompletionProvider>,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) {
-        let index = if self.scroll_handle.y_flipped() {
-            self.next_match_index()
-        } else {
-            self.prev_match_index()
-        };
-        self.update_selection_index(index, provider, window, cx);
-    }
-
-    fn select_next(
-        &mut self,
-        provider: Option<&dyn CompletionProvider>,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) {
-        let index = if self.scroll_handle.y_flipped() {
-            self.prev_match_index()
-        } else {
-            self.next_match_index()
-        };
-        self.update_selection_index(index, provider, window, cx);
-    }
-
-    fn update_selection_index(
-        &mut self,
-        match_index: usize,
-        provider: Option<&dyn CompletionProvider>,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) {
-        if self.selected_item != match_index {
-            self.selected_item = match_index;
-            self.handle_selection_changed(provider, window, cx);
-        }
-    }
-
-    fn prev_match_index(&self) -> usize {
-        if self.selected_item > 0 {
-            self.selected_item - 1
-        } else {
-            self.entries.borrow().len() - 1
-        }
-    }
-
-    fn next_match_index(&self) -> usize {
-        if self.selected_item + 1 < self.entries.borrow().len() {
-            self.selected_item + 1
-        } else {
-            0
-        }
-    }
-
-    fn handle_selection_changed(
-        &mut self,
-        provider: Option<&dyn CompletionProvider>,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) {
-        self.scroll_handle
-            .scroll_to_item(self.selected_item, ScrollStrategy::Nearest);
-        if let Some(provider) = provider {
-            let entries = self.entries.borrow();
-            let entry = if self.selected_item < entries.len() {
-                Some(&entries[self.selected_item])
-            } else {
-                None
-            };
-            provider.selection_changed(entry, window, cx);
-        }
-        self.resolve_visible_completions(provider, cx);
-        self.start_markdown_parse_for_nearby_entries(cx);
-        cx.notify();
-    }
-
-    pub fn resolve_visible_completions(
-        &mut self,
-        provider: Option<&dyn CompletionProvider>,
-        cx: &mut Context<Editor>,
-    ) {
-        if !self.resolve_completions {
-            return;
-        }
-        let Some(provider) = provider else {
-            return;
-        };
-
-        let entries = self.entries.borrow();
-        if entries.is_empty() {
-            return;
-        }
-        if self.selected_item >= entries.len() {
-            log::error!(
-                "bug: completion selected_item >= entries.len(): {} >= {}",
-                self.selected_item,
-                entries.len()
-            );
-            self.selected_item = entries.len() - 1;
-        }
-
-        // Attempt to resolve completions for every item that will be displayed. This matters
-        // because single line documentation may be displayed inline with the completion.
-        //
-        // When navigating to the very beginning or end of completions, `last_rendered_range` may
-        // have no overlap with the completions that will be displayed, so instead use a range based
-        // on the last rendered count.
-        const APPROXIMATE_VISIBLE_COUNT: usize = 12;
-        let last_rendered_range = self.last_rendered_range.borrow().clone();
-        let visible_count = last_rendered_range
-            .clone()
-            .map_or(APPROXIMATE_VISIBLE_COUNT, |range| range.count());
-        let entry_range = if self.selected_item == 0 {
-            0..min(visible_count, entries.len())
-        } else if self.selected_item == entries.len() - 1 {
-            entries.len().saturating_sub(visible_count)..entries.len()
-        } else {
-            last_rendered_range.map_or(0..0, |range| {
-                min(range.start, entries.len())..min(range.end, entries.len())
-            })
-        };
-
-        // Expand the range to resolve more completions than are predicted to be visible, to reduce
-        // jank on navigation.
-        let entry_indices = util::expanded_and_wrapped_usize_range(
-            entry_range,
-            RESOLVE_BEFORE_ITEMS,
-            RESOLVE_AFTER_ITEMS,
-            entries.len(),
-        );
-
-        // Avoid work by sometimes filtering out completions that already have documentation.
-        // This filtering doesn't happen if the completions are currently being updated.
-        let completions = self.completions.borrow();
-        let candidate_ids = entry_indices
-            .map(|i| entries[i].candidate_id)
-            .filter(|i| completions[*i].documentation.is_none());
-
-        // Current selection is always resolved even if it already has documentation, to handle
-        // out-of-spec language servers that return more results later.
-        let selected_candidate_id = entries[self.selected_item].candidate_id;
-        let candidate_ids = iter::once(selected_candidate_id)
-            .chain(candidate_ids.filter(|id| *id != selected_candidate_id))
-            .collect::<Vec<usize>>();
-        drop(entries);
-
-        if candidate_ids.is_empty() {
-            return;
-        }
-
-        let resolve_task = provider.resolve_completions(
-            self.buffer.clone(),
-            candidate_ids,
-            self.completions.clone(),
-            cx,
-        );
-
-        let completion_id = self.id;
-        cx.spawn(async move |editor, cx| {
-            if let Some(true) = resolve_task.await.log_err() {
-                editor
-                    .update(cx, |editor, cx| {
-                        // `resolve_completions` modified state affecting display.
-                        cx.notify();
-                        editor.with_completions_menu_matching_id(completion_id, |menu| {
-                            if let Some(menu) = menu {
-                                menu.start_markdown_parse_for_nearby_entries(cx)
-                            }
-                        });
-                    })
-                    .ok();
-            }
-        })
-        .detach();
-    }
-
-    fn start_markdown_parse_for_nearby_entries(&self, cx: &mut Context<Editor>) {
-        // Enqueue parse tasks of nearer items first.
-        //
-        // TODO: This means that the nearer items will actually be further back in the cache, which
-        // is not ideal. In practice this is fine because `get_or_create_markdown` moves the current
-        // selection to the front (when `is_render = true`).
-        let entry_indices = util::wrapped_usize_outward_from(
-            self.selected_item,
-            MARKDOWN_CACHE_BEFORE_ITEMS,
-            MARKDOWN_CACHE_AFTER_ITEMS,
-            self.entries.borrow().len(),
-        );
-
-        for index in entry_indices {
-            self.get_or_create_entry_markdown(index, cx);
-        }
-    }
-
-    fn get_or_create_entry_markdown(
-        &self,
-        index: usize,
-        cx: &mut Context<Editor>,
-    ) -> Option<Entity<Markdown>> {
-        let entries = self.entries.borrow();
-        if index >= entries.len() {
-            return None;
-        }
-        let candidate_id = entries[index].candidate_id;
-        let completions = self.completions.borrow();
-        match &completions[candidate_id].documentation {
-            Some(CompletionDocumentation::MultiLineMarkdown(source)) if !source.is_empty() => self
-                .get_or_create_markdown(candidate_id, Some(source), false, &completions, cx)
-                .map(|(_, markdown)| markdown),
-            Some(_) => None,
-            _ => None,
-        }
-    }
-
-    fn get_or_create_markdown(
-        &self,
-        candidate_id: usize,
-        source: Option<&SharedString>,
-        is_render: bool,
-        completions: &[Completion],
-        cx: &mut Context<Editor>,
-    ) -> Option<(bool, Entity<Markdown>)> {
-        let mut markdown_cache = self.markdown_cache.borrow_mut();
-
-        let mut has_completion_match_cache_entry = false;
-        let mut matching_entry = markdown_cache.iter().find_position(|(key, _)| match key {
-            MarkdownCacheKey::ForCandidate { candidate_id: id } => *id == candidate_id,
-            MarkdownCacheKey::ForCompletionMatch { .. } => {
-                has_completion_match_cache_entry = true;
-                false
-            }
-        });
-
-        if has_completion_match_cache_entry && matching_entry.is_none() {
-            if let Some(source) = source {
-                matching_entry = markdown_cache.iter().find_position(|(key, _)| {
-                    matches!(key, MarkdownCacheKey::ForCompletionMatch { markdown_source, .. }
-                                if markdown_source == source)
-                });
-            } else {
-                // Heuristic guess that documentation can be reused when new_text matches. This is
-                // to mitigate documentation flicker while typing. If this is wrong, then resolution
-                // should cause the correct documentation to be displayed soon.
-                let completion = &completions[candidate_id];
-                matching_entry = markdown_cache.iter().find_position(|(key, _)| {
-                    matches!(key, MarkdownCacheKey::ForCompletionMatch { new_text, .. }
-                                if new_text == &completion.new_text)
-                });
-            }
-        }
-
-        if let Some((cache_index, (key, markdown))) = matching_entry {
-            let markdown = markdown.clone();
-
-            // Since the markdown source matches, the key can now be ForCandidate.
-            if source.is_some() && matches!(key, MarkdownCacheKey::ForCompletionMatch { .. }) {
-                markdown_cache[cache_index].0 = MarkdownCacheKey::ForCandidate { candidate_id };
-            }
-
-            if is_render && cache_index != 0 {
-                // Move the current selection's cache entry to the front.
-                markdown_cache.rotate_right(1);
-                let cache_len = markdown_cache.len();
-                markdown_cache.swap(0, (cache_index + 1) % cache_len);
-            }
-
-            let is_parsing = markdown.update(cx, |markdown, cx| {
-                if let Some(source) = source {
-                    // `reset` is called as it's possible for documentation to change due to resolve
-                    // requests. It does nothing if `source` is unchanged.
-                    markdown.reset(source.clone(), cx);
-                }
-                markdown.is_parsing()
-            });
-            return Some((is_parsing, markdown));
-        }
-
-        let Some(source) = source else {
-            // Can't create markdown as there is no source.
-            return None;
-        };
-
-        if markdown_cache.len() < MARKDOWN_CACHE_MAX_SIZE {
-            let markdown = cx.new(|cx| {
-                Markdown::new(
-                    source.clone(),
-                    self.language_registry.clone(),
-                    self.language.clone(),
-                    cx,
-                )
-            });
-            // Handles redraw when the markdown is done parsing. The current render is for a
-            // deferred draw, and so without this did not redraw when `markdown` notified.
-            cx.observe(&markdown, |_, _, cx| cx.notify()).detach();
-            markdown_cache.push_front((
-                MarkdownCacheKey::ForCandidate { candidate_id },
-                markdown.clone(),
-            ));
-            Some((true, markdown))
-        } else {
-            debug_assert_eq!(markdown_cache.capacity(), MARKDOWN_CACHE_MAX_SIZE);
-            // Moves the last cache entry to the start. The ring buffer is full, so this does no
-            // copying and just shifts indexes.
-            markdown_cache.rotate_right(1);
-            markdown_cache[0].0 = MarkdownCacheKey::ForCandidate { candidate_id };
-            let markdown = &markdown_cache[0].1;
-            markdown.update(cx, |markdown, cx| markdown.reset(source.clone(), cx));
-            Some((true, markdown.clone()))
-        }
-    }
-
-    pub fn visible(&self) -> bool {
-        !self.entries.borrow().is_empty()
-    }
-
-    fn origin(&self) -> ContextMenuOrigin {
-        ContextMenuOrigin::Cursor
-    }
-
-    fn render(
-        &self,
-        style: &EditorStyle,
-        max_height_in_lines: u32,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) -> AnyElement {
-        let show_completion_documentation = self.show_completion_documentation;
-        let widest_completion_ix = if self.display_options.dynamic_width {
-            let completions = self.completions.borrow();
-            let widest_completion_ix = self
-                .entries
-                .borrow()
-                .iter()
-                .enumerate()
-                .max_by_key(|(_, mat)| {
-                    let completion = &completions[mat.candidate_id];
-                    let documentation = &completion.documentation;
-
-                    let mut len = completion.label.text.chars().count();
-                    if let Some(CompletionDocumentation::SingleLine(text)) = documentation {
-                        if show_completion_documentation {
-                            len += text.chars().count();
-                        }
-                    }
-
-                    len
-                })
-                .map(|(ix, _)| ix);
-            drop(completions);
-            widest_completion_ix
-        } else {
-            None
-        };
-
-        let selected_item = self.selected_item;
-        let completions = self.completions.clone();
-        let entries = self.entries.clone();
-        let last_rendered_range = self.last_rendered_range.clone();
-        let style = style.clone();
-        let list = uniform_list(
-            "completions",
-            self.entries.borrow().len(),
-            cx.processor(move |_editor, range: Range<usize>, _window, cx| {
-                last_rendered_range.borrow_mut().replace(range.clone());
-                let start_ix = range.start;
-                let completions_guard = completions.borrow_mut();
-
-                entries.borrow()[range]
-                    .iter()
-                    .enumerate()
-                    .map(|(ix, mat)| {
-                        let item_ix = start_ix + ix;
-                        let completion = &completions_guard[mat.candidate_id];
-                        let documentation = if show_completion_documentation {
-                            &completion.documentation
-                        } else {
-                            &None
-                        };
-
-                        let filter_start = completion.label.filter_range.start;
-                        let highlights = gpui::combine_highlights(
-                            mat.ranges().map(|range| {
-                                (
-                                    filter_start + range.start..filter_start + range.end,
-                                    FontWeight::BOLD.into(),
-                                )
-                            }),
-                            styled_runs_for_code_label(
-                                &completion.label,
-                                &style.syntax,
-                                &style.local_player,
-                            )
-                            .map(|(range, mut highlight)| {
-                                // Ignore font weight for syntax highlighting, as we'll use it
-                                // for fuzzy matches.
-                                highlight.font_weight = None;
-                                if completion
-                                    .source
-                                    .lsp_completion(false)
-                                    .and_then(|lsp_completion| {
-                                        match (lsp_completion.deprecated, &lsp_completion.tags) {
-                                            (Some(true), _) => Some(true),
-                                            (_, Some(tags)) => {
-                                                Some(tags.contains(&CompletionItemTag::DEPRECATED))
-                                            }
-                                            _ => None,
-                                        }
-                                    })
-                                    .unwrap_or(false)
-                                {
-                                    highlight.strikethrough = Some(StrikethroughStyle {
-                                        thickness: 1.0.into(),
-                                        ..Default::default()
-                                    });
-                                    highlight.color = Some(cx.theme().colors().text_muted);
-                                }
-
-                                (range, highlight)
-                            }),
-                        );
-
-                        let completion_label = StyledText::new(completion.label.text.clone())
-                            .with_default_highlights(&style.text, highlights);
-
-                        let documentation_label = match documentation {
-                            Some(CompletionDocumentation::SingleLine(text))
-                            | Some(CompletionDocumentation::SingleLineAndMultiLinePlainText {
-                                single_line: text,
-                                ..
-                            }) => {
-                                if text.trim().is_empty() {
-                                    None
-                                } else {
-                                    Some(
-                                        Label::new(text.clone())
-                                            .ml_4()
-                                            .size(LabelSize::Small)
-                                            .color(Color::Muted),
-                                    )
-                                }
-                            }
-                            _ => None,
-                        };
-
-                        let start_slot = completion
-                            .color()
-                            .map(|color| {
-                                div()
-                                    .flex_shrink_0()
-                                    .size_3p5()
-                                    .rounded_xs()
-                                    .bg(color)
-                                    .into_any_element()
-                            })
-                            .or_else(|| {
-                                completion.icon_path.as_ref().map(|path| {
-                                    Icon::from_path(path)
-                                        .size(IconSize::XSmall)
-                                        .color(Color::Muted)
-                                        .into_any_element()
-                                })
-                            });
-
-                        div()
-                            .min_w(COMPLETION_MENU_MIN_WIDTH)
-                            .max_w(COMPLETION_MENU_MAX_WIDTH)
-                            .child(
-                                ListItem::new(mat.candidate_id)
-                                    .inset(true)
-                                    .toggle_state(item_ix == selected_item)
-                                    .on_click(cx.listener(move |editor, _event, window, cx| {
-                                        cx.stop_propagation();
-                                        if let Some(task) = editor.confirm_completion(
-                                            &ConfirmCompletion {
-                                                item_ix: Some(item_ix),
-                                            },
-                                            window,
-                                            cx,
-                                        ) {
-                                            task.detach_and_log_err(cx)
-                                        }
-                                    }))
-                                    .start_slot::<AnyElement>(start_slot)
-                                    .child(h_flex().overflow_hidden().child(completion_label))
-                                    .end_slot::<Label>(documentation_label),
-                            )
-                    })
-                    .collect()
-            }),
-        )
-        .occlude()
-        .max_h(max_height_in_lines as f32 * window.line_height())
-        .track_scroll(&self.scroll_handle)
-        .with_sizing_behavior(ListSizingBehavior::Infer)
-        .map(|this| {
-            if self.display_options.dynamic_width {
-                this.with_width_from_item(widest_completion_ix)
-            } else {
-                this.w(rems(34.))
-            }
-        });
-
-        Popover::new()
-            .child(
-                div().child(list).custom_scrollbars(
-                    Scrollbars::for_settings::<CompletionMenuScrollBarSetting>()
-                        .show_along(ScrollAxes::Vertical)
-                        .tracked_scroll_handle(&self.scroll_handle),
-                    window,
-                    cx,
-                ),
-            )
-            .into_any_element()
-    }
-
-    fn render_aside(
-        &mut self,
-        max_size: Size<Pixels>,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) -> Option<AnyElement> {
-        if !self.show_completion_documentation {
-            return None;
-        }
-
-        let mat = &self.entries.borrow()[self.selected_item];
-        let completions = self.completions.borrow();
-        let multiline_docs = match completions[mat.candidate_id].documentation.as_ref() {
-            Some(CompletionDocumentation::MultiLinePlainText(text)) => div().child(text.clone()),
-            Some(CompletionDocumentation::SingleLineAndMultiLinePlainText {
-                plain_text: Some(text),
-                ..
-            }) => div().child(text.clone()),
-            Some(CompletionDocumentation::MultiLineMarkdown(source)) if !source.is_empty() => {
-                let Some((false, markdown)) = self.get_or_create_markdown(
-                    mat.candidate_id,
-                    Some(source),
-                    true,
-                    &completions,
-                    cx,
-                ) else {
-                    return None;
-                };
-                Self::render_markdown(markdown, window, cx)
-            }
-            None => {
-                // Handle the case where documentation hasn't yet been resolved but there's a
-                // `new_text` match in the cache.
-                //
-                // TODO: It's inconsistent that documentation caching based on matching `new_text`
-                // only works for markdown. Consider generally caching the results of resolving
-                // completions.
-                let Some((false, markdown)) =
-                    self.get_or_create_markdown(mat.candidate_id, None, true, &completions, cx)
-                else {
-                    return None;
-                };
-                Self::render_markdown(markdown, window, cx)
-            }
-            Some(CompletionDocumentation::MultiLineMarkdown(_)) => return None,
-            Some(CompletionDocumentation::SingleLine(_)) => return None,
-            Some(CompletionDocumentation::Undocumented) => return None,
-            Some(CompletionDocumentation::SingleLineAndMultiLinePlainText {
-                plain_text: None,
-                ..
-            }) => {
-                return None;
-            }
-        };
-
-        Some(
-            Popover::new()
-                .child(
-                    multiline_docs
-                        .id("multiline_docs")
-                        .px(MENU_ASIDE_X_PADDING / 2.)
-                        .max_w(max_size.width)
-                        .max_h(max_size.height)
-                        .overflow_y_scroll()
-                        .track_scroll(&self.scroll_handle_aside)
-                        .occlude(),
-                )
-                .into_any_element(),
-        )
-    }
-
-    fn render_markdown(
-        markdown: Entity<Markdown>,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) -> Div {
-        div().child(
-            MarkdownElement::new(markdown, hover_markdown_style(window, cx))
-                .code_block_renderer(markdown::CodeBlockRenderer::Default {
-                    copy_button: false,
-                    copy_button_on_hover: false,
-                    border: false,
-                })
-                .on_url_click(open_markdown_url),
-        )
-    }
-
-    pub fn filter(
-        &mut self,
-        query: Arc<String>,
-        query_end: text::Anchor,
-        buffer: &Entity<Buffer>,
-        provider: Option<Rc<dyn CompletionProvider>>,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) {
-        self.cancel_filter.store(true, Ordering::Relaxed);
-        self.cancel_filter = Arc::new(AtomicBool::new(false));
-        let matches = self.do_async_filtering(query, query_end, buffer, cx);
-        let id = self.id;
-        self.filter_task = cx.spawn_in(window, async move |editor, cx| {
-            let matches = matches.await;
-            editor
-                .update_in(cx, |editor, window, cx| {
-                    editor.with_completions_menu_matching_id(id, |this| {
-                        if let Some(this) = this {
-                            this.set_filter_results(matches, provider, window, cx);
-                        }
-                    });
-                })
-                .ok();
-        });
-    }
-
-    pub fn do_async_filtering(
-        &self,
-        query: Arc<String>,
-        query_end: text::Anchor,
-        buffer: &Entity<Buffer>,
-        cx: &Context<Editor>,
-    ) -> Task<Vec<StringMatch>> {
-        let buffer_snapshot = buffer.read(cx).snapshot();
-        let background_executor = cx.background_executor().clone();
-        let match_candidates = self.match_candidates.clone();
-        let cancel_filter = self.cancel_filter.clone();
-        let default_query = query.clone();
-
-        let matches_task = cx.background_spawn(async move {
-            let queries_and_candidates = match_candidates
-                .iter()
-                .map(|(query_start, candidates)| {
-                    let query_for_batch = match query_start {
-                        Some(start) => {
-                            Arc::new(buffer_snapshot.text_for_range(*start..query_end).collect())
-                        }
-                        None => default_query.clone(),
-                    };
-                    (query_for_batch, candidates)
-                })
-                .collect_vec();
-
-            let mut results = vec![];
-            for (query, match_candidates) in queries_and_candidates {
-                results.extend(
-                    fuzzy::match_strings(
-                        &match_candidates,
-                        &query,
-                        query.chars().any(|c| c.is_uppercase()),
-                        false,
-                        1000,
-                        &cancel_filter,
-                        background_executor.clone(),
-                    )
-                    .await,
-                );
-            }
-            results
-        });
-
-        let completions = self.completions.clone();
-        let sort_completions = self.sort_completions;
-        let snippet_sort_order = self.snippet_sort_order;
-        cx.foreground_executor().spawn(async move {
-            let mut matches = matches_task.await;
-
-            let completions_ref = completions.borrow();
-
-            if sort_completions {
-                matches = Self::sort_string_matches(
-                    matches,
-                    Some(&query), // used for non-snippets only
-                    snippet_sort_order,
-                    &completions_ref,
-                );
-            }
-
-            // Remove duplicate snippet prefixes (e.g., "cool code" will match
-            // the text "c c" in two places; we should only show the longer one)
-            let mut snippets_seen = HashSet::<(usize, usize)>::default();
-            matches.retain(|result| {
-                match completions_ref[result.candidate_id].snippet_deduplication_key {
-                    Some(key) => snippets_seen.insert(key),
-                    None => true,
-                }
-            });
-
-            matches
-        })
-    }
-
-    pub fn set_filter_results(
-        &mut self,
-        matches: Vec<StringMatch>,
-        provider: Option<Rc<dyn CompletionProvider>>,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) {
-        *self.entries.borrow_mut() = matches.into_boxed_slice();
-        self.selected_item = 0;
-        self.handle_selection_changed(provider.as_deref(), window, cx);
-    }
-
-    pub fn sort_string_matches(
-        matches: Vec<StringMatch>,
-        query: Option<&str>,
-        snippet_sort_order: SnippetSortOrder,
-        completions: &[Completion],
-    ) -> Vec<StringMatch> {
-        let mut matches = matches;
-
-        #[derive(Debug, PartialEq, Eq, PartialOrd, Ord)]
-        enum MatchTier<'a> {
-            WordStartMatch {
-                sort_exact: Reverse<i32>,
-                sort_snippet: Reverse<i32>,
-                sort_score: Reverse<OrderedFloat<f64>>,
-                sort_positions: Vec<usize>,
-                sort_text: Option<&'a str>,
-                sort_kind: usize,
-                sort_label: &'a str,
-            },
-            OtherMatch {
-                sort_score: Reverse<OrderedFloat<f64>>,
-            },
-        }
-
-        let query_start_lower = query
-            .as_ref()
-            .and_then(|q| q.chars().next())
-            .and_then(|c| c.to_lowercase().next());
-
-        if snippet_sort_order == SnippetSortOrder::None {
-            matches
-                .retain(|string_match| !completions[string_match.candidate_id].is_snippet_kind());
-        }
-
-        matches.sort_unstable_by_key(|string_match| {
-            let completion = &completions[string_match.candidate_id];
-
-            let sort_text = match &completion.source {
-                CompletionSource::Lsp { lsp_completion, .. } => lsp_completion.sort_text.as_deref(),
-                CompletionSource::Dap { sort_text } => Some(sort_text.as_str()),
-                _ => None,
-            };
-
-            let (sort_kind, sort_label) = completion.sort_key();
-
-            let score = string_match.score;
-            let sort_score = Reverse(OrderedFloat(score));
-
-            // Snippets do their own first-letter matching logic elsewhere.
-            let is_snippet = completion.is_snippet_kind();
-            let query_start_doesnt_match_split_words = !is_snippet
-                && query_start_lower
-                    .map(|query_char| {
-                        !split_words(&string_match.string).any(|word| {
-                            word.chars().next().and_then(|c| c.to_lowercase().next())
-                                == Some(query_char)
-                        })
-                    })
-                    .unwrap_or(false);
-
-            if query_start_doesnt_match_split_words {
-                MatchTier::OtherMatch { sort_score }
-            } else {
-                let sort_snippet = match snippet_sort_order {
-                    SnippetSortOrder::Top => Reverse(if is_snippet { 1 } else { 0 }),
-                    SnippetSortOrder::Bottom => Reverse(if is_snippet { 0 } else { 1 }),
-                    SnippetSortOrder::Inline => Reverse(0),
-                    SnippetSortOrder::None => Reverse(0),
-                };
-                let sort_positions = string_match.positions.clone();
-                // This exact matching won't work for multi-word snippets, but it's fine
-                let sort_exact = Reverse(if Some(completion.label.filter_text()) == query {
-                    1
-                } else {
-                    0
-                });
-
-                MatchTier::WordStartMatch {
-                    sort_exact,
-                    sort_snippet,
-                    sort_score,
-                    sort_positions,
-                    sort_text,
-                    sort_kind,
-                    sort_label,
-                }
-            }
-        });
-
-        matches
-    }
-
-    pub fn preserve_markdown_cache(&mut self, prev_menu: CompletionsMenu) {
-        self.markdown_cache = prev_menu.markdown_cache.clone();
-
-        // Convert ForCandidate cache keys to ForCompletionMatch keys.
-        let prev_completions = prev_menu.completions.borrow();
-        self.markdown_cache
-            .borrow_mut()
-            .retain_mut(|(key, _markdown)| match key {
-                MarkdownCacheKey::ForCompletionMatch { .. } => true,
-                MarkdownCacheKey::ForCandidate { candidate_id } => {
-                    if let Some(completion) = prev_completions.get(*candidate_id) {
-                        match &completion.documentation {
-                            Some(CompletionDocumentation::MultiLineMarkdown(source)) => {
-                                *key = MarkdownCacheKey::ForCompletionMatch {
-                                    new_text: completion.new_text.clone(),
-                                    markdown_source: source.clone(),
-                                };
-                                true
-                            }
-                            _ => false,
-                        }
-                    } else {
-                        false
-                    }
-                }
-            });
-    }
-
-    pub fn scroll_aside(
-        &mut self,
-        amount: ScrollAmount,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) {
-        let mut offset = self.scroll_handle_aside.offset();
-
-        offset.y -= amount.pixels(
-            window.line_height(),
-            self.scroll_handle_aside.bounds().size.height - px(16.),
-        ) / 2.0;
-
-        cx.notify();
-        self.scroll_handle_aside.set_offset(offset);
-    }
-}
-
-#[derive(Clone)]
-pub struct AvailableCodeAction {
-    pub excerpt_id: ExcerptId,
-    pub action: CodeAction,
-    pub provider: Rc<dyn CodeActionProvider>,
-}
-
-#[derive(Clone)]
-pub struct CodeActionContents {
-    tasks: Option<Rc<ResolvedTasks>>,
-    actions: Option<Rc<[AvailableCodeAction]>>,
-    debug_scenarios: Vec<DebugScenario>,
-    pub(crate) context: TaskContext,
-}
-
-impl CodeActionContents {
-    pub(crate) fn new(
-        tasks: Option<ResolvedTasks>,
-        actions: Option<Rc<[AvailableCodeAction]>>,
-        debug_scenarios: Vec<DebugScenario>,
-        context: TaskContext,
-    ) -> Self {
-        Self {
-            tasks: tasks.map(Rc::new),
-            actions,
-            debug_scenarios,
-            context,
-        }
-    }
-
-    pub fn tasks(&self) -> Option<&ResolvedTasks> {
-        self.tasks.as_deref()
-    }
-
-    fn len(&self) -> usize {
-        let tasks_len = self.tasks.as_ref().map_or(0, |tasks| tasks.templates.len());
-        let code_actions_len = self.actions.as_ref().map_or(0, |actions| actions.len());
-        tasks_len + code_actions_len + self.debug_scenarios.len()
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.len() == 0
-    }
-
-    fn iter(&self) -> impl Iterator<Item = CodeActionsItem> + '_ {
-        self.tasks
-            .iter()
-            .flat_map(|tasks| {
-                tasks
-                    .templates
-                    .iter()
-                    .map(|(kind, task)| CodeActionsItem::Task(kind.clone(), task.clone()))
-            })
-            .chain(self.actions.iter().flat_map(|actions| {
-                actions.iter().map(|available| CodeActionsItem::CodeAction {
-                    excerpt_id: available.excerpt_id,
-                    action: available.action.clone(),
-                    provider: available.provider.clone(),
-                })
-            }))
-            .chain(
-                self.debug_scenarios
-                    .iter()
-                    .cloned()
-                    .map(CodeActionsItem::DebugScenario),
-            )
-    }
-
-    pub fn get(&self, mut index: usize) -> Option<CodeActionsItem> {
-        if let Some(tasks) = &self.tasks {
-            if let Some((kind, task)) = tasks.templates.get(index) {
-                return Some(CodeActionsItem::Task(kind.clone(), task.clone()));
-            } else {
-                index -= tasks.templates.len();
-            }
-        }
-        if let Some(actions) = &self.actions {
-            if let Some(available) = actions.get(index) {
-                return Some(CodeActionsItem::CodeAction {
-                    excerpt_id: available.excerpt_id,
-                    action: available.action.clone(),
-                    provider: available.provider.clone(),
-                });
-            } else {
-                index -= actions.len();
-            }
-        }
-
-        self.debug_scenarios
-            .get(index)
-            .cloned()
-            .map(CodeActionsItem::DebugScenario)
-    }
-}
-
-#[derive(Clone)]
-pub enum CodeActionsItem {
-    Task(TaskSourceKind, ResolvedTask),
-    CodeAction {
-        excerpt_id: ExcerptId,
-        action: CodeAction,
-        provider: Rc<dyn CodeActionProvider>,
-    },
-    DebugScenario(DebugScenario),
-}
-
-impl CodeActionsItem {
-    fn as_task(&self) -> Option<&ResolvedTask> {
-        let Self::Task(_, task) = self else {
-            return None;
-        };
-        Some(task)
-    }
-
-    fn as_code_action(&self) -> Option<&CodeAction> {
-        let Self::CodeAction { action, .. } = self else {
-            return None;
-        };
-        Some(action)
-    }
-    fn as_debug_scenario(&self) -> Option<&DebugScenario> {
-        let Self::DebugScenario(scenario) = self else {
-            return None;
-        };
-        Some(scenario)
-    }
-
-    pub fn label(&self) -> String {
-        match self {
-            Self::CodeAction { action, .. } => action.lsp_action.title().to_owned(),
-            Self::Task(_, task) => task.resolved_label.clone(),
-            Self::DebugScenario(scenario) => scenario.label.to_string(),
-        }
-    }
-}
-
-pub struct CodeActionsMenu {
-    pub actions: CodeActionContents,
-    pub buffer: Entity<Buffer>,
-    pub selected_item: usize,
-    pub scroll_handle: UniformListScrollHandle,
-    pub deployed_from: Option<CodeActionSource>,
-}
-
-impl CodeActionsMenu {
-    fn select_first(&mut self, cx: &mut Context<Editor>) {
-        self.selected_item = if self.scroll_handle.y_flipped() {
-            self.actions.len() - 1
-        } else {
-            0
-        };
-        self.scroll_handle
-            .scroll_to_item(self.selected_item, ScrollStrategy::Top);
-        cx.notify()
-    }
-
-    fn select_last(&mut self, cx: &mut Context<Editor>) {
-        self.selected_item = if self.scroll_handle.y_flipped() {
-            0
-        } else {
-            self.actions.len() - 1
-        };
-        self.scroll_handle
-            .scroll_to_item(self.selected_item, ScrollStrategy::Top);
-        cx.notify()
-    }
-
-    fn select_prev(&mut self, cx: &mut Context<Editor>) {
-        self.selected_item = if self.scroll_handle.y_flipped() {
-            self.next_match_index()
-        } else {
-            self.prev_match_index()
-        };
-        self.scroll_handle
-            .scroll_to_item(self.selected_item, ScrollStrategy::Top);
-        cx.notify();
-    }
-
-    fn select_next(&mut self, cx: &mut Context<Editor>) {
-        self.selected_item = if self.scroll_handle.y_flipped() {
-            self.prev_match_index()
-        } else {
-            self.next_match_index()
-        };
-        self.scroll_handle
-            .scroll_to_item(self.selected_item, ScrollStrategy::Top);
-        cx.notify();
-    }
-
-    fn prev_match_index(&self) -> usize {
-        if self.selected_item > 0 {
-            self.selected_item - 1
-        } else {
-            self.actions.len() - 1
-        }
-    }
-
-    fn next_match_index(&self) -> usize {
-        if self.selected_item + 1 < self.actions.len() {
-            self.selected_item + 1
-        } else {
-            0
-        }
-    }
-
-    pub fn visible(&self) -> bool {
-        !self.actions.is_empty()
-    }
-
-    fn origin(&self) -> ContextMenuOrigin {
-        match &self.deployed_from {
-            Some(CodeActionSource::Indicator(row)) | Some(CodeActionSource::RunMenu(row)) => {
-                ContextMenuOrigin::GutterIndicator(*row)
-            }
-            Some(CodeActionSource::QuickActionBar) => ContextMenuOrigin::QuickActionBar,
-            None => ContextMenuOrigin::Cursor,
-        }
-    }
-
-    fn render(
-        &self,
-        _style: &EditorStyle,
-        max_height_in_lines: u32,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) -> AnyElement {
-        let actions = self.actions.clone();
-        let selected_item = self.selected_item;
-        let is_quick_action_bar = matches!(self.origin(), ContextMenuOrigin::QuickActionBar);
-
-        let list = uniform_list(
-            "code_actions_menu",
-            self.actions.len(),
-            cx.processor(move |_this, range: Range<usize>, _, cx| {
-                actions
-                    .iter()
-                    .skip(range.start)
-                    .take(range.end - range.start)
-                    .enumerate()
-                    .map(|(ix, action)| {
-                        let item_ix = range.start + ix;
-                        let selected = item_ix == selected_item;
-                        let colors = cx.theme().colors();
-                        div().min_w(px(220.)).max_w(px(540.)).child(
-                            ListItem::new(item_ix)
-                                .inset(true)
-                                .toggle_state(selected)
-                                .when_some(action.as_code_action(), |this, action| {
-                                    this.child(
-                                        h_flex()
-                                            .overflow_hidden()
-                                            .when(is_quick_action_bar, |this| this.text_ui(cx))
-                                            .child(
-                                                // TASK: It would be good to make lsp_action.title a SharedString to avoid allocating here.
-                                                action.lsp_action.title().replace("\n", ""),
-                                            )
-                                            .when(selected, |this| {
-                                                this.text_color(colors.text_accent)
-                                            }),
-                                    )
-                                })
-                                .when_some(action.as_task(), |this, task| {
-                                    this.child(
-                                        h_flex()
-                                            .overflow_hidden()
-                                            .when(is_quick_action_bar, |this| this.text_ui(cx))
-                                            .child(task.resolved_label.replace("\n", ""))
-                                            .when(selected, |this| {
-                                                this.text_color(colors.text_accent)
-                                            }),
-                                    )
-                                })
-                                .when_some(action.as_debug_scenario(), |this, scenario| {
-                                    this.child(
-                                        h_flex()
-                                            .overflow_hidden()
-                                            .when(is_quick_action_bar, |this| this.text_ui(cx))
-                                            .child("debug: ")
-                                            .child(scenario.label.clone())
-                                            .when(selected, |this| {
-                                                this.text_color(colors.text_accent)
-                                            }),
-                                    )
-                                })
-                                .on_click(cx.listener(move |editor, _, window, cx| {
-                                    cx.stop_propagation();
-                                    if let Some(task) = editor.confirm_code_action(
-                                        &ConfirmCodeAction {
-                                            item_ix: Some(item_ix),
-                                        },
-                                        window,
-                                        cx,
-                                    ) {
-                                        task.detach_and_log_err(cx)
-                                    }
-                                })),
-                        )
-                    })
-                    .collect()
-            }),
-        )
-        .occlude()
-        .max_h(max_height_in_lines as f32 * window.line_height())
-        .track_scroll(&self.scroll_handle)
-        .with_width_from_item(
-            self.actions
-                .iter()
-                .enumerate()
-                .max_by_key(|(_, action)| match action {
-                    CodeActionsItem::Task(_, task) => task.resolved_label.chars().count(),
-                    CodeActionsItem::CodeAction { action, .. } => {
-                        action.lsp_action.title().chars().count()
-                    }
-                    CodeActionsItem::DebugScenario(scenario) => {
-                        format!("debug: {}", scenario.label).chars().count()
-                    }
-                })
-                .map(|(ix, _)| ix),
-        )
-        .with_sizing_behavior(ListSizingBehavior::Infer);
-
-        Popover::new().child(list).into_any_element()
-    }
-}
diff --git a/crates/editor/src/display_map.rs b/crates/editor/src/display_map.rs
deleted file mode 100644
index cab5b3686e..0000000000
--- a/crates/editor/src/display_map.rs
+++ /dev/null
@@ -1,3095 +0,0 @@
-//! This module defines where the text should be displayed in an [`Editor`][Editor].
-//!
-//! Not literally though - rendering, layout and all that jazz is a responsibility of [`EditorElement`][EditorElement].
-//! Instead, [`DisplayMap`] decides where Inlays/Inlay hints are displayed, when
-//! to apply a soft wrap, where to add fold indicators, whether there are any tabs in the buffer that
-//! we display as spaces and where to display custom blocks (like diagnostics).
-//! Seems like a lot? That's because it is. [`DisplayMap`] is conceptually made up
-//! of several smaller structures that form a hierarchy (starting at the bottom):
-//! - [`InlayMap`] that decides where the [`Inlay`]s should be displayed.
-//! - [`FoldMap`] that decides where the fold indicators should be; it also tracks parts of a source file that are currently folded.
-//! - [`TabMap`] that keeps track of hard tabs in a buffer.
-//! - [`WrapMap`] that handles soft wrapping.
-//! - [`BlockMap`] that tracks custom blocks such as diagnostics that should be displayed within buffer.
-//! - [`DisplayMap`] that adds background highlights to the regions of text.
-//!   Each one of those builds on top of preceding map.
-//!
-//! [Editor]: crate::Editor
-//! [EditorElement]: crate::element::EditorElement
-
-#[macro_use]
-mod dimensions;
-
-mod block_map;
-mod crease_map;
-mod custom_highlights;
-mod fold_map;
-mod inlay_map;
-mod invisibles;
-mod tab_map;
-mod wrap_map;
-
-pub use crate::display_map::{fold_map::FoldMap, inlay_map::InlayMap, tab_map::TabMap};
-pub use block_map::{
-    Block, BlockChunks as DisplayChunks, BlockContext, BlockId, BlockMap, BlockPlacement,
-    BlockPoint, BlockProperties, BlockRows, BlockStyle, CustomBlockId, EditorMargins, RenderBlock,
-    StickyHeaderExcerpt,
-};
-pub use crease_map::*;
-pub use fold_map::{
-    ChunkRenderer, ChunkRendererContext, ChunkRendererId, Fold, FoldId, FoldPlaceholder, FoldPoint,
-};
-pub use inlay_map::{InlayOffset, InlayPoint};
-pub use invisibles::{is_invisible, replacement};
-
-use collections::{HashMap, HashSet};
-use gpui::{App, Context, Entity, Font, HighlightStyle, LineLayout, Pixels, UnderlineStyle};
-use language::{Point, Subscription as BufferSubscription, language_settings::language_settings};
-use multi_buffer::{
-    Anchor, AnchorRangeExt, MultiBuffer, MultiBufferOffset, MultiBufferOffsetUtf16,
-    MultiBufferPoint, MultiBufferRow, MultiBufferSnapshot, RowInfo, ToOffset, ToPoint,
-};
-use project::InlayId;
-use project::project_settings::DiagnosticSeverity;
-use serde::Deserialize;
-use sum_tree::{Bias, TreeMap};
-use text::{BufferId, LineIndent};
-use ui::{SharedString, px};
-use unicode_segmentation::UnicodeSegmentation;
-use ztracing::instrument;
-
-use std::{
-    any::TypeId,
-    borrow::Cow,
-    fmt::Debug,
-    iter,
-    num::NonZeroU32,
-    ops::{Add, Range, Sub},
-    sync::Arc,
-};
-
-use crate::{
-    EditorStyle, RowExt, hover_links::InlayHighlight, inlays::Inlay, movement::TextLayoutDetails,
-};
-use block_map::{BlockRow, BlockSnapshot};
-use fold_map::FoldSnapshot;
-use inlay_map::InlaySnapshot;
-use tab_map::TabSnapshot;
-use wrap_map::{WrapMap, WrapSnapshot};
-
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub enum FoldStatus {
-    Folded,
-    Foldable,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]
-pub enum HighlightKey {
-    Type(TypeId),
-    TypePlus(TypeId, usize),
-}
-
-pub trait ToDisplayPoint {
-    fn to_display_point(&self, map: &DisplaySnapshot) -> DisplayPoint;
-}
-
-type TextHighlights = TreeMap<HighlightKey, Arc<(HighlightStyle, Vec<Range<Anchor>>)>>;
-type InlayHighlights = TreeMap<TypeId, TreeMap<InlayId, (HighlightStyle, InlayHighlight)>>;
-
-/// Decides how text in a [`MultiBuffer`] should be displayed in a buffer, handling inlay hints,
-/// folding, hard tabs, soft wrapping, custom blocks (like diagnostics), and highlighting.
-///
-/// See the [module level documentation](self) for more information.
-pub struct DisplayMap {
-    /// The buffer that we are displaying.
-    buffer: Entity<MultiBuffer>,
-    buffer_subscription: BufferSubscription<MultiBufferOffset>,
-    /// Decides where the [`Inlay`]s should be displayed.
-    inlay_map: InlayMap,
-    /// Decides where the fold indicators should be and tracks parts of a source file that are currently folded.
-    fold_map: FoldMap,
-    /// Keeps track of hard tabs in a buffer.
-    tab_map: TabMap,
-    /// Handles soft wrapping.
-    wrap_map: Entity<WrapMap>,
-    /// Tracks custom blocks such as diagnostics that should be displayed within buffer.
-    block_map: BlockMap,
-    /// Regions of text that should be highlighted.
-    text_highlights: TextHighlights,
-    /// Regions of inlays that should be highlighted.
-    inlay_highlights: InlayHighlights,
-    /// A container for explicitly foldable ranges, which supersede indentation based fold range suggestions.
-    crease_map: CreaseMap,
-    pub(crate) fold_placeholder: FoldPlaceholder,
-    pub clip_at_line_ends: bool,
-    pub(crate) masked: bool,
-    pub(crate) diagnostics_max_severity: DiagnosticSeverity,
-}
-
-impl DisplayMap {
-    pub fn new(
-        buffer: Entity<MultiBuffer>,
-        font: Font,
-        font_size: Pixels,
-        wrap_width: Option<Pixels>,
-        buffer_header_height: u32,
-        excerpt_header_height: u32,
-        fold_placeholder: FoldPlaceholder,
-        diagnostics_max_severity: DiagnosticSeverity,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let buffer_subscription = buffer.update(cx, |buffer, _| buffer.subscribe());
-
-        let tab_size = Self::tab_size(&buffer, cx);
-        let buffer_snapshot = buffer.read(cx).snapshot(cx);
-        let crease_map = CreaseMap::new(&buffer_snapshot);
-        let (inlay_map, snapshot) = InlayMap::new(buffer_snapshot);
-        let (fold_map, snapshot) = FoldMap::new(snapshot);
-        let (tab_map, snapshot) = TabMap::new(snapshot, tab_size);
-        let (wrap_map, snapshot) = WrapMap::new(snapshot, font, font_size, wrap_width, cx);
-        let block_map = BlockMap::new(snapshot, buffer_header_height, excerpt_header_height);
-
-        cx.observe(&wrap_map, |_, _, cx| cx.notify()).detach();
-
-        DisplayMap {
-            buffer,
-            buffer_subscription,
-            fold_map,
-            inlay_map,
-            tab_map,
-            wrap_map,
-            block_map,
-            crease_map,
-            fold_placeholder,
-            diagnostics_max_severity,
-            text_highlights: Default::default(),
-            inlay_highlights: Default::default(),
-            clip_at_line_ends: false,
-            masked: false,
-        }
-    }
-
-    #[instrument(skip_all)]
-    pub fn snapshot(&mut self, cx: &mut Context<Self>) -> DisplaySnapshot {
-        let tab_size = Self::tab_size(&self.buffer, cx);
-
-        let buffer_snapshot = self.buffer.read(cx).snapshot(cx);
-        let edits = self.buffer_subscription.consume().into_inner();
-        let (inlay_snapshot, edits) = self.inlay_map.sync(buffer_snapshot, edits);
-        let (fold_snapshot, edits) = self.fold_map.read(inlay_snapshot, edits);
-        let (tab_snapshot, edits) = self.tab_map.sync(fold_snapshot, edits, tab_size);
-        let (wrap_snapshot, edits) = self
-            .wrap_map
-            .update(cx, |map, cx| map.sync(tab_snapshot, edits, cx));
-        let block_snapshot = self.block_map.read(wrap_snapshot, edits).snapshot;
-
-        // todo word diff here?
-
-        DisplaySnapshot {
-            block_snapshot,
-            diagnostics_max_severity: self.diagnostics_max_severity,
-            crease_snapshot: self.crease_map.snapshot(),
-            text_highlights: self.text_highlights.clone(),
-            inlay_highlights: self.inlay_highlights.clone(),
-            clip_at_line_ends: self.clip_at_line_ends,
-            masked: self.masked,
-            fold_placeholder: self.fold_placeholder.clone(),
-        }
-    }
-
-    #[instrument(skip_all)]
-    pub fn set_state(&mut self, other: &DisplaySnapshot, cx: &mut Context<Self>) {
-        self.fold(
-            other
-                .folds_in_range(MultiBufferOffset(0)..other.buffer_snapshot().len())
-                .map(|fold| {
-                    Crease::simple(
-                        fold.range.to_offset(other.buffer_snapshot()),
-                        fold.placeholder.clone(),
-                    )
-                })
-                .collect(),
-            cx,
-        );
-    }
-
-    /// Creates folds for the given creases.
-    #[instrument(skip_all)]
-    pub fn fold<T: Clone + ToOffset>(&mut self, creases: Vec<Crease<T>>, cx: &mut Context<Self>) {
-        let buffer_snapshot = self.buffer.read(cx).snapshot(cx);
-        let edits = self.buffer_subscription.consume().into_inner();
-        let tab_size = Self::tab_size(&self.buffer, cx);
-        let (snapshot, edits) = self.inlay_map.sync(buffer_snapshot.clone(), edits);
-        let (mut fold_map, snapshot, edits) = self.fold_map.write(snapshot, edits);
-        let (snapshot, edits) = self.tab_map.sync(snapshot, edits, tab_size);
-        let (snapshot, edits) = self
-            .wrap_map
-            .update(cx, |map, cx| map.sync(snapshot, edits, cx));
-        self.block_map.read(snapshot, edits);
-
-        let inline = creases.iter().filter_map(|crease| {
-            if let Crease::Inline {
-                range, placeholder, ..
-            } = crease
-            {
-                Some((range.clone(), placeholder.clone()))
-            } else {
-                None
-            }
-        });
-        let (snapshot, edits) = fold_map.fold(inline);
-
-        let (snapshot, edits) = self.tab_map.sync(snapshot, edits, tab_size);
-        let (snapshot, edits) = self
-            .wrap_map
-            .update(cx, |map, cx| map.sync(snapshot, edits, cx));
-        let mut block_map = self.block_map.write(snapshot, edits);
-        let blocks = creases.into_iter().filter_map(|crease| {
-            if let Crease::Block {
-                range,
-                block_height,
-                render_block,
-                block_style,
-                block_priority,
-                ..
-            } = crease
-            {
-                Some((
-                    range,
-                    render_block,
-                    block_height,
-                    block_style,
-                    block_priority,
-                ))
-            } else {
-                None
-            }
-        });
-        block_map.insert(
-            blocks
-                .into_iter()
-                .map(|(range, render, height, style, priority)| {
-                    let start = buffer_snapshot.anchor_before(range.start);
-                    let end = buffer_snapshot.anchor_after(range.end);
-                    BlockProperties {
-                        placement: BlockPlacement::Replace(start..=end),
-                        render,
-                        height: Some(height),
-                        style,
-                        priority,
-                    }
-                }),
-        );
-    }
-
-    /// Removes any folds with the given ranges.
-    #[instrument(skip_all)]
-    pub fn remove_folds_with_type<T: ToOffset>(
-        &mut self,
-        ranges: impl IntoIterator<Item = Range<T>>,
-        type_id: TypeId,
-        cx: &mut Context<Self>,
-    ) {
-        let snapshot = self.buffer.read(cx).snapshot(cx);
-        let edits = self.buffer_subscription.consume().into_inner();
-        let tab_size = Self::tab_size(&self.buffer, cx);
-        let (snapshot, edits) = self.inlay_map.sync(snapshot, edits);
-        let (mut fold_map, snapshot, edits) = self.fold_map.write(snapshot, edits);
-        let (snapshot, edits) = self.tab_map.sync(snapshot, edits, tab_size);
-        let (snapshot, edits) = self
-            .wrap_map
-            .update(cx, |map, cx| map.sync(snapshot, edits, cx));
-        self.block_map.read(snapshot, edits);
-        let (snapshot, edits) = fold_map.remove_folds(ranges, type_id);
-        let (snapshot, edits) = self.tab_map.sync(snapshot, edits, tab_size);
-        let (snapshot, edits) = self
-            .wrap_map
-            .update(cx, |map, cx| map.sync(snapshot, edits, cx));
-        self.block_map.write(snapshot, edits);
-    }
-
-    /// Removes any folds whose ranges intersect any of the given ranges.
-    #[instrument(skip_all)]
-    pub fn unfold_intersecting<T: ToOffset>(
-        &mut self,
-        ranges: impl IntoIterator<Item = Range<T>>,
-        inclusive: bool,
-        cx: &mut Context<Self>,
-    ) {
-        let snapshot = self.buffer.read(cx).snapshot(cx);
-        let offset_ranges = ranges
-            .into_iter()
-            .map(|range| range.start.to_offset(&snapshot)..range.end.to_offset(&snapshot))
-            .collect::<Vec<_>>();
-        let edits = self.buffer_subscription.consume().into_inner();
-        let tab_size = Self::tab_size(&self.buffer, cx);
-        let (snapshot, edits) = self.inlay_map.sync(snapshot, edits);
-        let (mut fold_map, snapshot, edits) = self.fold_map.write(snapshot, edits);
-        let (snapshot, edits) = self.tab_map.sync(snapshot, edits, tab_size);
-        let (snapshot, edits) = self
-            .wrap_map
-            .update(cx, |map, cx| map.sync(snapshot, edits, cx));
-        self.block_map.read(snapshot, edits);
-
-        let (snapshot, edits) =
-            fold_map.unfold_intersecting(offset_ranges.iter().cloned(), inclusive);
-        let (snapshot, edits) = self.tab_map.sync(snapshot, edits, tab_size);
-        let (snapshot, edits) = self
-            .wrap_map
-            .update(cx, |map, cx| map.sync(snapshot, edits, cx));
-        let mut block_map = self.block_map.write(snapshot, edits);
-        block_map.remove_intersecting_replace_blocks(offset_ranges, inclusive);
-    }
-
-    #[instrument(skip_all)]
-    pub fn disable_header_for_buffer(&mut self, buffer_id: BufferId, cx: &mut Context<Self>) {
-        let snapshot = self.buffer.read(cx).snapshot(cx);
-        let edits = self.buffer_subscription.consume().into_inner();
-        let tab_size = Self::tab_size(&self.buffer, cx);
-        let (snapshot, edits) = self.inlay_map.sync(snapshot, edits);
-        let (snapshot, edits) = self.fold_map.read(snapshot, edits);
-        let (snapshot, edits) = self.tab_map.sync(snapshot, edits, tab_size);
-        let (snapshot, edits) = self
-            .wrap_map
-            .update(cx, |map, cx| map.sync(snapshot, edits, cx));
-        let mut block_map = self.block_map.write(snapshot, edits);
-        block_map.disable_header_for_buffer(buffer_id)
-    }
-
-    #[instrument(skip_all)]
-    pub fn fold_buffers(
-        &mut self,
-        buffer_ids: impl IntoIterator<Item = language::BufferId>,
-        cx: &mut Context<Self>,
-    ) {
-        let snapshot = self.buffer.read(cx).snapshot(cx);
-        let edits = self.buffer_subscription.consume().into_inner();
-        let tab_size = Self::tab_size(&self.buffer, cx);
-        let (snapshot, edits) = self.inlay_map.sync(snapshot, edits);
-        let (snapshot, edits) = self.fold_map.read(snapshot, edits);
-        let (snapshot, edits) = self.tab_map.sync(snapshot, edits, tab_size);
-        let (snapshot, edits) = self
-            .wrap_map
-            .update(cx, |map, cx| map.sync(snapshot, edits, cx));
-        let mut block_map = self.block_map.write(snapshot, edits);
-        block_map.fold_buffers(buffer_ids, self.buffer.read(cx), cx)
-    }
-
-    #[instrument(skip_all)]
-    pub fn unfold_buffers(
-        &mut self,
-        buffer_ids: impl IntoIterator<Item = language::BufferId>,
-        cx: &mut Context<Self>,
-    ) {
-        let snapshot = self.buffer.read(cx).snapshot(cx);
-        let edits = self.buffer_subscription.consume().into_inner();
-        let tab_size = Self::tab_size(&self.buffer, cx);
-        let (snapshot, edits) = self.inlay_map.sync(snapshot, edits);
-        let (snapshot, edits) = self.fold_map.read(snapshot, edits);
-        let (snapshot, edits) = self.tab_map.sync(snapshot, edits, tab_size);
-        let (snapshot, edits) = self
-            .wrap_map
-            .update(cx, |map, cx| map.sync(snapshot, edits, cx));
-        let mut block_map = self.block_map.write(snapshot, edits);
-        block_map.unfold_buffers(buffer_ids, self.buffer.read(cx), cx)
-    }
-
-    #[instrument(skip_all)]
-    pub(crate) fn is_buffer_folded(&self, buffer_id: language::BufferId) -> bool {
-        self.block_map.folded_buffers.contains(&buffer_id)
-    }
-
-    #[instrument(skip_all)]
-    pub(crate) fn folded_buffers(&self) -> &HashSet<BufferId> {
-        &self.block_map.folded_buffers
-    }
-
-    #[instrument(skip_all)]
-    pub fn insert_creases(
-        &mut self,
-        creases: impl IntoIterator<Item = Crease<Anchor>>,
-        cx: &mut Context<Self>,
-    ) -> Vec<CreaseId> {
-        let snapshot = self.buffer.read(cx).snapshot(cx);
-        self.crease_map.insert(creases, &snapshot)
-    }
-
-    #[instrument(skip_all)]
-    pub fn remove_creases(
-        &mut self,
-        crease_ids: impl IntoIterator<Item = CreaseId>,
-        cx: &mut Context<Self>,
-    ) -> Vec<(CreaseId, Range<Anchor>)> {
-        let snapshot = self.buffer.read(cx).snapshot(cx);
-        self.crease_map.remove(crease_ids, &snapshot)
-    }
-
-    #[instrument(skip_all)]
-    pub fn insert_blocks(
-        &mut self,
-        blocks: impl IntoIterator<Item = BlockProperties<Anchor>>,
-        cx: &mut Context<Self>,
-    ) -> Vec<CustomBlockId> {
-        let snapshot = self.buffer.read(cx).snapshot(cx);
-        let edits = self.buffer_subscription.consume().into_inner();
-        let tab_size = Self::tab_size(&self.buffer, cx);
-        let (snapshot, edits) = self.inlay_map.sync(snapshot, edits);
-        let (snapshot, edits) = self.fold_map.read(snapshot, edits);
-        let (snapshot, edits) = self.tab_map.sync(snapshot, edits, tab_size);
-        let (snapshot, edits) = self
-            .wrap_map
-            .update(cx, |map, cx| map.sync(snapshot, edits, cx));
-        let mut block_map = self.block_map.write(snapshot, edits);
-        block_map.insert(blocks)
-    }
-
-    #[instrument(skip_all)]
-    pub fn resize_blocks(&mut self, heights: HashMap<CustomBlockId, u32>, cx: &mut Context<Self>) {
-        let snapshot = self.buffer.read(cx).snapshot(cx);
-        let edits = self.buffer_subscription.consume().into_inner();
-        let tab_size = Self::tab_size(&self.buffer, cx);
-        let (snapshot, edits) = self.inlay_map.sync(snapshot, edits);
-        let (snapshot, edits) = self.fold_map.read(snapshot, edits);
-        let (snapshot, edits) = self.tab_map.sync(snapshot, edits, tab_size);
-        let (snapshot, edits) = self
-            .wrap_map
-            .update(cx, |map, cx| map.sync(snapshot, edits, cx));
-        let mut block_map = self.block_map.write(snapshot, edits);
-        block_map.resize(heights);
-    }
-
-    #[instrument(skip_all)]
-    pub fn replace_blocks(&mut self, renderers: HashMap<CustomBlockId, RenderBlock>) {
-        self.block_map.replace_blocks(renderers);
-    }
-
-    #[instrument(skip_all)]
-    pub fn remove_blocks(&mut self, ids: HashSet<CustomBlockId>, cx: &mut Context<Self>) {
-        let snapshot = self.buffer.read(cx).snapshot(cx);
-        let edits = self.buffer_subscription.consume().into_inner();
-        let tab_size = Self::tab_size(&self.buffer, cx);
-        let (snapshot, edits) = self.inlay_map.sync(snapshot, edits);
-        let (snapshot, edits) = self.fold_map.read(snapshot, edits);
-        let (snapshot, edits) = self.tab_map.sync(snapshot, edits, tab_size);
-        let (snapshot, edits) = self
-            .wrap_map
-            .update(cx, |map, cx| map.sync(snapshot, edits, cx));
-        let mut block_map = self.block_map.write(snapshot, edits);
-        block_map.remove(ids);
-    }
-
-    #[instrument(skip_all)]
-    pub fn row_for_block(
-        &mut self,
-        block_id: CustomBlockId,
-        cx: &mut Context<Self>,
-    ) -> Option<DisplayRow> {
-        let snapshot = self.buffer.read(cx).snapshot(cx);
-        let edits = self.buffer_subscription.consume().into_inner();
-        let tab_size = Self::tab_size(&self.buffer, cx);
-        let (snapshot, edits) = self.inlay_map.sync(snapshot, edits);
-        let (snapshot, edits) = self.fold_map.read(snapshot, edits);
-        let (snapshot, edits) = self.tab_map.sync(snapshot, edits, tab_size);
-        let (snapshot, edits) = self
-            .wrap_map
-            .update(cx, |map, cx| map.sync(snapshot, edits, cx));
-        let block_map = self.block_map.read(snapshot, edits);
-        let block_row = block_map.row_for_block(block_id)?;
-        Some(DisplayRow(block_row.0))
-    }
-
-    #[instrument(skip_all)]
-    pub fn highlight_text(
-        &mut self,
-        key: HighlightKey,
-        ranges: Vec<Range<Anchor>>,
-        style: HighlightStyle,
-        merge: bool,
-        cx: &App,
-    ) {
-        let multi_buffer_snapshot = self.buffer.read(cx).snapshot(cx);
-        let to_insert = match self.text_highlights.remove(&key).filter(|_| merge) {
-            Some(previous) => {
-                let mut merged_ranges = previous.1.clone();
-                for new_range in ranges {
-                    let i = merged_ranges
-                        .binary_search_by(|probe| {
-                            probe.start.cmp(&new_range.start, &multi_buffer_snapshot)
-                        })
-                        .unwrap_or_else(|i| i);
-                    merged_ranges.insert(i, new_range);
-                }
-                Arc::new((style, merged_ranges))
-            }
-            None => Arc::new((style, ranges)),
-        };
-        self.text_highlights.insert(key, to_insert);
-    }
-
-    #[instrument(skip_all)]
-    pub(crate) fn highlight_inlays(
-        &mut self,
-        type_id: TypeId,
-        highlights: Vec<InlayHighlight>,
-        style: HighlightStyle,
-    ) {
-        for highlight in highlights {
-            let update = self.inlay_highlights.update(&type_id, |highlights| {
-                highlights.insert(highlight.inlay, (style, highlight.clone()))
-            });
-            if update.is_none() {
-                self.inlay_highlights.insert(
-                    type_id,
-                    TreeMap::from_ordered_entries([(highlight.inlay, (style, highlight))]),
-                );
-            }
-        }
-    }
-
-    #[instrument(skip_all)]
-    pub fn text_highlights(&self, type_id: TypeId) -> Option<(HighlightStyle, &[Range<Anchor>])> {
-        let highlights = self.text_highlights.get(&HighlightKey::Type(type_id))?;
-        Some((highlights.0, &highlights.1))
-    }
-
-    #[cfg(feature = "test-support")]
-    pub fn all_text_highlights(
-        &self,
-    ) -> impl Iterator<Item = &Arc<(HighlightStyle, Vec<Range<Anchor>>)>> {
-        self.text_highlights.values()
-    }
-
-    #[instrument(skip_all)]
-    pub fn clear_highlights(&mut self, type_id: TypeId) -> bool {
-        let mut cleared = self
-            .text_highlights
-            .remove(&HighlightKey::Type(type_id))
-            .is_some();
-        self.text_highlights.retain(|key, _| {
-            let retain = if let HighlightKey::TypePlus(key_type_id, _) = key {
-                key_type_id != &type_id
-            } else {
-                true
-            };
-            cleared |= !retain;
-            retain
-        });
-        cleared |= self.inlay_highlights.remove(&type_id).is_some();
-        cleared
-    }
-
-    pub fn set_font(&self, font: Font, font_size: Pixels, cx: &mut Context<Self>) -> bool {
-        self.wrap_map
-            .update(cx, |map, cx| map.set_font_with_size(font, font_size, cx))
-    }
-
-    pub fn set_wrap_width(&self, width: Option<Pixels>, cx: &mut Context<Self>) -> bool {
-        self.wrap_map
-            .update(cx, |map, cx| map.set_wrap_width(width, cx))
-    }
-
-    #[instrument(skip_all)]
-    pub fn update_fold_widths(
-        &mut self,
-        widths: impl IntoIterator<Item = (ChunkRendererId, Pixels)>,
-        cx: &mut Context<Self>,
-    ) -> bool {
-        let snapshot = self.buffer.read(cx).snapshot(cx);
-        let edits = self.buffer_subscription.consume().into_inner();
-        let tab_size = Self::tab_size(&self.buffer, cx);
-        let (snapshot, edits) = self.inlay_map.sync(snapshot, edits);
-        let (mut fold_map, snapshot, edits) = self.fold_map.write(snapshot, edits);
-        let (snapshot, edits) = self.tab_map.sync(snapshot, edits, tab_size);
-        let (snapshot, edits) = self
-            .wrap_map
-            .update(cx, |map, cx| map.sync(snapshot, edits, cx));
-        self.block_map.read(snapshot, edits);
-
-        let (snapshot, edits) = fold_map.update_fold_widths(widths);
-        let widths_changed = !edits.is_empty();
-        let (snapshot, edits) = self.tab_map.sync(snapshot, edits, tab_size);
-        let (snapshot, edits) = self
-            .wrap_map
-            .update(cx, |map, cx| map.sync(snapshot, edits, cx));
-        self.block_map.read(snapshot, edits);
-
-        widths_changed
-    }
-
-    pub(crate) fn current_inlays(&self) -> impl Iterator<Item = &Inlay> {
-        self.inlay_map.current_inlays()
-    }
-
-    #[instrument(skip_all)]
-    pub(crate) fn splice_inlays(
-        &mut self,
-        to_remove: &[InlayId],
-        to_insert: Vec<Inlay>,
-        cx: &mut Context<Self>,
-    ) {
-        if to_remove.is_empty() && to_insert.is_empty() {
-            return;
-        }
-        let buffer_snapshot = self.buffer.read(cx).snapshot(cx);
-        let edits = self.buffer_subscription.consume().into_inner();
-        let (snapshot, edits) = self.inlay_map.sync(buffer_snapshot, edits);
-        let (snapshot, edits) = self.fold_map.read(snapshot, edits);
-        let tab_size = Self::tab_size(&self.buffer, cx);
-        let (snapshot, edits) = self.tab_map.sync(snapshot, edits, tab_size);
-        let (snapshot, edits) = self
-            .wrap_map
-            .update(cx, |map, cx| map.sync(snapshot, edits, cx));
-        self.block_map.read(snapshot, edits);
-
-        let (snapshot, edits) = self.inlay_map.splice(to_remove, to_insert);
-        let (snapshot, edits) = self.fold_map.read(snapshot, edits);
-        let (snapshot, edits) = self.tab_map.sync(snapshot, edits, tab_size);
-        let (snapshot, edits) = self
-            .wrap_map
-            .update(cx, |map, cx| map.sync(snapshot, edits, cx));
-        self.block_map.read(snapshot, edits);
-    }
-
-    #[instrument(skip_all)]
-    fn tab_size(buffer: &Entity<MultiBuffer>, cx: &App) -> NonZeroU32 {
-        let buffer = buffer.read(cx).as_singleton().map(|buffer| buffer.read(cx));
-        let language = buffer
-            .and_then(|buffer| buffer.language())
-            .map(|l| l.name());
-        let file = buffer.and_then(|buffer| buffer.file());
-        language_settings(language, file, cx).tab_size
-    }
-
-    #[cfg(test)]
-    pub fn is_rewrapping(&self, cx: &gpui::App) -> bool {
-        self.wrap_map.read(cx).is_rewrapping()
-    }
-}
-
-#[derive(Debug, Default)]
-pub(crate) struct Highlights<'a> {
-    pub text_highlights: Option<&'a TextHighlights>,
-    pub inlay_highlights: Option<&'a InlayHighlights>,
-    pub styles: HighlightStyles,
-}
-
-#[derive(Clone, Copy, Debug)]
-pub struct EditPredictionStyles {
-    pub insertion: HighlightStyle,
-    pub whitespace: HighlightStyle,
-}
-
-#[derive(Default, Debug, Clone, Copy)]
-pub struct HighlightStyles {
-    pub inlay_hint: Option<HighlightStyle>,
-    pub edit_prediction: Option<EditPredictionStyles>,
-}
-
-#[derive(Clone)]
-pub enum ChunkReplacement {
-    Renderer(ChunkRenderer),
-    Str(SharedString),
-}
-
-pub struct HighlightedChunk<'a> {
-    pub text: &'a str,
-    pub style: Option<HighlightStyle>,
-    pub is_tab: bool,
-    pub is_inlay: bool,
-    pub replacement: Option<ChunkReplacement>,
-}
-
-impl<'a> HighlightedChunk<'a> {
-    #[instrument(skip_all)]
-    fn highlight_invisibles(
-        self,
-        editor_style: &'a EditorStyle,
-    ) -> impl Iterator<Item = Self> + 'a {
-        let mut chars = self.text.chars().peekable();
-        let mut text = self.text;
-        let style = self.style;
-        let is_tab = self.is_tab;
-        let renderer = self.replacement;
-        let is_inlay = self.is_inlay;
-        iter::from_fn(move || {
-            let mut prefix_len = 0;
-            while let Some(&ch) = chars.peek() {
-                if !is_invisible(ch) {
-                    prefix_len += ch.len_utf8();
-                    chars.next();
-                    continue;
-                }
-                if prefix_len > 0 {
-                    let (prefix, suffix) = text.split_at(prefix_len);
-                    text = suffix;
-                    return Some(HighlightedChunk {
-                        text: prefix,
-                        style,
-                        is_tab,
-                        is_inlay,
-                        replacement: renderer.clone(),
-                    });
-                }
-                chars.next();
-                let (prefix, suffix) = text.split_at(ch.len_utf8());
-                text = suffix;
-                if let Some(replacement) = replacement(ch) {
-                    let invisible_highlight = HighlightStyle {
-                        background_color: Some(editor_style.status.hint_background),
-                        underline: Some(UnderlineStyle {
-                            color: Some(editor_style.status.hint),
-                            thickness: px(1.),
-                            wavy: false,
-                        }),
-                        ..Default::default()
-                    };
-                    let invisible_style = if let Some(style) = style {
-                        style.highlight(invisible_highlight)
-                    } else {
-                        invisible_highlight
-                    };
-                    return Some(HighlightedChunk {
-                        text: prefix,
-                        style: Some(invisible_style),
-                        is_tab: false,
-                        is_inlay,
-                        replacement: Some(ChunkReplacement::Str(replacement.into())),
-                    });
-                } else {
-                    let invisible_highlight = HighlightStyle {
-                        background_color: Some(editor_style.status.hint_background),
-                        underline: Some(UnderlineStyle {
-                            color: Some(editor_style.status.hint),
-                            thickness: px(1.),
-                            wavy: false,
-                        }),
-                        ..Default::default()
-                    };
-                    let invisible_style = if let Some(style) = style {
-                        style.highlight(invisible_highlight)
-                    } else {
-                        invisible_highlight
-                    };
-
-                    return Some(HighlightedChunk {
-                        text: prefix,
-                        style: Some(invisible_style),
-                        is_tab: false,
-                        is_inlay,
-                        replacement: renderer.clone(),
-                    });
-                }
-            }
-
-            if !text.is_empty() {
-                let remainder = text;
-                text = "";
-                Some(HighlightedChunk {
-                    text: remainder,
-                    style,
-                    is_tab,
-                    is_inlay,
-                    replacement: renderer.clone(),
-                })
-            } else {
-                None
-            }
-        })
-    }
-}
-
-#[derive(Clone)]
-pub struct DisplaySnapshot {
-    pub crease_snapshot: CreaseSnapshot,
-    block_snapshot: BlockSnapshot,
-    text_highlights: TextHighlights,
-    inlay_highlights: InlayHighlights,
-    clip_at_line_ends: bool,
-    masked: bool,
-    diagnostics_max_severity: DiagnosticSeverity,
-    pub(crate) fold_placeholder: FoldPlaceholder,
-}
-
-impl DisplaySnapshot {
-    pub fn wrap_snapshot(&self) -> &WrapSnapshot {
-        &self.block_snapshot.wrap_snapshot
-    }
-    pub fn tab_snapshot(&self) -> &TabSnapshot {
-        &self.block_snapshot.wrap_snapshot.tab_snapshot
-    }
-
-    pub fn fold_snapshot(&self) -> &FoldSnapshot {
-        &self.block_snapshot.wrap_snapshot.tab_snapshot.fold_snapshot
-    }
-
-    pub fn inlay_snapshot(&self) -> &InlaySnapshot {
-        &self
-            .block_snapshot
-            .wrap_snapshot
-            .tab_snapshot
-            .fold_snapshot
-            .inlay_snapshot
-    }
-
-    pub fn buffer_snapshot(&self) -> &MultiBufferSnapshot {
-        &self
-            .block_snapshot
-            .wrap_snapshot
-            .tab_snapshot
-            .fold_snapshot
-            .inlay_snapshot
-            .buffer
-    }
-
-    #[cfg(test)]
-    pub fn fold_count(&self) -> usize {
-        self.fold_snapshot().fold_count()
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.buffer_snapshot().len() == MultiBufferOffset(0)
-    }
-
-    pub fn row_infos(&self, start_row: DisplayRow) -> impl Iterator<Item = RowInfo> + '_ {
-        self.block_snapshot.row_infos(BlockRow(start_row.0))
-    }
-
-    pub fn widest_line_number(&self) -> u32 {
-        self.buffer_snapshot().widest_line_number()
-    }
-
-    #[instrument(skip_all)]
-    pub fn prev_line_boundary(&self, mut point: MultiBufferPoint) -> (Point, DisplayPoint) {
-        loop {
-            let mut inlay_point = self.inlay_snapshot().to_inlay_point(point);
-            let mut fold_point = self.fold_snapshot().to_fold_point(inlay_point, Bias::Left);
-            fold_point.0.column = 0;
-            inlay_point = fold_point.to_inlay_point(self.fold_snapshot());
-            point = self.inlay_snapshot().to_buffer_point(inlay_point);
-
-            let mut display_point = self.point_to_display_point(point, Bias::Left);
-            *display_point.column_mut() = 0;
-            let next_point = self.display_point_to_point(display_point, Bias::Left);
-            if next_point == point {
-                return (point, display_point);
-            }
-            point = next_point;
-        }
-    }
-
-    #[instrument(skip_all)]
-    pub fn next_line_boundary(
-        &self,
-        mut point: MultiBufferPoint,
-    ) -> (MultiBufferPoint, DisplayPoint) {
-        let original_point = point;
-        loop {
-            let mut inlay_point = self.inlay_snapshot().to_inlay_point(point);
-            let mut fold_point = self.fold_snapshot().to_fold_point(inlay_point, Bias::Right);
-            fold_point.0.column = self.fold_snapshot().line_len(fold_point.row());
-            inlay_point = fold_point.to_inlay_point(self.fold_snapshot());
-            point = self.inlay_snapshot().to_buffer_point(inlay_point);
-
-            let mut display_point = self.point_to_display_point(point, Bias::Right);
-            *display_point.column_mut() = self.line_len(display_point.row());
-            let next_point = self.display_point_to_point(display_point, Bias::Right);
-            if next_point == point || original_point == point || original_point == next_point {
-                return (point, display_point);
-            }
-            point = next_point;
-        }
-    }
-
-    // used by line_mode selections and tries to match vim behavior
-    pub fn expand_to_line(&self, range: Range<Point>) -> Range<Point> {
-        let new_start = MultiBufferPoint::new(range.start.row, 0);
-        let new_end = if range.end.column > 0 {
-            MultiBufferPoint::new(
-                range.end.row,
-                self.buffer_snapshot()
-                    .line_len(MultiBufferRow(range.end.row)),
-            )
-        } else {
-            range.end
-        };
-
-        new_start..new_end
-    }
-
-    #[instrument(skip_all)]
-    pub fn point_to_display_point(&self, point: MultiBufferPoint, bias: Bias) -> DisplayPoint {
-        let inlay_point = self.inlay_snapshot().to_inlay_point(point);
-        let fold_point = self.fold_snapshot().to_fold_point(inlay_point, bias);
-        let tab_point = self.tab_snapshot().fold_point_to_tab_point(fold_point);
-        let wrap_point = self.wrap_snapshot().tab_point_to_wrap_point(tab_point);
-        let block_point = self.block_snapshot.to_block_point(wrap_point);
-        DisplayPoint(block_point)
-    }
-
-    pub fn display_point_to_point(&self, point: DisplayPoint, bias: Bias) -> Point {
-        self.inlay_snapshot()
-            .to_buffer_point(self.display_point_to_inlay_point(point, bias))
-    }
-
-    pub fn display_point_to_inlay_offset(&self, point: DisplayPoint, bias: Bias) -> InlayOffset {
-        self.inlay_snapshot()
-            .to_offset(self.display_point_to_inlay_point(point, bias))
-    }
-
-    pub fn anchor_to_inlay_offset(&self, anchor: Anchor) -> InlayOffset {
-        self.inlay_snapshot()
-            .to_inlay_offset(anchor.to_offset(self.buffer_snapshot()))
-    }
-
-    pub fn display_point_to_anchor(&self, point: DisplayPoint, bias: Bias) -> Anchor {
-        self.buffer_snapshot()
-            .anchor_at(point.to_offset(self, bias), bias)
-    }
-
-    #[instrument(skip_all)]
-    fn display_point_to_inlay_point(&self, point: DisplayPoint, bias: Bias) -> InlayPoint {
-        let block_point = point.0;
-        let wrap_point = self.block_snapshot.to_wrap_point(block_point, bias);
-        let tab_point = self.wrap_snapshot().to_tab_point(wrap_point);
-        let fold_point = self
-            .tab_snapshot()
-            .tab_point_to_fold_point(tab_point, bias)
-            .0;
-        fold_point.to_inlay_point(self.fold_snapshot())
-    }
-
-    #[instrument(skip_all)]
-    pub fn display_point_to_fold_point(&self, point: DisplayPoint, bias: Bias) -> FoldPoint {
-        let block_point = point.0;
-        let wrap_point = self.block_snapshot.to_wrap_point(block_point, bias);
-        let tab_point = self.wrap_snapshot().to_tab_point(wrap_point);
-        self.tab_snapshot()
-            .tab_point_to_fold_point(tab_point, bias)
-            .0
-    }
-
-    #[instrument(skip_all)]
-    pub fn fold_point_to_display_point(&self, fold_point: FoldPoint) -> DisplayPoint {
-        let tab_point = self.tab_snapshot().fold_point_to_tab_point(fold_point);
-        let wrap_point = self.wrap_snapshot().tab_point_to_wrap_point(tab_point);
-        let block_point = self.block_snapshot.to_block_point(wrap_point);
-        DisplayPoint(block_point)
-    }
-
-    pub fn max_point(&self) -> DisplayPoint {
-        DisplayPoint(self.block_snapshot.max_point())
-    }
-
-    /// Returns text chunks starting at the given display row until the end of the file
-    #[instrument(skip_all)]
-    pub fn text_chunks(&self, display_row: DisplayRow) -> impl Iterator<Item = &str> {
-        self.block_snapshot
-            .chunks(
-                BlockRow(display_row.0)..BlockRow(self.max_point().row().next_row().0),
-                false,
-                self.masked,
-                Highlights::default(),
-            )
-            .map(|h| h.text)
-    }
-
-    /// Returns text chunks starting at the end of the given display row in reverse until the start of the file
-    #[instrument(skip_all)]
-    pub fn reverse_text_chunks(&self, display_row: DisplayRow) -> impl Iterator<Item = &str> {
-        (0..=display_row.0).rev().flat_map(move |row| {
-            self.block_snapshot
-                .chunks(
-                    BlockRow(row)..BlockRow(row + 1),
-                    false,
-                    self.masked,
-                    Highlights::default(),
-                )
-                .map(|h| h.text)
-                .collect::<Vec<_>>()
-                .into_iter()
-                .rev()
-        })
-    }
-
-    #[instrument(skip_all)]
-    pub fn chunks(
-        &self,
-        display_rows: Range<DisplayRow>,
-        language_aware: bool,
-        highlight_styles: HighlightStyles,
-    ) -> DisplayChunks<'_> {
-        self.block_snapshot.chunks(
-            BlockRow(display_rows.start.0)..BlockRow(display_rows.end.0),
-            language_aware,
-            self.masked,
-            Highlights {
-                text_highlights: Some(&self.text_highlights),
-                inlay_highlights: Some(&self.inlay_highlights),
-                styles: highlight_styles,
-            },
-        )
-    }
-
-    #[instrument(skip_all)]
-    pub fn highlighted_chunks<'a>(
-        &'a self,
-        display_rows: Range<DisplayRow>,
-        language_aware: bool,
-        editor_style: &'a EditorStyle,
-    ) -> impl Iterator<Item = HighlightedChunk<'a>> {
-        self.chunks(
-            display_rows,
-            language_aware,
-            HighlightStyles {
-                inlay_hint: Some(editor_style.inlay_hints_style),
-                edit_prediction: Some(editor_style.edit_prediction_styles),
-            },
-        )
-        .flat_map(|chunk| {
-            let highlight_style = chunk
-                .syntax_highlight_id
-                .and_then(|id| id.style(&editor_style.syntax));
-
-            let chunk_highlight = chunk.highlight_style.map(|chunk_highlight| {
-                HighlightStyle {
-                    // For color inlays, blend the color with the editor background
-                    // if the color has transparency (alpha < 1.0)
-                    color: chunk_highlight.color.map(|color| {
-                        if chunk.is_inlay && !color.is_opaque() {
-                            editor_style.background.blend(color)
-                        } else {
-                            color
-                        }
-                    }),
-                    ..chunk_highlight
-                }
-            });
-
-            let diagnostic_highlight = chunk
-                .diagnostic_severity
-                .filter(|severity| {
-                    self.diagnostics_max_severity
-                        .into_lsp()
-                        .is_some_and(|max_severity| severity <= &max_severity)
-                })
-                .map(|severity| HighlightStyle {
-                    fade_out: chunk
-                        .is_unnecessary
-                        .then_some(editor_style.unnecessary_code_fade),
-                    underline: (chunk.underline
-                        && editor_style.show_underlines
-                        && !(chunk.is_unnecessary && severity > lsp::DiagnosticSeverity::WARNING))
-                        .then(|| {
-                            let diagnostic_color =
-                                super::diagnostic_style(severity, &editor_style.status);
-                            UnderlineStyle {
-                                color: Some(diagnostic_color),
-                                thickness: 1.0.into(),
-                                wavy: true,
-                            }
-                        }),
-                    ..Default::default()
-                });
-
-            let style = [highlight_style, chunk_highlight, diagnostic_highlight]
-                .into_iter()
-                .flatten()
-                .reduce(|acc, highlight| acc.highlight(highlight));
-
-            HighlightedChunk {
-                text: chunk.text,
-                style,
-                is_tab: chunk.is_tab,
-                is_inlay: chunk.is_inlay,
-                replacement: chunk.renderer.map(ChunkReplacement::Renderer),
-            }
-            .highlight_invisibles(editor_style)
-        })
-    }
-
-    #[instrument(skip_all)]
-    pub fn layout_row(
-        &self,
-        display_row: DisplayRow,
-        TextLayoutDetails {
-            text_system,
-            editor_style,
-            rem_size,
-            scroll_anchor: _,
-            visible_rows: _,
-            vertical_scroll_margin: _,
-        }: &TextLayoutDetails,
-    ) -> Arc<LineLayout> {
-        let mut runs = Vec::new();
-        let mut line = String::new();
-
-        let range = display_row..display_row.next_row();
-        for chunk in self.highlighted_chunks(range, false, editor_style) {
-            line.push_str(chunk.text);
-
-            let text_style = if let Some(style) = chunk.style {
-                Cow::Owned(editor_style.text.clone().highlight(style))
-            } else {
-                Cow::Borrowed(&editor_style.text)
-            };
-
-            runs.push(text_style.to_run(chunk.text.len()))
-        }
-
-        if line.ends_with('\n') {
-            line.pop();
-            if let Some(last_run) = runs.last_mut() {
-                last_run.len -= 1;
-                if last_run.len == 0 {
-                    runs.pop();
-                }
-            }
-        }
-
-        let font_size = editor_style.text.font_size.to_pixels(*rem_size);
-        text_system.layout_line(&line, font_size, &runs, None)
-    }
-
-    pub fn x_for_display_point(
-        &self,
-        display_point: DisplayPoint,
-        text_layout_details: &TextLayoutDetails,
-    ) -> Pixels {
-        let line = self.layout_row(display_point.row(), text_layout_details);
-        line.x_for_index(display_point.column() as usize)
-    }
-
-    pub fn display_column_for_x(
-        &self,
-        display_row: DisplayRow,
-        x: Pixels,
-        details: &TextLayoutDetails,
-    ) -> u32 {
-        let layout_line = self.layout_row(display_row, details);
-        layout_line.closest_index_for_x(x) as u32
-    }
-
-    #[instrument(skip_all)]
-    pub fn grapheme_at(&self, mut point: DisplayPoint) -> Option<SharedString> {
-        point = DisplayPoint(self.block_snapshot.clip_point(point.0, Bias::Left));
-        let chars = self
-            .text_chunks(point.row())
-            .flat_map(str::chars)
-            .skip_while({
-                let mut column = 0;
-                move |char| {
-                    let at_point = column >= point.column();
-                    column += char.len_utf8() as u32;
-                    !at_point
-                }
-            })
-            .take_while({
-                let mut prev = false;
-                move |char| {
-                    let now = char.is_ascii();
-                    let end = char.is_ascii() && (char.is_ascii_whitespace() || prev);
-                    prev = now;
-                    !end
-                }
-            });
-        chars.collect::<String>().graphemes(true).next().map(|s| {
-            if let Some(invisible) = s.chars().next().filter(|&c| is_invisible(c)) {
-                replacement(invisible).unwrap_or(s).to_owned().into()
-            } else if s == "\n" {
-                " ".into()
-            } else {
-                s.to_owned().into()
-            }
-        })
-    }
-
-    pub fn buffer_chars_at(
-        &self,
-        mut offset: MultiBufferOffset,
-    ) -> impl Iterator<Item = (char, MultiBufferOffset)> + '_ {
-        self.buffer_snapshot().chars_at(offset).map(move |ch| {
-            let ret = (ch, offset);
-            offset += ch.len_utf8();
-            ret
-        })
-    }
-
-    pub fn reverse_buffer_chars_at(
-        &self,
-        mut offset: MultiBufferOffset,
-    ) -> impl Iterator<Item = (char, MultiBufferOffset)> + '_ {
-        self.buffer_snapshot()
-            .reversed_chars_at(offset)
-            .map(move |ch| {
-                offset -= ch.len_utf8();
-                (ch, offset)
-            })
-    }
-
-    pub fn clip_point(&self, point: DisplayPoint, bias: Bias) -> DisplayPoint {
-        let mut clipped = self.block_snapshot.clip_point(point.0, bias);
-        if self.clip_at_line_ends {
-            clipped = self.clip_at_line_end(DisplayPoint(clipped)).0
-        }
-        DisplayPoint(clipped)
-    }
-
-    pub fn clip_ignoring_line_ends(&self, point: DisplayPoint, bias: Bias) -> DisplayPoint {
-        DisplayPoint(self.block_snapshot.clip_point(point.0, bias))
-    }
-
-    pub fn clip_at_line_end(&self, display_point: DisplayPoint) -> DisplayPoint {
-        let mut point = self.display_point_to_point(display_point, Bias::Left);
-
-        if point.column != self.buffer_snapshot().line_len(MultiBufferRow(point.row)) {
-            return display_point;
-        }
-        point.column = point.column.saturating_sub(1);
-        point = self.buffer_snapshot().clip_point(point, Bias::Left);
-        self.point_to_display_point(point, Bias::Left)
-    }
-
-    pub fn folds_in_range<T>(&self, range: Range<T>) -> impl Iterator<Item = &Fold>
-    where
-        T: ToOffset,
-    {
-        self.fold_snapshot().folds_in_range(range)
-    }
-
-    pub fn blocks_in_range(
-        &self,
-        rows: Range<DisplayRow>,
-    ) -> impl Iterator<Item = (DisplayRow, &Block)> {
-        self.block_snapshot
-            .blocks_in_range(BlockRow(rows.start.0)..BlockRow(rows.end.0))
-            .map(|(row, block)| (DisplayRow(row.0), block))
-    }
-
-    pub fn sticky_header_excerpt(&self, row: f64) -> Option<StickyHeaderExcerpt<'_>> {
-        self.block_snapshot.sticky_header_excerpt(row)
-    }
-
-    pub fn block_for_id(&self, id: BlockId) -> Option<Block> {
-        self.block_snapshot.block_for_id(id)
-    }
-
-    pub fn intersects_fold<T: ToOffset>(&self, offset: T) -> bool {
-        self.fold_snapshot().intersects_fold(offset)
-    }
-
-    pub fn is_line_folded(&self, buffer_row: MultiBufferRow) -> bool {
-        self.block_snapshot.is_line_replaced(buffer_row)
-            || self.fold_snapshot().is_line_folded(buffer_row)
-    }
-
-    pub fn is_block_line(&self, display_row: DisplayRow) -> bool {
-        self.block_snapshot.is_block_line(BlockRow(display_row.0))
-    }
-
-    pub fn is_folded_buffer_header(&self, display_row: DisplayRow) -> bool {
-        self.block_snapshot
-            .is_folded_buffer_header(BlockRow(display_row.0))
-    }
-
-    pub fn soft_wrap_indent(&self, display_row: DisplayRow) -> Option<u32> {
-        let wrap_row = self
-            .block_snapshot
-            .to_wrap_point(BlockPoint::new(BlockRow(display_row.0), 0), Bias::Left)
-            .row();
-        self.wrap_snapshot().soft_wrap_indent(wrap_row)
-    }
-
-    pub fn text(&self) -> String {
-        self.text_chunks(DisplayRow(0)).collect()
-    }
-
-    pub fn line(&self, display_row: DisplayRow) -> String {
-        let mut result = String::new();
-        for chunk in self.text_chunks(display_row) {
-            if let Some(ix) = chunk.find('\n') {
-                result.push_str(&chunk[0..ix]);
-                break;
-            } else {
-                result.push_str(chunk);
-            }
-        }
-        result
-    }
-
-    pub fn line_indent_for_buffer_row(&self, buffer_row: MultiBufferRow) -> LineIndent {
-        self.buffer_snapshot().line_indent_for_row(buffer_row)
-    }
-
-    pub fn line_len(&self, row: DisplayRow) -> u32 {
-        self.block_snapshot.line_len(BlockRow(row.0))
-    }
-
-    pub fn longest_row(&self) -> DisplayRow {
-        DisplayRow(self.block_snapshot.longest_row().0)
-    }
-
-    pub fn longest_row_in_range(&self, range: Range<DisplayRow>) -> DisplayRow {
-        let block_range = BlockRow(range.start.0)..BlockRow(range.end.0);
-        let longest_row = self.block_snapshot.longest_row_in_range(block_range);
-        DisplayRow(longest_row.0)
-    }
-
-    pub fn starts_indent(&self, buffer_row: MultiBufferRow) -> bool {
-        let max_row = self.buffer_snapshot().max_row();
-        if buffer_row >= max_row {
-            return false;
-        }
-
-        let line_indent = self.line_indent_for_buffer_row(buffer_row);
-        if line_indent.is_line_blank() {
-            return false;
-        }
-
-        (buffer_row.0 + 1..=max_row.0)
-            .find_map(|next_row| {
-                let next_line_indent = self.line_indent_for_buffer_row(MultiBufferRow(next_row));
-                if next_line_indent.raw_len() > line_indent.raw_len() {
-                    Some(true)
-                } else if !next_line_indent.is_line_blank() {
-                    Some(false)
-                } else {
-                    None
-                }
-            })
-            .unwrap_or(false)
-    }
-
-    #[instrument(skip_all)]
-    pub fn crease_for_buffer_row(&self, buffer_row: MultiBufferRow) -> Option<Crease<Point>> {
-        let start =
-            MultiBufferPoint::new(buffer_row.0, self.buffer_snapshot().line_len(buffer_row));
-        if let Some(crease) = self
-            .crease_snapshot
-            .query_row(buffer_row, self.buffer_snapshot())
-        {
-            match crease {
-                Crease::Inline {
-                    range,
-                    placeholder,
-                    render_toggle,
-                    render_trailer,
-                    metadata,
-                } => Some(Crease::Inline {
-                    range: range.to_point(self.buffer_snapshot()),
-                    placeholder: placeholder.clone(),
-                    render_toggle: render_toggle.clone(),
-                    render_trailer: render_trailer.clone(),
-                    metadata: metadata.clone(),
-                }),
-                Crease::Block {
-                    range,
-                    block_height,
-                    block_style,
-                    render_block,
-                    block_priority,
-                    render_toggle,
-                } => Some(Crease::Block {
-                    range: range.to_point(self.buffer_snapshot()),
-                    block_height: *block_height,
-                    block_style: *block_style,
-                    render_block: render_block.clone(),
-                    block_priority: *block_priority,
-                    render_toggle: render_toggle.clone(),
-                }),
-            }
-        } else if self.starts_indent(MultiBufferRow(start.row))
-            && !self.is_line_folded(MultiBufferRow(start.row))
-        {
-            let start_line_indent = self.line_indent_for_buffer_row(buffer_row);
-            let max_point = self.buffer_snapshot().max_point();
-            let mut end = None;
-
-            for row in (buffer_row.0 + 1)..=max_point.row {
-                let line_indent = self.line_indent_for_buffer_row(MultiBufferRow(row));
-                if !line_indent.is_line_blank()
-                    && line_indent.raw_len() <= start_line_indent.raw_len()
-                {
-                    let prev_row = row - 1;
-                    end = Some(Point::new(
-                        prev_row,
-                        self.buffer_snapshot().line_len(MultiBufferRow(prev_row)),
-                    ));
-                    break;
-                }
-            }
-
-            let mut row_before_line_breaks = end.unwrap_or(max_point);
-            while row_before_line_breaks.row > start.row
-                && self
-                    .buffer_snapshot()
-                    .is_line_blank(MultiBufferRow(row_before_line_breaks.row))
-            {
-                row_before_line_breaks.row -= 1;
-            }
-
-            row_before_line_breaks = Point::new(
-                row_before_line_breaks.row,
-                self.buffer_snapshot()
-                    .line_len(MultiBufferRow(row_before_line_breaks.row)),
-            );
-
-            Some(Crease::Inline {
-                range: start..row_before_line_breaks,
-                placeholder: self.fold_placeholder.clone(),
-                render_toggle: None,
-                render_trailer: None,
-                metadata: None,
-            })
-        } else {
-            None
-        }
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    #[instrument(skip_all)]
-    pub fn text_highlight_ranges<Tag: ?Sized + 'static>(
-        &self,
-    ) -> Option<Arc<(HighlightStyle, Vec<Range<Anchor>>)>> {
-        let type_id = TypeId::of::<Tag>();
-        self.text_highlights
-            .get(&HighlightKey::Type(type_id))
-            .cloned()
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    #[instrument(skip_all)]
-    pub fn all_text_highlight_ranges<Tag: ?Sized + 'static>(
-        &self,
-    ) -> Vec<(gpui::Hsla, Range<Point>)> {
-        use itertools::Itertools;
-
-        let required_type_id = TypeId::of::<Tag>();
-        self.text_highlights
-            .iter()
-            .filter(|(key, _)| match key {
-                HighlightKey::Type(type_id) => type_id == &required_type_id,
-                HighlightKey::TypePlus(type_id, _) => type_id == &required_type_id,
-            })
-            .map(|(_, value)| value.clone())
-            .flat_map(|ranges| {
-                ranges
-                    .1
-                    .iter()
-                    .flat_map(|range| {
-                        Some((ranges.0.color?, range.to_point(self.buffer_snapshot())))
-                    })
-                    .collect::<Vec<_>>()
-            })
-            .sorted_by_key(|(_, range)| range.start)
-            .collect()
-    }
-
-    #[allow(unused)]
-    #[cfg(any(test, feature = "test-support"))]
-    pub(crate) fn inlay_highlights<Tag: ?Sized + 'static>(
-        &self,
-    ) -> Option<&TreeMap<InlayId, (HighlightStyle, InlayHighlight)>> {
-        let type_id = TypeId::of::<Tag>();
-        self.inlay_highlights.get(&type_id)
-    }
-
-    pub fn buffer_header_height(&self) -> u32 {
-        self.block_snapshot.buffer_header_height
-    }
-
-    pub fn excerpt_header_height(&self) -> u32 {
-        self.block_snapshot.excerpt_header_height
-    }
-
-    /// Given a `DisplayPoint`, returns another `DisplayPoint` corresponding to
-    /// the start of the buffer row that is a given number of buffer rows away
-    /// from the provided point.
-    ///
-    /// This moves by buffer rows instead of display rows, a distinction that is
-    /// important when soft wrapping is enabled.
-    #[instrument(skip_all)]
-    pub fn start_of_relative_buffer_row(&self, point: DisplayPoint, times: isize) -> DisplayPoint {
-        let start = self.display_point_to_fold_point(point, Bias::Left);
-        let target = start.row() as isize + times;
-        let new_row = (target.max(0) as u32).min(self.fold_snapshot().max_point().row());
-
-        self.clip_point(
-            self.fold_point_to_display_point(
-                self.fold_snapshot()
-                    .clip_point(FoldPoint::new(new_row, 0), Bias::Right),
-            ),
-            Bias::Right,
-        )
-    }
-}
-
-impl std::ops::Deref for DisplaySnapshot {
-    type Target = BlockSnapshot;
-
-    fn deref(&self) -> &Self::Target {
-        &self.block_snapshot
-    }
-}
-
-/// A zero-indexed point in a text buffer consisting of a row and column adjusted for inserted blocks.
-#[derive(Copy, Clone, Default, Eq, Ord, PartialOrd, PartialEq)]
-pub struct DisplayPoint(BlockPoint);
-
-impl Debug for DisplayPoint {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.write_fmt(format_args!(
-            "DisplayPoint({}, {})",
-            self.row().0,
-            self.column()
-        ))
-    }
-}
-
-impl Add for DisplayPoint {
-    type Output = Self;
-
-    fn add(self, other: Self) -> Self::Output {
-        DisplayPoint(BlockPoint(self.0.0 + other.0.0))
-    }
-}
-
-impl Sub for DisplayPoint {
-    type Output = Self;
-
-    fn sub(self, other: Self) -> Self::Output {
-        DisplayPoint(BlockPoint(self.0.0 - other.0.0))
-    }
-}
-
-#[derive(Debug, Copy, Clone, Default, Eq, Ord, PartialOrd, PartialEq, Deserialize, Hash)]
-#[serde(transparent)]
-pub struct DisplayRow(pub u32);
-
-impl Add<DisplayRow> for DisplayRow {
-    type Output = Self;
-
-    fn add(self, other: Self) -> Self::Output {
-        DisplayRow(self.0 + other.0)
-    }
-}
-
-impl Add<u32> for DisplayRow {
-    type Output = Self;
-
-    fn add(self, other: u32) -> Self::Output {
-        DisplayRow(self.0 + other)
-    }
-}
-
-impl Sub<DisplayRow> for DisplayRow {
-    type Output = Self;
-
-    fn sub(self, other: Self) -> Self::Output {
-        DisplayRow(self.0 - other.0)
-    }
-}
-
-impl Sub<u32> for DisplayRow {
-    type Output = Self;
-
-    fn sub(self, other: u32) -> Self::Output {
-        DisplayRow(self.0 - other)
-    }
-}
-
-impl DisplayPoint {
-    pub fn new(row: DisplayRow, column: u32) -> Self {
-        Self(BlockPoint(Point::new(row.0, column)))
-    }
-
-    pub fn zero() -> Self {
-        Self::new(DisplayRow(0), 0)
-    }
-
-    pub fn is_zero(&self) -> bool {
-        self.0.is_zero()
-    }
-
-    pub fn row(self) -> DisplayRow {
-        DisplayRow(self.0.row)
-    }
-
-    pub fn column(self) -> u32 {
-        self.0.column
-    }
-
-    pub fn row_mut(&mut self) -> &mut u32 {
-        &mut self.0.row
-    }
-
-    pub fn column_mut(&mut self) -> &mut u32 {
-        &mut self.0.column
-    }
-
-    pub fn to_point(self, map: &DisplaySnapshot) -> Point {
-        map.display_point_to_point(self, Bias::Left)
-    }
-
-    pub fn to_offset(self, map: &DisplaySnapshot, bias: Bias) -> MultiBufferOffset {
-        let wrap_point = map.block_snapshot.to_wrap_point(self.0, bias);
-        let tab_point = map.wrap_snapshot().to_tab_point(wrap_point);
-        let fold_point = map
-            .tab_snapshot()
-            .tab_point_to_fold_point(tab_point, bias)
-            .0;
-        let inlay_point = fold_point.to_inlay_point(map.fold_snapshot());
-        map.inlay_snapshot()
-            .to_buffer_offset(map.inlay_snapshot().to_offset(inlay_point))
-    }
-}
-
-impl ToDisplayPoint for MultiBufferOffset {
-    fn to_display_point(&self, map: &DisplaySnapshot) -> DisplayPoint {
-        map.point_to_display_point(self.to_point(map.buffer_snapshot()), Bias::Left)
-    }
-}
-
-impl ToDisplayPoint for MultiBufferOffsetUtf16 {
-    fn to_display_point(&self, map: &DisplaySnapshot) -> DisplayPoint {
-        self.to_offset(map.buffer_snapshot()).to_display_point(map)
-    }
-}
-
-impl ToDisplayPoint for Point {
-    fn to_display_point(&self, map: &DisplaySnapshot) -> DisplayPoint {
-        map.point_to_display_point(*self, Bias::Left)
-    }
-}
-
-impl ToDisplayPoint for Anchor {
-    fn to_display_point(&self, map: &DisplaySnapshot) -> DisplayPoint {
-        self.to_point(map.buffer_snapshot()).to_display_point(map)
-    }
-}
-
-#[cfg(test)]
-pub mod tests {
-    use super::*;
-    use crate::{
-        movement,
-        test::{marked_display_snapshot, test_font},
-    };
-    use Bias::*;
-    use block_map::BlockPlacement;
-    use gpui::{
-        App, AppContext as _, BorrowAppContext, Element, Hsla, Rgba, div, font, observe, px,
-    };
-    use language::{
-        Buffer, Diagnostic, DiagnosticEntry, DiagnosticSet, Language, LanguageConfig,
-        LanguageMatcher,
-    };
-    use lsp::LanguageServerId;
-
-    use rand::{Rng, prelude::*};
-    use settings::{SettingsContent, SettingsStore};
-    use smol::stream::StreamExt;
-    use std::{env, sync::Arc};
-    use text::PointUtf16;
-    use theme::{LoadThemes, SyntaxTheme};
-    use unindent::Unindent as _;
-    use util::test::{marked_text_ranges, sample_text};
-
-    #[gpui::test(iterations = 100)]
-    async fn test_random_display_map(cx: &mut gpui::TestAppContext, mut rng: StdRng) {
-        cx.background_executor.set_block_on_ticks(0..=50);
-        let operations = env::var("OPERATIONS")
-            .map(|i| i.parse().expect("invalid `OPERATIONS` variable"))
-            .unwrap_or(10);
-
-        let mut tab_size = rng.random_range(1..=4);
-        let buffer_start_excerpt_header_height = rng.random_range(1..=5);
-        let excerpt_header_height = rng.random_range(1..=5);
-        let font_size = px(14.0);
-        let max_wrap_width = 300.0;
-        let mut wrap_width = if rng.random_bool(0.1) {
-            None
-        } else {
-            Some(px(rng.random_range(0.0..=max_wrap_width)))
-        };
-
-        log::info!("tab size: {}", tab_size);
-        log::info!("wrap width: {:?}", wrap_width);
-
-        cx.update(|cx| {
-            init_test(cx, |s| {
-                s.project.all_languages.defaults.tab_size = NonZeroU32::new(tab_size)
-            });
-        });
-
-        let buffer = cx.update(|cx| {
-            if rng.random() {
-                let len = rng.random_range(0..10);
-                let text = util::RandomCharIter::new(&mut rng)
-                    .take(len)
-                    .collect::<String>();
-                MultiBuffer::build_simple(&text, cx)
-            } else {
-                MultiBuffer::build_random(&mut rng, cx)
-            }
-        });
-
-        let font = test_font();
-        let map = cx.new(|cx| {
-            DisplayMap::new(
-                buffer.clone(),
-                font,
-                font_size,
-                wrap_width,
-                buffer_start_excerpt_header_height,
-                excerpt_header_height,
-                FoldPlaceholder::test(),
-                DiagnosticSeverity::Warning,
-                cx,
-            )
-        });
-        let mut notifications = observe(&map, cx);
-        let mut fold_count = 0;
-        let mut blocks = Vec::new();
-
-        let snapshot = map.update(cx, |map, cx| map.snapshot(cx));
-        log::info!("buffer text: {:?}", snapshot.buffer_snapshot().text());
-        log::info!("fold text: {:?}", snapshot.fold_snapshot().text());
-        log::info!("tab text: {:?}", snapshot.tab_snapshot().text());
-        log::info!("wrap text: {:?}", snapshot.wrap_snapshot().text());
-        log::info!("block text: {:?}", snapshot.block_snapshot.text());
-        log::info!("display text: {:?}", snapshot.text());
-
-        for _i in 0..operations {
-            match rng.random_range(0..100) {
-                0..=19 => {
-                    wrap_width = if rng.random_bool(0.2) {
-                        None
-                    } else {
-                        Some(px(rng.random_range(0.0..=max_wrap_width)))
-                    };
-                    log::info!("setting wrap width to {:?}", wrap_width);
-                    map.update(cx, |map, cx| map.set_wrap_width(wrap_width, cx));
-                }
-                20..=29 => {
-                    let mut tab_sizes = vec![1, 2, 3, 4];
-                    tab_sizes.remove((tab_size - 1) as usize);
-                    tab_size = *tab_sizes.choose(&mut rng).unwrap();
-                    log::info!("setting tab size to {:?}", tab_size);
-                    cx.update(|cx| {
-                        cx.update_global::<SettingsStore, _>(|store, cx| {
-                            store.update_user_settings(cx, |s| {
-                                s.project.all_languages.defaults.tab_size =
-                                    NonZeroU32::new(tab_size);
-                            });
-                        });
-                    });
-                }
-                30..=44 => {
-                    map.update(cx, |map, cx| {
-                        if rng.random() || blocks.is_empty() {
-                            let snapshot = map.snapshot(cx);
-                            let buffer = snapshot.buffer_snapshot();
-                            let block_properties = (0..rng.random_range(1..=1))
-                                .map(|_| {
-                                    let position = buffer.anchor_after(buffer.clip_offset(
-                                        rng.random_range(MultiBufferOffset(0)..=buffer.len()),
-                                        Bias::Left,
-                                    ));
-
-                                    let placement = if rng.random() {
-                                        BlockPlacement::Above(position)
-                                    } else {
-                                        BlockPlacement::Below(position)
-                                    };
-                                    let height = rng.random_range(1..5);
-                                    log::info!(
-                                        "inserting block {:?} with height {}",
-                                        placement.as_ref().map(|p| p.to_point(&buffer)),
-                                        height
-                                    );
-                                    let priority = rng.random_range(1..100);
-                                    BlockProperties {
-                                        placement,
-                                        style: BlockStyle::Fixed,
-                                        height: Some(height),
-                                        render: Arc::new(|_| div().into_any()),
-                                        priority,
-                                    }
-                                })
-                                .collect::<Vec<_>>();
-                            blocks.extend(map.insert_blocks(block_properties, cx));
-                        } else {
-                            blocks.shuffle(&mut rng);
-                            let remove_count = rng.random_range(1..=4.min(blocks.len()));
-                            let block_ids_to_remove = (0..remove_count)
-                                .map(|_| blocks.remove(rng.random_range(0..blocks.len())))
-                                .collect();
-                            log::info!("removing block ids {:?}", block_ids_to_remove);
-                            map.remove_blocks(block_ids_to_remove, cx);
-                        }
-                    });
-                }
-                45..=79 => {
-                    let mut ranges = Vec::new();
-                    for _ in 0..rng.random_range(1..=3) {
-                        buffer.read_with(cx, |buffer, cx| {
-                            let buffer = buffer.read(cx);
-                            let end = buffer.clip_offset(
-                                rng.random_range(MultiBufferOffset(0)..=buffer.len()),
-                                Right,
-                            );
-                            let start = buffer
-                                .clip_offset(rng.random_range(MultiBufferOffset(0)..=end), Left);
-                            ranges.push(start..end);
-                        });
-                    }
-
-                    if rng.random() && fold_count > 0 {
-                        log::info!("unfolding ranges: {:?}", ranges);
-                        map.update(cx, |map, cx| {
-                            map.unfold_intersecting(ranges, true, cx);
-                        });
-                    } else {
-                        log::info!("folding ranges: {:?}", ranges);
-                        map.update(cx, |map, cx| {
-                            map.fold(
-                                ranges
-                                    .into_iter()
-                                    .map(|range| Crease::simple(range, FoldPlaceholder::test()))
-                                    .collect(),
-                                cx,
-                            );
-                        });
-                    }
-                }
-                _ => {
-                    buffer.update(cx, |buffer, cx| buffer.randomly_mutate(&mut rng, 5, cx));
-                }
-            }
-
-            if map.read_with(cx, |map, cx| map.is_rewrapping(cx)) {
-                notifications.next().await.unwrap();
-            }
-
-            let snapshot = map.update(cx, |map, cx| map.snapshot(cx));
-            fold_count = snapshot.fold_count();
-            log::info!("buffer text: {:?}", snapshot.buffer_snapshot().text());
-            log::info!("fold text: {:?}", snapshot.fold_snapshot().text());
-            log::info!("tab text: {:?}", snapshot.tab_snapshot().text());
-            log::info!("wrap text: {:?}", snapshot.wrap_snapshot().text());
-            log::info!("block text: {:?}", snapshot.block_snapshot.text());
-            log::info!("display text: {:?}", snapshot.text());
-
-            // Line boundaries
-            let buffer = snapshot.buffer_snapshot();
-            for _ in 0..5 {
-                let row = rng.random_range(0..=buffer.max_point().row);
-                let column = rng.random_range(0..=buffer.line_len(MultiBufferRow(row)));
-                let point = buffer.clip_point(Point::new(row, column), Left);
-
-                let (prev_buffer_bound, prev_display_bound) = snapshot.prev_line_boundary(point);
-                let (next_buffer_bound, next_display_bound) = snapshot.next_line_boundary(point);
-
-                assert!(prev_buffer_bound <= point);
-                assert!(next_buffer_bound >= point);
-                assert_eq!(prev_buffer_bound.column, 0);
-                assert_eq!(prev_display_bound.column(), 0);
-                if next_buffer_bound < buffer.max_point() {
-                    assert_eq!(buffer.chars_at(next_buffer_bound).next(), Some('\n'));
-                }
-
-                assert_eq!(
-                    prev_display_bound,
-                    prev_buffer_bound.to_display_point(&snapshot),
-                    "row boundary before {:?}. reported buffer row boundary: {:?}",
-                    point,
-                    prev_buffer_bound
-                );
-                assert_eq!(
-                    next_display_bound,
-                    next_buffer_bound.to_display_point(&snapshot),
-                    "display row boundary after {:?}. reported buffer row boundary: {:?}",
-                    point,
-                    next_buffer_bound
-                );
-                assert_eq!(
-                    prev_buffer_bound,
-                    prev_display_bound.to_point(&snapshot),
-                    "row boundary before {:?}. reported display row boundary: {:?}",
-                    point,
-                    prev_display_bound
-                );
-                assert_eq!(
-                    next_buffer_bound,
-                    next_display_bound.to_point(&snapshot),
-                    "row boundary after {:?}. reported display row boundary: {:?}",
-                    point,
-                    next_display_bound
-                );
-            }
-
-            // Movement
-            let min_point = snapshot.clip_point(DisplayPoint::new(DisplayRow(0), 0), Left);
-            let max_point = snapshot.clip_point(snapshot.max_point(), Right);
-            for _ in 0..5 {
-                let row = rng.random_range(0..=snapshot.max_point().row().0);
-                let column = rng.random_range(0..=snapshot.line_len(DisplayRow(row)));
-                let point = snapshot.clip_point(DisplayPoint::new(DisplayRow(row), column), Left);
-
-                log::info!("Moving from point {:?}", point);
-
-                let moved_right = movement::right(&snapshot, point);
-                log::info!("Right {:?}", moved_right);
-                if point < max_point {
-                    assert!(moved_right > point);
-                    if point.column() == snapshot.line_len(point.row())
-                        || snapshot.soft_wrap_indent(point.row()).is_some()
-                            && point.column() == snapshot.line_len(point.row()) - 1
-                    {
-                        assert!(moved_right.row() > point.row());
-                    }
-                } else {
-                    assert_eq!(moved_right, point);
-                }
-
-                let moved_left = movement::left(&snapshot, point);
-                log::info!("Left {:?}", moved_left);
-                if point > min_point {
-                    assert!(moved_left < point);
-                    if point.column() == 0 {
-                        assert!(moved_left.row() < point.row());
-                    }
-                } else {
-                    assert_eq!(moved_left, point);
-                }
-            }
-        }
-    }
-
-    #[gpui::test(retries = 5)]
-    async fn test_soft_wraps(cx: &mut gpui::TestAppContext) {
-        cx.background_executor
-            .set_block_on_ticks(usize::MAX..=usize::MAX);
-        cx.update(|cx| {
-            init_test(cx, |_| {});
-        });
-
-        let mut cx = crate::test::editor_test_context::EditorTestContext::new(cx).await;
-        let editor = cx.editor.clone();
-        let window = cx.window;
-
-        _ = cx.update_window(window, |_, window, cx| {
-            let text_layout_details =
-                editor.update(cx, |editor, _cx| editor.text_layout_details(window));
-
-            let font_size = px(12.0);
-            let wrap_width = Some(px(96.));
-
-            let text = "one two three four five\nsix seven eight";
-            let buffer = MultiBuffer::build_simple(text, cx);
-            let map = cx.new(|cx| {
-                DisplayMap::new(
-                    buffer.clone(),
-                    font("Helvetica"),
-                    font_size,
-                    wrap_width,
-                    1,
-                    1,
-                    FoldPlaceholder::test(),
-                    DiagnosticSeverity::Warning,
-                    cx,
-                )
-            });
-
-            let snapshot = map.update(cx, |map, cx| map.snapshot(cx));
-            assert_eq!(
-                snapshot.text_chunks(DisplayRow(0)).collect::<String>(),
-                "one two \nthree four \nfive\nsix seven \neight"
-            );
-            assert_eq!(
-                snapshot.clip_point(DisplayPoint::new(DisplayRow(0), 8), Bias::Left),
-                DisplayPoint::new(DisplayRow(0), 7)
-            );
-            assert_eq!(
-                snapshot.clip_point(DisplayPoint::new(DisplayRow(0), 8), Bias::Right),
-                DisplayPoint::new(DisplayRow(1), 0)
-            );
-            assert_eq!(
-                movement::right(&snapshot, DisplayPoint::new(DisplayRow(0), 7)),
-                DisplayPoint::new(DisplayRow(1), 0)
-            );
-            assert_eq!(
-                movement::left(&snapshot, DisplayPoint::new(DisplayRow(1), 0)),
-                DisplayPoint::new(DisplayRow(0), 7)
-            );
-
-            let x = snapshot
-                .x_for_display_point(DisplayPoint::new(DisplayRow(1), 10), &text_layout_details);
-            assert_eq!(
-                movement::up(
-                    &snapshot,
-                    DisplayPoint::new(DisplayRow(1), 10),
-                    language::SelectionGoal::None,
-                    false,
-                    &text_layout_details,
-                ),
-                (
-                    DisplayPoint::new(DisplayRow(0), 7),
-                    language::SelectionGoal::HorizontalPosition(f64::from(x))
-                )
-            );
-            assert_eq!(
-                movement::down(
-                    &snapshot,
-                    DisplayPoint::new(DisplayRow(0), 7),
-                    language::SelectionGoal::HorizontalPosition(f64::from(x)),
-                    false,
-                    &text_layout_details
-                ),
-                (
-                    DisplayPoint::new(DisplayRow(1), 10),
-                    language::SelectionGoal::HorizontalPosition(f64::from(x))
-                )
-            );
-            assert_eq!(
-                movement::down(
-                    &snapshot,
-                    DisplayPoint::new(DisplayRow(1), 10),
-                    language::SelectionGoal::HorizontalPosition(f64::from(x)),
-                    false,
-                    &text_layout_details
-                ),
-                (
-                    DisplayPoint::new(DisplayRow(2), 4),
-                    language::SelectionGoal::HorizontalPosition(f64::from(x))
-                )
-            );
-
-            let ix = MultiBufferOffset(snapshot.buffer_snapshot().text().find("seven").unwrap());
-            buffer.update(cx, |buffer, cx| {
-                buffer.edit([(ix..ix, "and ")], None, cx);
-            });
-
-            let snapshot = map.update(cx, |map, cx| map.snapshot(cx));
-            assert_eq!(
-                snapshot.text_chunks(DisplayRow(1)).collect::<String>(),
-                "three four \nfive\nsix and \nseven eight"
-            );
-
-            // Re-wrap on font size changes
-            map.update(cx, |map, cx| {
-                map.set_font(font("Helvetica"), font_size + Pixels::from(3.), cx)
-            });
-
-            let snapshot = map.update(cx, |map, cx| map.snapshot(cx));
-            assert_eq!(
-                snapshot.text_chunks(DisplayRow(1)).collect::<String>(),
-                "three \nfour five\nsix and \nseven \neight"
-            )
-        });
-    }
-
-    #[gpui::test]
-    fn test_text_chunks(cx: &mut gpui::App) {
-        init_test(cx, |_| {});
-
-        let text = sample_text(6, 6, 'a');
-        let buffer = MultiBuffer::build_simple(&text, cx);
-
-        let font_size = px(14.0);
-        let map = cx.new(|cx| {
-            DisplayMap::new(
-                buffer.clone(),
-                font("Helvetica"),
-                font_size,
-                None,
-                1,
-                1,
-                FoldPlaceholder::test(),
-                DiagnosticSeverity::Warning,
-                cx,
-            )
-        });
-
-        buffer.update(cx, |buffer, cx| {
-            buffer.edit(
-                vec![
-                    (
-                        MultiBufferPoint::new(1, 0)..MultiBufferPoint::new(1, 0),
-                        "\t",
-                    ),
-                    (
-                        MultiBufferPoint::new(1, 1)..MultiBufferPoint::new(1, 1),
-                        "\t",
-                    ),
-                    (
-                        MultiBufferPoint::new(2, 1)..MultiBufferPoint::new(2, 1),
-                        "\t",
-                    ),
-                ],
-                None,
-                cx,
-            )
-        });
-
-        assert_eq!(
-            map.update(cx, |map, cx| map.snapshot(cx))
-                .text_chunks(DisplayRow(1))
-                .collect::<String>()
-                .lines()
-                .next(),
-            Some("    b   bbbbb")
-        );
-        assert_eq!(
-            map.update(cx, |map, cx| map.snapshot(cx))
-                .text_chunks(DisplayRow(2))
-                .collect::<String>()
-                .lines()
-                .next(),
-            Some("c   ccccc")
-        );
-    }
-
-    #[gpui::test]
-    fn test_inlays_with_newlines_after_blocks(cx: &mut gpui::TestAppContext) {
-        cx.update(|cx| init_test(cx, |_| {}));
-
-        let buffer = cx.new(|cx| Buffer::local("a", cx));
-        let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-        let buffer_snapshot = buffer.read_with(cx, |buffer, cx| buffer.snapshot(cx));
-
-        let font_size = px(14.0);
-        let map = cx.new(|cx| {
-            DisplayMap::new(
-                buffer.clone(),
-                font("Helvetica"),
-                font_size,
-                None,
-                1,
-                1,
-                FoldPlaceholder::test(),
-                DiagnosticSeverity::Warning,
-                cx,
-            )
-        });
-
-        map.update(cx, |map, cx| {
-            map.insert_blocks(
-                [BlockProperties {
-                    placement: BlockPlacement::Above(
-                        buffer_snapshot.anchor_before(Point::new(0, 0)),
-                    ),
-                    height: Some(2),
-                    style: BlockStyle::Sticky,
-                    render: Arc::new(|_| div().into_any()),
-                    priority: 0,
-                }],
-                cx,
-            );
-        });
-        map.update(cx, |m, cx| assert_eq!(m.snapshot(cx).text(), "\n\na"));
-
-        map.update(cx, |map, cx| {
-            map.splice_inlays(
-                &[],
-                vec![Inlay::edit_prediction(
-                    0,
-                    buffer_snapshot.anchor_after(MultiBufferOffset(0)),
-                    "\n",
-                )],
-                cx,
-            );
-        });
-        map.update(cx, |m, cx| assert_eq!(m.snapshot(cx).text(), "\n\n\na"));
-
-        // Regression test: updating the display map does not crash when a
-        // block is immediately followed by a multi-line inlay.
-        buffer.update(cx, |buffer, cx| {
-            buffer.edit(
-                [(MultiBufferOffset(1)..MultiBufferOffset(1), "b")],
-                None,
-                cx,
-            );
-        });
-        map.update(cx, |m, cx| assert_eq!(m.snapshot(cx).text(), "\n\n\nab"));
-    }
-
-    #[gpui::test]
-    async fn test_chunks(cx: &mut gpui::TestAppContext) {
-        let text = r#"
-            fn outer() {}
-
-            mod module {
-                fn inner() {}
-            }"#
-        .unindent();
-
-        let theme =
-            SyntaxTheme::new_test(vec![("mod.body", Hsla::red()), ("fn.name", Hsla::blue())]);
-        let language = Arc::new(
-            Language::new(
-                LanguageConfig {
-                    name: "Test".into(),
-                    matcher: LanguageMatcher {
-                        path_suffixes: vec![".test".to_string()],
-                        ..Default::default()
-                    },
-                    ..Default::default()
-                },
-                Some(tree_sitter_rust::LANGUAGE.into()),
-            )
-            .with_highlights_query(
-                r#"
-                (mod_item name: (identifier) body: _ @mod.body)
-                (function_item name: (identifier) @fn.name)
-                "#,
-            )
-            .unwrap(),
-        );
-        language.set_theme(&theme);
-
-        cx.update(|cx| {
-            init_test(cx, |s| {
-                s.project.all_languages.defaults.tab_size = Some(2.try_into().unwrap())
-            })
-        });
-
-        let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(language, cx));
-        cx.condition(&buffer, |buf, _| !buf.is_parsing()).await;
-        let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-
-        let font_size = px(14.0);
-
-        let map = cx.new(|cx| {
-            DisplayMap::new(
-                buffer,
-                font("Helvetica"),
-                font_size,
-                None,
-                1,
-                1,
-                FoldPlaceholder::test(),
-                DiagnosticSeverity::Warning,
-                cx,
-            )
-        });
-        assert_eq!(
-            cx.update(|cx| syntax_chunks(DisplayRow(0)..DisplayRow(5), &map, &theme, cx)),
-            vec![
-                ("fn ".to_string(), None),
-                ("outer".to_string(), Some(Hsla::blue())),
-                ("() {}\n\nmod module ".to_string(), None),
-                ("{\n    fn ".to_string(), Some(Hsla::red())),
-                ("inner".to_string(), Some(Hsla::blue())),
-                ("() {}\n}".to_string(), Some(Hsla::red())),
-            ]
-        );
-        assert_eq!(
-            cx.update(|cx| syntax_chunks(DisplayRow(3)..DisplayRow(5), &map, &theme, cx)),
-            vec![
-                ("    fn ".to_string(), Some(Hsla::red())),
-                ("inner".to_string(), Some(Hsla::blue())),
-                ("() {}\n}".to_string(), Some(Hsla::red())),
-            ]
-        );
-
-        map.update(cx, |map, cx| {
-            map.fold(
-                vec![Crease::simple(
-                    MultiBufferPoint::new(0, 6)..MultiBufferPoint::new(3, 2),
-                    FoldPlaceholder::test(),
-                )],
-                cx,
-            )
-        });
-        assert_eq!(
-            cx.update(|cx| syntax_chunks(DisplayRow(0)..DisplayRow(2), &map, &theme, cx)),
-            vec![
-                ("fn ".to_string(), None),
-                ("out".to_string(), Some(Hsla::blue())),
-                ("⋯".to_string(), None),
-                ("  fn ".to_string(), Some(Hsla::red())),
-                ("inner".to_string(), Some(Hsla::blue())),
-                ("() {}\n}".to_string(), Some(Hsla::red())),
-            ]
-        );
-    }
-
-    #[gpui::test]
-    async fn test_chunks_with_syntax_highlighting_across_blocks(cx: &mut gpui::TestAppContext) {
-        cx.background_executor
-            .set_block_on_ticks(usize::MAX..=usize::MAX);
-
-        let text = r#"
-            const A: &str = "
-                one
-                two
-                three
-            ";
-            const B: &str = "four";
-        "#
-        .unindent();
-
-        let theme = SyntaxTheme::new_test(vec![
-            ("string", Hsla::red()),
-            ("punctuation", Hsla::blue()),
-            ("keyword", Hsla::green()),
-        ]);
-        let language = Arc::new(
-            Language::new(
-                LanguageConfig {
-                    name: "Rust".into(),
-                    ..Default::default()
-                },
-                Some(tree_sitter_rust::LANGUAGE.into()),
-            )
-            .with_highlights_query(
-                r#"
-                (string_literal) @string
-                "const" @keyword
-                [":" ";"] @punctuation
-                "#,
-            )
-            .unwrap(),
-        );
-        language.set_theme(&theme);
-
-        cx.update(|cx| init_test(cx, |_| {}));
-
-        let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(language, cx));
-        cx.condition(&buffer, |buf, _| !buf.is_parsing()).await;
-        let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-        let buffer_snapshot = buffer.read_with(cx, |buffer, cx| buffer.snapshot(cx));
-
-        let map = cx.new(|cx| {
-            DisplayMap::new(
-                buffer,
-                font("Courier"),
-                px(16.0),
-                None,
-                1,
-                1,
-                FoldPlaceholder::test(),
-                DiagnosticSeverity::Warning,
-                cx,
-            )
-        });
-
-        // Insert two blocks in the middle of a multi-line string literal.
-        // The second block has zero height.
-        map.update(cx, |map, cx| {
-            map.insert_blocks(
-                [
-                    BlockProperties {
-                        placement: BlockPlacement::Below(
-                            buffer_snapshot.anchor_before(Point::new(1, 0)),
-                        ),
-                        height: Some(1),
-                        style: BlockStyle::Sticky,
-                        render: Arc::new(|_| div().into_any()),
-                        priority: 0,
-                    },
-                    BlockProperties {
-                        placement: BlockPlacement::Below(
-                            buffer_snapshot.anchor_before(Point::new(2, 0)),
-                        ),
-                        height: None,
-                        style: BlockStyle::Sticky,
-                        render: Arc::new(|_| div().into_any()),
-                        priority: 0,
-                    },
-                ],
-                cx,
-            )
-        });
-
-        pretty_assertions::assert_eq!(
-            cx.update(|cx| syntax_chunks(DisplayRow(0)..DisplayRow(7), &map, &theme, cx)),
-            [
-                ("const".into(), Some(Hsla::green())),
-                (" A".into(), None),
-                (":".into(), Some(Hsla::blue())),
-                (" &str = ".into(), None),
-                ("\"\n    one\n".into(), Some(Hsla::red())),
-                ("\n".into(), None),
-                ("    two\n    three\n\"".into(), Some(Hsla::red())),
-                (";".into(), Some(Hsla::blue())),
-                ("\n".into(), None),
-                ("const".into(), Some(Hsla::green())),
-                (" B".into(), None),
-                (":".into(), Some(Hsla::blue())),
-                (" &str = ".into(), None),
-                ("\"four\"".into(), Some(Hsla::red())),
-                (";".into(), Some(Hsla::blue())),
-                ("\n".into(), None),
-            ]
-        );
-    }
-
-    #[gpui::test]
-    async fn test_chunks_with_diagnostics_across_blocks(cx: &mut gpui::TestAppContext) {
-        cx.background_executor
-            .set_block_on_ticks(usize::MAX..=usize::MAX);
-
-        let text = r#"
-            struct A {
-                b: usize;
-            }
-            const c: usize = 1;
-        "#
-        .unindent();
-
-        cx.update(|cx| init_test(cx, |_| {}));
-
-        let buffer = cx.new(|cx| Buffer::local(text, cx));
-
-        buffer.update(cx, |buffer, cx| {
-            buffer.update_diagnostics(
-                LanguageServerId(0),
-                DiagnosticSet::new(
-                    [DiagnosticEntry {
-                        range: PointUtf16::new(0, 0)..PointUtf16::new(2, 1),
-                        diagnostic: Diagnostic {
-                            severity: lsp::DiagnosticSeverity::ERROR,
-                            group_id: 1,
-                            message: "hi".into(),
-                            ..Default::default()
-                        },
-                    }],
-                    buffer,
-                ),
-                cx,
-            )
-        });
-
-        let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-        let buffer_snapshot = buffer.read_with(cx, |buffer, cx| buffer.snapshot(cx));
-
-        let map = cx.new(|cx| {
-            DisplayMap::new(
-                buffer,
-                font("Courier"),
-                px(16.0),
-                None,
-                1,
-                1,
-                FoldPlaceholder::test(),
-                DiagnosticSeverity::Warning,
-                cx,
-            )
-        });
-
-        let black = gpui::black().to_rgb();
-        let red = gpui::red().to_rgb();
-
-        // Insert a block in the middle of a multi-line diagnostic.
-        map.update(cx, |map, cx| {
-            map.highlight_text(
-                HighlightKey::Type(TypeId::of::<usize>()),
-                vec![
-                    buffer_snapshot.anchor_before(Point::new(3, 9))
-                        ..buffer_snapshot.anchor_after(Point::new(3, 14)),
-                    buffer_snapshot.anchor_before(Point::new(3, 17))
-                        ..buffer_snapshot.anchor_after(Point::new(3, 18)),
-                ],
-                red.into(),
-                false,
-                cx,
-            );
-            map.insert_blocks(
-                [BlockProperties {
-                    placement: BlockPlacement::Below(
-                        buffer_snapshot.anchor_before(Point::new(1, 0)),
-                    ),
-                    height: Some(1),
-                    style: BlockStyle::Sticky,
-                    render: Arc::new(|_| div().into_any()),
-                    priority: 0,
-                }],
-                cx,
-            )
-        });
-
-        let snapshot = map.update(cx, |map, cx| map.snapshot(cx));
-        let mut chunks = Vec::<(String, Option<lsp::DiagnosticSeverity>, Rgba)>::new();
-        for chunk in snapshot.chunks(DisplayRow(0)..DisplayRow(5), true, Default::default()) {
-            let color = chunk
-                .highlight_style
-                .and_then(|style| style.color)
-                .map_or(black, |color| color.to_rgb());
-            if let Some((last_chunk, last_severity, last_color)) = chunks.last_mut()
-                && *last_severity == chunk.diagnostic_severity
-                && *last_color == color
-            {
-                last_chunk.push_str(chunk.text);
-                continue;
-            }
-
-            chunks.push((chunk.text.to_string(), chunk.diagnostic_severity, color));
-        }
-
-        assert_eq!(
-            chunks,
-            [
-                (
-                    "struct A {\n    b: usize;\n".into(),
-                    Some(lsp::DiagnosticSeverity::ERROR),
-                    black
-                ),
-                ("\n".into(), None, black),
-                ("}".into(), Some(lsp::DiagnosticSeverity::ERROR), black),
-                ("\nconst c: ".into(), None, black),
-                ("usize".into(), None, red),
-                (" = ".into(), None, black),
-                ("1".into(), None, red),
-                (";\n".into(), None, black),
-            ]
-        );
-    }
-
-    #[gpui::test]
-    async fn test_point_translation_with_replace_blocks(cx: &mut gpui::TestAppContext) {
-        cx.background_executor
-            .set_block_on_ticks(usize::MAX..=usize::MAX);
-
-        cx.update(|cx| init_test(cx, |_| {}));
-
-        let buffer = cx.update(|cx| MultiBuffer::build_simple("abcde\nfghij\nklmno\npqrst", cx));
-        let buffer_snapshot = buffer.read_with(cx, |buffer, cx| buffer.snapshot(cx));
-        let map = cx.new(|cx| {
-            DisplayMap::new(
-                buffer.clone(),
-                font("Courier"),
-                px(16.0),
-                None,
-                1,
-                1,
-                FoldPlaceholder::test(),
-                DiagnosticSeverity::Warning,
-                cx,
-            )
-        });
-
-        let snapshot = map.update(cx, |map, cx| {
-            map.insert_blocks(
-                [BlockProperties {
-                    placement: BlockPlacement::Replace(
-                        buffer_snapshot.anchor_before(Point::new(1, 2))
-                            ..=buffer_snapshot.anchor_after(Point::new(2, 3)),
-                    ),
-                    height: Some(4),
-                    style: BlockStyle::Fixed,
-                    render: Arc::new(|_| div().into_any()),
-                    priority: 0,
-                }],
-                cx,
-            );
-            map.snapshot(cx)
-        });
-
-        assert_eq!(snapshot.text(), "abcde\n\n\n\n\npqrst");
-
-        let point_to_display_points = [
-            (Point::new(1, 0), DisplayPoint::new(DisplayRow(1), 0)),
-            (Point::new(2, 0), DisplayPoint::new(DisplayRow(1), 0)),
-            (Point::new(3, 0), DisplayPoint::new(DisplayRow(5), 0)),
-        ];
-        for (buffer_point, display_point) in point_to_display_points {
-            assert_eq!(
-                snapshot.point_to_display_point(buffer_point, Bias::Left),
-                display_point,
-                "point_to_display_point({:?}, Bias::Left)",
-                buffer_point
-            );
-            assert_eq!(
-                snapshot.point_to_display_point(buffer_point, Bias::Right),
-                display_point,
-                "point_to_display_point({:?}, Bias::Right)",
-                buffer_point
-            );
-        }
-
-        let display_points_to_points = [
-            (
-                DisplayPoint::new(DisplayRow(1), 0),
-                Point::new(1, 0),
-                Point::new(2, 5),
-            ),
-            (
-                DisplayPoint::new(DisplayRow(2), 0),
-                Point::new(1, 0),
-                Point::new(2, 5),
-            ),
-            (
-                DisplayPoint::new(DisplayRow(3), 0),
-                Point::new(1, 0),
-                Point::new(2, 5),
-            ),
-            (
-                DisplayPoint::new(DisplayRow(4), 0),
-                Point::new(1, 0),
-                Point::new(2, 5),
-            ),
-            (
-                DisplayPoint::new(DisplayRow(5), 0),
-                Point::new(3, 0),
-                Point::new(3, 0),
-            ),
-        ];
-        for (display_point, left_buffer_point, right_buffer_point) in display_points_to_points {
-            assert_eq!(
-                snapshot.display_point_to_point(display_point, Bias::Left),
-                left_buffer_point,
-                "display_point_to_point({:?}, Bias::Left)",
-                display_point
-            );
-            assert_eq!(
-                snapshot.display_point_to_point(display_point, Bias::Right),
-                right_buffer_point,
-                "display_point_to_point({:?}, Bias::Right)",
-                display_point
-            );
-        }
-    }
-
-    #[gpui::test]
-    async fn test_chunks_with_soft_wrapping(cx: &mut gpui::TestAppContext) {
-        cx.background_executor
-            .set_block_on_ticks(usize::MAX..=usize::MAX);
-
-        let text = r#"
-            fn outer() {}
-
-            mod module {
-                fn inner() {}
-            }"#
-        .unindent();
-
-        let theme =
-            SyntaxTheme::new_test(vec![("mod.body", Hsla::red()), ("fn.name", Hsla::blue())]);
-        let language = Arc::new(
-            Language::new(
-                LanguageConfig {
-                    name: "Test".into(),
-                    matcher: LanguageMatcher {
-                        path_suffixes: vec![".test".to_string()],
-                        ..Default::default()
-                    },
-                    ..Default::default()
-                },
-                Some(tree_sitter_rust::LANGUAGE.into()),
-            )
-            .with_highlights_query(
-                r#"
-                (mod_item name: (identifier) body: _ @mod.body)
-                (function_item name: (identifier) @fn.name)
-                "#,
-            )
-            .unwrap(),
-        );
-        language.set_theme(&theme);
-
-        cx.update(|cx| init_test(cx, |_| {}));
-
-        let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(language, cx));
-        cx.condition(&buffer, |buf, _| !buf.is_parsing()).await;
-        let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-
-        let font_size = px(16.0);
-
-        let map = cx.new(|cx| {
-            DisplayMap::new(
-                buffer,
-                font("Courier"),
-                font_size,
-                Some(px(40.0)),
-                1,
-                1,
-                FoldPlaceholder::test(),
-                DiagnosticSeverity::Warning,
-                cx,
-            )
-        });
-        assert_eq!(
-            cx.update(|cx| syntax_chunks(DisplayRow(0)..DisplayRow(5), &map, &theme, cx)),
-            [
-                ("fn \n".to_string(), None),
-                ("oute".to_string(), Some(Hsla::blue())),
-                ("\n".to_string(), None),
-                ("r".to_string(), Some(Hsla::blue())),
-                ("() \n{}\n\n".to_string(), None),
-            ]
-        );
-        assert_eq!(
-            cx.update(|cx| syntax_chunks(DisplayRow(3)..DisplayRow(5), &map, &theme, cx)),
-            [("{}\n\n".to_string(), None)]
-        );
-
-        map.update(cx, |map, cx| {
-            map.fold(
-                vec![Crease::simple(
-                    MultiBufferPoint::new(0, 6)..MultiBufferPoint::new(3, 2),
-                    FoldPlaceholder::test(),
-                )],
-                cx,
-            )
-        });
-        assert_eq!(
-            cx.update(|cx| syntax_chunks(DisplayRow(1)..DisplayRow(4), &map, &theme, cx)),
-            [
-                ("out".to_string(), Some(Hsla::blue())),
-                ("⋯\n".to_string(), None),
-                ("  ".to_string(), Some(Hsla::red())),
-                ("\n".to_string(), None),
-                ("fn ".to_string(), Some(Hsla::red())),
-                ("i".to_string(), Some(Hsla::blue())),
-                ("\n".to_string(), None)
-            ]
-        );
-    }
-
-    #[gpui::test]
-    async fn test_chunks_with_text_highlights(cx: &mut gpui::TestAppContext) {
-        cx.update(|cx| init_test(cx, |_| {}));
-
-        let theme =
-            SyntaxTheme::new_test(vec![("operator", Hsla::red()), ("string", Hsla::green())]);
-        let language = Arc::new(
-            Language::new(
-                LanguageConfig {
-                    name: "Test".into(),
-                    matcher: LanguageMatcher {
-                        path_suffixes: vec![".test".to_string()],
-                        ..Default::default()
-                    },
-                    ..Default::default()
-                },
-                Some(tree_sitter_rust::LANGUAGE.into()),
-            )
-            .with_highlights_query(
-                r#"
-                ":" @operator
-                (string_literal) @string
-                "#,
-            )
-            .unwrap(),
-        );
-        language.set_theme(&theme);
-
-        let (text, highlighted_ranges) = marked_text_ranges(r#"constˇ «a»«:» B = "c «d»""#, false);
-
-        let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(language, cx));
-        cx.condition(&buffer, |buf, _| !buf.is_parsing()).await;
-
-        let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-        let buffer_snapshot = buffer.read_with(cx, |buffer, cx| buffer.snapshot(cx));
-
-        let font_size = px(16.0);
-        let map = cx.new(|cx| {
-            DisplayMap::new(
-                buffer,
-                font("Courier"),
-                font_size,
-                None,
-                1,
-                1,
-                FoldPlaceholder::test(),
-                DiagnosticSeverity::Warning,
-                cx,
-            )
-        });
-
-        enum MyType {}
-
-        let style = HighlightStyle {
-            color: Some(Hsla::blue()),
-            ..Default::default()
-        };
-
-        map.update(cx, |map, cx| {
-            map.highlight_text(
-                HighlightKey::Type(TypeId::of::<MyType>()),
-                highlighted_ranges
-                    .into_iter()
-                    .map(|range| MultiBufferOffset(range.start)..MultiBufferOffset(range.end))
-                    .map(|range| {
-                        buffer_snapshot.anchor_before(range.start)
-                            ..buffer_snapshot.anchor_before(range.end)
-                    })
-                    .collect(),
-                style,
-                false,
-                cx,
-            );
-        });
-
-        assert_eq!(
-            cx.update(|cx| chunks(DisplayRow(0)..DisplayRow(10), &map, &theme, cx)),
-            [
-                ("const ".to_string(), None, None),
-                ("a".to_string(), None, Some(Hsla::blue())),
-                (":".to_string(), Some(Hsla::red()), Some(Hsla::blue())),
-                (" B = ".to_string(), None, None),
-                ("\"c ".to_string(), Some(Hsla::green()), None),
-                ("d".to_string(), Some(Hsla::green()), Some(Hsla::blue())),
-                ("\"".to_string(), Some(Hsla::green()), None),
-            ]
-        );
-    }
-
-    #[gpui::test]
-    fn test_clip_point(cx: &mut gpui::App) {
-        init_test(cx, |_| {});
-
-        fn assert(text: &str, shift_right: bool, bias: Bias, cx: &mut gpui::App) {
-            let (unmarked_snapshot, mut markers) = marked_display_snapshot(text, cx);
-
-            match bias {
-                Bias::Left => {
-                    if shift_right {
-                        *markers[1].column_mut() += 1;
-                    }
-
-                    assert_eq!(unmarked_snapshot.clip_point(markers[1], bias), markers[0])
-                }
-                Bias::Right => {
-                    if shift_right {
-                        *markers[0].column_mut() += 1;
-                    }
-
-                    assert_eq!(unmarked_snapshot.clip_point(markers[0], bias), markers[1])
-                }
-            };
-        }
-
-        use Bias::{Left, Right};
-        assert("ˇˇα", false, Left, cx);
-        assert("ˇˇα", true, Left, cx);
-        assert("ˇˇα", false, Right, cx);
-        assert("ˇαˇ", true, Right, cx);
-        assert("ˇˇ✋", false, Left, cx);
-        assert("ˇˇ✋", true, Left, cx);
-        assert("ˇˇ✋", false, Right, cx);
-        assert("ˇ✋ˇ", true, Right, cx);
-        assert("ˇˇ🍐", false, Left, cx);
-        assert("ˇˇ🍐", true, Left, cx);
-        assert("ˇˇ🍐", false, Right, cx);
-        assert("ˇ🍐ˇ", true, Right, cx);
-        assert("ˇˇ\t", false, Left, cx);
-        assert("ˇˇ\t", true, Left, cx);
-        assert("ˇˇ\t", false, Right, cx);
-        assert("ˇ\tˇ", true, Right, cx);
-        assert(" ˇˇ\t", false, Left, cx);
-        assert(" ˇˇ\t", true, Left, cx);
-        assert(" ˇˇ\t", false, Right, cx);
-        assert(" ˇ\tˇ", true, Right, cx);
-        assert("   ˇˇ\t", false, Left, cx);
-        assert("   ˇˇ\t", false, Right, cx);
-    }
-
-    #[gpui::test]
-    fn test_clip_at_line_ends(cx: &mut gpui::App) {
-        init_test(cx, |_| {});
-
-        fn assert(text: &str, cx: &mut gpui::App) {
-            let (mut unmarked_snapshot, markers) = marked_display_snapshot(text, cx);
-            unmarked_snapshot.clip_at_line_ends = true;
-            assert_eq!(
-                unmarked_snapshot.clip_point(markers[1], Bias::Left),
-                markers[0]
-            );
-        }
-
-        assert("ˇˇ", cx);
-        assert("ˇaˇ", cx);
-        assert("aˇbˇ", cx);
-        assert("aˇαˇ", cx);
-    }
-
-    #[gpui::test]
-    fn test_creases(cx: &mut gpui::App) {
-        init_test(cx, |_| {});
-
-        let text = "aaa\nbbb\nccc\nddd\neee\nfff\nggg\nhhh\niii\njjj\nkkk\nlll";
-        let buffer = MultiBuffer::build_simple(text, cx);
-        let font_size = px(14.0);
-        cx.new(|cx| {
-            let mut map = DisplayMap::new(
-                buffer.clone(),
-                font("Helvetica"),
-                font_size,
-                None,
-                1,
-                1,
-                FoldPlaceholder::test(),
-                DiagnosticSeverity::Warning,
-                cx,
-            );
-            let snapshot = map.buffer.read(cx).snapshot(cx);
-            let range =
-                snapshot.anchor_before(Point::new(2, 0))..snapshot.anchor_after(Point::new(3, 3));
-
-            map.crease_map.insert(
-                [Crease::inline(
-                    range,
-                    FoldPlaceholder::test(),
-                    |_row, _status, _toggle, _window, _cx| div(),
-                    |_row, _status, _window, _cx| div(),
-                )],
-                &map.buffer.read(cx).snapshot(cx),
-            );
-
-            map
-        });
-    }
-
-    #[gpui::test]
-    fn test_tabs_with_multibyte_chars(cx: &mut gpui::App) {
-        init_test(cx, |_| {});
-
-        let text = "✅\t\tα\nβ\t\n🏀β\t\tγ";
-        let buffer = MultiBuffer::build_simple(text, cx);
-        let font_size = px(14.0);
-
-        let map = cx.new(|cx| {
-            DisplayMap::new(
-                buffer.clone(),
-                font("Helvetica"),
-                font_size,
-                None,
-                1,
-                1,
-                FoldPlaceholder::test(),
-                DiagnosticSeverity::Warning,
-                cx,
-            )
-        });
-        let map = map.update(cx, |map, cx| map.snapshot(cx));
-        assert_eq!(map.text(), "✅       α\nβ   \n🏀β      γ");
-        assert_eq!(
-            map.text_chunks(DisplayRow(0)).collect::<String>(),
-            "✅       α\nβ   \n🏀β      γ"
-        );
-        assert_eq!(
-            map.text_chunks(DisplayRow(1)).collect::<String>(),
-            "β   \n🏀β      γ"
-        );
-        assert_eq!(
-            map.text_chunks(DisplayRow(2)).collect::<String>(),
-            "🏀β      γ"
-        );
-
-        let point = MultiBufferPoint::new(0, "✅\t\t".len() as u32);
-        let display_point = DisplayPoint::new(DisplayRow(0), "✅       ".len() as u32);
-        assert_eq!(point.to_display_point(&map), display_point);
-        assert_eq!(display_point.to_point(&map), point);
-
-        let point = MultiBufferPoint::new(1, "β\t".len() as u32);
-        let display_point = DisplayPoint::new(DisplayRow(1), "β   ".len() as u32);
-        assert_eq!(point.to_display_point(&map), display_point);
-        assert_eq!(display_point.to_point(&map), point,);
-
-        let point = MultiBufferPoint::new(2, "🏀β\t\t".len() as u32);
-        let display_point = DisplayPoint::new(DisplayRow(2), "🏀β      ".len() as u32);
-        assert_eq!(point.to_display_point(&map), display_point);
-        assert_eq!(display_point.to_point(&map), point,);
-
-        // Display points inside of expanded tabs
-        assert_eq!(
-            DisplayPoint::new(DisplayRow(0), "✅      ".len() as u32).to_point(&map),
-            MultiBufferPoint::new(0, "✅\t".len() as u32),
-        );
-        assert_eq!(
-            DisplayPoint::new(DisplayRow(0), "✅ ".len() as u32).to_point(&map),
-            MultiBufferPoint::new(0, "✅".len() as u32),
-        );
-
-        // Clipping display points inside of multi-byte characters
-        assert_eq!(
-            map.clip_point(
-                DisplayPoint::new(DisplayRow(0), "✅".len() as u32 - 1),
-                Left
-            ),
-            DisplayPoint::new(DisplayRow(0), 0)
-        );
-        assert_eq!(
-            map.clip_point(
-                DisplayPoint::new(DisplayRow(0), "✅".len() as u32 - 1),
-                Bias::Right
-            ),
-            DisplayPoint::new(DisplayRow(0), "✅".len() as u32)
-        );
-    }
-
-    #[gpui::test]
-    fn test_max_point(cx: &mut gpui::App) {
-        init_test(cx, |_| {});
-
-        let buffer = MultiBuffer::build_simple("aaa\n\t\tbbb", cx);
-        let font_size = px(14.0);
-        let map = cx.new(|cx| {
-            DisplayMap::new(
-                buffer.clone(),
-                font("Helvetica"),
-                font_size,
-                None,
-                1,
-                1,
-                FoldPlaceholder::test(),
-                DiagnosticSeverity::Warning,
-                cx,
-            )
-        });
-        assert_eq!(
-            map.update(cx, |map, cx| map.snapshot(cx)).max_point(),
-            DisplayPoint::new(DisplayRow(1), 11)
-        )
-    }
-
-    fn syntax_chunks(
-        rows: Range<DisplayRow>,
-        map: &Entity<DisplayMap>,
-        theme: &SyntaxTheme,
-        cx: &mut App,
-    ) -> Vec<(String, Option<Hsla>)> {
-        chunks(rows, map, theme, cx)
-            .into_iter()
-            .map(|(text, color, _)| (text, color))
-            .collect()
-    }
-
-    fn chunks(
-        rows: Range<DisplayRow>,
-        map: &Entity<DisplayMap>,
-        theme: &SyntaxTheme,
-        cx: &mut App,
-    ) -> Vec<(String, Option<Hsla>, Option<Hsla>)> {
-        let snapshot = map.update(cx, |map, cx| map.snapshot(cx));
-        let mut chunks: Vec<(String, Option<Hsla>, Option<Hsla>)> = Vec::new();
-        for chunk in snapshot.chunks(rows, true, HighlightStyles::default()) {
-            let syntax_color = chunk
-                .syntax_highlight_id
-                .and_then(|id| id.style(theme)?.color);
-            let highlight_color = chunk.highlight_style.and_then(|style| style.color);
-            if let Some((last_chunk, last_syntax_color, last_highlight_color)) = chunks.last_mut()
-                && syntax_color == *last_syntax_color
-                && highlight_color == *last_highlight_color
-            {
-                last_chunk.push_str(chunk.text);
-                continue;
-            }
-            chunks.push((chunk.text.to_string(), syntax_color, highlight_color));
-        }
-        chunks
-    }
-
-    fn init_test(cx: &mut App, f: impl Fn(&mut SettingsContent)) {
-        let settings = SettingsStore::test(cx);
-        cx.set_global(settings);
-        crate::init(cx);
-        theme::init(LoadThemes::JustBase, cx);
-        cx.update_global::<SettingsStore, _>(|store, cx| {
-            store.update_user_settings(cx, f);
-        });
-    }
-}
diff --git a/crates/editor/src/display_map/block_map.rs b/crates/editor/src/display_map/block_map.rs
deleted file mode 100644
index 9c7f9d8632..0000000000
--- a/crates/editor/src/display_map/block_map.rs
+++ /dev/null
@@ -1,3820 +0,0 @@
-use super::{
-    Highlights,
-    fold_map::Chunk,
-    wrap_map::{self, WrapEdit, WrapPatch, WrapPoint, WrapSnapshot},
-};
-use crate::{
-    EditorStyle, GutterDimensions,
-    display_map::{dimensions::RowDelta, wrap_map::WrapRow},
-};
-use collections::{Bound, HashMap, HashSet};
-use gpui::{AnyElement, App, EntityId, Pixels, Window};
-use language::{Patch, Point};
-use multi_buffer::{
-    Anchor, ExcerptId, ExcerptInfo, MultiBuffer, MultiBufferOffset, MultiBufferRow,
-    MultiBufferSnapshot, RowInfo, ToOffset, ToPoint as _,
-};
-use parking_lot::Mutex;
-use std::{
-    cell::RefCell,
-    cmp::{self, Ordering},
-    fmt::Debug,
-    ops::{Deref, DerefMut, Not, Range, RangeBounds, RangeInclusive},
-    sync::{
-        Arc,
-        atomic::{AtomicUsize, Ordering::SeqCst},
-    },
-};
-use sum_tree::{Bias, ContextLessSummary, Dimensions, SumTree, TreeMap};
-use text::{BufferId, Edit};
-use ui::ElementId;
-
-const NEWLINES: &[u8; rope::Chunk::MASK_BITS] = &[b'\n'; _];
-const BULLETS: &[u8; rope::Chunk::MASK_BITS] = &[b'*'; _];
-
-/// Tracks custom blocks such as diagnostics that should be displayed within buffer.
-///
-/// See the [`display_map` module documentation](crate::display_map) for more information.
-pub struct BlockMap {
-    pub(super) wrap_snapshot: RefCell<WrapSnapshot>,
-    next_block_id: AtomicUsize,
-    custom_blocks: Vec<Arc<CustomBlock>>,
-    custom_blocks_by_id: TreeMap<CustomBlockId, Arc<CustomBlock>>,
-    transforms: RefCell<SumTree<Transform>>,
-    buffer_header_height: u32,
-    excerpt_header_height: u32,
-    pub(super) folded_buffers: HashSet<BufferId>,
-    buffers_with_disabled_headers: HashSet<BufferId>,
-}
-
-pub struct BlockMapReader<'a> {
-    blocks: &'a Vec<Arc<CustomBlock>>,
-    pub snapshot: BlockSnapshot,
-}
-
-pub struct BlockMapWriter<'a>(&'a mut BlockMap);
-
-#[derive(Clone)]
-pub struct BlockSnapshot {
-    pub(super) wrap_snapshot: WrapSnapshot,
-    transforms: SumTree<Transform>,
-    custom_blocks_by_id: TreeMap<CustomBlockId, Arc<CustomBlock>>,
-    pub(super) buffer_header_height: u32,
-    pub(super) excerpt_header_height: u32,
-}
-
-impl Deref for BlockSnapshot {
-    type Target = WrapSnapshot;
-
-    fn deref(&self) -> &Self::Target {
-        &self.wrap_snapshot
-    }
-}
-
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct CustomBlockId(pub usize);
-
-impl From<CustomBlockId> for ElementId {
-    fn from(val: CustomBlockId) -> Self {
-        val.0.into()
-    }
-}
-
-/// A zero-indexed point in a text buffer consisting of a row and column
-/// adjusted for inserted blocks, wrapped rows, tabs, folds and inlays.
-#[derive(Copy, Clone, Debug, Default, Eq, Ord, PartialOrd, PartialEq)]
-pub struct BlockPoint(pub Point);
-
-#[derive(Copy, Clone, Debug, Default, Eq, Ord, PartialOrd, PartialEq)]
-pub struct BlockRow(pub u32);
-
-impl_for_row_types! {
-    BlockRow => RowDelta
-}
-
-impl BlockPoint {
-    pub fn row(&self) -> BlockRow {
-        BlockRow(self.0.row)
-    }
-}
-
-pub type RenderBlock = Arc<dyn Send + Sync + Fn(&mut BlockContext) -> AnyElement>;
-
-/// Where to place a block.
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub enum BlockPlacement<T> {
-    /// Place the block above the given position.
-    Above(T),
-    /// Place the block below the given position.
-    Below(T),
-    /// Place the block next the given position.
-    Near(T),
-    /// Replace the given range of positions with the block.
-    Replace(RangeInclusive<T>),
-}
-
-impl<T> BlockPlacement<T> {
-    pub fn start(&self) -> &T {
-        match self {
-            BlockPlacement::Above(position) => position,
-            BlockPlacement::Below(position) => position,
-            BlockPlacement::Near(position) => position,
-            BlockPlacement::Replace(range) => range.start(),
-        }
-    }
-
-    fn end(&self) -> &T {
-        match self {
-            BlockPlacement::Above(position) => position,
-            BlockPlacement::Below(position) => position,
-            BlockPlacement::Near(position) => position,
-            BlockPlacement::Replace(range) => range.end(),
-        }
-    }
-
-    pub fn as_ref(&self) -> BlockPlacement<&T> {
-        match self {
-            BlockPlacement::Above(position) => BlockPlacement::Above(position),
-            BlockPlacement::Below(position) => BlockPlacement::Below(position),
-            BlockPlacement::Near(position) => BlockPlacement::Near(position),
-            BlockPlacement::Replace(range) => BlockPlacement::Replace(range.start()..=range.end()),
-        }
-    }
-
-    pub fn map<R>(self, mut f: impl FnMut(T) -> R) -> BlockPlacement<R> {
-        match self {
-            BlockPlacement::Above(position) => BlockPlacement::Above(f(position)),
-            BlockPlacement::Below(position) => BlockPlacement::Below(f(position)),
-            BlockPlacement::Near(position) => BlockPlacement::Near(f(position)),
-            BlockPlacement::Replace(range) => {
-                let (start, end) = range.into_inner();
-                BlockPlacement::Replace(f(start)..=f(end))
-            }
-        }
-    }
-
-    fn tie_break(&self) -> u8 {
-        match self {
-            BlockPlacement::Replace(_) => 0,
-            BlockPlacement::Above(_) => 1,
-            BlockPlacement::Near(_) => 2,
-            BlockPlacement::Below(_) => 3,
-        }
-    }
-}
-
-impl BlockPlacement<Anchor> {
-    #[ztracing::instrument(skip_all)]
-    fn cmp(&self, other: &Self, buffer: &MultiBufferSnapshot) -> Ordering {
-        self.start()
-            .cmp(other.start(), buffer)
-            .then_with(|| other.end().cmp(self.end(), buffer))
-            .then_with(|| self.tie_break().cmp(&other.tie_break()))
-    }
-
-    #[ztracing::instrument(skip_all)]
-    fn to_wrap_row(&self, wrap_snapshot: &WrapSnapshot) -> Option<BlockPlacement<WrapRow>> {
-        let buffer_snapshot = wrap_snapshot.buffer_snapshot();
-        match self {
-            BlockPlacement::Above(position) => {
-                let mut position = position.to_point(buffer_snapshot);
-                position.column = 0;
-                let wrap_row = wrap_snapshot.make_wrap_point(position, Bias::Left).row();
-                Some(BlockPlacement::Above(wrap_row))
-            }
-            BlockPlacement::Near(position) => {
-                let mut position = position.to_point(buffer_snapshot);
-                position.column = buffer_snapshot.line_len(MultiBufferRow(position.row));
-                let wrap_row = wrap_snapshot.make_wrap_point(position, Bias::Left).row();
-                Some(BlockPlacement::Near(wrap_row))
-            }
-            BlockPlacement::Below(position) => {
-                let mut position = position.to_point(buffer_snapshot);
-                position.column = buffer_snapshot.line_len(MultiBufferRow(position.row));
-                let wrap_row = wrap_snapshot.make_wrap_point(position, Bias::Left).row();
-                Some(BlockPlacement::Below(wrap_row))
-            }
-            BlockPlacement::Replace(range) => {
-                let mut start = range.start().to_point(buffer_snapshot);
-                let mut end = range.end().to_point(buffer_snapshot);
-                if start == end {
-                    None
-                } else {
-                    start.column = 0;
-                    let start_wrap_row = wrap_snapshot.make_wrap_point(start, Bias::Left).row();
-                    end.column = buffer_snapshot.line_len(MultiBufferRow(end.row));
-                    let end_wrap_row = wrap_snapshot.make_wrap_point(end, Bias::Left).row();
-                    Some(BlockPlacement::Replace(start_wrap_row..=end_wrap_row))
-                }
-            }
-        }
-    }
-}
-
-pub struct CustomBlock {
-    pub id: CustomBlockId,
-    pub placement: BlockPlacement<Anchor>,
-    pub height: Option<u32>,
-    style: BlockStyle,
-    render: Arc<Mutex<RenderBlock>>,
-    priority: usize,
-}
-
-#[derive(Clone)]
-pub struct BlockProperties<P> {
-    pub placement: BlockPlacement<P>,
-    // None if the block takes up no space
-    // (e.g. a horizontal line)
-    pub height: Option<u32>,
-    pub style: BlockStyle,
-    pub render: RenderBlock,
-    pub priority: usize,
-}
-
-impl<P: Debug> Debug for BlockProperties<P> {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("BlockProperties")
-            .field("placement", &self.placement)
-            .field("height", &self.height)
-            .field("style", &self.style)
-            .finish()
-    }
-}
-
-#[derive(Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-pub enum BlockStyle {
-    Fixed,
-    Flex,
-    Sticky,
-}
-
-#[derive(Debug, Default, Copy, Clone)]
-pub struct EditorMargins {
-    pub gutter: GutterDimensions,
-    pub right: Pixels,
-}
-
-#[derive(gpui::AppContext, gpui::VisualContext)]
-pub struct BlockContext<'a, 'b> {
-    #[window]
-    pub window: &'a mut Window,
-    #[app]
-    pub app: &'b mut App,
-    pub anchor_x: Pixels,
-    pub max_width: Pixels,
-    pub margins: &'b EditorMargins,
-    pub em_width: Pixels,
-    pub line_height: Pixels,
-    pub block_id: BlockId,
-    pub selected: bool,
-    pub editor_style: &'b EditorStyle,
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Ord, PartialOrd, Hash)]
-pub enum BlockId {
-    ExcerptBoundary(ExcerptId),
-    FoldedBuffer(ExcerptId),
-    Custom(CustomBlockId),
-}
-
-impl From<BlockId> for ElementId {
-    fn from(value: BlockId) -> Self {
-        match value {
-            BlockId::Custom(CustomBlockId(id)) => ("Block", id).into(),
-            BlockId::ExcerptBoundary(excerpt_id) => {
-                ("ExcerptBoundary", EntityId::from(excerpt_id)).into()
-            }
-            BlockId::FoldedBuffer(id) => ("FoldedBuffer", EntityId::from(id)).into(),
-        }
-    }
-}
-
-impl std::fmt::Display for BlockId {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Self::Custom(id) => write!(f, "Block({id:?})"),
-            Self::ExcerptBoundary(id) => write!(f, "ExcerptHeader({id:?})"),
-            Self::FoldedBuffer(id) => write!(f, "FoldedBuffer({id:?})"),
-        }
-    }
-}
-
-#[derive(Clone, Debug)]
-struct Transform {
-    summary: TransformSummary,
-    block: Option<Block>,
-}
-
-#[derive(Clone)]
-pub enum Block {
-    Custom(Arc<CustomBlock>),
-    FoldedBuffer {
-        first_excerpt: ExcerptInfo,
-        height: u32,
-    },
-    ExcerptBoundary {
-        excerpt: ExcerptInfo,
-        height: u32,
-    },
-    BufferHeader {
-        excerpt: ExcerptInfo,
-        height: u32,
-    },
-}
-
-impl Block {
-    pub fn id(&self) -> BlockId {
-        match self {
-            Block::Custom(block) => BlockId::Custom(block.id),
-            Block::ExcerptBoundary {
-                excerpt: next_excerpt,
-                ..
-            } => BlockId::ExcerptBoundary(next_excerpt.id),
-            Block::FoldedBuffer { first_excerpt, .. } => BlockId::FoldedBuffer(first_excerpt.id),
-            Block::BufferHeader {
-                excerpt: next_excerpt,
-                ..
-            } => BlockId::ExcerptBoundary(next_excerpt.id),
-        }
-    }
-
-    pub fn has_height(&self) -> bool {
-        match self {
-            Block::Custom(block) => block.height.is_some(),
-            Block::ExcerptBoundary { .. }
-            | Block::FoldedBuffer { .. }
-            | Block::BufferHeader { .. } => true,
-        }
-    }
-
-    pub fn height(&self) -> u32 {
-        match self {
-            Block::Custom(block) => block.height.unwrap_or(0),
-            Block::ExcerptBoundary { height, .. }
-            | Block::FoldedBuffer { height, .. }
-            | Block::BufferHeader { height, .. } => *height,
-        }
-    }
-
-    pub fn style(&self) -> BlockStyle {
-        match self {
-            Block::Custom(block) => block.style,
-            Block::ExcerptBoundary { .. }
-            | Block::FoldedBuffer { .. }
-            | Block::BufferHeader { .. } => BlockStyle::Sticky,
-        }
-    }
-
-    fn place_above(&self) -> bool {
-        match self {
-            Block::Custom(block) => matches!(block.placement, BlockPlacement::Above(_)),
-            Block::FoldedBuffer { .. } => false,
-            Block::ExcerptBoundary { .. } => true,
-            Block::BufferHeader { .. } => true,
-        }
-    }
-
-    pub fn place_near(&self) -> bool {
-        match self {
-            Block::Custom(block) => matches!(block.placement, BlockPlacement::Near(_)),
-            Block::FoldedBuffer { .. } => false,
-            Block::ExcerptBoundary { .. } => false,
-            Block::BufferHeader { .. } => false,
-        }
-    }
-
-    fn place_below(&self) -> bool {
-        match self {
-            Block::Custom(block) => matches!(
-                block.placement,
-                BlockPlacement::Below(_) | BlockPlacement::Near(_)
-            ),
-            Block::FoldedBuffer { .. } => false,
-            Block::ExcerptBoundary { .. } => false,
-            Block::BufferHeader { .. } => false,
-        }
-    }
-
-    fn is_replacement(&self) -> bool {
-        match self {
-            Block::Custom(block) => matches!(block.placement, BlockPlacement::Replace(_)),
-            Block::FoldedBuffer { .. } => true,
-            Block::ExcerptBoundary { .. } => false,
-            Block::BufferHeader { .. } => false,
-        }
-    }
-
-    fn is_header(&self) -> bool {
-        match self {
-            Block::Custom(_) => false,
-            Block::FoldedBuffer { .. } => true,
-            Block::ExcerptBoundary { .. } => true,
-            Block::BufferHeader { .. } => true,
-        }
-    }
-
-    pub fn is_buffer_header(&self) -> bool {
-        match self {
-            Block::Custom(_) => false,
-            Block::FoldedBuffer { .. } => true,
-            Block::ExcerptBoundary { .. } => false,
-            Block::BufferHeader { .. } => true,
-        }
-    }
-}
-
-impl Debug for Block {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Self::Custom(block) => f.debug_struct("Custom").field("block", block).finish(),
-            Self::FoldedBuffer {
-                first_excerpt,
-                height,
-            } => f
-                .debug_struct("FoldedBuffer")
-                .field("first_excerpt", &first_excerpt)
-                .field("height", height)
-                .finish(),
-            Self::ExcerptBoundary { excerpt, height } => f
-                .debug_struct("ExcerptBoundary")
-                .field("excerpt", excerpt)
-                .field("height", height)
-                .finish(),
-            Self::BufferHeader { excerpt, height } => f
-                .debug_struct("BufferHeader")
-                .field("excerpt", excerpt)
-                .field("height", height)
-                .finish(),
-        }
-    }
-}
-
-#[derive(Clone, Debug, Default)]
-struct TransformSummary {
-    input_rows: WrapRow,
-    output_rows: BlockRow,
-    longest_row: BlockRow,
-    longest_row_chars: u32,
-}
-
-pub struct BlockChunks<'a> {
-    transforms: sum_tree::Cursor<'a, 'static, Transform, Dimensions<BlockRow, WrapRow>>,
-    input_chunks: wrap_map::WrapChunks<'a>,
-    input_chunk: Chunk<'a>,
-    output_row: BlockRow,
-    max_output_row: BlockRow,
-    line_count_overflow: RowDelta,
-    masked: bool,
-}
-
-#[derive(Clone)]
-pub struct BlockRows<'a> {
-    transforms: sum_tree::Cursor<'a, 'static, Transform, Dimensions<BlockRow, WrapRow>>,
-    input_rows: wrap_map::WrapRows<'a>,
-    output_row: BlockRow,
-    started: bool,
-}
-
-impl BlockMap {
-    #[ztracing::instrument(skip_all)]
-    pub fn new(
-        wrap_snapshot: WrapSnapshot,
-        buffer_header_height: u32,
-        excerpt_header_height: u32,
-    ) -> Self {
-        let row_count = wrap_snapshot.max_point().row() + WrapRow(1);
-        let mut transforms = SumTree::default();
-        push_isomorphic(&mut transforms, row_count - WrapRow(0), &wrap_snapshot);
-        let map = Self {
-            next_block_id: AtomicUsize::new(0),
-            custom_blocks: Vec::new(),
-            custom_blocks_by_id: TreeMap::default(),
-            folded_buffers: HashSet::default(),
-            buffers_with_disabled_headers: HashSet::default(),
-            transforms: RefCell::new(transforms),
-            wrap_snapshot: RefCell::new(wrap_snapshot.clone()),
-            buffer_header_height,
-            excerpt_header_height,
-        };
-        map.sync(
-            &wrap_snapshot,
-            Patch::new(vec![Edit {
-                old: WrapRow(0)..row_count,
-                new: WrapRow(0)..row_count,
-            }]),
-        );
-        map
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn read(&self, wrap_snapshot: WrapSnapshot, edits: WrapPatch) -> BlockMapReader<'_> {
-        self.sync(&wrap_snapshot, edits);
-        *self.wrap_snapshot.borrow_mut() = wrap_snapshot.clone();
-        BlockMapReader {
-            blocks: &self.custom_blocks,
-            snapshot: BlockSnapshot {
-                wrap_snapshot,
-                transforms: self.transforms.borrow().clone(),
-                custom_blocks_by_id: self.custom_blocks_by_id.clone(),
-                buffer_header_height: self.buffer_header_height,
-                excerpt_header_height: self.excerpt_header_height,
-            },
-        }
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn write(&mut self, wrap_snapshot: WrapSnapshot, edits: WrapPatch) -> BlockMapWriter<'_> {
-        self.sync(&wrap_snapshot, edits);
-        *self.wrap_snapshot.borrow_mut() = wrap_snapshot;
-        BlockMapWriter(self)
-    }
-
-    #[ztracing::instrument(skip_all, fields(edits = ?edits))]
-    fn sync(&self, wrap_snapshot: &WrapSnapshot, mut edits: WrapPatch) {
-        let _timer = zlog::time!("BlockMap::sync").warn_if_gt(std::time::Duration::from_millis(50));
-
-        let buffer = wrap_snapshot.buffer_snapshot();
-
-        // Handle changing the last excerpt if it is empty.
-        if buffer.trailing_excerpt_update_count()
-            != self
-                .wrap_snapshot
-                .borrow()
-                .buffer_snapshot()
-                .trailing_excerpt_update_count()
-        {
-            let max_point = wrap_snapshot.max_point();
-            let edit_start = wrap_snapshot.prev_row_boundary(max_point);
-            let edit_end = max_point.row() + WrapRow(1);
-            edits = edits.compose([WrapEdit {
-                old: edit_start..edit_end,
-                new: edit_start..edit_end,
-            }]);
-        }
-
-        let edits = edits.into_inner();
-        if edits.is_empty() {
-            return;
-        }
-
-        let mut transforms = self.transforms.borrow_mut();
-        let mut new_transforms = SumTree::default();
-        let mut cursor = transforms.cursor::<WrapRow>(());
-        let mut last_block_ix = 0;
-        let mut blocks_in_edit = Vec::new();
-        let mut edits = edits.into_iter().peekable();
-
-        let mut inlay_point_cursor = wrap_snapshot.inlay_point_cursor();
-        let mut tab_point_cursor = wrap_snapshot.tab_point_cursor();
-        let mut fold_point_cursor = wrap_snapshot.fold_point_cursor();
-        let mut wrap_point_cursor = wrap_snapshot.wrap_point_cursor();
-
-        while let Some(edit) = edits.next() {
-            let span = ztracing::debug_span!("while edits", edit = ?edit);
-            let _enter = span.enter();
-
-            let mut old_start = edit.old.start;
-            let mut new_start = edit.new.start;
-
-            // Only preserve transforms that:
-            // * Strictly precedes this edit
-            // * Isomorphic transforms that end *at* the start of the edit
-            // * Below blocks that end at the start of the edit
-            // However, if we hit a replace block that ends at the start of the edit we want to reconstruct it.
-            new_transforms.append(cursor.slice(&old_start, Bias::Left), ());
-            if let Some(transform) = cursor.item()
-                && transform.summary.input_rows > WrapRow(0)
-                && cursor.end() == old_start
-                && transform.block.as_ref().is_none_or(|b| !b.is_replacement())
-            {
-                // Preserve the transform (push and next)
-                new_transforms.push(transform.clone(), ());
-                cursor.next();
-
-                // Preserve below blocks at end of edit
-                while let Some(transform) = cursor.item() {
-                    if transform.block.as_ref().is_some_and(|b| b.place_below()) {
-                        new_transforms.push(transform.clone(), ());
-                        cursor.next();
-                    } else {
-                        break;
-                    }
-                }
-            }
-
-            // Ensure the edit starts at a transform boundary.
-            // If the edit starts within an isomorphic transform, preserve its prefix
-            // If the edit lands within a replacement block, expand the edit to include the start of the replaced input range
-            let transform = cursor.item().unwrap();
-            let transform_rows_before_edit = old_start - *cursor.start();
-            if transform_rows_before_edit > RowDelta(0) {
-                if transform.block.is_none() {
-                    // Preserve any portion of the old isomorphic transform that precedes this edit.
-                    push_isomorphic(
-                        &mut new_transforms,
-                        transform_rows_before_edit,
-                        wrap_snapshot,
-                    );
-                } else {
-                    // We landed within a block that replaces some lines, so we
-                    // extend the edit to start at the beginning of the
-                    // replacement.
-                    debug_assert!(transform.summary.input_rows > WrapRow(0));
-                    old_start -= transform_rows_before_edit;
-                    new_start -= transform_rows_before_edit;
-                }
-            }
-
-            // Decide where the edit ends
-            // * It should end at a transform boundary
-            // * Coalesce edits that intersect the same transform
-            let mut old_end = edit.old.end;
-            let mut new_end = edit.new.end;
-            loop {
-                let span = ztracing::debug_span!("decide where edit ends loop");
-                let _enter = span.enter();
-                // Seek to the transform starting at or after the end of the edit
-                cursor.seek(&old_end, Bias::Left);
-                cursor.next();
-
-                // Extend edit to the end of the discarded transform so it is reconstructed in full
-                let transform_rows_after_edit = *cursor.start() - old_end;
-                old_end += transform_rows_after_edit;
-                new_end += transform_rows_after_edit;
-
-                // Combine this edit with any subsequent edits that intersect the same transform.
-                while let Some(next_edit) = edits.peek() {
-                    if next_edit.old.start <= *cursor.start() {
-                        old_end = next_edit.old.end;
-                        new_end = next_edit.new.end;
-                        cursor.seek(&old_end, Bias::Left);
-                        cursor.next();
-                        edits.next();
-                    } else {
-                        break;
-                    }
-                }
-
-                if *cursor.start() == old_end {
-                    break;
-                }
-            }
-
-            // Discard below blocks at the end of the edit. They'll be reconstructed.
-            while let Some(transform) = cursor.item() {
-                if transform.block.as_ref().is_some_and(|b| b.place_below()) {
-                    cursor.next();
-                } else {
-                    break;
-                }
-            }
-
-            // Find the blocks within this edited region.
-            let new_buffer_start = wrap_snapshot.to_point(WrapPoint::new(new_start, 0), Bias::Left);
-            let start_bound = Bound::Included(new_buffer_start);
-            let start_block_ix =
-                match self.custom_blocks[last_block_ix..].binary_search_by(|probe| {
-                    probe
-                        .start()
-                        .to_point(buffer)
-                        .cmp(&new_buffer_start)
-                        // Move left until we find the index of the first block starting within this edit
-                        .then(Ordering::Greater)
-                }) {
-                    Ok(ix) | Err(ix) => last_block_ix + ix,
-                };
-
-            let end_bound;
-            let end_block_ix = if new_end > wrap_snapshot.max_point().row() {
-                end_bound = Bound::Unbounded;
-                self.custom_blocks.len()
-            } else {
-                let new_buffer_end = wrap_snapshot.to_point(WrapPoint::new(new_end, 0), Bias::Left);
-                end_bound = Bound::Excluded(new_buffer_end);
-                match self.custom_blocks[start_block_ix..].binary_search_by(|probe| {
-                    probe
-                        .start()
-                        .to_point(buffer)
-                        .cmp(&new_buffer_end)
-                        .then(Ordering::Greater)
-                }) {
-                    Ok(ix) | Err(ix) => start_block_ix + ix,
-                }
-            };
-            last_block_ix = end_block_ix;
-
-            debug_assert!(blocks_in_edit.is_empty());
-            // + 8 is chosen arbitrarily to cover some multibuffer headers
-            blocks_in_edit
-                .reserve(end_block_ix - start_block_ix + if buffer.is_singleton() { 0 } else { 8 });
-
-            blocks_in_edit.extend(
-                self.custom_blocks[start_block_ix..end_block_ix]
-                    .iter()
-                    .filter_map(|block| {
-                        let placement = block.placement.to_wrap_row(wrap_snapshot)?;
-                        if let BlockPlacement::Above(row) = placement
-                            && row < new_start
-                        {
-                            return None;
-                        }
-                        Some((placement, Block::Custom(block.clone())))
-                    }),
-            );
-
-            blocks_in_edit.extend(self.header_and_footer_blocks(
-                buffer,
-                (start_bound, end_bound),
-                |point, bias| {
-                    wrap_point_cursor
-                        .map(
-                            tab_point_cursor
-                                .map(fold_point_cursor.map(inlay_point_cursor.map(point), bias)),
-                        )
-                        .row()
-                },
-            ));
-
-            BlockMap::sort_blocks(&mut blocks_in_edit);
-
-            // For each of these blocks, insert a new isomorphic transform preceding the block,
-            // and then insert the block itself.
-            let mut just_processed_folded_buffer = false;
-            for (block_placement, block) in blocks_in_edit.drain(..) {
-                let span =
-                    ztracing::debug_span!("for block in edits", block_height = block.height());
-                let _enter = span.enter();
-
-                let mut summary = TransformSummary {
-                    input_rows: WrapRow(0),
-                    output_rows: BlockRow(block.height()),
-                    longest_row: BlockRow(0),
-                    longest_row_chars: 0,
-                };
-
-                let rows_before_block;
-                match block_placement {
-                    BlockPlacement::Above(position) => {
-                        rows_before_block = position - new_transforms.summary().input_rows;
-                        just_processed_folded_buffer = false;
-                    }
-                    BlockPlacement::Near(position) | BlockPlacement::Below(position) => {
-                        if just_processed_folded_buffer {
-                            continue;
-                        }
-                        if position + RowDelta(1) < new_transforms.summary().input_rows {
-                            continue;
-                        }
-                        rows_before_block =
-                            (position + RowDelta(1)) - new_transforms.summary().input_rows;
-                    }
-                    BlockPlacement::Replace(range) => {
-                        rows_before_block = *range.start() - new_transforms.summary().input_rows;
-                        summary.input_rows = WrapRow(1) + (*range.end() - *range.start());
-                        just_processed_folded_buffer = matches!(block, Block::FoldedBuffer { .. });
-                    }
-                }
-
-                push_isomorphic(&mut new_transforms, rows_before_block, wrap_snapshot);
-                new_transforms.push(
-                    Transform {
-                        summary,
-                        block: Some(block),
-                    },
-                    (),
-                );
-            }
-
-            // Insert an isomorphic transform after the final block.
-            let rows_after_last_block =
-                RowDelta(new_end.0).saturating_sub(RowDelta(new_transforms.summary().input_rows.0));
-            push_isomorphic(&mut new_transforms, rows_after_last_block, wrap_snapshot);
-        }
-
-        new_transforms.append(cursor.suffix(), ());
-        debug_assert_eq!(
-            new_transforms.summary().input_rows,
-            wrap_snapshot.max_point().row() + WrapRow(1)
-        );
-
-        drop(cursor);
-        *transforms = new_transforms;
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn replace_blocks(&mut self, mut renderers: HashMap<CustomBlockId, RenderBlock>) {
-        for block in &mut self.custom_blocks {
-            if let Some(render) = renderers.remove(&block.id) {
-                *block.render.lock() = render;
-            }
-        }
-    }
-
-    /// Guarantees that `wrap_row_for` is called with points in increasing order.
-    #[ztracing::instrument(skip_all)]
-    fn header_and_footer_blocks<'a, R, T>(
-        &'a self,
-        buffer: &'a multi_buffer::MultiBufferSnapshot,
-        range: R,
-        mut wrap_row_for: impl 'a + FnMut(Point, Bias) -> WrapRow,
-    ) -> impl Iterator<Item = (BlockPlacement<WrapRow>, Block)> + 'a
-    where
-        R: RangeBounds<T>,
-        T: multi_buffer::ToOffset,
-    {
-        let mut boundaries = buffer.excerpt_boundaries_in_range(range).peekable();
-
-        std::iter::from_fn(move || {
-            loop {
-                let excerpt_boundary = boundaries.next()?;
-                let wrap_row = wrap_row_for(Point::new(excerpt_boundary.row.0, 0), Bias::Left);
-
-                let new_buffer_id = match (&excerpt_boundary.prev, &excerpt_boundary.next) {
-                    (None, next) => Some(next.buffer_id),
-                    (Some(prev), next) => {
-                        if prev.buffer_id != next.buffer_id {
-                            Some(next.buffer_id)
-                        } else {
-                            None
-                        }
-                    }
-                };
-
-                let mut height = 0;
-
-                if let Some(new_buffer_id) = new_buffer_id {
-                    let first_excerpt = excerpt_boundary.next.clone();
-                    if self.buffers_with_disabled_headers.contains(&new_buffer_id) {
-                        continue;
-                    }
-                    if self.folded_buffers.contains(&new_buffer_id) && buffer.show_headers() {
-                        let mut last_excerpt_end_row = first_excerpt.end_row;
-
-                        while let Some(next_boundary) = boundaries.peek() {
-                            if next_boundary.next.buffer_id == new_buffer_id {
-                                last_excerpt_end_row = next_boundary.next.end_row;
-                            } else {
-                                break;
-                            }
-
-                            boundaries.next();
-                        }
-                        let wrap_end_row = wrap_row_for(
-                            Point::new(
-                                last_excerpt_end_row.0,
-                                buffer.line_len(last_excerpt_end_row),
-                            ),
-                            Bias::Right,
-                        );
-
-                        return Some((
-                            BlockPlacement::Replace(wrap_row..=wrap_end_row),
-                            Block::FoldedBuffer {
-                                height: height + self.buffer_header_height,
-                                first_excerpt,
-                            },
-                        ));
-                    }
-                }
-
-                let starts_new_buffer = new_buffer_id.is_some();
-                let block = if starts_new_buffer && buffer.show_headers() {
-                    height += self.buffer_header_height;
-                    Block::BufferHeader {
-                        excerpt: excerpt_boundary.next,
-                        height,
-                    }
-                } else if excerpt_boundary.prev.is_some() {
-                    height += self.excerpt_header_height;
-                    Block::ExcerptBoundary {
-                        excerpt: excerpt_boundary.next,
-                        height,
-                    }
-                } else {
-                    continue;
-                };
-
-                return Some((BlockPlacement::Above(wrap_row), block));
-            }
-        })
-    }
-
-    #[ztracing::instrument(skip_all)]
-    fn sort_blocks(blocks: &mut Vec<(BlockPlacement<WrapRow>, Block)>) {
-        blocks.sort_unstable_by(|(placement_a, block_a), (placement_b, block_b)| {
-            placement_a
-                .start()
-                .cmp(placement_b.start())
-                .then_with(|| placement_b.end().cmp(placement_a.end()))
-                .then_with(|| placement_a.tie_break().cmp(&placement_b.tie_break()))
-                .then_with(|| {
-                    if block_a.is_header() {
-                        Ordering::Less
-                    } else if block_b.is_header() {
-                        Ordering::Greater
-                    } else {
-                        Ordering::Equal
-                    }
-                })
-                .then_with(|| match (block_a, block_b) {
-                    (
-                        Block::ExcerptBoundary {
-                            excerpt: excerpt_a, ..
-                        }
-                        | Block::BufferHeader {
-                            excerpt: excerpt_a, ..
-                        },
-                        Block::ExcerptBoundary {
-                            excerpt: excerpt_b, ..
-                        }
-                        | Block::BufferHeader {
-                            excerpt: excerpt_b, ..
-                        },
-                    ) => Some(excerpt_a.id).cmp(&Some(excerpt_b.id)),
-                    (
-                        Block::ExcerptBoundary { .. } | Block::BufferHeader { .. },
-                        Block::Custom(_),
-                    ) => Ordering::Less,
-                    (
-                        Block::Custom(_),
-                        Block::ExcerptBoundary { .. } | Block::BufferHeader { .. },
-                    ) => Ordering::Greater,
-                    (Block::Custom(block_a), Block::Custom(block_b)) => block_a
-                        .priority
-                        .cmp(&block_b.priority)
-                        .then_with(|| block_a.id.cmp(&block_b.id)),
-                    _ => {
-                        unreachable!()
-                    }
-                })
-        });
-        blocks.dedup_by(|right, left| match (left.0.clone(), right.0.clone()) {
-            (BlockPlacement::Replace(range), BlockPlacement::Above(row))
-            | (BlockPlacement::Replace(range), BlockPlacement::Below(row)) => range.contains(&row),
-            (BlockPlacement::Replace(range_a), BlockPlacement::Replace(range_b)) => {
-                if range_a.end() >= range_b.start() && range_a.start() <= range_b.end() {
-                    left.0 = BlockPlacement::Replace(
-                        *range_a.start()..=*range_a.end().max(range_b.end()),
-                    );
-                    true
-                } else {
-                    false
-                }
-            }
-            _ => false,
-        });
-    }
-}
-
-#[ztracing::instrument(skip(tree, wrap_snapshot))]
-fn push_isomorphic(tree: &mut SumTree<Transform>, rows: RowDelta, wrap_snapshot: &WrapSnapshot) {
-    if rows == RowDelta(0) {
-        return;
-    }
-
-    let wrap_row_start = tree.summary().input_rows;
-    let wrap_row_end = wrap_row_start + rows;
-    let wrap_summary = wrap_snapshot.text_summary_for_range(wrap_row_start..wrap_row_end);
-    let summary = TransformSummary {
-        input_rows: WrapRow(rows.0),
-        output_rows: BlockRow(rows.0),
-        longest_row: BlockRow(wrap_summary.longest_row),
-        longest_row_chars: wrap_summary.longest_row_chars,
-    };
-    let mut merged = false;
-    tree.update_last(
-        |last_transform| {
-            if last_transform.block.is_none() {
-                last_transform.summary.add_summary(&summary);
-                merged = true;
-            }
-        },
-        (),
-    );
-    if !merged {
-        tree.push(
-            Transform {
-                summary,
-                block: None,
-            },
-            (),
-        );
-    }
-}
-
-impl BlockPoint {
-    pub fn new(row: BlockRow, column: u32) -> Self {
-        Self(Point::new(row.0, column))
-    }
-}
-
-impl Deref for BlockPoint {
-    type Target = Point;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl std::ops::DerefMut for BlockPoint {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.0
-    }
-}
-
-impl Deref for BlockMapReader<'_> {
-    type Target = BlockSnapshot;
-
-    fn deref(&self) -> &Self::Target {
-        &self.snapshot
-    }
-}
-
-impl DerefMut for BlockMapReader<'_> {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.snapshot
-    }
-}
-
-impl BlockMapReader<'_> {
-    #[ztracing::instrument(skip_all)]
-    pub fn row_for_block(&self, block_id: CustomBlockId) -> Option<BlockRow> {
-        let block = self.blocks.iter().find(|block| block.id == block_id)?;
-        let buffer_row = block
-            .start()
-            .to_point(self.wrap_snapshot.buffer_snapshot())
-            .row;
-        let wrap_row = self
-            .wrap_snapshot
-            .make_wrap_point(Point::new(buffer_row, 0), Bias::Left)
-            .row();
-        let start_wrap_row = self
-            .wrap_snapshot
-            .prev_row_boundary(WrapPoint::new(wrap_row, 0));
-        let end_wrap_row = self
-            .wrap_snapshot
-            .next_row_boundary(WrapPoint::new(wrap_row, 0))
-            .unwrap_or(self.wrap_snapshot.max_point().row() + WrapRow(1));
-
-        let mut cursor = self.transforms.cursor::<Dimensions<WrapRow, BlockRow>>(());
-        cursor.seek(&start_wrap_row, Bias::Left);
-        while let Some(transform) = cursor.item() {
-            if cursor.start().0 > end_wrap_row {
-                break;
-            }
-
-            if let Some(BlockId::Custom(id)) = transform.block.as_ref().map(|block| block.id())
-                && id == block_id
-            {
-                return Some(cursor.start().1);
-            }
-            cursor.next();
-        }
-
-        None
-    }
-}
-
-impl BlockMapWriter<'_> {
-    #[ztracing::instrument(skip_all)]
-    pub fn insert(
-        &mut self,
-        blocks: impl IntoIterator<Item = BlockProperties<Anchor>>,
-    ) -> Vec<CustomBlockId> {
-        let blocks = blocks.into_iter();
-        let mut ids = Vec::with_capacity(blocks.size_hint().1.unwrap_or(0));
-        let mut edits = Patch::default();
-        let wrap_snapshot = &*self.0.wrap_snapshot.borrow();
-        let buffer = wrap_snapshot.buffer_snapshot();
-
-        let mut previous_wrap_row_range: Option<Range<WrapRow>> = None;
-        for block in blocks {
-            if let BlockPlacement::Replace(_) = &block.placement {
-                debug_assert!(block.height.unwrap() > 0);
-            }
-
-            let id = CustomBlockId(self.0.next_block_id.fetch_add(1, SeqCst));
-            ids.push(id);
-
-            let start = block.placement.start().to_point(buffer);
-            let end = block.placement.end().to_point(buffer);
-            let start_wrap_row = wrap_snapshot.make_wrap_point(start, Bias::Left).row();
-            let end_wrap_row = wrap_snapshot.make_wrap_point(end, Bias::Left).row();
-
-            let (start_row, end_row) = {
-                previous_wrap_row_range.take_if(|range| {
-                    !range.contains(&start_wrap_row) || !range.contains(&end_wrap_row)
-                });
-                let range = previous_wrap_row_range.get_or_insert_with(|| {
-                    let start_row =
-                        wrap_snapshot.prev_row_boundary(WrapPoint::new(start_wrap_row, 0));
-                    let end_row = wrap_snapshot
-                        .next_row_boundary(WrapPoint::new(end_wrap_row, 0))
-                        .unwrap_or(wrap_snapshot.max_point().row() + WrapRow(1));
-                    start_row..end_row
-                });
-                (range.start, range.end)
-            };
-            let block_ix = match self
-                .0
-                .custom_blocks
-                .binary_search_by(|probe| probe.placement.cmp(&block.placement, buffer))
-            {
-                Ok(ix) | Err(ix) => ix,
-            };
-            let new_block = Arc::new(CustomBlock {
-                id,
-                placement: block.placement,
-                height: block.height,
-                render: Arc::new(Mutex::new(block.render)),
-                style: block.style,
-                priority: block.priority,
-            });
-            self.0.custom_blocks.insert(block_ix, new_block.clone());
-            self.0.custom_blocks_by_id.insert(id, new_block);
-
-            edits = edits.compose([Edit {
-                old: start_row..end_row,
-                new: start_row..end_row,
-            }]);
-        }
-
-        self.0.sync(wrap_snapshot, edits);
-        ids
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn resize(&mut self, mut heights: HashMap<CustomBlockId, u32>) {
-        let wrap_snapshot = &*self.0.wrap_snapshot.borrow();
-        let buffer = wrap_snapshot.buffer_snapshot();
-        let mut edits = Patch::default();
-        let mut last_block_buffer_row = None;
-
-        for block in &mut self.0.custom_blocks {
-            if let Some(new_height) = heights.remove(&block.id) {
-                if let BlockPlacement::Replace(_) = &block.placement {
-                    debug_assert!(new_height > 0);
-                }
-
-                if block.height != Some(new_height) {
-                    let new_block = CustomBlock {
-                        id: block.id,
-                        placement: block.placement.clone(),
-                        height: Some(new_height),
-                        style: block.style,
-                        render: block.render.clone(),
-                        priority: block.priority,
-                    };
-                    let new_block = Arc::new(new_block);
-                    *block = new_block.clone();
-                    self.0.custom_blocks_by_id.insert(block.id, new_block);
-
-                    let start_row = block.placement.start().to_point(buffer).row;
-                    let end_row = block.placement.end().to_point(buffer).row;
-                    if last_block_buffer_row != Some(end_row) {
-                        last_block_buffer_row = Some(end_row);
-                        let start_wrap_row = wrap_snapshot
-                            .make_wrap_point(Point::new(start_row, 0), Bias::Left)
-                            .row();
-                        let end_wrap_row = wrap_snapshot
-                            .make_wrap_point(Point::new(end_row, 0), Bias::Left)
-                            .row();
-                        let start =
-                            wrap_snapshot.prev_row_boundary(WrapPoint::new(start_wrap_row, 0));
-                        let end = wrap_snapshot
-                            .next_row_boundary(WrapPoint::new(end_wrap_row, 0))
-                            .unwrap_or(wrap_snapshot.max_point().row() + WrapRow(1));
-                        edits.push(Edit {
-                            old: start..end,
-                            new: start..end,
-                        })
-                    }
-                }
-            }
-        }
-
-        self.0.sync(wrap_snapshot, edits);
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn remove(&mut self, block_ids: HashSet<CustomBlockId>) {
-        let wrap_snapshot = &*self.0.wrap_snapshot.borrow();
-        let buffer = wrap_snapshot.buffer_snapshot();
-        let mut edits = Patch::default();
-        let mut last_block_buffer_row = None;
-        let mut previous_wrap_row_range: Option<Range<WrapRow>> = None;
-        self.0.custom_blocks.retain(|block| {
-            if block_ids.contains(&block.id) {
-                let start = block.placement.start().to_point(buffer);
-                let end = block.placement.end().to_point(buffer);
-                if last_block_buffer_row != Some(end.row) {
-                    last_block_buffer_row = Some(end.row);
-                    let start_wrap_row = wrap_snapshot.make_wrap_point(start, Bias::Left).row();
-                    let end_wrap_row = wrap_snapshot.make_wrap_point(end, Bias::Left).row();
-                    let (start_row, end_row) = {
-                        previous_wrap_row_range.take_if(|range| {
-                            !range.contains(&start_wrap_row) || !range.contains(&end_wrap_row)
-                        });
-                        let range = previous_wrap_row_range.get_or_insert_with(|| {
-                            let start_row =
-                                wrap_snapshot.prev_row_boundary(WrapPoint::new(start_wrap_row, 0));
-                            let end_row = wrap_snapshot
-                                .next_row_boundary(WrapPoint::new(end_wrap_row, 0))
-                                .unwrap_or(wrap_snapshot.max_point().row() + WrapRow(1));
-                            start_row..end_row
-                        });
-                        (range.start, range.end)
-                    };
-
-                    edits.push(Edit {
-                        old: start_row..end_row,
-                        new: start_row..end_row,
-                    })
-                }
-                false
-            } else {
-                true
-            }
-        });
-        self.0
-            .custom_blocks_by_id
-            .retain(|id, _| !block_ids.contains(id));
-        self.0.sync(wrap_snapshot, edits);
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn remove_intersecting_replace_blocks(
-        &mut self,
-        ranges: impl IntoIterator<Item = Range<MultiBufferOffset>>,
-        inclusive: bool,
-    ) {
-        let wrap_snapshot = self.0.wrap_snapshot.borrow();
-        let mut blocks_to_remove = HashSet::default();
-        for range in ranges {
-            for block in self.blocks_intersecting_buffer_range(range, inclusive) {
-                if matches!(block.placement, BlockPlacement::Replace(_)) {
-                    blocks_to_remove.insert(block.id);
-                }
-            }
-        }
-        drop(wrap_snapshot);
-        self.remove(blocks_to_remove);
-    }
-
-    pub fn disable_header_for_buffer(&mut self, buffer_id: BufferId) {
-        self.0.buffers_with_disabled_headers.insert(buffer_id);
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn fold_buffers(
-        &mut self,
-        buffer_ids: impl IntoIterator<Item = BufferId>,
-        multi_buffer: &MultiBuffer,
-        cx: &App,
-    ) {
-        self.fold_or_unfold_buffers(true, buffer_ids, multi_buffer, cx);
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn unfold_buffers(
-        &mut self,
-        buffer_ids: impl IntoIterator<Item = BufferId>,
-        multi_buffer: &MultiBuffer,
-        cx: &App,
-    ) {
-        self.fold_or_unfold_buffers(false, buffer_ids, multi_buffer, cx);
-    }
-
-    #[ztracing::instrument(skip_all)]
-    fn fold_or_unfold_buffers(
-        &mut self,
-        fold: bool,
-        buffer_ids: impl IntoIterator<Item = BufferId>,
-        multi_buffer: &MultiBuffer,
-        cx: &App,
-    ) {
-        let mut ranges = Vec::new();
-        for buffer_id in buffer_ids {
-            if fold {
-                self.0.folded_buffers.insert(buffer_id);
-            } else {
-                self.0.folded_buffers.remove(&buffer_id);
-            }
-            ranges.extend(multi_buffer.excerpt_ranges_for_buffer(buffer_id, cx));
-        }
-        ranges.sort_unstable_by_key(|range| range.start);
-
-        let mut edits = Patch::default();
-        let wrap_snapshot = self.0.wrap_snapshot.borrow().clone();
-        for range in ranges {
-            let last_edit_row = cmp::min(
-                wrap_snapshot.make_wrap_point(range.end, Bias::Right).row() + WrapRow(1),
-                wrap_snapshot.max_point().row(),
-            ) + WrapRow(1);
-            let range = wrap_snapshot.make_wrap_point(range.start, Bias::Left).row()..last_edit_row;
-            edits.push(Edit {
-                old: range.clone(),
-                new: range,
-            });
-        }
-
-        self.0.sync(&wrap_snapshot, edits);
-    }
-
-    #[ztracing::instrument(skip_all)]
-    fn blocks_intersecting_buffer_range(
-        &self,
-        range: Range<MultiBufferOffset>,
-        inclusive: bool,
-    ) -> &[Arc<CustomBlock>] {
-        if range.is_empty() && !inclusive {
-            return &[];
-        }
-        let wrap_snapshot = self.0.wrap_snapshot.borrow();
-        let buffer = wrap_snapshot.buffer_snapshot();
-
-        let start_block_ix = match self.0.custom_blocks.binary_search_by(|block| {
-            let block_end = block.end().to_offset(buffer);
-            block_end.cmp(&range.start).then(Ordering::Greater)
-        }) {
-            Ok(ix) | Err(ix) => ix,
-        };
-        let end_block_ix = match self.0.custom_blocks[start_block_ix..].binary_search_by(|block| {
-            let block_start = block.start().to_offset(buffer);
-            block_start.cmp(&range.end).then(if inclusive {
-                Ordering::Less
-            } else {
-                Ordering::Greater
-            })
-        }) {
-            Ok(ix) | Err(ix) => ix,
-        };
-
-        &self.0.custom_blocks[start_block_ix..][..end_block_ix]
-    }
-}
-
-impl BlockSnapshot {
-    #[cfg(test)]
-    #[ztracing::instrument(skip_all)]
-    pub fn text(&self) -> String {
-        self.chunks(
-            BlockRow(0)..self.transforms.summary().output_rows,
-            false,
-            false,
-            Highlights::default(),
-        )
-        .map(|chunk| chunk.text)
-        .collect()
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub(crate) fn chunks<'a>(
-        &'a self,
-        rows: Range<BlockRow>,
-        language_aware: bool,
-        masked: bool,
-        highlights: Highlights<'a>,
-    ) -> BlockChunks<'a> {
-        let max_output_row = cmp::min(rows.end, self.transforms.summary().output_rows);
-
-        let mut cursor = self.transforms.cursor::<Dimensions<BlockRow, WrapRow>>(());
-        cursor.seek(&rows.start, Bias::Right);
-        let transform_output_start = cursor.start().0;
-        let transform_input_start = cursor.start().1;
-
-        let mut input_start = transform_input_start;
-        let mut input_end = transform_input_start;
-        if let Some(transform) = cursor.item()
-            && transform.block.is_none()
-        {
-            input_start += rows.start - transform_output_start;
-            input_end += cmp::min(
-                rows.end - transform_output_start,
-                RowDelta(transform.summary.input_rows.0),
-            );
-        }
-
-        BlockChunks {
-            input_chunks: self.wrap_snapshot.chunks(
-                input_start..input_end,
-                language_aware,
-                highlights,
-            ),
-            input_chunk: Default::default(),
-            transforms: cursor,
-            output_row: rows.start,
-            line_count_overflow: RowDelta(0),
-            max_output_row,
-            masked,
-        }
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub(super) fn row_infos(&self, start_row: BlockRow) -> BlockRows<'_> {
-        let mut cursor = self.transforms.cursor::<Dimensions<BlockRow, WrapRow>>(());
-        cursor.seek(&start_row, Bias::Right);
-        let Dimensions(output_start, input_start, _) = cursor.start();
-        let overshoot = if cursor
-            .item()
-            .is_some_and(|transform| transform.block.is_none())
-        {
-            start_row - *output_start
-        } else {
-            RowDelta(0)
-        };
-        let input_start_row = *input_start + overshoot;
-        BlockRows {
-            transforms: cursor,
-            input_rows: self.wrap_snapshot.row_infos(input_start_row),
-            output_row: start_row,
-            started: false,
-        }
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn blocks_in_range(
-        &self,
-        rows: Range<BlockRow>,
-    ) -> impl Iterator<Item = (BlockRow, &Block)> {
-        let mut cursor = self.transforms.cursor::<BlockRow>(());
-        cursor.seek(&rows.start, Bias::Left);
-        while *cursor.start() < rows.start && cursor.end() <= rows.start {
-            cursor.next();
-        }
-
-        std::iter::from_fn(move || {
-            while let Some(transform) = cursor.item() {
-                let start_row = *cursor.start();
-                if start_row > rows.end
-                    || (start_row == rows.end
-                        && transform
-                            .block
-                            .as_ref()
-                            .is_some_and(|block| block.height() > 0))
-                {
-                    break;
-                }
-                if let Some(block) = &transform.block {
-                    cursor.next();
-                    return Some((start_row, block));
-                } else {
-                    cursor.next();
-                }
-            }
-            None
-        })
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub(crate) fn sticky_header_excerpt(&self, position: f64) -> Option<StickyHeaderExcerpt<'_>> {
-        let top_row = position as u32;
-        let mut cursor = self.transforms.cursor::<BlockRow>(());
-        cursor.seek(&BlockRow(top_row), Bias::Right);
-
-        while let Some(transform) = cursor.item() {
-            match &transform.block {
-                Some(
-                    Block::ExcerptBoundary { excerpt, .. } | Block::BufferHeader { excerpt, .. },
-                ) => {
-                    return Some(StickyHeaderExcerpt { excerpt });
-                }
-                Some(block) if block.is_buffer_header() => return None,
-                _ => {
-                    cursor.prev();
-                    continue;
-                }
-            }
-        }
-
-        None
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn block_for_id(&self, block_id: BlockId) -> Option<Block> {
-        let buffer = self.wrap_snapshot.buffer_snapshot();
-        let wrap_point = match block_id {
-            BlockId::Custom(custom_block_id) => {
-                let custom_block = self.custom_blocks_by_id.get(&custom_block_id)?;
-                return Some(Block::Custom(custom_block.clone()));
-            }
-            BlockId::ExcerptBoundary(next_excerpt_id) => {
-                let excerpt_range = buffer.range_for_excerpt(next_excerpt_id)?;
-                self.wrap_snapshot
-                    .make_wrap_point(excerpt_range.start, Bias::Left)
-            }
-            BlockId::FoldedBuffer(excerpt_id) => self
-                .wrap_snapshot
-                .make_wrap_point(buffer.range_for_excerpt(excerpt_id)?.start, Bias::Left),
-        };
-        let wrap_row = wrap_point.row();
-
-        let mut cursor = self.transforms.cursor::<WrapRow>(());
-        cursor.seek(&wrap_row, Bias::Left);
-
-        while let Some(transform) = cursor.item() {
-            if let Some(block) = transform.block.as_ref() {
-                if block.id() == block_id {
-                    return Some(block.clone());
-                }
-            } else if *cursor.start() > wrap_row {
-                break;
-            }
-
-            cursor.next();
-        }
-
-        None
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn max_point(&self) -> BlockPoint {
-        let row = self
-            .transforms
-            .summary()
-            .output_rows
-            .saturating_sub(RowDelta(1));
-        BlockPoint::new(row, self.line_len(row))
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn longest_row(&self) -> BlockRow {
-        self.transforms.summary().longest_row
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn longest_row_in_range(&self, range: Range<BlockRow>) -> BlockRow {
-        let mut cursor = self.transforms.cursor::<Dimensions<BlockRow, WrapRow>>(());
-        cursor.seek(&range.start, Bias::Right);
-
-        let mut longest_row = range.start;
-        let mut longest_row_chars = 0;
-        if let Some(transform) = cursor.item() {
-            if transform.block.is_none() {
-                let &Dimensions(output_start, input_start, _) = cursor.start();
-                let overshoot = range.start - output_start;
-                let wrap_start_row = input_start + WrapRow(overshoot.0);
-                let wrap_end_row = cmp::min(
-                    input_start + WrapRow((range.end - output_start).0),
-                    cursor.end().1,
-                );
-                let summary = self
-                    .wrap_snapshot
-                    .text_summary_for_range(wrap_start_row..wrap_end_row);
-                longest_row = BlockRow(range.start.0 + summary.longest_row);
-                longest_row_chars = summary.longest_row_chars;
-            }
-            cursor.next();
-        }
-
-        let cursor_start_row = cursor.start().0;
-        if range.end > cursor_start_row {
-            let summary = cursor.summary::<_, TransformSummary>(&range.end, Bias::Right);
-            if summary.longest_row_chars > longest_row_chars {
-                longest_row = cursor_start_row + summary.longest_row;
-                longest_row_chars = summary.longest_row_chars;
-            }
-
-            if let Some(transform) = cursor.item()
-                && transform.block.is_none()
-            {
-                let &Dimensions(output_start, input_start, _) = cursor.start();
-                let overshoot = range.end - output_start;
-                let wrap_start_row = input_start;
-                let wrap_end_row = input_start + overshoot;
-                let summary = self
-                    .wrap_snapshot
-                    .text_summary_for_range(wrap_start_row..wrap_end_row);
-                if summary.longest_row_chars > longest_row_chars {
-                    longest_row = output_start + RowDelta(summary.longest_row);
-                }
-            }
-        }
-
-        longest_row
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub(super) fn line_len(&self, row: BlockRow) -> u32 {
-        let (start, _, item) =
-            self.transforms
-                .find::<Dimensions<BlockRow, WrapRow>, _>((), &row, Bias::Right);
-        if let Some(transform) = item {
-            let Dimensions(output_start, input_start, _) = start;
-            let overshoot = row - output_start;
-            if transform.block.is_some() {
-                0
-            } else {
-                self.wrap_snapshot.line_len(input_start + overshoot)
-            }
-        } else if row == BlockRow(0) {
-            0
-        } else {
-            panic!("row out of range");
-        }
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub(super) fn is_block_line(&self, row: BlockRow) -> bool {
-        let (_, _, item) = self.transforms.find::<BlockRow, _>((), &row, Bias::Right);
-        item.is_some_and(|t| t.block.is_some())
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub(super) fn is_folded_buffer_header(&self, row: BlockRow) -> bool {
-        let (_, _, item) = self.transforms.find::<BlockRow, _>((), &row, Bias::Right);
-        let Some(transform) = item else {
-            return false;
-        };
-        matches!(transform.block, Some(Block::FoldedBuffer { .. }))
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub(super) fn is_line_replaced(&self, row: MultiBufferRow) -> bool {
-        let wrap_point = self
-            .wrap_snapshot
-            .make_wrap_point(Point::new(row.0, 0), Bias::Left);
-        let (_, _, item) = self
-            .transforms
-            .find::<WrapRow, _>((), &wrap_point.row(), Bias::Right);
-        item.is_some_and(|transform| {
-            transform
-                .block
-                .as_ref()
-                .is_some_and(|block| block.is_replacement())
-        })
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn clip_point(&self, point: BlockPoint, bias: Bias) -> BlockPoint {
-        let mut cursor = self.transforms.cursor::<Dimensions<BlockRow, WrapRow>>(());
-        cursor.seek(&BlockRow(point.row), Bias::Right);
-
-        let max_input_row = self.transforms.summary().input_rows;
-        let mut search_left = (bias == Bias::Left && cursor.start().1 > WrapRow(0))
-            || cursor.end().1 == max_input_row;
-        let mut reversed = false;
-
-        loop {
-            if let Some(transform) = cursor.item() {
-                let Dimensions(output_start_row, input_start_row, _) = cursor.start();
-                let Dimensions(output_end_row, input_end_row, _) = cursor.end();
-                let output_start = Point::new(output_start_row.0, 0);
-                let input_start = Point::new(input_start_row.0, 0);
-                let input_end = Point::new(input_end_row.0, 0);
-
-                match transform.block.as_ref() {
-                    Some(block) => {
-                        if block.is_replacement()
-                            && (((bias == Bias::Left || search_left) && output_start <= point.0)
-                                || (!search_left && output_start >= point.0))
-                        {
-                            return BlockPoint(output_start);
-                        }
-                    }
-                    None => {
-                        let input_point = if point.row >= output_end_row.0 {
-                            let line_len = self.wrap_snapshot.line_len(input_end_row - RowDelta(1));
-                            self.wrap_snapshot.clip_point(
-                                WrapPoint::new(input_end_row - RowDelta(1), line_len),
-                                bias,
-                            )
-                        } else {
-                            let output_overshoot = point.0.saturating_sub(output_start);
-                            self.wrap_snapshot
-                                .clip_point(WrapPoint(input_start + output_overshoot), bias)
-                        };
-
-                        if (input_start..input_end).contains(&input_point.0) {
-                            let input_overshoot = input_point.0.saturating_sub(input_start);
-                            return BlockPoint(output_start + input_overshoot);
-                        }
-                    }
-                }
-
-                if search_left {
-                    cursor.prev();
-                } else {
-                    cursor.next();
-                }
-            } else if reversed {
-                return self.max_point();
-            } else {
-                reversed = true;
-                search_left = !search_left;
-                cursor.seek(&BlockRow(point.row), Bias::Right);
-            }
-        }
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn to_block_point(&self, wrap_point: WrapPoint) -> BlockPoint {
-        let (start, _, item) = self.transforms.find::<Dimensions<WrapRow, BlockRow>, _>(
-            (),
-            &wrap_point.row(),
-            Bias::Right,
-        );
-        if let Some(transform) = item {
-            if transform.block.is_some() {
-                BlockPoint::new(start.1, 0)
-            } else {
-                let Dimensions(input_start_row, output_start_row, _) = start;
-                let input_start = Point::new(input_start_row.0, 0);
-                let output_start = Point::new(output_start_row.0, 0);
-                let input_overshoot = wrap_point.0 - input_start;
-                BlockPoint(output_start + input_overshoot)
-            }
-        } else {
-            self.max_point()
-        }
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn to_wrap_point(&self, block_point: BlockPoint, bias: Bias) -> WrapPoint {
-        let (start, end, item) = self.transforms.find::<Dimensions<BlockRow, WrapRow>, _>(
-            (),
-            &BlockRow(block_point.row),
-            Bias::Right,
-        );
-        if let Some(transform) = item {
-            match transform.block.as_ref() {
-                Some(block) => {
-                    if block.place_below() {
-                        let wrap_row = start.1 - RowDelta(1);
-                        WrapPoint::new(wrap_row, self.wrap_snapshot.line_len(wrap_row))
-                    } else if block.place_above() {
-                        WrapPoint::new(start.1, 0)
-                    } else if bias == Bias::Left {
-                        WrapPoint::new(start.1, 0)
-                    } else {
-                        let wrap_row = end.1 - RowDelta(1);
-                        WrapPoint::new(wrap_row, self.wrap_snapshot.line_len(wrap_row))
-                    }
-                }
-                None => {
-                    let overshoot = block_point.row() - start.0;
-                    let wrap_row = start.1 + RowDelta(overshoot.0);
-                    WrapPoint::new(wrap_row, block_point.column)
-                }
-            }
-        } else {
-            self.wrap_snapshot.max_point()
-        }
-    }
-}
-
-impl BlockChunks<'_> {
-    /// Go to the next transform
-    #[ztracing::instrument(skip_all)]
-    fn advance(&mut self) {
-        self.input_chunk = Chunk::default();
-        self.transforms.next();
-        while let Some(transform) = self.transforms.item() {
-            if transform
-                .block
-                .as_ref()
-                .is_some_and(|block| block.height() == 0)
-            {
-                self.transforms.next();
-            } else {
-                break;
-            }
-        }
-
-        if self
-            .transforms
-            .item()
-            .is_some_and(|transform| transform.block.is_none())
-        {
-            let start_input_row = self.transforms.start().1;
-            let start_output_row = self.transforms.start().0;
-            if start_output_row < self.max_output_row {
-                let end_input_row = cmp::min(
-                    self.transforms.end().1,
-                    start_input_row + (self.max_output_row - start_output_row),
-                );
-                self.input_chunks.seek(start_input_row..end_input_row);
-            }
-        }
-    }
-}
-
-pub struct StickyHeaderExcerpt<'a> {
-    pub excerpt: &'a ExcerptInfo,
-}
-
-impl<'a> Iterator for BlockChunks<'a> {
-    type Item = Chunk<'a>;
-
-    #[ztracing::instrument(skip_all)]
-    fn next(&mut self) -> Option<Self::Item> {
-        if self.output_row >= self.max_output_row {
-            return None;
-        }
-
-        if self.line_count_overflow > RowDelta(0) {
-            let lines = self.line_count_overflow.0.min(u128::BITS);
-            self.line_count_overflow.0 -= lines;
-            self.output_row += RowDelta(lines);
-            return Some(Chunk {
-                text: unsafe { std::str::from_utf8_unchecked(&NEWLINES[..lines as usize]) },
-                chars: 1u128.unbounded_shl(lines).wrapping_sub(1),
-                ..Default::default()
-            });
-        }
-
-        let transform = self.transforms.item()?;
-        if transform.block.is_some() {
-            let block_start = self.transforms.start().0;
-            let mut block_end = self.transforms.end().0;
-            self.advance();
-            if self.transforms.item().is_none() {
-                block_end -= RowDelta(1);
-            }
-
-            let start_in_block = self.output_row - block_start;
-            let end_in_block = cmp::min(self.max_output_row, block_end) - block_start;
-            let line_count = end_in_block - start_in_block;
-            let lines = RowDelta(line_count.0.min(u128::BITS));
-            self.line_count_overflow = line_count - lines;
-            self.output_row += lines;
-
-            return Some(Chunk {
-                text: unsafe { std::str::from_utf8_unchecked(&NEWLINES[..lines.0 as usize]) },
-                chars: 1u128.unbounded_shl(lines.0).wrapping_sub(1),
-                ..Default::default()
-            });
-        }
-
-        if self.input_chunk.text.is_empty() {
-            if let Some(input_chunk) = self.input_chunks.next() {
-                self.input_chunk = input_chunk;
-            } else {
-                if self.output_row < self.max_output_row {
-                    self.output_row.0 += 1;
-                    self.advance();
-                    if self.transforms.item().is_some() {
-                        return Some(Chunk {
-                            text: "\n",
-                            chars: 1,
-                            ..Default::default()
-                        });
-                    }
-                }
-                return None;
-            }
-        }
-
-        let transform_end = self.transforms.end().0;
-        let (prefix_rows, prefix_bytes) =
-            offset_for_row(self.input_chunk.text, transform_end - self.output_row);
-        self.output_row += prefix_rows;
-
-        let (mut prefix, suffix) = self.input_chunk.text.split_at(prefix_bytes);
-        self.input_chunk.text = suffix;
-        self.input_chunk.tabs >>= prefix_bytes.saturating_sub(1);
-        self.input_chunk.chars >>= prefix_bytes.saturating_sub(1);
-
-        let mut tabs = self.input_chunk.tabs;
-        let mut chars = self.input_chunk.chars;
-
-        if self.masked {
-            // Not great for multibyte text because to keep cursor math correct we
-            // need to have the same number of chars in the input as output.
-            let chars_count = prefix.chars().count();
-            let bullet_len = chars_count;
-            prefix = unsafe { std::str::from_utf8_unchecked(&BULLETS[..bullet_len]) };
-            chars = 1u128.unbounded_shl(bullet_len as u32).wrapping_sub(1);
-            tabs = 0;
-        }
-
-        let chunk = Chunk {
-            text: prefix,
-            tabs,
-            chars,
-            ..self.input_chunk.clone()
-        };
-
-        if self.output_row == transform_end {
-            self.advance();
-        }
-
-        Some(chunk)
-    }
-}
-
-impl Iterator for BlockRows<'_> {
-    type Item = RowInfo;
-
-    #[ztracing::instrument(skip_all)]
-    fn next(&mut self) -> Option<Self::Item> {
-        if self.started {
-            self.output_row.0 += 1;
-        } else {
-            self.started = true;
-        }
-
-        if self.output_row >= self.transforms.end().0 {
-            self.transforms.next();
-            while let Some(transform) = self.transforms.item() {
-                if transform
-                    .block
-                    .as_ref()
-                    .is_some_and(|block| block.height() == 0)
-                {
-                    self.transforms.next();
-                } else {
-                    break;
-                }
-            }
-
-            let transform = self.transforms.item()?;
-            if transform
-                .block
-                .as_ref()
-                .is_none_or(|block| block.is_replacement())
-            {
-                self.input_rows.seek(self.transforms.start().1);
-            }
-        }
-
-        let transform = self.transforms.item()?;
-        if transform.block.as_ref().is_none_or(|block| {
-            block.is_replacement()
-                && self.transforms.start().0 == self.output_row
-                && matches!(block, Block::FoldedBuffer { .. }).not()
-        }) {
-            self.input_rows.next()
-        } else {
-            Some(RowInfo::default())
-        }
-    }
-}
-
-impl sum_tree::Item for Transform {
-    type Summary = TransformSummary;
-
-    fn summary(&self, _cx: ()) -> Self::Summary {
-        self.summary.clone()
-    }
-}
-
-impl sum_tree::ContextLessSummary for TransformSummary {
-    fn zero() -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, summary: &Self) {
-        if summary.longest_row_chars > self.longest_row_chars {
-            self.longest_row = self.output_rows + summary.longest_row;
-            self.longest_row_chars = summary.longest_row_chars;
-        }
-        self.input_rows += summary.input_rows;
-        self.output_rows += summary.output_rows;
-    }
-}
-
-impl<'a> sum_tree::Dimension<'a, TransformSummary> for WrapRow {
-    fn zero(_cx: ()) -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, summary: &'a TransformSummary, _: ()) {
-        *self += summary.input_rows;
-    }
-}
-
-impl<'a> sum_tree::Dimension<'a, TransformSummary> for BlockRow {
-    fn zero(_cx: ()) -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, summary: &'a TransformSummary, _: ()) {
-        *self += summary.output_rows;
-    }
-}
-
-impl Deref for BlockContext<'_, '_> {
-    type Target = App;
-
-    fn deref(&self) -> &Self::Target {
-        self.app
-    }
-}
-
-impl DerefMut for BlockContext<'_, '_> {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        self.app
-    }
-}
-
-impl CustomBlock {
-    #[ztracing::instrument(skip_all)]
-    pub fn render(&self, cx: &mut BlockContext) -> AnyElement {
-        self.render.lock()(cx)
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn start(&self) -> Anchor {
-        *self.placement.start()
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn end(&self) -> Anchor {
-        *self.placement.end()
-    }
-
-    pub fn style(&self) -> BlockStyle {
-        self.style
-    }
-}
-
-impl Debug for CustomBlock {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("Block")
-            .field("id", &self.id)
-            .field("placement", &self.placement)
-            .field("height", &self.height)
-            .field("style", &self.style)
-            .field("priority", &self.priority)
-            .finish_non_exhaustive()
-    }
-}
-
-// Count the number of bytes prior to a target point. If the string doesn't contain the target
-// point, return its total extent. Otherwise return the target point itself.
-fn offset_for_row(s: &str, target: RowDelta) -> (RowDelta, usize) {
-    let mut row = 0;
-    let mut offset = 0;
-    for (ix, line) in s.split('\n').enumerate() {
-        if ix > 0 {
-            row += 1;
-            offset += 1;
-        }
-        if row >= target.0 {
-            break;
-        }
-        offset += line.len();
-    }
-    (RowDelta(row), offset)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::{
-        display_map::{fold_map::FoldMap, inlay_map::InlayMap, tab_map::TabMap, wrap_map::WrapMap},
-        test::test_font,
-    };
-    use gpui::{App, AppContext as _, Element, div, font, px};
-    use itertools::Itertools;
-    use language::{Buffer, Capability};
-    use multi_buffer::{ExcerptRange, MultiBuffer};
-    use rand::prelude::*;
-    use settings::SettingsStore;
-    use std::env;
-    use util::RandomCharIter;
-
-    #[gpui::test]
-    fn test_offset_for_row() {
-        assert_eq!(offset_for_row("", RowDelta(0)), (RowDelta(0), 0));
-        assert_eq!(offset_for_row("", RowDelta(1)), (RowDelta(0), 0));
-        assert_eq!(offset_for_row("abcd", RowDelta(0)), (RowDelta(0), 0));
-        assert_eq!(offset_for_row("abcd", RowDelta(1)), (RowDelta(0), 4));
-        assert_eq!(offset_for_row("\n", RowDelta(0)), (RowDelta(0), 0));
-        assert_eq!(offset_for_row("\n", RowDelta(1)), (RowDelta(1), 1));
-        assert_eq!(
-            offset_for_row("abc\ndef\nghi", RowDelta(0)),
-            (RowDelta(0), 0)
-        );
-        assert_eq!(
-            offset_for_row("abc\ndef\nghi", RowDelta(1)),
-            (RowDelta(1), 4)
-        );
-        assert_eq!(
-            offset_for_row("abc\ndef\nghi", RowDelta(2)),
-            (RowDelta(2), 8)
-        );
-        assert_eq!(
-            offset_for_row("abc\ndef\nghi", RowDelta(3)),
-            (RowDelta(2), 11)
-        );
-    }
-
-    #[gpui::test]
-    fn test_basic_blocks(cx: &mut gpui::TestAppContext) {
-        cx.update(init_test);
-
-        let text = "aaa\nbbb\nccc\nddd";
-
-        let buffer = cx.update(|cx| MultiBuffer::build_simple(text, cx));
-        let buffer_snapshot = cx.update(|cx| buffer.read(cx).snapshot(cx));
-        let subscription = buffer.update(cx, |buffer, _| buffer.subscribe());
-        let (mut inlay_map, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
-        let (mut fold_map, fold_snapshot) = FoldMap::new(inlay_snapshot);
-        let (mut tab_map, tab_snapshot) = TabMap::new(fold_snapshot, 1.try_into().unwrap());
-        let (wrap_map, wraps_snapshot) =
-            cx.update(|cx| WrapMap::new(tab_snapshot, font("Helvetica"), px(14.0), None, cx));
-        let mut block_map = BlockMap::new(wraps_snapshot.clone(), 1, 1);
-
-        let mut writer = block_map.write(wraps_snapshot.clone(), Default::default());
-        let block_ids = writer.insert(vec![
-            BlockProperties {
-                style: BlockStyle::Fixed,
-                placement: BlockPlacement::Above(buffer_snapshot.anchor_after(Point::new(1, 0))),
-                height: Some(1),
-                render: Arc::new(|_| div().into_any()),
-                priority: 0,
-            },
-            BlockProperties {
-                style: BlockStyle::Fixed,
-                placement: BlockPlacement::Above(buffer_snapshot.anchor_after(Point::new(1, 2))),
-                height: Some(2),
-                render: Arc::new(|_| div().into_any()),
-                priority: 0,
-            },
-            BlockProperties {
-                style: BlockStyle::Fixed,
-                placement: BlockPlacement::Below(buffer_snapshot.anchor_after(Point::new(3, 3))),
-                height: Some(3),
-                render: Arc::new(|_| div().into_any()),
-                priority: 0,
-            },
-        ]);
-
-        let snapshot = block_map.read(wraps_snapshot, Default::default());
-        assert_eq!(snapshot.text(), "aaa\n\n\n\nbbb\nccc\nddd\n\n\n");
-
-        let blocks = snapshot
-            .blocks_in_range(BlockRow(0)..BlockRow(8))
-            .map(|(start_row, block)| {
-                let block = block.as_custom().unwrap();
-                (start_row.0..start_row.0 + block.height.unwrap(), block.id)
-            })
-            .collect::<Vec<_>>();
-
-        // When multiple blocks are on the same line, the newer blocks appear first.
-        assert_eq!(
-            blocks,
-            &[
-                (1..2, block_ids[0]),
-                (2..4, block_ids[1]),
-                (7..10, block_ids[2]),
-            ]
-        );
-
-        assert_eq!(
-            snapshot.to_block_point(WrapPoint::new(WrapRow(0), 3)),
-            BlockPoint::new(BlockRow(0), 3)
-        );
-        assert_eq!(
-            snapshot.to_block_point(WrapPoint::new(WrapRow(1), 0)),
-            BlockPoint::new(BlockRow(4), 0)
-        );
-        assert_eq!(
-            snapshot.to_block_point(WrapPoint::new(WrapRow(3), 3)),
-            BlockPoint::new(BlockRow(6), 3)
-        );
-
-        assert_eq!(
-            snapshot.to_wrap_point(BlockPoint::new(BlockRow(0), 3), Bias::Left),
-            WrapPoint::new(WrapRow(0), 3)
-        );
-        assert_eq!(
-            snapshot.to_wrap_point(BlockPoint::new(BlockRow(1), 0), Bias::Left),
-            WrapPoint::new(WrapRow(1), 0)
-        );
-        assert_eq!(
-            snapshot.to_wrap_point(BlockPoint::new(BlockRow(3), 0), Bias::Left),
-            WrapPoint::new(WrapRow(1), 0)
-        );
-        assert_eq!(
-            snapshot.to_wrap_point(BlockPoint::new(BlockRow(7), 0), Bias::Left),
-            WrapPoint::new(WrapRow(3), 3)
-        );
-
-        assert_eq!(
-            snapshot.clip_point(BlockPoint::new(BlockRow(1), 0), Bias::Left),
-            BlockPoint::new(BlockRow(0), 3)
-        );
-        assert_eq!(
-            snapshot.clip_point(BlockPoint::new(BlockRow(1), 0), Bias::Right),
-            BlockPoint::new(BlockRow(4), 0)
-        );
-        assert_eq!(
-            snapshot.clip_point(BlockPoint::new(BlockRow(1), 1), Bias::Left),
-            BlockPoint::new(BlockRow(0), 3)
-        );
-        assert_eq!(
-            snapshot.clip_point(BlockPoint::new(BlockRow(1), 1), Bias::Right),
-            BlockPoint::new(BlockRow(4), 0)
-        );
-        assert_eq!(
-            snapshot.clip_point(BlockPoint::new(BlockRow(4), 0), Bias::Left),
-            BlockPoint::new(BlockRow(4), 0)
-        );
-        assert_eq!(
-            snapshot.clip_point(BlockPoint::new(BlockRow(4), 0), Bias::Right),
-            BlockPoint::new(BlockRow(4), 0)
-        );
-        assert_eq!(
-            snapshot.clip_point(BlockPoint::new(BlockRow(6), 3), Bias::Left),
-            BlockPoint::new(BlockRow(6), 3)
-        );
-        assert_eq!(
-            snapshot.clip_point(BlockPoint::new(BlockRow(6), 3), Bias::Right),
-            BlockPoint::new(BlockRow(6), 3)
-        );
-        assert_eq!(
-            snapshot.clip_point(BlockPoint::new(BlockRow(7), 0), Bias::Left),
-            BlockPoint::new(BlockRow(6), 3)
-        );
-        assert_eq!(
-            snapshot.clip_point(BlockPoint::new(BlockRow(7), 0), Bias::Right),
-            BlockPoint::new(BlockRow(6), 3)
-        );
-
-        assert_eq!(
-            snapshot
-                .row_infos(BlockRow(0))
-                .map(|row_info| row_info.buffer_row)
-                .collect::<Vec<_>>(),
-            &[
-                Some(0),
-                None,
-                None,
-                None,
-                Some(1),
-                Some(2),
-                Some(3),
-                None,
-                None,
-                None
-            ]
-        );
-
-        // Insert a line break, separating two block decorations into separate lines.
-        let buffer_snapshot = buffer.update(cx, |buffer, cx| {
-            buffer.edit([(Point::new(1, 1)..Point::new(1, 1), "!!!\n")], None, cx);
-            buffer.snapshot(cx)
-        });
-
-        let (inlay_snapshot, inlay_edits) =
-            inlay_map.sync(buffer_snapshot, subscription.consume().into_inner());
-        let (fold_snapshot, fold_edits) = fold_map.read(inlay_snapshot, inlay_edits);
-        let (tab_snapshot, tab_edits) =
-            tab_map.sync(fold_snapshot, fold_edits, 4.try_into().unwrap());
-        let (wraps_snapshot, wrap_edits) = wrap_map.update(cx, |wrap_map, cx| {
-            wrap_map.sync(tab_snapshot, tab_edits, cx)
-        });
-        let snapshot = block_map.read(wraps_snapshot, wrap_edits);
-        assert_eq!(snapshot.text(), "aaa\n\nb!!!\n\n\nbb\nccc\nddd\n\n\n");
-    }
-
-    #[gpui::test]
-    fn test_multibuffer_headers_and_footers(cx: &mut App) {
-        init_test(cx);
-
-        let buffer1 = cx.new(|cx| Buffer::local("Buffer 1", cx));
-        let buffer2 = cx.new(|cx| Buffer::local("Buffer 2", cx));
-        let buffer3 = cx.new(|cx| Buffer::local("Buffer 3", cx));
-
-        let mut excerpt_ids = Vec::new();
-        let multi_buffer = cx.new(|cx| {
-            let mut multi_buffer = MultiBuffer::new(Capability::ReadWrite);
-            excerpt_ids.extend(multi_buffer.push_excerpts(
-                buffer1.clone(),
-                [ExcerptRange::new(0..buffer1.read(cx).len())],
-                cx,
-            ));
-            excerpt_ids.extend(multi_buffer.push_excerpts(
-                buffer2.clone(),
-                [ExcerptRange::new(0..buffer2.read(cx).len())],
-                cx,
-            ));
-            excerpt_ids.extend(multi_buffer.push_excerpts(
-                buffer3.clone(),
-                [ExcerptRange::new(0..buffer3.read(cx).len())],
-                cx,
-            ));
-
-            multi_buffer
-        });
-
-        let font = test_font();
-        let font_size = px(14.);
-        let font_id = cx.text_system().resolve_font(&font);
-        let mut wrap_width = px(0.);
-        for c in "Buff".chars() {
-            wrap_width += cx
-                .text_system()
-                .advance(font_id, font_size, c)
-                .unwrap()
-                .width;
-        }
-
-        let multi_buffer_snapshot = multi_buffer.read(cx).snapshot(cx);
-        let (_, inlay_snapshot) = InlayMap::new(multi_buffer_snapshot);
-        let (_, fold_snapshot) = FoldMap::new(inlay_snapshot);
-        let (_, tab_snapshot) = TabMap::new(fold_snapshot, 4.try_into().unwrap());
-        let (_, wraps_snapshot) = WrapMap::new(tab_snapshot, font, font_size, Some(wrap_width), cx);
-
-        let block_map = BlockMap::new(wraps_snapshot.clone(), 1, 1);
-        let snapshot = block_map.read(wraps_snapshot, Default::default());
-
-        // Each excerpt has a header above and footer below. Excerpts are also *separated* by a newline.
-        assert_eq!(snapshot.text(), "\nBuff\ner 1\n\nBuff\ner 2\n\nBuff\ner 3");
-
-        let blocks: Vec<_> = snapshot
-            .blocks_in_range(BlockRow(0)..BlockRow(u32::MAX))
-            .map(|(row, block)| (row.0..row.0 + block.height(), block.id()))
-            .collect();
-        assert_eq!(
-            blocks,
-            vec![
-                (0..1, BlockId::ExcerptBoundary(excerpt_ids[0])), // path, header
-                (3..4, BlockId::ExcerptBoundary(excerpt_ids[1])), // path, header
-                (6..7, BlockId::ExcerptBoundary(excerpt_ids[2])), // path, header
-            ]
-        );
-    }
-
-    #[gpui::test]
-    fn test_replace_with_heights(cx: &mut gpui::TestAppContext) {
-        cx.update(init_test);
-
-        let text = "aaa\nbbb\nccc\nddd";
-
-        let buffer = cx.update(|cx| MultiBuffer::build_simple(text, cx));
-        let buffer_snapshot = cx.update(|cx| buffer.read(cx).snapshot(cx));
-        let _subscription = buffer.update(cx, |buffer, _| buffer.subscribe());
-        let (_inlay_map, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
-        let (_fold_map, fold_snapshot) = FoldMap::new(inlay_snapshot);
-        let (_tab_map, tab_snapshot) = TabMap::new(fold_snapshot, 1.try_into().unwrap());
-        let (_wrap_map, wraps_snapshot) =
-            cx.update(|cx| WrapMap::new(tab_snapshot, font("Helvetica"), px(14.0), None, cx));
-        let mut block_map = BlockMap::new(wraps_snapshot.clone(), 1, 1);
-
-        let mut writer = block_map.write(wraps_snapshot.clone(), Default::default());
-        let block_ids = writer.insert(vec![
-            BlockProperties {
-                style: BlockStyle::Fixed,
-                placement: BlockPlacement::Above(buffer_snapshot.anchor_after(Point::new(1, 0))),
-                height: Some(1),
-                render: Arc::new(|_| div().into_any()),
-                priority: 0,
-            },
-            BlockProperties {
-                style: BlockStyle::Fixed,
-                placement: BlockPlacement::Above(buffer_snapshot.anchor_after(Point::new(1, 2))),
-                height: Some(2),
-                render: Arc::new(|_| div().into_any()),
-                priority: 0,
-            },
-            BlockProperties {
-                style: BlockStyle::Fixed,
-                placement: BlockPlacement::Below(buffer_snapshot.anchor_after(Point::new(3, 3))),
-                height: Some(3),
-                render: Arc::new(|_| div().into_any()),
-                priority: 0,
-            },
-        ]);
-
-        {
-            let snapshot = block_map.read(wraps_snapshot.clone(), Default::default());
-            assert_eq!(snapshot.text(), "aaa\n\n\n\nbbb\nccc\nddd\n\n\n");
-
-            let mut block_map_writer = block_map.write(wraps_snapshot.clone(), Default::default());
-
-            let mut new_heights = HashMap::default();
-            new_heights.insert(block_ids[0], 2);
-            block_map_writer.resize(new_heights);
-            let snapshot = block_map.read(wraps_snapshot.clone(), Default::default());
-            assert_eq!(snapshot.text(), "aaa\n\n\n\n\nbbb\nccc\nddd\n\n\n");
-        }
-
-        {
-            let mut block_map_writer = block_map.write(wraps_snapshot.clone(), Default::default());
-
-            let mut new_heights = HashMap::default();
-            new_heights.insert(block_ids[0], 1);
-            block_map_writer.resize(new_heights);
-
-            let snapshot = block_map.read(wraps_snapshot.clone(), Default::default());
-            assert_eq!(snapshot.text(), "aaa\n\n\n\nbbb\nccc\nddd\n\n\n");
-        }
-
-        {
-            let mut block_map_writer = block_map.write(wraps_snapshot.clone(), Default::default());
-
-            let mut new_heights = HashMap::default();
-            new_heights.insert(block_ids[0], 0);
-            block_map_writer.resize(new_heights);
-
-            let snapshot = block_map.read(wraps_snapshot.clone(), Default::default());
-            assert_eq!(snapshot.text(), "aaa\n\n\nbbb\nccc\nddd\n\n\n");
-        }
-
-        {
-            let mut block_map_writer = block_map.write(wraps_snapshot.clone(), Default::default());
-
-            let mut new_heights = HashMap::default();
-            new_heights.insert(block_ids[0], 3);
-            block_map_writer.resize(new_heights);
-
-            let snapshot = block_map.read(wraps_snapshot.clone(), Default::default());
-            assert_eq!(snapshot.text(), "aaa\n\n\n\n\n\nbbb\nccc\nddd\n\n\n");
-        }
-
-        {
-            let mut block_map_writer = block_map.write(wraps_snapshot.clone(), Default::default());
-
-            let mut new_heights = HashMap::default();
-            new_heights.insert(block_ids[0], 3);
-            block_map_writer.resize(new_heights);
-
-            let snapshot = block_map.read(wraps_snapshot, Default::default());
-            // Same height as before, should remain the same
-            assert_eq!(snapshot.text(), "aaa\n\n\n\n\n\nbbb\nccc\nddd\n\n\n");
-        }
-    }
-
-    #[gpui::test]
-    fn test_blocks_on_wrapped_lines(cx: &mut gpui::TestAppContext) {
-        cx.update(init_test);
-
-        let text = "one two three\nfour five six\nseven eight";
-
-        let buffer = cx.update(|cx| MultiBuffer::build_simple(text, cx));
-        let buffer_snapshot = cx.update(|cx| buffer.read(cx).snapshot(cx));
-        let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
-        let (_, fold_snapshot) = FoldMap::new(inlay_snapshot);
-        let (_, tab_snapshot) = TabMap::new(fold_snapshot, 4.try_into().unwrap());
-        let (_, wraps_snapshot) = cx.update(|cx| {
-            WrapMap::new(tab_snapshot, font("Helvetica"), px(14.0), Some(px(90.)), cx)
-        });
-        let mut block_map = BlockMap::new(wraps_snapshot.clone(), 1, 1);
-
-        let mut writer = block_map.write(wraps_snapshot.clone(), Default::default());
-        writer.insert(vec![
-            BlockProperties {
-                style: BlockStyle::Fixed,
-                placement: BlockPlacement::Above(buffer_snapshot.anchor_after(Point::new(1, 12))),
-                render: Arc::new(|_| div().into_any()),
-                height: Some(1),
-                priority: 0,
-            },
-            BlockProperties {
-                style: BlockStyle::Fixed,
-                placement: BlockPlacement::Below(buffer_snapshot.anchor_after(Point::new(1, 1))),
-                render: Arc::new(|_| div().into_any()),
-                height: Some(1),
-                priority: 0,
-            },
-        ]);
-
-        // Blocks with an 'above' disposition go above their corresponding buffer line.
-        // Blocks with a 'below' disposition go below their corresponding buffer line.
-        let snapshot = block_map.read(wraps_snapshot, Default::default());
-        assert_eq!(
-            snapshot.text(),
-            "one two \nthree\n\nfour five \nsix\n\nseven \neight"
-        );
-    }
-
-    #[gpui::test]
-    fn test_replace_lines(cx: &mut gpui::TestAppContext) {
-        cx.update(init_test);
-
-        let text = "line1\nline2\nline3\nline4\nline5";
-
-        let buffer = cx.update(|cx| MultiBuffer::build_simple(text, cx));
-        let buffer_subscription = buffer.update(cx, |buffer, _cx| buffer.subscribe());
-        let buffer_snapshot = cx.update(|cx| buffer.read(cx).snapshot(cx));
-        let (mut inlay_map, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
-        let (mut fold_map, fold_snapshot) = FoldMap::new(inlay_snapshot);
-        let tab_size = 1.try_into().unwrap();
-        let (mut tab_map, tab_snapshot) = TabMap::new(fold_snapshot, tab_size);
-        let (wrap_map, wraps_snapshot) =
-            cx.update(|cx| WrapMap::new(tab_snapshot, font("Helvetica"), px(14.0), None, cx));
-        let mut block_map = BlockMap::new(wraps_snapshot.clone(), 1, 1);
-
-        let mut writer = block_map.write(wraps_snapshot.clone(), Default::default());
-        let replace_block_id = writer.insert(vec![BlockProperties {
-            style: BlockStyle::Fixed,
-            placement: BlockPlacement::Replace(
-                buffer_snapshot.anchor_after(Point::new(1, 3))
-                    ..=buffer_snapshot.anchor_before(Point::new(3, 1)),
-            ),
-            height: Some(4),
-            render: Arc::new(|_| div().into_any()),
-            priority: 0,
-        }])[0];
-
-        let blocks_snapshot = block_map.read(wraps_snapshot, Default::default());
-        assert_eq!(blocks_snapshot.text(), "line1\n\n\n\n\nline5");
-
-        let buffer_snapshot = buffer.update(cx, |buffer, cx| {
-            buffer.edit([(Point::new(2, 0)..Point::new(3, 0), "")], None, cx);
-            buffer.snapshot(cx)
-        });
-        let (inlay_snapshot, inlay_edits) =
-            inlay_map.sync(buffer_snapshot, buffer_subscription.consume().into_inner());
-        let (fold_snapshot, fold_edits) = fold_map.read(inlay_snapshot, inlay_edits);
-        let (tab_snapshot, tab_edits) = tab_map.sync(fold_snapshot, fold_edits, tab_size);
-        let (wraps_snapshot, wrap_edits) = wrap_map.update(cx, |wrap_map, cx| {
-            wrap_map.sync(tab_snapshot, tab_edits, cx)
-        });
-        let blocks_snapshot = block_map.read(wraps_snapshot, wrap_edits);
-        assert_eq!(blocks_snapshot.text(), "line1\n\n\n\n\nline5");
-
-        let buffer_snapshot = buffer.update(cx, |buffer, cx| {
-            buffer.edit(
-                [(
-                    Point::new(1, 5)..Point::new(1, 5),
-                    "\nline 2.1\nline2.2\nline 2.3\nline 2.4",
-                )],
-                None,
-                cx,
-            );
-            buffer.snapshot(cx)
-        });
-        let (inlay_snapshot, inlay_edits) = inlay_map.sync(
-            buffer_snapshot.clone(),
-            buffer_subscription.consume().into_inner(),
-        );
-        let (fold_snapshot, fold_edits) = fold_map.read(inlay_snapshot, inlay_edits);
-        let (tab_snapshot, tab_edits) = tab_map.sync(fold_snapshot, fold_edits, tab_size);
-        let (wraps_snapshot, wrap_edits) = wrap_map.update(cx, |wrap_map, cx| {
-            wrap_map.sync(tab_snapshot, tab_edits, cx)
-        });
-        let blocks_snapshot = block_map.read(wraps_snapshot.clone(), wrap_edits);
-        assert_eq!(blocks_snapshot.text(), "line1\n\n\n\n\nline5");
-
-        // Blocks inserted right above the start or right below the end of the replaced region are hidden.
-        let mut writer = block_map.write(wraps_snapshot.clone(), Default::default());
-        writer.insert(vec![
-            BlockProperties {
-                style: BlockStyle::Fixed,
-                placement: BlockPlacement::Above(buffer_snapshot.anchor_after(Point::new(0, 3))),
-                height: Some(1),
-                render: Arc::new(|_| div().into_any()),
-                priority: 0,
-            },
-            BlockProperties {
-                style: BlockStyle::Fixed,
-                placement: BlockPlacement::Above(buffer_snapshot.anchor_after(Point::new(1, 3))),
-                height: Some(1),
-                render: Arc::new(|_| div().into_any()),
-                priority: 0,
-            },
-            BlockProperties {
-                style: BlockStyle::Fixed,
-                placement: BlockPlacement::Below(buffer_snapshot.anchor_after(Point::new(6, 2))),
-                height: Some(1),
-                render: Arc::new(|_| div().into_any()),
-                priority: 0,
-            },
-        ]);
-        let blocks_snapshot = block_map.read(wraps_snapshot.clone(), Default::default());
-        assert_eq!(blocks_snapshot.text(), "\nline1\n\n\n\n\nline5");
-
-        // Ensure blocks inserted *inside* replaced region are hidden.
-        let mut writer = block_map.write(wraps_snapshot.clone(), Default::default());
-        writer.insert(vec![
-            BlockProperties {
-                style: BlockStyle::Fixed,
-                placement: BlockPlacement::Below(buffer_snapshot.anchor_after(Point::new(1, 3))),
-                height: Some(1),
-                render: Arc::new(|_| div().into_any()),
-                priority: 0,
-            },
-            BlockProperties {
-                style: BlockStyle::Fixed,
-                placement: BlockPlacement::Above(buffer_snapshot.anchor_after(Point::new(2, 1))),
-                height: Some(1),
-                render: Arc::new(|_| div().into_any()),
-                priority: 0,
-            },
-            BlockProperties {
-                style: BlockStyle::Fixed,
-                placement: BlockPlacement::Above(buffer_snapshot.anchor_after(Point::new(6, 1))),
-                height: Some(1),
-                render: Arc::new(|_| div().into_any()),
-                priority: 0,
-            },
-        ]);
-        let blocks_snapshot = block_map.read(wraps_snapshot.clone(), Default::default());
-        assert_eq!(blocks_snapshot.text(), "\nline1\n\n\n\n\nline5");
-
-        // Removing the replace block shows all the hidden blocks again.
-        let mut writer = block_map.write(wraps_snapshot.clone(), Default::default());
-        writer.remove(HashSet::from_iter([replace_block_id]));
-        let blocks_snapshot = block_map.read(wraps_snapshot, Default::default());
-        assert_eq!(
-            blocks_snapshot.text(),
-            "\nline1\n\nline2\n\n\nline 2.1\nline2.2\nline 2.3\nline 2.4\n\nline4\n\nline5"
-        );
-    }
-
-    #[gpui::test]
-    fn test_custom_blocks_inside_buffer_folds(cx: &mut gpui::TestAppContext) {
-        cx.update(init_test);
-
-        let text = "111\n222\n333\n444\n555\n666";
-
-        let buffer = cx.update(|cx| {
-            MultiBuffer::build_multi(
-                [
-                    (text, vec![Point::new(0, 0)..Point::new(0, 3)]),
-                    (
-                        text,
-                        vec![
-                            Point::new(1, 0)..Point::new(1, 3),
-                            Point::new(2, 0)..Point::new(2, 3),
-                            Point::new(3, 0)..Point::new(3, 3),
-                        ],
-                    ),
-                    (
-                        text,
-                        vec![
-                            Point::new(4, 0)..Point::new(4, 3),
-                            Point::new(5, 0)..Point::new(5, 3),
-                        ],
-                    ),
-                ],
-                cx,
-            )
-        });
-        let buffer_snapshot = cx.update(|cx| buffer.read(cx).snapshot(cx));
-        let buffer_ids = buffer_snapshot
-            .excerpts()
-            .map(|(_, buffer_snapshot, _)| buffer_snapshot.remote_id())
-            .dedup()
-            .collect::<Vec<_>>();
-        assert_eq!(buffer_ids.len(), 3);
-        let buffer_id_1 = buffer_ids[0];
-        let buffer_id_2 = buffer_ids[1];
-        let buffer_id_3 = buffer_ids[2];
-
-        let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
-        let (_, fold_snapshot) = FoldMap::new(inlay_snapshot);
-        let (_, tab_snapshot) = TabMap::new(fold_snapshot, 4.try_into().unwrap());
-        let (_, wrap_snapshot) =
-            cx.update(|cx| WrapMap::new(tab_snapshot, font("Helvetica"), px(14.0), None, cx));
-        let mut block_map = BlockMap::new(wrap_snapshot.clone(), 2, 1);
-        let blocks_snapshot = block_map.read(wrap_snapshot.clone(), Patch::default());
-
-        assert_eq!(
-            blocks_snapshot.text(),
-            "\n\n111\n\n\n222\n\n333\n\n444\n\n\n555\n\n666"
-        );
-        assert_eq!(
-            blocks_snapshot
-                .row_infos(BlockRow(0))
-                .map(|i| i.buffer_row)
-                .collect::<Vec<_>>(),
-            vec![
-                None,
-                None,
-                Some(0),
-                None,
-                None,
-                Some(1),
-                None,
-                Some(2),
-                None,
-                Some(3),
-                None,
-                None,
-                Some(4),
-                None,
-                Some(5),
-            ]
-        );
-
-        let mut writer = block_map.write(wrap_snapshot.clone(), Patch::default());
-        let excerpt_blocks_2 = writer.insert(vec![
-            BlockProperties {
-                style: BlockStyle::Fixed,
-                placement: BlockPlacement::Above(buffer_snapshot.anchor_after(Point::new(1, 0))),
-                height: Some(1),
-                render: Arc::new(|_| div().into_any()),
-                priority: 0,
-            },
-            BlockProperties {
-                style: BlockStyle::Fixed,
-                placement: BlockPlacement::Above(buffer_snapshot.anchor_after(Point::new(2, 0))),
-                height: Some(1),
-                render: Arc::new(|_| div().into_any()),
-                priority: 0,
-            },
-            BlockProperties {
-                style: BlockStyle::Fixed,
-                placement: BlockPlacement::Below(buffer_snapshot.anchor_after(Point::new(3, 0))),
-                height: Some(1),
-                render: Arc::new(|_| div().into_any()),
-                priority: 0,
-            },
-        ]);
-        let excerpt_blocks_3 = writer.insert(vec![
-            BlockProperties {
-                style: BlockStyle::Fixed,
-                placement: BlockPlacement::Above(buffer_snapshot.anchor_after(Point::new(4, 0))),
-                height: Some(1),
-                render: Arc::new(|_| div().into_any()),
-                priority: 0,
-            },
-            BlockProperties {
-                style: BlockStyle::Fixed,
-                placement: BlockPlacement::Below(buffer_snapshot.anchor_after(Point::new(5, 0))),
-                height: Some(1),
-                render: Arc::new(|_| div().into_any()),
-                priority: 0,
-            },
-        ]);
-
-        let blocks_snapshot = block_map.read(wrap_snapshot.clone(), Patch::default());
-        assert_eq!(
-            blocks_snapshot.text(),
-            "\n\n111\n\n\n\n222\n\n\n333\n\n444\n\n\n\n\n555\n\n666\n"
-        );
-        assert_eq!(
-            blocks_snapshot
-                .row_infos(BlockRow(0))
-                .map(|i| i.buffer_row)
-                .collect::<Vec<_>>(),
-            vec![
-                None,
-                None,
-                Some(0),
-                None,
-                None,
-                None,
-                Some(1),
-                None,
-                None,
-                Some(2),
-                None,
-                Some(3),
-                None,
-                None,
-                None,
-                None,
-                Some(4),
-                None,
-                Some(5),
-                None,
-            ]
-        );
-
-        let mut writer = block_map.write(wrap_snapshot.clone(), Patch::default());
-        buffer.read_with(cx, |buffer, cx| {
-            writer.fold_buffers([buffer_id_1], buffer, cx);
-        });
-        let excerpt_blocks_1 = writer.insert(vec![BlockProperties {
-            style: BlockStyle::Fixed,
-            placement: BlockPlacement::Above(buffer_snapshot.anchor_after(Point::new(0, 0))),
-            height: Some(1),
-            render: Arc::new(|_| div().into_any()),
-            priority: 0,
-        }]);
-        let blocks_snapshot = block_map.read(wrap_snapshot.clone(), Patch::default());
-        let blocks = blocks_snapshot
-            .blocks_in_range(BlockRow(0)..BlockRow(u32::MAX))
-            .collect::<Vec<_>>();
-        for (_, block) in &blocks {
-            if let BlockId::Custom(custom_block_id) = block.id() {
-                assert!(
-                    !excerpt_blocks_1.contains(&custom_block_id),
-                    "Should have no blocks from the folded buffer"
-                );
-                assert!(
-                    excerpt_blocks_2.contains(&custom_block_id)
-                        || excerpt_blocks_3.contains(&custom_block_id),
-                    "Should have only blocks from unfolded buffers"
-                );
-            }
-        }
-        assert_eq!(
-            1,
-            blocks
-                .iter()
-                .filter(|(_, block)| matches!(block, Block::FoldedBuffer { .. }))
-                .count(),
-            "Should have one folded block, producing a header of the second buffer"
-        );
-        assert_eq!(
-            blocks_snapshot.text(),
-            "\n\n\n\n\n222\n\n\n333\n\n444\n\n\n\n\n555\n\n666\n"
-        );
-        assert_eq!(
-            blocks_snapshot
-                .row_infos(BlockRow(0))
-                .map(|i| i.buffer_row)
-                .collect::<Vec<_>>(),
-            vec![
-                None,
-                None,
-                None,
-                None,
-                None,
-                Some(1),
-                None,
-                None,
-                Some(2),
-                None,
-                Some(3),
-                None,
-                None,
-                None,
-                None,
-                Some(4),
-                None,
-                Some(5),
-                None,
-            ]
-        );
-
-        let mut writer = block_map.write(wrap_snapshot.clone(), Patch::default());
-        buffer.read_with(cx, |buffer, cx| {
-            writer.fold_buffers([buffer_id_2], buffer, cx);
-        });
-        let blocks_snapshot = block_map.read(wrap_snapshot.clone(), Patch::default());
-        let blocks = blocks_snapshot
-            .blocks_in_range(BlockRow(0)..BlockRow(u32::MAX))
-            .collect::<Vec<_>>();
-        for (_, block) in &blocks {
-            if let BlockId::Custom(custom_block_id) = block.id() {
-                assert!(
-                    !excerpt_blocks_1.contains(&custom_block_id),
-                    "Should have no blocks from the folded buffer_1"
-                );
-                assert!(
-                    !excerpt_blocks_2.contains(&custom_block_id),
-                    "Should have no blocks from the folded buffer_2"
-                );
-                assert!(
-                    excerpt_blocks_3.contains(&custom_block_id),
-                    "Should have only blocks from unfolded buffers"
-                );
-            }
-        }
-        assert_eq!(
-            2,
-            blocks
-                .iter()
-                .filter(|(_, block)| matches!(block, Block::FoldedBuffer { .. }))
-                .count(),
-            "Should have two folded blocks, producing headers"
-        );
-        assert_eq!(blocks_snapshot.text(), "\n\n\n\n\n\n\n555\n\n666\n");
-        assert_eq!(
-            blocks_snapshot
-                .row_infos(BlockRow(0))
-                .map(|i| i.buffer_row)
-                .collect::<Vec<_>>(),
-            vec![
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                Some(4),
-                None,
-                Some(5),
-                None,
-            ]
-        );
-
-        let mut writer = block_map.write(wrap_snapshot.clone(), Patch::default());
-        buffer.read_with(cx, |buffer, cx| {
-            writer.unfold_buffers([buffer_id_1], buffer, cx);
-        });
-        let blocks_snapshot = block_map.read(wrap_snapshot.clone(), Patch::default());
-        let blocks = blocks_snapshot
-            .blocks_in_range(BlockRow(0)..BlockRow(u32::MAX))
-            .collect::<Vec<_>>();
-        for (_, block) in &blocks {
-            if let BlockId::Custom(custom_block_id) = block.id() {
-                assert!(
-                    !excerpt_blocks_2.contains(&custom_block_id),
-                    "Should have no blocks from the folded buffer_2"
-                );
-                assert!(
-                    excerpt_blocks_1.contains(&custom_block_id)
-                        || excerpt_blocks_3.contains(&custom_block_id),
-                    "Should have only blocks from unfolded buffers"
-                );
-            }
-        }
-        assert_eq!(
-            1,
-            blocks
-                .iter()
-                .filter(|(_, block)| matches!(block, Block::FoldedBuffer { .. }))
-                .count(),
-            "Should be back to a single folded buffer, producing a header for buffer_2"
-        );
-        assert_eq!(
-            blocks_snapshot.text(),
-            "\n\n\n111\n\n\n\n\n\n555\n\n666\n",
-            "Should have extra newline for 111 buffer, due to a new block added when it was folded"
-        );
-        assert_eq!(
-            blocks_snapshot
-                .row_infos(BlockRow(0))
-                .map(|i| i.buffer_row)
-                .collect::<Vec<_>>(),
-            vec![
-                None,
-                None,
-                None,
-                Some(0),
-                None,
-                None,
-                None,
-                None,
-                None,
-                Some(4),
-                None,
-                Some(5),
-                None,
-            ]
-        );
-
-        let mut writer = block_map.write(wrap_snapshot.clone(), Patch::default());
-        buffer.read_with(cx, |buffer, cx| {
-            writer.fold_buffers([buffer_id_3], buffer, cx);
-        });
-        let blocks_snapshot = block_map.read(wrap_snapshot, Patch::default());
-        let blocks = blocks_snapshot
-            .blocks_in_range(BlockRow(0)..BlockRow(u32::MAX))
-            .collect::<Vec<_>>();
-        for (_, block) in &blocks {
-            if let BlockId::Custom(custom_block_id) = block.id() {
-                assert!(
-                    excerpt_blocks_1.contains(&custom_block_id),
-                    "Should have no blocks from the folded buffer_1"
-                );
-                assert!(
-                    !excerpt_blocks_2.contains(&custom_block_id),
-                    "Should have only blocks from unfolded buffers"
-                );
-                assert!(
-                    !excerpt_blocks_3.contains(&custom_block_id),
-                    "Should have only blocks from unfolded buffers"
-                );
-            }
-        }
-
-        assert_eq!(
-            blocks_snapshot.text(),
-            "\n\n\n111\n\n\n\n",
-            "Should have a single, first buffer left after folding"
-        );
-        assert_eq!(
-            blocks_snapshot
-                .row_infos(BlockRow(0))
-                .map(|i| i.buffer_row)
-                .collect::<Vec<_>>(),
-            vec![None, None, None, Some(0), None, None, None, None,]
-        );
-    }
-
-    #[gpui::test]
-    fn test_basic_buffer_fold(cx: &mut gpui::TestAppContext) {
-        cx.update(init_test);
-
-        let text = "111";
-
-        let buffer = cx.update(|cx| {
-            MultiBuffer::build_multi([(text, vec![Point::new(0, 0)..Point::new(0, 3)])], cx)
-        });
-        let buffer_snapshot = cx.update(|cx| buffer.read(cx).snapshot(cx));
-        let buffer_ids = buffer_snapshot
-            .excerpts()
-            .map(|(_, buffer_snapshot, _)| buffer_snapshot.remote_id())
-            .dedup()
-            .collect::<Vec<_>>();
-        assert_eq!(buffer_ids.len(), 1);
-        let buffer_id = buffer_ids[0];
-
-        let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot);
-        let (_, fold_snapshot) = FoldMap::new(inlay_snapshot);
-        let (_, tab_snapshot) = TabMap::new(fold_snapshot, 4.try_into().unwrap());
-        let (_, wrap_snapshot) =
-            cx.update(|cx| WrapMap::new(tab_snapshot, font("Helvetica"), px(14.0), None, cx));
-        let mut block_map = BlockMap::new(wrap_snapshot.clone(), 2, 1);
-        let blocks_snapshot = block_map.read(wrap_snapshot.clone(), Patch::default());
-
-        assert_eq!(blocks_snapshot.text(), "\n\n111");
-
-        let mut writer = block_map.write(wrap_snapshot.clone(), Patch::default());
-        buffer.read_with(cx, |buffer, cx| {
-            writer.fold_buffers([buffer_id], buffer, cx);
-        });
-        let blocks_snapshot = block_map.read(wrap_snapshot, Patch::default());
-        let blocks = blocks_snapshot
-            .blocks_in_range(BlockRow(0)..BlockRow(u32::MAX))
-            .collect::<Vec<_>>();
-        assert_eq!(
-            1,
-            blocks
-                .iter()
-                .filter(|(_, block)| { matches!(block, Block::FoldedBuffer { .. }) })
-                .count(),
-            "Should have one folded block, producing a header of the second buffer"
-        );
-        assert_eq!(blocks_snapshot.text(), "\n");
-        assert_eq!(
-            blocks_snapshot
-                .row_infos(BlockRow(0))
-                .map(|i| i.buffer_row)
-                .collect::<Vec<_>>(),
-            vec![None, None],
-            "When fully folded, should be no buffer rows"
-        );
-    }
-
-    #[gpui::test(iterations = 60)]
-    fn test_random_blocks(cx: &mut gpui::TestAppContext, mut rng: StdRng) {
-        cx.update(init_test);
-
-        let operations = env::var("OPERATIONS")
-            .map(|i| i.parse().expect("invalid `OPERATIONS` variable"))
-            .unwrap_or(10);
-
-        let wrap_width = if rng.random_bool(0.2) {
-            None
-        } else {
-            Some(px(rng.random_range(0.0..=100.0)))
-        };
-        let tab_size = 1.try_into().unwrap();
-        let font_size = px(14.0);
-        let buffer_start_header_height = rng.random_range(1..=5);
-        let excerpt_header_height = rng.random_range(1..=5);
-
-        log::info!("Wrap width: {:?}", wrap_width);
-        log::info!("Excerpt Header Height: {:?}", excerpt_header_height);
-        let is_singleton = rng.random();
-        let buffer = if is_singleton {
-            let len = rng.random_range(0..10);
-            let text = RandomCharIter::new(&mut rng).take(len).collect::<String>();
-            log::info!("initial singleton buffer text: {:?}", text);
-            cx.update(|cx| MultiBuffer::build_simple(&text, cx))
-        } else {
-            cx.update(|cx| {
-                let multibuffer = MultiBuffer::build_random(&mut rng, cx);
-                log::info!(
-                    "initial multi-buffer text: {:?}",
-                    multibuffer.read(cx).read(cx).text()
-                );
-                multibuffer
-            })
-        };
-
-        let mut buffer_snapshot = cx.update(|cx| buffer.read(cx).snapshot(cx));
-        let (mut inlay_map, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
-        let (mut fold_map, fold_snapshot) = FoldMap::new(inlay_snapshot);
-        let (mut tab_map, tab_snapshot) = TabMap::new(fold_snapshot, 4.try_into().unwrap());
-        let font = test_font();
-        let (wrap_map, wraps_snapshot) =
-            cx.update(|cx| WrapMap::new(tab_snapshot, font, font_size, wrap_width, cx));
-        let mut block_map = BlockMap::new(
-            wraps_snapshot,
-            buffer_start_header_height,
-            excerpt_header_height,
-        );
-
-        for _ in 0..operations {
-            let mut buffer_edits = Vec::new();
-            match rng.random_range(0..=100) {
-                0..=19 => {
-                    let wrap_width = if rng.random_bool(0.2) {
-                        None
-                    } else {
-                        Some(px(rng.random_range(0.0..=100.0)))
-                    };
-                    log::info!("Setting wrap width to {:?}", wrap_width);
-                    wrap_map.update(cx, |map, cx| map.set_wrap_width(wrap_width, cx));
-                }
-                20..=39 => {
-                    let block_count = rng.random_range(1..=5);
-                    let block_properties = (0..block_count)
-                        .map(|_| {
-                            let buffer = cx.update(|cx| buffer.read(cx).read(cx).clone());
-                            let offset = buffer.clip_offset(
-                                rng.random_range(MultiBufferOffset(0)..=buffer.len()),
-                                Bias::Left,
-                            );
-                            let mut min_height = 0;
-                            let placement = match rng.random_range(0..3) {
-                                0 => {
-                                    min_height = 1;
-                                    let start = buffer.anchor_after(offset);
-                                    let end = buffer.anchor_after(buffer.clip_offset(
-                                        rng.random_range(offset..=buffer.len()),
-                                        Bias::Left,
-                                    ));
-                                    BlockPlacement::Replace(start..=end)
-                                }
-                                1 => BlockPlacement::Above(buffer.anchor_after(offset)),
-                                _ => BlockPlacement::Below(buffer.anchor_after(offset)),
-                            };
-
-                            let height = rng.random_range(min_height..512);
-                            BlockProperties {
-                                style: BlockStyle::Fixed,
-                                placement,
-                                height: Some(height),
-                                render: Arc::new(|_| div().into_any()),
-                                priority: 0,
-                            }
-                        })
-                        .collect::<Vec<_>>();
-
-                    let (inlay_snapshot, inlay_edits) =
-                        inlay_map.sync(buffer_snapshot.clone(), vec![]);
-                    let (fold_snapshot, fold_edits) = fold_map.read(inlay_snapshot, inlay_edits);
-                    let (tab_snapshot, tab_edits) =
-                        tab_map.sync(fold_snapshot, fold_edits, tab_size);
-                    let (wraps_snapshot, wrap_edits) = wrap_map.update(cx, |wrap_map, cx| {
-                        wrap_map.sync(tab_snapshot, tab_edits, cx)
-                    });
-                    let mut block_map = block_map.write(wraps_snapshot, wrap_edits);
-                    let block_ids =
-                        block_map.insert(block_properties.iter().map(|props| BlockProperties {
-                            placement: props.placement.clone(),
-                            height: props.height,
-                            style: props.style,
-                            render: Arc::new(|_| div().into_any()),
-                            priority: 0,
-                        }));
-
-                    for (block_properties, block_id) in block_properties.iter().zip(block_ids) {
-                        log::info!(
-                            "inserted block {:?} with height {:?} and id {:?}",
-                            block_properties
-                                .placement
-                                .as_ref()
-                                .map(|p| p.to_point(&buffer_snapshot)),
-                            block_properties.height,
-                            block_id
-                        );
-                    }
-                }
-                40..=59 if !block_map.custom_blocks.is_empty() => {
-                    let block_count = rng.random_range(1..=4.min(block_map.custom_blocks.len()));
-                    let block_ids_to_remove = block_map
-                        .custom_blocks
-                        .choose_multiple(&mut rng, block_count)
-                        .map(|block| block.id)
-                        .collect::<HashSet<_>>();
-
-                    let (inlay_snapshot, inlay_edits) =
-                        inlay_map.sync(buffer_snapshot.clone(), vec![]);
-                    let (fold_snapshot, fold_edits) = fold_map.read(inlay_snapshot, inlay_edits);
-                    let (tab_snapshot, tab_edits) =
-                        tab_map.sync(fold_snapshot, fold_edits, tab_size);
-                    let (wraps_snapshot, wrap_edits) = wrap_map.update(cx, |wrap_map, cx| {
-                        wrap_map.sync(tab_snapshot, tab_edits, cx)
-                    });
-                    let mut block_map = block_map.write(wraps_snapshot, wrap_edits);
-                    log::info!(
-                        "removing {} blocks: {:?}",
-                        block_ids_to_remove.len(),
-                        block_ids_to_remove
-                    );
-                    block_map.remove(block_ids_to_remove);
-                }
-                60..=79 => {
-                    if buffer.read_with(cx, |buffer, _| buffer.is_singleton()) {
-                        log::info!("Noop fold/unfold operation on a singleton buffer");
-                        continue;
-                    }
-                    let (inlay_snapshot, inlay_edits) =
-                        inlay_map.sync(buffer_snapshot.clone(), vec![]);
-                    let (fold_snapshot, fold_edits) = fold_map.read(inlay_snapshot, inlay_edits);
-                    let (tab_snapshot, tab_edits) =
-                        tab_map.sync(fold_snapshot, fold_edits, tab_size);
-                    let (wraps_snapshot, wrap_edits) = wrap_map.update(cx, |wrap_map, cx| {
-                        wrap_map.sync(tab_snapshot, tab_edits, cx)
-                    });
-                    let mut block_map = block_map.write(wraps_snapshot, wrap_edits);
-                    let (unfolded_buffers, folded_buffers) = buffer.read_with(cx, |buffer, _| {
-                        let folded_buffers = block_map
-                            .0
-                            .folded_buffers
-                            .iter()
-                            .cloned()
-                            .collect::<Vec<_>>();
-                        let mut unfolded_buffers = buffer.excerpt_buffer_ids();
-                        unfolded_buffers.dedup();
-                        log::debug!("All buffers {unfolded_buffers:?}");
-                        log::debug!("Folded buffers {folded_buffers:?}");
-                        unfolded_buffers
-                            .retain(|buffer_id| !block_map.0.folded_buffers.contains(buffer_id));
-                        (unfolded_buffers, folded_buffers)
-                    });
-                    let mut folded_count = folded_buffers.len();
-                    let mut unfolded_count = unfolded_buffers.len();
-
-                    let fold = !unfolded_buffers.is_empty() && rng.random_bool(0.5);
-                    let unfold = !folded_buffers.is_empty() && rng.random_bool(0.5);
-                    if !fold && !unfold {
-                        log::info!(
-                            "Noop fold/unfold operation. Unfolded buffers: {unfolded_count}, folded buffers: {folded_count}"
-                        );
-                        continue;
-                    }
-
-                    buffer.update(cx, |buffer, cx| {
-                        if fold {
-                            let buffer_to_fold =
-                                unfolded_buffers[rng.random_range(0..unfolded_buffers.len())];
-                            log::info!("Folding {buffer_to_fold:?}");
-                            let related_excerpts = buffer_snapshot
-                                .excerpts()
-                                .filter_map(|(excerpt_id, buffer, range)| {
-                                    if buffer.remote_id() == buffer_to_fold {
-                                        Some((
-                                            excerpt_id,
-                                            buffer
-                                                .text_for_range(range.context)
-                                                .collect::<String>(),
-                                        ))
-                                    } else {
-                                        None
-                                    }
-                                })
-                                .collect::<Vec<_>>();
-                            log::info!(
-                                "Folding {buffer_to_fold:?}, related excerpts: {related_excerpts:?}"
-                            );
-                            folded_count += 1;
-                            unfolded_count -= 1;
-                            block_map.fold_buffers([buffer_to_fold], buffer, cx);
-                        }
-                        if unfold {
-                            let buffer_to_unfold =
-                                folded_buffers[rng.random_range(0..folded_buffers.len())];
-                            log::info!("Unfolding {buffer_to_unfold:?}");
-                            unfolded_count += 1;
-                            folded_count -= 1;
-                            block_map.unfold_buffers([buffer_to_unfold], buffer, cx);
-                        }
-                        log::info!(
-                            "Unfolded buffers: {unfolded_count}, folded buffers: {folded_count}"
-                        );
-                    });
-                }
-                _ => {
-                    buffer.update(cx, |buffer, cx| {
-                        let mutation_count = rng.random_range(1..=5);
-                        let subscription = buffer.subscribe();
-                        buffer.randomly_mutate(&mut rng, mutation_count, cx);
-                        buffer_snapshot = buffer.snapshot(cx);
-                        buffer_edits.extend(subscription.consume());
-                        log::info!("buffer text: {:?}", buffer_snapshot.text());
-                    });
-                }
-            }
-
-            let (inlay_snapshot, inlay_edits) =
-                inlay_map.sync(buffer_snapshot.clone(), buffer_edits);
-            let (fold_snapshot, fold_edits) = fold_map.read(inlay_snapshot, inlay_edits);
-            let (tab_snapshot, tab_edits) = tab_map.sync(fold_snapshot, fold_edits, tab_size);
-            let (wraps_snapshot, wrap_edits) = wrap_map.update(cx, |wrap_map, cx| {
-                wrap_map.sync(tab_snapshot, tab_edits, cx)
-            });
-            let blocks_snapshot = block_map.read(wraps_snapshot.clone(), wrap_edits);
-            assert_eq!(
-                blocks_snapshot.transforms.summary().input_rows,
-                wraps_snapshot.max_point().row() + RowDelta(1)
-            );
-            log::info!("wrapped text: {:?}", wraps_snapshot.text());
-            log::info!("blocks text: {:?}", blocks_snapshot.text());
-
-            let mut expected_blocks = Vec::new();
-            expected_blocks.extend(block_map.custom_blocks.iter().filter_map(|block| {
-                Some((
-                    block.placement.to_wrap_row(&wraps_snapshot)?,
-                    Block::Custom(block.clone()),
-                ))
-            }));
-
-            let mut inlay_point_cursor = wraps_snapshot.inlay_point_cursor();
-            let mut tab_point_cursor = wraps_snapshot.tab_point_cursor();
-            let mut fold_point_cursor = wraps_snapshot.fold_point_cursor();
-            let mut wrap_point_cursor = wraps_snapshot.wrap_point_cursor();
-
-            // Note that this needs to be synced with the related section in BlockMap::sync
-            expected_blocks.extend(block_map.header_and_footer_blocks(
-                &buffer_snapshot,
-                MultiBufferOffset(0)..,
-                |point, bias| {
-                    wrap_point_cursor
-                        .map(
-                            tab_point_cursor
-                                .map(fold_point_cursor.map(inlay_point_cursor.map(point), bias)),
-                        )
-                        .row()
-                },
-            ));
-
-            BlockMap::sort_blocks(&mut expected_blocks);
-
-            for (placement, block) in &expected_blocks {
-                log::info!(
-                    "Block {:?} placement: {:?} Height: {:?}",
-                    block.id(),
-                    placement,
-                    block.height()
-                );
-            }
-
-            let mut sorted_blocks_iter = expected_blocks.into_iter().peekable();
-
-            let input_buffer_rows = buffer_snapshot
-                .row_infos(MultiBufferRow(0))
-                .map(|row| row.buffer_row)
-                .collect::<Vec<_>>();
-            let mut expected_buffer_rows = Vec::new();
-            let mut expected_text = String::new();
-            let mut expected_block_positions = Vec::new();
-            let mut expected_replaced_buffer_rows = HashSet::default();
-            let input_text = wraps_snapshot.text();
-
-            // Loop over the input lines, creating (N - 1) empty lines for
-            // blocks of height N.
-            //
-            // It's important to note that output *starts* as one empty line,
-            // so we special case row 0 to assume a leading '\n'.
-            //
-            // Linehood is the birthright of strings.
-            let input_text_lines = input_text.split('\n').enumerate().peekable();
-            let mut block_row = 0;
-            for (wrap_row, input_line) in input_text_lines {
-                let wrap_row = WrapRow(wrap_row as u32);
-                let multibuffer_row = wraps_snapshot
-                    .to_point(WrapPoint::new(wrap_row, 0), Bias::Left)
-                    .row;
-
-                // Create empty lines for the above block
-                while let Some((placement, block)) = sorted_blocks_iter.peek() {
-                    if *placement.start() == wrap_row && block.place_above() {
-                        let (_, block) = sorted_blocks_iter.next().unwrap();
-                        expected_block_positions.push((block_row, block.id()));
-                        if block.height() > 0 {
-                            let text = "\n".repeat((block.height() - 1) as usize);
-                            if block_row > 0 {
-                                expected_text.push('\n')
-                            }
-                            expected_text.push_str(&text);
-                            for _ in 0..block.height() {
-                                expected_buffer_rows.push(None);
-                            }
-                            block_row += block.height();
-                        }
-                    } else {
-                        break;
-                    }
-                }
-
-                // Skip lines within replace blocks, then create empty lines for the replace block's height
-                let mut is_in_replace_block = false;
-                if let Some((BlockPlacement::Replace(replace_range), block)) =
-                    sorted_blocks_iter.peek()
-                    && wrap_row >= *replace_range.start()
-                {
-                    is_in_replace_block = true;
-
-                    if wrap_row == *replace_range.start() {
-                        if matches!(block, Block::FoldedBuffer { .. }) {
-                            expected_buffer_rows.push(None);
-                        } else {
-                            expected_buffer_rows.push(input_buffer_rows[multibuffer_row as usize]);
-                        }
-                    }
-
-                    if wrap_row == *replace_range.end() {
-                        expected_block_positions.push((block_row, block.id()));
-                        let text = "\n".repeat((block.height() - 1) as usize);
-                        if block_row > 0 {
-                            expected_text.push('\n');
-                        }
-                        expected_text.push_str(&text);
-
-                        for _ in 1..block.height() {
-                            expected_buffer_rows.push(None);
-                        }
-                        block_row += block.height();
-
-                        sorted_blocks_iter.next();
-                    }
-                }
-
-                if is_in_replace_block {
-                    expected_replaced_buffer_rows.insert(MultiBufferRow(multibuffer_row));
-                } else {
-                    let buffer_row = input_buffer_rows[multibuffer_row as usize];
-                    let soft_wrapped = wraps_snapshot
-                        .to_tab_point(WrapPoint::new(wrap_row, 0))
-                        .column()
-                        > 0;
-                    expected_buffer_rows.push(if soft_wrapped { None } else { buffer_row });
-                    if block_row > 0 {
-                        expected_text.push('\n');
-                    }
-                    expected_text.push_str(input_line);
-                    block_row += 1;
-                }
-
-                while let Some((placement, block)) = sorted_blocks_iter.peek() {
-                    if *placement.end() == wrap_row && block.place_below() {
-                        let (_, block) = sorted_blocks_iter.next().unwrap();
-                        expected_block_positions.push((block_row, block.id()));
-                        if block.height() > 0 {
-                            let text = "\n".repeat((block.height() - 1) as usize);
-                            if block_row > 0 {
-                                expected_text.push('\n')
-                            }
-                            expected_text.push_str(&text);
-                            for _ in 0..block.height() {
-                                expected_buffer_rows.push(None);
-                            }
-                            block_row += block.height();
-                        }
-                    } else {
-                        break;
-                    }
-                }
-            }
-
-            let expected_lines = expected_text.split('\n').collect::<Vec<_>>();
-            let expected_row_count = expected_lines.len();
-            log::info!("expected text: {expected_text:?}");
-
-            assert_eq!(
-                blocks_snapshot.max_point().row + 1,
-                expected_row_count as u32,
-                "actual row count != expected row count",
-            );
-            assert_eq!(
-                blocks_snapshot.text(),
-                expected_text,
-                "actual text != expected text",
-            );
-
-            for start_row in 0..expected_row_count {
-                let end_row = rng.random_range(start_row + 1..=expected_row_count);
-                let mut expected_text = expected_lines[start_row..end_row].join("\n");
-                if end_row < expected_row_count {
-                    expected_text.push('\n');
-                }
-
-                let actual_text = blocks_snapshot
-                    .chunks(
-                        BlockRow(start_row as u32)..BlockRow(end_row as u32),
-                        false,
-                        false,
-                        Highlights::default(),
-                    )
-                    .map(|chunk| chunk.text)
-                    .collect::<String>();
-                assert_eq!(
-                    actual_text,
-                    expected_text,
-                    "incorrect text starting row row range {:?}",
-                    start_row..end_row
-                );
-                assert_eq!(
-                    blocks_snapshot
-                        .row_infos(BlockRow(start_row as u32))
-                        .map(|row_info| row_info.buffer_row)
-                        .collect::<Vec<_>>(),
-                    &expected_buffer_rows[start_row..],
-                    "incorrect buffer_rows starting at row {:?}",
-                    start_row
-                );
-            }
-
-            assert_eq!(
-                blocks_snapshot
-                    .blocks_in_range(BlockRow(0)..BlockRow(expected_row_count as u32))
-                    .map(|(row, block)| (row.0, block.id()))
-                    .collect::<Vec<_>>(),
-                expected_block_positions,
-                "invalid blocks_in_range({:?})",
-                0..expected_row_count
-            );
-
-            for (_, expected_block) in
-                blocks_snapshot.blocks_in_range(BlockRow(0)..BlockRow(expected_row_count as u32))
-            {
-                let actual_block = blocks_snapshot.block_for_id(expected_block.id());
-                assert_eq!(
-                    actual_block.map(|block| block.id()),
-                    Some(expected_block.id())
-                );
-            }
-
-            for (block_row, block_id) in expected_block_positions {
-                if let BlockId::Custom(block_id) = block_id {
-                    assert_eq!(
-                        blocks_snapshot.row_for_block(block_id),
-                        Some(BlockRow(block_row))
-                    );
-                }
-            }
-
-            let mut expected_longest_rows = Vec::new();
-            let mut longest_line_len = -1_isize;
-            for (row, line) in expected_lines.iter().enumerate() {
-                let row = row as u32;
-
-                assert_eq!(
-                    blocks_snapshot.line_len(BlockRow(row)),
-                    line.len() as u32,
-                    "invalid line len for row {}",
-                    row
-                );
-
-                let line_char_count = line.chars().count() as isize;
-                match line_char_count.cmp(&longest_line_len) {
-                    Ordering::Less => {}
-                    Ordering::Equal => expected_longest_rows.push(row),
-                    Ordering::Greater => {
-                        longest_line_len = line_char_count;
-                        expected_longest_rows.clear();
-                        expected_longest_rows.push(row);
-                    }
-                }
-            }
-
-            let longest_row = blocks_snapshot.longest_row();
-            assert!(
-                expected_longest_rows.contains(&longest_row.0),
-                "incorrect longest row {}. expected {:?} with length {}",
-                longest_row.0,
-                expected_longest_rows,
-                longest_line_len,
-            );
-
-            for _ in 0..10 {
-                let end_row = rng.random_range(1..=expected_lines.len());
-                let start_row = rng.random_range(0..end_row);
-
-                let mut expected_longest_rows_in_range = vec![];
-                let mut longest_line_len_in_range = 0;
-
-                let mut row = start_row as u32;
-                for line in &expected_lines[start_row..end_row] {
-                    let line_char_count = line.chars().count() as isize;
-                    match line_char_count.cmp(&longest_line_len_in_range) {
-                        Ordering::Less => {}
-                        Ordering::Equal => expected_longest_rows_in_range.push(row),
-                        Ordering::Greater => {
-                            longest_line_len_in_range = line_char_count;
-                            expected_longest_rows_in_range.clear();
-                            expected_longest_rows_in_range.push(row);
-                        }
-                    }
-                    row += 1;
-                }
-
-                let longest_row_in_range = blocks_snapshot
-                    .longest_row_in_range(BlockRow(start_row as u32)..BlockRow(end_row as u32));
-                assert!(
-                    expected_longest_rows_in_range.contains(&longest_row_in_range.0),
-                    "incorrect longest row {} in range {:?}. expected {:?} with length {}",
-                    longest_row.0,
-                    start_row..end_row,
-                    expected_longest_rows_in_range,
-                    longest_line_len_in_range,
-                );
-            }
-
-            // Ensure that conversion between block points and wrap points is stable.
-            for row in 0..=blocks_snapshot.wrap_snapshot.max_point().row().0 {
-                let wrap_point = WrapPoint::new(WrapRow(row), 0);
-                let block_point = blocks_snapshot.to_block_point(wrap_point);
-                let left_wrap_point = blocks_snapshot.to_wrap_point(block_point, Bias::Left);
-                let right_wrap_point = blocks_snapshot.to_wrap_point(block_point, Bias::Right);
-                assert_eq!(blocks_snapshot.to_block_point(left_wrap_point), block_point);
-                assert_eq!(
-                    blocks_snapshot.to_block_point(right_wrap_point),
-                    block_point
-                );
-            }
-
-            let mut block_point = BlockPoint::new(BlockRow(0), 0);
-            for c in expected_text.chars() {
-                let left_point = blocks_snapshot.clip_point(block_point, Bias::Left);
-                let left_buffer_point = blocks_snapshot.to_point(left_point, Bias::Left);
-                assert_eq!(
-                    blocks_snapshot
-                        .to_block_point(blocks_snapshot.to_wrap_point(left_point, Bias::Left)),
-                    left_point,
-                    "block point: {:?}, wrap point: {:?}",
-                    block_point,
-                    blocks_snapshot.to_wrap_point(left_point, Bias::Left)
-                );
-                assert_eq!(
-                    left_buffer_point,
-                    buffer_snapshot.clip_point(left_buffer_point, Bias::Right),
-                    "{:?} is not valid in buffer coordinates",
-                    left_point
-                );
-
-                let right_point = blocks_snapshot.clip_point(block_point, Bias::Right);
-                let right_buffer_point = blocks_snapshot.to_point(right_point, Bias::Right);
-                assert_eq!(
-                    blocks_snapshot
-                        .to_block_point(blocks_snapshot.to_wrap_point(right_point, Bias::Right)),
-                    right_point,
-                    "block point: {:?}, wrap point: {:?}",
-                    block_point,
-                    blocks_snapshot.to_wrap_point(right_point, Bias::Right)
-                );
-                assert_eq!(
-                    right_buffer_point,
-                    buffer_snapshot.clip_point(right_buffer_point, Bias::Left),
-                    "{:?} is not valid in buffer coordinates",
-                    right_point
-                );
-
-                if c == '\n' {
-                    block_point.0 += Point::new(1, 0);
-                } else {
-                    block_point.column += c.len_utf8() as u32;
-                }
-            }
-
-            for buffer_row in 0..=buffer_snapshot.max_point().row {
-                let buffer_row = MultiBufferRow(buffer_row);
-                assert_eq!(
-                    blocks_snapshot.is_line_replaced(buffer_row),
-                    expected_replaced_buffer_rows.contains(&buffer_row),
-                    "incorrect is_line_replaced({buffer_row:?}), expected replaced rows: {expected_replaced_buffer_rows:?}",
-                );
-            }
-        }
-    }
-
-    #[gpui::test]
-    fn test_remove_intersecting_replace_blocks_edge_case(cx: &mut gpui::TestAppContext) {
-        cx.update(init_test);
-
-        let text = "abc\ndef\nghi\njkl\nmno";
-        let buffer = cx.update(|cx| MultiBuffer::build_simple(text, cx));
-        let buffer_snapshot = cx.update(|cx| buffer.read(cx).snapshot(cx));
-        let (_inlay_map, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
-        let (_fold_map, fold_snapshot) = FoldMap::new(inlay_snapshot);
-        let (_tab_map, tab_snapshot) = TabMap::new(fold_snapshot, 4.try_into().unwrap());
-        let (_wrap_map, wraps_snapshot) =
-            cx.update(|cx| WrapMap::new(tab_snapshot, font("Helvetica"), px(14.0), None, cx));
-        let mut block_map = BlockMap::new(wraps_snapshot.clone(), 1, 1);
-
-        let mut writer = block_map.write(wraps_snapshot.clone(), Default::default());
-        let _block_id = writer.insert(vec![BlockProperties {
-            style: BlockStyle::Fixed,
-            placement: BlockPlacement::Above(buffer_snapshot.anchor_after(Point::new(1, 0))),
-            height: Some(1),
-            render: Arc::new(|_| div().into_any()),
-            priority: 0,
-        }])[0];
-
-        let blocks_snapshot = block_map.read(wraps_snapshot.clone(), Default::default());
-        assert_eq!(blocks_snapshot.text(), "abc\n\ndef\nghi\njkl\nmno");
-
-        let mut writer = block_map.write(wraps_snapshot.clone(), Default::default());
-        writer.remove_intersecting_replace_blocks(
-            [buffer_snapshot
-                .anchor_after(Point::new(1, 0))
-                .to_offset(&buffer_snapshot)
-                ..buffer_snapshot
-                    .anchor_after(Point::new(1, 0))
-                    .to_offset(&buffer_snapshot)],
-            false,
-        );
-        let blocks_snapshot = block_map.read(wraps_snapshot, Default::default());
-        assert_eq!(blocks_snapshot.text(), "abc\n\ndef\nghi\njkl\nmno");
-    }
-
-    #[gpui::test]
-    fn test_folded_buffer_with_near_blocks(cx: &mut gpui::TestAppContext) {
-        cx.update(init_test);
-
-        let text = "line 1\nline 2\nline 3";
-        let buffer = cx.update(|cx| {
-            MultiBuffer::build_multi([(text, vec![Point::new(0, 0)..Point::new(2, 6)])], cx)
-        });
-        let buffer_snapshot = cx.update(|cx| buffer.read(cx).snapshot(cx));
-        let buffer_ids = buffer_snapshot
-            .excerpts()
-            .map(|(_, buffer_snapshot, _)| buffer_snapshot.remote_id())
-            .dedup()
-            .collect::<Vec<_>>();
-        assert_eq!(buffer_ids.len(), 1);
-        let buffer_id = buffer_ids[0];
-
-        let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
-        let (_, fold_snapshot) = FoldMap::new(inlay_snapshot);
-        let (_, tab_snapshot) = TabMap::new(fold_snapshot, 4.try_into().unwrap());
-        let (_, wrap_snapshot) =
-            cx.update(|cx| WrapMap::new(tab_snapshot, font("Helvetica"), px(14.0), None, cx));
-        let mut block_map = BlockMap::new(wrap_snapshot.clone(), 1, 1);
-
-        let mut writer = block_map.write(wrap_snapshot.clone(), Patch::default());
-        writer.insert(vec![BlockProperties {
-            style: BlockStyle::Fixed,
-            placement: BlockPlacement::Near(buffer_snapshot.anchor_after(Point::new(0, 0))),
-            height: Some(1),
-            render: Arc::new(|_| div().into_any()),
-            priority: 0,
-        }]);
-
-        let blocks_snapshot = block_map.read(wrap_snapshot.clone(), Patch::default());
-        assert_eq!(blocks_snapshot.text(), "\nline 1\n\nline 2\nline 3");
-
-        let mut writer = block_map.write(wrap_snapshot.clone(), Patch::default());
-        buffer.read_with(cx, |buffer, cx| {
-            writer.fold_buffers([buffer_id], buffer, cx);
-        });
-
-        let blocks_snapshot = block_map.read(wrap_snapshot, Patch::default());
-        assert_eq!(blocks_snapshot.text(), "");
-    }
-
-    #[gpui::test]
-    fn test_folded_buffer_with_near_blocks_on_last_line(cx: &mut gpui::TestAppContext) {
-        cx.update(init_test);
-
-        let text = "line 1\nline 2\nline 3\nline 4";
-        let buffer = cx.update(|cx| {
-            MultiBuffer::build_multi([(text, vec![Point::new(0, 0)..Point::new(3, 6)])], cx)
-        });
-        let buffer_snapshot = cx.update(|cx| buffer.read(cx).snapshot(cx));
-        let buffer_ids = buffer_snapshot
-            .excerpts()
-            .map(|(_, buffer_snapshot, _)| buffer_snapshot.remote_id())
-            .dedup()
-            .collect::<Vec<_>>();
-        assert_eq!(buffer_ids.len(), 1);
-        let buffer_id = buffer_ids[0];
-
-        let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
-        let (_, fold_snapshot) = FoldMap::new(inlay_snapshot);
-        let (_, tab_snapshot) = TabMap::new(fold_snapshot, 4.try_into().unwrap());
-        let (_, wrap_snapshot) =
-            cx.update(|cx| WrapMap::new(tab_snapshot, font("Helvetica"), px(14.0), None, cx));
-        let mut block_map = BlockMap::new(wrap_snapshot.clone(), 1, 1);
-
-        let mut writer = block_map.write(wrap_snapshot.clone(), Patch::default());
-        writer.insert(vec![BlockProperties {
-            style: BlockStyle::Fixed,
-            placement: BlockPlacement::Near(buffer_snapshot.anchor_after(Point::new(3, 6))),
-            height: Some(1),
-            render: Arc::new(|_| div().into_any()),
-            priority: 0,
-        }]);
-
-        let blocks_snapshot = block_map.read(wrap_snapshot.clone(), Patch::default());
-        assert_eq!(blocks_snapshot.text(), "\nline 1\nline 2\nline 3\nline 4\n");
-
-        let mut writer = block_map.write(wrap_snapshot.clone(), Patch::default());
-        buffer.read_with(cx, |buffer, cx| {
-            writer.fold_buffers([buffer_id], buffer, cx);
-        });
-
-        let blocks_snapshot = block_map.read(wrap_snapshot, Patch::default());
-        assert_eq!(blocks_snapshot.text(), "");
-    }
-
-    fn init_test(cx: &mut gpui::App) {
-        let settings = SettingsStore::test(cx);
-        cx.set_global(settings);
-        theme::init(theme::LoadThemes::JustBase, cx);
-        assets::Assets.load_test_fonts(cx);
-    }
-
-    impl Block {
-        fn as_custom(&self) -> Option<&CustomBlock> {
-            match self {
-                Block::Custom(block) => Some(block),
-                _ => None,
-            }
-        }
-    }
-
-    impl BlockSnapshot {
-        fn to_point(&self, point: BlockPoint, bias: Bias) -> Point {
-            self.wrap_snapshot
-                .to_point(self.to_wrap_point(point, bias), bias)
-        }
-    }
-}
diff --git a/crates/editor/src/display_map/crease_map.rs b/crates/editor/src/display_map/crease_map.rs
deleted file mode 100644
index 8f4a3781f4..0000000000
--- a/crates/editor/src/display_map/crease_map.rs
+++ /dev/null
@@ -1,529 +0,0 @@
-use collections::HashMap;
-use gpui::{AnyElement, IntoElement};
-use multi_buffer::{Anchor, AnchorRangeExt, MultiBufferRow, MultiBufferSnapshot, ToPoint};
-use serde::{Deserialize, Serialize};
-use std::{cmp::Ordering, fmt::Debug, ops::Range, sync::Arc};
-use sum_tree::{Bias, SeekTarget, SumTree};
-use text::Point;
-use ui::{App, SharedString, Window};
-
-use crate::{BlockStyle, FoldPlaceholder, RenderBlock};
-
-#[derive(Copy, Clone, Default, Debug, Eq, PartialEq, PartialOrd, Ord, Hash)]
-pub struct CreaseId(usize);
-
-pub struct CreaseMap {
-    snapshot: CreaseSnapshot,
-    next_id: CreaseId,
-    id_to_range: HashMap<CreaseId, Range<Anchor>>,
-}
-
-impl CreaseMap {
-    #[ztracing::instrument(skip_all)]
-    pub fn new(snapshot: &MultiBufferSnapshot) -> Self {
-        CreaseMap {
-            snapshot: CreaseSnapshot::new(snapshot),
-            next_id: CreaseId::default(),
-            id_to_range: HashMap::default(),
-        }
-    }
-}
-
-#[derive(Clone)]
-pub struct CreaseSnapshot {
-    creases: SumTree<CreaseItem>,
-}
-
-impl CreaseSnapshot {
-    pub fn new(snapshot: &MultiBufferSnapshot) -> Self {
-        CreaseSnapshot {
-            creases: SumTree::new(snapshot),
-        }
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn creases(&self) -> impl Iterator<Item = (CreaseId, &Crease<Anchor>)> {
-        self.creases.iter().map(|item| (item.id, &item.crease))
-    }
-
-    /// Returns the first Crease starting on the specified buffer row.
-    #[ztracing::instrument(skip_all)]
-    pub fn query_row<'a>(
-        &'a self,
-        row: MultiBufferRow,
-        snapshot: &'a MultiBufferSnapshot,
-    ) -> Option<&'a Crease<Anchor>> {
-        let start = snapshot.anchor_before(Point::new(row.0, 0));
-        let mut cursor = self.creases.cursor::<ItemSummary>(snapshot);
-        cursor.seek(&start, Bias::Left);
-        while let Some(item) = cursor.item() {
-            match Ord::cmp(&item.crease.range().start.to_point(snapshot).row, &row.0) {
-                Ordering::Less => cursor.next(),
-                Ordering::Equal => {
-                    if item.crease.range().start.is_valid(snapshot) {
-                        return Some(&item.crease);
-                    } else {
-                        cursor.next();
-                    }
-                }
-                Ordering::Greater => break,
-            }
-        }
-        None
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn creases_in_range<'a>(
-        &'a self,
-        range: Range<MultiBufferRow>,
-        snapshot: &'a MultiBufferSnapshot,
-    ) -> impl 'a + Iterator<Item = &'a Crease<Anchor>> {
-        let start = snapshot.anchor_before(Point::new(range.start.0, 0));
-        let mut cursor = self.creases.cursor::<ItemSummary>(snapshot);
-        cursor.seek(&start, Bias::Left);
-
-        std::iter::from_fn(move || {
-            while let Some(item) = cursor.item() {
-                cursor.next();
-                let crease_range = item.crease.range();
-                let crease_start = crease_range.start.to_point(snapshot);
-                let crease_end = crease_range.end.to_point(snapshot);
-                if crease_end.row > range.end.0 {
-                    continue;
-                }
-                if crease_start.row >= range.start.0 && crease_end.row < range.end.0 {
-                    return Some(&item.crease);
-                }
-            }
-            None
-        })
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn crease_items_with_offsets(
-        &self,
-        snapshot: &MultiBufferSnapshot,
-    ) -> Vec<(CreaseId, Range<Point>)> {
-        let mut cursor = self.creases.cursor::<ItemSummary>(snapshot);
-        let mut results = Vec::new();
-
-        cursor.next();
-        while let Some(item) = cursor.item() {
-            let crease_range = item.crease.range();
-            let start_point = crease_range.start.to_point(snapshot);
-            let end_point = crease_range.end.to_point(snapshot);
-            results.push((item.id, start_point..end_point));
-            cursor.next();
-        }
-
-        results
-    }
-}
-
-type RenderToggleFn = Arc<
-    dyn Send
-        + Sync
-        + Fn(
-            MultiBufferRow,
-            bool,
-            Arc<dyn Send + Sync + Fn(bool, &mut Window, &mut App)>,
-            &mut Window,
-            &mut App,
-        ) -> AnyElement,
->;
-type RenderTrailerFn =
-    Arc<dyn Send + Sync + Fn(MultiBufferRow, bool, &mut Window, &mut App) -> AnyElement>;
-
-#[derive(Clone)]
-pub enum Crease<T> {
-    Inline {
-        range: Range<T>,
-        placeholder: FoldPlaceholder,
-        render_toggle: Option<RenderToggleFn>,
-        render_trailer: Option<RenderTrailerFn>,
-        metadata: Option<CreaseMetadata>,
-    },
-    Block {
-        range: Range<T>,
-        block_height: u32,
-        block_style: BlockStyle,
-        render_block: RenderBlock,
-        block_priority: usize,
-        render_toggle: Option<RenderToggleFn>,
-    },
-}
-
-/// Metadata about a [`Crease`], that is used for serialization.
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct CreaseMetadata {
-    pub icon_path: SharedString,
-    pub label: SharedString,
-}
-
-impl<T> Crease<T> {
-    #[ztracing::instrument(skip_all)]
-    pub fn simple(range: Range<T>, placeholder: FoldPlaceholder) -> Self {
-        Crease::Inline {
-            range,
-            placeholder,
-            render_toggle: None,
-            render_trailer: None,
-            metadata: None,
-        }
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn block(range: Range<T>, height: u32, style: BlockStyle, render: RenderBlock) -> Self {
-        Self::Block {
-            range,
-            block_height: height,
-            block_style: style,
-            render_block: render,
-            block_priority: 0,
-            render_toggle: None,
-        }
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn inline<RenderToggle, ToggleElement, RenderTrailer, TrailerElement>(
-        range: Range<T>,
-        placeholder: FoldPlaceholder,
-        render_toggle: RenderToggle,
-        render_trailer: RenderTrailer,
-    ) -> Self
-    where
-        RenderToggle: 'static
-            + Send
-            + Sync
-            + Fn(
-                MultiBufferRow,
-                bool,
-                Arc<dyn Send + Sync + Fn(bool, &mut Window, &mut App)>,
-                &mut Window,
-                &mut App,
-            ) -> ToggleElement
-            + 'static,
-        ToggleElement: IntoElement,
-        RenderTrailer: 'static
-            + Send
-            + Sync
-            + Fn(MultiBufferRow, bool, &mut Window, &mut App) -> TrailerElement
-            + 'static,
-        TrailerElement: IntoElement,
-    {
-        Crease::Inline {
-            range,
-            placeholder,
-            render_toggle: Some(Arc::new(move |row, folded, toggle, window, cx| {
-                render_toggle(row, folded, toggle, window, cx).into_any_element()
-            })),
-            render_trailer: Some(Arc::new(move |row, folded, window, cx| {
-                render_trailer(row, folded, window, cx).into_any_element()
-            })),
-            metadata: None,
-        }
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn with_metadata(self, metadata: CreaseMetadata) -> Self {
-        match self {
-            Crease::Inline {
-                range,
-                placeholder,
-                render_toggle,
-                render_trailer,
-                ..
-            } => Crease::Inline {
-                range,
-                placeholder,
-                render_toggle,
-                render_trailer,
-                metadata: Some(metadata),
-            },
-            Crease::Block { .. } => self,
-        }
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn range(&self) -> &Range<T> {
-        match self {
-            Crease::Inline { range, .. } => range,
-            Crease::Block { range, .. } => range,
-        }
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn metadata(&self) -> Option<&CreaseMetadata> {
-        match self {
-            Self::Inline { metadata, .. } => metadata.as_ref(),
-            Self::Block { .. } => None,
-        }
-    }
-}
-
-impl<T> std::fmt::Debug for Crease<T>
-where
-    T: Debug,
-{
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Crease::Inline {
-                range, metadata, ..
-            } => f
-                .debug_struct("Crease::Inline")
-                .field("range", range)
-                .field("metadata", metadata)
-                .finish_non_exhaustive(),
-            Crease::Block {
-                range,
-                block_height,
-                ..
-            } => f
-                .debug_struct("Crease::Block")
-                .field("range", range)
-                .field("height", block_height)
-                .finish_non_exhaustive(),
-        }
-    }
-}
-
-#[derive(Clone, Debug)]
-struct CreaseItem {
-    id: CreaseId,
-    crease: Crease<Anchor>,
-}
-
-impl CreaseMap {
-    pub fn snapshot(&self) -> CreaseSnapshot {
-        self.snapshot.clone()
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn insert(
-        &mut self,
-        creases: impl IntoIterator<Item = Crease<Anchor>>,
-        snapshot: &MultiBufferSnapshot,
-    ) -> Vec<CreaseId> {
-        let mut new_ids = Vec::new();
-        self.snapshot.creases = {
-            let mut new_creases = SumTree::new(snapshot);
-            let mut cursor = self.snapshot.creases.cursor::<ItemSummary>(snapshot);
-            for crease in creases {
-                let crease_range = crease.range().clone();
-                new_creases.append(cursor.slice(&crease_range, Bias::Left), snapshot);
-
-                let id = self.next_id;
-                self.next_id.0 += 1;
-                self.id_to_range.insert(id, crease_range);
-                new_creases.push(CreaseItem { crease, id }, snapshot);
-                new_ids.push(id);
-            }
-            new_creases.append(cursor.suffix(), snapshot);
-            new_creases
-        };
-        new_ids
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn remove(
-        &mut self,
-        ids: impl IntoIterator<Item = CreaseId>,
-        snapshot: &MultiBufferSnapshot,
-    ) -> Vec<(CreaseId, Range<Anchor>)> {
-        let mut removals = Vec::new();
-        for id in ids {
-            if let Some(range) = self.id_to_range.remove(&id) {
-                removals.push((id, range.clone()));
-            }
-        }
-        removals.sort_unstable_by(|(a_id, a_range), (b_id, b_range)| {
-            AnchorRangeExt::cmp(a_range, b_range, snapshot).then(b_id.cmp(a_id))
-        });
-
-        self.snapshot.creases = {
-            let mut new_creases = SumTree::new(snapshot);
-            let mut cursor = self.snapshot.creases.cursor::<ItemSummary>(snapshot);
-
-            for (id, range) in &removals {
-                new_creases.append(cursor.slice(range, Bias::Left), snapshot);
-                while let Some(item) = cursor.item() {
-                    cursor.next();
-                    if item.id == *id {
-                        break;
-                    } else {
-                        new_creases.push(item.clone(), snapshot);
-                    }
-                }
-            }
-
-            new_creases.append(cursor.suffix(), snapshot);
-            new_creases
-        };
-
-        removals
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct ItemSummary {
-    range: Range<Anchor>,
-}
-
-impl Default for ItemSummary {
-    fn default() -> Self {
-        Self {
-            range: Anchor::min()..Anchor::min(),
-        }
-    }
-}
-
-impl sum_tree::Summary for ItemSummary {
-    type Context<'a> = &'a MultiBufferSnapshot;
-
-    fn zero(_cx: Self::Context<'_>) -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, other: &Self, _snapshot: &MultiBufferSnapshot) {
-        self.range = other.range.clone();
-    }
-}
-
-impl sum_tree::Item for CreaseItem {
-    type Summary = ItemSummary;
-
-    #[ztracing::instrument(skip_all)]
-    fn summary(&self, _cx: &MultiBufferSnapshot) -> Self::Summary {
-        ItemSummary {
-            range: self.crease.range().clone(),
-        }
-    }
-}
-
-/// Implements `SeekTarget` for `Range<Anchor>` to enable seeking within a `SumTree` of `CreaseItem`s.
-impl SeekTarget<'_, ItemSummary, ItemSummary> for Range<Anchor> {
-    #[ztracing::instrument(skip_all)]
-    fn cmp(&self, cursor_location: &ItemSummary, snapshot: &MultiBufferSnapshot) -> Ordering {
-        AnchorRangeExt::cmp(self, &cursor_location.range, snapshot)
-    }
-}
-
-impl SeekTarget<'_, ItemSummary, ItemSummary> for Anchor {
-    #[ztracing::instrument(skip_all)]
-    fn cmp(&self, other: &ItemSummary, snapshot: &MultiBufferSnapshot) -> Ordering {
-        self.cmp(&other.range.start, snapshot)
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use gpui::{App, div};
-    use multi_buffer::MultiBuffer;
-
-    #[gpui::test]
-    fn test_insert_and_remove_creases(cx: &mut App) {
-        let text = "line1\nline2\nline3\nline4\nline5";
-        let buffer = MultiBuffer::build_simple(text, cx);
-        let snapshot = buffer.read_with(cx, |buffer, cx| buffer.snapshot(cx));
-        let mut crease_map = CreaseMap::new(&buffer.read(cx).read(cx));
-
-        // Insert creases
-        let creases = [
-            Crease::inline(
-                snapshot.anchor_before(Point::new(1, 0))..snapshot.anchor_after(Point::new(1, 5)),
-                FoldPlaceholder::test(),
-                |_row, _folded, _toggle, _window, _cx| div(),
-                |_row, _folded, _window, _cx| div(),
-            ),
-            Crease::inline(
-                snapshot.anchor_before(Point::new(3, 0))..snapshot.anchor_after(Point::new(3, 5)),
-                FoldPlaceholder::test(),
-                |_row, _folded, _toggle, _window, _cx| div(),
-                |_row, _folded, _window, _cx| div(),
-            ),
-        ];
-        let crease_ids = crease_map.insert(creases, &snapshot);
-        assert_eq!(crease_ids.len(), 2);
-
-        // Verify creases are inserted
-        let crease_snapshot = crease_map.snapshot();
-        assert!(
-            crease_snapshot
-                .query_row(MultiBufferRow(1), &snapshot)
-                .is_some()
-        );
-        assert!(
-            crease_snapshot
-                .query_row(MultiBufferRow(3), &snapshot)
-                .is_some()
-        );
-
-        // Remove creases
-        crease_map.remove(crease_ids, &snapshot);
-
-        // Verify creases are removed
-        let crease_snapshot = crease_map.snapshot();
-        assert!(
-            crease_snapshot
-                .query_row(MultiBufferRow(1), &snapshot)
-                .is_none()
-        );
-        assert!(
-            crease_snapshot
-                .query_row(MultiBufferRow(3), &snapshot)
-                .is_none()
-        );
-    }
-
-    #[gpui::test]
-    #[ztracing::instrument(skip_all)]
-    fn test_creases_in_range(cx: &mut App) {
-        let text = "line1\nline2\nline3\nline4\nline5\nline6\nline7";
-        let buffer = MultiBuffer::build_simple(text, cx);
-        let snapshot = buffer.read_with(cx, |buffer, cx| buffer.snapshot(cx));
-        let mut crease_map = CreaseMap::new(&snapshot);
-
-        let creases = [
-            Crease::inline(
-                snapshot.anchor_before(Point::new(1, 0))..snapshot.anchor_after(Point::new(1, 5)),
-                FoldPlaceholder::test(),
-                |_row, _folded, _toggle, _window, _cx| div(),
-                |_row, _folded, _window, _cx| div(),
-            ),
-            Crease::inline(
-                snapshot.anchor_before(Point::new(3, 0))..snapshot.anchor_after(Point::new(3, 5)),
-                FoldPlaceholder::test(),
-                |_row, _folded, _toggle, _window, _cx| div(),
-                |_row, _folded, _window, _cx| div(),
-            ),
-            Crease::inline(
-                snapshot.anchor_before(Point::new(5, 0))..snapshot.anchor_after(Point::new(5, 5)),
-                FoldPlaceholder::test(),
-                |_row, _folded, _toggle, _window, _cx| div(),
-                |_row, _folded, _window, _cx| div(),
-            ),
-        ];
-        crease_map.insert(creases, &snapshot);
-
-        let crease_snapshot = crease_map.snapshot();
-
-        let range = MultiBufferRow(0)..MultiBufferRow(7);
-        let creases: Vec<_> = crease_snapshot.creases_in_range(range, &snapshot).collect();
-        assert_eq!(creases.len(), 3);
-
-        let range = MultiBufferRow(2)..MultiBufferRow(5);
-        let creases: Vec<_> = crease_snapshot.creases_in_range(range, &snapshot).collect();
-        assert_eq!(creases.len(), 1);
-        assert_eq!(creases[0].range().start.to_point(&snapshot).row, 3);
-
-        let range = MultiBufferRow(0)..MultiBufferRow(2);
-        let creases: Vec<_> = crease_snapshot.creases_in_range(range, &snapshot).collect();
-        assert_eq!(creases.len(), 1);
-        assert_eq!(creases[0].range().start.to_point(&snapshot).row, 1);
-
-        let range = MultiBufferRow(6)..MultiBufferRow(7);
-        let creases: Vec<_> = crease_snapshot.creases_in_range(range, &snapshot).collect();
-        assert_eq!(creases.len(), 0);
-    }
-}
diff --git a/crates/editor/src/display_map/custom_highlights.rs b/crates/editor/src/display_map/custom_highlights.rs
deleted file mode 100644
index 1ece2493e3..0000000000
--- a/crates/editor/src/display_map/custom_highlights.rs
+++ /dev/null
@@ -1,324 +0,0 @@
-use collections::BTreeMap;
-use gpui::HighlightStyle;
-use language::Chunk;
-use multi_buffer::{MultiBufferChunks, MultiBufferOffset, MultiBufferSnapshot, ToOffset as _};
-use std::{
-    cmp,
-    iter::{self, Peekable},
-    ops::Range,
-    vec,
-};
-
-use crate::display_map::{HighlightKey, TextHighlights};
-
-pub struct CustomHighlightsChunks<'a> {
-    buffer_chunks: MultiBufferChunks<'a>,
-    buffer_chunk: Option<Chunk<'a>>,
-    offset: MultiBufferOffset,
-    multibuffer_snapshot: &'a MultiBufferSnapshot,
-
-    highlight_endpoints: Peekable<vec::IntoIter<HighlightEndpoint>>,
-    active_highlights: BTreeMap<HighlightKey, HighlightStyle>,
-    text_highlights: Option<&'a TextHighlights>,
-}
-
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-struct HighlightEndpoint {
-    offset: MultiBufferOffset,
-    tag: HighlightKey,
-    style: Option<HighlightStyle>,
-}
-
-impl<'a> CustomHighlightsChunks<'a> {
-    #[ztracing::instrument(skip_all)]
-    pub fn new(
-        range: Range<MultiBufferOffset>,
-        language_aware: bool,
-        text_highlights: Option<&'a TextHighlights>,
-        multibuffer_snapshot: &'a MultiBufferSnapshot,
-    ) -> Self {
-        Self {
-            buffer_chunks: multibuffer_snapshot.chunks(range.clone(), language_aware),
-            buffer_chunk: None,
-            offset: range.start,
-            text_highlights,
-            highlight_endpoints: create_highlight_endpoints(
-                &range,
-                text_highlights,
-                multibuffer_snapshot,
-            ),
-            active_highlights: Default::default(),
-            multibuffer_snapshot,
-        }
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn seek(&mut self, new_range: Range<MultiBufferOffset>) {
-        self.highlight_endpoints =
-            create_highlight_endpoints(&new_range, self.text_highlights, self.multibuffer_snapshot);
-        self.offset = new_range.start;
-        self.buffer_chunks.seek(new_range);
-        self.buffer_chunk.take();
-        self.active_highlights.clear()
-    }
-}
-
-fn create_highlight_endpoints(
-    range: &Range<MultiBufferOffset>,
-    text_highlights: Option<&TextHighlights>,
-    buffer: &MultiBufferSnapshot,
-) -> iter::Peekable<vec::IntoIter<HighlightEndpoint>> {
-    let mut highlight_endpoints = Vec::new();
-    if let Some(text_highlights) = text_highlights {
-        let start = buffer.anchor_after(range.start);
-        let end = buffer.anchor_after(range.end);
-        for (&tag, text_highlights) in text_highlights.iter() {
-            let style = text_highlights.0;
-            let ranges = &text_highlights.1;
-
-            let start_ix = ranges
-                .binary_search_by(|probe| probe.end.cmp(&start, buffer).then(cmp::Ordering::Less))
-                .unwrap_or_else(|i| i);
-            let end_ix = ranges[start_ix..]
-                .binary_search_by(|probe| {
-                    probe.start.cmp(&end, buffer).then(cmp::Ordering::Greater)
-                })
-                .unwrap_or_else(|i| i);
-
-            highlight_endpoints.reserve(2 * end_ix);
-
-            for range in &ranges[start_ix..][..end_ix] {
-                let start = range.start.to_offset(buffer);
-                let end = range.end.to_offset(buffer);
-                if start == end {
-                    continue;
-                }
-                highlight_endpoints.push(HighlightEndpoint {
-                    offset: start,
-                    tag,
-                    style: Some(style),
-                });
-                highlight_endpoints.push(HighlightEndpoint {
-                    offset: end,
-                    tag,
-                    style: None,
-                });
-            }
-        }
-        highlight_endpoints.sort();
-    }
-    highlight_endpoints.into_iter().peekable()
-}
-
-impl<'a> Iterator for CustomHighlightsChunks<'a> {
-    type Item = Chunk<'a>;
-
-    #[ztracing::instrument(skip_all)]
-    fn next(&mut self) -> Option<Self::Item> {
-        let mut next_highlight_endpoint = MultiBufferOffset(usize::MAX);
-        while let Some(endpoint) = self.highlight_endpoints.peek().copied() {
-            if endpoint.offset <= self.offset {
-                if let Some(style) = endpoint.style {
-                    self.active_highlights.insert(endpoint.tag, style);
-                } else {
-                    self.active_highlights.remove(&endpoint.tag);
-                }
-                self.highlight_endpoints.next();
-            } else {
-                next_highlight_endpoint = endpoint.offset;
-                break;
-            }
-        }
-
-        let chunk = match &mut self.buffer_chunk {
-            Some(it) => it,
-            slot => slot.insert(self.buffer_chunks.next()?),
-        };
-        while chunk.text.is_empty() {
-            *chunk = self.buffer_chunks.next()?;
-        }
-
-        let split_idx = chunk.text.len().min(next_highlight_endpoint - self.offset);
-        let (prefix, suffix) = chunk.text.split_at(split_idx);
-        self.offset += prefix.len();
-
-        let mask = 1u128.unbounded_shl(split_idx as u32).wrapping_sub(1);
-        let chars = chunk.chars & mask;
-        let tabs = chunk.tabs & mask;
-        let mut prefix = Chunk {
-            text: prefix,
-            chars,
-            tabs,
-            ..chunk.clone()
-        };
-
-        chunk.chars = chunk.chars.unbounded_shr(split_idx as u32);
-        chunk.tabs = chunk.tabs.unbounded_shr(split_idx as u32);
-        chunk.text = suffix;
-        if !self.active_highlights.is_empty() {
-            prefix.highlight_style = self
-                .active_highlights
-                .values()
-                .copied()
-                .reduce(|acc, active_highlight| acc.highlight(active_highlight));
-        }
-        Some(prefix)
-    }
-}
-
-impl PartialOrd for HighlightEndpoint {
-    fn partial_cmp(&self, other: &Self) -> Option<cmp::Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-impl Ord for HighlightEndpoint {
-    fn cmp(&self, other: &Self) -> cmp::Ordering {
-        self.offset
-            .cmp(&other.offset)
-            .then_with(|| self.style.is_some().cmp(&other.style.is_some()))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::{any::TypeId, sync::Arc};
-
-    use super::*;
-    use crate::MultiBuffer;
-    use gpui::App;
-    use rand::prelude::*;
-    use util::RandomCharIter;
-
-    #[gpui::test(iterations = 100)]
-    fn test_random_chunk_bitmaps(cx: &mut App, mut rng: StdRng) {
-        // Generate random buffer using existing test infrastructure
-        let len = rng.random_range(10..10000);
-        let buffer = if rng.random() {
-            let text = RandomCharIter::new(&mut rng).take(len).collect::<String>();
-            MultiBuffer::build_simple(&text, cx)
-        } else {
-            MultiBuffer::build_random(&mut rng, cx)
-        };
-
-        let buffer_snapshot = buffer.read(cx).snapshot(cx);
-
-        // Create random highlights
-        let mut highlights = sum_tree::TreeMap::default();
-        let highlight_count = rng.random_range(1..10);
-
-        for _i in 0..highlight_count {
-            let style = HighlightStyle {
-                color: Some(gpui::Hsla {
-                    h: rng.random::<f32>(),
-                    s: rng.random::<f32>(),
-                    l: rng.random::<f32>(),
-                    a: 1.0,
-                }),
-                ..Default::default()
-            };
-
-            let mut ranges = Vec::new();
-            let range_count = rng.random_range(1..10);
-            let text = buffer_snapshot.text();
-            for _ in 0..range_count {
-                if buffer_snapshot.len() == MultiBufferOffset(0) {
-                    continue;
-                }
-
-                let mut start = rng.random_range(
-                    MultiBufferOffset(0)..=buffer_snapshot.len().saturating_sub_usize(10),
-                );
-
-                while !text.is_char_boundary(start.0) {
-                    start = start.saturating_sub_usize(1);
-                }
-
-                let end_end = buffer_snapshot.len().min(start + 100usize);
-                let mut end = rng.random_range(start..=end_end);
-                while !text.is_char_boundary(end.0) {
-                    end = end.saturating_sub_usize(1);
-                }
-
-                if start < end {
-                    start = end;
-                }
-                let start_anchor = buffer_snapshot.anchor_before(start);
-                let end_anchor = buffer_snapshot.anchor_after(end);
-                ranges.push(start_anchor..end_anchor);
-            }
-
-            let type_id = TypeId::of::<()>(); // Simple type ID for testing
-            highlights.insert(HighlightKey::Type(type_id), Arc::new((style, ranges)));
-        }
-
-        // Get all chunks and verify their bitmaps
-        let chunks = CustomHighlightsChunks::new(
-            MultiBufferOffset(0)..buffer_snapshot.len(),
-            false,
-            None,
-            &buffer_snapshot,
-        );
-
-        for chunk in chunks {
-            let chunk_text = chunk.text;
-            let chars_bitmap = chunk.chars;
-            let tabs_bitmap = chunk.tabs;
-
-            // Check empty chunks have empty bitmaps
-            if chunk_text.is_empty() {
-                assert_eq!(
-                    chars_bitmap, 0,
-                    "Empty chunk should have empty chars bitmap"
-                );
-                assert_eq!(tabs_bitmap, 0, "Empty chunk should have empty tabs bitmap");
-                continue;
-            }
-
-            // Verify that chunk text doesn't exceed 128 bytes
-            assert!(
-                chunk_text.len() <= 128,
-                "Chunk text length {} exceeds 128 bytes",
-                chunk_text.len()
-            );
-
-            // Verify chars bitmap
-            let char_indices = chunk_text
-                .char_indices()
-                .map(|(i, _)| i)
-                .collect::<Vec<_>>();
-
-            for byte_idx in 0..chunk_text.len() {
-                let should_have_bit = char_indices.contains(&byte_idx);
-                let has_bit = chars_bitmap & (1 << byte_idx) != 0;
-
-                if has_bit != should_have_bit {
-                    eprintln!("Chunk text bytes: {:?}", chunk_text.as_bytes());
-                    eprintln!("Char indices: {:?}", char_indices);
-                    eprintln!("Chars bitmap: {:#b}", chars_bitmap);
-                    assert_eq!(
-                        has_bit, should_have_bit,
-                        "Chars bitmap mismatch at byte index {} in chunk {:?}. Expected bit: {}, Got bit: {}",
-                        byte_idx, chunk_text, should_have_bit, has_bit
-                    );
-                }
-            }
-
-            // Verify tabs bitmap
-            for (byte_idx, byte) in chunk_text.bytes().enumerate() {
-                let is_tab = byte == b'\t';
-                let has_bit = tabs_bitmap & (1 << byte_idx) != 0;
-
-                if has_bit != is_tab {
-                    eprintln!("Chunk text bytes: {:?}", chunk_text.as_bytes());
-                    eprintln!("Tabs bitmap: {:#b}", tabs_bitmap);
-                    assert_eq!(
-                        has_bit, is_tab,
-                        "Tabs bitmap mismatch at byte index {} in chunk {:?}. Byte: {:?}, Expected bit: {}, Got bit: {}",
-                        byte_idx, chunk_text, byte as char, is_tab, has_bit
-                    );
-                }
-            }
-        }
-    }
-}
diff --git a/crates/editor/src/display_map/dimensions.rs b/crates/editor/src/display_map/dimensions.rs
deleted file mode 100644
index fd8efa6ca5..0000000000
--- a/crates/editor/src/display_map/dimensions.rs
+++ /dev/null
@@ -1,96 +0,0 @@
-#[derive(Copy, Clone, Debug, Default, Eq, Ord, PartialOrd, PartialEq)]
-pub struct RowDelta(pub u32);
-
-impl RowDelta {
-    pub fn saturating_sub(self, other: RowDelta) -> RowDelta {
-        RowDelta(self.0.saturating_sub(other.0))
-    }
-}
-
-impl ::std::ops::Add for RowDelta {
-    type Output = RowDelta;
-
-    fn add(self, rhs: RowDelta) -> Self::Output {
-        RowDelta(self.0 + rhs.0)
-    }
-}
-
-impl ::std::ops::Sub for RowDelta {
-    type Output = RowDelta;
-
-    fn sub(self, rhs: RowDelta) -> Self::Output {
-        RowDelta(self.0 - rhs.0)
-    }
-}
-
-impl ::std::ops::AddAssign for RowDelta {
-    fn add_assign(&mut self, rhs: RowDelta) {
-        self.0 += rhs.0;
-    }
-}
-
-impl ::std::ops::SubAssign for RowDelta {
-    fn sub_assign(&mut self, rhs: RowDelta) {
-        self.0 -= rhs.0;
-    }
-}
-
-macro_rules! impl_for_row_types {
-    ($row:ident => $row_delta:ident) => {
-        impl $row {
-            pub fn saturating_sub(self, other: $row_delta) -> $row {
-                $row(self.0.saturating_sub(other.0))
-            }
-        }
-
-        impl ::std::ops::Add for $row {
-            type Output = Self;
-
-            fn add(self, rhs: Self) -> Self::Output {
-                Self(self.0 + rhs.0)
-            }
-        }
-
-        impl ::std::ops::Add<$row_delta> for $row {
-            type Output = Self;
-
-            fn add(self, rhs: $row_delta) -> Self::Output {
-                Self(self.0 + rhs.0)
-            }
-        }
-
-        impl ::std::ops::Sub for $row {
-            type Output = $row_delta;
-
-            fn sub(self, rhs: Self) -> Self::Output {
-                $row_delta(self.0 - rhs.0)
-            }
-        }
-
-        impl ::std::ops::Sub<$row_delta> for $row {
-            type Output = $row;
-
-            fn sub(self, rhs: $row_delta) -> Self::Output {
-                $row(self.0 - rhs.0)
-            }
-        }
-
-        impl ::std::ops::AddAssign for $row {
-            fn add_assign(&mut self, rhs: Self) {
-                self.0 += rhs.0;
-            }
-        }
-
-        impl ::std::ops::AddAssign<$row_delta> for $row {
-            fn add_assign(&mut self, rhs: $row_delta) {
-                self.0 += rhs.0;
-            }
-        }
-
-        impl ::std::ops::SubAssign<$row_delta> for $row {
-            fn sub_assign(&mut self, rhs: $row_delta) {
-                self.0 -= rhs.0;
-            }
-        }
-    };
-}
diff --git a/crates/editor/src/display_map/fold_map.rs b/crates/editor/src/display_map/fold_map.rs
deleted file mode 100644
index bb0d6885ac..0000000000
--- a/crates/editor/src/display_map/fold_map.rs
+++ /dev/null
@@ -1,2407 +0,0 @@
-use crate::display_map::inlay_map::InlayChunk;
-
-use super::{
-    Highlights,
-    inlay_map::{InlayBufferRows, InlayChunks, InlayEdit, InlayOffset, InlayPoint, InlaySnapshot},
-};
-use gpui::{AnyElement, App, ElementId, HighlightStyle, Pixels, Window};
-use language::{Edit, HighlightId, Point};
-use multi_buffer::{
-    Anchor, AnchorRangeExt, MBTextSummary, MultiBufferOffset, MultiBufferRow, MultiBufferSnapshot,
-    RowInfo, ToOffset,
-};
-use project::InlayId;
-use std::{
-    any::TypeId,
-    cmp::{self, Ordering},
-    fmt, iter,
-    ops::{Add, AddAssign, Deref, DerefMut, Range, Sub, SubAssign},
-    sync::Arc,
-    usize,
-};
-use sum_tree::{Bias, Cursor, Dimensions, FilterCursor, SumTree, Summary, TreeMap};
-use ui::IntoElement as _;
-use util::post_inc;
-
-#[derive(Clone)]
-pub struct FoldPlaceholder {
-    /// Creates an element to represent this fold's placeholder.
-    pub render: Arc<dyn Send + Sync + Fn(FoldId, Range<Anchor>, &mut App) -> AnyElement>,
-    /// If true, the element is constrained to the shaped width of an ellipsis.
-    pub constrain_width: bool,
-    /// If true, merges the fold with an adjacent one.
-    pub merge_adjacent: bool,
-    /// Category of the fold. Useful for carefully removing from overlapping folds.
-    pub type_tag: Option<TypeId>,
-}
-
-impl Default for FoldPlaceholder {
-    fn default() -> Self {
-        Self {
-            render: Arc::new(|_, _, _| gpui::Empty.into_any_element()),
-            constrain_width: true,
-            merge_adjacent: true,
-            type_tag: None,
-        }
-    }
-}
-
-impl FoldPlaceholder {
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn test() -> Self {
-        Self {
-            render: Arc::new(|_id, _range, _cx| gpui::Empty.into_any_element()),
-            constrain_width: true,
-            merge_adjacent: true,
-            type_tag: None,
-        }
-    }
-}
-
-impl fmt::Debug for FoldPlaceholder {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("FoldPlaceholder")
-            .field("constrain_width", &self.constrain_width)
-            .finish()
-    }
-}
-
-impl Eq for FoldPlaceholder {}
-
-impl PartialEq for FoldPlaceholder {
-    fn eq(&self, other: &Self) -> bool {
-        Arc::ptr_eq(&self.render, &other.render) && self.constrain_width == other.constrain_width
-    }
-}
-
-#[derive(Copy, Clone, Debug, Default, Eq, Ord, PartialOrd, PartialEq)]
-pub struct FoldPoint(pub Point);
-
-impl FoldPoint {
-    pub fn new(row: u32, column: u32) -> Self {
-        Self(Point::new(row, column))
-    }
-
-    pub fn row(self) -> u32 {
-        self.0.row
-    }
-
-    pub fn column(self) -> u32 {
-        self.0.column
-    }
-
-    pub fn row_mut(&mut self) -> &mut u32 {
-        &mut self.0.row
-    }
-
-    #[cfg(test)]
-    pub fn column_mut(&mut self) -> &mut u32 {
-        &mut self.0.column
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn to_inlay_point(self, snapshot: &FoldSnapshot) -> InlayPoint {
-        let (start, _, _) = snapshot
-            .transforms
-            .find::<Dimensions<FoldPoint, InlayPoint>, _>((), &self, Bias::Right);
-        let overshoot = self.0 - start.0.0;
-        InlayPoint(start.1.0 + overshoot)
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn to_offset(self, snapshot: &FoldSnapshot) -> FoldOffset {
-        let (start, _, item) = snapshot
-            .transforms
-            .find::<Dimensions<FoldPoint, TransformSummary>, _>((), &self, Bias::Right);
-        let overshoot = self.0 - start.1.output.lines;
-        let mut offset = start.1.output.len;
-        if !overshoot.is_zero() {
-            let transform = item.expect("display point out of range");
-            assert!(transform.placeholder.is_none());
-            let end_inlay_offset = snapshot
-                .inlay_snapshot
-                .to_offset(InlayPoint(start.1.input.lines + overshoot));
-            offset += end_inlay_offset.0 - start.1.input.len;
-        }
-        FoldOffset(offset)
-    }
-}
-
-impl<'a> sum_tree::Dimension<'a, TransformSummary> for FoldPoint {
-    fn zero(_cx: ()) -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, summary: &'a TransformSummary, _: ()) {
-        self.0 += &summary.output.lines;
-    }
-}
-
-pub(crate) struct FoldMapWriter<'a>(&'a mut FoldMap);
-
-impl FoldMapWriter<'_> {
-    #[ztracing::instrument(skip_all)]
-    pub(crate) fn fold<T: ToOffset>(
-        &mut self,
-        ranges: impl IntoIterator<Item = (Range<T>, FoldPlaceholder)>,
-    ) -> (FoldSnapshot, Vec<FoldEdit>) {
-        let mut edits = Vec::new();
-        let mut folds = Vec::new();
-        let snapshot = self.0.snapshot.inlay_snapshot.clone();
-        for (range, fold_text) in ranges.into_iter() {
-            let buffer = &snapshot.buffer;
-            let range = range.start.to_offset(buffer)..range.end.to_offset(buffer);
-
-            // Ignore any empty ranges.
-            if range.start == range.end {
-                continue;
-            }
-
-            // For now, ignore any ranges that span an excerpt boundary.
-            let fold_range =
-                FoldRange(buffer.anchor_after(range.start)..buffer.anchor_before(range.end));
-            if fold_range.0.start.excerpt_id != fold_range.0.end.excerpt_id {
-                continue;
-            }
-
-            folds.push(Fold {
-                id: FoldId(post_inc(&mut self.0.next_fold_id.0)),
-                range: fold_range,
-                placeholder: fold_text,
-            });
-
-            let inlay_range =
-                snapshot.to_inlay_offset(range.start)..snapshot.to_inlay_offset(range.end);
-            edits.push(InlayEdit {
-                old: inlay_range.clone(),
-                new: inlay_range,
-            });
-        }
-
-        let buffer = &snapshot.buffer;
-        folds.sort_unstable_by(|a, b| sum_tree::SeekTarget::cmp(&a.range, &b.range, buffer));
-
-        self.0.snapshot.folds = {
-            let mut new_tree = SumTree::new(buffer);
-            let mut cursor = self.0.snapshot.folds.cursor::<FoldRange>(buffer);
-            for fold in folds {
-                self.0.snapshot.fold_metadata_by_id.insert(
-                    fold.id,
-                    FoldMetadata {
-                        range: fold.range.clone(),
-                        width: None,
-                    },
-                );
-                new_tree.append(cursor.slice(&fold.range, Bias::Right), buffer);
-                new_tree.push(fold, buffer);
-            }
-            new_tree.append(cursor.suffix(), buffer);
-            new_tree
-        };
-
-        let edits = consolidate_inlay_edits(edits);
-        let edits = self.0.sync(snapshot.clone(), edits);
-        (self.0.snapshot.clone(), edits)
-    }
-
-    /// Removes any folds with the given ranges.
-    #[ztracing::instrument(skip_all)]
-    pub(crate) fn remove_folds<T: ToOffset>(
-        &mut self,
-        ranges: impl IntoIterator<Item = Range<T>>,
-        type_id: TypeId,
-    ) -> (FoldSnapshot, Vec<FoldEdit>) {
-        self.remove_folds_with(
-            ranges,
-            |fold| fold.placeholder.type_tag == Some(type_id),
-            false,
-        )
-    }
-
-    /// Removes any folds whose ranges intersect the given ranges.
-    #[ztracing::instrument(skip_all)]
-    pub(crate) fn unfold_intersecting<T: ToOffset>(
-        &mut self,
-        ranges: impl IntoIterator<Item = Range<T>>,
-        inclusive: bool,
-    ) -> (FoldSnapshot, Vec<FoldEdit>) {
-        self.remove_folds_with(ranges, |_| true, inclusive)
-    }
-
-    /// Removes any folds that intersect the given ranges and for which the given predicate
-    /// returns true.
-    #[ztracing::instrument(skip_all)]
-    fn remove_folds_with<T: ToOffset>(
-        &mut self,
-        ranges: impl IntoIterator<Item = Range<T>>,
-        should_unfold: impl Fn(&Fold) -> bool,
-        inclusive: bool,
-    ) -> (FoldSnapshot, Vec<FoldEdit>) {
-        let mut edits = Vec::new();
-        let mut fold_ixs_to_delete = Vec::new();
-        let snapshot = self.0.snapshot.inlay_snapshot.clone();
-        let buffer = &snapshot.buffer;
-        for range in ranges.into_iter() {
-            let range = range.start.to_offset(buffer)..range.end.to_offset(buffer);
-            let mut folds_cursor =
-                intersecting_folds(&snapshot, &self.0.snapshot.folds, range.clone(), inclusive);
-            while let Some(fold) = folds_cursor.item() {
-                let offset_range =
-                    fold.range.start.to_offset(buffer)..fold.range.end.to_offset(buffer);
-                if should_unfold(fold) {
-                    if offset_range.end > offset_range.start {
-                        let inlay_range = snapshot.to_inlay_offset(offset_range.start)
-                            ..snapshot.to_inlay_offset(offset_range.end);
-                        edits.push(InlayEdit {
-                            old: inlay_range.clone(),
-                            new: inlay_range,
-                        });
-                    }
-                    fold_ixs_to_delete.push(*folds_cursor.start());
-                    self.0.snapshot.fold_metadata_by_id.remove(&fold.id);
-                }
-                folds_cursor.next();
-            }
-        }
-
-        fold_ixs_to_delete.sort_unstable();
-        fold_ixs_to_delete.dedup();
-
-        self.0.snapshot.folds = {
-            let mut cursor = self.0.snapshot.folds.cursor::<MultiBufferOffset>(buffer);
-            let mut folds = SumTree::new(buffer);
-            for fold_ix in fold_ixs_to_delete {
-                folds.append(cursor.slice(&fold_ix, Bias::Right), buffer);
-                cursor.next();
-            }
-            folds.append(cursor.suffix(), buffer);
-            folds
-        };
-
-        let edits = consolidate_inlay_edits(edits);
-        let edits = self.0.sync(snapshot.clone(), edits);
-        (self.0.snapshot.clone(), edits)
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub(crate) fn update_fold_widths(
-        &mut self,
-        new_widths: impl IntoIterator<Item = (ChunkRendererId, Pixels)>,
-    ) -> (FoldSnapshot, Vec<FoldEdit>) {
-        let mut edits = Vec::new();
-        let inlay_snapshot = self.0.snapshot.inlay_snapshot.clone();
-        let buffer = &inlay_snapshot.buffer;
-
-        for (id, new_width) in new_widths {
-            let ChunkRendererId::Fold(id) = id else {
-                continue;
-            };
-            if let Some(metadata) = self.0.snapshot.fold_metadata_by_id.get(&id).cloned()
-                && Some(new_width) != metadata.width
-            {
-                let buffer_start = metadata.range.start.to_offset(buffer);
-                let buffer_end = metadata.range.end.to_offset(buffer);
-                let inlay_range = inlay_snapshot.to_inlay_offset(buffer_start)
-                    ..inlay_snapshot.to_inlay_offset(buffer_end);
-                edits.push(InlayEdit {
-                    old: inlay_range.clone(),
-                    new: inlay_range.clone(),
-                });
-
-                self.0.snapshot.fold_metadata_by_id.insert(
-                    id,
-                    FoldMetadata {
-                        range: metadata.range,
-                        width: Some(new_width),
-                    },
-                );
-            }
-        }
-
-        let edits = consolidate_inlay_edits(edits);
-        let edits = self.0.sync(inlay_snapshot, edits);
-        (self.0.snapshot.clone(), edits)
-    }
-}
-
-/// Decides where the fold indicators should be; also tracks parts of a source file that are currently folded.
-///
-/// See the [`display_map` module documentation](crate::display_map) for more information.
-pub struct FoldMap {
-    snapshot: FoldSnapshot,
-    next_fold_id: FoldId,
-}
-
-impl FoldMap {
-    #[ztracing::instrument(skip_all)]
-    pub fn new(inlay_snapshot: InlaySnapshot) -> (Self, FoldSnapshot) {
-        let this = Self {
-            snapshot: FoldSnapshot {
-                folds: SumTree::new(&inlay_snapshot.buffer),
-                transforms: SumTree::from_item(
-                    Transform {
-                        summary: TransformSummary {
-                            input: inlay_snapshot.text_summary(),
-                            output: inlay_snapshot.text_summary(),
-                        },
-                        placeholder: None,
-                    },
-                    (),
-                ),
-                inlay_snapshot: inlay_snapshot,
-                version: 0,
-                fold_metadata_by_id: TreeMap::default(),
-            },
-            next_fold_id: FoldId::default(),
-        };
-        let snapshot = this.snapshot.clone();
-        (this, snapshot)
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn read(
-        &mut self,
-        inlay_snapshot: InlaySnapshot,
-        edits: Vec<InlayEdit>,
-    ) -> (FoldSnapshot, Vec<FoldEdit>) {
-        let edits = self.sync(inlay_snapshot, edits);
-        self.check_invariants();
-        (self.snapshot.clone(), edits)
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub(crate) fn write(
-        &mut self,
-        inlay_snapshot: InlaySnapshot,
-        edits: Vec<InlayEdit>,
-    ) -> (FoldMapWriter<'_>, FoldSnapshot, Vec<FoldEdit>) {
-        let (snapshot, edits) = self.read(inlay_snapshot, edits);
-        (FoldMapWriter(self), snapshot, edits)
-    }
-
-    #[ztracing::instrument(skip_all)]
-    fn check_invariants(&self) {
-        if cfg!(test) {
-            assert_eq!(
-                self.snapshot.transforms.summary().input.len,
-                self.snapshot.inlay_snapshot.len().0,
-                "transform tree does not match inlay snapshot's length"
-            );
-
-            let mut prev_transform_isomorphic = false;
-            for transform in self.snapshot.transforms.iter() {
-                if !transform.is_fold() && prev_transform_isomorphic {
-                    panic!(
-                        "found adjacent isomorphic transforms: {:?}",
-                        self.snapshot.transforms.items(())
-                    );
-                }
-                prev_transform_isomorphic = !transform.is_fold();
-            }
-
-            let mut folds = self.snapshot.folds.iter().peekable();
-            while let Some(fold) = folds.next() {
-                if let Some(next_fold) = folds.peek() {
-                    let comparison = fold.range.cmp(&next_fold.range, self.snapshot.buffer());
-                    assert!(comparison.is_le());
-                }
-            }
-        }
-    }
-
-    #[ztracing::instrument(skip_all)]
-    fn sync(
-        &mut self,
-        inlay_snapshot: InlaySnapshot,
-        inlay_edits: Vec<InlayEdit>,
-    ) -> Vec<FoldEdit> {
-        if inlay_edits.is_empty() {
-            if self.snapshot.inlay_snapshot.version != inlay_snapshot.version {
-                self.snapshot.version += 1;
-            }
-            self.snapshot.inlay_snapshot = inlay_snapshot;
-            Vec::new()
-        } else {
-            let mut inlay_edits_iter = inlay_edits.iter().cloned().peekable();
-
-            let mut new_transforms = SumTree::<Transform>::default();
-            let mut cursor = self.snapshot.transforms.cursor::<InlayOffset>(());
-            cursor.seek(&InlayOffset(MultiBufferOffset(0)), Bias::Right);
-
-            while let Some(mut edit) = inlay_edits_iter.next() {
-                if let Some(item) = cursor.item()
-                    && !item.is_fold()
-                {
-                    new_transforms.update_last(
-                        |transform| {
-                            if !transform.is_fold() {
-                                transform.summary.add_summary(&item.summary, ());
-                                cursor.next();
-                            }
-                        },
-                        (),
-                    );
-                }
-                new_transforms.append(cursor.slice(&edit.old.start, Bias::Left), ());
-                edit.new.start -= edit.old.start - *cursor.start();
-                edit.old.start = *cursor.start();
-
-                cursor.seek(&edit.old.end, Bias::Right);
-                cursor.next();
-
-                let mut delta = edit.new_len() as isize - edit.old_len() as isize;
-                loop {
-                    edit.old.end = *cursor.start();
-
-                    if let Some(next_edit) = inlay_edits_iter.peek() {
-                        if next_edit.old.start > edit.old.end {
-                            break;
-                        }
-
-                        let next_edit = inlay_edits_iter.next().unwrap();
-                        delta += next_edit.new_len() as isize - next_edit.old_len() as isize;
-
-                        if next_edit.old.end >= edit.old.end {
-                            edit.old.end = next_edit.old.end;
-                            cursor.seek(&edit.old.end, Bias::Right);
-                            cursor.next();
-                        }
-                    } else {
-                        break;
-                    }
-                }
-
-                edit.new.end = InlayOffset(MultiBufferOffset(
-                    ((edit.new.start + edit.old_len()).0.0 as isize + delta) as usize,
-                ));
-
-                let anchor = inlay_snapshot
-                    .buffer
-                    .anchor_before(inlay_snapshot.to_buffer_offset(edit.new.start));
-                let mut folds_cursor = self
-                    .snapshot
-                    .folds
-                    .cursor::<FoldRange>(&inlay_snapshot.buffer);
-                folds_cursor.seek(&FoldRange(anchor..Anchor::max()), Bias::Left);
-
-                let mut folds = iter::from_fn({
-                    let inlay_snapshot = &inlay_snapshot;
-                    move || {
-                        let item = folds_cursor.item().map(|fold| {
-                            let buffer_start = fold.range.start.to_offset(&inlay_snapshot.buffer);
-                            let buffer_end = fold.range.end.to_offset(&inlay_snapshot.buffer);
-                            (
-                                fold.clone(),
-                                inlay_snapshot.to_inlay_offset(buffer_start)
-                                    ..inlay_snapshot.to_inlay_offset(buffer_end),
-                            )
-                        });
-                        folds_cursor.next();
-                        item
-                    }
-                })
-                .peekable();
-
-                while folds
-                    .peek()
-                    .is_some_and(|(_, fold_range)| fold_range.start < edit.new.end)
-                {
-                    let (fold, mut fold_range) = folds.next().unwrap();
-                    let sum = new_transforms.summary();
-
-                    assert!(fold_range.start.0 >= sum.input.len);
-
-                    while folds.peek().is_some_and(|(next_fold, next_fold_range)| {
-                        next_fold_range.start < fold_range.end
-                            || (next_fold_range.start == fold_range.end
-                                && fold.placeholder.merge_adjacent
-                                && next_fold.placeholder.merge_adjacent)
-                    }) {
-                        let (_, next_fold_range) = folds.next().unwrap();
-                        if next_fold_range.end > fold_range.end {
-                            fold_range.end = next_fold_range.end;
-                        }
-                    }
-
-                    if fold_range.start.0 > sum.input.len {
-                        let text_summary = inlay_snapshot
-                            .text_summary_for_range(InlayOffset(sum.input.len)..fold_range.start);
-                        push_isomorphic(&mut new_transforms, text_summary);
-                    }
-
-                    if fold_range.end > fold_range.start {
-                        const ELLIPSIS: &str = "⋯";
-
-                        let fold_id = fold.id;
-                        new_transforms.push(
-                            Transform {
-                                summary: TransformSummary {
-                                    output: MBTextSummary::from(ELLIPSIS),
-                                    input: inlay_snapshot
-                                        .text_summary_for_range(fold_range.start..fold_range.end),
-                                },
-                                placeholder: Some(TransformPlaceholder {
-                                    text: ELLIPSIS,
-                                    chars: 1,
-                                    renderer: ChunkRenderer {
-                                        id: ChunkRendererId::Fold(fold.id),
-                                        render: Arc::new(move |cx| {
-                                            (fold.placeholder.render)(
-                                                fold_id,
-                                                fold.range.0.clone(),
-                                                cx.context,
-                                            )
-                                        }),
-                                        constrain_width: fold.placeholder.constrain_width,
-                                        measured_width: self.snapshot.fold_width(&fold_id),
-                                    },
-                                }),
-                            },
-                            (),
-                        );
-                    }
-                }
-
-                let sum = new_transforms.summary();
-                if sum.input.len < edit.new.end.0 {
-                    let text_summary = inlay_snapshot
-                        .text_summary_for_range(InlayOffset(sum.input.len)..edit.new.end);
-                    push_isomorphic(&mut new_transforms, text_summary);
-                }
-            }
-
-            new_transforms.append(cursor.suffix(), ());
-            if new_transforms.is_empty() {
-                let text_summary = inlay_snapshot.text_summary();
-                push_isomorphic(&mut new_transforms, text_summary);
-            }
-
-            drop(cursor);
-
-            let mut fold_edits = Vec::with_capacity(inlay_edits.len());
-            {
-                let mut old_transforms = self
-                    .snapshot
-                    .transforms
-                    .cursor::<Dimensions<InlayOffset, FoldOffset>>(());
-                let mut new_transforms =
-                    new_transforms.cursor::<Dimensions<InlayOffset, FoldOffset>>(());
-
-                for mut edit in inlay_edits {
-                    old_transforms.seek(&edit.old.start, Bias::Left);
-                    if old_transforms.item().is_some_and(|t| t.is_fold()) {
-                        edit.old.start = old_transforms.start().0;
-                    }
-                    let old_start =
-                        old_transforms.start().1.0 + (edit.old.start - old_transforms.start().0);
-
-                    old_transforms.seek_forward(&edit.old.end, Bias::Right);
-                    if old_transforms.item().is_some_and(|t| t.is_fold()) {
-                        old_transforms.next();
-                        edit.old.end = old_transforms.start().0;
-                    }
-                    let old_end =
-                        old_transforms.start().1.0 + (edit.old.end - old_transforms.start().0);
-
-                    new_transforms.seek(&edit.new.start, Bias::Left);
-                    if new_transforms.item().is_some_and(|t| t.is_fold()) {
-                        edit.new.start = new_transforms.start().0;
-                    }
-                    let new_start =
-                        new_transforms.start().1.0 + (edit.new.start - new_transforms.start().0);
-
-                    new_transforms.seek_forward(&edit.new.end, Bias::Right);
-                    if new_transforms.item().is_some_and(|t| t.is_fold()) {
-                        new_transforms.next();
-                        edit.new.end = new_transforms.start().0;
-                    }
-                    let new_end =
-                        new_transforms.start().1.0 + (edit.new.end - new_transforms.start().0);
-
-                    fold_edits.push(FoldEdit {
-                        old: FoldOffset(old_start)..FoldOffset(old_end),
-                        new: FoldOffset(new_start)..FoldOffset(new_end),
-                    });
-                }
-
-                fold_edits = consolidate_fold_edits(fold_edits);
-            }
-
-            self.snapshot.transforms = new_transforms;
-            self.snapshot.inlay_snapshot = inlay_snapshot;
-            self.snapshot.version += 1;
-            fold_edits
-        }
-    }
-}
-
-#[derive(Clone)]
-pub struct FoldSnapshot {
-    pub inlay_snapshot: InlaySnapshot,
-    transforms: SumTree<Transform>,
-    folds: SumTree<Fold>,
-    fold_metadata_by_id: TreeMap<FoldId, FoldMetadata>,
-    pub version: usize,
-}
-
-impl Deref for FoldSnapshot {
-    type Target = InlaySnapshot;
-
-    fn deref(&self) -> &Self::Target {
-        &self.inlay_snapshot
-    }
-}
-
-impl FoldSnapshot {
-    pub fn buffer(&self) -> &MultiBufferSnapshot {
-        &self.inlay_snapshot.buffer
-    }
-
-    #[ztracing::instrument(skip_all)]
-    fn fold_width(&self, fold_id: &FoldId) -> Option<Pixels> {
-        self.fold_metadata_by_id.get(fold_id)?.width
-    }
-
-    #[cfg(test)]
-    pub fn text(&self) -> String {
-        self.chunks(
-            FoldOffset(MultiBufferOffset(0))..self.len(),
-            false,
-            Highlights::default(),
-        )
-        .map(|c| c.text)
-        .collect()
-    }
-
-    #[cfg(test)]
-    pub fn fold_count(&self) -> usize {
-        self.folds.items(&self.inlay_snapshot.buffer).len()
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn text_summary_for_range(&self, range: Range<FoldPoint>) -> MBTextSummary {
-        let mut summary = MBTextSummary::default();
-
-        let mut cursor = self
-            .transforms
-            .cursor::<Dimensions<FoldPoint, InlayPoint>>(());
-        cursor.seek(&range.start, Bias::Right);
-        if let Some(transform) = cursor.item() {
-            let start_in_transform = range.start.0 - cursor.start().0.0;
-            let end_in_transform = cmp::min(range.end, cursor.end().0).0 - cursor.start().0.0;
-            if let Some(placeholder) = transform.placeholder.as_ref() {
-                summary = MBTextSummary::from(
-                    &placeholder.text
-                        [start_in_transform.column as usize..end_in_transform.column as usize],
-                );
-            } else {
-                let inlay_start = self
-                    .inlay_snapshot
-                    .to_offset(InlayPoint(cursor.start().1.0 + start_in_transform));
-                let inlay_end = self
-                    .inlay_snapshot
-                    .to_offset(InlayPoint(cursor.start().1.0 + end_in_transform));
-                summary = self
-                    .inlay_snapshot
-                    .text_summary_for_range(inlay_start..inlay_end);
-            }
-        }
-
-        if range.end > cursor.end().0 {
-            cursor.next();
-            summary += cursor
-                .summary::<_, TransformSummary>(&range.end, Bias::Right)
-                .output;
-            if let Some(transform) = cursor.item() {
-                let end_in_transform = range.end.0 - cursor.start().0.0;
-                if let Some(placeholder) = transform.placeholder.as_ref() {
-                    summary +=
-                        MBTextSummary::from(&placeholder.text[..end_in_transform.column as usize]);
-                } else {
-                    let inlay_start = self.inlay_snapshot.to_offset(cursor.start().1);
-                    let inlay_end = self
-                        .inlay_snapshot
-                        .to_offset(InlayPoint(cursor.start().1.0 + end_in_transform));
-                    summary += self
-                        .inlay_snapshot
-                        .text_summary_for_range(inlay_start..inlay_end);
-                }
-            }
-        }
-
-        summary
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn to_fold_point(&self, point: InlayPoint, bias: Bias) -> FoldPoint {
-        let (start, end, item) = self
-            .transforms
-            .find::<Dimensions<InlayPoint, FoldPoint>, _>((), &point, Bias::Right);
-        if item.is_some_and(|t| t.is_fold()) {
-            if bias == Bias::Left || point == start.0 {
-                start.1
-            } else {
-                end.1
-            }
-        } else {
-            let overshoot = point.0 - start.0.0;
-            FoldPoint(cmp::min(start.1.0 + overshoot, end.1.0))
-        }
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn fold_point_cursor(&self) -> FoldPointCursor<'_> {
-        let cursor = self
-            .transforms
-            .cursor::<Dimensions<InlayPoint, FoldPoint>>(());
-        FoldPointCursor { cursor }
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn len(&self) -> FoldOffset {
-        FoldOffset(self.transforms.summary().output.len)
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn line_len(&self, row: u32) -> u32 {
-        let line_start = FoldPoint::new(row, 0).to_offset(self).0;
-        let line_end = if row >= self.max_point().row() {
-            self.len().0
-        } else {
-            FoldPoint::new(row + 1, 0).to_offset(self).0 - 1
-        };
-        (line_end - line_start) as u32
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn row_infos(&self, start_row: u32) -> FoldRows<'_> {
-        if start_row > self.transforms.summary().output.lines.row {
-            panic!("invalid display row {}", start_row);
-        }
-
-        let fold_point = FoldPoint::new(start_row, 0);
-        let mut cursor = self
-            .transforms
-            .cursor::<Dimensions<FoldPoint, InlayPoint>>(());
-        cursor.seek(&fold_point, Bias::Left);
-
-        let overshoot = fold_point.0 - cursor.start().0.0;
-        let inlay_point = InlayPoint(cursor.start().1.0 + overshoot);
-        let input_rows = self.inlay_snapshot.row_infos(inlay_point.row());
-
-        FoldRows {
-            fold_point,
-            input_rows,
-            cursor,
-        }
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn max_point(&self) -> FoldPoint {
-        FoldPoint(self.transforms.summary().output.lines)
-    }
-
-    #[cfg(test)]
-    pub fn longest_row(&self) -> u32 {
-        self.transforms.summary().output.longest_row
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn folds_in_range<T>(&self, range: Range<T>) -> impl Iterator<Item = &Fold>
-    where
-        T: ToOffset,
-    {
-        let buffer = &self.inlay_snapshot.buffer;
-        let range = range.start.to_offset(buffer)..range.end.to_offset(buffer);
-        let mut folds = intersecting_folds(&self.inlay_snapshot, &self.folds, range, false);
-        iter::from_fn(move || {
-            let item = folds.item();
-            folds.next();
-            item
-        })
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn intersects_fold<T>(&self, offset: T) -> bool
-    where
-        T: ToOffset,
-    {
-        let buffer_offset = offset.to_offset(&self.inlay_snapshot.buffer);
-        let inlay_offset = self.inlay_snapshot.to_inlay_offset(buffer_offset);
-        let (_, _, item) = self
-            .transforms
-            .find::<InlayOffset, _>((), &inlay_offset, Bias::Right);
-        item.is_some_and(|t| t.placeholder.is_some())
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn is_line_folded(&self, buffer_row: MultiBufferRow) -> bool {
-        let mut inlay_point = self
-            .inlay_snapshot
-            .to_inlay_point(Point::new(buffer_row.0, 0));
-        let mut cursor = self.transforms.cursor::<InlayPoint>(());
-        cursor.seek(&inlay_point, Bias::Right);
-        loop {
-            match cursor.item() {
-                Some(transform) => {
-                    let buffer_point = self.inlay_snapshot.to_buffer_point(inlay_point);
-                    if buffer_point.row != buffer_row.0 {
-                        return false;
-                    } else if transform.placeholder.is_some() {
-                        return true;
-                    }
-                }
-                None => return false,
-            }
-
-            if cursor.end().row() == inlay_point.row() {
-                cursor.next();
-            } else {
-                inlay_point.0 += Point::new(1, 0);
-                cursor.seek(&inlay_point, Bias::Right);
-            }
-        }
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub(crate) fn chunks<'a>(
-        &'a self,
-        range: Range<FoldOffset>,
-        language_aware: bool,
-        highlights: Highlights<'a>,
-    ) -> FoldChunks<'a> {
-        let mut transform_cursor = self
-            .transforms
-            .cursor::<Dimensions<FoldOffset, InlayOffset>>(());
-        transform_cursor.seek(&range.start, Bias::Right);
-
-        let inlay_start = {
-            let overshoot = range.start - transform_cursor.start().0;
-            transform_cursor.start().1 + overshoot
-        };
-
-        let transform_end = transform_cursor.end();
-
-        let inlay_end = if transform_cursor
-            .item()
-            .is_none_or(|transform| transform.is_fold())
-        {
-            inlay_start
-        } else if range.end < transform_end.0 {
-            let overshoot = range.end - transform_cursor.start().0;
-            transform_cursor.start().1 + overshoot
-        } else {
-            transform_end.1
-        };
-
-        FoldChunks {
-            transform_cursor,
-            inlay_chunks: self.inlay_snapshot.chunks(
-                inlay_start..inlay_end,
-                language_aware,
-                highlights,
-            ),
-            inlay_chunk: None,
-            inlay_offset: inlay_start,
-            output_offset: range.start,
-            max_output_offset: range.end,
-        }
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn chars_at(&self, start: FoldPoint) -> impl '_ + Iterator<Item = char> {
-        self.chunks(
-            start.to_offset(self)..self.len(),
-            false,
-            Highlights::default(),
-        )
-        .flat_map(|chunk| chunk.text.chars())
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn chunks_at(&self, start: FoldPoint) -> FoldChunks<'_> {
-        self.chunks(
-            start.to_offset(self)..self.len(),
-            false,
-            Highlights::default(),
-        )
-    }
-
-    #[cfg(test)]
-    #[ztracing::instrument(skip_all)]
-    pub fn clip_offset(&self, offset: FoldOffset, bias: Bias) -> FoldOffset {
-        if offset > self.len() {
-            self.len()
-        } else {
-            self.clip_point(offset.to_point(self), bias).to_offset(self)
-        }
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn clip_point(&self, point: FoldPoint, bias: Bias) -> FoldPoint {
-        let (start, end, item) = self
-            .transforms
-            .find::<Dimensions<FoldPoint, InlayPoint>, _>((), &point, Bias::Right);
-        if let Some(transform) = item {
-            let transform_start = start.0.0;
-            if transform.placeholder.is_some() {
-                if point.0 == transform_start || matches!(bias, Bias::Left) {
-                    FoldPoint(transform_start)
-                } else {
-                    FoldPoint(end.0.0)
-                }
-            } else {
-                let overshoot = InlayPoint(point.0 - transform_start);
-                let inlay_point = start.1 + overshoot;
-                let clipped_inlay_point = self.inlay_snapshot.clip_point(inlay_point, bias);
-                FoldPoint(start.0.0 + (clipped_inlay_point - start.1).0)
-            }
-        } else {
-            FoldPoint(self.transforms.summary().output.lines)
-        }
-    }
-}
-
-pub struct FoldPointCursor<'transforms> {
-    cursor: Cursor<'transforms, 'static, Transform, Dimensions<InlayPoint, FoldPoint>>,
-}
-
-impl FoldPointCursor<'_> {
-    #[ztracing::instrument(skip_all)]
-    pub fn map(&mut self, point: InlayPoint, bias: Bias) -> FoldPoint {
-        let cursor = &mut self.cursor;
-        if cursor.did_seek() {
-            cursor.seek_forward(&point, Bias::Right);
-        } else {
-            cursor.seek(&point, Bias::Right);
-        }
-        if cursor.item().is_some_and(|t| t.is_fold()) {
-            if bias == Bias::Left || point == cursor.start().0 {
-                cursor.start().1
-            } else {
-                cursor.end().1
-            }
-        } else {
-            let overshoot = point.0 - cursor.start().0.0;
-            FoldPoint(cmp::min(cursor.start().1.0 + overshoot, cursor.end().1.0))
-        }
-    }
-}
-
-fn push_isomorphic(transforms: &mut SumTree<Transform>, summary: MBTextSummary) {
-    let mut did_merge = false;
-    transforms.update_last(
-        |last| {
-            if !last.is_fold() {
-                last.summary.input += summary;
-                last.summary.output += summary;
-                did_merge = true;
-            }
-        },
-        (),
-    );
-    if !did_merge {
-        transforms.push(
-            Transform {
-                summary: TransformSummary {
-                    input: summary,
-                    output: summary,
-                },
-                placeholder: None,
-            },
-            (),
-        )
-    }
-}
-
-fn intersecting_folds<'a>(
-    inlay_snapshot: &'a InlaySnapshot,
-    folds: &'a SumTree<Fold>,
-    range: Range<MultiBufferOffset>,
-    inclusive: bool,
-) -> FilterCursor<'a, 'a, impl 'a + FnMut(&FoldSummary) -> bool, Fold, MultiBufferOffset> {
-    let buffer = &inlay_snapshot.buffer;
-    let start = buffer.anchor_before(range.start.to_offset(buffer));
-    let end = buffer.anchor_after(range.end.to_offset(buffer));
-    let mut cursor = folds.filter::<_, MultiBufferOffset>(buffer, move |summary| {
-        let start_cmp = start.cmp(&summary.max_end, buffer);
-        let end_cmp = end.cmp(&summary.min_start, buffer);
-
-        if inclusive {
-            start_cmp <= Ordering::Equal && end_cmp >= Ordering::Equal
-        } else {
-            start_cmp == Ordering::Less && end_cmp == Ordering::Greater
-        }
-    });
-    cursor.next();
-    cursor
-}
-
-fn consolidate_inlay_edits(mut edits: Vec<InlayEdit>) -> Vec<InlayEdit> {
-    edits.sort_unstable_by(|a, b| {
-        a.old
-            .start
-            .cmp(&b.old.start)
-            .then_with(|| b.old.end.cmp(&a.old.end))
-    });
-
-    let _old_alloc_ptr = edits.as_ptr();
-    let mut inlay_edits = edits.into_iter();
-
-    if let Some(mut first_edit) = inlay_edits.next() {
-        // This code relies on reusing allocations from the Vec<_> - at the time of writing .flatten() prevents them.
-        #[allow(clippy::filter_map_identity)]
-        let mut v: Vec<_> = inlay_edits
-            .scan(&mut first_edit, |prev_edit, edit| {
-                if prev_edit.old.end >= edit.old.start {
-                    prev_edit.old.end = prev_edit.old.end.max(edit.old.end);
-                    prev_edit.new.start = prev_edit.new.start.min(edit.new.start);
-                    prev_edit.new.end = prev_edit.new.end.max(edit.new.end);
-                    Some(None) // Skip this edit, it's merged
-                } else {
-                    let prev = std::mem::replace(*prev_edit, edit);
-                    Some(Some(prev)) // Yield the previous edit
-                }
-            })
-            .filter_map(|x| x)
-            .collect();
-        v.push(first_edit.clone());
-        debug_assert_eq!(_old_alloc_ptr, v.as_ptr(), "Inlay edits were reallocated");
-        v
-    } else {
-        vec![]
-    }
-}
-
-fn consolidate_fold_edits(mut edits: Vec<FoldEdit>) -> Vec<FoldEdit> {
-    edits.sort_unstable_by(|a, b| {
-        a.old
-            .start
-            .cmp(&b.old.start)
-            .then_with(|| b.old.end.cmp(&a.old.end))
-    });
-    let _old_alloc_ptr = edits.as_ptr();
-    let mut fold_edits = edits.into_iter();
-
-    if let Some(mut first_edit) = fold_edits.next() {
-        // This code relies on reusing allocations from the Vec<_> - at the time of writing .flatten() prevents them.
-        #[allow(clippy::filter_map_identity)]
-        let mut v: Vec<_> = fold_edits
-            .scan(&mut first_edit, |prev_edit, edit| {
-                if prev_edit.old.end >= edit.old.start {
-                    prev_edit.old.end = prev_edit.old.end.max(edit.old.end);
-                    prev_edit.new.start = prev_edit.new.start.min(edit.new.start);
-                    prev_edit.new.end = prev_edit.new.end.max(edit.new.end);
-                    Some(None) // Skip this edit, it's merged
-                } else {
-                    let prev = std::mem::replace(*prev_edit, edit);
-                    Some(Some(prev)) // Yield the previous edit
-                }
-            })
-            .filter_map(|x| x)
-            .collect();
-        v.push(first_edit.clone());
-        v
-    } else {
-        vec![]
-    }
-}
-
-#[derive(Clone, Debug, Default)]
-struct Transform {
-    summary: TransformSummary,
-    placeholder: Option<TransformPlaceholder>,
-}
-
-#[derive(Clone, Debug)]
-struct TransformPlaceholder {
-    text: &'static str,
-    chars: u128,
-    renderer: ChunkRenderer,
-}
-
-impl Transform {
-    fn is_fold(&self) -> bool {
-        self.placeholder.is_some()
-    }
-}
-
-#[derive(Clone, Debug, Default, Eq, PartialEq)]
-struct TransformSummary {
-    output: MBTextSummary,
-    input: MBTextSummary,
-}
-
-impl sum_tree::Item for Transform {
-    type Summary = TransformSummary;
-
-    fn summary(&self, _cx: ()) -> Self::Summary {
-        self.summary.clone()
-    }
-}
-
-impl sum_tree::ContextLessSummary for TransformSummary {
-    fn zero() -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, other: &Self) {
-        self.input += other.input;
-        self.output += other.output;
-    }
-}
-
-#[derive(Copy, Clone, Eq, PartialEq, Debug, Default, Ord, PartialOrd, Hash)]
-pub struct FoldId(pub(super) usize);
-
-impl From<FoldId> for ElementId {
-    fn from(val: FoldId) -> Self {
-        val.0.into()
-    }
-}
-
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub struct Fold {
-    pub id: FoldId,
-    pub range: FoldRange,
-    pub placeholder: FoldPlaceholder,
-}
-
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub struct FoldRange(Range<Anchor>);
-
-impl Deref for FoldRange {
-    type Target = Range<Anchor>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl DerefMut for FoldRange {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.0
-    }
-}
-
-impl Default for FoldRange {
-    fn default() -> Self {
-        Self(Anchor::min()..Anchor::max())
-    }
-}
-
-#[derive(Clone, Debug)]
-struct FoldMetadata {
-    range: FoldRange,
-    width: Option<Pixels>,
-}
-
-impl sum_tree::Item for Fold {
-    type Summary = FoldSummary;
-
-    fn summary(&self, _cx: &MultiBufferSnapshot) -> Self::Summary {
-        FoldSummary {
-            start: self.range.start,
-            end: self.range.end,
-            min_start: self.range.start,
-            max_end: self.range.end,
-            count: 1,
-        }
-    }
-}
-
-#[derive(Clone, Debug)]
-pub struct FoldSummary {
-    start: Anchor,
-    end: Anchor,
-    min_start: Anchor,
-    max_end: Anchor,
-    count: usize,
-}
-
-impl Default for FoldSummary {
-    fn default() -> Self {
-        Self {
-            start: Anchor::min(),
-            end: Anchor::max(),
-            min_start: Anchor::max(),
-            max_end: Anchor::min(),
-            count: 0,
-        }
-    }
-}
-
-impl sum_tree::Summary for FoldSummary {
-    type Context<'a> = &'a MultiBufferSnapshot;
-
-    fn zero(_cx: &MultiBufferSnapshot) -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, other: &Self, buffer: Self::Context<'_>) {
-        if other.min_start.cmp(&self.min_start, buffer) == Ordering::Less {
-            self.min_start = other.min_start;
-        }
-        if other.max_end.cmp(&self.max_end, buffer) == Ordering::Greater {
-            self.max_end = other.max_end;
-        }
-
-        #[cfg(debug_assertions)]
-        {
-            let start_comparison = self.start.cmp(&other.start, buffer);
-            assert!(start_comparison <= Ordering::Equal);
-            if start_comparison == Ordering::Equal {
-                assert!(self.end.cmp(&other.end, buffer) >= Ordering::Equal);
-            }
-        }
-
-        self.start = other.start;
-        self.end = other.end;
-        self.count += other.count;
-    }
-}
-
-impl<'a> sum_tree::Dimension<'a, FoldSummary> for FoldRange {
-    fn zero(_cx: &MultiBufferSnapshot) -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, summary: &'a FoldSummary, _: &MultiBufferSnapshot) {
-        self.0.start = summary.start;
-        self.0.end = summary.end;
-    }
-}
-
-impl sum_tree::SeekTarget<'_, FoldSummary, FoldRange> for FoldRange {
-    fn cmp(&self, other: &Self, buffer: &MultiBufferSnapshot) -> Ordering {
-        AnchorRangeExt::cmp(&self.0, &other.0, buffer)
-    }
-}
-
-impl<'a> sum_tree::Dimension<'a, FoldSummary> for MultiBufferOffset {
-    fn zero(_cx: &MultiBufferSnapshot) -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, summary: &'a FoldSummary, _: &MultiBufferSnapshot) {
-        *self += summary.count;
-    }
-}
-
-#[derive(Clone)]
-pub struct FoldRows<'a> {
-    cursor: Cursor<'a, 'static, Transform, Dimensions<FoldPoint, InlayPoint>>,
-    input_rows: InlayBufferRows<'a>,
-    fold_point: FoldPoint,
-}
-
-impl FoldRows<'_> {
-    #[ztracing::instrument(skip_all)]
-    pub(crate) fn seek(&mut self, row: u32) {
-        let fold_point = FoldPoint::new(row, 0);
-        self.cursor.seek(&fold_point, Bias::Left);
-        let overshoot = fold_point.0 - self.cursor.start().0.0;
-        let inlay_point = InlayPoint(self.cursor.start().1.0 + overshoot);
-        self.input_rows.seek(inlay_point.row());
-        self.fold_point = fold_point;
-    }
-}
-
-impl Iterator for FoldRows<'_> {
-    type Item = RowInfo;
-
-    #[ztracing::instrument(skip_all)]
-    fn next(&mut self) -> Option<Self::Item> {
-        let mut traversed_fold = false;
-        while self.fold_point > self.cursor.end().0 {
-            self.cursor.next();
-            traversed_fold = true;
-            if self.cursor.item().is_none() {
-                break;
-            }
-        }
-
-        if self.cursor.item().is_some() {
-            if traversed_fold {
-                self.input_rows.seek(self.cursor.start().1.0.row);
-                self.input_rows.next();
-            }
-            *self.fold_point.row_mut() += 1;
-            self.input_rows.next()
-        } else {
-            None
-        }
-    }
-}
-
-/// A chunk of a buffer's text, along with its syntax highlight and
-/// diagnostic status.
-#[derive(Clone, Debug, Default)]
-pub struct Chunk<'a> {
-    /// The text of the chunk.
-    pub text: &'a str,
-    /// The syntax highlighting style of the chunk.
-    pub syntax_highlight_id: Option<HighlightId>,
-    /// The highlight style that has been applied to this chunk in
-    /// the editor.
-    pub highlight_style: Option<HighlightStyle>,
-    /// The severity of diagnostic associated with this chunk, if any.
-    pub diagnostic_severity: Option<lsp::DiagnosticSeverity>,
-    /// Whether this chunk of text is marked as unnecessary.
-    pub is_unnecessary: bool,
-    /// Whether this chunk of text should be underlined.
-    pub underline: bool,
-    /// Whether this chunk of text was originally a tab character.
-    pub is_tab: bool,
-    /// Whether this chunk of text was originally a tab character.
-    pub is_inlay: bool,
-    /// An optional recipe for how the chunk should be presented.
-    pub renderer: Option<ChunkRenderer>,
-    /// Bitmap of tab character locations in chunk
-    pub tabs: u128,
-    /// Bitmap of character locations in chunk
-    pub chars: u128,
-}
-
-#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
-pub enum ChunkRendererId {
-    Fold(FoldId),
-    Inlay(InlayId),
-}
-
-/// A recipe for how the chunk should be presented.
-#[derive(Clone)]
-pub struct ChunkRenderer {
-    /// The id of the renderer associated with this chunk.
-    pub id: ChunkRendererId,
-    /// Creates a custom element to represent this chunk.
-    pub render: Arc<dyn Send + Sync + Fn(&mut ChunkRendererContext) -> AnyElement>,
-    /// If true, the element is constrained to the shaped width of the text.
-    pub constrain_width: bool,
-    /// The width of the element, as measured during the last layout pass.
-    ///
-    /// This is None if the element has not been laid out yet.
-    pub measured_width: Option<Pixels>,
-}
-
-pub struct ChunkRendererContext<'a, 'b> {
-    pub window: &'a mut Window,
-    pub context: &'b mut App,
-    pub max_width: Pixels,
-}
-
-impl fmt::Debug for ChunkRenderer {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_struct("ChunkRenderer")
-            .field("constrain_width", &self.constrain_width)
-            .finish()
-    }
-}
-
-impl Deref for ChunkRendererContext<'_, '_> {
-    type Target = App;
-
-    fn deref(&self) -> &Self::Target {
-        self.context
-    }
-}
-
-impl DerefMut for ChunkRendererContext<'_, '_> {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        self.context
-    }
-}
-
-pub struct FoldChunks<'a> {
-    transform_cursor: Cursor<'a, 'static, Transform, Dimensions<FoldOffset, InlayOffset>>,
-    inlay_chunks: InlayChunks<'a>,
-    inlay_chunk: Option<(InlayOffset, InlayChunk<'a>)>,
-    inlay_offset: InlayOffset,
-    output_offset: FoldOffset,
-    max_output_offset: FoldOffset,
-}
-
-impl FoldChunks<'_> {
-    #[ztracing::instrument(skip_all)]
-    pub(crate) fn seek(&mut self, range: Range<FoldOffset>) {
-        self.transform_cursor.seek(&range.start, Bias::Right);
-
-        let inlay_start = {
-            let overshoot = range.start - self.transform_cursor.start().0;
-            self.transform_cursor.start().1 + overshoot
-        };
-
-        let transform_end = self.transform_cursor.end();
-
-        let inlay_end = if self
-            .transform_cursor
-            .item()
-            .is_none_or(|transform| transform.is_fold())
-        {
-            inlay_start
-        } else if range.end < transform_end.0 {
-            let overshoot = range.end - self.transform_cursor.start().0;
-            self.transform_cursor.start().1 + overshoot
-        } else {
-            transform_end.1
-        };
-
-        self.inlay_chunks.seek(inlay_start..inlay_end);
-        self.inlay_chunk = None;
-        self.inlay_offset = inlay_start;
-        self.output_offset = range.start;
-        self.max_output_offset = range.end;
-    }
-}
-
-impl<'a> Iterator for FoldChunks<'a> {
-    type Item = Chunk<'a>;
-
-    #[ztracing::instrument(skip_all)]
-    fn next(&mut self) -> Option<Self::Item> {
-        if self.output_offset >= self.max_output_offset {
-            return None;
-        }
-
-        let transform = self.transform_cursor.item()?;
-
-        // If we're in a fold, then return the fold's display text and
-        // advance the transform and buffer cursors to the end of the fold.
-        if let Some(placeholder) = transform.placeholder.as_ref() {
-            self.inlay_chunk.take();
-            self.inlay_offset += InlayOffset(transform.summary.input.len);
-
-            while self.inlay_offset >= self.transform_cursor.end().1
-                && self.transform_cursor.item().is_some()
-            {
-                self.transform_cursor.next();
-            }
-
-            self.output_offset.0 += placeholder.text.len();
-            return Some(Chunk {
-                text: placeholder.text,
-                chars: placeholder.chars,
-                renderer: Some(placeholder.renderer.clone()),
-                ..Default::default()
-            });
-        }
-
-        // When we reach a non-fold region, seek the underlying text
-        // chunk iterator to the next unfolded range.
-        if self.inlay_offset == self.transform_cursor.start().1
-            && self.inlay_chunks.offset() != self.inlay_offset
-        {
-            let transform_start = self.transform_cursor.start();
-            let transform_end = self.transform_cursor.end();
-            let inlay_end = if self.max_output_offset < transform_end.0 {
-                let overshoot = self.max_output_offset - transform_start.0;
-                transform_start.1 + overshoot
-            } else {
-                transform_end.1
-            };
-
-            self.inlay_chunks.seek(self.inlay_offset..inlay_end);
-        }
-
-        // Retrieve a chunk from the current location in the buffer.
-        if self.inlay_chunk.is_none() {
-            let chunk_offset = self.inlay_chunks.offset();
-            self.inlay_chunk = self.inlay_chunks.next().map(|chunk| (chunk_offset, chunk));
-        }
-
-        // Otherwise, take a chunk from the buffer's text.
-        if let Some((buffer_chunk_start, mut inlay_chunk)) = self.inlay_chunk.clone() {
-            let chunk = &mut inlay_chunk.chunk;
-            let buffer_chunk_end = buffer_chunk_start + chunk.text.len();
-            let transform_end = self.transform_cursor.end().1;
-            let chunk_end = buffer_chunk_end.min(transform_end);
-
-            let bit_start = self.inlay_offset - buffer_chunk_start;
-            let bit_end = chunk_end - buffer_chunk_start;
-            chunk.text = &chunk.text[bit_start..bit_end];
-
-            let bit_end = chunk_end - buffer_chunk_start;
-            let mask = 1u128.unbounded_shl(bit_end as u32).wrapping_sub(1);
-
-            chunk.tabs = (chunk.tabs >> bit_start) & mask;
-            chunk.chars = (chunk.chars >> bit_start) & mask;
-
-            if chunk_end == transform_end {
-                self.transform_cursor.next();
-            } else if chunk_end == buffer_chunk_end {
-                self.inlay_chunk.take();
-            }
-
-            self.inlay_offset = chunk_end;
-            self.output_offset.0 += chunk.text.len();
-            return Some(Chunk {
-                text: chunk.text,
-                tabs: chunk.tabs,
-                chars: chunk.chars,
-                syntax_highlight_id: chunk.syntax_highlight_id,
-                highlight_style: chunk.highlight_style,
-                diagnostic_severity: chunk.diagnostic_severity,
-                is_unnecessary: chunk.is_unnecessary,
-                is_tab: chunk.is_tab,
-                is_inlay: chunk.is_inlay,
-                underline: chunk.underline,
-                renderer: inlay_chunk.renderer,
-            });
-        }
-
-        None
-    }
-}
-
-#[derive(Copy, Clone, Debug, Default, Eq, Ord, PartialOrd, PartialEq)]
-pub struct FoldOffset(pub MultiBufferOffset);
-
-impl FoldOffset {
-    #[ztracing::instrument(skip_all)]
-    pub fn to_point(self, snapshot: &FoldSnapshot) -> FoldPoint {
-        let (start, _, item) = snapshot
-            .transforms
-            .find::<Dimensions<FoldOffset, TransformSummary>, _>((), &self, Bias::Right);
-        let overshoot = if item.is_none_or(|t| t.is_fold()) {
-            Point::new(0, (self.0 - start.0.0) as u32)
-        } else {
-            let inlay_offset = start.1.input.len + (self - start.0);
-            let inlay_point = snapshot.inlay_snapshot.to_point(InlayOffset(inlay_offset));
-            inlay_point.0 - start.1.input.lines
-        };
-        FoldPoint(start.1.output.lines + overshoot)
-    }
-
-    #[cfg(test)]
-    #[ztracing::instrument(skip_all)]
-    pub fn to_inlay_offset(self, snapshot: &FoldSnapshot) -> InlayOffset {
-        let (start, _, _) = snapshot
-            .transforms
-            .find::<Dimensions<FoldOffset, InlayOffset>, _>((), &self, Bias::Right);
-        let overshoot = self - start.0;
-        InlayOffset(start.1.0 + overshoot)
-    }
-}
-
-impl Add for FoldOffset {
-    type Output = Self;
-
-    fn add(self, rhs: Self) -> Self::Output {
-        Self(self.0 + rhs.0)
-    }
-}
-
-impl Sub for FoldOffset {
-    type Output = <MultiBufferOffset as Sub>::Output;
-
-    fn sub(self, rhs: Self) -> Self::Output {
-        self.0 - rhs.0
-    }
-}
-
-impl<T> SubAssign<T> for FoldOffset
-where
-    MultiBufferOffset: SubAssign<T>,
-{
-    fn sub_assign(&mut self, rhs: T) {
-        self.0 -= rhs;
-    }
-}
-
-impl<T> Add<T> for FoldOffset
-where
-    MultiBufferOffset: Add<T, Output = MultiBufferOffset>,
-{
-    type Output = Self;
-
-    fn add(self, rhs: T) -> Self::Output {
-        Self(self.0 + rhs)
-    }
-}
-
-impl AddAssign for FoldOffset {
-    fn add_assign(&mut self, rhs: Self) {
-        self.0 += rhs.0;
-    }
-}
-
-impl<T> AddAssign<T> for FoldOffset
-where
-    MultiBufferOffset: AddAssign<T>,
-{
-    fn add_assign(&mut self, rhs: T) {
-        self.0 += rhs;
-    }
-}
-
-impl<'a> sum_tree::Dimension<'a, TransformSummary> for FoldOffset {
-    fn zero(_cx: ()) -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, summary: &'a TransformSummary, _: ()) {
-        self.0 += summary.output.len;
-    }
-}
-
-impl<'a> sum_tree::Dimension<'a, TransformSummary> for InlayPoint {
-    fn zero(_cx: ()) -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, summary: &'a TransformSummary, _: ()) {
-        self.0 += &summary.input.lines;
-    }
-}
-
-impl<'a> sum_tree::Dimension<'a, TransformSummary> for InlayOffset {
-    fn zero(_cx: ()) -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, summary: &'a TransformSummary, _: ()) {
-        self.0 += summary.input.len;
-    }
-}
-
-pub type FoldEdit = Edit<FoldOffset>;
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::{MultiBuffer, ToPoint, display_map::inlay_map::InlayMap};
-    use Bias::{Left, Right};
-    use collections::HashSet;
-    use rand::prelude::*;
-    use settings::SettingsStore;
-    use std::{env, mem};
-    use text::Patch;
-    use util::RandomCharIter;
-    use util::test::sample_text;
-
-    #[gpui::test]
-    fn test_basic_folds(cx: &mut gpui::App) {
-        init_test(cx);
-        let buffer = MultiBuffer::build_simple(&sample_text(5, 6, 'a'), cx);
-        let subscription = buffer.update(cx, |buffer, _| buffer.subscribe());
-        let buffer_snapshot = buffer.read(cx).snapshot(cx);
-        let (mut inlay_map, inlay_snapshot) = InlayMap::new(buffer_snapshot);
-        let mut map = FoldMap::new(inlay_snapshot.clone()).0;
-
-        let (mut writer, _, _) = map.write(inlay_snapshot, vec![]);
-        let (snapshot2, edits) = writer.fold(vec![
-            (Point::new(0, 2)..Point::new(2, 2), FoldPlaceholder::test()),
-            (Point::new(2, 4)..Point::new(4, 1), FoldPlaceholder::test()),
-        ]);
-        assert_eq!(snapshot2.text(), "aa⋯cc⋯eeeee");
-        assert_eq!(
-            edits,
-            &[
-                FoldEdit {
-                    old: FoldOffset(MultiBufferOffset(2))..FoldOffset(MultiBufferOffset(16)),
-                    new: FoldOffset(MultiBufferOffset(2))..FoldOffset(MultiBufferOffset(5)),
-                },
-                FoldEdit {
-                    old: FoldOffset(MultiBufferOffset(18))..FoldOffset(MultiBufferOffset(29)),
-                    new: FoldOffset(MultiBufferOffset(7))..FoldOffset(MultiBufferOffset(10)),
-                },
-            ]
-        );
-
-        let buffer_snapshot = buffer.update(cx, |buffer, cx| {
-            buffer.edit(
-                vec![
-                    (Point::new(0, 0)..Point::new(0, 1), "123"),
-                    (Point::new(2, 3)..Point::new(2, 3), "123"),
-                ],
-                None,
-                cx,
-            );
-            buffer.snapshot(cx)
-        });
-
-        let (inlay_snapshot, inlay_edits) =
-            inlay_map.sync(buffer_snapshot, subscription.consume().into_inner());
-        let (snapshot3, edits) = map.read(inlay_snapshot, inlay_edits);
-        assert_eq!(snapshot3.text(), "123a⋯c123c⋯eeeee");
-        assert_eq!(
-            edits,
-            &[
-                FoldEdit {
-                    old: FoldOffset(MultiBufferOffset(0))..FoldOffset(MultiBufferOffset(1)),
-                    new: FoldOffset(MultiBufferOffset(0))..FoldOffset(MultiBufferOffset(3)),
-                },
-                FoldEdit {
-                    old: FoldOffset(MultiBufferOffset(6))..FoldOffset(MultiBufferOffset(6)),
-                    new: FoldOffset(MultiBufferOffset(8))..FoldOffset(MultiBufferOffset(11)),
-                },
-            ]
-        );
-
-        let buffer_snapshot = buffer.update(cx, |buffer, cx| {
-            buffer.edit([(Point::new(2, 6)..Point::new(4, 3), "456")], None, cx);
-            buffer.snapshot(cx)
-        });
-        let (inlay_snapshot, inlay_edits) =
-            inlay_map.sync(buffer_snapshot, subscription.consume().into_inner());
-        let (snapshot4, _) = map.read(inlay_snapshot.clone(), inlay_edits);
-        assert_eq!(snapshot4.text(), "123a⋯c123456eee");
-
-        let (mut writer, _, _) = map.write(inlay_snapshot.clone(), vec![]);
-        writer.unfold_intersecting(Some(Point::new(0, 4)..Point::new(0, 4)), false);
-        let (snapshot5, _) = map.read(inlay_snapshot.clone(), vec![]);
-        assert_eq!(snapshot5.text(), "123a⋯c123456eee");
-
-        let (mut writer, _, _) = map.write(inlay_snapshot.clone(), vec![]);
-        writer.unfold_intersecting(Some(Point::new(0, 4)..Point::new(0, 4)), true);
-        let (snapshot6, _) = map.read(inlay_snapshot, vec![]);
-        assert_eq!(snapshot6.text(), "123aaaaa\nbbbbbb\nccc123456eee");
-    }
-
-    #[gpui::test]
-    fn test_adjacent_folds(cx: &mut gpui::App) {
-        init_test(cx);
-        let buffer = MultiBuffer::build_simple("abcdefghijkl", cx);
-        let subscription = buffer.update(cx, |buffer, _| buffer.subscribe());
-        let buffer_snapshot = buffer.read(cx).snapshot(cx);
-        let (mut inlay_map, inlay_snapshot) = InlayMap::new(buffer_snapshot);
-
-        {
-            let mut map = FoldMap::new(inlay_snapshot.clone()).0;
-
-            let (mut writer, _, _) = map.write(inlay_snapshot.clone(), vec![]);
-            writer.fold(vec![(
-                MultiBufferOffset(5)..MultiBufferOffset(8),
-                FoldPlaceholder::test(),
-            )]);
-            let (snapshot, _) = map.read(inlay_snapshot.clone(), vec![]);
-            assert_eq!(snapshot.text(), "abcde⋯ijkl");
-
-            // Create an fold adjacent to the start of the first fold.
-            let (mut writer, _, _) = map.write(inlay_snapshot.clone(), vec![]);
-            writer.fold(vec![
-                (
-                    MultiBufferOffset(0)..MultiBufferOffset(1),
-                    FoldPlaceholder::test(),
-                ),
-                (
-                    MultiBufferOffset(2)..MultiBufferOffset(5),
-                    FoldPlaceholder::test(),
-                ),
-            ]);
-            let (snapshot, _) = map.read(inlay_snapshot.clone(), vec![]);
-            assert_eq!(snapshot.text(), "⋯b⋯ijkl");
-
-            // Create an fold adjacent to the end of the first fold.
-            let (mut writer, _, _) = map.write(inlay_snapshot.clone(), vec![]);
-            writer.fold(vec![
-                (
-                    MultiBufferOffset(11)..MultiBufferOffset(11),
-                    FoldPlaceholder::test(),
-                ),
-                (
-                    MultiBufferOffset(8)..MultiBufferOffset(10),
-                    FoldPlaceholder::test(),
-                ),
-            ]);
-            let (snapshot, _) = map.read(inlay_snapshot.clone(), vec![]);
-            assert_eq!(snapshot.text(), "⋯b⋯kl");
-        }
-
-        {
-            let mut map = FoldMap::new(inlay_snapshot.clone()).0;
-
-            // Create two adjacent folds.
-            let (mut writer, _, _) = map.write(inlay_snapshot.clone(), vec![]);
-            writer.fold(vec![
-                (
-                    MultiBufferOffset(0)..MultiBufferOffset(2),
-                    FoldPlaceholder::test(),
-                ),
-                (
-                    MultiBufferOffset(2)..MultiBufferOffset(5),
-                    FoldPlaceholder::test(),
-                ),
-            ]);
-            let (snapshot, _) = map.read(inlay_snapshot, vec![]);
-            assert_eq!(snapshot.text(), "⋯fghijkl");
-
-            // Edit within one of the folds.
-            let buffer_snapshot = buffer.update(cx, |buffer, cx| {
-                buffer.edit(
-                    [(MultiBufferOffset(0)..MultiBufferOffset(1), "12345")],
-                    None,
-                    cx,
-                );
-                buffer.snapshot(cx)
-            });
-            let (inlay_snapshot, inlay_edits) =
-                inlay_map.sync(buffer_snapshot, subscription.consume().into_inner());
-            let (snapshot, _) = map.read(inlay_snapshot, inlay_edits);
-            assert_eq!(snapshot.text(), "12345⋯fghijkl");
-        }
-    }
-
-    #[gpui::test]
-    fn test_overlapping_folds(cx: &mut gpui::App) {
-        let buffer = MultiBuffer::build_simple(&sample_text(5, 6, 'a'), cx);
-        let buffer_snapshot = buffer.read(cx).snapshot(cx);
-        let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot);
-        let mut map = FoldMap::new(inlay_snapshot.clone()).0;
-        let (mut writer, _, _) = map.write(inlay_snapshot.clone(), vec![]);
-        writer.fold(vec![
-            (Point::new(0, 2)..Point::new(2, 2), FoldPlaceholder::test()),
-            (Point::new(0, 4)..Point::new(1, 0), FoldPlaceholder::test()),
-            (Point::new(1, 2)..Point::new(3, 2), FoldPlaceholder::test()),
-            (Point::new(3, 1)..Point::new(4, 1), FoldPlaceholder::test()),
-        ]);
-        let (snapshot, _) = map.read(inlay_snapshot, vec![]);
-        assert_eq!(snapshot.text(), "aa⋯eeeee");
-    }
-
-    #[gpui::test]
-    fn test_merging_folds_via_edit(cx: &mut gpui::App) {
-        init_test(cx);
-        let buffer = MultiBuffer::build_simple(&sample_text(5, 6, 'a'), cx);
-        let subscription = buffer.update(cx, |buffer, _| buffer.subscribe());
-        let buffer_snapshot = buffer.read(cx).snapshot(cx);
-        let (mut inlay_map, inlay_snapshot) = InlayMap::new(buffer_snapshot);
-        let mut map = FoldMap::new(inlay_snapshot.clone()).0;
-
-        let (mut writer, _, _) = map.write(inlay_snapshot.clone(), vec![]);
-        writer.fold(vec![
-            (Point::new(0, 2)..Point::new(2, 2), FoldPlaceholder::test()),
-            (Point::new(3, 1)..Point::new(4, 1), FoldPlaceholder::test()),
-        ]);
-        let (snapshot, _) = map.read(inlay_snapshot, vec![]);
-        assert_eq!(snapshot.text(), "aa⋯cccc\nd⋯eeeee");
-
-        let buffer_snapshot = buffer.update(cx, |buffer, cx| {
-            buffer.edit([(Point::new(2, 2)..Point::new(3, 1), "")], None, cx);
-            buffer.snapshot(cx)
-        });
-        let (inlay_snapshot, inlay_edits) =
-            inlay_map.sync(buffer_snapshot, subscription.consume().into_inner());
-        let (snapshot, _) = map.read(inlay_snapshot, inlay_edits);
-        assert_eq!(snapshot.text(), "aa⋯eeeee");
-    }
-
-    #[gpui::test]
-    fn test_folds_in_range(cx: &mut gpui::App) {
-        let buffer = MultiBuffer::build_simple(&sample_text(5, 6, 'a'), cx);
-        let buffer_snapshot = buffer.read(cx).snapshot(cx);
-        let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
-        let mut map = FoldMap::new(inlay_snapshot.clone()).0;
-
-        let (mut writer, _, _) = map.write(inlay_snapshot.clone(), vec![]);
-        writer.fold(vec![
-            (Point::new(0, 2)..Point::new(2, 2), FoldPlaceholder::test()),
-            (Point::new(0, 4)..Point::new(1, 0), FoldPlaceholder::test()),
-            (Point::new(1, 2)..Point::new(3, 2), FoldPlaceholder::test()),
-            (Point::new(3, 1)..Point::new(4, 1), FoldPlaceholder::test()),
-        ]);
-        let (snapshot, _) = map.read(inlay_snapshot, vec![]);
-        let fold_ranges = snapshot
-            .folds_in_range(Point::new(1, 0)..Point::new(1, 3))
-            .map(|fold| {
-                fold.range.start.to_point(&buffer_snapshot)
-                    ..fold.range.end.to_point(&buffer_snapshot)
-            })
-            .collect::<Vec<_>>();
-        assert_eq!(
-            fold_ranges,
-            vec![
-                Point::new(0, 2)..Point::new(2, 2),
-                Point::new(1, 2)..Point::new(3, 2)
-            ]
-        );
-    }
-
-    #[gpui::test(iterations = 100)]
-    fn test_random_folds(cx: &mut gpui::App, mut rng: StdRng) {
-        init_test(cx);
-        let operations = env::var("OPERATIONS")
-            .map(|i| i.parse().expect("invalid `OPERATIONS` variable"))
-            .unwrap_or(10);
-
-        let len = rng.random_range(0..10);
-        let text = RandomCharIter::new(&mut rng).take(len).collect::<String>();
-        let buffer = if rng.random() {
-            MultiBuffer::build_simple(&text, cx)
-        } else {
-            MultiBuffer::build_random(&mut rng, cx)
-        };
-        let mut buffer_snapshot = buffer.read(cx).snapshot(cx);
-        let (mut inlay_map, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
-        let mut map = FoldMap::new(inlay_snapshot.clone()).0;
-
-        let (mut initial_snapshot, _) = map.read(inlay_snapshot, vec![]);
-        let mut snapshot_edits = Vec::new();
-
-        let mut next_inlay_id = 0;
-        for _ in 0..operations {
-            log::info!("text: {:?}", buffer_snapshot.text());
-            let mut buffer_edits = Vec::new();
-            let mut inlay_edits = Vec::new();
-            match rng.random_range(0..=100) {
-                0..=39 => {
-                    snapshot_edits.extend(map.randomly_mutate(&mut rng));
-                }
-                40..=59 => {
-                    let (_, edits) = inlay_map.randomly_mutate(&mut next_inlay_id, &mut rng);
-                    inlay_edits = edits;
-                }
-                _ => buffer.update(cx, |buffer, cx| {
-                    let subscription = buffer.subscribe();
-                    let edit_count = rng.random_range(1..=5);
-                    buffer.randomly_mutate(&mut rng, edit_count, cx);
-                    buffer_snapshot = buffer.snapshot(cx);
-                    let edits = subscription.consume().into_inner();
-                    log::info!("editing {:?}", edits);
-                    buffer_edits.extend(edits);
-                }),
-            };
-
-            let (inlay_snapshot, new_inlay_edits) =
-                inlay_map.sync(buffer_snapshot.clone(), buffer_edits);
-            log::info!("inlay text {:?}", inlay_snapshot.text());
-
-            let inlay_edits = Patch::new(inlay_edits)
-                .compose(new_inlay_edits)
-                .into_inner();
-            let (snapshot, edits) = map.read(inlay_snapshot.clone(), inlay_edits);
-            snapshot_edits.push((snapshot.clone(), edits));
-
-            let mut expected_text: String = inlay_snapshot.text().to_string();
-            for fold_range in map.merged_folds().into_iter().rev() {
-                let fold_inlay_start = inlay_snapshot.to_inlay_offset(fold_range.start);
-                let fold_inlay_end = inlay_snapshot.to_inlay_offset(fold_range.end);
-                expected_text.replace_range(fold_inlay_start.0.0..fold_inlay_end.0.0, "⋯");
-            }
-
-            assert_eq!(snapshot.text(), expected_text);
-            log::info!(
-                "fold text {:?} ({} lines)",
-                expected_text,
-                expected_text.matches('\n').count() + 1
-            );
-
-            let mut prev_row = 0;
-            let mut expected_buffer_rows = Vec::new();
-            for fold_range in map.merged_folds() {
-                let fold_start = inlay_snapshot
-                    .to_point(inlay_snapshot.to_inlay_offset(fold_range.start))
-                    .row();
-                let fold_end = inlay_snapshot
-                    .to_point(inlay_snapshot.to_inlay_offset(fold_range.end))
-                    .row();
-                expected_buffer_rows.extend(
-                    inlay_snapshot
-                        .row_infos(prev_row)
-                        .take((1 + fold_start - prev_row) as usize),
-                );
-                prev_row = 1 + fold_end;
-            }
-            expected_buffer_rows.extend(inlay_snapshot.row_infos(prev_row));
-
-            assert_eq!(
-                expected_buffer_rows.len(),
-                expected_text.matches('\n').count() + 1,
-                "wrong expected buffer rows {:?}. text: {:?}",
-                expected_buffer_rows,
-                expected_text
-            );
-
-            for (output_row, line) in expected_text.lines().enumerate() {
-                let line_len = snapshot.line_len(output_row as u32);
-                assert_eq!(line_len, line.len() as u32);
-            }
-
-            let longest_row = snapshot.longest_row();
-            let longest_char_column = expected_text
-                .split('\n')
-                .nth(longest_row as usize)
-                .unwrap()
-                .chars()
-                .count();
-            let mut fold_point = FoldPoint::new(0, 0);
-            let mut fold_offset = FoldOffset(MultiBufferOffset(0));
-            let mut char_column = 0;
-            for c in expected_text.chars() {
-                let inlay_point = fold_point.to_inlay_point(&snapshot);
-                let inlay_offset = fold_offset.to_inlay_offset(&snapshot);
-                assert_eq!(
-                    snapshot.to_fold_point(inlay_point, Right),
-                    fold_point,
-                    "{:?} -> fold point",
-                    inlay_point,
-                );
-                assert_eq!(
-                    inlay_snapshot.to_offset(inlay_point),
-                    inlay_offset,
-                    "inlay_snapshot.to_offset({:?})",
-                    inlay_point,
-                );
-                assert_eq!(
-                    fold_point.to_offset(&snapshot),
-                    fold_offset,
-                    "fold_point.to_offset({:?})",
-                    fold_point,
-                );
-
-                if c == '\n' {
-                    *fold_point.row_mut() += 1;
-                    *fold_point.column_mut() = 0;
-                    char_column = 0;
-                } else {
-                    *fold_point.column_mut() += c.len_utf8() as u32;
-                    char_column += 1;
-                }
-                fold_offset.0 += c.len_utf8();
-                if char_column > longest_char_column {
-                    panic!(
-                        "invalid longest row {:?} (chars {}), found row {:?} (chars: {})",
-                        longest_row,
-                        longest_char_column,
-                        fold_point.row(),
-                        char_column
-                    );
-                }
-            }
-
-            for _ in 0..5 {
-                let mut start = snapshot.clip_offset(
-                    FoldOffset(rng.random_range(MultiBufferOffset(0)..=snapshot.len().0)),
-                    Bias::Left,
-                );
-                let mut end = snapshot.clip_offset(
-                    FoldOffset(rng.random_range(MultiBufferOffset(0)..=snapshot.len().0)),
-                    Bias::Right,
-                );
-                if start > end {
-                    mem::swap(&mut start, &mut end);
-                }
-
-                let text = &expected_text[start.0.0..end.0.0];
-                assert_eq!(
-                    snapshot
-                        .chunks(start..end, false, Highlights::default())
-                        .map(|c| c.text)
-                        .collect::<String>(),
-                    text,
-                );
-            }
-
-            let mut fold_row = 0;
-            while fold_row < expected_buffer_rows.len() as u32 {
-                assert_eq!(
-                    snapshot.row_infos(fold_row).collect::<Vec<_>>(),
-                    expected_buffer_rows[(fold_row as usize)..],
-                    "wrong buffer rows starting at fold row {}",
-                    fold_row,
-                );
-                fold_row += 1;
-            }
-
-            let folded_buffer_rows = map
-                .merged_folds()
-                .iter()
-                .flat_map(|fold_range| {
-                    let start_row = fold_range.start.to_point(&buffer_snapshot).row;
-                    let end = fold_range.end.to_point(&buffer_snapshot);
-                    if end.column == 0 {
-                        start_row..end.row
-                    } else {
-                        start_row..end.row + 1
-                    }
-                })
-                .collect::<HashSet<_>>();
-            for row in 0..=buffer_snapshot.max_point().row {
-                assert_eq!(
-                    snapshot.is_line_folded(MultiBufferRow(row)),
-                    folded_buffer_rows.contains(&row),
-                    "expected buffer row {}{} to be folded",
-                    row,
-                    if folded_buffer_rows.contains(&row) {
-                        ""
-                    } else {
-                        " not"
-                    }
-                );
-            }
-
-            for _ in 0..5 {
-                let end = buffer_snapshot.clip_offset(
-                    rng.random_range(MultiBufferOffset(0)..=buffer_snapshot.len()),
-                    Right,
-                );
-                let start =
-                    buffer_snapshot.clip_offset(rng.random_range(MultiBufferOffset(0)..=end), Left);
-                let expected_folds = map
-                    .snapshot
-                    .folds
-                    .items(&buffer_snapshot)
-                    .into_iter()
-                    .filter(|fold| {
-                        let start = buffer_snapshot.anchor_before(start);
-                        let end = buffer_snapshot.anchor_after(end);
-                        start.cmp(&fold.range.end, &buffer_snapshot) == Ordering::Less
-                            && end.cmp(&fold.range.start, &buffer_snapshot) == Ordering::Greater
-                    })
-                    .collect::<Vec<_>>();
-
-                assert_eq!(
-                    snapshot
-                        .folds_in_range(start..end)
-                        .cloned()
-                        .collect::<Vec<_>>(),
-                    expected_folds
-                );
-            }
-
-            let text = snapshot.text();
-            for _ in 0..5 {
-                let start_row = rng.random_range(0..=snapshot.max_point().row());
-                let start_column = rng.random_range(0..=snapshot.line_len(start_row));
-                let end_row = rng.random_range(0..=snapshot.max_point().row());
-                let end_column = rng.random_range(0..=snapshot.line_len(end_row));
-                let mut start =
-                    snapshot.clip_point(FoldPoint::new(start_row, start_column), Bias::Left);
-                let mut end = snapshot.clip_point(FoldPoint::new(end_row, end_column), Bias::Right);
-                if start > end {
-                    mem::swap(&mut start, &mut end);
-                }
-
-                let lines = start..end;
-                let bytes = start.to_offset(&snapshot)..end.to_offset(&snapshot);
-                assert_eq!(
-                    snapshot.text_summary_for_range(lines),
-                    MBTextSummary::from(&text[bytes.start.0.0..bytes.end.0.0])
-                )
-            }
-
-            let mut text = initial_snapshot.text();
-            for (snapshot, edits) in snapshot_edits.drain(..) {
-                let new_text = snapshot.text();
-                for edit in edits {
-                    let old_bytes = edit.new.start.0.0..edit.new.start.0.0 + edit.old_len();
-                    let new_bytes = edit.new.start.0.0..edit.new.end.0.0;
-                    text.replace_range(old_bytes, &new_text[new_bytes]);
-                }
-
-                assert_eq!(text, new_text);
-                initial_snapshot = snapshot;
-            }
-        }
-    }
-
-    #[gpui::test]
-    fn test_buffer_rows(cx: &mut gpui::App) {
-        let text = sample_text(6, 6, 'a') + "\n";
-        let buffer = MultiBuffer::build_simple(&text, cx);
-
-        let buffer_snapshot = buffer.read(cx).snapshot(cx);
-        let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot);
-        let mut map = FoldMap::new(inlay_snapshot.clone()).0;
-
-        let (mut writer, _, _) = map.write(inlay_snapshot.clone(), vec![]);
-        writer.fold(vec![
-            (Point::new(0, 2)..Point::new(2, 2), FoldPlaceholder::test()),
-            (Point::new(3, 1)..Point::new(4, 1), FoldPlaceholder::test()),
-        ]);
-
-        let (snapshot, _) = map.read(inlay_snapshot, vec![]);
-        assert_eq!(snapshot.text(), "aa⋯cccc\nd⋯eeeee\nffffff\n");
-        assert_eq!(
-            snapshot
-                .row_infos(0)
-                .map(|info| info.buffer_row)
-                .collect::<Vec<_>>(),
-            [Some(0), Some(3), Some(5), Some(6)]
-        );
-        assert_eq!(
-            snapshot
-                .row_infos(3)
-                .map(|info| info.buffer_row)
-                .collect::<Vec<_>>(),
-            [Some(6)]
-        );
-    }
-
-    #[gpui::test(iterations = 100)]
-    fn test_random_chunk_bitmaps(cx: &mut gpui::App, mut rng: StdRng) {
-        init_test(cx);
-
-        // Generate random buffer using existing test infrastructure
-        let text_len = rng.random_range(0..10000);
-        let buffer = if rng.random() {
-            let text = RandomCharIter::new(&mut rng)
-                .take(text_len)
-                .collect::<String>();
-            MultiBuffer::build_simple(&text, cx)
-        } else {
-            MultiBuffer::build_random(&mut rng, cx)
-        };
-        let buffer_snapshot = buffer.read(cx).snapshot(cx);
-        let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot);
-        let (mut fold_map, _) = FoldMap::new(inlay_snapshot.clone());
-
-        // Perform random mutations
-        let mutation_count = rng.random_range(1..10);
-        for _ in 0..mutation_count {
-            fold_map.randomly_mutate(&mut rng);
-        }
-
-        let (snapshot, _) = fold_map.read(inlay_snapshot, vec![]);
-
-        // Get all chunks and verify their bitmaps
-        let chunks = snapshot.chunks(
-            FoldOffset(MultiBufferOffset(0))..FoldOffset(snapshot.len().0),
-            false,
-            Highlights::default(),
-        );
-
-        for chunk in chunks {
-            let chunk_text = chunk.text;
-            let chars_bitmap = chunk.chars;
-            let tabs_bitmap = chunk.tabs;
-
-            // Check empty chunks have empty bitmaps
-            if chunk_text.is_empty() {
-                assert_eq!(
-                    chars_bitmap, 0,
-                    "Empty chunk should have empty chars bitmap"
-                );
-                assert_eq!(tabs_bitmap, 0, "Empty chunk should have empty tabs bitmap");
-                continue;
-            }
-
-            // Verify that chunk text doesn't exceed 128 bytes
-            assert!(
-                chunk_text.len() <= 128,
-                "Chunk text length {} exceeds 128 bytes",
-                chunk_text.len()
-            );
-
-            // Verify chars bitmap
-            let char_indices = chunk_text
-                .char_indices()
-                .map(|(i, _)| i)
-                .collect::<Vec<_>>();
-
-            for byte_idx in 0..chunk_text.len() {
-                let should_have_bit = char_indices.contains(&byte_idx);
-                let has_bit = chars_bitmap & (1 << byte_idx) != 0;
-
-                if has_bit != should_have_bit {
-                    eprintln!("Chunk text bytes: {:?}", chunk_text.as_bytes());
-                    eprintln!("Char indices: {:?}", char_indices);
-                    eprintln!("Chars bitmap: {:#b}", chars_bitmap);
-                    assert_eq!(
-                        has_bit, should_have_bit,
-                        "Chars bitmap mismatch at byte index {} in chunk {:?}. Expected bit: {}, Got bit: {}",
-                        byte_idx, chunk_text, should_have_bit, has_bit
-                    );
-                }
-            }
-
-            // Verify tabs bitmap
-            for (byte_idx, byte) in chunk_text.bytes().enumerate() {
-                let is_tab = byte == b'\t';
-                let has_bit = tabs_bitmap & (1 << byte_idx) != 0;
-
-                assert_eq!(
-                    has_bit, is_tab,
-                    "Tabs bitmap mismatch at byte index {} in chunk {:?}. Byte: {:?}, Expected bit: {}, Got bit: {}",
-                    byte_idx, chunk_text, byte as char, is_tab, has_bit
-                );
-            }
-        }
-    }
-
-    fn init_test(cx: &mut gpui::App) {
-        let store = SettingsStore::test(cx);
-        cx.set_global(store);
-    }
-
-    impl FoldMap {
-        fn merged_folds(&self) -> Vec<Range<MultiBufferOffset>> {
-            let inlay_snapshot = self.snapshot.inlay_snapshot.clone();
-            let buffer = &inlay_snapshot.buffer;
-            let mut folds = self.snapshot.folds.items(buffer);
-            // Ensure sorting doesn't change how folds get merged and displayed.
-            folds.sort_by(|a, b| a.range.cmp(&b.range, buffer));
-            let mut folds = folds
-                .iter()
-                .map(|fold| fold.range.start.to_offset(buffer)..fold.range.end.to_offset(buffer))
-                .peekable();
-
-            let mut merged_folds = Vec::new();
-            while let Some(mut fold_range) = folds.next() {
-                while let Some(next_range) = folds.peek() {
-                    if fold_range.end >= next_range.start {
-                        if next_range.end > fold_range.end {
-                            fold_range.end = next_range.end;
-                        }
-                        folds.next();
-                    } else {
-                        break;
-                    }
-                }
-                if fold_range.end > fold_range.start {
-                    merged_folds.push(fold_range);
-                }
-            }
-            merged_folds
-        }
-
-        pub fn randomly_mutate(
-            &mut self,
-            rng: &mut impl Rng,
-        ) -> Vec<(FoldSnapshot, Vec<FoldEdit>)> {
-            let mut snapshot_edits = Vec::new();
-            match rng.random_range(0..=100) {
-                0..=39 if !self.snapshot.folds.is_empty() => {
-                    let inlay_snapshot = self.snapshot.inlay_snapshot.clone();
-                    let buffer = &inlay_snapshot.buffer;
-                    let mut to_unfold = Vec::new();
-                    for _ in 0..rng.random_range(1..=3) {
-                        let end = buffer.clip_offset(
-                            rng.random_range(MultiBufferOffset(0)..=buffer.len()),
-                            Right,
-                        );
-                        let start =
-                            buffer.clip_offset(rng.random_range(MultiBufferOffset(0)..=end), Left);
-                        to_unfold.push(start..end);
-                    }
-                    let inclusive = rng.random();
-                    log::info!("unfolding {:?} (inclusive: {})", to_unfold, inclusive);
-                    let (mut writer, snapshot, edits) = self.write(inlay_snapshot, vec![]);
-                    snapshot_edits.push((snapshot, edits));
-                    let (snapshot, edits) = writer.unfold_intersecting(to_unfold, inclusive);
-                    snapshot_edits.push((snapshot, edits));
-                }
-                _ => {
-                    let inlay_snapshot = self.snapshot.inlay_snapshot.clone();
-                    let buffer = &inlay_snapshot.buffer;
-                    let mut to_fold = Vec::new();
-                    for _ in 0..rng.random_range(1..=2) {
-                        let end = buffer.clip_offset(
-                            rng.random_range(MultiBufferOffset(0)..=buffer.len()),
-                            Right,
-                        );
-                        let start =
-                            buffer.clip_offset(rng.random_range(MultiBufferOffset(0)..=end), Left);
-                        to_fold.push((start..end, FoldPlaceholder::test()));
-                    }
-                    log::info!("folding {:?}", to_fold);
-                    let (mut writer, snapshot, edits) = self.write(inlay_snapshot, vec![]);
-                    snapshot_edits.push((snapshot, edits));
-                    let (snapshot, edits) = writer.fold(to_fold);
-                    snapshot_edits.push((snapshot, edits));
-                }
-            }
-            snapshot_edits
-        }
-    }
-}
diff --git a/crates/editor/src/display_map/inlay_map.rs b/crates/editor/src/display_map/inlay_map.rs
deleted file mode 100644
index d85f761a82..0000000000
--- a/crates/editor/src/display_map/inlay_map.rs
+++ /dev/null
@@ -1,2342 +0,0 @@
-use crate::{
-    ChunkRenderer, HighlightStyles,
-    inlays::{Inlay, InlayContent},
-};
-use collections::BTreeSet;
-use language::{Chunk, Edit, Point, TextSummary};
-use multi_buffer::{
-    MBTextSummary, MultiBufferOffset, MultiBufferRow, MultiBufferRows, MultiBufferSnapshot,
-    RowInfo, ToOffset,
-};
-use project::InlayId;
-use std::{
-    cmp,
-    ops::{Add, AddAssign, Range, Sub, SubAssign},
-    sync::Arc,
-};
-use sum_tree::{Bias, Cursor, Dimensions, SumTree};
-use text::{ChunkBitmaps, Patch};
-use ui::{ActiveTheme, IntoElement as _, ParentElement as _, Styled as _, div};
-
-use super::{Highlights, custom_highlights::CustomHighlightsChunks, fold_map::ChunkRendererId};
-
-/// Decides where the [`Inlay`]s should be displayed.
-///
-/// See the [`display_map` module documentation](crate::display_map) for more information.
-pub struct InlayMap {
-    snapshot: InlaySnapshot,
-    inlays: Vec<Inlay>,
-}
-
-#[derive(Clone)]
-pub struct InlaySnapshot {
-    pub buffer: MultiBufferSnapshot,
-    transforms: SumTree<Transform>,
-    pub version: usize,
-}
-
-impl std::ops::Deref for InlaySnapshot {
-    type Target = MultiBufferSnapshot;
-
-    fn deref(&self) -> &Self::Target {
-        &self.buffer
-    }
-}
-
-#[derive(Clone, Debug)]
-enum Transform {
-    Isomorphic(MBTextSummary),
-    Inlay(Inlay),
-}
-
-impl sum_tree::Item for Transform {
-    type Summary = TransformSummary;
-
-    #[ztracing::instrument(skip_all)]
-    fn summary(&self, _: ()) -> Self::Summary {
-        match self {
-            Transform::Isomorphic(summary) => TransformSummary {
-                input: *summary,
-                output: *summary,
-            },
-            Transform::Inlay(inlay) => TransformSummary {
-                input: MBTextSummary::default(),
-                output: MBTextSummary::from(inlay.text().summary()),
-            },
-        }
-    }
-}
-
-#[derive(Clone, Debug, Default)]
-struct TransformSummary {
-    input: MBTextSummary,
-    output: MBTextSummary,
-}
-
-impl sum_tree::ContextLessSummary for TransformSummary {
-    fn zero() -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, other: &Self) {
-        self.input += other.input;
-        self.output += other.output;
-    }
-}
-
-pub type InlayEdit = Edit<InlayOffset>;
-
-#[derive(Copy, Clone, Debug, Default, Eq, Ord, PartialOrd, PartialEq)]
-pub struct InlayOffset(pub MultiBufferOffset);
-
-impl Add for InlayOffset {
-    type Output = Self;
-
-    fn add(self, rhs: Self) -> Self::Output {
-        Self(self.0 + rhs.0)
-    }
-}
-
-impl Sub for InlayOffset {
-    type Output = <MultiBufferOffset as Sub>::Output;
-
-    fn sub(self, rhs: Self) -> Self::Output {
-        self.0 - rhs.0
-    }
-}
-
-impl<T> SubAssign<T> for InlayOffset
-where
-    MultiBufferOffset: SubAssign<T>,
-{
-    fn sub_assign(&mut self, rhs: T) {
-        self.0 -= rhs;
-    }
-}
-
-impl<T> Add<T> for InlayOffset
-where
-    MultiBufferOffset: Add<T, Output = MultiBufferOffset>,
-{
-    type Output = Self;
-
-    fn add(self, rhs: T) -> Self::Output {
-        Self(self.0 + rhs)
-    }
-}
-
-impl AddAssign for InlayOffset {
-    fn add_assign(&mut self, rhs: Self) {
-        self.0 += rhs.0;
-    }
-}
-
-impl<T> AddAssign<T> for InlayOffset
-where
-    MultiBufferOffset: AddAssign<T>,
-{
-    fn add_assign(&mut self, rhs: T) {
-        self.0 += rhs;
-    }
-}
-
-impl<'a> sum_tree::Dimension<'a, TransformSummary> for InlayOffset {
-    fn zero(_cx: ()) -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, summary: &'a TransformSummary, _: ()) {
-        self.0 += summary.output.len;
-    }
-}
-
-#[derive(Copy, Clone, Debug, Default, Eq, Ord, PartialOrd, PartialEq)]
-pub struct InlayPoint(pub Point);
-
-impl Add for InlayPoint {
-    type Output = Self;
-
-    fn add(self, rhs: Self) -> Self::Output {
-        Self(self.0 + rhs.0)
-    }
-}
-
-impl Sub for InlayPoint {
-    type Output = Self;
-
-    fn sub(self, rhs: Self) -> Self::Output {
-        Self(self.0 - rhs.0)
-    }
-}
-
-impl<'a> sum_tree::Dimension<'a, TransformSummary> for InlayPoint {
-    fn zero(_cx: ()) -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, summary: &'a TransformSummary, _: ()) {
-        self.0 += &summary.output.lines;
-    }
-}
-
-impl<'a> sum_tree::Dimension<'a, TransformSummary> for MultiBufferOffset {
-    fn zero(_cx: ()) -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, summary: &'a TransformSummary, _: ()) {
-        *self += summary.input.len;
-    }
-}
-
-impl<'a> sum_tree::Dimension<'a, TransformSummary> for Point {
-    fn zero(_cx: ()) -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, summary: &'a TransformSummary, _: ()) {
-        *self += &summary.input.lines;
-    }
-}
-
-#[derive(Clone)]
-pub struct InlayBufferRows<'a> {
-    transforms: Cursor<'a, 'static, Transform, Dimensions<InlayPoint, Point>>,
-    buffer_rows: MultiBufferRows<'a>,
-    inlay_row: u32,
-    max_buffer_row: MultiBufferRow,
-}
-
-pub struct InlayChunks<'a> {
-    transforms: Cursor<'a, 'static, Transform, Dimensions<InlayOffset, MultiBufferOffset>>,
-    buffer_chunks: CustomHighlightsChunks<'a>,
-    buffer_chunk: Option<Chunk<'a>>,
-    inlay_chunks: Option<text::ChunkWithBitmaps<'a>>,
-    /// text, char bitmap, tabs bitmap
-    inlay_chunk: Option<ChunkBitmaps<'a>>,
-    output_offset: InlayOffset,
-    max_output_offset: InlayOffset,
-    highlight_styles: HighlightStyles,
-    highlights: Highlights<'a>,
-    snapshot: &'a InlaySnapshot,
-}
-
-#[derive(Clone)]
-pub struct InlayChunk<'a> {
-    pub chunk: Chunk<'a>,
-    /// Whether the inlay should be customly rendered.
-    pub renderer: Option<ChunkRenderer>,
-}
-
-impl InlayChunks<'_> {
-    #[ztracing::instrument(skip_all)]
-    pub fn seek(&mut self, new_range: Range<InlayOffset>) {
-        self.transforms.seek(&new_range.start, Bias::Right);
-
-        let buffer_range = self.snapshot.to_buffer_offset(new_range.start)
-            ..self.snapshot.to_buffer_offset(new_range.end);
-        self.buffer_chunks.seek(buffer_range);
-        self.inlay_chunks = None;
-        self.buffer_chunk = None;
-        self.output_offset = new_range.start;
-        self.max_output_offset = new_range.end;
-    }
-
-    pub fn offset(&self) -> InlayOffset {
-        self.output_offset
-    }
-}
-
-impl<'a> Iterator for InlayChunks<'a> {
-    type Item = InlayChunk<'a>;
-
-    #[ztracing::instrument(skip_all)]
-    fn next(&mut self) -> Option<Self::Item> {
-        if self.output_offset == self.max_output_offset {
-            return None;
-        }
-
-        let chunk = match self.transforms.item()? {
-            Transform::Isomorphic(_) => {
-                let chunk = self
-                    .buffer_chunk
-                    .get_or_insert_with(|| self.buffer_chunks.next().unwrap());
-                if chunk.text.is_empty() {
-                    *chunk = self.buffer_chunks.next().unwrap();
-                }
-
-                let desired_bytes = self.transforms.end().0.0 - self.output_offset.0;
-
-                // If we're already at the transform boundary, skip to the next transform
-                if desired_bytes == 0 {
-                    self.inlay_chunks = None;
-                    self.transforms.next();
-                    return self.next();
-                }
-
-                // Determine split index handling edge cases
-                let split_index = if desired_bytes >= chunk.text.len() {
-                    chunk.text.len()
-                } else {
-                    chunk.text.ceil_char_boundary(desired_bytes)
-                };
-
-                let (prefix, suffix) = chunk.text.split_at(split_index);
-                self.output_offset.0 += prefix.len();
-
-                let mask = 1u128.unbounded_shl(split_index as u32).wrapping_sub(1);
-                let chars = chunk.chars & mask;
-                let tabs = chunk.tabs & mask;
-
-                chunk.chars = chunk.chars.unbounded_shr(split_index as u32);
-                chunk.tabs = chunk.tabs.unbounded_shr(split_index as u32);
-                chunk.text = suffix;
-
-                InlayChunk {
-                    chunk: Chunk {
-                        text: prefix,
-                        chars,
-                        tabs,
-                        ..chunk.clone()
-                    },
-                    renderer: None,
-                }
-            }
-            Transform::Inlay(inlay) => {
-                let mut inlay_style_and_highlight = None;
-                if let Some(inlay_highlights) = self.highlights.inlay_highlights {
-                    for (_, inlay_id_to_data) in inlay_highlights.iter() {
-                        let style_and_highlight = inlay_id_to_data.get(&inlay.id);
-                        if style_and_highlight.is_some() {
-                            inlay_style_and_highlight = style_and_highlight;
-                            break;
-                        }
-                    }
-                }
-
-                let mut renderer = None;
-                let mut highlight_style = match inlay.id {
-                    InlayId::EditPrediction(_) => self.highlight_styles.edit_prediction.map(|s| {
-                        if inlay.text().chars().all(|c| c.is_whitespace()) {
-                            s.whitespace
-                        } else {
-                            s.insertion
-                        }
-                    }),
-                    InlayId::Hint(_) => self.highlight_styles.inlay_hint,
-                    InlayId::DebuggerValue(_) => self.highlight_styles.inlay_hint,
-                    InlayId::Color(_) => {
-                        if let InlayContent::Color(color) = inlay.content {
-                            renderer = Some(ChunkRenderer {
-                                id: ChunkRendererId::Inlay(inlay.id),
-                                render: Arc::new(move |cx| {
-                                    div()
-                                        .relative()
-                                        .size_3p5()
-                                        .child(
-                                            div()
-                                                .absolute()
-                                                .right_1()
-                                                .size_3()
-                                                .border_1()
-                                                .border_color(
-                                                    if cx.theme().appearance().is_light() {
-                                                        gpui::black().opacity(0.5)
-                                                    } else {
-                                                        gpui::white().opacity(0.5)
-                                                    },
-                                                )
-                                                .bg(color),
-                                        )
-                                        .into_any_element()
-                                }),
-                                constrain_width: false,
-                                measured_width: None,
-                            });
-                        }
-                        self.highlight_styles.inlay_hint
-                    }
-                };
-                let next_inlay_highlight_endpoint;
-                let offset_in_inlay = self.output_offset - self.transforms.start().0;
-                if let Some((style, highlight)) = inlay_style_and_highlight {
-                    let range = &highlight.range;
-                    if offset_in_inlay < range.start {
-                        next_inlay_highlight_endpoint = range.start - offset_in_inlay;
-                    } else if offset_in_inlay >= range.end {
-                        next_inlay_highlight_endpoint = usize::MAX;
-                    } else {
-                        next_inlay_highlight_endpoint = range.end - offset_in_inlay;
-                        highlight_style = highlight_style
-                            .map(|highlight| highlight.highlight(*style))
-                            .or_else(|| Some(*style));
-                    }
-                } else {
-                    next_inlay_highlight_endpoint = usize::MAX;
-                }
-
-                let inlay_chunks = self.inlay_chunks.get_or_insert_with(|| {
-                    let start = offset_in_inlay;
-                    let end = cmp::min(self.max_output_offset, self.transforms.end().0)
-                        - self.transforms.start().0;
-                    let chunks = inlay.text().chunks_in_range(start..end);
-                    text::ChunkWithBitmaps(chunks)
-                });
-                let ChunkBitmaps {
-                    text: inlay_chunk,
-                    chars,
-                    tabs,
-                } = self
-                    .inlay_chunk
-                    .get_or_insert_with(|| inlay_chunks.next().unwrap());
-
-                // Determine split index handling edge cases
-                let split_index = if next_inlay_highlight_endpoint >= inlay_chunk.len() {
-                    inlay_chunk.len()
-                } else if next_inlay_highlight_endpoint == 0 {
-                    // Need to take at least one character to make progress
-                    inlay_chunk
-                        .chars()
-                        .next()
-                        .map(|c| c.len_utf8())
-                        .unwrap_or(1)
-                } else {
-                    inlay_chunk.ceil_char_boundary(next_inlay_highlight_endpoint)
-                };
-
-                let (chunk, remainder) = inlay_chunk.split_at(split_index);
-                *inlay_chunk = remainder;
-
-                let mask = 1u128.unbounded_shl(split_index as u32).wrapping_sub(1);
-                let new_chars = *chars & mask;
-                let new_tabs = *tabs & mask;
-
-                *chars = chars.unbounded_shr(split_index as u32);
-                *tabs = tabs.unbounded_shr(split_index as u32);
-
-                if inlay_chunk.is_empty() {
-                    self.inlay_chunk = None;
-                }
-
-                self.output_offset.0 += chunk.len();
-
-                InlayChunk {
-                    chunk: Chunk {
-                        text: chunk,
-                        chars: new_chars,
-                        tabs: new_tabs,
-                        highlight_style,
-                        is_inlay: true,
-                        ..Chunk::default()
-                    },
-                    renderer,
-                }
-            }
-        };
-
-        if self.output_offset >= self.transforms.end().0 {
-            self.inlay_chunks = None;
-            self.transforms.next();
-        }
-
-        Some(chunk)
-    }
-}
-
-impl InlayBufferRows<'_> {
-    #[ztracing::instrument(skip_all)]
-    pub fn seek(&mut self, row: u32) {
-        let inlay_point = InlayPoint::new(row, 0);
-        self.transforms.seek(&inlay_point, Bias::Left);
-
-        let mut buffer_point = self.transforms.start().1;
-        let buffer_row = MultiBufferRow(if row == 0 {
-            0
-        } else {
-            match self.transforms.item() {
-                Some(Transform::Isomorphic(_)) => {
-                    buffer_point += inlay_point.0 - self.transforms.start().0.0;
-                    buffer_point.row
-                }
-                _ => cmp::min(buffer_point.row + 1, self.max_buffer_row.0),
-            }
-        });
-        self.inlay_row = inlay_point.row();
-        self.buffer_rows.seek(buffer_row);
-    }
-}
-
-impl Iterator for InlayBufferRows<'_> {
-    type Item = RowInfo;
-
-    #[ztracing::instrument(skip_all)]
-    fn next(&mut self) -> Option<Self::Item> {
-        let buffer_row = if self.inlay_row == 0 {
-            self.buffer_rows.next().unwrap()
-        } else {
-            match self.transforms.item()? {
-                Transform::Inlay(_) => Default::default(),
-                Transform::Isomorphic(_) => self.buffer_rows.next().unwrap(),
-            }
-        };
-
-        self.inlay_row += 1;
-        self.transforms
-            .seek_forward(&InlayPoint::new(self.inlay_row, 0), Bias::Left);
-
-        Some(buffer_row)
-    }
-}
-
-impl InlayPoint {
-    pub fn new(row: u32, column: u32) -> Self {
-        Self(Point::new(row, column))
-    }
-
-    pub fn row(self) -> u32 {
-        self.0.row
-    }
-}
-
-impl InlayMap {
-    #[ztracing::instrument(skip_all)]
-    pub fn new(buffer: MultiBufferSnapshot) -> (Self, InlaySnapshot) {
-        let version = 0;
-        let snapshot = InlaySnapshot {
-            buffer: buffer.clone(),
-            transforms: SumTree::from_iter(Some(Transform::Isomorphic(buffer.text_summary())), ()),
-            version,
-        };
-
-        (
-            Self {
-                snapshot: snapshot.clone(),
-                inlays: Vec::new(),
-            },
-            snapshot,
-        )
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn sync(
-        &mut self,
-        buffer_snapshot: MultiBufferSnapshot,
-        mut buffer_edits: Vec<text::Edit<MultiBufferOffset>>,
-    ) -> (InlaySnapshot, Vec<InlayEdit>) {
-        let snapshot = &mut self.snapshot;
-
-        if buffer_edits.is_empty()
-            && snapshot.buffer.trailing_excerpt_update_count()
-                != buffer_snapshot.trailing_excerpt_update_count()
-        {
-            buffer_edits.push(Edit {
-                old: snapshot.buffer.len()..snapshot.buffer.len(),
-                new: buffer_snapshot.len()..buffer_snapshot.len(),
-            });
-        }
-
-        if buffer_edits.is_empty() {
-            if snapshot.buffer.edit_count() != buffer_snapshot.edit_count()
-                || snapshot.buffer.non_text_state_update_count()
-                    != buffer_snapshot.non_text_state_update_count()
-                || snapshot.buffer.trailing_excerpt_update_count()
-                    != buffer_snapshot.trailing_excerpt_update_count()
-            {
-                snapshot.version += 1;
-            }
-
-            snapshot.buffer = buffer_snapshot;
-            (snapshot.clone(), Vec::new())
-        } else {
-            let mut inlay_edits = Patch::default();
-            let mut new_transforms = SumTree::default();
-            let mut cursor = snapshot
-                .transforms
-                .cursor::<Dimensions<MultiBufferOffset, InlayOffset>>(());
-            let mut buffer_edits_iter = buffer_edits.iter().peekable();
-            while let Some(buffer_edit) = buffer_edits_iter.next() {
-                new_transforms.append(cursor.slice(&buffer_edit.old.start, Bias::Left), ());
-                if let Some(Transform::Isomorphic(transform)) = cursor.item()
-                    && cursor.end().0 == buffer_edit.old.start
-                {
-                    push_isomorphic(&mut new_transforms, *transform);
-                    cursor.next();
-                }
-
-                // Remove all the inlays and transforms contained by the edit.
-                let old_start = cursor.start().1 + (buffer_edit.old.start - cursor.start().0);
-                cursor.seek(&buffer_edit.old.end, Bias::Right);
-                let old_end = cursor.start().1 + (buffer_edit.old.end - cursor.start().0);
-
-                // Push the unchanged prefix.
-                let prefix_start = new_transforms.summary().input.len;
-                let prefix_end = buffer_edit.new.start;
-                push_isomorphic(
-                    &mut new_transforms,
-                    buffer_snapshot.text_summary_for_range(prefix_start..prefix_end),
-                );
-                let new_start = InlayOffset(new_transforms.summary().output.len);
-
-                let start_ix = match self.inlays.binary_search_by(|probe| {
-                    probe
-                        .position
-                        .to_offset(&buffer_snapshot)
-                        .cmp(&buffer_edit.new.start)
-                        .then(std::cmp::Ordering::Greater)
-                }) {
-                    Ok(ix) | Err(ix) => ix,
-                };
-
-                for inlay in &self.inlays[start_ix..] {
-                    if !inlay.position.is_valid(&buffer_snapshot) {
-                        continue;
-                    }
-                    let buffer_offset = inlay.position.to_offset(&buffer_snapshot);
-                    if buffer_offset > buffer_edit.new.end {
-                        break;
-                    }
-
-                    let prefix_start = new_transforms.summary().input.len;
-                    let prefix_end = buffer_offset;
-                    push_isomorphic(
-                        &mut new_transforms,
-                        buffer_snapshot.text_summary_for_range(prefix_start..prefix_end),
-                    );
-
-                    new_transforms.push(Transform::Inlay(inlay.clone()), ());
-                }
-
-                // Apply the rest of the edit.
-                let transform_start = new_transforms.summary().input.len;
-                push_isomorphic(
-                    &mut new_transforms,
-                    buffer_snapshot.text_summary_for_range(transform_start..buffer_edit.new.end),
-                );
-                let new_end = InlayOffset(new_transforms.summary().output.len);
-                inlay_edits.push(Edit {
-                    old: old_start..old_end,
-                    new: new_start..new_end,
-                });
-
-                // If the next edit doesn't intersect the current isomorphic transform, then
-                // we can push its remainder.
-                if buffer_edits_iter
-                    .peek()
-                    .is_none_or(|edit| edit.old.start >= cursor.end().0)
-                {
-                    let transform_start = new_transforms.summary().input.len;
-                    let transform_end =
-                        buffer_edit.new.end + (cursor.end().0 - buffer_edit.old.end);
-                    push_isomorphic(
-                        &mut new_transforms,
-                        buffer_snapshot.text_summary_for_range(transform_start..transform_end),
-                    );
-                    cursor.next();
-                }
-            }
-
-            new_transforms.append(cursor.suffix(), ());
-            if new_transforms.is_empty() {
-                new_transforms.push(Transform::Isomorphic(Default::default()), ());
-            }
-
-            drop(cursor);
-            snapshot.transforms = new_transforms;
-            snapshot.version += 1;
-            snapshot.buffer = buffer_snapshot;
-            snapshot.check_invariants();
-
-            (snapshot.clone(), inlay_edits.into_inner())
-        }
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn splice(
-        &mut self,
-        to_remove: &[InlayId],
-        to_insert: Vec<Inlay>,
-    ) -> (InlaySnapshot, Vec<InlayEdit>) {
-        let snapshot = &mut self.snapshot;
-        let mut edits = BTreeSet::new();
-
-        self.inlays.retain(|inlay| {
-            let retain = !to_remove.contains(&inlay.id);
-            if !retain {
-                let offset = inlay.position.to_offset(&snapshot.buffer);
-                edits.insert(offset);
-            }
-            retain
-        });
-
-        for inlay_to_insert in to_insert {
-            // Avoid inserting empty inlays.
-            if inlay_to_insert.text().is_empty() {
-                continue;
-            }
-
-            let offset = inlay_to_insert.position.to_offset(&snapshot.buffer);
-            match self.inlays.binary_search_by(|probe| {
-                probe
-                    .position
-                    .cmp(&inlay_to_insert.position, &snapshot.buffer)
-                    .then(std::cmp::Ordering::Less)
-            }) {
-                Ok(ix) | Err(ix) => {
-                    self.inlays.insert(ix, inlay_to_insert);
-                }
-            }
-
-            edits.insert(offset);
-        }
-
-        let buffer_edits = edits
-            .into_iter()
-            .map(|offset| Edit {
-                old: offset..offset,
-                new: offset..offset,
-            })
-            .collect();
-        let buffer_snapshot = snapshot.buffer.clone();
-        let (snapshot, edits) = self.sync(buffer_snapshot, buffer_edits);
-        (snapshot, edits)
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn current_inlays(&self) -> impl Iterator<Item = &Inlay> {
-        self.inlays.iter()
-    }
-
-    #[cfg(test)]
-    #[ztracing::instrument(skip_all)]
-    pub(crate) fn randomly_mutate(
-        &mut self,
-        next_inlay_id: &mut usize,
-        rng: &mut rand::rngs::StdRng,
-    ) -> (InlaySnapshot, Vec<InlayEdit>) {
-        use rand::prelude::*;
-        use util::post_inc;
-
-        let mut to_remove = Vec::new();
-        let mut to_insert = Vec::new();
-        let snapshot = &mut self.snapshot;
-        for i in 0..rng.random_range(1..=5) {
-            if self.inlays.is_empty() || rng.random() {
-                let position = snapshot
-                    .buffer
-                    .random_byte_range(MultiBufferOffset(0), rng)
-                    .start;
-                let bias = if rng.random() {
-                    Bias::Left
-                } else {
-                    Bias::Right
-                };
-                let len = if rng.random_bool(0.01) {
-                    0
-                } else {
-                    rng.random_range(1..=5)
-                };
-                let text = util::RandomCharIter::new(&mut *rng)
-                    .filter(|ch| *ch != '\r')
-                    .take(len)
-                    .collect::<String>();
-
-                let next_inlay = if i % 2 == 0 {
-                    Inlay::mock_hint(
-                        post_inc(next_inlay_id),
-                        snapshot.buffer.anchor_at(position, bias),
-                        &text,
-                    )
-                } else {
-                    Inlay::edit_prediction(
-                        post_inc(next_inlay_id),
-                        snapshot.buffer.anchor_at(position, bias),
-                        &text,
-                    )
-                };
-                let inlay_id = next_inlay.id;
-                log::info!(
-                    "creating inlay {inlay_id:?} at buffer offset {position} with bias {bias:?} and text {text:?}"
-                );
-                to_insert.push(next_inlay);
-            } else {
-                to_remove.push(
-                    self.inlays
-                        .iter()
-                        .choose(rng)
-                        .map(|inlay| inlay.id)
-                        .unwrap(),
-                );
-            }
-        }
-        log::info!("removing inlays: {:?}", to_remove);
-
-        let (snapshot, edits) = self.splice(&to_remove, to_insert);
-        (snapshot, edits)
-    }
-}
-
-impl InlaySnapshot {
-    #[ztracing::instrument(skip_all)]
-    pub fn to_point(&self, offset: InlayOffset) -> InlayPoint {
-        let (start, _, item) = self.transforms.find::<Dimensions<
-            InlayOffset,
-            InlayPoint,
-            MultiBufferOffset,
-        >, _>((), &offset, Bias::Right);
-        let overshoot = offset.0 - start.0.0;
-        match item {
-            Some(Transform::Isomorphic(_)) => {
-                let buffer_offset_start = start.2;
-                let buffer_offset_end = buffer_offset_start + overshoot;
-                let buffer_start = self.buffer.offset_to_point(buffer_offset_start);
-                let buffer_end = self.buffer.offset_to_point(buffer_offset_end);
-                InlayPoint(start.1.0 + (buffer_end - buffer_start))
-            }
-            Some(Transform::Inlay(inlay)) => {
-                let overshoot = inlay.text().offset_to_point(overshoot);
-                InlayPoint(start.1.0 + overshoot)
-            }
-            None => self.max_point(),
-        }
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn len(&self) -> InlayOffset {
-        InlayOffset(self.transforms.summary().output.len)
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn max_point(&self) -> InlayPoint {
-        InlayPoint(self.transforms.summary().output.lines)
-    }
-
-    #[ztracing::instrument(skip_all, fields(point))]
-    pub fn to_offset(&self, point: InlayPoint) -> InlayOffset {
-        let (start, _, item) = self
-            .transforms
-            .find::<Dimensions<InlayPoint, InlayOffset, Point>, _>((), &point, Bias::Right);
-        let overshoot = point.0 - start.0.0;
-        match item {
-            Some(Transform::Isomorphic(_)) => {
-                let buffer_point_start = start.2;
-                let buffer_point_end = buffer_point_start + overshoot;
-                let buffer_offset_start = self.buffer.point_to_offset(buffer_point_start);
-                let buffer_offset_end = self.buffer.point_to_offset(buffer_point_end);
-                InlayOffset(start.1.0 + (buffer_offset_end - buffer_offset_start))
-            }
-            Some(Transform::Inlay(inlay)) => {
-                let overshoot = inlay.text().point_to_offset(overshoot);
-                InlayOffset(start.1.0 + overshoot)
-            }
-            None => self.len(),
-        }
-    }
-    #[ztracing::instrument(skip_all)]
-    pub fn to_buffer_point(&self, point: InlayPoint) -> Point {
-        let (start, _, item) =
-            self.transforms
-                .find::<Dimensions<InlayPoint, Point>, _>((), &point, Bias::Right);
-        match item {
-            Some(Transform::Isomorphic(_)) => {
-                let overshoot = point.0 - start.0.0;
-                start.1 + overshoot
-            }
-            Some(Transform::Inlay(_)) => start.1,
-            None => self.buffer.max_point(),
-        }
-    }
-    #[ztracing::instrument(skip_all)]
-    pub fn to_buffer_offset(&self, offset: InlayOffset) -> MultiBufferOffset {
-        let (start, _, item) = self
-            .transforms
-            .find::<Dimensions<InlayOffset, MultiBufferOffset>, _>((), &offset, Bias::Right);
-        match item {
-            Some(Transform::Isomorphic(_)) => {
-                let overshoot = offset - start.0;
-                start.1 + overshoot
-            }
-            Some(Transform::Inlay(_)) => start.1,
-            None => self.buffer.len(),
-        }
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn to_inlay_offset(&self, offset: MultiBufferOffset) -> InlayOffset {
-        let mut cursor = self
-            .transforms
-            .cursor::<Dimensions<MultiBufferOffset, InlayOffset>>(());
-        cursor.seek(&offset, Bias::Left);
-        loop {
-            match cursor.item() {
-                Some(Transform::Isomorphic(_)) => {
-                    if offset == cursor.end().0 {
-                        while let Some(Transform::Inlay(inlay)) = cursor.next_item() {
-                            if inlay.position.bias() == Bias::Right {
-                                break;
-                            } else {
-                                cursor.next();
-                            }
-                        }
-                        return cursor.end().1;
-                    } else {
-                        let overshoot = offset - cursor.start().0;
-                        return InlayOffset(cursor.start().1.0 + overshoot);
-                    }
-                }
-                Some(Transform::Inlay(inlay)) => {
-                    if inlay.position.bias() == Bias::Left {
-                        cursor.next();
-                    } else {
-                        return cursor.start().1;
-                    }
-                }
-                None => {
-                    return self.len();
-                }
-            }
-        }
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn to_inlay_point(&self, point: Point) -> InlayPoint {
-        self.inlay_point_cursor().map(point)
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn inlay_point_cursor(&self) -> InlayPointCursor<'_> {
-        let cursor = self.transforms.cursor::<Dimensions<Point, InlayPoint>>(());
-        InlayPointCursor {
-            cursor,
-            transforms: &self.transforms,
-        }
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn clip_point(&self, mut point: InlayPoint, mut bias: Bias) -> InlayPoint {
-        let mut cursor = self.transforms.cursor::<Dimensions<InlayPoint, Point>>(());
-        cursor.seek(&point, Bias::Left);
-        loop {
-            match cursor.item() {
-                Some(Transform::Isomorphic(transform)) => {
-                    if cursor.start().0 == point {
-                        if let Some(Transform::Inlay(inlay)) = cursor.prev_item() {
-                            if inlay.position.bias() == Bias::Left {
-                                return point;
-                            } else if bias == Bias::Left {
-                                cursor.prev();
-                            } else if transform.first_line_chars == 0 {
-                                point.0 += Point::new(1, 0);
-                            } else {
-                                point.0 += Point::new(0, 1);
-                            }
-                        } else {
-                            return point;
-                        }
-                    } else if cursor.end().0 == point {
-                        if let Some(Transform::Inlay(inlay)) = cursor.next_item() {
-                            if inlay.position.bias() == Bias::Right {
-                                return point;
-                            } else if bias == Bias::Right {
-                                cursor.next();
-                            } else if point.0.column == 0 {
-                                point.0.row -= 1;
-                                point.0.column = self.line_len(point.0.row);
-                            } else {
-                                point.0.column -= 1;
-                            }
-                        } else {
-                            return point;
-                        }
-                    } else {
-                        let overshoot = point.0 - cursor.start().0.0;
-                        let buffer_point = cursor.start().1 + overshoot;
-                        let clipped_buffer_point = self.buffer.clip_point(buffer_point, bias);
-                        let clipped_overshoot = clipped_buffer_point - cursor.start().1;
-                        let clipped_point = InlayPoint(cursor.start().0.0 + clipped_overshoot);
-                        if clipped_point == point {
-                            return clipped_point;
-                        } else {
-                            point = clipped_point;
-                        }
-                    }
-                }
-                Some(Transform::Inlay(inlay)) => {
-                    if point == cursor.start().0 && inlay.position.bias() == Bias::Right {
-                        match cursor.prev_item() {
-                            Some(Transform::Inlay(inlay)) => {
-                                if inlay.position.bias() == Bias::Left {
-                                    return point;
-                                }
-                            }
-                            _ => return point,
-                        }
-                    } else if point == cursor.end().0 && inlay.position.bias() == Bias::Left {
-                        match cursor.next_item() {
-                            Some(Transform::Inlay(inlay)) => {
-                                if inlay.position.bias() == Bias::Right {
-                                    return point;
-                                }
-                            }
-                            _ => return point,
-                        }
-                    }
-
-                    if bias == Bias::Left {
-                        point = cursor.start().0;
-                        cursor.prev();
-                    } else {
-                        cursor.next();
-                        point = cursor.start().0;
-                    }
-                }
-                None => {
-                    bias = bias.invert();
-                    if bias == Bias::Left {
-                        point = cursor.start().0;
-                        cursor.prev();
-                    } else {
-                        cursor.next();
-                        point = cursor.start().0;
-                    }
-                }
-            }
-        }
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn text_summary(&self) -> MBTextSummary {
-        self.transforms.summary().output
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn text_summary_for_range(&self, range: Range<InlayOffset>) -> MBTextSummary {
-        let mut summary = MBTextSummary::default();
-
-        let mut cursor = self
-            .transforms
-            .cursor::<Dimensions<InlayOffset, MultiBufferOffset>>(());
-        cursor.seek(&range.start, Bias::Right);
-
-        let overshoot = range.start.0 - cursor.start().0.0;
-        match cursor.item() {
-            Some(Transform::Isomorphic(_)) => {
-                let buffer_start = cursor.start().1;
-                let suffix_start = buffer_start + overshoot;
-                let suffix_end =
-                    buffer_start + (cmp::min(cursor.end().0, range.end).0 - cursor.start().0.0);
-                summary = self.buffer.text_summary_for_range(suffix_start..suffix_end);
-                cursor.next();
-            }
-            Some(Transform::Inlay(inlay)) => {
-                let suffix_start = overshoot;
-                let suffix_end = cmp::min(cursor.end().0, range.end).0 - cursor.start().0.0;
-                summary = MBTextSummary::from(
-                    inlay
-                        .text()
-                        .cursor(suffix_start)
-                        .summary::<TextSummary>(suffix_end),
-                );
-                cursor.next();
-            }
-            None => {}
-        }
-
-        if range.end > cursor.start().0 {
-            summary += cursor
-                .summary::<_, TransformSummary>(&range.end, Bias::Right)
-                .output;
-
-            let overshoot = range.end.0 - cursor.start().0.0;
-            match cursor.item() {
-                Some(Transform::Isomorphic(_)) => {
-                    let prefix_start = cursor.start().1;
-                    let prefix_end = prefix_start + overshoot;
-                    summary += self
-                        .buffer
-                        .text_summary_for_range::<MBTextSummary, _>(prefix_start..prefix_end);
-                }
-                Some(Transform::Inlay(inlay)) => {
-                    let prefix_end = overshoot;
-                    summary += inlay.text().cursor(0).summary::<TextSummary>(prefix_end);
-                }
-                None => {}
-            }
-        }
-
-        summary
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn row_infos(&self, row: u32) -> InlayBufferRows<'_> {
-        let mut cursor = self.transforms.cursor::<Dimensions<InlayPoint, Point>>(());
-        let inlay_point = InlayPoint::new(row, 0);
-        cursor.seek(&inlay_point, Bias::Left);
-
-        let max_buffer_row = self.buffer.max_row();
-        let mut buffer_point = cursor.start().1;
-        let buffer_row = if row == 0 {
-            MultiBufferRow(0)
-        } else {
-            match cursor.item() {
-                Some(Transform::Isomorphic(_)) => {
-                    buffer_point += inlay_point.0 - cursor.start().0.0;
-                    MultiBufferRow(buffer_point.row)
-                }
-                _ => cmp::min(MultiBufferRow(buffer_point.row + 1), max_buffer_row),
-            }
-        };
-
-        InlayBufferRows {
-            transforms: cursor,
-            inlay_row: inlay_point.row(),
-            buffer_rows: self.buffer.row_infos(buffer_row),
-            max_buffer_row,
-        }
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn line_len(&self, row: u32) -> u32 {
-        let line_start = self.to_offset(InlayPoint::new(row, 0)).0;
-        let line_end = if row >= self.max_point().row() {
-            self.len().0
-        } else {
-            self.to_offset(InlayPoint::new(row + 1, 0)).0 - 1
-        };
-        (line_end - line_start) as u32
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub(crate) fn chunks<'a>(
-        &'a self,
-        range: Range<InlayOffset>,
-        language_aware: bool,
-        highlights: Highlights<'a>,
-    ) -> InlayChunks<'a> {
-        let mut cursor = self
-            .transforms
-            .cursor::<Dimensions<InlayOffset, MultiBufferOffset>>(());
-        cursor.seek(&range.start, Bias::Right);
-
-        let buffer_range = self.to_buffer_offset(range.start)..self.to_buffer_offset(range.end);
-        let buffer_chunks = CustomHighlightsChunks::new(
-            buffer_range,
-            language_aware,
-            highlights.text_highlights,
-            &self.buffer,
-        );
-
-        InlayChunks {
-            transforms: cursor,
-            buffer_chunks,
-            inlay_chunks: None,
-            inlay_chunk: None,
-            buffer_chunk: None,
-            output_offset: range.start,
-            max_output_offset: range.end,
-            highlight_styles: highlights.styles,
-            highlights,
-            snapshot: self,
-        }
-    }
-
-    #[cfg(test)]
-    #[ztracing::instrument(skip_all)]
-    pub fn text(&self) -> String {
-        self.chunks(Default::default()..self.len(), false, Highlights::default())
-            .map(|chunk| chunk.chunk.text)
-            .collect()
-    }
-
-    #[ztracing::instrument(skip_all)]
-    fn check_invariants(&self) {
-        #[cfg(any(debug_assertions, feature = "test-support"))]
-        {
-            assert_eq!(self.transforms.summary().input, self.buffer.text_summary());
-            let mut transforms = self.transforms.iter().peekable();
-            while let Some(transform) = transforms.next() {
-                let transform_is_isomorphic = matches!(transform, Transform::Isomorphic(_));
-                if let Some(next_transform) = transforms.peek() {
-                    let next_transform_is_isomorphic =
-                        matches!(next_transform, Transform::Isomorphic(_));
-                    assert!(
-                        !transform_is_isomorphic || !next_transform_is_isomorphic,
-                        "two adjacent isomorphic transforms"
-                    );
-                }
-            }
-        }
-    }
-}
-
-pub struct InlayPointCursor<'transforms> {
-    cursor: Cursor<'transforms, 'static, Transform, Dimensions<Point, InlayPoint>>,
-    transforms: &'transforms SumTree<Transform>,
-}
-
-impl InlayPointCursor<'_> {
-    #[ztracing::instrument(skip_all)]
-    pub fn map(&mut self, point: Point) -> InlayPoint {
-        let cursor = &mut self.cursor;
-        if cursor.did_seek() {
-            cursor.seek_forward(&point, Bias::Left);
-        } else {
-            cursor.seek(&point, Bias::Left);
-        }
-        loop {
-            match cursor.item() {
-                Some(Transform::Isomorphic(_)) => {
-                    if point == cursor.end().0 {
-                        while let Some(Transform::Inlay(inlay)) = cursor.next_item() {
-                            if inlay.position.bias() == Bias::Right {
-                                break;
-                            } else {
-                                cursor.next();
-                            }
-                        }
-                        return cursor.end().1;
-                    } else {
-                        let overshoot = point - cursor.start().0;
-                        return InlayPoint(cursor.start().1.0 + overshoot);
-                    }
-                }
-                Some(Transform::Inlay(inlay)) => {
-                    if inlay.position.bias() == Bias::Left {
-                        cursor.next();
-                    } else {
-                        return cursor.start().1;
-                    }
-                }
-                None => {
-                    return InlayPoint(self.transforms.summary().output.lines);
-                }
-            }
-        }
-    }
-}
-
-fn push_isomorphic(sum_tree: &mut SumTree<Transform>, summary: MBTextSummary) {
-    if summary.len == MultiBufferOffset(0) {
-        return;
-    }
-
-    let mut summary = Some(summary);
-    sum_tree.update_last(
-        |transform| {
-            if let Transform::Isomorphic(transform) = transform {
-                *transform += summary.take().unwrap();
-            }
-        },
-        (),
-    );
-
-    if let Some(summary) = summary {
-        sum_tree.push(Transform::Isomorphic(summary), ());
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::{
-        MultiBuffer,
-        display_map::{HighlightKey, InlayHighlights, TextHighlights},
-        hover_links::InlayHighlight,
-    };
-    use gpui::{App, HighlightStyle};
-    use multi_buffer::Anchor;
-    use project::{InlayHint, InlayHintLabel, ResolveState};
-    use rand::prelude::*;
-    use settings::SettingsStore;
-    use std::{any::TypeId, cmp::Reverse, env, sync::Arc};
-    use sum_tree::TreeMap;
-    use text::{Patch, Rope};
-    use util::RandomCharIter;
-    use util::post_inc;
-
-    #[test]
-    fn test_inlay_properties_label_padding() {
-        assert_eq!(
-            Inlay::hint(
-                InlayId::Hint(0),
-                Anchor::min(),
-                &InlayHint {
-                    label: InlayHintLabel::String("a".to_string()),
-                    position: text::Anchor::MIN,
-                    padding_left: false,
-                    padding_right: false,
-                    tooltip: None,
-                    kind: None,
-                    resolve_state: ResolveState::Resolved,
-                },
-            )
-            .text()
-            .to_string(),
-            "a",
-            "Should not pad label if not requested"
-        );
-
-        assert_eq!(
-            Inlay::hint(
-                InlayId::Hint(0),
-                Anchor::min(),
-                &InlayHint {
-                    label: InlayHintLabel::String("a".to_string()),
-                    position: text::Anchor::MIN,
-                    padding_left: true,
-                    padding_right: true,
-                    tooltip: None,
-                    kind: None,
-                    resolve_state: ResolveState::Resolved,
-                },
-            )
-            .text()
-            .to_string(),
-            " a ",
-            "Should pad label for every side requested"
-        );
-
-        assert_eq!(
-            Inlay::hint(
-                InlayId::Hint(0),
-                Anchor::min(),
-                &InlayHint {
-                    label: InlayHintLabel::String(" a ".to_string()),
-                    position: text::Anchor::MIN,
-                    padding_left: false,
-                    padding_right: false,
-                    tooltip: None,
-                    kind: None,
-                    resolve_state: ResolveState::Resolved,
-                },
-            )
-            .text()
-            .to_string(),
-            " a ",
-            "Should not change already padded label"
-        );
-
-        assert_eq!(
-            Inlay::hint(
-                InlayId::Hint(0),
-                Anchor::min(),
-                &InlayHint {
-                    label: InlayHintLabel::String(" a ".to_string()),
-                    position: text::Anchor::MIN,
-                    padding_left: true,
-                    padding_right: true,
-                    tooltip: None,
-                    kind: None,
-                    resolve_state: ResolveState::Resolved,
-                },
-            )
-            .text()
-            .to_string(),
-            " a ",
-            "Should not change already padded label"
-        );
-    }
-
-    #[gpui::test]
-    fn test_inlay_hint_padding_with_multibyte_chars() {
-        assert_eq!(
-            Inlay::hint(
-                InlayId::Hint(0),
-                Anchor::min(),
-                &InlayHint {
-                    label: InlayHintLabel::String("🎨".to_string()),
-                    position: text::Anchor::MIN,
-                    padding_left: true,
-                    padding_right: true,
-                    tooltip: None,
-                    kind: None,
-                    resolve_state: ResolveState::Resolved,
-                },
-            )
-            .text()
-            .to_string(),
-            " 🎨 ",
-            "Should pad single emoji correctly"
-        );
-    }
-
-    #[gpui::test]
-    fn test_basic_inlays(cx: &mut App) {
-        let buffer = MultiBuffer::build_simple("abcdefghi", cx);
-        let buffer_edits = buffer.update(cx, |buffer, _| buffer.subscribe());
-        let (mut inlay_map, inlay_snapshot) = InlayMap::new(buffer.read(cx).snapshot(cx));
-        assert_eq!(inlay_snapshot.text(), "abcdefghi");
-        let mut next_inlay_id = 0;
-
-        let (inlay_snapshot, _) = inlay_map.splice(
-            &[],
-            vec![Inlay::mock_hint(
-                post_inc(&mut next_inlay_id),
-                buffer
-                    .read(cx)
-                    .snapshot(cx)
-                    .anchor_after(MultiBufferOffset(3)),
-                "|123|",
-            )],
-        );
-        assert_eq!(inlay_snapshot.text(), "abc|123|defghi");
-        assert_eq!(
-            inlay_snapshot.to_inlay_point(Point::new(0, 0)),
-            InlayPoint::new(0, 0)
-        );
-        assert_eq!(
-            inlay_snapshot.to_inlay_point(Point::new(0, 1)),
-            InlayPoint::new(0, 1)
-        );
-        assert_eq!(
-            inlay_snapshot.to_inlay_point(Point::new(0, 2)),
-            InlayPoint::new(0, 2)
-        );
-        assert_eq!(
-            inlay_snapshot.to_inlay_point(Point::new(0, 3)),
-            InlayPoint::new(0, 3)
-        );
-        assert_eq!(
-            inlay_snapshot.to_inlay_point(Point::new(0, 4)),
-            InlayPoint::new(0, 9)
-        );
-        assert_eq!(
-            inlay_snapshot.to_inlay_point(Point::new(0, 5)),
-            InlayPoint::new(0, 10)
-        );
-        assert_eq!(
-            inlay_snapshot.clip_point(InlayPoint::new(0, 0), Bias::Left),
-            InlayPoint::new(0, 0)
-        );
-        assert_eq!(
-            inlay_snapshot.clip_point(InlayPoint::new(0, 0), Bias::Right),
-            InlayPoint::new(0, 0)
-        );
-        assert_eq!(
-            inlay_snapshot.clip_point(InlayPoint::new(0, 3), Bias::Left),
-            InlayPoint::new(0, 3)
-        );
-        assert_eq!(
-            inlay_snapshot.clip_point(InlayPoint::new(0, 3), Bias::Right),
-            InlayPoint::new(0, 3)
-        );
-        assert_eq!(
-            inlay_snapshot.clip_point(InlayPoint::new(0, 4), Bias::Left),
-            InlayPoint::new(0, 3)
-        );
-        assert_eq!(
-            inlay_snapshot.clip_point(InlayPoint::new(0, 4), Bias::Right),
-            InlayPoint::new(0, 9)
-        );
-
-        // Edits before or after the inlay should not affect it.
-        buffer.update(cx, |buffer, cx| {
-            buffer.edit(
-                [
-                    (MultiBufferOffset(2)..MultiBufferOffset(3), "x"),
-                    (MultiBufferOffset(3)..MultiBufferOffset(3), "y"),
-                    (MultiBufferOffset(4)..MultiBufferOffset(4), "z"),
-                ],
-                None,
-                cx,
-            )
-        });
-        let (inlay_snapshot, _) = inlay_map.sync(
-            buffer.read(cx).snapshot(cx),
-            buffer_edits.consume().into_inner(),
-        );
-        assert_eq!(inlay_snapshot.text(), "abxy|123|dzefghi");
-
-        // An edit surrounding the inlay should invalidate it.
-        buffer.update(cx, |buffer, cx| {
-            buffer.edit(
-                [(MultiBufferOffset(4)..MultiBufferOffset(5), "D")],
-                None,
-                cx,
-            )
-        });
-        let (inlay_snapshot, _) = inlay_map.sync(
-            buffer.read(cx).snapshot(cx),
-            buffer_edits.consume().into_inner(),
-        );
-        assert_eq!(inlay_snapshot.text(), "abxyDzefghi");
-
-        let (inlay_snapshot, _) = inlay_map.splice(
-            &[],
-            vec![
-                Inlay::mock_hint(
-                    post_inc(&mut next_inlay_id),
-                    buffer
-                        .read(cx)
-                        .snapshot(cx)
-                        .anchor_before(MultiBufferOffset(3)),
-                    "|123|",
-                ),
-                Inlay::edit_prediction(
-                    post_inc(&mut next_inlay_id),
-                    buffer
-                        .read(cx)
-                        .snapshot(cx)
-                        .anchor_after(MultiBufferOffset(3)),
-                    "|456|",
-                ),
-            ],
-        );
-        assert_eq!(inlay_snapshot.text(), "abx|123||456|yDzefghi");
-
-        // Edits ending where the inlay starts should not move it if it has a left bias.
-        buffer.update(cx, |buffer, cx| {
-            buffer.edit(
-                [(MultiBufferOffset(3)..MultiBufferOffset(3), "JKL")],
-                None,
-                cx,
-            )
-        });
-        let (inlay_snapshot, _) = inlay_map.sync(
-            buffer.read(cx).snapshot(cx),
-            buffer_edits.consume().into_inner(),
-        );
-        assert_eq!(inlay_snapshot.text(), "abx|123|JKL|456|yDzefghi");
-
-        assert_eq!(
-            inlay_snapshot.clip_point(InlayPoint::new(0, 0), Bias::Left),
-            InlayPoint::new(0, 0)
-        );
-        assert_eq!(
-            inlay_snapshot.clip_point(InlayPoint::new(0, 0), Bias::Right),
-            InlayPoint::new(0, 0)
-        );
-
-        assert_eq!(
-            inlay_snapshot.clip_point(InlayPoint::new(0, 1), Bias::Left),
-            InlayPoint::new(0, 1)
-        );
-        assert_eq!(
-            inlay_snapshot.clip_point(InlayPoint::new(0, 1), Bias::Right),
-            InlayPoint::new(0, 1)
-        );
-
-        assert_eq!(
-            inlay_snapshot.clip_point(InlayPoint::new(0, 2), Bias::Left),
-            InlayPoint::new(0, 2)
-        );
-        assert_eq!(
-            inlay_snapshot.clip_point(InlayPoint::new(0, 2), Bias::Right),
-            InlayPoint::new(0, 2)
-        );
-
-        assert_eq!(
-            inlay_snapshot.clip_point(InlayPoint::new(0, 3), Bias::Left),
-            InlayPoint::new(0, 2)
-        );
-        assert_eq!(
-            inlay_snapshot.clip_point(InlayPoint::new(0, 3), Bias::Right),
-            InlayPoint::new(0, 8)
-        );
-
-        assert_eq!(
-            inlay_snapshot.clip_point(InlayPoint::new(0, 4), Bias::Left),
-            InlayPoint::new(0, 2)
-        );
-        assert_eq!(
-            inlay_snapshot.clip_point(InlayPoint::new(0, 4), Bias::Right),
-            InlayPoint::new(0, 8)
-        );
-
-        assert_eq!(
-            inlay_snapshot.clip_point(InlayPoint::new(0, 5), Bias::Left),
-            InlayPoint::new(0, 2)
-        );
-        assert_eq!(
-            inlay_snapshot.clip_point(InlayPoint::new(0, 5), Bias::Right),
-            InlayPoint::new(0, 8)
-        );
-
-        assert_eq!(
-            inlay_snapshot.clip_point(InlayPoint::new(0, 6), Bias::Left),
-            InlayPoint::new(0, 2)
-        );
-        assert_eq!(
-            inlay_snapshot.clip_point(InlayPoint::new(0, 6), Bias::Right),
-            InlayPoint::new(0, 8)
-        );
-
-        assert_eq!(
-            inlay_snapshot.clip_point(InlayPoint::new(0, 7), Bias::Left),
-            InlayPoint::new(0, 2)
-        );
-        assert_eq!(
-            inlay_snapshot.clip_point(InlayPoint::new(0, 7), Bias::Right),
-            InlayPoint::new(0, 8)
-        );
-
-        assert_eq!(
-            inlay_snapshot.clip_point(InlayPoint::new(0, 8), Bias::Left),
-            InlayPoint::new(0, 8)
-        );
-        assert_eq!(
-            inlay_snapshot.clip_point(InlayPoint::new(0, 8), Bias::Right),
-            InlayPoint::new(0, 8)
-        );
-
-        assert_eq!(
-            inlay_snapshot.clip_point(InlayPoint::new(0, 9), Bias::Left),
-            InlayPoint::new(0, 9)
-        );
-        assert_eq!(
-            inlay_snapshot.clip_point(InlayPoint::new(0, 9), Bias::Right),
-            InlayPoint::new(0, 9)
-        );
-
-        assert_eq!(
-            inlay_snapshot.clip_point(InlayPoint::new(0, 10), Bias::Left),
-            InlayPoint::new(0, 10)
-        );
-        assert_eq!(
-            inlay_snapshot.clip_point(InlayPoint::new(0, 10), Bias::Right),
-            InlayPoint::new(0, 10)
-        );
-
-        assert_eq!(
-            inlay_snapshot.clip_point(InlayPoint::new(0, 11), Bias::Left),
-            InlayPoint::new(0, 11)
-        );
-        assert_eq!(
-            inlay_snapshot.clip_point(InlayPoint::new(0, 11), Bias::Right),
-            InlayPoint::new(0, 11)
-        );
-
-        assert_eq!(
-            inlay_snapshot.clip_point(InlayPoint::new(0, 12), Bias::Left),
-            InlayPoint::new(0, 11)
-        );
-        assert_eq!(
-            inlay_snapshot.clip_point(InlayPoint::new(0, 12), Bias::Right),
-            InlayPoint::new(0, 17)
-        );
-
-        assert_eq!(
-            inlay_snapshot.clip_point(InlayPoint::new(0, 13), Bias::Left),
-            InlayPoint::new(0, 11)
-        );
-        assert_eq!(
-            inlay_snapshot.clip_point(InlayPoint::new(0, 13), Bias::Right),
-            InlayPoint::new(0, 17)
-        );
-
-        assert_eq!(
-            inlay_snapshot.clip_point(InlayPoint::new(0, 14), Bias::Left),
-            InlayPoint::new(0, 11)
-        );
-        assert_eq!(
-            inlay_snapshot.clip_point(InlayPoint::new(0, 14), Bias::Right),
-            InlayPoint::new(0, 17)
-        );
-
-        assert_eq!(
-            inlay_snapshot.clip_point(InlayPoint::new(0, 15), Bias::Left),
-            InlayPoint::new(0, 11)
-        );
-        assert_eq!(
-            inlay_snapshot.clip_point(InlayPoint::new(0, 15), Bias::Right),
-            InlayPoint::new(0, 17)
-        );
-
-        assert_eq!(
-            inlay_snapshot.clip_point(InlayPoint::new(0, 16), Bias::Left),
-            InlayPoint::new(0, 11)
-        );
-        assert_eq!(
-            inlay_snapshot.clip_point(InlayPoint::new(0, 16), Bias::Right),
-            InlayPoint::new(0, 17)
-        );
-
-        assert_eq!(
-            inlay_snapshot.clip_point(InlayPoint::new(0, 17), Bias::Left),
-            InlayPoint::new(0, 17)
-        );
-        assert_eq!(
-            inlay_snapshot.clip_point(InlayPoint::new(0, 17), Bias::Right),
-            InlayPoint::new(0, 17)
-        );
-
-        assert_eq!(
-            inlay_snapshot.clip_point(InlayPoint::new(0, 18), Bias::Left),
-            InlayPoint::new(0, 18)
-        );
-        assert_eq!(
-            inlay_snapshot.clip_point(InlayPoint::new(0, 18), Bias::Right),
-            InlayPoint::new(0, 18)
-        );
-
-        // The inlays can be manually removed.
-        let (inlay_snapshot, _) = inlay_map.splice(
-            &inlay_map
-                .inlays
-                .iter()
-                .map(|inlay| inlay.id)
-                .collect::<Vec<InlayId>>(),
-            Vec::new(),
-        );
-        assert_eq!(inlay_snapshot.text(), "abxJKLyDzefghi");
-    }
-
-    #[gpui::test]
-    fn test_inlay_buffer_rows(cx: &mut App) {
-        let buffer = MultiBuffer::build_simple("abc\ndef\nghi", cx);
-        let (mut inlay_map, inlay_snapshot) = InlayMap::new(buffer.read(cx).snapshot(cx));
-        assert_eq!(inlay_snapshot.text(), "abc\ndef\nghi");
-        let mut next_inlay_id = 0;
-
-        let (inlay_snapshot, _) = inlay_map.splice(
-            &[],
-            vec![
-                Inlay::mock_hint(
-                    post_inc(&mut next_inlay_id),
-                    buffer
-                        .read(cx)
-                        .snapshot(cx)
-                        .anchor_before(MultiBufferOffset(0)),
-                    "|123|\n",
-                ),
-                Inlay::mock_hint(
-                    post_inc(&mut next_inlay_id),
-                    buffer
-                        .read(cx)
-                        .snapshot(cx)
-                        .anchor_before(MultiBufferOffset(4)),
-                    "|456|",
-                ),
-                Inlay::edit_prediction(
-                    post_inc(&mut next_inlay_id),
-                    buffer
-                        .read(cx)
-                        .snapshot(cx)
-                        .anchor_before(MultiBufferOffset(7)),
-                    "\n|567|\n",
-                ),
-            ],
-        );
-        assert_eq!(inlay_snapshot.text(), "|123|\nabc\n|456|def\n|567|\n\nghi");
-        assert_eq!(
-            inlay_snapshot
-                .row_infos(0)
-                .map(|info| info.buffer_row)
-                .collect::<Vec<_>>(),
-            vec![Some(0), None, Some(1), None, None, Some(2)]
-        );
-    }
-
-    #[gpui::test(iterations = 100)]
-    fn test_random_inlays(cx: &mut App, mut rng: StdRng) {
-        init_test(cx);
-
-        let operations = env::var("OPERATIONS")
-            .map(|i| i.parse().expect("invalid `OPERATIONS` variable"))
-            .unwrap_or(10);
-
-        let len = rng.random_range(0..30);
-        let buffer = if rng.random() {
-            let text = util::RandomCharIter::new(&mut rng)
-                .take(len)
-                .collect::<String>();
-            MultiBuffer::build_simple(&text, cx)
-        } else {
-            MultiBuffer::build_random(&mut rng, cx)
-        };
-        let mut buffer_snapshot = buffer.read(cx).snapshot(cx);
-        let mut next_inlay_id = 0;
-        log::info!("buffer text: {:?}", buffer_snapshot.text());
-        let (mut inlay_map, mut inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
-        for _ in 0..operations {
-            let mut inlay_edits = Patch::default();
-
-            let mut prev_inlay_text = inlay_snapshot.text();
-            let mut buffer_edits = Vec::new();
-            match rng.random_range(0..=100) {
-                0..=50 => {
-                    let (snapshot, edits) = inlay_map.randomly_mutate(&mut next_inlay_id, &mut rng);
-                    log::info!("mutated text: {:?}", snapshot.text());
-                    inlay_edits = Patch::new(edits);
-                }
-                _ => buffer.update(cx, |buffer, cx| {
-                    let subscription = buffer.subscribe();
-                    let edit_count = rng.random_range(1..=5);
-                    buffer.randomly_mutate(&mut rng, edit_count, cx);
-                    buffer_snapshot = buffer.snapshot(cx);
-                    let edits = subscription.consume().into_inner();
-                    log::info!("editing {:?}", edits);
-                    buffer_edits.extend(edits);
-                }),
-            };
-
-            let (new_inlay_snapshot, new_inlay_edits) =
-                inlay_map.sync(buffer_snapshot.clone(), buffer_edits);
-            inlay_snapshot = new_inlay_snapshot;
-            inlay_edits = inlay_edits.compose(new_inlay_edits);
-
-            log::info!("buffer text: {:?}", buffer_snapshot.text());
-            log::info!("inlay text: {:?}", inlay_snapshot.text());
-
-            let inlays = inlay_map
-                .inlays
-                .iter()
-                .filter(|inlay| inlay.position.is_valid(&buffer_snapshot))
-                .map(|inlay| {
-                    let offset = inlay.position.to_offset(&buffer_snapshot);
-                    (offset, inlay.clone())
-                })
-                .collect::<Vec<_>>();
-            let mut expected_text = Rope::from(&buffer_snapshot.text());
-            for (offset, inlay) in inlays.iter().rev() {
-                expected_text.replace(offset.0..offset.0, &inlay.text().to_string());
-            }
-            assert_eq!(inlay_snapshot.text(), expected_text.to_string());
-
-            let expected_buffer_rows = inlay_snapshot.row_infos(0).collect::<Vec<_>>();
-            assert_eq!(
-                expected_buffer_rows.len() as u32,
-                expected_text.max_point().row + 1
-            );
-            for row_start in 0..expected_buffer_rows.len() {
-                assert_eq!(
-                    inlay_snapshot
-                        .row_infos(row_start as u32)
-                        .collect::<Vec<_>>(),
-                    &expected_buffer_rows[row_start..],
-                    "incorrect buffer rows starting at {}",
-                    row_start
-                );
-            }
-
-            let mut text_highlights = TextHighlights::default();
-            let text_highlight_count = rng.random_range(0_usize..10);
-            let mut text_highlight_ranges = (0..text_highlight_count)
-                .map(|_| buffer_snapshot.random_byte_range(MultiBufferOffset(0), &mut rng))
-                .collect::<Vec<_>>();
-            text_highlight_ranges.sort_by_key(|range| (range.start, Reverse(range.end)));
-            log::info!("highlighting text ranges {text_highlight_ranges:?}");
-            text_highlights.insert(
-                HighlightKey::Type(TypeId::of::<()>()),
-                Arc::new((
-                    HighlightStyle::default(),
-                    text_highlight_ranges
-                        .into_iter()
-                        .map(|range| {
-                            buffer_snapshot.anchor_before(range.start)
-                                ..buffer_snapshot.anchor_after(range.end)
-                        })
-                        .collect(),
-                )),
-            );
-
-            let mut inlay_highlights = InlayHighlights::default();
-            if !inlays.is_empty() {
-                let inlay_highlight_count = rng.random_range(0..inlays.len());
-                let mut inlay_indices = BTreeSet::default();
-                while inlay_indices.len() < inlay_highlight_count {
-                    inlay_indices.insert(rng.random_range(0..inlays.len()));
-                }
-                let new_highlights = TreeMap::from_ordered_entries(
-                    inlay_indices
-                        .into_iter()
-                        .filter_map(|i| {
-                            let (_, inlay) = &inlays[i];
-                            let inlay_text_len = inlay.text().len();
-                            match inlay_text_len {
-                                0 => None,
-                                1 => Some(InlayHighlight {
-                                    inlay: inlay.id,
-                                    inlay_position: inlay.position,
-                                    range: 0..1,
-                                }),
-                                n => {
-                                    let inlay_text = inlay.text().to_string();
-                                    let mut highlight_end = rng.random_range(1..n);
-                                    let mut highlight_start = rng.random_range(0..highlight_end);
-                                    while !inlay_text.is_char_boundary(highlight_end) {
-                                        highlight_end += 1;
-                                    }
-                                    while !inlay_text.is_char_boundary(highlight_start) {
-                                        highlight_start -= 1;
-                                    }
-                                    Some(InlayHighlight {
-                                        inlay: inlay.id,
-                                        inlay_position: inlay.position,
-                                        range: highlight_start..highlight_end,
-                                    })
-                                }
-                            }
-                        })
-                        .map(|highlight| (highlight.inlay, (HighlightStyle::default(), highlight))),
-                );
-                log::info!("highlighting inlay ranges {new_highlights:?}");
-                inlay_highlights.insert(TypeId::of::<()>(), new_highlights);
-            }
-
-            for _ in 0..5 {
-                let mut end = rng.random_range(0..=inlay_snapshot.len().0.0);
-                end = expected_text.clip_offset(end, Bias::Right);
-                let mut start = rng.random_range(0..=end);
-                start = expected_text.clip_offset(start, Bias::Right);
-
-                let range =
-                    InlayOffset(MultiBufferOffset(start))..InlayOffset(MultiBufferOffset(end));
-                log::info!("calling inlay_snapshot.chunks({range:?})");
-                let actual_text = inlay_snapshot
-                    .chunks(
-                        range,
-                        false,
-                        Highlights {
-                            text_highlights: Some(&text_highlights),
-                            inlay_highlights: Some(&inlay_highlights),
-                            ..Highlights::default()
-                        },
-                    )
-                    .map(|chunk| chunk.chunk.text)
-                    .collect::<String>();
-                assert_eq!(
-                    actual_text,
-                    expected_text.slice(start..end).to_string(),
-                    "incorrect text in range {:?}",
-                    start..end
-                );
-
-                assert_eq!(
-                    inlay_snapshot.text_summary_for_range(
-                        InlayOffset(MultiBufferOffset(start))..InlayOffset(MultiBufferOffset(end))
-                    ),
-                    MBTextSummary::from(expected_text.slice(start..end).summary())
-                );
-            }
-
-            for edit in inlay_edits {
-                prev_inlay_text.replace_range(
-                    edit.new.start.0.0..edit.new.start.0.0 + edit.old_len(),
-                    &inlay_snapshot.text()[edit.new.start.0.0..edit.new.end.0.0],
-                );
-            }
-            assert_eq!(prev_inlay_text, inlay_snapshot.text());
-
-            assert_eq!(expected_text.max_point(), inlay_snapshot.max_point().0);
-            assert_eq!(expected_text.len(), inlay_snapshot.len().0.0);
-
-            let mut buffer_point = Point::default();
-            let mut inlay_point = inlay_snapshot.to_inlay_point(buffer_point);
-            let mut buffer_chars = buffer_snapshot.chars_at(MultiBufferOffset(0));
-            loop {
-                // Ensure conversion from buffer coordinates to inlay coordinates
-                // is consistent.
-                let buffer_offset = buffer_snapshot.point_to_offset(buffer_point);
-                assert_eq!(
-                    inlay_snapshot.to_point(inlay_snapshot.to_inlay_offset(buffer_offset)),
-                    inlay_point
-                );
-
-                // No matter which bias we clip an inlay point with, it doesn't move
-                // because it was constructed from a buffer point.
-                assert_eq!(
-                    inlay_snapshot.clip_point(inlay_point, Bias::Left),
-                    inlay_point,
-                    "invalid inlay point for buffer point {:?} when clipped left",
-                    buffer_point
-                );
-                assert_eq!(
-                    inlay_snapshot.clip_point(inlay_point, Bias::Right),
-                    inlay_point,
-                    "invalid inlay point for buffer point {:?} when clipped right",
-                    buffer_point
-                );
-
-                if let Some(ch) = buffer_chars.next() {
-                    if ch == '\n' {
-                        buffer_point += Point::new(1, 0);
-                    } else {
-                        buffer_point += Point::new(0, ch.len_utf8() as u32);
-                    }
-
-                    // Ensure that moving forward in the buffer always moves the inlay point forward as well.
-                    let new_inlay_point = inlay_snapshot.to_inlay_point(buffer_point);
-                    assert!(new_inlay_point > inlay_point);
-                    inlay_point = new_inlay_point;
-                } else {
-                    break;
-                }
-            }
-
-            let mut inlay_point = InlayPoint::default();
-            let mut inlay_offset = InlayOffset::default();
-            for ch in expected_text.chars() {
-                assert_eq!(
-                    inlay_snapshot.to_offset(inlay_point),
-                    inlay_offset,
-                    "invalid to_offset({:?})",
-                    inlay_point
-                );
-                assert_eq!(
-                    inlay_snapshot.to_point(inlay_offset),
-                    inlay_point,
-                    "invalid to_point({:?})",
-                    inlay_offset
-                );
-
-                let mut bytes = [0; 4];
-                for byte in ch.encode_utf8(&mut bytes).as_bytes() {
-                    inlay_offset.0 += 1;
-                    if *byte == b'\n' {
-                        inlay_point.0 += Point::new(1, 0);
-                    } else {
-                        inlay_point.0 += Point::new(0, 1);
-                    }
-
-                    let clipped_left_point = inlay_snapshot.clip_point(inlay_point, Bias::Left);
-                    let clipped_right_point = inlay_snapshot.clip_point(inlay_point, Bias::Right);
-                    assert!(
-                        clipped_left_point <= clipped_right_point,
-                        "inlay point {:?} when clipped left is greater than when clipped right ({:?} > {:?})",
-                        inlay_point,
-                        clipped_left_point,
-                        clipped_right_point
-                    );
-
-                    // Ensure the clipped points are at valid text locations.
-                    assert_eq!(
-                        clipped_left_point.0,
-                        expected_text.clip_point(clipped_left_point.0, Bias::Left)
-                    );
-                    assert_eq!(
-                        clipped_right_point.0,
-                        expected_text.clip_point(clipped_right_point.0, Bias::Right)
-                    );
-
-                    // Ensure the clipped points never overshoot the end of the map.
-                    assert!(clipped_left_point <= inlay_snapshot.max_point());
-                    assert!(clipped_right_point <= inlay_snapshot.max_point());
-
-                    // Ensure the clipped points are at valid buffer locations.
-                    assert_eq!(
-                        inlay_snapshot
-                            .to_inlay_point(inlay_snapshot.to_buffer_point(clipped_left_point)),
-                        clipped_left_point,
-                        "to_buffer_point({:?}) = {:?}",
-                        clipped_left_point,
-                        inlay_snapshot.to_buffer_point(clipped_left_point),
-                    );
-                    assert_eq!(
-                        inlay_snapshot
-                            .to_inlay_point(inlay_snapshot.to_buffer_point(clipped_right_point)),
-                        clipped_right_point,
-                        "to_buffer_point({:?}) = {:?}",
-                        clipped_right_point,
-                        inlay_snapshot.to_buffer_point(clipped_right_point),
-                    );
-                }
-            }
-        }
-    }
-
-    #[gpui::test(iterations = 100)]
-    fn test_random_chunk_bitmaps(cx: &mut gpui::App, mut rng: StdRng) {
-        init_test(cx);
-
-        // Generate random buffer using existing test infrastructure
-        let text_len = rng.random_range(0..10000);
-        let buffer = if rng.random() {
-            let text = RandomCharIter::new(&mut rng)
-                .take(text_len)
-                .collect::<String>();
-            MultiBuffer::build_simple(&text, cx)
-        } else {
-            MultiBuffer::build_random(&mut rng, cx)
-        };
-
-        let buffer_snapshot = buffer.read(cx).snapshot(cx);
-        let (mut inlay_map, _) = InlayMap::new(buffer_snapshot.clone());
-
-        // Perform random mutations to add inlays
-        let mut next_inlay_id = 0;
-        let mutation_count = rng.random_range(1..10);
-        for _ in 0..mutation_count {
-            inlay_map.randomly_mutate(&mut next_inlay_id, &mut rng);
-        }
-
-        let (snapshot, _) = inlay_map.sync(buffer_snapshot, vec![]);
-
-        // Get all chunks and verify their bitmaps
-        let chunks = snapshot.chunks(
-            InlayOffset(MultiBufferOffset(0))..snapshot.len(),
-            false,
-            Highlights::default(),
-        );
-
-        for chunk in chunks.into_iter().map(|inlay_chunk| inlay_chunk.chunk) {
-            let chunk_text = chunk.text;
-            let chars_bitmap = chunk.chars;
-            let tabs_bitmap = chunk.tabs;
-
-            // Check empty chunks have empty bitmaps
-            if chunk_text.is_empty() {
-                assert_eq!(
-                    chars_bitmap, 0,
-                    "Empty chunk should have empty chars bitmap"
-                );
-                assert_eq!(tabs_bitmap, 0, "Empty chunk should have empty tabs bitmap");
-                continue;
-            }
-
-            // Verify that chunk text doesn't exceed 128 bytes
-            assert!(
-                chunk_text.len() <= 128,
-                "Chunk text length {} exceeds 128 bytes",
-                chunk_text.len()
-            );
-
-            // Verify chars bitmap
-            let char_indices = chunk_text
-                .char_indices()
-                .map(|(i, _)| i)
-                .collect::<Vec<_>>();
-
-            for byte_idx in 0..chunk_text.len() {
-                let should_have_bit = char_indices.contains(&byte_idx);
-                let has_bit = chars_bitmap & (1 << byte_idx) != 0;
-
-                if has_bit != should_have_bit {
-                    eprintln!("Chunk text bytes: {:?}", chunk_text.as_bytes());
-                    eprintln!("Char indices: {:?}", char_indices);
-                    eprintln!("Chars bitmap: {:#b}", chars_bitmap);
-                    assert_eq!(
-                        has_bit, should_have_bit,
-                        "Chars bitmap mismatch at byte index {} in chunk {:?}. Expected bit: {}, Got bit: {}",
-                        byte_idx, chunk_text, should_have_bit, has_bit
-                    );
-                }
-            }
-
-            // Verify tabs bitmap
-            for (byte_idx, byte) in chunk_text.bytes().enumerate() {
-                let is_tab = byte == b'\t';
-                let has_bit = tabs_bitmap & (1 << byte_idx) != 0;
-
-                if has_bit != is_tab {
-                    eprintln!("Chunk text bytes: {:?}", chunk_text.as_bytes());
-                    eprintln!("Tabs bitmap: {:#b}", tabs_bitmap);
-                    assert_eq!(
-                        has_bit, is_tab,
-                        "Tabs bitmap mismatch at byte index {} in chunk {:?}. Byte: {:?}, Expected bit: {}, Got bit: {}",
-                        byte_idx, chunk_text, byte as char, is_tab, has_bit
-                    );
-                }
-            }
-        }
-    }
-
-    fn init_test(cx: &mut App) {
-        let store = SettingsStore::test(cx);
-        cx.set_global(store);
-        theme::init(theme::LoadThemes::JustBase, cx);
-    }
-
-    /// Helper to create test highlights for an inlay
-    fn create_inlay_highlights(
-        inlay_id: InlayId,
-        highlight_range: Range<usize>,
-        position: Anchor,
-    ) -> TreeMap<TypeId, TreeMap<InlayId, (HighlightStyle, InlayHighlight)>> {
-        let mut inlay_highlights = TreeMap::default();
-        let mut type_highlights = TreeMap::default();
-        type_highlights.insert(
-            inlay_id,
-            (
-                HighlightStyle::default(),
-                InlayHighlight {
-                    inlay: inlay_id,
-                    range: highlight_range,
-                    inlay_position: position,
-                },
-            ),
-        );
-        inlay_highlights.insert(TypeId::of::<()>(), type_highlights);
-        inlay_highlights
-    }
-
-    #[gpui::test]
-    fn test_inlay_utf8_boundary_panic_fix(cx: &mut App) {
-        init_test(cx);
-
-        // This test verifies that we handle UTF-8 character boundaries correctly
-        // when splitting inlay text for highlighting. Previously, this would panic
-        // when trying to split at byte 13, which is in the middle of the '…' character.
-        //
-        // See https://github.com/zed-industries/zed/issues/33641
-        let buffer = MultiBuffer::build_simple("fn main() {}\n", cx);
-        let (mut inlay_map, _) = InlayMap::new(buffer.read(cx).snapshot(cx));
-
-        // Create an inlay with text that contains a multi-byte character
-        // The string "SortingDirec…" contains an ellipsis character '…' which is 3 bytes (E2 80 A6)
-        let inlay_text = "SortingDirec…";
-        let position = buffer.read(cx).snapshot(cx).anchor_before(Point::new(0, 5));
-
-        let inlay = Inlay {
-            id: InlayId::Hint(0),
-            position,
-            content: InlayContent::Text(text::Rope::from(inlay_text)),
-        };
-
-        let (inlay_snapshot, _) = inlay_map.splice(&[], vec![inlay]);
-
-        // Create highlights that request a split at byte 13, which is in the middle
-        // of the '…' character (bytes 12..15). We include the full character.
-        let inlay_highlights = create_inlay_highlights(InlayId::Hint(0), 0..13, position);
-
-        let highlights = crate::display_map::Highlights {
-            text_highlights: None,
-            inlay_highlights: Some(&inlay_highlights),
-            styles: crate::display_map::HighlightStyles::default(),
-        };
-
-        // Collect chunks - this previously would panic
-        let chunks: Vec<_> = inlay_snapshot
-            .chunks(
-                InlayOffset(MultiBufferOffset(0))..inlay_snapshot.len(),
-                false,
-                highlights,
-            )
-            .collect();
-
-        // Verify the chunks are correct
-        let full_text: String = chunks.iter().map(|c| c.chunk.text).collect();
-        assert_eq!(full_text, "fn maSortingDirec…in() {}\n");
-
-        // Verify the highlighted portion includes the complete ellipsis character
-        let highlighted_chunks: Vec<_> = chunks
-            .iter()
-            .filter(|c| c.chunk.highlight_style.is_some() && c.chunk.is_inlay)
-            .collect();
-
-        assert_eq!(highlighted_chunks.len(), 1);
-        assert_eq!(highlighted_chunks[0].chunk.text, "SortingDirec…");
-    }
-
-    #[gpui::test]
-    fn test_inlay_utf8_boundaries(cx: &mut App) {
-        init_test(cx);
-
-        struct TestCase {
-            inlay_text: &'static str,
-            highlight_range: Range<usize>,
-            expected_highlighted: &'static str,
-            description: &'static str,
-        }
-
-        let test_cases = vec![
-            TestCase {
-                inlay_text: "Hello👋World",
-                highlight_range: 0..7,
-                expected_highlighted: "Hello👋",
-                description: "Emoji boundary - rounds up to include full emoji",
-            },
-            TestCase {
-                inlay_text: "Test→End",
-                highlight_range: 0..5,
-                expected_highlighted: "Test→",
-                description: "Arrow boundary - rounds up to include full arrow",
-            },
-            TestCase {
-                inlay_text: "café",
-                highlight_range: 0..4,
-                expected_highlighted: "café",
-                description: "Accented char boundary - rounds up to include full é",
-            },
-            TestCase {
-                inlay_text: "🎨🎭🎪",
-                highlight_range: 0..5,
-                expected_highlighted: "🎨🎭",
-                description: "Multiple emojis - partial highlight",
-            },
-            TestCase {
-                inlay_text: "普通话",
-                highlight_range: 0..4,
-                expected_highlighted: "普通",
-                description: "Chinese characters - partial highlight",
-            },
-            TestCase {
-                inlay_text: "Hello",
-                highlight_range: 0..2,
-                expected_highlighted: "He",
-                description: "ASCII only - no adjustment needed",
-            },
-            TestCase {
-                inlay_text: "👋",
-                highlight_range: 0..1,
-                expected_highlighted: "👋",
-                description: "Single emoji - partial byte range includes whole char",
-            },
-            TestCase {
-                inlay_text: "Test",
-                highlight_range: 0..0,
-                expected_highlighted: "",
-                description: "Empty range",
-            },
-            TestCase {
-                inlay_text: "🎨ABC",
-                highlight_range: 2..5,
-                expected_highlighted: "A",
-                description: "Range starting mid-emoji skips the emoji",
-            },
-        ];
-
-        for test_case in test_cases {
-            let buffer = MultiBuffer::build_simple("test", cx);
-            let (mut inlay_map, _) = InlayMap::new(buffer.read(cx).snapshot(cx));
-            let position = buffer.read(cx).snapshot(cx).anchor_before(Point::new(0, 2));
-
-            let inlay = Inlay {
-                id: InlayId::Hint(0),
-                position,
-                content: InlayContent::Text(text::Rope::from(test_case.inlay_text)),
-            };
-
-            let (inlay_snapshot, _) = inlay_map.splice(&[], vec![inlay]);
-            let inlay_highlights = create_inlay_highlights(
-                InlayId::Hint(0),
-                test_case.highlight_range.clone(),
-                position,
-            );
-
-            let highlights = crate::display_map::Highlights {
-                text_highlights: None,
-                inlay_highlights: Some(&inlay_highlights),
-                styles: crate::display_map::HighlightStyles::default(),
-            };
-
-            let chunks: Vec<_> = inlay_snapshot
-                .chunks(
-                    InlayOffset(MultiBufferOffset(0))..inlay_snapshot.len(),
-                    false,
-                    highlights,
-                )
-                .collect();
-
-            // Verify we got chunks and they total to the expected text
-            let full_text: String = chunks.iter().map(|c| c.chunk.text).collect();
-            assert_eq!(
-                full_text,
-                format!("te{}st", test_case.inlay_text),
-                "Full text mismatch for case: {}",
-                test_case.description
-            );
-
-            // Verify that the highlighted portion matches expectations
-            let highlighted_text: String = chunks
-                .iter()
-                .filter(|c| c.chunk.highlight_style.is_some() && c.chunk.is_inlay)
-                .map(|c| c.chunk.text)
-                .collect();
-            assert_eq!(
-                highlighted_text, test_case.expected_highlighted,
-                "Highlighted text mismatch for case: {} (text: '{}', range: {:?})",
-                test_case.description, test_case.inlay_text, test_case.highlight_range
-            );
-        }
-    }
-}
diff --git a/crates/editor/src/display_map/invisibles.rs b/crates/editor/src/display_map/invisibles.rs
deleted file mode 100644
index 90bd54ab28..0000000000
--- a/crates/editor/src/display_map/invisibles.rs
+++ /dev/null
@@ -1,133 +0,0 @@
-// Invisibility in a Unicode context is not well defined, so we have to guess.
-//
-// We highlight all ASCII control codes, and unicode whitespace because they are likely
-// confused with an ASCII space in a programming context (U+0020).
-//
-// We also highlight the handful of blank non-space characters:
-//   U+2800 BRAILLE PATTERN BLANK - Category: So
-//   U+115F HANGUL CHOSEONG FILLER - Category: Lo
-//   U+1160 HANGUL CHOSEONG FILLER - Category: Lo
-//   U+3164 HANGUL FILLER - Category: Lo
-//   U+FFA0 HALFWIDTH HANGUL FILLER - Category: Lo
-//   U+FFFC OBJECT REPLACEMENT CHARACTER - Category: So
-//
-// For the rest of Unicode, invisibility happens for two reasons:
-// * A Format character (like a byte order mark or right-to-left override)
-// * An invisible Nonspacing Mark character (like U+034F, or variation selectors)
-//
-// We don't consider unassigned codepoints invisible as the font renderer already shows
-// a replacement character in that case (and there are a *lot* of them)
-//
-// Control characters are mostly fine to highlight; except:
-// * U+E0020..=U+E007F are used in emoji flags. We don't highlight them right now, but we could if we tightened our heuristics.
-// * U+200D is used to join characters. We highlight this but don't replace it. As our font system ignores mid-glyph highlights this mostly works to highlight unexpected uses.
-//
-// Nonspacing marks are handled like U+200D. This means that mid-glyph we ignore them, but
-// probably causes issues with end-of-glyph usage.
-//
-// ref: https://invisible-characters.com
-// ref: https://www.compart.com/en/unicode/category/Cf
-// ref: https://gist.github.com/ConradIrwin/f759e1fc29267143c4c7895aa495dca5?h=1
-// ref: https://unicode.org/Public/emoji/13.0/emoji-test.txt
-// https://github.com/bits/UTF-8-Unicode-Test-Documents/blob/master/UTF-8_sequence_separated/utf8_sequence_0-0x10ffff_assigned_including-unprintable-asis.txt
-#[ztracing::instrument(skip_all)]
-pub fn is_invisible(c: char) -> bool {
-    if c <= '\u{1f}' {
-        c != '\t' && c != '\n' && c != '\r'
-    } else if c >= '\u{7f}' {
-        c <= '\u{9f}'
-            || (c.is_whitespace() && c != IDEOGRAPHIC_SPACE)
-            || contains(c, FORMAT)
-            || contains(c, OTHER)
-    } else {
-        false
-    }
-}
-// ASCII control characters have fancy unicode glyphs, everything else
-// is replaced by a space - unless it is used in combining characters in
-// which case we need to leave it in the string.
-pub fn replacement(c: char) -> Option<&'static str> {
-    if c <= '\x1f' {
-        Some(C0_SYMBOLS[c as usize])
-    } else if c == '\x7f' {
-        Some(DEL)
-    } else if contains(c, PRESERVE) {
-        None
-    } else {
-        Some(FIXED_WIDTH_SPACE)
-    }
-}
-
-const FIXED_WIDTH_SPACE: &str = "\u{2007}";
-
-// IDEOGRAPHIC SPACE is common alongside Chinese and other wide character sets.
-// We don't highlight this for now (as it already shows up wide in the editor),
-// but could if we tracked state in the classifier.
-const IDEOGRAPHIC_SPACE: char = '\u{3000}';
-
-const C0_SYMBOLS: &[&str] = &[
-    "␀", "␁", "␂", "␃", "␄", "␅", "␆", "␇", "␈", "␉", "␊", "␋", "␌", "␍", "␎", "␏", "␐", "␑", "␒",
-    "␓", "␔", "␕", "␖", "␗", "␘", "␙", "␚", "␛", "␜", "␝", "␞", "␟",
-];
-const DEL: &str = "␡";
-
-// generated using ucd-generate: ucd-generate general-category --include Format --chars ucd-16.0.0
-pub const FORMAT: &[(char, char)] = &[
-    ('\u{ad}', '\u{ad}'),
-    ('\u{600}', '\u{605}'),
-    ('\u{61c}', '\u{61c}'),
-    ('\u{6dd}', '\u{6dd}'),
-    ('\u{70f}', '\u{70f}'),
-    ('\u{890}', '\u{891}'),
-    ('\u{8e2}', '\u{8e2}'),
-    ('\u{180e}', '\u{180e}'),
-    ('\u{200b}', '\u{200f}'),
-    ('\u{202a}', '\u{202e}'),
-    ('\u{2060}', '\u{2064}'),
-    ('\u{2066}', '\u{206f}'),
-    ('\u{feff}', '\u{feff}'),
-    ('\u{fff9}', '\u{fffb}'),
-    ('\u{110bd}', '\u{110bd}'),
-    ('\u{110cd}', '\u{110cd}'),
-    ('\u{13430}', '\u{1343f}'),
-    ('\u{1bca0}', '\u{1bca3}'),
-    ('\u{1d173}', '\u{1d17a}'),
-    ('\u{e0001}', '\u{e0001}'),
-    ('\u{e0020}', '\u{e007f}'),
-];
-
-// hand-made base on https://invisible-characters.com (Excluding Cf)
-pub const OTHER: &[(char, char)] = &[
-    ('\u{034f}', '\u{034f}'),
-    ('\u{115F}', '\u{1160}'),
-    ('\u{17b4}', '\u{17b5}'),
-    ('\u{180b}', '\u{180d}'),
-    ('\u{2800}', '\u{2800}'),
-    ('\u{3164}', '\u{3164}'),
-    ('\u{fe00}', '\u{fe0d}'),
-    ('\u{ffa0}', '\u{ffa0}'),
-    ('\u{fffc}', '\u{fffc}'),
-    ('\u{e0100}', '\u{e01ef}'),
-];
-
-// a subset of FORMAT/OTHER that may appear within glyphs
-const PRESERVE: &[(char, char)] = &[
-    ('\u{034f}', '\u{034f}'),
-    ('\u{200d}', '\u{200d}'),
-    ('\u{17b4}', '\u{17b5}'),
-    ('\u{180b}', '\u{180d}'),
-    ('\u{e0061}', '\u{e007a}'),
-    ('\u{e007f}', '\u{e007f}'),
-];
-
-fn contains(c: char, list: &[(char, char)]) -> bool {
-    for &(start, end) in list {
-        if c < start {
-            return false;
-        }
-        if c <= end {
-            return true;
-        }
-    }
-    false
-}
diff --git a/crates/editor/src/display_map/tab_map.rs b/crates/editor/src/display_map/tab_map.rs
deleted file mode 100644
index 4e768a4771..0000000000
--- a/crates/editor/src/display_map/tab_map.rs
+++ /dev/null
@@ -1,1622 +0,0 @@
-use super::{
-    Highlights,
-    fold_map::{self, Chunk, FoldChunks, FoldEdit, FoldPoint, FoldSnapshot},
-};
-
-use language::Point;
-use multi_buffer::MultiBufferSnapshot;
-use std::{cmp, mem, num::NonZeroU32, ops::Range};
-use sum_tree::Bias;
-
-const MAX_EXPANSION_COLUMN: u32 = 256;
-
-// Handles a tab width <= 128
-const SPACES: &[u8; rope::Chunk::MASK_BITS] = &[b' '; _];
-const MAX_TABS: NonZeroU32 = NonZeroU32::new(SPACES.len() as u32).unwrap();
-
-/// Keeps track of hard tabs in a text buffer.
-///
-/// See the [`display_map` module documentation](crate::display_map) for more information.
-pub struct TabMap(TabSnapshot);
-
-impl TabMap {
-    #[ztracing::instrument(skip_all)]
-    pub fn new(fold_snapshot: FoldSnapshot, tab_size: NonZeroU32) -> (Self, TabSnapshot) {
-        let snapshot = TabSnapshot {
-            fold_snapshot,
-            tab_size: tab_size.min(MAX_TABS),
-            max_expansion_column: MAX_EXPANSION_COLUMN,
-            version: 0,
-        };
-        (Self(snapshot.clone()), snapshot)
-    }
-
-    #[cfg(test)]
-    pub fn set_max_expansion_column(&mut self, column: u32) -> TabSnapshot {
-        self.0.max_expansion_column = column;
-        self.0.clone()
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn sync(
-        &mut self,
-        fold_snapshot: FoldSnapshot,
-        mut fold_edits: Vec<FoldEdit>,
-        tab_size: NonZeroU32,
-    ) -> (TabSnapshot, Vec<TabEdit>) {
-        let old_snapshot = &mut self.0;
-        let mut new_snapshot = TabSnapshot {
-            fold_snapshot,
-            tab_size: tab_size.min(MAX_TABS),
-            max_expansion_column: old_snapshot.max_expansion_column,
-            version: old_snapshot.version,
-        };
-
-        if old_snapshot.fold_snapshot.version != new_snapshot.fold_snapshot.version {
-            new_snapshot.version += 1;
-        }
-
-        let tab_edits = if old_snapshot.tab_size == new_snapshot.tab_size {
-            // Expand each edit to include the next tab on the same line as the edit,
-            // and any subsequent tabs on that line that moved across the tab expansion
-            // boundary.
-            for fold_edit in &mut fold_edits {
-                let old_end = fold_edit.old.end.to_point(&old_snapshot.fold_snapshot);
-                let old_end_row_successor_offset = cmp::min(
-                    FoldPoint::new(old_end.row() + 1, 0),
-                    old_snapshot.fold_snapshot.max_point(),
-                )
-                .to_offset(&old_snapshot.fold_snapshot);
-                let new_end = fold_edit.new.end.to_point(&new_snapshot.fold_snapshot);
-
-                let mut offset_from_edit = 0;
-                let mut first_tab_offset = None;
-                let mut last_tab_with_changed_expansion_offset = None;
-                'outer: for chunk in old_snapshot.fold_snapshot.chunks(
-                    fold_edit.old.end..old_end_row_successor_offset,
-                    false,
-                    Highlights::default(),
-                ) {
-                    // todo(performance use tabs bitmask)
-                    for (ix, _) in chunk.text.match_indices('\t') {
-                        let offset_from_edit = offset_from_edit + (ix as u32);
-                        if first_tab_offset.is_none() {
-                            first_tab_offset = Some(offset_from_edit);
-                        }
-
-                        let old_column = old_end.column() + offset_from_edit;
-                        let new_column = new_end.column() + offset_from_edit;
-                        let was_expanded = old_column < old_snapshot.max_expansion_column;
-                        let is_expanded = new_column < new_snapshot.max_expansion_column;
-                        if was_expanded != is_expanded {
-                            last_tab_with_changed_expansion_offset = Some(offset_from_edit);
-                        } else if !was_expanded && !is_expanded {
-                            break 'outer;
-                        }
-                    }
-
-                    offset_from_edit += chunk.text.len() as u32;
-                    if old_end.column() + offset_from_edit >= old_snapshot.max_expansion_column
-                        && new_end.column() + offset_from_edit >= new_snapshot.max_expansion_column
-                    {
-                        break;
-                    }
-                }
-
-                if let Some(offset) = last_tab_with_changed_expansion_offset.or(first_tab_offset) {
-                    fold_edit.old.end.0 += offset as usize + 1;
-                    fold_edit.new.end.0 += offset as usize + 1;
-                }
-            }
-
-            let _old_alloc_ptr = fold_edits.as_ptr();
-            // Combine any edits that overlap due to the expansion.
-            let mut fold_edits = fold_edits.into_iter();
-            if let Some(mut first_edit) = fold_edits.next() {
-                // This code relies on reusing allocations from the Vec<_> - at the time of writing .flatten() prevents them.
-                #[allow(clippy::filter_map_identity)]
-                let mut v: Vec<_> = fold_edits
-                    .scan(&mut first_edit, |state, edit| {
-                        if state.old.end >= edit.old.start {
-                            state.old.end = edit.old.end;
-                            state.new.end = edit.new.end;
-                            Some(None) // Skip this edit, it's merged
-                        } else {
-                            let new_state = edit;
-                            let result = Some(Some(state.clone())); // Yield the previous edit
-                            **state = new_state;
-                            result
-                        }
-                    })
-                    .filter_map(|x| x)
-                    .collect();
-                v.push(first_edit);
-                debug_assert_eq!(v.as_ptr(), _old_alloc_ptr, "Fold edits were reallocated");
-                v.into_iter()
-                    .map(|fold_edit| {
-                        let old_start = fold_edit.old.start.to_point(&old_snapshot.fold_snapshot);
-                        let old_end = fold_edit.old.end.to_point(&old_snapshot.fold_snapshot);
-                        let new_start = fold_edit.new.start.to_point(&new_snapshot.fold_snapshot);
-                        let new_end = fold_edit.new.end.to_point(&new_snapshot.fold_snapshot);
-                        TabEdit {
-                            old: old_snapshot.fold_point_to_tab_point(old_start)
-                                ..old_snapshot.fold_point_to_tab_point(old_end),
-                            new: new_snapshot.fold_point_to_tab_point(new_start)
-                                ..new_snapshot.fold_point_to_tab_point(new_end),
-                        }
-                    })
-                    .collect()
-            } else {
-                vec![]
-            }
-        } else {
-            new_snapshot.version += 1;
-            vec![TabEdit {
-                old: TabPoint::zero()..old_snapshot.max_point(),
-                new: TabPoint::zero()..new_snapshot.max_point(),
-            }]
-        };
-        *old_snapshot = new_snapshot;
-        (old_snapshot.clone(), tab_edits)
-    }
-}
-
-#[derive(Clone)]
-pub struct TabSnapshot {
-    pub fold_snapshot: FoldSnapshot,
-    pub tab_size: NonZeroU32,
-    pub max_expansion_column: u32,
-    pub version: usize,
-}
-
-impl std::ops::Deref for TabSnapshot {
-    type Target = FoldSnapshot;
-
-    fn deref(&self) -> &Self::Target {
-        &self.fold_snapshot
-    }
-}
-
-impl TabSnapshot {
-    #[ztracing::instrument(skip_all)]
-    pub fn buffer_snapshot(&self) -> &MultiBufferSnapshot {
-        &self.fold_snapshot.inlay_snapshot.buffer
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn line_len(&self, row: u32) -> u32 {
-        let max_point = self.max_point();
-        if row < max_point.row() {
-            self.fold_point_to_tab_point(FoldPoint::new(row, self.fold_snapshot.line_len(row)))
-                .0
-                .column
-        } else {
-            max_point.column()
-        }
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn text_summary(&self) -> TextSummary {
-        self.text_summary_for_range(TabPoint::zero()..self.max_point())
-    }
-
-    #[ztracing::instrument(skip_all, fields(rows))]
-    pub fn text_summary_for_range(&self, range: Range<TabPoint>) -> TextSummary {
-        let input_start = self.tab_point_to_fold_point(range.start, Bias::Left).0;
-        let input_end = self.tab_point_to_fold_point(range.end, Bias::Right).0;
-        let input_summary = self
-            .fold_snapshot
-            .text_summary_for_range(input_start..input_end);
-
-        let line_end = if range.start.row() == range.end.row() {
-            range.end
-        } else {
-            self.max_point()
-        };
-        let first_line_chars = self
-            .chunks(range.start..line_end, false, Highlights::default())
-            .flat_map(|chunk| chunk.text.chars())
-            .take_while(|&c| c != '\n')
-            .count() as u32;
-
-        let last_line_chars = if range.start.row() == range.end.row() {
-            first_line_chars
-        } else {
-            self.chunks(
-                TabPoint::new(range.end.row(), 0)..range.end,
-                false,
-                Highlights::default(),
-            )
-            .flat_map(|chunk| chunk.text.chars())
-            .count() as u32
-        };
-
-        TextSummary {
-            lines: range.end.0 - range.start.0,
-            first_line_chars,
-            last_line_chars,
-            longest_row: input_summary.longest_row,
-            longest_row_chars: input_summary.longest_row_chars,
-        }
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub(crate) fn chunks<'a>(
-        &'a self,
-        range: Range<TabPoint>,
-        language_aware: bool,
-        highlights: Highlights<'a>,
-    ) -> TabChunks<'a> {
-        let (input_start, expanded_char_column, to_next_stop) =
-            self.tab_point_to_fold_point(range.start, Bias::Left);
-        let input_column = input_start.column();
-        let input_start = input_start.to_offset(&self.fold_snapshot);
-        let input_end = self
-            .tab_point_to_fold_point(range.end, Bias::Right)
-            .0
-            .to_offset(&self.fold_snapshot);
-        let to_next_stop = if range.start.0 + Point::new(0, to_next_stop) > range.end.0 {
-            range.end.column() - range.start.column()
-        } else {
-            to_next_stop
-        };
-
-        TabChunks {
-            snapshot: self,
-            fold_chunks: self.fold_snapshot.chunks(
-                input_start..input_end,
-                language_aware,
-                highlights,
-            ),
-            input_column,
-            column: expanded_char_column,
-            max_expansion_column: self.max_expansion_column,
-            output_position: range.start.0,
-            max_output_position: range.end.0,
-            tab_size: self.tab_size,
-            chunk: Chunk {
-                text: unsafe { std::str::from_utf8_unchecked(&SPACES[..to_next_stop as usize]) },
-                is_tab: true,
-                ..Default::default()
-            },
-            inside_leading_tab: to_next_stop > 0,
-        }
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn rows(&self, row: u32) -> fold_map::FoldRows<'_> {
-        self.fold_snapshot.row_infos(row)
-    }
-
-    #[cfg(test)]
-    #[ztracing::instrument(skip_all)]
-    pub fn text(&self) -> String {
-        self.chunks(
-            TabPoint::zero()..self.max_point(),
-            false,
-            Highlights::default(),
-        )
-        .map(|chunk| chunk.text)
-        .collect()
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn max_point(&self) -> TabPoint {
-        self.fold_point_to_tab_point(self.fold_snapshot.max_point())
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn clip_point(&self, point: TabPoint, bias: Bias) -> TabPoint {
-        self.fold_point_to_tab_point(
-            self.fold_snapshot
-                .clip_point(self.tab_point_to_fold_point(point, bias).0, bias),
-        )
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn fold_point_to_tab_point(&self, input: FoldPoint) -> TabPoint {
-        let chunks = self.fold_snapshot.chunks_at(FoldPoint::new(input.row(), 0));
-        let tab_cursor = TabStopCursor::new(chunks);
-        let expanded = self.expand_tabs(tab_cursor, input.column());
-        TabPoint::new(input.row(), expanded)
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn tab_point_cursor(&self) -> TabPointCursor<'_> {
-        TabPointCursor { this: self }
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn tab_point_to_fold_point(&self, output: TabPoint, bias: Bias) -> (FoldPoint, u32, u32) {
-        let chunks = self
-            .fold_snapshot
-            .chunks_at(FoldPoint::new(output.row(), 0));
-
-        let tab_cursor = TabStopCursor::new(chunks);
-        let expanded = output.column();
-        let (collapsed, expanded_char_column, to_next_stop) =
-            self.collapse_tabs(tab_cursor, expanded, bias);
-
-        (
-            FoldPoint::new(output.row(), collapsed),
-            expanded_char_column,
-            to_next_stop,
-        )
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn point_to_tab_point(&self, point: Point, bias: Bias) -> TabPoint {
-        let inlay_point = self.fold_snapshot.inlay_snapshot.to_inlay_point(point);
-        let fold_point = self.fold_snapshot.to_fold_point(inlay_point, bias);
-        self.fold_point_to_tab_point(fold_point)
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn tab_point_to_point(&self, point: TabPoint, bias: Bias) -> Point {
-        let fold_point = self.tab_point_to_fold_point(point, bias).0;
-        let inlay_point = fold_point.to_inlay_point(&self.fold_snapshot);
-        self.fold_snapshot
-            .inlay_snapshot
-            .to_buffer_point(inlay_point)
-    }
-
-    #[ztracing::instrument(skip_all)]
-    fn expand_tabs<'a, I>(&self, mut cursor: TabStopCursor<'a, I>, column: u32) -> u32
-    where
-        I: Iterator<Item = Chunk<'a>>,
-    {
-        let tab_size = self.tab_size.get();
-
-        let end_column = column.min(self.max_expansion_column);
-        let mut seek_target = end_column;
-        let mut tab_count = 0;
-        let mut expanded_tab_len = 0;
-
-        while let Some(tab_stop) = cursor.seek(seek_target) {
-            let expanded_chars_old = tab_stop.char_offset + expanded_tab_len - tab_count;
-            let tab_len = tab_size - ((expanded_chars_old - 1) % tab_size);
-            tab_count += 1;
-            expanded_tab_len += tab_len;
-
-            seek_target = end_column - cursor.byte_offset;
-        }
-
-        let left_over_char_bytes = if !cursor.is_char_boundary() {
-            cursor.bytes_until_next_char().unwrap_or(0) as u32
-        } else {
-            0
-        };
-
-        let collapsed_bytes = cursor.byte_offset() + left_over_char_bytes;
-        let expanded_bytes =
-            cursor.byte_offset() + expanded_tab_len - tab_count + left_over_char_bytes;
-
-        expanded_bytes + column.saturating_sub(collapsed_bytes)
-    }
-
-    #[ztracing::instrument(skip_all)]
-    fn collapse_tabs<'a, I>(
-        &self,
-        mut cursor: TabStopCursor<'a, I>,
-        column: u32,
-        bias: Bias,
-    ) -> (u32, u32, u32)
-    where
-        I: Iterator<Item = Chunk<'a>>,
-    {
-        let tab_size = self.tab_size.get();
-        let mut collapsed_column = column;
-        let mut seek_target = column.min(self.max_expansion_column);
-        let mut tab_count = 0;
-        let mut expanded_tab_len = 0;
-
-        while let Some(tab_stop) = cursor.seek(seek_target) {
-            // Calculate how much we want to expand this tab stop (into spaces)
-            let expanded_chars_old = tab_stop.char_offset + expanded_tab_len - tab_count;
-            let tab_len = tab_size - ((expanded_chars_old - 1) % tab_size);
-            // Increment tab count
-            tab_count += 1;
-            // The count of how many spaces we've added to this line in place of tab bytes
-            expanded_tab_len += tab_len;
-
-            // The count of bytes at this point in the iteration while considering tab_count and previous expansions
-            let expanded_bytes = tab_stop.byte_offset + expanded_tab_len - tab_count;
-
-            // Did we expand past the search target?
-            if expanded_bytes > column {
-                let mut expanded_chars = tab_stop.char_offset + expanded_tab_len - tab_count;
-                // We expanded past the search target, so need to account for the offshoot
-                expanded_chars -= expanded_bytes - column;
-                return match bias {
-                    Bias::Left => (
-                        cursor.byte_offset() - 1,
-                        expanded_chars,
-                        expanded_bytes - column,
-                    ),
-                    Bias::Right => (cursor.byte_offset(), expanded_chars, 0),
-                };
-            } else {
-                // otherwise we only want to move the cursor collapse column forward
-                collapsed_column = collapsed_column - tab_len + 1;
-                seek_target = (collapsed_column - cursor.byte_offset)
-                    .min(self.max_expansion_column - cursor.byte_offset);
-            }
-        }
-
-        let collapsed_bytes = cursor.byte_offset();
-        let expanded_bytes = cursor.byte_offset() + expanded_tab_len - tab_count;
-        let expanded_chars = cursor.char_offset() + expanded_tab_len - tab_count;
-        (
-            collapsed_bytes + column.saturating_sub(expanded_bytes),
-            expanded_chars,
-            0,
-        )
-    }
-}
-
-// todo(lw): Implement TabPointCursor properly
-pub struct TabPointCursor<'this> {
-    this: &'this TabSnapshot,
-}
-
-impl TabPointCursor<'_> {
-    #[ztracing::instrument(skip_all)]
-    pub fn map(&mut self, point: FoldPoint) -> TabPoint {
-        self.this.fold_point_to_tab_point(point)
-    }
-}
-
-#[derive(Copy, Clone, Debug, Default, Eq, Ord, PartialOrd, PartialEq)]
-pub struct TabPoint(pub Point);
-
-impl TabPoint {
-    pub fn new(row: u32, column: u32) -> Self {
-        Self(Point::new(row, column))
-    }
-
-    pub fn zero() -> Self {
-        Self::new(0, 0)
-    }
-
-    pub fn row(self) -> u32 {
-        self.0.row
-    }
-
-    pub fn column(self) -> u32 {
-        self.0.column
-    }
-}
-
-impl From<Point> for TabPoint {
-    fn from(point: Point) -> Self {
-        Self(point)
-    }
-}
-
-pub type TabEdit = text::Edit<TabPoint>;
-
-#[derive(Clone, Debug, Default, Eq, PartialEq)]
-pub struct TextSummary {
-    pub lines: Point,
-    pub first_line_chars: u32,
-    pub last_line_chars: u32,
-    pub longest_row: u32,
-    pub longest_row_chars: u32,
-}
-
-impl<'a> From<&'a str> for TextSummary {
-    #[ztracing::instrument(skip_all)]
-    fn from(text: &'a str) -> Self {
-        let sum = text::TextSummary::from(text);
-
-        TextSummary {
-            lines: sum.lines,
-            first_line_chars: sum.first_line_chars,
-            last_line_chars: sum.last_line_chars,
-            longest_row: sum.longest_row,
-            longest_row_chars: sum.longest_row_chars,
-        }
-    }
-}
-
-impl<'a> std::ops::AddAssign<&'a Self> for TextSummary {
-    #[ztracing::instrument(skip_all)]
-    fn add_assign(&mut self, other: &'a Self) {
-        let joined_chars = self.last_line_chars + other.first_line_chars;
-        if joined_chars > self.longest_row_chars {
-            self.longest_row = self.lines.row;
-            self.longest_row_chars = joined_chars;
-        }
-        if other.longest_row_chars > self.longest_row_chars {
-            self.longest_row = self.lines.row + other.longest_row;
-            self.longest_row_chars = other.longest_row_chars;
-        }
-
-        if self.lines.row == 0 {
-            self.first_line_chars += other.first_line_chars;
-        }
-
-        if other.lines.row == 0 {
-            self.last_line_chars += other.first_line_chars;
-        } else {
-            self.last_line_chars = other.last_line_chars;
-        }
-
-        self.lines += &other.lines;
-    }
-}
-
-pub struct TabChunks<'a> {
-    snapshot: &'a TabSnapshot,
-    max_expansion_column: u32,
-    max_output_position: Point,
-    tab_size: NonZeroU32,
-    // region: iteration state
-    fold_chunks: FoldChunks<'a>,
-    chunk: Chunk<'a>,
-    column: u32,
-    output_position: Point,
-    input_column: u32,
-    inside_leading_tab: bool,
-    // endregion: iteration state
-}
-
-impl TabChunks<'_> {
-    #[ztracing::instrument(skip_all)]
-    pub(crate) fn seek(&mut self, range: Range<TabPoint>) {
-        let (input_start, expanded_char_column, to_next_stop) = self
-            .snapshot
-            .tab_point_to_fold_point(range.start, Bias::Left);
-        let input_column = input_start.column();
-        let input_start = input_start.to_offset(&self.snapshot.fold_snapshot);
-        let input_end = self
-            .snapshot
-            .tab_point_to_fold_point(range.end, Bias::Right)
-            .0
-            .to_offset(&self.snapshot.fold_snapshot);
-        let to_next_stop = if range.start.0 + Point::new(0, to_next_stop) > range.end.0 {
-            range.end.column() - range.start.column()
-        } else {
-            to_next_stop
-        };
-
-        self.fold_chunks.seek(input_start..input_end);
-        self.input_column = input_column;
-        self.column = expanded_char_column;
-        self.output_position = range.start.0;
-        self.max_output_position = range.end.0;
-        self.chunk = Chunk {
-            text: unsafe { std::str::from_utf8_unchecked(&SPACES[..to_next_stop as usize]) },
-            is_tab: true,
-            chars: 1u128.unbounded_shl(to_next_stop) - 1,
-            ..Default::default()
-        };
-        self.inside_leading_tab = to_next_stop > 0;
-    }
-}
-
-impl<'a> Iterator for TabChunks<'a> {
-    type Item = Chunk<'a>;
-
-    #[ztracing::instrument(skip_all)]
-    fn next(&mut self) -> Option<Self::Item> {
-        if self.chunk.text.is_empty() {
-            if let Some(chunk) = self.fold_chunks.next() {
-                self.chunk = chunk;
-                if self.inside_leading_tab {
-                    self.chunk.text = &self.chunk.text[1..];
-                    self.inside_leading_tab = false;
-                    self.input_column += 1;
-                }
-            } else {
-                return None;
-            }
-        }
-
-        //todo(improve performance by using tab cursor)
-        for (ix, c) in self.chunk.text.char_indices() {
-            match c {
-                '\t' if ix > 0 => {
-                    let (prefix, suffix) = self.chunk.text.split_at(ix);
-
-                    let mask = 1u128.unbounded_shl(ix as u32).wrapping_sub(1);
-                    let chars = self.chunk.chars & mask;
-                    let tabs = self.chunk.tabs & mask;
-                    self.chunk.tabs = self.chunk.tabs.unbounded_shr(ix as u32);
-                    self.chunk.chars = self.chunk.chars.unbounded_shr(ix as u32);
-                    self.chunk.text = suffix;
-                    return Some(Chunk {
-                        text: prefix,
-                        chars,
-                        tabs,
-                        ..self.chunk.clone()
-                    });
-                }
-                '\t' => {
-                    self.chunk.text = &self.chunk.text[1..];
-                    self.chunk.tabs >>= 1;
-                    self.chunk.chars >>= 1;
-                    let tab_size = if self.input_column < self.max_expansion_column {
-                        self.tab_size.get()
-                    } else {
-                        1
-                    };
-                    let mut len = tab_size - self.column % tab_size;
-                    let next_output_position = cmp::min(
-                        self.output_position + Point::new(0, len),
-                        self.max_output_position,
-                    );
-                    len = next_output_position.column - self.output_position.column;
-                    self.column += len;
-                    self.input_column += 1;
-                    self.output_position = next_output_position;
-                    return Some(Chunk {
-                        text: unsafe { std::str::from_utf8_unchecked(&SPACES[..len as usize]) },
-                        is_tab: true,
-                        chars: 1u128.unbounded_shl(len) - 1,
-                        tabs: 0,
-                        ..self.chunk.clone()
-                    });
-                }
-                '\n' => {
-                    self.column = 0;
-                    self.input_column = 0;
-                    self.output_position += Point::new(1, 0);
-                }
-                _ => {
-                    self.column += 1;
-                    if !self.inside_leading_tab {
-                        self.input_column += c.len_utf8() as u32;
-                    }
-                    self.output_position.column += c.len_utf8() as u32;
-                }
-            }
-        }
-
-        Some(mem::take(&mut self.chunk))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::{
-        MultiBuffer,
-        display_map::{
-            fold_map::{FoldMap, FoldOffset},
-            inlay_map::InlayMap,
-        },
-    };
-    use multi_buffer::MultiBufferOffset;
-    use rand::{Rng, prelude::StdRng};
-    use util;
-
-    impl TabSnapshot {
-        fn expected_collapse_tabs(
-            &self,
-            chars: impl Iterator<Item = char>,
-            column: u32,
-            bias: Bias,
-        ) -> (u32, u32, u32) {
-            let tab_size = self.tab_size.get();
-
-            let mut expanded_bytes = 0;
-            let mut expanded_chars = 0;
-            let mut collapsed_bytes = 0;
-            for c in chars {
-                if expanded_bytes >= column {
-                    break;
-                }
-                if collapsed_bytes >= self.max_expansion_column {
-                    break;
-                }
-
-                if c == '\t' {
-                    let tab_len = tab_size - (expanded_chars % tab_size);
-                    expanded_chars += tab_len;
-                    expanded_bytes += tab_len;
-                    if expanded_bytes > column {
-                        expanded_chars -= expanded_bytes - column;
-                        return match bias {
-                            Bias::Left => {
-                                (collapsed_bytes, expanded_chars, expanded_bytes - column)
-                            }
-                            Bias::Right => (collapsed_bytes + 1, expanded_chars, 0),
-                        };
-                    }
-                } else {
-                    expanded_chars += 1;
-                    expanded_bytes += c.len_utf8() as u32;
-                }
-
-                if expanded_bytes > column && matches!(bias, Bias::Left) {
-                    expanded_chars -= 1;
-                    break;
-                }
-
-                collapsed_bytes += c.len_utf8() as u32;
-            }
-
-            (
-                collapsed_bytes + column.saturating_sub(expanded_bytes),
-                expanded_chars,
-                0,
-            )
-        }
-
-        pub fn expected_to_tab_point(&self, input: FoldPoint) -> TabPoint {
-            let chars = self.fold_snapshot.chars_at(FoldPoint::new(input.row(), 0));
-            let expanded = self.expected_expand_tabs(chars, input.column());
-            TabPoint::new(input.row(), expanded)
-        }
-
-        fn expected_expand_tabs(&self, chars: impl Iterator<Item = char>, column: u32) -> u32 {
-            let tab_size = self.tab_size.get();
-
-            let mut expanded_chars = 0;
-            let mut expanded_bytes = 0;
-            let mut collapsed_bytes = 0;
-            let end_column = column.min(self.max_expansion_column);
-            for c in chars {
-                if collapsed_bytes >= end_column {
-                    break;
-                }
-                if c == '\t' {
-                    let tab_len = tab_size - expanded_chars % tab_size;
-                    expanded_bytes += tab_len;
-                    expanded_chars += tab_len;
-                } else {
-                    expanded_bytes += c.len_utf8() as u32;
-                    expanded_chars += 1;
-                }
-                collapsed_bytes += c.len_utf8() as u32;
-            }
-
-            expanded_bytes + column.saturating_sub(collapsed_bytes)
-        }
-
-        fn expected_to_fold_point(&self, output: TabPoint, bias: Bias) -> (FoldPoint, u32, u32) {
-            let chars = self.fold_snapshot.chars_at(FoldPoint::new(output.row(), 0));
-            let expanded = output.column();
-            let (collapsed, expanded_char_column, to_next_stop) =
-                self.expected_collapse_tabs(chars, expanded, bias);
-            (
-                FoldPoint::new(output.row(), collapsed),
-                expanded_char_column,
-                to_next_stop,
-            )
-        }
-    }
-
-    #[gpui::test]
-    fn test_expand_tabs(cx: &mut gpui::App) {
-        let test_values = [
-            ("κg🏀 f\nwo🏀❌by🍐❎β🍗c\tβ❎ \ncλ🎉", 17),
-            (" \twςe", 4),
-            ("fε", 1),
-            ("i❎\t", 3),
-        ];
-        let buffer = MultiBuffer::build_simple("", cx);
-        let buffer_snapshot = buffer.read(cx).snapshot(cx);
-        let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot);
-        let (_, fold_snapshot) = FoldMap::new(inlay_snapshot);
-        let (_, tab_snapshot) = TabMap::new(fold_snapshot, 4.try_into().unwrap());
-
-        for (text, column) in test_values {
-            let mut tabs = 0u128;
-            let mut chars = 0u128;
-            for (idx, c) in text.char_indices() {
-                if c == '\t' {
-                    tabs |= 1 << idx;
-                }
-                chars |= 1 << idx;
-            }
-
-            let chunks = [Chunk {
-                text,
-                tabs,
-                chars,
-                ..Default::default()
-            }];
-
-            let cursor = TabStopCursor::new(chunks);
-
-            assert_eq!(
-                tab_snapshot.expected_expand_tabs(text.chars(), column),
-                tab_snapshot.expand_tabs(cursor, column)
-            );
-        }
-    }
-
-    #[gpui::test]
-    fn test_collapse_tabs(cx: &mut gpui::App) {
-        let input = "A\tBC\tDEF\tG\tHI\tJ\tK\tL\tM";
-
-        let buffer = MultiBuffer::build_simple(input, cx);
-        let buffer_snapshot = buffer.read(cx).snapshot(cx);
-        let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot);
-        let (_, fold_snapshot) = FoldMap::new(inlay_snapshot);
-        let (_, tab_snapshot) = TabMap::new(fold_snapshot, 4.try_into().unwrap());
-
-        for (ix, _) in input.char_indices() {
-            let range = TabPoint::new(0, ix as u32)..tab_snapshot.max_point();
-
-            assert_eq!(
-                tab_snapshot.expected_to_fold_point(range.start, Bias::Left),
-                tab_snapshot.tab_point_to_fold_point(range.start, Bias::Left),
-                "Failed with tab_point at column {ix}"
-            );
-            assert_eq!(
-                tab_snapshot.expected_to_fold_point(range.start, Bias::Right),
-                tab_snapshot.tab_point_to_fold_point(range.start, Bias::Right),
-                "Failed with tab_point at column {ix}"
-            );
-
-            assert_eq!(
-                tab_snapshot.expected_to_fold_point(range.end, Bias::Left),
-                tab_snapshot.tab_point_to_fold_point(range.end, Bias::Left),
-                "Failed with tab_point at column {ix}"
-            );
-            assert_eq!(
-                tab_snapshot.expected_to_fold_point(range.end, Bias::Right),
-                tab_snapshot.tab_point_to_fold_point(range.end, Bias::Right),
-                "Failed with tab_point at column {ix}"
-            );
-        }
-    }
-
-    #[gpui::test]
-    fn test_to_fold_point_panic_reproduction(cx: &mut gpui::App) {
-        // This test reproduces a specific panic where to_fold_point returns incorrect results
-        let _text = "use macro_rules_attribute::apply;\nuse serde_json::Value;\nuse smol::{\n    io::AsyncReadExt,\n    process::{Command, Stdio},\n};\nuse smol_macros::main;\nuse std::io;\n\nfn test_random() {\n    // Generate a random value\n    let random_value = std::time::SystemTime::now()\n        .duration_since(std::time::UNIX_EPOCH)\n        .unwrap()\n        .as_secs()\n        % 100;\n\n    // Create some complex nested data structures\n    let mut vector = Vec::new();\n    for i in 0..random_value {\n        vector.push(i);\n    }\n    ";
-
-        let text = "γ\tw⭐\n🍐🍗 \t";
-        let buffer = MultiBuffer::build_simple(text, cx);
-        let buffer_snapshot = buffer.read(cx).snapshot(cx);
-        let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot);
-        let (_, fold_snapshot) = FoldMap::new(inlay_snapshot);
-        let (_, tab_snapshot) = TabMap::new(fold_snapshot, 4.try_into().unwrap());
-
-        // This should panic with the expected vs actual mismatch
-        let tab_point = TabPoint::new(0, 9);
-        let result = tab_snapshot.tab_point_to_fold_point(tab_point, Bias::Left);
-        let expected = tab_snapshot.expected_to_fold_point(tab_point, Bias::Left);
-
-        assert_eq!(result, expected);
-    }
-
-    #[gpui::test(iterations = 100)]
-    fn test_collapse_tabs_random(cx: &mut gpui::App, mut rng: StdRng) {
-        // Generate random input string with up to 200 characters including tabs
-        // to stay within the MAX_EXPANSION_COLUMN limit of 256
-        let len = rng.random_range(0..=2048);
-        let tab_size = NonZeroU32::new(rng.random_range(1..=4)).unwrap();
-        let mut input = String::with_capacity(len);
-
-        for _ in 0..len {
-            if rng.random_bool(0.1) {
-                // 10% chance of inserting a tab
-                input.push('\t');
-            } else {
-                // 90% chance of inserting a random ASCII character (excluding tab, newline, carriage return)
-                let ch = loop {
-                    let ascii_code = rng.random_range(32..=126); // printable ASCII range
-                    let ch = ascii_code as u8 as char;
-                    if ch != '\t' {
-                        break ch;
-                    }
-                };
-                input.push(ch);
-            }
-        }
-
-        let buffer = MultiBuffer::build_simple(&input, cx);
-        let buffer_snapshot = buffer.read(cx).snapshot(cx);
-        let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot);
-        let (_, fold_snapshot) = FoldMap::new(inlay_snapshot);
-        let (_, mut tab_snapshot) = TabMap::new(fold_snapshot, 4.try_into().unwrap());
-        tab_snapshot.max_expansion_column = rng.random_range(0..323);
-        tab_snapshot.tab_size = tab_size;
-
-        for (ix, _) in input.char_indices() {
-            let range = TabPoint::new(0, ix as u32)..tab_snapshot.max_point();
-
-            assert_eq!(
-                tab_snapshot.expected_to_fold_point(range.start, Bias::Left),
-                tab_snapshot.tab_point_to_fold_point(range.start, Bias::Left),
-                "Failed with input: {}, with idx: {ix}",
-                input
-            );
-            assert_eq!(
-                tab_snapshot.expected_to_fold_point(range.start, Bias::Right),
-                tab_snapshot.tab_point_to_fold_point(range.start, Bias::Right),
-                "Failed with input: {}, with idx: {ix}",
-                input
-            );
-
-            assert_eq!(
-                tab_snapshot.expected_to_fold_point(range.end, Bias::Left),
-                tab_snapshot.tab_point_to_fold_point(range.end, Bias::Left),
-                "Failed with input: {}, with idx: {ix}",
-                input
-            );
-            assert_eq!(
-                tab_snapshot.expected_to_fold_point(range.end, Bias::Right),
-                tab_snapshot.tab_point_to_fold_point(range.end, Bias::Right),
-                "Failed with input: {}, with idx: {ix}",
-                input
-            );
-        }
-    }
-
-    #[gpui::test]
-    fn test_long_lines(cx: &mut gpui::App) {
-        let max_expansion_column = 12;
-        let input = "A\tBC\tDEF\tG\tHI\tJ\tK\tL\tM";
-        let output = "A   BC  DEF G   HI J K L M";
-
-        let buffer = MultiBuffer::build_simple(input, cx);
-        let buffer_snapshot = buffer.read(cx).snapshot(cx);
-        let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot);
-        let (_, fold_snapshot) = FoldMap::new(inlay_snapshot);
-        let (_, mut tab_snapshot) = TabMap::new(fold_snapshot, 4.try_into().unwrap());
-
-        tab_snapshot.max_expansion_column = max_expansion_column;
-        assert_eq!(tab_snapshot.text(), output);
-
-        for (ix, c) in input.char_indices() {
-            assert_eq!(
-                tab_snapshot
-                    .chunks(
-                        TabPoint::new(0, ix as u32)..tab_snapshot.max_point(),
-                        false,
-                        Highlights::default(),
-                    )
-                    .map(|c| c.text)
-                    .collect::<String>(),
-                &output[ix..],
-                "text from index {ix}"
-            );
-
-            if c != '\t' {
-                let input_point = Point::new(0, ix as u32);
-                let output_point = Point::new(0, output.find(c).unwrap() as u32);
-                assert_eq!(
-                    tab_snapshot.fold_point_to_tab_point(FoldPoint(input_point)),
-                    TabPoint(output_point),
-                    "to_tab_point({input_point:?})"
-                );
-                assert_eq!(
-                    tab_snapshot
-                        .tab_point_to_fold_point(TabPoint(output_point), Bias::Left)
-                        .0,
-                    FoldPoint(input_point),
-                    "to_fold_point({output_point:?})"
-                );
-            }
-        }
-    }
-
-    #[gpui::test]
-    fn test_long_lines_with_character_spanning_max_expansion_column(cx: &mut gpui::App) {
-        let max_expansion_column = 8;
-        let input = "abcdefg⋯hij";
-
-        let buffer = MultiBuffer::build_simple(input, cx);
-        let buffer_snapshot = buffer.read(cx).snapshot(cx);
-        let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot);
-        let (_, fold_snapshot) = FoldMap::new(inlay_snapshot);
-        let (_, mut tab_snapshot) = TabMap::new(fold_snapshot, 4.try_into().unwrap());
-
-        tab_snapshot.max_expansion_column = max_expansion_column;
-        assert_eq!(tab_snapshot.text(), input);
-    }
-
-    #[gpui::test]
-    fn test_marking_tabs(cx: &mut gpui::App) {
-        let input = "\t \thello";
-
-        let buffer = MultiBuffer::build_simple(input, cx);
-        let buffer_snapshot = buffer.read(cx).snapshot(cx);
-        let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot);
-        let (_, fold_snapshot) = FoldMap::new(inlay_snapshot);
-        let (_, tab_snapshot) = TabMap::new(fold_snapshot, 4.try_into().unwrap());
-
-        assert_eq!(
-            chunks(&tab_snapshot, TabPoint::zero()),
-            vec![
-                ("    ".to_string(), true),
-                (" ".to_string(), false),
-                ("   ".to_string(), true),
-                ("hello".to_string(), false),
-            ]
-        );
-        assert_eq!(
-            chunks(&tab_snapshot, TabPoint::new(0, 2)),
-            vec![
-                ("  ".to_string(), true),
-                (" ".to_string(), false),
-                ("   ".to_string(), true),
-                ("hello".to_string(), false),
-            ]
-        );
-
-        fn chunks(snapshot: &TabSnapshot, start: TabPoint) -> Vec<(String, bool)> {
-            let mut chunks = Vec::new();
-            let mut was_tab = false;
-            let mut text = String::new();
-            for chunk in snapshot.chunks(start..snapshot.max_point(), false, Highlights::default())
-            {
-                if chunk.is_tab != was_tab {
-                    if !text.is_empty() {
-                        chunks.push((mem::take(&mut text), was_tab));
-                    }
-                    was_tab = chunk.is_tab;
-                }
-                text.push_str(chunk.text);
-            }
-
-            if !text.is_empty() {
-                chunks.push((text, was_tab));
-            }
-            chunks
-        }
-    }
-
-    #[gpui::test(iterations = 100)]
-    fn test_random_tabs(cx: &mut gpui::App, mut rng: StdRng) {
-        let tab_size = NonZeroU32::new(rng.random_range(1..=4)).unwrap();
-        let len = rng.random_range(0..30);
-        let buffer = if rng.random() {
-            let text = util::RandomCharIter::new(&mut rng)
-                .take(len)
-                .collect::<String>();
-            MultiBuffer::build_simple(&text, cx)
-        } else {
-            MultiBuffer::build_random(&mut rng, cx)
-        };
-        let buffer_snapshot = buffer.read(cx).snapshot(cx);
-        log::info!("Buffer text: {:?}", buffer_snapshot.text());
-
-        let (mut inlay_map, inlay_snapshot) = InlayMap::new(buffer_snapshot);
-        log::info!("InlayMap text: {:?}", inlay_snapshot.text());
-        let (mut fold_map, _) = FoldMap::new(inlay_snapshot.clone());
-        fold_map.randomly_mutate(&mut rng);
-        let (fold_snapshot, _) = fold_map.read(inlay_snapshot, vec![]);
-        log::info!("FoldMap text: {:?}", fold_snapshot.text());
-        let (inlay_snapshot, _) = inlay_map.randomly_mutate(&mut 0, &mut rng);
-        log::info!("InlayMap text: {:?}", inlay_snapshot.text());
-
-        let (mut tab_map, _) = TabMap::new(fold_snapshot, tab_size);
-        let tabs_snapshot = tab_map.set_max_expansion_column(32);
-
-        let text = text::Rope::from(tabs_snapshot.text().as_str());
-        log::info!(
-            "TabMap text (tab size: {}): {:?}",
-            tab_size,
-            tabs_snapshot.text(),
-        );
-
-        for _ in 0..5 {
-            let end_row = rng.random_range(0..=text.max_point().row);
-            let end_column = rng.random_range(0..=text.line_len(end_row));
-            let mut end = TabPoint(text.clip_point(Point::new(end_row, end_column), Bias::Right));
-            let start_row = rng.random_range(0..=text.max_point().row);
-            let start_column = rng.random_range(0..=text.line_len(start_row));
-            let mut start =
-                TabPoint(text.clip_point(Point::new(start_row, start_column), Bias::Left));
-            if start > end {
-                mem::swap(&mut start, &mut end);
-            }
-
-            let expected_text = text
-                .chunks_in_range(text.point_to_offset(start.0)..text.point_to_offset(end.0))
-                .collect::<String>();
-            let expected_summary = TextSummary::from(expected_text.as_str());
-            assert_eq!(
-                tabs_snapshot
-                    .chunks(start..end, false, Highlights::default())
-                    .map(|c| c.text)
-                    .collect::<String>(),
-                expected_text,
-                "chunks({:?}..{:?})",
-                start,
-                end
-            );
-
-            let mut actual_summary = tabs_snapshot.text_summary_for_range(start..end);
-            if tab_size.get() > 1 && inlay_snapshot.text().contains('\t') {
-                actual_summary.longest_row = expected_summary.longest_row;
-                actual_summary.longest_row_chars = expected_summary.longest_row_chars;
-            }
-            assert_eq!(actual_summary, expected_summary);
-        }
-
-        for row in 0..=text.max_point().row {
-            assert_eq!(
-                tabs_snapshot.line_len(row),
-                text.line_len(row),
-                "line_len({row})"
-            );
-        }
-    }
-
-    #[gpui::test(iterations = 100)]
-    fn test_to_tab_point_random(cx: &mut gpui::App, mut rng: StdRng) {
-        let tab_size = NonZeroU32::new(rng.random_range(1..=16)).unwrap();
-        let len = rng.random_range(0..=2000);
-
-        // Generate random text using RandomCharIter
-        let text = util::RandomCharIter::new(&mut rng)
-            .take(len)
-            .collect::<String>();
-
-        // Create buffer and tab map
-        let buffer = MultiBuffer::build_simple(&text, cx);
-        let buffer_snapshot = buffer.read(cx).snapshot(cx);
-        let (mut inlay_map, inlay_snapshot) = InlayMap::new(buffer_snapshot);
-        let (mut fold_map, fold_snapshot) = FoldMap::new(inlay_snapshot);
-        let (mut tab_map, _) = TabMap::new(fold_snapshot, tab_size);
-
-        let mut next_inlay_id = 0;
-        let (inlay_snapshot, inlay_edits) = inlay_map.randomly_mutate(&mut next_inlay_id, &mut rng);
-        let (fold_snapshot, fold_edits) = fold_map.read(inlay_snapshot, inlay_edits);
-        let max_fold_point = fold_snapshot.max_point();
-        let (mut tab_snapshot, _) = tab_map.sync(fold_snapshot.clone(), fold_edits, tab_size);
-
-        // Test random fold points
-        for _ in 0..50 {
-            tab_snapshot.max_expansion_column = rng.random_range(0..=256);
-            // Generate random fold point
-            let row = rng.random_range(0..=max_fold_point.row());
-            let max_column = if row < max_fold_point.row() {
-                fold_snapshot.line_len(row)
-            } else {
-                max_fold_point.column()
-            };
-            let column = rng.random_range(0..=max_column + 10);
-            let fold_point = FoldPoint::new(row, column);
-
-            let actual = tab_snapshot.fold_point_to_tab_point(fold_point);
-            let expected = tab_snapshot.expected_to_tab_point(fold_point);
-
-            assert_eq!(
-                actual, expected,
-                "to_tab_point mismatch for fold_point {:?} in text {:?}",
-                fold_point, text
-            );
-        }
-    }
-
-    #[gpui::test]
-    fn test_tab_stop_cursor_utf8(cx: &mut gpui::App) {
-        let text = "\tfoo\tbarbarbar\t\tbaz\n";
-        let buffer = MultiBuffer::build_simple(text, cx);
-        let buffer_snapshot = buffer.read(cx).snapshot(cx);
-        let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot);
-        let (_, fold_snapshot) = FoldMap::new(inlay_snapshot);
-        let chunks = fold_snapshot.chunks(
-            FoldOffset(MultiBufferOffset(0))..fold_snapshot.len(),
-            false,
-            Default::default(),
-        );
-        let mut cursor = TabStopCursor::new(chunks);
-        assert!(cursor.seek(0).is_none());
-        let mut tab_stops = Vec::new();
-
-        let mut all_tab_stops = Vec::new();
-        let mut byte_offset = 0;
-        for (offset, ch) in buffer.read(cx).snapshot(cx).text().char_indices() {
-            byte_offset += ch.len_utf8() as u32;
-
-            if ch == '\t' {
-                all_tab_stops.push(TabStop {
-                    byte_offset,
-                    char_offset: offset as u32 + 1,
-                });
-            }
-        }
-
-        while let Some(tab_stop) = cursor.seek(u32::MAX) {
-            tab_stops.push(tab_stop);
-        }
-        pretty_assertions::assert_eq!(tab_stops.as_slice(), all_tab_stops.as_slice(),);
-
-        assert_eq!(cursor.byte_offset(), byte_offset);
-    }
-
-    #[gpui::test]
-    fn test_tab_stop_with_end_range_utf8(cx: &mut gpui::App) {
-        let input = "A\tBC\t"; // DEF\tG\tHI\tJ\tK\tL\tM
-
-        let buffer = MultiBuffer::build_simple(input, cx);
-        let buffer_snapshot = buffer.read(cx).snapshot(cx);
-        let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot);
-        let (_, fold_snapshot) = FoldMap::new(inlay_snapshot);
-
-        let chunks = fold_snapshot.chunks_at(FoldPoint::new(0, 0));
-        let mut cursor = TabStopCursor::new(chunks);
-
-        let mut actual_tab_stops = Vec::new();
-
-        let mut expected_tab_stops = Vec::new();
-        let mut byte_offset = 0;
-        for (offset, ch) in buffer.read(cx).snapshot(cx).text().char_indices() {
-            byte_offset += ch.len_utf8() as u32;
-
-            if ch == '\t' {
-                expected_tab_stops.push(TabStop {
-                    byte_offset,
-                    char_offset: offset as u32 + 1,
-                });
-            }
-        }
-
-        while let Some(tab_stop) = cursor.seek(u32::MAX) {
-            actual_tab_stops.push(tab_stop);
-        }
-        pretty_assertions::assert_eq!(actual_tab_stops.as_slice(), expected_tab_stops.as_slice(),);
-
-        assert_eq!(cursor.byte_offset(), byte_offset);
-    }
-
-    #[gpui::test(iterations = 100)]
-    fn test_tab_stop_cursor_random_utf8(cx: &mut gpui::App, mut rng: StdRng) {
-        // Generate random input string with up to 512 characters including tabs
-        let len = rng.random_range(0..=2048);
-        let mut input = String::with_capacity(len);
-
-        let mut skip_tabs = rng.random_bool(0.10);
-        for idx in 0..len {
-            if idx % 128 == 0 {
-                skip_tabs = rng.random_bool(0.10);
-            }
-
-            if rng.random_bool(0.15) && !skip_tabs {
-                input.push('\t');
-            } else {
-                let ch = loop {
-                    let ascii_code = rng.random_range(32..=126); // printable ASCII range
-                    let ch = ascii_code as u8 as char;
-                    if ch != '\t' {
-                        break ch;
-                    }
-                };
-                input.push(ch);
-            }
-        }
-
-        // Build the buffer and create cursor
-        let buffer = MultiBuffer::build_simple(&input, cx);
-        let buffer_snapshot = buffer.read(cx).snapshot(cx);
-        let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
-        let (_, fold_snapshot) = FoldMap::new(inlay_snapshot);
-
-        // First, collect all expected tab positions
-        let mut all_tab_stops = Vec::new();
-        let mut byte_offset = 1;
-        let mut char_offset = 1;
-        for ch in buffer_snapshot.text().chars() {
-            if ch == '\t' {
-                all_tab_stops.push(TabStop {
-                    byte_offset,
-                    char_offset,
-                });
-            }
-            byte_offset += ch.len_utf8() as u32;
-            char_offset += 1;
-        }
-
-        // Test with various distances
-        let distances = vec![1, 5, 10, 50, 100, u32::MAX];
-        // let distances = vec![150];
-
-        for distance in distances {
-            let chunks = fold_snapshot.chunks_at(FoldPoint::new(0, 0));
-            let mut cursor = TabStopCursor::new(chunks);
-
-            let mut found_tab_stops = Vec::new();
-            let mut position = distance;
-            while let Some(tab_stop) = cursor.seek(position) {
-                found_tab_stops.push(tab_stop);
-                position = distance - tab_stop.byte_offset;
-            }
-
-            let expected_found_tab_stops: Vec<_> = all_tab_stops
-                .iter()
-                .take_while(|tab_stop| tab_stop.byte_offset <= distance)
-                .cloned()
-                .collect();
-
-            pretty_assertions::assert_eq!(
-                found_tab_stops,
-                expected_found_tab_stops,
-                "TabStopCursor output mismatch for distance {}. Input: {:?}",
-                distance,
-                input
-            );
-
-            let final_position = cursor.byte_offset();
-            if !found_tab_stops.is_empty() {
-                let last_tab_stop = found_tab_stops.last().unwrap();
-                assert!(
-                    final_position >= last_tab_stop.byte_offset,
-                    "Cursor final position {} is before last tab stop {}. Input: {:?}",
-                    final_position,
-                    last_tab_stop.byte_offset,
-                    input
-                );
-            }
-        }
-    }
-
-    #[gpui::test]
-    fn test_tab_stop_cursor_utf16(cx: &mut gpui::App) {
-        let text = "\r\t😁foo\tb😀arbar🤯bar\t\tbaz\n";
-        let buffer = MultiBuffer::build_simple(text, cx);
-        let buffer_snapshot = buffer.read(cx).snapshot(cx);
-        let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot);
-        let (_, fold_snapshot) = FoldMap::new(inlay_snapshot);
-        let chunks = fold_snapshot.chunks(
-            FoldOffset(MultiBufferOffset(0))..fold_snapshot.len(),
-            false,
-            Default::default(),
-        );
-        let mut cursor = TabStopCursor::new(chunks);
-        assert!(cursor.seek(0).is_none());
-
-        let mut expected_tab_stops = Vec::new();
-        let mut byte_offset = 0;
-        for (i, ch) in fold_snapshot.chars_at(FoldPoint::new(0, 0)).enumerate() {
-            byte_offset += ch.len_utf8() as u32;
-
-            if ch == '\t' {
-                expected_tab_stops.push(TabStop {
-                    byte_offset,
-                    char_offset: i as u32 + 1,
-                });
-            }
-        }
-
-        let mut actual_tab_stops = Vec::new();
-        while let Some(tab_stop) = cursor.seek(u32::MAX) {
-            actual_tab_stops.push(tab_stop);
-        }
-
-        pretty_assertions::assert_eq!(actual_tab_stops.as_slice(), expected_tab_stops.as_slice(),);
-
-        assert_eq!(cursor.byte_offset(), byte_offset);
-    }
-
-    #[gpui::test(iterations = 100)]
-    fn test_tab_stop_cursor_random_utf16(cx: &mut gpui::App, mut rng: StdRng) {
-        // Generate random input string with up to 512 characters including tabs
-        let len = rng.random_range(0..=2048);
-        let input = util::RandomCharIter::new(&mut rng)
-            .take(len)
-            .collect::<String>();
-
-        // Build the buffer and create cursor
-        let buffer = MultiBuffer::build_simple(&input, cx);
-        let buffer_snapshot = buffer.read(cx).snapshot(cx);
-        let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
-        let (_, fold_snapshot) = FoldMap::new(inlay_snapshot);
-
-        // First, collect all expected tab positions
-        let mut all_tab_stops = Vec::new();
-        let mut byte_offset = 0;
-        for (i, ch) in buffer_snapshot.text().chars().enumerate() {
-            byte_offset += ch.len_utf8() as u32;
-            if ch == '\t' {
-                all_tab_stops.push(TabStop {
-                    byte_offset,
-                    char_offset: i as u32 + 1,
-                });
-            }
-        }
-
-        // Test with various distances
-        // let distances = vec![1, 5, 10, 50, 100, u32::MAX];
-        let distances = vec![150];
-
-        for distance in distances {
-            let chunks = fold_snapshot.chunks_at(FoldPoint::new(0, 0));
-            let mut cursor = TabStopCursor::new(chunks);
-
-            let mut found_tab_stops = Vec::new();
-            let mut position = distance;
-            while let Some(tab_stop) = cursor.seek(position) {
-                found_tab_stops.push(tab_stop);
-                position = distance - tab_stop.byte_offset;
-            }
-
-            let expected_found_tab_stops: Vec<_> = all_tab_stops
-                .iter()
-                .take_while(|tab_stop| tab_stop.byte_offset <= distance)
-                .cloned()
-                .collect();
-
-            pretty_assertions::assert_eq!(
-                found_tab_stops,
-                expected_found_tab_stops,
-                "TabStopCursor output mismatch for distance {}. Input: {:?}",
-                distance,
-                input
-            );
-
-            let final_position = cursor.byte_offset();
-            if !found_tab_stops.is_empty() {
-                let last_tab_stop = found_tab_stops.last().unwrap();
-                assert!(
-                    final_position >= last_tab_stop.byte_offset,
-                    "Cursor final position {} is before last tab stop {}. Input: {:?}",
-                    final_position,
-                    last_tab_stop.byte_offset,
-                    input
-                );
-            }
-        }
-    }
-}
-
-struct TabStopCursor<'a, I>
-where
-    I: Iterator<Item = Chunk<'a>>,
-{
-    chunks: I,
-    byte_offset: u32,
-    char_offset: u32,
-    /// Chunk
-    /// last tab position iterated through
-    current_chunk: Option<(Chunk<'a>, u32)>,
-}
-
-impl<'a, I> TabStopCursor<'a, I>
-where
-    I: Iterator<Item = Chunk<'a>>,
-{
-    #[ztracing::instrument(skip_all)]
-    fn new(chunks: impl IntoIterator<Item = Chunk<'a>, IntoIter = I>) -> Self {
-        Self {
-            chunks: chunks.into_iter(),
-            byte_offset: 0,
-            char_offset: 0,
-            current_chunk: None,
-        }
-    }
-
-    #[ztracing::instrument(skip_all)]
-    fn bytes_until_next_char(&self) -> Option<usize> {
-        self.current_chunk.as_ref().and_then(|(chunk, idx)| {
-            let mut idx = *idx;
-            let mut diff = 0;
-            while idx > 0 && chunk.chars & (1u128.unbounded_shl(idx)) == 0 {
-                idx -= 1;
-                diff += 1;
-            }
-
-            if chunk.chars & (1 << idx) != 0 {
-                Some(
-                    (chunk.text[idx as usize..].chars().next()?)
-                        .len_utf8()
-                        .saturating_sub(diff),
-                )
-            } else {
-                None
-            }
-        })
-    }
-
-    #[ztracing::instrument(skip_all)]
-    fn is_char_boundary(&self) -> bool {
-        self.current_chunk
-            .as_ref()
-            .is_some_and(|(chunk, idx)| (chunk.chars & 1u128.unbounded_shl(*idx)) != 0)
-    }
-
-    /// distance: length to move forward while searching for the next tab stop
-    #[ztracing::instrument(skip_all)]
-    fn seek(&mut self, distance: u32) -> Option<TabStop> {
-        if distance == 0 {
-            return None;
-        }
-
-        let mut distance_traversed = 0;
-
-        while let Some((mut chunk, chunk_position)) = self
-            .current_chunk
-            .take()
-            .or_else(|| self.chunks.next().zip(Some(0)))
-        {
-            if chunk.tabs == 0 {
-                let chunk_distance = chunk.text.len() as u32 - chunk_position;
-                if chunk_distance + distance_traversed >= distance {
-                    let overshoot = distance_traversed.abs_diff(distance);
-
-                    self.byte_offset += overshoot;
-                    self.char_offset += get_char_offset(
-                        chunk_position..(chunk_position + overshoot).saturating_sub(1),
-                        chunk.chars,
-                    );
-
-                    if chunk_position + overshoot < 128 {
-                        self.current_chunk = Some((chunk, chunk_position + overshoot));
-                    }
-
-                    return None;
-                }
-
-                self.byte_offset += chunk_distance;
-                self.char_offset += get_char_offset(
-                    chunk_position..(chunk_position + chunk_distance).saturating_sub(1),
-                    chunk.chars,
-                );
-                distance_traversed += chunk_distance;
-                continue;
-            }
-            let tab_position = chunk.tabs.trailing_zeros() + 1;
-
-            if distance_traversed + tab_position - chunk_position > distance {
-                let cursor_position = distance_traversed.abs_diff(distance);
-
-                self.char_offset += get_char_offset(
-                    chunk_position..(chunk_position + cursor_position - 1),
-                    chunk.chars,
-                );
-                self.current_chunk = Some((chunk, cursor_position + chunk_position));
-                self.byte_offset += cursor_position;
-
-                return None;
-            }
-
-            self.byte_offset += tab_position - chunk_position;
-            self.char_offset += get_char_offset(chunk_position..(tab_position - 1), chunk.chars);
-
-            let tabstop = TabStop {
-                char_offset: self.char_offset,
-                byte_offset: self.byte_offset,
-            };
-
-            chunk.tabs = (chunk.tabs - 1) & chunk.tabs;
-
-            if tab_position as usize != chunk.text.len() {
-                self.current_chunk = Some((chunk, tab_position));
-            }
-
-            return Some(tabstop);
-        }
-
-        None
-    }
-
-    fn byte_offset(&self) -> u32 {
-        self.byte_offset
-    }
-
-    fn char_offset(&self) -> u32 {
-        self.char_offset
-    }
-}
-
-#[inline(always)]
-fn get_char_offset(range: Range<u32>, bit_map: u128) -> u32 {
-    if range.start == range.end {
-        return if (1u128 << range.start) & bit_map == 0 {
-            0
-        } else {
-            1
-        };
-    }
-    let end_shift: u128 = 127u128 - range.end as u128;
-    let mut bit_mask = (u128::MAX >> range.start) << range.start;
-    bit_mask = (bit_mask << end_shift) >> end_shift;
-    let bit_map = bit_map & bit_mask;
-
-    bit_map.count_ones()
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-struct TabStop {
-    char_offset: u32,
-    byte_offset: u32,
-}
diff --git a/crates/editor/src/display_map/wrap_map.rs b/crates/editor/src/display_map/wrap_map.rs
deleted file mode 100644
index 4d6b79d061..0000000000
--- a/crates/editor/src/display_map/wrap_map.rs
+++ /dev/null
@@ -1,1610 +0,0 @@
-use super::{
-    Highlights,
-    dimensions::RowDelta,
-    fold_map::{Chunk, FoldRows},
-    tab_map::{self, TabEdit, TabPoint, TabSnapshot},
-};
-use gpui::{App, AppContext as _, Context, Entity, Font, LineWrapper, Pixels, Task};
-use language::Point;
-use multi_buffer::{MultiBufferSnapshot, RowInfo};
-use smol::future::yield_now;
-use std::{cmp, collections::VecDeque, mem, ops::Range, sync::LazyLock, time::Duration};
-use sum_tree::{Bias, Cursor, Dimensions, SumTree};
-use text::Patch;
-
-pub use super::tab_map::TextSummary;
-pub type WrapEdit = text::Edit<WrapRow>;
-pub type WrapPatch = text::Patch<WrapRow>;
-
-#[derive(Copy, Clone, Debug, Default, Eq, Ord, PartialOrd, PartialEq)]
-pub struct WrapRow(pub u32);
-
-impl_for_row_types! {
-    WrapRow => RowDelta
-}
-
-/// Handles soft wrapping of text.
-///
-/// See the [`display_map` module documentation](crate::display_map) for more information.
-pub struct WrapMap {
-    snapshot: WrapSnapshot,
-    pending_edits: VecDeque<(TabSnapshot, Vec<TabEdit>)>,
-    interpolated_edits: WrapPatch,
-    edits_since_sync: WrapPatch,
-    wrap_width: Option<Pixels>,
-    background_task: Option<Task<()>>,
-    font_with_size: (Font, Pixels),
-}
-
-#[derive(Clone)]
-pub struct WrapSnapshot {
-    pub(super) tab_snapshot: TabSnapshot,
-    transforms: SumTree<Transform>,
-    interpolated: bool,
-}
-
-impl std::ops::Deref for WrapSnapshot {
-    type Target = TabSnapshot;
-
-    fn deref(&self) -> &Self::Target {
-        &self.tab_snapshot
-    }
-}
-
-#[derive(Clone, Debug, Default, Eq, PartialEq)]
-struct Transform {
-    summary: TransformSummary,
-    display_text: Option<&'static str>,
-}
-
-#[derive(Clone, Debug, Default, Eq, PartialEq)]
-struct TransformSummary {
-    input: TextSummary,
-    output: TextSummary,
-}
-
-#[derive(Copy, Clone, Debug, Default, Eq, Ord, PartialOrd, PartialEq)]
-pub struct WrapPoint(pub Point);
-
-pub struct WrapChunks<'a> {
-    input_chunks: tab_map::TabChunks<'a>,
-    input_chunk: Chunk<'a>,
-    output_position: WrapPoint,
-    max_output_row: WrapRow,
-    transforms: Cursor<'a, 'static, Transform, Dimensions<WrapPoint, TabPoint>>,
-    snapshot: &'a WrapSnapshot,
-}
-
-#[derive(Clone)]
-pub struct WrapRows<'a> {
-    input_buffer_rows: FoldRows<'a>,
-    input_buffer_row: RowInfo,
-    output_row: WrapRow,
-    soft_wrapped: bool,
-    max_output_row: WrapRow,
-    transforms: Cursor<'a, 'static, Transform, Dimensions<WrapPoint, TabPoint>>,
-}
-
-impl WrapRows<'_> {
-    #[ztracing::instrument(skip_all)]
-    pub(crate) fn seek(&mut self, start_row: WrapRow) {
-        self.transforms
-            .seek(&WrapPoint::new(start_row, 0), Bias::Left);
-        let mut input_row = self.transforms.start().1.row();
-        if self.transforms.item().is_some_and(|t| t.is_isomorphic()) {
-            input_row += (start_row - self.transforms.start().0.row()).0;
-        }
-        self.soft_wrapped = self.transforms.item().is_some_and(|t| !t.is_isomorphic());
-        self.input_buffer_rows.seek(input_row);
-        self.input_buffer_row = self.input_buffer_rows.next().unwrap();
-        self.output_row = start_row;
-    }
-}
-
-impl WrapMap {
-    #[ztracing::instrument(skip_all)]
-    pub fn new(
-        tab_snapshot: TabSnapshot,
-        font: Font,
-        font_size: Pixels,
-        wrap_width: Option<Pixels>,
-        cx: &mut App,
-    ) -> (Entity<Self>, WrapSnapshot) {
-        let handle = cx.new(|cx| {
-            let mut this = Self {
-                font_with_size: (font, font_size),
-                wrap_width: None,
-                pending_edits: Default::default(),
-                interpolated_edits: Default::default(),
-                edits_since_sync: Default::default(),
-                snapshot: WrapSnapshot::new(tab_snapshot),
-                background_task: None,
-            };
-            this.set_wrap_width(wrap_width, cx);
-            mem::take(&mut this.edits_since_sync);
-            this
-        });
-        let snapshot = handle.read(cx).snapshot.clone();
-        (handle, snapshot)
-    }
-
-    #[cfg(test)]
-    pub fn is_rewrapping(&self) -> bool {
-        self.background_task.is_some()
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn sync(
-        &mut self,
-        tab_snapshot: TabSnapshot,
-        edits: Vec<TabEdit>,
-        cx: &mut Context<Self>,
-    ) -> (WrapSnapshot, WrapPatch) {
-        if self.wrap_width.is_some() {
-            self.pending_edits.push_back((tab_snapshot, edits));
-            self.flush_edits(cx);
-        } else {
-            self.edits_since_sync = self
-                .edits_since_sync
-                .compose(self.snapshot.interpolate(tab_snapshot, &edits));
-            self.snapshot.interpolated = false;
-        }
-
-        (self.snapshot.clone(), mem::take(&mut self.edits_since_sync))
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn set_font_with_size(
-        &mut self,
-        font: Font,
-        font_size: Pixels,
-        cx: &mut Context<Self>,
-    ) -> bool {
-        let font_with_size = (font, font_size);
-
-        if font_with_size == self.font_with_size {
-            false
-        } else {
-            self.font_with_size = font_with_size;
-            self.rewrap(cx);
-            true
-        }
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn set_wrap_width(&mut self, wrap_width: Option<Pixels>, cx: &mut Context<Self>) -> bool {
-        if wrap_width == self.wrap_width {
-            return false;
-        }
-
-        self.wrap_width = wrap_width;
-        self.rewrap(cx);
-        true
-    }
-
-    #[ztracing::instrument(skip_all)]
-    fn rewrap(&mut self, cx: &mut Context<Self>) {
-        self.background_task.take();
-        self.interpolated_edits.clear();
-        self.pending_edits.clear();
-
-        if let Some(wrap_width) = self.wrap_width {
-            let mut new_snapshot = self.snapshot.clone();
-
-            let text_system = cx.text_system().clone();
-            let (font, font_size) = self.font_with_size.clone();
-            let task = cx.background_spawn(async move {
-                let mut line_wrapper = text_system.line_wrapper(font, font_size);
-                let tab_snapshot = new_snapshot.tab_snapshot.clone();
-                let range = TabPoint::zero()..tab_snapshot.max_point();
-                let edits = new_snapshot
-                    .update(
-                        tab_snapshot,
-                        &[TabEdit {
-                            old: range.clone(),
-                            new: range.clone(),
-                        }],
-                        wrap_width,
-                        &mut line_wrapper,
-                    )
-                    .await;
-                (new_snapshot, edits)
-            });
-
-            match cx
-                .background_executor()
-                .block_with_timeout(Duration::from_millis(5), task)
-            {
-                Ok((snapshot, edits)) => {
-                    self.snapshot = snapshot;
-                    self.edits_since_sync = self.edits_since_sync.compose(&edits);
-                }
-                Err(wrap_task) => {
-                    self.background_task = Some(cx.spawn(async move |this, cx| {
-                        let (snapshot, edits) = wrap_task.await;
-                        this.update(cx, |this, cx| {
-                            this.snapshot = snapshot;
-                            this.edits_since_sync = this
-                                .edits_since_sync
-                                .compose(mem::take(&mut this.interpolated_edits).invert())
-                                .compose(&edits);
-                            this.background_task = None;
-                            this.flush_edits(cx);
-                            cx.notify();
-                        })
-                        .ok();
-                    }));
-                }
-            }
-        } else {
-            let old_rows = self.snapshot.transforms.summary().output.lines.row + 1;
-            self.snapshot.transforms = SumTree::default();
-            let summary = self.snapshot.tab_snapshot.text_summary();
-            if !summary.lines.is_zero() {
-                self.snapshot
-                    .transforms
-                    .push(Transform::isomorphic(summary), ());
-            }
-            let new_rows = self.snapshot.transforms.summary().output.lines.row + 1;
-            self.snapshot.interpolated = false;
-            self.edits_since_sync = self.edits_since_sync.compose(Patch::new(vec![WrapEdit {
-                old: WrapRow(0)..WrapRow(old_rows),
-                new: WrapRow(0)..WrapRow(new_rows),
-            }]));
-        }
-    }
-
-    #[ztracing::instrument(skip_all)]
-    fn flush_edits(&mut self, cx: &mut Context<Self>) {
-        if !self.snapshot.interpolated {
-            let mut to_remove_len = 0;
-            for (tab_snapshot, _) in &self.pending_edits {
-                if tab_snapshot.version <= self.snapshot.tab_snapshot.version {
-                    to_remove_len += 1;
-                } else {
-                    break;
-                }
-            }
-            self.pending_edits.drain(..to_remove_len);
-        }
-
-        if self.pending_edits.is_empty() {
-            return;
-        }
-
-        if let Some(wrap_width) = self.wrap_width
-            && self.background_task.is_none()
-        {
-            let pending_edits = self.pending_edits.clone();
-            let mut snapshot = self.snapshot.clone();
-            let text_system = cx.text_system().clone();
-            let (font, font_size) = self.font_with_size.clone();
-            let update_task = cx.background_spawn(async move {
-                let mut edits = Patch::default();
-                let mut line_wrapper = text_system.line_wrapper(font, font_size);
-                for (tab_snapshot, tab_edits) in pending_edits {
-                    let wrap_edits = snapshot
-                        .update(tab_snapshot, &tab_edits, wrap_width, &mut line_wrapper)
-                        .await;
-                    edits = edits.compose(&wrap_edits);
-                }
-                (snapshot, edits)
-            });
-
-            match cx
-                .background_executor()
-                .block_with_timeout(Duration::from_millis(1), update_task)
-            {
-                Ok((snapshot, output_edits)) => {
-                    self.snapshot = snapshot;
-                    self.edits_since_sync = self.edits_since_sync.compose(&output_edits);
-                }
-                Err(update_task) => {
-                    self.background_task = Some(cx.spawn(async move |this, cx| {
-                        let (snapshot, edits) = update_task.await;
-                        this.update(cx, |this, cx| {
-                            this.snapshot = snapshot;
-                            this.edits_since_sync = this
-                                .edits_since_sync
-                                .compose(mem::take(&mut this.interpolated_edits).invert())
-                                .compose(&edits);
-                            this.background_task = None;
-                            this.flush_edits(cx);
-                            cx.notify();
-                        })
-                        .ok();
-                    }));
-                }
-            }
-        }
-
-        let was_interpolated = self.snapshot.interpolated;
-        let mut to_remove_len = 0;
-        for (tab_snapshot, edits) in &self.pending_edits {
-            if tab_snapshot.version <= self.snapshot.tab_snapshot.version {
-                to_remove_len += 1;
-            } else {
-                let interpolated_edits = self.snapshot.interpolate(tab_snapshot.clone(), edits);
-                self.edits_since_sync = self.edits_since_sync.compose(&interpolated_edits);
-                self.interpolated_edits = self.interpolated_edits.compose(&interpolated_edits);
-            }
-        }
-
-        if !was_interpolated {
-            self.pending_edits.drain(..to_remove_len);
-        }
-    }
-}
-
-impl WrapSnapshot {
-    #[ztracing::instrument(skip_all)]
-    fn new(tab_snapshot: TabSnapshot) -> Self {
-        let mut transforms = SumTree::default();
-        let extent = tab_snapshot.text_summary();
-        if !extent.lines.is_zero() {
-            transforms.push(Transform::isomorphic(extent), ());
-        }
-        Self {
-            transforms,
-            tab_snapshot,
-            interpolated: true,
-        }
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn buffer_snapshot(&self) -> &MultiBufferSnapshot {
-        self.tab_snapshot.buffer_snapshot()
-    }
-
-    #[ztracing::instrument(skip_all)]
-    fn interpolate(&mut self, new_tab_snapshot: TabSnapshot, tab_edits: &[TabEdit]) -> WrapPatch {
-        let mut new_transforms;
-        if tab_edits.is_empty() {
-            new_transforms = self.transforms.clone();
-        } else {
-            let mut old_cursor = self.transforms.cursor::<TabPoint>(());
-
-            let mut tab_edits_iter = tab_edits.iter().peekable();
-            new_transforms =
-                old_cursor.slice(&tab_edits_iter.peek().unwrap().old.start, Bias::Right);
-
-            while let Some(edit) = tab_edits_iter.next() {
-                if edit.new.start > TabPoint::from(new_transforms.summary().input.lines) {
-                    let summary = new_tab_snapshot.text_summary_for_range(
-                        TabPoint::from(new_transforms.summary().input.lines)..edit.new.start,
-                    );
-                    new_transforms.push_or_extend(Transform::isomorphic(summary));
-                }
-
-                if !edit.new.is_empty() {
-                    new_transforms.push_or_extend(Transform::isomorphic(
-                        new_tab_snapshot.text_summary_for_range(edit.new.clone()),
-                    ));
-                }
-
-                old_cursor.seek_forward(&edit.old.end, Bias::Right);
-                if let Some(next_edit) = tab_edits_iter.peek() {
-                    if next_edit.old.start > old_cursor.end() {
-                        if old_cursor.end() > edit.old.end {
-                            let summary = self
-                                .tab_snapshot
-                                .text_summary_for_range(edit.old.end..old_cursor.end());
-                            new_transforms.push_or_extend(Transform::isomorphic(summary));
-                        }
-
-                        old_cursor.next();
-                        new_transforms
-                            .append(old_cursor.slice(&next_edit.old.start, Bias::Right), ());
-                    }
-                } else {
-                    if old_cursor.end() > edit.old.end {
-                        let summary = self
-                            .tab_snapshot
-                            .text_summary_for_range(edit.old.end..old_cursor.end());
-                        new_transforms.push_or_extend(Transform::isomorphic(summary));
-                    }
-                    old_cursor.next();
-                    new_transforms.append(old_cursor.suffix(), ());
-                }
-            }
-        }
-
-        let old_snapshot = mem::replace(
-            self,
-            WrapSnapshot {
-                tab_snapshot: new_tab_snapshot,
-                transforms: new_transforms,
-                interpolated: true,
-            },
-        );
-        self.check_invariants();
-        old_snapshot.compute_edits(tab_edits, self)
-    }
-
-    #[ztracing::instrument(skip_all)]
-    async fn update(
-        &mut self,
-        new_tab_snapshot: TabSnapshot,
-        tab_edits: &[TabEdit],
-        wrap_width: Pixels,
-        line_wrapper: &mut LineWrapper,
-    ) -> WrapPatch {
-        #[derive(Debug)]
-        struct RowEdit {
-            old_rows: Range<u32>,
-            new_rows: Range<u32>,
-        }
-
-        let mut tab_edits_iter = tab_edits.iter().peekable();
-        let mut row_edits = Vec::with_capacity(tab_edits.len());
-        while let Some(edit) = tab_edits_iter.next() {
-            let mut row_edit = RowEdit {
-                old_rows: edit.old.start.row()..edit.old.end.row() + 1,
-                new_rows: edit.new.start.row()..edit.new.end.row() + 1,
-            };
-
-            while let Some(next_edit) = tab_edits_iter.peek() {
-                if next_edit.old.start.row() <= row_edit.old_rows.end {
-                    row_edit.old_rows.end = next_edit.old.end.row() + 1;
-                    row_edit.new_rows.end = next_edit.new.end.row() + 1;
-                    tab_edits_iter.next();
-                } else {
-                    break;
-                }
-            }
-
-            row_edits.push(row_edit);
-        }
-
-        let mut new_transforms;
-        if row_edits.is_empty() {
-            new_transforms = self.transforms.clone();
-        } else {
-            let mut row_edits = row_edits.into_iter().peekable();
-            let mut old_cursor = self.transforms.cursor::<TabPoint>(());
-
-            new_transforms = old_cursor.slice(
-                &TabPoint::new(row_edits.peek().unwrap().old_rows.start, 0),
-                Bias::Right,
-            );
-
-            while let Some(edit) = row_edits.next() {
-                if edit.new_rows.start > new_transforms.summary().input.lines.row {
-                    let summary = new_tab_snapshot.text_summary_for_range(
-                        TabPoint(new_transforms.summary().input.lines)
-                            ..TabPoint::new(edit.new_rows.start, 0),
-                    );
-                    new_transforms.push_or_extend(Transform::isomorphic(summary));
-                }
-
-                let mut line = String::new();
-                let mut line_fragments = Vec::new();
-                let mut remaining = None;
-                let mut chunks = new_tab_snapshot.chunks(
-                    TabPoint::new(edit.new_rows.start, 0)..new_tab_snapshot.max_point(),
-                    false,
-                    Highlights::default(),
-                );
-                let mut edit_transforms = Vec::<Transform>::new();
-                for _ in edit.new_rows.start..edit.new_rows.end {
-                    while let Some(chunk) = remaining.take().or_else(|| chunks.next()) {
-                        if let Some(ix) = chunk.text.find('\n') {
-                            let (prefix, suffix) = chunk.text.split_at(ix + 1);
-                            line_fragments.push(gpui::LineFragment::text(prefix));
-                            line.push_str(prefix);
-                            remaining = Some(Chunk {
-                                text: suffix,
-                                ..chunk
-                            });
-                            break;
-                        } else {
-                            if let Some(width) =
-                                chunk.renderer.as_ref().and_then(|r| r.measured_width)
-                            {
-                                line_fragments
-                                    .push(gpui::LineFragment::element(width, chunk.text.len()));
-                            } else {
-                                line_fragments.push(gpui::LineFragment::text(chunk.text));
-                            }
-                            line.push_str(chunk.text);
-                        }
-                    }
-
-                    if line.is_empty() {
-                        break;
-                    }
-
-                    let mut prev_boundary_ix = 0;
-                    for boundary in line_wrapper.wrap_line(&line_fragments, wrap_width) {
-                        let wrapped = &line[prev_boundary_ix..boundary.ix];
-                        push_isomorphic(&mut edit_transforms, TextSummary::from(wrapped));
-                        edit_transforms.push(Transform::wrap(boundary.next_indent));
-                        prev_boundary_ix = boundary.ix;
-                    }
-
-                    if prev_boundary_ix < line.len() {
-                        push_isomorphic(
-                            &mut edit_transforms,
-                            TextSummary::from(&line[prev_boundary_ix..]),
-                        );
-                    }
-
-                    line.clear();
-                    line_fragments.clear();
-                    yield_now().await;
-                }
-
-                let mut edit_transforms = edit_transforms.into_iter();
-                if let Some(transform) = edit_transforms.next() {
-                    new_transforms.push_or_extend(transform);
-                }
-                new_transforms.extend(edit_transforms, ());
-
-                old_cursor.seek_forward(&TabPoint::new(edit.old_rows.end, 0), Bias::Right);
-                if let Some(next_edit) = row_edits.peek() {
-                    if next_edit.old_rows.start > old_cursor.end().row() {
-                        if old_cursor.end() > TabPoint::new(edit.old_rows.end, 0) {
-                            let summary = self.tab_snapshot.text_summary_for_range(
-                                TabPoint::new(edit.old_rows.end, 0)..old_cursor.end(),
-                            );
-                            new_transforms.push_or_extend(Transform::isomorphic(summary));
-                        }
-                        old_cursor.next();
-                        new_transforms.append(
-                            old_cursor
-                                .slice(&TabPoint::new(next_edit.old_rows.start, 0), Bias::Right),
-                            (),
-                        );
-                    }
-                } else {
-                    if old_cursor.end() > TabPoint::new(edit.old_rows.end, 0) {
-                        let summary = self.tab_snapshot.text_summary_for_range(
-                            TabPoint::new(edit.old_rows.end, 0)..old_cursor.end(),
-                        );
-                        new_transforms.push_or_extend(Transform::isomorphic(summary));
-                    }
-                    old_cursor.next();
-                    new_transforms.append(old_cursor.suffix(), ());
-                }
-            }
-        }
-
-        let old_snapshot = mem::replace(
-            self,
-            WrapSnapshot {
-                tab_snapshot: new_tab_snapshot,
-                transforms: new_transforms,
-                interpolated: false,
-            },
-        );
-        self.check_invariants();
-        old_snapshot.compute_edits(tab_edits, self)
-    }
-
-    #[ztracing::instrument(skip_all)]
-    fn compute_edits(&self, tab_edits: &[TabEdit], new_snapshot: &WrapSnapshot) -> WrapPatch {
-        let mut wrap_edits = Vec::with_capacity(tab_edits.len());
-        let mut old_cursor = self.transforms.cursor::<TransformSummary>(());
-        let mut new_cursor = new_snapshot.transforms.cursor::<TransformSummary>(());
-        for mut tab_edit in tab_edits.iter().cloned() {
-            tab_edit.old.start.0.column = 0;
-            tab_edit.old.end.0 += Point::new(1, 0);
-            tab_edit.new.start.0.column = 0;
-            tab_edit.new.end.0 += Point::new(1, 0);
-
-            old_cursor.seek(&tab_edit.old.start, Bias::Right);
-            let mut old_start = old_cursor.start().output.lines;
-            old_start += tab_edit.old.start.0 - old_cursor.start().input.lines;
-
-            old_cursor.seek_forward(&tab_edit.old.end, Bias::Right);
-            let mut old_end = old_cursor.start().output.lines;
-            old_end += tab_edit.old.end.0 - old_cursor.start().input.lines;
-
-            new_cursor.seek(&tab_edit.new.start, Bias::Right);
-            let mut new_start = new_cursor.start().output.lines;
-            new_start += tab_edit.new.start.0 - new_cursor.start().input.lines;
-
-            new_cursor.seek_forward(&tab_edit.new.end, Bias::Right);
-            let mut new_end = new_cursor.start().output.lines;
-            new_end += tab_edit.new.end.0 - new_cursor.start().input.lines;
-
-            wrap_edits.push(WrapEdit {
-                old: WrapRow(old_start.row)..WrapRow(old_end.row),
-                new: WrapRow(new_start.row)..WrapRow(new_end.row),
-            });
-        }
-
-        wrap_edits = consolidate_wrap_edits(wrap_edits);
-        Patch::new(wrap_edits)
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub(crate) fn chunks<'a>(
-        &'a self,
-        rows: Range<WrapRow>,
-        language_aware: bool,
-        highlights: Highlights<'a>,
-    ) -> WrapChunks<'a> {
-        let output_start = WrapPoint::new(rows.start, 0);
-        let output_end = WrapPoint::new(rows.end, 0);
-        let mut transforms = self
-            .transforms
-            .cursor::<Dimensions<WrapPoint, TabPoint>>(());
-        transforms.seek(&output_start, Bias::Right);
-        let mut input_start = TabPoint(transforms.start().1.0);
-        if transforms.item().is_some_and(|t| t.is_isomorphic()) {
-            input_start.0 += output_start.0 - transforms.start().0.0;
-        }
-        let input_end = self.to_tab_point(output_end);
-        let max_point = self.tab_snapshot.max_point();
-        let input_start = input_start.min(max_point);
-        let input_end = input_end.min(max_point);
-        WrapChunks {
-            input_chunks: self.tab_snapshot.chunks(
-                input_start..input_end,
-                language_aware,
-                highlights,
-            ),
-            input_chunk: Default::default(),
-            output_position: output_start,
-            max_output_row: rows.end,
-            transforms,
-            snapshot: self,
-        }
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn max_point(&self) -> WrapPoint {
-        WrapPoint(self.transforms.summary().output.lines)
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn line_len(&self, row: WrapRow) -> u32 {
-        let (start, _, item) = self.transforms.find::<Dimensions<WrapPoint, TabPoint>, _>(
-            (),
-            &WrapPoint::new(row + WrapRow(1), 0),
-            Bias::Left,
-        );
-        if item.is_some_and(|transform| transform.is_isomorphic()) {
-            let overshoot = row - start.0.row();
-            let tab_row = start.1.row() + overshoot.0;
-            let tab_line_len = self.tab_snapshot.line_len(tab_row);
-            if overshoot.0 == 0 {
-                start.0.column() + (tab_line_len - start.1.column())
-            } else {
-                tab_line_len
-            }
-        } else {
-            start.0.column()
-        }
-    }
-
-    #[ztracing::instrument(skip_all, fields(rows))]
-    pub fn text_summary_for_range(&self, rows: Range<WrapRow>) -> TextSummary {
-        let mut summary = TextSummary::default();
-
-        let start = WrapPoint::new(rows.start, 0);
-        let end = WrapPoint::new(rows.end, 0);
-
-        let mut cursor = self
-            .transforms
-            .cursor::<Dimensions<WrapPoint, TabPoint>>(());
-        cursor.seek(&start, Bias::Right);
-        if let Some(transform) = cursor.item() {
-            let start_in_transform = start.0 - cursor.start().0.0;
-            let end_in_transform = cmp::min(end, cursor.end().0).0 - cursor.start().0.0;
-            if transform.is_isomorphic() {
-                let tab_start = TabPoint(cursor.start().1.0 + start_in_transform);
-                let tab_end = TabPoint(cursor.start().1.0 + end_in_transform);
-                summary += &self.tab_snapshot.text_summary_for_range(tab_start..tab_end);
-            } else {
-                debug_assert_eq!(start_in_transform.row, end_in_transform.row);
-                let indent_len = end_in_transform.column - start_in_transform.column;
-                summary += &TextSummary {
-                    lines: Point::new(0, indent_len),
-                    first_line_chars: indent_len,
-                    last_line_chars: indent_len,
-                    longest_row: 0,
-                    longest_row_chars: indent_len,
-                };
-            }
-
-            cursor.next();
-        }
-
-        if rows.end > cursor.start().0.row() {
-            summary += &cursor
-                .summary::<_, TransformSummary>(&WrapPoint::new(rows.end, 0), Bias::Right)
-                .output;
-
-            if let Some(transform) = cursor.item() {
-                let end_in_transform = end.0 - cursor.start().0.0;
-                if transform.is_isomorphic() {
-                    let char_start = cursor.start().1;
-                    let char_end = TabPoint(char_start.0 + end_in_transform);
-                    summary += &self
-                        .tab_snapshot
-                        .text_summary_for_range(char_start..char_end);
-                } else {
-                    debug_assert_eq!(end_in_transform, Point::new(1, 0));
-                    summary += &TextSummary {
-                        lines: Point::new(1, 0),
-                        first_line_chars: 0,
-                        last_line_chars: 0,
-                        longest_row: 0,
-                        longest_row_chars: 0,
-                    };
-                }
-            }
-        }
-
-        summary
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn soft_wrap_indent(&self, row: WrapRow) -> Option<u32> {
-        let (.., item) = self.transforms.find::<WrapPoint, _>(
-            (),
-            &WrapPoint::new(row + WrapRow(1), 0),
-            Bias::Right,
-        );
-        item.and_then(|transform| {
-            if transform.is_isomorphic() {
-                None
-            } else {
-                Some(transform.summary.output.lines.column)
-            }
-        })
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn longest_row(&self) -> u32 {
-        self.transforms.summary().output.longest_row
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn row_infos(&self, start_row: WrapRow) -> WrapRows<'_> {
-        let mut transforms = self
-            .transforms
-            .cursor::<Dimensions<WrapPoint, TabPoint>>(());
-        transforms.seek(&WrapPoint::new(start_row, 0), Bias::Left);
-        let mut input_row = transforms.start().1.row();
-        if transforms.item().is_some_and(|t| t.is_isomorphic()) {
-            input_row += (start_row - transforms.start().0.row()).0;
-        }
-        let soft_wrapped = transforms.item().is_some_and(|t| !t.is_isomorphic());
-        let mut input_buffer_rows = self.tab_snapshot.rows(input_row);
-        let input_buffer_row = input_buffer_rows.next().unwrap();
-        WrapRows {
-            transforms,
-            input_buffer_row,
-            input_buffer_rows,
-            output_row: start_row,
-            soft_wrapped,
-            max_output_row: self.max_point().row(),
-        }
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn to_tab_point(&self, point: WrapPoint) -> TabPoint {
-        let (start, _, item) =
-            self.transforms
-                .find::<Dimensions<WrapPoint, TabPoint>, _>((), &point, Bias::Right);
-        let mut tab_point = start.1.0;
-        if item.is_some_and(|t| t.is_isomorphic()) {
-            tab_point += point.0 - start.0.0;
-        }
-        TabPoint(tab_point)
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn to_point(&self, point: WrapPoint, bias: Bias) -> Point {
-        self.tab_snapshot
-            .tab_point_to_point(self.to_tab_point(point), bias)
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn make_wrap_point(&self, point: Point, bias: Bias) -> WrapPoint {
-        self.tab_point_to_wrap_point(self.tab_snapshot.point_to_tab_point(point, bias))
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn tab_point_to_wrap_point(&self, point: TabPoint) -> WrapPoint {
-        let (start, ..) =
-            self.transforms
-                .find::<Dimensions<TabPoint, WrapPoint>, _>((), &point, Bias::Right);
-        WrapPoint(start.1.0 + (point.0 - start.0.0))
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn wrap_point_cursor(&self) -> WrapPointCursor<'_> {
-        WrapPointCursor {
-            cursor: self
-                .transforms
-                .cursor::<Dimensions<TabPoint, WrapPoint>>(()),
-        }
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn clip_point(&self, mut point: WrapPoint, bias: Bias) -> WrapPoint {
-        if bias == Bias::Left {
-            let (start, _, item) = self
-                .transforms
-                .find::<WrapPoint, _>((), &point, Bias::Right);
-            if item.is_some_and(|t| !t.is_isomorphic()) {
-                point = start;
-                *point.column_mut() -= 1;
-            }
-        }
-
-        self.tab_point_to_wrap_point(self.tab_snapshot.clip_point(self.to_tab_point(point), bias))
-    }
-
-    #[ztracing::instrument(skip_all, fields(point=?point, ret))]
-    pub fn prev_row_boundary(&self, mut point: WrapPoint) -> WrapRow {
-        if self.transforms.is_empty() {
-            return WrapRow(0);
-        }
-
-        *point.column_mut() = 0;
-
-        let mut cursor = self
-            .transforms
-            .cursor::<Dimensions<WrapPoint, TabPoint>>(());
-        // start
-        cursor.seek(&point, Bias::Right);
-        // end
-        if cursor.item().is_none() {
-            cursor.prev();
-        }
-
-        // start
-        while let Some(transform) = cursor.item() {
-            if transform.is_isomorphic() && cursor.start().1.column() == 0 {
-                return cmp::min(cursor.end().0.row(), point.row());
-            } else {
-                cursor.prev();
-            }
-        }
-        // end
-
-        unreachable!()
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn next_row_boundary(&self, mut point: WrapPoint) -> Option<WrapRow> {
-        point.0 += Point::new(1, 0);
-
-        let mut cursor = self
-            .transforms
-            .cursor::<Dimensions<WrapPoint, TabPoint>>(());
-        cursor.seek(&point, Bias::Right);
-        while let Some(transform) = cursor.item() {
-            if transform.is_isomorphic() && cursor.start().1.column() == 0 {
-                return Some(cmp::max(cursor.start().0.row(), point.row()));
-            } else {
-                cursor.next();
-            }
-        }
-
-        None
-    }
-
-    #[cfg(test)]
-    #[ztracing::instrument(skip_all)]
-    pub fn text(&self) -> String {
-        self.text_chunks(WrapRow(0)).collect()
-    }
-
-    #[cfg(test)]
-    #[ztracing::instrument(skip_all)]
-    pub fn text_chunks(&self, wrap_row: WrapRow) -> impl Iterator<Item = &str> {
-        self.chunks(
-            wrap_row..self.max_point().row() + WrapRow(1),
-            false,
-            Highlights::default(),
-        )
-        .map(|h| h.text)
-    }
-
-    #[ztracing::instrument(skip_all)]
-    fn check_invariants(&self) {
-        #[cfg(test)]
-        {
-            assert_eq!(
-                TabPoint::from(self.transforms.summary().input.lines),
-                self.tab_snapshot.max_point()
-            );
-
-            {
-                let mut transforms = self.transforms.cursor::<()>(()).peekable();
-                while let Some(transform) = transforms.next() {
-                    if let Some(next_transform) = transforms.peek() {
-                        assert!(transform.is_isomorphic() != next_transform.is_isomorphic());
-                    }
-                }
-            }
-
-            let text = language::Rope::from(self.text().as_str());
-            let mut input_buffer_rows = self.tab_snapshot.rows(0);
-            let mut expected_buffer_rows = Vec::new();
-            let mut prev_tab_row = 0;
-            for display_row in 0..=self.max_point().row().0 {
-                let display_row = WrapRow(display_row);
-                let tab_point = self.to_tab_point(WrapPoint::new(display_row, 0));
-                if tab_point.row() == prev_tab_row && display_row != WrapRow(0) {
-                    expected_buffer_rows.push(None);
-                } else {
-                    expected_buffer_rows.push(input_buffer_rows.next().unwrap().buffer_row);
-                }
-
-                prev_tab_row = tab_point.row();
-                assert_eq!(self.line_len(display_row), text.line_len(display_row.0));
-            }
-
-            for start_display_row in 0..expected_buffer_rows.len() {
-                assert_eq!(
-                    self.row_infos(WrapRow(start_display_row as u32))
-                        .map(|row_info| row_info.buffer_row)
-                        .collect::<Vec<_>>(),
-                    &expected_buffer_rows[start_display_row..],
-                    "invalid buffer_rows({}..)",
-                    start_display_row
-                );
-            }
-        }
-    }
-}
-
-pub struct WrapPointCursor<'transforms> {
-    cursor: Cursor<'transforms, 'static, Transform, Dimensions<TabPoint, WrapPoint>>,
-}
-
-impl WrapPointCursor<'_> {
-    #[ztracing::instrument(skip_all)]
-    pub fn map(&mut self, point: TabPoint) -> WrapPoint {
-        let cursor = &mut self.cursor;
-        if cursor.did_seek() {
-            cursor.seek_forward(&point, Bias::Right);
-        } else {
-            cursor.seek(&point, Bias::Right);
-        }
-        WrapPoint(cursor.start().1.0 + (point.0 - cursor.start().0.0))
-    }
-}
-
-impl WrapChunks<'_> {
-    #[ztracing::instrument(skip_all)]
-    pub(crate) fn seek(&mut self, rows: Range<WrapRow>) {
-        let output_start = WrapPoint::new(rows.start, 0);
-        let output_end = WrapPoint::new(rows.end, 0);
-        self.transforms.seek(&output_start, Bias::Right);
-        let mut input_start = TabPoint(self.transforms.start().1.0);
-        if self.transforms.item().is_some_and(|t| t.is_isomorphic()) {
-            input_start.0 += output_start.0 - self.transforms.start().0.0;
-        }
-        let input_end = self.snapshot.to_tab_point(output_end);
-        let max_point = self.snapshot.tab_snapshot.max_point();
-        let input_start = input_start.min(max_point);
-        let input_end = input_end.min(max_point);
-        self.input_chunks.seek(input_start..input_end);
-        self.input_chunk = Chunk::default();
-        self.output_position = output_start;
-        self.max_output_row = rows.end;
-    }
-}
-
-impl<'a> Iterator for WrapChunks<'a> {
-    type Item = Chunk<'a>;
-
-    #[ztracing::instrument(skip_all)]
-    fn next(&mut self) -> Option<Self::Item> {
-        if self.output_position.row() >= self.max_output_row {
-            return None;
-        }
-
-        let transform = self.transforms.item()?;
-        if let Some(display_text) = transform.display_text {
-            let mut start_ix = 0;
-            let mut end_ix = display_text.len();
-            let mut summary = transform.summary.output.lines;
-
-            if self.output_position > self.transforms.start().0 {
-                // Exclude newline starting prior to the desired row.
-                start_ix = 1;
-                summary.row = 0;
-            } else if self.output_position.row() + WrapRow(1) >= self.max_output_row {
-                // Exclude soft indentation ending after the desired row.
-                end_ix = 1;
-                summary.column = 0;
-            }
-
-            self.output_position.0 += summary;
-            self.transforms.next();
-            return Some(Chunk {
-                text: &display_text[start_ix..end_ix],
-                ..Default::default()
-            });
-        }
-
-        if self.input_chunk.text.is_empty() {
-            self.input_chunk = self.input_chunks.next()?;
-        }
-
-        let mut input_len = 0;
-        let transform_end = self.transforms.end().0;
-        for c in self.input_chunk.text.chars() {
-            let char_len = c.len_utf8();
-            input_len += char_len;
-            if c == '\n' {
-                *self.output_position.row_mut() += 1;
-                *self.output_position.column_mut() = 0;
-            } else {
-                *self.output_position.column_mut() += char_len as u32;
-            }
-
-            if self.output_position >= transform_end {
-                self.transforms.next();
-                break;
-            }
-        }
-
-        let (prefix, suffix) = self.input_chunk.text.split_at(input_len);
-
-        let mask = 1u128.unbounded_shl(input_len as u32).wrapping_sub(1);
-        let chars = self.input_chunk.chars & mask;
-        let tabs = self.input_chunk.tabs & mask;
-        self.input_chunk.tabs = self.input_chunk.tabs.unbounded_shr(input_len as u32);
-        self.input_chunk.chars = self.input_chunk.chars.unbounded_shr(input_len as u32);
-
-        self.input_chunk.text = suffix;
-        Some(Chunk {
-            text: prefix,
-            chars,
-            tabs,
-            ..self.input_chunk.clone()
-        })
-    }
-}
-
-impl Iterator for WrapRows<'_> {
-    type Item = RowInfo;
-
-    #[ztracing::instrument(skip_all)]
-    fn next(&mut self) -> Option<Self::Item> {
-        if self.output_row > self.max_output_row {
-            return None;
-        }
-
-        let buffer_row = self.input_buffer_row;
-        let soft_wrapped = self.soft_wrapped;
-        let diff_status = self.input_buffer_row.diff_status;
-
-        self.output_row += WrapRow(1);
-        self.transforms
-            .seek_forward(&WrapPoint::new(self.output_row, 0), Bias::Left);
-        if self.transforms.item().is_some_and(|t| t.is_isomorphic()) {
-            self.input_buffer_row = self.input_buffer_rows.next().unwrap();
-            self.soft_wrapped = false;
-        } else {
-            self.soft_wrapped = true;
-        }
-
-        Some(if soft_wrapped {
-            RowInfo {
-                buffer_id: None,
-                buffer_row: None,
-                base_text_row: None,
-                multibuffer_row: None,
-                diff_status,
-                expand_info: None,
-                wrapped_buffer_row: buffer_row.buffer_row,
-            }
-        } else {
-            buffer_row
-        })
-    }
-}
-
-impl Transform {
-    #[ztracing::instrument(skip_all)]
-    fn isomorphic(summary: TextSummary) -> Self {
-        #[cfg(test)]
-        assert!(!summary.lines.is_zero());
-
-        Self {
-            summary: TransformSummary {
-                input: summary.clone(),
-                output: summary,
-            },
-            display_text: None,
-        }
-    }
-
-    #[ztracing::instrument(skip_all)]
-    fn wrap(indent: u32) -> Self {
-        static WRAP_TEXT: LazyLock<String> = LazyLock::new(|| {
-            let mut wrap_text = String::new();
-            wrap_text.push('\n');
-            wrap_text.extend((0..LineWrapper::MAX_INDENT as usize).map(|_| ' '));
-            wrap_text
-        });
-
-        Self {
-            summary: TransformSummary {
-                input: TextSummary::default(),
-                output: TextSummary {
-                    lines: Point::new(1, indent),
-                    first_line_chars: 0,
-                    last_line_chars: indent,
-                    longest_row: 1,
-                    longest_row_chars: indent,
-                },
-            },
-            display_text: Some(&WRAP_TEXT[..1 + indent as usize]),
-        }
-    }
-
-    fn is_isomorphic(&self) -> bool {
-        self.display_text.is_none()
-    }
-}
-
-impl sum_tree::Item for Transform {
-    type Summary = TransformSummary;
-
-    fn summary(&self, _cx: ()) -> Self::Summary {
-        self.summary.clone()
-    }
-}
-
-fn push_isomorphic(transforms: &mut Vec<Transform>, summary: TextSummary) {
-    if let Some(last_transform) = transforms.last_mut()
-        && last_transform.is_isomorphic()
-    {
-        last_transform.summary.input += &summary;
-        last_transform.summary.output += &summary;
-        return;
-    }
-    transforms.push(Transform::isomorphic(summary));
-}
-
-trait SumTreeExt {
-    fn push_or_extend(&mut self, transform: Transform);
-}
-
-impl SumTreeExt for SumTree<Transform> {
-    #[ztracing::instrument(skip_all)]
-    fn push_or_extend(&mut self, transform: Transform) {
-        let mut transform = Some(transform);
-        self.update_last(
-            |last_transform| {
-                if last_transform.is_isomorphic() && transform.as_ref().unwrap().is_isomorphic() {
-                    let transform = transform.take().unwrap();
-                    last_transform.summary.input += &transform.summary.input;
-                    last_transform.summary.output += &transform.summary.output;
-                }
-            },
-            (),
-        );
-
-        if let Some(transform) = transform {
-            self.push(transform, ());
-        }
-    }
-}
-
-impl WrapPoint {
-    pub fn new(row: WrapRow, column: u32) -> Self {
-        Self(Point::new(row.0, column))
-    }
-
-    pub fn row(self) -> WrapRow {
-        WrapRow(self.0.row)
-    }
-
-    pub fn row_mut(&mut self) -> &mut u32 {
-        &mut self.0.row
-    }
-
-    pub fn column(self) -> u32 {
-        self.0.column
-    }
-
-    pub fn column_mut(&mut self) -> &mut u32 {
-        &mut self.0.column
-    }
-}
-
-impl sum_tree::ContextLessSummary for TransformSummary {
-    fn zero() -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, other: &Self) {
-        self.input += &other.input;
-        self.output += &other.output;
-    }
-}
-
-impl<'a> sum_tree::Dimension<'a, TransformSummary> for TabPoint {
-    fn zero(_cx: ()) -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, summary: &'a TransformSummary, _: ()) {
-        self.0 += summary.input.lines;
-    }
-}
-
-impl sum_tree::SeekTarget<'_, TransformSummary, TransformSummary> for TabPoint {
-    #[ztracing::instrument(skip_all)]
-    fn cmp(&self, cursor_location: &TransformSummary, _: ()) -> std::cmp::Ordering {
-        Ord::cmp(&self.0, &cursor_location.input.lines)
-    }
-}
-
-impl<'a> sum_tree::Dimension<'a, TransformSummary> for WrapPoint {
-    fn zero(_cx: ()) -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, summary: &'a TransformSummary, _: ()) {
-        self.0 += summary.output.lines;
-    }
-}
-
-fn consolidate_wrap_edits(edits: Vec<WrapEdit>) -> Vec<WrapEdit> {
-    let _old_alloc_ptr = edits.as_ptr();
-    let mut wrap_edits = edits.into_iter();
-
-    if let Some(mut first_edit) = wrap_edits.next() {
-        // This code relies on reusing allocations from the Vec<_> - at the time of writing .flatten() prevents them.
-        #[allow(clippy::filter_map_identity)]
-        let mut v: Vec<_> = wrap_edits
-            .scan(&mut first_edit, |prev_edit, edit| {
-                if prev_edit.old.end >= edit.old.start {
-                    prev_edit.old.end = edit.old.end;
-                    prev_edit.new.end = edit.new.end;
-                    Some(None) // Skip this edit, it's merged
-                } else {
-                    let prev = std::mem::replace(*prev_edit, edit);
-                    Some(Some(prev)) // Yield the previous edit
-                }
-            })
-            .filter_map(|x| x)
-            .collect();
-        v.push(first_edit.clone());
-        debug_assert_eq!(v.as_ptr(), _old_alloc_ptr, "Wrap edits were reallocated");
-        v
-    } else {
-        vec![]
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::{
-        MultiBuffer,
-        display_map::{fold_map::FoldMap, inlay_map::InlayMap, tab_map::TabMap},
-        test::test_font,
-    };
-    use gpui::{LineFragment, px, test::observe};
-    use rand::prelude::*;
-    use settings::SettingsStore;
-    use smol::stream::StreamExt;
-    use std::{cmp, env, num::NonZeroU32};
-    use text::Rope;
-    use theme::LoadThemes;
-
-    #[gpui::test(iterations = 100)]
-    async fn test_random_wraps(cx: &mut gpui::TestAppContext, mut rng: StdRng) {
-        // todo this test is flaky
-        init_test(cx);
-
-        cx.background_executor.set_block_on_ticks(0..=50);
-        let operations = env::var("OPERATIONS")
-            .map(|i| i.parse().expect("invalid `OPERATIONS` variable"))
-            .unwrap_or(10);
-
-        let text_system = cx.read(|cx| cx.text_system().clone());
-        let mut wrap_width = if rng.random_bool(0.1) {
-            None
-        } else {
-            Some(px(rng.random_range(0.0..=1000.0)))
-        };
-        let tab_size = NonZeroU32::new(rng.random_range(1..=4)).unwrap();
-
-        let font = test_font();
-        let _font_id = text_system.resolve_font(&font);
-        let font_size = px(14.0);
-
-        log::info!("Tab size: {}", tab_size);
-        log::info!("Wrap width: {:?}", wrap_width);
-
-        let buffer = cx.update(|cx| {
-            if rng.random() {
-                MultiBuffer::build_random(&mut rng, cx)
-            } else {
-                let len = rng.random_range(0..10);
-                let text = util::RandomCharIter::new(&mut rng)
-                    .take(len)
-                    .collect::<String>();
-                MultiBuffer::build_simple(&text, cx)
-            }
-        });
-        let mut buffer_snapshot = buffer.read_with(cx, |buffer, cx| buffer.snapshot(cx));
-        log::info!("Buffer text: {:?}", buffer_snapshot.text());
-        let (mut inlay_map, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
-        log::info!("InlayMap text: {:?}", inlay_snapshot.text());
-        let (mut fold_map, fold_snapshot) = FoldMap::new(inlay_snapshot.clone());
-        log::info!("FoldMap text: {:?}", fold_snapshot.text());
-        let (mut tab_map, _) = TabMap::new(fold_snapshot.clone(), tab_size);
-        let tabs_snapshot = tab_map.set_max_expansion_column(32);
-        log::info!("TabMap text: {:?}", tabs_snapshot.text());
-
-        let mut line_wrapper = text_system.line_wrapper(font.clone(), font_size);
-        let expected_text = wrap_text(&tabs_snapshot, wrap_width, &mut line_wrapper);
-
-        let (wrap_map, _) =
-            cx.update(|cx| WrapMap::new(tabs_snapshot.clone(), font, font_size, wrap_width, cx));
-        let mut notifications = observe(&wrap_map, cx);
-
-        if wrap_map.read_with(cx, |map, _| map.is_rewrapping()) {
-            notifications.next().await.unwrap();
-        }
-
-        let (initial_snapshot, _) = wrap_map.update(cx, |map, cx| {
-            assert!(!map.is_rewrapping());
-            map.sync(tabs_snapshot.clone(), Vec::new(), cx)
-        });
-
-        let actual_text = initial_snapshot.text();
-        assert_eq!(
-            actual_text,
-            expected_text,
-            "unwrapped text is: {:?}",
-            tabs_snapshot.text()
-        );
-        log::info!("Wrapped text: {:?}", actual_text);
-
-        let mut next_inlay_id = 0;
-        let mut edits = Vec::new();
-        for _i in 0..operations {
-            log::info!("{} ==============================================", _i);
-
-            let mut buffer_edits = Vec::new();
-            match rng.random_range(0..=100) {
-                0..=19 => {
-                    wrap_width = if rng.random_bool(0.2) {
-                        None
-                    } else {
-                        Some(px(rng.random_range(0.0..=1000.0)))
-                    };
-                    log::info!("Setting wrap width to {:?}", wrap_width);
-                    wrap_map.update(cx, |map, cx| map.set_wrap_width(wrap_width, cx));
-                }
-                20..=39 => {
-                    for (fold_snapshot, fold_edits) in fold_map.randomly_mutate(&mut rng) {
-                        let (tabs_snapshot, tab_edits) =
-                            tab_map.sync(fold_snapshot, fold_edits, tab_size);
-                        let (mut snapshot, wrap_edits) =
-                            wrap_map.update(cx, |map, cx| map.sync(tabs_snapshot, tab_edits, cx));
-                        snapshot.check_invariants();
-                        snapshot.verify_chunks(&mut rng);
-                        edits.push((snapshot, wrap_edits));
-                    }
-                }
-                40..=59 => {
-                    let (inlay_snapshot, inlay_edits) =
-                        inlay_map.randomly_mutate(&mut next_inlay_id, &mut rng);
-                    let (fold_snapshot, fold_edits) = fold_map.read(inlay_snapshot, inlay_edits);
-                    let (tabs_snapshot, tab_edits) =
-                        tab_map.sync(fold_snapshot, fold_edits, tab_size);
-                    let (mut snapshot, wrap_edits) =
-                        wrap_map.update(cx, |map, cx| map.sync(tabs_snapshot, tab_edits, cx));
-                    snapshot.check_invariants();
-                    snapshot.verify_chunks(&mut rng);
-                    edits.push((snapshot, wrap_edits));
-                }
-                _ => {
-                    buffer.update(cx, |buffer, cx| {
-                        let subscription = buffer.subscribe();
-                        let edit_count = rng.random_range(1..=5);
-                        buffer.randomly_mutate(&mut rng, edit_count, cx);
-                        buffer_snapshot = buffer.snapshot(cx);
-                        buffer_edits.extend(subscription.consume());
-                    });
-                }
-            }
-
-            log::info!("Buffer text: {:?}", buffer_snapshot.text());
-            let (inlay_snapshot, inlay_edits) =
-                inlay_map.sync(buffer_snapshot.clone(), buffer_edits);
-            log::info!("InlayMap text: {:?}", inlay_snapshot.text());
-            let (fold_snapshot, fold_edits) = fold_map.read(inlay_snapshot, inlay_edits);
-            log::info!("FoldMap text: {:?}", fold_snapshot.text());
-            let (tabs_snapshot, tab_edits) = tab_map.sync(fold_snapshot, fold_edits, tab_size);
-            log::info!("TabMap text: {:?}", tabs_snapshot.text());
-
-            let expected_text = wrap_text(&tabs_snapshot, wrap_width, &mut line_wrapper);
-            let (mut snapshot, wrap_edits) =
-                wrap_map.update(cx, |map, cx| map.sync(tabs_snapshot.clone(), tab_edits, cx));
-            snapshot.check_invariants();
-            snapshot.verify_chunks(&mut rng);
-            edits.push((snapshot, wrap_edits));
-
-            if wrap_map.read_with(cx, |map, _| map.is_rewrapping()) && rng.random_bool(0.4) {
-                log::info!("Waiting for wrapping to finish");
-                while wrap_map.read_with(cx, |map, _| map.is_rewrapping()) {
-                    notifications.next().await.unwrap();
-                }
-                wrap_map.read_with(cx, |map, _| assert!(map.pending_edits.is_empty()));
-            }
-
-            if !wrap_map.read_with(cx, |map, _| map.is_rewrapping()) {
-                let (mut wrapped_snapshot, wrap_edits) = wrap_map.update(cx, |map, cx| {
-                    map.sync(tabs_snapshot.clone(), Vec::new(), cx)
-                });
-                let actual_text = wrapped_snapshot.text();
-                let actual_longest_row = wrapped_snapshot.longest_row();
-                log::info!("Wrapping finished: {:?}", actual_text);
-                wrapped_snapshot.check_invariants();
-                wrapped_snapshot.verify_chunks(&mut rng);
-                edits.push((wrapped_snapshot.clone(), wrap_edits));
-                assert_eq!(
-                    actual_text,
-                    expected_text,
-                    "unwrapped text is: {:?}",
-                    tabs_snapshot.text()
-                );
-
-                let mut summary = TextSummary::default();
-                for (ix, item) in wrapped_snapshot
-                    .transforms
-                    .items(())
-                    .into_iter()
-                    .enumerate()
-                {
-                    summary += &item.summary.output;
-                    log::info!("{} summary: {:?}", ix, item.summary.output,);
-                }
-
-                if tab_size.get() == 1
-                    || !wrapped_snapshot
-                        .tab_snapshot
-                        .fold_snapshot
-                        .text()
-                        .contains('\t')
-                {
-                    let mut expected_longest_rows = Vec::new();
-                    let mut longest_line_len = -1;
-                    for (row, line) in expected_text.split('\n').enumerate() {
-                        let line_char_count = line.chars().count() as isize;
-                        if line_char_count > longest_line_len {
-                            expected_longest_rows.clear();
-                            longest_line_len = line_char_count;
-                        }
-                        if line_char_count >= longest_line_len {
-                            expected_longest_rows.push(row as u32);
-                        }
-                    }
-
-                    assert!(
-                        expected_longest_rows.contains(&actual_longest_row),
-                        "incorrect longest row {}. expected {:?} with length {}",
-                        actual_longest_row,
-                        expected_longest_rows,
-                        longest_line_len,
-                    )
-                }
-            }
-        }
-
-        let mut initial_text = Rope::from(initial_snapshot.text().as_str());
-        for (snapshot, patch) in edits {
-            let snapshot_text = Rope::from(snapshot.text().as_str());
-            for edit in &patch {
-                let old_start = initial_text.point_to_offset(Point::new(edit.new.start.0, 0));
-                let old_end = initial_text.point_to_offset(cmp::min(
-                    Point::new(edit.new.start.0 + (edit.old.end - edit.old.start).0, 0),
-                    initial_text.max_point(),
-                ));
-                let new_start = snapshot_text.point_to_offset(Point::new(edit.new.start.0, 0));
-                let new_end = snapshot_text.point_to_offset(cmp::min(
-                    Point::new(edit.new.end.0, 0),
-                    snapshot_text.max_point(),
-                ));
-                let new_text = snapshot_text
-                    .chunks_in_range(new_start..new_end)
-                    .collect::<String>();
-
-                initial_text.replace(old_start..old_end, &new_text);
-            }
-            assert_eq!(initial_text.to_string(), snapshot_text.to_string());
-        }
-
-        if wrap_map.read_with(cx, |map, _| map.is_rewrapping()) {
-            log::info!("Waiting for wrapping to finish");
-            while wrap_map.read_with(cx, |map, _| map.is_rewrapping()) {
-                notifications.next().await.unwrap();
-            }
-        }
-        wrap_map.read_with(cx, |map, _| assert!(map.pending_edits.is_empty()));
-    }
-
-    fn init_test(cx: &mut gpui::TestAppContext) {
-        cx.update(|cx| {
-            let settings = SettingsStore::test(cx);
-            cx.set_global(settings);
-            theme::init(LoadThemes::JustBase, cx);
-        });
-    }
-
-    fn wrap_text(
-        tab_snapshot: &TabSnapshot,
-        wrap_width: Option<Pixels>,
-        line_wrapper: &mut LineWrapper,
-    ) -> String {
-        if let Some(wrap_width) = wrap_width {
-            let mut wrapped_text = String::new();
-            for (row, line) in tab_snapshot.text().split('\n').enumerate() {
-                if row > 0 {
-                    wrapped_text.push('\n');
-                }
-
-                let mut prev_ix = 0;
-                for boundary in line_wrapper.wrap_line(&[LineFragment::text(line)], wrap_width) {
-                    wrapped_text.push_str(&line[prev_ix..boundary.ix]);
-                    wrapped_text.push('\n');
-                    wrapped_text.push_str(&" ".repeat(boundary.next_indent as usize));
-                    prev_ix = boundary.ix;
-                }
-                wrapped_text.push_str(&line[prev_ix..]);
-            }
-
-            wrapped_text
-        } else {
-            tab_snapshot.text()
-        }
-    }
-
-    impl WrapSnapshot {
-        fn verify_chunks(&mut self, rng: &mut impl Rng) {
-            for _ in 0..5 {
-                let mut end_row = rng.random_range(0..=self.max_point().row().0);
-                let start_row = rng.random_range(0..=end_row);
-                end_row += 1;
-
-                let mut expected_text = self.text_chunks(WrapRow(start_row)).collect::<String>();
-                if expected_text.ends_with('\n') {
-                    expected_text.push('\n');
-                }
-                let mut expected_text = expected_text
-                    .lines()
-                    .take((end_row - start_row) as usize)
-                    .collect::<Vec<_>>()
-                    .join("\n");
-                if end_row <= self.max_point().row().0 {
-                    expected_text.push('\n');
-                }
-
-                let actual_text = self
-                    .chunks(
-                        WrapRow(start_row)..WrapRow(end_row),
-                        true,
-                        Highlights::default(),
-                    )
-                    .map(|c| c.text)
-                    .collect::<String>();
-                assert_eq!(
-                    expected_text,
-                    actual_text,
-                    "chunks != highlighted_chunks for rows {:?}",
-                    start_row..end_row
-                );
-            }
-        }
-    }
-}
diff --git a/crates/editor/src/edit_prediction_tests.rs b/crates/editor/src/edit_prediction_tests.rs
deleted file mode 100644
index bfce1532ce..0000000000
--- a/crates/editor/src/edit_prediction_tests.rs
+++ /dev/null
@@ -1,585 +0,0 @@
-use edit_prediction_types::EditPredictionDelegate;
-use gpui::{Entity, KeyBinding, Modifiers, prelude::*};
-use indoc::indoc;
-use multi_buffer::{Anchor, MultiBufferSnapshot, ToPoint};
-use std::{ops::Range, sync::Arc};
-use text::{Point, ToOffset};
-
-use crate::{
-    AcceptEditPrediction, EditPrediction, MenuEditPredictionsPolicy, editor_tests::init_test,
-    test::editor_test_context::EditorTestContext,
-};
-
-#[gpui::test]
-async fn test_edit_prediction_insert(cx: &mut gpui::TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-    let provider = cx.new(|_| FakeEditPredictionDelegate::default());
-    assign_editor_completion_provider(provider.clone(), &mut cx);
-    cx.set_state("let absolute_zero_celsius = ˇ;");
-
-    propose_edits(&provider, vec![(28..28, "-273.15")], &mut cx);
-    cx.update_editor(|editor, window, cx| editor.update_visible_edit_prediction(window, cx));
-
-    assert_editor_active_edit_completion(&mut cx, |_, edits| {
-        assert_eq!(edits.len(), 1);
-        assert_eq!(edits[0].1.as_ref(), "-273.15");
-    });
-
-    accept_completion(&mut cx);
-
-    cx.assert_editor_state("let absolute_zero_celsius = -273.15ˇ;")
-}
-
-#[gpui::test]
-async fn test_edit_prediction_modification(cx: &mut gpui::TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-    let provider = cx.new(|_| FakeEditPredictionDelegate::default());
-    assign_editor_completion_provider(provider.clone(), &mut cx);
-    cx.set_state("let pi = ˇ\"foo\";");
-
-    propose_edits(&provider, vec![(9..14, "3.14159")], &mut cx);
-    cx.update_editor(|editor, window, cx| editor.update_visible_edit_prediction(window, cx));
-
-    assert_editor_active_edit_completion(&mut cx, |_, edits| {
-        assert_eq!(edits.len(), 1);
-        assert_eq!(edits[0].1.as_ref(), "3.14159");
-    });
-
-    accept_completion(&mut cx);
-
-    cx.assert_editor_state("let pi = 3.14159ˇ;")
-}
-
-#[gpui::test]
-async fn test_edit_prediction_jump_button(cx: &mut gpui::TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-    let provider = cx.new(|_| FakeEditPredictionDelegate::default());
-    assign_editor_completion_provider(provider.clone(), &mut cx);
-
-    // Cursor is 2+ lines above the proposed edit
-    cx.set_state(indoc! {"
-        line 0
-        line ˇ1
-        line 2
-        line 3
-        line
-    "});
-
-    propose_edits(
-        &provider,
-        vec![(Point::new(4, 3)..Point::new(4, 3), " 4")],
-        &mut cx,
-    );
-
-    cx.update_editor(|editor, window, cx| editor.update_visible_edit_prediction(window, cx));
-    assert_editor_active_move_completion(&mut cx, |snapshot, move_target| {
-        assert_eq!(move_target.to_point(&snapshot), Point::new(4, 3));
-    });
-
-    // When accepting, cursor is moved to the proposed location
-    accept_completion(&mut cx);
-    cx.assert_editor_state(indoc! {"
-        line 0
-        line 1
-        line 2
-        line 3
-        linˇe
-    "});
-
-    // Cursor is 2+ lines below the proposed edit
-    cx.set_state(indoc! {"
-        line 0
-        line
-        line 2
-        line 3
-        line ˇ4
-    "});
-
-    propose_edits(
-        &provider,
-        vec![(Point::new(1, 3)..Point::new(1, 3), " 1")],
-        &mut cx,
-    );
-
-    cx.update_editor(|editor, window, cx| editor.update_visible_edit_prediction(window, cx));
-    assert_editor_active_move_completion(&mut cx, |snapshot, move_target| {
-        assert_eq!(move_target.to_point(&snapshot), Point::new(1, 3));
-    });
-
-    // When accepting, cursor is moved to the proposed location
-    accept_completion(&mut cx);
-    cx.assert_editor_state(indoc! {"
-        line 0
-        linˇe
-        line 2
-        line 3
-        line 4
-    "});
-}
-
-#[gpui::test]
-async fn test_edit_prediction_invalidation_range(cx: &mut gpui::TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-    let provider = cx.new(|_| FakeEditPredictionDelegate::default());
-    assign_editor_completion_provider(provider.clone(), &mut cx);
-
-    // Cursor is 3+ lines above the proposed edit
-    cx.set_state(indoc! {"
-        line 0
-        line ˇ1
-        line 2
-        line 3
-        line 4
-        line
-    "});
-    let edit_location = Point::new(5, 3);
-
-    propose_edits(
-        &provider,
-        vec![(edit_location..edit_location, " 5")],
-        &mut cx,
-    );
-
-    cx.update_editor(|editor, window, cx| editor.update_visible_edit_prediction(window, cx));
-    assert_editor_active_move_completion(&mut cx, |snapshot, move_target| {
-        assert_eq!(move_target.to_point(&snapshot), edit_location);
-    });
-
-    // If we move *towards* the completion, it stays active
-    cx.set_selections_state(indoc! {"
-        line 0
-        line 1
-        line ˇ2
-        line 3
-        line 4
-        line
-    "});
-    assert_editor_active_move_completion(&mut cx, |snapshot, move_target| {
-        assert_eq!(move_target.to_point(&snapshot), edit_location);
-    });
-
-    // If we move *away* from the completion, it is discarded
-    cx.set_selections_state(indoc! {"
-        line ˇ0
-        line 1
-        line 2
-        line 3
-        line 4
-        line
-    "});
-    cx.editor(|editor, _, _| {
-        assert!(editor.active_edit_prediction.is_none());
-    });
-
-    // Cursor is 3+ lines below the proposed edit
-    cx.set_state(indoc! {"
-        line
-        line 1
-        line 2
-        line 3
-        line ˇ4
-        line 5
-    "});
-    let edit_location = Point::new(0, 3);
-
-    propose_edits(
-        &provider,
-        vec![(edit_location..edit_location, " 0")],
-        &mut cx,
-    );
-
-    cx.update_editor(|editor, window, cx| editor.update_visible_edit_prediction(window, cx));
-    assert_editor_active_move_completion(&mut cx, |snapshot, move_target| {
-        assert_eq!(move_target.to_point(&snapshot), edit_location);
-    });
-
-    // If we move *towards* the completion, it stays active
-    cx.set_selections_state(indoc! {"
-        line
-        line 1
-        line 2
-        line ˇ3
-        line 4
-        line 5
-    "});
-    assert_editor_active_move_completion(&mut cx, |snapshot, move_target| {
-        assert_eq!(move_target.to_point(&snapshot), edit_location);
-    });
-
-    // If we move *away* from the completion, it is discarded
-    cx.set_selections_state(indoc! {"
-        line
-        line 1
-        line 2
-        line 3
-        line 4
-        line ˇ5
-    "});
-    cx.editor(|editor, _, _| {
-        assert!(editor.active_edit_prediction.is_none());
-    });
-}
-
-#[gpui::test]
-async fn test_edit_prediction_jump_disabled_for_non_zed_providers(cx: &mut gpui::TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-    let provider = cx.new(|_| FakeNonZedEditPredictionDelegate::default());
-    assign_editor_completion_provider_non_zed(provider.clone(), &mut cx);
-
-    // Cursor is 2+ lines above the proposed edit
-    cx.set_state(indoc! {"
-        line 0
-        line ˇ1
-        line 2
-        line 3
-        line
-    "});
-
-    propose_edits_non_zed(
-        &provider,
-        vec![(Point::new(4, 3)..Point::new(4, 3), " 4")],
-        &mut cx,
-    );
-
-    cx.update_editor(|editor, window, cx| editor.update_visible_edit_prediction(window, cx));
-
-    // For non-Zed providers, there should be no move completion (jump functionality disabled)
-    cx.editor(|editor, _, _| {
-        if let Some(completion_state) = &editor.active_edit_prediction {
-            // Should be an Edit prediction, not a Move prediction
-            match &completion_state.completion {
-                EditPrediction::Edit { .. } => {
-                    // This is expected for non-Zed providers
-                }
-                EditPrediction::MoveWithin { .. } | EditPrediction::MoveOutside { .. } => {
-                    panic!(
-                        "Non-Zed providers should not show Move predictions (jump functionality)"
-                    );
-                }
-            }
-        }
-    });
-}
-
-#[gpui::test]
-async fn test_edit_prediction_preview_cleanup_on_toggle_off(cx: &mut gpui::TestAppContext) {
-    init_test(cx, |_| {});
-
-    // Bind `ctrl-shift-a` to accept the provided edit prediction. The actual key
-    // binding here doesn't matter, we simply need to confirm that holding the
-    // binding's modifiers triggers the edit prediction preview.
-    cx.update(|cx| cx.bind_keys([KeyBinding::new("ctrl-shift-a", AcceptEditPrediction, None)]));
-
-    let mut cx = EditorTestContext::new(cx).await;
-    let provider = cx.new(|_| FakeEditPredictionDelegate::default());
-    assign_editor_completion_provider(provider.clone(), &mut cx);
-    cx.set_state("let x = ˇ;");
-
-    propose_edits(&provider, vec![(8..8, "42")], &mut cx);
-    cx.update_editor(|editor, window, cx| {
-        editor.set_menu_edit_predictions_policy(MenuEditPredictionsPolicy::ByProvider);
-        editor.update_visible_edit_prediction(window, cx)
-    });
-
-    cx.editor(|editor, _, _| {
-        assert!(editor.has_active_edit_prediction());
-    });
-
-    // Simulate pressing the modifiers for `AcceptEditPrediction`, namely
-    // `ctrl-shift`, so that we can confirm that the edit prediction preview is
-    // activated.
-    let modifiers = Modifiers::control_shift();
-    cx.simulate_modifiers_change(modifiers);
-    cx.run_until_parked();
-
-    cx.editor(|editor, _, _| {
-        assert!(editor.edit_prediction_preview_is_active());
-    });
-
-    // Disable showing edit predictions without issuing a new modifiers changed
-    // event, to confirm that the edit prediction preview is still active.
-    cx.update_editor(|editor, window, cx| {
-        editor.set_show_edit_predictions(Some(false), window, cx);
-    });
-
-    cx.editor(|editor, _, _| {
-        assert!(!editor.has_active_edit_prediction());
-        assert!(editor.edit_prediction_preview_is_active());
-    });
-
-    // Now release the modifiers
-    // Simulate releasing all modifiers, ensuring that even with edit prediction
-    // disabled, the edit prediction preview is cleaned up.
-    cx.simulate_modifiers_change(Modifiers::none());
-    cx.run_until_parked();
-
-    cx.editor(|editor, _, _| {
-        assert!(!editor.edit_prediction_preview_is_active());
-    });
-}
-
-fn assert_editor_active_edit_completion(
-    cx: &mut EditorTestContext,
-    assert: impl FnOnce(MultiBufferSnapshot, &Vec<(Range<Anchor>, Arc<str>)>),
-) {
-    cx.editor(|editor, _, cx| {
-        let completion_state = editor
-            .active_edit_prediction
-            .as_ref()
-            .expect("editor has no active completion");
-
-        if let EditPrediction::Edit { edits, .. } = &completion_state.completion {
-            assert(editor.buffer().read(cx).snapshot(cx), edits);
-        } else {
-            panic!("expected edit completion");
-        }
-    })
-}
-
-fn assert_editor_active_move_completion(
-    cx: &mut EditorTestContext,
-    assert: impl FnOnce(MultiBufferSnapshot, Anchor),
-) {
-    cx.editor(|editor, _, cx| {
-        let completion_state = editor
-            .active_edit_prediction
-            .as_ref()
-            .expect("editor has no active completion");
-
-        if let EditPrediction::MoveWithin { target, .. } = &completion_state.completion {
-            assert(editor.buffer().read(cx).snapshot(cx), *target);
-        } else {
-            panic!("expected move completion");
-        }
-    })
-}
-
-fn accept_completion(cx: &mut EditorTestContext) {
-    cx.update_editor(|editor, window, cx| {
-        editor.accept_edit_prediction(&crate::AcceptEditPrediction, window, cx)
-    })
-}
-
-fn propose_edits<T: ToOffset>(
-    provider: &Entity<FakeEditPredictionDelegate>,
-    edits: Vec<(Range<T>, &str)>,
-    cx: &mut EditorTestContext,
-) {
-    let snapshot = cx.buffer_snapshot();
-    let edits = edits.into_iter().map(|(range, text)| {
-        let range = snapshot.anchor_after(range.start)..snapshot.anchor_before(range.end);
-        (range, text.into())
-    });
-
-    cx.update(|_, cx| {
-        provider.update(cx, |provider, _| {
-            provider.set_edit_prediction(Some(edit_prediction_types::EditPrediction::Local {
-                id: None,
-                edits: edits.collect(),
-                edit_preview: None,
-            }))
-        })
-    });
-}
-
-fn assign_editor_completion_provider(
-    provider: Entity<FakeEditPredictionDelegate>,
-    cx: &mut EditorTestContext,
-) {
-    cx.update_editor(|editor, window, cx| {
-        editor.set_edit_prediction_provider(Some(provider), window, cx);
-    })
-}
-
-fn propose_edits_non_zed<T: ToOffset>(
-    provider: &Entity<FakeNonZedEditPredictionDelegate>,
-    edits: Vec<(Range<T>, &str)>,
-    cx: &mut EditorTestContext,
-) {
-    let snapshot = cx.buffer_snapshot();
-    let edits = edits.into_iter().map(|(range, text)| {
-        let range = snapshot.anchor_after(range.start)..snapshot.anchor_before(range.end);
-        (range, text.into())
-    });
-
-    cx.update(|_, cx| {
-        provider.update(cx, |provider, _| {
-            provider.set_edit_prediction(Some(edit_prediction_types::EditPrediction::Local {
-                id: None,
-                edits: edits.collect(),
-                edit_preview: None,
-            }))
-        })
-    });
-}
-
-fn assign_editor_completion_provider_non_zed(
-    provider: Entity<FakeNonZedEditPredictionDelegate>,
-    cx: &mut EditorTestContext,
-) {
-    cx.update_editor(|editor, window, cx| {
-        editor.set_edit_prediction_provider(Some(provider), window, cx);
-    })
-}
-
-#[derive(Default, Clone)]
-pub struct FakeEditPredictionDelegate {
-    pub completion: Option<edit_prediction_types::EditPrediction>,
-}
-
-impl FakeEditPredictionDelegate {
-    pub fn set_edit_prediction(
-        &mut self,
-        completion: Option<edit_prediction_types::EditPrediction>,
-    ) {
-        self.completion = completion;
-    }
-}
-
-impl EditPredictionDelegate for FakeEditPredictionDelegate {
-    fn name() -> &'static str {
-        "fake-completion-provider"
-    }
-
-    fn display_name() -> &'static str {
-        "Fake Completion Provider"
-    }
-
-    fn show_predictions_in_menu() -> bool {
-        true
-    }
-
-    fn supports_jump_to_edit() -> bool {
-        true
-    }
-
-    fn is_enabled(
-        &self,
-        _buffer: &gpui::Entity<language::Buffer>,
-        _cursor_position: language::Anchor,
-        _cx: &gpui::App,
-    ) -> bool {
-        true
-    }
-
-    fn is_refreshing(&self, _cx: &gpui::App) -> bool {
-        false
-    }
-
-    fn refresh(
-        &mut self,
-        _buffer: gpui::Entity<language::Buffer>,
-        _cursor_position: language::Anchor,
-        _debounce: bool,
-        _cx: &mut gpui::Context<Self>,
-    ) {
-    }
-
-    fn cycle(
-        &mut self,
-        _buffer: gpui::Entity<language::Buffer>,
-        _cursor_position: language::Anchor,
-        _direction: edit_prediction_types::Direction,
-        _cx: &mut gpui::Context<Self>,
-    ) {
-    }
-
-    fn accept(&mut self, _cx: &mut gpui::Context<Self>) {}
-
-    fn discard(&mut self, _cx: &mut gpui::Context<Self>) {}
-
-    fn suggest<'a>(
-        &mut self,
-        _buffer: &gpui::Entity<language::Buffer>,
-        _cursor_position: language::Anchor,
-        _cx: &mut gpui::Context<Self>,
-    ) -> Option<edit_prediction_types::EditPrediction> {
-        self.completion.clone()
-    }
-}
-
-#[derive(Default, Clone)]
-pub struct FakeNonZedEditPredictionDelegate {
-    pub completion: Option<edit_prediction_types::EditPrediction>,
-}
-
-impl FakeNonZedEditPredictionDelegate {
-    pub fn set_edit_prediction(
-        &mut self,
-        completion: Option<edit_prediction_types::EditPrediction>,
-    ) {
-        self.completion = completion;
-    }
-}
-
-impl EditPredictionDelegate for FakeNonZedEditPredictionDelegate {
-    fn name() -> &'static str {
-        "fake-non-zed-provider"
-    }
-
-    fn display_name() -> &'static str {
-        "Fake Non-Zed Provider"
-    }
-
-    fn show_predictions_in_menu() -> bool {
-        false
-    }
-
-    fn supports_jump_to_edit() -> bool {
-        false
-    }
-
-    fn is_enabled(
-        &self,
-        _buffer: &gpui::Entity<language::Buffer>,
-        _cursor_position: language::Anchor,
-        _cx: &gpui::App,
-    ) -> bool {
-        true
-    }
-
-    fn is_refreshing(&self, _cx: &gpui::App) -> bool {
-        false
-    }
-
-    fn refresh(
-        &mut self,
-        _buffer: gpui::Entity<language::Buffer>,
-        _cursor_position: language::Anchor,
-        _debounce: bool,
-        _cx: &mut gpui::Context<Self>,
-    ) {
-    }
-
-    fn cycle(
-        &mut self,
-        _buffer: gpui::Entity<language::Buffer>,
-        _cursor_position: language::Anchor,
-        _direction: edit_prediction_types::Direction,
-        _cx: &mut gpui::Context<Self>,
-    ) {
-    }
-
-    fn accept(&mut self, _cx: &mut gpui::Context<Self>) {}
-
-    fn discard(&mut self, _cx: &mut gpui::Context<Self>) {}
-
-    fn suggest<'a>(
-        &mut self,
-        _buffer: &gpui::Entity<language::Buffer>,
-        _cursor_position: language::Anchor,
-        _cx: &mut gpui::Context<Self>,
-    ) -> Option<edit_prediction_types::EditPrediction> {
-        self.completion.clone()
-    }
-}
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
deleted file mode 100644
index cddb20d83e..0000000000
--- a/crates/editor/src/editor.rs
+++ /dev/null
@@ -1,26162 +0,0 @@
-#![allow(rustdoc::private_intra_doc_links)]
-//! This is the place where everything editor-related is stored (data-wise) and displayed (ui-wise).
-//! The main point of interest in this crate is [`Editor`] type, which is used in every other Zed part as a user input element.
-//! It comes in different flavors: single line, multiline and a fixed height one.
-//!
-//! Editor contains of multiple large submodules:
-//! * [`element`] — the place where all rendering happens
-//! * [`display_map`] - chunks up text in the editor into the logical blocks, establishes coordinates and mapping between each of them.
-//!   Contains all metadata related to text transformations (folds, fake inlay text insertions, soft wraps, tab markup, etc.).
-//!
-//! All other submodules and structs are mostly concerned with holding editor data about the way it displays current buffer region(s).
-//!
-//! If you're looking to improve Vim mode, you should check out Vim crate that wraps Editor and overrides its behavior.
-pub mod actions;
-pub mod blink_manager;
-mod bracket_colorization;
-mod clangd_ext;
-pub mod code_context_menus;
-pub mod display_map;
-mod editor_settings;
-mod element;
-mod git;
-mod highlight_matching_bracket;
-mod hover_links;
-pub mod hover_popover;
-mod indent_guides;
-mod inlays;
-pub mod items;
-mod jsx_tag_auto_close;
-mod linked_editing_ranges;
-mod lsp_colors;
-mod lsp_ext;
-mod mouse_context_menu;
-pub mod movement;
-mod persistence;
-mod rust_analyzer_ext;
-pub mod scroll;
-mod selections_collection;
-mod split;
-pub mod tasks;
-
-#[cfg(test)]
-mod code_completion_tests;
-#[cfg(test)]
-mod edit_prediction_tests;
-#[cfg(test)]
-mod editor_tests;
-mod signature_help;
-#[cfg(any(test, feature = "test-support"))]
-pub mod test;
-
-pub(crate) use actions::*;
-pub use display_map::{ChunkRenderer, ChunkRendererContext, DisplayPoint, FoldPlaceholder};
-pub use edit_prediction_types::Direction;
-pub use editor_settings::{
-    CurrentLineHighlight, DocumentColorsRenderMode, EditorSettings, HideMouseMode,
-    ScrollBeyondLastLine, ScrollbarAxes, SearchSettings, ShowMinimap,
-};
-pub use element::{
-    CursorLayout, EditorElement, HighlightedRange, HighlightedRangeLine, PointForPosition,
-};
-pub use git::blame::BlameRenderer;
-pub use hover_popover::hover_markdown_style;
-pub use inlays::Inlay;
-pub use items::MAX_TAB_TITLE_LEN;
-pub use lsp::CompletionContext;
-pub use lsp_ext::lsp_tasks;
-pub use multi_buffer::{
-    Anchor, AnchorRangeExt, BufferOffset, ExcerptId, ExcerptRange, MBTextSummary, MultiBuffer,
-    MultiBufferOffset, MultiBufferOffsetUtf16, MultiBufferSnapshot, PathKey, RowInfo, ToOffset,
-    ToPoint,
-};
-pub use split::SplittableEditor;
-pub use text::Bias;
-
-use ::git::{
-    Restore,
-    blame::{BlameEntry, ParsedCommitMessage},
-    status::FileStatus,
-};
-use aho_corasick::{AhoCorasick, AhoCorasickBuilder, BuildError};
-use anyhow::{Context as _, Result, anyhow, bail};
-use blink_manager::BlinkManager;
-use buffer_diff::DiffHunkStatus;
-use client::{Collaborator, ParticipantIndex, parse_zed_link};
-use clock::ReplicaId;
-use code_context_menus::{
-    AvailableCodeAction, CodeActionContents, CodeActionsItem, CodeActionsMenu, CodeContextMenu,
-    CompletionsMenu, ContextMenuOrigin,
-};
-use collections::{BTreeMap, HashMap, HashSet, VecDeque};
-use convert_case::{Case, Casing};
-use dap::TelemetrySpawnLocation;
-use display_map::*;
-use edit_prediction_types::{EditPredictionDelegate, EditPredictionDelegateHandle};
-use editor_settings::{GoToDefinitionFallback, Minimap as MinimapSettings};
-use element::{AcceptEditPredictionBinding, LineWithInvisibles, PositionMap, layout_line};
-use futures::{
-    FutureExt, StreamExt as _,
-    future::{self, Shared, join},
-    stream::FuturesUnordered,
-};
-use fuzzy::{StringMatch, StringMatchCandidate};
-use git::blame::{GitBlame, GlobalBlameRenderer};
-use gpui::{
-    Action, Animation, AnimationExt, AnyElement, App, AppContext, AsyncWindowContext,
-    AvailableSpace, Background, Bounds, ClickEvent, ClipboardEntry, ClipboardItem, Context,
-    DispatchPhase, Edges, Entity, EntityInputHandler, EventEmitter, FocusHandle, FocusOutEvent,
-    Focusable, FontId, FontWeight, Global, HighlightStyle, Hsla, KeyContext, Modifiers,
-    MouseButton, MouseDownEvent, MouseMoveEvent, PaintQuad, ParentElement, Pixels, Render,
-    ScrollHandle, SharedString, Size, Stateful, Styled, Subscription, Task, TextRun, TextStyle,
-    TextStyleRefinement, UTF16Selection, UnderlineStyle, UniformListScrollHandle, WeakEntity,
-    WeakFocusHandle, Window, div, point, prelude::*, pulsating_between, px, relative, size,
-};
-use hover_links::{HoverLink, HoveredLinkState, find_file};
-use hover_popover::{HoverState, hide_hover};
-use indent_guides::ActiveIndentGuidesState;
-use inlays::{InlaySplice, inlay_hints::InlayHintRefreshReason};
-use itertools::{Either, Itertools};
-use language::{
-    AutoindentMode, BlockCommentConfig, BracketMatch, BracketPair, Buffer, BufferRow,
-    BufferSnapshot, Capability, CharClassifier, CharKind, CharScopeContext, CodeLabel, CursorShape,
-    DiagnosticEntryRef, DiffOptions, EditPredictionsMode, EditPreview, HighlightedText, IndentKind,
-    IndentSize, Language, LanguageName, LanguageRegistry, OffsetRangeExt, OutlineItem, Point,
-    Runnable, Selection, SelectionGoal, TextObject, TransactionId, TreeSitterOptions, WordsQuery,
-    language_settings::{
-        self, LanguageSettings, LspInsertMode, RewrapBehavior, WordsCompletionMode,
-        all_language_settings, language_settings,
-    },
-    point_from_lsp, point_to_lsp, text_diff_with_options,
-};
-use linked_editing_ranges::refresh_linked_ranges;
-use lsp::{
-    CodeActionKind, CompletionItemKind, CompletionTriggerKind, InsertTextFormat, InsertTextMode,
-    LanguageServerId,
-};
-use lsp_colors::LspColorData;
-use markdown::Markdown;
-use mouse_context_menu::MouseContextMenu;
-use movement::TextLayoutDetails;
-use multi_buffer::{
-    ExcerptInfo, ExpandExcerptDirection, MultiBufferDiffHunk, MultiBufferPoint, MultiBufferRow,
-};
-use parking_lot::Mutex;
-use persistence::DB;
-use project::{
-    BreakpointWithPosition, CodeAction, Completion, CompletionDisplayOptions, CompletionIntent,
-    CompletionResponse, CompletionSource, DisableAiSettings, DocumentHighlight, InlayHint, InlayId,
-    InvalidationStrategy, Location, LocationLink, LspAction, PrepareRenameResponse, Project,
-    ProjectItem, ProjectPath, ProjectTransaction, TaskSourceKind,
-    debugger::{
-        breakpoint_store::{
-            Breakpoint, BreakpointEditAction, BreakpointSessionState, BreakpointState,
-            BreakpointStore, BreakpointStoreEvent,
-        },
-        session::{Session, SessionEvent},
-    },
-    git_store::GitStoreEvent,
-    lsp_store::{
-        CacheInlayHints, CompletionDocumentation, FormatTrigger, LspFormatTarget,
-        OpenLspBufferHandle,
-    },
-    project_settings::{DiagnosticSeverity, GoToDiagnosticSeverityFilter, ProjectSettings},
-};
-use rand::seq::SliceRandom;
-use rpc::{ErrorCode, ErrorExt, proto::PeerId};
-use scroll::{Autoscroll, OngoingScroll, ScrollAnchor, ScrollManager};
-use selections_collection::{MutableSelectionsCollection, SelectionsCollection};
-use serde::{Deserialize, Serialize};
-use settings::{
-    GitGutterSetting, RelativeLineNumbers, Settings, SettingsLocation, SettingsStore,
-    update_settings_file,
-};
-use smallvec::{SmallVec, smallvec};
-use snippet::Snippet;
-use std::{
-    any::{Any, TypeId},
-    borrow::Cow,
-    cell::{OnceCell, RefCell},
-    cmp::{self, Ordering, Reverse},
-    collections::hash_map,
-    iter::{self, Peekable},
-    mem,
-    num::NonZeroU32,
-    ops::{ControlFlow, Deref, DerefMut, Not, Range, RangeInclusive},
-    path::{Path, PathBuf},
-    rc::Rc,
-    sync::Arc,
-    time::{Duration, Instant},
-};
-use task::{ResolvedTask, RunnableTag, TaskTemplate, TaskVariables};
-use text::{BufferId, FromAnchor, OffsetUtf16, Rope, ToOffset as _};
-use theme::{
-    AccentColors, ActiveTheme, PlayerColor, StatusColors, SyntaxTheme, Theme, ThemeSettings,
-    observe_buffer_font_size_adjustment,
-};
-use ui::{
-    ButtonSize, ButtonStyle, ContextMenu, Disclosure, IconButton, IconButtonShape, IconName,
-    IconSize, Indicator, Key, Tooltip, h_flex, prelude::*, scrollbars::ScrollbarAutoHide,
-};
-use util::{RangeExt, ResultExt, TryFutureExt, maybe, post_inc};
-use workspace::{
-    CollaboratorId, Item as WorkspaceItem, ItemId, ItemNavHistory, OpenInTerminal, OpenTerminal,
-    RestoreOnStartupBehavior, SERIALIZATION_THROTTLE_TIME, SplitDirection, TabBarSettings, Toast,
-    ViewId, Workspace, WorkspaceId, WorkspaceSettings,
-    item::{ItemBufferKind, ItemHandle, PreviewTabsSettings, SaveOptions},
-    notifications::{DetachAndPromptErr, NotificationId, NotifyTaskExt},
-    searchable::SearchEvent,
-};
-
-use crate::{
-    code_context_menus::CompletionsMenuSource,
-    editor_settings::MultiCursorModifier,
-    hover_links::{find_url, find_url_from_range},
-    inlays::{
-        InlineValueCache,
-        inlay_hints::{LspInlayHintData, inlay_hint_settings},
-    },
-    scroll::{ScrollOffset, ScrollPixelOffset},
-    selections_collection::resolve_selections_wrapping_blocks,
-    signature_help::{SignatureHelpHiddenBy, SignatureHelpState},
-};
-
-pub const FILE_HEADER_HEIGHT: u32 = 2;
-pub const MULTI_BUFFER_EXCERPT_HEADER_HEIGHT: u32 = 1;
-const CURSOR_BLINK_INTERVAL: Duration = Duration::from_millis(500);
-const MAX_LINE_LEN: usize = 1024;
-const MIN_NAVIGATION_HISTORY_ROW_DELTA: i64 = 10;
-const MAX_SELECTION_HISTORY_LEN: usize = 1024;
-pub(crate) const CURSORS_VISIBLE_FOR: Duration = Duration::from_millis(2000);
-#[doc(hidden)]
-pub const CODE_ACTIONS_DEBOUNCE_TIMEOUT: Duration = Duration::from_millis(250);
-pub const SELECTION_HIGHLIGHT_DEBOUNCE_TIMEOUT: Duration = Duration::from_millis(100);
-
-pub(crate) const CODE_ACTION_TIMEOUT: Duration = Duration::from_secs(5);
-pub(crate) const FORMAT_TIMEOUT: Duration = Duration::from_secs(5);
-pub(crate) const SCROLL_CENTER_TOP_BOTTOM_DEBOUNCE_TIMEOUT: Duration = Duration::from_secs(1);
-pub const FETCH_COLORS_DEBOUNCE_TIMEOUT: Duration = Duration::from_millis(150);
-
-pub(crate) const EDIT_PREDICTION_KEY_CONTEXT: &str = "edit_prediction";
-pub(crate) const EDIT_PREDICTION_CONFLICT_KEY_CONTEXT: &str = "edit_prediction_conflict";
-pub(crate) const MINIMAP_FONT_SIZE: AbsoluteLength = AbsoluteLength::Pixels(px(2.));
-
-pub type RenderDiffHunkControlsFn = Arc<
-    dyn Fn(
-        u32,
-        &DiffHunkStatus,
-        Range<Anchor>,
-        bool,
-        Pixels,
-        &Entity<Editor>,
-        &mut Window,
-        &mut App,
-    ) -> AnyElement,
->;
-
-enum ReportEditorEvent {
-    Saved { auto_saved: bool },
-    EditorOpened,
-    Closed,
-}
-
-impl ReportEditorEvent {
-    pub fn event_type(&self) -> &'static str {
-        match self {
-            Self::Saved { .. } => "Editor Saved",
-            Self::EditorOpened => "Editor Opened",
-            Self::Closed => "Editor Closed",
-        }
-    }
-}
-
-pub enum ActiveDebugLine {}
-pub enum DebugStackFrameLine {}
-enum DocumentHighlightRead {}
-enum DocumentHighlightWrite {}
-enum InputComposition {}
-pub enum PendingInput {}
-enum SelectedTextHighlight {}
-
-pub enum ConflictsOuter {}
-pub enum ConflictsOurs {}
-pub enum ConflictsTheirs {}
-pub enum ConflictsOursMarker {}
-pub enum ConflictsTheirsMarker {}
-
-pub struct HunkAddedColor;
-pub struct HunkRemovedColor;
-
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
-pub enum Navigated {
-    Yes,
-    No,
-}
-
-impl Navigated {
-    pub fn from_bool(yes: bool) -> Navigated {
-        if yes { Navigated::Yes } else { Navigated::No }
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-enum DisplayDiffHunk {
-    Folded {
-        display_row: DisplayRow,
-    },
-    Unfolded {
-        is_created_file: bool,
-        diff_base_byte_range: Range<usize>,
-        display_row_range: Range<DisplayRow>,
-        multi_buffer_range: Range<Anchor>,
-        status: DiffHunkStatus,
-        word_diffs: Vec<Range<MultiBufferOffset>>,
-    },
-}
-
-pub enum HideMouseCursorOrigin {
-    TypingAction,
-    MovementAction,
-}
-
-pub fn init(cx: &mut App) {
-    cx.set_global(GlobalBlameRenderer(Arc::new(())));
-
-    workspace::register_project_item::<Editor>(cx);
-    workspace::FollowableViewRegistry::register::<Editor>(cx);
-    workspace::register_serializable_item::<Editor>(cx);
-
-    cx.observe_new(
-        |workspace: &mut Workspace, _: Option<&mut Window>, _cx: &mut Context<Workspace>| {
-            workspace.register_action(Editor::new_file);
-            workspace.register_action(Editor::new_file_split);
-            workspace.register_action(Editor::new_file_vertical);
-            workspace.register_action(Editor::new_file_horizontal);
-            workspace.register_action(Editor::cancel_language_server_work);
-            workspace.register_action(Editor::toggle_focus);
-        },
-    )
-    .detach();
-
-    cx.on_action(move |_: &workspace::NewFile, cx| {
-        let app_state = workspace::AppState::global(cx);
-        if let Some(app_state) = app_state.upgrade() {
-            workspace::open_new(
-                Default::default(),
-                app_state,
-                cx,
-                |workspace, window, cx| {
-                    Editor::new_file(workspace, &Default::default(), window, cx)
-                },
-            )
-            .detach();
-        }
-    });
-    cx.on_action(move |_: &workspace::NewWindow, cx| {
-        let app_state = workspace::AppState::global(cx);
-        if let Some(app_state) = app_state.upgrade() {
-            workspace::open_new(
-                Default::default(),
-                app_state,
-                cx,
-                |workspace, window, cx| {
-                    cx.activate(true);
-                    Editor::new_file(workspace, &Default::default(), window, cx)
-                },
-            )
-            .detach();
-        }
-    });
-}
-
-pub fn set_blame_renderer(renderer: impl BlameRenderer + 'static, cx: &mut App) {
-    cx.set_global(GlobalBlameRenderer(Arc::new(renderer)));
-}
-
-pub trait DiagnosticRenderer {
-    fn render_group(
-        &self,
-        diagnostic_group: Vec<DiagnosticEntryRef<'_, Point>>,
-        buffer_id: BufferId,
-        snapshot: EditorSnapshot,
-        editor: WeakEntity<Editor>,
-        language_registry: Option<Arc<LanguageRegistry>>,
-        cx: &mut App,
-    ) -> Vec<BlockProperties<Anchor>>;
-
-    fn render_hover(
-        &self,
-        diagnostic_group: Vec<DiagnosticEntryRef<'_, Point>>,
-        range: Range<Point>,
-        buffer_id: BufferId,
-        language_registry: Option<Arc<LanguageRegistry>>,
-        cx: &mut App,
-    ) -> Option<Entity<markdown::Markdown>>;
-
-    fn open_link(
-        &self,
-        editor: &mut Editor,
-        link: SharedString,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    );
-}
-
-pub(crate) struct GlobalDiagnosticRenderer(pub Arc<dyn DiagnosticRenderer>);
-
-impl GlobalDiagnosticRenderer {
-    fn global(cx: &App) -> Option<Arc<dyn DiagnosticRenderer>> {
-        cx.try_global::<Self>().map(|g| g.0.clone())
-    }
-}
-
-impl gpui::Global for GlobalDiagnosticRenderer {}
-pub fn set_diagnostic_renderer(renderer: impl DiagnosticRenderer + 'static, cx: &mut App) {
-    cx.set_global(GlobalDiagnosticRenderer(Arc::new(renderer)));
-}
-
-pub struct SearchWithinRange;
-
-trait InvalidationRegion {
-    fn ranges(&self) -> &[Range<Anchor>];
-}
-
-#[derive(Clone, Debug, PartialEq)]
-pub enum SelectPhase {
-    Begin {
-        position: DisplayPoint,
-        add: bool,
-        click_count: usize,
-    },
-    BeginColumnar {
-        position: DisplayPoint,
-        reset: bool,
-        mode: ColumnarMode,
-        goal_column: u32,
-    },
-    Extend {
-        position: DisplayPoint,
-        click_count: usize,
-    },
-    Update {
-        position: DisplayPoint,
-        goal_column: u32,
-        scroll_delta: gpui::Point<f32>,
-    },
-    End,
-}
-
-#[derive(Clone, Debug, PartialEq)]
-pub enum ColumnarMode {
-    FromMouse,
-    FromSelection,
-}
-
-#[derive(Clone, Debug)]
-pub enum SelectMode {
-    Character,
-    Word(Range<Anchor>),
-    Line(Range<Anchor>),
-    All,
-}
-
-#[derive(Copy, Clone, Default, PartialEq, Eq, Debug)]
-pub enum SizingBehavior {
-    /// The editor will layout itself using `size_full` and will include the vertical
-    /// scroll margin as requested by user settings.
-    #[default]
-    Default,
-    /// The editor will layout itself using `size_full`, but will not have any
-    /// vertical overscroll.
-    ExcludeOverscrollMargin,
-    /// The editor will request a vertical size according to its content and will be
-    /// layouted without a vertical scroll margin.
-    SizeByContent,
-}
-
-#[derive(Clone, PartialEq, Eq, Debug)]
-pub enum EditorMode {
-    SingleLine,
-    AutoHeight {
-        min_lines: usize,
-        max_lines: Option<usize>,
-    },
-    Full {
-        /// When set to `true`, the editor will scale its UI elements with the buffer font size.
-        scale_ui_elements_with_buffer_font_size: bool,
-        /// When set to `true`, the editor will render a background for the active line.
-        show_active_line_background: bool,
-        /// Determines the sizing behavior for this editor
-        sizing_behavior: SizingBehavior,
-    },
-    Minimap {
-        parent: WeakEntity<Editor>,
-    },
-}
-
-impl EditorMode {
-    pub fn full() -> Self {
-        Self::Full {
-            scale_ui_elements_with_buffer_font_size: true,
-            show_active_line_background: true,
-            sizing_behavior: SizingBehavior::Default,
-        }
-    }
-
-    #[inline]
-    pub fn is_full(&self) -> bool {
-        matches!(self, Self::Full { .. })
-    }
-
-    #[inline]
-    pub fn is_single_line(&self) -> bool {
-        matches!(self, Self::SingleLine { .. })
-    }
-
-    #[inline]
-    fn is_minimap(&self) -> bool {
-        matches!(self, Self::Minimap { .. })
-    }
-}
-
-#[derive(Copy, Clone, Debug)]
-pub enum SoftWrap {
-    /// Prefer not to wrap at all.
-    ///
-    /// Note: this is currently internal, as actually limited by [`crate::MAX_LINE_LEN`] until it wraps.
-    /// The mode is used inside git diff hunks, where it's seems currently more useful to not wrap as much as possible.
-    GitDiff,
-    /// Prefer a single line generally, unless an overly long line is encountered.
-    None,
-    /// Soft wrap lines that exceed the editor width.
-    EditorWidth,
-    /// Soft wrap lines at the preferred line length.
-    Column(u32),
-    /// Soft wrap line at the preferred line length or the editor width (whichever is smaller).
-    Bounded(u32),
-}
-
-#[derive(Clone)]
-pub struct EditorStyle {
-    pub background: Hsla,
-    pub border: Hsla,
-    pub local_player: PlayerColor,
-    pub text: TextStyle,
-    pub scrollbar_width: Pixels,
-    pub syntax: Arc<SyntaxTheme>,
-    pub status: StatusColors,
-    pub inlay_hints_style: HighlightStyle,
-    pub edit_prediction_styles: EditPredictionStyles,
-    pub unnecessary_code_fade: f32,
-    pub show_underlines: bool,
-}
-
-impl Default for EditorStyle {
-    fn default() -> Self {
-        Self {
-            background: Hsla::default(),
-            border: Hsla::default(),
-            local_player: PlayerColor::default(),
-            text: TextStyle::default(),
-            scrollbar_width: Pixels::default(),
-            syntax: Default::default(),
-            // HACK: Status colors don't have a real default.
-            // We should look into removing the status colors from the editor
-            // style and retrieve them directly from the theme.
-            status: StatusColors::dark(),
-            inlay_hints_style: HighlightStyle::default(),
-            edit_prediction_styles: EditPredictionStyles {
-                insertion: HighlightStyle::default(),
-                whitespace: HighlightStyle::default(),
-            },
-            unnecessary_code_fade: Default::default(),
-            show_underlines: true,
-        }
-    }
-}
-
-pub fn make_inlay_hints_style(cx: &App) -> HighlightStyle {
-    let show_background = language_settings::language_settings(None, None, cx)
-        .inlay_hints
-        .show_background;
-
-    let mut style = cx.theme().syntax().get("hint");
-
-    if style.color.is_none() {
-        style.color = Some(cx.theme().status().hint);
-    }
-
-    if !show_background {
-        style.background_color = None;
-        return style;
-    }
-
-    if style.background_color.is_none() {
-        style.background_color = Some(cx.theme().status().hint_background);
-    }
-
-    style
-}
-
-pub fn make_suggestion_styles(cx: &App) -> EditPredictionStyles {
-    EditPredictionStyles {
-        insertion: HighlightStyle {
-            color: Some(cx.theme().status().predictive),
-            ..HighlightStyle::default()
-        },
-        whitespace: HighlightStyle {
-            background_color: Some(cx.theme().status().created_background),
-            ..HighlightStyle::default()
-        },
-    }
-}
-
-type CompletionId = usize;
-
-pub(crate) enum EditDisplayMode {
-    TabAccept,
-    DiffPopover,
-    Inline,
-}
-
-enum EditPrediction {
-    Edit {
-        edits: Vec<(Range<Anchor>, Arc<str>)>,
-        edit_preview: Option<EditPreview>,
-        display_mode: EditDisplayMode,
-        snapshot: BufferSnapshot,
-    },
-    /// Move to a specific location in the active editor
-    MoveWithin {
-        target: Anchor,
-        snapshot: BufferSnapshot,
-    },
-    /// Move to a specific location in a different editor (not the active one)
-    MoveOutside {
-        target: language::Anchor,
-        snapshot: BufferSnapshot,
-    },
-}
-
-struct EditPredictionState {
-    inlay_ids: Vec<InlayId>,
-    completion: EditPrediction,
-    completion_id: Option<SharedString>,
-    invalidation_range: Option<Range<Anchor>>,
-}
-
-enum EditPredictionSettings {
-    Disabled,
-    Enabled {
-        show_in_menu: bool,
-        preview_requires_modifier: bool,
-    },
-}
-
-enum EditPredictionHighlight {}
-
-#[derive(Debug, Clone)]
-struct InlineDiagnostic {
-    message: SharedString,
-    group_id: usize,
-    is_primary: bool,
-    start: Point,
-    severity: lsp::DiagnosticSeverity,
-}
-
-pub enum MenuEditPredictionsPolicy {
-    Never,
-    ByProvider,
-}
-
-pub enum EditPredictionPreview {
-    /// Modifier is not pressed
-    Inactive { released_too_fast: bool },
-    /// Modifier pressed
-    Active {
-        since: Instant,
-        previous_scroll_position: Option<ScrollAnchor>,
-    },
-}
-
-impl EditPredictionPreview {
-    pub fn released_too_fast(&self) -> bool {
-        match self {
-            EditPredictionPreview::Inactive { released_too_fast } => *released_too_fast,
-            EditPredictionPreview::Active { .. } => false,
-        }
-    }
-
-    pub fn set_previous_scroll_position(&mut self, scroll_position: Option<ScrollAnchor>) {
-        if let EditPredictionPreview::Active {
-            previous_scroll_position,
-            ..
-        } = self
-        {
-            *previous_scroll_position = scroll_position;
-        }
-    }
-}
-
-pub struct ContextMenuOptions {
-    pub min_entries_visible: usize,
-    pub max_entries_visible: usize,
-    pub placement: Option<ContextMenuPlacement>,
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum ContextMenuPlacement {
-    Above,
-    Below,
-}
-
-#[derive(Copy, Clone, Eq, PartialEq, PartialOrd, Ord, Debug, Default)]
-struct EditorActionId(usize);
-
-impl EditorActionId {
-    pub fn post_inc(&mut self) -> Self {
-        let answer = self.0;
-
-        *self = Self(answer + 1);
-
-        Self(answer)
-    }
-}
-
-// type GetFieldEditorTheme = dyn Fn(&theme::Theme) -> theme::FieldEditor;
-// type OverrideTextStyle = dyn Fn(&EditorStyle) -> Option<HighlightStyle>;
-
-type BackgroundHighlight = (
-    Arc<dyn Fn(&usize, &Theme) -> Hsla + Send + Sync>,
-    Arc<[Range<Anchor>]>,
-);
-type GutterHighlight = (fn(&App) -> Hsla, Vec<Range<Anchor>>);
-
-#[derive(Default)]
-struct ScrollbarMarkerState {
-    scrollbar_size: Size<Pixels>,
-    dirty: bool,
-    markers: Arc<[PaintQuad]>,
-    pending_refresh: Option<Task<Result<()>>>,
-}
-
-impl ScrollbarMarkerState {
-    fn should_refresh(&self, scrollbar_size: Size<Pixels>) -> bool {
-        self.pending_refresh.is_none() && (self.scrollbar_size != scrollbar_size || self.dirty)
-    }
-}
-
-#[derive(Clone, Copy, PartialEq, Eq)]
-pub enum MinimapVisibility {
-    Disabled,
-    Enabled {
-        /// The configuration currently present in the users settings.
-        setting_configuration: bool,
-        /// Whether to override the currently set visibility from the users setting.
-        toggle_override: bool,
-    },
-}
-
-impl MinimapVisibility {
-    fn for_mode(mode: &EditorMode, cx: &App) -> Self {
-        if mode.is_full() {
-            Self::Enabled {
-                setting_configuration: EditorSettings::get_global(cx).minimap.minimap_enabled(),
-                toggle_override: false,
-            }
-        } else {
-            Self::Disabled
-        }
-    }
-
-    fn hidden(&self) -> Self {
-        match *self {
-            Self::Enabled {
-                setting_configuration,
-                ..
-            } => Self::Enabled {
-                setting_configuration,
-                toggle_override: setting_configuration,
-            },
-            Self::Disabled => Self::Disabled,
-        }
-    }
-
-    fn disabled(&self) -> bool {
-        matches!(*self, Self::Disabled)
-    }
-
-    fn settings_visibility(&self) -> bool {
-        match *self {
-            Self::Enabled {
-                setting_configuration,
-                ..
-            } => setting_configuration,
-            _ => false,
-        }
-    }
-
-    fn visible(&self) -> bool {
-        match *self {
-            Self::Enabled {
-                setting_configuration,
-                toggle_override,
-            } => setting_configuration ^ toggle_override,
-            _ => false,
-        }
-    }
-
-    fn toggle_visibility(&self) -> Self {
-        match *self {
-            Self::Enabled {
-                toggle_override,
-                setting_configuration,
-            } => Self::Enabled {
-                setting_configuration,
-                toggle_override: !toggle_override,
-            },
-            Self::Disabled => Self::Disabled,
-        }
-    }
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum BufferSerialization {
-    All,
-    NonDirtyBuffers,
-}
-
-impl BufferSerialization {
-    fn new(restore_unsaved_buffers: bool) -> Self {
-        if restore_unsaved_buffers {
-            Self::All
-        } else {
-            Self::NonDirtyBuffers
-        }
-    }
-}
-
-#[derive(Clone, Debug)]
-struct RunnableTasks {
-    templates: Vec<(TaskSourceKind, TaskTemplate)>,
-    offset: multi_buffer::Anchor,
-    // We need the column at which the task context evaluation should take place (when we're spawning it via gutter).
-    column: u32,
-    // Values of all named captures, including those starting with '_'
-    extra_variables: HashMap<String, String>,
-    // Full range of the tagged region. We use it to determine which `extra_variables` to grab for context resolution in e.g. a modal.
-    context_range: Range<BufferOffset>,
-}
-
-impl RunnableTasks {
-    fn resolve<'a>(
-        &'a self,
-        cx: &'a task::TaskContext,
-    ) -> impl Iterator<Item = (TaskSourceKind, ResolvedTask)> + 'a {
-        self.templates.iter().filter_map(|(kind, template)| {
-            template
-                .resolve_task(&kind.to_id_base(), cx)
-                .map(|task| (kind.clone(), task))
-        })
-    }
-}
-
-#[derive(Clone)]
-pub struct ResolvedTasks {
-    templates: SmallVec<[(TaskSourceKind, ResolvedTask); 1]>,
-    position: Anchor,
-}
-
-/// Addons allow storing per-editor state in other crates (e.g. Vim)
-pub trait Addon: 'static {
-    fn extend_key_context(&self, _: &mut KeyContext, _: &App) {}
-
-    fn render_buffer_header_controls(
-        &self,
-        _: &ExcerptInfo,
-        _: &Window,
-        _: &App,
-    ) -> Option<AnyElement> {
-        None
-    }
-
-    fn override_status_for_buffer_id(&self, _: BufferId, _: &App) -> Option<FileStatus> {
-        None
-    }
-
-    fn to_any(&self) -> &dyn std::any::Any;
-
-    fn to_any_mut(&mut self) -> Option<&mut dyn std::any::Any> {
-        None
-    }
-}
-
-struct ChangeLocation {
-    current: Option<Vec<Anchor>>,
-    original: Vec<Anchor>,
-}
-impl ChangeLocation {
-    fn locations(&self) -> &[Anchor] {
-        self.current.as_ref().unwrap_or(&self.original)
-    }
-}
-
-/// A set of caret positions, registered when the editor was edited.
-pub struct ChangeList {
-    changes: Vec<ChangeLocation>,
-    /// Currently "selected" change.
-    position: Option<usize>,
-}
-
-impl ChangeList {
-    pub fn new() -> Self {
-        Self {
-            changes: Vec::new(),
-            position: None,
-        }
-    }
-
-    /// Moves to the next change in the list (based on the direction given) and returns the caret positions for the next change.
-    /// If reaches the end of the list in the direction, returns the corresponding change until called for a different direction.
-    pub fn next_change(&mut self, count: usize, direction: Direction) -> Option<&[Anchor]> {
-        if self.changes.is_empty() {
-            return None;
-        }
-
-        let prev = self.position.unwrap_or(self.changes.len());
-        let next = if direction == Direction::Prev {
-            prev.saturating_sub(count)
-        } else {
-            (prev + count).min(self.changes.len() - 1)
-        };
-        self.position = Some(next);
-        self.changes.get(next).map(|change| change.locations())
-    }
-
-    /// Adds a new change to the list, resetting the change list position.
-    pub fn push_to_change_list(&mut self, group: bool, new_positions: Vec<Anchor>) {
-        self.position.take();
-        if let Some(last) = self.changes.last_mut()
-            && group
-        {
-            last.current = Some(new_positions)
-        } else {
-            self.changes.push(ChangeLocation {
-                original: new_positions,
-                current: None,
-            });
-        }
-    }
-
-    pub fn last(&self) -> Option<&[Anchor]> {
-        self.changes.last().map(|change| change.locations())
-    }
-
-    pub fn last_before_grouping(&self) -> Option<&[Anchor]> {
-        self.changes.last().map(|change| change.original.as_slice())
-    }
-
-    pub fn invert_last_group(&mut self) {
-        if let Some(last) = self.changes.last_mut()
-            && let Some(current) = last.current.as_mut()
-        {
-            mem::swap(&mut last.original, current);
-        }
-    }
-}
-
-#[derive(Clone)]
-struct InlineBlamePopoverState {
-    scroll_handle: ScrollHandle,
-    commit_message: Option<ParsedCommitMessage>,
-    markdown: Entity<Markdown>,
-}
-
-struct InlineBlamePopover {
-    position: gpui::Point<Pixels>,
-    hide_task: Option<Task<()>>,
-    popover_bounds: Option<Bounds<Pixels>>,
-    popover_state: InlineBlamePopoverState,
-    keyboard_grace: bool,
-}
-
-enum SelectionDragState {
-    /// State when no drag related activity is detected.
-    None,
-    /// State when the mouse is down on a selection that is about to be dragged.
-    ReadyToDrag {
-        selection: Selection<Anchor>,
-        click_position: gpui::Point<Pixels>,
-        mouse_down_time: Instant,
-    },
-    /// State when the mouse is dragging the selection in the editor.
-    Dragging {
-        selection: Selection<Anchor>,
-        drop_cursor: Selection<Anchor>,
-        hide_drop_cursor: bool,
-    },
-}
-
-enum ColumnarSelectionState {
-    FromMouse {
-        selection_tail: Anchor,
-        display_point: Option<DisplayPoint>,
-    },
-    FromSelection {
-        selection_tail: Anchor,
-    },
-}
-
-/// Represents a breakpoint indicator that shows up when hovering over lines in the gutter that don't have
-/// a breakpoint on them.
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-struct PhantomBreakpointIndicator {
-    display_row: DisplayRow,
-    /// There's a small debounce between hovering over the line and showing the indicator.
-    /// We don't want to show the indicator when moving the mouse from editor to e.g. project panel.
-    is_active: bool,
-    collides_with_existing_breakpoint: bool,
-}
-
-/// Zed's primary implementation of text input, allowing users to edit a [`MultiBuffer`].
-///
-/// See the [module level documentation](self) for more information.
-pub struct Editor {
-    focus_handle: FocusHandle,
-    last_focused_descendant: Option<WeakFocusHandle>,
-    /// The text buffer being edited
-    buffer: Entity<MultiBuffer>,
-    /// Map of how text in the buffer should be displayed.
-    /// Handles soft wraps, folds, fake inlay text insertions, etc.
-    pub display_map: Entity<DisplayMap>,
-    placeholder_display_map: Option<Entity<DisplayMap>>,
-    pub selections: SelectionsCollection,
-    pub scroll_manager: ScrollManager,
-    /// When inline assist editors are linked, they all render cursors because
-    /// typing enters text into each of them, even the ones that aren't focused.
-    pub(crate) show_cursor_when_unfocused: bool,
-    columnar_selection_state: Option<ColumnarSelectionState>,
-    add_selections_state: Option<AddSelectionsState>,
-    select_next_state: Option<SelectNextState>,
-    select_prev_state: Option<SelectNextState>,
-    selection_history: SelectionHistory,
-    defer_selection_effects: bool,
-    deferred_selection_effects_state: Option<DeferredSelectionEffectsState>,
-    autoclose_regions: Vec<AutocloseRegion>,
-    snippet_stack: InvalidationStack<SnippetState>,
-    select_syntax_node_history: SelectSyntaxNodeHistory,
-    ime_transaction: Option<TransactionId>,
-    pub diagnostics_max_severity: DiagnosticSeverity,
-    active_diagnostics: ActiveDiagnostic,
-    show_inline_diagnostics: bool,
-    inline_diagnostics_update: Task<()>,
-    inline_diagnostics_enabled: bool,
-    diagnostics_enabled: bool,
-    word_completions_enabled: bool,
-    inline_diagnostics: Vec<(Anchor, InlineDiagnostic)>,
-    soft_wrap_mode_override: Option<language_settings::SoftWrap>,
-    hard_wrap: Option<usize>,
-    project: Option<Entity<Project>>,
-    semantics_provider: Option<Rc<dyn SemanticsProvider>>,
-    completion_provider: Option<Rc<dyn CompletionProvider>>,
-    collaboration_hub: Option<Box<dyn CollaborationHub>>,
-    blink_manager: Entity<BlinkManager>,
-    show_cursor_names: bool,
-    hovered_cursors: HashMap<HoveredCursor, Task<()>>,
-    pub show_local_selections: bool,
-    mode: EditorMode,
-    show_breadcrumbs: bool,
-    show_gutter: bool,
-    show_scrollbars: ScrollbarAxes,
-    minimap_visibility: MinimapVisibility,
-    offset_content: bool,
-    disable_expand_excerpt_buttons: bool,
-    show_line_numbers: Option<bool>,
-    use_relative_line_numbers: Option<bool>,
-    show_git_diff_gutter: Option<bool>,
-    show_code_actions: Option<bool>,
-    show_runnables: Option<bool>,
-    show_breakpoints: Option<bool>,
-    show_wrap_guides: Option<bool>,
-    show_indent_guides: Option<bool>,
-    buffers_with_disabled_indent_guides: HashSet<BufferId>,
-    highlight_order: usize,
-    highlighted_rows: HashMap<TypeId, Vec<RowHighlight>>,
-    background_highlights: HashMap<HighlightKey, BackgroundHighlight>,
-    gutter_highlights: HashMap<TypeId, GutterHighlight>,
-    scrollbar_marker_state: ScrollbarMarkerState,
-    active_indent_guides_state: ActiveIndentGuidesState,
-    nav_history: Option<ItemNavHistory>,
-    context_menu: RefCell<Option<CodeContextMenu>>,
-    context_menu_options: Option<ContextMenuOptions>,
-    mouse_context_menu: Option<MouseContextMenu>,
-    completion_tasks: Vec<(CompletionId, Task<()>)>,
-    inline_blame_popover: Option<InlineBlamePopover>,
-    inline_blame_popover_show_task: Option<Task<()>>,
-    signature_help_state: SignatureHelpState,
-    auto_signature_help: Option<bool>,
-    find_all_references_task_sources: Vec<Anchor>,
-    next_completion_id: CompletionId,
-    available_code_actions: Option<(Location, Rc<[AvailableCodeAction]>)>,
-    code_actions_task: Option<Task<Result<()>>>,
-    quick_selection_highlight_task: Option<(Range<Anchor>, Task<()>)>,
-    debounced_selection_highlight_task: Option<(Range<Anchor>, Task<()>)>,
-    document_highlights_task: Option<Task<()>>,
-    linked_editing_range_task: Option<Task<Option<()>>>,
-    linked_edit_ranges: linked_editing_ranges::LinkedEditingRanges,
-    pending_rename: Option<RenameState>,
-    searchable: bool,
-    cursor_shape: CursorShape,
-    current_line_highlight: Option<CurrentLineHighlight>,
-    pub collapse_matches: bool,
-    autoindent_mode: Option<AutoindentMode>,
-    workspace: Option<(WeakEntity<Workspace>, Option<WorkspaceId>)>,
-    input_enabled: bool,
-    use_modal_editing: bool,
-    read_only: bool,
-    leader_id: Option<CollaboratorId>,
-    remote_id: Option<ViewId>,
-    pub hover_state: HoverState,
-    pending_mouse_down: Option<Rc<RefCell<Option<MouseDownEvent>>>>,
-    gutter_hovered: bool,
-    hovered_link_state: Option<HoveredLinkState>,
-    edit_prediction_provider: Option<RegisteredEditPredictionDelegate>,
-    code_action_providers: Vec<Rc<dyn CodeActionProvider>>,
-    active_edit_prediction: Option<EditPredictionState>,
-    /// Used to prevent flickering as the user types while the menu is open
-    stale_edit_prediction_in_menu: Option<EditPredictionState>,
-    edit_prediction_settings: EditPredictionSettings,
-    edit_predictions_hidden_for_vim_mode: bool,
-    show_edit_predictions_override: Option<bool>,
-    show_completions_on_input_override: Option<bool>,
-    menu_edit_predictions_policy: MenuEditPredictionsPolicy,
-    edit_prediction_preview: EditPredictionPreview,
-    edit_prediction_indent_conflict: bool,
-    edit_prediction_requires_modifier_in_indent_conflict: bool,
-    next_inlay_id: usize,
-    next_color_inlay_id: usize,
-    _subscriptions: Vec<Subscription>,
-    pixel_position_of_newest_cursor: Option<gpui::Point<Pixels>>,
-    gutter_dimensions: GutterDimensions,
-    style: Option<EditorStyle>,
-    text_style_refinement: Option<TextStyleRefinement>,
-    next_editor_action_id: EditorActionId,
-    editor_actions: Rc<
-        RefCell<BTreeMap<EditorActionId, Box<dyn Fn(&Editor, &mut Window, &mut Context<Self>)>>>,
-    >,
-    use_autoclose: bool,
-    use_auto_surround: bool,
-    auto_replace_emoji_shortcode: bool,
-    jsx_tag_auto_close_enabled_in_any_buffer: bool,
-    show_git_blame_gutter: bool,
-    show_git_blame_inline: bool,
-    show_git_blame_inline_delay_task: Option<Task<()>>,
-    git_blame_inline_enabled: bool,
-    render_diff_hunk_controls: RenderDiffHunkControlsFn,
-    buffer_serialization: Option<BufferSerialization>,
-    show_selection_menu: Option<bool>,
-    blame: Option<Entity<GitBlame>>,
-    blame_subscription: Option<Subscription>,
-    custom_context_menu: Option<
-        Box<
-            dyn 'static
-                + Fn(
-                    &mut Self,
-                    DisplayPoint,
-                    &mut Window,
-                    &mut Context<Self>,
-                ) -> Option<Entity<ui::ContextMenu>>,
-        >,
-    >,
-    last_bounds: Option<Bounds<Pixels>>,
-    last_position_map: Option<Rc<PositionMap>>,
-    expect_bounds_change: Option<Bounds<Pixels>>,
-    tasks: BTreeMap<(BufferId, BufferRow), RunnableTasks>,
-    tasks_update_task: Option<Task<()>>,
-    breakpoint_store: Option<Entity<BreakpointStore>>,
-    gutter_breakpoint_indicator: (Option<PhantomBreakpointIndicator>, Option<Task<()>>),
-    hovered_diff_hunk_row: Option<DisplayRow>,
-    pull_diagnostics_task: Task<()>,
-    pull_diagnostics_background_task: Task<()>,
-    in_project_search: bool,
-    previous_search_ranges: Option<Arc<[Range<Anchor>]>>,
-    breadcrumb_header: Option<String>,
-    focused_block: Option<FocusedBlock>,
-    next_scroll_position: NextScrollCursorCenterTopBottom,
-    addons: HashMap<TypeId, Box<dyn Addon>>,
-    registered_buffers: HashMap<BufferId, OpenLspBufferHandle>,
-    load_diff_task: Option<Shared<Task<()>>>,
-    /// Whether we are temporarily displaying a diff other than git's
-    temporary_diff_override: bool,
-    selection_mark_mode: bool,
-    toggle_fold_multiple_buffers: Task<()>,
-    _scroll_cursor_center_top_bottom_task: Task<()>,
-    serialize_selections: Task<()>,
-    serialize_folds: Task<()>,
-    mouse_cursor_hidden: bool,
-    minimap: Option<Entity<Self>>,
-    hide_mouse_mode: HideMouseMode,
-    pub change_list: ChangeList,
-    inline_value_cache: InlineValueCache,
-
-    selection_drag_state: SelectionDragState,
-    colors: Option<LspColorData>,
-    post_scroll_update: Task<()>,
-    refresh_colors_task: Task<()>,
-    inlay_hints: Option<LspInlayHintData>,
-    folding_newlines: Task<()>,
-    select_next_is_case_sensitive: Option<bool>,
-    pub lookup_key: Option<Box<dyn Any + Send + Sync>>,
-    applicable_language_settings: HashMap<Option<LanguageName>, LanguageSettings>,
-    accent_data: Option<AccentData>,
-    fetched_tree_sitter_chunks: HashMap<ExcerptId, HashSet<Range<BufferRow>>>,
-    use_base_text_line_numbers: bool,
-}
-
-#[derive(Debug, PartialEq)]
-struct AccentData {
-    colors: AccentColors,
-    overrides: Vec<SharedString>,
-}
-
-fn debounce_value(debounce_ms: u64) -> Option<Duration> {
-    if debounce_ms > 0 {
-        Some(Duration::from_millis(debounce_ms))
-    } else {
-        None
-    }
-}
-
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Default)]
-enum NextScrollCursorCenterTopBottom {
-    #[default]
-    Center,
-    Top,
-    Bottom,
-}
-
-impl NextScrollCursorCenterTopBottom {
-    fn next(&self) -> Self {
-        match self {
-            Self::Center => Self::Top,
-            Self::Top => Self::Bottom,
-            Self::Bottom => Self::Center,
-        }
-    }
-}
-
-#[derive(Clone)]
-pub struct EditorSnapshot {
-    pub mode: EditorMode,
-    show_gutter: bool,
-    offset_content: bool,
-    show_line_numbers: Option<bool>,
-    show_git_diff_gutter: Option<bool>,
-    show_code_actions: Option<bool>,
-    show_runnables: Option<bool>,
-    show_breakpoints: Option<bool>,
-    git_blame_gutter_max_author_length: Option<usize>,
-    pub display_snapshot: DisplaySnapshot,
-    pub placeholder_display_snapshot: Option<DisplaySnapshot>,
-    is_focused: bool,
-    scroll_anchor: ScrollAnchor,
-    ongoing_scroll: OngoingScroll,
-    current_line_highlight: CurrentLineHighlight,
-    gutter_hovered: bool,
-}
-
-#[derive(Default, Debug, Clone, Copy)]
-pub struct GutterDimensions {
-    pub left_padding: Pixels,
-    pub right_padding: Pixels,
-    pub width: Pixels,
-    pub margin: Pixels,
-    pub git_blame_entries_width: Option<Pixels>,
-}
-
-impl GutterDimensions {
-    fn default_with_margin(font_id: FontId, font_size: Pixels, cx: &App) -> Self {
-        Self {
-            margin: Self::default_gutter_margin(font_id, font_size, cx),
-            ..Default::default()
-        }
-    }
-
-    fn default_gutter_margin(font_id: FontId, font_size: Pixels, cx: &App) -> Pixels {
-        -cx.text_system().descent(font_id, font_size)
-    }
-    /// The full width of the space taken up by the gutter.
-    pub fn full_width(&self) -> Pixels {
-        self.margin + self.width
-    }
-
-    /// The width of the space reserved for the fold indicators,
-    /// use alongside 'justify_end' and `gutter_width` to
-    /// right align content with the line numbers
-    pub fn fold_area_width(&self) -> Pixels {
-        self.margin + self.right_padding
-    }
-}
-
-struct CharacterDimensions {
-    em_width: Pixels,
-    em_advance: Pixels,
-    line_height: Pixels,
-}
-
-#[derive(Debug)]
-pub struct RemoteSelection {
-    pub replica_id: ReplicaId,
-    pub selection: Selection<Anchor>,
-    pub cursor_shape: CursorShape,
-    pub collaborator_id: CollaboratorId,
-    pub line_mode: bool,
-    pub user_name: Option<SharedString>,
-    pub color: PlayerColor,
-}
-
-#[derive(Clone, Debug)]
-struct SelectionHistoryEntry {
-    selections: Arc<[Selection<Anchor>]>,
-    select_next_state: Option<SelectNextState>,
-    select_prev_state: Option<SelectNextState>,
-    add_selections_state: Option<AddSelectionsState>,
-}
-
-#[derive(Copy, Clone, Default, Debug, PartialEq, Eq)]
-enum SelectionHistoryMode {
-    #[default]
-    Normal,
-    Undoing,
-    Redoing,
-    Skipping,
-}
-
-#[derive(Clone, PartialEq, Eq, Hash)]
-struct HoveredCursor {
-    replica_id: ReplicaId,
-    selection_id: usize,
-}
-
-#[derive(Debug)]
-/// SelectionEffects controls the side-effects of updating the selection.
-///
-/// The default behaviour does "what you mostly want":
-/// - it pushes to the nav history if the cursor moved by >10 lines
-/// - it re-triggers completion requests
-/// - it scrolls to fit
-///
-/// You might want to modify these behaviours. For example when doing a "jump"
-/// like go to definition, we always want to add to nav history; but when scrolling
-/// in vim mode we never do.
-///
-/// Similarly, you might want to disable scrolling if you don't want the viewport to
-/// move.
-#[derive(Clone)]
-pub struct SelectionEffects {
-    nav_history: Option<bool>,
-    completions: bool,
-    scroll: Option<Autoscroll>,
-}
-
-impl Default for SelectionEffects {
-    fn default() -> Self {
-        Self {
-            nav_history: None,
-            completions: true,
-            scroll: Some(Autoscroll::fit()),
-        }
-    }
-}
-impl SelectionEffects {
-    pub fn scroll(scroll: Autoscroll) -> Self {
-        Self {
-            scroll: Some(scroll),
-            ..Default::default()
-        }
-    }
-
-    pub fn no_scroll() -> Self {
-        Self {
-            scroll: None,
-            ..Default::default()
-        }
-    }
-
-    pub fn completions(self, completions: bool) -> Self {
-        Self {
-            completions,
-            ..self
-        }
-    }
-
-    pub fn nav_history(self, nav_history: bool) -> Self {
-        Self {
-            nav_history: Some(nav_history),
-            ..self
-        }
-    }
-}
-
-struct DeferredSelectionEffectsState {
-    changed: bool,
-    effects: SelectionEffects,
-    old_cursor_position: Anchor,
-    history_entry: SelectionHistoryEntry,
-}
-
-#[derive(Default)]
-struct SelectionHistory {
-    #[allow(clippy::type_complexity)]
-    selections_by_transaction:
-        HashMap<TransactionId, (Arc<[Selection<Anchor>]>, Option<Arc<[Selection<Anchor>]>>)>,
-    mode: SelectionHistoryMode,
-    undo_stack: VecDeque<SelectionHistoryEntry>,
-    redo_stack: VecDeque<SelectionHistoryEntry>,
-}
-
-impl SelectionHistory {
-    #[track_caller]
-    fn insert_transaction(
-        &mut self,
-        transaction_id: TransactionId,
-        selections: Arc<[Selection<Anchor>]>,
-    ) {
-        if selections.is_empty() {
-            log::error!(
-                "SelectionHistory::insert_transaction called with empty selections. Caller: {}",
-                std::panic::Location::caller()
-            );
-            return;
-        }
-        self.selections_by_transaction
-            .insert(transaction_id, (selections, None));
-    }
-
-    #[allow(clippy::type_complexity)]
-    fn transaction(
-        &self,
-        transaction_id: TransactionId,
-    ) -> Option<&(Arc<[Selection<Anchor>]>, Option<Arc<[Selection<Anchor>]>>)> {
-        self.selections_by_transaction.get(&transaction_id)
-    }
-
-    #[allow(clippy::type_complexity)]
-    fn transaction_mut(
-        &mut self,
-        transaction_id: TransactionId,
-    ) -> Option<&mut (Arc<[Selection<Anchor>]>, Option<Arc<[Selection<Anchor>]>>)> {
-        self.selections_by_transaction.get_mut(&transaction_id)
-    }
-
-    fn push(&mut self, entry: SelectionHistoryEntry) {
-        if !entry.selections.is_empty() {
-            match self.mode {
-                SelectionHistoryMode::Normal => {
-                    self.push_undo(entry);
-                    self.redo_stack.clear();
-                }
-                SelectionHistoryMode::Undoing => self.push_redo(entry),
-                SelectionHistoryMode::Redoing => self.push_undo(entry),
-                SelectionHistoryMode::Skipping => {}
-            }
-        }
-    }
-
-    fn push_undo(&mut self, entry: SelectionHistoryEntry) {
-        if self
-            .undo_stack
-            .back()
-            .is_none_or(|e| e.selections != entry.selections)
-        {
-            self.undo_stack.push_back(entry);
-            if self.undo_stack.len() > MAX_SELECTION_HISTORY_LEN {
-                self.undo_stack.pop_front();
-            }
-        }
-    }
-
-    fn push_redo(&mut self, entry: SelectionHistoryEntry) {
-        if self
-            .redo_stack
-            .back()
-            .is_none_or(|e| e.selections != entry.selections)
-        {
-            self.redo_stack.push_back(entry);
-            if self.redo_stack.len() > MAX_SELECTION_HISTORY_LEN {
-                self.redo_stack.pop_front();
-            }
-        }
-    }
-}
-
-#[derive(Clone, Copy)]
-pub struct RowHighlightOptions {
-    pub autoscroll: bool,
-    pub include_gutter: bool,
-}
-
-impl Default for RowHighlightOptions {
-    fn default() -> Self {
-        Self {
-            autoscroll: Default::default(),
-            include_gutter: true,
-        }
-    }
-}
-
-struct RowHighlight {
-    index: usize,
-    range: Range<Anchor>,
-    color: Hsla,
-    options: RowHighlightOptions,
-    type_id: TypeId,
-}
-
-#[derive(Clone, Debug)]
-struct AddSelectionsState {
-    groups: Vec<AddSelectionsGroup>,
-}
-
-#[derive(Clone, Debug)]
-struct AddSelectionsGroup {
-    above: bool,
-    stack: Vec<usize>,
-}
-
-#[derive(Clone)]
-struct SelectNextState {
-    query: AhoCorasick,
-    wordwise: bool,
-    done: bool,
-}
-
-impl std::fmt::Debug for SelectNextState {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct(std::any::type_name::<Self>())
-            .field("wordwise", &self.wordwise)
-            .field("done", &self.done)
-            .finish()
-    }
-}
-
-#[derive(Debug)]
-struct AutocloseRegion {
-    selection_id: usize,
-    range: Range<Anchor>,
-    pair: BracketPair,
-}
-
-#[derive(Debug)]
-struct SnippetState {
-    ranges: Vec<Vec<Range<Anchor>>>,
-    active_index: usize,
-    choices: Vec<Option<Vec<String>>>,
-}
-
-#[doc(hidden)]
-pub struct RenameState {
-    pub range: Range<Anchor>,
-    pub old_name: Arc<str>,
-    pub editor: Entity<Editor>,
-    block_id: CustomBlockId,
-}
-
-struct InvalidationStack<T>(Vec<T>);
-
-struct RegisteredEditPredictionDelegate {
-    provider: Arc<dyn EditPredictionDelegateHandle>,
-    _subscription: Subscription,
-}
-
-#[derive(Debug, PartialEq, Eq)]
-pub struct ActiveDiagnosticGroup {
-    pub active_range: Range<Anchor>,
-    pub active_message: String,
-    pub group_id: usize,
-    pub blocks: HashSet<CustomBlockId>,
-}
-
-#[derive(Debug, PartialEq, Eq)]
-
-pub(crate) enum ActiveDiagnostic {
-    None,
-    All,
-    Group(ActiveDiagnosticGroup),
-}
-
-#[derive(Serialize, Deserialize, Clone, Debug)]
-pub struct ClipboardSelection {
-    /// The number of bytes in this selection.
-    pub len: usize,
-    /// Whether this was a full-line selection.
-    pub is_entire_line: bool,
-    /// The indentation of the first line when this content was originally copied.
-    pub first_line_indent: u32,
-    #[serde(default)]
-    pub file_path: Option<PathBuf>,
-    #[serde(default)]
-    pub line_range: Option<RangeInclusive<u32>>,
-}
-
-impl ClipboardSelection {
-    pub fn for_buffer(
-        len: usize,
-        is_entire_line: bool,
-        range: Range<Point>,
-        buffer: &MultiBufferSnapshot,
-        project: Option<&Entity<Project>>,
-        cx: &App,
-    ) -> Self {
-        let first_line_indent = buffer
-            .indent_size_for_line(MultiBufferRow(range.start.row))
-            .len;
-
-        let file_path = util::maybe!({
-            let project = project?.read(cx);
-            let file = buffer.file_at(range.start)?;
-            let project_path = ProjectPath {
-                worktree_id: file.worktree_id(cx),
-                path: file.path().clone(),
-            };
-            project.absolute_path(&project_path, cx)
-        });
-
-        let line_range = file_path.as_ref().map(|_| range.start.row..=range.end.row);
-
-        Self {
-            len,
-            is_entire_line,
-            first_line_indent,
-            file_path,
-            line_range,
-        }
-    }
-}
-
-// selections, scroll behavior, was newest selection reversed
-type SelectSyntaxNodeHistoryState = (
-    Box<[Selection<MultiBufferOffset>]>,
-    SelectSyntaxNodeScrollBehavior,
-    bool,
-);
-
-#[derive(Default)]
-struct SelectSyntaxNodeHistory {
-    stack: Vec<SelectSyntaxNodeHistoryState>,
-    // disable temporarily to allow changing selections without losing the stack
-    pub disable_clearing: bool,
-}
-
-impl SelectSyntaxNodeHistory {
-    pub fn try_clear(&mut self) {
-        if !self.disable_clearing {
-            self.stack.clear();
-        }
-    }
-
-    pub fn push(&mut self, selection: SelectSyntaxNodeHistoryState) {
-        self.stack.push(selection);
-    }
-
-    pub fn pop(&mut self) -> Option<SelectSyntaxNodeHistoryState> {
-        self.stack.pop()
-    }
-}
-
-enum SelectSyntaxNodeScrollBehavior {
-    CursorTop,
-    FitSelection,
-    CursorBottom,
-}
-
-#[derive(Debug)]
-pub(crate) struct NavigationData {
-    cursor_anchor: Anchor,
-    cursor_position: Point,
-    scroll_anchor: ScrollAnchor,
-    scroll_top_row: u32,
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum GotoDefinitionKind {
-    Symbol,
-    Declaration,
-    Type,
-    Implementation,
-}
-
-pub enum FormatTarget {
-    Buffers(HashSet<Entity<Buffer>>),
-    Ranges(Vec<Range<MultiBufferPoint>>),
-}
-
-pub(crate) struct FocusedBlock {
-    id: BlockId,
-    focus_handle: WeakFocusHandle,
-}
-
-#[derive(Clone, Debug)]
-enum JumpData {
-    MultiBufferRow {
-        row: MultiBufferRow,
-        line_offset_from_top: u32,
-    },
-    MultiBufferPoint {
-        excerpt_id: ExcerptId,
-        position: Point,
-        anchor: text::Anchor,
-        line_offset_from_top: u32,
-    },
-}
-
-pub enum MultibufferSelectionMode {
-    First,
-    All,
-}
-
-#[derive(Clone, Copy, Debug, Default)]
-pub struct RewrapOptions {
-    pub override_language_settings: bool,
-    pub preserve_existing_whitespace: bool,
-}
-
-impl Editor {
-    pub fn single_line(window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let buffer = cx.new(|cx| Buffer::local("", cx));
-        let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-        Self::new(EditorMode::SingleLine, buffer, None, window, cx)
-    }
-
-    pub fn multi_line(window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let buffer = cx.new(|cx| Buffer::local("", cx));
-        let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-        Self::new(EditorMode::full(), buffer, None, window, cx)
-    }
-
-    pub fn auto_height(
-        min_lines: usize,
-        max_lines: usize,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let buffer = cx.new(|cx| Buffer::local("", cx));
-        let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-        Self::new(
-            EditorMode::AutoHeight {
-                min_lines,
-                max_lines: Some(max_lines),
-            },
-            buffer,
-            None,
-            window,
-            cx,
-        )
-    }
-
-    /// Creates a new auto-height editor with a minimum number of lines but no maximum.
-    /// The editor grows as tall as needed to fit its content.
-    pub fn auto_height_unbounded(
-        min_lines: usize,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let buffer = cx.new(|cx| Buffer::local("", cx));
-        let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-        Self::new(
-            EditorMode::AutoHeight {
-                min_lines,
-                max_lines: None,
-            },
-            buffer,
-            None,
-            window,
-            cx,
-        )
-    }
-
-    pub fn for_buffer(
-        buffer: Entity<Buffer>,
-        project: Option<Entity<Project>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-        Self::new(EditorMode::full(), buffer, project, window, cx)
-    }
-
-    pub fn for_multibuffer(
-        buffer: Entity<MultiBuffer>,
-        project: Option<Entity<Project>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        Self::new(EditorMode::full(), buffer, project, window, cx)
-    }
-
-    pub fn clone(&self, window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let mut clone = Self::new(
-            self.mode.clone(),
-            self.buffer.clone(),
-            self.project.clone(),
-            window,
-            cx,
-        );
-        self.display_map.update(cx, |display_map, cx| {
-            let snapshot = display_map.snapshot(cx);
-            clone.display_map.update(cx, |display_map, cx| {
-                display_map.set_state(&snapshot, cx);
-            });
-        });
-        clone.folds_did_change(cx);
-        clone.selections.clone_state(&self.selections);
-        clone.scroll_manager.clone_state(&self.scroll_manager);
-        clone.searchable = self.searchable;
-        clone.read_only = self.read_only;
-        clone
-    }
-
-    pub fn new(
-        mode: EditorMode,
-        buffer: Entity<MultiBuffer>,
-        project: Option<Entity<Project>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        Editor::new_internal(mode, buffer, project, None, window, cx)
-    }
-
-    pub fn sticky_headers(
-        &self,
-        style: &EditorStyle,
-        cx: &App,
-    ) -> Option<Vec<OutlineItem<Anchor>>> {
-        let multi_buffer = self.buffer().read(cx);
-        let multi_buffer_snapshot = multi_buffer.snapshot(cx);
-        let multi_buffer_visible_start = self
-            .scroll_manager
-            .anchor()
-            .anchor
-            .to_point(&multi_buffer_snapshot);
-        let max_row = multi_buffer_snapshot.max_point().row;
-
-        let start_row = (multi_buffer_visible_start.row).min(max_row);
-        let end_row = (multi_buffer_visible_start.row + 10).min(max_row);
-
-        if let Some((excerpt_id, _, buffer)) = multi_buffer.read(cx).as_singleton() {
-            let outline_items = buffer
-                .outline_items_containing(
-                    Point::new(start_row, 0)..Point::new(end_row, 0),
-                    true,
-                    Some(style.syntax.as_ref()),
-                )
-                .into_iter()
-                .map(|outline_item| OutlineItem {
-                    depth: outline_item.depth,
-                    range: Anchor::range_in_buffer(*excerpt_id, outline_item.range),
-                    source_range_for_text: Anchor::range_in_buffer(
-                        *excerpt_id,
-                        outline_item.source_range_for_text,
-                    ),
-                    text: outline_item.text,
-                    highlight_ranges: outline_item.highlight_ranges,
-                    name_ranges: outline_item.name_ranges,
-                    body_range: outline_item
-                        .body_range
-                        .map(|range| Anchor::range_in_buffer(*excerpt_id, range)),
-                    annotation_range: outline_item
-                        .annotation_range
-                        .map(|range| Anchor::range_in_buffer(*excerpt_id, range)),
-                });
-            return Some(outline_items.collect());
-        }
-
-        None
-    }
-
-    fn new_internal(
-        mode: EditorMode,
-        multi_buffer: Entity<MultiBuffer>,
-        project: Option<Entity<Project>>,
-        display_map: Option<Entity<DisplayMap>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        debug_assert!(
-            display_map.is_none() || mode.is_minimap(),
-            "Providing a display map for a new editor is only intended for the minimap and might have unintended side effects otherwise!"
-        );
-
-        let full_mode = mode.is_full();
-        let is_minimap = mode.is_minimap();
-        let diagnostics_max_severity = if full_mode {
-            EditorSettings::get_global(cx)
-                .diagnostics_max_severity
-                .unwrap_or(DiagnosticSeverity::Hint)
-        } else {
-            DiagnosticSeverity::Off
-        };
-        let style = window.text_style();
-        let font_size = style.font_size.to_pixels(window.rem_size());
-        let editor = cx.entity().downgrade();
-        let fold_placeholder = FoldPlaceholder {
-            constrain_width: false,
-            render: Arc::new(move |fold_id, fold_range, cx| {
-                let editor = editor.clone();
-                div()
-                    .id(fold_id)
-                    .bg(cx.theme().colors().ghost_element_background)
-                    .hover(|style| style.bg(cx.theme().colors().ghost_element_hover))
-                    .active(|style| style.bg(cx.theme().colors().ghost_element_active))
-                    .rounded_xs()
-                    .size_full()
-                    .cursor_pointer()
-                    .child("⋯")
-                    .on_mouse_down(MouseButton::Left, |_, _, cx| cx.stop_propagation())
-                    .on_click(move |_, _window, cx| {
-                        editor
-                            .update(cx, |editor, cx| {
-                                editor.unfold_ranges(
-                                    &[fold_range.start..fold_range.end],
-                                    true,
-                                    false,
-                                    cx,
-                                );
-                                cx.stop_propagation();
-                            })
-                            .ok();
-                    })
-                    .into_any()
-            }),
-            merge_adjacent: true,
-            ..FoldPlaceholder::default()
-        };
-        let display_map = display_map.unwrap_or_else(|| {
-            cx.new(|cx| {
-                DisplayMap::new(
-                    multi_buffer.clone(),
-                    style.font(),
-                    font_size,
-                    None,
-                    FILE_HEADER_HEIGHT,
-                    MULTI_BUFFER_EXCERPT_HEADER_HEIGHT,
-                    fold_placeholder,
-                    diagnostics_max_severity,
-                    cx,
-                )
-            })
-        });
-
-        let selections = SelectionsCollection::new();
-
-        let blink_manager = cx.new(|cx| {
-            let mut blink_manager = BlinkManager::new(
-                CURSOR_BLINK_INTERVAL,
-                |cx| EditorSettings::get_global(cx).cursor_blink,
-                cx,
-            );
-            if is_minimap {
-                blink_manager.disable(cx);
-            }
-            blink_manager
-        });
-
-        let soft_wrap_mode_override =
-            matches!(mode, EditorMode::SingleLine).then(|| language_settings::SoftWrap::None);
-
-        let mut project_subscriptions = Vec::new();
-        if full_mode && let Some(project) = project.as_ref() {
-            project_subscriptions.push(cx.subscribe_in(
-                project,
-                window,
-                |editor, _, event, window, cx| match event {
-                    project::Event::RefreshCodeLens => {
-                        // we always query lens with actions, without storing them, always refreshing them
-                    }
-                    project::Event::RefreshInlayHints {
-                        server_id,
-                        request_id,
-                    } => {
-                        editor.refresh_inlay_hints(
-                            InlayHintRefreshReason::RefreshRequested {
-                                server_id: *server_id,
-                                request_id: *request_id,
-                            },
-                            cx,
-                        );
-                    }
-                    project::Event::LanguageServerRemoved(..) => {
-                        if editor.tasks_update_task.is_none() {
-                            editor.tasks_update_task = Some(editor.refresh_runnables(window, cx));
-                        }
-                        editor.registered_buffers.clear();
-                        editor.register_visible_buffers(cx);
-                    }
-                    project::Event::LanguageServerAdded(..) => {
-                        if editor.tasks_update_task.is_none() {
-                            editor.tasks_update_task = Some(editor.refresh_runnables(window, cx));
-                        }
-                    }
-                    project::Event::SnippetEdit(id, snippet_edits) => {
-                        // todo(lw): Non singletons
-                        if let Some(buffer) = editor.buffer.read(cx).as_singleton() {
-                            let snapshot = buffer.read(cx).snapshot();
-                            let focus_handle = editor.focus_handle(cx);
-                            if snapshot.remote_id() == *id && focus_handle.is_focused(window) {
-                                for (range, snippet) in snippet_edits {
-                                    let buffer_range =
-                                        language::range_from_lsp(*range).to_offset(&snapshot);
-                                    editor
-                                        .insert_snippet(
-                                            &[MultiBufferOffset(buffer_range.start)
-                                                ..MultiBufferOffset(buffer_range.end)],
-                                            snippet.clone(),
-                                            window,
-                                            cx,
-                                        )
-                                        .ok();
-                                }
-                            }
-                        }
-                    }
-                    project::Event::LanguageServerBufferRegistered { buffer_id, .. } => {
-                        let buffer_id = *buffer_id;
-                        if editor.buffer().read(cx).buffer(buffer_id).is_some() {
-                            editor.register_buffer(buffer_id, cx);
-                            editor.update_lsp_data(Some(buffer_id), window, cx);
-                            editor.refresh_inlay_hints(InlayHintRefreshReason::NewLinesShown, cx);
-                            refresh_linked_ranges(editor, window, cx);
-                            editor.refresh_code_actions(window, cx);
-                            editor.refresh_document_highlights(cx);
-                        }
-                    }
-
-                    project::Event::EntryRenamed(transaction, project_path, abs_path) => {
-                        let Some(workspace) = editor.workspace() else {
-                            return;
-                        };
-                        let Some(active_editor) = workspace.read(cx).active_item_as::<Self>(cx)
-                        else {
-                            return;
-                        };
-
-                        if active_editor.entity_id() == cx.entity_id() {
-                            let entity_id = cx.entity_id();
-                            workspace.update(cx, |this, cx| {
-                                this.panes_mut()
-                                    .iter_mut()
-                                    .filter(|pane| pane.entity_id() != entity_id)
-                                    .for_each(|p| {
-                                        p.update(cx, |pane, _| {
-                                            pane.nav_history_mut().rename_item(
-                                                entity_id,
-                                                project_path.clone(),
-                                                abs_path.clone().into(),
-                                            );
-                                        })
-                                    });
-                            });
-                            let edited_buffers_already_open = {
-                                let other_editors: Vec<Entity<Editor>> = workspace
-                                    .read(cx)
-                                    .panes()
-                                    .iter()
-                                    .flat_map(|pane| pane.read(cx).items_of_type::<Editor>())
-                                    .filter(|editor| editor.entity_id() != cx.entity_id())
-                                    .collect();
-
-                                transaction.0.keys().all(|buffer| {
-                                    other_editors.iter().any(|editor| {
-                                        let multi_buffer = editor.read(cx).buffer();
-                                        multi_buffer.read(cx).is_singleton()
-                                            && multi_buffer.read(cx).as_singleton().map_or(
-                                                false,
-                                                |singleton| {
-                                                    singleton.entity_id() == buffer.entity_id()
-                                                },
-                                            )
-                                    })
-                                })
-                            };
-                            if !edited_buffers_already_open {
-                                let workspace = workspace.downgrade();
-                                let transaction = transaction.clone();
-                                cx.defer_in(window, move |_, window, cx| {
-                                    cx.spawn_in(window, async move |editor, cx| {
-                                        Self::open_project_transaction(
-                                            &editor,
-                                            workspace,
-                                            transaction,
-                                            "Rename".to_string(),
-                                            cx,
-                                        )
-                                        .await
-                                        .ok()
-                                    })
-                                    .detach();
-                                });
-                            }
-                        }
-                    }
-
-                    _ => {}
-                },
-            ));
-            if let Some(task_inventory) = project
-                .read(cx)
-                .task_store()
-                .read(cx)
-                .task_inventory()
-                .cloned()
-            {
-                project_subscriptions.push(cx.observe_in(
-                    &task_inventory,
-                    window,
-                    |editor, _, window, cx| {
-                        editor.tasks_update_task = Some(editor.refresh_runnables(window, cx));
-                    },
-                ));
-            };
-
-            project_subscriptions.push(cx.subscribe_in(
-                &project.read(cx).breakpoint_store(),
-                window,
-                |editor, _, event, window, cx| match event {
-                    BreakpointStoreEvent::ClearDebugLines => {
-                        editor.clear_row_highlights::<ActiveDebugLine>();
-                        editor.refresh_inline_values(cx);
-                    }
-                    BreakpointStoreEvent::SetDebugLine => {
-                        if editor.go_to_active_debug_line(window, cx) {
-                            cx.stop_propagation();
-                        }
-
-                        editor.refresh_inline_values(cx);
-                    }
-                    _ => {}
-                },
-            ));
-            let git_store = project.read(cx).git_store().clone();
-            let project = project.clone();
-            project_subscriptions.push(cx.subscribe(&git_store, move |this, _, event, cx| {
-                if let GitStoreEvent::RepositoryAdded = event {
-                    this.load_diff_task = Some(
-                        update_uncommitted_diff_for_buffer(
-                            cx.entity(),
-                            &project,
-                            this.buffer.read(cx).all_buffers(),
-                            this.buffer.clone(),
-                            cx,
-                        )
-                        .shared(),
-                    );
-                }
-            }));
-        }
-
-        let buffer_snapshot = multi_buffer.read(cx).snapshot(cx);
-
-        let inlay_hint_settings =
-            inlay_hint_settings(selections.newest_anchor().head(), &buffer_snapshot, cx);
-        let focus_handle = cx.focus_handle();
-        if !is_minimap {
-            cx.on_focus(&focus_handle, window, Self::handle_focus)
-                .detach();
-            cx.on_focus_in(&focus_handle, window, Self::handle_focus_in)
-                .detach();
-            cx.on_focus_out(&focus_handle, window, Self::handle_focus_out)
-                .detach();
-            cx.on_blur(&focus_handle, window, Self::handle_blur)
-                .detach();
-            cx.observe_pending_input(window, Self::observe_pending_input)
-                .detach();
-        }
-
-        let show_indent_guides =
-            if matches!(mode, EditorMode::SingleLine | EditorMode::Minimap { .. }) {
-                Some(false)
-            } else {
-                None
-            };
-
-        let breakpoint_store = match (&mode, project.as_ref()) {
-            (EditorMode::Full { .. }, Some(project)) => Some(project.read(cx).breakpoint_store()),
-            _ => None,
-        };
-
-        let mut code_action_providers = Vec::new();
-        let mut load_uncommitted_diff = None;
-        if let Some(project) = project.clone() {
-            load_uncommitted_diff = Some(
-                update_uncommitted_diff_for_buffer(
-                    cx.entity(),
-                    &project,
-                    multi_buffer.read(cx).all_buffers(),
-                    multi_buffer.clone(),
-                    cx,
-                )
-                .shared(),
-            );
-            code_action_providers.push(Rc::new(project) as Rc<_>);
-        }
-
-        let mut editor = Self {
-            focus_handle,
-            show_cursor_when_unfocused: false,
-            last_focused_descendant: None,
-            buffer: multi_buffer.clone(),
-            display_map: display_map.clone(),
-            placeholder_display_map: None,
-            selections,
-            scroll_manager: ScrollManager::new(cx),
-            columnar_selection_state: None,
-            add_selections_state: None,
-            select_next_state: None,
-            select_prev_state: None,
-            selection_history: SelectionHistory::default(),
-            defer_selection_effects: false,
-            deferred_selection_effects_state: None,
-            autoclose_regions: Vec::new(),
-            snippet_stack: InvalidationStack::default(),
-            select_syntax_node_history: SelectSyntaxNodeHistory::default(),
-            ime_transaction: None,
-            active_diagnostics: ActiveDiagnostic::None,
-            show_inline_diagnostics: ProjectSettings::get_global(cx).diagnostics.inline.enabled,
-            inline_diagnostics_update: Task::ready(()),
-            inline_diagnostics: Vec::new(),
-            soft_wrap_mode_override,
-            diagnostics_max_severity,
-            hard_wrap: None,
-            completion_provider: project.clone().map(|project| Rc::new(project) as _),
-            semantics_provider: project.clone().map(|project| Rc::new(project) as _),
-            collaboration_hub: project.clone().map(|project| Box::new(project) as _),
-            project,
-            blink_manager: blink_manager.clone(),
-            show_local_selections: true,
-            show_scrollbars: ScrollbarAxes {
-                horizontal: full_mode,
-                vertical: full_mode,
-            },
-            minimap_visibility: MinimapVisibility::for_mode(&mode, cx),
-            offset_content: !matches!(mode, EditorMode::SingleLine),
-            show_breadcrumbs: EditorSettings::get_global(cx).toolbar.breadcrumbs,
-            show_gutter: full_mode,
-            show_line_numbers: (!full_mode).then_some(false),
-            use_relative_line_numbers: None,
-            disable_expand_excerpt_buttons: !full_mode,
-            show_git_diff_gutter: None,
-            show_code_actions: None,
-            show_runnables: None,
-            show_breakpoints: None,
-            show_wrap_guides: None,
-            show_indent_guides,
-            buffers_with_disabled_indent_guides: HashSet::default(),
-            highlight_order: 0,
-            highlighted_rows: HashMap::default(),
-            background_highlights: HashMap::default(),
-            gutter_highlights: HashMap::default(),
-            scrollbar_marker_state: ScrollbarMarkerState::default(),
-            active_indent_guides_state: ActiveIndentGuidesState::default(),
-            nav_history: None,
-            context_menu: RefCell::new(None),
-            context_menu_options: None,
-            mouse_context_menu: None,
-            completion_tasks: Vec::new(),
-            inline_blame_popover: None,
-            inline_blame_popover_show_task: None,
-            signature_help_state: SignatureHelpState::default(),
-            auto_signature_help: None,
-            find_all_references_task_sources: Vec::new(),
-            next_completion_id: 0,
-            next_inlay_id: 0,
-            code_action_providers,
-            available_code_actions: None,
-            code_actions_task: None,
-            quick_selection_highlight_task: None,
-            debounced_selection_highlight_task: None,
-            document_highlights_task: None,
-            linked_editing_range_task: None,
-            pending_rename: None,
-            searchable: !is_minimap,
-            cursor_shape: EditorSettings::get_global(cx)
-                .cursor_shape
-                .unwrap_or_default(),
-            current_line_highlight: None,
-            autoindent_mode: Some(AutoindentMode::EachLine),
-            collapse_matches: false,
-            workspace: None,
-            input_enabled: !is_minimap,
-            use_modal_editing: full_mode,
-            read_only: is_minimap,
-            use_autoclose: true,
-            use_auto_surround: true,
-            auto_replace_emoji_shortcode: false,
-            jsx_tag_auto_close_enabled_in_any_buffer: false,
-            leader_id: None,
-            remote_id: None,
-            hover_state: HoverState::default(),
-            pending_mouse_down: None,
-            hovered_link_state: None,
-            edit_prediction_provider: None,
-            active_edit_prediction: None,
-            stale_edit_prediction_in_menu: None,
-            edit_prediction_preview: EditPredictionPreview::Inactive {
-                released_too_fast: false,
-            },
-            inline_diagnostics_enabled: full_mode,
-            diagnostics_enabled: full_mode,
-            word_completions_enabled: full_mode,
-            inline_value_cache: InlineValueCache::new(inlay_hint_settings.show_value_hints),
-            gutter_hovered: false,
-            pixel_position_of_newest_cursor: None,
-            last_bounds: None,
-            last_position_map: None,
-            expect_bounds_change: None,
-            gutter_dimensions: GutterDimensions::default(),
-            style: None,
-            show_cursor_names: false,
-            hovered_cursors: HashMap::default(),
-            next_editor_action_id: EditorActionId::default(),
-            editor_actions: Rc::default(),
-            edit_predictions_hidden_for_vim_mode: false,
-            show_edit_predictions_override: None,
-            show_completions_on_input_override: None,
-            menu_edit_predictions_policy: MenuEditPredictionsPolicy::ByProvider,
-            edit_prediction_settings: EditPredictionSettings::Disabled,
-            edit_prediction_indent_conflict: false,
-            edit_prediction_requires_modifier_in_indent_conflict: true,
-            custom_context_menu: None,
-            show_git_blame_gutter: false,
-            show_git_blame_inline: false,
-            show_selection_menu: None,
-            show_git_blame_inline_delay_task: None,
-            git_blame_inline_enabled: full_mode
-                && ProjectSettings::get_global(cx).git.inline_blame.enabled,
-            render_diff_hunk_controls: Arc::new(render_diff_hunk_controls),
-            buffer_serialization: is_minimap.not().then(|| {
-                BufferSerialization::new(
-                    ProjectSettings::get_global(cx)
-                        .session
-                        .restore_unsaved_buffers,
-                )
-            }),
-            blame: None,
-            blame_subscription: None,
-            tasks: BTreeMap::default(),
-
-            breakpoint_store,
-            gutter_breakpoint_indicator: (None, None),
-            hovered_diff_hunk_row: None,
-            _subscriptions: (!is_minimap)
-                .then(|| {
-                    vec![
-                        cx.observe(&multi_buffer, Self::on_buffer_changed),
-                        cx.subscribe_in(&multi_buffer, window, Self::on_buffer_event),
-                        cx.observe_in(&display_map, window, Self::on_display_map_changed),
-                        cx.observe(&blink_manager, |_, _, cx| cx.notify()),
-                        cx.observe_global_in::<SettingsStore>(window, Self::settings_changed),
-                        observe_buffer_font_size_adjustment(cx, |_, cx| cx.notify()),
-                        cx.observe_window_activation(window, |editor, window, cx| {
-                            let active = window.is_window_active();
-                            editor.blink_manager.update(cx, |blink_manager, cx| {
-                                if active {
-                                    blink_manager.enable(cx);
-                                } else {
-                                    blink_manager.disable(cx);
-                                }
-                            });
-                            if active {
-                                editor.show_mouse_cursor(cx);
-                            }
-                        }),
-                    ]
-                })
-                .unwrap_or_default(),
-            tasks_update_task: None,
-            pull_diagnostics_task: Task::ready(()),
-            pull_diagnostics_background_task: Task::ready(()),
-            colors: None,
-            refresh_colors_task: Task::ready(()),
-            inlay_hints: None,
-            next_color_inlay_id: 0,
-            post_scroll_update: Task::ready(()),
-            linked_edit_ranges: Default::default(),
-            in_project_search: false,
-            previous_search_ranges: None,
-            breadcrumb_header: None,
-            focused_block: None,
-            next_scroll_position: NextScrollCursorCenterTopBottom::default(),
-            addons: HashMap::default(),
-            registered_buffers: HashMap::default(),
-            _scroll_cursor_center_top_bottom_task: Task::ready(()),
-            selection_mark_mode: false,
-            toggle_fold_multiple_buffers: Task::ready(()),
-            serialize_selections: Task::ready(()),
-            serialize_folds: Task::ready(()),
-            text_style_refinement: None,
-            load_diff_task: load_uncommitted_diff,
-            temporary_diff_override: false,
-            mouse_cursor_hidden: false,
-            minimap: None,
-            hide_mouse_mode: EditorSettings::get_global(cx)
-                .hide_mouse
-                .unwrap_or_default(),
-            change_list: ChangeList::new(),
-            mode,
-            selection_drag_state: SelectionDragState::None,
-            folding_newlines: Task::ready(()),
-            lookup_key: None,
-            select_next_is_case_sensitive: None,
-            applicable_language_settings: HashMap::default(),
-            accent_data: None,
-            fetched_tree_sitter_chunks: HashMap::default(),
-            use_base_text_line_numbers: false,
-        };
-
-        if is_minimap {
-            return editor;
-        }
-
-        editor.applicable_language_settings = editor.fetch_applicable_language_settings(cx);
-        editor.accent_data = editor.fetch_accent_data(cx);
-
-        if let Some(breakpoints) = editor.breakpoint_store.as_ref() {
-            editor
-                ._subscriptions
-                .push(cx.observe(breakpoints, |_, _, cx| {
-                    cx.notify();
-                }));
-        }
-        editor.tasks_update_task = Some(editor.refresh_runnables(window, cx));
-        editor._subscriptions.extend(project_subscriptions);
-
-        editor._subscriptions.push(cx.subscribe_in(
-            &cx.entity(),
-            window,
-            |editor, _, e: &EditorEvent, window, cx| match e {
-                EditorEvent::ScrollPositionChanged { local, .. } => {
-                    if *local {
-                        editor.hide_signature_help(cx, SignatureHelpHiddenBy::Escape);
-                        editor.inline_blame_popover.take();
-                        let new_anchor = editor.scroll_manager.anchor();
-                        let snapshot = editor.snapshot(window, cx);
-                        editor.update_restoration_data(cx, move |data| {
-                            data.scroll_position = (
-                                new_anchor.top_row(snapshot.buffer_snapshot()),
-                                new_anchor.offset,
-                            );
-                        });
-
-                        editor.post_scroll_update = cx.spawn_in(window, async move |editor, cx| {
-                            cx.background_executor()
-                                .timer(Duration::from_millis(50))
-                                .await;
-                            editor
-                                .update_in(cx, |editor, window, cx| {
-                                    editor.register_visible_buffers(cx);
-                                    editor.refresh_colors_for_visible_range(None, window, cx);
-                                    editor.refresh_inlay_hints(
-                                        InlayHintRefreshReason::NewLinesShown,
-                                        cx,
-                                    );
-                                    editor.colorize_brackets(false, cx);
-                                })
-                                .ok();
-                        });
-                    }
-                }
-                EditorEvent::Edited { .. } => {
-                    let vim_mode = vim_mode_setting::VimModeSetting::try_get(cx)
-                        .map(|vim_mode| vim_mode.0)
-                        .unwrap_or(false);
-                    if !vim_mode {
-                        let display_map = editor.display_snapshot(cx);
-                        let selections = editor.selections.all_adjusted_display(&display_map);
-                        let pop_state = editor
-                            .change_list
-                            .last()
-                            .map(|previous| {
-                                previous.len() == selections.len()
-                                    && previous.iter().enumerate().all(|(ix, p)| {
-                                        p.to_display_point(&display_map).row()
-                                            == selections[ix].head().row()
-                                    })
-                            })
-                            .unwrap_or(false);
-                        let new_positions = selections
-                            .into_iter()
-                            .map(|s| display_map.display_point_to_anchor(s.head(), Bias::Left))
-                            .collect();
-                        editor
-                            .change_list
-                            .push_to_change_list(pop_state, new_positions);
-                    }
-                }
-                _ => (),
-            },
-        ));
-
-        if let Some(dap_store) = editor
-            .project
-            .as_ref()
-            .map(|project| project.read(cx).dap_store())
-        {
-            let weak_editor = cx.weak_entity();
-
-            editor
-                ._subscriptions
-                .push(
-                    cx.observe_new::<project::debugger::session::Session>(move |_, _, cx| {
-                        let session_entity = cx.entity();
-                        weak_editor
-                            .update(cx, |editor, cx| {
-                                editor._subscriptions.push(
-                                    cx.subscribe(&session_entity, Self::on_debug_session_event),
-                                );
-                            })
-                            .ok();
-                    }),
-                );
-
-            for session in dap_store.read(cx).sessions().cloned().collect::<Vec<_>>() {
-                editor
-                    ._subscriptions
-                    .push(cx.subscribe(&session, Self::on_debug_session_event));
-            }
-        }
-
-        // skip adding the initial selection to selection history
-        editor.selection_history.mode = SelectionHistoryMode::Skipping;
-        editor.end_selection(window, cx);
-        editor.selection_history.mode = SelectionHistoryMode::Normal;
-
-        editor.scroll_manager.show_scrollbars(window, cx);
-        jsx_tag_auto_close::refresh_enabled_in_any_buffer(&mut editor, &multi_buffer, cx);
-
-        if full_mode {
-            let should_auto_hide_scrollbars = cx.should_auto_hide_scrollbars();
-            cx.set_global(ScrollbarAutoHide(should_auto_hide_scrollbars));
-
-            if editor.git_blame_inline_enabled {
-                editor.start_git_blame_inline(false, window, cx);
-            }
-
-            editor.go_to_active_debug_line(window, cx);
-
-            editor.minimap =
-                editor.create_minimap(EditorSettings::get_global(cx).minimap, window, cx);
-            editor.colors = Some(LspColorData::new(cx));
-            editor.inlay_hints = Some(LspInlayHintData::new(inlay_hint_settings));
-
-            if let Some(buffer) = multi_buffer.read(cx).as_singleton() {
-                editor.register_buffer(buffer.read(cx).remote_id(), cx);
-            }
-            editor.report_editor_event(ReportEditorEvent::EditorOpened, None, cx);
-        }
-
-        editor
-    }
-
-    pub fn display_snapshot(&self, cx: &mut App) -> DisplaySnapshot {
-        self.display_map.update(cx, |map, cx| map.snapshot(cx))
-    }
-
-    pub fn deploy_mouse_context_menu(
-        &mut self,
-        position: gpui::Point<Pixels>,
-        context_menu: Entity<ContextMenu>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.mouse_context_menu = Some(MouseContextMenu::new(
-            self,
-            crate::mouse_context_menu::MenuPosition::PinnedToScreen(position),
-            context_menu,
-            window,
-            cx,
-        ));
-    }
-
-    pub fn mouse_menu_is_focused(&self, window: &Window, cx: &App) -> bool {
-        self.mouse_context_menu
-            .as_ref()
-            .is_some_and(|menu| menu.context_menu.focus_handle(cx).is_focused(window))
-    }
-
-    pub fn is_range_selected(&mut self, range: &Range<Anchor>, cx: &mut Context<Self>) -> bool {
-        if self
-            .selections
-            .pending_anchor()
-            .is_some_and(|pending_selection| {
-                let snapshot = self.buffer().read(cx).snapshot(cx);
-                pending_selection.range().includes(range, &snapshot)
-            })
-        {
-            return true;
-        }
-
-        self.selections
-            .disjoint_in_range::<MultiBufferOffset>(range.clone(), &self.display_snapshot(cx))
-            .into_iter()
-            .any(|selection| {
-                // This is needed to cover a corner case, if we just check for an existing
-                // selection in the fold range, having a cursor at the start of the fold
-                // marks it as selected. Non-empty selections don't cause this.
-                let length = selection.end - selection.start;
-                length > 0
-            })
-    }
-
-    pub fn key_context(&self, window: &mut Window, cx: &mut App) -> KeyContext {
-        self.key_context_internal(self.has_active_edit_prediction(), window, cx)
-    }
-
-    fn key_context_internal(
-        &self,
-        has_active_edit_prediction: bool,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> KeyContext {
-        let mut key_context = KeyContext::new_with_defaults();
-        key_context.add("Editor");
-        let mode = match self.mode {
-            EditorMode::SingleLine => "single_line",
-            EditorMode::AutoHeight { .. } => "auto_height",
-            EditorMode::Minimap { .. } => "minimap",
-            EditorMode::Full { .. } => "full",
-        };
-
-        if EditorSettings::jupyter_enabled(cx) {
-            key_context.add("jupyter");
-        }
-
-        key_context.set("mode", mode);
-        if self.pending_rename.is_some() {
-            key_context.add("renaming");
-        }
-
-        if let Some(snippet_stack) = self.snippet_stack.last() {
-            key_context.add("in_snippet");
-
-            if snippet_stack.active_index > 0 {
-                key_context.add("has_previous_tabstop");
-            }
-
-            if snippet_stack.active_index < snippet_stack.ranges.len().saturating_sub(1) {
-                key_context.add("has_next_tabstop");
-            }
-        }
-
-        match self.context_menu.borrow().as_ref() {
-            Some(CodeContextMenu::Completions(menu)) => {
-                if menu.visible() {
-                    key_context.add("menu");
-                    key_context.add("showing_completions");
-                }
-            }
-            Some(CodeContextMenu::CodeActions(menu)) => {
-                if menu.visible() {
-                    key_context.add("menu");
-                    key_context.add("showing_code_actions")
-                }
-            }
-            None => {}
-        }
-
-        if self.signature_help_state.has_multiple_signatures() {
-            key_context.add("showing_signature_help");
-        }
-
-        // Disable vim contexts when a sub-editor (e.g. rename/inline assistant) is focused.
-        if !self.focus_handle(cx).contains_focused(window, cx)
-            || (self.is_focused(window) || self.mouse_menu_is_focused(window, cx))
-        {
-            for addon in self.addons.values() {
-                addon.extend_key_context(&mut key_context, cx)
-            }
-        }
-
-        if let Some(singleton_buffer) = self.buffer.read(cx).as_singleton() {
-            if let Some(extension) = singleton_buffer.read(cx).file().and_then(|file| {
-                Some(
-                    file.full_path(cx)
-                        .extension()?
-                        .to_string_lossy()
-                        .into_owned(),
-                )
-            }) {
-                key_context.set("extension", extension);
-            }
-        } else {
-            key_context.add("multibuffer");
-        }
-
-        if has_active_edit_prediction {
-            if self.edit_prediction_in_conflict() {
-                key_context.add(EDIT_PREDICTION_CONFLICT_KEY_CONTEXT);
-            } else {
-                key_context.add(EDIT_PREDICTION_KEY_CONTEXT);
-                key_context.add("copilot_suggestion");
-            }
-        }
-
-        if self.selection_mark_mode {
-            key_context.add("selection_mode");
-        }
-
-        let disjoint = self.selections.disjoint_anchors();
-        let snapshot = self.snapshot(window, cx);
-        let snapshot = snapshot.buffer_snapshot();
-        if self.mode == EditorMode::SingleLine
-            && let [selection] = disjoint
-            && selection.start == selection.end
-            && selection.end.to_offset(snapshot) == snapshot.len()
-        {
-            key_context.add("end_of_input");
-        }
-
-        if self.has_any_expanded_diff_hunks(cx) {
-            key_context.add("diffs_expanded");
-        }
-
-        key_context
-    }
-
-    pub fn last_bounds(&self) -> Option<&Bounds<Pixels>> {
-        self.last_bounds.as_ref()
-    }
-
-    fn show_mouse_cursor(&mut self, cx: &mut Context<Self>) {
-        if self.mouse_cursor_hidden {
-            self.mouse_cursor_hidden = false;
-            cx.notify();
-        }
-    }
-
-    pub fn hide_mouse_cursor(&mut self, origin: HideMouseCursorOrigin, cx: &mut Context<Self>) {
-        let hide_mouse_cursor = match origin {
-            HideMouseCursorOrigin::TypingAction => {
-                matches!(
-                    self.hide_mouse_mode,
-                    HideMouseMode::OnTyping | HideMouseMode::OnTypingAndMovement
-                )
-            }
-            HideMouseCursorOrigin::MovementAction => {
-                matches!(self.hide_mouse_mode, HideMouseMode::OnTypingAndMovement)
-            }
-        };
-        if self.mouse_cursor_hidden != hide_mouse_cursor {
-            self.mouse_cursor_hidden = hide_mouse_cursor;
-            cx.notify();
-        }
-    }
-
-    pub fn edit_prediction_in_conflict(&self) -> bool {
-        if !self.show_edit_predictions_in_menu() {
-            return false;
-        }
-
-        let showing_completions = self
-            .context_menu
-            .borrow()
-            .as_ref()
-            .is_some_and(|context| matches!(context, CodeContextMenu::Completions(_)));
-
-        showing_completions
-            || self.edit_prediction_requires_modifier()
-            // Require modifier key when the cursor is on leading whitespace, to allow `tab`
-            // bindings to insert tab characters.
-            || (self.edit_prediction_requires_modifier_in_indent_conflict && self.edit_prediction_indent_conflict)
-    }
-
-    pub fn accept_edit_prediction_keybind(
-        &self,
-        accept_partial: bool,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> AcceptEditPredictionBinding {
-        let key_context = self.key_context_internal(true, window, cx);
-        let in_conflict = self.edit_prediction_in_conflict();
-
-        let bindings = if accept_partial {
-            window.bindings_for_action_in_context(&AcceptPartialEditPrediction, key_context)
-        } else {
-            window.bindings_for_action_in_context(&AcceptEditPrediction, key_context)
-        };
-
-        // TODO: if the binding contains multiple keystrokes, display all of them, not
-        // just the first one.
-        AcceptEditPredictionBinding(bindings.into_iter().rev().find(|binding| {
-            !in_conflict
-                || binding
-                    .keystrokes()
-                    .first()
-                    .is_some_and(|keystroke| keystroke.modifiers().modified())
-        }))
-    }
-
-    pub fn new_file(
-        workspace: &mut Workspace,
-        _: &workspace::NewFile,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        Self::new_in_workspace(workspace, window, cx).detach_and_prompt_err(
-            "Failed to create buffer",
-            window,
-            cx,
-            |e, _, _| match e.error_code() {
-                ErrorCode::RemoteUpgradeRequired => Some(format!(
-                "The remote instance of Zed does not support this yet. It must be upgraded to {}",
-                e.error_tag("required").unwrap_or("the latest version")
-            )),
-                _ => None,
-            },
-        );
-    }
-
-    pub fn new_in_workspace(
-        workspace: &mut Workspace,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) -> Task<Result<Entity<Editor>>> {
-        let project = workspace.project().clone();
-        let create = project.update(cx, |project, cx| project.create_buffer(true, cx));
-
-        cx.spawn_in(window, async move |workspace, cx| {
-            let buffer = create.await?;
-            workspace.update_in(cx, |workspace, window, cx| {
-                let editor =
-                    cx.new(|cx| Editor::for_buffer(buffer, Some(project.clone()), window, cx));
-                workspace.add_item_to_active_pane(Box::new(editor.clone()), None, true, window, cx);
-                editor
-            })
-        })
-    }
-
-    fn new_file_vertical(
-        workspace: &mut Workspace,
-        _: &workspace::NewFileSplitVertical,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        Self::new_file_in_direction(workspace, SplitDirection::vertical(cx), window, cx)
-    }
-
-    fn new_file_horizontal(
-        workspace: &mut Workspace,
-        _: &workspace::NewFileSplitHorizontal,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        Self::new_file_in_direction(workspace, SplitDirection::horizontal(cx), window, cx)
-    }
-
-    fn new_file_split(
-        workspace: &mut Workspace,
-        action: &workspace::NewFileSplit,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        Self::new_file_in_direction(workspace, action.0, window, cx)
-    }
-
-    fn new_file_in_direction(
-        workspace: &mut Workspace,
-        direction: SplitDirection,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        let project = workspace.project().clone();
-        let create = project.update(cx, |project, cx| project.create_buffer(true, cx));
-
-        cx.spawn_in(window, async move |workspace, cx| {
-            let buffer = create.await?;
-            workspace.update_in(cx, move |workspace, window, cx| {
-                workspace.split_item(
-                    direction,
-                    Box::new(
-                        cx.new(|cx| Editor::for_buffer(buffer, Some(project.clone()), window, cx)),
-                    ),
-                    window,
-                    cx,
-                )
-            })?;
-            anyhow::Ok(())
-        })
-        .detach_and_prompt_err("Failed to create buffer", window, cx, |e, _, _| {
-            match e.error_code() {
-                ErrorCode::RemoteUpgradeRequired => Some(format!(
-                "The remote instance of Zed does not support this yet. It must be upgraded to {}",
-                e.error_tag("required").unwrap_or("the latest version")
-            )),
-                _ => None,
-            }
-        });
-    }
-
-    pub fn leader_id(&self) -> Option<CollaboratorId> {
-        self.leader_id
-    }
-
-    pub fn buffer(&self) -> &Entity<MultiBuffer> {
-        &self.buffer
-    }
-
-    pub fn project(&self) -> Option<&Entity<Project>> {
-        self.project.as_ref()
-    }
-
-    pub fn workspace(&self) -> Option<Entity<Workspace>> {
-        self.workspace.as_ref()?.0.upgrade()
-    }
-
-    /// Returns the workspace serialization ID if this editor should be serialized.
-    fn workspace_serialization_id(&self, _cx: &App) -> Option<WorkspaceId> {
-        self.workspace
-            .as_ref()
-            .filter(|_| self.should_serialize_buffer())
-            .and_then(|workspace| workspace.1)
-    }
-
-    pub fn title<'a>(&self, cx: &'a App) -> Cow<'a, str> {
-        self.buffer().read(cx).title(cx)
-    }
-
-    pub fn snapshot(&self, window: &Window, cx: &mut App) -> EditorSnapshot {
-        let git_blame_gutter_max_author_length = self
-            .render_git_blame_gutter(cx)
-            .then(|| {
-                if let Some(blame) = self.blame.as_ref() {
-                    let max_author_length =
-                        blame.update(cx, |blame, cx| blame.max_author_length(cx));
-                    Some(max_author_length)
-                } else {
-                    None
-                }
-            })
-            .flatten();
-
-        EditorSnapshot {
-            mode: self.mode.clone(),
-            show_gutter: self.show_gutter,
-            offset_content: self.offset_content,
-            show_line_numbers: self.show_line_numbers,
-            show_git_diff_gutter: self.show_git_diff_gutter,
-            show_code_actions: self.show_code_actions,
-            show_runnables: self.show_runnables,
-            show_breakpoints: self.show_breakpoints,
-            git_blame_gutter_max_author_length,
-            display_snapshot: self.display_map.update(cx, |map, cx| map.snapshot(cx)),
-            placeholder_display_snapshot: self
-                .placeholder_display_map
-                .as_ref()
-                .map(|display_map| display_map.update(cx, |map, cx| map.snapshot(cx))),
-            scroll_anchor: self.scroll_manager.anchor(),
-            ongoing_scroll: self.scroll_manager.ongoing_scroll(),
-            is_focused: self.focus_handle.is_focused(window),
-            current_line_highlight: self
-                .current_line_highlight
-                .unwrap_or_else(|| EditorSettings::get_global(cx).current_line_highlight),
-            gutter_hovered: self.gutter_hovered,
-        }
-    }
-
-    pub fn language_at<T: ToOffset>(&self, point: T, cx: &App) -> Option<Arc<Language>> {
-        self.buffer.read(cx).language_at(point, cx)
-    }
-
-    pub fn file_at<T: ToOffset>(&self, point: T, cx: &App) -> Option<Arc<dyn language::File>> {
-        self.buffer.read(cx).read(cx).file_at(point).cloned()
-    }
-
-    pub fn active_excerpt(
-        &self,
-        cx: &App,
-    ) -> Option<(ExcerptId, Entity<Buffer>, Range<text::Anchor>)> {
-        self.buffer
-            .read(cx)
-            .excerpt_containing(self.selections.newest_anchor().head(), cx)
-    }
-
-    pub fn mode(&self) -> &EditorMode {
-        &self.mode
-    }
-
-    pub fn set_mode(&mut self, mode: EditorMode) {
-        self.mode = mode;
-    }
-
-    pub fn collaboration_hub(&self) -> Option<&dyn CollaborationHub> {
-        self.collaboration_hub.as_deref()
-    }
-
-    pub fn set_collaboration_hub(&mut self, hub: Box<dyn CollaborationHub>) {
-        self.collaboration_hub = Some(hub);
-    }
-
-    pub fn set_in_project_search(&mut self, in_project_search: bool) {
-        self.in_project_search = in_project_search;
-    }
-
-    pub fn set_custom_context_menu(
-        &mut self,
-        f: impl 'static
-        + Fn(
-            &mut Self,
-            DisplayPoint,
-            &mut Window,
-            &mut Context<Self>,
-        ) -> Option<Entity<ui::ContextMenu>>,
-    ) {
-        self.custom_context_menu = Some(Box::new(f))
-    }
-
-    pub fn set_completion_provider(&mut self, provider: Option<Rc<dyn CompletionProvider>>) {
-        self.completion_provider = provider;
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn completion_provider(&self) -> Option<Rc<dyn CompletionProvider>> {
-        self.completion_provider.clone()
-    }
-
-    pub fn semantics_provider(&self) -> Option<Rc<dyn SemanticsProvider>> {
-        self.semantics_provider.clone()
-    }
-
-    pub fn set_semantics_provider(&mut self, provider: Option<Rc<dyn SemanticsProvider>>) {
-        self.semantics_provider = provider;
-    }
-
-    pub fn set_edit_prediction_provider<T>(
-        &mut self,
-        provider: Option<Entity<T>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) where
-        T: EditPredictionDelegate,
-    {
-        self.edit_prediction_provider = provider.map(|provider| RegisteredEditPredictionDelegate {
-            _subscription: cx.observe_in(&provider, window, |this, _, window, cx| {
-                if this.focus_handle.is_focused(window) {
-                    this.update_visible_edit_prediction(window, cx);
-                }
-            }),
-            provider: Arc::new(provider),
-        });
-        self.update_edit_prediction_settings(cx);
-        self.refresh_edit_prediction(false, false, window, cx);
-    }
-
-    pub fn placeholder_text(&self, cx: &mut App) -> Option<String> {
-        self.placeholder_display_map
-            .as_ref()
-            .map(|display_map| display_map.update(cx, |map, cx| map.snapshot(cx)).text())
-    }
-
-    pub fn set_placeholder_text(
-        &mut self,
-        placeholder_text: &str,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let multibuffer = cx
-            .new(|cx| MultiBuffer::singleton(cx.new(|cx| Buffer::local(placeholder_text, cx)), cx));
-
-        let style = window.text_style();
-
-        self.placeholder_display_map = Some(cx.new(|cx| {
-            DisplayMap::new(
-                multibuffer,
-                style.font(),
-                style.font_size.to_pixels(window.rem_size()),
-                None,
-                FILE_HEADER_HEIGHT,
-                MULTI_BUFFER_EXCERPT_HEADER_HEIGHT,
-                Default::default(),
-                DiagnosticSeverity::Off,
-                cx,
-            )
-        }));
-        cx.notify();
-    }
-
-    pub fn set_cursor_shape(&mut self, cursor_shape: CursorShape, cx: &mut Context<Self>) {
-        self.cursor_shape = cursor_shape;
-
-        // Disrupt blink for immediate user feedback that the cursor shape has changed
-        self.blink_manager.update(cx, BlinkManager::show_cursor);
-
-        cx.notify();
-    }
-
-    pub fn cursor_shape(&self) -> CursorShape {
-        self.cursor_shape
-    }
-
-    pub fn set_current_line_highlight(
-        &mut self,
-        current_line_highlight: Option<CurrentLineHighlight>,
-    ) {
-        self.current_line_highlight = current_line_highlight;
-    }
-
-    pub fn set_collapse_matches(&mut self, collapse_matches: bool) {
-        self.collapse_matches = collapse_matches;
-    }
-
-    pub fn range_for_match<T: std::marker::Copy>(&self, range: &Range<T>) -> Range<T> {
-        if self.collapse_matches {
-            return range.start..range.start;
-        }
-        range.clone()
-    }
-
-    pub fn clip_at_line_ends(&mut self, cx: &mut Context<Self>) -> bool {
-        self.display_map.read(cx).clip_at_line_ends
-    }
-
-    pub fn set_clip_at_line_ends(&mut self, clip: bool, cx: &mut Context<Self>) {
-        if self.display_map.read(cx).clip_at_line_ends != clip {
-            self.display_map
-                .update(cx, |map, _| map.clip_at_line_ends = clip);
-        }
-    }
-
-    pub fn set_input_enabled(&mut self, input_enabled: bool) {
-        self.input_enabled = input_enabled;
-    }
-
-    pub fn set_edit_predictions_hidden_for_vim_mode(
-        &mut self,
-        hidden: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if hidden != self.edit_predictions_hidden_for_vim_mode {
-            self.edit_predictions_hidden_for_vim_mode = hidden;
-            if hidden {
-                self.update_visible_edit_prediction(window, cx);
-            } else {
-                self.refresh_edit_prediction(true, false, window, cx);
-            }
-        }
-    }
-
-    pub fn set_menu_edit_predictions_policy(&mut self, value: MenuEditPredictionsPolicy) {
-        self.menu_edit_predictions_policy = value;
-    }
-
-    pub fn set_autoindent(&mut self, autoindent: bool) {
-        if autoindent {
-            self.autoindent_mode = Some(AutoindentMode::EachLine);
-        } else {
-            self.autoindent_mode = None;
-        }
-    }
-
-    pub fn read_only(&self, cx: &App) -> bool {
-        self.read_only || self.buffer.read(cx).read_only()
-    }
-
-    pub fn set_read_only(&mut self, read_only: bool) {
-        self.read_only = read_only;
-    }
-
-    pub fn set_use_autoclose(&mut self, autoclose: bool) {
-        self.use_autoclose = autoclose;
-    }
-
-    pub fn set_use_auto_surround(&mut self, auto_surround: bool) {
-        self.use_auto_surround = auto_surround;
-    }
-
-    pub fn set_auto_replace_emoji_shortcode(&mut self, auto_replace: bool) {
-        self.auto_replace_emoji_shortcode = auto_replace;
-    }
-
-    pub fn set_should_serialize(&mut self, should_serialize: bool, cx: &App) {
-        self.buffer_serialization = should_serialize.then(|| {
-            BufferSerialization::new(
-                ProjectSettings::get_global(cx)
-                    .session
-                    .restore_unsaved_buffers,
-            )
-        })
-    }
-
-    fn should_serialize_buffer(&self) -> bool {
-        self.buffer_serialization.is_some()
-    }
-
-    pub fn toggle_edit_predictions(
-        &mut self,
-        _: &ToggleEditPrediction,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.show_edit_predictions_override.is_some() {
-            self.set_show_edit_predictions(None, window, cx);
-        } else {
-            let show_edit_predictions = !self.edit_predictions_enabled();
-            self.set_show_edit_predictions(Some(show_edit_predictions), window, cx);
-        }
-    }
-
-    pub fn set_show_completions_on_input(&mut self, show_completions_on_input: Option<bool>) {
-        self.show_completions_on_input_override = show_completions_on_input;
-    }
-
-    pub fn set_show_edit_predictions(
-        &mut self,
-        show_edit_predictions: Option<bool>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.show_edit_predictions_override = show_edit_predictions;
-        self.update_edit_prediction_settings(cx);
-
-        if let Some(false) = show_edit_predictions {
-            self.discard_edit_prediction(false, cx);
-        } else {
-            self.refresh_edit_prediction(false, true, window, cx);
-        }
-    }
-
-    fn edit_predictions_disabled_in_scope(
-        &self,
-        buffer: &Entity<Buffer>,
-        buffer_position: language::Anchor,
-        cx: &App,
-    ) -> bool {
-        let snapshot = buffer.read(cx).snapshot();
-        let settings = snapshot.settings_at(buffer_position, cx);
-
-        let Some(scope) = snapshot.language_scope_at(buffer_position) else {
-            return false;
-        };
-
-        scope.override_name().is_some_and(|scope_name| {
-            settings
-                .edit_predictions_disabled_in
-                .iter()
-                .any(|s| s == scope_name)
-        })
-    }
-
-    pub fn set_use_modal_editing(&mut self, to: bool) {
-        self.use_modal_editing = to;
-    }
-
-    pub fn use_modal_editing(&self) -> bool {
-        self.use_modal_editing
-    }
-
-    fn selections_did_change(
-        &mut self,
-        local: bool,
-        old_cursor_position: &Anchor,
-        effects: SelectionEffects,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        window.invalidate_character_coordinates();
-
-        // Copy selections to primary selection buffer
-        #[cfg(any(target_os = "linux", target_os = "freebsd"))]
-        if local {
-            let selections = self
-                .selections
-                .all::<MultiBufferOffset>(&self.display_snapshot(cx));
-            let buffer_handle = self.buffer.read(cx).read(cx);
-
-            let mut text = String::new();
-            for (index, selection) in selections.iter().enumerate() {
-                let text_for_selection = buffer_handle
-                    .text_for_range(selection.start..selection.end)
-                    .collect::<String>();
-
-                text.push_str(&text_for_selection);
-                if index != selections.len() - 1 {
-                    text.push('\n');
-                }
-            }
-
-            if !text.is_empty() {
-                cx.write_to_primary(ClipboardItem::new_string(text));
-            }
-        }
-
-        let selection_anchors = self.selections.disjoint_anchors_arc();
-
-        if self.focus_handle.is_focused(window) && self.leader_id.is_none() {
-            self.buffer.update(cx, |buffer, cx| {
-                buffer.set_active_selections(
-                    &selection_anchors,
-                    self.selections.line_mode(),
-                    self.cursor_shape,
-                    cx,
-                )
-            });
-        }
-        let display_map = self
-            .display_map
-            .update(cx, |display_map, cx| display_map.snapshot(cx));
-        let buffer = display_map.buffer_snapshot();
-        if self.selections.count() == 1 {
-            self.add_selections_state = None;
-        }
-        self.select_next_state = None;
-        self.select_prev_state = None;
-        self.select_syntax_node_history.try_clear();
-        self.invalidate_autoclose_regions(&selection_anchors, buffer);
-        self.snippet_stack.invalidate(&selection_anchors, buffer);
-        self.take_rename(false, window, cx);
-
-        let newest_selection = self.selections.newest_anchor();
-        let new_cursor_position = newest_selection.head();
-        let selection_start = newest_selection.start;
-
-        if effects.nav_history.is_none() || effects.nav_history == Some(true) {
-            self.push_to_nav_history(
-                *old_cursor_position,
-                Some(new_cursor_position.to_point(buffer)),
-                false,
-                effects.nav_history == Some(true),
-                cx,
-            );
-        }
-
-        if local {
-            if let Some(buffer_id) = new_cursor_position.text_anchor.buffer_id {
-                self.register_buffer(buffer_id, cx);
-            }
-
-            let mut context_menu = self.context_menu.borrow_mut();
-            let completion_menu = match context_menu.as_ref() {
-                Some(CodeContextMenu::Completions(menu)) => Some(menu),
-                Some(CodeContextMenu::CodeActions(_)) => {
-                    *context_menu = None;
-                    None
-                }
-                None => None,
-            };
-            let completion_position = completion_menu.map(|menu| menu.initial_position);
-            drop(context_menu);
-
-            if effects.completions
-                && let Some(completion_position) = completion_position
-            {
-                let start_offset = selection_start.to_offset(buffer);
-                let position_matches = start_offset == completion_position.to_offset(buffer);
-                let continue_showing = if position_matches {
-                    if self.snippet_stack.is_empty() {
-                        buffer.char_kind_before(start_offset, Some(CharScopeContext::Completion))
-                            == Some(CharKind::Word)
-                    } else {
-                        // Snippet choices can be shown even when the cursor is in whitespace.
-                        // Dismissing the menu with actions like backspace is handled by
-                        // invalidation regions.
-                        true
-                    }
-                } else {
-                    false
-                };
-
-                if continue_showing {
-                    self.open_or_update_completions_menu(None, None, false, window, cx);
-                } else {
-                    self.hide_context_menu(window, cx);
-                }
-            }
-
-            hide_hover(self, cx);
-
-            if old_cursor_position.to_display_point(&display_map).row()
-                != new_cursor_position.to_display_point(&display_map).row()
-            {
-                self.available_code_actions.take();
-            }
-            self.refresh_code_actions(window, cx);
-            self.refresh_document_highlights(cx);
-            refresh_linked_ranges(self, window, cx);
-
-            self.refresh_selected_text_highlights(false, window, cx);
-            self.refresh_matching_bracket_highlights(window, cx);
-            self.update_visible_edit_prediction(window, cx);
-            self.edit_prediction_requires_modifier_in_indent_conflict = true;
-            self.inline_blame_popover.take();
-            if self.git_blame_inline_enabled {
-                self.start_inline_blame_timer(window, cx);
-            }
-        }
-
-        self.blink_manager.update(cx, BlinkManager::pause_blinking);
-        cx.emit(EditorEvent::SelectionsChanged { local });
-
-        let selections = &self.selections.disjoint_anchors_arc();
-        if selections.len() == 1 {
-            cx.emit(SearchEvent::ActiveMatchChanged)
-        }
-        if local && let Some((_, _, buffer_snapshot)) = buffer.as_singleton() {
-            let inmemory_selections = selections
-                .iter()
-                .map(|s| {
-                    text::ToPoint::to_point(&s.range().start.text_anchor, buffer_snapshot)
-                        ..text::ToPoint::to_point(&s.range().end.text_anchor, buffer_snapshot)
-                })
-                .collect();
-            self.update_restoration_data(cx, |data| {
-                data.selections = inmemory_selections;
-            });
-
-            if WorkspaceSettings::get(None, cx).restore_on_startup != RestoreOnStartupBehavior::None
-                && let Some(workspace_id) = self.workspace_serialization_id(cx)
-            {
-                let snapshot = self.buffer().read(cx).snapshot(cx);
-                let selections = selections.clone();
-                let background_executor = cx.background_executor().clone();
-                let editor_id = cx.entity().entity_id().as_u64() as ItemId;
-                self.serialize_selections = cx.background_spawn(async move {
-                    background_executor.timer(SERIALIZATION_THROTTLE_TIME).await;
-                    let db_selections = selections
-                        .iter()
-                        .map(|selection| {
-                            (
-                                selection.start.to_offset(&snapshot).0,
-                                selection.end.to_offset(&snapshot).0,
-                            )
-                        })
-                        .collect();
-
-                    DB.save_editor_selections(editor_id, workspace_id, db_selections)
-                        .await
-                        .with_context(|| {
-                            format!(
-                                "persisting editor selections for editor {editor_id}, \
-                                workspace {workspace_id:?}"
-                            )
-                        })
-                        .log_err();
-                });
-            }
-        }
-
-        cx.notify();
-    }
-
-    fn folds_did_change(&mut self, cx: &mut Context<Self>) {
-        use text::ToOffset as _;
-        use text::ToPoint as _;
-
-        if self.mode.is_minimap()
-            || WorkspaceSettings::get(None, cx).restore_on_startup == RestoreOnStartupBehavior::None
-        {
-            return;
-        }
-
-        if !self.buffer().read(cx).is_singleton() {
-            return;
-        }
-
-        let display_snapshot = self
-            .display_map
-            .update(cx, |display_map, cx| display_map.snapshot(cx));
-        let Some((.., snapshot)) = display_snapshot.buffer_snapshot().as_singleton() else {
-            return;
-        };
-        let inmemory_folds = display_snapshot
-            .folds_in_range(MultiBufferOffset(0)..display_snapshot.buffer_snapshot().len())
-            .map(|fold| {
-                fold.range.start.text_anchor.to_point(&snapshot)
-                    ..fold.range.end.text_anchor.to_point(&snapshot)
-            })
-            .collect();
-        self.update_restoration_data(cx, |data| {
-            data.folds = inmemory_folds;
-        });
-
-        let Some(workspace_id) = self.workspace_serialization_id(cx) else {
-            return;
-        };
-        let background_executor = cx.background_executor().clone();
-        let editor_id = cx.entity().entity_id().as_u64() as ItemId;
-        let db_folds = display_snapshot
-            .folds_in_range(MultiBufferOffset(0)..display_snapshot.buffer_snapshot().len())
-            .map(|fold| {
-                (
-                    fold.range.start.text_anchor.to_offset(&snapshot),
-                    fold.range.end.text_anchor.to_offset(&snapshot),
-                )
-            })
-            .collect();
-        self.serialize_folds = cx.background_spawn(async move {
-            background_executor.timer(SERIALIZATION_THROTTLE_TIME).await;
-            DB.save_editor_folds(editor_id, workspace_id, db_folds)
-                .await
-                .with_context(|| {
-                    format!(
-                        "persisting editor folds for editor {editor_id}, workspace {workspace_id:?}"
-                    )
-                })
-                .log_err();
-        });
-    }
-
-    pub fn sync_selections(
-        &mut self,
-        other: Entity<Editor>,
-        cx: &mut Context<Self>,
-    ) -> gpui::Subscription {
-        let other_selections = other.read(cx).selections.disjoint_anchors().to_vec();
-        if !other_selections.is_empty() {
-            self.selections
-                .change_with(&self.display_snapshot(cx), |selections| {
-                    selections.select_anchors(other_selections);
-                });
-        }
-
-        let other_subscription = cx.subscribe(&other, |this, other, other_evt, cx| {
-            if let EditorEvent::SelectionsChanged { local: true } = other_evt {
-                let other_selections = other.read(cx).selections.disjoint_anchors().to_vec();
-                if other_selections.is_empty() {
-                    return;
-                }
-                let snapshot = this.display_snapshot(cx);
-                this.selections.change_with(&snapshot, |selections| {
-                    selections.select_anchors(other_selections);
-                });
-            }
-        });
-
-        let this_subscription = cx.subscribe_self::<EditorEvent>(move |this, this_evt, cx| {
-            if let EditorEvent::SelectionsChanged { local: true } = this_evt {
-                let these_selections = this.selections.disjoint_anchors().to_vec();
-                if these_selections.is_empty() {
-                    return;
-                }
-                other.update(cx, |other_editor, cx| {
-                    let snapshot = other_editor.display_snapshot(cx);
-                    other_editor
-                        .selections
-                        .change_with(&snapshot, |selections| {
-                            selections.select_anchors(these_selections);
-                        })
-                });
-            }
-        });
-
-        Subscription::join(other_subscription, this_subscription)
-    }
-
-    fn unfold_buffers_with_selections(&mut self, cx: &mut Context<Self>) {
-        if self.buffer().read(cx).is_singleton() {
-            return;
-        }
-        let snapshot = self.buffer.read(cx).snapshot(cx);
-        let buffer_ids: HashSet<BufferId> = self
-            .selections
-            .disjoint_anchor_ranges()
-            .flat_map(|range| snapshot.buffer_ids_for_range(range))
-            .collect();
-        for buffer_id in buffer_ids {
-            self.unfold_buffer(buffer_id, cx);
-        }
-    }
-
-    /// Changes selections using the provided mutation function. Changes to `self.selections` occur
-    /// immediately, but when run within `transact` or `with_selection_effects_deferred` other
-    /// effects of selection change occur at the end of the transaction.
-    pub fn change_selections<R>(
-        &mut self,
-        effects: SelectionEffects,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-        change: impl FnOnce(&mut MutableSelectionsCollection<'_, '_>) -> R,
-    ) -> R {
-        let snapshot = self.display_snapshot(cx);
-        if let Some(state) = &mut self.deferred_selection_effects_state {
-            state.effects.scroll = effects.scroll.or(state.effects.scroll);
-            state.effects.completions = effects.completions;
-            state.effects.nav_history = effects.nav_history.or(state.effects.nav_history);
-            let (changed, result) = self.selections.change_with(&snapshot, change);
-            state.changed |= changed;
-            return result;
-        }
-        let mut state = DeferredSelectionEffectsState {
-            changed: false,
-            effects,
-            old_cursor_position: self.selections.newest_anchor().head(),
-            history_entry: SelectionHistoryEntry {
-                selections: self.selections.disjoint_anchors_arc(),
-                select_next_state: self.select_next_state.clone(),
-                select_prev_state: self.select_prev_state.clone(),
-                add_selections_state: self.add_selections_state.clone(),
-            },
-        };
-        let (changed, result) = self.selections.change_with(&snapshot, change);
-        state.changed = state.changed || changed;
-        if self.defer_selection_effects {
-            self.deferred_selection_effects_state = Some(state);
-        } else {
-            self.apply_selection_effects(state, window, cx);
-        }
-        result
-    }
-
-    /// Defers the effects of selection change, so that the effects of multiple calls to
-    /// `change_selections` are applied at the end. This way these intermediate states aren't added
-    /// to selection history and the state of popovers based on selection position aren't
-    /// erroneously updated.
-    pub fn with_selection_effects_deferred<R>(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-        update: impl FnOnce(&mut Self, &mut Window, &mut Context<Self>) -> R,
-    ) -> R {
-        let already_deferred = self.defer_selection_effects;
-        self.defer_selection_effects = true;
-        let result = update(self, window, cx);
-        if !already_deferred {
-            self.defer_selection_effects = false;
-            if let Some(state) = self.deferred_selection_effects_state.take() {
-                self.apply_selection_effects(state, window, cx);
-            }
-        }
-        result
-    }
-
-    fn apply_selection_effects(
-        &mut self,
-        state: DeferredSelectionEffectsState,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if state.changed {
-            self.selection_history.push(state.history_entry);
-
-            if let Some(autoscroll) = state.effects.scroll {
-                self.request_autoscroll(autoscroll, cx);
-            }
-
-            let old_cursor_position = &state.old_cursor_position;
-
-            self.selections_did_change(true, old_cursor_position, state.effects, window, cx);
-
-            if self.should_open_signature_help_automatically(old_cursor_position, cx) {
-                self.show_signature_help(&ShowSignatureHelp, window, cx);
-            }
-        }
-    }
-
-    pub fn edit<I, S, T>(&mut self, edits: I, cx: &mut Context<Self>)
-    where
-        I: IntoIterator<Item = (Range<S>, T)>,
-        S: ToOffset,
-        T: Into<Arc<str>>,
-    {
-        if self.read_only(cx) {
-            return;
-        }
-
-        self.buffer
-            .update(cx, |buffer, cx| buffer.edit(edits, None, cx));
-    }
-
-    pub fn edit_with_autoindent<I, S, T>(&mut self, edits: I, cx: &mut Context<Self>)
-    where
-        I: IntoIterator<Item = (Range<S>, T)>,
-        S: ToOffset,
-        T: Into<Arc<str>>,
-    {
-        if self.read_only(cx) {
-            return;
-        }
-
-        self.buffer.update(cx, |buffer, cx| {
-            buffer.edit(edits, self.autoindent_mode.clone(), cx)
-        });
-    }
-
-    pub fn edit_with_block_indent<I, S, T>(
-        &mut self,
-        edits: I,
-        original_indent_columns: Vec<Option<u32>>,
-        cx: &mut Context<Self>,
-    ) where
-        I: IntoIterator<Item = (Range<S>, T)>,
-        S: ToOffset,
-        T: Into<Arc<str>>,
-    {
-        if self.read_only(cx) {
-            return;
-        }
-
-        self.buffer.update(cx, |buffer, cx| {
-            buffer.edit(
-                edits,
-                Some(AutoindentMode::Block {
-                    original_indent_columns,
-                }),
-                cx,
-            )
-        });
-    }
-
-    fn select(&mut self, phase: SelectPhase, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_context_menu(window, cx);
-
-        match phase {
-            SelectPhase::Begin {
-                position,
-                add,
-                click_count,
-            } => self.begin_selection(position, add, click_count, window, cx),
-            SelectPhase::BeginColumnar {
-                position,
-                goal_column,
-                reset,
-                mode,
-            } => self.begin_columnar_selection(position, goal_column, reset, mode, window, cx),
-            SelectPhase::Extend {
-                position,
-                click_count,
-            } => self.extend_selection(position, click_count, window, cx),
-            SelectPhase::Update {
-                position,
-                goal_column,
-                scroll_delta,
-            } => self.update_selection(position, goal_column, scroll_delta, window, cx),
-            SelectPhase::End => self.end_selection(window, cx),
-        }
-    }
-
-    fn extend_selection(
-        &mut self,
-        position: DisplayPoint,
-        click_count: usize,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-        let tail = self
-            .selections
-            .newest::<MultiBufferOffset>(&display_map)
-            .tail();
-        let click_count = click_count.max(match self.selections.select_mode() {
-            SelectMode::Character => 1,
-            SelectMode::Word(_) => 2,
-            SelectMode::Line(_) => 3,
-            SelectMode::All => 4,
-        });
-        self.begin_selection(position, false, click_count, window, cx);
-
-        let tail_anchor = display_map.buffer_snapshot().anchor_before(tail);
-
-        let current_selection = match self.selections.select_mode() {
-            SelectMode::Character | SelectMode::All => tail_anchor..tail_anchor,
-            SelectMode::Word(range) | SelectMode::Line(range) => range.clone(),
-        };
-
-        let mut pending_selection = self
-            .selections
-            .pending_anchor()
-            .cloned()
-            .expect("extend_selection not called with pending selection");
-
-        if pending_selection
-            .start
-            .cmp(&current_selection.start, display_map.buffer_snapshot())
-            == Ordering::Greater
-        {
-            pending_selection.start = current_selection.start;
-        }
-        if pending_selection
-            .end
-            .cmp(&current_selection.end, display_map.buffer_snapshot())
-            == Ordering::Less
-        {
-            pending_selection.end = current_selection.end;
-            pending_selection.reversed = true;
-        }
-
-        let mut pending_mode = self.selections.pending_mode().unwrap();
-        match &mut pending_mode {
-            SelectMode::Word(range) | SelectMode::Line(range) => *range = current_selection,
-            _ => {}
-        }
-
-        let effects = if EditorSettings::get_global(cx).autoscroll_on_clicks {
-            SelectionEffects::scroll(Autoscroll::fit())
-        } else {
-            SelectionEffects::no_scroll()
-        };
-
-        self.change_selections(effects, window, cx, |s| {
-            s.set_pending(pending_selection.clone(), pending_mode);
-            s.set_is_extending(true);
-        });
-    }
-
-    fn begin_selection(
-        &mut self,
-        position: DisplayPoint,
-        add: bool,
-        click_count: usize,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if !self.focus_handle.is_focused(window) {
-            self.last_focused_descendant = None;
-            window.focus(&self.focus_handle);
-        }
-
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-        let buffer = display_map.buffer_snapshot();
-        let position = display_map.clip_point(position, Bias::Left);
-
-        let start;
-        let end;
-        let mode;
-        let mut auto_scroll;
-        match click_count {
-            1 => {
-                start = buffer.anchor_before(position.to_point(&display_map));
-                end = start;
-                mode = SelectMode::Character;
-                auto_scroll = true;
-            }
-            2 => {
-                let position = display_map
-                    .clip_point(position, Bias::Left)
-                    .to_offset(&display_map, Bias::Left);
-                let (range, _) = buffer.surrounding_word(position, None);
-                start = buffer.anchor_before(range.start);
-                end = buffer.anchor_before(range.end);
-                mode = SelectMode::Word(start..end);
-                auto_scroll = true;
-            }
-            3 => {
-                let position = display_map
-                    .clip_point(position, Bias::Left)
-                    .to_point(&display_map);
-                let line_start = display_map.prev_line_boundary(position).0;
-                let next_line_start = buffer.clip_point(
-                    display_map.next_line_boundary(position).0 + Point::new(1, 0),
-                    Bias::Left,
-                );
-                start = buffer.anchor_before(line_start);
-                end = buffer.anchor_before(next_line_start);
-                mode = SelectMode::Line(start..end);
-                auto_scroll = true;
-            }
-            _ => {
-                start = buffer.anchor_before(MultiBufferOffset(0));
-                end = buffer.anchor_before(buffer.len());
-                mode = SelectMode::All;
-                auto_scroll = false;
-            }
-        }
-        auto_scroll &= EditorSettings::get_global(cx).autoscroll_on_clicks;
-
-        let point_to_delete: Option<usize> = {
-            let selected_points: Vec<Selection<Point>> =
-                self.selections.disjoint_in_range(start..end, &display_map);
-
-            if !add || click_count > 1 {
-                None
-            } else if !selected_points.is_empty() {
-                Some(selected_points[0].id)
-            } else {
-                let clicked_point_already_selected =
-                    self.selections.disjoint_anchors().iter().find(|selection| {
-                        selection.start.to_point(buffer) == start.to_point(buffer)
-                            || selection.end.to_point(buffer) == end.to_point(buffer)
-                    });
-
-                clicked_point_already_selected.map(|selection| selection.id)
-            }
-        };
-
-        let selections_count = self.selections.count();
-        let effects = if auto_scroll {
-            SelectionEffects::default()
-        } else {
-            SelectionEffects::no_scroll()
-        };
-
-        self.change_selections(effects, window, cx, |s| {
-            if let Some(point_to_delete) = point_to_delete {
-                s.delete(point_to_delete);
-
-                if selections_count == 1 {
-                    s.set_pending_anchor_range(start..end, mode);
-                }
-            } else {
-                if !add {
-                    s.clear_disjoint();
-                }
-
-                s.set_pending_anchor_range(start..end, mode);
-            }
-        });
-    }
-
-    fn begin_columnar_selection(
-        &mut self,
-        position: DisplayPoint,
-        goal_column: u32,
-        reset: bool,
-        mode: ColumnarMode,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if !self.focus_handle.is_focused(window) {
-            self.last_focused_descendant = None;
-            window.focus(&self.focus_handle);
-        }
-
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-
-        if reset {
-            let pointer_position = display_map
-                .buffer_snapshot()
-                .anchor_before(position.to_point(&display_map));
-
-            self.change_selections(
-                SelectionEffects::scroll(Autoscroll::newest()),
-                window,
-                cx,
-                |s| {
-                    s.clear_disjoint();
-                    s.set_pending_anchor_range(
-                        pointer_position..pointer_position,
-                        SelectMode::Character,
-                    );
-                },
-            );
-        };
-
-        let tail = self.selections.newest::<Point>(&display_map).tail();
-        let selection_anchor = display_map.buffer_snapshot().anchor_before(tail);
-        self.columnar_selection_state = match mode {
-            ColumnarMode::FromMouse => Some(ColumnarSelectionState::FromMouse {
-                selection_tail: selection_anchor,
-                display_point: if reset {
-                    if position.column() != goal_column {
-                        Some(DisplayPoint::new(position.row(), goal_column))
-                    } else {
-                        None
-                    }
-                } else {
-                    None
-                },
-            }),
-            ColumnarMode::FromSelection => Some(ColumnarSelectionState::FromSelection {
-                selection_tail: selection_anchor,
-            }),
-        };
-
-        if !reset {
-            self.select_columns(position, goal_column, &display_map, window, cx);
-        }
-    }
-
-    fn update_selection(
-        &mut self,
-        position: DisplayPoint,
-        goal_column: u32,
-        scroll_delta: gpui::Point<f32>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-
-        if self.columnar_selection_state.is_some() {
-            self.select_columns(position, goal_column, &display_map, window, cx);
-        } else if let Some(mut pending) = self.selections.pending_anchor().cloned() {
-            let buffer = display_map.buffer_snapshot();
-            let head;
-            let tail;
-            let mode = self.selections.pending_mode().unwrap();
-            match &mode {
-                SelectMode::Character => {
-                    head = position.to_point(&display_map);
-                    tail = pending.tail().to_point(buffer);
-                }
-                SelectMode::Word(original_range) => {
-                    let offset = display_map
-                        .clip_point(position, Bias::Left)
-                        .to_offset(&display_map, Bias::Left);
-                    let original_range = original_range.to_offset(buffer);
-
-                    let head_offset = if buffer.is_inside_word(offset, None)
-                        || original_range.contains(&offset)
-                    {
-                        let (word_range, _) = buffer.surrounding_word(offset, None);
-                        if word_range.start < original_range.start {
-                            word_range.start
-                        } else {
-                            word_range.end
-                        }
-                    } else {
-                        offset
-                    };
-
-                    head = head_offset.to_point(buffer);
-                    if head_offset <= original_range.start {
-                        tail = original_range.end.to_point(buffer);
-                    } else {
-                        tail = original_range.start.to_point(buffer);
-                    }
-                }
-                SelectMode::Line(original_range) => {
-                    let original_range = original_range.to_point(display_map.buffer_snapshot());
-
-                    let position = display_map
-                        .clip_point(position, Bias::Left)
-                        .to_point(&display_map);
-                    let line_start = display_map.prev_line_boundary(position).0;
-                    let next_line_start = buffer.clip_point(
-                        display_map.next_line_boundary(position).0 + Point::new(1, 0),
-                        Bias::Left,
-                    );
-
-                    if line_start < original_range.start {
-                        head = line_start
-                    } else {
-                        head = next_line_start
-                    }
-
-                    if head <= original_range.start {
-                        tail = original_range.end;
-                    } else {
-                        tail = original_range.start;
-                    }
-                }
-                SelectMode::All => {
-                    return;
-                }
-            };
-
-            if head < tail {
-                pending.start = buffer.anchor_before(head);
-                pending.end = buffer.anchor_before(tail);
-                pending.reversed = true;
-            } else {
-                pending.start = buffer.anchor_before(tail);
-                pending.end = buffer.anchor_before(head);
-                pending.reversed = false;
-            }
-
-            self.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                s.set_pending(pending.clone(), mode);
-            });
-        } else {
-            log::error!("update_selection dispatched with no pending selection");
-            return;
-        }
-
-        self.apply_scroll_delta(scroll_delta, window, cx);
-        cx.notify();
-    }
-
-    fn end_selection(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.columnar_selection_state.take();
-        if let Some(pending_mode) = self.selections.pending_mode() {
-            let selections = self
-                .selections
-                .all::<MultiBufferOffset>(&self.display_snapshot(cx));
-            self.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                s.select(selections);
-                s.clear_pending();
-                if s.is_extending() {
-                    s.set_is_extending(false);
-                } else {
-                    s.set_select_mode(pending_mode);
-                }
-            });
-        }
-    }
-
-    fn select_columns(
-        &mut self,
-        head: DisplayPoint,
-        goal_column: u32,
-        display_map: &DisplaySnapshot,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(columnar_state) = self.columnar_selection_state.as_ref() else {
-            return;
-        };
-
-        let tail = match columnar_state {
-            ColumnarSelectionState::FromMouse {
-                selection_tail,
-                display_point,
-            } => display_point.unwrap_or_else(|| selection_tail.to_display_point(display_map)),
-            ColumnarSelectionState::FromSelection { selection_tail } => {
-                selection_tail.to_display_point(display_map)
-            }
-        };
-
-        let start_row = cmp::min(tail.row(), head.row());
-        let end_row = cmp::max(tail.row(), head.row());
-        let start_column = cmp::min(tail.column(), goal_column);
-        let end_column = cmp::max(tail.column(), goal_column);
-        let reversed = start_column < tail.column();
-
-        let selection_ranges = (start_row.0..=end_row.0)
-            .map(DisplayRow)
-            .filter_map(|row| {
-                if (matches!(columnar_state, ColumnarSelectionState::FromMouse { .. })
-                    || start_column <= display_map.line_len(row))
-                    && !display_map.is_block_line(row)
-                {
-                    let start = display_map
-                        .clip_point(DisplayPoint::new(row, start_column), Bias::Left)
-                        .to_point(display_map);
-                    let end = display_map
-                        .clip_point(DisplayPoint::new(row, end_column), Bias::Right)
-                        .to_point(display_map);
-                    if reversed {
-                        Some(end..start)
-                    } else {
-                        Some(start..end)
-                    }
-                } else {
-                    None
-                }
-            })
-            .collect::<Vec<_>>();
-        if selection_ranges.is_empty() {
-            return;
-        }
-
-        let ranges = match columnar_state {
-            ColumnarSelectionState::FromMouse { .. } => {
-                let mut non_empty_ranges = selection_ranges
-                    .iter()
-                    .filter(|selection_range| selection_range.start != selection_range.end)
-                    .peekable();
-                if non_empty_ranges.peek().is_some() {
-                    non_empty_ranges.cloned().collect()
-                } else {
-                    selection_ranges
-                }
-            }
-            _ => selection_ranges,
-        };
-
-        self.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges(ranges);
-        });
-        cx.notify();
-    }
-
-    pub fn has_non_empty_selection(&self, snapshot: &DisplaySnapshot) -> bool {
-        self.selections
-            .all_adjusted(snapshot)
-            .iter()
-            .any(|selection| !selection.is_empty())
-    }
-
-    pub fn has_pending_nonempty_selection(&self) -> bool {
-        let pending_nonempty_selection = match self.selections.pending_anchor() {
-            Some(Selection { start, end, .. }) => start != end,
-            None => false,
-        };
-
-        pending_nonempty_selection
-            || (self.columnar_selection_state.is_some()
-                && self.selections.disjoint_anchors().len() > 1)
-    }
-
-    pub fn has_pending_selection(&self) -> bool {
-        self.selections.pending_anchor().is_some() || self.columnar_selection_state.is_some()
-    }
-
-    pub fn cancel(&mut self, _: &Cancel, window: &mut Window, cx: &mut Context<Self>) {
-        self.selection_mark_mode = false;
-        self.selection_drag_state = SelectionDragState::None;
-
-        if self.dismiss_menus_and_popups(true, window, cx) {
-            cx.notify();
-            return;
-        }
-        if self.clear_expanded_diff_hunks(cx) {
-            cx.notify();
-            return;
-        }
-        if self.show_git_blame_gutter {
-            self.show_git_blame_gutter = false;
-            cx.notify();
-            return;
-        }
-
-        if self.mode.is_full()
-            && self.change_selections(Default::default(), window, cx, |s| s.try_cancel())
-        {
-            cx.notify();
-            return;
-        }
-
-        cx.propagate();
-    }
-
-    pub fn dismiss_menus_and_popups(
-        &mut self,
-        is_user_requested: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> bool {
-        let mut dismissed = false;
-
-        dismissed |= self.take_rename(false, window, cx).is_some();
-        dismissed |= self.hide_blame_popover(true, cx);
-        dismissed |= hide_hover(self, cx);
-        dismissed |= self.hide_signature_help(cx, SignatureHelpHiddenBy::Escape);
-        dismissed |= self.hide_context_menu(window, cx).is_some();
-        dismissed |= self.mouse_context_menu.take().is_some();
-        dismissed |= is_user_requested && self.discard_edit_prediction(true, cx);
-        dismissed |= self.snippet_stack.pop().is_some();
-
-        if self.mode.is_full() && matches!(self.active_diagnostics, ActiveDiagnostic::Group(_)) {
-            self.dismiss_diagnostics(cx);
-            dismissed = true;
-        }
-
-        dismissed
-    }
-
-    fn linked_editing_ranges_for(
-        &self,
-        selection: Range<text::Anchor>,
-        cx: &App,
-    ) -> Option<HashMap<Entity<Buffer>, Vec<Range<text::Anchor>>>> {
-        if self.linked_edit_ranges.is_empty() {
-            return None;
-        }
-        let ((base_range, linked_ranges), buffer_snapshot, buffer) =
-            selection.end.buffer_id.and_then(|end_buffer_id| {
-                if selection.start.buffer_id != Some(end_buffer_id) {
-                    return None;
-                }
-                let buffer = self.buffer.read(cx).buffer(end_buffer_id)?;
-                let snapshot = buffer.read(cx).snapshot();
-                self.linked_edit_ranges
-                    .get(end_buffer_id, selection.start..selection.end, &snapshot)
-                    .map(|ranges| (ranges, snapshot, buffer))
-            })?;
-        use text::ToOffset as TO;
-        // find offset from the start of current range to current cursor position
-        let start_byte_offset = TO::to_offset(&base_range.start, &buffer_snapshot);
-
-        let start_offset = TO::to_offset(&selection.start, &buffer_snapshot);
-        let start_difference = start_offset - start_byte_offset;
-        let end_offset = TO::to_offset(&selection.end, &buffer_snapshot);
-        let end_difference = end_offset - start_byte_offset;
-        // Current range has associated linked ranges.
-        let mut linked_edits = HashMap::<_, Vec<_>>::default();
-        for range in linked_ranges.iter() {
-            let start_offset = TO::to_offset(&range.start, &buffer_snapshot);
-            let end_offset = start_offset + end_difference;
-            let start_offset = start_offset + start_difference;
-            if start_offset > buffer_snapshot.len() || end_offset > buffer_snapshot.len() {
-                continue;
-            }
-            if self.selections.disjoint_anchor_ranges().any(|s| {
-                if s.start.text_anchor.buffer_id != selection.start.buffer_id
-                    || s.end.text_anchor.buffer_id != selection.end.buffer_id
-                {
-                    return false;
-                }
-                TO::to_offset(&s.start.text_anchor, &buffer_snapshot) <= end_offset
-                    && TO::to_offset(&s.end.text_anchor, &buffer_snapshot) >= start_offset
-            }) {
-                continue;
-            }
-            let start = buffer_snapshot.anchor_after(start_offset);
-            let end = buffer_snapshot.anchor_after(end_offset);
-            linked_edits
-                .entry(buffer.clone())
-                .or_default()
-                .push(start..end);
-        }
-        Some(linked_edits)
-    }
-
-    pub fn handle_input(&mut self, text: &str, window: &mut Window, cx: &mut Context<Self>) {
-        let text: Arc<str> = text.into();
-
-        if self.read_only(cx) {
-            return;
-        }
-
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-
-        self.unfold_buffers_with_selections(cx);
-
-        let selections = self.selections.all_adjusted(&self.display_snapshot(cx));
-        let mut bracket_inserted = false;
-        let mut edits = Vec::new();
-        let mut linked_edits = HashMap::<_, Vec<_>>::default();
-        let mut new_selections = Vec::with_capacity(selections.len());
-        let mut new_autoclose_regions = Vec::new();
-        let snapshot = self.buffer.read(cx).read(cx);
-        let mut clear_linked_edit_ranges = false;
-
-        for (selection, autoclose_region) in
-            self.selections_with_autoclose_regions(selections, &snapshot)
-        {
-            if let Some(scope) = snapshot.language_scope_at(selection.head()) {
-                // Determine if the inserted text matches the opening or closing
-                // bracket of any of this language's bracket pairs.
-                let mut bracket_pair = None;
-                let mut is_bracket_pair_start = false;
-                let mut is_bracket_pair_end = false;
-                if !text.is_empty() {
-                    let mut bracket_pair_matching_end = None;
-                    // `text` can be empty when a user is using IME (e.g. Chinese Wubi Simplified)
-                    //  and they are removing the character that triggered IME popup.
-                    for (pair, enabled) in scope.brackets() {
-                        if !pair.close && !pair.surround {
-                            continue;
-                        }
-
-                        if enabled && pair.start.ends_with(text.as_ref()) {
-                            let prefix_len = pair.start.len() - text.len();
-                            let preceding_text_matches_prefix = prefix_len == 0
-                                || (selection.start.column >= (prefix_len as u32)
-                                    && snapshot.contains_str_at(
-                                        Point::new(
-                                            selection.start.row,
-                                            selection.start.column - (prefix_len as u32),
-                                        ),
-                                        &pair.start[..prefix_len],
-                                    ));
-                            if preceding_text_matches_prefix {
-                                bracket_pair = Some(pair.clone());
-                                is_bracket_pair_start = true;
-                                break;
-                            }
-                        }
-                        if pair.end.as_str() == text.as_ref() && bracket_pair_matching_end.is_none()
-                        {
-                            // take first bracket pair matching end, but don't break in case a later bracket
-                            // pair matches start
-                            bracket_pair_matching_end = Some(pair.clone());
-                        }
-                    }
-                    if let Some(end) = bracket_pair_matching_end
-                        && bracket_pair.is_none()
-                    {
-                        bracket_pair = Some(end);
-                        is_bracket_pair_end = true;
-                    }
-                }
-
-                if let Some(bracket_pair) = bracket_pair {
-                    let snapshot_settings = snapshot.language_settings_at(selection.start, cx);
-                    let autoclose = self.use_autoclose && snapshot_settings.use_autoclose;
-                    let auto_surround =
-                        self.use_auto_surround && snapshot_settings.use_auto_surround;
-                    if selection.is_empty() {
-                        if is_bracket_pair_start {
-                            // If the inserted text is a suffix of an opening bracket and the
-                            // selection is preceded by the rest of the opening bracket, then
-                            // insert the closing bracket.
-                            let following_text_allows_autoclose = snapshot
-                                .chars_at(selection.start)
-                                .next()
-                                .is_none_or(|c| scope.should_autoclose_before(c));
-
-                            let preceding_text_allows_autoclose = selection.start.column == 0
-                                || snapshot
-                                    .reversed_chars_at(selection.start)
-                                    .next()
-                                    .is_none_or(|c| {
-                                        bracket_pair.start != bracket_pair.end
-                                            || !snapshot
-                                                .char_classifier_at(selection.start)
-                                                .is_word(c)
-                                    });
-
-                            let is_closing_quote = if bracket_pair.end == bracket_pair.start
-                                && bracket_pair.start.len() == 1
-                            {
-                                let target = bracket_pair.start.chars().next().unwrap();
-                                let current_line_count = snapshot
-                                    .reversed_chars_at(selection.start)
-                                    .take_while(|&c| c != '\n')
-                                    .filter(|&c| c == target)
-                                    .count();
-                                current_line_count % 2 == 1
-                            } else {
-                                false
-                            };
-
-                            if autoclose
-                                && bracket_pair.close
-                                && following_text_allows_autoclose
-                                && preceding_text_allows_autoclose
-                                && !is_closing_quote
-                            {
-                                let anchor = snapshot.anchor_before(selection.end);
-                                new_selections.push((selection.map(|_| anchor), text.len()));
-                                new_autoclose_regions.push((
-                                    anchor,
-                                    text.len(),
-                                    selection.id,
-                                    bracket_pair.clone(),
-                                ));
-                                edits.push((
-                                    selection.range(),
-                                    format!("{}{}", text, bracket_pair.end).into(),
-                                ));
-                                bracket_inserted = true;
-                                continue;
-                            }
-                        }
-
-                        if let Some(region) = autoclose_region {
-                            // If the selection is followed by an auto-inserted closing bracket,
-                            // then don't insert that closing bracket again; just move the selection
-                            // past the closing bracket.
-                            let should_skip = selection.end == region.range.end.to_point(&snapshot)
-                                && text.as_ref() == region.pair.end.as_str()
-                                && snapshot.contains_str_at(region.range.end, text.as_ref());
-                            if should_skip {
-                                let anchor = snapshot.anchor_after(selection.end);
-                                new_selections
-                                    .push((selection.map(|_| anchor), region.pair.end.len()));
-                                continue;
-                            }
-                        }
-
-                        let always_treat_brackets_as_autoclosed = snapshot
-                            .language_settings_at(selection.start, cx)
-                            .always_treat_brackets_as_autoclosed;
-                        if always_treat_brackets_as_autoclosed
-                            && is_bracket_pair_end
-                            && snapshot.contains_str_at(selection.end, text.as_ref())
-                        {
-                            // Otherwise, when `always_treat_brackets_as_autoclosed` is set to `true
-                            // and the inserted text is a closing bracket and the selection is followed
-                            // by the closing bracket then move the selection past the closing bracket.
-                            let anchor = snapshot.anchor_after(selection.end);
-                            new_selections.push((selection.map(|_| anchor), text.len()));
-                            continue;
-                        }
-                    }
-                    // If an opening bracket is 1 character long and is typed while
-                    // text is selected, then surround that text with the bracket pair.
-                    else if auto_surround
-                        && bracket_pair.surround
-                        && is_bracket_pair_start
-                        && bracket_pair.start.chars().count() == 1
-                    {
-                        edits.push((selection.start..selection.start, text.clone()));
-                        edits.push((
-                            selection.end..selection.end,
-                            bracket_pair.end.as_str().into(),
-                        ));
-                        bracket_inserted = true;
-                        new_selections.push((
-                            Selection {
-                                id: selection.id,
-                                start: snapshot.anchor_after(selection.start),
-                                end: snapshot.anchor_before(selection.end),
-                                reversed: selection.reversed,
-                                goal: selection.goal,
-                            },
-                            0,
-                        ));
-                        continue;
-                    }
-                }
-            }
-
-            if self.auto_replace_emoji_shortcode
-                && selection.is_empty()
-                && text.as_ref().ends_with(':')
-                && let Some(possible_emoji_short_code) =
-                    Self::find_possible_emoji_shortcode_at_position(&snapshot, selection.start)
-                && !possible_emoji_short_code.is_empty()
-                && let Some(emoji) = emojis::get_by_shortcode(&possible_emoji_short_code)
-            {
-                let emoji_shortcode_start = Point::new(
-                    selection.start.row,
-                    selection.start.column - possible_emoji_short_code.len() as u32 - 1,
-                );
-
-                // Remove shortcode from buffer
-                edits.push((
-                    emoji_shortcode_start..selection.start,
-                    "".to_string().into(),
-                ));
-                new_selections.push((
-                    Selection {
-                        id: selection.id,
-                        start: snapshot.anchor_after(emoji_shortcode_start),
-                        end: snapshot.anchor_before(selection.start),
-                        reversed: selection.reversed,
-                        goal: selection.goal,
-                    },
-                    0,
-                ));
-
-                // Insert emoji
-                let selection_start_anchor = snapshot.anchor_after(selection.start);
-                new_selections.push((selection.map(|_| selection_start_anchor), 0));
-                edits.push((selection.start..selection.end, emoji.to_string().into()));
-
-                continue;
-            }
-
-            // If not handling any auto-close operation, then just replace the selected
-            // text with the given input and move the selection to the end of the
-            // newly inserted text.
-            let anchor = snapshot.anchor_after(selection.end);
-            if !self.linked_edit_ranges.is_empty() {
-                let start_anchor = snapshot.anchor_before(selection.start);
-
-                let is_word_char = text.chars().next().is_none_or(|char| {
-                    let classifier = snapshot
-                        .char_classifier_at(start_anchor.to_offset(&snapshot))
-                        .scope_context(Some(CharScopeContext::LinkedEdit));
-                    classifier.is_word(char)
-                });
-
-                if is_word_char {
-                    if let Some(ranges) = self
-                        .linked_editing_ranges_for(start_anchor.text_anchor..anchor.text_anchor, cx)
-                    {
-                        for (buffer, edits) in ranges {
-                            linked_edits
-                                .entry(buffer.clone())
-                                .or_default()
-                                .extend(edits.into_iter().map(|range| (range, text.clone())));
-                        }
-                    }
-                } else {
-                    clear_linked_edit_ranges = true;
-                }
-            }
-
-            new_selections.push((selection.map(|_| anchor), 0));
-            edits.push((selection.start..selection.end, text.clone()));
-        }
-
-        drop(snapshot);
-
-        self.transact(window, cx, |this, window, cx| {
-            if clear_linked_edit_ranges {
-                this.linked_edit_ranges.clear();
-            }
-            let initial_buffer_versions =
-                jsx_tag_auto_close::construct_initial_buffer_versions_map(this, &edits, cx);
-
-            this.buffer.update(cx, |buffer, cx| {
-                buffer.edit(edits, this.autoindent_mode.clone(), cx);
-            });
-            for (buffer, edits) in linked_edits {
-                buffer.update(cx, |buffer, cx| {
-                    let snapshot = buffer.snapshot();
-                    let edits = edits
-                        .into_iter()
-                        .map(|(range, text)| {
-                            use text::ToPoint as TP;
-                            let end_point = TP::to_point(&range.end, &snapshot);
-                            let start_point = TP::to_point(&range.start, &snapshot);
-                            (start_point..end_point, text)
-                        })
-                        .sorted_by_key(|(range, _)| range.start);
-                    buffer.edit(edits, None, cx);
-                })
-            }
-            let new_anchor_selections = new_selections.iter().map(|e| &e.0);
-            let new_selection_deltas = new_selections.iter().map(|e| e.1);
-            let map = this.display_map.update(cx, |map, cx| map.snapshot(cx));
-            let new_selections = resolve_selections_wrapping_blocks::<MultiBufferOffset, _>(
-                new_anchor_selections,
-                &map,
-            )
-            .zip(new_selection_deltas)
-            .map(|(selection, delta)| Selection {
-                id: selection.id,
-                start: selection.start + delta,
-                end: selection.end + delta,
-                reversed: selection.reversed,
-                goal: SelectionGoal::None,
-            })
-            .collect::<Vec<_>>();
-
-            let mut i = 0;
-            for (position, delta, selection_id, pair) in new_autoclose_regions {
-                let position = position.to_offset(map.buffer_snapshot()) + delta;
-                let start = map.buffer_snapshot().anchor_before(position);
-                let end = map.buffer_snapshot().anchor_after(position);
-                while let Some(existing_state) = this.autoclose_regions.get(i) {
-                    match existing_state
-                        .range
-                        .start
-                        .cmp(&start, map.buffer_snapshot())
-                    {
-                        Ordering::Less => i += 1,
-                        Ordering::Greater => break,
-                        Ordering::Equal => {
-                            match end.cmp(&existing_state.range.end, map.buffer_snapshot()) {
-                                Ordering::Less => i += 1,
-                                Ordering::Equal => break,
-                                Ordering::Greater => break,
-                            }
-                        }
-                    }
-                }
-                this.autoclose_regions.insert(
-                    i,
-                    AutocloseRegion {
-                        selection_id,
-                        range: start..end,
-                        pair,
-                    },
-                );
-            }
-
-            let had_active_edit_prediction = this.has_active_edit_prediction();
-            this.change_selections(
-                SelectionEffects::scroll(Autoscroll::fit()).completions(false),
-                window,
-                cx,
-                |s| s.select(new_selections),
-            );
-
-            if !bracket_inserted
-                && let Some(on_type_format_task) =
-                    this.trigger_on_type_formatting(text.to_string(), window, cx)
-            {
-                on_type_format_task.detach_and_log_err(cx);
-            }
-
-            let editor_settings = EditorSettings::get_global(cx);
-            if bracket_inserted
-                && (editor_settings.auto_signature_help
-                    || editor_settings.show_signature_help_after_edits)
-            {
-                this.show_signature_help(&ShowSignatureHelp, window, cx);
-            }
-
-            let trigger_in_words =
-                this.show_edit_predictions_in_menu() || !had_active_edit_prediction;
-            if this.hard_wrap.is_some() {
-                let latest: Range<Point> = this.selections.newest(&map).range();
-                if latest.is_empty()
-                    && this
-                        .buffer()
-                        .read(cx)
-                        .snapshot(cx)
-                        .line_len(MultiBufferRow(latest.start.row))
-                        == latest.start.column
-                {
-                    this.rewrap_impl(
-                        RewrapOptions {
-                            override_language_settings: true,
-                            preserve_existing_whitespace: true,
-                        },
-                        cx,
-                    )
-                }
-            }
-            this.trigger_completion_on_input(&text, trigger_in_words, window, cx);
-            refresh_linked_ranges(this, window, cx);
-            this.refresh_edit_prediction(true, false, window, cx);
-            jsx_tag_auto_close::handle_from(this, initial_buffer_versions, window, cx);
-        });
-    }
-
-    fn find_possible_emoji_shortcode_at_position(
-        snapshot: &MultiBufferSnapshot,
-        position: Point,
-    ) -> Option<String> {
-        let mut chars = Vec::new();
-        let mut found_colon = false;
-        for char in snapshot.reversed_chars_at(position).take(100) {
-            // Found a possible emoji shortcode in the middle of the buffer
-            if found_colon {
-                if char.is_whitespace() {
-                    chars.reverse();
-                    return Some(chars.iter().collect());
-                }
-                // If the previous character is not a whitespace, we are in the middle of a word
-                // and we only want to complete the shortcode if the word is made up of other emojis
-                let mut containing_word = String::new();
-                for ch in snapshot
-                    .reversed_chars_at(position)
-                    .skip(chars.len() + 1)
-                    .take(100)
-                {
-                    if ch.is_whitespace() {
-                        break;
-                    }
-                    containing_word.push(ch);
-                }
-                let containing_word = containing_word.chars().rev().collect::<String>();
-                if util::word_consists_of_emojis(containing_word.as_str()) {
-                    chars.reverse();
-                    return Some(chars.iter().collect());
-                }
-            }
-
-            if char.is_whitespace() || !char.is_ascii() {
-                return None;
-            }
-            if char == ':' {
-                found_colon = true;
-            } else {
-                chars.push(char);
-            }
-        }
-        // Found a possible emoji shortcode at the beginning of the buffer
-        chars.reverse();
-        Some(chars.iter().collect())
-    }
-
-    pub fn newline(&mut self, _: &Newline, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-        self.transact(window, cx, |this, window, cx| {
-            let (edits_with_flags, selection_info): (Vec<_>, Vec<_>) = {
-                let selections = this
-                    .selections
-                    .all::<MultiBufferOffset>(&this.display_snapshot(cx));
-                let multi_buffer = this.buffer.read(cx);
-                let buffer = multi_buffer.snapshot(cx);
-                selections
-                    .iter()
-                    .map(|selection| {
-                        let start_point = selection.start.to_point(&buffer);
-                        let mut existing_indent =
-                            buffer.indent_size_for_line(MultiBufferRow(start_point.row));
-                        existing_indent.len = cmp::min(existing_indent.len, start_point.column);
-                        let start = selection.start;
-                        let end = selection.end;
-                        let selection_is_empty = start == end;
-                        let language_scope = buffer.language_scope_at(start);
-                        let (
-                            comment_delimiter,
-                            doc_delimiter,
-                            insert_extra_newline,
-                            indent_on_newline,
-                            indent_on_extra_newline,
-                        ) = if let Some(language) = &language_scope {
-                            let mut insert_extra_newline =
-                                insert_extra_newline_brackets(&buffer, start..end, language)
-                                    || insert_extra_newline_tree_sitter(&buffer, start..end);
-
-                            // Comment extension on newline is allowed only for cursor selections
-                            let comment_delimiter = maybe!({
-                                if !selection_is_empty {
-                                    return None;
-                                }
-
-                                if !multi_buffer.language_settings(cx).extend_comment_on_newline {
-                                    return None;
-                                }
-
-                                let delimiters = language.line_comment_prefixes();
-                                let max_len_of_delimiter =
-                                    delimiters.iter().map(|delimiter| delimiter.len()).max()?;
-                                let (snapshot, range) =
-                                    buffer.buffer_line_for_row(MultiBufferRow(start_point.row))?;
-
-                                let num_of_whitespaces = snapshot
-                                    .chars_for_range(range.clone())
-                                    .take_while(|c| c.is_whitespace())
-                                    .count();
-                                let comment_candidate = snapshot
-                                    .chars_for_range(range.clone())
-                                    .skip(num_of_whitespaces)
-                                    .take(max_len_of_delimiter)
-                                    .collect::<String>();
-                                let (delimiter, trimmed_len) = delimiters
-                                    .iter()
-                                    .filter_map(|delimiter| {
-                                        let prefix = delimiter.trim_end();
-                                        if comment_candidate.starts_with(prefix) {
-                                            Some((delimiter, prefix.len()))
-                                        } else {
-                                            None
-                                        }
-                                    })
-                                    .max_by_key(|(_, len)| *len)?;
-
-                                if let Some(BlockCommentConfig {
-                                    start: block_start, ..
-                                }) = language.block_comment()
-                                {
-                                    let block_start_trimmed = block_start.trim_end();
-                                    if block_start_trimmed.starts_with(delimiter.trim_end()) {
-                                        let line_content = snapshot
-                                            .chars_for_range(range)
-                                            .skip(num_of_whitespaces)
-                                            .take(block_start_trimmed.len())
-                                            .collect::<String>();
-
-                                        if line_content.starts_with(block_start_trimmed) {
-                                            return None;
-                                        }
-                                    }
-                                }
-
-                                let cursor_is_placed_after_comment_marker =
-                                    num_of_whitespaces + trimmed_len <= start_point.column as usize;
-                                if cursor_is_placed_after_comment_marker {
-                                    Some(delimiter.clone())
-                                } else {
-                                    None
-                                }
-                            });
-
-                            let mut indent_on_newline = IndentSize::spaces(0);
-                            let mut indent_on_extra_newline = IndentSize::spaces(0);
-
-                            let doc_delimiter = maybe!({
-                                if !selection_is_empty {
-                                    return None;
-                                }
-
-                                if !multi_buffer.language_settings(cx).extend_comment_on_newline {
-                                    return None;
-                                }
-
-                                let BlockCommentConfig {
-                                    start: start_tag,
-                                    end: end_tag,
-                                    prefix: delimiter,
-                                    tab_size: len,
-                                } = language.documentation_comment()?;
-                                let is_within_block_comment = buffer
-                                    .language_scope_at(start_point)
-                                    .is_some_and(|scope| scope.override_name() == Some("comment"));
-                                if !is_within_block_comment {
-                                    return None;
-                                }
-
-                                let (snapshot, range) =
-                                    buffer.buffer_line_for_row(MultiBufferRow(start_point.row))?;
-
-                                let num_of_whitespaces = snapshot
-                                    .chars_for_range(range.clone())
-                                    .take_while(|c| c.is_whitespace())
-                                    .count();
-
-                                // It is safe to use a column from MultiBufferPoint in context of a single buffer ranges, because we're only ever looking at a single line at a time.
-                                let column = start_point.column;
-                                let cursor_is_after_start_tag = {
-                                    let start_tag_len = start_tag.len();
-                                    let start_tag_line = snapshot
-                                        .chars_for_range(range.clone())
-                                        .skip(num_of_whitespaces)
-                                        .take(start_tag_len)
-                                        .collect::<String>();
-                                    if start_tag_line.starts_with(start_tag.as_ref()) {
-                                        num_of_whitespaces + start_tag_len <= column as usize
-                                    } else {
-                                        false
-                                    }
-                                };
-
-                                let cursor_is_after_delimiter = {
-                                    let delimiter_trim = delimiter.trim_end();
-                                    let delimiter_line = snapshot
-                                        .chars_for_range(range.clone())
-                                        .skip(num_of_whitespaces)
-                                        .take(delimiter_trim.len())
-                                        .collect::<String>();
-                                    if delimiter_line.starts_with(delimiter_trim) {
-                                        num_of_whitespaces + delimiter_trim.len() <= column as usize
-                                    } else {
-                                        false
-                                    }
-                                };
-
-                                let cursor_is_before_end_tag_if_exists = {
-                                    let mut char_position = 0u32;
-                                    let mut end_tag_offset = None;
-
-                                    'outer: for chunk in snapshot.text_for_range(range) {
-                                        if let Some(byte_pos) = chunk.find(&**end_tag) {
-                                            let chars_before_match =
-                                                chunk[..byte_pos].chars().count() as u32;
-                                            end_tag_offset =
-                                                Some(char_position + chars_before_match);
-                                            break 'outer;
-                                        }
-                                        char_position += chunk.chars().count() as u32;
-                                    }
-
-                                    if let Some(end_tag_offset) = end_tag_offset {
-                                        let cursor_is_before_end_tag = column <= end_tag_offset;
-                                        if cursor_is_after_start_tag {
-                                            if cursor_is_before_end_tag {
-                                                insert_extra_newline = true;
-                                            }
-                                            let cursor_is_at_start_of_end_tag =
-                                                column == end_tag_offset;
-                                            if cursor_is_at_start_of_end_tag {
-                                                indent_on_extra_newline.len = *len;
-                                            }
-                                        }
-                                        cursor_is_before_end_tag
-                                    } else {
-                                        true
-                                    }
-                                };
-
-                                if (cursor_is_after_start_tag || cursor_is_after_delimiter)
-                                    && cursor_is_before_end_tag_if_exists
-                                {
-                                    if cursor_is_after_start_tag {
-                                        indent_on_newline.len = *len;
-                                    }
-                                    Some(delimiter.clone())
-                                } else {
-                                    None
-                                }
-                            });
-
-                            (
-                                comment_delimiter,
-                                doc_delimiter,
-                                insert_extra_newline,
-                                indent_on_newline,
-                                indent_on_extra_newline,
-                            )
-                        } else {
-                            (
-                                None,
-                                None,
-                                false,
-                                IndentSize::default(),
-                                IndentSize::default(),
-                            )
-                        };
-
-                        let prevent_auto_indent = doc_delimiter.is_some();
-                        let delimiter = comment_delimiter.or(doc_delimiter);
-
-                        let capacity_for_delimiter =
-                            delimiter.as_deref().map(str::len).unwrap_or_default();
-                        let mut new_text = String::with_capacity(
-                            1 + capacity_for_delimiter
-                                + existing_indent.len as usize
-                                + indent_on_newline.len as usize
-                                + indent_on_extra_newline.len as usize,
-                        );
-                        new_text.push('\n');
-                        new_text.extend(existing_indent.chars());
-                        new_text.extend(indent_on_newline.chars());
-
-                        if let Some(delimiter) = &delimiter {
-                            new_text.push_str(delimiter);
-                        }
-
-                        if insert_extra_newline {
-                            new_text.push('\n');
-                            new_text.extend(existing_indent.chars());
-                            new_text.extend(indent_on_extra_newline.chars());
-                        }
-
-                        let anchor = buffer.anchor_after(end);
-                        let new_selection = selection.map(|_| anchor);
-                        (
-                            ((start..end, new_text), prevent_auto_indent),
-                            (insert_extra_newline, new_selection),
-                        )
-                    })
-                    .unzip()
-            };
-
-            let mut auto_indent_edits = Vec::new();
-            let mut edits = Vec::new();
-            for (edit, prevent_auto_indent) in edits_with_flags {
-                if prevent_auto_indent {
-                    edits.push(edit);
-                } else {
-                    auto_indent_edits.push(edit);
-                }
-            }
-            if !edits.is_empty() {
-                this.edit(edits, cx);
-            }
-            if !auto_indent_edits.is_empty() {
-                this.edit_with_autoindent(auto_indent_edits, cx);
-            }
-
-            let buffer = this.buffer.read(cx).snapshot(cx);
-            let new_selections = selection_info
-                .into_iter()
-                .map(|(extra_newline_inserted, new_selection)| {
-                    let mut cursor = new_selection.end.to_point(&buffer);
-                    if extra_newline_inserted {
-                        cursor.row -= 1;
-                        cursor.column = buffer.line_len(MultiBufferRow(cursor.row));
-                    }
-                    new_selection.map(|_| cursor)
-                })
-                .collect();
-
-            this.change_selections(Default::default(), window, cx, |s| s.select(new_selections));
-            this.refresh_edit_prediction(true, false, window, cx);
-        });
-    }
-
-    pub fn newline_above(&mut self, _: &NewlineAbove, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-
-        let buffer = self.buffer.read(cx);
-        let snapshot = buffer.snapshot(cx);
-
-        let mut edits = Vec::new();
-        let mut rows = Vec::new();
-
-        for (rows_inserted, selection) in self
-            .selections
-            .all_adjusted(&self.display_snapshot(cx))
-            .into_iter()
-            .enumerate()
-        {
-            let cursor = selection.head();
-            let row = cursor.row;
-
-            let start_of_line = snapshot.clip_point(Point::new(row, 0), Bias::Left);
-
-            let newline = "\n".to_string();
-            edits.push((start_of_line..start_of_line, newline));
-
-            rows.push(row + rows_inserted as u32);
-        }
-
-        self.transact(window, cx, |editor, window, cx| {
-            editor.edit(edits, cx);
-
-            editor.change_selections(Default::default(), window, cx, |s| {
-                let mut index = 0;
-                s.move_cursors_with(|map, _, _| {
-                    let row = rows[index];
-                    index += 1;
-
-                    let point = Point::new(row, 0);
-                    let boundary = map.next_line_boundary(point).1;
-                    let clipped = map.clip_point(boundary, Bias::Left);
-
-                    (clipped, SelectionGoal::None)
-                });
-            });
-
-            let mut indent_edits = Vec::new();
-            let multibuffer_snapshot = editor.buffer.read(cx).snapshot(cx);
-            for row in rows {
-                let indents = multibuffer_snapshot.suggested_indents(row..row + 1, cx);
-                for (row, indent) in indents {
-                    if indent.len == 0 {
-                        continue;
-                    }
-
-                    let text = match indent.kind {
-                        IndentKind::Space => " ".repeat(indent.len as usize),
-                        IndentKind::Tab => "\t".repeat(indent.len as usize),
-                    };
-                    let point = Point::new(row.0, 0);
-                    indent_edits.push((point..point, text));
-                }
-            }
-            editor.edit(indent_edits, cx);
-        });
-    }
-
-    pub fn newline_below(&mut self, _: &NewlineBelow, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-
-        let buffer = self.buffer.read(cx);
-        let snapshot = buffer.snapshot(cx);
-
-        let mut edits = Vec::new();
-        let mut rows = Vec::new();
-        let mut rows_inserted = 0;
-
-        for selection in self.selections.all_adjusted(&self.display_snapshot(cx)) {
-            let cursor = selection.head();
-            let row = cursor.row;
-
-            let point = Point::new(row + 1, 0);
-            let start_of_line = snapshot.clip_point(point, Bias::Left);
-
-            let newline = "\n".to_string();
-            edits.push((start_of_line..start_of_line, newline));
-
-            rows_inserted += 1;
-            rows.push(row + rows_inserted);
-        }
-
-        self.transact(window, cx, |editor, window, cx| {
-            editor.edit(edits, cx);
-
-            editor.change_selections(Default::default(), window, cx, |s| {
-                let mut index = 0;
-                s.move_cursors_with(|map, _, _| {
-                    let row = rows[index];
-                    index += 1;
-
-                    let point = Point::new(row, 0);
-                    let boundary = map.next_line_boundary(point).1;
-                    let clipped = map.clip_point(boundary, Bias::Left);
-
-                    (clipped, SelectionGoal::None)
-                });
-            });
-
-            let mut indent_edits = Vec::new();
-            let multibuffer_snapshot = editor.buffer.read(cx).snapshot(cx);
-            for row in rows {
-                let indents = multibuffer_snapshot.suggested_indents(row..row + 1, cx);
-                for (row, indent) in indents {
-                    if indent.len == 0 {
-                        continue;
-                    }
-
-                    let text = match indent.kind {
-                        IndentKind::Space => " ".repeat(indent.len as usize),
-                        IndentKind::Tab => "\t".repeat(indent.len as usize),
-                    };
-                    let point = Point::new(row.0, 0);
-                    indent_edits.push((point..point, text));
-                }
-            }
-            editor.edit(indent_edits, cx);
-        });
-    }
-
-    pub fn insert(&mut self, text: &str, window: &mut Window, cx: &mut Context<Self>) {
-        let autoindent = text.is_empty().not().then(|| AutoindentMode::Block {
-            original_indent_columns: Vec::new(),
-        });
-        self.insert_with_autoindent_mode(text, autoindent, window, cx);
-    }
-
-    fn insert_with_autoindent_mode(
-        &mut self,
-        text: &str,
-        autoindent_mode: Option<AutoindentMode>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.read_only(cx) {
-            return;
-        }
-
-        let text: Arc<str> = text.into();
-        self.transact(window, cx, |this, window, cx| {
-            let old_selections = this.selections.all_adjusted(&this.display_snapshot(cx));
-            let selection_anchors = this.buffer.update(cx, |buffer, cx| {
-                let anchors = {
-                    let snapshot = buffer.read(cx);
-                    old_selections
-                        .iter()
-                        .map(|s| {
-                            let anchor = snapshot.anchor_after(s.head());
-                            s.map(|_| anchor)
-                        })
-                        .collect::<Vec<_>>()
-                };
-                buffer.edit(
-                    old_selections
-                        .iter()
-                        .map(|s| (s.start..s.end, text.clone())),
-                    autoindent_mode,
-                    cx,
-                );
-                anchors
-            });
-
-            this.change_selections(Default::default(), window, cx, |s| {
-                s.select_anchors(selection_anchors);
-            });
-
-            cx.notify();
-        });
-    }
-
-    fn trigger_completion_on_input(
-        &mut self,
-        text: &str,
-        trigger_in_words: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let completions_source = self
-            .context_menu
-            .borrow()
-            .as_ref()
-            .and_then(|menu| match menu {
-                CodeContextMenu::Completions(completions_menu) => Some(completions_menu.source),
-                CodeContextMenu::CodeActions(_) => None,
-            });
-
-        match completions_source {
-            Some(CompletionsMenuSource::Words { .. }) => {
-                self.open_or_update_completions_menu(
-                    Some(CompletionsMenuSource::Words {
-                        ignore_threshold: false,
-                    }),
-                    None,
-                    trigger_in_words,
-                    window,
-                    cx,
-                );
-            }
-            _ => self.open_or_update_completions_menu(
-                None,
-                Some(text.to_owned()).filter(|x| !x.is_empty()),
-                true,
-                window,
-                cx,
-            ),
-        }
-    }
-
-    /// If any empty selections is touching the start of its innermost containing autoclose
-    /// region, expand it to select the brackets.
-    fn select_autoclose_pair(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let selections = self
-            .selections
-            .all::<MultiBufferOffset>(&self.display_snapshot(cx));
-        let buffer = self.buffer.read(cx).read(cx);
-        let new_selections = self
-            .selections_with_autoclose_regions(selections, &buffer)
-            .map(|(mut selection, region)| {
-                if !selection.is_empty() {
-                    return selection;
-                }
-
-                if let Some(region) = region {
-                    let mut range = region.range.to_offset(&buffer);
-                    if selection.start == range.start && range.start.0 >= region.pair.start.len() {
-                        range.start -= region.pair.start.len();
-                        if buffer.contains_str_at(range.start, &region.pair.start)
-                            && buffer.contains_str_at(range.end, &region.pair.end)
-                        {
-                            range.end += region.pair.end.len();
-                            selection.start = range.start;
-                            selection.end = range.end;
-
-                            return selection;
-                        }
-                    }
-                }
-
-                let always_treat_brackets_as_autoclosed = buffer
-                    .language_settings_at(selection.start, cx)
-                    .always_treat_brackets_as_autoclosed;
-
-                if !always_treat_brackets_as_autoclosed {
-                    return selection;
-                }
-
-                if let Some(scope) = buffer.language_scope_at(selection.start) {
-                    for (pair, enabled) in scope.brackets() {
-                        if !enabled || !pair.close {
-                            continue;
-                        }
-
-                        if buffer.contains_str_at(selection.start, &pair.end) {
-                            let pair_start_len = pair.start.len();
-                            if buffer.contains_str_at(
-                                selection.start.saturating_sub_usize(pair_start_len),
-                                &pair.start,
-                            ) {
-                                selection.start -= pair_start_len;
-                                selection.end += pair.end.len();
-
-                                return selection;
-                            }
-                        }
-                    }
-                }
-
-                selection
-            })
-            .collect();
-
-        drop(buffer);
-        self.change_selections(SelectionEffects::no_scroll(), window, cx, |selections| {
-            selections.select(new_selections)
-        });
-    }
-
-    /// Iterate the given selections, and for each one, find the smallest surrounding
-    /// autoclose region. This uses the ordering of the selections and the autoclose
-    /// regions to avoid repeated comparisons.
-    fn selections_with_autoclose_regions<'a, D: ToOffset + Clone>(
-        &'a self,
-        selections: impl IntoIterator<Item = Selection<D>>,
-        buffer: &'a MultiBufferSnapshot,
-    ) -> impl Iterator<Item = (Selection<D>, Option<&'a AutocloseRegion>)> {
-        let mut i = 0;
-        let mut regions = self.autoclose_regions.as_slice();
-        selections.into_iter().map(move |selection| {
-            let range = selection.start.to_offset(buffer)..selection.end.to_offset(buffer);
-
-            let mut enclosing = None;
-            while let Some(pair_state) = regions.get(i) {
-                if pair_state.range.end.to_offset(buffer) < range.start {
-                    regions = &regions[i + 1..];
-                    i = 0;
-                } else if pair_state.range.start.to_offset(buffer) > range.end {
-                    break;
-                } else {
-                    if pair_state.selection_id == selection.id {
-                        enclosing = Some(pair_state);
-                    }
-                    i += 1;
-                }
-            }
-
-            (selection, enclosing)
-        })
-    }
-
-    /// Remove any autoclose regions that no longer contain their selection or have invalid anchors in ranges.
-    fn invalidate_autoclose_regions(
-        &mut self,
-        mut selections: &[Selection<Anchor>],
-        buffer: &MultiBufferSnapshot,
-    ) {
-        self.autoclose_regions.retain(|state| {
-            if !state.range.start.is_valid(buffer) || !state.range.end.is_valid(buffer) {
-                return false;
-            }
-
-            let mut i = 0;
-            while let Some(selection) = selections.get(i) {
-                if selection.end.cmp(&state.range.start, buffer).is_lt() {
-                    selections = &selections[1..];
-                    continue;
-                }
-                if selection.start.cmp(&state.range.end, buffer).is_gt() {
-                    break;
-                }
-                if selection.id == state.selection_id {
-                    return true;
-                } else {
-                    i += 1;
-                }
-            }
-            false
-        });
-    }
-
-    fn completion_query(buffer: &MultiBufferSnapshot, position: impl ToOffset) -> Option<String> {
-        let offset = position.to_offset(buffer);
-        let (word_range, kind) =
-            buffer.surrounding_word(offset, Some(CharScopeContext::Completion));
-        if offset > word_range.start && kind == Some(CharKind::Word) {
-            Some(
-                buffer
-                    .text_for_range(word_range.start..offset)
-                    .collect::<String>(),
-            )
-        } else {
-            None
-        }
-    }
-
-    pub fn visible_excerpts(
-        &self,
-        lsp_related_only: bool,
-        cx: &mut Context<Editor>,
-    ) -> HashMap<ExcerptId, (Entity<Buffer>, clock::Global, Range<usize>)> {
-        let project = self.project().cloned();
-        let multi_buffer = self.buffer().read(cx);
-        let multi_buffer_snapshot = multi_buffer.snapshot(cx);
-        let multi_buffer_visible_start = self
-            .scroll_manager
-            .anchor()
-            .anchor
-            .to_point(&multi_buffer_snapshot);
-        let multi_buffer_visible_end = multi_buffer_snapshot.clip_point(
-            multi_buffer_visible_start
-                + Point::new(self.visible_line_count().unwrap_or(0.).ceil() as u32, 0),
-            Bias::Left,
-        );
-        multi_buffer_snapshot
-            .range_to_buffer_ranges(multi_buffer_visible_start..multi_buffer_visible_end)
-            .into_iter()
-            .filter(|(_, excerpt_visible_range, _)| !excerpt_visible_range.is_empty())
-            .filter_map(|(buffer, excerpt_visible_range, excerpt_id)| {
-                if !lsp_related_only {
-                    return Some((
-                        excerpt_id,
-                        (
-                            multi_buffer.buffer(buffer.remote_id()).unwrap(),
-                            buffer.version().clone(),
-                            excerpt_visible_range.start.0..excerpt_visible_range.end.0,
-                        ),
-                    ));
-                }
-
-                let project = project.as_ref()?.read(cx);
-                let buffer_file = project::File::from_dyn(buffer.file())?;
-                let buffer_worktree = project.worktree_for_id(buffer_file.worktree_id(cx), cx)?;
-                let worktree_entry = buffer_worktree
-                    .read(cx)
-                    .entry_for_id(buffer_file.project_entry_id()?)?;
-                if worktree_entry.is_ignored {
-                    None
-                } else {
-                    Some((
-                        excerpt_id,
-                        (
-                            multi_buffer.buffer(buffer.remote_id()).unwrap(),
-                            buffer.version().clone(),
-                            excerpt_visible_range.start.0..excerpt_visible_range.end.0,
-                        ),
-                    ))
-                }
-            })
-            .collect()
-    }
-
-    pub fn text_layout_details(&self, window: &mut Window) -> TextLayoutDetails {
-        TextLayoutDetails {
-            text_system: window.text_system().clone(),
-            editor_style: self.style.clone().unwrap(),
-            rem_size: window.rem_size(),
-            scroll_anchor: self.scroll_manager.anchor(),
-            visible_rows: self.visible_line_count(),
-            vertical_scroll_margin: self.scroll_manager.vertical_scroll_margin,
-        }
-    }
-
-    fn trigger_on_type_formatting(
-        &self,
-        input: String,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Task<Result<()>>> {
-        if input.len() != 1 {
-            return None;
-        }
-
-        let project = self.project()?;
-        let position = self.selections.newest_anchor().head();
-        let (buffer, buffer_position) = self
-            .buffer
-            .read(cx)
-            .text_anchor_for_position(position, cx)?;
-
-        let settings = language_settings::language_settings(
-            buffer
-                .read(cx)
-                .language_at(buffer_position)
-                .map(|l| l.name()),
-            buffer.read(cx).file(),
-            cx,
-        );
-        if !settings.use_on_type_format {
-            return None;
-        }
-
-        // OnTypeFormatting returns a list of edits, no need to pass them between Zed instances,
-        // hence we do LSP request & edit on host side only — add formats to host's history.
-        let push_to_lsp_host_history = true;
-        // If this is not the host, append its history with new edits.
-        let push_to_client_history = project.read(cx).is_via_collab();
-
-        let on_type_formatting = project.update(cx, |project, cx| {
-            project.on_type_format(
-                buffer.clone(),
-                buffer_position,
-                input,
-                push_to_lsp_host_history,
-                cx,
-            )
-        });
-        Some(cx.spawn_in(window, async move |editor, cx| {
-            if let Some(transaction) = on_type_formatting.await? {
-                if push_to_client_history {
-                    buffer
-                        .update(cx, |buffer, _| {
-                            buffer.push_transaction(transaction, Instant::now());
-                            buffer.finalize_last_transaction();
-                        })
-                        .ok();
-                }
-                editor.update(cx, |editor, cx| {
-                    editor.refresh_document_highlights(cx);
-                })?;
-            }
-            Ok(())
-        }))
-    }
-
-    pub fn show_word_completions(
-        &mut self,
-        _: &ShowWordCompletions,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.open_or_update_completions_menu(
-            Some(CompletionsMenuSource::Words {
-                ignore_threshold: true,
-            }),
-            None,
-            false,
-            window,
-            cx,
-        );
-    }
-
-    pub fn show_completions(
-        &mut self,
-        _: &ShowCompletions,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.open_or_update_completions_menu(None, None, false, window, cx);
-    }
-
-    fn open_or_update_completions_menu(
-        &mut self,
-        requested_source: Option<CompletionsMenuSource>,
-        trigger: Option<String>,
-        trigger_in_words: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.pending_rename.is_some() {
-            return;
-        }
-
-        let completions_source = self
-            .context_menu
-            .borrow()
-            .as_ref()
-            .and_then(|menu| match menu {
-                CodeContextMenu::Completions(completions_menu) => Some(completions_menu.source),
-                CodeContextMenu::CodeActions(_) => None,
-            });
-
-        let multibuffer_snapshot = self.buffer.read(cx).read(cx);
-
-        // Typically `start` == `end`, but with snippet tabstop choices the default choice is
-        // inserted and selected. To handle that case, the start of the selection is used so that
-        // the menu starts with all choices.
-        let position = self
-            .selections
-            .newest_anchor()
-            .start
-            .bias_right(&multibuffer_snapshot);
-        if position.diff_base_anchor.is_some() {
-            return;
-        }
-        let buffer_position = multibuffer_snapshot.anchor_before(position);
-        let Some(buffer) = buffer_position
-            .text_anchor
-            .buffer_id
-            .and_then(|buffer_id| self.buffer.read(cx).buffer(buffer_id))
-        else {
-            return;
-        };
-        let buffer_snapshot = buffer.read(cx).snapshot();
-
-        let menu_is_open = matches!(
-            self.context_menu.borrow().as_ref(),
-            Some(CodeContextMenu::Completions(_))
-        );
-
-        let language = buffer_snapshot
-            .language_at(buffer_position.text_anchor)
-            .map(|language| language.name());
-
-        let language_settings = language_settings(language.clone(), buffer_snapshot.file(), cx);
-        let completion_settings = language_settings.completions.clone();
-
-        let show_completions_on_input = self
-            .show_completions_on_input_override
-            .unwrap_or(language_settings.show_completions_on_input);
-        if !menu_is_open && trigger.is_some() && !show_completions_on_input {
-            return;
-        }
-
-        let query: Option<Arc<String>> =
-            Self::completion_query(&multibuffer_snapshot, buffer_position)
-                .map(|query| query.into());
-
-        drop(multibuffer_snapshot);
-
-        // Hide the current completions menu when query is empty. Without this, cached
-        // completions from before the trigger char may be reused (#32774).
-        if query.is_none() && menu_is_open {
-            self.hide_context_menu(window, cx);
-        }
-
-        let mut ignore_word_threshold = false;
-        let provider = match requested_source {
-            Some(CompletionsMenuSource::Normal) | None => self.completion_provider.clone(),
-            Some(CompletionsMenuSource::Words { ignore_threshold }) => {
-                ignore_word_threshold = ignore_threshold;
-                None
-            }
-            Some(CompletionsMenuSource::SnippetChoices)
-            | Some(CompletionsMenuSource::SnippetsOnly) => {
-                log::error!("bug: SnippetChoices requested_source is not handled");
-                None
-            }
-        };
-
-        let sort_completions = provider
-            .as_ref()
-            .is_some_and(|provider| provider.sort_completions());
-
-        let filter_completions = provider
-            .as_ref()
-            .is_none_or(|provider| provider.filter_completions());
-
-        let was_snippets_only = matches!(
-            completions_source,
-            Some(CompletionsMenuSource::SnippetsOnly)
-        );
-
-        if let Some(CodeContextMenu::Completions(menu)) = self.context_menu.borrow_mut().as_mut() {
-            if filter_completions {
-                menu.filter(
-                    query.clone().unwrap_or_default(),
-                    buffer_position.text_anchor,
-                    &buffer,
-                    provider.clone(),
-                    window,
-                    cx,
-                );
-            }
-            // When `is_incomplete` is false, no need to re-query completions when the current query
-            // is a suffix of the initial query.
-            let was_complete = !menu.is_incomplete;
-            if was_complete && !was_snippets_only {
-                // If the new query is a suffix of the old query (typing more characters) and
-                // the previous result was complete, the existing completions can be filtered.
-                //
-                // Note that snippet completions are always complete.
-                let query_matches = match (&menu.initial_query, &query) {
-                    (Some(initial_query), Some(query)) => query.starts_with(initial_query.as_ref()),
-                    (None, _) => true,
-                    _ => false,
-                };
-                if query_matches {
-                    let position_matches = if menu.initial_position == position {
-                        true
-                    } else {
-                        let snapshot = self.buffer.read(cx).read(cx);
-                        menu.initial_position.to_offset(&snapshot) == position.to_offset(&snapshot)
-                    };
-                    if position_matches {
-                        return;
-                    }
-                }
-            }
-        };
-
-        let Anchor {
-            excerpt_id: buffer_excerpt_id,
-            text_anchor: buffer_position,
-            ..
-        } = buffer_position;
-
-        let (word_replace_range, word_to_exclude) = if let (word_range, Some(CharKind::Word)) =
-            buffer_snapshot.surrounding_word(buffer_position, None)
-        {
-            let word_to_exclude = buffer_snapshot
-                .text_for_range(word_range.clone())
-                .collect::<String>();
-            (
-                buffer_snapshot.anchor_before(word_range.start)
-                    ..buffer_snapshot.anchor_after(buffer_position),
-                Some(word_to_exclude),
-            )
-        } else {
-            (buffer_position..buffer_position, None)
-        };
-
-        let show_completion_documentation = buffer_snapshot
-            .settings_at(buffer_position, cx)
-            .show_completion_documentation;
-
-        // The document can be large, so stay in reasonable bounds when searching for words,
-        // otherwise completion pop-up might be slow to appear.
-        const WORD_LOOKUP_ROWS: u32 = 5_000;
-        let buffer_row = text::ToPoint::to_point(&buffer_position, &buffer_snapshot).row;
-        let min_word_search = buffer_snapshot.clip_point(
-            Point::new(buffer_row.saturating_sub(WORD_LOOKUP_ROWS), 0),
-            Bias::Left,
-        );
-        let max_word_search = buffer_snapshot.clip_point(
-            Point::new(buffer_row + WORD_LOOKUP_ROWS, 0).min(buffer_snapshot.max_point()),
-            Bias::Right,
-        );
-        let word_search_range = buffer_snapshot.point_to_offset(min_word_search)
-            ..buffer_snapshot.point_to_offset(max_word_search);
-
-        let skip_digits = query
-            .as_ref()
-            .is_none_or(|query| !query.chars().any(|c| c.is_digit(10)));
-
-        let load_provider_completions = provider.as_ref().is_some_and(|provider| {
-            trigger.as_ref().is_none_or(|trigger| {
-                provider.is_completion_trigger(
-                    &buffer,
-                    position.text_anchor,
-                    trigger,
-                    trigger_in_words,
-                    cx,
-                )
-            })
-        });
-
-        let provider_responses = if let Some(provider) = &provider
-            && load_provider_completions
-        {
-            let trigger_character =
-                trigger.filter(|trigger| buffer.read(cx).completion_triggers().contains(trigger));
-            let completion_context = CompletionContext {
-                trigger_kind: match &trigger_character {
-                    Some(_) => CompletionTriggerKind::TRIGGER_CHARACTER,
-                    None => CompletionTriggerKind::INVOKED,
-                },
-                trigger_character,
-            };
-
-            provider.completions(
-                buffer_excerpt_id,
-                &buffer,
-                buffer_position,
-                completion_context,
-                window,
-                cx,
-            )
-        } else {
-            Task::ready(Ok(Vec::new()))
-        };
-
-        let load_word_completions = if !self.word_completions_enabled {
-            false
-        } else if requested_source
-            == Some(CompletionsMenuSource::Words {
-                ignore_threshold: true,
-            })
-        {
-            true
-        } else {
-            load_provider_completions
-                && completion_settings.words != WordsCompletionMode::Disabled
-                && (ignore_word_threshold || {
-                    let words_min_length = completion_settings.words_min_length;
-                    // check whether word has at least `words_min_length` characters
-                    let query_chars = query.iter().flat_map(|q| q.chars());
-                    query_chars.take(words_min_length).count() == words_min_length
-                })
-        };
-
-        let mut words = if load_word_completions {
-            cx.background_spawn({
-                let buffer_snapshot = buffer_snapshot.clone();
-                async move {
-                    buffer_snapshot.words_in_range(WordsQuery {
-                        fuzzy_contents: None,
-                        range: word_search_range,
-                        skip_digits,
-                    })
-                }
-            })
-        } else {
-            Task::ready(BTreeMap::default())
-        };
-
-        let snippets = if let Some(provider) = &provider
-            && provider.show_snippets()
-            && let Some(project) = self.project()
-        {
-            let char_classifier = buffer_snapshot
-                .char_classifier_at(buffer_position)
-                .scope_context(Some(CharScopeContext::Completion));
-            project.update(cx, |project, cx| {
-                snippet_completions(project, &buffer, buffer_position, char_classifier, cx)
-            })
-        } else {
-            Task::ready(Ok(CompletionResponse {
-                completions: Vec::new(),
-                display_options: Default::default(),
-                is_incomplete: false,
-            }))
-        };
-
-        let snippet_sort_order = EditorSettings::get_global(cx).snippet_sort_order;
-
-        let id = post_inc(&mut self.next_completion_id);
-        let task = cx.spawn_in(window, async move |editor, cx| {
-            let Ok(()) = editor.update(cx, |this, _| {
-                this.completion_tasks.retain(|(task_id, _)| *task_id >= id);
-            }) else {
-                return;
-            };
-
-            // TODO: Ideally completions from different sources would be selectively re-queried, so
-            // that having one source with `is_incomplete: true` doesn't cause all to be re-queried.
-            let mut completions = Vec::new();
-            let mut is_incomplete = false;
-            let mut display_options: Option<CompletionDisplayOptions> = None;
-            if let Some(provider_responses) = provider_responses.await.log_err()
-                && !provider_responses.is_empty()
-            {
-                for response in provider_responses {
-                    completions.extend(response.completions);
-                    is_incomplete = is_incomplete || response.is_incomplete;
-                    match display_options.as_mut() {
-                        None => {
-                            display_options = Some(response.display_options);
-                        }
-                        Some(options) => options.merge(&response.display_options),
-                    }
-                }
-                if completion_settings.words == WordsCompletionMode::Fallback {
-                    words = Task::ready(BTreeMap::default());
-                }
-            }
-            let display_options = display_options.unwrap_or_default();
-
-            let mut words = words.await;
-            if let Some(word_to_exclude) = &word_to_exclude {
-                words.remove(word_to_exclude);
-            }
-            for lsp_completion in &completions {
-                words.remove(&lsp_completion.new_text);
-            }
-            completions.extend(words.into_iter().map(|(word, word_range)| Completion {
-                replace_range: word_replace_range.clone(),
-                new_text: word.clone(),
-                label: CodeLabel::plain(word, None),
-                match_start: None,
-                snippet_deduplication_key: None,
-                icon_path: None,
-                documentation: None,
-                source: CompletionSource::BufferWord {
-                    word_range,
-                    resolved: false,
-                },
-                insert_text_mode: Some(InsertTextMode::AS_IS),
-                confirm: None,
-            }));
-
-            completions.extend(
-                snippets
-                    .await
-                    .into_iter()
-                    .flat_map(|response| response.completions),
-            );
-
-            let menu = if completions.is_empty() {
-                None
-            } else {
-                let Ok((mut menu, matches_task)) = editor.update(cx, |editor, cx| {
-                    let languages = editor
-                        .workspace
-                        .as_ref()
-                        .and_then(|(workspace, _)| workspace.upgrade())
-                        .map(|workspace| workspace.read(cx).app_state().languages.clone());
-                    let menu = CompletionsMenu::new(
-                        id,
-                        requested_source.unwrap_or(if load_provider_completions {
-                            CompletionsMenuSource::Normal
-                        } else {
-                            CompletionsMenuSource::SnippetsOnly
-                        }),
-                        sort_completions,
-                        show_completion_documentation,
-                        position,
-                        query.clone(),
-                        is_incomplete,
-                        buffer.clone(),
-                        completions.into(),
-                        editor
-                            .context_menu()
-                            .borrow_mut()
-                            .as_ref()
-                            .map(|menu| menu.primary_scroll_handle()),
-                        display_options,
-                        snippet_sort_order,
-                        languages,
-                        language,
-                        cx,
-                    );
-
-                    let query = if filter_completions { query } else { None };
-                    let matches_task = menu.do_async_filtering(
-                        query.unwrap_or_default(),
-                        buffer_position,
-                        &buffer,
-                        cx,
-                    );
-                    (menu, matches_task)
-                }) else {
-                    return;
-                };
-
-                let matches = matches_task.await;
-
-                let Ok(()) = editor.update_in(cx, |editor, window, cx| {
-                    // Newer menu already set, so exit.
-                    if let Some(CodeContextMenu::Completions(prev_menu)) =
-                        editor.context_menu.borrow().as_ref()
-                        && prev_menu.id > id
-                    {
-                        return;
-                    };
-
-                    // Only valid to take prev_menu because either the new menu is immediately set
-                    // below, or the menu is hidden.
-                    if let Some(CodeContextMenu::Completions(prev_menu)) =
-                        editor.context_menu.borrow_mut().take()
-                    {
-                        let position_matches =
-                            if prev_menu.initial_position == menu.initial_position {
-                                true
-                            } else {
-                                let snapshot = editor.buffer.read(cx).read(cx);
-                                prev_menu.initial_position.to_offset(&snapshot)
-                                    == menu.initial_position.to_offset(&snapshot)
-                            };
-                        if position_matches {
-                            // Preserve markdown cache before `set_filter_results` because it will
-                            // try to populate the documentation cache.
-                            menu.preserve_markdown_cache(prev_menu);
-                        }
-                    };
-
-                    menu.set_filter_results(matches, provider, window, cx);
-                }) else {
-                    return;
-                };
-
-                menu.visible().then_some(menu)
-            };
-
-            editor
-                .update_in(cx, |editor, window, cx| {
-                    if editor.focus_handle.is_focused(window)
-                        && let Some(menu) = menu
-                    {
-                        *editor.context_menu.borrow_mut() =
-                            Some(CodeContextMenu::Completions(menu));
-
-                        crate::hover_popover::hide_hover(editor, cx);
-                        if editor.show_edit_predictions_in_menu() {
-                            editor.update_visible_edit_prediction(window, cx);
-                        } else {
-                            editor.discard_edit_prediction(false, cx);
-                        }
-
-                        cx.notify();
-                        return;
-                    }
-
-                    if editor.completion_tasks.len() <= 1 {
-                        // If there are no more completion tasks and the last menu was empty, we should hide it.
-                        let was_hidden = editor.hide_context_menu(window, cx).is_none();
-                        // If it was already hidden and we don't show edit predictions in the menu,
-                        // we should also show the edit prediction when available.
-                        if was_hidden && editor.show_edit_predictions_in_menu() {
-                            editor.update_visible_edit_prediction(window, cx);
-                        }
-                    }
-                })
-                .ok();
-        });
-
-        self.completion_tasks.push((id, task));
-    }
-
-    #[cfg(feature = "test-support")]
-    pub fn current_completions(&self) -> Option<Vec<project::Completion>> {
-        let menu = self.context_menu.borrow();
-        if let CodeContextMenu::Completions(menu) = menu.as_ref()? {
-            let completions = menu.completions.borrow();
-            Some(completions.to_vec())
-        } else {
-            None
-        }
-    }
-
-    pub fn with_completions_menu_matching_id<R>(
-        &self,
-        id: CompletionId,
-        f: impl FnOnce(Option<&mut CompletionsMenu>) -> R,
-    ) -> R {
-        let mut context_menu = self.context_menu.borrow_mut();
-        let Some(CodeContextMenu::Completions(completions_menu)) = &mut *context_menu else {
-            return f(None);
-        };
-        if completions_menu.id != id {
-            return f(None);
-        }
-        f(Some(completions_menu))
-    }
-
-    pub fn confirm_completion(
-        &mut self,
-        action: &ConfirmCompletion,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Task<Result<()>>> {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-        self.do_completion(action.item_ix, CompletionIntent::Complete, window, cx)
-    }
-
-    pub fn confirm_completion_insert(
-        &mut self,
-        _: &ConfirmCompletionInsert,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Task<Result<()>>> {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-        self.do_completion(None, CompletionIntent::CompleteWithInsert, window, cx)
-    }
-
-    pub fn confirm_completion_replace(
-        &mut self,
-        _: &ConfirmCompletionReplace,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Task<Result<()>>> {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-        self.do_completion(None, CompletionIntent::CompleteWithReplace, window, cx)
-    }
-
-    pub fn compose_completion(
-        &mut self,
-        action: &ComposeCompletion,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Task<Result<()>>> {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-        self.do_completion(action.item_ix, CompletionIntent::Compose, window, cx)
-    }
-
-    fn do_completion(
-        &mut self,
-        item_ix: Option<usize>,
-        intent: CompletionIntent,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) -> Option<Task<Result<()>>> {
-        use language::ToOffset as _;
-
-        let CodeContextMenu::Completions(completions_menu) = self.hide_context_menu(window, cx)?
-        else {
-            return None;
-        };
-
-        let candidate_id = {
-            let entries = completions_menu.entries.borrow();
-            let mat = entries.get(item_ix.unwrap_or(completions_menu.selected_item))?;
-            if self.show_edit_predictions_in_menu() {
-                self.discard_edit_prediction(true, cx);
-            }
-            mat.candidate_id
-        };
-
-        let completion = completions_menu
-            .completions
-            .borrow()
-            .get(candidate_id)?
-            .clone();
-        cx.stop_propagation();
-
-        let buffer_handle = completions_menu.buffer.clone();
-
-        let CompletionEdit {
-            new_text,
-            snippet,
-            replace_range,
-        } = process_completion_for_edit(
-            &completion,
-            intent,
-            &buffer_handle,
-            &completions_menu.initial_position.text_anchor,
-            cx,
-        );
-
-        let buffer = buffer_handle.read(cx);
-        let snapshot = self.buffer.read(cx).snapshot(cx);
-        let newest_anchor = self.selections.newest_anchor();
-        let replace_range_multibuffer = {
-            let mut excerpt = snapshot.excerpt_containing(newest_anchor.range()).unwrap();
-            excerpt.map_range_from_buffer(replace_range.clone())
-        };
-        if snapshot.buffer_id_for_anchor(newest_anchor.head()) != Some(buffer.remote_id()) {
-            return None;
-        }
-
-        let old_text = buffer
-            .text_for_range(replace_range.clone())
-            .collect::<String>();
-        let lookbehind = newest_anchor
-            .start
-            .text_anchor
-            .to_offset(buffer)
-            .saturating_sub(replace_range.start.0);
-        let lookahead = replace_range
-            .end
-            .0
-            .saturating_sub(newest_anchor.end.text_anchor.to_offset(buffer));
-        let prefix = &old_text[..old_text.len().saturating_sub(lookahead)];
-        let suffix = &old_text[lookbehind.min(old_text.len())..];
-
-        let selections = self
-            .selections
-            .all::<MultiBufferOffset>(&self.display_snapshot(cx));
-        let mut ranges = Vec::new();
-        let mut linked_edits = HashMap::<_, Vec<_>>::default();
-
-        for selection in &selections {
-            let range = if selection.id == newest_anchor.id {
-                replace_range_multibuffer.clone()
-            } else {
-                let mut range = selection.range();
-
-                // if prefix is present, don't duplicate it
-                if snapshot.contains_str_at(range.start.saturating_sub_usize(lookbehind), prefix) {
-                    range.start = range.start.saturating_sub_usize(lookbehind);
-
-                    // if suffix is also present, mimic the newest cursor and replace it
-                    if selection.id != newest_anchor.id
-                        && snapshot.contains_str_at(range.end, suffix)
-                    {
-                        range.end += lookahead;
-                    }
-                }
-                range
-            };
-
-            ranges.push(range.clone());
-
-            if !self.linked_edit_ranges.is_empty() {
-                let start_anchor = snapshot.anchor_before(range.start);
-                let end_anchor = snapshot.anchor_after(range.end);
-                if let Some(ranges) = self
-                    .linked_editing_ranges_for(start_anchor.text_anchor..end_anchor.text_anchor, cx)
-                {
-                    for (buffer, edits) in ranges {
-                        linked_edits
-                            .entry(buffer.clone())
-                            .or_default()
-                            .extend(edits.into_iter().map(|range| (range, new_text.to_owned())));
-                    }
-                }
-            }
-        }
-
-        let common_prefix_len = old_text
-            .chars()
-            .zip(new_text.chars())
-            .take_while(|(a, b)| a == b)
-            .map(|(a, _)| a.len_utf8())
-            .sum::<usize>();
-
-        cx.emit(EditorEvent::InputHandled {
-            utf16_range_to_replace: None,
-            text: new_text[common_prefix_len..].into(),
-        });
-
-        self.transact(window, cx, |editor, window, cx| {
-            if let Some(mut snippet) = snippet {
-                snippet.text = new_text.to_string();
-                editor
-                    .insert_snippet(&ranges, snippet, window, cx)
-                    .log_err();
-            } else {
-                editor.buffer.update(cx, |multi_buffer, cx| {
-                    let auto_indent = match completion.insert_text_mode {
-                        Some(InsertTextMode::AS_IS) => None,
-                        _ => editor.autoindent_mode.clone(),
-                    };
-                    let edits = ranges.into_iter().map(|range| (range, new_text.as_str()));
-                    multi_buffer.edit(edits, auto_indent, cx);
-                });
-            }
-            for (buffer, edits) in linked_edits {
-                buffer.update(cx, |buffer, cx| {
-                    let snapshot = buffer.snapshot();
-                    let edits = edits
-                        .into_iter()
-                        .map(|(range, text)| {
-                            use text::ToPoint as TP;
-                            let end_point = TP::to_point(&range.end, &snapshot);
-                            let start_point = TP::to_point(&range.start, &snapshot);
-                            (start_point..end_point, text)
-                        })
-                        .sorted_by_key(|(range, _)| range.start);
-                    buffer.edit(edits, None, cx);
-                })
-            }
-
-            editor.refresh_edit_prediction(true, false, window, cx);
-        });
-        self.invalidate_autoclose_regions(&self.selections.disjoint_anchors_arc(), &snapshot);
-
-        let show_new_completions_on_confirm = completion
-            .confirm
-            .as_ref()
-            .is_some_and(|confirm| confirm(intent, window, cx));
-        if show_new_completions_on_confirm {
-            self.open_or_update_completions_menu(None, None, false, window, cx);
-        }
-
-        let provider = self.completion_provider.as_ref()?;
-
-        let lsp_store = self.project().map(|project| project.read(cx).lsp_store());
-        let command = lsp_store.as_ref().and_then(|lsp_store| {
-            let CompletionSource::Lsp {
-                lsp_completion,
-                server_id,
-                ..
-            } = &completion.source
-            else {
-                return None;
-            };
-            let lsp_command = lsp_completion.command.as_ref()?;
-            let available_commands = lsp_store
-                .read(cx)
-                .lsp_server_capabilities
-                .get(server_id)
-                .and_then(|server_capabilities| {
-                    server_capabilities
-                        .execute_command_provider
-                        .as_ref()
-                        .map(|options| options.commands.as_slice())
-                })?;
-            if available_commands.contains(&lsp_command.command) {
-                Some(CodeAction {
-                    server_id: *server_id,
-                    range: language::Anchor::MIN..language::Anchor::MIN,
-                    lsp_action: LspAction::Command(lsp_command.clone()),
-                    resolved: false,
-                })
-            } else {
-                None
-            }
-        });
-
-        drop(completion);
-        let apply_edits = provider.apply_additional_edits_for_completion(
-            buffer_handle.clone(),
-            completions_menu.completions.clone(),
-            candidate_id,
-            true,
-            cx,
-        );
-
-        let editor_settings = EditorSettings::get_global(cx);
-        if editor_settings.show_signature_help_after_edits || editor_settings.auto_signature_help {
-            // After the code completion is finished, users often want to know what signatures are needed.
-            // so we should automatically call signature_help
-            self.show_signature_help(&ShowSignatureHelp, window, cx);
-        }
-
-        Some(cx.spawn_in(window, async move |editor, cx| {
-            apply_edits.await?;
-
-            if let Some((lsp_store, command)) = lsp_store.zip(command) {
-                let title = command.lsp_action.title().to_owned();
-                let project_transaction = lsp_store
-                    .update(cx, |lsp_store, cx| {
-                        lsp_store.apply_code_action(buffer_handle, command, false, cx)
-                    })?
-                    .await
-                    .context("applying post-completion command")?;
-                if let Some(workspace) = editor.read_with(cx, |editor, _| editor.workspace())? {
-                    Self::open_project_transaction(
-                        &editor,
-                        workspace.downgrade(),
-                        project_transaction,
-                        title,
-                        cx,
-                    )
-                    .await?;
-                }
-            }
-
-            Ok(())
-        }))
-    }
-
-    pub fn toggle_code_actions(
-        &mut self,
-        action: &ToggleCodeActions,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let quick_launch = action.quick_launch;
-        let mut context_menu = self.context_menu.borrow_mut();
-        if let Some(CodeContextMenu::CodeActions(code_actions)) = context_menu.as_ref() {
-            if code_actions.deployed_from == action.deployed_from {
-                // Toggle if we're selecting the same one
-                *context_menu = None;
-                cx.notify();
-                return;
-            } else {
-                // Otherwise, clear it and start a new one
-                *context_menu = None;
-                cx.notify();
-            }
-        }
-        drop(context_menu);
-        let snapshot = self.snapshot(window, cx);
-        let deployed_from = action.deployed_from.clone();
-        let action = action.clone();
-        self.completion_tasks.clear();
-        self.discard_edit_prediction(false, cx);
-
-        let multibuffer_point = match &action.deployed_from {
-            Some(CodeActionSource::Indicator(row)) | Some(CodeActionSource::RunMenu(row)) => {
-                DisplayPoint::new(*row, 0).to_point(&snapshot)
-            }
-            _ => self
-                .selections
-                .newest::<Point>(&snapshot.display_snapshot)
-                .head(),
-        };
-        let Some((buffer, buffer_row)) = snapshot
-            .buffer_snapshot()
-            .buffer_line_for_row(MultiBufferRow(multibuffer_point.row))
-            .and_then(|(buffer_snapshot, range)| {
-                self.buffer()
-                    .read(cx)
-                    .buffer(buffer_snapshot.remote_id())
-                    .map(|buffer| (buffer, range.start.row))
-            })
-        else {
-            return;
-        };
-        let buffer_id = buffer.read(cx).remote_id();
-        let tasks = self
-            .tasks
-            .get(&(buffer_id, buffer_row))
-            .map(|t| Arc::new(t.to_owned()));
-
-        if !self.focus_handle.is_focused(window) {
-            return;
-        }
-        let project = self.project.clone();
-
-        let code_actions_task = match deployed_from {
-            Some(CodeActionSource::RunMenu(_)) => Task::ready(None),
-            _ => self.code_actions(buffer_row, window, cx),
-        };
-
-        let runnable_task = match deployed_from {
-            Some(CodeActionSource::Indicator(_)) => Task::ready(Ok(Default::default())),
-            _ => {
-                let mut task_context_task = Task::ready(None);
-                if let Some(tasks) = &tasks
-                    && let Some(project) = project
-                {
-                    task_context_task =
-                        Self::build_tasks_context(&project, &buffer, buffer_row, tasks, cx);
-                }
-
-                cx.spawn_in(window, {
-                    let buffer = buffer.clone();
-                    async move |editor, cx| {
-                        let task_context = task_context_task.await;
-
-                        let resolved_tasks =
-                            tasks
-                                .zip(task_context.clone())
-                                .map(|(tasks, task_context)| ResolvedTasks {
-                                    templates: tasks.resolve(&task_context).collect(),
-                                    position: snapshot.buffer_snapshot().anchor_before(Point::new(
-                                        multibuffer_point.row,
-                                        tasks.column,
-                                    )),
-                                });
-                        let debug_scenarios = editor
-                            .update(cx, |editor, cx| {
-                                editor.debug_scenarios(&resolved_tasks, &buffer, cx)
-                            })?
-                            .await;
-                        anyhow::Ok((resolved_tasks, debug_scenarios, task_context))
-                    }
-                })
-            }
-        };
-
-        cx.spawn_in(window, async move |editor, cx| {
-            let (resolved_tasks, debug_scenarios, task_context) = runnable_task.await?;
-            let code_actions = code_actions_task.await;
-            let spawn_straight_away = quick_launch
-                && resolved_tasks
-                    .as_ref()
-                    .is_some_and(|tasks| tasks.templates.len() == 1)
-                && code_actions
-                    .as_ref()
-                    .is_none_or(|actions| actions.is_empty())
-                && debug_scenarios.is_empty();
-
-            editor.update_in(cx, |editor, window, cx| {
-                crate::hover_popover::hide_hover(editor, cx);
-                let actions = CodeActionContents::new(
-                    resolved_tasks,
-                    code_actions,
-                    debug_scenarios,
-                    task_context.unwrap_or_default(),
-                );
-
-                // Don't show the menu if there are no actions available
-                if actions.is_empty() {
-                    cx.notify();
-                    return Task::ready(Ok(()));
-                }
-
-                *editor.context_menu.borrow_mut() =
-                    Some(CodeContextMenu::CodeActions(CodeActionsMenu {
-                        buffer,
-                        actions,
-                        selected_item: Default::default(),
-                        scroll_handle: UniformListScrollHandle::default(),
-                        deployed_from,
-                    }));
-                cx.notify();
-                if spawn_straight_away
-                    && let Some(task) = editor.confirm_code_action(
-                        &ConfirmCodeAction { item_ix: Some(0) },
-                        window,
-                        cx,
-                    )
-                {
-                    return task;
-                }
-
-                Task::ready(Ok(()))
-            })
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn debug_scenarios(
-        &mut self,
-        resolved_tasks: &Option<ResolvedTasks>,
-        buffer: &Entity<Buffer>,
-        cx: &mut App,
-    ) -> Task<Vec<task::DebugScenario>> {
-        maybe!({
-            let project = self.project()?;
-            let dap_store = project.read(cx).dap_store();
-            let mut scenarios = vec![];
-            let resolved_tasks = resolved_tasks.as_ref()?;
-            let buffer = buffer.read(cx);
-            let language = buffer.language()?;
-            let file = buffer.file();
-            let debug_adapter = language_settings(language.name().into(), file, cx)
-                .debuggers
-                .first()
-                .map(SharedString::from)
-                .or_else(|| language.config().debuggers.first().map(SharedString::from))?;
-
-            dap_store.update(cx, |dap_store, cx| {
-                for (_, task) in &resolved_tasks.templates {
-                    let maybe_scenario = dap_store.debug_scenario_for_build_task(
-                        task.original_task().clone(),
-                        debug_adapter.clone().into(),
-                        task.display_label().to_owned().into(),
-                        cx,
-                    );
-                    scenarios.push(maybe_scenario);
-                }
-            });
-            Some(cx.background_spawn(async move {
-                futures::future::join_all(scenarios)
-                    .await
-                    .into_iter()
-                    .flatten()
-                    .collect::<Vec<_>>()
-            }))
-        })
-        .unwrap_or_else(|| Task::ready(vec![]))
-    }
-
-    fn code_actions(
-        &mut self,
-        buffer_row: u32,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Option<Rc<[AvailableCodeAction]>>> {
-        let mut task = self.code_actions_task.take();
-        cx.spawn_in(window, async move |editor, cx| {
-            while let Some(prev_task) = task {
-                prev_task.await.log_err();
-                task = editor
-                    .update(cx, |this, _| this.code_actions_task.take())
-                    .ok()?;
-            }
-
-            editor
-                .update(cx, |editor, cx| {
-                    editor
-                        .available_code_actions
-                        .clone()
-                        .and_then(|(location, code_actions)| {
-                            let snapshot = location.buffer.read(cx).snapshot();
-                            let point_range = location.range.to_point(&snapshot);
-                            let point_range = point_range.start.row..=point_range.end.row;
-                            if point_range.contains(&buffer_row) {
-                                Some(code_actions)
-                            } else {
-                                None
-                            }
-                        })
-                })
-                .ok()
-                .flatten()
-        })
-    }
-
-    pub fn confirm_code_action(
-        &mut self,
-        action: &ConfirmCodeAction,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Task<Result<()>>> {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-
-        let actions_menu =
-            if let CodeContextMenu::CodeActions(menu) = self.hide_context_menu(window, cx)? {
-                menu
-            } else {
-                return None;
-            };
-
-        let action_ix = action.item_ix.unwrap_or(actions_menu.selected_item);
-        let action = actions_menu.actions.get(action_ix)?;
-        let title = action.label();
-        let buffer = actions_menu.buffer;
-        let workspace = self.workspace()?;
-
-        match action {
-            CodeActionsItem::Task(task_source_kind, resolved_task) => {
-                workspace.update(cx, |workspace, cx| {
-                    workspace.schedule_resolved_task(
-                        task_source_kind,
-                        resolved_task,
-                        false,
-                        window,
-                        cx,
-                    );
-
-                    Some(Task::ready(Ok(())))
-                })
-            }
-            CodeActionsItem::CodeAction {
-                excerpt_id,
-                action,
-                provider,
-            } => {
-                let apply_code_action =
-                    provider.apply_code_action(buffer, action, excerpt_id, true, window, cx);
-                let workspace = workspace.downgrade();
-                Some(cx.spawn_in(window, async move |editor, cx| {
-                    let project_transaction = apply_code_action.await?;
-                    Self::open_project_transaction(
-                        &editor,
-                        workspace,
-                        project_transaction,
-                        title,
-                        cx,
-                    )
-                    .await
-                }))
-            }
-            CodeActionsItem::DebugScenario(scenario) => {
-                let context = actions_menu.actions.context;
-
-                workspace.update(cx, |workspace, cx| {
-                    dap::send_telemetry(&scenario, TelemetrySpawnLocation::Gutter, cx);
-                    workspace.start_debug_session(
-                        scenario,
-                        context,
-                        Some(buffer),
-                        None,
-                        window,
-                        cx,
-                    );
-                });
-                Some(Task::ready(Ok(())))
-            }
-        }
-    }
-
-    pub async fn open_project_transaction(
-        editor: &WeakEntity<Editor>,
-        workspace: WeakEntity<Workspace>,
-        transaction: ProjectTransaction,
-        title: String,
-        cx: &mut AsyncWindowContext,
-    ) -> Result<()> {
-        let mut entries = transaction.0.into_iter().collect::<Vec<_>>();
-        cx.update(|_, cx| {
-            entries.sort_unstable_by_key(|(buffer, _)| {
-                buffer.read(cx).file().map(|f| f.path().clone())
-            });
-        })?;
-        if entries.is_empty() {
-            return Ok(());
-        }
-
-        // If the project transaction's edits are all contained within this editor, then
-        // avoid opening a new editor to display them.
-
-        if let [(buffer, transaction)] = &*entries {
-            let excerpt = editor.update(cx, |editor, cx| {
-                editor
-                    .buffer()
-                    .read(cx)
-                    .excerpt_containing(editor.selections.newest_anchor().head(), cx)
-            })?;
-            if let Some((_, excerpted_buffer, excerpt_range)) = excerpt
-                && excerpted_buffer == *buffer
-            {
-                let all_edits_within_excerpt = buffer.read_with(cx, |buffer, _| {
-                    let excerpt_range = excerpt_range.to_offset(buffer);
-                    buffer
-                        .edited_ranges_for_transaction::<usize>(transaction)
-                        .all(|range| {
-                            excerpt_range.start <= range.start && excerpt_range.end >= range.end
-                        })
-                })?;
-
-                if all_edits_within_excerpt {
-                    return Ok(());
-                }
-            }
-        }
-
-        let mut ranges_to_highlight = Vec::new();
-        let excerpt_buffer = cx.new(|cx| {
-            let mut multibuffer = MultiBuffer::new(Capability::ReadWrite).with_title(title);
-            for (buffer_handle, transaction) in &entries {
-                let edited_ranges = buffer_handle
-                    .read(cx)
-                    .edited_ranges_for_transaction::<Point>(transaction)
-                    .collect::<Vec<_>>();
-                let (ranges, _) = multibuffer.set_excerpts_for_path(
-                    PathKey::for_buffer(buffer_handle, cx),
-                    buffer_handle.clone(),
-                    edited_ranges,
-                    multibuffer_context_lines(cx),
-                    cx,
-                );
-
-                ranges_to_highlight.extend(ranges);
-            }
-            multibuffer.push_transaction(entries.iter().map(|(b, t)| (b, t)), cx);
-            multibuffer
-        })?;
-
-        workspace.update_in(cx, |workspace, window, cx| {
-            let project = workspace.project().clone();
-            let editor =
-                cx.new(|cx| Editor::for_multibuffer(excerpt_buffer, Some(project), window, cx));
-            workspace.add_item_to_active_pane(Box::new(editor.clone()), None, true, window, cx);
-            editor.update(cx, |editor, cx| {
-                editor.highlight_background::<Self>(
-                    &ranges_to_highlight,
-                    |_, theme| theme.colors().editor_highlighted_line_background,
-                    cx,
-                );
-            });
-        })?;
-
-        Ok(())
-    }
-
-    pub fn clear_code_action_providers(&mut self) {
-        self.code_action_providers.clear();
-        self.available_code_actions.take();
-    }
-
-    pub fn add_code_action_provider(
-        &mut self,
-        provider: Rc<dyn CodeActionProvider>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self
-            .code_action_providers
-            .iter()
-            .any(|existing_provider| existing_provider.id() == provider.id())
-        {
-            return;
-        }
-
-        self.code_action_providers.push(provider);
-        self.refresh_code_actions(window, cx);
-    }
-
-    pub fn remove_code_action_provider(
-        &mut self,
-        id: Arc<str>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.code_action_providers
-            .retain(|provider| provider.id() != id);
-        self.refresh_code_actions(window, cx);
-    }
-
-    pub fn code_actions_enabled_for_toolbar(&self, cx: &App) -> bool {
-        !self.code_action_providers.is_empty()
-            && EditorSettings::get_global(cx).toolbar.code_actions
-    }
-
-    pub fn has_available_code_actions(&self) -> bool {
-        self.available_code_actions
-            .as_ref()
-            .is_some_and(|(_, actions)| !actions.is_empty())
-    }
-
-    fn render_inline_code_actions(
-        &self,
-        icon_size: ui::IconSize,
-        display_row: DisplayRow,
-        is_active: bool,
-        cx: &mut Context<Self>,
-    ) -> AnyElement {
-        let show_tooltip = !self.context_menu_visible();
-        IconButton::new("inline_code_actions", ui::IconName::BoltFilled)
-            .icon_size(icon_size)
-            .shape(ui::IconButtonShape::Square)
-            .icon_color(ui::Color::Hidden)
-            .toggle_state(is_active)
-            .when(show_tooltip, |this| {
-                this.tooltip({
-                    let focus_handle = self.focus_handle.clone();
-                    move |_window, cx| {
-                        Tooltip::for_action_in(
-                            "Toggle Code Actions",
-                            &ToggleCodeActions {
-                                deployed_from: None,
-                                quick_launch: false,
-                            },
-                            &focus_handle,
-                            cx,
-                        )
-                    }
-                })
-            })
-            .on_click(cx.listener(move |editor, _: &ClickEvent, window, cx| {
-                window.focus(&editor.focus_handle(cx));
-                editor.toggle_code_actions(
-                    &crate::actions::ToggleCodeActions {
-                        deployed_from: Some(crate::actions::CodeActionSource::Indicator(
-                            display_row,
-                        )),
-                        quick_launch: false,
-                    },
-                    window,
-                    cx,
-                );
-            }))
-            .into_any_element()
-    }
-
-    pub fn context_menu(&self) -> &RefCell<Option<CodeContextMenu>> {
-        &self.context_menu
-    }
-
-    fn refresh_code_actions(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.code_actions_task = Some(cx.spawn_in(window, async move |this, cx| {
-            cx.background_executor()
-                .timer(CODE_ACTIONS_DEBOUNCE_TIMEOUT)
-                .await;
-
-            let (start_buffer, start, _, end, newest_selection) = this
-                .update(cx, |this, cx| {
-                    let newest_selection = this.selections.newest_anchor().clone();
-                    if newest_selection.head().diff_base_anchor.is_some() {
-                        return None;
-                    }
-                    let display_snapshot = this.display_snapshot(cx);
-                    let newest_selection_adjusted =
-                        this.selections.newest_adjusted(&display_snapshot);
-                    let buffer = this.buffer.read(cx);
-
-                    let (start_buffer, start) =
-                        buffer.text_anchor_for_position(newest_selection_adjusted.start, cx)?;
-                    let (end_buffer, end) =
-                        buffer.text_anchor_for_position(newest_selection_adjusted.end, cx)?;
-
-                    Some((start_buffer, start, end_buffer, end, newest_selection))
-                })?
-                .filter(|(start_buffer, _, end_buffer, _, _)| start_buffer == end_buffer)
-                .context(
-                    "Expected selection to lie in a single buffer when refreshing code actions",
-                )?;
-            let (providers, tasks) = this.update_in(cx, |this, window, cx| {
-                let providers = this.code_action_providers.clone();
-                let tasks = this
-                    .code_action_providers
-                    .iter()
-                    .map(|provider| provider.code_actions(&start_buffer, start..end, window, cx))
-                    .collect::<Vec<_>>();
-                (providers, tasks)
-            })?;
-
-            let mut actions = Vec::new();
-            for (provider, provider_actions) in
-                providers.into_iter().zip(future::join_all(tasks).await)
-            {
-                if let Some(provider_actions) = provider_actions.log_err() {
-                    actions.extend(provider_actions.into_iter().map(|action| {
-                        AvailableCodeAction {
-                            excerpt_id: newest_selection.start.excerpt_id,
-                            action,
-                            provider: provider.clone(),
-                        }
-                    }));
-                }
-            }
-
-            this.update(cx, |this, cx| {
-                this.available_code_actions = if actions.is_empty() {
-                    None
-                } else {
-                    Some((
-                        Location {
-                            buffer: start_buffer,
-                            range: start..end,
-                        },
-                        actions.into(),
-                    ))
-                };
-                cx.notify();
-            })
-        }));
-    }
-
-    fn start_inline_blame_timer(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(delay) = ProjectSettings::get_global(cx).git.inline_blame_delay() {
-            self.show_git_blame_inline = false;
-
-            self.show_git_blame_inline_delay_task =
-                Some(cx.spawn_in(window, async move |this, cx| {
-                    cx.background_executor().timer(delay).await;
-
-                    this.update(cx, |this, cx| {
-                        this.show_git_blame_inline = true;
-                        cx.notify();
-                    })
-                    .log_err();
-                }));
-        }
-    }
-
-    pub fn blame_hover(&mut self, _: &BlameHover, window: &mut Window, cx: &mut Context<Self>) {
-        let snapshot = self.snapshot(window, cx);
-        let cursor = self
-            .selections
-            .newest::<Point>(&snapshot.display_snapshot)
-            .head();
-        let Some((buffer, point, _)) = snapshot.buffer_snapshot().point_to_buffer_point(cursor)
-        else {
-            return;
-        };
-
-        if self.blame.is_none() {
-            self.start_git_blame(true, window, cx);
-        }
-        let Some(blame) = self.blame.as_ref() else {
-            return;
-        };
-
-        let row_info = RowInfo {
-            buffer_id: Some(buffer.remote_id()),
-            buffer_row: Some(point.row),
-            ..Default::default()
-        };
-        let Some((buffer, blame_entry)) = blame
-            .update(cx, |blame, cx| blame.blame_for_rows(&[row_info], cx).next())
-            .flatten()
-        else {
-            return;
-        };
-
-        let anchor = self.selections.newest_anchor().head();
-        let position = self.to_pixel_point(anchor, &snapshot, window, cx);
-        if let (Some(position), Some(last_bounds)) = (position, self.last_bounds) {
-            self.show_blame_popover(
-                buffer,
-                &blame_entry,
-                position + last_bounds.origin,
-                true,
-                cx,
-            );
-        };
-    }
-
-    fn show_blame_popover(
-        &mut self,
-        buffer: BufferId,
-        blame_entry: &BlameEntry,
-        position: gpui::Point<Pixels>,
-        ignore_timeout: bool,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(state) = &mut self.inline_blame_popover {
-            state.hide_task.take();
-        } else {
-            let blame_popover_delay = EditorSettings::get_global(cx).hover_popover_delay.0;
-            let blame_entry = blame_entry.clone();
-            let show_task = cx.spawn(async move |editor, cx| {
-                if !ignore_timeout {
-                    cx.background_executor()
-                        .timer(std::time::Duration::from_millis(blame_popover_delay))
-                        .await;
-                }
-                editor
-                    .update(cx, |editor, cx| {
-                        editor.inline_blame_popover_show_task.take();
-                        let Some(blame) = editor.blame.as_ref() else {
-                            return;
-                        };
-                        let blame = blame.read(cx);
-                        let details = blame.details_for_entry(buffer, &blame_entry);
-                        let markdown = cx.new(|cx| {
-                            Markdown::new(
-                                details
-                                    .as_ref()
-                                    .map(|message| message.message.clone())
-                                    .unwrap_or_default(),
-                                None,
-                                None,
-                                cx,
-                            )
-                        });
-                        editor.inline_blame_popover = Some(InlineBlamePopover {
-                            position,
-                            hide_task: None,
-                            popover_bounds: None,
-                            popover_state: InlineBlamePopoverState {
-                                scroll_handle: ScrollHandle::new(),
-                                commit_message: details,
-                                markdown,
-                            },
-                            keyboard_grace: ignore_timeout,
-                        });
-                        cx.notify();
-                    })
-                    .ok();
-            });
-            self.inline_blame_popover_show_task = Some(show_task);
-        }
-    }
-
-    pub fn has_mouse_context_menu(&self) -> bool {
-        self.mouse_context_menu.is_some()
-    }
-
-    pub fn hide_blame_popover(&mut self, ignore_timeout: bool, cx: &mut Context<Self>) -> bool {
-        self.inline_blame_popover_show_task.take();
-        if let Some(state) = &mut self.inline_blame_popover {
-            let hide_task = cx.spawn(async move |editor, cx| {
-                if !ignore_timeout {
-                    cx.background_executor()
-                        .timer(std::time::Duration::from_millis(100))
-                        .await;
-                }
-                editor
-                    .update(cx, |editor, cx| {
-                        editor.inline_blame_popover.take();
-                        cx.notify();
-                    })
-                    .ok();
-            });
-            state.hide_task = Some(hide_task);
-            true
-        } else {
-            false
-        }
-    }
-
-    fn refresh_document_highlights(&mut self, cx: &mut Context<Self>) -> Option<()> {
-        if self.pending_rename.is_some() {
-            return None;
-        }
-
-        let provider = self.semantics_provider.clone()?;
-        let buffer = self.buffer.read(cx);
-        let newest_selection = self.selections.newest_anchor().clone();
-        let cursor_position = newest_selection.head();
-        let (cursor_buffer, cursor_buffer_position) =
-            buffer.text_anchor_for_position(cursor_position, cx)?;
-        let (tail_buffer, tail_buffer_position) =
-            buffer.text_anchor_for_position(newest_selection.tail(), cx)?;
-        if cursor_buffer != tail_buffer {
-            return None;
-        }
-
-        let snapshot = cursor_buffer.read(cx).snapshot();
-        let (start_word_range, _) = snapshot.surrounding_word(cursor_buffer_position, None);
-        let (end_word_range, _) = snapshot.surrounding_word(tail_buffer_position, None);
-        if start_word_range != end_word_range {
-            self.document_highlights_task.take();
-            self.clear_background_highlights::<DocumentHighlightRead>(cx);
-            self.clear_background_highlights::<DocumentHighlightWrite>(cx);
-            return None;
-        }
-
-        let debounce = EditorSettings::get_global(cx).lsp_highlight_debounce.0;
-        self.document_highlights_task = Some(cx.spawn(async move |this, cx| {
-            cx.background_executor()
-                .timer(Duration::from_millis(debounce))
-                .await;
-
-            let highlights = if let Some(highlights) = cx
-                .update(|cx| {
-                    provider.document_highlights(&cursor_buffer, cursor_buffer_position, cx)
-                })
-                .ok()
-                .flatten()
-            {
-                highlights.await.log_err()
-            } else {
-                None
-            };
-
-            if let Some(highlights) = highlights {
-                this.update(cx, |this, cx| {
-                    if this.pending_rename.is_some() {
-                        return;
-                    }
-
-                    let buffer = this.buffer.read(cx);
-                    if buffer
-                        .text_anchor_for_position(cursor_position, cx)
-                        .is_none_or(|(buffer, _)| buffer != cursor_buffer)
-                    {
-                        return;
-                    }
-
-                    let cursor_buffer_snapshot = cursor_buffer.read(cx);
-                    let mut write_ranges = Vec::new();
-                    let mut read_ranges = Vec::new();
-                    for highlight in highlights {
-                        let buffer_id = cursor_buffer.read(cx).remote_id();
-                        for (excerpt_id, excerpt_range) in buffer.excerpts_for_buffer(buffer_id, cx)
-                        {
-                            let start = highlight
-                                .range
-                                .start
-                                .max(&excerpt_range.context.start, cursor_buffer_snapshot);
-                            let end = highlight
-                                .range
-                                .end
-                                .min(&excerpt_range.context.end, cursor_buffer_snapshot);
-                            if start.cmp(&end, cursor_buffer_snapshot).is_ge() {
-                                continue;
-                            }
-
-                            let range = Anchor::range_in_buffer(excerpt_id, *start..*end);
-                            if highlight.kind == lsp::DocumentHighlightKind::WRITE {
-                                write_ranges.push(range);
-                            } else {
-                                read_ranges.push(range);
-                            }
-                        }
-                    }
-
-                    this.highlight_background::<DocumentHighlightRead>(
-                        &read_ranges,
-                        |_, theme| theme.colors().editor_document_highlight_read_background,
-                        cx,
-                    );
-                    this.highlight_background::<DocumentHighlightWrite>(
-                        &write_ranges,
-                        |_, theme| theme.colors().editor_document_highlight_write_background,
-                        cx,
-                    );
-                    cx.notify();
-                })
-                .log_err();
-            }
-        }));
-        None
-    }
-
-    fn prepare_highlight_query_from_selection(
-        &mut self,
-        window: &Window,
-        cx: &mut Context<Editor>,
-    ) -> Option<(String, Range<Anchor>)> {
-        if matches!(self.mode, EditorMode::SingleLine) {
-            return None;
-        }
-        if !EditorSettings::get_global(cx).selection_highlight {
-            return None;
-        }
-        if self.selections.count() != 1 || self.selections.line_mode() {
-            return None;
-        }
-        let snapshot = self.snapshot(window, cx);
-        let selection = self.selections.newest::<Point>(&snapshot);
-        // If the selection spans multiple rows OR it is empty
-        if selection.start.row != selection.end.row
-            || selection.start.column == selection.end.column
-        {
-            return None;
-        }
-        let selection_anchor_range = selection.range().to_anchors(snapshot.buffer_snapshot());
-        let query = snapshot
-            .buffer_snapshot()
-            .text_for_range(selection_anchor_range.clone())
-            .collect::<String>();
-        if query.trim().is_empty() {
-            return None;
-        }
-        Some((query, selection_anchor_range))
-    }
-
-    #[ztracing::instrument(skip_all)]
-    fn update_selection_occurrence_highlights(
-        &mut self,
-        query_text: String,
-        query_range: Range<Anchor>,
-        multi_buffer_range_to_query: Range<Point>,
-        use_debounce: bool,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) -> Task<()> {
-        let multi_buffer_snapshot = self.buffer().read(cx).snapshot(cx);
-        cx.spawn_in(window, async move |editor, cx| {
-            if use_debounce {
-                cx.background_executor()
-                    .timer(SELECTION_HIGHLIGHT_DEBOUNCE_TIMEOUT)
-                    .await;
-            }
-            let match_task = cx.background_spawn(async move {
-                let buffer_ranges = multi_buffer_snapshot
-                    .range_to_buffer_ranges(multi_buffer_range_to_query)
-                    .into_iter()
-                    .filter(|(_, excerpt_visible_range, _)| !excerpt_visible_range.is_empty());
-                let mut match_ranges = Vec::new();
-                let Ok(regex) = project::search::SearchQuery::text(
-                    query_text.clone(),
-                    false,
-                    false,
-                    false,
-                    Default::default(),
-                    Default::default(),
-                    false,
-                    None,
-                ) else {
-                    return Vec::default();
-                };
-                let query_range = query_range.to_anchors(&multi_buffer_snapshot);
-                for (buffer_snapshot, search_range, excerpt_id) in buffer_ranges {
-                    match_ranges.extend(
-                        regex
-                            .search(
-                                buffer_snapshot,
-                                Some(search_range.start.0..search_range.end.0),
-                            )
-                            .await
-                            .into_iter()
-                            .filter_map(|match_range| {
-                                let match_start = buffer_snapshot
-                                    .anchor_after(search_range.start + match_range.start);
-                                let match_end = buffer_snapshot
-                                    .anchor_before(search_range.start + match_range.end);
-                                let match_anchor_range =
-                                    Anchor::range_in_buffer(excerpt_id, match_start..match_end);
-                                (match_anchor_range != query_range).then_some(match_anchor_range)
-                            }),
-                    );
-                }
-                match_ranges
-            });
-            let match_ranges = match_task.await;
-            editor
-                .update_in(cx, |editor, _, cx| {
-                    editor.clear_background_highlights::<SelectedTextHighlight>(cx);
-                    if !match_ranges.is_empty() {
-                        editor.highlight_background::<SelectedTextHighlight>(
-                            &match_ranges,
-                            |_, theme| theme.colors().editor_document_highlight_bracket_background,
-                            cx,
-                        )
-                    }
-                })
-                .log_err();
-        })
-    }
-
-    fn refresh_single_line_folds(&mut self, window: &mut Window, cx: &mut Context<Editor>) {
-        struct NewlineFold;
-        let type_id = std::any::TypeId::of::<NewlineFold>();
-        if !self.mode.is_single_line() {
-            return;
-        }
-        let snapshot = self.snapshot(window, cx);
-        if snapshot.buffer_snapshot().max_point().row == 0 {
-            return;
-        }
-        let task = cx.background_spawn(async move {
-            let new_newlines = snapshot
-                .buffer_chars_at(MultiBufferOffset(0))
-                .filter_map(|(c, i)| {
-                    if c == '\n' {
-                        Some(
-                            snapshot.buffer_snapshot().anchor_after(i)
-                                ..snapshot.buffer_snapshot().anchor_before(i + 1usize),
-                        )
-                    } else {
-                        None
-                    }
-                })
-                .collect::<Vec<_>>();
-            let existing_newlines = snapshot
-                .folds_in_range(MultiBufferOffset(0)..snapshot.buffer_snapshot().len())
-                .filter_map(|fold| {
-                    if fold.placeholder.type_tag == Some(type_id) {
-                        Some(fold.range.start..fold.range.end)
-                    } else {
-                        None
-                    }
-                })
-                .collect::<Vec<_>>();
-
-            (new_newlines, existing_newlines)
-        });
-        self.folding_newlines = cx.spawn(async move |this, cx| {
-            let (new_newlines, existing_newlines) = task.await;
-            if new_newlines == existing_newlines {
-                return;
-            }
-            let placeholder = FoldPlaceholder {
-                render: Arc::new(move |_, _, cx| {
-                    div()
-                        .bg(cx.theme().status().hint_background)
-                        .border_b_1()
-                        .size_full()
-                        .font(ThemeSettings::get_global(cx).buffer_font.clone())
-                        .border_color(cx.theme().status().hint)
-                        .child("\\n")
-                        .into_any()
-                }),
-                constrain_width: false,
-                merge_adjacent: false,
-                type_tag: Some(type_id),
-            };
-            let creases = new_newlines
-                .into_iter()
-                .map(|range| Crease::simple(range, placeholder.clone()))
-                .collect();
-            this.update(cx, |this, cx| {
-                this.display_map.update(cx, |display_map, cx| {
-                    display_map.remove_folds_with_type(existing_newlines, type_id, cx);
-                    display_map.fold(creases, cx);
-                });
-            })
-            .ok();
-        });
-    }
-
-    #[ztracing::instrument(skip_all)]
-    fn refresh_selected_text_highlights(
-        &mut self,
-        on_buffer_edit: bool,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) {
-        let Some((query_text, query_range)) =
-            self.prepare_highlight_query_from_selection(window, cx)
-        else {
-            self.clear_background_highlights::<SelectedTextHighlight>(cx);
-            self.quick_selection_highlight_task.take();
-            self.debounced_selection_highlight_task.take();
-            return;
-        };
-        let multi_buffer_snapshot = self.buffer().read(cx).snapshot(cx);
-        if on_buffer_edit
-            || self
-                .quick_selection_highlight_task
-                .as_ref()
-                .is_none_or(|(prev_anchor_range, _)| prev_anchor_range != &query_range)
-        {
-            let multi_buffer_visible_start = self
-                .scroll_manager
-                .anchor()
-                .anchor
-                .to_point(&multi_buffer_snapshot);
-            let multi_buffer_visible_end = multi_buffer_snapshot.clip_point(
-                multi_buffer_visible_start
-                    + Point::new(self.visible_line_count().unwrap_or(0.).ceil() as u32, 0),
-                Bias::Left,
-            );
-            let multi_buffer_visible_range = multi_buffer_visible_start..multi_buffer_visible_end;
-            self.quick_selection_highlight_task = Some((
-                query_range.clone(),
-                self.update_selection_occurrence_highlights(
-                    query_text.clone(),
-                    query_range.clone(),
-                    multi_buffer_visible_range,
-                    false,
-                    window,
-                    cx,
-                ),
-            ));
-        }
-        if on_buffer_edit
-            || self
-                .debounced_selection_highlight_task
-                .as_ref()
-                .is_none_or(|(prev_anchor_range, _)| prev_anchor_range != &query_range)
-        {
-            let multi_buffer_start = multi_buffer_snapshot
-                .anchor_before(MultiBufferOffset(0))
-                .to_point(&multi_buffer_snapshot);
-            let multi_buffer_end = multi_buffer_snapshot
-                .anchor_after(multi_buffer_snapshot.len())
-                .to_point(&multi_buffer_snapshot);
-            let multi_buffer_full_range = multi_buffer_start..multi_buffer_end;
-            self.debounced_selection_highlight_task = Some((
-                query_range.clone(),
-                self.update_selection_occurrence_highlights(
-                    query_text,
-                    query_range,
-                    multi_buffer_full_range,
-                    true,
-                    window,
-                    cx,
-                ),
-            ));
-        }
-    }
-
-    pub fn refresh_edit_prediction(
-        &mut self,
-        debounce: bool,
-        user_requested: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<()> {
-        if DisableAiSettings::get_global(cx).disable_ai {
-            return None;
-        }
-
-        let provider = self.edit_prediction_provider()?;
-        let cursor = self.selections.newest_anchor().head();
-        let (buffer, cursor_buffer_position) =
-            self.buffer.read(cx).text_anchor_for_position(cursor, cx)?;
-
-        if !self.edit_predictions_enabled_in_buffer(&buffer, cursor_buffer_position, cx) {
-            self.discard_edit_prediction(false, cx);
-            return None;
-        }
-
-        self.update_visible_edit_prediction(window, cx);
-
-        if !user_requested
-            && (!self.should_show_edit_predictions()
-                || !self.is_focused(window)
-                || buffer.read(cx).is_empty())
-        {
-            self.discard_edit_prediction(false, cx);
-            return None;
-        }
-
-        provider.refresh(buffer, cursor_buffer_position, debounce, cx);
-        Some(())
-    }
-
-    fn show_edit_predictions_in_menu(&self) -> bool {
-        match self.edit_prediction_settings {
-            EditPredictionSettings::Disabled => false,
-            EditPredictionSettings::Enabled { show_in_menu, .. } => show_in_menu,
-        }
-    }
-
-    pub fn edit_predictions_enabled(&self) -> bool {
-        match self.edit_prediction_settings {
-            EditPredictionSettings::Disabled => false,
-            EditPredictionSettings::Enabled { .. } => true,
-        }
-    }
-
-    fn edit_prediction_requires_modifier(&self) -> bool {
-        match self.edit_prediction_settings {
-            EditPredictionSettings::Disabled => false,
-            EditPredictionSettings::Enabled {
-                preview_requires_modifier,
-                ..
-            } => preview_requires_modifier,
-        }
-    }
-
-    pub fn update_edit_prediction_settings(&mut self, cx: &mut Context<Self>) {
-        if self.edit_prediction_provider.is_none() || DisableAiSettings::get_global(cx).disable_ai {
-            self.edit_prediction_settings = EditPredictionSettings::Disabled;
-            self.discard_edit_prediction(false, cx);
-        } else {
-            let selection = self.selections.newest_anchor();
-            let cursor = selection.head();
-
-            if let Some((buffer, cursor_buffer_position)) =
-                self.buffer.read(cx).text_anchor_for_position(cursor, cx)
-            {
-                self.edit_prediction_settings =
-                    self.edit_prediction_settings_at_position(&buffer, cursor_buffer_position, cx);
-            }
-        }
-    }
-
-    fn edit_prediction_settings_at_position(
-        &self,
-        buffer: &Entity<Buffer>,
-        buffer_position: language::Anchor,
-        cx: &App,
-    ) -> EditPredictionSettings {
-        if !self.mode.is_full()
-            || !self.show_edit_predictions_override.unwrap_or(true)
-            || self.edit_predictions_disabled_in_scope(buffer, buffer_position, cx)
-        {
-            return EditPredictionSettings::Disabled;
-        }
-
-        let buffer = buffer.read(cx);
-
-        let file = buffer.file();
-
-        if !language_settings(buffer.language().map(|l| l.name()), file, cx).show_edit_predictions {
-            return EditPredictionSettings::Disabled;
-        };
-
-        let by_provider = matches!(
-            self.menu_edit_predictions_policy,
-            MenuEditPredictionsPolicy::ByProvider
-        );
-
-        let show_in_menu = by_provider
-            && self
-                .edit_prediction_provider
-                .as_ref()
-                .is_some_and(|provider| provider.provider.show_predictions_in_menu());
-
-        let preview_requires_modifier =
-            all_language_settings(file, cx).edit_predictions_mode() == EditPredictionsMode::Subtle;
-
-        EditPredictionSettings::Enabled {
-            show_in_menu,
-            preview_requires_modifier,
-        }
-    }
-
-    fn should_show_edit_predictions(&self) -> bool {
-        self.snippet_stack.is_empty() && self.edit_predictions_enabled()
-    }
-
-    pub fn edit_prediction_preview_is_active(&self) -> bool {
-        matches!(
-            self.edit_prediction_preview,
-            EditPredictionPreview::Active { .. }
-        )
-    }
-
-    pub fn edit_predictions_enabled_at_cursor(&self, cx: &App) -> bool {
-        let cursor = self.selections.newest_anchor().head();
-        if let Some((buffer, cursor_position)) =
-            self.buffer.read(cx).text_anchor_for_position(cursor, cx)
-        {
-            self.edit_predictions_enabled_in_buffer(&buffer, cursor_position, cx)
-        } else {
-            false
-        }
-    }
-
-    pub fn supports_minimap(&self, cx: &App) -> bool {
-        !self.minimap_visibility.disabled() && self.buffer_kind(cx) == ItemBufferKind::Singleton
-    }
-
-    fn edit_predictions_enabled_in_buffer(
-        &self,
-        buffer: &Entity<Buffer>,
-        buffer_position: language::Anchor,
-        cx: &App,
-    ) -> bool {
-        maybe!({
-            if self.read_only(cx) {
-                return Some(false);
-            }
-            let provider = self.edit_prediction_provider()?;
-            if !provider.is_enabled(buffer, buffer_position, cx) {
-                return Some(false);
-            }
-            let buffer = buffer.read(cx);
-            let Some(file) = buffer.file() else {
-                return Some(true);
-            };
-            let settings = all_language_settings(Some(file), cx);
-            Some(settings.edit_predictions_enabled_for_file(file, cx))
-        })
-        .unwrap_or(false)
-    }
-
-    fn cycle_edit_prediction(
-        &mut self,
-        direction: Direction,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<()> {
-        let provider = self.edit_prediction_provider()?;
-        let cursor = self.selections.newest_anchor().head();
-        let (buffer, cursor_buffer_position) =
-            self.buffer.read(cx).text_anchor_for_position(cursor, cx)?;
-        if self.edit_predictions_hidden_for_vim_mode || !self.should_show_edit_predictions() {
-            return None;
-        }
-
-        provider.cycle(buffer, cursor_buffer_position, direction, cx);
-        self.update_visible_edit_prediction(window, cx);
-
-        Some(())
-    }
-
-    pub fn show_edit_prediction(
-        &mut self,
-        _: &ShowEditPrediction,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if !self.has_active_edit_prediction() {
-            self.refresh_edit_prediction(false, true, window, cx);
-            return;
-        }
-
-        self.update_visible_edit_prediction(window, cx);
-    }
-
-    pub fn display_cursor_names(
-        &mut self,
-        _: &DisplayCursorNames,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.show_cursor_names(window, cx);
-    }
-
-    fn show_cursor_names(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.show_cursor_names = true;
-        cx.notify();
-        cx.spawn_in(window, async move |this, cx| {
-            cx.background_executor().timer(CURSORS_VISIBLE_FOR).await;
-            this.update(cx, |this, cx| {
-                this.show_cursor_names = false;
-                cx.notify()
-            })
-            .ok()
-        })
-        .detach();
-    }
-
-    pub fn next_edit_prediction(
-        &mut self,
-        _: &NextEditPrediction,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.has_active_edit_prediction() {
-            self.cycle_edit_prediction(Direction::Next, window, cx);
-        } else {
-            let is_copilot_disabled = self
-                .refresh_edit_prediction(false, true, window, cx)
-                .is_none();
-            if is_copilot_disabled {
-                cx.propagate();
-            }
-        }
-    }
-
-    pub fn previous_edit_prediction(
-        &mut self,
-        _: &PreviousEditPrediction,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.has_active_edit_prediction() {
-            self.cycle_edit_prediction(Direction::Prev, window, cx);
-        } else {
-            let is_copilot_disabled = self
-                .refresh_edit_prediction(false, true, window, cx)
-                .is_none();
-            if is_copilot_disabled {
-                cx.propagate();
-            }
-        }
-    }
-
-    pub fn accept_edit_prediction(
-        &mut self,
-        _: &AcceptEditPrediction,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.show_edit_predictions_in_menu() {
-            self.hide_context_menu(window, cx);
-        }
-
-        let Some(active_edit_prediction) = self.active_edit_prediction.as_ref() else {
-            return;
-        };
-
-        match &active_edit_prediction.completion {
-            EditPrediction::MoveWithin { target, .. } => {
-                let target = *target;
-
-                if let Some(position_map) = &self.last_position_map {
-                    if position_map
-                        .visible_row_range
-                        .contains(&target.to_display_point(&position_map.snapshot).row())
-                        || !self.edit_prediction_requires_modifier()
-                    {
-                        self.unfold_ranges(&[target..target], true, false, cx);
-                        // Note that this is also done in vim's handler of the Tab action.
-                        self.change_selections(
-                            SelectionEffects::scroll(Autoscroll::newest()),
-                            window,
-                            cx,
-                            |selections| {
-                                selections.select_anchor_ranges([target..target]);
-                            },
-                        );
-                        self.clear_row_highlights::<EditPredictionPreview>();
-
-                        self.edit_prediction_preview
-                            .set_previous_scroll_position(None);
-                    } else {
-                        self.edit_prediction_preview
-                            .set_previous_scroll_position(Some(
-                                position_map.snapshot.scroll_anchor,
-                            ));
-
-                        self.highlight_rows::<EditPredictionPreview>(
-                            target..target,
-                            cx.theme().colors().editor_highlighted_line_background,
-                            RowHighlightOptions {
-                                autoscroll: true,
-                                ..Default::default()
-                            },
-                            cx,
-                        );
-                        self.request_autoscroll(Autoscroll::fit(), cx);
-                    }
-                }
-            }
-            EditPrediction::MoveOutside { snapshot, target } => {
-                if let Some(workspace) = self.workspace() {
-                    Self::open_editor_at_anchor(snapshot, *target, &workspace, window, cx)
-                        .detach_and_log_err(cx);
-                }
-            }
-            EditPrediction::Edit { edits, .. } => {
-                self.report_edit_prediction_event(
-                    active_edit_prediction.completion_id.clone(),
-                    true,
-                    cx,
-                );
-
-                if let Some(provider) = self.edit_prediction_provider() {
-                    provider.accept(cx);
-                }
-
-                // Store the transaction ID and selections before applying the edit
-                let transaction_id_prev = self.buffer.read(cx).last_transaction_id(cx);
-
-                let snapshot = self.buffer.read(cx).snapshot(cx);
-                let last_edit_end = edits.last().unwrap().0.end.bias_right(&snapshot);
-
-                self.buffer.update(cx, |buffer, cx| {
-                    buffer.edit(edits.iter().cloned(), None, cx)
-                });
-
-                self.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.select_anchor_ranges([last_edit_end..last_edit_end]);
-                });
-
-                let selections = self.selections.disjoint_anchors_arc();
-                if let Some(transaction_id_now) = self.buffer.read(cx).last_transaction_id(cx) {
-                    let has_new_transaction = transaction_id_prev != Some(transaction_id_now);
-                    if has_new_transaction {
-                        self.selection_history
-                            .insert_transaction(transaction_id_now, selections);
-                    }
-                }
-
-                self.update_visible_edit_prediction(window, cx);
-                if self.active_edit_prediction.is_none() {
-                    self.refresh_edit_prediction(true, true, window, cx);
-                }
-
-                cx.notify();
-            }
-        }
-
-        self.edit_prediction_requires_modifier_in_indent_conflict = false;
-    }
-
-    pub fn accept_partial_edit_prediction(
-        &mut self,
-        _: &AcceptPartialEditPrediction,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(active_edit_prediction) = self.active_edit_prediction.as_ref() else {
-            return;
-        };
-        if self.selections.count() != 1 {
-            return;
-        }
-
-        match &active_edit_prediction.completion {
-            EditPrediction::MoveWithin { target, .. } => {
-                let target = *target;
-                self.change_selections(
-                    SelectionEffects::scroll(Autoscroll::newest()),
-                    window,
-                    cx,
-                    |selections| {
-                        selections.select_anchor_ranges([target..target]);
-                    },
-                );
-            }
-            EditPrediction::MoveOutside { snapshot, target } => {
-                if let Some(workspace) = self.workspace() {
-                    Self::open_editor_at_anchor(snapshot, *target, &workspace, window, cx)
-                        .detach_and_log_err(cx);
-                }
-            }
-            EditPrediction::Edit { edits, .. } => {
-                self.report_edit_prediction_event(
-                    active_edit_prediction.completion_id.clone(),
-                    true,
-                    cx,
-                );
-
-                // Find an insertion that starts at the cursor position.
-                let snapshot = self.buffer.read(cx).snapshot(cx);
-                let cursor_offset = self
-                    .selections
-                    .newest::<MultiBufferOffset>(&self.display_snapshot(cx))
-                    .head();
-                let insertion = edits.iter().find_map(|(range, text)| {
-                    let range = range.to_offset(&snapshot);
-                    if range.is_empty() && range.start == cursor_offset {
-                        Some(text)
-                    } else {
-                        None
-                    }
-                });
-
-                if let Some(text) = insertion {
-                    let mut partial_completion = text
-                        .chars()
-                        .by_ref()
-                        .take_while(|c| c.is_alphabetic())
-                        .collect::<String>();
-                    if partial_completion.is_empty() {
-                        partial_completion = text
-                            .chars()
-                            .by_ref()
-                            .take_while(|c| c.is_whitespace() || !c.is_alphabetic())
-                            .collect::<String>();
-                    }
-
-                    cx.emit(EditorEvent::InputHandled {
-                        utf16_range_to_replace: None,
-                        text: partial_completion.clone().into(),
-                    });
-
-                    self.insert_with_autoindent_mode(&partial_completion, None, window, cx);
-
-                    self.refresh_edit_prediction(true, true, window, cx);
-                    cx.notify();
-                } else {
-                    self.accept_edit_prediction(&Default::default(), window, cx);
-                }
-            }
-        }
-    }
-
-    fn discard_edit_prediction(
-        &mut self,
-        should_report_edit_prediction_event: bool,
-        cx: &mut Context<Self>,
-    ) -> bool {
-        if should_report_edit_prediction_event {
-            let completion_id = self
-                .active_edit_prediction
-                .as_ref()
-                .and_then(|active_completion| active_completion.completion_id.clone());
-
-            self.report_edit_prediction_event(completion_id, false, cx);
-        }
-
-        if let Some(provider) = self.edit_prediction_provider() {
-            provider.discard(cx);
-        }
-
-        self.take_active_edit_prediction(cx)
-    }
-
-    fn report_edit_prediction_event(&self, id: Option<SharedString>, accepted: bool, cx: &App) {
-        let Some(provider) = self.edit_prediction_provider() else {
-            return;
-        };
-
-        let Some((_, buffer, _)) = self
-            .buffer
-            .read(cx)
-            .excerpt_containing(self.selections.newest_anchor().head(), cx)
-        else {
-            return;
-        };
-
-        let extension = buffer
-            .read(cx)
-            .file()
-            .and_then(|file| Some(file.path().extension()?.to_string()));
-
-        let event_type = match accepted {
-            true => "Edit Prediction Accepted",
-            false => "Edit Prediction Discarded",
-        };
-        telemetry::event!(
-            event_type,
-            provider = provider.name(),
-            prediction_id = id,
-            suggestion_accepted = accepted,
-            file_extension = extension,
-        );
-    }
-
-    fn open_editor_at_anchor(
-        snapshot: &language::BufferSnapshot,
-        target: language::Anchor,
-        workspace: &Entity<Workspace>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<()>> {
-        workspace.update(cx, |workspace, cx| {
-            let path = snapshot.file().map(|file| file.full_path(cx));
-            let Some(path) =
-                path.and_then(|path| workspace.project().read(cx).find_project_path(path, cx))
-            else {
-                return Task::ready(Err(anyhow::anyhow!("Project path not found")));
-            };
-            let target = text::ToPoint::to_point(&target, snapshot);
-            let item = workspace.open_path(path, None, true, window, cx);
-            window.spawn(cx, async move |cx| {
-                let Some(editor) = item.await?.downcast::<Editor>() else {
-                    return Ok(());
-                };
-                editor
-                    .update_in(cx, |editor, window, cx| {
-                        editor.go_to_singleton_buffer_point(target, window, cx);
-                    })
-                    .ok();
-                anyhow::Ok(())
-            })
-        })
-    }
-
-    pub fn has_active_edit_prediction(&self) -> bool {
-        self.active_edit_prediction.is_some()
-    }
-
-    fn take_active_edit_prediction(&mut self, cx: &mut Context<Self>) -> bool {
-        let Some(active_edit_prediction) = self.active_edit_prediction.take() else {
-            return false;
-        };
-
-        self.splice_inlays(&active_edit_prediction.inlay_ids, Default::default(), cx);
-        self.clear_highlights::<EditPredictionHighlight>(cx);
-        self.stale_edit_prediction_in_menu = Some(active_edit_prediction);
-        true
-    }
-
-    /// Returns true when we're displaying the edit prediction popover below the cursor
-    /// like we are not previewing and the LSP autocomplete menu is visible
-    /// or we are in `when_holding_modifier` mode.
-    pub fn edit_prediction_visible_in_cursor_popover(&self, has_completion: bool) -> bool {
-        if self.edit_prediction_preview_is_active()
-            || !self.show_edit_predictions_in_menu()
-            || !self.edit_predictions_enabled()
-        {
-            return false;
-        }
-
-        if self.has_visible_completions_menu() {
-            return true;
-        }
-
-        has_completion && self.edit_prediction_requires_modifier()
-    }
-
-    fn handle_modifiers_changed(
-        &mut self,
-        modifiers: Modifiers,
-        position_map: &PositionMap,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        // Ensure that the edit prediction preview is updated, even when not
-        // enabled, if there's an active edit prediction preview.
-        if self.show_edit_predictions_in_menu()
-            || matches!(
-                self.edit_prediction_preview,
-                EditPredictionPreview::Active { .. }
-            )
-        {
-            self.update_edit_prediction_preview(&modifiers, window, cx);
-        }
-
-        self.update_selection_mode(&modifiers, position_map, window, cx);
-
-        let mouse_position = window.mouse_position();
-        if !position_map.text_hitbox.is_hovered(window) {
-            return;
-        }
-
-        self.update_hovered_link(
-            position_map.point_for_position(mouse_position),
-            &position_map.snapshot,
-            modifiers,
-            window,
-            cx,
-        )
-    }
-
-    fn is_cmd_or_ctrl_pressed(modifiers: &Modifiers, cx: &mut Context<Self>) -> bool {
-        match EditorSettings::get_global(cx).multi_cursor_modifier {
-            MultiCursorModifier::Alt => modifiers.secondary(),
-            MultiCursorModifier::CmdOrCtrl => modifiers.alt,
-        }
-    }
-
-    fn is_alt_pressed(modifiers: &Modifiers, cx: &mut Context<Self>) -> bool {
-        match EditorSettings::get_global(cx).multi_cursor_modifier {
-            MultiCursorModifier::Alt => modifiers.alt,
-            MultiCursorModifier::CmdOrCtrl => modifiers.secondary(),
-        }
-    }
-
-    fn columnar_selection_mode(
-        modifiers: &Modifiers,
-        cx: &mut Context<Self>,
-    ) -> Option<ColumnarMode> {
-        if modifiers.shift && modifiers.number_of_modifiers() == 2 {
-            if Self::is_cmd_or_ctrl_pressed(modifiers, cx) {
-                Some(ColumnarMode::FromMouse)
-            } else if Self::is_alt_pressed(modifiers, cx) {
-                Some(ColumnarMode::FromSelection)
-            } else {
-                None
-            }
-        } else {
-            None
-        }
-    }
-
-    fn update_selection_mode(
-        &mut self,
-        modifiers: &Modifiers,
-        position_map: &PositionMap,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(mode) = Self::columnar_selection_mode(modifiers, cx) else {
-            return;
-        };
-        if self.selections.pending_anchor().is_none() {
-            return;
-        }
-
-        let mouse_position = window.mouse_position();
-        let point_for_position = position_map.point_for_position(mouse_position);
-        let position = point_for_position.previous_valid;
-
-        self.select(
-            SelectPhase::BeginColumnar {
-                position,
-                reset: false,
-                mode,
-                goal_column: point_for_position.exact_unclipped.column(),
-            },
-            window,
-            cx,
-        );
-    }
-
-    fn update_edit_prediction_preview(
-        &mut self,
-        modifiers: &Modifiers,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let mut modifiers_held = false;
-        if let Some(accept_keystroke) = self
-            .accept_edit_prediction_keybind(false, window, cx)
-            .keystroke()
-        {
-            modifiers_held = modifiers_held
-                || (accept_keystroke.modifiers() == modifiers
-                    && accept_keystroke.modifiers().modified());
-        };
-        if let Some(accept_partial_keystroke) = self
-            .accept_edit_prediction_keybind(true, window, cx)
-            .keystroke()
-        {
-            modifiers_held = modifiers_held
-                || (accept_partial_keystroke.modifiers() == modifiers
-                    && accept_partial_keystroke.modifiers().modified());
-        }
-
-        if modifiers_held {
-            if matches!(
-                self.edit_prediction_preview,
-                EditPredictionPreview::Inactive { .. }
-            ) {
-                if let Some(provider) = self.edit_prediction_provider.as_ref() {
-                    provider.provider.did_show(cx)
-                }
-
-                self.edit_prediction_preview = EditPredictionPreview::Active {
-                    previous_scroll_position: None,
-                    since: Instant::now(),
-                };
-
-                self.update_visible_edit_prediction(window, cx);
-                cx.notify();
-            }
-        } else if let EditPredictionPreview::Active {
-            previous_scroll_position,
-            since,
-        } = self.edit_prediction_preview
-        {
-            if let (Some(previous_scroll_position), Some(position_map)) =
-                (previous_scroll_position, self.last_position_map.as_ref())
-            {
-                self.set_scroll_position(
-                    previous_scroll_position
-                        .scroll_position(&position_map.snapshot.display_snapshot),
-                    window,
-                    cx,
-                );
-            }
-
-            self.edit_prediction_preview = EditPredictionPreview::Inactive {
-                released_too_fast: since.elapsed() < Duration::from_millis(200),
-            };
-            self.clear_row_highlights::<EditPredictionPreview>();
-            self.update_visible_edit_prediction(window, cx);
-            cx.notify();
-        }
-    }
-
-    fn update_visible_edit_prediction(
-        &mut self,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<()> {
-        if DisableAiSettings::get_global(cx).disable_ai {
-            return None;
-        }
-
-        if self.ime_transaction.is_some() {
-            self.discard_edit_prediction(false, cx);
-            return None;
-        }
-
-        let selection = self.selections.newest_anchor();
-        let cursor = selection.head();
-        let multibuffer = self.buffer.read(cx).snapshot(cx);
-        let offset_selection = selection.map(|endpoint| endpoint.to_offset(&multibuffer));
-        let excerpt_id = cursor.excerpt_id;
-
-        let show_in_menu = self.show_edit_predictions_in_menu();
-        let completions_menu_has_precedence = !show_in_menu
-            && (self.context_menu.borrow().is_some()
-                || (!self.completion_tasks.is_empty() && !self.has_active_edit_prediction()));
-
-        if completions_menu_has_precedence
-            || !offset_selection.is_empty()
-            || self
-                .active_edit_prediction
-                .as_ref()
-                .is_some_and(|completion| {
-                    let Some(invalidation_range) = completion.invalidation_range.as_ref() else {
-                        return false;
-                    };
-                    let invalidation_range = invalidation_range.to_offset(&multibuffer);
-                    let invalidation_range = invalidation_range.start..=invalidation_range.end;
-                    !invalidation_range.contains(&offset_selection.head())
-                })
-        {
-            self.discard_edit_prediction(false, cx);
-            return None;
-        }
-
-        self.take_active_edit_prediction(cx);
-        let Some(provider) = self.edit_prediction_provider() else {
-            self.edit_prediction_settings = EditPredictionSettings::Disabled;
-            return None;
-        };
-
-        let (buffer, cursor_buffer_position) =
-            self.buffer.read(cx).text_anchor_for_position(cursor, cx)?;
-
-        self.edit_prediction_settings =
-            self.edit_prediction_settings_at_position(&buffer, cursor_buffer_position, cx);
-
-        self.edit_prediction_indent_conflict = multibuffer.is_line_whitespace_upto(cursor);
-
-        if self.edit_prediction_indent_conflict {
-            let cursor_point = cursor.to_point(&multibuffer);
-            let mut suggested_indent = None;
-            multibuffer.suggested_indents_callback(
-                cursor_point.row..cursor_point.row + 1,
-                |_, indent| {
-                    suggested_indent = Some(indent);
-                    ControlFlow::Break(())
-                },
-                cx,
-            );
-
-            if let Some(indent) = suggested_indent
-                && indent.len == cursor_point.column
-            {
-                self.edit_prediction_indent_conflict = false;
-            }
-        }
-
-        let edit_prediction = provider.suggest(&buffer, cursor_buffer_position, cx)?;
-
-        let (completion_id, edits, edit_preview) = match edit_prediction {
-            edit_prediction_types::EditPrediction::Local {
-                id,
-                edits,
-                edit_preview,
-            } => (id, edits, edit_preview),
-            edit_prediction_types::EditPrediction::Jump {
-                id,
-                snapshot,
-                target,
-            } => {
-                self.stale_edit_prediction_in_menu = None;
-                self.active_edit_prediction = Some(EditPredictionState {
-                    inlay_ids: vec![],
-                    completion: EditPrediction::MoveOutside { snapshot, target },
-                    completion_id: id,
-                    invalidation_range: None,
-                });
-                cx.notify();
-                return Some(());
-            }
-        };
-
-        let edits = edits
-            .into_iter()
-            .flat_map(|(range, new_text)| {
-                Some((
-                    multibuffer.anchor_range_in_excerpt(excerpt_id, range)?,
-                    new_text,
-                ))
-            })
-            .collect::<Vec<_>>();
-        if edits.is_empty() {
-            return None;
-        }
-
-        let first_edit_start = edits.first().unwrap().0.start;
-        let first_edit_start_point = first_edit_start.to_point(&multibuffer);
-        let edit_start_row = first_edit_start_point.row.saturating_sub(2);
-
-        let last_edit_end = edits.last().unwrap().0.end;
-        let last_edit_end_point = last_edit_end.to_point(&multibuffer);
-        let edit_end_row = cmp::min(multibuffer.max_point().row, last_edit_end_point.row + 2);
-
-        let cursor_row = cursor.to_point(&multibuffer).row;
-
-        let snapshot = multibuffer.buffer_for_excerpt(excerpt_id).cloned()?;
-
-        let mut inlay_ids = Vec::new();
-        let invalidation_row_range;
-        let move_invalidation_row_range = if cursor_row < edit_start_row {
-            Some(cursor_row..edit_end_row)
-        } else if cursor_row > edit_end_row {
-            Some(edit_start_row..cursor_row)
-        } else {
-            None
-        };
-        let supports_jump = self
-            .edit_prediction_provider
-            .as_ref()
-            .map(|provider| provider.provider.supports_jump_to_edit())
-            .unwrap_or(true);
-
-        let is_move = supports_jump
-            && (move_invalidation_row_range.is_some() || self.edit_predictions_hidden_for_vim_mode);
-        let completion = if is_move {
-            invalidation_row_range =
-                move_invalidation_row_range.unwrap_or(edit_start_row..edit_end_row);
-            let target = first_edit_start;
-            EditPrediction::MoveWithin { target, snapshot }
-        } else {
-            let show_completions_in_buffer = !self.edit_prediction_visible_in_cursor_popover(true)
-                && !self.edit_predictions_hidden_for_vim_mode;
-
-            if show_completions_in_buffer {
-                if let Some(provider) = &self.edit_prediction_provider {
-                    provider.provider.did_show(cx);
-                }
-                if edits
-                    .iter()
-                    .all(|(range, _)| range.to_offset(&multibuffer).is_empty())
-                {
-                    let mut inlays = Vec::new();
-                    for (range, new_text) in &edits {
-                        let inlay = Inlay::edit_prediction(
-                            post_inc(&mut self.next_inlay_id),
-                            range.start,
-                            new_text.as_ref(),
-                        );
-                        inlay_ids.push(inlay.id);
-                        inlays.push(inlay);
-                    }
-
-                    self.splice_inlays(&[], inlays, cx);
-                } else {
-                    let background_color = cx.theme().status().deleted_background;
-                    self.highlight_text::<EditPredictionHighlight>(
-                        edits.iter().map(|(range, _)| range.clone()).collect(),
-                        HighlightStyle {
-                            background_color: Some(background_color),
-                            ..Default::default()
-                        },
-                        cx,
-                    );
-                }
-            }
-
-            invalidation_row_range = edit_start_row..edit_end_row;
-
-            let display_mode = if all_edits_insertions_or_deletions(&edits, &multibuffer) {
-                if provider.show_tab_accept_marker() {
-                    EditDisplayMode::TabAccept
-                } else {
-                    EditDisplayMode::Inline
-                }
-            } else {
-                EditDisplayMode::DiffPopover
-            };
-
-            EditPrediction::Edit {
-                edits,
-                edit_preview,
-                display_mode,
-                snapshot,
-            }
-        };
-
-        let invalidation_range = multibuffer
-            .anchor_before(Point::new(invalidation_row_range.start, 0))
-            ..multibuffer.anchor_after(Point::new(
-                invalidation_row_range.end,
-                multibuffer.line_len(MultiBufferRow(invalidation_row_range.end)),
-            ));
-
-        self.stale_edit_prediction_in_menu = None;
-        self.active_edit_prediction = Some(EditPredictionState {
-            inlay_ids,
-            completion,
-            completion_id,
-            invalidation_range: Some(invalidation_range),
-        });
-
-        cx.notify();
-
-        Some(())
-    }
-
-    pub fn edit_prediction_provider(&self) -> Option<Arc<dyn EditPredictionDelegateHandle>> {
-        Some(self.edit_prediction_provider.as_ref()?.provider.clone())
-    }
-
-    fn clear_tasks(&mut self) {
-        self.tasks.clear()
-    }
-
-    fn insert_tasks(&mut self, key: (BufferId, BufferRow), value: RunnableTasks) {
-        if self.tasks.insert(key, value).is_some() {
-            // This case should hopefully be rare, but just in case...
-            log::error!(
-                "multiple different run targets found on a single line, only the last target will be rendered"
-            )
-        }
-    }
-
-    /// Get all display points of breakpoints that will be rendered within editor
-    ///
-    /// This function is used to handle overlaps between breakpoints and Code action/runner symbol.
-    /// It's also used to set the color of line numbers with breakpoints to the breakpoint color.
-    /// TODO debugger: Use this function to color toggle symbols that house nested breakpoints
-    fn active_breakpoints(
-        &self,
-        range: Range<DisplayRow>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> HashMap<DisplayRow, (Anchor, Breakpoint, Option<BreakpointSessionState>)> {
-        let mut breakpoint_display_points = HashMap::default();
-
-        let Some(breakpoint_store) = self.breakpoint_store.clone() else {
-            return breakpoint_display_points;
-        };
-
-        let snapshot = self.snapshot(window, cx);
-
-        let multi_buffer_snapshot = snapshot.buffer_snapshot();
-        let Some(project) = self.project() else {
-            return breakpoint_display_points;
-        };
-
-        let range = snapshot.display_point_to_point(DisplayPoint::new(range.start, 0), Bias::Left)
-            ..snapshot.display_point_to_point(DisplayPoint::new(range.end, 0), Bias::Right);
-
-        for (buffer_snapshot, range, excerpt_id) in
-            multi_buffer_snapshot.range_to_buffer_ranges(range)
-        {
-            let Some(buffer) = project
-                .read(cx)
-                .buffer_for_id(buffer_snapshot.remote_id(), cx)
-            else {
-                continue;
-            };
-            let breakpoints = breakpoint_store.read(cx).breakpoints(
-                &buffer,
-                Some(
-                    buffer_snapshot.anchor_before(range.start)
-                        ..buffer_snapshot.anchor_after(range.end),
-                ),
-                buffer_snapshot,
-                cx,
-            );
-            for (breakpoint, state) in breakpoints {
-                let multi_buffer_anchor = Anchor::in_buffer(excerpt_id, breakpoint.position);
-                let position = multi_buffer_anchor
-                    .to_point(&multi_buffer_snapshot)
-                    .to_display_point(&snapshot);
-
-                breakpoint_display_points.insert(
-                    position.row(),
-                    (multi_buffer_anchor, breakpoint.bp.clone(), state),
-                );
-            }
-        }
-
-        breakpoint_display_points
-    }
-
-    fn breakpoint_context_menu(
-        &self,
-        anchor: Anchor,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Entity<ui::ContextMenu> {
-        let weak_editor = cx.weak_entity();
-        let focus_handle = self.focus_handle(cx);
-
-        let row = self
-            .buffer
-            .read(cx)
-            .snapshot(cx)
-            .summary_for_anchor::<Point>(&anchor)
-            .row;
-
-        let breakpoint = self
-            .breakpoint_at_row(row, window, cx)
-            .map(|(anchor, bp)| (anchor, Arc::from(bp)));
-
-        let log_breakpoint_msg = if breakpoint.as_ref().is_some_and(|bp| bp.1.message.is_some()) {
-            "Edit Log Breakpoint"
-        } else {
-            "Set Log Breakpoint"
-        };
-
-        let condition_breakpoint_msg = if breakpoint
-            .as_ref()
-            .is_some_and(|bp| bp.1.condition.is_some())
-        {
-            "Edit Condition Breakpoint"
-        } else {
-            "Set Condition Breakpoint"
-        };
-
-        let hit_condition_breakpoint_msg = if breakpoint
-            .as_ref()
-            .is_some_and(|bp| bp.1.hit_condition.is_some())
-        {
-            "Edit Hit Condition Breakpoint"
-        } else {
-            "Set Hit Condition Breakpoint"
-        };
-
-        let set_breakpoint_msg = if breakpoint.as_ref().is_some() {
-            "Unset Breakpoint"
-        } else {
-            "Set Breakpoint"
-        };
-
-        let run_to_cursor = window.is_action_available(&RunToCursor, cx);
-
-        let toggle_state_msg = breakpoint.as_ref().map_or(None, |bp| match bp.1.state {
-            BreakpointState::Enabled => Some("Disable"),
-            BreakpointState::Disabled => Some("Enable"),
-        });
-
-        let (anchor, breakpoint) =
-            breakpoint.unwrap_or_else(|| (anchor, Arc::new(Breakpoint::new_standard())));
-
-        ui::ContextMenu::build(window, cx, |menu, _, _cx| {
-            menu.on_blur_subscription(Subscription::new(|| {}))
-                .context(focus_handle)
-                .when(run_to_cursor, |this| {
-                    let weak_editor = weak_editor.clone();
-                    this.entry("Run to cursor", None, move |window, cx| {
-                        weak_editor
-                            .update(cx, |editor, cx| {
-                                editor.change_selections(
-                                    SelectionEffects::no_scroll(),
-                                    window,
-                                    cx,
-                                    |s| s.select_ranges([Point::new(row, 0)..Point::new(row, 0)]),
-                                );
-                            })
-                            .ok();
-
-                        window.dispatch_action(Box::new(RunToCursor), cx);
-                    })
-                    .separator()
-                })
-                .when_some(toggle_state_msg, |this, msg| {
-                    this.entry(msg, None, {
-                        let weak_editor = weak_editor.clone();
-                        let breakpoint = breakpoint.clone();
-                        move |_window, cx| {
-                            weak_editor
-                                .update(cx, |this, cx| {
-                                    this.edit_breakpoint_at_anchor(
-                                        anchor,
-                                        breakpoint.as_ref().clone(),
-                                        BreakpointEditAction::InvertState,
-                                        cx,
-                                    );
-                                })
-                                .log_err();
-                        }
-                    })
-                })
-                .entry(set_breakpoint_msg, None, {
-                    let weak_editor = weak_editor.clone();
-                    let breakpoint = breakpoint.clone();
-                    move |_window, cx| {
-                        weak_editor
-                            .update(cx, |this, cx| {
-                                this.edit_breakpoint_at_anchor(
-                                    anchor,
-                                    breakpoint.as_ref().clone(),
-                                    BreakpointEditAction::Toggle,
-                                    cx,
-                                );
-                            })
-                            .log_err();
-                    }
-                })
-                .entry(log_breakpoint_msg, None, {
-                    let breakpoint = breakpoint.clone();
-                    let weak_editor = weak_editor.clone();
-                    move |window, cx| {
-                        weak_editor
-                            .update(cx, |this, cx| {
-                                this.add_edit_breakpoint_block(
-                                    anchor,
-                                    breakpoint.as_ref(),
-                                    BreakpointPromptEditAction::Log,
-                                    window,
-                                    cx,
-                                );
-                            })
-                            .log_err();
-                    }
-                })
-                .entry(condition_breakpoint_msg, None, {
-                    let breakpoint = breakpoint.clone();
-                    let weak_editor = weak_editor.clone();
-                    move |window, cx| {
-                        weak_editor
-                            .update(cx, |this, cx| {
-                                this.add_edit_breakpoint_block(
-                                    anchor,
-                                    breakpoint.as_ref(),
-                                    BreakpointPromptEditAction::Condition,
-                                    window,
-                                    cx,
-                                );
-                            })
-                            .log_err();
-                    }
-                })
-                .entry(hit_condition_breakpoint_msg, None, move |window, cx| {
-                    weak_editor
-                        .update(cx, |this, cx| {
-                            this.add_edit_breakpoint_block(
-                                anchor,
-                                breakpoint.as_ref(),
-                                BreakpointPromptEditAction::HitCondition,
-                                window,
-                                cx,
-                            );
-                        })
-                        .log_err();
-                })
-        })
-    }
-
-    fn render_breakpoint(
-        &self,
-        position: Anchor,
-        row: DisplayRow,
-        breakpoint: &Breakpoint,
-        state: Option<BreakpointSessionState>,
-        cx: &mut Context<Self>,
-    ) -> IconButton {
-        let is_rejected = state.is_some_and(|s| !s.verified);
-        // Is it a breakpoint that shows up when hovering over gutter?
-        let (is_phantom, collides_with_existing) = self.gutter_breakpoint_indicator.0.map_or(
-            (false, false),
-            |PhantomBreakpointIndicator {
-                 is_active,
-                 display_row,
-                 collides_with_existing_breakpoint,
-             }| {
-                (
-                    is_active && display_row == row,
-                    collides_with_existing_breakpoint,
-                )
-            },
-        );
-
-        let (color, icon) = {
-            let icon = match (&breakpoint.message.is_some(), breakpoint.is_disabled()) {
-                (false, false) => ui::IconName::DebugBreakpoint,
-                (true, false) => ui::IconName::DebugLogBreakpoint,
-                (false, true) => ui::IconName::DebugDisabledBreakpoint,
-                (true, true) => ui::IconName::DebugDisabledLogBreakpoint,
-            };
-
-            let color = cx.theme().colors();
-
-            let color = if is_phantom {
-                if collides_with_existing {
-                    Color::Custom(color.debugger_accent.blend(color.text.opacity(0.6)))
-                } else {
-                    Color::Hint
-                }
-            } else if is_rejected {
-                Color::Disabled
-            } else {
-                Color::Debugger
-            };
-
-            (color, icon)
-        };
-
-        let breakpoint = Arc::from(breakpoint.clone());
-
-        let alt_as_text = gpui::Keystroke {
-            modifiers: Modifiers::secondary_key(),
-            ..Default::default()
-        };
-        let primary_action_text = if breakpoint.is_disabled() {
-            "Enable breakpoint"
-        } else if is_phantom && !collides_with_existing {
-            "Set breakpoint"
-        } else {
-            "Unset breakpoint"
-        };
-        let focus_handle = self.focus_handle.clone();
-
-        let meta = if is_rejected {
-            SharedString::from("No executable code is associated with this line.")
-        } else if collides_with_existing && !breakpoint.is_disabled() {
-            SharedString::from(format!(
-                "{alt_as_text}-click to disable,\nright-click for more options."
-            ))
-        } else {
-            SharedString::from("Right-click for more options.")
-        };
-        IconButton::new(("breakpoint_indicator", row.0 as usize), icon)
-            .icon_size(IconSize::XSmall)
-            .size(ui::ButtonSize::None)
-            .when(is_rejected, |this| {
-                this.indicator(Indicator::icon(Icon::new(IconName::Warning)).color(Color::Warning))
-            })
-            .icon_color(color)
-            .style(ButtonStyle::Transparent)
-            .on_click(cx.listener({
-                move |editor, event: &ClickEvent, window, cx| {
-                    let edit_action = if event.modifiers().platform || breakpoint.is_disabled() {
-                        BreakpointEditAction::InvertState
-                    } else {
-                        BreakpointEditAction::Toggle
-                    };
-
-                    window.focus(&editor.focus_handle(cx));
-                    editor.edit_breakpoint_at_anchor(
-                        position,
-                        breakpoint.as_ref().clone(),
-                        edit_action,
-                        cx,
-                    );
-                }
-            }))
-            .on_right_click(cx.listener(move |editor, event: &ClickEvent, window, cx| {
-                editor.set_breakpoint_context_menu(
-                    row,
-                    Some(position),
-                    event.position(),
-                    window,
-                    cx,
-                );
-            }))
-            .tooltip(move |_window, cx| {
-                Tooltip::with_meta_in(
-                    primary_action_text,
-                    Some(&ToggleBreakpoint),
-                    meta.clone(),
-                    &focus_handle,
-                    cx,
-                )
-            })
-    }
-
-    fn build_tasks_context(
-        project: &Entity<Project>,
-        buffer: &Entity<Buffer>,
-        buffer_row: u32,
-        tasks: &Arc<RunnableTasks>,
-        cx: &mut Context<Self>,
-    ) -> Task<Option<task::TaskContext>> {
-        let position = Point::new(buffer_row, tasks.column);
-        let range_start = buffer.read(cx).anchor_at(position, Bias::Right);
-        let location = Location {
-            buffer: buffer.clone(),
-            range: range_start..range_start,
-        };
-        // Fill in the environmental variables from the tree-sitter captures
-        let mut captured_task_variables = TaskVariables::default();
-        for (capture_name, value) in tasks.extra_variables.clone() {
-            captured_task_variables.insert(
-                task::VariableName::Custom(capture_name.into()),
-                value.clone(),
-            );
-        }
-        project.update(cx, |project, cx| {
-            project.task_store().update(cx, |task_store, cx| {
-                task_store.task_context_for_location(captured_task_variables, location, cx)
-            })
-        })
-    }
-
-    pub fn spawn_nearest_task(
-        &mut self,
-        action: &SpawnNearestTask,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some((workspace, _)) = self.workspace.clone() else {
-            return;
-        };
-        let Some(project) = self.project.clone() else {
-            return;
-        };
-
-        // Try to find a closest, enclosing node using tree-sitter that has a task
-        let Some((buffer, buffer_row, tasks)) = self
-            .find_enclosing_node_task(cx)
-            // Or find the task that's closest in row-distance.
-            .or_else(|| self.find_closest_task(cx))
-        else {
-            return;
-        };
-
-        let reveal_strategy = action.reveal;
-        let task_context = Self::build_tasks_context(&project, &buffer, buffer_row, &tasks, cx);
-        cx.spawn_in(window, async move |_, cx| {
-            let context = task_context.await?;
-            let (task_source_kind, mut resolved_task) = tasks.resolve(&context).next()?;
-
-            let resolved = &mut resolved_task.resolved;
-            resolved.reveal = reveal_strategy;
-
-            workspace
-                .update_in(cx, |workspace, window, cx| {
-                    workspace.schedule_resolved_task(
-                        task_source_kind,
-                        resolved_task,
-                        false,
-                        window,
-                        cx,
-                    );
-                })
-                .ok()
-        })
-        .detach();
-    }
-
-    fn find_closest_task(
-        &mut self,
-        cx: &mut Context<Self>,
-    ) -> Option<(Entity<Buffer>, u32, Arc<RunnableTasks>)> {
-        let cursor_row = self
-            .selections
-            .newest_adjusted(&self.display_snapshot(cx))
-            .head()
-            .row;
-
-        let ((buffer_id, row), tasks) = self
-            .tasks
-            .iter()
-            .min_by_key(|((_, row), _)| cursor_row.abs_diff(*row))?;
-
-        let buffer = self.buffer.read(cx).buffer(*buffer_id)?;
-        let tasks = Arc::new(tasks.to_owned());
-        Some((buffer, *row, tasks))
-    }
-
-    fn find_enclosing_node_task(
-        &mut self,
-        cx: &mut Context<Self>,
-    ) -> Option<(Entity<Buffer>, u32, Arc<RunnableTasks>)> {
-        let snapshot = self.buffer.read(cx).snapshot(cx);
-        let offset = self
-            .selections
-            .newest::<MultiBufferOffset>(&self.display_snapshot(cx))
-            .head();
-        let mut excerpt = snapshot.excerpt_containing(offset..offset)?;
-        let offset = excerpt.map_offset_to_buffer(offset);
-        let buffer_id = excerpt.buffer().remote_id();
-
-        let layer = excerpt.buffer().syntax_layer_at(offset)?;
-        let mut cursor = layer.node().walk();
-
-        while cursor.goto_first_child_for_byte(offset.0).is_some() {
-            if cursor.node().end_byte() == offset.0 {
-                cursor.goto_next_sibling();
-            }
-        }
-
-        // Ascend to the smallest ancestor that contains the range and has a task.
-        loop {
-            let node = cursor.node();
-            let node_range = node.byte_range();
-            let symbol_start_row = excerpt.buffer().offset_to_point(node.start_byte()).row;
-
-            // Check if this node contains our offset
-            if node_range.start <= offset.0 && node_range.end >= offset.0 {
-                // If it contains offset, check for task
-                if let Some(tasks) = self.tasks.get(&(buffer_id, symbol_start_row)) {
-                    let buffer = self.buffer.read(cx).buffer(buffer_id)?;
-                    return Some((buffer, symbol_start_row, Arc::new(tasks.to_owned())));
-                }
-            }
-
-            if !cursor.goto_parent() {
-                break;
-            }
-        }
-        None
-    }
-
-    fn render_run_indicator(
-        &self,
-        _style: &EditorStyle,
-        is_active: bool,
-        row: DisplayRow,
-        breakpoint: Option<(Anchor, Breakpoint, Option<BreakpointSessionState>)>,
-        cx: &mut Context<Self>,
-    ) -> IconButton {
-        let color = Color::Muted;
-        let position = breakpoint.as_ref().map(|(anchor, _, _)| *anchor);
-
-        IconButton::new(
-            ("run_indicator", row.0 as usize),
-            ui::IconName::PlayOutlined,
-        )
-        .shape(ui::IconButtonShape::Square)
-        .icon_size(IconSize::XSmall)
-        .icon_color(color)
-        .toggle_state(is_active)
-        .on_click(cx.listener(move |editor, e: &ClickEvent, window, cx| {
-            let quick_launch = match e {
-                ClickEvent::Keyboard(_) => true,
-                ClickEvent::Mouse(e) => e.down.button == MouseButton::Left,
-            };
-
-            window.focus(&editor.focus_handle(cx));
-            editor.toggle_code_actions(
-                &ToggleCodeActions {
-                    deployed_from: Some(CodeActionSource::RunMenu(row)),
-                    quick_launch,
-                },
-                window,
-                cx,
-            );
-        }))
-        .on_right_click(cx.listener(move |editor, event: &ClickEvent, window, cx| {
-            editor.set_breakpoint_context_menu(row, position, event.position(), window, cx);
-        }))
-    }
-
-    pub fn context_menu_visible(&self) -> bool {
-        !self.edit_prediction_preview_is_active()
-            && self
-                .context_menu
-                .borrow()
-                .as_ref()
-                .is_some_and(|menu| menu.visible())
-    }
-
-    pub fn context_menu_origin(&self) -> Option<ContextMenuOrigin> {
-        self.context_menu
-            .borrow()
-            .as_ref()
-            .map(|menu| menu.origin())
-    }
-
-    pub fn set_context_menu_options(&mut self, options: ContextMenuOptions) {
-        self.context_menu_options = Some(options);
-    }
-
-    const EDIT_PREDICTION_POPOVER_PADDING_X: Pixels = px(24.);
-    const EDIT_PREDICTION_POPOVER_PADDING_Y: Pixels = px(2.);
-
-    fn render_edit_prediction_popover(
-        &mut self,
-        text_bounds: &Bounds<Pixels>,
-        content_origin: gpui::Point<Pixels>,
-        right_margin: Pixels,
-        editor_snapshot: &EditorSnapshot,
-        visible_row_range: Range<DisplayRow>,
-        scroll_top: ScrollOffset,
-        scroll_bottom: ScrollOffset,
-        line_layouts: &[LineWithInvisibles],
-        line_height: Pixels,
-        scroll_position: gpui::Point<ScrollOffset>,
-        scroll_pixel_position: gpui::Point<ScrollPixelOffset>,
-        newest_selection_head: Option<DisplayPoint>,
-        editor_width: Pixels,
-        style: &EditorStyle,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<(AnyElement, gpui::Point<Pixels>)> {
-        if self.mode().is_minimap() {
-            return None;
-        }
-        let active_edit_prediction = self.active_edit_prediction.as_ref()?;
-
-        if self.edit_prediction_visible_in_cursor_popover(true) {
-            return None;
-        }
-
-        match &active_edit_prediction.completion {
-            EditPrediction::MoveWithin { target, .. } => {
-                let target_display_point = target.to_display_point(editor_snapshot);
-
-                if self.edit_prediction_requires_modifier() {
-                    if !self.edit_prediction_preview_is_active() {
-                        return None;
-                    }
-
-                    self.render_edit_prediction_modifier_jump_popover(
-                        text_bounds,
-                        content_origin,
-                        visible_row_range,
-                        line_layouts,
-                        line_height,
-                        scroll_pixel_position,
-                        newest_selection_head,
-                        target_display_point,
-                        window,
-                        cx,
-                    )
-                } else {
-                    self.render_edit_prediction_eager_jump_popover(
-                        text_bounds,
-                        content_origin,
-                        editor_snapshot,
-                        visible_row_range,
-                        scroll_top,
-                        scroll_bottom,
-                        line_height,
-                        scroll_pixel_position,
-                        target_display_point,
-                        editor_width,
-                        window,
-                        cx,
-                    )
-                }
-            }
-            EditPrediction::Edit {
-                display_mode: EditDisplayMode::Inline,
-                ..
-            } => None,
-            EditPrediction::Edit {
-                display_mode: EditDisplayMode::TabAccept,
-                edits,
-                ..
-            } => {
-                let range = &edits.first()?.0;
-                let target_display_point = range.end.to_display_point(editor_snapshot);
-
-                self.render_edit_prediction_end_of_line_popover(
-                    "Accept",
-                    editor_snapshot,
-                    visible_row_range,
-                    target_display_point,
-                    line_height,
-                    scroll_pixel_position,
-                    content_origin,
-                    editor_width,
-                    window,
-                    cx,
-                )
-            }
-            EditPrediction::Edit {
-                edits,
-                edit_preview,
-                display_mode: EditDisplayMode::DiffPopover,
-                snapshot,
-            } => self.render_edit_prediction_diff_popover(
-                text_bounds,
-                content_origin,
-                right_margin,
-                editor_snapshot,
-                visible_row_range,
-                line_layouts,
-                line_height,
-                scroll_position,
-                scroll_pixel_position,
-                newest_selection_head,
-                editor_width,
-                style,
-                edits,
-                edit_preview,
-                snapshot,
-                window,
-                cx,
-            ),
-            EditPrediction::MoveOutside { snapshot, .. } => {
-                let mut element = self
-                    .render_edit_prediction_jump_outside_popover(snapshot, window, cx)
-                    .into_any();
-
-                let size = element.layout_as_root(AvailableSpace::min_size(), window, cx);
-                let origin_x = text_bounds.size.width - size.width - px(30.);
-                let origin = text_bounds.origin + gpui::Point::new(origin_x, px(16.));
-                element.prepaint_at(origin, window, cx);
-
-                Some((element, origin))
-            }
-        }
-    }
-
-    fn render_edit_prediction_modifier_jump_popover(
-        &mut self,
-        text_bounds: &Bounds<Pixels>,
-        content_origin: gpui::Point<Pixels>,
-        visible_row_range: Range<DisplayRow>,
-        line_layouts: &[LineWithInvisibles],
-        line_height: Pixels,
-        scroll_pixel_position: gpui::Point<ScrollPixelOffset>,
-        newest_selection_head: Option<DisplayPoint>,
-        target_display_point: DisplayPoint,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<(AnyElement, gpui::Point<Pixels>)> {
-        let scrolled_content_origin =
-            content_origin - gpui::Point::new(scroll_pixel_position.x.into(), Pixels::ZERO);
-
-        const SCROLL_PADDING_Y: Pixels = px(12.);
-
-        if target_display_point.row() < visible_row_range.start {
-            return self.render_edit_prediction_scroll_popover(
-                |_| SCROLL_PADDING_Y,
-                IconName::ArrowUp,
-                visible_row_range,
-                line_layouts,
-                newest_selection_head,
-                scrolled_content_origin,
-                window,
-                cx,
-            );
-        } else if target_display_point.row() >= visible_row_range.end {
-            return self.render_edit_prediction_scroll_popover(
-                |size| text_bounds.size.height - size.height - SCROLL_PADDING_Y,
-                IconName::ArrowDown,
-                visible_row_range,
-                line_layouts,
-                newest_selection_head,
-                scrolled_content_origin,
-                window,
-                cx,
-            );
-        }
-
-        const POLE_WIDTH: Pixels = px(2.);
-
-        let line_layout =
-            line_layouts.get(target_display_point.row().minus(visible_row_range.start) as usize)?;
-        let target_column = target_display_point.column() as usize;
-
-        let target_x = line_layout.x_for_index(target_column);
-        let target_y = (target_display_point.row().as_f64() * f64::from(line_height))
-            - scroll_pixel_position.y;
-
-        let flag_on_right = target_x < text_bounds.size.width / 2.;
-
-        let mut border_color = Self::edit_prediction_callout_popover_border_color(cx);
-        border_color.l += 0.001;
-
-        let mut element = v_flex()
-            .items_end()
-            .when(flag_on_right, |el| el.items_start())
-            .child(if flag_on_right {
-                self.render_edit_prediction_line_popover("Jump", None, window, cx)
-                    .rounded_bl(px(0.))
-                    .rounded_tl(px(0.))
-                    .border_l_2()
-                    .border_color(border_color)
-            } else {
-                self.render_edit_prediction_line_popover("Jump", None, window, cx)
-                    .rounded_br(px(0.))
-                    .rounded_tr(px(0.))
-                    .border_r_2()
-                    .border_color(border_color)
-            })
-            .child(div().w(POLE_WIDTH).bg(border_color).h(line_height))
-            .into_any();
-
-        let size = element.layout_as_root(AvailableSpace::min_size(), window, cx);
-
-        let mut origin = scrolled_content_origin + point(target_x, target_y.into())
-            - point(
-                if flag_on_right {
-                    POLE_WIDTH
-                } else {
-                    size.width - POLE_WIDTH
-                },
-                size.height - line_height,
-            );
-
-        origin.x = origin.x.max(content_origin.x);
-
-        element.prepaint_at(origin, window, cx);
-
-        Some((element, origin))
-    }
-
-    fn render_edit_prediction_scroll_popover(
-        &mut self,
-        to_y: impl Fn(Size<Pixels>) -> Pixels,
-        scroll_icon: IconName,
-        visible_row_range: Range<DisplayRow>,
-        line_layouts: &[LineWithInvisibles],
-        newest_selection_head: Option<DisplayPoint>,
-        scrolled_content_origin: gpui::Point<Pixels>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<(AnyElement, gpui::Point<Pixels>)> {
-        let mut element = self
-            .render_edit_prediction_line_popover("Scroll", Some(scroll_icon), window, cx)
-            .into_any();
-
-        let size = element.layout_as_root(AvailableSpace::min_size(), window, cx);
-
-        let cursor = newest_selection_head?;
-        let cursor_row_layout =
-            line_layouts.get(cursor.row().minus(visible_row_range.start) as usize)?;
-        let cursor_column = cursor.column() as usize;
-
-        let cursor_character_x = cursor_row_layout.x_for_index(cursor_column);
-
-        let origin = scrolled_content_origin + point(cursor_character_x, to_y(size));
-
-        element.prepaint_at(origin, window, cx);
-        Some((element, origin))
-    }
-
-    fn render_edit_prediction_eager_jump_popover(
-        &mut self,
-        text_bounds: &Bounds<Pixels>,
-        content_origin: gpui::Point<Pixels>,
-        editor_snapshot: &EditorSnapshot,
-        visible_row_range: Range<DisplayRow>,
-        scroll_top: ScrollOffset,
-        scroll_bottom: ScrollOffset,
-        line_height: Pixels,
-        scroll_pixel_position: gpui::Point<ScrollPixelOffset>,
-        target_display_point: DisplayPoint,
-        editor_width: Pixels,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<(AnyElement, gpui::Point<Pixels>)> {
-        if target_display_point.row().as_f64() < scroll_top {
-            let mut element = self
-                .render_edit_prediction_line_popover(
-                    "Jump to Edit",
-                    Some(IconName::ArrowUp),
-                    window,
-                    cx,
-                )
-                .into_any();
-
-            let size = element.layout_as_root(AvailableSpace::min_size(), window, cx);
-            let offset = point(
-                (text_bounds.size.width - size.width) / 2.,
-                Self::EDIT_PREDICTION_POPOVER_PADDING_Y,
-            );
-
-            let origin = text_bounds.origin + offset;
-            element.prepaint_at(origin, window, cx);
-            Some((element, origin))
-        } else if (target_display_point.row().as_f64() + 1.) > scroll_bottom {
-            let mut element = self
-                .render_edit_prediction_line_popover(
-                    "Jump to Edit",
-                    Some(IconName::ArrowDown),
-                    window,
-                    cx,
-                )
-                .into_any();
-
-            let size = element.layout_as_root(AvailableSpace::min_size(), window, cx);
-            let offset = point(
-                (text_bounds.size.width - size.width) / 2.,
-                text_bounds.size.height - size.height - Self::EDIT_PREDICTION_POPOVER_PADDING_Y,
-            );
-
-            let origin = text_bounds.origin + offset;
-            element.prepaint_at(origin, window, cx);
-            Some((element, origin))
-        } else {
-            self.render_edit_prediction_end_of_line_popover(
-                "Jump to Edit",
-                editor_snapshot,
-                visible_row_range,
-                target_display_point,
-                line_height,
-                scroll_pixel_position,
-                content_origin,
-                editor_width,
-                window,
-                cx,
-            )
-        }
-    }
-
-    fn render_edit_prediction_end_of_line_popover(
-        self: &mut Editor,
-        label: &'static str,
-        editor_snapshot: &EditorSnapshot,
-        visible_row_range: Range<DisplayRow>,
-        target_display_point: DisplayPoint,
-        line_height: Pixels,
-        scroll_pixel_position: gpui::Point<ScrollPixelOffset>,
-        content_origin: gpui::Point<Pixels>,
-        editor_width: Pixels,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<(AnyElement, gpui::Point<Pixels>)> {
-        let target_line_end = DisplayPoint::new(
-            target_display_point.row(),
-            editor_snapshot.line_len(target_display_point.row()),
-        );
-
-        let mut element = self
-            .render_edit_prediction_line_popover(label, None, window, cx)
-            .into_any();
-
-        let size = element.layout_as_root(AvailableSpace::min_size(), window, cx);
-
-        let line_origin =
-            self.display_to_pixel_point(target_line_end, editor_snapshot, window, cx)?;
-
-        let start_point = content_origin - point(scroll_pixel_position.x.into(), Pixels::ZERO);
-        let mut origin = start_point
-            + line_origin
-            + point(Self::EDIT_PREDICTION_POPOVER_PADDING_X, Pixels::ZERO);
-        origin.x = origin.x.max(content_origin.x);
-
-        let max_x = content_origin.x + editor_width - size.width;
-
-        if origin.x > max_x {
-            let offset = line_height + Self::EDIT_PREDICTION_POPOVER_PADDING_Y;
-
-            let icon = if visible_row_range.contains(&(target_display_point.row() + 2)) {
-                origin.y += offset;
-                IconName::ArrowUp
-            } else {
-                origin.y -= offset;
-                IconName::ArrowDown
-            };
-
-            element = self
-                .render_edit_prediction_line_popover(label, Some(icon), window, cx)
-                .into_any();
-
-            let size = element.layout_as_root(AvailableSpace::min_size(), window, cx);
-
-            origin.x = content_origin.x + editor_width - size.width - px(2.);
-        }
-
-        element.prepaint_at(origin, window, cx);
-        Some((element, origin))
-    }
-
-    fn render_edit_prediction_diff_popover(
-        self: &Editor,
-        text_bounds: &Bounds<Pixels>,
-        content_origin: gpui::Point<Pixels>,
-        right_margin: Pixels,
-        editor_snapshot: &EditorSnapshot,
-        visible_row_range: Range<DisplayRow>,
-        line_layouts: &[LineWithInvisibles],
-        line_height: Pixels,
-        scroll_position: gpui::Point<ScrollOffset>,
-        scroll_pixel_position: gpui::Point<ScrollPixelOffset>,
-        newest_selection_head: Option<DisplayPoint>,
-        editor_width: Pixels,
-        style: &EditorStyle,
-        edits: &Vec<(Range<Anchor>, Arc<str>)>,
-        edit_preview: &Option<language::EditPreview>,
-        snapshot: &language::BufferSnapshot,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<(AnyElement, gpui::Point<Pixels>)> {
-        let edit_start = edits
-            .first()
-            .unwrap()
-            .0
-            .start
-            .to_display_point(editor_snapshot);
-        let edit_end = edits
-            .last()
-            .unwrap()
-            .0
-            .end
-            .to_display_point(editor_snapshot);
-
-        let is_visible = visible_row_range.contains(&edit_start.row())
-            || visible_row_range.contains(&edit_end.row());
-        if !is_visible {
-            return None;
-        }
-
-        let highlighted_edits = if let Some(edit_preview) = edit_preview.as_ref() {
-            crate::edit_prediction_edit_text(snapshot, edits, edit_preview, false, cx)
-        } else {
-            // Fallback for providers without edit_preview
-            crate::edit_prediction_fallback_text(edits, cx)
-        };
-
-        let styled_text = highlighted_edits.to_styled_text(&style.text);
-        let line_count = highlighted_edits.text.lines().count();
-
-        const BORDER_WIDTH: Pixels = px(1.);
-
-        let keybind = self.render_edit_prediction_accept_keybind(window, cx);
-        let has_keybind = keybind.is_some();
-
-        let mut element = h_flex()
-            .items_start()
-            .child(
-                h_flex()
-                    .bg(cx.theme().colors().editor_background)
-                    .border(BORDER_WIDTH)
-                    .shadow_xs()
-                    .border_color(cx.theme().colors().border)
-                    .rounded_l_lg()
-                    .when(line_count > 1, |el| el.rounded_br_lg())
-                    .pr_1()
-                    .child(styled_text),
-            )
-            .child(
-                h_flex()
-                    .h(line_height + BORDER_WIDTH * 2.)
-                    .px_1p5()
-                    .gap_1()
-                    // Workaround: For some reason, there's a gap if we don't do this
-                    .ml(-BORDER_WIDTH)
-                    .shadow(vec![gpui::BoxShadow {
-                        color: gpui::black().opacity(0.05),
-                        offset: point(px(1.), px(1.)),
-                        blur_radius: px(2.),
-                        spread_radius: px(0.),
-                    }])
-                    .bg(Editor::edit_prediction_line_popover_bg_color(cx))
-                    .border(BORDER_WIDTH)
-                    .border_color(cx.theme().colors().border)
-                    .rounded_r_lg()
-                    .id("edit_prediction_diff_popover_keybind")
-                    .when(!has_keybind, |el| {
-                        let status_colors = cx.theme().status();
-
-                        el.bg(status_colors.error_background)
-                            .border_color(status_colors.error.opacity(0.6))
-                            .child(Icon::new(IconName::Info).color(Color::Error))
-                            .cursor_default()
-                            .hoverable_tooltip(move |_window, cx| {
-                                cx.new(|_| MissingEditPredictionKeybindingTooltip).into()
-                            })
-                    })
-                    .children(keybind),
-            )
-            .into_any();
-
-        let longest_row =
-            editor_snapshot.longest_row_in_range(edit_start.row()..edit_end.row() + 1);
-        let longest_line_width = if visible_row_range.contains(&longest_row) {
-            line_layouts[(longest_row.0 - visible_row_range.start.0) as usize].width
-        } else {
-            layout_line(
-                longest_row,
-                editor_snapshot,
-                style,
-                editor_width,
-                |_| false,
-                window,
-                cx,
-            )
-            .width
-        };
-
-        let viewport_bounds =
-            Bounds::new(Default::default(), window.viewport_size()).extend(Edges {
-                right: -right_margin,
-                ..Default::default()
-            });
-
-        let x_after_longest = Pixels::from(
-            ScrollPixelOffset::from(
-                text_bounds.origin.x + longest_line_width + Self::EDIT_PREDICTION_POPOVER_PADDING_X,
-            ) - scroll_pixel_position.x,
-        );
-
-        let element_bounds = element.layout_as_root(AvailableSpace::min_size(), window, cx);
-
-        // Fully visible if it can be displayed within the window (allow overlapping other
-        // panes). However, this is only allowed if the popover starts within text_bounds.
-        let can_position_to_the_right = x_after_longest < text_bounds.right()
-            && x_after_longest + element_bounds.width < viewport_bounds.right();
-
-        let mut origin = if can_position_to_the_right {
-            point(
-                x_after_longest,
-                text_bounds.origin.y
-                    + Pixels::from(
-                        edit_start.row().as_f64() * ScrollPixelOffset::from(line_height)
-                            - scroll_pixel_position.y,
-                    ),
-            )
-        } else {
-            let cursor_row = newest_selection_head.map(|head| head.row());
-            let above_edit = edit_start
-                .row()
-                .0
-                .checked_sub(line_count as u32)
-                .map(DisplayRow);
-            let below_edit = Some(edit_end.row() + 1);
-            let above_cursor =
-                cursor_row.and_then(|row| row.0.checked_sub(line_count as u32).map(DisplayRow));
-            let below_cursor = cursor_row.map(|cursor_row| cursor_row + 1);
-
-            // Place the edit popover adjacent to the edit if there is a location
-            // available that is onscreen and does not obscure the cursor. Otherwise,
-            // place it adjacent to the cursor.
-            let row_target = [above_edit, below_edit, above_cursor, below_cursor]
-                .into_iter()
-                .flatten()
-                .find(|&start_row| {
-                    let end_row = start_row + line_count as u32;
-                    visible_row_range.contains(&start_row)
-                        && visible_row_range.contains(&end_row)
-                        && cursor_row
-                            .is_none_or(|cursor_row| !((start_row..end_row).contains(&cursor_row)))
-                })?;
-
-            content_origin
-                + point(
-                    Pixels::from(-scroll_pixel_position.x),
-                    Pixels::from(
-                        (row_target.as_f64() - scroll_position.y) * f64::from(line_height),
-                    ),
-                )
-        };
-
-        origin.x -= BORDER_WIDTH;
-
-        window.defer_draw(element, origin, 1);
-
-        // Do not return an element, since it will already be drawn due to defer_draw.
-        None
-    }
-
-    fn edit_prediction_cursor_popover_height(&self) -> Pixels {
-        px(30.)
-    }
-
-    fn current_user_player_color(&self, cx: &mut App) -> PlayerColor {
-        if self.read_only(cx) {
-            cx.theme().players().read_only()
-        } else {
-            self.style.as_ref().unwrap().local_player
-        }
-    }
-
-    fn render_edit_prediction_accept_keybind(
-        &self,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<AnyElement> {
-        let accept_binding = self.accept_edit_prediction_keybind(false, window, cx);
-        let accept_keystroke = accept_binding.keystroke()?;
-
-        let is_platform_style_mac = PlatformStyle::platform() == PlatformStyle::Mac;
-
-        let modifiers_color = if *accept_keystroke.modifiers() == window.modifiers() {
-            Color::Accent
-        } else {
-            Color::Muted
-        };
-
-        h_flex()
-            .px_0p5()
-            .when(is_platform_style_mac, |parent| parent.gap_0p5())
-            .font(theme::ThemeSettings::get_global(cx).buffer_font.clone())
-            .text_size(TextSize::XSmall.rems(cx))
-            .child(h_flex().children(ui::render_modifiers(
-                accept_keystroke.modifiers(),
-                PlatformStyle::platform(),
-                Some(modifiers_color),
-                Some(IconSize::XSmall.rems().into()),
-                true,
-            )))
-            .when(is_platform_style_mac, |parent| {
-                parent.child(accept_keystroke.key().to_string())
-            })
-            .when(!is_platform_style_mac, |parent| {
-                parent.child(
-                    Key::new(
-                        util::capitalize(accept_keystroke.key()),
-                        Some(Color::Default),
-                    )
-                    .size(Some(IconSize::XSmall.rems().into())),
-                )
-            })
-            .into_any()
-            .into()
-    }
-
-    fn render_edit_prediction_line_popover(
-        &self,
-        label: impl Into<SharedString>,
-        icon: Option<IconName>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Stateful<Div> {
-        let padding_right = if icon.is_some() { px(4.) } else { px(8.) };
-
-        let keybind = self.render_edit_prediction_accept_keybind(window, cx);
-        let has_keybind = keybind.is_some();
-
-        h_flex()
-            .id("ep-line-popover")
-            .py_0p5()
-            .pl_1()
-            .pr(padding_right)
-            .gap_1()
-            .rounded_md()
-            .border_1()
-            .bg(Self::edit_prediction_line_popover_bg_color(cx))
-            .border_color(Self::edit_prediction_callout_popover_border_color(cx))
-            .shadow_xs()
-            .when(!has_keybind, |el| {
-                let status_colors = cx.theme().status();
-
-                el.bg(status_colors.error_background)
-                    .border_color(status_colors.error.opacity(0.6))
-                    .pl_2()
-                    .child(Icon::new(IconName::ZedPredictError).color(Color::Error))
-                    .cursor_default()
-                    .hoverable_tooltip(move |_window, cx| {
-                        cx.new(|_| MissingEditPredictionKeybindingTooltip).into()
-                    })
-            })
-            .children(keybind)
-            .child(
-                Label::new(label)
-                    .size(LabelSize::Small)
-                    .when(!has_keybind, |el| {
-                        el.color(cx.theme().status().error.into()).strikethrough()
-                    }),
-            )
-            .when(!has_keybind, |el| {
-                el.child(
-                    h_flex().ml_1().child(
-                        Icon::new(IconName::Info)
-                            .size(IconSize::Small)
-                            .color(cx.theme().status().error.into()),
-                    ),
-                )
-            })
-            .when_some(icon, |element, icon| {
-                element.child(
-                    div()
-                        .mt(px(1.5))
-                        .child(Icon::new(icon).size(IconSize::Small)),
-                )
-            })
-    }
-
-    fn render_edit_prediction_jump_outside_popover(
-        &self,
-        snapshot: &BufferSnapshot,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Stateful<Div> {
-        let keybind = self.render_edit_prediction_accept_keybind(window, cx);
-        let has_keybind = keybind.is_some();
-
-        let file_name = snapshot
-            .file()
-            .map(|file| SharedString::new(file.file_name(cx)))
-            .unwrap_or(SharedString::new_static("untitled"));
-
-        h_flex()
-            .id("ep-jump-outside-popover")
-            .py_1()
-            .px_2()
-            .gap_1()
-            .rounded_md()
-            .border_1()
-            .bg(Self::edit_prediction_line_popover_bg_color(cx))
-            .border_color(Self::edit_prediction_callout_popover_border_color(cx))
-            .shadow_xs()
-            .when(!has_keybind, |el| {
-                let status_colors = cx.theme().status();
-
-                el.bg(status_colors.error_background)
-                    .border_color(status_colors.error.opacity(0.6))
-                    .pl_2()
-                    .child(Icon::new(IconName::ZedPredictError).color(Color::Error))
-                    .cursor_default()
-                    .hoverable_tooltip(move |_window, cx| {
-                        cx.new(|_| MissingEditPredictionKeybindingTooltip).into()
-                    })
-            })
-            .children(keybind)
-            .child(
-                Label::new(file_name)
-                    .size(LabelSize::Small)
-                    .buffer_font(cx)
-                    .when(!has_keybind, |el| {
-                        el.color(cx.theme().status().error.into()).strikethrough()
-                    }),
-            )
-            .when(!has_keybind, |el| {
-                el.child(
-                    h_flex().ml_1().child(
-                        Icon::new(IconName::Info)
-                            .size(IconSize::Small)
-                            .color(cx.theme().status().error.into()),
-                    ),
-                )
-            })
-            .child(
-                div()
-                    .mt(px(1.5))
-                    .child(Icon::new(IconName::ArrowUpRight).size(IconSize::Small)),
-            )
-    }
-
-    fn edit_prediction_line_popover_bg_color(cx: &App) -> Hsla {
-        let accent_color = cx.theme().colors().text_accent;
-        let editor_bg_color = cx.theme().colors().editor_background;
-        editor_bg_color.blend(accent_color.opacity(0.1))
-    }
-
-    fn edit_prediction_callout_popover_border_color(cx: &App) -> Hsla {
-        let accent_color = cx.theme().colors().text_accent;
-        let editor_bg_color = cx.theme().colors().editor_background;
-        editor_bg_color.blend(accent_color.opacity(0.6))
-    }
-    fn get_prediction_provider_icon_name(
-        provider: &Option<RegisteredEditPredictionDelegate>,
-    ) -> IconName {
-        match provider {
-            Some(provider) => match provider.provider.name() {
-                "copilot" => IconName::Copilot,
-                "supermaven" => IconName::Supermaven,
-                _ => IconName::ZedPredict,
-            },
-            None => IconName::ZedPredict,
-        }
-    }
-
-    fn render_edit_prediction_cursor_popover(
-        &self,
-        min_width: Pixels,
-        max_width: Pixels,
-        cursor_point: Point,
-        style: &EditorStyle,
-        accept_keystroke: Option<&gpui::KeybindingKeystroke>,
-        _window: &Window,
-        cx: &mut Context<Editor>,
-    ) -> Option<AnyElement> {
-        let provider = self.edit_prediction_provider.as_ref()?;
-        let provider_icon = Self::get_prediction_provider_icon_name(&self.edit_prediction_provider);
-
-        let is_refreshing = provider.provider.is_refreshing(cx);
-
-        fn pending_completion_container(icon: IconName) -> Div {
-            h_flex().h_full().flex_1().gap_2().child(Icon::new(icon))
-        }
-
-        let completion = match &self.active_edit_prediction {
-            Some(prediction) => {
-                if !self.has_visible_completions_menu() {
-                    const RADIUS: Pixels = px(6.);
-                    const BORDER_WIDTH: Pixels = px(1.);
-
-                    return Some(
-                        h_flex()
-                            .elevation_2(cx)
-                            .border(BORDER_WIDTH)
-                            .border_color(cx.theme().colors().border)
-                            .when(accept_keystroke.is_none(), |el| {
-                                el.border_color(cx.theme().status().error)
-                            })
-                            .rounded(RADIUS)
-                            .rounded_tl(px(0.))
-                            .overflow_hidden()
-                            .child(div().px_1p5().child(match &prediction.completion {
-                                EditPrediction::MoveWithin { target, snapshot } => {
-                                    use text::ToPoint as _;
-                                    if target.text_anchor.to_point(snapshot).row > cursor_point.row
-                                    {
-                                        Icon::new(IconName::ZedPredictDown)
-                                    } else {
-                                        Icon::new(IconName::ZedPredictUp)
-                                    }
-                                }
-                                EditPrediction::MoveOutside { .. } => {
-                                    // TODO [zeta2] custom icon for external jump?
-                                    Icon::new(provider_icon)
-                                }
-                                EditPrediction::Edit { .. } => Icon::new(provider_icon),
-                            }))
-                            .child(
-                                h_flex()
-                                    .gap_1()
-                                    .py_1()
-                                    .px_2()
-                                    .rounded_r(RADIUS - BORDER_WIDTH)
-                                    .border_l_1()
-                                    .border_color(cx.theme().colors().border)
-                                    .bg(Self::edit_prediction_line_popover_bg_color(cx))
-                                    .when(self.edit_prediction_preview.released_too_fast(), |el| {
-                                        el.child(
-                                            Label::new("Hold")
-                                                .size(LabelSize::Small)
-                                                .when(accept_keystroke.is_none(), |el| {
-                                                    el.strikethrough()
-                                                })
-                                                .line_height_style(LineHeightStyle::UiLabel),
-                                        )
-                                    })
-                                    .id("edit_prediction_cursor_popover_keybind")
-                                    .when(accept_keystroke.is_none(), |el| {
-                                        let status_colors = cx.theme().status();
-
-                                        el.bg(status_colors.error_background)
-                                            .border_color(status_colors.error.opacity(0.6))
-                                            .child(Icon::new(IconName::Info).color(Color::Error))
-                                            .cursor_default()
-                                            .hoverable_tooltip(move |_window, cx| {
-                                                cx.new(|_| MissingEditPredictionKeybindingTooltip)
-                                                    .into()
-                                            })
-                                    })
-                                    .when_some(
-                                        accept_keystroke.as_ref(),
-                                        |el, accept_keystroke| {
-                                            el.child(h_flex().children(ui::render_modifiers(
-                                                accept_keystroke.modifiers(),
-                                                PlatformStyle::platform(),
-                                                Some(Color::Default),
-                                                Some(IconSize::XSmall.rems().into()),
-                                                false,
-                                            )))
-                                        },
-                                    ),
-                            )
-                            .into_any(),
-                    );
-                }
-
-                self.render_edit_prediction_cursor_popover_preview(
-                    prediction,
-                    cursor_point,
-                    style,
-                    cx,
-                )?
-            }
-
-            None if is_refreshing => match &self.stale_edit_prediction_in_menu {
-                Some(stale_completion) => self.render_edit_prediction_cursor_popover_preview(
-                    stale_completion,
-                    cursor_point,
-                    style,
-                    cx,
-                )?,
-
-                None => pending_completion_container(provider_icon)
-                    .child(Label::new("...").size(LabelSize::Small)),
-            },
-
-            None => pending_completion_container(provider_icon)
-                .child(Label::new("...").size(LabelSize::Small)),
-        };
-
-        let completion = if is_refreshing || self.active_edit_prediction.is_none() {
-            completion
-                .with_animation(
-                    "loading-completion",
-                    Animation::new(Duration::from_secs(2))
-                        .repeat()
-                        .with_easing(pulsating_between(0.4, 0.8)),
-                    |label, delta| label.opacity(delta),
-                )
-                .into_any_element()
-        } else {
-            completion.into_any_element()
-        };
-
-        let has_completion = self.active_edit_prediction.is_some();
-
-        let is_platform_style_mac = PlatformStyle::platform() == PlatformStyle::Mac;
-        Some(
-            h_flex()
-                .min_w(min_width)
-                .max_w(max_width)
-                .flex_1()
-                .elevation_2(cx)
-                .border_color(cx.theme().colors().border)
-                .child(
-                    div()
-                        .flex_1()
-                        .py_1()
-                        .px_2()
-                        .overflow_hidden()
-                        .child(completion),
-                )
-                .when_some(accept_keystroke, |el, accept_keystroke| {
-                    if !accept_keystroke.modifiers().modified() {
-                        return el;
-                    }
-
-                    el.child(
-                        h_flex()
-                            .h_full()
-                            .border_l_1()
-                            .rounded_r_lg()
-                            .border_color(cx.theme().colors().border)
-                            .bg(Self::edit_prediction_line_popover_bg_color(cx))
-                            .gap_1()
-                            .py_1()
-                            .px_2()
-                            .child(
-                                h_flex()
-                                    .font(theme::ThemeSettings::get_global(cx).buffer_font.clone())
-                                    .when(is_platform_style_mac, |parent| parent.gap_1())
-                                    .child(h_flex().children(ui::render_modifiers(
-                                        accept_keystroke.modifiers(),
-                                        PlatformStyle::platform(),
-                                        Some(if !has_completion {
-                                            Color::Muted
-                                        } else {
-                                            Color::Default
-                                        }),
-                                        None,
-                                        false,
-                                    ))),
-                            )
-                            .child(Label::new("Preview").into_any_element())
-                            .opacity(if has_completion { 1.0 } else { 0.4 }),
-                    )
-                })
-                .into_any(),
-        )
-    }
-
-    fn render_edit_prediction_cursor_popover_preview(
-        &self,
-        completion: &EditPredictionState,
-        cursor_point: Point,
-        style: &EditorStyle,
-        cx: &mut Context<Editor>,
-    ) -> Option<Div> {
-        use text::ToPoint as _;
-
-        fn render_relative_row_jump(
-            prefix: impl Into<String>,
-            current_row: u32,
-            target_row: u32,
-        ) -> Div {
-            let (row_diff, arrow) = if target_row < current_row {
-                (current_row - target_row, IconName::ArrowUp)
-            } else {
-                (target_row - current_row, IconName::ArrowDown)
-            };
-
-            h_flex()
-                .child(
-                    Label::new(format!("{}{}", prefix.into(), row_diff))
-                        .color(Color::Muted)
-                        .size(LabelSize::Small),
-                )
-                .child(Icon::new(arrow).color(Color::Muted).size(IconSize::Small))
-        }
-
-        let supports_jump = self
-            .edit_prediction_provider
-            .as_ref()
-            .map(|provider| provider.provider.supports_jump_to_edit())
-            .unwrap_or(true);
-
-        match &completion.completion {
-            EditPrediction::MoveWithin {
-                target, snapshot, ..
-            } => {
-                if !supports_jump {
-                    return None;
-                }
-
-                Some(
-                    h_flex()
-                        .px_2()
-                        .gap_2()
-                        .flex_1()
-                        .child(
-                            if target.text_anchor.to_point(snapshot).row > cursor_point.row {
-                                Icon::new(IconName::ZedPredictDown)
-                            } else {
-                                Icon::new(IconName::ZedPredictUp)
-                            },
-                        )
-                        .child(Label::new("Jump to Edit")),
-                )
-            }
-            EditPrediction::MoveOutside { snapshot, .. } => {
-                let file_name = snapshot
-                    .file()
-                    .map(|file| file.file_name(cx))
-                    .unwrap_or("untitled");
-                Some(
-                    h_flex()
-                        .px_2()
-                        .gap_2()
-                        .flex_1()
-                        .child(Icon::new(IconName::ZedPredict))
-                        .child(Label::new(format!("Jump to {file_name}"))),
-                )
-            }
-            EditPrediction::Edit {
-                edits,
-                edit_preview,
-                snapshot,
-                display_mode: _,
-            } => {
-                let first_edit_row = edits.first()?.0.start.text_anchor.to_point(snapshot).row;
-
-                let (highlighted_edits, has_more_lines) =
-                    if let Some(edit_preview) = edit_preview.as_ref() {
-                        crate::edit_prediction_edit_text(snapshot, edits, edit_preview, true, cx)
-                            .first_line_preview()
-                    } else {
-                        crate::edit_prediction_fallback_text(edits, cx).first_line_preview()
-                    };
-
-                let styled_text = gpui::StyledText::new(highlighted_edits.text)
-                    .with_default_highlights(&style.text, highlighted_edits.highlights);
-
-                let preview = h_flex()
-                    .gap_1()
-                    .min_w_16()
-                    .child(styled_text)
-                    .when(has_more_lines, |parent| parent.child("…"));
-
-                let left = if supports_jump && first_edit_row != cursor_point.row {
-                    render_relative_row_jump("", cursor_point.row, first_edit_row)
-                        .into_any_element()
-                } else {
-                    let icon_name =
-                        Editor::get_prediction_provider_icon_name(&self.edit_prediction_provider);
-                    Icon::new(icon_name).into_any_element()
-                };
-
-                Some(
-                    h_flex()
-                        .h_full()
-                        .flex_1()
-                        .gap_2()
-                        .pr_1()
-                        .overflow_x_hidden()
-                        .font(theme::ThemeSettings::get_global(cx).buffer_font.clone())
-                        .child(left)
-                        .child(preview),
-                )
-            }
-        }
-    }
-
-    pub fn render_context_menu(
-        &mut self,
-        max_height_in_lines: u32,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) -> Option<AnyElement> {
-        let menu = self.context_menu.borrow();
-        let menu = menu.as_ref()?;
-        if !menu.visible() {
-            return None;
-        };
-        self.style
-            .as_ref()
-            .map(|style| menu.render(style, max_height_in_lines, window, cx))
-    }
-
-    fn render_context_menu_aside(
-        &mut self,
-        max_size: Size<Pixels>,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) -> Option<AnyElement> {
-        self.context_menu.borrow_mut().as_mut().and_then(|menu| {
-            if menu.visible() {
-                menu.render_aside(max_size, window, cx)
-            } else {
-                None
-            }
-        })
-    }
-
-    fn hide_context_menu(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<CodeContextMenu> {
-        cx.notify();
-        self.completion_tasks.clear();
-        let context_menu = self.context_menu.borrow_mut().take();
-        self.stale_edit_prediction_in_menu.take();
-        self.update_visible_edit_prediction(window, cx);
-        if let Some(CodeContextMenu::Completions(_)) = &context_menu
-            && let Some(completion_provider) = &self.completion_provider
-        {
-            completion_provider.selection_changed(None, window, cx);
-        }
-        context_menu
-    }
-
-    fn show_snippet_choices(
-        &mut self,
-        choices: &Vec<String>,
-        selection: Range<Anchor>,
-        cx: &mut Context<Self>,
-    ) {
-        let Some((_, buffer, _)) = self
-            .buffer()
-            .read(cx)
-            .excerpt_containing(selection.start, cx)
-        else {
-            return;
-        };
-        let Some((_, end_buffer, _)) = self.buffer().read(cx).excerpt_containing(selection.end, cx)
-        else {
-            return;
-        };
-        if buffer != end_buffer {
-            log::error!("expected anchor range to have matching buffer IDs");
-            return;
-        }
-
-        let id = post_inc(&mut self.next_completion_id);
-        let snippet_sort_order = EditorSettings::get_global(cx).snippet_sort_order;
-        let mut context_menu = self.context_menu.borrow_mut();
-        let old_menu = context_menu.take();
-        *context_menu = Some(CodeContextMenu::Completions(
-            CompletionsMenu::new_snippet_choices(
-                id,
-                true,
-                choices,
-                selection,
-                buffer,
-                old_menu.map(|menu| menu.primary_scroll_handle()),
-                snippet_sort_order,
-            ),
-        ));
-    }
-
-    pub fn insert_snippet(
-        &mut self,
-        insertion_ranges: &[Range<MultiBufferOffset>],
-        snippet: Snippet,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Result<()> {
-        struct Tabstop<T> {
-            is_end_tabstop: bool,
-            ranges: Vec<Range<T>>,
-            choices: Option<Vec<String>>,
-        }
-
-        let tabstops = self.buffer.update(cx, |buffer, cx| {
-            let snippet_text: Arc<str> = snippet.text.clone().into();
-            let edits = insertion_ranges
-                .iter()
-                .cloned()
-                .map(|range| (range, snippet_text.clone()));
-            let autoindent_mode = AutoindentMode::Block {
-                original_indent_columns: Vec::new(),
-            };
-            buffer.edit(edits, Some(autoindent_mode), cx);
-
-            let snapshot = &*buffer.read(cx);
-            let snippet = &snippet;
-            snippet
-                .tabstops
-                .iter()
-                .map(|tabstop| {
-                    let is_end_tabstop = tabstop.ranges.first().is_some_and(|tabstop| {
-                        tabstop.is_empty() && tabstop.start == snippet.text.len() as isize
-                    });
-                    let mut tabstop_ranges = tabstop
-                        .ranges
-                        .iter()
-                        .flat_map(|tabstop_range| {
-                            let mut delta = 0_isize;
-                            insertion_ranges.iter().map(move |insertion_range| {
-                                let insertion_start = insertion_range.start + delta;
-                                delta += snippet.text.len() as isize
-                                    - (insertion_range.end - insertion_range.start) as isize;
-
-                                let start =
-                                    (insertion_start + tabstop_range.start).min(snapshot.len());
-                                let end = (insertion_start + tabstop_range.end).min(snapshot.len());
-                                snapshot.anchor_before(start)..snapshot.anchor_after(end)
-                            })
-                        })
-                        .collect::<Vec<_>>();
-                    tabstop_ranges.sort_unstable_by(|a, b| a.start.cmp(&b.start, snapshot));
-
-                    Tabstop {
-                        is_end_tabstop,
-                        ranges: tabstop_ranges,
-                        choices: tabstop.choices.clone(),
-                    }
-                })
-                .collect::<Vec<_>>()
-        });
-        if let Some(tabstop) = tabstops.first() {
-            self.change_selections(Default::default(), window, cx, |s| {
-                // Reverse order so that the first range is the newest created selection.
-                // Completions will use it and autoscroll will prioritize it.
-                s.select_ranges(tabstop.ranges.iter().rev().cloned());
-            });
-
-            if let Some(choices) = &tabstop.choices
-                && let Some(selection) = tabstop.ranges.first()
-            {
-                self.show_snippet_choices(choices, selection.clone(), cx)
-            }
-
-            // If we're already at the last tabstop and it's at the end of the snippet,
-            // we're done, we don't need to keep the state around.
-            if !tabstop.is_end_tabstop {
-                let choices = tabstops
-                    .iter()
-                    .map(|tabstop| tabstop.choices.clone())
-                    .collect();
-
-                let ranges = tabstops
-                    .into_iter()
-                    .map(|tabstop| tabstop.ranges)
-                    .collect::<Vec<_>>();
-
-                self.snippet_stack.push(SnippetState {
-                    active_index: 0,
-                    ranges,
-                    choices,
-                });
-            }
-
-            // Check whether the just-entered snippet ends with an auto-closable bracket.
-            if self.autoclose_regions.is_empty() {
-                let snapshot = self.buffer.read(cx).snapshot(cx);
-                for selection in &mut self.selections.all::<Point>(&self.display_snapshot(cx)) {
-                    let selection_head = selection.head();
-                    let Some(scope) = snapshot.language_scope_at(selection_head) else {
-                        continue;
-                    };
-
-                    let mut bracket_pair = None;
-                    let max_lookup_length = scope
-                        .brackets()
-                        .map(|(pair, _)| {
-                            pair.start
-                                .as_str()
-                                .chars()
-                                .count()
-                                .max(pair.end.as_str().chars().count())
-                        })
-                        .max();
-                    if let Some(max_lookup_length) = max_lookup_length {
-                        let next_text = snapshot
-                            .chars_at(selection_head)
-                            .take(max_lookup_length)
-                            .collect::<String>();
-                        let prev_text = snapshot
-                            .reversed_chars_at(selection_head)
-                            .take(max_lookup_length)
-                            .collect::<String>();
-
-                        for (pair, enabled) in scope.brackets() {
-                            if enabled
-                                && pair.close
-                                && prev_text.starts_with(pair.start.as_str())
-                                && next_text.starts_with(pair.end.as_str())
-                            {
-                                bracket_pair = Some(pair.clone());
-                                break;
-                            }
-                        }
-                    }
-
-                    if let Some(pair) = bracket_pair {
-                        let snapshot_settings = snapshot.language_settings_at(selection_head, cx);
-                        let autoclose_enabled =
-                            self.use_autoclose && snapshot_settings.use_autoclose;
-                        if autoclose_enabled {
-                            let start = snapshot.anchor_after(selection_head);
-                            let end = snapshot.anchor_after(selection_head);
-                            self.autoclose_regions.push(AutocloseRegion {
-                                selection_id: selection.id,
-                                range: start..end,
-                                pair,
-                            });
-                        }
-                    }
-                }
-            }
-        }
-        Ok(())
-    }
-
-    pub fn move_to_next_snippet_tabstop(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> bool {
-        self.move_to_snippet_tabstop(Bias::Right, window, cx)
-    }
-
-    pub fn move_to_prev_snippet_tabstop(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> bool {
-        self.move_to_snippet_tabstop(Bias::Left, window, cx)
-    }
-
-    pub fn move_to_snippet_tabstop(
-        &mut self,
-        bias: Bias,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> bool {
-        if let Some(mut snippet) = self.snippet_stack.pop() {
-            match bias {
-                Bias::Left => {
-                    if snippet.active_index > 0 {
-                        snippet.active_index -= 1;
-                    } else {
-                        self.snippet_stack.push(snippet);
-                        return false;
-                    }
-                }
-                Bias::Right => {
-                    if snippet.active_index + 1 < snippet.ranges.len() {
-                        snippet.active_index += 1;
-                    } else {
-                        self.snippet_stack.push(snippet);
-                        return false;
-                    }
-                }
-            }
-            if let Some(current_ranges) = snippet.ranges.get(snippet.active_index) {
-                self.change_selections(Default::default(), window, cx, |s| {
-                    // Reverse order so that the first range is the newest created selection.
-                    // Completions will use it and autoscroll will prioritize it.
-                    s.select_ranges(current_ranges.iter().rev().cloned())
-                });
-
-                if let Some(choices) = &snippet.choices[snippet.active_index]
-                    && let Some(selection) = current_ranges.first()
-                {
-                    self.show_snippet_choices(choices, selection.clone(), cx);
-                }
-
-                // If snippet state is not at the last tabstop, push it back on the stack
-                if snippet.active_index + 1 < snippet.ranges.len() {
-                    self.snippet_stack.push(snippet);
-                }
-                return true;
-            }
-        }
-
-        false
-    }
-
-    pub fn clear(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.transact(window, cx, |this, window, cx| {
-            this.select_all(&SelectAll, window, cx);
-            this.insert("", window, cx);
-        });
-    }
-
-    pub fn backspace(&mut self, _: &Backspace, window: &mut Window, cx: &mut Context<Self>) {
-        if self.read_only(cx) {
-            return;
-        }
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-        self.transact(window, cx, |this, window, cx| {
-            this.select_autoclose_pair(window, cx);
-
-            let display_map = this.display_map.update(cx, |map, cx| map.snapshot(cx));
-
-            let mut linked_ranges = HashMap::<_, Vec<_>>::default();
-            if !this.linked_edit_ranges.is_empty() {
-                let selections = this.selections.all::<MultiBufferPoint>(&display_map);
-                let snapshot = this.buffer.read(cx).snapshot(cx);
-
-                for selection in selections.iter() {
-                    let selection_start = snapshot.anchor_before(selection.start).text_anchor;
-                    let selection_end = snapshot.anchor_after(selection.end).text_anchor;
-                    if selection_start.buffer_id != selection_end.buffer_id {
-                        continue;
-                    }
-                    if let Some(ranges) =
-                        this.linked_editing_ranges_for(selection_start..selection_end, cx)
-                    {
-                        for (buffer, entries) in ranges {
-                            linked_ranges.entry(buffer).or_default().extend(entries);
-                        }
-                    }
-                }
-            }
-
-            let mut selections = this.selections.all::<MultiBufferPoint>(&display_map);
-            for selection in &mut selections {
-                if selection.is_empty() {
-                    let old_head = selection.head();
-                    let mut new_head =
-                        movement::left(&display_map, old_head.to_display_point(&display_map))
-                            .to_point(&display_map);
-                    if let Some((buffer, line_buffer_range)) = display_map
-                        .buffer_snapshot()
-                        .buffer_line_for_row(MultiBufferRow(old_head.row))
-                    {
-                        let indent_size = buffer.indent_size_for_line(line_buffer_range.start.row);
-                        let indent_len = match indent_size.kind {
-                            IndentKind::Space => {
-                                buffer.settings_at(line_buffer_range.start, cx).tab_size
-                            }
-                            IndentKind::Tab => NonZeroU32::new(1).unwrap(),
-                        };
-                        if old_head.column <= indent_size.len && old_head.column > 0 {
-                            let indent_len = indent_len.get();
-                            new_head = cmp::min(
-                                new_head,
-                                MultiBufferPoint::new(
-                                    old_head.row,
-                                    ((old_head.column - 1) / indent_len) * indent_len,
-                                ),
-                            );
-                        }
-                    }
-
-                    selection.set_head(new_head, SelectionGoal::None);
-                }
-            }
-
-            this.change_selections(Default::default(), window, cx, |s| s.select(selections));
-            this.insert("", window, cx);
-            let empty_str: Arc<str> = Arc::from("");
-            for (buffer, edits) in linked_ranges {
-                let snapshot = buffer.read(cx).snapshot();
-                use text::ToPoint as TP;
-
-                let edits = edits
-                    .into_iter()
-                    .map(|range| {
-                        let end_point = TP::to_point(&range.end, &snapshot);
-                        let mut start_point = TP::to_point(&range.start, &snapshot);
-
-                        if end_point == start_point {
-                            let offset = text::ToOffset::to_offset(&range.start, &snapshot)
-                                .saturating_sub(1);
-                            start_point =
-                                snapshot.clip_point(TP::to_point(&offset, &snapshot), Bias::Left);
-                        };
-
-                        (start_point..end_point, empty_str.clone())
-                    })
-                    .sorted_by_key(|(range, _)| range.start)
-                    .collect::<Vec<_>>();
-                buffer.update(cx, |this, cx| {
-                    this.edit(edits, None, cx);
-                })
-            }
-            this.refresh_edit_prediction(true, false, window, cx);
-            refresh_linked_ranges(this, window, cx);
-        });
-    }
-
-    pub fn delete(&mut self, _: &Delete, window: &mut Window, cx: &mut Context<Self>) {
-        if self.read_only(cx) {
-            return;
-        }
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-        self.transact(window, cx, |this, window, cx| {
-            this.change_selections(Default::default(), window, cx, |s| {
-                s.move_with(|map, selection| {
-                    if selection.is_empty() {
-                        let cursor = movement::right(map, selection.head());
-                        selection.end = cursor;
-                        selection.reversed = true;
-                        selection.goal = SelectionGoal::None;
-                    }
-                })
-            });
-            this.insert("", window, cx);
-            this.refresh_edit_prediction(true, false, window, cx);
-        });
-    }
-
-    pub fn backtab(&mut self, _: &Backtab, window: &mut Window, cx: &mut Context<Self>) {
-        if self.mode.is_single_line() {
-            cx.propagate();
-            return;
-        }
-
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-        if self.move_to_prev_snippet_tabstop(window, cx) {
-            return;
-        }
-        self.outdent(&Outdent, window, cx);
-    }
-
-    pub fn next_snippet_tabstop(
-        &mut self,
-        _: &NextSnippetTabstop,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.mode.is_single_line() || self.snippet_stack.is_empty() {
-            cx.propagate();
-            return;
-        }
-
-        if self.move_to_next_snippet_tabstop(window, cx) {
-            self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-            return;
-        }
-        cx.propagate();
-    }
-
-    pub fn previous_snippet_tabstop(
-        &mut self,
-        _: &PreviousSnippetTabstop,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.mode.is_single_line() || self.snippet_stack.is_empty() {
-            cx.propagate();
-            return;
-        }
-
-        if self.move_to_prev_snippet_tabstop(window, cx) {
-            self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-            return;
-        }
-        cx.propagate();
-    }
-
-    pub fn tab(&mut self, _: &Tab, window: &mut Window, cx: &mut Context<Self>) {
-        if self.mode.is_single_line() {
-            cx.propagate();
-            return;
-        }
-
-        if self.move_to_next_snippet_tabstop(window, cx) {
-            self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-            return;
-        }
-        if self.read_only(cx) {
-            return;
-        }
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-        let mut selections = self.selections.all_adjusted(&self.display_snapshot(cx));
-        let buffer = self.buffer.read(cx);
-        let snapshot = buffer.snapshot(cx);
-        let rows_iter = selections.iter().map(|s| s.head().row);
-        let suggested_indents = snapshot.suggested_indents(rows_iter, cx);
-
-        let has_some_cursor_in_whitespace = selections
-            .iter()
-            .filter(|selection| selection.is_empty())
-            .any(|selection| {
-                let cursor = selection.head();
-                let current_indent = snapshot.indent_size_for_line(MultiBufferRow(cursor.row));
-                cursor.column < current_indent.len
-            });
-
-        let mut edits = Vec::new();
-        let mut prev_edited_row = 0;
-        let mut row_delta = 0;
-        for selection in &mut selections {
-            if selection.start.row != prev_edited_row {
-                row_delta = 0;
-            }
-            prev_edited_row = selection.end.row;
-
-            // If the selection is non-empty, then increase the indentation of the selected lines.
-            if !selection.is_empty() {
-                row_delta =
-                    Self::indent_selection(buffer, &snapshot, selection, &mut edits, row_delta, cx);
-                continue;
-            }
-
-            let cursor = selection.head();
-            let current_indent = snapshot.indent_size_for_line(MultiBufferRow(cursor.row));
-            if let Some(suggested_indent) =
-                suggested_indents.get(&MultiBufferRow(cursor.row)).copied()
-            {
-                // Don't do anything if already at suggested indent
-                // and there is any other cursor which is not
-                if has_some_cursor_in_whitespace
-                    && cursor.column == current_indent.len
-                    && current_indent.len == suggested_indent.len
-                {
-                    continue;
-                }
-
-                // Adjust line and move cursor to suggested indent
-                // if cursor is not at suggested indent
-                if cursor.column < suggested_indent.len
-                    && cursor.column <= current_indent.len
-                    && current_indent.len <= suggested_indent.len
-                {
-                    selection.start = Point::new(cursor.row, suggested_indent.len);
-                    selection.end = selection.start;
-                    if row_delta == 0 {
-                        edits.extend(Buffer::edit_for_indent_size_adjustment(
-                            cursor.row,
-                            current_indent,
-                            suggested_indent,
-                        ));
-                        row_delta = suggested_indent.len - current_indent.len;
-                    }
-                    continue;
-                }
-
-                // If current indent is more than suggested indent
-                // only move cursor to current indent and skip indent
-                if cursor.column < current_indent.len && current_indent.len > suggested_indent.len {
-                    selection.start = Point::new(cursor.row, current_indent.len);
-                    selection.end = selection.start;
-                    continue;
-                }
-            }
-
-            // Otherwise, insert a hard or soft tab.
-            let settings = buffer.language_settings_at(cursor, cx);
-            let tab_size = if settings.hard_tabs {
-                IndentSize::tab()
-            } else {
-                let tab_size = settings.tab_size.get();
-                let indent_remainder = snapshot
-                    .text_for_range(Point::new(cursor.row, 0)..cursor)
-                    .flat_map(str::chars)
-                    .fold(row_delta % tab_size, |counter: u32, c| {
-                        if c == '\t' {
-                            0
-                        } else {
-                            (counter + 1) % tab_size
-                        }
-                    });
-
-                let chars_to_next_tab_stop = tab_size - indent_remainder;
-                IndentSize::spaces(chars_to_next_tab_stop)
-            };
-            selection.start = Point::new(cursor.row, cursor.column + row_delta + tab_size.len);
-            selection.end = selection.start;
-            edits.push((cursor..cursor, tab_size.chars().collect::<String>()));
-            row_delta += tab_size.len;
-        }
-
-        self.transact(window, cx, |this, window, cx| {
-            this.buffer.update(cx, |b, cx| b.edit(edits, None, cx));
-            this.change_selections(Default::default(), window, cx, |s| s.select(selections));
-            this.refresh_edit_prediction(true, false, window, cx);
-        });
-    }
-
-    pub fn indent(&mut self, _: &Indent, window: &mut Window, cx: &mut Context<Self>) {
-        if self.read_only(cx) {
-            return;
-        }
-        if self.mode.is_single_line() {
-            cx.propagate();
-            return;
-        }
-
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-        let mut selections = self.selections.all::<Point>(&self.display_snapshot(cx));
-        let mut prev_edited_row = 0;
-        let mut row_delta = 0;
-        let mut edits = Vec::new();
-        let buffer = self.buffer.read(cx);
-        let snapshot = buffer.snapshot(cx);
-        for selection in &mut selections {
-            if selection.start.row != prev_edited_row {
-                row_delta = 0;
-            }
-            prev_edited_row = selection.end.row;
-
-            row_delta =
-                Self::indent_selection(buffer, &snapshot, selection, &mut edits, row_delta, cx);
-        }
-
-        self.transact(window, cx, |this, window, cx| {
-            this.buffer.update(cx, |b, cx| b.edit(edits, None, cx));
-            this.change_selections(Default::default(), window, cx, |s| s.select(selections));
-        });
-    }
-
-    fn indent_selection(
-        buffer: &MultiBuffer,
-        snapshot: &MultiBufferSnapshot,
-        selection: &mut Selection<Point>,
-        edits: &mut Vec<(Range<Point>, String)>,
-        delta_for_start_row: u32,
-        cx: &App,
-    ) -> u32 {
-        let settings = buffer.language_settings_at(selection.start, cx);
-        let tab_size = settings.tab_size.get();
-        let indent_kind = if settings.hard_tabs {
-            IndentKind::Tab
-        } else {
-            IndentKind::Space
-        };
-        let mut start_row = selection.start.row;
-        let mut end_row = selection.end.row + 1;
-
-        // If a selection ends at the beginning of a line, don't indent
-        // that last line.
-        if selection.end.column == 0 && selection.end.row > selection.start.row {
-            end_row -= 1;
-        }
-
-        // Avoid re-indenting a row that has already been indented by a
-        // previous selection, but still update this selection's column
-        // to reflect that indentation.
-        if delta_for_start_row > 0 {
-            start_row += 1;
-            selection.start.column += delta_for_start_row;
-            if selection.end.row == selection.start.row {
-                selection.end.column += delta_for_start_row;
-            }
-        }
-
-        let mut delta_for_end_row = 0;
-        let has_multiple_rows = start_row + 1 != end_row;
-        for row in start_row..end_row {
-            let current_indent = snapshot.indent_size_for_line(MultiBufferRow(row));
-            let indent_delta = match (current_indent.kind, indent_kind) {
-                (IndentKind::Space, IndentKind::Space) => {
-                    let columns_to_next_tab_stop = tab_size - (current_indent.len % tab_size);
-                    IndentSize::spaces(columns_to_next_tab_stop)
-                }
-                (IndentKind::Tab, IndentKind::Space) => IndentSize::spaces(tab_size),
-                (_, IndentKind::Tab) => IndentSize::tab(),
-            };
-
-            let start = if has_multiple_rows || current_indent.len < selection.start.column {
-                0
-            } else {
-                selection.start.column
-            };
-            let row_start = Point::new(row, start);
-            edits.push((
-                row_start..row_start,
-                indent_delta.chars().collect::<String>(),
-            ));
-
-            // Update this selection's endpoints to reflect the indentation.
-            if row == selection.start.row {
-                selection.start.column += indent_delta.len;
-            }
-            if row == selection.end.row {
-                selection.end.column += indent_delta.len;
-                delta_for_end_row = indent_delta.len;
-            }
-        }
-
-        if selection.start.row == selection.end.row {
-            delta_for_start_row + delta_for_end_row
-        } else {
-            delta_for_end_row
-        }
-    }
-
-    pub fn outdent(&mut self, _: &Outdent, window: &mut Window, cx: &mut Context<Self>) {
-        if self.read_only(cx) {
-            return;
-        }
-        if self.mode.is_single_line() {
-            cx.propagate();
-            return;
-        }
-
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-        let selections = self.selections.all::<Point>(&display_map);
-        let mut deletion_ranges = Vec::new();
-        let mut last_outdent = None;
-        {
-            let buffer = self.buffer.read(cx);
-            let snapshot = buffer.snapshot(cx);
-            for selection in &selections {
-                let settings = buffer.language_settings_at(selection.start, cx);
-                let tab_size = settings.tab_size.get();
-                let mut rows = selection.spanned_rows(false, &display_map);
-
-                // Avoid re-outdenting a row that has already been outdented by a
-                // previous selection.
-                if let Some(last_row) = last_outdent
-                    && last_row == rows.start
-                {
-                    rows.start = rows.start.next_row();
-                }
-                let has_multiple_rows = rows.len() > 1;
-                for row in rows.iter_rows() {
-                    let indent_size = snapshot.indent_size_for_line(row);
-                    if indent_size.len > 0 {
-                        let deletion_len = match indent_size.kind {
-                            IndentKind::Space => {
-                                let columns_to_prev_tab_stop = indent_size.len % tab_size;
-                                if columns_to_prev_tab_stop == 0 {
-                                    tab_size
-                                } else {
-                                    columns_to_prev_tab_stop
-                                }
-                            }
-                            IndentKind::Tab => 1,
-                        };
-                        let start = if has_multiple_rows
-                            || deletion_len > selection.start.column
-                            || indent_size.len < selection.start.column
-                        {
-                            0
-                        } else {
-                            selection.start.column - deletion_len
-                        };
-                        deletion_ranges.push(
-                            Point::new(row.0, start)..Point::new(row.0, start + deletion_len),
-                        );
-                        last_outdent = Some(row);
-                    }
-                }
-            }
-        }
-
-        self.transact(window, cx, |this, window, cx| {
-            this.buffer.update(cx, |buffer, cx| {
-                let empty_str: Arc<str> = Arc::default();
-                buffer.edit(
-                    deletion_ranges
-                        .into_iter()
-                        .map(|range| (range, empty_str.clone())),
-                    None,
-                    cx,
-                );
-            });
-            let selections = this
-                .selections
-                .all::<MultiBufferOffset>(&this.display_snapshot(cx));
-            this.change_selections(Default::default(), window, cx, |s| s.select(selections));
-        });
-    }
-
-    pub fn autoindent(&mut self, _: &AutoIndent, window: &mut Window, cx: &mut Context<Self>) {
-        if self.read_only(cx) {
-            return;
-        }
-        if self.mode.is_single_line() {
-            cx.propagate();
-            return;
-        }
-
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-        let selections = self
-            .selections
-            .all::<MultiBufferOffset>(&self.display_snapshot(cx))
-            .into_iter()
-            .map(|s| s.range());
-
-        self.transact(window, cx, |this, window, cx| {
-            this.buffer.update(cx, |buffer, cx| {
-                buffer.autoindent_ranges(selections, cx);
-            });
-            let selections = this
-                .selections
-                .all::<MultiBufferOffset>(&this.display_snapshot(cx));
-            this.change_selections(Default::default(), window, cx, |s| s.select(selections));
-        });
-    }
-
-    pub fn delete_line(&mut self, _: &DeleteLine, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-        let selections = self.selections.all::<Point>(&display_map);
-
-        let mut new_cursors = Vec::new();
-        let mut edit_ranges = Vec::new();
-        let mut selections = selections.iter().peekable();
-        while let Some(selection) = selections.next() {
-            let mut rows = selection.spanned_rows(false, &display_map);
-
-            // Accumulate contiguous regions of rows that we want to delete.
-            while let Some(next_selection) = selections.peek() {
-                let next_rows = next_selection.spanned_rows(false, &display_map);
-                if next_rows.start <= rows.end {
-                    rows.end = next_rows.end;
-                    selections.next().unwrap();
-                } else {
-                    break;
-                }
-            }
-
-            let buffer = display_map.buffer_snapshot();
-            let mut edit_start = ToOffset::to_offset(&Point::new(rows.start.0, 0), buffer);
-            let (edit_end, target_row) = if buffer.max_point().row >= rows.end.0 {
-                // If there's a line after the range, delete the \n from the end of the row range
-                (
-                    ToOffset::to_offset(&Point::new(rows.end.0, 0), buffer),
-                    rows.end,
-                )
-            } else {
-                // If there isn't a line after the range, delete the \n from the line before the
-                // start of the row range
-                edit_start = edit_start.saturating_sub_usize(1);
-                (buffer.len(), rows.start.previous_row())
-            };
-
-            let text_layout_details = self.text_layout_details(window);
-            let x = display_map.x_for_display_point(
-                selection.head().to_display_point(&display_map),
-                &text_layout_details,
-            );
-            let row = Point::new(target_row.0, 0)
-                .to_display_point(&display_map)
-                .row();
-            let column = display_map.display_column_for_x(row, x, &text_layout_details);
-
-            new_cursors.push((
-                selection.id,
-                buffer.anchor_after(DisplayPoint::new(row, column).to_point(&display_map)),
-                SelectionGoal::None,
-            ));
-            edit_ranges.push(edit_start..edit_end);
-        }
-
-        self.transact(window, cx, |this, window, cx| {
-            let buffer = this.buffer.update(cx, |buffer, cx| {
-                let empty_str: Arc<str> = Arc::default();
-                buffer.edit(
-                    edit_ranges
-                        .into_iter()
-                        .map(|range| (range, empty_str.clone())),
-                    None,
-                    cx,
-                );
-                buffer.snapshot(cx)
-            });
-            let new_selections = new_cursors
-                .into_iter()
-                .map(|(id, cursor, goal)| {
-                    let cursor = cursor.to_point(&buffer);
-                    Selection {
-                        id,
-                        start: cursor,
-                        end: cursor,
-                        reversed: false,
-                        goal,
-                    }
-                })
-                .collect();
-
-            this.change_selections(Default::default(), window, cx, |s| {
-                s.select(new_selections);
-            });
-        });
-    }
-
-    pub fn join_lines_impl(
-        &mut self,
-        insert_whitespace: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.read_only(cx) {
-            return;
-        }
-        let mut row_ranges = Vec::<Range<MultiBufferRow>>::new();
-        for selection in self.selections.all::<Point>(&self.display_snapshot(cx)) {
-            let start = MultiBufferRow(selection.start.row);
-            // Treat single line selections as if they include the next line. Otherwise this action
-            // would do nothing for single line selections individual cursors.
-            let end = if selection.start.row == selection.end.row {
-                MultiBufferRow(selection.start.row + 1)
-            } else {
-                MultiBufferRow(selection.end.row)
-            };
-
-            if let Some(last_row_range) = row_ranges.last_mut()
-                && start <= last_row_range.end
-            {
-                last_row_range.end = end;
-                continue;
-            }
-            row_ranges.push(start..end);
-        }
-
-        let snapshot = self.buffer.read(cx).snapshot(cx);
-        let mut cursor_positions = Vec::new();
-        for row_range in &row_ranges {
-            let anchor = snapshot.anchor_before(Point::new(
-                row_range.end.previous_row().0,
-                snapshot.line_len(row_range.end.previous_row()),
-            ));
-            cursor_positions.push(anchor..anchor);
-        }
-
-        self.transact(window, cx, |this, window, cx| {
-            for row_range in row_ranges.into_iter().rev() {
-                for row in row_range.iter_rows().rev() {
-                    let end_of_line = Point::new(row.0, snapshot.line_len(row));
-                    let next_line_row = row.next_row();
-                    let indent = snapshot.indent_size_for_line(next_line_row);
-                    let start_of_next_line = Point::new(next_line_row.0, indent.len);
-
-                    let replace =
-                        if snapshot.line_len(next_line_row) > indent.len && insert_whitespace {
-                            " "
-                        } else {
-                            ""
-                        };
-
-                    this.buffer.update(cx, |buffer, cx| {
-                        buffer.edit([(end_of_line..start_of_next_line, replace)], None, cx)
-                    });
-                }
-            }
-
-            this.change_selections(Default::default(), window, cx, |s| {
-                s.select_anchor_ranges(cursor_positions)
-            });
-        });
-    }
-
-    pub fn join_lines(&mut self, _: &JoinLines, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-        self.join_lines_impl(true, window, cx);
-    }
-
-    pub fn sort_lines_case_sensitive(
-        &mut self,
-        _: &SortLinesCaseSensitive,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.manipulate_immutable_lines(window, cx, |lines| lines.sort())
-    }
-
-    pub fn sort_lines_by_length(
-        &mut self,
-        _: &SortLinesByLength,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.manipulate_immutable_lines(window, cx, |lines| {
-            lines.sort_by_key(|&line| line.chars().count())
-        })
-    }
-
-    pub fn sort_lines_case_insensitive(
-        &mut self,
-        _: &SortLinesCaseInsensitive,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.manipulate_immutable_lines(window, cx, |lines| {
-            lines.sort_by_key(|line| line.to_lowercase())
-        })
-    }
-
-    pub fn unique_lines_case_insensitive(
-        &mut self,
-        _: &UniqueLinesCaseInsensitive,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.manipulate_immutable_lines(window, cx, |lines| {
-            let mut seen = HashSet::default();
-            lines.retain(|line| seen.insert(line.to_lowercase()));
-        })
-    }
-
-    pub fn unique_lines_case_sensitive(
-        &mut self,
-        _: &UniqueLinesCaseSensitive,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.manipulate_immutable_lines(window, cx, |lines| {
-            let mut seen = HashSet::default();
-            lines.retain(|line| seen.insert(*line));
-        })
-    }
-
-    fn enable_wrap_selections_in_tag(&self, cx: &App) -> bool {
-        let snapshot = self.buffer.read(cx).snapshot(cx);
-        for selection in self.selections.disjoint_anchors_arc().iter() {
-            if snapshot
-                .language_at(selection.start)
-                .and_then(|lang| lang.config().wrap_characters.as_ref())
-                .is_some()
-            {
-                return true;
-            }
-        }
-        false
-    }
-
-    fn wrap_selections_in_tag(
-        &mut self,
-        _: &WrapSelectionsInTag,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-
-        let snapshot = self.buffer.read(cx).snapshot(cx);
-
-        let mut edits = Vec::new();
-        let mut boundaries = Vec::new();
-
-        for selection in self
-            .selections
-            .all_adjusted(&self.display_snapshot(cx))
-            .iter()
-        {
-            let Some(wrap_config) = snapshot
-                .language_at(selection.start)
-                .and_then(|lang| lang.config().wrap_characters.clone())
-            else {
-                continue;
-            };
-
-            let open_tag = format!("{}{}", wrap_config.start_prefix, wrap_config.start_suffix);
-            let close_tag = format!("{}{}", wrap_config.end_prefix, wrap_config.end_suffix);
-
-            let start_before = snapshot.anchor_before(selection.start);
-            let end_after = snapshot.anchor_after(selection.end);
-
-            edits.push((start_before..start_before, open_tag));
-            edits.push((end_after..end_after, close_tag));
-
-            boundaries.push((
-                start_before,
-                end_after,
-                wrap_config.start_prefix.len(),
-                wrap_config.end_suffix.len(),
-            ));
-        }
-
-        if edits.is_empty() {
-            return;
-        }
-
-        self.transact(window, cx, |this, window, cx| {
-            let buffer = this.buffer.update(cx, |buffer, cx| {
-                buffer.edit(edits, None, cx);
-                buffer.snapshot(cx)
-            });
-
-            let mut new_selections = Vec::with_capacity(boundaries.len() * 2);
-            for (start_before, end_after, start_prefix_len, end_suffix_len) in
-                boundaries.into_iter()
-            {
-                let open_offset = start_before.to_offset(&buffer) + start_prefix_len;
-                let close_offset = end_after
-                    .to_offset(&buffer)
-                    .saturating_sub_usize(end_suffix_len);
-                new_selections.push(open_offset..open_offset);
-                new_selections.push(close_offset..close_offset);
-            }
-
-            this.change_selections(Default::default(), window, cx, |s| {
-                s.select_ranges(new_selections);
-            });
-
-            this.request_autoscroll(Autoscroll::fit(), cx);
-        });
-    }
-
-    pub fn reload_file(&mut self, _: &ReloadFile, window: &mut Window, cx: &mut Context<Self>) {
-        let Some(project) = self.project.clone() else {
-            return;
-        };
-        self.reload(project, window, cx)
-            .detach_and_notify_err(window, cx);
-    }
-
-    pub fn restore_file(
-        &mut self,
-        _: &::git::RestoreFile,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-        let mut buffer_ids = HashSet::default();
-        let snapshot = self.buffer().read(cx).snapshot(cx);
-        for selection in self
-            .selections
-            .all::<MultiBufferOffset>(&self.display_snapshot(cx))
-        {
-            buffer_ids.extend(snapshot.buffer_ids_for_range(selection.range()))
-        }
-
-        let buffer = self.buffer().read(cx);
-        let ranges = buffer_ids
-            .into_iter()
-            .flat_map(|buffer_id| buffer.excerpt_ranges_for_buffer(buffer_id, cx))
-            .collect::<Vec<_>>();
-
-        self.restore_hunks_in_ranges(ranges, window, cx);
-    }
-
-    pub fn git_restore(&mut self, _: &Restore, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-        let selections = self
-            .selections
-            .all(&self.display_snapshot(cx))
-            .into_iter()
-            .map(|s| s.range())
-            .collect();
-        self.restore_hunks_in_ranges(selections, window, cx);
-    }
-
-    pub fn restore_hunks_in_ranges(
-        &mut self,
-        ranges: Vec<Range<Point>>,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) {
-        let mut revert_changes = HashMap::default();
-        let chunk_by = self
-            .snapshot(window, cx)
-            .hunks_for_ranges(ranges)
-            .into_iter()
-            .chunk_by(|hunk| hunk.buffer_id);
-        for (buffer_id, hunks) in &chunk_by {
-            let hunks = hunks.collect::<Vec<_>>();
-            for hunk in &hunks {
-                self.prepare_restore_change(&mut revert_changes, hunk, cx);
-            }
-            self.do_stage_or_unstage(false, buffer_id, hunks.into_iter(), cx);
-        }
-        drop(chunk_by);
-        if !revert_changes.is_empty() {
-            self.transact(window, cx, |editor, window, cx| {
-                editor.restore(revert_changes, window, cx);
-            });
-        }
-    }
-
-    pub fn status_for_buffer_id(&self, buffer_id: BufferId, cx: &App) -> Option<FileStatus> {
-        if let Some(status) = self
-            .addons
-            .iter()
-            .find_map(|(_, addon)| addon.override_status_for_buffer_id(buffer_id, cx))
-        {
-            return Some(status);
-        }
-        self.project
-            .as_ref()?
-            .read(cx)
-            .status_for_buffer_id(buffer_id, cx)
-    }
-
-    pub fn open_active_item_in_terminal(
-        &mut self,
-        _: &OpenInTerminal,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(working_directory) = self.active_excerpt(cx).and_then(|(_, buffer, _)| {
-            let project_path = buffer.read(cx).project_path(cx)?;
-            let project = self.project()?.read(cx);
-            let entry = project.entry_for_path(&project_path, cx)?;
-            let parent = match &entry.canonical_path {
-                Some(canonical_path) => canonical_path.to_path_buf(),
-                None => project.absolute_path(&project_path, cx)?,
-            }
-            .parent()?
-            .to_path_buf();
-            Some(parent)
-        }) {
-            window.dispatch_action(OpenTerminal { working_directory }.boxed_clone(), cx);
-        }
-    }
-
-    fn set_breakpoint_context_menu(
-        &mut self,
-        display_row: DisplayRow,
-        position: Option<Anchor>,
-        clicked_point: gpui::Point<Pixels>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let source = self
-            .buffer
-            .read(cx)
-            .snapshot(cx)
-            .anchor_before(Point::new(display_row.0, 0u32));
-
-        let context_menu = self.breakpoint_context_menu(position.unwrap_or(source), window, cx);
-
-        self.mouse_context_menu = MouseContextMenu::pinned_to_editor(
-            self,
-            source,
-            clicked_point,
-            context_menu,
-            window,
-            cx,
-        );
-    }
-
-    fn add_edit_breakpoint_block(
-        &mut self,
-        anchor: Anchor,
-        breakpoint: &Breakpoint,
-        edit_action: BreakpointPromptEditAction,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let weak_editor = cx.weak_entity();
-        let bp_prompt = cx.new(|cx| {
-            BreakpointPromptEditor::new(
-                weak_editor,
-                anchor,
-                breakpoint.clone(),
-                edit_action,
-                window,
-                cx,
-            )
-        });
-
-        let height = bp_prompt.update(cx, |this, cx| {
-            this.prompt
-                .update(cx, |prompt, cx| prompt.max_point(cx).row().0 + 1 + 2)
-        });
-        let cloned_prompt = bp_prompt.clone();
-        let blocks = vec![BlockProperties {
-            style: BlockStyle::Sticky,
-            placement: BlockPlacement::Above(anchor),
-            height: Some(height),
-            render: Arc::new(move |cx| {
-                *cloned_prompt.read(cx).editor_margins.lock() = *cx.margins;
-                cloned_prompt.clone().into_any_element()
-            }),
-            priority: 0,
-        }];
-
-        let focus_handle = bp_prompt.focus_handle(cx);
-        window.focus(&focus_handle);
-
-        let block_ids = self.insert_blocks(blocks, None, cx);
-        bp_prompt.update(cx, |prompt, _| {
-            prompt.add_block_ids(block_ids);
-        });
-    }
-
-    pub(crate) fn breakpoint_at_row(
-        &self,
-        row: u32,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<(Anchor, Breakpoint)> {
-        let snapshot = self.snapshot(window, cx);
-        let breakpoint_position = snapshot.buffer_snapshot().anchor_before(Point::new(row, 0));
-
-        self.breakpoint_at_anchor(breakpoint_position, &snapshot, cx)
-    }
-
-    pub(crate) fn breakpoint_at_anchor(
-        &self,
-        breakpoint_position: Anchor,
-        snapshot: &EditorSnapshot,
-        cx: &mut Context<Self>,
-    ) -> Option<(Anchor, Breakpoint)> {
-        let buffer = self
-            .buffer
-            .read(cx)
-            .buffer_for_anchor(breakpoint_position, cx)?;
-
-        let enclosing_excerpt = breakpoint_position.excerpt_id;
-        let buffer_snapshot = buffer.read(cx).snapshot();
-
-        let row = buffer_snapshot
-            .summary_for_anchor::<text::PointUtf16>(&breakpoint_position.text_anchor)
-            .row;
-
-        let line_len = snapshot.buffer_snapshot().line_len(MultiBufferRow(row));
-        let anchor_end = snapshot
-            .buffer_snapshot()
-            .anchor_after(Point::new(row, line_len));
-
-        self.breakpoint_store
-            .as_ref()?
-            .read_with(cx, |breakpoint_store, cx| {
-                breakpoint_store
-                    .breakpoints(
-                        &buffer,
-                        Some(breakpoint_position.text_anchor..anchor_end.text_anchor),
-                        &buffer_snapshot,
-                        cx,
-                    )
-                    .next()
-                    .and_then(|(bp, _)| {
-                        let breakpoint_row = buffer_snapshot
-                            .summary_for_anchor::<text::PointUtf16>(&bp.position)
-                            .row;
-
-                        if breakpoint_row == row {
-                            snapshot
-                                .buffer_snapshot()
-                                .anchor_in_excerpt(enclosing_excerpt, bp.position)
-                                .map(|position| (position, bp.bp.clone()))
-                        } else {
-                            None
-                        }
-                    })
-            })
-    }
-
-    pub fn edit_log_breakpoint(
-        &mut self,
-        _: &EditLogBreakpoint,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.breakpoint_store.is_none() {
-            return;
-        }
-
-        for (anchor, breakpoint) in self.breakpoints_at_cursors(window, cx) {
-            let breakpoint = breakpoint.unwrap_or_else(|| Breakpoint {
-                message: None,
-                state: BreakpointState::Enabled,
-                condition: None,
-                hit_condition: None,
-            });
-
-            self.add_edit_breakpoint_block(
-                anchor,
-                &breakpoint,
-                BreakpointPromptEditAction::Log,
-                window,
-                cx,
-            );
-        }
-    }
-
-    fn breakpoints_at_cursors(
-        &self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Vec<(Anchor, Option<Breakpoint>)> {
-        let snapshot = self.snapshot(window, cx);
-        let cursors = self
-            .selections
-            .disjoint_anchors_arc()
-            .iter()
-            .map(|selection| {
-                let cursor_position: Point = selection.head().to_point(&snapshot.buffer_snapshot());
-
-                let breakpoint_position = self
-                    .breakpoint_at_row(cursor_position.row, window, cx)
-                    .map(|bp| bp.0)
-                    .unwrap_or_else(|| {
-                        snapshot
-                            .display_snapshot
-                            .buffer_snapshot()
-                            .anchor_after(Point::new(cursor_position.row, 0))
-                    });
-
-                let breakpoint = self
-                    .breakpoint_at_anchor(breakpoint_position, &snapshot, cx)
-                    .map(|(anchor, breakpoint)| (anchor, Some(breakpoint)));
-
-                breakpoint.unwrap_or_else(|| (breakpoint_position, None))
-            })
-            // There might be multiple cursors on the same line; all of them should have the same anchors though as their breakpoints positions, which makes it possible to sort and dedup the list.
-            .collect::<HashMap<Anchor, _>>();
-
-        cursors.into_iter().collect()
-    }
-
-    pub fn enable_breakpoint(
-        &mut self,
-        _: &crate::actions::EnableBreakpoint,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.breakpoint_store.is_none() {
-            return;
-        }
-
-        for (anchor, breakpoint) in self.breakpoints_at_cursors(window, cx) {
-            let Some(breakpoint) = breakpoint.filter(|breakpoint| breakpoint.is_disabled()) else {
-                continue;
-            };
-            self.edit_breakpoint_at_anchor(
-                anchor,
-                breakpoint,
-                BreakpointEditAction::InvertState,
-                cx,
-            );
-        }
-    }
-
-    pub fn disable_breakpoint(
-        &mut self,
-        _: &crate::actions::DisableBreakpoint,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.breakpoint_store.is_none() {
-            return;
-        }
-
-        for (anchor, breakpoint) in self.breakpoints_at_cursors(window, cx) {
-            let Some(breakpoint) = breakpoint.filter(|breakpoint| breakpoint.is_enabled()) else {
-                continue;
-            };
-            self.edit_breakpoint_at_anchor(
-                anchor,
-                breakpoint,
-                BreakpointEditAction::InvertState,
-                cx,
-            );
-        }
-    }
-
-    pub fn toggle_breakpoint(
-        &mut self,
-        _: &crate::actions::ToggleBreakpoint,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.breakpoint_store.is_none() {
-            return;
-        }
-
-        for (anchor, breakpoint) in self.breakpoints_at_cursors(window, cx) {
-            if let Some(breakpoint) = breakpoint {
-                self.edit_breakpoint_at_anchor(
-                    anchor,
-                    breakpoint,
-                    BreakpointEditAction::Toggle,
-                    cx,
-                );
-            } else {
-                self.edit_breakpoint_at_anchor(
-                    anchor,
-                    Breakpoint::new_standard(),
-                    BreakpointEditAction::Toggle,
-                    cx,
-                );
-            }
-        }
-    }
-
-    pub fn edit_breakpoint_at_anchor(
-        &mut self,
-        breakpoint_position: Anchor,
-        breakpoint: Breakpoint,
-        edit_action: BreakpointEditAction,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(breakpoint_store) = &self.breakpoint_store else {
-            return;
-        };
-
-        let Some(buffer) = self
-            .buffer
-            .read(cx)
-            .buffer_for_anchor(breakpoint_position, cx)
-        else {
-            return;
-        };
-
-        breakpoint_store.update(cx, |breakpoint_store, cx| {
-            breakpoint_store.toggle_breakpoint(
-                buffer,
-                BreakpointWithPosition {
-                    position: breakpoint_position.text_anchor,
-                    bp: breakpoint,
-                },
-                edit_action,
-                cx,
-            );
-        });
-
-        cx.notify();
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn breakpoint_store(&self) -> Option<Entity<BreakpointStore>> {
-        self.breakpoint_store.clone()
-    }
-
-    pub fn prepare_restore_change(
-        &self,
-        revert_changes: &mut HashMap<BufferId, Vec<(Range<text::Anchor>, Rope)>>,
-        hunk: &MultiBufferDiffHunk,
-        cx: &mut App,
-    ) -> Option<()> {
-        if hunk.is_created_file() {
-            return None;
-        }
-        let buffer = self.buffer.read(cx);
-        let diff = buffer.diff_for(hunk.buffer_id)?;
-        let buffer = buffer.buffer(hunk.buffer_id)?;
-        let buffer = buffer.read(cx);
-        let original_text = diff
-            .read(cx)
-            .base_text()
-            .as_rope()
-            .slice(hunk.diff_base_byte_range.start.0..hunk.diff_base_byte_range.end.0);
-        let buffer_snapshot = buffer.snapshot();
-        let buffer_revert_changes = revert_changes.entry(buffer.remote_id()).or_default();
-        if let Err(i) = buffer_revert_changes.binary_search_by(|probe| {
-            probe
-                .0
-                .start
-                .cmp(&hunk.buffer_range.start, &buffer_snapshot)
-                .then(probe.0.end.cmp(&hunk.buffer_range.end, &buffer_snapshot))
-        }) {
-            buffer_revert_changes.insert(i, (hunk.buffer_range.clone(), original_text));
-            Some(())
-        } else {
-            None
-        }
-    }
-
-    pub fn reverse_lines(&mut self, _: &ReverseLines, window: &mut Window, cx: &mut Context<Self>) {
-        self.manipulate_immutable_lines(window, cx, |lines| lines.reverse())
-    }
-
-    pub fn shuffle_lines(&mut self, _: &ShuffleLines, window: &mut Window, cx: &mut Context<Self>) {
-        self.manipulate_immutable_lines(window, cx, |lines| lines.shuffle(&mut rand::rng()))
-    }
-
-    pub fn rotate_selections_forward(
-        &mut self,
-        _: &RotateSelectionsForward,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.rotate_selections(window, cx, false)
-    }
-
-    pub fn rotate_selections_backward(
-        &mut self,
-        _: &RotateSelectionsBackward,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.rotate_selections(window, cx, true)
-    }
-
-    fn rotate_selections(&mut self, window: &mut Window, cx: &mut Context<Self>, reverse: bool) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-        let display_snapshot = self.display_snapshot(cx);
-        let selections = self.selections.all::<MultiBufferOffset>(&display_snapshot);
-
-        if selections.len() < 2 {
-            return;
-        }
-
-        let (edits, new_selections) = {
-            let buffer = self.buffer.read(cx).read(cx);
-            let has_selections = selections.iter().any(|s| !s.is_empty());
-            if has_selections {
-                let mut selected_texts: Vec<String> = selections
-                    .iter()
-                    .map(|selection| {
-                        buffer
-                            .text_for_range(selection.start..selection.end)
-                            .collect()
-                    })
-                    .collect();
-
-                if reverse {
-                    selected_texts.rotate_left(1);
-                } else {
-                    selected_texts.rotate_right(1);
-                }
-
-                let mut offset_delta: i64 = 0;
-                let mut new_selections = Vec::new();
-                let edits: Vec<_> = selections
-                    .iter()
-                    .zip(selected_texts.iter())
-                    .map(|(selection, new_text)| {
-                        let old_len = (selection.end.0 - selection.start.0) as i64;
-                        let new_len = new_text.len() as i64;
-                        let adjusted_start =
-                            MultiBufferOffset((selection.start.0 as i64 + offset_delta) as usize);
-                        let adjusted_end =
-                            MultiBufferOffset((adjusted_start.0 as i64 + new_len) as usize);
-
-                        new_selections.push(Selection {
-                            id: selection.id,
-                            start: adjusted_start,
-                            end: adjusted_end,
-                            reversed: selection.reversed,
-                            goal: selection.goal,
-                        });
-
-                        offset_delta += new_len - old_len;
-                        (selection.start..selection.end, new_text.clone())
-                    })
-                    .collect();
-                (edits, new_selections)
-            } else {
-                let mut all_rows: Vec<u32> = selections
-                    .iter()
-                    .map(|selection| buffer.offset_to_point(selection.start).row)
-                    .collect();
-                all_rows.sort_unstable();
-                all_rows.dedup();
-
-                if all_rows.len() < 2 {
-                    return;
-                }
-
-                let line_ranges: Vec<Range<MultiBufferOffset>> = all_rows
-                    .iter()
-                    .map(|&row| {
-                        let start = Point::new(row, 0);
-                        let end = Point::new(row, buffer.line_len(MultiBufferRow(row)));
-                        buffer.point_to_offset(start)..buffer.point_to_offset(end)
-                    })
-                    .collect();
-
-                let mut line_texts: Vec<String> = line_ranges
-                    .iter()
-                    .map(|range| buffer.text_for_range(range.clone()).collect())
-                    .collect();
-
-                if reverse {
-                    line_texts.rotate_left(1);
-                } else {
-                    line_texts.rotate_right(1);
-                }
-
-                let edits = line_ranges
-                    .iter()
-                    .zip(line_texts.iter())
-                    .map(|(range, new_text)| (range.clone(), new_text.clone()))
-                    .collect();
-
-                let num_rows = all_rows.len();
-                let row_to_index: std::collections::HashMap<u32, usize> = all_rows
-                    .iter()
-                    .enumerate()
-                    .map(|(i, &row)| (row, i))
-                    .collect();
-
-                // Compute new line start offsets after rotation (handles CRLF)
-                let newline_len = line_ranges[1].start.0 - line_ranges[0].end.0;
-                let first_line_start = line_ranges[0].start.0;
-                let mut new_line_starts: Vec<usize> = vec![first_line_start];
-                for text in line_texts.iter().take(num_rows - 1) {
-                    let prev_start = *new_line_starts.last().unwrap();
-                    new_line_starts.push(prev_start + text.len() + newline_len);
-                }
-
-                let new_selections = selections
-                    .iter()
-                    .map(|selection| {
-                        let point = buffer.offset_to_point(selection.start);
-                        let old_index = row_to_index[&point.row];
-                        let new_index = if reverse {
-                            (old_index + num_rows - 1) % num_rows
-                        } else {
-                            (old_index + 1) % num_rows
-                        };
-                        let new_offset =
-                            MultiBufferOffset(new_line_starts[new_index] + point.column as usize);
-                        Selection {
-                            id: selection.id,
-                            start: new_offset,
-                            end: new_offset,
-                            reversed: selection.reversed,
-                            goal: selection.goal,
-                        }
-                    })
-                    .collect();
-
-                (edits, new_selections)
-            }
-        };
-
-        self.transact(window, cx, |this, window, cx| {
-            this.buffer.update(cx, |buffer, cx| {
-                buffer.edit(edits, None, cx);
-            });
-            this.change_selections(Default::default(), window, cx, |s| {
-                s.select(new_selections);
-            });
-        });
-    }
-
-    fn manipulate_lines<M>(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-        mut manipulate: M,
-    ) where
-        M: FnMut(&str) -> LineManipulationResult,
-    {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-        let buffer = self.buffer.read(cx).snapshot(cx);
-
-        let mut edits = Vec::new();
-
-        let selections = self.selections.all::<Point>(&display_map);
-        let mut selections = selections.iter().peekable();
-        let mut contiguous_row_selections = Vec::new();
-        let mut new_selections = Vec::new();
-        let mut added_lines = 0;
-        let mut removed_lines = 0;
-
-        while let Some(selection) = selections.next() {
-            let (start_row, end_row) = consume_contiguous_rows(
-                &mut contiguous_row_selections,
-                selection,
-                &display_map,
-                &mut selections,
-            );
-
-            let start_point = Point::new(start_row.0, 0);
-            let end_point = Point::new(
-                end_row.previous_row().0,
-                buffer.line_len(end_row.previous_row()),
-            );
-            let text = buffer
-                .text_for_range(start_point..end_point)
-                .collect::<String>();
-
-            let LineManipulationResult {
-                new_text,
-                line_count_before,
-                line_count_after,
-            } = manipulate(&text);
-
-            edits.push((start_point..end_point, new_text));
-
-            // Selections must change based on added and removed line count
-            let start_row =
-                MultiBufferRow(start_point.row + added_lines as u32 - removed_lines as u32);
-            let end_row = MultiBufferRow(start_row.0 + line_count_after.saturating_sub(1) as u32);
-            new_selections.push(Selection {
-                id: selection.id,
-                start: start_row,
-                end: end_row,
-                goal: SelectionGoal::None,
-                reversed: selection.reversed,
-            });
-
-            if line_count_after > line_count_before {
-                added_lines += line_count_after - line_count_before;
-            } else if line_count_before > line_count_after {
-                removed_lines += line_count_before - line_count_after;
-            }
-        }
-
-        self.transact(window, cx, |this, window, cx| {
-            let buffer = this.buffer.update(cx, |buffer, cx| {
-                buffer.edit(edits, None, cx);
-                buffer.snapshot(cx)
-            });
-
-            // Recalculate offsets on newly edited buffer
-            let new_selections = new_selections
-                .iter()
-                .map(|s| {
-                    let start_point = Point::new(s.start.0, 0);
-                    let end_point = Point::new(s.end.0, buffer.line_len(s.end));
-                    Selection {
-                        id: s.id,
-                        start: buffer.point_to_offset(start_point),
-                        end: buffer.point_to_offset(end_point),
-                        goal: s.goal,
-                        reversed: s.reversed,
-                    }
-                })
-                .collect();
-
-            this.change_selections(Default::default(), window, cx, |s| {
-                s.select(new_selections);
-            });
-
-            this.request_autoscroll(Autoscroll::fit(), cx);
-        });
-    }
-
-    fn manipulate_immutable_lines<Fn>(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-        mut callback: Fn,
-    ) where
-        Fn: FnMut(&mut Vec<&str>),
-    {
-        self.manipulate_lines(window, cx, |text| {
-            let mut lines: Vec<&str> = text.split('\n').collect();
-            let line_count_before = lines.len();
-
-            callback(&mut lines);
-
-            LineManipulationResult {
-                new_text: lines.join("\n"),
-                line_count_before,
-                line_count_after: lines.len(),
-            }
-        });
-    }
-
-    fn manipulate_mutable_lines<Fn>(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-        mut callback: Fn,
-    ) where
-        Fn: FnMut(&mut Vec<Cow<'_, str>>),
-    {
-        self.manipulate_lines(window, cx, |text| {
-            let mut lines: Vec<Cow<str>> = text.split('\n').map(Cow::from).collect();
-            let line_count_before = lines.len();
-
-            callback(&mut lines);
-
-            LineManipulationResult {
-                new_text: lines.join("\n"),
-                line_count_before,
-                line_count_after: lines.len(),
-            }
-        });
-    }
-
-    pub fn convert_indentation_to_spaces(
-        &mut self,
-        _: &ConvertIndentationToSpaces,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let settings = self.buffer.read(cx).language_settings(cx);
-        let tab_size = settings.tab_size.get() as usize;
-
-        self.manipulate_mutable_lines(window, cx, |lines| {
-            // Allocates a reasonably sized scratch buffer once for the whole loop
-            let mut reindented_line = String::with_capacity(MAX_LINE_LEN);
-            // Avoids recomputing spaces that could be inserted many times
-            let space_cache: Vec<Vec<char>> = (1..=tab_size)
-                .map(|n| IndentSize::spaces(n as u32).chars().collect())
-                .collect();
-
-            for line in lines.iter_mut().filter(|line| !line.is_empty()) {
-                let mut chars = line.as_ref().chars();
-                let mut col = 0;
-                let mut changed = false;
-
-                for ch in chars.by_ref() {
-                    match ch {
-                        ' ' => {
-                            reindented_line.push(' ');
-                            col += 1;
-                        }
-                        '\t' => {
-                            // \t are converted to spaces depending on the current column
-                            let spaces_len = tab_size - (col % tab_size);
-                            reindented_line.extend(&space_cache[spaces_len - 1]);
-                            col += spaces_len;
-                            changed = true;
-                        }
-                        _ => {
-                            // If we dont append before break, the character is consumed
-                            reindented_line.push(ch);
-                            break;
-                        }
-                    }
-                }
-
-                if !changed {
-                    reindented_line.clear();
-                    continue;
-                }
-                // Append the rest of the line and replace old reference with new one
-                reindented_line.extend(chars);
-                *line = Cow::Owned(reindented_line.clone());
-                reindented_line.clear();
-            }
-        });
-    }
-
-    pub fn convert_indentation_to_tabs(
-        &mut self,
-        _: &ConvertIndentationToTabs,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let settings = self.buffer.read(cx).language_settings(cx);
-        let tab_size = settings.tab_size.get() as usize;
-
-        self.manipulate_mutable_lines(window, cx, |lines| {
-            // Allocates a reasonably sized buffer once for the whole loop
-            let mut reindented_line = String::with_capacity(MAX_LINE_LEN);
-            // Avoids recomputing spaces that could be inserted many times
-            let space_cache: Vec<Vec<char>> = (1..=tab_size)
-                .map(|n| IndentSize::spaces(n as u32).chars().collect())
-                .collect();
-
-            for line in lines.iter_mut().filter(|line| !line.is_empty()) {
-                let mut chars = line.chars();
-                let mut spaces_count = 0;
-                let mut first_non_indent_char = None;
-                let mut changed = false;
-
-                for ch in chars.by_ref() {
-                    match ch {
-                        ' ' => {
-                            // Keep track of spaces. Append \t when we reach tab_size
-                            spaces_count += 1;
-                            changed = true;
-                            if spaces_count == tab_size {
-                                reindented_line.push('\t');
-                                spaces_count = 0;
-                            }
-                        }
-                        '\t' => {
-                            reindented_line.push('\t');
-                            spaces_count = 0;
-                        }
-                        _ => {
-                            // Dont append it yet, we might have remaining spaces
-                            first_non_indent_char = Some(ch);
-                            break;
-                        }
-                    }
-                }
-
-                if !changed {
-                    reindented_line.clear();
-                    continue;
-                }
-                // Remaining spaces that didn't make a full tab stop
-                if spaces_count > 0 {
-                    reindented_line.extend(&space_cache[spaces_count - 1]);
-                }
-                // If we consume an extra character that was not indentation, add it back
-                if let Some(extra_char) = first_non_indent_char {
-                    reindented_line.push(extra_char);
-                }
-                // Append the rest of the line and replace old reference with new one
-                reindented_line.extend(chars);
-                *line = Cow::Owned(reindented_line.clone());
-                reindented_line.clear();
-            }
-        });
-    }
-
-    pub fn convert_to_upper_case(
-        &mut self,
-        _: &ConvertToUpperCase,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.manipulate_text(window, cx, |text| text.to_uppercase())
-    }
-
-    pub fn convert_to_lower_case(
-        &mut self,
-        _: &ConvertToLowerCase,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.manipulate_text(window, cx, |text| text.to_lowercase())
-    }
-
-    pub fn convert_to_title_case(
-        &mut self,
-        _: &ConvertToTitleCase,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.manipulate_text(window, cx, |text| {
-            text.split('\n')
-                .map(|line| line.to_case(Case::Title))
-                .join("\n")
-        })
-    }
-
-    pub fn convert_to_snake_case(
-        &mut self,
-        _: &ConvertToSnakeCase,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.manipulate_text(window, cx, |text| text.to_case(Case::Snake))
-    }
-
-    pub fn convert_to_kebab_case(
-        &mut self,
-        _: &ConvertToKebabCase,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.manipulate_text(window, cx, |text| text.to_case(Case::Kebab))
-    }
-
-    pub fn convert_to_upper_camel_case(
-        &mut self,
-        _: &ConvertToUpperCamelCase,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.manipulate_text(window, cx, |text| {
-            text.split('\n')
-                .map(|line| line.to_case(Case::UpperCamel))
-                .join("\n")
-        })
-    }
-
-    pub fn convert_to_lower_camel_case(
-        &mut self,
-        _: &ConvertToLowerCamelCase,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.manipulate_text(window, cx, |text| text.to_case(Case::Camel))
-    }
-
-    pub fn convert_to_opposite_case(
-        &mut self,
-        _: &ConvertToOppositeCase,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.manipulate_text(window, cx, |text| {
-            text.chars()
-                .fold(String::with_capacity(text.len()), |mut t, c| {
-                    if c.is_uppercase() {
-                        t.extend(c.to_lowercase());
-                    } else {
-                        t.extend(c.to_uppercase());
-                    }
-                    t
-                })
-        })
-    }
-
-    pub fn convert_to_sentence_case(
-        &mut self,
-        _: &ConvertToSentenceCase,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.manipulate_text(window, cx, |text| text.to_case(Case::Sentence))
-    }
-
-    pub fn toggle_case(&mut self, _: &ToggleCase, window: &mut Window, cx: &mut Context<Self>) {
-        self.manipulate_text(window, cx, |text| {
-            let has_upper_case_characters = text.chars().any(|c| c.is_uppercase());
-            if has_upper_case_characters {
-                text.to_lowercase()
-            } else {
-                text.to_uppercase()
-            }
-        })
-    }
-
-    pub fn convert_to_rot13(
-        &mut self,
-        _: &ConvertToRot13,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.manipulate_text(window, cx, |text| {
-            text.chars()
-                .map(|c| match c {
-                    'A'..='M' | 'a'..='m' => ((c as u8) + 13) as char,
-                    'N'..='Z' | 'n'..='z' => ((c as u8) - 13) as char,
-                    _ => c,
-                })
-                .collect()
-        })
-    }
-
-    pub fn convert_to_rot47(
-        &mut self,
-        _: &ConvertToRot47,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.manipulate_text(window, cx, |text| {
-            text.chars()
-                .map(|c| {
-                    let code_point = c as u32;
-                    if code_point >= 33 && code_point <= 126 {
-                        return char::from_u32(33 + ((code_point + 14) % 94)).unwrap();
-                    }
-                    c
-                })
-                .collect()
-        })
-    }
-
-    fn manipulate_text<Fn>(&mut self, window: &mut Window, cx: &mut Context<Self>, mut callback: Fn)
-    where
-        Fn: FnMut(&str) -> String,
-    {
-        let buffer = self.buffer.read(cx).snapshot(cx);
-
-        let mut new_selections = Vec::new();
-        let mut edits = Vec::new();
-        let mut selection_adjustment = 0isize;
-
-        for selection in self.selections.all_adjusted(&self.display_snapshot(cx)) {
-            let selection_is_empty = selection.is_empty();
-
-            let (start, end) = if selection_is_empty {
-                let (word_range, _) = buffer.surrounding_word(selection.start, None);
-                (word_range.start, word_range.end)
-            } else {
-                (
-                    buffer.point_to_offset(selection.start),
-                    buffer.point_to_offset(selection.end),
-                )
-            };
-
-            let text = buffer.text_for_range(start..end).collect::<String>();
-            let old_length = text.len() as isize;
-            let text = callback(&text);
-
-            new_selections.push(Selection {
-                start: MultiBufferOffset((start.0 as isize - selection_adjustment) as usize),
-                end: MultiBufferOffset(
-                    ((start.0 + text.len()) as isize - selection_adjustment) as usize,
-                ),
-                goal: SelectionGoal::None,
-                id: selection.id,
-                reversed: selection.reversed,
-            });
-
-            selection_adjustment += old_length - text.len() as isize;
-
-            edits.push((start..end, text));
-        }
-
-        self.transact(window, cx, |this, window, cx| {
-            this.buffer.update(cx, |buffer, cx| {
-                buffer.edit(edits, None, cx);
-            });
-
-            this.change_selections(Default::default(), window, cx, |s| {
-                s.select(new_selections);
-            });
-
-            this.request_autoscroll(Autoscroll::fit(), cx);
-        });
-    }
-
-    pub fn move_selection_on_drop(
-        &mut self,
-        selection: &Selection<Anchor>,
-        target: DisplayPoint,
-        is_cut: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-        let buffer = display_map.buffer_snapshot();
-        let mut edits = Vec::new();
-        let insert_point = display_map
-            .clip_point(target, Bias::Left)
-            .to_point(&display_map);
-        let text = buffer
-            .text_for_range(selection.start..selection.end)
-            .collect::<String>();
-        if is_cut {
-            edits.push(((selection.start..selection.end), String::new()));
-        }
-        let insert_anchor = buffer.anchor_before(insert_point);
-        edits.push(((insert_anchor..insert_anchor), text));
-        let last_edit_start = insert_anchor.bias_left(buffer);
-        let last_edit_end = insert_anchor.bias_right(buffer);
-        self.transact(window, cx, |this, window, cx| {
-            this.buffer.update(cx, |buffer, cx| {
-                buffer.edit(edits, None, cx);
-            });
-            this.change_selections(Default::default(), window, cx, |s| {
-                s.select_anchor_ranges([last_edit_start..last_edit_end]);
-            });
-        });
-    }
-
-    pub fn clear_selection_drag_state(&mut self) {
-        self.selection_drag_state = SelectionDragState::None;
-    }
-
-    pub fn duplicate(
-        &mut self,
-        upwards: bool,
-        whole_lines: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-        let buffer = display_map.buffer_snapshot();
-        let selections = self.selections.all::<Point>(&display_map);
-
-        let mut edits = Vec::new();
-        let mut selections_iter = selections.iter().peekable();
-        while let Some(selection) = selections_iter.next() {
-            let mut rows = selection.spanned_rows(false, &display_map);
-            // duplicate line-wise
-            if whole_lines || selection.start == selection.end {
-                // Avoid duplicating the same lines twice.
-                while let Some(next_selection) = selections_iter.peek() {
-                    let next_rows = next_selection.spanned_rows(false, &display_map);
-                    if next_rows.start < rows.end {
-                        rows.end = next_rows.end;
-                        selections_iter.next().unwrap();
-                    } else {
-                        break;
-                    }
-                }
-
-                // Copy the text from the selected row region and splice it either at the start
-                // or end of the region.
-                let start = Point::new(rows.start.0, 0);
-                let end = Point::new(
-                    rows.end.previous_row().0,
-                    buffer.line_len(rows.end.previous_row()),
-                );
-
-                let mut text = buffer.text_for_range(start..end).collect::<String>();
-
-                let insert_location = if upwards {
-                    // When duplicating upward, we need to insert before the current line.
-                    // If we're on the last line and it doesn't end with a newline,
-                    // we need to add a newline before the duplicated content.
-                    let needs_leading_newline = rows.end.0 >= buffer.max_point().row
-                        && buffer.max_point().column > 0
-                        && !text.ends_with('\n');
-
-                    if needs_leading_newline {
-                        text.insert(0, '\n');
-                        end
-                    } else {
-                        text.push('\n');
-                        Point::new(rows.start.0, 0)
-                    }
-                } else {
-                    text.push('\n');
-                    start
-                };
-                edits.push((insert_location..insert_location, text));
-            } else {
-                // duplicate character-wise
-                let start = selection.start;
-                let end = selection.end;
-                let text = buffer.text_for_range(start..end).collect::<String>();
-                edits.push((selection.end..selection.end, text));
-            }
-        }
-
-        self.transact(window, cx, |this, window, cx| {
-            this.buffer.update(cx, |buffer, cx| {
-                buffer.edit(edits, None, cx);
-            });
-
-            // When duplicating upward with whole lines, move the cursor to the duplicated line
-            if upwards && whole_lines {
-                let display_map = this.display_map.update(cx, |map, cx| map.snapshot(cx));
-
-                this.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    let mut new_ranges = Vec::new();
-                    let selections = s.all::<Point>(&display_map);
-                    let mut selections_iter = selections.iter().peekable();
-
-                    while let Some(first_selection) = selections_iter.next() {
-                        // Group contiguous selections together to find the total row span
-                        let mut group_selections = vec![first_selection];
-                        let mut rows = first_selection.spanned_rows(false, &display_map);
-
-                        while let Some(next_selection) = selections_iter.peek() {
-                            let next_rows = next_selection.spanned_rows(false, &display_map);
-                            if next_rows.start < rows.end {
-                                rows.end = next_rows.end;
-                                group_selections.push(selections_iter.next().unwrap());
-                            } else {
-                                break;
-                            }
-                        }
-
-                        let row_count = rows.end.0 - rows.start.0;
-
-                        // Move all selections in this group up by the total number of duplicated rows
-                        for selection in group_selections {
-                            let new_start = Point::new(
-                                selection.start.row.saturating_sub(row_count),
-                                selection.start.column,
-                            );
-
-                            let new_end = Point::new(
-                                selection.end.row.saturating_sub(row_count),
-                                selection.end.column,
-                            );
-
-                            new_ranges.push(new_start..new_end);
-                        }
-                    }
-
-                    s.select_ranges(new_ranges);
-                });
-            }
-
-            this.request_autoscroll(Autoscroll::fit(), cx);
-        });
-    }
-
-    pub fn duplicate_line_up(
-        &mut self,
-        _: &DuplicateLineUp,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.duplicate(true, true, window, cx);
-    }
-
-    pub fn duplicate_line_down(
-        &mut self,
-        _: &DuplicateLineDown,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.duplicate(false, true, window, cx);
-    }
-
-    pub fn duplicate_selection(
-        &mut self,
-        _: &DuplicateSelection,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.duplicate(false, false, window, cx);
-    }
-
-    pub fn move_line_up(&mut self, _: &MoveLineUp, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-        if self.mode.is_single_line() {
-            cx.propagate();
-            return;
-        }
-
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-        let buffer = self.buffer.read(cx).snapshot(cx);
-
-        let mut edits = Vec::new();
-        let mut unfold_ranges = Vec::new();
-        let mut refold_creases = Vec::new();
-
-        let selections = self.selections.all::<Point>(&display_map);
-        let mut selections = selections.iter().peekable();
-        let mut contiguous_row_selections = Vec::new();
-        let mut new_selections = Vec::new();
-
-        while let Some(selection) = selections.next() {
-            // Find all the selections that span a contiguous row range
-            let (start_row, end_row) = consume_contiguous_rows(
-                &mut contiguous_row_selections,
-                selection,
-                &display_map,
-                &mut selections,
-            );
-
-            // Move the text spanned by the row range to be before the line preceding the row range
-            if start_row.0 > 0 {
-                let range_to_move = Point::new(
-                    start_row.previous_row().0,
-                    buffer.line_len(start_row.previous_row()),
-                )
-                    ..Point::new(
-                        end_row.previous_row().0,
-                        buffer.line_len(end_row.previous_row()),
-                    );
-                let insertion_point = display_map
-                    .prev_line_boundary(Point::new(start_row.previous_row().0, 0))
-                    .0;
-
-                // Don't move lines across excerpts
-                if buffer
-                    .excerpt_containing(insertion_point..range_to_move.end)
-                    .is_some()
-                {
-                    let text = buffer
-                        .text_for_range(range_to_move.clone())
-                        .flat_map(|s| s.chars())
-                        .skip(1)
-                        .chain(['\n'])
-                        .collect::<String>();
-
-                    edits.push((
-                        buffer.anchor_after(range_to_move.start)
-                            ..buffer.anchor_before(range_to_move.end),
-                        String::new(),
-                    ));
-                    let insertion_anchor = buffer.anchor_after(insertion_point);
-                    edits.push((insertion_anchor..insertion_anchor, text));
-
-                    let row_delta = range_to_move.start.row - insertion_point.row + 1;
-
-                    // Move selections up
-                    new_selections.extend(contiguous_row_selections.drain(..).map(
-                        |mut selection| {
-                            selection.start.row -= row_delta;
-                            selection.end.row -= row_delta;
-                            selection
-                        },
-                    ));
-
-                    // Move folds up
-                    unfold_ranges.push(range_to_move.clone());
-                    for fold in display_map.folds_in_range(
-                        buffer.anchor_before(range_to_move.start)
-                            ..buffer.anchor_after(range_to_move.end),
-                    ) {
-                        let mut start = fold.range.start.to_point(&buffer);
-                        let mut end = fold.range.end.to_point(&buffer);
-                        start.row -= row_delta;
-                        end.row -= row_delta;
-                        refold_creases.push(Crease::simple(start..end, fold.placeholder.clone()));
-                    }
-                }
-            }
-
-            // If we didn't move line(s), preserve the existing selections
-            new_selections.append(&mut contiguous_row_selections);
-        }
-
-        self.transact(window, cx, |this, window, cx| {
-            this.unfold_ranges(&unfold_ranges, true, true, cx);
-            this.buffer.update(cx, |buffer, cx| {
-                for (range, text) in edits {
-                    buffer.edit([(range, text)], None, cx);
-                }
-            });
-            this.fold_creases(refold_creases, true, window, cx);
-            this.change_selections(Default::default(), window, cx, |s| {
-                s.select(new_selections);
-            })
-        });
-    }
-
-    pub fn move_line_down(
-        &mut self,
-        _: &MoveLineDown,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-        if self.mode.is_single_line() {
-            cx.propagate();
-            return;
-        }
-
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-        let buffer = self.buffer.read(cx).snapshot(cx);
-
-        let mut edits = Vec::new();
-        let mut unfold_ranges = Vec::new();
-        let mut refold_creases = Vec::new();
-
-        let selections = self.selections.all::<Point>(&display_map);
-        let mut selections = selections.iter().peekable();
-        let mut contiguous_row_selections = Vec::new();
-        let mut new_selections = Vec::new();
-
-        while let Some(selection) = selections.next() {
-            // Find all the selections that span a contiguous row range
-            let (start_row, end_row) = consume_contiguous_rows(
-                &mut contiguous_row_selections,
-                selection,
-                &display_map,
-                &mut selections,
-            );
-
-            // Move the text spanned by the row range to be after the last line of the row range
-            if end_row.0 <= buffer.max_point().row {
-                let range_to_move =
-                    MultiBufferPoint::new(start_row.0, 0)..MultiBufferPoint::new(end_row.0, 0);
-                let insertion_point = display_map
-                    .next_line_boundary(MultiBufferPoint::new(end_row.0, 0))
-                    .0;
-
-                // Don't move lines across excerpt boundaries
-                if buffer
-                    .excerpt_containing(range_to_move.start..insertion_point)
-                    .is_some()
-                {
-                    let mut text = String::from("\n");
-                    text.extend(buffer.text_for_range(range_to_move.clone()));
-                    text.pop(); // Drop trailing newline
-                    edits.push((
-                        buffer.anchor_after(range_to_move.start)
-                            ..buffer.anchor_before(range_to_move.end),
-                        String::new(),
-                    ));
-                    let insertion_anchor = buffer.anchor_after(insertion_point);
-                    edits.push((insertion_anchor..insertion_anchor, text));
-
-                    let row_delta = insertion_point.row - range_to_move.end.row + 1;
-
-                    // Move selections down
-                    new_selections.extend(contiguous_row_selections.drain(..).map(
-                        |mut selection| {
-                            selection.start.row += row_delta;
-                            selection.end.row += row_delta;
-                            selection
-                        },
-                    ));
-
-                    // Move folds down
-                    unfold_ranges.push(range_to_move.clone());
-                    for fold in display_map.folds_in_range(
-                        buffer.anchor_before(range_to_move.start)
-                            ..buffer.anchor_after(range_to_move.end),
-                    ) {
-                        let mut start = fold.range.start.to_point(&buffer);
-                        let mut end = fold.range.end.to_point(&buffer);
-                        start.row += row_delta;
-                        end.row += row_delta;
-                        refold_creases.push(Crease::simple(start..end, fold.placeholder.clone()));
-                    }
-                }
-            }
-
-            // If we didn't move line(s), preserve the existing selections
-            new_selections.append(&mut contiguous_row_selections);
-        }
-
-        self.transact(window, cx, |this, window, cx| {
-            this.unfold_ranges(&unfold_ranges, true, true, cx);
-            this.buffer.update(cx, |buffer, cx| {
-                for (range, text) in edits {
-                    buffer.edit([(range, text)], None, cx);
-                }
-            });
-            this.fold_creases(refold_creases, true, window, cx);
-            this.change_selections(Default::default(), window, cx, |s| s.select(new_selections));
-        });
-    }
-
-    pub fn transpose(&mut self, _: &Transpose, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-        let text_layout_details = &self.text_layout_details(window);
-        self.transact(window, cx, |this, window, cx| {
-            let edits = this.change_selections(Default::default(), window, cx, |s| {
-                let mut edits: Vec<(Range<MultiBufferOffset>, String)> = Default::default();
-                s.move_with(|display_map, selection| {
-                    if !selection.is_empty() {
-                        return;
-                    }
-
-                    let mut head = selection.head();
-                    let mut transpose_offset = head.to_offset(display_map, Bias::Right);
-                    if head.column() == display_map.line_len(head.row()) {
-                        transpose_offset = display_map
-                            .buffer_snapshot()
-                            .clip_offset(transpose_offset.saturating_sub_usize(1), Bias::Left);
-                    }
-
-                    if transpose_offset == MultiBufferOffset(0) {
-                        return;
-                    }
-
-                    *head.column_mut() += 1;
-                    head = display_map.clip_point(head, Bias::Right);
-                    let goal = SelectionGoal::HorizontalPosition(
-                        display_map
-                            .x_for_display_point(head, text_layout_details)
-                            .into(),
-                    );
-                    selection.collapse_to(head, goal);
-
-                    let transpose_start = display_map
-                        .buffer_snapshot()
-                        .clip_offset(transpose_offset.saturating_sub_usize(1), Bias::Left);
-                    if edits.last().is_none_or(|e| e.0.end <= transpose_start) {
-                        let transpose_end = display_map
-                            .buffer_snapshot()
-                            .clip_offset(transpose_offset + 1usize, Bias::Right);
-                        if let Some(ch) = display_map
-                            .buffer_snapshot()
-                            .chars_at(transpose_start)
-                            .next()
-                        {
-                            edits.push((transpose_start..transpose_offset, String::new()));
-                            edits.push((transpose_end..transpose_end, ch.to_string()));
-                        }
-                    }
-                });
-                edits
-            });
-            this.buffer
-                .update(cx, |buffer, cx| buffer.edit(edits, None, cx));
-            let selections = this
-                .selections
-                .all::<MultiBufferOffset>(&this.display_snapshot(cx));
-            this.change_selections(Default::default(), window, cx, |s| {
-                s.select(selections);
-            });
-        });
-    }
-
-    pub fn rewrap(&mut self, _: &Rewrap, _: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-        if self.mode.is_single_line() {
-            cx.propagate();
-            return;
-        }
-
-        self.rewrap_impl(RewrapOptions::default(), cx)
-    }
-
-    pub fn rewrap_impl(&mut self, options: RewrapOptions, cx: &mut Context<Self>) {
-        let buffer = self.buffer.read(cx).snapshot(cx);
-        let selections = self.selections.all::<Point>(&self.display_snapshot(cx));
-
-        #[derive(Clone, Debug, PartialEq)]
-        enum CommentFormat {
-            /// single line comment, with prefix for line
-            Line(String),
-            /// single line within a block comment, with prefix for line
-            BlockLine(String),
-            /// a single line of a block comment that includes the initial delimiter
-            BlockCommentWithStart(BlockCommentConfig),
-            /// a single line of a block comment that includes the ending delimiter
-            BlockCommentWithEnd(BlockCommentConfig),
-        }
-
-        // Split selections to respect paragraph, indent, and comment prefix boundaries.
-        let wrap_ranges = selections.into_iter().flat_map(|selection| {
-            let mut non_blank_rows_iter = (selection.start.row..=selection.end.row)
-                .filter(|row| !buffer.is_line_blank(MultiBufferRow(*row)))
-                .peekable();
-
-            let first_row = if let Some(&row) = non_blank_rows_iter.peek() {
-                row
-            } else {
-                return Vec::new();
-            };
-
-            let language_settings = buffer.language_settings_at(selection.head(), cx);
-            let language_scope = buffer.language_scope_at(selection.head());
-
-            let indent_and_prefix_for_row =
-                |row: u32| -> (IndentSize, Option<CommentFormat>, Option<String>) {
-                    let indent = buffer.indent_size_for_line(MultiBufferRow(row));
-                    let (comment_prefix, rewrap_prefix) = if let Some(language_scope) =
-                        &language_scope
-                    {
-                        let indent_end = Point::new(row, indent.len);
-                        let line_end = Point::new(row, buffer.line_len(MultiBufferRow(row)));
-                        let line_text_after_indent = buffer
-                            .text_for_range(indent_end..line_end)
-                            .collect::<String>();
-
-                        let is_within_comment_override = buffer
-                            .language_scope_at(indent_end)
-                            .is_some_and(|scope| scope.override_name() == Some("comment"));
-                        let comment_delimiters = if is_within_comment_override {
-                            // we are within a comment syntax node, but we don't
-                            // yet know what kind of comment: block, doc or line
-                            match (
-                                language_scope.documentation_comment(),
-                                language_scope.block_comment(),
-                            ) {
-                                (Some(config), _) | (_, Some(config))
-                                    if buffer.contains_str_at(indent_end, &config.start) =>
-                                {
-                                    Some(CommentFormat::BlockCommentWithStart(config.clone()))
-                                }
-                                (Some(config), _) | (_, Some(config))
-                                    if line_text_after_indent.ends_with(config.end.as_ref()) =>
-                                {
-                                    Some(CommentFormat::BlockCommentWithEnd(config.clone()))
-                                }
-                                (Some(config), _) | (_, Some(config))
-                                    if buffer.contains_str_at(indent_end, &config.prefix) =>
-                                {
-                                    Some(CommentFormat::BlockLine(config.prefix.to_string()))
-                                }
-                                (_, _) => language_scope
-                                    .line_comment_prefixes()
-                                    .iter()
-                                    .find(|prefix| buffer.contains_str_at(indent_end, prefix))
-                                    .map(|prefix| CommentFormat::Line(prefix.to_string())),
-                            }
-                        } else {
-                            // we not in an overridden comment node, but we may
-                            // be within a non-overridden line comment node
-                            language_scope
-                                .line_comment_prefixes()
-                                .iter()
-                                .find(|prefix| buffer.contains_str_at(indent_end, prefix))
-                                .map(|prefix| CommentFormat::Line(prefix.to_string()))
-                        };
-
-                        let rewrap_prefix = language_scope
-                            .rewrap_prefixes()
-                            .iter()
-                            .find_map(|prefix_regex| {
-                                prefix_regex.find(&line_text_after_indent).map(|mat| {
-                                    if mat.start() == 0 {
-                                        Some(mat.as_str().to_string())
-                                    } else {
-                                        None
-                                    }
-                                })
-                            })
-                            .flatten();
-                        (comment_delimiters, rewrap_prefix)
-                    } else {
-                        (None, None)
-                    };
-                    (indent, comment_prefix, rewrap_prefix)
-                };
-
-            let mut ranges = Vec::new();
-            let from_empty_selection = selection.is_empty();
-
-            let mut current_range_start = first_row;
-            let mut prev_row = first_row;
-            let (
-                mut current_range_indent,
-                mut current_range_comment_delimiters,
-                mut current_range_rewrap_prefix,
-            ) = indent_and_prefix_for_row(first_row);
-
-            for row in non_blank_rows_iter.skip(1) {
-                let has_paragraph_break = row > prev_row + 1;
-
-                let (row_indent, row_comment_delimiters, row_rewrap_prefix) =
-                    indent_and_prefix_for_row(row);
-
-                let has_indent_change = row_indent != current_range_indent;
-                let has_comment_change = row_comment_delimiters != current_range_comment_delimiters;
-
-                let has_boundary_change = has_comment_change
-                    || row_rewrap_prefix.is_some()
-                    || (has_indent_change && current_range_comment_delimiters.is_some());
-
-                if has_paragraph_break || has_boundary_change {
-                    ranges.push((
-                        language_settings.clone(),
-                        Point::new(current_range_start, 0)
-                            ..Point::new(prev_row, buffer.line_len(MultiBufferRow(prev_row))),
-                        current_range_indent,
-                        current_range_comment_delimiters.clone(),
-                        current_range_rewrap_prefix.clone(),
-                        from_empty_selection,
-                    ));
-                    current_range_start = row;
-                    current_range_indent = row_indent;
-                    current_range_comment_delimiters = row_comment_delimiters;
-                    current_range_rewrap_prefix = row_rewrap_prefix;
-                }
-                prev_row = row;
-            }
-
-            ranges.push((
-                language_settings.clone(),
-                Point::new(current_range_start, 0)
-                    ..Point::new(prev_row, buffer.line_len(MultiBufferRow(prev_row))),
-                current_range_indent,
-                current_range_comment_delimiters,
-                current_range_rewrap_prefix,
-                from_empty_selection,
-            ));
-
-            ranges
-        });
-
-        let mut edits = Vec::new();
-        let mut rewrapped_row_ranges = Vec::<RangeInclusive<u32>>::new();
-
-        for (
-            language_settings,
-            wrap_range,
-            mut indent_size,
-            comment_prefix,
-            rewrap_prefix,
-            from_empty_selection,
-        ) in wrap_ranges
-        {
-            let mut start_row = wrap_range.start.row;
-            let mut end_row = wrap_range.end.row;
-
-            // Skip selections that overlap with a range that has already been rewrapped.
-            let selection_range = start_row..end_row;
-            if rewrapped_row_ranges
-                .iter()
-                .any(|range| range.overlaps(&selection_range))
-            {
-                continue;
-            }
-
-            let tab_size = language_settings.tab_size;
-
-            let (line_prefix, inside_comment) = match &comment_prefix {
-                Some(CommentFormat::Line(prefix) | CommentFormat::BlockLine(prefix)) => {
-                    (Some(prefix.as_str()), true)
-                }
-                Some(CommentFormat::BlockCommentWithEnd(BlockCommentConfig { prefix, .. })) => {
-                    (Some(prefix.as_ref()), true)
-                }
-                Some(CommentFormat::BlockCommentWithStart(BlockCommentConfig {
-                    start: _,
-                    end: _,
-                    prefix,
-                    tab_size,
-                })) => {
-                    indent_size.len += tab_size;
-                    (Some(prefix.as_ref()), true)
-                }
-                None => (None, false),
-            };
-            let indent_prefix = indent_size.chars().collect::<String>();
-            let line_prefix = format!("{indent_prefix}{}", line_prefix.unwrap_or(""));
-
-            let allow_rewrap_based_on_language = match language_settings.allow_rewrap {
-                RewrapBehavior::InComments => inside_comment,
-                RewrapBehavior::InSelections => !wrap_range.is_empty(),
-                RewrapBehavior::Anywhere => true,
-            };
-
-            let should_rewrap = options.override_language_settings
-                || allow_rewrap_based_on_language
-                || self.hard_wrap.is_some();
-            if !should_rewrap {
-                continue;
-            }
-
-            if from_empty_selection {
-                'expand_upwards: while start_row > 0 {
-                    let prev_row = start_row - 1;
-                    if buffer.contains_str_at(Point::new(prev_row, 0), &line_prefix)
-                        && buffer.line_len(MultiBufferRow(prev_row)) as usize > line_prefix.len()
-                        && !buffer.is_line_blank(MultiBufferRow(prev_row))
-                    {
-                        start_row = prev_row;
-                    } else {
-                        break 'expand_upwards;
-                    }
-                }
-
-                'expand_downwards: while end_row < buffer.max_point().row {
-                    let next_row = end_row + 1;
-                    if buffer.contains_str_at(Point::new(next_row, 0), &line_prefix)
-                        && buffer.line_len(MultiBufferRow(next_row)) as usize > line_prefix.len()
-                        && !buffer.is_line_blank(MultiBufferRow(next_row))
-                    {
-                        end_row = next_row;
-                    } else {
-                        break 'expand_downwards;
-                    }
-                }
-            }
-
-            let start = Point::new(start_row, 0);
-            let start_offset = ToOffset::to_offset(&start, &buffer);
-            let end = Point::new(end_row, buffer.line_len(MultiBufferRow(end_row)));
-            let selection_text = buffer.text_for_range(start..end).collect::<String>();
-            let mut first_line_delimiter = None;
-            let mut last_line_delimiter = None;
-            let Some(lines_without_prefixes) = selection_text
-                .lines()
-                .enumerate()
-                .map(|(ix, line)| {
-                    let line_trimmed = line.trim_start();
-                    if rewrap_prefix.is_some() && ix > 0 {
-                        Ok(line_trimmed)
-                    } else if let Some(
-                        CommentFormat::BlockCommentWithStart(BlockCommentConfig {
-                            start,
-                            prefix,
-                            end,
-                            tab_size,
-                        })
-                        | CommentFormat::BlockCommentWithEnd(BlockCommentConfig {
-                            start,
-                            prefix,
-                            end,
-                            tab_size,
-                        }),
-                    ) = &comment_prefix
-                    {
-                        let line_trimmed = line_trimmed
-                            .strip_prefix(start.as_ref())
-                            .map(|s| {
-                                let mut indent_size = indent_size;
-                                indent_size.len -= tab_size;
-                                let indent_prefix: String = indent_size.chars().collect();
-                                first_line_delimiter = Some((indent_prefix, start));
-                                s.trim_start()
-                            })
-                            .unwrap_or(line_trimmed);
-                        let line_trimmed = line_trimmed
-                            .strip_suffix(end.as_ref())
-                            .map(|s| {
-                                last_line_delimiter = Some(end);
-                                s.trim_end()
-                            })
-                            .unwrap_or(line_trimmed);
-                        let line_trimmed = line_trimmed
-                            .strip_prefix(prefix.as_ref())
-                            .unwrap_or(line_trimmed);
-                        Ok(line_trimmed)
-                    } else if let Some(CommentFormat::BlockLine(prefix)) = &comment_prefix {
-                        line_trimmed.strip_prefix(prefix).with_context(|| {
-                            format!("line did not start with prefix {prefix:?}: {line:?}")
-                        })
-                    } else {
-                        line_trimmed
-                            .strip_prefix(&line_prefix.trim_start())
-                            .with_context(|| {
-                                format!("line did not start with prefix {line_prefix:?}: {line:?}")
-                            })
-                    }
-                })
-                .collect::<Result<Vec<_>, _>>()
-                .log_err()
-            else {
-                continue;
-            };
-
-            let wrap_column = self.hard_wrap.unwrap_or_else(|| {
-                buffer
-                    .language_settings_at(Point::new(start_row, 0), cx)
-                    .preferred_line_length as usize
-            });
-
-            let subsequent_lines_prefix = if let Some(rewrap_prefix_str) = &rewrap_prefix {
-                format!("{}{}", indent_prefix, " ".repeat(rewrap_prefix_str.len()))
-            } else {
-                line_prefix.clone()
-            };
-
-            let wrapped_text = {
-                let mut wrapped_text = wrap_with_prefix(
-                    line_prefix,
-                    subsequent_lines_prefix,
-                    lines_without_prefixes.join("\n"),
-                    wrap_column,
-                    tab_size,
-                    options.preserve_existing_whitespace,
-                );
-
-                if let Some((indent, delimiter)) = first_line_delimiter {
-                    wrapped_text = format!("{indent}{delimiter}\n{wrapped_text}");
-                }
-                if let Some(last_line) = last_line_delimiter {
-                    wrapped_text = format!("{wrapped_text}\n{indent_prefix}{last_line}");
-                }
-
-                wrapped_text
-            };
-
-            // TODO: should always use char-based diff while still supporting cursor behavior that
-            // matches vim.
-            let mut diff_options = DiffOptions::default();
-            if options.override_language_settings {
-                diff_options.max_word_diff_len = 0;
-                diff_options.max_word_diff_line_count = 0;
-            } else {
-                diff_options.max_word_diff_len = usize::MAX;
-                diff_options.max_word_diff_line_count = usize::MAX;
-            }
-
-            for (old_range, new_text) in
-                text_diff_with_options(&selection_text, &wrapped_text, diff_options)
-            {
-                let edit_start = buffer.anchor_after(start_offset + old_range.start);
-                let edit_end = buffer.anchor_after(start_offset + old_range.end);
-                edits.push((edit_start..edit_end, new_text));
-            }
-
-            rewrapped_row_ranges.push(start_row..=end_row);
-        }
-
-        self.buffer
-            .update(cx, |buffer, cx| buffer.edit(edits, None, cx));
-    }
-
-    pub fn cut_common(
-        &mut self,
-        cut_no_selection_line: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> ClipboardItem {
-        let mut text = String::new();
-        let buffer = self.buffer.read(cx).snapshot(cx);
-        let mut selections = self.selections.all::<Point>(&self.display_snapshot(cx));
-        let mut clipboard_selections = Vec::with_capacity(selections.len());
-        {
-            let max_point = buffer.max_point();
-            let mut is_first = true;
-            let mut prev_selection_was_entire_line = false;
-            for selection in &mut selections {
-                let is_entire_line =
-                    (selection.is_empty() && cut_no_selection_line) || self.selections.line_mode();
-                if is_entire_line {
-                    selection.start = Point::new(selection.start.row, 0);
-                    if !selection.is_empty() && selection.end.column == 0 {
-                        selection.end = cmp::min(max_point, selection.end);
-                    } else {
-                        selection.end = cmp::min(max_point, Point::new(selection.end.row + 1, 0));
-                    }
-                    selection.goal = SelectionGoal::None;
-                }
-                if is_first {
-                    is_first = false;
-                } else if !prev_selection_was_entire_line {
-                    text += "\n";
-                }
-                prev_selection_was_entire_line = is_entire_line;
-                let mut len = 0;
-                for chunk in buffer.text_for_range(selection.start..selection.end) {
-                    text.push_str(chunk);
-                    len += chunk.len();
-                }
-
-                clipboard_selections.push(ClipboardSelection::for_buffer(
-                    len,
-                    is_entire_line,
-                    selection.range(),
-                    &buffer,
-                    self.project.as_ref(),
-                    cx,
-                ));
-            }
-        }
-
-        self.transact(window, cx, |this, window, cx| {
-            this.change_selections(Default::default(), window, cx, |s| {
-                s.select(selections);
-            });
-            this.insert("", window, cx);
-        });
-        ClipboardItem::new_string_with_json_metadata(text, clipboard_selections)
-    }
-
-    pub fn cut(&mut self, _: &Cut, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-        let item = self.cut_common(true, window, cx);
-        cx.write_to_clipboard(item);
-    }
-
-    pub fn kill_ring_cut(&mut self, _: &KillRingCut, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-        self.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.move_with(|snapshot, sel| {
-                if sel.is_empty() {
-                    sel.end = DisplayPoint::new(sel.end.row(), snapshot.line_len(sel.end.row()));
-                }
-                if sel.is_empty() {
-                    sel.end = DisplayPoint::new(sel.end.row() + 1_u32, 0);
-                }
-            });
-        });
-        let item = self.cut_common(false, window, cx);
-        cx.set_global(KillRing(item))
-    }
-
-    pub fn kill_ring_yank(
-        &mut self,
-        _: &KillRingYank,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-        let (text, metadata) = if let Some(KillRing(item)) = cx.try_global() {
-            if let Some(ClipboardEntry::String(kill_ring)) = item.entries().first() {
-                (kill_ring.text().to_string(), kill_ring.metadata_json())
-            } else {
-                return;
-            }
-        } else {
-            return;
-        };
-        self.do_paste(&text, metadata, false, window, cx);
-    }
-
-    pub fn copy_and_trim(&mut self, _: &CopyAndTrim, _: &mut Window, cx: &mut Context<Self>) {
-        self.do_copy(true, cx);
-    }
-
-    pub fn copy(&mut self, _: &Copy, _: &mut Window, cx: &mut Context<Self>) {
-        self.do_copy(false, cx);
-    }
-
-    fn do_copy(&self, strip_leading_indents: bool, cx: &mut Context<Self>) {
-        let selections = self.selections.all::<Point>(&self.display_snapshot(cx));
-        let buffer = self.buffer.read(cx).read(cx);
-        let mut text = String::new();
-
-        let mut clipboard_selections = Vec::with_capacity(selections.len());
-        {
-            let max_point = buffer.max_point();
-            let mut is_first = true;
-            let mut prev_selection_was_entire_line = false;
-            for selection in &selections {
-                let mut start = selection.start;
-                let mut end = selection.end;
-                let is_entire_line = selection.is_empty() || self.selections.line_mode();
-                let mut add_trailing_newline = false;
-                if is_entire_line {
-                    start = Point::new(start.row, 0);
-                    let next_line_start = Point::new(end.row + 1, 0);
-                    if next_line_start <= max_point {
-                        end = next_line_start;
-                    } else {
-                        // We're on the last line without a trailing newline.
-                        // Copy to the end of the line and add a newline afterwards.
-                        end = Point::new(end.row, buffer.line_len(MultiBufferRow(end.row)));
-                        add_trailing_newline = true;
-                    }
-                }
-
-                let mut trimmed_selections = Vec::new();
-                if strip_leading_indents && end.row.saturating_sub(start.row) > 0 {
-                    let row = MultiBufferRow(start.row);
-                    let first_indent = buffer.indent_size_for_line(row);
-                    if first_indent.len == 0 || start.column > first_indent.len {
-                        trimmed_selections.push(start..end);
-                    } else {
-                        trimmed_selections.push(
-                            Point::new(row.0, first_indent.len)
-                                ..Point::new(row.0, buffer.line_len(row)),
-                        );
-                        for row in start.row + 1..=end.row {
-                            let mut line_len = buffer.line_len(MultiBufferRow(row));
-                            if row == end.row {
-                                line_len = end.column;
-                            }
-                            if line_len == 0 {
-                                trimmed_selections
-                                    .push(Point::new(row, 0)..Point::new(row, line_len));
-                                continue;
-                            }
-                            let row_indent_size = buffer.indent_size_for_line(MultiBufferRow(row));
-                            if row_indent_size.len >= first_indent.len {
-                                trimmed_selections.push(
-                                    Point::new(row, first_indent.len)..Point::new(row, line_len),
-                                );
-                            } else {
-                                trimmed_selections.clear();
-                                trimmed_selections.push(start..end);
-                                break;
-                            }
-                        }
-                    }
-                } else {
-                    trimmed_selections.push(start..end);
-                }
-
-                for trimmed_range in trimmed_selections {
-                    if is_first {
-                        is_first = false;
-                    } else if !prev_selection_was_entire_line {
-                        text += "\n";
-                    }
-                    prev_selection_was_entire_line = is_entire_line;
-                    let mut len = 0;
-                    for chunk in buffer.text_for_range(trimmed_range.start..trimmed_range.end) {
-                        text.push_str(chunk);
-                        len += chunk.len();
-                    }
-                    if add_trailing_newline {
-                        text.push('\n');
-                        len += 1;
-                    }
-                    clipboard_selections.push(ClipboardSelection::for_buffer(
-                        len,
-                        is_entire_line,
-                        trimmed_range,
-                        &buffer,
-                        self.project.as_ref(),
-                        cx,
-                    ));
-                }
-            }
-        }
-
-        cx.write_to_clipboard(ClipboardItem::new_string_with_json_metadata(
-            text,
-            clipboard_selections,
-        ));
-    }
-
-    pub fn do_paste(
-        &mut self,
-        text: &String,
-        clipboard_selections: Option<Vec<ClipboardSelection>>,
-        handle_entire_lines: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.read_only(cx) {
-            return;
-        }
-
-        let clipboard_text = Cow::Borrowed(text.as_str());
-
-        self.transact(window, cx, |this, window, cx| {
-            let had_active_edit_prediction = this.has_active_edit_prediction();
-            let display_map = this.display_snapshot(cx);
-            let old_selections = this.selections.all::<MultiBufferOffset>(&display_map);
-            let cursor_offset = this
-                .selections
-                .last::<MultiBufferOffset>(&display_map)
-                .head();
-
-            if let Some(mut clipboard_selections) = clipboard_selections {
-                let all_selections_were_entire_line =
-                    clipboard_selections.iter().all(|s| s.is_entire_line);
-                let first_selection_indent_column =
-                    clipboard_selections.first().map(|s| s.first_line_indent);
-                if clipboard_selections.len() != old_selections.len() {
-                    clipboard_selections.drain(..);
-                }
-                let mut auto_indent_on_paste = true;
-
-                this.buffer.update(cx, |buffer, cx| {
-                    let snapshot = buffer.read(cx);
-                    auto_indent_on_paste = snapshot
-                        .language_settings_at(cursor_offset, cx)
-                        .auto_indent_on_paste;
-
-                    let mut start_offset = 0;
-                    let mut edits = Vec::new();
-                    let mut original_indent_columns = Vec::new();
-                    for (ix, selection) in old_selections.iter().enumerate() {
-                        let to_insert;
-                        let entire_line;
-                        let original_indent_column;
-                        if let Some(clipboard_selection) = clipboard_selections.get(ix) {
-                            let end_offset = start_offset + clipboard_selection.len;
-                            to_insert = &clipboard_text[start_offset..end_offset];
-                            entire_line = clipboard_selection.is_entire_line;
-                            start_offset = if entire_line {
-                                end_offset
-                            } else {
-                                end_offset + 1
-                            };
-                            original_indent_column = Some(clipboard_selection.first_line_indent);
-                        } else {
-                            to_insert = &*clipboard_text;
-                            entire_line = all_selections_were_entire_line;
-                            original_indent_column = first_selection_indent_column
-                        }
-
-                        let (range, to_insert) =
-                            if selection.is_empty() && handle_entire_lines && entire_line {
-                                // If the corresponding selection was empty when this slice of the
-                                // clipboard text was written, then the entire line containing the
-                                // selection was copied. If this selection is also currently empty,
-                                // then paste the line before the current line of the buffer.
-                                let column = selection.start.to_point(&snapshot).column as usize;
-                                let line_start = selection.start - column;
-                                (line_start..line_start, Cow::Borrowed(to_insert))
-                            } else {
-                                let language = snapshot.language_at(selection.head());
-                                let range = selection.range();
-                                if let Some(language) = language
-                                    && language.name() == "Markdown".into()
-                                {
-                                    edit_for_markdown_paste(
-                                        &snapshot,
-                                        range,
-                                        to_insert,
-                                        url::Url::parse(to_insert).ok(),
-                                    )
-                                } else {
-                                    (range, Cow::Borrowed(to_insert))
-                                }
-                            };
-
-                        edits.push((range, to_insert));
-                        original_indent_columns.push(original_indent_column);
-                    }
-                    drop(snapshot);
-
-                    buffer.edit(
-                        edits,
-                        if auto_indent_on_paste {
-                            Some(AutoindentMode::Block {
-                                original_indent_columns,
-                            })
-                        } else {
-                            None
-                        },
-                        cx,
-                    );
-                });
-
-                let selections = this
-                    .selections
-                    .all::<MultiBufferOffset>(&this.display_snapshot(cx));
-                this.change_selections(Default::default(), window, cx, |s| s.select(selections));
-            } else {
-                let url = url::Url::parse(&clipboard_text).ok();
-
-                let auto_indent_mode = if !clipboard_text.is_empty() {
-                    Some(AutoindentMode::Block {
-                        original_indent_columns: Vec::new(),
-                    })
-                } else {
-                    None
-                };
-
-                let selection_anchors = this.buffer.update(cx, |buffer, cx| {
-                    let snapshot = buffer.snapshot(cx);
-
-                    let anchors = old_selections
-                        .iter()
-                        .map(|s| {
-                            let anchor = snapshot.anchor_after(s.head());
-                            s.map(|_| anchor)
-                        })
-                        .collect::<Vec<_>>();
-
-                    let mut edits = Vec::new();
-
-                    for selection in old_selections.iter() {
-                        let language = snapshot.language_at(selection.head());
-                        let range = selection.range();
-
-                        let (edit_range, edit_text) = if let Some(language) = language
-                            && language.name() == "Markdown".into()
-                        {
-                            edit_for_markdown_paste(&snapshot, range, &clipboard_text, url.clone())
-                        } else {
-                            (range, clipboard_text.clone())
-                        };
-
-                        edits.push((edit_range, edit_text));
-                    }
-
-                    drop(snapshot);
-                    buffer.edit(edits, auto_indent_mode, cx);
-
-                    anchors
-                });
-
-                this.change_selections(Default::default(), window, cx, |s| {
-                    s.select_anchors(selection_anchors);
-                });
-            }
-
-            //   🤔                 |    ..     | show_in_menu |
-            // | ..                  |   true        true
-            // | had_edit_prediction |   false       true
-
-            let trigger_in_words =
-                this.show_edit_predictions_in_menu() || !had_active_edit_prediction;
-
-            this.trigger_completion_on_input(text, trigger_in_words, window, cx);
-        });
-    }
-
-    pub fn diff_clipboard_with_selection(
-        &mut self,
-        _: &DiffClipboardWithSelection,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let selections = self
-            .selections
-            .all::<MultiBufferOffset>(&self.display_snapshot(cx));
-
-        if selections.is_empty() {
-            log::warn!("There should always be at least one selection in Zed. This is a bug.");
-            return;
-        };
-
-        let clipboard_text = match cx.read_from_clipboard() {
-            Some(item) => match item.entries().first() {
-                Some(ClipboardEntry::String(text)) => Some(text.text().to_string()),
-                _ => None,
-            },
-            None => None,
-        };
-
-        let Some(clipboard_text) = clipboard_text else {
-            log::warn!("Clipboard doesn't contain text.");
-            return;
-        };
-
-        window.dispatch_action(
-            Box::new(DiffClipboardWithSelectionData {
-                clipboard_text,
-                editor: cx.entity(),
-            }),
-            cx,
-        );
-    }
-
-    pub fn paste(&mut self, _: &Paste, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-        if let Some(item) = cx.read_from_clipboard() {
-            let entries = item.entries();
-
-            match entries.first() {
-                // For now, we only support applying metadata if there's one string. In the future, we can incorporate all the selections
-                // of all the pasted entries.
-                Some(ClipboardEntry::String(clipboard_string)) if entries.len() == 1 => self
-                    .do_paste(
-                        clipboard_string.text(),
-                        clipboard_string.metadata_json::<Vec<ClipboardSelection>>(),
-                        true,
-                        window,
-                        cx,
-                    ),
-                _ => self.do_paste(&item.text().unwrap_or_default(), None, true, window, cx),
-            }
-        }
-    }
-
-    pub fn undo(&mut self, _: &Undo, window: &mut Window, cx: &mut Context<Self>) {
-        if self.read_only(cx) {
-            return;
-        }
-
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-
-        if let Some(transaction_id) = self.buffer.update(cx, |buffer, cx| buffer.undo(cx)) {
-            if let Some((selections, _)) =
-                self.selection_history.transaction(transaction_id).cloned()
-            {
-                self.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.select_anchors(selections.to_vec());
-                });
-            } else {
-                log::error!(
-                    "No entry in selection_history found for undo. \
-                     This may correspond to a bug where undo does not update the selection. \
-                     If this is occurring, please add details to \
-                     https://github.com/zed-industries/zed/issues/22692"
-                );
-            }
-            self.request_autoscroll(Autoscroll::fit(), cx);
-            self.unmark_text(window, cx);
-            self.refresh_edit_prediction(true, false, window, cx);
-            cx.emit(EditorEvent::Edited { transaction_id });
-            cx.emit(EditorEvent::TransactionUndone { transaction_id });
-        }
-    }
-
-    pub fn redo(&mut self, _: &Redo, window: &mut Window, cx: &mut Context<Self>) {
-        if self.read_only(cx) {
-            return;
-        }
-
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-
-        if let Some(transaction_id) = self.buffer.update(cx, |buffer, cx| buffer.redo(cx)) {
-            if let Some((_, Some(selections))) =
-                self.selection_history.transaction(transaction_id).cloned()
-            {
-                self.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.select_anchors(selections.to_vec());
-                });
-            } else {
-                log::error!(
-                    "No entry in selection_history found for redo. \
-                     This may correspond to a bug where undo does not update the selection. \
-                     If this is occurring, please add details to \
-                     https://github.com/zed-industries/zed/issues/22692"
-                );
-            }
-            self.request_autoscroll(Autoscroll::fit(), cx);
-            self.unmark_text(window, cx);
-            self.refresh_edit_prediction(true, false, window, cx);
-            cx.emit(EditorEvent::Edited { transaction_id });
-        }
-    }
-
-    pub fn finalize_last_transaction(&mut self, cx: &mut Context<Self>) {
-        self.buffer
-            .update(cx, |buffer, cx| buffer.finalize_last_transaction(cx));
-    }
-
-    pub fn group_until_transaction(&mut self, tx_id: TransactionId, cx: &mut Context<Self>) {
-        self.buffer
-            .update(cx, |buffer, cx| buffer.group_until_transaction(tx_id, cx));
-    }
-
-    pub fn move_left(&mut self, _: &MoveLeft, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.move_with(|map, selection| {
-                let cursor = if selection.is_empty() {
-                    movement::left(map, selection.start)
-                } else {
-                    selection.start
-                };
-                selection.collapse_to(cursor, SelectionGoal::None);
-            });
-        })
-    }
-
-    pub fn select_left(&mut self, _: &SelectLeft, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.move_heads_with(|map, head, _| (movement::left(map, head), SelectionGoal::None));
-        })
-    }
-
-    pub fn move_right(&mut self, _: &MoveRight, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.move_with(|map, selection| {
-                let cursor = if selection.is_empty() {
-                    movement::right(map, selection.end)
-                } else {
-                    selection.end
-                };
-                selection.collapse_to(cursor, SelectionGoal::None)
-            });
-        })
-    }
-
-    pub fn select_right(&mut self, _: &SelectRight, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.move_heads_with(|map, head, _| (movement::right(map, head), SelectionGoal::None));
-        });
-    }
-
-    pub fn move_up(&mut self, _: &MoveUp, window: &mut Window, cx: &mut Context<Self>) {
-        if self.take_rename(true, window, cx).is_some() {
-            return;
-        }
-
-        if self.mode.is_single_line() {
-            cx.propagate();
-            return;
-        }
-
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-
-        let text_layout_details = &self.text_layout_details(window);
-        let selection_count = self.selections.count();
-        let first_selection = self.selections.first_anchor();
-
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.move_with(|map, selection| {
-                if !selection.is_empty() {
-                    selection.goal = SelectionGoal::None;
-                }
-                let (cursor, goal) = movement::up(
-                    map,
-                    selection.start,
-                    selection.goal,
-                    false,
-                    text_layout_details,
-                );
-                selection.collapse_to(cursor, goal);
-            });
-        });
-
-        if selection_count == 1 && first_selection.range() == self.selections.first_anchor().range()
-        {
-            cx.propagate();
-        }
-    }
-
-    pub fn move_up_by_lines(
-        &mut self,
-        action: &MoveUpByLines,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.take_rename(true, window, cx).is_some() {
-            return;
-        }
-
-        if self.mode.is_single_line() {
-            cx.propagate();
-            return;
-        }
-
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-
-        let text_layout_details = &self.text_layout_details(window);
-
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.move_with(|map, selection| {
-                if !selection.is_empty() {
-                    selection.goal = SelectionGoal::None;
-                }
-                let (cursor, goal) = movement::up_by_rows(
-                    map,
-                    selection.start,
-                    action.lines,
-                    selection.goal,
-                    false,
-                    text_layout_details,
-                );
-                selection.collapse_to(cursor, goal);
-            });
-        })
-    }
-
-    pub fn move_down_by_lines(
-        &mut self,
-        action: &MoveDownByLines,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.take_rename(true, window, cx).is_some() {
-            return;
-        }
-
-        if self.mode.is_single_line() {
-            cx.propagate();
-            return;
-        }
-
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-
-        let text_layout_details = &self.text_layout_details(window);
-
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.move_with(|map, selection| {
-                if !selection.is_empty() {
-                    selection.goal = SelectionGoal::None;
-                }
-                let (cursor, goal) = movement::down_by_rows(
-                    map,
-                    selection.start,
-                    action.lines,
-                    selection.goal,
-                    false,
-                    text_layout_details,
-                );
-                selection.collapse_to(cursor, goal);
-            });
-        })
-    }
-
-    pub fn select_down_by_lines(
-        &mut self,
-        action: &SelectDownByLines,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        let text_layout_details = &self.text_layout_details(window);
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.move_heads_with(|map, head, goal| {
-                movement::down_by_rows(map, head, action.lines, goal, false, text_layout_details)
-            })
-        })
-    }
-
-    pub fn select_up_by_lines(
-        &mut self,
-        action: &SelectUpByLines,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        let text_layout_details = &self.text_layout_details(window);
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.move_heads_with(|map, head, goal| {
-                movement::up_by_rows(map, head, action.lines, goal, false, text_layout_details)
-            })
-        })
-    }
-
-    pub fn select_page_up(
-        &mut self,
-        _: &SelectPageUp,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(row_count) = self.visible_row_count() else {
-            return;
-        };
-
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-
-        let text_layout_details = &self.text_layout_details(window);
-
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.move_heads_with(|map, head, goal| {
-                movement::up_by_rows(map, head, row_count, goal, false, text_layout_details)
-            })
-        })
-    }
-
-    pub fn move_page_up(
-        &mut self,
-        action: &MovePageUp,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.take_rename(true, window, cx).is_some() {
-            return;
-        }
-
-        if self
-            .context_menu
-            .borrow_mut()
-            .as_mut()
-            .map(|menu| menu.select_first(self.completion_provider.as_deref(), window, cx))
-            .unwrap_or(false)
-        {
-            return;
-        }
-
-        if matches!(self.mode, EditorMode::SingleLine) {
-            cx.propagate();
-            return;
-        }
-
-        let Some(row_count) = self.visible_row_count() else {
-            return;
-        };
-
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-
-        let effects = if action.center_cursor {
-            SelectionEffects::scroll(Autoscroll::center())
-        } else {
-            SelectionEffects::default()
-        };
-
-        let text_layout_details = &self.text_layout_details(window);
-
-        self.change_selections(effects, window, cx, |s| {
-            s.move_with(|map, selection| {
-                if !selection.is_empty() {
-                    selection.goal = SelectionGoal::None;
-                }
-                let (cursor, goal) = movement::up_by_rows(
-                    map,
-                    selection.end,
-                    row_count,
-                    selection.goal,
-                    false,
-                    text_layout_details,
-                );
-                selection.collapse_to(cursor, goal);
-            });
-        });
-    }
-
-    pub fn select_up(&mut self, _: &SelectUp, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        let text_layout_details = &self.text_layout_details(window);
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.move_heads_with(|map, head, goal| {
-                movement::up(map, head, goal, false, text_layout_details)
-            })
-        })
-    }
-
-    pub fn move_down(&mut self, _: &MoveDown, window: &mut Window, cx: &mut Context<Self>) {
-        self.take_rename(true, window, cx);
-
-        if self.mode.is_single_line() {
-            cx.propagate();
-            return;
-        }
-
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-
-        let text_layout_details = &self.text_layout_details(window);
-        let selection_count = self.selections.count();
-        let first_selection = self.selections.first_anchor();
-
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.move_with(|map, selection| {
-                if !selection.is_empty() {
-                    selection.goal = SelectionGoal::None;
-                }
-                let (cursor, goal) = movement::down(
-                    map,
-                    selection.end,
-                    selection.goal,
-                    false,
-                    text_layout_details,
-                );
-                selection.collapse_to(cursor, goal);
-            });
-        });
-
-        if selection_count == 1 && first_selection.range() == self.selections.first_anchor().range()
-        {
-            cx.propagate();
-        }
-    }
-
-    pub fn select_page_down(
-        &mut self,
-        _: &SelectPageDown,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(row_count) = self.visible_row_count() else {
-            return;
-        };
-
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-
-        let text_layout_details = &self.text_layout_details(window);
-
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.move_heads_with(|map, head, goal| {
-                movement::down_by_rows(map, head, row_count, goal, false, text_layout_details)
-            })
-        })
-    }
-
-    pub fn move_page_down(
-        &mut self,
-        action: &MovePageDown,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.take_rename(true, window, cx).is_some() {
-            return;
-        }
-
-        if self
-            .context_menu
-            .borrow_mut()
-            .as_mut()
-            .map(|menu| menu.select_last(self.completion_provider.as_deref(), window, cx))
-            .unwrap_or(false)
-        {
-            return;
-        }
-
-        if matches!(self.mode, EditorMode::SingleLine) {
-            cx.propagate();
-            return;
-        }
-
-        let Some(row_count) = self.visible_row_count() else {
-            return;
-        };
-
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-
-        let effects = if action.center_cursor {
-            SelectionEffects::scroll(Autoscroll::center())
-        } else {
-            SelectionEffects::default()
-        };
-
-        let text_layout_details = &self.text_layout_details(window);
-        self.change_selections(effects, window, cx, |s| {
-            s.move_with(|map, selection| {
-                if !selection.is_empty() {
-                    selection.goal = SelectionGoal::None;
-                }
-                let (cursor, goal) = movement::down_by_rows(
-                    map,
-                    selection.end,
-                    row_count,
-                    selection.goal,
-                    false,
-                    text_layout_details,
-                );
-                selection.collapse_to(cursor, goal);
-            });
-        });
-    }
-
-    pub fn select_down(&mut self, _: &SelectDown, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        let text_layout_details = &self.text_layout_details(window);
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.move_heads_with(|map, head, goal| {
-                movement::down(map, head, goal, false, text_layout_details)
-            })
-        });
-    }
-
-    pub fn context_menu_first(
-        &mut self,
-        _: &ContextMenuFirst,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(context_menu) = self.context_menu.borrow_mut().as_mut() {
-            context_menu.select_first(self.completion_provider.as_deref(), window, cx);
-        }
-    }
-
-    pub fn context_menu_prev(
-        &mut self,
-        _: &ContextMenuPrevious,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(context_menu) = self.context_menu.borrow_mut().as_mut() {
-            context_menu.select_prev(self.completion_provider.as_deref(), window, cx);
-        }
-    }
-
-    pub fn context_menu_next(
-        &mut self,
-        _: &ContextMenuNext,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(context_menu) = self.context_menu.borrow_mut().as_mut() {
-            context_menu.select_next(self.completion_provider.as_deref(), window, cx);
-        }
-    }
-
-    pub fn context_menu_last(
-        &mut self,
-        _: &ContextMenuLast,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(context_menu) = self.context_menu.borrow_mut().as_mut() {
-            context_menu.select_last(self.completion_provider.as_deref(), window, cx);
-        }
-    }
-
-    pub fn signature_help_prev(
-        &mut self,
-        _: &SignatureHelpPrevious,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(popover) = self.signature_help_state.popover_mut() {
-            if popover.current_signature == 0 {
-                popover.current_signature = popover.signatures.len() - 1;
-            } else {
-                popover.current_signature -= 1;
-            }
-            cx.notify();
-        }
-    }
-
-    pub fn signature_help_next(
-        &mut self,
-        _: &SignatureHelpNext,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(popover) = self.signature_help_state.popover_mut() {
-            if popover.current_signature + 1 == popover.signatures.len() {
-                popover.current_signature = 0;
-            } else {
-                popover.current_signature += 1;
-            }
-            cx.notify();
-        }
-    }
-
-    pub fn move_to_previous_word_start(
-        &mut self,
-        _: &MoveToPreviousWordStart,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.move_cursors_with(|map, head, _| {
-                (
-                    movement::previous_word_start(map, head),
-                    SelectionGoal::None,
-                )
-            });
-        })
-    }
-
-    pub fn move_to_previous_subword_start(
-        &mut self,
-        _: &MoveToPreviousSubwordStart,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.move_cursors_with(|map, head, _| {
-                (
-                    movement::previous_subword_start(map, head),
-                    SelectionGoal::None,
-                )
-            });
-        })
-    }
-
-    pub fn select_to_previous_word_start(
-        &mut self,
-        _: &SelectToPreviousWordStart,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.move_heads_with(|map, head, _| {
-                (
-                    movement::previous_word_start(map, head),
-                    SelectionGoal::None,
-                )
-            });
-        })
-    }
-
-    pub fn select_to_previous_subword_start(
-        &mut self,
-        _: &SelectToPreviousSubwordStart,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.move_heads_with(|map, head, _| {
-                (
-                    movement::previous_subword_start(map, head),
-                    SelectionGoal::None,
-                )
-            });
-        })
-    }
-
-    pub fn delete_to_previous_word_start(
-        &mut self,
-        action: &DeleteToPreviousWordStart,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-        self.transact(window, cx, |this, window, cx| {
-            this.select_autoclose_pair(window, cx);
-            this.change_selections(Default::default(), window, cx, |s| {
-                s.move_with(|map, selection| {
-                    if selection.is_empty() {
-                        let mut cursor = if action.ignore_newlines {
-                            movement::previous_word_start(map, selection.head())
-                        } else {
-                            movement::previous_word_start_or_newline(map, selection.head())
-                        };
-                        cursor = movement::adjust_greedy_deletion(
-                            map,
-                            selection.head(),
-                            cursor,
-                            action.ignore_brackets,
-                        );
-                        selection.set_head(cursor, SelectionGoal::None);
-                    }
-                });
-            });
-            this.insert("", window, cx);
-        });
-    }
-
-    pub fn delete_to_previous_subword_start(
-        &mut self,
-        _: &DeleteToPreviousSubwordStart,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-        self.transact(window, cx, |this, window, cx| {
-            this.select_autoclose_pair(window, cx);
-            this.change_selections(Default::default(), window, cx, |s| {
-                s.move_with(|map, selection| {
-                    if selection.is_empty() {
-                        let mut cursor = movement::previous_subword_start(map, selection.head());
-                        cursor =
-                            movement::adjust_greedy_deletion(map, selection.head(), cursor, false);
-                        selection.set_head(cursor, SelectionGoal::None);
-                    }
-                });
-            });
-            this.insert("", window, cx);
-        });
-    }
-
-    pub fn move_to_next_word_end(
-        &mut self,
-        _: &MoveToNextWordEnd,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.move_cursors_with(|map, head, _| {
-                (movement::next_word_end(map, head), SelectionGoal::None)
-            });
-        })
-    }
-
-    pub fn move_to_next_subword_end(
-        &mut self,
-        _: &MoveToNextSubwordEnd,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.move_cursors_with(|map, head, _| {
-                (movement::next_subword_end(map, head), SelectionGoal::None)
-            });
-        })
-    }
-
-    pub fn select_to_next_word_end(
-        &mut self,
-        _: &SelectToNextWordEnd,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.move_heads_with(|map, head, _| {
-                (movement::next_word_end(map, head), SelectionGoal::None)
-            });
-        })
-    }
-
-    pub fn select_to_next_subword_end(
-        &mut self,
-        _: &SelectToNextSubwordEnd,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.move_heads_with(|map, head, _| {
-                (movement::next_subword_end(map, head), SelectionGoal::None)
-            });
-        })
-    }
-
-    pub fn delete_to_next_word_end(
-        &mut self,
-        action: &DeleteToNextWordEnd,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-        self.transact(window, cx, |this, window, cx| {
-            this.change_selections(Default::default(), window, cx, |s| {
-                s.move_with(|map, selection| {
-                    if selection.is_empty() {
-                        let mut cursor = if action.ignore_newlines {
-                            movement::next_word_end(map, selection.head())
-                        } else {
-                            movement::next_word_end_or_newline(map, selection.head())
-                        };
-                        cursor = movement::adjust_greedy_deletion(
-                            map,
-                            selection.head(),
-                            cursor,
-                            action.ignore_brackets,
-                        );
-                        selection.set_head(cursor, SelectionGoal::None);
-                    }
-                });
-            });
-            this.insert("", window, cx);
-        });
-    }
-
-    pub fn delete_to_next_subword_end(
-        &mut self,
-        _: &DeleteToNextSubwordEnd,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-        self.transact(window, cx, |this, window, cx| {
-            this.change_selections(Default::default(), window, cx, |s| {
-                s.move_with(|map, selection| {
-                    if selection.is_empty() {
-                        let mut cursor = movement::next_subword_end(map, selection.head());
-                        cursor =
-                            movement::adjust_greedy_deletion(map, selection.head(), cursor, false);
-                        selection.set_head(cursor, SelectionGoal::None);
-                    }
-                });
-            });
-            this.insert("", window, cx);
-        });
-    }
-
-    pub fn move_to_beginning_of_line(
-        &mut self,
-        action: &MoveToBeginningOfLine,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.move_cursors_with(|map, head, _| {
-                (
-                    movement::indented_line_beginning(
-                        map,
-                        head,
-                        action.stop_at_soft_wraps,
-                        action.stop_at_indent,
-                    ),
-                    SelectionGoal::None,
-                )
-            });
-        })
-    }
-
-    pub fn select_to_beginning_of_line(
-        &mut self,
-        action: &SelectToBeginningOfLine,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.move_heads_with(|map, head, _| {
-                (
-                    movement::indented_line_beginning(
-                        map,
-                        head,
-                        action.stop_at_soft_wraps,
-                        action.stop_at_indent,
-                    ),
-                    SelectionGoal::None,
-                )
-            });
-        });
-    }
-
-    pub fn delete_to_beginning_of_line(
-        &mut self,
-        action: &DeleteToBeginningOfLine,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-        self.transact(window, cx, |this, window, cx| {
-            this.change_selections(Default::default(), window, cx, |s| {
-                s.move_with(|_, selection| {
-                    selection.reversed = true;
-                });
-            });
-
-            this.select_to_beginning_of_line(
-                &SelectToBeginningOfLine {
-                    stop_at_soft_wraps: false,
-                    stop_at_indent: action.stop_at_indent,
-                },
-                window,
-                cx,
-            );
-            this.backspace(&Backspace, window, cx);
-        });
-    }
-
-    pub fn move_to_end_of_line(
-        &mut self,
-        action: &MoveToEndOfLine,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.move_cursors_with(|map, head, _| {
-                (
-                    movement::line_end(map, head, action.stop_at_soft_wraps),
-                    SelectionGoal::None,
-                )
-            });
-        })
-    }
-
-    pub fn select_to_end_of_line(
-        &mut self,
-        action: &SelectToEndOfLine,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.move_heads_with(|map, head, _| {
-                (
-                    movement::line_end(map, head, action.stop_at_soft_wraps),
-                    SelectionGoal::None,
-                )
-            });
-        })
-    }
-
-    pub fn delete_to_end_of_line(
-        &mut self,
-        _: &DeleteToEndOfLine,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-        self.transact(window, cx, |this, window, cx| {
-            this.select_to_end_of_line(
-                &SelectToEndOfLine {
-                    stop_at_soft_wraps: false,
-                },
-                window,
-                cx,
-            );
-            this.delete(&Delete, window, cx);
-        });
-    }
-
-    pub fn cut_to_end_of_line(
-        &mut self,
-        action: &CutToEndOfLine,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-        self.transact(window, cx, |this, window, cx| {
-            this.select_to_end_of_line(
-                &SelectToEndOfLine {
-                    stop_at_soft_wraps: false,
-                },
-                window,
-                cx,
-            );
-            if !action.stop_at_newlines {
-                this.change_selections(Default::default(), window, cx, |s| {
-                    s.move_with(|_, sel| {
-                        if sel.is_empty() {
-                            sel.end = DisplayPoint::new(sel.end.row() + 1_u32, 0);
-                        }
-                    });
-                });
-            }
-            this.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-            let item = this.cut_common(false, window, cx);
-            cx.write_to_clipboard(item);
-        });
-    }
-
-    pub fn move_to_start_of_paragraph(
-        &mut self,
-        _: &MoveToStartOfParagraph,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if matches!(self.mode, EditorMode::SingleLine) {
-            cx.propagate();
-            return;
-        }
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.move_with(|map, selection| {
-                selection.collapse_to(
-                    movement::start_of_paragraph(map, selection.head(), 1),
-                    SelectionGoal::None,
-                )
-            });
-        })
-    }
-
-    pub fn move_to_end_of_paragraph(
-        &mut self,
-        _: &MoveToEndOfParagraph,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if matches!(self.mode, EditorMode::SingleLine) {
-            cx.propagate();
-            return;
-        }
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.move_with(|map, selection| {
-                selection.collapse_to(
-                    movement::end_of_paragraph(map, selection.head(), 1),
-                    SelectionGoal::None,
-                )
-            });
-        })
-    }
-
-    pub fn select_to_start_of_paragraph(
-        &mut self,
-        _: &SelectToStartOfParagraph,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if matches!(self.mode, EditorMode::SingleLine) {
-            cx.propagate();
-            return;
-        }
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.move_heads_with(|map, head, _| {
-                (
-                    movement::start_of_paragraph(map, head, 1),
-                    SelectionGoal::None,
-                )
-            });
-        })
-    }
-
-    pub fn select_to_end_of_paragraph(
-        &mut self,
-        _: &SelectToEndOfParagraph,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if matches!(self.mode, EditorMode::SingleLine) {
-            cx.propagate();
-            return;
-        }
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.move_heads_with(|map, head, _| {
-                (
-                    movement::end_of_paragraph(map, head, 1),
-                    SelectionGoal::None,
-                )
-            });
-        })
-    }
-
-    pub fn move_to_start_of_excerpt(
-        &mut self,
-        _: &MoveToStartOfExcerpt,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if matches!(self.mode, EditorMode::SingleLine) {
-            cx.propagate();
-            return;
-        }
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.move_with(|map, selection| {
-                selection.collapse_to(
-                    movement::start_of_excerpt(
-                        map,
-                        selection.head(),
-                        workspace::searchable::Direction::Prev,
-                    ),
-                    SelectionGoal::None,
-                )
-            });
-        })
-    }
-
-    pub fn move_to_start_of_next_excerpt(
-        &mut self,
-        _: &MoveToStartOfNextExcerpt,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if matches!(self.mode, EditorMode::SingleLine) {
-            cx.propagate();
-            return;
-        }
-
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.move_with(|map, selection| {
-                selection.collapse_to(
-                    movement::start_of_excerpt(
-                        map,
-                        selection.head(),
-                        workspace::searchable::Direction::Next,
-                    ),
-                    SelectionGoal::None,
-                )
-            });
-        })
-    }
-
-    pub fn move_to_end_of_excerpt(
-        &mut self,
-        _: &MoveToEndOfExcerpt,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if matches!(self.mode, EditorMode::SingleLine) {
-            cx.propagate();
-            return;
-        }
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.move_with(|map, selection| {
-                selection.collapse_to(
-                    movement::end_of_excerpt(
-                        map,
-                        selection.head(),
-                        workspace::searchable::Direction::Next,
-                    ),
-                    SelectionGoal::None,
-                )
-            });
-        })
-    }
-
-    pub fn move_to_end_of_previous_excerpt(
-        &mut self,
-        _: &MoveToEndOfPreviousExcerpt,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if matches!(self.mode, EditorMode::SingleLine) {
-            cx.propagate();
-            return;
-        }
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.move_with(|map, selection| {
-                selection.collapse_to(
-                    movement::end_of_excerpt(
-                        map,
-                        selection.head(),
-                        workspace::searchable::Direction::Prev,
-                    ),
-                    SelectionGoal::None,
-                )
-            });
-        })
-    }
-
-    pub fn select_to_start_of_excerpt(
-        &mut self,
-        _: &SelectToStartOfExcerpt,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if matches!(self.mode, EditorMode::SingleLine) {
-            cx.propagate();
-            return;
-        }
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.move_heads_with(|map, head, _| {
-                (
-                    movement::start_of_excerpt(map, head, workspace::searchable::Direction::Prev),
-                    SelectionGoal::None,
-                )
-            });
-        })
-    }
-
-    pub fn select_to_start_of_next_excerpt(
-        &mut self,
-        _: &SelectToStartOfNextExcerpt,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if matches!(self.mode, EditorMode::SingleLine) {
-            cx.propagate();
-            return;
-        }
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.move_heads_with(|map, head, _| {
-                (
-                    movement::start_of_excerpt(map, head, workspace::searchable::Direction::Next),
-                    SelectionGoal::None,
-                )
-            });
-        })
-    }
-
-    pub fn select_to_end_of_excerpt(
-        &mut self,
-        _: &SelectToEndOfExcerpt,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if matches!(self.mode, EditorMode::SingleLine) {
-            cx.propagate();
-            return;
-        }
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.move_heads_with(|map, head, _| {
-                (
-                    movement::end_of_excerpt(map, head, workspace::searchable::Direction::Next),
-                    SelectionGoal::None,
-                )
-            });
-        })
-    }
-
-    pub fn select_to_end_of_previous_excerpt(
-        &mut self,
-        _: &SelectToEndOfPreviousExcerpt,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if matches!(self.mode, EditorMode::SingleLine) {
-            cx.propagate();
-            return;
-        }
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.move_heads_with(|map, head, _| {
-                (
-                    movement::end_of_excerpt(map, head, workspace::searchable::Direction::Prev),
-                    SelectionGoal::None,
-                )
-            });
-        })
-    }
-
-    pub fn move_to_beginning(
-        &mut self,
-        _: &MoveToBeginning,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if matches!(self.mode, EditorMode::SingleLine) {
-            cx.propagate();
-            return;
-        }
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.select_ranges(vec![Anchor::min()..Anchor::min()]);
-        });
-    }
-
-    pub fn select_to_beginning(
-        &mut self,
-        _: &SelectToBeginning,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let mut selection = self.selections.last::<Point>(&self.display_snapshot(cx));
-        selection.set_head(Point::zero(), SelectionGoal::None);
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.select(vec![selection]);
-        });
-    }
-
-    pub fn move_to_end(&mut self, _: &MoveToEnd, window: &mut Window, cx: &mut Context<Self>) {
-        if matches!(self.mode, EditorMode::SingleLine) {
-            cx.propagate();
-            return;
-        }
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        let cursor = self.buffer.read(cx).read(cx).len();
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.select_ranges(vec![cursor..cursor])
-        });
-    }
-
-    pub fn set_nav_history(&mut self, nav_history: Option<ItemNavHistory>) {
-        self.nav_history = nav_history;
-    }
-
-    pub fn nav_history(&self) -> Option<&ItemNavHistory> {
-        self.nav_history.as_ref()
-    }
-
-    pub fn create_nav_history_entry(&mut self, cx: &mut Context<Self>) {
-        self.push_to_nav_history(
-            self.selections.newest_anchor().head(),
-            None,
-            false,
-            true,
-            cx,
-        );
-    }
-
-    fn push_to_nav_history(
-        &mut self,
-        cursor_anchor: Anchor,
-        new_position: Option<Point>,
-        is_deactivate: bool,
-        always: bool,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(nav_history) = self.nav_history.as_mut() {
-            let buffer = self.buffer.read(cx).read(cx);
-            let cursor_position = cursor_anchor.to_point(&buffer);
-            let scroll_state = self.scroll_manager.anchor();
-            let scroll_top_row = scroll_state.top_row(&buffer);
-            drop(buffer);
-
-            if let Some(new_position) = new_position {
-                let row_delta = (new_position.row as i64 - cursor_position.row as i64).abs();
-                if row_delta == 0 || (row_delta < MIN_NAVIGATION_HISTORY_ROW_DELTA && !always) {
-                    return;
-                }
-            }
-
-            nav_history.push(
-                Some(NavigationData {
-                    cursor_anchor,
-                    cursor_position,
-                    scroll_anchor: scroll_state,
-                    scroll_top_row,
-                }),
-                cx,
-            );
-            cx.emit(EditorEvent::PushedToNavHistory {
-                anchor: cursor_anchor,
-                is_deactivate,
-            })
-        }
-    }
-
-    pub fn select_to_end(&mut self, _: &SelectToEnd, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        let buffer = self.buffer.read(cx).snapshot(cx);
-        let mut selection = self
-            .selections
-            .first::<MultiBufferOffset>(&self.display_snapshot(cx));
-        selection.set_head(buffer.len(), SelectionGoal::None);
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.select(vec![selection]);
-        });
-    }
-
-    pub fn select_all(&mut self, _: &SelectAll, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        self.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges(vec![Anchor::min()..Anchor::max()]);
-        });
-    }
-
-    pub fn select_line(&mut self, _: &SelectLine, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-        let mut selections = self.selections.all::<Point>(&display_map);
-        let max_point = display_map.buffer_snapshot().max_point();
-        for selection in &mut selections {
-            let rows = selection.spanned_rows(true, &display_map);
-            selection.start = Point::new(rows.start.0, 0);
-            selection.end = cmp::min(max_point, Point::new(rows.end.0, 0));
-            selection.reversed = false;
-        }
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.select(selections);
-        });
-    }
-
-    pub fn split_selection_into_lines(
-        &mut self,
-        action: &SplitSelectionIntoLines,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let selections = self
-            .selections
-            .all::<Point>(&self.display_snapshot(cx))
-            .into_iter()
-            .map(|selection| selection.start..selection.end)
-            .collect::<Vec<_>>();
-        self.unfold_ranges(&selections, true, true, cx);
-
-        let mut new_selection_ranges = Vec::new();
-        {
-            let buffer = self.buffer.read(cx).read(cx);
-            for selection in selections {
-                for row in selection.start.row..selection.end.row {
-                    let line_start = Point::new(row, 0);
-                    let line_end = Point::new(row, buffer.line_len(MultiBufferRow(row)));
-
-                    if action.keep_selections {
-                        // Keep the selection range for each line
-                        let selection_start = if row == selection.start.row {
-                            selection.start
-                        } else {
-                            line_start
-                        };
-                        new_selection_ranges.push(selection_start..line_end);
-                    } else {
-                        // Collapse to cursor at end of line
-                        new_selection_ranges.push(line_end..line_end);
-                    }
-                }
-
-                let is_multiline_selection = selection.start.row != selection.end.row;
-                // Don't insert last one if it's a multi-line selection ending at the start of a line,
-                // so this action feels more ergonomic when paired with other selection operations
-                let should_skip_last = is_multiline_selection && selection.end.column == 0;
-                if !should_skip_last {
-                    if action.keep_selections {
-                        if is_multiline_selection {
-                            let line_start = Point::new(selection.end.row, 0);
-                            new_selection_ranges.push(line_start..selection.end);
-                        } else {
-                            new_selection_ranges.push(selection.start..selection.end);
-                        }
-                    } else {
-                        new_selection_ranges.push(selection.end..selection.end);
-                    }
-                }
-            }
-        }
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.select_ranges(new_selection_ranges);
-        });
-    }
-
-    pub fn add_selection_above(
-        &mut self,
-        action: &AddSelectionAbove,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.add_selection(true, action.skip_soft_wrap, window, cx);
-    }
-
-    pub fn add_selection_below(
-        &mut self,
-        action: &AddSelectionBelow,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.add_selection(false, action.skip_soft_wrap, window, cx);
-    }
-
-    fn add_selection(
-        &mut self,
-        above: bool,
-        skip_soft_wrap: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-        let all_selections = self.selections.all::<Point>(&display_map);
-        let text_layout_details = self.text_layout_details(window);
-
-        let (mut columnar_selections, new_selections_to_columnarize) = {
-            if let Some(state) = self.add_selections_state.as_ref() {
-                let columnar_selection_ids: HashSet<_> = state
-                    .groups
-                    .iter()
-                    .flat_map(|group| group.stack.iter())
-                    .copied()
-                    .collect();
-
-                all_selections
-                    .into_iter()
-                    .partition(|s| columnar_selection_ids.contains(&s.id))
-            } else {
-                (Vec::new(), all_selections)
-            }
-        };
-
-        let mut state = self
-            .add_selections_state
-            .take()
-            .unwrap_or_else(|| AddSelectionsState { groups: Vec::new() });
-
-        for selection in new_selections_to_columnarize {
-            let range = selection.display_range(&display_map).sorted();
-            let start_x = display_map.x_for_display_point(range.start, &text_layout_details);
-            let end_x = display_map.x_for_display_point(range.end, &text_layout_details);
-            let positions = start_x.min(end_x)..start_x.max(end_x);
-            let mut stack = Vec::new();
-            for row in range.start.row().0..=range.end.row().0 {
-                if let Some(selection) = self.selections.build_columnar_selection(
-                    &display_map,
-                    DisplayRow(row),
-                    &positions,
-                    selection.reversed,
-                    &text_layout_details,
-                ) {
-                    stack.push(selection.id);
-                    columnar_selections.push(selection);
-                }
-            }
-            if !stack.is_empty() {
-                if above {
-                    stack.reverse();
-                }
-                state.groups.push(AddSelectionsGroup { above, stack });
-            }
-        }
-
-        let mut final_selections = Vec::new();
-        let end_row = if above {
-            DisplayRow(0)
-        } else {
-            display_map.max_point().row()
-        };
-
-        let mut last_added_item_per_group = HashMap::default();
-        for group in state.groups.iter_mut() {
-            if let Some(last_id) = group.stack.last() {
-                last_added_item_per_group.insert(*last_id, group);
-            }
-        }
-
-        for selection in columnar_selections {
-            if let Some(group) = last_added_item_per_group.get_mut(&selection.id) {
-                if above == group.above {
-                    let range = selection.display_range(&display_map).sorted();
-                    debug_assert_eq!(range.start.row(), range.end.row());
-                    let mut row = range.start.row();
-                    let positions =
-                        if let SelectionGoal::HorizontalRange { start, end } = selection.goal {
-                            Pixels::from(start)..Pixels::from(end)
-                        } else {
-                            let start_x =
-                                display_map.x_for_display_point(range.start, &text_layout_details);
-                            let end_x =
-                                display_map.x_for_display_point(range.end, &text_layout_details);
-                            start_x.min(end_x)..start_x.max(end_x)
-                        };
-
-                    let mut maybe_new_selection = None;
-                    let direction = if above { -1 } else { 1 };
-
-                    while row != end_row {
-                        if skip_soft_wrap {
-                            row = display_map
-                                .start_of_relative_buffer_row(DisplayPoint::new(row, 0), direction)
-                                .row();
-                        } else if above {
-                            row.0 -= 1;
-                        } else {
-                            row.0 += 1;
-                        }
-
-                        if let Some(new_selection) = self.selections.build_columnar_selection(
-                            &display_map,
-                            row,
-                            &positions,
-                            selection.reversed,
-                            &text_layout_details,
-                        ) {
-                            maybe_new_selection = Some(new_selection);
-                            break;
-                        }
-                    }
-
-                    if let Some(new_selection) = maybe_new_selection {
-                        group.stack.push(new_selection.id);
-                        if above {
-                            final_selections.push(new_selection);
-                            final_selections.push(selection);
-                        } else {
-                            final_selections.push(selection);
-                            final_selections.push(new_selection);
-                        }
-                    } else {
-                        final_selections.push(selection);
-                    }
-                } else {
-                    group.stack.pop();
-                }
-            } else {
-                final_selections.push(selection);
-            }
-        }
-
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.select(final_selections);
-        });
-
-        let final_selection_ids: HashSet<_> = self
-            .selections
-            .all::<Point>(&display_map)
-            .iter()
-            .map(|s| s.id)
-            .collect();
-        state.groups.retain_mut(|group| {
-            // selections might get merged above so we remove invalid items from stacks
-            group.stack.retain(|id| final_selection_ids.contains(id));
-
-            // single selection in stack can be treated as initial state
-            group.stack.len() > 1
-        });
-
-        if !state.groups.is_empty() {
-            self.add_selections_state = Some(state);
-        }
-    }
-
-    pub fn insert_snippet_at_selections(
-        &mut self,
-        action: &InsertSnippet,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.try_insert_snippet_at_selections(action, window, cx)
-            .log_err();
-    }
-
-    fn try_insert_snippet_at_selections(
-        &mut self,
-        action: &InsertSnippet,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Result<()> {
-        let insertion_ranges = self
-            .selections
-            .all::<MultiBufferOffset>(&self.display_snapshot(cx))
-            .into_iter()
-            .map(|selection| selection.range())
-            .collect_vec();
-
-        let snippet = if let Some(snippet_body) = &action.snippet {
-            if action.language.is_none() && action.name.is_none() {
-                Snippet::parse(snippet_body)?
-            } else {
-                bail!("`snippet` is mutually exclusive with `language` and `name`")
-            }
-        } else if let Some(name) = &action.name {
-            let project = self.project().context("no project")?;
-            let snippet_store = project.read(cx).snippets().read(cx);
-            let snippet = snippet_store
-                .snippets_for(action.language.clone(), cx)
-                .into_iter()
-                .find(|snippet| snippet.name == *name)
-                .context("snippet not found")?;
-            Snippet::parse(&snippet.body)?
-        } else {
-            // todo(andrew): open modal to select snippet
-            bail!("`name` or `snippet` is required")
-        };
-
-        self.insert_snippet(&insertion_ranges, snippet, window, cx)
-    }
-
-    fn select_match_ranges(
-        &mut self,
-        range: Range<MultiBufferOffset>,
-        reversed: bool,
-        replace_newest: bool,
-        auto_scroll: Option<Autoscroll>,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) {
-        self.unfold_ranges(
-            std::slice::from_ref(&range),
-            false,
-            auto_scroll.is_some(),
-            cx,
-        );
-        let effects = if let Some(scroll) = auto_scroll {
-            SelectionEffects::scroll(scroll)
-        } else {
-            SelectionEffects::no_scroll()
-        };
-        self.change_selections(effects, window, cx, |s| {
-            if replace_newest {
-                s.delete(s.newest_anchor().id);
-            }
-            if reversed {
-                s.insert_range(range.end..range.start);
-            } else {
-                s.insert_range(range);
-            }
-        });
-    }
-
-    pub fn select_next_match_internal(
-        &mut self,
-        display_map: &DisplaySnapshot,
-        replace_newest: bool,
-        autoscroll: Option<Autoscroll>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Result<()> {
-        let buffer = display_map.buffer_snapshot();
-        let mut selections = self.selections.all::<MultiBufferOffset>(&display_map);
-        if let Some(mut select_next_state) = self.select_next_state.take() {
-            let query = &select_next_state.query;
-            if !select_next_state.done {
-                let first_selection = selections.iter().min_by_key(|s| s.id).unwrap();
-                let last_selection = selections.iter().max_by_key(|s| s.id).unwrap();
-                let mut next_selected_range = None;
-
-                let bytes_after_last_selection =
-                    buffer.bytes_in_range(last_selection.end..buffer.len());
-                let bytes_before_first_selection =
-                    buffer.bytes_in_range(MultiBufferOffset(0)..first_selection.start);
-                let query_matches = query
-                    .stream_find_iter(bytes_after_last_selection)
-                    .map(|result| (last_selection.end, result))
-                    .chain(
-                        query
-                            .stream_find_iter(bytes_before_first_selection)
-                            .map(|result| (MultiBufferOffset(0), result)),
-                    );
-
-                for (start_offset, query_match) in query_matches {
-                    let query_match = query_match.unwrap(); // can only fail due to I/O
-                    let offset_range =
-                        start_offset + query_match.start()..start_offset + query_match.end();
-
-                    if !select_next_state.wordwise
-                        || (!buffer.is_inside_word(offset_range.start, None)
-                            && !buffer.is_inside_word(offset_range.end, None))
-                    {
-                        let idx = selections
-                            .partition_point(|selection| selection.end <= offset_range.start);
-                        let overlaps = selections
-                            .get(idx)
-                            .map_or(false, |selection| selection.start < offset_range.end);
-
-                        if !overlaps {
-                            next_selected_range = Some(offset_range);
-                            break;
-                        }
-                    }
-                }
-
-                if let Some(next_selected_range) = next_selected_range {
-                    self.select_match_ranges(
-                        next_selected_range,
-                        last_selection.reversed,
-                        replace_newest,
-                        autoscroll,
-                        window,
-                        cx,
-                    );
-                } else {
-                    select_next_state.done = true;
-                }
-            }
-
-            self.select_next_state = Some(select_next_state);
-        } else {
-            let mut only_carets = true;
-            let mut same_text_selected = true;
-            let mut selected_text = None;
-
-            let mut selections_iter = selections.iter().peekable();
-            while let Some(selection) = selections_iter.next() {
-                if selection.start != selection.end {
-                    only_carets = false;
-                }
-
-                if same_text_selected {
-                    if selected_text.is_none() {
-                        selected_text =
-                            Some(buffer.text_for_range(selection.range()).collect::<String>());
-                    }
-
-                    if let Some(next_selection) = selections_iter.peek() {
-                        if next_selection.len() == selection.len() {
-                            let next_selected_text = buffer
-                                .text_for_range(next_selection.range())
-                                .collect::<String>();
-                            if Some(next_selected_text) != selected_text {
-                                same_text_selected = false;
-                                selected_text = None;
-                            }
-                        } else {
-                            same_text_selected = false;
-                            selected_text = None;
-                        }
-                    }
-                }
-            }
-
-            if only_carets {
-                for selection in &mut selections {
-                    let (word_range, _) = buffer.surrounding_word(selection.start, None);
-                    selection.start = word_range.start;
-                    selection.end = word_range.end;
-                    selection.goal = SelectionGoal::None;
-                    selection.reversed = false;
-                    self.select_match_ranges(
-                        selection.start..selection.end,
-                        selection.reversed,
-                        replace_newest,
-                        autoscroll,
-                        window,
-                        cx,
-                    );
-                }
-
-                if selections.len() == 1 {
-                    let selection = selections
-                        .last()
-                        .expect("ensured that there's only one selection");
-                    let query = buffer
-                        .text_for_range(selection.start..selection.end)
-                        .collect::<String>();
-                    let is_empty = query.is_empty();
-                    let select_state = SelectNextState {
-                        query: self.build_query(&[query], cx)?,
-                        wordwise: true,
-                        done: is_empty,
-                    };
-                    self.select_next_state = Some(select_state);
-                } else {
-                    self.select_next_state = None;
-                }
-            } else if let Some(selected_text) = selected_text {
-                self.select_next_state = Some(SelectNextState {
-                    query: self.build_query(&[selected_text], cx)?,
-                    wordwise: false,
-                    done: false,
-                });
-                self.select_next_match_internal(
-                    display_map,
-                    replace_newest,
-                    autoscroll,
-                    window,
-                    cx,
-                )?;
-            }
-        }
-        Ok(())
-    }
-
-    pub fn select_all_matches(
-        &mut self,
-        _action: &SelectAllMatches,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Result<()> {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-
-        self.select_next_match_internal(&display_map, false, None, window, cx)?;
-        let Some(select_next_state) = self.select_next_state.as_mut() else {
-            return Ok(());
-        };
-        if select_next_state.done {
-            return Ok(());
-        }
-
-        let mut new_selections = Vec::new();
-
-        let reversed = self
-            .selections
-            .oldest::<MultiBufferOffset>(&display_map)
-            .reversed;
-        let buffer = display_map.buffer_snapshot();
-        let query_matches = select_next_state
-            .query
-            .stream_find_iter(buffer.bytes_in_range(MultiBufferOffset(0)..buffer.len()));
-
-        for query_match in query_matches.into_iter() {
-            let query_match = query_match.context("query match for select all action")?; // can only fail due to I/O
-            let offset_range = if reversed {
-                MultiBufferOffset(query_match.end())..MultiBufferOffset(query_match.start())
-            } else {
-                MultiBufferOffset(query_match.start())..MultiBufferOffset(query_match.end())
-            };
-
-            if !select_next_state.wordwise
-                || (!buffer.is_inside_word(offset_range.start, None)
-                    && !buffer.is_inside_word(offset_range.end, None))
-            {
-                new_selections.push(offset_range.start..offset_range.end);
-            }
-        }
-
-        select_next_state.done = true;
-
-        if new_selections.is_empty() {
-            log::error!("bug: new_selections is empty in select_all_matches");
-            return Ok(());
-        }
-
-        self.unfold_ranges(&new_selections.clone(), false, false, cx);
-        self.change_selections(SelectionEffects::no_scroll(), window, cx, |selections| {
-            selections.select_ranges(new_selections)
-        });
-
-        Ok(())
-    }
-
-    pub fn select_next(
-        &mut self,
-        action: &SelectNext,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Result<()> {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-        self.select_next_match_internal(
-            &display_map,
-            action.replace_newest,
-            Some(Autoscroll::newest()),
-            window,
-            cx,
-        )?;
-        Ok(())
-    }
-
-    pub fn select_previous(
-        &mut self,
-        action: &SelectPrevious,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Result<()> {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-        let buffer = display_map.buffer_snapshot();
-        let mut selections = self.selections.all::<MultiBufferOffset>(&display_map);
-        if let Some(mut select_prev_state) = self.select_prev_state.take() {
-            let query = &select_prev_state.query;
-            if !select_prev_state.done {
-                let first_selection = selections.iter().min_by_key(|s| s.id).unwrap();
-                let last_selection = selections.iter().max_by_key(|s| s.id).unwrap();
-                let mut next_selected_range = None;
-                // When we're iterating matches backwards, the oldest match will actually be the furthest one in the buffer.
-                let bytes_before_last_selection =
-                    buffer.reversed_bytes_in_range(MultiBufferOffset(0)..last_selection.start);
-                let bytes_after_first_selection =
-                    buffer.reversed_bytes_in_range(first_selection.end..buffer.len());
-                let query_matches = query
-                    .stream_find_iter(bytes_before_last_selection)
-                    .map(|result| (last_selection.start, result))
-                    .chain(
-                        query
-                            .stream_find_iter(bytes_after_first_selection)
-                            .map(|result| (buffer.len(), result)),
-                    );
-                for (end_offset, query_match) in query_matches {
-                    let query_match = query_match.unwrap(); // can only fail due to I/O
-                    let offset_range =
-                        end_offset - query_match.end()..end_offset - query_match.start();
-
-                    if !select_prev_state.wordwise
-                        || (!buffer.is_inside_word(offset_range.start, None)
-                            && !buffer.is_inside_word(offset_range.end, None))
-                    {
-                        next_selected_range = Some(offset_range);
-                        break;
-                    }
-                }
-
-                if let Some(next_selected_range) = next_selected_range {
-                    self.select_match_ranges(
-                        next_selected_range,
-                        last_selection.reversed,
-                        action.replace_newest,
-                        Some(Autoscroll::newest()),
-                        window,
-                        cx,
-                    );
-                } else {
-                    select_prev_state.done = true;
-                }
-            }
-
-            self.select_prev_state = Some(select_prev_state);
-        } else {
-            let mut only_carets = true;
-            let mut same_text_selected = true;
-            let mut selected_text = None;
-
-            let mut selections_iter = selections.iter().peekable();
-            while let Some(selection) = selections_iter.next() {
-                if selection.start != selection.end {
-                    only_carets = false;
-                }
-
-                if same_text_selected {
-                    if selected_text.is_none() {
-                        selected_text =
-                            Some(buffer.text_for_range(selection.range()).collect::<String>());
-                    }
-
-                    if let Some(next_selection) = selections_iter.peek() {
-                        if next_selection.len() == selection.len() {
-                            let next_selected_text = buffer
-                                .text_for_range(next_selection.range())
-                                .collect::<String>();
-                            if Some(next_selected_text) != selected_text {
-                                same_text_selected = false;
-                                selected_text = None;
-                            }
-                        } else {
-                            same_text_selected = false;
-                            selected_text = None;
-                        }
-                    }
-                }
-            }
-
-            if only_carets {
-                for selection in &mut selections {
-                    let (word_range, _) = buffer.surrounding_word(selection.start, None);
-                    selection.start = word_range.start;
-                    selection.end = word_range.end;
-                    selection.goal = SelectionGoal::None;
-                    selection.reversed = false;
-                    self.select_match_ranges(
-                        selection.start..selection.end,
-                        selection.reversed,
-                        action.replace_newest,
-                        Some(Autoscroll::newest()),
-                        window,
-                        cx,
-                    );
-                }
-                if selections.len() == 1 {
-                    let selection = selections
-                        .last()
-                        .expect("ensured that there's only one selection");
-                    let query = buffer
-                        .text_for_range(selection.start..selection.end)
-                        .collect::<String>();
-                    let is_empty = query.is_empty();
-                    let select_state = SelectNextState {
-                        query: self.build_query(&[query.chars().rev().collect::<String>()], cx)?,
-                        wordwise: true,
-                        done: is_empty,
-                    };
-                    self.select_prev_state = Some(select_state);
-                } else {
-                    self.select_prev_state = None;
-                }
-            } else if let Some(selected_text) = selected_text {
-                self.select_prev_state = Some(SelectNextState {
-                    query: self
-                        .build_query(&[selected_text.chars().rev().collect::<String>()], cx)?,
-                    wordwise: false,
-                    done: false,
-                });
-                self.select_previous(action, window, cx)?;
-            }
-        }
-        Ok(())
-    }
-
-    /// Builds an `AhoCorasick` automaton from the provided patterns, while
-    /// setting the case sensitivity based on the global
-    /// `SelectNextCaseSensitive` setting, if set, otherwise based on the
-    /// editor's settings.
-    fn build_query<I, P>(&self, patterns: I, cx: &Context<Self>) -> Result<AhoCorasick, BuildError>
-    where
-        I: IntoIterator<Item = P>,
-        P: AsRef<[u8]>,
-    {
-        let case_sensitive = self.select_next_is_case_sensitive.map_or_else(
-            || EditorSettings::get_global(cx).search.case_sensitive,
-            |value| value,
-        );
-
-        let mut builder = AhoCorasickBuilder::new();
-        builder.ascii_case_insensitive(!case_sensitive);
-        builder.build(patterns)
-    }
-
-    pub fn find_next_match(
-        &mut self,
-        _: &FindNextMatch,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Result<()> {
-        let selections = self.selections.disjoint_anchors_arc();
-        match selections.first() {
-            Some(first) if selections.len() >= 2 => {
-                self.change_selections(Default::default(), window, cx, |s| {
-                    s.select_ranges([first.range()]);
-                });
-            }
-            _ => self.select_next(
-                &SelectNext {
-                    replace_newest: true,
-                },
-                window,
-                cx,
-            )?,
-        }
-        Ok(())
-    }
-
-    pub fn find_previous_match(
-        &mut self,
-        _: &FindPreviousMatch,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Result<()> {
-        let selections = self.selections.disjoint_anchors_arc();
-        match selections.last() {
-            Some(last) if selections.len() >= 2 => {
-                self.change_selections(Default::default(), window, cx, |s| {
-                    s.select_ranges([last.range()]);
-                });
-            }
-            _ => self.select_previous(
-                &SelectPrevious {
-                    replace_newest: true,
-                },
-                window,
-                cx,
-            )?,
-        }
-        Ok(())
-    }
-
-    pub fn toggle_comments(
-        &mut self,
-        action: &ToggleComments,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.read_only(cx) {
-            return;
-        }
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-        let text_layout_details = &self.text_layout_details(window);
-        self.transact(window, cx, |this, window, cx| {
-            let mut selections = this
-                .selections
-                .all::<MultiBufferPoint>(&this.display_snapshot(cx));
-            let mut edits = Vec::new();
-            let mut selection_edit_ranges = Vec::new();
-            let mut last_toggled_row = None;
-            let snapshot = this.buffer.read(cx).read(cx);
-            let empty_str: Arc<str> = Arc::default();
-            let mut suffixes_inserted = Vec::new();
-            let ignore_indent = action.ignore_indent;
-
-            fn comment_prefix_range(
-                snapshot: &MultiBufferSnapshot,
-                row: MultiBufferRow,
-                comment_prefix: &str,
-                comment_prefix_whitespace: &str,
-                ignore_indent: bool,
-            ) -> Range<Point> {
-                let indent_size = if ignore_indent {
-                    0
-                } else {
-                    snapshot.indent_size_for_line(row).len
-                };
-
-                let start = Point::new(row.0, indent_size);
-
-                let mut line_bytes = snapshot
-                    .bytes_in_range(start..snapshot.max_point())
-                    .flatten()
-                    .copied();
-
-                // If this line currently begins with the line comment prefix, then record
-                // the range containing the prefix.
-                if line_bytes
-                    .by_ref()
-                    .take(comment_prefix.len())
-                    .eq(comment_prefix.bytes())
-                {
-                    // Include any whitespace that matches the comment prefix.
-                    let matching_whitespace_len = line_bytes
-                        .zip(comment_prefix_whitespace.bytes())
-                        .take_while(|(a, b)| a == b)
-                        .count() as u32;
-                    let end = Point::new(
-                        start.row,
-                        start.column + comment_prefix.len() as u32 + matching_whitespace_len,
-                    );
-                    start..end
-                } else {
-                    start..start
-                }
-            }
-
-            fn comment_suffix_range(
-                snapshot: &MultiBufferSnapshot,
-                row: MultiBufferRow,
-                comment_suffix: &str,
-                comment_suffix_has_leading_space: bool,
-            ) -> Range<Point> {
-                let end = Point::new(row.0, snapshot.line_len(row));
-                let suffix_start_column = end.column.saturating_sub(comment_suffix.len() as u32);
-
-                let mut line_end_bytes = snapshot
-                    .bytes_in_range(Point::new(end.row, suffix_start_column.saturating_sub(1))..end)
-                    .flatten()
-                    .copied();
-
-                let leading_space_len = if suffix_start_column > 0
-                    && line_end_bytes.next() == Some(b' ')
-                    && comment_suffix_has_leading_space
-                {
-                    1
-                } else {
-                    0
-                };
-
-                // If this line currently begins with the line comment prefix, then record
-                // the range containing the prefix.
-                if line_end_bytes.by_ref().eq(comment_suffix.bytes()) {
-                    let start = Point::new(end.row, suffix_start_column - leading_space_len);
-                    start..end
-                } else {
-                    end..end
-                }
-            }
-
-            // TODO: Handle selections that cross excerpts
-            for selection in &mut selections {
-                let start_column = snapshot
-                    .indent_size_for_line(MultiBufferRow(selection.start.row))
-                    .len;
-                let language = if let Some(language) =
-                    snapshot.language_scope_at(Point::new(selection.start.row, start_column))
-                {
-                    language
-                } else {
-                    continue;
-                };
-
-                selection_edit_ranges.clear();
-
-                // If multiple selections contain a given row, avoid processing that
-                // row more than once.
-                let mut start_row = MultiBufferRow(selection.start.row);
-                if last_toggled_row == Some(start_row) {
-                    start_row = start_row.next_row();
-                }
-                let end_row =
-                    if selection.end.row > selection.start.row && selection.end.column == 0 {
-                        MultiBufferRow(selection.end.row - 1)
-                    } else {
-                        MultiBufferRow(selection.end.row)
-                    };
-                last_toggled_row = Some(end_row);
-
-                if start_row > end_row {
-                    continue;
-                }
-
-                // If the language has line comments, toggle those.
-                let mut full_comment_prefixes = language.line_comment_prefixes().to_vec();
-
-                // If ignore_indent is set, trim spaces from the right side of all full_comment_prefixes
-                if ignore_indent {
-                    full_comment_prefixes = full_comment_prefixes
-                        .into_iter()
-                        .map(|s| Arc::from(s.trim_end()))
-                        .collect();
-                }
-
-                if !full_comment_prefixes.is_empty() {
-                    let first_prefix = full_comment_prefixes
-                        .first()
-                        .expect("prefixes is non-empty");
-                    let prefix_trimmed_lengths = full_comment_prefixes
-                        .iter()
-                        .map(|p| p.trim_end_matches(' ').len())
-                        .collect::<SmallVec<[usize; 4]>>();
-
-                    let mut all_selection_lines_are_comments = true;
-
-                    for row in start_row.0..=end_row.0 {
-                        let row = MultiBufferRow(row);
-                        if start_row < end_row && snapshot.is_line_blank(row) {
-                            continue;
-                        }
-
-                        let prefix_range = full_comment_prefixes
-                            .iter()
-                            .zip(prefix_trimmed_lengths.iter().copied())
-                            .map(|(prefix, trimmed_prefix_len)| {
-                                comment_prefix_range(
-                                    snapshot.deref(),
-                                    row,
-                                    &prefix[..trimmed_prefix_len],
-                                    &prefix[trimmed_prefix_len..],
-                                    ignore_indent,
-                                )
-                            })
-                            .max_by_key(|range| range.end.column - range.start.column)
-                            .expect("prefixes is non-empty");
-
-                        if prefix_range.is_empty() {
-                            all_selection_lines_are_comments = false;
-                        }
-
-                        selection_edit_ranges.push(prefix_range);
-                    }
-
-                    if all_selection_lines_are_comments {
-                        edits.extend(
-                            selection_edit_ranges
-                                .iter()
-                                .cloned()
-                                .map(|range| (range, empty_str.clone())),
-                        );
-                    } else {
-                        let min_column = selection_edit_ranges
-                            .iter()
-                            .map(|range| range.start.column)
-                            .min()
-                            .unwrap_or(0);
-                        edits.extend(selection_edit_ranges.iter().map(|range| {
-                            let position = Point::new(range.start.row, min_column);
-                            (position..position, first_prefix.clone())
-                        }));
-                    }
-                } else if let Some(BlockCommentConfig {
-                    start: full_comment_prefix,
-                    end: comment_suffix,
-                    ..
-                }) = language.block_comment()
-                {
-                    let comment_prefix = full_comment_prefix.trim_end_matches(' ');
-                    let comment_prefix_whitespace = &full_comment_prefix[comment_prefix.len()..];
-                    let prefix_range = comment_prefix_range(
-                        snapshot.deref(),
-                        start_row,
-                        comment_prefix,
-                        comment_prefix_whitespace,
-                        ignore_indent,
-                    );
-                    let suffix_range = comment_suffix_range(
-                        snapshot.deref(),
-                        end_row,
-                        comment_suffix.trim_start_matches(' '),
-                        comment_suffix.starts_with(' '),
-                    );
-
-                    if prefix_range.is_empty() || suffix_range.is_empty() {
-                        edits.push((
-                            prefix_range.start..prefix_range.start,
-                            full_comment_prefix.clone(),
-                        ));
-                        edits.push((suffix_range.end..suffix_range.end, comment_suffix.clone()));
-                        suffixes_inserted.push((end_row, comment_suffix.len()));
-                    } else {
-                        edits.push((prefix_range, empty_str.clone()));
-                        edits.push((suffix_range, empty_str.clone()));
-                    }
-                } else {
-                    continue;
-                }
-            }
-
-            drop(snapshot);
-            this.buffer.update(cx, |buffer, cx| {
-                buffer.edit(edits, None, cx);
-            });
-
-            // Adjust selections so that they end before any comment suffixes that
-            // were inserted.
-            let mut suffixes_inserted = suffixes_inserted.into_iter().peekable();
-            let mut selections = this.selections.all::<Point>(&this.display_snapshot(cx));
-            let snapshot = this.buffer.read(cx).read(cx);
-            for selection in &mut selections {
-                while let Some((row, suffix_len)) = suffixes_inserted.peek().copied() {
-                    match row.cmp(&MultiBufferRow(selection.end.row)) {
-                        Ordering::Less => {
-                            suffixes_inserted.next();
-                            continue;
-                        }
-                        Ordering::Greater => break,
-                        Ordering::Equal => {
-                            if selection.end.column == snapshot.line_len(row) {
-                                if selection.is_empty() {
-                                    selection.start.column -= suffix_len as u32;
-                                }
-                                selection.end.column -= suffix_len as u32;
-                            }
-                            break;
-                        }
-                    }
-                }
-            }
-
-            drop(snapshot);
-            this.change_selections(Default::default(), window, cx, |s| s.select(selections));
-
-            let selections = this.selections.all::<Point>(&this.display_snapshot(cx));
-            let selections_on_single_row = selections.windows(2).all(|selections| {
-                selections[0].start.row == selections[1].start.row
-                    && selections[0].end.row == selections[1].end.row
-                    && selections[0].start.row == selections[0].end.row
-            });
-            let selections_selecting = selections
-                .iter()
-                .any(|selection| selection.start != selection.end);
-            let advance_downwards = action.advance_downwards
-                && selections_on_single_row
-                && !selections_selecting
-                && !matches!(this.mode, EditorMode::SingleLine);
-
-            if advance_downwards {
-                let snapshot = this.buffer.read(cx).snapshot(cx);
-
-                this.change_selections(Default::default(), window, cx, |s| {
-                    s.move_cursors_with(|display_snapshot, display_point, _| {
-                        let mut point = display_point.to_point(display_snapshot);
-                        point.row += 1;
-                        point = snapshot.clip_point(point, Bias::Left);
-                        let display_point = point.to_display_point(display_snapshot);
-                        let goal = SelectionGoal::HorizontalPosition(
-                            display_snapshot
-                                .x_for_display_point(display_point, text_layout_details)
-                                .into(),
-                        );
-                        (display_point, goal)
-                    })
-                });
-            }
-        });
-    }
-
-    pub fn select_enclosing_symbol(
-        &mut self,
-        _: &SelectEnclosingSymbol,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-
-        let buffer = self.buffer.read(cx).snapshot(cx);
-        let old_selections = self
-            .selections
-            .all::<MultiBufferOffset>(&self.display_snapshot(cx))
-            .into_boxed_slice();
-
-        fn update_selection(
-            selection: &Selection<MultiBufferOffset>,
-            buffer_snap: &MultiBufferSnapshot,
-        ) -> Option<Selection<MultiBufferOffset>> {
-            let cursor = selection.head();
-            let (_buffer_id, symbols) = buffer_snap.symbols_containing(cursor, None)?;
-            for symbol in symbols.iter().rev() {
-                let start = symbol.range.start.to_offset(buffer_snap);
-                let end = symbol.range.end.to_offset(buffer_snap);
-                let new_range = start..end;
-                if start < selection.start || end > selection.end {
-                    return Some(Selection {
-                        id: selection.id,
-                        start: new_range.start,
-                        end: new_range.end,
-                        goal: SelectionGoal::None,
-                        reversed: selection.reversed,
-                    });
-                }
-            }
-            None
-        }
-
-        let mut selected_larger_symbol = false;
-        let new_selections = old_selections
-            .iter()
-            .map(|selection| match update_selection(selection, &buffer) {
-                Some(new_selection) => {
-                    if new_selection.range() != selection.range() {
-                        selected_larger_symbol = true;
-                    }
-                    new_selection
-                }
-                None => selection.clone(),
-            })
-            .collect::<Vec<_>>();
-
-        if selected_larger_symbol {
-            self.change_selections(Default::default(), window, cx, |s| {
-                s.select(new_selections);
-            });
-        }
-    }
-
-    pub fn select_larger_syntax_node(
-        &mut self,
-        _: &SelectLargerSyntaxNode,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(visible_row_count) = self.visible_row_count() else {
-            return;
-        };
-        let old_selections: Box<[_]> = self
-            .selections
-            .all::<MultiBufferOffset>(&self.display_snapshot(cx))
-            .into();
-        if old_selections.is_empty() {
-            return;
-        }
-
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-        let buffer = self.buffer.read(cx).snapshot(cx);
-
-        let mut selected_larger_node = false;
-        let mut new_selections = old_selections
-            .iter()
-            .map(|selection| {
-                let old_range = selection.start..selection.end;
-
-                if let Some((node, _)) = buffer.syntax_ancestor(old_range.clone()) {
-                    // manually select word at selection
-                    if ["string_content", "inline"].contains(&node.kind()) {
-                        let (word_range, _) = buffer.surrounding_word(old_range.start, None);
-                        // ignore if word is already selected
-                        if !word_range.is_empty() && old_range != word_range {
-                            let (last_word_range, _) = buffer.surrounding_word(old_range.end, None);
-                            // only select word if start and end point belongs to same word
-                            if word_range == last_word_range {
-                                selected_larger_node = true;
-                                return Selection {
-                                    id: selection.id,
-                                    start: word_range.start,
-                                    end: word_range.end,
-                                    goal: SelectionGoal::None,
-                                    reversed: selection.reversed,
-                                };
-                            }
-                        }
-                    }
-                }
-
-                let mut new_range = old_range.clone();
-                while let Some((node, range)) = buffer.syntax_ancestor(new_range.clone()) {
-                    new_range = range;
-                    if !node.is_named() {
-                        continue;
-                    }
-                    if !display_map.intersects_fold(new_range.start)
-                        && !display_map.intersects_fold(new_range.end)
-                    {
-                        break;
-                    }
-                }
-
-                selected_larger_node |= new_range != old_range;
-                Selection {
-                    id: selection.id,
-                    start: new_range.start,
-                    end: new_range.end,
-                    goal: SelectionGoal::None,
-                    reversed: selection.reversed,
-                }
-            })
-            .collect::<Vec<_>>();
-
-        if !selected_larger_node {
-            return; // don't put this call in the history
-        }
-
-        // scroll based on transformation done to the last selection created by the user
-        let (last_old, last_new) = old_selections
-            .last()
-            .zip(new_selections.last().cloned())
-            .expect("old_selections isn't empty");
-
-        // revert selection
-        let is_selection_reversed = {
-            let should_newest_selection_be_reversed = last_old.start != last_new.start;
-            new_selections.last_mut().expect("checked above").reversed =
-                should_newest_selection_be_reversed;
-            should_newest_selection_be_reversed
-        };
-
-        if selected_larger_node {
-            self.select_syntax_node_history.disable_clearing = true;
-            self.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                s.select(new_selections.clone());
-            });
-            self.select_syntax_node_history.disable_clearing = false;
-        }
-
-        let start_row = last_new.start.to_display_point(&display_map).row().0;
-        let end_row = last_new.end.to_display_point(&display_map).row().0;
-        let selection_height = end_row - start_row + 1;
-        let scroll_margin_rows = self.vertical_scroll_margin() as u32;
-
-        let fits_on_the_screen = visible_row_count >= selection_height + scroll_margin_rows * 2;
-        let scroll_behavior = if fits_on_the_screen {
-            self.request_autoscroll(Autoscroll::fit(), cx);
-            SelectSyntaxNodeScrollBehavior::FitSelection
-        } else if is_selection_reversed {
-            self.scroll_cursor_top(&ScrollCursorTop, window, cx);
-            SelectSyntaxNodeScrollBehavior::CursorTop
-        } else {
-            self.scroll_cursor_bottom(&ScrollCursorBottom, window, cx);
-            SelectSyntaxNodeScrollBehavior::CursorBottom
-        };
-
-        self.select_syntax_node_history.push((
-            old_selections,
-            scroll_behavior,
-            is_selection_reversed,
-        ));
-    }
-
-    pub fn select_smaller_syntax_node(
-        &mut self,
-        _: &SelectSmallerSyntaxNode,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-
-        if let Some((mut selections, scroll_behavior, is_selection_reversed)) =
-            self.select_syntax_node_history.pop()
-        {
-            if let Some(selection) = selections.last_mut() {
-                selection.reversed = is_selection_reversed;
-            }
-
-            self.select_syntax_node_history.disable_clearing = true;
-            self.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                s.select(selections.to_vec());
-            });
-            self.select_syntax_node_history.disable_clearing = false;
-
-            match scroll_behavior {
-                SelectSyntaxNodeScrollBehavior::CursorTop => {
-                    self.scroll_cursor_top(&ScrollCursorTop, window, cx);
-                }
-                SelectSyntaxNodeScrollBehavior::FitSelection => {
-                    self.request_autoscroll(Autoscroll::fit(), cx);
-                }
-                SelectSyntaxNodeScrollBehavior::CursorBottom => {
-                    self.scroll_cursor_bottom(&ScrollCursorBottom, window, cx);
-                }
-            }
-        }
-    }
-
-    pub fn unwrap_syntax_node(
-        &mut self,
-        _: &UnwrapSyntaxNode,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-
-        let buffer = self.buffer.read(cx).snapshot(cx);
-        let selections = self
-            .selections
-            .all::<MultiBufferOffset>(&self.display_snapshot(cx))
-            .into_iter()
-            // subtracting the offset requires sorting
-            .sorted_by_key(|i| i.start);
-
-        let full_edits = selections
-            .into_iter()
-            .filter_map(|selection| {
-                let child = if selection.is_empty()
-                    && let Some((_, ancestor_range)) =
-                        buffer.syntax_ancestor(selection.start..selection.end)
-                {
-                    ancestor_range
-                } else {
-                    selection.range()
-                };
-
-                let mut parent = child.clone();
-                while let Some((_, ancestor_range)) = buffer.syntax_ancestor(parent.clone()) {
-                    parent = ancestor_range;
-                    if parent.start < child.start || parent.end > child.end {
-                        break;
-                    }
-                }
-
-                if parent == child {
-                    return None;
-                }
-                let text = buffer.text_for_range(child).collect::<String>();
-                Some((selection.id, parent, text))
-            })
-            .collect::<Vec<_>>();
-        if full_edits.is_empty() {
-            return;
-        }
-
-        self.transact(window, cx, |this, window, cx| {
-            this.buffer.update(cx, |buffer, cx| {
-                buffer.edit(
-                    full_edits
-                        .iter()
-                        .map(|(_, p, t)| (p.clone(), t.clone()))
-                        .collect::<Vec<_>>(),
-                    None,
-                    cx,
-                );
-            });
-            this.change_selections(Default::default(), window, cx, |s| {
-                let mut offset = 0;
-                let mut selections = vec![];
-                for (id, parent, text) in full_edits {
-                    let start = parent.start - offset;
-                    offset += (parent.end - parent.start) - text.len();
-                    selections.push(Selection {
-                        id,
-                        start,
-                        end: start + text.len(),
-                        reversed: false,
-                        goal: Default::default(),
-                    });
-                }
-                s.select(selections);
-            });
-        });
-    }
-
-    pub fn select_next_syntax_node(
-        &mut self,
-        _: &SelectNextSyntaxNode,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let old_selections: Box<[_]> = self
-            .selections
-            .all::<MultiBufferOffset>(&self.display_snapshot(cx))
-            .into();
-        if old_selections.is_empty() {
-            return;
-        }
-
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-
-        let buffer = self.buffer.read(cx).snapshot(cx);
-        let mut selected_sibling = false;
-
-        let new_selections = old_selections
-            .iter()
-            .map(|selection| {
-                let old_range = selection.start..selection.end;
-
-                let old_range =
-                    old_range.start.to_offset(&buffer)..old_range.end.to_offset(&buffer);
-                let excerpt = buffer.excerpt_containing(old_range.clone());
-
-                if let Some(mut excerpt) = excerpt
-                    && let Some(node) = excerpt
-                        .buffer()
-                        .syntax_next_sibling(excerpt.map_range_to_buffer(old_range))
-                {
-                    let new_range = excerpt.map_range_from_buffer(
-                        BufferOffset(node.byte_range().start)..BufferOffset(node.byte_range().end),
-                    );
-                    selected_sibling = true;
-                    Selection {
-                        id: selection.id,
-                        start: new_range.start,
-                        end: new_range.end,
-                        goal: SelectionGoal::None,
-                        reversed: selection.reversed,
-                    }
-                } else {
-                    selection.clone()
-                }
-            })
-            .collect::<Vec<_>>();
-
-        if selected_sibling {
-            self.change_selections(
-                SelectionEffects::scroll(Autoscroll::fit()),
-                window,
-                cx,
-                |s| {
-                    s.select(new_selections);
-                },
-            );
-        }
-    }
-
-    pub fn select_prev_syntax_node(
-        &mut self,
-        _: &SelectPreviousSyntaxNode,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let old_selections: Box<[_]> = self
-            .selections
-            .all::<MultiBufferOffset>(&self.display_snapshot(cx))
-            .into();
-        if old_selections.is_empty() {
-            return;
-        }
-
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-
-        let buffer = self.buffer.read(cx).snapshot(cx);
-        let mut selected_sibling = false;
-
-        let new_selections = old_selections
-            .iter()
-            .map(|selection| {
-                let old_range = selection.start..selection.end;
-                let old_range =
-                    old_range.start.to_offset(&buffer)..old_range.end.to_offset(&buffer);
-                let excerpt = buffer.excerpt_containing(old_range.clone());
-
-                if let Some(mut excerpt) = excerpt
-                    && let Some(node) = excerpt
-                        .buffer()
-                        .syntax_prev_sibling(excerpt.map_range_to_buffer(old_range))
-                {
-                    let new_range = excerpt.map_range_from_buffer(
-                        BufferOffset(node.byte_range().start)..BufferOffset(node.byte_range().end),
-                    );
-                    selected_sibling = true;
-                    Selection {
-                        id: selection.id,
-                        start: new_range.start,
-                        end: new_range.end,
-                        goal: SelectionGoal::None,
-                        reversed: selection.reversed,
-                    }
-                } else {
-                    selection.clone()
-                }
-            })
-            .collect::<Vec<_>>();
-
-        if selected_sibling {
-            self.change_selections(
-                SelectionEffects::scroll(Autoscroll::fit()),
-                window,
-                cx,
-                |s| {
-                    s.select(new_selections);
-                },
-            );
-        }
-    }
-
-    fn refresh_runnables(&mut self, window: &mut Window, cx: &mut Context<Self>) -> Task<()> {
-        if !EditorSettings::get_global(cx).gutter.runnables {
-            self.clear_tasks();
-            return Task::ready(());
-        }
-        let project = self.project().map(Entity::downgrade);
-        let task_sources = self.lsp_task_sources(cx);
-        let multi_buffer = self.buffer.downgrade();
-        cx.spawn_in(window, async move |editor, cx| {
-            cx.background_executor().timer(UPDATE_DEBOUNCE).await;
-            let Some(project) = project.and_then(|p| p.upgrade()) else {
-                return;
-            };
-            let Ok(display_snapshot) = editor.update(cx, |this, cx| {
-                this.display_map.update(cx, |map, cx| map.snapshot(cx))
-            }) else {
-                return;
-            };
-
-            let hide_runnables = project
-                .update(cx, |project, _| project.is_via_collab())
-                .unwrap_or(true);
-            if hide_runnables {
-                return;
-            }
-            let new_rows =
-                cx.background_spawn({
-                    let snapshot = display_snapshot.clone();
-                    async move {
-                        Self::fetch_runnable_ranges(&snapshot, Anchor::min()..Anchor::max())
-                    }
-                })
-                    .await;
-            let Ok(lsp_tasks) =
-                cx.update(|_, cx| crate::lsp_tasks(project.clone(), &task_sources, None, cx))
-            else {
-                return;
-            };
-            let lsp_tasks = lsp_tasks.await;
-
-            let Ok(mut lsp_tasks_by_rows) = cx.update(|_, cx| {
-                lsp_tasks
-                    .into_iter()
-                    .flat_map(|(kind, tasks)| {
-                        tasks.into_iter().filter_map(move |(location, task)| {
-                            Some((kind.clone(), location?, task))
-                        })
-                    })
-                    .fold(HashMap::default(), |mut acc, (kind, location, task)| {
-                        let buffer = location.target.buffer;
-                        let buffer_snapshot = buffer.read(cx).snapshot();
-                        let offset = display_snapshot.buffer_snapshot().excerpts().find_map(
-                            |(excerpt_id, snapshot, _)| {
-                                if snapshot.remote_id() == buffer_snapshot.remote_id() {
-                                    display_snapshot
-                                        .buffer_snapshot()
-                                        .anchor_in_excerpt(excerpt_id, location.target.range.start)
-                                } else {
-                                    None
-                                }
-                            },
-                        );
-                        if let Some(offset) = offset {
-                            let task_buffer_range =
-                                location.target.range.to_point(&buffer_snapshot);
-                            let context_buffer_range =
-                                task_buffer_range.to_offset(&buffer_snapshot);
-                            let context_range = BufferOffset(context_buffer_range.start)
-                                ..BufferOffset(context_buffer_range.end);
-
-                            acc.entry((buffer_snapshot.remote_id(), task_buffer_range.start.row))
-                                .or_insert_with(|| RunnableTasks {
-                                    templates: Vec::new(),
-                                    offset,
-                                    column: task_buffer_range.start.column,
-                                    extra_variables: HashMap::default(),
-                                    context_range,
-                                })
-                                .templates
-                                .push((kind, task.original_task().clone()));
-                        }
-
-                        acc
-                    })
-            }) else {
-                return;
-            };
-
-            let Ok(prefer_lsp) = multi_buffer.update(cx, |buffer, cx| {
-                buffer.language_settings(cx).tasks.prefer_lsp
-            }) else {
-                return;
-            };
-
-            let rows = Self::runnable_rows(
-                project,
-                display_snapshot,
-                prefer_lsp && !lsp_tasks_by_rows.is_empty(),
-                new_rows,
-                cx.clone(),
-            )
-            .await;
-            editor
-                .update(cx, |editor, _| {
-                    editor.clear_tasks();
-                    for (key, mut value) in rows {
-                        if let Some(lsp_tasks) = lsp_tasks_by_rows.remove(&key) {
-                            value.templates.extend(lsp_tasks.templates);
-                        }
-
-                        editor.insert_tasks(key, value);
-                    }
-                    for (key, value) in lsp_tasks_by_rows {
-                        editor.insert_tasks(key, value);
-                    }
-                })
-                .ok();
-        })
-    }
-    fn fetch_runnable_ranges(
-        snapshot: &DisplaySnapshot,
-        range: Range<Anchor>,
-    ) -> Vec<(Range<MultiBufferOffset>, language::RunnableRange)> {
-        snapshot.buffer_snapshot().runnable_ranges(range).collect()
-    }
-
-    fn runnable_rows(
-        project: Entity<Project>,
-        snapshot: DisplaySnapshot,
-        prefer_lsp: bool,
-        runnable_ranges: Vec<(Range<MultiBufferOffset>, language::RunnableRange)>,
-        cx: AsyncWindowContext,
-    ) -> Task<Vec<((BufferId, BufferRow), RunnableTasks)>> {
-        cx.spawn(async move |cx| {
-            let mut runnable_rows = Vec::with_capacity(runnable_ranges.len());
-            for (run_range, mut runnable) in runnable_ranges {
-                let Some(tasks) = cx
-                    .update(|_, cx| Self::templates_with_tags(&project, &mut runnable.runnable, cx))
-                    .ok()
-                else {
-                    continue;
-                };
-                let mut tasks = tasks.await;
-
-                if prefer_lsp {
-                    tasks.retain(|(task_kind, _)| {
-                        !matches!(task_kind, TaskSourceKind::Language { .. })
-                    });
-                }
-                if tasks.is_empty() {
-                    continue;
-                }
-
-                let point = run_range.start.to_point(&snapshot.buffer_snapshot());
-                let Some(row) = snapshot
-                    .buffer_snapshot()
-                    .buffer_line_for_row(MultiBufferRow(point.row))
-                    .map(|(_, range)| range.start.row)
-                else {
-                    continue;
-                };
-
-                let context_range =
-                    BufferOffset(runnable.full_range.start)..BufferOffset(runnable.full_range.end);
-                runnable_rows.push((
-                    (runnable.buffer_id, row),
-                    RunnableTasks {
-                        templates: tasks,
-                        offset: snapshot.buffer_snapshot().anchor_before(run_range.start),
-                        context_range,
-                        column: point.column,
-                        extra_variables: runnable.extra_captures,
-                    },
-                ));
-            }
-            runnable_rows
-        })
-    }
-
-    fn templates_with_tags(
-        project: &Entity<Project>,
-        runnable: &mut Runnable,
-        cx: &mut App,
-    ) -> Task<Vec<(TaskSourceKind, TaskTemplate)>> {
-        let (inventory, worktree_id, file) = project.read_with(cx, |project, cx| {
-            let (worktree_id, file) = project
-                .buffer_for_id(runnable.buffer, cx)
-                .and_then(|buffer| buffer.read(cx).file())
-                .map(|file| (file.worktree_id(cx), file.clone()))
-                .unzip();
-
-            (
-                project.task_store().read(cx).task_inventory().cloned(),
-                worktree_id,
-                file,
-            )
-        });
-
-        let tags = mem::take(&mut runnable.tags);
-        let language = runnable.language.clone();
-        cx.spawn(async move |cx| {
-            let mut templates_with_tags = Vec::new();
-            if let Some(inventory) = inventory {
-                for RunnableTag(tag) in tags {
-                    let Ok(new_tasks) = inventory.update(cx, |inventory, cx| {
-                        inventory.list_tasks(file.clone(), Some(language.clone()), worktree_id, cx)
-                    }) else {
-                        return templates_with_tags;
-                    };
-                    templates_with_tags.extend(new_tasks.await.into_iter().filter(
-                        move |(_, template)| {
-                            template.tags.iter().any(|source_tag| source_tag == &tag)
-                        },
-                    ));
-                }
-            }
-            templates_with_tags.sort_by_key(|(kind, _)| kind.to_owned());
-
-            if let Some((leading_tag_source, _)) = templates_with_tags.first() {
-                // Strongest source wins; if we have worktree tag binding, prefer that to
-                // global and language bindings;
-                // if we have a global binding, prefer that to language binding.
-                let first_mismatch = templates_with_tags
-                    .iter()
-                    .position(|(tag_source, _)| tag_source != leading_tag_source);
-                if let Some(index) = first_mismatch {
-                    templates_with_tags.truncate(index);
-                }
-            }
-
-            templates_with_tags
-        })
-    }
-
-    pub fn move_to_enclosing_bracket(
-        &mut self,
-        _: &MoveToEnclosingBracket,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.move_offsets_with(|snapshot, selection| {
-                let Some(enclosing_bracket_ranges) =
-                    snapshot.enclosing_bracket_ranges(selection.start..selection.end)
-                else {
-                    return;
-                };
-
-                let mut best_length = usize::MAX;
-                let mut best_inside = false;
-                let mut best_in_bracket_range = false;
-                let mut best_destination = None;
-                for (open, close) in enclosing_bracket_ranges {
-                    let close = close.to_inclusive();
-                    let length = *close.end() - open.start;
-                    let inside = selection.start >= open.end && selection.end <= *close.start();
-                    let in_bracket_range = open.to_inclusive().contains(&selection.head())
-                        || close.contains(&selection.head());
-
-                    // If best is next to a bracket and current isn't, skip
-                    if !in_bracket_range && best_in_bracket_range {
-                        continue;
-                    }
-
-                    // Prefer smaller lengths unless best is inside and current isn't
-                    if length > best_length && (best_inside || !inside) {
-                        continue;
-                    }
-
-                    best_length = length;
-                    best_inside = inside;
-                    best_in_bracket_range = in_bracket_range;
-                    best_destination = Some(
-                        if close.contains(&selection.start) && close.contains(&selection.end) {
-                            if inside { open.end } else { open.start }
-                        } else if inside {
-                            *close.start()
-                        } else {
-                            *close.end()
-                        },
-                    );
-                }
-
-                if let Some(destination) = best_destination {
-                    selection.collapse_to(destination, SelectionGoal::None);
-                }
-            })
-        });
-    }
-
-    pub fn undo_selection(
-        &mut self,
-        _: &UndoSelection,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        if let Some(entry) = self.selection_history.undo_stack.pop_back() {
-            self.selection_history.mode = SelectionHistoryMode::Undoing;
-            self.with_selection_effects_deferred(window, cx, |this, window, cx| {
-                this.end_selection(window, cx);
-                this.change_selections(
-                    SelectionEffects::scroll(Autoscroll::newest()),
-                    window,
-                    cx,
-                    |s| s.select_anchors(entry.selections.to_vec()),
-                );
-            });
-            self.selection_history.mode = SelectionHistoryMode::Normal;
-
-            self.select_next_state = entry.select_next_state;
-            self.select_prev_state = entry.select_prev_state;
-            self.add_selections_state = entry.add_selections_state;
-        }
-    }
-
-    pub fn redo_selection(
-        &mut self,
-        _: &RedoSelection,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        if let Some(entry) = self.selection_history.redo_stack.pop_back() {
-            self.selection_history.mode = SelectionHistoryMode::Redoing;
-            self.with_selection_effects_deferred(window, cx, |this, window, cx| {
-                this.end_selection(window, cx);
-                this.change_selections(
-                    SelectionEffects::scroll(Autoscroll::newest()),
-                    window,
-                    cx,
-                    |s| s.select_anchors(entry.selections.to_vec()),
-                );
-            });
-            self.selection_history.mode = SelectionHistoryMode::Normal;
-
-            self.select_next_state = entry.select_next_state;
-            self.select_prev_state = entry.select_prev_state;
-            self.add_selections_state = entry.add_selections_state;
-        }
-    }
-
-    pub fn expand_excerpts(
-        &mut self,
-        action: &ExpandExcerpts,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.expand_excerpts_for_direction(action.lines, ExpandExcerptDirection::UpAndDown, cx)
-    }
-
-    pub fn expand_excerpts_down(
-        &mut self,
-        action: &ExpandExcerptsDown,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.expand_excerpts_for_direction(action.lines, ExpandExcerptDirection::Down, cx)
-    }
-
-    pub fn expand_excerpts_up(
-        &mut self,
-        action: &ExpandExcerptsUp,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.expand_excerpts_for_direction(action.lines, ExpandExcerptDirection::Up, cx)
-    }
-
-    pub fn expand_excerpts_for_direction(
-        &mut self,
-        lines: u32,
-        direction: ExpandExcerptDirection,
-
-        cx: &mut Context<Self>,
-    ) {
-        let selections = self.selections.disjoint_anchors_arc();
-
-        let lines = if lines == 0 {
-            EditorSettings::get_global(cx).expand_excerpt_lines
-        } else {
-            lines
-        };
-
-        self.buffer.update(cx, |buffer, cx| {
-            let snapshot = buffer.snapshot(cx);
-            let mut excerpt_ids = selections
-                .iter()
-                .flat_map(|selection| snapshot.excerpt_ids_for_range(selection.range()))
-                .collect::<Vec<_>>();
-            excerpt_ids.sort();
-            excerpt_ids.dedup();
-            buffer.expand_excerpts(excerpt_ids, lines, direction, cx)
-        })
-    }
-
-    pub fn expand_excerpt(
-        &mut self,
-        excerpt: ExcerptId,
-        direction: ExpandExcerptDirection,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let current_scroll_position = self.scroll_position(cx);
-        let lines_to_expand = EditorSettings::get_global(cx).expand_excerpt_lines;
-        let mut scroll = None;
-
-        if direction == ExpandExcerptDirection::Down {
-            let multi_buffer = self.buffer.read(cx);
-            let snapshot = multi_buffer.snapshot(cx);
-            if let Some(buffer_id) = snapshot.buffer_id_for_excerpt(excerpt)
-                && let Some(buffer) = multi_buffer.buffer(buffer_id)
-                && let Some(excerpt_range) = snapshot.context_range_for_excerpt(excerpt)
-            {
-                let buffer_snapshot = buffer.read(cx).snapshot();
-                let excerpt_end_row = Point::from_anchor(&excerpt_range.end, &buffer_snapshot).row;
-                let last_row = buffer_snapshot.max_point().row;
-                let lines_below = last_row.saturating_sub(excerpt_end_row);
-                if lines_below >= lines_to_expand {
-                    scroll = Some(
-                        current_scroll_position
-                            + gpui::Point::new(0.0, lines_to_expand as ScrollOffset),
-                    );
-                }
-            }
-        }
-        if direction == ExpandExcerptDirection::Up
-            && self
-                .buffer
-                .read(cx)
-                .snapshot(cx)
-                .excerpt_before(excerpt)
-                .is_none()
-        {
-            scroll = Some(current_scroll_position);
-        }
-
-        self.buffer.update(cx, |buffer, cx| {
-            buffer.expand_excerpts([excerpt], lines_to_expand, direction, cx)
-        });
-
-        if let Some(new_scroll_position) = scroll {
-            self.set_scroll_position(new_scroll_position, window, cx);
-        }
-    }
-
-    pub fn go_to_singleton_buffer_point(
-        &mut self,
-        point: Point,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.go_to_singleton_buffer_range(point..point, window, cx);
-    }
-
-    pub fn go_to_singleton_buffer_range(
-        &mut self,
-        range: Range<Point>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let multibuffer = self.buffer().read(cx);
-        let Some(buffer) = multibuffer.as_singleton() else {
-            return;
-        };
-        let Some(start) = multibuffer.buffer_point_to_anchor(&buffer, range.start, cx) else {
-            return;
-        };
-        let Some(end) = multibuffer.buffer_point_to_anchor(&buffer, range.end, cx) else {
-            return;
-        };
-        self.change_selections(
-            SelectionEffects::default().nav_history(true),
-            window,
-            cx,
-            |s| s.select_anchor_ranges([start..end]),
-        );
-    }
-
-    pub fn go_to_diagnostic(
-        &mut self,
-        action: &GoToDiagnostic,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if !self.diagnostics_enabled() {
-            return;
-        }
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        self.go_to_diagnostic_impl(Direction::Next, action.severity, window, cx)
-    }
-
-    pub fn go_to_prev_diagnostic(
-        &mut self,
-        action: &GoToPreviousDiagnostic,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if !self.diagnostics_enabled() {
-            return;
-        }
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        self.go_to_diagnostic_impl(Direction::Prev, action.severity, window, cx)
-    }
-
-    pub fn go_to_diagnostic_impl(
-        &mut self,
-        direction: Direction,
-        severity: GoToDiagnosticSeverityFilter,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let buffer = self.buffer.read(cx).snapshot(cx);
-        let selection = self
-            .selections
-            .newest::<MultiBufferOffset>(&self.display_snapshot(cx));
-
-        let mut active_group_id = None;
-        if let ActiveDiagnostic::Group(active_group) = &self.active_diagnostics
-            && active_group.active_range.start.to_offset(&buffer) == selection.start
-        {
-            active_group_id = Some(active_group.group_id);
-        }
-
-        fn filtered<'a>(
-            severity: GoToDiagnosticSeverityFilter,
-            diagnostics: impl Iterator<Item = DiagnosticEntryRef<'a, MultiBufferOffset>>,
-        ) -> impl Iterator<Item = DiagnosticEntryRef<'a, MultiBufferOffset>> {
-            diagnostics
-                .filter(move |entry| severity.matches(entry.diagnostic.severity))
-                .filter(|entry| entry.range.start != entry.range.end)
-                .filter(|entry| !entry.diagnostic.is_unnecessary)
-        }
-
-        let before = filtered(
-            severity,
-            buffer
-                .diagnostics_in_range(MultiBufferOffset(0)..selection.start)
-                .filter(|entry| entry.range.start <= selection.start),
-        );
-        let after = filtered(
-            severity,
-            buffer
-                .diagnostics_in_range(selection.start..buffer.len())
-                .filter(|entry| entry.range.start >= selection.start),
-        );
-
-        let mut found: Option<DiagnosticEntryRef<MultiBufferOffset>> = None;
-        if direction == Direction::Prev {
-            'outer: for prev_diagnostics in [before.collect::<Vec<_>>(), after.collect::<Vec<_>>()]
-            {
-                for diagnostic in prev_diagnostics.into_iter().rev() {
-                    if diagnostic.range.start != selection.start
-                        || active_group_id
-                            .is_some_and(|active| diagnostic.diagnostic.group_id < active)
-                    {
-                        found = Some(diagnostic);
-                        break 'outer;
-                    }
-                }
-            }
-        } else {
-            for diagnostic in after.chain(before) {
-                if diagnostic.range.start != selection.start
-                    || active_group_id.is_some_and(|active| diagnostic.diagnostic.group_id > active)
-                {
-                    found = Some(diagnostic);
-                    break;
-                }
-            }
-        }
-        let Some(next_diagnostic) = found else {
-            return;
-        };
-
-        let next_diagnostic_start = buffer.anchor_after(next_diagnostic.range.start);
-        let Some(buffer_id) = buffer.buffer_id_for_anchor(next_diagnostic_start) else {
-            return;
-        };
-        let snapshot = self.snapshot(window, cx);
-        if snapshot.intersects_fold(next_diagnostic.range.start) {
-            self.unfold_ranges(
-                std::slice::from_ref(&next_diagnostic.range),
-                true,
-                false,
-                cx,
-            );
-        }
-        self.change_selections(Default::default(), window, cx, |s| {
-            s.select_ranges(vec![
-                next_diagnostic.range.start..next_diagnostic.range.start,
-            ])
-        });
-        self.activate_diagnostics(buffer_id, next_diagnostic, window, cx);
-        self.refresh_edit_prediction(false, true, window, cx);
-    }
-
-    pub fn go_to_next_hunk(&mut self, _: &GoToHunk, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        let snapshot = self.snapshot(window, cx);
-        let selection = self.selections.newest::<Point>(&self.display_snapshot(cx));
-        self.go_to_hunk_before_or_after_position(
-            &snapshot,
-            selection.head(),
-            Direction::Next,
-            window,
-            cx,
-        );
-    }
-
-    pub fn go_to_hunk_before_or_after_position(
-        &mut self,
-        snapshot: &EditorSnapshot,
-        position: Point,
-        direction: Direction,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) {
-        let row = if direction == Direction::Next {
-            self.hunk_after_position(snapshot, position)
-                .map(|hunk| hunk.row_range.start)
-        } else {
-            self.hunk_before_position(snapshot, position)
-        };
-
-        if let Some(row) = row {
-            let destination = Point::new(row.0, 0);
-            let autoscroll = Autoscroll::center();
-
-            self.unfold_ranges(&[destination..destination], false, false, cx);
-            self.change_selections(SelectionEffects::scroll(autoscroll), window, cx, |s| {
-                s.select_ranges([destination..destination]);
-            });
-        }
-    }
-
-    fn hunk_after_position(
-        &mut self,
-        snapshot: &EditorSnapshot,
-        position: Point,
-    ) -> Option<MultiBufferDiffHunk> {
-        snapshot
-            .buffer_snapshot()
-            .diff_hunks_in_range(position..snapshot.buffer_snapshot().max_point())
-            .find(|hunk| hunk.row_range.start.0 > position.row)
-            .or_else(|| {
-                snapshot
-                    .buffer_snapshot()
-                    .diff_hunks_in_range(Point::zero()..position)
-                    .find(|hunk| hunk.row_range.end.0 < position.row)
-            })
-    }
-
-    fn go_to_prev_hunk(
-        &mut self,
-        _: &GoToPreviousHunk,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        let snapshot = self.snapshot(window, cx);
-        let selection = self.selections.newest::<Point>(&snapshot.display_snapshot);
-        self.go_to_hunk_before_or_after_position(
-            &snapshot,
-            selection.head(),
-            Direction::Prev,
-            window,
-            cx,
-        );
-    }
-
-    fn hunk_before_position(
-        &mut self,
-        snapshot: &EditorSnapshot,
-        position: Point,
-    ) -> Option<MultiBufferRow> {
-        snapshot
-            .buffer_snapshot()
-            .diff_hunk_before(position)
-            .or_else(|| snapshot.buffer_snapshot().diff_hunk_before(Point::MAX))
-    }
-
-    fn go_to_next_change(
-        &mut self,
-        _: &GoToNextChange,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(selections) = self
-            .change_list
-            .next_change(1, Direction::Next)
-            .map(|s| s.to_vec())
-        {
-            self.change_selections(Default::default(), window, cx, |s| {
-                let map = s.display_snapshot();
-                s.select_display_ranges(selections.iter().map(|a| {
-                    let point = a.to_display_point(&map);
-                    point..point
-                }))
-            })
-        }
-    }
-
-    fn go_to_previous_change(
-        &mut self,
-        _: &GoToPreviousChange,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(selections) = self
-            .change_list
-            .next_change(1, Direction::Prev)
-            .map(|s| s.to_vec())
-        {
-            self.change_selections(Default::default(), window, cx, |s| {
-                let map = s.display_snapshot();
-                s.select_display_ranges(selections.iter().map(|a| {
-                    let point = a.to_display_point(&map);
-                    point..point
-                }))
-            })
-        }
-    }
-
-    pub fn go_to_next_document_highlight(
-        &mut self,
-        _: &GoToNextDocumentHighlight,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.go_to_document_highlight_before_or_after_position(Direction::Next, window, cx);
-    }
-
-    pub fn go_to_prev_document_highlight(
-        &mut self,
-        _: &GoToPreviousDocumentHighlight,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.go_to_document_highlight_before_or_after_position(Direction::Prev, window, cx);
-    }
-
-    pub fn go_to_document_highlight_before_or_after_position(
-        &mut self,
-        direction: Direction,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-        let snapshot = self.snapshot(window, cx);
-        let buffer = &snapshot.buffer_snapshot();
-        let position = self
-            .selections
-            .newest::<Point>(&snapshot.display_snapshot)
-            .head();
-        let anchor_position = buffer.anchor_after(position);
-
-        // Get all document highlights (both read and write)
-        let mut all_highlights = Vec::new();
-
-        if let Some((_, read_highlights)) = self
-            .background_highlights
-            .get(&HighlightKey::Type(TypeId::of::<DocumentHighlightRead>()))
-        {
-            all_highlights.extend(read_highlights.iter());
-        }
-
-        if let Some((_, write_highlights)) = self
-            .background_highlights
-            .get(&HighlightKey::Type(TypeId::of::<DocumentHighlightWrite>()))
-        {
-            all_highlights.extend(write_highlights.iter());
-        }
-
-        if all_highlights.is_empty() {
-            return;
-        }
-
-        // Sort highlights by position
-        all_highlights.sort_by(|a, b| a.start.cmp(&b.start, buffer));
-
-        let target_highlight = match direction {
-            Direction::Next => {
-                // Find the first highlight after the current position
-                all_highlights
-                    .iter()
-                    .find(|highlight| highlight.start.cmp(&anchor_position, buffer).is_gt())
-            }
-            Direction::Prev => {
-                // Find the last highlight before the current position
-                all_highlights
-                    .iter()
-                    .rev()
-                    .find(|highlight| highlight.end.cmp(&anchor_position, buffer).is_lt())
-            }
-        };
-
-        if let Some(highlight) = target_highlight {
-            let destination = highlight.start.to_point(buffer);
-            let autoscroll = Autoscroll::center();
-
-            self.unfold_ranges(&[destination..destination], false, false, cx);
-            self.change_selections(SelectionEffects::scroll(autoscroll), window, cx, |s| {
-                s.select_ranges([destination..destination]);
-            });
-        }
-    }
-
-    fn go_to_line<T: 'static>(
-        &mut self,
-        position: Anchor,
-        highlight_color: Option<Hsla>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let snapshot = self.snapshot(window, cx).display_snapshot;
-        let position = position.to_point(&snapshot.buffer_snapshot());
-        let start = snapshot
-            .buffer_snapshot()
-            .clip_point(Point::new(position.row, 0), Bias::Left);
-        let end = start + Point::new(1, 0);
-        let start = snapshot.buffer_snapshot().anchor_before(start);
-        let end = snapshot.buffer_snapshot().anchor_before(end);
-
-        self.highlight_rows::<T>(
-            start..end,
-            highlight_color
-                .unwrap_or_else(|| cx.theme().colors().editor_highlighted_line_background),
-            Default::default(),
-            cx,
-        );
-
-        if self.buffer.read(cx).is_singleton() {
-            self.request_autoscroll(Autoscroll::center().for_anchor(start), cx);
-        }
-    }
-
-    pub fn go_to_definition(
-        &mut self,
-        _: &GoToDefinition,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Navigated>> {
-        let definition =
-            self.go_to_definition_of_kind(GotoDefinitionKind::Symbol, false, window, cx);
-        let fallback_strategy = EditorSettings::get_global(cx).go_to_definition_fallback;
-        cx.spawn_in(window, async move |editor, cx| {
-            if definition.await? == Navigated::Yes {
-                return Ok(Navigated::Yes);
-            }
-            match fallback_strategy {
-                GoToDefinitionFallback::None => Ok(Navigated::No),
-                GoToDefinitionFallback::FindAllReferences => {
-                    match editor.update_in(cx, |editor, window, cx| {
-                        editor.find_all_references(&FindAllReferences::default(), window, cx)
-                    })? {
-                        Some(references) => references.await,
-                        None => Ok(Navigated::No),
-                    }
-                }
-            }
-        })
-    }
-
-    pub fn go_to_declaration(
-        &mut self,
-        _: &GoToDeclaration,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Navigated>> {
-        self.go_to_definition_of_kind(GotoDefinitionKind::Declaration, false, window, cx)
-    }
-
-    pub fn go_to_declaration_split(
-        &mut self,
-        _: &GoToDeclaration,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Navigated>> {
-        self.go_to_definition_of_kind(GotoDefinitionKind::Declaration, true, window, cx)
-    }
-
-    pub fn go_to_implementation(
-        &mut self,
-        _: &GoToImplementation,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Navigated>> {
-        self.go_to_definition_of_kind(GotoDefinitionKind::Implementation, false, window, cx)
-    }
-
-    pub fn go_to_implementation_split(
-        &mut self,
-        _: &GoToImplementationSplit,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Navigated>> {
-        self.go_to_definition_of_kind(GotoDefinitionKind::Implementation, true, window, cx)
-    }
-
-    pub fn go_to_type_definition(
-        &mut self,
-        _: &GoToTypeDefinition,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Navigated>> {
-        self.go_to_definition_of_kind(GotoDefinitionKind::Type, false, window, cx)
-    }
-
-    pub fn go_to_definition_split(
-        &mut self,
-        _: &GoToDefinitionSplit,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Navigated>> {
-        self.go_to_definition_of_kind(GotoDefinitionKind::Symbol, true, window, cx)
-    }
-
-    pub fn go_to_type_definition_split(
-        &mut self,
-        _: &GoToTypeDefinitionSplit,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Navigated>> {
-        self.go_to_definition_of_kind(GotoDefinitionKind::Type, true, window, cx)
-    }
-
-    fn go_to_definition_of_kind(
-        &mut self,
-        kind: GotoDefinitionKind,
-        split: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Navigated>> {
-        let Some(provider) = self.semantics_provider.clone() else {
-            return Task::ready(Ok(Navigated::No));
-        };
-        let head = self
-            .selections
-            .newest::<MultiBufferOffset>(&self.display_snapshot(cx))
-            .head();
-        let buffer = self.buffer.read(cx);
-        let Some((buffer, head)) = buffer.text_anchor_for_position(head, cx) else {
-            return Task::ready(Ok(Navigated::No));
-        };
-        let Some(definitions) = provider.definitions(&buffer, head, kind, cx) else {
-            return Task::ready(Ok(Navigated::No));
-        };
-
-        cx.spawn_in(window, async move |editor, cx| {
-            let Some(definitions) = definitions.await? else {
-                return Ok(Navigated::No);
-            };
-            let navigated = editor
-                .update_in(cx, |editor, window, cx| {
-                    editor.navigate_to_hover_links(
-                        Some(kind),
-                        definitions
-                            .into_iter()
-                            .filter(|location| {
-                                hover_links::exclude_link_to_position(&buffer, &head, location, cx)
-                            })
-                            .map(HoverLink::Text)
-                            .collect::<Vec<_>>(),
-                        split,
-                        window,
-                        cx,
-                    )
-                })?
-                .await?;
-            anyhow::Ok(navigated)
-        })
-    }
-
-    pub fn open_url(&mut self, _: &OpenUrl, window: &mut Window, cx: &mut Context<Self>) {
-        let selection = self.selections.newest_anchor();
-        let head = selection.head();
-        let tail = selection.tail();
-
-        let Some((buffer, start_position)) =
-            self.buffer.read(cx).text_anchor_for_position(head, cx)
-        else {
-            return;
-        };
-
-        let end_position = if head != tail {
-            let Some((_, pos)) = self.buffer.read(cx).text_anchor_for_position(tail, cx) else {
-                return;
-            };
-            Some(pos)
-        } else {
-            None
-        };
-
-        let url_finder = cx.spawn_in(window, async move |_editor, cx| {
-            let url = if let Some(end_pos) = end_position {
-                find_url_from_range(&buffer, start_position..end_pos, cx.clone())
-            } else {
-                find_url(&buffer, start_position, cx.clone()).map(|(_, url)| url)
-            };
-
-            if let Some(url) = url {
-                cx.update(|window, cx| {
-                    if parse_zed_link(&url, cx).is_some() {
-                        window.dispatch_action(Box::new(zed_actions::OpenZedUrl { url }), cx);
-                    } else {
-                        cx.open_url(&url);
-                    }
-                })?;
-            }
-
-            anyhow::Ok(())
-        });
-
-        url_finder.detach();
-    }
-
-    pub fn open_selected_filename(
-        &mut self,
-        _: &OpenSelectedFilename,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(workspace) = self.workspace() else {
-            return;
-        };
-
-        let position = self.selections.newest_anchor().head();
-
-        let Some((buffer, buffer_position)) =
-            self.buffer.read(cx).text_anchor_for_position(position, cx)
-        else {
-            return;
-        };
-
-        let project = self.project.clone();
-
-        cx.spawn_in(window, async move |_, cx| {
-            let result = find_file(&buffer, project, buffer_position, cx).await;
-
-            if let Some((_, path)) = result {
-                workspace
-                    .update_in(cx, |workspace, window, cx| {
-                        workspace.open_resolved_path(path, window, cx)
-                    })?
-                    .await?;
-            }
-            anyhow::Ok(())
-        })
-        .detach();
-    }
-
-    pub(crate) fn navigate_to_hover_links(
-        &mut self,
-        kind: Option<GotoDefinitionKind>,
-        definitions: Vec<HoverLink>,
-        split: bool,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) -> Task<Result<Navigated>> {
-        // Separate out url and file links, we can only handle one of them at most or an arbitrary number of locations
-        let mut first_url_or_file = None;
-        let definitions: Vec<_> = definitions
-            .into_iter()
-            .filter_map(|def| match def {
-                HoverLink::Text(link) => Some(Task::ready(anyhow::Ok(Some(link.target)))),
-                HoverLink::InlayHint(lsp_location, server_id) => {
-                    let computation =
-                        self.compute_target_location(lsp_location, server_id, window, cx);
-                    Some(cx.background_spawn(computation))
-                }
-                HoverLink::Url(url) => {
-                    first_url_or_file = Some(Either::Left(url));
-                    None
-                }
-                HoverLink::File(path) => {
-                    first_url_or_file = Some(Either::Right(path));
-                    None
-                }
-            })
-            .collect();
-
-        let workspace = self.workspace();
-
-        cx.spawn_in(window, async move |editor, cx| {
-            let locations: Vec<Location> = future::join_all(definitions)
-                .await
-                .into_iter()
-                .filter_map(|location| location.transpose())
-                .collect::<Result<_>>()
-                .context("location tasks")?;
-            let mut locations = cx.update(|_, cx| {
-                locations
-                    .into_iter()
-                    .map(|location| {
-                        let buffer = location.buffer.read(cx);
-                        (location.buffer, location.range.to_point(buffer))
-                    })
-                    .into_group_map()
-            })?;
-            let mut num_locations = 0;
-            for ranges in locations.values_mut() {
-                ranges.sort_by_key(|range| (range.start, Reverse(range.end)));
-                ranges.dedup();
-                num_locations += ranges.len();
-            }
-
-            if num_locations > 1 {
-                let tab_kind = match kind {
-                    Some(GotoDefinitionKind::Implementation) => "Implementations",
-                    Some(GotoDefinitionKind::Symbol) | None => "Definitions",
-                    Some(GotoDefinitionKind::Declaration) => "Declarations",
-                    Some(GotoDefinitionKind::Type) => "Types",
-                };
-                let title = editor
-                    .update_in(cx, |_, _, cx| {
-                        let target = locations
-                            .iter()
-                            .flat_map(|(k, v)| iter::repeat(k.clone()).zip(v))
-                            .map(|(buffer, location)| {
-                                buffer
-                                    .read(cx)
-                                    .text_for_range(location.clone())
-                                    .collect::<String>()
-                            })
-                            .filter(|text| !text.contains('\n'))
-                            .unique()
-                            .take(3)
-                            .join(", ");
-                        if target.is_empty() {
-                            tab_kind.to_owned()
-                        } else {
-                            format!("{tab_kind} for {target}")
-                        }
-                    })
-                    .context("buffer title")?;
-
-                let Some(workspace) = workspace else {
-                    return Ok(Navigated::No);
-                };
-
-                let opened = workspace
-                    .update_in(cx, |workspace, window, cx| {
-                        let allow_preview = PreviewTabsSettings::get_global(cx)
-                            .enable_preview_multibuffer_from_code_navigation;
-                        Self::open_locations_in_multibuffer(
-                            workspace,
-                            locations,
-                            title,
-                            split,
-                            allow_preview,
-                            MultibufferSelectionMode::First,
-                            window,
-                            cx,
-                        )
-                    })
-                    .is_ok();
-
-                anyhow::Ok(Navigated::from_bool(opened))
-            } else if num_locations == 0 {
-                // If there is one url or file, open it directly
-                match first_url_or_file {
-                    Some(Either::Left(url)) => {
-                        cx.update(|_, cx| cx.open_url(&url))?;
-                        Ok(Navigated::Yes)
-                    }
-                    Some(Either::Right(path)) => {
-                        // TODO(andrew): respect preview tab settings
-                        //               `enable_keep_preview_on_code_navigation` and
-                        //               `enable_preview_file_from_code_navigation`
-                        let Some(workspace) = workspace else {
-                            return Ok(Navigated::No);
-                        };
-                        workspace
-                            .update_in(cx, |workspace, window, cx| {
-                                workspace.open_resolved_path(path, window, cx)
-                            })?
-                            .await?;
-                        Ok(Navigated::Yes)
-                    }
-                    None => Ok(Navigated::No),
-                }
-            } else {
-                let (target_buffer, target_ranges) = locations.into_iter().next().unwrap();
-                let target_range = target_ranges.first().unwrap().clone();
-
-                editor.update_in(cx, |editor, window, cx| {
-                    let range = target_range.to_point(target_buffer.read(cx));
-                    let range = editor.range_for_match(&range);
-                    let range = collapse_multiline_range(range);
-
-                    if !split
-                        && Some(&target_buffer) == editor.buffer.read(cx).as_singleton().as_ref()
-                    {
-                        editor.go_to_singleton_buffer_range(range, window, cx);
-                    } else {
-                        let Some(workspace) = workspace else {
-                            return Navigated::No;
-                        };
-                        let pane = workspace.read(cx).active_pane().clone();
-                        window.defer(cx, move |window, cx| {
-                            let target_editor: Entity<Self> =
-                                workspace.update(cx, |workspace, cx| {
-                                    let pane = if split {
-                                        workspace.adjacent_pane(window, cx)
-                                    } else {
-                                        workspace.active_pane().clone()
-                                    };
-
-                                    let preview_tabs_settings = PreviewTabsSettings::get_global(cx);
-                                    let keep_old_preview = preview_tabs_settings
-                                        .enable_keep_preview_on_code_navigation;
-                                    let allow_new_preview = preview_tabs_settings
-                                        .enable_preview_file_from_code_navigation;
-
-                                    workspace.open_project_item(
-                                        pane,
-                                        target_buffer.clone(),
-                                        true,
-                                        true,
-                                        keep_old_preview,
-                                        allow_new_preview,
-                                        window,
-                                        cx,
-                                    )
-                                });
-                            target_editor.update(cx, |target_editor, cx| {
-                                // When selecting a definition in a different buffer, disable the nav history
-                                // to avoid creating a history entry at the previous cursor location.
-                                pane.update(cx, |pane, _| pane.disable_history());
-                                target_editor.go_to_singleton_buffer_range(range, window, cx);
-                                pane.update(cx, |pane, _| pane.enable_history());
-                            });
-                        });
-                    }
-                    Navigated::Yes
-                })
-            }
-        })
-    }
-
-    fn compute_target_location(
-        &self,
-        lsp_location: lsp::Location,
-        server_id: LanguageServerId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<anyhow::Result<Option<Location>>> {
-        let Some(project) = self.project.clone() else {
-            return Task::ready(Ok(None));
-        };
-
-        cx.spawn_in(window, async move |editor, cx| {
-            let location_task = editor.update(cx, |_, cx| {
-                project.update(cx, |project, cx| {
-                    project.open_local_buffer_via_lsp(lsp_location.uri.clone(), server_id, cx)
-                })
-            })?;
-            let location = Some({
-                let target_buffer_handle = location_task.await.context("open local buffer")?;
-                let range = target_buffer_handle.read_with(cx, |target_buffer, _| {
-                    let target_start = target_buffer
-                        .clip_point_utf16(point_from_lsp(lsp_location.range.start), Bias::Left);
-                    let target_end = target_buffer
-                        .clip_point_utf16(point_from_lsp(lsp_location.range.end), Bias::Left);
-                    target_buffer.anchor_after(target_start)
-                        ..target_buffer.anchor_before(target_end)
-                })?;
-                Location {
-                    buffer: target_buffer_handle,
-                    range,
-                }
-            });
-            Ok(location)
-        })
-    }
-
-    fn go_to_next_reference(
-        &mut self,
-        _: &GoToNextReference,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let task = self.go_to_reference_before_or_after_position(Direction::Next, 1, window, cx);
-        if let Some(task) = task {
-            task.detach();
-        };
-    }
-
-    fn go_to_prev_reference(
-        &mut self,
-        _: &GoToPreviousReference,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let task = self.go_to_reference_before_or_after_position(Direction::Prev, 1, window, cx);
-        if let Some(task) = task {
-            task.detach();
-        };
-    }
-
-    pub fn go_to_reference_before_or_after_position(
-        &mut self,
-        direction: Direction,
-        count: usize,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Task<Result<()>>> {
-        let selection = self.selections.newest_anchor();
-        let head = selection.head();
-
-        let multi_buffer = self.buffer.read(cx);
-
-        let (buffer, text_head) = multi_buffer.text_anchor_for_position(head, cx)?;
-        let workspace = self.workspace()?;
-        let project = workspace.read(cx).project().clone();
-        let references =
-            project.update(cx, |project, cx| project.references(&buffer, text_head, cx));
-        Some(cx.spawn_in(window, async move |editor, cx| -> Result<()> {
-            let Some(locations) = references.await? else {
-                return Ok(());
-            };
-
-            if locations.is_empty() {
-                // totally normal - the cursor may be on something which is not
-                // a symbol (e.g. a keyword)
-                log::info!("no references found under cursor");
-                return Ok(());
-            }
-
-            let multi_buffer = editor.read_with(cx, |editor, _| editor.buffer().clone())?;
-
-            let (locations, current_location_index) =
-                multi_buffer.update(cx, |multi_buffer, cx| {
-                    let mut locations = locations
-                        .into_iter()
-                        .filter_map(|loc| {
-                            let start = multi_buffer.buffer_anchor_to_anchor(
-                                &loc.buffer,
-                                loc.range.start,
-                                cx,
-                            )?;
-                            let end = multi_buffer.buffer_anchor_to_anchor(
-                                &loc.buffer,
-                                loc.range.end,
-                                cx,
-                            )?;
-                            Some(start..end)
-                        })
-                        .collect::<Vec<_>>();
-
-                    let multi_buffer_snapshot = multi_buffer.snapshot(cx);
-                    // There is an O(n) implementation, but given this list will be
-                    // small (usually <100 items), the extra O(log(n)) factor isn't
-                    // worth the (surprisingly large amount of) extra complexity.
-                    locations
-                        .sort_unstable_by(|l, r| l.start.cmp(&r.start, &multi_buffer_snapshot));
-
-                    let head_offset = head.to_offset(&multi_buffer_snapshot);
-
-                    let current_location_index = locations.iter().position(|loc| {
-                        loc.start.to_offset(&multi_buffer_snapshot) <= head_offset
-                            && loc.end.to_offset(&multi_buffer_snapshot) >= head_offset
-                    });
-
-                    (locations, current_location_index)
-                })?;
-
-            let Some(current_location_index) = current_location_index else {
-                // This indicates something has gone wrong, because we already
-                // handle the "no references" case above
-                log::error!(
-                    "failed to find current reference under cursor. Total references: {}",
-                    locations.len()
-                );
-                return Ok(());
-            };
-
-            let destination_location_index = match direction {
-                Direction::Next => (current_location_index + count) % locations.len(),
-                Direction::Prev => {
-                    (current_location_index + locations.len() - count % locations.len())
-                        % locations.len()
-                }
-            };
-
-            // TODO(cameron): is this needed?
-            // the thinking is to avoid "jumping to the current location" (avoid
-            // polluting "jumplist" in vim terms)
-            if current_location_index == destination_location_index {
-                return Ok(());
-            }
-
-            let Range { start, end } = locations[destination_location_index];
-
-            editor.update_in(cx, |editor, window, cx| {
-                let effects = SelectionEffects::default();
-
-                editor.unfold_ranges(&[start..end], false, false, cx);
-                editor.change_selections(effects, window, cx, |s| {
-                    s.select_ranges([start..start]);
-                });
-            })?;
-
-            Ok(())
-        }))
-    }
-
-    pub fn find_all_references(
-        &mut self,
-        action: &FindAllReferences,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Task<Result<Navigated>>> {
-        let always_open_multibuffer = action.always_open_multibuffer;
-        let selection = self.selections.newest_anchor();
-        let multi_buffer = self.buffer.read(cx);
-        let multi_buffer_snapshot = multi_buffer.snapshot(cx);
-        let selection_offset = selection.map(|anchor| anchor.to_offset(&multi_buffer_snapshot));
-        let selection_point = selection.map(|anchor| anchor.to_point(&multi_buffer_snapshot));
-        let head = selection_offset.head();
-
-        let head_anchor = multi_buffer_snapshot.anchor_at(
-            head,
-            if head < selection_offset.tail() {
-                Bias::Right
-            } else {
-                Bias::Left
-            },
-        );
-
-        match self
-            .find_all_references_task_sources
-            .binary_search_by(|anchor| anchor.cmp(&head_anchor, &multi_buffer_snapshot))
-        {
-            Ok(_) => {
-                log::info!(
-                    "Ignoring repeated FindAllReferences invocation with the position of already running task"
-                );
-                return None;
-            }
-            Err(i) => {
-                self.find_all_references_task_sources.insert(i, head_anchor);
-            }
-        }
-
-        let (buffer, head) = multi_buffer.text_anchor_for_position(head, cx)?;
-        let workspace = self.workspace()?;
-        let project = workspace.read(cx).project().clone();
-        let references = project.update(cx, |project, cx| project.references(&buffer, head, cx));
-        Some(cx.spawn_in(window, async move |editor, cx| {
-            let _cleanup = cx.on_drop(&editor, move |editor, _| {
-                if let Ok(i) = editor
-                    .find_all_references_task_sources
-                    .binary_search_by(|anchor| anchor.cmp(&head_anchor, &multi_buffer_snapshot))
-                {
-                    editor.find_all_references_task_sources.remove(i);
-                }
-            });
-
-            let Some(locations) = references.await? else {
-                return anyhow::Ok(Navigated::No);
-            };
-            let mut locations = cx.update(|_, cx| {
-                locations
-                    .into_iter()
-                    .map(|location| {
-                        let buffer = location.buffer.read(cx);
-                        (location.buffer, location.range.to_point(buffer))
-                    })
-                    // if special-casing the single-match case, remove ranges
-                    // that intersect current selection
-                    .filter(|(location_buffer, location)| {
-                        if always_open_multibuffer || &buffer != location_buffer {
-                            return true;
-                        }
-
-                        !location.contains_inclusive(&selection_point.range())
-                    })
-                    .into_group_map()
-            })?;
-            if locations.is_empty() {
-                return anyhow::Ok(Navigated::No);
-            }
-            for ranges in locations.values_mut() {
-                ranges.sort_by_key(|range| (range.start, Reverse(range.end)));
-                ranges.dedup();
-            }
-            let mut num_locations = 0;
-            for ranges in locations.values_mut() {
-                ranges.sort_by_key(|range| (range.start, Reverse(range.end)));
-                ranges.dedup();
-                num_locations += ranges.len();
-            }
-
-            if num_locations == 1 && !always_open_multibuffer {
-                let (target_buffer, target_ranges) = locations.into_iter().next().unwrap();
-                let target_range = target_ranges.first().unwrap().clone();
-
-                return editor.update_in(cx, |editor, window, cx| {
-                    let range = target_range.to_point(target_buffer.read(cx));
-                    let range = editor.range_for_match(&range);
-                    let range = range.start..range.start;
-
-                    if Some(&target_buffer) == editor.buffer.read(cx).as_singleton().as_ref() {
-                        editor.go_to_singleton_buffer_range(range, window, cx);
-                    } else {
-                        let pane = workspace.read(cx).active_pane().clone();
-                        window.defer(cx, move |window, cx| {
-                            let target_editor: Entity<Self> =
-                                workspace.update(cx, |workspace, cx| {
-                                    let pane = workspace.active_pane().clone();
-
-                                    let preview_tabs_settings = PreviewTabsSettings::get_global(cx);
-                                    let keep_old_preview = preview_tabs_settings
-                                        .enable_keep_preview_on_code_navigation;
-                                    let allow_new_preview = preview_tabs_settings
-                                        .enable_preview_file_from_code_navigation;
-
-                                    workspace.open_project_item(
-                                        pane,
-                                        target_buffer.clone(),
-                                        true,
-                                        true,
-                                        keep_old_preview,
-                                        allow_new_preview,
-                                        window,
-                                        cx,
-                                    )
-                                });
-                            target_editor.update(cx, |target_editor, cx| {
-                                // When selecting a definition in a different buffer, disable the nav history
-                                // to avoid creating a history entry at the previous cursor location.
-                                pane.update(cx, |pane, _| pane.disable_history());
-                                target_editor.go_to_singleton_buffer_range(range, window, cx);
-                                pane.update(cx, |pane, _| pane.enable_history());
-                            });
-                        });
-                    }
-                    Navigated::No
-                });
-            }
-
-            workspace.update_in(cx, |workspace, window, cx| {
-                let target = locations
-                    .iter()
-                    .flat_map(|(k, v)| iter::repeat(k.clone()).zip(v))
-                    .map(|(buffer, location)| {
-                        buffer
-                            .read(cx)
-                            .text_for_range(location.clone())
-                            .collect::<String>()
-                    })
-                    .filter(|text| !text.contains('\n'))
-                    .unique()
-                    .take(3)
-                    .join(", ");
-                let title = if target.is_empty() {
-                    "References".to_owned()
-                } else {
-                    format!("References to {target}")
-                };
-                let allow_preview = PreviewTabsSettings::get_global(cx)
-                    .enable_preview_multibuffer_from_code_navigation;
-                Self::open_locations_in_multibuffer(
-                    workspace,
-                    locations,
-                    title,
-                    false,
-                    allow_preview,
-                    MultibufferSelectionMode::First,
-                    window,
-                    cx,
-                );
-                Navigated::Yes
-            })
-        }))
-    }
-
-    /// Opens a multibuffer with the given project locations in it.
-    pub fn open_locations_in_multibuffer(
-        workspace: &mut Workspace,
-        locations: std::collections::HashMap<Entity<Buffer>, Vec<Range<Point>>>,
-        title: String,
-        split: bool,
-        allow_preview: bool,
-        multibuffer_selection_mode: MultibufferSelectionMode,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        if locations.is_empty() {
-            log::error!("bug: open_locations_in_multibuffer called with empty list of locations");
-            return;
-        }
-
-        let capability = workspace.project().read(cx).capability();
-        let mut ranges = <Vec<Range<Anchor>>>::new();
-
-        // a key to find existing multibuffer editors with the same set of locations
-        // to prevent us from opening more and more multibuffer tabs for searches and the like
-        let mut key = (title.clone(), vec![]);
-        let excerpt_buffer = cx.new(|cx| {
-            let key = &mut key.1;
-            let mut multibuffer = MultiBuffer::new(capability);
-            for (buffer, mut ranges_for_buffer) in locations {
-                ranges_for_buffer.sort_by_key(|range| (range.start, Reverse(range.end)));
-                key.push((buffer.read(cx).remote_id(), ranges_for_buffer.clone()));
-                let (new_ranges, _) = multibuffer.set_excerpts_for_path(
-                    PathKey::for_buffer(&buffer, cx),
-                    buffer.clone(),
-                    ranges_for_buffer,
-                    multibuffer_context_lines(cx),
-                    cx,
-                );
-                ranges.extend(new_ranges)
-            }
-
-            multibuffer.with_title(title)
-        });
-        let existing = workspace.active_pane().update(cx, |pane, cx| {
-            pane.items()
-                .filter_map(|item| item.downcast::<Editor>())
-                .find(|editor| {
-                    editor
-                        .read(cx)
-                        .lookup_key
-                        .as_ref()
-                        .and_then(|it| {
-                            it.downcast_ref::<(String, Vec<(BufferId, Vec<Range<Point>>)>)>()
-                        })
-                        .is_some_and(|it| *it == key)
-                })
-        });
-        let was_existing = existing.is_some();
-        let editor = existing.unwrap_or_else(|| {
-            cx.new(|cx| {
-                let mut editor = Editor::for_multibuffer(
-                    excerpt_buffer,
-                    Some(workspace.project().clone()),
-                    window,
-                    cx,
-                );
-                editor.lookup_key = Some(Box::new(key));
-                editor
-            })
-        });
-        editor.update(cx, |editor, cx| match multibuffer_selection_mode {
-            MultibufferSelectionMode::First => {
-                if let Some(first_range) = ranges.first() {
-                    editor.change_selections(
-                        SelectionEffects::no_scroll(),
-                        window,
-                        cx,
-                        |selections| {
-                            selections.clear_disjoint();
-                            selections.select_anchor_ranges(std::iter::once(first_range.clone()));
-                        },
-                    );
-                }
-                editor.highlight_background::<Self>(
-                    &ranges,
-                    |_, theme| theme.colors().editor_highlighted_line_background,
-                    cx,
-                );
-            }
-            MultibufferSelectionMode::All => {
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |selections| {
-                    selections.clear_disjoint();
-                    selections.select_anchor_ranges(ranges);
-                });
-            }
-        });
-
-        let item = Box::new(editor);
-
-        let pane = if split {
-            workspace.adjacent_pane(window, cx)
-        } else {
-            workspace.active_pane().clone()
-        };
-        let activate_pane = split;
-
-        let mut destination_index = None;
-        pane.update(cx, |pane, cx| {
-            if allow_preview && !was_existing {
-                destination_index = pane.replace_preview_item_id(item.item_id(), window, cx);
-            }
-            if was_existing && !allow_preview {
-                pane.unpreview_item_if_preview(item.item_id());
-            }
-            pane.add_item(item, activate_pane, true, destination_index, window, cx);
-        });
-    }
-
-    pub fn rename(
-        &mut self,
-        _: &Rename,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Task<Result<()>>> {
-        use language::ToOffset as _;
-
-        let provider = self.semantics_provider.clone()?;
-        let selection = self.selections.newest_anchor().clone();
-        let (cursor_buffer, cursor_buffer_position) = self
-            .buffer
-            .read(cx)
-            .text_anchor_for_position(selection.head(), cx)?;
-        let (tail_buffer, cursor_buffer_position_end) = self
-            .buffer
-            .read(cx)
-            .text_anchor_for_position(selection.tail(), cx)?;
-        if tail_buffer != cursor_buffer {
-            return None;
-        }
-
-        let snapshot = cursor_buffer.read(cx).snapshot();
-        let cursor_buffer_offset = cursor_buffer_position.to_offset(&snapshot);
-        let cursor_buffer_offset_end = cursor_buffer_position_end.to_offset(&snapshot);
-        let prepare_rename = provider
-            .range_for_rename(&cursor_buffer, cursor_buffer_position, cx)
-            .unwrap_or_else(|| Task::ready(Ok(None)));
-        drop(snapshot);
-
-        Some(cx.spawn_in(window, async move |this, cx| {
-            let rename_range = if let Some(range) = prepare_rename.await? {
-                Some(range)
-            } else {
-                this.update(cx, |this, cx| {
-                    let buffer = this.buffer.read(cx).snapshot(cx);
-                    let mut buffer_highlights = this
-                        .document_highlights_for_position(selection.head(), &buffer)
-                        .filter(|highlight| {
-                            highlight.start.excerpt_id == selection.head().excerpt_id
-                                && highlight.end.excerpt_id == selection.head().excerpt_id
-                        });
-                    buffer_highlights
-                        .next()
-                        .map(|highlight| highlight.start.text_anchor..highlight.end.text_anchor)
-                })?
-            };
-            if let Some(rename_range) = rename_range {
-                this.update_in(cx, |this, window, cx| {
-                    let snapshot = cursor_buffer.read(cx).snapshot();
-                    let rename_buffer_range = rename_range.to_offset(&snapshot);
-                    let cursor_offset_in_rename_range =
-                        cursor_buffer_offset.saturating_sub(rename_buffer_range.start);
-                    let cursor_offset_in_rename_range_end =
-                        cursor_buffer_offset_end.saturating_sub(rename_buffer_range.start);
-
-                    this.take_rename(false, window, cx);
-                    let buffer = this.buffer.read(cx).read(cx);
-                    let cursor_offset = selection.head().to_offset(&buffer);
-                    let rename_start =
-                        cursor_offset.saturating_sub_usize(cursor_offset_in_rename_range);
-                    let rename_end = rename_start + rename_buffer_range.len();
-                    let range = buffer.anchor_before(rename_start)..buffer.anchor_after(rename_end);
-                    let mut old_highlight_id = None;
-                    let old_name: Arc<str> = buffer
-                        .chunks(rename_start..rename_end, true)
-                        .map(|chunk| {
-                            if old_highlight_id.is_none() {
-                                old_highlight_id = chunk.syntax_highlight_id;
-                            }
-                            chunk.text
-                        })
-                        .collect::<String>()
-                        .into();
-
-                    drop(buffer);
-
-                    // Position the selection in the rename editor so that it matches the current selection.
-                    this.show_local_selections = false;
-                    let rename_editor = cx.new(|cx| {
-                        let mut editor = Editor::single_line(window, cx);
-                        editor.buffer.update(cx, |buffer, cx| {
-                            buffer.edit(
-                                [(MultiBufferOffset(0)..MultiBufferOffset(0), old_name.clone())],
-                                None,
-                                cx,
-                            )
-                        });
-                        let cursor_offset_in_rename_range =
-                            MultiBufferOffset(cursor_offset_in_rename_range);
-                        let cursor_offset_in_rename_range_end =
-                            MultiBufferOffset(cursor_offset_in_rename_range_end);
-                        let rename_selection_range = match cursor_offset_in_rename_range
-                            .cmp(&cursor_offset_in_rename_range_end)
-                        {
-                            Ordering::Equal => {
-                                editor.select_all(&SelectAll, window, cx);
-                                return editor;
-                            }
-                            Ordering::Less => {
-                                cursor_offset_in_rename_range..cursor_offset_in_rename_range_end
-                            }
-                            Ordering::Greater => {
-                                cursor_offset_in_rename_range_end..cursor_offset_in_rename_range
-                            }
-                        };
-                        if rename_selection_range.end.0 > old_name.len() {
-                            editor.select_all(&SelectAll, window, cx);
-                        } else {
-                            editor.change_selections(Default::default(), window, cx, |s| {
-                                s.select_ranges([rename_selection_range]);
-                            });
-                        }
-                        editor
-                    });
-                    cx.subscribe(&rename_editor, |_, _, e: &EditorEvent, cx| {
-                        if e == &EditorEvent::Focused {
-                            cx.emit(EditorEvent::FocusedIn)
-                        }
-                    })
-                    .detach();
-
-                    let write_highlights =
-                        this.clear_background_highlights::<DocumentHighlightWrite>(cx);
-                    let read_highlights =
-                        this.clear_background_highlights::<DocumentHighlightRead>(cx);
-                    let ranges = write_highlights
-                        .iter()
-                        .flat_map(|(_, ranges)| ranges.iter())
-                        .chain(read_highlights.iter().flat_map(|(_, ranges)| ranges.iter()))
-                        .cloned()
-                        .collect();
-
-                    this.highlight_text::<Rename>(
-                        ranges,
-                        HighlightStyle {
-                            fade_out: Some(0.6),
-                            ..Default::default()
-                        },
-                        cx,
-                    );
-                    let rename_focus_handle = rename_editor.focus_handle(cx);
-                    window.focus(&rename_focus_handle);
-                    let block_id = this.insert_blocks(
-                        [BlockProperties {
-                            style: BlockStyle::Flex,
-                            placement: BlockPlacement::Below(range.start),
-                            height: Some(1),
-                            render: Arc::new({
-                                let rename_editor = rename_editor.clone();
-                                move |cx: &mut BlockContext| {
-                                    let mut text_style = cx.editor_style.text.clone();
-                                    if let Some(highlight_style) = old_highlight_id
-                                        .and_then(|h| h.style(&cx.editor_style.syntax))
-                                    {
-                                        text_style = text_style.highlight(highlight_style);
-                                    }
-                                    div()
-                                        .block_mouse_except_scroll()
-                                        .pl(cx.anchor_x)
-                                        .child(EditorElement::new(
-                                            &rename_editor,
-                                            EditorStyle {
-                                                background: cx.theme().system().transparent,
-                                                local_player: cx.editor_style.local_player,
-                                                text: text_style,
-                                                scrollbar_width: cx.editor_style.scrollbar_width,
-                                                syntax: cx.editor_style.syntax.clone(),
-                                                status: cx.editor_style.status.clone(),
-                                                inlay_hints_style: HighlightStyle {
-                                                    font_weight: Some(FontWeight::BOLD),
-                                                    ..make_inlay_hints_style(cx.app)
-                                                },
-                                                edit_prediction_styles: make_suggestion_styles(
-                                                    cx.app,
-                                                ),
-                                                ..EditorStyle::default()
-                                            },
-                                        ))
-                                        .into_any_element()
-                                }
-                            }),
-                            priority: 0,
-                        }],
-                        Some(Autoscroll::fit()),
-                        cx,
-                    )[0];
-                    this.pending_rename = Some(RenameState {
-                        range,
-                        old_name,
-                        editor: rename_editor,
-                        block_id,
-                    });
-                })?;
-            }
-
-            Ok(())
-        }))
-    }
-
-    pub fn confirm_rename(
-        &mut self,
-        _: &ConfirmRename,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Task<Result<()>>> {
-        let rename = self.take_rename(false, window, cx)?;
-        let workspace = self.workspace()?.downgrade();
-        let (buffer, start) = self
-            .buffer
-            .read(cx)
-            .text_anchor_for_position(rename.range.start, cx)?;
-        let (end_buffer, _) = self
-            .buffer
-            .read(cx)
-            .text_anchor_for_position(rename.range.end, cx)?;
-        if buffer != end_buffer {
-            return None;
-        }
-
-        let old_name = rename.old_name;
-        let new_name = rename.editor.read(cx).text(cx);
-
-        let rename = self.semantics_provider.as_ref()?.perform_rename(
-            &buffer,
-            start,
-            new_name.clone(),
-            cx,
-        )?;
-
-        Some(cx.spawn_in(window, async move |editor, cx| {
-            let project_transaction = rename.await?;
-            Self::open_project_transaction(
-                &editor,
-                workspace,
-                project_transaction,
-                format!("Rename: {} → {}", old_name, new_name),
-                cx,
-            )
-            .await?;
-
-            editor.update(cx, |editor, cx| {
-                editor.refresh_document_highlights(cx);
-            })?;
-            Ok(())
-        }))
-    }
-
-    fn take_rename(
-        &mut self,
-        moving_cursor: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<RenameState> {
-        let rename = self.pending_rename.take()?;
-        if rename.editor.focus_handle(cx).is_focused(window) {
-            window.focus(&self.focus_handle);
-        }
-
-        self.remove_blocks(
-            [rename.block_id].into_iter().collect(),
-            Some(Autoscroll::fit()),
-            cx,
-        );
-        self.clear_highlights::<Rename>(cx);
-        self.show_local_selections = true;
-
-        if moving_cursor {
-            let cursor_in_rename_editor = rename.editor.update(cx, |editor, cx| {
-                editor
-                    .selections
-                    .newest::<MultiBufferOffset>(&editor.display_snapshot(cx))
-                    .head()
-            });
-
-            // Update the selection to match the position of the selection inside
-            // the rename editor.
-            let snapshot = self.buffer.read(cx).read(cx);
-            let rename_range = rename.range.to_offset(&snapshot);
-            let cursor_in_editor = snapshot
-                .clip_offset(rename_range.start + cursor_in_rename_editor, Bias::Left)
-                .min(rename_range.end);
-            drop(snapshot);
-
-            self.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                s.select_ranges(vec![cursor_in_editor..cursor_in_editor])
-            });
-        } else {
-            self.refresh_document_highlights(cx);
-        }
-
-        Some(rename)
-    }
-
-    pub fn pending_rename(&self) -> Option<&RenameState> {
-        self.pending_rename.as_ref()
-    }
-
-    fn format(
-        &mut self,
-        _: &Format,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Task<Result<()>>> {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-
-        let project = match &self.project {
-            Some(project) => project.clone(),
-            None => return None,
-        };
-
-        Some(self.perform_format(
-            project,
-            FormatTrigger::Manual,
-            FormatTarget::Buffers(self.buffer.read(cx).all_buffers()),
-            window,
-            cx,
-        ))
-    }
-
-    fn format_selections(
-        &mut self,
-        _: &FormatSelections,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Task<Result<()>>> {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-
-        let project = match &self.project {
-            Some(project) => project.clone(),
-            None => return None,
-        };
-
-        let ranges = self
-            .selections
-            .all_adjusted(&self.display_snapshot(cx))
-            .into_iter()
-            .map(|selection| selection.range())
-            .collect_vec();
-
-        Some(self.perform_format(
-            project,
-            FormatTrigger::Manual,
-            FormatTarget::Ranges(ranges),
-            window,
-            cx,
-        ))
-    }
-
-    fn perform_format(
-        &mut self,
-        project: Entity<Project>,
-        trigger: FormatTrigger,
-        target: FormatTarget,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let buffer = self.buffer.clone();
-        let (buffers, target) = match target {
-            FormatTarget::Buffers(buffers) => (buffers, LspFormatTarget::Buffers),
-            FormatTarget::Ranges(selection_ranges) => {
-                let multi_buffer = buffer.read(cx);
-                let snapshot = multi_buffer.read(cx);
-                let mut buffers = HashSet::default();
-                let mut buffer_id_to_ranges: BTreeMap<BufferId, Vec<Range<text::Anchor>>> =
-                    BTreeMap::new();
-                for selection_range in selection_ranges {
-                    for (buffer, buffer_range, _) in
-                        snapshot.range_to_buffer_ranges(selection_range)
-                    {
-                        let buffer_id = buffer.remote_id();
-                        let start = buffer.anchor_before(buffer_range.start);
-                        let end = buffer.anchor_after(buffer_range.end);
-                        buffers.insert(multi_buffer.buffer(buffer_id).unwrap());
-                        buffer_id_to_ranges
-                            .entry(buffer_id)
-                            .and_modify(|buffer_ranges| buffer_ranges.push(start..end))
-                            .or_insert_with(|| vec![start..end]);
-                    }
-                }
-                (buffers, LspFormatTarget::Ranges(buffer_id_to_ranges))
-            }
-        };
-
-        let transaction_id_prev = buffer.read(cx).last_transaction_id(cx);
-        let selections_prev = transaction_id_prev
-            .and_then(|transaction_id_prev| {
-                // default to selections as they were after the last edit, if we have them,
-                // instead of how they are now.
-                // This will make it so that editing, moving somewhere else, formatting, then undoing the format
-                // will take you back to where you made the last edit, instead of staying where you scrolled
-                self.selection_history
-                    .transaction(transaction_id_prev)
-                    .map(|t| t.0.clone())
-            })
-            .unwrap_or_else(|| self.selections.disjoint_anchors_arc());
-
-        let mut timeout = cx.background_executor().timer(FORMAT_TIMEOUT).fuse();
-        let format = project.update(cx, |project, cx| {
-            project.format(buffers, target, true, trigger, cx)
-        });
-
-        cx.spawn_in(window, async move |editor, cx| {
-            let transaction = futures::select_biased! {
-                transaction = format.log_err().fuse() => transaction,
-                () = timeout => {
-                    log::warn!("timed out waiting for formatting");
-                    None
-                }
-            };
-
-            buffer
-                .update(cx, |buffer, cx| {
-                    if let Some(transaction) = transaction
-                        && !buffer.is_singleton()
-                    {
-                        buffer.push_transaction(&transaction.0, cx);
-                    }
-                    cx.notify();
-                })
-                .ok();
-
-            if let Some(transaction_id_now) =
-                buffer.read_with(cx, |b, cx| b.last_transaction_id(cx))?
-            {
-                let has_new_transaction = transaction_id_prev != Some(transaction_id_now);
-                if has_new_transaction {
-                    _ = editor.update(cx, |editor, _| {
-                        editor
-                            .selection_history
-                            .insert_transaction(transaction_id_now, selections_prev);
-                    });
-                }
-            }
-
-            Ok(())
-        })
-    }
-
-    fn organize_imports(
-        &mut self,
-        _: &OrganizeImports,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Task<Result<()>>> {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-        let project = match &self.project {
-            Some(project) => project.clone(),
-            None => return None,
-        };
-        Some(self.perform_code_action_kind(
-            project,
-            CodeActionKind::SOURCE_ORGANIZE_IMPORTS,
-            window,
-            cx,
-        ))
-    }
-
-    fn perform_code_action_kind(
-        &mut self,
-        project: Entity<Project>,
-        kind: CodeActionKind,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let buffer = self.buffer.clone();
-        let buffers = buffer.read(cx).all_buffers();
-        let mut timeout = cx.background_executor().timer(CODE_ACTION_TIMEOUT).fuse();
-        let apply_action = project.update(cx, |project, cx| {
-            project.apply_code_action_kind(buffers, kind, true, cx)
-        });
-        cx.spawn_in(window, async move |_, cx| {
-            let transaction = futures::select_biased! {
-                () = timeout => {
-                    log::warn!("timed out waiting for executing code action");
-                    None
-                }
-                transaction = apply_action.log_err().fuse() => transaction,
-            };
-            buffer
-                .update(cx, |buffer, cx| {
-                    // check if we need this
-                    if let Some(transaction) = transaction
-                        && !buffer.is_singleton()
-                    {
-                        buffer.push_transaction(&transaction.0, cx);
-                    }
-                    cx.notify();
-                })
-                .ok();
-            Ok(())
-        })
-    }
-
-    pub fn restart_language_server(
-        &mut self,
-        _: &RestartLanguageServer,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(project) = self.project.clone() {
-            self.buffer.update(cx, |multi_buffer, cx| {
-                project.update(cx, |project, cx| {
-                    project.restart_language_servers_for_buffers(
-                        multi_buffer.all_buffers().into_iter().collect(),
-                        HashSet::default(),
-                        cx,
-                    );
-                });
-            })
-        }
-    }
-
-    pub fn stop_language_server(
-        &mut self,
-        _: &StopLanguageServer,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(project) = self.project.clone() {
-            self.buffer.update(cx, |multi_buffer, cx| {
-                project.update(cx, |project, cx| {
-                    project.stop_language_servers_for_buffers(
-                        multi_buffer.all_buffers().into_iter().collect(),
-                        HashSet::default(),
-                        cx,
-                    );
-                });
-            });
-            self.refresh_inlay_hints(InlayHintRefreshReason::NewLinesShown, cx);
-        }
-    }
-
-    fn cancel_language_server_work(
-        workspace: &mut Workspace,
-        _: &actions::CancelLanguageServerWork,
-        _: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        let project = workspace.project();
-        let buffers = workspace
-            .active_item(cx)
-            .and_then(|item| item.act_as::<Editor>(cx))
-            .map_or(HashSet::default(), |editor| {
-                editor.read(cx).buffer.read(cx).all_buffers()
-            });
-        project.update(cx, |project, cx| {
-            project.cancel_language_server_work_for_buffers(buffers, cx);
-        });
-    }
-
-    fn show_character_palette(
-        &mut self,
-        _: &ShowCharacterPalette,
-        window: &mut Window,
-        _: &mut Context<Self>,
-    ) {
-        window.show_character_palette();
-    }
-
-    fn refresh_active_diagnostics(&mut self, cx: &mut Context<Editor>) {
-        if !self.diagnostics_enabled() {
-            return;
-        }
-
-        if let ActiveDiagnostic::Group(active_diagnostics) = &mut self.active_diagnostics {
-            let buffer = self.buffer.read(cx).snapshot(cx);
-            let primary_range_start = active_diagnostics.active_range.start.to_offset(&buffer);
-            let primary_range_end = active_diagnostics.active_range.end.to_offset(&buffer);
-            let is_valid = buffer
-                .diagnostics_in_range::<MultiBufferOffset>(primary_range_start..primary_range_end)
-                .any(|entry| {
-                    entry.diagnostic.is_primary
-                        && !entry.range.is_empty()
-                        && entry.range.start == primary_range_start
-                        && entry.diagnostic.message == active_diagnostics.active_message
-                });
-
-            if !is_valid {
-                self.dismiss_diagnostics(cx);
-            }
-        }
-    }
-
-    pub fn active_diagnostic_group(&self) -> Option<&ActiveDiagnosticGroup> {
-        match &self.active_diagnostics {
-            ActiveDiagnostic::Group(group) => Some(group),
-            _ => None,
-        }
-    }
-
-    pub fn set_all_diagnostics_active(&mut self, cx: &mut Context<Self>) {
-        if !self.diagnostics_enabled() {
-            return;
-        }
-        self.dismiss_diagnostics(cx);
-        self.active_diagnostics = ActiveDiagnostic::All;
-    }
-
-    fn activate_diagnostics(
-        &mut self,
-        buffer_id: BufferId,
-        diagnostic: DiagnosticEntryRef<'_, MultiBufferOffset>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if !self.diagnostics_enabled() || matches!(self.active_diagnostics, ActiveDiagnostic::All) {
-            return;
-        }
-        self.dismiss_diagnostics(cx);
-        let snapshot = self.snapshot(window, cx);
-        let buffer = self.buffer.read(cx).snapshot(cx);
-        let Some(renderer) = GlobalDiagnosticRenderer::global(cx) else {
-            return;
-        };
-
-        let diagnostic_group = buffer
-            .diagnostic_group(buffer_id, diagnostic.diagnostic.group_id)
-            .collect::<Vec<_>>();
-
-        let language_registry = self
-            .project()
-            .map(|project| project.read(cx).languages().clone());
-
-        let blocks = renderer.render_group(
-            diagnostic_group,
-            buffer_id,
-            snapshot,
-            cx.weak_entity(),
-            language_registry,
-            cx,
-        );
-
-        let blocks = self.display_map.update(cx, |display_map, cx| {
-            display_map.insert_blocks(blocks, cx).into_iter().collect()
-        });
-        self.active_diagnostics = ActiveDiagnostic::Group(ActiveDiagnosticGroup {
-            active_range: buffer.anchor_before(diagnostic.range.start)
-                ..buffer.anchor_after(diagnostic.range.end),
-            active_message: diagnostic.diagnostic.message.clone(),
-            group_id: diagnostic.diagnostic.group_id,
-            blocks,
-        });
-        cx.notify();
-    }
-
-    fn dismiss_diagnostics(&mut self, cx: &mut Context<Self>) {
-        if matches!(self.active_diagnostics, ActiveDiagnostic::All) {
-            return;
-        };
-
-        let prev = mem::replace(&mut self.active_diagnostics, ActiveDiagnostic::None);
-        if let ActiveDiagnostic::Group(group) = prev {
-            self.display_map.update(cx, |display_map, cx| {
-                display_map.remove_blocks(group.blocks, cx);
-            });
-            cx.notify();
-        }
-    }
-
-    /// Disable inline diagnostics rendering for this editor.
-    pub fn disable_inline_diagnostics(&mut self) {
-        self.inline_diagnostics_enabled = false;
-        self.inline_diagnostics_update = Task::ready(());
-        self.inline_diagnostics.clear();
-    }
-
-    pub fn disable_diagnostics(&mut self, cx: &mut Context<Self>) {
-        self.diagnostics_enabled = false;
-        self.dismiss_diagnostics(cx);
-        self.inline_diagnostics_update = Task::ready(());
-        self.inline_diagnostics.clear();
-    }
-
-    pub fn disable_word_completions(&mut self) {
-        self.word_completions_enabled = false;
-    }
-
-    pub fn diagnostics_enabled(&self) -> bool {
-        self.diagnostics_enabled && self.mode.is_full()
-    }
-
-    pub fn inline_diagnostics_enabled(&self) -> bool {
-        self.inline_diagnostics_enabled && self.diagnostics_enabled()
-    }
-
-    pub fn show_inline_diagnostics(&self) -> bool {
-        self.show_inline_diagnostics
-    }
-
-    pub fn toggle_inline_diagnostics(
-        &mut self,
-        _: &ToggleInlineDiagnostics,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) {
-        self.show_inline_diagnostics = !self.show_inline_diagnostics;
-        self.refresh_inline_diagnostics(false, window, cx);
-    }
-
-    pub fn set_max_diagnostics_severity(&mut self, severity: DiagnosticSeverity, cx: &mut App) {
-        self.diagnostics_max_severity = severity;
-        self.display_map.update(cx, |display_map, _| {
-            display_map.diagnostics_max_severity = self.diagnostics_max_severity;
-        });
-    }
-
-    pub fn toggle_diagnostics(
-        &mut self,
-        _: &ToggleDiagnostics,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) {
-        if !self.diagnostics_enabled() {
-            return;
-        }
-
-        let new_severity = if self.diagnostics_max_severity == DiagnosticSeverity::Off {
-            EditorSettings::get_global(cx)
-                .diagnostics_max_severity
-                .filter(|severity| severity != &DiagnosticSeverity::Off)
-                .unwrap_or(DiagnosticSeverity::Hint)
-        } else {
-            DiagnosticSeverity::Off
-        };
-        self.set_max_diagnostics_severity(new_severity, cx);
-        if self.diagnostics_max_severity == DiagnosticSeverity::Off {
-            self.active_diagnostics = ActiveDiagnostic::None;
-            self.inline_diagnostics_update = Task::ready(());
-            self.inline_diagnostics.clear();
-        } else {
-            self.refresh_inline_diagnostics(false, window, cx);
-        }
-
-        cx.notify();
-    }
-
-    pub fn toggle_minimap(
-        &mut self,
-        _: &ToggleMinimap,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) {
-        if self.supports_minimap(cx) {
-            self.set_minimap_visibility(self.minimap_visibility.toggle_visibility(), window, cx);
-        }
-    }
-
-    fn refresh_inline_diagnostics(
-        &mut self,
-        debounce: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let max_severity = ProjectSettings::get_global(cx)
-            .diagnostics
-            .inline
-            .max_severity
-            .unwrap_or(self.diagnostics_max_severity);
-
-        if !self.inline_diagnostics_enabled()
-            || !self.diagnostics_enabled()
-            || !self.show_inline_diagnostics
-            || max_severity == DiagnosticSeverity::Off
-        {
-            self.inline_diagnostics_update = Task::ready(());
-            self.inline_diagnostics.clear();
-            return;
-        }
-
-        let debounce_ms = ProjectSettings::get_global(cx)
-            .diagnostics
-            .inline
-            .update_debounce_ms;
-        let debounce = if debounce && debounce_ms > 0 {
-            Some(Duration::from_millis(debounce_ms))
-        } else {
-            None
-        };
-        self.inline_diagnostics_update = cx.spawn_in(window, async move |editor, cx| {
-            if let Some(debounce) = debounce {
-                cx.background_executor().timer(debounce).await;
-            }
-            let Some(snapshot) = editor.upgrade().and_then(|editor| {
-                editor
-                    .update(cx, |editor, cx| editor.buffer().read(cx).snapshot(cx))
-                    .ok()
-            }) else {
-                return;
-            };
-
-            let new_inline_diagnostics = cx
-                .background_spawn(async move {
-                    let mut inline_diagnostics = Vec::<(Anchor, InlineDiagnostic)>::new();
-                    for diagnostic_entry in
-                        snapshot.diagnostics_in_range(MultiBufferOffset(0)..snapshot.len())
-                    {
-                        let message = diagnostic_entry
-                            .diagnostic
-                            .message
-                            .split_once('\n')
-                            .map(|(line, _)| line)
-                            .map(SharedString::new)
-                            .unwrap_or_else(|| {
-                                SharedString::new(&*diagnostic_entry.diagnostic.message)
-                            });
-                        let start_anchor = snapshot.anchor_before(diagnostic_entry.range.start);
-                        let (Ok(i) | Err(i)) = inline_diagnostics
-                            .binary_search_by(|(probe, _)| probe.cmp(&start_anchor, &snapshot));
-                        inline_diagnostics.insert(
-                            i,
-                            (
-                                start_anchor,
-                                InlineDiagnostic {
-                                    message,
-                                    group_id: diagnostic_entry.diagnostic.group_id,
-                                    start: diagnostic_entry.range.start.to_point(&snapshot),
-                                    is_primary: diagnostic_entry.diagnostic.is_primary,
-                                    severity: diagnostic_entry.diagnostic.severity,
-                                },
-                            ),
-                        );
-                    }
-                    inline_diagnostics
-                })
-                .await;
-
-            editor
-                .update(cx, |editor, cx| {
-                    editor.inline_diagnostics = new_inline_diagnostics;
-                    cx.notify();
-                })
-                .ok();
-        });
-    }
-
-    fn pull_diagnostics(
-        &mut self,
-        buffer_id: Option<BufferId>,
-        window: &Window,
-        cx: &mut Context<Self>,
-    ) -> Option<()> {
-        if self.ignore_lsp_data() || !self.diagnostics_enabled() {
-            return None;
-        }
-        let pull_diagnostics_settings = ProjectSettings::get_global(cx)
-            .diagnostics
-            .lsp_pull_diagnostics;
-        if !pull_diagnostics_settings.enabled {
-            return None;
-        }
-        let project = self.project()?.downgrade();
-
-        let mut edited_buffer_ids = HashSet::default();
-        let mut edited_worktree_ids = HashSet::default();
-        let edited_buffers = match buffer_id {
-            Some(buffer_id) => {
-                let buffer = self.buffer().read(cx).buffer(buffer_id)?;
-                let worktree_id = buffer.read(cx).file().map(|f| f.worktree_id(cx))?;
-                edited_buffer_ids.insert(buffer.read(cx).remote_id());
-                edited_worktree_ids.insert(worktree_id);
-                vec![buffer]
-            }
-            None => self
-                .buffer()
-                .read(cx)
-                .all_buffers()
-                .into_iter()
-                .filter(|buffer| {
-                    let buffer = buffer.read(cx);
-                    match buffer.file().map(|f| f.worktree_id(cx)) {
-                        Some(worktree_id) => {
-                            edited_buffer_ids.insert(buffer.remote_id());
-                            edited_worktree_ids.insert(worktree_id);
-                            true
-                        }
-                        None => false,
-                    }
-                })
-                .collect::<Vec<_>>(),
-        };
-
-        if edited_buffers.is_empty() {
-            self.pull_diagnostics_task = Task::ready(());
-            self.pull_diagnostics_background_task = Task::ready(());
-            return None;
-        }
-
-        let mut already_used_buffers = HashSet::default();
-        let related_open_buffers = self
-            .workspace
-            .as_ref()
-            .and_then(|(workspace, _)| workspace.upgrade())
-            .into_iter()
-            .flat_map(|workspace| workspace.read(cx).panes())
-            .flat_map(|pane| pane.read(cx).items_of_type::<Editor>())
-            .filter(|editor| editor != &cx.entity())
-            .flat_map(|editor| editor.read(cx).buffer().read(cx).all_buffers())
-            .filter(|buffer| {
-                let buffer = buffer.read(cx);
-                let buffer_id = buffer.remote_id();
-                if already_used_buffers.insert(buffer_id) {
-                    if let Some(worktree_id) = buffer.file().map(|f| f.worktree_id(cx)) {
-                        return !edited_buffer_ids.contains(&buffer_id)
-                            && !edited_worktree_ids.contains(&worktree_id);
-                    }
-                }
-                false
-            })
-            .collect::<Vec<_>>();
-
-        let debounce = Duration::from_millis(pull_diagnostics_settings.debounce_ms);
-        let make_spawn = |buffers: Vec<Entity<Buffer>>, delay: Duration| {
-            if buffers.is_empty() {
-                return Task::ready(());
-            }
-            let project_weak = project.clone();
-            cx.spawn_in(window, async move |_, cx| {
-                cx.background_executor().timer(delay).await;
-
-                let Ok(mut pull_diagnostics_tasks) = cx.update(|_, cx| {
-                    buffers
-                        .into_iter()
-                        .filter_map(|buffer| {
-                            project_weak
-                                .update(cx, |project, cx| {
-                                    project.lsp_store().update(cx, |lsp_store, cx| {
-                                        lsp_store.pull_diagnostics_for_buffer(buffer, cx)
-                                    })
-                                })
-                                .ok()
-                        })
-                        .collect::<FuturesUnordered<_>>()
-                }) else {
-                    return;
-                };
-
-                while let Some(pull_task) = pull_diagnostics_tasks.next().await {
-                    if let Err(e) = pull_task {
-                        log::error!("Failed to update project diagnostics: {e:#}");
-                    }
-                }
-            })
-        };
-
-        self.pull_diagnostics_task = make_spawn(edited_buffers, debounce);
-        self.pull_diagnostics_background_task = make_spawn(related_open_buffers, debounce * 2);
-
-        Some(())
-    }
-
-    pub fn set_selections_from_remote(
-        &mut self,
-        selections: Vec<Selection<Anchor>>,
-        pending_selection: Option<Selection<Anchor>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let old_cursor_position = self.selections.newest_anchor().head();
-        self.selections
-            .change_with(&self.display_snapshot(cx), |s| {
-                s.select_anchors(selections);
-                if let Some(pending_selection) = pending_selection {
-                    s.set_pending(pending_selection, SelectMode::Character);
-                } else {
-                    s.clear_pending();
-                }
-            });
-        self.selections_did_change(
-            false,
-            &old_cursor_position,
-            SelectionEffects::default(),
-            window,
-            cx,
-        );
-    }
-
-    pub fn transact(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-        update: impl FnOnce(&mut Self, &mut Window, &mut Context<Self>),
-    ) -> Option<TransactionId> {
-        self.with_selection_effects_deferred(window, cx, |this, window, cx| {
-            this.start_transaction_at(Instant::now(), window, cx);
-            update(this, window, cx);
-            this.end_transaction_at(Instant::now(), cx)
-        })
-    }
-
-    pub fn start_transaction_at(
-        &mut self,
-        now: Instant,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<TransactionId> {
-        self.end_selection(window, cx);
-        if let Some(tx_id) = self
-            .buffer
-            .update(cx, |buffer, cx| buffer.start_transaction_at(now, cx))
-        {
-            self.selection_history
-                .insert_transaction(tx_id, self.selections.disjoint_anchors_arc());
-            cx.emit(EditorEvent::TransactionBegun {
-                transaction_id: tx_id,
-            });
-            Some(tx_id)
-        } else {
-            None
-        }
-    }
-
-    pub fn end_transaction_at(
-        &mut self,
-        now: Instant,
-        cx: &mut Context<Self>,
-    ) -> Option<TransactionId> {
-        if let Some(transaction_id) = self
-            .buffer
-            .update(cx, |buffer, cx| buffer.end_transaction_at(now, cx))
-        {
-            if let Some((_, end_selections)) =
-                self.selection_history.transaction_mut(transaction_id)
-            {
-                *end_selections = Some(self.selections.disjoint_anchors_arc());
-            } else {
-                log::error!("unexpectedly ended a transaction that wasn't started by this editor");
-            }
-
-            cx.emit(EditorEvent::Edited { transaction_id });
-            Some(transaction_id)
-        } else {
-            None
-        }
-    }
-
-    pub fn modify_transaction_selection_history(
-        &mut self,
-        transaction_id: TransactionId,
-        modify: impl FnOnce(&mut (Arc<[Selection<Anchor>]>, Option<Arc<[Selection<Anchor>]>>)),
-    ) -> bool {
-        self.selection_history
-            .transaction_mut(transaction_id)
-            .map(modify)
-            .is_some()
-    }
-
-    pub fn set_mark(&mut self, _: &actions::SetMark, window: &mut Window, cx: &mut Context<Self>) {
-        if self.selection_mark_mode {
-            self.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                s.move_with(|_, sel| {
-                    sel.collapse_to(sel.head(), SelectionGoal::None);
-                });
-            })
-        }
-        self.selection_mark_mode = true;
-        cx.notify();
-    }
-
-    pub fn swap_selection_ends(
-        &mut self,
-        _: &actions::SwapSelectionEnds,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.move_with(|_, sel| {
-                if sel.start != sel.end {
-                    sel.reversed = !sel.reversed
-                }
-            });
-        });
-        self.request_autoscroll(Autoscroll::newest(), cx);
-        cx.notify();
-    }
-
-    pub fn toggle_focus(
-        workspace: &mut Workspace,
-        _: &actions::ToggleFocus,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        let Some(item) = workspace.recent_active_item_by_type::<Self>(cx) else {
-            return;
-        };
-        workspace.activate_item(&item, true, true, window, cx);
-    }
-
-    pub fn toggle_fold(
-        &mut self,
-        _: &actions::ToggleFold,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.buffer_kind(cx) == ItemBufferKind::Singleton {
-            let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-            let selection = self.selections.newest::<Point>(&display_map);
-
-            let range = if selection.is_empty() {
-                let point = selection.head().to_display_point(&display_map);
-                let start = DisplayPoint::new(point.row(), 0).to_point(&display_map);
-                let end = DisplayPoint::new(point.row(), display_map.line_len(point.row()))
-                    .to_point(&display_map);
-                start..end
-            } else {
-                selection.range()
-            };
-            if display_map.folds_in_range(range).next().is_some() {
-                self.unfold_lines(&Default::default(), window, cx)
-            } else {
-                self.fold(&Default::default(), window, cx)
-            }
-        } else {
-            let multi_buffer_snapshot = self.buffer.read(cx).snapshot(cx);
-            let buffer_ids: HashSet<_> = self
-                .selections
-                .disjoint_anchor_ranges()
-                .flat_map(|range| multi_buffer_snapshot.buffer_ids_for_range(range))
-                .collect();
-
-            let should_unfold = buffer_ids
-                .iter()
-                .any(|buffer_id| self.is_buffer_folded(*buffer_id, cx));
-
-            for buffer_id in buffer_ids {
-                if should_unfold {
-                    self.unfold_buffer(buffer_id, cx);
-                } else {
-                    self.fold_buffer(buffer_id, cx);
-                }
-            }
-        }
-    }
-
-    pub fn toggle_fold_recursive(
-        &mut self,
-        _: &actions::ToggleFoldRecursive,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let selection = self.selections.newest::<Point>(&self.display_snapshot(cx));
-
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-        let range = if selection.is_empty() {
-            let point = selection.head().to_display_point(&display_map);
-            let start = DisplayPoint::new(point.row(), 0).to_point(&display_map);
-            let end = DisplayPoint::new(point.row(), display_map.line_len(point.row()))
-                .to_point(&display_map);
-            start..end
-        } else {
-            selection.range()
-        };
-        if display_map.folds_in_range(range).next().is_some() {
-            self.unfold_recursive(&Default::default(), window, cx)
-        } else {
-            self.fold_recursive(&Default::default(), window, cx)
-        }
-    }
-
-    pub fn fold(&mut self, _: &actions::Fold, window: &mut Window, cx: &mut Context<Self>) {
-        if self.buffer_kind(cx) == ItemBufferKind::Singleton {
-            let mut to_fold = Vec::new();
-            let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-            let selections = self.selections.all_adjusted(&display_map);
-
-            for selection in selections {
-                let range = selection.range().sorted();
-                let buffer_start_row = range.start.row;
-
-                if range.start.row != range.end.row {
-                    let mut found = false;
-                    let mut row = range.start.row;
-                    while row <= range.end.row {
-                        if let Some(crease) = display_map.crease_for_buffer_row(MultiBufferRow(row))
-                        {
-                            found = true;
-                            row = crease.range().end.row + 1;
-                            to_fold.push(crease);
-                        } else {
-                            row += 1
-                        }
-                    }
-                    if found {
-                        continue;
-                    }
-                }
-
-                for row in (0..=range.start.row).rev() {
-                    if let Some(crease) = display_map.crease_for_buffer_row(MultiBufferRow(row))
-                        && crease.range().end.row >= buffer_start_row
-                    {
-                        to_fold.push(crease);
-                        if row <= range.start.row {
-                            break;
-                        }
-                    }
-                }
-            }
-
-            self.fold_creases(to_fold, true, window, cx);
-        } else {
-            let multi_buffer_snapshot = self.buffer.read(cx).snapshot(cx);
-            let buffer_ids = self
-                .selections
-                .disjoint_anchor_ranges()
-                .flat_map(|range| multi_buffer_snapshot.buffer_ids_for_range(range))
-                .collect::<HashSet<_>>();
-            for buffer_id in buffer_ids {
-                self.fold_buffer(buffer_id, cx);
-            }
-        }
-    }
-
-    pub fn toggle_fold_all(
-        &mut self,
-        _: &actions::ToggleFoldAll,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.buffer.read(cx).is_singleton() {
-            let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-            let has_folds = display_map
-                .folds_in_range(MultiBufferOffset(0)..display_map.buffer_snapshot().len())
-                .next()
-                .is_some();
-
-            if has_folds {
-                self.unfold_all(&actions::UnfoldAll, window, cx);
-            } else {
-                self.fold_all(&actions::FoldAll, window, cx);
-            }
-        } else {
-            let buffer_ids = self.buffer.read(cx).excerpt_buffer_ids();
-            let should_unfold = buffer_ids
-                .iter()
-                .any(|buffer_id| self.is_buffer_folded(*buffer_id, cx));
-
-            self.toggle_fold_multiple_buffers = cx.spawn_in(window, async move |editor, cx| {
-                editor
-                    .update_in(cx, |editor, _, cx| {
-                        for buffer_id in buffer_ids {
-                            if should_unfold {
-                                editor.unfold_buffer(buffer_id, cx);
-                            } else {
-                                editor.fold_buffer(buffer_id, cx);
-                            }
-                        }
-                    })
-                    .ok();
-            });
-        }
-    }
-
-    fn fold_at_level(
-        &mut self,
-        fold_at: &FoldAtLevel,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if !self.buffer.read(cx).is_singleton() {
-            return;
-        }
-
-        let fold_at_level = fold_at.0;
-        let snapshot = self.buffer.read(cx).snapshot(cx);
-        let mut to_fold = Vec::new();
-        let mut stack = vec![(0, snapshot.max_row().0, 1)];
-
-        let row_ranges_to_keep: Vec<Range<u32>> = self
-            .selections
-            .all::<Point>(&self.display_snapshot(cx))
-            .into_iter()
-            .map(|sel| sel.start.row..sel.end.row)
-            .collect();
-
-        while let Some((mut start_row, end_row, current_level)) = stack.pop() {
-            while start_row < end_row {
-                match self
-                    .snapshot(window, cx)
-                    .crease_for_buffer_row(MultiBufferRow(start_row))
-                {
-                    Some(crease) => {
-                        let nested_start_row = crease.range().start.row + 1;
-                        let nested_end_row = crease.range().end.row;
-
-                        if current_level < fold_at_level {
-                            stack.push((nested_start_row, nested_end_row, current_level + 1));
-                        } else if current_level == fold_at_level {
-                            // Fold iff there is no selection completely contained within the fold region
-                            if !row_ranges_to_keep.iter().any(|selection| {
-                                selection.end >= nested_start_row
-                                    && selection.start <= nested_end_row
-                            }) {
-                                to_fold.push(crease);
-                            }
-                        }
-
-                        start_row = nested_end_row + 1;
-                    }
-                    None => start_row += 1,
-                }
-            }
-        }
-
-        self.fold_creases(to_fold, true, window, cx);
-    }
-
-    pub fn fold_at_level_1(
-        &mut self,
-        _: &actions::FoldAtLevel1,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.fold_at_level(&actions::FoldAtLevel(1), window, cx);
-    }
-
-    pub fn fold_at_level_2(
-        &mut self,
-        _: &actions::FoldAtLevel2,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.fold_at_level(&actions::FoldAtLevel(2), window, cx);
-    }
-
-    pub fn fold_at_level_3(
-        &mut self,
-        _: &actions::FoldAtLevel3,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.fold_at_level(&actions::FoldAtLevel(3), window, cx);
-    }
-
-    pub fn fold_at_level_4(
-        &mut self,
-        _: &actions::FoldAtLevel4,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.fold_at_level(&actions::FoldAtLevel(4), window, cx);
-    }
-
-    pub fn fold_at_level_5(
-        &mut self,
-        _: &actions::FoldAtLevel5,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.fold_at_level(&actions::FoldAtLevel(5), window, cx);
-    }
-
-    pub fn fold_at_level_6(
-        &mut self,
-        _: &actions::FoldAtLevel6,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.fold_at_level(&actions::FoldAtLevel(6), window, cx);
-    }
-
-    pub fn fold_at_level_7(
-        &mut self,
-        _: &actions::FoldAtLevel7,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.fold_at_level(&actions::FoldAtLevel(7), window, cx);
-    }
-
-    pub fn fold_at_level_8(
-        &mut self,
-        _: &actions::FoldAtLevel8,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.fold_at_level(&actions::FoldAtLevel(8), window, cx);
-    }
-
-    pub fn fold_at_level_9(
-        &mut self,
-        _: &actions::FoldAtLevel9,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.fold_at_level(&actions::FoldAtLevel(9), window, cx);
-    }
-
-    pub fn fold_all(&mut self, _: &actions::FoldAll, window: &mut Window, cx: &mut Context<Self>) {
-        if self.buffer.read(cx).is_singleton() {
-            let mut fold_ranges = Vec::new();
-            let snapshot = self.buffer.read(cx).snapshot(cx);
-
-            for row in 0..snapshot.max_row().0 {
-                if let Some(foldable_range) = self
-                    .snapshot(window, cx)
-                    .crease_for_buffer_row(MultiBufferRow(row))
-                {
-                    fold_ranges.push(foldable_range);
-                }
-            }
-
-            self.fold_creases(fold_ranges, true, window, cx);
-        } else {
-            self.toggle_fold_multiple_buffers = cx.spawn_in(window, async move |editor, cx| {
-                editor
-                    .update_in(cx, |editor, _, cx| {
-                        for buffer_id in editor.buffer.read(cx).excerpt_buffer_ids() {
-                            editor.fold_buffer(buffer_id, cx);
-                        }
-                    })
-                    .ok();
-            });
-        }
-    }
-
-    pub fn fold_function_bodies(
-        &mut self,
-        _: &actions::FoldFunctionBodies,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let snapshot = self.buffer.read(cx).snapshot(cx);
-
-        let ranges = snapshot
-            .text_object_ranges(
-                MultiBufferOffset(0)..snapshot.len(),
-                TreeSitterOptions::default(),
-            )
-            .filter_map(|(range, obj)| (obj == TextObject::InsideFunction).then_some(range))
-            .collect::<Vec<_>>();
-
-        let creases = ranges
-            .into_iter()
-            .map(|range| Crease::simple(range, self.display_map.read(cx).fold_placeholder.clone()))
-            .collect();
-
-        self.fold_creases(creases, true, window, cx);
-    }
-
-    pub fn fold_recursive(
-        &mut self,
-        _: &actions::FoldRecursive,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let mut to_fold = Vec::new();
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-        let selections = self.selections.all_adjusted(&display_map);
-
-        for selection in selections {
-            let range = selection.range().sorted();
-            let buffer_start_row = range.start.row;
-
-            if range.start.row != range.end.row {
-                let mut found = false;
-                for row in range.start.row..=range.end.row {
-                    if let Some(crease) = display_map.crease_for_buffer_row(MultiBufferRow(row)) {
-                        found = true;
-                        to_fold.push(crease);
-                    }
-                }
-                if found {
-                    continue;
-                }
-            }
-
-            for row in (0..=range.start.row).rev() {
-                if let Some(crease) = display_map.crease_for_buffer_row(MultiBufferRow(row)) {
-                    if crease.range().end.row >= buffer_start_row {
-                        to_fold.push(crease);
-                    } else {
-                        break;
-                    }
-                }
-            }
-        }
-
-        self.fold_creases(to_fold, true, window, cx);
-    }
-
-    pub fn fold_at(
-        &mut self,
-        buffer_row: MultiBufferRow,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-
-        if let Some(crease) = display_map.crease_for_buffer_row(buffer_row) {
-            let autoscroll = self
-                .selections
-                .all::<Point>(&display_map)
-                .iter()
-                .any(|selection| crease.range().overlaps(&selection.range()));
-
-            self.fold_creases(vec![crease], autoscroll, window, cx);
-        }
-    }
-
-    pub fn unfold_lines(&mut self, _: &UnfoldLines, _window: &mut Window, cx: &mut Context<Self>) {
-        if self.buffer_kind(cx) == ItemBufferKind::Singleton {
-            let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-            let buffer = display_map.buffer_snapshot();
-            let selections = self.selections.all::<Point>(&display_map);
-            let ranges = selections
-                .iter()
-                .map(|s| {
-                    let range = s.display_range(&display_map).sorted();
-                    let mut start = range.start.to_point(&display_map);
-                    let mut end = range.end.to_point(&display_map);
-                    start.column = 0;
-                    end.column = buffer.line_len(MultiBufferRow(end.row));
-                    start..end
-                })
-                .collect::<Vec<_>>();
-
-            self.unfold_ranges(&ranges, true, true, cx);
-        } else {
-            let multi_buffer_snapshot = self.buffer.read(cx).snapshot(cx);
-            let buffer_ids = self
-                .selections
-                .disjoint_anchor_ranges()
-                .flat_map(|range| multi_buffer_snapshot.buffer_ids_for_range(range))
-                .collect::<HashSet<_>>();
-            for buffer_id in buffer_ids {
-                self.unfold_buffer(buffer_id, cx);
-            }
-        }
-    }
-
-    pub fn unfold_recursive(
-        &mut self,
-        _: &UnfoldRecursive,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-        let selections = self.selections.all::<Point>(&display_map);
-        let ranges = selections
-            .iter()
-            .map(|s| {
-                let mut range = s.display_range(&display_map).sorted();
-                *range.start.column_mut() = 0;
-                *range.end.column_mut() = display_map.line_len(range.end.row());
-                let start = range.start.to_point(&display_map);
-                let end = range.end.to_point(&display_map);
-                start..end
-            })
-            .collect::<Vec<_>>();
-
-        self.unfold_ranges(&ranges, true, true, cx);
-    }
-
-    pub fn unfold_at(
-        &mut self,
-        buffer_row: MultiBufferRow,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-
-        let intersection_range = Point::new(buffer_row.0, 0)
-            ..Point::new(
-                buffer_row.0,
-                display_map.buffer_snapshot().line_len(buffer_row),
-            );
-
-        let autoscroll = self
-            .selections
-            .all::<Point>(&display_map)
-            .iter()
-            .any(|selection| RangeExt::overlaps(&selection.range(), &intersection_range));
-
-        self.unfold_ranges(&[intersection_range], true, autoscroll, cx);
-    }
-
-    pub fn unfold_all(
-        &mut self,
-        _: &actions::UnfoldAll,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.buffer.read(cx).is_singleton() {
-            let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-            self.unfold_ranges(
-                &[MultiBufferOffset(0)..display_map.buffer_snapshot().len()],
-                true,
-                true,
-                cx,
-            );
-        } else {
-            self.toggle_fold_multiple_buffers = cx.spawn(async move |editor, cx| {
-                editor
-                    .update(cx, |editor, cx| {
-                        for buffer_id in editor.buffer.read(cx).excerpt_buffer_ids() {
-                            editor.unfold_buffer(buffer_id, cx);
-                        }
-                    })
-                    .ok();
-            });
-        }
-    }
-
-    pub fn fold_selected_ranges(
-        &mut self,
-        _: &FoldSelectedRanges,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-        let selections = self.selections.all_adjusted(&display_map);
-        let ranges = selections
-            .into_iter()
-            .map(|s| Crease::simple(s.range(), display_map.fold_placeholder.clone()))
-            .collect::<Vec<_>>();
-        self.fold_creases(ranges, true, window, cx);
-    }
-
-    pub fn fold_ranges<T: ToOffset + Clone>(
-        &mut self,
-        ranges: Vec<Range<T>>,
-        auto_scroll: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-        let ranges = ranges
-            .into_iter()
-            .map(|r| Crease::simple(r, display_map.fold_placeholder.clone()))
-            .collect::<Vec<_>>();
-        self.fold_creases(ranges, auto_scroll, window, cx);
-    }
-
-    pub fn fold_creases<T: ToOffset + Clone>(
-        &mut self,
-        creases: Vec<Crease<T>>,
-        auto_scroll: bool,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if creases.is_empty() {
-            return;
-        }
-
-        self.display_map.update(cx, |map, cx| map.fold(creases, cx));
-
-        if auto_scroll {
-            self.request_autoscroll(Autoscroll::fit(), cx);
-        }
-
-        cx.notify();
-
-        self.scrollbar_marker_state.dirty = true;
-        self.folds_did_change(cx);
-    }
-
-    /// Removes any folds whose ranges intersect any of the given ranges.
-    pub fn unfold_ranges<T: ToOffset + Clone>(
-        &mut self,
-        ranges: &[Range<T>],
-        inclusive: bool,
-        auto_scroll: bool,
-        cx: &mut Context<Self>,
-    ) {
-        self.remove_folds_with(ranges, auto_scroll, cx, |map, cx| {
-            map.unfold_intersecting(ranges.iter().cloned(), inclusive, cx)
-        });
-        self.folds_did_change(cx);
-    }
-
-    pub fn fold_buffer(&mut self, buffer_id: BufferId, cx: &mut Context<Self>) {
-        if self.buffer().read(cx).is_singleton() || self.is_buffer_folded(buffer_id, cx) {
-            return;
-        }
-
-        let folded_excerpts = self.buffer().read(cx).excerpts_for_buffer(buffer_id, cx);
-        self.display_map.update(cx, |display_map, cx| {
-            display_map.fold_buffers([buffer_id], cx)
-        });
-
-        let snapshot = self.display_snapshot(cx);
-        self.selections.change_with(&snapshot, |selections| {
-            selections.remove_selections_from_buffer(buffer_id);
-        });
-
-        cx.emit(EditorEvent::BufferFoldToggled {
-            ids: folded_excerpts.iter().map(|&(id, _)| id).collect(),
-            folded: true,
-        });
-        cx.notify();
-    }
-
-    pub fn unfold_buffer(&mut self, buffer_id: BufferId, cx: &mut Context<Self>) {
-        if self.buffer().read(cx).is_singleton() || !self.is_buffer_folded(buffer_id, cx) {
-            return;
-        }
-        let unfolded_excerpts = self.buffer().read(cx).excerpts_for_buffer(buffer_id, cx);
-        self.display_map.update(cx, |display_map, cx| {
-            display_map.unfold_buffers([buffer_id], cx);
-        });
-        cx.emit(EditorEvent::BufferFoldToggled {
-            ids: unfolded_excerpts.iter().map(|&(id, _)| id).collect(),
-            folded: false,
-        });
-        cx.notify();
-    }
-
-    pub fn is_buffer_folded(&self, buffer: BufferId, cx: &App) -> bool {
-        self.display_map.read(cx).is_buffer_folded(buffer)
-    }
-
-    pub fn folded_buffers<'a>(&self, cx: &'a App) -> &'a HashSet<BufferId> {
-        self.display_map.read(cx).folded_buffers()
-    }
-
-    pub fn disable_header_for_buffer(&mut self, buffer_id: BufferId, cx: &mut Context<Self>) {
-        self.display_map.update(cx, |display_map, cx| {
-            display_map.disable_header_for_buffer(buffer_id, cx);
-        });
-        cx.notify();
-    }
-
-    /// Removes any folds with the given ranges.
-    pub fn remove_folds_with_type<T: ToOffset + Clone>(
-        &mut self,
-        ranges: &[Range<T>],
-        type_id: TypeId,
-        auto_scroll: bool,
-        cx: &mut Context<Self>,
-    ) {
-        self.remove_folds_with(ranges, auto_scroll, cx, |map, cx| {
-            map.remove_folds_with_type(ranges.iter().cloned(), type_id, cx)
-        });
-        self.folds_did_change(cx);
-    }
-
-    fn remove_folds_with<T: ToOffset + Clone>(
-        &mut self,
-        ranges: &[Range<T>],
-        auto_scroll: bool,
-        cx: &mut Context<Self>,
-        update: impl FnOnce(&mut DisplayMap, &mut Context<DisplayMap>),
-    ) {
-        if ranges.is_empty() {
-            return;
-        }
-
-        let mut buffers_affected = HashSet::default();
-        let multi_buffer = self.buffer().read(cx);
-        for range in ranges {
-            if let Some((_, buffer, _)) = multi_buffer.excerpt_containing(range.start.clone(), cx) {
-                buffers_affected.insert(buffer.read(cx).remote_id());
-            };
-        }
-
-        self.display_map.update(cx, update);
-
-        if auto_scroll {
-            self.request_autoscroll(Autoscroll::fit(), cx);
-        }
-
-        cx.notify();
-        self.scrollbar_marker_state.dirty = true;
-        self.active_indent_guides_state.dirty = true;
-    }
-
-    pub fn update_renderer_widths(
-        &mut self,
-        widths: impl IntoIterator<Item = (ChunkRendererId, Pixels)>,
-        cx: &mut Context<Self>,
-    ) -> bool {
-        self.display_map
-            .update(cx, |map, cx| map.update_fold_widths(widths, cx))
-    }
-
-    pub fn default_fold_placeholder(&self, cx: &App) -> FoldPlaceholder {
-        self.display_map.read(cx).fold_placeholder.clone()
-    }
-
-    pub fn set_use_base_text_line_numbers(&mut self, show: bool, _cx: &mut Context<Self>) {
-        self.use_base_text_line_numbers = show;
-    }
-
-    pub fn set_expand_all_diff_hunks(&mut self, cx: &mut App) {
-        self.buffer.update(cx, |buffer, cx| {
-            buffer.set_all_diff_hunks_expanded(cx);
-        });
-    }
-
-    pub fn expand_all_diff_hunks(
-        &mut self,
-        _: &ExpandAllDiffHunks,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.buffer.update(cx, |buffer, cx| {
-            buffer.expand_diff_hunks(vec![Anchor::min()..Anchor::max()], cx)
-        });
-    }
-
-    pub fn collapse_all_diff_hunks(
-        &mut self,
-        _: &CollapseAllDiffHunks,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.buffer.update(cx, |buffer, cx| {
-            buffer.collapse_diff_hunks(vec![Anchor::min()..Anchor::max()], cx)
-        });
-    }
-
-    pub fn toggle_selected_diff_hunks(
-        &mut self,
-        _: &ToggleSelectedDiffHunks,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let ranges: Vec<_> = self
-            .selections
-            .disjoint_anchors()
-            .iter()
-            .map(|s| s.range())
-            .collect();
-        self.toggle_diff_hunks_in_ranges(ranges, cx);
-    }
-
-    pub fn diff_hunks_in_ranges<'a>(
-        &'a self,
-        ranges: &'a [Range<Anchor>],
-        buffer: &'a MultiBufferSnapshot,
-    ) -> impl 'a + Iterator<Item = MultiBufferDiffHunk> {
-        ranges.iter().flat_map(move |range| {
-            let end_excerpt_id = range.end.excerpt_id;
-            let range = range.to_point(buffer);
-            let mut peek_end = range.end;
-            if range.end.row < buffer.max_row().0 {
-                peek_end = Point::new(range.end.row + 1, 0);
-            }
-            buffer
-                .diff_hunks_in_range(range.start..peek_end)
-                .filter(move |hunk| hunk.excerpt_id.cmp(&end_excerpt_id, buffer).is_le())
-        })
-    }
-
-    pub fn has_stageable_diff_hunks_in_ranges(
-        &self,
-        ranges: &[Range<Anchor>],
-        snapshot: &MultiBufferSnapshot,
-    ) -> bool {
-        let mut hunks = self.diff_hunks_in_ranges(ranges, snapshot);
-        hunks.any(|hunk| hunk.status().has_secondary_hunk())
-    }
-
-    pub fn toggle_staged_selected_diff_hunks(
-        &mut self,
-        _: &::git::ToggleStaged,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let snapshot = self.buffer.read(cx).snapshot(cx);
-        let ranges: Vec<_> = self
-            .selections
-            .disjoint_anchors()
-            .iter()
-            .map(|s| s.range())
-            .collect();
-        let stage = self.has_stageable_diff_hunks_in_ranges(&ranges, &snapshot);
-        self.stage_or_unstage_diff_hunks(stage, ranges, cx);
-    }
-
-    pub fn set_render_diff_hunk_controls(
-        &mut self,
-        render_diff_hunk_controls: RenderDiffHunkControlsFn,
-        cx: &mut Context<Self>,
-    ) {
-        self.render_diff_hunk_controls = render_diff_hunk_controls;
-        cx.notify();
-    }
-
-    pub fn stage_and_next(
-        &mut self,
-        _: &::git::StageAndNext,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.do_stage_or_unstage_and_next(true, window, cx);
-    }
-
-    pub fn unstage_and_next(
-        &mut self,
-        _: &::git::UnstageAndNext,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.do_stage_or_unstage_and_next(false, window, cx);
-    }
-
-    pub fn stage_or_unstage_diff_hunks(
-        &mut self,
-        stage: bool,
-        ranges: Vec<Range<Anchor>>,
-        cx: &mut Context<Self>,
-    ) {
-        let task = self.save_buffers_for_ranges_if_needed(&ranges, cx);
-        cx.spawn(async move |this, cx| {
-            task.await?;
-            this.update(cx, |this, cx| {
-                let snapshot = this.buffer.read(cx).snapshot(cx);
-                let chunk_by = this
-                    .diff_hunks_in_ranges(&ranges, &snapshot)
-                    .chunk_by(|hunk| hunk.buffer_id);
-                for (buffer_id, hunks) in &chunk_by {
-                    this.do_stage_or_unstage(stage, buffer_id, hunks, cx);
-                }
-            })
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn save_buffers_for_ranges_if_needed(
-        &mut self,
-        ranges: &[Range<Anchor>],
-        cx: &mut Context<Editor>,
-    ) -> Task<Result<()>> {
-        let multibuffer = self.buffer.read(cx);
-        let snapshot = multibuffer.read(cx);
-        let buffer_ids: HashSet<_> = ranges
-            .iter()
-            .flat_map(|range| snapshot.buffer_ids_for_range(range.clone()))
-            .collect();
-        drop(snapshot);
-
-        let mut buffers = HashSet::default();
-        for buffer_id in buffer_ids {
-            if let Some(buffer_entity) = multibuffer.buffer(buffer_id) {
-                let buffer = buffer_entity.read(cx);
-                if buffer.file().is_some_and(|file| file.disk_state().exists()) && buffer.is_dirty()
-                {
-                    buffers.insert(buffer_entity);
-                }
-            }
-        }
-
-        if let Some(project) = &self.project {
-            project.update(cx, |project, cx| project.save_buffers(buffers, cx))
-        } else {
-            Task::ready(Ok(()))
-        }
-    }
-
-    fn do_stage_or_unstage_and_next(
-        &mut self,
-        stage: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let ranges = self.selections.disjoint_anchor_ranges().collect::<Vec<_>>();
-
-        if ranges.iter().any(|range| range.start != range.end) {
-            self.stage_or_unstage_diff_hunks(stage, ranges, cx);
-            return;
-        }
-
-        self.stage_or_unstage_diff_hunks(stage, ranges, cx);
-        let snapshot = self.snapshot(window, cx);
-        let position = self
-            .selections
-            .newest::<Point>(&snapshot.display_snapshot)
-            .head();
-        let mut row = snapshot
-            .buffer_snapshot()
-            .diff_hunks_in_range(position..snapshot.buffer_snapshot().max_point())
-            .find(|hunk| hunk.row_range.start.0 > position.row)
-            .map(|hunk| hunk.row_range.start);
-
-        let all_diff_hunks_expanded = self.buffer().read(cx).all_diff_hunks_expanded();
-        // Outside of the project diff editor, wrap around to the beginning.
-        if !all_diff_hunks_expanded {
-            row = row.or_else(|| {
-                snapshot
-                    .buffer_snapshot()
-                    .diff_hunks_in_range(Point::zero()..position)
-                    .find(|hunk| hunk.row_range.end.0 < position.row)
-                    .map(|hunk| hunk.row_range.start)
-            });
-        }
-
-        if let Some(row) = row {
-            let destination = Point::new(row.0, 0);
-            let autoscroll = Autoscroll::center();
-
-            self.unfold_ranges(&[destination..destination], false, false, cx);
-            self.change_selections(SelectionEffects::scroll(autoscroll), window, cx, |s| {
-                s.select_ranges([destination..destination]);
-            });
-        }
-    }
-
-    fn do_stage_or_unstage(
-        &self,
-        stage: bool,
-        buffer_id: BufferId,
-        hunks: impl Iterator<Item = MultiBufferDiffHunk>,
-        cx: &mut App,
-    ) -> Option<()> {
-        let project = self.project()?;
-        let buffer = project.read(cx).buffer_for_id(buffer_id, cx)?;
-        let diff = self.buffer.read(cx).diff_for(buffer_id)?;
-        let buffer_snapshot = buffer.read(cx).snapshot();
-        let file_exists = buffer_snapshot
-            .file()
-            .is_some_and(|file| file.disk_state().exists());
-        diff.update(cx, |diff, cx| {
-            diff.stage_or_unstage_hunks(
-                stage,
-                &hunks
-                    .map(|hunk| buffer_diff::DiffHunk {
-                        buffer_range: hunk.buffer_range,
-                        // We don't need to pass in word diffs here because they're only used for rendering and
-                        // this function changes internal state
-                        base_word_diffs: Vec::default(),
-                        buffer_word_diffs: Vec::default(),
-                        diff_base_byte_range: hunk.diff_base_byte_range.start.0
-                            ..hunk.diff_base_byte_range.end.0,
-                        secondary_status: hunk.secondary_status,
-                        range: Point::zero()..Point::zero(), // unused
-                    })
-                    .collect::<Vec<_>>(),
-                &buffer_snapshot,
-                file_exists,
-                cx,
-            )
-        });
-        None
-    }
-
-    pub fn expand_selected_diff_hunks(&mut self, cx: &mut Context<Self>) {
-        let ranges: Vec<_> = self
-            .selections
-            .disjoint_anchors()
-            .iter()
-            .map(|s| s.range())
-            .collect();
-        self.buffer
-            .update(cx, |buffer, cx| buffer.expand_diff_hunks(ranges, cx))
-    }
-
-    pub fn clear_expanded_diff_hunks(&mut self, cx: &mut Context<Self>) -> bool {
-        self.buffer.update(cx, |buffer, cx| {
-            let ranges = vec![Anchor::min()..Anchor::max()];
-            if !buffer.all_diff_hunks_expanded()
-                && buffer.has_expanded_diff_hunks_in_ranges(&ranges, cx)
-            {
-                buffer.collapse_diff_hunks(ranges, cx);
-                true
-            } else {
-                false
-            }
-        })
-    }
-
-    fn has_any_expanded_diff_hunks(&self, cx: &App) -> bool {
-        if self.buffer.read(cx).all_diff_hunks_expanded() {
-            return true;
-        }
-        let ranges = vec![Anchor::min()..Anchor::max()];
-        self.buffer
-            .read(cx)
-            .has_expanded_diff_hunks_in_ranges(&ranges, cx)
-    }
-
-    fn toggle_diff_hunks_in_ranges(
-        &mut self,
-        ranges: Vec<Range<Anchor>>,
-        cx: &mut Context<Editor>,
-    ) {
-        self.buffer.update(cx, |buffer, cx| {
-            let expand = !buffer.has_expanded_diff_hunks_in_ranges(&ranges, cx);
-            buffer.expand_or_collapse_diff_hunks(ranges, expand, cx);
-        })
-    }
-
-    fn toggle_single_diff_hunk(&mut self, range: Range<Anchor>, cx: &mut Context<Self>) {
-        self.buffer.update(cx, |buffer, cx| {
-            let snapshot = buffer.snapshot(cx);
-            let excerpt_id = range.end.excerpt_id;
-            let point_range = range.to_point(&snapshot);
-            let expand = !buffer.single_hunk_is_expanded(range, cx);
-            buffer.expand_or_collapse_diff_hunks_inner([(point_range, excerpt_id)], expand, cx);
-        })
-    }
-
-    pub(crate) fn apply_all_diff_hunks(
-        &mut self,
-        _: &ApplyAllDiffHunks,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-
-        let buffers = self.buffer.read(cx).all_buffers();
-        for branch_buffer in buffers {
-            branch_buffer.update(cx, |branch_buffer, cx| {
-                branch_buffer.merge_into_base(Vec::new(), cx);
-            });
-        }
-
-        if let Some(project) = self.project.clone() {
-            self.save(
-                SaveOptions {
-                    format: true,
-                    autosave: false,
-                },
-                project,
-                window,
-                cx,
-            )
-            .detach_and_log_err(cx);
-        }
-    }
-
-    pub(crate) fn apply_selected_diff_hunks(
-        &mut self,
-        _: &ApplyDiffHunk,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-        let snapshot = self.snapshot(window, cx);
-        let hunks = snapshot.hunks_for_ranges(
-            self.selections
-                .all(&snapshot.display_snapshot)
-                .into_iter()
-                .map(|selection| selection.range()),
-        );
-        let mut ranges_by_buffer = HashMap::default();
-        self.transact(window, cx, |editor, _window, cx| {
-            for hunk in hunks {
-                if let Some(buffer) = editor.buffer.read(cx).buffer(hunk.buffer_id) {
-                    ranges_by_buffer
-                        .entry(buffer.clone())
-                        .or_insert_with(Vec::new)
-                        .push(hunk.buffer_range.to_offset(buffer.read(cx)));
-                }
-            }
-
-            for (buffer, ranges) in ranges_by_buffer {
-                buffer.update(cx, |buffer, cx| {
-                    buffer.merge_into_base(ranges, cx);
-                });
-            }
-        });
-
-        if let Some(project) = self.project.clone() {
-            self.save(
-                SaveOptions {
-                    format: true,
-                    autosave: false,
-                },
-                project,
-                window,
-                cx,
-            )
-            .detach_and_log_err(cx);
-        }
-    }
-
-    pub fn set_gutter_hovered(&mut self, hovered: bool, cx: &mut Context<Self>) {
-        if hovered != self.gutter_hovered {
-            self.gutter_hovered = hovered;
-            cx.notify();
-        }
-    }
-
-    pub fn insert_blocks(
-        &mut self,
-        blocks: impl IntoIterator<Item = BlockProperties<Anchor>>,
-        autoscroll: Option<Autoscroll>,
-        cx: &mut Context<Self>,
-    ) -> Vec<CustomBlockId> {
-        let blocks = self
-            .display_map
-            .update(cx, |display_map, cx| display_map.insert_blocks(blocks, cx));
-        if let Some(autoscroll) = autoscroll {
-            self.request_autoscroll(autoscroll, cx);
-        }
-        cx.notify();
-        blocks
-    }
-
-    pub fn resize_blocks(
-        &mut self,
-        heights: HashMap<CustomBlockId, u32>,
-        autoscroll: Option<Autoscroll>,
-        cx: &mut Context<Self>,
-    ) {
-        self.display_map
-            .update(cx, |display_map, cx| display_map.resize_blocks(heights, cx));
-        if let Some(autoscroll) = autoscroll {
-            self.request_autoscroll(autoscroll, cx);
-        }
-        cx.notify();
-    }
-
-    pub fn replace_blocks(
-        &mut self,
-        renderers: HashMap<CustomBlockId, RenderBlock>,
-        autoscroll: Option<Autoscroll>,
-        cx: &mut Context<Self>,
-    ) {
-        self.display_map
-            .update(cx, |display_map, _cx| display_map.replace_blocks(renderers));
-        if let Some(autoscroll) = autoscroll {
-            self.request_autoscroll(autoscroll, cx);
-        }
-        cx.notify();
-    }
-
-    pub fn remove_blocks(
-        &mut self,
-        block_ids: HashSet<CustomBlockId>,
-        autoscroll: Option<Autoscroll>,
-        cx: &mut Context<Self>,
-    ) {
-        self.display_map.update(cx, |display_map, cx| {
-            display_map.remove_blocks(block_ids, cx)
-        });
-        if let Some(autoscroll) = autoscroll {
-            self.request_autoscroll(autoscroll, cx);
-        }
-        cx.notify();
-    }
-
-    pub fn row_for_block(
-        &self,
-        block_id: CustomBlockId,
-        cx: &mut Context<Self>,
-    ) -> Option<DisplayRow> {
-        self.display_map
-            .update(cx, |map, cx| map.row_for_block(block_id, cx))
-    }
-
-    pub(crate) fn set_focused_block(&mut self, focused_block: FocusedBlock) {
-        self.focused_block = Some(focused_block);
-    }
-
-    pub(crate) fn take_focused_block(&mut self) -> Option<FocusedBlock> {
-        self.focused_block.take()
-    }
-
-    pub fn insert_creases(
-        &mut self,
-        creases: impl IntoIterator<Item = Crease<Anchor>>,
-        cx: &mut Context<Self>,
-    ) -> Vec<CreaseId> {
-        self.display_map
-            .update(cx, |map, cx| map.insert_creases(creases, cx))
-    }
-
-    pub fn remove_creases(
-        &mut self,
-        ids: impl IntoIterator<Item = CreaseId>,
-        cx: &mut Context<Self>,
-    ) -> Vec<(CreaseId, Range<Anchor>)> {
-        self.display_map
-            .update(cx, |map, cx| map.remove_creases(ids, cx))
-    }
-
-    pub fn longest_row(&self, cx: &mut App) -> DisplayRow {
-        self.display_map
-            .update(cx, |map, cx| map.snapshot(cx))
-            .longest_row()
-    }
-
-    pub fn max_point(&self, cx: &mut App) -> DisplayPoint {
-        self.display_map
-            .update(cx, |map, cx| map.snapshot(cx))
-            .max_point()
-    }
-
-    pub fn text(&self, cx: &App) -> String {
-        self.buffer.read(cx).read(cx).text()
-    }
-
-    pub fn is_empty(&self, cx: &App) -> bool {
-        self.buffer.read(cx).read(cx).is_empty()
-    }
-
-    pub fn text_option(&self, cx: &App) -> Option<String> {
-        let text = self.text(cx);
-        let text = text.trim();
-
-        if text.is_empty() {
-            return None;
-        }
-
-        Some(text.to_string())
-    }
-
-    pub fn set_text(
-        &mut self,
-        text: impl Into<Arc<str>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.transact(window, cx, |this, _, cx| {
-            this.buffer
-                .read(cx)
-                .as_singleton()
-                .expect("you can only call set_text on editors for singleton buffers")
-                .update(cx, |buffer, cx| buffer.set_text(text, cx));
-        });
-    }
-
-    pub fn display_text(&self, cx: &mut App) -> String {
-        self.display_map
-            .update(cx, |map, cx| map.snapshot(cx))
-            .text()
-    }
-
-    fn create_minimap(
-        &self,
-        minimap_settings: MinimapSettings,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Entity<Self>> {
-        (minimap_settings.minimap_enabled() && self.buffer_kind(cx) == ItemBufferKind::Singleton)
-            .then(|| self.initialize_new_minimap(minimap_settings, window, cx))
-    }
-
-    fn initialize_new_minimap(
-        &self,
-        minimap_settings: MinimapSettings,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Entity<Self> {
-        const MINIMAP_FONT_WEIGHT: gpui::FontWeight = gpui::FontWeight::BLACK;
-
-        let mut minimap = Editor::new_internal(
-            EditorMode::Minimap {
-                parent: cx.weak_entity(),
-            },
-            self.buffer.clone(),
-            None,
-            Some(self.display_map.clone()),
-            window,
-            cx,
-        );
-        minimap.scroll_manager.clone_state(&self.scroll_manager);
-        minimap.set_text_style_refinement(TextStyleRefinement {
-            font_size: Some(MINIMAP_FONT_SIZE),
-            font_weight: Some(MINIMAP_FONT_WEIGHT),
-            ..Default::default()
-        });
-        minimap.update_minimap_configuration(minimap_settings, cx);
-        cx.new(|_| minimap)
-    }
-
-    fn update_minimap_configuration(&mut self, minimap_settings: MinimapSettings, cx: &App) {
-        let current_line_highlight = minimap_settings
-            .current_line_highlight
-            .unwrap_or_else(|| EditorSettings::get_global(cx).current_line_highlight);
-        self.set_current_line_highlight(Some(current_line_highlight));
-    }
-
-    pub fn minimap(&self) -> Option<&Entity<Self>> {
-        self.minimap
-            .as_ref()
-            .filter(|_| self.minimap_visibility.visible())
-    }
-
-    pub fn wrap_guides(&self, cx: &App) -> SmallVec<[(usize, bool); 2]> {
-        let mut wrap_guides = smallvec![];
-
-        if self.show_wrap_guides == Some(false) {
-            return wrap_guides;
-        }
-
-        let settings = self.buffer.read(cx).language_settings(cx);
-        if settings.show_wrap_guides {
-            match self.soft_wrap_mode(cx) {
-                SoftWrap::Column(soft_wrap) => {
-                    wrap_guides.push((soft_wrap as usize, true));
-                }
-                SoftWrap::Bounded(soft_wrap) => {
-                    wrap_guides.push((soft_wrap as usize, true));
-                }
-                SoftWrap::GitDiff | SoftWrap::None | SoftWrap::EditorWidth => {}
-            }
-            wrap_guides.extend(settings.wrap_guides.iter().map(|guide| (*guide, false)))
-        }
-
-        wrap_guides
-    }
-
-    pub fn soft_wrap_mode(&self, cx: &App) -> SoftWrap {
-        let settings = self.buffer.read(cx).language_settings(cx);
-        let mode = self.soft_wrap_mode_override.unwrap_or(settings.soft_wrap);
-        match mode {
-            language_settings::SoftWrap::PreferLine | language_settings::SoftWrap::None => {
-                SoftWrap::None
-            }
-            language_settings::SoftWrap::EditorWidth => SoftWrap::EditorWidth,
-            language_settings::SoftWrap::PreferredLineLength => {
-                SoftWrap::Column(settings.preferred_line_length)
-            }
-            language_settings::SoftWrap::Bounded => {
-                SoftWrap::Bounded(settings.preferred_line_length)
-            }
-        }
-    }
-
-    pub fn set_soft_wrap_mode(
-        &mut self,
-        mode: language_settings::SoftWrap,
-
-        cx: &mut Context<Self>,
-    ) {
-        self.soft_wrap_mode_override = Some(mode);
-        cx.notify();
-    }
-
-    pub fn set_hard_wrap(&mut self, hard_wrap: Option<usize>, cx: &mut Context<Self>) {
-        self.hard_wrap = hard_wrap;
-        cx.notify();
-    }
-
-    pub fn set_text_style_refinement(&mut self, style: TextStyleRefinement) {
-        self.text_style_refinement = Some(style);
-    }
-
-    /// called by the Element so we know what style we were most recently rendered with.
-    pub fn set_style(&mut self, style: EditorStyle, window: &mut Window, cx: &mut Context<Self>) {
-        // We intentionally do not inform the display map about the minimap style
-        // so that wrapping is not recalculated and stays consistent for the editor
-        // and its linked minimap.
-        if !self.mode.is_minimap() {
-            let font = style.text.font();
-            let font_size = style.text.font_size.to_pixels(window.rem_size());
-            let display_map = self
-                .placeholder_display_map
-                .as_ref()
-                .filter(|_| self.is_empty(cx))
-                .unwrap_or(&self.display_map);
-
-            display_map.update(cx, |map, cx| map.set_font(font, font_size, cx));
-        }
-        self.style = Some(style);
-    }
-
-    pub fn style(&mut self, cx: &App) -> &EditorStyle {
-        if self.style.is_none() {
-            self.style = Some(self.create_style(cx));
-        }
-        self.style.as_ref().unwrap()
-    }
-
-    // Called by the element. This method is not designed to be called outside of the editor
-    // element's layout code because it does not notify when rewrapping is computed synchronously.
-    pub(crate) fn set_wrap_width(&self, width: Option<Pixels>, cx: &mut App) -> bool {
-        if self.is_empty(cx) {
-            self.placeholder_display_map
-                .as_ref()
-                .map_or(false, |display_map| {
-                    display_map.update(cx, |map, cx| map.set_wrap_width(width, cx))
-                })
-        } else {
-            self.display_map
-                .update(cx, |map, cx| map.set_wrap_width(width, cx))
-        }
-    }
-
-    pub fn set_soft_wrap(&mut self) {
-        self.soft_wrap_mode_override = Some(language_settings::SoftWrap::EditorWidth)
-    }
-
-    pub fn toggle_soft_wrap(&mut self, _: &ToggleSoftWrap, _: &mut Window, cx: &mut Context<Self>) {
-        if self.soft_wrap_mode_override.is_some() {
-            self.soft_wrap_mode_override.take();
-        } else {
-            let soft_wrap = match self.soft_wrap_mode(cx) {
-                SoftWrap::GitDiff => return,
-                SoftWrap::None => language_settings::SoftWrap::EditorWidth,
-                SoftWrap::EditorWidth | SoftWrap::Column(_) | SoftWrap::Bounded(_) => {
-                    language_settings::SoftWrap::None
-                }
-            };
-            self.soft_wrap_mode_override = Some(soft_wrap);
-        }
-        cx.notify();
-    }
-
-    pub fn toggle_tab_bar(&mut self, _: &ToggleTabBar, _: &mut Window, cx: &mut Context<Self>) {
-        let Some(workspace) = self.workspace() else {
-            return;
-        };
-        let fs = workspace.read(cx).app_state().fs.clone();
-        let current_show = TabBarSettings::get_global(cx).show;
-        update_settings_file(fs, cx, move |setting, _| {
-            setting.tab_bar.get_or_insert_default().show = Some(!current_show);
-        });
-    }
-
-    pub fn toggle_indent_guides(
-        &mut self,
-        _: &ToggleIndentGuides,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let currently_enabled = self.should_show_indent_guides().unwrap_or_else(|| {
-            self.buffer
-                .read(cx)
-                .language_settings(cx)
-                .indent_guides
-                .enabled
-        });
-        self.show_indent_guides = Some(!currently_enabled);
-        cx.notify();
-    }
-
-    fn should_show_indent_guides(&self) -> Option<bool> {
-        self.show_indent_guides
-    }
-
-    pub fn disable_indent_guides_for_buffer(
-        &mut self,
-        buffer_id: BufferId,
-        cx: &mut Context<Self>,
-    ) {
-        self.buffers_with_disabled_indent_guides.insert(buffer_id);
-        cx.notify();
-    }
-
-    pub fn has_indent_guides_disabled_for_buffer(&self, buffer_id: BufferId) -> bool {
-        self.buffers_with_disabled_indent_guides
-            .contains(&buffer_id)
-    }
-
-    pub fn toggle_line_numbers(
-        &mut self,
-        _: &ToggleLineNumbers,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let mut editor_settings = EditorSettings::get_global(cx).clone();
-        editor_settings.gutter.line_numbers = !editor_settings.gutter.line_numbers;
-        EditorSettings::override_global(editor_settings, cx);
-    }
-
-    pub fn line_numbers_enabled(&self, cx: &App) -> bool {
-        if let Some(show_line_numbers) = self.show_line_numbers {
-            return show_line_numbers;
-        }
-        EditorSettings::get_global(cx).gutter.line_numbers
-    }
-
-    pub fn relative_line_numbers(&self, cx: &mut App) -> RelativeLineNumbers {
-        match (
-            self.use_relative_line_numbers,
-            EditorSettings::get_global(cx).relative_line_numbers,
-        ) {
-            (None, setting) => setting,
-            (Some(false), _) => RelativeLineNumbers::Disabled,
-            (Some(true), RelativeLineNumbers::Wrapped) => RelativeLineNumbers::Wrapped,
-            (Some(true), _) => RelativeLineNumbers::Enabled,
-        }
-    }
-
-    pub fn toggle_relative_line_numbers(
-        &mut self,
-        _: &ToggleRelativeLineNumbers,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let is_relative = self.relative_line_numbers(cx);
-        self.set_relative_line_number(Some(!is_relative.enabled()), cx)
-    }
-
-    pub fn set_relative_line_number(&mut self, is_relative: Option<bool>, cx: &mut Context<Self>) {
-        self.use_relative_line_numbers = is_relative;
-        cx.notify();
-    }
-
-    pub fn set_show_gutter(&mut self, show_gutter: bool, cx: &mut Context<Self>) {
-        self.show_gutter = show_gutter;
-        cx.notify();
-    }
-
-    pub fn set_show_scrollbars(&mut self, show: bool, cx: &mut Context<Self>) {
-        self.show_scrollbars = ScrollbarAxes {
-            horizontal: show,
-            vertical: show,
-        };
-        cx.notify();
-    }
-
-    pub fn set_show_vertical_scrollbar(&mut self, show: bool, cx: &mut Context<Self>) {
-        self.show_scrollbars.vertical = show;
-        cx.notify();
-    }
-
-    pub fn set_show_horizontal_scrollbar(&mut self, show: bool, cx: &mut Context<Self>) {
-        self.show_scrollbars.horizontal = show;
-        cx.notify();
-    }
-
-    pub fn set_minimap_visibility(
-        &mut self,
-        minimap_visibility: MinimapVisibility,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.minimap_visibility != minimap_visibility {
-            if minimap_visibility.visible() && self.minimap.is_none() {
-                let minimap_settings = EditorSettings::get_global(cx).minimap;
-                self.minimap =
-                    self.create_minimap(minimap_settings.with_show_override(), window, cx);
-            }
-            self.minimap_visibility = minimap_visibility;
-            cx.notify();
-        }
-    }
-
-    pub fn disable_scrollbars_and_minimap(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.set_show_scrollbars(false, cx);
-        self.set_minimap_visibility(MinimapVisibility::Disabled, window, cx);
-    }
-
-    pub fn hide_minimap_by_default(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.set_minimap_visibility(self.minimap_visibility.hidden(), window, cx);
-    }
-
-    /// Normally the text in full mode and auto height editors is padded on the
-    /// left side by roughly half a character width for improved hit testing.
-    ///
-    /// Use this method to disable this for cases where this is not wanted (e.g.
-    /// if you want to align the editor text with some other text above or below)
-    /// or if you want to add this padding to single-line editors.
-    pub fn set_offset_content(&mut self, offset_content: bool, cx: &mut Context<Self>) {
-        self.offset_content = offset_content;
-        cx.notify();
-    }
-
-    pub fn set_show_line_numbers(&mut self, show_line_numbers: bool, cx: &mut Context<Self>) {
-        self.show_line_numbers = Some(show_line_numbers);
-        cx.notify();
-    }
-
-    pub fn disable_expand_excerpt_buttons(&mut self, cx: &mut Context<Self>) {
-        self.disable_expand_excerpt_buttons = true;
-        cx.notify();
-    }
-
-    pub fn set_show_git_diff_gutter(&mut self, show_git_diff_gutter: bool, cx: &mut Context<Self>) {
-        self.show_git_diff_gutter = Some(show_git_diff_gutter);
-        cx.notify();
-    }
-
-    pub fn set_show_code_actions(&mut self, show_code_actions: bool, cx: &mut Context<Self>) {
-        self.show_code_actions = Some(show_code_actions);
-        cx.notify();
-    }
-
-    pub fn set_show_runnables(&mut self, show_runnables: bool, cx: &mut Context<Self>) {
-        self.show_runnables = Some(show_runnables);
-        cx.notify();
-    }
-
-    pub fn set_show_breakpoints(&mut self, show_breakpoints: bool, cx: &mut Context<Self>) {
-        self.show_breakpoints = Some(show_breakpoints);
-        cx.notify();
-    }
-
-    pub fn set_masked(&mut self, masked: bool, cx: &mut Context<Self>) {
-        if self.display_map.read(cx).masked != masked {
-            self.display_map.update(cx, |map, _| map.masked = masked);
-        }
-        cx.notify()
-    }
-
-    pub fn set_show_wrap_guides(&mut self, show_wrap_guides: bool, cx: &mut Context<Self>) {
-        self.show_wrap_guides = Some(show_wrap_guides);
-        cx.notify();
-    }
-
-    pub fn set_show_indent_guides(&mut self, show_indent_guides: bool, cx: &mut Context<Self>) {
-        self.show_indent_guides = Some(show_indent_guides);
-        cx.notify();
-    }
-
-    pub fn working_directory(&self, cx: &App) -> Option<PathBuf> {
-        if let Some(buffer) = self.buffer().read(cx).as_singleton() {
-            if let Some(file) = buffer.read(cx).file().and_then(|f| f.as_local())
-                && let Some(dir) = file.abs_path(cx).parent()
-            {
-                return Some(dir.to_owned());
-            }
-        }
-
-        None
-    }
-
-    fn target_file<'a>(&self, cx: &'a App) -> Option<&'a dyn language::LocalFile> {
-        self.active_excerpt(cx)?
-            .1
-            .read(cx)
-            .file()
-            .and_then(|f| f.as_local())
-    }
-
-    pub fn target_file_abs_path(&self, cx: &mut Context<Self>) -> Option<PathBuf> {
-        self.active_excerpt(cx).and_then(|(_, buffer, _)| {
-            let buffer = buffer.read(cx);
-            if let Some(project_path) = buffer.project_path(cx) {
-                let project = self.project()?.read(cx);
-                project.absolute_path(&project_path, cx)
-            } else {
-                buffer
-                    .file()
-                    .and_then(|file| file.as_local().map(|file| file.abs_path(cx)))
-            }
-        })
-    }
-
-    pub fn reveal_in_finder(
-        &mut self,
-        _: &RevealInFileManager,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(target) = self.target_file(cx) {
-            cx.reveal_path(&target.abs_path(cx));
-        }
-    }
-
-    pub fn copy_path(
-        &mut self,
-        _: &zed_actions::workspace::CopyPath,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(path) = self.target_file_abs_path(cx)
-            && let Some(path) = path.to_str()
-        {
-            cx.write_to_clipboard(ClipboardItem::new_string(path.to_string()));
-        } else {
-            cx.propagate();
-        }
-    }
-
-    pub fn copy_relative_path(
-        &mut self,
-        _: &zed_actions::workspace::CopyRelativePath,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(path) = self.active_excerpt(cx).and_then(|(_, buffer, _)| {
-            let project = self.project()?.read(cx);
-            let path = buffer.read(cx).file()?.path();
-            let path = path.display(project.path_style(cx));
-            Some(path)
-        }) {
-            cx.write_to_clipboard(ClipboardItem::new_string(path.to_string()));
-        } else {
-            cx.propagate();
-        }
-    }
-
-    /// Returns the project path for the editor's buffer, if any buffer is
-    /// opened in the editor.
-    pub fn project_path(&self, cx: &App) -> Option<ProjectPath> {
-        if let Some(buffer) = self.buffer.read(cx).as_singleton() {
-            buffer.read(cx).project_path(cx)
-        } else {
-            None
-        }
-    }
-
-    // Returns true if the editor handled a go-to-line request
-    pub fn go_to_active_debug_line(&mut self, window: &mut Window, cx: &mut Context<Self>) -> bool {
-        maybe!({
-            let breakpoint_store = self.breakpoint_store.as_ref()?;
-
-            let Some(active_stack_frame) = breakpoint_store.read(cx).active_position().cloned()
-            else {
-                self.clear_row_highlights::<ActiveDebugLine>();
-                return None;
-            };
-
-            let position = active_stack_frame.position;
-            let buffer_id = position.buffer_id?;
-            let snapshot = self
-                .project
-                .as_ref()?
-                .read(cx)
-                .buffer_for_id(buffer_id, cx)?
-                .read(cx)
-                .snapshot();
-
-            let mut handled = false;
-            for (id, ExcerptRange { context, .. }) in
-                self.buffer.read(cx).excerpts_for_buffer(buffer_id, cx)
-            {
-                if context.start.cmp(&position, &snapshot).is_ge()
-                    || context.end.cmp(&position, &snapshot).is_lt()
-                {
-                    continue;
-                }
-                let snapshot = self.buffer.read(cx).snapshot(cx);
-                let multibuffer_anchor = snapshot.anchor_in_excerpt(id, position)?;
-
-                handled = true;
-                self.clear_row_highlights::<ActiveDebugLine>();
-
-                self.go_to_line::<ActiveDebugLine>(
-                    multibuffer_anchor,
-                    Some(cx.theme().colors().editor_debugger_active_line_background),
-                    window,
-                    cx,
-                );
-
-                cx.notify();
-            }
-
-            handled.then_some(())
-        })
-        .is_some()
-    }
-
-    pub fn copy_file_name_without_extension(
-        &mut self,
-        _: &CopyFileNameWithoutExtension,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(file_stem) = self.active_excerpt(cx).and_then(|(_, buffer, _)| {
-            let file = buffer.read(cx).file()?;
-            file.path().file_stem()
-        }) {
-            cx.write_to_clipboard(ClipboardItem::new_string(file_stem.to_string()));
-        }
-    }
-
-    pub fn copy_file_name(&mut self, _: &CopyFileName, _: &mut Window, cx: &mut Context<Self>) {
-        if let Some(file_name) = self.active_excerpt(cx).and_then(|(_, buffer, _)| {
-            let file = buffer.read(cx).file()?;
-            Some(file.file_name(cx))
-        }) {
-            cx.write_to_clipboard(ClipboardItem::new_string(file_name.to_string()));
-        }
-    }
-
-    pub fn toggle_git_blame(
-        &mut self,
-        _: &::git::Blame,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.show_git_blame_gutter = !self.show_git_blame_gutter;
-
-        if self.show_git_blame_gutter && !self.has_blame_entries(cx) {
-            self.start_git_blame(true, window, cx);
-        }
-
-        cx.notify();
-    }
-
-    pub fn toggle_git_blame_inline(
-        &mut self,
-        _: &ToggleGitBlameInline,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.toggle_git_blame_inline_internal(true, window, cx);
-        cx.notify();
-    }
-
-    pub fn open_git_blame_commit(
-        &mut self,
-        _: &OpenGitBlameCommit,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.open_git_blame_commit_internal(window, cx);
-    }
-
-    fn open_git_blame_commit_internal(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<()> {
-        let blame = self.blame.as_ref()?;
-        let snapshot = self.snapshot(window, cx);
-        let cursor = self
-            .selections
-            .newest::<Point>(&snapshot.display_snapshot)
-            .head();
-        let (buffer, point, _) = snapshot.buffer_snapshot().point_to_buffer_point(cursor)?;
-        let (_, blame_entry) = blame
-            .update(cx, |blame, cx| {
-                blame
-                    .blame_for_rows(
-                        &[RowInfo {
-                            buffer_id: Some(buffer.remote_id()),
-                            buffer_row: Some(point.row),
-                            ..Default::default()
-                        }],
-                        cx,
-                    )
-                    .next()
-            })
-            .flatten()?;
-        let renderer = cx.global::<GlobalBlameRenderer>().0.clone();
-        let repo = blame.read(cx).repository(cx, buffer.remote_id())?;
-        let workspace = self.workspace()?.downgrade();
-        renderer.open_blame_commit(blame_entry, repo, workspace, window, cx);
-        None
-    }
-
-    pub fn git_blame_inline_enabled(&self) -> bool {
-        self.git_blame_inline_enabled
-    }
-
-    pub fn toggle_selection_menu(
-        &mut self,
-        _: &ToggleSelectionMenu,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.show_selection_menu = self
-            .show_selection_menu
-            .map(|show_selections_menu| !show_selections_menu)
-            .or_else(|| Some(!EditorSettings::get_global(cx).toolbar.selections_menu));
-
-        cx.notify();
-    }
-
-    pub fn selection_menu_enabled(&self, cx: &App) -> bool {
-        self.show_selection_menu
-            .unwrap_or_else(|| EditorSettings::get_global(cx).toolbar.selections_menu)
-    }
-
-    fn start_git_blame(
-        &mut self,
-        user_triggered: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(project) = self.project() {
-            if let Some(buffer) = self.buffer().read(cx).as_singleton()
-                && buffer.read(cx).file().is_none()
-            {
-                return;
-            }
-
-            let focused = self.focus_handle(cx).contains_focused(window, cx);
-
-            let project = project.clone();
-            let blame = cx
-                .new(|cx| GitBlame::new(self.buffer.clone(), project, user_triggered, focused, cx));
-            self.blame_subscription =
-                Some(cx.observe_in(&blame, window, |_, _, _, cx| cx.notify()));
-            self.blame = Some(blame);
-        }
-    }
-
-    fn toggle_git_blame_inline_internal(
-        &mut self,
-        user_triggered: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.git_blame_inline_enabled {
-            self.git_blame_inline_enabled = false;
-            self.show_git_blame_inline = false;
-            self.show_git_blame_inline_delay_task.take();
-        } else {
-            self.git_blame_inline_enabled = true;
-            self.start_git_blame_inline(user_triggered, window, cx);
-        }
-
-        cx.notify();
-    }
-
-    fn start_git_blame_inline(
-        &mut self,
-        user_triggered: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.start_git_blame(user_triggered, window, cx);
-
-        if ProjectSettings::get_global(cx)
-            .git
-            .inline_blame_delay()
-            .is_some()
-        {
-            self.start_inline_blame_timer(window, cx);
-        } else {
-            self.show_git_blame_inline = true
-        }
-    }
-
-    pub fn blame(&self) -> Option<&Entity<GitBlame>> {
-        self.blame.as_ref()
-    }
-
-    pub fn show_git_blame_gutter(&self) -> bool {
-        self.show_git_blame_gutter
-    }
-
-    pub fn render_git_blame_gutter(&self, cx: &App) -> bool {
-        !self.mode().is_minimap() && self.show_git_blame_gutter && self.has_blame_entries(cx)
-    }
-
-    pub fn render_git_blame_inline(&self, window: &Window, cx: &App) -> bool {
-        self.show_git_blame_inline
-            && (self.focus_handle.is_focused(window) || self.inline_blame_popover.is_some())
-            && !self.newest_selection_head_on_empty_line(cx)
-            && self.has_blame_entries(cx)
-    }
-
-    fn has_blame_entries(&self, cx: &App) -> bool {
-        self.blame()
-            .is_some_and(|blame| blame.read(cx).has_generated_entries())
-    }
-
-    fn newest_selection_head_on_empty_line(&self, cx: &App) -> bool {
-        let cursor_anchor = self.selections.newest_anchor().head();
-
-        let snapshot = self.buffer.read(cx).snapshot(cx);
-        let buffer_row = MultiBufferRow(cursor_anchor.to_point(&snapshot).row);
-
-        snapshot.line_len(buffer_row) == 0
-    }
-
-    fn get_permalink_to_line(&self, cx: &mut Context<Self>) -> Task<Result<url::Url>> {
-        let buffer_and_selection = maybe!({
-            let selection = self.selections.newest::<Point>(&self.display_snapshot(cx));
-            let selection_range = selection.range();
-
-            let multi_buffer = self.buffer().read(cx);
-            let multi_buffer_snapshot = multi_buffer.snapshot(cx);
-            let buffer_ranges = multi_buffer_snapshot.range_to_buffer_ranges(selection_range);
-
-            let (buffer, range, _) = if selection.reversed {
-                buffer_ranges.first()
-            } else {
-                buffer_ranges.last()
-            }?;
-
-            let start_row_in_buffer = text::ToPoint::to_point(&range.start, buffer).row;
-            let end_row_in_buffer = text::ToPoint::to_point(&range.end, buffer).row;
-
-            let Some(buffer_diff) = multi_buffer.diff_for(buffer.remote_id()) else {
-                let selection = start_row_in_buffer..end_row_in_buffer;
-
-                return Some((multi_buffer.buffer(buffer.remote_id()).unwrap(), selection));
-            };
-
-            let buffer_diff_snapshot = buffer_diff.read(cx).snapshot(cx);
-
-            Some((
-                multi_buffer.buffer(buffer.remote_id()).unwrap(),
-                buffer_diff_snapshot.row_to_base_text_row(start_row_in_buffer, buffer)
-                    ..buffer_diff_snapshot.row_to_base_text_row(end_row_in_buffer, buffer),
-            ))
-        });
-
-        let Some((buffer, selection)) = buffer_and_selection else {
-            return Task::ready(Err(anyhow!("failed to determine buffer and selection")));
-        };
-
-        let Some(project) = self.project() else {
-            return Task::ready(Err(anyhow!("editor does not have project")));
-        };
-
-        project.update(cx, |project, cx| {
-            project.get_permalink_to_line(&buffer, selection, cx)
-        })
-    }
-
-    pub fn copy_permalink_to_line(
-        &mut self,
-        _: &CopyPermalinkToLine,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let permalink_task = self.get_permalink_to_line(cx);
-        let workspace = self.workspace();
-
-        cx.spawn_in(window, async move |_, cx| match permalink_task.await {
-            Ok(permalink) => {
-                cx.update(|_, cx| {
-                    cx.write_to_clipboard(ClipboardItem::new_string(permalink.to_string()));
-                })
-                .ok();
-            }
-            Err(err) => {
-                let message = format!("Failed to copy permalink: {err}");
-
-                anyhow::Result::<()>::Err(err).log_err();
-
-                if let Some(workspace) = workspace {
-                    workspace
-                        .update_in(cx, |workspace, _, cx| {
-                            struct CopyPermalinkToLine;
-
-                            workspace.show_toast(
-                                Toast::new(
-                                    NotificationId::unique::<CopyPermalinkToLine>(),
-                                    message,
-                                ),
-                                cx,
-                            )
-                        })
-                        .ok();
-                }
-            }
-        })
-        .detach();
-    }
-
-    pub fn copy_file_location(
-        &mut self,
-        _: &CopyFileLocation,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let selection = self
-            .selections
-            .newest::<Point>(&self.display_snapshot(cx))
-            .start
-            .row
-            + 1;
-        if let Some(file_location) = self.active_excerpt(cx).and_then(|(_, buffer, _)| {
-            let project = self.project()?.read(cx);
-            let file = buffer.read(cx).file()?;
-            let path = file.path().display(project.path_style(cx));
-
-            Some(format!("{path}:{selection}"))
-        }) {
-            cx.write_to_clipboard(ClipboardItem::new_string(file_location));
-        }
-    }
-
-    pub fn open_permalink_to_line(
-        &mut self,
-        _: &OpenPermalinkToLine,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let permalink_task = self.get_permalink_to_line(cx);
-        let workspace = self.workspace();
-
-        cx.spawn_in(window, async move |_, cx| match permalink_task.await {
-            Ok(permalink) => {
-                cx.update(|_, cx| {
-                    cx.open_url(permalink.as_ref());
-                })
-                .ok();
-            }
-            Err(err) => {
-                let message = format!("Failed to open permalink: {err}");
-
-                anyhow::Result::<()>::Err(err).log_err();
-
-                if let Some(workspace) = workspace {
-                    workspace
-                        .update(cx, |workspace, cx| {
-                            struct OpenPermalinkToLine;
-
-                            workspace.show_toast(
-                                Toast::new(
-                                    NotificationId::unique::<OpenPermalinkToLine>(),
-                                    message,
-                                ),
-                                cx,
-                            )
-                        })
-                        .ok();
-                }
-            }
-        })
-        .detach();
-    }
-
-    pub fn insert_uuid_v4(
-        &mut self,
-        _: &InsertUuidV4,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.insert_uuid(UuidVersion::V4, window, cx);
-    }
-
-    pub fn insert_uuid_v7(
-        &mut self,
-        _: &InsertUuidV7,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.insert_uuid(UuidVersion::V7, window, cx);
-    }
-
-    fn insert_uuid(&mut self, version: UuidVersion, window: &mut Window, cx: &mut Context<Self>) {
-        self.hide_mouse_cursor(HideMouseCursorOrigin::TypingAction, cx);
-        self.transact(window, cx, |this, window, cx| {
-            let edits = this
-                .selections
-                .all::<Point>(&this.display_snapshot(cx))
-                .into_iter()
-                .map(|selection| {
-                    let uuid = match version {
-                        UuidVersion::V4 => uuid::Uuid::new_v4(),
-                        UuidVersion::V7 => uuid::Uuid::now_v7(),
-                    };
-
-                    (selection.range(), uuid.to_string())
-                });
-            this.edit(edits, cx);
-            this.refresh_edit_prediction(true, false, window, cx);
-        });
-    }
-
-    pub fn open_selections_in_multibuffer(
-        &mut self,
-        _: &OpenSelectionsInMultibuffer,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let multibuffer = self.buffer.read(cx);
-
-        let Some(buffer) = multibuffer.as_singleton() else {
-            return;
-        };
-
-        let Some(workspace) = self.workspace() else {
-            return;
-        };
-
-        let title = multibuffer.title(cx).to_string();
-
-        let locations = self
-            .selections
-            .all_anchors(&self.display_snapshot(cx))
-            .iter()
-            .map(|selection| {
-                (
-                    buffer.clone(),
-                    (selection.start.text_anchor..selection.end.text_anchor)
-                        .to_point(buffer.read(cx)),
-                )
-            })
-            .into_group_map();
-
-        cx.spawn_in(window, async move |_, cx| {
-            workspace.update_in(cx, |workspace, window, cx| {
-                Self::open_locations_in_multibuffer(
-                    workspace,
-                    locations,
-                    format!("Selections for '{title}'"),
-                    false,
-                    false,
-                    MultibufferSelectionMode::All,
-                    window,
-                    cx,
-                );
-            })
-        })
-        .detach();
-    }
-
-    /// Adds a row highlight for the given range. If a row has multiple highlights, the
-    /// last highlight added will be used.
-    ///
-    /// If the range ends at the beginning of a line, then that line will not be highlighted.
-    pub fn highlight_rows<T: 'static>(
-        &mut self,
-        range: Range<Anchor>,
-        color: Hsla,
-        options: RowHighlightOptions,
-        cx: &mut Context<Self>,
-    ) {
-        let snapshot = self.buffer().read(cx).snapshot(cx);
-        let row_highlights = self.highlighted_rows.entry(TypeId::of::<T>()).or_default();
-        let ix = row_highlights.binary_search_by(|highlight| {
-            Ordering::Equal
-                .then_with(|| highlight.range.start.cmp(&range.start, &snapshot))
-                .then_with(|| highlight.range.end.cmp(&range.end, &snapshot))
-        });
-
-        if let Err(mut ix) = ix {
-            let index = post_inc(&mut self.highlight_order);
-
-            // If this range intersects with the preceding highlight, then merge it with
-            // the preceding highlight. Otherwise insert a new highlight.
-            let mut merged = false;
-            if ix > 0 {
-                let prev_highlight = &mut row_highlights[ix - 1];
-                if prev_highlight
-                    .range
-                    .end
-                    .cmp(&range.start, &snapshot)
-                    .is_ge()
-                {
-                    ix -= 1;
-                    if prev_highlight.range.end.cmp(&range.end, &snapshot).is_lt() {
-                        prev_highlight.range.end = range.end;
-                    }
-                    merged = true;
-                    prev_highlight.index = index;
-                    prev_highlight.color = color;
-                    prev_highlight.options = options;
-                }
-            }
-
-            if !merged {
-                row_highlights.insert(
-                    ix,
-                    RowHighlight {
-                        range,
-                        index,
-                        color,
-                        options,
-                        type_id: TypeId::of::<T>(),
-                    },
-                );
-            }
-
-            // If any of the following highlights intersect with this one, merge them.
-            while let Some(next_highlight) = row_highlights.get(ix + 1) {
-                let highlight = &row_highlights[ix];
-                if next_highlight
-                    .range
-                    .start
-                    .cmp(&highlight.range.end, &snapshot)
-                    .is_le()
-                {
-                    if next_highlight
-                        .range
-                        .end
-                        .cmp(&highlight.range.end, &snapshot)
-                        .is_gt()
-                    {
-                        row_highlights[ix].range.end = next_highlight.range.end;
-                    }
-                    row_highlights.remove(ix + 1);
-                } else {
-                    break;
-                }
-            }
-        }
-    }
-
-    /// Remove any highlighted row ranges of the given type that intersect the
-    /// given ranges.
-    pub fn remove_highlighted_rows<T: 'static>(
-        &mut self,
-        ranges_to_remove: Vec<Range<Anchor>>,
-        cx: &mut Context<Self>,
-    ) {
-        let snapshot = self.buffer().read(cx).snapshot(cx);
-        let row_highlights = self.highlighted_rows.entry(TypeId::of::<T>()).or_default();
-        let mut ranges_to_remove = ranges_to_remove.iter().peekable();
-        row_highlights.retain(|highlight| {
-            while let Some(range_to_remove) = ranges_to_remove.peek() {
-                match range_to_remove.end.cmp(&highlight.range.start, &snapshot) {
-                    Ordering::Less | Ordering::Equal => {
-                        ranges_to_remove.next();
-                    }
-                    Ordering::Greater => {
-                        match range_to_remove.start.cmp(&highlight.range.end, &snapshot) {
-                            Ordering::Less | Ordering::Equal => {
-                                return false;
-                            }
-                            Ordering::Greater => break,
-                        }
-                    }
-                }
-            }
-
-            true
-        })
-    }
-
-    /// Clear all anchor ranges for a certain highlight context type, so no corresponding rows will be highlighted.
-    pub fn clear_row_highlights<T: 'static>(&mut self) {
-        self.highlighted_rows.remove(&TypeId::of::<T>());
-    }
-
-    /// For a highlight given context type, gets all anchor ranges that will be used for row highlighting.
-    pub fn highlighted_rows<T: 'static>(&self) -> impl '_ + Iterator<Item = (Range<Anchor>, Hsla)> {
-        self.highlighted_rows
-            .get(&TypeId::of::<T>())
-            .map_or(&[] as &[_], |vec| vec.as_slice())
-            .iter()
-            .map(|highlight| (highlight.range.clone(), highlight.color))
-    }
-
-    /// Merges all anchor ranges for all context types ever set, picking the last highlight added in case of a row conflict.
-    /// Returns a map of display rows that are highlighted and their corresponding highlight color.
-    /// Allows to ignore certain kinds of highlights.
-    pub fn highlighted_display_rows(
-        &self,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> BTreeMap<DisplayRow, LineHighlight> {
-        let snapshot = self.snapshot(window, cx);
-        let mut used_highlight_orders = HashMap::default();
-        self.highlighted_rows
-            .iter()
-            .flat_map(|(_, highlighted_rows)| highlighted_rows.iter())
-            .fold(
-                BTreeMap::<DisplayRow, LineHighlight>::new(),
-                |mut unique_rows, highlight| {
-                    let start = highlight.range.start.to_display_point(&snapshot);
-                    let end = highlight.range.end.to_display_point(&snapshot);
-                    let start_row = start.row().0;
-                    let end_row = if !highlight.range.end.text_anchor.is_max() && end.column() == 0
-                    {
-                        end.row().0.saturating_sub(1)
-                    } else {
-                        end.row().0
-                    };
-                    for row in start_row..=end_row {
-                        let used_index =
-                            used_highlight_orders.entry(row).or_insert(highlight.index);
-                        if highlight.index >= *used_index {
-                            *used_index = highlight.index;
-                            unique_rows.insert(
-                                DisplayRow(row),
-                                LineHighlight {
-                                    include_gutter: highlight.options.include_gutter,
-                                    border: None,
-                                    background: highlight.color.into(),
-                                    type_id: Some(highlight.type_id),
-                                },
-                            );
-                        }
-                    }
-                    unique_rows
-                },
-            )
-    }
-
-    pub fn highlighted_display_row_for_autoscroll(
-        &self,
-        snapshot: &DisplaySnapshot,
-    ) -> Option<DisplayRow> {
-        self.highlighted_rows
-            .values()
-            .flat_map(|highlighted_rows| highlighted_rows.iter())
-            .filter_map(|highlight| {
-                if highlight.options.autoscroll {
-                    Some(highlight.range.start.to_display_point(snapshot).row())
-                } else {
-                    None
-                }
-            })
-            .min()
-    }
-
-    pub fn set_search_within_ranges(&mut self, ranges: &[Range<Anchor>], cx: &mut Context<Self>) {
-        self.highlight_background::<SearchWithinRange>(
-            ranges,
-            |_, colors| colors.colors().editor_document_highlight_read_background,
-            cx,
-        )
-    }
-
-    pub fn set_breadcrumb_header(&mut self, new_header: String) {
-        self.breadcrumb_header = Some(new_header);
-    }
-
-    pub fn clear_search_within_ranges(&mut self, cx: &mut Context<Self>) {
-        self.clear_background_highlights::<SearchWithinRange>(cx);
-    }
-
-    pub fn highlight_background<T: 'static>(
-        &mut self,
-        ranges: &[Range<Anchor>],
-        color_fetcher: impl Fn(&usize, &Theme) -> Hsla + Send + Sync + 'static,
-        cx: &mut Context<Self>,
-    ) {
-        self.background_highlights.insert(
-            HighlightKey::Type(TypeId::of::<T>()),
-            (Arc::new(color_fetcher), Arc::from(ranges)),
-        );
-        self.scrollbar_marker_state.dirty = true;
-        cx.notify();
-    }
-
-    pub fn highlight_background_key<T: 'static>(
-        &mut self,
-        key: usize,
-        ranges: &[Range<Anchor>],
-        color_fetcher: impl Fn(&usize, &Theme) -> Hsla + Send + Sync + 'static,
-        cx: &mut Context<Self>,
-    ) {
-        self.background_highlights.insert(
-            HighlightKey::TypePlus(TypeId::of::<T>(), key),
-            (Arc::new(color_fetcher), Arc::from(ranges)),
-        );
-        self.scrollbar_marker_state.dirty = true;
-        cx.notify();
-    }
-
-    pub fn clear_background_highlights<T: 'static>(
-        &mut self,
-        cx: &mut Context<Self>,
-    ) -> Option<BackgroundHighlight> {
-        let text_highlights = self
-            .background_highlights
-            .remove(&HighlightKey::Type(TypeId::of::<T>()))?;
-        if !text_highlights.1.is_empty() {
-            self.scrollbar_marker_state.dirty = true;
-            cx.notify();
-        }
-        Some(text_highlights)
-    }
-
-    pub fn highlight_gutter<T: 'static>(
-        &mut self,
-        ranges: impl Into<Vec<Range<Anchor>>>,
-        color_fetcher: fn(&App) -> Hsla,
-        cx: &mut Context<Self>,
-    ) {
-        self.gutter_highlights
-            .insert(TypeId::of::<T>(), (color_fetcher, ranges.into()));
-        cx.notify();
-    }
-
-    pub fn clear_gutter_highlights<T: 'static>(
-        &mut self,
-        cx: &mut Context<Self>,
-    ) -> Option<GutterHighlight> {
-        cx.notify();
-        self.gutter_highlights.remove(&TypeId::of::<T>())
-    }
-
-    pub fn insert_gutter_highlight<T: 'static>(
-        &mut self,
-        range: Range<Anchor>,
-        color_fetcher: fn(&App) -> Hsla,
-        cx: &mut Context<Self>,
-    ) {
-        let snapshot = self.buffer().read(cx).snapshot(cx);
-        let mut highlights = self
-            .gutter_highlights
-            .remove(&TypeId::of::<T>())
-            .map(|(_, highlights)| highlights)
-            .unwrap_or_default();
-        let ix = highlights.binary_search_by(|highlight| {
-            Ordering::Equal
-                .then_with(|| highlight.start.cmp(&range.start, &snapshot))
-                .then_with(|| highlight.end.cmp(&range.end, &snapshot))
-        });
-        if let Err(ix) = ix {
-            highlights.insert(ix, range);
-        }
-        self.gutter_highlights
-            .insert(TypeId::of::<T>(), (color_fetcher, highlights));
-    }
-
-    pub fn remove_gutter_highlights<T: 'static>(
-        &mut self,
-        ranges_to_remove: Vec<Range<Anchor>>,
-        cx: &mut Context<Self>,
-    ) {
-        let snapshot = self.buffer().read(cx).snapshot(cx);
-        let Some((color_fetcher, mut gutter_highlights)) =
-            self.gutter_highlights.remove(&TypeId::of::<T>())
-        else {
-            return;
-        };
-        let mut ranges_to_remove = ranges_to_remove.iter().peekable();
-        gutter_highlights.retain(|highlight| {
-            while let Some(range_to_remove) = ranges_to_remove.peek() {
-                match range_to_remove.end.cmp(&highlight.start, &snapshot) {
-                    Ordering::Less | Ordering::Equal => {
-                        ranges_to_remove.next();
-                    }
-                    Ordering::Greater => {
-                        match range_to_remove.start.cmp(&highlight.end, &snapshot) {
-                            Ordering::Less | Ordering::Equal => {
-                                return false;
-                            }
-                            Ordering::Greater => break,
-                        }
-                    }
-                }
-            }
-
-            true
-        });
-        self.gutter_highlights
-            .insert(TypeId::of::<T>(), (color_fetcher, gutter_highlights));
-    }
-
-    #[cfg(feature = "test-support")]
-    pub fn all_text_highlights(
-        &self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Vec<(HighlightStyle, Vec<Range<DisplayPoint>>)> {
-        let snapshot = self.snapshot(window, cx);
-        self.display_map.update(cx, |display_map, _| {
-            display_map
-                .all_text_highlights()
-                .map(|highlight| {
-                    let (style, ranges) = highlight.as_ref();
-                    (
-                        *style,
-                        ranges
-                            .iter()
-                            .map(|range| range.clone().to_display_points(&snapshot))
-                            .collect(),
-                    )
-                })
-                .collect()
-        })
-    }
-
-    #[cfg(feature = "test-support")]
-    pub fn all_text_background_highlights(
-        &self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Vec<(Range<DisplayPoint>, Hsla)> {
-        let snapshot = self.snapshot(window, cx);
-        let buffer = &snapshot.buffer_snapshot();
-        let start = buffer.anchor_before(MultiBufferOffset(0));
-        let end = buffer.anchor_after(buffer.len());
-        self.sorted_background_highlights_in_range(start..end, &snapshot, cx.theme())
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn sorted_background_highlights_in_range(
-        &self,
-        search_range: Range<Anchor>,
-        display_snapshot: &DisplaySnapshot,
-        theme: &Theme,
-    ) -> Vec<(Range<DisplayPoint>, Hsla)> {
-        let mut res = self.background_highlights_in_range(search_range, display_snapshot, theme);
-        res.sort_by(|a, b| {
-            a.0.start
-                .cmp(&b.0.start)
-                .then_with(|| a.0.end.cmp(&b.0.end))
-                .then_with(|| a.1.cmp(&b.1))
-        });
-        res
-    }
-
-    #[cfg(feature = "test-support")]
-    pub fn search_background_highlights(&mut self, cx: &mut Context<Self>) -> Vec<Range<Point>> {
-        let snapshot = self.buffer().read(cx).snapshot(cx);
-
-        let highlights = self
-            .background_highlights
-            .get(&HighlightKey::Type(TypeId::of::<
-                items::BufferSearchHighlights,
-            >()));
-
-        if let Some((_color, ranges)) = highlights {
-            ranges
-                .iter()
-                .map(|range| range.start.to_point(&snapshot)..range.end.to_point(&snapshot))
-                .collect_vec()
-        } else {
-            vec![]
-        }
-    }
-
-    fn document_highlights_for_position<'a>(
-        &'a self,
-        position: Anchor,
-        buffer: &'a MultiBufferSnapshot,
-    ) -> impl 'a + Iterator<Item = &'a Range<Anchor>> {
-        let read_highlights = self
-            .background_highlights
-            .get(&HighlightKey::Type(TypeId::of::<DocumentHighlightRead>()))
-            .map(|h| &h.1);
-        let write_highlights = self
-            .background_highlights
-            .get(&HighlightKey::Type(TypeId::of::<DocumentHighlightWrite>()))
-            .map(|h| &h.1);
-        let left_position = position.bias_left(buffer);
-        let right_position = position.bias_right(buffer);
-        read_highlights
-            .into_iter()
-            .chain(write_highlights)
-            .flat_map(move |ranges| {
-                let start_ix = match ranges.binary_search_by(|probe| {
-                    let cmp = probe.end.cmp(&left_position, buffer);
-                    if cmp.is_ge() {
-                        Ordering::Greater
-                    } else {
-                        Ordering::Less
-                    }
-                }) {
-                    Ok(i) | Err(i) => i,
-                };
-
-                ranges[start_ix..]
-                    .iter()
-                    .take_while(move |range| range.start.cmp(&right_position, buffer).is_le())
-            })
-    }
-
-    pub fn has_background_highlights<T: 'static>(&self) -> bool {
-        self.background_highlights
-            .get(&HighlightKey::Type(TypeId::of::<T>()))
-            .is_some_and(|(_, highlights)| !highlights.is_empty())
-    }
-
-    /// Returns all background highlights for a given range.
-    ///
-    /// The order of highlights is not deterministic, do sort the ranges if needed for the logic.
-    pub fn background_highlights_in_range(
-        &self,
-        search_range: Range<Anchor>,
-        display_snapshot: &DisplaySnapshot,
-        theme: &Theme,
-    ) -> Vec<(Range<DisplayPoint>, Hsla)> {
-        let mut results = Vec::new();
-        for (color_fetcher, ranges) in self.background_highlights.values() {
-            let start_ix = match ranges.binary_search_by(|probe| {
-                let cmp = probe
-                    .end
-                    .cmp(&search_range.start, &display_snapshot.buffer_snapshot());
-                if cmp.is_gt() {
-                    Ordering::Greater
-                } else {
-                    Ordering::Less
-                }
-            }) {
-                Ok(i) | Err(i) => i,
-            };
-            for (index, range) in ranges[start_ix..].iter().enumerate() {
-                if range
-                    .start
-                    .cmp(&search_range.end, &display_snapshot.buffer_snapshot())
-                    .is_ge()
-                {
-                    break;
-                }
-
-                let color = color_fetcher(&(start_ix + index), theme);
-                let start = range.start.to_display_point(display_snapshot);
-                let end = range.end.to_display_point(display_snapshot);
-                results.push((start..end, color))
-            }
-        }
-        results
-    }
-
-    pub fn gutter_highlights_in_range(
-        &self,
-        search_range: Range<Anchor>,
-        display_snapshot: &DisplaySnapshot,
-        cx: &App,
-    ) -> Vec<(Range<DisplayPoint>, Hsla)> {
-        let mut results = Vec::new();
-        for (color_fetcher, ranges) in self.gutter_highlights.values() {
-            let color = color_fetcher(cx);
-            let start_ix = match ranges.binary_search_by(|probe| {
-                let cmp = probe
-                    .end
-                    .cmp(&search_range.start, &display_snapshot.buffer_snapshot());
-                if cmp.is_gt() {
-                    Ordering::Greater
-                } else {
-                    Ordering::Less
-                }
-            }) {
-                Ok(i) | Err(i) => i,
-            };
-            for range in &ranges[start_ix..] {
-                if range
-                    .start
-                    .cmp(&search_range.end, &display_snapshot.buffer_snapshot())
-                    .is_ge()
-                {
-                    break;
-                }
-
-                let start = range.start.to_display_point(display_snapshot);
-                let end = range.end.to_display_point(display_snapshot);
-                results.push((start..end, color))
-            }
-        }
-        results
-    }
-
-    /// Get the text ranges corresponding to the redaction query
-    pub fn redacted_ranges(
-        &self,
-        search_range: Range<Anchor>,
-        display_snapshot: &DisplaySnapshot,
-        cx: &App,
-    ) -> Vec<Range<DisplayPoint>> {
-        display_snapshot
-            .buffer_snapshot()
-            .redacted_ranges(search_range, |file| {
-                if let Some(file) = file {
-                    file.is_private()
-                        && EditorSettings::get(
-                            Some(SettingsLocation {
-                                worktree_id: file.worktree_id(cx),
-                                path: file.path().as_ref(),
-                            }),
-                            cx,
-                        )
-                        .redact_private_values
-                } else {
-                    false
-                }
-            })
-            .map(|range| {
-                range.start.to_display_point(display_snapshot)
-                    ..range.end.to_display_point(display_snapshot)
-            })
-            .collect()
-    }
-
-    pub fn highlight_text_key<T: 'static>(
-        &mut self,
-        key: usize,
-        ranges: Vec<Range<Anchor>>,
-        style: HighlightStyle,
-        merge: bool,
-        cx: &mut Context<Self>,
-    ) {
-        self.display_map.update(cx, |map, cx| {
-            map.highlight_text(
-                HighlightKey::TypePlus(TypeId::of::<T>(), key),
-                ranges,
-                style,
-                merge,
-                cx,
-            );
-        });
-        cx.notify();
-    }
-
-    pub fn highlight_text<T: 'static>(
-        &mut self,
-        ranges: Vec<Range<Anchor>>,
-        style: HighlightStyle,
-        cx: &mut Context<Self>,
-    ) {
-        self.display_map.update(cx, |map, cx| {
-            map.highlight_text(
-                HighlightKey::Type(TypeId::of::<T>()),
-                ranges,
-                style,
-                false,
-                cx,
-            )
-        });
-        cx.notify();
-    }
-
-    pub fn text_highlights<'a, T: 'static>(
-        &'a self,
-        cx: &'a App,
-    ) -> Option<(HighlightStyle, &'a [Range<Anchor>])> {
-        self.display_map.read(cx).text_highlights(TypeId::of::<T>())
-    }
-
-    pub fn clear_highlights<T: 'static>(&mut self, cx: &mut Context<Self>) {
-        let cleared = self
-            .display_map
-            .update(cx, |map, _| map.clear_highlights(TypeId::of::<T>()));
-        if cleared {
-            cx.notify();
-        }
-    }
-
-    pub fn show_local_cursors(&self, window: &mut Window, cx: &mut App) -> bool {
-        (self.read_only(cx) || self.blink_manager.read(cx).visible())
-            && self.focus_handle.is_focused(window)
-    }
-
-    pub fn set_show_cursor_when_unfocused(&mut self, is_enabled: bool, cx: &mut Context<Self>) {
-        self.show_cursor_when_unfocused = is_enabled;
-        cx.notify();
-    }
-
-    fn on_buffer_changed(&mut self, _: Entity<MultiBuffer>, cx: &mut Context<Self>) {
-        cx.notify();
-    }
-
-    fn on_debug_session_event(
-        &mut self,
-        _session: Entity<Session>,
-        event: &SessionEvent,
-        cx: &mut Context<Self>,
-    ) {
-        if let SessionEvent::InvalidateInlineValue = event {
-            self.refresh_inline_values(cx);
-        }
-    }
-
-    pub fn refresh_inline_values(&mut self, cx: &mut Context<Self>) {
-        let Some(project) = self.project.clone() else {
-            return;
-        };
-
-        if !self.inline_value_cache.enabled {
-            let inlays = std::mem::take(&mut self.inline_value_cache.inlays);
-            self.splice_inlays(&inlays, Vec::new(), cx);
-            return;
-        }
-
-        let current_execution_position = self
-            .highlighted_rows
-            .get(&TypeId::of::<ActiveDebugLine>())
-            .and_then(|lines| lines.last().map(|line| line.range.end));
-
-        self.inline_value_cache.refresh_task = cx.spawn(async move |editor, cx| {
-            let inline_values = editor
-                .update(cx, |editor, cx| {
-                    let Some(current_execution_position) = current_execution_position else {
-                        return Some(Task::ready(Ok(Vec::new())));
-                    };
-
-                    let buffer = editor.buffer.read_with(cx, |buffer, cx| {
-                        let snapshot = buffer.snapshot(cx);
-
-                        let excerpt = snapshot.excerpt_containing(
-                            current_execution_position..current_execution_position,
-                        )?;
-
-                        editor.buffer.read(cx).buffer(excerpt.buffer_id())
-                    })?;
-
-                    let range =
-                        buffer.read(cx).anchor_before(0)..current_execution_position.text_anchor;
-
-                    project.inline_values(buffer, range, cx)
-                })
-                .ok()
-                .flatten()?
-                .await
-                .context("refreshing debugger inlays")
-                .log_err()?;
-
-            let mut buffer_inline_values: HashMap<BufferId, Vec<InlayHint>> = HashMap::default();
-
-            for (buffer_id, inline_value) in inline_values
-                .into_iter()
-                .filter_map(|hint| Some((hint.position.buffer_id?, hint)))
-            {
-                buffer_inline_values
-                    .entry(buffer_id)
-                    .or_default()
-                    .push(inline_value);
-            }
-
-            editor
-                .update(cx, |editor, cx| {
-                    let snapshot = editor.buffer.read(cx).snapshot(cx);
-                    let mut new_inlays = Vec::default();
-
-                    for (excerpt_id, buffer_snapshot, _) in snapshot.excerpts() {
-                        let buffer_id = buffer_snapshot.remote_id();
-                        buffer_inline_values
-                            .get(&buffer_id)
-                            .into_iter()
-                            .flatten()
-                            .for_each(|hint| {
-                                let inlay = Inlay::debugger(
-                                    post_inc(&mut editor.next_inlay_id),
-                                    Anchor::in_buffer(excerpt_id, hint.position),
-                                    hint.text(),
-                                );
-                                if !inlay.text().chars().contains(&'\n') {
-                                    new_inlays.push(inlay);
-                                }
-                            });
-                    }
-
-                    let mut inlay_ids = new_inlays.iter().map(|inlay| inlay.id).collect();
-                    std::mem::swap(&mut editor.inline_value_cache.inlays, &mut inlay_ids);
-
-                    editor.splice_inlays(&inlay_ids, new_inlays, cx);
-                })
-                .ok()?;
-            Some(())
-        });
-    }
-
-    fn on_buffer_event(
-        &mut self,
-        multibuffer: &Entity<MultiBuffer>,
-        event: &multi_buffer::Event,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            multi_buffer::Event::Edited { edited_buffer } => {
-                self.scrollbar_marker_state.dirty = true;
-                self.active_indent_guides_state.dirty = true;
-                self.refresh_active_diagnostics(cx);
-                self.refresh_code_actions(window, cx);
-                self.refresh_single_line_folds(window, cx);
-                self.refresh_matching_bracket_highlights(window, cx);
-                if self.has_active_edit_prediction() {
-                    self.update_visible_edit_prediction(window, cx);
-                }
-
-                if let Some(buffer) = edited_buffer {
-                    if buffer.read(cx).file().is_none() {
-                        cx.emit(EditorEvent::TitleChanged);
-                    }
-
-                    if self.project.is_some() {
-                        let buffer_id = buffer.read(cx).remote_id();
-                        self.register_buffer(buffer_id, cx);
-                        self.update_lsp_data(Some(buffer_id), window, cx);
-                        self.refresh_inlay_hints(
-                            InlayHintRefreshReason::BufferEdited(buffer_id),
-                            cx,
-                        );
-                    }
-                }
-
-                cx.emit(EditorEvent::BufferEdited);
-                cx.emit(SearchEvent::MatchesInvalidated);
-
-                let Some(project) = &self.project else { return };
-                let (telemetry, is_via_ssh) = {
-                    let project = project.read(cx);
-                    let telemetry = project.client().telemetry().clone();
-                    let is_via_ssh = project.is_via_remote_server();
-                    (telemetry, is_via_ssh)
-                };
-                telemetry.log_edit_event("editor", is_via_ssh);
-            }
-            multi_buffer::Event::ExcerptsAdded {
-                buffer,
-                predecessor,
-                excerpts,
-            } => {
-                self.tasks_update_task = Some(self.refresh_runnables(window, cx));
-                let buffer_id = buffer.read(cx).remote_id();
-                if self.buffer.read(cx).diff_for(buffer_id).is_none()
-                    && let Some(project) = &self.project
-                {
-                    update_uncommitted_diff_for_buffer(
-                        cx.entity(),
-                        project,
-                        [buffer.clone()],
-                        self.buffer.clone(),
-                        cx,
-                    )
-                    .detach();
-                }
-                self.update_lsp_data(Some(buffer_id), window, cx);
-                self.refresh_inlay_hints(InlayHintRefreshReason::NewLinesShown, cx);
-                self.colorize_brackets(false, cx);
-                cx.emit(EditorEvent::ExcerptsAdded {
-                    buffer: buffer.clone(),
-                    predecessor: *predecessor,
-                    excerpts: excerpts.clone(),
-                });
-            }
-            multi_buffer::Event::ExcerptsRemoved {
-                ids,
-                removed_buffer_ids,
-            } => {
-                if let Some(inlay_hints) = &mut self.inlay_hints {
-                    inlay_hints.remove_inlay_chunk_data(removed_buffer_ids);
-                }
-                self.refresh_inlay_hints(InlayHintRefreshReason::ExcerptsRemoved(ids.clone()), cx);
-                for buffer_id in removed_buffer_ids {
-                    self.registered_buffers.remove(buffer_id);
-                }
-                jsx_tag_auto_close::refresh_enabled_in_any_buffer(self, multibuffer, cx);
-                cx.emit(EditorEvent::ExcerptsRemoved {
-                    ids: ids.clone(),
-                    removed_buffer_ids: removed_buffer_ids.clone(),
-                });
-            }
-            multi_buffer::Event::ExcerptsEdited {
-                excerpt_ids,
-                buffer_ids,
-            } => {
-                self.display_map.update(cx, |map, cx| {
-                    map.unfold_buffers(buffer_ids.iter().copied(), cx)
-                });
-                cx.emit(EditorEvent::ExcerptsEdited {
-                    ids: excerpt_ids.clone(),
-                });
-            }
-            multi_buffer::Event::ExcerptsExpanded { ids } => {
-                self.refresh_inlay_hints(InlayHintRefreshReason::NewLinesShown, cx);
-                self.refresh_document_highlights(cx);
-                for id in ids {
-                    self.fetched_tree_sitter_chunks.remove(id);
-                }
-                self.colorize_brackets(false, cx);
-                cx.emit(EditorEvent::ExcerptsExpanded { ids: ids.clone() })
-            }
-            multi_buffer::Event::Reparsed(buffer_id) => {
-                self.tasks_update_task = Some(self.refresh_runnables(window, cx));
-                self.refresh_selected_text_highlights(true, window, cx);
-                self.colorize_brackets(true, cx);
-                jsx_tag_auto_close::refresh_enabled_in_any_buffer(self, multibuffer, cx);
-
-                cx.emit(EditorEvent::Reparsed(*buffer_id));
-            }
-            multi_buffer::Event::DiffHunksToggled => {
-                self.tasks_update_task = Some(self.refresh_runnables(window, cx));
-            }
-            multi_buffer::Event::LanguageChanged(buffer_id, is_fresh_language) => {
-                if !is_fresh_language {
-                    self.registered_buffers.remove(&buffer_id);
-                }
-                jsx_tag_auto_close::refresh_enabled_in_any_buffer(self, multibuffer, cx);
-                cx.emit(EditorEvent::Reparsed(*buffer_id));
-                cx.notify();
-            }
-            multi_buffer::Event::DirtyChanged => cx.emit(EditorEvent::DirtyChanged),
-            multi_buffer::Event::Saved => cx.emit(EditorEvent::Saved),
-            multi_buffer::Event::FileHandleChanged
-            | multi_buffer::Event::Reloaded
-            | multi_buffer::Event::BufferDiffChanged => cx.emit(EditorEvent::TitleChanged),
-            multi_buffer::Event::DiagnosticsUpdated => {
-                self.update_diagnostics_state(window, cx);
-            }
-            _ => {}
-        };
-    }
-
-    fn update_diagnostics_state(&mut self, window: &mut Window, cx: &mut Context<'_, Editor>) {
-        if !self.diagnostics_enabled() {
-            return;
-        }
-        self.refresh_active_diagnostics(cx);
-        self.refresh_inline_diagnostics(true, window, cx);
-        self.scrollbar_marker_state.dirty = true;
-        cx.notify();
-    }
-
-    pub fn start_temporary_diff_override(&mut self) {
-        self.load_diff_task.take();
-        self.temporary_diff_override = true;
-    }
-
-    pub fn end_temporary_diff_override(&mut self, cx: &mut Context<Self>) {
-        self.temporary_diff_override = false;
-        self.set_render_diff_hunk_controls(Arc::new(render_diff_hunk_controls), cx);
-        self.buffer.update(cx, |buffer, cx| {
-            buffer.set_all_diff_hunks_collapsed(cx);
-        });
-
-        if let Some(project) = self.project.clone() {
-            self.load_diff_task = Some(
-                update_uncommitted_diff_for_buffer(
-                    cx.entity(),
-                    &project,
-                    self.buffer.read(cx).all_buffers(),
-                    self.buffer.clone(),
-                    cx,
-                )
-                .shared(),
-            );
-        }
-    }
-
-    fn on_display_map_changed(
-        &mut self,
-        _: Entity<DisplayMap>,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        cx.notify();
-    }
-
-    fn fetch_accent_data(&self, cx: &App) -> Option<AccentData> {
-        if !self.mode.is_full() {
-            return None;
-        }
-
-        let theme_settings = theme::ThemeSettings::get_global(cx);
-        let theme = cx.theme();
-        let accent_colors = theme.accents().clone();
-
-        let accent_overrides = theme_settings
-            .theme_overrides
-            .get(theme.name.as_ref())
-            .map(|theme_style| &theme_style.accents)
-            .into_iter()
-            .flatten()
-            .chain(
-                theme_settings
-                    .experimental_theme_overrides
-                    .as_ref()
-                    .map(|overrides| &overrides.accents)
-                    .into_iter()
-                    .flatten(),
-            )
-            .flat_map(|accent| accent.0.clone())
-            .collect();
-
-        Some(AccentData {
-            colors: accent_colors,
-            overrides: accent_overrides,
-        })
-    }
-
-    fn fetch_applicable_language_settings(
-        &self,
-        cx: &App,
-    ) -> HashMap<Option<LanguageName>, LanguageSettings> {
-        if !self.mode.is_full() {
-            return HashMap::default();
-        }
-
-        self.buffer().read(cx).all_buffers().into_iter().fold(
-            HashMap::default(),
-            |mut acc, buffer| {
-                let buffer = buffer.read(cx);
-                let language = buffer.language().map(|language| language.name());
-                if let hash_map::Entry::Vacant(v) = acc.entry(language.clone()) {
-                    let file = buffer.file();
-                    v.insert(language_settings(language, file, cx).into_owned());
-                }
-                acc
-            },
-        )
-    }
-
-    fn settings_changed(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let new_language_settings = self.fetch_applicable_language_settings(cx);
-        let language_settings_changed = new_language_settings != self.applicable_language_settings;
-        self.applicable_language_settings = new_language_settings;
-
-        let new_accents = self.fetch_accent_data(cx);
-        let accents_changed = new_accents != self.accent_data;
-        self.accent_data = new_accents;
-
-        if self.diagnostics_enabled() {
-            let new_severity = EditorSettings::get_global(cx)
-                .diagnostics_max_severity
-                .unwrap_or(DiagnosticSeverity::Hint);
-            self.set_max_diagnostics_severity(new_severity, cx);
-        }
-        self.tasks_update_task = Some(self.refresh_runnables(window, cx));
-        self.update_edit_prediction_settings(cx);
-        self.refresh_edit_prediction(true, false, window, cx);
-        self.refresh_inline_values(cx);
-        self.refresh_inlay_hints(
-            InlayHintRefreshReason::SettingsChange(inlay_hint_settings(
-                self.selections.newest_anchor().head(),
-                &self.buffer.read(cx).snapshot(cx),
-                cx,
-            )),
-            cx,
-        );
-
-        let old_cursor_shape = self.cursor_shape;
-        let old_show_breadcrumbs = self.show_breadcrumbs;
-
-        {
-            let editor_settings = EditorSettings::get_global(cx);
-            self.scroll_manager.vertical_scroll_margin = editor_settings.vertical_scroll_margin;
-            self.show_breadcrumbs = editor_settings.toolbar.breadcrumbs;
-            self.cursor_shape = editor_settings.cursor_shape.unwrap_or_default();
-            self.hide_mouse_mode = editor_settings.hide_mouse.unwrap_or_default();
-        }
-
-        if old_cursor_shape != self.cursor_shape {
-            cx.emit(EditorEvent::CursorShapeChanged);
-        }
-
-        if old_show_breadcrumbs != self.show_breadcrumbs {
-            cx.emit(EditorEvent::BreadcrumbsChanged);
-        }
-
-        let project_settings = ProjectSettings::get_global(cx);
-        self.buffer_serialization = self
-            .should_serialize_buffer()
-            .then(|| BufferSerialization::new(project_settings.session.restore_unsaved_buffers));
-
-        if self.mode.is_full() {
-            let show_inline_diagnostics = project_settings.diagnostics.inline.enabled;
-            let inline_blame_enabled = project_settings.git.inline_blame.enabled;
-            if self.show_inline_diagnostics != show_inline_diagnostics {
-                self.show_inline_diagnostics = show_inline_diagnostics;
-                self.refresh_inline_diagnostics(false, window, cx);
-            }
-
-            if self.git_blame_inline_enabled != inline_blame_enabled {
-                self.toggle_git_blame_inline_internal(false, window, cx);
-            }
-
-            let minimap_settings = EditorSettings::get_global(cx).minimap;
-            if self.minimap_visibility != MinimapVisibility::Disabled {
-                if self.minimap_visibility.settings_visibility()
-                    != minimap_settings.minimap_enabled()
-                {
-                    self.set_minimap_visibility(
-                        MinimapVisibility::for_mode(self.mode(), cx),
-                        window,
-                        cx,
-                    );
-                } else if let Some(minimap_entity) = self.minimap.as_ref() {
-                    minimap_entity.update(cx, |minimap_editor, cx| {
-                        minimap_editor.update_minimap_configuration(minimap_settings, cx)
-                    })
-                }
-            }
-
-            if language_settings_changed || accents_changed {
-                self.colorize_brackets(true, cx);
-            }
-
-            if let Some(inlay_splice) = self.colors.as_mut().and_then(|colors| {
-                colors.render_mode_updated(EditorSettings::get_global(cx).lsp_document_colors)
-            }) {
-                if !inlay_splice.is_empty() {
-                    self.splice_inlays(&inlay_splice.to_remove, inlay_splice.to_insert, cx);
-                }
-                self.refresh_colors_for_visible_range(None, window, cx);
-            }
-        }
-
-        cx.notify();
-    }
-
-    pub fn set_searchable(&mut self, searchable: bool) {
-        self.searchable = searchable;
-    }
-
-    pub fn searchable(&self) -> bool {
-        self.searchable
-    }
-
-    pub fn open_excerpts_in_split(
-        &mut self,
-        _: &OpenExcerptsSplit,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.open_excerpts_common(None, true, window, cx)
-    }
-
-    pub fn open_excerpts(&mut self, _: &OpenExcerpts, window: &mut Window, cx: &mut Context<Self>) {
-        self.open_excerpts_common(None, false, window, cx)
-    }
-
-    fn open_excerpts_common(
-        &mut self,
-        jump_data: Option<JumpData>,
-        split: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(workspace) = self.workspace() else {
-            cx.propagate();
-            return;
-        };
-
-        if self.buffer.read(cx).is_singleton() {
-            cx.propagate();
-            return;
-        }
-
-        let mut new_selections_by_buffer = HashMap::default();
-        match &jump_data {
-            Some(JumpData::MultiBufferPoint {
-                excerpt_id,
-                position,
-                anchor,
-                line_offset_from_top,
-            }) => {
-                let multi_buffer_snapshot = self.buffer.read(cx).snapshot(cx);
-                if let Some(buffer) = multi_buffer_snapshot
-                    .buffer_id_for_excerpt(*excerpt_id)
-                    .and_then(|buffer_id| self.buffer.read(cx).buffer(buffer_id))
-                {
-                    let buffer_snapshot = buffer.read(cx).snapshot();
-                    let jump_to_point = if buffer_snapshot.can_resolve(anchor) {
-                        language::ToPoint::to_point(anchor, &buffer_snapshot)
-                    } else {
-                        buffer_snapshot.clip_point(*position, Bias::Left)
-                    };
-                    let jump_to_offset = buffer_snapshot.point_to_offset(jump_to_point);
-                    new_selections_by_buffer.insert(
-                        buffer,
-                        (
-                            vec![BufferOffset(jump_to_offset)..BufferOffset(jump_to_offset)],
-                            Some(*line_offset_from_top),
-                        ),
-                    );
-                }
-            }
-            Some(JumpData::MultiBufferRow {
-                row,
-                line_offset_from_top,
-            }) => {
-                let point = MultiBufferPoint::new(row.0, 0);
-                if let Some((buffer, buffer_point, _)) =
-                    self.buffer.read(cx).point_to_buffer_point(point, cx)
-                {
-                    let buffer_offset = buffer.read(cx).point_to_offset(buffer_point);
-                    new_selections_by_buffer
-                        .entry(buffer)
-                        .or_insert((Vec::new(), Some(*line_offset_from_top)))
-                        .0
-                        .push(BufferOffset(buffer_offset)..BufferOffset(buffer_offset))
-                }
-            }
-            None => {
-                let selections = self
-                    .selections
-                    .all::<MultiBufferOffset>(&self.display_snapshot(cx));
-                let multi_buffer = self.buffer.read(cx);
-                for selection in selections {
-                    for (snapshot, range, _, anchor) in multi_buffer
-                        .snapshot(cx)
-                        .range_to_buffer_ranges_with_deleted_hunks(selection.range())
-                    {
-                        if let Some(anchor) = anchor {
-                            let Some(buffer_handle) = multi_buffer.buffer_for_anchor(anchor, cx)
-                            else {
-                                continue;
-                            };
-                            let offset = text::ToOffset::to_offset(
-                                &anchor.text_anchor,
-                                &buffer_handle.read(cx).snapshot(),
-                            );
-                            let range = BufferOffset(offset)..BufferOffset(offset);
-                            new_selections_by_buffer
-                                .entry(buffer_handle)
-                                .or_insert((Vec::new(), None))
-                                .0
-                                .push(range)
-                        } else {
-                            let Some(buffer_handle) = multi_buffer.buffer(snapshot.remote_id())
-                            else {
-                                continue;
-                            };
-                            new_selections_by_buffer
-                                .entry(buffer_handle)
-                                .or_insert((Vec::new(), None))
-                                .0
-                                .push(range)
-                        }
-                    }
-                }
-            }
-        }
-
-        new_selections_by_buffer
-            .retain(|buffer, _| Self::can_open_excerpts_in_file(buffer.read(cx).file()));
-
-        if new_selections_by_buffer.is_empty() {
-            return;
-        }
-
-        // We defer the pane interaction because we ourselves are a workspace item
-        // and activating a new item causes the pane to call a method on us reentrantly,
-        // which panics if we're on the stack.
-        window.defer(cx, move |window, cx| {
-            workspace.update(cx, |workspace, cx| {
-                let pane = if split {
-                    workspace.adjacent_pane(window, cx)
-                } else {
-                    workspace.active_pane().clone()
-                };
-
-                for (buffer, (ranges, scroll_offset)) in new_selections_by_buffer {
-                    let buffer_read = buffer.read(cx);
-                    let (has_file, is_project_file) = if let Some(file) = buffer_read.file() {
-                        (true, project::File::from_dyn(Some(file)).is_some())
-                    } else {
-                        (false, false)
-                    };
-
-                    // If project file is none workspace.open_project_item will fail to open the excerpt
-                    // in a pre existing workspace item if one exists, because Buffer entity_id will be None
-                    // so we check if there's a tab match in that case first
-                    let editor = (!has_file || !is_project_file)
-                        .then(|| {
-                            // Handle file-less buffers separately: those are not really the project items, so won't have a project path or entity id,
-                            // so `workspace.open_project_item` will never find them, always opening a new editor.
-                            // Instead, we try to activate the existing editor in the pane first.
-                            let (editor, pane_item_index, pane_item_id) =
-                                pane.read(cx).items().enumerate().find_map(|(i, item)| {
-                                    let editor = item.downcast::<Editor>()?;
-                                    let singleton_buffer =
-                                        editor.read(cx).buffer().read(cx).as_singleton()?;
-                                    if singleton_buffer == buffer {
-                                        Some((editor, i, item.item_id()))
-                                    } else {
-                                        None
-                                    }
-                                })?;
-                            pane.update(cx, |pane, cx| {
-                                pane.activate_item(pane_item_index, true, true, window, cx);
-                                if !PreviewTabsSettings::get_global(cx)
-                                    .enable_preview_from_multibuffer
-                                {
-                                    pane.unpreview_item_if_preview(pane_item_id);
-                                }
-                            });
-                            Some(editor)
-                        })
-                        .flatten()
-                        .unwrap_or_else(|| {
-                            let keep_old_preview = PreviewTabsSettings::get_global(cx)
-                                .enable_keep_preview_on_code_navigation;
-                            let allow_new_preview =
-                                PreviewTabsSettings::get_global(cx).enable_preview_from_multibuffer;
-                            workspace.open_project_item::<Self>(
-                                pane.clone(),
-                                buffer,
-                                true,
-                                true,
-                                keep_old_preview,
-                                allow_new_preview,
-                                window,
-                                cx,
-                            )
-                        });
-
-                    editor.update(cx, |editor, cx| {
-                        if has_file && !is_project_file {
-                            editor.set_read_only(true);
-                        }
-                        let autoscroll = match scroll_offset {
-                            Some(scroll_offset) => Autoscroll::top_relative(scroll_offset as usize),
-                            None => Autoscroll::newest(),
-                        };
-                        let nav_history = editor.nav_history.take();
-                        let multibuffer_snapshot = editor.buffer().read(cx).snapshot(cx);
-                        let Some((&excerpt_id, _, buffer_snapshot)) =
-                            multibuffer_snapshot.as_singleton()
-                        else {
-                            return;
-                        };
-                        editor.change_selections(
-                            SelectionEffects::scroll(autoscroll),
-                            window,
-                            cx,
-                            |s| {
-                                s.select_ranges(ranges.into_iter().map(|range| {
-                                    let range = buffer_snapshot.anchor_before(range.start)
-                                        ..buffer_snapshot.anchor_after(range.end);
-                                    multibuffer_snapshot
-                                        .anchor_range_in_excerpt(excerpt_id, range)
-                                        .unwrap()
-                                }));
-                            },
-                        );
-                        editor.nav_history = nav_history;
-                    });
-                }
-            })
-        });
-    }
-
-    // Allow opening excerpts for buffers that either belong to the current project
-    // or represent synthetic/non-local files (e.g., git blobs). File-less buffers
-    // are also supported so tests and other in-memory views keep working.
-    fn can_open_excerpts_in_file(file: Option<&Arc<dyn language::File>>) -> bool {
-        file.is_none_or(|file| project::File::from_dyn(Some(file)).is_some() || !file.is_local())
-    }
-
-    fn marked_text_ranges(&self, cx: &App) -> Option<Vec<Range<MultiBufferOffsetUtf16>>> {
-        let snapshot = self.buffer.read(cx).read(cx);
-        let (_, ranges) = self.text_highlights::<InputComposition>(cx)?;
-        Some(
-            ranges
-                .iter()
-                .map(move |range| {
-                    range.start.to_offset_utf16(&snapshot)..range.end.to_offset_utf16(&snapshot)
-                })
-                .collect(),
-        )
-    }
-
-    fn selection_replacement_ranges(
-        &self,
-        range: Range<MultiBufferOffsetUtf16>,
-        cx: &mut App,
-    ) -> Vec<Range<MultiBufferOffsetUtf16>> {
-        let selections = self
-            .selections
-            .all::<MultiBufferOffsetUtf16>(&self.display_snapshot(cx));
-        let newest_selection = selections
-            .iter()
-            .max_by_key(|selection| selection.id)
-            .unwrap();
-        let start_delta = range.start.0.0 as isize - newest_selection.start.0.0 as isize;
-        let end_delta = range.end.0.0 as isize - newest_selection.end.0.0 as isize;
-        let snapshot = self.buffer.read(cx).read(cx);
-        selections
-            .into_iter()
-            .map(|mut selection| {
-                selection.start.0.0 =
-                    (selection.start.0.0 as isize).saturating_add(start_delta) as usize;
-                selection.end.0.0 = (selection.end.0.0 as isize).saturating_add(end_delta) as usize;
-                snapshot.clip_offset_utf16(selection.start, Bias::Left)
-                    ..snapshot.clip_offset_utf16(selection.end, Bias::Right)
-            })
-            .collect()
-    }
-
-    fn report_editor_event(
-        &self,
-        reported_event: ReportEditorEvent,
-        file_extension: Option<String>,
-        cx: &App,
-    ) {
-        if cfg!(any(test, feature = "test-support")) {
-            return;
-        }
-
-        let Some(project) = &self.project else { return };
-
-        // If None, we are in a file without an extension
-        let file = self
-            .buffer
-            .read(cx)
-            .as_singleton()
-            .and_then(|b| b.read(cx).file());
-        let file_extension = file_extension.or(file
-            .as_ref()
-            .and_then(|file| Path::new(file.file_name(cx)).extension())
-            .and_then(|e| e.to_str())
-            .map(|a| a.to_string()));
-
-        let vim_mode = vim_mode_setting::VimModeSetting::try_get(cx)
-            .map(|vim_mode| vim_mode.0)
-            .unwrap_or(false);
-
-        let edit_predictions_provider = all_language_settings(file, cx).edit_predictions.provider;
-        let copilot_enabled = edit_predictions_provider
-            == language::language_settings::EditPredictionProvider::Copilot;
-        let copilot_enabled_for_language = self
-            .buffer
-            .read(cx)
-            .language_settings(cx)
-            .show_edit_predictions;
-
-        let project = project.read(cx);
-        let event_type = reported_event.event_type();
-
-        if let ReportEditorEvent::Saved { auto_saved } = reported_event {
-            telemetry::event!(
-                event_type,
-                type = if auto_saved {"autosave"} else {"manual"},
-                file_extension,
-                vim_mode,
-                copilot_enabled,
-                copilot_enabled_for_language,
-                edit_predictions_provider,
-                is_via_ssh = project.is_via_remote_server(),
-            );
-        } else {
-            telemetry::event!(
-                event_type,
-                file_extension,
-                vim_mode,
-                copilot_enabled,
-                copilot_enabled_for_language,
-                edit_predictions_provider,
-                is_via_ssh = project.is_via_remote_server(),
-            );
-        };
-    }
-
-    /// Copy the highlighted chunks to the clipboard as JSON. The format is an array of lines,
-    /// with each line being an array of {text, highlight} objects.
-    fn copy_highlight_json(
-        &mut self,
-        _: &CopyHighlightJson,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        #[derive(Serialize)]
-        struct Chunk<'a> {
-            text: String,
-            highlight: Option<&'a str>,
-        }
-
-        let snapshot = self.buffer.read(cx).snapshot(cx);
-        let range = self
-            .selected_text_range(false, window, cx)
-            .and_then(|selection| {
-                if selection.range.is_empty() {
-                    None
-                } else {
-                    Some(
-                        snapshot.offset_utf16_to_offset(MultiBufferOffsetUtf16(OffsetUtf16(
-                            selection.range.start,
-                        )))
-                            ..snapshot.offset_utf16_to_offset(MultiBufferOffsetUtf16(OffsetUtf16(
-                                selection.range.end,
-                            ))),
-                    )
-                }
-            })
-            .unwrap_or_else(|| MultiBufferOffset(0)..snapshot.len());
-
-        let chunks = snapshot.chunks(range, true);
-        let mut lines = Vec::new();
-        let mut line: VecDeque<Chunk> = VecDeque::new();
-
-        let Some(style) = self.style.as_ref() else {
-            return;
-        };
-
-        for chunk in chunks {
-            let highlight = chunk
-                .syntax_highlight_id
-                .and_then(|id| id.name(&style.syntax));
-            let mut chunk_lines = chunk.text.split('\n').peekable();
-            while let Some(text) = chunk_lines.next() {
-                let mut merged_with_last_token = false;
-                if let Some(last_token) = line.back_mut()
-                    && last_token.highlight == highlight
-                {
-                    last_token.text.push_str(text);
-                    merged_with_last_token = true;
-                }
-
-                if !merged_with_last_token {
-                    line.push_back(Chunk {
-                        text: text.into(),
-                        highlight,
-                    });
-                }
-
-                if chunk_lines.peek().is_some() {
-                    if line.len() > 1 && line.front().unwrap().text.is_empty() {
-                        line.pop_front();
-                    }
-                    if line.len() > 1 && line.back().unwrap().text.is_empty() {
-                        line.pop_back();
-                    }
-
-                    lines.push(mem::take(&mut line));
-                }
-            }
-        }
-
-        let Some(lines) = serde_json::to_string_pretty(&lines).log_err() else {
-            return;
-        };
-        cx.write_to_clipboard(ClipboardItem::new_string(lines));
-    }
-
-    pub fn open_context_menu(
-        &mut self,
-        _: &OpenContextMenu,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.request_autoscroll(Autoscroll::newest(), cx);
-        let position = self
-            .selections
-            .newest_display(&self.display_snapshot(cx))
-            .start;
-        mouse_context_menu::deploy_context_menu(self, None, position, window, cx);
-    }
-
-    pub fn replay_insert_event(
-        &mut self,
-        text: &str,
-        relative_utf16_range: Option<Range<isize>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if !self.input_enabled {
-            cx.emit(EditorEvent::InputIgnored { text: text.into() });
-            return;
-        }
-        if let Some(relative_utf16_range) = relative_utf16_range {
-            let selections = self
-                .selections
-                .all::<MultiBufferOffsetUtf16>(&self.display_snapshot(cx));
-            self.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                let new_ranges = selections.into_iter().map(|range| {
-                    let start = MultiBufferOffsetUtf16(OffsetUtf16(
-                        range
-                            .head()
-                            .0
-                            .0
-                            .saturating_add_signed(relative_utf16_range.start),
-                    ));
-                    let end = MultiBufferOffsetUtf16(OffsetUtf16(
-                        range
-                            .head()
-                            .0
-                            .0
-                            .saturating_add_signed(relative_utf16_range.end),
-                    ));
-                    start..end
-                });
-                s.select_ranges(new_ranges);
-            });
-        }
-
-        self.handle_input(text, window, cx);
-    }
-
-    pub fn is_focused(&self, window: &Window) -> bool {
-        self.focus_handle.is_focused(window)
-    }
-
-    fn handle_focus(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        cx.emit(EditorEvent::Focused);
-
-        if let Some(descendant) = self
-            .last_focused_descendant
-            .take()
-            .and_then(|descendant| descendant.upgrade())
-        {
-            window.focus(&descendant);
-        } else {
-            if let Some(blame) = self.blame.as_ref() {
-                blame.update(cx, GitBlame::focus)
-            }
-
-            self.blink_manager.update(cx, BlinkManager::enable);
-            self.show_cursor_names(window, cx);
-            self.buffer.update(cx, |buffer, cx| {
-                buffer.finalize_last_transaction(cx);
-                if self.leader_id.is_none() {
-                    buffer.set_active_selections(
-                        &self.selections.disjoint_anchors_arc(),
-                        self.selections.line_mode(),
-                        self.cursor_shape,
-                        cx,
-                    );
-                }
-            });
-
-            if let Some(position_map) = self.last_position_map.clone() {
-                EditorElement::mouse_moved(
-                    self,
-                    &MouseMoveEvent {
-                        position: window.mouse_position(),
-                        pressed_button: None,
-                        modifiers: window.modifiers(),
-                    },
-                    &position_map,
-                    window,
-                    cx,
-                );
-            }
-        }
-    }
-
-    fn handle_focus_in(&mut self, _: &mut Window, cx: &mut Context<Self>) {
-        cx.emit(EditorEvent::FocusedIn)
-    }
-
-    fn handle_focus_out(
-        &mut self,
-        event: FocusOutEvent,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if event.blurred != self.focus_handle {
-            self.last_focused_descendant = Some(event.blurred);
-        }
-        self.selection_drag_state = SelectionDragState::None;
-        self.refresh_inlay_hints(InlayHintRefreshReason::ModifiersChanged(false), cx);
-    }
-
-    pub fn handle_blur(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.blink_manager.update(cx, BlinkManager::disable);
-        self.buffer
-            .update(cx, |buffer, cx| buffer.remove_active_selections(cx));
-
-        if let Some(blame) = self.blame.as_ref() {
-            blame.update(cx, GitBlame::blur)
-        }
-        if !self.hover_state.focused(window, cx) {
-            hide_hover(self, cx);
-        }
-        if !self
-            .context_menu
-            .borrow()
-            .as_ref()
-            .is_some_and(|context_menu| context_menu.focused(window, cx))
-        {
-            self.hide_context_menu(window, cx);
-        }
-        self.take_active_edit_prediction(cx);
-        cx.emit(EditorEvent::Blurred);
-        cx.notify();
-    }
-
-    pub fn observe_pending_input(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let mut pending: String = window
-            .pending_input_keystrokes()
-            .into_iter()
-            .flatten()
-            .filter_map(|keystroke| keystroke.key_char.clone())
-            .collect();
-
-        if !self.input_enabled || self.read_only || !self.focus_handle.is_focused(window) {
-            pending = "".to_string();
-        }
-
-        let existing_pending = self
-            .text_highlights::<PendingInput>(cx)
-            .map(|(_, ranges)| ranges.to_vec());
-        if existing_pending.is_none() && pending.is_empty() {
-            return;
-        }
-        let transaction =
-            self.transact(window, cx, |this, window, cx| {
-                let selections = this
-                    .selections
-                    .all::<MultiBufferOffset>(&this.display_snapshot(cx));
-                let edits = selections
-                    .iter()
-                    .map(|selection| (selection.end..selection.end, pending.clone()));
-                this.edit(edits, cx);
-                this.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.select_ranges(selections.into_iter().enumerate().map(|(ix, sel)| {
-                        sel.start + ix * pending.len()..sel.end + ix * pending.len()
-                    }));
-                });
-                if let Some(existing_ranges) = existing_pending {
-                    let edits = existing_ranges.iter().map(|range| (range.clone(), ""));
-                    this.edit(edits, cx);
-                }
-            });
-
-        let snapshot = self.snapshot(window, cx);
-        let ranges = self
-            .selections
-            .all::<MultiBufferOffset>(&snapshot.display_snapshot)
-            .into_iter()
-            .map(|selection| {
-                snapshot.buffer_snapshot().anchor_after(selection.end)
-                    ..snapshot
-                        .buffer_snapshot()
-                        .anchor_before(selection.end + pending.len())
-            })
-            .collect();
-
-        if pending.is_empty() {
-            self.clear_highlights::<PendingInput>(cx);
-        } else {
-            self.highlight_text::<PendingInput>(
-                ranges,
-                HighlightStyle {
-                    underline: Some(UnderlineStyle {
-                        thickness: px(1.),
-                        color: None,
-                        wavy: false,
-                    }),
-                    ..Default::default()
-                },
-                cx,
-            );
-        }
-
-        self.ime_transaction = self.ime_transaction.or(transaction);
-        if let Some(transaction) = self.ime_transaction {
-            self.buffer.update(cx, |buffer, cx| {
-                buffer.group_until_transaction(transaction, cx);
-            });
-        }
-
-        if self.text_highlights::<PendingInput>(cx).is_none() {
-            self.ime_transaction.take();
-        }
-    }
-
-    pub fn register_action_renderer(
-        &mut self,
-        listener: impl Fn(&Editor, &mut Window, &mut Context<Editor>) + 'static,
-    ) -> Subscription {
-        let id = self.next_editor_action_id.post_inc();
-        self.editor_actions
-            .borrow_mut()
-            .insert(id, Box::new(listener));
-
-        let editor_actions = self.editor_actions.clone();
-        Subscription::new(move || {
-            editor_actions.borrow_mut().remove(&id);
-        })
-    }
-
-    pub fn register_action<A: Action>(
-        &mut self,
-        listener: impl Fn(&A, &mut Window, &mut App) + 'static,
-    ) -> Subscription {
-        let id = self.next_editor_action_id.post_inc();
-        let listener = Arc::new(listener);
-        self.editor_actions.borrow_mut().insert(
-            id,
-            Box::new(move |_, window, _| {
-                let listener = listener.clone();
-                window.on_action(TypeId::of::<A>(), move |action, phase, window, cx| {
-                    let action = action.downcast_ref().unwrap();
-                    if phase == DispatchPhase::Bubble {
-                        listener(action, window, cx)
-                    }
-                })
-            }),
-        );
-
-        let editor_actions = self.editor_actions.clone();
-        Subscription::new(move || {
-            editor_actions.borrow_mut().remove(&id);
-        })
-    }
-
-    pub fn file_header_size(&self) -> u32 {
-        FILE_HEADER_HEIGHT
-    }
-
-    pub fn restore(
-        &mut self,
-        revert_changes: HashMap<BufferId, Vec<(Range<text::Anchor>, Rope)>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let workspace = self.workspace();
-        let project = self.project();
-        let save_tasks = self.buffer().update(cx, |multi_buffer, cx| {
-            let mut tasks = Vec::new();
-            for (buffer_id, changes) in revert_changes {
-                if let Some(buffer) = multi_buffer.buffer(buffer_id) {
-                    buffer.update(cx, |buffer, cx| {
-                        buffer.edit(
-                            changes
-                                .into_iter()
-                                .map(|(range, text)| (range, text.to_string())),
-                            None,
-                            cx,
-                        );
-                    });
-
-                    if let Some(project) =
-                        project.filter(|_| multi_buffer.all_diff_hunks_expanded())
-                    {
-                        project.update(cx, |project, cx| {
-                            tasks.push((buffer.clone(), project.save_buffer(buffer, cx)));
-                        })
-                    }
-                }
-            }
-            tasks
-        });
-        cx.spawn_in(window, async move |_, cx| {
-            for (buffer, task) in save_tasks {
-                let result = task.await;
-                if result.is_err() {
-                    let Some(path) = buffer
-                        .read_with(cx, |buffer, cx| buffer.project_path(cx))
-                        .ok()
-                    else {
-                        continue;
-                    };
-                    if let Some((workspace, path)) = workspace.as_ref().zip(path) {
-                        let Some(task) = cx
-                            .update_window_entity(workspace, |workspace, window, cx| {
-                                workspace
-                                    .open_path_preview(path, None, false, false, false, window, cx)
-                            })
-                            .ok()
-                        else {
-                            continue;
-                        };
-                        task.await.log_err();
-                    }
-                }
-            }
-        })
-        .detach();
-        self.change_selections(SelectionEffects::no_scroll(), window, cx, |selections| {
-            selections.refresh()
-        });
-    }
-
-    pub fn to_pixel_point(
-        &mut self,
-        source: multi_buffer::Anchor,
-        editor_snapshot: &EditorSnapshot,
-        window: &mut Window,
-        cx: &App,
-    ) -> Option<gpui::Point<Pixels>> {
-        let source_point = source.to_display_point(editor_snapshot);
-        self.display_to_pixel_point(source_point, editor_snapshot, window, cx)
-    }
-
-    pub fn display_to_pixel_point(
-        &mut self,
-        source: DisplayPoint,
-        editor_snapshot: &EditorSnapshot,
-        window: &mut Window,
-        cx: &App,
-    ) -> Option<gpui::Point<Pixels>> {
-        let line_height = self.style(cx).text.line_height_in_pixels(window.rem_size());
-        let text_layout_details = self.text_layout_details(window);
-        let scroll_top = text_layout_details
-            .scroll_anchor
-            .scroll_position(editor_snapshot)
-            .y;
-
-        if source.row().as_f64() < scroll_top.floor() {
-            return None;
-        }
-        let source_x = editor_snapshot.x_for_display_point(source, &text_layout_details);
-        let source_y = line_height * (source.row().as_f64() - scroll_top) as f32;
-        Some(gpui::Point::new(source_x, source_y))
-    }
-
-    pub fn has_visible_completions_menu(&self) -> bool {
-        !self.edit_prediction_preview_is_active()
-            && self.context_menu.borrow().as_ref().is_some_and(|menu| {
-                menu.visible() && matches!(menu, CodeContextMenu::Completions(_))
-            })
-    }
-
-    pub fn register_addon<T: Addon>(&mut self, instance: T) {
-        if self.mode.is_minimap() {
-            return;
-        }
-        self.addons
-            .insert(std::any::TypeId::of::<T>(), Box::new(instance));
-    }
-
-    pub fn unregister_addon<T: Addon>(&mut self) {
-        self.addons.remove(&std::any::TypeId::of::<T>());
-    }
-
-    pub fn addon<T: Addon>(&self) -> Option<&T> {
-        let type_id = std::any::TypeId::of::<T>();
-        self.addons
-            .get(&type_id)
-            .and_then(|item| item.to_any().downcast_ref::<T>())
-    }
-
-    pub fn addon_mut<T: Addon>(&mut self) -> Option<&mut T> {
-        let type_id = std::any::TypeId::of::<T>();
-        self.addons
-            .get_mut(&type_id)
-            .and_then(|item| item.to_any_mut()?.downcast_mut::<T>())
-    }
-
-    fn character_dimensions(&self, window: &mut Window) -> CharacterDimensions {
-        let text_layout_details = self.text_layout_details(window);
-        let style = &text_layout_details.editor_style;
-        let font_id = window.text_system().resolve_font(&style.text.font());
-        let font_size = style.text.font_size.to_pixels(window.rem_size());
-        let line_height = style.text.line_height_in_pixels(window.rem_size());
-        let em_width = window.text_system().em_width(font_id, font_size).unwrap();
-        let em_advance = window.text_system().em_advance(font_id, font_size).unwrap();
-
-        CharacterDimensions {
-            em_width,
-            em_advance,
-            line_height,
-        }
-    }
-
-    pub fn wait_for_diff_to_load(&self) -> Option<Shared<Task<()>>> {
-        self.load_diff_task.clone()
-    }
-
-    fn read_metadata_from_db(
-        &mut self,
-        item_id: u64,
-        workspace_id: WorkspaceId,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) {
-        if self.buffer_kind(cx) == ItemBufferKind::Singleton
-            && !self.mode.is_minimap()
-            && WorkspaceSettings::get(None, cx).restore_on_startup != RestoreOnStartupBehavior::None
-        {
-            let buffer_snapshot = OnceCell::new();
-
-            if let Some(folds) = DB.get_editor_folds(item_id, workspace_id).log_err()
-                && !folds.is_empty()
-            {
-                let snapshot = buffer_snapshot.get_or_init(|| self.buffer.read(cx).snapshot(cx));
-                self.fold_ranges(
-                    folds
-                        .into_iter()
-                        .map(|(start, end)| {
-                            snapshot.clip_offset(MultiBufferOffset(start), Bias::Left)
-                                ..snapshot.clip_offset(MultiBufferOffset(end), Bias::Right)
-                        })
-                        .collect(),
-                    false,
-                    window,
-                    cx,
-                );
-            }
-
-            if let Some(selections) = DB.get_editor_selections(item_id, workspace_id).log_err()
-                && !selections.is_empty()
-            {
-                let snapshot = buffer_snapshot.get_or_init(|| self.buffer.read(cx).snapshot(cx));
-                // skip adding the initial selection to selection history
-                self.selection_history.mode = SelectionHistoryMode::Skipping;
-                self.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.select_ranges(selections.into_iter().map(|(start, end)| {
-                        snapshot.clip_offset(MultiBufferOffset(start), Bias::Left)
-                            ..snapshot.clip_offset(MultiBufferOffset(end), Bias::Right)
-                    }));
-                });
-                self.selection_history.mode = SelectionHistoryMode::Normal;
-            };
-        }
-
-        self.read_scroll_position_from_db(item_id, workspace_id, window, cx);
-    }
-
-    fn update_lsp_data(
-        &mut self,
-        for_buffer: Option<BufferId>,
-        window: &mut Window,
-        cx: &mut Context<'_, Self>,
-    ) {
-        self.pull_diagnostics(for_buffer, window, cx);
-        self.refresh_colors_for_visible_range(for_buffer, window, cx);
-    }
-
-    fn register_visible_buffers(&mut self, cx: &mut Context<Self>) {
-        if self.ignore_lsp_data() {
-            return;
-        }
-        for (_, (visible_buffer, _, _)) in self.visible_excerpts(true, cx) {
-            self.register_buffer(visible_buffer.read(cx).remote_id(), cx);
-        }
-    }
-
-    fn register_buffer(&mut self, buffer_id: BufferId, cx: &mut Context<Self>) {
-        if self.ignore_lsp_data() {
-            return;
-        }
-
-        if !self.registered_buffers.contains_key(&buffer_id)
-            && let Some(project) = self.project.as_ref()
-        {
-            if let Some(buffer) = self.buffer.read(cx).buffer(buffer_id) {
-                project.update(cx, |project, cx| {
-                    self.registered_buffers.insert(
-                        buffer_id,
-                        project.register_buffer_with_language_servers(&buffer, cx),
-                    );
-                });
-            } else {
-                self.registered_buffers.remove(&buffer_id);
-            }
-        }
-    }
-
-    fn ignore_lsp_data(&self) -> bool {
-        // `ActiveDiagnostic::All` is a special mode where editor's diagnostics are managed by the external view,
-        // skip any LSP updates for it.
-        self.active_diagnostics == ActiveDiagnostic::All || !self.mode().is_full()
-    }
-
-    fn create_style(&self, cx: &App) -> EditorStyle {
-        let settings = ThemeSettings::get_global(cx);
-
-        let mut text_style = match self.mode {
-            EditorMode::SingleLine | EditorMode::AutoHeight { .. } => TextStyle {
-                color: cx.theme().colors().editor_foreground,
-                font_family: settings.ui_font.family.clone(),
-                font_features: settings.ui_font.features.clone(),
-                font_fallbacks: settings.ui_font.fallbacks.clone(),
-                font_size: rems(0.875).into(),
-                font_weight: settings.ui_font.weight,
-                line_height: relative(settings.buffer_line_height.value()),
-                ..Default::default()
-            },
-            EditorMode::Full { .. } | EditorMode::Minimap { .. } => TextStyle {
-                color: cx.theme().colors().editor_foreground,
-                font_family: settings.buffer_font.family.clone(),
-                font_features: settings.buffer_font.features.clone(),
-                font_fallbacks: settings.buffer_font.fallbacks.clone(),
-                font_size: settings.buffer_font_size(cx).into(),
-                font_weight: settings.buffer_font.weight,
-                line_height: relative(settings.buffer_line_height.value()),
-                ..Default::default()
-            },
-        };
-        if let Some(text_style_refinement) = &self.text_style_refinement {
-            text_style.refine(text_style_refinement)
-        }
-
-        let background = match self.mode {
-            EditorMode::SingleLine => cx.theme().system().transparent,
-            EditorMode::AutoHeight { .. } => cx.theme().system().transparent,
-            EditorMode::Full { .. } => cx.theme().colors().editor_background,
-            EditorMode::Minimap { .. } => cx.theme().colors().editor_background.opacity(0.7),
-        };
-
-        EditorStyle {
-            background,
-            border: cx.theme().colors().border,
-            local_player: cx.theme().players().local(),
-            text: text_style,
-            scrollbar_width: EditorElement::SCROLLBAR_WIDTH,
-            syntax: cx.theme().syntax().clone(),
-            status: cx.theme().status().clone(),
-            inlay_hints_style: make_inlay_hints_style(cx),
-            edit_prediction_styles: make_suggestion_styles(cx),
-            unnecessary_code_fade: settings.unnecessary_code_fade,
-            show_underlines: self.diagnostics_enabled(),
-        }
-    }
-}
-
-fn edit_for_markdown_paste<'a>(
-    buffer: &MultiBufferSnapshot,
-    range: Range<MultiBufferOffset>,
-    to_insert: &'a str,
-    url: Option<url::Url>,
-) -> (Range<MultiBufferOffset>, Cow<'a, str>) {
-    if url.is_none() {
-        return (range, Cow::Borrowed(to_insert));
-    };
-
-    let old_text = buffer.text_for_range(range.clone()).collect::<String>();
-
-    let new_text = if range.is_empty() || url::Url::parse(&old_text).is_ok() {
-        Cow::Borrowed(to_insert)
-    } else {
-        Cow::Owned(format!("[{old_text}]({to_insert})"))
-    };
-    (range, new_text)
-}
-
-fn process_completion_for_edit(
-    completion: &Completion,
-    intent: CompletionIntent,
-    buffer: &Entity<Buffer>,
-    cursor_position: &text::Anchor,
-    cx: &mut Context<Editor>,
-) -> CompletionEdit {
-    let buffer = buffer.read(cx);
-    let buffer_snapshot = buffer.snapshot();
-    let (snippet, new_text) = if completion.is_snippet() {
-        let mut snippet_source = completion.new_text.clone();
-        // Workaround for typescript language server issues so that methods don't expand within
-        // strings and functions with type expressions. The previous point is used because the query
-        // for function identifier doesn't match when the cursor is immediately after. See PR #30312
-        let previous_point = text::ToPoint::to_point(cursor_position, &buffer_snapshot);
-        let previous_point = if previous_point.column > 0 {
-            cursor_position.to_previous_offset(&buffer_snapshot)
-        } else {
-            cursor_position.to_offset(&buffer_snapshot)
-        };
-        if let Some(scope) = buffer_snapshot.language_scope_at(previous_point)
-            && scope.prefers_label_for_snippet_in_completion()
-            && let Some(label) = completion.label()
-            && matches!(
-                completion.kind(),
-                Some(CompletionItemKind::FUNCTION) | Some(CompletionItemKind::METHOD)
-            )
-        {
-            snippet_source = label;
-        }
-        match Snippet::parse(&snippet_source).log_err() {
-            Some(parsed_snippet) => (Some(parsed_snippet.clone()), parsed_snippet.text),
-            None => (None, completion.new_text.clone()),
-        }
-    } else {
-        (None, completion.new_text.clone())
-    };
-
-    let mut range_to_replace = {
-        let replace_range = &completion.replace_range;
-        if let CompletionSource::Lsp {
-            insert_range: Some(insert_range),
-            ..
-        } = &completion.source
-        {
-            debug_assert_eq!(
-                insert_range.start, replace_range.start,
-                "insert_range and replace_range should start at the same position"
-            );
-            debug_assert!(
-                insert_range
-                    .start
-                    .cmp(cursor_position, &buffer_snapshot)
-                    .is_le(),
-                "insert_range should start before or at cursor position"
-            );
-            debug_assert!(
-                replace_range
-                    .start
-                    .cmp(cursor_position, &buffer_snapshot)
-                    .is_le(),
-                "replace_range should start before or at cursor position"
-            );
-
-            let should_replace = match intent {
-                CompletionIntent::CompleteWithInsert => false,
-                CompletionIntent::CompleteWithReplace => true,
-                CompletionIntent::Complete | CompletionIntent::Compose => {
-                    let insert_mode =
-                        language_settings(buffer.language().map(|l| l.name()), buffer.file(), cx)
-                            .completions
-                            .lsp_insert_mode;
-                    match insert_mode {
-                        LspInsertMode::Insert => false,
-                        LspInsertMode::Replace => true,
-                        LspInsertMode::ReplaceSubsequence => {
-                            let mut text_to_replace = buffer.chars_for_range(
-                                buffer.anchor_before(replace_range.start)
-                                    ..buffer.anchor_after(replace_range.end),
-                            );
-                            let mut current_needle = text_to_replace.next();
-                            for haystack_ch in completion.label.text.chars() {
-                                if let Some(needle_ch) = current_needle
-                                    && haystack_ch.eq_ignore_ascii_case(&needle_ch)
-                                {
-                                    current_needle = text_to_replace.next();
-                                }
-                            }
-                            current_needle.is_none()
-                        }
-                        LspInsertMode::ReplaceSuffix => {
-                            if replace_range
-                                .end
-                                .cmp(cursor_position, &buffer_snapshot)
-                                .is_gt()
-                            {
-                                let range_after_cursor = *cursor_position..replace_range.end;
-                                let text_after_cursor = buffer
-                                    .text_for_range(
-                                        buffer.anchor_before(range_after_cursor.start)
-                                            ..buffer.anchor_after(range_after_cursor.end),
-                                    )
-                                    .collect::<String>()
-                                    .to_ascii_lowercase();
-                                completion
-                                    .label
-                                    .text
-                                    .to_ascii_lowercase()
-                                    .ends_with(&text_after_cursor)
-                            } else {
-                                true
-                            }
-                        }
-                    }
-                }
-            };
-
-            if should_replace {
-                replace_range.clone()
-            } else {
-                insert_range.clone()
-            }
-        } else {
-            replace_range.clone()
-        }
-    };
-
-    if range_to_replace
-        .end
-        .cmp(cursor_position, &buffer_snapshot)
-        .is_lt()
-    {
-        range_to_replace.end = *cursor_position;
-    }
-
-    let replace_range = range_to_replace.to_offset(buffer);
-    CompletionEdit {
-        new_text,
-        replace_range: BufferOffset(replace_range.start)..BufferOffset(replace_range.end),
-        snippet,
-    }
-}
-
-struct CompletionEdit {
-    new_text: String,
-    replace_range: Range<BufferOffset>,
-    snippet: Option<Snippet>,
-}
-
-fn insert_extra_newline_brackets(
-    buffer: &MultiBufferSnapshot,
-    range: Range<MultiBufferOffset>,
-    language: &language::LanguageScope,
-) -> bool {
-    let leading_whitespace_len = buffer
-        .reversed_chars_at(range.start)
-        .take_while(|c| c.is_whitespace() && *c != '\n')
-        .map(|c| c.len_utf8())
-        .sum::<usize>();
-    let trailing_whitespace_len = buffer
-        .chars_at(range.end)
-        .take_while(|c| c.is_whitespace() && *c != '\n')
-        .map(|c| c.len_utf8())
-        .sum::<usize>();
-    let range = range.start - leading_whitespace_len..range.end + trailing_whitespace_len;
-
-    language.brackets().any(|(pair, enabled)| {
-        let pair_start = pair.start.trim_end();
-        let pair_end = pair.end.trim_start();
-
-        enabled
-            && pair.newline
-            && buffer.contains_str_at(range.end, pair_end)
-            && buffer.contains_str_at(
-                range.start.saturating_sub_usize(pair_start.len()),
-                pair_start,
-            )
-    })
-}
-
-fn insert_extra_newline_tree_sitter(
-    buffer: &MultiBufferSnapshot,
-    range: Range<MultiBufferOffset>,
-) -> bool {
-    let (buffer, range) = match buffer.range_to_buffer_ranges(range).as_slice() {
-        [(buffer, range, _)] => (*buffer, range.clone()),
-        _ => return false,
-    };
-    let pair = {
-        let mut result: Option<BracketMatch<usize>> = None;
-
-        for pair in buffer
-            .all_bracket_ranges(range.start.0..range.end.0)
-            .filter(move |pair| {
-                pair.open_range.start <= range.start.0 && pair.close_range.end >= range.end.0
-            })
-        {
-            let len = pair.close_range.end - pair.open_range.start;
-
-            if let Some(existing) = &result {
-                let existing_len = existing.close_range.end - existing.open_range.start;
-                if len > existing_len {
-                    continue;
-                }
-            }
-
-            result = Some(pair);
-        }
-
-        result
-    };
-    let Some(pair) = pair else {
-        return false;
-    };
-    pair.newline_only
-        && buffer
-            .chars_for_range(pair.open_range.end..range.start.0)
-            .chain(buffer.chars_for_range(range.end.0..pair.close_range.start))
-            .all(|c| c.is_whitespace() && c != '\n')
-}
-
-fn update_uncommitted_diff_for_buffer(
-    editor: Entity<Editor>,
-    project: &Entity<Project>,
-    buffers: impl IntoIterator<Item = Entity<Buffer>>,
-    buffer: Entity<MultiBuffer>,
-    cx: &mut App,
-) -> Task<()> {
-    let mut tasks = Vec::new();
-    project.update(cx, |project, cx| {
-        for buffer in buffers {
-            if project::File::from_dyn(buffer.read(cx).file()).is_some() {
-                tasks.push(project.open_uncommitted_diff(buffer.clone(), cx))
-            }
-        }
-    });
-    cx.spawn(async move |cx| {
-        let diffs = future::join_all(tasks).await;
-        if editor
-            .read_with(cx, |editor, _cx| editor.temporary_diff_override)
-            .unwrap_or(false)
-        {
-            return;
-        }
-
-        buffer
-            .update(cx, |buffer, cx| {
-                for diff in diffs.into_iter().flatten() {
-                    buffer.add_diff(diff, cx);
-                }
-            })
-            .ok();
-    })
-}
-
-fn char_len_with_expanded_tabs(offset: usize, text: &str, tab_size: NonZeroU32) -> usize {
-    let tab_size = tab_size.get() as usize;
-    let mut width = offset;
-
-    for ch in text.chars() {
-        width += if ch == '\t' {
-            tab_size - (width % tab_size)
-        } else {
-            1
-        };
-    }
-
-    width - offset
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_string_size_with_expanded_tabs() {
-        let nz = |val| NonZeroU32::new(val).unwrap();
-        assert_eq!(char_len_with_expanded_tabs(0, "", nz(4)), 0);
-        assert_eq!(char_len_with_expanded_tabs(0, "hello", nz(4)), 5);
-        assert_eq!(char_len_with_expanded_tabs(0, "\thello", nz(4)), 9);
-        assert_eq!(char_len_with_expanded_tabs(0, "abc\tab", nz(4)), 6);
-        assert_eq!(char_len_with_expanded_tabs(0, "hello\t", nz(4)), 8);
-        assert_eq!(char_len_with_expanded_tabs(0, "\t\t", nz(8)), 16);
-        assert_eq!(char_len_with_expanded_tabs(0, "x\t", nz(8)), 8);
-        assert_eq!(char_len_with_expanded_tabs(7, "x\t", nz(8)), 9);
-    }
-}
-
-/// Tokenizes a string into runs of text that should stick together, or that is whitespace.
-struct WordBreakingTokenizer<'a> {
-    input: &'a str,
-}
-
-impl<'a> WordBreakingTokenizer<'a> {
-    fn new(input: &'a str) -> Self {
-        Self { input }
-    }
-}
-
-fn is_char_ideographic(ch: char) -> bool {
-    use unicode_script::Script::*;
-    use unicode_script::UnicodeScript;
-    matches!(ch.script(), Han | Tangut | Yi)
-}
-
-fn is_grapheme_ideographic(text: &str) -> bool {
-    text.chars().any(is_char_ideographic)
-}
-
-fn is_grapheme_whitespace(text: &str) -> bool {
-    text.chars().any(|x| x.is_whitespace())
-}
-
-fn should_stay_with_preceding_ideograph(text: &str) -> bool {
-    text.chars()
-        .next()
-        .is_some_and(|ch| matches!(ch, '。' | '、' | '，' | '？' | '！' | '：' | '；' | '…'))
-}
-
-#[derive(PartialEq, Eq, Debug, Clone, Copy)]
-enum WordBreakToken<'a> {
-    Word { token: &'a str, grapheme_len: usize },
-    InlineWhitespace { token: &'a str, grapheme_len: usize },
-    Newline,
-}
-
-impl<'a> Iterator for WordBreakingTokenizer<'a> {
-    /// Yields a span, the count of graphemes in the token, and whether it was
-    /// whitespace. Note that it also breaks at word boundaries.
-    type Item = WordBreakToken<'a>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        use unicode_segmentation::UnicodeSegmentation;
-        if self.input.is_empty() {
-            return None;
-        }
-
-        let mut iter = self.input.graphemes(true).peekable();
-        let mut offset = 0;
-        let mut grapheme_len = 0;
-        if let Some(first_grapheme) = iter.next() {
-            let is_newline = first_grapheme == "\n";
-            let is_whitespace = is_grapheme_whitespace(first_grapheme);
-            offset += first_grapheme.len();
-            grapheme_len += 1;
-            if is_grapheme_ideographic(first_grapheme) && !is_whitespace {
-                if let Some(grapheme) = iter.peek().copied()
-                    && should_stay_with_preceding_ideograph(grapheme)
-                {
-                    offset += grapheme.len();
-                    grapheme_len += 1;
-                }
-            } else {
-                let mut words = self.input[offset..].split_word_bound_indices().peekable();
-                let mut next_word_bound = words.peek().copied();
-                if next_word_bound.is_some_and(|(i, _)| i == 0) {
-                    next_word_bound = words.next();
-                }
-                while let Some(grapheme) = iter.peek().copied() {
-                    if next_word_bound.is_some_and(|(i, _)| i == offset) {
-                        break;
-                    };
-                    if is_grapheme_whitespace(grapheme) != is_whitespace
-                        || (grapheme == "\n") != is_newline
-                    {
-                        break;
-                    };
-                    offset += grapheme.len();
-                    grapheme_len += 1;
-                    iter.next();
-                }
-            }
-            let token = &self.input[..offset];
-            self.input = &self.input[offset..];
-            if token == "\n" {
-                Some(WordBreakToken::Newline)
-            } else if is_whitespace {
-                Some(WordBreakToken::InlineWhitespace {
-                    token,
-                    grapheme_len,
-                })
-            } else {
-                Some(WordBreakToken::Word {
-                    token,
-                    grapheme_len,
-                })
-            }
-        } else {
-            None
-        }
-    }
-}
-
-#[test]
-fn test_word_breaking_tokenizer() {
-    let tests: &[(&str, &[WordBreakToken<'static>])] = &[
-        ("", &[]),
-        ("  ", &[whitespace("  ", 2)]),
-        ("Ʒ", &[word("Ʒ", 1)]),
-        ("Ǽ", &[word("Ǽ", 1)]),
-        ("⋑", &[word("⋑", 1)]),
-        ("⋑⋑", &[word("⋑⋑", 2)]),
-        (
-            "原理，进而",
-            &[word("原", 1), word("理，", 2), word("进", 1), word("而", 1)],
-        ),
-        (
-            "hello world",
-            &[word("hello", 5), whitespace(" ", 1), word("world", 5)],
-        ),
-        (
-            "hello, world",
-            &[word("hello,", 6), whitespace(" ", 1), word("world", 5)],
-        ),
-        (
-            "  hello world",
-            &[
-                whitespace("  ", 2),
-                word("hello", 5),
-                whitespace(" ", 1),
-                word("world", 5),
-            ],
-        ),
-        (
-            "这是什么 \n 钢笔",
-            &[
-                word("这", 1),
-                word("是", 1),
-                word("什", 1),
-                word("么", 1),
-                whitespace(" ", 1),
-                newline(),
-                whitespace(" ", 1),
-                word("钢", 1),
-                word("笔", 1),
-            ],
-        ),
-        (" mutton", &[whitespace(" ", 1), word("mutton", 6)]),
-    ];
-
-    fn word(token: &'static str, grapheme_len: usize) -> WordBreakToken<'static> {
-        WordBreakToken::Word {
-            token,
-            grapheme_len,
-        }
-    }
-
-    fn whitespace(token: &'static str, grapheme_len: usize) -> WordBreakToken<'static> {
-        WordBreakToken::InlineWhitespace {
-            token,
-            grapheme_len,
-        }
-    }
-
-    fn newline() -> WordBreakToken<'static> {
-        WordBreakToken::Newline
-    }
-
-    for (input, result) in tests {
-        assert_eq!(
-            WordBreakingTokenizer::new(input)
-                .collect::<Vec<_>>()
-                .as_slice(),
-            *result,
-        );
-    }
-}
-
-fn wrap_with_prefix(
-    first_line_prefix: String,
-    subsequent_lines_prefix: String,
-    unwrapped_text: String,
-    wrap_column: usize,
-    tab_size: NonZeroU32,
-    preserve_existing_whitespace: bool,
-) -> String {
-    let first_line_prefix_len = char_len_with_expanded_tabs(0, &first_line_prefix, tab_size);
-    let subsequent_lines_prefix_len =
-        char_len_with_expanded_tabs(0, &subsequent_lines_prefix, tab_size);
-    let mut wrapped_text = String::new();
-    let mut current_line = first_line_prefix;
-    let mut is_first_line = true;
-
-    let tokenizer = WordBreakingTokenizer::new(&unwrapped_text);
-    let mut current_line_len = first_line_prefix_len;
-    let mut in_whitespace = false;
-    for token in tokenizer {
-        let have_preceding_whitespace = in_whitespace;
-        match token {
-            WordBreakToken::Word {
-                token,
-                grapheme_len,
-            } => {
-                in_whitespace = false;
-                let current_prefix_len = if is_first_line {
-                    first_line_prefix_len
-                } else {
-                    subsequent_lines_prefix_len
-                };
-                if current_line_len + grapheme_len > wrap_column
-                    && current_line_len != current_prefix_len
-                {
-                    wrapped_text.push_str(current_line.trim_end());
-                    wrapped_text.push('\n');
-                    is_first_line = false;
-                    current_line = subsequent_lines_prefix.clone();
-                    current_line_len = subsequent_lines_prefix_len;
-                }
-                current_line.push_str(token);
-                current_line_len += grapheme_len;
-            }
-            WordBreakToken::InlineWhitespace {
-                mut token,
-                mut grapheme_len,
-            } => {
-                in_whitespace = true;
-                if have_preceding_whitespace && !preserve_existing_whitespace {
-                    continue;
-                }
-                if !preserve_existing_whitespace {
-                    // Keep a single whitespace grapheme as-is
-                    if let Some(first) =
-                        unicode_segmentation::UnicodeSegmentation::graphemes(token, true).next()
-                    {
-                        token = first;
-                    } else {
-                        token = " ";
-                    }
-                    grapheme_len = 1;
-                }
-                let current_prefix_len = if is_first_line {
-                    first_line_prefix_len
-                } else {
-                    subsequent_lines_prefix_len
-                };
-                if current_line_len + grapheme_len > wrap_column {
-                    wrapped_text.push_str(current_line.trim_end());
-                    wrapped_text.push('\n');
-                    is_first_line = false;
-                    current_line = subsequent_lines_prefix.clone();
-                    current_line_len = subsequent_lines_prefix_len;
-                } else if current_line_len != current_prefix_len || preserve_existing_whitespace {
-                    current_line.push_str(token);
-                    current_line_len += grapheme_len;
-                }
-            }
-            WordBreakToken::Newline => {
-                in_whitespace = true;
-                let current_prefix_len = if is_first_line {
-                    first_line_prefix_len
-                } else {
-                    subsequent_lines_prefix_len
-                };
-                if preserve_existing_whitespace {
-                    wrapped_text.push_str(current_line.trim_end());
-                    wrapped_text.push('\n');
-                    is_first_line = false;
-                    current_line = subsequent_lines_prefix.clone();
-                    current_line_len = subsequent_lines_prefix_len;
-                } else if have_preceding_whitespace {
-                    continue;
-                } else if current_line_len + 1 > wrap_column
-                    && current_line_len != current_prefix_len
-                {
-                    wrapped_text.push_str(current_line.trim_end());
-                    wrapped_text.push('\n');
-                    is_first_line = false;
-                    current_line = subsequent_lines_prefix.clone();
-                    current_line_len = subsequent_lines_prefix_len;
-                } else if current_line_len != current_prefix_len {
-                    current_line.push(' ');
-                    current_line_len += 1;
-                }
-            }
-        }
-    }
-
-    if !current_line.is_empty() {
-        wrapped_text.push_str(&current_line);
-    }
-    wrapped_text
-}
-
-#[test]
-fn test_wrap_with_prefix() {
-    assert_eq!(
-        wrap_with_prefix(
-            "# ".to_string(),
-            "# ".to_string(),
-            "abcdefg".to_string(),
-            4,
-            NonZeroU32::new(4).unwrap(),
-            false,
-        ),
-        "# abcdefg"
-    );
-    assert_eq!(
-        wrap_with_prefix(
-            "".to_string(),
-            "".to_string(),
-            "\thello world".to_string(),
-            8,
-            NonZeroU32::new(4).unwrap(),
-            false,
-        ),
-        "hello\nworld"
-    );
-    assert_eq!(
-        wrap_with_prefix(
-            "// ".to_string(),
-            "// ".to_string(),
-            "xx \nyy zz aa bb cc".to_string(),
-            12,
-            NonZeroU32::new(4).unwrap(),
-            false,
-        ),
-        "// xx yy zz\n// aa bb cc"
-    );
-    assert_eq!(
-        wrap_with_prefix(
-            String::new(),
-            String::new(),
-            "这是什么 \n 钢笔".to_string(),
-            3,
-            NonZeroU32::new(4).unwrap(),
-            false,
-        ),
-        "这是什\n么 钢\n笔"
-    );
-    assert_eq!(
-        wrap_with_prefix(
-            String::new(),
-            String::new(),
-            format!("foo{}bar", '\u{2009}'), // thin space
-            80,
-            NonZeroU32::new(4).unwrap(),
-            false,
-        ),
-        format!("foo{}bar", '\u{2009}')
-    );
-}
-
-pub trait CollaborationHub {
-    fn collaborators<'a>(&self, cx: &'a App) -> &'a HashMap<PeerId, Collaborator>;
-    fn user_participant_indices<'a>(&self, cx: &'a App) -> &'a HashMap<u64, ParticipantIndex>;
-    fn user_names(&self, cx: &App) -> HashMap<u64, SharedString>;
-}
-
-impl CollaborationHub for Entity<Project> {
-    fn collaborators<'a>(&self, cx: &'a App) -> &'a HashMap<PeerId, Collaborator> {
-        self.read(cx).collaborators()
-    }
-
-    fn user_participant_indices<'a>(&self, cx: &'a App) -> &'a HashMap<u64, ParticipantIndex> {
-        self.read(cx).user_store().read(cx).participant_indices()
-    }
-
-    fn user_names(&self, cx: &App) -> HashMap<u64, SharedString> {
-        let this = self.read(cx);
-        let user_ids = this.collaborators().values().map(|c| c.user_id);
-        this.user_store().read(cx).participant_names(user_ids, cx)
-    }
-}
-
-pub trait SemanticsProvider {
-    fn hover(
-        &self,
-        buffer: &Entity<Buffer>,
-        position: text::Anchor,
-        cx: &mut App,
-    ) -> Option<Task<Option<Vec<project::Hover>>>>;
-
-    fn inline_values(
-        &self,
-        buffer_handle: Entity<Buffer>,
-        range: Range<text::Anchor>,
-        cx: &mut App,
-    ) -> Option<Task<anyhow::Result<Vec<InlayHint>>>>;
-
-    fn applicable_inlay_chunks(
-        &self,
-        buffer: &Entity<Buffer>,
-        ranges: &[Range<text::Anchor>],
-        cx: &mut App,
-    ) -> Vec<Range<BufferRow>>;
-
-    fn invalidate_inlay_hints(&self, for_buffers: &HashSet<BufferId>, cx: &mut App);
-
-    fn inlay_hints(
-        &self,
-        invalidate: InvalidationStrategy,
-        buffer: Entity<Buffer>,
-        ranges: Vec<Range<text::Anchor>>,
-        known_chunks: Option<(clock::Global, HashSet<Range<BufferRow>>)>,
-        cx: &mut App,
-    ) -> Option<HashMap<Range<BufferRow>, Task<Result<CacheInlayHints>>>>;
-
-    fn supports_inlay_hints(&self, buffer: &Entity<Buffer>, cx: &mut App) -> bool;
-
-    fn document_highlights(
-        &self,
-        buffer: &Entity<Buffer>,
-        position: text::Anchor,
-        cx: &mut App,
-    ) -> Option<Task<Result<Vec<DocumentHighlight>>>>;
-
-    fn definitions(
-        &self,
-        buffer: &Entity<Buffer>,
-        position: text::Anchor,
-        kind: GotoDefinitionKind,
-        cx: &mut App,
-    ) -> Option<Task<Result<Option<Vec<LocationLink>>>>>;
-
-    fn range_for_rename(
-        &self,
-        buffer: &Entity<Buffer>,
-        position: text::Anchor,
-        cx: &mut App,
-    ) -> Option<Task<Result<Option<Range<text::Anchor>>>>>;
-
-    fn perform_rename(
-        &self,
-        buffer: &Entity<Buffer>,
-        position: text::Anchor,
-        new_name: String,
-        cx: &mut App,
-    ) -> Option<Task<Result<ProjectTransaction>>>;
-}
-
-pub trait CompletionProvider {
-    fn completions(
-        &self,
-        excerpt_id: ExcerptId,
-        buffer: &Entity<Buffer>,
-        buffer_position: text::Anchor,
-        trigger: CompletionContext,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) -> Task<Result<Vec<CompletionResponse>>>;
-
-    fn resolve_completions(
-        &self,
-        _buffer: Entity<Buffer>,
-        _completion_indices: Vec<usize>,
-        _completions: Rc<RefCell<Box<[Completion]>>>,
-        _cx: &mut Context<Editor>,
-    ) -> Task<Result<bool>> {
-        Task::ready(Ok(false))
-    }
-
-    fn apply_additional_edits_for_completion(
-        &self,
-        _buffer: Entity<Buffer>,
-        _completions: Rc<RefCell<Box<[Completion]>>>,
-        _completion_index: usize,
-        _push_to_history: bool,
-        _cx: &mut Context<Editor>,
-    ) -> Task<Result<Option<language::Transaction>>> {
-        Task::ready(Ok(None))
-    }
-
-    fn is_completion_trigger(
-        &self,
-        buffer: &Entity<Buffer>,
-        position: language::Anchor,
-        text: &str,
-        trigger_in_words: bool,
-        cx: &mut Context<Editor>,
-    ) -> bool;
-
-    fn selection_changed(&self, _mat: Option<&StringMatch>, _window: &mut Window, _cx: &mut App) {}
-
-    fn sort_completions(&self) -> bool {
-        true
-    }
-
-    fn filter_completions(&self) -> bool {
-        true
-    }
-
-    fn show_snippets(&self) -> bool {
-        false
-    }
-}
-
-pub trait CodeActionProvider {
-    fn id(&self) -> Arc<str>;
-
-    fn code_actions(
-        &self,
-        buffer: &Entity<Buffer>,
-        range: Range<text::Anchor>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<Vec<CodeAction>>>;
-
-    fn apply_code_action(
-        &self,
-        buffer_handle: Entity<Buffer>,
-        action: CodeAction,
-        excerpt_id: ExcerptId,
-        push_to_history: bool,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<ProjectTransaction>>;
-}
-
-impl CodeActionProvider for Entity<Project> {
-    fn id(&self) -> Arc<str> {
-        "project".into()
-    }
-
-    fn code_actions(
-        &self,
-        buffer: &Entity<Buffer>,
-        range: Range<text::Anchor>,
-        _window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<Vec<CodeAction>>> {
-        self.update(cx, |project, cx| {
-            let code_lens_actions = project.code_lens_actions(buffer, range.clone(), cx);
-            let code_actions = project.code_actions(buffer, range, None, cx);
-            cx.background_spawn(async move {
-                let (code_lens_actions, code_actions) = join(code_lens_actions, code_actions).await;
-                Ok(code_lens_actions
-                    .context("code lens fetch")?
-                    .into_iter()
-                    .flatten()
-                    .chain(
-                        code_actions
-                            .context("code action fetch")?
-                            .into_iter()
-                            .flatten(),
-                    )
-                    .collect())
-            })
-        })
-    }
-
-    fn apply_code_action(
-        &self,
-        buffer_handle: Entity<Buffer>,
-        action: CodeAction,
-        _excerpt_id: ExcerptId,
-        push_to_history: bool,
-        _window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<ProjectTransaction>> {
-        self.update(cx, |project, cx| {
-            project.apply_code_action(buffer_handle, action, push_to_history, cx)
-        })
-    }
-}
-
-fn snippet_completions(
-    project: &Project,
-    buffer: &Entity<Buffer>,
-    buffer_anchor: text::Anchor,
-    classifier: CharClassifier,
-    cx: &mut App,
-) -> Task<Result<CompletionResponse>> {
-    let languages = buffer.read(cx).languages_at(buffer_anchor);
-    let snippet_store = project.snippets().read(cx);
-
-    let scopes: Vec<_> = languages
-        .iter()
-        .filter_map(|language| {
-            let language_name = language.lsp_id();
-            let snippets = snippet_store.snippets_for(Some(language_name), cx);
-
-            if snippets.is_empty() {
-                None
-            } else {
-                Some((language.default_scope(), snippets))
-            }
-        })
-        .collect();
-
-    if scopes.is_empty() {
-        return Task::ready(Ok(CompletionResponse {
-            completions: vec![],
-            display_options: CompletionDisplayOptions::default(),
-            is_incomplete: false,
-        }));
-    }
-
-    let snapshot = buffer.read(cx).text_snapshot();
-    let executor = cx.background_executor().clone();
-
-    cx.background_spawn(async move {
-        let is_word_char = |c| classifier.is_word(c);
-
-        let mut is_incomplete = false;
-        let mut completions: Vec<Completion> = Vec::new();
-
-        const MAX_PREFIX_LEN: usize = 128;
-        let buffer_offset = text::ToOffset::to_offset(&buffer_anchor, &snapshot);
-        let window_start = buffer_offset.saturating_sub(MAX_PREFIX_LEN);
-        let window_start = snapshot.clip_offset(window_start, Bias::Left);
-
-        let max_buffer_window: String = snapshot
-            .text_for_range(window_start..buffer_offset)
-            .collect();
-
-        if max_buffer_window.is_empty() {
-            return Ok(CompletionResponse {
-                completions: vec![],
-                display_options: CompletionDisplayOptions::default(),
-                is_incomplete: true,
-            });
-        }
-
-        for (_scope, snippets) in scopes.into_iter() {
-            // Sort snippets by word count to match longer snippet prefixes first.
-            let mut sorted_snippet_candidates = snippets
-                .iter()
-                .enumerate()
-                .flat_map(|(snippet_ix, snippet)| {
-                    snippet
-                        .prefix
-                        .iter()
-                        .enumerate()
-                        .map(move |(prefix_ix, prefix)| {
-                            let word_count =
-                                snippet_candidate_suffixes(prefix, is_word_char).count();
-                            ((snippet_ix, prefix_ix), prefix, word_count)
-                        })
-                })
-                .collect_vec();
-            sorted_snippet_candidates
-                .sort_unstable_by_key(|(_, _, word_count)| Reverse(*word_count));
-
-            // Each prefix may be matched multiple times; the completion menu must filter out duplicates.
-
-            let buffer_windows = snippet_candidate_suffixes(&max_buffer_window, is_word_char)
-                .take(
-                    sorted_snippet_candidates
-                        .first()
-                        .map(|(_, _, word_count)| *word_count)
-                        .unwrap_or_default(),
-                )
-                .collect_vec();
-
-            const MAX_RESULTS: usize = 100;
-            // Each match also remembers how many characters from the buffer it consumed
-            let mut matches: Vec<(StringMatch, usize)> = vec![];
-
-            let mut snippet_list_cutoff_index = 0;
-            for (buffer_index, buffer_window) in buffer_windows.iter().enumerate().rev() {
-                let word_count = buffer_index + 1;
-                // Increase `snippet_list_cutoff_index` until we have all of the
-                // snippets with sufficiently many words.
-                while sorted_snippet_candidates
-                    .get(snippet_list_cutoff_index)
-                    .is_some_and(|(_ix, _prefix, snippet_word_count)| {
-                        *snippet_word_count >= word_count
-                    })
-                {
-                    snippet_list_cutoff_index += 1;
-                }
-
-                // Take only the candidates with at least `word_count` many words
-                let snippet_candidates_at_word_len =
-                    &sorted_snippet_candidates[..snippet_list_cutoff_index];
-
-                let candidates = snippet_candidates_at_word_len
-                    .iter()
-                    .map(|(_snippet_ix, prefix, _snippet_word_count)| prefix)
-                    .enumerate() // index in `sorted_snippet_candidates`
-                    // First char must match
-                    .filter(|(_ix, prefix)| {
-                        itertools::equal(
-                            prefix
-                                .chars()
-                                .next()
-                                .into_iter()
-                                .flat_map(|c| c.to_lowercase()),
-                            buffer_window
-                                .chars()
-                                .next()
-                                .into_iter()
-                                .flat_map(|c| c.to_lowercase()),
-                        )
-                    })
-                    .map(|(ix, prefix)| StringMatchCandidate::new(ix, prefix))
-                    .collect::<Vec<StringMatchCandidate>>();
-
-                matches.extend(
-                    fuzzy::match_strings(
-                        &candidates,
-                        &buffer_window,
-                        buffer_window.chars().any(|c| c.is_uppercase()),
-                        true,
-                        MAX_RESULTS - matches.len(), // always prioritize longer snippets
-                        &Default::default(),
-                        executor.clone(),
-                    )
-                    .await
-                    .into_iter()
-                    .map(|string_match| (string_match, buffer_window.len())),
-                );
-
-                if matches.len() >= MAX_RESULTS {
-                    break;
-                }
-            }
-
-            let to_lsp = |point: &text::Anchor| {
-                let end = text::ToPointUtf16::to_point_utf16(point, &snapshot);
-                point_to_lsp(end)
-            };
-            let lsp_end = to_lsp(&buffer_anchor);
-
-            if matches.len() >= MAX_RESULTS {
-                is_incomplete = true;
-            }
-
-            completions.extend(matches.iter().map(|(string_match, buffer_window_len)| {
-                let ((snippet_index, prefix_index), matching_prefix, _snippet_word_count) =
-                    sorted_snippet_candidates[string_match.candidate_id];
-                let snippet = &snippets[snippet_index];
-                let start = buffer_offset - buffer_window_len;
-                let start = snapshot.anchor_before(start);
-                let range = start..buffer_anchor;
-                let lsp_start = to_lsp(&start);
-                let lsp_range = lsp::Range {
-                    start: lsp_start,
-                    end: lsp_end,
-                };
-                Completion {
-                    replace_range: range,
-                    new_text: snippet.body.clone(),
-                    source: CompletionSource::Lsp {
-                        insert_range: None,
-                        server_id: LanguageServerId(usize::MAX),
-                        resolved: true,
-                        lsp_completion: Box::new(lsp::CompletionItem {
-                            label: snippet.prefix.first().unwrap().clone(),
-                            kind: Some(CompletionItemKind::SNIPPET),
-                            label_details: snippet.description.as_ref().map(|description| {
-                                lsp::CompletionItemLabelDetails {
-                                    detail: Some(description.clone()),
-                                    description: None,
-                                }
-                            }),
-                            insert_text_format: Some(InsertTextFormat::SNIPPET),
-                            text_edit: Some(lsp::CompletionTextEdit::InsertAndReplace(
-                                lsp::InsertReplaceEdit {
-                                    new_text: snippet.body.clone(),
-                                    insert: lsp_range,
-                                    replace: lsp_range,
-                                },
-                            )),
-                            filter_text: Some(snippet.body.clone()),
-                            sort_text: Some(char::MAX.to_string()),
-                            ..lsp::CompletionItem::default()
-                        }),
-                        lsp_defaults: None,
-                    },
-                    label: CodeLabel {
-                        text: matching_prefix.clone(),
-                        runs: Vec::new(),
-                        filter_range: 0..matching_prefix.len(),
-                    },
-                    icon_path: None,
-                    documentation: Some(CompletionDocumentation::SingleLineAndMultiLinePlainText {
-                        single_line: snippet.name.clone().into(),
-                        plain_text: snippet
-                            .description
-                            .clone()
-                            .map(|description| description.into()),
-                    }),
-                    insert_text_mode: None,
-                    confirm: None,
-                    match_start: Some(start),
-                    snippet_deduplication_key: Some((snippet_index, prefix_index)),
-                }
-            }));
-        }
-
-        Ok(CompletionResponse {
-            completions,
-            display_options: CompletionDisplayOptions::default(),
-            is_incomplete,
-        })
-    })
-}
-
-impl CompletionProvider for Entity<Project> {
-    fn completions(
-        &self,
-        _excerpt_id: ExcerptId,
-        buffer: &Entity<Buffer>,
-        buffer_position: text::Anchor,
-        options: CompletionContext,
-        _window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) -> Task<Result<Vec<CompletionResponse>>> {
-        self.update(cx, |project, cx| {
-            let task = project.completions(buffer, buffer_position, options, cx);
-            cx.background_spawn(task)
-        })
-    }
-
-    fn resolve_completions(
-        &self,
-        buffer: Entity<Buffer>,
-        completion_indices: Vec<usize>,
-        completions: Rc<RefCell<Box<[Completion]>>>,
-        cx: &mut Context<Editor>,
-    ) -> Task<Result<bool>> {
-        self.update(cx, |project, cx| {
-            project.lsp_store().update(cx, |lsp_store, cx| {
-                lsp_store.resolve_completions(buffer, completion_indices, completions, cx)
-            })
-        })
-    }
-
-    fn apply_additional_edits_for_completion(
-        &self,
-        buffer: Entity<Buffer>,
-        completions: Rc<RefCell<Box<[Completion]>>>,
-        completion_index: usize,
-        push_to_history: bool,
-        cx: &mut Context<Editor>,
-    ) -> Task<Result<Option<language::Transaction>>> {
-        self.update(cx, |project, cx| {
-            project.lsp_store().update(cx, |lsp_store, cx| {
-                lsp_store.apply_additional_edits_for_completion(
-                    buffer,
-                    completions,
-                    completion_index,
-                    push_to_history,
-                    cx,
-                )
-            })
-        })
-    }
-
-    fn is_completion_trigger(
-        &self,
-        buffer: &Entity<Buffer>,
-        position: language::Anchor,
-        text: &str,
-        trigger_in_words: bool,
-        cx: &mut Context<Editor>,
-    ) -> bool {
-        let mut chars = text.chars();
-        let char = if let Some(char) = chars.next() {
-            char
-        } else {
-            return false;
-        };
-        if chars.next().is_some() {
-            return false;
-        }
-
-        let buffer = buffer.read(cx);
-        let snapshot = buffer.snapshot();
-        let classifier = snapshot
-            .char_classifier_at(position)
-            .scope_context(Some(CharScopeContext::Completion));
-        if trigger_in_words && classifier.is_word(char) {
-            return true;
-        }
-
-        buffer.completion_triggers().contains(text)
-    }
-
-    fn show_snippets(&self) -> bool {
-        true
-    }
-}
-
-impl SemanticsProvider for Entity<Project> {
-    fn hover(
-        &self,
-        buffer: &Entity<Buffer>,
-        position: text::Anchor,
-        cx: &mut App,
-    ) -> Option<Task<Option<Vec<project::Hover>>>> {
-        Some(self.update(cx, |project, cx| project.hover(buffer, position, cx)))
-    }
-
-    fn document_highlights(
-        &self,
-        buffer: &Entity<Buffer>,
-        position: text::Anchor,
-        cx: &mut App,
-    ) -> Option<Task<Result<Vec<DocumentHighlight>>>> {
-        Some(self.update(cx, |project, cx| {
-            project.document_highlights(buffer, position, cx)
-        }))
-    }
-
-    fn definitions(
-        &self,
-        buffer: &Entity<Buffer>,
-        position: text::Anchor,
-        kind: GotoDefinitionKind,
-        cx: &mut App,
-    ) -> Option<Task<Result<Option<Vec<LocationLink>>>>> {
-        Some(self.update(cx, |project, cx| match kind {
-            GotoDefinitionKind::Symbol => project.definitions(buffer, position, cx),
-            GotoDefinitionKind::Declaration => project.declarations(buffer, position, cx),
-            GotoDefinitionKind::Type => project.type_definitions(buffer, position, cx),
-            GotoDefinitionKind::Implementation => project.implementations(buffer, position, cx),
-        }))
-    }
-
-    fn supports_inlay_hints(&self, buffer: &Entity<Buffer>, cx: &mut App) -> bool {
-        self.update(cx, |project, cx| {
-            if project
-                .active_debug_session(cx)
-                .is_some_and(|(session, _)| session.read(cx).any_stopped_thread())
-            {
-                return true;
-            }
-
-            buffer.update(cx, |buffer, cx| {
-                project.any_language_server_supports_inlay_hints(buffer, cx)
-            })
-        })
-    }
-
-    fn inline_values(
-        &self,
-        buffer_handle: Entity<Buffer>,
-        range: Range<text::Anchor>,
-        cx: &mut App,
-    ) -> Option<Task<anyhow::Result<Vec<InlayHint>>>> {
-        self.update(cx, |project, cx| {
-            let (session, active_stack_frame) = project.active_debug_session(cx)?;
-
-            Some(project.inline_values(session, active_stack_frame, buffer_handle, range, cx))
-        })
-    }
-
-    fn applicable_inlay_chunks(
-        &self,
-        buffer: &Entity<Buffer>,
-        ranges: &[Range<text::Anchor>],
-        cx: &mut App,
-    ) -> Vec<Range<BufferRow>> {
-        self.read(cx).lsp_store().update(cx, |lsp_store, cx| {
-            lsp_store.applicable_inlay_chunks(buffer, ranges, cx)
-        })
-    }
-
-    fn invalidate_inlay_hints(&self, for_buffers: &HashSet<BufferId>, cx: &mut App) {
-        self.read(cx).lsp_store().update(cx, |lsp_store, _| {
-            lsp_store.invalidate_inlay_hints(for_buffers)
-        });
-    }
-
-    fn inlay_hints(
-        &self,
-        invalidate: InvalidationStrategy,
-        buffer: Entity<Buffer>,
-        ranges: Vec<Range<text::Anchor>>,
-        known_chunks: Option<(clock::Global, HashSet<Range<BufferRow>>)>,
-        cx: &mut App,
-    ) -> Option<HashMap<Range<BufferRow>, Task<Result<CacheInlayHints>>>> {
-        Some(self.read(cx).lsp_store().update(cx, |lsp_store, cx| {
-            lsp_store.inlay_hints(invalidate, buffer, ranges, known_chunks, cx)
-        }))
-    }
-
-    fn range_for_rename(
-        &self,
-        buffer: &Entity<Buffer>,
-        position: text::Anchor,
-        cx: &mut App,
-    ) -> Option<Task<Result<Option<Range<text::Anchor>>>>> {
-        Some(self.update(cx, |project, cx| {
-            let buffer = buffer.clone();
-            let task = project.prepare_rename(buffer.clone(), position, cx);
-            cx.spawn(async move |_, cx| {
-                Ok(match task.await? {
-                    PrepareRenameResponse::Success(range) => Some(range),
-                    PrepareRenameResponse::InvalidPosition => None,
-                    PrepareRenameResponse::OnlyUnpreparedRenameSupported => {
-                        // Fallback on using TreeSitter info to determine identifier range
-                        buffer.read_with(cx, |buffer, _| {
-                            let snapshot = buffer.snapshot();
-                            let (range, kind) = snapshot.surrounding_word(position, None);
-                            if kind != Some(CharKind::Word) {
-                                return None;
-                            }
-                            Some(
-                                snapshot.anchor_before(range.start)
-                                    ..snapshot.anchor_after(range.end),
-                            )
-                        })?
-                    }
-                })
-            })
-        }))
-    }
-
-    fn perform_rename(
-        &self,
-        buffer: &Entity<Buffer>,
-        position: text::Anchor,
-        new_name: String,
-        cx: &mut App,
-    ) -> Option<Task<Result<ProjectTransaction>>> {
-        Some(self.update(cx, |project, cx| {
-            project.perform_rename(buffer.clone(), position, new_name, cx)
-        }))
-    }
-}
-
-fn consume_contiguous_rows(
-    contiguous_row_selections: &mut Vec<Selection<Point>>,
-    selection: &Selection<Point>,
-    display_map: &DisplaySnapshot,
-    selections: &mut Peekable<std::slice::Iter<Selection<Point>>>,
-) -> (MultiBufferRow, MultiBufferRow) {
-    contiguous_row_selections.push(selection.clone());
-    let start_row = starting_row(selection, display_map);
-    let mut end_row = ending_row(selection, display_map);
-
-    while let Some(next_selection) = selections.peek() {
-        if next_selection.start.row <= end_row.0 {
-            end_row = ending_row(next_selection, display_map);
-            contiguous_row_selections.push(selections.next().unwrap().clone());
-        } else {
-            break;
-        }
-    }
-    (start_row, end_row)
-}
-
-fn starting_row(selection: &Selection<Point>, display_map: &DisplaySnapshot) -> MultiBufferRow {
-    if selection.start.column > 0 {
-        MultiBufferRow(display_map.prev_line_boundary(selection.start).0.row)
-    } else {
-        MultiBufferRow(selection.start.row)
-    }
-}
-
-fn ending_row(next_selection: &Selection<Point>, display_map: &DisplaySnapshot) -> MultiBufferRow {
-    if next_selection.end.column > 0 || next_selection.is_empty() {
-        MultiBufferRow(display_map.next_line_boundary(next_selection.end).0.row + 1)
-    } else {
-        MultiBufferRow(next_selection.end.row)
-    }
-}
-
-impl EditorSnapshot {
-    pub fn remote_selections_in_range<'a>(
-        &'a self,
-        range: &'a Range<Anchor>,
-        collaboration_hub: &dyn CollaborationHub,
-        cx: &'a App,
-    ) -> impl 'a + Iterator<Item = RemoteSelection> {
-        let participant_names = collaboration_hub.user_names(cx);
-        let participant_indices = collaboration_hub.user_participant_indices(cx);
-        let collaborators_by_peer_id = collaboration_hub.collaborators(cx);
-        let collaborators_by_replica_id = collaborators_by_peer_id
-            .values()
-            .map(|collaborator| (collaborator.replica_id, collaborator))
-            .collect::<HashMap<_, _>>();
-        self.buffer_snapshot()
-            .selections_in_range(range, false)
-            .filter_map(move |(replica_id, line_mode, cursor_shape, selection)| {
-                if replica_id == ReplicaId::AGENT {
-                    Some(RemoteSelection {
-                        replica_id,
-                        selection,
-                        cursor_shape,
-                        line_mode,
-                        collaborator_id: CollaboratorId::Agent,
-                        user_name: Some("Agent".into()),
-                        color: cx.theme().players().agent(),
-                    })
-                } else {
-                    let collaborator = collaborators_by_replica_id.get(&replica_id)?;
-                    let participant_index = participant_indices.get(&collaborator.user_id).copied();
-                    let user_name = participant_names.get(&collaborator.user_id).cloned();
-                    Some(RemoteSelection {
-                        replica_id,
-                        selection,
-                        cursor_shape,
-                        line_mode,
-                        collaborator_id: CollaboratorId::PeerId(collaborator.peer_id),
-                        user_name,
-                        color: if let Some(index) = participant_index {
-                            cx.theme().players().color_for_participant(index.0)
-                        } else {
-                            cx.theme().players().absent()
-                        },
-                    })
-                }
-            })
-    }
-
-    pub fn hunks_for_ranges(
-        &self,
-        ranges: impl IntoIterator<Item = Range<Point>>,
-    ) -> Vec<MultiBufferDiffHunk> {
-        let mut hunks = Vec::new();
-        let mut processed_buffer_rows: HashMap<BufferId, HashSet<Range<text::Anchor>>> =
-            HashMap::default();
-        for query_range in ranges {
-            let query_rows =
-                MultiBufferRow(query_range.start.row)..MultiBufferRow(query_range.end.row + 1);
-            for hunk in self.buffer_snapshot().diff_hunks_in_range(
-                Point::new(query_rows.start.0, 0)..Point::new(query_rows.end.0, 0),
-            ) {
-                // Include deleted hunks that are adjacent to the query range, because
-                // otherwise they would be missed.
-                let mut intersects_range = hunk.row_range.overlaps(&query_rows);
-                if hunk.status().is_deleted() {
-                    intersects_range |= hunk.row_range.start == query_rows.end;
-                    intersects_range |= hunk.row_range.end == query_rows.start;
-                }
-                if intersects_range {
-                    if !processed_buffer_rows
-                        .entry(hunk.buffer_id)
-                        .or_default()
-                        .insert(hunk.buffer_range.start..hunk.buffer_range.end)
-                    {
-                        continue;
-                    }
-                    hunks.push(hunk);
-                }
-            }
-        }
-
-        hunks
-    }
-
-    fn display_diff_hunks_for_rows<'a>(
-        &'a self,
-        display_rows: Range<DisplayRow>,
-        folded_buffers: &'a HashSet<BufferId>,
-    ) -> impl 'a + Iterator<Item = DisplayDiffHunk> {
-        let buffer_start = DisplayPoint::new(display_rows.start, 0).to_point(self);
-        let buffer_end = DisplayPoint::new(display_rows.end, 0).to_point(self);
-
-        self.buffer_snapshot()
-            .diff_hunks_in_range(buffer_start..buffer_end)
-            .filter_map(|hunk| {
-                if folded_buffers.contains(&hunk.buffer_id) {
-                    return None;
-                }
-
-                let hunk_start_point = Point::new(hunk.row_range.start.0, 0);
-                let hunk_end_point = Point::new(hunk.row_range.end.0, 0);
-
-                let hunk_display_start = self.point_to_display_point(hunk_start_point, Bias::Left);
-                let hunk_display_end = self.point_to_display_point(hunk_end_point, Bias::Right);
-
-                let display_hunk = if hunk_display_start.column() != 0 {
-                    DisplayDiffHunk::Folded {
-                        display_row: hunk_display_start.row(),
-                    }
-                } else {
-                    let mut end_row = hunk_display_end.row();
-                    if hunk_display_end.column() > 0 {
-                        end_row.0 += 1;
-                    }
-                    let is_created_file = hunk.is_created_file();
-
-                    DisplayDiffHunk::Unfolded {
-                        status: hunk.status(),
-                        diff_base_byte_range: hunk.diff_base_byte_range.start.0
-                            ..hunk.diff_base_byte_range.end.0,
-                        word_diffs: hunk.word_diffs,
-                        display_row_range: hunk_display_start.row()..end_row,
-                        multi_buffer_range: Anchor::range_in_buffer(
-                            hunk.excerpt_id,
-                            hunk.buffer_range,
-                        ),
-                        is_created_file,
-                    }
-                };
-
-                Some(display_hunk)
-            })
-    }
-
-    pub fn language_at<T: ToOffset>(&self, position: T) -> Option<&Arc<Language>> {
-        self.display_snapshot
-            .buffer_snapshot()
-            .language_at(position)
-    }
-
-    pub fn is_focused(&self) -> bool {
-        self.is_focused
-    }
-
-    pub fn placeholder_text(&self) -> Option<String> {
-        self.placeholder_display_snapshot
-            .as_ref()
-            .map(|display_map| display_map.text())
-    }
-
-    pub fn scroll_position(&self) -> gpui::Point<ScrollOffset> {
-        self.scroll_anchor.scroll_position(&self.display_snapshot)
-    }
-
-    pub fn gutter_dimensions(
-        &self,
-        font_id: FontId,
-        font_size: Pixels,
-        style: &EditorStyle,
-        window: &mut Window,
-        cx: &App,
-    ) -> GutterDimensions {
-        if self.show_gutter
-            && let Some(ch_width) = cx.text_system().ch_width(font_id, font_size).log_err()
-            && let Some(ch_advance) = cx.text_system().ch_advance(font_id, font_size).log_err()
-        {
-            let show_git_gutter = self.show_git_diff_gutter.unwrap_or_else(|| {
-                matches!(
-                    ProjectSettings::get_global(cx).git.git_gutter,
-                    GitGutterSetting::TrackedFiles
-                )
-            });
-            let gutter_settings = EditorSettings::get_global(cx).gutter;
-            let show_line_numbers = self
-                .show_line_numbers
-                .unwrap_or(gutter_settings.line_numbers);
-            let line_gutter_width = if show_line_numbers {
-                // Avoid flicker-like gutter resizes when the line number gains another digit by
-                // only resizing the gutter on files with > 10**min_line_number_digits lines.
-                let min_width_for_number_on_gutter =
-                    ch_advance * gutter_settings.min_line_number_digits as f32;
-                self.max_line_number_width(style, window)
-                    .max(min_width_for_number_on_gutter)
-            } else {
-                0.0.into()
-            };
-
-            let show_runnables = self.show_runnables.unwrap_or(gutter_settings.runnables);
-            let show_breakpoints = self.show_breakpoints.unwrap_or(gutter_settings.breakpoints);
-
-            let git_blame_entries_width =
-                self.git_blame_gutter_max_author_length
-                    .map(|max_author_length| {
-                        let renderer = cx.global::<GlobalBlameRenderer>().0.clone();
-                        const MAX_RELATIVE_TIMESTAMP: &str = "60 minutes ago";
-
-                        /// The number of characters to dedicate to gaps and margins.
-                        const SPACING_WIDTH: usize = 4;
-
-                        let max_char_count = max_author_length.min(renderer.max_author_length())
-                            + ::git::SHORT_SHA_LENGTH
-                            + MAX_RELATIVE_TIMESTAMP.len()
-                            + SPACING_WIDTH;
-
-                        ch_advance * max_char_count
-                    });
-
-            let is_singleton = self.buffer_snapshot().is_singleton();
-
-            let mut left_padding = git_blame_entries_width.unwrap_or(Pixels::ZERO);
-            left_padding += if !is_singleton {
-                ch_width * 4.0
-            } else if show_runnables || show_breakpoints {
-                ch_width * 3.0
-            } else if show_git_gutter && show_line_numbers {
-                ch_width * 2.0
-            } else if show_git_gutter || show_line_numbers {
-                ch_width
-            } else {
-                px(0.)
-            };
-
-            let shows_folds = is_singleton && gutter_settings.folds;
-
-            let right_padding = if shows_folds && show_line_numbers {
-                ch_width * 4.0
-            } else if shows_folds || (!is_singleton && show_line_numbers) {
-                ch_width * 3.0
-            } else if show_line_numbers {
-                ch_width
-            } else {
-                px(0.)
-            };
-
-            GutterDimensions {
-                left_padding,
-                right_padding,
-                width: line_gutter_width + left_padding + right_padding,
-                margin: GutterDimensions::default_gutter_margin(font_id, font_size, cx),
-                git_blame_entries_width,
-            }
-        } else if self.offset_content {
-            GutterDimensions::default_with_margin(font_id, font_size, cx)
-        } else {
-            GutterDimensions::default()
-        }
-    }
-
-    pub fn render_crease_toggle(
-        &self,
-        buffer_row: MultiBufferRow,
-        row_contains_cursor: bool,
-        editor: Entity<Editor>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<AnyElement> {
-        let folded = self.is_line_folded(buffer_row);
-        let mut is_foldable = false;
-
-        if let Some(crease) = self
-            .crease_snapshot
-            .query_row(buffer_row, self.buffer_snapshot())
-        {
-            is_foldable = true;
-            match crease {
-                Crease::Inline { render_toggle, .. } | Crease::Block { render_toggle, .. } => {
-                    if let Some(render_toggle) = render_toggle {
-                        let toggle_callback =
-                            Arc::new(move |folded, window: &mut Window, cx: &mut App| {
-                                if folded {
-                                    editor.update(cx, |editor, cx| {
-                                        editor.fold_at(buffer_row, window, cx)
-                                    });
-                                } else {
-                                    editor.update(cx, |editor, cx| {
-                                        editor.unfold_at(buffer_row, window, cx)
-                                    });
-                                }
-                            });
-                        return Some((render_toggle)(
-                            buffer_row,
-                            folded,
-                            toggle_callback,
-                            window,
-                            cx,
-                        ));
-                    }
-                }
-            }
-        }
-
-        is_foldable |= self.starts_indent(buffer_row);
-
-        if folded || (is_foldable && (row_contains_cursor || self.gutter_hovered)) {
-            Some(
-                Disclosure::new(("gutter_crease", buffer_row.0), !folded)
-                    .toggle_state(folded)
-                    .on_click(window.listener_for(&editor, move |this, _e, window, cx| {
-                        if folded {
-                            this.unfold_at(buffer_row, window, cx);
-                        } else {
-                            this.fold_at(buffer_row, window, cx);
-                        }
-                    }))
-                    .into_any_element(),
-            )
-        } else {
-            None
-        }
-    }
-
-    pub fn render_crease_trailer(
-        &self,
-        buffer_row: MultiBufferRow,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<AnyElement> {
-        let folded = self.is_line_folded(buffer_row);
-        if let Crease::Inline { render_trailer, .. } = self
-            .crease_snapshot
-            .query_row(buffer_row, self.buffer_snapshot())?
-        {
-            let render_trailer = render_trailer.as_ref()?;
-            Some(render_trailer(buffer_row, folded, window, cx))
-        } else {
-            None
-        }
-    }
-
-    pub fn max_line_number_width(&self, style: &EditorStyle, window: &mut Window) -> Pixels {
-        let digit_count = self.widest_line_number().ilog10() + 1;
-        column_pixels(style, digit_count as usize, window)
-    }
-}
-
-pub fn column_pixels(style: &EditorStyle, column: usize, window: &Window) -> Pixels {
-    let font_size = style.text.font_size.to_pixels(window.rem_size());
-    let layout = window.text_system().shape_line(
-        SharedString::from(" ".repeat(column)),
-        font_size,
-        &[TextRun {
-            len: column,
-            font: style.text.font(),
-            color: Hsla::default(),
-            ..Default::default()
-        }],
-        None,
-    );
-
-    layout.width
-}
-
-impl Deref for EditorSnapshot {
-    type Target = DisplaySnapshot;
-
-    fn deref(&self) -> &Self::Target {
-        &self.display_snapshot
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum EditorEvent {
-    InputIgnored {
-        text: Arc<str>,
-    },
-    InputHandled {
-        utf16_range_to_replace: Option<Range<isize>>,
-        text: Arc<str>,
-    },
-    ExcerptsAdded {
-        buffer: Entity<Buffer>,
-        predecessor: ExcerptId,
-        excerpts: Vec<(ExcerptId, ExcerptRange<language::Anchor>)>,
-    },
-    ExcerptsRemoved {
-        ids: Vec<ExcerptId>,
-        removed_buffer_ids: Vec<BufferId>,
-    },
-    BufferFoldToggled {
-        ids: Vec<ExcerptId>,
-        folded: bool,
-    },
-    ExcerptsEdited {
-        ids: Vec<ExcerptId>,
-    },
-    ExcerptsExpanded {
-        ids: Vec<ExcerptId>,
-    },
-    BufferEdited,
-    Edited {
-        transaction_id: clock::Lamport,
-    },
-    Reparsed(BufferId),
-    Focused,
-    FocusedIn,
-    Blurred,
-    DirtyChanged,
-    Saved,
-    TitleChanged,
-    SelectionsChanged {
-        local: bool,
-    },
-    ScrollPositionChanged {
-        local: bool,
-        autoscroll: bool,
-    },
-    TransactionUndone {
-        transaction_id: clock::Lamport,
-    },
-    TransactionBegun {
-        transaction_id: clock::Lamport,
-    },
-    CursorShapeChanged,
-    BreadcrumbsChanged,
-    PushedToNavHistory {
-        anchor: Anchor,
-        is_deactivate: bool,
-    },
-}
-
-impl EventEmitter<EditorEvent> for Editor {}
-
-impl Focusable for Editor {
-    fn focus_handle(&self, _cx: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl Render for Editor {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        EditorElement::new(&cx.entity(), self.create_style(cx))
-    }
-}
-
-impl EntityInputHandler for Editor {
-    fn text_for_range(
-        &mut self,
-        range_utf16: Range<usize>,
-        adjusted_range: &mut Option<Range<usize>>,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<String> {
-        let snapshot = self.buffer.read(cx).read(cx);
-        let start = snapshot.clip_offset_utf16(
-            MultiBufferOffsetUtf16(OffsetUtf16(range_utf16.start)),
-            Bias::Left,
-        );
-        let end = snapshot.clip_offset_utf16(
-            MultiBufferOffsetUtf16(OffsetUtf16(range_utf16.end)),
-            Bias::Right,
-        );
-        if (start.0.0..end.0.0) != range_utf16 {
-            adjusted_range.replace(start.0.0..end.0.0);
-        }
-        Some(snapshot.text_for_range(start..end).collect())
-    }
-
-    fn selected_text_range(
-        &mut self,
-        ignore_disabled_input: bool,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<UTF16Selection> {
-        // Prevent the IME menu from appearing when holding down an alphabetic key
-        // while input is disabled.
-        if !ignore_disabled_input && !self.input_enabled {
-            return None;
-        }
-
-        let selection = self
-            .selections
-            .newest::<MultiBufferOffsetUtf16>(&self.display_snapshot(cx));
-        let range = selection.range();
-
-        Some(UTF16Selection {
-            range: range.start.0.0..range.end.0.0,
-            reversed: selection.reversed,
-        })
-    }
-
-    fn marked_text_range(&self, _: &mut Window, cx: &mut Context<Self>) -> Option<Range<usize>> {
-        let snapshot = self.buffer.read(cx).read(cx);
-        let range = self.text_highlights::<InputComposition>(cx)?.1.first()?;
-        Some(range.start.to_offset_utf16(&snapshot).0.0..range.end.to_offset_utf16(&snapshot).0.0)
-    }
-
-    fn unmark_text(&mut self, _: &mut Window, cx: &mut Context<Self>) {
-        self.clear_highlights::<InputComposition>(cx);
-        self.ime_transaction.take();
-    }
-
-    fn replace_text_in_range(
-        &mut self,
-        range_utf16: Option<Range<usize>>,
-        text: &str,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if !self.input_enabled {
-            cx.emit(EditorEvent::InputIgnored { text: text.into() });
-            return;
-        }
-
-        self.transact(window, cx, |this, window, cx| {
-            let new_selected_ranges = if let Some(range_utf16) = range_utf16 {
-                let range_utf16 = MultiBufferOffsetUtf16(OffsetUtf16(range_utf16.start))
-                    ..MultiBufferOffsetUtf16(OffsetUtf16(range_utf16.end));
-                Some(this.selection_replacement_ranges(range_utf16, cx))
-            } else {
-                this.marked_text_ranges(cx)
-            };
-
-            let range_to_replace = new_selected_ranges.as_ref().and_then(|ranges_to_replace| {
-                let newest_selection_id = this.selections.newest_anchor().id;
-                this.selections
-                    .all::<MultiBufferOffsetUtf16>(&this.display_snapshot(cx))
-                    .iter()
-                    .zip(ranges_to_replace.iter())
-                    .find_map(|(selection, range)| {
-                        if selection.id == newest_selection_id {
-                            Some(
-                                (range.start.0.0 as isize - selection.head().0.0 as isize)
-                                    ..(range.end.0.0 as isize - selection.head().0.0 as isize),
-                            )
-                        } else {
-                            None
-                        }
-                    })
-            });
-
-            cx.emit(EditorEvent::InputHandled {
-                utf16_range_to_replace: range_to_replace,
-                text: text.into(),
-            });
-
-            if let Some(new_selected_ranges) = new_selected_ranges {
-                this.change_selections(SelectionEffects::no_scroll(), window, cx, |selections| {
-                    selections.select_ranges(new_selected_ranges)
-                });
-                this.backspace(&Default::default(), window, cx);
-            }
-
-            this.handle_input(text, window, cx);
-        });
-
-        if let Some(transaction) = self.ime_transaction {
-            self.buffer.update(cx, |buffer, cx| {
-                buffer.group_until_transaction(transaction, cx);
-            });
-        }
-
-        self.unmark_text(window, cx);
-    }
-
-    fn replace_and_mark_text_in_range(
-        &mut self,
-        range_utf16: Option<Range<usize>>,
-        text: &str,
-        new_selected_range_utf16: Option<Range<usize>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if !self.input_enabled {
-            return;
-        }
-
-        let transaction = self.transact(window, cx, |this, window, cx| {
-            let ranges_to_replace = if let Some(mut marked_ranges) = this.marked_text_ranges(cx) {
-                let snapshot = this.buffer.read(cx).read(cx);
-                if let Some(relative_range_utf16) = range_utf16.as_ref() {
-                    for marked_range in &mut marked_ranges {
-                        marked_range.end = marked_range.start + relative_range_utf16.end;
-                        marked_range.start += relative_range_utf16.start;
-                        marked_range.start =
-                            snapshot.clip_offset_utf16(marked_range.start, Bias::Left);
-                        marked_range.end =
-                            snapshot.clip_offset_utf16(marked_range.end, Bias::Right);
-                    }
-                }
-                Some(marked_ranges)
-            } else if let Some(range_utf16) = range_utf16 {
-                let range_utf16 = MultiBufferOffsetUtf16(OffsetUtf16(range_utf16.start))
-                    ..MultiBufferOffsetUtf16(OffsetUtf16(range_utf16.end));
-                Some(this.selection_replacement_ranges(range_utf16, cx))
-            } else {
-                None
-            };
-
-            let range_to_replace = ranges_to_replace.as_ref().and_then(|ranges_to_replace| {
-                let newest_selection_id = this.selections.newest_anchor().id;
-                this.selections
-                    .all::<MultiBufferOffsetUtf16>(&this.display_snapshot(cx))
-                    .iter()
-                    .zip(ranges_to_replace.iter())
-                    .find_map(|(selection, range)| {
-                        if selection.id == newest_selection_id {
-                            Some(
-                                (range.start.0.0 as isize - selection.head().0.0 as isize)
-                                    ..(range.end.0.0 as isize - selection.head().0.0 as isize),
-                            )
-                        } else {
-                            None
-                        }
-                    })
-            });
-
-            cx.emit(EditorEvent::InputHandled {
-                utf16_range_to_replace: range_to_replace,
-                text: text.into(),
-            });
-
-            if let Some(ranges) = ranges_to_replace {
-                this.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.select_ranges(ranges)
-                });
-            }
-
-            let marked_ranges = {
-                let snapshot = this.buffer.read(cx).read(cx);
-                this.selections
-                    .disjoint_anchors_arc()
-                    .iter()
-                    .map(|selection| {
-                        selection.start.bias_left(&snapshot)..selection.end.bias_right(&snapshot)
-                    })
-                    .collect::<Vec<_>>()
-            };
-
-            if text.is_empty() {
-                this.unmark_text(window, cx);
-            } else {
-                this.highlight_text::<InputComposition>(
-                    marked_ranges.clone(),
-                    HighlightStyle {
-                        underline: Some(UnderlineStyle {
-                            thickness: px(1.),
-                            color: None,
-                            wavy: false,
-                        }),
-                        ..Default::default()
-                    },
-                    cx,
-                );
-            }
-
-            // Disable auto-closing when composing text (i.e. typing a `"` on a Brazilian keyboard)
-            let use_autoclose = this.use_autoclose;
-            let use_auto_surround = this.use_auto_surround;
-            this.set_use_autoclose(false);
-            this.set_use_auto_surround(false);
-            this.handle_input(text, window, cx);
-            this.set_use_autoclose(use_autoclose);
-            this.set_use_auto_surround(use_auto_surround);
-
-            if let Some(new_selected_range) = new_selected_range_utf16 {
-                let snapshot = this.buffer.read(cx).read(cx);
-                let new_selected_ranges = marked_ranges
-                    .into_iter()
-                    .map(|marked_range| {
-                        let insertion_start = marked_range.start.to_offset_utf16(&snapshot).0;
-                        let new_start = MultiBufferOffsetUtf16(OffsetUtf16(
-                            insertion_start.0 + new_selected_range.start,
-                        ));
-                        let new_end = MultiBufferOffsetUtf16(OffsetUtf16(
-                            insertion_start.0 + new_selected_range.end,
-                        ));
-                        snapshot.clip_offset_utf16(new_start, Bias::Left)
-                            ..snapshot.clip_offset_utf16(new_end, Bias::Right)
-                    })
-                    .collect::<Vec<_>>();
-
-                drop(snapshot);
-                this.change_selections(SelectionEffects::no_scroll(), window, cx, |selections| {
-                    selections.select_ranges(new_selected_ranges)
-                });
-            }
-        });
-
-        self.ime_transaction = self.ime_transaction.or(transaction);
-        if let Some(transaction) = self.ime_transaction {
-            self.buffer.update(cx, |buffer, cx| {
-                buffer.group_until_transaction(transaction, cx);
-            });
-        }
-
-        if self.text_highlights::<InputComposition>(cx).is_none() {
-            self.ime_transaction.take();
-        }
-    }
-
-    fn bounds_for_range(
-        &mut self,
-        range_utf16: Range<usize>,
-        element_bounds: gpui::Bounds<Pixels>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<gpui::Bounds<Pixels>> {
-        let text_layout_details = self.text_layout_details(window);
-        let CharacterDimensions {
-            em_width,
-            em_advance,
-            line_height,
-        } = self.character_dimensions(window);
-
-        let snapshot = self.snapshot(window, cx);
-        let scroll_position = snapshot.scroll_position();
-        let scroll_left = scroll_position.x * ScrollOffset::from(em_advance);
-
-        let start =
-            MultiBufferOffsetUtf16(OffsetUtf16(range_utf16.start)).to_display_point(&snapshot);
-        let x = Pixels::from(
-            ScrollOffset::from(
-                snapshot.x_for_display_point(start, &text_layout_details)
-                    + self.gutter_dimensions.full_width(),
-            ) - scroll_left,
-        );
-        let y = line_height * (start.row().as_f64() - scroll_position.y) as f32;
-
-        Some(Bounds {
-            origin: element_bounds.origin + point(x, y),
-            size: size(em_width, line_height),
-        })
-    }
-
-    fn character_index_for_point(
-        &mut self,
-        point: gpui::Point<Pixels>,
-        _window: &mut Window,
-        _cx: &mut Context<Self>,
-    ) -> Option<usize> {
-        let position_map = self.last_position_map.as_ref()?;
-        if !position_map.text_hitbox.contains(&point) {
-            return None;
-        }
-        let display_point = position_map.point_for_position(point).previous_valid;
-        let anchor = position_map
-            .snapshot
-            .display_point_to_anchor(display_point, Bias::Left);
-        let utf16_offset = anchor.to_offset_utf16(&position_map.snapshot.buffer_snapshot());
-        Some(utf16_offset.0.0)
-    }
-
-    fn accepts_text_input(&self, _window: &mut Window, _cx: &mut Context<Self>) -> bool {
-        self.input_enabled
-    }
-}
-
-trait SelectionExt {
-    fn display_range(&self, map: &DisplaySnapshot) -> Range<DisplayPoint>;
-    fn spanned_rows(
-        &self,
-        include_end_if_at_line_start: bool,
-        map: &DisplaySnapshot,
-    ) -> Range<MultiBufferRow>;
-}
-
-impl<T: ToPoint + ToOffset> SelectionExt for Selection<T> {
-    fn display_range(&self, map: &DisplaySnapshot) -> Range<DisplayPoint> {
-        let start = self
-            .start
-            .to_point(map.buffer_snapshot())
-            .to_display_point(map);
-        let end = self
-            .end
-            .to_point(map.buffer_snapshot())
-            .to_display_point(map);
-        if self.reversed {
-            end..start
-        } else {
-            start..end
-        }
-    }
-
-    fn spanned_rows(
-        &self,
-        include_end_if_at_line_start: bool,
-        map: &DisplaySnapshot,
-    ) -> Range<MultiBufferRow> {
-        let start = self.start.to_point(map.buffer_snapshot());
-        let mut end = self.end.to_point(map.buffer_snapshot());
-        if !include_end_if_at_line_start && start.row != end.row && end.column == 0 {
-            end.row -= 1;
-        }
-
-        let buffer_start = map.prev_line_boundary(start).0;
-        let buffer_end = map.next_line_boundary(end).0;
-        MultiBufferRow(buffer_start.row)..MultiBufferRow(buffer_end.row + 1)
-    }
-}
-
-impl<T: InvalidationRegion> InvalidationStack<T> {
-    fn invalidate<S>(&mut self, selections: &[Selection<S>], buffer: &MultiBufferSnapshot)
-    where
-        S: Clone + ToOffset,
-    {
-        while let Some(region) = self.last() {
-            let all_selections_inside_invalidation_ranges =
-                if selections.len() == region.ranges().len() {
-                    selections
-                        .iter()
-                        .zip(region.ranges().iter().map(|r| r.to_offset(buffer)))
-                        .all(|(selection, invalidation_range)| {
-                            let head = selection.head().to_offset(buffer);
-                            invalidation_range.start <= head && invalidation_range.end >= head
-                        })
-                } else {
-                    false
-                };
-
-            if all_selections_inside_invalidation_ranges {
-                break;
-            } else {
-                self.pop();
-            }
-        }
-    }
-}
-
-impl<T> Default for InvalidationStack<T> {
-    fn default() -> Self {
-        Self(Default::default())
-    }
-}
-
-impl<T> Deref for InvalidationStack<T> {
-    type Target = Vec<T>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl<T> DerefMut for InvalidationStack<T> {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.0
-    }
-}
-
-impl InvalidationRegion for SnippetState {
-    fn ranges(&self) -> &[Range<Anchor>] {
-        &self.ranges[self.active_index]
-    }
-}
-
-fn edit_prediction_edit_text(
-    current_snapshot: &BufferSnapshot,
-    edits: &[(Range<Anchor>, impl AsRef<str>)],
-    edit_preview: &EditPreview,
-    include_deletions: bool,
-    cx: &App,
-) -> HighlightedText {
-    let edits = edits
-        .iter()
-        .map(|(anchor, text)| (anchor.start.text_anchor..anchor.end.text_anchor, text))
-        .collect::<Vec<_>>();
-
-    edit_preview.highlight_edits(current_snapshot, &edits, include_deletions, cx)
-}
-
-fn edit_prediction_fallback_text(edits: &[(Range<Anchor>, Arc<str>)], cx: &App) -> HighlightedText {
-    // Fallback for providers that don't provide edit_preview (like Copilot/Supermaven)
-    // Just show the raw edit text with basic styling
-    let mut text = String::new();
-    let mut highlights = Vec::new();
-
-    let insertion_highlight_style = HighlightStyle {
-        color: Some(cx.theme().colors().text),
-        ..Default::default()
-    };
-
-    for (_, edit_text) in edits {
-        let start_offset = text.len();
-        text.push_str(edit_text);
-        let end_offset = text.len();
-
-        if start_offset < end_offset {
-            highlights.push((start_offset..end_offset, insertion_highlight_style));
-        }
-    }
-
-    HighlightedText {
-        text: text.into(),
-        highlights,
-    }
-}
-
-pub fn diagnostic_style(severity: lsp::DiagnosticSeverity, colors: &StatusColors) -> Hsla {
-    match severity {
-        lsp::DiagnosticSeverity::ERROR => colors.error,
-        lsp::DiagnosticSeverity::WARNING => colors.warning,
-        lsp::DiagnosticSeverity::INFORMATION => colors.info,
-        lsp::DiagnosticSeverity::HINT => colors.info,
-        _ => colors.ignored,
-    }
-}
-
-pub fn styled_runs_for_code_label<'a>(
-    label: &'a CodeLabel,
-    syntax_theme: &'a theme::SyntaxTheme,
-    local_player: &'a theme::PlayerColor,
-) -> impl 'a + Iterator<Item = (Range<usize>, HighlightStyle)> {
-    let fade_out = HighlightStyle {
-        fade_out: Some(0.35),
-        ..Default::default()
-    };
-
-    let mut prev_end = label.filter_range.end;
-    label
-        .runs
-        .iter()
-        .enumerate()
-        .flat_map(move |(ix, (range, highlight_id))| {
-            let style = if *highlight_id == language::HighlightId::TABSTOP_INSERT_ID {
-                HighlightStyle {
-                    color: Some(local_player.cursor),
-                    ..Default::default()
-                }
-            } else if *highlight_id == language::HighlightId::TABSTOP_REPLACE_ID {
-                HighlightStyle {
-                    background_color: Some(local_player.selection),
-                    ..Default::default()
-                }
-            } else if let Some(style) = highlight_id.style(syntax_theme) {
-                style
-            } else {
-                return Default::default();
-            };
-            let muted_style = style.highlight(fade_out);
-
-            let mut runs = SmallVec::<[(Range<usize>, HighlightStyle); 3]>::new();
-            if range.start >= label.filter_range.end {
-                if range.start > prev_end {
-                    runs.push((prev_end..range.start, fade_out));
-                }
-                runs.push((range.clone(), muted_style));
-            } else if range.end <= label.filter_range.end {
-                runs.push((range.clone(), style));
-            } else {
-                runs.push((range.start..label.filter_range.end, style));
-                runs.push((label.filter_range.end..range.end, muted_style));
-            }
-            prev_end = cmp::max(prev_end, range.end);
-
-            if ix + 1 == label.runs.len() && label.text.len() > prev_end {
-                runs.push((prev_end..label.text.len(), fade_out));
-            }
-
-            runs
-        })
-}
-
-pub(crate) fn split_words(text: &str) -> impl std::iter::Iterator<Item = &str> + '_ {
-    let mut prev_index = 0;
-    let mut prev_codepoint: Option<char> = None;
-    text.char_indices()
-        .chain([(text.len(), '\0')])
-        .filter_map(move |(index, codepoint)| {
-            let prev_codepoint = prev_codepoint.replace(codepoint)?;
-            let is_boundary = index == text.len()
-                || !prev_codepoint.is_uppercase() && codepoint.is_uppercase()
-                || !prev_codepoint.is_alphanumeric() && codepoint.is_alphanumeric();
-            if is_boundary {
-                let chunk = &text[prev_index..index];
-                prev_index = index;
-                Some(chunk)
-            } else {
-                None
-            }
-        })
-}
-
-/// Given a string of text immediately before the cursor, iterates over possible
-/// strings a snippet could match to. More precisely: returns an iterator over
-/// suffixes of `text` created by splitting at word boundaries (before & after
-/// every non-word character).
-///
-/// Shorter suffixes are returned first.
-pub(crate) fn snippet_candidate_suffixes(
-    text: &str,
-    is_word_char: impl Fn(char) -> bool,
-) -> impl std::iter::Iterator<Item = &str> {
-    let mut prev_index = text.len();
-    let mut prev_codepoint = None;
-    text.char_indices()
-        .rev()
-        .chain([(0, '\0')])
-        .filter_map(move |(index, codepoint)| {
-            let prev_index = std::mem::replace(&mut prev_index, index);
-            let prev_codepoint = prev_codepoint.replace(codepoint)?;
-            if is_word_char(prev_codepoint) && is_word_char(codepoint) {
-                None
-            } else {
-                let chunk = &text[prev_index..]; // go to end of string
-                Some(chunk)
-            }
-        })
-}
-
-pub trait RangeToAnchorExt: Sized {
-    fn to_anchors(self, snapshot: &MultiBufferSnapshot) -> Range<Anchor>;
-
-    fn to_display_points(self, snapshot: &EditorSnapshot) -> Range<DisplayPoint> {
-        let anchor_range = self.to_anchors(&snapshot.buffer_snapshot());
-        anchor_range.start.to_display_point(snapshot)..anchor_range.end.to_display_point(snapshot)
-    }
-}
-
-impl<T: ToOffset> RangeToAnchorExt for Range<T> {
-    fn to_anchors(self, snapshot: &MultiBufferSnapshot) -> Range<Anchor> {
-        let start_offset = self.start.to_offset(snapshot);
-        let end_offset = self.end.to_offset(snapshot);
-        if start_offset == end_offset {
-            snapshot.anchor_before(start_offset)..snapshot.anchor_before(end_offset)
-        } else {
-            snapshot.anchor_after(self.start)..snapshot.anchor_before(self.end)
-        }
-    }
-}
-
-pub trait RowExt {
-    fn as_f64(&self) -> f64;
-
-    fn next_row(&self) -> Self;
-
-    fn previous_row(&self) -> Self;
-
-    fn minus(&self, other: Self) -> u32;
-}
-
-impl RowExt for DisplayRow {
-    fn as_f64(&self) -> f64 {
-        self.0 as _
-    }
-
-    fn next_row(&self) -> Self {
-        Self(self.0 + 1)
-    }
-
-    fn previous_row(&self) -> Self {
-        Self(self.0.saturating_sub(1))
-    }
-
-    fn minus(&self, other: Self) -> u32 {
-        self.0 - other.0
-    }
-}
-
-impl RowExt for MultiBufferRow {
-    fn as_f64(&self) -> f64 {
-        self.0 as _
-    }
-
-    fn next_row(&self) -> Self {
-        Self(self.0 + 1)
-    }
-
-    fn previous_row(&self) -> Self {
-        Self(self.0.saturating_sub(1))
-    }
-
-    fn minus(&self, other: Self) -> u32 {
-        self.0 - other.0
-    }
-}
-
-trait RowRangeExt {
-    type Row;
-
-    fn len(&self) -> usize;
-
-    fn iter_rows(&self) -> impl DoubleEndedIterator<Item = Self::Row>;
-}
-
-impl RowRangeExt for Range<MultiBufferRow> {
-    type Row = MultiBufferRow;
-
-    fn len(&self) -> usize {
-        (self.end.0 - self.start.0) as usize
-    }
-
-    fn iter_rows(&self) -> impl DoubleEndedIterator<Item = MultiBufferRow> {
-        (self.start.0..self.end.0).map(MultiBufferRow)
-    }
-}
-
-impl RowRangeExt for Range<DisplayRow> {
-    type Row = DisplayRow;
-
-    fn len(&self) -> usize {
-        (self.end.0 - self.start.0) as usize
-    }
-
-    fn iter_rows(&self) -> impl DoubleEndedIterator<Item = DisplayRow> {
-        (self.start.0..self.end.0).map(DisplayRow)
-    }
-}
-
-/// If select range has more than one line, we
-/// just point the cursor to range.start.
-fn collapse_multiline_range(range: Range<Point>) -> Range<Point> {
-    if range.start.row == range.end.row {
-        range
-    } else {
-        range.start..range.start
-    }
-}
-pub struct KillRing(ClipboardItem);
-impl Global for KillRing {}
-
-const UPDATE_DEBOUNCE: Duration = Duration::from_millis(50);
-
-enum BreakpointPromptEditAction {
-    Log,
-    Condition,
-    HitCondition,
-}
-
-struct BreakpointPromptEditor {
-    pub(crate) prompt: Entity<Editor>,
-    editor: WeakEntity<Editor>,
-    breakpoint_anchor: Anchor,
-    breakpoint: Breakpoint,
-    edit_action: BreakpointPromptEditAction,
-    block_ids: HashSet<CustomBlockId>,
-    editor_margins: Arc<Mutex<EditorMargins>>,
-    _subscriptions: Vec<Subscription>,
-}
-
-impl BreakpointPromptEditor {
-    const MAX_LINES: u8 = 4;
-
-    fn new(
-        editor: WeakEntity<Editor>,
-        breakpoint_anchor: Anchor,
-        breakpoint: Breakpoint,
-        edit_action: BreakpointPromptEditAction,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let base_text = match edit_action {
-            BreakpointPromptEditAction::Log => breakpoint.message.as_ref(),
-            BreakpointPromptEditAction::Condition => breakpoint.condition.as_ref(),
-            BreakpointPromptEditAction::HitCondition => breakpoint.hit_condition.as_ref(),
-        }
-        .map(|msg| msg.to_string())
-        .unwrap_or_default();
-
-        let buffer = cx.new(|cx| Buffer::local(base_text, cx));
-        let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-
-        let prompt = cx.new(|cx| {
-            let mut prompt = Editor::new(
-                EditorMode::AutoHeight {
-                    min_lines: 1,
-                    max_lines: Some(Self::MAX_LINES as usize),
-                },
-                buffer,
-                None,
-                window,
-                cx,
-            );
-            prompt.set_soft_wrap_mode(language::language_settings::SoftWrap::EditorWidth, cx);
-            prompt.set_show_cursor_when_unfocused(false, cx);
-            prompt.set_placeholder_text(
-                match edit_action {
-                    BreakpointPromptEditAction::Log => "Message to log when a breakpoint is hit. Expressions within {} are interpolated.",
-                    BreakpointPromptEditAction::Condition => "Condition when a breakpoint is hit. Expressions within {} are interpolated.",
-                    BreakpointPromptEditAction::HitCondition => "How many breakpoint hits to ignore",
-                },
-                window,
-                cx,
-            );
-
-            prompt
-        });
-
-        Self {
-            prompt,
-            editor,
-            breakpoint_anchor,
-            breakpoint,
-            edit_action,
-            editor_margins: Arc::new(Mutex::new(EditorMargins::default())),
-            block_ids: Default::default(),
-            _subscriptions: vec![],
-        }
-    }
-
-    pub(crate) fn add_block_ids(&mut self, block_ids: Vec<CustomBlockId>) {
-        self.block_ids.extend(block_ids)
-    }
-
-    fn confirm(&mut self, _: &menu::Confirm, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(editor) = self.editor.upgrade() {
-            let message = self
-                .prompt
-                .read(cx)
-                .buffer
-                .read(cx)
-                .as_singleton()
-                .expect("A multi buffer in breakpoint prompt isn't possible")
-                .read(cx)
-                .as_rope()
-                .to_string();
-
-            editor.update(cx, |editor, cx| {
-                editor.edit_breakpoint_at_anchor(
-                    self.breakpoint_anchor,
-                    self.breakpoint.clone(),
-                    match self.edit_action {
-                        BreakpointPromptEditAction::Log => {
-                            BreakpointEditAction::EditLogMessage(message.into())
-                        }
-                        BreakpointPromptEditAction::Condition => {
-                            BreakpointEditAction::EditCondition(message.into())
-                        }
-                        BreakpointPromptEditAction::HitCondition => {
-                            BreakpointEditAction::EditHitCondition(message.into())
-                        }
-                    },
-                    cx,
-                );
-
-                editor.remove_blocks(self.block_ids.clone(), None, cx);
-                cx.focus_self(window);
-            });
-        }
-    }
-
-    fn cancel(&mut self, _: &menu::Cancel, window: &mut Window, cx: &mut Context<Self>) {
-        self.editor
-            .update(cx, |editor, cx| {
-                editor.remove_blocks(self.block_ids.clone(), None, cx);
-                window.focus(&editor.focus_handle);
-            })
-            .log_err();
-    }
-
-    fn render_prompt_editor(&self, cx: &mut Context<Self>) -> impl IntoElement {
-        let settings = ThemeSettings::get_global(cx);
-        let text_style = TextStyle {
-            color: if self.prompt.read(cx).read_only(cx) {
-                cx.theme().colors().text_disabled
-            } else {
-                cx.theme().colors().text
-            },
-            font_family: settings.buffer_font.family.clone(),
-            font_fallbacks: settings.buffer_font.fallbacks.clone(),
-            font_size: settings.buffer_font_size(cx).into(),
-            font_weight: settings.buffer_font.weight,
-            line_height: relative(settings.buffer_line_height.value()),
-            ..Default::default()
-        };
-        EditorElement::new(
-            &self.prompt,
-            EditorStyle {
-                background: cx.theme().colors().editor_background,
-                local_player: cx.theme().players().local(),
-                text: text_style,
-                ..Default::default()
-            },
-        )
-    }
-}
-
-impl Render for BreakpointPromptEditor {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let editor_margins = *self.editor_margins.lock();
-        let gutter_dimensions = editor_margins.gutter;
-        h_flex()
-            .key_context("Editor")
-            .bg(cx.theme().colors().editor_background)
-            .border_y_1()
-            .border_color(cx.theme().status().info_border)
-            .size_full()
-            .py(window.line_height() / 2.5)
-            .on_action(cx.listener(Self::confirm))
-            .on_action(cx.listener(Self::cancel))
-            .child(h_flex().w(gutter_dimensions.full_width() + (gutter_dimensions.margin / 2.0)))
-            .child(div().flex_1().child(self.render_prompt_editor(cx)))
-    }
-}
-
-impl Focusable for BreakpointPromptEditor {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        self.prompt.focus_handle(cx)
-    }
-}
-
-fn all_edits_insertions_or_deletions(
-    edits: &Vec<(Range<Anchor>, Arc<str>)>,
-    snapshot: &MultiBufferSnapshot,
-) -> bool {
-    let mut all_insertions = true;
-    let mut all_deletions = true;
-
-    for (range, new_text) in edits.iter() {
-        let range_is_empty = range.to_offset(snapshot).is_empty();
-        let text_is_empty = new_text.is_empty();
-
-        if range_is_empty != text_is_empty {
-            if range_is_empty {
-                all_deletions = false;
-            } else {
-                all_insertions = false;
-            }
-        } else {
-            return false;
-        }
-
-        if !all_insertions && !all_deletions {
-            return false;
-        }
-    }
-    all_insertions || all_deletions
-}
-
-struct MissingEditPredictionKeybindingTooltip;
-
-impl Render for MissingEditPredictionKeybindingTooltip {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        ui::tooltip_container(cx, |container, cx| {
-            container
-                .flex_shrink_0()
-                .max_w_80()
-                .min_h(rems_from_px(124.))
-                .justify_between()
-                .child(
-                    v_flex()
-                        .flex_1()
-                        .text_ui_sm(cx)
-                        .child(Label::new("Conflict with Accept Keybinding"))
-                        .child("Your keymap currently overrides the default accept keybinding. To continue, assign one keybinding for the `editor::AcceptEditPrediction` action.")
-                )
-                .child(
-                    h_flex()
-                        .pb_1()
-                        .gap_1()
-                        .items_end()
-                        .w_full()
-                        .child(Button::new("open-keymap", "Assign Keybinding").size(ButtonSize::Compact).on_click(|_ev, window, cx| {
-                            window.dispatch_action(zed_actions::OpenKeymapFile.boxed_clone(), cx)
-                        }))
-                        .child(Button::new("see-docs", "See Docs").size(ButtonSize::Compact).on_click(|_ev, _window, cx| {
-                            cx.open_url("https://zed.dev/docs/completions#edit-predictions-missing-keybinding");
-                        })),
-                )
-        })
-    }
-}
-
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub struct LineHighlight {
-    pub background: Background,
-    pub border: Option<gpui::Hsla>,
-    pub include_gutter: bool,
-    pub type_id: Option<TypeId>,
-}
-
-struct LineManipulationResult {
-    pub new_text: String,
-    pub line_count_before: usize,
-    pub line_count_after: usize,
-}
-
-fn render_diff_hunk_controls(
-    row: u32,
-    status: &DiffHunkStatus,
-    hunk_range: Range<Anchor>,
-    is_created_file: bool,
-    line_height: Pixels,
-    editor: &Entity<Editor>,
-    _window: &mut Window,
-    cx: &mut App,
-) -> AnyElement {
-    h_flex()
-        .h(line_height)
-        .mr_1()
-        .gap_1()
-        .px_0p5()
-        .pb_1()
-        .border_x_1()
-        .border_b_1()
-        .border_color(cx.theme().colors().border_variant)
-        .rounded_b_lg()
-        .bg(cx.theme().colors().editor_background)
-        .gap_1()
-        .block_mouse_except_scroll()
-        .shadow_md()
-        .child(if status.has_secondary_hunk() {
-            Button::new(("stage", row as u64), "Stage")
-                .alpha(if status.is_pending() { 0.66 } else { 1.0 })
-                .tooltip({
-                    let focus_handle = editor.focus_handle(cx);
-                    move |_window, cx| {
-                        Tooltip::for_action_in(
-                            "Stage Hunk",
-                            &::git::ToggleStaged,
-                            &focus_handle,
-                            cx,
-                        )
-                    }
-                })
-                .on_click({
-                    let editor = editor.clone();
-                    move |_event, _window, cx| {
-                        editor.update(cx, |editor, cx| {
-                            editor.stage_or_unstage_diff_hunks(
-                                true,
-                                vec![hunk_range.start..hunk_range.start],
-                                cx,
-                            );
-                        });
-                    }
-                })
-        } else {
-            Button::new(("unstage", row as u64), "Unstage")
-                .alpha(if status.is_pending() { 0.66 } else { 1.0 })
-                .tooltip({
-                    let focus_handle = editor.focus_handle(cx);
-                    move |_window, cx| {
-                        Tooltip::for_action_in(
-                            "Unstage Hunk",
-                            &::git::ToggleStaged,
-                            &focus_handle,
-                            cx,
-                        )
-                    }
-                })
-                .on_click({
-                    let editor = editor.clone();
-                    move |_event, _window, cx| {
-                        editor.update(cx, |editor, cx| {
-                            editor.stage_or_unstage_diff_hunks(
-                                false,
-                                vec![hunk_range.start..hunk_range.start],
-                                cx,
-                            );
-                        });
-                    }
-                })
-        })
-        .child(
-            Button::new(("restore", row as u64), "Restore")
-                .tooltip({
-                    let focus_handle = editor.focus_handle(cx);
-                    move |_window, cx| {
-                        Tooltip::for_action_in("Restore Hunk", &::git::Restore, &focus_handle, cx)
-                    }
-                })
-                .on_click({
-                    let editor = editor.clone();
-                    move |_event, window, cx| {
-                        editor.update(cx, |editor, cx| {
-                            let snapshot = editor.snapshot(window, cx);
-                            let point = hunk_range.start.to_point(&snapshot.buffer_snapshot());
-                            editor.restore_hunks_in_ranges(vec![point..point], window, cx);
-                        });
-                    }
-                })
-                .disabled(is_created_file),
-        )
-        .when(
-            !editor.read(cx).buffer().read(cx).all_diff_hunks_expanded(),
-            |el| {
-                el.child(
-                    IconButton::new(("next-hunk", row as u64), IconName::ArrowDown)
-                        .shape(IconButtonShape::Square)
-                        .icon_size(IconSize::Small)
-                        // .disabled(!has_multiple_hunks)
-                        .tooltip({
-                            let focus_handle = editor.focus_handle(cx);
-                            move |_window, cx| {
-                                Tooltip::for_action_in("Next Hunk", &GoToHunk, &focus_handle, cx)
-                            }
-                        })
-                        .on_click({
-                            let editor = editor.clone();
-                            move |_event, window, cx| {
-                                editor.update(cx, |editor, cx| {
-                                    let snapshot = editor.snapshot(window, cx);
-                                    let position =
-                                        hunk_range.end.to_point(&snapshot.buffer_snapshot());
-                                    editor.go_to_hunk_before_or_after_position(
-                                        &snapshot,
-                                        position,
-                                        Direction::Next,
-                                        window,
-                                        cx,
-                                    );
-                                    editor.expand_selected_diff_hunks(cx);
-                                });
-                            }
-                        }),
-                )
-                .child(
-                    IconButton::new(("prev-hunk", row as u64), IconName::ArrowUp)
-                        .shape(IconButtonShape::Square)
-                        .icon_size(IconSize::Small)
-                        // .disabled(!has_multiple_hunks)
-                        .tooltip({
-                            let focus_handle = editor.focus_handle(cx);
-                            move |_window, cx| {
-                                Tooltip::for_action_in(
-                                    "Previous Hunk",
-                                    &GoToPreviousHunk,
-                                    &focus_handle,
-                                    cx,
-                                )
-                            }
-                        })
-                        .on_click({
-                            let editor = editor.clone();
-                            move |_event, window, cx| {
-                                editor.update(cx, |editor, cx| {
-                                    let snapshot = editor.snapshot(window, cx);
-                                    let point =
-                                        hunk_range.start.to_point(&snapshot.buffer_snapshot());
-                                    editor.go_to_hunk_before_or_after_position(
-                                        &snapshot,
-                                        point,
-                                        Direction::Prev,
-                                        window,
-                                        cx,
-                                    );
-                                    editor.expand_selected_diff_hunks(cx);
-                                });
-                            }
-                        }),
-                )
-            },
-        )
-        .into_any_element()
-}
-
-pub fn multibuffer_context_lines(cx: &App) -> u32 {
-    EditorSettings::try_get(cx)
-        .map(|settings| settings.excerpt_context_lines)
-        .unwrap_or(2)
-        .min(32)
-}
diff --git a/crates/editor/src/editor_settings.rs b/crates/editor/src/editor_settings.rs
deleted file mode 100644
index e1984311d4..0000000000
--- a/crates/editor/src/editor_settings.rs
+++ /dev/null
@@ -1,290 +0,0 @@
-use core::num;
-
-use gpui::App;
-use language::CursorShape;
-use project::project_settings::DiagnosticSeverity;
-pub use settings::{
-    CurrentLineHighlight, DelayMs, DisplayIn, DocumentColorsRenderMode, DoubleClickInMultibuffer,
-    GoToDefinitionFallback, HideMouseMode, MinimapThumb, MinimapThumbBorder, MultiCursorModifier,
-    ScrollBeyondLastLine, ScrollbarDiagnostics, SeedQuerySetting, ShowMinimap, SnippetSortOrder,
-};
-use settings::{RegisterSetting, RelativeLineNumbers, Settings};
-use ui::scrollbars::{ScrollbarVisibility, ShowScrollbar};
-
-/// Imports from the VSCode settings at
-/// https://code.visualstudio.com/docs/reference/default-settings
-#[derive(Clone, RegisterSetting)]
-pub struct EditorSettings {
-    pub cursor_blink: bool,
-    pub cursor_shape: Option<CursorShape>,
-    pub current_line_highlight: CurrentLineHighlight,
-    pub selection_highlight: bool,
-    pub rounded_selection: bool,
-    pub lsp_highlight_debounce: DelayMs,
-    pub hover_popover_enabled: bool,
-    pub hover_popover_delay: DelayMs,
-    pub toolbar: Toolbar,
-    pub scrollbar: Scrollbar,
-    pub minimap: Minimap,
-    pub gutter: Gutter,
-    pub scroll_beyond_last_line: ScrollBeyondLastLine,
-    pub vertical_scroll_margin: f64,
-    pub autoscroll_on_clicks: bool,
-    pub horizontal_scroll_margin: f32,
-    pub scroll_sensitivity: f32,
-    pub fast_scroll_sensitivity: f32,
-    pub sticky_scroll: StickyScroll,
-    pub relative_line_numbers: RelativeLineNumbers,
-    pub seed_search_query_from_cursor: SeedQuerySetting,
-    pub use_smartcase_search: bool,
-    pub multi_cursor_modifier: MultiCursorModifier,
-    pub redact_private_values: bool,
-    pub expand_excerpt_lines: u32,
-    pub excerpt_context_lines: u32,
-    pub middle_click_paste: bool,
-    pub double_click_in_multibuffer: DoubleClickInMultibuffer,
-    pub search_wrap: bool,
-    pub search: SearchSettings,
-    pub auto_signature_help: bool,
-    pub show_signature_help_after_edits: bool,
-    pub go_to_definition_fallback: GoToDefinitionFallback,
-    pub jupyter: Jupyter,
-    pub hide_mouse: Option<HideMouseMode>,
-    pub snippet_sort_order: SnippetSortOrder,
-    pub diagnostics_max_severity: Option<DiagnosticSeverity>,
-    pub inline_code_actions: bool,
-    pub drag_and_drop_selection: DragAndDropSelection,
-    pub lsp_document_colors: DocumentColorsRenderMode,
-    pub minimum_contrast_for_highlights: f32,
-    pub completion_menu_scrollbar: ShowScrollbar,
-}
-#[derive(Debug, Clone)]
-pub struct Jupyter {
-    /// Whether the Jupyter feature is enabled.
-    ///
-    /// Default: true
-    pub enabled: bool,
-}
-
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub struct StickyScroll {
-    pub enabled: bool,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct Toolbar {
-    pub breadcrumbs: bool,
-    pub quick_actions: bool,
-    pub selections_menu: bool,
-    pub agent_review: bool,
-    pub code_actions: bool,
-}
-
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub struct Scrollbar {
-    pub show: ShowScrollbar,
-    pub git_diff: bool,
-    pub selected_text: bool,
-    pub selected_symbol: bool,
-    pub search_results: bool,
-    pub diagnostics: ScrollbarDiagnostics,
-    pub cursors: bool,
-    pub axes: ScrollbarAxes,
-}
-
-#[derive(Copy, Clone, Debug, PartialEq)]
-pub struct Minimap {
-    pub show: ShowMinimap,
-    pub display_in: DisplayIn,
-    pub thumb: MinimapThumb,
-    pub thumb_border: MinimapThumbBorder,
-    pub current_line_highlight: Option<CurrentLineHighlight>,
-    pub max_width_columns: num::NonZeroU32,
-}
-
-impl Minimap {
-    pub fn minimap_enabled(&self) -> bool {
-        self.show != ShowMinimap::Never
-    }
-
-    #[inline]
-    pub fn on_active_editor(&self) -> bool {
-        self.display_in == DisplayIn::ActiveEditor
-    }
-
-    pub fn with_show_override(self) -> Self {
-        Self {
-            show: ShowMinimap::Always,
-            ..self
-        }
-    }
-}
-
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub struct Gutter {
-    pub min_line_number_digits: usize,
-    pub line_numbers: bool,
-    pub runnables: bool,
-    pub breakpoints: bool,
-    pub folds: bool,
-}
-
-/// Forcefully enable or disable the scrollbar for each axis
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub struct ScrollbarAxes {
-    /// When false, forcefully disables the horizontal scrollbar. Otherwise, obey other settings.
-    ///
-    /// Default: true
-    pub horizontal: bool,
-
-    /// When false, forcefully disables the vertical scrollbar. Otherwise, obey other settings.
-    ///
-    /// Default: true
-    pub vertical: bool,
-}
-
-/// Whether to allow drag and drop text selection in buffer.
-#[derive(Copy, Clone, Default, Debug, PartialEq, Eq)]
-pub struct DragAndDropSelection {
-    /// When true, enables drag and drop text selection in buffer.
-    ///
-    /// Default: true
-    pub enabled: bool,
-
-    /// The delay in milliseconds that must elapse before drag and drop is allowed. Otherwise, a new text selection is created.
-    ///
-    /// Default: 300
-    pub delay: DelayMs,
-}
-
-/// Default options for buffer and project search items.
-#[derive(Copy, Clone, Default, Debug, PartialEq, Eq)]
-pub struct SearchSettings {
-    /// Whether to show the project search button in the status bar.
-    pub button: bool,
-    /// Whether to only match on whole words.
-    pub whole_word: bool,
-    /// Whether to match case sensitively.
-    pub case_sensitive: bool,
-    /// Whether to include gitignored files in search results.
-    pub include_ignored: bool,
-    /// Whether to interpret the search query as a regular expression.
-    pub regex: bool,
-    /// Whether to center the cursor on each search match when navigating.
-    pub center_on_match: bool,
-}
-
-impl EditorSettings {
-    pub fn jupyter_enabled(cx: &App) -> bool {
-        EditorSettings::get_global(cx).jupyter.enabled
-    }
-}
-
-impl ScrollbarVisibility for EditorSettings {
-    fn visibility(&self, _cx: &App) -> ShowScrollbar {
-        self.scrollbar.show
-    }
-}
-
-impl Settings for EditorSettings {
-    fn from_settings(content: &settings::SettingsContent) -> Self {
-        let editor = content.editor.clone();
-        let scrollbar = editor.scrollbar.unwrap();
-        let minimap = editor.minimap.unwrap();
-        let gutter = editor.gutter.unwrap();
-        let axes = scrollbar.axes.unwrap();
-        let toolbar = editor.toolbar.unwrap();
-        let search = editor.search.unwrap();
-        let drag_and_drop_selection = editor.drag_and_drop_selection.unwrap();
-        let sticky_scroll = editor.sticky_scroll.unwrap();
-        Self {
-            cursor_blink: editor.cursor_blink.unwrap(),
-            cursor_shape: editor.cursor_shape.map(Into::into),
-            current_line_highlight: editor.current_line_highlight.unwrap(),
-            selection_highlight: editor.selection_highlight.unwrap(),
-            rounded_selection: editor.rounded_selection.unwrap(),
-            lsp_highlight_debounce: editor.lsp_highlight_debounce.unwrap(),
-            hover_popover_enabled: editor.hover_popover_enabled.unwrap(),
-            hover_popover_delay: editor.hover_popover_delay.unwrap(),
-            toolbar: Toolbar {
-                breadcrumbs: toolbar.breadcrumbs.unwrap(),
-                quick_actions: toolbar.quick_actions.unwrap(),
-                selections_menu: toolbar.selections_menu.unwrap(),
-                agent_review: toolbar.agent_review.unwrap(),
-                code_actions: toolbar.code_actions.unwrap(),
-            },
-            scrollbar: Scrollbar {
-                show: scrollbar.show.map(Into::into).unwrap(),
-                git_diff: scrollbar.git_diff.unwrap(),
-                selected_text: scrollbar.selected_text.unwrap(),
-                selected_symbol: scrollbar.selected_symbol.unwrap(),
-                search_results: scrollbar.search_results.unwrap(),
-                diagnostics: scrollbar.diagnostics.unwrap(),
-                cursors: scrollbar.cursors.unwrap(),
-                axes: ScrollbarAxes {
-                    horizontal: axes.horizontal.unwrap(),
-                    vertical: axes.vertical.unwrap(),
-                },
-            },
-            minimap: Minimap {
-                show: minimap.show.unwrap(),
-                display_in: minimap.display_in.unwrap(),
-                thumb: minimap.thumb.unwrap(),
-                thumb_border: minimap.thumb_border.unwrap(),
-                current_line_highlight: minimap.current_line_highlight,
-                max_width_columns: minimap.max_width_columns.unwrap(),
-            },
-            gutter: Gutter {
-                min_line_number_digits: gutter.min_line_number_digits.unwrap(),
-                line_numbers: gutter.line_numbers.unwrap(),
-                runnables: gutter.runnables.unwrap(),
-                breakpoints: gutter.breakpoints.unwrap(),
-                folds: gutter.folds.unwrap(),
-            },
-            scroll_beyond_last_line: editor.scroll_beyond_last_line.unwrap(),
-            vertical_scroll_margin: editor.vertical_scroll_margin.unwrap() as f64,
-            autoscroll_on_clicks: editor.autoscroll_on_clicks.unwrap(),
-            horizontal_scroll_margin: editor.horizontal_scroll_margin.unwrap(),
-            scroll_sensitivity: editor.scroll_sensitivity.unwrap(),
-            fast_scroll_sensitivity: editor.fast_scroll_sensitivity.unwrap(),
-            sticky_scroll: StickyScroll {
-                enabled: sticky_scroll.enabled.unwrap(),
-            },
-            relative_line_numbers: editor.relative_line_numbers.unwrap(),
-            seed_search_query_from_cursor: editor.seed_search_query_from_cursor.unwrap(),
-            use_smartcase_search: editor.use_smartcase_search.unwrap(),
-            multi_cursor_modifier: editor.multi_cursor_modifier.unwrap(),
-            redact_private_values: editor.redact_private_values.unwrap(),
-            expand_excerpt_lines: editor.expand_excerpt_lines.unwrap(),
-            excerpt_context_lines: editor.excerpt_context_lines.unwrap(),
-            middle_click_paste: editor.middle_click_paste.unwrap(),
-            double_click_in_multibuffer: editor.double_click_in_multibuffer.unwrap(),
-            search_wrap: editor.search_wrap.unwrap(),
-            search: SearchSettings {
-                button: search.button.unwrap(),
-                whole_word: search.whole_word.unwrap(),
-                case_sensitive: search.case_sensitive.unwrap(),
-                include_ignored: search.include_ignored.unwrap(),
-                regex: search.regex.unwrap(),
-                center_on_match: search.center_on_match.unwrap(),
-            },
-            auto_signature_help: editor.auto_signature_help.unwrap(),
-            show_signature_help_after_edits: editor.show_signature_help_after_edits.unwrap(),
-            go_to_definition_fallback: editor.go_to_definition_fallback.unwrap(),
-            jupyter: Jupyter {
-                enabled: editor.jupyter.unwrap().enabled.unwrap(),
-            },
-            hide_mouse: editor.hide_mouse,
-            snippet_sort_order: editor.snippet_sort_order.unwrap(),
-            diagnostics_max_severity: editor.diagnostics_max_severity.map(Into::into),
-            inline_code_actions: editor.inline_code_actions.unwrap(),
-            drag_and_drop_selection: DragAndDropSelection {
-                enabled: drag_and_drop_selection.enabled.unwrap(),
-                delay: drag_and_drop_selection.delay.unwrap(),
-            },
-            lsp_document_colors: editor.lsp_document_colors.unwrap(),
-            minimum_contrast_for_highlights: editor.minimum_contrast_for_highlights.unwrap().0,
-            completion_menu_scrollbar: editor.completion_menu_scrollbar.map(Into::into).unwrap(),
-        }
-    }
-}
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
deleted file mode 100644
index 89131e8bc3..0000000000
--- a/crates/editor/src/editor_tests.rs
+++ /dev/null
@@ -1,29188 +0,0 @@
-use super::*;
-use crate::{
-    JoinLines,
-    code_context_menus::CodeContextMenu,
-    edit_prediction_tests::FakeEditPredictionDelegate,
-    element::StickyHeader,
-    linked_editing_ranges::LinkedEditingRanges,
-    scroll::scroll_amount::ScrollAmount,
-    test::{
-        assert_text_with_selections, build_editor,
-        editor_lsp_test_context::{EditorLspTestContext, git_commit_lang},
-        editor_test_context::EditorTestContext,
-        select_ranges,
-    },
-};
-use buffer_diff::{BufferDiff, DiffHunkSecondaryStatus, DiffHunkStatus, DiffHunkStatusKind};
-use collections::HashMap;
-use futures::{StreamExt, channel::oneshot};
-use gpui::{
-    BackgroundExecutor, DismissEvent, Rgba, TestAppContext, UpdateGlobal, VisualTestContext,
-    WindowBounds, WindowOptions, div,
-};
-use indoc::indoc;
-use language::{
-    BracketPairConfig,
-    Capability::ReadWrite,
-    DiagnosticSourceKind, FakeLspAdapter, IndentGuideSettings, LanguageConfig,
-    LanguageConfigOverride, LanguageMatcher, LanguageName, Override, Point,
-    language_settings::{
-        CompletionSettingsContent, FormatterList, LanguageSettingsContent, LspInsertMode,
-    },
-    tree_sitter_python,
-};
-use language_settings::Formatter;
-use languages::markdown_lang;
-use languages::rust_lang;
-use lsp::CompletionParams;
-use multi_buffer::{
-    IndentGuide, MultiBufferFilterMode, MultiBufferOffset, MultiBufferOffsetUtf16, PathKey,
-};
-use parking_lot::Mutex;
-use pretty_assertions::{assert_eq, assert_ne};
-use project::{
-    FakeFs,
-    debugger::breakpoint_store::{BreakpointState, SourceBreakpoint},
-    project_settings::LspSettings,
-};
-use serde_json::{self, json};
-use settings::{
-    AllLanguageSettingsContent, EditorSettingsContent, IndentGuideBackgroundColoring,
-    IndentGuideColoring, ProjectSettingsContent, SearchSettingsContent,
-};
-use std::{cell::RefCell, future::Future, rc::Rc, sync::atomic::AtomicBool, time::Instant};
-use std::{
-    iter,
-    sync::atomic::{self, AtomicUsize},
-};
-use test::build_editor_with_project;
-use text::ToPoint as _;
-use unindent::Unindent;
-use util::{
-    assert_set_eq, path,
-    rel_path::rel_path,
-    test::{TextRangeMarker, marked_text_ranges, marked_text_ranges_by, sample_text},
-    uri,
-};
-use workspace::{
-    CloseActiveItem, CloseAllItems, CloseOtherItems, MoveItemToPaneInDirection, NavigationEntry,
-    OpenOptions, ViewId,
-    invalid_item_view::InvalidItemView,
-    item::{FollowEvent, FollowableItem, Item, ItemHandle, SaveOptions},
-    register_project_item,
-};
-
-fn display_ranges(editor: &Editor, cx: &mut Context<'_, Editor>) -> Vec<Range<DisplayPoint>> {
-    editor
-        .selections
-        .display_ranges(&editor.display_snapshot(cx))
-}
-
-#[gpui::test]
-fn test_edit_events(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let buffer = cx.new(|cx| {
-        let mut buffer = language::Buffer::local("123456", cx);
-        buffer.set_group_interval(Duration::from_secs(1));
-        buffer
-    });
-
-    let events = Rc::new(RefCell::new(Vec::new()));
-    let editor1 = cx.add_window({
-        let events = events.clone();
-        |window, cx| {
-            let entity = cx.entity();
-            cx.subscribe_in(
-                &entity,
-                window,
-                move |_, _, event: &EditorEvent, _, _| match event {
-                    EditorEvent::Edited { .. } => events.borrow_mut().push(("editor1", "edited")),
-                    EditorEvent::BufferEdited => {
-                        events.borrow_mut().push(("editor1", "buffer edited"))
-                    }
-                    _ => {}
-                },
-            )
-            .detach();
-            Editor::for_buffer(buffer.clone(), None, window, cx)
-        }
-    });
-
-    let editor2 = cx.add_window({
-        let events = events.clone();
-        |window, cx| {
-            cx.subscribe_in(
-                &cx.entity(),
-                window,
-                move |_, _, event: &EditorEvent, _, _| match event {
-                    EditorEvent::Edited { .. } => events.borrow_mut().push(("editor2", "edited")),
-                    EditorEvent::BufferEdited => {
-                        events.borrow_mut().push(("editor2", "buffer edited"))
-                    }
-                    _ => {}
-                },
-            )
-            .detach();
-            Editor::for_buffer(buffer.clone(), None, window, cx)
-        }
-    });
-
-    assert_eq!(mem::take(&mut *events.borrow_mut()), []);
-
-    // Mutating editor 1 will emit an `Edited` event only for that editor.
-    _ = editor1.update(cx, |editor, window, cx| editor.insert("X", window, cx));
-    assert_eq!(
-        mem::take(&mut *events.borrow_mut()),
-        [
-            ("editor1", "edited"),
-            ("editor1", "buffer edited"),
-            ("editor2", "buffer edited"),
-        ]
-    );
-
-    // Mutating editor 2 will emit an `Edited` event only for that editor.
-    _ = editor2.update(cx, |editor, window, cx| editor.delete(&Delete, window, cx));
-    assert_eq!(
-        mem::take(&mut *events.borrow_mut()),
-        [
-            ("editor2", "edited"),
-            ("editor1", "buffer edited"),
-            ("editor2", "buffer edited"),
-        ]
-    );
-
-    // Undoing on editor 1 will emit an `Edited` event only for that editor.
-    _ = editor1.update(cx, |editor, window, cx| editor.undo(&Undo, window, cx));
-    assert_eq!(
-        mem::take(&mut *events.borrow_mut()),
-        [
-            ("editor1", "edited"),
-            ("editor1", "buffer edited"),
-            ("editor2", "buffer edited"),
-        ]
-    );
-
-    // Redoing on editor 1 will emit an `Edited` event only for that editor.
-    _ = editor1.update(cx, |editor, window, cx| editor.redo(&Redo, window, cx));
-    assert_eq!(
-        mem::take(&mut *events.borrow_mut()),
-        [
-            ("editor1", "edited"),
-            ("editor1", "buffer edited"),
-            ("editor2", "buffer edited"),
-        ]
-    );
-
-    // Undoing on editor 2 will emit an `Edited` event only for that editor.
-    _ = editor2.update(cx, |editor, window, cx| editor.undo(&Undo, window, cx));
-    assert_eq!(
-        mem::take(&mut *events.borrow_mut()),
-        [
-            ("editor2", "edited"),
-            ("editor1", "buffer edited"),
-            ("editor2", "buffer edited"),
-        ]
-    );
-
-    // Redoing on editor 2 will emit an `Edited` event only for that editor.
-    _ = editor2.update(cx, |editor, window, cx| editor.redo(&Redo, window, cx));
-    assert_eq!(
-        mem::take(&mut *events.borrow_mut()),
-        [
-            ("editor2", "edited"),
-            ("editor1", "buffer edited"),
-            ("editor2", "buffer edited"),
-        ]
-    );
-
-    // No event is emitted when the mutation is a no-op.
-    _ = editor2.update(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([MultiBufferOffset(0)..MultiBufferOffset(0)])
-        });
-
-        editor.backspace(&Backspace, window, cx);
-    });
-    assert_eq!(mem::take(&mut *events.borrow_mut()), []);
-}
-
-#[gpui::test]
-fn test_undo_redo_with_selection_restoration(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut now = Instant::now();
-    let group_interval = Duration::from_millis(1);
-    let buffer = cx.new(|cx| {
-        let mut buf = language::Buffer::local("123456", cx);
-        buf.set_group_interval(group_interval);
-        buf
-    });
-    let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-    let editor = cx.add_window(|window, cx| build_editor(buffer.clone(), window, cx));
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.start_transaction_at(now, window, cx);
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([MultiBufferOffset(2)..MultiBufferOffset(4)])
-        });
-
-        editor.insert("cd", window, cx);
-        editor.end_transaction_at(now, cx);
-        assert_eq!(editor.text(cx), "12cd56");
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            vec![MultiBufferOffset(4)..MultiBufferOffset(4)]
-        );
-
-        editor.start_transaction_at(now, window, cx);
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([MultiBufferOffset(4)..MultiBufferOffset(5)])
-        });
-        editor.insert("e", window, cx);
-        editor.end_transaction_at(now, cx);
-        assert_eq!(editor.text(cx), "12cde6");
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            vec![MultiBufferOffset(5)..MultiBufferOffset(5)]
-        );
-
-        now += group_interval + Duration::from_millis(1);
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([MultiBufferOffset(2)..MultiBufferOffset(2)])
-        });
-
-        // Simulate an edit in another editor
-        buffer.update(cx, |buffer, cx| {
-            buffer.start_transaction_at(now, cx);
-            buffer.edit(
-                [(MultiBufferOffset(0)..MultiBufferOffset(1), "a")],
-                None,
-                cx,
-            );
-            buffer.edit(
-                [(MultiBufferOffset(1)..MultiBufferOffset(1), "b")],
-                None,
-                cx,
-            );
-            buffer.end_transaction_at(now, cx);
-        });
-
-        assert_eq!(editor.text(cx), "ab2cde6");
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            vec![MultiBufferOffset(3)..MultiBufferOffset(3)]
-        );
-
-        // Last transaction happened past the group interval in a different editor.
-        // Undo it individually and don't restore selections.
-        editor.undo(&Undo, window, cx);
-        assert_eq!(editor.text(cx), "12cde6");
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            vec![MultiBufferOffset(2)..MultiBufferOffset(2)]
-        );
-
-        // First two transactions happened within the group interval in this editor.
-        // Undo them together and restore selections.
-        editor.undo(&Undo, window, cx);
-        editor.undo(&Undo, window, cx); // Undo stack is empty here, so this is a no-op.
-        assert_eq!(editor.text(cx), "123456");
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            vec![MultiBufferOffset(0)..MultiBufferOffset(0)]
-        );
-
-        // Redo the first two transactions together.
-        editor.redo(&Redo, window, cx);
-        assert_eq!(editor.text(cx), "12cde6");
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            vec![MultiBufferOffset(5)..MultiBufferOffset(5)]
-        );
-
-        // Redo the last transaction on its own.
-        editor.redo(&Redo, window, cx);
-        assert_eq!(editor.text(cx), "ab2cde6");
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            vec![MultiBufferOffset(6)..MultiBufferOffset(6)]
-        );
-
-        // Test empty transactions.
-        editor.start_transaction_at(now, window, cx);
-        editor.end_transaction_at(now, cx);
-        editor.undo(&Undo, window, cx);
-        assert_eq!(editor.text(cx), "12cde6");
-    });
-}
-
-#[gpui::test]
-fn test_ime_composition(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let buffer = cx.new(|cx| {
-        let mut buffer = language::Buffer::local("abcde", cx);
-        // Ensure automatic grouping doesn't occur.
-        buffer.set_group_interval(Duration::ZERO);
-        buffer
-    });
-
-    let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-    cx.add_window(|window, cx| {
-        let mut editor = build_editor(buffer.clone(), window, cx);
-
-        // Start a new IME composition.
-        editor.replace_and_mark_text_in_range(Some(0..1), "à", None, window, cx);
-        editor.replace_and_mark_text_in_range(Some(0..1), "á", None, window, cx);
-        editor.replace_and_mark_text_in_range(Some(0..1), "ä", None, window, cx);
-        assert_eq!(editor.text(cx), "äbcde");
-        assert_eq!(
-            editor.marked_text_ranges(cx),
-            Some(vec![
-                MultiBufferOffsetUtf16(OffsetUtf16(0))..MultiBufferOffsetUtf16(OffsetUtf16(1))
-            ])
-        );
-
-        // Finalize IME composition.
-        editor.replace_text_in_range(None, "ā", window, cx);
-        assert_eq!(editor.text(cx), "ābcde");
-        assert_eq!(editor.marked_text_ranges(cx), None);
-
-        // IME composition edits are grouped and are undone/redone at once.
-        editor.undo(&Default::default(), window, cx);
-        assert_eq!(editor.text(cx), "abcde");
-        assert_eq!(editor.marked_text_ranges(cx), None);
-        editor.redo(&Default::default(), window, cx);
-        assert_eq!(editor.text(cx), "ābcde");
-        assert_eq!(editor.marked_text_ranges(cx), None);
-
-        // Start a new IME composition.
-        editor.replace_and_mark_text_in_range(Some(0..1), "à", None, window, cx);
-        assert_eq!(
-            editor.marked_text_ranges(cx),
-            Some(vec![
-                MultiBufferOffsetUtf16(OffsetUtf16(0))..MultiBufferOffsetUtf16(OffsetUtf16(1))
-            ])
-        );
-
-        // Undoing during an IME composition cancels it.
-        editor.undo(&Default::default(), window, cx);
-        assert_eq!(editor.text(cx), "ābcde");
-        assert_eq!(editor.marked_text_ranges(cx), None);
-
-        // Start a new IME composition with an invalid marked range, ensuring it gets clipped.
-        editor.replace_and_mark_text_in_range(Some(4..999), "è", None, window, cx);
-        assert_eq!(editor.text(cx), "ābcdè");
-        assert_eq!(
-            editor.marked_text_ranges(cx),
-            Some(vec![
-                MultiBufferOffsetUtf16(OffsetUtf16(4))..MultiBufferOffsetUtf16(OffsetUtf16(5))
-            ])
-        );
-
-        // Finalize IME composition with an invalid replacement range, ensuring it gets clipped.
-        editor.replace_text_in_range(Some(4..999), "ę", window, cx);
-        assert_eq!(editor.text(cx), "ābcdę");
-        assert_eq!(editor.marked_text_ranges(cx), None);
-
-        // Start a new IME composition with multiple cursors.
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([
-                MultiBufferOffsetUtf16(OffsetUtf16(1))..MultiBufferOffsetUtf16(OffsetUtf16(1)),
-                MultiBufferOffsetUtf16(OffsetUtf16(3))..MultiBufferOffsetUtf16(OffsetUtf16(3)),
-                MultiBufferOffsetUtf16(OffsetUtf16(5))..MultiBufferOffsetUtf16(OffsetUtf16(5)),
-            ])
-        });
-        editor.replace_and_mark_text_in_range(Some(4..5), "XYZ", None, window, cx);
-        assert_eq!(editor.text(cx), "XYZbXYZdXYZ");
-        assert_eq!(
-            editor.marked_text_ranges(cx),
-            Some(vec![
-                MultiBufferOffsetUtf16(OffsetUtf16(0))..MultiBufferOffsetUtf16(OffsetUtf16(3)),
-                MultiBufferOffsetUtf16(OffsetUtf16(4))..MultiBufferOffsetUtf16(OffsetUtf16(7)),
-                MultiBufferOffsetUtf16(OffsetUtf16(8))..MultiBufferOffsetUtf16(OffsetUtf16(11))
-            ])
-        );
-
-        // Ensure the newly-marked range gets treated as relative to the previously-marked ranges.
-        editor.replace_and_mark_text_in_range(Some(1..2), "1", None, window, cx);
-        assert_eq!(editor.text(cx), "X1ZbX1ZdX1Z");
-        assert_eq!(
-            editor.marked_text_ranges(cx),
-            Some(vec![
-                MultiBufferOffsetUtf16(OffsetUtf16(1))..MultiBufferOffsetUtf16(OffsetUtf16(2)),
-                MultiBufferOffsetUtf16(OffsetUtf16(5))..MultiBufferOffsetUtf16(OffsetUtf16(6)),
-                MultiBufferOffsetUtf16(OffsetUtf16(9))..MultiBufferOffsetUtf16(OffsetUtf16(10))
-            ])
-        );
-
-        // Finalize IME composition with multiple cursors.
-        editor.replace_text_in_range(Some(9..10), "2", window, cx);
-        assert_eq!(editor.text(cx), "X2ZbX2ZdX2Z");
-        assert_eq!(editor.marked_text_ranges(cx), None);
-
-        editor
-    });
-}
-
-#[gpui::test]
-fn test_selection_with_mouse(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let editor = cx.add_window(|window, cx| {
-        let buffer = MultiBuffer::build_simple("aaaaaa\nbbbbbb\ncccccc\nddddddd\n", cx);
-        build_editor(buffer, window, cx)
-    });
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.begin_selection(DisplayPoint::new(DisplayRow(2), 2), false, 1, window, cx);
-    });
-    assert_eq!(
-        editor
-            .update(cx, |editor, _, cx| display_ranges(editor, cx))
-            .unwrap(),
-        [DisplayPoint::new(DisplayRow(2), 2)..DisplayPoint::new(DisplayRow(2), 2)]
-    );
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.update_selection(
-            DisplayPoint::new(DisplayRow(3), 3),
-            0,
-            gpui::Point::<f32>::default(),
-            window,
-            cx,
-        );
-    });
-
-    assert_eq!(
-        editor
-            .update(cx, |editor, _, cx| display_ranges(editor, cx))
-            .unwrap(),
-        [DisplayPoint::new(DisplayRow(2), 2)..DisplayPoint::new(DisplayRow(3), 3)]
-    );
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.update_selection(
-            DisplayPoint::new(DisplayRow(1), 1),
-            0,
-            gpui::Point::<f32>::default(),
-            window,
-            cx,
-        );
-    });
-
-    assert_eq!(
-        editor
-            .update(cx, |editor, _, cx| display_ranges(editor, cx))
-            .unwrap(),
-        [DisplayPoint::new(DisplayRow(2), 2)..DisplayPoint::new(DisplayRow(1), 1)]
-    );
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.end_selection(window, cx);
-        editor.update_selection(
-            DisplayPoint::new(DisplayRow(3), 3),
-            0,
-            gpui::Point::<f32>::default(),
-            window,
-            cx,
-        );
-    });
-
-    assert_eq!(
-        editor
-            .update(cx, |editor, _, cx| display_ranges(editor, cx))
-            .unwrap(),
-        [DisplayPoint::new(DisplayRow(2), 2)..DisplayPoint::new(DisplayRow(1), 1)]
-    );
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.begin_selection(DisplayPoint::new(DisplayRow(3), 3), true, 1, window, cx);
-        editor.update_selection(
-            DisplayPoint::new(DisplayRow(0), 0),
-            0,
-            gpui::Point::<f32>::default(),
-            window,
-            cx,
-        );
-    });
-
-    assert_eq!(
-        editor
-            .update(cx, |editor, _, cx| display_ranges(editor, cx))
-            .unwrap(),
-        [
-            DisplayPoint::new(DisplayRow(2), 2)..DisplayPoint::new(DisplayRow(1), 1),
-            DisplayPoint::new(DisplayRow(3), 3)..DisplayPoint::new(DisplayRow(0), 0)
-        ]
-    );
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.end_selection(window, cx);
-    });
-
-    assert_eq!(
-        editor
-            .update(cx, |editor, _, cx| display_ranges(editor, cx))
-            .unwrap(),
-        [DisplayPoint::new(DisplayRow(3), 3)..DisplayPoint::new(DisplayRow(0), 0)]
-    );
-}
-
-#[gpui::test]
-fn test_multiple_cursor_removal(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let editor = cx.add_window(|window, cx| {
-        let buffer = MultiBuffer::build_simple("aaaaaa\nbbbbbb\ncccccc\nddddddd\n", cx);
-        build_editor(buffer, window, cx)
-    });
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.begin_selection(DisplayPoint::new(DisplayRow(2), 1), false, 1, window, cx);
-    });
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.end_selection(window, cx);
-    });
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.begin_selection(DisplayPoint::new(DisplayRow(3), 2), true, 1, window, cx);
-    });
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.end_selection(window, cx);
-    });
-
-    assert_eq!(
-        editor
-            .update(cx, |editor, _, cx| display_ranges(editor, cx))
-            .unwrap(),
-        [
-            DisplayPoint::new(DisplayRow(2), 1)..DisplayPoint::new(DisplayRow(2), 1),
-            DisplayPoint::new(DisplayRow(3), 2)..DisplayPoint::new(DisplayRow(3), 2)
-        ]
-    );
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.begin_selection(DisplayPoint::new(DisplayRow(2), 1), true, 1, window, cx);
-    });
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.end_selection(window, cx);
-    });
-
-    assert_eq!(
-        editor
-            .update(cx, |editor, _, cx| display_ranges(editor, cx))
-            .unwrap(),
-        [DisplayPoint::new(DisplayRow(3), 2)..DisplayPoint::new(DisplayRow(3), 2)]
-    );
-}
-
-#[gpui::test]
-fn test_canceling_pending_selection(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let editor = cx.add_window(|window, cx| {
-        let buffer = MultiBuffer::build_simple("aaaaaa\nbbbbbb\ncccccc\ndddddd\n", cx);
-        build_editor(buffer, window, cx)
-    });
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.begin_selection(DisplayPoint::new(DisplayRow(2), 2), false, 1, window, cx);
-        assert_eq!(
-            display_ranges(editor, cx),
-            [DisplayPoint::new(DisplayRow(2), 2)..DisplayPoint::new(DisplayRow(2), 2)]
-        );
-    });
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.update_selection(
-            DisplayPoint::new(DisplayRow(3), 3),
-            0,
-            gpui::Point::<f32>::default(),
-            window,
-            cx,
-        );
-        assert_eq!(
-            display_ranges(editor, cx),
-            [DisplayPoint::new(DisplayRow(2), 2)..DisplayPoint::new(DisplayRow(3), 3)]
-        );
-    });
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.cancel(&Cancel, window, cx);
-        editor.update_selection(
-            DisplayPoint::new(DisplayRow(1), 1),
-            0,
-            gpui::Point::<f32>::default(),
-            window,
-            cx,
-        );
-        assert_eq!(
-            display_ranges(editor, cx),
-            [DisplayPoint::new(DisplayRow(2), 2)..DisplayPoint::new(DisplayRow(3), 3)]
-        );
-    });
-}
-
-#[gpui::test]
-fn test_movement_actions_with_pending_selection(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let editor = cx.add_window(|window, cx| {
-        let buffer = MultiBuffer::build_simple("aaaaaa\nbbbbbb\ncccccc\ndddddd\n", cx);
-        build_editor(buffer, window, cx)
-    });
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.begin_selection(DisplayPoint::new(DisplayRow(2), 2), false, 1, window, cx);
-        assert_eq!(
-            display_ranges(editor, cx),
-            [DisplayPoint::new(DisplayRow(2), 2)..DisplayPoint::new(DisplayRow(2), 2)]
-        );
-
-        editor.move_down(&Default::default(), window, cx);
-        assert_eq!(
-            display_ranges(editor, cx),
-            [DisplayPoint::new(DisplayRow(3), 2)..DisplayPoint::new(DisplayRow(3), 2)]
-        );
-
-        editor.begin_selection(DisplayPoint::new(DisplayRow(2), 2), false, 1, window, cx);
-        assert_eq!(
-            display_ranges(editor, cx),
-            [DisplayPoint::new(DisplayRow(2), 2)..DisplayPoint::new(DisplayRow(2), 2)]
-        );
-
-        editor.move_up(&Default::default(), window, cx);
-        assert_eq!(
-            display_ranges(editor, cx),
-            [DisplayPoint::new(DisplayRow(1), 2)..DisplayPoint::new(DisplayRow(1), 2)]
-        );
-    });
-}
-
-#[gpui::test]
-fn test_extending_selection(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let editor = cx.add_window(|window, cx| {
-        let buffer = MultiBuffer::build_simple("aaa bbb ccc ddd eee", cx);
-        build_editor(buffer, window, cx)
-    });
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.begin_selection(DisplayPoint::new(DisplayRow(0), 5), false, 1, window, cx);
-        editor.end_selection(window, cx);
-        assert_eq!(
-            display_ranges(editor, cx),
-            [DisplayPoint::new(DisplayRow(0), 5)..DisplayPoint::new(DisplayRow(0), 5)]
-        );
-
-        editor.extend_selection(DisplayPoint::new(DisplayRow(0), 10), 1, window, cx);
-        editor.end_selection(window, cx);
-        assert_eq!(
-            display_ranges(editor, cx),
-            [DisplayPoint::new(DisplayRow(0), 5)..DisplayPoint::new(DisplayRow(0), 10)]
-        );
-
-        editor.extend_selection(DisplayPoint::new(DisplayRow(0), 10), 1, window, cx);
-        editor.end_selection(window, cx);
-        editor.extend_selection(DisplayPoint::new(DisplayRow(0), 10), 2, window, cx);
-        assert_eq!(
-            display_ranges(editor, cx),
-            [DisplayPoint::new(DisplayRow(0), 5)..DisplayPoint::new(DisplayRow(0), 11)]
-        );
-
-        editor.update_selection(
-            DisplayPoint::new(DisplayRow(0), 1),
-            0,
-            gpui::Point::<f32>::default(),
-            window,
-            cx,
-        );
-        editor.end_selection(window, cx);
-        assert_eq!(
-            display_ranges(editor, cx),
-            [DisplayPoint::new(DisplayRow(0), 5)..DisplayPoint::new(DisplayRow(0), 0)]
-        );
-
-        editor.begin_selection(DisplayPoint::new(DisplayRow(0), 5), true, 1, window, cx);
-        editor.end_selection(window, cx);
-        editor.begin_selection(DisplayPoint::new(DisplayRow(0), 5), true, 2, window, cx);
-        editor.end_selection(window, cx);
-        assert_eq!(
-            display_ranges(editor, cx),
-            [DisplayPoint::new(DisplayRow(0), 4)..DisplayPoint::new(DisplayRow(0), 7)]
-        );
-
-        editor.extend_selection(DisplayPoint::new(DisplayRow(0), 10), 1, window, cx);
-        assert_eq!(
-            display_ranges(editor, cx),
-            [DisplayPoint::new(DisplayRow(0), 4)..DisplayPoint::new(DisplayRow(0), 11)]
-        );
-
-        editor.update_selection(
-            DisplayPoint::new(DisplayRow(0), 6),
-            0,
-            gpui::Point::<f32>::default(),
-            window,
-            cx,
-        );
-        assert_eq!(
-            display_ranges(editor, cx),
-            [DisplayPoint::new(DisplayRow(0), 4)..DisplayPoint::new(DisplayRow(0), 7)]
-        );
-
-        editor.update_selection(
-            DisplayPoint::new(DisplayRow(0), 1),
-            0,
-            gpui::Point::<f32>::default(),
-            window,
-            cx,
-        );
-        editor.end_selection(window, cx);
-        assert_eq!(
-            display_ranges(editor, cx),
-            [DisplayPoint::new(DisplayRow(0), 7)..DisplayPoint::new(DisplayRow(0), 0)]
-        );
-    });
-}
-
-#[gpui::test]
-fn test_clone(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let (text, selection_ranges) = marked_text_ranges(
-        indoc! {"
-            one
-            two
-            threeˇ
-            four
-            fiveˇ
-        "},
-        true,
-    );
-
-    let editor = cx.add_window(|window, cx| {
-        let buffer = MultiBuffer::build_simple(&text, cx);
-        build_editor(buffer, window, cx)
-    });
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges(
-                selection_ranges
-                    .iter()
-                    .map(|range| MultiBufferOffset(range.start)..MultiBufferOffset(range.end)),
-            )
-        });
-        editor.fold_creases(
-            vec![
-                Crease::simple(Point::new(1, 0)..Point::new(2, 0), FoldPlaceholder::test()),
-                Crease::simple(Point::new(3, 0)..Point::new(4, 0), FoldPlaceholder::test()),
-            ],
-            true,
-            window,
-            cx,
-        );
-    });
-
-    let cloned_editor = editor
-        .update(cx, |editor, _, cx| {
-            cx.open_window(Default::default(), |window, cx| {
-                cx.new(|cx| editor.clone(window, cx))
-            })
-        })
-        .unwrap()
-        .unwrap();
-
-    let snapshot = editor
-        .update(cx, |e, window, cx| e.snapshot(window, cx))
-        .unwrap();
-    let cloned_snapshot = cloned_editor
-        .update(cx, |e, window, cx| e.snapshot(window, cx))
-        .unwrap();
-
-    assert_eq!(
-        cloned_editor
-            .update(cx, |e, _, cx| e.display_text(cx))
-            .unwrap(),
-        editor.update(cx, |e, _, cx| e.display_text(cx)).unwrap()
-    );
-    assert_eq!(
-        cloned_snapshot
-            .folds_in_range(MultiBufferOffset(0)..MultiBufferOffset(text.len()))
-            .collect::<Vec<_>>(),
-        snapshot
-            .folds_in_range(MultiBufferOffset(0)..MultiBufferOffset(text.len()))
-            .collect::<Vec<_>>(),
-    );
-    assert_set_eq!(
-        cloned_editor
-            .update(cx, |editor, _, cx| editor
-                .selections
-                .ranges::<Point>(&editor.display_snapshot(cx)))
-            .unwrap(),
-        editor
-            .update(cx, |editor, _, cx| editor
-                .selections
-                .ranges(&editor.display_snapshot(cx)))
-            .unwrap()
-    );
-    assert_set_eq!(
-        cloned_editor
-            .update(cx, |e, _window, cx| e
-                .selections
-                .display_ranges(&e.display_snapshot(cx)))
-            .unwrap(),
-        editor
-            .update(cx, |e, _, cx| e
-                .selections
-                .display_ranges(&e.display_snapshot(cx)))
-            .unwrap()
-    );
-}
-
-#[gpui::test]
-async fn test_navigation_history(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    use workspace::item::Item;
-
-    let fs = FakeFs::new(cx.executor());
-    let project = Project::test(fs, [], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project, window, cx));
-    let pane = workspace
-        .update(cx, |workspace, _, _| workspace.active_pane().clone())
-        .unwrap();
-
-    _ = workspace.update(cx, |_v, window, cx| {
-        cx.new(|cx| {
-            let buffer = MultiBuffer::build_simple(&sample_text(300, 5, 'a'), cx);
-            let mut editor = build_editor(buffer, window, cx);
-            let handle = cx.entity();
-            editor.set_nav_history(Some(pane.read(cx).nav_history_for_item(&handle)));
-
-            fn pop_history(editor: &mut Editor, cx: &mut App) -> Option<NavigationEntry> {
-                editor.nav_history.as_mut().unwrap().pop_backward(cx)
-            }
-
-            // Move the cursor a small distance.
-            // Nothing is added to the navigation history.
-            editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                s.select_display_ranges([
-                    DisplayPoint::new(DisplayRow(1), 0)..DisplayPoint::new(DisplayRow(1), 0)
-                ])
-            });
-            editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                s.select_display_ranges([
-                    DisplayPoint::new(DisplayRow(3), 0)..DisplayPoint::new(DisplayRow(3), 0)
-                ])
-            });
-            assert!(pop_history(&mut editor, cx).is_none());
-
-            // Move the cursor a large distance.
-            // The history can jump back to the previous position.
-            editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                s.select_display_ranges([
-                    DisplayPoint::new(DisplayRow(13), 0)..DisplayPoint::new(DisplayRow(13), 3)
-                ])
-            });
-            let nav_entry = pop_history(&mut editor, cx).unwrap();
-            editor.navigate(nav_entry.data.unwrap(), window, cx);
-            assert_eq!(nav_entry.item.id(), cx.entity_id());
-            assert_eq!(
-                editor
-                    .selections
-                    .display_ranges(&editor.display_snapshot(cx)),
-                &[DisplayPoint::new(DisplayRow(3), 0)..DisplayPoint::new(DisplayRow(3), 0)]
-            );
-            assert!(pop_history(&mut editor, cx).is_none());
-
-            // Move the cursor a small distance via the mouse.
-            // Nothing is added to the navigation history.
-            editor.begin_selection(DisplayPoint::new(DisplayRow(5), 0), false, 1, window, cx);
-            editor.end_selection(window, cx);
-            assert_eq!(
-                editor
-                    .selections
-                    .display_ranges(&editor.display_snapshot(cx)),
-                &[DisplayPoint::new(DisplayRow(5), 0)..DisplayPoint::new(DisplayRow(5), 0)]
-            );
-            assert!(pop_history(&mut editor, cx).is_none());
-
-            // Move the cursor a large distance via the mouse.
-            // The history can jump back to the previous position.
-            editor.begin_selection(DisplayPoint::new(DisplayRow(15), 0), false, 1, window, cx);
-            editor.end_selection(window, cx);
-            assert_eq!(
-                editor
-                    .selections
-                    .display_ranges(&editor.display_snapshot(cx)),
-                &[DisplayPoint::new(DisplayRow(15), 0)..DisplayPoint::new(DisplayRow(15), 0)]
-            );
-            let nav_entry = pop_history(&mut editor, cx).unwrap();
-            editor.navigate(nav_entry.data.unwrap(), window, cx);
-            assert_eq!(nav_entry.item.id(), cx.entity_id());
-            assert_eq!(
-                editor
-                    .selections
-                    .display_ranges(&editor.display_snapshot(cx)),
-                &[DisplayPoint::new(DisplayRow(5), 0)..DisplayPoint::new(DisplayRow(5), 0)]
-            );
-            assert!(pop_history(&mut editor, cx).is_none());
-
-            // Set scroll position to check later
-            editor.set_scroll_position(gpui::Point::<f64>::new(5.5, 5.5), window, cx);
-            let original_scroll_position = editor.scroll_manager.anchor();
-
-            // Jump to the end of the document and adjust scroll
-            editor.move_to_end(&MoveToEnd, window, cx);
-            editor.set_scroll_position(gpui::Point::<f64>::new(-2.5, -0.5), window, cx);
-            assert_ne!(editor.scroll_manager.anchor(), original_scroll_position);
-
-            let nav_entry = pop_history(&mut editor, cx).unwrap();
-            editor.navigate(nav_entry.data.unwrap(), window, cx);
-            assert_eq!(editor.scroll_manager.anchor(), original_scroll_position);
-
-            // Ensure we don't panic when navigation data contains invalid anchors *and* points.
-            let mut invalid_anchor = editor.scroll_manager.anchor().anchor;
-            invalid_anchor.text_anchor.buffer_id = BufferId::new(999).ok();
-            let invalid_point = Point::new(9999, 0);
-            editor.navigate(
-                Box::new(NavigationData {
-                    cursor_anchor: invalid_anchor,
-                    cursor_position: invalid_point,
-                    scroll_anchor: ScrollAnchor {
-                        anchor: invalid_anchor,
-                        offset: Default::default(),
-                    },
-                    scroll_top_row: invalid_point.row,
-                }),
-                window,
-                cx,
-            );
-            assert_eq!(
-                editor
-                    .selections
-                    .display_ranges(&editor.display_snapshot(cx)),
-                &[editor.max_point(cx)..editor.max_point(cx)]
-            );
-            assert_eq!(
-                editor.scroll_position(cx),
-                gpui::Point::new(0., editor.max_point(cx).row().as_f64())
-            );
-
-            editor
-        })
-    });
-}
-
-#[gpui::test]
-fn test_cancel(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let editor = cx.add_window(|window, cx| {
-        let buffer = MultiBuffer::build_simple("aaaaaa\nbbbbbb\ncccccc\ndddddd\n", cx);
-        build_editor(buffer, window, cx)
-    });
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.begin_selection(DisplayPoint::new(DisplayRow(3), 4), false, 1, window, cx);
-        editor.update_selection(
-            DisplayPoint::new(DisplayRow(1), 1),
-            0,
-            gpui::Point::<f32>::default(),
-            window,
-            cx,
-        );
-        editor.end_selection(window, cx);
-
-        editor.begin_selection(DisplayPoint::new(DisplayRow(0), 1), true, 1, window, cx);
-        editor.update_selection(
-            DisplayPoint::new(DisplayRow(0), 3),
-            0,
-            gpui::Point::<f32>::default(),
-            window,
-            cx,
-        );
-        editor.end_selection(window, cx);
-        assert_eq!(
-            display_ranges(editor, cx),
-            [
-                DisplayPoint::new(DisplayRow(0), 1)..DisplayPoint::new(DisplayRow(0), 3),
-                DisplayPoint::new(DisplayRow(3), 4)..DisplayPoint::new(DisplayRow(1), 1),
-            ]
-        );
-    });
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.cancel(&Cancel, window, cx);
-        assert_eq!(
-            display_ranges(editor, cx),
-            [DisplayPoint::new(DisplayRow(3), 4)..DisplayPoint::new(DisplayRow(1), 1)]
-        );
-    });
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.cancel(&Cancel, window, cx);
-        assert_eq!(
-            display_ranges(editor, cx),
-            [DisplayPoint::new(DisplayRow(1), 1)..DisplayPoint::new(DisplayRow(1), 1)]
-        );
-    });
-}
-
-#[gpui::test]
-fn test_fold_action(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let editor = cx.add_window(|window, cx| {
-        let buffer = MultiBuffer::build_simple(
-            &"
-                impl Foo {
-                    // Hello!
-
-                    fn a() {
-                        1
-                    }
-
-                    fn b() {
-                        2
-                    }
-
-                    fn c() {
-                        3
-                    }
-                }
-            "
-            .unindent(),
-            cx,
-        );
-        build_editor(buffer, window, cx)
-    });
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_display_ranges([
-                DisplayPoint::new(DisplayRow(7), 0)..DisplayPoint::new(DisplayRow(12), 0)
-            ]);
-        });
-        editor.fold(&Fold, window, cx);
-        assert_eq!(
-            editor.display_text(cx),
-            "
-                impl Foo {
-                    // Hello!
-
-                    fn a() {
-                        1
-                    }
-
-                    fn b() {⋯
-                    }
-
-                    fn c() {⋯
-                    }
-                }
-            "
-            .unindent(),
-        );
-
-        editor.fold(&Fold, window, cx);
-        assert_eq!(
-            editor.display_text(cx),
-            "
-                impl Foo {⋯
-                }
-            "
-            .unindent(),
-        );
-
-        editor.unfold_lines(&UnfoldLines, window, cx);
-        assert_eq!(
-            editor.display_text(cx),
-            "
-                impl Foo {
-                    // Hello!
-
-                    fn a() {
-                        1
-                    }
-
-                    fn b() {⋯
-                    }
-
-                    fn c() {⋯
-                    }
-                }
-            "
-            .unindent(),
-        );
-
-        editor.unfold_lines(&UnfoldLines, window, cx);
-        assert_eq!(
-            editor.display_text(cx),
-            editor.buffer.read(cx).read(cx).text()
-        );
-    });
-}
-
-#[gpui::test]
-fn test_fold_action_whitespace_sensitive_language(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let editor = cx.add_window(|window, cx| {
-        let buffer = MultiBuffer::build_simple(
-            &"
-                class Foo:
-                    # Hello!
-
-                    def a():
-                        print(1)
-
-                    def b():
-                        print(2)
-
-                    def c():
-                        print(3)
-            "
-            .unindent(),
-            cx,
-        );
-        build_editor(buffer, window, cx)
-    });
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_display_ranges([
-                DisplayPoint::new(DisplayRow(6), 0)..DisplayPoint::new(DisplayRow(10), 0)
-            ]);
-        });
-        editor.fold(&Fold, window, cx);
-        assert_eq!(
-            editor.display_text(cx),
-            "
-                class Foo:
-                    # Hello!
-
-                    def a():
-                        print(1)
-
-                    def b():⋯
-
-                    def c():⋯
-            "
-            .unindent(),
-        );
-
-        editor.fold(&Fold, window, cx);
-        assert_eq!(
-            editor.display_text(cx),
-            "
-                class Foo:⋯
-            "
-            .unindent(),
-        );
-
-        editor.unfold_lines(&UnfoldLines, window, cx);
-        assert_eq!(
-            editor.display_text(cx),
-            "
-                class Foo:
-                    # Hello!
-
-                    def a():
-                        print(1)
-
-                    def b():⋯
-
-                    def c():⋯
-            "
-            .unindent(),
-        );
-
-        editor.unfold_lines(&UnfoldLines, window, cx);
-        assert_eq!(
-            editor.display_text(cx),
-            editor.buffer.read(cx).read(cx).text()
-        );
-    });
-}
-
-#[gpui::test]
-fn test_fold_action_multiple_line_breaks(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let editor = cx.add_window(|window, cx| {
-        let buffer = MultiBuffer::build_simple(
-            &"
-                class Foo:
-                    # Hello!
-
-                    def a():
-                        print(1)
-
-                    def b():
-                        print(2)
-
-
-                    def c():
-                        print(3)
-
-
-            "
-            .unindent(),
-            cx,
-        );
-        build_editor(buffer, window, cx)
-    });
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_display_ranges([
-                DisplayPoint::new(DisplayRow(6), 0)..DisplayPoint::new(DisplayRow(11), 0)
-            ]);
-        });
-        editor.fold(&Fold, window, cx);
-        assert_eq!(
-            editor.display_text(cx),
-            "
-                class Foo:
-                    # Hello!
-
-                    def a():
-                        print(1)
-
-                    def b():⋯
-
-
-                    def c():⋯
-
-
-            "
-            .unindent(),
-        );
-
-        editor.fold(&Fold, window, cx);
-        assert_eq!(
-            editor.display_text(cx),
-            "
-                class Foo:⋯
-
-
-            "
-            .unindent(),
-        );
-
-        editor.unfold_lines(&UnfoldLines, window, cx);
-        assert_eq!(
-            editor.display_text(cx),
-            "
-                class Foo:
-                    # Hello!
-
-                    def a():
-                        print(1)
-
-                    def b():⋯
-
-
-                    def c():⋯
-
-
-            "
-            .unindent(),
-        );
-
-        editor.unfold_lines(&UnfoldLines, window, cx);
-        assert_eq!(
-            editor.display_text(cx),
-            editor.buffer.read(cx).read(cx).text()
-        );
-    });
-}
-
-#[gpui::test]
-fn test_fold_at_level(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let editor = cx.add_window(|window, cx| {
-        let buffer = MultiBuffer::build_simple(
-            &"
-                class Foo:
-                    # Hello!
-
-                    def a():
-                        print(1)
-
-                    def b():
-                        print(2)
-
-
-                class Bar:
-                    # World!
-
-                    def a():
-                        print(1)
-
-                    def b():
-                        print(2)
-
-
-            "
-            .unindent(),
-            cx,
-        );
-        build_editor(buffer, window, cx)
-    });
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.fold_at_level(&FoldAtLevel(2), window, cx);
-        assert_eq!(
-            editor.display_text(cx),
-            "
-                class Foo:
-                    # Hello!
-
-                    def a():⋯
-
-                    def b():⋯
-
-
-                class Bar:
-                    # World!
-
-                    def a():⋯
-
-                    def b():⋯
-
-
-            "
-            .unindent(),
-        );
-
-        editor.fold_at_level(&FoldAtLevel(1), window, cx);
-        assert_eq!(
-            editor.display_text(cx),
-            "
-                class Foo:⋯
-
-
-                class Bar:⋯
-
-
-            "
-            .unindent(),
-        );
-
-        editor.unfold_all(&UnfoldAll, window, cx);
-        editor.fold_at_level(&FoldAtLevel(0), window, cx);
-        assert_eq!(
-            editor.display_text(cx),
-            "
-                class Foo:
-                    # Hello!
-
-                    def a():
-                        print(1)
-
-                    def b():
-                        print(2)
-
-
-                class Bar:
-                    # World!
-
-                    def a():
-                        print(1)
-
-                    def b():
-                        print(2)
-
-
-            "
-            .unindent(),
-        );
-
-        assert_eq!(
-            editor.display_text(cx),
-            editor.buffer.read(cx).read(cx).text()
-        );
-        let (_, positions) = marked_text_ranges(
-            &"
-                       class Foo:
-                           # Hello!
-
-                           def a():
-                              print(1)
-
-                           def b():
-                               p«riˇ»nt(2)
-
-
-                       class Bar:
-                           # World!
-
-                           def a():
-                               «ˇprint(1)
-
-                           def b():
-                               print(2)»
-
-
-                   "
-            .unindent(),
-            true,
-        );
-
-        editor.change_selections(SelectionEffects::default(), window, cx, |s| {
-            s.select_ranges(
-                positions
-                    .iter()
-                    .map(|range| MultiBufferOffset(range.start)..MultiBufferOffset(range.end)),
-            )
-        });
-
-        editor.fold_at_level(&FoldAtLevel(2), window, cx);
-        assert_eq!(
-            editor.display_text(cx),
-            "
-                class Foo:
-                    # Hello!
-
-                    def a():⋯
-
-                    def b():
-                        print(2)
-
-
-                class Bar:
-                    # World!
-
-                    def a():
-                        print(1)
-
-                    def b():
-                        print(2)
-
-
-            "
-            .unindent(),
-        );
-    });
-}
-
-#[gpui::test]
-fn test_move_cursor(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let buffer = cx.update(|cx| MultiBuffer::build_simple(&sample_text(6, 6, 'a'), cx));
-    let editor = cx.add_window(|window, cx| build_editor(buffer.clone(), window, cx));
-
-    buffer.update(cx, |buffer, cx| {
-        buffer.edit(
-            vec![
-                (Point::new(1, 0)..Point::new(1, 0), "\t"),
-                (Point::new(1, 1)..Point::new(1, 1), "\t"),
-            ],
-            None,
-            cx,
-        );
-    });
-    _ = editor.update(cx, |editor, window, cx| {
-        assert_eq!(
-            display_ranges(editor, cx),
-            &[DisplayPoint::new(DisplayRow(0), 0)..DisplayPoint::new(DisplayRow(0), 0)]
-        );
-
-        editor.move_down(&MoveDown, window, cx);
-        assert_eq!(
-            display_ranges(editor, cx),
-            &[DisplayPoint::new(DisplayRow(1), 0)..DisplayPoint::new(DisplayRow(1), 0)]
-        );
-
-        editor.move_right(&MoveRight, window, cx);
-        assert_eq!(
-            display_ranges(editor, cx),
-            &[DisplayPoint::new(DisplayRow(1), 4)..DisplayPoint::new(DisplayRow(1), 4)]
-        );
-
-        editor.move_left(&MoveLeft, window, cx);
-        assert_eq!(
-            display_ranges(editor, cx),
-            &[DisplayPoint::new(DisplayRow(1), 0)..DisplayPoint::new(DisplayRow(1), 0)]
-        );
-
-        editor.move_up(&MoveUp, window, cx);
-        assert_eq!(
-            display_ranges(editor, cx),
-            &[DisplayPoint::new(DisplayRow(0), 0)..DisplayPoint::new(DisplayRow(0), 0)]
-        );
-
-        editor.move_to_end(&MoveToEnd, window, cx);
-        assert_eq!(
-            display_ranges(editor, cx),
-            &[DisplayPoint::new(DisplayRow(5), 6)..DisplayPoint::new(DisplayRow(5), 6)]
-        );
-
-        editor.move_to_beginning(&MoveToBeginning, window, cx);
-        assert_eq!(
-            display_ranges(editor, cx),
-            &[DisplayPoint::new(DisplayRow(0), 0)..DisplayPoint::new(DisplayRow(0), 0)]
-        );
-
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_display_ranges([
-                DisplayPoint::new(DisplayRow(0), 1)..DisplayPoint::new(DisplayRow(0), 2)
-            ]);
-        });
-        editor.select_to_beginning(&SelectToBeginning, window, cx);
-        assert_eq!(
-            display_ranges(editor, cx),
-            &[DisplayPoint::new(DisplayRow(0), 1)..DisplayPoint::new(DisplayRow(0), 0)]
-        );
-
-        editor.select_to_end(&SelectToEnd, window, cx);
-        assert_eq!(
-            display_ranges(editor, cx),
-            &[DisplayPoint::new(DisplayRow(0), 1)..DisplayPoint::new(DisplayRow(5), 6)]
-        );
-    });
-}
-
-#[gpui::test]
-fn test_move_cursor_multibyte(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let editor = cx.add_window(|window, cx| {
-        let buffer = MultiBuffer::build_simple("🟥🟧🟨🟩🟦🟪\nabcde\nαβγδε", cx);
-        build_editor(buffer, window, cx)
-    });
-
-    assert_eq!('🟥'.len_utf8(), 4);
-    assert_eq!('α'.len_utf8(), 2);
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.fold_creases(
-            vec![
-                Crease::simple(Point::new(0, 8)..Point::new(0, 16), FoldPlaceholder::test()),
-                Crease::simple(Point::new(1, 2)..Point::new(1, 4), FoldPlaceholder::test()),
-                Crease::simple(Point::new(2, 4)..Point::new(2, 8), FoldPlaceholder::test()),
-            ],
-            true,
-            window,
-            cx,
-        );
-        assert_eq!(editor.display_text(cx), "🟥🟧⋯🟦🟪\nab⋯e\nαβ⋯ε");
-
-        editor.move_right(&MoveRight, window, cx);
-        assert_eq!(display_ranges(editor, cx), &[empty_range(0, "🟥".len())]);
-        editor.move_right(&MoveRight, window, cx);
-        assert_eq!(display_ranges(editor, cx), &[empty_range(0, "🟥🟧".len())]);
-        editor.move_right(&MoveRight, window, cx);
-        assert_eq!(display_ranges(editor, cx), &[empty_range(0, "🟥🟧⋯".len())]);
-
-        editor.move_down(&MoveDown, window, cx);
-        assert_eq!(display_ranges(editor, cx), &[empty_range(1, "ab⋯e".len())]);
-        editor.move_left(&MoveLeft, window, cx);
-        assert_eq!(display_ranges(editor, cx), &[empty_range(1, "ab⋯".len())]);
-        editor.move_left(&MoveLeft, window, cx);
-        assert_eq!(display_ranges(editor, cx), &[empty_range(1, "ab".len())]);
-        editor.move_left(&MoveLeft, window, cx);
-        assert_eq!(display_ranges(editor, cx), &[empty_range(1, "a".len())]);
-
-        editor.move_down(&MoveDown, window, cx);
-        assert_eq!(display_ranges(editor, cx), &[empty_range(2, "α".len())]);
-        editor.move_right(&MoveRight, window, cx);
-        assert_eq!(display_ranges(editor, cx), &[empty_range(2, "αβ".len())]);
-        editor.move_right(&MoveRight, window, cx);
-        assert_eq!(display_ranges(editor, cx), &[empty_range(2, "αβ⋯".len())]);
-        editor.move_right(&MoveRight, window, cx);
-        assert_eq!(display_ranges(editor, cx), &[empty_range(2, "αβ⋯ε".len())]);
-
-        editor.move_up(&MoveUp, window, cx);
-        assert_eq!(display_ranges(editor, cx), &[empty_range(1, "ab⋯e".len())]);
-        editor.move_down(&MoveDown, window, cx);
-        assert_eq!(display_ranges(editor, cx), &[empty_range(2, "αβ⋯ε".len())]);
-        editor.move_up(&MoveUp, window, cx);
-        assert_eq!(display_ranges(editor, cx), &[empty_range(1, "ab⋯e".len())]);
-
-        editor.move_up(&MoveUp, window, cx);
-        assert_eq!(display_ranges(editor, cx), &[empty_range(0, "🟥🟧".len())]);
-        editor.move_left(&MoveLeft, window, cx);
-        assert_eq!(display_ranges(editor, cx), &[empty_range(0, "🟥".len())]);
-        editor.move_left(&MoveLeft, window, cx);
-        assert_eq!(display_ranges(editor, cx), &[empty_range(0, "".len())]);
-    });
-}
-
-#[gpui::test]
-fn test_move_cursor_different_line_lengths(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let editor = cx.add_window(|window, cx| {
-        let buffer = MultiBuffer::build_simple("ⓐⓑⓒⓓⓔ\nabcd\nαβγ\nabcd\nⓐⓑⓒⓓⓔ\n", cx);
-        build_editor(buffer, window, cx)
-    });
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_display_ranges([empty_range(0, "ⓐⓑⓒⓓⓔ".len())]);
-        });
-
-        // moving above start of document should move selection to start of document,
-        // but the next move down should still be at the original goal_x
-        editor.move_up(&MoveUp, window, cx);
-        assert_eq!(display_ranges(editor, cx), &[empty_range(0, "".len())]);
-
-        editor.move_down(&MoveDown, window, cx);
-        assert_eq!(display_ranges(editor, cx), &[empty_range(1, "abcd".len())]);
-
-        editor.move_down(&MoveDown, window, cx);
-        assert_eq!(display_ranges(editor, cx), &[empty_range(2, "αβγ".len())]);
-
-        editor.move_down(&MoveDown, window, cx);
-        assert_eq!(display_ranges(editor, cx), &[empty_range(3, "abcd".len())]);
-
-        editor.move_down(&MoveDown, window, cx);
-        assert_eq!(display_ranges(editor, cx), &[empty_range(4, "ⓐⓑⓒⓓⓔ".len())]);
-
-        // moving past end of document should not change goal_x
-        editor.move_down(&MoveDown, window, cx);
-        assert_eq!(display_ranges(editor, cx), &[empty_range(5, "".len())]);
-
-        editor.move_down(&MoveDown, window, cx);
-        assert_eq!(display_ranges(editor, cx), &[empty_range(5, "".len())]);
-
-        editor.move_up(&MoveUp, window, cx);
-        assert_eq!(display_ranges(editor, cx), &[empty_range(4, "ⓐⓑⓒⓓⓔ".len())]);
-
-        editor.move_up(&MoveUp, window, cx);
-        assert_eq!(display_ranges(editor, cx), &[empty_range(3, "abcd".len())]);
-
-        editor.move_up(&MoveUp, window, cx);
-        assert_eq!(display_ranges(editor, cx), &[empty_range(2, "αβγ".len())]);
-    });
-}
-
-#[gpui::test]
-fn test_beginning_end_of_line(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    let move_to_beg = MoveToBeginningOfLine {
-        stop_at_soft_wraps: true,
-        stop_at_indent: true,
-    };
-
-    let delete_to_beg = DeleteToBeginningOfLine {
-        stop_at_indent: false,
-    };
-
-    let move_to_end = MoveToEndOfLine {
-        stop_at_soft_wraps: true,
-    };
-
-    let editor = cx.add_window(|window, cx| {
-        let buffer = MultiBuffer::build_simple("abc\n  def", cx);
-        build_editor(buffer, window, cx)
-    });
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_display_ranges([
-                DisplayPoint::new(DisplayRow(0), 1)..DisplayPoint::new(DisplayRow(0), 1),
-                DisplayPoint::new(DisplayRow(1), 4)..DisplayPoint::new(DisplayRow(1), 4),
-            ]);
-        });
-    });
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.move_to_beginning_of_line(&move_to_beg, window, cx);
-        assert_eq!(
-            display_ranges(editor, cx),
-            &[
-                DisplayPoint::new(DisplayRow(0), 0)..DisplayPoint::new(DisplayRow(0), 0),
-                DisplayPoint::new(DisplayRow(1), 2)..DisplayPoint::new(DisplayRow(1), 2),
-            ]
-        );
-    });
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.move_to_beginning_of_line(&move_to_beg, window, cx);
-        assert_eq!(
-            display_ranges(editor, cx),
-            &[
-                DisplayPoint::new(DisplayRow(0), 0)..DisplayPoint::new(DisplayRow(0), 0),
-                DisplayPoint::new(DisplayRow(1), 0)..DisplayPoint::new(DisplayRow(1), 0),
-            ]
-        );
-    });
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.move_to_beginning_of_line(&move_to_beg, window, cx);
-        assert_eq!(
-            display_ranges(editor, cx),
-            &[
-                DisplayPoint::new(DisplayRow(0), 0)..DisplayPoint::new(DisplayRow(0), 0),
-                DisplayPoint::new(DisplayRow(1), 2)..DisplayPoint::new(DisplayRow(1), 2),
-            ]
-        );
-    });
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.move_to_end_of_line(&move_to_end, window, cx);
-        assert_eq!(
-            display_ranges(editor, cx),
-            &[
-                DisplayPoint::new(DisplayRow(0), 3)..DisplayPoint::new(DisplayRow(0), 3),
-                DisplayPoint::new(DisplayRow(1), 5)..DisplayPoint::new(DisplayRow(1), 5),
-            ]
-        );
-    });
-
-    // Moving to the end of line again is a no-op.
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.move_to_end_of_line(&move_to_end, window, cx);
-        assert_eq!(
-            display_ranges(editor, cx),
-            &[
-                DisplayPoint::new(DisplayRow(0), 3)..DisplayPoint::new(DisplayRow(0), 3),
-                DisplayPoint::new(DisplayRow(1), 5)..DisplayPoint::new(DisplayRow(1), 5),
-            ]
-        );
-    });
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.move_left(&MoveLeft, window, cx);
-        editor.select_to_beginning_of_line(
-            &SelectToBeginningOfLine {
-                stop_at_soft_wraps: true,
-                stop_at_indent: true,
-            },
-            window,
-            cx,
-        );
-        assert_eq!(
-            display_ranges(editor, cx),
-            &[
-                DisplayPoint::new(DisplayRow(0), 2)..DisplayPoint::new(DisplayRow(0), 0),
-                DisplayPoint::new(DisplayRow(1), 4)..DisplayPoint::new(DisplayRow(1), 2),
-            ]
-        );
-    });
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.select_to_beginning_of_line(
-            &SelectToBeginningOfLine {
-                stop_at_soft_wraps: true,
-                stop_at_indent: true,
-            },
-            window,
-            cx,
-        );
-        assert_eq!(
-            display_ranges(editor, cx),
-            &[
-                DisplayPoint::new(DisplayRow(0), 2)..DisplayPoint::new(DisplayRow(0), 0),
-                DisplayPoint::new(DisplayRow(1), 4)..DisplayPoint::new(DisplayRow(1), 0),
-            ]
-        );
-    });
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.select_to_beginning_of_line(
-            &SelectToBeginningOfLine {
-                stop_at_soft_wraps: true,
-                stop_at_indent: true,
-            },
-            window,
-            cx,
-        );
-        assert_eq!(
-            display_ranges(editor, cx),
-            &[
-                DisplayPoint::new(DisplayRow(0), 2)..DisplayPoint::new(DisplayRow(0), 0),
-                DisplayPoint::new(DisplayRow(1), 4)..DisplayPoint::new(DisplayRow(1), 2),
-            ]
-        );
-    });
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.select_to_end_of_line(
-            &SelectToEndOfLine {
-                stop_at_soft_wraps: true,
-            },
-            window,
-            cx,
-        );
-        assert_eq!(
-            display_ranges(editor, cx),
-            &[
-                DisplayPoint::new(DisplayRow(0), 2)..DisplayPoint::new(DisplayRow(0), 3),
-                DisplayPoint::new(DisplayRow(1), 4)..DisplayPoint::new(DisplayRow(1), 5),
-            ]
-        );
-    });
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.delete_to_end_of_line(&DeleteToEndOfLine, window, cx);
-        assert_eq!(editor.display_text(cx), "ab\n  de");
-        assert_eq!(
-            display_ranges(editor, cx),
-            &[
-                DisplayPoint::new(DisplayRow(0), 2)..DisplayPoint::new(DisplayRow(0), 2),
-                DisplayPoint::new(DisplayRow(1), 4)..DisplayPoint::new(DisplayRow(1), 4),
-            ]
-        );
-    });
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.delete_to_beginning_of_line(&delete_to_beg, window, cx);
-        assert_eq!(editor.display_text(cx), "\n");
-        assert_eq!(
-            display_ranges(editor, cx),
-            &[
-                DisplayPoint::new(DisplayRow(0), 0)..DisplayPoint::new(DisplayRow(0), 0),
-                DisplayPoint::new(DisplayRow(1), 0)..DisplayPoint::new(DisplayRow(1), 0),
-            ]
-        );
-    });
-}
-
-#[gpui::test]
-fn test_beginning_end_of_line_ignore_soft_wrap(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    let move_to_beg = MoveToBeginningOfLine {
-        stop_at_soft_wraps: false,
-        stop_at_indent: false,
-    };
-
-    let move_to_end = MoveToEndOfLine {
-        stop_at_soft_wraps: false,
-    };
-
-    let editor = cx.add_window(|window, cx| {
-        let buffer = MultiBuffer::build_simple("thequickbrownfox\njumpedoverthelazydogs", cx);
-        build_editor(buffer, window, cx)
-    });
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.set_wrap_width(Some(140.0.into()), cx);
-
-        // We expect the following lines after wrapping
-        // ```
-        // thequickbrownfox
-        // jumpedoverthelazydo
-        // gs
-        // ```
-        // The final `gs` was soft-wrapped onto a new line.
-        assert_eq!(
-            "thequickbrownfox\njumpedoverthelaz\nydogs",
-            editor.display_text(cx),
-        );
-
-        // First, let's assert behavior on the first line, that was not soft-wrapped.
-        // Start the cursor at the `k` on the first line
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_display_ranges([
-                DisplayPoint::new(DisplayRow(0), 7)..DisplayPoint::new(DisplayRow(0), 7)
-            ]);
-        });
-
-        // Moving to the beginning of the line should put us at the beginning of the line.
-        editor.move_to_beginning_of_line(&move_to_beg, window, cx);
-        assert_eq!(
-            vec![DisplayPoint::new(DisplayRow(0), 0)..DisplayPoint::new(DisplayRow(0), 0),],
-            display_ranges(editor, cx)
-        );
-
-        // Moving to the end of the line should put us at the end of the line.
-        editor.move_to_end_of_line(&move_to_end, window, cx);
-        assert_eq!(
-            vec![DisplayPoint::new(DisplayRow(0), 16)..DisplayPoint::new(DisplayRow(0), 16),],
-            display_ranges(editor, cx)
-        );
-
-        // Now, let's assert behavior on the second line, that ended up being soft-wrapped.
-        // Start the cursor at the last line (`y` that was wrapped to a new line)
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_display_ranges([
-                DisplayPoint::new(DisplayRow(2), 0)..DisplayPoint::new(DisplayRow(2), 0)
-            ]);
-        });
-
-        // Moving to the beginning of the line should put us at the start of the second line of
-        // display text, i.e., the `j`.
-        editor.move_to_beginning_of_line(&move_to_beg, window, cx);
-        assert_eq!(
-            vec![DisplayPoint::new(DisplayRow(1), 0)..DisplayPoint::new(DisplayRow(1), 0),],
-            display_ranges(editor, cx)
-        );
-
-        // Moving to the beginning of the line again should be a no-op.
-        editor.move_to_beginning_of_line(&move_to_beg, window, cx);
-        assert_eq!(
-            vec![DisplayPoint::new(DisplayRow(1), 0)..DisplayPoint::new(DisplayRow(1), 0),],
-            display_ranges(editor, cx)
-        );
-
-        // Moving to the end of the line should put us right after the `s` that was soft-wrapped to the
-        // next display line.
-        editor.move_to_end_of_line(&move_to_end, window, cx);
-        assert_eq!(
-            vec![DisplayPoint::new(DisplayRow(2), 5)..DisplayPoint::new(DisplayRow(2), 5),],
-            display_ranges(editor, cx)
-        );
-
-        // Moving to the end of the line again should be a no-op.
-        editor.move_to_end_of_line(&move_to_end, window, cx);
-        assert_eq!(
-            vec![DisplayPoint::new(DisplayRow(2), 5)..DisplayPoint::new(DisplayRow(2), 5),],
-            display_ranges(editor, cx)
-        );
-    });
-}
-
-#[gpui::test]
-fn test_beginning_of_line_stop_at_indent(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let move_to_beg = MoveToBeginningOfLine {
-        stop_at_soft_wraps: true,
-        stop_at_indent: true,
-    };
-
-    let select_to_beg = SelectToBeginningOfLine {
-        stop_at_soft_wraps: true,
-        stop_at_indent: true,
-    };
-
-    let delete_to_beg = DeleteToBeginningOfLine {
-        stop_at_indent: true,
-    };
-
-    let move_to_end = MoveToEndOfLine {
-        stop_at_soft_wraps: false,
-    };
-
-    let editor = cx.add_window(|window, cx| {
-        let buffer = MultiBuffer::build_simple("abc\n  def", cx);
-        build_editor(buffer, window, cx)
-    });
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_display_ranges([
-                DisplayPoint::new(DisplayRow(0), 1)..DisplayPoint::new(DisplayRow(0), 1),
-                DisplayPoint::new(DisplayRow(1), 4)..DisplayPoint::new(DisplayRow(1), 4),
-            ]);
-        });
-
-        // Moving to the beginning of the line should put the first cursor at the beginning of the line,
-        // and the second cursor at the first non-whitespace character in the line.
-        editor.move_to_beginning_of_line(&move_to_beg, window, cx);
-        assert_eq!(
-            display_ranges(editor, cx),
-            &[
-                DisplayPoint::new(DisplayRow(0), 0)..DisplayPoint::new(DisplayRow(0), 0),
-                DisplayPoint::new(DisplayRow(1), 2)..DisplayPoint::new(DisplayRow(1), 2),
-            ]
-        );
-
-        // Moving to the beginning of the line again should be a no-op for the first cursor,
-        // and should move the second cursor to the beginning of the line.
-        editor.move_to_beginning_of_line(&move_to_beg, window, cx);
-        assert_eq!(
-            display_ranges(editor, cx),
-            &[
-                DisplayPoint::new(DisplayRow(0), 0)..DisplayPoint::new(DisplayRow(0), 0),
-                DisplayPoint::new(DisplayRow(1), 0)..DisplayPoint::new(DisplayRow(1), 0),
-            ]
-        );
-
-        // Moving to the beginning of the line again should still be a no-op for the first cursor,
-        // and should move the second cursor back to the first non-whitespace character in the line.
-        editor.move_to_beginning_of_line(&move_to_beg, window, cx);
-        assert_eq!(
-            display_ranges(editor, cx),
-            &[
-                DisplayPoint::new(DisplayRow(0), 0)..DisplayPoint::new(DisplayRow(0), 0),
-                DisplayPoint::new(DisplayRow(1), 2)..DisplayPoint::new(DisplayRow(1), 2),
-            ]
-        );
-
-        // Selecting to the beginning of the line should select to the beginning of the line for the first cursor,
-        // and to the first non-whitespace character in the line for the second cursor.
-        editor.move_to_end_of_line(&move_to_end, window, cx);
-        editor.move_left(&MoveLeft, window, cx);
-        editor.select_to_beginning_of_line(&select_to_beg, window, cx);
-        assert_eq!(
-            display_ranges(editor, cx),
-            &[
-                DisplayPoint::new(DisplayRow(0), 2)..DisplayPoint::new(DisplayRow(0), 0),
-                DisplayPoint::new(DisplayRow(1), 4)..DisplayPoint::new(DisplayRow(1), 2),
-            ]
-        );
-
-        // Selecting to the beginning of the line again should be a no-op for the first cursor,
-        // and should select to the beginning of the line for the second cursor.
-        editor.select_to_beginning_of_line(&select_to_beg, window, cx);
-        assert_eq!(
-            display_ranges(editor, cx),
-            &[
-                DisplayPoint::new(DisplayRow(0), 2)..DisplayPoint::new(DisplayRow(0), 0),
-                DisplayPoint::new(DisplayRow(1), 4)..DisplayPoint::new(DisplayRow(1), 0),
-            ]
-        );
-
-        // Deleting to the beginning of the line should delete to the beginning of the line for the first cursor,
-        // and should delete to the first non-whitespace character in the line for the second cursor.
-        editor.move_to_end_of_line(&move_to_end, window, cx);
-        editor.move_left(&MoveLeft, window, cx);
-        editor.delete_to_beginning_of_line(&delete_to_beg, window, cx);
-        assert_eq!(editor.text(cx), "c\n  f");
-    });
-}
-
-#[gpui::test]
-fn test_beginning_of_line_with_cursor_between_line_start_and_indent(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let move_to_beg = MoveToBeginningOfLine {
-        stop_at_soft_wraps: true,
-        stop_at_indent: true,
-    };
-
-    let editor = cx.add_window(|window, cx| {
-        let buffer = MultiBuffer::build_simple("    hello\nworld", cx);
-        build_editor(buffer, window, cx)
-    });
-
-    _ = editor.update(cx, |editor, window, cx| {
-        // test cursor between line_start and indent_start
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_display_ranges([
-                DisplayPoint::new(DisplayRow(0), 3)..DisplayPoint::new(DisplayRow(0), 3)
-            ]);
-        });
-
-        // cursor should move to line_start
-        editor.move_to_beginning_of_line(&move_to_beg, window, cx);
-        assert_eq!(
-            display_ranges(editor, cx),
-            &[DisplayPoint::new(DisplayRow(0), 0)..DisplayPoint::new(DisplayRow(0), 0)]
-        );
-
-        // cursor should move to indent_start
-        editor.move_to_beginning_of_line(&move_to_beg, window, cx);
-        assert_eq!(
-            display_ranges(editor, cx),
-            &[DisplayPoint::new(DisplayRow(0), 4)..DisplayPoint::new(DisplayRow(0), 4)]
-        );
-
-        // cursor should move to back to line_start
-        editor.move_to_beginning_of_line(&move_to_beg, window, cx);
-        assert_eq!(
-            display_ranges(editor, cx),
-            &[DisplayPoint::new(DisplayRow(0), 0)..DisplayPoint::new(DisplayRow(0), 0)]
-        );
-    });
-}
-
-#[gpui::test]
-fn test_prev_next_word_boundary(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let editor = cx.add_window(|window, cx| {
-        let buffer = MultiBuffer::build_simple("use std::str::{foo, bar}\n\n  {baz.qux()}", cx);
-        build_editor(buffer, window, cx)
-    });
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_display_ranges([
-                DisplayPoint::new(DisplayRow(0), 11)..DisplayPoint::new(DisplayRow(0), 11),
-                DisplayPoint::new(DisplayRow(2), 4)..DisplayPoint::new(DisplayRow(2), 4),
-            ])
-        });
-        editor.move_to_previous_word_start(&MoveToPreviousWordStart, window, cx);
-        assert_selection_ranges("use std::ˇstr::{foo, bar}\n\n  {ˇbaz.qux()}", editor, cx);
-
-        editor.move_to_previous_word_start(&MoveToPreviousWordStart, window, cx);
-        assert_selection_ranges("use stdˇ::str::{foo, bar}\n\nˇ  {baz.qux()}", editor, cx);
-
-        editor.move_to_previous_word_start(&MoveToPreviousWordStart, window, cx);
-        assert_selection_ranges("use ˇstd::str::{foo, bar}\nˇ\n  {baz.qux()}", editor, cx);
-
-        editor.move_to_previous_word_start(&MoveToPreviousWordStart, window, cx);
-        assert_selection_ranges("ˇuse std::str::{foo, barˇ}\n\n  {baz.qux()}", editor, cx);
-
-        editor.move_to_previous_word_start(&MoveToPreviousWordStart, window, cx);
-        assert_selection_ranges("ˇuse std::str::{foo, ˇbar}\n\n  {baz.qux()}", editor, cx);
-
-        editor.move_to_next_word_end(&MoveToNextWordEnd, window, cx);
-        assert_selection_ranges("useˇ std::str::{foo, barˇ}\n\n  {baz.qux()}", editor, cx);
-
-        editor.move_to_next_word_end(&MoveToNextWordEnd, window, cx);
-        assert_selection_ranges("use stdˇ::str::{foo, bar}ˇ\n\n  {baz.qux()}", editor, cx);
-
-        editor.move_to_next_word_end(&MoveToNextWordEnd, window, cx);
-        assert_selection_ranges("use std::ˇstr::{foo, bar}\nˇ\n  {baz.qux()}", editor, cx);
-
-        editor.move_right(&MoveRight, window, cx);
-        editor.select_to_previous_word_start(&SelectToPreviousWordStart, window, cx);
-        assert_selection_ranges(
-            "use std::«ˇs»tr::{foo, bar}\n«ˇ\n»  {baz.qux()}",
-            editor,
-            cx,
-        );
-
-        editor.select_to_previous_word_start(&SelectToPreviousWordStart, window, cx);
-        assert_selection_ranges(
-            "use std«ˇ::s»tr::{foo, bar«ˇ}\n\n»  {baz.qux()}",
-            editor,
-            cx,
-        );
-
-        editor.select_to_next_word_end(&SelectToNextWordEnd, window, cx);
-        assert_selection_ranges(
-            "use std::«ˇs»tr::{foo, bar}«ˇ\n\n»  {baz.qux()}",
-            editor,
-            cx,
-        );
-    });
-}
-
-#[gpui::test]
-fn test_prev_next_word_bounds_with_soft_wrap(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let editor = cx.add_window(|window, cx| {
-        let buffer = MultiBuffer::build_simple("use one::{\n    two::three::four::five\n};", cx);
-        build_editor(buffer, window, cx)
-    });
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.set_wrap_width(Some(140.0.into()), cx);
-        assert_eq!(
-            editor.display_text(cx),
-            "use one::{\n    two::three::\n    four::five\n};"
-        );
-
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_display_ranges([
-                DisplayPoint::new(DisplayRow(1), 7)..DisplayPoint::new(DisplayRow(1), 7)
-            ]);
-        });
-
-        editor.move_to_next_word_end(&MoveToNextWordEnd, window, cx);
-        assert_eq!(
-            display_ranges(editor, cx),
-            &[DisplayPoint::new(DisplayRow(1), 9)..DisplayPoint::new(DisplayRow(1), 9)]
-        );
-
-        editor.move_to_next_word_end(&MoveToNextWordEnd, window, cx);
-        assert_eq!(
-            display_ranges(editor, cx),
-            &[DisplayPoint::new(DisplayRow(1), 14)..DisplayPoint::new(DisplayRow(1), 14)]
-        );
-
-        editor.move_to_next_word_end(&MoveToNextWordEnd, window, cx);
-        assert_eq!(
-            display_ranges(editor, cx),
-            &[DisplayPoint::new(DisplayRow(2), 4)..DisplayPoint::new(DisplayRow(2), 4)]
-        );
-
-        editor.move_to_next_word_end(&MoveToNextWordEnd, window, cx);
-        assert_eq!(
-            display_ranges(editor, cx),
-            &[DisplayPoint::new(DisplayRow(2), 8)..DisplayPoint::new(DisplayRow(2), 8)]
-        );
-
-        editor.move_to_previous_word_start(&MoveToPreviousWordStart, window, cx);
-        assert_eq!(
-            display_ranges(editor, cx),
-            &[DisplayPoint::new(DisplayRow(2), 4)..DisplayPoint::new(DisplayRow(2), 4)]
-        );
-
-        editor.move_to_previous_word_start(&MoveToPreviousWordStart, window, cx);
-        assert_eq!(
-            display_ranges(editor, cx),
-            &[DisplayPoint::new(DisplayRow(1), 14)..DisplayPoint::new(DisplayRow(1), 14)]
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_move_start_of_paragraph_end_of_paragraph(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    let mut cx = EditorTestContext::new(cx).await;
-
-    let line_height = cx.update_editor(|editor, window, cx| {
-        editor
-            .style(cx)
-            .text
-            .line_height_in_pixels(window.rem_size())
-    });
-    cx.simulate_window_resize(cx.window, size(px(100.), 4. * line_height));
-
-    cx.set_state(
-        &r#"ˇone
-        two
-
-        three
-        fourˇ
-        five
-
-        six"#
-            .unindent(),
-    );
-
-    cx.update_editor(|editor, window, cx| {
-        editor.move_to_end_of_paragraph(&MoveToEndOfParagraph, window, cx)
-    });
-    cx.assert_editor_state(
-        &r#"one
-        two
-        ˇ
-        three
-        four
-        five
-        ˇ
-        six"#
-            .unindent(),
-    );
-
-    cx.update_editor(|editor, window, cx| {
-        editor.move_to_end_of_paragraph(&MoveToEndOfParagraph, window, cx)
-    });
-    cx.assert_editor_state(
-        &r#"one
-        two
-
-        three
-        four
-        five
-        ˇ
-        sixˇ"#
-            .unindent(),
-    );
-
-    cx.update_editor(|editor, window, cx| {
-        editor.move_to_end_of_paragraph(&MoveToEndOfParagraph, window, cx)
-    });
-    cx.assert_editor_state(
-        &r#"one
-        two
-
-        three
-        four
-        five
-
-        sixˇ"#
-            .unindent(),
-    );
-
-    cx.update_editor(|editor, window, cx| {
-        editor.move_to_start_of_paragraph(&MoveToStartOfParagraph, window, cx)
-    });
-    cx.assert_editor_state(
-        &r#"one
-        two
-
-        three
-        four
-        five
-        ˇ
-        six"#
-            .unindent(),
-    );
-
-    cx.update_editor(|editor, window, cx| {
-        editor.move_to_start_of_paragraph(&MoveToStartOfParagraph, window, cx)
-    });
-    cx.assert_editor_state(
-        &r#"one
-        two
-        ˇ
-        three
-        four
-        five
-
-        six"#
-            .unindent(),
-    );
-
-    cx.update_editor(|editor, window, cx| {
-        editor.move_to_start_of_paragraph(&MoveToStartOfParagraph, window, cx)
-    });
-    cx.assert_editor_state(
-        &r#"ˇone
-        two
-
-        three
-        four
-        five
-
-        six"#
-            .unindent(),
-    );
-}
-
-#[gpui::test]
-async fn test_scroll_page_up_page_down(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    let mut cx = EditorTestContext::new(cx).await;
-    let line_height = cx.update_editor(|editor, window, cx| {
-        editor
-            .style(cx)
-            .text
-            .line_height_in_pixels(window.rem_size())
-    });
-    let window = cx.window;
-    cx.simulate_window_resize(window, size(px(1000.), 4. * line_height + px(0.5)));
-
-    cx.set_state(
-        r#"ˇone
-        two
-        three
-        four
-        five
-        six
-        seven
-        eight
-        nine
-        ten
-        "#,
-    );
-
-    cx.update_editor(|editor, window, cx| {
-        assert_eq!(
-            editor.snapshot(window, cx).scroll_position(),
-            gpui::Point::new(0., 0.)
-        );
-        editor.scroll_screen(&ScrollAmount::Page(1.), window, cx);
-        assert_eq!(
-            editor.snapshot(window, cx).scroll_position(),
-            gpui::Point::new(0., 3.)
-        );
-        editor.scroll_screen(&ScrollAmount::Page(1.), window, cx);
-        assert_eq!(
-            editor.snapshot(window, cx).scroll_position(),
-            gpui::Point::new(0., 6.)
-        );
-        editor.scroll_screen(&ScrollAmount::Page(-1.), window, cx);
-        assert_eq!(
-            editor.snapshot(window, cx).scroll_position(),
-            gpui::Point::new(0., 3.)
-        );
-
-        editor.scroll_screen(&ScrollAmount::Page(-0.5), window, cx);
-        assert_eq!(
-            editor.snapshot(window, cx).scroll_position(),
-            gpui::Point::new(0., 1.)
-        );
-        editor.scroll_screen(&ScrollAmount::Page(0.5), window, cx);
-        assert_eq!(
-            editor.snapshot(window, cx).scroll_position(),
-            gpui::Point::new(0., 3.)
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_autoscroll(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    let mut cx = EditorTestContext::new(cx).await;
-
-    let line_height = cx.update_editor(|editor, window, cx| {
-        editor.set_vertical_scroll_margin(2, cx);
-        editor
-            .style(cx)
-            .text
-            .line_height_in_pixels(window.rem_size())
-    });
-    let window = cx.window;
-    cx.simulate_window_resize(window, size(px(1000.), 6. * line_height));
-
-    cx.set_state(
-        r#"ˇone
-            two
-            three
-            four
-            five
-            six
-            seven
-            eight
-            nine
-            ten
-        "#,
-    );
-    cx.update_editor(|editor, window, cx| {
-        assert_eq!(
-            editor.snapshot(window, cx).scroll_position(),
-            gpui::Point::new(0., 0.0)
-        );
-    });
-
-    // Add a cursor below the visible area. Since both cursors cannot fit
-    // on screen, the editor autoscrolls to reveal the newest cursor, and
-    // allows the vertical scroll margin below that cursor.
-    cx.update_editor(|editor, window, cx| {
-        editor.change_selections(Default::default(), window, cx, |selections| {
-            selections.select_ranges([
-                Point::new(0, 0)..Point::new(0, 0),
-                Point::new(6, 0)..Point::new(6, 0),
-            ]);
-        })
-    });
-    cx.update_editor(|editor, window, cx| {
-        assert_eq!(
-            editor.snapshot(window, cx).scroll_position(),
-            gpui::Point::new(0., 3.0)
-        );
-    });
-
-    // Move down. The editor cursor scrolls down to track the newest cursor.
-    cx.update_editor(|editor, window, cx| {
-        editor.move_down(&Default::default(), window, cx);
-    });
-    cx.update_editor(|editor, window, cx| {
-        assert_eq!(
-            editor.snapshot(window, cx).scroll_position(),
-            gpui::Point::new(0., 4.0)
-        );
-    });
-
-    // Add a cursor above the visible area. Since both cursors fit on screen,
-    // the editor scrolls to show both.
-    cx.update_editor(|editor, window, cx| {
-        editor.change_selections(Default::default(), window, cx, |selections| {
-            selections.select_ranges([
-                Point::new(1, 0)..Point::new(1, 0),
-                Point::new(6, 0)..Point::new(6, 0),
-            ]);
-        })
-    });
-    cx.update_editor(|editor, window, cx| {
-        assert_eq!(
-            editor.snapshot(window, cx).scroll_position(),
-            gpui::Point::new(0., 1.0)
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_move_page_up_page_down(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    let mut cx = EditorTestContext::new(cx).await;
-
-    let line_height = cx.update_editor(|editor, window, cx| {
-        editor
-            .style(cx)
-            .text
-            .line_height_in_pixels(window.rem_size())
-    });
-    let window = cx.window;
-    cx.simulate_window_resize(window, size(px(100.), 4. * line_height));
-    cx.set_state(
-        &r#"
-        ˇone
-        two
-        threeˇ
-        four
-        five
-        six
-        seven
-        eight
-        nine
-        ten
-        "#
-        .unindent(),
-    );
-
-    cx.update_editor(|editor, window, cx| {
-        editor.move_page_down(&MovePageDown::default(), window, cx)
-    });
-    cx.assert_editor_state(
-        &r#"
-        one
-        two
-        three
-        ˇfour
-        five
-        sixˇ
-        seven
-        eight
-        nine
-        ten
-        "#
-        .unindent(),
-    );
-
-    cx.update_editor(|editor, window, cx| {
-        editor.move_page_down(&MovePageDown::default(), window, cx)
-    });
-    cx.assert_editor_state(
-        &r#"
-        one
-        two
-        three
-        four
-        five
-        six
-        ˇseven
-        eight
-        nineˇ
-        ten
-        "#
-        .unindent(),
-    );
-
-    cx.update_editor(|editor, window, cx| editor.move_page_up(&MovePageUp::default(), window, cx));
-    cx.assert_editor_state(
-        &r#"
-        one
-        two
-        three
-        ˇfour
-        five
-        sixˇ
-        seven
-        eight
-        nine
-        ten
-        "#
-        .unindent(),
-    );
-
-    cx.update_editor(|editor, window, cx| editor.move_page_up(&MovePageUp::default(), window, cx));
-    cx.assert_editor_state(
-        &r#"
-        ˇone
-        two
-        threeˇ
-        four
-        five
-        six
-        seven
-        eight
-        nine
-        ten
-        "#
-        .unindent(),
-    );
-
-    // Test select collapsing
-    cx.update_editor(|editor, window, cx| {
-        editor.move_page_down(&MovePageDown::default(), window, cx);
-        editor.move_page_down(&MovePageDown::default(), window, cx);
-        editor.move_page_down(&MovePageDown::default(), window, cx);
-    });
-    cx.assert_editor_state(
-        &r#"
-        one
-        two
-        three
-        four
-        five
-        six
-        seven
-        eight
-        nine
-        ˇten
-        ˇ"#
-        .unindent(),
-    );
-}
-
-#[gpui::test]
-async fn test_delete_to_beginning_of_line(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    let mut cx = EditorTestContext::new(cx).await;
-    cx.set_state("one «two threeˇ» four");
-    cx.update_editor(|editor, window, cx| {
-        editor.delete_to_beginning_of_line(
-            &DeleteToBeginningOfLine {
-                stop_at_indent: false,
-            },
-            window,
-            cx,
-        );
-        assert_eq!(editor.text(cx), " four");
-    });
-}
-
-#[gpui::test]
-async fn test_delete_to_word_boundary(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    // For an empty selection, the preceding word fragment is deleted.
-    // For non-empty selections, only selected characters are deleted.
-    cx.set_state("onˇe two t«hreˇ»e four");
-    cx.update_editor(|editor, window, cx| {
-        editor.delete_to_previous_word_start(
-            &DeleteToPreviousWordStart {
-                ignore_newlines: false,
-                ignore_brackets: false,
-            },
-            window,
-            cx,
-        );
-    });
-    cx.assert_editor_state("ˇe two tˇe four");
-
-    cx.set_state("e tˇwo te «fˇ»our");
-    cx.update_editor(|editor, window, cx| {
-        editor.delete_to_next_word_end(
-            &DeleteToNextWordEnd {
-                ignore_newlines: false,
-                ignore_brackets: false,
-            },
-            window,
-            cx,
-        );
-    });
-    cx.assert_editor_state("e tˇ te ˇour");
-}
-
-#[gpui::test]
-async fn test_delete_whitespaces(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    cx.set_state("here is some text    ˇwith a space");
-    cx.update_editor(|editor, window, cx| {
-        editor.delete_to_previous_word_start(
-            &DeleteToPreviousWordStart {
-                ignore_newlines: false,
-                ignore_brackets: true,
-            },
-            window,
-            cx,
-        );
-    });
-    // Continuous whitespace sequences are removed entirely, words behind them are not affected by the deletion action.
-    cx.assert_editor_state("here is some textˇwith a space");
-
-    cx.set_state("here is some text    ˇwith a space");
-    cx.update_editor(|editor, window, cx| {
-        editor.delete_to_previous_word_start(
-            &DeleteToPreviousWordStart {
-                ignore_newlines: false,
-                ignore_brackets: false,
-            },
-            window,
-            cx,
-        );
-    });
-    cx.assert_editor_state("here is some textˇwith a space");
-
-    cx.set_state("here is some textˇ    with a space");
-    cx.update_editor(|editor, window, cx| {
-        editor.delete_to_next_word_end(
-            &DeleteToNextWordEnd {
-                ignore_newlines: false,
-                ignore_brackets: true,
-            },
-            window,
-            cx,
-        );
-    });
-    // Same happens in the other direction.
-    cx.assert_editor_state("here is some textˇwith a space");
-
-    cx.set_state("here is some textˇ    with a space");
-    cx.update_editor(|editor, window, cx| {
-        editor.delete_to_next_word_end(
-            &DeleteToNextWordEnd {
-                ignore_newlines: false,
-                ignore_brackets: false,
-            },
-            window,
-            cx,
-        );
-    });
-    cx.assert_editor_state("here is some textˇwith a space");
-
-    cx.set_state("here is some textˇ    with a space");
-    cx.update_editor(|editor, window, cx| {
-        editor.delete_to_next_word_end(
-            &DeleteToNextWordEnd {
-                ignore_newlines: true,
-                ignore_brackets: false,
-            },
-            window,
-            cx,
-        );
-    });
-    cx.assert_editor_state("here is some textˇwith a space");
-    cx.update_editor(|editor, window, cx| {
-        editor.delete_to_previous_word_start(
-            &DeleteToPreviousWordStart {
-                ignore_newlines: true,
-                ignore_brackets: false,
-            },
-            window,
-            cx,
-        );
-    });
-    cx.assert_editor_state("here is some ˇwith a space");
-    cx.update_editor(|editor, window, cx| {
-        editor.delete_to_previous_word_start(
-            &DeleteToPreviousWordStart {
-                ignore_newlines: true,
-                ignore_brackets: false,
-            },
-            window,
-            cx,
-        );
-    });
-    // Single whitespaces are removed with the word behind them.
-    cx.assert_editor_state("here is ˇwith a space");
-    cx.update_editor(|editor, window, cx| {
-        editor.delete_to_previous_word_start(
-            &DeleteToPreviousWordStart {
-                ignore_newlines: true,
-                ignore_brackets: false,
-            },
-            window,
-            cx,
-        );
-    });
-    cx.assert_editor_state("here ˇwith a space");
-    cx.update_editor(|editor, window, cx| {
-        editor.delete_to_previous_word_start(
-            &DeleteToPreviousWordStart {
-                ignore_newlines: true,
-                ignore_brackets: false,
-            },
-            window,
-            cx,
-        );
-    });
-    cx.assert_editor_state("ˇwith a space");
-    cx.update_editor(|editor, window, cx| {
-        editor.delete_to_previous_word_start(
-            &DeleteToPreviousWordStart {
-                ignore_newlines: true,
-                ignore_brackets: false,
-            },
-            window,
-            cx,
-        );
-    });
-    cx.assert_editor_state("ˇwith a space");
-    cx.update_editor(|editor, window, cx| {
-        editor.delete_to_next_word_end(
-            &DeleteToNextWordEnd {
-                ignore_newlines: true,
-                ignore_brackets: false,
-            },
-            window,
-            cx,
-        );
-    });
-    // Same happens in the other direction.
-    cx.assert_editor_state("ˇ a space");
-    cx.update_editor(|editor, window, cx| {
-        editor.delete_to_next_word_end(
-            &DeleteToNextWordEnd {
-                ignore_newlines: true,
-                ignore_brackets: false,
-            },
-            window,
-            cx,
-        );
-    });
-    cx.assert_editor_state("ˇ space");
-    cx.update_editor(|editor, window, cx| {
-        editor.delete_to_next_word_end(
-            &DeleteToNextWordEnd {
-                ignore_newlines: true,
-                ignore_brackets: false,
-            },
-            window,
-            cx,
-        );
-    });
-    cx.assert_editor_state("ˇ");
-    cx.update_editor(|editor, window, cx| {
-        editor.delete_to_next_word_end(
-            &DeleteToNextWordEnd {
-                ignore_newlines: true,
-                ignore_brackets: false,
-            },
-            window,
-            cx,
-        );
-    });
-    cx.assert_editor_state("ˇ");
-    cx.update_editor(|editor, window, cx| {
-        editor.delete_to_previous_word_start(
-            &DeleteToPreviousWordStart {
-                ignore_newlines: true,
-                ignore_brackets: false,
-            },
-            window,
-            cx,
-        );
-    });
-    cx.assert_editor_state("ˇ");
-}
-
-#[gpui::test]
-async fn test_delete_to_bracket(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let language = Arc::new(
-        Language::new(
-            LanguageConfig {
-                brackets: BracketPairConfig {
-                    pairs: vec![
-                        BracketPair {
-                            start: "\"".to_string(),
-                            end: "\"".to_string(),
-                            close: true,
-                            surround: true,
-                            newline: false,
-                        },
-                        BracketPair {
-                            start: "(".to_string(),
-                            end: ")".to_string(),
-                            close: true,
-                            surround: true,
-                            newline: true,
-                        },
-                    ],
-                    ..BracketPairConfig::default()
-                },
-                ..LanguageConfig::default()
-            },
-            Some(tree_sitter_rust::LANGUAGE.into()),
-        )
-        .with_brackets_query(
-            r#"
-                ("(" @open ")" @close)
-                ("\"" @open "\"" @close)
-            "#,
-        )
-        .unwrap(),
-    );
-
-    let mut cx = EditorTestContext::new(cx).await;
-    cx.update_buffer(|buffer, cx| buffer.set_language(Some(language), cx));
-
-    cx.set_state(r#"macro!("// ˇCOMMENT");"#);
-    cx.update_editor(|editor, window, cx| {
-        editor.delete_to_previous_word_start(
-            &DeleteToPreviousWordStart {
-                ignore_newlines: true,
-                ignore_brackets: false,
-            },
-            window,
-            cx,
-        );
-    });
-    // Deletion stops before brackets if asked to not ignore them.
-    cx.assert_editor_state(r#"macro!("ˇCOMMENT");"#);
-    cx.update_editor(|editor, window, cx| {
-        editor.delete_to_previous_word_start(
-            &DeleteToPreviousWordStart {
-                ignore_newlines: true,
-                ignore_brackets: false,
-            },
-            window,
-            cx,
-        );
-    });
-    // Deletion has to remove a single bracket and then stop again.
-    cx.assert_editor_state(r#"macro!(ˇCOMMENT");"#);
-
-    cx.update_editor(|editor, window, cx| {
-        editor.delete_to_previous_word_start(
-            &DeleteToPreviousWordStart {
-                ignore_newlines: true,
-                ignore_brackets: false,
-            },
-            window,
-            cx,
-        );
-    });
-    cx.assert_editor_state(r#"macro!ˇCOMMENT");"#);
-
-    cx.update_editor(|editor, window, cx| {
-        editor.delete_to_previous_word_start(
-            &DeleteToPreviousWordStart {
-                ignore_newlines: true,
-                ignore_brackets: false,
-            },
-            window,
-            cx,
-        );
-    });
-    cx.assert_editor_state(r#"ˇCOMMENT");"#);
-
-    cx.update_editor(|editor, window, cx| {
-        editor.delete_to_previous_word_start(
-            &DeleteToPreviousWordStart {
-                ignore_newlines: true,
-                ignore_brackets: false,
-            },
-            window,
-            cx,
-        );
-    });
-    cx.assert_editor_state(r#"ˇCOMMENT");"#);
-
-    cx.update_editor(|editor, window, cx| {
-        editor.delete_to_next_word_end(
-            &DeleteToNextWordEnd {
-                ignore_newlines: true,
-                ignore_brackets: false,
-            },
-            window,
-            cx,
-        );
-    });
-    // Brackets on the right are not paired anymore, hence deletion does not stop at them
-    cx.assert_editor_state(r#"ˇ");"#);
-
-    cx.update_editor(|editor, window, cx| {
-        editor.delete_to_next_word_end(
-            &DeleteToNextWordEnd {
-                ignore_newlines: true,
-                ignore_brackets: false,
-            },
-            window,
-            cx,
-        );
-    });
-    cx.assert_editor_state(r#"ˇ"#);
-
-    cx.update_editor(|editor, window, cx| {
-        editor.delete_to_next_word_end(
-            &DeleteToNextWordEnd {
-                ignore_newlines: true,
-                ignore_brackets: false,
-            },
-            window,
-            cx,
-        );
-    });
-    cx.assert_editor_state(r#"ˇ"#);
-
-    cx.set_state(r#"macro!("// ˇCOMMENT");"#);
-    cx.update_editor(|editor, window, cx| {
-        editor.delete_to_previous_word_start(
-            &DeleteToPreviousWordStart {
-                ignore_newlines: true,
-                ignore_brackets: true,
-            },
-            window,
-            cx,
-        );
-    });
-    cx.assert_editor_state(r#"macroˇCOMMENT");"#);
-}
-
-#[gpui::test]
-fn test_delete_to_previous_word_start_or_newline(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let editor = cx.add_window(|window, cx| {
-        let buffer = MultiBuffer::build_simple("one\n2\nthree\n4", cx);
-        build_editor(buffer, window, cx)
-    });
-    let del_to_prev_word_start = DeleteToPreviousWordStart {
-        ignore_newlines: false,
-        ignore_brackets: false,
-    };
-    let del_to_prev_word_start_ignore_newlines = DeleteToPreviousWordStart {
-        ignore_newlines: true,
-        ignore_brackets: false,
-    };
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_display_ranges([
-                DisplayPoint::new(DisplayRow(3), 1)..DisplayPoint::new(DisplayRow(3), 1)
-            ])
-        });
-        editor.delete_to_previous_word_start(&del_to_prev_word_start, window, cx);
-        assert_eq!(editor.buffer.read(cx).read(cx).text(), "one\n2\nthree\n");
-        editor.delete_to_previous_word_start(&del_to_prev_word_start, window, cx);
-        assert_eq!(editor.buffer.read(cx).read(cx).text(), "one\n2\nthree");
-        editor.delete_to_previous_word_start(&del_to_prev_word_start, window, cx);
-        assert_eq!(editor.buffer.read(cx).read(cx).text(), "one\n2\n");
-        editor.delete_to_previous_word_start(&del_to_prev_word_start, window, cx);
-        assert_eq!(editor.buffer.read(cx).read(cx).text(), "one\n2");
-        editor.delete_to_previous_word_start(&del_to_prev_word_start_ignore_newlines, window, cx);
-        assert_eq!(editor.buffer.read(cx).read(cx).text(), "one\n");
-        editor.delete_to_previous_word_start(&del_to_prev_word_start_ignore_newlines, window, cx);
-        assert_eq!(editor.buffer.read(cx).read(cx).text(), "");
-    });
-}
-
-#[gpui::test]
-fn test_delete_to_next_word_end_or_newline(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let editor = cx.add_window(|window, cx| {
-        let buffer = MultiBuffer::build_simple("\none\n   two\nthree\n   four", cx);
-        build_editor(buffer, window, cx)
-    });
-    let del_to_next_word_end = DeleteToNextWordEnd {
-        ignore_newlines: false,
-        ignore_brackets: false,
-    };
-    let del_to_next_word_end_ignore_newlines = DeleteToNextWordEnd {
-        ignore_newlines: true,
-        ignore_brackets: false,
-    };
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_display_ranges([
-                DisplayPoint::new(DisplayRow(0), 0)..DisplayPoint::new(DisplayRow(0), 0)
-            ])
-        });
-        editor.delete_to_next_word_end(&del_to_next_word_end, window, cx);
-        assert_eq!(
-            editor.buffer.read(cx).read(cx).text(),
-            "one\n   two\nthree\n   four"
-        );
-        editor.delete_to_next_word_end(&del_to_next_word_end, window, cx);
-        assert_eq!(
-            editor.buffer.read(cx).read(cx).text(),
-            "\n   two\nthree\n   four"
-        );
-        editor.delete_to_next_word_end(&del_to_next_word_end, window, cx);
-        assert_eq!(
-            editor.buffer.read(cx).read(cx).text(),
-            "two\nthree\n   four"
-        );
-        editor.delete_to_next_word_end(&del_to_next_word_end, window, cx);
-        assert_eq!(editor.buffer.read(cx).read(cx).text(), "\nthree\n   four");
-        editor.delete_to_next_word_end(&del_to_next_word_end_ignore_newlines, window, cx);
-        assert_eq!(editor.buffer.read(cx).read(cx).text(), "\n   four");
-        editor.delete_to_next_word_end(&del_to_next_word_end_ignore_newlines, window, cx);
-        assert_eq!(editor.buffer.read(cx).read(cx).text(), "four");
-        editor.delete_to_next_word_end(&del_to_next_word_end_ignore_newlines, window, cx);
-        assert_eq!(editor.buffer.read(cx).read(cx).text(), "");
-    });
-}
-
-#[gpui::test]
-fn test_newline(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let editor = cx.add_window(|window, cx| {
-        let buffer = MultiBuffer::build_simple("aaaa\n    bbbb\n", cx);
-        build_editor(buffer, window, cx)
-    });
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_display_ranges([
-                DisplayPoint::new(DisplayRow(0), 2)..DisplayPoint::new(DisplayRow(0), 2),
-                DisplayPoint::new(DisplayRow(1), 2)..DisplayPoint::new(DisplayRow(1), 2),
-                DisplayPoint::new(DisplayRow(1), 6)..DisplayPoint::new(DisplayRow(1), 6),
-            ])
-        });
-
-        editor.newline(&Newline, window, cx);
-        assert_eq!(editor.text(cx), "aa\naa\n  \n    bb\n    bb\n");
-    });
-}
-
-#[gpui::test]
-async fn test_newline_yaml(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-    let yaml_language = languages::language("yaml", tree_sitter_yaml::LANGUAGE.into());
-    cx.update_buffer(|buffer, cx| buffer.set_language(Some(yaml_language), cx));
-
-    // Object (between 2 fields)
-    cx.set_state(indoc! {"
-    test:ˇ
-    hello: bye"});
-    cx.update_editor(|e, window, cx| e.newline(&Newline, window, cx));
-    cx.assert_editor_state(indoc! {"
-    test:
-        ˇ
-    hello: bye"});
-
-    // Object (first and single line)
-    cx.set_state(indoc! {"
-    test:ˇ"});
-    cx.update_editor(|e, window, cx| e.newline(&Newline, window, cx));
-    cx.assert_editor_state(indoc! {"
-    test:
-        ˇ"});
-
-    // Array with objects (after first element)
-    cx.set_state(indoc! {"
-    test:
-        - foo: barˇ"});
-    cx.update_editor(|e, window, cx| e.newline(&Newline, window, cx));
-    cx.assert_editor_state(indoc! {"
-    test:
-        - foo: bar
-        ˇ"});
-
-    // Array with objects and comment
-    cx.set_state(indoc! {"
-    test:
-        - foo: bar
-        - bar: # testˇ"});
-    cx.update_editor(|e, window, cx| e.newline(&Newline, window, cx));
-    cx.assert_editor_state(indoc! {"
-    test:
-        - foo: bar
-        - bar: # test
-            ˇ"});
-
-    // Array with objects (after second element)
-    cx.set_state(indoc! {"
-    test:
-        - foo: bar
-        - bar: fooˇ"});
-    cx.update_editor(|e, window, cx| e.newline(&Newline, window, cx));
-    cx.assert_editor_state(indoc! {"
-    test:
-        - foo: bar
-        - bar: foo
-        ˇ"});
-
-    // Array with strings (after first element)
-    cx.set_state(indoc! {"
-    test:
-        - fooˇ"});
-    cx.update_editor(|e, window, cx| e.newline(&Newline, window, cx));
-    cx.assert_editor_state(indoc! {"
-    test:
-        - foo
-        ˇ"});
-}
-
-#[gpui::test]
-fn test_newline_with_old_selections(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let editor = cx.add_window(|window, cx| {
-        let buffer = MultiBuffer::build_simple(
-            "
-                a
-                b(
-                    X
-                )
-                c(
-                    X
-                )
-            "
-            .unindent()
-            .as_str(),
-            cx,
-        );
-        let mut editor = build_editor(buffer, window, cx);
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([
-                Point::new(2, 4)..Point::new(2, 5),
-                Point::new(5, 4)..Point::new(5, 5),
-            ])
-        });
-        editor
-    });
-
-    _ = editor.update(cx, |editor, window, cx| {
-        // Edit the buffer directly, deleting ranges surrounding the editor's selections
-        editor.buffer.update(cx, |buffer, cx| {
-            buffer.edit(
-                [
-                    (Point::new(1, 2)..Point::new(3, 0), ""),
-                    (Point::new(4, 2)..Point::new(6, 0), ""),
-                ],
-                None,
-                cx,
-            );
-            assert_eq!(
-                buffer.read(cx).text(),
-                "
-                    a
-                    b()
-                    c()
-                "
-                .unindent()
-            );
-        });
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            &[
-                Point::new(1, 2)..Point::new(1, 2),
-                Point::new(2, 2)..Point::new(2, 2),
-            ],
-        );
-
-        editor.newline(&Newline, window, cx);
-        assert_eq!(
-            editor.text(cx),
-            "
-                a
-                b(
-                )
-                c(
-                )
-            "
-            .unindent()
-        );
-
-        // The selections are moved after the inserted newlines
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            &[
-                Point::new(2, 0)..Point::new(2, 0),
-                Point::new(4, 0)..Point::new(4, 0),
-            ],
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_newline_above(cx: &mut TestAppContext) {
-    init_test(cx, |settings| {
-        settings.defaults.tab_size = NonZeroU32::new(4)
-    });
-
-    let language = Arc::new(
-        Language::new(
-            LanguageConfig::default(),
-            Some(tree_sitter_rust::LANGUAGE.into()),
-        )
-        .with_indents_query(r#"(_ "(" ")" @end) @indent"#)
-        .unwrap(),
-    );
-
-    let mut cx = EditorTestContext::new(cx).await;
-    cx.update_buffer(|buffer, cx| buffer.set_language(Some(language), cx));
-    cx.set_state(indoc! {"
-        const a: ˇA = (
-            (ˇ
-                «const_functionˇ»(ˇ),
-                so«mˇ»et«hˇ»ing_ˇelse,ˇ
-            )ˇ
-        ˇ);ˇ
-    "});
-
-    cx.update_editor(|e, window, cx| e.newline_above(&NewlineAbove, window, cx));
-    cx.assert_editor_state(indoc! {"
-        ˇ
-        const a: A = (
-            ˇ
-            (
-                ˇ
-                ˇ
-                const_function(),
-                ˇ
-                ˇ
-                ˇ
-                ˇ
-                something_else,
-                ˇ
-            )
-            ˇ
-            ˇ
-        );
-    "});
-}
-
-#[gpui::test]
-async fn test_newline_below(cx: &mut TestAppContext) {
-    init_test(cx, |settings| {
-        settings.defaults.tab_size = NonZeroU32::new(4)
-    });
-
-    let language = Arc::new(
-        Language::new(
-            LanguageConfig::default(),
-            Some(tree_sitter_rust::LANGUAGE.into()),
-        )
-        .with_indents_query(r#"(_ "(" ")" @end) @indent"#)
-        .unwrap(),
-    );
-
-    let mut cx = EditorTestContext::new(cx).await;
-    cx.update_buffer(|buffer, cx| buffer.set_language(Some(language), cx));
-    cx.set_state(indoc! {"
-        const a: ˇA = (
-            (ˇ
-                «const_functionˇ»(ˇ),
-                so«mˇ»et«hˇ»ing_ˇelse,ˇ
-            )ˇ
-        ˇ);ˇ
-    "});
-
-    cx.update_editor(|e, window, cx| e.newline_below(&NewlineBelow, window, cx));
-    cx.assert_editor_state(indoc! {"
-        const a: A = (
-            ˇ
-            (
-                ˇ
-                const_function(),
-                ˇ
-                ˇ
-                something_else,
-                ˇ
-                ˇ
-                ˇ
-                ˇ
-            )
-            ˇ
-        );
-        ˇ
-        ˇ
-    "});
-}
-
-#[gpui::test]
-async fn test_newline_comments(cx: &mut TestAppContext) {
-    init_test(cx, |settings| {
-        settings.defaults.tab_size = NonZeroU32::new(4)
-    });
-
-    let language = Arc::new(Language::new(
-        LanguageConfig {
-            line_comments: vec!["// ".into()],
-            ..LanguageConfig::default()
-        },
-        None,
-    ));
-    {
-        let mut cx = EditorTestContext::new(cx).await;
-        cx.update_buffer(|buffer, cx| buffer.set_language(Some(language), cx));
-        cx.set_state(indoc! {"
-        // Fooˇ
-    "});
-
-        cx.update_editor(|e, window, cx| e.newline(&Newline, window, cx));
-        cx.assert_editor_state(indoc! {"
-        // Foo
-        // ˇ
-    "});
-        // Ensure that we add comment prefix when existing line contains space
-        cx.update_editor(|e, window, cx| e.newline(&Newline, window, cx));
-        cx.assert_editor_state(
-            indoc! {"
-        // Foo
-        //s
-        // ˇ
-    "}
-            .replace("s", " ") // s is used as space placeholder to prevent format on save
-            .as_str(),
-        );
-        // Ensure that we add comment prefix when existing line does not contain space
-        cx.set_state(indoc! {"
-        // Foo
-        //ˇ
-    "});
-        cx.update_editor(|e, window, cx| e.newline(&Newline, window, cx));
-        cx.assert_editor_state(indoc! {"
-        // Foo
-        //
-        // ˇ
-    "});
-        // Ensure that if cursor is before the comment start, we do not actually insert a comment prefix.
-        cx.set_state(indoc! {"
-        ˇ// Foo
-    "});
-        cx.update_editor(|e, window, cx| e.newline(&Newline, window, cx));
-        cx.assert_editor_state(indoc! {"
-
-        ˇ// Foo
-    "});
-    }
-    // Ensure that comment continuations can be disabled.
-    update_test_language_settings(cx, |settings| {
-        settings.defaults.extend_comment_on_newline = Some(false);
-    });
-    let mut cx = EditorTestContext::new(cx).await;
-    cx.set_state(indoc! {"
-        // Fooˇ
-    "});
-    cx.update_editor(|e, window, cx| e.newline(&Newline, window, cx));
-    cx.assert_editor_state(indoc! {"
-        // Foo
-        ˇ
-    "});
-}
-
-#[gpui::test]
-async fn test_newline_comments_with_multiple_delimiters(cx: &mut TestAppContext) {
-    init_test(cx, |settings| {
-        settings.defaults.tab_size = NonZeroU32::new(4)
-    });
-
-    let language = Arc::new(Language::new(
-        LanguageConfig {
-            line_comments: vec!["// ".into(), "/// ".into()],
-            ..LanguageConfig::default()
-        },
-        None,
-    ));
-    {
-        let mut cx = EditorTestContext::new(cx).await;
-        cx.update_buffer(|buffer, cx| buffer.set_language(Some(language), cx));
-        cx.set_state(indoc! {"
-        //ˇ
-    "});
-        cx.update_editor(|e, window, cx| e.newline(&Newline, window, cx));
-        cx.assert_editor_state(indoc! {"
-        //
-        // ˇ
-    "});
-
-        cx.set_state(indoc! {"
-        ///ˇ
-    "});
-        cx.update_editor(|e, window, cx| e.newline(&Newline, window, cx));
-        cx.assert_editor_state(indoc! {"
-        ///
-        /// ˇ
-    "});
-    }
-}
-
-#[gpui::test]
-async fn test_newline_documentation_comments(cx: &mut TestAppContext) {
-    init_test(cx, |settings| {
-        settings.defaults.tab_size = NonZeroU32::new(4)
-    });
-
-    let language = Arc::new(
-        Language::new(
-            LanguageConfig {
-                documentation_comment: Some(language::BlockCommentConfig {
-                    start: "/**".into(),
-                    end: "*/".into(),
-                    prefix: "* ".into(),
-                    tab_size: 1,
-                }),
-
-                ..LanguageConfig::default()
-            },
-            Some(tree_sitter_rust::LANGUAGE.into()),
-        )
-        .with_override_query("[(line_comment)(block_comment)] @comment.inclusive")
-        .unwrap(),
-    );
-
-    {
-        let mut cx = EditorTestContext::new(cx).await;
-        cx.update_buffer(|buffer, cx| buffer.set_language(Some(language), cx));
-        cx.set_state(indoc! {"
-        /**ˇ
-    "});
-
-        cx.update_editor(|e, window, cx| e.newline(&Newline, window, cx));
-        cx.assert_editor_state(indoc! {"
-        /**
-         * ˇ
-    "});
-        // Ensure that if cursor is before the comment start,
-        // we do not actually insert a comment prefix.
-        cx.set_state(indoc! {"
-        ˇ/**
-    "});
-        cx.update_editor(|e, window, cx| e.newline(&Newline, window, cx));
-        cx.assert_editor_state(indoc! {"
-
-        ˇ/**
-    "});
-        // Ensure that if cursor is between it doesn't add comment prefix.
-        cx.set_state(indoc! {"
-        /*ˇ*
-    "});
-        cx.update_editor(|e, window, cx| e.newline(&Newline, window, cx));
-        cx.assert_editor_state(indoc! {"
-        /*
-        ˇ*
-    "});
-        // Ensure that if suffix exists on same line after cursor it adds new line.
-        cx.set_state(indoc! {"
-        /**ˇ*/
-    "});
-        cx.update_editor(|e, window, cx| e.newline(&Newline, window, cx));
-        cx.assert_editor_state(indoc! {"
-        /**
-         * ˇ
-         */
-    "});
-        // Ensure that if suffix exists on same line after cursor with space it adds new line.
-        cx.set_state(indoc! {"
-        /**ˇ */
-    "});
-        cx.update_editor(|e, window, cx| e.newline(&Newline, window, cx));
-        cx.assert_editor_state(indoc! {"
-        /**
-         * ˇ
-         */
-    "});
-        // Ensure that if suffix exists on same line after cursor with space it adds new line.
-        cx.set_state(indoc! {"
-        /** ˇ*/
-    "});
-        cx.update_editor(|e, window, cx| e.newline(&Newline, window, cx));
-        cx.assert_editor_state(
-            indoc! {"
-        /**s
-         * ˇ
-         */
-    "}
-            .replace("s", " ") // s is used as space placeholder to prevent format on save
-            .as_str(),
-        );
-        // Ensure that delimiter space is preserved when newline on already
-        // spaced delimiter.
-        cx.update_editor(|e, window, cx| e.newline(&Newline, window, cx));
-        cx.assert_editor_state(
-            indoc! {"
-        /**s
-         *s
-         * ˇ
-         */
-    "}
-            .replace("s", " ") // s is used as space placeholder to prevent format on save
-            .as_str(),
-        );
-        // Ensure that delimiter space is preserved when space is not
-        // on existing delimiter.
-        cx.set_state(indoc! {"
-        /**
-         *ˇ
-         */
-    "});
-        cx.update_editor(|e, window, cx| e.newline(&Newline, window, cx));
-        cx.assert_editor_state(indoc! {"
-        /**
-         *
-         * ˇ
-         */
-    "});
-        // Ensure that if suffix exists on same line after cursor it
-        // doesn't add extra new line if prefix is not on same line.
-        cx.set_state(indoc! {"
-        /**
-        ˇ*/
-    "});
-        cx.update_editor(|e, window, cx| e.newline(&Newline, window, cx));
-        cx.assert_editor_state(indoc! {"
-        /**
-
-        ˇ*/
-    "});
-        // Ensure that it detects suffix after existing prefix.
-        cx.set_state(indoc! {"
-        /**ˇ/
-    "});
-        cx.update_editor(|e, window, cx| e.newline(&Newline, window, cx));
-        cx.assert_editor_state(indoc! {"
-        /**
-        ˇ/
-    "});
-        // Ensure that if suffix exists on same line before
-        // cursor it does not add comment prefix.
-        cx.set_state(indoc! {"
-        /** */ˇ
-    "});
-        cx.update_editor(|e, window, cx| e.newline(&Newline, window, cx));
-        cx.assert_editor_state(indoc! {"
-        /** */
-        ˇ
-    "});
-        // Ensure that if suffix exists on same line before
-        // cursor it does not add comment prefix.
-        cx.set_state(indoc! {"
-        /**
-         *
-         */ˇ
-    "});
-        cx.update_editor(|e, window, cx| e.newline(&Newline, window, cx));
-        cx.assert_editor_state(indoc! {"
-        /**
-         *
-         */
-         ˇ
-    "});
-
-        // Ensure that inline comment followed by code
-        // doesn't add comment prefix on newline
-        cx.set_state(indoc! {"
-        /** */ textˇ
-    "});
-        cx.update_editor(|e, window, cx| e.newline(&Newline, window, cx));
-        cx.assert_editor_state(indoc! {"
-        /** */ text
-        ˇ
-    "});
-
-        // Ensure that text after comment end tag
-        // doesn't add comment prefix on newline
-        cx.set_state(indoc! {"
-        /**
-         *
-         */ˇtext
-    "});
-        cx.update_editor(|e, window, cx| e.newline(&Newline, window, cx));
-        cx.assert_editor_state(indoc! {"
-        /**
-         *
-         */
-         ˇtext
-    "});
-
-        // Ensure if not comment block it doesn't
-        // add comment prefix on newline
-        cx.set_state(indoc! {"
-        * textˇ
-    "});
-        cx.update_editor(|e, window, cx| e.newline(&Newline, window, cx));
-        cx.assert_editor_state(indoc! {"
-        * text
-        ˇ
-    "});
-    }
-    // Ensure that comment continuations can be disabled.
-    update_test_language_settings(cx, |settings| {
-        settings.defaults.extend_comment_on_newline = Some(false);
-    });
-    let mut cx = EditorTestContext::new(cx).await;
-    cx.set_state(indoc! {"
-        /**ˇ
-    "});
-    cx.update_editor(|e, window, cx| e.newline(&Newline, window, cx));
-    cx.assert_editor_state(indoc! {"
-        /**
-        ˇ
-    "});
-}
-
-#[gpui::test]
-async fn test_newline_comments_with_block_comment(cx: &mut TestAppContext) {
-    init_test(cx, |settings| {
-        settings.defaults.tab_size = NonZeroU32::new(4)
-    });
-
-    let lua_language = Arc::new(Language::new(
-        LanguageConfig {
-            line_comments: vec!["--".into()],
-            block_comment: Some(language::BlockCommentConfig {
-                start: "--[[".into(),
-                prefix: "".into(),
-                end: "]]".into(),
-                tab_size: 0,
-            }),
-            ..LanguageConfig::default()
-        },
-        None,
-    ));
-
-    let mut cx = EditorTestContext::new(cx).await;
-    cx.update_buffer(|buffer, cx| buffer.set_language(Some(lua_language), cx));
-
-    // Line with line comment should extend
-    cx.set_state(indoc! {"
-        --ˇ
-    "});
-    cx.update_editor(|e, window, cx| e.newline(&Newline, window, cx));
-    cx.assert_editor_state(indoc! {"
-        --
-        --ˇ
-    "});
-
-    // Line with block comment that matches line comment should not extend
-    cx.set_state(indoc! {"
-        --[[ˇ
-    "});
-    cx.update_editor(|e, window, cx| e.newline(&Newline, window, cx));
-    cx.assert_editor_state(indoc! {"
-        --[[
-        ˇ
-    "});
-}
-
-#[gpui::test]
-fn test_insert_with_old_selections(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let editor = cx.add_window(|window, cx| {
-        let buffer = MultiBuffer::build_simple("a( X ), b( Y ), c( Z )", cx);
-        let mut editor = build_editor(buffer, window, cx);
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([
-                MultiBufferOffset(3)..MultiBufferOffset(4),
-                MultiBufferOffset(11)..MultiBufferOffset(12),
-                MultiBufferOffset(19)..MultiBufferOffset(20),
-            ])
-        });
-        editor
-    });
-
-    _ = editor.update(cx, |editor, window, cx| {
-        // Edit the buffer directly, deleting ranges surrounding the editor's selections
-        editor.buffer.update(cx, |buffer, cx| {
-            buffer.edit(
-                [
-                    (MultiBufferOffset(2)..MultiBufferOffset(5), ""),
-                    (MultiBufferOffset(10)..MultiBufferOffset(13), ""),
-                    (MultiBufferOffset(18)..MultiBufferOffset(21), ""),
-                ],
-                None,
-                cx,
-            );
-            assert_eq!(buffer.read(cx).text(), "a(), b(), c()".unindent());
-        });
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            &[
-                MultiBufferOffset(2)..MultiBufferOffset(2),
-                MultiBufferOffset(7)..MultiBufferOffset(7),
-                MultiBufferOffset(12)..MultiBufferOffset(12)
-            ],
-        );
-
-        editor.insert("Z", window, cx);
-        assert_eq!(editor.text(cx), "a(Z), b(Z), c(Z)");
-
-        // The selections are moved after the inserted characters
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            &[
-                MultiBufferOffset(3)..MultiBufferOffset(3),
-                MultiBufferOffset(9)..MultiBufferOffset(9),
-                MultiBufferOffset(15)..MultiBufferOffset(15)
-            ],
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_tab(cx: &mut TestAppContext) {
-    init_test(cx, |settings| {
-        settings.defaults.tab_size = NonZeroU32::new(3)
-    });
-
-    let mut cx = EditorTestContext::new(cx).await;
-    cx.set_state(indoc! {"
-        ˇabˇc
-        ˇ🏀ˇ🏀ˇefg
-        dˇ
-    "});
-    cx.update_editor(|e, window, cx| e.tab(&Tab, window, cx));
-    cx.assert_editor_state(indoc! {"
-           ˇab ˇc
-           ˇ🏀  ˇ🏀  ˇefg
-        d  ˇ
-    "});
-
-    cx.set_state(indoc! {"
-        a
-        «🏀ˇ»🏀«🏀ˇ»🏀«🏀ˇ»
-    "});
-    cx.update_editor(|e, window, cx| e.tab(&Tab, window, cx));
-    cx.assert_editor_state(indoc! {"
-        a
-           «🏀ˇ»🏀«🏀ˇ»🏀«🏀ˇ»
-    "});
-}
-
-#[gpui::test]
-async fn test_tab_in_leading_whitespace_auto_indents_lines(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-    let language = Arc::new(
-        Language::new(
-            LanguageConfig::default(),
-            Some(tree_sitter_rust::LANGUAGE.into()),
-        )
-        .with_indents_query(r#"(_ "(" ")" @end) @indent"#)
-        .unwrap(),
-    );
-    cx.update_buffer(|buffer, cx| buffer.set_language(Some(language), cx));
-
-    // test when all cursors are not at suggested indent
-    // then simply move to their suggested indent location
-    cx.set_state(indoc! {"
-        const a: B = (
-            c(
-        ˇ
-        ˇ    )
-        );
-    "});
-    cx.update_editor(|e, window, cx| e.tab(&Tab, window, cx));
-    cx.assert_editor_state(indoc! {"
-        const a: B = (
-            c(
-                ˇ
-            ˇ)
-        );
-    "});
-
-    // test cursor already at suggested indent not moving when
-    // other cursors are yet to reach their suggested indents
-    cx.set_state(indoc! {"
-        ˇ
-        const a: B = (
-            c(
-                d(
-        ˇ
-                )
-        ˇ
-        ˇ    )
-        );
-    "});
-    cx.update_editor(|e, window, cx| e.tab(&Tab, window, cx));
-    cx.assert_editor_state(indoc! {"
-        ˇ
-        const a: B = (
-            c(
-                d(
-                    ˇ
-                )
-                ˇ
-            ˇ)
-        );
-    "});
-    // test when all cursors are at suggested indent then tab is inserted
-    cx.update_editor(|e, window, cx| e.tab(&Tab, window, cx));
-    cx.assert_editor_state(indoc! {"
-            ˇ
-        const a: B = (
-            c(
-                d(
-                        ˇ
-                )
-                    ˇ
-                ˇ)
-        );
-    "});
-
-    // test when current indent is less than suggested indent,
-    // we adjust line to match suggested indent and move cursor to it
-    //
-    // when no other cursor is at word boundary, all of them should move
-    cx.set_state(indoc! {"
-        const a: B = (
-            c(
-                d(
-        ˇ
-        ˇ   )
-        ˇ   )
-        );
-    "});
-    cx.update_editor(|e, window, cx| e.tab(&Tab, window, cx));
-    cx.assert_editor_state(indoc! {"
-        const a: B = (
-            c(
-                d(
-                    ˇ
-                ˇ)
-            ˇ)
-        );
-    "});
-
-    // test when current indent is less than suggested indent,
-    // we adjust line to match suggested indent and move cursor to it
-    //
-    // when some other cursor is at word boundary, it should not move
-    cx.set_state(indoc! {"
-        const a: B = (
-            c(
-                d(
-        ˇ
-        ˇ   )
-           ˇ)
-        );
-    "});
-    cx.update_editor(|e, window, cx| e.tab(&Tab, window, cx));
-    cx.assert_editor_state(indoc! {"
-        const a: B = (
-            c(
-                d(
-                    ˇ
-                ˇ)
-            ˇ)
-        );
-    "});
-
-    // test when current indent is more than suggested indent,
-    // we just move cursor to current indent instead of suggested indent
-    //
-    // when no other cursor is at word boundary, all of them should move
-    cx.set_state(indoc! {"
-        const a: B = (
-            c(
-                d(
-        ˇ
-        ˇ                )
-        ˇ   )
-        );
-    "});
-    cx.update_editor(|e, window, cx| e.tab(&Tab, window, cx));
-    cx.assert_editor_state(indoc! {"
-        const a: B = (
-            c(
-                d(
-                    ˇ
-                        ˇ)
-            ˇ)
-        );
-    "});
-    cx.update_editor(|e, window, cx| e.tab(&Tab, window, cx));
-    cx.assert_editor_state(indoc! {"
-        const a: B = (
-            c(
-                d(
-                        ˇ
-                            ˇ)
-                ˇ)
-        );
-    "});
-
-    // test when current indent is more than suggested indent,
-    // we just move cursor to current indent instead of suggested indent
-    //
-    // when some other cursor is at word boundary, it doesn't move
-    cx.set_state(indoc! {"
-        const a: B = (
-            c(
-                d(
-        ˇ
-        ˇ                )
-            ˇ)
-        );
-    "});
-    cx.update_editor(|e, window, cx| e.tab(&Tab, window, cx));
-    cx.assert_editor_state(indoc! {"
-        const a: B = (
-            c(
-                d(
-                    ˇ
-                        ˇ)
-            ˇ)
-        );
-    "});
-
-    // handle auto-indent when there are multiple cursors on the same line
-    cx.set_state(indoc! {"
-        const a: B = (
-            c(
-        ˇ    ˇ
-        ˇ    )
-        );
-    "});
-    cx.update_editor(|e, window, cx| e.tab(&Tab, window, cx));
-    cx.assert_editor_state(indoc! {"
-        const a: B = (
-            c(
-                ˇ
-            ˇ)
-        );
-    "});
-}
-
-#[gpui::test]
-async fn test_tab_with_mixed_whitespace_txt(cx: &mut TestAppContext) {
-    init_test(cx, |settings| {
-        settings.defaults.tab_size = NonZeroU32::new(3)
-    });
-
-    let mut cx = EditorTestContext::new(cx).await;
-    cx.set_state(indoc! {"
-         ˇ
-        \t ˇ
-        \t  ˇ
-        \t   ˇ
-         \t  \t\t \t      \t\t   \t\t    \t \t ˇ
-    "});
-
-    cx.update_editor(|e, window, cx| e.tab(&Tab, window, cx));
-    cx.assert_editor_state(indoc! {"
-           ˇ
-        \t   ˇ
-        \t   ˇ
-        \t      ˇ
-         \t  \t\t \t      \t\t   \t\t    \t \t   ˇ
-    "});
-}
-
-#[gpui::test]
-async fn test_tab_with_mixed_whitespace_rust(cx: &mut TestAppContext) {
-    init_test(cx, |settings| {
-        settings.defaults.tab_size = NonZeroU32::new(4)
-    });
-
-    let language = Arc::new(
-        Language::new(
-            LanguageConfig::default(),
-            Some(tree_sitter_rust::LANGUAGE.into()),
-        )
-        .with_indents_query(r#"(_ "{" "}" @end) @indent"#)
-        .unwrap(),
-    );
-
-    let mut cx = EditorTestContext::new(cx).await;
-    cx.update_buffer(|buffer, cx| buffer.set_language(Some(language), cx));
-    cx.set_state(indoc! {"
-        fn a() {
-            if b {
-        \t ˇc
-            }
-        }
-    "});
-
-    cx.update_editor(|e, window, cx| e.tab(&Tab, window, cx));
-    cx.assert_editor_state(indoc! {"
-        fn a() {
-            if b {
-                ˇc
-            }
-        }
-    "});
-}
-
-#[gpui::test]
-async fn test_indent_outdent(cx: &mut TestAppContext) {
-    init_test(cx, |settings| {
-        settings.defaults.tab_size = NonZeroU32::new(4);
-    });
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    cx.set_state(indoc! {"
-          «oneˇ» «twoˇ»
-        three
-         four
-    "});
-    cx.update_editor(|e, window, cx| e.tab(&Tab, window, cx));
-    cx.assert_editor_state(indoc! {"
-            «oneˇ» «twoˇ»
-        three
-         four
-    "});
-
-    cx.update_editor(|e, window, cx| e.backtab(&Backtab, window, cx));
-    cx.assert_editor_state(indoc! {"
-        «oneˇ» «twoˇ»
-        three
-         four
-    "});
-
-    // select across line ending
-    cx.set_state(indoc! {"
-        one two
-        t«hree
-        ˇ» four
-    "});
-    cx.update_editor(|e, window, cx| e.tab(&Tab, window, cx));
-    cx.assert_editor_state(indoc! {"
-        one two
-            t«hree
-        ˇ» four
-    "});
-
-    cx.update_editor(|e, window, cx| e.backtab(&Backtab, window, cx));
-    cx.assert_editor_state(indoc! {"
-        one two
-        t«hree
-        ˇ» four
-    "});
-
-    // Ensure that indenting/outdenting works when the cursor is at column 0.
-    cx.set_state(indoc! {"
-        one two
-        ˇthree
-            four
-    "});
-    cx.update_editor(|e, window, cx| e.tab(&Tab, window, cx));
-    cx.assert_editor_state(indoc! {"
-        one two
-            ˇthree
-            four
-    "});
-
-    cx.set_state(indoc! {"
-        one two
-        ˇ    three
-            four
-    "});
-    cx.update_editor(|e, window, cx| e.backtab(&Backtab, window, cx));
-    cx.assert_editor_state(indoc! {"
-        one two
-        ˇthree
-            four
-    "});
-}
-
-#[gpui::test]
-async fn test_indent_yaml_comments_with_multiple_cursors(cx: &mut TestAppContext) {
-    // This is a regression test for issue #33761
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-    let yaml_language = languages::language("yaml", tree_sitter_yaml::LANGUAGE.into());
-    cx.update_buffer(|buffer, cx| buffer.set_language(Some(yaml_language), cx));
-
-    cx.set_state(
-        r#"ˇ#     ingress:
-ˇ#         api:
-ˇ#             enabled: false
-ˇ#             pathType: Prefix
-ˇ#           console:
-ˇ#               enabled: false
-ˇ#               pathType: Prefix
-"#,
-    );
-
-    // Press tab to indent all lines
-    cx.update_editor(|e, window, cx| e.tab(&Tab, window, cx));
-
-    cx.assert_editor_state(
-        r#"    ˇ#     ingress:
-    ˇ#         api:
-    ˇ#             enabled: false
-    ˇ#             pathType: Prefix
-    ˇ#           console:
-    ˇ#               enabled: false
-    ˇ#               pathType: Prefix
-"#,
-    );
-}
-
-#[gpui::test]
-async fn test_indent_yaml_non_comments_with_multiple_cursors(cx: &mut TestAppContext) {
-    // This is a test to make sure our fix for issue #33761 didn't break anything
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-    let yaml_language = languages::language("yaml", tree_sitter_yaml::LANGUAGE.into());
-    cx.update_buffer(|buffer, cx| buffer.set_language(Some(yaml_language), cx));
-
-    cx.set_state(
-        r#"ˇingress:
-ˇ  api:
-ˇ    enabled: false
-ˇ    pathType: Prefix
-"#,
-    );
-
-    // Press tab to indent all lines
-    cx.update_editor(|e, window, cx| e.tab(&Tab, window, cx));
-
-    cx.assert_editor_state(
-        r#"ˇingress:
-    ˇapi:
-        ˇenabled: false
-        ˇpathType: Prefix
-"#,
-    );
-}
-
-#[gpui::test]
-async fn test_indent_outdent_with_hard_tabs(cx: &mut TestAppContext) {
-    init_test(cx, |settings| {
-        settings.defaults.hard_tabs = Some(true);
-    });
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    // select two ranges on one line
-    cx.set_state(indoc! {"
-        «oneˇ» «twoˇ»
-        three
-        four
-    "});
-    cx.update_editor(|e, window, cx| e.tab(&Tab, window, cx));
-    cx.assert_editor_state(indoc! {"
-        \t«oneˇ» «twoˇ»
-        three
-        four
-    "});
-    cx.update_editor(|e, window, cx| e.tab(&Tab, window, cx));
-    cx.assert_editor_state(indoc! {"
-        \t\t«oneˇ» «twoˇ»
-        three
-        four
-    "});
-    cx.update_editor(|e, window, cx| e.backtab(&Backtab, window, cx));
-    cx.assert_editor_state(indoc! {"
-        \t«oneˇ» «twoˇ»
-        three
-        four
-    "});
-    cx.update_editor(|e, window, cx| e.backtab(&Backtab, window, cx));
-    cx.assert_editor_state(indoc! {"
-        «oneˇ» «twoˇ»
-        three
-        four
-    "});
-
-    // select across a line ending
-    cx.set_state(indoc! {"
-        one two
-        t«hree
-        ˇ»four
-    "});
-    cx.update_editor(|e, window, cx| e.tab(&Tab, window, cx));
-    cx.assert_editor_state(indoc! {"
-        one two
-        \tt«hree
-        ˇ»four
-    "});
-    cx.update_editor(|e, window, cx| e.tab(&Tab, window, cx));
-    cx.assert_editor_state(indoc! {"
-        one two
-        \t\tt«hree
-        ˇ»four
-    "});
-    cx.update_editor(|e, window, cx| e.backtab(&Backtab, window, cx));
-    cx.assert_editor_state(indoc! {"
-        one two
-        \tt«hree
-        ˇ»four
-    "});
-    cx.update_editor(|e, window, cx| e.backtab(&Backtab, window, cx));
-    cx.assert_editor_state(indoc! {"
-        one two
-        t«hree
-        ˇ»four
-    "});
-
-    // Ensure that indenting/outdenting works when the cursor is at column 0.
-    cx.set_state(indoc! {"
-        one two
-        ˇthree
-        four
-    "});
-    cx.update_editor(|e, window, cx| e.backtab(&Backtab, window, cx));
-    cx.assert_editor_state(indoc! {"
-        one two
-        ˇthree
-        four
-    "});
-    cx.update_editor(|e, window, cx| e.tab(&Tab, window, cx));
-    cx.assert_editor_state(indoc! {"
-        one two
-        \tˇthree
-        four
-    "});
-    cx.update_editor(|e, window, cx| e.backtab(&Backtab, window, cx));
-    cx.assert_editor_state(indoc! {"
-        one two
-        ˇthree
-        four
-    "});
-}
-
-#[gpui::test]
-fn test_indent_outdent_with_excerpts(cx: &mut TestAppContext) {
-    init_test(cx, |settings| {
-        settings.languages.0.extend([
-            (
-                "TOML".into(),
-                LanguageSettingsContent {
-                    tab_size: NonZeroU32::new(2),
-                    ..Default::default()
-                },
-            ),
-            (
-                "Rust".into(),
-                LanguageSettingsContent {
-                    tab_size: NonZeroU32::new(4),
-                    ..Default::default()
-                },
-            ),
-        ]);
-    });
-
-    let toml_language = Arc::new(Language::new(
-        LanguageConfig {
-            name: "TOML".into(),
-            ..Default::default()
-        },
-        None,
-    ));
-    let rust_language = Arc::new(Language::new(
-        LanguageConfig {
-            name: "Rust".into(),
-            ..Default::default()
-        },
-        None,
-    ));
-
-    let toml_buffer =
-        cx.new(|cx| Buffer::local("a = 1\nb = 2\n", cx).with_language(toml_language, cx));
-    let rust_buffer =
-        cx.new(|cx| Buffer::local("const c: usize = 3;\n", cx).with_language(rust_language, cx));
-    let multibuffer = cx.new(|cx| {
-        let mut multibuffer = MultiBuffer::new(ReadWrite);
-        multibuffer.push_excerpts(
-            toml_buffer.clone(),
-            [ExcerptRange::new(Point::new(0, 0)..Point::new(2, 0))],
-            cx,
-        );
-        multibuffer.push_excerpts(
-            rust_buffer.clone(),
-            [ExcerptRange::new(Point::new(0, 0)..Point::new(1, 0))],
-            cx,
-        );
-        multibuffer
-    });
-
-    cx.add_window(|window, cx| {
-        let mut editor = build_editor(multibuffer, window, cx);
-
-        assert_eq!(
-            editor.text(cx),
-            indoc! {"
-                a = 1
-                b = 2
-
-                const c: usize = 3;
-            "}
-        );
-
-        select_ranges(
-            &mut editor,
-            indoc! {"
-                «aˇ» = 1
-                b = 2
-
-                «const c:ˇ» usize = 3;
-            "},
-            window,
-            cx,
-        );
-
-        editor.tab(&Tab, window, cx);
-        assert_text_with_selections(
-            &mut editor,
-            indoc! {"
-                  «aˇ» = 1
-                b = 2
-
-                    «const c:ˇ» usize = 3;
-            "},
-            cx,
-        );
-        editor.backtab(&Backtab, window, cx);
-        assert_text_with_selections(
-            &mut editor,
-            indoc! {"
-                «aˇ» = 1
-                b = 2
-
-                «const c:ˇ» usize = 3;
-            "},
-            cx,
-        );
-
-        editor
-    });
-}
-
-#[gpui::test]
-async fn test_backspace(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    // Basic backspace
-    cx.set_state(indoc! {"
-        onˇe two three
-        fou«rˇ» five six
-        seven «ˇeight nine
-        »ten
-    "});
-    cx.update_editor(|e, window, cx| e.backspace(&Backspace, window, cx));
-    cx.assert_editor_state(indoc! {"
-        oˇe two three
-        fouˇ five six
-        seven ˇten
-    "});
-
-    // Test backspace inside and around indents
-    cx.set_state(indoc! {"
-        zero
-            ˇone
-                ˇtwo
-            ˇ ˇ ˇ  three
-        ˇ  ˇ  four
-    "});
-    cx.update_editor(|e, window, cx| e.backspace(&Backspace, window, cx));
-    cx.assert_editor_state(indoc! {"
-        zero
-        ˇone
-            ˇtwo
-        ˇ  threeˇ  four
-    "});
-}
-
-#[gpui::test]
-async fn test_delete(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-    cx.set_state(indoc! {"
-        onˇe two three
-        fou«rˇ» five six
-        seven «ˇeight nine
-        »ten
-    "});
-    cx.update_editor(|e, window, cx| e.delete(&Delete, window, cx));
-    cx.assert_editor_state(indoc! {"
-        onˇ two three
-        fouˇ five six
-        seven ˇten
-    "});
-}
-
-#[gpui::test]
-fn test_delete_line(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let editor = cx.add_window(|window, cx| {
-        let buffer = MultiBuffer::build_simple("abc\ndef\nghi\n", cx);
-        build_editor(buffer, window, cx)
-    });
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_display_ranges([
-                DisplayPoint::new(DisplayRow(0), 1)..DisplayPoint::new(DisplayRow(0), 1),
-                DisplayPoint::new(DisplayRow(1), 0)..DisplayPoint::new(DisplayRow(1), 1),
-                DisplayPoint::new(DisplayRow(3), 0)..DisplayPoint::new(DisplayRow(3), 0),
-            ])
-        });
-        editor.delete_line(&DeleteLine, window, cx);
-        assert_eq!(editor.display_text(cx), "ghi");
-        assert_eq!(
-            display_ranges(editor, cx),
-            vec![
-                DisplayPoint::new(DisplayRow(0), 0)..DisplayPoint::new(DisplayRow(0), 0),
-                DisplayPoint::new(DisplayRow(0), 1)..DisplayPoint::new(DisplayRow(0), 1),
-            ]
-        );
-    });
-
-    let editor = cx.add_window(|window, cx| {
-        let buffer = MultiBuffer::build_simple("abc\ndef\nghi\n", cx);
-        build_editor(buffer, window, cx)
-    });
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_display_ranges([
-                DisplayPoint::new(DisplayRow(2), 0)..DisplayPoint::new(DisplayRow(0), 1)
-            ])
-        });
-        editor.delete_line(&DeleteLine, window, cx);
-        assert_eq!(editor.display_text(cx), "ghi\n");
-        assert_eq!(
-            display_ranges(editor, cx),
-            vec![DisplayPoint::new(DisplayRow(0), 1)..DisplayPoint::new(DisplayRow(0), 1)]
-        );
-    });
-
-    let editor = cx.add_window(|window, cx| {
-        let buffer = MultiBuffer::build_simple("abc\ndef\nghi\n\njkl\nmno", cx);
-        build_editor(buffer, window, cx)
-    });
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_display_ranges([
-                DisplayPoint::new(DisplayRow(0), 1)..DisplayPoint::new(DisplayRow(2), 1)
-            ])
-        });
-        editor.delete_line(&DeleteLine, window, cx);
-        assert_eq!(editor.display_text(cx), "\njkl\nmno");
-        assert_eq!(
-            display_ranges(editor, cx),
-            vec![DisplayPoint::new(DisplayRow(0), 0)..DisplayPoint::new(DisplayRow(0), 0)]
-        );
-    });
-}
-
-#[gpui::test]
-fn test_join_lines_with_single_selection(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    cx.add_window(|window, cx| {
-        let buffer = MultiBuffer::build_simple("aaa\nbbb\nccc\nddd\n\n", cx);
-        let mut editor = build_editor(buffer.clone(), window, cx);
-        let buffer = buffer.read(cx).as_singleton().unwrap();
-
-        assert_eq!(
-            editor
-                .selections
-                .ranges::<Point>(&editor.display_snapshot(cx)),
-            &[Point::new(0, 0)..Point::new(0, 0)]
-        );
-
-        // When on single line, replace newline at end by space
-        editor.join_lines(&JoinLines, window, cx);
-        assert_eq!(buffer.read(cx).text(), "aaa bbb\nccc\nddd\n\n");
-        assert_eq!(
-            editor
-                .selections
-                .ranges::<Point>(&editor.display_snapshot(cx)),
-            &[Point::new(0, 3)..Point::new(0, 3)]
-        );
-
-        // When multiple lines are selected, remove newlines that are spanned by the selection
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([Point::new(0, 5)..Point::new(2, 2)])
-        });
-        editor.join_lines(&JoinLines, window, cx);
-        assert_eq!(buffer.read(cx).text(), "aaa bbb ccc ddd\n\n");
-        assert_eq!(
-            editor
-                .selections
-                .ranges::<Point>(&editor.display_snapshot(cx)),
-            &[Point::new(0, 11)..Point::new(0, 11)]
-        );
-
-        // Undo should be transactional
-        editor.undo(&Undo, window, cx);
-        assert_eq!(buffer.read(cx).text(), "aaa bbb\nccc\nddd\n\n");
-        assert_eq!(
-            editor
-                .selections
-                .ranges::<Point>(&editor.display_snapshot(cx)),
-            &[Point::new(0, 5)..Point::new(2, 2)]
-        );
-
-        // When joining an empty line don't insert a space
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([Point::new(2, 1)..Point::new(2, 2)])
-        });
-        editor.join_lines(&JoinLines, window, cx);
-        assert_eq!(buffer.read(cx).text(), "aaa bbb\nccc\nddd\n");
-        assert_eq!(
-            editor
-                .selections
-                .ranges::<Point>(&editor.display_snapshot(cx)),
-            [Point::new(2, 3)..Point::new(2, 3)]
-        );
-
-        // We can remove trailing newlines
-        editor.join_lines(&JoinLines, window, cx);
-        assert_eq!(buffer.read(cx).text(), "aaa bbb\nccc\nddd");
-        assert_eq!(
-            editor
-                .selections
-                .ranges::<Point>(&editor.display_snapshot(cx)),
-            [Point::new(2, 3)..Point::new(2, 3)]
-        );
-
-        // We don't blow up on the last line
-        editor.join_lines(&JoinLines, window, cx);
-        assert_eq!(buffer.read(cx).text(), "aaa bbb\nccc\nddd");
-        assert_eq!(
-            editor
-                .selections
-                .ranges::<Point>(&editor.display_snapshot(cx)),
-            [Point::new(2, 3)..Point::new(2, 3)]
-        );
-
-        // reset to test indentation
-        editor.buffer.update(cx, |buffer, cx| {
-            buffer.edit(
-                [
-                    (Point::new(1, 0)..Point::new(1, 2), "  "),
-                    (Point::new(2, 0)..Point::new(2, 3), "  \n\td"),
-                ],
-                None,
-                cx,
-            )
-        });
-
-        // We remove any leading spaces
-        assert_eq!(buffer.read(cx).text(), "aaa bbb\n  c\n  \n\td");
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([Point::new(0, 1)..Point::new(0, 1)])
-        });
-        editor.join_lines(&JoinLines, window, cx);
-        assert_eq!(buffer.read(cx).text(), "aaa bbb c\n  \n\td");
-
-        // We don't insert a space for a line containing only spaces
-        editor.join_lines(&JoinLines, window, cx);
-        assert_eq!(buffer.read(cx).text(), "aaa bbb c\n\td");
-
-        // We ignore any leading tabs
-        editor.join_lines(&JoinLines, window, cx);
-        assert_eq!(buffer.read(cx).text(), "aaa bbb c d");
-
-        editor
-    });
-}
-
-#[gpui::test]
-fn test_join_lines_with_multi_selection(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    cx.add_window(|window, cx| {
-        let buffer = MultiBuffer::build_simple("aaa\nbbb\nccc\nddd\n\n", cx);
-        let mut editor = build_editor(buffer.clone(), window, cx);
-        let buffer = buffer.read(cx).as_singleton().unwrap();
-
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([
-                Point::new(0, 2)..Point::new(1, 1),
-                Point::new(1, 2)..Point::new(1, 2),
-                Point::new(3, 1)..Point::new(3, 2),
-            ])
-        });
-
-        editor.join_lines(&JoinLines, window, cx);
-        assert_eq!(buffer.read(cx).text(), "aaa bbb ccc\nddd\n");
-
-        assert_eq!(
-            editor
-                .selections
-                .ranges::<Point>(&editor.display_snapshot(cx)),
-            [
-                Point::new(0, 7)..Point::new(0, 7),
-                Point::new(1, 3)..Point::new(1, 3)
-            ]
-        );
-        editor
-    });
-}
-
-#[gpui::test]
-async fn test_join_lines_with_git_diff_base(executor: BackgroundExecutor, cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    let diff_base = r#"
-        Line 0
-        Line 1
-        Line 2
-        Line 3
-        "#
-    .unindent();
-
-    cx.set_state(
-        &r#"
-        ˇLine 0
-        Line 1
-        Line 2
-        Line 3
-        "#
-        .unindent(),
-    );
-
-    cx.set_head_text(&diff_base);
-    executor.run_until_parked();
-
-    // Join lines
-    cx.update_editor(|editor, window, cx| {
-        editor.join_lines(&JoinLines, window, cx);
-    });
-    executor.run_until_parked();
-
-    cx.assert_editor_state(
-        &r#"
-        Line 0ˇ Line 1
-        Line 2
-        Line 3
-        "#
-        .unindent(),
-    );
-    // Join again
-    cx.update_editor(|editor, window, cx| {
-        editor.join_lines(&JoinLines, window, cx);
-    });
-    executor.run_until_parked();
-
-    cx.assert_editor_state(
-        &r#"
-        Line 0 Line 1ˇ Line 2
-        Line 3
-        "#
-        .unindent(),
-    );
-}
-
-#[gpui::test]
-async fn test_custom_newlines_cause_no_false_positive_diffs(
-    executor: BackgroundExecutor,
-    cx: &mut TestAppContext,
-) {
-    init_test(cx, |_| {});
-    let mut cx = EditorTestContext::new(cx).await;
-    cx.set_state("Line 0\r\nLine 1\rˇ\nLine 2\r\nLine 3");
-    cx.set_head_text("Line 0\r\nLine 1\r\nLine 2\r\nLine 3");
-    executor.run_until_parked();
-
-    cx.update_editor(|editor, window, cx| {
-        let snapshot = editor.snapshot(window, cx);
-        assert_eq!(
-            snapshot
-                .buffer_snapshot()
-                .diff_hunks_in_range(MultiBufferOffset(0)..snapshot.buffer_snapshot().len())
-                .collect::<Vec<_>>(),
-            Vec::new(),
-            "Should not have any diffs for files with custom newlines"
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_manipulate_immutable_lines_with_single_selection(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    // Test sort_lines_case_insensitive()
-    cx.set_state(indoc! {"
-        «z
-        y
-        x
-        Z
-        Y
-        Xˇ»
-    "});
-    cx.update_editor(|e, window, cx| {
-        e.sort_lines_case_insensitive(&SortLinesCaseInsensitive, window, cx)
-    });
-    cx.assert_editor_state(indoc! {"
-        «x
-        X
-        y
-        Y
-        z
-        Zˇ»
-    "});
-
-    // Test sort_lines_by_length()
-    //
-    // Demonstrates:
-    // - ∞ is 3 bytes UTF-8, but sorted by its char count (1)
-    // - sort is stable
-    cx.set_state(indoc! {"
-        «123
-        æ
-        12
-        ∞
-        1
-        æˇ»
-    "});
-    cx.update_editor(|e, window, cx| e.sort_lines_by_length(&SortLinesByLength, window, cx));
-    cx.assert_editor_state(indoc! {"
-        «æ
-        ∞
-        1
-        æ
-        12
-        123ˇ»
-    "});
-
-    // Test reverse_lines()
-    cx.set_state(indoc! {"
-        «5
-        4
-        3
-        2
-        1ˇ»
-    "});
-    cx.update_editor(|e, window, cx| e.reverse_lines(&ReverseLines, window, cx));
-    cx.assert_editor_state(indoc! {"
-        «1
-        2
-        3
-        4
-        5ˇ»
-    "});
-
-    // Skip testing shuffle_line()
-
-    // From here on out, test more complex cases of manipulate_immutable_lines() with a single driver method: sort_lines_case_sensitive()
-    // Since all methods calling manipulate_immutable_lines() are doing the exact same general thing (reordering lines)
-
-    // Don't manipulate when cursor is on single line, but expand the selection
-    cx.set_state(indoc! {"
-        ddˇdd
-        ccc
-        bb
-        a
-    "});
-    cx.update_editor(|e, window, cx| {
-        e.sort_lines_case_sensitive(&SortLinesCaseSensitive, window, cx)
-    });
-    cx.assert_editor_state(indoc! {"
-        «ddddˇ»
-        ccc
-        bb
-        a
-    "});
-
-    // Basic manipulate case
-    // Start selection moves to column 0
-    // End of selection shrinks to fit shorter line
-    cx.set_state(indoc! {"
-        dd«d
-        ccc
-        bb
-        aaaaaˇ»
-    "});
-    cx.update_editor(|e, window, cx| {
-        e.sort_lines_case_sensitive(&SortLinesCaseSensitive, window, cx)
-    });
-    cx.assert_editor_state(indoc! {"
-        «aaaaa
-        bb
-        ccc
-        dddˇ»
-    "});
-
-    // Manipulate case with newlines
-    cx.set_state(indoc! {"
-        dd«d
-        ccc
-
-        bb
-        aaaaa
-
-        ˇ»
-    "});
-    cx.update_editor(|e, window, cx| {
-        e.sort_lines_case_sensitive(&SortLinesCaseSensitive, window, cx)
-    });
-    cx.assert_editor_state(indoc! {"
-        «
-
-        aaaaa
-        bb
-        ccc
-        dddˇ»
-
-    "});
-
-    // Adding new line
-    cx.set_state(indoc! {"
-        aa«a
-        bbˇ»b
-    "});
-    cx.update_editor(|e, window, cx| {
-        e.manipulate_immutable_lines(window, cx, |lines| lines.push("added_line"))
-    });
-    cx.assert_editor_state(indoc! {"
-        «aaa
-        bbb
-        added_lineˇ»
-    "});
-
-    // Removing line
-    cx.set_state(indoc! {"
-        aa«a
-        bbbˇ»
-    "});
-    cx.update_editor(|e, window, cx| {
-        e.manipulate_immutable_lines(window, cx, |lines| {
-            lines.pop();
-        })
-    });
-    cx.assert_editor_state(indoc! {"
-        «aaaˇ»
-    "});
-
-    // Removing all lines
-    cx.set_state(indoc! {"
-        aa«a
-        bbbˇ»
-    "});
-    cx.update_editor(|e, window, cx| {
-        e.manipulate_immutable_lines(window, cx, |lines| {
-            lines.drain(..);
-        })
-    });
-    cx.assert_editor_state(indoc! {"
-        ˇ
-    "});
-}
-
-#[gpui::test]
-async fn test_unique_lines_multi_selection(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    // Consider continuous selection as single selection
-    cx.set_state(indoc! {"
-        Aaa«aa
-        cˇ»c«c
-        bb
-        aaaˇ»aa
-    "});
-    cx.update_editor(|e, window, cx| {
-        e.unique_lines_case_sensitive(&UniqueLinesCaseSensitive, window, cx)
-    });
-    cx.assert_editor_state(indoc! {"
-        «Aaaaa
-        ccc
-        bb
-        aaaaaˇ»
-    "});
-
-    cx.set_state(indoc! {"
-        Aaa«aa
-        cˇ»c«c
-        bb
-        aaaˇ»aa
-    "});
-    cx.update_editor(|e, window, cx| {
-        e.unique_lines_case_insensitive(&UniqueLinesCaseInsensitive, window, cx)
-    });
-    cx.assert_editor_state(indoc! {"
-        «Aaaaa
-        ccc
-        bbˇ»
-    "});
-
-    // Consider non continuous selection as distinct dedup operations
-    cx.set_state(indoc! {"
-        «aaaaa
-        bb
-        aaaaa
-        aaaaaˇ»
-
-        aaa«aaˇ»
-    "});
-    cx.update_editor(|e, window, cx| {
-        e.unique_lines_case_sensitive(&UniqueLinesCaseSensitive, window, cx)
-    });
-    cx.assert_editor_state(indoc! {"
-        «aaaaa
-        bbˇ»
-
-        «aaaaaˇ»
-    "});
-}
-
-#[gpui::test]
-async fn test_unique_lines_single_selection(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    cx.set_state(indoc! {"
-        «Aaa
-        aAa
-        Aaaˇ»
-    "});
-    cx.update_editor(|e, window, cx| {
-        e.unique_lines_case_sensitive(&UniqueLinesCaseSensitive, window, cx)
-    });
-    cx.assert_editor_state(indoc! {"
-        «Aaa
-        aAaˇ»
-    "});
-
-    cx.set_state(indoc! {"
-        «Aaa
-        aAa
-        aaAˇ»
-    "});
-    cx.update_editor(|e, window, cx| {
-        e.unique_lines_case_insensitive(&UniqueLinesCaseInsensitive, window, cx)
-    });
-    cx.assert_editor_state(indoc! {"
-        «Aaaˇ»
-    "});
-}
-
-#[gpui::test]
-async fn test_wrap_in_tag_single_selection(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    let js_language = Arc::new(Language::new(
-        LanguageConfig {
-            name: "JavaScript".into(),
-            wrap_characters: Some(language::WrapCharactersConfig {
-                start_prefix: "<".into(),
-                start_suffix: ">".into(),
-                end_prefix: "</".into(),
-                end_suffix: ">".into(),
-            }),
-            ..LanguageConfig::default()
-        },
-        None,
-    ));
-
-    cx.update_buffer(|buffer, cx| buffer.set_language(Some(js_language), cx));
-
-    cx.set_state(indoc! {"
-        «testˇ»
-    "});
-    cx.update_editor(|e, window, cx| e.wrap_selections_in_tag(&WrapSelectionsInTag, window, cx));
-    cx.assert_editor_state(indoc! {"
-        <«ˇ»>test</«ˇ»>
-    "});
-
-    cx.set_state(indoc! {"
-        «test
-         testˇ»
-    "});
-    cx.update_editor(|e, window, cx| e.wrap_selections_in_tag(&WrapSelectionsInTag, window, cx));
-    cx.assert_editor_state(indoc! {"
-        <«ˇ»>test
-         test</«ˇ»>
-    "});
-
-    cx.set_state(indoc! {"
-        teˇst
-    "});
-    cx.update_editor(|e, window, cx| e.wrap_selections_in_tag(&WrapSelectionsInTag, window, cx));
-    cx.assert_editor_state(indoc! {"
-        te<«ˇ»></«ˇ»>st
-    "});
-}
-
-#[gpui::test]
-async fn test_wrap_in_tag_multi_selection(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    let js_language = Arc::new(Language::new(
-        LanguageConfig {
-            name: "JavaScript".into(),
-            wrap_characters: Some(language::WrapCharactersConfig {
-                start_prefix: "<".into(),
-                start_suffix: ">".into(),
-                end_prefix: "</".into(),
-                end_suffix: ">".into(),
-            }),
-            ..LanguageConfig::default()
-        },
-        None,
-    ));
-
-    cx.update_buffer(|buffer, cx| buffer.set_language(Some(js_language), cx));
-
-    cx.set_state(indoc! {"
-        «testˇ»
-        «testˇ» «testˇ»
-        «testˇ»
-    "});
-    cx.update_editor(|e, window, cx| e.wrap_selections_in_tag(&WrapSelectionsInTag, window, cx));
-    cx.assert_editor_state(indoc! {"
-        <«ˇ»>test</«ˇ»>
-        <«ˇ»>test</«ˇ»> <«ˇ»>test</«ˇ»>
-        <«ˇ»>test</«ˇ»>
-    "});
-
-    cx.set_state(indoc! {"
-        «test
-         testˇ»
-        «test
-         testˇ»
-    "});
-    cx.update_editor(|e, window, cx| e.wrap_selections_in_tag(&WrapSelectionsInTag, window, cx));
-    cx.assert_editor_state(indoc! {"
-        <«ˇ»>test
-         test</«ˇ»>
-        <«ˇ»>test
-         test</«ˇ»>
-    "});
-}
-
-#[gpui::test]
-async fn test_wrap_in_tag_does_nothing_in_unsupported_languages(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    let plaintext_language = Arc::new(Language::new(
-        LanguageConfig {
-            name: "Plain Text".into(),
-            ..LanguageConfig::default()
-        },
-        None,
-    ));
-
-    cx.update_buffer(|buffer, cx| buffer.set_language(Some(plaintext_language), cx));
-
-    cx.set_state(indoc! {"
-        «testˇ»
-    "});
-    cx.update_editor(|e, window, cx| e.wrap_selections_in_tag(&WrapSelectionsInTag, window, cx));
-    cx.assert_editor_state(indoc! {"
-      «testˇ»
-    "});
-}
-
-#[gpui::test]
-async fn test_manipulate_immutable_lines_with_multi_selection(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    // Manipulate with multiple selections on a single line
-    cx.set_state(indoc! {"
-        dd«dd
-        cˇ»c«c
-        bb
-        aaaˇ»aa
-    "});
-    cx.update_editor(|e, window, cx| {
-        e.sort_lines_case_sensitive(&SortLinesCaseSensitive, window, cx)
-    });
-    cx.assert_editor_state(indoc! {"
-        «aaaaa
-        bb
-        ccc
-        ddddˇ»
-    "});
-
-    // Manipulate with multiple disjoin selections
-    cx.set_state(indoc! {"
-        5«
-        4
-        3
-        2
-        1ˇ»
-
-        dd«dd
-        ccc
-        bb
-        aaaˇ»aa
-    "});
-    cx.update_editor(|e, window, cx| {
-        e.sort_lines_case_sensitive(&SortLinesCaseSensitive, window, cx)
-    });
-    cx.assert_editor_state(indoc! {"
-        «1
-        2
-        3
-        4
-        5ˇ»
-
-        «aaaaa
-        bb
-        ccc
-        ddddˇ»
-    "});
-
-    // Adding lines on each selection
-    cx.set_state(indoc! {"
-        2«
-        1ˇ»
-
-        bb«bb
-        aaaˇ»aa
-    "});
-    cx.update_editor(|e, window, cx| {
-        e.manipulate_immutable_lines(window, cx, |lines| lines.push("added line"))
-    });
-    cx.assert_editor_state(indoc! {"
-        «2
-        1
-        added lineˇ»
-
-        «bbbb
-        aaaaa
-        added lineˇ»
-    "});
-
-    // Removing lines on each selection
-    cx.set_state(indoc! {"
-        2«
-        1ˇ»
-
-        bb«bb
-        aaaˇ»aa
-    "});
-    cx.update_editor(|e, window, cx| {
-        e.manipulate_immutable_lines(window, cx, |lines| {
-            lines.pop();
-        })
-    });
-    cx.assert_editor_state(indoc! {"
-        «2ˇ»
-
-        «bbbbˇ»
-    "});
-}
-
-#[gpui::test]
-async fn test_convert_indentation_to_spaces(cx: &mut TestAppContext) {
-    init_test(cx, |settings| {
-        settings.defaults.tab_size = NonZeroU32::new(3)
-    });
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    // MULTI SELECTION
-    // Ln.1 "«" tests empty lines
-    // Ln.9 tests just leading whitespace
-    cx.set_state(indoc! {"
-        «
-        abc                 // No indentationˇ»
-        «\tabc              // 1 tabˇ»
-        \t\tabc «      ˇ»   // 2 tabs
-        \t ab«c             // Tab followed by space
-         \tabc              // Space followed by tab (3 spaces should be the result)
-        \t \t  \t   \tabc   // Mixed indentation (tab conversion depends on the column)
-           abˇ»ˇc   ˇ    ˇ  // Already space indented«
-        \t
-        \tabc\tdef          // Only the leading tab is manipulatedˇ»
-    "});
-    cx.update_editor(|e, window, cx| {
-        e.convert_indentation_to_spaces(&ConvertIndentationToSpaces, window, cx);
-    });
-    cx.assert_editor_state(
-        indoc! {"
-            «
-            abc                 // No indentation
-               abc              // 1 tab
-                  abc          // 2 tabs
-                abc             // Tab followed by space
-               abc              // Space followed by tab (3 spaces should be the result)
-                           abc   // Mixed indentation (tab conversion depends on the column)
-               abc         // Already space indented
-               ·
-               abc\tdef          // Only the leading tab is manipulatedˇ»
-        "}
-        .replace("·", "")
-        .as_str(), // · used as placeholder to prevent format-on-save from removing whitespace
-    );
-
-    // Test on just a few lines, the others should remain unchanged
-    // Only lines (3, 5, 10, 11) should change
-    cx.set_state(
-        indoc! {"
-            ·
-            abc                 // No indentation
-            \tabcˇ               // 1 tab
-            \t\tabc             // 2 tabs
-            \t abcˇ              // Tab followed by space
-             \tabc              // Space followed by tab (3 spaces should be the result)
-            \t \t  \t   \tabc   // Mixed indentation (tab conversion depends on the column)
-               abc              // Already space indented
-            «\t
-            \tabc\tdef          // Only the leading tab is manipulatedˇ»
-        "}
-        .replace("·", "")
-        .as_str(), // · used as placeholder to prevent format-on-save from removing whitespace
-    );
-    cx.update_editor(|e, window, cx| {
-        e.convert_indentation_to_spaces(&ConvertIndentationToSpaces, window, cx);
-    });
-    cx.assert_editor_state(
-        indoc! {"
-            ·
-            abc                 // No indentation
-            «   abc               // 1 tabˇ»
-            \t\tabc             // 2 tabs
-            «    abc              // Tab followed by spaceˇ»
-             \tabc              // Space followed by tab (3 spaces should be the result)
-            \t \t  \t   \tabc   // Mixed indentation (tab conversion depends on the column)
-               abc              // Already space indented
-            «   ·
-               abc\tdef          // Only the leading tab is manipulatedˇ»
-        "}
-        .replace("·", "")
-        .as_str(), // · used as placeholder to prevent format-on-save from removing whitespace
-    );
-
-    // SINGLE SELECTION
-    // Ln.1 "«" tests empty lines
-    // Ln.9 tests just leading whitespace
-    cx.set_state(indoc! {"
-        «
-        abc                 // No indentation
-        \tabc               // 1 tab
-        \t\tabc             // 2 tabs
-        \t abc              // Tab followed by space
-         \tabc              // Space followed by tab (3 spaces should be the result)
-        \t \t  \t   \tabc   // Mixed indentation (tab conversion depends on the column)
-           abc              // Already space indented
-        \t
-        \tabc\tdef          // Only the leading tab is manipulatedˇ»
-    "});
-    cx.update_editor(|e, window, cx| {
-        e.convert_indentation_to_spaces(&ConvertIndentationToSpaces, window, cx);
-    });
-    cx.assert_editor_state(
-        indoc! {"
-            «
-            abc                 // No indentation
-               abc               // 1 tab
-                  abc             // 2 tabs
-                abc              // Tab followed by space
-               abc              // Space followed by tab (3 spaces should be the result)
-                           abc   // Mixed indentation (tab conversion depends on the column)
-               abc              // Already space indented
-               ·
-               abc\tdef          // Only the leading tab is manipulatedˇ»
-        "}
-        .replace("·", "")
-        .as_str(), // · used as placeholder to prevent format-on-save from removing whitespace
-    );
-}
-
-#[gpui::test]
-async fn test_convert_indentation_to_tabs(cx: &mut TestAppContext) {
-    init_test(cx, |settings| {
-        settings.defaults.tab_size = NonZeroU32::new(3)
-    });
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    // MULTI SELECTION
-    // Ln.1 "«" tests empty lines
-    // Ln.11 tests just leading whitespace
-    cx.set_state(indoc! {"
-        «
-        abˇ»ˇc                 // No indentation
-         abc    ˇ        ˇ    // 1 space (< 3 so dont convert)
-          abc  «             // 2 spaces (< 3 so dont convert)
-           abc              // 3 spaces (convert)
-             abc ˇ»           // 5 spaces (1 tab + 2 spaces)
-        «\tˇ»\t«\tˇ»abc           // Already tab indented
-        «\t abc              // Tab followed by space
-         \tabc              // Space followed by tab (should be consumed due to tab)
-        \t \t  \t   \tabc   // Mixed indentation (first 3 spaces are consumed, the others are converted)
-           \tˇ»  «\t
-           abcˇ»   \t ˇˇˇ        // Only the leading spaces should be converted
-    "});
-    cx.update_editor(|e, window, cx| {
-        e.convert_indentation_to_tabs(&ConvertIndentationToTabs, window, cx);
-    });
-    cx.assert_editor_state(indoc! {"
-        «
-        abc                 // No indentation
-         abc                // 1 space (< 3 so dont convert)
-          abc               // 2 spaces (< 3 so dont convert)
-        \tabc              // 3 spaces (convert)
-        \t  abc            // 5 spaces (1 tab + 2 spaces)
-        \t\t\tabc           // Already tab indented
-        \t abc              // Tab followed by space
-        \tabc              // Space followed by tab (should be consumed due to tab)
-        \t\t\t\t\tabc   // Mixed indentation (first 3 spaces are consumed, the others are converted)
-        \t\t\t
-        \tabc   \t         // Only the leading spaces should be convertedˇ»
-    "});
-
-    // Test on just a few lines, the other should remain unchanged
-    // Only lines (4, 8, 11, 12) should change
-    cx.set_state(
-        indoc! {"
-            ·
-            abc                 // No indentation
-             abc                // 1 space (< 3 so dont convert)
-              abc               // 2 spaces (< 3 so dont convert)
-            «   abc              // 3 spaces (convert)ˇ»
-                 abc            // 5 spaces (1 tab + 2 spaces)
-            \t\t\tabc           // Already tab indented
-            \t abc              // Tab followed by space
-             \tabc      ˇ        // Space followed by tab (should be consumed due to tab)
-               \t\t  \tabc      // Mixed indentation
-            \t \t  \t   \tabc   // Mixed indentation
-               \t  \tˇ
-            «   abc   \t         // Only the leading spaces should be convertedˇ»
-        "}
-        .replace("·", "")
-        .as_str(), // · used as placeholder to prevent format-on-save from removing whitespace
-    );
-    cx.update_editor(|e, window, cx| {
-        e.convert_indentation_to_tabs(&ConvertIndentationToTabs, window, cx);
-    });
-    cx.assert_editor_state(
-        indoc! {"
-            ·
-            abc                 // No indentation
-             abc                // 1 space (< 3 so dont convert)
-              abc               // 2 spaces (< 3 so dont convert)
-            «\tabc              // 3 spaces (convert)ˇ»
-                 abc            // 5 spaces (1 tab + 2 spaces)
-            \t\t\tabc           // Already tab indented
-            \t abc              // Tab followed by space
-            «\tabc              // Space followed by tab (should be consumed due to tab)ˇ»
-               \t\t  \tabc      // Mixed indentation
-            \t \t  \t   \tabc   // Mixed indentation
-            «\t\t\t
-            \tabc   \t         // Only the leading spaces should be convertedˇ»
-        "}
-        .replace("·", "")
-        .as_str(), // · used as placeholder to prevent format-on-save from removing whitespace
-    );
-
-    // SINGLE SELECTION
-    // Ln.1 "«" tests empty lines
-    // Ln.11 tests just leading whitespace
-    cx.set_state(indoc! {"
-        «
-        abc                 // No indentation
-         abc                // 1 space (< 3 so dont convert)
-          abc               // 2 spaces (< 3 so dont convert)
-           abc              // 3 spaces (convert)
-             abc            // 5 spaces (1 tab + 2 spaces)
-        \t\t\tabc           // Already tab indented
-        \t abc              // Tab followed by space
-         \tabc              // Space followed by tab (should be consumed due to tab)
-        \t \t  \t   \tabc   // Mixed indentation (first 3 spaces are consumed, the others are converted)
-           \t  \t
-           abc   \t         // Only the leading spaces should be convertedˇ»
-    "});
-    cx.update_editor(|e, window, cx| {
-        e.convert_indentation_to_tabs(&ConvertIndentationToTabs, window, cx);
-    });
-    cx.assert_editor_state(indoc! {"
-        «
-        abc                 // No indentation
-         abc                // 1 space (< 3 so dont convert)
-          abc               // 2 spaces (< 3 so dont convert)
-        \tabc              // 3 spaces (convert)
-        \t  abc            // 5 spaces (1 tab + 2 spaces)
-        \t\t\tabc           // Already tab indented
-        \t abc              // Tab followed by space
-        \tabc              // Space followed by tab (should be consumed due to tab)
-        \t\t\t\t\tabc   // Mixed indentation (first 3 spaces are consumed, the others are converted)
-        \t\t\t
-        \tabc   \t         // Only the leading spaces should be convertedˇ»
-    "});
-}
-
-#[gpui::test]
-async fn test_toggle_case(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    // If all lower case -> upper case
-    cx.set_state(indoc! {"
-        «hello worldˇ»
-    "});
-    cx.update_editor(|e, window, cx| e.toggle_case(&ToggleCase, window, cx));
-    cx.assert_editor_state(indoc! {"
-        «HELLO WORLDˇ»
-    "});
-
-    // If all upper case -> lower case
-    cx.set_state(indoc! {"
-        «HELLO WORLDˇ»
-    "});
-    cx.update_editor(|e, window, cx| e.toggle_case(&ToggleCase, window, cx));
-    cx.assert_editor_state(indoc! {"
-        «hello worldˇ»
-    "});
-
-    // If any upper case characters are identified -> lower case
-    // This matches JetBrains IDEs
-    cx.set_state(indoc! {"
-        «hEllo worldˇ»
-    "});
-    cx.update_editor(|e, window, cx| e.toggle_case(&ToggleCase, window, cx));
-    cx.assert_editor_state(indoc! {"
-        «hello worldˇ»
-    "});
-}
-
-#[gpui::test]
-async fn test_convert_to_sentence_case(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    cx.set_state(indoc! {"
-        «implement-windows-supportˇ»
-    "});
-    cx.update_editor(|e, window, cx| {
-        e.convert_to_sentence_case(&ConvertToSentenceCase, window, cx)
-    });
-    cx.assert_editor_state(indoc! {"
-        «Implement windows supportˇ»
-    "});
-}
-
-#[gpui::test]
-async fn test_manipulate_text(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    // Test convert_to_upper_case()
-    cx.set_state(indoc! {"
-        «hello worldˇ»
-    "});
-    cx.update_editor(|e, window, cx| e.convert_to_upper_case(&ConvertToUpperCase, window, cx));
-    cx.assert_editor_state(indoc! {"
-        «HELLO WORLDˇ»
-    "});
-
-    // Test convert_to_lower_case()
-    cx.set_state(indoc! {"
-        «HELLO WORLDˇ»
-    "});
-    cx.update_editor(|e, window, cx| e.convert_to_lower_case(&ConvertToLowerCase, window, cx));
-    cx.assert_editor_state(indoc! {"
-        «hello worldˇ»
-    "});
-
-    // Test multiple line, single selection case
-    cx.set_state(indoc! {"
-        «The quick brown
-        fox jumps over
-        the lazy dogˇ»
-    "});
-    cx.update_editor(|e, window, cx| e.convert_to_title_case(&ConvertToTitleCase, window, cx));
-    cx.assert_editor_state(indoc! {"
-        «The Quick Brown
-        Fox Jumps Over
-        The Lazy Dogˇ»
-    "});
-
-    // Test multiple line, single selection case
-    cx.set_state(indoc! {"
-        «The quick brown
-        fox jumps over
-        the lazy dogˇ»
-    "});
-    cx.update_editor(|e, window, cx| {
-        e.convert_to_upper_camel_case(&ConvertToUpperCamelCase, window, cx)
-    });
-    cx.assert_editor_state(indoc! {"
-        «TheQuickBrown
-        FoxJumpsOver
-        TheLazyDogˇ»
-    "});
-
-    // From here on out, test more complex cases of manipulate_text()
-
-    // Test no selection case - should affect words cursors are in
-    // Cursor at beginning, middle, and end of word
-    cx.set_state(indoc! {"
-        ˇhello big beauˇtiful worldˇ
-    "});
-    cx.update_editor(|e, window, cx| e.convert_to_upper_case(&ConvertToUpperCase, window, cx));
-    cx.assert_editor_state(indoc! {"
-        «HELLOˇ» big «BEAUTIFULˇ» «WORLDˇ»
-    "});
-
-    // Test multiple selections on a single line and across multiple lines
-    cx.set_state(indoc! {"
-        «Theˇ» quick «brown
-        foxˇ» jumps «overˇ»
-        the «lazyˇ» dog
-    "});
-    cx.update_editor(|e, window, cx| e.convert_to_upper_case(&ConvertToUpperCase, window, cx));
-    cx.assert_editor_state(indoc! {"
-        «THEˇ» quick «BROWN
-        FOXˇ» jumps «OVERˇ»
-        the «LAZYˇ» dog
-    "});
-
-    // Test case where text length grows
-    cx.set_state(indoc! {"
-        «tschüߡ»
-    "});
-    cx.update_editor(|e, window, cx| e.convert_to_upper_case(&ConvertToUpperCase, window, cx));
-    cx.assert_editor_state(indoc! {"
-        «TSCHÜSSˇ»
-    "});
-
-    // Test to make sure we don't crash when text shrinks
-    cx.set_state(indoc! {"
-        aaa_bbbˇ
-    "});
-    cx.update_editor(|e, window, cx| {
-        e.convert_to_lower_camel_case(&ConvertToLowerCamelCase, window, cx)
-    });
-    cx.assert_editor_state(indoc! {"
-        «aaaBbbˇ»
-    "});
-
-    // Test to make sure we all aware of the fact that each word can grow and shrink
-    // Final selections should be aware of this fact
-    cx.set_state(indoc! {"
-        aaa_bˇbb bbˇb_ccc ˇccc_ddd
-    "});
-    cx.update_editor(|e, window, cx| {
-        e.convert_to_lower_camel_case(&ConvertToLowerCamelCase, window, cx)
-    });
-    cx.assert_editor_state(indoc! {"
-        «aaaBbbˇ» «bbbCccˇ» «cccDddˇ»
-    "});
-
-    cx.set_state(indoc! {"
-        «hElLo, WoRld!ˇ»
-    "});
-    cx.update_editor(|e, window, cx| {
-        e.convert_to_opposite_case(&ConvertToOppositeCase, window, cx)
-    });
-    cx.assert_editor_state(indoc! {"
-        «HeLlO, wOrLD!ˇ»
-    "});
-
-    // Test selections with `line_mode() = true`.
-    cx.update_editor(|editor, _window, _cx| editor.selections.set_line_mode(true));
-    cx.set_state(indoc! {"
-        «The quick brown
-        fox jumps over
-        tˇ»he lazy dog
-    "});
-    cx.update_editor(|e, window, cx| e.convert_to_upper_case(&ConvertToUpperCase, window, cx));
-    cx.assert_editor_state(indoc! {"
-        «THE QUICK BROWN
-        FOX JUMPS OVER
-        THE LAZY DOGˇ»
-    "});
-}
-
-#[gpui::test]
-fn test_duplicate_line(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let editor = cx.add_window(|window, cx| {
-        let buffer = MultiBuffer::build_simple("abc\ndef\nghi\n", cx);
-        build_editor(buffer, window, cx)
-    });
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_display_ranges([
-                DisplayPoint::new(DisplayRow(0), 0)..DisplayPoint::new(DisplayRow(0), 1),
-                DisplayPoint::new(DisplayRow(0), 2)..DisplayPoint::new(DisplayRow(0), 2),
-                DisplayPoint::new(DisplayRow(1), 0)..DisplayPoint::new(DisplayRow(1), 0),
-                DisplayPoint::new(DisplayRow(3), 0)..DisplayPoint::new(DisplayRow(3), 0),
-            ])
-        });
-        editor.duplicate_line_down(&DuplicateLineDown, window, cx);
-        assert_eq!(editor.display_text(cx), "abc\nabc\ndef\ndef\nghi\n\n");
-        assert_eq!(
-            display_ranges(editor, cx),
-            vec![
-                DisplayPoint::new(DisplayRow(1), 0)..DisplayPoint::new(DisplayRow(1), 1),
-                DisplayPoint::new(DisplayRow(1), 2)..DisplayPoint::new(DisplayRow(1), 2),
-                DisplayPoint::new(DisplayRow(3), 0)..DisplayPoint::new(DisplayRow(3), 0),
-                DisplayPoint::new(DisplayRow(6), 0)..DisplayPoint::new(DisplayRow(6), 0),
-            ]
-        );
-    });
-
-    let editor = cx.add_window(|window, cx| {
-        let buffer = MultiBuffer::build_simple("abc\ndef\nghi\n", cx);
-        build_editor(buffer, window, cx)
-    });
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_display_ranges([
-                DisplayPoint::new(DisplayRow(0), 1)..DisplayPoint::new(DisplayRow(1), 1),
-                DisplayPoint::new(DisplayRow(1), 2)..DisplayPoint::new(DisplayRow(2), 1),
-            ])
-        });
-        editor.duplicate_line_down(&DuplicateLineDown, window, cx);
-        assert_eq!(editor.display_text(cx), "abc\ndef\nghi\nabc\ndef\nghi\n");
-        assert_eq!(
-            display_ranges(editor, cx),
-            vec![
-                DisplayPoint::new(DisplayRow(3), 1)..DisplayPoint::new(DisplayRow(4), 1),
-                DisplayPoint::new(DisplayRow(4), 2)..DisplayPoint::new(DisplayRow(5), 1),
-            ]
-        );
-    });
-
-    // With `duplicate_line_up` the selections move to the duplicated lines,
-    // which are inserted above the original lines
-    let editor = cx.add_window(|window, cx| {
-        let buffer = MultiBuffer::build_simple("abc\ndef\nghi\n", cx);
-        build_editor(buffer, window, cx)
-    });
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_display_ranges([
-                DisplayPoint::new(DisplayRow(0), 0)..DisplayPoint::new(DisplayRow(0), 1),
-                DisplayPoint::new(DisplayRow(0), 2)..DisplayPoint::new(DisplayRow(0), 2),
-                DisplayPoint::new(DisplayRow(1), 0)..DisplayPoint::new(DisplayRow(1), 0),
-                DisplayPoint::new(DisplayRow(3), 0)..DisplayPoint::new(DisplayRow(3), 0),
-            ])
-        });
-        editor.duplicate_line_up(&DuplicateLineUp, window, cx);
-        assert_eq!(editor.display_text(cx), "abc\nabc\ndef\ndef\nghi\n\n");
-        assert_eq!(
-            display_ranges(editor, cx),
-            vec![
-                DisplayPoint::new(DisplayRow(0), 0)..DisplayPoint::new(DisplayRow(0), 1),
-                DisplayPoint::new(DisplayRow(0), 2)..DisplayPoint::new(DisplayRow(0), 2),
-                DisplayPoint::new(DisplayRow(2), 0)..DisplayPoint::new(DisplayRow(2), 0),
-                DisplayPoint::new(DisplayRow(5), 0)..DisplayPoint::new(DisplayRow(5), 0),
-            ]
-        );
-    });
-
-    let editor = cx.add_window(|window, cx| {
-        let buffer = MultiBuffer::build_simple("abc\ndef\nghi\n", cx);
-        build_editor(buffer, window, cx)
-    });
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_display_ranges([
-                DisplayPoint::new(DisplayRow(0), 1)..DisplayPoint::new(DisplayRow(1), 1),
-                DisplayPoint::new(DisplayRow(1), 2)..DisplayPoint::new(DisplayRow(2), 1),
-            ])
-        });
-        editor.duplicate_line_up(&DuplicateLineUp, window, cx);
-        assert_eq!(editor.display_text(cx), "abc\ndef\nghi\nabc\ndef\nghi\n");
-        assert_eq!(
-            display_ranges(editor, cx),
-            vec![
-                DisplayPoint::new(DisplayRow(0), 1)..DisplayPoint::new(DisplayRow(1), 1),
-                DisplayPoint::new(DisplayRow(1), 2)..DisplayPoint::new(DisplayRow(2), 1),
-            ]
-        );
-    });
-
-    let editor = cx.add_window(|window, cx| {
-        let buffer = MultiBuffer::build_simple("abc\ndef\nghi\n", cx);
-        build_editor(buffer, window, cx)
-    });
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_display_ranges([
-                DisplayPoint::new(DisplayRow(0), 1)..DisplayPoint::new(DisplayRow(1), 1),
-                DisplayPoint::new(DisplayRow(1), 2)..DisplayPoint::new(DisplayRow(2), 1),
-            ])
-        });
-        editor.duplicate_selection(&DuplicateSelection, window, cx);
-        assert_eq!(editor.display_text(cx), "abc\ndbc\ndef\ngf\nghi\n");
-        assert_eq!(
-            display_ranges(editor, cx),
-            vec![
-                DisplayPoint::new(DisplayRow(0), 1)..DisplayPoint::new(DisplayRow(1), 1),
-                DisplayPoint::new(DisplayRow(2), 2)..DisplayPoint::new(DisplayRow(3), 1),
-            ]
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_rotate_selections(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    // Rotate text selections (horizontal)
-    cx.set_state("x=«1ˇ», y=«2ˇ», z=«3ˇ»");
-    cx.update_editor(|e, window, cx| {
-        e.rotate_selections_forward(&RotateSelectionsForward, window, cx)
-    });
-    cx.assert_editor_state("x=«3ˇ», y=«1ˇ», z=«2ˇ»");
-    cx.update_editor(|e, window, cx| {
-        e.rotate_selections_backward(&RotateSelectionsBackward, window, cx)
-    });
-    cx.assert_editor_state("x=«1ˇ», y=«2ˇ», z=«3ˇ»");
-
-    // Rotate text selections (vertical)
-    cx.set_state(indoc! {"
-        x=«1ˇ»
-        y=«2ˇ»
-        z=«3ˇ»
-    "});
-    cx.update_editor(|e, window, cx| {
-        e.rotate_selections_forward(&RotateSelectionsForward, window, cx)
-    });
-    cx.assert_editor_state(indoc! {"
-        x=«3ˇ»
-        y=«1ˇ»
-        z=«2ˇ»
-    "});
-    cx.update_editor(|e, window, cx| {
-        e.rotate_selections_backward(&RotateSelectionsBackward, window, cx)
-    });
-    cx.assert_editor_state(indoc! {"
-        x=«1ˇ»
-        y=«2ˇ»
-        z=«3ˇ»
-    "});
-
-    // Rotate text selections (vertical, different lengths)
-    cx.set_state(indoc! {"
-        x=\"«ˇ»\"
-        y=\"«aˇ»\"
-        z=\"«aaˇ»\"
-    "});
-    cx.update_editor(|e, window, cx| {
-        e.rotate_selections_forward(&RotateSelectionsForward, window, cx)
-    });
-    cx.assert_editor_state(indoc! {"
-        x=\"«aaˇ»\"
-        y=\"«ˇ»\"
-        z=\"«aˇ»\"
-    "});
-    cx.update_editor(|e, window, cx| {
-        e.rotate_selections_backward(&RotateSelectionsBackward, window, cx)
-    });
-    cx.assert_editor_state(indoc! {"
-        x=\"«ˇ»\"
-        y=\"«aˇ»\"
-        z=\"«aaˇ»\"
-    "});
-
-    // Rotate whole lines (cursor positions preserved)
-    cx.set_state(indoc! {"
-        ˇline123
-        liˇne23
-        line3ˇ
-    "});
-    cx.update_editor(|e, window, cx| {
-        e.rotate_selections_forward(&RotateSelectionsForward, window, cx)
-    });
-    cx.assert_editor_state(indoc! {"
-        line3ˇ
-        ˇline123
-        liˇne23
-    "});
-    cx.update_editor(|e, window, cx| {
-        e.rotate_selections_backward(&RotateSelectionsBackward, window, cx)
-    });
-    cx.assert_editor_state(indoc! {"
-        ˇline123
-        liˇne23
-        line3ˇ
-    "});
-
-    // Rotate whole lines, multiple cursors per line (positions preserved)
-    cx.set_state(indoc! {"
-        ˇliˇne123
-        ˇline23
-        ˇline3
-    "});
-    cx.update_editor(|e, window, cx| {
-        e.rotate_selections_forward(&RotateSelectionsForward, window, cx)
-    });
-    cx.assert_editor_state(indoc! {"
-        ˇline3
-        ˇliˇne123
-        ˇline23
-    "});
-    cx.update_editor(|e, window, cx| {
-        e.rotate_selections_backward(&RotateSelectionsBackward, window, cx)
-    });
-    cx.assert_editor_state(indoc! {"
-        ˇliˇne123
-        ˇline23
-        ˇline3
-    "});
-}
-
-#[gpui::test]
-fn test_move_line_up_down(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let editor = cx.add_window(|window, cx| {
-        let buffer = MultiBuffer::build_simple(&sample_text(10, 5, 'a'), cx);
-        build_editor(buffer, window, cx)
-    });
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.fold_creases(
-            vec![
-                Crease::simple(Point::new(0, 2)..Point::new(1, 2), FoldPlaceholder::test()),
-                Crease::simple(Point::new(2, 3)..Point::new(4, 1), FoldPlaceholder::test()),
-                Crease::simple(Point::new(7, 0)..Point::new(8, 4), FoldPlaceholder::test()),
-            ],
-            true,
-            window,
-            cx,
-        );
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_display_ranges([
-                DisplayPoint::new(DisplayRow(0), 1)..DisplayPoint::new(DisplayRow(0), 1),
-                DisplayPoint::new(DisplayRow(3), 1)..DisplayPoint::new(DisplayRow(3), 1),
-                DisplayPoint::new(DisplayRow(3), 2)..DisplayPoint::new(DisplayRow(4), 3),
-                DisplayPoint::new(DisplayRow(5), 0)..DisplayPoint::new(DisplayRow(5), 2),
-            ])
-        });
-        assert_eq!(
-            editor.display_text(cx),
-            "aa⋯bbb\nccc⋯eeee\nfffff\nggggg\n⋯i\njjjjj"
-        );
-
-        editor.move_line_up(&MoveLineUp, window, cx);
-        assert_eq!(
-            editor.display_text(cx),
-            "aa⋯bbb\nccc⋯eeee\nggggg\n⋯i\njjjjj\nfffff"
-        );
-        assert_eq!(
-            display_ranges(editor, cx),
-            vec![
-                DisplayPoint::new(DisplayRow(0), 1)..DisplayPoint::new(DisplayRow(0), 1),
-                DisplayPoint::new(DisplayRow(2), 1)..DisplayPoint::new(DisplayRow(2), 1),
-                DisplayPoint::new(DisplayRow(2), 2)..DisplayPoint::new(DisplayRow(3), 3),
-                DisplayPoint::new(DisplayRow(4), 0)..DisplayPoint::new(DisplayRow(4), 2)
-            ]
-        );
-    });
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.move_line_down(&MoveLineDown, window, cx);
-        assert_eq!(
-            editor.display_text(cx),
-            "ccc⋯eeee\naa⋯bbb\nfffff\nggggg\n⋯i\njjjjj"
-        );
-        assert_eq!(
-            display_ranges(editor, cx),
-            vec![
-                DisplayPoint::new(DisplayRow(1), 1)..DisplayPoint::new(DisplayRow(1), 1),
-                DisplayPoint::new(DisplayRow(3), 1)..DisplayPoint::new(DisplayRow(3), 1),
-                DisplayPoint::new(DisplayRow(3), 2)..DisplayPoint::new(DisplayRow(4), 3),
-                DisplayPoint::new(DisplayRow(5), 0)..DisplayPoint::new(DisplayRow(5), 2)
-            ]
-        );
-    });
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.move_line_down(&MoveLineDown, window, cx);
-        assert_eq!(
-            editor.display_text(cx),
-            "ccc⋯eeee\nfffff\naa⋯bbb\nggggg\n⋯i\njjjjj"
-        );
-        assert_eq!(
-            display_ranges(editor, cx),
-            vec![
-                DisplayPoint::new(DisplayRow(2), 1)..DisplayPoint::new(DisplayRow(2), 1),
-                DisplayPoint::new(DisplayRow(3), 1)..DisplayPoint::new(DisplayRow(3), 1),
-                DisplayPoint::new(DisplayRow(3), 2)..DisplayPoint::new(DisplayRow(4), 3),
-                DisplayPoint::new(DisplayRow(5), 0)..DisplayPoint::new(DisplayRow(5), 2)
-            ]
-        );
-    });
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.move_line_up(&MoveLineUp, window, cx);
-        assert_eq!(
-            editor.display_text(cx),
-            "ccc⋯eeee\naa⋯bbb\nggggg\n⋯i\njjjjj\nfffff"
-        );
-        assert_eq!(
-            display_ranges(editor, cx),
-            vec![
-                DisplayPoint::new(DisplayRow(1), 1)..DisplayPoint::new(DisplayRow(1), 1),
-                DisplayPoint::new(DisplayRow(2), 1)..DisplayPoint::new(DisplayRow(2), 1),
-                DisplayPoint::new(DisplayRow(2), 2)..DisplayPoint::new(DisplayRow(3), 3),
-                DisplayPoint::new(DisplayRow(4), 0)..DisplayPoint::new(DisplayRow(4), 2)
-            ]
-        );
-    });
-}
-
-#[gpui::test]
-fn test_move_line_up_selection_at_end_of_fold(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    let editor = cx.add_window(|window, cx| {
-        let buffer = MultiBuffer::build_simple("\n\n\n\n\n\naaaa\nbbbb\ncccc", cx);
-        build_editor(buffer, window, cx)
-    });
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.fold_creases(
-            vec![Crease::simple(
-                Point::new(6, 4)..Point::new(7, 4),
-                FoldPlaceholder::test(),
-            )],
-            true,
-            window,
-            cx,
-        );
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([Point::new(7, 4)..Point::new(7, 4)])
-        });
-        assert_eq!(editor.display_text(cx), "\n\n\n\n\n\naaaa⋯\ncccc");
-        editor.move_line_up(&MoveLineUp, window, cx);
-        let buffer_text = editor.buffer.read(cx).snapshot(cx).text();
-        assert_eq!(buffer_text, "\n\n\n\n\naaaa\nbbbb\n\ncccc");
-    });
-}
-
-#[gpui::test]
-fn test_move_line_up_down_with_blocks(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let editor = cx.add_window(|window, cx| {
-        let buffer = MultiBuffer::build_simple(&sample_text(10, 5, 'a'), cx);
-        build_editor(buffer, window, cx)
-    });
-    _ = editor.update(cx, |editor, window, cx| {
-        let snapshot = editor.buffer.read(cx).snapshot(cx);
-        editor.insert_blocks(
-            [BlockProperties {
-                style: BlockStyle::Fixed,
-                placement: BlockPlacement::Below(snapshot.anchor_after(Point::new(2, 0))),
-                height: Some(1),
-                render: Arc::new(|_| div().into_any()),
-                priority: 0,
-            }],
-            Some(Autoscroll::fit()),
-            cx,
-        );
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([Point::new(2, 0)..Point::new(2, 0)])
-        });
-        editor.move_line_down(&MoveLineDown, window, cx);
-    });
-}
-
-#[gpui::test]
-async fn test_selections_and_replace_blocks(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-    cx.set_state(
-        &"
-            ˇzero
-            one
-            two
-            three
-            four
-            five
-        "
-        .unindent(),
-    );
-
-    // Create a four-line block that replaces three lines of text.
-    cx.update_editor(|editor, window, cx| {
-        let snapshot = editor.snapshot(window, cx);
-        let snapshot = &snapshot.buffer_snapshot();
-        let placement = BlockPlacement::Replace(
-            snapshot.anchor_after(Point::new(1, 0))..=snapshot.anchor_after(Point::new(3, 0)),
-        );
-        editor.insert_blocks(
-            [BlockProperties {
-                placement,
-                height: Some(4),
-                style: BlockStyle::Sticky,
-                render: Arc::new(|_| gpui::div().into_any_element()),
-                priority: 0,
-            }],
-            None,
-            cx,
-        );
-    });
-
-    // Move down so that the cursor touches the block.
-    cx.update_editor(|editor, window, cx| {
-        editor.move_down(&Default::default(), window, cx);
-    });
-    cx.assert_editor_state(
-        &"
-            zero
-            «one
-            two
-            threeˇ»
-            four
-            five
-        "
-        .unindent(),
-    );
-
-    // Move down past the block.
-    cx.update_editor(|editor, window, cx| {
-        editor.move_down(&Default::default(), window, cx);
-    });
-    cx.assert_editor_state(
-        &"
-            zero
-            one
-            two
-            three
-            ˇfour
-            five
-        "
-        .unindent(),
-    );
-}
-
-#[gpui::test]
-fn test_transpose(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    _ = cx.add_window(|window, cx| {
-        let mut editor = build_editor(MultiBuffer::build_simple("abc", cx), window, cx);
-        editor.set_style(EditorStyle::default(), window, cx);
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([MultiBufferOffset(1)..MultiBufferOffset(1)])
-        });
-        editor.transpose(&Default::default(), window, cx);
-        assert_eq!(editor.text(cx), "bac");
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            [MultiBufferOffset(2)..MultiBufferOffset(2)]
-        );
-
-        editor.transpose(&Default::default(), window, cx);
-        assert_eq!(editor.text(cx), "bca");
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            [MultiBufferOffset(3)..MultiBufferOffset(3)]
-        );
-
-        editor.transpose(&Default::default(), window, cx);
-        assert_eq!(editor.text(cx), "bac");
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            [MultiBufferOffset(3)..MultiBufferOffset(3)]
-        );
-
-        editor
-    });
-
-    _ = cx.add_window(|window, cx| {
-        let mut editor = build_editor(MultiBuffer::build_simple("abc\nde", cx), window, cx);
-        editor.set_style(EditorStyle::default(), window, cx);
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([MultiBufferOffset(3)..MultiBufferOffset(3)])
-        });
-        editor.transpose(&Default::default(), window, cx);
-        assert_eq!(editor.text(cx), "acb\nde");
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            [MultiBufferOffset(3)..MultiBufferOffset(3)]
-        );
-
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([MultiBufferOffset(4)..MultiBufferOffset(4)])
-        });
-        editor.transpose(&Default::default(), window, cx);
-        assert_eq!(editor.text(cx), "acbd\ne");
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            [MultiBufferOffset(5)..MultiBufferOffset(5)]
-        );
-
-        editor.transpose(&Default::default(), window, cx);
-        assert_eq!(editor.text(cx), "acbde\n");
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            [MultiBufferOffset(6)..MultiBufferOffset(6)]
-        );
-
-        editor.transpose(&Default::default(), window, cx);
-        assert_eq!(editor.text(cx), "acbd\ne");
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            [MultiBufferOffset(6)..MultiBufferOffset(6)]
-        );
-
-        editor
-    });
-
-    _ = cx.add_window(|window, cx| {
-        let mut editor = build_editor(MultiBuffer::build_simple("abc\nde", cx), window, cx);
-        editor.set_style(EditorStyle::default(), window, cx);
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([
-                MultiBufferOffset(1)..MultiBufferOffset(1),
-                MultiBufferOffset(2)..MultiBufferOffset(2),
-                MultiBufferOffset(4)..MultiBufferOffset(4),
-            ])
-        });
-        editor.transpose(&Default::default(), window, cx);
-        assert_eq!(editor.text(cx), "bacd\ne");
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            [
-                MultiBufferOffset(2)..MultiBufferOffset(2),
-                MultiBufferOffset(3)..MultiBufferOffset(3),
-                MultiBufferOffset(5)..MultiBufferOffset(5)
-            ]
-        );
-
-        editor.transpose(&Default::default(), window, cx);
-        assert_eq!(editor.text(cx), "bcade\n");
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            [
-                MultiBufferOffset(3)..MultiBufferOffset(3),
-                MultiBufferOffset(4)..MultiBufferOffset(4),
-                MultiBufferOffset(6)..MultiBufferOffset(6)
-            ]
-        );
-
-        editor.transpose(&Default::default(), window, cx);
-        assert_eq!(editor.text(cx), "bcda\ne");
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            [
-                MultiBufferOffset(4)..MultiBufferOffset(4),
-                MultiBufferOffset(6)..MultiBufferOffset(6)
-            ]
-        );
-
-        editor.transpose(&Default::default(), window, cx);
-        assert_eq!(editor.text(cx), "bcade\n");
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            [
-                MultiBufferOffset(4)..MultiBufferOffset(4),
-                MultiBufferOffset(6)..MultiBufferOffset(6)
-            ]
-        );
-
-        editor.transpose(&Default::default(), window, cx);
-        assert_eq!(editor.text(cx), "bcaed\n");
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            [
-                MultiBufferOffset(5)..MultiBufferOffset(5),
-                MultiBufferOffset(6)..MultiBufferOffset(6)
-            ]
-        );
-
-        editor
-    });
-
-    _ = cx.add_window(|window, cx| {
-        let mut editor = build_editor(MultiBuffer::build_simple("🍐🏀✋", cx), window, cx);
-        editor.set_style(EditorStyle::default(), window, cx);
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([MultiBufferOffset(4)..MultiBufferOffset(4)])
-        });
-        editor.transpose(&Default::default(), window, cx);
-        assert_eq!(editor.text(cx), "🏀🍐✋");
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            [MultiBufferOffset(8)..MultiBufferOffset(8)]
-        );
-
-        editor.transpose(&Default::default(), window, cx);
-        assert_eq!(editor.text(cx), "🏀✋🍐");
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            [MultiBufferOffset(11)..MultiBufferOffset(11)]
-        );
-
-        editor.transpose(&Default::default(), window, cx);
-        assert_eq!(editor.text(cx), "🏀🍐✋");
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            [MultiBufferOffset(11)..MultiBufferOffset(11)]
-        );
-
-        editor
-    });
-}
-
-#[gpui::test]
-async fn test_rewrap(cx: &mut TestAppContext) {
-    init_test(cx, |settings| {
-        settings.languages.0.extend([
-            (
-                "Markdown".into(),
-                LanguageSettingsContent {
-                    allow_rewrap: Some(language_settings::RewrapBehavior::Anywhere),
-                    preferred_line_length: Some(40),
-                    ..Default::default()
-                },
-            ),
-            (
-                "Plain Text".into(),
-                LanguageSettingsContent {
-                    allow_rewrap: Some(language_settings::RewrapBehavior::Anywhere),
-                    preferred_line_length: Some(40),
-                    ..Default::default()
-                },
-            ),
-            (
-                "C++".into(),
-                LanguageSettingsContent {
-                    allow_rewrap: Some(language_settings::RewrapBehavior::InComments),
-                    preferred_line_length: Some(40),
-                    ..Default::default()
-                },
-            ),
-            (
-                "Python".into(),
-                LanguageSettingsContent {
-                    allow_rewrap: Some(language_settings::RewrapBehavior::InComments),
-                    preferred_line_length: Some(40),
-                    ..Default::default()
-                },
-            ),
-            (
-                "Rust".into(),
-                LanguageSettingsContent {
-                    allow_rewrap: Some(language_settings::RewrapBehavior::InComments),
-                    preferred_line_length: Some(40),
-                    ..Default::default()
-                },
-            ),
-        ])
-    });
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    let cpp_language = Arc::new(Language::new(
-        LanguageConfig {
-            name: "C++".into(),
-            line_comments: vec!["// ".into()],
-            ..LanguageConfig::default()
-        },
-        None,
-    ));
-    let python_language = Arc::new(Language::new(
-        LanguageConfig {
-            name: "Python".into(),
-            line_comments: vec!["# ".into()],
-            ..LanguageConfig::default()
-        },
-        None,
-    ));
-    let markdown_language = Arc::new(Language::new(
-        LanguageConfig {
-            name: "Markdown".into(),
-            rewrap_prefixes: vec![
-                regex::Regex::new("\\d+\\.\\s+").unwrap(),
-                regex::Regex::new("[-*+]\\s+").unwrap(),
-            ],
-            ..LanguageConfig::default()
-        },
-        None,
-    ));
-    let rust_language = Arc::new(
-        Language::new(
-            LanguageConfig {
-                name: "Rust".into(),
-                line_comments: vec!["// ".into(), "/// ".into()],
-                ..LanguageConfig::default()
-            },
-            Some(tree_sitter_rust::LANGUAGE.into()),
-        )
-        .with_override_query("[(line_comment)(block_comment)] @comment.inclusive")
-        .unwrap(),
-    );
-
-    let plaintext_language = Arc::new(Language::new(
-        LanguageConfig {
-            name: "Plain Text".into(),
-            ..LanguageConfig::default()
-        },
-        None,
-    ));
-
-    // Test basic rewrapping of a long line with a cursor
-    assert_rewrap(
-        indoc! {"
-            // ˇThis is a long comment that needs to be wrapped.
-        "},
-        indoc! {"
-            // ˇThis is a long comment that needs to
-            // be wrapped.
-        "},
-        cpp_language.clone(),
-        &mut cx,
-    );
-
-    // Test rewrapping a full selection
-    assert_rewrap(
-        indoc! {"
-            «// This selected long comment needs to be wrapped.ˇ»"
-        },
-        indoc! {"
-            «// This selected long comment needs to
-            // be wrapped.ˇ»"
-        },
-        cpp_language.clone(),
-        &mut cx,
-    );
-
-    // Test multiple cursors on different lines within the same paragraph are preserved after rewrapping
-    assert_rewrap(
-        indoc! {"
-            // ˇThis is the first line.
-            // Thisˇ is the second line.
-            // This is the thirdˇ line, all part of one paragraph.
-         "},
-        indoc! {"
-            // ˇThis is the first line. Thisˇ is the
-            // second line. This is the thirdˇ line,
-            // all part of one paragraph.
-         "},
-        cpp_language.clone(),
-        &mut cx,
-    );
-
-    // Test multiple cursors in different paragraphs trigger separate rewraps
-    assert_rewrap(
-        indoc! {"
-            // ˇThis is the first paragraph, first line.
-            // ˇThis is the first paragraph, second line.
-
-            // ˇThis is the second paragraph, first line.
-            // ˇThis is the second paragraph, second line.
-        "},
-        indoc! {"
-            // ˇThis is the first paragraph, first
-            // line. ˇThis is the first paragraph,
-            // second line.
-
-            // ˇThis is the second paragraph, first
-            // line. ˇThis is the second paragraph,
-            // second line.
-        "},
-        cpp_language.clone(),
-        &mut cx,
-    );
-
-    // Test that change in comment prefix (e.g., `//` to `///`) trigger seperate rewraps
-    assert_rewrap(
-        indoc! {"
-            «// A regular long long comment to be wrapped.
-            /// A documentation long comment to be wrapped.ˇ»
-          "},
-        indoc! {"
-            «// A regular long long comment to be
-            // wrapped.
-            /// A documentation long comment to be
-            /// wrapped.ˇ»
-          "},
-        rust_language.clone(),
-        &mut cx,
-    );
-
-    // Test that change in indentation level trigger seperate rewraps
-    assert_rewrap(
-        indoc! {"
-            fn foo() {
-                «// This is a long comment at the base indent.
-                    // This is a long comment at the next indent.ˇ»
-            }
-        "},
-        indoc! {"
-            fn foo() {
-                «// This is a long comment at the
-                // base indent.
-                    // This is a long comment at the
-                    // next indent.ˇ»
-            }
-        "},
-        rust_language.clone(),
-        &mut cx,
-    );
-
-    // Test that different comment prefix characters (e.g., '#') are handled correctly
-    assert_rewrap(
-        indoc! {"
-            # ˇThis is a long comment using a pound sign.
-        "},
-        indoc! {"
-            # ˇThis is a long comment using a pound
-            # sign.
-        "},
-        python_language,
-        &mut cx,
-    );
-
-    // Test rewrapping only affects comments, not code even when selected
-    assert_rewrap(
-        indoc! {"
-            «/// This doc comment is long and should be wrapped.
-            fn my_func(a: u32, b: u32, c: u32, d: u32, e: u32, f: u32) {}ˇ»
-        "},
-        indoc! {"
-            «/// This doc comment is long and should
-            /// be wrapped.
-            fn my_func(a: u32, b: u32, c: u32, d: u32, e: u32, f: u32) {}ˇ»
-        "},
-        rust_language.clone(),
-        &mut cx,
-    );
-
-    // Test that rewrapping works in Markdown documents where `allow_rewrap` is `Anywhere`
-    assert_rewrap(
-        indoc! {"
-            # Header
-
-            A long long long line of markdown text to wrap.ˇ
-         "},
-        indoc! {"
-            # Header
-
-            A long long long line of markdown text
-            to wrap.ˇ
-         "},
-        markdown_language.clone(),
-        &mut cx,
-    );
-
-    // Test that rewrapping boundary works and preserves relative indent for Markdown documents
-    assert_rewrap(
-        indoc! {"
-            «1. This is a numbered list item that is very long and needs to be wrapped properly.
-            2. This is a numbered list item that is very long and needs to be wrapped properly.
-            - This is an unordered list item that is also very long and should not merge with the numbered item.ˇ»
-        "},
-        indoc! {"
-            «1. This is a numbered list item that is
-               very long and needs to be wrapped
-               properly.
-            2. This is a numbered list item that is
-               very long and needs to be wrapped
-               properly.
-            - This is an unordered list item that is
-              also very long and should not merge
-              with the numbered item.ˇ»
-        "},
-        markdown_language.clone(),
-        &mut cx,
-    );
-
-    // Test that rewrapping add indents for rewrapping boundary if not exists already.
-    assert_rewrap(
-        indoc! {"
-            «1. This is a numbered list item that is
-            very long and needs to be wrapped
-            properly.
-            2. This is a numbered list item that is
-            very long and needs to be wrapped
-            properly.
-            - This is an unordered list item that is
-            also very long and should not merge with
-            the numbered item.ˇ»
-        "},
-        indoc! {"
-            «1. This is a numbered list item that is
-               very long and needs to be wrapped
-               properly.
-            2. This is a numbered list item that is
-               very long and needs to be wrapped
-               properly.
-            - This is an unordered list item that is
-              also very long and should not merge
-              with the numbered item.ˇ»
-        "},
-        markdown_language.clone(),
-        &mut cx,
-    );
-
-    // Test that rewrapping maintain indents even when they already exists.
-    assert_rewrap(
-        indoc! {"
-            «1. This is a numbered list
-               item that is very long and needs to be wrapped properly.
-            2. This is a numbered list
-               item that is very long and needs to be wrapped properly.
-            - This is an unordered list item that is also very long and
-              should not merge with the numbered item.ˇ»
-        "},
-        indoc! {"
-            «1. This is a numbered list item that is
-               very long and needs to be wrapped
-               properly.
-            2. This is a numbered list item that is
-               very long and needs to be wrapped
-               properly.
-            - This is an unordered list item that is
-              also very long and should not merge
-              with the numbered item.ˇ»
-        "},
-        markdown_language,
-        &mut cx,
-    );
-
-    // Test that rewrapping works in plain text where `allow_rewrap` is `Anywhere`
-    assert_rewrap(
-        indoc! {"
-            ˇThis is a very long line of plain text that will be wrapped.
-        "},
-        indoc! {"
-            ˇThis is a very long line of plain text
-            that will be wrapped.
-        "},
-        plaintext_language.clone(),
-        &mut cx,
-    );
-
-    // Test that non-commented code acts as a paragraph boundary within a selection
-    assert_rewrap(
-        indoc! {"
-               «// This is the first long comment block to be wrapped.
-               fn my_func(a: u32);
-               // This is the second long comment block to be wrapped.ˇ»
-           "},
-        indoc! {"
-               «// This is the first long comment block
-               // to be wrapped.
-               fn my_func(a: u32);
-               // This is the second long comment block
-               // to be wrapped.ˇ»
-           "},
-        rust_language,
-        &mut cx,
-    );
-
-    // Test rewrapping multiple selections, including ones with blank lines or tabs
-    assert_rewrap(
-        indoc! {"
-            «ˇThis is a very long line that will be wrapped.
-
-            This is another paragraph in the same selection.»
-
-            «\tThis is a very long indented line that will be wrapped.ˇ»
-         "},
-        indoc! {"
-            «ˇThis is a very long line that will be
-            wrapped.
-
-            This is another paragraph in the same
-            selection.»
-
-            «\tThis is a very long indented line
-            \tthat will be wrapped.ˇ»
-         "},
-        plaintext_language,
-        &mut cx,
-    );
-
-    // Test that an empty comment line acts as a paragraph boundary
-    assert_rewrap(
-        indoc! {"
-            // ˇThis is a long comment that will be wrapped.
-            //
-            // And this is another long comment that will also be wrapped.ˇ
-         "},
-        indoc! {"
-            // ˇThis is a long comment that will be
-            // wrapped.
-            //
-            // And this is another long comment that
-            // will also be wrapped.ˇ
-         "},
-        cpp_language,
-        &mut cx,
-    );
-
-    #[track_caller]
-    fn assert_rewrap(
-        unwrapped_text: &str,
-        wrapped_text: &str,
-        language: Arc<Language>,
-        cx: &mut EditorTestContext,
-    ) {
-        cx.update_buffer(|buffer, cx| buffer.set_language(Some(language), cx));
-        cx.set_state(unwrapped_text);
-        cx.update_editor(|e, window, cx| e.rewrap(&Rewrap, window, cx));
-        cx.assert_editor_state(wrapped_text);
-    }
-}
-
-#[gpui::test]
-async fn test_rewrap_block_comments(cx: &mut TestAppContext) {
-    init_test(cx, |settings| {
-        settings.languages.0.extend([(
-            "Rust".into(),
-            LanguageSettingsContent {
-                allow_rewrap: Some(language_settings::RewrapBehavior::InComments),
-                preferred_line_length: Some(40),
-                ..Default::default()
-            },
-        )])
-    });
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    let rust_lang = Arc::new(
-        Language::new(
-            LanguageConfig {
-                name: "Rust".into(),
-                line_comments: vec!["// ".into()],
-                block_comment: Some(BlockCommentConfig {
-                    start: "/*".into(),
-                    end: "*/".into(),
-                    prefix: "* ".into(),
-                    tab_size: 1,
-                }),
-                documentation_comment: Some(BlockCommentConfig {
-                    start: "/**".into(),
-                    end: "*/".into(),
-                    prefix: "* ".into(),
-                    tab_size: 1,
-                }),
-
-                ..LanguageConfig::default()
-            },
-            Some(tree_sitter_rust::LANGUAGE.into()),
-        )
-        .with_override_query("[(line_comment) (block_comment)] @comment.inclusive")
-        .unwrap(),
-    );
-
-    // regular block comment
-    assert_rewrap(
-        indoc! {"
-            /*
-             *ˇ Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-             */
-            /*ˇ Lorem ipsum dolor sit amet, consectetur adipiscing elit. */
-        "},
-        indoc! {"
-            /*
-             *ˇ Lorem ipsum dolor sit amet,
-             * consectetur adipiscing elit.
-             */
-            /*
-             *ˇ Lorem ipsum dolor sit amet,
-             * consectetur adipiscing elit.
-             */
-        "},
-        rust_lang.clone(),
-        &mut cx,
-    );
-
-    // indent is respected
-    assert_rewrap(
-        indoc! {"
-            {}
-                /*ˇ Lorem ipsum dolor sit amet, consectetur adipiscing elit. */
-        "},
-        indoc! {"
-            {}
-                /*
-                 *ˇ Lorem ipsum dolor sit amet,
-                 * consectetur adipiscing elit.
-                 */
-        "},
-        rust_lang.clone(),
-        &mut cx,
-    );
-
-    // short block comments with inline delimiters
-    assert_rewrap(
-        indoc! {"
-            /*ˇ Lorem ipsum dolor sit amet, consectetur adipiscing elit. */
-            /*ˇ Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-             */
-            /*
-             *ˇ Lorem ipsum dolor sit amet, consectetur adipiscing elit. */
-        "},
-        indoc! {"
-            /*
-             *ˇ Lorem ipsum dolor sit amet,
-             * consectetur adipiscing elit.
-             */
-            /*
-             *ˇ Lorem ipsum dolor sit amet,
-             * consectetur adipiscing elit.
-             */
-            /*
-             *ˇ Lorem ipsum dolor sit amet,
-             * consectetur adipiscing elit.
-             */
-        "},
-        rust_lang.clone(),
-        &mut cx,
-    );
-
-    // multiline block comment with inline start/end delimiters
-    assert_rewrap(
-        indoc! {"
-            /*ˇ Lorem ipsum dolor sit amet,
-             * consectetur adipiscing elit. */
-        "},
-        indoc! {"
-            /*
-             *ˇ Lorem ipsum dolor sit amet,
-             * consectetur adipiscing elit.
-             */
-        "},
-        rust_lang.clone(),
-        &mut cx,
-    );
-
-    // block comment rewrap still respects paragraph bounds
-    assert_rewrap(
-        indoc! {"
-            /*
-             *ˇ Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-             *
-             * Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-             */
-        "},
-        indoc! {"
-            /*
-             *ˇ Lorem ipsum dolor sit amet,
-             * consectetur adipiscing elit.
-             *
-             * Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-             */
-        "},
-        rust_lang.clone(),
-        &mut cx,
-    );
-
-    // documentation comments
-    assert_rewrap(
-        indoc! {"
-            /**ˇ Lorem ipsum dolor sit amet, consectetur adipiscing elit. */
-            /**
-             *ˇ Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-             */
-        "},
-        indoc! {"
-            /**
-             *ˇ Lorem ipsum dolor sit amet,
-             * consectetur adipiscing elit.
-             */
-            /**
-             *ˇ Lorem ipsum dolor sit amet,
-             * consectetur adipiscing elit.
-             */
-        "},
-        rust_lang.clone(),
-        &mut cx,
-    );
-
-    // different, adjacent comments
-    assert_rewrap(
-        indoc! {"
-            /**
-             *ˇ Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-             */
-            /*ˇ Lorem ipsum dolor sit amet, consectetur adipiscing elit. */
-            //ˇ Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-        "},
-        indoc! {"
-            /**
-             *ˇ Lorem ipsum dolor sit amet,
-             * consectetur adipiscing elit.
-             */
-            /*
-             *ˇ Lorem ipsum dolor sit amet,
-             * consectetur adipiscing elit.
-             */
-            //ˇ Lorem ipsum dolor sit amet,
-            // consectetur adipiscing elit.
-        "},
-        rust_lang.clone(),
-        &mut cx,
-    );
-
-    // selection w/ single short block comment
-    assert_rewrap(
-        indoc! {"
-            «/* Lorem ipsum dolor sit amet, consectetur adipiscing elit. */ˇ»
-        "},
-        indoc! {"
-            «/*
-             * Lorem ipsum dolor sit amet,
-             * consectetur adipiscing elit.
-             */ˇ»
-        "},
-        rust_lang.clone(),
-        &mut cx,
-    );
-
-    // rewrapping a single comment w/ abutting comments
-    assert_rewrap(
-        indoc! {"
-            /* ˇLorem ipsum dolor sit amet, consectetur adipiscing elit. */
-            /* Lorem ipsum dolor sit amet, consectetur adipiscing elit. */
-        "},
-        indoc! {"
-            /*
-             * ˇLorem ipsum dolor sit amet,
-             * consectetur adipiscing elit.
-             */
-            /* Lorem ipsum dolor sit amet, consectetur adipiscing elit. */
-        "},
-        rust_lang.clone(),
-        &mut cx,
-    );
-
-    // selection w/ non-abutting short block comments
-    assert_rewrap(
-        indoc! {"
-            «/* Lorem ipsum dolor sit amet, consectetur adipiscing elit. */
-
-            /* Lorem ipsum dolor sit amet, consectetur adipiscing elit. */ˇ»
-        "},
-        indoc! {"
-            «/*
-             * Lorem ipsum dolor sit amet,
-             * consectetur adipiscing elit.
-             */
-
-            /*
-             * Lorem ipsum dolor sit amet,
-             * consectetur adipiscing elit.
-             */ˇ»
-        "},
-        rust_lang.clone(),
-        &mut cx,
-    );
-
-    // selection of multiline block comments
-    assert_rewrap(
-        indoc! {"
-            «/* Lorem ipsum dolor sit amet,
-             * consectetur adipiscing elit. */ˇ»
-        "},
-        indoc! {"
-            «/*
-             * Lorem ipsum dolor sit amet,
-             * consectetur adipiscing elit.
-             */ˇ»
-        "},
-        rust_lang.clone(),
-        &mut cx,
-    );
-
-    // partial selection of multiline block comments
-    assert_rewrap(
-        indoc! {"
-            «/* Lorem ipsum dolor sit amet,ˇ»
-             * consectetur adipiscing elit. */
-            /* Lorem ipsum dolor sit amet,
-             «* consectetur adipiscing elit. */ˇ»
-        "},
-        indoc! {"
-            «/*
-             * Lorem ipsum dolor sit amet,ˇ»
-             * consectetur adipiscing elit. */
-            /* Lorem ipsum dolor sit amet,
-             «* consectetur adipiscing elit.
-             */ˇ»
-        "},
-        rust_lang.clone(),
-        &mut cx,
-    );
-
-    // selection w/ abutting short block comments
-    // TODO: should not be combined; should rewrap as 2 comments
-    assert_rewrap(
-        indoc! {"
-            «/* Lorem ipsum dolor sit amet, consectetur adipiscing elit. */
-            /* Lorem ipsum dolor sit amet, consectetur adipiscing elit. */ˇ»
-        "},
-        // desired behavior:
-        // indoc! {"
-        //     «/*
-        //      * Lorem ipsum dolor sit amet,
-        //      * consectetur adipiscing elit.
-        //      */
-        //     /*
-        //      * Lorem ipsum dolor sit amet,
-        //      * consectetur adipiscing elit.
-        //      */ˇ»
-        // "},
-        // actual behaviour:
-        indoc! {"
-            «/*
-             * Lorem ipsum dolor sit amet,
-             * consectetur adipiscing elit. Lorem
-             * ipsum dolor sit amet, consectetur
-             * adipiscing elit.
-             */ˇ»
-        "},
-        rust_lang.clone(),
-        &mut cx,
-    );
-
-    // TODO: same as above, but with delimiters on separate line
-    // assert_rewrap(
-    //     indoc! {"
-    //         «/* Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-    //          */
-    //         /*
-    //          * Lorem ipsum dolor sit amet, consectetur adipiscing elit. */ˇ»
-    //     "},
-    //     // desired:
-    //     // indoc! {"
-    //     //     «/*
-    //     //      * Lorem ipsum dolor sit amet,
-    //     //      * consectetur adipiscing elit.
-    //     //      */
-    //     //     /*
-    //     //      * Lorem ipsum dolor sit amet,
-    //     //      * consectetur adipiscing elit.
-    //     //      */ˇ»
-    //     // "},
-    //     // actual: (but with trailing w/s on the empty lines)
-    //     indoc! {"
-    //         «/*
-    //          * Lorem ipsum dolor sit amet,
-    //          * consectetur adipiscing elit.
-    //          *
-    //          */
-    //         /*
-    //          *
-    //          * Lorem ipsum dolor sit amet,
-    //          * consectetur adipiscing elit.
-    //          */ˇ»
-    //     "},
-    //     rust_lang.clone(),
-    //     &mut cx,
-    // );
-
-    // TODO these are unhandled edge cases; not correct, just documenting known issues
-    assert_rewrap(
-        indoc! {"
-            /*
-             //ˇ Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-             */
-            /*
-             //ˇ Lorem ipsum dolor sit amet, consectetur adipiscing elit. */
-            /*ˇ Lorem ipsum dolor sit amet */ /* consectetur adipiscing elit. */
-        "},
-        // desired:
-        // indoc! {"
-        //     /*
-        //      *ˇ Lorem ipsum dolor sit amet,
-        //      * consectetur adipiscing elit.
-        //      */
-        //     /*
-        //      *ˇ Lorem ipsum dolor sit amet,
-        //      * consectetur adipiscing elit.
-        //      */
-        //     /*
-        //      *ˇ Lorem ipsum dolor sit amet
-        //      */ /* consectetur adipiscing elit. */
-        // "},
-        // actual:
-        indoc! {"
-            /*
-             //ˇ Lorem ipsum dolor sit amet,
-             // consectetur adipiscing elit.
-             */
-            /*
-             * //ˇ Lorem ipsum dolor sit amet,
-             * consectetur adipiscing elit.
-             */
-            /*
-             *ˇ Lorem ipsum dolor sit amet */ /*
-             * consectetur adipiscing elit.
-             */
-        "},
-        rust_lang,
-        &mut cx,
-    );
-
-    #[track_caller]
-    fn assert_rewrap(
-        unwrapped_text: &str,
-        wrapped_text: &str,
-        language: Arc<Language>,
-        cx: &mut EditorTestContext,
-    ) {
-        cx.update_buffer(|buffer, cx| buffer.set_language(Some(language), cx));
-        cx.set_state(unwrapped_text);
-        cx.update_editor(|e, window, cx| e.rewrap(&Rewrap, window, cx));
-        cx.assert_editor_state(wrapped_text);
-    }
-}
-
-#[gpui::test]
-async fn test_hard_wrap(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    let mut cx = EditorTestContext::new(cx).await;
-
-    cx.update_buffer(|buffer, cx| buffer.set_language(Some(git_commit_lang()), cx));
-    cx.update_editor(|editor, _, cx| {
-        editor.set_hard_wrap(Some(14), cx);
-    });
-
-    cx.set_state(indoc!(
-        "
-        one two three ˇ
-        "
-    ));
-    cx.simulate_input("four");
-    cx.run_until_parked();
-
-    cx.assert_editor_state(indoc!(
-        "
-        one two three
-        fourˇ
-        "
-    ));
-
-    cx.update_editor(|editor, window, cx| {
-        editor.newline(&Default::default(), window, cx);
-    });
-    cx.run_until_parked();
-    cx.assert_editor_state(indoc!(
-        "
-        one two three
-        four
-        ˇ
-        "
-    ));
-
-    cx.simulate_input("five");
-    cx.run_until_parked();
-    cx.assert_editor_state(indoc!(
-        "
-        one two three
-        four
-        fiveˇ
-        "
-    ));
-
-    cx.update_editor(|editor, window, cx| {
-        editor.newline(&Default::default(), window, cx);
-    });
-    cx.run_until_parked();
-    cx.simulate_input("# ");
-    cx.run_until_parked();
-    cx.assert_editor_state(indoc!(
-        "
-        one two three
-        four
-        five
-        # ˇ
-        "
-    ));
-
-    cx.update_editor(|editor, window, cx| {
-        editor.newline(&Default::default(), window, cx);
-    });
-    cx.run_until_parked();
-    cx.assert_editor_state(indoc!(
-        "
-        one two three
-        four
-        five
-        #\x20
-        #ˇ
-        "
-    ));
-
-    cx.simulate_input(" 6");
-    cx.run_until_parked();
-    cx.assert_editor_state(indoc!(
-        "
-        one two three
-        four
-        five
-        #
-        # 6ˇ
-        "
-    ));
-}
-
-#[gpui::test]
-async fn test_cut_line_ends(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    cx.set_state(indoc! {"The quick brownˇ"});
-    cx.update_editor(|e, window, cx| e.cut_to_end_of_line(&CutToEndOfLine::default(), window, cx));
-    cx.assert_editor_state(indoc! {"The quick brownˇ"});
-
-    cx.set_state(indoc! {"The emacs foxˇ"});
-    cx.update_editor(|e, window, cx| e.kill_ring_cut(&KillRingCut, window, cx));
-    cx.assert_editor_state(indoc! {"The emacs foxˇ"});
-
-    cx.set_state(indoc! {"
-        The quick« brownˇ»
-        fox jumps overˇ
-        the lazy dog"});
-    cx.update_editor(|e, window, cx| e.cut(&Cut, window, cx));
-    cx.assert_editor_state(indoc! {"
-        The quickˇ
-        ˇthe lazy dog"});
-
-    cx.set_state(indoc! {"
-        The quick« brownˇ»
-        fox jumps overˇ
-        the lazy dog"});
-    cx.update_editor(|e, window, cx| e.cut_to_end_of_line(&CutToEndOfLine::default(), window, cx));
-    cx.assert_editor_state(indoc! {"
-        The quickˇ
-        fox jumps overˇthe lazy dog"});
-
-    cx.set_state(indoc! {"
-        The quick« brownˇ»
-        fox jumps overˇ
-        the lazy dog"});
-    cx.update_editor(|e, window, cx| {
-        e.cut_to_end_of_line(
-            &CutToEndOfLine {
-                stop_at_newlines: true,
-            },
-            window,
-            cx,
-        )
-    });
-    cx.assert_editor_state(indoc! {"
-        The quickˇ
-        fox jumps overˇ
-        the lazy dog"});
-
-    cx.set_state(indoc! {"
-        The quick« brownˇ»
-        fox jumps overˇ
-        the lazy dog"});
-    cx.update_editor(|e, window, cx| e.kill_ring_cut(&KillRingCut, window, cx));
-    cx.assert_editor_state(indoc! {"
-        The quickˇ
-        fox jumps overˇthe lazy dog"});
-}
-
-#[gpui::test]
-async fn test_clipboard(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    cx.set_state("«one✅ ˇ»two «three ˇ»four «five ˇ»six ");
-    cx.update_editor(|e, window, cx| e.cut(&Cut, window, cx));
-    cx.assert_editor_state("ˇtwo ˇfour ˇsix ");
-
-    // Paste with three cursors. Each cursor pastes one slice of the clipboard text.
-    cx.set_state("two ˇfour ˇsix ˇ");
-    cx.update_editor(|e, window, cx| e.paste(&Paste, window, cx));
-    cx.assert_editor_state("two one✅ ˇfour three ˇsix five ˇ");
-
-    // Paste again but with only two cursors. Since the number of cursors doesn't
-    // match the number of slices in the clipboard, the entire clipboard text
-    // is pasted at each cursor.
-    cx.set_state("ˇtwo one✅ four three six five ˇ");
-    cx.update_editor(|e, window, cx| {
-        e.handle_input("( ", window, cx);
-        e.paste(&Paste, window, cx);
-        e.handle_input(") ", window, cx);
-    });
-    cx.assert_editor_state(
-        &([
-            "( one✅ ",
-            "three ",
-            "five ) ˇtwo one✅ four three six five ( one✅ ",
-            "three ",
-            "five ) ˇ",
-        ]
-        .join("\n")),
-    );
-
-    // Cut with three selections, one of which is full-line.
-    cx.set_state(indoc! {"
-        1«2ˇ»3
-        4ˇ567
-        «8ˇ»9"});
-    cx.update_editor(|e, window, cx| e.cut(&Cut, window, cx));
-    cx.assert_editor_state(indoc! {"
-        1ˇ3
-        ˇ9"});
-
-    // Paste with three selections, noticing how the copied selection that was full-line
-    // gets inserted before the second cursor.
-    cx.set_state(indoc! {"
-        1ˇ3
-        9ˇ
-        «oˇ»ne"});
-    cx.update_editor(|e, window, cx| e.paste(&Paste, window, cx));
-    cx.assert_editor_state(indoc! {"
-        12ˇ3
-        4567
-        9ˇ
-        8ˇne"});
-
-    // Copy with a single cursor only, which writes the whole line into the clipboard.
-    cx.set_state(indoc! {"
-        The quick brown
-        fox juˇmps over
-        the lazy dog"});
-    cx.update_editor(|e, window, cx| e.copy(&Copy, window, cx));
-    assert_eq!(
-        cx.read_from_clipboard()
-            .and_then(|item| item.text().as_deref().map(str::to_string)),
-        Some("fox jumps over\n".to_string())
-    );
-
-    // Paste with three selections, noticing how the copied full-line selection is inserted
-    // before the empty selections but replaces the selection that is non-empty.
-    cx.set_state(indoc! {"
-        Tˇhe quick brown
-        «foˇ»x jumps over
-        tˇhe lazy dog"});
-    cx.update_editor(|e, window, cx| e.paste(&Paste, window, cx));
-    cx.assert_editor_state(indoc! {"
-        fox jumps over
-        Tˇhe quick brown
-        fox jumps over
-        ˇx jumps over
-        fox jumps over
-        tˇhe lazy dog"});
-}
-
-#[gpui::test]
-async fn test_copy_trim(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-    cx.set_state(
-        r#"            «for selection in selections.iter() {
-            let mut start = selection.start;
-            let mut end = selection.end;
-            let is_entire_line = selection.is_empty();
-            if is_entire_line {
-                start = Point::new(start.row, 0);ˇ»
-                end = cmp::min(max_point, Point::new(end.row + 1, 0));
-            }
-        "#,
-    );
-    cx.update_editor(|e, window, cx| e.copy(&Copy, window, cx));
-    assert_eq!(
-        cx.read_from_clipboard()
-            .and_then(|item| item.text().as_deref().map(str::to_string)),
-        Some(
-            "for selection in selections.iter() {
-            let mut start = selection.start;
-            let mut end = selection.end;
-            let is_entire_line = selection.is_empty();
-            if is_entire_line {
-                start = Point::new(start.row, 0);"
-                .to_string()
-        ),
-        "Regular copying preserves all indentation selected",
-    );
-    cx.update_editor(|e, window, cx| e.copy_and_trim(&CopyAndTrim, window, cx));
-    assert_eq!(
-        cx.read_from_clipboard()
-            .and_then(|item| item.text().as_deref().map(str::to_string)),
-        Some(
-            "for selection in selections.iter() {
-let mut start = selection.start;
-let mut end = selection.end;
-let is_entire_line = selection.is_empty();
-if is_entire_line {
-    start = Point::new(start.row, 0);"
-                .to_string()
-        ),
-        "Copying with stripping should strip all leading whitespaces"
-    );
-
-    cx.set_state(
-        r#"       «     for selection in selections.iter() {
-            let mut start = selection.start;
-            let mut end = selection.end;
-            let is_entire_line = selection.is_empty();
-            if is_entire_line {
-                start = Point::new(start.row, 0);ˇ»
-                end = cmp::min(max_point, Point::new(end.row + 1, 0));
-            }
-        "#,
-    );
-    cx.update_editor(|e, window, cx| e.copy(&Copy, window, cx));
-    assert_eq!(
-        cx.read_from_clipboard()
-            .and_then(|item| item.text().as_deref().map(str::to_string)),
-        Some(
-            "     for selection in selections.iter() {
-            let mut start = selection.start;
-            let mut end = selection.end;
-            let is_entire_line = selection.is_empty();
-            if is_entire_line {
-                start = Point::new(start.row, 0);"
-                .to_string()
-        ),
-        "Regular copying preserves all indentation selected",
-    );
-    cx.update_editor(|e, window, cx| e.copy_and_trim(&CopyAndTrim, window, cx));
-    assert_eq!(
-        cx.read_from_clipboard()
-            .and_then(|item| item.text().as_deref().map(str::to_string)),
-        Some(
-            "for selection in selections.iter() {
-let mut start = selection.start;
-let mut end = selection.end;
-let is_entire_line = selection.is_empty();
-if is_entire_line {
-    start = Point::new(start.row, 0);"
-                .to_string()
-        ),
-        "Copying with stripping should strip all leading whitespaces, even if some of it was selected"
-    );
-
-    cx.set_state(
-        r#"       «ˇ     for selection in selections.iter() {
-            let mut start = selection.start;
-            let mut end = selection.end;
-            let is_entire_line = selection.is_empty();
-            if is_entire_line {
-                start = Point::new(start.row, 0);»
-                end = cmp::min(max_point, Point::new(end.row + 1, 0));
-            }
-        "#,
-    );
-    cx.update_editor(|e, window, cx| e.copy(&Copy, window, cx));
-    assert_eq!(
-        cx.read_from_clipboard()
-            .and_then(|item| item.text().as_deref().map(str::to_string)),
-        Some(
-            "     for selection in selections.iter() {
-            let mut start = selection.start;
-            let mut end = selection.end;
-            let is_entire_line = selection.is_empty();
-            if is_entire_line {
-                start = Point::new(start.row, 0);"
-                .to_string()
-        ),
-        "Regular copying for reverse selection works the same",
-    );
-    cx.update_editor(|e, window, cx| e.copy_and_trim(&CopyAndTrim, window, cx));
-    assert_eq!(
-        cx.read_from_clipboard()
-            .and_then(|item| item.text().as_deref().map(str::to_string)),
-        Some(
-            "for selection in selections.iter() {
-let mut start = selection.start;
-let mut end = selection.end;
-let is_entire_line = selection.is_empty();
-if is_entire_line {
-    start = Point::new(start.row, 0);"
-                .to_string()
-        ),
-        "Copying with stripping for reverse selection works the same"
-    );
-
-    cx.set_state(
-        r#"            for selection «in selections.iter() {
-            let mut start = selection.start;
-            let mut end = selection.end;
-            let is_entire_line = selection.is_empty();
-            if is_entire_line {
-                start = Point::new(start.row, 0);ˇ»
-                end = cmp::min(max_point, Point::new(end.row + 1, 0));
-            }
-        "#,
-    );
-    cx.update_editor(|e, window, cx| e.copy(&Copy, window, cx));
-    assert_eq!(
-        cx.read_from_clipboard()
-            .and_then(|item| item.text().as_deref().map(str::to_string)),
-        Some(
-            "in selections.iter() {
-            let mut start = selection.start;
-            let mut end = selection.end;
-            let is_entire_line = selection.is_empty();
-            if is_entire_line {
-                start = Point::new(start.row, 0);"
-                .to_string()
-        ),
-        "When selecting past the indent, the copying works as usual",
-    );
-    cx.update_editor(|e, window, cx| e.copy_and_trim(&CopyAndTrim, window, cx));
-    assert_eq!(
-        cx.read_from_clipboard()
-            .and_then(|item| item.text().as_deref().map(str::to_string)),
-        Some(
-            "in selections.iter() {
-            let mut start = selection.start;
-            let mut end = selection.end;
-            let is_entire_line = selection.is_empty();
-            if is_entire_line {
-                start = Point::new(start.row, 0);"
-                .to_string()
-        ),
-        "When selecting past the indent, nothing is trimmed"
-    );
-
-    cx.set_state(
-        r#"            «for selection in selections.iter() {
-            let mut start = selection.start;
-
-            let mut end = selection.end;
-            let is_entire_line = selection.is_empty();
-            if is_entire_line {
-                start = Point::new(start.row, 0);
-ˇ»                end = cmp::min(max_point, Point::new(end.row + 1, 0));
-            }
-        "#,
-    );
-    cx.update_editor(|e, window, cx| e.copy_and_trim(&CopyAndTrim, window, cx));
-    assert_eq!(
-        cx.read_from_clipboard()
-            .and_then(|item| item.text().as_deref().map(str::to_string)),
-        Some(
-            "for selection in selections.iter() {
-let mut start = selection.start;
-
-let mut end = selection.end;
-let is_entire_line = selection.is_empty();
-if is_entire_line {
-    start = Point::new(start.row, 0);
-"
-            .to_string()
-        ),
-        "Copying with stripping should ignore empty lines"
-    );
-}
-
-#[gpui::test]
-async fn test_paste_multiline(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-    cx.update_buffer(|buffer, cx| buffer.set_language(Some(rust_lang()), cx));
-
-    // Cut an indented block, without the leading whitespace.
-    cx.set_state(indoc! {"
-        const a: B = (
-            c(),
-            «d(
-                e,
-                f
-            )ˇ»
-        );
-    "});
-    cx.update_editor(|e, window, cx| e.cut(&Cut, window, cx));
-    cx.assert_editor_state(indoc! {"
-        const a: B = (
-            c(),
-            ˇ
-        );
-    "});
-
-    // Paste it at the same position.
-    cx.update_editor(|e, window, cx| e.paste(&Paste, window, cx));
-    cx.assert_editor_state(indoc! {"
-        const a: B = (
-            c(),
-            d(
-                e,
-                f
-            )ˇ
-        );
-    "});
-
-    // Paste it at a line with a lower indent level.
-    cx.set_state(indoc! {"
-        ˇ
-        const a: B = (
-            c(),
-        );
-    "});
-    cx.update_editor(|e, window, cx| e.paste(&Paste, window, cx));
-    cx.assert_editor_state(indoc! {"
-        d(
-            e,
-            f
-        )ˇ
-        const a: B = (
-            c(),
-        );
-    "});
-
-    // Cut an indented block, with the leading whitespace.
-    cx.set_state(indoc! {"
-        const a: B = (
-            c(),
-        «    d(
-                e,
-                f
-            )
-        ˇ»);
-    "});
-    cx.update_editor(|e, window, cx| e.cut(&Cut, window, cx));
-    cx.assert_editor_state(indoc! {"
-        const a: B = (
-            c(),
-        ˇ);
-    "});
-
-    // Paste it at the same position.
-    cx.update_editor(|e, window, cx| e.paste(&Paste, window, cx));
-    cx.assert_editor_state(indoc! {"
-        const a: B = (
-            c(),
-            d(
-                e,
-                f
-            )
-        ˇ);
-    "});
-
-    // Paste it at a line with a higher indent level.
-    cx.set_state(indoc! {"
-        const a: B = (
-            c(),
-            d(
-                e,
-                fˇ
-            )
-        );
-    "});
-    cx.update_editor(|e, window, cx| e.paste(&Paste, window, cx));
-    cx.assert_editor_state(indoc! {"
-        const a: B = (
-            c(),
-            d(
-                e,
-                f    d(
-                    e,
-                    f
-                )
-        ˇ
-            )
-        );
-    "});
-
-    // Copy an indented block, starting mid-line
-    cx.set_state(indoc! {"
-        const a: B = (
-            c(),
-            somethin«g(
-                e,
-                f
-            )ˇ»
-        );
-    "});
-    cx.update_editor(|e, window, cx| e.copy(&Copy, window, cx));
-
-    // Paste it on a line with a lower indent level
-    cx.update_editor(|e, window, cx| e.move_to_end(&Default::default(), window, cx));
-    cx.update_editor(|e, window, cx| e.paste(&Paste, window, cx));
-    cx.assert_editor_state(indoc! {"
-        const a: B = (
-            c(),
-            something(
-                e,
-                f
-            )
-        );
-        g(
-            e,
-            f
-        )ˇ"});
-}
-
-#[gpui::test]
-async fn test_paste_content_from_other_app(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    cx.write_to_clipboard(ClipboardItem::new_string(
-        "    d(\n        e\n    );\n".into(),
-    ));
-
-    let mut cx = EditorTestContext::new(cx).await;
-    cx.update_buffer(|buffer, cx| buffer.set_language(Some(rust_lang()), cx));
-
-    cx.set_state(indoc! {"
-        fn a() {
-            b();
-            if c() {
-                ˇ
-            }
-        }
-    "});
-
-    cx.update_editor(|e, window, cx| e.paste(&Paste, window, cx));
-    cx.assert_editor_state(indoc! {"
-        fn a() {
-            b();
-            if c() {
-                d(
-                    e
-                );
-        ˇ
-            }
-        }
-    "});
-
-    cx.set_state(indoc! {"
-        fn a() {
-            b();
-            ˇ
-        }
-    "});
-
-    cx.update_editor(|e, window, cx| e.paste(&Paste, window, cx));
-    cx.assert_editor_state(indoc! {"
-        fn a() {
-            b();
-            d(
-                e
-            );
-        ˇ
-        }
-    "});
-}
-
-#[gpui::test]
-fn test_select_all(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let editor = cx.add_window(|window, cx| {
-        let buffer = MultiBuffer::build_simple("abc\nde\nfgh", cx);
-        build_editor(buffer, window, cx)
-    });
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.select_all(&SelectAll, window, cx);
-        assert_eq!(
-            display_ranges(editor, cx),
-            &[DisplayPoint::new(DisplayRow(0), 0)..DisplayPoint::new(DisplayRow(2), 3)]
-        );
-    });
-}
-
-#[gpui::test]
-fn test_select_line(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let editor = cx.add_window(|window, cx| {
-        let buffer = MultiBuffer::build_simple(&sample_text(6, 5, 'a'), cx);
-        build_editor(buffer, window, cx)
-    });
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_display_ranges([
-                DisplayPoint::new(DisplayRow(0), 0)..DisplayPoint::new(DisplayRow(0), 1),
-                DisplayPoint::new(DisplayRow(0), 2)..DisplayPoint::new(DisplayRow(0), 2),
-                DisplayPoint::new(DisplayRow(1), 0)..DisplayPoint::new(DisplayRow(1), 0),
-                DisplayPoint::new(DisplayRow(4), 2)..DisplayPoint::new(DisplayRow(4), 2),
-            ])
-        });
-        editor.select_line(&SelectLine, window, cx);
-        assert_eq!(
-            display_ranges(editor, cx),
-            vec![
-                DisplayPoint::new(DisplayRow(0), 0)..DisplayPoint::new(DisplayRow(2), 0),
-                DisplayPoint::new(DisplayRow(4), 0)..DisplayPoint::new(DisplayRow(5), 0),
-            ]
-        );
-    });
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.select_line(&SelectLine, window, cx);
-        assert_eq!(
-            display_ranges(editor, cx),
-            vec![
-                DisplayPoint::new(DisplayRow(0), 0)..DisplayPoint::new(DisplayRow(3), 0),
-                DisplayPoint::new(DisplayRow(4), 0)..DisplayPoint::new(DisplayRow(5), 5),
-            ]
-        );
-    });
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.select_line(&SelectLine, window, cx);
-        assert_eq!(
-            display_ranges(editor, cx),
-            vec![DisplayPoint::new(DisplayRow(0), 0)..DisplayPoint::new(DisplayRow(5), 5)]
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_split_selection_into_lines(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    let mut cx = EditorTestContext::new(cx).await;
-
-    #[track_caller]
-    fn test(cx: &mut EditorTestContext, initial_state: &'static str, expected_state: &'static str) {
-        cx.set_state(initial_state);
-        cx.update_editor(|e, window, cx| {
-            e.split_selection_into_lines(&Default::default(), window, cx)
-        });
-        cx.assert_editor_state(expected_state);
-    }
-
-    // Selection starts and ends at the middle of lines, left-to-right
-    test(
-        &mut cx,
-        "aa\nb«ˇb\ncc\ndd\ne»e\nff",
-        "aa\nbbˇ\nccˇ\nddˇ\neˇe\nff",
-    );
-    // Same thing, right-to-left
-    test(
-        &mut cx,
-        "aa\nb«b\ncc\ndd\neˇ»e\nff",
-        "aa\nbbˇ\nccˇ\nddˇ\neˇe\nff",
-    );
-
-    // Whole buffer, left-to-right, last line *doesn't* end with newline
-    test(
-        &mut cx,
-        "«ˇaa\nbb\ncc\ndd\nee\nff»",
-        "aaˇ\nbbˇ\nccˇ\nddˇ\neeˇ\nffˇ",
-    );
-    // Same thing, right-to-left
-    test(
-        &mut cx,
-        "«aa\nbb\ncc\ndd\nee\nffˇ»",
-        "aaˇ\nbbˇ\nccˇ\nddˇ\neeˇ\nffˇ",
-    );
-
-    // Whole buffer, left-to-right, last line ends with newline
-    test(
-        &mut cx,
-        "«ˇaa\nbb\ncc\ndd\nee\nff\n»",
-        "aaˇ\nbbˇ\nccˇ\nddˇ\neeˇ\nffˇ\n",
-    );
-    // Same thing, right-to-left
-    test(
-        &mut cx,
-        "«aa\nbb\ncc\ndd\nee\nff\nˇ»",
-        "aaˇ\nbbˇ\nccˇ\nddˇ\neeˇ\nffˇ\n",
-    );
-
-    // Starts at the end of a line, ends at the start of another
-    test(
-        &mut cx,
-        "aa\nbb«ˇ\ncc\ndd\nee\n»ff\n",
-        "aa\nbbˇ\nccˇ\nddˇ\neeˇ\nff\n",
-    );
-}
-
-#[gpui::test]
-async fn test_split_selection_into_lines_interacting_with_creases(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let editor = cx.add_window(|window, cx| {
-        let buffer = MultiBuffer::build_simple(&sample_text(9, 5, 'a'), cx);
-        build_editor(buffer, window, cx)
-    });
-
-    // setup
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.fold_creases(
-            vec![
-                Crease::simple(Point::new(0, 2)..Point::new(1, 2), FoldPlaceholder::test()),
-                Crease::simple(Point::new(2, 3)..Point::new(4, 1), FoldPlaceholder::test()),
-                Crease::simple(Point::new(7, 0)..Point::new(8, 4), FoldPlaceholder::test()),
-            ],
-            true,
-            window,
-            cx,
-        );
-        assert_eq!(
-            editor.display_text(cx),
-            "aa⋯bbb\nccc⋯eeee\nfffff\nggggg\n⋯i"
-        );
-    });
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_display_ranges([
-                DisplayPoint::new(DisplayRow(0), 0)..DisplayPoint::new(DisplayRow(0), 1),
-                DisplayPoint::new(DisplayRow(0), 2)..DisplayPoint::new(DisplayRow(0), 2),
-                DisplayPoint::new(DisplayRow(1), 0)..DisplayPoint::new(DisplayRow(1), 0),
-                DisplayPoint::new(DisplayRow(4), 4)..DisplayPoint::new(DisplayRow(4), 4),
-            ])
-        });
-        editor.split_selection_into_lines(&Default::default(), window, cx);
-        assert_eq!(
-            editor.display_text(cx),
-            "aaaaa\nbbbbb\nccc⋯eeee\nfffff\nggggg\n⋯i"
-        );
-    });
-    EditorTestContext::for_editor(editor, cx)
-        .await
-        .assert_editor_state("aˇaˇaaa\nbbbbb\nˇccccc\nddddd\neeeee\nfffff\nggggg\nhhhhh\niiiiiˇ");
-
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_display_ranges([
-                DisplayPoint::new(DisplayRow(5), 0)..DisplayPoint::new(DisplayRow(0), 1)
-            ])
-        });
-        editor.split_selection_into_lines(&Default::default(), window, cx);
-        assert_eq!(
-            editor.display_text(cx),
-            "aaaaa\nbbbbb\nccccc\nddddd\neeeee\nfffff\nggggg\nhhhhh\niiiii"
-        );
-        assert_eq!(
-            display_ranges(editor, cx),
-            [
-                DisplayPoint::new(DisplayRow(0), 5)..DisplayPoint::new(DisplayRow(0), 5),
-                DisplayPoint::new(DisplayRow(1), 5)..DisplayPoint::new(DisplayRow(1), 5),
-                DisplayPoint::new(DisplayRow(2), 5)..DisplayPoint::new(DisplayRow(2), 5),
-                DisplayPoint::new(DisplayRow(3), 5)..DisplayPoint::new(DisplayRow(3), 5),
-                DisplayPoint::new(DisplayRow(4), 5)..DisplayPoint::new(DisplayRow(4), 5),
-                DisplayPoint::new(DisplayRow(5), 5)..DisplayPoint::new(DisplayRow(5), 5),
-                DisplayPoint::new(DisplayRow(6), 5)..DisplayPoint::new(DisplayRow(6), 5)
-            ]
-        );
-    });
-    EditorTestContext::for_editor(editor, cx)
-        .await
-        .assert_editor_state(
-            "aaaaaˇ\nbbbbbˇ\ncccccˇ\ndddddˇ\neeeeeˇ\nfffffˇ\ngggggˇ\nhhhhh\niiiii",
-        );
-}
-
-#[gpui::test]
-async fn test_add_selection_above_below(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    cx.set_state(indoc!(
-        r#"abc
-           defˇghi
-
-           jk
-           nlmo
-           "#
-    ));
-
-    cx.update_editor(|editor, window, cx| {
-        editor.add_selection_above(&Default::default(), window, cx);
-    });
-
-    cx.assert_editor_state(indoc!(
-        r#"abcˇ
-           defˇghi
-
-           jk
-           nlmo
-           "#
-    ));
-
-    cx.update_editor(|editor, window, cx| {
-        editor.add_selection_above(&Default::default(), window, cx);
-    });
-
-    cx.assert_editor_state(indoc!(
-        r#"abcˇ
-            defˇghi
-
-            jk
-            nlmo
-            "#
-    ));
-
-    cx.update_editor(|editor, window, cx| {
-        editor.add_selection_below(&Default::default(), window, cx);
-    });
-
-    cx.assert_editor_state(indoc!(
-        r#"abc
-           defˇghi
-
-           jk
-           nlmo
-           "#
-    ));
-
-    cx.update_editor(|editor, window, cx| {
-        editor.undo_selection(&Default::default(), window, cx);
-    });
-
-    cx.assert_editor_state(indoc!(
-        r#"abcˇ
-           defˇghi
-
-           jk
-           nlmo
-           "#
-    ));
-
-    cx.update_editor(|editor, window, cx| {
-        editor.redo_selection(&Default::default(), window, cx);
-    });
-
-    cx.assert_editor_state(indoc!(
-        r#"abc
-           defˇghi
-
-           jk
-           nlmo
-           "#
-    ));
-
-    cx.update_editor(|editor, window, cx| {
-        editor.add_selection_below(&Default::default(), window, cx);
-    });
-
-    cx.assert_editor_state(indoc!(
-        r#"abc
-           defˇghi
-           ˇ
-           jk
-           nlmo
-           "#
-    ));
-
-    cx.update_editor(|editor, window, cx| {
-        editor.add_selection_below(&Default::default(), window, cx);
-    });
-
-    cx.assert_editor_state(indoc!(
-        r#"abc
-           defˇghi
-           ˇ
-           jkˇ
-           nlmo
-           "#
-    ));
-
-    cx.update_editor(|editor, window, cx| {
-        editor.add_selection_below(&Default::default(), window, cx);
-    });
-
-    cx.assert_editor_state(indoc!(
-        r#"abc
-           defˇghi
-           ˇ
-           jkˇ
-           nlmˇo
-           "#
-    ));
-
-    cx.update_editor(|editor, window, cx| {
-        editor.add_selection_below(&Default::default(), window, cx);
-    });
-
-    cx.assert_editor_state(indoc!(
-        r#"abc
-           defˇghi
-           ˇ
-           jkˇ
-           nlmˇo
-           ˇ"#
-    ));
-
-    // change selections
-    cx.set_state(indoc!(
-        r#"abc
-           def«ˇg»hi
-
-           jk
-           nlmo
-           "#
-    ));
-
-    cx.update_editor(|editor, window, cx| {
-        editor.add_selection_below(&Default::default(), window, cx);
-    });
-
-    cx.assert_editor_state(indoc!(
-        r#"abc
-           def«ˇg»hi
-
-           jk
-           nlm«ˇo»
-           "#
-    ));
-
-    cx.update_editor(|editor, window, cx| {
-        editor.add_selection_below(&Default::default(), window, cx);
-    });
-
-    cx.assert_editor_state(indoc!(
-        r#"abc
-           def«ˇg»hi
-
-           jk
-           nlm«ˇo»
-           "#
-    ));
-
-    cx.update_editor(|editor, window, cx| {
-        editor.add_selection_above(&Default::default(), window, cx);
-    });
-
-    cx.assert_editor_state(indoc!(
-        r#"abc
-           def«ˇg»hi
-
-           jk
-           nlmo
-           "#
-    ));
-
-    cx.update_editor(|editor, window, cx| {
-        editor.add_selection_above(&Default::default(), window, cx);
-    });
-
-    cx.assert_editor_state(indoc!(
-        r#"abc
-           def«ˇg»hi
-
-           jk
-           nlmo
-           "#
-    ));
-
-    // Change selections again
-    cx.set_state(indoc!(
-        r#"a«bc
-           defgˇ»hi
-
-           jk
-           nlmo
-           "#
-    ));
-
-    cx.update_editor(|editor, window, cx| {
-        editor.add_selection_below(&Default::default(), window, cx);
-    });
-
-    cx.assert_editor_state(indoc!(
-        r#"a«bcˇ»
-           d«efgˇ»hi
-
-           j«kˇ»
-           nlmo
-           "#
-    ));
-
-    cx.update_editor(|editor, window, cx| {
-        editor.add_selection_below(&Default::default(), window, cx);
-    });
-    cx.assert_editor_state(indoc!(
-        r#"a«bcˇ»
-           d«efgˇ»hi
-
-           j«kˇ»
-           n«lmoˇ»
-           "#
-    ));
-    cx.update_editor(|editor, window, cx| {
-        editor.add_selection_above(&Default::default(), window, cx);
-    });
-
-    cx.assert_editor_state(indoc!(
-        r#"a«bcˇ»
-           d«efgˇ»hi
-
-           j«kˇ»
-           nlmo
-           "#
-    ));
-
-    // Change selections again
-    cx.set_state(indoc!(
-        r#"abc
-           d«ˇefghi
-
-           jk
-           nlm»o
-           "#
-    ));
-
-    cx.update_editor(|editor, window, cx| {
-        editor.add_selection_above(&Default::default(), window, cx);
-    });
-
-    cx.assert_editor_state(indoc!(
-        r#"a«ˇbc»
-           d«ˇef»ghi
-
-           j«ˇk»
-           n«ˇlm»o
-           "#
-    ));
-
-    cx.update_editor(|editor, window, cx| {
-        editor.add_selection_below(&Default::default(), window, cx);
-    });
-
-    cx.assert_editor_state(indoc!(
-        r#"abc
-           d«ˇef»ghi
-
-           j«ˇk»
-           n«ˇlm»o
-           "#
-    ));
-}
-
-#[gpui::test]
-async fn test_add_selection_above_below_multi_cursor(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    let mut cx = EditorTestContext::new(cx).await;
-
-    cx.set_state(indoc!(
-        r#"line onˇe
-           liˇne two
-           line three
-           line four"#
-    ));
-
-    cx.update_editor(|editor, window, cx| {
-        editor.add_selection_below(&Default::default(), window, cx);
-    });
-
-    // test multiple cursors expand in the same direction
-    cx.assert_editor_state(indoc!(
-        r#"line onˇe
-           liˇne twˇo
-           liˇne three
-           line four"#
-    ));
-
-    cx.update_editor(|editor, window, cx| {
-        editor.add_selection_below(&Default::default(), window, cx);
-    });
-
-    cx.update_editor(|editor, window, cx| {
-        editor.add_selection_below(&Default::default(), window, cx);
-    });
-
-    // test multiple cursors expand below overflow
-    cx.assert_editor_state(indoc!(
-        r#"line onˇe
-           liˇne twˇo
-           liˇne thˇree
-           liˇne foˇur"#
-    ));
-
-    cx.update_editor(|editor, window, cx| {
-        editor.add_selection_above(&Default::default(), window, cx);
-    });
-
-    // test multiple cursors retrieves back correctly
-    cx.assert_editor_state(indoc!(
-        r#"line onˇe
-           liˇne twˇo
-           liˇne thˇree
-           line four"#
-    ));
-
-    cx.update_editor(|editor, window, cx| {
-        editor.add_selection_above(&Default::default(), window, cx);
-    });
-
-    cx.update_editor(|editor, window, cx| {
-        editor.add_selection_above(&Default::default(), window, cx);
-    });
-
-    // test multiple cursor groups maintain independent direction - first expands up, second shrinks above
-    cx.assert_editor_state(indoc!(
-        r#"liˇne onˇe
-           liˇne two
-           line three
-           line four"#
-    ));
-
-    cx.update_editor(|editor, window, cx| {
-        editor.undo_selection(&Default::default(), window, cx);
-    });
-
-    // test undo
-    cx.assert_editor_state(indoc!(
-        r#"line onˇe
-           liˇne twˇo
-           line three
-           line four"#
-    ));
-
-    cx.update_editor(|editor, window, cx| {
-        editor.redo_selection(&Default::default(), window, cx);
-    });
-
-    // test redo
-    cx.assert_editor_state(indoc!(
-        r#"liˇne onˇe
-           liˇne two
-           line three
-           line four"#
-    ));
-
-    cx.set_state(indoc!(
-        r#"abcd
-           ef«ghˇ»
-           ijkl
-           «mˇ»nop"#
-    ));
-
-    cx.update_editor(|editor, window, cx| {
-        editor.add_selection_above(&Default::default(), window, cx);
-    });
-
-    // test multiple selections expand in the same direction
-    cx.assert_editor_state(indoc!(
-        r#"ab«cdˇ»
-           ef«ghˇ»
-           «iˇ»jkl
-           «mˇ»nop"#
-    ));
-
-    cx.update_editor(|editor, window, cx| {
-        editor.add_selection_above(&Default::default(), window, cx);
-    });
-
-    // test multiple selection upward overflow
-    cx.assert_editor_state(indoc!(
-        r#"ab«cdˇ»
-           «eˇ»f«ghˇ»
-           «iˇ»jkl
-           «mˇ»nop"#
-    ));
-
-    cx.update_editor(|editor, window, cx| {
-        editor.add_selection_below(&Default::default(), window, cx);
-    });
-
-    // test multiple selection retrieves back correctly
-    cx.assert_editor_state(indoc!(
-        r#"abcd
-           ef«ghˇ»
-           «iˇ»jkl
-           «mˇ»nop"#
-    ));
-
-    cx.update_editor(|editor, window, cx| {
-        editor.add_selection_below(&Default::default(), window, cx);
-    });
-
-    // test multiple cursor groups maintain independent direction - first shrinks down, second expands below
-    cx.assert_editor_state(indoc!(
-        r#"abcd
-           ef«ghˇ»
-           ij«klˇ»
-           «mˇ»nop"#
-    ));
-
-    cx.update_editor(|editor, window, cx| {
-        editor.undo_selection(&Default::default(), window, cx);
-    });
-
-    // test undo
-    cx.assert_editor_state(indoc!(
-        r#"abcd
-           ef«ghˇ»
-           «iˇ»jkl
-           «mˇ»nop"#
-    ));
-
-    cx.update_editor(|editor, window, cx| {
-        editor.redo_selection(&Default::default(), window, cx);
-    });
-
-    // test redo
-    cx.assert_editor_state(indoc!(
-        r#"abcd
-           ef«ghˇ»
-           ij«klˇ»
-           «mˇ»nop"#
-    ));
-}
-
-#[gpui::test]
-async fn test_add_selection_above_below_multi_cursor_existing_state(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    let mut cx = EditorTestContext::new(cx).await;
-
-    cx.set_state(indoc!(
-        r#"line onˇe
-           liˇne two
-           line three
-           line four"#
-    ));
-
-    cx.update_editor(|editor, window, cx| {
-        editor.add_selection_below(&Default::default(), window, cx);
-        editor.add_selection_below(&Default::default(), window, cx);
-        editor.add_selection_below(&Default::default(), window, cx);
-    });
-
-    // initial state with two multi cursor groups
-    cx.assert_editor_state(indoc!(
-        r#"line onˇe
-           liˇne twˇo
-           liˇne thˇree
-           liˇne foˇur"#
-    ));
-
-    // add single cursor in middle - simulate opt click
-    cx.update_editor(|editor, window, cx| {
-        let new_cursor_point = DisplayPoint::new(DisplayRow(2), 4);
-        editor.begin_selection(new_cursor_point, true, 1, window, cx);
-        editor.end_selection(window, cx);
-    });
-
-    cx.assert_editor_state(indoc!(
-        r#"line onˇe
-           liˇne twˇo
-           liˇneˇ thˇree
-           liˇne foˇur"#
-    ));
-
-    cx.update_editor(|editor, window, cx| {
-        editor.add_selection_above(&Default::default(), window, cx);
-    });
-
-    // test new added selection expands above and existing selection shrinks
-    cx.assert_editor_state(indoc!(
-        r#"line onˇe
-           liˇneˇ twˇo
-           liˇneˇ thˇree
-           line four"#
-    ));
-
-    cx.update_editor(|editor, window, cx| {
-        editor.add_selection_above(&Default::default(), window, cx);
-    });
-
-    // test new added selection expands above and existing selection shrinks
-    cx.assert_editor_state(indoc!(
-        r#"lineˇ onˇe
-           liˇneˇ twˇo
-           lineˇ three
-           line four"#
-    ));
-
-    // intial state with two selection groups
-    cx.set_state(indoc!(
-        r#"abcd
-           ef«ghˇ»
-           ijkl
-           «mˇ»nop"#
-    ));
-
-    cx.update_editor(|editor, window, cx| {
-        editor.add_selection_above(&Default::default(), window, cx);
-        editor.add_selection_above(&Default::default(), window, cx);
-    });
-
-    cx.assert_editor_state(indoc!(
-        r#"ab«cdˇ»
-           «eˇ»f«ghˇ»
-           «iˇ»jkl
-           «mˇ»nop"#
-    ));
-
-    // add single selection in middle - simulate opt drag
-    cx.update_editor(|editor, window, cx| {
-        let new_cursor_point = DisplayPoint::new(DisplayRow(2), 3);
-        editor.begin_selection(new_cursor_point, true, 1, window, cx);
-        editor.update_selection(
-            DisplayPoint::new(DisplayRow(2), 4),
-            0,
-            gpui::Point::<f32>::default(),
-            window,
-            cx,
-        );
-        editor.end_selection(window, cx);
-    });
-
-    cx.assert_editor_state(indoc!(
-        r#"ab«cdˇ»
-           «eˇ»f«ghˇ»
-           «iˇ»jk«lˇ»
-           «mˇ»nop"#
-    ));
-
-    cx.update_editor(|editor, window, cx| {
-        editor.add_selection_below(&Default::default(), window, cx);
-    });
-
-    // test new added selection expands below, others shrinks from above
-    cx.assert_editor_state(indoc!(
-        r#"abcd
-           ef«ghˇ»
-           «iˇ»jk«lˇ»
-           «mˇ»no«pˇ»"#
-    ));
-}
-
-#[gpui::test]
-async fn test_select_next(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    let mut cx = EditorTestContext::new(cx).await;
-
-    // Enable case sensitive search.
-    update_test_editor_settings(&mut cx, |settings| {
-        let mut search_settings = SearchSettingsContent::default();
-        search_settings.case_sensitive = Some(true);
-        settings.search = Some(search_settings);
-    });
-
-    cx.set_state("abc\nˇabc abc\ndefabc\nabc");
-
-    cx.update_editor(|e, window, cx| e.select_next(&SelectNext::default(), window, cx))
-        .unwrap();
-    cx.assert_editor_state("abc\n«abcˇ» abc\ndefabc\nabc");
-
-    cx.update_editor(|e, window, cx| e.select_next(&SelectNext::default(), window, cx))
-        .unwrap();
-    cx.assert_editor_state("abc\n«abcˇ» «abcˇ»\ndefabc\nabc");
-
-    cx.update_editor(|editor, window, cx| editor.undo_selection(&UndoSelection, window, cx));
-    cx.assert_editor_state("abc\n«abcˇ» abc\ndefabc\nabc");
-
-    cx.update_editor(|editor, window, cx| editor.redo_selection(&RedoSelection, window, cx));
-    cx.assert_editor_state("abc\n«abcˇ» «abcˇ»\ndefabc\nabc");
-
-    cx.update_editor(|e, window, cx| e.select_next(&SelectNext::default(), window, cx))
-        .unwrap();
-    cx.assert_editor_state("abc\n«abcˇ» «abcˇ»\ndefabc\n«abcˇ»");
-
-    cx.update_editor(|e, window, cx| e.select_next(&SelectNext::default(), window, cx))
-        .unwrap();
-    cx.assert_editor_state("«abcˇ»\n«abcˇ» «abcˇ»\ndefabc\n«abcˇ»");
-
-    // Test selection direction should be preserved
-    cx.set_state("abc\n«ˇabc» abc\ndefabc\nabc");
-
-    cx.update_editor(|e, window, cx| e.select_next(&SelectNext::default(), window, cx))
-        .unwrap();
-    cx.assert_editor_state("abc\n«ˇabc» «ˇabc»\ndefabc\nabc");
-
-    // Test case sensitivity
-    cx.set_state("«ˇfoo»\nFOO\nFoo\nfoo");
-    cx.update_editor(|e, window, cx| {
-        e.select_next(&SelectNext::default(), window, cx).unwrap();
-    });
-    cx.assert_editor_state("«ˇfoo»\nFOO\nFoo\n«ˇfoo»");
-
-    // Disable case sensitive search.
-    update_test_editor_settings(&mut cx, |settings| {
-        let mut search_settings = SearchSettingsContent::default();
-        search_settings.case_sensitive = Some(false);
-        settings.search = Some(search_settings);
-    });
-
-    cx.set_state("«ˇfoo»\nFOO\nFoo");
-    cx.update_editor(|e, window, cx| {
-        e.select_next(&SelectNext::default(), window, cx).unwrap();
-        e.select_next(&SelectNext::default(), window, cx).unwrap();
-    });
-    cx.assert_editor_state("«ˇfoo»\n«ˇFOO»\n«ˇFoo»");
-}
-
-#[gpui::test]
-async fn test_select_all_matches(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    let mut cx = EditorTestContext::new(cx).await;
-
-    // Enable case sensitive search.
-    update_test_editor_settings(&mut cx, |settings| {
-        let mut search_settings = SearchSettingsContent::default();
-        search_settings.case_sensitive = Some(true);
-        settings.search = Some(search_settings);
-    });
-
-    // Test caret-only selections
-    cx.set_state("abc\nˇabc abc\ndefabc\nabc");
-    cx.update_editor(|e, window, cx| e.select_all_matches(&SelectAllMatches, window, cx))
-        .unwrap();
-    cx.assert_editor_state("«abcˇ»\n«abcˇ» «abcˇ»\ndefabc\n«abcˇ»");
-
-    // Test left-to-right selections
-    cx.set_state("abc\n«abcˇ»\nabc");
-    cx.update_editor(|e, window, cx| e.select_all_matches(&SelectAllMatches, window, cx))
-        .unwrap();
-    cx.assert_editor_state("«abcˇ»\n«abcˇ»\n«abcˇ»");
-
-    // Test right-to-left selections
-    cx.set_state("abc\n«ˇabc»\nabc");
-    cx.update_editor(|e, window, cx| e.select_all_matches(&SelectAllMatches, window, cx))
-        .unwrap();
-    cx.assert_editor_state("«ˇabc»\n«ˇabc»\n«ˇabc»");
-
-    // Test selecting whitespace with caret selection
-    cx.set_state("abc\nˇ   abc\nabc");
-    cx.update_editor(|e, window, cx| e.select_all_matches(&SelectAllMatches, window, cx))
-        .unwrap();
-    cx.assert_editor_state("abc\n«   ˇ»abc\nabc");
-
-    // Test selecting whitespace with left-to-right selection
-    cx.set_state("abc\n«ˇ  »abc\nabc");
-    cx.update_editor(|e, window, cx| e.select_all_matches(&SelectAllMatches, window, cx))
-        .unwrap();
-    cx.assert_editor_state("abc\n«ˇ  »abc\nabc");
-
-    // Test no matches with right-to-left selection
-    cx.set_state("abc\n«  ˇ»abc\nabc");
-    cx.update_editor(|e, window, cx| e.select_all_matches(&SelectAllMatches, window, cx))
-        .unwrap();
-    cx.assert_editor_state("abc\n«  ˇ»abc\nabc");
-
-    // Test with a single word and clip_at_line_ends=true (#29823)
-    cx.set_state("aˇbc");
-    cx.update_editor(|e, window, cx| {
-        e.set_clip_at_line_ends(true, cx);
-        e.select_all_matches(&SelectAllMatches, window, cx).unwrap();
-        e.set_clip_at_line_ends(false, cx);
-    });
-    cx.assert_editor_state("«abcˇ»");
-
-    // Test case sensitivity
-    cx.set_state("fˇoo\nFOO\nFoo");
-    cx.update_editor(|e, window, cx| {
-        e.select_all_matches(&SelectAllMatches, window, cx).unwrap();
-    });
-    cx.assert_editor_state("«fooˇ»\nFOO\nFoo");
-
-    // Disable case sensitive search.
-    update_test_editor_settings(&mut cx, |settings| {
-        let mut search_settings = SearchSettingsContent::default();
-        search_settings.case_sensitive = Some(false);
-        settings.search = Some(search_settings);
-    });
-
-    cx.set_state("fˇoo\nFOO\nFoo");
-    cx.update_editor(|e, window, cx| {
-        e.select_all_matches(&SelectAllMatches, window, cx).unwrap();
-    });
-    cx.assert_editor_state("«fooˇ»\n«FOOˇ»\n«Fooˇ»");
-}
-
-#[gpui::test]
-async fn test_select_all_matches_does_not_scroll(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    let large_body_1 = "\nd".repeat(200);
-    let large_body_2 = "\ne".repeat(200);
-
-    cx.set_state(&format!(
-        "abc\nabc{large_body_1} «ˇa»bc{large_body_2}\nefabc\nabc"
-    ));
-    let initial_scroll_position = cx.update_editor(|editor, _, cx| {
-        let scroll_position = editor.scroll_position(cx);
-        assert!(scroll_position.y > 0.0, "Initial selection is between two large bodies and should have the editor scrolled to it");
-        scroll_position
-    });
-
-    cx.update_editor(|e, window, cx| e.select_all_matches(&SelectAllMatches, window, cx))
-        .unwrap();
-    cx.assert_editor_state(&format!(
-        "«ˇa»bc\n«ˇa»bc{large_body_1} «ˇa»bc{large_body_2}\nef«ˇa»bc\n«ˇa»bc"
-    ));
-    let scroll_position_after_selection =
-        cx.update_editor(|editor, _, cx| editor.scroll_position(cx));
-    assert_eq!(
-        initial_scroll_position, scroll_position_after_selection,
-        "Scroll position should not change after selecting all matches"
-    );
-}
-
-#[gpui::test]
-async fn test_undo_format_scrolls_to_last_edit_pos(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorLspTestContext::new_rust(
-        lsp::ServerCapabilities {
-            document_formatting_provider: Some(lsp::OneOf::Left(true)),
-            ..Default::default()
-        },
-        cx,
-    )
-    .await;
-
-    cx.set_state(indoc! {"
-        line 1
-        line 2
-        linˇe 3
-        line 4
-        line 5
-    "});
-
-    // Make an edit
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("X", window, cx);
-    });
-
-    // Move cursor to a different position
-    cx.update_editor(|editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([Point::new(4, 2)..Point::new(4, 2)]);
-        });
-    });
-
-    cx.assert_editor_state(indoc! {"
-        line 1
-        line 2
-        linXe 3
-        line 4
-        liˇne 5
-    "});
-
-    cx.lsp
-        .set_request_handler::<lsp::request::Formatting, _, _>(move |_, _| async move {
-            Ok(Some(vec![lsp::TextEdit::new(
-                lsp::Range::new(lsp::Position::new(0, 0), lsp::Position::new(0, 0)),
-                "PREFIX ".to_string(),
-            )]))
-        });
-
-    cx.update_editor(|editor, window, cx| editor.format(&Default::default(), window, cx))
-        .unwrap()
-        .await
-        .unwrap();
-
-    cx.assert_editor_state(indoc! {"
-        PREFIX line 1
-        line 2
-        linXe 3
-        line 4
-        liˇne 5
-    "});
-
-    // Undo formatting
-    cx.update_editor(|editor, window, cx| {
-        editor.undo(&Default::default(), window, cx);
-    });
-
-    // Verify cursor moved back to position after edit
-    cx.assert_editor_state(indoc! {"
-        line 1
-        line 2
-        linXˇe 3
-        line 4
-        line 5
-    "});
-}
-
-#[gpui::test]
-async fn test_undo_edit_prediction_scrolls_to_edit_pos(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    let provider = cx.new(|_| FakeEditPredictionDelegate::default());
-    cx.update_editor(|editor, window, cx| {
-        editor.set_edit_prediction_provider(Some(provider.clone()), window, cx);
-    });
-
-    cx.set_state(indoc! {"
-        line 1
-        line 2
-        linˇe 3
-        line 4
-        line 5
-        line 6
-        line 7
-        line 8
-        line 9
-        line 10
-    "});
-
-    let snapshot = cx.buffer_snapshot();
-    let edit_position = snapshot.anchor_after(Point::new(2, 4));
-
-    cx.update(|_, cx| {
-        provider.update(cx, |provider, _| {
-            provider.set_edit_prediction(Some(edit_prediction_types::EditPrediction::Local {
-                id: None,
-                edits: vec![(edit_position..edit_position, "X".into())],
-                edit_preview: None,
-            }))
-        })
-    });
-
-    cx.update_editor(|editor, window, cx| editor.update_visible_edit_prediction(window, cx));
-    cx.update_editor(|editor, window, cx| {
-        editor.accept_edit_prediction(&crate::AcceptEditPrediction, window, cx)
-    });
-
-    cx.assert_editor_state(indoc! {"
-        line 1
-        line 2
-        lineXˇ 3
-        line 4
-        line 5
-        line 6
-        line 7
-        line 8
-        line 9
-        line 10
-    "});
-
-    cx.update_editor(|editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([Point::new(9, 2)..Point::new(9, 2)]);
-        });
-    });
-
-    cx.assert_editor_state(indoc! {"
-        line 1
-        line 2
-        lineX 3
-        line 4
-        line 5
-        line 6
-        line 7
-        line 8
-        line 9
-        liˇne 10
-    "});
-
-    cx.update_editor(|editor, window, cx| {
-        editor.undo(&Default::default(), window, cx);
-    });
-
-    cx.assert_editor_state(indoc! {"
-        line 1
-        line 2
-        lineˇ 3
-        line 4
-        line 5
-        line 6
-        line 7
-        line 8
-        line 9
-        line 10
-    "});
-}
-
-#[gpui::test]
-async fn test_select_next_with_multiple_carets(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-    cx.set_state(
-        r#"let foo = 2;
-lˇet foo = 2;
-let fooˇ = 2;
-let foo = 2;
-let foo = ˇ2;"#,
-    );
-
-    cx.update_editor(|e, window, cx| e.select_next(&SelectNext::default(), window, cx))
-        .unwrap();
-    cx.assert_editor_state(
-        r#"let foo = 2;
-«letˇ» foo = 2;
-let «fooˇ» = 2;
-let foo = 2;
-let foo = «2ˇ»;"#,
-    );
-
-    // noop for multiple selections with different contents
-    cx.update_editor(|e, window, cx| e.select_next(&SelectNext::default(), window, cx))
-        .unwrap();
-    cx.assert_editor_state(
-        r#"let foo = 2;
-«letˇ» foo = 2;
-let «fooˇ» = 2;
-let foo = 2;
-let foo = «2ˇ»;"#,
-    );
-
-    // Test last selection direction should be preserved
-    cx.set_state(
-        r#"let foo = 2;
-let foo = 2;
-let «fooˇ» = 2;
-let «ˇfoo» = 2;
-let foo = 2;"#,
-    );
-
-    cx.update_editor(|e, window, cx| e.select_next(&SelectNext::default(), window, cx))
-        .unwrap();
-    cx.assert_editor_state(
-        r#"let foo = 2;
-let foo = 2;
-let «fooˇ» = 2;
-let «ˇfoo» = 2;
-let «ˇfoo» = 2;"#,
-    );
-}
-
-#[gpui::test]
-async fn test_select_previous_multibuffer(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx =
-        EditorTestContext::new_multibuffer(cx, ["aaa\n«bbb\nccc\n»ddd", "aaa\n«bbb\nccc\n»ddd"]);
-
-    cx.assert_editor_state(indoc! {"
-        ˇbbb
-        ccc
-
-        bbb
-        ccc
-        "});
-    cx.dispatch_action(SelectPrevious::default());
-    cx.assert_editor_state(indoc! {"
-                «bbbˇ»
-                ccc
-
-                bbb
-                ccc
-                "});
-    cx.dispatch_action(SelectPrevious::default());
-    cx.assert_editor_state(indoc! {"
-                «bbbˇ»
-                ccc
-
-                «bbbˇ»
-                ccc
-                "});
-}
-
-#[gpui::test]
-async fn test_select_previous_with_single_caret(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-    cx.set_state("abc\nˇabc abc\ndefabc\nabc");
-
-    cx.update_editor(|e, window, cx| e.select_previous(&SelectPrevious::default(), window, cx))
-        .unwrap();
-    cx.assert_editor_state("abc\n«abcˇ» abc\ndefabc\nabc");
-
-    cx.update_editor(|e, window, cx| e.select_previous(&SelectPrevious::default(), window, cx))
-        .unwrap();
-    cx.assert_editor_state("«abcˇ»\n«abcˇ» abc\ndefabc\nabc");
-
-    cx.update_editor(|editor, window, cx| editor.undo_selection(&UndoSelection, window, cx));
-    cx.assert_editor_state("abc\n«abcˇ» abc\ndefabc\nabc");
-
-    cx.update_editor(|editor, window, cx| editor.redo_selection(&RedoSelection, window, cx));
-    cx.assert_editor_state("«abcˇ»\n«abcˇ» abc\ndefabc\nabc");
-
-    cx.update_editor(|e, window, cx| e.select_previous(&SelectPrevious::default(), window, cx))
-        .unwrap();
-    cx.assert_editor_state("«abcˇ»\n«abcˇ» abc\ndefabc\n«abcˇ»");
-
-    cx.update_editor(|e, window, cx| e.select_previous(&SelectPrevious::default(), window, cx))
-        .unwrap();
-    cx.assert_editor_state("«abcˇ»\n«abcˇ» «abcˇ»\ndefabc\n«abcˇ»");
-}
-
-#[gpui::test]
-async fn test_select_previous_empty_buffer(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-    cx.set_state("aˇ");
-
-    cx.update_editor(|e, window, cx| e.select_previous(&SelectPrevious::default(), window, cx))
-        .unwrap();
-    cx.assert_editor_state("«aˇ»");
-    cx.update_editor(|e, window, cx| e.select_previous(&SelectPrevious::default(), window, cx))
-        .unwrap();
-    cx.assert_editor_state("«aˇ»");
-}
-
-#[gpui::test]
-async fn test_select_previous_with_multiple_carets(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-    cx.set_state(
-        r#"let foo = 2;
-lˇet foo = 2;
-let fooˇ = 2;
-let foo = 2;
-let foo = ˇ2;"#,
-    );
-
-    cx.update_editor(|e, window, cx| e.select_previous(&SelectPrevious::default(), window, cx))
-        .unwrap();
-    cx.assert_editor_state(
-        r#"let foo = 2;
-«letˇ» foo = 2;
-let «fooˇ» = 2;
-let foo = 2;
-let foo = «2ˇ»;"#,
-    );
-
-    // noop for multiple selections with different contents
-    cx.update_editor(|e, window, cx| e.select_previous(&SelectPrevious::default(), window, cx))
-        .unwrap();
-    cx.assert_editor_state(
-        r#"let foo = 2;
-«letˇ» foo = 2;
-let «fooˇ» = 2;
-let foo = 2;
-let foo = «2ˇ»;"#,
-    );
-}
-
-#[gpui::test]
-async fn test_select_previous_with_single_selection(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    let mut cx = EditorTestContext::new(cx).await;
-
-    // Enable case sensitive search.
-    update_test_editor_settings(&mut cx, |settings| {
-        let mut search_settings = SearchSettingsContent::default();
-        search_settings.case_sensitive = Some(true);
-        settings.search = Some(search_settings);
-    });
-
-    cx.set_state("abc\n«ˇabc» abc\ndefabc\nabc");
-
-    cx.update_editor(|e, window, cx| e.select_previous(&SelectPrevious::default(), window, cx))
-        .unwrap();
-    // selection direction is preserved
-    cx.assert_editor_state("«ˇabc»\n«ˇabc» abc\ndefabc\nabc");
-
-    cx.update_editor(|e, window, cx| e.select_previous(&SelectPrevious::default(), window, cx))
-        .unwrap();
-    cx.assert_editor_state("«ˇabc»\n«ˇabc» abc\ndefabc\n«ˇabc»");
-
-    cx.update_editor(|editor, window, cx| editor.undo_selection(&UndoSelection, window, cx));
-    cx.assert_editor_state("«ˇabc»\n«ˇabc» abc\ndefabc\nabc");
-
-    cx.update_editor(|editor, window, cx| editor.redo_selection(&RedoSelection, window, cx));
-    cx.assert_editor_state("«ˇabc»\n«ˇabc» abc\ndefabc\n«ˇabc»");
-
-    cx.update_editor(|e, window, cx| e.select_previous(&SelectPrevious::default(), window, cx))
-        .unwrap();
-    cx.assert_editor_state("«ˇabc»\n«ˇabc» abc\ndef«ˇabc»\n«ˇabc»");
-
-    cx.update_editor(|e, window, cx| e.select_previous(&SelectPrevious::default(), window, cx))
-        .unwrap();
-    cx.assert_editor_state("«ˇabc»\n«ˇabc» «ˇabc»\ndef«ˇabc»\n«ˇabc»");
-
-    // Test case sensitivity
-    cx.set_state("foo\nFOO\nFoo\n«ˇfoo»");
-    cx.update_editor(|e, window, cx| {
-        e.select_previous(&SelectPrevious::default(), window, cx)
-            .unwrap();
-        e.select_previous(&SelectPrevious::default(), window, cx)
-            .unwrap();
-    });
-    cx.assert_editor_state("«ˇfoo»\nFOO\nFoo\n«ˇfoo»");
-
-    // Disable case sensitive search.
-    update_test_editor_settings(&mut cx, |settings| {
-        let mut search_settings = SearchSettingsContent::default();
-        search_settings.case_sensitive = Some(false);
-        settings.search = Some(search_settings);
-    });
-
-    cx.set_state("foo\nFOO\n«ˇFoo»");
-    cx.update_editor(|e, window, cx| {
-        e.select_previous(&SelectPrevious::default(), window, cx)
-            .unwrap();
-        e.select_previous(&SelectPrevious::default(), window, cx)
-            .unwrap();
-    });
-    cx.assert_editor_state("«ˇfoo»\n«ˇFOO»\n«ˇFoo»");
-}
-
-#[gpui::test]
-async fn test_select_larger_smaller_syntax_node(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let language = Arc::new(Language::new(
-        LanguageConfig::default(),
-        Some(tree_sitter_rust::LANGUAGE.into()),
-    ));
-
-    let text = r#"
-        use mod1::mod2::{mod3, mod4};
-
-        fn fn_1(param1: bool, param2: &str) {
-            let var1 = "text";
-        }
-    "#
-    .unindent();
-
-    let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(language, cx));
-    let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-    let (editor, cx) = cx.add_window_view(|window, cx| build_editor(buffer, window, cx));
-
-    editor
-        .condition::<crate::EditorEvent>(cx, |editor, cx| !editor.buffer.read(cx).is_parsing(cx))
-        .await;
-
-    editor.update_in(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_display_ranges([
-                DisplayPoint::new(DisplayRow(0), 25)..DisplayPoint::new(DisplayRow(0), 25),
-                DisplayPoint::new(DisplayRow(2), 24)..DisplayPoint::new(DisplayRow(2), 12),
-                DisplayPoint::new(DisplayRow(3), 18)..DisplayPoint::new(DisplayRow(3), 18),
-            ]);
-        });
-        editor.select_larger_syntax_node(&SelectLargerSyntaxNode, window, cx);
-    });
-    editor.update(cx, |editor, cx| {
-        assert_text_with_selections(
-            editor,
-            indoc! {r#"
-                use mod1::mod2::{mod3, «mod4ˇ»};
-
-                fn fn_1«ˇ(param1: bool, param2: &str)» {
-                    let var1 = "«ˇtext»";
-                }
-            "#},
-            cx,
-        );
-    });
-
-    editor.update_in(cx, |editor, window, cx| {
-        editor.select_larger_syntax_node(&SelectLargerSyntaxNode, window, cx);
-    });
-    editor.update(cx, |editor, cx| {
-        assert_text_with_selections(
-            editor,
-            indoc! {r#"
-                use mod1::mod2::«{mod3, mod4}ˇ»;
-
-                «ˇfn fn_1(param1: bool, param2: &str) {
-                    let var1 = "text";
-                }»
-            "#},
-            cx,
-        );
-    });
-
-    editor.update_in(cx, |editor, window, cx| {
-        editor.select_larger_syntax_node(&SelectLargerSyntaxNode, window, cx);
-    });
-    assert_eq!(
-        editor.update(cx, |editor, cx| editor
-            .selections
-            .display_ranges(&editor.display_snapshot(cx))),
-        &[DisplayPoint::new(DisplayRow(5), 0)..DisplayPoint::new(DisplayRow(0), 0)]
-    );
-
-    // Trying to expand the selected syntax node one more time has no effect.
-    editor.update_in(cx, |editor, window, cx| {
-        editor.select_larger_syntax_node(&SelectLargerSyntaxNode, window, cx);
-    });
-    assert_eq!(
-        editor.update(cx, |editor, cx| editor
-            .selections
-            .display_ranges(&editor.display_snapshot(cx))),
-        &[DisplayPoint::new(DisplayRow(5), 0)..DisplayPoint::new(DisplayRow(0), 0)]
-    );
-
-    editor.update_in(cx, |editor, window, cx| {
-        editor.select_smaller_syntax_node(&SelectSmallerSyntaxNode, window, cx);
-    });
-    editor.update(cx, |editor, cx| {
-        assert_text_with_selections(
-            editor,
-            indoc! {r#"
-                use mod1::mod2::«{mod3, mod4}ˇ»;
-
-                «ˇfn fn_1(param1: bool, param2: &str) {
-                    let var1 = "text";
-                }»
-            "#},
-            cx,
-        );
-    });
-
-    editor.update_in(cx, |editor, window, cx| {
-        editor.select_smaller_syntax_node(&SelectSmallerSyntaxNode, window, cx);
-    });
-    editor.update(cx, |editor, cx| {
-        assert_text_with_selections(
-            editor,
-            indoc! {r#"
-                use mod1::mod2::{mod3, «mod4ˇ»};
-
-                fn fn_1«ˇ(param1: bool, param2: &str)» {
-                    let var1 = "«ˇtext»";
-                }
-            "#},
-            cx,
-        );
-    });
-
-    editor.update_in(cx, |editor, window, cx| {
-        editor.select_smaller_syntax_node(&SelectSmallerSyntaxNode, window, cx);
-    });
-    editor.update(cx, |editor, cx| {
-        assert_text_with_selections(
-            editor,
-            indoc! {r#"
-                use mod1::mod2::{mod3, moˇd4};
-
-                fn fn_1(para«ˇm1: bool, pa»ram2: &str) {
-                    let var1 = "teˇxt";
-                }
-            "#},
-            cx,
-        );
-    });
-
-    // Trying to shrink the selected syntax node one more time has no effect.
-    editor.update_in(cx, |editor, window, cx| {
-        editor.select_smaller_syntax_node(&SelectSmallerSyntaxNode, window, cx);
-    });
-    editor.update_in(cx, |editor, _, cx| {
-        assert_text_with_selections(
-            editor,
-            indoc! {r#"
-                use mod1::mod2::{mod3, moˇd4};
-
-                fn fn_1(para«ˇm1: bool, pa»ram2: &str) {
-                    let var1 = "teˇxt";
-                }
-            "#},
-            cx,
-        );
-    });
-
-    // Ensure that we keep expanding the selection if the larger selection starts or ends within
-    // a fold.
-    editor.update_in(cx, |editor, window, cx| {
-        editor.fold_creases(
-            vec![
-                Crease::simple(
-                    Point::new(0, 21)..Point::new(0, 24),
-                    FoldPlaceholder::test(),
-                ),
-                Crease::simple(
-                    Point::new(3, 20)..Point::new(3, 22),
-                    FoldPlaceholder::test(),
-                ),
-            ],
-            true,
-            window,
-            cx,
-        );
-        editor.select_larger_syntax_node(&SelectLargerSyntaxNode, window, cx);
-    });
-    editor.update(cx, |editor, cx| {
-        assert_text_with_selections(
-            editor,
-            indoc! {r#"
-                use mod1::mod2::«{mod3, mod4}ˇ»;
-
-                fn fn_1«ˇ(param1: bool, param2: &str)» {
-                    let var1 = "«ˇtext»";
-                }
-            "#},
-            cx,
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_select_larger_syntax_node_for_cursor_at_end(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let language = Arc::new(Language::new(
-        LanguageConfig::default(),
-        Some(tree_sitter_rust::LANGUAGE.into()),
-    ));
-
-    let text = "let a = 2;";
-
-    let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(language, cx));
-    let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-    let (editor, cx) = cx.add_window_view(|window, cx| build_editor(buffer, window, cx));
-
-    editor
-        .condition::<crate::EditorEvent>(cx, |editor, cx| !editor.buffer.read(cx).is_parsing(cx))
-        .await;
-
-    // Test case 1: Cursor at end of word
-    editor.update_in(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_display_ranges([
-                DisplayPoint::new(DisplayRow(0), 5)..DisplayPoint::new(DisplayRow(0), 5)
-            ]);
-        });
-    });
-    editor.update(cx, |editor, cx| {
-        assert_text_with_selections(editor, "let aˇ = 2;", cx);
-    });
-    editor.update_in(cx, |editor, window, cx| {
-        editor.select_larger_syntax_node(&SelectLargerSyntaxNode, window, cx);
-    });
-    editor.update(cx, |editor, cx| {
-        assert_text_with_selections(editor, "let «ˇa» = 2;", cx);
-    });
-    editor.update_in(cx, |editor, window, cx| {
-        editor.select_larger_syntax_node(&SelectLargerSyntaxNode, window, cx);
-    });
-    editor.update(cx, |editor, cx| {
-        assert_text_with_selections(editor, "«ˇlet a = 2;»", cx);
-    });
-
-    // Test case 2: Cursor at end of statement
-    editor.update_in(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_display_ranges([
-                DisplayPoint::new(DisplayRow(0), 11)..DisplayPoint::new(DisplayRow(0), 11)
-            ]);
-        });
-    });
-    editor.update(cx, |editor, cx| {
-        assert_text_with_selections(editor, "let a = 2;ˇ", cx);
-    });
-    editor.update_in(cx, |editor, window, cx| {
-        editor.select_larger_syntax_node(&SelectLargerSyntaxNode, window, cx);
-    });
-    editor.update(cx, |editor, cx| {
-        assert_text_with_selections(editor, "«ˇlet a = 2;»", cx);
-    });
-}
-
-#[gpui::test]
-async fn test_select_larger_syntax_node_for_cursor_at_symbol(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let language = Arc::new(Language::new(
-        LanguageConfig {
-            name: "JavaScript".into(),
-            ..Default::default()
-        },
-        Some(tree_sitter_typescript::LANGUAGE_TSX.into()),
-    ));
-
-    let text = r#"
-        let a = {
-            key: "value",
-        };
-    "#
-    .unindent();
-
-    let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(language, cx));
-    let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-    let (editor, cx) = cx.add_window_view(|window, cx| build_editor(buffer, window, cx));
-
-    editor
-        .condition::<crate::EditorEvent>(cx, |editor, cx| !editor.buffer.read(cx).is_parsing(cx))
-        .await;
-
-    // Test case 1: Cursor after '{'
-    editor.update_in(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_display_ranges([
-                DisplayPoint::new(DisplayRow(0), 9)..DisplayPoint::new(DisplayRow(0), 9)
-            ]);
-        });
-    });
-    editor.update(cx, |editor, cx| {
-        assert_text_with_selections(
-            editor,
-            indoc! {r#"
-                let a = {ˇ
-                    key: "value",
-                };
-            "#},
-            cx,
-        );
-    });
-    editor.update_in(cx, |editor, window, cx| {
-        editor.select_larger_syntax_node(&SelectLargerSyntaxNode, window, cx);
-    });
-    editor.update(cx, |editor, cx| {
-        assert_text_with_selections(
-            editor,
-            indoc! {r#"
-                let a = «ˇ{
-                    key: "value",
-                }»;
-            "#},
-            cx,
-        );
-    });
-
-    // Test case 2: Cursor after ':'
-    editor.update_in(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_display_ranges([
-                DisplayPoint::new(DisplayRow(1), 8)..DisplayPoint::new(DisplayRow(1), 8)
-            ]);
-        });
-    });
-    editor.update(cx, |editor, cx| {
-        assert_text_with_selections(
-            editor,
-            indoc! {r#"
-                let a = {
-                    key:ˇ "value",
-                };
-            "#},
-            cx,
-        );
-    });
-    editor.update_in(cx, |editor, window, cx| {
-        editor.select_larger_syntax_node(&SelectLargerSyntaxNode, window, cx);
-    });
-    editor.update(cx, |editor, cx| {
-        assert_text_with_selections(
-            editor,
-            indoc! {r#"
-                let a = {
-                    «ˇkey: "value"»,
-                };
-            "#},
-            cx,
-        );
-    });
-    editor.update_in(cx, |editor, window, cx| {
-        editor.select_larger_syntax_node(&SelectLargerSyntaxNode, window, cx);
-    });
-    editor.update(cx, |editor, cx| {
-        assert_text_with_selections(
-            editor,
-            indoc! {r#"
-                let a = «ˇ{
-                    key: "value",
-                }»;
-            "#},
-            cx,
-        );
-    });
-
-    // Test case 3: Cursor after ','
-    editor.update_in(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_display_ranges([
-                DisplayPoint::new(DisplayRow(1), 17)..DisplayPoint::new(DisplayRow(1), 17)
-            ]);
-        });
-    });
-    editor.update(cx, |editor, cx| {
-        assert_text_with_selections(
-            editor,
-            indoc! {r#"
-                let a = {
-                    key: "value",ˇ
-                };
-            "#},
-            cx,
-        );
-    });
-    editor.update_in(cx, |editor, window, cx| {
-        editor.select_larger_syntax_node(&SelectLargerSyntaxNode, window, cx);
-    });
-    editor.update(cx, |editor, cx| {
-        assert_text_with_selections(
-            editor,
-            indoc! {r#"
-                let a = «ˇ{
-                    key: "value",
-                }»;
-            "#},
-            cx,
-        );
-    });
-
-    // Test case 4: Cursor after ';'
-    editor.update_in(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_display_ranges([
-                DisplayPoint::new(DisplayRow(2), 2)..DisplayPoint::new(DisplayRow(2), 2)
-            ]);
-        });
-    });
-    editor.update(cx, |editor, cx| {
-        assert_text_with_selections(
-            editor,
-            indoc! {r#"
-                let a = {
-                    key: "value",
-                };ˇ
-            "#},
-            cx,
-        );
-    });
-    editor.update_in(cx, |editor, window, cx| {
-        editor.select_larger_syntax_node(&SelectLargerSyntaxNode, window, cx);
-    });
-    editor.update(cx, |editor, cx| {
-        assert_text_with_selections(
-            editor,
-            indoc! {r#"
-                «ˇlet a = {
-                    key: "value",
-                };
-                »"#},
-            cx,
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_select_larger_smaller_syntax_node_for_string(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let language = Arc::new(Language::new(
-        LanguageConfig::default(),
-        Some(tree_sitter_rust::LANGUAGE.into()),
-    ));
-
-    let text = r#"
-        use mod1::mod2::{mod3, mod4};
-
-        fn fn_1(param1: bool, param2: &str) {
-            let var1 = "hello world";
-        }
-    "#
-    .unindent();
-
-    let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(language, cx));
-    let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-    let (editor, cx) = cx.add_window_view(|window, cx| build_editor(buffer, window, cx));
-
-    editor
-        .condition::<crate::EditorEvent>(cx, |editor, cx| !editor.buffer.read(cx).is_parsing(cx))
-        .await;
-
-    // Test 1: Cursor on a letter of a string word
-    editor.update_in(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_display_ranges([
-                DisplayPoint::new(DisplayRow(3), 17)..DisplayPoint::new(DisplayRow(3), 17)
-            ]);
-        });
-    });
-    editor.update_in(cx, |editor, window, cx| {
-        assert_text_with_selections(
-            editor,
-            indoc! {r#"
-                use mod1::mod2::{mod3, mod4};
-
-                fn fn_1(param1: bool, param2: &str) {
-                    let var1 = "hˇello world";
-                }
-            "#},
-            cx,
-        );
-        editor.select_larger_syntax_node(&SelectLargerSyntaxNode, window, cx);
-        assert_text_with_selections(
-            editor,
-            indoc! {r#"
-                use mod1::mod2::{mod3, mod4};
-
-                fn fn_1(param1: bool, param2: &str) {
-                    let var1 = "«ˇhello» world";
-                }
-            "#},
-            cx,
-        );
-    });
-
-    // Test 2: Partial selection within a word
-    editor.update_in(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_display_ranges([
-                DisplayPoint::new(DisplayRow(3), 17)..DisplayPoint::new(DisplayRow(3), 19)
-            ]);
-        });
-    });
-    editor.update_in(cx, |editor, window, cx| {
-        assert_text_with_selections(
-            editor,
-            indoc! {r#"
-                use mod1::mod2::{mod3, mod4};
-
-                fn fn_1(param1: bool, param2: &str) {
-                    let var1 = "h«elˇ»lo world";
-                }
-            "#},
-            cx,
-        );
-        editor.select_larger_syntax_node(&SelectLargerSyntaxNode, window, cx);
-        assert_text_with_selections(
-            editor,
-            indoc! {r#"
-                use mod1::mod2::{mod3, mod4};
-
-                fn fn_1(param1: bool, param2: &str) {
-                    let var1 = "«ˇhello» world";
-                }
-            "#},
-            cx,
-        );
-    });
-
-    // Test 3: Complete word already selected
-    editor.update_in(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_display_ranges([
-                DisplayPoint::new(DisplayRow(3), 16)..DisplayPoint::new(DisplayRow(3), 21)
-            ]);
-        });
-    });
-    editor.update_in(cx, |editor, window, cx| {
-        assert_text_with_selections(
-            editor,
-            indoc! {r#"
-                use mod1::mod2::{mod3, mod4};
-
-                fn fn_1(param1: bool, param2: &str) {
-                    let var1 = "«helloˇ» world";
-                }
-            "#},
-            cx,
-        );
-        editor.select_larger_syntax_node(&SelectLargerSyntaxNode, window, cx);
-        assert_text_with_selections(
-            editor,
-            indoc! {r#"
-                use mod1::mod2::{mod3, mod4};
-
-                fn fn_1(param1: bool, param2: &str) {
-                    let var1 = "«hello worldˇ»";
-                }
-            "#},
-            cx,
-        );
-    });
-
-    // Test 4: Selection spanning across words
-    editor.update_in(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_display_ranges([
-                DisplayPoint::new(DisplayRow(3), 19)..DisplayPoint::new(DisplayRow(3), 24)
-            ]);
-        });
-    });
-    editor.update_in(cx, |editor, window, cx| {
-        assert_text_with_selections(
-            editor,
-            indoc! {r#"
-                use mod1::mod2::{mod3, mod4};
-
-                fn fn_1(param1: bool, param2: &str) {
-                    let var1 = "hel«lo woˇ»rld";
-                }
-            "#},
-            cx,
-        );
-        editor.select_larger_syntax_node(&SelectLargerSyntaxNode, window, cx);
-        assert_text_with_selections(
-            editor,
-            indoc! {r#"
-                use mod1::mod2::{mod3, mod4};
-
-                fn fn_1(param1: bool, param2: &str) {
-                    let var1 = "«ˇhello world»";
-                }
-            "#},
-            cx,
-        );
-    });
-
-    // Test 5: Expansion beyond string
-    editor.update_in(cx, |editor, window, cx| {
-        editor.select_larger_syntax_node(&SelectLargerSyntaxNode, window, cx);
-        editor.select_larger_syntax_node(&SelectLargerSyntaxNode, window, cx);
-        assert_text_with_selections(
-            editor,
-            indoc! {r#"
-                use mod1::mod2::{mod3, mod4};
-
-                fn fn_1(param1: bool, param2: &str) {
-                    «ˇlet var1 = "hello world";»
-                }
-            "#},
-            cx,
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_unwrap_syntax_nodes(cx: &mut gpui::TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    let language = Arc::new(Language::new(
-        LanguageConfig::default(),
-        Some(tree_sitter_rust::LANGUAGE.into()),
-    ));
-
-    cx.update_buffer(|buffer, cx| {
-        buffer.set_language(Some(language), cx);
-    });
-
-    cx.set_state(indoc! { r#"use mod1::{mod2::{«mod3ˇ», mod4}, mod5::{mod6, «mod7ˇ»}};"# });
-    cx.update_editor(|editor, window, cx| {
-        editor.unwrap_syntax_node(&UnwrapSyntaxNode, window, cx);
-    });
-
-    cx.assert_editor_state(indoc! { r#"use mod1::{mod2::«mod3ˇ», mod5::«mod7ˇ»};"# });
-
-    cx.set_state(indoc! { r#"fn a() {
-          // what
-          // a
-          // ˇlong
-          // method
-          // I
-          // sure
-          // hope
-          // it
-          // works
-    }"# });
-
-    let buffer = cx.update_multibuffer(|multibuffer, _| multibuffer.as_singleton().unwrap());
-    let multi_buffer = cx.new(|_| MultiBuffer::new(Capability::ReadWrite));
-    cx.update(|_, cx| {
-        multi_buffer.update(cx, |multi_buffer, cx| {
-            multi_buffer.set_excerpts_for_path(
-                PathKey::for_buffer(&buffer, cx),
-                buffer,
-                [Point::new(1, 0)..Point::new(1, 0)],
-                3,
-                cx,
-            );
-        });
-    });
-
-    let editor2 = cx.new_window_entity(|window, cx| {
-        Editor::new(EditorMode::full(), multi_buffer, None, window, cx)
-    });
-
-    let mut cx = EditorTestContext::for_editor_in(editor2, &mut cx).await;
-    cx.update_editor(|editor, window, cx| {
-        editor.change_selections(SelectionEffects::default(), window, cx, |s| {
-            s.select_ranges([Point::new(3, 0)..Point::new(3, 0)]);
-        })
-    });
-
-    cx.assert_editor_state(indoc! { "
-        fn a() {
-              // what
-              // a
-        ˇ      // long
-              // method"});
-
-    cx.update_editor(|editor, window, cx| {
-        editor.unwrap_syntax_node(&UnwrapSyntaxNode, window, cx);
-    });
-
-    // Although we could potentially make the action work when the syntax node
-    // is half-hidden, it seems a bit dangerous as you can't easily tell what it
-    // did. Maybe we could also expand the excerpt to contain the range?
-    cx.assert_editor_state(indoc! { "
-        fn a() {
-              // what
-              // a
-        ˇ      // long
-              // method"});
-}
-
-#[gpui::test]
-async fn test_fold_function_bodies(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let base_text = r#"
-        impl A {
-            // this is an uncommitted comment
-
-            fn b() {
-                c();
-            }
-
-            // this is another uncommitted comment
-
-            fn d() {
-                // e
-                // f
-            }
-        }
-
-        fn g() {
-            // h
-        }
-    "#
-    .unindent();
-
-    let text = r#"
-        ˇimpl A {
-
-            fn b() {
-                c();
-            }
-
-            fn d() {
-                // e
-                // f
-            }
-        }
-
-        fn g() {
-            // h
-        }
-    "#
-    .unindent();
-
-    let mut cx = EditorLspTestContext::new_rust(Default::default(), cx).await;
-    cx.set_state(&text);
-    cx.set_head_text(&base_text);
-    cx.update_editor(|editor, window, cx| {
-        editor.expand_all_diff_hunks(&Default::default(), window, cx);
-    });
-
-    cx.assert_state_with_diff(
-        "
-        ˇimpl A {
-      -     // this is an uncommitted comment
-
-            fn b() {
-                c();
-            }
-
-      -     // this is another uncommitted comment
-      -
-            fn d() {
-                // e
-                // f
-            }
-        }
-
-        fn g() {
-            // h
-        }
-    "
-        .unindent(),
-    );
-
-    let expected_display_text = "
-        impl A {
-            // this is an uncommitted comment
-
-            fn b() {
-                ⋯
-            }
-
-            // this is another uncommitted comment
-
-            fn d() {
-                ⋯
-            }
-        }
-
-        fn g() {
-            ⋯
-        }
-        "
-    .unindent();
-
-    cx.update_editor(|editor, window, cx| {
-        editor.fold_function_bodies(&FoldFunctionBodies, window, cx);
-        assert_eq!(editor.display_text(cx), expected_display_text);
-    });
-}
-
-#[gpui::test]
-async fn test_autoindent(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let language = Arc::new(
-        Language::new(
-            LanguageConfig {
-                brackets: BracketPairConfig {
-                    pairs: vec![
-                        BracketPair {
-                            start: "{".to_string(),
-                            end: "}".to_string(),
-                            close: false,
-                            surround: false,
-                            newline: true,
-                        },
-                        BracketPair {
-                            start: "(".to_string(),
-                            end: ")".to_string(),
-                            close: false,
-                            surround: false,
-                            newline: true,
-                        },
-                    ],
-                    ..Default::default()
-                },
-                ..Default::default()
-            },
-            Some(tree_sitter_rust::LANGUAGE.into()),
-        )
-        .with_indents_query(
-            r#"
-                (_ "(" ")" @end) @indent
-                (_ "{" "}" @end) @indent
-            "#,
-        )
-        .unwrap(),
-    );
-
-    let text = "fn a() {}";
-
-    let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(language, cx));
-    let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-    let (editor, cx) = cx.add_window_view(|window, cx| build_editor(buffer, window, cx));
-    editor
-        .condition::<crate::EditorEvent>(cx, |editor, cx| !editor.buffer.read(cx).is_parsing(cx))
-        .await;
-
-    editor.update_in(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([
-                MultiBufferOffset(5)..MultiBufferOffset(5),
-                MultiBufferOffset(8)..MultiBufferOffset(8),
-                MultiBufferOffset(9)..MultiBufferOffset(9),
-            ])
-        });
-        editor.newline(&Newline, window, cx);
-        assert_eq!(editor.text(cx), "fn a(\n    \n) {\n    \n}\n");
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            &[
-                Point::new(1, 4)..Point::new(1, 4),
-                Point::new(3, 4)..Point::new(3, 4),
-                Point::new(5, 0)..Point::new(5, 0)
-            ]
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_autoindent_disabled(cx: &mut TestAppContext) {
-    init_test(cx, |settings| settings.defaults.auto_indent = Some(false));
-
-    let language = Arc::new(
-        Language::new(
-            LanguageConfig {
-                brackets: BracketPairConfig {
-                    pairs: vec![
-                        BracketPair {
-                            start: "{".to_string(),
-                            end: "}".to_string(),
-                            close: false,
-                            surround: false,
-                            newline: true,
-                        },
-                        BracketPair {
-                            start: "(".to_string(),
-                            end: ")".to_string(),
-                            close: false,
-                            surround: false,
-                            newline: true,
-                        },
-                    ],
-                    ..Default::default()
-                },
-                ..Default::default()
-            },
-            Some(tree_sitter_rust::LANGUAGE.into()),
-        )
-        .with_indents_query(
-            r#"
-                (_ "(" ")" @end) @indent
-                (_ "{" "}" @end) @indent
-            "#,
-        )
-        .unwrap(),
-    );
-
-    let text = "fn a() {}";
-
-    let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(language, cx));
-    let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-    let (editor, cx) = cx.add_window_view(|window, cx| build_editor(buffer, window, cx));
-    editor
-        .condition::<crate::EditorEvent>(cx, |editor, cx| !editor.buffer.read(cx).is_parsing(cx))
-        .await;
-
-    editor.update_in(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([
-                MultiBufferOffset(5)..MultiBufferOffset(5),
-                MultiBufferOffset(8)..MultiBufferOffset(8),
-                MultiBufferOffset(9)..MultiBufferOffset(9),
-            ])
-        });
-        editor.newline(&Newline, window, cx);
-        assert_eq!(
-            editor.text(cx),
-            indoc!(
-                "
-                fn a(
-
-                ) {
-
-                }
-                "
-            )
-        );
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            &[
-                Point::new(1, 0)..Point::new(1, 0),
-                Point::new(3, 0)..Point::new(3, 0),
-                Point::new(5, 0)..Point::new(5, 0)
-            ]
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_autoindent_disabled_with_nested_language(cx: &mut TestAppContext) {
-    init_test(cx, |settings| {
-        settings.defaults.auto_indent = Some(true);
-        settings.languages.0.insert(
-            "python".into(),
-            LanguageSettingsContent {
-                auto_indent: Some(false),
-                ..Default::default()
-            },
-        );
-    });
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    let injected_language = Arc::new(
-        Language::new(
-            LanguageConfig {
-                brackets: BracketPairConfig {
-                    pairs: vec![
-                        BracketPair {
-                            start: "{".to_string(),
-                            end: "}".to_string(),
-                            close: false,
-                            surround: false,
-                            newline: true,
-                        },
-                        BracketPair {
-                            start: "(".to_string(),
-                            end: ")".to_string(),
-                            close: true,
-                            surround: false,
-                            newline: true,
-                        },
-                    ],
-                    ..Default::default()
-                },
-                name: "python".into(),
-                ..Default::default()
-            },
-            Some(tree_sitter_python::LANGUAGE.into()),
-        )
-        .with_indents_query(
-            r#"
-                (_ "(" ")" @end) @indent
-                (_ "{" "}" @end) @indent
-            "#,
-        )
-        .unwrap(),
-    );
-
-    let language = Arc::new(
-        Language::new(
-            LanguageConfig {
-                brackets: BracketPairConfig {
-                    pairs: vec![
-                        BracketPair {
-                            start: "{".to_string(),
-                            end: "}".to_string(),
-                            close: false,
-                            surround: false,
-                            newline: true,
-                        },
-                        BracketPair {
-                            start: "(".to_string(),
-                            end: ")".to_string(),
-                            close: true,
-                            surround: false,
-                            newline: true,
-                        },
-                    ],
-                    ..Default::default()
-                },
-                name: LanguageName::new_static("rust"),
-                ..Default::default()
-            },
-            Some(tree_sitter_rust::LANGUAGE.into()),
-        )
-        .with_indents_query(
-            r#"
-                (_ "(" ")" @end) @indent
-                (_ "{" "}" @end) @indent
-            "#,
-        )
-        .unwrap()
-        .with_injection_query(
-            r#"
-            (macro_invocation
-                macro: (identifier) @_macro_name
-                (token_tree) @injection.content
-                (#set! injection.language "python"))
-           "#,
-        )
-        .unwrap(),
-    );
-
-    cx.language_registry().add(injected_language);
-    cx.language_registry().add(language.clone());
-
-    cx.update_buffer(|buffer, cx| {
-        buffer.set_language(Some(language), cx);
-    });
-
-    cx.set_state(r#"struct A {ˇ}"#);
-
-    cx.update_editor(|editor, window, cx| {
-        editor.newline(&Default::default(), window, cx);
-    });
-
-    cx.assert_editor_state(indoc!(
-        "struct A {
-            ˇ
-        }"
-    ));
-
-    cx.set_state(r#"select_biased!(ˇ)"#);
-
-    cx.update_editor(|editor, window, cx| {
-        editor.newline(&Default::default(), window, cx);
-        editor.handle_input("def ", window, cx);
-        editor.handle_input("(", window, cx);
-        editor.newline(&Default::default(), window, cx);
-        editor.handle_input("a", window, cx);
-    });
-
-    cx.assert_editor_state(indoc!(
-        "select_biased!(
-        def (
-        aˇ
-        )
-        )"
-    ));
-}
-
-#[gpui::test]
-async fn test_autoindent_selections(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    {
-        let mut cx = EditorLspTestContext::new_rust(Default::default(), cx).await;
-        cx.set_state(indoc! {"
-            impl A {
-
-                fn b() {}
-
-            «fn c() {
-
-            }ˇ»
-            }
-        "});
-
-        cx.update_editor(|editor, window, cx| {
-            editor.autoindent(&Default::default(), window, cx);
-        });
-
-        cx.assert_editor_state(indoc! {"
-            impl A {
-
-                fn b() {}
-
-                «fn c() {
-
-                }ˇ»
-            }
-        "});
-    }
-
-    {
-        let mut cx = EditorTestContext::new_multibuffer(
-            cx,
-            [indoc! { "
-                impl A {
-                «
-                // a
-                fn b(){}
-                »
-                «
-                    }
-                    fn c(){}
-                »
-            "}],
-        );
-
-        let buffer = cx.update_editor(|editor, _, cx| {
-            let buffer = editor.buffer().update(cx, |buffer, _| {
-                buffer.all_buffers().iter().next().unwrap().clone()
-            });
-            buffer.update(cx, |buffer, cx| buffer.set_language(Some(rust_lang()), cx));
-            buffer
-        });
-
-        cx.run_until_parked();
-        cx.update_editor(|editor, window, cx| {
-            editor.select_all(&Default::default(), window, cx);
-            editor.autoindent(&Default::default(), window, cx)
-        });
-        cx.run_until_parked();
-
-        cx.update(|_, cx| {
-            assert_eq!(
-                buffer.read(cx).text(),
-                indoc! { "
-                    impl A {
-
-                        // a
-                        fn b(){}
-
-
-                    }
-                    fn c(){}
-
-                " }
-            )
-        });
-    }
-}
-
-#[gpui::test]
-async fn test_autoclose_and_auto_surround_pairs(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    let language = Arc::new(Language::new(
-        LanguageConfig {
-            brackets: BracketPairConfig {
-                pairs: vec![
-                    BracketPair {
-                        start: "{".to_string(),
-                        end: "}".to_string(),
-                        close: true,
-                        surround: true,
-                        newline: true,
-                    },
-                    BracketPair {
-                        start: "(".to_string(),
-                        end: ")".to_string(),
-                        close: true,
-                        surround: true,
-                        newline: true,
-                    },
-                    BracketPair {
-                        start: "/*".to_string(),
-                        end: " */".to_string(),
-                        close: true,
-                        surround: true,
-                        newline: true,
-                    },
-                    BracketPair {
-                        start: "[".to_string(),
-                        end: "]".to_string(),
-                        close: false,
-                        surround: false,
-                        newline: true,
-                    },
-                    BracketPair {
-                        start: "\"".to_string(),
-                        end: "\"".to_string(),
-                        close: true,
-                        surround: true,
-                        newline: false,
-                    },
-                    BracketPair {
-                        start: "<".to_string(),
-                        end: ">".to_string(),
-                        close: false,
-                        surround: true,
-                        newline: true,
-                    },
-                ],
-                ..Default::default()
-            },
-            autoclose_before: "})]".to_string(),
-            ..Default::default()
-        },
-        Some(tree_sitter_rust::LANGUAGE.into()),
-    ));
-
-    cx.language_registry().add(language.clone());
-    cx.update_buffer(|buffer, cx| {
-        buffer.set_language(Some(language), cx);
-    });
-
-    cx.set_state(
-        &r#"
-            🏀ˇ
-            εˇ
-            ❤️ˇ
-        "#
-        .unindent(),
-    );
-
-    // autoclose multiple nested brackets at multiple cursors
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("{", window, cx);
-        editor.handle_input("{", window, cx);
-        editor.handle_input("{", window, cx);
-    });
-    cx.assert_editor_state(
-        &"
-            🏀{{{ˇ}}}
-            ε{{{ˇ}}}
-            ❤️{{{ˇ}}}
-        "
-        .unindent(),
-    );
-
-    // insert a different closing bracket
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input(")", window, cx);
-    });
-    cx.assert_editor_state(
-        &"
-            🏀{{{)ˇ}}}
-            ε{{{)ˇ}}}
-            ❤️{{{)ˇ}}}
-        "
-        .unindent(),
-    );
-
-    // skip over the auto-closed brackets when typing a closing bracket
-    cx.update_editor(|editor, window, cx| {
-        editor.move_right(&MoveRight, window, cx);
-        editor.handle_input("}", window, cx);
-        editor.handle_input("}", window, cx);
-        editor.handle_input("}", window, cx);
-    });
-    cx.assert_editor_state(
-        &"
-            🏀{{{)}}}}ˇ
-            ε{{{)}}}}ˇ
-            ❤️{{{)}}}}ˇ
-        "
-        .unindent(),
-    );
-
-    // autoclose multi-character pairs
-    cx.set_state(
-        &"
-            ˇ
-            ˇ
-        "
-        .unindent(),
-    );
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("/", window, cx);
-        editor.handle_input("*", window, cx);
-    });
-    cx.assert_editor_state(
-        &"
-            /*ˇ */
-            /*ˇ */
-        "
-        .unindent(),
-    );
-
-    // one cursor autocloses a multi-character pair, one cursor
-    // does not autoclose.
-    cx.set_state(
-        &"
-            /ˇ
-            ˇ
-        "
-        .unindent(),
-    );
-    cx.update_editor(|editor, window, cx| editor.handle_input("*", window, cx));
-    cx.assert_editor_state(
-        &"
-            /*ˇ */
-            *ˇ
-        "
-        .unindent(),
-    );
-
-    // Don't autoclose if the next character isn't whitespace and isn't
-    // listed in the language's "autoclose_before" section.
-    cx.set_state("ˇa b");
-    cx.update_editor(|editor, window, cx| editor.handle_input("{", window, cx));
-    cx.assert_editor_state("{ˇa b");
-
-    // Don't autoclose if `close` is false for the bracket pair
-    cx.set_state("ˇ");
-    cx.update_editor(|editor, window, cx| editor.handle_input("[", window, cx));
-    cx.assert_editor_state("[ˇ");
-
-    // Surround with brackets if text is selected
-    cx.set_state("«aˇ» b");
-    cx.update_editor(|editor, window, cx| editor.handle_input("{", window, cx));
-    cx.assert_editor_state("{«aˇ»} b");
-
-    // Autoclose when not immediately after a word character
-    cx.set_state("a ˇ");
-    cx.update_editor(|editor, window, cx| editor.handle_input("\"", window, cx));
-    cx.assert_editor_state("a \"ˇ\"");
-
-    // Autoclose pair where the start and end characters are the same
-    cx.update_editor(|editor, window, cx| editor.handle_input("\"", window, cx));
-    cx.assert_editor_state("a \"\"ˇ");
-
-    // Don't autoclose when immediately after a word character
-    cx.set_state("aˇ");
-    cx.update_editor(|editor, window, cx| editor.handle_input("\"", window, cx));
-    cx.assert_editor_state("a\"ˇ");
-
-    // Do autoclose when after a non-word character
-    cx.set_state("{ˇ");
-    cx.update_editor(|editor, window, cx| editor.handle_input("\"", window, cx));
-    cx.assert_editor_state("{\"ˇ\"");
-
-    // Non identical pairs autoclose regardless of preceding character
-    cx.set_state("aˇ");
-    cx.update_editor(|editor, window, cx| editor.handle_input("{", window, cx));
-    cx.assert_editor_state("a{ˇ}");
-
-    // Don't autoclose pair if autoclose is disabled
-    cx.set_state("ˇ");
-    cx.update_editor(|editor, window, cx| editor.handle_input("<", window, cx));
-    cx.assert_editor_state("<ˇ");
-
-    // Surround with brackets if text is selected and auto_surround is enabled, even if autoclose is disabled
-    cx.set_state("«aˇ» b");
-    cx.update_editor(|editor, window, cx| editor.handle_input("<", window, cx));
-    cx.assert_editor_state("<«aˇ»> b");
-}
-
-#[gpui::test]
-async fn test_always_treat_brackets_as_autoclosed_skip_over(cx: &mut TestAppContext) {
-    init_test(cx, |settings| {
-        settings.defaults.always_treat_brackets_as_autoclosed = Some(true);
-    });
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    let language = Arc::new(Language::new(
-        LanguageConfig {
-            brackets: BracketPairConfig {
-                pairs: vec![
-                    BracketPair {
-                        start: "{".to_string(),
-                        end: "}".to_string(),
-                        close: true,
-                        surround: true,
-                        newline: true,
-                    },
-                    BracketPair {
-                        start: "(".to_string(),
-                        end: ")".to_string(),
-                        close: true,
-                        surround: true,
-                        newline: true,
-                    },
-                    BracketPair {
-                        start: "[".to_string(),
-                        end: "]".to_string(),
-                        close: false,
-                        surround: false,
-                        newline: true,
-                    },
-                ],
-                ..Default::default()
-            },
-            autoclose_before: "})]".to_string(),
-            ..Default::default()
-        },
-        Some(tree_sitter_rust::LANGUAGE.into()),
-    ));
-
-    cx.language_registry().add(language.clone());
-    cx.update_buffer(|buffer, cx| {
-        buffer.set_language(Some(language), cx);
-    });
-
-    cx.set_state(
-        &"
-            ˇ
-            ˇ
-            ˇ
-        "
-        .unindent(),
-    );
-
-    // ensure only matching closing brackets are skipped over
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("}", window, cx);
-        editor.move_left(&MoveLeft, window, cx);
-        editor.handle_input(")", window, cx);
-        editor.move_left(&MoveLeft, window, cx);
-    });
-    cx.assert_editor_state(
-        &"
-            ˇ)}
-            ˇ)}
-            ˇ)}
-        "
-        .unindent(),
-    );
-
-    // skip-over closing brackets at multiple cursors
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input(")", window, cx);
-        editor.handle_input("}", window, cx);
-    });
-    cx.assert_editor_state(
-        &"
-            )}ˇ
-            )}ˇ
-            )}ˇ
-        "
-        .unindent(),
-    );
-
-    // ignore non-close brackets
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("]", window, cx);
-        editor.move_left(&MoveLeft, window, cx);
-        editor.handle_input("]", window, cx);
-    });
-    cx.assert_editor_state(
-        &"
-            )}]ˇ]
-            )}]ˇ]
-            )}]ˇ]
-        "
-        .unindent(),
-    );
-}
-
-#[gpui::test]
-async fn test_autoclose_with_embedded_language(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    let html_language = Arc::new(
-        Language::new(
-            LanguageConfig {
-                name: "HTML".into(),
-                brackets: BracketPairConfig {
-                    pairs: vec![
-                        BracketPair {
-                            start: "<".into(),
-                            end: ">".into(),
-                            close: true,
-                            ..Default::default()
-                        },
-                        BracketPair {
-                            start: "{".into(),
-                            end: "}".into(),
-                            close: true,
-                            ..Default::default()
-                        },
-                        BracketPair {
-                            start: "(".into(),
-                            end: ")".into(),
-                            close: true,
-                            ..Default::default()
-                        },
-                    ],
-                    ..Default::default()
-                },
-                autoclose_before: "})]>".into(),
-                ..Default::default()
-            },
-            Some(tree_sitter_html::LANGUAGE.into()),
-        )
-        .with_injection_query(
-            r#"
-            (script_element
-                (raw_text) @injection.content
-                (#set! injection.language "javascript"))
-            "#,
-        )
-        .unwrap(),
-    );
-
-    let javascript_language = Arc::new(Language::new(
-        LanguageConfig {
-            name: "JavaScript".into(),
-            brackets: BracketPairConfig {
-                pairs: vec![
-                    BracketPair {
-                        start: "/*".into(),
-                        end: " */".into(),
-                        close: true,
-                        ..Default::default()
-                    },
-                    BracketPair {
-                        start: "{".into(),
-                        end: "}".into(),
-                        close: true,
-                        ..Default::default()
-                    },
-                    BracketPair {
-                        start: "(".into(),
-                        end: ")".into(),
-                        close: true,
-                        ..Default::default()
-                    },
-                ],
-                ..Default::default()
-            },
-            autoclose_before: "})]>".into(),
-            ..Default::default()
-        },
-        Some(tree_sitter_typescript::LANGUAGE_TSX.into()),
-    ));
-
-    cx.language_registry().add(html_language.clone());
-    cx.language_registry().add(javascript_language);
-    cx.executor().run_until_parked();
-
-    cx.update_buffer(|buffer, cx| {
-        buffer.set_language(Some(html_language), cx);
-    });
-
-    cx.set_state(
-        &r#"
-            <body>ˇ
-                <script>
-                    var x = 1;ˇ
-                </script>
-            </body>ˇ
-        "#
-        .unindent(),
-    );
-
-    // Precondition: different languages are active at different locations.
-    cx.update_editor(|editor, window, cx| {
-        let snapshot = editor.snapshot(window, cx);
-        let cursors = editor
-            .selections
-            .ranges::<MultiBufferOffset>(&editor.display_snapshot(cx));
-        let languages = cursors
-            .iter()
-            .map(|c| snapshot.language_at(c.start).unwrap().name())
-            .collect::<Vec<_>>();
-        assert_eq!(
-            languages,
-            &["HTML".into(), "JavaScript".into(), "HTML".into()]
-        );
-    });
-
-    // Angle brackets autoclose in HTML, but not JavaScript.
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("<", window, cx);
-        editor.handle_input("a", window, cx);
-    });
-    cx.assert_editor_state(
-        &r#"
-            <body><aˇ>
-                <script>
-                    var x = 1;<aˇ
-                </script>
-            </body><aˇ>
-        "#
-        .unindent(),
-    );
-
-    // Curly braces and parens autoclose in both HTML and JavaScript.
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input(" b=", window, cx);
-        editor.handle_input("{", window, cx);
-        editor.handle_input("c", window, cx);
-        editor.handle_input("(", window, cx);
-    });
-    cx.assert_editor_state(
-        &r#"
-            <body><a b={c(ˇ)}>
-                <script>
-                    var x = 1;<a b={c(ˇ)}
-                </script>
-            </body><a b={c(ˇ)}>
-        "#
-        .unindent(),
-    );
-
-    // Brackets that were already autoclosed are skipped.
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input(")", window, cx);
-        editor.handle_input("d", window, cx);
-        editor.handle_input("}", window, cx);
-    });
-    cx.assert_editor_state(
-        &r#"
-            <body><a b={c()d}ˇ>
-                <script>
-                    var x = 1;<a b={c()d}ˇ
-                </script>
-            </body><a b={c()d}ˇ>
-        "#
-        .unindent(),
-    );
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input(">", window, cx);
-    });
-    cx.assert_editor_state(
-        &r#"
-            <body><a b={c()d}>ˇ
-                <script>
-                    var x = 1;<a b={c()d}>ˇ
-                </script>
-            </body><a b={c()d}>ˇ
-        "#
-        .unindent(),
-    );
-
-    // Reset
-    cx.set_state(
-        &r#"
-            <body>ˇ
-                <script>
-                    var x = 1;ˇ
-                </script>
-            </body>ˇ
-        "#
-        .unindent(),
-    );
-
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("<", window, cx);
-    });
-    cx.assert_editor_state(
-        &r#"
-            <body><ˇ>
-                <script>
-                    var x = 1;<ˇ
-                </script>
-            </body><ˇ>
-        "#
-        .unindent(),
-    );
-
-    // When backspacing, the closing angle brackets are removed.
-    cx.update_editor(|editor, window, cx| {
-        editor.backspace(&Backspace, window, cx);
-    });
-    cx.assert_editor_state(
-        &r#"
-            <body>ˇ
-                <script>
-                    var x = 1;ˇ
-                </script>
-            </body>ˇ
-        "#
-        .unindent(),
-    );
-
-    // Block comments autoclose in JavaScript, but not HTML.
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("/", window, cx);
-        editor.handle_input("*", window, cx);
-    });
-    cx.assert_editor_state(
-        &r#"
-            <body>/*ˇ
-                <script>
-                    var x = 1;/*ˇ */
-                </script>
-            </body>/*ˇ
-        "#
-        .unindent(),
-    );
-}
-
-#[gpui::test]
-async fn test_autoclose_with_overrides(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    let rust_language = Arc::new(
-        Language::new(
-            LanguageConfig {
-                name: "Rust".into(),
-                brackets: serde_json::from_value(json!([
-                    { "start": "{", "end": "}", "close": true, "newline": true },
-                    { "start": "\"", "end": "\"", "close": true, "newline": false, "not_in": ["string"] },
-                ]))
-                .unwrap(),
-                autoclose_before: "})]>".into(),
-                ..Default::default()
-            },
-            Some(tree_sitter_rust::LANGUAGE.into()),
-        )
-        .with_override_query("(string_literal) @string")
-        .unwrap(),
-    );
-
-    cx.language_registry().add(rust_language.clone());
-    cx.update_buffer(|buffer, cx| {
-        buffer.set_language(Some(rust_language), cx);
-    });
-
-    cx.set_state(
-        &r#"
-            let x = ˇ
-        "#
-        .unindent(),
-    );
-
-    // Inserting a quotation mark. A closing quotation mark is automatically inserted.
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("\"", window, cx);
-    });
-    cx.assert_editor_state(
-        &r#"
-            let x = "ˇ"
-        "#
-        .unindent(),
-    );
-
-    // Inserting another quotation mark. The cursor moves across the existing
-    // automatically-inserted quotation mark.
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("\"", window, cx);
-    });
-    cx.assert_editor_state(
-        &r#"
-            let x = ""ˇ
-        "#
-        .unindent(),
-    );
-
-    // Reset
-    cx.set_state(
-        &r#"
-            let x = ˇ
-        "#
-        .unindent(),
-    );
-
-    // Inserting a quotation mark inside of a string. A second quotation mark is not inserted.
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("\"", window, cx);
-        editor.handle_input(" ", window, cx);
-        editor.move_left(&Default::default(), window, cx);
-        editor.handle_input("\\", window, cx);
-        editor.handle_input("\"", window, cx);
-    });
-    cx.assert_editor_state(
-        &r#"
-            let x = "\"ˇ "
-        "#
-        .unindent(),
-    );
-
-    // Inserting a closing quotation mark at the position of an automatically-inserted quotation
-    // mark. Nothing is inserted.
-    cx.update_editor(|editor, window, cx| {
-        editor.move_right(&Default::default(), window, cx);
-        editor.handle_input("\"", window, cx);
-    });
-    cx.assert_editor_state(
-        &r#"
-            let x = "\" "ˇ
-        "#
-        .unindent(),
-    );
-}
-
-#[gpui::test]
-async fn test_surround_with_pair(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let language = Arc::new(Language::new(
-        LanguageConfig {
-            brackets: BracketPairConfig {
-                pairs: vec![
-                    BracketPair {
-                        start: "{".to_string(),
-                        end: "}".to_string(),
-                        close: true,
-                        surround: true,
-                        newline: true,
-                    },
-                    BracketPair {
-                        start: "/* ".to_string(),
-                        end: "*/".to_string(),
-                        close: true,
-                        surround: true,
-                        ..Default::default()
-                    },
-                ],
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-        Some(tree_sitter_rust::LANGUAGE.into()),
-    ));
-
-    let text = r#"
-        a
-        b
-        c
-    "#
-    .unindent();
-
-    let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(language, cx));
-    let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-    let (editor, cx) = cx.add_window_view(|window, cx| build_editor(buffer, window, cx));
-    editor
-        .condition::<crate::EditorEvent>(cx, |editor, cx| !editor.buffer.read(cx).is_parsing(cx))
-        .await;
-
-    editor.update_in(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_display_ranges([
-                DisplayPoint::new(DisplayRow(0), 0)..DisplayPoint::new(DisplayRow(0), 1),
-                DisplayPoint::new(DisplayRow(1), 0)..DisplayPoint::new(DisplayRow(1), 1),
-                DisplayPoint::new(DisplayRow(2), 0)..DisplayPoint::new(DisplayRow(2), 1),
-            ])
-        });
-
-        editor.handle_input("{", window, cx);
-        editor.handle_input("{", window, cx);
-        editor.handle_input("{", window, cx);
-        assert_eq!(
-            editor.text(cx),
-            "
-                {{{a}}}
-                {{{b}}}
-                {{{c}}}
-            "
-            .unindent()
-        );
-        assert_eq!(
-            display_ranges(editor, cx),
-            [
-                DisplayPoint::new(DisplayRow(0), 3)..DisplayPoint::new(DisplayRow(0), 4),
-                DisplayPoint::new(DisplayRow(1), 3)..DisplayPoint::new(DisplayRow(1), 4),
-                DisplayPoint::new(DisplayRow(2), 3)..DisplayPoint::new(DisplayRow(2), 4)
-            ]
-        );
-
-        editor.undo(&Undo, window, cx);
-        editor.undo(&Undo, window, cx);
-        editor.undo(&Undo, window, cx);
-        assert_eq!(
-            editor.text(cx),
-            "
-                a
-                b
-                c
-            "
-            .unindent()
-        );
-        assert_eq!(
-            display_ranges(editor, cx),
-            [
-                DisplayPoint::new(DisplayRow(0), 0)..DisplayPoint::new(DisplayRow(0), 1),
-                DisplayPoint::new(DisplayRow(1), 0)..DisplayPoint::new(DisplayRow(1), 1),
-                DisplayPoint::new(DisplayRow(2), 0)..DisplayPoint::new(DisplayRow(2), 1)
-            ]
-        );
-
-        // Ensure inserting the first character of a multi-byte bracket pair
-        // doesn't surround the selections with the bracket.
-        editor.handle_input("/", window, cx);
-        assert_eq!(
-            editor.text(cx),
-            "
-                /
-                /
-                /
-            "
-            .unindent()
-        );
-        assert_eq!(
-            display_ranges(editor, cx),
-            [
-                DisplayPoint::new(DisplayRow(0), 1)..DisplayPoint::new(DisplayRow(0), 1),
-                DisplayPoint::new(DisplayRow(1), 1)..DisplayPoint::new(DisplayRow(1), 1),
-                DisplayPoint::new(DisplayRow(2), 1)..DisplayPoint::new(DisplayRow(2), 1)
-            ]
-        );
-
-        editor.undo(&Undo, window, cx);
-        assert_eq!(
-            editor.text(cx),
-            "
-                a
-                b
-                c
-            "
-            .unindent()
-        );
-        assert_eq!(
-            display_ranges(editor, cx),
-            [
-                DisplayPoint::new(DisplayRow(0), 0)..DisplayPoint::new(DisplayRow(0), 1),
-                DisplayPoint::new(DisplayRow(1), 0)..DisplayPoint::new(DisplayRow(1), 1),
-                DisplayPoint::new(DisplayRow(2), 0)..DisplayPoint::new(DisplayRow(2), 1)
-            ]
-        );
-
-        // Ensure inserting the last character of a multi-byte bracket pair
-        // doesn't surround the selections with the bracket.
-        editor.handle_input("*", window, cx);
-        assert_eq!(
-            editor.text(cx),
-            "
-                *
-                *
-                *
-            "
-            .unindent()
-        );
-        assert_eq!(
-            display_ranges(editor, cx),
-            [
-                DisplayPoint::new(DisplayRow(0), 1)..DisplayPoint::new(DisplayRow(0), 1),
-                DisplayPoint::new(DisplayRow(1), 1)..DisplayPoint::new(DisplayRow(1), 1),
-                DisplayPoint::new(DisplayRow(2), 1)..DisplayPoint::new(DisplayRow(2), 1)
-            ]
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_delete_autoclose_pair(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let language = Arc::new(Language::new(
-        LanguageConfig {
-            brackets: BracketPairConfig {
-                pairs: vec![BracketPair {
-                    start: "{".to_string(),
-                    end: "}".to_string(),
-                    close: true,
-                    surround: true,
-                    newline: true,
-                }],
-                ..Default::default()
-            },
-            autoclose_before: "}".to_string(),
-            ..Default::default()
-        },
-        Some(tree_sitter_rust::LANGUAGE.into()),
-    ));
-
-    let text = r#"
-        a
-        b
-        c
-    "#
-    .unindent();
-
-    let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(language, cx));
-    let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-    let (editor, cx) = cx.add_window_view(|window, cx| build_editor(buffer, window, cx));
-    editor
-        .condition::<crate::EditorEvent>(cx, |editor, cx| !editor.buffer.read(cx).is_parsing(cx))
-        .await;
-
-    editor.update_in(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([
-                Point::new(0, 1)..Point::new(0, 1),
-                Point::new(1, 1)..Point::new(1, 1),
-                Point::new(2, 1)..Point::new(2, 1),
-            ])
-        });
-
-        editor.handle_input("{", window, cx);
-        editor.handle_input("{", window, cx);
-        editor.handle_input("_", window, cx);
-        assert_eq!(
-            editor.text(cx),
-            "
-                a{{_}}
-                b{{_}}
-                c{{_}}
-            "
-            .unindent()
-        );
-        assert_eq!(
-            editor
-                .selections
-                .ranges::<Point>(&editor.display_snapshot(cx)),
-            [
-                Point::new(0, 4)..Point::new(0, 4),
-                Point::new(1, 4)..Point::new(1, 4),
-                Point::new(2, 4)..Point::new(2, 4)
-            ]
-        );
-
-        editor.backspace(&Default::default(), window, cx);
-        editor.backspace(&Default::default(), window, cx);
-        assert_eq!(
-            editor.text(cx),
-            "
-                a{}
-                b{}
-                c{}
-            "
-            .unindent()
-        );
-        assert_eq!(
-            editor
-                .selections
-                .ranges::<Point>(&editor.display_snapshot(cx)),
-            [
-                Point::new(0, 2)..Point::new(0, 2),
-                Point::new(1, 2)..Point::new(1, 2),
-                Point::new(2, 2)..Point::new(2, 2)
-            ]
-        );
-
-        editor.delete_to_previous_word_start(&Default::default(), window, cx);
-        assert_eq!(
-            editor.text(cx),
-            "
-                a
-                b
-                c
-            "
-            .unindent()
-        );
-        assert_eq!(
-            editor
-                .selections
-                .ranges::<Point>(&editor.display_snapshot(cx)),
-            [
-                Point::new(0, 1)..Point::new(0, 1),
-                Point::new(1, 1)..Point::new(1, 1),
-                Point::new(2, 1)..Point::new(2, 1)
-            ]
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_always_treat_brackets_as_autoclosed_delete(cx: &mut TestAppContext) {
-    init_test(cx, |settings| {
-        settings.defaults.always_treat_brackets_as_autoclosed = Some(true);
-    });
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    let language = Arc::new(Language::new(
-        LanguageConfig {
-            brackets: BracketPairConfig {
-                pairs: vec![
-                    BracketPair {
-                        start: "{".to_string(),
-                        end: "}".to_string(),
-                        close: true,
-                        surround: true,
-                        newline: true,
-                    },
-                    BracketPair {
-                        start: "(".to_string(),
-                        end: ")".to_string(),
-                        close: true,
-                        surround: true,
-                        newline: true,
-                    },
-                    BracketPair {
-                        start: "[".to_string(),
-                        end: "]".to_string(),
-                        close: false,
-                        surround: true,
-                        newline: true,
-                    },
-                ],
-                ..Default::default()
-            },
-            autoclose_before: "})]".to_string(),
-            ..Default::default()
-        },
-        Some(tree_sitter_rust::LANGUAGE.into()),
-    ));
-
-    cx.language_registry().add(language.clone());
-    cx.update_buffer(|buffer, cx| {
-        buffer.set_language(Some(language), cx);
-    });
-
-    cx.set_state(
-        &"
-            {(ˇ)}
-            [[ˇ]]
-            {(ˇ)}
-        "
-        .unindent(),
-    );
-
-    cx.update_editor(|editor, window, cx| {
-        editor.backspace(&Default::default(), window, cx);
-        editor.backspace(&Default::default(), window, cx);
-    });
-
-    cx.assert_editor_state(
-        &"
-            ˇ
-            ˇ]]
-            ˇ
-        "
-        .unindent(),
-    );
-
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("{", window, cx);
-        editor.handle_input("{", window, cx);
-        editor.move_right(&MoveRight, window, cx);
-        editor.move_right(&MoveRight, window, cx);
-        editor.move_left(&MoveLeft, window, cx);
-        editor.move_left(&MoveLeft, window, cx);
-        editor.backspace(&Default::default(), window, cx);
-    });
-
-    cx.assert_editor_state(
-        &"
-            {ˇ}
-            {ˇ}]]
-            {ˇ}
-        "
-        .unindent(),
-    );
-
-    cx.update_editor(|editor, window, cx| {
-        editor.backspace(&Default::default(), window, cx);
-    });
-
-    cx.assert_editor_state(
-        &"
-            ˇ
-            ˇ]]
-            ˇ
-        "
-        .unindent(),
-    );
-}
-
-#[gpui::test]
-async fn test_auto_replace_emoji_shortcode(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let language = Arc::new(Language::new(
-        LanguageConfig::default(),
-        Some(tree_sitter_rust::LANGUAGE.into()),
-    ));
-
-    let buffer = cx.new(|cx| Buffer::local("", cx).with_language(language, cx));
-    let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-    let (editor, cx) = cx.add_window_view(|window, cx| build_editor(buffer, window, cx));
-    editor
-        .condition::<crate::EditorEvent>(cx, |editor, cx| !editor.buffer.read(cx).is_parsing(cx))
-        .await;
-
-    editor.update_in(cx, |editor, window, cx| {
-        editor.set_auto_replace_emoji_shortcode(true);
-
-        editor.handle_input("Hello ", window, cx);
-        editor.handle_input(":wave", window, cx);
-        assert_eq!(editor.text(cx), "Hello :wave".unindent());
-
-        editor.handle_input(":", window, cx);
-        assert_eq!(editor.text(cx), "Hello 👋".unindent());
-
-        editor.handle_input(" :smile", window, cx);
-        assert_eq!(editor.text(cx), "Hello 👋 :smile".unindent());
-
-        editor.handle_input(":", window, cx);
-        assert_eq!(editor.text(cx), "Hello 👋 😄".unindent());
-
-        // Ensure shortcode gets replaced when it is part of a word that only consists of emojis
-        editor.handle_input(":wave", window, cx);
-        assert_eq!(editor.text(cx), "Hello 👋 😄:wave".unindent());
-
-        editor.handle_input(":", window, cx);
-        assert_eq!(editor.text(cx), "Hello 👋 😄👋".unindent());
-
-        editor.handle_input(":1", window, cx);
-        assert_eq!(editor.text(cx), "Hello 👋 😄👋:1".unindent());
-
-        editor.handle_input(":", window, cx);
-        assert_eq!(editor.text(cx), "Hello 👋 😄👋:1:".unindent());
-
-        // Ensure shortcode does not get replaced when it is part of a word
-        editor.handle_input(" Test:wave", window, cx);
-        assert_eq!(editor.text(cx), "Hello 👋 😄👋:1: Test:wave".unindent());
-
-        editor.handle_input(":", window, cx);
-        assert_eq!(editor.text(cx), "Hello 👋 😄👋:1: Test:wave:".unindent());
-
-        editor.set_auto_replace_emoji_shortcode(false);
-
-        // Ensure shortcode does not get replaced when auto replace is off
-        editor.handle_input(" :wave", window, cx);
-        assert_eq!(
-            editor.text(cx),
-            "Hello 👋 😄👋:1: Test:wave: :wave".unindent()
-        );
-
-        editor.handle_input(":", window, cx);
-        assert_eq!(
-            editor.text(cx),
-            "Hello 👋 😄👋:1: Test:wave: :wave:".unindent()
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_snippet_placeholder_choices(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let (text, insertion_ranges) = marked_text_ranges(
-        indoc! {"
-            ˇ
-        "},
-        false,
-    );
-
-    let buffer = cx.update(|cx| MultiBuffer::build_simple(&text, cx));
-    let (editor, cx) = cx.add_window_view(|window, cx| build_editor(buffer, window, cx));
-
-    _ = editor.update_in(cx, |editor, window, cx| {
-        let snippet = Snippet::parse("type ${1|,i32,u32|} = $2").unwrap();
-
-        editor
-            .insert_snippet(
-                &insertion_ranges
-                    .iter()
-                    .map(|range| MultiBufferOffset(range.start)..MultiBufferOffset(range.end))
-                    .collect::<Vec<_>>(),
-                snippet,
-                window,
-                cx,
-            )
-            .unwrap();
-
-        fn assert(editor: &mut Editor, cx: &mut Context<Editor>, marked_text: &str) {
-            let (expected_text, selection_ranges) = marked_text_ranges(marked_text, false);
-            assert_eq!(editor.text(cx), expected_text);
-            assert_eq!(
-                editor.selections.ranges(&editor.display_snapshot(cx)),
-                selection_ranges
-                    .iter()
-                    .map(|range| MultiBufferOffset(range.start)..MultiBufferOffset(range.end))
-                    .collect::<Vec<_>>()
-            );
-        }
-
-        assert(
-            editor,
-            cx,
-            indoc! {"
-            type «» =•
-            "},
-        );
-
-        assert!(editor.context_menu_visible(), "There should be a matches");
-    });
-}
-
-#[gpui::test]
-async fn test_snippet_tabstop_navigation_with_placeholders(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    fn assert_state(editor: &mut Editor, cx: &mut Context<Editor>, marked_text: &str) {
-        let (expected_text, selection_ranges) = marked_text_ranges(marked_text, false);
-        assert_eq!(editor.text(cx), expected_text);
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            selection_ranges
-                .iter()
-                .map(|range| MultiBufferOffset(range.start)..MultiBufferOffset(range.end))
-                .collect::<Vec<_>>()
-        );
-    }
-
-    let (text, insertion_ranges) = marked_text_ranges(
-        indoc! {"
-            ˇ
-        "},
-        false,
-    );
-
-    let buffer = cx.update(|cx| MultiBuffer::build_simple(&text, cx));
-    let (editor, cx) = cx.add_window_view(|window, cx| build_editor(buffer, window, cx));
-
-    _ = editor.update_in(cx, |editor, window, cx| {
-        let snippet = Snippet::parse("type ${1|,i32,u32|} = $2; $3").unwrap();
-
-        editor
-            .insert_snippet(
-                &insertion_ranges
-                    .iter()
-                    .map(|range| MultiBufferOffset(range.start)..MultiBufferOffset(range.end))
-                    .collect::<Vec<_>>(),
-                snippet,
-                window,
-                cx,
-            )
-            .unwrap();
-
-        assert_state(
-            editor,
-            cx,
-            indoc! {"
-            type «» = ;•
-            "},
-        );
-
-        assert!(
-            editor.context_menu_visible(),
-            "Context menu should be visible for placeholder choices"
-        );
-
-        editor.next_snippet_tabstop(&NextSnippetTabstop, window, cx);
-
-        assert_state(
-            editor,
-            cx,
-            indoc! {"
-            type  = «»;•
-            "},
-        );
-
-        assert!(
-            !editor.context_menu_visible(),
-            "Context menu should be hidden after moving to next tabstop"
-        );
-
-        editor.next_snippet_tabstop(&NextSnippetTabstop, window, cx);
-
-        assert_state(
-            editor,
-            cx,
-            indoc! {"
-            type  = ; ˇ
-            "},
-        );
-
-        editor.next_snippet_tabstop(&NextSnippetTabstop, window, cx);
-
-        assert_state(
-            editor,
-            cx,
-            indoc! {"
-            type  = ; ˇ
-            "},
-        );
-    });
-
-    _ = editor.update_in(cx, |editor, window, cx| {
-        editor.select_all(&SelectAll, window, cx);
-        editor.backspace(&Backspace, window, cx);
-
-        let snippet = Snippet::parse("fn ${1|,foo,bar|} = ${2:value}; $3").unwrap();
-        let insertion_ranges = editor
-            .selections
-            .all(&editor.display_snapshot(cx))
-            .iter()
-            .map(|s| s.range())
-            .collect::<Vec<_>>();
-
-        editor
-            .insert_snippet(&insertion_ranges, snippet, window, cx)
-            .unwrap();
-
-        assert_state(editor, cx, "fn «» = value;•");
-
-        assert!(
-            editor.context_menu_visible(),
-            "Context menu should be visible for placeholder choices"
-        );
-
-        editor.next_snippet_tabstop(&NextSnippetTabstop, window, cx);
-
-        assert_state(editor, cx, "fn  = «valueˇ»;•");
-
-        editor.previous_snippet_tabstop(&PreviousSnippetTabstop, window, cx);
-
-        assert_state(editor, cx, "fn «» = value;•");
-
-        assert!(
-            editor.context_menu_visible(),
-            "Context menu should be visible again after returning to first tabstop"
-        );
-
-        editor.previous_snippet_tabstop(&PreviousSnippetTabstop, window, cx);
-
-        assert_state(editor, cx, "fn «» = value;•");
-    });
-}
-
-#[gpui::test]
-async fn test_snippets(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    cx.set_state(indoc! {"
-        a.ˇ b
-        a.ˇ b
-        a.ˇ b
-    "});
-
-    cx.update_editor(|editor, window, cx| {
-        let snippet = Snippet::parse("f(${1:one}, ${2:two}, ${1:three})$0").unwrap();
-        let insertion_ranges = editor
-            .selections
-            .all(&editor.display_snapshot(cx))
-            .iter()
-            .map(|s| s.range())
-            .collect::<Vec<_>>();
-        editor
-            .insert_snippet(&insertion_ranges, snippet, window, cx)
-            .unwrap();
-    });
-
-    cx.assert_editor_state(indoc! {"
-        a.f(«oneˇ», two, «threeˇ») b
-        a.f(«oneˇ», two, «threeˇ») b
-        a.f(«oneˇ», two, «threeˇ») b
-    "});
-
-    // Can't move earlier than the first tab stop
-    cx.update_editor(|editor, window, cx| {
-        assert!(!editor.move_to_prev_snippet_tabstop(window, cx))
-    });
-    cx.assert_editor_state(indoc! {"
-        a.f(«oneˇ», two, «threeˇ») b
-        a.f(«oneˇ», two, «threeˇ») b
-        a.f(«oneˇ», two, «threeˇ») b
-    "});
-
-    cx.update_editor(|editor, window, cx| assert!(editor.move_to_next_snippet_tabstop(window, cx)));
-    cx.assert_editor_state(indoc! {"
-        a.f(one, «twoˇ», three) b
-        a.f(one, «twoˇ», three) b
-        a.f(one, «twoˇ», three) b
-    "});
-
-    cx.update_editor(|editor, window, cx| assert!(editor.move_to_prev_snippet_tabstop(window, cx)));
-    cx.assert_editor_state(indoc! {"
-        a.f(«oneˇ», two, «threeˇ») b
-        a.f(«oneˇ», two, «threeˇ») b
-        a.f(«oneˇ», two, «threeˇ») b
-    "});
-
-    cx.update_editor(|editor, window, cx| assert!(editor.move_to_next_snippet_tabstop(window, cx)));
-    cx.assert_editor_state(indoc! {"
-        a.f(one, «twoˇ», three) b
-        a.f(one, «twoˇ», three) b
-        a.f(one, «twoˇ», three) b
-    "});
-    cx.update_editor(|editor, window, cx| assert!(editor.move_to_next_snippet_tabstop(window, cx)));
-    cx.assert_editor_state(indoc! {"
-        a.f(one, two, three)ˇ b
-        a.f(one, two, three)ˇ b
-        a.f(one, two, three)ˇ b
-    "});
-
-    // As soon as the last tab stop is reached, snippet state is gone
-    cx.update_editor(|editor, window, cx| {
-        assert!(!editor.move_to_prev_snippet_tabstop(window, cx))
-    });
-    cx.assert_editor_state(indoc! {"
-        a.f(one, two, three)ˇ b
-        a.f(one, two, three)ˇ b
-        a.f(one, two, three)ˇ b
-    "});
-}
-
-#[gpui::test]
-async fn test_snippet_indentation(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    cx.update_editor(|editor, window, cx| {
-        let snippet = Snippet::parse(indoc! {"
-            /*
-             * Multiline comment with leading indentation
-             *
-             * $1
-             */
-            $0"})
-        .unwrap();
-        let insertion_ranges = editor
-            .selections
-            .all(&editor.display_snapshot(cx))
-            .iter()
-            .map(|s| s.range())
-            .collect::<Vec<_>>();
-        editor
-            .insert_snippet(&insertion_ranges, snippet, window, cx)
-            .unwrap();
-    });
-
-    cx.assert_editor_state(indoc! {"
-        /*
-         * Multiline comment with leading indentation
-         *
-         * ˇ
-         */
-    "});
-
-    cx.update_editor(|editor, window, cx| assert!(editor.move_to_next_snippet_tabstop(window, cx)));
-    cx.assert_editor_state(indoc! {"
-        /*
-         * Multiline comment with leading indentation
-         *
-         *•
-         */
-        ˇ"});
-}
-
-#[gpui::test]
-async fn test_snippet_with_multi_word_prefix(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-    cx.update_editor(|editor, _, cx| {
-        editor.project().unwrap().update(cx, |project, cx| {
-            project.snippets().update(cx, |snippets, _cx| {
-                let snippet = project::snippet_provider::Snippet {
-                    prefix: vec!["multi word".to_string()],
-                    body: "this is many words".to_string(),
-                    description: Some("description".to_string()),
-                    name: "multi-word snippet test".to_string(),
-                };
-                snippets.add_snippet_for_test(
-                    None,
-                    PathBuf::from("test_snippets.json"),
-                    vec![Arc::new(snippet)],
-                );
-            });
-        })
-    });
-
-    for (input_to_simulate, should_match_snippet) in [
-        ("m", true),
-        ("m ", true),
-        ("m w", true),
-        ("aa m w", true),
-        ("aa m g", false),
-    ] {
-        cx.set_state("ˇ");
-        cx.simulate_input(input_to_simulate); // fails correctly
-
-        cx.update_editor(|editor, _, _| {
-            let Some(CodeContextMenu::Completions(context_menu)) = &*editor.context_menu.borrow()
-            else {
-                assert!(!should_match_snippet); // no completions! don't even show the menu
-                return;
-            };
-            assert!(context_menu.visible());
-            let completions = context_menu.completions.borrow();
-
-            assert_eq!(!completions.is_empty(), should_match_snippet);
-        });
-    }
-}
-
-#[gpui::test]
-async fn test_document_format_during_save(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_file(path!("/file.rs"), Default::default()).await;
-
-    let project = Project::test(fs, [path!("/file.rs").as_ref()], cx).await;
-
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-    language_registry.add(rust_lang());
-    let mut fake_servers = language_registry.register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            capabilities: lsp::ServerCapabilities {
-                document_formatting_provider: Some(lsp::OneOf::Left(true)),
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-    );
-
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer(path!("/file.rs"), cx)
-        })
-        .await
-        .unwrap();
-
-    let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-    let (editor, cx) = cx.add_window_view(|window, cx| {
-        build_editor_with_project(project.clone(), buffer, window, cx)
-    });
-    editor.update_in(cx, |editor, window, cx| {
-        editor.set_text("one\ntwo\nthree\n", window, cx)
-    });
-    assert!(cx.read(|cx| editor.is_dirty(cx)));
-
-    cx.executor().start_waiting();
-    let fake_server = fake_servers.next().await.unwrap();
-
-    {
-        fake_server.set_request_handler::<lsp::request::Formatting, _, _>(
-            move |params, _| async move {
-                assert_eq!(
-                    params.text_document.uri,
-                    lsp::Uri::from_file_path(path!("/file.rs")).unwrap()
-                );
-                assert_eq!(params.options.tab_size, 4);
-                Ok(Some(vec![lsp::TextEdit::new(
-                    lsp::Range::new(lsp::Position::new(0, 3), lsp::Position::new(1, 0)),
-                    ", ".to_string(),
-                )]))
-            },
-        );
-        let save = editor
-            .update_in(cx, |editor, window, cx| {
-                editor.save(
-                    SaveOptions {
-                        format: true,
-                        autosave: false,
-                    },
-                    project.clone(),
-                    window,
-                    cx,
-                )
-            })
-            .unwrap();
-        cx.executor().start_waiting();
-        save.await;
-
-        assert_eq!(
-            editor.update(cx, |editor, cx| editor.text(cx)),
-            "one, two\nthree\n"
-        );
-        assert!(!cx.read(|cx| editor.is_dirty(cx)));
-    }
-
-    {
-        editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("one\ntwo\nthree\n", window, cx)
-        });
-        assert!(cx.read(|cx| editor.is_dirty(cx)));
-
-        // Ensure we can still save even if formatting hangs.
-        fake_server.set_request_handler::<lsp::request::Formatting, _, _>(
-            move |params, _| async move {
-                assert_eq!(
-                    params.text_document.uri,
-                    lsp::Uri::from_file_path(path!("/file.rs")).unwrap()
-                );
-                futures::future::pending::<()>().await;
-                unreachable!()
-            },
-        );
-        let save = editor
-            .update_in(cx, |editor, window, cx| {
-                editor.save(
-                    SaveOptions {
-                        format: true,
-                        autosave: false,
-                    },
-                    project.clone(),
-                    window,
-                    cx,
-                )
-            })
-            .unwrap();
-        cx.executor().advance_clock(super::FORMAT_TIMEOUT);
-        cx.executor().start_waiting();
-        save.await;
-        assert_eq!(
-            editor.update(cx, |editor, cx| editor.text(cx)),
-            "one\ntwo\nthree\n"
-        );
-    }
-
-    // Set rust language override and assert overridden tabsize is sent to language server
-    update_test_language_settings(cx, |settings| {
-        settings.languages.0.insert(
-            "Rust".into(),
-            LanguageSettingsContent {
-                tab_size: NonZeroU32::new(8),
-                ..Default::default()
-            },
-        );
-    });
-
-    {
-        editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("somehting_new\n", window, cx)
-        });
-        assert!(cx.read(|cx| editor.is_dirty(cx)));
-        let _formatting_request_signal = fake_server
-            .set_request_handler::<lsp::request::Formatting, _, _>(move |params, _| async move {
-                assert_eq!(
-                    params.text_document.uri,
-                    lsp::Uri::from_file_path(path!("/file.rs")).unwrap()
-                );
-                assert_eq!(params.options.tab_size, 8);
-                Ok(Some(vec![]))
-            });
-        let save = editor
-            .update_in(cx, |editor, window, cx| {
-                editor.save(
-                    SaveOptions {
-                        format: true,
-                        autosave: false,
-                    },
-                    project.clone(),
-                    window,
-                    cx,
-                )
-            })
-            .unwrap();
-        cx.executor().start_waiting();
-        save.await;
-    }
-}
-
-#[gpui::test]
-async fn test_redo_after_noop_format(cx: &mut TestAppContext) {
-    init_test(cx, |settings| {
-        settings.defaults.ensure_final_newline_on_save = Some(false);
-    });
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_file(path!("/file.txt"), "foo".into()).await;
-
-    let project = Project::test(fs, [path!("/file.txt").as_ref()], cx).await;
-
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer(path!("/file.txt"), cx)
-        })
-        .await
-        .unwrap();
-
-    let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-    let (editor, cx) = cx.add_window_view(|window, cx| {
-        build_editor_with_project(project.clone(), buffer, window, cx)
-    });
-    editor.update_in(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::default(), window, cx, |s| {
-            s.select_ranges([MultiBufferOffset(0)..MultiBufferOffset(0)])
-        });
-    });
-    assert!(!cx.read(|cx| editor.is_dirty(cx)));
-
-    editor.update_in(cx, |editor, window, cx| {
-        editor.handle_input("\n", window, cx)
-    });
-    cx.run_until_parked();
-    save(&editor, &project, cx).await;
-    assert_eq!("\nfoo", editor.read_with(cx, |editor, cx| editor.text(cx)));
-
-    editor.update_in(cx, |editor, window, cx| {
-        editor.undo(&Default::default(), window, cx);
-    });
-    save(&editor, &project, cx).await;
-    assert_eq!("foo", editor.read_with(cx, |editor, cx| editor.text(cx)));
-
-    editor.update_in(cx, |editor, window, cx| {
-        editor.redo(&Default::default(), window, cx);
-    });
-    cx.run_until_parked();
-    assert_eq!("\nfoo", editor.read_with(cx, |editor, cx| editor.text(cx)));
-
-    async fn save(editor: &Entity<Editor>, project: &Entity<Project>, cx: &mut VisualTestContext) {
-        let save = editor
-            .update_in(cx, |editor, window, cx| {
-                editor.save(
-                    SaveOptions {
-                        format: true,
-                        autosave: false,
-                    },
-                    project.clone(),
-                    window,
-                    cx,
-                )
-            })
-            .unwrap();
-        cx.executor().start_waiting();
-        save.await;
-        assert!(!cx.read(|cx| editor.is_dirty(cx)));
-    }
-}
-
-#[gpui::test]
-async fn test_multibuffer_format_during_save(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let cols = 4;
-    let rows = 10;
-    let sample_text_1 = sample_text(rows, cols, 'a');
-    assert_eq!(
-        sample_text_1,
-        "aaaa\nbbbb\ncccc\ndddd\neeee\nffff\ngggg\nhhhh\niiii\njjjj"
-    );
-    let sample_text_2 = sample_text(rows, cols, 'l');
-    assert_eq!(
-        sample_text_2,
-        "llll\nmmmm\nnnnn\noooo\npppp\nqqqq\nrrrr\nssss\ntttt\nuuuu"
-    );
-    let sample_text_3 = sample_text(rows, cols, 'v');
-    assert_eq!(
-        sample_text_3,
-        "vvvv\nwwww\nxxxx\nyyyy\nzzzz\n{{{{\n||||\n}}}}\n~~~~\n\u{7f}\u{7f}\u{7f}\u{7f}"
-    );
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/a"),
-        json!({
-            "main.rs": sample_text_1,
-            "other.rs": sample_text_2,
-            "lib.rs": sample_text_3,
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace.deref(), cx);
-
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-    language_registry.add(rust_lang());
-    let mut fake_servers = language_registry.register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            capabilities: lsp::ServerCapabilities {
-                document_formatting_provider: Some(lsp::OneOf::Left(true)),
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-    );
-
-    let worktree = project.update(cx, |project, cx| {
-        let mut worktrees = project.worktrees(cx).collect::<Vec<_>>();
-        assert_eq!(worktrees.len(), 1);
-        worktrees.pop().unwrap()
-    });
-    let worktree_id = worktree.update(cx, |worktree, _| worktree.id());
-
-    let buffer_1 = project
-        .update(cx, |project, cx| {
-            project.open_buffer((worktree_id, rel_path("main.rs")), cx)
-        })
-        .await
-        .unwrap();
-    let buffer_2 = project
-        .update(cx, |project, cx| {
-            project.open_buffer((worktree_id, rel_path("other.rs")), cx)
-        })
-        .await
-        .unwrap();
-    let buffer_3 = project
-        .update(cx, |project, cx| {
-            project.open_buffer((worktree_id, rel_path("lib.rs")), cx)
-        })
-        .await
-        .unwrap();
-
-    let multi_buffer = cx.new(|cx| {
-        let mut multi_buffer = MultiBuffer::new(ReadWrite);
-        multi_buffer.push_excerpts(
-            buffer_1.clone(),
-            [
-                ExcerptRange::new(Point::new(0, 0)..Point::new(3, 0)),
-                ExcerptRange::new(Point::new(5, 0)..Point::new(7, 0)),
-                ExcerptRange::new(Point::new(9, 0)..Point::new(10, 4)),
-            ],
-            cx,
-        );
-        multi_buffer.push_excerpts(
-            buffer_2.clone(),
-            [
-                ExcerptRange::new(Point::new(0, 0)..Point::new(3, 0)),
-                ExcerptRange::new(Point::new(5, 0)..Point::new(7, 0)),
-                ExcerptRange::new(Point::new(9, 0)..Point::new(10, 4)),
-            ],
-            cx,
-        );
-        multi_buffer.push_excerpts(
-            buffer_3.clone(),
-            [
-                ExcerptRange::new(Point::new(0, 0)..Point::new(3, 0)),
-                ExcerptRange::new(Point::new(5, 0)..Point::new(7, 0)),
-                ExcerptRange::new(Point::new(9, 0)..Point::new(10, 4)),
-            ],
-            cx,
-        );
-        multi_buffer
-    });
-    let multi_buffer_editor = cx.new_window_entity(|window, cx| {
-        Editor::new(
-            EditorMode::full(),
-            multi_buffer,
-            Some(project.clone()),
-            window,
-            cx,
-        )
-    });
-
-    multi_buffer_editor.update_in(cx, |editor, window, cx| {
-        editor.change_selections(
-            SelectionEffects::scroll(Autoscroll::Next),
-            window,
-            cx,
-            |s| s.select_ranges(Some(MultiBufferOffset(1)..MultiBufferOffset(2))),
-        );
-        editor.insert("|one|two|three|", window, cx);
-    });
-    assert!(cx.read(|cx| multi_buffer_editor.is_dirty(cx)));
-    multi_buffer_editor.update_in(cx, |editor, window, cx| {
-        editor.change_selections(
-            SelectionEffects::scroll(Autoscroll::Next),
-            window,
-            cx,
-            |s| s.select_ranges(Some(MultiBufferOffset(60)..MultiBufferOffset(70))),
-        );
-        editor.insert("|four|five|six|", window, cx);
-    });
-    assert!(cx.read(|cx| multi_buffer_editor.is_dirty(cx)));
-
-    // First two buffers should be edited, but not the third one.
-    assert_eq!(
-        multi_buffer_editor.update(cx, |editor, cx| editor.text(cx)),
-        "a|one|two|three|aa\nbbbb\ncccc\n\nffff\ngggg\n\njjjj\nllll\nmmmm\nnnnn|four|five|six|\nr\n\nuuuu\nvvvv\nwwww\nxxxx\n\n{{{{\n||||\n\n\u{7f}\u{7f}\u{7f}\u{7f}",
-    );
-    buffer_1.update(cx, |buffer, _| {
-        assert!(buffer.is_dirty());
-        assert_eq!(
-            buffer.text(),
-            "a|one|two|three|aa\nbbbb\ncccc\ndddd\neeee\nffff\ngggg\nhhhh\niiii\njjjj",
-        )
-    });
-    buffer_2.update(cx, |buffer, _| {
-        assert!(buffer.is_dirty());
-        assert_eq!(
-            buffer.text(),
-            "llll\nmmmm\nnnnn|four|five|six|oooo\npppp\nr\nssss\ntttt\nuuuu",
-        )
-    });
-    buffer_3.update(cx, |buffer, _| {
-        assert!(!buffer.is_dirty());
-        assert_eq!(buffer.text(), sample_text_3,)
-    });
-    cx.executor().run_until_parked();
-
-    cx.executor().start_waiting();
-    let save = multi_buffer_editor
-        .update_in(cx, |editor, window, cx| {
-            editor.save(
-                SaveOptions {
-                    format: true,
-                    autosave: false,
-                },
-                project.clone(),
-                window,
-                cx,
-            )
-        })
-        .unwrap();
-
-    let fake_server = fake_servers.next().await.unwrap();
-    fake_server
-        .server
-        .on_request::<lsp::request::Formatting, _, _>(move |params, _| async move {
-            Ok(Some(vec![lsp::TextEdit::new(
-                lsp::Range::new(lsp::Position::new(0, 3), lsp::Position::new(1, 0)),
-                format!("[{} formatted]", params.text_document.uri),
-            )]))
-        })
-        .detach();
-    save.await;
-
-    // After multibuffer saving, only first two buffers should be reformatted, but not the third one (as it was not dirty).
-    assert!(cx.read(|cx| !multi_buffer_editor.is_dirty(cx)));
-    assert_eq!(
-        multi_buffer_editor.update(cx, |editor, cx| editor.text(cx)),
-        uri!(
-            "a|o[file:///a/main.rs formatted]bbbb\ncccc\n\nffff\ngggg\n\njjjj\n\nlll[file:///a/other.rs formatted]mmmm\nnnnn|four|five|six|\nr\n\nuuuu\n\nvvvv\nwwww\nxxxx\n\n{{{{\n||||\n\n\u{7f}\u{7f}\u{7f}\u{7f}"
-        ),
-    );
-    buffer_1.update(cx, |buffer, _| {
-        assert!(!buffer.is_dirty());
-        assert_eq!(
-            buffer.text(),
-            uri!("a|o[file:///a/main.rs formatted]bbbb\ncccc\ndddd\neeee\nffff\ngggg\nhhhh\niiii\njjjj\n"),
-        )
-    });
-    buffer_2.update(cx, |buffer, _| {
-        assert!(!buffer.is_dirty());
-        assert_eq!(
-            buffer.text(),
-            uri!("lll[file:///a/other.rs formatted]mmmm\nnnnn|four|five|six|oooo\npppp\nr\nssss\ntttt\nuuuu\n"),
-        )
-    });
-    buffer_3.update(cx, |buffer, _| {
-        assert!(!buffer.is_dirty());
-        assert_eq!(buffer.text(), sample_text_3,)
-    });
-}
-
-#[gpui::test]
-async fn test_autosave_with_dirty_buffers(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/dir"),
-        json!({
-            "file1.rs": "fn main() { println!(\"hello\"); }",
-            "file2.rs": "fn test() { println!(\"test\"); }",
-            "file3.rs": "fn other() { println!(\"other\"); }\n",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace.deref(), cx);
-
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-    language_registry.add(rust_lang());
-
-    let worktree = project.update(cx, |project, cx| project.worktrees(cx).next().unwrap());
-    let worktree_id = worktree.update(cx, |worktree, _| worktree.id());
-
-    // Open three buffers
-    let buffer_1 = project
-        .update(cx, |project, cx| {
-            project.open_buffer((worktree_id, rel_path("file1.rs")), cx)
-        })
-        .await
-        .unwrap();
-    let buffer_2 = project
-        .update(cx, |project, cx| {
-            project.open_buffer((worktree_id, rel_path("file2.rs")), cx)
-        })
-        .await
-        .unwrap();
-    let buffer_3 = project
-        .update(cx, |project, cx| {
-            project.open_buffer((worktree_id, rel_path("file3.rs")), cx)
-        })
-        .await
-        .unwrap();
-
-    // Create a multi-buffer with all three buffers
-    let multi_buffer = cx.new(|cx| {
-        let mut multi_buffer = MultiBuffer::new(ReadWrite);
-        multi_buffer.push_excerpts(
-            buffer_1.clone(),
-            [ExcerptRange::new(Point::new(0, 0)..Point::new(1, 0))],
-            cx,
-        );
-        multi_buffer.push_excerpts(
-            buffer_2.clone(),
-            [ExcerptRange::new(Point::new(0, 0)..Point::new(1, 0))],
-            cx,
-        );
-        multi_buffer.push_excerpts(
-            buffer_3.clone(),
-            [ExcerptRange::new(Point::new(0, 0)..Point::new(1, 0))],
-            cx,
-        );
-        multi_buffer
-    });
-
-    let editor = cx.new_window_entity(|window, cx| {
-        Editor::new(
-            EditorMode::full(),
-            multi_buffer,
-            Some(project.clone()),
-            window,
-            cx,
-        )
-    });
-
-    // Edit only the first buffer
-    editor.update_in(cx, |editor, window, cx| {
-        editor.change_selections(
-            SelectionEffects::scroll(Autoscroll::Next),
-            window,
-            cx,
-            |s| s.select_ranges(Some(MultiBufferOffset(10)..MultiBufferOffset(10))),
-        );
-        editor.insert("// edited", window, cx);
-    });
-
-    // Verify that only buffer 1 is dirty
-    buffer_1.update(cx, |buffer, _| assert!(buffer.is_dirty()));
-    buffer_2.update(cx, |buffer, _| assert!(!buffer.is_dirty()));
-    buffer_3.update(cx, |buffer, _| assert!(!buffer.is_dirty()));
-
-    // Get write counts after file creation (files were created with initial content)
-    // We expect each file to have been written once during creation
-    let write_count_after_creation_1 = fs.write_count_for_path(path!("/dir/file1.rs"));
-    let write_count_after_creation_2 = fs.write_count_for_path(path!("/dir/file2.rs"));
-    let write_count_after_creation_3 = fs.write_count_for_path(path!("/dir/file3.rs"));
-
-    // Perform autosave
-    let save_task = editor.update_in(cx, |editor, window, cx| {
-        editor.save(
-            SaveOptions {
-                format: true,
-                autosave: true,
-            },
-            project.clone(),
-            window,
-            cx,
-        )
-    });
-    save_task.await.unwrap();
-
-    // Only the dirty buffer should have been saved
-    assert_eq!(
-        fs.write_count_for_path(path!("/dir/file1.rs")) - write_count_after_creation_1,
-        1,
-        "Buffer 1 was dirty, so it should have been written once during autosave"
-    );
-    assert_eq!(
-        fs.write_count_for_path(path!("/dir/file2.rs")) - write_count_after_creation_2,
-        0,
-        "Buffer 2 was clean, so it should not have been written during autosave"
-    );
-    assert_eq!(
-        fs.write_count_for_path(path!("/dir/file3.rs")) - write_count_after_creation_3,
-        0,
-        "Buffer 3 was clean, so it should not have been written during autosave"
-    );
-
-    // Verify buffer states after autosave
-    buffer_1.update(cx, |buffer, _| assert!(!buffer.is_dirty()));
-    buffer_2.update(cx, |buffer, _| assert!(!buffer.is_dirty()));
-    buffer_3.update(cx, |buffer, _| assert!(!buffer.is_dirty()));
-
-    // Now perform a manual save (format = true)
-    let save_task = editor.update_in(cx, |editor, window, cx| {
-        editor.save(
-            SaveOptions {
-                format: true,
-                autosave: false,
-            },
-            project.clone(),
-            window,
-            cx,
-        )
-    });
-    save_task.await.unwrap();
-
-    // During manual save, clean buffers don't get written to disk
-    // They just get did_save called for language server notifications
-    assert_eq!(
-        fs.write_count_for_path(path!("/dir/file1.rs")) - write_count_after_creation_1,
-        1,
-        "Buffer 1 should only have been written once total (during autosave, not manual save)"
-    );
-    assert_eq!(
-        fs.write_count_for_path(path!("/dir/file2.rs")) - write_count_after_creation_2,
-        0,
-        "Buffer 2 should not have been written at all"
-    );
-    assert_eq!(
-        fs.write_count_for_path(path!("/dir/file3.rs")) - write_count_after_creation_3,
-        0,
-        "Buffer 3 should not have been written at all"
-    );
-}
-
-async fn setup_range_format_test(
-    cx: &mut TestAppContext,
-) -> (
-    Entity<Project>,
-    Entity<Editor>,
-    &mut gpui::VisualTestContext,
-    lsp::FakeLanguageServer,
-) {
-    init_test(cx, |_| {});
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_file(path!("/file.rs"), Default::default()).await;
-
-    let project = Project::test(fs, [path!("/").as_ref()], cx).await;
-
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-    language_registry.add(rust_lang());
-    let mut fake_servers = language_registry.register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            capabilities: lsp::ServerCapabilities {
-                document_range_formatting_provider: Some(lsp::OneOf::Left(true)),
-                ..lsp::ServerCapabilities::default()
-            },
-            ..FakeLspAdapter::default()
-        },
-    );
-
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer(path!("/file.rs"), cx)
-        })
-        .await
-        .unwrap();
-
-    let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-    let (editor, cx) = cx.add_window_view(|window, cx| {
-        build_editor_with_project(project.clone(), buffer, window, cx)
-    });
-
-    cx.executor().start_waiting();
-    let fake_server = fake_servers.next().await.unwrap();
-
-    (project, editor, cx, fake_server)
-}
-
-#[gpui::test]
-async fn test_range_format_on_save_success(cx: &mut TestAppContext) {
-    let (project, editor, cx, fake_server) = setup_range_format_test(cx).await;
-
-    editor.update_in(cx, |editor, window, cx| {
-        editor.set_text("one\ntwo\nthree\n", window, cx)
-    });
-    assert!(cx.read(|cx| editor.is_dirty(cx)));
-
-    let save = editor
-        .update_in(cx, |editor, window, cx| {
-            editor.save(
-                SaveOptions {
-                    format: true,
-                    autosave: false,
-                },
-                project.clone(),
-                window,
-                cx,
-            )
-        })
-        .unwrap();
-    fake_server
-        .set_request_handler::<lsp::request::RangeFormatting, _, _>(move |params, _| async move {
-            assert_eq!(
-                params.text_document.uri,
-                lsp::Uri::from_file_path(path!("/file.rs")).unwrap()
-            );
-            assert_eq!(params.options.tab_size, 4);
-            Ok(Some(vec![lsp::TextEdit::new(
-                lsp::Range::new(lsp::Position::new(0, 3), lsp::Position::new(1, 0)),
-                ", ".to_string(),
-            )]))
-        })
-        .next()
-        .await;
-    cx.executor().start_waiting();
-    save.await;
-    assert_eq!(
-        editor.update(cx, |editor, cx| editor.text(cx)),
-        "one, two\nthree\n"
-    );
-    assert!(!cx.read(|cx| editor.is_dirty(cx)));
-}
-
-#[gpui::test]
-async fn test_range_format_on_save_timeout(cx: &mut TestAppContext) {
-    let (project, editor, cx, fake_server) = setup_range_format_test(cx).await;
-
-    editor.update_in(cx, |editor, window, cx| {
-        editor.set_text("one\ntwo\nthree\n", window, cx)
-    });
-    assert!(cx.read(|cx| editor.is_dirty(cx)));
-
-    // Test that save still works when formatting hangs
-    fake_server.set_request_handler::<lsp::request::RangeFormatting, _, _>(
-        move |params, _| async move {
-            assert_eq!(
-                params.text_document.uri,
-                lsp::Uri::from_file_path(path!("/file.rs")).unwrap()
-            );
-            futures::future::pending::<()>().await;
-            unreachable!()
-        },
-    );
-    let save = editor
-        .update_in(cx, |editor, window, cx| {
-            editor.save(
-                SaveOptions {
-                    format: true,
-                    autosave: false,
-                },
-                project.clone(),
-                window,
-                cx,
-            )
-        })
-        .unwrap();
-    cx.executor().advance_clock(super::FORMAT_TIMEOUT);
-    cx.executor().start_waiting();
-    save.await;
-    assert_eq!(
-        editor.update(cx, |editor, cx| editor.text(cx)),
-        "one\ntwo\nthree\n"
-    );
-    assert!(!cx.read(|cx| editor.is_dirty(cx)));
-}
-
-#[gpui::test]
-async fn test_range_format_not_called_for_clean_buffer(cx: &mut TestAppContext) {
-    let (project, editor, cx, fake_server) = setup_range_format_test(cx).await;
-
-    // Buffer starts clean, no formatting should be requested
-    let save = editor
-        .update_in(cx, |editor, window, cx| {
-            editor.save(
-                SaveOptions {
-                    format: false,
-                    autosave: false,
-                },
-                project.clone(),
-                window,
-                cx,
-            )
-        })
-        .unwrap();
-    let _pending_format_request = fake_server
-        .set_request_handler::<lsp::request::RangeFormatting, _, _>(move |_, _| async move {
-            panic!("Should not be invoked");
-        })
-        .next();
-    cx.executor().start_waiting();
-    save.await;
-    cx.run_until_parked();
-}
-
-#[gpui::test]
-async fn test_range_format_respects_language_tab_size_override(cx: &mut TestAppContext) {
-    let (project, editor, cx, fake_server) = setup_range_format_test(cx).await;
-
-    // Set Rust language override and assert overridden tabsize is sent to language server
-    update_test_language_settings(cx, |settings| {
-        settings.languages.0.insert(
-            "Rust".into(),
-            LanguageSettingsContent {
-                tab_size: NonZeroU32::new(8),
-                ..Default::default()
-            },
-        );
-    });
-
-    editor.update_in(cx, |editor, window, cx| {
-        editor.set_text("something_new\n", window, cx)
-    });
-    assert!(cx.read(|cx| editor.is_dirty(cx)));
-    let save = editor
-        .update_in(cx, |editor, window, cx| {
-            editor.save(
-                SaveOptions {
-                    format: true,
-                    autosave: false,
-                },
-                project.clone(),
-                window,
-                cx,
-            )
-        })
-        .unwrap();
-    fake_server
-        .set_request_handler::<lsp::request::RangeFormatting, _, _>(move |params, _| async move {
-            assert_eq!(
-                params.text_document.uri,
-                lsp::Uri::from_file_path(path!("/file.rs")).unwrap()
-            );
-            assert_eq!(params.options.tab_size, 8);
-            Ok(Some(Vec::new()))
-        })
-        .next()
-        .await;
-    save.await;
-}
-
-#[gpui::test]
-async fn test_document_format_manual_trigger(cx: &mut TestAppContext) {
-    init_test(cx, |settings| {
-        settings.defaults.formatter = Some(FormatterList::Single(Formatter::LanguageServer(
-            settings::LanguageServerFormatterSpecifier::Current,
-        )))
-    });
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_file(path!("/file.rs"), Default::default()).await;
-
-    let project = Project::test(fs, [path!("/").as_ref()], cx).await;
-
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-    language_registry.add(Arc::new(Language::new(
-        LanguageConfig {
-            name: "Rust".into(),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["rs".to_string()],
-                ..Default::default()
-            },
-            ..LanguageConfig::default()
-        },
-        Some(tree_sitter_rust::LANGUAGE.into()),
-    )));
-    update_test_language_settings(cx, |settings| {
-        // Enable Prettier formatting for the same buffer, and ensure
-        // LSP is called instead of Prettier.
-        settings.defaults.prettier.get_or_insert_default().allowed = Some(true);
-    });
-    let mut fake_servers = language_registry.register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            capabilities: lsp::ServerCapabilities {
-                document_formatting_provider: Some(lsp::OneOf::Left(true)),
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-    );
-
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer(path!("/file.rs"), cx)
-        })
-        .await
-        .unwrap();
-
-    let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-    let (editor, cx) = cx.add_window_view(|window, cx| {
-        build_editor_with_project(project.clone(), buffer, window, cx)
-    });
-    editor.update_in(cx, |editor, window, cx| {
-        editor.set_text("one\ntwo\nthree\n", window, cx)
-    });
-
-    cx.executor().start_waiting();
-    let fake_server = fake_servers.next().await.unwrap();
-
-    let format = editor
-        .update_in(cx, |editor, window, cx| {
-            editor.perform_format(
-                project.clone(),
-                FormatTrigger::Manual,
-                FormatTarget::Buffers(editor.buffer().read(cx).all_buffers()),
-                window,
-                cx,
-            )
-        })
-        .unwrap();
-    fake_server
-        .set_request_handler::<lsp::request::Formatting, _, _>(move |params, _| async move {
-            assert_eq!(
-                params.text_document.uri,
-                lsp::Uri::from_file_path(path!("/file.rs")).unwrap()
-            );
-            assert_eq!(params.options.tab_size, 4);
-            Ok(Some(vec![lsp::TextEdit::new(
-                lsp::Range::new(lsp::Position::new(0, 3), lsp::Position::new(1, 0)),
-                ", ".to_string(),
-            )]))
-        })
-        .next()
-        .await;
-    cx.executor().start_waiting();
-    format.await;
-    assert_eq!(
-        editor.update(cx, |editor, cx| editor.text(cx)),
-        "one, two\nthree\n"
-    );
-
-    editor.update_in(cx, |editor, window, cx| {
-        editor.set_text("one\ntwo\nthree\n", window, cx)
-    });
-    // Ensure we don't lock if formatting hangs.
-    fake_server.set_request_handler::<lsp::request::Formatting, _, _>(
-        move |params, _| async move {
-            assert_eq!(
-                params.text_document.uri,
-                lsp::Uri::from_file_path(path!("/file.rs")).unwrap()
-            );
-            futures::future::pending::<()>().await;
-            unreachable!()
-        },
-    );
-    let format = editor
-        .update_in(cx, |editor, window, cx| {
-            editor.perform_format(
-                project,
-                FormatTrigger::Manual,
-                FormatTarget::Buffers(editor.buffer().read(cx).all_buffers()),
-                window,
-                cx,
-            )
-        })
-        .unwrap();
-    cx.executor().advance_clock(super::FORMAT_TIMEOUT);
-    cx.executor().start_waiting();
-    format.await;
-    assert_eq!(
-        editor.update(cx, |editor, cx| editor.text(cx)),
-        "one\ntwo\nthree\n"
-    );
-}
-
-#[gpui::test]
-async fn test_multiple_formatters(cx: &mut TestAppContext) {
-    init_test(cx, |settings| {
-        settings.defaults.remove_trailing_whitespace_on_save = Some(true);
-        settings.defaults.formatter = Some(FormatterList::Vec(vec![
-            Formatter::LanguageServer(settings::LanguageServerFormatterSpecifier::Current),
-            Formatter::CodeAction("code-action-1".into()),
-            Formatter::CodeAction("code-action-2".into()),
-        ]))
-    });
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_file(path!("/file.rs"), "one  \ntwo   \nthree".into())
-        .await;
-
-    let project = Project::test(fs, [path!("/").as_ref()], cx).await;
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-    language_registry.add(rust_lang());
-
-    let mut fake_servers = language_registry.register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            capabilities: lsp::ServerCapabilities {
-                document_formatting_provider: Some(lsp::OneOf::Left(true)),
-                execute_command_provider: Some(lsp::ExecuteCommandOptions {
-                    commands: vec!["the-command-for-code-action-1".into()],
-                    ..Default::default()
-                }),
-                code_action_provider: Some(lsp::CodeActionProviderCapability::Simple(true)),
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-    );
-
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer(path!("/file.rs"), cx)
-        })
-        .await
-        .unwrap();
-
-    let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-    let (editor, cx) = cx.add_window_view(|window, cx| {
-        build_editor_with_project(project.clone(), buffer, window, cx)
-    });
-
-    cx.executor().start_waiting();
-
-    let fake_server = fake_servers.next().await.unwrap();
-    fake_server.set_request_handler::<lsp::request::Formatting, _, _>(
-        move |_params, _| async move {
-            Ok(Some(vec![lsp::TextEdit::new(
-                lsp::Range::new(lsp::Position::new(0, 0), lsp::Position::new(0, 0)),
-                "applied-formatting\n".to_string(),
-            )]))
-        },
-    );
-    fake_server.set_request_handler::<lsp::request::CodeActionRequest, _, _>(
-        move |params, _| async move {
-            let requested_code_actions = params.context.only.expect("Expected code action request");
-            assert_eq!(requested_code_actions.len(), 1);
-
-            let uri = lsp::Uri::from_file_path(path!("/file.rs")).unwrap();
-            let code_action = match requested_code_actions[0].as_str() {
-                "code-action-1" => lsp::CodeAction {
-                    kind: Some("code-action-1".into()),
-                    edit: Some(lsp::WorkspaceEdit::new(
-                        [(
-                            uri,
-                            vec![lsp::TextEdit::new(
-                                lsp::Range::new(lsp::Position::new(0, 0), lsp::Position::new(0, 0)),
-                                "applied-code-action-1-edit\n".to_string(),
-                            )],
-                        )]
-                        .into_iter()
-                        .collect(),
-                    )),
-                    command: Some(lsp::Command {
-                        command: "the-command-for-code-action-1".into(),
-                        ..Default::default()
-                    }),
-                    ..Default::default()
-                },
-                "code-action-2" => lsp::CodeAction {
-                    kind: Some("code-action-2".into()),
-                    edit: Some(lsp::WorkspaceEdit::new(
-                        [(
-                            uri,
-                            vec![lsp::TextEdit::new(
-                                lsp::Range::new(lsp::Position::new(0, 0), lsp::Position::new(0, 0)),
-                                "applied-code-action-2-edit\n".to_string(),
-                            )],
-                        )]
-                        .into_iter()
-                        .collect(),
-                    )),
-                    ..Default::default()
-                },
-                req => panic!("Unexpected code action request: {:?}", req),
-            };
-            Ok(Some(vec![lsp::CodeActionOrCommand::CodeAction(
-                code_action,
-            )]))
-        },
-    );
-
-    fake_server.set_request_handler::<lsp::request::CodeActionResolveRequest, _, _>({
-        move |params, _| async move { Ok(params) }
-    });
-
-    let command_lock = Arc::new(futures::lock::Mutex::new(()));
-    fake_server.set_request_handler::<lsp::request::ExecuteCommand, _, _>({
-        let fake = fake_server.clone();
-        let lock = command_lock.clone();
-        move |params, _| {
-            assert_eq!(params.command, "the-command-for-code-action-1");
-            let fake = fake.clone();
-            let lock = lock.clone();
-            async move {
-                lock.lock().await;
-                fake.server
-                    .request::<lsp::request::ApplyWorkspaceEdit>(lsp::ApplyWorkspaceEditParams {
-                        label: None,
-                        edit: lsp::WorkspaceEdit {
-                            changes: Some(
-                                [(
-                                    lsp::Uri::from_file_path(path!("/file.rs")).unwrap(),
-                                    vec![lsp::TextEdit {
-                                        range: lsp::Range::new(
-                                            lsp::Position::new(0, 0),
-                                            lsp::Position::new(0, 0),
-                                        ),
-                                        new_text: "applied-code-action-1-command\n".into(),
-                                    }],
-                                )]
-                                .into_iter()
-                                .collect(),
-                            ),
-                            ..Default::default()
-                        },
-                    })
-                    .await
-                    .into_response()
-                    .unwrap();
-                Ok(Some(json!(null)))
-            }
-        }
-    });
-
-    cx.executor().start_waiting();
-    editor
-        .update_in(cx, |editor, window, cx| {
-            editor.perform_format(
-                project.clone(),
-                FormatTrigger::Manual,
-                FormatTarget::Buffers(editor.buffer().read(cx).all_buffers()),
-                window,
-                cx,
-            )
-        })
-        .unwrap()
-        .await;
-    editor.update(cx, |editor, cx| {
-        assert_eq!(
-            editor.text(cx),
-            r#"
-                applied-code-action-2-edit
-                applied-code-action-1-command
-                applied-code-action-1-edit
-                applied-formatting
-                one
-                two
-                three
-            "#
-            .unindent()
-        );
-    });
-
-    editor.update_in(cx, |editor, window, cx| {
-        editor.undo(&Default::default(), window, cx);
-        assert_eq!(editor.text(cx), "one  \ntwo   \nthree");
-    });
-
-    // Perform a manual edit while waiting for an LSP command
-    // that's being run as part of a formatting code action.
-    let lock_guard = command_lock.lock().await;
-    let format = editor
-        .update_in(cx, |editor, window, cx| {
-            editor.perform_format(
-                project.clone(),
-                FormatTrigger::Manual,
-                FormatTarget::Buffers(editor.buffer().read(cx).all_buffers()),
-                window,
-                cx,
-            )
-        })
-        .unwrap();
-    cx.run_until_parked();
-    editor.update(cx, |editor, cx| {
-        assert_eq!(
-            editor.text(cx),
-            r#"
-                applied-code-action-1-edit
-                applied-formatting
-                one
-                two
-                three
-            "#
-            .unindent()
-        );
-
-        editor.buffer.update(cx, |buffer, cx| {
-            let ix = buffer.len(cx);
-            buffer.edit([(ix..ix, "edited\n")], None, cx);
-        });
-    });
-
-    // Allow the LSP command to proceed. Because the buffer was edited,
-    // the second code action will not be run.
-    drop(lock_guard);
-    format.await;
-    editor.update_in(cx, |editor, window, cx| {
-        assert_eq!(
-            editor.text(cx),
-            r#"
-                applied-code-action-1-command
-                applied-code-action-1-edit
-                applied-formatting
-                one
-                two
-                three
-                edited
-            "#
-            .unindent()
-        );
-
-        // The manual edit is undone first, because it is the last thing the user did
-        // (even though the command completed afterwards).
-        editor.undo(&Default::default(), window, cx);
-        assert_eq!(
-            editor.text(cx),
-            r#"
-                applied-code-action-1-command
-                applied-code-action-1-edit
-                applied-formatting
-                one
-                two
-                three
-            "#
-            .unindent()
-        );
-
-        // All the formatting (including the command, which completed after the manual edit)
-        // is undone together.
-        editor.undo(&Default::default(), window, cx);
-        assert_eq!(editor.text(cx), "one  \ntwo   \nthree");
-    });
-}
-
-#[gpui::test]
-async fn test_organize_imports_manual_trigger(cx: &mut TestAppContext) {
-    init_test(cx, |settings| {
-        settings.defaults.formatter = Some(FormatterList::Vec(vec![Formatter::LanguageServer(
-            settings::LanguageServerFormatterSpecifier::Current,
-        )]))
-    });
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_file(path!("/file.ts"), Default::default()).await;
-
-    let project = Project::test(fs, [path!("/").as_ref()], cx).await;
-
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-    language_registry.add(Arc::new(Language::new(
-        LanguageConfig {
-            name: "TypeScript".into(),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["ts".to_string()],
-                ..Default::default()
-            },
-            ..LanguageConfig::default()
-        },
-        Some(tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into()),
-    )));
-    update_test_language_settings(cx, |settings| {
-        settings.defaults.prettier.get_or_insert_default().allowed = Some(true);
-    });
-    let mut fake_servers = language_registry.register_fake_lsp(
-        "TypeScript",
-        FakeLspAdapter {
-            capabilities: lsp::ServerCapabilities {
-                code_action_provider: Some(lsp::CodeActionProviderCapability::Simple(true)),
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-    );
-
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer(path!("/file.ts"), cx)
-        })
-        .await
-        .unwrap();
-
-    let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-    let (editor, cx) = cx.add_window_view(|window, cx| {
-        build_editor_with_project(project.clone(), buffer, window, cx)
-    });
-    editor.update_in(cx, |editor, window, cx| {
-        editor.set_text(
-            "import { a } from 'module';\nimport { b } from 'module';\n\nconst x = a;\n",
-            window,
-            cx,
-        )
-    });
-
-    cx.executor().start_waiting();
-    let fake_server = fake_servers.next().await.unwrap();
-
-    let format = editor
-        .update_in(cx, |editor, window, cx| {
-            editor.perform_code_action_kind(
-                project.clone(),
-                CodeActionKind::SOURCE_ORGANIZE_IMPORTS,
-                window,
-                cx,
-            )
-        })
-        .unwrap();
-    fake_server
-        .set_request_handler::<lsp::request::CodeActionRequest, _, _>(move |params, _| async move {
-            assert_eq!(
-                params.text_document.uri,
-                lsp::Uri::from_file_path(path!("/file.ts")).unwrap()
-            );
-            Ok(Some(vec![lsp::CodeActionOrCommand::CodeAction(
-                lsp::CodeAction {
-                    title: "Organize Imports".to_string(),
-                    kind: Some(lsp::CodeActionKind::SOURCE_ORGANIZE_IMPORTS),
-                    edit: Some(lsp::WorkspaceEdit {
-                        changes: Some(
-                            [(
-                                params.text_document.uri.clone(),
-                                vec![lsp::TextEdit::new(
-                                    lsp::Range::new(
-                                        lsp::Position::new(1, 0),
-                                        lsp::Position::new(2, 0),
-                                    ),
-                                    "".to_string(),
-                                )],
-                            )]
-                            .into_iter()
-                            .collect(),
-                        ),
-                        ..Default::default()
-                    }),
-                    ..Default::default()
-                },
-            )]))
-        })
-        .next()
-        .await;
-    cx.executor().start_waiting();
-    format.await;
-    assert_eq!(
-        editor.update(cx, |editor, cx| editor.text(cx)),
-        "import { a } from 'module';\n\nconst x = a;\n"
-    );
-
-    editor.update_in(cx, |editor, window, cx| {
-        editor.set_text(
-            "import { a } from 'module';\nimport { b } from 'module';\n\nconst x = a;\n",
-            window,
-            cx,
-        )
-    });
-    // Ensure we don't lock if code action hangs.
-    fake_server.set_request_handler::<lsp::request::CodeActionRequest, _, _>(
-        move |params, _| async move {
-            assert_eq!(
-                params.text_document.uri,
-                lsp::Uri::from_file_path(path!("/file.ts")).unwrap()
-            );
-            futures::future::pending::<()>().await;
-            unreachable!()
-        },
-    );
-    let format = editor
-        .update_in(cx, |editor, window, cx| {
-            editor.perform_code_action_kind(
-                project,
-                CodeActionKind::SOURCE_ORGANIZE_IMPORTS,
-                window,
-                cx,
-            )
-        })
-        .unwrap();
-    cx.executor().advance_clock(super::CODE_ACTION_TIMEOUT);
-    cx.executor().start_waiting();
-    format.await;
-    assert_eq!(
-        editor.update(cx, |editor, cx| editor.text(cx)),
-        "import { a } from 'module';\nimport { b } from 'module';\n\nconst x = a;\n"
-    );
-}
-
-#[gpui::test]
-async fn test_concurrent_format_requests(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorLspTestContext::new_rust(
-        lsp::ServerCapabilities {
-            document_formatting_provider: Some(lsp::OneOf::Left(true)),
-            ..Default::default()
-        },
-        cx,
-    )
-    .await;
-
-    cx.set_state(indoc! {"
-        one.twoˇ
-    "});
-
-    // The format request takes a long time. When it completes, it inserts
-    // a newline and an indent before the `.`
-    cx.lsp
-        .set_request_handler::<lsp::request::Formatting, _, _>(move |_, cx| {
-            let executor = cx.background_executor().clone();
-            async move {
-                executor.timer(Duration::from_millis(100)).await;
-                Ok(Some(vec![lsp::TextEdit {
-                    range: lsp::Range::new(lsp::Position::new(0, 3), lsp::Position::new(0, 3)),
-                    new_text: "\n    ".into(),
-                }]))
-            }
-        });
-
-    // Submit a format request.
-    let format_1 = cx
-        .update_editor(|editor, window, cx| editor.format(&Format, window, cx))
-        .unwrap();
-    cx.executor().run_until_parked();
-
-    // Submit a second format request.
-    let format_2 = cx
-        .update_editor(|editor, window, cx| editor.format(&Format, window, cx))
-        .unwrap();
-    cx.executor().run_until_parked();
-
-    // Wait for both format requests to complete
-    cx.executor().advance_clock(Duration::from_millis(200));
-    cx.executor().start_waiting();
-    format_1.await.unwrap();
-    cx.executor().start_waiting();
-    format_2.await.unwrap();
-
-    // The formatting edits only happens once.
-    cx.assert_editor_state(indoc! {"
-        one
-            .twoˇ
-    "});
-}
-
-#[gpui::test]
-async fn test_strip_whitespace_and_format_via_lsp(cx: &mut TestAppContext) {
-    init_test(cx, |settings| {
-        settings.defaults.formatter = Some(FormatterList::default())
-    });
-
-    let mut cx = EditorLspTestContext::new_rust(
-        lsp::ServerCapabilities {
-            document_formatting_provider: Some(lsp::OneOf::Left(true)),
-            ..Default::default()
-        },
-        cx,
-    )
-    .await;
-
-    // Record which buffer changes have been sent to the language server
-    let buffer_changes = Arc::new(Mutex::new(Vec::new()));
-    cx.lsp
-        .handle_notification::<lsp::notification::DidChangeTextDocument, _>({
-            let buffer_changes = buffer_changes.clone();
-            move |params, _| {
-                buffer_changes.lock().extend(
-                    params
-                        .content_changes
-                        .into_iter()
-                        .map(|e| (e.range.unwrap(), e.text)),
-                );
-            }
-        });
-    // Handle formatting requests to the language server.
-    cx.lsp
-        .set_request_handler::<lsp::request::Formatting, _, _>({
-            let buffer_changes = buffer_changes.clone();
-            move |_, _| {
-                let buffer_changes = buffer_changes.clone();
-                // Insert blank lines between each line of the buffer.
-                async move {
-                    // When formatting is requested, trailing whitespace has already been stripped,
-                    // and the trailing newline has already been added.
-                    assert_eq!(
-                        &buffer_changes.lock()[1..],
-                        &[
-                            (
-                                lsp::Range::new(lsp::Position::new(0, 3), lsp::Position::new(0, 4)),
-                                "".into()
-                            ),
-                            (
-                                lsp::Range::new(lsp::Position::new(2, 5), lsp::Position::new(2, 6)),
-                                "".into()
-                            ),
-                            (
-                                lsp::Range::new(lsp::Position::new(3, 4), lsp::Position::new(3, 4)),
-                                "\n".into()
-                            ),
-                        ]
-                    );
-
-                    Ok(Some(vec![
-                        lsp::TextEdit {
-                            range: lsp::Range::new(
-                                lsp::Position::new(1, 0),
-                                lsp::Position::new(1, 0),
-                            ),
-                            new_text: "\n".into(),
-                        },
-                        lsp::TextEdit {
-                            range: lsp::Range::new(
-                                lsp::Position::new(2, 0),
-                                lsp::Position::new(2, 0),
-                            ),
-                            new_text: "\n".into(),
-                        },
-                    ]))
-                }
-            }
-        });
-
-    // Set up a buffer white some trailing whitespace and no trailing newline.
-    cx.set_state(
-        &[
-            "one ",   //
-            "twoˇ",   //
-            "three ", //
-            "four",   //
-        ]
-        .join("\n"),
-    );
-    cx.run_until_parked();
-
-    // Submit a format request.
-    let format = cx
-        .update_editor(|editor, window, cx| editor.format(&Format, window, cx))
-        .unwrap();
-
-    cx.run_until_parked();
-    // After formatting the buffer, the trailing whitespace is stripped,
-    // a newline is appended, and the edits provided by the language server
-    // have been applied.
-    format.await.unwrap();
-
-    cx.assert_editor_state(
-        &[
-            "one",   //
-            "",      //
-            "twoˇ",  //
-            "",      //
-            "three", //
-            "four",  //
-            "",      //
-        ]
-        .join("\n"),
-    );
-
-    // Undoing the formatting undoes the trailing whitespace removal, the
-    // trailing newline, and the LSP edits.
-    cx.update_buffer(|buffer, cx| buffer.undo(cx));
-    cx.assert_editor_state(
-        &[
-            "one ",   //
-            "twoˇ",   //
-            "three ", //
-            "four",   //
-        ]
-        .join("\n"),
-    );
-}
-
-#[gpui::test]
-async fn test_handle_input_for_show_signature_help_auto_signature_help_true(
-    cx: &mut TestAppContext,
-) {
-    init_test(cx, |_| {});
-
-    cx.update(|cx| {
-        cx.update_global::<SettingsStore, _>(|settings, cx| {
-            settings.update_user_settings(cx, |settings| {
-                settings.editor.auto_signature_help = Some(true);
-            });
-        });
-    });
-
-    let mut cx = EditorLspTestContext::new_rust(
-        lsp::ServerCapabilities {
-            signature_help_provider: Some(lsp::SignatureHelpOptions {
-                ..Default::default()
-            }),
-            ..Default::default()
-        },
-        cx,
-    )
-    .await;
-
-    let language = Language::new(
-        LanguageConfig {
-            name: "Rust".into(),
-            brackets: BracketPairConfig {
-                pairs: vec![
-                    BracketPair {
-                        start: "{".to_string(),
-                        end: "}".to_string(),
-                        close: true,
-                        surround: true,
-                        newline: true,
-                    },
-                    BracketPair {
-                        start: "(".to_string(),
-                        end: ")".to_string(),
-                        close: true,
-                        surround: true,
-                        newline: true,
-                    },
-                    BracketPair {
-                        start: "/*".to_string(),
-                        end: " */".to_string(),
-                        close: true,
-                        surround: true,
-                        newline: true,
-                    },
-                    BracketPair {
-                        start: "[".to_string(),
-                        end: "]".to_string(),
-                        close: false,
-                        surround: false,
-                        newline: true,
-                    },
-                    BracketPair {
-                        start: "\"".to_string(),
-                        end: "\"".to_string(),
-                        close: true,
-                        surround: true,
-                        newline: false,
-                    },
-                    BracketPair {
-                        start: "<".to_string(),
-                        end: ">".to_string(),
-                        close: false,
-                        surround: true,
-                        newline: true,
-                    },
-                ],
-                ..Default::default()
-            },
-            autoclose_before: "})]".to_string(),
-            ..Default::default()
-        },
-        Some(tree_sitter_rust::LANGUAGE.into()),
-    );
-    let language = Arc::new(language);
-
-    cx.language_registry().add(language.clone());
-    cx.update_buffer(|buffer, cx| {
-        buffer.set_language(Some(language), cx);
-    });
-
-    cx.set_state(
-        &r#"
-            fn main() {
-                sampleˇ
-            }
-        "#
-        .unindent(),
-    );
-
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("(", window, cx);
-    });
-    cx.assert_editor_state(
-        &"
-            fn main() {
-                sample(ˇ)
-            }
-        "
-        .unindent(),
-    );
-
-    let mocked_response = lsp::SignatureHelp {
-        signatures: vec![lsp::SignatureInformation {
-            label: "fn sample(param1: u8, param2: u8)".to_string(),
-            documentation: None,
-            parameters: Some(vec![
-                lsp::ParameterInformation {
-                    label: lsp::ParameterLabel::Simple("param1: u8".to_string()),
-                    documentation: None,
-                },
-                lsp::ParameterInformation {
-                    label: lsp::ParameterLabel::Simple("param2: u8".to_string()),
-                    documentation: None,
-                },
-            ]),
-            active_parameter: None,
-        }],
-        active_signature: Some(0),
-        active_parameter: Some(0),
-    };
-    handle_signature_help_request(&mut cx, mocked_response).await;
-
-    cx.condition(|editor, _| editor.signature_help_state.is_shown())
-        .await;
-
-    cx.editor(|editor, _, _| {
-        let signature_help_state = editor.signature_help_state.popover().cloned();
-        let signature = signature_help_state.unwrap();
-        assert_eq!(
-            signature.signatures[signature.current_signature].label,
-            "fn sample(param1: u8, param2: u8)"
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_handle_input_with_different_show_signature_settings(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    cx.update(|cx| {
-        cx.update_global::<SettingsStore, _>(|settings, cx| {
-            settings.update_user_settings(cx, |settings| {
-                settings.editor.auto_signature_help = Some(false);
-                settings.editor.show_signature_help_after_edits = Some(false);
-            });
-        });
-    });
-
-    let mut cx = EditorLspTestContext::new_rust(
-        lsp::ServerCapabilities {
-            signature_help_provider: Some(lsp::SignatureHelpOptions {
-                ..Default::default()
-            }),
-            ..Default::default()
-        },
-        cx,
-    )
-    .await;
-
-    let language = Language::new(
-        LanguageConfig {
-            name: "Rust".into(),
-            brackets: BracketPairConfig {
-                pairs: vec![
-                    BracketPair {
-                        start: "{".to_string(),
-                        end: "}".to_string(),
-                        close: true,
-                        surround: true,
-                        newline: true,
-                    },
-                    BracketPair {
-                        start: "(".to_string(),
-                        end: ")".to_string(),
-                        close: true,
-                        surround: true,
-                        newline: true,
-                    },
-                    BracketPair {
-                        start: "/*".to_string(),
-                        end: " */".to_string(),
-                        close: true,
-                        surround: true,
-                        newline: true,
-                    },
-                    BracketPair {
-                        start: "[".to_string(),
-                        end: "]".to_string(),
-                        close: false,
-                        surround: false,
-                        newline: true,
-                    },
-                    BracketPair {
-                        start: "\"".to_string(),
-                        end: "\"".to_string(),
-                        close: true,
-                        surround: true,
-                        newline: false,
-                    },
-                    BracketPair {
-                        start: "<".to_string(),
-                        end: ">".to_string(),
-                        close: false,
-                        surround: true,
-                        newline: true,
-                    },
-                ],
-                ..Default::default()
-            },
-            autoclose_before: "})]".to_string(),
-            ..Default::default()
-        },
-        Some(tree_sitter_rust::LANGUAGE.into()),
-    );
-    let language = Arc::new(language);
-
-    cx.language_registry().add(language.clone());
-    cx.update_buffer(|buffer, cx| {
-        buffer.set_language(Some(language), cx);
-    });
-
-    // Ensure that signature_help is not called when no signature help is enabled.
-    cx.set_state(
-        &r#"
-            fn main() {
-                sampleˇ
-            }
-        "#
-        .unindent(),
-    );
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("(", window, cx);
-    });
-    cx.assert_editor_state(
-        &"
-            fn main() {
-                sample(ˇ)
-            }
-        "
-        .unindent(),
-    );
-    cx.editor(|editor, _, _| {
-        assert!(editor.signature_help_state.task().is_none());
-    });
-
-    let mocked_response = lsp::SignatureHelp {
-        signatures: vec![lsp::SignatureInformation {
-            label: "fn sample(param1: u8, param2: u8)".to_string(),
-            documentation: None,
-            parameters: Some(vec![
-                lsp::ParameterInformation {
-                    label: lsp::ParameterLabel::Simple("param1: u8".to_string()),
-                    documentation: None,
-                },
-                lsp::ParameterInformation {
-                    label: lsp::ParameterLabel::Simple("param2: u8".to_string()),
-                    documentation: None,
-                },
-            ]),
-            active_parameter: None,
-        }],
-        active_signature: Some(0),
-        active_parameter: Some(0),
-    };
-
-    // Ensure that signature_help is called when enabled afte edits
-    cx.update(|_, cx| {
-        cx.update_global::<SettingsStore, _>(|settings, cx| {
-            settings.update_user_settings(cx, |settings| {
-                settings.editor.auto_signature_help = Some(false);
-                settings.editor.show_signature_help_after_edits = Some(true);
-            });
-        });
-    });
-    cx.set_state(
-        &r#"
-            fn main() {
-                sampleˇ
-            }
-        "#
-        .unindent(),
-    );
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("(", window, cx);
-    });
-    cx.assert_editor_state(
-        &"
-            fn main() {
-                sample(ˇ)
-            }
-        "
-        .unindent(),
-    );
-    handle_signature_help_request(&mut cx, mocked_response.clone()).await;
-    cx.condition(|editor, _| editor.signature_help_state.is_shown())
-        .await;
-    cx.update_editor(|editor, _, _| {
-        let signature_help_state = editor.signature_help_state.popover().cloned();
-        assert!(signature_help_state.is_some());
-        let signature = signature_help_state.unwrap();
-        assert_eq!(
-            signature.signatures[signature.current_signature].label,
-            "fn sample(param1: u8, param2: u8)"
-        );
-        editor.signature_help_state = SignatureHelpState::default();
-    });
-
-    // Ensure that signature_help is called when auto signature help override is enabled
-    cx.update(|_, cx| {
-        cx.update_global::<SettingsStore, _>(|settings, cx| {
-            settings.update_user_settings(cx, |settings| {
-                settings.editor.auto_signature_help = Some(true);
-                settings.editor.show_signature_help_after_edits = Some(false);
-            });
-        });
-    });
-    cx.set_state(
-        &r#"
-            fn main() {
-                sampleˇ
-            }
-        "#
-        .unindent(),
-    );
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("(", window, cx);
-    });
-    cx.assert_editor_state(
-        &"
-            fn main() {
-                sample(ˇ)
-            }
-        "
-        .unindent(),
-    );
-    handle_signature_help_request(&mut cx, mocked_response).await;
-    cx.condition(|editor, _| editor.signature_help_state.is_shown())
-        .await;
-    cx.editor(|editor, _, _| {
-        let signature_help_state = editor.signature_help_state.popover().cloned();
-        assert!(signature_help_state.is_some());
-        let signature = signature_help_state.unwrap();
-        assert_eq!(
-            signature.signatures[signature.current_signature].label,
-            "fn sample(param1: u8, param2: u8)"
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_signature_help(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    cx.update(|cx| {
-        cx.update_global::<SettingsStore, _>(|settings, cx| {
-            settings.update_user_settings(cx, |settings| {
-                settings.editor.auto_signature_help = Some(true);
-            });
-        });
-    });
-
-    let mut cx = EditorLspTestContext::new_rust(
-        lsp::ServerCapabilities {
-            signature_help_provider: Some(lsp::SignatureHelpOptions {
-                ..Default::default()
-            }),
-            ..Default::default()
-        },
-        cx,
-    )
-    .await;
-
-    // A test that directly calls `show_signature_help`
-    cx.update_editor(|editor, window, cx| {
-        editor.show_signature_help(&ShowSignatureHelp, window, cx);
-    });
-
-    let mocked_response = lsp::SignatureHelp {
-        signatures: vec![lsp::SignatureInformation {
-            label: "fn sample(param1: u8, param2: u8)".to_string(),
-            documentation: None,
-            parameters: Some(vec![
-                lsp::ParameterInformation {
-                    label: lsp::ParameterLabel::Simple("param1: u8".to_string()),
-                    documentation: None,
-                },
-                lsp::ParameterInformation {
-                    label: lsp::ParameterLabel::Simple("param2: u8".to_string()),
-                    documentation: None,
-                },
-            ]),
-            active_parameter: None,
-        }],
-        active_signature: Some(0),
-        active_parameter: Some(0),
-    };
-    handle_signature_help_request(&mut cx, mocked_response).await;
-
-    cx.condition(|editor, _| editor.signature_help_state.is_shown())
-        .await;
-
-    cx.editor(|editor, _, _| {
-        let signature_help_state = editor.signature_help_state.popover().cloned();
-        assert!(signature_help_state.is_some());
-        let signature = signature_help_state.unwrap();
-        assert_eq!(
-            signature.signatures[signature.current_signature].label,
-            "fn sample(param1: u8, param2: u8)"
-        );
-    });
-
-    // When exiting outside from inside the brackets, `signature_help` is closed.
-    cx.set_state(indoc! {"
-        fn main() {
-            sample(ˇ);
-        }
-
-        fn sample(param1: u8, param2: u8) {}
-    "});
-
-    cx.update_editor(|editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([MultiBufferOffset(0)..MultiBufferOffset(0)])
-        });
-    });
-
-    let mocked_response = lsp::SignatureHelp {
-        signatures: Vec::new(),
-        active_signature: None,
-        active_parameter: None,
-    };
-    handle_signature_help_request(&mut cx, mocked_response).await;
-
-    cx.condition(|editor, _| !editor.signature_help_state.is_shown())
-        .await;
-
-    cx.editor(|editor, _, _| {
-        assert!(!editor.signature_help_state.is_shown());
-    });
-
-    // When entering inside the brackets from outside, `show_signature_help` is automatically called.
-    cx.set_state(indoc! {"
-        fn main() {
-            sample(ˇ);
-        }
-
-        fn sample(param1: u8, param2: u8) {}
-    "});
-
-    let mocked_response = lsp::SignatureHelp {
-        signatures: vec![lsp::SignatureInformation {
-            label: "fn sample(param1: u8, param2: u8)".to_string(),
-            documentation: None,
-            parameters: Some(vec![
-                lsp::ParameterInformation {
-                    label: lsp::ParameterLabel::Simple("param1: u8".to_string()),
-                    documentation: None,
-                },
-                lsp::ParameterInformation {
-                    label: lsp::ParameterLabel::Simple("param2: u8".to_string()),
-                    documentation: None,
-                },
-            ]),
-            active_parameter: None,
-        }],
-        active_signature: Some(0),
-        active_parameter: Some(0),
-    };
-    handle_signature_help_request(&mut cx, mocked_response.clone()).await;
-    cx.condition(|editor, _| editor.signature_help_state.is_shown())
-        .await;
-    cx.editor(|editor, _, _| {
-        assert!(editor.signature_help_state.is_shown());
-    });
-
-    // Restore the popover with more parameter input
-    cx.set_state(indoc! {"
-        fn main() {
-            sample(param1, param2ˇ);
-        }
-
-        fn sample(param1: u8, param2: u8) {}
-    "});
-
-    let mocked_response = lsp::SignatureHelp {
-        signatures: vec![lsp::SignatureInformation {
-            label: "fn sample(param1: u8, param2: u8)".to_string(),
-            documentation: None,
-            parameters: Some(vec![
-                lsp::ParameterInformation {
-                    label: lsp::ParameterLabel::Simple("param1: u8".to_string()),
-                    documentation: None,
-                },
-                lsp::ParameterInformation {
-                    label: lsp::ParameterLabel::Simple("param2: u8".to_string()),
-                    documentation: None,
-                },
-            ]),
-            active_parameter: None,
-        }],
-        active_signature: Some(0),
-        active_parameter: Some(1),
-    };
-    handle_signature_help_request(&mut cx, mocked_response.clone()).await;
-    cx.condition(|editor, _| editor.signature_help_state.is_shown())
-        .await;
-
-    // When selecting a range, the popover is gone.
-    // Avoid using `cx.set_state` to not actually edit the document, just change its selections.
-    cx.update_editor(|editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges(Some(Point::new(1, 25)..Point::new(1, 19)));
-        })
-    });
-    cx.assert_editor_state(indoc! {"
-        fn main() {
-            sample(param1, «ˇparam2»);
-        }
-
-        fn sample(param1: u8, param2: u8) {}
-    "});
-    cx.editor(|editor, _, _| {
-        assert!(!editor.signature_help_state.is_shown());
-    });
-
-    // When unselecting again, the popover is back if within the brackets.
-    cx.update_editor(|editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges(Some(Point::new(1, 19)..Point::new(1, 19)));
-        })
-    });
-    cx.assert_editor_state(indoc! {"
-        fn main() {
-            sample(param1, ˇparam2);
-        }
-
-        fn sample(param1: u8, param2: u8) {}
-    "});
-    handle_signature_help_request(&mut cx, mocked_response).await;
-    cx.condition(|editor, _| editor.signature_help_state.is_shown())
-        .await;
-    cx.editor(|editor, _, _| {
-        assert!(editor.signature_help_state.is_shown());
-    });
-
-    // Test to confirm that SignatureHelp does not appear after deselecting multiple ranges when it was hidden by pressing Escape.
-    cx.update_editor(|editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges(Some(Point::new(0, 0)..Point::new(0, 0)));
-            s.select_ranges(Some(Point::new(1, 19)..Point::new(1, 19)));
-        })
-    });
-    cx.assert_editor_state(indoc! {"
-        fn main() {
-            sample(param1, ˇparam2);
-        }
-
-        fn sample(param1: u8, param2: u8) {}
-    "});
-
-    let mocked_response = lsp::SignatureHelp {
-        signatures: vec![lsp::SignatureInformation {
-            label: "fn sample(param1: u8, param2: u8)".to_string(),
-            documentation: None,
-            parameters: Some(vec![
-                lsp::ParameterInformation {
-                    label: lsp::ParameterLabel::Simple("param1: u8".to_string()),
-                    documentation: None,
-                },
-                lsp::ParameterInformation {
-                    label: lsp::ParameterLabel::Simple("param2: u8".to_string()),
-                    documentation: None,
-                },
-            ]),
-            active_parameter: None,
-        }],
-        active_signature: Some(0),
-        active_parameter: Some(1),
-    };
-    handle_signature_help_request(&mut cx, mocked_response.clone()).await;
-    cx.condition(|editor, _| editor.signature_help_state.is_shown())
-        .await;
-    cx.update_editor(|editor, _, cx| {
-        editor.hide_signature_help(cx, SignatureHelpHiddenBy::Escape);
-    });
-    cx.condition(|editor, _| !editor.signature_help_state.is_shown())
-        .await;
-    cx.update_editor(|editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges(Some(Point::new(1, 25)..Point::new(1, 19)));
-        })
-    });
-    cx.assert_editor_state(indoc! {"
-        fn main() {
-            sample(param1, «ˇparam2»);
-        }
-
-        fn sample(param1: u8, param2: u8) {}
-    "});
-    cx.update_editor(|editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges(Some(Point::new(1, 19)..Point::new(1, 19)));
-        })
-    });
-    cx.assert_editor_state(indoc! {"
-        fn main() {
-            sample(param1, ˇparam2);
-        }
-
-        fn sample(param1: u8, param2: u8) {}
-    "});
-    cx.condition(|editor, _| !editor.signature_help_state.is_shown()) // because hidden by escape
-        .await;
-}
-
-#[gpui::test]
-async fn test_signature_help_multiple_signatures(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorLspTestContext::new_rust(
-        lsp::ServerCapabilities {
-            signature_help_provider: Some(lsp::SignatureHelpOptions {
-                ..Default::default()
-            }),
-            ..Default::default()
-        },
-        cx,
-    )
-    .await;
-
-    cx.set_state(indoc! {"
-        fn main() {
-            overloadedˇ
-        }
-    "});
-
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("(", window, cx);
-        editor.show_signature_help(&ShowSignatureHelp, window, cx);
-    });
-
-    // Mock response with 3 signatures
-    let mocked_response = lsp::SignatureHelp {
-        signatures: vec![
-            lsp::SignatureInformation {
-                label: "fn overloaded(x: i32)".to_string(),
-                documentation: None,
-                parameters: Some(vec![lsp::ParameterInformation {
-                    label: lsp::ParameterLabel::Simple("x: i32".to_string()),
-                    documentation: None,
-                }]),
-                active_parameter: None,
-            },
-            lsp::SignatureInformation {
-                label: "fn overloaded(x: i32, y: i32)".to_string(),
-                documentation: None,
-                parameters: Some(vec![
-                    lsp::ParameterInformation {
-                        label: lsp::ParameterLabel::Simple("x: i32".to_string()),
-                        documentation: None,
-                    },
-                    lsp::ParameterInformation {
-                        label: lsp::ParameterLabel::Simple("y: i32".to_string()),
-                        documentation: None,
-                    },
-                ]),
-                active_parameter: None,
-            },
-            lsp::SignatureInformation {
-                label: "fn overloaded(x: i32, y: i32, z: i32)".to_string(),
-                documentation: None,
-                parameters: Some(vec![
-                    lsp::ParameterInformation {
-                        label: lsp::ParameterLabel::Simple("x: i32".to_string()),
-                        documentation: None,
-                    },
-                    lsp::ParameterInformation {
-                        label: lsp::ParameterLabel::Simple("y: i32".to_string()),
-                        documentation: None,
-                    },
-                    lsp::ParameterInformation {
-                        label: lsp::ParameterLabel::Simple("z: i32".to_string()),
-                        documentation: None,
-                    },
-                ]),
-                active_parameter: None,
-            },
-        ],
-        active_signature: Some(1),
-        active_parameter: Some(0),
-    };
-    handle_signature_help_request(&mut cx, mocked_response).await;
-
-    cx.condition(|editor, _| editor.signature_help_state.is_shown())
-        .await;
-
-    // Verify we have multiple signatures and the right one is selected
-    cx.editor(|editor, _, _| {
-        let popover = editor.signature_help_state.popover().cloned().unwrap();
-        assert_eq!(popover.signatures.len(), 3);
-        // active_signature was 1, so that should be the current
-        assert_eq!(popover.current_signature, 1);
-        assert_eq!(popover.signatures[0].label, "fn overloaded(x: i32)");
-        assert_eq!(popover.signatures[1].label, "fn overloaded(x: i32, y: i32)");
-        assert_eq!(
-            popover.signatures[2].label,
-            "fn overloaded(x: i32, y: i32, z: i32)"
-        );
-    });
-
-    // Test navigation functionality
-    cx.update_editor(|editor, window, cx| {
-        editor.signature_help_next(&crate::SignatureHelpNext, window, cx);
-    });
-
-    cx.editor(|editor, _, _| {
-        let popover = editor.signature_help_state.popover().cloned().unwrap();
-        assert_eq!(popover.current_signature, 2);
-    });
-
-    // Test wrap around
-    cx.update_editor(|editor, window, cx| {
-        editor.signature_help_next(&crate::SignatureHelpNext, window, cx);
-    });
-
-    cx.editor(|editor, _, _| {
-        let popover = editor.signature_help_state.popover().cloned().unwrap();
-        assert_eq!(popover.current_signature, 0);
-    });
-
-    // Test previous navigation
-    cx.update_editor(|editor, window, cx| {
-        editor.signature_help_prev(&crate::SignatureHelpPrevious, window, cx);
-    });
-
-    cx.editor(|editor, _, _| {
-        let popover = editor.signature_help_state.popover().cloned().unwrap();
-        assert_eq!(popover.current_signature, 2);
-    });
-}
-
-#[gpui::test]
-async fn test_completion_mode(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    let mut cx = EditorLspTestContext::new_rust(
-        lsp::ServerCapabilities {
-            completion_provider: Some(lsp::CompletionOptions {
-                resolve_provider: Some(true),
-                ..Default::default()
-            }),
-            ..Default::default()
-        },
-        cx,
-    )
-    .await;
-
-    struct Run {
-        run_description: &'static str,
-        initial_state: String,
-        buffer_marked_text: String,
-        completion_label: &'static str,
-        completion_text: &'static str,
-        expected_with_insert_mode: String,
-        expected_with_replace_mode: String,
-        expected_with_replace_subsequence_mode: String,
-        expected_with_replace_suffix_mode: String,
-    }
-
-    let runs = [
-        Run {
-            run_description: "Start of word matches completion text",
-            initial_state: "before ediˇ after".into(),
-            buffer_marked_text: "before <edi|> after".into(),
-            completion_label: "editor",
-            completion_text: "editor",
-            expected_with_insert_mode: "before editorˇ after".into(),
-            expected_with_replace_mode: "before editorˇ after".into(),
-            expected_with_replace_subsequence_mode: "before editorˇ after".into(),
-            expected_with_replace_suffix_mode: "before editorˇ after".into(),
-        },
-        Run {
-            run_description: "Accept same text at the middle of the word",
-            initial_state: "before ediˇtor after".into(),
-            buffer_marked_text: "before <edi|tor> after".into(),
-            completion_label: "editor",
-            completion_text: "editor",
-            expected_with_insert_mode: "before editorˇtor after".into(),
-            expected_with_replace_mode: "before editorˇ after".into(),
-            expected_with_replace_subsequence_mode: "before editorˇ after".into(),
-            expected_with_replace_suffix_mode: "before editorˇ after".into(),
-        },
-        Run {
-            run_description: "End of word matches completion text -- cursor at end",
-            initial_state: "before torˇ after".into(),
-            buffer_marked_text: "before <tor|> after".into(),
-            completion_label: "editor",
-            completion_text: "editor",
-            expected_with_insert_mode: "before editorˇ after".into(),
-            expected_with_replace_mode: "before editorˇ after".into(),
-            expected_with_replace_subsequence_mode: "before editorˇ after".into(),
-            expected_with_replace_suffix_mode: "before editorˇ after".into(),
-        },
-        Run {
-            run_description: "End of word matches completion text -- cursor at start",
-            initial_state: "before ˇtor after".into(),
-            buffer_marked_text: "before <|tor> after".into(),
-            completion_label: "editor",
-            completion_text: "editor",
-            expected_with_insert_mode: "before editorˇtor after".into(),
-            expected_with_replace_mode: "before editorˇ after".into(),
-            expected_with_replace_subsequence_mode: "before editorˇ after".into(),
-            expected_with_replace_suffix_mode: "before editorˇ after".into(),
-        },
-        Run {
-            run_description: "Prepend text containing whitespace",
-            initial_state: "pˇfield: bool".into(),
-            buffer_marked_text: "<p|field>: bool".into(),
-            completion_label: "pub ",
-            completion_text: "pub ",
-            expected_with_insert_mode: "pub ˇfield: bool".into(),
-            expected_with_replace_mode: "pub ˇ: bool".into(),
-            expected_with_replace_subsequence_mode: "pub ˇfield: bool".into(),
-            expected_with_replace_suffix_mode: "pub ˇfield: bool".into(),
-        },
-        Run {
-            run_description: "Add element to start of list",
-            initial_state: "[element_ˇelement_2]".into(),
-            buffer_marked_text: "[<element_|element_2>]".into(),
-            completion_label: "element_1",
-            completion_text: "element_1",
-            expected_with_insert_mode: "[element_1ˇelement_2]".into(),
-            expected_with_replace_mode: "[element_1ˇ]".into(),
-            expected_with_replace_subsequence_mode: "[element_1ˇelement_2]".into(),
-            expected_with_replace_suffix_mode: "[element_1ˇelement_2]".into(),
-        },
-        Run {
-            run_description: "Add element to start of list -- first and second elements are equal",
-            initial_state: "[elˇelement]".into(),
-            buffer_marked_text: "[<el|element>]".into(),
-            completion_label: "element",
-            completion_text: "element",
-            expected_with_insert_mode: "[elementˇelement]".into(),
-            expected_with_replace_mode: "[elementˇ]".into(),
-            expected_with_replace_subsequence_mode: "[elementˇelement]".into(),
-            expected_with_replace_suffix_mode: "[elementˇ]".into(),
-        },
-        Run {
-            run_description: "Ends with matching suffix",
-            initial_state: "SubˇError".into(),
-            buffer_marked_text: "<Sub|Error>".into(),
-            completion_label: "SubscriptionError",
-            completion_text: "SubscriptionError",
-            expected_with_insert_mode: "SubscriptionErrorˇError".into(),
-            expected_with_replace_mode: "SubscriptionErrorˇ".into(),
-            expected_with_replace_subsequence_mode: "SubscriptionErrorˇ".into(),
-            expected_with_replace_suffix_mode: "SubscriptionErrorˇ".into(),
-        },
-        Run {
-            run_description: "Suffix is a subsequence -- contiguous",
-            initial_state: "SubˇErr".into(),
-            buffer_marked_text: "<Sub|Err>".into(),
-            completion_label: "SubscriptionError",
-            completion_text: "SubscriptionError",
-            expected_with_insert_mode: "SubscriptionErrorˇErr".into(),
-            expected_with_replace_mode: "SubscriptionErrorˇ".into(),
-            expected_with_replace_subsequence_mode: "SubscriptionErrorˇ".into(),
-            expected_with_replace_suffix_mode: "SubscriptionErrorˇErr".into(),
-        },
-        Run {
-            run_description: "Suffix is a subsequence -- non-contiguous -- replace intended",
-            initial_state: "Suˇscrirr".into(),
-            buffer_marked_text: "<Su|scrirr>".into(),
-            completion_label: "SubscriptionError",
-            completion_text: "SubscriptionError",
-            expected_with_insert_mode: "SubscriptionErrorˇscrirr".into(),
-            expected_with_replace_mode: "SubscriptionErrorˇ".into(),
-            expected_with_replace_subsequence_mode: "SubscriptionErrorˇ".into(),
-            expected_with_replace_suffix_mode: "SubscriptionErrorˇscrirr".into(),
-        },
-        Run {
-            run_description: "Suffix is a subsequence -- non-contiguous -- replace unintended",
-            initial_state: "foo(indˇix)".into(),
-            buffer_marked_text: "foo(<ind|ix>)".into(),
-            completion_label: "node_index",
-            completion_text: "node_index",
-            expected_with_insert_mode: "foo(node_indexˇix)".into(),
-            expected_with_replace_mode: "foo(node_indexˇ)".into(),
-            expected_with_replace_subsequence_mode: "foo(node_indexˇix)".into(),
-            expected_with_replace_suffix_mode: "foo(node_indexˇix)".into(),
-        },
-        Run {
-            run_description: "Replace range ends before cursor - should extend to cursor",
-            initial_state: "before editˇo after".into(),
-            buffer_marked_text: "before <{ed}>it|o after".into(),
-            completion_label: "editor",
-            completion_text: "editor",
-            expected_with_insert_mode: "before editorˇo after".into(),
-            expected_with_replace_mode: "before editorˇo after".into(),
-            expected_with_replace_subsequence_mode: "before editorˇo after".into(),
-            expected_with_replace_suffix_mode: "before editorˇo after".into(),
-        },
-        Run {
-            run_description: "Uses label for suffix matching",
-            initial_state: "before ediˇtor after".into(),
-            buffer_marked_text: "before <edi|tor> after".into(),
-            completion_label: "editor",
-            completion_text: "editor()",
-            expected_with_insert_mode: "before editor()ˇtor after".into(),
-            expected_with_replace_mode: "before editor()ˇ after".into(),
-            expected_with_replace_subsequence_mode: "before editor()ˇ after".into(),
-            expected_with_replace_suffix_mode: "before editor()ˇ after".into(),
-        },
-        Run {
-            run_description: "Case insensitive subsequence and suffix matching",
-            initial_state: "before EDiˇtoR after".into(),
-            buffer_marked_text: "before <EDi|toR> after".into(),
-            completion_label: "editor",
-            completion_text: "editor",
-            expected_with_insert_mode: "before editorˇtoR after".into(),
-            expected_with_replace_mode: "before editorˇ after".into(),
-            expected_with_replace_subsequence_mode: "before editorˇ after".into(),
-            expected_with_replace_suffix_mode: "before editorˇ after".into(),
-        },
-    ];
-
-    for run in runs {
-        let run_variations = [
-            (LspInsertMode::Insert, run.expected_with_insert_mode),
-            (LspInsertMode::Replace, run.expected_with_replace_mode),
-            (
-                LspInsertMode::ReplaceSubsequence,
-                run.expected_with_replace_subsequence_mode,
-            ),
-            (
-                LspInsertMode::ReplaceSuffix,
-                run.expected_with_replace_suffix_mode,
-            ),
-        ];
-
-        for (lsp_insert_mode, expected_text) in run_variations {
-            eprintln!(
-                "run = {:?}, mode = {lsp_insert_mode:.?}",
-                run.run_description,
-            );
-
-            update_test_language_settings(&mut cx, |settings| {
-                settings.defaults.completions = Some(CompletionSettingsContent {
-                    lsp_insert_mode: Some(lsp_insert_mode),
-                    words: Some(WordsCompletionMode::Disabled),
-                    words_min_length: Some(0),
-                    ..Default::default()
-                });
-            });
-
-            cx.set_state(&run.initial_state);
-            cx.update_editor(|editor, window, cx| {
-                editor.show_completions(&ShowCompletions, window, cx);
-            });
-
-            let counter = Arc::new(AtomicUsize::new(0));
-            handle_completion_request_with_insert_and_replace(
-                &mut cx,
-                &run.buffer_marked_text,
-                vec![(run.completion_label, run.completion_text)],
-                counter.clone(),
-            )
-            .await;
-            cx.condition(|editor, _| editor.context_menu_visible())
-                .await;
-            assert_eq!(counter.load(atomic::Ordering::Acquire), 1);
-
-            let apply_additional_edits = cx.update_editor(|editor, window, cx| {
-                editor
-                    .confirm_completion(&ConfirmCompletion::default(), window, cx)
-                    .unwrap()
-            });
-            cx.assert_editor_state(&expected_text);
-            handle_resolve_completion_request(&mut cx, None).await;
-            apply_additional_edits.await.unwrap();
-        }
-    }
-}
-
-#[gpui::test]
-async fn test_completion_with_mode_specified_by_action(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    let mut cx = EditorLspTestContext::new_rust(
-        lsp::ServerCapabilities {
-            completion_provider: Some(lsp::CompletionOptions {
-                resolve_provider: Some(true),
-                ..Default::default()
-            }),
-            ..Default::default()
-        },
-        cx,
-    )
-    .await;
-
-    let initial_state = "SubˇError";
-    let buffer_marked_text = "<Sub|Error>";
-    let completion_text = "SubscriptionError";
-    let expected_with_insert_mode = "SubscriptionErrorˇError";
-    let expected_with_replace_mode = "SubscriptionErrorˇ";
-
-    update_test_language_settings(&mut cx, |settings| {
-        settings.defaults.completions = Some(CompletionSettingsContent {
-            words: Some(WordsCompletionMode::Disabled),
-            words_min_length: Some(0),
-            // set the opposite here to ensure that the action is overriding the default behavior
-            lsp_insert_mode: Some(LspInsertMode::Insert),
-            ..Default::default()
-        });
-    });
-
-    cx.set_state(initial_state);
-    cx.update_editor(|editor, window, cx| {
-        editor.show_completions(&ShowCompletions, window, cx);
-    });
-
-    let counter = Arc::new(AtomicUsize::new(0));
-    handle_completion_request_with_insert_and_replace(
-        &mut cx,
-        buffer_marked_text,
-        vec![(completion_text, completion_text)],
-        counter.clone(),
-    )
-    .await;
-    cx.condition(|editor, _| editor.context_menu_visible())
-        .await;
-    assert_eq!(counter.load(atomic::Ordering::Acquire), 1);
-
-    let apply_additional_edits = cx.update_editor(|editor, window, cx| {
-        editor
-            .confirm_completion_replace(&ConfirmCompletionReplace, window, cx)
-            .unwrap()
-    });
-    cx.assert_editor_state(expected_with_replace_mode);
-    handle_resolve_completion_request(&mut cx, None).await;
-    apply_additional_edits.await.unwrap();
-
-    update_test_language_settings(&mut cx, |settings| {
-        settings.defaults.completions = Some(CompletionSettingsContent {
-            words: Some(WordsCompletionMode::Disabled),
-            words_min_length: Some(0),
-            // set the opposite here to ensure that the action is overriding the default behavior
-            lsp_insert_mode: Some(LspInsertMode::Replace),
-            ..Default::default()
-        });
-    });
-
-    cx.set_state(initial_state);
-    cx.update_editor(|editor, window, cx| {
-        editor.show_completions(&ShowCompletions, window, cx);
-    });
-    handle_completion_request_with_insert_and_replace(
-        &mut cx,
-        buffer_marked_text,
-        vec![(completion_text, completion_text)],
-        counter.clone(),
-    )
-    .await;
-    cx.condition(|editor, _| editor.context_menu_visible())
-        .await;
-    assert_eq!(counter.load(atomic::Ordering::Acquire), 2);
-
-    let apply_additional_edits = cx.update_editor(|editor, window, cx| {
-        editor
-            .confirm_completion_insert(&ConfirmCompletionInsert, window, cx)
-            .unwrap()
-    });
-    cx.assert_editor_state(expected_with_insert_mode);
-    handle_resolve_completion_request(&mut cx, None).await;
-    apply_additional_edits.await.unwrap();
-}
-
-#[gpui::test]
-async fn test_completion_replacing_surrounding_text_with_multicursors(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    let mut cx = EditorLspTestContext::new_rust(
-        lsp::ServerCapabilities {
-            completion_provider: Some(lsp::CompletionOptions {
-                resolve_provider: Some(true),
-                ..Default::default()
-            }),
-            ..Default::default()
-        },
-        cx,
-    )
-    .await;
-
-    // scenario: surrounding text matches completion text
-    let completion_text = "to_offset";
-    let initial_state = indoc! {"
-        1. buf.to_offˇsuffix
-        2. buf.to_offˇsuf
-        3. buf.to_offˇfix
-        4. buf.to_offˇ
-        5. into_offˇensive
-        6. ˇsuffix
-        7. let ˇ //
-        8. aaˇzz
-        9. buf.to_off«zzzzzˇ»suffix
-        10. buf.«ˇzzzzz»suffix
-        11. to_off«ˇzzzzz»
-
-        buf.to_offˇsuffix  // newest cursor
-    "};
-    let completion_marked_buffer = indoc! {"
-        1. buf.to_offsuffix
-        2. buf.to_offsuf
-        3. buf.to_offfix
-        4. buf.to_off
-        5. into_offensive
-        6. suffix
-        7. let  //
-        8. aazz
-        9. buf.to_offzzzzzsuffix
-        10. buf.zzzzzsuffix
-        11. to_offzzzzz
-
-        buf.<to_off|suffix>  // newest cursor
-    "};
-    let expected = indoc! {"
-        1. buf.to_offsetˇ
-        2. buf.to_offsetˇsuf
-        3. buf.to_offsetˇfix
-        4. buf.to_offsetˇ
-        5. into_offsetˇensive
-        6. to_offsetˇsuffix
-        7. let to_offsetˇ //
-        8. aato_offsetˇzz
-        9. buf.to_offsetˇ
-        10. buf.to_offsetˇsuffix
-        11. to_offsetˇ
-
-        buf.to_offsetˇ  // newest cursor
-    "};
-    cx.set_state(initial_state);
-    cx.update_editor(|editor, window, cx| {
-        editor.show_completions(&ShowCompletions, window, cx);
-    });
-    handle_completion_request_with_insert_and_replace(
-        &mut cx,
-        completion_marked_buffer,
-        vec![(completion_text, completion_text)],
-        Arc::new(AtomicUsize::new(0)),
-    )
-    .await;
-    cx.condition(|editor, _| editor.context_menu_visible())
-        .await;
-    let apply_additional_edits = cx.update_editor(|editor, window, cx| {
-        editor
-            .confirm_completion_replace(&ConfirmCompletionReplace, window, cx)
-            .unwrap()
-    });
-    cx.assert_editor_state(expected);
-    handle_resolve_completion_request(&mut cx, None).await;
-    apply_additional_edits.await.unwrap();
-
-    // scenario: surrounding text matches surroundings of newest cursor, inserting at the end
-    let completion_text = "foo_and_bar";
-    let initial_state = indoc! {"
-        1. ooanbˇ
-        2. zooanbˇ
-        3. ooanbˇz
-        4. zooanbˇz
-        5. ooanˇ
-        6. oanbˇ
-
-        ooanbˇ
-    "};
-    let completion_marked_buffer = indoc! {"
-        1. ooanb
-        2. zooanb
-        3. ooanbz
-        4. zooanbz
-        5. ooan
-        6. oanb
-
-        <ooanb|>
-    "};
-    let expected = indoc! {"
-        1. foo_and_barˇ
-        2. zfoo_and_barˇ
-        3. foo_and_barˇz
-        4. zfoo_and_barˇz
-        5. ooanfoo_and_barˇ
-        6. oanbfoo_and_barˇ
-
-        foo_and_barˇ
-    "};
-    cx.set_state(initial_state);
-    cx.update_editor(|editor, window, cx| {
-        editor.show_completions(&ShowCompletions, window, cx);
-    });
-    handle_completion_request_with_insert_and_replace(
-        &mut cx,
-        completion_marked_buffer,
-        vec![(completion_text, completion_text)],
-        Arc::new(AtomicUsize::new(0)),
-    )
-    .await;
-    cx.condition(|editor, _| editor.context_menu_visible())
-        .await;
-    let apply_additional_edits = cx.update_editor(|editor, window, cx| {
-        editor
-            .confirm_completion_replace(&ConfirmCompletionReplace, window, cx)
-            .unwrap()
-    });
-    cx.assert_editor_state(expected);
-    handle_resolve_completion_request(&mut cx, None).await;
-    apply_additional_edits.await.unwrap();
-
-    // scenario: surrounding text matches surroundings of newest cursor, inserted at the middle
-    // (expects the same as if it was inserted at the end)
-    let completion_text = "foo_and_bar";
-    let initial_state = indoc! {"
-        1. ooˇanb
-        2. zooˇanb
-        3. ooˇanbz
-        4. zooˇanbz
-
-        ooˇanb
-    "};
-    let completion_marked_buffer = indoc! {"
-        1. ooanb
-        2. zooanb
-        3. ooanbz
-        4. zooanbz
-
-        <oo|anb>
-    "};
-    let expected = indoc! {"
-        1. foo_and_barˇ
-        2. zfoo_and_barˇ
-        3. foo_and_barˇz
-        4. zfoo_and_barˇz
-
-        foo_and_barˇ
-    "};
-    cx.set_state(initial_state);
-    cx.update_editor(|editor, window, cx| {
-        editor.show_completions(&ShowCompletions, window, cx);
-    });
-    handle_completion_request_with_insert_and_replace(
-        &mut cx,
-        completion_marked_buffer,
-        vec![(completion_text, completion_text)],
-        Arc::new(AtomicUsize::new(0)),
-    )
-    .await;
-    cx.condition(|editor, _| editor.context_menu_visible())
-        .await;
-    let apply_additional_edits = cx.update_editor(|editor, window, cx| {
-        editor
-            .confirm_completion_replace(&ConfirmCompletionReplace, window, cx)
-            .unwrap()
-    });
-    cx.assert_editor_state(expected);
-    handle_resolve_completion_request(&mut cx, None).await;
-    apply_additional_edits.await.unwrap();
-}
-
-// This used to crash
-#[gpui::test]
-async fn test_completion_in_multibuffer_with_replace_range(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let buffer_text = indoc! {"
-        fn main() {
-            10.satu;
-
-            //
-            // separate cursors so they open in different excerpts (manually reproducible)
-            //
-
-            10.satu20;
-        }
-    "};
-    let multibuffer_text_with_selections = indoc! {"
-        fn main() {
-            10.satuˇ;
-
-            //
-
-            //
-
-            10.satuˇ20;
-        }
-    "};
-    let expected_multibuffer = indoc! {"
-        fn main() {
-            10.saturating_sub()ˇ;
-
-            //
-
-            //
-
-            10.saturating_sub()ˇ;
-        }
-    "};
-
-    let first_excerpt_end = buffer_text.find("//").unwrap() + 3;
-    let second_excerpt_end = buffer_text.rfind("//").unwrap() - 4;
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/a"),
-        json!({
-            "main.rs": buffer_text,
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-    language_registry.add(rust_lang());
-    let mut fake_servers = language_registry.register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            capabilities: lsp::ServerCapabilities {
-                completion_provider: Some(lsp::CompletionOptions {
-                    resolve_provider: None,
-                    ..lsp::CompletionOptions::default()
-                }),
-                ..lsp::ServerCapabilities::default()
-            },
-            ..FakeLspAdapter::default()
-        },
-    );
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer(path!("/a/main.rs"), cx)
-        })
-        .await
-        .unwrap();
-
-    let multi_buffer = cx.new(|cx| {
-        let mut multi_buffer = MultiBuffer::new(Capability::ReadWrite);
-        multi_buffer.push_excerpts(
-            buffer.clone(),
-            [ExcerptRange::new(0..first_excerpt_end)],
-            cx,
-        );
-        multi_buffer.push_excerpts(
-            buffer.clone(),
-            [ExcerptRange::new(second_excerpt_end..buffer_text.len())],
-            cx,
-        );
-        multi_buffer
-    });
-
-    let editor = workspace
-        .update(cx, |_, window, cx| {
-            cx.new(|cx| {
-                Editor::new(
-                    EditorMode::Full {
-                        scale_ui_elements_with_buffer_font_size: false,
-                        show_active_line_background: false,
-                        sizing_behavior: SizingBehavior::Default,
-                    },
-                    multi_buffer.clone(),
-                    Some(project.clone()),
-                    window,
-                    cx,
-                )
-            })
-        })
-        .unwrap();
-
-    let pane = workspace
-        .update(cx, |workspace, _, _| workspace.active_pane().clone())
-        .unwrap();
-    pane.update_in(cx, |pane, window, cx| {
-        pane.add_item(Box::new(editor.clone()), true, true, None, window, cx);
-    });
-
-    let fake_server = fake_servers.next().await.unwrap();
-
-    editor.update_in(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([
-                Point::new(1, 11)..Point::new(1, 11),
-                Point::new(7, 11)..Point::new(7, 11),
-            ])
-        });
-
-        assert_text_with_selections(editor, multibuffer_text_with_selections, cx);
-    });
-
-    editor.update_in(cx, |editor, window, cx| {
-        editor.show_completions(&ShowCompletions, window, cx);
-    });
-
-    fake_server
-        .set_request_handler::<lsp::request::Completion, _, _>(move |_, _| async move {
-            let completion_item = lsp::CompletionItem {
-                label: "saturating_sub()".into(),
-                text_edit: Some(lsp::CompletionTextEdit::InsertAndReplace(
-                    lsp::InsertReplaceEdit {
-                        new_text: "saturating_sub()".to_owned(),
-                        insert: lsp::Range::new(
-                            lsp::Position::new(7, 7),
-                            lsp::Position::new(7, 11),
-                        ),
-                        replace: lsp::Range::new(
-                            lsp::Position::new(7, 7),
-                            lsp::Position::new(7, 13),
-                        ),
-                    },
-                )),
-                ..lsp::CompletionItem::default()
-            };
-
-            Ok(Some(lsp::CompletionResponse::Array(vec![completion_item])))
-        })
-        .next()
-        .await
-        .unwrap();
-
-    cx.condition(&editor, |editor, _| editor.context_menu_visible())
-        .await;
-
-    editor
-        .update_in(cx, |editor, window, cx| {
-            editor
-                .confirm_completion_replace(&ConfirmCompletionReplace, window, cx)
-                .unwrap()
-        })
-        .await
-        .unwrap();
-
-    editor.update(cx, |editor, cx| {
-        assert_text_with_selections(editor, expected_multibuffer, cx);
-    })
-}
-
-#[gpui::test]
-async fn test_completion(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorLspTestContext::new_rust(
-        lsp::ServerCapabilities {
-            completion_provider: Some(lsp::CompletionOptions {
-                trigger_characters: Some(vec![".".to_string(), ":".to_string()]),
-                resolve_provider: Some(true),
-                ..Default::default()
-            }),
-            signature_help_provider: Some(lsp::SignatureHelpOptions::default()),
-            ..Default::default()
-        },
-        cx,
-    )
-    .await;
-    let counter = Arc::new(AtomicUsize::new(0));
-
-    cx.set_state(indoc! {"
-        oneˇ
-        two
-        three
-    "});
-    cx.simulate_keystroke(".");
-    handle_completion_request(
-        indoc! {"
-            one.|<>
-            two
-            three
-        "},
-        vec!["first_completion", "second_completion"],
-        true,
-        counter.clone(),
-        &mut cx,
-    )
-    .await;
-    cx.condition(|editor, _| editor.context_menu_visible())
-        .await;
-    assert_eq!(counter.load(atomic::Ordering::Acquire), 1);
-
-    let _handler = handle_signature_help_request(
-        &mut cx,
-        lsp::SignatureHelp {
-            signatures: vec![lsp::SignatureInformation {
-                label: "test signature".to_string(),
-                documentation: None,
-                parameters: Some(vec![lsp::ParameterInformation {
-                    label: lsp::ParameterLabel::Simple("foo: u8".to_string()),
-                    documentation: None,
-                }]),
-                active_parameter: None,
-            }],
-            active_signature: None,
-            active_parameter: None,
-        },
-    );
-    cx.update_editor(|editor, window, cx| {
-        assert!(
-            !editor.signature_help_state.is_shown(),
-            "No signature help was called for"
-        );
-        editor.show_signature_help(&ShowSignatureHelp, window, cx);
-    });
-    cx.run_until_parked();
-    cx.update_editor(|editor, _, _| {
-        assert!(
-            !editor.signature_help_state.is_shown(),
-            "No signature help should be shown when completions menu is open"
-        );
-    });
-
-    let apply_additional_edits = cx.update_editor(|editor, window, cx| {
-        editor.context_menu_next(&Default::default(), window, cx);
-        editor
-            .confirm_completion(&ConfirmCompletion::default(), window, cx)
-            .unwrap()
-    });
-    cx.assert_editor_state(indoc! {"
-        one.second_completionˇ
-        two
-        three
-    "});
-
-    handle_resolve_completion_request(
-        &mut cx,
-        Some(vec![
-            (
-                //This overlaps with the primary completion edit which is
-                //misbehavior from the LSP spec, test that we filter it out
-                indoc! {"
-                    one.second_ˇcompletion
-                    two
-                    threeˇ
-                "},
-                "overlapping additional edit",
-            ),
-            (
-                indoc! {"
-                    one.second_completion
-                    two
-                    threeˇ
-                "},
-                "\nadditional edit",
-            ),
-        ]),
-    )
-    .await;
-    apply_additional_edits.await.unwrap();
-    cx.assert_editor_state(indoc! {"
-        one.second_completionˇ
-        two
-        three
-        additional edit
-    "});
-
-    cx.set_state(indoc! {"
-        one.second_completion
-        twoˇ
-        threeˇ
-        additional edit
-    "});
-    cx.simulate_keystroke(" ");
-    assert!(cx.editor(|e, _, _| e.context_menu.borrow_mut().is_none()));
-    cx.simulate_keystroke("s");
-    assert!(cx.editor(|e, _, _| e.context_menu.borrow_mut().is_none()));
-
-    cx.assert_editor_state(indoc! {"
-        one.second_completion
-        two sˇ
-        three sˇ
-        additional edit
-    "});
-    handle_completion_request(
-        indoc! {"
-            one.second_completion
-            two s
-            three <s|>
-            additional edit
-        "},
-        vec!["fourth_completion", "fifth_completion", "sixth_completion"],
-        true,
-        counter.clone(),
-        &mut cx,
-    )
-    .await;
-    cx.condition(|editor, _| editor.context_menu_visible())
-        .await;
-    assert_eq!(counter.load(atomic::Ordering::Acquire), 2);
-
-    cx.simulate_keystroke("i");
-
-    handle_completion_request(
-        indoc! {"
-            one.second_completion
-            two si
-            three <si|>
-            additional edit
-        "},
-        vec!["fourth_completion", "fifth_completion", "sixth_completion"],
-        true,
-        counter.clone(),
-        &mut cx,
-    )
-    .await;
-    cx.condition(|editor, _| editor.context_menu_visible())
-        .await;
-    assert_eq!(counter.load(atomic::Ordering::Acquire), 3);
-
-    let apply_additional_edits = cx.update_editor(|editor, window, cx| {
-        editor
-            .confirm_completion(&ConfirmCompletion::default(), window, cx)
-            .unwrap()
-    });
-    cx.assert_editor_state(indoc! {"
-        one.second_completion
-        two sixth_completionˇ
-        three sixth_completionˇ
-        additional edit
-    "});
-
-    apply_additional_edits.await.unwrap();
-
-    update_test_language_settings(&mut cx, |settings| {
-        settings.defaults.show_completions_on_input = Some(false);
-    });
-    cx.set_state("editorˇ");
-    cx.simulate_keystroke(".");
-    assert!(cx.editor(|e, _, _| e.context_menu.borrow_mut().is_none()));
-    cx.simulate_keystrokes("c l o");
-    cx.assert_editor_state("editor.cloˇ");
-    assert!(cx.editor(|e, _, _| e.context_menu.borrow_mut().is_none()));
-    cx.update_editor(|editor, window, cx| {
-        editor.show_completions(&ShowCompletions, window, cx);
-    });
-    handle_completion_request(
-        "editor.<clo|>",
-        vec!["close", "clobber"],
-        true,
-        counter.clone(),
-        &mut cx,
-    )
-    .await;
-    cx.condition(|editor, _| editor.context_menu_visible())
-        .await;
-    assert_eq!(counter.load(atomic::Ordering::Acquire), 4);
-
-    let apply_additional_edits = cx.update_editor(|editor, window, cx| {
-        editor
-            .confirm_completion(&ConfirmCompletion::default(), window, cx)
-            .unwrap()
-    });
-    cx.assert_editor_state("editor.clobberˇ");
-    handle_resolve_completion_request(&mut cx, None).await;
-    apply_additional_edits.await.unwrap();
-}
-
-#[gpui::test]
-async fn test_completion_can_run_commands(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/a"),
-        json!({
-            "main.rs": "",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-    language_registry.add(rust_lang());
-    let command_calls = Arc::new(AtomicUsize::new(0));
-    let registered_command = "_the/command";
-
-    let closure_command_calls = command_calls.clone();
-    let mut fake_servers = language_registry.register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            capabilities: lsp::ServerCapabilities {
-                completion_provider: Some(lsp::CompletionOptions {
-                    trigger_characters: Some(vec![".".to_string(), ":".to_string()]),
-                    ..lsp::CompletionOptions::default()
-                }),
-                execute_command_provider: Some(lsp::ExecuteCommandOptions {
-                    commands: vec![registered_command.to_owned()],
-                    ..lsp::ExecuteCommandOptions::default()
-                }),
-                ..lsp::ServerCapabilities::default()
-            },
-            initializer: Some(Box::new(move |fake_server| {
-                fake_server.set_request_handler::<lsp::request::Completion, _, _>(
-                    move |params, _| async move {
-                        Ok(Some(lsp::CompletionResponse::Array(vec![
-                            lsp::CompletionItem {
-                                label: "registered_command".to_owned(),
-                                text_edit: gen_text_edit(&params, ""),
-                                command: Some(lsp::Command {
-                                    title: registered_command.to_owned(),
-                                    command: "_the/command".to_owned(),
-                                    arguments: Some(vec![serde_json::Value::Bool(true)]),
-                                }),
-                                ..lsp::CompletionItem::default()
-                            },
-                            lsp::CompletionItem {
-                                label: "unregistered_command".to_owned(),
-                                text_edit: gen_text_edit(&params, ""),
-                                command: Some(lsp::Command {
-                                    title: "????????????".to_owned(),
-                                    command: "????????????".to_owned(),
-                                    arguments: Some(vec![serde_json::Value::Null]),
-                                }),
-                                ..lsp::CompletionItem::default()
-                            },
-                        ])))
-                    },
-                );
-                fake_server.set_request_handler::<lsp::request::ExecuteCommand, _, _>({
-                    let command_calls = closure_command_calls.clone();
-                    move |params, _| {
-                        assert_eq!(params.command, registered_command);
-                        let command_calls = command_calls.clone();
-                        async move {
-                            command_calls.fetch_add(1, atomic::Ordering::Release);
-                            Ok(Some(json!(null)))
-                        }
-                    }
-                });
-            })),
-            ..FakeLspAdapter::default()
-        },
-    );
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let editor = workspace
-        .update(cx, |workspace, window, cx| {
-            workspace.open_abs_path(
-                PathBuf::from(path!("/a/main.rs")),
-                OpenOptions::default(),
-                window,
-                cx,
-            )
-        })
-        .unwrap()
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-    let _fake_server = fake_servers.next().await.unwrap();
-
-    editor.update_in(cx, |editor, window, cx| {
-        cx.focus_self(window);
-        editor.move_to_end(&MoveToEnd, window, cx);
-        editor.handle_input(".", window, cx);
-    });
-    cx.run_until_parked();
-    editor.update(cx, |editor, _| {
-        assert!(editor.context_menu_visible());
-        if let Some(CodeContextMenu::Completions(menu)) = editor.context_menu.borrow_mut().as_ref()
-        {
-            let completion_labels = menu
-                .completions
-                .borrow()
-                .iter()
-                .map(|c| c.label.text.clone())
-                .collect::<Vec<_>>();
-            assert_eq!(
-                completion_labels,
-                &["registered_command", "unregistered_command",],
-            );
-        } else {
-            panic!("expected completion menu to be open");
-        }
-    });
-
-    editor
-        .update_in(cx, |editor, window, cx| {
-            editor
-                .confirm_completion(&ConfirmCompletion::default(), window, cx)
-                .unwrap()
-        })
-        .await
-        .unwrap();
-    cx.run_until_parked();
-    assert_eq!(
-        command_calls.load(atomic::Ordering::Acquire),
-        1,
-        "For completion with a registered command, Zed should send a command execution request",
-    );
-
-    editor.update_in(cx, |editor, window, cx| {
-        cx.focus_self(window);
-        editor.handle_input(".", window, cx);
-    });
-    cx.run_until_parked();
-    editor.update(cx, |editor, _| {
-        assert!(editor.context_menu_visible());
-        if let Some(CodeContextMenu::Completions(menu)) = editor.context_menu.borrow_mut().as_ref()
-        {
-            let completion_labels = menu
-                .completions
-                .borrow()
-                .iter()
-                .map(|c| c.label.text.clone())
-                .collect::<Vec<_>>();
-            assert_eq!(
-                completion_labels,
-                &["registered_command", "unregistered_command",],
-            );
-        } else {
-            panic!("expected completion menu to be open");
-        }
-    });
-    editor
-        .update_in(cx, |editor, window, cx| {
-            editor.context_menu_next(&Default::default(), window, cx);
-            editor
-                .confirm_completion(&ConfirmCompletion::default(), window, cx)
-                .unwrap()
-        })
-        .await
-        .unwrap();
-    cx.run_until_parked();
-    assert_eq!(
-        command_calls.load(atomic::Ordering::Acquire),
-        1,
-        "For completion with an unregistered command, Zed should not send a command execution request",
-    );
-}
-
-#[gpui::test]
-async fn test_completion_reuse(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorLspTestContext::new_rust(
-        lsp::ServerCapabilities {
-            completion_provider: Some(lsp::CompletionOptions {
-                trigger_characters: Some(vec![".".to_string()]),
-                ..Default::default()
-            }),
-            ..Default::default()
-        },
-        cx,
-    )
-    .await;
-
-    let counter = Arc::new(AtomicUsize::new(0));
-    cx.set_state("objˇ");
-    cx.simulate_keystroke(".");
-
-    // Initial completion request returns complete results
-    let is_incomplete = false;
-    handle_completion_request(
-        "obj.|<>",
-        vec!["a", "ab", "abc"],
-        is_incomplete,
-        counter.clone(),
-        &mut cx,
-    )
-    .await;
-    cx.run_until_parked();
-    assert_eq!(counter.load(atomic::Ordering::Acquire), 1);
-    cx.assert_editor_state("obj.ˇ");
-    check_displayed_completions(vec!["a", "ab", "abc"], &mut cx);
-
-    // Type "a" - filters existing completions
-    cx.simulate_keystroke("a");
-    cx.run_until_parked();
-    assert_eq!(counter.load(atomic::Ordering::Acquire), 1);
-    cx.assert_editor_state("obj.aˇ");
-    check_displayed_completions(vec!["a", "ab", "abc"], &mut cx);
-
-    // Type "b" - filters existing completions
-    cx.simulate_keystroke("b");
-    cx.run_until_parked();
-    assert_eq!(counter.load(atomic::Ordering::Acquire), 1);
-    cx.assert_editor_state("obj.abˇ");
-    check_displayed_completions(vec!["ab", "abc"], &mut cx);
-
-    // Type "c" - filters existing completions
-    cx.simulate_keystroke("c");
-    cx.run_until_parked();
-    assert_eq!(counter.load(atomic::Ordering::Acquire), 1);
-    cx.assert_editor_state("obj.abcˇ");
-    check_displayed_completions(vec!["abc"], &mut cx);
-
-    // Backspace to delete "c" - filters existing completions
-    cx.update_editor(|editor, window, cx| {
-        editor.backspace(&Backspace, window, cx);
-    });
-    cx.run_until_parked();
-    assert_eq!(counter.load(atomic::Ordering::Acquire), 1);
-    cx.assert_editor_state("obj.abˇ");
-    check_displayed_completions(vec!["ab", "abc"], &mut cx);
-
-    // Moving cursor to the left dismisses menu.
-    cx.update_editor(|editor, window, cx| {
-        editor.move_left(&MoveLeft, window, cx);
-    });
-    cx.run_until_parked();
-    assert_eq!(counter.load(atomic::Ordering::Acquire), 1);
-    cx.assert_editor_state("obj.aˇb");
-    cx.update_editor(|editor, _, _| {
-        assert_eq!(editor.context_menu_visible(), false);
-    });
-
-    // Type "b" - new request
-    cx.simulate_keystroke("b");
-    let is_incomplete = false;
-    handle_completion_request(
-        "obj.<ab|>a",
-        vec!["ab", "abc"],
-        is_incomplete,
-        counter.clone(),
-        &mut cx,
-    )
-    .await;
-    cx.run_until_parked();
-    assert_eq!(counter.load(atomic::Ordering::Acquire), 2);
-    cx.assert_editor_state("obj.abˇb");
-    check_displayed_completions(vec!["ab", "abc"], &mut cx);
-
-    // Backspace to delete "b" - since query was "ab" and is now "a", new request is made.
-    cx.update_editor(|editor, window, cx| {
-        editor.backspace(&Backspace, window, cx);
-    });
-    let is_incomplete = false;
-    handle_completion_request(
-        "obj.<a|>b",
-        vec!["a", "ab", "abc"],
-        is_incomplete,
-        counter.clone(),
-        &mut cx,
-    )
-    .await;
-    cx.run_until_parked();
-    assert_eq!(counter.load(atomic::Ordering::Acquire), 3);
-    cx.assert_editor_state("obj.aˇb");
-    check_displayed_completions(vec!["a", "ab", "abc"], &mut cx);
-
-    // Backspace to delete "a" - dismisses menu.
-    cx.update_editor(|editor, window, cx| {
-        editor.backspace(&Backspace, window, cx);
-    });
-    cx.run_until_parked();
-    assert_eq!(counter.load(atomic::Ordering::Acquire), 3);
-    cx.assert_editor_state("obj.ˇb");
-    cx.update_editor(|editor, _, _| {
-        assert_eq!(editor.context_menu_visible(), false);
-    });
-}
-
-#[gpui::test]
-async fn test_word_completion(cx: &mut TestAppContext) {
-    let lsp_fetch_timeout_ms = 10;
-    init_test(cx, |language_settings| {
-        language_settings.defaults.completions = Some(CompletionSettingsContent {
-            words_min_length: Some(0),
-            lsp_fetch_timeout_ms: Some(10),
-            lsp_insert_mode: Some(LspInsertMode::Insert),
-            ..Default::default()
-        });
-    });
-
-    let mut cx = EditorLspTestContext::new_rust(
-        lsp::ServerCapabilities {
-            completion_provider: Some(lsp::CompletionOptions {
-                trigger_characters: Some(vec![".".to_string(), ":".to_string()]),
-                ..lsp::CompletionOptions::default()
-            }),
-            signature_help_provider: Some(lsp::SignatureHelpOptions::default()),
-            ..lsp::ServerCapabilities::default()
-        },
-        cx,
-    )
-    .await;
-
-    let throttle_completions = Arc::new(AtomicBool::new(false));
-
-    let lsp_throttle_completions = throttle_completions.clone();
-    let _completion_requests_handler =
-        cx.lsp
-            .server
-            .on_request::<lsp::request::Completion, _, _>(move |_, cx| {
-                let lsp_throttle_completions = lsp_throttle_completions.clone();
-                let cx = cx.clone();
-                async move {
-                    if lsp_throttle_completions.load(atomic::Ordering::Acquire) {
-                        cx.background_executor()
-                            .timer(Duration::from_millis(lsp_fetch_timeout_ms * 10))
-                            .await;
-                    }
-                    Ok(Some(lsp::CompletionResponse::Array(vec![
-                        lsp::CompletionItem {
-                            label: "first".into(),
-                            ..lsp::CompletionItem::default()
-                        },
-                        lsp::CompletionItem {
-                            label: "last".into(),
-                            ..lsp::CompletionItem::default()
-                        },
-                    ])))
-                }
-            });
-
-    cx.set_state(indoc! {"
-        oneˇ
-        two
-        three
-    "});
-    cx.simulate_keystroke(".");
-    cx.executor().run_until_parked();
-    cx.condition(|editor, _| editor.context_menu_visible())
-        .await;
-    cx.update_editor(|editor, window, cx| {
-        if let Some(CodeContextMenu::Completions(menu)) = editor.context_menu.borrow_mut().as_ref()
-        {
-            assert_eq!(
-                completion_menu_entries(menu),
-                &["first", "last"],
-                "When LSP server is fast to reply, no fallback word completions are used"
-            );
-        } else {
-            panic!("expected completion menu to be open");
-        }
-        editor.cancel(&Cancel, window, cx);
-    });
-    cx.executor().run_until_parked();
-    cx.condition(|editor, _| !editor.context_menu_visible())
-        .await;
-
-    throttle_completions.store(true, atomic::Ordering::Release);
-    cx.simulate_keystroke(".");
-    cx.executor()
-        .advance_clock(Duration::from_millis(lsp_fetch_timeout_ms * 2));
-    cx.executor().run_until_parked();
-    cx.condition(|editor, _| editor.context_menu_visible())
-        .await;
-    cx.update_editor(|editor, _, _| {
-        if let Some(CodeContextMenu::Completions(menu)) = editor.context_menu.borrow_mut().as_ref()
-        {
-            assert_eq!(completion_menu_entries(menu), &["one", "three", "two"],
-                "When LSP server is slow, document words can be shown instead, if configured accordingly");
-        } else {
-            panic!("expected completion menu to be open");
-        }
-    });
-}
-
-#[gpui::test]
-async fn test_word_completions_do_not_duplicate_lsp_ones(cx: &mut TestAppContext) {
-    init_test(cx, |language_settings| {
-        language_settings.defaults.completions = Some(CompletionSettingsContent {
-            words: Some(WordsCompletionMode::Enabled),
-            words_min_length: Some(0),
-            lsp_insert_mode: Some(LspInsertMode::Insert),
-            ..Default::default()
-        });
-    });
-
-    let mut cx = EditorLspTestContext::new_rust(
-        lsp::ServerCapabilities {
-            completion_provider: Some(lsp::CompletionOptions {
-                trigger_characters: Some(vec![".".to_string(), ":".to_string()]),
-                ..lsp::CompletionOptions::default()
-            }),
-            signature_help_provider: Some(lsp::SignatureHelpOptions::default()),
-            ..lsp::ServerCapabilities::default()
-        },
-        cx,
-    )
-    .await;
-
-    let _completion_requests_handler =
-        cx.lsp
-            .server
-            .on_request::<lsp::request::Completion, _, _>(move |_, _| async move {
-                Ok(Some(lsp::CompletionResponse::Array(vec![
-                    lsp::CompletionItem {
-                        label: "first".into(),
-                        ..lsp::CompletionItem::default()
-                    },
-                    lsp::CompletionItem {
-                        label: "last".into(),
-                        ..lsp::CompletionItem::default()
-                    },
-                ])))
-            });
-
-    cx.set_state(indoc! {"ˇ
-        first
-        last
-        second
-    "});
-    cx.simulate_keystroke(".");
-    cx.executor().run_until_parked();
-    cx.condition(|editor, _| editor.context_menu_visible())
-        .await;
-    cx.update_editor(|editor, _, _| {
-        if let Some(CodeContextMenu::Completions(menu)) = editor.context_menu.borrow_mut().as_ref()
-        {
-            assert_eq!(
-                completion_menu_entries(menu),
-                &["first", "last", "second"],
-                "Word completions that has the same edit as the any of the LSP ones, should not be proposed"
-            );
-        } else {
-            panic!("expected completion menu to be open");
-        }
-    });
-}
-
-#[gpui::test]
-async fn test_word_completions_continue_on_typing(cx: &mut TestAppContext) {
-    init_test(cx, |language_settings| {
-        language_settings.defaults.completions = Some(CompletionSettingsContent {
-            words: Some(WordsCompletionMode::Disabled),
-            words_min_length: Some(0),
-            lsp_insert_mode: Some(LspInsertMode::Insert),
-            ..Default::default()
-        });
-    });
-
-    let mut cx = EditorLspTestContext::new_rust(
-        lsp::ServerCapabilities {
-            completion_provider: Some(lsp::CompletionOptions {
-                trigger_characters: Some(vec![".".to_string(), ":".to_string()]),
-                ..lsp::CompletionOptions::default()
-            }),
-            signature_help_provider: Some(lsp::SignatureHelpOptions::default()),
-            ..lsp::ServerCapabilities::default()
-        },
-        cx,
-    )
-    .await;
-
-    let _completion_requests_handler =
-        cx.lsp
-            .server
-            .on_request::<lsp::request::Completion, _, _>(move |_, _| async move {
-                panic!("LSP completions should not be queried when dealing with word completions")
-            });
-
-    cx.set_state(indoc! {"ˇ
-        first
-        last
-        second
-    "});
-    cx.update_editor(|editor, window, cx| {
-        editor.show_word_completions(&ShowWordCompletions, window, cx);
-    });
-    cx.executor().run_until_parked();
-    cx.condition(|editor, _| editor.context_menu_visible())
-        .await;
-    cx.update_editor(|editor, _, _| {
-        if let Some(CodeContextMenu::Completions(menu)) = editor.context_menu.borrow_mut().as_ref()
-        {
-            assert_eq!(
-                completion_menu_entries(menu),
-                &["first", "last", "second"],
-                "`ShowWordCompletions` action should show word completions"
-            );
-        } else {
-            panic!("expected completion menu to be open");
-        }
-    });
-
-    cx.simulate_keystroke("l");
-    cx.executor().run_until_parked();
-    cx.condition(|editor, _| editor.context_menu_visible())
-        .await;
-    cx.update_editor(|editor, _, _| {
-        if let Some(CodeContextMenu::Completions(menu)) = editor.context_menu.borrow_mut().as_ref()
-        {
-            assert_eq!(
-                completion_menu_entries(menu),
-                &["last"],
-                "After showing word completions, further editing should filter them and not query the LSP"
-            );
-        } else {
-            panic!("expected completion menu to be open");
-        }
-    });
-}
-
-#[gpui::test]
-async fn test_word_completions_usually_skip_digits(cx: &mut TestAppContext) {
-    init_test(cx, |language_settings| {
-        language_settings.defaults.completions = Some(CompletionSettingsContent {
-            words_min_length: Some(0),
-            lsp: Some(false),
-            lsp_insert_mode: Some(LspInsertMode::Insert),
-            ..Default::default()
-        });
-    });
-
-    let mut cx = EditorLspTestContext::new_rust(lsp::ServerCapabilities::default(), cx).await;
-
-    cx.set_state(indoc! {"ˇ
-        0_usize
-        let
-        33
-        4.5f32
-    "});
-    cx.update_editor(|editor, window, cx| {
-        editor.show_completions(&ShowCompletions, window, cx);
-    });
-    cx.executor().run_until_parked();
-    cx.condition(|editor, _| editor.context_menu_visible())
-        .await;
-    cx.update_editor(|editor, window, cx| {
-        if let Some(CodeContextMenu::Completions(menu)) = editor.context_menu.borrow_mut().as_ref()
-        {
-            assert_eq!(
-                completion_menu_entries(menu),
-                &["let"],
-                "With no digits in the completion query, no digits should be in the word completions"
-            );
-        } else {
-            panic!("expected completion menu to be open");
-        }
-        editor.cancel(&Cancel, window, cx);
-    });
-
-    cx.set_state(indoc! {"3ˇ
-        0_usize
-        let
-        3
-        33.35f32
-    "});
-    cx.update_editor(|editor, window, cx| {
-        editor.show_completions(&ShowCompletions, window, cx);
-    });
-    cx.executor().run_until_parked();
-    cx.condition(|editor, _| editor.context_menu_visible())
-        .await;
-    cx.update_editor(|editor, _, _| {
-        if let Some(CodeContextMenu::Completions(menu)) = editor.context_menu.borrow_mut().as_ref()
-        {
-            assert_eq!(completion_menu_entries(menu), &["33", "35f32"], "The digit is in the completion query, \
-                return matching words with digits (`33`, `35f32`) but exclude query duplicates (`3`)");
-        } else {
-            panic!("expected completion menu to be open");
-        }
-    });
-}
-
-#[gpui::test]
-async fn test_word_completions_do_not_show_before_threshold(cx: &mut TestAppContext) {
-    init_test(cx, |language_settings| {
-        language_settings.defaults.completions = Some(CompletionSettingsContent {
-            words: Some(WordsCompletionMode::Enabled),
-            words_min_length: Some(3),
-            lsp_insert_mode: Some(LspInsertMode::Insert),
-            ..Default::default()
-        });
-    });
-
-    let mut cx = EditorLspTestContext::new_rust(lsp::ServerCapabilities::default(), cx).await;
-    cx.set_state(indoc! {"ˇ
-        wow
-        wowen
-        wowser
-    "});
-    cx.simulate_keystroke("w");
-    cx.executor().run_until_parked();
-    cx.update_editor(|editor, _, _| {
-        if editor.context_menu.borrow_mut().is_some() {
-            panic!(
-                "expected completion menu to be hidden, as words completion threshold is not met"
-            );
-        }
-    });
-
-    cx.update_editor(|editor, window, cx| {
-        editor.show_word_completions(&ShowWordCompletions, window, cx);
-    });
-    cx.executor().run_until_parked();
-    cx.update_editor(|editor, window, cx| {
-        if let Some(CodeContextMenu::Completions(menu)) = editor.context_menu.borrow_mut().as_ref()
-        {
-            assert_eq!(completion_menu_entries(menu), &["wowser", "wowen", "wow"], "Even though the threshold is not met, invoking word completions with an action should provide the completions");
-        } else {
-            panic!("expected completion menu to be open after the word completions are called with an action");
-        }
-
-        editor.cancel(&Cancel, window, cx);
-    });
-    cx.update_editor(|editor, _, _| {
-        if editor.context_menu.borrow_mut().is_some() {
-            panic!("expected completion menu to be hidden after canceling");
-        }
-    });
-
-    cx.simulate_keystroke("o");
-    cx.executor().run_until_parked();
-    cx.update_editor(|editor, _, _| {
-        if editor.context_menu.borrow_mut().is_some() {
-            panic!(
-                "expected completion menu to be hidden, as words completion threshold is not met still"
-            );
-        }
-    });
-
-    cx.simulate_keystroke("w");
-    cx.executor().run_until_parked();
-    cx.update_editor(|editor, _, _| {
-        if let Some(CodeContextMenu::Completions(menu)) = editor.context_menu.borrow_mut().as_ref()
-        {
-            assert_eq!(completion_menu_entries(menu), &["wowen", "wowser"], "After word completion threshold is met, matching words should be shown, excluding the already typed word");
-        } else {
-            panic!("expected completion menu to be open after the word completions threshold is met");
-        }
-    });
-}
-
-#[gpui::test]
-async fn test_word_completions_disabled(cx: &mut TestAppContext) {
-    init_test(cx, |language_settings| {
-        language_settings.defaults.completions = Some(CompletionSettingsContent {
-            words: Some(WordsCompletionMode::Enabled),
-            words_min_length: Some(0),
-            lsp_insert_mode: Some(LspInsertMode::Insert),
-            ..Default::default()
-        });
-    });
-
-    let mut cx = EditorLspTestContext::new_rust(lsp::ServerCapabilities::default(), cx).await;
-    cx.update_editor(|editor, _, _| {
-        editor.disable_word_completions();
-    });
-    cx.set_state(indoc! {"ˇ
-        wow
-        wowen
-        wowser
-    "});
-    cx.simulate_keystroke("w");
-    cx.executor().run_until_parked();
-    cx.update_editor(|editor, _, _| {
-        if editor.context_menu.borrow_mut().is_some() {
-            panic!(
-                "expected completion menu to be hidden, as words completion are disabled for this editor"
-            );
-        }
-    });
-
-    cx.update_editor(|editor, window, cx| {
-        editor.show_word_completions(&ShowWordCompletions, window, cx);
-    });
-    cx.executor().run_until_parked();
-    cx.update_editor(|editor, _, _| {
-        if editor.context_menu.borrow_mut().is_some() {
-            panic!(
-                "expected completion menu to be hidden even if called for explicitly, as words completion are disabled for this editor"
-            );
-        }
-    });
-}
-
-#[gpui::test]
-async fn test_word_completions_disabled_with_no_provider(cx: &mut TestAppContext) {
-    init_test(cx, |language_settings| {
-        language_settings.defaults.completions = Some(CompletionSettingsContent {
-            words: Some(WordsCompletionMode::Disabled),
-            words_min_length: Some(0),
-            lsp_insert_mode: Some(LspInsertMode::Insert),
-            ..Default::default()
-        });
-    });
-
-    let mut cx = EditorLspTestContext::new_rust(lsp::ServerCapabilities::default(), cx).await;
-    cx.update_editor(|editor, _, _| {
-        editor.set_completion_provider(None);
-    });
-    cx.set_state(indoc! {"ˇ
-        wow
-        wowen
-        wowser
-    "});
-    cx.simulate_keystroke("w");
-    cx.executor().run_until_parked();
-    cx.update_editor(|editor, _, _| {
-        if editor.context_menu.borrow_mut().is_some() {
-            panic!("expected completion menu to be hidden, as disabled in settings");
-        }
-    });
-}
-
-fn gen_text_edit(params: &CompletionParams, text: &str) -> Option<lsp::CompletionTextEdit> {
-    let position = || lsp::Position {
-        line: params.text_document_position.position.line,
-        character: params.text_document_position.position.character,
-    };
-    Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
-        range: lsp::Range {
-            start: position(),
-            end: position(),
-        },
-        new_text: text.to_string(),
-    }))
-}
-
-#[gpui::test]
-async fn test_multiline_completion(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/a"),
-        json!({
-            "main.ts": "a",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-    let typescript_language = Arc::new(Language::new(
-        LanguageConfig {
-            name: "TypeScript".into(),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["ts".to_string()],
-                ..LanguageMatcher::default()
-            },
-            line_comments: vec!["// ".into()],
-            ..LanguageConfig::default()
-        },
-        Some(tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into()),
-    ));
-    language_registry.add(typescript_language.clone());
-    let mut fake_servers = language_registry.register_fake_lsp(
-        "TypeScript",
-        FakeLspAdapter {
-            capabilities: lsp::ServerCapabilities {
-                completion_provider: Some(lsp::CompletionOptions {
-                    trigger_characters: Some(vec![".".to_string(), ":".to_string()]),
-                    ..lsp::CompletionOptions::default()
-                }),
-                signature_help_provider: Some(lsp::SignatureHelpOptions::default()),
-                ..lsp::ServerCapabilities::default()
-            },
-            // Emulate vtsls label generation
-            label_for_completion: Some(Box::new(|item, _| {
-                let text = if let Some(description) = item
-                    .label_details
-                    .as_ref()
-                    .and_then(|label_details| label_details.description.as_ref())
-                {
-                    format!("{} {}", item.label, description)
-                } else if let Some(detail) = &item.detail {
-                    format!("{} {}", item.label, detail)
-                } else {
-                    item.label.clone()
-                };
-                Some(language::CodeLabel::plain(text, None))
-            })),
-            ..FakeLspAdapter::default()
-        },
-    );
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let worktree_id = workspace
-        .update(cx, |workspace, _window, cx| {
-            workspace.project().update(cx, |project, cx| {
-                project.worktrees(cx).next().unwrap().read(cx).id()
-            })
-        })
-        .unwrap();
-    let _buffer = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer_with_lsp(path!("/a/main.ts"), cx)
-        })
-        .await
-        .unwrap();
-    let editor = workspace
-        .update(cx, |workspace, window, cx| {
-            workspace.open_path((worktree_id, rel_path("main.ts")), None, true, window, cx)
-        })
-        .unwrap()
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-    let fake_server = fake_servers.next().await.unwrap();
-
-    let multiline_label = "StickyHeaderExcerpt {\n            excerpt,\n            next_excerpt_controls_present,\n            next_buffer_row,\n        }: StickyHeaderExcerpt<'_>,";
-    let multiline_label_2 = "a\nb\nc\n";
-    let multiline_detail = "[]struct {\n\tSignerId\tstruct {\n\t\tIssuer\t\t\tstring\t`json:\"issuer\"`\n\t\tSubjectSerialNumber\"`\n}}";
-    let multiline_description = "d\ne\nf\n";
-    let multiline_detail_2 = "g\nh\ni\n";
-
-    let mut completion_handle = fake_server.set_request_handler::<lsp::request::Completion, _, _>(
-        move |params, _| async move {
-            Ok(Some(lsp::CompletionResponse::Array(vec![
-                lsp::CompletionItem {
-                    label: multiline_label.to_string(),
-                    text_edit: gen_text_edit(&params, "new_text_1"),
-                    ..lsp::CompletionItem::default()
-                },
-                lsp::CompletionItem {
-                    label: "single line label 1".to_string(),
-                    detail: Some(multiline_detail.to_string()),
-                    text_edit: gen_text_edit(&params, "new_text_2"),
-                    ..lsp::CompletionItem::default()
-                },
-                lsp::CompletionItem {
-                    label: "single line label 2".to_string(),
-                    label_details: Some(lsp::CompletionItemLabelDetails {
-                        description: Some(multiline_description.to_string()),
-                        detail: None,
-                    }),
-                    text_edit: gen_text_edit(&params, "new_text_2"),
-                    ..lsp::CompletionItem::default()
-                },
-                lsp::CompletionItem {
-                    label: multiline_label_2.to_string(),
-                    detail: Some(multiline_detail_2.to_string()),
-                    text_edit: gen_text_edit(&params, "new_text_3"),
-                    ..lsp::CompletionItem::default()
-                },
-                lsp::CompletionItem {
-                    label: "Label with many     spaces and \t but without newlines".to_string(),
-                    detail: Some(
-                        "Details with many     spaces and \t but without newlines".to_string(),
-                    ),
-                    text_edit: gen_text_edit(&params, "new_text_4"),
-                    ..lsp::CompletionItem::default()
-                },
-            ])))
-        },
-    );
-
-    editor.update_in(cx, |editor, window, cx| {
-        cx.focus_self(window);
-        editor.move_to_end(&MoveToEnd, window, cx);
-        editor.handle_input(".", window, cx);
-    });
-    cx.run_until_parked();
-    completion_handle.next().await.unwrap();
-
-    editor.update(cx, |editor, _| {
-        assert!(editor.context_menu_visible());
-        if let Some(CodeContextMenu::Completions(menu)) = editor.context_menu.borrow_mut().as_ref()
-        {
-            let completion_labels = menu
-                .completions
-                .borrow()
-                .iter()
-                .map(|c| c.label.text.clone())
-                .collect::<Vec<_>>();
-            assert_eq!(
-                completion_labels,
-                &[
-                    "StickyHeaderExcerpt { excerpt, next_excerpt_controls_present, next_buffer_row, }: StickyHeaderExcerpt<'_>,",
-                    "single line label 1 []struct { SignerId struct { Issuer string `json:\"issuer\"` SubjectSerialNumber\"` }}",
-                    "single line label 2 d e f ",
-                    "a b c g h i ",
-                    "Label with many     spaces and \t but without newlines Details with many     spaces and \t but without newlines",
-                ],
-                "Completion items should have their labels without newlines, also replacing excessive whitespaces. Completion items without newlines should not be altered.",
-            );
-
-            for completion in menu
-                .completions
-                .borrow()
-                .iter() {
-                    assert_eq!(
-                        completion.label.filter_range,
-                        0..completion.label.text.len(),
-                        "Adjusted completion items should still keep their filter ranges for the entire label. Item: {completion:?}"
-                    );
-                }
-        } else {
-            panic!("expected completion menu to be open");
-        }
-    });
-}
-
-#[gpui::test]
-async fn test_completion_page_up_down_keys(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    let mut cx = EditorLspTestContext::new_rust(
-        lsp::ServerCapabilities {
-            completion_provider: Some(lsp::CompletionOptions {
-                trigger_characters: Some(vec![".".to_string()]),
-                ..Default::default()
-            }),
-            ..Default::default()
-        },
-        cx,
-    )
-    .await;
-    cx.lsp
-        .set_request_handler::<lsp::request::Completion, _, _>(move |_, _| async move {
-            Ok(Some(lsp::CompletionResponse::Array(vec![
-                lsp::CompletionItem {
-                    label: "first".into(),
-                    ..Default::default()
-                },
-                lsp::CompletionItem {
-                    label: "last".into(),
-                    ..Default::default()
-                },
-            ])))
-        });
-    cx.set_state("variableˇ");
-    cx.simulate_keystroke(".");
-    cx.executor().run_until_parked();
-
-    cx.update_editor(|editor, _, _| {
-        if let Some(CodeContextMenu::Completions(menu)) = editor.context_menu.borrow_mut().as_ref()
-        {
-            assert_eq!(completion_menu_entries(menu), &["first", "last"]);
-        } else {
-            panic!("expected completion menu to be open");
-        }
-    });
-
-    cx.update_editor(|editor, window, cx| {
-        editor.move_page_down(&MovePageDown::default(), window, cx);
-        if let Some(CodeContextMenu::Completions(menu)) = editor.context_menu.borrow_mut().as_ref()
-        {
-            assert!(
-                menu.selected_item == 1,
-                "expected PageDown to select the last item from the context menu"
-            );
-        } else {
-            panic!("expected completion menu to stay open after PageDown");
-        }
-    });
-
-    cx.update_editor(|editor, window, cx| {
-        editor.move_page_up(&MovePageUp::default(), window, cx);
-        if let Some(CodeContextMenu::Completions(menu)) = editor.context_menu.borrow_mut().as_ref()
-        {
-            assert!(
-                menu.selected_item == 0,
-                "expected PageUp to select the first item from the context menu"
-            );
-        } else {
-            panic!("expected completion menu to stay open after PageUp");
-        }
-    });
-}
-
-#[gpui::test]
-async fn test_as_is_completions(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    let mut cx = EditorLspTestContext::new_rust(
-        lsp::ServerCapabilities {
-            completion_provider: Some(lsp::CompletionOptions {
-                ..Default::default()
-            }),
-            ..Default::default()
-        },
-        cx,
-    )
-    .await;
-    cx.lsp
-        .set_request_handler::<lsp::request::Completion, _, _>(move |_, _| async move {
-            Ok(Some(lsp::CompletionResponse::Array(vec![
-                lsp::CompletionItem {
-                    label: "unsafe".into(),
-                    text_edit: Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
-                        range: lsp::Range {
-                            start: lsp::Position {
-                                line: 1,
-                                character: 2,
-                            },
-                            end: lsp::Position {
-                                line: 1,
-                                character: 3,
-                            },
-                        },
-                        new_text: "unsafe".to_string(),
-                    })),
-                    insert_text_mode: Some(lsp::InsertTextMode::AS_IS),
-                    ..Default::default()
-                },
-            ])))
-        });
-    cx.set_state("fn a() {}\n  nˇ");
-    cx.executor().run_until_parked();
-    cx.update_editor(|editor, window, cx| {
-        editor.trigger_completion_on_input("n", true, window, cx)
-    });
-    cx.executor().run_until_parked();
-
-    cx.update_editor(|editor, window, cx| {
-        editor.confirm_completion(&Default::default(), window, cx)
-    });
-    cx.executor().run_until_parked();
-    cx.assert_editor_state("fn a() {}\n  unsafeˇ");
-}
-
-#[gpui::test]
-async fn test_panic_during_c_completions(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    let language =
-        Arc::try_unwrap(languages::language("c", tree_sitter_c::LANGUAGE.into())).unwrap();
-    let mut cx = EditorLspTestContext::new(
-        language,
-        lsp::ServerCapabilities {
-            completion_provider: Some(lsp::CompletionOptions {
-                ..lsp::CompletionOptions::default()
-            }),
-            ..lsp::ServerCapabilities::default()
-        },
-        cx,
-    )
-    .await;
-
-    cx.set_state(
-        "#ifndef BAR_H
-#define BAR_H
-
-#include <stdbool.h>
-
-int fn_branch(bool do_branch1, bool do_branch2);
-
-#endif // BAR_H
-ˇ",
-    );
-    cx.executor().run_until_parked();
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("#", window, cx);
-    });
-    cx.executor().run_until_parked();
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("i", window, cx);
-    });
-    cx.executor().run_until_parked();
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("n", window, cx);
-    });
-    cx.executor().run_until_parked();
-    cx.assert_editor_state(
-        "#ifndef BAR_H
-#define BAR_H
-
-#include <stdbool.h>
-
-int fn_branch(bool do_branch1, bool do_branch2);
-
-#endif // BAR_H
-#inˇ",
-    );
-
-    cx.lsp
-        .set_request_handler::<lsp::request::Completion, _, _>(move |_, _| async move {
-            Ok(Some(lsp::CompletionResponse::List(lsp::CompletionList {
-                is_incomplete: false,
-                item_defaults: None,
-                items: vec![lsp::CompletionItem {
-                    kind: Some(lsp::CompletionItemKind::SNIPPET),
-                    label_details: Some(lsp::CompletionItemLabelDetails {
-                        detail: Some("header".to_string()),
-                        description: None,
-                    }),
-                    label: " include".to_string(),
-                    text_edit: Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
-                        range: lsp::Range {
-                            start: lsp::Position {
-                                line: 8,
-                                character: 1,
-                            },
-                            end: lsp::Position {
-                                line: 8,
-                                character: 1,
-                            },
-                        },
-                        new_text: "include \"$0\"".to_string(),
-                    })),
-                    sort_text: Some("40b67681include".to_string()),
-                    insert_text_format: Some(lsp::InsertTextFormat::SNIPPET),
-                    filter_text: Some("include".to_string()),
-                    insert_text: Some("include \"$0\"".to_string()),
-                    ..lsp::CompletionItem::default()
-                }],
-            })))
-        });
-    cx.update_editor(|editor, window, cx| {
-        editor.show_completions(&ShowCompletions, window, cx);
-    });
-    cx.executor().run_until_parked();
-    cx.update_editor(|editor, window, cx| {
-        editor.confirm_completion(&ConfirmCompletion::default(), window, cx)
-    });
-    cx.executor().run_until_parked();
-    cx.assert_editor_state(
-        "#ifndef BAR_H
-#define BAR_H
-
-#include <stdbool.h>
-
-int fn_branch(bool do_branch1, bool do_branch2);
-
-#endif // BAR_H
-#include \"ˇ\"",
-    );
-
-    cx.lsp
-        .set_request_handler::<lsp::request::Completion, _, _>(move |_, _| async move {
-            Ok(Some(lsp::CompletionResponse::List(lsp::CompletionList {
-                is_incomplete: true,
-                item_defaults: None,
-                items: vec![lsp::CompletionItem {
-                    kind: Some(lsp::CompletionItemKind::FILE),
-                    label: "AGL/".to_string(),
-                    text_edit: Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
-                        range: lsp::Range {
-                            start: lsp::Position {
-                                line: 8,
-                                character: 10,
-                            },
-                            end: lsp::Position {
-                                line: 8,
-                                character: 11,
-                            },
-                        },
-                        new_text: "AGL/".to_string(),
-                    })),
-                    sort_text: Some("40b67681AGL/".to_string()),
-                    insert_text_format: Some(lsp::InsertTextFormat::PLAIN_TEXT),
-                    filter_text: Some("AGL/".to_string()),
-                    insert_text: Some("AGL/".to_string()),
-                    ..lsp::CompletionItem::default()
-                }],
-            })))
-        });
-    cx.update_editor(|editor, window, cx| {
-        editor.show_completions(&ShowCompletions, window, cx);
-    });
-    cx.executor().run_until_parked();
-    cx.update_editor(|editor, window, cx| {
-        editor.confirm_completion(&ConfirmCompletion::default(), window, cx)
-    });
-    cx.executor().run_until_parked();
-    cx.assert_editor_state(
-        r##"#ifndef BAR_H
-#define BAR_H
-
-#include <stdbool.h>
-
-int fn_branch(bool do_branch1, bool do_branch2);
-
-#endif // BAR_H
-#include "AGL/ˇ"##,
-    );
-
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("\"", window, cx);
-    });
-    cx.executor().run_until_parked();
-    cx.assert_editor_state(
-        r##"#ifndef BAR_H
-#define BAR_H
-
-#include <stdbool.h>
-
-int fn_branch(bool do_branch1, bool do_branch2);
-
-#endif // BAR_H
-#include "AGL/"ˇ"##,
-    );
-}
-
-#[gpui::test]
-async fn test_no_duplicated_completion_requests(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorLspTestContext::new_rust(
-        lsp::ServerCapabilities {
-            completion_provider: Some(lsp::CompletionOptions {
-                trigger_characters: Some(vec![".".to_string()]),
-                resolve_provider: Some(true),
-                ..Default::default()
-            }),
-            ..Default::default()
-        },
-        cx,
-    )
-    .await;
-
-    cx.set_state("fn main() { let a = 2ˇ; }");
-    cx.simulate_keystroke(".");
-    let completion_item = lsp::CompletionItem {
-        label: "Some".into(),
-        kind: Some(lsp::CompletionItemKind::SNIPPET),
-        detail: Some("Wrap the expression in an `Option::Some`".to_string()),
-        documentation: Some(lsp::Documentation::MarkupContent(lsp::MarkupContent {
-            kind: lsp::MarkupKind::Markdown,
-            value: "```rust\nSome(2)\n```".to_string(),
-        })),
-        deprecated: Some(false),
-        sort_text: Some("Some".to_string()),
-        filter_text: Some("Some".to_string()),
-        insert_text_format: Some(lsp::InsertTextFormat::SNIPPET),
-        text_edit: Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
-            range: lsp::Range {
-                start: lsp::Position {
-                    line: 0,
-                    character: 22,
-                },
-                end: lsp::Position {
-                    line: 0,
-                    character: 22,
-                },
-            },
-            new_text: "Some(2)".to_string(),
-        })),
-        additional_text_edits: Some(vec![lsp::TextEdit {
-            range: lsp::Range {
-                start: lsp::Position {
-                    line: 0,
-                    character: 20,
-                },
-                end: lsp::Position {
-                    line: 0,
-                    character: 22,
-                },
-            },
-            new_text: "".to_string(),
-        }]),
-        ..Default::default()
-    };
-
-    let closure_completion_item = completion_item.clone();
-    let counter = Arc::new(AtomicUsize::new(0));
-    let counter_clone = counter.clone();
-    let mut request = cx.set_request_handler::<lsp::request::Completion, _, _>(move |_, _, _| {
-        let task_completion_item = closure_completion_item.clone();
-        counter_clone.fetch_add(1, atomic::Ordering::Release);
-        async move {
-            Ok(Some(lsp::CompletionResponse::List(lsp::CompletionList {
-                is_incomplete: true,
-                item_defaults: None,
-                items: vec![task_completion_item],
-            })))
-        }
-    });
-
-    cx.condition(|editor, _| editor.context_menu_visible())
-        .await;
-    cx.assert_editor_state("fn main() { let a = 2.ˇ; }");
-    assert!(request.next().await.is_some());
-    assert_eq!(counter.load(atomic::Ordering::Acquire), 1);
-
-    cx.simulate_keystrokes("S o m");
-    cx.condition(|editor, _| editor.context_menu_visible())
-        .await;
-    cx.assert_editor_state("fn main() { let a = 2.Somˇ; }");
-    assert!(request.next().await.is_some());
-    assert!(request.next().await.is_some());
-    assert!(request.next().await.is_some());
-    request.close();
-    assert!(request.next().await.is_none());
-    assert_eq!(
-        counter.load(atomic::Ordering::Acquire),
-        4,
-        "With the completions menu open, only one LSP request should happen per input"
-    );
-}
-
-#[gpui::test]
-async fn test_toggle_comment(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    let mut cx = EditorTestContext::new(cx).await;
-    let language = Arc::new(Language::new(
-        LanguageConfig {
-            line_comments: vec!["// ".into(), "//! ".into(), "/// ".into()],
-            ..Default::default()
-        },
-        Some(tree_sitter_rust::LANGUAGE.into()),
-    ));
-    cx.update_buffer(|buffer, cx| buffer.set_language(Some(language), cx));
-
-    // If multiple selections intersect a line, the line is only toggled once.
-    cx.set_state(indoc! {"
-        fn a() {
-            «//b();
-            ˇ»// «c();
-            //ˇ»  d();
-        }
-    "});
-
-    cx.update_editor(|e, window, cx| e.toggle_comments(&ToggleComments::default(), window, cx));
-
-    cx.assert_editor_state(indoc! {"
-        fn a() {
-            «b();
-            c();
-            ˇ» d();
-        }
-    "});
-
-    // The comment prefix is inserted at the same column for every line in a
-    // selection.
-    cx.update_editor(|e, window, cx| e.toggle_comments(&ToggleComments::default(), window, cx));
-
-    cx.assert_editor_state(indoc! {"
-        fn a() {
-            // «b();
-            // c();
-            ˇ»//  d();
-        }
-    "});
-
-    // If a selection ends at the beginning of a line, that line is not toggled.
-    cx.set_selections_state(indoc! {"
-        fn a() {
-            // b();
-            «// c();
-        ˇ»    //  d();
-        }
-    "});
-
-    cx.update_editor(|e, window, cx| e.toggle_comments(&ToggleComments::default(), window, cx));
-
-    cx.assert_editor_state(indoc! {"
-        fn a() {
-            // b();
-            «c();
-        ˇ»    //  d();
-        }
-    "});
-
-    // If a selection span a single line and is empty, the line is toggled.
-    cx.set_state(indoc! {"
-        fn a() {
-            a();
-            b();
-        ˇ
-        }
-    "});
-
-    cx.update_editor(|e, window, cx| e.toggle_comments(&ToggleComments::default(), window, cx));
-
-    cx.assert_editor_state(indoc! {"
-        fn a() {
-            a();
-            b();
-        //•ˇ
-        }
-    "});
-
-    // If a selection span multiple lines, empty lines are not toggled.
-    cx.set_state(indoc! {"
-        fn a() {
-            «a();
-
-            c();ˇ»
-        }
-    "});
-
-    cx.update_editor(|e, window, cx| e.toggle_comments(&ToggleComments::default(), window, cx));
-
-    cx.assert_editor_state(indoc! {"
-        fn a() {
-            // «a();
-
-            // c();ˇ»
-        }
-    "});
-
-    // If a selection includes multiple comment prefixes, all lines are uncommented.
-    cx.set_state(indoc! {"
-        fn a() {
-            «// a();
-            /// b();
-            //! c();ˇ»
-        }
-    "});
-
-    cx.update_editor(|e, window, cx| e.toggle_comments(&ToggleComments::default(), window, cx));
-
-    cx.assert_editor_state(indoc! {"
-        fn a() {
-            «a();
-            b();
-            c();ˇ»
-        }
-    "});
-}
-
-#[gpui::test]
-async fn test_toggle_comment_ignore_indent(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    let mut cx = EditorTestContext::new(cx).await;
-    let language = Arc::new(Language::new(
-        LanguageConfig {
-            line_comments: vec!["// ".into(), "//! ".into(), "/// ".into()],
-            ..Default::default()
-        },
-        Some(tree_sitter_rust::LANGUAGE.into()),
-    ));
-    cx.update_buffer(|buffer, cx| buffer.set_language(Some(language), cx));
-
-    let toggle_comments = &ToggleComments {
-        advance_downwards: false,
-        ignore_indent: true,
-    };
-
-    // If multiple selections intersect a line, the line is only toggled once.
-    cx.set_state(indoc! {"
-        fn a() {
-        //    «b();
-        //    c();
-        //    ˇ» d();
-        }
-    "});
-
-    cx.update_editor(|e, window, cx| e.toggle_comments(toggle_comments, window, cx));
-
-    cx.assert_editor_state(indoc! {"
-        fn a() {
-            «b();
-            c();
-            ˇ» d();
-        }
-    "});
-
-    // The comment prefix is inserted at the beginning of each line
-    cx.update_editor(|e, window, cx| e.toggle_comments(toggle_comments, window, cx));
-
-    cx.assert_editor_state(indoc! {"
-        fn a() {
-        //    «b();
-        //    c();
-        //    ˇ» d();
-        }
-    "});
-
-    // If a selection ends at the beginning of a line, that line is not toggled.
-    cx.set_selections_state(indoc! {"
-        fn a() {
-        //    b();
-        //    «c();
-        ˇ»//     d();
-        }
-    "});
-
-    cx.update_editor(|e, window, cx| e.toggle_comments(toggle_comments, window, cx));
-
-    cx.assert_editor_state(indoc! {"
-        fn a() {
-        //    b();
-            «c();
-        ˇ»//     d();
-        }
-    "});
-
-    // If a selection span a single line and is empty, the line is toggled.
-    cx.set_state(indoc! {"
-        fn a() {
-            a();
-            b();
-        ˇ
-        }
-    "});
-
-    cx.update_editor(|e, window, cx| e.toggle_comments(toggle_comments, window, cx));
-
-    cx.assert_editor_state(indoc! {"
-        fn a() {
-            a();
-            b();
-        //ˇ
-        }
-    "});
-
-    // If a selection span multiple lines, empty lines are not toggled.
-    cx.set_state(indoc! {"
-        fn a() {
-            «a();
-
-            c();ˇ»
-        }
-    "});
-
-    cx.update_editor(|e, window, cx| e.toggle_comments(toggle_comments, window, cx));
-
-    cx.assert_editor_state(indoc! {"
-        fn a() {
-        //    «a();
-
-        //    c();ˇ»
-        }
-    "});
-
-    // If a selection includes multiple comment prefixes, all lines are uncommented.
-    cx.set_state(indoc! {"
-        fn a() {
-        //    «a();
-        ///    b();
-        //!    c();ˇ»
-        }
-    "});
-
-    cx.update_editor(|e, window, cx| e.toggle_comments(toggle_comments, window, cx));
-
-    cx.assert_editor_state(indoc! {"
-        fn a() {
-            «a();
-            b();
-            c();ˇ»
-        }
-    "});
-}
-
-#[gpui::test]
-async fn test_advance_downward_on_toggle_comment(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let language = Arc::new(Language::new(
-        LanguageConfig {
-            line_comments: vec!["// ".into()],
-            ..Default::default()
-        },
-        Some(tree_sitter_rust::LANGUAGE.into()),
-    ));
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    cx.language_registry().add(language.clone());
-    cx.update_buffer(|buffer, cx| {
-        buffer.set_language(Some(language), cx);
-    });
-
-    let toggle_comments = &ToggleComments {
-        advance_downwards: true,
-        ignore_indent: false,
-    };
-
-    // Single cursor on one line -> advance
-    // Cursor moves horizontally 3 characters as well on non-blank line
-    cx.set_state(indoc!(
-        "fn a() {
-             ˇdog();
-             cat();
-        }"
-    ));
-    cx.update_editor(|editor, window, cx| {
-        editor.toggle_comments(toggle_comments, window, cx);
-    });
-    cx.assert_editor_state(indoc!(
-        "fn a() {
-             // dog();
-             catˇ();
-        }"
-    ));
-
-    // Single selection on one line -> don't advance
-    cx.set_state(indoc!(
-        "fn a() {
-             «dog()ˇ»;
-             cat();
-        }"
-    ));
-    cx.update_editor(|editor, window, cx| {
-        editor.toggle_comments(toggle_comments, window, cx);
-    });
-    cx.assert_editor_state(indoc!(
-        "fn a() {
-             // «dog()ˇ»;
-             cat();
-        }"
-    ));
-
-    // Multiple cursors on one line -> advance
-    cx.set_state(indoc!(
-        "fn a() {
-             ˇdˇog();
-             cat();
-        }"
-    ));
-    cx.update_editor(|editor, window, cx| {
-        editor.toggle_comments(toggle_comments, window, cx);
-    });
-    cx.assert_editor_state(indoc!(
-        "fn a() {
-             // dog();
-             catˇ(ˇ);
-        }"
-    ));
-
-    // Multiple cursors on one line, with selection -> don't advance
-    cx.set_state(indoc!(
-        "fn a() {
-             ˇdˇog«()ˇ»;
-             cat();
-        }"
-    ));
-    cx.update_editor(|editor, window, cx| {
-        editor.toggle_comments(toggle_comments, window, cx);
-    });
-    cx.assert_editor_state(indoc!(
-        "fn a() {
-             // ˇdˇog«()ˇ»;
-             cat();
-        }"
-    ));
-
-    // Single cursor on one line -> advance
-    // Cursor moves to column 0 on blank line
-    cx.set_state(indoc!(
-        "fn a() {
-             ˇdog();
-
-             cat();
-        }"
-    ));
-    cx.update_editor(|editor, window, cx| {
-        editor.toggle_comments(toggle_comments, window, cx);
-    });
-    cx.assert_editor_state(indoc!(
-        "fn a() {
-             // dog();
-        ˇ
-             cat();
-        }"
-    ));
-
-    // Single cursor on one line -> advance
-    // Cursor starts and ends at column 0
-    cx.set_state(indoc!(
-        "fn a() {
-         ˇ    dog();
-             cat();
-        }"
-    ));
-    cx.update_editor(|editor, window, cx| {
-        editor.toggle_comments(toggle_comments, window, cx);
-    });
-    cx.assert_editor_state(indoc!(
-        "fn a() {
-             // dog();
-         ˇ    cat();
-        }"
-    ));
-}
-
-#[gpui::test]
-async fn test_toggle_block_comment(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    let html_language = Arc::new(
-        Language::new(
-            LanguageConfig {
-                name: "HTML".into(),
-                block_comment: Some(BlockCommentConfig {
-                    start: "<!-- ".into(),
-                    prefix: "".into(),
-                    end: " -->".into(),
-                    tab_size: 0,
-                }),
-                ..Default::default()
-            },
-            Some(tree_sitter_html::LANGUAGE.into()),
-        )
-        .with_injection_query(
-            r#"
-            (script_element
-                (raw_text) @injection.content
-                (#set! injection.language "javascript"))
-            "#,
-        )
-        .unwrap(),
-    );
-
-    let javascript_language = Arc::new(Language::new(
-        LanguageConfig {
-            name: "JavaScript".into(),
-            line_comments: vec!["// ".into()],
-            ..Default::default()
-        },
-        Some(tree_sitter_typescript::LANGUAGE_TSX.into()),
-    ));
-
-    cx.language_registry().add(html_language.clone());
-    cx.language_registry().add(javascript_language);
-    cx.update_buffer(|buffer, cx| {
-        buffer.set_language(Some(html_language), cx);
-    });
-
-    // Toggle comments for empty selections
-    cx.set_state(
-        &r#"
-            <p>A</p>ˇ
-            <p>B</p>ˇ
-            <p>C</p>ˇ
-        "#
-        .unindent(),
-    );
-    cx.update_editor(|editor, window, cx| {
-        editor.toggle_comments(&ToggleComments::default(), window, cx)
-    });
-    cx.assert_editor_state(
-        &r#"
-            <!-- <p>A</p>ˇ -->
-            <!-- <p>B</p>ˇ -->
-            <!-- <p>C</p>ˇ -->
-        "#
-        .unindent(),
-    );
-    cx.update_editor(|editor, window, cx| {
-        editor.toggle_comments(&ToggleComments::default(), window, cx)
-    });
-    cx.assert_editor_state(
-        &r#"
-            <p>A</p>ˇ
-            <p>B</p>ˇ
-            <p>C</p>ˇ
-        "#
-        .unindent(),
-    );
-
-    // Toggle comments for mixture of empty and non-empty selections, where
-    // multiple selections occupy a given line.
-    cx.set_state(
-        &r#"
-            <p>A«</p>
-            <p>ˇ»B</p>ˇ
-            <p>C«</p>
-            <p>ˇ»D</p>ˇ
-        "#
-        .unindent(),
-    );
-
-    cx.update_editor(|editor, window, cx| {
-        editor.toggle_comments(&ToggleComments::default(), window, cx)
-    });
-    cx.assert_editor_state(
-        &r#"
-            <!-- <p>A«</p>
-            <p>ˇ»B</p>ˇ -->
-            <!-- <p>C«</p>
-            <p>ˇ»D</p>ˇ -->
-        "#
-        .unindent(),
-    );
-    cx.update_editor(|editor, window, cx| {
-        editor.toggle_comments(&ToggleComments::default(), window, cx)
-    });
-    cx.assert_editor_state(
-        &r#"
-            <p>A«</p>
-            <p>ˇ»B</p>ˇ
-            <p>C«</p>
-            <p>ˇ»D</p>ˇ
-        "#
-        .unindent(),
-    );
-
-    // Toggle comments when different languages are active for different
-    // selections.
-    cx.set_state(
-        &r#"
-            ˇ<script>
-                ˇvar x = new Y();
-            ˇ</script>
-        "#
-        .unindent(),
-    );
-    cx.executor().run_until_parked();
-    cx.update_editor(|editor, window, cx| {
-        editor.toggle_comments(&ToggleComments::default(), window, cx)
-    });
-    // TODO this is how it actually worked in Zed Stable, which is not very ergonomic.
-    // Uncommenting and commenting from this position brings in even more wrong artifacts.
-    cx.assert_editor_state(
-        &r#"
-            <!-- ˇ<script> -->
-                // ˇvar x = new Y();
-            <!-- ˇ</script> -->
-        "#
-        .unindent(),
-    );
-}
-
-#[gpui::test]
-fn test_editing_disjoint_excerpts(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let buffer = cx.new(|cx| Buffer::local(sample_text(3, 4, 'a'), cx));
-    let multibuffer = cx.new(|cx| {
-        let mut multibuffer = MultiBuffer::new(ReadWrite);
-        multibuffer.push_excerpts(
-            buffer.clone(),
-            [
-                ExcerptRange::new(Point::new(0, 0)..Point::new(0, 4)),
-                ExcerptRange::new(Point::new(1, 0)..Point::new(1, 4)),
-            ],
-            cx,
-        );
-        assert_eq!(multibuffer.read(cx).text(), "aaaa\nbbbb");
-        multibuffer
-    });
-
-    let (editor, cx) = cx.add_window_view(|window, cx| build_editor(multibuffer, window, cx));
-    editor.update_in(cx, |editor, window, cx| {
-        assert_eq!(editor.text(cx), "aaaa\nbbbb");
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([
-                Point::new(0, 0)..Point::new(0, 0),
-                Point::new(1, 0)..Point::new(1, 0),
-            ])
-        });
-
-        editor.handle_input("X", window, cx);
-        assert_eq!(editor.text(cx), "Xaaaa\nXbbbb");
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            [
-                Point::new(0, 1)..Point::new(0, 1),
-                Point::new(1, 1)..Point::new(1, 1),
-            ]
-        );
-
-        // Ensure the cursor's head is respected when deleting across an excerpt boundary.
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([Point::new(0, 2)..Point::new(1, 2)])
-        });
-        editor.backspace(&Default::default(), window, cx);
-        assert_eq!(editor.text(cx), "Xa\nbbb");
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            [Point::new(1, 0)..Point::new(1, 0)]
-        );
-
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([Point::new(1, 1)..Point::new(0, 1)])
-        });
-        editor.backspace(&Default::default(), window, cx);
-        assert_eq!(editor.text(cx), "X\nbb");
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            [Point::new(0, 1)..Point::new(0, 1)]
-        );
-    });
-}
-
-#[gpui::test]
-fn test_editing_overlapping_excerpts(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let markers = vec![('[', ']').into(), ('(', ')').into()];
-    let (initial_text, mut excerpt_ranges) = marked_text_ranges_by(
-        indoc! {"
-            [aaaa
-            (bbbb]
-            cccc)",
-        },
-        markers.clone(),
-    );
-    let excerpt_ranges = markers.into_iter().map(|marker| {
-        let context = excerpt_ranges.remove(&marker).unwrap()[0].clone();
-        ExcerptRange::new(context)
-    });
-    let buffer = cx.new(|cx| Buffer::local(initial_text, cx));
-    let multibuffer = cx.new(|cx| {
-        let mut multibuffer = MultiBuffer::new(ReadWrite);
-        multibuffer.push_excerpts(buffer, excerpt_ranges, cx);
-        multibuffer
-    });
-
-    let (editor, cx) = cx.add_window_view(|window, cx| build_editor(multibuffer, window, cx));
-    editor.update_in(cx, |editor, window, cx| {
-        let (expected_text, selection_ranges) = marked_text_ranges(
-            indoc! {"
-                aaaa
-                bˇbbb
-                bˇbbˇb
-                cccc"
-            },
-            true,
-        );
-        assert_eq!(editor.text(cx), expected_text);
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges(
-                selection_ranges
-                    .iter()
-                    .map(|range| MultiBufferOffset(range.start)..MultiBufferOffset(range.end)),
-            )
-        });
-
-        editor.handle_input("X", window, cx);
-
-        let (expected_text, expected_selections) = marked_text_ranges(
-            indoc! {"
-                aaaa
-                bXˇbbXb
-                bXˇbbXˇb
-                cccc"
-            },
-            false,
-        );
-        assert_eq!(editor.text(cx), expected_text);
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            expected_selections
-                .iter()
-                .map(|range| MultiBufferOffset(range.start)..MultiBufferOffset(range.end))
-                .collect::<Vec<_>>()
-        );
-
-        editor.newline(&Newline, window, cx);
-        let (expected_text, expected_selections) = marked_text_ranges(
-            indoc! {"
-                aaaa
-                bX
-                ˇbbX
-                b
-                bX
-                ˇbbX
-                ˇb
-                cccc"
-            },
-            false,
-        );
-        assert_eq!(editor.text(cx), expected_text);
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            expected_selections
-                .iter()
-                .map(|range| MultiBufferOffset(range.start)..MultiBufferOffset(range.end))
-                .collect::<Vec<_>>()
-        );
-    });
-}
-
-#[gpui::test]
-fn test_refresh_selections(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let buffer = cx.new(|cx| Buffer::local(sample_text(3, 4, 'a'), cx));
-    let mut excerpt1_id = None;
-    let multibuffer = cx.new(|cx| {
-        let mut multibuffer = MultiBuffer::new(ReadWrite);
-        excerpt1_id = multibuffer
-            .push_excerpts(
-                buffer.clone(),
-                [
-                    ExcerptRange::new(Point::new(0, 0)..Point::new(1, 4)),
-                    ExcerptRange::new(Point::new(1, 0)..Point::new(2, 4)),
-                ],
-                cx,
-            )
-            .into_iter()
-            .next();
-        assert_eq!(multibuffer.read(cx).text(), "aaaa\nbbbb\nbbbb\ncccc");
-        multibuffer
-    });
-
-    let editor = cx.add_window(|window, cx| {
-        let mut editor = build_editor(multibuffer.clone(), window, cx);
-        let snapshot = editor.snapshot(window, cx);
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([Point::new(1, 3)..Point::new(1, 3)])
-        });
-        editor.begin_selection(
-            Point::new(2, 1).to_display_point(&snapshot),
-            true,
-            1,
-            window,
-            cx,
-        );
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            [
-                Point::new(1, 3)..Point::new(1, 3),
-                Point::new(2, 1)..Point::new(2, 1),
-            ]
-        );
-        editor
-    });
-
-    // Refreshing selections is a no-op when excerpts haven't changed.
-    _ = editor.update(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| s.refresh());
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            [
-                Point::new(1, 3)..Point::new(1, 3),
-                Point::new(2, 1)..Point::new(2, 1),
-            ]
-        );
-    });
-
-    multibuffer.update(cx, |multibuffer, cx| {
-        multibuffer.remove_excerpts([excerpt1_id.unwrap()], cx);
-    });
-    _ = editor.update(cx, |editor, window, cx| {
-        // Removing an excerpt causes the first selection to become degenerate.
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            [
-                Point::new(0, 0)..Point::new(0, 0),
-                Point::new(0, 1)..Point::new(0, 1)
-            ]
-        );
-
-        // Refreshing selections will relocate the first selection to the original buffer
-        // location.
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| s.refresh());
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            [
-                Point::new(0, 1)..Point::new(0, 1),
-                Point::new(0, 3)..Point::new(0, 3)
-            ]
-        );
-        assert!(editor.selections.pending_anchor().is_some());
-    });
-}
-
-#[gpui::test]
-fn test_refresh_selections_while_selecting_with_mouse(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let buffer = cx.new(|cx| Buffer::local(sample_text(3, 4, 'a'), cx));
-    let mut excerpt1_id = None;
-    let multibuffer = cx.new(|cx| {
-        let mut multibuffer = MultiBuffer::new(ReadWrite);
-        excerpt1_id = multibuffer
-            .push_excerpts(
-                buffer.clone(),
-                [
-                    ExcerptRange::new(Point::new(0, 0)..Point::new(1, 4)),
-                    ExcerptRange::new(Point::new(1, 0)..Point::new(2, 4)),
-                ],
-                cx,
-            )
-            .into_iter()
-            .next();
-        assert_eq!(multibuffer.read(cx).text(), "aaaa\nbbbb\nbbbb\ncccc");
-        multibuffer
-    });
-
-    let editor = cx.add_window(|window, cx| {
-        let mut editor = build_editor(multibuffer.clone(), window, cx);
-        let snapshot = editor.snapshot(window, cx);
-        editor.begin_selection(
-            Point::new(1, 3).to_display_point(&snapshot),
-            false,
-            1,
-            window,
-            cx,
-        );
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            [Point::new(1, 3)..Point::new(1, 3)]
-        );
-        editor
-    });
-
-    multibuffer.update(cx, |multibuffer, cx| {
-        multibuffer.remove_excerpts([excerpt1_id.unwrap()], cx);
-    });
-    _ = editor.update(cx, |editor, window, cx| {
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            [Point::new(0, 0)..Point::new(0, 0)]
-        );
-
-        // Ensure we don't panic when selections are refreshed and that the pending selection is finalized.
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| s.refresh());
-        assert_eq!(
-            editor.selections.ranges(&editor.display_snapshot(cx)),
-            [Point::new(0, 3)..Point::new(0, 3)]
-        );
-        assert!(editor.selections.pending_anchor().is_some());
-    });
-}
-
-#[gpui::test]
-async fn test_extra_newline_insertion(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let language = Arc::new(
-        Language::new(
-            LanguageConfig {
-                brackets: BracketPairConfig {
-                    pairs: vec![
-                        BracketPair {
-                            start: "{".to_string(),
-                            end: "}".to_string(),
-                            close: true,
-                            surround: true,
-                            newline: true,
-                        },
-                        BracketPair {
-                            start: "/* ".to_string(),
-                            end: " */".to_string(),
-                            close: true,
-                            surround: true,
-                            newline: true,
-                        },
-                    ],
-                    ..Default::default()
-                },
-                ..Default::default()
-            },
-            Some(tree_sitter_rust::LANGUAGE.into()),
-        )
-        .with_indents_query("")
-        .unwrap(),
-    );
-
-    let text = concat!(
-        "{   }\n",     //
-        "  x\n",       //
-        "  /*   */\n", //
-        "x\n",         //
-        "{{} }\n",     //
-    );
-
-    let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(language, cx));
-    let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-    let (editor, cx) = cx.add_window_view(|window, cx| build_editor(buffer, window, cx));
-    editor
-        .condition::<crate::EditorEvent>(cx, |editor, cx| !editor.buffer.read(cx).is_parsing(cx))
-        .await;
-
-    editor.update_in(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_display_ranges([
-                DisplayPoint::new(DisplayRow(0), 2)..DisplayPoint::new(DisplayRow(0), 3),
-                DisplayPoint::new(DisplayRow(2), 5)..DisplayPoint::new(DisplayRow(2), 5),
-                DisplayPoint::new(DisplayRow(4), 4)..DisplayPoint::new(DisplayRow(4), 4),
-            ])
-        });
-        editor.newline(&Newline, window, cx);
-
-        assert_eq!(
-            editor.buffer().read(cx).read(cx).text(),
-            concat!(
-                "{ \n",    // Suppress rustfmt
-                "\n",      //
-                "}\n",     //
-                "  x\n",   //
-                "  /* \n", //
-                "  \n",    //
-                "  */\n",  //
-                "x\n",     //
-                "{{} \n",  //
-                "}\n",     //
-            )
-        );
-    });
-}
-
-#[gpui::test]
-fn test_highlighted_ranges(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let editor = cx.add_window(|window, cx| {
-        let buffer = MultiBuffer::build_simple(&sample_text(16, 8, 'a'), cx);
-        build_editor(buffer, window, cx)
-    });
-
-    _ = editor.update(cx, |editor, window, cx| {
-        struct Type1;
-        struct Type2;
-
-        let buffer = editor.buffer.read(cx).snapshot(cx);
-
-        let anchor_range =
-            |range: Range<Point>| buffer.anchor_after(range.start)..buffer.anchor_after(range.end);
-
-        editor.highlight_background::<Type1>(
-            &[
-                anchor_range(Point::new(2, 1)..Point::new(2, 3)),
-                anchor_range(Point::new(4, 2)..Point::new(4, 4)),
-                anchor_range(Point::new(6, 3)..Point::new(6, 5)),
-                anchor_range(Point::new(8, 4)..Point::new(8, 6)),
-            ],
-            |_, _| Hsla::red(),
-            cx,
-        );
-        editor.highlight_background::<Type2>(
-            &[
-                anchor_range(Point::new(3, 2)..Point::new(3, 5)),
-                anchor_range(Point::new(5, 3)..Point::new(5, 6)),
-                anchor_range(Point::new(7, 4)..Point::new(7, 7)),
-                anchor_range(Point::new(9, 5)..Point::new(9, 8)),
-            ],
-            |_, _| Hsla::green(),
-            cx,
-        );
-
-        let snapshot = editor.snapshot(window, cx);
-        let highlighted_ranges = editor.sorted_background_highlights_in_range(
-            anchor_range(Point::new(3, 4)..Point::new(7, 4)),
-            &snapshot,
-            cx.theme(),
-        );
-        assert_eq!(
-            highlighted_ranges,
-            &[
-                (
-                    DisplayPoint::new(DisplayRow(3), 2)..DisplayPoint::new(DisplayRow(3), 5),
-                    Hsla::green(),
-                ),
-                (
-                    DisplayPoint::new(DisplayRow(4), 2)..DisplayPoint::new(DisplayRow(4), 4),
-                    Hsla::red(),
-                ),
-                (
-                    DisplayPoint::new(DisplayRow(5), 3)..DisplayPoint::new(DisplayRow(5), 6),
-                    Hsla::green(),
-                ),
-                (
-                    DisplayPoint::new(DisplayRow(6), 3)..DisplayPoint::new(DisplayRow(6), 5),
-                    Hsla::red(),
-                ),
-            ]
-        );
-        assert_eq!(
-            editor.sorted_background_highlights_in_range(
-                anchor_range(Point::new(5, 6)..Point::new(6, 4)),
-                &snapshot,
-                cx.theme(),
-            ),
-            &[(
-                DisplayPoint::new(DisplayRow(6), 3)..DisplayPoint::new(DisplayRow(6), 5),
-                Hsla::red(),
-            )]
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_following(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let fs = FakeFs::new(cx.executor());
-    let project = Project::test(fs, ["/file.rs".as_ref()], cx).await;
-
-    let buffer = project.update(cx, |project, cx| {
-        let buffer = project.create_local_buffer(&sample_text(16, 8, 'a'), None, false, cx);
-        cx.new(|cx| MultiBuffer::singleton(buffer, cx))
-    });
-    let leader = cx.add_window(|window, cx| build_editor(buffer.clone(), window, cx));
-    let follower = cx.update(|cx| {
-        cx.open_window(
-            WindowOptions {
-                window_bounds: Some(WindowBounds::Windowed(Bounds::from_corners(
-                    gpui::Point::new(px(0.), px(0.)),
-                    gpui::Point::new(px(10.), px(80.)),
-                ))),
-                ..Default::default()
-            },
-            |window, cx| cx.new(|cx| build_editor(buffer.clone(), window, cx)),
-        )
-        .unwrap()
-    });
-
-    let is_still_following = Rc::new(RefCell::new(true));
-    let follower_edit_event_count = Rc::new(RefCell::new(0));
-    let pending_update = Rc::new(RefCell::new(None));
-    let leader_entity = leader.root(cx).unwrap();
-    let follower_entity = follower.root(cx).unwrap();
-    _ = follower.update(cx, {
-        let update = pending_update.clone();
-        let is_still_following = is_still_following.clone();
-        let follower_edit_event_count = follower_edit_event_count.clone();
-        |_, window, cx| {
-            cx.subscribe_in(
-                &leader_entity,
-                window,
-                move |_, leader, event, window, cx| {
-                    leader.read(cx).add_event_to_update_proto(
-                        event,
-                        &mut update.borrow_mut(),
-                        window,
-                        cx,
-                    );
-                },
-            )
-            .detach();
-
-            cx.subscribe_in(
-                &follower_entity,
-                window,
-                move |_, _, event: &EditorEvent, _window, _cx| {
-                    if matches!(Editor::to_follow_event(event), Some(FollowEvent::Unfollow)) {
-                        *is_still_following.borrow_mut() = false;
-                    }
-
-                    if let EditorEvent::BufferEdited = event {
-                        *follower_edit_event_count.borrow_mut() += 1;
-                    }
-                },
-            )
-            .detach();
-        }
-    });
-
-    // Update the selections only
-    _ = leader.update(cx, |leader, window, cx| {
-        leader.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([MultiBufferOffset(1)..MultiBufferOffset(1)])
-        });
-    });
-    follower
-        .update(cx, |follower, window, cx| {
-            follower.apply_update_proto(
-                &project,
-                pending_update.borrow_mut().take().unwrap(),
-                window,
-                cx,
-            )
-        })
-        .unwrap()
-        .await
-        .unwrap();
-    _ = follower.update(cx, |follower, _, cx| {
-        assert_eq!(
-            follower.selections.ranges(&follower.display_snapshot(cx)),
-            vec![MultiBufferOffset(1)..MultiBufferOffset(1)]
-        );
-    });
-    assert!(*is_still_following.borrow());
-    assert_eq!(*follower_edit_event_count.borrow(), 0);
-
-    // Update the scroll position only
-    _ = leader.update(cx, |leader, window, cx| {
-        leader.set_scroll_position(gpui::Point::new(1.5, 3.5), window, cx);
-    });
-    follower
-        .update(cx, |follower, window, cx| {
-            follower.apply_update_proto(
-                &project,
-                pending_update.borrow_mut().take().unwrap(),
-                window,
-                cx,
-            )
-        })
-        .unwrap()
-        .await
-        .unwrap();
-    assert_eq!(
-        follower
-            .update(cx, |follower, _, cx| follower.scroll_position(cx))
-            .unwrap(),
-        gpui::Point::new(1.5, 3.5)
-    );
-    assert!(*is_still_following.borrow());
-    assert_eq!(*follower_edit_event_count.borrow(), 0);
-
-    // Update the selections and scroll position. The follower's scroll position is updated
-    // via autoscroll, not via the leader's exact scroll position.
-    _ = leader.update(cx, |leader, window, cx| {
-        leader.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([MultiBufferOffset(0)..MultiBufferOffset(0)])
-        });
-        leader.request_autoscroll(Autoscroll::newest(), cx);
-        leader.set_scroll_position(gpui::Point::new(1.5, 3.5), window, cx);
-    });
-    follower
-        .update(cx, |follower, window, cx| {
-            follower.apply_update_proto(
-                &project,
-                pending_update.borrow_mut().take().unwrap(),
-                window,
-                cx,
-            )
-        })
-        .unwrap()
-        .await
-        .unwrap();
-    _ = follower.update(cx, |follower, _, cx| {
-        assert_eq!(follower.scroll_position(cx), gpui::Point::new(1.5, 0.0));
-        assert_eq!(
-            follower.selections.ranges(&follower.display_snapshot(cx)),
-            vec![MultiBufferOffset(0)..MultiBufferOffset(0)]
-        );
-    });
-    assert!(*is_still_following.borrow());
-
-    // Creating a pending selection that precedes another selection
-    _ = leader.update(cx, |leader, window, cx| {
-        leader.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([MultiBufferOffset(1)..MultiBufferOffset(1)])
-        });
-        leader.begin_selection(DisplayPoint::new(DisplayRow(0), 0), true, 1, window, cx);
-    });
-    follower
-        .update(cx, |follower, window, cx| {
-            follower.apply_update_proto(
-                &project,
-                pending_update.borrow_mut().take().unwrap(),
-                window,
-                cx,
-            )
-        })
-        .unwrap()
-        .await
-        .unwrap();
-    _ = follower.update(cx, |follower, _, cx| {
-        assert_eq!(
-            follower.selections.ranges(&follower.display_snapshot(cx)),
-            vec![
-                MultiBufferOffset(0)..MultiBufferOffset(0),
-                MultiBufferOffset(1)..MultiBufferOffset(1)
-            ]
-        );
-    });
-    assert!(*is_still_following.borrow());
-
-    // Extend the pending selection so that it surrounds another selection
-    _ = leader.update(cx, |leader, window, cx| {
-        leader.extend_selection(DisplayPoint::new(DisplayRow(0), 2), 1, window, cx);
-    });
-    follower
-        .update(cx, |follower, window, cx| {
-            follower.apply_update_proto(
-                &project,
-                pending_update.borrow_mut().take().unwrap(),
-                window,
-                cx,
-            )
-        })
-        .unwrap()
-        .await
-        .unwrap();
-    _ = follower.update(cx, |follower, _, cx| {
-        assert_eq!(
-            follower.selections.ranges(&follower.display_snapshot(cx)),
-            vec![MultiBufferOffset(0)..MultiBufferOffset(2)]
-        );
-    });
-
-    // Scrolling locally breaks the follow
-    _ = follower.update(cx, |follower, window, cx| {
-        let top_anchor = follower
-            .buffer()
-            .read(cx)
-            .read(cx)
-            .anchor_after(MultiBufferOffset(0));
-        follower.set_scroll_anchor(
-            ScrollAnchor {
-                anchor: top_anchor,
-                offset: gpui::Point::new(0.0, 0.5),
-            },
-            window,
-            cx,
-        );
-    });
-    assert!(!(*is_still_following.borrow()));
-}
-
-#[gpui::test]
-async fn test_following_with_multiple_excerpts(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let fs = FakeFs::new(cx.executor());
-    let project = Project::test(fs, ["/file.rs".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let pane = workspace
-        .update(cx, |workspace, _, _| workspace.active_pane().clone())
-        .unwrap();
-
-    let cx = &mut VisualTestContext::from_window(*workspace.deref(), cx);
-
-    let leader = pane.update_in(cx, |_, window, cx| {
-        let multibuffer = cx.new(|_| MultiBuffer::new(ReadWrite));
-        cx.new(|cx| build_editor(multibuffer.clone(), window, cx))
-    });
-
-    // Start following the editor when it has no excerpts.
-    let mut state_message =
-        leader.update_in(cx, |leader, window, cx| leader.to_state_proto(window, cx));
-    let workspace_entity = workspace.root(cx).unwrap();
-    let follower_1 = cx
-        .update_window(*workspace.deref(), |_, window, cx| {
-            Editor::from_state_proto(
-                workspace_entity,
-                ViewId {
-                    creator: CollaboratorId::PeerId(PeerId::default()),
-                    id: 0,
-                },
-                &mut state_message,
-                window,
-                cx,
-            )
-        })
-        .unwrap()
-        .unwrap()
-        .await
-        .unwrap();
-
-    let update_message = Rc::new(RefCell::new(None));
-    follower_1.update_in(cx, {
-        let update = update_message.clone();
-        |_, window, cx| {
-            cx.subscribe_in(&leader, window, move |_, leader, event, window, cx| {
-                leader.read(cx).add_event_to_update_proto(
-                    event,
-                    &mut update.borrow_mut(),
-                    window,
-                    cx,
-                );
-            })
-            .detach();
-        }
-    });
-
-    let (buffer_1, buffer_2) = project.update(cx, |project, cx| {
-        (
-            project.create_local_buffer("abc\ndef\nghi\njkl\n", None, false, cx),
-            project.create_local_buffer("mno\npqr\nstu\nvwx\n", None, false, cx),
-        )
-    });
-
-    // Insert some excerpts.
-    leader.update(cx, |leader, cx| {
-        leader.buffer.update(cx, |multibuffer, cx| {
-            multibuffer.set_excerpts_for_path(
-                PathKey::with_sort_prefix(1, rel_path("b.txt").into_arc()),
-                buffer_1.clone(),
-                vec![
-                    Point::row_range(0..3),
-                    Point::row_range(1..6),
-                    Point::row_range(12..15),
-                ],
-                0,
-                cx,
-            );
-            multibuffer.set_excerpts_for_path(
-                PathKey::with_sort_prefix(1, rel_path("a.txt").into_arc()),
-                buffer_2.clone(),
-                vec![Point::row_range(0..6), Point::row_range(8..12)],
-                0,
-                cx,
-            );
-        });
-    });
-
-    // Apply the update of adding the excerpts.
-    follower_1
-        .update_in(cx, |follower, window, cx| {
-            follower.apply_update_proto(
-                &project,
-                update_message.borrow().clone().unwrap(),
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-    assert_eq!(
-        follower_1.update(cx, |editor, cx| editor.text(cx)),
-        leader.update(cx, |editor, cx| editor.text(cx))
-    );
-    update_message.borrow_mut().take();
-
-    // Start following separately after it already has excerpts.
-    let mut state_message =
-        leader.update_in(cx, |leader, window, cx| leader.to_state_proto(window, cx));
-    let workspace_entity = workspace.root(cx).unwrap();
-    let follower_2 = cx
-        .update_window(*workspace.deref(), |_, window, cx| {
-            Editor::from_state_proto(
-                workspace_entity,
-                ViewId {
-                    creator: CollaboratorId::PeerId(PeerId::default()),
-                    id: 0,
-                },
-                &mut state_message,
-                window,
-                cx,
-            )
-        })
-        .unwrap()
-        .unwrap()
-        .await
-        .unwrap();
-    assert_eq!(
-        follower_2.update(cx, |editor, cx| editor.text(cx)),
-        leader.update(cx, |editor, cx| editor.text(cx))
-    );
-
-    // Remove some excerpts.
-    leader.update(cx, |leader, cx| {
-        leader.buffer.update(cx, |multibuffer, cx| {
-            let excerpt_ids = multibuffer.excerpt_ids();
-            multibuffer.remove_excerpts([excerpt_ids[1], excerpt_ids[2]], cx);
-            multibuffer.remove_excerpts([excerpt_ids[0]], cx);
-        });
-    });
-
-    // Apply the update of removing the excerpts.
-    follower_1
-        .update_in(cx, |follower, window, cx| {
-            follower.apply_update_proto(
-                &project,
-                update_message.borrow().clone().unwrap(),
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-    follower_2
-        .update_in(cx, |follower, window, cx| {
-            follower.apply_update_proto(
-                &project,
-                update_message.borrow().clone().unwrap(),
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-    update_message.borrow_mut().take();
-    assert_eq!(
-        follower_1.update(cx, |editor, cx| editor.text(cx)),
-        leader.update(cx, |editor, cx| editor.text(cx))
-    );
-}
-
-#[gpui::test]
-async fn go_to_prev_overlapping_diagnostic(executor: BackgroundExecutor, cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-    let lsp_store =
-        cx.update_editor(|editor, _, cx| editor.project().unwrap().read(cx).lsp_store());
-
-    cx.set_state(indoc! {"
-        ˇfn func(abc def: i32) -> u32 {
-        }
-    "});
-
-    cx.update(|_, cx| {
-        lsp_store.update(cx, |lsp_store, cx| {
-            lsp_store
-                .update_diagnostics(
-                    LanguageServerId(0),
-                    lsp::PublishDiagnosticsParams {
-                        uri: lsp::Uri::from_file_path(path!("/root/file")).unwrap(),
-                        version: None,
-                        diagnostics: vec![
-                            lsp::Diagnostic {
-                                range: lsp::Range::new(
-                                    lsp::Position::new(0, 11),
-                                    lsp::Position::new(0, 12),
-                                ),
-                                severity: Some(lsp::DiagnosticSeverity::ERROR),
-                                ..Default::default()
-                            },
-                            lsp::Diagnostic {
-                                range: lsp::Range::new(
-                                    lsp::Position::new(0, 12),
-                                    lsp::Position::new(0, 15),
-                                ),
-                                severity: Some(lsp::DiagnosticSeverity::ERROR),
-                                ..Default::default()
-                            },
-                            lsp::Diagnostic {
-                                range: lsp::Range::new(
-                                    lsp::Position::new(0, 25),
-                                    lsp::Position::new(0, 28),
-                                ),
-                                severity: Some(lsp::DiagnosticSeverity::ERROR),
-                                ..Default::default()
-                            },
-                        ],
-                    },
-                    None,
-                    DiagnosticSourceKind::Pushed,
-                    &[],
-                    cx,
-                )
-                .unwrap()
-        });
-    });
-
-    executor.run_until_parked();
-
-    cx.update_editor(|editor, window, cx| {
-        editor.go_to_prev_diagnostic(&GoToPreviousDiagnostic::default(), window, cx);
-    });
-
-    cx.assert_editor_state(indoc! {"
-        fn func(abc def: i32) -> ˇu32 {
-        }
-    "});
-
-    cx.update_editor(|editor, window, cx| {
-        editor.go_to_prev_diagnostic(&GoToPreviousDiagnostic::default(), window, cx);
-    });
-
-    cx.assert_editor_state(indoc! {"
-        fn func(abc ˇdef: i32) -> u32 {
-        }
-    "});
-
-    cx.update_editor(|editor, window, cx| {
-        editor.go_to_prev_diagnostic(&GoToPreviousDiagnostic::default(), window, cx);
-    });
-
-    cx.assert_editor_state(indoc! {"
-        fn func(abcˇ def: i32) -> u32 {
-        }
-    "});
-
-    cx.update_editor(|editor, window, cx| {
-        editor.go_to_prev_diagnostic(&GoToPreviousDiagnostic::default(), window, cx);
-    });
-
-    cx.assert_editor_state(indoc! {"
-        fn func(abc def: i32) -> ˇu32 {
-        }
-    "});
-}
-
-#[gpui::test]
-async fn test_go_to_hunk(executor: BackgroundExecutor, cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    let diff_base = r#"
-        use some::mod;
-
-        const A: u32 = 42;
-
-        fn main() {
-            println!("hello");
-
-            println!("world");
-        }
-        "#
-    .unindent();
-
-    // Edits are modified, removed, modified, added
-    cx.set_state(
-        &r#"
-        use some::modified;
-
-        ˇ
-        fn main() {
-            println!("hello there");
-
-            println!("around the");
-            println!("world");
-        }
-        "#
-        .unindent(),
-    );
-
-    cx.set_head_text(&diff_base);
-    executor.run_until_parked();
-
-    cx.update_editor(|editor, window, cx| {
-        //Wrap around the bottom of the buffer
-        for _ in 0..3 {
-            editor.go_to_next_hunk(&GoToHunk, window, cx);
-        }
-    });
-
-    cx.assert_editor_state(
-        &r#"
-        ˇuse some::modified;
-
-
-        fn main() {
-            println!("hello there");
-
-            println!("around the");
-            println!("world");
-        }
-        "#
-        .unindent(),
-    );
-
-    cx.update_editor(|editor, window, cx| {
-        //Wrap around the top of the buffer
-        for _ in 0..2 {
-            editor.go_to_prev_hunk(&GoToPreviousHunk, window, cx);
-        }
-    });
-
-    cx.assert_editor_state(
-        &r#"
-        use some::modified;
-
-
-        fn main() {
-        ˇ    println!("hello there");
-
-            println!("around the");
-            println!("world");
-        }
-        "#
-        .unindent(),
-    );
-
-    cx.update_editor(|editor, window, cx| {
-        editor.go_to_prev_hunk(&GoToPreviousHunk, window, cx);
-    });
-
-    cx.assert_editor_state(
-        &r#"
-        use some::modified;
-
-        ˇ
-        fn main() {
-            println!("hello there");
-
-            println!("around the");
-            println!("world");
-        }
-        "#
-        .unindent(),
-    );
-
-    cx.update_editor(|editor, window, cx| {
-        editor.go_to_prev_hunk(&GoToPreviousHunk, window, cx);
-    });
-
-    cx.assert_editor_state(
-        &r#"
-        ˇuse some::modified;
-
-
-        fn main() {
-            println!("hello there");
-
-            println!("around the");
-            println!("world");
-        }
-        "#
-        .unindent(),
-    );
-
-    cx.update_editor(|editor, window, cx| {
-        for _ in 0..2 {
-            editor.go_to_prev_hunk(&GoToPreviousHunk, window, cx);
-        }
-    });
-
-    cx.assert_editor_state(
-        &r#"
-        use some::modified;
-
-
-        fn main() {
-        ˇ    println!("hello there");
-
-            println!("around the");
-            println!("world");
-        }
-        "#
-        .unindent(),
-    );
-
-    cx.update_editor(|editor, window, cx| {
-        editor.fold(&Fold, window, cx);
-    });
-
-    cx.update_editor(|editor, window, cx| {
-        editor.go_to_next_hunk(&GoToHunk, window, cx);
-    });
-
-    cx.assert_editor_state(
-        &r#"
-        ˇuse some::modified;
-
-
-        fn main() {
-            println!("hello there");
-
-            println!("around the");
-            println!("world");
-        }
-        "#
-        .unindent(),
-    );
-}
-
-#[test]
-fn test_split_words() {
-    fn split(text: &str) -> Vec<&str> {
-        split_words(text).collect()
-    }
-
-    assert_eq!(split("HelloWorld"), &["Hello", "World"]);
-    assert_eq!(split("hello_world"), &["hello_", "world"]);
-    assert_eq!(split("_hello_world_"), &["_", "hello_", "world_"]);
-    assert_eq!(split("Hello_World"), &["Hello_", "World"]);
-    assert_eq!(split("helloWOrld"), &["hello", "WOrld"]);
-    assert_eq!(split("helloworld"), &["helloworld"]);
-
-    assert_eq!(split(":do_the_thing"), &[":", "do_", "the_", "thing"]);
-}
-
-#[test]
-fn test_split_words_for_snippet_prefix() {
-    fn split(text: &str) -> Vec<&str> {
-        snippet_candidate_suffixes(text, |c| c.is_alphanumeric() || c == '_').collect()
-    }
-
-    assert_eq!(split("HelloWorld"), &["HelloWorld"]);
-    assert_eq!(split("hello_world"), &["hello_world"]);
-    assert_eq!(split("_hello_world_"), &["_hello_world_"]);
-    assert_eq!(split("Hello_World"), &["Hello_World"]);
-    assert_eq!(split("helloWOrld"), &["helloWOrld"]);
-    assert_eq!(split("helloworld"), &["helloworld"]);
-    assert_eq!(
-        split("this@is!@#$^many   . symbols"),
-        &[
-            "symbols",
-            " symbols",
-            ". symbols",
-            " . symbols",
-            "  . symbols",
-            "   . symbols",
-            "many   . symbols",
-            "^many   . symbols",
-            "$^many   . symbols",
-            "#$^many   . symbols",
-            "@#$^many   . symbols",
-            "!@#$^many   . symbols",
-            "is!@#$^many   . symbols",
-            "@is!@#$^many   . symbols",
-            "this@is!@#$^many   . symbols",
-        ],
-    );
-    assert_eq!(split("a.s"), &["s", ".s", "a.s"]);
-}
-
-#[gpui::test]
-async fn test_move_to_enclosing_bracket(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorLspTestContext::new_typescript(Default::default(), cx).await;
-
-    #[track_caller]
-    fn assert(before: &str, after: &str, cx: &mut EditorLspTestContext) {
-        let _state_context = cx.set_state(before);
-        cx.run_until_parked();
-        cx.update_editor(|editor, window, cx| {
-            editor.move_to_enclosing_bracket(&MoveToEnclosingBracket, window, cx)
-        });
-        cx.run_until_parked();
-        cx.assert_editor_state(after);
-    }
-
-    // Outside bracket jumps to outside of matching bracket
-    assert("console.logˇ(var);", "console.log(var)ˇ;", &mut cx);
-    assert("console.log(var)ˇ;", "console.logˇ(var);", &mut cx);
-
-    // Inside bracket jumps to inside of matching bracket
-    assert("console.log(ˇvar);", "console.log(varˇ);", &mut cx);
-    assert("console.log(varˇ);", "console.log(ˇvar);", &mut cx);
-
-    // When outside a bracket and inside, favor jumping to the inside bracket
-    assert(
-        "console.log('foo', [1, 2, 3]ˇ);",
-        "console.log('foo', ˇ[1, 2, 3]);",
-        &mut cx,
-    );
-    assert(
-        "console.log(ˇ'foo', [1, 2, 3]);",
-        "console.log('foo'ˇ, [1, 2, 3]);",
-        &mut cx,
-    );
-
-    // Bias forward if two options are equally likely
-    assert(
-        "let result = curried_fun()ˇ();",
-        "let result = curried_fun()()ˇ;",
-        &mut cx,
-    );
-
-    // If directly adjacent to a smaller pair but inside a larger (not adjacent), pick the smaller
-    assert(
-        indoc! {"
-            function test() {
-                console.log('test')ˇ
-            }"},
-        indoc! {"
-            function test() {
-                console.logˇ('test')
-            }"},
-        &mut cx,
-    );
-}
-
-#[gpui::test]
-async fn test_move_to_enclosing_bracket_in_markdown_code_block(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    let language_registry = Arc::new(language::LanguageRegistry::test(cx.executor()));
-    language_registry.add(markdown_lang());
-    language_registry.add(rust_lang());
-    let buffer = cx.new(|cx| {
-        let mut buffer = language::Buffer::local(
-            indoc! {"
-            ```rs
-            impl Worktree {
-                pub async fn open_buffers(&self, path: &Path) -> impl Iterator<&Buffer> {
-                }
-            }
-            ```
-        "},
-            cx,
-        );
-        buffer.set_language_registry(language_registry.clone());
-        buffer.set_language(Some(markdown_lang()), cx);
-        buffer
-    });
-    let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-    let editor = cx.add_window(|window, cx| build_editor(buffer.clone(), window, cx));
-    cx.executor().run_until_parked();
-    _ = editor.update(cx, |editor, window, cx| {
-        // Case 1: Test outer enclosing brackets
-        select_ranges(
-            editor,
-            &indoc! {"
-                ```rs
-                impl Worktree {
-                    pub async fn open_buffers(&self, path: &Path) -> impl Iterator<&Buffer> {
-                    }
-                }ˇ
-                ```
-            "},
-            window,
-            cx,
-        );
-        editor.move_to_enclosing_bracket(&MoveToEnclosingBracket, window, cx);
-        assert_text_with_selections(
-            editor,
-            &indoc! {"
-                ```rs
-                impl Worktree ˇ{
-                    pub async fn open_buffers(&self, path: &Path) -> impl Iterator<&Buffer> {
-                    }
-                }
-                ```
-            "},
-            cx,
-        );
-        // Case 2: Test inner enclosing brackets
-        select_ranges(
-            editor,
-            &indoc! {"
-                ```rs
-                impl Worktree {
-                    pub async fn open_buffers(&self, path: &Path) -> impl Iterator<&Buffer> {
-                    }ˇ
-                }
-                ```
-            "},
-            window,
-            cx,
-        );
-        editor.move_to_enclosing_bracket(&MoveToEnclosingBracket, window, cx);
-        assert_text_with_selections(
-            editor,
-            &indoc! {"
-                ```rs
-                impl Worktree {
-                    pub async fn open_buffers(&self, path: &Path) -> impl Iterator<&Buffer> ˇ{
-                    }
-                }
-                ```
-            "},
-            cx,
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_on_type_formatting_not_triggered(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/a"),
-        json!({
-            "main.rs": "fn main() { let a = 5; }",
-            "other.rs": "// Test file",
-        }),
-    )
-    .await;
-    let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
-
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-    language_registry.add(Arc::new(Language::new(
-        LanguageConfig {
-            name: "Rust".into(),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["rs".to_string()],
-                ..Default::default()
-            },
-            brackets: BracketPairConfig {
-                pairs: vec![BracketPair {
-                    start: "{".to_string(),
-                    end: "}".to_string(),
-                    close: true,
-                    surround: true,
-                    newline: true,
-                }],
-                disabled_scopes_by_bracket_ix: Vec::new(),
-            },
-            ..Default::default()
-        },
-        Some(tree_sitter_rust::LANGUAGE.into()),
-    )));
-    let mut fake_servers = language_registry.register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            capabilities: lsp::ServerCapabilities {
-                document_on_type_formatting_provider: Some(lsp::DocumentOnTypeFormattingOptions {
-                    first_trigger_character: "{".to_string(),
-                    more_trigger_character: None,
-                }),
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-    );
-
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-    let worktree_id = workspace
-        .update(cx, |workspace, _, cx| {
-            workspace.project().update(cx, |project, cx| {
-                project.worktrees(cx).next().unwrap().read(cx).id()
-            })
-        })
-        .unwrap();
-
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer(path!("/a/main.rs"), cx)
-        })
-        .await
-        .unwrap();
-    let editor_handle = workspace
-        .update(cx, |workspace, window, cx| {
-            workspace.open_path((worktree_id, rel_path("main.rs")), None, true, window, cx)
-        })
-        .unwrap()
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-
-    cx.executor().start_waiting();
-    let fake_server = fake_servers.next().await.unwrap();
-
-    fake_server.set_request_handler::<lsp::request::OnTypeFormatting, _, _>(
-        |params, _| async move {
-            assert_eq!(
-                params.text_document_position.text_document.uri,
-                lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap(),
-            );
-            assert_eq!(
-                params.text_document_position.position,
-                lsp::Position::new(0, 21),
-            );
-
-            Ok(Some(vec![lsp::TextEdit {
-                new_text: "]".to_string(),
-                range: lsp::Range::new(lsp::Position::new(0, 22), lsp::Position::new(0, 22)),
-            }]))
-        },
-    );
-
-    editor_handle.update_in(cx, |editor, window, cx| {
-        window.focus(&editor.focus_handle(cx));
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([Point::new(0, 21)..Point::new(0, 20)])
-        });
-        editor.handle_input("{", window, cx);
-    });
-
-    cx.executor().run_until_parked();
-
-    buffer.update(cx, |buffer, _| {
-        assert_eq!(
-            buffer.text(),
-            "fn main() { let a = {5}; }",
-            "No extra braces from on type formatting should appear in the buffer"
-        )
-    });
-}
-
-#[gpui::test(iterations = 20, seeds(31))]
-async fn test_on_type_formatting_is_applied_after_autoindent(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorLspTestContext::new_rust(
-        lsp::ServerCapabilities {
-            document_on_type_formatting_provider: Some(lsp::DocumentOnTypeFormattingOptions {
-                first_trigger_character: ".".to_string(),
-                more_trigger_character: None,
-            }),
-            ..Default::default()
-        },
-        cx,
-    )
-    .await;
-
-    cx.update_buffer(|buffer, _| {
-        // This causes autoindent to be async.
-        buffer.set_sync_parse_timeout(Duration::ZERO)
-    });
-
-    cx.set_state("fn c() {\n    d()ˇ\n}\n");
-    cx.simulate_keystroke("\n");
-    cx.run_until_parked();
-
-    let buffer_cloned = cx.multibuffer(|multi_buffer, _| multi_buffer.as_singleton().unwrap());
-    let mut request =
-        cx.set_request_handler::<lsp::request::OnTypeFormatting, _, _>(move |_, _, mut cx| {
-            let buffer_cloned = buffer_cloned.clone();
-            async move {
-                buffer_cloned.update(&mut cx, |buffer, _| {
-                    assert_eq!(
-                        buffer.text(),
-                        "fn c() {\n    d()\n        .\n}\n",
-                        "OnTypeFormatting should triggered after autoindent applied"
-                    )
-                })?;
-
-                Ok(Some(vec![]))
-            }
-        });
-
-    cx.simulate_keystroke(".");
-    cx.run_until_parked();
-
-    cx.assert_editor_state("fn c() {\n    d()\n        .ˇ\n}\n");
-    assert!(request.next().await.is_some());
-    request.close();
-    assert!(request.next().await.is_none());
-}
-
-#[gpui::test]
-async fn test_language_server_restart_due_to_settings_change(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/a"),
-        json!({
-            "main.rs": "fn main() { let a = 5; }",
-            "other.rs": "// Test file",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
-
-    let server_restarts = Arc::new(AtomicUsize::new(0));
-    let closure_restarts = Arc::clone(&server_restarts);
-    let language_server_name = "test language server";
-    let language_name: LanguageName = "Rust".into();
-
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-    language_registry.add(Arc::new(Language::new(
-        LanguageConfig {
-            name: language_name.clone(),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["rs".to_string()],
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-        Some(tree_sitter_rust::LANGUAGE.into()),
-    )));
-    let mut fake_servers = language_registry.register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            name: language_server_name,
-            initialization_options: Some(json!({
-                "testOptionValue": true
-            })),
-            initializer: Some(Box::new(move |fake_server| {
-                let task_restarts = Arc::clone(&closure_restarts);
-                fake_server.set_request_handler::<lsp::request::Shutdown, _, _>(move |_, _| {
-                    task_restarts.fetch_add(1, atomic::Ordering::Release);
-                    futures::future::ready(Ok(()))
-                });
-            })),
-            ..Default::default()
-        },
-    );
-
-    let _window = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let _buffer = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer_with_lsp(path!("/a/main.rs"), cx)
-        })
-        .await
-        .unwrap();
-    let _fake_server = fake_servers.next().await.unwrap();
-    update_test_language_settings(cx, |language_settings| {
-        language_settings.languages.0.insert(
-            language_name.clone().0,
-            LanguageSettingsContent {
-                tab_size: NonZeroU32::new(8),
-                ..Default::default()
-            },
-        );
-    });
-    cx.executor().run_until_parked();
-    assert_eq!(
-        server_restarts.load(atomic::Ordering::Acquire),
-        0,
-        "Should not restart LSP server on an unrelated change"
-    );
-
-    update_test_project_settings(cx, |project_settings| {
-        project_settings.lsp.insert(
-            "Some other server name".into(),
-            LspSettings {
-                binary: None,
-                settings: None,
-                initialization_options: Some(json!({
-                    "some other init value": false
-                })),
-                enable_lsp_tasks: false,
-                fetch: None,
-            },
-        );
-    });
-    cx.executor().run_until_parked();
-    assert_eq!(
-        server_restarts.load(atomic::Ordering::Acquire),
-        0,
-        "Should not restart LSP server on an unrelated LSP settings change"
-    );
-
-    update_test_project_settings(cx, |project_settings| {
-        project_settings.lsp.insert(
-            language_server_name.into(),
-            LspSettings {
-                binary: None,
-                settings: None,
-                initialization_options: Some(json!({
-                    "anotherInitValue": false
-                })),
-                enable_lsp_tasks: false,
-                fetch: None,
-            },
-        );
-    });
-    cx.executor().run_until_parked();
-    assert_eq!(
-        server_restarts.load(atomic::Ordering::Acquire),
-        1,
-        "Should restart LSP server on a related LSP settings change"
-    );
-
-    update_test_project_settings(cx, |project_settings| {
-        project_settings.lsp.insert(
-            language_server_name.into(),
-            LspSettings {
-                binary: None,
-                settings: None,
-                initialization_options: Some(json!({
-                    "anotherInitValue": false
-                })),
-                enable_lsp_tasks: false,
-                fetch: None,
-            },
-        );
-    });
-    cx.executor().run_until_parked();
-    assert_eq!(
-        server_restarts.load(atomic::Ordering::Acquire),
-        1,
-        "Should not restart LSP server on a related LSP settings change that is the same"
-    );
-
-    update_test_project_settings(cx, |project_settings| {
-        project_settings.lsp.insert(
-            language_server_name.into(),
-            LspSettings {
-                binary: None,
-                settings: None,
-                initialization_options: None,
-                enable_lsp_tasks: false,
-                fetch: None,
-            },
-        );
-    });
-    cx.executor().run_until_parked();
-    assert_eq!(
-        server_restarts.load(atomic::Ordering::Acquire),
-        2,
-        "Should restart LSP server on another related LSP settings change"
-    );
-}
-
-#[gpui::test]
-async fn test_completions_with_additional_edits(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorLspTestContext::new_rust(
-        lsp::ServerCapabilities {
-            completion_provider: Some(lsp::CompletionOptions {
-                trigger_characters: Some(vec![".".to_string()]),
-                resolve_provider: Some(true),
-                ..Default::default()
-            }),
-            ..Default::default()
-        },
-        cx,
-    )
-    .await;
-
-    cx.set_state("fn main() { let a = 2ˇ; }");
-    cx.simulate_keystroke(".");
-    let completion_item = lsp::CompletionItem {
-        label: "some".into(),
-        kind: Some(lsp::CompletionItemKind::SNIPPET),
-        detail: Some("Wrap the expression in an `Option::Some`".to_string()),
-        documentation: Some(lsp::Documentation::MarkupContent(lsp::MarkupContent {
-            kind: lsp::MarkupKind::Markdown,
-            value: "```rust\nSome(2)\n```".to_string(),
-        })),
-        deprecated: Some(false),
-        sort_text: Some("fffffff2".to_string()),
-        filter_text: Some("some".to_string()),
-        insert_text_format: Some(lsp::InsertTextFormat::SNIPPET),
-        text_edit: Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
-            range: lsp::Range {
-                start: lsp::Position {
-                    line: 0,
-                    character: 22,
-                },
-                end: lsp::Position {
-                    line: 0,
-                    character: 22,
-                },
-            },
-            new_text: "Some(2)".to_string(),
-        })),
-        additional_text_edits: Some(vec![lsp::TextEdit {
-            range: lsp::Range {
-                start: lsp::Position {
-                    line: 0,
-                    character: 20,
-                },
-                end: lsp::Position {
-                    line: 0,
-                    character: 22,
-                },
-            },
-            new_text: "".to_string(),
-        }]),
-        ..Default::default()
-    };
-
-    let closure_completion_item = completion_item.clone();
-    let mut request = cx.set_request_handler::<lsp::request::Completion, _, _>(move |_, _, _| {
-        let task_completion_item = closure_completion_item.clone();
-        async move {
-            Ok(Some(lsp::CompletionResponse::Array(vec![
-                task_completion_item,
-            ])))
-        }
-    });
-
-    request.next().await;
-
-    cx.condition(|editor, _| editor.context_menu_visible())
-        .await;
-    let apply_additional_edits = cx.update_editor(|editor, window, cx| {
-        editor
-            .confirm_completion(&ConfirmCompletion::default(), window, cx)
-            .unwrap()
-    });
-    cx.assert_editor_state("fn main() { let a = 2.Some(2)ˇ; }");
-
-    cx.set_request_handler::<lsp::request::ResolveCompletionItem, _, _>(move |_, _, _| {
-        let task_completion_item = completion_item.clone();
-        async move { Ok(task_completion_item) }
-    })
-    .next()
-    .await
-    .unwrap();
-    apply_additional_edits.await.unwrap();
-    cx.assert_editor_state("fn main() { let a = Some(2)ˇ; }");
-}
-
-#[gpui::test]
-async fn test_completions_resolve_updates_labels_if_filter_text_matches(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorLspTestContext::new_rust(
-        lsp::ServerCapabilities {
-            completion_provider: Some(lsp::CompletionOptions {
-                trigger_characters: Some(vec![".".to_string()]),
-                resolve_provider: Some(true),
-                ..Default::default()
-            }),
-            ..Default::default()
-        },
-        cx,
-    )
-    .await;
-
-    cx.set_state("fn main() { let a = 2ˇ; }");
-    cx.simulate_keystroke(".");
-
-    let item1 = lsp::CompletionItem {
-        label: "method id()".to_string(),
-        filter_text: Some("id".to_string()),
-        detail: None,
-        documentation: None,
-        text_edit: Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
-            range: lsp::Range::new(lsp::Position::new(0, 22), lsp::Position::new(0, 22)),
-            new_text: ".id".to_string(),
-        })),
-        ..lsp::CompletionItem::default()
-    };
-
-    let item2 = lsp::CompletionItem {
-        label: "other".to_string(),
-        filter_text: Some("other".to_string()),
-        detail: None,
-        documentation: None,
-        text_edit: Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
-            range: lsp::Range::new(lsp::Position::new(0, 22), lsp::Position::new(0, 22)),
-            new_text: ".other".to_string(),
-        })),
-        ..lsp::CompletionItem::default()
-    };
-
-    let item1 = item1.clone();
-    cx.set_request_handler::<lsp::request::Completion, _, _>({
-        let item1 = item1.clone();
-        move |_, _, _| {
-            let item1 = item1.clone();
-            let item2 = item2.clone();
-            async move { Ok(Some(lsp::CompletionResponse::Array(vec![item1, item2]))) }
-        }
-    })
-    .next()
-    .await;
-
-    cx.condition(|editor, _| editor.context_menu_visible())
-        .await;
-    cx.update_editor(|editor, _, _| {
-        let context_menu = editor.context_menu.borrow_mut();
-        let context_menu = context_menu
-            .as_ref()
-            .expect("Should have the context menu deployed");
-        match context_menu {
-            CodeContextMenu::Completions(completions_menu) => {
-                let completions = completions_menu.completions.borrow_mut();
-                assert_eq!(
-                    completions
-                        .iter()
-                        .map(|completion| &completion.label.text)
-                        .collect::<Vec<_>>(),
-                    vec!["method id()", "other"]
-                )
-            }
-            CodeContextMenu::CodeActions(_) => panic!("Should show the completions menu"),
-        }
-    });
-
-    cx.set_request_handler::<lsp::request::ResolveCompletionItem, _, _>({
-        let item1 = item1.clone();
-        move |_, item_to_resolve, _| {
-            let item1 = item1.clone();
-            async move {
-                if item1 == item_to_resolve {
-                    Ok(lsp::CompletionItem {
-                        label: "method id()".to_string(),
-                        filter_text: Some("id".to_string()),
-                        detail: Some("Now resolved!".to_string()),
-                        documentation: Some(lsp::Documentation::String("Docs".to_string())),
-                        text_edit: Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
-                            range: lsp::Range::new(
-                                lsp::Position::new(0, 22),
-                                lsp::Position::new(0, 22),
-                            ),
-                            new_text: ".id".to_string(),
-                        })),
-                        ..lsp::CompletionItem::default()
-                    })
-                } else {
-                    Ok(item_to_resolve)
-                }
-            }
-        }
-    })
-    .next()
-    .await
-    .unwrap();
-    cx.run_until_parked();
-
-    cx.update_editor(|editor, window, cx| {
-        editor.context_menu_next(&Default::default(), window, cx);
-    });
-
-    cx.update_editor(|editor, _, _| {
-        let context_menu = editor.context_menu.borrow_mut();
-        let context_menu = context_menu
-            .as_ref()
-            .expect("Should have the context menu deployed");
-        match context_menu {
-            CodeContextMenu::Completions(completions_menu) => {
-                let completions = completions_menu.completions.borrow_mut();
-                assert_eq!(
-                    completions
-                        .iter()
-                        .map(|completion| &completion.label.text)
-                        .collect::<Vec<_>>(),
-                    vec!["method id() Now resolved!", "other"],
-                    "Should update first completion label, but not second as the filter text did not match."
-                );
-            }
-            CodeContextMenu::CodeActions(_) => panic!("Should show the completions menu"),
-        }
-    });
-}
-
-#[gpui::test]
-async fn test_context_menus_hide_hover_popover(cx: &mut gpui::TestAppContext) {
-    init_test(cx, |_| {});
-    let mut cx = EditorLspTestContext::new_rust(
-        lsp::ServerCapabilities {
-            hover_provider: Some(lsp::HoverProviderCapability::Simple(true)),
-            code_action_provider: Some(lsp::CodeActionProviderCapability::Simple(true)),
-            completion_provider: Some(lsp::CompletionOptions {
-                resolve_provider: Some(true),
-                ..Default::default()
-            }),
-            ..Default::default()
-        },
-        cx,
-    )
-    .await;
-    cx.set_state(indoc! {"
-        struct TestStruct {
-            field: i32
-        }
-
-        fn mainˇ() {
-            let unused_var = 42;
-            let test_struct = TestStruct { field: 42 };
-        }
-    "});
-    let symbol_range = cx.lsp_range(indoc! {"
-        struct TestStruct {
-            field: i32
-        }
-
-        «fn main»() {
-            let unused_var = 42;
-            let test_struct = TestStruct { field: 42 };
-        }
-    "});
-    let mut hover_requests =
-        cx.set_request_handler::<lsp::request::HoverRequest, _, _>(move |_, _, _| async move {
-            Ok(Some(lsp::Hover {
-                contents: lsp::HoverContents::Markup(lsp::MarkupContent {
-                    kind: lsp::MarkupKind::Markdown,
-                    value: "Function documentation".to_string(),
-                }),
-                range: Some(symbol_range),
-            }))
-        });
-
-    // Case 1: Test that code action menu hide hover popover
-    cx.dispatch_action(Hover);
-    hover_requests.next().await;
-    cx.condition(|editor, _| editor.hover_state.visible()).await;
-    let mut code_action_requests = cx.set_request_handler::<lsp::request::CodeActionRequest, _, _>(
-        move |_, _, _| async move {
-            Ok(Some(vec![lsp::CodeActionOrCommand::CodeAction(
-                lsp::CodeAction {
-                    title: "Remove unused variable".to_string(),
-                    kind: Some(CodeActionKind::QUICKFIX),
-                    edit: Some(lsp::WorkspaceEdit {
-                        changes: Some(
-                            [(
-                                lsp::Uri::from_file_path(path!("/file.rs")).unwrap(),
-                                vec![lsp::TextEdit {
-                                    range: lsp::Range::new(
-                                        lsp::Position::new(5, 4),
-                                        lsp::Position::new(5, 27),
-                                    ),
-                                    new_text: "".to_string(),
-                                }],
-                            )]
-                            .into_iter()
-                            .collect(),
-                        ),
-                        ..Default::default()
-                    }),
-                    ..Default::default()
-                },
-            )]))
-        },
-    );
-    cx.update_editor(|editor, window, cx| {
-        editor.toggle_code_actions(
-            &ToggleCodeActions {
-                deployed_from: None,
-                quick_launch: false,
-            },
-            window,
-            cx,
-        );
-    });
-    code_action_requests.next().await;
-    cx.run_until_parked();
-    cx.condition(|editor, _| editor.context_menu_visible())
-        .await;
-    cx.update_editor(|editor, _, _| {
-        assert!(
-            !editor.hover_state.visible(),
-            "Hover popover should be hidden when code action menu is shown"
-        );
-        // Hide code actions
-        editor.context_menu.take();
-    });
-
-    // Case 2: Test that code completions hide hover popover
-    cx.dispatch_action(Hover);
-    hover_requests.next().await;
-    cx.condition(|editor, _| editor.hover_state.visible()).await;
-    let counter = Arc::new(AtomicUsize::new(0));
-    let mut completion_requests =
-        cx.set_request_handler::<lsp::request::Completion, _, _>(move |_, _, _| {
-            let counter = counter.clone();
-            async move {
-                counter.fetch_add(1, atomic::Ordering::Release);
-                Ok(Some(lsp::CompletionResponse::Array(vec![
-                    lsp::CompletionItem {
-                        label: "main".into(),
-                        kind: Some(lsp::CompletionItemKind::FUNCTION),
-                        detail: Some("() -> ()".to_string()),
-                        ..Default::default()
-                    },
-                    lsp::CompletionItem {
-                        label: "TestStruct".into(),
-                        kind: Some(lsp::CompletionItemKind::STRUCT),
-                        detail: Some("struct TestStruct".to_string()),
-                        ..Default::default()
-                    },
-                ])))
-            }
-        });
-    cx.update_editor(|editor, window, cx| {
-        editor.show_completions(&ShowCompletions, window, cx);
-    });
-    completion_requests.next().await;
-    cx.condition(|editor, _| editor.context_menu_visible())
-        .await;
-    cx.update_editor(|editor, _, _| {
-        assert!(
-            !editor.hover_state.visible(),
-            "Hover popover should be hidden when completion menu is shown"
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_completions_resolve_happens_once(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorLspTestContext::new_rust(
-        lsp::ServerCapabilities {
-            completion_provider: Some(lsp::CompletionOptions {
-                trigger_characters: Some(vec![".".to_string()]),
-                resolve_provider: Some(true),
-                ..Default::default()
-            }),
-            ..Default::default()
-        },
-        cx,
-    )
-    .await;
-
-    cx.set_state("fn main() { let a = 2ˇ; }");
-    cx.simulate_keystroke(".");
-
-    let unresolved_item_1 = lsp::CompletionItem {
-        label: "id".to_string(),
-        filter_text: Some("id".to_string()),
-        detail: None,
-        documentation: None,
-        text_edit: Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
-            range: lsp::Range::new(lsp::Position::new(0, 22), lsp::Position::new(0, 22)),
-            new_text: ".id".to_string(),
-        })),
-        ..lsp::CompletionItem::default()
-    };
-    let resolved_item_1 = lsp::CompletionItem {
-        additional_text_edits: Some(vec![lsp::TextEdit {
-            range: lsp::Range::new(lsp::Position::new(0, 20), lsp::Position::new(0, 22)),
-            new_text: "!!".to_string(),
-        }]),
-        ..unresolved_item_1.clone()
-    };
-    let unresolved_item_2 = lsp::CompletionItem {
-        label: "other".to_string(),
-        filter_text: Some("other".to_string()),
-        detail: None,
-        documentation: None,
-        text_edit: Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
-            range: lsp::Range::new(lsp::Position::new(0, 22), lsp::Position::new(0, 22)),
-            new_text: ".other".to_string(),
-        })),
-        ..lsp::CompletionItem::default()
-    };
-    let resolved_item_2 = lsp::CompletionItem {
-        additional_text_edits: Some(vec![lsp::TextEdit {
-            range: lsp::Range::new(lsp::Position::new(0, 20), lsp::Position::new(0, 22)),
-            new_text: "??".to_string(),
-        }]),
-        ..unresolved_item_2.clone()
-    };
-
-    let resolve_requests_1 = Arc::new(AtomicUsize::new(0));
-    let resolve_requests_2 = Arc::new(AtomicUsize::new(0));
-    cx.lsp
-        .server
-        .on_request::<lsp::request::ResolveCompletionItem, _, _>({
-            let unresolved_item_1 = unresolved_item_1.clone();
-            let resolved_item_1 = resolved_item_1.clone();
-            let unresolved_item_2 = unresolved_item_2.clone();
-            let resolved_item_2 = resolved_item_2.clone();
-            let resolve_requests_1 = resolve_requests_1.clone();
-            let resolve_requests_2 = resolve_requests_2.clone();
-            move |unresolved_request, _| {
-                let unresolved_item_1 = unresolved_item_1.clone();
-                let resolved_item_1 = resolved_item_1.clone();
-                let unresolved_item_2 = unresolved_item_2.clone();
-                let resolved_item_2 = resolved_item_2.clone();
-                let resolve_requests_1 = resolve_requests_1.clone();
-                let resolve_requests_2 = resolve_requests_2.clone();
-                async move {
-                    if unresolved_request == unresolved_item_1 {
-                        resolve_requests_1.fetch_add(1, atomic::Ordering::Release);
-                        Ok(resolved_item_1.clone())
-                    } else if unresolved_request == unresolved_item_2 {
-                        resolve_requests_2.fetch_add(1, atomic::Ordering::Release);
-                        Ok(resolved_item_2.clone())
-                    } else {
-                        panic!("Unexpected completion item {unresolved_request:?}")
-                    }
-                }
-            }
-        })
-        .detach();
-
-    cx.set_request_handler::<lsp::request::Completion, _, _>(move |_, _, _| {
-        let unresolved_item_1 = unresolved_item_1.clone();
-        let unresolved_item_2 = unresolved_item_2.clone();
-        async move {
-            Ok(Some(lsp::CompletionResponse::Array(vec![
-                unresolved_item_1,
-                unresolved_item_2,
-            ])))
-        }
-    })
-    .next()
-    .await;
-
-    cx.condition(|editor, _| editor.context_menu_visible())
-        .await;
-    cx.update_editor(|editor, _, _| {
-        let context_menu = editor.context_menu.borrow_mut();
-        let context_menu = context_menu
-            .as_ref()
-            .expect("Should have the context menu deployed");
-        match context_menu {
-            CodeContextMenu::Completions(completions_menu) => {
-                let completions = completions_menu.completions.borrow_mut();
-                assert_eq!(
-                    completions
-                        .iter()
-                        .map(|completion| &completion.label.text)
-                        .collect::<Vec<_>>(),
-                    vec!["id", "other"]
-                )
-            }
-            CodeContextMenu::CodeActions(_) => panic!("Should show the completions menu"),
-        }
-    });
-    cx.run_until_parked();
-
-    cx.update_editor(|editor, window, cx| {
-        editor.context_menu_next(&ContextMenuNext, window, cx);
-    });
-    cx.run_until_parked();
-    cx.update_editor(|editor, window, cx| {
-        editor.context_menu_prev(&ContextMenuPrevious, window, cx);
-    });
-    cx.run_until_parked();
-    cx.update_editor(|editor, window, cx| {
-        editor.context_menu_next(&ContextMenuNext, window, cx);
-    });
-    cx.run_until_parked();
-    cx.update_editor(|editor, window, cx| {
-        editor
-            .compose_completion(&ComposeCompletion::default(), window, cx)
-            .expect("No task returned")
-    })
-    .await
-    .expect("Completion failed");
-    cx.run_until_parked();
-
-    cx.update_editor(|editor, _, cx| {
-        assert_eq!(
-            resolve_requests_1.load(atomic::Ordering::Acquire),
-            1,
-            "Should always resolve once despite multiple selections"
-        );
-        assert_eq!(
-            resolve_requests_2.load(atomic::Ordering::Acquire),
-            1,
-            "Should always resolve once after multiple selections and applying the completion"
-        );
-        assert_eq!(
-            editor.text(cx),
-            "fn main() { let a = ??.other; }",
-            "Should use resolved data when applying the completion"
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_completions_default_resolve_data_handling(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let item_0 = lsp::CompletionItem {
-        label: "abs".into(),
-        insert_text: Some("abs".into()),
-        data: Some(json!({ "very": "special"})),
-        insert_text_mode: Some(lsp::InsertTextMode::ADJUST_INDENTATION),
-        text_edit: Some(lsp::CompletionTextEdit::InsertAndReplace(
-            lsp::InsertReplaceEdit {
-                new_text: "abs".to_string(),
-                insert: lsp::Range::default(),
-                replace: lsp::Range::default(),
-            },
-        )),
-        ..lsp::CompletionItem::default()
-    };
-    let items = iter::once(item_0.clone())
-        .chain((11..51).map(|i| lsp::CompletionItem {
-            label: format!("item_{}", i),
-            insert_text: Some(format!("item_{}", i)),
-            insert_text_format: Some(lsp::InsertTextFormat::PLAIN_TEXT),
-            ..lsp::CompletionItem::default()
-        }))
-        .collect::<Vec<_>>();
-
-    let default_commit_characters = vec!["?".to_string()];
-    let default_data = json!({ "default": "data"});
-    let default_insert_text_format = lsp::InsertTextFormat::SNIPPET;
-    let default_insert_text_mode = lsp::InsertTextMode::AS_IS;
-    let default_edit_range = lsp::Range {
-        start: lsp::Position {
-            line: 0,
-            character: 5,
-        },
-        end: lsp::Position {
-            line: 0,
-            character: 5,
-        },
-    };
-
-    let mut cx = EditorLspTestContext::new_rust(
-        lsp::ServerCapabilities {
-            completion_provider: Some(lsp::CompletionOptions {
-                trigger_characters: Some(vec![".".to_string()]),
-                resolve_provider: Some(true),
-                ..Default::default()
-            }),
-            ..Default::default()
-        },
-        cx,
-    )
-    .await;
-
-    cx.set_state("fn main() { let a = 2ˇ; }");
-    cx.simulate_keystroke(".");
-
-    let completion_data = default_data.clone();
-    let completion_characters = default_commit_characters.clone();
-    let completion_items = items.clone();
-    cx.set_request_handler::<lsp::request::Completion, _, _>(move |_, _, _| {
-        let default_data = completion_data.clone();
-        let default_commit_characters = completion_characters.clone();
-        let items = completion_items.clone();
-        async move {
-            Ok(Some(lsp::CompletionResponse::List(lsp::CompletionList {
-                items,
-                item_defaults: Some(lsp::CompletionListItemDefaults {
-                    data: Some(default_data.clone()),
-                    commit_characters: Some(default_commit_characters.clone()),
-                    edit_range: Some(lsp::CompletionListItemDefaultsEditRange::Range(
-                        default_edit_range,
-                    )),
-                    insert_text_format: Some(default_insert_text_format),
-                    insert_text_mode: Some(default_insert_text_mode),
-                }),
-                ..lsp::CompletionList::default()
-            })))
-        }
-    })
-    .next()
-    .await;
-
-    let resolved_items = Arc::new(Mutex::new(Vec::new()));
-    cx.lsp
-        .server
-        .on_request::<lsp::request::ResolveCompletionItem, _, _>({
-            let closure_resolved_items = resolved_items.clone();
-            move |item_to_resolve, _| {
-                let closure_resolved_items = closure_resolved_items.clone();
-                async move {
-                    closure_resolved_items.lock().push(item_to_resolve.clone());
-                    Ok(item_to_resolve)
-                }
-            }
-        })
-        .detach();
-
-    cx.condition(|editor, _| editor.context_menu_visible())
-        .await;
-    cx.run_until_parked();
-    cx.update_editor(|editor, _, _| {
-        let menu = editor.context_menu.borrow_mut();
-        match menu.as_ref().expect("should have the completions menu") {
-            CodeContextMenu::Completions(completions_menu) => {
-                assert_eq!(
-                    completions_menu
-                        .entries
-                        .borrow()
-                        .iter()
-                        .map(|mat| mat.string.clone())
-                        .collect::<Vec<String>>(),
-                    items
-                        .iter()
-                        .map(|completion| completion.label.clone())
-                        .collect::<Vec<String>>()
-                );
-            }
-            CodeContextMenu::CodeActions(_) => panic!("Expected to have the completions menu"),
-        }
-    });
-    // Approximate initial displayed interval is 0..12. With extra item padding of 4 this is 0..16
-    // with 4 from the end.
-    assert_eq!(
-        *resolved_items.lock(),
-        [&items[0..16], &items[items.len() - 4..items.len()]]
-            .concat()
-            .iter()
-            .cloned()
-            .map(|mut item| {
-                if item.data.is_none() {
-                    item.data = Some(default_data.clone());
-                }
-                item
-            })
-            .collect::<Vec<lsp::CompletionItem>>(),
-        "Items sent for resolve should be unchanged modulo resolve `data` filled with default if missing"
-    );
-    resolved_items.lock().clear();
-
-    cx.update_editor(|editor, window, cx| {
-        editor.context_menu_prev(&ContextMenuPrevious, window, cx);
-    });
-    cx.run_until_parked();
-    // Completions that have already been resolved are skipped.
-    assert_eq!(
-        *resolved_items.lock(),
-        items[items.len() - 17..items.len() - 4]
-            .iter()
-            .cloned()
-            .map(|mut item| {
-                if item.data.is_none() {
-                    item.data = Some(default_data.clone());
-                }
-                item
-            })
-            .collect::<Vec<lsp::CompletionItem>>()
-    );
-    resolved_items.lock().clear();
-}
-
-#[gpui::test]
-async fn test_completions_in_languages_with_extra_word_characters(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorLspTestContext::new(
-        Language::new(
-            LanguageConfig {
-                matcher: LanguageMatcher {
-                    path_suffixes: vec!["jsx".into()],
-                    ..Default::default()
-                },
-                overrides: [(
-                    "element".into(),
-                    LanguageConfigOverride {
-                        completion_query_characters: Override::Set(['-'].into_iter().collect()),
-                        ..Default::default()
-                    },
-                )]
-                .into_iter()
-                .collect(),
-                ..Default::default()
-            },
-            Some(tree_sitter_typescript::LANGUAGE_TSX.into()),
-        )
-        .with_override_query("(jsx_self_closing_element) @element")
-        .unwrap(),
-        lsp::ServerCapabilities {
-            completion_provider: Some(lsp::CompletionOptions {
-                trigger_characters: Some(vec![":".to_string()]),
-                ..Default::default()
-            }),
-            ..Default::default()
-        },
-        cx,
-    )
-    .await;
-
-    cx.lsp
-        .set_request_handler::<lsp::request::Completion, _, _>(move |_, _| async move {
-            Ok(Some(lsp::CompletionResponse::Array(vec![
-                lsp::CompletionItem {
-                    label: "bg-blue".into(),
-                    ..Default::default()
-                },
-                lsp::CompletionItem {
-                    label: "bg-red".into(),
-                    ..Default::default()
-                },
-                lsp::CompletionItem {
-                    label: "bg-yellow".into(),
-                    ..Default::default()
-                },
-            ])))
-        });
-
-    cx.set_state(r#"<p class="bgˇ" />"#);
-
-    // Trigger completion when typing a dash, because the dash is an extra
-    // word character in the 'element' scope, which contains the cursor.
-    cx.simulate_keystroke("-");
-    cx.executor().run_until_parked();
-    cx.update_editor(|editor, _, _| {
-        if let Some(CodeContextMenu::Completions(menu)) = editor.context_menu.borrow_mut().as_ref()
-        {
-            assert_eq!(
-                completion_menu_entries(menu),
-                &["bg-blue", "bg-red", "bg-yellow"]
-            );
-        } else {
-            panic!("expected completion menu to be open");
-        }
-    });
-
-    cx.simulate_keystroke("l");
-    cx.executor().run_until_parked();
-    cx.update_editor(|editor, _, _| {
-        if let Some(CodeContextMenu::Completions(menu)) = editor.context_menu.borrow_mut().as_ref()
-        {
-            assert_eq!(completion_menu_entries(menu), &["bg-blue", "bg-yellow"]);
-        } else {
-            panic!("expected completion menu to be open");
-        }
-    });
-
-    // When filtering completions, consider the character after the '-' to
-    // be the start of a subword.
-    cx.set_state(r#"<p class="yelˇ" />"#);
-    cx.simulate_keystroke("l");
-    cx.executor().run_until_parked();
-    cx.update_editor(|editor, _, _| {
-        if let Some(CodeContextMenu::Completions(menu)) = editor.context_menu.borrow_mut().as_ref()
-        {
-            assert_eq!(completion_menu_entries(menu), &["bg-yellow"]);
-        } else {
-            panic!("expected completion menu to be open");
-        }
-    });
-}
-
-fn completion_menu_entries(menu: &CompletionsMenu) -> Vec<String> {
-    let entries = menu.entries.borrow();
-    entries.iter().map(|mat| mat.string.clone()).collect()
-}
-
-#[gpui::test]
-async fn test_document_format_with_prettier(cx: &mut TestAppContext) {
-    init_test(cx, |settings| {
-        settings.defaults.formatter = Some(FormatterList::Single(Formatter::Prettier))
-    });
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_file(path!("/file.ts"), Default::default()).await;
-
-    let project = Project::test(fs, [path!("/file.ts").as_ref()], cx).await;
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-
-    language_registry.add(Arc::new(Language::new(
-        LanguageConfig {
-            name: "TypeScript".into(),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["ts".to_string()],
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-        Some(tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into()),
-    )));
-    update_test_language_settings(cx, |settings| {
-        settings.defaults.prettier.get_or_insert_default().allowed = Some(true);
-    });
-
-    let test_plugin = "test_plugin";
-    let _ = language_registry.register_fake_lsp(
-        "TypeScript",
-        FakeLspAdapter {
-            prettier_plugins: vec![test_plugin],
-            ..Default::default()
-        },
-    );
-
-    let prettier_format_suffix = project::TEST_PRETTIER_FORMAT_SUFFIX;
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer(path!("/file.ts"), cx)
-        })
-        .await
-        .unwrap();
-
-    let buffer_text = "one\ntwo\nthree\n";
-    let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-    let (editor, cx) = cx.add_window_view(|window, cx| build_editor(buffer, window, cx));
-    editor.update_in(cx, |editor, window, cx| {
-        editor.set_text(buffer_text, window, cx)
-    });
-
-    editor
-        .update_in(cx, |editor, window, cx| {
-            editor.perform_format(
-                project.clone(),
-                FormatTrigger::Manual,
-                FormatTarget::Buffers(editor.buffer().read(cx).all_buffers()),
-                window,
-                cx,
-            )
-        })
-        .unwrap()
-        .await;
-    assert_eq!(
-        editor.update(cx, |editor, cx| editor.text(cx)),
-        buffer_text.to_string() + prettier_format_suffix,
-        "Test prettier formatting was not applied to the original buffer text",
-    );
-
-    update_test_language_settings(cx, |settings| {
-        settings.defaults.formatter = Some(FormatterList::default())
-    });
-    let format = editor.update_in(cx, |editor, window, cx| {
-        editor.perform_format(
-            project.clone(),
-            FormatTrigger::Manual,
-            FormatTarget::Buffers(editor.buffer().read(cx).all_buffers()),
-            window,
-            cx,
-        )
-    });
-    format.await.unwrap();
-    assert_eq!(
-        editor.update(cx, |editor, cx| editor.text(cx)),
-        buffer_text.to_string() + prettier_format_suffix + "\n" + prettier_format_suffix,
-        "Autoformatting (via test prettier) was not applied to the original buffer text",
-    );
-}
-
-#[gpui::test]
-async fn test_document_format_with_prettier_explicit_language(cx: &mut TestAppContext) {
-    init_test(cx, |settings| {
-        settings.defaults.formatter = Some(FormatterList::Single(Formatter::Prettier))
-    });
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_file(path!("/file.settings"), Default::default())
-        .await;
-
-    let project = Project::test(fs, [path!("/file.settings").as_ref()], cx).await;
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-
-    let ts_lang = Arc::new(Language::new(
-        LanguageConfig {
-            name: "TypeScript".into(),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["ts".to_string()],
-                ..LanguageMatcher::default()
-            },
-            prettier_parser_name: Some("typescript".to_string()),
-            ..LanguageConfig::default()
-        },
-        Some(tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into()),
-    ));
-
-    language_registry.add(ts_lang.clone());
-
-    update_test_language_settings(cx, |settings| {
-        settings.defaults.prettier.get_or_insert_default().allowed = Some(true);
-    });
-
-    let test_plugin = "test_plugin";
-    let _ = language_registry.register_fake_lsp(
-        "TypeScript",
-        FakeLspAdapter {
-            prettier_plugins: vec![test_plugin],
-            ..Default::default()
-        },
-    );
-
-    let prettier_format_suffix = project::TEST_PRETTIER_FORMAT_SUFFIX;
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer(path!("/file.settings"), cx)
-        })
-        .await
-        .unwrap();
-
-    project.update(cx, |project, cx| {
-        project.set_language_for_buffer(&buffer, ts_lang, cx)
-    });
-
-    let buffer_text = "one\ntwo\nthree\n";
-    let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-    let (editor, cx) = cx.add_window_view(|window, cx| build_editor(buffer, window, cx));
-    editor.update_in(cx, |editor, window, cx| {
-        editor.set_text(buffer_text, window, cx)
-    });
-
-    editor
-        .update_in(cx, |editor, window, cx| {
-            editor.perform_format(
-                project.clone(),
-                FormatTrigger::Manual,
-                FormatTarget::Buffers(editor.buffer().read(cx).all_buffers()),
-                window,
-                cx,
-            )
-        })
-        .unwrap()
-        .await;
-    assert_eq!(
-        editor.update(cx, |editor, cx| editor.text(cx)),
-        buffer_text.to_string() + prettier_format_suffix + "\ntypescript",
-        "Test prettier formatting was not applied to the original buffer text",
-    );
-
-    update_test_language_settings(cx, |settings| {
-        settings.defaults.formatter = Some(FormatterList::default())
-    });
-    let format = editor.update_in(cx, |editor, window, cx| {
-        editor.perform_format(
-            project.clone(),
-            FormatTrigger::Manual,
-            FormatTarget::Buffers(editor.buffer().read(cx).all_buffers()),
-            window,
-            cx,
-        )
-    });
-    format.await.unwrap();
-
-    assert_eq!(
-        editor.update(cx, |editor, cx| editor.text(cx)),
-        buffer_text.to_string()
-            + prettier_format_suffix
-            + "\ntypescript\n"
-            + prettier_format_suffix
-            + "\ntypescript",
-        "Autoformatting (via test prettier) was not applied to the original buffer text",
-    );
-}
-
-#[gpui::test]
-async fn test_addition_reverts(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    let mut cx = EditorLspTestContext::new_rust(lsp::ServerCapabilities::default(), cx).await;
-    let base_text = indoc! {r#"
-        struct Row;
-        struct Row1;
-        struct Row2;
-
-        struct Row4;
-        struct Row5;
-        struct Row6;
-
-        struct Row8;
-        struct Row9;
-        struct Row10;"#};
-
-    // When addition hunks are not adjacent to carets, no hunk revert is performed
-    assert_hunk_revert(
-        indoc! {r#"struct Row;
-                   struct Row1;
-                   struct Row1.1;
-                   struct Row1.2;
-                   struct Row2;ˇ
-
-                   struct Row4;
-                   struct Row5;
-                   struct Row6;
-
-                   struct Row8;
-                   ˇstruct Row9;
-                   struct Row9.1;
-                   struct Row9.2;
-                   struct Row9.3;
-                   struct Row10;"#},
-        vec![DiffHunkStatusKind::Added, DiffHunkStatusKind::Added],
-        indoc! {r#"struct Row;
-                   struct Row1;
-                   struct Row1.1;
-                   struct Row1.2;
-                   struct Row2;ˇ
-
-                   struct Row4;
-                   struct Row5;
-                   struct Row6;
-
-                   struct Row8;
-                   ˇstruct Row9;
-                   struct Row9.1;
-                   struct Row9.2;
-                   struct Row9.3;
-                   struct Row10;"#},
-        base_text,
-        &mut cx,
-    );
-    // Same for selections
-    assert_hunk_revert(
-        indoc! {r#"struct Row;
-                   struct Row1;
-                   struct Row2;
-                   struct Row2.1;
-                   struct Row2.2;
-                   «ˇ
-                   struct Row4;
-                   struct» Row5;
-                   «struct Row6;
-                   ˇ»
-                   struct Row9.1;
-                   struct Row9.2;
-                   struct Row9.3;
-                   struct Row8;
-                   struct Row9;
-                   struct Row10;"#},
-        vec![DiffHunkStatusKind::Added, DiffHunkStatusKind::Added],
-        indoc! {r#"struct Row;
-                   struct Row1;
-                   struct Row2;
-                   struct Row2.1;
-                   struct Row2.2;
-                   «ˇ
-                   struct Row4;
-                   struct» Row5;
-                   «struct Row6;
-                   ˇ»
-                   struct Row9.1;
-                   struct Row9.2;
-                   struct Row9.3;
-                   struct Row8;
-                   struct Row9;
-                   struct Row10;"#},
-        base_text,
-        &mut cx,
-    );
-
-    // When carets and selections intersect the addition hunks, those are reverted.
-    // Adjacent carets got merged.
-    assert_hunk_revert(
-        indoc! {r#"struct Row;
-                   ˇ// something on the top
-                   struct Row1;
-                   struct Row2;
-                   struct Roˇw3.1;
-                   struct Row2.2;
-                   struct Row2.3;ˇ
-
-                   struct Row4;
-                   struct ˇRow5.1;
-                   struct Row5.2;
-                   struct «Rowˇ»5.3;
-                   struct Row5;
-                   struct Row6;
-                   ˇ
-                   struct Row9.1;
-                   struct «Rowˇ»9.2;
-                   struct «ˇRow»9.3;
-                   struct Row8;
-                   struct Row9;
-                   «ˇ// something on bottom»
-                   struct Row10;"#},
-        vec![
-            DiffHunkStatusKind::Added,
-            DiffHunkStatusKind::Added,
-            DiffHunkStatusKind::Added,
-            DiffHunkStatusKind::Added,
-            DiffHunkStatusKind::Added,
-        ],
-        indoc! {r#"struct Row;
-                   ˇstruct Row1;
-                   struct Row2;
-                   ˇ
-                   struct Row4;
-                   ˇstruct Row5;
-                   struct Row6;
-                   ˇ
-                   ˇstruct Row8;
-                   struct Row9;
-                   ˇstruct Row10;"#},
-        base_text,
-        &mut cx,
-    );
-}
-
-#[gpui::test]
-async fn test_modification_reverts(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    let mut cx = EditorLspTestContext::new_rust(lsp::ServerCapabilities::default(), cx).await;
-    let base_text = indoc! {r#"
-        struct Row;
-        struct Row1;
-        struct Row2;
-
-        struct Row4;
-        struct Row5;
-        struct Row6;
-
-        struct Row8;
-        struct Row9;
-        struct Row10;"#};
-
-    // Modification hunks behave the same as the addition ones.
-    assert_hunk_revert(
-        indoc! {r#"struct Row;
-                   struct Row1;
-                   struct Row33;
-                   ˇ
-                   struct Row4;
-                   struct Row5;
-                   struct Row6;
-                   ˇ
-                   struct Row99;
-                   struct Row9;
-                   struct Row10;"#},
-        vec![DiffHunkStatusKind::Modified, DiffHunkStatusKind::Modified],
-        indoc! {r#"struct Row;
-                   struct Row1;
-                   struct Row33;
-                   ˇ
-                   struct Row4;
-                   struct Row5;
-                   struct Row6;
-                   ˇ
-                   struct Row99;
-                   struct Row9;
-                   struct Row10;"#},
-        base_text,
-        &mut cx,
-    );
-    assert_hunk_revert(
-        indoc! {r#"struct Row;
-                   struct Row1;
-                   struct Row33;
-                   «ˇ
-                   struct Row4;
-                   struct» Row5;
-                   «struct Row6;
-                   ˇ»
-                   struct Row99;
-                   struct Row9;
-                   struct Row10;"#},
-        vec![DiffHunkStatusKind::Modified, DiffHunkStatusKind::Modified],
-        indoc! {r#"struct Row;
-                   struct Row1;
-                   struct Row33;
-                   «ˇ
-                   struct Row4;
-                   struct» Row5;
-                   «struct Row6;
-                   ˇ»
-                   struct Row99;
-                   struct Row9;
-                   struct Row10;"#},
-        base_text,
-        &mut cx,
-    );
-
-    assert_hunk_revert(
-        indoc! {r#"ˇstruct Row1.1;
-                   struct Row1;
-                   «ˇstr»uct Row22;
-
-                   struct ˇRow44;
-                   struct Row5;
-                   struct «Rˇ»ow66;ˇ
-
-                   «struˇ»ct Row88;
-                   struct Row9;
-                   struct Row1011;ˇ"#},
-        vec![
-            DiffHunkStatusKind::Modified,
-            DiffHunkStatusKind::Modified,
-            DiffHunkStatusKind::Modified,
-            DiffHunkStatusKind::Modified,
-            DiffHunkStatusKind::Modified,
-            DiffHunkStatusKind::Modified,
-        ],
-        indoc! {r#"struct Row;
-                   ˇstruct Row1;
-                   struct Row2;
-                   ˇ
-                   struct Row4;
-                   ˇstruct Row5;
-                   struct Row6;
-                   ˇ
-                   struct Row8;
-                   ˇstruct Row9;
-                   struct Row10;ˇ"#},
-        base_text,
-        &mut cx,
-    );
-}
-
-#[gpui::test]
-async fn test_deleting_over_diff_hunk(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    let mut cx = EditorLspTestContext::new_rust(lsp::ServerCapabilities::default(), cx).await;
-    let base_text = indoc! {r#"
-        one
-
-        two
-        three
-        "#};
-
-    cx.set_head_text(base_text);
-    cx.set_state("\nˇ\n");
-    cx.executor().run_until_parked();
-    cx.update_editor(|editor, _window, cx| {
-        editor.expand_selected_diff_hunks(cx);
-    });
-    cx.executor().run_until_parked();
-    cx.update_editor(|editor, window, cx| {
-        editor.backspace(&Default::default(), window, cx);
-    });
-    cx.run_until_parked();
-    cx.assert_state_with_diff(
-        indoc! {r#"
-
-        - two
-        - threeˇ
-        +
-        "#}
-        .to_string(),
-    );
-}
-
-#[gpui::test]
-async fn test_deletion_reverts(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    let mut cx = EditorLspTestContext::new_rust(lsp::ServerCapabilities::default(), cx).await;
-    let base_text = indoc! {r#"struct Row;
-struct Row1;
-struct Row2;
-
-struct Row4;
-struct Row5;
-struct Row6;
-
-struct Row8;
-struct Row9;
-struct Row10;"#};
-
-    // Deletion hunks trigger with carets on adjacent rows, so carets and selections have to stay farther to avoid the revert
-    assert_hunk_revert(
-        indoc! {r#"struct Row;
-                   struct Row2;
-
-                   ˇstruct Row4;
-                   struct Row5;
-                   struct Row6;
-                   ˇ
-                   struct Row8;
-                   struct Row10;"#},
-        vec![DiffHunkStatusKind::Deleted, DiffHunkStatusKind::Deleted],
-        indoc! {r#"struct Row;
-                   struct Row2;
-
-                   ˇstruct Row4;
-                   struct Row5;
-                   struct Row6;
-                   ˇ
-                   struct Row8;
-                   struct Row10;"#},
-        base_text,
-        &mut cx,
-    );
-    assert_hunk_revert(
-        indoc! {r#"struct Row;
-                   struct Row2;
-
-                   «ˇstruct Row4;
-                   struct» Row5;
-                   «struct Row6;
-                   ˇ»
-                   struct Row8;
-                   struct Row10;"#},
-        vec![DiffHunkStatusKind::Deleted, DiffHunkStatusKind::Deleted],
-        indoc! {r#"struct Row;
-                   struct Row2;
-
-                   «ˇstruct Row4;
-                   struct» Row5;
-                   «struct Row6;
-                   ˇ»
-                   struct Row8;
-                   struct Row10;"#},
-        base_text,
-        &mut cx,
-    );
-
-    // Deletion hunks are ephemeral, so it's impossible to place the caret into them — Zed triggers reverts for lines, adjacent to carets and selections.
-    assert_hunk_revert(
-        indoc! {r#"struct Row;
-                   ˇstruct Row2;
-
-                   struct Row4;
-                   struct Row5;
-                   struct Row6;
-
-                   struct Row8;ˇ
-                   struct Row10;"#},
-        vec![DiffHunkStatusKind::Deleted, DiffHunkStatusKind::Deleted],
-        indoc! {r#"struct Row;
-                   struct Row1;
-                   ˇstruct Row2;
-
-                   struct Row4;
-                   struct Row5;
-                   struct Row6;
-
-                   struct Row8;ˇ
-                   struct Row9;
-                   struct Row10;"#},
-        base_text,
-        &mut cx,
-    );
-    assert_hunk_revert(
-        indoc! {r#"struct Row;
-                   struct Row2«ˇ;
-                   struct Row4;
-                   struct» Row5;
-                   «struct Row6;
-
-                   struct Row8;ˇ»
-                   struct Row10;"#},
-        vec![
-            DiffHunkStatusKind::Deleted,
-            DiffHunkStatusKind::Deleted,
-            DiffHunkStatusKind::Deleted,
-        ],
-        indoc! {r#"struct Row;
-                   struct Row1;
-                   struct Row2«ˇ;
-
-                   struct Row4;
-                   struct» Row5;
-                   «struct Row6;
-
-                   struct Row8;ˇ»
-                   struct Row9;
-                   struct Row10;"#},
-        base_text,
-        &mut cx,
-    );
-}
-
-#[gpui::test]
-async fn test_multibuffer_reverts(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let base_text_1 = "aaaa\nbbbb\ncccc\ndddd\neeee\nffff\ngggg\nhhhh\niiii\njjjj";
-    let base_text_2 = "llll\nmmmm\nnnnn\noooo\npppp\nqqqq\nrrrr\nssss\ntttt\nuuuu";
-    let base_text_3 =
-        "vvvv\nwwww\nxxxx\nyyyy\nzzzz\n{{{{\n||||\n}}}}\n~~~~\n\u{7f}\u{7f}\u{7f}\u{7f}";
-
-    let text_1 = edit_first_char_of_every_line(base_text_1);
-    let text_2 = edit_first_char_of_every_line(base_text_2);
-    let text_3 = edit_first_char_of_every_line(base_text_3);
-
-    let buffer_1 = cx.new(|cx| Buffer::local(text_1.clone(), cx));
-    let buffer_2 = cx.new(|cx| Buffer::local(text_2.clone(), cx));
-    let buffer_3 = cx.new(|cx| Buffer::local(text_3.clone(), cx));
-
-    let multibuffer = cx.new(|cx| {
-        let mut multibuffer = MultiBuffer::new(ReadWrite);
-        multibuffer.push_excerpts(
-            buffer_1.clone(),
-            [
-                ExcerptRange::new(Point::new(0, 0)..Point::new(3, 0)),
-                ExcerptRange::new(Point::new(5, 0)..Point::new(7, 0)),
-                ExcerptRange::new(Point::new(9, 0)..Point::new(10, 4)),
-            ],
-            cx,
-        );
-        multibuffer.push_excerpts(
-            buffer_2.clone(),
-            [
-                ExcerptRange::new(Point::new(0, 0)..Point::new(3, 0)),
-                ExcerptRange::new(Point::new(5, 0)..Point::new(7, 0)),
-                ExcerptRange::new(Point::new(9, 0)..Point::new(10, 4)),
-            ],
-            cx,
-        );
-        multibuffer.push_excerpts(
-            buffer_3.clone(),
-            [
-                ExcerptRange::new(Point::new(0, 0)..Point::new(3, 0)),
-                ExcerptRange::new(Point::new(5, 0)..Point::new(7, 0)),
-                ExcerptRange::new(Point::new(9, 0)..Point::new(10, 4)),
-            ],
-            cx,
-        );
-        multibuffer
-    });
-
-    let fs = FakeFs::new(cx.executor());
-    let project = Project::test(fs, [path!("/").as_ref()], cx).await;
-    let (editor, cx) = cx
-        .add_window_view(|window, cx| build_editor_with_project(project, multibuffer, window, cx));
-    editor.update_in(cx, |editor, _window, cx| {
-        for (buffer, diff_base) in [
-            (buffer_1.clone(), base_text_1),
-            (buffer_2.clone(), base_text_2),
-            (buffer_3.clone(), base_text_3),
-        ] {
-            let diff = cx.new(|cx| BufferDiff::new_with_base_text(diff_base, &buffer, cx));
-            editor
-                .buffer
-                .update(cx, |buffer, cx| buffer.add_diff(diff, cx));
-        }
-    });
-    cx.executor().run_until_parked();
-
-    editor.update_in(cx, |editor, window, cx| {
-        assert_eq!(editor.text(cx), "Xaaa\nXbbb\nXccc\n\nXfff\nXggg\n\nXjjj\nXlll\nXmmm\nXnnn\n\nXqqq\nXrrr\n\nXuuu\nXvvv\nXwww\nXxxx\n\nX{{{\nX|||\n\nX\u{7f}\u{7f}\u{7f}");
-        editor.select_all(&SelectAll, window, cx);
-        editor.git_restore(&Default::default(), window, cx);
-    });
-    cx.executor().run_until_parked();
-
-    // When all ranges are selected, all buffer hunks are reverted.
-    editor.update(cx, |editor, cx| {
-        assert_eq!(editor.text(cx), "aaaa\nbbbb\ncccc\ndddd\neeee\nffff\ngggg\nhhhh\niiii\njjjj\n\n\nllll\nmmmm\nnnnn\noooo\npppp\nqqqq\nrrrr\nssss\ntttt\nuuuu\n\n\nvvvv\nwwww\nxxxx\nyyyy\nzzzz\n{{{{\n||||\n}}}}\n~~~~\n\u{7f}\u{7f}\u{7f}\u{7f}\n\n");
-    });
-    buffer_1.update(cx, |buffer, _| {
-        assert_eq!(buffer.text(), base_text_1);
-    });
-    buffer_2.update(cx, |buffer, _| {
-        assert_eq!(buffer.text(), base_text_2);
-    });
-    buffer_3.update(cx, |buffer, _| {
-        assert_eq!(buffer.text(), base_text_3);
-    });
-
-    editor.update_in(cx, |editor, window, cx| {
-        editor.undo(&Default::default(), window, cx);
-    });
-
-    editor.update_in(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges(Some(Point::new(0, 0)..Point::new(6, 0)));
-        });
-        editor.git_restore(&Default::default(), window, cx);
-    });
-
-    // Now, when all ranges selected belong to buffer_1, the revert should succeed,
-    // but not affect buffer_2 and its related excerpts.
-    editor.update(cx, |editor, cx| {
-        assert_eq!(
-            editor.text(cx),
-            "aaaa\nbbbb\ncccc\ndddd\neeee\nffff\ngggg\nhhhh\niiii\njjjj\n\n\nXlll\nXmmm\nXnnn\n\nXqqq\nXrrr\n\nXuuu\nXvvv\nXwww\nXxxx\n\nX{{{\nX|||\n\nX\u{7f}\u{7f}\u{7f}"
-        );
-    });
-    buffer_1.update(cx, |buffer, _| {
-        assert_eq!(buffer.text(), base_text_1);
-    });
-    buffer_2.update(cx, |buffer, _| {
-        assert_eq!(
-            buffer.text(),
-            "Xlll\nXmmm\nXnnn\nXooo\nXppp\nXqqq\nXrrr\nXsss\nXttt\nXuuu"
-        );
-    });
-    buffer_3.update(cx, |buffer, _| {
-        assert_eq!(
-            buffer.text(),
-            "Xvvv\nXwww\nXxxx\nXyyy\nXzzz\nX{{{\nX|||\nX}}}\nX~~~\nX\u{7f}\u{7f}\u{7f}"
-        );
-    });
-
-    fn edit_first_char_of_every_line(text: &str) -> String {
-        text.split('\n')
-            .map(|line| format!("X{}", &line[1..]))
-            .collect::<Vec<_>>()
-            .join("\n")
-    }
-}
-
-#[gpui::test]
-async fn test_multibuffer_in_navigation_history(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let cols = 4;
-    let rows = 10;
-    let sample_text_1 = sample_text(rows, cols, 'a');
-    assert_eq!(
-        sample_text_1,
-        "aaaa\nbbbb\ncccc\ndddd\neeee\nffff\ngggg\nhhhh\niiii\njjjj"
-    );
-    let sample_text_2 = sample_text(rows, cols, 'l');
-    assert_eq!(
-        sample_text_2,
-        "llll\nmmmm\nnnnn\noooo\npppp\nqqqq\nrrrr\nssss\ntttt\nuuuu"
-    );
-    let sample_text_3 = sample_text(rows, cols, 'v');
-    assert_eq!(
-        sample_text_3,
-        "vvvv\nwwww\nxxxx\nyyyy\nzzzz\n{{{{\n||||\n}}}}\n~~~~\n\u{7f}\u{7f}\u{7f}\u{7f}"
-    );
-
-    let buffer_1 = cx.new(|cx| Buffer::local(sample_text_1.clone(), cx));
-    let buffer_2 = cx.new(|cx| Buffer::local(sample_text_2.clone(), cx));
-    let buffer_3 = cx.new(|cx| Buffer::local(sample_text_3.clone(), cx));
-
-    let multi_buffer = cx.new(|cx| {
-        let mut multibuffer = MultiBuffer::new(ReadWrite);
-        multibuffer.push_excerpts(
-            buffer_1.clone(),
-            [
-                ExcerptRange::new(Point::new(0, 0)..Point::new(3, 0)),
-                ExcerptRange::new(Point::new(5, 0)..Point::new(7, 0)),
-                ExcerptRange::new(Point::new(9, 0)..Point::new(10, 4)),
-            ],
-            cx,
-        );
-        multibuffer.push_excerpts(
-            buffer_2.clone(),
-            [
-                ExcerptRange::new(Point::new(0, 0)..Point::new(3, 0)),
-                ExcerptRange::new(Point::new(5, 0)..Point::new(7, 0)),
-                ExcerptRange::new(Point::new(9, 0)..Point::new(10, 4)),
-            ],
-            cx,
-        );
-        multibuffer.push_excerpts(
-            buffer_3.clone(),
-            [
-                ExcerptRange::new(Point::new(0, 0)..Point::new(3, 0)),
-                ExcerptRange::new(Point::new(5, 0)..Point::new(7, 0)),
-                ExcerptRange::new(Point::new(9, 0)..Point::new(10, 4)),
-            ],
-            cx,
-        );
-        multibuffer
-    });
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/a",
-        json!({
-            "main.rs": sample_text_1,
-            "other.rs": sample_text_2,
-            "lib.rs": sample_text_3,
-        }),
-    )
-    .await;
-    let project = Project::test(fs, ["/a".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace.deref(), cx);
-    let multi_buffer_editor = cx.new_window_entity(|window, cx| {
-        Editor::new(
-            EditorMode::full(),
-            multi_buffer,
-            Some(project.clone()),
-            window,
-            cx,
-        )
-    });
-    let multibuffer_item_id = workspace
-        .update(cx, |workspace, window, cx| {
-            assert!(
-                workspace.active_item(cx).is_none(),
-                "active item should be None before the first item is added"
-            );
-            workspace.add_item_to_active_pane(
-                Box::new(multi_buffer_editor.clone()),
-                None,
-                true,
-                window,
-                cx,
-            );
-            let active_item = workspace
-                .active_item(cx)
-                .expect("should have an active item after adding the multi buffer");
-            assert_eq!(
-                active_item.buffer_kind(cx),
-                ItemBufferKind::Multibuffer,
-                "A multi buffer was expected to active after adding"
-            );
-            active_item.item_id()
-        })
-        .unwrap();
-    cx.executor().run_until_parked();
-
-    multi_buffer_editor.update_in(cx, |editor, window, cx| {
-        editor.change_selections(
-            SelectionEffects::scroll(Autoscroll::Next),
-            window,
-            cx,
-            |s| s.select_ranges(Some(MultiBufferOffset(1)..MultiBufferOffset(2))),
-        );
-        editor.open_excerpts(&OpenExcerpts, window, cx);
-    });
-    cx.executor().run_until_parked();
-    let first_item_id = workspace
-        .update(cx, |workspace, window, cx| {
-            let active_item = workspace
-                .active_item(cx)
-                .expect("should have an active item after navigating into the 1st buffer");
-            let first_item_id = active_item.item_id();
-            assert_ne!(
-                first_item_id, multibuffer_item_id,
-                "Should navigate into the 1st buffer and activate it"
-            );
-            assert_eq!(
-                active_item.buffer_kind(cx),
-                ItemBufferKind::Singleton,
-                "New active item should be a singleton buffer"
-            );
-            assert_eq!(
-                active_item
-                    .act_as::<Editor>(cx)
-                    .expect("should have navigated into an editor for the 1st buffer")
-                    .read(cx)
-                    .text(cx),
-                sample_text_1
-            );
-
-            workspace
-                .go_back(workspace.active_pane().downgrade(), window, cx)
-                .detach_and_log_err(cx);
-
-            first_item_id
-        })
-        .unwrap();
-    cx.executor().run_until_parked();
-    workspace
-        .update(cx, |workspace, _, cx| {
-            let active_item = workspace
-                .active_item(cx)
-                .expect("should have an active item after navigating back");
-            assert_eq!(
-                active_item.item_id(),
-                multibuffer_item_id,
-                "Should navigate back to the multi buffer"
-            );
-            assert_eq!(active_item.buffer_kind(cx), ItemBufferKind::Multibuffer);
-        })
-        .unwrap();
-
-    multi_buffer_editor.update_in(cx, |editor, window, cx| {
-        editor.change_selections(
-            SelectionEffects::scroll(Autoscroll::Next),
-            window,
-            cx,
-            |s| s.select_ranges(Some(MultiBufferOffset(39)..MultiBufferOffset(40))),
-        );
-        editor.open_excerpts(&OpenExcerpts, window, cx);
-    });
-    cx.executor().run_until_parked();
-    let second_item_id = workspace
-        .update(cx, |workspace, window, cx| {
-            let active_item = workspace
-                .active_item(cx)
-                .expect("should have an active item after navigating into the 2nd buffer");
-            let second_item_id = active_item.item_id();
-            assert_ne!(
-                second_item_id, multibuffer_item_id,
-                "Should navigate away from the multibuffer"
-            );
-            assert_ne!(
-                second_item_id, first_item_id,
-                "Should navigate into the 2nd buffer and activate it"
-            );
-            assert_eq!(
-                active_item.buffer_kind(cx),
-                ItemBufferKind::Singleton,
-                "New active item should be a singleton buffer"
-            );
-            assert_eq!(
-                active_item
-                    .act_as::<Editor>(cx)
-                    .expect("should have navigated into an editor")
-                    .read(cx)
-                    .text(cx),
-                sample_text_2
-            );
-
-            workspace
-                .go_back(workspace.active_pane().downgrade(), window, cx)
-                .detach_and_log_err(cx);
-
-            second_item_id
-        })
-        .unwrap();
-    cx.executor().run_until_parked();
-    workspace
-        .update(cx, |workspace, _, cx| {
-            let active_item = workspace
-                .active_item(cx)
-                .expect("should have an active item after navigating back from the 2nd buffer");
-            assert_eq!(
-                active_item.item_id(),
-                multibuffer_item_id,
-                "Should navigate back from the 2nd buffer to the multi buffer"
-            );
-            assert_eq!(active_item.buffer_kind(cx), ItemBufferKind::Multibuffer);
-        })
-        .unwrap();
-
-    multi_buffer_editor.update_in(cx, |editor, window, cx| {
-        editor.change_selections(
-            SelectionEffects::scroll(Autoscroll::Next),
-            window,
-            cx,
-            |s| s.select_ranges(Some(MultiBufferOffset(70)..MultiBufferOffset(70))),
-        );
-        editor.open_excerpts(&OpenExcerpts, window, cx);
-    });
-    cx.executor().run_until_parked();
-    workspace
-        .update(cx, |workspace, window, cx| {
-            let active_item = workspace
-                .active_item(cx)
-                .expect("should have an active item after navigating into the 3rd buffer");
-            let third_item_id = active_item.item_id();
-            assert_ne!(
-                third_item_id, multibuffer_item_id,
-                "Should navigate into the 3rd buffer and activate it"
-            );
-            assert_ne!(third_item_id, first_item_id);
-            assert_ne!(third_item_id, second_item_id);
-            assert_eq!(
-                active_item.buffer_kind(cx),
-                ItemBufferKind::Singleton,
-                "New active item should be a singleton buffer"
-            );
-            assert_eq!(
-                active_item
-                    .act_as::<Editor>(cx)
-                    .expect("should have navigated into an editor")
-                    .read(cx)
-                    .text(cx),
-                sample_text_3
-            );
-
-            workspace
-                .go_back(workspace.active_pane().downgrade(), window, cx)
-                .detach_and_log_err(cx);
-        })
-        .unwrap();
-    cx.executor().run_until_parked();
-    workspace
-        .update(cx, |workspace, _, cx| {
-            let active_item = workspace
-                .active_item(cx)
-                .expect("should have an active item after navigating back from the 3rd buffer");
-            assert_eq!(
-                active_item.item_id(),
-                multibuffer_item_id,
-                "Should navigate back from the 3rd buffer to the multi buffer"
-            );
-            assert_eq!(active_item.buffer_kind(cx), ItemBufferKind::Multibuffer);
-        })
-        .unwrap();
-}
-
-#[gpui::test]
-async fn test_toggle_selected_diff_hunks(executor: BackgroundExecutor, cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    let diff_base = r#"
-        use some::mod;
-
-        const A: u32 = 42;
-
-        fn main() {
-            println!("hello");
-
-            println!("world");
-        }
-        "#
-    .unindent();
-
-    cx.set_state(
-        &r#"
-        use some::modified;
-
-        ˇ
-        fn main() {
-            println!("hello there");
-
-            println!("around the");
-            println!("world");
-        }
-        "#
-        .unindent(),
-    );
-
-    cx.set_head_text(&diff_base);
-    executor.run_until_parked();
-
-    cx.update_editor(|editor, window, cx| {
-        editor.go_to_next_hunk(&GoToHunk, window, cx);
-        editor.toggle_selected_diff_hunks(&ToggleSelectedDiffHunks, window, cx);
-    });
-    executor.run_until_parked();
-    cx.assert_state_with_diff(
-        r#"
-          use some::modified;
-
-
-          fn main() {
-        -     println!("hello");
-        + ˇ    println!("hello there");
-
-              println!("around the");
-              println!("world");
-          }
-        "#
-        .unindent(),
-    );
-
-    cx.update_editor(|editor, window, cx| {
-        for _ in 0..2 {
-            editor.go_to_next_hunk(&GoToHunk, window, cx);
-            editor.toggle_selected_diff_hunks(&ToggleSelectedDiffHunks, window, cx);
-        }
-    });
-    executor.run_until_parked();
-    cx.assert_state_with_diff(
-        r#"
-        - use some::mod;
-        + ˇuse some::modified;
-
-
-          fn main() {
-        -     println!("hello");
-        +     println!("hello there");
-
-        +     println!("around the");
-              println!("world");
-          }
-        "#
-        .unindent(),
-    );
-
-    cx.update_editor(|editor, window, cx| {
-        editor.go_to_next_hunk(&GoToHunk, window, cx);
-        editor.toggle_selected_diff_hunks(&ToggleSelectedDiffHunks, window, cx);
-    });
-    executor.run_until_parked();
-    cx.assert_state_with_diff(
-        r#"
-        - use some::mod;
-        + use some::modified;
-
-        - const A: u32 = 42;
-          ˇ
-          fn main() {
-        -     println!("hello");
-        +     println!("hello there");
-
-        +     println!("around the");
-              println!("world");
-          }
-        "#
-        .unindent(),
-    );
-
-    cx.update_editor(|editor, window, cx| {
-        editor.cancel(&Cancel, window, cx);
-    });
-
-    cx.assert_state_with_diff(
-        r#"
-          use some::modified;
-
-          ˇ
-          fn main() {
-              println!("hello there");
-
-              println!("around the");
-              println!("world");
-          }
-        "#
-        .unindent(),
-    );
-}
-
-#[gpui::test]
-async fn test_diff_base_change_with_expanded_diff_hunks(
-    executor: BackgroundExecutor,
-    cx: &mut TestAppContext,
-) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    let diff_base = r#"
-        use some::mod1;
-        use some::mod2;
-
-        const A: u32 = 42;
-        const B: u32 = 42;
-        const C: u32 = 42;
-
-        fn main() {
-            println!("hello");
-
-            println!("world");
-        }
-        "#
-    .unindent();
-
-    cx.set_state(
-        &r#"
-        use some::mod2;
-
-        const A: u32 = 42;
-        const C: u32 = 42;
-
-        fn main(ˇ) {
-            //println!("hello");
-
-            println!("world");
-            //
-            //
-        }
-        "#
-        .unindent(),
-    );
-
-    cx.set_head_text(&diff_base);
-    executor.run_until_parked();
-
-    cx.update_editor(|editor, window, cx| {
-        editor.expand_all_diff_hunks(&ExpandAllDiffHunks, window, cx);
-    });
-    executor.run_until_parked();
-    cx.assert_state_with_diff(
-        r#"
-        - use some::mod1;
-          use some::mod2;
-
-          const A: u32 = 42;
-        - const B: u32 = 42;
-          const C: u32 = 42;
-
-          fn main(ˇ) {
-        -     println!("hello");
-        +     //println!("hello");
-
-              println!("world");
-        +     //
-        +     //
-          }
-        "#
-        .unindent(),
-    );
-
-    cx.set_head_text("new diff base!");
-    executor.run_until_parked();
-    cx.assert_state_with_diff(
-        r#"
-        - new diff base!
-        + use some::mod2;
-        +
-        + const A: u32 = 42;
-        + const C: u32 = 42;
-        +
-        + fn main(ˇ) {
-        +     //println!("hello");
-        +
-        +     println!("world");
-        +     //
-        +     //
-        + }
-        "#
-        .unindent(),
-    );
-}
-
-#[gpui::test]
-async fn test_toggle_diff_expand_in_multi_buffer(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let file_1_old = "aaa\nbbb\nccc\nddd\neee\nfff\nggg\nhhh\niii\njjj";
-    let file_1_new = "aaa\nccc\nddd\neee\nfff\nggg\nhhh\niii\njjj";
-    let file_2_old = "lll\nmmm\nnnn\nooo\nppp\nqqq\nrrr\nsss\nttt\nuuu";
-    let file_2_new = "lll\nmmm\nNNN\nooo\nppp\nqqq\nrrr\nsss\nttt\nuuu";
-    let file_3_old = "111\n222\n333\n444\n555\n777\n888\n999\n000\n!!!";
-    let file_3_new = "111\n222\n333\n444\n555\n666\n777\n888\n999\n000\n!!!";
-
-    let buffer_1 = cx.new(|cx| Buffer::local(file_1_new.to_string(), cx));
-    let buffer_2 = cx.new(|cx| Buffer::local(file_2_new.to_string(), cx));
-    let buffer_3 = cx.new(|cx| Buffer::local(file_3_new.to_string(), cx));
-
-    let multi_buffer = cx.new(|cx| {
-        let mut multibuffer = MultiBuffer::new(ReadWrite);
-        multibuffer.push_excerpts(
-            buffer_1.clone(),
-            [
-                ExcerptRange::new(Point::new(0, 0)..Point::new(3, 0)),
-                ExcerptRange::new(Point::new(5, 0)..Point::new(7, 0)),
-                ExcerptRange::new(Point::new(9, 0)..Point::new(10, 3)),
-            ],
-            cx,
-        );
-        multibuffer.push_excerpts(
-            buffer_2.clone(),
-            [
-                ExcerptRange::new(Point::new(0, 0)..Point::new(3, 0)),
-                ExcerptRange::new(Point::new(5, 0)..Point::new(7, 0)),
-                ExcerptRange::new(Point::new(9, 0)..Point::new(10, 3)),
-            ],
-            cx,
-        );
-        multibuffer.push_excerpts(
-            buffer_3.clone(),
-            [
-                ExcerptRange::new(Point::new(0, 0)..Point::new(3, 0)),
-                ExcerptRange::new(Point::new(5, 0)..Point::new(7, 0)),
-                ExcerptRange::new(Point::new(9, 0)..Point::new(10, 3)),
-            ],
-            cx,
-        );
-        multibuffer
-    });
-
-    let editor =
-        cx.add_window(|window, cx| Editor::new(EditorMode::full(), multi_buffer, None, window, cx));
-    editor
-        .update(cx, |editor, _window, cx| {
-            for (buffer, diff_base) in [
-                (buffer_1.clone(), file_1_old),
-                (buffer_2.clone(), file_2_old),
-                (buffer_3.clone(), file_3_old),
-            ] {
-                let diff = cx.new(|cx| BufferDiff::new_with_base_text(diff_base, &buffer, cx));
-                editor
-                    .buffer
-                    .update(cx, |buffer, cx| buffer.add_diff(diff, cx));
-            }
-        })
-        .unwrap();
-
-    let mut cx = EditorTestContext::for_editor(editor, cx).await;
-    cx.run_until_parked();
-
-    cx.assert_editor_state(
-        &"
-            ˇaaa
-            ccc
-            ddd
-
-            ggg
-            hhh
-
-
-            lll
-            mmm
-            NNN
-
-            qqq
-            rrr
-
-            uuu
-            111
-            222
-            333
-
-            666
-            777
-
-            000
-            !!!"
-        .unindent(),
-    );
-
-    cx.update_editor(|editor, window, cx| {
-        editor.select_all(&SelectAll, window, cx);
-        editor.toggle_selected_diff_hunks(&ToggleSelectedDiffHunks, window, cx);
-    });
-    cx.executor().run_until_parked();
-
-    cx.assert_state_with_diff(
-        "
-            «aaa
-          - bbb
-            ccc
-            ddd
-
-            ggg
-            hhh
-
-
-            lll
-            mmm
-          - nnn
-          + NNN
-
-            qqq
-            rrr
-
-            uuu
-            111
-            222
-            333
-
-          + 666
-            777
-
-            000
-            !!!ˇ»"
-            .unindent(),
-    );
-}
-
-#[gpui::test]
-async fn test_expand_diff_hunk_at_excerpt_boundary(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let base = "aaa\nbbb\nccc\nddd\neee\nfff\nggg\n";
-    let text = "aaa\nBBB\nBB2\nccc\nDDD\nEEE\nfff\nggg\nhhh\niii\n";
-
-    let buffer = cx.new(|cx| Buffer::local(text.to_string(), cx));
-    let multi_buffer = cx.new(|cx| {
-        let mut multibuffer = MultiBuffer::new(ReadWrite);
-        multibuffer.push_excerpts(
-            buffer.clone(),
-            [
-                ExcerptRange::new(Point::new(0, 0)..Point::new(2, 0)),
-                ExcerptRange::new(Point::new(4, 0)..Point::new(7, 0)),
-                ExcerptRange::new(Point::new(9, 0)..Point::new(10, 0)),
-            ],
-            cx,
-        );
-        multibuffer
-    });
-
-    let editor =
-        cx.add_window(|window, cx| Editor::new(EditorMode::full(), multi_buffer, None, window, cx));
-    editor
-        .update(cx, |editor, _window, cx| {
-            let diff = cx.new(|cx| BufferDiff::new_with_base_text(base, &buffer, cx));
-            editor
-                .buffer
-                .update(cx, |buffer, cx| buffer.add_diff(diff, cx))
-        })
-        .unwrap();
-
-    let mut cx = EditorTestContext::for_editor(editor, cx).await;
-    cx.run_until_parked();
-
-    cx.update_editor(|editor, window, cx| {
-        editor.expand_all_diff_hunks(&Default::default(), window, cx)
-    });
-    cx.executor().run_until_parked();
-
-    // When the start of a hunk coincides with the start of its excerpt,
-    // the hunk is expanded. When the start of a hunk is earlier than
-    // the start of its excerpt, the hunk is not expanded.
-    cx.assert_state_with_diff(
-        "
-            ˇaaa
-          - bbb
-          + BBB
-
-          - ddd
-          - eee
-          + DDD
-          + EEE
-            fff
-
-            iii
-        "
-        .unindent(),
-    );
-}
-
-#[gpui::test]
-async fn test_edits_around_expanded_insertion_hunks(
-    executor: BackgroundExecutor,
-    cx: &mut TestAppContext,
-) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    let diff_base = r#"
-        use some::mod1;
-        use some::mod2;
-
-        const A: u32 = 42;
-
-        fn main() {
-            println!("hello");
-
-            println!("world");
-        }
-        "#
-    .unindent();
-    executor.run_until_parked();
-    cx.set_state(
-        &r#"
-        use some::mod1;
-        use some::mod2;
-
-        const A: u32 = 42;
-        const B: u32 = 42;
-        const C: u32 = 42;
-        ˇ
-
-        fn main() {
-            println!("hello");
-
-            println!("world");
-        }
-        "#
-        .unindent(),
-    );
-
-    cx.set_head_text(&diff_base);
-    executor.run_until_parked();
-
-    cx.update_editor(|editor, window, cx| {
-        editor.expand_all_diff_hunks(&ExpandAllDiffHunks, window, cx);
-    });
-    executor.run_until_parked();
-
-    cx.assert_state_with_diff(
-        r#"
-        use some::mod1;
-        use some::mod2;
-
-        const A: u32 = 42;
-      + const B: u32 = 42;
-      + const C: u32 = 42;
-      + ˇ
-
-        fn main() {
-            println!("hello");
-
-            println!("world");
-        }
-      "#
-        .unindent(),
-    );
-
-    cx.update_editor(|editor, window, cx| editor.handle_input("const D: u32 = 42;\n", window, cx));
-    executor.run_until_parked();
-
-    cx.assert_state_with_diff(
-        r#"
-        use some::mod1;
-        use some::mod2;
-
-        const A: u32 = 42;
-      + const B: u32 = 42;
-      + const C: u32 = 42;
-      + const D: u32 = 42;
-      + ˇ
-
-        fn main() {
-            println!("hello");
-
-            println!("world");
-        }
-      "#
-        .unindent(),
-    );
-
-    cx.update_editor(|editor, window, cx| editor.handle_input("const E: u32 = 42;\n", window, cx));
-    executor.run_until_parked();
-
-    cx.assert_state_with_diff(
-        r#"
-        use some::mod1;
-        use some::mod2;
-
-        const A: u32 = 42;
-      + const B: u32 = 42;
-      + const C: u32 = 42;
-      + const D: u32 = 42;
-      + const E: u32 = 42;
-      + ˇ
-
-        fn main() {
-            println!("hello");
-
-            println!("world");
-        }
-      "#
-        .unindent(),
-    );
-
-    cx.update_editor(|editor, window, cx| {
-        editor.delete_line(&DeleteLine, window, cx);
-    });
-    executor.run_until_parked();
-
-    cx.assert_state_with_diff(
-        r#"
-        use some::mod1;
-        use some::mod2;
-
-        const A: u32 = 42;
-      + const B: u32 = 42;
-      + const C: u32 = 42;
-      + const D: u32 = 42;
-      + const E: u32 = 42;
-        ˇ
-        fn main() {
-            println!("hello");
-
-            println!("world");
-        }
-      "#
-        .unindent(),
-    );
-
-    cx.update_editor(|editor, window, cx| {
-        editor.move_up(&MoveUp, window, cx);
-        editor.delete_line(&DeleteLine, window, cx);
-        editor.move_up(&MoveUp, window, cx);
-        editor.delete_line(&DeleteLine, window, cx);
-        editor.move_up(&MoveUp, window, cx);
-        editor.delete_line(&DeleteLine, window, cx);
-    });
-    executor.run_until_parked();
-    cx.assert_state_with_diff(
-        r#"
-        use some::mod1;
-        use some::mod2;
-
-        const A: u32 = 42;
-      + const B: u32 = 42;
-        ˇ
-        fn main() {
-            println!("hello");
-
-            println!("world");
-        }
-      "#
-        .unindent(),
-    );
-
-    cx.update_editor(|editor, window, cx| {
-        editor.select_up_by_lines(&SelectUpByLines { lines: 5 }, window, cx);
-        editor.delete_line(&DeleteLine, window, cx);
-    });
-    executor.run_until_parked();
-    cx.assert_state_with_diff(
-        r#"
-        ˇ
-        fn main() {
-            println!("hello");
-
-            println!("world");
-        }
-      "#
-        .unindent(),
-    );
-}
-
-#[gpui::test]
-async fn test_toggling_adjacent_diff_hunks(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-    cx.set_head_text(indoc! { "
-        one
-        two
-        three
-        four
-        five
-        "
-    });
-    cx.set_state(indoc! { "
-        one
-        ˇthree
-        five
-    "});
-    cx.run_until_parked();
-    cx.update_editor(|editor, window, cx| {
-        editor.toggle_selected_diff_hunks(&Default::default(), window, cx);
-    });
-    cx.assert_state_with_diff(
-        indoc! { "
-        one
-      - two
-        ˇthree
-      - four
-        five
-    "}
-        .to_string(),
-    );
-    cx.update_editor(|editor, window, cx| {
-        editor.toggle_selected_diff_hunks(&Default::default(), window, cx);
-    });
-
-    cx.assert_state_with_diff(
-        indoc! { "
-        one
-        ˇthree
-        five
-    "}
-        .to_string(),
-    );
-
-    cx.set_state(indoc! { "
-        one
-        ˇTWO
-        three
-        four
-        five
-    "});
-    cx.run_until_parked();
-    cx.update_editor(|editor, window, cx| {
-        editor.toggle_selected_diff_hunks(&Default::default(), window, cx);
-    });
-
-    cx.assert_state_with_diff(
-        indoc! { "
-            one
-          - two
-          + ˇTWO
-            three
-            four
-            five
-        "}
-        .to_string(),
-    );
-    cx.update_editor(|editor, window, cx| {
-        editor.move_up(&Default::default(), window, cx);
-        editor.toggle_selected_diff_hunks(&Default::default(), window, cx);
-    });
-    cx.assert_state_with_diff(
-        indoc! { "
-            one
-            ˇTWO
-            three
-            four
-            five
-        "}
-        .to_string(),
-    );
-}
-
-#[gpui::test]
-async fn test_edits_around_expanded_deletion_hunks(
-    executor: BackgroundExecutor,
-    cx: &mut TestAppContext,
-) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    let diff_base = r#"
-        use some::mod1;
-        use some::mod2;
-
-        const A: u32 = 42;
-        const B: u32 = 42;
-        const C: u32 = 42;
-
-
-        fn main() {
-            println!("hello");
-
-            println!("world");
-        }
-    "#
-    .unindent();
-    executor.run_until_parked();
-    cx.set_state(
-        &r#"
-        use some::mod1;
-        use some::mod2;
-
-        ˇconst B: u32 = 42;
-        const C: u32 = 42;
-
-
-        fn main() {
-            println!("hello");
-
-            println!("world");
-        }
-        "#
-        .unindent(),
-    );
-
-    cx.set_head_text(&diff_base);
-    executor.run_until_parked();
-
-    cx.update_editor(|editor, window, cx| {
-        editor.expand_all_diff_hunks(&ExpandAllDiffHunks, window, cx);
-    });
-    executor.run_until_parked();
-
-    cx.assert_state_with_diff(
-        r#"
-        use some::mod1;
-        use some::mod2;
-
-      - const A: u32 = 42;
-        ˇconst B: u32 = 42;
-        const C: u32 = 42;
-
-
-        fn main() {
-            println!("hello");
-
-            println!("world");
-        }
-      "#
-        .unindent(),
-    );
-
-    cx.update_editor(|editor, window, cx| {
-        editor.delete_line(&DeleteLine, window, cx);
-    });
-    executor.run_until_parked();
-    cx.assert_state_with_diff(
-        r#"
-        use some::mod1;
-        use some::mod2;
-
-      - const A: u32 = 42;
-      - const B: u32 = 42;
-        ˇconst C: u32 = 42;
-
-
-        fn main() {
-            println!("hello");
-
-            println!("world");
-        }
-      "#
-        .unindent(),
-    );
-
-    cx.update_editor(|editor, window, cx| {
-        editor.delete_line(&DeleteLine, window, cx);
-    });
-    executor.run_until_parked();
-    cx.assert_state_with_diff(
-        r#"
-        use some::mod1;
-        use some::mod2;
-
-      - const A: u32 = 42;
-      - const B: u32 = 42;
-      - const C: u32 = 42;
-        ˇ
-
-        fn main() {
-            println!("hello");
-
-            println!("world");
-        }
-      "#
-        .unindent(),
-    );
-
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("replacement", window, cx);
-    });
-    executor.run_until_parked();
-    cx.assert_state_with_diff(
-        r#"
-        use some::mod1;
-        use some::mod2;
-
-      - const A: u32 = 42;
-      - const B: u32 = 42;
-      - const C: u32 = 42;
-      -
-      + replacementˇ
-
-        fn main() {
-            println!("hello");
-
-            println!("world");
-        }
-      "#
-        .unindent(),
-    );
-}
-
-#[gpui::test]
-async fn test_backspace_after_deletion_hunk(executor: BackgroundExecutor, cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    let base_text = r#"
-        one
-        two
-        three
-        four
-        five
-    "#
-    .unindent();
-    executor.run_until_parked();
-    cx.set_state(
-        &r#"
-        one
-        two
-        fˇour
-        five
-        "#
-        .unindent(),
-    );
-
-    cx.set_head_text(&base_text);
-    executor.run_until_parked();
-
-    cx.update_editor(|editor, window, cx| {
-        editor.expand_all_diff_hunks(&ExpandAllDiffHunks, window, cx);
-    });
-    executor.run_until_parked();
-
-    cx.assert_state_with_diff(
-        r#"
-          one
-          two
-        - three
-          fˇour
-          five
-        "#
-        .unindent(),
-    );
-
-    cx.update_editor(|editor, window, cx| {
-        editor.backspace(&Backspace, window, cx);
-        editor.backspace(&Backspace, window, cx);
-    });
-    executor.run_until_parked();
-    cx.assert_state_with_diff(
-        r#"
-          one
-          two
-        - threeˇ
-        - four
-        + our
-          five
-        "#
-        .unindent(),
-    );
-}
-
-#[gpui::test]
-async fn test_edit_after_expanded_modification_hunk(
-    executor: BackgroundExecutor,
-    cx: &mut TestAppContext,
-) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    let diff_base = r#"
-        use some::mod1;
-        use some::mod2;
-
-        const A: u32 = 42;
-        const B: u32 = 42;
-        const C: u32 = 42;
-        const D: u32 = 42;
-
-
-        fn main() {
-            println!("hello");
-
-            println!("world");
-        }"#
-    .unindent();
-
-    cx.set_state(
-        &r#"
-        use some::mod1;
-        use some::mod2;
-
-        const A: u32 = 42;
-        const B: u32 = 42;
-        const C: u32 = 43ˇ
-        const D: u32 = 42;
-
-
-        fn main() {
-            println!("hello");
-
-            println!("world");
-        }"#
-        .unindent(),
-    );
-
-    cx.set_head_text(&diff_base);
-    executor.run_until_parked();
-    cx.update_editor(|editor, window, cx| {
-        editor.expand_all_diff_hunks(&ExpandAllDiffHunks, window, cx);
-    });
-    executor.run_until_parked();
-
-    cx.assert_state_with_diff(
-        r#"
-        use some::mod1;
-        use some::mod2;
-
-        const A: u32 = 42;
-        const B: u32 = 42;
-      - const C: u32 = 42;
-      + const C: u32 = 43ˇ
-        const D: u32 = 42;
-
-
-        fn main() {
-            println!("hello");
-
-            println!("world");
-        }"#
-        .unindent(),
-    );
-
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("\nnew_line\n", window, cx);
-    });
-    executor.run_until_parked();
-
-    cx.assert_state_with_diff(
-        r#"
-        use some::mod1;
-        use some::mod2;
-
-        const A: u32 = 42;
-        const B: u32 = 42;
-      - const C: u32 = 42;
-      + const C: u32 = 43
-      + new_line
-      + ˇ
-        const D: u32 = 42;
-
-
-        fn main() {
-            println!("hello");
-
-            println!("world");
-        }"#
-        .unindent(),
-    );
-}
-
-#[gpui::test]
-async fn test_stage_and_unstage_added_file_hunk(
-    executor: BackgroundExecutor,
-    cx: &mut TestAppContext,
-) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-    cx.update_editor(|editor, _, cx| {
-        editor.set_expand_all_diff_hunks(cx);
-    });
-
-    let working_copy = r#"
-            ˇfn main() {
-                println!("hello, world!");
-            }
-        "#
-    .unindent();
-
-    cx.set_state(&working_copy);
-    executor.run_until_parked();
-
-    cx.assert_state_with_diff(
-        r#"
-            + ˇfn main() {
-            +     println!("hello, world!");
-            + }
-        "#
-        .unindent(),
-    );
-    cx.assert_index_text(None);
-
-    cx.update_editor(|editor, window, cx| {
-        editor.toggle_staged_selected_diff_hunks(&Default::default(), window, cx);
-    });
-    executor.run_until_parked();
-    cx.assert_index_text(Some(&working_copy.replace("ˇ", "")));
-    cx.assert_state_with_diff(
-        r#"
-            + ˇfn main() {
-            +     println!("hello, world!");
-            + }
-        "#
-        .unindent(),
-    );
-
-    cx.update_editor(|editor, window, cx| {
-        editor.toggle_staged_selected_diff_hunks(&Default::default(), window, cx);
-    });
-    executor.run_until_parked();
-    cx.assert_index_text(None);
-}
-
-async fn setup_indent_guides_editor(
-    text: &str,
-    cx: &mut TestAppContext,
-) -> (BufferId, EditorTestContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    let buffer_id = cx.update_editor(|editor, window, cx| {
-        editor.set_text(text, window, cx);
-        let buffer_ids = editor.buffer().read(cx).excerpt_buffer_ids();
-
-        buffer_ids[0]
-    });
-
-    (buffer_id, cx)
-}
-
-fn assert_indent_guides(
-    range: Range<u32>,
-    expected: Vec<IndentGuide>,
-    active_indices: Option<Vec<usize>>,
-    cx: &mut EditorTestContext,
-) {
-    let indent_guides = cx.update_editor(|editor, window, cx| {
-        let snapshot = editor.snapshot(window, cx).display_snapshot;
-        let mut indent_guides: Vec<_> = crate::indent_guides::indent_guides_in_range(
-            editor,
-            MultiBufferRow(range.start)..MultiBufferRow(range.end),
-            true,
-            &snapshot,
-            cx,
-        );
-
-        indent_guides.sort_by(|a, b| {
-            a.depth.cmp(&b.depth).then(
-                a.start_row
-                    .cmp(&b.start_row)
-                    .then(a.end_row.cmp(&b.end_row)),
-            )
-        });
-        indent_guides
-    });
-
-    if let Some(expected) = active_indices {
-        let active_indices = cx.update_editor(|editor, window, cx| {
-            let snapshot = editor.snapshot(window, cx).display_snapshot;
-            editor.find_active_indent_guide_indices(&indent_guides, &snapshot, window, cx)
-        });
-
-        assert_eq!(
-            active_indices.unwrap().into_iter().collect::<Vec<_>>(),
-            expected,
-            "Active indent guide indices do not match"
-        );
-    }
-
-    assert_eq!(indent_guides, expected, "Indent guides do not match");
-}
-
-fn indent_guide(buffer_id: BufferId, start_row: u32, end_row: u32, depth: u32) -> IndentGuide {
-    IndentGuide {
-        buffer_id,
-        start_row: MultiBufferRow(start_row),
-        end_row: MultiBufferRow(end_row),
-        depth,
-        tab_size: 4,
-        settings: IndentGuideSettings {
-            enabled: true,
-            line_width: 1,
-            active_line_width: 1,
-            coloring: IndentGuideColoring::default(),
-            background_coloring: IndentGuideBackgroundColoring::default(),
-        },
-    }
-}
-
-#[gpui::test]
-async fn test_indent_guide_single_line(cx: &mut TestAppContext) {
-    let (buffer_id, mut cx) = setup_indent_guides_editor(
-        &"
-        fn main() {
-            let a = 1;
-        }"
-        .unindent(),
-        cx,
-    )
-    .await;
-
-    assert_indent_guides(0..3, vec![indent_guide(buffer_id, 1, 1, 0)], None, &mut cx);
-}
-
-#[gpui::test]
-async fn test_indent_guide_simple_block(cx: &mut TestAppContext) {
-    let (buffer_id, mut cx) = setup_indent_guides_editor(
-        &"
-        fn main() {
-            let a = 1;
-            let b = 2;
-        }"
-        .unindent(),
-        cx,
-    )
-    .await;
-
-    assert_indent_guides(0..4, vec![indent_guide(buffer_id, 1, 2, 0)], None, &mut cx);
-}
-
-#[gpui::test]
-async fn test_indent_guide_nested(cx: &mut TestAppContext) {
-    let (buffer_id, mut cx) = setup_indent_guides_editor(
-        &"
-        fn main() {
-            let a = 1;
-            if a == 3 {
-                let b = 2;
-            } else {
-                let c = 3;
-            }
-        }"
-        .unindent(),
-        cx,
-    )
-    .await;
-
-    assert_indent_guides(
-        0..8,
-        vec![
-            indent_guide(buffer_id, 1, 6, 0),
-            indent_guide(buffer_id, 3, 3, 1),
-            indent_guide(buffer_id, 5, 5, 1),
-        ],
-        None,
-        &mut cx,
-    );
-}
-
-#[gpui::test]
-async fn test_indent_guide_tab(cx: &mut TestAppContext) {
-    let (buffer_id, mut cx) = setup_indent_guides_editor(
-        &"
-        fn main() {
-            let a = 1;
-                let b = 2;
-            let c = 3;
-        }"
-        .unindent(),
-        cx,
-    )
-    .await;
-
-    assert_indent_guides(
-        0..5,
-        vec![
-            indent_guide(buffer_id, 1, 3, 0),
-            indent_guide(buffer_id, 2, 2, 1),
-        ],
-        None,
-        &mut cx,
-    );
-}
-
-#[gpui::test]
-async fn test_indent_guide_continues_on_empty_line(cx: &mut TestAppContext) {
-    let (buffer_id, mut cx) = setup_indent_guides_editor(
-        &"
-        fn main() {
-            let a = 1;
-
-            let c = 3;
-        }"
-        .unindent(),
-        cx,
-    )
-    .await;
-
-    assert_indent_guides(0..5, vec![indent_guide(buffer_id, 1, 3, 0)], None, &mut cx);
-}
-
-#[gpui::test]
-async fn test_indent_guide_complex(cx: &mut TestAppContext) {
-    let (buffer_id, mut cx) = setup_indent_guides_editor(
-        &"
-        fn main() {
-            let a = 1;
-
-            let c = 3;
-
-            if a == 3 {
-                let b = 2;
-            } else {
-                let c = 3;
-            }
-        }"
-        .unindent(),
-        cx,
-    )
-    .await;
-
-    assert_indent_guides(
-        0..11,
-        vec![
-            indent_guide(buffer_id, 1, 9, 0),
-            indent_guide(buffer_id, 6, 6, 1),
-            indent_guide(buffer_id, 8, 8, 1),
-        ],
-        None,
-        &mut cx,
-    );
-}
-
-#[gpui::test]
-async fn test_indent_guide_starts_off_screen(cx: &mut TestAppContext) {
-    let (buffer_id, mut cx) = setup_indent_guides_editor(
-        &"
-        fn main() {
-            let a = 1;
-
-            let c = 3;
-
-            if a == 3 {
-                let b = 2;
-            } else {
-                let c = 3;
-            }
-        }"
-        .unindent(),
-        cx,
-    )
-    .await;
-
-    assert_indent_guides(
-        1..11,
-        vec![
-            indent_guide(buffer_id, 1, 9, 0),
-            indent_guide(buffer_id, 6, 6, 1),
-            indent_guide(buffer_id, 8, 8, 1),
-        ],
-        None,
-        &mut cx,
-    );
-}
-
-#[gpui::test]
-async fn test_indent_guide_ends_off_screen(cx: &mut TestAppContext) {
-    let (buffer_id, mut cx) = setup_indent_guides_editor(
-        &"
-        fn main() {
-            let a = 1;
-
-            let c = 3;
-
-            if a == 3 {
-                let b = 2;
-            } else {
-                let c = 3;
-            }
-        }"
-        .unindent(),
-        cx,
-    )
-    .await;
-
-    assert_indent_guides(
-        1..10,
-        vec![
-            indent_guide(buffer_id, 1, 9, 0),
-            indent_guide(buffer_id, 6, 6, 1),
-            indent_guide(buffer_id, 8, 8, 1),
-        ],
-        None,
-        &mut cx,
-    );
-}
-
-#[gpui::test]
-async fn test_indent_guide_with_folds(cx: &mut TestAppContext) {
-    let (buffer_id, mut cx) = setup_indent_guides_editor(
-        &"
-        fn main() {
-            if a {
-                b(
-                    c,
-                    d,
-                )
-            } else {
-                e(
-                    f
-                )
-            }
-        }"
-        .unindent(),
-        cx,
-    )
-    .await;
-
-    assert_indent_guides(
-        0..11,
-        vec![
-            indent_guide(buffer_id, 1, 10, 0),
-            indent_guide(buffer_id, 2, 5, 1),
-            indent_guide(buffer_id, 7, 9, 1),
-            indent_guide(buffer_id, 3, 4, 2),
-            indent_guide(buffer_id, 8, 8, 2),
-        ],
-        None,
-        &mut cx,
-    );
-
-    cx.update_editor(|editor, window, cx| {
-        editor.fold_at(MultiBufferRow(2), window, cx);
-        assert_eq!(
-            editor.display_text(cx),
-            "
-            fn main() {
-                if a {
-                    b(⋯
-                    )
-                } else {
-                    e(
-                        f
-                    )
-                }
-            }"
-            .unindent()
-        );
-    });
-
-    assert_indent_guides(
-        0..11,
-        vec![
-            indent_guide(buffer_id, 1, 10, 0),
-            indent_guide(buffer_id, 2, 5, 1),
-            indent_guide(buffer_id, 7, 9, 1),
-            indent_guide(buffer_id, 8, 8, 2),
-        ],
-        None,
-        &mut cx,
-    );
-}
-
-#[gpui::test]
-async fn test_indent_guide_without_brackets(cx: &mut TestAppContext) {
-    let (buffer_id, mut cx) = setup_indent_guides_editor(
-        &"
-        block1
-            block2
-                block3
-                    block4
-            block2
-        block1
-        block1"
-            .unindent(),
-        cx,
-    )
-    .await;
-
-    assert_indent_guides(
-        1..10,
-        vec![
-            indent_guide(buffer_id, 1, 4, 0),
-            indent_guide(buffer_id, 2, 3, 1),
-            indent_guide(buffer_id, 3, 3, 2),
-        ],
-        None,
-        &mut cx,
-    );
-}
-
-#[gpui::test]
-async fn test_indent_guide_ends_before_empty_line(cx: &mut TestAppContext) {
-    let (buffer_id, mut cx) = setup_indent_guides_editor(
-        &"
-        block1
-            block2
-                block3
-
-        block1
-        block1"
-            .unindent(),
-        cx,
-    )
-    .await;
-
-    assert_indent_guides(
-        0..6,
-        vec![
-            indent_guide(buffer_id, 1, 2, 0),
-            indent_guide(buffer_id, 2, 2, 1),
-        ],
-        None,
-        &mut cx,
-    );
-}
-
-#[gpui::test]
-async fn test_indent_guide_ignored_only_whitespace_lines(cx: &mut TestAppContext) {
-    let (buffer_id, mut cx) = setup_indent_guides_editor(
-        &"
-        function component() {
-        \treturn (
-        \t\t\t
-        \t\t<div>
-        \t\t\t<abc></abc>
-        \t\t</div>
-        \t)
-        }"
-        .unindent(),
-        cx,
-    )
-    .await;
-
-    assert_indent_guides(
-        0..8,
-        vec![
-            indent_guide(buffer_id, 1, 6, 0),
-            indent_guide(buffer_id, 2, 5, 1),
-            indent_guide(buffer_id, 4, 4, 2),
-        ],
-        None,
-        &mut cx,
-    );
-}
-
-#[gpui::test]
-async fn test_indent_guide_fallback_to_next_non_entirely_whitespace_line(cx: &mut TestAppContext) {
-    let (buffer_id, mut cx) = setup_indent_guides_editor(
-        &"
-        function component() {
-        \treturn (
-        \t
-        \t\t<div>
-        \t\t\t<abc></abc>
-        \t\t</div>
-        \t)
-        }"
-        .unindent(),
-        cx,
-    )
-    .await;
-
-    assert_indent_guides(
-        0..8,
-        vec![
-            indent_guide(buffer_id, 1, 6, 0),
-            indent_guide(buffer_id, 2, 5, 1),
-            indent_guide(buffer_id, 4, 4, 2),
-        ],
-        None,
-        &mut cx,
-    );
-}
-
-#[gpui::test]
-async fn test_indent_guide_continuing_off_screen(cx: &mut TestAppContext) {
-    let (buffer_id, mut cx) = setup_indent_guides_editor(
-        &"
-        block1
-
-
-
-            block2
-        "
-        .unindent(),
-        cx,
-    )
-    .await;
-
-    assert_indent_guides(0..1, vec![indent_guide(buffer_id, 1, 1, 0)], None, &mut cx);
-}
-
-#[gpui::test]
-async fn test_indent_guide_tabs(cx: &mut TestAppContext) {
-    let (buffer_id, mut cx) = setup_indent_guides_editor(
-        &"
-        def a:
-        \tb = 3
-        \tif True:
-        \t\tc = 4
-        \t\td = 5
-        \tprint(b)
-        "
-        .unindent(),
-        cx,
-    )
-    .await;
-
-    assert_indent_guides(
-        0..6,
-        vec![
-            indent_guide(buffer_id, 1, 5, 0),
-            indent_guide(buffer_id, 3, 4, 1),
-        ],
-        None,
-        &mut cx,
-    );
-}
-
-#[gpui::test]
-async fn test_active_indent_guide_single_line(cx: &mut TestAppContext) {
-    let (buffer_id, mut cx) = setup_indent_guides_editor(
-        &"
-    fn main() {
-        let a = 1;
-    }"
-        .unindent(),
-        cx,
-    )
-    .await;
-
-    cx.update_editor(|editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([Point::new(1, 0)..Point::new(1, 0)])
-        });
-    });
-
-    assert_indent_guides(
-        0..3,
-        vec![indent_guide(buffer_id, 1, 1, 0)],
-        Some(vec![0]),
-        &mut cx,
-    );
-}
-
-#[gpui::test]
-async fn test_active_indent_guide_respect_indented_range(cx: &mut TestAppContext) {
-    let (buffer_id, mut cx) = setup_indent_guides_editor(
-        &"
-    fn main() {
-        if 1 == 2 {
-            let a = 1;
-        }
-    }"
-        .unindent(),
-        cx,
-    )
-    .await;
-
-    cx.update_editor(|editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([Point::new(1, 0)..Point::new(1, 0)])
-        });
-    });
-
-    assert_indent_guides(
-        0..4,
-        vec![
-            indent_guide(buffer_id, 1, 3, 0),
-            indent_guide(buffer_id, 2, 2, 1),
-        ],
-        Some(vec![1]),
-        &mut cx,
-    );
-
-    cx.update_editor(|editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([Point::new(2, 0)..Point::new(2, 0)])
-        });
-    });
-
-    assert_indent_guides(
-        0..4,
-        vec![
-            indent_guide(buffer_id, 1, 3, 0),
-            indent_guide(buffer_id, 2, 2, 1),
-        ],
-        Some(vec![1]),
-        &mut cx,
-    );
-
-    cx.update_editor(|editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([Point::new(3, 0)..Point::new(3, 0)])
-        });
-    });
-
-    assert_indent_guides(
-        0..4,
-        vec![
-            indent_guide(buffer_id, 1, 3, 0),
-            indent_guide(buffer_id, 2, 2, 1),
-        ],
-        Some(vec![0]),
-        &mut cx,
-    );
-}
-
-#[gpui::test]
-async fn test_active_indent_guide_empty_line(cx: &mut TestAppContext) {
-    let (buffer_id, mut cx) = setup_indent_guides_editor(
-        &"
-    fn main() {
-        let a = 1;
-
-        let b = 2;
-    }"
-        .unindent(),
-        cx,
-    )
-    .await;
-
-    cx.update_editor(|editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([Point::new(2, 0)..Point::new(2, 0)])
-        });
-    });
-
-    assert_indent_guides(
-        0..5,
-        vec![indent_guide(buffer_id, 1, 3, 0)],
-        Some(vec![0]),
-        &mut cx,
-    );
-}
-
-#[gpui::test]
-async fn test_active_indent_guide_non_matching_indent(cx: &mut TestAppContext) {
-    let (buffer_id, mut cx) = setup_indent_guides_editor(
-        &"
-    def m:
-        a = 1
-        pass"
-            .unindent(),
-        cx,
-    )
-    .await;
-
-    cx.update_editor(|editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([Point::new(1, 0)..Point::new(1, 0)])
-        });
-    });
-
-    assert_indent_guides(
-        0..3,
-        vec![indent_guide(buffer_id, 1, 2, 0)],
-        Some(vec![0]),
-        &mut cx,
-    );
-}
-
-#[gpui::test]
-async fn test_indent_guide_with_expanded_diff_hunks(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    let mut cx = EditorTestContext::new(cx).await;
-    let text = indoc! {
-        "
-        impl A {
-            fn b() {
-                0;
-                3;
-                5;
-                6;
-                7;
-            }
-        }
-        "
-    };
-    let base_text = indoc! {
-        "
-        impl A {
-            fn b() {
-                0;
-                1;
-                2;
-                3;
-                4;
-            }
-            fn c() {
-                5;
-                6;
-                7;
-            }
-        }
-        "
-    };
-
-    cx.update_editor(|editor, window, cx| {
-        editor.set_text(text, window, cx);
-
-        editor.buffer().update(cx, |multibuffer, cx| {
-            let buffer = multibuffer.as_singleton().unwrap();
-            let diff = cx.new(|cx| BufferDiff::new_with_base_text(base_text, &buffer, cx));
-
-            multibuffer.set_all_diff_hunks_expanded(cx);
-            multibuffer.add_diff(diff, cx);
-
-            buffer.read(cx).remote_id()
-        })
-    });
-    cx.run_until_parked();
-
-    cx.assert_state_with_diff(
-        indoc! { "
-          impl A {
-              fn b() {
-                  0;
-        -         1;
-        -         2;
-                  3;
-        -         4;
-        -     }
-        -     fn c() {
-                  5;
-                  6;
-                  7;
-              }
-          }
-          ˇ"
-        }
-        .to_string(),
-    );
-
-    let mut actual_guides = cx.update_editor(|editor, window, cx| {
-        editor
-            .snapshot(window, cx)
-            .buffer_snapshot()
-            .indent_guides_in_range(Anchor::min()..Anchor::max(), false, cx)
-            .map(|guide| (guide.start_row..=guide.end_row, guide.depth))
-            .collect::<Vec<_>>()
-    });
-    actual_guides.sort_by_key(|item| (*item.0.start(), item.1));
-    assert_eq!(
-        actual_guides,
-        vec![
-            (MultiBufferRow(1)..=MultiBufferRow(12), 0),
-            (MultiBufferRow(2)..=MultiBufferRow(6), 1),
-            (MultiBufferRow(9)..=MultiBufferRow(11), 1),
-        ]
-    );
-}
-
-#[gpui::test]
-async fn test_adjacent_diff_hunks(executor: BackgroundExecutor, cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    let mut cx = EditorTestContext::new(cx).await;
-
-    let diff_base = r#"
-        a
-        b
-        c
-        "#
-    .unindent();
-
-    cx.set_state(
-        &r#"
-        ˇA
-        b
-        C
-        "#
-        .unindent(),
-    );
-    cx.set_head_text(&diff_base);
-    cx.update_editor(|editor, window, cx| {
-        editor.expand_all_diff_hunks(&ExpandAllDiffHunks, window, cx);
-    });
-    executor.run_until_parked();
-
-    let both_hunks_expanded = r#"
-        - a
-        + ˇA
-          b
-        - c
-        + C
-        "#
-    .unindent();
-
-    cx.assert_state_with_diff(both_hunks_expanded.clone());
-
-    let hunk_ranges = cx.update_editor(|editor, window, cx| {
-        let snapshot = editor.snapshot(window, cx);
-        let hunks = editor
-            .diff_hunks_in_ranges(&[Anchor::min()..Anchor::max()], &snapshot.buffer_snapshot())
-            .collect::<Vec<_>>();
-        let excerpt_id = editor.buffer.read(cx).excerpt_ids()[0];
-        hunks
-            .into_iter()
-            .map(|hunk| Anchor::range_in_buffer(excerpt_id, hunk.buffer_range))
-            .collect::<Vec<_>>()
-    });
-    assert_eq!(hunk_ranges.len(), 2);
-
-    cx.update_editor(|editor, _, cx| {
-        editor.toggle_single_diff_hunk(hunk_ranges[0].clone(), cx);
-    });
-    executor.run_until_parked();
-
-    let second_hunk_expanded = r#"
-          ˇA
-          b
-        - c
-        + C
-        "#
-    .unindent();
-
-    cx.assert_state_with_diff(second_hunk_expanded);
-
-    cx.update_editor(|editor, _, cx| {
-        editor.toggle_single_diff_hunk(hunk_ranges[0].clone(), cx);
-    });
-    executor.run_until_parked();
-
-    cx.assert_state_with_diff(both_hunks_expanded.clone());
-
-    cx.update_editor(|editor, _, cx| {
-        editor.toggle_single_diff_hunk(hunk_ranges[1].clone(), cx);
-    });
-    executor.run_until_parked();
-
-    let first_hunk_expanded = r#"
-        - a
-        + ˇA
-          b
-          C
-        "#
-    .unindent();
-
-    cx.assert_state_with_diff(first_hunk_expanded);
-
-    cx.update_editor(|editor, _, cx| {
-        editor.toggle_single_diff_hunk(hunk_ranges[1].clone(), cx);
-    });
-    executor.run_until_parked();
-
-    cx.assert_state_with_diff(both_hunks_expanded);
-
-    cx.set_state(
-        &r#"
-        ˇA
-        b
-        "#
-        .unindent(),
-    );
-    cx.run_until_parked();
-
-    // TODO this cursor position seems bad
-    cx.assert_state_with_diff(
-        r#"
-        - ˇa
-        + A
-          b
-        "#
-        .unindent(),
-    );
-
-    cx.update_editor(|editor, window, cx| {
-        editor.expand_all_diff_hunks(&ExpandAllDiffHunks, window, cx);
-    });
-
-    cx.assert_state_with_diff(
-        r#"
-            - ˇa
-            + A
-              b
-            - c
-            "#
-        .unindent(),
-    );
-
-    let hunk_ranges = cx.update_editor(|editor, window, cx| {
-        let snapshot = editor.snapshot(window, cx);
-        let hunks = editor
-            .diff_hunks_in_ranges(&[Anchor::min()..Anchor::max()], &snapshot.buffer_snapshot())
-            .collect::<Vec<_>>();
-        let excerpt_id = editor.buffer.read(cx).excerpt_ids()[0];
-        hunks
-            .into_iter()
-            .map(|hunk| Anchor::range_in_buffer(excerpt_id, hunk.buffer_range))
-            .collect::<Vec<_>>()
-    });
-    assert_eq!(hunk_ranges.len(), 2);
-
-    cx.update_editor(|editor, _, cx| {
-        editor.toggle_single_diff_hunk(hunk_ranges[1].clone(), cx);
-    });
-    executor.run_until_parked();
-
-    cx.assert_state_with_diff(
-        r#"
-        - ˇa
-        + A
-          b
-        "#
-        .unindent(),
-    );
-}
-
-#[gpui::test]
-async fn test_toggle_deletion_hunk_at_start_of_file(
-    executor: BackgroundExecutor,
-    cx: &mut TestAppContext,
-) {
-    init_test(cx, |_| {});
-    let mut cx = EditorTestContext::new(cx).await;
-
-    let diff_base = r#"
-        a
-        b
-        c
-        "#
-    .unindent();
-
-    cx.set_state(
-        &r#"
-        ˇb
-        c
-        "#
-        .unindent(),
-    );
-    cx.set_head_text(&diff_base);
-    cx.update_editor(|editor, window, cx| {
-        editor.expand_all_diff_hunks(&ExpandAllDiffHunks, window, cx);
-    });
-    executor.run_until_parked();
-
-    let hunk_expanded = r#"
-        - a
-          ˇb
-          c
-        "#
-    .unindent();
-
-    cx.assert_state_with_diff(hunk_expanded.clone());
-
-    let hunk_ranges = cx.update_editor(|editor, window, cx| {
-        let snapshot = editor.snapshot(window, cx);
-        let hunks = editor
-            .diff_hunks_in_ranges(&[Anchor::min()..Anchor::max()], &snapshot.buffer_snapshot())
-            .collect::<Vec<_>>();
-        let excerpt_id = editor.buffer.read(cx).excerpt_ids()[0];
-        hunks
-            .into_iter()
-            .map(|hunk| Anchor::range_in_buffer(excerpt_id, hunk.buffer_range))
-            .collect::<Vec<_>>()
-    });
-    assert_eq!(hunk_ranges.len(), 1);
-
-    cx.update_editor(|editor, _, cx| {
-        editor.toggle_single_diff_hunk(hunk_ranges[0].clone(), cx);
-    });
-    executor.run_until_parked();
-
-    let hunk_collapsed = r#"
-          ˇb
-          c
-        "#
-    .unindent();
-
-    cx.assert_state_with_diff(hunk_collapsed);
-
-    cx.update_editor(|editor, _, cx| {
-        editor.toggle_single_diff_hunk(hunk_ranges[0].clone(), cx);
-    });
-    executor.run_until_parked();
-
-    cx.assert_state_with_diff(hunk_expanded);
-}
-
-#[gpui::test]
-async fn test_display_diff_hunks(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/test"),
-        json!({
-            ".git": {},
-            "file-1": "ONE\n",
-            "file-2": "TWO\n",
-            "file-3": "THREE\n",
-        }),
-    )
-    .await;
-
-    fs.set_head_for_repo(
-        path!("/test/.git").as_ref(),
-        &[
-            ("file-1", "one\n".into()),
-            ("file-2", "two\n".into()),
-            ("file-3", "three\n".into()),
-        ],
-        "deadbeef",
-    );
-
-    let project = Project::test(fs, [path!("/test").as_ref()], cx).await;
-    let mut buffers = vec![];
-    for i in 1..=3 {
-        let buffer = project
-            .update(cx, |project, cx| {
-                let path = format!(path!("/test/file-{}"), i);
-                project.open_local_buffer(path, cx)
-            })
-            .await
-            .unwrap();
-        buffers.push(buffer);
-    }
-
-    let multibuffer = cx.new(|cx| {
-        let mut multibuffer = MultiBuffer::new(Capability::ReadWrite);
-        multibuffer.set_all_diff_hunks_expanded(cx);
-        for buffer in &buffers {
-            let snapshot = buffer.read(cx).snapshot();
-            multibuffer.set_excerpts_for_path(
-                PathKey::with_sort_prefix(0, buffer.read(cx).file().unwrap().path().clone()),
-                buffer.clone(),
-                vec![text::Anchor::MIN.to_point(&snapshot)..text::Anchor::MAX.to_point(&snapshot)],
-                2,
-                cx,
-            );
-        }
-        multibuffer
-    });
-
-    let editor = cx.add_window(|window, cx| {
-        Editor::new(EditorMode::full(), multibuffer, Some(project), window, cx)
-    });
-    cx.run_until_parked();
-
-    let snapshot = editor
-        .update(cx, |editor, window, cx| editor.snapshot(window, cx))
-        .unwrap();
-    let hunks = snapshot
-        .display_diff_hunks_for_rows(DisplayRow(0)..DisplayRow(u32::MAX), &Default::default())
-        .map(|hunk| match hunk {
-            DisplayDiffHunk::Unfolded {
-                display_row_range, ..
-            } => display_row_range,
-            DisplayDiffHunk::Folded { .. } => unreachable!(),
-        })
-        .collect::<Vec<_>>();
-    assert_eq!(
-        hunks,
-        [
-            DisplayRow(2)..DisplayRow(4),
-            DisplayRow(7)..DisplayRow(9),
-            DisplayRow(12)..DisplayRow(14),
-        ]
-    );
-}
-
-#[gpui::test]
-async fn test_partially_staged_hunk(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-    cx.set_head_text(indoc! { "
-        one
-        two
-        three
-        four
-        five
-        "
-    });
-    cx.set_index_text(indoc! { "
-        one
-        two
-        three
-        four
-        five
-        "
-    });
-    cx.set_state(indoc! {"
-        one
-        TWO
-        ˇTHREE
-        FOUR
-        five
-    "});
-    cx.run_until_parked();
-    cx.update_editor(|editor, window, cx| {
-        editor.toggle_staged_selected_diff_hunks(&Default::default(), window, cx);
-    });
-    cx.run_until_parked();
-    cx.assert_index_text(Some(indoc! {"
-        one
-        TWO
-        THREE
-        FOUR
-        five
-    "}));
-    cx.set_state(indoc! { "
-        one
-        TWO
-        ˇTHREE-HUNDRED
-        FOUR
-        five
-    "});
-    cx.run_until_parked();
-    cx.update_editor(|editor, window, cx| {
-        let snapshot = editor.snapshot(window, cx);
-        let hunks = editor
-            .diff_hunks_in_ranges(&[Anchor::min()..Anchor::max()], &snapshot.buffer_snapshot())
-            .collect::<Vec<_>>();
-        assert_eq!(hunks.len(), 1);
-        assert_eq!(
-            hunks[0].status(),
-            DiffHunkStatus {
-                kind: DiffHunkStatusKind::Modified,
-                secondary: DiffHunkSecondaryStatus::OverlapsWithSecondaryHunk
-            }
-        );
-
-        editor.toggle_staged_selected_diff_hunks(&Default::default(), window, cx);
-    });
-    cx.run_until_parked();
-    cx.assert_index_text(Some(indoc! {"
-        one
-        TWO
-        THREE-HUNDRED
-        FOUR
-        five
-    "}));
-}
-
-#[gpui::test]
-fn test_crease_insertion_and_rendering(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let editor = cx.add_window(|window, cx| {
-        let buffer = MultiBuffer::build_simple("aaaaaa\nbbbbbb\ncccccc\nddddddd\n", cx);
-        build_editor(buffer, window, cx)
-    });
-
-    let render_args = Arc::new(Mutex::new(None));
-    let snapshot = editor
-        .update(cx, |editor, window, cx| {
-            let snapshot = editor.buffer().read(cx).snapshot(cx);
-            let range =
-                snapshot.anchor_before(Point::new(1, 0))..snapshot.anchor_after(Point::new(2, 6));
-
-            struct RenderArgs {
-                row: MultiBufferRow,
-                folded: bool,
-                callback: Arc<dyn Fn(bool, &mut Window, &mut App) + Send + Sync>,
-            }
-
-            let crease = Crease::inline(
-                range,
-                FoldPlaceholder::test(),
-                {
-                    let toggle_callback = render_args.clone();
-                    move |row, folded, callback, _window, _cx| {
-                        *toggle_callback.lock() = Some(RenderArgs {
-                            row,
-                            folded,
-                            callback,
-                        });
-                        div()
-                    }
-                },
-                |_row, _folded, _window, _cx| div(),
-            );
-
-            editor.insert_creases(Some(crease), cx);
-            let snapshot = editor.snapshot(window, cx);
-            let _div =
-                snapshot.render_crease_toggle(MultiBufferRow(1), false, cx.entity(), window, cx);
-            snapshot
-        })
-        .unwrap();
-
-    let render_args = render_args.lock().take().unwrap();
-    assert_eq!(render_args.row, MultiBufferRow(1));
-    assert!(!render_args.folded);
-    assert!(!snapshot.is_line_folded(MultiBufferRow(1)));
-
-    cx.update_window(*editor, |_, window, cx| {
-        (render_args.callback)(true, window, cx)
-    })
-    .unwrap();
-    let snapshot = editor
-        .update(cx, |editor, window, cx| editor.snapshot(window, cx))
-        .unwrap();
-    assert!(snapshot.is_line_folded(MultiBufferRow(1)));
-
-    cx.update_window(*editor, |_, window, cx| {
-        (render_args.callback)(false, window, cx)
-    })
-    .unwrap();
-    let snapshot = editor
-        .update(cx, |editor, window, cx| editor.snapshot(window, cx))
-        .unwrap();
-    assert!(!snapshot.is_line_folded(MultiBufferRow(1)));
-}
-
-#[gpui::test]
-async fn test_input_text(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    let mut cx = EditorTestContext::new(cx).await;
-
-    cx.set_state(
-        &r#"ˇone
-        two
-
-        three
-        fourˇ
-        five
-
-        siˇx"#
-            .unindent(),
-    );
-
-    cx.dispatch_action(HandleInput(String::new()));
-    cx.assert_editor_state(
-        &r#"ˇone
-        two
-
-        three
-        fourˇ
-        five
-
-        siˇx"#
-            .unindent(),
-    );
-
-    cx.dispatch_action(HandleInput("AAAA".to_string()));
-    cx.assert_editor_state(
-        &r#"AAAAˇone
-        two
-
-        three
-        fourAAAAˇ
-        five
-
-        siAAAAˇx"#
-            .unindent(),
-    );
-}
-
-#[gpui::test]
-async fn test_scroll_cursor_center_top_bottom(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-    cx.set_state(
-        r#"let foo = 1;
-let foo = 2;
-let foo = 3;
-let fooˇ = 4;
-let foo = 5;
-let foo = 6;
-let foo = 7;
-let foo = 8;
-let foo = 9;
-let foo = 10;
-let foo = 11;
-let foo = 12;
-let foo = 13;
-let foo = 14;
-let foo = 15;"#,
-    );
-
-    cx.update_editor(|e, window, cx| {
-        assert_eq!(
-            e.next_scroll_position,
-            NextScrollCursorCenterTopBottom::Center,
-            "Default next scroll direction is center",
-        );
-
-        e.scroll_cursor_center_top_bottom(&ScrollCursorCenterTopBottom, window, cx);
-        assert_eq!(
-            e.next_scroll_position,
-            NextScrollCursorCenterTopBottom::Top,
-            "After center, next scroll direction should be top",
-        );
-
-        e.scroll_cursor_center_top_bottom(&ScrollCursorCenterTopBottom, window, cx);
-        assert_eq!(
-            e.next_scroll_position,
-            NextScrollCursorCenterTopBottom::Bottom,
-            "After top, next scroll direction should be bottom",
-        );
-
-        e.scroll_cursor_center_top_bottom(&ScrollCursorCenterTopBottom, window, cx);
-        assert_eq!(
-            e.next_scroll_position,
-            NextScrollCursorCenterTopBottom::Center,
-            "After bottom, scrolling should start over",
-        );
-
-        e.scroll_cursor_center_top_bottom(&ScrollCursorCenterTopBottom, window, cx);
-        assert_eq!(
-            e.next_scroll_position,
-            NextScrollCursorCenterTopBottom::Top,
-            "Scrolling continues if retriggered fast enough"
-        );
-    });
-
-    cx.executor()
-        .advance_clock(SCROLL_CENTER_TOP_BOTTOM_DEBOUNCE_TIMEOUT + Duration::from_millis(200));
-    cx.executor().run_until_parked();
-    cx.update_editor(|e, _, _| {
-        assert_eq!(
-            e.next_scroll_position,
-            NextScrollCursorCenterTopBottom::Center,
-            "If scrolling is not triggered fast enough, it should reset"
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_goto_definition_with_find_all_references_fallback(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    let mut cx = EditorLspTestContext::new_rust(
-        lsp::ServerCapabilities {
-            definition_provider: Some(lsp::OneOf::Left(true)),
-            references_provider: Some(lsp::OneOf::Left(true)),
-            ..lsp::ServerCapabilities::default()
-        },
-        cx,
-    )
-    .await;
-
-    let set_up_lsp_handlers = |empty_go_to_definition: bool, cx: &mut EditorLspTestContext| {
-        let go_to_definition = cx
-            .lsp
-            .set_request_handler::<lsp::request::GotoDefinition, _, _>(
-                move |params, _| async move {
-                    if empty_go_to_definition {
-                        Ok(None)
-                    } else {
-                        Ok(Some(lsp::GotoDefinitionResponse::Scalar(lsp::Location {
-                            uri: params.text_document_position_params.text_document.uri,
-                            range: lsp::Range::new(
-                                lsp::Position::new(4, 3),
-                                lsp::Position::new(4, 6),
-                            ),
-                        })))
-                    }
-                },
-            );
-        let references = cx
-            .lsp
-            .set_request_handler::<lsp::request::References, _, _>(move |params, _| async move {
-                Ok(Some(vec![lsp::Location {
-                    uri: params.text_document_position.text_document.uri,
-                    range: lsp::Range::new(lsp::Position::new(0, 8), lsp::Position::new(0, 11)),
-                }]))
-            });
-        (go_to_definition, references)
-    };
-
-    cx.set_state(
-        &r#"fn one() {
-            let mut a = ˇtwo();
-        }
-
-        fn two() {}"#
-            .unindent(),
-    );
-    set_up_lsp_handlers(false, &mut cx);
-    let navigated = cx
-        .update_editor(|editor, window, cx| editor.go_to_definition(&GoToDefinition, window, cx))
-        .await
-        .expect("Failed to navigate to definition");
-    assert_eq!(
-        navigated,
-        Navigated::Yes,
-        "Should have navigated to definition from the GetDefinition response"
-    );
-    cx.assert_editor_state(
-        &r#"fn one() {
-            let mut a = two();
-        }
-
-        fn «twoˇ»() {}"#
-            .unindent(),
-    );
-
-    let editors = cx.update_workspace(|workspace, _, cx| {
-        workspace.items_of_type::<Editor>(cx).collect::<Vec<_>>()
-    });
-    cx.update_editor(|_, _, test_editor_cx| {
-        assert_eq!(
-            editors.len(),
-            1,
-            "Initially, only one, test, editor should be open in the workspace"
-        );
-        assert_eq!(
-            test_editor_cx.entity(),
-            editors.last().expect("Asserted len is 1").clone()
-        );
-    });
-
-    set_up_lsp_handlers(true, &mut cx);
-    let navigated = cx
-        .update_editor(|editor, window, cx| editor.go_to_definition(&GoToDefinition, window, cx))
-        .await
-        .expect("Failed to navigate to lookup references");
-    assert_eq!(
-        navigated,
-        Navigated::Yes,
-        "Should have navigated to references as a fallback after empty GoToDefinition response"
-    );
-    // We should not change the selections in the existing file,
-    // if opening another milti buffer with the references
-    cx.assert_editor_state(
-        &r#"fn one() {
-            let mut a = two();
-        }
-
-        fn «twoˇ»() {}"#
-            .unindent(),
-    );
-    let editors = cx.update_workspace(|workspace, _, cx| {
-        workspace.items_of_type::<Editor>(cx).collect::<Vec<_>>()
-    });
-    cx.update_editor(|_, _, test_editor_cx| {
-        assert_eq!(
-            editors.len(),
-            2,
-            "After falling back to references search, we open a new editor with the results"
-        );
-        let references_fallback_text = editors
-            .into_iter()
-            .find(|new_editor| *new_editor != test_editor_cx.entity())
-            .expect("Should have one non-test editor now")
-            .read(test_editor_cx)
-            .text(test_editor_cx);
-        assert_eq!(
-            references_fallback_text, "fn one() {\n    let mut a = two();\n}",
-            "Should use the range from the references response and not the GoToDefinition one"
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_goto_definition_no_fallback(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    cx.update(|cx| {
-        let mut editor_settings = EditorSettings::get_global(cx).clone();
-        editor_settings.go_to_definition_fallback = GoToDefinitionFallback::None;
-        EditorSettings::override_global(editor_settings, cx);
-    });
-    let mut cx = EditorLspTestContext::new_rust(
-        lsp::ServerCapabilities {
-            definition_provider: Some(lsp::OneOf::Left(true)),
-            references_provider: Some(lsp::OneOf::Left(true)),
-            ..lsp::ServerCapabilities::default()
-        },
-        cx,
-    )
-    .await;
-    let original_state = r#"fn one() {
-        let mut a = ˇtwo();
-    }
-
-    fn two() {}"#
-        .unindent();
-    cx.set_state(&original_state);
-
-    let mut go_to_definition = cx
-        .lsp
-        .set_request_handler::<lsp::request::GotoDefinition, _, _>(
-            move |_, _| async move { Ok(None) },
-        );
-    let _references = cx
-        .lsp
-        .set_request_handler::<lsp::request::References, _, _>(move |_, _| async move {
-            panic!("Should not call for references with no go to definition fallback")
-        });
-
-    let navigated = cx
-        .update_editor(|editor, window, cx| editor.go_to_definition(&GoToDefinition, window, cx))
-        .await
-        .expect("Failed to navigate to lookup references");
-    go_to_definition
-        .next()
-        .await
-        .expect("Should have called the go_to_definition handler");
-
-    assert_eq!(
-        navigated,
-        Navigated::No,
-        "Should have navigated to references as a fallback after empty GoToDefinition response"
-    );
-    cx.assert_editor_state(&original_state);
-    let editors = cx.update_workspace(|workspace, _, cx| {
-        workspace.items_of_type::<Editor>(cx).collect::<Vec<_>>()
-    });
-    cx.update_editor(|_, _, _| {
-        assert_eq!(
-            editors.len(),
-            1,
-            "After unsuccessful fallback, no other editor should have been opened"
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_find_all_references_editor_reuse(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    let mut cx = EditorLspTestContext::new_rust(
-        lsp::ServerCapabilities {
-            references_provider: Some(lsp::OneOf::Left(true)),
-            ..lsp::ServerCapabilities::default()
-        },
-        cx,
-    )
-    .await;
-
-    cx.set_state(
-        &r#"
-        fn one() {
-            let mut a = two();
-        }
-
-        fn ˇtwo() {}"#
-            .unindent(),
-    );
-    cx.lsp
-        .set_request_handler::<lsp::request::References, _, _>(move |params, _| async move {
-            Ok(Some(vec![
-                lsp::Location {
-                    uri: params.text_document_position.text_document.uri.clone(),
-                    range: lsp::Range::new(lsp::Position::new(0, 16), lsp::Position::new(0, 19)),
-                },
-                lsp::Location {
-                    uri: params.text_document_position.text_document.uri,
-                    range: lsp::Range::new(lsp::Position::new(4, 4), lsp::Position::new(4, 7)),
-                },
-            ]))
-        });
-    let navigated = cx
-        .update_editor(|editor, window, cx| {
-            editor.find_all_references(&FindAllReferences::default(), window, cx)
-        })
-        .unwrap()
-        .await
-        .expect("Failed to navigate to references");
-    assert_eq!(
-        navigated,
-        Navigated::Yes,
-        "Should have navigated to references from the FindAllReferences response"
-    );
-    cx.assert_editor_state(
-        &r#"fn one() {
-            let mut a = two();
-        }
-
-        fn ˇtwo() {}"#
-            .unindent(),
-    );
-
-    let editors = cx.update_workspace(|workspace, _, cx| {
-        workspace.items_of_type::<Editor>(cx).collect::<Vec<_>>()
-    });
-    cx.update_editor(|_, _, _| {
-        assert_eq!(editors.len(), 2, "We should have opened a new multibuffer");
-    });
-
-    cx.set_state(
-        &r#"fn one() {
-            let mut a = ˇtwo();
-        }
-
-        fn two() {}"#
-            .unindent(),
-    );
-    let navigated = cx
-        .update_editor(|editor, window, cx| {
-            editor.find_all_references(&FindAllReferences::default(), window, cx)
-        })
-        .unwrap()
-        .await
-        .expect("Failed to navigate to references");
-    assert_eq!(
-        navigated,
-        Navigated::Yes,
-        "Should have navigated to references from the FindAllReferences response"
-    );
-    cx.assert_editor_state(
-        &r#"fn one() {
-            let mut a = ˇtwo();
-        }
-
-        fn two() {}"#
-            .unindent(),
-    );
-    let editors = cx.update_workspace(|workspace, _, cx| {
-        workspace.items_of_type::<Editor>(cx).collect::<Vec<_>>()
-    });
-    cx.update_editor(|_, _, _| {
-        assert_eq!(
-            editors.len(),
-            2,
-            "should have re-used the previous multibuffer"
-        );
-    });
-
-    cx.set_state(
-        &r#"fn one() {
-            let mut a = ˇtwo();
-        }
-        fn three() {}
-        fn two() {}"#
-            .unindent(),
-    );
-    cx.lsp
-        .set_request_handler::<lsp::request::References, _, _>(move |params, _| async move {
-            Ok(Some(vec![
-                lsp::Location {
-                    uri: params.text_document_position.text_document.uri.clone(),
-                    range: lsp::Range::new(lsp::Position::new(0, 16), lsp::Position::new(0, 19)),
-                },
-                lsp::Location {
-                    uri: params.text_document_position.text_document.uri,
-                    range: lsp::Range::new(lsp::Position::new(5, 4), lsp::Position::new(5, 7)),
-                },
-            ]))
-        });
-    let navigated = cx
-        .update_editor(|editor, window, cx| {
-            editor.find_all_references(&FindAllReferences::default(), window, cx)
-        })
-        .unwrap()
-        .await
-        .expect("Failed to navigate to references");
-    assert_eq!(
-        navigated,
-        Navigated::Yes,
-        "Should have navigated to references from the FindAllReferences response"
-    );
-    cx.assert_editor_state(
-        &r#"fn one() {
-                let mut a = ˇtwo();
-            }
-            fn three() {}
-            fn two() {}"#
-            .unindent(),
-    );
-    let editors = cx.update_workspace(|workspace, _, cx| {
-        workspace.items_of_type::<Editor>(cx).collect::<Vec<_>>()
-    });
-    cx.update_editor(|_, _, _| {
-        assert_eq!(
-            editors.len(),
-            3,
-            "should have used a new multibuffer as offsets changed"
-        );
-    });
-}
-#[gpui::test]
-async fn test_find_enclosing_node_with_task(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let language = Arc::new(Language::new(
-        LanguageConfig::default(),
-        Some(tree_sitter_rust::LANGUAGE.into()),
-    ));
-
-    let text = r#"
-        #[cfg(test)]
-        mod tests() {
-            #[test]
-            fn runnable_1() {
-                let a = 1;
-            }
-
-            #[test]
-            fn runnable_2() {
-                let a = 1;
-                let b = 2;
-            }
-        }
-    "#
-    .unindent();
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_file("/file.rs", Default::default()).await;
-
-    let project = Project::test(fs, ["/a".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace.deref(), cx);
-    let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(language, cx));
-    let multi_buffer = cx.new(|cx| MultiBuffer::singleton(buffer.clone(), cx));
-
-    let editor = cx.new_window_entity(|window, cx| {
-        Editor::new(
-            EditorMode::full(),
-            multi_buffer,
-            Some(project.clone()),
-            window,
-            cx,
-        )
-    });
-
-    editor.update_in(cx, |editor, window, cx| {
-        let snapshot = editor.buffer().read(cx).snapshot(cx);
-        editor.tasks.insert(
-            (buffer.read(cx).remote_id(), 3),
-            RunnableTasks {
-                templates: vec![],
-                offset: snapshot.anchor_before(MultiBufferOffset(43)),
-                column: 0,
-                extra_variables: HashMap::default(),
-                context_range: BufferOffset(43)..BufferOffset(85),
-            },
-        );
-        editor.tasks.insert(
-            (buffer.read(cx).remote_id(), 8),
-            RunnableTasks {
-                templates: vec![],
-                offset: snapshot.anchor_before(MultiBufferOffset(86)),
-                column: 0,
-                extra_variables: HashMap::default(),
-                context_range: BufferOffset(86)..BufferOffset(191),
-            },
-        );
-
-        // Test finding task when cursor is inside function body
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([Point::new(4, 5)..Point::new(4, 5)])
-        });
-        let (_, row, _) = editor.find_enclosing_node_task(cx).unwrap();
-        assert_eq!(row, 3, "Should find task for cursor inside runnable_1");
-
-        // Test finding task when cursor is on function name
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([Point::new(8, 4)..Point::new(8, 4)])
-        });
-        let (_, row, _) = editor.find_enclosing_node_task(cx).unwrap();
-        assert_eq!(row, 8, "Should find task when cursor is on function name");
-    });
-}
-
-#[gpui::test]
-async fn test_folding_buffers(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let sample_text_1 = "aaaa\nbbbb\ncccc\ndddd\neeee\nffff\ngggg\nhhhh\niiii\njjjj".to_string();
-    let sample_text_2 = "llll\nmmmm\nnnnn\noooo\npppp\nqqqq\nrrrr\nssss\ntttt\nuuuu".to_string();
-    let sample_text_3 = "vvvv\nwwww\nxxxx\nyyyy\nzzzz\n1111\n2222\n3333\n4444\n5555".to_string();
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/a"),
-        json!({
-            "first.rs": sample_text_1,
-            "second.rs": sample_text_2,
-            "third.rs": sample_text_3,
-        }),
-    )
-    .await;
-    let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace.deref(), cx);
-    let worktree = project.update(cx, |project, cx| {
-        let mut worktrees = project.worktrees(cx).collect::<Vec<_>>();
-        assert_eq!(worktrees.len(), 1);
-        worktrees.pop().unwrap()
-    });
-    let worktree_id = worktree.update(cx, |worktree, _| worktree.id());
-
-    let buffer_1 = project
-        .update(cx, |project, cx| {
-            project.open_buffer((worktree_id, rel_path("first.rs")), cx)
-        })
-        .await
-        .unwrap();
-    let buffer_2 = project
-        .update(cx, |project, cx| {
-            project.open_buffer((worktree_id, rel_path("second.rs")), cx)
-        })
-        .await
-        .unwrap();
-    let buffer_3 = project
-        .update(cx, |project, cx| {
-            project.open_buffer((worktree_id, rel_path("third.rs")), cx)
-        })
-        .await
-        .unwrap();
-
-    let multi_buffer = cx.new(|cx| {
-        let mut multi_buffer = MultiBuffer::new(ReadWrite);
-        multi_buffer.push_excerpts(
-            buffer_1.clone(),
-            [
-                ExcerptRange::new(Point::new(0, 0)..Point::new(3, 0)),
-                ExcerptRange::new(Point::new(5, 0)..Point::new(7, 0)),
-                ExcerptRange::new(Point::new(9, 0)..Point::new(10, 4)),
-            ],
-            cx,
-        );
-        multi_buffer.push_excerpts(
-            buffer_2.clone(),
-            [
-                ExcerptRange::new(Point::new(0, 0)..Point::new(3, 0)),
-                ExcerptRange::new(Point::new(5, 0)..Point::new(7, 0)),
-                ExcerptRange::new(Point::new(9, 0)..Point::new(10, 4)),
-            ],
-            cx,
-        );
-        multi_buffer.push_excerpts(
-            buffer_3.clone(),
-            [
-                ExcerptRange::new(Point::new(0, 0)..Point::new(3, 0)),
-                ExcerptRange::new(Point::new(5, 0)..Point::new(7, 0)),
-                ExcerptRange::new(Point::new(9, 0)..Point::new(10, 4)),
-            ],
-            cx,
-        );
-        multi_buffer
-    });
-    let multi_buffer_editor = cx.new_window_entity(|window, cx| {
-        Editor::new(
-            EditorMode::full(),
-            multi_buffer.clone(),
-            Some(project.clone()),
-            window,
-            cx,
-        )
-    });
-
-    assert_eq!(
-        multi_buffer_editor.update(cx, |editor, cx| editor.display_text(cx)),
-        "\n\naaaa\nbbbb\ncccc\n\n\nffff\ngggg\n\n\njjjj\n\n\nllll\nmmmm\nnnnn\n\n\nqqqq\nrrrr\n\n\nuuuu\n\n\nvvvv\nwwww\nxxxx\n\n\n1111\n2222\n\n\n5555",
-    );
-
-    multi_buffer_editor.update(cx, |editor, cx| {
-        editor.fold_buffer(buffer_1.read(cx).remote_id(), cx)
-    });
-    assert_eq!(
-        multi_buffer_editor.update(cx, |editor, cx| editor.display_text(cx)),
-        "\n\n\n\nllll\nmmmm\nnnnn\n\n\nqqqq\nrrrr\n\n\nuuuu\n\n\nvvvv\nwwww\nxxxx\n\n\n1111\n2222\n\n\n5555",
-        "After folding the first buffer, its text should not be displayed"
-    );
-
-    multi_buffer_editor.update(cx, |editor, cx| {
-        editor.fold_buffer(buffer_2.read(cx).remote_id(), cx)
-    });
-    assert_eq!(
-        multi_buffer_editor.update(cx, |editor, cx| editor.display_text(cx)),
-        "\n\n\n\n\n\nvvvv\nwwww\nxxxx\n\n\n1111\n2222\n\n\n5555",
-        "After folding the second buffer, its text should not be displayed"
-    );
-
-    multi_buffer_editor.update(cx, |editor, cx| {
-        editor.fold_buffer(buffer_3.read(cx).remote_id(), cx)
-    });
-    assert_eq!(
-        multi_buffer_editor.update(cx, |editor, cx| editor.display_text(cx)),
-        "\n\n\n\n\n",
-        "After folding the third buffer, its text should not be displayed"
-    );
-
-    // Emulate selection inside the fold logic, that should work
-    multi_buffer_editor.update_in(cx, |editor, window, cx| {
-        editor
-            .snapshot(window, cx)
-            .next_line_boundary(Point::new(0, 4));
-    });
-
-    multi_buffer_editor.update(cx, |editor, cx| {
-        editor.unfold_buffer(buffer_2.read(cx).remote_id(), cx)
-    });
-    assert_eq!(
-        multi_buffer_editor.update(cx, |editor, cx| editor.display_text(cx)),
-        "\n\n\n\nllll\nmmmm\nnnnn\n\n\nqqqq\nrrrr\n\n\nuuuu\n\n",
-        "After unfolding the second buffer, its text should be displayed"
-    );
-
-    // Typing inside of buffer 1 causes that buffer to be unfolded.
-    multi_buffer_editor.update_in(cx, |editor, window, cx| {
-        assert_eq!(
-            multi_buffer
-                .read(cx)
-                .snapshot(cx)
-                .text_for_range(Point::new(1, 0)..Point::new(1, 4))
-                .collect::<String>(),
-            "bbbb"
-        );
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |selections| {
-            selections.select_ranges(vec![Point::new(1, 0)..Point::new(1, 0)]);
-        });
-        editor.handle_input("B", window, cx);
-    });
-
-    assert_eq!(
-        multi_buffer_editor.update(cx, |editor, cx| editor.display_text(cx)),
-        "\n\naaaa\nBbbbb\ncccc\n\n\nffff\ngggg\n\n\njjjj\n\n\nllll\nmmmm\nnnnn\n\n\nqqqq\nrrrr\n\n\nuuuu\n\n",
-        "After unfolding the first buffer, its and 2nd buffer's text should be displayed"
-    );
-
-    multi_buffer_editor.update(cx, |editor, cx| {
-        editor.unfold_buffer(buffer_3.read(cx).remote_id(), cx)
-    });
-    assert_eq!(
-        multi_buffer_editor.update(cx, |editor, cx| editor.display_text(cx)),
-        "\n\naaaa\nBbbbb\ncccc\n\n\nffff\ngggg\n\n\njjjj\n\n\nllll\nmmmm\nnnnn\n\n\nqqqq\nrrrr\n\n\nuuuu\n\n\nvvvv\nwwww\nxxxx\n\n\n1111\n2222\n\n\n5555",
-        "After unfolding the all buffers, all original text should be displayed"
-    );
-}
-
-#[gpui::test]
-async fn test_folding_buffers_with_one_excerpt(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let sample_text_1 = "1111\n2222\n3333".to_string();
-    let sample_text_2 = "4444\n5555\n6666".to_string();
-    let sample_text_3 = "7777\n8888\n9999".to_string();
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/a"),
-        json!({
-            "first.rs": sample_text_1,
-            "second.rs": sample_text_2,
-            "third.rs": sample_text_3,
-        }),
-    )
-    .await;
-    let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace.deref(), cx);
-    let worktree = project.update(cx, |project, cx| {
-        let mut worktrees = project.worktrees(cx).collect::<Vec<_>>();
-        assert_eq!(worktrees.len(), 1);
-        worktrees.pop().unwrap()
-    });
-    let worktree_id = worktree.update(cx, |worktree, _| worktree.id());
-
-    let buffer_1 = project
-        .update(cx, |project, cx| {
-            project.open_buffer((worktree_id, rel_path("first.rs")), cx)
-        })
-        .await
-        .unwrap();
-    let buffer_2 = project
-        .update(cx, |project, cx| {
-            project.open_buffer((worktree_id, rel_path("second.rs")), cx)
-        })
-        .await
-        .unwrap();
-    let buffer_3 = project
-        .update(cx, |project, cx| {
-            project.open_buffer((worktree_id, rel_path("third.rs")), cx)
-        })
-        .await
-        .unwrap();
-
-    let multi_buffer = cx.new(|cx| {
-        let mut multi_buffer = MultiBuffer::new(ReadWrite);
-        multi_buffer.push_excerpts(
-            buffer_1.clone(),
-            [ExcerptRange::new(Point::new(0, 0)..Point::new(3, 0))],
-            cx,
-        );
-        multi_buffer.push_excerpts(
-            buffer_2.clone(),
-            [ExcerptRange::new(Point::new(0, 0)..Point::new(3, 0))],
-            cx,
-        );
-        multi_buffer.push_excerpts(
-            buffer_3.clone(),
-            [ExcerptRange::new(Point::new(0, 0)..Point::new(3, 0))],
-            cx,
-        );
-        multi_buffer
-    });
-
-    let multi_buffer_editor = cx.new_window_entity(|window, cx| {
-        Editor::new(
-            EditorMode::full(),
-            multi_buffer,
-            Some(project.clone()),
-            window,
-            cx,
-        )
-    });
-
-    let full_text = "\n\n1111\n2222\n3333\n\n\n4444\n5555\n6666\n\n\n7777\n8888\n9999";
-    assert_eq!(
-        multi_buffer_editor.update(cx, |editor, cx| editor.display_text(cx)),
-        full_text,
-    );
-
-    multi_buffer_editor.update(cx, |editor, cx| {
-        editor.fold_buffer(buffer_1.read(cx).remote_id(), cx)
-    });
-    assert_eq!(
-        multi_buffer_editor.update(cx, |editor, cx| editor.display_text(cx)),
-        "\n\n\n\n4444\n5555\n6666\n\n\n7777\n8888\n9999",
-        "After folding the first buffer, its text should not be displayed"
-    );
-
-    multi_buffer_editor.update(cx, |editor, cx| {
-        editor.fold_buffer(buffer_2.read(cx).remote_id(), cx)
-    });
-
-    assert_eq!(
-        multi_buffer_editor.update(cx, |editor, cx| editor.display_text(cx)),
-        "\n\n\n\n\n\n7777\n8888\n9999",
-        "After folding the second buffer, its text should not be displayed"
-    );
-
-    multi_buffer_editor.update(cx, |editor, cx| {
-        editor.fold_buffer(buffer_3.read(cx).remote_id(), cx)
-    });
-    assert_eq!(
-        multi_buffer_editor.update(cx, |editor, cx| editor.display_text(cx)),
-        "\n\n\n\n\n",
-        "After folding the third buffer, its text should not be displayed"
-    );
-
-    multi_buffer_editor.update(cx, |editor, cx| {
-        editor.unfold_buffer(buffer_2.read(cx).remote_id(), cx)
-    });
-    assert_eq!(
-        multi_buffer_editor.update(cx, |editor, cx| editor.display_text(cx)),
-        "\n\n\n\n4444\n5555\n6666\n\n",
-        "After unfolding the second buffer, its text should be displayed"
-    );
-
-    multi_buffer_editor.update(cx, |editor, cx| {
-        editor.unfold_buffer(buffer_1.read(cx).remote_id(), cx)
-    });
-    assert_eq!(
-        multi_buffer_editor.update(cx, |editor, cx| editor.display_text(cx)),
-        "\n\n1111\n2222\n3333\n\n\n4444\n5555\n6666\n\n",
-        "After unfolding the first buffer, its text should be displayed"
-    );
-
-    multi_buffer_editor.update(cx, |editor, cx| {
-        editor.unfold_buffer(buffer_3.read(cx).remote_id(), cx)
-    });
-    assert_eq!(
-        multi_buffer_editor.update(cx, |editor, cx| editor.display_text(cx)),
-        full_text,
-        "After unfolding all buffers, all original text should be displayed"
-    );
-}
-
-#[gpui::test]
-async fn test_folding_buffer_when_multibuffer_has_only_one_excerpt(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let sample_text = "aaaa\nbbbb\ncccc\ndddd\neeee\nffff\ngggg\nhhhh\niiii\njjjj".to_string();
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/a"),
-        json!({
-            "main.rs": sample_text,
-        }),
-    )
-    .await;
-    let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace.deref(), cx);
-    let worktree = project.update(cx, |project, cx| {
-        let mut worktrees = project.worktrees(cx).collect::<Vec<_>>();
-        assert_eq!(worktrees.len(), 1);
-        worktrees.pop().unwrap()
-    });
-    let worktree_id = worktree.update(cx, |worktree, _| worktree.id());
-
-    let buffer_1 = project
-        .update(cx, |project, cx| {
-            project.open_buffer((worktree_id, rel_path("main.rs")), cx)
-        })
-        .await
-        .unwrap();
-
-    let multi_buffer = cx.new(|cx| {
-        let mut multi_buffer = MultiBuffer::new(ReadWrite);
-        multi_buffer.push_excerpts(
-            buffer_1.clone(),
-            [ExcerptRange::new(
-                Point::new(0, 0)
-                    ..Point::new(
-                        sample_text.chars().filter(|&c| c == '\n').count() as u32 + 1,
-                        0,
-                    ),
-            )],
-            cx,
-        );
-        multi_buffer
-    });
-    let multi_buffer_editor = cx.new_window_entity(|window, cx| {
-        Editor::new(
-            EditorMode::full(),
-            multi_buffer,
-            Some(project.clone()),
-            window,
-            cx,
-        )
-    });
-
-    let selection_range = Point::new(1, 0)..Point::new(2, 0);
-    multi_buffer_editor.update_in(cx, |editor, window, cx| {
-        enum TestHighlight {}
-        let multi_buffer_snapshot = editor.buffer().read(cx).snapshot(cx);
-        let highlight_range = selection_range.clone().to_anchors(&multi_buffer_snapshot);
-        editor.highlight_text::<TestHighlight>(
-            vec![highlight_range.clone()],
-            HighlightStyle::color(Hsla::green()),
-            cx,
-        );
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges(Some(highlight_range))
-        });
-    });
-
-    let full_text = format!("\n\n{sample_text}");
-    assert_eq!(
-        multi_buffer_editor.update(cx, |editor, cx| editor.display_text(cx)),
-        full_text,
-    );
-}
-
-#[gpui::test]
-async fn test_multi_buffer_navigation_with_folded_buffers(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    cx.update(|cx| {
-        let default_key_bindings = settings::KeymapFile::load_asset_allow_partial_failure(
-            "keymaps/default-linux.json",
-            cx,
-        )
-        .unwrap();
-        cx.bind_keys(default_key_bindings);
-    });
-
-    let (editor, cx) = cx.add_window_view(|window, cx| {
-        let multi_buffer = MultiBuffer::build_multi(
-            [
-                ("a0\nb0\nc0\nd0\ne0\n", vec![Point::row_range(0..2)]),
-                ("a1\nb1\nc1\nd1\ne1\n", vec![Point::row_range(0..2)]),
-                ("a2\nb2\nc2\nd2\ne2\n", vec![Point::row_range(0..2)]),
-                ("a3\nb3\nc3\nd3\ne3\n", vec![Point::row_range(0..2)]),
-            ],
-            cx,
-        );
-        let mut editor = Editor::new(EditorMode::full(), multi_buffer.clone(), None, window, cx);
-
-        let buffer_ids = multi_buffer.read(cx).excerpt_buffer_ids();
-        // fold all but the second buffer, so that we test navigating between two
-        // adjacent folded buffers, as well as folded buffers at the start and
-        // end the multibuffer
-        editor.fold_buffer(buffer_ids[0], cx);
-        editor.fold_buffer(buffer_ids[2], cx);
-        editor.fold_buffer(buffer_ids[3], cx);
-
-        editor
-    });
-    cx.simulate_resize(size(px(1000.), px(1000.)));
-
-    let mut cx = EditorTestContext::for_editor_in(editor.clone(), cx).await;
-    cx.assert_excerpts_with_selections(indoc! {"
-        [EXCERPT]
-        ˇ[FOLDED]
-        [EXCERPT]
-        a1
-        b1
-        [EXCERPT]
-        [FOLDED]
-        [EXCERPT]
-        [FOLDED]
-        "
-    });
-    cx.simulate_keystroke("down");
-    cx.assert_excerpts_with_selections(indoc! {"
-        [EXCERPT]
-        [FOLDED]
-        [EXCERPT]
-        ˇa1
-        b1
-        [EXCERPT]
-        [FOLDED]
-        [EXCERPT]
-        [FOLDED]
-        "
-    });
-    cx.simulate_keystroke("down");
-    cx.assert_excerpts_with_selections(indoc! {"
-        [EXCERPT]
-        [FOLDED]
-        [EXCERPT]
-        a1
-        ˇb1
-        [EXCERPT]
-        [FOLDED]
-        [EXCERPT]
-        [FOLDED]
-        "
-    });
-    cx.simulate_keystroke("down");
-    cx.assert_excerpts_with_selections(indoc! {"
-        [EXCERPT]
-        [FOLDED]
-        [EXCERPT]
-        a1
-        b1
-        ˇ[EXCERPT]
-        [FOLDED]
-        [EXCERPT]
-        [FOLDED]
-        "
-    });
-    cx.simulate_keystroke("down");
-    cx.assert_excerpts_with_selections(indoc! {"
-        [EXCERPT]
-        [FOLDED]
-        [EXCERPT]
-        a1
-        b1
-        [EXCERPT]
-        ˇ[FOLDED]
-        [EXCERPT]
-        [FOLDED]
-        "
-    });
-    for _ in 0..5 {
-        cx.simulate_keystroke("down");
-        cx.assert_excerpts_with_selections(indoc! {"
-            [EXCERPT]
-            [FOLDED]
-            [EXCERPT]
-            a1
-            b1
-            [EXCERPT]
-            [FOLDED]
-            [EXCERPT]
-            ˇ[FOLDED]
-            "
-        });
-    }
-
-    cx.simulate_keystroke("up");
-    cx.assert_excerpts_with_selections(indoc! {"
-        [EXCERPT]
-        [FOLDED]
-        [EXCERPT]
-        a1
-        b1
-        [EXCERPT]
-        ˇ[FOLDED]
-        [EXCERPT]
-        [FOLDED]
-        "
-    });
-    cx.simulate_keystroke("up");
-    cx.assert_excerpts_with_selections(indoc! {"
-        [EXCERPT]
-        [FOLDED]
-        [EXCERPT]
-        a1
-        b1
-        ˇ[EXCERPT]
-        [FOLDED]
-        [EXCERPT]
-        [FOLDED]
-        "
-    });
-    cx.simulate_keystroke("up");
-    cx.assert_excerpts_with_selections(indoc! {"
-        [EXCERPT]
-        [FOLDED]
-        [EXCERPT]
-        a1
-        ˇb1
-        [EXCERPT]
-        [FOLDED]
-        [EXCERPT]
-        [FOLDED]
-        "
-    });
-    cx.simulate_keystroke("up");
-    cx.assert_excerpts_with_selections(indoc! {"
-        [EXCERPT]
-        [FOLDED]
-        [EXCERPT]
-        ˇa1
-        b1
-        [EXCERPT]
-        [FOLDED]
-        [EXCERPT]
-        [FOLDED]
-        "
-    });
-    for _ in 0..5 {
-        cx.simulate_keystroke("up");
-        cx.assert_excerpts_with_selections(indoc! {"
-            [EXCERPT]
-            ˇ[FOLDED]
-            [EXCERPT]
-            a1
-            b1
-            [EXCERPT]
-            [FOLDED]
-            [EXCERPT]
-            [FOLDED]
-            "
-        });
-    }
-}
-
-#[gpui::test]
-async fn test_edit_prediction_text(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    // Simple insertion
-    assert_highlighted_edits(
-        "Hello, world!",
-        vec![(Point::new(0, 6)..Point::new(0, 6), " beautiful".into())],
-        true,
-        cx,
-        |highlighted_edits, cx| {
-            assert_eq!(highlighted_edits.text, "Hello, beautiful world!");
-            assert_eq!(highlighted_edits.highlights.len(), 1);
-            assert_eq!(highlighted_edits.highlights[0].0, 6..16);
-            assert_eq!(
-                highlighted_edits.highlights[0].1.background_color,
-                Some(cx.theme().status().created_background)
-            );
-        },
-    )
-    .await;
-
-    // Replacement
-    assert_highlighted_edits(
-        "This is a test.",
-        vec![(Point::new(0, 0)..Point::new(0, 4), "That".into())],
-        false,
-        cx,
-        |highlighted_edits, cx| {
-            assert_eq!(highlighted_edits.text, "That is a test.");
-            assert_eq!(highlighted_edits.highlights.len(), 1);
-            assert_eq!(highlighted_edits.highlights[0].0, 0..4);
-            assert_eq!(
-                highlighted_edits.highlights[0].1.background_color,
-                Some(cx.theme().status().created_background)
-            );
-        },
-    )
-    .await;
-
-    // Multiple edits
-    assert_highlighted_edits(
-        "Hello, world!",
-        vec![
-            (Point::new(0, 0)..Point::new(0, 5), "Greetings".into()),
-            (Point::new(0, 12)..Point::new(0, 12), " and universe".into()),
-        ],
-        false,
-        cx,
-        |highlighted_edits, cx| {
-            assert_eq!(highlighted_edits.text, "Greetings, world and universe!");
-            assert_eq!(highlighted_edits.highlights.len(), 2);
-            assert_eq!(highlighted_edits.highlights[0].0, 0..9);
-            assert_eq!(highlighted_edits.highlights[1].0, 16..29);
-            assert_eq!(
-                highlighted_edits.highlights[0].1.background_color,
-                Some(cx.theme().status().created_background)
-            );
-            assert_eq!(
-                highlighted_edits.highlights[1].1.background_color,
-                Some(cx.theme().status().created_background)
-            );
-        },
-    )
-    .await;
-
-    // Multiple lines with edits
-    assert_highlighted_edits(
-        "First line\nSecond line\nThird line\nFourth line",
-        vec![
-            (Point::new(1, 7)..Point::new(1, 11), "modified".to_string()),
-            (
-                Point::new(2, 0)..Point::new(2, 10),
-                "New third line".to_string(),
-            ),
-            (Point::new(3, 6)..Point::new(3, 6), " updated".to_string()),
-        ],
-        false,
-        cx,
-        |highlighted_edits, cx| {
-            assert_eq!(
-                highlighted_edits.text,
-                "Second modified\nNew third line\nFourth updated line"
-            );
-            assert_eq!(highlighted_edits.highlights.len(), 3);
-            assert_eq!(highlighted_edits.highlights[0].0, 7..15); // "modified"
-            assert_eq!(highlighted_edits.highlights[1].0, 16..30); // "New third line"
-            assert_eq!(highlighted_edits.highlights[2].0, 37..45); // " updated"
-            for highlight in &highlighted_edits.highlights {
-                assert_eq!(
-                    highlight.1.background_color,
-                    Some(cx.theme().status().created_background)
-                );
-            }
-        },
-    )
-    .await;
-}
-
-#[gpui::test]
-async fn test_edit_prediction_text_with_deletions(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    // Deletion
-    assert_highlighted_edits(
-        "Hello, world!",
-        vec![(Point::new(0, 5)..Point::new(0, 11), "".to_string())],
-        true,
-        cx,
-        |highlighted_edits, cx| {
-            assert_eq!(highlighted_edits.text, "Hello, world!");
-            assert_eq!(highlighted_edits.highlights.len(), 1);
-            assert_eq!(highlighted_edits.highlights[0].0, 5..11);
-            assert_eq!(
-                highlighted_edits.highlights[0].1.background_color,
-                Some(cx.theme().status().deleted_background)
-            );
-        },
-    )
-    .await;
-
-    // Insertion
-    assert_highlighted_edits(
-        "Hello, world!",
-        vec![(Point::new(0, 6)..Point::new(0, 6), " digital".to_string())],
-        true,
-        cx,
-        |highlighted_edits, cx| {
-            assert_eq!(highlighted_edits.highlights.len(), 1);
-            assert_eq!(highlighted_edits.highlights[0].0, 6..14);
-            assert_eq!(
-                highlighted_edits.highlights[0].1.background_color,
-                Some(cx.theme().status().created_background)
-            );
-        },
-    )
-    .await;
-}
-
-async fn assert_highlighted_edits(
-    text: &str,
-    edits: Vec<(Range<Point>, String)>,
-    include_deletions: bool,
-    cx: &mut TestAppContext,
-    assertion_fn: impl Fn(HighlightedText, &App),
-) {
-    let window = cx.add_window(|window, cx| {
-        let buffer = MultiBuffer::build_simple(text, cx);
-        Editor::new(EditorMode::full(), buffer, None, window, cx)
-    });
-    let cx = &mut VisualTestContext::from_window(*window, cx);
-
-    let (buffer, snapshot) = window
-        .update(cx, |editor, _window, cx| {
-            (
-                editor.buffer().clone(),
-                editor.buffer().read(cx).snapshot(cx),
-            )
-        })
-        .unwrap();
-
-    let edits = edits
-        .into_iter()
-        .map(|(range, edit)| {
-            (
-                snapshot.anchor_after(range.start)..snapshot.anchor_before(range.end),
-                edit,
-            )
-        })
-        .collect::<Vec<_>>();
-
-    let text_anchor_edits = edits
-        .clone()
-        .into_iter()
-        .map(|(range, edit)| (range.start.text_anchor..range.end.text_anchor, edit.into()))
-        .collect::<Vec<_>>();
-
-    let edit_preview = window
-        .update(cx, |_, _window, cx| {
-            buffer
-                .read(cx)
-                .as_singleton()
-                .unwrap()
-                .read(cx)
-                .preview_edits(text_anchor_edits.into(), cx)
-        })
-        .unwrap()
-        .await;
-
-    cx.update(|_window, cx| {
-        let highlighted_edits = edit_prediction_edit_text(
-            snapshot.as_singleton().unwrap().2,
-            &edits,
-            &edit_preview,
-            include_deletions,
-            cx,
-        );
-        assertion_fn(highlighted_edits, cx)
-    });
-}
-
-#[track_caller]
-fn assert_breakpoint(
-    breakpoints: &BTreeMap<Arc<Path>, Vec<SourceBreakpoint>>,
-    path: &Arc<Path>,
-    expected: Vec<(u32, Breakpoint)>,
-) {
-    if expected.is_empty() {
-        assert!(!breakpoints.contains_key(path), "{}", path.display());
-    } else {
-        let mut breakpoint = breakpoints
-            .get(path)
-            .unwrap()
-            .iter()
-            .map(|breakpoint| {
-                (
-                    breakpoint.row,
-                    Breakpoint {
-                        message: breakpoint.message.clone(),
-                        state: breakpoint.state,
-                        condition: breakpoint.condition.clone(),
-                        hit_condition: breakpoint.hit_condition.clone(),
-                    },
-                )
-            })
-            .collect::<Vec<_>>();
-
-        breakpoint.sort_by_key(|(cached_position, _)| *cached_position);
-
-        assert_eq!(expected, breakpoint);
-    }
-}
-
-fn add_log_breakpoint_at_cursor(
-    editor: &mut Editor,
-    log_message: &str,
-    window: &mut Window,
-    cx: &mut Context<Editor>,
-) {
-    let (anchor, bp) = editor
-        .breakpoints_at_cursors(window, cx)
-        .first()
-        .and_then(|(anchor, bp)| bp.as_ref().map(|bp| (*anchor, bp.clone())))
-        .unwrap_or_else(|| {
-            let snapshot = editor.snapshot(window, cx);
-            let cursor_position: Point =
-                editor.selections.newest(&snapshot.display_snapshot).head();
-
-            let breakpoint_position = snapshot
-                .buffer_snapshot()
-                .anchor_before(Point::new(cursor_position.row, 0));
-
-            (breakpoint_position, Breakpoint::new_log(log_message))
-        });
-
-    editor.edit_breakpoint_at_anchor(
-        anchor,
-        bp,
-        BreakpointEditAction::EditLogMessage(log_message.into()),
-        cx,
-    );
-}
-
-#[gpui::test]
-async fn test_breakpoint_toggling(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let sample_text = "First line\nSecond line\nThird line\nFourth line".to_string();
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/a"),
-        json!({
-            "main.rs": sample_text,
-        }),
-    )
-    .await;
-    let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace.deref(), cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/a"),
-        json!({
-            "main.rs": sample_text,
-        }),
-    )
-    .await;
-    let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace.deref(), cx);
-    let worktree_id = workspace
-        .update(cx, |workspace, _window, cx| {
-            workspace.project().update(cx, |project, cx| {
-                project.worktrees(cx).next().unwrap().read(cx).id()
-            })
-        })
-        .unwrap();
-
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_buffer((worktree_id, rel_path("main.rs")), cx)
-        })
-        .await
-        .unwrap();
-
-    let (editor, cx) = cx.add_window_view(|window, cx| {
-        Editor::new(
-            EditorMode::full(),
-            MultiBuffer::build_from_buffer(buffer, cx),
-            Some(project.clone()),
-            window,
-            cx,
-        )
-    });
-
-    let project_path = editor.update(cx, |editor, cx| editor.project_path(cx).unwrap());
-    let abs_path = project.read_with(cx, |project, cx| {
-        project
-            .absolute_path(&project_path, cx)
-            .map(Arc::from)
-            .unwrap()
-    });
-
-    // assert we can add breakpoint on the first line
-    editor.update_in(cx, |editor, window, cx| {
-        editor.toggle_breakpoint(&actions::ToggleBreakpoint, window, cx);
-        editor.move_to_end(&MoveToEnd, window, cx);
-        editor.toggle_breakpoint(&actions::ToggleBreakpoint, window, cx);
-    });
-
-    let breakpoints = editor.update(cx, |editor, cx| {
-        editor
-            .breakpoint_store()
-            .as_ref()
-            .unwrap()
-            .read(cx)
-            .all_source_breakpoints(cx)
-    });
-
-    assert_eq!(1, breakpoints.len());
-    assert_breakpoint(
-        &breakpoints,
-        &abs_path,
-        vec![
-            (0, Breakpoint::new_standard()),
-            (3, Breakpoint::new_standard()),
-        ],
-    );
-
-    editor.update_in(cx, |editor, window, cx| {
-        editor.move_to_beginning(&MoveToBeginning, window, cx);
-        editor.toggle_breakpoint(&actions::ToggleBreakpoint, window, cx);
-    });
-
-    let breakpoints = editor.update(cx, |editor, cx| {
-        editor
-            .breakpoint_store()
-            .as_ref()
-            .unwrap()
-            .read(cx)
-            .all_source_breakpoints(cx)
-    });
-
-    assert_eq!(1, breakpoints.len());
-    assert_breakpoint(
-        &breakpoints,
-        &abs_path,
-        vec![(3, Breakpoint::new_standard())],
-    );
-
-    editor.update_in(cx, |editor, window, cx| {
-        editor.move_to_end(&MoveToEnd, window, cx);
-        editor.toggle_breakpoint(&actions::ToggleBreakpoint, window, cx);
-    });
-
-    let breakpoints = editor.update(cx, |editor, cx| {
-        editor
-            .breakpoint_store()
-            .as_ref()
-            .unwrap()
-            .read(cx)
-            .all_source_breakpoints(cx)
-    });
-
-    assert_eq!(0, breakpoints.len());
-    assert_breakpoint(&breakpoints, &abs_path, vec![]);
-}
-
-#[gpui::test]
-async fn test_log_breakpoint_editing(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let sample_text = "First line\nSecond line\nThird line\nFourth line".to_string();
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/a"),
-        json!({
-            "main.rs": sample_text,
-        }),
-    )
-    .await;
-    let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
-    let (workspace, cx) =
-        cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-    let worktree_id = workspace.update(cx, |workspace, cx| {
-        workspace.project().update(cx, |project, cx| {
-            project.worktrees(cx).next().unwrap().read(cx).id()
-        })
-    });
-
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_buffer((worktree_id, rel_path("main.rs")), cx)
-        })
-        .await
-        .unwrap();
-
-    let (editor, cx) = cx.add_window_view(|window, cx| {
-        Editor::new(
-            EditorMode::full(),
-            MultiBuffer::build_from_buffer(buffer, cx),
-            Some(project.clone()),
-            window,
-            cx,
-        )
-    });
-
-    let project_path = editor.update(cx, |editor, cx| editor.project_path(cx).unwrap());
-    let abs_path = project.read_with(cx, |project, cx| {
-        project
-            .absolute_path(&project_path, cx)
-            .map(Arc::from)
-            .unwrap()
-    });
-
-    editor.update_in(cx, |editor, window, cx| {
-        add_log_breakpoint_at_cursor(editor, "hello world", window, cx);
-    });
-
-    let breakpoints = editor.update(cx, |editor, cx| {
-        editor
-            .breakpoint_store()
-            .as_ref()
-            .unwrap()
-            .read(cx)
-            .all_source_breakpoints(cx)
-    });
-
-    assert_breakpoint(
-        &breakpoints,
-        &abs_path,
-        vec![(0, Breakpoint::new_log("hello world"))],
-    );
-
-    // Removing a log message from a log breakpoint should remove it
-    editor.update_in(cx, |editor, window, cx| {
-        add_log_breakpoint_at_cursor(editor, "", window, cx);
-    });
-
-    let breakpoints = editor.update(cx, |editor, cx| {
-        editor
-            .breakpoint_store()
-            .as_ref()
-            .unwrap()
-            .read(cx)
-            .all_source_breakpoints(cx)
-    });
-
-    assert_breakpoint(&breakpoints, &abs_path, vec![]);
-
-    editor.update_in(cx, |editor, window, cx| {
-        editor.toggle_breakpoint(&actions::ToggleBreakpoint, window, cx);
-        editor.move_to_end(&MoveToEnd, window, cx);
-        editor.toggle_breakpoint(&actions::ToggleBreakpoint, window, cx);
-        // Not adding a log message to a standard breakpoint shouldn't remove it
-        add_log_breakpoint_at_cursor(editor, "", window, cx);
-    });
-
-    let breakpoints = editor.update(cx, |editor, cx| {
-        editor
-            .breakpoint_store()
-            .as_ref()
-            .unwrap()
-            .read(cx)
-            .all_source_breakpoints(cx)
-    });
-
-    assert_breakpoint(
-        &breakpoints,
-        &abs_path,
-        vec![
-            (0, Breakpoint::new_standard()),
-            (3, Breakpoint::new_standard()),
-        ],
-    );
-
-    editor.update_in(cx, |editor, window, cx| {
-        add_log_breakpoint_at_cursor(editor, "hello world", window, cx);
-    });
-
-    let breakpoints = editor.update(cx, |editor, cx| {
-        editor
-            .breakpoint_store()
-            .as_ref()
-            .unwrap()
-            .read(cx)
-            .all_source_breakpoints(cx)
-    });
-
-    assert_breakpoint(
-        &breakpoints,
-        &abs_path,
-        vec![
-            (0, Breakpoint::new_standard()),
-            (3, Breakpoint::new_log("hello world")),
-        ],
-    );
-
-    editor.update_in(cx, |editor, window, cx| {
-        add_log_breakpoint_at_cursor(editor, "hello Earth!!", window, cx);
-    });
-
-    let breakpoints = editor.update(cx, |editor, cx| {
-        editor
-            .breakpoint_store()
-            .as_ref()
-            .unwrap()
-            .read(cx)
-            .all_source_breakpoints(cx)
-    });
-
-    assert_breakpoint(
-        &breakpoints,
-        &abs_path,
-        vec![
-            (0, Breakpoint::new_standard()),
-            (3, Breakpoint::new_log("hello Earth!!")),
-        ],
-    );
-}
-
-/// This also tests that Editor::breakpoint_at_cursor_head is working properly
-/// we had some issues where we wouldn't find a breakpoint at Point {row: 0, col: 0}
-/// or when breakpoints were placed out of order. This tests for a regression too
-#[gpui::test]
-async fn test_breakpoint_enabling_and_disabling(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let sample_text = "First line\nSecond line\nThird line\nFourth line".to_string();
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/a"),
-        json!({
-            "main.rs": sample_text,
-        }),
-    )
-    .await;
-    let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace.deref(), cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/a"),
-        json!({
-            "main.rs": sample_text,
-        }),
-    )
-    .await;
-    let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace.deref(), cx);
-    let worktree_id = workspace
-        .update(cx, |workspace, _window, cx| {
-            workspace.project().update(cx, |project, cx| {
-                project.worktrees(cx).next().unwrap().read(cx).id()
-            })
-        })
-        .unwrap();
-
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_buffer((worktree_id, rel_path("main.rs")), cx)
-        })
-        .await
-        .unwrap();
-
-    let (editor, cx) = cx.add_window_view(|window, cx| {
-        Editor::new(
-            EditorMode::full(),
-            MultiBuffer::build_from_buffer(buffer, cx),
-            Some(project.clone()),
-            window,
-            cx,
-        )
-    });
-
-    let project_path = editor.update(cx, |editor, cx| editor.project_path(cx).unwrap());
-    let abs_path = project.read_with(cx, |project, cx| {
-        project
-            .absolute_path(&project_path, cx)
-            .map(Arc::from)
-            .unwrap()
-    });
-
-    // assert we can add breakpoint on the first line
-    editor.update_in(cx, |editor, window, cx| {
-        editor.toggle_breakpoint(&actions::ToggleBreakpoint, window, cx);
-        editor.move_to_end(&MoveToEnd, window, cx);
-        editor.toggle_breakpoint(&actions::ToggleBreakpoint, window, cx);
-        editor.move_up(&MoveUp, window, cx);
-        editor.toggle_breakpoint(&actions::ToggleBreakpoint, window, cx);
-    });
-
-    let breakpoints = editor.update(cx, |editor, cx| {
-        editor
-            .breakpoint_store()
-            .as_ref()
-            .unwrap()
-            .read(cx)
-            .all_source_breakpoints(cx)
-    });
-
-    assert_eq!(1, breakpoints.len());
-    assert_breakpoint(
-        &breakpoints,
-        &abs_path,
-        vec![
-            (0, Breakpoint::new_standard()),
-            (2, Breakpoint::new_standard()),
-            (3, Breakpoint::new_standard()),
-        ],
-    );
-
-    editor.update_in(cx, |editor, window, cx| {
-        editor.move_to_beginning(&MoveToBeginning, window, cx);
-        editor.disable_breakpoint(&actions::DisableBreakpoint, window, cx);
-        editor.move_to_end(&MoveToEnd, window, cx);
-        editor.disable_breakpoint(&actions::DisableBreakpoint, window, cx);
-        // Disabling a breakpoint that doesn't exist should do nothing
-        editor.move_up(&MoveUp, window, cx);
-        editor.move_up(&MoveUp, window, cx);
-        editor.disable_breakpoint(&actions::DisableBreakpoint, window, cx);
-    });
-
-    let breakpoints = editor.update(cx, |editor, cx| {
-        editor
-            .breakpoint_store()
-            .as_ref()
-            .unwrap()
-            .read(cx)
-            .all_source_breakpoints(cx)
-    });
-
-    let disable_breakpoint = {
-        let mut bp = Breakpoint::new_standard();
-        bp.state = BreakpointState::Disabled;
-        bp
-    };
-
-    assert_eq!(1, breakpoints.len());
-    assert_breakpoint(
-        &breakpoints,
-        &abs_path,
-        vec![
-            (0, disable_breakpoint.clone()),
-            (2, Breakpoint::new_standard()),
-            (3, disable_breakpoint.clone()),
-        ],
-    );
-
-    editor.update_in(cx, |editor, window, cx| {
-        editor.move_to_beginning(&MoveToBeginning, window, cx);
-        editor.enable_breakpoint(&actions::EnableBreakpoint, window, cx);
-        editor.move_to_end(&MoveToEnd, window, cx);
-        editor.enable_breakpoint(&actions::EnableBreakpoint, window, cx);
-        editor.move_up(&MoveUp, window, cx);
-        editor.disable_breakpoint(&actions::DisableBreakpoint, window, cx);
-    });
-
-    let breakpoints = editor.update(cx, |editor, cx| {
-        editor
-            .breakpoint_store()
-            .as_ref()
-            .unwrap()
-            .read(cx)
-            .all_source_breakpoints(cx)
-    });
-
-    assert_eq!(1, breakpoints.len());
-    assert_breakpoint(
-        &breakpoints,
-        &abs_path,
-        vec![
-            (0, Breakpoint::new_standard()),
-            (2, disable_breakpoint),
-            (3, Breakpoint::new_standard()),
-        ],
-    );
-}
-
-#[gpui::test]
-async fn test_rename_with_duplicate_edits(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    let capabilities = lsp::ServerCapabilities {
-        rename_provider: Some(lsp::OneOf::Right(lsp::RenameOptions {
-            prepare_provider: Some(true),
-            work_done_progress_options: Default::default(),
-        })),
-        ..Default::default()
-    };
-    let mut cx = EditorLspTestContext::new_rust(capabilities, cx).await;
-
-    cx.set_state(indoc! {"
-        struct Fˇoo {}
-    "});
-
-    cx.update_editor(|editor, _, cx| {
-        let highlight_range = Point::new(0, 7)..Point::new(0, 10);
-        let highlight_range = highlight_range.to_anchors(&editor.buffer().read(cx).snapshot(cx));
-        editor.highlight_background::<DocumentHighlightRead>(
-            &[highlight_range],
-            |_, theme| theme.colors().editor_document_highlight_read_background,
-            cx,
-        );
-    });
-
-    let mut prepare_rename_handler = cx
-        .set_request_handler::<lsp::request::PrepareRenameRequest, _, _>(
-            move |_, _, _| async move {
-                Ok(Some(lsp::PrepareRenameResponse::Range(lsp::Range {
-                    start: lsp::Position {
-                        line: 0,
-                        character: 7,
-                    },
-                    end: lsp::Position {
-                        line: 0,
-                        character: 10,
-                    },
-                })))
-            },
-        );
-    let prepare_rename_task = cx
-        .update_editor(|e, window, cx| e.rename(&Rename, window, cx))
-        .expect("Prepare rename was not started");
-    prepare_rename_handler.next().await.unwrap();
-    prepare_rename_task.await.expect("Prepare rename failed");
-
-    let mut rename_handler =
-        cx.set_request_handler::<lsp::request::Rename, _, _>(move |url, _, _| async move {
-            let edit = lsp::TextEdit {
-                range: lsp::Range {
-                    start: lsp::Position {
-                        line: 0,
-                        character: 7,
-                    },
-                    end: lsp::Position {
-                        line: 0,
-                        character: 10,
-                    },
-                },
-                new_text: "FooRenamed".to_string(),
-            };
-            Ok(Some(lsp::WorkspaceEdit::new(
-                // Specify the same edit twice
-                std::collections::HashMap::from_iter(Some((url, vec![edit.clone(), edit]))),
-            )))
-        });
-    let rename_task = cx
-        .update_editor(|e, window, cx| e.confirm_rename(&ConfirmRename, window, cx))
-        .expect("Confirm rename was not started");
-    rename_handler.next().await.unwrap();
-    rename_task.await.expect("Confirm rename failed");
-    cx.run_until_parked();
-
-    // Despite two edits, only one is actually applied as those are identical
-    cx.assert_editor_state(indoc! {"
-        struct FooRenamedˇ {}
-    "});
-}
-
-#[gpui::test]
-async fn test_rename_without_prepare(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    // These capabilities indicate that the server does not support prepare rename.
-    let capabilities = lsp::ServerCapabilities {
-        rename_provider: Some(lsp::OneOf::Left(true)),
-        ..Default::default()
-    };
-    let mut cx = EditorLspTestContext::new_rust(capabilities, cx).await;
-
-    cx.set_state(indoc! {"
-        struct Fˇoo {}
-    "});
-
-    cx.update_editor(|editor, _window, cx| {
-        let highlight_range = Point::new(0, 7)..Point::new(0, 10);
-        let highlight_range = highlight_range.to_anchors(&editor.buffer().read(cx).snapshot(cx));
-        editor.highlight_background::<DocumentHighlightRead>(
-            &[highlight_range],
-            |_, theme| theme.colors().editor_document_highlight_read_background,
-            cx,
-        );
-    });
-
-    cx.update_editor(|e, window, cx| e.rename(&Rename, window, cx))
-        .expect("Prepare rename was not started")
-        .await
-        .expect("Prepare rename failed");
-
-    let mut rename_handler =
-        cx.set_request_handler::<lsp::request::Rename, _, _>(move |url, _, _| async move {
-            let edit = lsp::TextEdit {
-                range: lsp::Range {
-                    start: lsp::Position {
-                        line: 0,
-                        character: 7,
-                    },
-                    end: lsp::Position {
-                        line: 0,
-                        character: 10,
-                    },
-                },
-                new_text: "FooRenamed".to_string(),
-            };
-            Ok(Some(lsp::WorkspaceEdit::new(
-                std::collections::HashMap::from_iter(Some((url, vec![edit]))),
-            )))
-        });
-    let rename_task = cx
-        .update_editor(|e, window, cx| e.confirm_rename(&ConfirmRename, window, cx))
-        .expect("Confirm rename was not started");
-    rename_handler.next().await.unwrap();
-    rename_task.await.expect("Confirm rename failed");
-    cx.run_until_parked();
-
-    // Correct range is renamed, as `surrounding_word` is used to find it.
-    cx.assert_editor_state(indoc! {"
-        struct FooRenamedˇ {}
-    "});
-}
-
-#[gpui::test]
-async fn test_tree_sitter_brackets_newline_insertion(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    let mut cx = EditorTestContext::new(cx).await;
-
-    let language = Arc::new(
-        Language::new(
-            LanguageConfig::default(),
-            Some(tree_sitter_html::LANGUAGE.into()),
-        )
-        .with_brackets_query(
-            r#"
-            ("<" @open "/>" @close)
-            ("</" @open ">" @close)
-            ("<" @open ">" @close)
-            ("\"" @open "\"" @close)
-            ((element (start_tag) @open (end_tag) @close) (#set! newline.only))
-        "#,
-        )
-        .unwrap(),
-    );
-    cx.update_buffer(|buffer, cx| buffer.set_language(Some(language), cx));
-
-    cx.set_state(indoc! {"
-        <span>ˇ</span>
-    "});
-    cx.update_editor(|e, window, cx| e.newline(&Newline, window, cx));
-    cx.assert_editor_state(indoc! {"
-        <span>
-        ˇ
-        </span>
-    "});
-
-    cx.set_state(indoc! {"
-        <span><span></span>ˇ</span>
-    "});
-    cx.update_editor(|e, window, cx| e.newline(&Newline, window, cx));
-    cx.assert_editor_state(indoc! {"
-        <span><span></span>
-        ˇ</span>
-    "});
-
-    cx.set_state(indoc! {"
-        <span>ˇ
-        </span>
-    "});
-    cx.update_editor(|e, window, cx| e.newline(&Newline, window, cx));
-    cx.assert_editor_state(indoc! {"
-        <span>
-        ˇ
-        </span>
-    "});
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_apply_code_lens_actions_with_commands(cx: &mut gpui::TestAppContext) {
-    init_test(cx, |_| {});
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/dir"),
-        json!({
-            "a.ts": "a",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace.deref(), cx);
-
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-    language_registry.add(Arc::new(Language::new(
-        LanguageConfig {
-            name: "TypeScript".into(),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["ts".to_string()],
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-        Some(tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into()),
-    )));
-    let mut fake_language_servers = language_registry.register_fake_lsp(
-        "TypeScript",
-        FakeLspAdapter {
-            capabilities: lsp::ServerCapabilities {
-                code_lens_provider: Some(lsp::CodeLensOptions {
-                    resolve_provider: Some(true),
-                }),
-                execute_command_provider: Some(lsp::ExecuteCommandOptions {
-                    commands: vec!["_the/command".to_string()],
-                    ..lsp::ExecuteCommandOptions::default()
-                }),
-                ..lsp::ServerCapabilities::default()
-            },
-            ..FakeLspAdapter::default()
-        },
-    );
-
-    let editor = workspace
-        .update(cx, |workspace, window, cx| {
-            workspace.open_abs_path(
-                PathBuf::from(path!("/dir/a.ts")),
-                OpenOptions::default(),
-                window,
-                cx,
-            )
-        })
-        .unwrap()
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-    cx.executor().run_until_parked();
-
-    let fake_server = fake_language_servers.next().await.unwrap();
-
-    let buffer = editor.update(cx, |editor, cx| {
-        editor
-            .buffer()
-            .read(cx)
-            .as_singleton()
-            .expect("have opened a single file by path")
-    });
-
-    let buffer_snapshot = buffer.update(cx, |buffer, _| buffer.snapshot());
-    let anchor = buffer_snapshot.anchor_at(0, text::Bias::Left);
-    drop(buffer_snapshot);
-    let actions = cx
-        .update_window(*workspace, |_, window, cx| {
-            project.code_actions(&buffer, anchor..anchor, window, cx)
-        })
-        .unwrap();
-
-    fake_server
-        .set_request_handler::<lsp::request::CodeLensRequest, _, _>(|_, _| async move {
-            Ok(Some(vec![
-                lsp::CodeLens {
-                    range: lsp::Range::default(),
-                    command: Some(lsp::Command {
-                        title: "Code lens command".to_owned(),
-                        command: "_the/command".to_owned(),
-                        arguments: None,
-                    }),
-                    data: None,
-                },
-                lsp::CodeLens {
-                    range: lsp::Range::default(),
-                    command: Some(lsp::Command {
-                        title: "Command not in capabilities".to_owned(),
-                        command: "not in capabilities".to_owned(),
-                        arguments: None,
-                    }),
-                    data: None,
-                },
-                lsp::CodeLens {
-                    range: lsp::Range {
-                        start: lsp::Position {
-                            line: 1,
-                            character: 1,
-                        },
-                        end: lsp::Position {
-                            line: 1,
-                            character: 1,
-                        },
-                    },
-                    command: Some(lsp::Command {
-                        title: "Command not in range".to_owned(),
-                        command: "_the/command".to_owned(),
-                        arguments: None,
-                    }),
-                    data: None,
-                },
-            ]))
-        })
-        .next()
-        .await;
-
-    let actions = actions.await.unwrap();
-    assert_eq!(
-        actions.len(),
-        1,
-        "Should have only one valid action for the 0..0 range, got: {actions:#?}"
-    );
-    let action = actions[0].clone();
-    let apply = project.update(cx, |project, cx| {
-        project.apply_code_action(buffer.clone(), action, true, cx)
-    });
-
-    // Resolving the code action does not populate its edits. In absence of
-    // edits, we must execute the given command.
-    fake_server.set_request_handler::<lsp::request::CodeLensResolve, _, _>(
-        |mut lens, _| async move {
-            let lens_command = lens.command.as_mut().expect("should have a command");
-            assert_eq!(lens_command.title, "Code lens command");
-            lens_command.arguments = Some(vec![json!("the-argument")]);
-            Ok(lens)
-        },
-    );
-
-    // While executing the command, the language server sends the editor
-    // a `workspaceEdit` request.
-    fake_server
-        .set_request_handler::<lsp::request::ExecuteCommand, _, _>({
-            let fake = fake_server.clone();
-            move |params, _| {
-                assert_eq!(params.command, "_the/command");
-                let fake = fake.clone();
-                async move {
-                    fake.server
-                        .request::<lsp::request::ApplyWorkspaceEdit>(
-                            lsp::ApplyWorkspaceEditParams {
-                                label: None,
-                                edit: lsp::WorkspaceEdit {
-                                    changes: Some(
-                                        [(
-                                            lsp::Uri::from_file_path(path!("/dir/a.ts")).unwrap(),
-                                            vec![lsp::TextEdit {
-                                                range: lsp::Range::new(
-                                                    lsp::Position::new(0, 0),
-                                                    lsp::Position::new(0, 0),
-                                                ),
-                                                new_text: "X".into(),
-                                            }],
-                                        )]
-                                        .into_iter()
-                                        .collect(),
-                                    ),
-                                    ..lsp::WorkspaceEdit::default()
-                                },
-                            },
-                        )
-                        .await
-                        .into_response()
-                        .unwrap();
-                    Ok(Some(json!(null)))
-                }
-            }
-        })
-        .next()
-        .await;
-
-    // Applying the code lens command returns a project transaction containing the edits
-    // sent by the language server in its `workspaceEdit` request.
-    let transaction = apply.await.unwrap();
-    assert!(transaction.0.contains_key(&buffer));
-    buffer.update(cx, |buffer, cx| {
-        assert_eq!(buffer.text(), "Xa");
-        buffer.undo(cx);
-        assert_eq!(buffer.text(), "a");
-    });
-
-    let actions_after_edits = cx
-        .update_window(*workspace, |_, window, cx| {
-            project.code_actions(&buffer, anchor..anchor, window, cx)
-        })
-        .unwrap()
-        .await
-        .unwrap();
-    assert_eq!(
-        actions, actions_after_edits,
-        "For the same selection, same code lens actions should be returned"
-    );
-
-    let _responses =
-        fake_server.set_request_handler::<lsp::request::CodeLensRequest, _, _>(|_, _| async move {
-            panic!("No more code lens requests are expected");
-        });
-    editor.update_in(cx, |editor, window, cx| {
-        editor.select_all(&SelectAll, window, cx);
-    });
-    cx.executor().run_until_parked();
-    let new_actions = cx
-        .update_window(*workspace, |_, window, cx| {
-            project.code_actions(&buffer, anchor..anchor, window, cx)
-        })
-        .unwrap()
-        .await
-        .unwrap();
-    assert_eq!(
-        actions, new_actions,
-        "Code lens are queried for the same range and should get the same set back, but without additional LSP queries now"
-    );
-}
-
-#[gpui::test]
-async fn test_editor_restore_data_different_in_panes(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let fs = FakeFs::new(cx.executor());
-    let main_text = r#"fn main() {
-println!("1");
-println!("2");
-println!("3");
-println!("4");
-println!("5");
-}"#;
-    let lib_text = "mod foo {}";
-    fs.insert_tree(
-        path!("/a"),
-        json!({
-            "lib.rs": lib_text,
-            "main.rs": main_text,
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
-    let (workspace, cx) =
-        cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let worktree_id = workspace.update(cx, |workspace, cx| {
-        workspace.project().update(cx, |project, cx| {
-            project.worktrees(cx).next().unwrap().read(cx).id()
-        })
-    });
-
-    let expected_ranges = vec![
-        Point::new(0, 0)..Point::new(0, 0),
-        Point::new(1, 0)..Point::new(1, 1),
-        Point::new(2, 0)..Point::new(2, 2),
-        Point::new(3, 0)..Point::new(3, 3),
-    ];
-
-    let pane_1 = workspace.update(cx, |workspace, _| workspace.active_pane().clone());
-    let editor_1 = workspace
-        .update_in(cx, |workspace, window, cx| {
-            workspace.open_path(
-                (worktree_id, rel_path("main.rs")),
-                Some(pane_1.downgrade()),
-                true,
-                window,
-                cx,
-            )
-        })
-        .unwrap()
-        .await
-        .downcast::<Editor>()
-        .unwrap();
-    pane_1.update(cx, |pane, cx| {
-        let open_editor = pane.active_item().unwrap().downcast::<Editor>().unwrap();
-        open_editor.update(cx, |editor, cx| {
-            assert_eq!(
-                editor.display_text(cx),
-                main_text,
-                "Original main.rs text on initial open",
-            );
-            assert_eq!(
-                editor
-                    .selections
-                    .all::<Point>(&editor.display_snapshot(cx))
-                    .into_iter()
-                    .map(|s| s.range())
-                    .collect::<Vec<_>>(),
-                vec![Point::zero()..Point::zero()],
-                "Default selections on initial open",
-            );
-        })
-    });
-    editor_1.update_in(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges(expected_ranges.clone());
-        });
-    });
-
-    let pane_2 = workspace.update_in(cx, |workspace, window, cx| {
-        workspace.split_pane(pane_1.clone(), SplitDirection::Right, window, cx)
-    });
-    let editor_2 = workspace
-        .update_in(cx, |workspace, window, cx| {
-            workspace.open_path(
-                (worktree_id, rel_path("main.rs")),
-                Some(pane_2.downgrade()),
-                true,
-                window,
-                cx,
-            )
-        })
-        .unwrap()
-        .await
-        .downcast::<Editor>()
-        .unwrap();
-    pane_2.update(cx, |pane, cx| {
-        let open_editor = pane.active_item().unwrap().downcast::<Editor>().unwrap();
-        open_editor.update(cx, |editor, cx| {
-            assert_eq!(
-                editor.display_text(cx),
-                main_text,
-                "Original main.rs text on initial open in another panel",
-            );
-            assert_eq!(
-                editor
-                    .selections
-                    .all::<Point>(&editor.display_snapshot(cx))
-                    .into_iter()
-                    .map(|s| s.range())
-                    .collect::<Vec<_>>(),
-                vec![Point::zero()..Point::zero()],
-                "Default selections on initial open in another panel",
-            );
-        })
-    });
-
-    editor_2.update_in(cx, |editor, window, cx| {
-        editor.fold_ranges(expected_ranges.clone(), false, window, cx);
-    });
-
-    let _other_editor_1 = workspace
-        .update_in(cx, |workspace, window, cx| {
-            workspace.open_path(
-                (worktree_id, rel_path("lib.rs")),
-                Some(pane_1.downgrade()),
-                true,
-                window,
-                cx,
-            )
-        })
-        .unwrap()
-        .await
-        .downcast::<Editor>()
-        .unwrap();
-    pane_1
-        .update_in(cx, |pane, window, cx| {
-            pane.close_other_items(&CloseOtherItems::default(), None, window, cx)
-        })
-        .await
-        .unwrap();
-    drop(editor_1);
-    pane_1.update(cx, |pane, cx| {
-        pane.active_item()
-            .unwrap()
-            .downcast::<Editor>()
-            .unwrap()
-            .update(cx, |editor, cx| {
-                assert_eq!(
-                    editor.display_text(cx),
-                    lib_text,
-                    "Other file should be open and active",
-                );
-            });
-        assert_eq!(pane.items().count(), 1, "No other editors should be open");
-    });
-
-    let _other_editor_2 = workspace
-        .update_in(cx, |workspace, window, cx| {
-            workspace.open_path(
-                (worktree_id, rel_path("lib.rs")),
-                Some(pane_2.downgrade()),
-                true,
-                window,
-                cx,
-            )
-        })
-        .unwrap()
-        .await
-        .downcast::<Editor>()
-        .unwrap();
-    pane_2
-        .update_in(cx, |pane, window, cx| {
-            pane.close_other_items(&CloseOtherItems::default(), None, window, cx)
-        })
-        .await
-        .unwrap();
-    drop(editor_2);
-    pane_2.update(cx, |pane, cx| {
-        let open_editor = pane.active_item().unwrap().downcast::<Editor>().unwrap();
-        open_editor.update(cx, |editor, cx| {
-            assert_eq!(
-                editor.display_text(cx),
-                lib_text,
-                "Other file should be open and active in another panel too",
-            );
-        });
-        assert_eq!(
-            pane.items().count(),
-            1,
-            "No other editors should be open in another pane",
-        );
-    });
-
-    let _editor_1_reopened = workspace
-        .update_in(cx, |workspace, window, cx| {
-            workspace.open_path(
-                (worktree_id, rel_path("main.rs")),
-                Some(pane_1.downgrade()),
-                true,
-                window,
-                cx,
-            )
-        })
-        .unwrap()
-        .await
-        .downcast::<Editor>()
-        .unwrap();
-    let _editor_2_reopened = workspace
-        .update_in(cx, |workspace, window, cx| {
-            workspace.open_path(
-                (worktree_id, rel_path("main.rs")),
-                Some(pane_2.downgrade()),
-                true,
-                window,
-                cx,
-            )
-        })
-        .unwrap()
-        .await
-        .downcast::<Editor>()
-        .unwrap();
-    pane_1.update(cx, |pane, cx| {
-        let open_editor = pane.active_item().unwrap().downcast::<Editor>().unwrap();
-        open_editor.update(cx, |editor, cx| {
-            assert_eq!(
-                editor.display_text(cx),
-                main_text,
-                "Previous editor in the 1st panel had no extra text manipulations and should get none on reopen",
-            );
-            assert_eq!(
-                editor
-                    .selections
-                    .all::<Point>(&editor.display_snapshot(cx))
-                    .into_iter()
-                    .map(|s| s.range())
-                    .collect::<Vec<_>>(),
-                expected_ranges,
-                "Previous editor in the 1st panel had selections and should get them restored on reopen",
-            );
-        })
-    });
-    pane_2.update(cx, |pane, cx| {
-        let open_editor = pane.active_item().unwrap().downcast::<Editor>().unwrap();
-        open_editor.update(cx, |editor, cx| {
-            assert_eq!(
-                editor.display_text(cx),
-                r#"fn main() {
-⋯rintln!("1");
-⋯intln!("2");
-⋯ntln!("3");
-println!("4");
-println!("5");
-}"#,
-                "Previous editor in the 2nd pane had folds and should restore those on reopen in the same pane",
-            );
-            assert_eq!(
-                editor
-                    .selections
-                    .all::<Point>(&editor.display_snapshot(cx))
-                    .into_iter()
-                    .map(|s| s.range())
-                    .collect::<Vec<_>>(),
-                vec![Point::zero()..Point::zero()],
-                "Previous editor in the 2nd pane had no selections changed hence should restore none",
-            );
-        })
-    });
-}
-
-#[gpui::test]
-async fn test_editor_does_not_restore_data_when_turned_off(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let fs = FakeFs::new(cx.executor());
-    let main_text = r#"fn main() {
-println!("1");
-println!("2");
-println!("3");
-println!("4");
-println!("5");
-}"#;
-    let lib_text = "mod foo {}";
-    fs.insert_tree(
-        path!("/a"),
-        json!({
-            "lib.rs": lib_text,
-            "main.rs": main_text,
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
-    let (workspace, cx) =
-        cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let worktree_id = workspace.update(cx, |workspace, cx| {
-        workspace.project().update(cx, |project, cx| {
-            project.worktrees(cx).next().unwrap().read(cx).id()
-        })
-    });
-
-    let pane = workspace.update(cx, |workspace, _| workspace.active_pane().clone());
-    let editor = workspace
-        .update_in(cx, |workspace, window, cx| {
-            workspace.open_path(
-                (worktree_id, rel_path("main.rs")),
-                Some(pane.downgrade()),
-                true,
-                window,
-                cx,
-            )
-        })
-        .unwrap()
-        .await
-        .downcast::<Editor>()
-        .unwrap();
-    pane.update(cx, |pane, cx| {
-        let open_editor = pane.active_item().unwrap().downcast::<Editor>().unwrap();
-        open_editor.update(cx, |editor, cx| {
-            assert_eq!(
-                editor.display_text(cx),
-                main_text,
-                "Original main.rs text on initial open",
-            );
-        })
-    });
-    editor.update_in(cx, |editor, window, cx| {
-        editor.fold_ranges(vec![Point::new(0, 0)..Point::new(0, 0)], false, window, cx);
-    });
-
-    cx.update_global(|store: &mut SettingsStore, cx| {
-        store.update_user_settings(cx, |s| {
-            s.workspace.restore_on_file_reopen = Some(false);
-        });
-    });
-    editor.update_in(cx, |editor, window, cx| {
-        editor.fold_ranges(
-            vec![
-                Point::new(1, 0)..Point::new(1, 1),
-                Point::new(2, 0)..Point::new(2, 2),
-                Point::new(3, 0)..Point::new(3, 3),
-            ],
-            false,
-            window,
-            cx,
-        );
-    });
-    pane.update_in(cx, |pane, window, cx| {
-        pane.close_all_items(&CloseAllItems::default(), window, cx)
-    })
-    .await
-    .unwrap();
-    pane.update(cx, |pane, _| {
-        assert!(pane.active_item().is_none());
-    });
-    cx.update_global(|store: &mut SettingsStore, cx| {
-        store.update_user_settings(cx, |s| {
-            s.workspace.restore_on_file_reopen = Some(true);
-        });
-    });
-
-    let _editor_reopened = workspace
-        .update_in(cx, |workspace, window, cx| {
-            workspace.open_path(
-                (worktree_id, rel_path("main.rs")),
-                Some(pane.downgrade()),
-                true,
-                window,
-                cx,
-            )
-        })
-        .unwrap()
-        .await
-        .downcast::<Editor>()
-        .unwrap();
-    pane.update(cx, |pane, cx| {
-        let open_editor = pane.active_item().unwrap().downcast::<Editor>().unwrap();
-        open_editor.update(cx, |editor, cx| {
-            assert_eq!(
-                editor.display_text(cx),
-                main_text,
-                "No folds: even after enabling the restoration, previous editor's data should not be saved to be used for the restoration"
-            );
-        })
-    });
-}
-
-#[gpui::test]
-async fn test_hide_mouse_context_menu_on_modal_opened(cx: &mut TestAppContext) {
-    struct EmptyModalView {
-        focus_handle: gpui::FocusHandle,
-    }
-    impl EventEmitter<DismissEvent> for EmptyModalView {}
-    impl Render for EmptyModalView {
-        fn render(&mut self, _: &mut Window, _: &mut Context<'_, Self>) -> impl IntoElement {
-            div()
-        }
-    }
-    impl Focusable for EmptyModalView {
-        fn focus_handle(&self, _cx: &App) -> gpui::FocusHandle {
-            self.focus_handle.clone()
-        }
-    }
-    impl workspace::ModalView for EmptyModalView {}
-    fn new_empty_modal_view(cx: &App) -> EmptyModalView {
-        EmptyModalView {
-            focus_handle: cx.focus_handle(),
-        }
-    }
-
-    init_test(cx, |_| {});
-
-    let fs = FakeFs::new(cx.executor());
-    let project = Project::test(fs, [], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let buffer = cx.update(|cx| MultiBuffer::build_simple("hello world!", cx));
-    let cx = &mut VisualTestContext::from_window(*workspace.deref(), cx);
-    let editor = cx.new_window_entity(|window, cx| {
-        Editor::new(
-            EditorMode::full(),
-            buffer,
-            Some(project.clone()),
-            window,
-            cx,
-        )
-    });
-    workspace
-        .update(cx, |workspace, window, cx| {
-            workspace.add_item_to_active_pane(Box::new(editor.clone()), None, true, window, cx);
-        })
-        .unwrap();
-    editor.update_in(cx, |editor, window, cx| {
-        editor.open_context_menu(&OpenContextMenu, window, cx);
-        assert!(editor.mouse_context_menu.is_some());
-    });
-    workspace
-        .update(cx, |workspace, window, cx| {
-            workspace.toggle_modal(window, cx, |_, cx| new_empty_modal_view(cx));
-        })
-        .unwrap();
-    cx.read(|cx| {
-        assert!(editor.read(cx).mouse_context_menu.is_none());
-    });
-}
-
-fn set_linked_edit_ranges(
-    opening: (Point, Point),
-    closing: (Point, Point),
-    editor: &mut Editor,
-    cx: &mut Context<Editor>,
-) {
-    let Some((buffer, _)) = editor
-        .buffer
-        .read(cx)
-        .text_anchor_for_position(editor.selections.newest_anchor().start, cx)
-    else {
-        panic!("Failed to get buffer for selection position");
-    };
-    let buffer = buffer.read(cx);
-    let buffer_id = buffer.remote_id();
-    let opening_range = buffer.anchor_before(opening.0)..buffer.anchor_after(opening.1);
-    let closing_range = buffer.anchor_before(closing.0)..buffer.anchor_after(closing.1);
-    let mut linked_ranges = HashMap::default();
-    linked_ranges.insert(buffer_id, vec![(opening_range, vec![closing_range])]);
-    editor.linked_edit_ranges = LinkedEditingRanges(linked_ranges);
-}
-
-#[gpui::test]
-async fn test_html_linked_edits_on_completion(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_file(path!("/file.html"), Default::default())
-        .await;
-
-    let project = Project::test(fs, [path!("/").as_ref()], cx).await;
-
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-    let html_language = Arc::new(Language::new(
-        LanguageConfig {
-            name: "HTML".into(),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["html".to_string()],
-                ..LanguageMatcher::default()
-            },
-            brackets: BracketPairConfig {
-                pairs: vec![BracketPair {
-                    start: "<".into(),
-                    end: ">".into(),
-                    close: true,
-                    ..Default::default()
-                }],
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-        Some(tree_sitter_html::LANGUAGE.into()),
-    ));
-    language_registry.add(html_language);
-    let mut fake_servers = language_registry.register_fake_lsp(
-        "HTML",
-        FakeLspAdapter {
-            capabilities: lsp::ServerCapabilities {
-                completion_provider: Some(lsp::CompletionOptions {
-                    resolve_provider: Some(true),
-                    ..Default::default()
-                }),
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-    );
-
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-    let worktree_id = workspace
-        .update(cx, |workspace, _window, cx| {
-            workspace.project().update(cx, |project, cx| {
-                project.worktrees(cx).next().unwrap().read(cx).id()
-            })
-        })
-        .unwrap();
-    project
-        .update(cx, |project, cx| {
-            project.open_local_buffer_with_lsp(path!("/file.html"), cx)
-        })
-        .await
-        .unwrap();
-    let editor = workspace
-        .update(cx, |workspace, window, cx| {
-            workspace.open_path((worktree_id, rel_path("file.html")), None, true, window, cx)
-        })
-        .unwrap()
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-
-    let fake_server = fake_servers.next().await.unwrap();
-    editor.update_in(cx, |editor, window, cx| {
-        editor.set_text("<ad></ad>", window, cx);
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |selections| {
-            selections.select_ranges([Point::new(0, 3)..Point::new(0, 3)]);
-        });
-        set_linked_edit_ranges(
-            (Point::new(0, 1), Point::new(0, 3)),
-            (Point::new(0, 6), Point::new(0, 8)),
-            editor,
-            cx,
-        );
-    });
-    let mut completion_handle =
-        fake_server.set_request_handler::<lsp::request::Completion, _, _>(move |_, _| async move {
-            Ok(Some(lsp::CompletionResponse::Array(vec![
-                lsp::CompletionItem {
-                    label: "head".to_string(),
-                    text_edit: Some(lsp::CompletionTextEdit::InsertAndReplace(
-                        lsp::InsertReplaceEdit {
-                            new_text: "head".to_string(),
-                            insert: lsp::Range::new(
-                                lsp::Position::new(0, 1),
-                                lsp::Position::new(0, 3),
-                            ),
-                            replace: lsp::Range::new(
-                                lsp::Position::new(0, 1),
-                                lsp::Position::new(0, 3),
-                            ),
-                        },
-                    )),
-                    ..Default::default()
-                },
-            ])))
-        });
-    editor.update_in(cx, |editor, window, cx| {
-        editor.show_completions(&ShowCompletions, window, cx);
-    });
-    cx.run_until_parked();
-    completion_handle.next().await.unwrap();
-    editor.update(cx, |editor, _| {
-        assert!(
-            editor.context_menu_visible(),
-            "Completion menu should be visible"
-        );
-    });
-    editor.update_in(cx, |editor, window, cx| {
-        editor.confirm_completion(&ConfirmCompletion::default(), window, cx)
-    });
-    cx.executor().run_until_parked();
-    editor.update(cx, |editor, cx| {
-        assert_eq!(editor.text(cx), "<head></head>");
-    });
-}
-
-#[gpui::test]
-async fn test_linked_edits_on_typing_punctuation(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-    let language = Arc::new(Language::new(
-        LanguageConfig {
-            name: "TSX".into(),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["tsx".to_string()],
-                ..LanguageMatcher::default()
-            },
-            brackets: BracketPairConfig {
-                pairs: vec![BracketPair {
-                    start: "<".into(),
-                    end: ">".into(),
-                    close: true,
-                    ..Default::default()
-                }],
-                ..Default::default()
-            },
-            linked_edit_characters: HashSet::from_iter(['.']),
-            ..Default::default()
-        },
-        Some(tree_sitter_typescript::LANGUAGE_TSX.into()),
-    ));
-    cx.update_buffer(|buffer, cx| buffer.set_language(Some(language), cx));
-
-    // Test typing > does not extend linked pair
-    cx.set_state("<divˇ<div></div>");
-    cx.update_editor(|editor, _, cx| {
-        set_linked_edit_ranges(
-            (Point::new(0, 1), Point::new(0, 4)),
-            (Point::new(0, 11), Point::new(0, 14)),
-            editor,
-            cx,
-        );
-    });
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input(">", window, cx);
-    });
-    cx.assert_editor_state("<div>ˇ<div></div>");
-
-    // Test typing . do extend linked pair
-    cx.set_state("<Animatedˇ></Animated>");
-    cx.update_editor(|editor, _, cx| {
-        set_linked_edit_ranges(
-            (Point::new(0, 1), Point::new(0, 9)),
-            (Point::new(0, 12), Point::new(0, 20)),
-            editor,
-            cx,
-        );
-    });
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input(".", window, cx);
-    });
-    cx.assert_editor_state("<Animated.ˇ></Animated.>");
-    cx.update_editor(|editor, _, cx| {
-        set_linked_edit_ranges(
-            (Point::new(0, 1), Point::new(0, 10)),
-            (Point::new(0, 13), Point::new(0, 21)),
-            editor,
-            cx,
-        );
-    });
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("V", window, cx);
-    });
-    cx.assert_editor_state("<Animated.Vˇ></Animated.V>");
-}
-
-#[gpui::test]
-async fn test_invisible_worktree_servers(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/root"),
-        json!({
-            "a": {
-                "main.rs": "fn main() {}",
-            },
-            "foo": {
-                "bar": {
-                    "external_file.rs": "pub mod external {}",
-                }
-            }
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/root/a").as_ref()], cx).await;
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-    language_registry.add(rust_lang());
-    let _fake_servers = language_registry.register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            ..FakeLspAdapter::default()
-        },
-    );
-    let (workspace, cx) =
-        cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let worktree_id = workspace.update(cx, |workspace, cx| {
-        workspace.project().update(cx, |project, cx| {
-            project.worktrees(cx).next().unwrap().read(cx).id()
-        })
-    });
-
-    let assert_language_servers_count =
-        |expected: usize, context: &str, cx: &mut VisualTestContext| {
-            project.update(cx, |project, cx| {
-                let current = project
-                    .lsp_store()
-                    .read(cx)
-                    .as_local()
-                    .unwrap()
-                    .language_servers
-                    .len();
-                assert_eq!(expected, current, "{context}");
-            });
-        };
-
-    assert_language_servers_count(
-        0,
-        "No servers should be running before any file is open",
-        cx,
-    );
-    let pane = workspace.update(cx, |workspace, _| workspace.active_pane().clone());
-    let main_editor = workspace
-        .update_in(cx, |workspace, window, cx| {
-            workspace.open_path(
-                (worktree_id, rel_path("main.rs")),
-                Some(pane.downgrade()),
-                true,
-                window,
-                cx,
-            )
-        })
-        .unwrap()
-        .await
-        .downcast::<Editor>()
-        .unwrap();
-    pane.update(cx, |pane, cx| {
-        let open_editor = pane.active_item().unwrap().downcast::<Editor>().unwrap();
-        open_editor.update(cx, |editor, cx| {
-            assert_eq!(
-                editor.display_text(cx),
-                "fn main() {}",
-                "Original main.rs text on initial open",
-            );
-        });
-        assert_eq!(open_editor, main_editor);
-    });
-    assert_language_servers_count(1, "First *.rs file starts a language server", cx);
-
-    let external_editor = workspace
-        .update_in(cx, |workspace, window, cx| {
-            workspace.open_abs_path(
-                PathBuf::from("/root/foo/bar/external_file.rs"),
-                OpenOptions::default(),
-                window,
-                cx,
-            )
-        })
-        .await
-        .expect("opening external file")
-        .downcast::<Editor>()
-        .expect("downcasted external file's open element to editor");
-    pane.update(cx, |pane, cx| {
-        let open_editor = pane.active_item().unwrap().downcast::<Editor>().unwrap();
-        open_editor.update(cx, |editor, cx| {
-            assert_eq!(
-                editor.display_text(cx),
-                "pub mod external {}",
-                "External file is open now",
-            );
-        });
-        assert_eq!(open_editor, external_editor);
-    });
-    assert_language_servers_count(
-        1,
-        "Second, external, *.rs file should join the existing server",
-        cx,
-    );
-
-    pane.update_in(cx, |pane, window, cx| {
-        pane.close_active_item(&CloseActiveItem::default(), window, cx)
-    })
-    .await
-    .unwrap();
-    pane.update_in(cx, |pane, window, cx| {
-        pane.navigate_backward(&Default::default(), window, cx);
-    });
-    cx.run_until_parked();
-    pane.update(cx, |pane, cx| {
-        let open_editor = pane.active_item().unwrap().downcast::<Editor>().unwrap();
-        open_editor.update(cx, |editor, cx| {
-            assert_eq!(
-                editor.display_text(cx),
-                "pub mod external {}",
-                "External file is open now",
-            );
-        });
-    });
-    assert_language_servers_count(
-        1,
-        "After closing and reopening (with navigate back) of an external file, no extra language servers should appear",
-        cx,
-    );
-
-    cx.update(|_, cx| {
-        workspace::reload(cx);
-    });
-    assert_language_servers_count(
-        1,
-        "After reloading the worktree with local and external files opened, only one project should be started",
-        cx,
-    );
-}
-
-#[gpui::test]
-async fn test_tab_in_leading_whitespace_auto_indents_for_python(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-    let language = languages::language("python", tree_sitter_python::LANGUAGE.into());
-    cx.update_buffer(|buffer, cx| buffer.set_language(Some(language), cx));
-
-    // test cursor move to start of each line on tab
-    // for `if`, `elif`, `else`, `while`, `with` and `for`
-    cx.set_state(indoc! {"
-        def main():
-        ˇ    for item in items:
-        ˇ        while item.active:
-        ˇ            if item.value > 10:
-        ˇ                continue
-        ˇ            elif item.value < 0:
-        ˇ                break
-        ˇ            else:
-        ˇ                with item.context() as ctx:
-        ˇ                    yield count
-        ˇ        else:
-        ˇ            log('while else')
-        ˇ    else:
-        ˇ        log('for else')
-    "});
-    cx.update_editor(|e, window, cx| e.tab(&Tab, window, cx));
-    cx.assert_editor_state(indoc! {"
-        def main():
-            ˇfor item in items:
-                ˇwhile item.active:
-                    ˇif item.value > 10:
-                        ˇcontinue
-                    ˇelif item.value < 0:
-                        ˇbreak
-                    ˇelse:
-                        ˇwith item.context() as ctx:
-                            ˇyield count
-                ˇelse:
-                    ˇlog('while else')
-            ˇelse:
-                ˇlog('for else')
-    "});
-    // test relative indent is preserved when tab
-    // for `if`, `elif`, `else`, `while`, `with` and `for`
-    cx.update_editor(|e, window, cx| e.tab(&Tab, window, cx));
-    cx.assert_editor_state(indoc! {"
-        def main():
-                ˇfor item in items:
-                    ˇwhile item.active:
-                        ˇif item.value > 10:
-                            ˇcontinue
-                        ˇelif item.value < 0:
-                            ˇbreak
-                        ˇelse:
-                            ˇwith item.context() as ctx:
-                                ˇyield count
-                    ˇelse:
-                        ˇlog('while else')
-                ˇelse:
-                    ˇlog('for else')
-    "});
-
-    // test cursor move to start of each line on tab
-    // for `try`, `except`, `else`, `finally`, `match` and `def`
-    cx.set_state(indoc! {"
-        def main():
-        ˇ    try:
-        ˇ        fetch()
-        ˇ    except ValueError:
-        ˇ        handle_error()
-        ˇ    else:
-        ˇ        match value:
-        ˇ            case _:
-        ˇ    finally:
-        ˇ        def status():
-        ˇ            return 0
-    "});
-    cx.update_editor(|e, window, cx| e.tab(&Tab, window, cx));
-    cx.assert_editor_state(indoc! {"
-        def main():
-            ˇtry:
-                ˇfetch()
-            ˇexcept ValueError:
-                ˇhandle_error()
-            ˇelse:
-                ˇmatch value:
-                    ˇcase _:
-            ˇfinally:
-                ˇdef status():
-                    ˇreturn 0
-    "});
-    // test relative indent is preserved when tab
-    // for `try`, `except`, `else`, `finally`, `match` and `def`
-    cx.update_editor(|e, window, cx| e.tab(&Tab, window, cx));
-    cx.assert_editor_state(indoc! {"
-        def main():
-                ˇtry:
-                    ˇfetch()
-                ˇexcept ValueError:
-                    ˇhandle_error()
-                ˇelse:
-                    ˇmatch value:
-                        ˇcase _:
-                ˇfinally:
-                    ˇdef status():
-                        ˇreturn 0
-    "});
-}
-
-#[gpui::test]
-async fn test_outdent_after_input_for_python(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-    let language = languages::language("python", tree_sitter_python::LANGUAGE.into());
-    cx.update_buffer(|buffer, cx| buffer.set_language(Some(language), cx));
-
-    // test `else` auto outdents when typed inside `if` block
-    cx.set_state(indoc! {"
-        def main():
-            if i == 2:
-                return
-                ˇ
-    "});
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("else:", window, cx);
-    });
-    cx.assert_editor_state(indoc! {"
-        def main():
-            if i == 2:
-                return
-            else:ˇ
-    "});
-
-    // test `except` auto outdents when typed inside `try` block
-    cx.set_state(indoc! {"
-        def main():
-            try:
-                i = 2
-                ˇ
-    "});
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("except:", window, cx);
-    });
-    cx.assert_editor_state(indoc! {"
-        def main():
-            try:
-                i = 2
-            except:ˇ
-    "});
-
-    // test `else` auto outdents when typed inside `except` block
-    cx.set_state(indoc! {"
-        def main():
-            try:
-                i = 2
-            except:
-                j = 2
-                ˇ
-    "});
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("else:", window, cx);
-    });
-    cx.assert_editor_state(indoc! {"
-        def main():
-            try:
-                i = 2
-            except:
-                j = 2
-            else:ˇ
-    "});
-
-    // test `finally` auto outdents when typed inside `else` block
-    cx.set_state(indoc! {"
-        def main():
-            try:
-                i = 2
-            except:
-                j = 2
-            else:
-                k = 2
-                ˇ
-    "});
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("finally:", window, cx);
-    });
-    cx.assert_editor_state(indoc! {"
-        def main():
-            try:
-                i = 2
-            except:
-                j = 2
-            else:
-                k = 2
-            finally:ˇ
-    "});
-
-    // test `else` does not outdents when typed inside `except` block right after for block
-    cx.set_state(indoc! {"
-        def main():
-            try:
-                i = 2
-            except:
-                for i in range(n):
-                    pass
-                ˇ
-    "});
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("else:", window, cx);
-    });
-    cx.assert_editor_state(indoc! {"
-        def main():
-            try:
-                i = 2
-            except:
-                for i in range(n):
-                    pass
-                else:ˇ
-    "});
-
-    // test `finally` auto outdents when typed inside `else` block right after for block
-    cx.set_state(indoc! {"
-        def main():
-            try:
-                i = 2
-            except:
-                j = 2
-            else:
-                for i in range(n):
-                    pass
-                ˇ
-    "});
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("finally:", window, cx);
-    });
-    cx.assert_editor_state(indoc! {"
-        def main():
-            try:
-                i = 2
-            except:
-                j = 2
-            else:
-                for i in range(n):
-                    pass
-            finally:ˇ
-    "});
-
-    // test `except` outdents to inner "try" block
-    cx.set_state(indoc! {"
-        def main():
-            try:
-                i = 2
-                if i == 2:
-                    try:
-                        i = 3
-                        ˇ
-    "});
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("except:", window, cx);
-    });
-    cx.assert_editor_state(indoc! {"
-        def main():
-            try:
-                i = 2
-                if i == 2:
-                    try:
-                        i = 3
-                    except:ˇ
-    "});
-
-    // test `except` outdents to outer "try" block
-    cx.set_state(indoc! {"
-        def main():
-            try:
-                i = 2
-                if i == 2:
-                    try:
-                        i = 3
-                ˇ
-    "});
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("except:", window, cx);
-    });
-    cx.assert_editor_state(indoc! {"
-        def main():
-            try:
-                i = 2
-                if i == 2:
-                    try:
-                        i = 3
-            except:ˇ
-    "});
-
-    // test `else` stays at correct indent when typed after `for` block
-    cx.set_state(indoc! {"
-        def main():
-            for i in range(10):
-                if i == 3:
-                    break
-            ˇ
-    "});
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("else:", window, cx);
-    });
-    cx.assert_editor_state(indoc! {"
-        def main():
-            for i in range(10):
-                if i == 3:
-                    break
-            else:ˇ
-    "});
-
-    // test does not outdent on typing after line with square brackets
-    cx.set_state(indoc! {"
-        def f() -> list[str]:
-            ˇ
-    "});
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("a", window, cx);
-    });
-    cx.assert_editor_state(indoc! {"
-        def f() -> list[str]:
-            aˇ
-    "});
-
-    // test does not outdent on typing : after case keyword
-    cx.set_state(indoc! {"
-        match 1:
-            caseˇ
-    "});
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input(":", window, cx);
-    });
-    cx.assert_editor_state(indoc! {"
-        match 1:
-            case:ˇ
-    "});
-}
-
-#[gpui::test]
-async fn test_indent_on_newline_for_python(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    update_test_language_settings(cx, |settings| {
-        settings.defaults.extend_comment_on_newline = Some(false);
-    });
-    let mut cx = EditorTestContext::new(cx).await;
-    let language = languages::language("python", tree_sitter_python::LANGUAGE.into());
-    cx.update_buffer(|buffer, cx| buffer.set_language(Some(language), cx));
-
-    // test correct indent after newline on comment
-    cx.set_state(indoc! {"
-        # COMMENT:ˇ
-    "});
-    cx.update_editor(|editor, window, cx| {
-        editor.newline(&Newline, window, cx);
-    });
-    cx.assert_editor_state(indoc! {"
-        # COMMENT:
-        ˇ
-    "});
-
-    // test correct indent after newline in brackets
-    cx.set_state(indoc! {"
-        {ˇ}
-    "});
-    cx.update_editor(|editor, window, cx| {
-        editor.newline(&Newline, window, cx);
-    });
-    cx.run_until_parked();
-    cx.assert_editor_state(indoc! {"
-        {
-            ˇ
-        }
-    "});
-
-    cx.set_state(indoc! {"
-        (ˇ)
-    "});
-    cx.update_editor(|editor, window, cx| {
-        editor.newline(&Newline, window, cx);
-    });
-    cx.run_until_parked();
-    cx.assert_editor_state(indoc! {"
-        (
-            ˇ
-        )
-    "});
-
-    // do not indent after empty lists or dictionaries
-    cx.set_state(indoc! {"
-        a = []ˇ
-    "});
-    cx.update_editor(|editor, window, cx| {
-        editor.newline(&Newline, window, cx);
-    });
-    cx.run_until_parked();
-    cx.assert_editor_state(indoc! {"
-        a = []
-        ˇ
-    "});
-}
-
-#[gpui::test]
-async fn test_tab_in_leading_whitespace_auto_indents_for_bash(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-    let language = languages::language("bash", tree_sitter_bash::LANGUAGE.into());
-    cx.update_buffer(|buffer, cx| buffer.set_language(Some(language), cx));
-
-    // test cursor move to start of each line on tab
-    // for `if`, `elif`, `else`, `while`, `for`, `case` and `function`
-    cx.set_state(indoc! {"
-        function main() {
-        ˇ    for item in $items; do
-        ˇ        while [ -n \"$item\" ]; do
-        ˇ            if [ \"$value\" -gt 10 ]; then
-        ˇ                continue
-        ˇ            elif [ \"$value\" -lt 0 ]; then
-        ˇ                break
-        ˇ            else
-        ˇ                echo \"$item\"
-        ˇ            fi
-        ˇ        done
-        ˇ    done
-        ˇ}
-    "});
-    cx.update_editor(|e, window, cx| e.tab(&Tab, window, cx));
-    cx.assert_editor_state(indoc! {"
-        function main() {
-            ˇfor item in $items; do
-                ˇwhile [ -n \"$item\" ]; do
-                    ˇif [ \"$value\" -gt 10 ]; then
-                        ˇcontinue
-                    ˇelif [ \"$value\" -lt 0 ]; then
-                        ˇbreak
-                    ˇelse
-                        ˇecho \"$item\"
-                    ˇfi
-                ˇdone
-            ˇdone
-        ˇ}
-    "});
-    // test relative indent is preserved when tab
-    cx.update_editor(|e, window, cx| e.tab(&Tab, window, cx));
-    cx.assert_editor_state(indoc! {"
-        function main() {
-                ˇfor item in $items; do
-                    ˇwhile [ -n \"$item\" ]; do
-                        ˇif [ \"$value\" -gt 10 ]; then
-                            ˇcontinue
-                        ˇelif [ \"$value\" -lt 0 ]; then
-                            ˇbreak
-                        ˇelse
-                            ˇecho \"$item\"
-                        ˇfi
-                    ˇdone
-                ˇdone
-            ˇ}
-    "});
-
-    // test cursor move to start of each line on tab
-    // for `case` statement with patterns
-    cx.set_state(indoc! {"
-        function handle() {
-        ˇ    case \"$1\" in
-        ˇ        start)
-        ˇ            echo \"a\"
-        ˇ            ;;
-        ˇ        stop)
-        ˇ            echo \"b\"
-        ˇ            ;;
-        ˇ        *)
-        ˇ            echo \"c\"
-        ˇ            ;;
-        ˇ    esac
-        ˇ}
-    "});
-    cx.update_editor(|e, window, cx| e.tab(&Tab, window, cx));
-    cx.assert_editor_state(indoc! {"
-        function handle() {
-            ˇcase \"$1\" in
-                ˇstart)
-                    ˇecho \"a\"
-                    ˇ;;
-                ˇstop)
-                    ˇecho \"b\"
-                    ˇ;;
-                ˇ*)
-                    ˇecho \"c\"
-                    ˇ;;
-            ˇesac
-        ˇ}
-    "});
-}
-
-#[gpui::test]
-async fn test_indent_after_input_for_bash(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-    let language = languages::language("bash", tree_sitter_bash::LANGUAGE.into());
-    cx.update_buffer(|buffer, cx| buffer.set_language(Some(language), cx));
-
-    // test indents on comment insert
-    cx.set_state(indoc! {"
-        function main() {
-        ˇ    for item in $items; do
-        ˇ        while [ -n \"$item\" ]; do
-        ˇ            if [ \"$value\" -gt 10 ]; then
-        ˇ                continue
-        ˇ            elif [ \"$value\" -lt 0 ]; then
-        ˇ                break
-        ˇ            else
-        ˇ                echo \"$item\"
-        ˇ            fi
-        ˇ        done
-        ˇ    done
-        ˇ}
-    "});
-    cx.update_editor(|e, window, cx| e.handle_input("#", window, cx));
-    cx.assert_editor_state(indoc! {"
-        function main() {
-        #ˇ    for item in $items; do
-        #ˇ        while [ -n \"$item\" ]; do
-        #ˇ            if [ \"$value\" -gt 10 ]; then
-        #ˇ                continue
-        #ˇ            elif [ \"$value\" -lt 0 ]; then
-        #ˇ                break
-        #ˇ            else
-        #ˇ                echo \"$item\"
-        #ˇ            fi
-        #ˇ        done
-        #ˇ    done
-        #ˇ}
-    "});
-}
-
-#[gpui::test]
-async fn test_outdent_after_input_for_bash(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-    let language = languages::language("bash", tree_sitter_bash::LANGUAGE.into());
-    cx.update_buffer(|buffer, cx| buffer.set_language(Some(language), cx));
-
-    // test `else` auto outdents when typed inside `if` block
-    cx.set_state(indoc! {"
-        if [ \"$1\" = \"test\" ]; then
-            echo \"foo bar\"
-            ˇ
-    "});
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("else", window, cx);
-    });
-    cx.assert_editor_state(indoc! {"
-        if [ \"$1\" = \"test\" ]; then
-            echo \"foo bar\"
-        elseˇ
-    "});
-
-    // test `elif` auto outdents when typed inside `if` block
-    cx.set_state(indoc! {"
-        if [ \"$1\" = \"test\" ]; then
-            echo \"foo bar\"
-            ˇ
-    "});
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("elif", window, cx);
-    });
-    cx.assert_editor_state(indoc! {"
-        if [ \"$1\" = \"test\" ]; then
-            echo \"foo bar\"
-        elifˇ
-    "});
-
-    // test `fi` auto outdents when typed inside `else` block
-    cx.set_state(indoc! {"
-        if [ \"$1\" = \"test\" ]; then
-            echo \"foo bar\"
-        else
-            echo \"bar baz\"
-            ˇ
-    "});
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("fi", window, cx);
-    });
-    cx.assert_editor_state(indoc! {"
-        if [ \"$1\" = \"test\" ]; then
-            echo \"foo bar\"
-        else
-            echo \"bar baz\"
-        fiˇ
-    "});
-
-    // test `done` auto outdents when typed inside `while` block
-    cx.set_state(indoc! {"
-        while read line; do
-            echo \"$line\"
-            ˇ
-    "});
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("done", window, cx);
-    });
-    cx.assert_editor_state(indoc! {"
-        while read line; do
-            echo \"$line\"
-        doneˇ
-    "});
-
-    // test `done` auto outdents when typed inside `for` block
-    cx.set_state(indoc! {"
-        for file in *.txt; do
-            cat \"$file\"
-            ˇ
-    "});
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("done", window, cx);
-    });
-    cx.assert_editor_state(indoc! {"
-        for file in *.txt; do
-            cat \"$file\"
-        doneˇ
-    "});
-
-    // test `esac` auto outdents when typed inside `case` block
-    cx.set_state(indoc! {"
-        case \"$1\" in
-            start)
-                echo \"foo bar\"
-                ;;
-            stop)
-                echo \"bar baz\"
-                ;;
-            ˇ
-    "});
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("esac", window, cx);
-    });
-    cx.assert_editor_state(indoc! {"
-        case \"$1\" in
-            start)
-                echo \"foo bar\"
-                ;;
-            stop)
-                echo \"bar baz\"
-                ;;
-        esacˇ
-    "});
-
-    // test `*)` auto outdents when typed inside `case` block
-    cx.set_state(indoc! {"
-        case \"$1\" in
-            start)
-                echo \"foo bar\"
-                ;;
-                ˇ
-    "});
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("*)", window, cx);
-    });
-    cx.assert_editor_state(indoc! {"
-        case \"$1\" in
-            start)
-                echo \"foo bar\"
-                ;;
-            *)ˇ
-    "});
-
-    // test `fi` outdents to correct level with nested if blocks
-    cx.set_state(indoc! {"
-        if [ \"$1\" = \"test\" ]; then
-            echo \"outer if\"
-            if [ \"$2\" = \"debug\" ]; then
-                echo \"inner if\"
-                ˇ
-    "});
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("fi", window, cx);
-    });
-    cx.assert_editor_state(indoc! {"
-        if [ \"$1\" = \"test\" ]; then
-            echo \"outer if\"
-            if [ \"$2\" = \"debug\" ]; then
-                echo \"inner if\"
-            fiˇ
-    "});
-}
-
-#[gpui::test]
-async fn test_indent_on_newline_for_bash(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    update_test_language_settings(cx, |settings| {
-        settings.defaults.extend_comment_on_newline = Some(false);
-    });
-    let mut cx = EditorTestContext::new(cx).await;
-    let language = languages::language("bash", tree_sitter_bash::LANGUAGE.into());
-    cx.update_buffer(|buffer, cx| buffer.set_language(Some(language), cx));
-
-    // test correct indent after newline on comment
-    cx.set_state(indoc! {"
-        # COMMENT:ˇ
-    "});
-    cx.update_editor(|editor, window, cx| {
-        editor.newline(&Newline, window, cx);
-    });
-    cx.assert_editor_state(indoc! {"
-        # COMMENT:
-        ˇ
-    "});
-
-    // test correct indent after newline after `then`
-    cx.set_state(indoc! {"
-
-        if [ \"$1\" = \"test\" ]; thenˇ
-    "});
-    cx.update_editor(|editor, window, cx| {
-        editor.newline(&Newline, window, cx);
-    });
-    cx.run_until_parked();
-    cx.assert_editor_state(indoc! {"
-
-        if [ \"$1\" = \"test\" ]; then
-            ˇ
-    "});
-
-    // test correct indent after newline after `else`
-    cx.set_state(indoc! {"
-        if [ \"$1\" = \"test\" ]; then
-        elseˇ
-    "});
-    cx.update_editor(|editor, window, cx| {
-        editor.newline(&Newline, window, cx);
-    });
-    cx.run_until_parked();
-    cx.assert_editor_state(indoc! {"
-        if [ \"$1\" = \"test\" ]; then
-        else
-            ˇ
-    "});
-
-    // test correct indent after newline after `elif`
-    cx.set_state(indoc! {"
-        if [ \"$1\" = \"test\" ]; then
-        elifˇ
-    "});
-    cx.update_editor(|editor, window, cx| {
-        editor.newline(&Newline, window, cx);
-    });
-    cx.run_until_parked();
-    cx.assert_editor_state(indoc! {"
-        if [ \"$1\" = \"test\" ]; then
-        elif
-            ˇ
-    "});
-
-    // test correct indent after newline after `do`
-    cx.set_state(indoc! {"
-        for file in *.txt; doˇ
-    "});
-    cx.update_editor(|editor, window, cx| {
-        editor.newline(&Newline, window, cx);
-    });
-    cx.run_until_parked();
-    cx.assert_editor_state(indoc! {"
-        for file in *.txt; do
-            ˇ
-    "});
-
-    // test correct indent after newline after case pattern
-    cx.set_state(indoc! {"
-        case \"$1\" in
-            start)ˇ
-    "});
-    cx.update_editor(|editor, window, cx| {
-        editor.newline(&Newline, window, cx);
-    });
-    cx.run_until_parked();
-    cx.assert_editor_state(indoc! {"
-        case \"$1\" in
-            start)
-                ˇ
-    "});
-
-    // test correct indent after newline after case pattern
-    cx.set_state(indoc! {"
-        case \"$1\" in
-            start)
-                ;;
-            *)ˇ
-    "});
-    cx.update_editor(|editor, window, cx| {
-        editor.newline(&Newline, window, cx);
-    });
-    cx.run_until_parked();
-    cx.assert_editor_state(indoc! {"
-        case \"$1\" in
-            start)
-                ;;
-            *)
-                ˇ
-    "});
-
-    // test correct indent after newline after function opening brace
-    cx.set_state(indoc! {"
-        function test() {ˇ}
-    "});
-    cx.update_editor(|editor, window, cx| {
-        editor.newline(&Newline, window, cx);
-    });
-    cx.run_until_parked();
-    cx.assert_editor_state(indoc! {"
-        function test() {
-            ˇ
-        }
-    "});
-
-    // test no extra indent after semicolon on same line
-    cx.set_state(indoc! {"
-        echo \"test\";ˇ
-    "});
-    cx.update_editor(|editor, window, cx| {
-        editor.newline(&Newline, window, cx);
-    });
-    cx.run_until_parked();
-    cx.assert_editor_state(indoc! {"
-        echo \"test\";
-        ˇ
-    "});
-}
-
-fn empty_range(row: usize, column: usize) -> Range<DisplayPoint> {
-    let point = DisplayPoint::new(DisplayRow(row as u32), column as u32);
-    point..point
-}
-
-#[track_caller]
-fn assert_selection_ranges(marked_text: &str, editor: &mut Editor, cx: &mut Context<Editor>) {
-    let (text, ranges) = marked_text_ranges(marked_text, true);
-    assert_eq!(editor.text(cx), text);
-    assert_eq!(
-        editor.selections.ranges(&editor.display_snapshot(cx)),
-        ranges
-            .iter()
-            .map(|range| MultiBufferOffset(range.start)..MultiBufferOffset(range.end))
-            .collect::<Vec<_>>(),
-        "Assert selections are {}",
-        marked_text
-    );
-}
-
-pub fn handle_signature_help_request(
-    cx: &mut EditorLspTestContext,
-    mocked_response: lsp::SignatureHelp,
-) -> impl Future<Output = ()> + use<> {
-    let mut request =
-        cx.set_request_handler::<lsp::request::SignatureHelpRequest, _, _>(move |_, _, _| {
-            let mocked_response = mocked_response.clone();
-            async move { Ok(Some(mocked_response)) }
-        });
-
-    async move {
-        request.next().await;
-    }
-}
-
-#[track_caller]
-pub fn check_displayed_completions(expected: Vec<&'static str>, cx: &mut EditorLspTestContext) {
-    cx.update_editor(|editor, _, _| {
-        if let Some(CodeContextMenu::Completions(menu)) = editor.context_menu.borrow().as_ref() {
-            let entries = menu.entries.borrow();
-            let entries = entries
-                .iter()
-                .map(|entry| entry.string.as_str())
-                .collect::<Vec<_>>();
-            assert_eq!(entries, expected);
-        } else {
-            panic!("Expected completions menu");
-        }
-    });
-}
-
-#[gpui::test]
-async fn test_mixed_completions_with_multi_word_snippet(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    let mut cx = EditorLspTestContext::new_rust(
-        lsp::ServerCapabilities {
-            completion_provider: Some(lsp::CompletionOptions {
-                ..Default::default()
-            }),
-            ..Default::default()
-        },
-        cx,
-    )
-    .await;
-    cx.lsp
-        .set_request_handler::<lsp::request::Completion, _, _>(move |_, _| async move {
-            Ok(Some(lsp::CompletionResponse::Array(vec![
-                lsp::CompletionItem {
-                    label: "unsafe".into(),
-                    text_edit: Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
-                        range: lsp::Range {
-                            start: lsp::Position {
-                                line: 0,
-                                character: 9,
-                            },
-                            end: lsp::Position {
-                                line: 0,
-                                character: 11,
-                            },
-                        },
-                        new_text: "unsafe".to_string(),
-                    })),
-                    insert_text_mode: Some(lsp::InsertTextMode::AS_IS),
-                    ..Default::default()
-                },
-            ])))
-        });
-
-    cx.update_editor(|editor, _, cx| {
-        editor.project().unwrap().update(cx, |project, cx| {
-            project.snippets().update(cx, |snippets, _cx| {
-                snippets.add_snippet_for_test(
-                    None,
-                    PathBuf::from("test_snippets.json"),
-                    vec![
-                        Arc::new(project::snippet_provider::Snippet {
-                            prefix: vec![
-                                "unlimited word count".to_string(),
-                                "unlimit word count".to_string(),
-                                "unlimited unknown".to_string(),
-                            ],
-                            body: "this is many words".to_string(),
-                            description: Some("description".to_string()),
-                            name: "multi-word snippet test".to_string(),
-                        }),
-                        Arc::new(project::snippet_provider::Snippet {
-                            prefix: vec!["unsnip".to_string(), "@few".to_string()],
-                            body: "fewer words".to_string(),
-                            description: Some("alt description".to_string()),
-                            name: "other name".to_string(),
-                        }),
-                        Arc::new(project::snippet_provider::Snippet {
-                            prefix: vec!["ab aa".to_string()],
-                            body: "abcd".to_string(),
-                            description: None,
-                            name: "alphabet".to_string(),
-                        }),
-                    ],
-                );
-            });
-        })
-    });
-
-    let get_completions = |cx: &mut EditorLspTestContext| {
-        cx.update_editor(|editor, _, _| match &*editor.context_menu.borrow() {
-            Some(CodeContextMenu::Completions(context_menu)) => {
-                let entries = context_menu.entries.borrow();
-                entries
-                    .iter()
-                    .map(|entry| entry.string.clone())
-                    .collect_vec()
-            }
-            _ => vec![],
-        })
-    };
-
-    // snippets:
-    //  @foo
-    //  foo bar
-    //
-    // when typing:
-    //
-    // when typing:
-    //  - if I type a symbol "open the completions with snippets only"
-    //  - if I type a word character "open the completions menu" (if it had been open snippets only, clear it out)
-    //
-    // stuff we need:
-    //  - filtering logic change?
-    //  - remember how far back the completion started.
-
-    let test_cases: &[(&str, &[&str])] = &[
-        (
-            "un",
-            &[
-                "unsafe",
-                "unlimit word count",
-                "unlimited unknown",
-                "unlimited word count",
-                "unsnip",
-            ],
-        ),
-        (
-            "u ",
-            &[
-                "unlimit word count",
-                "unlimited unknown",
-                "unlimited word count",
-            ],
-        ),
-        ("u a", &["ab aa", "unsafe"]), // unsAfe
-        (
-            "u u",
-            &[
-                "unsafe",
-                "unlimit word count",
-                "unlimited unknown", // ranked highest among snippets
-                "unlimited word count",
-                "unsnip",
-            ],
-        ),
-        ("uw c", &["unlimit word count", "unlimited word count"]),
-        (
-            "u w",
-            &[
-                "unlimit word count",
-                "unlimited word count",
-                "unlimited unknown",
-            ],
-        ),
-        ("u w ", &["unlimit word count", "unlimited word count"]),
-        (
-            "u ",
-            &[
-                "unlimit word count",
-                "unlimited unknown",
-                "unlimited word count",
-            ],
-        ),
-        ("wor", &[]),
-        ("uf", &["unsafe"]),
-        ("af", &["unsafe"]),
-        ("afu", &[]),
-        (
-            "ue",
-            &["unsafe", "unlimited unknown", "unlimited word count"],
-        ),
-        ("@", &["@few"]),
-        ("@few", &["@few"]),
-        ("@ ", &[]),
-        ("a@", &["@few"]),
-        ("a@f", &["@few", "unsafe"]),
-        ("a@fw", &["@few"]),
-        ("a", &["ab aa", "unsafe"]),
-        ("aa", &["ab aa"]),
-        ("aaa", &["ab aa"]),
-        ("ab", &["ab aa"]),
-        ("ab ", &["ab aa"]),
-        ("ab a", &["ab aa", "unsafe"]),
-        ("ab ab", &["ab aa"]),
-        ("ab ab aa", &["ab aa"]),
-    ];
-
-    for &(input_to_simulate, expected_completions) in test_cases {
-        cx.set_state("fn a() { ˇ }\n");
-        for c in input_to_simulate.split("") {
-            cx.simulate_input(c);
-            cx.run_until_parked();
-        }
-        let expected_completions = expected_completions
-            .iter()
-            .map(|s| s.to_string())
-            .collect_vec();
-        assert_eq!(
-            get_completions(&mut cx),
-            expected_completions,
-            "< actual / expected >, input = {input_to_simulate:?}",
-        );
-    }
-}
-
-/// Handle completion request passing a marked string specifying where the completion
-/// should be triggered from using '|' character, what range should be replaced, and what completions
-/// should be returned using '<' and '>' to delimit the range.
-///
-/// Also see `handle_completion_request_with_insert_and_replace`.
-#[track_caller]
-pub fn handle_completion_request(
-    marked_string: &str,
-    completions: Vec<&'static str>,
-    is_incomplete: bool,
-    counter: Arc<AtomicUsize>,
-    cx: &mut EditorLspTestContext,
-) -> impl Future<Output = ()> {
-    let complete_from_marker: TextRangeMarker = '|'.into();
-    let replace_range_marker: TextRangeMarker = ('<', '>').into();
-    let (_, mut marked_ranges) = marked_text_ranges_by(
-        marked_string,
-        vec![complete_from_marker.clone(), replace_range_marker.clone()],
-    );
-
-    let complete_from_position = cx.to_lsp(MultiBufferOffset(
-        marked_ranges.remove(&complete_from_marker).unwrap()[0].start,
-    ));
-    let range = marked_ranges.remove(&replace_range_marker).unwrap()[0].clone();
-    let replace_range =
-        cx.to_lsp_range(MultiBufferOffset(range.start)..MultiBufferOffset(range.end));
-
-    let mut request =
-        cx.set_request_handler::<lsp::request::Completion, _, _>(move |url, params, _| {
-            let completions = completions.clone();
-            counter.fetch_add(1, atomic::Ordering::Release);
-            async move {
-                assert_eq!(params.text_document_position.text_document.uri, url.clone());
-                assert_eq!(
-                    params.text_document_position.position,
-                    complete_from_position
-                );
-                Ok(Some(lsp::CompletionResponse::List(lsp::CompletionList {
-                    is_incomplete,
-                    item_defaults: None,
-                    items: completions
-                        .iter()
-                        .map(|completion_text| lsp::CompletionItem {
-                            label: completion_text.to_string(),
-                            text_edit: Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
-                                range: replace_range,
-                                new_text: completion_text.to_string(),
-                            })),
-                            ..Default::default()
-                        })
-                        .collect(),
-                })))
-            }
-        });
-
-    async move {
-        request.next().await;
-    }
-}
-
-/// Similar to `handle_completion_request`, but a [`CompletionTextEdit::InsertAndReplace`] will be
-/// given instead, which also contains an `insert` range.
-///
-/// This function uses markers to define ranges:
-/// - `|` marks the cursor position
-/// - `<>` marks the replace range
-/// - `[]` marks the insert range (optional, defaults to `replace_range.start..cursor_pos`which is what Rust-Analyzer provides)
-pub fn handle_completion_request_with_insert_and_replace(
-    cx: &mut EditorLspTestContext,
-    marked_string: &str,
-    completions: Vec<(&'static str, &'static str)>, // (label, new_text)
-    counter: Arc<AtomicUsize>,
-) -> impl Future<Output = ()> {
-    let complete_from_marker: TextRangeMarker = '|'.into();
-    let replace_range_marker: TextRangeMarker = ('<', '>').into();
-    let insert_range_marker: TextRangeMarker = ('{', '}').into();
-
-    let (_, mut marked_ranges) = marked_text_ranges_by(
-        marked_string,
-        vec![
-            complete_from_marker.clone(),
-            replace_range_marker.clone(),
-            insert_range_marker.clone(),
-        ],
-    );
-
-    let complete_from_position = cx.to_lsp(MultiBufferOffset(
-        marked_ranges.remove(&complete_from_marker).unwrap()[0].start,
-    ));
-    let range = marked_ranges.remove(&replace_range_marker).unwrap()[0].clone();
-    let replace_range =
-        cx.to_lsp_range(MultiBufferOffset(range.start)..MultiBufferOffset(range.end));
-
-    let insert_range = match marked_ranges.remove(&insert_range_marker) {
-        Some(ranges) if !ranges.is_empty() => {
-            let range1 = ranges[0].clone();
-            cx.to_lsp_range(MultiBufferOffset(range1.start)..MultiBufferOffset(range1.end))
-        }
-        _ => lsp::Range {
-            start: replace_range.start,
-            end: complete_from_position,
-        },
-    };
-
-    let mut request =
-        cx.set_request_handler::<lsp::request::Completion, _, _>(move |url, params, _| {
-            let completions = completions.clone();
-            counter.fetch_add(1, atomic::Ordering::Release);
-            async move {
-                assert_eq!(params.text_document_position.text_document.uri, url.clone());
-                assert_eq!(
-                    params.text_document_position.position, complete_from_position,
-                    "marker `|` position doesn't match",
-                );
-                Ok(Some(lsp::CompletionResponse::Array(
-                    completions
-                        .iter()
-                        .map(|(label, new_text)| lsp::CompletionItem {
-                            label: label.to_string(),
-                            text_edit: Some(lsp::CompletionTextEdit::InsertAndReplace(
-                                lsp::InsertReplaceEdit {
-                                    insert: insert_range,
-                                    replace: replace_range,
-                                    new_text: new_text.to_string(),
-                                },
-                            )),
-                            ..Default::default()
-                        })
-                        .collect(),
-                )))
-            }
-        });
-
-    async move {
-        request.next().await;
-    }
-}
-
-fn handle_resolve_completion_request(
-    cx: &mut EditorLspTestContext,
-    edits: Option<Vec<(&'static str, &'static str)>>,
-) -> impl Future<Output = ()> {
-    let edits = edits.map(|edits| {
-        edits
-            .iter()
-            .map(|(marked_string, new_text)| {
-                let (_, marked_ranges) = marked_text_ranges(marked_string, false);
-                let replace_range = cx.to_lsp_range(
-                    MultiBufferOffset(marked_ranges[0].start)
-                        ..MultiBufferOffset(marked_ranges[0].end),
-                );
-                lsp::TextEdit::new(replace_range, new_text.to_string())
-            })
-            .collect::<Vec<_>>()
-    });
-
-    let mut request =
-        cx.set_request_handler::<lsp::request::ResolveCompletionItem, _, _>(move |_, _, _| {
-            let edits = edits.clone();
-            async move {
-                Ok(lsp::CompletionItem {
-                    additional_text_edits: edits,
-                    ..Default::default()
-                })
-            }
-        });
-
-    async move {
-        request.next().await;
-    }
-}
-
-pub(crate) fn update_test_language_settings(
-    cx: &mut TestAppContext,
-    f: impl Fn(&mut AllLanguageSettingsContent),
-) {
-    cx.update(|cx| {
-        SettingsStore::update_global(cx, |store, cx| {
-            store.update_user_settings(cx, |settings| f(&mut settings.project.all_languages));
-        });
-    });
-}
-
-pub(crate) fn update_test_project_settings(
-    cx: &mut TestAppContext,
-    f: impl Fn(&mut ProjectSettingsContent),
-) {
-    cx.update(|cx| {
-        SettingsStore::update_global(cx, |store, cx| {
-            store.update_user_settings(cx, |settings| f(&mut settings.project));
-        });
-    });
-}
-
-pub(crate) fn update_test_editor_settings(
-    cx: &mut TestAppContext,
-    f: impl Fn(&mut EditorSettingsContent),
-) {
-    cx.update(|cx| {
-        SettingsStore::update_global(cx, |store, cx| {
-            store.update_user_settings(cx, |settings| f(&mut settings.editor));
-        })
-    })
-}
-
-pub(crate) fn init_test(cx: &mut TestAppContext, f: fn(&mut AllLanguageSettingsContent)) {
-    cx.update(|cx| {
-        assets::Assets.load_test_fonts(cx);
-        let store = SettingsStore::test(cx);
-        cx.set_global(store);
-        theme::init(theme::LoadThemes::JustBase, cx);
-        release_channel::init(semver::Version::new(0, 0, 0), cx);
-        crate::init(cx);
-    });
-    zlog::init_test();
-    update_test_language_settings(cx, f);
-}
-
-#[track_caller]
-fn assert_hunk_revert(
-    not_reverted_text_with_selections: &str,
-    expected_hunk_statuses_before: Vec<DiffHunkStatusKind>,
-    expected_reverted_text_with_selections: &str,
-    base_text: &str,
-    cx: &mut EditorLspTestContext,
-) {
-    cx.set_state(not_reverted_text_with_selections);
-    cx.set_head_text(base_text);
-    cx.executor().run_until_parked();
-
-    let actual_hunk_statuses_before = cx.update_editor(|editor, window, cx| {
-        let snapshot = editor.snapshot(window, cx);
-        let reverted_hunk_statuses = snapshot
-            .buffer_snapshot()
-            .diff_hunks_in_range(MultiBufferOffset(0)..snapshot.buffer_snapshot().len())
-            .map(|hunk| hunk.status().kind)
-            .collect::<Vec<_>>();
-
-        editor.git_restore(&Default::default(), window, cx);
-        reverted_hunk_statuses
-    });
-    cx.executor().run_until_parked();
-    cx.assert_editor_state(expected_reverted_text_with_selections);
-    assert_eq!(actual_hunk_statuses_before, expected_hunk_statuses_before);
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_pulling_diagnostics(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let diagnostic_requests = Arc::new(AtomicUsize::new(0));
-    let counter = diagnostic_requests.clone();
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/a"),
-        json!({
-            "first.rs": "fn main() { let a = 5; }",
-            "second.rs": "// Test file",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-    language_registry.add(rust_lang());
-    let mut fake_servers = language_registry.register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            capabilities: lsp::ServerCapabilities {
-                diagnostic_provider: Some(lsp::DiagnosticServerCapabilities::Options(
-                    lsp::DiagnosticOptions {
-                        identifier: None,
-                        inter_file_dependencies: true,
-                        workspace_diagnostics: true,
-                        work_done_progress_options: Default::default(),
-                    },
-                )),
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-    );
-
-    let editor = workspace
-        .update(cx, |workspace, window, cx| {
-            workspace.open_abs_path(
-                PathBuf::from(path!("/a/first.rs")),
-                OpenOptions::default(),
-                window,
-                cx,
-            )
-        })
-        .unwrap()
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-    let fake_server = fake_servers.next().await.unwrap();
-    let server_id = fake_server.server.server_id();
-    let mut first_request = fake_server
-        .set_request_handler::<lsp::request::DocumentDiagnosticRequest, _, _>(move |params, _| {
-            let new_result_id = counter.fetch_add(1, atomic::Ordering::Release) + 1;
-            let result_id = Some(new_result_id.to_string());
-            assert_eq!(
-                params.text_document.uri,
-                lsp::Uri::from_file_path(path!("/a/first.rs")).unwrap()
-            );
-            async move {
-                Ok(lsp::DocumentDiagnosticReportResult::Report(
-                    lsp::DocumentDiagnosticReport::Full(lsp::RelatedFullDocumentDiagnosticReport {
-                        related_documents: None,
-                        full_document_diagnostic_report: lsp::FullDocumentDiagnosticReport {
-                            items: Vec::new(),
-                            result_id,
-                        },
-                    }),
-                ))
-            }
-        });
-
-    let ensure_result_id = |expected: Option<SharedString>, cx: &mut TestAppContext| {
-        project.update(cx, |project, cx| {
-            let buffer_id = editor
-                .read(cx)
-                .buffer()
-                .read(cx)
-                .as_singleton()
-                .expect("created a singleton buffer")
-                .read(cx)
-                .remote_id();
-            let buffer_result_id = project
-                .lsp_store()
-                .read(cx)
-                .result_id_for_buffer_pull(server_id, buffer_id, &None, cx);
-            assert_eq!(expected, buffer_result_id);
-        });
-    };
-
-    ensure_result_id(None, cx);
-    cx.executor().advance_clock(Duration::from_millis(60));
-    cx.executor().run_until_parked();
-    assert_eq!(
-        diagnostic_requests.load(atomic::Ordering::Acquire),
-        1,
-        "Opening file should trigger diagnostic request"
-    );
-    first_request
-        .next()
-        .await
-        .expect("should have sent the first diagnostics pull request");
-    ensure_result_id(Some(SharedString::new("1")), cx);
-
-    // Editing should trigger diagnostics
-    editor.update_in(cx, |editor, window, cx| {
-        editor.handle_input("2", window, cx)
-    });
-    cx.executor().advance_clock(Duration::from_millis(60));
-    cx.executor().run_until_parked();
-    assert_eq!(
-        diagnostic_requests.load(atomic::Ordering::Acquire),
-        2,
-        "Editing should trigger diagnostic request"
-    );
-    ensure_result_id(Some(SharedString::new("2")), cx);
-
-    // Moving cursor should not trigger diagnostic request
-    editor.update_in(cx, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([Point::new(0, 0)..Point::new(0, 0)])
-        });
-    });
-    cx.executor().advance_clock(Duration::from_millis(60));
-    cx.executor().run_until_parked();
-    assert_eq!(
-        diagnostic_requests.load(atomic::Ordering::Acquire),
-        2,
-        "Cursor movement should not trigger diagnostic request"
-    );
-    ensure_result_id(Some(SharedString::new("2")), cx);
-    // Multiple rapid edits should be debounced
-    for _ in 0..5 {
-        editor.update_in(cx, |editor, window, cx| {
-            editor.handle_input("x", window, cx)
-        });
-    }
-    cx.executor().advance_clock(Duration::from_millis(60));
-    cx.executor().run_until_parked();
-
-    let final_requests = diagnostic_requests.load(atomic::Ordering::Acquire);
-    assert!(
-        final_requests <= 4,
-        "Multiple rapid edits should be debounced (got {final_requests} requests)",
-    );
-    ensure_result_id(Some(SharedString::new(final_requests.to_string())), cx);
-}
-
-#[gpui::test]
-async fn test_add_selection_after_moving_with_multiple_cursors(cx: &mut TestAppContext) {
-    // Regression test for issue #11671
-    // Previously, adding a cursor after moving multiple cursors would reset
-    // the cursor count instead of adding to the existing cursors.
-    init_test(cx, |_| {});
-    let mut cx = EditorTestContext::new(cx).await;
-
-    // Create a simple buffer with cursor at start
-    cx.set_state(indoc! {"
-        ˇaaaa
-        bbbb
-        cccc
-        dddd
-        eeee
-        ffff
-        gggg
-        hhhh"});
-
-    // Add 2 cursors below (so we have 3 total)
-    cx.update_editor(|editor, window, cx| {
-        editor.add_selection_below(&Default::default(), window, cx);
-        editor.add_selection_below(&Default::default(), window, cx);
-    });
-
-    // Verify we have 3 cursors
-    let initial_count = cx.update_editor(|editor, _, _| editor.selections.count());
-    assert_eq!(
-        initial_count, 3,
-        "Should have 3 cursors after adding 2 below"
-    );
-
-    // Move down one line
-    cx.update_editor(|editor, window, cx| {
-        editor.move_down(&MoveDown, window, cx);
-    });
-
-    // Add another cursor below
-    cx.update_editor(|editor, window, cx| {
-        editor.add_selection_below(&Default::default(), window, cx);
-    });
-
-    // Should now have 4 cursors (3 original + 1 new)
-    let final_count = cx.update_editor(|editor, _, _| editor.selections.count());
-    assert_eq!(
-        final_count, 4,
-        "Should have 4 cursors after moving and adding another"
-    );
-}
-
-#[gpui::test]
-async fn test_add_selection_skip_soft_wrap_option(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    cx.set_state(indoc!(
-        r#"ˇThis is a very long line that will be wrapped when soft wrapping is enabled
-           Second line here"#
-    ));
-
-    cx.update_editor(|editor, window, cx| {
-        // Enable soft wrapping with a narrow width to force soft wrapping and
-        // confirm that more than 2 rows are being displayed.
-        editor.set_wrap_width(Some(100.0.into()), cx);
-        assert!(editor.display_text(cx).lines().count() > 2);
-
-        editor.add_selection_below(
-            &AddSelectionBelow {
-                skip_soft_wrap: true,
-            },
-            window,
-            cx,
-        );
-
-        assert_eq!(
-            display_ranges(editor, cx),
-            &[
-                DisplayPoint::new(DisplayRow(0), 0)..DisplayPoint::new(DisplayRow(0), 0),
-                DisplayPoint::new(DisplayRow(8), 0)..DisplayPoint::new(DisplayRow(8), 0),
-            ]
-        );
-
-        editor.add_selection_above(
-            &AddSelectionAbove {
-                skip_soft_wrap: true,
-            },
-            window,
-            cx,
-        );
-
-        assert_eq!(
-            display_ranges(editor, cx),
-            &[DisplayPoint::new(DisplayRow(0), 0)..DisplayPoint::new(DisplayRow(0), 0)]
-        );
-
-        editor.add_selection_below(
-            &AddSelectionBelow {
-                skip_soft_wrap: false,
-            },
-            window,
-            cx,
-        );
-
-        assert_eq!(
-            display_ranges(editor, cx),
-            &[
-                DisplayPoint::new(DisplayRow(0), 0)..DisplayPoint::new(DisplayRow(0), 0),
-                DisplayPoint::new(DisplayRow(1), 0)..DisplayPoint::new(DisplayRow(1), 0),
-            ]
-        );
-
-        editor.add_selection_above(
-            &AddSelectionAbove {
-                skip_soft_wrap: false,
-            },
-            window,
-            cx,
-        );
-
-        assert_eq!(
-            display_ranges(editor, cx),
-            &[DisplayPoint::new(DisplayRow(0), 0)..DisplayPoint::new(DisplayRow(0), 0)]
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_insert_snippet(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    let mut cx = EditorTestContext::new(cx).await;
-
-    cx.update_editor(|editor, _, cx| {
-        editor.project().unwrap().update(cx, |project, cx| {
-            project.snippets().update(cx, |snippets, _cx| {
-                let snippet = project::snippet_provider::Snippet {
-                    prefix: vec![], // no prefix needed!
-                    body: "an Unspecified".to_string(),
-                    description: Some("shhhh it's a secret".to_string()),
-                    name: "super secret snippet".to_string(),
-                };
-                snippets.add_snippet_for_test(
-                    None,
-                    PathBuf::from("test_snippets.json"),
-                    vec![Arc::new(snippet)],
-                );
-
-                let snippet = project::snippet_provider::Snippet {
-                    prefix: vec![], // no prefix needed!
-                    body: " Location".to_string(),
-                    description: Some("the word 'location'".to_string()),
-                    name: "location word".to_string(),
-                };
-                snippets.add_snippet_for_test(
-                    Some("Markdown".to_string()),
-                    PathBuf::from("test_snippets.json"),
-                    vec![Arc::new(snippet)],
-                );
-            });
-        })
-    });
-
-    cx.set_state(indoc!(r#"First cursor at ˇ and second cursor at ˇ"#));
-
-    cx.update_editor(|editor, window, cx| {
-        editor.insert_snippet_at_selections(
-            &InsertSnippet {
-                language: None,
-                name: Some("super secret snippet".to_string()),
-                snippet: None,
-            },
-            window,
-            cx,
-        );
-
-        // Language is specified in the action,
-        // so the buffer language does not need to match
-        editor.insert_snippet_at_selections(
-            &InsertSnippet {
-                language: Some("Markdown".to_string()),
-                name: Some("location word".to_string()),
-                snippet: None,
-            },
-            window,
-            cx,
-        );
-
-        editor.insert_snippet_at_selections(
-            &InsertSnippet {
-                language: None,
-                name: None,
-                snippet: Some("$0 after".to_string()),
-            },
-            window,
-            cx,
-        );
-    });
-
-    cx.assert_editor_state(
-        r#"First cursor at an Unspecified Locationˇ after and second cursor at an Unspecified Locationˇ after"#,
-    );
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_document_colors(cx: &mut TestAppContext) {
-    let expected_color = Rgba {
-        r: 0.33,
-        g: 0.33,
-        b: 0.33,
-        a: 0.33,
-    };
-
-    init_test(cx, |_| {});
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/a"),
-        json!({
-            "first.rs": "fn main() { let a = 5; }",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-    language_registry.add(rust_lang());
-    let mut fake_servers = language_registry.register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            capabilities: lsp::ServerCapabilities {
-                color_provider: Some(lsp::ColorProviderCapability::Simple(true)),
-                ..lsp::ServerCapabilities::default()
-            },
-            name: "rust-analyzer",
-            ..FakeLspAdapter::default()
-        },
-    );
-    let mut fake_servers_without_capabilities = language_registry.register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            capabilities: lsp::ServerCapabilities {
-                color_provider: Some(lsp::ColorProviderCapability::Simple(false)),
-                ..lsp::ServerCapabilities::default()
-            },
-            name: "not-rust-analyzer",
-            ..FakeLspAdapter::default()
-        },
-    );
-
-    let editor = workspace
-        .update(cx, |workspace, window, cx| {
-            workspace.open_abs_path(
-                PathBuf::from(path!("/a/first.rs")),
-                OpenOptions::default(),
-                window,
-                cx,
-            )
-        })
-        .unwrap()
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-    let fake_language_server = fake_servers.next().await.unwrap();
-    let fake_language_server_without_capabilities =
-        fake_servers_without_capabilities.next().await.unwrap();
-    let requests_made = Arc::new(AtomicUsize::new(0));
-    let closure_requests_made = Arc::clone(&requests_made);
-    let mut color_request_handle = fake_language_server
-        .set_request_handler::<lsp::request::DocumentColor, _, _>(move |params, _| {
-            let requests_made = Arc::clone(&closure_requests_made);
-            async move {
-                assert_eq!(
-                    params.text_document.uri,
-                    lsp::Uri::from_file_path(path!("/a/first.rs")).unwrap()
-                );
-                requests_made.fetch_add(1, atomic::Ordering::Release);
-                Ok(vec![
-                    lsp::ColorInformation {
-                        range: lsp::Range {
-                            start: lsp::Position {
-                                line: 0,
-                                character: 0,
-                            },
-                            end: lsp::Position {
-                                line: 0,
-                                character: 1,
-                            },
-                        },
-                        color: lsp::Color {
-                            red: 0.33,
-                            green: 0.33,
-                            blue: 0.33,
-                            alpha: 0.33,
-                        },
-                    },
-                    lsp::ColorInformation {
-                        range: lsp::Range {
-                            start: lsp::Position {
-                                line: 0,
-                                character: 0,
-                            },
-                            end: lsp::Position {
-                                line: 0,
-                                character: 1,
-                            },
-                        },
-                        color: lsp::Color {
-                            red: 0.33,
-                            green: 0.33,
-                            blue: 0.33,
-                            alpha: 0.33,
-                        },
-                    },
-                ])
-            }
-        });
-
-    let _handle = fake_language_server_without_capabilities
-        .set_request_handler::<lsp::request::DocumentColor, _, _>(move |_, _| async move {
-            panic!("Should not be called");
-        });
-    cx.executor().advance_clock(FETCH_COLORS_DEBOUNCE_TIMEOUT);
-    color_request_handle.next().await.unwrap();
-    cx.run_until_parked();
-    assert_eq!(
-        1,
-        requests_made.load(atomic::Ordering::Acquire),
-        "Should query for colors once per editor open"
-    );
-    editor.update_in(cx, |editor, _, cx| {
-        assert_eq!(
-            vec![expected_color],
-            extract_color_inlays(editor, cx),
-            "Should have an initial inlay"
-        );
-    });
-
-    // opening another file in a split should not influence the LSP query counter
-    workspace
-        .update(cx, |workspace, window, cx| {
-            assert_eq!(
-                workspace.panes().len(),
-                1,
-                "Should have one pane with one editor"
-            );
-            workspace.move_item_to_pane_in_direction(
-                &MoveItemToPaneInDirection {
-                    direction: SplitDirection::Right,
-                    focus: false,
-                    clone: true,
-                },
-                window,
-                cx,
-            );
-        })
-        .unwrap();
-    cx.run_until_parked();
-    workspace
-        .update(cx, |workspace, _, cx| {
-            let panes = workspace.panes();
-            assert_eq!(panes.len(), 2, "Should have two panes after splitting");
-            for pane in panes {
-                let editor = pane
-                    .read(cx)
-                    .active_item()
-                    .and_then(|item| item.downcast::<Editor>())
-                    .expect("Should have opened an editor in each split");
-                let editor_file = editor
-                    .read(cx)
-                    .buffer()
-                    .read(cx)
-                    .as_singleton()
-                    .expect("test deals with singleton buffers")
-                    .read(cx)
-                    .file()
-                    .expect("test buffese should have a file")
-                    .path();
-                assert_eq!(
-                    editor_file.as_ref(),
-                    rel_path("first.rs"),
-                    "Both editors should be opened for the same file"
-                )
-            }
-        })
-        .unwrap();
-
-    cx.executor().advance_clock(Duration::from_millis(500));
-    let save = editor.update_in(cx, |editor, window, cx| {
-        editor.move_to_end(&MoveToEnd, window, cx);
-        editor.handle_input("dirty", window, cx);
-        editor.save(
-            SaveOptions {
-                format: true,
-                autosave: true,
-            },
-            project.clone(),
-            window,
-            cx,
-        )
-    });
-    save.await.unwrap();
-
-    color_request_handle.next().await.unwrap();
-    cx.run_until_parked();
-    assert_eq!(
-        2,
-        requests_made.load(atomic::Ordering::Acquire),
-        "Should query for colors once per save (deduplicated) and once per formatting after save"
-    );
-
-    drop(editor);
-    let close = workspace
-        .update(cx, |workspace, window, cx| {
-            workspace.active_pane().update(cx, |pane, cx| {
-                pane.close_active_item(&CloseActiveItem::default(), window, cx)
-            })
-        })
-        .unwrap();
-    close.await.unwrap();
-    let close = workspace
-        .update(cx, |workspace, window, cx| {
-            workspace.active_pane().update(cx, |pane, cx| {
-                pane.close_active_item(&CloseActiveItem::default(), window, cx)
-            })
-        })
-        .unwrap();
-    close.await.unwrap();
-    assert_eq!(
-        2,
-        requests_made.load(atomic::Ordering::Acquire),
-        "After saving and closing all editors, no extra requests should be made"
-    );
-    workspace
-        .update(cx, |workspace, _, cx| {
-            assert!(
-                workspace.active_item(cx).is_none(),
-                "Should close all editors"
-            )
-        })
-        .unwrap();
-
-    workspace
-        .update(cx, |workspace, window, cx| {
-            workspace.active_pane().update(cx, |pane, cx| {
-                pane.navigate_backward(&workspace::GoBack, window, cx);
-            })
-        })
-        .unwrap();
-    cx.executor().advance_clock(FETCH_COLORS_DEBOUNCE_TIMEOUT);
-    cx.run_until_parked();
-    let editor = workspace
-        .update(cx, |workspace, _, cx| {
-            workspace
-                .active_item(cx)
-                .expect("Should have reopened the editor again after navigating back")
-                .downcast::<Editor>()
-                .expect("Should be an editor")
-        })
-        .unwrap();
-
-    assert_eq!(
-        2,
-        requests_made.load(atomic::Ordering::Acquire),
-        "Cache should be reused on buffer close and reopen"
-    );
-    editor.update(cx, |editor, cx| {
-        assert_eq!(
-            vec![expected_color],
-            extract_color_inlays(editor, cx),
-            "Should have an initial inlay"
-        );
-    });
-
-    drop(color_request_handle);
-    let closure_requests_made = Arc::clone(&requests_made);
-    let mut empty_color_request_handle = fake_language_server
-        .set_request_handler::<lsp::request::DocumentColor, _, _>(move |params, _| {
-            let requests_made = Arc::clone(&closure_requests_made);
-            async move {
-                assert_eq!(
-                    params.text_document.uri,
-                    lsp::Uri::from_file_path(path!("/a/first.rs")).unwrap()
-                );
-                requests_made.fetch_add(1, atomic::Ordering::Release);
-                Ok(Vec::new())
-            }
-        });
-    let save = editor.update_in(cx, |editor, window, cx| {
-        editor.move_to_end(&MoveToEnd, window, cx);
-        editor.handle_input("dirty_again", window, cx);
-        editor.save(
-            SaveOptions {
-                format: false,
-                autosave: true,
-            },
-            project.clone(),
-            window,
-            cx,
-        )
-    });
-    save.await.unwrap();
-
-    cx.executor().advance_clock(FETCH_COLORS_DEBOUNCE_TIMEOUT);
-    empty_color_request_handle.next().await.unwrap();
-    cx.run_until_parked();
-    assert_eq!(
-        3,
-        requests_made.load(atomic::Ordering::Acquire),
-        "Should query for colors once per save only, as formatting was not requested"
-    );
-    editor.update(cx, |editor, cx| {
-        assert_eq!(
-            Vec::<Rgba>::new(),
-            extract_color_inlays(editor, cx),
-            "Should clear all colors when the server returns an empty response"
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_newline_replacement_in_single_line(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    let (editor, cx) = cx.add_window_view(Editor::single_line);
-    editor.update_in(cx, |editor, window, cx| {
-        editor.set_text("oops\n\nwow\n", window, cx)
-    });
-    cx.run_until_parked();
-    editor.update(cx, |editor, cx| {
-        assert_eq!(editor.display_text(cx), "oops⋯⋯wow⋯");
-    });
-    editor.update(cx, |editor, cx| {
-        editor.edit([(MultiBufferOffset(3)..MultiBufferOffset(5), "")], cx)
-    });
-    cx.run_until_parked();
-    editor.update(cx, |editor, cx| {
-        assert_eq!(editor.display_text(cx), "oop⋯wow⋯");
-    });
-}
-
-#[gpui::test]
-async fn test_non_utf_8_opens(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    cx.update(|cx| {
-        register_project_item::<Editor>(cx);
-    });
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree("/root1", json!({})).await;
-    fs.insert_file("/root1/one.pdf", vec![0xff, 0xfe, 0xfd])
-        .await;
-
-    let project = Project::test(fs, ["/root1".as_ref()], cx).await;
-    let (workspace, cx) =
-        cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-    let worktree_id = project.update(cx, |project, cx| {
-        project.worktrees(cx).next().unwrap().read(cx).id()
-    });
-
-    let handle = workspace
-        .update_in(cx, |workspace, window, cx| {
-            let project_path = (worktree_id, rel_path("one.pdf"));
-            workspace.open_path(project_path, None, true, window, cx)
-        })
-        .await
-        .unwrap();
-
-    assert_eq!(
-        handle.to_any_view().entity_type(),
-        TypeId::of::<InvalidItemView>()
-    );
-}
-
-#[gpui::test]
-async fn test_select_next_prev_syntax_node(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let language = Arc::new(Language::new(
-        LanguageConfig::default(),
-        Some(tree_sitter_rust::LANGUAGE.into()),
-    ));
-
-    // Test hierarchical sibling navigation
-    let text = r#"
-        fn outer() {
-            if condition {
-                let a = 1;
-            }
-            let b = 2;
-        }
-
-        fn another() {
-            let c = 3;
-        }
-    "#;
-
-    let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(language, cx));
-    let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-    let (editor, cx) = cx.add_window_view(|window, cx| build_editor(buffer, window, cx));
-
-    // Wait for parsing to complete
-    editor
-        .condition::<crate::EditorEvent>(cx, |editor, cx| !editor.buffer.read(cx).is_parsing(cx))
-        .await;
-
-    editor.update_in(cx, |editor, window, cx| {
-        // Start by selecting "let a = 1;" inside the if block
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_display_ranges([
-                DisplayPoint::new(DisplayRow(3), 16)..DisplayPoint::new(DisplayRow(3), 26)
-            ]);
-        });
-
-        let initial_selection = editor
-            .selections
-            .display_ranges(&editor.display_snapshot(cx));
-        assert_eq!(initial_selection.len(), 1, "Should have one selection");
-
-        // Test select next sibling - should move up levels to find the next sibling
-        // Since "let a = 1;" has no siblings in the if block, it should move up
-        // to find "let b = 2;" which is a sibling of the if block
-        editor.select_next_syntax_node(&SelectNextSyntaxNode, window, cx);
-        let next_selection = editor
-            .selections
-            .display_ranges(&editor.display_snapshot(cx));
-
-        // Should have a selection and it should be different from the initial
-        assert_eq!(
-            next_selection.len(),
-            1,
-            "Should have one selection after next"
-        );
-        assert_ne!(
-            next_selection[0], initial_selection[0],
-            "Next sibling selection should be different"
-        );
-
-        // Test hierarchical navigation by going to the end of the current function
-        // and trying to navigate to the next function
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_display_ranges([
-                DisplayPoint::new(DisplayRow(5), 12)..DisplayPoint::new(DisplayRow(5), 22)
-            ]);
-        });
-
-        editor.select_next_syntax_node(&SelectNextSyntaxNode, window, cx);
-        let function_next_selection = editor
-            .selections
-            .display_ranges(&editor.display_snapshot(cx));
-
-        // Should move to the next function
-        assert_eq!(
-            function_next_selection.len(),
-            1,
-            "Should have one selection after function next"
-        );
-
-        // Test select previous sibling navigation
-        editor.select_prev_syntax_node(&SelectPreviousSyntaxNode, window, cx);
-        let prev_selection = editor
-            .selections
-            .display_ranges(&editor.display_snapshot(cx));
-
-        // Should have a selection and it should be different
-        assert_eq!(
-            prev_selection.len(),
-            1,
-            "Should have one selection after prev"
-        );
-        assert_ne!(
-            prev_selection[0], function_next_selection[0],
-            "Previous sibling selection should be different from next"
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_next_prev_document_highlight(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-    cx.set_state(
-        "let ˇvariable = 42;
-let another = variable + 1;
-let result = variable * 2;",
-    );
-
-    // Set up document highlights manually (simulating LSP response)
-    cx.update_editor(|editor, _window, cx| {
-        let buffer_snapshot = editor.buffer().read(cx).snapshot(cx);
-
-        // Create highlights for "variable" occurrences
-        let highlight_ranges = [
-            Point::new(0, 4)..Point::new(0, 12),  // First "variable"
-            Point::new(1, 14)..Point::new(1, 22), // Second "variable"
-            Point::new(2, 13)..Point::new(2, 21), // Third "variable"
-        ];
-
-        let anchor_ranges: Vec<_> = highlight_ranges
-            .iter()
-            .map(|range| range.clone().to_anchors(&buffer_snapshot))
-            .collect();
-
-        editor.highlight_background::<DocumentHighlightRead>(
-            &anchor_ranges,
-            |_, theme| theme.colors().editor_document_highlight_read_background,
-            cx,
-        );
-    });
-
-    // Go to next highlight - should move to second "variable"
-    cx.update_editor(|editor, window, cx| {
-        editor.go_to_next_document_highlight(&GoToNextDocumentHighlight, window, cx);
-    });
-    cx.assert_editor_state(
-        "let variable = 42;
-let another = ˇvariable + 1;
-let result = variable * 2;",
-    );
-
-    // Go to next highlight - should move to third "variable"
-    cx.update_editor(|editor, window, cx| {
-        editor.go_to_next_document_highlight(&GoToNextDocumentHighlight, window, cx);
-    });
-    cx.assert_editor_state(
-        "let variable = 42;
-let another = variable + 1;
-let result = ˇvariable * 2;",
-    );
-
-    // Go to next highlight - should stay at third "variable" (no wrap-around)
-    cx.update_editor(|editor, window, cx| {
-        editor.go_to_next_document_highlight(&GoToNextDocumentHighlight, window, cx);
-    });
-    cx.assert_editor_state(
-        "let variable = 42;
-let another = variable + 1;
-let result = ˇvariable * 2;",
-    );
-
-    // Now test going backwards from third position
-    cx.update_editor(|editor, window, cx| {
-        editor.go_to_prev_document_highlight(&GoToPreviousDocumentHighlight, window, cx);
-    });
-    cx.assert_editor_state(
-        "let variable = 42;
-let another = ˇvariable + 1;
-let result = variable * 2;",
-    );
-
-    // Go to previous highlight - should move to first "variable"
-    cx.update_editor(|editor, window, cx| {
-        editor.go_to_prev_document_highlight(&GoToPreviousDocumentHighlight, window, cx);
-    });
-    cx.assert_editor_state(
-        "let ˇvariable = 42;
-let another = variable + 1;
-let result = variable * 2;",
-    );
-
-    // Go to previous highlight - should stay on first "variable"
-    cx.update_editor(|editor, window, cx| {
-        editor.go_to_prev_document_highlight(&GoToPreviousDocumentHighlight, window, cx);
-    });
-    cx.assert_editor_state(
-        "let ˇvariable = 42;
-let another = variable + 1;
-let result = variable * 2;",
-    );
-}
-
-#[gpui::test]
-async fn test_paste_url_from_other_app_creates_markdown_link_over_selected_text(
-    cx: &mut gpui::TestAppContext,
-) {
-    init_test(cx, |_| {});
-
-    let url = "https://zed.dev";
-
-    let markdown_language = Arc::new(Language::new(
-        LanguageConfig {
-            name: "Markdown".into(),
-            ..LanguageConfig::default()
-        },
-        None,
-    ));
-
-    let mut cx = EditorTestContext::new(cx).await;
-    cx.update_buffer(|buffer, cx| buffer.set_language(Some(markdown_language), cx));
-    cx.set_state("Hello, «editorˇ».\nZed is «ˇgreat» (see this link: ˇ)");
-
-    cx.update_editor(|editor, window, cx| {
-        cx.write_to_clipboard(ClipboardItem::new_string(url.to_string()));
-        editor.paste(&Paste, window, cx);
-    });
-
-    cx.assert_editor_state(&format!(
-        "Hello, [editor]({url})ˇ.\nZed is [great]({url})ˇ (see this link: {url}ˇ)"
-    ));
-}
-
-#[gpui::test]
-async fn test_markdown_indents(cx: &mut gpui::TestAppContext) {
-    init_test(cx, |_| {});
-
-    let markdown_language = languages::language("markdown", tree_sitter_md::LANGUAGE.into());
-    let mut cx = EditorTestContext::new(cx).await;
-
-    cx.update_buffer(|buffer, cx| buffer.set_language(Some(markdown_language), cx));
-
-    // Case 1: Test if adding a character with multi cursors preserves nested list indents
-    cx.set_state(&indoc! {"
-        - [ ] Item 1
-            - [ ] Item 1.a
-        - [ˇ] Item 2
-            - [ˇ] Item 2.a
-            - [ˇ] Item 2.b
-        "
-    });
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("x", window, cx);
-    });
-    cx.run_until_parked();
-    cx.assert_editor_state(indoc! {"
-        - [ ] Item 1
-            - [ ] Item 1.a
-        - [xˇ] Item 2
-            - [xˇ] Item 2.a
-            - [xˇ] Item 2.b
-        "
-    });
-
-    // Case 2: Test adding new line after nested list preserves indent of previous line
-    cx.set_state(&indoc! {"
-        - [ ] Item 1
-            - [ ] Item 1.a
-        - [x] Item 2
-            - [x] Item 2.a
-            - [x] Item 2.bˇ"
-    });
-    cx.update_editor(|editor, window, cx| {
-        editor.newline(&Newline, window, cx);
-    });
-    cx.assert_editor_state(indoc! {"
-        - [ ] Item 1
-            - [ ] Item 1.a
-        - [x] Item 2
-            - [x] Item 2.a
-            - [x] Item 2.b
-            ˇ"
-    });
-
-    // Case 3: Test adding a new nested list item preserves indent
-    cx.set_state(&indoc! {"
-        - [ ] Item 1
-            - [ ] Item 1.a
-        - [x] Item 2
-            - [x] Item 2.a
-            - [x] Item 2.b
-            ˇ"
-    });
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("-", window, cx);
-    });
-    cx.run_until_parked();
-    cx.assert_editor_state(indoc! {"
-        - [ ] Item 1
-            - [ ] Item 1.a
-        - [x] Item 2
-            - [x] Item 2.a
-            - [x] Item 2.b
-            -ˇ"
-    });
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input(" [x] Item 2.c", window, cx);
-    });
-    cx.run_until_parked();
-    cx.assert_editor_state(indoc! {"
-        - [ ] Item 1
-            - [ ] Item 1.a
-        - [x] Item 2
-            - [x] Item 2.a
-            - [x] Item 2.b
-            - [x] Item 2.cˇ"
-    });
-
-    // Case 4: Test adding new line after nested ordered list preserves indent of previous line
-    cx.set_state(indoc! {"
-        1. Item 1
-            1. Item 1.a
-        2. Item 2
-            1. Item 2.a
-            2. Item 2.bˇ"
-    });
-    cx.update_editor(|editor, window, cx| {
-        editor.newline(&Newline, window, cx);
-    });
-    cx.assert_editor_state(indoc! {"
-        1. Item 1
-            1. Item 1.a
-        2. Item 2
-            1. Item 2.a
-            2. Item 2.b
-            ˇ"
-    });
-
-    // Case 5: Adding new ordered list item preserves indent
-    cx.set_state(indoc! {"
-        1. Item 1
-            1. Item 1.a
-        2. Item 2
-            1. Item 2.a
-            2. Item 2.b
-            ˇ"
-    });
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("3", window, cx);
-    });
-    cx.run_until_parked();
-    cx.assert_editor_state(indoc! {"
-        1. Item 1
-            1. Item 1.a
-        2. Item 2
-            1. Item 2.a
-            2. Item 2.b
-            3ˇ"
-    });
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input(".", window, cx);
-    });
-    cx.run_until_parked();
-    cx.assert_editor_state(indoc! {"
-        1. Item 1
-            1. Item 1.a
-        2. Item 2
-            1. Item 2.a
-            2. Item 2.b
-            3.ˇ"
-    });
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input(" Item 2.c", window, cx);
-    });
-    cx.run_until_parked();
-    cx.assert_editor_state(indoc! {"
-        1. Item 1
-            1. Item 1.a
-        2. Item 2
-            1. Item 2.a
-            2. Item 2.b
-            3. Item 2.cˇ"
-    });
-
-    // Case 6: Test adding new line after nested ordered list preserves indent of previous line
-    cx.set_state(indoc! {"
-        - Item 1
-            - Item 1.a
-            - Item 1.a
-        ˇ"});
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("-", window, cx);
-    });
-    cx.run_until_parked();
-    cx.assert_editor_state(indoc! {"
-        - Item 1
-            - Item 1.a
-            - Item 1.a
-        -ˇ"});
-
-    // Case 7: Test blockquote newline preserves something
-    cx.set_state(indoc! {"
-        > Item 1ˇ"
-    });
-    cx.update_editor(|editor, window, cx| {
-        editor.newline(&Newline, window, cx);
-    });
-    cx.assert_editor_state(indoc! {"
-        > Item 1
-        ˇ"
-    });
-}
-
-#[gpui::test]
-async fn test_paste_url_from_zed_copy_creates_markdown_link_over_selected_text(
-    cx: &mut gpui::TestAppContext,
-) {
-    init_test(cx, |_| {});
-
-    let url = "https://zed.dev";
-
-    let markdown_language = Arc::new(Language::new(
-        LanguageConfig {
-            name: "Markdown".into(),
-            ..LanguageConfig::default()
-        },
-        None,
-    ));
-
-    let mut cx = EditorTestContext::new(cx).await;
-    cx.update_buffer(|buffer, cx| buffer.set_language(Some(markdown_language), cx));
-    cx.set_state(&format!(
-        "Hello, editor.\nZed is great (see this link: )\n«{url}ˇ»"
-    ));
-
-    cx.update_editor(|editor, window, cx| {
-        editor.copy(&Copy, window, cx);
-    });
-
-    cx.set_state(&format!(
-        "Hello, «editorˇ».\nZed is «ˇgreat» (see this link: ˇ)\n{url}"
-    ));
-
-    cx.update_editor(|editor, window, cx| {
-        editor.paste(&Paste, window, cx);
-    });
-
-    cx.assert_editor_state(&format!(
-        "Hello, [editor]({url})ˇ.\nZed is [great]({url})ˇ (see this link: {url}ˇ)\n{url}"
-    ));
-}
-
-#[gpui::test]
-async fn test_paste_url_from_other_app_replaces_existing_url_without_creating_markdown_link(
-    cx: &mut gpui::TestAppContext,
-) {
-    init_test(cx, |_| {});
-
-    let url = "https://zed.dev";
-
-    let markdown_language = Arc::new(Language::new(
-        LanguageConfig {
-            name: "Markdown".into(),
-            ..LanguageConfig::default()
-        },
-        None,
-    ));
-
-    let mut cx = EditorTestContext::new(cx).await;
-    cx.update_buffer(|buffer, cx| buffer.set_language(Some(markdown_language), cx));
-    cx.set_state("Please visit zed's homepage: «https://www.apple.comˇ»");
-
-    cx.update_editor(|editor, window, cx| {
-        cx.write_to_clipboard(ClipboardItem::new_string(url.to_string()));
-        editor.paste(&Paste, window, cx);
-    });
-
-    cx.assert_editor_state(&format!("Please visit zed's homepage: {url}ˇ"));
-}
-
-#[gpui::test]
-async fn test_paste_plain_text_from_other_app_replaces_selection_without_creating_markdown_link(
-    cx: &mut gpui::TestAppContext,
-) {
-    init_test(cx, |_| {});
-
-    let text = "Awesome";
-
-    let markdown_language = Arc::new(Language::new(
-        LanguageConfig {
-            name: "Markdown".into(),
-            ..LanguageConfig::default()
-        },
-        None,
-    ));
-
-    let mut cx = EditorTestContext::new(cx).await;
-    cx.update_buffer(|buffer, cx| buffer.set_language(Some(markdown_language), cx));
-    cx.set_state("Hello, «editorˇ».\nZed is «ˇgreat»");
-
-    cx.update_editor(|editor, window, cx| {
-        cx.write_to_clipboard(ClipboardItem::new_string(text.to_string()));
-        editor.paste(&Paste, window, cx);
-    });
-
-    cx.assert_editor_state(&format!("Hello, {text}ˇ.\nZed is {text}ˇ"));
-}
-
-#[gpui::test]
-async fn test_paste_url_from_other_app_without_creating_markdown_link_in_non_markdown_language(
-    cx: &mut gpui::TestAppContext,
-) {
-    init_test(cx, |_| {});
-
-    let url = "https://zed.dev";
-
-    let markdown_language = Arc::new(Language::new(
-        LanguageConfig {
-            name: "Rust".into(),
-            ..LanguageConfig::default()
-        },
-        None,
-    ));
-
-    let mut cx = EditorTestContext::new(cx).await;
-    cx.update_buffer(|buffer, cx| buffer.set_language(Some(markdown_language), cx));
-    cx.set_state("// Hello, «editorˇ».\n// Zed is «ˇgreat» (see this link: ˇ)");
-
-    cx.update_editor(|editor, window, cx| {
-        cx.write_to_clipboard(ClipboardItem::new_string(url.to_string()));
-        editor.paste(&Paste, window, cx);
-    });
-
-    cx.assert_editor_state(&format!(
-        "// Hello, {url}ˇ.\n// Zed is {url}ˇ (see this link: {url}ˇ)"
-    ));
-}
-
-#[gpui::test]
-async fn test_paste_url_from_other_app_creates_markdown_link_selectively_in_multi_buffer(
-    cx: &mut TestAppContext,
-) {
-    init_test(cx, |_| {});
-
-    let url = "https://zed.dev";
-
-    let markdown_language = Arc::new(Language::new(
-        LanguageConfig {
-            name: "Markdown".into(),
-            ..LanguageConfig::default()
-        },
-        None,
-    ));
-
-    let (editor, cx) = cx.add_window_view(|window, cx| {
-        let multi_buffer = MultiBuffer::build_multi(
-            [
-                ("this will embed -> link", vec![Point::row_range(0..1)]),
-                ("this will replace -> link", vec![Point::row_range(0..1)]),
-            ],
-            cx,
-        );
-        let mut editor = Editor::new(EditorMode::full(), multi_buffer.clone(), None, window, cx);
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges(vec![
-                Point::new(0, 19)..Point::new(0, 23),
-                Point::new(1, 21)..Point::new(1, 25),
-            ])
-        });
-        let first_buffer_id = multi_buffer
-            .read(cx)
-            .excerpt_buffer_ids()
-            .into_iter()
-            .next()
-            .unwrap();
-        let first_buffer = multi_buffer.read(cx).buffer(first_buffer_id).unwrap();
-        first_buffer.update(cx, |buffer, cx| {
-            buffer.set_language(Some(markdown_language.clone()), cx);
-        });
-
-        editor
-    });
-    let mut cx = EditorTestContext::for_editor_in(editor.clone(), cx).await;
-
-    cx.update_editor(|editor, window, cx| {
-        cx.write_to_clipboard(ClipboardItem::new_string(url.to_string()));
-        editor.paste(&Paste, window, cx);
-    });
-
-    cx.assert_editor_state(&format!(
-        "this will embed -> [link]({url})ˇ\nthis will replace -> {url}ˇ"
-    ));
-}
-
-#[gpui::test]
-async fn test_race_in_multibuffer_save(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/project"),
-        json!({
-            "first.rs": "# First Document\nSome content here.",
-            "second.rs": "Plain text content for second file.",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/project").as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-    let language = rust_lang();
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-    language_registry.add(language.clone());
-    let mut fake_servers = language_registry.register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            ..FakeLspAdapter::default()
-        },
-    );
-
-    let buffer1 = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer(PathBuf::from(path!("/project/first.rs")), cx)
-        })
-        .await
-        .unwrap();
-    let buffer2 = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer(PathBuf::from(path!("/project/second.rs")), cx)
-        })
-        .await
-        .unwrap();
-
-    let multi_buffer = cx.new(|cx| {
-        let mut multi_buffer = MultiBuffer::new(Capability::ReadWrite);
-        multi_buffer.set_excerpts_for_path(
-            PathKey::for_buffer(&buffer1, cx),
-            buffer1.clone(),
-            [Point::zero()..buffer1.read(cx).max_point()],
-            3,
-            cx,
-        );
-        multi_buffer.set_excerpts_for_path(
-            PathKey::for_buffer(&buffer2, cx),
-            buffer2.clone(),
-            [Point::zero()..buffer1.read(cx).max_point()],
-            3,
-            cx,
-        );
-        multi_buffer
-    });
-
-    let (editor, cx) = cx.add_window_view(|window, cx| {
-        Editor::new(
-            EditorMode::full(),
-            multi_buffer,
-            Some(project.clone()),
-            window,
-            cx,
-        )
-    });
-
-    let fake_language_server = fake_servers.next().await.unwrap();
-
-    buffer1.update(cx, |buffer, cx| buffer.edit([(0..0, "hello!")], None, cx));
-
-    let save = editor.update_in(cx, |editor, window, cx| {
-        assert!(editor.is_dirty(cx));
-
-        editor.save(
-            SaveOptions {
-                format: true,
-                autosave: true,
-            },
-            project,
-            window,
-            cx,
-        )
-    });
-    let (start_edit_tx, start_edit_rx) = oneshot::channel();
-    let (done_edit_tx, done_edit_rx) = oneshot::channel();
-    let mut done_edit_rx = Some(done_edit_rx);
-    let mut start_edit_tx = Some(start_edit_tx);
-
-    fake_language_server.set_request_handler::<lsp::request::Formatting, _, _>(move |_, _| {
-        start_edit_tx.take().unwrap().send(()).unwrap();
-        let done_edit_rx = done_edit_rx.take().unwrap();
-        async move {
-            done_edit_rx.await.unwrap();
-            Ok(None)
-        }
-    });
-
-    start_edit_rx.await.unwrap();
-    buffer2
-        .update(cx, |buffer, cx| buffer.edit([(0..0, "world!")], None, cx))
-        .unwrap();
-
-    done_edit_tx.send(()).unwrap();
-
-    save.await.unwrap();
-    cx.update(|_, cx| assert!(editor.is_dirty(cx)));
-}
-
-#[track_caller]
-fn extract_color_inlays(editor: &Editor, cx: &App) -> Vec<Rgba> {
-    editor
-        .all_inlays(cx)
-        .into_iter()
-        .filter_map(|inlay| inlay.get_color())
-        .map(Rgba::from)
-        .collect()
-}
-
-#[gpui::test]
-fn test_duplicate_line_up_on_last_line_without_newline(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let editor = cx.add_window(|window, cx| {
-        let buffer = MultiBuffer::build_simple("line1\nline2", cx);
-        build_editor(buffer, window, cx)
-    });
-
-    editor
-        .update(cx, |editor, window, cx| {
-            editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                s.select_display_ranges([
-                    DisplayPoint::new(DisplayRow(1), 0)..DisplayPoint::new(DisplayRow(1), 0)
-                ])
-            });
-
-            editor.duplicate_line_up(&DuplicateLineUp, window, cx);
-
-            assert_eq!(
-                editor.display_text(cx),
-                "line1\nline2\nline2",
-                "Duplicating last line upward should create duplicate above, not on same line"
-            );
-
-            assert_eq!(
-                editor
-                    .selections
-                    .display_ranges(&editor.display_snapshot(cx)),
-                vec![DisplayPoint::new(DisplayRow(0), 0)..DisplayPoint::new(DisplayRow(0), 0)],
-                "Selection should move to the duplicated line"
-            );
-        })
-        .unwrap();
-}
-
-#[gpui::test]
-async fn test_copy_line_without_trailing_newline(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    cx.set_state("line1\nline2ˇ");
-
-    cx.update_editor(|e, window, cx| e.copy(&Copy, window, cx));
-
-    let clipboard_text = cx
-        .read_from_clipboard()
-        .and_then(|item| item.text().as_deref().map(str::to_string));
-
-    assert_eq!(
-        clipboard_text,
-        Some("line2\n".to_string()),
-        "Copying a line without trailing newline should include a newline"
-    );
-
-    cx.set_state("line1\nˇ");
-
-    cx.update_editor(|e, window, cx| e.paste(&Paste, window, cx));
-
-    cx.assert_editor_state("line1\nline2\nˇ");
-}
-
-#[gpui::test]
-async fn test_multi_selection_copy_with_newline_between_copied_lines(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    cx.set_state("ˇline1\nˇline2\nˇline3\n");
-
-    cx.update_editor(|e, window, cx| e.copy(&Copy, window, cx));
-
-    let clipboard_text = cx
-        .read_from_clipboard()
-        .and_then(|item| item.text().as_deref().map(str::to_string));
-
-    assert_eq!(
-        clipboard_text,
-        Some("line1\nline2\nline3\n".to_string()),
-        "Copying multiple lines should include a single newline between lines"
-    );
-
-    cx.set_state("lineA\nˇ");
-
-    cx.update_editor(|e, window, cx| e.paste(&Paste, window, cx));
-
-    cx.assert_editor_state("lineA\nline1\nline2\nline3\nˇ");
-}
-
-#[gpui::test]
-async fn test_multi_selection_cut_with_newline_between_copied_lines(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    cx.set_state("ˇline1\nˇline2\nˇline3\n");
-
-    cx.update_editor(|e, window, cx| e.cut(&Cut, window, cx));
-
-    let clipboard_text = cx
-        .read_from_clipboard()
-        .and_then(|item| item.text().as_deref().map(str::to_string));
-
-    assert_eq!(
-        clipboard_text,
-        Some("line1\nline2\nline3\n".to_string()),
-        "Copying multiple lines should include a single newline between lines"
-    );
-
-    cx.set_state("lineA\nˇ");
-
-    cx.update_editor(|e, window, cx| e.paste(&Paste, window, cx));
-
-    cx.assert_editor_state("lineA\nline1\nline2\nline3\nˇ");
-}
-
-#[gpui::test]
-async fn test_end_of_editor_context(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorTestContext::new(cx).await;
-
-    cx.set_state("line1\nline2ˇ");
-    cx.update_editor(|e, window, cx| {
-        e.set_mode(EditorMode::SingleLine);
-        assert!(e.key_context(window, cx).contains("end_of_input"));
-    });
-    cx.set_state("ˇline1\nline2");
-    cx.update_editor(|e, window, cx| {
-        assert!(!e.key_context(window, cx).contains("end_of_input"));
-    });
-    cx.set_state("line1ˇ\nline2");
-    cx.update_editor(|e, window, cx| {
-        assert!(!e.key_context(window, cx).contains("end_of_input"));
-    });
-}
-
-#[gpui::test]
-async fn test_sticky_scroll(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    let mut cx = EditorTestContext::new(cx).await;
-
-    let buffer = indoc! {"
-            ˇfn foo() {
-                let abc = 123;
-            }
-            struct Bar;
-            impl Bar {
-                fn new() -> Self {
-                    Self
-                }
-            }
-            fn baz() {
-            }
-        "};
-    cx.set_state(&buffer);
-
-    cx.update_editor(|e, _, cx| {
-        e.buffer()
-            .read(cx)
-            .as_singleton()
-            .unwrap()
-            .update(cx, |buffer, cx| {
-                buffer.set_language(Some(rust_lang()), cx);
-            })
-    });
-
-    let mut sticky_headers = |offset: ScrollOffset| {
-        cx.update_editor(|e, window, cx| {
-            e.scroll(gpui::Point { x: 0., y: offset }, None, window, cx);
-            let style = e.style(cx).clone();
-            EditorElement::sticky_headers(&e, &e.snapshot(window, cx), &style, cx)
-                .into_iter()
-                .map(
-                    |StickyHeader {
-                         start_point,
-                         offset,
-                         ..
-                     }| { (start_point, offset) },
-                )
-                .collect::<Vec<_>>()
-        })
-    };
-
-    let fn_foo = Point { row: 0, column: 0 };
-    let impl_bar = Point { row: 4, column: 0 };
-    let fn_new = Point { row: 5, column: 4 };
-
-    assert_eq!(sticky_headers(0.0), vec![]);
-    assert_eq!(sticky_headers(0.5), vec![(fn_foo, 0.0)]);
-    assert_eq!(sticky_headers(1.0), vec![(fn_foo, 0.0)]);
-    assert_eq!(sticky_headers(1.5), vec![(fn_foo, -0.5)]);
-    assert_eq!(sticky_headers(2.0), vec![]);
-    assert_eq!(sticky_headers(2.5), vec![]);
-    assert_eq!(sticky_headers(3.0), vec![]);
-    assert_eq!(sticky_headers(3.5), vec![]);
-    assert_eq!(sticky_headers(4.0), vec![]);
-    assert_eq!(sticky_headers(4.5), vec![(impl_bar, 0.0), (fn_new, 1.0)]);
-    assert_eq!(sticky_headers(5.0), vec![(impl_bar, 0.0), (fn_new, 1.0)]);
-    assert_eq!(sticky_headers(5.5), vec![(impl_bar, 0.0), (fn_new, 0.5)]);
-    assert_eq!(sticky_headers(6.0), vec![(impl_bar, 0.0)]);
-    assert_eq!(sticky_headers(6.5), vec![(impl_bar, 0.0)]);
-    assert_eq!(sticky_headers(7.0), vec![(impl_bar, 0.0)]);
-    assert_eq!(sticky_headers(7.5), vec![(impl_bar, -0.5)]);
-    assert_eq!(sticky_headers(8.0), vec![]);
-    assert_eq!(sticky_headers(8.5), vec![]);
-    assert_eq!(sticky_headers(9.0), vec![]);
-    assert_eq!(sticky_headers(9.5), vec![]);
-    assert_eq!(sticky_headers(10.0), vec![]);
-}
-
-#[gpui::test]
-async fn test_scroll_by_clicking_sticky_header(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    cx.update(|cx| {
-        SettingsStore::update_global(cx, |store, cx| {
-            store.update_user_settings(cx, |settings| {
-                settings.editor.sticky_scroll = Some(settings::StickyScrollContent {
-                    enabled: Some(true),
-                })
-            });
-        });
-    });
-    let mut cx = EditorTestContext::new(cx).await;
-
-    let line_height = cx.update_editor(|editor, window, cx| {
-        editor
-            .style(cx)
-            .text
-            .line_height_in_pixels(window.rem_size())
-    });
-
-    let buffer = indoc! {"
-            ˇfn foo() {
-                let abc = 123;
-            }
-            struct Bar;
-            impl Bar {
-                fn new() -> Self {
-                    Self
-                }
-            }
-            fn baz() {
-            }
-        "};
-    cx.set_state(&buffer);
-
-    cx.update_editor(|e, _, cx| {
-        e.buffer()
-            .read(cx)
-            .as_singleton()
-            .unwrap()
-            .update(cx, |buffer, cx| {
-                buffer.set_language(Some(rust_lang()), cx);
-            })
-    });
-
-    let fn_foo = || empty_range(0, 0);
-    let impl_bar = || empty_range(4, 0);
-    let fn_new = || empty_range(5, 4);
-
-    let mut scroll_and_click = |scroll_offset: ScrollOffset, click_offset: ScrollOffset| {
-        cx.update_editor(|e, window, cx| {
-            e.scroll(
-                gpui::Point {
-                    x: 0.,
-                    y: scroll_offset,
-                },
-                None,
-                window,
-                cx,
-            );
-        });
-        cx.simulate_click(
-            gpui::Point {
-                x: px(0.),
-                y: click_offset as f32 * line_height,
-            },
-            Modifiers::none(),
-        );
-        cx.update_editor(|e, _, cx| (e.scroll_position(cx), display_ranges(e, cx)))
-    };
-
-    assert_eq!(
-        scroll_and_click(
-            4.5, // impl Bar is halfway off the screen
-            0.0  // click top of screen
-        ),
-        // scrolled to impl Bar
-        (gpui::Point { x: 0., y: 4. }, vec![impl_bar()])
-    );
-
-    assert_eq!(
-        scroll_and_click(
-            4.5,  // impl Bar is halfway off the screen
-            0.25  // click middle of impl Bar
-        ),
-        // scrolled to impl Bar
-        (gpui::Point { x: 0., y: 4. }, vec![impl_bar()])
-    );
-
-    assert_eq!(
-        scroll_and_click(
-            4.5, // impl Bar is halfway off the screen
-            1.5  // click below impl Bar (e.g. fn new())
-        ),
-        // scrolled to fn new() - this is below the impl Bar header which has persisted
-        (gpui::Point { x: 0., y: 4. }, vec![fn_new()])
-    );
-
-    assert_eq!(
-        scroll_and_click(
-            5.5,  // fn new is halfway underneath impl Bar
-            0.75  // click on the overlap of impl Bar and fn new()
-        ),
-        (gpui::Point { x: 0., y: 4. }, vec![impl_bar()])
-    );
-
-    assert_eq!(
-        scroll_and_click(
-            5.5,  // fn new is halfway underneath impl Bar
-            1.25  // click on the visible part of fn new()
-        ),
-        (gpui::Point { x: 0., y: 4. }, vec![fn_new()])
-    );
-
-    assert_eq!(
-        scroll_and_click(
-            1.5, // fn foo is halfway off the screen
-            0.0  // click top of screen
-        ),
-        (gpui::Point { x: 0., y: 0. }, vec![fn_foo()])
-    );
-
-    assert_eq!(
-        scroll_and_click(
-            1.5,  // fn foo is halfway off the screen
-            0.75  // click visible part of let abc...
-        )
-        .0,
-        // no change in scroll
-        // we don't assert on the visible_range because if we clicked the gutter, our line is fully selected
-        (gpui::Point { x: 0., y: 1.5 })
-    );
-}
-
-#[gpui::test]
-async fn test_next_prev_reference(cx: &mut TestAppContext) {
-    const CYCLE_POSITIONS: &[&'static str] = &[
-        indoc! {"
-            fn foo() {
-                let ˇabc = 123;
-                let x = abc + 1;
-                let y = abc + 2;
-                let z = abc + 2;
-            }
-        "},
-        indoc! {"
-            fn foo() {
-                let abc = 123;
-                let x = ˇabc + 1;
-                let y = abc + 2;
-                let z = abc + 2;
-            }
-        "},
-        indoc! {"
-            fn foo() {
-                let abc = 123;
-                let x = abc + 1;
-                let y = ˇabc + 2;
-                let z = abc + 2;
-            }
-        "},
-        indoc! {"
-            fn foo() {
-                let abc = 123;
-                let x = abc + 1;
-                let y = abc + 2;
-                let z = ˇabc + 2;
-            }
-        "},
-    ];
-
-    init_test(cx, |_| {});
-
-    let mut cx = EditorLspTestContext::new_rust(
-        lsp::ServerCapabilities {
-            references_provider: Some(lsp::OneOf::Left(true)),
-            ..Default::default()
-        },
-        cx,
-    )
-    .await;
-
-    // importantly, the cursor is in the middle
-    cx.set_state(indoc! {"
-        fn foo() {
-            let aˇbc = 123;
-            let x = abc + 1;
-            let y = abc + 2;
-            let z = abc + 2;
-        }
-    "});
-
-    let reference_ranges = [
-        lsp::Position::new(1, 8),
-        lsp::Position::new(2, 12),
-        lsp::Position::new(3, 12),
-        lsp::Position::new(4, 12),
-    ]
-    .map(|start| lsp::Range::new(start, lsp::Position::new(start.line, start.character + 3)));
-
-    cx.lsp
-        .set_request_handler::<lsp::request::References, _, _>(move |params, _cx| async move {
-            Ok(Some(
-                reference_ranges
-                    .map(|range| lsp::Location {
-                        uri: params.text_document_position.text_document.uri.clone(),
-                        range,
-                    })
-                    .to_vec(),
-            ))
-        });
-
-    let _move = async |direction, count, cx: &mut EditorLspTestContext| {
-        cx.update_editor(|editor, window, cx| {
-            editor.go_to_reference_before_or_after_position(direction, count, window, cx)
-        })
-        .unwrap()
-        .await
-        .unwrap()
-    };
-
-    _move(Direction::Next, 1, &mut cx).await;
-    cx.assert_editor_state(CYCLE_POSITIONS[1]);
-
-    _move(Direction::Next, 1, &mut cx).await;
-    cx.assert_editor_state(CYCLE_POSITIONS[2]);
-
-    _move(Direction::Next, 1, &mut cx).await;
-    cx.assert_editor_state(CYCLE_POSITIONS[3]);
-
-    // loops back to the start
-    _move(Direction::Next, 1, &mut cx).await;
-    cx.assert_editor_state(CYCLE_POSITIONS[0]);
-
-    // loops back to the end
-    _move(Direction::Prev, 1, &mut cx).await;
-    cx.assert_editor_state(CYCLE_POSITIONS[3]);
-
-    _move(Direction::Prev, 1, &mut cx).await;
-    cx.assert_editor_state(CYCLE_POSITIONS[2]);
-
-    _move(Direction::Prev, 1, &mut cx).await;
-    cx.assert_editor_state(CYCLE_POSITIONS[1]);
-
-    _move(Direction::Prev, 1, &mut cx).await;
-    cx.assert_editor_state(CYCLE_POSITIONS[0]);
-
-    _move(Direction::Next, 3, &mut cx).await;
-    cx.assert_editor_state(CYCLE_POSITIONS[3]);
-
-    _move(Direction::Prev, 2, &mut cx).await;
-    cx.assert_editor_state(CYCLE_POSITIONS[1]);
-}
-
-#[gpui::test]
-async fn test_multibuffer_selections_with_folding(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let (editor, cx) = cx.add_window_view(|window, cx| {
-        let multi_buffer = MultiBuffer::build_multi(
-            [
-                ("1\n2\n3\n", vec![Point::row_range(0..3)]),
-                ("1\n2\n3\n", vec![Point::row_range(0..3)]),
-            ],
-            cx,
-        );
-        Editor::new(EditorMode::full(), multi_buffer, None, window, cx)
-    });
-
-    let mut cx = EditorTestContext::for_editor_in(editor.clone(), cx).await;
-    let buffer_ids = cx.multibuffer(|mb, _| mb.excerpt_buffer_ids());
-
-    cx.assert_excerpts_with_selections(indoc! {"
-        [EXCERPT]
-        ˇ1
-        2
-        3
-        [EXCERPT]
-        1
-        2
-        3
-        "});
-
-    // Scenario 1: Unfolded buffers, position cursor on "2", select all matches, then insert
-    cx.update_editor(|editor, window, cx| {
-        editor.change_selections(None.into(), window, cx, |s| {
-            s.select_ranges([MultiBufferOffset(2)..MultiBufferOffset(3)]);
-        });
-    });
-    cx.assert_excerpts_with_selections(indoc! {"
-        [EXCERPT]
-        1
-        2ˇ
-        3
-        [EXCERPT]
-        1
-        2
-        3
-        "});
-
-    cx.update_editor(|editor, window, cx| {
-        editor
-            .select_all_matches(&SelectAllMatches, window, cx)
-            .unwrap();
-    });
-    cx.assert_excerpts_with_selections(indoc! {"
-        [EXCERPT]
-        1
-        2ˇ
-        3
-        [EXCERPT]
-        1
-        2ˇ
-        3
-        "});
-
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("X", window, cx);
-    });
-    cx.assert_excerpts_with_selections(indoc! {"
-        [EXCERPT]
-        1
-        Xˇ
-        3
-        [EXCERPT]
-        1
-        Xˇ
-        3
-        "});
-
-    // Scenario 2: Select "2", then fold second buffer before insertion
-    cx.update_multibuffer(|mb, cx| {
-        for buffer_id in buffer_ids.iter() {
-            let buffer = mb.buffer(*buffer_id).unwrap();
-            buffer.update(cx, |buffer, cx| {
-                buffer.edit([(0..buffer.len(), "1\n2\n3\n")], None, cx);
-            });
-        }
-    });
-
-    // Select "2" and select all matches
-    cx.update_editor(|editor, window, cx| {
-        editor.change_selections(None.into(), window, cx, |s| {
-            s.select_ranges([MultiBufferOffset(2)..MultiBufferOffset(3)]);
-        });
-        editor
-            .select_all_matches(&SelectAllMatches, window, cx)
-            .unwrap();
-    });
-
-    // Fold second buffer - should remove selections from folded buffer
-    cx.update_editor(|editor, _, cx| {
-        editor.fold_buffer(buffer_ids[1], cx);
-    });
-    cx.assert_excerpts_with_selections(indoc! {"
-        [EXCERPT]
-        1
-        2ˇ
-        3
-        [EXCERPT]
-        [FOLDED]
-        "});
-
-    // Insert text - should only affect first buffer
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("Y", window, cx);
-    });
-    cx.update_editor(|editor, _, cx| {
-        editor.unfold_buffer(buffer_ids[1], cx);
-    });
-    cx.assert_excerpts_with_selections(indoc! {"
-        [EXCERPT]
-        1
-        Yˇ
-        3
-        [EXCERPT]
-        1
-        2
-        3
-        "});
-
-    // Scenario 3: Select "2", then fold first buffer before insertion
-    cx.update_multibuffer(|mb, cx| {
-        for buffer_id in buffer_ids.iter() {
-            let buffer = mb.buffer(*buffer_id).unwrap();
-            buffer.update(cx, |buffer, cx| {
-                buffer.edit([(0..buffer.len(), "1\n2\n3\n")], None, cx);
-            });
-        }
-    });
-
-    // Select "2" and select all matches
-    cx.update_editor(|editor, window, cx| {
-        editor.change_selections(None.into(), window, cx, |s| {
-            s.select_ranges([MultiBufferOffset(2)..MultiBufferOffset(3)]);
-        });
-        editor
-            .select_all_matches(&SelectAllMatches, window, cx)
-            .unwrap();
-    });
-
-    // Fold first buffer - should remove selections from folded buffer
-    cx.update_editor(|editor, _, cx| {
-        editor.fold_buffer(buffer_ids[0], cx);
-    });
-    cx.assert_excerpts_with_selections(indoc! {"
-        [EXCERPT]
-        [FOLDED]
-        [EXCERPT]
-        1
-        2ˇ
-        3
-        "});
-
-    // Insert text - should only affect second buffer
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("Z", window, cx);
-    });
-    cx.update_editor(|editor, _, cx| {
-        editor.unfold_buffer(buffer_ids[0], cx);
-    });
-    cx.assert_excerpts_with_selections(indoc! {"
-        [EXCERPT]
-        1
-        2
-        3
-        [EXCERPT]
-        1
-        Zˇ
-        3
-        "});
-
-    // Test correct folded header is selected upon fold
-    cx.update_editor(|editor, _, cx| {
-        editor.fold_buffer(buffer_ids[0], cx);
-        editor.fold_buffer(buffer_ids[1], cx);
-    });
-    cx.assert_excerpts_with_selections(indoc! {"
-        [EXCERPT]
-        [FOLDED]
-        [EXCERPT]
-        ˇ[FOLDED]
-        "});
-
-    // Test selection inside folded buffer unfolds it on type
-    cx.update_editor(|editor, window, cx| {
-        editor.handle_input("W", window, cx);
-    });
-    cx.update_editor(|editor, _, cx| {
-        editor.unfold_buffer(buffer_ids[0], cx);
-    });
-    cx.assert_excerpts_with_selections(indoc! {"
-        [EXCERPT]
-        1
-        2
-        3
-        [EXCERPT]
-        Wˇ1
-        Z
-        3
-        "});
-}
-
-#[gpui::test]
-async fn test_filtered_editor_pair(cx: &mut gpui::TestAppContext) {
-    init_test(cx, |_| {});
-    let mut leader_cx = EditorTestContext::new(cx).await;
-
-    let diff_base = indoc!(
-        r#"
-        one
-        two
-        three
-        four
-        five
-        six
-        "#
-    );
-
-    let initial_state = indoc!(
-        r#"
-        ˇone
-        two
-        THREE
-        four
-        five
-        six
-        "#
-    );
-
-    leader_cx.set_state(initial_state);
-
-    leader_cx.set_head_text(&diff_base);
-    leader_cx.run_until_parked();
-
-    let follower = leader_cx.update_multibuffer(|leader, cx| {
-        leader.set_filter_mode(Some(MultiBufferFilterMode::KeepInsertions));
-        leader.set_all_diff_hunks_expanded(cx);
-        leader.get_or_create_follower(cx)
-    });
-    follower.update(cx, |follower, cx| {
-        follower.set_filter_mode(Some(MultiBufferFilterMode::KeepDeletions));
-        follower.set_all_diff_hunks_expanded(cx);
-    });
-
-    let follower_editor =
-        leader_cx.new_window_entity(|window, cx| build_editor(follower, window, cx));
-    // leader_cx.window.focus(&follower_editor.focus_handle(cx));
-
-    let mut follower_cx = EditorTestContext::for_editor_in(follower_editor, &mut leader_cx).await;
-    cx.run_until_parked();
-
-    leader_cx.assert_editor_state(initial_state);
-    follower_cx.assert_editor_state(indoc! {
-        r#"
-        ˇone
-        two
-        three
-        four
-        five
-        six
-        "#
-    });
-
-    follower_cx.editor(|editor, _window, cx| {
-        assert!(editor.read_only(cx));
-    });
-
-    leader_cx.update_editor(|editor, _window, cx| {
-        editor.edit([(Point::new(4, 0)..Point::new(5, 0), "FIVE\n")], cx);
-    });
-    cx.run_until_parked();
-
-    leader_cx.assert_editor_state(indoc! {
-        r#"
-        ˇone
-        two
-        THREE
-        four
-        FIVE
-        six
-        "#
-    });
-
-    follower_cx.assert_editor_state(indoc! {
-        r#"
-        ˇone
-        two
-        three
-        four
-        five
-        six
-        "#
-    });
-
-    leader_cx.update_editor(|editor, _window, cx| {
-        editor.edit([(Point::new(6, 0)..Point::new(6, 0), "SEVEN")], cx);
-    });
-    cx.run_until_parked();
-
-    leader_cx.assert_editor_state(indoc! {
-        r#"
-        ˇone
-        two
-        THREE
-        four
-        FIVE
-        six
-        SEVEN"#
-    });
-
-    follower_cx.assert_editor_state(indoc! {
-        r#"
-        ˇone
-        two
-        three
-        four
-        five
-        six
-        "#
-    });
-
-    leader_cx.update_editor(|editor, window, cx| {
-        editor.move_down(&MoveDown, window, cx);
-        editor.refresh_selected_text_highlights(true, window, cx);
-    });
-    leader_cx.run_until_parked();
-}
-
-#[gpui::test]
-async fn test_filtered_editor_pair_complex(cx: &mut gpui::TestAppContext) {
-    init_test(cx, |_| {});
-    let base_text = "base\n";
-    let buffer_text = "buffer\n";
-
-    let buffer1 = cx.new(|cx| Buffer::local(buffer_text, cx));
-    let diff1 = cx.new(|cx| BufferDiff::new_with_base_text(base_text, &buffer1, cx));
-
-    let extra_buffer_1 = cx.new(|cx| Buffer::local("dummy text 1\n", cx));
-    let extra_diff_1 = cx.new(|cx| BufferDiff::new_with_base_text("", &extra_buffer_1, cx));
-    let extra_buffer_2 = cx.new(|cx| Buffer::local("dummy text 2\n", cx));
-    let extra_diff_2 = cx.new(|cx| BufferDiff::new_with_base_text("", &extra_buffer_2, cx));
-
-    let leader = cx.new(|cx| {
-        let mut leader = MultiBuffer::new(Capability::ReadWrite);
-        leader.set_all_diff_hunks_expanded(cx);
-        leader.set_filter_mode(Some(MultiBufferFilterMode::KeepInsertions));
-        leader
-    });
-    let follower = leader.update(cx, |leader, cx| leader.get_or_create_follower(cx));
-    follower.update(cx, |follower, _| {
-        follower.set_filter_mode(Some(MultiBufferFilterMode::KeepDeletions));
-    });
-
-    leader.update(cx, |leader, cx| {
-        leader.insert_excerpts_after(
-            ExcerptId::min(),
-            extra_buffer_2.clone(),
-            vec![ExcerptRange::new(text::Anchor::MIN..text::Anchor::MAX)],
-            cx,
-        );
-        leader.add_diff(extra_diff_2.clone(), cx);
-
-        leader.insert_excerpts_after(
-            ExcerptId::min(),
-            extra_buffer_1.clone(),
-            vec![ExcerptRange::new(text::Anchor::MIN..text::Anchor::MAX)],
-            cx,
-        );
-        leader.add_diff(extra_diff_1.clone(), cx);
-
-        leader.insert_excerpts_after(
-            ExcerptId::min(),
-            buffer1.clone(),
-            vec![ExcerptRange::new(text::Anchor::MIN..text::Anchor::MAX)],
-            cx,
-        );
-        leader.add_diff(diff1.clone(), cx);
-    });
-
-    cx.run_until_parked();
-    let mut cx = cx.add_empty_window();
-
-    let leader_editor = cx
-        .new_window_entity(|window, cx| Editor::for_multibuffer(leader.clone(), None, window, cx));
-    let follower_editor = cx.new_window_entity(|window, cx| {
-        Editor::for_multibuffer(follower.clone(), None, window, cx)
-    });
-
-    let mut leader_cx = EditorTestContext::for_editor_in(leader_editor.clone(), &mut cx).await;
-    leader_cx.assert_editor_state(indoc! {"
-       ˇbuffer
-
-       dummy text 1
-
-       dummy text 2
-    "});
-    let mut follower_cx = EditorTestContext::for_editor_in(follower_editor.clone(), &mut cx).await;
-    follower_cx.assert_editor_state(indoc! {"
-        ˇbase
-
-
-    "});
-}
-
-#[gpui::test]
-async fn test_multibuffer_scroll_cursor_top_margin(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let (editor, cx) = cx.add_window_view(|window, cx| {
-        let multi_buffer = MultiBuffer::build_multi(
-            [
-                ("1\n2\n3\n", vec![Point::row_range(0..3)]),
-                ("1\n2\n3\n4\n5\n6\n7\n8\n9\n", vec![Point::row_range(0..9)]),
-            ],
-            cx,
-        );
-        Editor::new(EditorMode::full(), multi_buffer, None, window, cx)
-    });
-
-    let mut cx = EditorTestContext::for_editor_in(editor.clone(), cx).await;
-
-    cx.assert_excerpts_with_selections(indoc! {"
-        [EXCERPT]
-        ˇ1
-        2
-        3
-        [EXCERPT]
-        1
-        2
-        3
-        4
-        5
-        6
-        7
-        8
-        9
-        "});
-
-    cx.update_editor(|editor, window, cx| {
-        editor.change_selections(None.into(), window, cx, |s| {
-            s.select_ranges([MultiBufferOffset(19)..MultiBufferOffset(19)]);
-        });
-    });
-
-    cx.assert_excerpts_with_selections(indoc! {"
-        [EXCERPT]
-        1
-        2
-        3
-        [EXCERPT]
-        1
-        2
-        3
-        4
-        5
-        6
-        ˇ7
-        8
-        9
-        "});
-
-    cx.update_editor(|editor, _window, cx| {
-        editor.set_vertical_scroll_margin(0, cx);
-    });
-
-    cx.update_editor(|editor, window, cx| {
-        assert_eq!(editor.vertical_scroll_margin(), 0);
-        editor.scroll_cursor_top(&ScrollCursorTop, window, cx);
-        assert_eq!(
-            editor.snapshot(window, cx).scroll_position(),
-            gpui::Point::new(0., 12.0)
-        );
-    });
-
-    cx.update_editor(|editor, _window, cx| {
-        editor.set_vertical_scroll_margin(3, cx);
-    });
-
-    cx.update_editor(|editor, window, cx| {
-        assert_eq!(editor.vertical_scroll_margin(), 3);
-        editor.scroll_cursor_top(&ScrollCursorTop, window, cx);
-        assert_eq!(
-            editor.snapshot(window, cx).scroll_position(),
-            gpui::Point::new(0., 9.0)
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_find_references_single_case(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    let mut cx = EditorLspTestContext::new_rust(
-        lsp::ServerCapabilities {
-            references_provider: Some(lsp::OneOf::Left(true)),
-            ..lsp::ServerCapabilities::default()
-        },
-        cx,
-    )
-    .await;
-
-    let before = indoc!(
-        r#"
-        fn main() {
-            let aˇbc = 123;
-            let xyz = abc;
-        }
-        "#
-    );
-    let after = indoc!(
-        r#"
-        fn main() {
-            let abc = 123;
-            let xyz = ˇabc;
-        }
-        "#
-    );
-
-    cx.lsp
-        .set_request_handler::<lsp::request::References, _, _>(async move |params, _| {
-            Ok(Some(vec![
-                lsp::Location {
-                    uri: params.text_document_position.text_document.uri.clone(),
-                    range: lsp::Range::new(lsp::Position::new(1, 8), lsp::Position::new(1, 11)),
-                },
-                lsp::Location {
-                    uri: params.text_document_position.text_document.uri,
-                    range: lsp::Range::new(lsp::Position::new(2, 14), lsp::Position::new(2, 17)),
-                },
-            ]))
-        });
-
-    cx.set_state(before);
-
-    let action = FindAllReferences {
-        always_open_multibuffer: false,
-    };
-
-    let navigated = cx
-        .update_editor(|editor, window, cx| editor.find_all_references(&action, window, cx))
-        .expect("should have spawned a task")
-        .await
-        .unwrap();
-
-    assert_eq!(navigated, Navigated::No);
-
-    cx.run_until_parked();
-
-    cx.assert_editor_state(after);
-}
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
deleted file mode 100644
index 653cf291a7..0000000000
--- a/crates/editor/src/element.rs
+++ /dev/null
@@ -1,12506 +0,0 @@
-use crate::{
-    ActiveDiagnostic, BlockId, CURSORS_VISIBLE_FOR, ChunkRendererContext, ChunkReplacement,
-    CodeActionSource, ColumnarMode, ConflictsOurs, ConflictsOursMarker, ConflictsOuter,
-    ConflictsTheirs, ConflictsTheirsMarker, ContextMenuPlacement, CursorShape, CustomBlockId,
-    DisplayDiffHunk, DisplayPoint, DisplayRow, DocumentHighlightRead, DocumentHighlightWrite,
-    EditDisplayMode, EditPrediction, Editor, EditorMode, EditorSettings, EditorSnapshot,
-    EditorStyle, FILE_HEADER_HEIGHT, FocusedBlock, GutterDimensions, HalfPageDown, HalfPageUp,
-    HandleInput, HoveredCursor, InlayHintRefreshReason, JumpData, LineDown, LineHighlight, LineUp,
-    MAX_LINE_LEN, MINIMAP_FONT_SIZE, MULTI_BUFFER_EXCERPT_HEADER_HEIGHT, OpenExcerpts, PageDown,
-    PageUp, PhantomBreakpointIndicator, Point, RowExt, RowRangeExt, SelectPhase,
-    SelectedTextHighlight, Selection, SelectionDragState, SelectionEffects, SizingBehavior,
-    SoftWrap, StickyHeaderExcerpt, ToPoint, ToggleFold, ToggleFoldAll,
-    code_context_menus::{CodeActionsMenu, MENU_ASIDE_MAX_WIDTH, MENU_ASIDE_MIN_WIDTH, MENU_GAP},
-    column_pixels,
-    display_map::{
-        Block, BlockContext, BlockStyle, ChunkRendererId, DisplaySnapshot, EditorMargins,
-        HighlightKey, HighlightedChunk, ToDisplayPoint,
-    },
-    editor_settings::{
-        CurrentLineHighlight, DocumentColorsRenderMode, DoubleClickInMultibuffer, Minimap,
-        MinimapThumb, MinimapThumbBorder, ScrollBeyondLastLine, ScrollbarAxes,
-        ScrollbarDiagnostics, ShowMinimap,
-    },
-    git::blame::{BlameRenderer, GitBlame, GlobalBlameRenderer},
-    hover_popover::{
-        self, HOVER_POPOVER_GAP, MIN_POPOVER_CHARACTER_WIDTH, MIN_POPOVER_LINE_HEIGHT,
-        POPOVER_RIGHT_OFFSET, hover_at,
-    },
-    inlay_hint_settings,
-    items::BufferSearchHighlights,
-    mouse_context_menu::{self, MenuPosition},
-    scroll::{
-        ActiveScrollbarState, Autoscroll, ScrollOffset, ScrollPixelOffset, ScrollbarThumbState,
-        scroll_amount::ScrollAmount,
-    },
-};
-use buffer_diff::{DiffHunkStatus, DiffHunkStatusKind};
-use collections::{BTreeMap, HashMap};
-use file_icons::FileIcons;
-use git::{
-    Oid,
-    blame::{BlameEntry, ParsedCommitMessage},
-    status::FileStatus,
-};
-use gpui::{
-    Action, Along, AnyElement, App, AppContext, AvailableSpace, Axis as ScrollbarAxis, BorderStyle,
-    Bounds, ClickEvent, ClipboardItem, ContentMask, Context, Corner, Corners, CursorStyle,
-    DispatchPhase, Edges, Element, ElementInputHandler, Entity, Focusable as _, FontId,
-    GlobalElementId, Hitbox, HitboxBehavior, Hsla, InteractiveElement, IntoElement, IsZero,
-    KeybindingKeystroke, Length, Modifiers, ModifiersChangedEvent, MouseButton, MouseClickEvent,
-    MouseDownEvent, MouseMoveEvent, MouseUpEvent, PaintQuad, ParentElement, Pixels, ScrollDelta,
-    ScrollHandle, ScrollWheelEvent, ShapedLine, SharedString, Size, StatefulInteractiveElement,
-    Style, Styled, TextRun, TextStyleRefinement, WeakEntity, Window, anchored, deferred, div, fill,
-    linear_color_stop, linear_gradient, outline, point, px, quad, relative, size, solid_background,
-    transparent_black,
-};
-use itertools::Itertools;
-use language::{IndentGuideSettings, language_settings::ShowWhitespaceSetting};
-use markdown::Markdown;
-use multi_buffer::{
-    Anchor, ExcerptId, ExcerptInfo, ExpandExcerptDirection, ExpandInfo, MultiBufferPoint,
-    MultiBufferRow, RowInfo,
-};
-
-use project::{
-    Entry, ProjectPath,
-    debugger::breakpoint_store::{Breakpoint, BreakpointSessionState},
-    project_settings::ProjectSettings,
-};
-use settings::{
-    GitGutterSetting, GitHunkStyleSetting, IndentGuideBackgroundColoring, IndentGuideColoring,
-    Settings,
-};
-use smallvec::{SmallVec, smallvec};
-use std::{
-    any::TypeId,
-    borrow::Cow,
-    cell::Cell,
-    cmp::{self, Ordering},
-    fmt::{self, Write},
-    iter, mem,
-    ops::{Deref, Range},
-    path::{self, Path},
-    rc::Rc,
-    sync::Arc,
-    time::{Duration, Instant},
-};
-use sum_tree::Bias;
-use text::{BufferId, SelectionGoal};
-use theme::{ActiveTheme, Appearance, BufferLineHeight, PlayerColor};
-use ui::utils::ensure_minimum_contrast;
-use ui::{
-    ButtonLike, ContextMenu, Indicator, KeyBinding, POPOVER_Y_PADDING, Tooltip, prelude::*,
-    right_click_menu, scrollbars::ShowScrollbar, text_for_keystroke,
-};
-use unicode_segmentation::UnicodeSegmentation;
-use util::post_inc;
-use util::{RangeExt, ResultExt, debug_panic};
-use workspace::{
-    CollaboratorId, ItemSettings, OpenInTerminal, OpenTerminal, RevealInProjectPanel, Workspace,
-    item::{Item, ItemBufferKind},
-    notifications::NotifyTaskExt,
-};
-
-/// Determines what kinds of highlights should be applied to a lines background.
-#[derive(Clone, Copy, Default)]
-struct LineHighlightSpec {
-    selection: bool,
-    breakpoint: bool,
-    _active_stack_frame: bool,
-}
-
-#[derive(Debug)]
-struct SelectionLayout {
-    head: DisplayPoint,
-    cursor_shape: CursorShape,
-    is_newest: bool,
-    is_local: bool,
-    range: Range<DisplayPoint>,
-    active_rows: Range<DisplayRow>,
-    user_name: Option<SharedString>,
-}
-
-struct InlineBlameLayout {
-    element: AnyElement,
-    bounds: Bounds<Pixels>,
-    buffer_id: BufferId,
-    entry: BlameEntry,
-}
-
-impl SelectionLayout {
-    fn new<T: ToPoint + ToDisplayPoint + Clone>(
-        selection: Selection<T>,
-        line_mode: bool,
-        cursor_shape: CursorShape,
-        map: &DisplaySnapshot,
-        is_newest: bool,
-        is_local: bool,
-        user_name: Option<SharedString>,
-    ) -> Self {
-        let point_selection = selection.map(|p| p.to_point(map.buffer_snapshot()));
-        let display_selection = point_selection.map(|p| p.to_display_point(map));
-        let mut range = display_selection.range();
-        let mut head = display_selection.head();
-        let mut active_rows = map.prev_line_boundary(point_selection.start).1.row()
-            ..map.next_line_boundary(point_selection.end).1.row();
-
-        // vim visual line mode
-        if line_mode {
-            let point_range = map.expand_to_line(point_selection.range());
-            range = point_range.start.to_display_point(map)..point_range.end.to_display_point(map);
-        }
-
-        // any vim visual mode (including line mode)
-        if (cursor_shape == CursorShape::Block || cursor_shape == CursorShape::Hollow)
-            && !range.is_empty()
-            && !selection.reversed
-        {
-            if head.column() > 0 {
-                head = map.clip_point(DisplayPoint::new(head.row(), head.column() - 1), Bias::Left)
-            } else if head.row().0 > 0 && head != map.max_point() {
-                head = map.clip_point(
-                    DisplayPoint::new(
-                        head.row().previous_row(),
-                        map.line_len(head.row().previous_row()),
-                    ),
-                    Bias::Left,
-                );
-                // updating range.end is a no-op unless you're cursor is
-                // on the newline containing a multi-buffer divider
-                // in which case the clip_point may have moved the head up
-                // an additional row.
-                range.end = DisplayPoint::new(head.row().next_row(), 0);
-                active_rows.end = head.row();
-            }
-        }
-
-        Self {
-            head,
-            cursor_shape,
-            is_newest,
-            is_local,
-            range,
-            active_rows,
-            user_name,
-        }
-    }
-}
-
-#[derive(Default)]
-struct RenderBlocksOutput {
-    blocks: Vec<BlockLayout>,
-    row_block_types: HashMap<DisplayRow, bool>,
-    resized_blocks: Option<HashMap<CustomBlockId, u32>>,
-}
-
-pub struct EditorElement {
-    editor: Entity<Editor>,
-    style: EditorStyle,
-}
-
-type DisplayRowDelta = u32;
-
-impl EditorElement {
-    pub(crate) const SCROLLBAR_WIDTH: Pixels = px(15.);
-
-    pub fn new(editor: &Entity<Editor>, style: EditorStyle) -> Self {
-        Self {
-            editor: editor.clone(),
-            style,
-        }
-    }
-
-    fn register_actions(&self, window: &mut Window, cx: &mut App) {
-        let editor = &self.editor;
-        editor.update(cx, |editor, cx| {
-            for action in editor.editor_actions.borrow().values() {
-                (action)(editor, window, cx)
-            }
-        });
-
-        crate::rust_analyzer_ext::apply_related_actions(editor, window, cx);
-        crate::clangd_ext::apply_related_actions(editor, window, cx);
-
-        register_action(editor, window, Editor::open_context_menu);
-        register_action(editor, window, Editor::move_left);
-        register_action(editor, window, Editor::move_right);
-        register_action(editor, window, Editor::move_down);
-        register_action(editor, window, Editor::move_down_by_lines);
-        register_action(editor, window, Editor::select_down_by_lines);
-        register_action(editor, window, Editor::move_up);
-        register_action(editor, window, Editor::move_up_by_lines);
-        register_action(editor, window, Editor::select_up_by_lines);
-        register_action(editor, window, Editor::select_page_down);
-        register_action(editor, window, Editor::select_page_up);
-        register_action(editor, window, Editor::cancel);
-        register_action(editor, window, Editor::newline);
-        register_action(editor, window, Editor::newline_above);
-        register_action(editor, window, Editor::newline_below);
-        register_action(editor, window, Editor::backspace);
-        register_action(editor, window, Editor::blame_hover);
-        register_action(editor, window, Editor::delete);
-        register_action(editor, window, Editor::tab);
-        register_action(editor, window, Editor::next_snippet_tabstop);
-        register_action(editor, window, Editor::previous_snippet_tabstop);
-        register_action(editor, window, Editor::backtab);
-        register_action(editor, window, Editor::indent);
-        register_action(editor, window, Editor::outdent);
-        register_action(editor, window, Editor::autoindent);
-        register_action(editor, window, Editor::delete_line);
-        register_action(editor, window, Editor::join_lines);
-        register_action(editor, window, Editor::sort_lines_by_length);
-        register_action(editor, window, Editor::sort_lines_case_sensitive);
-        register_action(editor, window, Editor::sort_lines_case_insensitive);
-        register_action(editor, window, Editor::reverse_lines);
-        register_action(editor, window, Editor::shuffle_lines);
-        register_action(editor, window, Editor::rotate_selections_forward);
-        register_action(editor, window, Editor::rotate_selections_backward);
-        register_action(editor, window, Editor::convert_indentation_to_spaces);
-        register_action(editor, window, Editor::convert_indentation_to_tabs);
-        register_action(editor, window, Editor::convert_to_upper_case);
-        register_action(editor, window, Editor::convert_to_lower_case);
-        register_action(editor, window, Editor::convert_to_title_case);
-        register_action(editor, window, Editor::convert_to_snake_case);
-        register_action(editor, window, Editor::convert_to_kebab_case);
-        register_action(editor, window, Editor::convert_to_upper_camel_case);
-        register_action(editor, window, Editor::convert_to_lower_camel_case);
-        register_action(editor, window, Editor::convert_to_opposite_case);
-        register_action(editor, window, Editor::convert_to_sentence_case);
-        register_action(editor, window, Editor::toggle_case);
-        register_action(editor, window, Editor::convert_to_rot13);
-        register_action(editor, window, Editor::convert_to_rot47);
-        register_action(editor, window, Editor::delete_to_previous_word_start);
-        register_action(editor, window, Editor::delete_to_previous_subword_start);
-        register_action(editor, window, Editor::delete_to_next_word_end);
-        register_action(editor, window, Editor::delete_to_next_subword_end);
-        register_action(editor, window, Editor::delete_to_beginning_of_line);
-        register_action(editor, window, Editor::delete_to_end_of_line);
-        register_action(editor, window, Editor::cut_to_end_of_line);
-        register_action(editor, window, Editor::duplicate_line_up);
-        register_action(editor, window, Editor::duplicate_line_down);
-        register_action(editor, window, Editor::duplicate_selection);
-        register_action(editor, window, Editor::move_line_up);
-        register_action(editor, window, Editor::move_line_down);
-        register_action(editor, window, Editor::transpose);
-        register_action(editor, window, Editor::rewrap);
-        register_action(editor, window, Editor::cut);
-        register_action(editor, window, Editor::kill_ring_cut);
-        register_action(editor, window, Editor::kill_ring_yank);
-        register_action(editor, window, Editor::copy);
-        register_action(editor, window, Editor::copy_and_trim);
-        register_action(editor, window, Editor::diff_clipboard_with_selection);
-        register_action(editor, window, Editor::paste);
-        register_action(editor, window, Editor::undo);
-        register_action(editor, window, Editor::redo);
-        register_action(editor, window, Editor::move_page_up);
-        register_action(editor, window, Editor::move_page_down);
-        register_action(editor, window, Editor::next_screen);
-        register_action(editor, window, Editor::scroll_cursor_top);
-        register_action(editor, window, Editor::scroll_cursor_center);
-        register_action(editor, window, Editor::scroll_cursor_bottom);
-        register_action(editor, window, Editor::scroll_cursor_center_top_bottom);
-        register_action(editor, window, |editor, _: &LineDown, window, cx| {
-            editor.scroll_screen(&ScrollAmount::Line(1.), window, cx)
-        });
-        register_action(editor, window, |editor, _: &LineUp, window, cx| {
-            editor.scroll_screen(&ScrollAmount::Line(-1.), window, cx)
-        });
-        register_action(editor, window, |editor, _: &HalfPageDown, window, cx| {
-            editor.scroll_screen(&ScrollAmount::Page(0.5), window, cx)
-        });
-        register_action(
-            editor,
-            window,
-            |editor, HandleInput(text): &HandleInput, window, cx| {
-                if text.is_empty() {
-                    return;
-                }
-                editor.handle_input(text, window, cx);
-            },
-        );
-        register_action(editor, window, |editor, _: &HalfPageUp, window, cx| {
-            editor.scroll_screen(&ScrollAmount::Page(-0.5), window, cx)
-        });
-        register_action(editor, window, |editor, _: &PageDown, window, cx| {
-            editor.scroll_screen(&ScrollAmount::Page(1.), window, cx)
-        });
-        register_action(editor, window, |editor, _: &PageUp, window, cx| {
-            editor.scroll_screen(&ScrollAmount::Page(-1.), window, cx)
-        });
-        register_action(editor, window, Editor::move_to_previous_word_start);
-        register_action(editor, window, Editor::move_to_previous_subword_start);
-        register_action(editor, window, Editor::move_to_next_word_end);
-        register_action(editor, window, Editor::move_to_next_subword_end);
-        register_action(editor, window, Editor::move_to_beginning_of_line);
-        register_action(editor, window, Editor::move_to_end_of_line);
-        register_action(editor, window, Editor::move_to_start_of_paragraph);
-        register_action(editor, window, Editor::move_to_end_of_paragraph);
-        register_action(editor, window, Editor::move_to_beginning);
-        register_action(editor, window, Editor::move_to_end);
-        register_action(editor, window, Editor::move_to_start_of_excerpt);
-        register_action(editor, window, Editor::move_to_start_of_next_excerpt);
-        register_action(editor, window, Editor::move_to_end_of_excerpt);
-        register_action(editor, window, Editor::move_to_end_of_previous_excerpt);
-        register_action(editor, window, Editor::select_up);
-        register_action(editor, window, Editor::select_down);
-        register_action(editor, window, Editor::select_left);
-        register_action(editor, window, Editor::select_right);
-        register_action(editor, window, Editor::select_to_previous_word_start);
-        register_action(editor, window, Editor::select_to_previous_subword_start);
-        register_action(editor, window, Editor::select_to_next_word_end);
-        register_action(editor, window, Editor::select_to_next_subword_end);
-        register_action(editor, window, Editor::select_to_beginning_of_line);
-        register_action(editor, window, Editor::select_to_end_of_line);
-        register_action(editor, window, Editor::select_to_start_of_paragraph);
-        register_action(editor, window, Editor::select_to_end_of_paragraph);
-        register_action(editor, window, Editor::select_to_start_of_excerpt);
-        register_action(editor, window, Editor::select_to_start_of_next_excerpt);
-        register_action(editor, window, Editor::select_to_end_of_excerpt);
-        register_action(editor, window, Editor::select_to_end_of_previous_excerpt);
-        register_action(editor, window, Editor::select_to_beginning);
-        register_action(editor, window, Editor::select_to_end);
-        register_action(editor, window, Editor::select_all);
-        register_action(editor, window, |editor, action, window, cx| {
-            editor.select_all_matches(action, window, cx).log_err();
-        });
-        register_action(editor, window, Editor::select_line);
-        register_action(editor, window, Editor::split_selection_into_lines);
-        register_action(editor, window, Editor::add_selection_above);
-        register_action(editor, window, Editor::add_selection_below);
-        register_action(editor, window, Editor::insert_snippet_at_selections);
-        register_action(editor, window, |editor, action, window, cx| {
-            editor.select_next(action, window, cx).log_err();
-        });
-        register_action(editor, window, |editor, action, window, cx| {
-            editor.select_previous(action, window, cx).log_err();
-        });
-        register_action(editor, window, |editor, action, window, cx| {
-            editor.find_next_match(action, window, cx).log_err();
-        });
-        register_action(editor, window, |editor, action, window, cx| {
-            editor.find_previous_match(action, window, cx).log_err();
-        });
-        register_action(editor, window, Editor::toggle_comments);
-        register_action(editor, window, Editor::select_larger_syntax_node);
-        register_action(editor, window, Editor::select_smaller_syntax_node);
-        register_action(editor, window, Editor::select_next_syntax_node);
-        register_action(editor, window, Editor::select_prev_syntax_node);
-        register_action(editor, window, Editor::unwrap_syntax_node);
-        register_action(editor, window, Editor::select_enclosing_symbol);
-        register_action(editor, window, Editor::move_to_enclosing_bracket);
-        register_action(editor, window, Editor::undo_selection);
-        register_action(editor, window, Editor::redo_selection);
-        if editor.read(cx).buffer_kind(cx) == ItemBufferKind::Multibuffer {
-            register_action(editor, window, Editor::expand_excerpts);
-            register_action(editor, window, Editor::expand_excerpts_up);
-            register_action(editor, window, Editor::expand_excerpts_down);
-        }
-        register_action(editor, window, Editor::go_to_diagnostic);
-        register_action(editor, window, Editor::go_to_prev_diagnostic);
-        register_action(editor, window, Editor::go_to_next_hunk);
-        register_action(editor, window, Editor::go_to_prev_hunk);
-        register_action(editor, window, Editor::go_to_next_document_highlight);
-        register_action(editor, window, Editor::go_to_prev_document_highlight);
-        register_action(editor, window, |editor, action, window, cx| {
-            editor
-                .go_to_definition(action, window, cx)
-                .detach_and_log_err(cx);
-        });
-        register_action(editor, window, |editor, action, window, cx| {
-            editor
-                .go_to_definition_split(action, window, cx)
-                .detach_and_log_err(cx);
-        });
-        register_action(editor, window, |editor, action, window, cx| {
-            editor
-                .go_to_declaration(action, window, cx)
-                .detach_and_log_err(cx);
-        });
-        register_action(editor, window, |editor, action, window, cx| {
-            editor
-                .go_to_declaration_split(action, window, cx)
-                .detach_and_log_err(cx);
-        });
-        register_action(editor, window, |editor, action, window, cx| {
-            editor
-                .go_to_implementation(action, window, cx)
-                .detach_and_log_err(cx);
-        });
-        register_action(editor, window, |editor, action, window, cx| {
-            editor
-                .go_to_implementation_split(action, window, cx)
-                .detach_and_log_err(cx);
-        });
-        register_action(editor, window, |editor, action, window, cx| {
-            editor
-                .go_to_type_definition(action, window, cx)
-                .detach_and_log_err(cx);
-        });
-        register_action(editor, window, |editor, action, window, cx| {
-            editor
-                .go_to_type_definition_split(action, window, cx)
-                .detach_and_log_err(cx);
-        });
-        register_action(editor, window, Editor::open_url);
-        register_action(editor, window, Editor::open_selected_filename);
-        register_action(editor, window, Editor::fold);
-        register_action(editor, window, Editor::fold_at_level);
-        register_action(editor, window, Editor::fold_at_level_1);
-        register_action(editor, window, Editor::fold_at_level_2);
-        register_action(editor, window, Editor::fold_at_level_3);
-        register_action(editor, window, Editor::fold_at_level_4);
-        register_action(editor, window, Editor::fold_at_level_5);
-        register_action(editor, window, Editor::fold_at_level_6);
-        register_action(editor, window, Editor::fold_at_level_7);
-        register_action(editor, window, Editor::fold_at_level_8);
-        register_action(editor, window, Editor::fold_at_level_9);
-        register_action(editor, window, Editor::fold_all);
-        register_action(editor, window, Editor::fold_function_bodies);
-        register_action(editor, window, Editor::fold_recursive);
-        register_action(editor, window, Editor::toggle_fold);
-        register_action(editor, window, Editor::toggle_fold_recursive);
-        register_action(editor, window, Editor::toggle_fold_all);
-        register_action(editor, window, Editor::unfold_lines);
-        register_action(editor, window, Editor::unfold_recursive);
-        register_action(editor, window, Editor::unfold_all);
-        register_action(editor, window, Editor::fold_selected_ranges);
-        register_action(editor, window, Editor::set_mark);
-        register_action(editor, window, Editor::swap_selection_ends);
-        register_action(editor, window, Editor::show_completions);
-        register_action(editor, window, Editor::show_word_completions);
-        register_action(editor, window, Editor::toggle_code_actions);
-        register_action(editor, window, Editor::open_excerpts);
-        register_action(editor, window, Editor::open_excerpts_in_split);
-        register_action(editor, window, Editor::toggle_soft_wrap);
-        register_action(editor, window, Editor::toggle_tab_bar);
-        register_action(editor, window, Editor::toggle_line_numbers);
-        register_action(editor, window, Editor::toggle_relative_line_numbers);
-        register_action(editor, window, Editor::toggle_indent_guides);
-        register_action(editor, window, Editor::toggle_inlay_hints);
-        register_action(editor, window, Editor::toggle_edit_predictions);
-        if editor.read(cx).diagnostics_enabled() {
-            register_action(editor, window, Editor::toggle_diagnostics);
-        }
-        if editor.read(cx).inline_diagnostics_enabled() {
-            register_action(editor, window, Editor::toggle_inline_diagnostics);
-        }
-        if editor.read(cx).supports_minimap(cx) {
-            register_action(editor, window, Editor::toggle_minimap);
-        }
-        register_action(editor, window, hover_popover::hover);
-        register_action(editor, window, Editor::reveal_in_finder);
-        register_action(editor, window, Editor::copy_path);
-        register_action(editor, window, Editor::copy_relative_path);
-        register_action(editor, window, Editor::copy_file_name);
-        register_action(editor, window, Editor::copy_file_name_without_extension);
-        register_action(editor, window, Editor::copy_highlight_json);
-        register_action(editor, window, Editor::copy_permalink_to_line);
-        register_action(editor, window, Editor::open_permalink_to_line);
-        register_action(editor, window, Editor::copy_file_location);
-        register_action(editor, window, Editor::toggle_git_blame);
-        register_action(editor, window, Editor::toggle_git_blame_inline);
-        register_action(editor, window, Editor::open_git_blame_commit);
-        register_action(editor, window, Editor::toggle_selected_diff_hunks);
-        register_action(editor, window, Editor::toggle_staged_selected_diff_hunks);
-        register_action(editor, window, Editor::stage_and_next);
-        register_action(editor, window, Editor::unstage_and_next);
-        register_action(editor, window, Editor::expand_all_diff_hunks);
-        register_action(editor, window, Editor::collapse_all_diff_hunks);
-        register_action(editor, window, Editor::go_to_previous_change);
-        register_action(editor, window, Editor::go_to_next_change);
-        register_action(editor, window, Editor::go_to_prev_reference);
-        register_action(editor, window, Editor::go_to_next_reference);
-
-        register_action(editor, window, |editor, action, window, cx| {
-            if let Some(task) = editor.format(action, window, cx) {
-                task.detach_and_notify_err(window, cx);
-            } else {
-                cx.propagate();
-            }
-        });
-        register_action(editor, window, |editor, action, window, cx| {
-            if let Some(task) = editor.format_selections(action, window, cx) {
-                task.detach_and_notify_err(window, cx);
-            } else {
-                cx.propagate();
-            }
-        });
-        register_action(editor, window, |editor, action, window, cx| {
-            if let Some(task) = editor.organize_imports(action, window, cx) {
-                task.detach_and_notify_err(window, cx);
-            } else {
-                cx.propagate();
-            }
-        });
-        register_action(editor, window, Editor::restart_language_server);
-        register_action(editor, window, Editor::stop_language_server);
-        register_action(editor, window, Editor::show_character_palette);
-        register_action(editor, window, |editor, action, window, cx| {
-            if let Some(task) = editor.confirm_completion(action, window, cx) {
-                task.detach_and_notify_err(window, cx);
-            } else {
-                cx.propagate();
-            }
-        });
-        register_action(editor, window, |editor, action, window, cx| {
-            if let Some(task) = editor.confirm_completion_replace(action, window, cx) {
-                task.detach_and_notify_err(window, cx);
-            } else {
-                cx.propagate();
-            }
-        });
-        register_action(editor, window, |editor, action, window, cx| {
-            if let Some(task) = editor.confirm_completion_insert(action, window, cx) {
-                task.detach_and_notify_err(window, cx);
-            } else {
-                cx.propagate();
-            }
-        });
-        register_action(editor, window, |editor, action, window, cx| {
-            if let Some(task) = editor.compose_completion(action, window, cx) {
-                task.detach_and_notify_err(window, cx);
-            } else {
-                cx.propagate();
-            }
-        });
-        register_action(editor, window, |editor, action, window, cx| {
-            if let Some(task) = editor.confirm_code_action(action, window, cx) {
-                task.detach_and_notify_err(window, cx);
-            } else {
-                cx.propagate();
-            }
-        });
-        register_action(editor, window, |editor, action, window, cx| {
-            if let Some(task) = editor.rename(action, window, cx) {
-                task.detach_and_notify_err(window, cx);
-            } else {
-                cx.propagate();
-            }
-        });
-        register_action(editor, window, |editor, action, window, cx| {
-            if let Some(task) = editor.confirm_rename(action, window, cx) {
-                task.detach_and_notify_err(window, cx);
-            } else {
-                cx.propagate();
-            }
-        });
-        register_action(editor, window, |editor, action, window, cx| {
-            if let Some(task) = editor.find_all_references(action, window, cx) {
-                task.detach_and_log_err(cx);
-            } else {
-                cx.propagate();
-            }
-        });
-        register_action(editor, window, Editor::show_signature_help);
-        register_action(editor, window, Editor::signature_help_prev);
-        register_action(editor, window, Editor::signature_help_next);
-        register_action(editor, window, Editor::next_edit_prediction);
-        register_action(editor, window, Editor::previous_edit_prediction);
-        register_action(editor, window, Editor::show_edit_prediction);
-        register_action(editor, window, Editor::context_menu_first);
-        register_action(editor, window, Editor::context_menu_prev);
-        register_action(editor, window, Editor::context_menu_next);
-        register_action(editor, window, Editor::context_menu_last);
-        register_action(editor, window, Editor::display_cursor_names);
-        register_action(editor, window, Editor::unique_lines_case_insensitive);
-        register_action(editor, window, Editor::unique_lines_case_sensitive);
-        register_action(editor, window, Editor::accept_partial_edit_prediction);
-        register_action(editor, window, Editor::accept_edit_prediction);
-        register_action(editor, window, Editor::restore_file);
-        register_action(editor, window, Editor::git_restore);
-        register_action(editor, window, Editor::apply_all_diff_hunks);
-        register_action(editor, window, Editor::apply_selected_diff_hunks);
-        register_action(editor, window, Editor::open_active_item_in_terminal);
-        register_action(editor, window, Editor::reload_file);
-        register_action(editor, window, Editor::spawn_nearest_task);
-        register_action(editor, window, Editor::insert_uuid_v4);
-        register_action(editor, window, Editor::insert_uuid_v7);
-        register_action(editor, window, Editor::open_selections_in_multibuffer);
-        register_action(editor, window, Editor::toggle_breakpoint);
-        register_action(editor, window, Editor::edit_log_breakpoint);
-        register_action(editor, window, Editor::enable_breakpoint);
-        register_action(editor, window, Editor::disable_breakpoint);
-        if editor.read(cx).enable_wrap_selections_in_tag(cx) {
-            register_action(editor, window, Editor::wrap_selections_in_tag);
-        }
-    }
-
-    fn register_key_listeners(&self, window: &mut Window, _: &mut App, layout: &EditorLayout) {
-        let position_map = layout.position_map.clone();
-        window.on_key_event({
-            let editor = self.editor.clone();
-            move |event: &ModifiersChangedEvent, phase, window, cx| {
-                if phase != DispatchPhase::Bubble {
-                    return;
-                }
-                editor.update(cx, |editor, cx| {
-                    let inlay_hint_settings = inlay_hint_settings(
-                        editor.selections.newest_anchor().head(),
-                        &editor.buffer.read(cx).snapshot(cx),
-                        cx,
-                    );
-
-                    if let Some(inlay_modifiers) = inlay_hint_settings
-                        .toggle_on_modifiers_press
-                        .as_ref()
-                        .filter(|modifiers| modifiers.modified())
-                    {
-                        editor.refresh_inlay_hints(
-                            InlayHintRefreshReason::ModifiersChanged(
-                                inlay_modifiers == &event.modifiers,
-                            ),
-                            cx,
-                        );
-                    }
-
-                    if editor.hover_state.focused(window, cx) {
-                        return;
-                    }
-
-                    editor.handle_modifiers_changed(event.modifiers, &position_map, window, cx);
-                })
-            }
-        });
-    }
-
-    fn mouse_left_down(
-        editor: &mut Editor,
-        event: &MouseDownEvent,
-        position_map: &PositionMap,
-        line_numbers: &HashMap<MultiBufferRow, LineNumberLayout>,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) {
-        if window.default_prevented() {
-            return;
-        }
-
-        let text_hitbox = &position_map.text_hitbox;
-        let gutter_hitbox = &position_map.gutter_hitbox;
-        let point_for_position = position_map.point_for_position(event.position);
-        let mut click_count = event.click_count;
-        let mut modifiers = event.modifiers;
-
-        if let Some(hovered_hunk) =
-            position_map
-                .display_hunks
-                .iter()
-                .find_map(|(hunk, hunk_hitbox)| match hunk {
-                    DisplayDiffHunk::Folded { .. } => None,
-                    DisplayDiffHunk::Unfolded {
-                        multi_buffer_range, ..
-                    } => hunk_hitbox
-                        .as_ref()
-                        .is_some_and(|hitbox| hitbox.is_hovered(window))
-                        .then(|| multi_buffer_range.clone()),
-                })
-        {
-            editor.toggle_single_diff_hunk(hovered_hunk, cx);
-            cx.notify();
-            return;
-        } else if gutter_hitbox.is_hovered(window) {
-            click_count = 3; // Simulate triple-click when clicking the gutter to select lines
-        } else if !text_hitbox.is_hovered(window) {
-            return;
-        }
-
-        if EditorSettings::get_global(cx)
-            .drag_and_drop_selection
-            .enabled
-            && click_count == 1
-            && !modifiers.shift
-        {
-            let newest_anchor = editor.selections.newest_anchor();
-            let snapshot = editor.snapshot(window, cx);
-            let selection = newest_anchor.map(|anchor| anchor.to_display_point(&snapshot));
-            if point_for_position.intersects_selection(&selection) {
-                editor.selection_drag_state = SelectionDragState::ReadyToDrag {
-                    selection: newest_anchor.clone(),
-                    click_position: event.position,
-                    mouse_down_time: Instant::now(),
-                };
-                cx.stop_propagation();
-                return;
-            }
-        }
-
-        let is_singleton = editor.buffer().read(cx).is_singleton();
-
-        if click_count == 2 && !is_singleton {
-            match EditorSettings::get_global(cx).double_click_in_multibuffer {
-                DoubleClickInMultibuffer::Select => {
-                    // do nothing special on double click, all selection logic is below
-                }
-                DoubleClickInMultibuffer::Open => {
-                    if modifiers.alt {
-                        // if double click is made with alt, pretend it's a regular double click without opening and alt,
-                        // and run the selection logic.
-                        modifiers.alt = false;
-                    } else {
-                        let scroll_position_row = position_map.scroll_position.y;
-                        let display_row = (((event.position - gutter_hitbox.bounds.origin).y
-                            / position_map.line_height)
-                            as f64
-                            + position_map.scroll_position.y)
-                            as u32;
-                        let multi_buffer_row = position_map
-                            .snapshot
-                            .display_point_to_point(
-                                DisplayPoint::new(DisplayRow(display_row), 0),
-                                Bias::Right,
-                            )
-                            .row;
-                        let line_offset_from_top = display_row - scroll_position_row as u32;
-                        // if double click is made without alt, open the corresponding excerp
-                        editor.open_excerpts_common(
-                            Some(JumpData::MultiBufferRow {
-                                row: MultiBufferRow(multi_buffer_row),
-                                line_offset_from_top,
-                            }),
-                            false,
-                            window,
-                            cx,
-                        );
-                        return;
-                    }
-                }
-            }
-        }
-
-        if !is_singleton {
-            let display_row = (ScrollPixelOffset::from(
-                (event.position - gutter_hitbox.bounds.origin).y / position_map.line_height,
-            ) + position_map.scroll_position.y) as u32;
-            let multi_buffer_row = position_map
-                .snapshot
-                .display_point_to_point(DisplayPoint::new(DisplayRow(display_row), 0), Bias::Right)
-                .row;
-            if line_numbers
-                .get(&MultiBufferRow(multi_buffer_row))
-                .is_some_and(|line_layout| {
-                    line_layout.segments.iter().any(|segment| {
-                        segment
-                            .hitbox
-                            .as_ref()
-                            .is_some_and(|hitbox| hitbox.contains(&event.position))
-                    })
-                })
-            {
-                let line_offset_from_top = display_row - position_map.scroll_position.y as u32;
-
-                editor.open_excerpts_common(
-                    Some(JumpData::MultiBufferRow {
-                        row: MultiBufferRow(multi_buffer_row),
-                        line_offset_from_top,
-                    }),
-                    modifiers.alt,
-                    window,
-                    cx,
-                );
-                cx.stop_propagation();
-                return;
-            }
-        }
-
-        let position = point_for_position.previous_valid;
-        if let Some(mode) = Editor::columnar_selection_mode(&modifiers, cx) {
-            editor.select(
-                SelectPhase::BeginColumnar {
-                    position,
-                    reset: match mode {
-                        ColumnarMode::FromMouse => true,
-                        ColumnarMode::FromSelection => false,
-                    },
-                    mode,
-                    goal_column: point_for_position.exact_unclipped.column(),
-                },
-                window,
-                cx,
-            );
-        } else if modifiers.shift && !modifiers.control && !modifiers.alt && !modifiers.secondary()
-        {
-            editor.select(
-                SelectPhase::Extend {
-                    position,
-                    click_count,
-                },
-                window,
-                cx,
-            );
-        } else {
-            editor.select(
-                SelectPhase::Begin {
-                    position,
-                    add: Editor::is_alt_pressed(&modifiers, cx),
-                    click_count,
-                },
-                window,
-                cx,
-            );
-        }
-        cx.stop_propagation();
-    }
-
-    fn mouse_right_down(
-        editor: &mut Editor,
-        event: &MouseDownEvent,
-        position_map: &PositionMap,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) {
-        if position_map.gutter_hitbox.is_hovered(window) {
-            let gutter_right_padding = editor.gutter_dimensions.right_padding;
-            let hitbox = &position_map.gutter_hitbox;
-
-            if event.position.x <= hitbox.bounds.right() - gutter_right_padding {
-                let point_for_position = position_map.point_for_position(event.position);
-                editor.set_breakpoint_context_menu(
-                    point_for_position.previous_valid.row(),
-                    None,
-                    event.position,
-                    window,
-                    cx,
-                );
-            }
-            return;
-        }
-
-        if !position_map.text_hitbox.is_hovered(window) {
-            return;
-        }
-
-        let point_for_position = position_map.point_for_position(event.position);
-        mouse_context_menu::deploy_context_menu(
-            editor,
-            Some(event.position),
-            point_for_position.previous_valid,
-            window,
-            cx,
-        );
-        cx.stop_propagation();
-    }
-
-    fn mouse_middle_down(
-        editor: &mut Editor,
-        event: &MouseDownEvent,
-        position_map: &PositionMap,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) {
-        if !position_map.text_hitbox.is_hovered(window) || window.default_prevented() {
-            return;
-        }
-
-        let point_for_position = position_map.point_for_position(event.position);
-        let position = point_for_position.previous_valid;
-
-        editor.select(
-            SelectPhase::BeginColumnar {
-                position,
-                reset: true,
-                mode: ColumnarMode::FromMouse,
-                goal_column: point_for_position.exact_unclipped.column(),
-            },
-            window,
-            cx,
-        );
-    }
-
-    fn mouse_up(
-        editor: &mut Editor,
-        event: &MouseUpEvent,
-        position_map: &PositionMap,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) {
-        let text_hitbox = &position_map.text_hitbox;
-        let end_selection = editor.has_pending_selection();
-        let pending_nonempty_selections = editor.has_pending_nonempty_selection();
-        let point_for_position = position_map.point_for_position(event.position);
-
-        match editor.selection_drag_state {
-            SelectionDragState::ReadyToDrag {
-                selection: _,
-                ref click_position,
-                mouse_down_time: _,
-            } => {
-                if event.position == *click_position {
-                    editor.select(
-                        SelectPhase::Begin {
-                            position: point_for_position.previous_valid,
-                            add: false,
-                            click_count: 1, // ready to drag state only occurs on click count 1
-                        },
-                        window,
-                        cx,
-                    );
-                    editor.selection_drag_state = SelectionDragState::None;
-                    cx.stop_propagation();
-                    return;
-                } else {
-                    debug_panic!("drag state can never be in ready state after drag")
-                }
-            }
-            SelectionDragState::Dragging { ref selection, .. } => {
-                let snapshot = editor.snapshot(window, cx);
-                let selection_display = selection.map(|anchor| anchor.to_display_point(&snapshot));
-                if !point_for_position.intersects_selection(&selection_display)
-                    && text_hitbox.is_hovered(window)
-                {
-                    let is_cut = !(cfg!(target_os = "macos") && event.modifiers.alt
-                        || cfg!(not(target_os = "macos")) && event.modifiers.control);
-                    editor.move_selection_on_drop(
-                        &selection.clone(),
-                        point_for_position.previous_valid,
-                        is_cut,
-                        window,
-                        cx,
-                    );
-                }
-                editor.selection_drag_state = SelectionDragState::None;
-                cx.stop_propagation();
-                cx.notify();
-                return;
-            }
-            _ => {}
-        }
-
-        if end_selection {
-            editor.select(SelectPhase::End, window, cx);
-        }
-
-        if end_selection && pending_nonempty_selections {
-            cx.stop_propagation();
-        } else if cfg!(any(target_os = "linux", target_os = "freebsd"))
-            && event.button == MouseButton::Middle
-        {
-            #[allow(
-                clippy::collapsible_if,
-                clippy::needless_return,
-                reason = "The cfg-block below makes this a false positive"
-            )]
-            if !text_hitbox.is_hovered(window) || editor.read_only(cx) {
-                return;
-            }
-
-            #[cfg(any(target_os = "linux", target_os = "freebsd"))]
-            if EditorSettings::get_global(cx).middle_click_paste {
-                if let Some(text) = cx.read_from_primary().and_then(|item| item.text()) {
-                    let point_for_position = position_map.point_for_position(event.position);
-                    let position = point_for_position.previous_valid;
-
-                    editor.select(
-                        SelectPhase::Begin {
-                            position,
-                            add: false,
-                            click_count: 1,
-                        },
-                        window,
-                        cx,
-                    );
-                    editor.insert(&text, window, cx);
-                }
-                cx.stop_propagation()
-            }
-        }
-    }
-
-    fn click(
-        editor: &mut Editor,
-        event: &ClickEvent,
-        position_map: &PositionMap,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) {
-        let text_hitbox = &position_map.text_hitbox;
-        let pending_nonempty_selections = editor.has_pending_nonempty_selection();
-
-        let hovered_link_modifier = Editor::is_cmd_or_ctrl_pressed(&event.modifiers(), cx);
-
-        if let Some(mouse_position) = event.mouse_position()
-            && !pending_nonempty_selections
-            && hovered_link_modifier
-            && text_hitbox.is_hovered(window)
-        {
-            let point = position_map.point_for_position(mouse_position);
-            editor.handle_click_hovered_link(point, event.modifiers(), window, cx);
-            editor.selection_drag_state = SelectionDragState::None;
-
-            cx.stop_propagation();
-        }
-    }
-
-    fn mouse_dragged(
-        editor: &mut Editor,
-        event: &MouseMoveEvent,
-        position_map: &PositionMap,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) {
-        if !editor.has_pending_selection()
-            && matches!(editor.selection_drag_state, SelectionDragState::None)
-        {
-            return;
-        }
-
-        let point_for_position = position_map.point_for_position(event.position);
-        let text_hitbox = &position_map.text_hitbox;
-
-        let scroll_delta = {
-            let text_bounds = text_hitbox.bounds;
-            let mut scroll_delta = gpui::Point::<f32>::default();
-            let vertical_margin = position_map.line_height.min(text_bounds.size.height / 3.0);
-            let top = text_bounds.origin.y + vertical_margin;
-            let bottom = text_bounds.bottom_left().y - vertical_margin;
-            if event.position.y < top {
-                scroll_delta.y = -scale_vertical_mouse_autoscroll_delta(top - event.position.y);
-            }
-            if event.position.y > bottom {
-                scroll_delta.y = scale_vertical_mouse_autoscroll_delta(event.position.y - bottom);
-            }
-
-            // We need horizontal width of text
-            let style = editor.style.clone().unwrap_or_default();
-            let font_id = window.text_system().resolve_font(&style.text.font());
-            let font_size = style.text.font_size.to_pixels(window.rem_size());
-            let em_width = window.text_system().em_width(font_id, font_size).unwrap();
-
-            let scroll_margin_x = EditorSettings::get_global(cx).horizontal_scroll_margin;
-
-            let scroll_space: Pixels = scroll_margin_x * em_width;
-
-            let left = text_bounds.origin.x + scroll_space;
-            let right = text_bounds.top_right().x - scroll_space;
-
-            if event.position.x < left {
-                scroll_delta.x = -scale_horizontal_mouse_autoscroll_delta(left - event.position.x);
-            }
-            if event.position.x > right {
-                scroll_delta.x = scale_horizontal_mouse_autoscroll_delta(event.position.x - right);
-            }
-            scroll_delta
-        };
-
-        if !editor.has_pending_selection() {
-            let drop_anchor = position_map
-                .snapshot
-                .display_point_to_anchor(point_for_position.previous_valid, Bias::Left);
-            match editor.selection_drag_state {
-                SelectionDragState::Dragging {
-                    ref mut drop_cursor,
-                    ref mut hide_drop_cursor,
-                    ..
-                } => {
-                    drop_cursor.start = drop_anchor;
-                    drop_cursor.end = drop_anchor;
-                    *hide_drop_cursor = !text_hitbox.is_hovered(window);
-                    editor.apply_scroll_delta(scroll_delta, window, cx);
-                    cx.notify();
-                }
-                SelectionDragState::ReadyToDrag {
-                    ref selection,
-                    ref click_position,
-                    ref mouse_down_time,
-                } => {
-                    let drag_and_drop_delay = Duration::from_millis(
-                        EditorSettings::get_global(cx)
-                            .drag_and_drop_selection
-                            .delay
-                            .0,
-                    );
-                    if mouse_down_time.elapsed() >= drag_and_drop_delay {
-                        let drop_cursor = Selection {
-                            id: post_inc(&mut editor.selections.next_selection_id()),
-                            start: drop_anchor,
-                            end: drop_anchor,
-                            reversed: false,
-                            goal: SelectionGoal::None,
-                        };
-                        editor.selection_drag_state = SelectionDragState::Dragging {
-                            selection: selection.clone(),
-                            drop_cursor,
-                            hide_drop_cursor: false,
-                        };
-                        editor.apply_scroll_delta(scroll_delta, window, cx);
-                        cx.notify();
-                    } else {
-                        let click_point = position_map.point_for_position(*click_position);
-                        editor.selection_drag_state = SelectionDragState::None;
-                        editor.select(
-                            SelectPhase::Begin {
-                                position: click_point.previous_valid,
-                                add: false,
-                                click_count: 1,
-                            },
-                            window,
-                            cx,
-                        );
-                        editor.select(
-                            SelectPhase::Update {
-                                position: point_for_position.previous_valid,
-                                goal_column: point_for_position.exact_unclipped.column(),
-                                scroll_delta,
-                            },
-                            window,
-                            cx,
-                        );
-                    }
-                }
-                _ => {}
-            }
-        } else {
-            editor.select(
-                SelectPhase::Update {
-                    position: point_for_position.previous_valid,
-                    goal_column: point_for_position.exact_unclipped.column(),
-                    scroll_delta,
-                },
-                window,
-                cx,
-            );
-        }
-    }
-
-    pub(crate) fn mouse_moved(
-        editor: &mut Editor,
-        event: &MouseMoveEvent,
-        position_map: &PositionMap,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) {
-        let text_hitbox = &position_map.text_hitbox;
-        let gutter_hitbox = &position_map.gutter_hitbox;
-        let modifiers = event.modifiers;
-        let text_hovered = text_hitbox.is_hovered(window);
-        let gutter_hovered = gutter_hitbox.bounds.contains(&event.position);
-        editor.set_gutter_hovered(gutter_hovered, cx);
-        editor.show_mouse_cursor(cx);
-
-        let point_for_position = position_map.point_for_position(event.position);
-        let valid_point = point_for_position.previous_valid;
-
-        let hovered_diff_control = position_map
-            .diff_hunk_control_bounds
-            .iter()
-            .find(|(_, bounds)| bounds.contains(&event.position))
-            .map(|(row, _)| *row);
-
-        let hovered_diff_hunk_row = if let Some(control_row) = hovered_diff_control {
-            Some(control_row)
-        } else if text_hovered {
-            let current_row = valid_point.row();
-            position_map.display_hunks.iter().find_map(|(hunk, _)| {
-                if let DisplayDiffHunk::Unfolded {
-                    display_row_range, ..
-                } = hunk
-                {
-                    if display_row_range.contains(&current_row) {
-                        Some(display_row_range.start)
-                    } else {
-                        None
-                    }
-                } else {
-                    None
-                }
-            })
-        } else {
-            None
-        };
-
-        if hovered_diff_hunk_row != editor.hovered_diff_hunk_row {
-            editor.hovered_diff_hunk_row = hovered_diff_hunk_row;
-            cx.notify();
-        }
-
-        if let Some((bounds, buffer_id, blame_entry)) = &position_map.inline_blame_bounds {
-            let mouse_over_inline_blame = bounds.contains(&event.position);
-            let mouse_over_popover = editor
-                .inline_blame_popover
-                .as_ref()
-                .and_then(|state| state.popover_bounds)
-                .is_some_and(|bounds| bounds.contains(&event.position));
-            let keyboard_grace = editor
-                .inline_blame_popover
-                .as_ref()
-                .is_some_and(|state| state.keyboard_grace);
-
-            if mouse_over_inline_blame || mouse_over_popover {
-                editor.show_blame_popover(*buffer_id, blame_entry, event.position, false, cx);
-            } else if !keyboard_grace {
-                editor.hide_blame_popover(false, cx);
-            }
-        } else {
-            let keyboard_grace = editor
-                .inline_blame_popover
-                .as_ref()
-                .is_some_and(|state| state.keyboard_grace);
-            if !keyboard_grace {
-                editor.hide_blame_popover(false, cx);
-            }
-        }
-
-        let breakpoint_indicator = if gutter_hovered {
-            let buffer_anchor = position_map
-                .snapshot
-                .display_point_to_anchor(valid_point, Bias::Left);
-
-            if let Some((buffer_snapshot, file)) = position_map
-                .snapshot
-                .buffer_snapshot()
-                .buffer_for_excerpt(buffer_anchor.excerpt_id)
-                .and_then(|buffer| buffer.file().map(|file| (buffer, file)))
-            {
-                let as_point = text::ToPoint::to_point(&buffer_anchor.text_anchor, buffer_snapshot);
-
-                let is_visible = editor
-                    .gutter_breakpoint_indicator
-                    .0
-                    .is_some_and(|indicator| indicator.is_active);
-
-                let has_existing_breakpoint =
-                    editor.breakpoint_store.as_ref().is_some_and(|store| {
-                        let Some(project) = &editor.project else {
-                            return false;
-                        };
-                        let Some(abs_path) = project.read(cx).absolute_path(
-                            &ProjectPath {
-                                path: file.path().clone(),
-                                worktree_id: file.worktree_id(cx),
-                            },
-                            cx,
-                        ) else {
-                            return false;
-                        };
-                        store
-                            .read(cx)
-                            .breakpoint_at_row(&abs_path, as_point.row, cx)
-                            .is_some()
-                    });
-
-                if !is_visible {
-                    editor.gutter_breakpoint_indicator.1.get_or_insert_with(|| {
-                        cx.spawn(async move |this, cx| {
-                            cx.background_executor()
-                                .timer(Duration::from_millis(200))
-                                .await;
-
-                            this.update(cx, |this, cx| {
-                                if let Some(indicator) = this.gutter_breakpoint_indicator.0.as_mut()
-                                {
-                                    indicator.is_active = true;
-                                    cx.notify();
-                                }
-                            })
-                            .ok();
-                        })
-                    });
-                }
-
-                Some(PhantomBreakpointIndicator {
-                    display_row: valid_point.row(),
-                    is_active: is_visible,
-                    collides_with_existing_breakpoint: has_existing_breakpoint,
-                })
-            } else {
-                editor.gutter_breakpoint_indicator.1 = None;
-                None
-            }
-        } else {
-            editor.gutter_breakpoint_indicator.1 = None;
-            None
-        };
-
-        if &breakpoint_indicator != &editor.gutter_breakpoint_indicator.0 {
-            editor.gutter_breakpoint_indicator.0 = breakpoint_indicator;
-            cx.notify();
-        }
-
-        // Don't trigger hover popover if mouse is hovering over context menu
-        if text_hovered {
-            editor.update_hovered_link(
-                point_for_position,
-                &position_map.snapshot,
-                modifiers,
-                window,
-                cx,
-            );
-
-            if let Some(point) = point_for_position.as_valid() {
-                let anchor = position_map
-                    .snapshot
-                    .buffer_snapshot()
-                    .anchor_before(point.to_offset(&position_map.snapshot, Bias::Left));
-                hover_at(editor, Some(anchor), window, cx);
-                Self::update_visible_cursor(editor, point, position_map, window, cx);
-            } else {
-                editor.update_inlay_link_and_hover_points(
-                    &position_map.snapshot,
-                    point_for_position,
-                    modifiers.secondary(),
-                    modifiers.shift,
-                    window,
-                    cx,
-                );
-            }
-        } else {
-            editor.hide_hovered_link(cx);
-            hover_at(editor, None, window, cx);
-        }
-    }
-
-    fn update_visible_cursor(
-        editor: &mut Editor,
-        point: DisplayPoint,
-        position_map: &PositionMap,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) {
-        let snapshot = &position_map.snapshot;
-        let Some(hub) = editor.collaboration_hub() else {
-            return;
-        };
-        let start = snapshot.display_snapshot.clip_point(
-            DisplayPoint::new(point.row(), point.column().saturating_sub(1)),
-            Bias::Left,
-        );
-        let end = snapshot.display_snapshot.clip_point(
-            DisplayPoint::new(
-                point.row(),
-                (point.column() + 1).min(snapshot.line_len(point.row())),
-            ),
-            Bias::Right,
-        );
-
-        let range = snapshot
-            .buffer_snapshot()
-            .anchor_before(start.to_point(&snapshot.display_snapshot))
-            ..snapshot
-                .buffer_snapshot()
-                .anchor_after(end.to_point(&snapshot.display_snapshot));
-
-        let Some(selection) = snapshot.remote_selections_in_range(&range, hub, cx).next() else {
-            return;
-        };
-        let key = crate::HoveredCursor {
-            replica_id: selection.replica_id,
-            selection_id: selection.selection.id,
-        };
-        editor.hovered_cursors.insert(
-            key.clone(),
-            cx.spawn_in(window, async move |editor, cx| {
-                cx.background_executor().timer(CURSORS_VISIBLE_FOR).await;
-                editor
-                    .update(cx, |editor, cx| {
-                        editor.hovered_cursors.remove(&key);
-                        cx.notify();
-                    })
-                    .ok();
-            }),
-        );
-        cx.notify()
-    }
-
-    fn layout_selections(
-        &self,
-        start_anchor: Anchor,
-        end_anchor: Anchor,
-        local_selections: &[Selection<Point>],
-        snapshot: &EditorSnapshot,
-        start_row: DisplayRow,
-        end_row: DisplayRow,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> (
-        Vec<(PlayerColor, Vec<SelectionLayout>)>,
-        BTreeMap<DisplayRow, LineHighlightSpec>,
-        Option<DisplayPoint>,
-    ) {
-        let mut selections: Vec<(PlayerColor, Vec<SelectionLayout>)> = Vec::new();
-        let mut active_rows = BTreeMap::new();
-        let mut newest_selection_head = None;
-
-        let Some(editor_with_selections) = self.editor_with_selections(cx) else {
-            return (selections, active_rows, newest_selection_head);
-        };
-
-        editor_with_selections.update(cx, |editor, cx| {
-            if editor.show_local_selections {
-                let mut layouts = Vec::new();
-                let newest = editor.selections.newest(&editor.display_snapshot(cx));
-                for selection in local_selections.iter().cloned() {
-                    let is_empty = selection.start == selection.end;
-                    let is_newest = selection == newest;
-
-                    let layout = SelectionLayout::new(
-                        selection,
-                        editor.selections.line_mode(),
-                        editor.cursor_shape,
-                        &snapshot.display_snapshot,
-                        is_newest,
-                        editor.leader_id.is_none(),
-                        None,
-                    );
-                    if is_newest {
-                        newest_selection_head = Some(layout.head);
-                    }
-
-                    for row in cmp::max(layout.active_rows.start.0, start_row.0)
-                        ..=cmp::min(layout.active_rows.end.0, end_row.0)
-                    {
-                        let contains_non_empty_selection = active_rows
-                            .entry(DisplayRow(row))
-                            .or_insert_with(LineHighlightSpec::default);
-                        contains_non_empty_selection.selection |= !is_empty;
-                    }
-                    layouts.push(layout);
-                }
-
-                let mut player = editor.current_user_player_color(cx);
-                if !editor.is_focused(window) {
-                    const UNFOCUS_EDITOR_SELECTION_OPACITY: f32 = 0.5;
-                    player.selection = player.selection.opacity(UNFOCUS_EDITOR_SELECTION_OPACITY);
-                }
-                selections.push((player, layouts));
-
-                if let SelectionDragState::Dragging {
-                    ref selection,
-                    ref drop_cursor,
-                    ref hide_drop_cursor,
-                } = editor.selection_drag_state
-                    && !hide_drop_cursor
-                    && (drop_cursor
-                        .start
-                        .cmp(&selection.start, &snapshot.buffer_snapshot())
-                        .eq(&Ordering::Less)
-                        || drop_cursor
-                            .end
-                            .cmp(&selection.end, &snapshot.buffer_snapshot())
-                            .eq(&Ordering::Greater))
-                {
-                    let drag_cursor_layout = SelectionLayout::new(
-                        drop_cursor.clone(),
-                        false,
-                        CursorShape::Bar,
-                        &snapshot.display_snapshot,
-                        false,
-                        false,
-                        None,
-                    );
-                    let absent_color = cx.theme().players().absent();
-                    selections.push((absent_color, vec![drag_cursor_layout]));
-                }
-            }
-
-            if let Some(collaboration_hub) = &editor.collaboration_hub {
-                // When following someone, render the local selections in their color.
-                if let Some(leader_id) = editor.leader_id {
-                    match leader_id {
-                        CollaboratorId::PeerId(peer_id) => {
-                            if let Some(collaborator) =
-                                collaboration_hub.collaborators(cx).get(&peer_id)
-                                && let Some(participant_index) = collaboration_hub
-                                    .user_participant_indices(cx)
-                                    .get(&collaborator.user_id)
-                                && let Some((local_selection_style, _)) = selections.first_mut()
-                            {
-                                *local_selection_style = cx
-                                    .theme()
-                                    .players()
-                                    .color_for_participant(participant_index.0);
-                            }
-                        }
-                        CollaboratorId::Agent => {
-                            if let Some((local_selection_style, _)) = selections.first_mut() {
-                                *local_selection_style = cx.theme().players().agent();
-                            }
-                        }
-                    }
-                }
-
-                let mut remote_selections = HashMap::default();
-                for selection in snapshot.remote_selections_in_range(
-                    &(start_anchor..end_anchor),
-                    collaboration_hub.as_ref(),
-                    cx,
-                ) {
-                    // Don't re-render the leader's selections, since the local selections
-                    // match theirs.
-                    if Some(selection.collaborator_id) == editor.leader_id {
-                        continue;
-                    }
-                    let key = HoveredCursor {
-                        replica_id: selection.replica_id,
-                        selection_id: selection.selection.id,
-                    };
-
-                    let is_shown =
-                        editor.show_cursor_names || editor.hovered_cursors.contains_key(&key);
-
-                    remote_selections
-                        .entry(selection.replica_id)
-                        .or_insert((selection.color, Vec::new()))
-                        .1
-                        .push(SelectionLayout::new(
-                            selection.selection,
-                            selection.line_mode,
-                            selection.cursor_shape,
-                            &snapshot.display_snapshot,
-                            false,
-                            false,
-                            if is_shown { selection.user_name } else { None },
-                        ));
-                }
-
-                selections.extend(remote_selections.into_values());
-            } else if !editor.is_focused(window) && editor.show_cursor_when_unfocused {
-                let layouts = snapshot
-                    .buffer_snapshot()
-                    .selections_in_range(&(start_anchor..end_anchor), true)
-                    .map(move |(_, line_mode, cursor_shape, selection)| {
-                        SelectionLayout::new(
-                            selection,
-                            line_mode,
-                            cursor_shape,
-                            &snapshot.display_snapshot,
-                            false,
-                            false,
-                            None,
-                        )
-                    })
-                    .collect::<Vec<_>>();
-                let player = editor.current_user_player_color(cx);
-                selections.push((player, layouts));
-            }
-        });
-
-        #[cfg(debug_assertions)]
-        Self::layout_debug_ranges(
-            &mut selections,
-            start_anchor..end_anchor,
-            &snapshot.display_snapshot,
-            cx,
-        );
-
-        (selections, active_rows, newest_selection_head)
-    }
-
-    fn collect_cursors(
-        &self,
-        snapshot: &EditorSnapshot,
-        cx: &mut App,
-    ) -> Vec<(DisplayPoint, Hsla)> {
-        let editor = self.editor.read(cx);
-        let mut cursors = Vec::new();
-        let mut skip_local = false;
-        let mut add_cursor = |anchor: Anchor, color| {
-            cursors.push((anchor.to_display_point(&snapshot.display_snapshot), color));
-        };
-        // Remote cursors
-        if let Some(collaboration_hub) = &editor.collaboration_hub {
-            for remote_selection in snapshot.remote_selections_in_range(
-                &(Anchor::min()..Anchor::max()),
-                collaboration_hub.deref(),
-                cx,
-            ) {
-                add_cursor(
-                    remote_selection.selection.head(),
-                    remote_selection.color.cursor,
-                );
-                if Some(remote_selection.collaborator_id) == editor.leader_id {
-                    skip_local = true;
-                }
-            }
-        }
-        // Local cursors
-        if !skip_local {
-            let color = cx.theme().players().local().cursor;
-            editor
-                .selections
-                .disjoint_anchors()
-                .iter()
-                .for_each(|selection| {
-                    add_cursor(selection.head(), color);
-                });
-            if let Some(ref selection) = editor.selections.pending_anchor() {
-                add_cursor(selection.head(), color);
-            }
-        }
-        cursors
-    }
-
-    fn layout_visible_cursors(
-        &self,
-        snapshot: &EditorSnapshot,
-        selections: &[(PlayerColor, Vec<SelectionLayout>)],
-        row_block_types: &HashMap<DisplayRow, bool>,
-        visible_display_row_range: Range<DisplayRow>,
-        line_layouts: &[LineWithInvisibles],
-        text_hitbox: &Hitbox,
-        content_origin: gpui::Point<Pixels>,
-        scroll_position: gpui::Point<ScrollOffset>,
-        scroll_pixel_position: gpui::Point<ScrollPixelOffset>,
-        line_height: Pixels,
-        em_width: Pixels,
-        em_advance: Pixels,
-        autoscroll_containing_element: bool,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Vec<CursorLayout> {
-        let mut autoscroll_bounds = None;
-        let cursor_layouts = self.editor.update(cx, |editor, cx| {
-            let mut cursors = Vec::new();
-
-            let show_local_cursors = editor.show_local_cursors(window, cx);
-
-            for (player_color, selections) in selections {
-                for selection in selections {
-                    let cursor_position = selection.head;
-
-                    let in_range = visible_display_row_range.contains(&cursor_position.row());
-                    if (selection.is_local && !show_local_cursors)
-                        || !in_range
-                        || row_block_types.get(&cursor_position.row()) == Some(&true)
-                    {
-                        continue;
-                    }
-
-                    let cursor_row_layout = &line_layouts
-                        [cursor_position.row().minus(visible_display_row_range.start) as usize];
-                    let cursor_column = cursor_position.column() as usize;
-
-                    let cursor_character_x = cursor_row_layout.x_for_index(cursor_column);
-                    let mut block_width =
-                        cursor_row_layout.x_for_index(cursor_column + 1) - cursor_character_x;
-                    if block_width == Pixels::ZERO {
-                        block_width = em_advance;
-                    }
-                    let block_text = if let CursorShape::Block = selection.cursor_shape {
-                        snapshot
-                            .grapheme_at(cursor_position)
-                            .or_else(|| {
-                                if snapshot.is_empty() {
-                                    snapshot.placeholder_text().and_then(|s| {
-                                        s.graphemes(true).next().map(|s| s.to_string().into())
-                                    })
-                                } else {
-                                    None
-                                }
-                            })
-                            .map(|text| {
-                                let len = text.len();
-
-                                let mut font = cursor_row_layout
-                                    .font_id_for_index(cursor_column)
-                                    .and_then(|cursor_font_id| {
-                                        window.text_system().get_font_for_id(cursor_font_id)
-                                    })
-                                    .unwrap_or(self.style.text.font());
-                                font.features = self.style.text.font_features.clone();
-
-                                // Invert the text color for the block cursor. Ensure that the text
-                                // color is opaque enough to be visible against the background color.
-                                //
-                                // 0.75 is an arbitrary threshold to determine if the background color is
-                                // opaque enough to use as a text color.
-                                //
-                                // TODO: In the future we should ensure themes have a `text_inverse` color.
-                                let color = if cx.theme().colors().editor_background.a < 0.75 {
-                                    match cx.theme().appearance {
-                                        Appearance::Dark => Hsla::black(),
-                                        Appearance::Light => Hsla::white(),
-                                    }
-                                } else {
-                                    cx.theme().colors().editor_background
-                                };
-
-                                window.text_system().shape_line(
-                                    text,
-                                    cursor_row_layout.font_size,
-                                    &[TextRun {
-                                        len,
-                                        font,
-                                        color,
-                                        ..Default::default()
-                                    }],
-                                    None,
-                                )
-                            })
-                    } else {
-                        None
-                    };
-
-                    let x = cursor_character_x - scroll_pixel_position.x.into();
-                    let y = ((cursor_position.row().as_f64() - scroll_position.y)
-                        * ScrollPixelOffset::from(line_height))
-                    .into();
-                    if selection.is_newest {
-                        editor.pixel_position_of_newest_cursor = Some(point(
-                            text_hitbox.origin.x + x + block_width / 2.,
-                            text_hitbox.origin.y + y + line_height / 2.,
-                        ));
-
-                        if autoscroll_containing_element {
-                            let top = text_hitbox.origin.y
-                                + ((cursor_position.row().as_f64() - scroll_position.y - 3.)
-                                    .max(0.)
-                                    * ScrollPixelOffset::from(line_height))
-                                .into();
-                            let left = text_hitbox.origin.x
-                                + ((cursor_position.column() as ScrollOffset
-                                    - scroll_position.x
-                                    - 3.)
-                                    .max(0.)
-                                    * ScrollPixelOffset::from(em_width))
-                                .into();
-
-                            let bottom = text_hitbox.origin.y
-                                + ((cursor_position.row().as_f64() - scroll_position.y + 4.)
-                                    * ScrollPixelOffset::from(line_height))
-                                .into();
-                            let right = text_hitbox.origin.x
-                                + ((cursor_position.column() as ScrollOffset - scroll_position.x
-                                    + 4.)
-                                    * ScrollPixelOffset::from(em_width))
-                                .into();
-
-                            autoscroll_bounds =
-                                Some(Bounds::from_corners(point(left, top), point(right, bottom)))
-                        }
-                    }
-
-                    let mut cursor = CursorLayout {
-                        color: player_color.cursor,
-                        block_width,
-                        origin: point(x, y),
-                        line_height,
-                        shape: selection.cursor_shape,
-                        block_text,
-                        cursor_name: None,
-                    };
-                    let cursor_name = selection.user_name.clone().map(|name| CursorName {
-                        string: name,
-                        color: self.style.background,
-                        is_top_row: cursor_position.row().0 == 0,
-                    });
-                    cursor.layout(content_origin, cursor_name, window, cx);
-                    cursors.push(cursor);
-                }
-            }
-
-            cursors
-        });
-
-        if let Some(bounds) = autoscroll_bounds {
-            window.request_autoscroll(bounds);
-        }
-
-        cursor_layouts
-    }
-
-    fn layout_scrollbars(
-        &self,
-        snapshot: &EditorSnapshot,
-        scrollbar_layout_information: &ScrollbarLayoutInformation,
-        content_offset: gpui::Point<Pixels>,
-        scroll_position: gpui::Point<ScrollOffset>,
-        non_visible_cursors: bool,
-        right_margin: Pixels,
-        editor_width: Pixels,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<EditorScrollbars> {
-        let show_scrollbars = self.editor.read(cx).show_scrollbars;
-        if (!show_scrollbars.horizontal && !show_scrollbars.vertical)
-            || self.style.scrollbar_width.is_zero()
-        {
-            return None;
-        }
-
-        // If a drag took place after we started dragging the scrollbar,
-        // cancel the scrollbar drag.
-        if cx.has_active_drag() {
-            self.editor.update(cx, |editor, cx| {
-                editor.scroll_manager.reset_scrollbar_state(cx)
-            });
-        }
-
-        let editor_settings = EditorSettings::get_global(cx);
-        let scrollbar_settings = editor_settings.scrollbar;
-        let show_scrollbars = match scrollbar_settings.show {
-            ShowScrollbar::Auto => {
-                let editor = self.editor.read(cx);
-                let is_singleton = editor.buffer_kind(cx) == ItemBufferKind::Singleton;
-                // Git
-                (is_singleton && scrollbar_settings.git_diff && snapshot.buffer_snapshot().has_diff_hunks())
-                ||
-                // Buffer Search Results
-                (is_singleton && scrollbar_settings.search_results && editor.has_background_highlights::<BufferSearchHighlights>())
-                ||
-                // Selected Text Occurrences
-                (is_singleton && scrollbar_settings.selected_text && editor.has_background_highlights::<SelectedTextHighlight>())
-                ||
-                // Selected Symbol Occurrences
-                (is_singleton && scrollbar_settings.selected_symbol && (editor.has_background_highlights::<DocumentHighlightRead>() || editor.has_background_highlights::<DocumentHighlightWrite>()))
-                ||
-                // Diagnostics
-                (is_singleton && scrollbar_settings.diagnostics != ScrollbarDiagnostics::None && snapshot.buffer_snapshot().has_diagnostics())
-                ||
-                // Cursors out of sight
-                non_visible_cursors
-                ||
-                // Scrollmanager
-                editor.scroll_manager.scrollbars_visible()
-            }
-            ShowScrollbar::System => self.editor.read(cx).scroll_manager.scrollbars_visible(),
-            ShowScrollbar::Always => true,
-            ShowScrollbar::Never => return None,
-        };
-
-        // The horizontal scrollbar is usually slightly offset to align nicely with
-        // indent guides. However, this offset is not needed if indent guides are
-        // disabled for the current editor.
-        let content_offset = self
-            .editor
-            .read(cx)
-            .show_indent_guides
-            .is_none_or(|should_show| should_show)
-            .then_some(content_offset)
-            .unwrap_or_default();
-
-        Some(EditorScrollbars::from_scrollbar_axes(
-            ScrollbarAxes {
-                horizontal: scrollbar_settings.axes.horizontal
-                    && self.editor.read(cx).show_scrollbars.horizontal,
-                vertical: scrollbar_settings.axes.vertical
-                    && self.editor.read(cx).show_scrollbars.vertical,
-            },
-            scrollbar_layout_information,
-            content_offset,
-            scroll_position,
-            self.style.scrollbar_width,
-            right_margin,
-            editor_width,
-            show_scrollbars,
-            self.editor.read(cx).scroll_manager.active_scrollbar_state(),
-            window,
-        ))
-    }
-
-    fn layout_minimap(
-        &self,
-        snapshot: &EditorSnapshot,
-        minimap_width: Pixels,
-        scroll_position: gpui::Point<f64>,
-        scrollbar_layout_information: &ScrollbarLayoutInformation,
-        scrollbar_layout: Option<&EditorScrollbars>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<MinimapLayout> {
-        let minimap_editor = self.editor.read(cx).minimap().cloned()?;
-
-        let minimap_settings = EditorSettings::get_global(cx).minimap;
-
-        if minimap_settings.on_active_editor() {
-            let active_editor = self.editor.read(cx).workspace().and_then(|ws| {
-                ws.read(cx)
-                    .active_pane()
-                    .read(cx)
-                    .active_item()
-                    .and_then(|i| i.act_as::<Editor>(cx))
-            });
-            if active_editor.is_some_and(|e| e != self.editor) {
-                return None;
-            }
-        }
-
-        if !snapshot.mode.is_full()
-            || minimap_width.is_zero()
-            || matches!(
-                minimap_settings.show,
-                ShowMinimap::Auto if scrollbar_layout.is_none_or(|layout| !layout.visible)
-            )
-        {
-            return None;
-        }
-
-        const MINIMAP_AXIS: ScrollbarAxis = ScrollbarAxis::Vertical;
-
-        let ScrollbarLayoutInformation {
-            editor_bounds,
-            scroll_range,
-            glyph_grid_cell,
-        } = scrollbar_layout_information;
-
-        let line_height = glyph_grid_cell.height;
-        let scroll_position = scroll_position.along(MINIMAP_AXIS);
-
-        let top_right_anchor = scrollbar_layout
-            .and_then(|layout| layout.vertical.as_ref())
-            .map(|vertical_scrollbar| vertical_scrollbar.hitbox.origin)
-            .unwrap_or_else(|| editor_bounds.top_right());
-
-        let thumb_state = self
-            .editor
-            .read_with(cx, |editor, _| editor.scroll_manager.minimap_thumb_state());
-
-        let show_thumb = match minimap_settings.thumb {
-            MinimapThumb::Always => true,
-            MinimapThumb::Hover => thumb_state.is_some(),
-        };
-
-        let minimap_bounds = Bounds::from_corner_and_size(
-            Corner::TopRight,
-            top_right_anchor,
-            size(minimap_width, editor_bounds.size.height),
-        );
-        let minimap_line_height = self.get_minimap_line_height(
-            minimap_editor
-                .read(cx)
-                .text_style_refinement
-                .as_ref()
-                .and_then(|refinement| refinement.font_size)
-                .unwrap_or(MINIMAP_FONT_SIZE),
-            window,
-            cx,
-        );
-        let minimap_height = minimap_bounds.size.height;
-
-        let visible_editor_lines = (editor_bounds.size.height / line_height) as f64;
-        let total_editor_lines = (scroll_range.height / line_height) as f64;
-        let minimap_lines = (minimap_height / minimap_line_height) as f64;
-
-        let minimap_scroll_top = MinimapLayout::calculate_minimap_top_offset(
-            total_editor_lines,
-            visible_editor_lines,
-            minimap_lines,
-            scroll_position,
-        );
-
-        let layout = ScrollbarLayout::for_minimap(
-            window.insert_hitbox(minimap_bounds, HitboxBehavior::Normal),
-            visible_editor_lines,
-            total_editor_lines,
-            minimap_line_height,
-            scroll_position,
-            minimap_scroll_top,
-            show_thumb,
-        )
-        .with_thumb_state(thumb_state);
-
-        minimap_editor.update(cx, |editor, cx| {
-            editor.set_scroll_position(point(0., minimap_scroll_top), window, cx)
-        });
-
-        // Required for the drop shadow to be visible
-        const PADDING_OFFSET: Pixels = px(4.);
-
-        let mut minimap = div()
-            .size_full()
-            .shadow_xs()
-            .px(PADDING_OFFSET)
-            .child(minimap_editor)
-            .into_any_element();
-
-        let extended_bounds = minimap_bounds.extend(Edges {
-            right: PADDING_OFFSET,
-            left: PADDING_OFFSET,
-            ..Default::default()
-        });
-        minimap.layout_as_root(extended_bounds.size.into(), window, cx);
-        window.with_absolute_element_offset(extended_bounds.origin, |window| {
-            minimap.prepaint(window, cx)
-        });
-
-        Some(MinimapLayout {
-            minimap,
-            thumb_layout: layout,
-            thumb_border_style: minimap_settings.thumb_border,
-            minimap_line_height,
-            minimap_scroll_top,
-            max_scroll_top: total_editor_lines,
-        })
-    }
-
-    fn get_minimap_line_height(
-        &self,
-        font_size: AbsoluteLength,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Pixels {
-        let rem_size = self.rem_size(cx).unwrap_or(window.rem_size());
-        let mut text_style = self.style.text.clone();
-        text_style.font_size = font_size;
-        text_style.line_height_in_pixels(rem_size)
-    }
-
-    fn get_minimap_width(
-        &self,
-        minimap_settings: &Minimap,
-        scrollbars_shown: bool,
-        text_width: Pixels,
-        em_width: Pixels,
-        font_size: Pixels,
-        rem_size: Pixels,
-        cx: &App,
-    ) -> Option<Pixels> {
-        if minimap_settings.show == ShowMinimap::Auto && !scrollbars_shown {
-            return None;
-        }
-
-        let minimap_font_size = self.editor.read_with(cx, |editor, cx| {
-            editor.minimap().map(|minimap_editor| {
-                minimap_editor
-                    .read(cx)
-                    .text_style_refinement
-                    .as_ref()
-                    .and_then(|refinement| refinement.font_size)
-                    .unwrap_or(MINIMAP_FONT_SIZE)
-            })
-        })?;
-
-        let minimap_em_width = em_width * (minimap_font_size.to_pixels(rem_size) / font_size);
-
-        let minimap_width = (text_width * MinimapLayout::MINIMAP_WIDTH_PCT)
-            .min(minimap_em_width * minimap_settings.max_width_columns.get() as f32);
-
-        (minimap_width >= minimap_em_width * MinimapLayout::MINIMAP_MIN_WIDTH_COLUMNS)
-            .then_some(minimap_width)
-    }
-
-    fn prepaint_crease_toggles(
-        &self,
-        crease_toggles: &mut [Option<AnyElement>],
-        line_height: Pixels,
-        gutter_dimensions: &GutterDimensions,
-        gutter_settings: crate::editor_settings::Gutter,
-        scroll_pixel_position: gpui::Point<ScrollPixelOffset>,
-        gutter_hitbox: &Hitbox,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        for (ix, crease_toggle) in crease_toggles.iter_mut().enumerate() {
-            if let Some(crease_toggle) = crease_toggle {
-                debug_assert!(gutter_settings.folds);
-                let available_space = size(
-                    AvailableSpace::MinContent,
-                    AvailableSpace::Definite(line_height * 0.55),
-                );
-                let crease_toggle_size = crease_toggle.layout_as_root(available_space, window, cx);
-
-                let position = point(
-                    gutter_dimensions.width - gutter_dimensions.right_padding,
-                    ix as f32 * line_height
-                        - (scroll_pixel_position.y % ScrollPixelOffset::from(line_height)).into(),
-                );
-                let centering_offset = point(
-                    (gutter_dimensions.fold_area_width() - crease_toggle_size.width) / 2.,
-                    (line_height - crease_toggle_size.height) / 2.,
-                );
-                let origin = gutter_hitbox.origin + position + centering_offset;
-                crease_toggle.prepaint_as_root(origin, available_space, window, cx);
-            }
-        }
-    }
-
-    fn prepaint_expand_toggles(
-        &self,
-        expand_toggles: &mut [Option<(AnyElement, gpui::Point<Pixels>)>],
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        for (expand_toggle, origin) in expand_toggles.iter_mut().flatten() {
-            let available_space = size(AvailableSpace::MinContent, AvailableSpace::MinContent);
-            expand_toggle.layout_as_root(available_space, window, cx);
-            expand_toggle.prepaint_as_root(*origin, available_space, window, cx);
-        }
-    }
-
-    fn prepaint_crease_trailers(
-        &self,
-        trailers: Vec<Option<AnyElement>>,
-        lines: &[LineWithInvisibles],
-        line_height: Pixels,
-        content_origin: gpui::Point<Pixels>,
-        scroll_pixel_position: gpui::Point<ScrollPixelOffset>,
-        em_width: Pixels,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Vec<Option<CreaseTrailerLayout>> {
-        trailers
-            .into_iter()
-            .enumerate()
-            .map(|(ix, element)| {
-                let mut element = element?;
-                let available_space = size(
-                    AvailableSpace::MinContent,
-                    AvailableSpace::Definite(line_height),
-                );
-                let size = element.layout_as_root(available_space, window, cx);
-
-                let line = &lines[ix];
-                let padding = if line.width == Pixels::ZERO {
-                    Pixels::ZERO
-                } else {
-                    4. * em_width
-                };
-                let position = point(
-                    Pixels::from(scroll_pixel_position.x) + line.width + padding,
-                    ix as f32 * line_height
-                        - (scroll_pixel_position.y % ScrollPixelOffset::from(line_height)).into(),
-                );
-                let centering_offset = point(px(0.), (line_height - size.height) / 2.);
-                let origin = content_origin + position + centering_offset;
-                element.prepaint_as_root(origin, available_space, window, cx);
-                Some(CreaseTrailerLayout {
-                    element,
-                    bounds: Bounds::new(origin, size),
-                })
-            })
-            .collect()
-    }
-
-    // Folds contained in a hunk are ignored apart from shrinking visual size
-    // If a fold contains any hunks then that fold line is marked as modified
-    fn layout_gutter_diff_hunks(
-        &self,
-        line_height: Pixels,
-        gutter_hitbox: &Hitbox,
-        display_rows: Range<DisplayRow>,
-        snapshot: &EditorSnapshot,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Vec<(DisplayDiffHunk, Option<Hitbox>)> {
-        let folded_buffers = self.editor.read(cx).folded_buffers(cx);
-        let mut display_hunks = snapshot
-            .display_diff_hunks_for_rows(display_rows, folded_buffers)
-            .map(|hunk| (hunk, None))
-            .collect::<Vec<_>>();
-        let git_gutter_setting = ProjectSettings::get_global(cx).git.git_gutter;
-        if let GitGutterSetting::TrackedFiles = git_gutter_setting {
-            for (hunk, hitbox) in &mut display_hunks {
-                if matches!(hunk, DisplayDiffHunk::Unfolded { .. }) {
-                    let hunk_bounds =
-                        Self::diff_hunk_bounds(snapshot, line_height, gutter_hitbox.bounds, hunk);
-                    *hitbox = Some(window.insert_hitbox(hunk_bounds, HitboxBehavior::BlockMouse));
-                }
-            }
-        }
-
-        display_hunks
-    }
-
-    fn layout_inline_diagnostics(
-        &self,
-        line_layouts: &[LineWithInvisibles],
-        crease_trailers: &[Option<CreaseTrailerLayout>],
-        row_block_types: &HashMap<DisplayRow, bool>,
-        content_origin: gpui::Point<Pixels>,
-        scroll_position: gpui::Point<ScrollOffset>,
-        scroll_pixel_position: gpui::Point<ScrollPixelOffset>,
-        edit_prediction_popover_origin: Option<gpui::Point<Pixels>>,
-        start_row: DisplayRow,
-        end_row: DisplayRow,
-        line_height: Pixels,
-        em_width: Pixels,
-        style: &EditorStyle,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> HashMap<DisplayRow, AnyElement> {
-        let max_severity = match self
-            .editor
-            .read(cx)
-            .inline_diagnostics_enabled()
-            .then(|| {
-                ProjectSettings::get_global(cx)
-                    .diagnostics
-                    .inline
-                    .max_severity
-                    .unwrap_or_else(|| self.editor.read(cx).diagnostics_max_severity)
-                    .into_lsp()
-            })
-            .flatten()
-        {
-            Some(max_severity) => max_severity,
-            None => return HashMap::default(),
-        };
-
-        let active_diagnostics_group =
-            if let ActiveDiagnostic::Group(group) = &self.editor.read(cx).active_diagnostics {
-                Some(group.group_id)
-            } else {
-                None
-            };
-
-        let diagnostics_by_rows = self.editor.update(cx, |editor, cx| {
-            let snapshot = editor.snapshot(window, cx);
-            editor
-                .inline_diagnostics
-                .iter()
-                .filter(|(_, diagnostic)| diagnostic.severity <= max_severity)
-                .filter(|(_, diagnostic)| match active_diagnostics_group {
-                    Some(active_diagnostics_group) => {
-                        // Active diagnostics are all shown in the editor already, no need to display them inline
-                        diagnostic.group_id != active_diagnostics_group
-                    }
-                    None => true,
-                })
-                .map(|(point, diag)| (point.to_display_point(&snapshot), diag.clone()))
-                .skip_while(|(point, _)| point.row() < start_row)
-                .take_while(|(point, _)| point.row() < end_row)
-                .filter(|(point, _)| !row_block_types.contains_key(&point.row()))
-                .fold(HashMap::default(), |mut acc, (point, diagnostic)| {
-                    acc.entry(point.row())
-                        .or_insert_with(Vec::new)
-                        .push(diagnostic);
-                    acc
-                })
-        });
-
-        if diagnostics_by_rows.is_empty() {
-            return HashMap::default();
-        }
-
-        let severity_to_color = |sev: &lsp::DiagnosticSeverity| match sev {
-            &lsp::DiagnosticSeverity::ERROR => Color::Error,
-            &lsp::DiagnosticSeverity::WARNING => Color::Warning,
-            &lsp::DiagnosticSeverity::INFORMATION => Color::Info,
-            &lsp::DiagnosticSeverity::HINT => Color::Hint,
-            _ => Color::Error,
-        };
-
-        let padding = ProjectSettings::get_global(cx).diagnostics.inline.padding as f32 * em_width;
-        let min_x = column_pixels(
-            &self.style,
-            ProjectSettings::get_global(cx)
-                .diagnostics
-                .inline
-                .min_column as usize,
-            window,
-        );
-
-        let mut elements = HashMap::default();
-        for (row, mut diagnostics) in diagnostics_by_rows {
-            diagnostics.sort_by_key(|diagnostic| {
-                (
-                    diagnostic.severity,
-                    std::cmp::Reverse(diagnostic.is_primary),
-                    diagnostic.start.row,
-                    diagnostic.start.column,
-                )
-            });
-
-            let Some(diagnostic_to_render) = diagnostics
-                .iter()
-                .find(|diagnostic| diagnostic.is_primary)
-                .or_else(|| diagnostics.first())
-            else {
-                continue;
-            };
-
-            let pos_y = content_origin.y + line_height * (row.0 as f64 - scroll_position.y) as f32;
-
-            let window_ix = row.0.saturating_sub(start_row.0) as usize;
-            let pos_x = {
-                let crease_trailer_layout = &crease_trailers[window_ix];
-                let line_layout = &line_layouts[window_ix];
-
-                let line_end = if let Some(crease_trailer) = crease_trailer_layout {
-                    crease_trailer.bounds.right()
-                } else {
-                    Pixels::from(
-                        ScrollPixelOffset::from(content_origin.x + line_layout.width)
-                            - scroll_pixel_position.x,
-                    )
-                };
-
-                let padded_line = line_end + padding;
-                let min_start = Pixels::from(
-                    ScrollPixelOffset::from(content_origin.x + min_x) - scroll_pixel_position.x,
-                );
-
-                cmp::max(padded_line, min_start)
-            };
-
-            let behind_edit_prediction_popover = edit_prediction_popover_origin
-                .as_ref()
-                .is_some_and(|edit_prediction_popover_origin| {
-                    (pos_y..pos_y + line_height).contains(&edit_prediction_popover_origin.y)
-                });
-            let opacity = if behind_edit_prediction_popover {
-                0.5
-            } else {
-                1.0
-            };
-
-            let mut element = h_flex()
-                .id(("diagnostic", row.0))
-                .h(line_height)
-                .w_full()
-                .px_1()
-                .rounded_xs()
-                .opacity(opacity)
-                .bg(severity_to_color(&diagnostic_to_render.severity)
-                    .color(cx)
-                    .opacity(0.05))
-                .text_color(severity_to_color(&diagnostic_to_render.severity).color(cx))
-                .text_sm()
-                .font(style.text.font())
-                .child(diagnostic_to_render.message.clone())
-                .into_any();
-
-            element.prepaint_as_root(point(pos_x, pos_y), AvailableSpace::min_size(), window, cx);
-
-            elements.insert(row, element);
-        }
-
-        elements
-    }
-
-    fn layout_inline_code_actions(
-        &self,
-        display_point: DisplayPoint,
-        content_origin: gpui::Point<Pixels>,
-        scroll_position: gpui::Point<ScrollOffset>,
-        scroll_pixel_position: gpui::Point<ScrollPixelOffset>,
-        line_height: Pixels,
-        snapshot: &EditorSnapshot,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<AnyElement> {
-        if !snapshot
-            .show_code_actions
-            .unwrap_or(EditorSettings::get_global(cx).inline_code_actions)
-        {
-            return None;
-        }
-
-        let icon_size = ui::IconSize::XSmall;
-        let mut button = self.editor.update(cx, |editor, cx| {
-            editor.available_code_actions.as_ref()?;
-            let active = editor
-                .context_menu
-                .borrow()
-                .as_ref()
-                .and_then(|menu| {
-                    if let crate::CodeContextMenu::CodeActions(CodeActionsMenu {
-                        deployed_from,
-                        ..
-                    }) = menu
-                    {
-                        deployed_from.as_ref()
-                    } else {
-                        None
-                    }
-                })
-                .is_some_and(|source| matches!(source, CodeActionSource::Indicator(..)));
-            Some(editor.render_inline_code_actions(icon_size, display_point.row(), active, cx))
-        })?;
-
-        let buffer_point = display_point.to_point(&snapshot.display_snapshot);
-
-        // do not show code action for folded line
-        if snapshot.is_line_folded(MultiBufferRow(buffer_point.row)) {
-            return None;
-        }
-
-        // do not show code action for blank line with cursor
-        let line_indent = snapshot
-            .display_snapshot
-            .buffer_snapshot()
-            .line_indent_for_row(MultiBufferRow(buffer_point.row));
-        if line_indent.is_line_blank() {
-            return None;
-        }
-
-        const INLINE_SLOT_CHAR_LIMIT: u32 = 4;
-        const MAX_ALTERNATE_DISTANCE: u32 = 8;
-
-        let excerpt_id = snapshot
-            .display_snapshot
-            .buffer_snapshot()
-            .excerpt_containing(buffer_point..buffer_point)
-            .map(|excerpt| excerpt.id());
-
-        let is_valid_row = |row_candidate: u32| -> bool {
-            // move to other row if folded row
-            if snapshot.is_line_folded(MultiBufferRow(row_candidate)) {
-                return false;
-            }
-            if buffer_point.row == row_candidate {
-                // move to other row if cursor is in slot
-                if buffer_point.column < INLINE_SLOT_CHAR_LIMIT {
-                    return false;
-                }
-            } else {
-                let candidate_point = MultiBufferPoint {
-                    row: row_candidate,
-                    column: 0,
-                };
-                let candidate_excerpt_id = snapshot
-                    .display_snapshot
-                    .buffer_snapshot()
-                    .excerpt_containing(candidate_point..candidate_point)
-                    .map(|excerpt| excerpt.id());
-                // move to other row if different excerpt
-                if excerpt_id != candidate_excerpt_id {
-                    return false;
-                }
-            }
-            let line_indent = snapshot
-                .display_snapshot
-                .buffer_snapshot()
-                .line_indent_for_row(MultiBufferRow(row_candidate));
-            // use this row if it's blank
-            if line_indent.is_line_blank() {
-                true
-            } else {
-                // use this row if code starts after slot
-                let indent_size = snapshot
-                    .display_snapshot
-                    .buffer_snapshot()
-                    .indent_size_for_line(MultiBufferRow(row_candidate));
-                indent_size.len >= INLINE_SLOT_CHAR_LIMIT
-            }
-        };
-
-        let new_buffer_row = if is_valid_row(buffer_point.row) {
-            Some(buffer_point.row)
-        } else {
-            let max_row = snapshot.display_snapshot.buffer_snapshot().max_point().row;
-            (1..=MAX_ALTERNATE_DISTANCE).find_map(|offset| {
-                let row_above = buffer_point.row.saturating_sub(offset);
-                let row_below = buffer_point.row + offset;
-                if row_above != buffer_point.row && is_valid_row(row_above) {
-                    Some(row_above)
-                } else if row_below <= max_row && is_valid_row(row_below) {
-                    Some(row_below)
-                } else {
-                    None
-                }
-            })
-        }?;
-
-        let new_display_row = snapshot
-            .display_snapshot
-            .point_to_display_point(
-                Point {
-                    row: new_buffer_row,
-                    column: buffer_point.column,
-                },
-                text::Bias::Left,
-            )
-            .row();
-
-        let start_y = content_origin.y
-            + (((new_display_row.as_f64() - scroll_position.y) as f32) * line_height)
-            + (line_height / 2.0)
-            - (icon_size.square(window, cx) / 2.);
-        let start_x = (ScrollPixelOffset::from(content_origin.x) - scroll_pixel_position.x
-            + ScrollPixelOffset::from(window.rem_size() * 0.1))
-        .into();
-
-        let absolute_offset = gpui::point(start_x, start_y);
-        button.layout_as_root(gpui::AvailableSpace::min_size(), window, cx);
-        button.prepaint_as_root(
-            absolute_offset,
-            gpui::AvailableSpace::min_size(),
-            window,
-            cx,
-        );
-        Some(button)
-    }
-
-    fn layout_inline_blame(
-        &self,
-        display_row: DisplayRow,
-        row_info: &RowInfo,
-        line_layout: &LineWithInvisibles,
-        crease_trailer: Option<&CreaseTrailerLayout>,
-        em_width: Pixels,
-        content_origin: gpui::Point<Pixels>,
-        scroll_position: gpui::Point<ScrollOffset>,
-        scroll_pixel_position: gpui::Point<ScrollPixelOffset>,
-        line_height: Pixels,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<InlineBlameLayout> {
-        if !self
-            .editor
-            .update(cx, |editor, cx| editor.render_git_blame_inline(window, cx))
-        {
-            return None;
-        }
-
-        let editor = self.editor.read(cx);
-        let blame = editor.blame.clone()?;
-        let padding = {
-            const INLINE_ACCEPT_SUGGESTION_EM_WIDTHS: f32 = 14.;
-
-            let mut padding = ProjectSettings::get_global(cx).git.inline_blame.padding as f32;
-
-            if let Some(edit_prediction) = editor.active_edit_prediction.as_ref()
-                && let EditPrediction::Edit {
-                    display_mode: EditDisplayMode::TabAccept,
-                    ..
-                } = &edit_prediction.completion
-            {
-                padding += INLINE_ACCEPT_SUGGESTION_EM_WIDTHS
-            }
-
-            padding * em_width
-        };
-
-        let (buffer_id, entry) = blame
-            .update(cx, |blame, cx| {
-                blame.blame_for_rows(&[*row_info], cx).next()
-            })
-            .flatten()?;
-
-        let mut element = render_inline_blame_entry(entry.clone(), &self.style, cx)?;
-
-        let start_y =
-            content_origin.y + line_height * ((display_row.as_f64() - scroll_position.y) as f32);
-
-        let start_x = {
-            let line_end = if let Some(crease_trailer) = crease_trailer {
-                crease_trailer.bounds.right()
-            } else {
-                Pixels::from(
-                    ScrollPixelOffset::from(content_origin.x + line_layout.width)
-                        - scroll_pixel_position.x,
-                )
-            };
-
-            let padded_line_end = line_end + padding;
-
-            let min_column_in_pixels = column_pixels(
-                &self.style,
-                ProjectSettings::get_global(cx).git.inline_blame.min_column as usize,
-                window,
-            );
-            let min_start = Pixels::from(
-                ScrollPixelOffset::from(content_origin.x + min_column_in_pixels)
-                    - scroll_pixel_position.x,
-            );
-
-            cmp::max(padded_line_end, min_start)
-        };
-
-        let absolute_offset = point(start_x, start_y);
-        let size = element.layout_as_root(AvailableSpace::min_size(), window, cx);
-        let bounds = Bounds::new(absolute_offset, size);
-
-        element.prepaint_as_root(absolute_offset, AvailableSpace::min_size(), window, cx);
-
-        Some(InlineBlameLayout {
-            element,
-            bounds,
-            buffer_id,
-            entry,
-        })
-    }
-
-    fn layout_blame_popover(
-        &self,
-        editor_snapshot: &EditorSnapshot,
-        text_hitbox: &Hitbox,
-        line_height: Pixels,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        if !self.editor.read(cx).inline_blame_popover.is_some() {
-            return;
-        }
-
-        let Some(blame) = self.editor.read(cx).blame.clone() else {
-            return;
-        };
-        let cursor_point = self
-            .editor
-            .read(cx)
-            .selections
-            .newest::<language::Point>(&editor_snapshot.display_snapshot)
-            .head();
-
-        let Some((buffer, buffer_point, _)) = editor_snapshot
-            .buffer_snapshot()
-            .point_to_buffer_point(cursor_point)
-        else {
-            return;
-        };
-
-        let row_info = RowInfo {
-            buffer_id: Some(buffer.remote_id()),
-            buffer_row: Some(buffer_point.row),
-            ..Default::default()
-        };
-
-        let Some((buffer_id, blame_entry)) = blame
-            .update(cx, |blame, cx| blame.blame_for_rows(&[row_info], cx).next())
-            .flatten()
-        else {
-            return;
-        };
-
-        let Some((popover_state, target_point)) = self.editor.read_with(cx, |editor, _| {
-            editor
-                .inline_blame_popover
-                .as_ref()
-                .map(|state| (state.popover_state.clone(), state.position))
-        }) else {
-            return;
-        };
-
-        let workspace = self
-            .editor
-            .read_with(cx, |editor, _| editor.workspace().map(|w| w.downgrade()));
-
-        let maybe_element = workspace.and_then(|workspace| {
-            render_blame_entry_popover(
-                blame_entry,
-                popover_state.scroll_handle,
-                popover_state.commit_message,
-                popover_state.markdown,
-                workspace,
-                &blame,
-                buffer_id,
-                window,
-                cx,
-            )
-        });
-
-        if let Some(mut element) = maybe_element {
-            let size = element.layout_as_root(AvailableSpace::min_size(), window, cx);
-            let overall_height = size.height + HOVER_POPOVER_GAP;
-            let popover_origin = if target_point.y > overall_height {
-                point(target_point.x, target_point.y - size.height)
-            } else {
-                point(
-                    target_point.x,
-                    target_point.y + line_height + HOVER_POPOVER_GAP,
-                )
-            };
-
-            let horizontal_offset = (text_hitbox.top_right().x
-                - POPOVER_RIGHT_OFFSET
-                - (popover_origin.x + size.width))
-                .min(Pixels::ZERO);
-
-            let origin = point(popover_origin.x + horizontal_offset, popover_origin.y);
-            let popover_bounds = Bounds::new(origin, size);
-
-            self.editor.update(cx, |editor, _| {
-                if let Some(state) = &mut editor.inline_blame_popover {
-                    state.popover_bounds = Some(popover_bounds);
-                }
-            });
-
-            window.defer_draw(element, origin, 2);
-        }
-    }
-
-    fn layout_blame_entries(
-        &self,
-        buffer_rows: &[RowInfo],
-        em_width: Pixels,
-        scroll_position: gpui::Point<ScrollOffset>,
-        line_height: Pixels,
-        gutter_hitbox: &Hitbox,
-        max_width: Option<Pixels>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<Vec<AnyElement>> {
-        if !self
-            .editor
-            .update(cx, |editor, cx| editor.render_git_blame_gutter(cx))
-        {
-            return None;
-        }
-
-        let blame = self.editor.read(cx).blame.clone()?;
-        let workspace = self.editor.read(cx).workspace()?;
-        let blamed_rows: Vec<_> = blame.update(cx, |blame, cx| {
-            blame.blame_for_rows(buffer_rows, cx).collect()
-        });
-
-        let width = if let Some(max_width) = max_width {
-            AvailableSpace::Definite(max_width)
-        } else {
-            AvailableSpace::MaxContent
-        };
-        let scroll_top = scroll_position.y * ScrollPixelOffset::from(line_height);
-        let start_x = em_width;
-
-        let mut last_used_color: Option<(Hsla, Oid)> = None;
-        let blame_renderer = cx.global::<GlobalBlameRenderer>().0.clone();
-
-        let shaped_lines = blamed_rows
-            .into_iter()
-            .enumerate()
-            .flat_map(|(ix, blame_entry)| {
-                let (buffer_id, blame_entry) = blame_entry?;
-                let mut element = render_blame_entry(
-                    ix,
-                    &blame,
-                    blame_entry,
-                    &self.style,
-                    &mut last_used_color,
-                    self.editor.clone(),
-                    workspace.clone(),
-                    buffer_id,
-                    &*blame_renderer,
-                    window,
-                    cx,
-                )?;
-
-                let start_y = ix as f32 * line_height
-                    - Pixels::from(scroll_top % ScrollPixelOffset::from(line_height));
-                let absolute_offset = gutter_hitbox.origin + point(start_x, start_y);
-
-                element.prepaint_as_root(
-                    absolute_offset,
-                    size(width, AvailableSpace::MinContent),
-                    window,
-                    cx,
-                );
-
-                Some(element)
-            })
-            .collect();
-
-        Some(shaped_lines)
-    }
-
-    fn layout_indent_guides(
-        &self,
-        content_origin: gpui::Point<Pixels>,
-        text_origin: gpui::Point<Pixels>,
-        visible_buffer_range: Range<MultiBufferRow>,
-        scroll_pixel_position: gpui::Point<ScrollPixelOffset>,
-        line_height: Pixels,
-        snapshot: &DisplaySnapshot,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<Vec<IndentGuideLayout>> {
-        let indent_guides = self.editor.update(cx, |editor, cx| {
-            editor.indent_guides(visible_buffer_range, snapshot, cx)
-        })?;
-
-        let active_indent_guide_indices = self.editor.update(cx, |editor, cx| {
-            editor
-                .find_active_indent_guide_indices(&indent_guides, snapshot, window, cx)
-                .unwrap_or_default()
-        });
-
-        Some(
-            indent_guides
-                .into_iter()
-                .enumerate()
-                .filter_map(|(i, indent_guide)| {
-                    let single_indent_width =
-                        column_pixels(&self.style, indent_guide.tab_size as usize, window);
-                    let total_width = single_indent_width * indent_guide.depth as f32;
-                    let start_x = Pixels::from(
-                        ScrollOffset::from(content_origin.x + total_width)
-                            - scroll_pixel_position.x,
-                    );
-                    if start_x >= text_origin.x {
-                        let (offset_y, length) = Self::calculate_indent_guide_bounds(
-                            indent_guide.start_row..indent_guide.end_row,
-                            line_height,
-                            snapshot,
-                        );
-
-                        let start_y = Pixels::from(
-                            ScrollOffset::from(content_origin.y) + offset_y
-                                - scroll_pixel_position.y,
-                        );
-
-                        Some(IndentGuideLayout {
-                            origin: point(start_x, start_y),
-                            length,
-                            single_indent_width,
-                            depth: indent_guide.depth,
-                            active: active_indent_guide_indices.contains(&i),
-                            settings: indent_guide.settings,
-                        })
-                    } else {
-                        None
-                    }
-                })
-                .collect(),
-        )
-    }
-
-    fn layout_wrap_guides(
-        &self,
-        em_advance: Pixels,
-        scroll_position: gpui::Point<f64>,
-        content_origin: gpui::Point<Pixels>,
-        scrollbar_layout: Option<&EditorScrollbars>,
-        vertical_scrollbar_width: Pixels,
-        hitbox: &Hitbox,
-        window: &Window,
-        cx: &App,
-    ) -> SmallVec<[(Pixels, bool); 2]> {
-        let scroll_left = scroll_position.x as f32 * em_advance;
-        let content_origin = content_origin.x;
-        let horizontal_offset = content_origin - scroll_left;
-        let vertical_scrollbar_width = scrollbar_layout
-            .and_then(|layout| layout.visible.then_some(vertical_scrollbar_width))
-            .unwrap_or_default();
-
-        self.editor
-            .read(cx)
-            .wrap_guides(cx)
-            .into_iter()
-            .flat_map(|(guide, active)| {
-                let wrap_position = column_pixels(&self.style, guide, window);
-                let wrap_guide_x = wrap_position + horizontal_offset;
-                let display_wrap_guide = wrap_guide_x >= content_origin
-                    && wrap_guide_x <= hitbox.bounds.right() - vertical_scrollbar_width;
-
-                display_wrap_guide.then_some((wrap_guide_x, active))
-            })
-            .collect()
-    }
-
-    fn calculate_indent_guide_bounds(
-        row_range: Range<MultiBufferRow>,
-        line_height: Pixels,
-        snapshot: &DisplaySnapshot,
-    ) -> (f64, gpui::Pixels) {
-        let start_point = Point::new(row_range.start.0, 0);
-        let end_point = Point::new(row_range.end.0, 0);
-
-        let row_range = start_point.to_display_point(snapshot).row()
-            ..end_point.to_display_point(snapshot).row();
-
-        let mut prev_line = start_point;
-        prev_line.row = prev_line.row.saturating_sub(1);
-        let prev_line = prev_line.to_display_point(snapshot).row();
-
-        let mut cons_line = end_point;
-        cons_line.row += 1;
-        let cons_line = cons_line.to_display_point(snapshot).row();
-
-        let mut offset_y = row_range.start.as_f64() * f64::from(line_height);
-        let mut length = (cons_line.0.saturating_sub(row_range.start.0)) as f32 * line_height;
-
-        // If we are at the end of the buffer, ensure that the indent guide extends to the end of the line.
-        if row_range.end == cons_line {
-            length += line_height;
-        }
-
-        // If there is a block (e.g. diagnostic) in between the start of the indent guide and the line above,
-        // we want to extend the indent guide to the start of the block.
-        let mut block_height = 0;
-        let mut block_offset = 0;
-        let mut found_excerpt_header = false;
-        for (_, block) in snapshot.blocks_in_range(prev_line..row_range.start) {
-            if matches!(
-                block,
-                Block::ExcerptBoundary { .. } | Block::BufferHeader { .. }
-            ) {
-                found_excerpt_header = true;
-                break;
-            }
-            block_offset += block.height();
-            block_height += block.height();
-        }
-        if !found_excerpt_header {
-            offset_y -= block_offset as f64 * f64::from(line_height);
-            length += block_height as f32 * line_height;
-        }
-
-        // If there is a block (e.g. diagnostic) at the end of an multibuffer excerpt,
-        // we want to ensure that the indent guide stops before the excerpt header.
-        let mut block_height = 0;
-        let mut found_excerpt_header = false;
-        for (_, block) in snapshot.blocks_in_range(row_range.end..cons_line) {
-            if matches!(
-                block,
-                Block::ExcerptBoundary { .. } | Block::BufferHeader { .. }
-            ) {
-                found_excerpt_header = true;
-            }
-            block_height += block.height();
-        }
-        if found_excerpt_header {
-            length -= block_height as f32 * line_height;
-        }
-
-        (offset_y, length)
-    }
-
-    fn layout_breakpoints(
-        &self,
-        line_height: Pixels,
-        range: Range<DisplayRow>,
-        scroll_position: gpui::Point<ScrollOffset>,
-        gutter_dimensions: &GutterDimensions,
-        gutter_hitbox: &Hitbox,
-        display_hunks: &[(DisplayDiffHunk, Option<Hitbox>)],
-        snapshot: &EditorSnapshot,
-        breakpoints: HashMap<DisplayRow, (Anchor, Breakpoint, Option<BreakpointSessionState>)>,
-        row_infos: &[RowInfo],
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Vec<AnyElement> {
-        self.editor.update(cx, |editor, cx| {
-            breakpoints
-                .into_iter()
-                .filter_map(|(display_row, (text_anchor, bp, state))| {
-                    if row_infos
-                        .get((display_row.0.saturating_sub(range.start.0)) as usize)
-                        .is_some_and(|row_info| {
-                            row_info.expand_info.is_some()
-                                || row_info
-                                    .diff_status
-                                    .is_some_and(|status| status.is_deleted())
-                        })
-                    {
-                        return None;
-                    }
-
-                    if range.start > display_row || range.end < display_row {
-                        return None;
-                    }
-
-                    let row =
-                        MultiBufferRow(DisplayPoint::new(display_row, 0).to_point(snapshot).row);
-                    if snapshot.is_line_folded(row) {
-                        return None;
-                    }
-
-                    let button = editor.render_breakpoint(text_anchor, display_row, &bp, state, cx);
-
-                    let button = prepaint_gutter_button(
-                        button,
-                        display_row,
-                        line_height,
-                        gutter_dimensions,
-                        scroll_position,
-                        gutter_hitbox,
-                        display_hunks,
-                        window,
-                        cx,
-                    );
-                    Some(button)
-                })
-                .collect_vec()
-        })
-    }
-
-    #[allow(clippy::too_many_arguments)]
-    fn layout_run_indicators(
-        &self,
-        line_height: Pixels,
-        range: Range<DisplayRow>,
-        row_infos: &[RowInfo],
-        scroll_position: gpui::Point<ScrollOffset>,
-        gutter_dimensions: &GutterDimensions,
-        gutter_hitbox: &Hitbox,
-        display_hunks: &[(DisplayDiffHunk, Option<Hitbox>)],
-        snapshot: &EditorSnapshot,
-        breakpoints: &mut HashMap<DisplayRow, (Anchor, Breakpoint, Option<BreakpointSessionState>)>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Vec<AnyElement> {
-        self.editor.update(cx, |editor, cx| {
-            let active_task_indicator_row =
-                // TODO: add edit button on the right side of each row in the context menu
-                if let Some(crate::CodeContextMenu::CodeActions(CodeActionsMenu {
-                    deployed_from,
-                    actions,
-                    ..
-                })) = editor.context_menu.borrow().as_ref()
-                {
-                    actions
-                        .tasks()
-                        .map(|tasks| tasks.position.to_display_point(snapshot).row())
-                        .or_else(|| match deployed_from {
-                            Some(CodeActionSource::Indicator(row)) => Some(*row),
-                            _ => None,
-                        })
-                } else {
-                    None
-                };
-
-            let offset_range_start =
-                snapshot.display_point_to_point(DisplayPoint::new(range.start, 0), Bias::Left);
-
-            let offset_range_end =
-                snapshot.display_point_to_point(DisplayPoint::new(range.end, 0), Bias::Right);
-
-            editor
-                .tasks
-                .iter()
-                .filter_map(|(_, tasks)| {
-                    let multibuffer_point = tasks.offset.to_point(&snapshot.buffer_snapshot());
-                    if multibuffer_point < offset_range_start
-                        || multibuffer_point > offset_range_end
-                    {
-                        return None;
-                    }
-                    let multibuffer_row = MultiBufferRow(multibuffer_point.row);
-                    let buffer_folded = snapshot
-                        .buffer_snapshot()
-                        .buffer_line_for_row(multibuffer_row)
-                        .map(|(buffer_snapshot, _)| buffer_snapshot.remote_id())
-                        .map(|buffer_id| editor.is_buffer_folded(buffer_id, cx))
-                        .unwrap_or(false);
-                    if buffer_folded {
-                        return None;
-                    }
-
-                    if snapshot.is_line_folded(multibuffer_row) {
-                        // Skip folded indicators, unless it's the starting line of a fold.
-                        if multibuffer_row
-                            .0
-                            .checked_sub(1)
-                            .is_some_and(|previous_row| {
-                                snapshot.is_line_folded(MultiBufferRow(previous_row))
-                            })
-                        {
-                            return None;
-                        }
-                    }
-
-                    let display_row = multibuffer_point.to_display_point(snapshot).row();
-                    if !range.contains(&display_row) {
-                        return None;
-                    }
-                    if row_infos
-                        .get((display_row - range.start).0 as usize)
-                        .is_some_and(|row_info| row_info.expand_info.is_some())
-                    {
-                        return None;
-                    }
-
-                    let button = editor.render_run_indicator(
-                        &self.style,
-                        Some(display_row) == active_task_indicator_row,
-                        display_row,
-                        breakpoints.remove(&display_row),
-                        cx,
-                    );
-
-                    let button = prepaint_gutter_button(
-                        button,
-                        display_row,
-                        line_height,
-                        gutter_dimensions,
-                        scroll_position,
-                        gutter_hitbox,
-                        display_hunks,
-                        window,
-                        cx,
-                    );
-                    Some(button)
-                })
-                .collect_vec()
-        })
-    }
-
-    fn layout_expand_toggles(
-        &self,
-        gutter_hitbox: &Hitbox,
-        gutter_dimensions: GutterDimensions,
-        em_width: Pixels,
-        line_height: Pixels,
-        scroll_position: gpui::Point<ScrollOffset>,
-        buffer_rows: &[RowInfo],
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Vec<Option<(AnyElement, gpui::Point<Pixels>)>> {
-        if self.editor.read(cx).disable_expand_excerpt_buttons {
-            return vec![];
-        }
-
-        let editor_font_size = self.style.text.font_size.to_pixels(window.rem_size()) * 1.2;
-
-        let scroll_top = scroll_position.y * ScrollPixelOffset::from(line_height);
-
-        let max_line_number_length = self
-            .editor
-            .read(cx)
-            .buffer()
-            .read(cx)
-            .snapshot(cx)
-            .widest_line_number()
-            .ilog10()
-            + 1;
-
-        let git_gutter_width = Self::gutter_strip_width(line_height)
-            + gutter_dimensions
-                .git_blame_entries_width
-                .unwrap_or_default();
-        let available_width = gutter_dimensions.left_padding - git_gutter_width;
-
-        buffer_rows
-            .iter()
-            .enumerate()
-            .map(|(ix, row_info)| {
-                let ExpandInfo {
-                    excerpt_id,
-                    direction,
-                } = row_info.expand_info?;
-
-                let icon_name = match direction {
-                    ExpandExcerptDirection::Up => IconName::ExpandUp,
-                    ExpandExcerptDirection::Down => IconName::ExpandDown,
-                    ExpandExcerptDirection::UpAndDown => IconName::ExpandVertical,
-                };
-
-                let editor = self.editor.clone();
-                let is_wide = max_line_number_length
-                    >= EditorSettings::get_global(cx).gutter.min_line_number_digits as u32
-                    && row_info
-                        .buffer_row
-                        .is_some_and(|row| (row + 1).ilog10() + 1 == max_line_number_length)
-                    || gutter_dimensions.right_padding == px(0.);
-
-                let width = if is_wide {
-                    available_width - px(2.)
-                } else {
-                    available_width + em_width - px(2.)
-                };
-
-                let toggle = IconButton::new(("expand", ix), icon_name)
-                    .icon_color(Color::Custom(cx.theme().colors().editor_line_number))
-                    .selected_icon_color(Color::Custom(cx.theme().colors().editor_foreground))
-                    .icon_size(IconSize::Custom(rems(editor_font_size / window.rem_size())))
-                    .width(width)
-                    .on_click(move |_, window, cx| {
-                        editor.update(cx, |editor, cx| {
-                            editor.expand_excerpt(excerpt_id, direction, window, cx);
-                        });
-                    })
-                    .tooltip(Tooltip::for_action_title(
-                        "Expand Excerpt",
-                        &crate::actions::ExpandExcerpts::default(),
-                    ))
-                    .into_any_element();
-
-                let position = point(
-                    git_gutter_width + px(1.),
-                    ix as f32 * line_height
-                        - Pixels::from(scroll_top % ScrollPixelOffset::from(line_height))
-                        + px(1.),
-                );
-                let origin = gutter_hitbox.origin + position;
-
-                Some((toggle, origin))
-            })
-            .collect()
-    }
-
-    fn calculate_relative_line_numbers(
-        &self,
-        snapshot: &EditorSnapshot,
-        rows: &Range<DisplayRow>,
-        relative_to: Option<DisplayRow>,
-        count_wrapped_lines: bool,
-    ) -> HashMap<DisplayRow, DisplayRowDelta> {
-        let mut relative_rows: HashMap<DisplayRow, DisplayRowDelta> = Default::default();
-        let Some(relative_to) = relative_to else {
-            return relative_rows;
-        };
-
-        let start = rows.start.min(relative_to);
-        let end = rows.end.max(relative_to);
-
-        let buffer_rows = snapshot
-            .row_infos(start)
-            .take(1 + end.minus(start) as usize)
-            .collect::<Vec<_>>();
-
-        let head_idx = relative_to.minus(start);
-        let mut delta = 1;
-        let mut i = head_idx + 1;
-        let should_count_line = |row_info: &RowInfo| {
-            if count_wrapped_lines {
-                row_info.buffer_row.is_some() || row_info.wrapped_buffer_row.is_some()
-            } else {
-                row_info.buffer_row.is_some()
-            }
-        };
-        while i < buffer_rows.len() as u32 {
-            if should_count_line(&buffer_rows[i as usize]) {
-                if rows.contains(&DisplayRow(i + start.0)) {
-                    relative_rows.insert(DisplayRow(i + start.0), delta);
-                }
-                delta += 1;
-            }
-            i += 1;
-        }
-        delta = 1;
-        i = head_idx.min(buffer_rows.len().saturating_sub(1) as u32);
-        while i > 0 && buffer_rows[i as usize].buffer_row.is_none() && !count_wrapped_lines {
-            i -= 1;
-        }
-
-        while i > 0 {
-            i -= 1;
-            if should_count_line(&buffer_rows[i as usize]) {
-                if rows.contains(&DisplayRow(i + start.0)) {
-                    relative_rows.insert(DisplayRow(i + start.0), delta);
-                }
-                delta += 1;
-            }
-        }
-
-        relative_rows
-    }
-
-    fn layout_line_numbers(
-        &self,
-        gutter_hitbox: Option<&Hitbox>,
-        gutter_dimensions: GutterDimensions,
-        line_height: Pixels,
-        scroll_position: gpui::Point<ScrollOffset>,
-        rows: Range<DisplayRow>,
-        buffer_rows: &[RowInfo],
-        active_rows: &BTreeMap<DisplayRow, LineHighlightSpec>,
-        newest_selection_head: Option<DisplayPoint>,
-        snapshot: &EditorSnapshot,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Arc<HashMap<MultiBufferRow, LineNumberLayout>> {
-        let include_line_numbers = snapshot
-            .show_line_numbers
-            .unwrap_or_else(|| EditorSettings::get_global(cx).gutter.line_numbers);
-        if !include_line_numbers {
-            return Arc::default();
-        }
-
-        let (newest_selection_head, relative) = self.editor.update(cx, |editor, cx| {
-            let newest_selection_head = newest_selection_head.unwrap_or_else(|| {
-                let newest = editor
-                    .selections
-                    .newest::<Point>(&editor.display_snapshot(cx));
-                SelectionLayout::new(
-                    newest,
-                    editor.selections.line_mode(),
-                    editor.cursor_shape,
-                    &snapshot.display_snapshot,
-                    true,
-                    true,
-                    None,
-                )
-                .head
-            });
-            let relative = editor.relative_line_numbers(cx);
-            (newest_selection_head, relative)
-        });
-
-        let relative_line_numbers_enabled = relative.enabled();
-        let relative_to = relative_line_numbers_enabled.then(|| newest_selection_head.row());
-
-        let relative_rows =
-            self.calculate_relative_line_numbers(snapshot, &rows, relative_to, relative.wrapped());
-        let mut line_number = String::new();
-        let segments = buffer_rows.iter().enumerate().flat_map(|(ix, row_info)| {
-            let display_row = DisplayRow(rows.start.0 + ix as u32);
-            line_number.clear();
-            let non_relative_number = if relative.wrapped() {
-                row_info.buffer_row.or(row_info.wrapped_buffer_row)? + 1
-            } else if self.editor.read(cx).use_base_text_line_numbers {
-                row_info.base_text_row?.0 + 1
-            } else {
-                row_info.buffer_row? + 1
-            };
-            let relative_number = relative_rows.get(&display_row);
-            if !(relative_line_numbers_enabled && relative_number.is_some())
-                && row_info
-                    .diff_status
-                    .is_some_and(|status| status.is_deleted())
-                && !self.editor.read(cx).use_base_text_line_numbers
-            {
-                return None;
-            }
-
-            let number = relative_number.unwrap_or(&non_relative_number);
-            write!(&mut line_number, "{number}").unwrap();
-
-            let color = active_rows
-                .get(&display_row)
-                .map(|spec| {
-                    if spec.breakpoint {
-                        cx.theme().colors().debugger_accent
-                    } else {
-                        cx.theme().colors().editor_active_line_number
-                    }
-                })
-                .unwrap_or_else(|| cx.theme().colors().editor_line_number);
-            let shaped_line =
-                self.shape_line_number(SharedString::from(&line_number), color, window);
-            let scroll_top = scroll_position.y * ScrollPixelOffset::from(line_height);
-            let line_origin = gutter_hitbox.map(|hitbox| {
-                hitbox.origin
-                    + point(
-                        hitbox.size.width - shaped_line.width - gutter_dimensions.right_padding,
-                        ix as f32 * line_height
-                            - Pixels::from(scroll_top % ScrollPixelOffset::from(line_height)),
-                    )
-            });
-
-            #[cfg(not(test))]
-            let hitbox = line_origin.map(|line_origin| {
-                window.insert_hitbox(
-                    Bounds::new(line_origin, size(shaped_line.width, line_height)),
-                    HitboxBehavior::Normal,
-                )
-            });
-            #[cfg(test)]
-            let hitbox = {
-                let _ = line_origin;
-                None
-            };
-
-            let segment = LineNumberSegment {
-                shaped_line,
-                hitbox,
-            };
-
-            let buffer_row = DisplayPoint::new(display_row, 0).to_point(snapshot).row;
-            let multi_buffer_row = MultiBufferRow(buffer_row);
-
-            Some((multi_buffer_row, segment))
-        });
-
-        let mut line_numbers: HashMap<MultiBufferRow, LineNumberLayout> = HashMap::default();
-        for (buffer_row, segment) in segments {
-            line_numbers
-                .entry(buffer_row)
-                .or_insert_with(|| LineNumberLayout {
-                    segments: Default::default(),
-                })
-                .segments
-                .push(segment);
-        }
-        Arc::new(line_numbers)
-    }
-
-    fn layout_crease_toggles(
-        &self,
-        rows: Range<DisplayRow>,
-        row_infos: &[RowInfo],
-        active_rows: &BTreeMap<DisplayRow, LineHighlightSpec>,
-        snapshot: &EditorSnapshot,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Vec<Option<AnyElement>> {
-        let include_fold_statuses = EditorSettings::get_global(cx).gutter.folds
-            && snapshot.mode.is_full()
-            && self.editor.read(cx).buffer_kind(cx) == ItemBufferKind::Singleton;
-        if include_fold_statuses {
-            row_infos
-                .iter()
-                .enumerate()
-                .map(|(ix, info)| {
-                    if info.expand_info.is_some() {
-                        return None;
-                    }
-                    let row = info.multibuffer_row?;
-                    let display_row = DisplayRow(rows.start.0 + ix as u32);
-                    let active = active_rows.contains_key(&display_row);
-
-                    snapshot.render_crease_toggle(row, active, self.editor.clone(), window, cx)
-                })
-                .collect()
-        } else {
-            Vec::new()
-        }
-    }
-
-    fn layout_crease_trailers(
-        &self,
-        buffer_rows: impl IntoIterator<Item = RowInfo>,
-        snapshot: &EditorSnapshot,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Vec<Option<AnyElement>> {
-        buffer_rows
-            .into_iter()
-            .map(|row_info| {
-                if row_info.expand_info.is_some() {
-                    return None;
-                }
-                if let Some(row) = row_info.multibuffer_row {
-                    snapshot.render_crease_trailer(row, window, cx)
-                } else {
-                    None
-                }
-            })
-            .collect()
-    }
-
-    fn bg_segments_per_row(
-        rows: Range<DisplayRow>,
-        selections: &[(PlayerColor, Vec<SelectionLayout>)],
-        highlight_ranges: &[(Range<DisplayPoint>, Hsla)],
-        base_background: Hsla,
-    ) -> Vec<Vec<(Range<DisplayPoint>, Hsla)>> {
-        if rows.start >= rows.end {
-            return Vec::new();
-        }
-        if !base_background.is_opaque() {
-            // We don't actually know what color is behind this editor.
-            return Vec::new();
-        }
-        let highlight_iter = highlight_ranges.iter().cloned();
-        let selection_iter = selections.iter().flat_map(|(player_color, layouts)| {
-            let color = player_color.selection;
-            layouts.iter().filter_map(move |selection_layout| {
-                if selection_layout.range.start != selection_layout.range.end {
-                    Some((selection_layout.range.clone(), color))
-                } else {
-                    None
-                }
-            })
-        });
-        let mut per_row_map = vec![Vec::new(); rows.len()];
-        for (range, color) in highlight_iter.chain(selection_iter) {
-            let covered_rows = if range.end.column() == 0 {
-                cmp::max(range.start.row(), rows.start)..cmp::min(range.end.row(), rows.end)
-            } else {
-                cmp::max(range.start.row(), rows.start)
-                    ..cmp::min(range.end.row().next_row(), rows.end)
-            };
-            for row in covered_rows.iter_rows() {
-                let seg_start = if row == range.start.row() {
-                    range.start
-                } else {
-                    DisplayPoint::new(row, 0)
-                };
-                let seg_end = if row == range.end.row() && range.end.column() != 0 {
-                    range.end
-                } else {
-                    DisplayPoint::new(row, u32::MAX)
-                };
-                let ix = row.minus(rows.start) as usize;
-                debug_assert!(row >= rows.start && row < rows.end);
-                debug_assert!(ix < per_row_map.len());
-                per_row_map[ix].push((seg_start..seg_end, color));
-            }
-        }
-        for row_segments in per_row_map.iter_mut() {
-            if row_segments.is_empty() {
-                continue;
-            }
-            let segments = mem::take(row_segments);
-            let merged = Self::merge_overlapping_ranges(segments, base_background);
-            *row_segments = merged;
-        }
-        per_row_map
-    }
-
-    /// Merge overlapping ranges by splitting at all range boundaries and blending colors where
-    /// multiple ranges overlap. The result contains non-overlapping ranges ordered from left to right.
-    ///
-    /// Expects `start.row() == end.row()` for each range.
-    fn merge_overlapping_ranges(
-        ranges: Vec<(Range<DisplayPoint>, Hsla)>,
-        base_background: Hsla,
-    ) -> Vec<(Range<DisplayPoint>, Hsla)> {
-        struct Boundary {
-            pos: DisplayPoint,
-            is_start: bool,
-            index: usize,
-            color: Hsla,
-        }
-
-        let mut boundaries: SmallVec<[Boundary; 16]> = SmallVec::with_capacity(ranges.len() * 2);
-        for (index, (range, color)) in ranges.iter().enumerate() {
-            debug_assert!(
-                range.start.row() == range.end.row(),
-                "expects single-row ranges"
-            );
-            if range.start < range.end {
-                boundaries.push(Boundary {
-                    pos: range.start,
-                    is_start: true,
-                    index,
-                    color: *color,
-                });
-                boundaries.push(Boundary {
-                    pos: range.end,
-                    is_start: false,
-                    index,
-                    color: *color,
-                });
-            }
-        }
-
-        if boundaries.is_empty() {
-            return Vec::new();
-        }
-
-        boundaries
-            .sort_unstable_by(|a, b| a.pos.cmp(&b.pos).then_with(|| a.is_start.cmp(&b.is_start)));
-
-        let mut processed_ranges: Vec<(Range<DisplayPoint>, Hsla)> = Vec::new();
-        let mut active_ranges: SmallVec<[(usize, Hsla); 8]> = SmallVec::new();
-
-        let mut i = 0;
-        let mut start_pos = boundaries[0].pos;
-
-        let boundaries_len = boundaries.len();
-        while i < boundaries_len {
-            let current_boundary_pos = boundaries[i].pos;
-            if start_pos < current_boundary_pos {
-                if !active_ranges.is_empty() {
-                    let mut color = base_background;
-                    for &(_, c) in &active_ranges {
-                        color = Hsla::blend(color, c);
-                    }
-                    if let Some((last_range, last_color)) = processed_ranges.last_mut() {
-                        if *last_color == color && last_range.end == start_pos {
-                            last_range.end = current_boundary_pos;
-                        } else {
-                            processed_ranges.push((start_pos..current_boundary_pos, color));
-                        }
-                    } else {
-                        processed_ranges.push((start_pos..current_boundary_pos, color));
-                    }
-                }
-            }
-            while i < boundaries_len && boundaries[i].pos == current_boundary_pos {
-                let active_range = &boundaries[i];
-                if active_range.is_start {
-                    let idx = active_range.index;
-                    let pos = active_ranges
-                        .binary_search_by_key(&idx, |(i, _)| *i)
-                        .unwrap_or_else(|p| p);
-                    active_ranges.insert(pos, (idx, active_range.color));
-                } else {
-                    let idx = active_range.index;
-                    if let Ok(pos) = active_ranges.binary_search_by_key(&idx, |(i, _)| *i) {
-                        active_ranges.remove(pos);
-                    }
-                }
-                i += 1;
-            }
-            start_pos = current_boundary_pos;
-        }
-
-        processed_ranges
-    }
-
-    fn layout_lines(
-        rows: Range<DisplayRow>,
-        snapshot: &EditorSnapshot,
-        style: &EditorStyle,
-        editor_width: Pixels,
-        is_row_soft_wrapped: impl Copy + Fn(usize) -> bool,
-        bg_segments_per_row: &[Vec<(Range<DisplayPoint>, Hsla)>],
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Vec<LineWithInvisibles> {
-        if rows.start >= rows.end {
-            return Vec::new();
-        }
-
-        // Show the placeholder when the editor is empty
-        if snapshot.is_empty() {
-            let font_size = style.text.font_size.to_pixels(window.rem_size());
-            let placeholder_color = cx.theme().colors().text_placeholder;
-            let placeholder_text = snapshot.placeholder_text();
-
-            let placeholder_lines = placeholder_text
-                .as_ref()
-                .map_or(Vec::new(), |text| text.split('\n').collect::<Vec<_>>());
-
-            let placeholder_line_count = placeholder_lines.len();
-
-            placeholder_lines
-                .into_iter()
-                .skip(rows.start.0 as usize)
-                .chain(iter::repeat(""))
-                .take(cmp::max(rows.len(), placeholder_line_count))
-                .map(move |line| {
-                    let run = TextRun {
-                        len: line.len(),
-                        font: style.text.font(),
-                        color: placeholder_color,
-                        ..Default::default()
-                    };
-                    let line = window.text_system().shape_line(
-                        line.to_string().into(),
-                        font_size,
-                        &[run],
-                        None,
-                    );
-                    LineWithInvisibles {
-                        width: line.width,
-                        len: line.len,
-                        fragments: smallvec![LineFragment::Text(line)],
-                        invisibles: Vec::new(),
-                        font_size,
-                    }
-                })
-                .collect()
-        } else {
-            let chunks = snapshot.highlighted_chunks(rows.clone(), true, style);
-            LineWithInvisibles::from_chunks(
-                chunks,
-                style,
-                MAX_LINE_LEN,
-                rows.len(),
-                &snapshot.mode,
-                editor_width,
-                is_row_soft_wrapped,
-                bg_segments_per_row,
-                window,
-                cx,
-            )
-        }
-    }
-
-    fn prepaint_lines(
-        &self,
-        start_row: DisplayRow,
-        line_layouts: &mut [LineWithInvisibles],
-        line_height: Pixels,
-        scroll_position: gpui::Point<ScrollOffset>,
-        scroll_pixel_position: gpui::Point<ScrollPixelOffset>,
-        content_origin: gpui::Point<Pixels>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> SmallVec<[AnyElement; 1]> {
-        let mut line_elements = SmallVec::new();
-        for (ix, line) in line_layouts.iter_mut().enumerate() {
-            let row = start_row + DisplayRow(ix as u32);
-            line.prepaint(
-                line_height,
-                scroll_position,
-                scroll_pixel_position,
-                row,
-                content_origin,
-                &mut line_elements,
-                window,
-                cx,
-            );
-        }
-        line_elements
-    }
-
-    fn render_block(
-        &self,
-        block: &Block,
-        available_width: AvailableSpace,
-        block_id: BlockId,
-        block_row_start: DisplayRow,
-        snapshot: &EditorSnapshot,
-        text_x: Pixels,
-        rows: &Range<DisplayRow>,
-        line_layouts: &[LineWithInvisibles],
-        editor_margins: &EditorMargins,
-        line_height: Pixels,
-        em_width: Pixels,
-        text_hitbox: &Hitbox,
-        editor_width: Pixels,
-        scroll_width: &mut Pixels,
-        resized_blocks: &mut HashMap<CustomBlockId, u32>,
-        row_block_types: &mut HashMap<DisplayRow, bool>,
-        selections: &[Selection<Point>],
-        selected_buffer_ids: &Vec<BufferId>,
-        latest_selection_anchors: &HashMap<BufferId, Anchor>,
-        is_row_soft_wrapped: impl Copy + Fn(usize) -> bool,
-        sticky_header_excerpt_id: Option<ExcerptId>,
-        block_resize_offset: &mut i32,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<(AnyElement, Size<Pixels>, DisplayRow, Pixels)> {
-        let mut x_position = None;
-        let mut element = match block {
-            Block::Custom(custom) => {
-                let block_start = custom.start().to_point(&snapshot.buffer_snapshot());
-                let block_end = custom.end().to_point(&snapshot.buffer_snapshot());
-                if block.place_near() && snapshot.is_line_folded(MultiBufferRow(block_start.row)) {
-                    return None;
-                }
-                let align_to = block_start.to_display_point(snapshot);
-                let x_and_width = |layout: &LineWithInvisibles| {
-                    Some((
-                        text_x + layout.x_for_index(align_to.column() as usize),
-                        text_x + layout.width,
-                    ))
-                };
-                let line_ix = align_to.row().0.checked_sub(rows.start.0);
-                x_position =
-                    if let Some(layout) = line_ix.and_then(|ix| line_layouts.get(ix as usize)) {
-                        x_and_width(layout)
-                    } else {
-                        x_and_width(&layout_line(
-                            align_to.row(),
-                            snapshot,
-                            &self.style,
-                            editor_width,
-                            is_row_soft_wrapped,
-                            window,
-                            cx,
-                        ))
-                    };
-
-                let anchor_x = x_position.unwrap().0;
-
-                let selected = selections
-                    .binary_search_by(|selection| {
-                        if selection.end <= block_start {
-                            Ordering::Less
-                        } else if selection.start >= block_end {
-                            Ordering::Greater
-                        } else {
-                            Ordering::Equal
-                        }
-                    })
-                    .is_ok();
-
-                div()
-                    .size_full()
-                    .child(custom.render(&mut BlockContext {
-                        window,
-                        app: cx,
-                        anchor_x,
-                        margins: editor_margins,
-                        line_height,
-                        em_width,
-                        block_id,
-                        selected,
-                        max_width: text_hitbox.size.width.max(*scroll_width),
-                        editor_style: &self.style,
-                    }))
-                    .into_any()
-            }
-
-            Block::FoldedBuffer {
-                first_excerpt,
-                height,
-                ..
-            } => {
-                let selected = selected_buffer_ids.contains(&first_excerpt.buffer_id);
-                let result = v_flex().id(block_id).w_full().pr(editor_margins.right);
-
-                let jump_data = header_jump_data(
-                    snapshot,
-                    block_row_start,
-                    *height,
-                    first_excerpt,
-                    latest_selection_anchors,
-                );
-                result
-                    .child(self.render_buffer_header(
-                        first_excerpt,
-                        true,
-                        selected,
-                        false,
-                        jump_data,
-                        window,
-                        cx,
-                    ))
-                    .into_any_element()
-            }
-
-            Block::ExcerptBoundary { .. } => {
-                let color = cx.theme().colors().clone();
-                let mut result = v_flex().id(block_id).w_full();
-
-                result = result.child(
-                    h_flex().relative().child(
-                        div()
-                            .top(line_height / 2.)
-                            .absolute()
-                            .w_full()
-                            .h_px()
-                            .bg(color.border_variant),
-                    ),
-                );
-
-                result.into_any()
-            }
-
-            Block::BufferHeader { excerpt, height } => {
-                let mut result = v_flex().id(block_id).w_full();
-
-                let jump_data = header_jump_data(
-                    snapshot,
-                    block_row_start,
-                    *height,
-                    excerpt,
-                    latest_selection_anchors,
-                );
-
-                if sticky_header_excerpt_id != Some(excerpt.id) {
-                    let selected = selected_buffer_ids.contains(&excerpt.buffer_id);
-
-                    result = result.child(div().pr(editor_margins.right).child(
-                        self.render_buffer_header(
-                            excerpt, false, selected, false, jump_data, window, cx,
-                        ),
-                    ));
-                } else {
-                    result =
-                        result.child(div().h(FILE_HEADER_HEIGHT as f32 * window.line_height()));
-                }
-
-                result.into_any()
-            }
-        };
-
-        // Discover the element's content height, then round up to the nearest multiple of line height.
-        let preliminary_size = element.layout_as_root(
-            size(available_width, AvailableSpace::MinContent),
-            window,
-            cx,
-        );
-        let quantized_height = (preliminary_size.height / line_height).ceil() * line_height;
-        let final_size = if preliminary_size.height == quantized_height {
-            preliminary_size
-        } else {
-            element.layout_as_root(size(available_width, quantized_height.into()), window, cx)
-        };
-        let mut element_height_in_lines = ((final_size.height / line_height).ceil() as u32).max(1);
-
-        let effective_row_start = block_row_start.0 as i32 + *block_resize_offset;
-        debug_assert!(effective_row_start >= 0);
-        let mut row = DisplayRow(effective_row_start.max(0) as u32);
-
-        let mut x_offset = px(0.);
-        let mut is_block = true;
-
-        if let BlockId::Custom(custom_block_id) = block_id
-            && block.has_height()
-        {
-            if block.place_near()
-                && let Some((x_target, line_width)) = x_position
-            {
-                let margin = em_width * 2;
-                if line_width + final_size.width + margin
-                    < editor_width + editor_margins.gutter.full_width()
-                    && !row_block_types.contains_key(&(row - 1))
-                    && element_height_in_lines == 1
-                {
-                    x_offset = line_width + margin;
-                    row = row - 1;
-                    is_block = false;
-                    element_height_in_lines = 0;
-                    row_block_types.insert(row, is_block);
-                } else {
-                    let max_offset =
-                        editor_width + editor_margins.gutter.full_width() - final_size.width;
-                    let min_offset = (x_target + em_width - final_size.width)
-                        .max(editor_margins.gutter.full_width());
-                    x_offset = x_target.min(max_offset).max(min_offset);
-                }
-            };
-            if element_height_in_lines != block.height() {
-                *block_resize_offset += element_height_in_lines as i32 - block.height() as i32;
-                resized_blocks.insert(custom_block_id, element_height_in_lines);
-            }
-        }
-        for i in 0..element_height_in_lines {
-            row_block_types.insert(row + i, is_block);
-        }
-
-        Some((element, final_size, row, x_offset))
-    }
-
-    fn render_buffer_header(
-        &self,
-        for_excerpt: &ExcerptInfo,
-        is_folded: bool,
-        is_selected: bool,
-        is_sticky: bool,
-        jump_data: JumpData,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> impl IntoElement {
-        let editor = self.editor.read(cx);
-        let multi_buffer = editor.buffer.read(cx);
-        let is_read_only = self.editor.read(cx).read_only(cx);
-
-        let file_status = multi_buffer
-            .all_diff_hunks_expanded()
-            .then(|| editor.status_for_buffer_id(for_excerpt.buffer_id, cx))
-            .flatten();
-        let indicator = multi_buffer
-            .buffer(for_excerpt.buffer_id)
-            .and_then(|buffer| {
-                let buffer = buffer.read(cx);
-                let indicator_color = match (buffer.has_conflict(), buffer.is_dirty()) {
-                    (true, _) => Some(Color::Warning),
-                    (_, true) => Some(Color::Accent),
-                    (false, false) => None,
-                };
-                indicator_color.map(|indicator_color| Indicator::dot().color(indicator_color))
-            });
-
-        let include_root = editor
-            .project
-            .as_ref()
-            .map(|project| project.read(cx).visible_worktrees(cx).count() > 1)
-            .unwrap_or_default();
-        let file = for_excerpt.buffer.file();
-        let can_open_excerpts = Editor::can_open_excerpts_in_file(file);
-        let path_style = file.map(|file| file.path_style(cx));
-        let relative_path = for_excerpt.buffer.resolve_file_path(include_root, cx);
-        let (parent_path, filename) = if let Some(path) = &relative_path {
-            if let Some(path_style) = path_style {
-                let (dir, file_name) = path_style.split(path);
-                (dir.map(|dir| dir.to_owned()), Some(file_name.to_owned()))
-            } else {
-                (None, Some(path.clone()))
-            }
-        } else {
-            (None, None)
-        };
-        let focus_handle = editor.focus_handle(cx);
-        let colors = cx.theme().colors();
-
-        let header = div()
-            .p_1()
-            .w_full()
-            .h(FILE_HEADER_HEIGHT as f32 * window.line_height())
-            .child(
-                h_flex()
-                    .size_full()
-                    .flex_basis(Length::Definite(DefiniteLength::Fraction(0.667)))
-                    .pl_1()
-                    .pr_2()
-                    .rounded_sm()
-                    .gap_1p5()
-                    .when(is_sticky, |el| el.shadow_md())
-                    .border_1()
-                    .map(|border| {
-                        let border_color = if is_selected
-                            && is_folded
-                            && focus_handle.contains_focused(window, cx)
-                        {
-                            colors.border_focused
-                        } else {
-                            colors.border
-                        };
-                        border.border_color(border_color)
-                    })
-                    .bg(colors.editor_subheader_background)
-                    .hover(|style| style.bg(colors.element_hover))
-                    .map(|header| {
-                        let editor = self.editor.clone();
-                        let buffer_id = for_excerpt.buffer_id;
-                        let toggle_chevron_icon =
-                            FileIcons::get_chevron_icon(!is_folded, cx).map(Icon::from_path);
-                        let button_size = rems_from_px(28.);
-
-                        header.child(
-                            div()
-                                .hover(|style| style.bg(colors.element_selected))
-                                .rounded_xs()
-                                .child(
-                                    ButtonLike::new("toggle-buffer-fold")
-                                        .style(ButtonStyle::Transparent)
-                                        .height(button_size.into())
-                                        .width(button_size)
-                                        .children(toggle_chevron_icon)
-                                        .tooltip({
-                                            let focus_handle = focus_handle.clone();
-                                            let is_folded_for_tooltip = is_folded;
-                                            move |_window, cx| {
-                                                Tooltip::with_meta_in(
-                                                    if is_folded_for_tooltip {
-                                                        "Unfold Excerpt"
-                                                    } else {
-                                                        "Fold Excerpt"
-                                                    },
-                                                    Some(&ToggleFold),
-                                                    format!(
-                                                        "{} to toggle all",
-                                                        text_for_keystroke(
-                                                            &Modifiers::alt(),
-                                                            "click",
-                                                            cx
-                                                        )
-                                                    ),
-                                                    &focus_handle,
-                                                    cx,
-                                                )
-                                            }
-                                        })
-                                        .on_click(move |event, window, cx| {
-                                            if event.modifiers().alt {
-                                                // Alt+click toggles all buffers
-                                                editor.update(cx, |editor, cx| {
-                                                    editor.toggle_fold_all(
-                                                        &ToggleFoldAll,
-                                                        window,
-                                                        cx,
-                                                    );
-                                                });
-                                            } else {
-                                                // Regular click toggles single buffer
-                                                if is_folded {
-                                                    editor.update(cx, |editor, cx| {
-                                                        editor.unfold_buffer(buffer_id, cx);
-                                                    });
-                                                } else {
-                                                    editor.update(cx, |editor, cx| {
-                                                        editor.fold_buffer(buffer_id, cx);
-                                                    });
-                                                }
-                                            }
-                                        }),
-                                ),
-                        )
-                    })
-                    .children(
-                        editor
-                            .addons
-                            .values()
-                            .filter_map(|addon| {
-                                addon.render_buffer_header_controls(for_excerpt, window, cx)
-                            })
-                            .take(1),
-                    )
-                    .when(!is_read_only, |this| {
-                        this.child(
-                            h_flex()
-                                .size_3()
-                                .justify_center()
-                                .flex_shrink_0()
-                                .children(indicator),
-                        )
-                    })
-                    .child(
-                        h_flex()
-                            .cursor_pointer()
-                            .id("path_header_block")
-                            .min_w_0()
-                            .size_full()
-                            .justify_between()
-                            .overflow_hidden()
-                            .child(h_flex().min_w_0().flex_1().gap_0p5().map(|path_header| {
-                                let filename = filename
-                                    .map(SharedString::from)
-                                    .unwrap_or_else(|| "untitled".into());
-
-                                path_header
-                                    .when(ItemSettings::get_global(cx).file_icons, |el| {
-                                        let path = path::Path::new(filename.as_str());
-                                        let icon =
-                                            FileIcons::get_icon(path, cx).unwrap_or_default();
-
-                                        el.child(Icon::from_path(icon).color(Color::Muted))
-                                    })
-                                    .child(
-                                        ButtonLike::new("filename-button")
-                                            .child(
-                                                Label::new(filename)
-                                                    .single_line()
-                                                    .color(file_status_label_color(file_status))
-                                                    .when(
-                                                        file_status.is_some_and(|s| s.is_deleted()),
-                                                        |label| label.strikethrough(),
-                                                    ),
-                                            )
-                                            .on_click(window.listener_for(&self.editor, {
-                                                let jump_data = jump_data.clone();
-                                                move |editor, e: &ClickEvent, window, cx| {
-                                                    editor.open_excerpts_common(
-                                                        Some(jump_data.clone()),
-                                                        e.modifiers().secondary(),
-                                                        window,
-                                                        cx,
-                                                    );
-                                                }
-                                            })),
-                                    )
-                                    .when_some(parent_path, |then, path| {
-                                        then.child(Label::new(path).truncate().color(
-                                            if file_status.is_some_and(FileStatus::is_deleted) {
-                                                Color::Custom(colors.text_disabled)
-                                            } else {
-                                                Color::Custom(colors.text_muted)
-                                            },
-                                        ))
-                                    })
-                            }))
-                            .when(
-                                can_open_excerpts && is_selected && relative_path.is_some(),
-                                |el| {
-                                    el.child(
-                                        Button::new("open-file-button", "Open File")
-                                            .style(ButtonStyle::OutlinedGhost)
-                                            .key_binding(KeyBinding::for_action_in(
-                                                &OpenExcerpts,
-                                                &focus_handle,
-                                                cx,
-                                            ))
-                                            .on_click(window.listener_for(&self.editor, {
-                                                let jump_data = jump_data.clone();
-                                                move |editor, e: &ClickEvent, window, cx| {
-                                                    editor.open_excerpts_common(
-                                                        Some(jump_data.clone()),
-                                                        e.modifiers().secondary(),
-                                                        window,
-                                                        cx,
-                                                    );
-                                                }
-                                            })),
-                                    )
-                                },
-                            )
-                            .on_mouse_down(MouseButton::Left, |_, _, cx| cx.stop_propagation())
-                            .on_click(window.listener_for(&self.editor, {
-                                let buffer_id = for_excerpt.buffer_id;
-                                move |editor, e: &ClickEvent, window, cx| {
-                                    if e.modifiers().alt {
-                                        editor.open_excerpts_common(
-                                            Some(jump_data.clone()),
-                                            e.modifiers().secondary(),
-                                            window,
-                                            cx,
-                                        );
-                                        return;
-                                    }
-
-                                    if is_folded {
-                                        editor.unfold_buffer(buffer_id, cx);
-                                    } else {
-                                        editor.fold_buffer(buffer_id, cx);
-                                    }
-                                }
-                            })),
-                    ),
-            );
-
-        let file = for_excerpt.buffer.file().cloned();
-        let editor = self.editor.clone();
-
-        right_click_menu("buffer-header-context-menu")
-            .trigger(move |_, _, _| header)
-            .menu(move |window, cx| {
-                let menu_context = focus_handle.clone();
-                let editor = editor.clone();
-                let file = file.clone();
-                ContextMenu::build(window, cx, move |mut menu, window, cx| {
-                    if let Some(file) = file
-                        && let Some(project) = editor.read(cx).project()
-                        && let Some(worktree) =
-                            project.read(cx).worktree_for_id(file.worktree_id(cx), cx)
-                    {
-                        let path_style = file.path_style(cx);
-                        let worktree = worktree.read(cx);
-                        let relative_path = file.path();
-                        let entry_for_path = worktree.entry_for_path(relative_path);
-                        let abs_path = entry_for_path.map(|e| {
-                            e.canonical_path.as_deref().map_or_else(
-                                || worktree.absolutize(relative_path),
-                                Path::to_path_buf,
-                            )
-                        });
-                        let has_relative_path = worktree.root_entry().is_some_and(Entry::is_dir);
-
-                        let parent_abs_path = abs_path
-                            .as_ref()
-                            .and_then(|abs_path| Some(abs_path.parent()?.to_path_buf()));
-                        let relative_path = has_relative_path
-                            .then_some(relative_path)
-                            .map(ToOwned::to_owned);
-
-                        let visible_in_project_panel =
-                            relative_path.is_some() && worktree.is_visible();
-                        let reveal_in_project_panel = entry_for_path
-                            .filter(|_| visible_in_project_panel)
-                            .map(|entry| entry.id);
-                        menu = menu
-                            .when_some(abs_path, |menu, abs_path| {
-                                menu.entry(
-                                    "Copy Path",
-                                    Some(Box::new(zed_actions::workspace::CopyPath)),
-                                    window.handler_for(&editor, move |_, _, cx| {
-                                        cx.write_to_clipboard(ClipboardItem::new_string(
-                                            abs_path.to_string_lossy().into_owned(),
-                                        ));
-                                    }),
-                                )
-                            })
-                            .when_some(relative_path, |menu, relative_path| {
-                                menu.entry(
-                                    "Copy Relative Path",
-                                    Some(Box::new(zed_actions::workspace::CopyRelativePath)),
-                                    window.handler_for(&editor, move |_, _, cx| {
-                                        cx.write_to_clipboard(ClipboardItem::new_string(
-                                            relative_path.display(path_style).to_string(),
-                                        ));
-                                    }),
-                                )
-                            })
-                            .when(
-                                reveal_in_project_panel.is_some() || parent_abs_path.is_some(),
-                                |menu| menu.separator(),
-                            )
-                            .when_some(reveal_in_project_panel, |menu, entry_id| {
-                                menu.entry(
-                                    "Reveal In Project Panel",
-                                    Some(Box::new(RevealInProjectPanel::default())),
-                                    window.handler_for(&editor, move |editor, _, cx| {
-                                        if let Some(project) = &mut editor.project {
-                                            project.update(cx, |_, cx| {
-                                                cx.emit(project::Event::RevealInProjectPanel(
-                                                    entry_id,
-                                                ))
-                                            });
-                                        }
-                                    }),
-                                )
-                            })
-                            .when_some(parent_abs_path, |menu, parent_abs_path| {
-                                menu.entry(
-                                    "Open in Terminal",
-                                    Some(Box::new(OpenInTerminal)),
-                                    window.handler_for(&editor, move |_, window, cx| {
-                                        window.dispatch_action(
-                                            OpenTerminal {
-                                                working_directory: parent_abs_path.clone(),
-                                            }
-                                            .boxed_clone(),
-                                            cx,
-                                        );
-                                    }),
-                                )
-                            });
-                    }
-
-                    menu.context(menu_context)
-                })
-            })
-    }
-
-    fn render_blocks(
-        &self,
-        rows: Range<DisplayRow>,
-        snapshot: &EditorSnapshot,
-        hitbox: &Hitbox,
-        text_hitbox: &Hitbox,
-        editor_width: Pixels,
-        scroll_width: &mut Pixels,
-        editor_margins: &EditorMargins,
-        em_width: Pixels,
-        text_x: Pixels,
-        line_height: Pixels,
-        line_layouts: &mut [LineWithInvisibles],
-        selections: &[Selection<Point>],
-        selected_buffer_ids: &Vec<BufferId>,
-        latest_selection_anchors: &HashMap<BufferId, Anchor>,
-        is_row_soft_wrapped: impl Copy + Fn(usize) -> bool,
-        sticky_header_excerpt_id: Option<ExcerptId>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> RenderBlocksOutput {
-        let (fixed_blocks, non_fixed_blocks) = snapshot
-            .blocks_in_range(rows.clone())
-            .partition::<Vec<_>, _>(|(_, block)| block.style() == BlockStyle::Fixed);
-
-        let mut focused_block = self
-            .editor
-            .update(cx, |editor, _| editor.take_focused_block());
-        let mut fixed_block_max_width = Pixels::ZERO;
-        let mut blocks = Vec::new();
-        let mut resized_blocks = HashMap::default();
-        let mut row_block_types = HashMap::default();
-        let mut block_resize_offset: i32 = 0;
-
-        for (row, block) in fixed_blocks {
-            let block_id = block.id();
-
-            if focused_block.as_ref().is_some_and(|b| b.id == block_id) {
-                focused_block = None;
-            }
-
-            if let Some((element, element_size, row, x_offset)) = self.render_block(
-                block,
-                AvailableSpace::MinContent,
-                block_id,
-                row,
-                snapshot,
-                text_x,
-                &rows,
-                line_layouts,
-                editor_margins,
-                line_height,
-                em_width,
-                text_hitbox,
-                editor_width,
-                scroll_width,
-                &mut resized_blocks,
-                &mut row_block_types,
-                selections,
-                selected_buffer_ids,
-                latest_selection_anchors,
-                is_row_soft_wrapped,
-                sticky_header_excerpt_id,
-                &mut block_resize_offset,
-                window,
-                cx,
-            ) {
-                fixed_block_max_width = fixed_block_max_width.max(element_size.width + em_width);
-                blocks.push(BlockLayout {
-                    id: block_id,
-                    x_offset,
-                    row: Some(row),
-                    element,
-                    available_space: size(AvailableSpace::MinContent, element_size.height.into()),
-                    style: BlockStyle::Fixed,
-                    overlaps_gutter: true,
-                    is_buffer_header: block.is_buffer_header(),
-                });
-            }
-        }
-
-        for (row, block) in non_fixed_blocks {
-            let style = block.style();
-            let width = match (style, block.place_near()) {
-                (_, true) => AvailableSpace::MinContent,
-                (BlockStyle::Sticky, _) => hitbox.size.width.into(),
-                (BlockStyle::Flex, _) => hitbox
-                    .size
-                    .width
-                    .max(fixed_block_max_width)
-                    .max(editor_margins.gutter.width + *scroll_width)
-                    .into(),
-                (BlockStyle::Fixed, _) => unreachable!(),
-            };
-            let block_id = block.id();
-
-            if focused_block.as_ref().is_some_and(|b| b.id == block_id) {
-                focused_block = None;
-            }
-
-            if let Some((element, element_size, row, x_offset)) = self.render_block(
-                block,
-                width,
-                block_id,
-                row,
-                snapshot,
-                text_x,
-                &rows,
-                line_layouts,
-                editor_margins,
-                line_height,
-                em_width,
-                text_hitbox,
-                editor_width,
-                scroll_width,
-                &mut resized_blocks,
-                &mut row_block_types,
-                selections,
-                selected_buffer_ids,
-                latest_selection_anchors,
-                is_row_soft_wrapped,
-                sticky_header_excerpt_id,
-                &mut block_resize_offset,
-                window,
-                cx,
-            ) {
-                blocks.push(BlockLayout {
-                    id: block_id,
-                    x_offset,
-                    row: Some(row),
-                    element,
-                    available_space: size(width, element_size.height.into()),
-                    style,
-                    overlaps_gutter: !block.place_near(),
-                    is_buffer_header: block.is_buffer_header(),
-                });
-            }
-        }
-
-        if let Some(focused_block) = focused_block
-            && let Some(focus_handle) = focused_block.focus_handle.upgrade()
-            && focus_handle.is_focused(window)
-            && let Some(block) = snapshot.block_for_id(focused_block.id)
-        {
-            let style = block.style();
-            let width = match style {
-                BlockStyle::Fixed => AvailableSpace::MinContent,
-                BlockStyle::Flex => AvailableSpace::Definite(
-                    hitbox
-                        .size
-                        .width
-                        .max(fixed_block_max_width)
-                        .max(editor_margins.gutter.width + *scroll_width),
-                ),
-                BlockStyle::Sticky => AvailableSpace::Definite(hitbox.size.width),
-            };
-
-            if let Some((element, element_size, _, x_offset)) = self.render_block(
-                &block,
-                width,
-                focused_block.id,
-                rows.end,
-                snapshot,
-                text_x,
-                &rows,
-                line_layouts,
-                editor_margins,
-                line_height,
-                em_width,
-                text_hitbox,
-                editor_width,
-                scroll_width,
-                &mut resized_blocks,
-                &mut row_block_types,
-                selections,
-                selected_buffer_ids,
-                latest_selection_anchors,
-                is_row_soft_wrapped,
-                sticky_header_excerpt_id,
-                &mut block_resize_offset,
-                window,
-                cx,
-            ) {
-                blocks.push(BlockLayout {
-                    id: block.id(),
-                    x_offset,
-                    row: None,
-                    element,
-                    available_space: size(width, element_size.height.into()),
-                    style,
-                    overlaps_gutter: true,
-                    is_buffer_header: block.is_buffer_header(),
-                });
-            }
-        }
-
-        if resized_blocks.is_empty() {
-            *scroll_width =
-                (*scroll_width).max(fixed_block_max_width - editor_margins.gutter.width);
-        }
-
-        RenderBlocksOutput {
-            blocks,
-            row_block_types,
-            resized_blocks: (!resized_blocks.is_empty()).then_some(resized_blocks),
-        }
-    }
-
-    fn layout_blocks(
-        &self,
-        blocks: &mut Vec<BlockLayout>,
-        hitbox: &Hitbox,
-        line_height: Pixels,
-        scroll_position: gpui::Point<ScrollOffset>,
-        scroll_pixel_position: gpui::Point<ScrollPixelOffset>,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        for block in blocks {
-            let mut origin = if let Some(row) = block.row {
-                hitbox.origin
-                    + point(
-                        block.x_offset,
-                        Pixels::from(
-                            (row.as_f64() - scroll_position.y)
-                                * ScrollPixelOffset::from(line_height),
-                        ),
-                    )
-            } else {
-                // Position the block outside the visible area
-                hitbox.origin + point(Pixels::ZERO, hitbox.size.height)
-            };
-
-            if !matches!(block.style, BlockStyle::Sticky) {
-                origin += point(Pixels::from(-scroll_pixel_position.x), Pixels::ZERO);
-            }
-
-            let focus_handle =
-                block
-                    .element
-                    .prepaint_as_root(origin, block.available_space, window, cx);
-
-            if let Some(focus_handle) = focus_handle {
-                self.editor.update(cx, |editor, _cx| {
-                    editor.set_focused_block(FocusedBlock {
-                        id: block.id,
-                        focus_handle: focus_handle.downgrade(),
-                    });
-                });
-            }
-        }
-    }
-
-    fn layout_sticky_buffer_header(
-        &self,
-        StickyHeaderExcerpt { excerpt }: StickyHeaderExcerpt<'_>,
-        scroll_position: gpui::Point<ScrollOffset>,
-        line_height: Pixels,
-        right_margin: Pixels,
-        snapshot: &EditorSnapshot,
-        hitbox: &Hitbox,
-        selected_buffer_ids: &Vec<BufferId>,
-        blocks: &[BlockLayout],
-        latest_selection_anchors: &HashMap<BufferId, Anchor>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> AnyElement {
-        let jump_data = header_jump_data(
-            snapshot,
-            DisplayRow(scroll_position.y as u32),
-            FILE_HEADER_HEIGHT + MULTI_BUFFER_EXCERPT_HEADER_HEIGHT,
-            excerpt,
-            latest_selection_anchors,
-        );
-
-        let editor_bg_color = cx.theme().colors().editor_background;
-
-        let selected = selected_buffer_ids.contains(&excerpt.buffer_id);
-
-        let available_width = hitbox.bounds.size.width - right_margin;
-
-        let mut header = v_flex()
-            .w_full()
-            .relative()
-            .child(
-                div()
-                    .w(available_width)
-                    .h(FILE_HEADER_HEIGHT as f32 * line_height)
-                    .bg(linear_gradient(
-                        0.,
-                        linear_color_stop(editor_bg_color.opacity(0.), 0.),
-                        linear_color_stop(editor_bg_color, 0.6),
-                    ))
-                    .absolute()
-                    .top_0(),
-            )
-            .child(
-                self.render_buffer_header(excerpt, false, selected, true, jump_data, window, cx)
-                    .into_any_element(),
-            )
-            .into_any_element();
-
-        let mut origin = hitbox.origin;
-        // Move floating header up to avoid colliding with the next buffer header.
-        for block in blocks.iter() {
-            if !block.is_buffer_header {
-                continue;
-            }
-
-            let Some(display_row) = block.row.filter(|row| row.0 > scroll_position.y as u32) else {
-                continue;
-            };
-
-            let max_row = display_row.0.saturating_sub(FILE_HEADER_HEIGHT);
-            let offset = scroll_position.y - max_row as f64;
-
-            if offset > 0.0 {
-                origin.y -= Pixels::from(offset * ScrollPixelOffset::from(line_height));
-            }
-            break;
-        }
-
-        let size = size(
-            AvailableSpace::Definite(available_width),
-            AvailableSpace::MinContent,
-        );
-
-        header.prepaint_as_root(origin, size, window, cx);
-
-        header
-    }
-
-    fn layout_sticky_headers(
-        &self,
-        snapshot: &EditorSnapshot,
-        editor_width: Pixels,
-        is_row_soft_wrapped: impl Copy + Fn(usize) -> bool,
-        line_height: Pixels,
-        scroll_pixel_position: gpui::Point<ScrollPixelOffset>,
-        content_origin: gpui::Point<Pixels>,
-        gutter_dimensions: &GutterDimensions,
-        gutter_hitbox: &Hitbox,
-        text_hitbox: &Hitbox,
-        style: &EditorStyle,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<StickyHeaders> {
-        let show_line_numbers = snapshot
-            .show_line_numbers
-            .unwrap_or_else(|| EditorSettings::get_global(cx).gutter.line_numbers);
-
-        let rows = Self::sticky_headers(self.editor.read(cx), snapshot, style, cx);
-
-        let mut lines = Vec::<StickyHeaderLine>::new();
-
-        for StickyHeader {
-            item,
-            sticky_row,
-            start_point,
-            offset,
-        } in rows.into_iter().rev()
-        {
-            let line = layout_line(
-                sticky_row,
-                snapshot,
-                &self.style,
-                editor_width,
-                is_row_soft_wrapped,
-                window,
-                cx,
-            );
-
-            let line_number = show_line_numbers.then(|| {
-                let number = (start_point.row + 1).to_string();
-                let color = cx.theme().colors().editor_line_number;
-                self.shape_line_number(SharedString::from(number), color, window)
-            });
-
-            lines.push(StickyHeaderLine::new(
-                sticky_row,
-                line_height * offset as f32,
-                line,
-                line_number,
-                item.range.start,
-                line_height,
-                scroll_pixel_position,
-                content_origin,
-                gutter_hitbox,
-                text_hitbox,
-                window,
-                cx,
-            ));
-        }
-
-        lines.reverse();
-        if lines.is_empty() {
-            return None;
-        }
-
-        Some(StickyHeaders {
-            lines,
-            gutter_background: cx.theme().colors().editor_gutter_background,
-            content_background: self.style.background,
-            gutter_right_padding: gutter_dimensions.right_padding,
-        })
-    }
-
-    pub(crate) fn sticky_headers(
-        editor: &Editor,
-        snapshot: &EditorSnapshot,
-        style: &EditorStyle,
-        cx: &App,
-    ) -> Vec<StickyHeader> {
-        let scroll_top = snapshot.scroll_position().y;
-
-        let mut end_rows = Vec::<DisplayRow>::new();
-        let mut rows = Vec::<StickyHeader>::new();
-
-        let items = editor.sticky_headers(style, cx).unwrap_or_default();
-
-        for item in items {
-            let start_point = item.range.start.to_point(snapshot.buffer_snapshot());
-            let end_point = item.range.end.to_point(snapshot.buffer_snapshot());
-
-            let sticky_row = snapshot
-                .display_snapshot
-                .point_to_display_point(start_point, Bias::Left)
-                .row();
-            let end_row = snapshot
-                .display_snapshot
-                .point_to_display_point(end_point, Bias::Left)
-                .row();
-            let max_sticky_row = end_row.previous_row();
-            if max_sticky_row <= sticky_row {
-                continue;
-            }
-
-            while end_rows
-                .last()
-                .is_some_and(|&last_end| last_end < sticky_row)
-            {
-                end_rows.pop();
-            }
-            let depth = end_rows.len();
-            let adjusted_scroll_top = scroll_top + depth as f64;
-
-            if sticky_row.as_f64() >= adjusted_scroll_top || end_row.as_f64() <= adjusted_scroll_top
-            {
-                continue;
-            }
-
-            let max_scroll_offset = max_sticky_row.as_f64() - scroll_top;
-            let offset = (depth as f64).min(max_scroll_offset);
-
-            end_rows.push(end_row);
-            rows.push(StickyHeader {
-                item,
-                sticky_row,
-                start_point,
-                offset,
-            });
-        }
-
-        rows
-    }
-
-    fn layout_cursor_popovers(
-        &self,
-        line_height: Pixels,
-        text_hitbox: &Hitbox,
-        content_origin: gpui::Point<Pixels>,
-        right_margin: Pixels,
-        start_row: DisplayRow,
-        scroll_pixel_position: gpui::Point<ScrollPixelOffset>,
-        line_layouts: &[LineWithInvisibles],
-        cursor: DisplayPoint,
-        cursor_point: Point,
-        style: &EditorStyle,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<ContextMenuLayout> {
-        let mut min_menu_height = Pixels::ZERO;
-        let mut max_menu_height = Pixels::ZERO;
-        let mut height_above_menu = Pixels::ZERO;
-        let height_below_menu = Pixels::ZERO;
-        let mut edit_prediction_popover_visible = false;
-        let mut context_menu_visible = false;
-        let context_menu_placement;
-
-        {
-            let editor = self.editor.read(cx);
-            if editor.edit_prediction_visible_in_cursor_popover(editor.has_active_edit_prediction())
-            {
-                height_above_menu +=
-                    editor.edit_prediction_cursor_popover_height() + POPOVER_Y_PADDING;
-                edit_prediction_popover_visible = true;
-            }
-
-            if editor.context_menu_visible()
-                && let Some(crate::ContextMenuOrigin::Cursor) = editor.context_menu_origin()
-            {
-                let (min_height_in_lines, max_height_in_lines) = editor
-                    .context_menu_options
-                    .as_ref()
-                    .map_or((3, 12), |options| {
-                        (options.min_entries_visible, options.max_entries_visible)
-                    });
-
-                min_menu_height += line_height * min_height_in_lines as f32 + POPOVER_Y_PADDING;
-                max_menu_height += line_height * max_height_in_lines as f32 + POPOVER_Y_PADDING;
-                context_menu_visible = true;
-            }
-            context_menu_placement = editor
-                .context_menu_options
-                .as_ref()
-                .and_then(|options| options.placement.clone());
-        }
-
-        let visible = edit_prediction_popover_visible || context_menu_visible;
-        if !visible {
-            return None;
-        }
-
-        let cursor_row_layout = &line_layouts[cursor.row().minus(start_row) as usize];
-        let target_position = content_origin
-            + gpui::Point {
-                x: cmp::max(
-                    px(0.),
-                    Pixels::from(
-                        ScrollPixelOffset::from(
-                            cursor_row_layout.x_for_index(cursor.column() as usize),
-                        ) - scroll_pixel_position.x,
-                    ),
-                ),
-                y: cmp::max(
-                    px(0.),
-                    Pixels::from(
-                        cursor.row().next_row().as_f64() * ScrollPixelOffset::from(line_height)
-                            - scroll_pixel_position.y,
-                    ),
-                ),
-            };
-
-        let viewport_bounds =
-            Bounds::new(Default::default(), window.viewport_size()).extend(Edges {
-                right: -right_margin - MENU_GAP,
-                ..Default::default()
-            });
-
-        let min_height = height_above_menu + min_menu_height + height_below_menu;
-        let max_height = height_above_menu + max_menu_height + height_below_menu;
-        let (laid_out_popovers, y_flipped) = self.layout_popovers_above_or_below_line(
-            target_position,
-            line_height,
-            min_height,
-            max_height,
-            context_menu_placement,
-            text_hitbox,
-            viewport_bounds,
-            window,
-            cx,
-            |height, max_width_for_stable_x, y_flipped, window, cx| {
-                // First layout the menu to get its size - others can be at least this wide.
-                let context_menu = if context_menu_visible {
-                    let menu_height = if y_flipped {
-                        height - height_below_menu
-                    } else {
-                        height - height_above_menu
-                    };
-                    let mut element = self
-                        .render_context_menu(line_height, menu_height, window, cx)
-                        .expect("Visible context menu should always render.");
-                    let size = element.layout_as_root(AvailableSpace::min_size(), window, cx);
-                    Some((CursorPopoverType::CodeContextMenu, element, size))
-                } else {
-                    None
-                };
-                let min_width = context_menu
-                    .as_ref()
-                    .map_or(px(0.), |(_, _, size)| size.width);
-                let max_width = max_width_for_stable_x.max(
-                    context_menu
-                        .as_ref()
-                        .map_or(px(0.), |(_, _, size)| size.width),
-                );
-
-                let edit_prediction = if edit_prediction_popover_visible {
-                    self.editor.update(cx, move |editor, cx| {
-                        let accept_binding =
-                            editor.accept_edit_prediction_keybind(false, window, cx);
-                        let mut element = editor.render_edit_prediction_cursor_popover(
-                            min_width,
-                            max_width,
-                            cursor_point,
-                            style,
-                            accept_binding.keystroke(),
-                            window,
-                            cx,
-                        )?;
-                        let size = element.layout_as_root(AvailableSpace::min_size(), window, cx);
-                        Some((CursorPopoverType::EditPrediction, element, size))
-                    })
-                } else {
-                    None
-                };
-                vec![edit_prediction, context_menu]
-                    .into_iter()
-                    .flatten()
-                    .collect::<Vec<_>>()
-            },
-        )?;
-
-        let (menu_ix, (_, menu_bounds)) = laid_out_popovers
-            .iter()
-            .find_position(|(x, _)| matches!(x, CursorPopoverType::CodeContextMenu))?;
-        let last_ix = laid_out_popovers.len() - 1;
-        let menu_is_last = menu_ix == last_ix;
-        let first_popover_bounds = laid_out_popovers[0].1;
-        let last_popover_bounds = laid_out_popovers[last_ix].1;
-
-        // Bounds to layout the aside around. When y_flipped, the aside goes either above or to the
-        // right, and otherwise it goes below or to the right.
-        let mut target_bounds = Bounds::from_corners(
-            first_popover_bounds.origin,
-            last_popover_bounds.bottom_right(),
-        );
-        target_bounds.size.width = menu_bounds.size.width;
-
-        // Like `target_bounds`, but with the max height it could occupy. Choosing an aside position
-        // based on this is preferred for layout stability.
-        let mut max_target_bounds = target_bounds;
-        max_target_bounds.size.height = max_height;
-        if y_flipped {
-            max_target_bounds.origin.y -= max_height - target_bounds.size.height;
-        }
-
-        // Add spacing around `target_bounds` and `max_target_bounds`.
-        let mut extend_amount = Edges::all(MENU_GAP);
-        if y_flipped {
-            extend_amount.bottom = line_height;
-        } else {
-            extend_amount.top = line_height;
-        }
-        let target_bounds = target_bounds.extend(extend_amount);
-        let max_target_bounds = max_target_bounds.extend(extend_amount);
-
-        let must_place_above_or_below =
-            if y_flipped && !menu_is_last && menu_bounds.size.height < max_menu_height {
-                laid_out_popovers[menu_ix + 1..]
-                    .iter()
-                    .any(|(_, popover_bounds)| popover_bounds.size.width > menu_bounds.size.width)
-            } else {
-                false
-            };
-
-        let aside_bounds = self.layout_context_menu_aside(
-            y_flipped,
-            *menu_bounds,
-            target_bounds,
-            max_target_bounds,
-            max_menu_height,
-            must_place_above_or_below,
-            text_hitbox,
-            viewport_bounds,
-            window,
-            cx,
-        );
-
-        if let Some(menu_bounds) = laid_out_popovers.iter().find_map(|(popover_type, bounds)| {
-            if matches!(popover_type, CursorPopoverType::CodeContextMenu) {
-                Some(*bounds)
-            } else {
-                None
-            }
-        }) {
-            let bounds = if let Some(aside_bounds) = aside_bounds {
-                menu_bounds.union(&aside_bounds)
-            } else {
-                menu_bounds
-            };
-            return Some(ContextMenuLayout { y_flipped, bounds });
-        }
-
-        None
-    }
-
-    fn layout_gutter_menu(
-        &self,
-        line_height: Pixels,
-        text_hitbox: &Hitbox,
-        content_origin: gpui::Point<Pixels>,
-        right_margin: Pixels,
-        scroll_pixel_position: gpui::Point<ScrollPixelOffset>,
-        gutter_overshoot: Pixels,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        let editor = self.editor.read(cx);
-        if !editor.context_menu_visible() {
-            return;
-        }
-        let Some(crate::ContextMenuOrigin::GutterIndicator(gutter_row)) =
-            editor.context_menu_origin()
-        else {
-            return;
-        };
-        // Context menu was spawned via a click on a gutter. Ensure it's a bit closer to the
-        // indicator than just a plain first column of the text field.
-        let target_position = content_origin
-            + gpui::Point {
-                x: -gutter_overshoot,
-                y: Pixels::from(
-                    gutter_row.next_row().as_f64() * ScrollPixelOffset::from(line_height)
-                        - scroll_pixel_position.y,
-                ),
-            };
-
-        let (min_height_in_lines, max_height_in_lines) = editor
-            .context_menu_options
-            .as_ref()
-            .map_or((3, 12), |options| {
-                (options.min_entries_visible, options.max_entries_visible)
-            });
-
-        let min_height = line_height * min_height_in_lines as f32 + POPOVER_Y_PADDING;
-        let max_height = line_height * max_height_in_lines as f32 + POPOVER_Y_PADDING;
-        let viewport_bounds =
-            Bounds::new(Default::default(), window.viewport_size()).extend(Edges {
-                right: -right_margin - MENU_GAP,
-                ..Default::default()
-            });
-        self.layout_popovers_above_or_below_line(
-            target_position,
-            line_height,
-            min_height,
-            max_height,
-            editor
-                .context_menu_options
-                .as_ref()
-                .and_then(|options| options.placement.clone()),
-            text_hitbox,
-            viewport_bounds,
-            window,
-            cx,
-            move |height, _max_width_for_stable_x, _, window, cx| {
-                let mut element = self
-                    .render_context_menu(line_height, height, window, cx)
-                    .expect("Visible context menu should always render.");
-                let size = element.layout_as_root(AvailableSpace::min_size(), window, cx);
-                vec![(CursorPopoverType::CodeContextMenu, element, size)]
-            },
-        );
-    }
-
-    fn layout_popovers_above_or_below_line(
-        &self,
-        target_position: gpui::Point<Pixels>,
-        line_height: Pixels,
-        min_height: Pixels,
-        max_height: Pixels,
-        placement: Option<ContextMenuPlacement>,
-        text_hitbox: &Hitbox,
-        viewport_bounds: Bounds<Pixels>,
-        window: &mut Window,
-        cx: &mut App,
-        make_sized_popovers: impl FnOnce(
-            Pixels,
-            Pixels,
-            bool,
-            &mut Window,
-            &mut App,
-        ) -> Vec<(CursorPopoverType, AnyElement, Size<Pixels>)>,
-    ) -> Option<(Vec<(CursorPopoverType, Bounds<Pixels>)>, bool)> {
-        let text_style = TextStyleRefinement {
-            line_height: Some(DefiniteLength::Fraction(
-                BufferLineHeight::Comfortable.value(),
-            )),
-            ..Default::default()
-        };
-        window.with_text_style(Some(text_style), |window| {
-            // If the max height won't fit below and there is more space above, put it above the line.
-            let bottom_y_when_flipped = target_position.y - line_height;
-            let available_above = bottom_y_when_flipped - text_hitbox.top();
-            let available_below = text_hitbox.bottom() - target_position.y;
-            let y_overflows_below = max_height > available_below;
-            let mut y_flipped = match placement {
-                Some(ContextMenuPlacement::Above) => true,
-                Some(ContextMenuPlacement::Below) => false,
-                None => y_overflows_below && available_above > available_below,
-            };
-            let mut height = cmp::min(
-                max_height,
-                if y_flipped {
-                    available_above
-                } else {
-                    available_below
-                },
-            );
-
-            // If the min height doesn't fit within text bounds, instead fit within the window.
-            if height < min_height {
-                let available_above = bottom_y_when_flipped;
-                let available_below = viewport_bounds.bottom() - target_position.y;
-                let (y_flipped_override, height_override) = match placement {
-                    Some(ContextMenuPlacement::Above) => {
-                        (true, cmp::min(available_above, min_height))
-                    }
-                    Some(ContextMenuPlacement::Below) => {
-                        (false, cmp::min(available_below, min_height))
-                    }
-                    None => {
-                        if available_below > min_height {
-                            (false, min_height)
-                        } else if available_above > min_height {
-                            (true, min_height)
-                        } else if available_above > available_below {
-                            (true, available_above)
-                        } else {
-                            (false, available_below)
-                        }
-                    }
-                };
-                y_flipped = y_flipped_override;
-                height = height_override;
-            }
-
-            let max_width_for_stable_x = viewport_bounds.right() - target_position.x;
-
-            // TODO: Use viewport_bounds.width as a max width so that it doesn't get clipped on the left
-            // for very narrow windows.
-            let popovers =
-                make_sized_popovers(height, max_width_for_stable_x, y_flipped, window, cx);
-            if popovers.is_empty() {
-                return None;
-            }
-
-            let max_width = popovers
-                .iter()
-                .map(|(_, _, size)| size.width)
-                .max()
-                .unwrap_or_default();
-
-            let mut current_position = gpui::Point {
-                // Snap the right edge of the list to the right edge of the window if its horizontal bounds
-                // overflow. Include space for the scrollbar.
-                x: target_position
-                    .x
-                    .min((viewport_bounds.right() - max_width).max(Pixels::ZERO)),
-                y: if y_flipped {
-                    bottom_y_when_flipped
-                } else {
-                    target_position.y
-                },
-            };
-
-            let mut laid_out_popovers = popovers
-                .into_iter()
-                .map(|(popover_type, element, size)| {
-                    if y_flipped {
-                        current_position.y -= size.height;
-                    }
-                    let position = current_position;
-                    window.defer_draw(element, current_position, 1);
-                    if !y_flipped {
-                        current_position.y += size.height + MENU_GAP;
-                    } else {
-                        current_position.y -= MENU_GAP;
-                    }
-                    (popover_type, Bounds::new(position, size))
-                })
-                .collect::<Vec<_>>();
-
-            if y_flipped {
-                laid_out_popovers.reverse();
-            }
-
-            Some((laid_out_popovers, y_flipped))
-        })
-    }
-
-    fn layout_context_menu_aside(
-        &self,
-        y_flipped: bool,
-        menu_bounds: Bounds<Pixels>,
-        target_bounds: Bounds<Pixels>,
-        max_target_bounds: Bounds<Pixels>,
-        max_height: Pixels,
-        must_place_above_or_below: bool,
-        text_hitbox: &Hitbox,
-        viewport_bounds: Bounds<Pixels>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<Bounds<Pixels>> {
-        let available_within_viewport = target_bounds.space_within(&viewport_bounds);
-        let positioned_aside = if available_within_viewport.right >= MENU_ASIDE_MIN_WIDTH
-            && !must_place_above_or_below
-        {
-            let max_width = cmp::min(
-                available_within_viewport.right - px(1.),
-                MENU_ASIDE_MAX_WIDTH,
-            );
-            let mut aside = self.render_context_menu_aside(
-                size(max_width, max_height - POPOVER_Y_PADDING),
-                window,
-                cx,
-            )?;
-            let size = aside.layout_as_root(AvailableSpace::min_size(), window, cx);
-            let right_position = point(target_bounds.right(), menu_bounds.origin.y);
-            Some((aside, right_position, size))
-        } else {
-            let max_size = size(
-                // TODO(mgsloan): Once the menu is bounded by viewport width the bound on viewport
-                // won't be needed here.
-                cmp::min(
-                    cmp::max(menu_bounds.size.width - px(2.), MENU_ASIDE_MIN_WIDTH),
-                    viewport_bounds.right(),
-                ),
-                cmp::min(
-                    max_height,
-                    cmp::max(
-                        available_within_viewport.top,
-                        available_within_viewport.bottom,
-                    ),
-                ) - POPOVER_Y_PADDING,
-            );
-            let mut aside = self.render_context_menu_aside(max_size, window, cx)?;
-            let actual_size = aside.layout_as_root(AvailableSpace::min_size(), window, cx);
-
-            let top_position = point(
-                menu_bounds.origin.x,
-                target_bounds.top() - actual_size.height,
-            );
-            let bottom_position = point(menu_bounds.origin.x, target_bounds.bottom());
-
-            let fit_within = |available: Edges<Pixels>, wanted: Size<Pixels>| {
-                // Prefer to fit on the same side of the line as the menu, then on the other side of
-                // the line.
-                if !y_flipped && wanted.height < available.bottom {
-                    Some(bottom_position)
-                } else if !y_flipped && wanted.height < available.top {
-                    Some(top_position)
-                } else if y_flipped && wanted.height < available.top {
-                    Some(top_position)
-                } else if y_flipped && wanted.height < available.bottom {
-                    Some(bottom_position)
-                } else {
-                    None
-                }
-            };
-
-            // Prefer choosing a direction using max sizes rather than actual size for stability.
-            let available_within_text = max_target_bounds.space_within(&text_hitbox.bounds);
-            let wanted = size(MENU_ASIDE_MAX_WIDTH, max_height);
-            let aside_position = fit_within(available_within_text, wanted)
-                // Fallback: fit max size in window.
-                .or_else(|| fit_within(max_target_bounds.space_within(&viewport_bounds), wanted))
-                // Fallback: fit actual size in window.
-                .or_else(|| fit_within(available_within_viewport, actual_size));
-
-            aside_position.map(|position| (aside, position, actual_size))
-        };
-
-        // Skip drawing if it doesn't fit anywhere.
-        if let Some((aside, position, size)) = positioned_aside {
-            let aside_bounds = Bounds::new(position, size);
-            window.defer_draw(aside, position, 2);
-            return Some(aside_bounds);
-        }
-
-        None
-    }
-
-    fn render_context_menu(
-        &self,
-        line_height: Pixels,
-        height: Pixels,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<AnyElement> {
-        let max_height_in_lines = ((height - POPOVER_Y_PADDING) / line_height).floor() as u32;
-        self.editor.update(cx, |editor, cx| {
-            editor.render_context_menu(max_height_in_lines, window, cx)
-        })
-    }
-
-    fn render_context_menu_aside(
-        &self,
-        max_size: Size<Pixels>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<AnyElement> {
-        if max_size.width < px(100.) || max_size.height < px(12.) {
-            None
-        } else {
-            self.editor.update(cx, |editor, cx| {
-                editor.render_context_menu_aside(max_size, window, cx)
-            })
-        }
-    }
-
-    fn layout_mouse_context_menu(
-        &self,
-        editor_snapshot: &EditorSnapshot,
-        visible_range: Range<DisplayRow>,
-        content_origin: gpui::Point<Pixels>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<AnyElement> {
-        let position = self.editor.update(cx, |editor, cx| {
-            let visible_start_point = editor.display_to_pixel_point(
-                DisplayPoint::new(visible_range.start, 0),
-                editor_snapshot,
-                window,
-                cx,
-            )?;
-            let visible_end_point = editor.display_to_pixel_point(
-                DisplayPoint::new(visible_range.end, 0),
-                editor_snapshot,
-                window,
-                cx,
-            )?;
-
-            let mouse_context_menu = editor.mouse_context_menu.as_ref()?;
-            let (source_display_point, position) = match mouse_context_menu.position {
-                MenuPosition::PinnedToScreen(point) => (None, point),
-                MenuPosition::PinnedToEditor { source, offset } => {
-                    let source_display_point = source.to_display_point(editor_snapshot);
-                    let source_point =
-                        editor.to_pixel_point(source, editor_snapshot, window, cx)?;
-                    let position = content_origin + source_point + offset;
-                    (Some(source_display_point), position)
-                }
-            };
-
-            let source_included = source_display_point.is_none_or(|source_display_point| {
-                visible_range
-                    .to_inclusive()
-                    .contains(&source_display_point.row())
-            });
-            let position_included =
-                visible_start_point.y <= position.y && position.y <= visible_end_point.y;
-            if !source_included && !position_included {
-                None
-            } else {
-                Some(position)
-            }
-        })?;
-
-        let text_style = TextStyleRefinement {
-            line_height: Some(DefiniteLength::Fraction(
-                BufferLineHeight::Comfortable.value(),
-            )),
-            ..Default::default()
-        };
-        window.with_text_style(Some(text_style), |window| {
-            let mut element = self.editor.read_with(cx, |editor, _| {
-                let mouse_context_menu = editor.mouse_context_menu.as_ref()?;
-                let context_menu = mouse_context_menu.context_menu.clone();
-
-                Some(
-                    deferred(
-                        anchored()
-                            .position(position)
-                            .child(context_menu)
-                            .anchor(Corner::TopLeft)
-                            .snap_to_window_with_margin(px(8.)),
-                    )
-                    .with_priority(1)
-                    .into_any(),
-                )
-            })?;
-
-            element.prepaint_as_root(position, AvailableSpace::min_size(), window, cx);
-            Some(element)
-        })
-    }
-
-    fn layout_hover_popovers(
-        &self,
-        snapshot: &EditorSnapshot,
-        hitbox: &Hitbox,
-        visible_display_row_range: Range<DisplayRow>,
-        content_origin: gpui::Point<Pixels>,
-        scroll_pixel_position: gpui::Point<ScrollPixelOffset>,
-        line_layouts: &[LineWithInvisibles],
-        line_height: Pixels,
-        em_width: Pixels,
-        context_menu_layout: Option<ContextMenuLayout>,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        struct MeasuredHoverPopover {
-            element: AnyElement,
-            size: Size<Pixels>,
-            horizontal_offset: Pixels,
-        }
-
-        let max_size = size(
-            (120. * em_width) // Default size
-                .min(hitbox.size.width / 2.) // Shrink to half of the editor width
-                .max(MIN_POPOVER_CHARACTER_WIDTH * em_width), // Apply minimum width of 20 characters
-            (16. * line_height) // Default size
-                .min(hitbox.size.height / 2.) // Shrink to half of the editor height
-                .max(MIN_POPOVER_LINE_HEIGHT * line_height), // Apply minimum height of 4 lines
-        );
-
-        let hover_popovers = self.editor.update(cx, |editor, cx| {
-            editor.hover_state.render(
-                snapshot,
-                visible_display_row_range.clone(),
-                max_size,
-                &editor.text_layout_details(window),
-                window,
-                cx,
-            )
-        });
-        let Some((popover_position, hover_popovers)) = hover_popovers else {
-            return;
-        };
-
-        // This is safe because we check on layout whether the required row is available
-        let hovered_row_layout = &line_layouts[popover_position
-            .row()
-            .minus(visible_display_row_range.start)
-            as usize];
-
-        // Compute Hovered Point
-        let x = hovered_row_layout.x_for_index(popover_position.column() as usize)
-            - Pixels::from(scroll_pixel_position.x);
-        let y = Pixels::from(
-            popover_position.row().as_f64() * ScrollPixelOffset::from(line_height)
-                - scroll_pixel_position.y,
-        );
-        let hovered_point = content_origin + point(x, y);
-
-        let mut overall_height = Pixels::ZERO;
-        let mut measured_hover_popovers = Vec::new();
-        for (position, mut hover_popover) in hover_popovers.into_iter().with_position() {
-            let size = hover_popover.layout_as_root(AvailableSpace::min_size(), window, cx);
-            let horizontal_offset =
-                (hitbox.top_right().x - POPOVER_RIGHT_OFFSET - (hovered_point.x + size.width))
-                    .min(Pixels::ZERO);
-            match position {
-                itertools::Position::Middle | itertools::Position::Last => {
-                    overall_height += HOVER_POPOVER_GAP
-                }
-                _ => {}
-            }
-            overall_height += size.height;
-            measured_hover_popovers.push(MeasuredHoverPopover {
-                element: hover_popover,
-                size,
-                horizontal_offset,
-            });
-        }
-
-        fn draw_occluder(
-            width: Pixels,
-            origin: gpui::Point<Pixels>,
-            window: &mut Window,
-            cx: &mut App,
-        ) {
-            let mut occlusion = div()
-                .size_full()
-                .occlude()
-                .on_mouse_move(|_, _, cx| cx.stop_propagation())
-                .into_any_element();
-            occlusion.layout_as_root(size(width, HOVER_POPOVER_GAP).into(), window, cx);
-            window.defer_draw(occlusion, origin, 2);
-        }
-
-        fn place_popovers_above(
-            hovered_point: gpui::Point<Pixels>,
-            measured_hover_popovers: Vec<MeasuredHoverPopover>,
-            window: &mut Window,
-            cx: &mut App,
-        ) {
-            let mut current_y = hovered_point.y;
-            for (position, popover) in measured_hover_popovers.into_iter().with_position() {
-                let size = popover.size;
-                let popover_origin = point(
-                    hovered_point.x + popover.horizontal_offset,
-                    current_y - size.height,
-                );
-
-                window.defer_draw(popover.element, popover_origin, 2);
-                if position != itertools::Position::Last {
-                    let origin = point(popover_origin.x, popover_origin.y - HOVER_POPOVER_GAP);
-                    draw_occluder(size.width, origin, window, cx);
-                }
-
-                current_y = popover_origin.y - HOVER_POPOVER_GAP;
-            }
-        }
-
-        fn place_popovers_below(
-            hovered_point: gpui::Point<Pixels>,
-            measured_hover_popovers: Vec<MeasuredHoverPopover>,
-            line_height: Pixels,
-            window: &mut Window,
-            cx: &mut App,
-        ) {
-            let mut current_y = hovered_point.y + line_height;
-            for (position, popover) in measured_hover_popovers.into_iter().with_position() {
-                let size = popover.size;
-                let popover_origin = point(hovered_point.x + popover.horizontal_offset, current_y);
-
-                window.defer_draw(popover.element, popover_origin, 2);
-                if position != itertools::Position::Last {
-                    let origin = point(popover_origin.x, popover_origin.y + size.height);
-                    draw_occluder(size.width, origin, window, cx);
-                }
-
-                current_y = popover_origin.y + size.height + HOVER_POPOVER_GAP;
-            }
-        }
-
-        let intersects_menu = |bounds: Bounds<Pixels>| -> bool {
-            context_menu_layout
-                .as_ref()
-                .is_some_and(|menu| bounds.intersects(&menu.bounds))
-        };
-
-        let can_place_above = {
-            let mut bounds_above = Vec::new();
-            let mut current_y = hovered_point.y;
-            for popover in &measured_hover_popovers {
-                let size = popover.size;
-                let popover_origin = point(
-                    hovered_point.x + popover.horizontal_offset,
-                    current_y - size.height,
-                );
-                bounds_above.push(Bounds::new(popover_origin, size));
-                current_y = popover_origin.y - HOVER_POPOVER_GAP;
-            }
-            bounds_above
-                .iter()
-                .all(|b| b.is_contained_within(hitbox) && !intersects_menu(*b))
-        };
-
-        let can_place_below = || {
-            let mut bounds_below = Vec::new();
-            let mut current_y = hovered_point.y + line_height;
-            for popover in &measured_hover_popovers {
-                let size = popover.size;
-                let popover_origin = point(hovered_point.x + popover.horizontal_offset, current_y);
-                bounds_below.push(Bounds::new(popover_origin, size));
-                current_y = popover_origin.y + size.height + HOVER_POPOVER_GAP;
-            }
-            bounds_below
-                .iter()
-                .all(|b| b.is_contained_within(hitbox) && !intersects_menu(*b))
-        };
-
-        if can_place_above {
-            // try placing above hovered point
-            place_popovers_above(hovered_point, measured_hover_popovers, window, cx);
-        } else if can_place_below() {
-            // try placing below hovered point
-            place_popovers_below(
-                hovered_point,
-                measured_hover_popovers,
-                line_height,
-                window,
-                cx,
-            );
-        } else {
-            // try to place popovers around the context menu
-            let origin_surrounding_menu = context_menu_layout.as_ref().and_then(|menu| {
-                let total_width = measured_hover_popovers
-                    .iter()
-                    .map(|p| p.size.width)
-                    .max()
-                    .unwrap_or(Pixels::ZERO);
-                let y_for_horizontal_positioning = if menu.y_flipped {
-                    menu.bounds.bottom() - overall_height
-                } else {
-                    menu.bounds.top()
-                };
-                let possible_origins = vec![
-                    // left of context menu
-                    point(
-                        menu.bounds.left() - total_width - HOVER_POPOVER_GAP,
-                        y_for_horizontal_positioning,
-                    ),
-                    // right of context menu
-                    point(
-                        menu.bounds.right() + HOVER_POPOVER_GAP,
-                        y_for_horizontal_positioning,
-                    ),
-                    // top of context menu
-                    point(
-                        menu.bounds.left(),
-                        menu.bounds.top() - overall_height - HOVER_POPOVER_GAP,
-                    ),
-                    // bottom of context menu
-                    point(menu.bounds.left(), menu.bounds.bottom() + HOVER_POPOVER_GAP),
-                ];
-                possible_origins.into_iter().find(|&origin| {
-                    Bounds::new(origin, size(total_width, overall_height))
-                        .is_contained_within(hitbox)
-                })
-            });
-            if let Some(origin) = origin_surrounding_menu {
-                let mut current_y = origin.y;
-                for (position, popover) in measured_hover_popovers.into_iter().with_position() {
-                    let size = popover.size;
-                    let popover_origin = point(origin.x, current_y);
-
-                    window.defer_draw(popover.element, popover_origin, 2);
-                    if position != itertools::Position::Last {
-                        let origin = point(popover_origin.x, popover_origin.y + size.height);
-                        draw_occluder(size.width, origin, window, cx);
-                    }
-
-                    current_y = popover_origin.y + size.height + HOVER_POPOVER_GAP;
-                }
-            } else {
-                // fallback to existing above/below cursor logic
-                // this might overlap menu or overflow in rare case
-                if can_place_above {
-                    place_popovers_above(hovered_point, measured_hover_popovers, window, cx);
-                } else {
-                    place_popovers_below(
-                        hovered_point,
-                        measured_hover_popovers,
-                        line_height,
-                        window,
-                        cx,
-                    );
-                }
-            }
-        }
-    }
-
-    fn layout_word_diff_highlights(
-        display_hunks: &[(DisplayDiffHunk, Option<Hitbox>)],
-        row_infos: &[RowInfo],
-        start_row: DisplayRow,
-        snapshot: &EditorSnapshot,
-        highlighted_ranges: &mut Vec<(Range<DisplayPoint>, Hsla)>,
-        cx: &mut App,
-    ) {
-        let colors = cx.theme().colors();
-
-        let word_highlights = display_hunks
-            .into_iter()
-            .filter_map(|(hunk, _)| match hunk {
-                DisplayDiffHunk::Unfolded {
-                    word_diffs, status, ..
-                } => Some((word_diffs, status)),
-                _ => None,
-            })
-            .filter(|(_, status)| status.is_modified())
-            .flat_map(|(word_diffs, _)| word_diffs)
-            .filter_map(|word_diff| {
-                let start_point = word_diff.start.to_display_point(&snapshot.display_snapshot);
-                let end_point = word_diff.end.to_display_point(&snapshot.display_snapshot);
-                let start_row_offset = start_point.row().0.saturating_sub(start_row.0) as usize;
-
-                row_infos
-                    .get(start_row_offset)
-                    .and_then(|row_info| row_info.diff_status)
-                    .and_then(|diff_status| {
-                        let background_color = match diff_status.kind {
-                            DiffHunkStatusKind::Added => colors.version_control_word_added,
-                            DiffHunkStatusKind::Deleted => colors.version_control_word_deleted,
-                            DiffHunkStatusKind::Modified => {
-                                debug_panic!("modified diff status for row info");
-                                return None;
-                            }
-                        };
-                        Some((start_point..end_point, background_color))
-                    })
-            });
-
-        highlighted_ranges.extend(word_highlights);
-    }
-
-    fn layout_diff_hunk_controls(
-        &self,
-        row_range: Range<DisplayRow>,
-        row_infos: &[RowInfo],
-        text_hitbox: &Hitbox,
-        newest_cursor_position: Option<DisplayPoint>,
-        line_height: Pixels,
-        right_margin: Pixels,
-        scroll_pixel_position: gpui::Point<ScrollPixelOffset>,
-        display_hunks: &[(DisplayDiffHunk, Option<Hitbox>)],
-        highlighted_rows: &BTreeMap<DisplayRow, LineHighlight>,
-        editor: Entity<Editor>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> (Vec<AnyElement>, Vec<(DisplayRow, Bounds<Pixels>)>) {
-        let render_diff_hunk_controls = editor.read(cx).render_diff_hunk_controls.clone();
-        let hovered_diff_hunk_row = editor.read(cx).hovered_diff_hunk_row;
-
-        let mut controls = vec![];
-        let mut control_bounds = vec![];
-
-        let active_positions = [
-            hovered_diff_hunk_row.map(|row| DisplayPoint::new(row, 0)),
-            newest_cursor_position,
-        ];
-
-        for (hunk, _) in display_hunks {
-            if let DisplayDiffHunk::Unfolded {
-                display_row_range,
-                multi_buffer_range,
-                status,
-                is_created_file,
-                ..
-            } = &hunk
-            {
-                if display_row_range.start < row_range.start
-                    || display_row_range.start >= row_range.end
-                {
-                    continue;
-                }
-                if highlighted_rows
-                    .get(&display_row_range.start)
-                    .and_then(|highlight| highlight.type_id)
-                    .is_some_and(|type_id| {
-                        [
-                            TypeId::of::<ConflictsOuter>(),
-                            TypeId::of::<ConflictsOursMarker>(),
-                            TypeId::of::<ConflictsOurs>(),
-                            TypeId::of::<ConflictsTheirs>(),
-                            TypeId::of::<ConflictsTheirsMarker>(),
-                        ]
-                        .contains(&type_id)
-                    })
-                {
-                    continue;
-                }
-                let row_ix = (display_row_range.start - row_range.start).0 as usize;
-                if row_infos[row_ix].diff_status.is_none() {
-                    continue;
-                }
-                if row_infos[row_ix]
-                    .diff_status
-                    .is_some_and(|status| status.is_added())
-                    && !status.is_added()
-                {
-                    continue;
-                }
-
-                if active_positions
-                    .iter()
-                    .any(|p| p.is_some_and(|p| display_row_range.contains(&p.row())))
-                {
-                    let y = (display_row_range.start.as_f64()
-                        * ScrollPixelOffset::from(line_height)
-                        + ScrollPixelOffset::from(text_hitbox.bounds.top())
-                        - scroll_pixel_position.y)
-                        .into();
-
-                    let mut element = render_diff_hunk_controls(
-                        display_row_range.start.0,
-                        status,
-                        multi_buffer_range.clone(),
-                        *is_created_file,
-                        line_height,
-                        &editor,
-                        window,
-                        cx,
-                    );
-                    let size =
-                        element.layout_as_root(size(px(100.0), line_height).into(), window, cx);
-
-                    let x = text_hitbox.bounds.right() - right_margin - px(10.) - size.width;
-
-                    let bounds = Bounds::new(gpui::Point::new(x, y), size);
-                    control_bounds.push((display_row_range.start, bounds));
-
-                    window.with_absolute_element_offset(gpui::Point::new(x, y), |window| {
-                        element.prepaint(window, cx)
-                    });
-                    controls.push(element);
-                }
-            }
-        }
-
-        (controls, control_bounds)
-    }
-
-    fn layout_signature_help(
-        &self,
-        hitbox: &Hitbox,
-        content_origin: gpui::Point<Pixels>,
-        scroll_pixel_position: gpui::Point<ScrollPixelOffset>,
-        newest_selection_head: Option<DisplayPoint>,
-        start_row: DisplayRow,
-        line_layouts: &[LineWithInvisibles],
-        line_height: Pixels,
-        em_width: Pixels,
-        context_menu_layout: Option<ContextMenuLayout>,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        if !self.editor.focus_handle(cx).is_focused(window) {
-            return;
-        }
-        let Some(newest_selection_head) = newest_selection_head else {
-            return;
-        };
-
-        let max_size = size(
-            (120. * em_width) // Default size
-                .min(hitbox.size.width / 2.) // Shrink to half of the editor width
-                .max(MIN_POPOVER_CHARACTER_WIDTH * em_width), // Apply minimum width of 20 characters
-            (16. * line_height) // Default size
-                .min(hitbox.size.height / 2.) // Shrink to half of the editor height
-                .max(MIN_POPOVER_LINE_HEIGHT * line_height), // Apply minimum height of 4 lines
-        );
-
-        let maybe_element = self.editor.update(cx, |editor, cx| {
-            if let Some(popover) = editor.signature_help_state.popover_mut() {
-                let element = popover.render(max_size, window, cx);
-                Some(element)
-            } else {
-                None
-            }
-        });
-        let Some(mut element) = maybe_element else {
-            return;
-        };
-
-        let selection_row = newest_selection_head.row();
-        let Some(cursor_row_layout) = (selection_row >= start_row)
-            .then(|| line_layouts.get(selection_row.minus(start_row) as usize))
-            .flatten()
-        else {
-            return;
-        };
-
-        let target_x = cursor_row_layout.x_for_index(newest_selection_head.column() as usize)
-            - Pixels::from(scroll_pixel_position.x);
-        let target_y = Pixels::from(
-            selection_row.as_f64() * ScrollPixelOffset::from(line_height) - scroll_pixel_position.y,
-        );
-        let target_point = content_origin + point(target_x, target_y);
-
-        let actual_size = element.layout_as_root(Size::<AvailableSpace>::default(), window, cx);
-
-        let (popover_bounds_above, popover_bounds_below) = {
-            let horizontal_offset = (hitbox.top_right().x
-                - POPOVER_RIGHT_OFFSET
-                - (target_point.x + actual_size.width))
-                .min(Pixels::ZERO);
-            let initial_x = target_point.x + horizontal_offset;
-            (
-                Bounds::new(
-                    point(initial_x, target_point.y - actual_size.height),
-                    actual_size,
-                ),
-                Bounds::new(
-                    point(initial_x, target_point.y + line_height + HOVER_POPOVER_GAP),
-                    actual_size,
-                ),
-            )
-        };
-
-        let intersects_menu = |bounds: Bounds<Pixels>| -> bool {
-            context_menu_layout
-                .as_ref()
-                .is_some_and(|menu| bounds.intersects(&menu.bounds))
-        };
-
-        let final_origin = if popover_bounds_above.is_contained_within(hitbox)
-            && !intersects_menu(popover_bounds_above)
-        {
-            // try placing above cursor
-            popover_bounds_above.origin
-        } else if popover_bounds_below.is_contained_within(hitbox)
-            && !intersects_menu(popover_bounds_below)
-        {
-            // try placing below cursor
-            popover_bounds_below.origin
-        } else {
-            // try surrounding context menu if exists
-            let origin_surrounding_menu = context_menu_layout.as_ref().and_then(|menu| {
-                let y_for_horizontal_positioning = if menu.y_flipped {
-                    menu.bounds.bottom() - actual_size.height
-                } else {
-                    menu.bounds.top()
-                };
-                let possible_origins = vec![
-                    // left of context menu
-                    point(
-                        menu.bounds.left() - actual_size.width - HOVER_POPOVER_GAP,
-                        y_for_horizontal_positioning,
-                    ),
-                    // right of context menu
-                    point(
-                        menu.bounds.right() + HOVER_POPOVER_GAP,
-                        y_for_horizontal_positioning,
-                    ),
-                    // top of context menu
-                    point(
-                        menu.bounds.left(),
-                        menu.bounds.top() - actual_size.height - HOVER_POPOVER_GAP,
-                    ),
-                    // bottom of context menu
-                    point(menu.bounds.left(), menu.bounds.bottom() + HOVER_POPOVER_GAP),
-                ];
-                possible_origins
-                    .into_iter()
-                    .find(|&origin| Bounds::new(origin, actual_size).is_contained_within(hitbox))
-            });
-            origin_surrounding_menu.unwrap_or_else(|| {
-                // fallback to existing above/below cursor logic
-                // this might overlap menu or overflow in rare case
-                if popover_bounds_above.is_contained_within(hitbox) {
-                    popover_bounds_above.origin
-                } else {
-                    popover_bounds_below.origin
-                }
-            })
-        };
-
-        window.defer_draw(element, final_origin, 2);
-    }
-
-    fn paint_background(&self, layout: &EditorLayout, window: &mut Window, cx: &mut App) {
-        window.paint_layer(layout.hitbox.bounds, |window| {
-            let scroll_top = layout.position_map.snapshot.scroll_position().y;
-            let gutter_bg = cx.theme().colors().editor_gutter_background;
-            window.paint_quad(fill(layout.gutter_hitbox.bounds, gutter_bg));
-            window.paint_quad(fill(
-                layout.position_map.text_hitbox.bounds,
-                self.style.background,
-            ));
-
-            if matches!(
-                layout.mode,
-                EditorMode::Full { .. } | EditorMode::Minimap { .. }
-            ) {
-                let show_active_line_background = match layout.mode {
-                    EditorMode::Full {
-                        show_active_line_background,
-                        ..
-                    } => show_active_line_background,
-                    EditorMode::Minimap { .. } => true,
-                    _ => false,
-                };
-                let mut active_rows = layout.active_rows.iter().peekable();
-                while let Some((start_row, contains_non_empty_selection)) = active_rows.next() {
-                    let mut end_row = start_row.0;
-                    while active_rows
-                        .peek()
-                        .is_some_and(|(active_row, has_selection)| {
-                            active_row.0 == end_row + 1
-                                && has_selection.selection == contains_non_empty_selection.selection
-                        })
-                    {
-                        active_rows.next().unwrap();
-                        end_row += 1;
-                    }
-
-                    if show_active_line_background && !contains_non_empty_selection.selection {
-                        let highlight_h_range =
-                            match layout.position_map.snapshot.current_line_highlight {
-                                CurrentLineHighlight::Gutter => Some(Range {
-                                    start: layout.hitbox.left(),
-                                    end: layout.gutter_hitbox.right(),
-                                }),
-                                CurrentLineHighlight::Line => Some(Range {
-                                    start: layout.position_map.text_hitbox.bounds.left(),
-                                    end: layout.position_map.text_hitbox.bounds.right(),
-                                }),
-                                CurrentLineHighlight::All => Some(Range {
-                                    start: layout.hitbox.left(),
-                                    end: layout.hitbox.right(),
-                                }),
-                                CurrentLineHighlight::None => None,
-                            };
-                        if let Some(range) = highlight_h_range {
-                            let active_line_bg = cx.theme().colors().editor_active_line_background;
-                            let bounds = Bounds {
-                                origin: point(
-                                    range.start,
-                                    layout.hitbox.origin.y
-                                        + Pixels::from(
-                                            (start_row.as_f64() - scroll_top)
-                                                * ScrollPixelOffset::from(
-                                                    layout.position_map.line_height,
-                                                ),
-                                        ),
-                                ),
-                                size: size(
-                                    range.end - range.start,
-                                    layout.position_map.line_height
-                                        * (end_row - start_row.0 + 1) as f32,
-                                ),
-                            };
-                            window.paint_quad(fill(bounds, active_line_bg));
-                        }
-                    }
-                }
-
-                let mut paint_highlight = |highlight_row_start: DisplayRow,
-                                           highlight_row_end: DisplayRow,
-                                           highlight: crate::LineHighlight,
-                                           edges| {
-                    let mut origin_x = layout.hitbox.left();
-                    let mut width = layout.hitbox.size.width;
-                    if !highlight.include_gutter {
-                        origin_x += layout.gutter_hitbox.size.width;
-                        width -= layout.gutter_hitbox.size.width;
-                    }
-
-                    let origin = point(
-                        origin_x,
-                        layout.hitbox.origin.y
-                            + Pixels::from(
-                                (highlight_row_start.as_f64() - scroll_top)
-                                    * ScrollPixelOffset::from(layout.position_map.line_height),
-                            ),
-                    );
-                    let size = size(
-                        width,
-                        layout.position_map.line_height
-                            * highlight_row_end.next_row().minus(highlight_row_start) as f32,
-                    );
-                    let mut quad = fill(Bounds { origin, size }, highlight.background);
-                    if let Some(border_color) = highlight.border {
-                        quad.border_color = border_color;
-                        quad.border_widths = edges
-                    }
-                    window.paint_quad(quad);
-                };
-
-                let mut current_paint: Option<(LineHighlight, Range<DisplayRow>, Edges<Pixels>)> =
-                    None;
-                for (&new_row, &new_background) in &layout.highlighted_rows {
-                    match &mut current_paint {
-                        &mut Some((current_background, ref mut current_range, mut edges)) => {
-                            let new_range_started = current_background != new_background
-                                || current_range.end.next_row() != new_row;
-                            if new_range_started {
-                                if current_range.end.next_row() == new_row {
-                                    edges.bottom = px(0.);
-                                };
-                                paint_highlight(
-                                    current_range.start,
-                                    current_range.end,
-                                    current_background,
-                                    edges,
-                                );
-                                let edges = Edges {
-                                    top: if current_range.end.next_row() != new_row {
-                                        px(1.)
-                                    } else {
-                                        px(0.)
-                                    },
-                                    bottom: px(1.),
-                                    ..Default::default()
-                                };
-                                current_paint = Some((new_background, new_row..new_row, edges));
-                                continue;
-                            } else {
-                                current_range.end = current_range.end.next_row();
-                            }
-                        }
-                        None => {
-                            let edges = Edges {
-                                top: px(1.),
-                                bottom: px(1.),
-                                ..Default::default()
-                            };
-                            current_paint = Some((new_background, new_row..new_row, edges))
-                        }
-                    };
-                }
-                if let Some((color, range, edges)) = current_paint {
-                    paint_highlight(range.start, range.end, color, edges);
-                }
-
-                for (guide_x, active) in layout.wrap_guides.iter() {
-                    let color = if *active {
-                        cx.theme().colors().editor_active_wrap_guide
-                    } else {
-                        cx.theme().colors().editor_wrap_guide
-                    };
-                    window.paint_quad(fill(
-                        Bounds {
-                            origin: point(*guide_x, layout.position_map.text_hitbox.origin.y),
-                            size: size(px(1.), layout.position_map.text_hitbox.size.height),
-                        },
-                        color,
-                    ));
-                }
-            }
-        })
-    }
-
-    fn paint_indent_guides(
-        &mut self,
-        layout: &mut EditorLayout,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        let Some(indent_guides) = &layout.indent_guides else {
-            return;
-        };
-
-        let faded_color = |color: Hsla, alpha: f32| {
-            let mut faded = color;
-            faded.a = alpha;
-            faded
-        };
-
-        for indent_guide in indent_guides {
-            let indent_accent_colors = cx.theme().accents().color_for_index(indent_guide.depth);
-            let settings = &indent_guide.settings;
-
-            // TODO fixed for now, expose them through themes later
-            const INDENT_AWARE_ALPHA: f32 = 0.2;
-            const INDENT_AWARE_ACTIVE_ALPHA: f32 = 0.4;
-            const INDENT_AWARE_BACKGROUND_ALPHA: f32 = 0.1;
-            const INDENT_AWARE_BACKGROUND_ACTIVE_ALPHA: f32 = 0.2;
-
-            let line_color = match (settings.coloring, indent_guide.active) {
-                (IndentGuideColoring::Disabled, _) => None,
-                (IndentGuideColoring::Fixed, false) => {
-                    Some(cx.theme().colors().editor_indent_guide)
-                }
-                (IndentGuideColoring::Fixed, true) => {
-                    Some(cx.theme().colors().editor_indent_guide_active)
-                }
-                (IndentGuideColoring::IndentAware, false) => {
-                    Some(faded_color(indent_accent_colors, INDENT_AWARE_ALPHA))
-                }
-                (IndentGuideColoring::IndentAware, true) => {
-                    Some(faded_color(indent_accent_colors, INDENT_AWARE_ACTIVE_ALPHA))
-                }
-            };
-
-            let background_color = match (settings.background_coloring, indent_guide.active) {
-                (IndentGuideBackgroundColoring::Disabled, _) => None,
-                (IndentGuideBackgroundColoring::IndentAware, false) => Some(faded_color(
-                    indent_accent_colors,
-                    INDENT_AWARE_BACKGROUND_ALPHA,
-                )),
-                (IndentGuideBackgroundColoring::IndentAware, true) => Some(faded_color(
-                    indent_accent_colors,
-                    INDENT_AWARE_BACKGROUND_ACTIVE_ALPHA,
-                )),
-            };
-
-            let requested_line_width = if indent_guide.active {
-                settings.active_line_width
-            } else {
-                settings.line_width
-            }
-            .clamp(1, 10);
-            let mut line_indicator_width = 0.;
-            if let Some(color) = line_color {
-                window.paint_quad(fill(
-                    Bounds {
-                        origin: indent_guide.origin,
-                        size: size(px(requested_line_width as f32), indent_guide.length),
-                    },
-                    color,
-                ));
-                line_indicator_width = requested_line_width as f32;
-            }
-
-            if let Some(color) = background_color {
-                let width = indent_guide.single_indent_width - px(line_indicator_width);
-                window.paint_quad(fill(
-                    Bounds {
-                        origin: point(
-                            indent_guide.origin.x + px(line_indicator_width),
-                            indent_guide.origin.y,
-                        ),
-                        size: size(width, indent_guide.length),
-                    },
-                    color,
-                ));
-            }
-        }
-    }
-
-    fn paint_line_numbers(&mut self, layout: &mut EditorLayout, window: &mut Window, cx: &mut App) {
-        let is_singleton = self.editor.read(cx).buffer_kind(cx) == ItemBufferKind::Singleton;
-
-        let line_height = layout.position_map.line_height;
-        window.set_cursor_style(CursorStyle::Arrow, &layout.gutter_hitbox);
-
-        for line_layout in layout.line_numbers.values() {
-            for LineNumberSegment {
-                shaped_line,
-                hitbox,
-            } in &line_layout.segments
-            {
-                let Some(hitbox) = hitbox else {
-                    continue;
-                };
-
-                let Some(()) = (if !is_singleton && hitbox.is_hovered(window) {
-                    let color = cx.theme().colors().editor_hover_line_number;
-
-                    let line = self.shape_line_number(shaped_line.text.clone(), color, window);
-                    line.paint(hitbox.origin, line_height, window, cx).log_err()
-                } else {
-                    shaped_line
-                        .paint(hitbox.origin, line_height, window, cx)
-                        .log_err()
-                }) else {
-                    continue;
-                };
-
-                // In singleton buffers, we select corresponding lines on the line number click, so use | -like cursor.
-                // In multi buffers, we open file at the line number clicked, so use a pointing hand cursor.
-                if is_singleton {
-                    window.set_cursor_style(CursorStyle::IBeam, hitbox);
-                } else {
-                    window.set_cursor_style(CursorStyle::PointingHand, hitbox);
-                }
-            }
-        }
-    }
-
-    fn paint_gutter_diff_hunks(layout: &mut EditorLayout, window: &mut Window, cx: &mut App) {
-        if layout.display_hunks.is_empty() {
-            return;
-        }
-
-        let line_height = layout.position_map.line_height;
-        window.paint_layer(layout.gutter_hitbox.bounds, |window| {
-            for (hunk, hitbox) in &layout.display_hunks {
-                let hunk_to_paint = match hunk {
-                    DisplayDiffHunk::Folded { .. } => {
-                        let hunk_bounds = Self::diff_hunk_bounds(
-                            &layout.position_map.snapshot,
-                            line_height,
-                            layout.gutter_hitbox.bounds,
-                            hunk,
-                        );
-                        Some((
-                            hunk_bounds,
-                            cx.theme().colors().version_control_modified,
-                            Corners::all(px(0.)),
-                            DiffHunkStatus::modified_none(),
-                        ))
-                    }
-                    DisplayDiffHunk::Unfolded {
-                        status,
-                        display_row_range,
-                        ..
-                    } => hitbox.as_ref().map(|hunk_hitbox| match status.kind {
-                        DiffHunkStatusKind::Added => (
-                            hunk_hitbox.bounds,
-                            cx.theme().colors().version_control_added,
-                            Corners::all(px(0.)),
-                            *status,
-                        ),
-                        DiffHunkStatusKind::Modified => (
-                            hunk_hitbox.bounds,
-                            cx.theme().colors().version_control_modified,
-                            Corners::all(px(0.)),
-                            *status,
-                        ),
-                        DiffHunkStatusKind::Deleted if !display_row_range.is_empty() => (
-                            hunk_hitbox.bounds,
-                            cx.theme().colors().version_control_deleted,
-                            Corners::all(px(0.)),
-                            *status,
-                        ),
-                        DiffHunkStatusKind::Deleted => (
-                            Bounds::new(
-                                point(
-                                    hunk_hitbox.origin.x - hunk_hitbox.size.width,
-                                    hunk_hitbox.origin.y,
-                                ),
-                                size(hunk_hitbox.size.width * 2., hunk_hitbox.size.height),
-                            ),
-                            cx.theme().colors().version_control_deleted,
-                            Corners::all(1. * line_height),
-                            *status,
-                        ),
-                    }),
-                };
-
-                if let Some((hunk_bounds, background_color, corner_radii, status)) = hunk_to_paint {
-                    // Flatten the background color with the editor color to prevent
-                    // elements below transparent hunks from showing through
-                    let flattened_background_color = cx
-                        .theme()
-                        .colors()
-                        .editor_background
-                        .blend(background_color);
-
-                    if !Self::diff_hunk_hollow(status, cx) {
-                        window.paint_quad(quad(
-                            hunk_bounds,
-                            corner_radii,
-                            flattened_background_color,
-                            Edges::default(),
-                            transparent_black(),
-                            BorderStyle::default(),
-                        ));
-                    } else {
-                        let flattened_unstaged_background_color = cx
-                            .theme()
-                            .colors()
-                            .editor_background
-                            .blend(background_color.opacity(0.3));
-
-                        window.paint_quad(quad(
-                            hunk_bounds,
-                            corner_radii,
-                            flattened_unstaged_background_color,
-                            Edges::all(px(1.0)),
-                            flattened_background_color,
-                            BorderStyle::Solid,
-                        ));
-                    }
-                }
-            }
-        });
-    }
-
-    fn gutter_strip_width(line_height: Pixels) -> Pixels {
-        (0.275 * line_height).floor()
-    }
-
-    fn diff_hunk_bounds(
-        snapshot: &EditorSnapshot,
-        line_height: Pixels,
-        gutter_bounds: Bounds<Pixels>,
-        hunk: &DisplayDiffHunk,
-    ) -> Bounds<Pixels> {
-        let scroll_position = snapshot.scroll_position();
-        let scroll_top = scroll_position.y * ScrollPixelOffset::from(line_height);
-        let gutter_strip_width = Self::gutter_strip_width(line_height);
-
-        match hunk {
-            DisplayDiffHunk::Folded { display_row, .. } => {
-                let start_y = (display_row.as_f64() * ScrollPixelOffset::from(line_height)
-                    - scroll_top)
-                    .into();
-                let end_y = start_y + line_height;
-                let highlight_origin = gutter_bounds.origin + point(px(0.), start_y);
-                let highlight_size = size(gutter_strip_width, end_y - start_y);
-                Bounds::new(highlight_origin, highlight_size)
-            }
-            DisplayDiffHunk::Unfolded {
-                display_row_range,
-                status,
-                ..
-            } => {
-                if status.is_deleted() && display_row_range.is_empty() {
-                    let row = display_row_range.start;
-
-                    let offset = ScrollPixelOffset::from(line_height / 2.);
-                    let start_y =
-                        (row.as_f64() * ScrollPixelOffset::from(line_height) - offset - scroll_top)
-                            .into();
-                    let end_y = start_y + line_height;
-
-                    let width = (0.35 * line_height).floor();
-                    let highlight_origin = gutter_bounds.origin + point(px(0.), start_y);
-                    let highlight_size = size(width, end_y - start_y);
-                    Bounds::new(highlight_origin, highlight_size)
-                } else {
-                    let start_row = display_row_range.start;
-                    let end_row = display_row_range.end;
-                    // If we're in a multibuffer, row range span might include an
-                    // excerpt header, so if we were to draw the marker straight away,
-                    // the hunk might include the rows of that header.
-                    // Making the range inclusive doesn't quite cut it, as we rely on the exclusivity for the soft wrap.
-                    // Instead, we simply check whether the range we're dealing with includes
-                    // any excerpt headers and if so, we stop painting the diff hunk on the first row of that header.
-                    let end_row_in_current_excerpt = snapshot
-                        .blocks_in_range(start_row..end_row)
-                        .find_map(|(start_row, block)| {
-                            if matches!(
-                                block,
-                                Block::ExcerptBoundary { .. } | Block::BufferHeader { .. }
-                            ) {
-                                Some(start_row)
-                            } else {
-                                None
-                            }
-                        })
-                        .unwrap_or(end_row);
-
-                    let start_y = (start_row.as_f64() * ScrollPixelOffset::from(line_height)
-                        - scroll_top)
-                        .into();
-                    let end_y = Pixels::from(
-                        end_row_in_current_excerpt.as_f64() * ScrollPixelOffset::from(line_height)
-                            - scroll_top,
-                    );
-
-                    let highlight_origin = gutter_bounds.origin + point(px(0.), start_y);
-                    let highlight_size = size(gutter_strip_width, end_y - start_y);
-                    Bounds::new(highlight_origin, highlight_size)
-                }
-            }
-        }
-    }
-
-    fn paint_gutter_indicators(
-        &self,
-        layout: &mut EditorLayout,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        window.paint_layer(layout.gutter_hitbox.bounds, |window| {
-            window.with_element_namespace("crease_toggles", |window| {
-                for crease_toggle in layout.crease_toggles.iter_mut().flatten() {
-                    crease_toggle.paint(window, cx);
-                }
-            });
-
-            window.with_element_namespace("expand_toggles", |window| {
-                for (expand_toggle, _) in layout.expand_toggles.iter_mut().flatten() {
-                    expand_toggle.paint(window, cx);
-                }
-            });
-
-            for breakpoint in layout.breakpoints.iter_mut() {
-                breakpoint.paint(window, cx);
-            }
-
-            for test_indicator in layout.test_indicators.iter_mut() {
-                test_indicator.paint(window, cx);
-            }
-        });
-    }
-
-    fn paint_gutter_highlights(
-        &self,
-        layout: &mut EditorLayout,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        for (_, hunk_hitbox) in &layout.display_hunks {
-            if let Some(hunk_hitbox) = hunk_hitbox
-                && !self
-                    .editor
-                    .read(cx)
-                    .buffer()
-                    .read(cx)
-                    .all_diff_hunks_expanded()
-            {
-                window.set_cursor_style(CursorStyle::PointingHand, hunk_hitbox);
-            }
-        }
-
-        let show_git_gutter = layout
-            .position_map
-            .snapshot
-            .show_git_diff_gutter
-            .unwrap_or_else(|| {
-                matches!(
-                    ProjectSettings::get_global(cx).git.git_gutter,
-                    GitGutterSetting::TrackedFiles
-                )
-            });
-        if show_git_gutter {
-            Self::paint_gutter_diff_hunks(layout, window, cx)
-        }
-
-        let highlight_width = 0.275 * layout.position_map.line_height;
-        let highlight_corner_radii = Corners::all(0.05 * layout.position_map.line_height);
-        window.paint_layer(layout.gutter_hitbox.bounds, |window| {
-            for (range, color) in &layout.highlighted_gutter_ranges {
-                let start_row = if range.start.row() < layout.visible_display_row_range.start {
-                    layout.visible_display_row_range.start - DisplayRow(1)
-                } else {
-                    range.start.row()
-                };
-                let end_row = if range.end.row() > layout.visible_display_row_range.end {
-                    layout.visible_display_row_range.end + DisplayRow(1)
-                } else {
-                    range.end.row()
-                };
-
-                let start_y = layout.gutter_hitbox.top()
-                    + Pixels::from(
-                        start_row.0 as f64
-                            * ScrollPixelOffset::from(layout.position_map.line_height)
-                            - layout.position_map.scroll_pixel_position.y,
-                    );
-                let end_y = layout.gutter_hitbox.top()
-                    + Pixels::from(
-                        (end_row.0 + 1) as f64
-                            * ScrollPixelOffset::from(layout.position_map.line_height)
-                            - layout.position_map.scroll_pixel_position.y,
-                    );
-                let bounds = Bounds::from_corners(
-                    point(layout.gutter_hitbox.left(), start_y),
-                    point(layout.gutter_hitbox.left() + highlight_width, end_y),
-                );
-                window.paint_quad(fill(bounds, *color).corner_radii(highlight_corner_radii));
-            }
-        });
-    }
-
-    fn paint_blamed_display_rows(
-        &self,
-        layout: &mut EditorLayout,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        let Some(blamed_display_rows) = layout.blamed_display_rows.take() else {
-            return;
-        };
-
-        window.paint_layer(layout.gutter_hitbox.bounds, |window| {
-            for mut blame_element in blamed_display_rows.into_iter() {
-                blame_element.paint(window, cx);
-            }
-        })
-    }
-
-    fn paint_text(&mut self, layout: &mut EditorLayout, window: &mut Window, cx: &mut App) {
-        window.with_content_mask(
-            Some(ContentMask {
-                bounds: layout.position_map.text_hitbox.bounds,
-            }),
-            |window| {
-                let editor = self.editor.read(cx);
-                if editor.mouse_cursor_hidden {
-                    window.set_window_cursor_style(CursorStyle::None);
-                } else if let SelectionDragState::ReadyToDrag {
-                    mouse_down_time, ..
-                } = &editor.selection_drag_state
-                {
-                    let drag_and_drop_delay = Duration::from_millis(
-                        EditorSettings::get_global(cx)
-                            .drag_and_drop_selection
-                            .delay
-                            .0,
-                    );
-                    if mouse_down_time.elapsed() >= drag_and_drop_delay {
-                        window.set_cursor_style(
-                            CursorStyle::DragCopy,
-                            &layout.position_map.text_hitbox,
-                        );
-                    }
-                } else if matches!(
-                    editor.selection_drag_state,
-                    SelectionDragState::Dragging { .. }
-                ) {
-                    window
-                        .set_cursor_style(CursorStyle::DragCopy, &layout.position_map.text_hitbox);
-                } else if editor
-                    .hovered_link_state
-                    .as_ref()
-                    .is_some_and(|hovered_link_state| !hovered_link_state.links.is_empty())
-                {
-                    window.set_cursor_style(
-                        CursorStyle::PointingHand,
-                        &layout.position_map.text_hitbox,
-                    );
-                } else {
-                    window.set_cursor_style(CursorStyle::IBeam, &layout.position_map.text_hitbox);
-                };
-
-                self.paint_lines_background(layout, window, cx);
-                let invisible_display_ranges = self.paint_highlights(layout, window, cx);
-                self.paint_document_colors(layout, window);
-                self.paint_lines(&invisible_display_ranges, layout, window, cx);
-                self.paint_redactions(layout, window);
-                self.paint_cursors(layout, window, cx);
-                self.paint_inline_diagnostics(layout, window, cx);
-                self.paint_inline_blame(layout, window, cx);
-                self.paint_inline_code_actions(layout, window, cx);
-                self.paint_diff_hunk_controls(layout, window, cx);
-                window.with_element_namespace("crease_trailers", |window| {
-                    for trailer in layout.crease_trailers.iter_mut().flatten() {
-                        trailer.element.paint(window, cx);
-                    }
-                });
-            },
-        )
-    }
-
-    fn paint_highlights(
-        &mut self,
-        layout: &mut EditorLayout,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> SmallVec<[Range<DisplayPoint>; 32]> {
-        window.paint_layer(layout.position_map.text_hitbox.bounds, |window| {
-            let mut invisible_display_ranges = SmallVec::<[Range<DisplayPoint>; 32]>::new();
-            let line_end_overshoot = 0.15 * layout.position_map.line_height;
-            for (range, color) in &layout.highlighted_ranges {
-                self.paint_highlighted_range(
-                    range.clone(),
-                    true,
-                    *color,
-                    Pixels::ZERO,
-                    line_end_overshoot,
-                    layout,
-                    window,
-                );
-            }
-
-            let corner_radius = if EditorSettings::get_global(cx).rounded_selection {
-                0.15 * layout.position_map.line_height
-            } else {
-                Pixels::ZERO
-            };
-
-            for (player_color, selections) in &layout.selections {
-                for selection in selections.iter() {
-                    self.paint_highlighted_range(
-                        selection.range.clone(),
-                        true,
-                        player_color.selection,
-                        corner_radius,
-                        corner_radius * 2.,
-                        layout,
-                        window,
-                    );
-
-                    if selection.is_local && !selection.range.is_empty() {
-                        invisible_display_ranges.push(selection.range.clone());
-                    }
-                }
-            }
-            invisible_display_ranges
-        })
-    }
-
-    fn paint_lines(
-        &mut self,
-        invisible_display_ranges: &[Range<DisplayPoint>],
-        layout: &mut EditorLayout,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        let whitespace_setting = self
-            .editor
-            .read(cx)
-            .buffer
-            .read(cx)
-            .language_settings(cx)
-            .show_whitespaces;
-
-        for (ix, line_with_invisibles) in layout.position_map.line_layouts.iter().enumerate() {
-            let row = DisplayRow(layout.visible_display_row_range.start.0 + ix as u32);
-            line_with_invisibles.draw(
-                layout,
-                row,
-                layout.content_origin,
-                whitespace_setting,
-                invisible_display_ranges,
-                window,
-                cx,
-            )
-        }
-
-        for line_element in &mut layout.line_elements {
-            line_element.paint(window, cx);
-        }
-    }
-
-    fn paint_sticky_headers(
-        &mut self,
-        layout: &mut EditorLayout,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        let Some(mut sticky_headers) = layout.sticky_headers.take() else {
-            return;
-        };
-
-        if sticky_headers.lines.is_empty() {
-            layout.sticky_headers = Some(sticky_headers);
-            return;
-        }
-
-        let whitespace_setting = self
-            .editor
-            .read(cx)
-            .buffer
-            .read(cx)
-            .language_settings(cx)
-            .show_whitespaces;
-        sticky_headers.paint(layout, whitespace_setting, window, cx);
-
-        let sticky_header_hitboxes: Vec<Hitbox> = sticky_headers
-            .lines
-            .iter()
-            .map(|line| line.hitbox.clone())
-            .collect();
-        let hovered_hitbox = sticky_header_hitboxes
-            .iter()
-            .find_map(|hitbox| hitbox.is_hovered(window).then_some(hitbox.id));
-
-        window.on_mouse_event(move |_: &MouseMoveEvent, phase, window, _cx| {
-            if !phase.bubble() {
-                return;
-            }
-
-            let current_hover = sticky_header_hitboxes
-                .iter()
-                .find_map(|hitbox| hitbox.is_hovered(window).then_some(hitbox.id));
-            if hovered_hitbox != current_hover {
-                window.refresh();
-            }
-        });
-
-        for (line_index, line) in sticky_headers.lines.iter().enumerate() {
-            let editor = self.editor.clone();
-            let hitbox = line.hitbox.clone();
-            let target_anchor = line.target_anchor;
-            window.on_mouse_event(move |event: &MouseDownEvent, phase, window, cx| {
-                if !phase.bubble() {
-                    return;
-                }
-
-                if event.button == MouseButton::Left && hitbox.is_hovered(window) {
-                    editor.update(cx, |editor, cx| {
-                        editor.change_selections(
-                            SelectionEffects::scroll(Autoscroll::top_relative(line_index)),
-                            window,
-                            cx,
-                            |selections| selections.select_ranges([target_anchor..target_anchor]),
-                        );
-                        cx.stop_propagation();
-                    });
-                }
-            });
-        }
-
-        let text_bounds = layout.position_map.text_hitbox.bounds;
-        let border_top = text_bounds.top()
-            + sticky_headers.lines.last().unwrap().offset
-            + layout.position_map.line_height;
-        let separator_height = px(1.);
-        let border_bounds = Bounds::from_corners(
-            point(layout.gutter_hitbox.bounds.left(), border_top),
-            point(text_bounds.right(), border_top + separator_height),
-        );
-        window.paint_quad(fill(border_bounds, cx.theme().colors().border_variant));
-
-        layout.sticky_headers = Some(sticky_headers);
-    }
-
-    fn paint_lines_background(
-        &mut self,
-        layout: &mut EditorLayout,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        for (ix, line_with_invisibles) in layout.position_map.line_layouts.iter().enumerate() {
-            let row = DisplayRow(layout.visible_display_row_range.start.0 + ix as u32);
-            line_with_invisibles.draw_background(layout, row, layout.content_origin, window, cx);
-        }
-    }
-
-    fn paint_redactions(&mut self, layout: &EditorLayout, window: &mut Window) {
-        if layout.redacted_ranges.is_empty() {
-            return;
-        }
-
-        let line_end_overshoot = layout.line_end_overshoot();
-
-        // A softer than perfect black
-        let redaction_color = gpui::rgb(0x0e1111);
-
-        window.paint_layer(layout.position_map.text_hitbox.bounds, |window| {
-            for range in layout.redacted_ranges.iter() {
-                self.paint_highlighted_range(
-                    range.clone(),
-                    true,
-                    redaction_color.into(),
-                    Pixels::ZERO,
-                    line_end_overshoot,
-                    layout,
-                    window,
-                );
-            }
-        });
-    }
-
-    fn paint_document_colors(&self, layout: &mut EditorLayout, window: &mut Window) {
-        let Some((colors_render_mode, image_colors)) = &layout.document_colors else {
-            return;
-        };
-        if image_colors.is_empty()
-            || colors_render_mode == &DocumentColorsRenderMode::None
-            || colors_render_mode == &DocumentColorsRenderMode::Inlay
-        {
-            return;
-        }
-
-        let line_end_overshoot = layout.line_end_overshoot();
-
-        for (range, color) in image_colors {
-            match colors_render_mode {
-                DocumentColorsRenderMode::Inlay | DocumentColorsRenderMode::None => return,
-                DocumentColorsRenderMode::Background => {
-                    self.paint_highlighted_range(
-                        range.clone(),
-                        true,
-                        *color,
-                        Pixels::ZERO,
-                        line_end_overshoot,
-                        layout,
-                        window,
-                    );
-                }
-                DocumentColorsRenderMode::Border => {
-                    self.paint_highlighted_range(
-                        range.clone(),
-                        false,
-                        *color,
-                        Pixels::ZERO,
-                        line_end_overshoot,
-                        layout,
-                        window,
-                    );
-                }
-            }
-        }
-    }
-
-    fn paint_cursors(&mut self, layout: &mut EditorLayout, window: &mut Window, cx: &mut App) {
-        for cursor in &mut layout.visible_cursors {
-            cursor.paint(layout.content_origin, window, cx);
-        }
-    }
-
-    fn paint_scrollbars(&mut self, layout: &mut EditorLayout, window: &mut Window, cx: &mut App) {
-        let Some(scrollbars_layout) = layout.scrollbars_layout.take() else {
-            return;
-        };
-        let any_scrollbar_dragged = self.editor.read(cx).scroll_manager.any_scrollbar_dragged();
-
-        for (scrollbar_layout, axis) in scrollbars_layout.iter_scrollbars() {
-            let hitbox = &scrollbar_layout.hitbox;
-            if scrollbars_layout.visible {
-                let scrollbar_edges = match axis {
-                    ScrollbarAxis::Horizontal => Edges {
-                        top: Pixels::ZERO,
-                        right: Pixels::ZERO,
-                        bottom: Pixels::ZERO,
-                        left: Pixels::ZERO,
-                    },
-                    ScrollbarAxis::Vertical => Edges {
-                        top: Pixels::ZERO,
-                        right: Pixels::ZERO,
-                        bottom: Pixels::ZERO,
-                        left: ScrollbarLayout::BORDER_WIDTH,
-                    },
-                };
-
-                window.paint_layer(hitbox.bounds, |window| {
-                    window.paint_quad(quad(
-                        hitbox.bounds,
-                        Corners::default(),
-                        cx.theme().colors().scrollbar_track_background,
-                        scrollbar_edges,
-                        cx.theme().colors().scrollbar_track_border,
-                        BorderStyle::Solid,
-                    ));
-
-                    if axis == ScrollbarAxis::Vertical {
-                        let fast_markers =
-                            self.collect_fast_scrollbar_markers(layout, scrollbar_layout, cx);
-                        // Refresh slow scrollbar markers in the background. Below, we
-                        // paint whatever markers have already been computed.
-                        self.refresh_slow_scrollbar_markers(layout, scrollbar_layout, window, cx);
-
-                        let markers = self.editor.read(cx).scrollbar_marker_state.markers.clone();
-                        for marker in markers.iter().chain(&fast_markers) {
-                            let mut marker = marker.clone();
-                            marker.bounds.origin += hitbox.origin;
-                            window.paint_quad(marker);
-                        }
-                    }
-
-                    if let Some(thumb_bounds) = scrollbar_layout.thumb_bounds {
-                        let scrollbar_thumb_color = match scrollbar_layout.thumb_state {
-                            ScrollbarThumbState::Dragging => {
-                                cx.theme().colors().scrollbar_thumb_active_background
-                            }
-                            ScrollbarThumbState::Hovered => {
-                                cx.theme().colors().scrollbar_thumb_hover_background
-                            }
-                            ScrollbarThumbState::Idle => {
-                                cx.theme().colors().scrollbar_thumb_background
-                            }
-                        };
-                        window.paint_quad(quad(
-                            thumb_bounds,
-                            Corners::default(),
-                            scrollbar_thumb_color,
-                            scrollbar_edges,
-                            cx.theme().colors().scrollbar_thumb_border,
-                            BorderStyle::Solid,
-                        ));
-
-                        if any_scrollbar_dragged {
-                            window.set_window_cursor_style(CursorStyle::Arrow);
-                        } else {
-                            window.set_cursor_style(CursorStyle::Arrow, hitbox);
-                        }
-                    }
-                })
-            }
-        }
-
-        window.on_mouse_event({
-            let editor = self.editor.clone();
-            let scrollbars_layout = scrollbars_layout.clone();
-
-            let mut mouse_position = window.mouse_position();
-            move |event: &MouseMoveEvent, phase, window, cx| {
-                if phase == DispatchPhase::Capture {
-                    return;
-                }
-
-                editor.update(cx, |editor, cx| {
-                    if let Some((scrollbar_layout, axis)) = event
-                        .pressed_button
-                        .filter(|button| *button == MouseButton::Left)
-                        .and(editor.scroll_manager.dragging_scrollbar_axis())
-                        .and_then(|axis| {
-                            scrollbars_layout
-                                .iter_scrollbars()
-                                .find(|(_, a)| *a == axis)
-                        })
-                    {
-                        let ScrollbarLayout {
-                            hitbox,
-                            text_unit_size,
-                            ..
-                        } = scrollbar_layout;
-
-                        let old_position = mouse_position.along(axis);
-                        let new_position = event.position.along(axis);
-                        if (hitbox.origin.along(axis)..hitbox.bottom_right().along(axis))
-                            .contains(&old_position)
-                        {
-                            let position = editor.scroll_position(cx).apply_along(axis, |p| {
-                                (p + ScrollOffset::from(
-                                    (new_position - old_position) / *text_unit_size,
-                                ))
-                                .max(0.)
-                            });
-                            editor.set_scroll_position(position, window, cx);
-                        }
-
-                        editor.scroll_manager.show_scrollbars(window, cx);
-                        cx.stop_propagation();
-                    } else if let Some((layout, axis)) = scrollbars_layout
-                        .get_hovered_axis(window)
-                        .filter(|_| !event.dragging())
-                    {
-                        if layout.thumb_hovered(&event.position) {
-                            editor
-                                .scroll_manager
-                                .set_hovered_scroll_thumb_axis(axis, cx);
-                        } else {
-                            editor.scroll_manager.reset_scrollbar_state(cx);
-                        }
-
-                        editor.scroll_manager.show_scrollbars(window, cx);
-                    } else {
-                        editor.scroll_manager.reset_scrollbar_state(cx);
-                    }
-
-                    mouse_position = event.position;
-                })
-            }
-        });
-
-        if any_scrollbar_dragged {
-            window.on_mouse_event({
-                let editor = self.editor.clone();
-                move |_: &MouseUpEvent, phase, window, cx| {
-                    if phase == DispatchPhase::Capture {
-                        return;
-                    }
-
-                    editor.update(cx, |editor, cx| {
-                        if let Some((_, axis)) = scrollbars_layout.get_hovered_axis(window) {
-                            editor
-                                .scroll_manager
-                                .set_hovered_scroll_thumb_axis(axis, cx);
-                        } else {
-                            editor.scroll_manager.reset_scrollbar_state(cx);
-                        }
-                        cx.stop_propagation();
-                    });
-                }
-            });
-        } else {
-            window.on_mouse_event({
-                let editor = self.editor.clone();
-
-                move |event: &MouseDownEvent, phase, window, cx| {
-                    if phase == DispatchPhase::Capture {
-                        return;
-                    }
-                    let Some((scrollbar_layout, axis)) = scrollbars_layout.get_hovered_axis(window)
-                    else {
-                        return;
-                    };
-
-                    let ScrollbarLayout {
-                        hitbox,
-                        visible_range,
-                        text_unit_size,
-                        thumb_bounds,
-                        ..
-                    } = scrollbar_layout;
-
-                    let Some(thumb_bounds) = thumb_bounds else {
-                        return;
-                    };
-
-                    editor.update(cx, |editor, cx| {
-                        editor
-                            .scroll_manager
-                            .set_dragged_scroll_thumb_axis(axis, cx);
-
-                        let event_position = event.position.along(axis);
-
-                        if event_position < thumb_bounds.origin.along(axis)
-                            || thumb_bounds.bottom_right().along(axis) < event_position
-                        {
-                            let center_position = ((event_position - hitbox.origin.along(axis))
-                                / *text_unit_size)
-                                .round() as u32;
-                            let start_position = center_position.saturating_sub(
-                                (visible_range.end - visible_range.start) as u32 / 2,
-                            );
-
-                            let position = editor
-                                .scroll_position(cx)
-                                .apply_along(axis, |_| start_position as ScrollOffset);
-
-                            editor.set_scroll_position(position, window, cx);
-                        } else {
-                            editor.scroll_manager.show_scrollbars(window, cx);
-                        }
-
-                        cx.stop_propagation();
-                    });
-                }
-            });
-        }
-    }
-
-    fn collect_fast_scrollbar_markers(
-        &self,
-        layout: &EditorLayout,
-        scrollbar_layout: &ScrollbarLayout,
-        cx: &mut App,
-    ) -> Vec<PaintQuad> {
-        const LIMIT: usize = 100;
-        if !EditorSettings::get_global(cx).scrollbar.cursors || layout.cursors.len() > LIMIT {
-            return vec![];
-        }
-        let cursor_ranges = layout
-            .cursors
-            .iter()
-            .map(|(point, color)| ColoredRange {
-                start: point.row(),
-                end: point.row(),
-                color: *color,
-            })
-            .collect_vec();
-        scrollbar_layout.marker_quads_for_ranges(cursor_ranges, None)
-    }
-
-    fn refresh_slow_scrollbar_markers(
-        &self,
-        layout: &EditorLayout,
-        scrollbar_layout: &ScrollbarLayout,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        self.editor.update(cx, |editor, cx| {
-            if editor.buffer_kind(cx) != ItemBufferKind::Singleton
-                || !editor
-                    .scrollbar_marker_state
-                    .should_refresh(scrollbar_layout.hitbox.size)
-            {
-                return;
-            }
-
-            let scrollbar_layout = scrollbar_layout.clone();
-            let background_highlights = editor.background_highlights.clone();
-            let snapshot = layout.position_map.snapshot.clone();
-            let theme = cx.theme().clone();
-            let scrollbar_settings = EditorSettings::get_global(cx).scrollbar;
-
-            editor.scrollbar_marker_state.dirty = false;
-            editor.scrollbar_marker_state.pending_refresh =
-                Some(cx.spawn_in(window, async move |editor, cx| {
-                    let scrollbar_size = scrollbar_layout.hitbox.size;
-                    let scrollbar_markers = cx
-                        .background_spawn(async move {
-                            let max_point = snapshot.display_snapshot.buffer_snapshot().max_point();
-                            let mut marker_quads = Vec::new();
-                            if scrollbar_settings.git_diff {
-                                let marker_row_ranges =
-                                    snapshot.buffer_snapshot().diff_hunks().map(|hunk| {
-                                        let start_display_row =
-                                            MultiBufferPoint::new(hunk.row_range.start.0, 0)
-                                                .to_display_point(&snapshot.display_snapshot)
-                                                .row();
-                                        let mut end_display_row =
-                                            MultiBufferPoint::new(hunk.row_range.end.0, 0)
-                                                .to_display_point(&snapshot.display_snapshot)
-                                                .row();
-                                        if end_display_row != start_display_row {
-                                            end_display_row.0 -= 1;
-                                        }
-                                        let color = match &hunk.status().kind {
-                                            DiffHunkStatusKind::Added => {
-                                                theme.colors().version_control_added
-                                            }
-                                            DiffHunkStatusKind::Modified => {
-                                                theme.colors().version_control_modified
-                                            }
-                                            DiffHunkStatusKind::Deleted => {
-                                                theme.colors().version_control_deleted
-                                            }
-                                        };
-                                        ColoredRange {
-                                            start: start_display_row,
-                                            end: end_display_row,
-                                            color,
-                                        }
-                                    });
-
-                                marker_quads.extend(
-                                    scrollbar_layout
-                                        .marker_quads_for_ranges(marker_row_ranges, Some(0)),
-                                );
-                            }
-
-                            for (background_highlight_id, (_, background_ranges)) in
-                                background_highlights.iter()
-                            {
-                                let is_search_highlights = *background_highlight_id
-                                    == HighlightKey::Type(TypeId::of::<BufferSearchHighlights>());
-                                let is_text_highlights = *background_highlight_id
-                                    == HighlightKey::Type(TypeId::of::<SelectedTextHighlight>());
-                                let is_symbol_occurrences = *background_highlight_id
-                                    == HighlightKey::Type(TypeId::of::<DocumentHighlightRead>())
-                                    || *background_highlight_id
-                                        == HighlightKey::Type(
-                                            TypeId::of::<DocumentHighlightWrite>(),
-                                        );
-                                if (is_search_highlights && scrollbar_settings.search_results)
-                                    || (is_text_highlights && scrollbar_settings.selected_text)
-                                    || (is_symbol_occurrences && scrollbar_settings.selected_symbol)
-                                {
-                                    let mut color = theme.status().info;
-                                    if is_symbol_occurrences {
-                                        color.fade_out(0.5);
-                                    }
-                                    let marker_row_ranges = background_ranges.iter().map(|range| {
-                                        let display_start = range
-                                            .start
-                                            .to_display_point(&snapshot.display_snapshot);
-                                        let display_end =
-                                            range.end.to_display_point(&snapshot.display_snapshot);
-                                        ColoredRange {
-                                            start: display_start.row(),
-                                            end: display_end.row(),
-                                            color,
-                                        }
-                                    });
-                                    marker_quads.extend(
-                                        scrollbar_layout
-                                            .marker_quads_for_ranges(marker_row_ranges, Some(1)),
-                                    );
-                                }
-                            }
-
-                            if scrollbar_settings.diagnostics != ScrollbarDiagnostics::None {
-                                let diagnostics = snapshot
-                                    .buffer_snapshot()
-                                    .diagnostics_in_range::<Point>(Point::zero()..max_point)
-                                    // Don't show diagnostics the user doesn't care about
-                                    .filter(|diagnostic| {
-                                        match (
-                                            scrollbar_settings.diagnostics,
-                                            diagnostic.diagnostic.severity,
-                                        ) {
-                                            (ScrollbarDiagnostics::All, _) => true,
-                                            (
-                                                ScrollbarDiagnostics::Error,
-                                                lsp::DiagnosticSeverity::ERROR,
-                                            ) => true,
-                                            (
-                                                ScrollbarDiagnostics::Warning,
-                                                lsp::DiagnosticSeverity::ERROR
-                                                | lsp::DiagnosticSeverity::WARNING,
-                                            ) => true,
-                                            (
-                                                ScrollbarDiagnostics::Information,
-                                                lsp::DiagnosticSeverity::ERROR
-                                                | lsp::DiagnosticSeverity::WARNING
-                                                | lsp::DiagnosticSeverity::INFORMATION,
-                                            ) => true,
-                                            (_, _) => false,
-                                        }
-                                    })
-                                    // We want to sort by severity, in order to paint the most severe diagnostics last.
-                                    .sorted_by_key(|diagnostic| {
-                                        std::cmp::Reverse(diagnostic.diagnostic.severity)
-                                    });
-
-                                let marker_row_ranges = diagnostics.into_iter().map(|diagnostic| {
-                                    let start_display = diagnostic
-                                        .range
-                                        .start
-                                        .to_display_point(&snapshot.display_snapshot);
-                                    let end_display = diagnostic
-                                        .range
-                                        .end
-                                        .to_display_point(&snapshot.display_snapshot);
-                                    let color = match diagnostic.diagnostic.severity {
-                                        lsp::DiagnosticSeverity::ERROR => theme.status().error,
-                                        lsp::DiagnosticSeverity::WARNING => theme.status().warning,
-                                        lsp::DiagnosticSeverity::INFORMATION => theme.status().info,
-                                        _ => theme.status().hint,
-                                    };
-                                    ColoredRange {
-                                        start: start_display.row(),
-                                        end: end_display.row(),
-                                        color,
-                                    }
-                                });
-                                marker_quads.extend(
-                                    scrollbar_layout
-                                        .marker_quads_for_ranges(marker_row_ranges, Some(2)),
-                                );
-                            }
-
-                            Arc::from(marker_quads)
-                        })
-                        .await;
-
-                    editor.update(cx, |editor, cx| {
-                        editor.scrollbar_marker_state.markers = scrollbar_markers;
-                        editor.scrollbar_marker_state.scrollbar_size = scrollbar_size;
-                        editor.scrollbar_marker_state.pending_refresh = None;
-                        cx.notify();
-                    })?;
-
-                    Ok(())
-                }));
-        });
-    }
-
-    fn paint_highlighted_range(
-        &self,
-        range: Range<DisplayPoint>,
-        fill: bool,
-        color: Hsla,
-        corner_radius: Pixels,
-        line_end_overshoot: Pixels,
-        layout: &EditorLayout,
-        window: &mut Window,
-    ) {
-        let start_row = layout.visible_display_row_range.start;
-        let end_row = layout.visible_display_row_range.end;
-        if range.start != range.end {
-            let row_range = if range.end.column() == 0 {
-                cmp::max(range.start.row(), start_row)..cmp::min(range.end.row(), end_row)
-            } else {
-                cmp::max(range.start.row(), start_row)
-                    ..cmp::min(range.end.row().next_row(), end_row)
-            };
-
-            let highlighted_range = HighlightedRange {
-                color,
-                line_height: layout.position_map.line_height,
-                corner_radius,
-                start_y: layout.content_origin.y
-                    + Pixels::from(
-                        (row_range.start.as_f64() - layout.position_map.scroll_position.y)
-                            * ScrollOffset::from(layout.position_map.line_height),
-                    ),
-                lines: row_range
-                    .iter_rows()
-                    .map(|row| {
-                        let line_layout =
-                            &layout.position_map.line_layouts[row.minus(start_row) as usize];
-                        HighlightedRangeLine {
-                            start_x: if row == range.start.row() {
-                                layout.content_origin.x
-                                    + Pixels::from(
-                                        ScrollPixelOffset::from(
-                                            line_layout.x_for_index(range.start.column() as usize),
-                                        ) - layout.position_map.scroll_pixel_position.x,
-                                    )
-                            } else {
-                                layout.content_origin.x
-                                    - Pixels::from(layout.position_map.scroll_pixel_position.x)
-                            },
-                            end_x: if row == range.end.row() {
-                                layout.content_origin.x
-                                    + Pixels::from(
-                                        ScrollPixelOffset::from(
-                                            line_layout.x_for_index(range.end.column() as usize),
-                                        ) - layout.position_map.scroll_pixel_position.x,
-                                    )
-                            } else {
-                                Pixels::from(
-                                    ScrollPixelOffset::from(
-                                        layout.content_origin.x
-                                            + line_layout.width
-                                            + line_end_overshoot,
-                                    ) - layout.position_map.scroll_pixel_position.x,
-                                )
-                            },
-                        }
-                    })
-                    .collect(),
-            };
-
-            highlighted_range.paint(fill, layout.position_map.text_hitbox.bounds, window);
-        }
-    }
-
-    fn paint_inline_diagnostics(
-        &mut self,
-        layout: &mut EditorLayout,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        for mut inline_diagnostic in layout.inline_diagnostics.drain() {
-            inline_diagnostic.1.paint(window, cx);
-        }
-    }
-
-    fn paint_inline_blame(&mut self, layout: &mut EditorLayout, window: &mut Window, cx: &mut App) {
-        if let Some(mut blame_layout) = layout.inline_blame_layout.take() {
-            window.paint_layer(layout.position_map.text_hitbox.bounds, |window| {
-                blame_layout.element.paint(window, cx);
-            })
-        }
-    }
-
-    fn paint_inline_code_actions(
-        &mut self,
-        layout: &mut EditorLayout,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        if let Some(mut inline_code_actions) = layout.inline_code_actions.take() {
-            window.paint_layer(layout.position_map.text_hitbox.bounds, |window| {
-                inline_code_actions.paint(window, cx);
-            })
-        }
-    }
-
-    fn paint_diff_hunk_controls(
-        &mut self,
-        layout: &mut EditorLayout,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        for mut diff_hunk_control in layout.diff_hunk_controls.drain(..) {
-            diff_hunk_control.paint(window, cx);
-        }
-    }
-
-    fn paint_minimap(&self, layout: &mut EditorLayout, window: &mut Window, cx: &mut App) {
-        if let Some(mut layout) = layout.minimap.take() {
-            let minimap_hitbox = layout.thumb_layout.hitbox.clone();
-            let dragging_minimap = self.editor.read(cx).scroll_manager.is_dragging_minimap();
-
-            window.paint_layer(layout.thumb_layout.hitbox.bounds, |window| {
-                window.with_element_namespace("minimap", |window| {
-                    layout.minimap.paint(window, cx);
-                    if let Some(thumb_bounds) = layout.thumb_layout.thumb_bounds {
-                        let minimap_thumb_color = match layout.thumb_layout.thumb_state {
-                            ScrollbarThumbState::Idle => {
-                                cx.theme().colors().minimap_thumb_background
-                            }
-                            ScrollbarThumbState::Hovered => {
-                                cx.theme().colors().minimap_thumb_hover_background
-                            }
-                            ScrollbarThumbState::Dragging => {
-                                cx.theme().colors().minimap_thumb_active_background
-                            }
-                        };
-                        let minimap_thumb_border = match layout.thumb_border_style {
-                            MinimapThumbBorder::Full => Edges::all(ScrollbarLayout::BORDER_WIDTH),
-                            MinimapThumbBorder::LeftOnly => Edges {
-                                left: ScrollbarLayout::BORDER_WIDTH,
-                                ..Default::default()
-                            },
-                            MinimapThumbBorder::LeftOpen => Edges {
-                                right: ScrollbarLayout::BORDER_WIDTH,
-                                top: ScrollbarLayout::BORDER_WIDTH,
-                                bottom: ScrollbarLayout::BORDER_WIDTH,
-                                ..Default::default()
-                            },
-                            MinimapThumbBorder::RightOpen => Edges {
-                                left: ScrollbarLayout::BORDER_WIDTH,
-                                top: ScrollbarLayout::BORDER_WIDTH,
-                                bottom: ScrollbarLayout::BORDER_WIDTH,
-                                ..Default::default()
-                            },
-                            MinimapThumbBorder::None => Default::default(),
-                        };
-
-                        window.paint_layer(minimap_hitbox.bounds, |window| {
-                            window.paint_quad(quad(
-                                thumb_bounds,
-                                Corners::default(),
-                                minimap_thumb_color,
-                                minimap_thumb_border,
-                                cx.theme().colors().minimap_thumb_border,
-                                BorderStyle::Solid,
-                            ));
-                        });
-                    }
-                });
-            });
-
-            if dragging_minimap {
-                window.set_window_cursor_style(CursorStyle::Arrow);
-            } else {
-                window.set_cursor_style(CursorStyle::Arrow, &minimap_hitbox);
-            }
-
-            let minimap_axis = ScrollbarAxis::Vertical;
-            let pixels_per_line = Pixels::from(
-                ScrollPixelOffset::from(minimap_hitbox.size.height) / layout.max_scroll_top,
-            )
-            .min(layout.minimap_line_height);
-
-            let mut mouse_position = window.mouse_position();
-
-            window.on_mouse_event({
-                let editor = self.editor.clone();
-
-                let minimap_hitbox = minimap_hitbox.clone();
-
-                move |event: &MouseMoveEvent, phase, window, cx| {
-                    if phase == DispatchPhase::Capture {
-                        return;
-                    }
-
-                    editor.update(cx, |editor, cx| {
-                        if event.pressed_button == Some(MouseButton::Left)
-                            && editor.scroll_manager.is_dragging_minimap()
-                        {
-                            let old_position = mouse_position.along(minimap_axis);
-                            let new_position = event.position.along(minimap_axis);
-                            if (minimap_hitbox.origin.along(minimap_axis)
-                                ..minimap_hitbox.bottom_right().along(minimap_axis))
-                                .contains(&old_position)
-                            {
-                                let position =
-                                    editor.scroll_position(cx).apply_along(minimap_axis, |p| {
-                                        (p + ScrollPixelOffset::from(
-                                            (new_position - old_position) / pixels_per_line,
-                                        ))
-                                        .max(0.)
-                                    });
-
-                                editor.set_scroll_position(position, window, cx);
-                            }
-                            cx.stop_propagation();
-                        } else if minimap_hitbox.is_hovered(window) {
-                            editor.scroll_manager.set_is_hovering_minimap_thumb(
-                                !event.dragging()
-                                    && layout
-                                        .thumb_layout
-                                        .thumb_bounds
-                                        .is_some_and(|bounds| bounds.contains(&event.position)),
-                                cx,
-                            );
-
-                            // Stop hover events from propagating to the
-                            // underlying editor if the minimap hitbox is hovered
-                            if !event.dragging() {
-                                cx.stop_propagation();
-                            }
-                        } else {
-                            editor.scroll_manager.hide_minimap_thumb(cx);
-                        }
-                        mouse_position = event.position;
-                    });
-                }
-            });
-
-            if dragging_minimap {
-                window.on_mouse_event({
-                    let editor = self.editor.clone();
-                    move |event: &MouseUpEvent, phase, window, cx| {
-                        if phase == DispatchPhase::Capture {
-                            return;
-                        }
-
-                        editor.update(cx, |editor, cx| {
-                            if minimap_hitbox.is_hovered(window) {
-                                editor.scroll_manager.set_is_hovering_minimap_thumb(
-                                    layout
-                                        .thumb_layout
-                                        .thumb_bounds
-                                        .is_some_and(|bounds| bounds.contains(&event.position)),
-                                    cx,
-                                );
-                            } else {
-                                editor.scroll_manager.hide_minimap_thumb(cx);
-                            }
-                            cx.stop_propagation();
-                        });
-                    }
-                });
-            } else {
-                window.on_mouse_event({
-                    let editor = self.editor.clone();
-
-                    move |event: &MouseDownEvent, phase, window, cx| {
-                        if phase == DispatchPhase::Capture || !minimap_hitbox.is_hovered(window) {
-                            return;
-                        }
-
-                        let event_position = event.position;
-
-                        let Some(thumb_bounds) = layout.thumb_layout.thumb_bounds else {
-                            return;
-                        };
-
-                        editor.update(cx, |editor, cx| {
-                            if !thumb_bounds.contains(&event_position) {
-                                let click_position =
-                                    event_position.relative_to(&minimap_hitbox.origin).y;
-
-                                let top_position = (click_position
-                                    - thumb_bounds.size.along(minimap_axis) / 2.0)
-                                    .max(Pixels::ZERO);
-
-                                let scroll_offset = (layout.minimap_scroll_top
-                                    + ScrollPixelOffset::from(
-                                        top_position / layout.minimap_line_height,
-                                    ))
-                                .min(layout.max_scroll_top);
-
-                                let scroll_position = editor
-                                    .scroll_position(cx)
-                                    .apply_along(minimap_axis, |_| scroll_offset);
-                                editor.set_scroll_position(scroll_position, window, cx);
-                            }
-
-                            editor.scroll_manager.set_is_dragging_minimap(cx);
-                            cx.stop_propagation();
-                        });
-                    }
-                });
-            }
-        }
-    }
-
-    fn paint_blocks(&mut self, layout: &mut EditorLayout, window: &mut Window, cx: &mut App) {
-        for mut block in layout.blocks.drain(..) {
-            if block.overlaps_gutter {
-                block.element.paint(window, cx);
-            } else {
-                let mut bounds = layout.hitbox.bounds;
-                bounds.origin.x += layout.gutter_hitbox.bounds.size.width;
-                window.with_content_mask(Some(ContentMask { bounds }), |window| {
-                    block.element.paint(window, cx);
-                })
-            }
-        }
-    }
-
-    fn paint_edit_prediction_popover(
-        &mut self,
-        layout: &mut EditorLayout,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        if let Some(edit_prediction_popover) = layout.edit_prediction_popover.as_mut() {
-            edit_prediction_popover.paint(window, cx);
-        }
-    }
-
-    fn paint_mouse_context_menu(
-        &mut self,
-        layout: &mut EditorLayout,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        if let Some(mouse_context_menu) = layout.mouse_context_menu.as_mut() {
-            mouse_context_menu.paint(window, cx);
-        }
-    }
-
-    fn paint_scroll_wheel_listener(
-        &mut self,
-        layout: &EditorLayout,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        window.on_mouse_event({
-            let position_map = layout.position_map.clone();
-            let editor = self.editor.clone();
-            let hitbox = layout.hitbox.clone();
-            let mut delta = ScrollDelta::default();
-
-            // Set a minimum scroll_sensitivity of 0.01 to make sure the user doesn't
-            // accidentally turn off their scrolling.
-            let base_scroll_sensitivity =
-                EditorSettings::get_global(cx).scroll_sensitivity.max(0.01);
-
-            // Use a minimum fast_scroll_sensitivity for same reason above
-            let fast_scroll_sensitivity = EditorSettings::get_global(cx)
-                .fast_scroll_sensitivity
-                .max(0.01);
-
-            move |event: &ScrollWheelEvent, phase, window, cx| {
-                let scroll_sensitivity = {
-                    if event.modifiers.alt {
-                        fast_scroll_sensitivity
-                    } else {
-                        base_scroll_sensitivity
-                    }
-                };
-
-                if phase == DispatchPhase::Bubble && hitbox.should_handle_scroll(window) {
-                    delta = delta.coalesce(event.delta);
-                    editor.update(cx, |editor, cx| {
-                        let position_map: &PositionMap = &position_map;
-
-                        let line_height = position_map.line_height;
-                        let max_glyph_advance = position_map.em_advance;
-                        let (delta, axis) = match delta {
-                            gpui::ScrollDelta::Pixels(mut pixels) => {
-                                //Trackpad
-                                let axis = position_map.snapshot.ongoing_scroll.filter(&mut pixels);
-                                (pixels, axis)
-                            }
-
-                            gpui::ScrollDelta::Lines(lines) => {
-                                //Not trackpad
-                                let pixels =
-                                    point(lines.x * max_glyph_advance, lines.y * line_height);
-                                (pixels, None)
-                            }
-                        };
-
-                        let current_scroll_position = position_map.snapshot.scroll_position();
-                        let x = (current_scroll_position.x
-                            * ScrollPixelOffset::from(max_glyph_advance)
-                            - ScrollPixelOffset::from(delta.x * scroll_sensitivity))
-                            / ScrollPixelOffset::from(max_glyph_advance);
-                        let y = (current_scroll_position.y * ScrollPixelOffset::from(line_height)
-                            - ScrollPixelOffset::from(delta.y * scroll_sensitivity))
-                            / ScrollPixelOffset::from(line_height);
-                        let mut scroll_position =
-                            point(x, y).clamp(&point(0., 0.), &position_map.scroll_max);
-                        let forbid_vertical_scroll = editor.scroll_manager.forbid_vertical_scroll();
-                        if forbid_vertical_scroll {
-                            scroll_position.y = current_scroll_position.y;
-                        }
-
-                        if scroll_position != current_scroll_position {
-                            editor.scroll(scroll_position, axis, window, cx);
-                            cx.stop_propagation();
-                        } else if y < 0. {
-                            // Due to clamping, we may fail to detect cases of overscroll to the top;
-                            // We want the scroll manager to get an update in such cases and detect the change of direction
-                            // on the next frame.
-                            cx.notify();
-                        }
-                    });
-                }
-            }
-        });
-    }
-
-    fn paint_mouse_listeners(&mut self, layout: &EditorLayout, window: &mut Window, cx: &mut App) {
-        if layout.mode.is_minimap() {
-            return;
-        }
-
-        self.paint_scroll_wheel_listener(layout, window, cx);
-
-        window.on_mouse_event({
-            let position_map = layout.position_map.clone();
-            let editor = self.editor.clone();
-            let line_numbers = layout.line_numbers.clone();
-
-            move |event: &MouseDownEvent, phase, window, cx| {
-                if phase == DispatchPhase::Bubble {
-                    match event.button {
-                        MouseButton::Left => editor.update(cx, |editor, cx| {
-                            let pending_mouse_down = editor
-                                .pending_mouse_down
-                                .get_or_insert_with(Default::default)
-                                .clone();
-
-                            *pending_mouse_down.borrow_mut() = Some(event.clone());
-
-                            Self::mouse_left_down(
-                                editor,
-                                event,
-                                &position_map,
-                                line_numbers.as_ref(),
-                                window,
-                                cx,
-                            );
-                        }),
-                        MouseButton::Right => editor.update(cx, |editor, cx| {
-                            Self::mouse_right_down(editor, event, &position_map, window, cx);
-                        }),
-                        MouseButton::Middle => editor.update(cx, |editor, cx| {
-                            Self::mouse_middle_down(editor, event, &position_map, window, cx);
-                        }),
-                        _ => {}
-                    };
-                }
-            }
-        });
-
-        window.on_mouse_event({
-            let editor = self.editor.clone();
-            let position_map = layout.position_map.clone();
-
-            move |event: &MouseUpEvent, phase, window, cx| {
-                if phase == DispatchPhase::Bubble {
-                    editor.update(cx, |editor, cx| {
-                        Self::mouse_up(editor, event, &position_map, window, cx)
-                    });
-                }
-            }
-        });
-
-        window.on_mouse_event({
-            let editor = self.editor.clone();
-            let position_map = layout.position_map.clone();
-            let mut captured_mouse_down = None;
-
-            move |event: &MouseUpEvent, phase, window, cx| match phase {
-                // Clear the pending mouse down during the capture phase,
-                // so that it happens even if another event handler stops
-                // propagation.
-                DispatchPhase::Capture => editor.update(cx, |editor, _cx| {
-                    let pending_mouse_down = editor
-                        .pending_mouse_down
-                        .get_or_insert_with(Default::default)
-                        .clone();
-
-                    let mut pending_mouse_down = pending_mouse_down.borrow_mut();
-                    if pending_mouse_down.is_some() && position_map.text_hitbox.is_hovered(window) {
-                        captured_mouse_down = pending_mouse_down.take();
-                        window.refresh();
-                    }
-                }),
-                // Fire click handlers during the bubble phase.
-                DispatchPhase::Bubble => editor.update(cx, |editor, cx| {
-                    if let Some(mouse_down) = captured_mouse_down.take() {
-                        let event = ClickEvent::Mouse(MouseClickEvent {
-                            down: mouse_down,
-                            up: event.clone(),
-                        });
-                        Self::click(editor, &event, &position_map, window, cx);
-                    }
-                }),
-            }
-        });
-
-        window.on_mouse_event({
-            let position_map = layout.position_map.clone();
-            let editor = self.editor.clone();
-
-            move |event: &MouseMoveEvent, phase, window, cx| {
-                if phase == DispatchPhase::Bubble {
-                    editor.update(cx, |editor, cx| {
-                        if editor.hover_state.focused(window, cx) {
-                            return;
-                        }
-                        if event.pressed_button == Some(MouseButton::Left)
-                            || event.pressed_button == Some(MouseButton::Middle)
-                        {
-                            Self::mouse_dragged(editor, event, &position_map, window, cx)
-                        }
-
-                        Self::mouse_moved(editor, event, &position_map, window, cx)
-                    });
-                }
-            }
-        });
-    }
-
-    fn shape_line_number(
-        &self,
-        text: SharedString,
-        color: Hsla,
-        window: &mut Window,
-    ) -> ShapedLine {
-        let run = TextRun {
-            len: text.len(),
-            font: self.style.text.font(),
-            color,
-            ..Default::default()
-        };
-        window.text_system().shape_line(
-            text,
-            self.style.text.font_size.to_pixels(window.rem_size()),
-            &[run],
-            None,
-        )
-    }
-
-    fn diff_hunk_hollow(status: DiffHunkStatus, cx: &mut App) -> bool {
-        let unstaged = status.has_secondary_hunk();
-        let unstaged_hollow = matches!(
-            ProjectSettings::get_global(cx).git.hunk_style,
-            GitHunkStyleSetting::UnstagedHollow
-        );
-
-        unstaged == unstaged_hollow
-    }
-
-    #[cfg(debug_assertions)]
-    fn layout_debug_ranges(
-        selections: &mut Vec<(PlayerColor, Vec<SelectionLayout>)>,
-        anchor_range: Range<Anchor>,
-        display_snapshot: &DisplaySnapshot,
-        cx: &App,
-    ) {
-        let theme = cx.theme();
-        text::debug::GlobalDebugRanges::with_locked(|debug_ranges| {
-            if debug_ranges.ranges.is_empty() {
-                return;
-            }
-            let buffer_snapshot = &display_snapshot.buffer_snapshot();
-            for (buffer, buffer_range, excerpt_id) in
-                buffer_snapshot.range_to_buffer_ranges(anchor_range)
-            {
-                let buffer_range =
-                    buffer.anchor_after(buffer_range.start)..buffer.anchor_before(buffer_range.end);
-                selections.extend(debug_ranges.ranges.iter().flat_map(|debug_range| {
-                    let player_color = theme
-                        .players()
-                        .color_for_participant(debug_range.occurrence_index as u32 + 1);
-                    debug_range.ranges.iter().filter_map(move |range| {
-                        if range.start.buffer_id != Some(buffer.remote_id()) {
-                            return None;
-                        }
-                        let clipped_start = range.start.max(&buffer_range.start, buffer);
-                        let clipped_end = range.end.min(&buffer_range.end, buffer);
-                        let range = buffer_snapshot
-                            .anchor_range_in_excerpt(excerpt_id, *clipped_start..*clipped_end)?;
-                        let start = range.start.to_display_point(display_snapshot);
-                        let end = range.end.to_display_point(display_snapshot);
-                        let selection_layout = SelectionLayout {
-                            head: start,
-                            range: start..end,
-                            cursor_shape: CursorShape::Bar,
-                            is_newest: false,
-                            is_local: false,
-                            active_rows: start.row()..end.row(),
-                            user_name: Some(SharedString::new(debug_range.value.clone())),
-                        };
-                        Some((player_color, vec![selection_layout]))
-                    })
-                }));
-            }
-        });
-    }
-}
-
-fn file_status_label_color(file_status: Option<FileStatus>) -> Color {
-    file_status.map_or(Color::Default, |status| {
-        if status.is_conflicted() {
-            Color::Conflict
-        } else if status.is_modified() {
-            Color::Modified
-        } else if status.is_deleted() {
-            Color::Disabled
-        } else if status.is_created() {
-            Color::Created
-        } else {
-            Color::Default
-        }
-    })
-}
-
-fn header_jump_data(
-    editor_snapshot: &EditorSnapshot,
-    block_row_start: DisplayRow,
-    height: u32,
-    first_excerpt: &ExcerptInfo,
-    latest_selection_anchors: &HashMap<BufferId, Anchor>,
-) -> JumpData {
-    let jump_target = if let Some(anchor) = latest_selection_anchors.get(&first_excerpt.buffer_id)
-        && let Some(range) = editor_snapshot.context_range_for_excerpt(anchor.excerpt_id)
-        && let Some(buffer) = editor_snapshot
-            .buffer_snapshot()
-            .buffer_for_excerpt(anchor.excerpt_id)
-    {
-        JumpTargetInExcerptInput {
-            id: anchor.excerpt_id,
-            buffer,
-            excerpt_start_anchor: range.start,
-            jump_anchor: anchor.text_anchor,
-        }
-    } else {
-        JumpTargetInExcerptInput {
-            id: first_excerpt.id,
-            buffer: &first_excerpt.buffer,
-            excerpt_start_anchor: first_excerpt.range.context.start,
-            jump_anchor: first_excerpt.range.primary.start,
-        }
-    };
-    header_jump_data_inner(editor_snapshot, block_row_start, height, &jump_target)
-}
-
-struct JumpTargetInExcerptInput<'a> {
-    id: ExcerptId,
-    buffer: &'a language::BufferSnapshot,
-    excerpt_start_anchor: text::Anchor,
-    jump_anchor: text::Anchor,
-}
-
-fn header_jump_data_inner(
-    snapshot: &EditorSnapshot,
-    block_row_start: DisplayRow,
-    height: u32,
-    for_excerpt: &JumpTargetInExcerptInput,
-) -> JumpData {
-    let buffer = &for_excerpt.buffer;
-    let jump_position = language::ToPoint::to_point(&for_excerpt.jump_anchor, buffer);
-    let excerpt_start = for_excerpt.excerpt_start_anchor;
-    let rows_from_excerpt_start = if for_excerpt.jump_anchor == excerpt_start {
-        0
-    } else {
-        let excerpt_start_point = language::ToPoint::to_point(&excerpt_start, buffer);
-        jump_position.row.saturating_sub(excerpt_start_point.row)
-    };
-
-    let line_offset_from_top = (block_row_start.0 + height + rows_from_excerpt_start)
-        .saturating_sub(
-            snapshot
-                .scroll_anchor
-                .scroll_position(&snapshot.display_snapshot)
-                .y as u32,
-        );
-
-    JumpData::MultiBufferPoint {
-        excerpt_id: for_excerpt.id,
-        anchor: for_excerpt.jump_anchor,
-        position: jump_position,
-        line_offset_from_top,
-    }
-}
-
-pub struct AcceptEditPredictionBinding(pub(crate) Option<gpui::KeyBinding>);
-
-impl AcceptEditPredictionBinding {
-    pub fn keystroke(&self) -> Option<&KeybindingKeystroke> {
-        if let Some(binding) = self.0.as_ref() {
-            match &binding.keystrokes() {
-                [keystroke, ..] => Some(keystroke),
-                _ => None,
-            }
-        } else {
-            None
-        }
-    }
-}
-
-fn prepaint_gutter_button(
-    button: IconButton,
-    row: DisplayRow,
-    line_height: Pixels,
-    gutter_dimensions: &GutterDimensions,
-    scroll_position: gpui::Point<ScrollOffset>,
-    gutter_hitbox: &Hitbox,
-    display_hunks: &[(DisplayDiffHunk, Option<Hitbox>)],
-    window: &mut Window,
-    cx: &mut App,
-) -> AnyElement {
-    let mut button = button.into_any_element();
-
-    let available_space = size(
-        AvailableSpace::MinContent,
-        AvailableSpace::Definite(line_height),
-    );
-    let indicator_size = button.layout_as_root(available_space, window, cx);
-
-    let blame_width = gutter_dimensions.git_blame_entries_width;
-    let gutter_width = display_hunks
-        .binary_search_by(|(hunk, _)| match hunk {
-            DisplayDiffHunk::Folded { display_row } => display_row.cmp(&row),
-            DisplayDiffHunk::Unfolded {
-                display_row_range, ..
-            } => {
-                if display_row_range.end <= row {
-                    Ordering::Less
-                } else if display_row_range.start > row {
-                    Ordering::Greater
-                } else {
-                    Ordering::Equal
-                }
-            }
-        })
-        .ok()
-        .and_then(|ix| Some(display_hunks[ix].1.as_ref()?.size.width));
-    let left_offset = blame_width.max(gutter_width).unwrap_or_default();
-
-    let mut x = left_offset;
-    let available_width = gutter_dimensions.margin + gutter_dimensions.left_padding
-        - indicator_size.width
-        - left_offset;
-    x += available_width / 2.;
-
-    let mut y =
-        Pixels::from((row.as_f64() - scroll_position.y) * ScrollPixelOffset::from(line_height));
-    y += (line_height - indicator_size.height) / 2.;
-
-    button.prepaint_as_root(
-        gutter_hitbox.origin + point(x, y),
-        available_space,
-        window,
-        cx,
-    );
-    button
-}
-
-fn render_inline_blame_entry(
-    blame_entry: BlameEntry,
-    style: &EditorStyle,
-    cx: &mut App,
-) -> Option<AnyElement> {
-    let renderer = cx.global::<GlobalBlameRenderer>().0.clone();
-    renderer.render_inline_blame_entry(&style.text, blame_entry, cx)
-}
-
-fn render_blame_entry_popover(
-    blame_entry: BlameEntry,
-    scroll_handle: ScrollHandle,
-    commit_message: Option<ParsedCommitMessage>,
-    markdown: Entity<Markdown>,
-    workspace: WeakEntity<Workspace>,
-    blame: &Entity<GitBlame>,
-    buffer: BufferId,
-    window: &mut Window,
-    cx: &mut App,
-) -> Option<AnyElement> {
-    let renderer = cx.global::<GlobalBlameRenderer>().0.clone();
-    let blame = blame.read(cx);
-    let repository = blame.repository(cx, buffer)?;
-    renderer.render_blame_entry_popover(
-        blame_entry,
-        scroll_handle,
-        commit_message,
-        markdown,
-        repository,
-        workspace,
-        window,
-        cx,
-    )
-}
-
-fn render_blame_entry(
-    ix: usize,
-    blame: &Entity<GitBlame>,
-    blame_entry: BlameEntry,
-    style: &EditorStyle,
-    last_used_color: &mut Option<(Hsla, Oid)>,
-    editor: Entity<Editor>,
-    workspace: Entity<Workspace>,
-    buffer: BufferId,
-    renderer: &dyn BlameRenderer,
-    window: &mut Window,
-    cx: &mut App,
-) -> Option<AnyElement> {
-    let index: u32 = blame_entry.sha.into();
-    let mut sha_color = cx.theme().players().color_for_participant(index).cursor;
-
-    // If the last color we used is the same as the one we get for this line, but
-    // the commit SHAs are different, then we try again to get a different color.
-    if let Some((color, sha)) = *last_used_color
-        && sha != blame_entry.sha
-        && color == sha_color
-    {
-        sha_color = cx.theme().players().color_for_participant(index + 1).cursor;
-    }
-    last_used_color.replace((sha_color, blame_entry.sha));
-
-    let blame = blame.read(cx);
-    let details = blame.details_for_entry(buffer, &blame_entry);
-    let repository = blame.repository(cx, buffer)?;
-    renderer.render_blame_entry(
-        &style.text,
-        blame_entry,
-        details,
-        repository,
-        workspace.downgrade(),
-        editor,
-        ix,
-        sha_color,
-        window,
-        cx,
-    )
-}
-
-#[derive(Debug)]
-pub(crate) struct LineWithInvisibles {
-    fragments: SmallVec<[LineFragment; 1]>,
-    invisibles: Vec<Invisible>,
-    len: usize,
-    pub(crate) width: Pixels,
-    font_size: Pixels,
-}
-
-enum LineFragment {
-    Text(ShapedLine),
-    Element {
-        id: ChunkRendererId,
-        element: Option<AnyElement>,
-        size: Size<Pixels>,
-        len: usize,
-    },
-}
-
-impl fmt::Debug for LineFragment {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        match self {
-            LineFragment::Text(shaped_line) => f.debug_tuple("Text").field(shaped_line).finish(),
-            LineFragment::Element { size, len, .. } => f
-                .debug_struct("Element")
-                .field("size", size)
-                .field("len", len)
-                .finish(),
-        }
-    }
-}
-
-impl LineWithInvisibles {
-    fn from_chunks<'a>(
-        chunks: impl Iterator<Item = HighlightedChunk<'a>>,
-        editor_style: &EditorStyle,
-        max_line_len: usize,
-        max_line_count: usize,
-        editor_mode: &EditorMode,
-        text_width: Pixels,
-        is_row_soft_wrapped: impl Copy + Fn(usize) -> bool,
-        bg_segments_per_row: &[Vec<(Range<DisplayPoint>, Hsla)>],
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Vec<Self> {
-        let text_style = &editor_style.text;
-        let mut layouts = Vec::with_capacity(max_line_count);
-        let mut fragments: SmallVec<[LineFragment; 1]> = SmallVec::new();
-        let mut line = String::new();
-        let mut invisibles = Vec::new();
-        let mut width = Pixels::ZERO;
-        let mut len = 0;
-        let mut styles = Vec::new();
-        let mut non_whitespace_added = false;
-        let mut row = 0;
-        let mut line_exceeded_max_len = false;
-        let font_size = text_style.font_size.to_pixels(window.rem_size());
-        let min_contrast = EditorSettings::get_global(cx).minimum_contrast_for_highlights;
-
-        let ellipsis = SharedString::from("⋯");
-
-        for highlighted_chunk in chunks.chain([HighlightedChunk {
-            text: "\n",
-            style: None,
-            is_tab: false,
-            is_inlay: false,
-            replacement: None,
-        }]) {
-            if let Some(replacement) = highlighted_chunk.replacement {
-                if !line.is_empty() {
-                    let segments = bg_segments_per_row.get(row).map(|v| &v[..]).unwrap_or(&[]);
-                    let text_runs: &[TextRun] = if segments.is_empty() {
-                        &styles
-                    } else {
-                        &Self::split_runs_by_bg_segments(&styles, segments, min_contrast, len)
-                    };
-                    let shaped_line = window.text_system().shape_line(
-                        line.clone().into(),
-                        font_size,
-                        text_runs,
-                        None,
-                    );
-                    width += shaped_line.width;
-                    len += shaped_line.len;
-                    fragments.push(LineFragment::Text(shaped_line));
-                    line.clear();
-                    styles.clear();
-                }
-
-                match replacement {
-                    ChunkReplacement::Renderer(renderer) => {
-                        let available_width = if renderer.constrain_width {
-                            let chunk = if highlighted_chunk.text == ellipsis.as_ref() {
-                                ellipsis.clone()
-                            } else {
-                                SharedString::from(Arc::from(highlighted_chunk.text))
-                            };
-                            let shaped_line = window.text_system().shape_line(
-                                chunk,
-                                font_size,
-                                &[text_style.to_run(highlighted_chunk.text.len())],
-                                None,
-                            );
-                            AvailableSpace::Definite(shaped_line.width)
-                        } else {
-                            AvailableSpace::MinContent
-                        };
-
-                        let mut element = (renderer.render)(&mut ChunkRendererContext {
-                            context: cx,
-                            window,
-                            max_width: text_width,
-                        });
-                        let line_height = text_style.line_height_in_pixels(window.rem_size());
-                        let size = element.layout_as_root(
-                            size(available_width, AvailableSpace::Definite(line_height)),
-                            window,
-                            cx,
-                        );
-
-                        width += size.width;
-                        len += highlighted_chunk.text.len();
-                        fragments.push(LineFragment::Element {
-                            id: renderer.id,
-                            element: Some(element),
-                            size,
-                            len: highlighted_chunk.text.len(),
-                        });
-                    }
-                    ChunkReplacement::Str(x) => {
-                        let text_style = if let Some(style) = highlighted_chunk.style {
-                            Cow::Owned(text_style.clone().highlight(style))
-                        } else {
-                            Cow::Borrowed(text_style)
-                        };
-
-                        let run = TextRun {
-                            len: x.len(),
-                            font: text_style.font(),
-                            color: text_style.color,
-                            background_color: text_style.background_color,
-                            underline: text_style.underline,
-                            strikethrough: text_style.strikethrough,
-                        };
-                        let line_layout = window
-                            .text_system()
-                            .shape_line(x, font_size, &[run], None)
-                            .with_len(highlighted_chunk.text.len());
-
-                        width += line_layout.width;
-                        len += highlighted_chunk.text.len();
-                        fragments.push(LineFragment::Text(line_layout))
-                    }
-                }
-            } else {
-                for (ix, mut line_chunk) in highlighted_chunk.text.split('\n').enumerate() {
-                    if ix > 0 {
-                        let segments = bg_segments_per_row.get(row).map(|v| &v[..]).unwrap_or(&[]);
-                        let text_runs = if segments.is_empty() {
-                            &styles
-                        } else {
-                            &Self::split_runs_by_bg_segments(&styles, segments, min_contrast, len)
-                        };
-                        let shaped_line = window.text_system().shape_line(
-                            line.clone().into(),
-                            font_size,
-                            text_runs,
-                            None,
-                        );
-                        width += shaped_line.width;
-                        len += shaped_line.len;
-                        fragments.push(LineFragment::Text(shaped_line));
-                        layouts.push(Self {
-                            width: mem::take(&mut width),
-                            len: mem::take(&mut len),
-                            fragments: mem::take(&mut fragments),
-                            invisibles: std::mem::take(&mut invisibles),
-                            font_size,
-                        });
-
-                        line.clear();
-                        styles.clear();
-                        row += 1;
-                        line_exceeded_max_len = false;
-                        non_whitespace_added = false;
-                        if row == max_line_count {
-                            return layouts;
-                        }
-                    }
-
-                    if !line_chunk.is_empty() && !line_exceeded_max_len {
-                        let text_style = if let Some(style) = highlighted_chunk.style {
-                            Cow::Owned(text_style.clone().highlight(style))
-                        } else {
-                            Cow::Borrowed(text_style)
-                        };
-
-                        if line.len() + line_chunk.len() > max_line_len {
-                            let mut chunk_len = max_line_len - line.len();
-                            while !line_chunk.is_char_boundary(chunk_len) {
-                                chunk_len -= 1;
-                            }
-                            line_chunk = &line_chunk[..chunk_len];
-                            line_exceeded_max_len = true;
-                        }
-
-                        styles.push(TextRun {
-                            len: line_chunk.len(),
-                            font: text_style.font(),
-                            color: text_style.color,
-                            background_color: text_style.background_color,
-                            underline: text_style.underline,
-                            strikethrough: text_style.strikethrough,
-                        });
-
-                        if editor_mode.is_full() && !highlighted_chunk.is_inlay {
-                            // Line wrap pads its contents with fake whitespaces,
-                            // avoid printing them
-                            let is_soft_wrapped = is_row_soft_wrapped(row);
-                            if highlighted_chunk.is_tab {
-                                if non_whitespace_added || !is_soft_wrapped {
-                                    invisibles.push(Invisible::Tab {
-                                        line_start_offset: line.len(),
-                                        line_end_offset: line.len() + line_chunk.len(),
-                                    });
-                                }
-                            } else {
-                                invisibles.extend(line_chunk.char_indices().filter_map(
-                                    |(index, c)| {
-                                        let is_whitespace = c.is_whitespace();
-                                        non_whitespace_added |= !is_whitespace;
-                                        if is_whitespace
-                                            && (non_whitespace_added || !is_soft_wrapped)
-                                        {
-                                            Some(Invisible::Whitespace {
-                                                line_offset: line.len() + index,
-                                            })
-                                        } else {
-                                            None
-                                        }
-                                    },
-                                ))
-                            }
-                        }
-
-                        line.push_str(line_chunk);
-                    }
-                }
-            }
-        }
-
-        layouts
-    }
-
-    /// Takes text runs and non-overlapping left-to-right background ranges with color.
-    /// Returns new text runs with adjusted contrast as per background ranges.
-    fn split_runs_by_bg_segments(
-        text_runs: &[TextRun],
-        bg_segments: &[(Range<DisplayPoint>, Hsla)],
-        min_contrast: f32,
-        start_col_offset: usize,
-    ) -> Vec<TextRun> {
-        let mut output_runs: Vec<TextRun> = Vec::with_capacity(text_runs.len());
-        let mut line_col = start_col_offset;
-        let mut segment_ix = 0usize;
-
-        for text_run in text_runs.iter() {
-            let run_start_col = line_col;
-            let run_end_col = run_start_col + text_run.len;
-            while segment_ix < bg_segments.len()
-                && (bg_segments[segment_ix].0.end.column() as usize) <= run_start_col
-            {
-                segment_ix += 1;
-            }
-            let mut cursor_col = run_start_col;
-            let mut local_segment_ix = segment_ix;
-            while local_segment_ix < bg_segments.len() {
-                let (range, segment_color) = &bg_segments[local_segment_ix];
-                let segment_start_col = range.start.column() as usize;
-                let segment_end_col = range.end.column() as usize;
-                if segment_start_col >= run_end_col {
-                    break;
-                }
-                if segment_start_col > cursor_col {
-                    let span_len = segment_start_col - cursor_col;
-                    output_runs.push(TextRun {
-                        len: span_len,
-                        font: text_run.font.clone(),
-                        color: text_run.color,
-                        background_color: text_run.background_color,
-                        underline: text_run.underline,
-                        strikethrough: text_run.strikethrough,
-                    });
-                    cursor_col = segment_start_col;
-                }
-                let segment_slice_end_col = segment_end_col.min(run_end_col);
-                if segment_slice_end_col > cursor_col {
-                    let new_text_color =
-                        ensure_minimum_contrast(text_run.color, *segment_color, min_contrast);
-                    output_runs.push(TextRun {
-                        len: segment_slice_end_col - cursor_col,
-                        font: text_run.font.clone(),
-                        color: new_text_color,
-                        background_color: text_run.background_color,
-                        underline: text_run.underline,
-                        strikethrough: text_run.strikethrough,
-                    });
-                    cursor_col = segment_slice_end_col;
-                }
-                if segment_end_col >= run_end_col {
-                    break;
-                }
-                local_segment_ix += 1;
-            }
-            if cursor_col < run_end_col {
-                output_runs.push(TextRun {
-                    len: run_end_col - cursor_col,
-                    font: text_run.font.clone(),
-                    color: text_run.color,
-                    background_color: text_run.background_color,
-                    underline: text_run.underline,
-                    strikethrough: text_run.strikethrough,
-                });
-            }
-            line_col = run_end_col;
-            segment_ix = local_segment_ix;
-        }
-        output_runs
-    }
-
-    fn prepaint(
-        &mut self,
-        line_height: Pixels,
-        scroll_position: gpui::Point<ScrollOffset>,
-        scroll_pixel_position: gpui::Point<ScrollPixelOffset>,
-        row: DisplayRow,
-        content_origin: gpui::Point<Pixels>,
-        line_elements: &mut SmallVec<[AnyElement; 1]>,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        let line_y = f32::from(line_height) * Pixels::from(row.as_f64() - scroll_position.y);
-        self.prepaint_with_custom_offset(
-            line_height,
-            scroll_pixel_position,
-            content_origin,
-            line_y,
-            line_elements,
-            window,
-            cx,
-        );
-    }
-
-    fn prepaint_with_custom_offset(
-        &mut self,
-        line_height: Pixels,
-        scroll_pixel_position: gpui::Point<ScrollPixelOffset>,
-        content_origin: gpui::Point<Pixels>,
-        line_y: Pixels,
-        line_elements: &mut SmallVec<[AnyElement; 1]>,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        let mut fragment_origin =
-            content_origin + gpui::point(Pixels::from(-scroll_pixel_position.x), line_y);
-        for fragment in &mut self.fragments {
-            match fragment {
-                LineFragment::Text(line) => {
-                    fragment_origin.x += line.width;
-                }
-                LineFragment::Element { element, size, .. } => {
-                    let mut element = element
-                        .take()
-                        .expect("you can't prepaint LineWithInvisibles twice");
-
-                    // Center the element vertically within the line.
-                    let mut element_origin = fragment_origin;
-                    element_origin.y += (line_height - size.height) / 2.;
-                    element.prepaint_at(element_origin, window, cx);
-                    line_elements.push(element);
-
-                    fragment_origin.x += size.width;
-                }
-            }
-        }
-    }
-
-    fn draw(
-        &self,
-        layout: &EditorLayout,
-        row: DisplayRow,
-        content_origin: gpui::Point<Pixels>,
-        whitespace_setting: ShowWhitespaceSetting,
-        selection_ranges: &[Range<DisplayPoint>],
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        self.draw_with_custom_offset(
-            layout,
-            row,
-            content_origin,
-            layout.position_map.line_height
-                * (row.as_f64() - layout.position_map.scroll_position.y) as f32,
-            whitespace_setting,
-            selection_ranges,
-            window,
-            cx,
-        );
-    }
-
-    fn draw_with_custom_offset(
-        &self,
-        layout: &EditorLayout,
-        row: DisplayRow,
-        content_origin: gpui::Point<Pixels>,
-        line_y: Pixels,
-        whitespace_setting: ShowWhitespaceSetting,
-        selection_ranges: &[Range<DisplayPoint>],
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        let line_height = layout.position_map.line_height;
-        let mut fragment_origin = content_origin
-            + gpui::point(
-                Pixels::from(-layout.position_map.scroll_pixel_position.x),
-                line_y,
-            );
-
-        for fragment in &self.fragments {
-            match fragment {
-                LineFragment::Text(line) => {
-                    line.paint(fragment_origin, line_height, window, cx)
-                        .log_err();
-                    fragment_origin.x += line.width;
-                }
-                LineFragment::Element { size, .. } => {
-                    fragment_origin.x += size.width;
-                }
-            }
-        }
-
-        self.draw_invisibles(
-            selection_ranges,
-            layout,
-            content_origin,
-            line_y,
-            row,
-            line_height,
-            whitespace_setting,
-            window,
-            cx,
-        );
-    }
-
-    fn draw_background(
-        &self,
-        layout: &EditorLayout,
-        row: DisplayRow,
-        content_origin: gpui::Point<Pixels>,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        let line_height = layout.position_map.line_height;
-        let line_y = line_height * (row.as_f64() - layout.position_map.scroll_position.y) as f32;
-
-        let mut fragment_origin = content_origin
-            + gpui::point(
-                Pixels::from(-layout.position_map.scroll_pixel_position.x),
-                line_y,
-            );
-
-        for fragment in &self.fragments {
-            match fragment {
-                LineFragment::Text(line) => {
-                    line.paint_background(fragment_origin, line_height, window, cx)
-                        .log_err();
-                    fragment_origin.x += line.width;
-                }
-                LineFragment::Element { size, .. } => {
-                    fragment_origin.x += size.width;
-                }
-            }
-        }
-    }
-
-    fn draw_invisibles(
-        &self,
-        selection_ranges: &[Range<DisplayPoint>],
-        layout: &EditorLayout,
-        content_origin: gpui::Point<Pixels>,
-        line_y: Pixels,
-        row: DisplayRow,
-        line_height: Pixels,
-        whitespace_setting: ShowWhitespaceSetting,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        let extract_whitespace_info = |invisible: &Invisible| {
-            let (token_offset, token_end_offset, invisible_symbol) = match invisible {
-                Invisible::Tab {
-                    line_start_offset,
-                    line_end_offset,
-                } => (*line_start_offset, *line_end_offset, &layout.tab_invisible),
-                Invisible::Whitespace { line_offset } => {
-                    (*line_offset, line_offset + 1, &layout.space_invisible)
-                }
-            };
-
-            let x_offset: ScrollPixelOffset = self.x_for_index(token_offset).into();
-            let invisible_offset: ScrollPixelOffset =
-                ((layout.position_map.em_width - invisible_symbol.width).max(Pixels::ZERO) / 2.0)
-                    .into();
-            let origin = content_origin
-                + gpui::point(
-                    Pixels::from(
-                        x_offset + invisible_offset - layout.position_map.scroll_pixel_position.x,
-                    ),
-                    line_y,
-                );
-
-            (
-                [token_offset, token_end_offset],
-                Box::new(move |window: &mut Window, cx: &mut App| {
-                    invisible_symbol
-                        .paint(origin, line_height, window, cx)
-                        .log_err();
-                }),
-            )
-        };
-
-        let invisible_iter = self.invisibles.iter().map(extract_whitespace_info);
-        match whitespace_setting {
-            ShowWhitespaceSetting::None => (),
-            ShowWhitespaceSetting::All => invisible_iter.for_each(|(_, paint)| paint(window, cx)),
-            ShowWhitespaceSetting::Selection => invisible_iter.for_each(|([start, _], paint)| {
-                let invisible_point = DisplayPoint::new(row, start as u32);
-                if !selection_ranges
-                    .iter()
-                    .any(|region| region.start <= invisible_point && invisible_point < region.end)
-                {
-                    return;
-                }
-
-                paint(window, cx);
-            }),
-
-            ShowWhitespaceSetting::Trailing => {
-                let mut previous_start = self.len;
-                for ([start, end], paint) in invisible_iter.rev() {
-                    if previous_start != end {
-                        break;
-                    }
-                    previous_start = start;
-                    paint(window, cx);
-                }
-            }
-
-            // For a whitespace to be on a boundary, any of the following conditions need to be met:
-            // - It is a tab
-            // - It is adjacent to an edge (start or end)
-            // - It is adjacent to a whitespace (left or right)
-            ShowWhitespaceSetting::Boundary => {
-                // We'll need to keep track of the last invisible we've seen and then check if we are adjacent to it for some of
-                // the above cases.
-                // Note: We zip in the original `invisibles` to check for tab equality
-                let mut last_seen: Option<(bool, usize, Box<dyn Fn(&mut Window, &mut App)>)> = None;
-                for (([start, end], paint), invisible) in
-                    invisible_iter.zip_eq(self.invisibles.iter())
-                {
-                    let should_render = match (&last_seen, invisible) {
-                        (_, Invisible::Tab { .. }) => true,
-                        (Some((_, last_end, _)), _) => *last_end == start,
-                        _ => false,
-                    };
-
-                    if should_render || start == 0 || end == self.len {
-                        paint(window, cx);
-
-                        // Since we are scanning from the left, we will skip over the first available whitespace that is part
-                        // of a boundary between non-whitespace segments, so we correct by manually redrawing it if needed.
-                        if let Some((should_render_last, last_end, paint_last)) = last_seen {
-                            // Note that we need to make sure that the last one is actually adjacent
-                            if !should_render_last && last_end == start {
-                                paint_last(window, cx);
-                            }
-                        }
-                    }
-
-                    // Manually render anything within a selection
-                    let invisible_point = DisplayPoint::new(row, start as u32);
-                    if selection_ranges.iter().any(|region| {
-                        region.start <= invisible_point && invisible_point < region.end
-                    }) {
-                        paint(window, cx);
-                    }
-
-                    last_seen = Some((should_render, end, paint));
-                }
-            }
-        }
-    }
-
-    pub fn x_for_index(&self, index: usize) -> Pixels {
-        let mut fragment_start_x = Pixels::ZERO;
-        let mut fragment_start_index = 0;
-
-        for fragment in &self.fragments {
-            match fragment {
-                LineFragment::Text(shaped_line) => {
-                    let fragment_end_index = fragment_start_index + shaped_line.len;
-                    if index < fragment_end_index {
-                        return fragment_start_x
-                            + shaped_line.x_for_index(index - fragment_start_index);
-                    }
-                    fragment_start_x += shaped_line.width;
-                    fragment_start_index = fragment_end_index;
-                }
-                LineFragment::Element { len, size, .. } => {
-                    let fragment_end_index = fragment_start_index + len;
-                    if index < fragment_end_index {
-                        return fragment_start_x;
-                    }
-                    fragment_start_x += size.width;
-                    fragment_start_index = fragment_end_index;
-                }
-            }
-        }
-
-        fragment_start_x
-    }
-
-    pub fn index_for_x(&self, x: Pixels) -> Option<usize> {
-        let mut fragment_start_x = Pixels::ZERO;
-        let mut fragment_start_index = 0;
-
-        for fragment in &self.fragments {
-            match fragment {
-                LineFragment::Text(shaped_line) => {
-                    let fragment_end_x = fragment_start_x + shaped_line.width;
-                    if x < fragment_end_x {
-                        return Some(
-                            fragment_start_index + shaped_line.index_for_x(x - fragment_start_x)?,
-                        );
-                    }
-                    fragment_start_x = fragment_end_x;
-                    fragment_start_index += shaped_line.len;
-                }
-                LineFragment::Element { len, size, .. } => {
-                    let fragment_end_x = fragment_start_x + size.width;
-                    if x < fragment_end_x {
-                        return Some(fragment_start_index);
-                    }
-                    fragment_start_index += len;
-                    fragment_start_x = fragment_end_x;
-                }
-            }
-        }
-
-        None
-    }
-
-    pub fn font_id_for_index(&self, index: usize) -> Option<FontId> {
-        let mut fragment_start_index = 0;
-
-        for fragment in &self.fragments {
-            match fragment {
-                LineFragment::Text(shaped_line) => {
-                    let fragment_end_index = fragment_start_index + shaped_line.len;
-                    if index < fragment_end_index {
-                        return shaped_line.font_id_for_index(index - fragment_start_index);
-                    }
-                    fragment_start_index = fragment_end_index;
-                }
-                LineFragment::Element { len, .. } => {
-                    let fragment_end_index = fragment_start_index + len;
-                    if index < fragment_end_index {
-                        return None;
-                    }
-                    fragment_start_index = fragment_end_index;
-                }
-            }
-        }
-
-        None
-    }
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-enum Invisible {
-    /// A tab character
-    ///
-    /// A tab character is internally represented by spaces (configured by the user's tab width)
-    /// aligned to the nearest column, so it's necessary to store the start and end offset for
-    /// adjacency checks.
-    Tab {
-        line_start_offset: usize,
-        line_end_offset: usize,
-    },
-    Whitespace {
-        line_offset: usize,
-    },
-}
-
-impl EditorElement {
-    /// Returns the rem size to use when rendering the [`EditorElement`].
-    ///
-    /// This allows UI elements to scale based on the `buffer_font_size`.
-    fn rem_size(&self, cx: &mut App) -> Option<Pixels> {
-        match self.editor.read(cx).mode {
-            EditorMode::Full {
-                scale_ui_elements_with_buffer_font_size: true,
-                ..
-            }
-            | EditorMode::Minimap { .. } => {
-                let buffer_font_size = self.style.text.font_size;
-                match buffer_font_size {
-                    AbsoluteLength::Pixels(pixels) => {
-                        let rem_size_scale = {
-                            // Our default UI font size is 14px on a 16px base scale.
-                            // This means the default UI font size is 0.875rems.
-                            let default_font_size_scale = 14. / ui::BASE_REM_SIZE_IN_PX;
-
-                            // We then determine the delta between a single rem and the default font
-                            // size scale.
-                            let default_font_size_delta = 1. - default_font_size_scale;
-
-                            // Finally, we add this delta to 1rem to get the scale factor that
-                            // should be used to scale up the UI.
-                            1. + default_font_size_delta
-                        };
-
-                        Some(pixels * rem_size_scale)
-                    }
-                    AbsoluteLength::Rems(rems) => {
-                        Some(rems.to_pixels(ui::BASE_REM_SIZE_IN_PX.into()))
-                    }
-                }
-            }
-            // We currently use single-line and auto-height editors in UI contexts,
-            // so we don't want to scale everything with the buffer font size, as it
-            // ends up looking off.
-            _ => None,
-        }
-    }
-
-    fn editor_with_selections(&self, cx: &App) -> Option<Entity<Editor>> {
-        if let EditorMode::Minimap { parent } = self.editor.read(cx).mode() {
-            parent.upgrade()
-        } else {
-            Some(self.editor.clone())
-        }
-    }
-}
-
-#[derive(Default)]
-pub struct EditorRequestLayoutState {
-    // We use prepaint depth to limit the number of times prepaint is
-    // called recursively. We need this so that we can update stale
-    // data for e.g. block heights in block map.
-    prepaint_depth: Rc<Cell<usize>>,
-}
-
-impl EditorRequestLayoutState {
-    // In ideal conditions we only need one more subsequent prepaint call for resize to take effect.
-    // i.e. MAX_PREPAINT_DEPTH = 2, but since moving blocks inline (place_near), more lines from
-    // below get exposed, and we end up querying blocks for those lines too in subsequent renders.
-    // Setting MAX_PREPAINT_DEPTH = 3, passes all tests. Just to be on the safe side we set it to 5, so
-    // that subsequent shrinking does not lead to incorrect block placing.
-    const MAX_PREPAINT_DEPTH: usize = 5;
-
-    fn increment_prepaint_depth(&self) -> EditorPrepaintGuard {
-        let depth = self.prepaint_depth.get();
-        self.prepaint_depth.set(depth + 1);
-        EditorPrepaintGuard {
-            prepaint_depth: self.prepaint_depth.clone(),
-        }
-    }
-
-    fn can_prepaint(&self) -> bool {
-        self.prepaint_depth.get() < Self::MAX_PREPAINT_DEPTH
-    }
-}
-
-struct EditorPrepaintGuard {
-    prepaint_depth: Rc<Cell<usize>>,
-}
-
-impl Drop for EditorPrepaintGuard {
-    fn drop(&mut self) {
-        let depth = self.prepaint_depth.get();
-        self.prepaint_depth.set(depth.saturating_sub(1));
-    }
-}
-
-impl Element for EditorElement {
-    type RequestLayoutState = EditorRequestLayoutState;
-    type PrepaintState = EditorLayout;
-
-    fn id(&self) -> Option<ElementId> {
-        None
-    }
-
-    fn source_location(&self) -> Option<&'static core::panic::Location<'static>> {
-        None
-    }
-
-    fn request_layout(
-        &mut self,
-        _: Option<&GlobalElementId>,
-        _inspector_id: Option<&gpui::InspectorElementId>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> (gpui::LayoutId, Self::RequestLayoutState) {
-        let rem_size = self.rem_size(cx);
-        window.with_rem_size(rem_size, |window| {
-            self.editor.update(cx, |editor, cx| {
-                editor.set_style(self.style.clone(), window, cx);
-
-                let layout_id = match editor.mode {
-                    EditorMode::SingleLine => {
-                        let rem_size = window.rem_size();
-                        let height = self.style.text.line_height_in_pixels(rem_size);
-                        let mut style = Style::default();
-                        style.size.height = height.into();
-                        style.size.width = relative(1.).into();
-                        window.request_layout(style, None, cx)
-                    }
-                    EditorMode::AutoHeight {
-                        min_lines,
-                        max_lines,
-                    } => {
-                        let editor_handle = cx.entity();
-                        window.request_measured_layout(
-                            Style::default(),
-                            move |known_dimensions, available_space, window, cx| {
-                                editor_handle
-                                    .update(cx, |editor, cx| {
-                                        compute_auto_height_layout(
-                                            editor,
-                                            min_lines,
-                                            max_lines,
-                                            known_dimensions,
-                                            available_space.width,
-                                            window,
-                                            cx,
-                                        )
-                                    })
-                                    .unwrap_or_default()
-                            },
-                        )
-                    }
-                    EditorMode::Minimap { .. } => {
-                        let mut style = Style::default();
-                        style.size.width = relative(1.).into();
-                        style.size.height = relative(1.).into();
-                        window.request_layout(style, None, cx)
-                    }
-                    EditorMode::Full {
-                        sizing_behavior, ..
-                    } => {
-                        let mut style = Style::default();
-                        style.size.width = relative(1.).into();
-                        if sizing_behavior == SizingBehavior::SizeByContent {
-                            let snapshot = editor.snapshot(window, cx);
-                            let line_height =
-                                self.style.text.line_height_in_pixels(window.rem_size());
-                            let scroll_height =
-                                (snapshot.max_point().row().next_row().0 as f32) * line_height;
-                            style.size.height = scroll_height.into();
-                        } else {
-                            style.size.height = relative(1.).into();
-                        }
-                        window.request_layout(style, None, cx)
-                    }
-                };
-
-                (layout_id, EditorRequestLayoutState::default())
-            })
-        })
-    }
-
-    fn prepaint(
-        &mut self,
-        _: Option<&GlobalElementId>,
-        _inspector_id: Option<&gpui::InspectorElementId>,
-        bounds: Bounds<Pixels>,
-        request_layout: &mut Self::RequestLayoutState,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Self::PrepaintState {
-        let _prepaint_depth_guard = request_layout.increment_prepaint_depth();
-        let text_style = TextStyleRefinement {
-            font_size: Some(self.style.text.font_size),
-            line_height: Some(self.style.text.line_height),
-            ..Default::default()
-        };
-
-        let is_minimap = self.editor.read(cx).mode.is_minimap();
-        let is_singleton = self.editor.read(cx).buffer_kind(cx) == ItemBufferKind::Singleton;
-
-        if !is_minimap {
-            let focus_handle = self.editor.focus_handle(cx);
-            window.set_view_id(self.editor.entity_id());
-            window.set_focus_handle(&focus_handle, cx);
-        }
-
-        let rem_size = self.rem_size(cx);
-        window.with_rem_size(rem_size, |window| {
-            window.with_text_style(Some(text_style), |window| {
-                window.with_content_mask(Some(ContentMask { bounds }), |window| {
-                    let (mut snapshot, is_read_only) = self.editor.update(cx, |editor, cx| {
-                        (editor.snapshot(window, cx), editor.read_only(cx))
-                    });
-                    let style = &self.style;
-
-                    let rem_size = window.rem_size();
-                    let font_id = window.text_system().resolve_font(&style.text.font());
-                    let font_size = style.text.font_size.to_pixels(rem_size);
-                    let line_height = style.text.line_height_in_pixels(rem_size);
-                    let em_width = window.text_system().em_width(font_id, font_size).unwrap();
-                    let em_advance = window.text_system().em_advance(font_id, font_size).unwrap();
-                    let glyph_grid_cell = size(em_advance, line_height);
-
-                    let gutter_dimensions = snapshot
-                        .gutter_dimensions(
-                            font_id,
-                            font_size,
-                            style,
-                            window,
-                            cx,
-                        );
-                    let text_width = bounds.size.width - gutter_dimensions.width;
-
-                    let settings = EditorSettings::get_global(cx);
-                    let scrollbars_shown = settings.scrollbar.show != ShowScrollbar::Never;
-                    let vertical_scrollbar_width = (scrollbars_shown
-                        && settings.scrollbar.axes.vertical
-                        && self.editor.read(cx).show_scrollbars.vertical)
-                        .then_some(style.scrollbar_width)
-                        .unwrap_or_default();
-                    let minimap_width = self
-                        .get_minimap_width(
-                            &settings.minimap,
-                            scrollbars_shown,
-                            text_width,
-                            em_width,
-                            font_size,
-                            rem_size,
-                            cx,
-                        )
-                        .unwrap_or_default();
-
-                    let right_margin = minimap_width + vertical_scrollbar_width;
-
-                    let editor_width =
-                        text_width - gutter_dimensions.margin - 2 * em_width - right_margin;
-                    let editor_margins = EditorMargins {
-                        gutter: gutter_dimensions,
-                        right: right_margin,
-                    };
-
-                    snapshot = self.editor.update(cx, |editor, cx| {
-                        editor.last_bounds = Some(bounds);
-                        editor.gutter_dimensions = gutter_dimensions;
-                        editor.set_visible_line_count(
-                            (bounds.size.height / line_height) as f64,
-                            window,
-                            cx,
-                        );
-                        editor.set_visible_column_count(f64::from(editor_width / em_advance));
-
-                        if matches!(
-                            editor.mode,
-                            EditorMode::AutoHeight { .. } | EditorMode::Minimap { .. }
-                        ) {
-                            snapshot
-                        } else {
-                            let wrap_width_for = |column: u32| (column as f32 * em_advance).ceil();
-                            let wrap_width = match editor.soft_wrap_mode(cx) {
-                                SoftWrap::GitDiff => None,
-                                SoftWrap::None => Some(wrap_width_for(MAX_LINE_LEN as u32 / 2)),
-                                SoftWrap::EditorWidth => Some(editor_width),
-                                SoftWrap::Column(column) => Some(wrap_width_for(column)),
-                                SoftWrap::Bounded(column) => {
-                                    Some(editor_width.min(wrap_width_for(column)))
-                                }
-                            };
-
-                            if editor.set_wrap_width(wrap_width, cx) {
-                                editor.snapshot(window, cx)
-                            } else {
-                                snapshot
-                            }
-                        }
-                    });
-
-                    let hitbox = window.insert_hitbox(bounds, HitboxBehavior::Normal);
-                    let gutter_hitbox = window.insert_hitbox(
-                        gutter_bounds(bounds, gutter_dimensions),
-                        HitboxBehavior::Normal,
-                    );
-                    let text_hitbox = window.insert_hitbox(
-                        Bounds {
-                            origin: gutter_hitbox.top_right(),
-                            size: size(text_width, bounds.size.height),
-                        },
-                        HitboxBehavior::Normal,
-                    );
-
-                    // Offset the content_bounds from the text_bounds by the gutter margin (which
-                    // is roughly half a character wide) to make hit testing work more like how we want.
-                    let content_offset = point(editor_margins.gutter.margin, Pixels::ZERO);
-                    let content_origin = text_hitbox.origin + content_offset;
-
-                    let height_in_lines = f64::from(bounds.size.height / line_height);
-                    let max_row = snapshot.max_point().row().as_f64();
-
-                    // The max scroll position for the top of the window
-                    let max_scroll_top = if matches!(
-                        snapshot.mode,
-                        EditorMode::SingleLine
-                            | EditorMode::AutoHeight { .. }
-                            | EditorMode::Full {
-                                sizing_behavior: SizingBehavior::ExcludeOverscrollMargin
-                                    | SizingBehavior::SizeByContent,
-                                ..
-                            }
-                    ) {
-                        (max_row - height_in_lines + 1.).max(0.)
-                    } else {
-                        let settings = EditorSettings::get_global(cx);
-                        match settings.scroll_beyond_last_line {
-                            ScrollBeyondLastLine::OnePage => max_row,
-                            ScrollBeyondLastLine::Off => (max_row - height_in_lines + 1.).max(0.),
-                            ScrollBeyondLastLine::VerticalScrollMargin => {
-                                (max_row - height_in_lines + 1. + settings.vertical_scroll_margin)
-                                    .max(0.)
-                            }
-                        }
-                    };
-
-                    let (
-                        autoscroll_request,
-                        autoscroll_containing_element,
-                        needs_horizontal_autoscroll,
-                    ) = self.editor.update(cx, |editor, cx| {
-                        let autoscroll_request = editor.scroll_manager.take_autoscroll_request();
-
-                        let autoscroll_containing_element =
-                            autoscroll_request.is_some() || editor.has_pending_selection();
-
-                        let (needs_horizontal_autoscroll, was_scrolled) = editor
-                            .autoscroll_vertically(
-                                bounds,
-                                line_height,
-                                max_scroll_top,
-                                autoscroll_request,
-                                window,
-                                cx,
-                            );
-                        if was_scrolled.0 {
-                            snapshot = editor.snapshot(window, cx);
-                        }
-                        (
-                            autoscroll_request,
-                            autoscroll_containing_element,
-                            needs_horizontal_autoscroll,
-                        )
-                    });
-
-                    let mut scroll_position = snapshot.scroll_position();
-                    // The scroll position is a fractional point, the whole number of which represents
-                    // the top of the window in terms of display rows.
-                    let start_row = DisplayRow(scroll_position.y as u32);
-                    let max_row = snapshot.max_point().row();
-                    let end_row = cmp::min(
-                        (scroll_position.y + height_in_lines).ceil() as u32,
-                        max_row.next_row().0,
-                    );
-                    let end_row = DisplayRow(end_row);
-
-                    let row_infos = snapshot // note we only get the visual range
-                        .row_infos(start_row)
-                        .take((start_row..end_row).len())
-                        .collect::<Vec<RowInfo>>();
-                    let is_row_soft_wrapped = |row: usize| {
-                        row_infos
-                            .get(row)
-                            .is_none_or(|info| info.buffer_row.is_none())
-                    };
-
-                    let start_anchor = if start_row == Default::default() {
-                        Anchor::min()
-                    } else {
-                        snapshot.buffer_snapshot().anchor_before(
-                            DisplayPoint::new(start_row, 0).to_offset(&snapshot, Bias::Left),
-                        )
-                    };
-                    let end_anchor = if end_row > max_row {
-                        Anchor::max()
-                    } else {
-                        snapshot.buffer_snapshot().anchor_before(
-                            DisplayPoint::new(end_row, 0).to_offset(&snapshot, Bias::Right),
-                        )
-                    };
-
-                    let mut highlighted_rows = self
-                        .editor
-                        .update(cx, |editor, cx| editor.highlighted_display_rows(window, cx));
-
-                    let is_light = cx.theme().appearance().is_light();
-
-                    let mut highlighted_ranges = self
-                        .editor_with_selections(cx)
-                        .map(|editor| {
-                            editor.read(cx).background_highlights_in_range(
-                                start_anchor..end_anchor,
-                                &snapshot.display_snapshot,
-                                cx.theme(),
-                            )
-                        })
-                        .unwrap_or_default();
-
-                    for (ix, row_info) in row_infos.iter().enumerate() {
-                        let Some(diff_status) = row_info.diff_status else {
-                            continue;
-                        };
-
-                        let background_color = match diff_status.kind {
-                            DiffHunkStatusKind::Added =>
-                                cx.theme().colors().version_control_added,
-                            DiffHunkStatusKind::Deleted =>
-                                cx.theme().colors().version_control_deleted,
-                            DiffHunkStatusKind::Modified => {
-                                debug_panic!("modified diff status for row info");
-                                continue;
-                            }
-                        };
-
-                        let hunk_opacity = if is_light { 0.16 } else { 0.12 };
-
-                        let hollow_highlight = LineHighlight {
-                            background: (background_color.opacity(if is_light {
-                                0.08
-                            } else {
-                                0.06
-                            }))
-                            .into(),
-                            border: Some(if is_light {
-                                background_color.opacity(0.48)
-                            } else {
-                                background_color.opacity(0.36)
-                            }),
-                            include_gutter: true,
-                            type_id: None,
-                        };
-
-                        let filled_highlight = LineHighlight {
-                            background: solid_background(background_color.opacity(hunk_opacity)),
-                            border: None,
-                            include_gutter: true,
-                            type_id: None,
-                        };
-
-                        let background = if Self::diff_hunk_hollow(diff_status, cx) {
-                            hollow_highlight
-                        } else {
-                            filled_highlight
-                        };
-
-                        let base_display_point =
-                            DisplayPoint::new(start_row + DisplayRow(ix as u32), 0);
-
-                        highlighted_rows
-                            .entry(base_display_point.row())
-                            .or_insert(background);
-                    }
-
-                    let highlighted_gutter_ranges =
-                        self.editor.read(cx).gutter_highlights_in_range(
-                            start_anchor..end_anchor,
-                            &snapshot.display_snapshot,
-                            cx,
-                        );
-
-                    let document_colors = self
-                        .editor
-                        .read(cx)
-                        .colors
-                        .as_ref()
-                        .map(|colors| colors.editor_display_highlights(&snapshot));
-                    let redacted_ranges = self.editor.read(cx).redacted_ranges(
-                        start_anchor..end_anchor,
-                        &snapshot.display_snapshot,
-                        cx,
-                    );
-
-                    let (local_selections, selected_buffer_ids, latest_selection_anchors): (
-                        Vec<Selection<Point>>,
-                        Vec<BufferId>,
-                        HashMap<BufferId, Anchor>,
-                    ) = self
-                        .editor_with_selections(cx)
-                        .map(|editor| {
-                            editor.update(cx, |editor, cx| {
-                                let all_selections =
-                                    editor.selections.all::<Point>(&snapshot.display_snapshot);
-                                let all_anchor_selections =
-                                    editor.selections.all_anchors(&snapshot.display_snapshot);
-                                let selected_buffer_ids =
-                                    if editor.buffer_kind(cx) == ItemBufferKind::Singleton {
-                                        Vec::new()
-                                    } else {
-                                        let mut selected_buffer_ids =
-                                            Vec::with_capacity(all_selections.len());
-
-                                        for selection in all_selections {
-                                            for buffer_id in snapshot
-                                                .buffer_snapshot()
-                                                .buffer_ids_for_range(selection.range())
-                                            {
-                                                if selected_buffer_ids.last() != Some(&buffer_id) {
-                                                    selected_buffer_ids.push(buffer_id);
-                                                }
-                                            }
-                                        }
-
-                                        selected_buffer_ids
-                                    };
-
-                                let mut selections = editor.selections.disjoint_in_range(
-                                    start_anchor..end_anchor,
-                                    &snapshot.display_snapshot,
-                                );
-                                selections
-                                    .extend(editor.selections.pending(&snapshot.display_snapshot));
-
-                                let mut anchors_by_buffer: HashMap<BufferId, (usize, Anchor)> =
-                                    HashMap::default();
-                                for selection in all_anchor_selections.iter() {
-                                    let head = selection.head();
-                                    if let Some(buffer_id) = head.text_anchor.buffer_id {
-                                        anchors_by_buffer
-                                            .entry(buffer_id)
-                                            .and_modify(|(latest_id, latest_anchor)| {
-                                                if selection.id > *latest_id {
-                                                    *latest_id = selection.id;
-                                                    *latest_anchor = head;
-                                                }
-                                            })
-                                            .or_insert((selection.id, head));
-                                    }
-                                }
-                                let latest_selection_anchors = anchors_by_buffer
-                                    .into_iter()
-                                    .map(|(buffer_id, (_, anchor))| (buffer_id, anchor))
-                                    .collect();
-
-                                (selections, selected_buffer_ids, latest_selection_anchors)
-                            })
-                        })
-                        .unwrap_or_else(|| (Vec::new(), Vec::new(), HashMap::default()));
-
-                    let (selections, mut active_rows, newest_selection_head) = self
-                        .layout_selections(
-                            start_anchor,
-                            end_anchor,
-                            &local_selections,
-                            &snapshot,
-                            start_row,
-                            end_row,
-                            window,
-                            cx,
-                        );
-                    let mut breakpoint_rows = self.editor.update(cx, |editor, cx| {
-                        editor.active_breakpoints(start_row..end_row, window, cx)
-                    });
-                    for (display_row, (_, bp, state)) in &breakpoint_rows {
-                        if bp.is_enabled() && state.is_none_or(|s| s.verified) {
-                            active_rows.entry(*display_row).or_default().breakpoint = true;
-                        }
-                    }
-
-                    let line_numbers = self.layout_line_numbers(
-                        Some(&gutter_hitbox),
-                        gutter_dimensions,
-                        line_height,
-                        scroll_position,
-                        start_row..end_row,
-                        &row_infos,
-                        &active_rows,
-                        newest_selection_head,
-                        &snapshot,
-                        window,
-                        cx,
-                    );
-
-                    // We add the gutter breakpoint indicator to breakpoint_rows after painting
-                    // line numbers so we don't paint a line number debug accent color if a user
-                    // has their mouse over that line when a breakpoint isn't there
-                    self.editor.update(cx, |editor, _| {
-                        if let Some(phantom_breakpoint) = &mut editor
-                            .gutter_breakpoint_indicator
-                            .0
-                            .filter(|phantom_breakpoint| phantom_breakpoint.is_active)
-                        {
-                            // Is there a non-phantom breakpoint on this line?
-                            phantom_breakpoint.collides_with_existing_breakpoint = true;
-                            breakpoint_rows
-                                .entry(phantom_breakpoint.display_row)
-                                .or_insert_with(|| {
-                                    let position = snapshot.display_point_to_anchor(
-                                        DisplayPoint::new(phantom_breakpoint.display_row, 0),
-                                        Bias::Right,
-                                    );
-                                    let breakpoint = Breakpoint::new_standard();
-                                    phantom_breakpoint.collides_with_existing_breakpoint = false;
-                                    (position, breakpoint, None)
-                                });
-                        }
-                    });
-
-                    let mut expand_toggles =
-                        window.with_element_namespace("expand_toggles", |window| {
-                            self.layout_expand_toggles(
-                                &gutter_hitbox,
-                                gutter_dimensions,
-                                em_width,
-                                line_height,
-                                scroll_position,
-                                &row_infos,
-                                window,
-                                cx,
-                            )
-                        });
-
-                    let mut crease_toggles =
-                        window.with_element_namespace("crease_toggles", |window| {
-                            self.layout_crease_toggles(
-                                start_row..end_row,
-                                &row_infos,
-                                &active_rows,
-                                &snapshot,
-                                window,
-                                cx,
-                            )
-                        });
-                    let crease_trailers =
-                        window.with_element_namespace("crease_trailers", |window| {
-                            self.layout_crease_trailers(
-                                row_infos.iter().cloned(),
-                                &snapshot,
-                                window,
-                                cx,
-                            )
-                        });
-
-                    let display_hunks = self.layout_gutter_diff_hunks(
-                        line_height,
-                        &gutter_hitbox,
-                        start_row..end_row,
-                        &snapshot,
-                        window,
-                        cx,
-                    );
-
-                    Self::layout_word_diff_highlights(
-                        &display_hunks,
-                        &row_infos,
-                        start_row,
-                        &snapshot,
-                        &mut highlighted_ranges,
-                        cx,
-                    );
-
-                    let merged_highlighted_ranges =
-                        if let Some((_, colors)) = document_colors.as_ref() {
-                            &highlighted_ranges
-                                .clone()
-                                .into_iter()
-                                .chain(colors.clone())
-                                .collect()
-                        } else {
-                            &highlighted_ranges
-                        };
-                    let bg_segments_per_row = Self::bg_segments_per_row(
-                        start_row..end_row,
-                        &selections,
-                        &merged_highlighted_ranges,
-                        self.style.background,
-                    );
-
-                    let mut line_layouts = Self::layout_lines(
-                        start_row..end_row,
-                        &snapshot,
-                        &self.style,
-                        editor_width,
-                        is_row_soft_wrapped,
-                        &bg_segments_per_row,
-                        window,
-                        cx,
-                    );
-                    let new_renderer_widths = (!is_minimap).then(|| {
-                        line_layouts
-                            .iter()
-                            .flat_map(|layout| &layout.fragments)
-                            .filter_map(|fragment| {
-                                if let LineFragment::Element { id, size, .. } = fragment {
-                                    Some((*id, size.width))
-                                } else {
-                                    None
-                                }
-                            })
-                    });
-                    if new_renderer_widths.is_some_and(|new_renderer_widths| {
-                        self.editor.update(cx, |editor, cx| {
-                            editor.update_renderer_widths(new_renderer_widths, cx)
-                        })
-                    }) {
-                        // If the fold widths have changed, we need to prepaint
-                        // the element again to account for any changes in
-                        // wrapping.
-                        if request_layout.can_prepaint() {
-                            return self.prepaint(
-                                None,
-                                _inspector_id,
-                                bounds,
-                                request_layout,
-                                window,
-                                cx,
-                            );
-                        } else {
-                            debug_panic!(
-                                "skipping recursive prepaint at max depth. renderer widths may be stale."
-                            );
-                        }
-                    }
-
-                    let longest_line_blame_width = self
-                        .editor
-                        .update(cx, |editor, cx| {
-                            if !editor.show_git_blame_inline {
-                                return None;
-                            }
-                            let blame = editor.blame.as_ref()?;
-                            let (_, blame_entry) = blame
-                                .update(cx, |blame, cx| {
-                                    let row_infos =
-                                        snapshot.row_infos(snapshot.longest_row()).next()?;
-                                    blame.blame_for_rows(&[row_infos], cx).next()
-                                })
-                                .flatten()?;
-                            let mut element = render_inline_blame_entry(blame_entry, style, cx)?;
-                            let inline_blame_padding =
-                                ProjectSettings::get_global(cx).git.inline_blame.padding as f32
-                                    * em_advance;
-                            Some(
-                                element
-                                    .layout_as_root(AvailableSpace::min_size(), window, cx)
-                                    .width
-                                    + inline_blame_padding,
-                            )
-                        })
-                        .unwrap_or(Pixels::ZERO);
-
-                    let longest_line_width = layout_line(
-                        snapshot.longest_row(),
-                        &snapshot,
-                        style,
-                        editor_width,
-                        is_row_soft_wrapped,
-                        window,
-                        cx,
-                    )
-                    .width;
-
-                    let scrollbar_layout_information = ScrollbarLayoutInformation::new(
-                        text_hitbox.bounds,
-                        glyph_grid_cell,
-                        size(
-                            longest_line_width,
-                            Pixels::from(max_row.as_f64() * f64::from(line_height)),
-                        ),
-                        longest_line_blame_width,
-                        EditorSettings::get_global(cx),
-                    );
-
-                    let mut scroll_width = scrollbar_layout_information.scroll_range.width;
-
-                    let sticky_header_excerpt = if snapshot.buffer_snapshot().show_headers() {
-                        snapshot.sticky_header_excerpt(scroll_position.y)
-                    } else {
-                        None
-                    };
-                    let sticky_header_excerpt_id =
-                        sticky_header_excerpt.as_ref().map(|top| top.excerpt.id);
-
-                    let blocks = (!is_minimap)
-                        .then(|| {
-                            window.with_element_namespace("blocks", |window| {
-                                self.render_blocks(
-                                    start_row..end_row,
-                                    &snapshot,
-                                    &hitbox,
-                                    &text_hitbox,
-                                    editor_width,
-                                    &mut scroll_width,
-                                    &editor_margins,
-                                    em_width,
-                                    gutter_dimensions.full_width(),
-                                    line_height,
-                                    &mut line_layouts,
-                                    &local_selections,
-                                    &selected_buffer_ids,
-                                    &latest_selection_anchors,
-                                    is_row_soft_wrapped,
-                                    sticky_header_excerpt_id,
-                                    window,
-                                    cx,
-                                )
-                            })
-                        })
-                        .unwrap_or_default();
-                    let RenderBlocksOutput {
-                        mut blocks,
-                        row_block_types,
-                        resized_blocks,
-                    } = blocks;
-                    if let Some(resized_blocks) = resized_blocks {
-                        self.editor.update(cx, |editor, cx| {
-                            editor.resize_blocks(
-                                resized_blocks,
-                                autoscroll_request.map(|(autoscroll, _)| autoscroll),
-                                cx,
-                            )
-                        });
-                        if request_layout.can_prepaint() {
-                            return self.prepaint(
-                                None,
-                                _inspector_id,
-                                bounds,
-                                request_layout,
-                                window,
-                                cx,
-                            );
-                        } else {
-                            debug_panic!(
-                                "skipping recursive prepaint at max depth. block layout may be stale."
-                            );
-                        }
-                    }
-
-                    let sticky_buffer_header = sticky_header_excerpt.map(|sticky_header_excerpt| {
-                        window.with_element_namespace("blocks", |window| {
-                            self.layout_sticky_buffer_header(
-                                sticky_header_excerpt,
-                                scroll_position,
-                                line_height,
-                                right_margin,
-                                &snapshot,
-                                &hitbox,
-                                &selected_buffer_ids,
-                                &blocks,
-                                &latest_selection_anchors,
-                                window,
-                                cx,
-                            )
-                        })
-                    });
-
-                    let start_buffer_row =
-                        MultiBufferRow(start_anchor.to_point(&snapshot.buffer_snapshot()).row);
-                    let end_buffer_row =
-                        MultiBufferRow(end_anchor.to_point(&snapshot.buffer_snapshot()).row);
-
-                    let scroll_max: gpui::Point<ScrollPixelOffset> = point(
-                        ScrollPixelOffset::from(
-                            ((scroll_width - editor_width) / em_advance).max(0.0),
-                        ),
-                        max_scroll_top,
-                    );
-
-                    self.editor.update(cx, |editor, cx| {
-                        if editor.scroll_manager.clamp_scroll_left(scroll_max.x) {
-                            scroll_position.x = scroll_position.x.min(scroll_max.x);
-                        }
-
-                        if needs_horizontal_autoscroll.0
-                            && let Some(new_scroll_position) = editor.autoscroll_horizontally(
-                                start_row,
-                                editor_width,
-                                scroll_width,
-                                em_advance,
-                                &line_layouts,
-                                autoscroll_request,
-                                window,
-                                cx,
-                            )
-                        {
-                            scroll_position = new_scroll_position;
-                        }
-                    });
-
-                    let scroll_pixel_position = point(
-                        scroll_position.x * f64::from(em_advance),
-                        scroll_position.y * f64::from(line_height),
-                    );
-                    let sticky_headers = if !is_minimap
-                        && is_singleton
-                        && EditorSettings::get_global(cx).sticky_scroll.enabled
-                    {
-                        self.layout_sticky_headers(
-                            &snapshot,
-                            editor_width,
-                            is_row_soft_wrapped,
-                            line_height,
-                            scroll_pixel_position,
-                            content_origin,
-                            &gutter_dimensions,
-                            &gutter_hitbox,
-                            &text_hitbox,
-                            &style,
-                            window,
-                            cx,
-                        )
-                    } else {
-                        None
-                    };
-                    let indent_guides = self.layout_indent_guides(
-                        content_origin,
-                        text_hitbox.origin,
-                        start_buffer_row..end_buffer_row,
-                        scroll_pixel_position,
-                        line_height,
-                        &snapshot,
-                        window,
-                        cx,
-                    );
-
-                    let crease_trailers =
-                        window.with_element_namespace("crease_trailers", |window| {
-                            self.prepaint_crease_trailers(
-                                crease_trailers,
-                                &line_layouts,
-                                line_height,
-                                content_origin,
-                                scroll_pixel_position,
-                                em_width,
-                                window,
-                                cx,
-                            )
-                        });
-
-                    let (edit_prediction_popover, edit_prediction_popover_origin) = self
-                        .editor
-                        .update(cx, |editor, cx| {
-                            editor.render_edit_prediction_popover(
-                                &text_hitbox.bounds,
-                                content_origin,
-                                right_margin,
-                                &snapshot,
-                                start_row..end_row,
-                                scroll_position.y,
-                                scroll_position.y + height_in_lines,
-                                &line_layouts,
-                                line_height,
-                                scroll_position,
-                                scroll_pixel_position,
-                                newest_selection_head,
-                                editor_width,
-                                style,
-                                window,
-                                cx,
-                            )
-                        })
-                        .unzip();
-
-                    let mut inline_diagnostics = self.layout_inline_diagnostics(
-                        &line_layouts,
-                        &crease_trailers,
-                        &row_block_types,
-                        content_origin,
-                        scroll_position,
-                        scroll_pixel_position,
-                        edit_prediction_popover_origin,
-                        start_row,
-                        end_row,
-                        line_height,
-                        em_width,
-                        style,
-                        window,
-                        cx,
-                    );
-
-                    let mut inline_blame_layout = None;
-                    let mut inline_code_actions = None;
-                    if let Some(newest_selection_head) = newest_selection_head {
-                        let display_row = newest_selection_head.row();
-                        if (start_row..end_row).contains(&display_row)
-                            && !row_block_types.contains_key(&display_row)
-                        {
-                            inline_code_actions = self.layout_inline_code_actions(
-                                newest_selection_head,
-                                content_origin,
-                                scroll_position,
-                                scroll_pixel_position,
-                                line_height,
-                                &snapshot,
-                                window,
-                                cx,
-                            );
-
-                            let line_ix = display_row.minus(start_row) as usize;
-                            if let (Some(row_info), Some(line_layout), Some(crease_trailer)) = (
-                                row_infos.get(line_ix),
-                                line_layouts.get(line_ix),
-                                crease_trailers.get(line_ix),
-                            ) {
-                                let crease_trailer_layout = crease_trailer.as_ref();
-                                if let Some(layout) = self.layout_inline_blame(
-                                    display_row,
-                                    row_info,
-                                    line_layout,
-                                    crease_trailer_layout,
-                                    em_width,
-                                    content_origin,
-                                    scroll_position,
-                                    scroll_pixel_position,
-                                    line_height,
-                                    window,
-                                    cx,
-                                ) {
-                                    inline_blame_layout = Some(layout);
-                                    // Blame overrides inline diagnostics
-                                    inline_diagnostics.remove(&display_row);
-                                }
-                            } else {
-                                log::error!(
-                                    "bug: line_ix {} is out of bounds - row_infos.len(): {}, \
-                                    line_layouts.len(): {}, \
-                                    crease_trailers.len(): {}",
-                                    line_ix,
-                                    row_infos.len(),
-                                    line_layouts.len(),
-                                    crease_trailers.len(),
-                                );
-                            }
-                        }
-                    }
-
-                    let blamed_display_rows = self.layout_blame_entries(
-                        &row_infos,
-                        em_width,
-                        scroll_position,
-                        line_height,
-                        &gutter_hitbox,
-                        gutter_dimensions.git_blame_entries_width,
-                        window,
-                        cx,
-                    );
-
-                    let line_elements = self.prepaint_lines(
-                        start_row,
-                        &mut line_layouts,
-                        line_height,
-                        scroll_position,
-                        scroll_pixel_position,
-                        content_origin,
-                        window,
-                        cx,
-                    );
-
-                    window.with_element_namespace("blocks", |window| {
-                        self.layout_blocks(
-                            &mut blocks,
-                            &hitbox,
-                            line_height,
-                            scroll_position,
-                            scroll_pixel_position,
-                            window,
-                            cx,
-                        );
-                    });
-
-                    let cursors = self.collect_cursors(&snapshot, cx);
-                    let visible_row_range = start_row..end_row;
-                    let non_visible_cursors = cursors
-                        .iter()
-                        .any(|c| !visible_row_range.contains(&c.0.row()));
-
-                    let visible_cursors = self.layout_visible_cursors(
-                        &snapshot,
-                        &selections,
-                        &row_block_types,
-                        start_row..end_row,
-                        &line_layouts,
-                        &text_hitbox,
-                        content_origin,
-                        scroll_position,
-                        scroll_pixel_position,
-                        line_height,
-                        em_width,
-                        em_advance,
-                        autoscroll_containing_element,
-                        window,
-                        cx,
-                    );
-
-                    let scrollbars_layout = self.layout_scrollbars(
-                        &snapshot,
-                        &scrollbar_layout_information,
-                        content_offset,
-                        scroll_position,
-                        non_visible_cursors,
-                        right_margin,
-                        editor_width,
-                        window,
-                        cx,
-                    );
-
-                    let gutter_settings = EditorSettings::get_global(cx).gutter;
-
-                    let context_menu_layout =
-                        if let Some(newest_selection_head) = newest_selection_head {
-                            let newest_selection_point =
-                                newest_selection_head.to_point(&snapshot.display_snapshot);
-                            if (start_row..end_row).contains(&newest_selection_head.row()) {
-                                self.layout_cursor_popovers(
-                                    line_height,
-                                    &text_hitbox,
-                                    content_origin,
-                                    right_margin,
-                                    start_row,
-                                    scroll_pixel_position,
-                                    &line_layouts,
-                                    newest_selection_head,
-                                    newest_selection_point,
-                                    style,
-                                    window,
-                                    cx,
-                                )
-                            } else {
-                                None
-                            }
-                        } else {
-                            None
-                        };
-
-                    self.layout_gutter_menu(
-                        line_height,
-                        &text_hitbox,
-                        content_origin,
-                        right_margin,
-                        scroll_pixel_position,
-                        gutter_dimensions.width - gutter_dimensions.left_padding,
-                        window,
-                        cx,
-                    );
-
-                    let test_indicators = if gutter_settings.runnables {
-                        self.layout_run_indicators(
-                            line_height,
-                            start_row..end_row,
-                            &row_infos,
-                            scroll_position,
-                            &gutter_dimensions,
-                            &gutter_hitbox,
-                            &display_hunks,
-                            &snapshot,
-                            &mut breakpoint_rows,
-                            window,
-                            cx,
-                        )
-                    } else {
-                        Vec::new()
-                    };
-
-                    let show_breakpoints = snapshot
-                        .show_breakpoints
-                        .unwrap_or(gutter_settings.breakpoints);
-                    let breakpoints = if show_breakpoints {
-                        self.layout_breakpoints(
-                            line_height,
-                            start_row..end_row,
-                            scroll_position,
-                            &gutter_dimensions,
-                            &gutter_hitbox,
-                            &display_hunks,
-                            &snapshot,
-                            breakpoint_rows,
-                            &row_infos,
-                            window,
-                            cx,
-                        )
-                    } else {
-                        Vec::new()
-                    };
-
-                    self.layout_signature_help(
-                        &hitbox,
-                        content_origin,
-                        scroll_pixel_position,
-                        newest_selection_head,
-                        start_row,
-                        &line_layouts,
-                        line_height,
-                        em_width,
-                        context_menu_layout,
-                        window,
-                        cx,
-                    );
-
-                    if !cx.has_active_drag() {
-                        self.layout_hover_popovers(
-                            &snapshot,
-                            &hitbox,
-                            start_row..end_row,
-                            content_origin,
-                            scroll_pixel_position,
-                            &line_layouts,
-                            line_height,
-                            em_width,
-                            context_menu_layout,
-                            window,
-                            cx,
-                        );
-
-                        self.layout_blame_popover(&snapshot, &hitbox, line_height, window, cx);
-                    }
-
-                    let mouse_context_menu = self.layout_mouse_context_menu(
-                        &snapshot,
-                        start_row..end_row,
-                        content_origin,
-                        window,
-                        cx,
-                    );
-
-                    window.with_element_namespace("crease_toggles", |window| {
-                        self.prepaint_crease_toggles(
-                            &mut crease_toggles,
-                            line_height,
-                            &gutter_dimensions,
-                            gutter_settings,
-                            scroll_pixel_position,
-                            &gutter_hitbox,
-                            window,
-                            cx,
-                        )
-                    });
-
-                    window.with_element_namespace("expand_toggles", |window| {
-                        self.prepaint_expand_toggles(&mut expand_toggles, window, cx)
-                    });
-
-                    let wrap_guides = self.layout_wrap_guides(
-                        em_advance,
-                        scroll_position,
-                        content_origin,
-                        scrollbars_layout.as_ref(),
-                        vertical_scrollbar_width,
-                        &hitbox,
-                        window,
-                        cx,
-                    );
-
-                    let minimap = window.with_element_namespace("minimap", |window| {
-                        self.layout_minimap(
-                            &snapshot,
-                            minimap_width,
-                            scroll_position,
-                            &scrollbar_layout_information,
-                            scrollbars_layout.as_ref(),
-                            window,
-                            cx,
-                        )
-                    });
-
-                    let invisible_symbol_font_size = font_size / 2.;
-                    let whitespace_map = &self
-                        .editor
-                        .read(cx)
-                        .buffer
-                        .read(cx)
-                        .language_settings(cx)
-                        .whitespace_map;
-
-                    let tab_char = whitespace_map.tab.clone();
-                    let tab_len = tab_char.len();
-                    let tab_invisible = window.text_system().shape_line(
-                        tab_char,
-                        invisible_symbol_font_size,
-                        &[TextRun {
-                            len: tab_len,
-                            font: self.style.text.font(),
-                            color: cx.theme().colors().editor_invisible,
-                            ..Default::default()
-                        }],
-                        None,
-                    );
-
-                    let space_char = whitespace_map.space.clone();
-                    let space_len = space_char.len();
-                    let space_invisible = window.text_system().shape_line(
-                        space_char,
-                        invisible_symbol_font_size,
-                        &[TextRun {
-                            len: space_len,
-                            font: self.style.text.font(),
-                            color: cx.theme().colors().editor_invisible,
-                            ..Default::default()
-                        }],
-                        None,
-                    );
-
-                    let mode = snapshot.mode.clone();
-
-                    let (diff_hunk_controls, diff_hunk_control_bounds) = if is_read_only {
-                        (vec![], vec![])
-                    } else {
-                        self.layout_diff_hunk_controls(
-                            start_row..end_row,
-                            &row_infos,
-                            &text_hitbox,
-                            newest_selection_head,
-                            line_height,
-                            right_margin,
-                            scroll_pixel_position,
-                            &display_hunks,
-                            &highlighted_rows,
-                            self.editor.clone(),
-                            window,
-                            cx,
-                        )
-                    };
-
-                    let position_map = Rc::new(PositionMap {
-                        size: bounds.size,
-                        visible_row_range,
-                        scroll_position,
-                        scroll_pixel_position,
-                        scroll_max,
-                        line_layouts,
-                        line_height,
-                        em_width,
-                        em_advance,
-                        snapshot,
-                        gutter_hitbox: gutter_hitbox.clone(),
-                        text_hitbox: text_hitbox.clone(),
-                        inline_blame_bounds: inline_blame_layout
-                            .as_ref()
-                            .map(|layout| (layout.bounds, layout.buffer_id, layout.entry.clone())),
-                        display_hunks: display_hunks.clone(),
-                        diff_hunk_control_bounds,
-                    });
-
-                    self.editor.update(cx, |editor, _| {
-                        editor.last_position_map = Some(position_map.clone())
-                    });
-
-                    EditorLayout {
-                        mode,
-                        position_map,
-                        visible_display_row_range: start_row..end_row,
-                        wrap_guides,
-                        indent_guides,
-                        hitbox,
-                        gutter_hitbox,
-                        display_hunks,
-                        content_origin,
-                        scrollbars_layout,
-                        minimap,
-                        active_rows,
-                        highlighted_rows,
-                        highlighted_ranges,
-                        highlighted_gutter_ranges,
-                        redacted_ranges,
-                        document_colors,
-                        line_elements,
-                        line_numbers,
-                        blamed_display_rows,
-                        inline_diagnostics,
-                        inline_blame_layout,
-                        inline_code_actions,
-                        blocks,
-                        cursors,
-                        visible_cursors,
-                        selections,
-                        edit_prediction_popover,
-                        diff_hunk_controls,
-                        mouse_context_menu,
-                        test_indicators,
-                        breakpoints,
-                        crease_toggles,
-                        crease_trailers,
-                        tab_invisible,
-                        space_invisible,
-                        sticky_buffer_header,
-                        sticky_headers,
-                        expand_toggles,
-                    }
-                })
-            })
-        })
-    }
-
-    fn paint(
-        &mut self,
-        _: Option<&GlobalElementId>,
-        _inspector_id: Option<&gpui::InspectorElementId>,
-        bounds: Bounds<gpui::Pixels>,
-        _: &mut Self::RequestLayoutState,
-        layout: &mut Self::PrepaintState,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        if !layout.mode.is_minimap() {
-            let focus_handle = self.editor.focus_handle(cx);
-            let key_context = self
-                .editor
-                .update(cx, |editor, cx| editor.key_context(window, cx));
-
-            window.set_key_context(key_context);
-            window.handle_input(
-                &focus_handle,
-                ElementInputHandler::new(bounds, self.editor.clone()),
-                cx,
-            );
-            self.register_actions(window, cx);
-            self.register_key_listeners(window, cx, layout);
-        }
-
-        let text_style = TextStyleRefinement {
-            font_size: Some(self.style.text.font_size),
-            line_height: Some(self.style.text.line_height),
-            ..Default::default()
-        };
-        let rem_size = self.rem_size(cx);
-        window.with_rem_size(rem_size, |window| {
-            window.with_text_style(Some(text_style), |window| {
-                window.with_content_mask(Some(ContentMask { bounds }), |window| {
-                    self.paint_mouse_listeners(layout, window, cx);
-                    self.paint_background(layout, window, cx);
-                    self.paint_indent_guides(layout, window, cx);
-
-                    if layout.gutter_hitbox.size.width > Pixels::ZERO {
-                        self.paint_blamed_display_rows(layout, window, cx);
-                        self.paint_line_numbers(layout, window, cx);
-                    }
-
-                    self.paint_text(layout, window, cx);
-
-                    if layout.gutter_hitbox.size.width > Pixels::ZERO {
-                        self.paint_gutter_highlights(layout, window, cx);
-                        self.paint_gutter_indicators(layout, window, cx);
-                    }
-
-                    if !layout.blocks.is_empty() {
-                        window.with_element_namespace("blocks", |window| {
-                            self.paint_blocks(layout, window, cx);
-                        });
-                    }
-
-                    window.with_element_namespace("blocks", |window| {
-                        if let Some(mut sticky_header) = layout.sticky_buffer_header.take() {
-                            sticky_header.paint(window, cx)
-                        }
-                    });
-
-                    self.paint_sticky_headers(layout, window, cx);
-                    self.paint_minimap(layout, window, cx);
-                    self.paint_scrollbars(layout, window, cx);
-                    self.paint_edit_prediction_popover(layout, window, cx);
-                    self.paint_mouse_context_menu(layout, window, cx);
-                });
-            })
-        })
-    }
-}
-
-pub(super) fn gutter_bounds(
-    editor_bounds: Bounds<Pixels>,
-    gutter_dimensions: GutterDimensions,
-) -> Bounds<Pixels> {
-    Bounds {
-        origin: editor_bounds.origin,
-        size: size(gutter_dimensions.width, editor_bounds.size.height),
-    }
-}
-
-#[derive(Clone, Copy)]
-struct ContextMenuLayout {
-    y_flipped: bool,
-    bounds: Bounds<Pixels>,
-}
-
-/// Holds information required for layouting the editor scrollbars.
-struct ScrollbarLayoutInformation {
-    /// The bounds of the editor area (excluding the content offset).
-    editor_bounds: Bounds<Pixels>,
-    /// The available range to scroll within the document.
-    scroll_range: Size<Pixels>,
-    /// The space available for one glyph in the editor.
-    glyph_grid_cell: Size<Pixels>,
-}
-
-impl ScrollbarLayoutInformation {
-    pub fn new(
-        editor_bounds: Bounds<Pixels>,
-        glyph_grid_cell: Size<Pixels>,
-        document_size: Size<Pixels>,
-        longest_line_blame_width: Pixels,
-        settings: &EditorSettings,
-    ) -> Self {
-        let vertical_overscroll = match settings.scroll_beyond_last_line {
-            ScrollBeyondLastLine::OnePage => editor_bounds.size.height,
-            ScrollBeyondLastLine::Off => glyph_grid_cell.height,
-            ScrollBeyondLastLine::VerticalScrollMargin => {
-                (1.0 + settings.vertical_scroll_margin) as f32 * glyph_grid_cell.height
-            }
-        };
-
-        let overscroll = size(longest_line_blame_width, vertical_overscroll);
-
-        ScrollbarLayoutInformation {
-            editor_bounds,
-            scroll_range: document_size + overscroll,
-            glyph_grid_cell,
-        }
-    }
-}
-
-impl IntoElement for EditorElement {
-    type Element = Self;
-
-    fn into_element(self) -> Self::Element {
-        self
-    }
-}
-
-pub struct EditorLayout {
-    position_map: Rc<PositionMap>,
-    hitbox: Hitbox,
-    gutter_hitbox: Hitbox,
-    content_origin: gpui::Point<Pixels>,
-    scrollbars_layout: Option<EditorScrollbars>,
-    minimap: Option<MinimapLayout>,
-    mode: EditorMode,
-    wrap_guides: SmallVec<[(Pixels, bool); 2]>,
-    indent_guides: Option<Vec<IndentGuideLayout>>,
-    visible_display_row_range: Range<DisplayRow>,
-    active_rows: BTreeMap<DisplayRow, LineHighlightSpec>,
-    highlighted_rows: BTreeMap<DisplayRow, LineHighlight>,
-    line_elements: SmallVec<[AnyElement; 1]>,
-    line_numbers: Arc<HashMap<MultiBufferRow, LineNumberLayout>>,
-    display_hunks: Vec<(DisplayDiffHunk, Option<Hitbox>)>,
-    blamed_display_rows: Option<Vec<AnyElement>>,
-    inline_diagnostics: HashMap<DisplayRow, AnyElement>,
-    inline_blame_layout: Option<InlineBlameLayout>,
-    inline_code_actions: Option<AnyElement>,
-    blocks: Vec<BlockLayout>,
-    highlighted_ranges: Vec<(Range<DisplayPoint>, Hsla)>,
-    highlighted_gutter_ranges: Vec<(Range<DisplayPoint>, Hsla)>,
-    redacted_ranges: Vec<Range<DisplayPoint>>,
-    cursors: Vec<(DisplayPoint, Hsla)>,
-    visible_cursors: Vec<CursorLayout>,
-    selections: Vec<(PlayerColor, Vec<SelectionLayout>)>,
-    test_indicators: Vec<AnyElement>,
-    breakpoints: Vec<AnyElement>,
-    crease_toggles: Vec<Option<AnyElement>>,
-    expand_toggles: Vec<Option<(AnyElement, gpui::Point<Pixels>)>>,
-    diff_hunk_controls: Vec<AnyElement>,
-    crease_trailers: Vec<Option<CreaseTrailerLayout>>,
-    edit_prediction_popover: Option<AnyElement>,
-    mouse_context_menu: Option<AnyElement>,
-    tab_invisible: ShapedLine,
-    space_invisible: ShapedLine,
-    sticky_buffer_header: Option<AnyElement>,
-    sticky_headers: Option<StickyHeaders>,
-    document_colors: Option<(DocumentColorsRenderMode, Vec<(Range<DisplayPoint>, Hsla)>)>,
-}
-
-struct StickyHeaders {
-    lines: Vec<StickyHeaderLine>,
-    gutter_background: Hsla,
-    content_background: Hsla,
-    gutter_right_padding: Pixels,
-}
-
-struct StickyHeaderLine {
-    row: DisplayRow,
-    offset: Pixels,
-    line: LineWithInvisibles,
-    line_number: Option<ShapedLine>,
-    elements: SmallVec<[AnyElement; 1]>,
-    available_text_width: Pixels,
-    target_anchor: Anchor,
-    hitbox: Hitbox,
-}
-
-impl EditorLayout {
-    fn line_end_overshoot(&self) -> Pixels {
-        0.15 * self.position_map.line_height
-    }
-}
-
-impl StickyHeaders {
-    fn paint(
-        &mut self,
-        layout: &mut EditorLayout,
-        whitespace_setting: ShowWhitespaceSetting,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        let line_height = layout.position_map.line_height;
-
-        for line in self.lines.iter_mut().rev() {
-            window.paint_layer(
-                Bounds::new(
-                    layout.gutter_hitbox.origin + point(Pixels::ZERO, line.offset),
-                    size(line.hitbox.size.width, line_height),
-                ),
-                |window| {
-                    let gutter_bounds = Bounds::new(
-                        layout.gutter_hitbox.origin + point(Pixels::ZERO, line.offset),
-                        size(layout.gutter_hitbox.size.width, line_height),
-                    );
-                    window.paint_quad(fill(gutter_bounds, self.gutter_background));
-
-                    let text_bounds = Bounds::new(
-                        layout.position_map.text_hitbox.origin + point(Pixels::ZERO, line.offset),
-                        size(line.available_text_width, line_height),
-                    );
-                    window.paint_quad(fill(text_bounds, self.content_background));
-
-                    if line.hitbox.is_hovered(window) {
-                        let hover_overlay = cx.theme().colors().panel_overlay_hover;
-                        window.paint_quad(fill(gutter_bounds, hover_overlay));
-                        window.paint_quad(fill(text_bounds, hover_overlay));
-                    }
-
-                    line.paint(
-                        layout,
-                        self.gutter_right_padding,
-                        line.available_text_width,
-                        layout.content_origin,
-                        line_height,
-                        whitespace_setting,
-                        window,
-                        cx,
-                    );
-                },
-            );
-
-            window.set_cursor_style(CursorStyle::PointingHand, &line.hitbox);
-        }
-    }
-}
-
-impl StickyHeaderLine {
-    fn new(
-        row: DisplayRow,
-        offset: Pixels,
-        mut line: LineWithInvisibles,
-        line_number: Option<ShapedLine>,
-        target_anchor: Anchor,
-        line_height: Pixels,
-        scroll_pixel_position: gpui::Point<ScrollPixelOffset>,
-        content_origin: gpui::Point<Pixels>,
-        gutter_hitbox: &Hitbox,
-        text_hitbox: &Hitbox,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Self {
-        let mut elements = SmallVec::<[AnyElement; 1]>::new();
-        line.prepaint_with_custom_offset(
-            line_height,
-            scroll_pixel_position,
-            content_origin,
-            offset,
-            &mut elements,
-            window,
-            cx,
-        );
-
-        let hitbox_bounds = Bounds::new(
-            gutter_hitbox.origin + point(Pixels::ZERO, offset),
-            size(text_hitbox.right() - gutter_hitbox.left(), line_height),
-        );
-        let available_text_width =
-            (hitbox_bounds.size.width - gutter_hitbox.size.width).max(Pixels::ZERO);
-
-        Self {
-            row,
-            offset,
-            line,
-            line_number,
-            elements,
-            available_text_width,
-            target_anchor,
-            hitbox: window.insert_hitbox(hitbox_bounds, HitboxBehavior::BlockMouseExceptScroll),
-        }
-    }
-
-    fn paint(
-        &mut self,
-        layout: &EditorLayout,
-        gutter_right_padding: Pixels,
-        available_text_width: Pixels,
-        content_origin: gpui::Point<Pixels>,
-        line_height: Pixels,
-        whitespace_setting: ShowWhitespaceSetting,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        window.with_content_mask(
-            Some(ContentMask {
-                bounds: Bounds::new(
-                    layout.position_map.text_hitbox.bounds.origin
-                        + point(Pixels::ZERO, self.offset),
-                    size(available_text_width, line_height),
-                ),
-            }),
-            |window| {
-                self.line.draw_with_custom_offset(
-                    layout,
-                    self.row,
-                    content_origin,
-                    self.offset,
-                    whitespace_setting,
-                    &[],
-                    window,
-                    cx,
-                );
-                for element in &mut self.elements {
-                    element.paint(window, cx);
-                }
-            },
-        );
-
-        if let Some(line_number) = &self.line_number {
-            let gutter_origin = layout.gutter_hitbox.origin + point(Pixels::ZERO, self.offset);
-            let gutter_width = layout.gutter_hitbox.size.width;
-            let origin = point(
-                gutter_origin.x + gutter_width - gutter_right_padding - line_number.width,
-                gutter_origin.y,
-            );
-            line_number.paint(origin, line_height, window, cx).log_err();
-        }
-    }
-}
-
-#[derive(Debug)]
-struct LineNumberSegment {
-    shaped_line: ShapedLine,
-    hitbox: Option<Hitbox>,
-}
-
-#[derive(Debug)]
-struct LineNumberLayout {
-    segments: SmallVec<[LineNumberSegment; 1]>,
-}
-
-struct ColoredRange<T> {
-    start: T,
-    end: T,
-    color: Hsla,
-}
-
-impl Along for ScrollbarAxes {
-    type Unit = bool;
-
-    fn along(&self, axis: ScrollbarAxis) -> Self::Unit {
-        match axis {
-            ScrollbarAxis::Horizontal => self.horizontal,
-            ScrollbarAxis::Vertical => self.vertical,
-        }
-    }
-
-    fn apply_along(&self, axis: ScrollbarAxis, f: impl FnOnce(Self::Unit) -> Self::Unit) -> Self {
-        match axis {
-            ScrollbarAxis::Horizontal => ScrollbarAxes {
-                horizontal: f(self.horizontal),
-                vertical: self.vertical,
-            },
-            ScrollbarAxis::Vertical => ScrollbarAxes {
-                horizontal: self.horizontal,
-                vertical: f(self.vertical),
-            },
-        }
-    }
-}
-
-#[derive(Clone)]
-struct EditorScrollbars {
-    pub vertical: Option<ScrollbarLayout>,
-    pub horizontal: Option<ScrollbarLayout>,
-    pub visible: bool,
-}
-
-impl EditorScrollbars {
-    pub fn from_scrollbar_axes(
-        show_scrollbar: ScrollbarAxes,
-        layout_information: &ScrollbarLayoutInformation,
-        content_offset: gpui::Point<Pixels>,
-        scroll_position: gpui::Point<f64>,
-        scrollbar_width: Pixels,
-        right_margin: Pixels,
-        editor_width: Pixels,
-        show_scrollbars: bool,
-        scrollbar_state: Option<&ActiveScrollbarState>,
-        window: &mut Window,
-    ) -> Self {
-        let ScrollbarLayoutInformation {
-            editor_bounds,
-            scroll_range,
-            glyph_grid_cell,
-        } = layout_information;
-
-        let viewport_size = size(editor_width, editor_bounds.size.height);
-
-        let scrollbar_bounds_for = |axis: ScrollbarAxis| match axis {
-            ScrollbarAxis::Horizontal => Bounds::from_corner_and_size(
-                Corner::BottomLeft,
-                editor_bounds.bottom_left(),
-                size(
-                    // The horizontal viewport size differs from the space available for the
-                    // horizontal scrollbar, so we have to manually stitch it together here.
-                    editor_bounds.size.width - right_margin,
-                    scrollbar_width,
-                ),
-            ),
-            ScrollbarAxis::Vertical => Bounds::from_corner_and_size(
-                Corner::TopRight,
-                editor_bounds.top_right(),
-                size(scrollbar_width, viewport_size.height),
-            ),
-        };
-
-        let mut create_scrollbar_layout = |axis| {
-            let viewport_size = viewport_size.along(axis);
-            let scroll_range = scroll_range.along(axis);
-
-            // We always want a vertical scrollbar track for scrollbar diagnostic visibility.
-            (show_scrollbar.along(axis)
-                && (axis == ScrollbarAxis::Vertical || scroll_range > viewport_size))
-                .then(|| {
-                    ScrollbarLayout::new(
-                        window.insert_hitbox(scrollbar_bounds_for(axis), HitboxBehavior::Normal),
-                        viewport_size,
-                        scroll_range,
-                        glyph_grid_cell.along(axis),
-                        content_offset.along(axis),
-                        scroll_position.along(axis),
-                        show_scrollbars,
-                        axis,
-                    )
-                    .with_thumb_state(
-                        scrollbar_state.and_then(|state| state.thumb_state_for_axis(axis)),
-                    )
-                })
-        };
-
-        Self {
-            vertical: create_scrollbar_layout(ScrollbarAxis::Vertical),
-            horizontal: create_scrollbar_layout(ScrollbarAxis::Horizontal),
-            visible: show_scrollbars,
-        }
-    }
-
-    pub fn iter_scrollbars(&self) -> impl Iterator<Item = (&ScrollbarLayout, ScrollbarAxis)> + '_ {
-        [
-            (&self.vertical, ScrollbarAxis::Vertical),
-            (&self.horizontal, ScrollbarAxis::Horizontal),
-        ]
-        .into_iter()
-        .filter_map(|(scrollbar, axis)| scrollbar.as_ref().map(|s| (s, axis)))
-    }
-
-    /// Returns the currently hovered scrollbar axis, if any.
-    pub fn get_hovered_axis(&self, window: &Window) -> Option<(&ScrollbarLayout, ScrollbarAxis)> {
-        self.iter_scrollbars()
-            .find(|s| s.0.hitbox.is_hovered(window))
-    }
-}
-
-#[derive(Clone)]
-struct ScrollbarLayout {
-    hitbox: Hitbox,
-    visible_range: Range<ScrollOffset>,
-    text_unit_size: Pixels,
-    thumb_bounds: Option<Bounds<Pixels>>,
-    thumb_state: ScrollbarThumbState,
-}
-
-impl ScrollbarLayout {
-    const BORDER_WIDTH: Pixels = px(1.0);
-    const LINE_MARKER_HEIGHT: Pixels = px(2.0);
-    const MIN_MARKER_HEIGHT: Pixels = px(5.0);
-    const MIN_THUMB_SIZE: Pixels = px(25.0);
-
-    fn new(
-        scrollbar_track_hitbox: Hitbox,
-        viewport_size: Pixels,
-        scroll_range: Pixels,
-        glyph_space: Pixels,
-        content_offset: Pixels,
-        scroll_position: ScrollOffset,
-        show_thumb: bool,
-        axis: ScrollbarAxis,
-    ) -> Self {
-        let track_bounds = scrollbar_track_hitbox.bounds;
-        // The length of the track available to the scrollbar thumb. We deliberately
-        // exclude the content size here so that the thumb aligns with the content.
-        let track_length = track_bounds.size.along(axis) - content_offset;
-
-        Self::new_with_hitbox_and_track_length(
-            scrollbar_track_hitbox,
-            track_length,
-            viewport_size,
-            scroll_range.into(),
-            glyph_space,
-            content_offset.into(),
-            scroll_position,
-            show_thumb,
-            axis,
-        )
-    }
-
-    fn for_minimap(
-        minimap_track_hitbox: Hitbox,
-        visible_lines: f64,
-        total_editor_lines: f64,
-        minimap_line_height: Pixels,
-        scroll_position: ScrollOffset,
-        minimap_scroll_top: ScrollOffset,
-        show_thumb: bool,
-    ) -> Self {
-        // The scrollbar thumb size is calculated as
-        // (visible_content/total_content) × scrollbar_track_length.
-        //
-        // For the minimap's thumb layout, we leverage this by setting the
-        // scrollbar track length to the entire document size (using minimap line
-        // height). This creates a thumb that exactly represents the editor
-        // viewport scaled to minimap proportions.
-        //
-        // We adjust the thumb position relative to `minimap_scroll_top` to
-        // accommodate for the deliberately oversized track.
-        //
-        // This approach ensures that the minimap thumb accurately reflects the
-        // editor's current scroll position whilst nicely synchronizing the minimap
-        // thumb and scrollbar thumb.
-        let scroll_range = total_editor_lines * f64::from(minimap_line_height);
-        let viewport_size = visible_lines * f64::from(minimap_line_height);
-
-        let track_top_offset = -minimap_scroll_top * f64::from(minimap_line_height);
-
-        Self::new_with_hitbox_and_track_length(
-            minimap_track_hitbox,
-            Pixels::from(scroll_range),
-            Pixels::from(viewport_size),
-            scroll_range,
-            minimap_line_height,
-            track_top_offset,
-            scroll_position,
-            show_thumb,
-            ScrollbarAxis::Vertical,
-        )
-    }
-
-    fn new_with_hitbox_and_track_length(
-        scrollbar_track_hitbox: Hitbox,
-        track_length: Pixels,
-        viewport_size: Pixels,
-        scroll_range: f64,
-        glyph_space: Pixels,
-        content_offset: ScrollOffset,
-        scroll_position: ScrollOffset,
-        show_thumb: bool,
-        axis: ScrollbarAxis,
-    ) -> Self {
-        let text_units_per_page = viewport_size.to_f64() / glyph_space.to_f64();
-        let visible_range = scroll_position..scroll_position + text_units_per_page;
-        let total_text_units = scroll_range / glyph_space.to_f64();
-
-        let thumb_percentage = text_units_per_page / total_text_units;
-        let thumb_size = Pixels::from(ScrollOffset::from(track_length) * thumb_percentage)
-            .max(ScrollbarLayout::MIN_THUMB_SIZE)
-            .min(track_length);
-
-        let text_unit_divisor = (total_text_units - text_units_per_page).max(0.);
-
-        let content_larger_than_viewport = text_unit_divisor > 0.;
-
-        let text_unit_size = if content_larger_than_viewport {
-            Pixels::from(ScrollOffset::from(track_length - thumb_size) / text_unit_divisor)
-        } else {
-            glyph_space
-        };
-
-        let thumb_bounds = (show_thumb && content_larger_than_viewport).then(|| {
-            Self::thumb_bounds(
-                &scrollbar_track_hitbox,
-                content_offset,
-                visible_range.start,
-                text_unit_size,
-                thumb_size,
-                axis,
-            )
-        });
-
-        ScrollbarLayout {
-            hitbox: scrollbar_track_hitbox,
-            visible_range,
-            text_unit_size,
-            thumb_bounds,
-            thumb_state: Default::default(),
-        }
-    }
-
-    fn with_thumb_state(self, thumb_state: Option<ScrollbarThumbState>) -> Self {
-        if let Some(thumb_state) = thumb_state {
-            Self {
-                thumb_state,
-                ..self
-            }
-        } else {
-            self
-        }
-    }
-
-    fn thumb_bounds(
-        scrollbar_track: &Hitbox,
-        content_offset: f64,
-        visible_range_start: f64,
-        text_unit_size: Pixels,
-        thumb_size: Pixels,
-        axis: ScrollbarAxis,
-    ) -> Bounds<Pixels> {
-        let thumb_origin = scrollbar_track.origin.apply_along(axis, |origin| {
-            origin
-                + Pixels::from(
-                    content_offset + visible_range_start * ScrollOffset::from(text_unit_size),
-                )
-        });
-        Bounds::new(
-            thumb_origin,
-            scrollbar_track.size.apply_along(axis, |_| thumb_size),
-        )
-    }
-
-    fn thumb_hovered(&self, position: &gpui::Point<Pixels>) -> bool {
-        self.thumb_bounds
-            .is_some_and(|bounds| bounds.contains(position))
-    }
-
-    fn marker_quads_for_ranges(
-        &self,
-        row_ranges: impl IntoIterator<Item = ColoredRange<DisplayRow>>,
-        column: Option<usize>,
-    ) -> Vec<PaintQuad> {
-        struct MinMax {
-            min: Pixels,
-            max: Pixels,
-        }
-        let (x_range, height_limit) = if let Some(column) = column {
-            let column_width = ((self.hitbox.size.width - Self::BORDER_WIDTH) / 3.0).floor();
-            let start = Self::BORDER_WIDTH + (column as f32 * column_width);
-            let end = start + column_width;
-            (
-                Range { start, end },
-                MinMax {
-                    min: Self::MIN_MARKER_HEIGHT,
-                    max: px(f32::MAX),
-                },
-            )
-        } else {
-            (
-                Range {
-                    start: Self::BORDER_WIDTH,
-                    end: self.hitbox.size.width,
-                },
-                MinMax {
-                    min: Self::LINE_MARKER_HEIGHT,
-                    max: Self::LINE_MARKER_HEIGHT,
-                },
-            )
-        };
-
-        let row_to_y = |row: DisplayRow| row.as_f64() as f32 * self.text_unit_size;
-        let mut pixel_ranges = row_ranges
-            .into_iter()
-            .map(|range| {
-                let start_y = row_to_y(range.start);
-                let end_y = row_to_y(range.end)
-                    + self
-                        .text_unit_size
-                        .max(height_limit.min)
-                        .min(height_limit.max);
-                ColoredRange {
-                    start: start_y,
-                    end: end_y,
-                    color: range.color,
-                }
-            })
-            .peekable();
-
-        let mut quads = Vec::new();
-        while let Some(mut pixel_range) = pixel_ranges.next() {
-            while let Some(next_pixel_range) = pixel_ranges.peek() {
-                if pixel_range.end >= next_pixel_range.start - px(1.0)
-                    && pixel_range.color == next_pixel_range.color
-                {
-                    pixel_range.end = next_pixel_range.end.max(pixel_range.end);
-                    pixel_ranges.next();
-                } else {
-                    break;
-                }
-            }
-
-            let bounds = Bounds::from_corners(
-                point(x_range.start, pixel_range.start),
-                point(x_range.end, pixel_range.end),
-            );
-            quads.push(quad(
-                bounds,
-                Corners::default(),
-                pixel_range.color,
-                Edges::default(),
-                Hsla::transparent_black(),
-                BorderStyle::default(),
-            ));
-        }
-
-        quads
-    }
-}
-
-struct MinimapLayout {
-    pub minimap: AnyElement,
-    pub thumb_layout: ScrollbarLayout,
-    pub minimap_scroll_top: ScrollOffset,
-    pub minimap_line_height: Pixels,
-    pub thumb_border_style: MinimapThumbBorder,
-    pub max_scroll_top: ScrollOffset,
-}
-
-impl MinimapLayout {
-    /// The minimum width of the minimap in columns. If the minimap is smaller than this, it will be hidden.
-    const MINIMAP_MIN_WIDTH_COLUMNS: f32 = 20.;
-    /// The minimap width as a percentage of the editor width.
-    const MINIMAP_WIDTH_PCT: f32 = 0.15;
-    /// Calculates the scroll top offset the minimap editor has to have based on the
-    /// current scroll progress.
-    fn calculate_minimap_top_offset(
-        document_lines: f64,
-        visible_editor_lines: f64,
-        visible_minimap_lines: f64,
-        scroll_position: f64,
-    ) -> ScrollOffset {
-        let non_visible_document_lines = (document_lines - visible_editor_lines).max(0.);
-        if non_visible_document_lines == 0. {
-            0.
-        } else {
-            let scroll_percentage = (scroll_position / non_visible_document_lines).clamp(0., 1.);
-            scroll_percentage * (document_lines - visible_minimap_lines).max(0.)
-        }
-    }
-}
-
-struct CreaseTrailerLayout {
-    element: AnyElement,
-    bounds: Bounds<Pixels>,
-}
-
-pub(crate) struct PositionMap {
-    pub size: Size<Pixels>,
-    pub line_height: Pixels,
-    pub scroll_position: gpui::Point<ScrollOffset>,
-    pub scroll_pixel_position: gpui::Point<ScrollPixelOffset>,
-    pub scroll_max: gpui::Point<ScrollOffset>,
-    pub em_width: Pixels,
-    pub em_advance: Pixels,
-    pub visible_row_range: Range<DisplayRow>,
-    pub line_layouts: Vec<LineWithInvisibles>,
-    pub snapshot: EditorSnapshot,
-    pub text_hitbox: Hitbox,
-    pub gutter_hitbox: Hitbox,
-    pub inline_blame_bounds: Option<(Bounds<Pixels>, BufferId, BlameEntry)>,
-    pub display_hunks: Vec<(DisplayDiffHunk, Option<Hitbox>)>,
-    pub diff_hunk_control_bounds: Vec<(DisplayRow, Bounds<Pixels>)>,
-}
-
-#[derive(Debug, Copy, Clone)]
-pub struct PointForPosition {
-    pub previous_valid: DisplayPoint,
-    pub next_valid: DisplayPoint,
-    pub exact_unclipped: DisplayPoint,
-    pub column_overshoot_after_line_end: u32,
-}
-
-impl PointForPosition {
-    pub fn as_valid(&self) -> Option<DisplayPoint> {
-        if self.previous_valid == self.exact_unclipped && self.next_valid == self.exact_unclipped {
-            Some(self.previous_valid)
-        } else {
-            None
-        }
-    }
-
-    pub fn intersects_selection(&self, selection: &Selection<DisplayPoint>) -> bool {
-        let Some(valid_point) = self.as_valid() else {
-            return false;
-        };
-        let range = selection.range();
-
-        let candidate_row = valid_point.row();
-        let candidate_col = valid_point.column();
-
-        let start_row = range.start.row();
-        let start_col = range.start.column();
-        let end_row = range.end.row();
-        let end_col = range.end.column();
-
-        if candidate_row < start_row || candidate_row > end_row {
-            false
-        } else if start_row == end_row {
-            candidate_col >= start_col && candidate_col < end_col
-        } else if candidate_row == start_row {
-            candidate_col >= start_col
-        } else if candidate_row == end_row {
-            candidate_col < end_col
-        } else {
-            true
-        }
-    }
-}
-
-impl PositionMap {
-    pub(crate) fn point_for_position(&self, position: gpui::Point<Pixels>) -> PointForPosition {
-        let text_bounds = self.text_hitbox.bounds;
-        let scroll_position = self.snapshot.scroll_position();
-        let position = position - text_bounds.origin;
-        let y = position.y.max(px(0.)).min(self.size.height);
-        let x = position.x + (scroll_position.x as f32 * self.em_advance);
-        let row = ((y / self.line_height) as f64 + scroll_position.y) as u32;
-
-        let (column, x_overshoot_after_line_end) = if let Some(line) = self
-            .line_layouts
-            .get(row as usize - scroll_position.y as usize)
-        {
-            if let Some(ix) = line.index_for_x(x) {
-                (ix as u32, px(0.))
-            } else {
-                (line.len as u32, px(0.).max(x - line.width))
-            }
-        } else {
-            (0, x)
-        };
-
-        let mut exact_unclipped = DisplayPoint::new(DisplayRow(row), column);
-        let previous_valid = self.snapshot.clip_point(exact_unclipped, Bias::Left);
-        let next_valid = self.snapshot.clip_point(exact_unclipped, Bias::Right);
-
-        let column_overshoot_after_line_end = (x_overshoot_after_line_end / self.em_advance) as u32;
-        *exact_unclipped.column_mut() += column_overshoot_after_line_end;
-        PointForPosition {
-            previous_valid,
-            next_valid,
-            exact_unclipped,
-            column_overshoot_after_line_end,
-        }
-    }
-}
-
-struct BlockLayout {
-    id: BlockId,
-    x_offset: Pixels,
-    row: Option<DisplayRow>,
-    element: AnyElement,
-    available_space: Size<AvailableSpace>,
-    style: BlockStyle,
-    overlaps_gutter: bool,
-    is_buffer_header: bool,
-}
-
-pub fn layout_line(
-    row: DisplayRow,
-    snapshot: &EditorSnapshot,
-    style: &EditorStyle,
-    text_width: Pixels,
-    is_row_soft_wrapped: impl Copy + Fn(usize) -> bool,
-    window: &mut Window,
-    cx: &mut App,
-) -> LineWithInvisibles {
-    let chunks = snapshot.highlighted_chunks(row..row + DisplayRow(1), true, style);
-    LineWithInvisibles::from_chunks(
-        chunks,
-        style,
-        MAX_LINE_LEN,
-        1,
-        &snapshot.mode,
-        text_width,
-        is_row_soft_wrapped,
-        &[],
-        window,
-        cx,
-    )
-    .pop()
-    .unwrap()
-}
-
-#[derive(Debug)]
-pub struct IndentGuideLayout {
-    origin: gpui::Point<Pixels>,
-    length: Pixels,
-    single_indent_width: Pixels,
-    depth: u32,
-    active: bool,
-    settings: IndentGuideSettings,
-}
-
-pub struct CursorLayout {
-    origin: gpui::Point<Pixels>,
-    block_width: Pixels,
-    line_height: Pixels,
-    color: Hsla,
-    shape: CursorShape,
-    block_text: Option<ShapedLine>,
-    cursor_name: Option<AnyElement>,
-}
-
-#[derive(Debug)]
-pub struct CursorName {
-    string: SharedString,
-    color: Hsla,
-    is_top_row: bool,
-}
-
-impl CursorLayout {
-    pub fn new(
-        origin: gpui::Point<Pixels>,
-        block_width: Pixels,
-        line_height: Pixels,
-        color: Hsla,
-        shape: CursorShape,
-        block_text: Option<ShapedLine>,
-    ) -> CursorLayout {
-        CursorLayout {
-            origin,
-            block_width,
-            line_height,
-            color,
-            shape,
-            block_text,
-            cursor_name: None,
-        }
-    }
-
-    pub fn bounding_rect(&self, origin: gpui::Point<Pixels>) -> Bounds<Pixels> {
-        Bounds {
-            origin: self.origin + origin,
-            size: size(self.block_width, self.line_height),
-        }
-    }
-
-    fn bounds(&self, origin: gpui::Point<Pixels>) -> Bounds<Pixels> {
-        match self.shape {
-            CursorShape::Bar => Bounds {
-                origin: self.origin + origin,
-                size: size(px(2.0), self.line_height),
-            },
-            CursorShape::Block | CursorShape::Hollow => Bounds {
-                origin: self.origin + origin,
-                size: size(self.block_width, self.line_height),
-            },
-            CursorShape::Underline => Bounds {
-                origin: self.origin
-                    + origin
-                    + gpui::Point::new(Pixels::ZERO, self.line_height - px(2.0)),
-                size: size(self.block_width, px(2.0)),
-            },
-        }
-    }
-
-    pub fn layout(
-        &mut self,
-        origin: gpui::Point<Pixels>,
-        cursor_name: Option<CursorName>,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        if let Some(cursor_name) = cursor_name {
-            let bounds = self.bounds(origin);
-            let text_size = self.line_height / 1.5;
-
-            let name_origin = if cursor_name.is_top_row {
-                point(bounds.right() - px(1.), bounds.top())
-            } else {
-                match self.shape {
-                    CursorShape::Bar => point(
-                        bounds.right() - px(2.),
-                        bounds.top() - text_size / 2. - px(1.),
-                    ),
-                    _ => point(
-                        bounds.right() - px(1.),
-                        bounds.top() - text_size / 2. - px(1.),
-                    ),
-                }
-            };
-            let mut name_element = div()
-                .bg(self.color)
-                .text_size(text_size)
-                .px_0p5()
-                .line_height(text_size + px(2.))
-                .text_color(cursor_name.color)
-                .child(cursor_name.string)
-                .into_any_element();
-
-            name_element.prepaint_as_root(name_origin, AvailableSpace::min_size(), window, cx);
-
-            self.cursor_name = Some(name_element);
-        }
-    }
-
-    pub fn paint(&mut self, origin: gpui::Point<Pixels>, window: &mut Window, cx: &mut App) {
-        let bounds = self.bounds(origin);
-
-        //Draw background or border quad
-        let cursor = if matches!(self.shape, CursorShape::Hollow) {
-            outline(bounds, self.color, BorderStyle::Solid)
-        } else {
-            fill(bounds, self.color)
-        };
-
-        if let Some(name) = &mut self.cursor_name {
-            name.paint(window, cx);
-        }
-
-        window.paint_quad(cursor);
-
-        if let Some(block_text) = &self.block_text {
-            block_text
-                .paint(self.origin + origin, self.line_height, window, cx)
-                .log_err();
-        }
-    }
-
-    pub fn shape(&self) -> CursorShape {
-        self.shape
-    }
-}
-
-#[derive(Debug)]
-pub struct HighlightedRange {
-    pub start_y: Pixels,
-    pub line_height: Pixels,
-    pub lines: Vec<HighlightedRangeLine>,
-    pub color: Hsla,
-    pub corner_radius: Pixels,
-}
-
-#[derive(Debug)]
-pub struct HighlightedRangeLine {
-    pub start_x: Pixels,
-    pub end_x: Pixels,
-}
-
-impl HighlightedRange {
-    pub fn paint(&self, fill: bool, bounds: Bounds<Pixels>, window: &mut Window) {
-        if self.lines.len() >= 2 && self.lines[0].start_x > self.lines[1].end_x {
-            self.paint_lines(self.start_y, &self.lines[0..1], fill, bounds, window);
-            self.paint_lines(
-                self.start_y + self.line_height,
-                &self.lines[1..],
-                fill,
-                bounds,
-                window,
-            );
-        } else {
-            self.paint_lines(self.start_y, &self.lines, fill, bounds, window);
-        }
-    }
-
-    fn paint_lines(
-        &self,
-        start_y: Pixels,
-        lines: &[HighlightedRangeLine],
-        fill: bool,
-        _bounds: Bounds<Pixels>,
-        window: &mut Window,
-    ) {
-        if lines.is_empty() {
-            return;
-        }
-
-        let first_line = lines.first().unwrap();
-        let last_line = lines.last().unwrap();
-
-        let first_top_left = point(first_line.start_x, start_y);
-        let first_top_right = point(first_line.end_x, start_y);
-
-        let curve_height = point(Pixels::ZERO, self.corner_radius);
-        let curve_width = |start_x: Pixels, end_x: Pixels| {
-            let max = (end_x - start_x) / 2.;
-            let width = if max < self.corner_radius {
-                max
-            } else {
-                self.corner_radius
-            };
-
-            point(width, Pixels::ZERO)
-        };
-
-        let top_curve_width = curve_width(first_line.start_x, first_line.end_x);
-        let mut builder = if fill {
-            gpui::PathBuilder::fill()
-        } else {
-            gpui::PathBuilder::stroke(px(1.))
-        };
-        builder.move_to(first_top_right - top_curve_width);
-        builder.curve_to(first_top_right + curve_height, first_top_right);
-
-        let mut iter = lines.iter().enumerate().peekable();
-        while let Some((ix, line)) = iter.next() {
-            let bottom_right = point(line.end_x, start_y + (ix + 1) as f32 * self.line_height);
-
-            if let Some((_, next_line)) = iter.peek() {
-                let next_top_right = point(next_line.end_x, bottom_right.y);
-
-                match next_top_right.x.partial_cmp(&bottom_right.x).unwrap() {
-                    Ordering::Equal => {
-                        builder.line_to(bottom_right);
-                    }
-                    Ordering::Less => {
-                        let curve_width = curve_width(next_top_right.x, bottom_right.x);
-                        builder.line_to(bottom_right - curve_height);
-                        if self.corner_radius > Pixels::ZERO {
-                            builder.curve_to(bottom_right - curve_width, bottom_right);
-                        }
-                        builder.line_to(next_top_right + curve_width);
-                        if self.corner_radius > Pixels::ZERO {
-                            builder.curve_to(next_top_right + curve_height, next_top_right);
-                        }
-                    }
-                    Ordering::Greater => {
-                        let curve_width = curve_width(bottom_right.x, next_top_right.x);
-                        builder.line_to(bottom_right - curve_height);
-                        if self.corner_radius > Pixels::ZERO {
-                            builder.curve_to(bottom_right + curve_width, bottom_right);
-                        }
-                        builder.line_to(next_top_right - curve_width);
-                        if self.corner_radius > Pixels::ZERO {
-                            builder.curve_to(next_top_right + curve_height, next_top_right);
-                        }
-                    }
-                }
-            } else {
-                let curve_width = curve_width(line.start_x, line.end_x);
-                builder.line_to(bottom_right - curve_height);
-                if self.corner_radius > Pixels::ZERO {
-                    builder.curve_to(bottom_right - curve_width, bottom_right);
-                }
-
-                let bottom_left = point(line.start_x, bottom_right.y);
-                builder.line_to(bottom_left + curve_width);
-                if self.corner_radius > Pixels::ZERO {
-                    builder.curve_to(bottom_left - curve_height, bottom_left);
-                }
-            }
-        }
-
-        if first_line.start_x > last_line.start_x {
-            let curve_width = curve_width(last_line.start_x, first_line.start_x);
-            let second_top_left = point(last_line.start_x, start_y + self.line_height);
-            builder.line_to(second_top_left + curve_height);
-            if self.corner_radius > Pixels::ZERO {
-                builder.curve_to(second_top_left + curve_width, second_top_left);
-            }
-            let first_bottom_left = point(first_line.start_x, second_top_left.y);
-            builder.line_to(first_bottom_left - curve_width);
-            if self.corner_radius > Pixels::ZERO {
-                builder.curve_to(first_bottom_left - curve_height, first_bottom_left);
-            }
-        }
-
-        builder.line_to(first_top_left + curve_height);
-        if self.corner_radius > Pixels::ZERO {
-            builder.curve_to(first_top_left + top_curve_width, first_top_left);
-        }
-        builder.line_to(first_top_right - top_curve_width);
-
-        if let Ok(path) = builder.build() {
-            window.paint_path(path, self.color);
-        }
-    }
-}
-
-pub(crate) struct StickyHeader {
-    pub item: language::OutlineItem<Anchor>,
-    pub sticky_row: DisplayRow,
-    pub start_point: Point,
-    pub offset: ScrollOffset,
-}
-
-enum CursorPopoverType {
-    CodeContextMenu,
-    EditPrediction,
-}
-
-pub fn scale_vertical_mouse_autoscroll_delta(delta: Pixels) -> f32 {
-    (delta.pow(1.2) / 100.0).min(px(3.0)).into()
-}
-
-fn scale_horizontal_mouse_autoscroll_delta(delta: Pixels) -> f32 {
-    (delta.pow(1.2) / 300.0).into()
-}
-
-pub fn register_action<T: Action>(
-    editor: &Entity<Editor>,
-    window: &mut Window,
-    listener: impl Fn(&mut Editor, &T, &mut Window, &mut Context<Editor>) + 'static,
-) {
-    let editor = editor.clone();
-    window.on_action(TypeId::of::<T>(), move |action, phase, window, cx| {
-        let action = action.downcast_ref().unwrap();
-        if phase == DispatchPhase::Bubble {
-            editor.update(cx, |editor, cx| {
-                listener(editor, action, window, cx);
-            })
-        }
-    })
-}
-
-fn compute_auto_height_layout(
-    editor: &mut Editor,
-    min_lines: usize,
-    max_lines: Option<usize>,
-    known_dimensions: Size<Option<Pixels>>,
-    available_width: AvailableSpace,
-    window: &mut Window,
-    cx: &mut Context<Editor>,
-) -> Option<Size<Pixels>> {
-    let width = known_dimensions.width.or({
-        if let AvailableSpace::Definite(available_width) = available_width {
-            Some(available_width)
-        } else {
-            None
-        }
-    })?;
-    if let Some(height) = known_dimensions.height {
-        return Some(size(width, height));
-    }
-
-    let style = editor.style.as_ref().unwrap();
-    let font_id = window.text_system().resolve_font(&style.text.font());
-    let font_size = style.text.font_size.to_pixels(window.rem_size());
-    let line_height = style.text.line_height_in_pixels(window.rem_size());
-    let em_width = window.text_system().em_width(font_id, font_size).unwrap();
-
-    let mut snapshot = editor.snapshot(window, cx);
-    let gutter_dimensions = snapshot.gutter_dimensions(font_id, font_size, style, window, cx);
-
-    editor.gutter_dimensions = gutter_dimensions;
-    let text_width = width - gutter_dimensions.width;
-    let overscroll = size(em_width, px(0.));
-
-    let editor_width = text_width - gutter_dimensions.margin - overscroll.width - em_width;
-    if !matches!(editor.soft_wrap_mode(cx), SoftWrap::None)
-        && editor.set_wrap_width(Some(editor_width), cx)
-    {
-        snapshot = editor.snapshot(window, cx);
-    }
-
-    let scroll_height = (snapshot.max_point().row().next_row().0 as f32) * line_height;
-
-    let min_height = line_height * min_lines as f32;
-    let content_height = scroll_height.max(min_height);
-
-    let final_height = if let Some(max_lines) = max_lines {
-        let max_height = line_height * max_lines as f32;
-        content_height.min(max_height)
-    } else {
-        content_height
-    };
-
-    Some(size(width, final_height))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::{
-        Editor, MultiBuffer, SelectionEffects,
-        display_map::{BlockPlacement, BlockProperties},
-        editor_tests::{init_test, update_test_language_settings},
-    };
-    use gpui::{TestAppContext, VisualTestContext};
-    use language::language_settings;
-    use log::info;
-    use std::num::NonZeroU32;
-    use util::test::sample_text;
-
-    #[gpui::test]
-    async fn test_soft_wrap_editor_width_auto_height_editor(cx: &mut TestAppContext) {
-        init_test(cx, |_| {});
-
-        let window = cx.add_window(|window, cx| {
-            let buffer = MultiBuffer::build_simple(&"a ".to_string().repeat(100), cx);
-            let mut editor = Editor::new(
-                EditorMode::AutoHeight {
-                    min_lines: 1,
-                    max_lines: None,
-                },
-                buffer,
-                None,
-                window,
-                cx,
-            );
-            editor.set_soft_wrap_mode(language_settings::SoftWrap::EditorWidth, cx);
-            editor
-        });
-        let cx = &mut VisualTestContext::from_window(*window, cx);
-        let editor = window.root(cx).unwrap();
-        let style = cx.update(|_, cx| editor.update(cx, |editor, cx| editor.style(cx).clone()));
-
-        for x in 1..=100 {
-            let (_, state) = cx.draw(
-                Default::default(),
-                size(px(200. + 0.13 * x as f32), px(500.)),
-                |_, _| EditorElement::new(&editor, style.clone()),
-            );
-
-            assert!(
-                state.position_map.scroll_max.x == 0.,
-                "Soft wrapped editor should have no horizontal scrolling!"
-            );
-        }
-    }
-
-    #[gpui::test]
-    async fn test_soft_wrap_editor_width_full_editor(cx: &mut TestAppContext) {
-        init_test(cx, |_| {});
-
-        let window = cx.add_window(|window, cx| {
-            let buffer = MultiBuffer::build_simple(&"a ".to_string().repeat(100), cx);
-            let mut editor = Editor::new(EditorMode::full(), buffer, None, window, cx);
-            editor.set_soft_wrap_mode(language_settings::SoftWrap::EditorWidth, cx);
-            editor
-        });
-        let cx = &mut VisualTestContext::from_window(*window, cx);
-        let editor = window.root(cx).unwrap();
-        let style = cx.update(|_, cx| editor.update(cx, |editor, cx| editor.style(cx).clone()));
-
-        for x in 1..=100 {
-            let (_, state) = cx.draw(
-                Default::default(),
-                size(px(200. + 0.13 * x as f32), px(500.)),
-                |_, _| EditorElement::new(&editor, style.clone()),
-            );
-
-            assert!(
-                state.position_map.scroll_max.x == 0.,
-                "Soft wrapped editor should have no horizontal scrolling!"
-            );
-        }
-    }
-
-    #[gpui::test]
-    fn test_shape_line_numbers(cx: &mut TestAppContext) {
-        init_test(cx, |_| {});
-        let window = cx.add_window(|window, cx| {
-            let buffer = MultiBuffer::build_simple(&sample_text(6, 6, 'a'), cx);
-            Editor::new(EditorMode::full(), buffer, None, window, cx)
-        });
-
-        let editor = window.root(cx).unwrap();
-        let style = editor.update(cx, |editor, cx| editor.style(cx).clone());
-        let line_height = window
-            .update(cx, |_, window, _| {
-                style.text.line_height_in_pixels(window.rem_size())
-            })
-            .unwrap();
-        let element = EditorElement::new(&editor, style);
-        let snapshot = window
-            .update(cx, |editor, window, cx| editor.snapshot(window, cx))
-            .unwrap();
-
-        let layouts = cx
-            .update_window(*window, |_, window, cx| {
-                element.layout_line_numbers(
-                    None,
-                    GutterDimensions {
-                        left_padding: Pixels::ZERO,
-                        right_padding: Pixels::ZERO,
-                        width: px(30.0),
-                        margin: Pixels::ZERO,
-                        git_blame_entries_width: None,
-                    },
-                    line_height,
-                    gpui::Point::default(),
-                    DisplayRow(0)..DisplayRow(6),
-                    &(0..6)
-                        .map(|row| RowInfo {
-                            buffer_row: Some(row),
-                            ..Default::default()
-                        })
-                        .collect::<Vec<_>>(),
-                    &BTreeMap::default(),
-                    Some(DisplayPoint::new(DisplayRow(0), 0)),
-                    &snapshot,
-                    window,
-                    cx,
-                )
-            })
-            .unwrap();
-        assert_eq!(layouts.len(), 6);
-
-        let relative_rows = window
-            .update(cx, |editor, window, cx| {
-                let snapshot = editor.snapshot(window, cx);
-                element.calculate_relative_line_numbers(
-                    &snapshot,
-                    &(DisplayRow(0)..DisplayRow(6)),
-                    Some(DisplayRow(3)),
-                    false,
-                )
-            })
-            .unwrap();
-        assert_eq!(relative_rows[&DisplayRow(0)], 3);
-        assert_eq!(relative_rows[&DisplayRow(1)], 2);
-        assert_eq!(relative_rows[&DisplayRow(2)], 1);
-        // current line has no relative number
-        assert_eq!(relative_rows[&DisplayRow(4)], 1);
-        assert_eq!(relative_rows[&DisplayRow(5)], 2);
-
-        // works if cursor is before screen
-        let relative_rows = window
-            .update(cx, |editor, window, cx| {
-                let snapshot = editor.snapshot(window, cx);
-                element.calculate_relative_line_numbers(
-                    &snapshot,
-                    &(DisplayRow(3)..DisplayRow(6)),
-                    Some(DisplayRow(1)),
-                    false,
-                )
-            })
-            .unwrap();
-        assert_eq!(relative_rows.len(), 3);
-        assert_eq!(relative_rows[&DisplayRow(3)], 2);
-        assert_eq!(relative_rows[&DisplayRow(4)], 3);
-        assert_eq!(relative_rows[&DisplayRow(5)], 4);
-
-        // works if cursor is after screen
-        let relative_rows = window
-            .update(cx, |editor, window, cx| {
-                let snapshot = editor.snapshot(window, cx);
-                element.calculate_relative_line_numbers(
-                    &snapshot,
-                    &(DisplayRow(0)..DisplayRow(3)),
-                    Some(DisplayRow(6)),
-                    false,
-                )
-            })
-            .unwrap();
-        assert_eq!(relative_rows.len(), 3);
-        assert_eq!(relative_rows[&DisplayRow(0)], 5);
-        assert_eq!(relative_rows[&DisplayRow(1)], 4);
-        assert_eq!(relative_rows[&DisplayRow(2)], 3);
-
-        const DELETED_LINE: u32 = 3;
-        let layouts = cx
-            .update_window(*window, |_, window, cx| {
-                element.layout_line_numbers(
-                    None,
-                    GutterDimensions {
-                        left_padding: Pixels::ZERO,
-                        right_padding: Pixels::ZERO,
-                        width: px(30.0),
-                        margin: Pixels::ZERO,
-                        git_blame_entries_width: None,
-                    },
-                    line_height,
-                    gpui::Point::default(),
-                    DisplayRow(0)..DisplayRow(6),
-                    &(0..6)
-                        .map(|row| RowInfo {
-                            buffer_row: Some(row),
-                            diff_status: (row == DELETED_LINE).then(|| {
-                                DiffHunkStatus::deleted(
-                                    buffer_diff::DiffHunkSecondaryStatus::NoSecondaryHunk,
-                                )
-                            }),
-                            ..Default::default()
-                        })
-                        .collect::<Vec<_>>(),
-                    &BTreeMap::default(),
-                    Some(DisplayPoint::new(DisplayRow(0), 0)),
-                    &snapshot,
-                    window,
-                    cx,
-                )
-            })
-            .unwrap();
-        assert_eq!(layouts.len(), 5,);
-        assert!(
-            layouts.get(&MultiBufferRow(DELETED_LINE)).is_none(),
-            "Deleted line should not have a line number"
-        );
-    }
-
-    #[gpui::test]
-    fn test_shape_line_numbers_wrapping(cx: &mut TestAppContext) {
-        init_test(cx, |_| {});
-        let window = cx.add_window(|window, cx| {
-            let buffer = MultiBuffer::build_simple(&sample_text(6, 6, 'a'), cx);
-            Editor::new(EditorMode::full(), buffer, None, window, cx)
-        });
-
-        update_test_language_settings(cx, |s| {
-            s.defaults.preferred_line_length = Some(5_u32);
-            s.defaults.soft_wrap = Some(language_settings::SoftWrap::PreferredLineLength);
-        });
-
-        let editor = window.root(cx).unwrap();
-        let style = editor.update(cx, |editor, cx| editor.style(cx).clone());
-        let line_height = window
-            .update(cx, |_, window, _| {
-                style.text.line_height_in_pixels(window.rem_size())
-            })
-            .unwrap();
-        let element = EditorElement::new(&editor, style);
-        let snapshot = window
-            .update(cx, |editor, window, cx| editor.snapshot(window, cx))
-            .unwrap();
-
-        let layouts = cx
-            .update_window(*window, |_, window, cx| {
-                element.layout_line_numbers(
-                    None,
-                    GutterDimensions {
-                        left_padding: Pixels::ZERO,
-                        right_padding: Pixels::ZERO,
-                        width: px(30.0),
-                        margin: Pixels::ZERO,
-                        git_blame_entries_width: None,
-                    },
-                    line_height,
-                    gpui::Point::default(),
-                    DisplayRow(0)..DisplayRow(6),
-                    &(0..6)
-                        .map(|row| RowInfo {
-                            buffer_row: Some(row),
-                            ..Default::default()
-                        })
-                        .collect::<Vec<_>>(),
-                    &BTreeMap::default(),
-                    Some(DisplayPoint::new(DisplayRow(0), 0)),
-                    &snapshot,
-                    window,
-                    cx,
-                )
-            })
-            .unwrap();
-        assert_eq!(layouts.len(), 3);
-
-        let relative_rows = window
-            .update(cx, |editor, window, cx| {
-                let snapshot = editor.snapshot(window, cx);
-                element.calculate_relative_line_numbers(
-                    &snapshot,
-                    &(DisplayRow(0)..DisplayRow(6)),
-                    Some(DisplayRow(3)),
-                    true,
-                )
-            })
-            .unwrap();
-
-        assert_eq!(relative_rows[&DisplayRow(0)], 3);
-        assert_eq!(relative_rows[&DisplayRow(1)], 2);
-        assert_eq!(relative_rows[&DisplayRow(2)], 1);
-        // current line has no relative number
-        assert_eq!(relative_rows[&DisplayRow(4)], 1);
-        assert_eq!(relative_rows[&DisplayRow(5)], 2);
-
-        let layouts = cx
-            .update_window(*window, |_, window, cx| {
-                element.layout_line_numbers(
-                    None,
-                    GutterDimensions {
-                        left_padding: Pixels::ZERO,
-                        right_padding: Pixels::ZERO,
-                        width: px(30.0),
-                        margin: Pixels::ZERO,
-                        git_blame_entries_width: None,
-                    },
-                    line_height,
-                    gpui::Point::default(),
-                    DisplayRow(0)..DisplayRow(6),
-                    &(0..6)
-                        .map(|row| RowInfo {
-                            buffer_row: Some(row),
-                            diff_status: Some(DiffHunkStatus::deleted(
-                                buffer_diff::DiffHunkSecondaryStatus::NoSecondaryHunk,
-                            )),
-                            ..Default::default()
-                        })
-                        .collect::<Vec<_>>(),
-                    &BTreeMap::from_iter([(DisplayRow(0), LineHighlightSpec::default())]),
-                    Some(DisplayPoint::new(DisplayRow(0), 0)),
-                    &snapshot,
-                    window,
-                    cx,
-                )
-            })
-            .unwrap();
-        assert!(
-            layouts.is_empty(),
-            "Deleted lines should have no line number"
-        );
-
-        let relative_rows = window
-            .update(cx, |editor, window, cx| {
-                let snapshot = editor.snapshot(window, cx);
-                element.calculate_relative_line_numbers(
-                    &snapshot,
-                    &(DisplayRow(0)..DisplayRow(6)),
-                    Some(DisplayRow(3)),
-                    true,
-                )
-            })
-            .unwrap();
-
-        // Deleted lines should still have relative numbers
-        assert_eq!(relative_rows[&DisplayRow(0)], 3);
-        assert_eq!(relative_rows[&DisplayRow(1)], 2);
-        assert_eq!(relative_rows[&DisplayRow(2)], 1);
-        // current line, even if deleted, has no relative number
-        assert_eq!(relative_rows[&DisplayRow(4)], 1);
-        assert_eq!(relative_rows[&DisplayRow(5)], 2);
-    }
-
-    #[gpui::test]
-    async fn test_vim_visual_selections(cx: &mut TestAppContext) {
-        init_test(cx, |_| {});
-
-        let window = cx.add_window(|window, cx| {
-            let buffer = MultiBuffer::build_simple(&(sample_text(6, 6, 'a') + "\n"), cx);
-            Editor::new(EditorMode::full(), buffer, None, window, cx)
-        });
-        let cx = &mut VisualTestContext::from_window(*window, cx);
-        let editor = window.root(cx).unwrap();
-        let style = cx.update(|_, cx| editor.update(cx, |editor, cx| editor.style(cx).clone()));
-
-        window
-            .update(cx, |editor, window, cx| {
-                editor.cursor_shape = CursorShape::Block;
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.select_ranges([
-                        Point::new(0, 0)..Point::new(1, 0),
-                        Point::new(3, 2)..Point::new(3, 3),
-                        Point::new(5, 6)..Point::new(6, 0),
-                    ]);
-                });
-            })
-            .unwrap();
-
-        let (_, state) = cx.draw(
-            point(px(500.), px(500.)),
-            size(px(500.), px(500.)),
-            |_, _| EditorElement::new(&editor, style),
-        );
-
-        assert_eq!(state.selections.len(), 1);
-        let local_selections = &state.selections[0].1;
-        assert_eq!(local_selections.len(), 3);
-        // moves cursor back one line
-        assert_eq!(
-            local_selections[0].head,
-            DisplayPoint::new(DisplayRow(0), 6)
-        );
-        assert_eq!(
-            local_selections[0].range,
-            DisplayPoint::new(DisplayRow(0), 0)..DisplayPoint::new(DisplayRow(1), 0)
-        );
-
-        // moves cursor back one column
-        assert_eq!(
-            local_selections[1].range,
-            DisplayPoint::new(DisplayRow(3), 2)..DisplayPoint::new(DisplayRow(3), 3)
-        );
-        assert_eq!(
-            local_selections[1].head,
-            DisplayPoint::new(DisplayRow(3), 2)
-        );
-
-        // leaves cursor on the max point
-        assert_eq!(
-            local_selections[2].range,
-            DisplayPoint::new(DisplayRow(5), 6)..DisplayPoint::new(DisplayRow(6), 0)
-        );
-        assert_eq!(
-            local_selections[2].head,
-            DisplayPoint::new(DisplayRow(6), 0)
-        );
-
-        // active lines does not include 1 (even though the range of the selection does)
-        assert_eq!(
-            state.active_rows.keys().cloned().collect::<Vec<_>>(),
-            vec![DisplayRow(0), DisplayRow(3), DisplayRow(5), DisplayRow(6)]
-        );
-    }
-
-    #[gpui::test]
-    fn test_layout_with_placeholder_text_and_blocks(cx: &mut TestAppContext) {
-        init_test(cx, |_| {});
-
-        let window = cx.add_window(|window, cx| {
-            let buffer = MultiBuffer::build_simple("", cx);
-            Editor::new(EditorMode::full(), buffer, None, window, cx)
-        });
-        let cx = &mut VisualTestContext::from_window(*window, cx);
-        let editor = window.root(cx).unwrap();
-        let style = cx.update(|_, cx| editor.update(cx, |editor, cx| editor.style(cx).clone()));
-        window
-            .update(cx, |editor, window, cx| {
-                editor.set_placeholder_text("hello", window, cx);
-                editor.insert_blocks(
-                    [BlockProperties {
-                        style: BlockStyle::Fixed,
-                        placement: BlockPlacement::Above(Anchor::min()),
-                        height: Some(3),
-                        render: Arc::new(|cx| div().h(3. * cx.window.line_height()).into_any()),
-                        priority: 0,
-                    }],
-                    None,
-                    cx,
-                );
-
-                // Blur the editor so that it displays placeholder text.
-                window.blur();
-            })
-            .unwrap();
-
-        let (_, state) = cx.draw(
-            point(px(500.), px(500.)),
-            size(px(500.), px(500.)),
-            |_, _| EditorElement::new(&editor, style),
-        );
-        assert_eq!(state.position_map.line_layouts.len(), 4);
-        assert_eq!(state.line_numbers.len(), 1);
-        assert_eq!(
-            state
-                .line_numbers
-                .get(&MultiBufferRow(0))
-                .map(|line_number| line_number
-                    .segments
-                    .first()
-                    .unwrap()
-                    .shaped_line
-                    .text
-                    .as_ref()),
-            Some("1")
-        );
-    }
-
-    #[gpui::test]
-    fn test_all_invisibles_drawing(cx: &mut TestAppContext) {
-        const TAB_SIZE: u32 = 4;
-
-        let input_text = "\t \t|\t| a b";
-        let expected_invisibles = vec![
-            Invisible::Tab {
-                line_start_offset: 0,
-                line_end_offset: TAB_SIZE as usize,
-            },
-            Invisible::Whitespace {
-                line_offset: TAB_SIZE as usize,
-            },
-            Invisible::Tab {
-                line_start_offset: TAB_SIZE as usize + 1,
-                line_end_offset: TAB_SIZE as usize * 2,
-            },
-            Invisible::Tab {
-                line_start_offset: TAB_SIZE as usize * 2 + 1,
-                line_end_offset: TAB_SIZE as usize * 3,
-            },
-            Invisible::Whitespace {
-                line_offset: TAB_SIZE as usize * 3 + 1,
-            },
-            Invisible::Whitespace {
-                line_offset: TAB_SIZE as usize * 3 + 3,
-            },
-        ];
-        assert_eq!(
-            expected_invisibles.len(),
-            input_text
-                .chars()
-                .filter(|initial_char| initial_char.is_whitespace())
-                .count(),
-            "Hardcoded expected invisibles differ from the actual ones in '{input_text}'"
-        );
-
-        for show_line_numbers in [true, false] {
-            init_test(cx, |s| {
-                s.defaults.show_whitespaces = Some(ShowWhitespaceSetting::All);
-                s.defaults.tab_size = NonZeroU32::new(TAB_SIZE);
-            });
-
-            let actual_invisibles = collect_invisibles_from_new_editor(
-                cx,
-                EditorMode::full(),
-                input_text,
-                px(500.0),
-                show_line_numbers,
-            );
-
-            assert_eq!(expected_invisibles, actual_invisibles);
-        }
-    }
-
-    #[gpui::test]
-    fn test_invisibles_dont_appear_in_certain_editors(cx: &mut TestAppContext) {
-        init_test(cx, |s| {
-            s.defaults.show_whitespaces = Some(ShowWhitespaceSetting::All);
-            s.defaults.tab_size = NonZeroU32::new(4);
-        });
-
-        for editor_mode_without_invisibles in [
-            EditorMode::SingleLine,
-            EditorMode::AutoHeight {
-                min_lines: 1,
-                max_lines: Some(100),
-            },
-        ] {
-            for show_line_numbers in [true, false] {
-                let invisibles = collect_invisibles_from_new_editor(
-                    cx,
-                    editor_mode_without_invisibles.clone(),
-                    "\t\t\t| | a b",
-                    px(500.0),
-                    show_line_numbers,
-                );
-                assert!(
-                    invisibles.is_empty(),
-                    "For editor mode {editor_mode_without_invisibles:?} no invisibles was expected but got {invisibles:?}"
-                );
-            }
-        }
-    }
-
-    #[gpui::test]
-    fn test_wrapped_invisibles_drawing(cx: &mut TestAppContext) {
-        let tab_size = 4;
-        let input_text = "a\tbcd     ".repeat(9);
-        let repeated_invisibles = [
-            Invisible::Tab {
-                line_start_offset: 1,
-                line_end_offset: tab_size as usize,
-            },
-            Invisible::Whitespace {
-                line_offset: tab_size as usize + 3,
-            },
-            Invisible::Whitespace {
-                line_offset: tab_size as usize + 4,
-            },
-            Invisible::Whitespace {
-                line_offset: tab_size as usize + 5,
-            },
-            Invisible::Whitespace {
-                line_offset: tab_size as usize + 6,
-            },
-            Invisible::Whitespace {
-                line_offset: tab_size as usize + 7,
-            },
-        ];
-        let expected_invisibles = std::iter::once(repeated_invisibles)
-            .cycle()
-            .take(9)
-            .flatten()
-            .collect::<Vec<_>>();
-        assert_eq!(
-            expected_invisibles.len(),
-            input_text
-                .chars()
-                .filter(|initial_char| initial_char.is_whitespace())
-                .count(),
-            "Hardcoded expected invisibles differ from the actual ones in '{input_text}'"
-        );
-        info!("Expected invisibles: {expected_invisibles:?}");
-
-        init_test(cx, |_| {});
-
-        // Put the same string with repeating whitespace pattern into editors of various size,
-        // take deliberately small steps during resizing, to put all whitespace kinds near the wrap point.
-        let resize_step = 10.0;
-        let mut editor_width = 200.0;
-        while editor_width <= 1000.0 {
-            for show_line_numbers in [true, false] {
-                update_test_language_settings(cx, |s| {
-                    s.defaults.tab_size = NonZeroU32::new(tab_size);
-                    s.defaults.show_whitespaces = Some(ShowWhitespaceSetting::All);
-                    s.defaults.preferred_line_length = Some(editor_width as u32);
-                    s.defaults.soft_wrap = Some(language_settings::SoftWrap::PreferredLineLength);
-                });
-
-                let actual_invisibles = collect_invisibles_from_new_editor(
-                    cx,
-                    EditorMode::full(),
-                    &input_text,
-                    px(editor_width),
-                    show_line_numbers,
-                );
-
-                // Whatever the editor size is, ensure it has the same invisible kinds in the same order
-                // (no good guarantees about the offsets: wrapping could trigger padding and its tests should check the offsets).
-                let mut i = 0;
-                for (actual_index, actual_invisible) in actual_invisibles.iter().enumerate() {
-                    i = actual_index;
-                    match expected_invisibles.get(i) {
-                        Some(expected_invisible) => match (expected_invisible, actual_invisible) {
-                            (Invisible::Whitespace { .. }, Invisible::Whitespace { .. })
-                            | (Invisible::Tab { .. }, Invisible::Tab { .. }) => {}
-                            _ => {
-                                panic!(
-                                    "At index {i}, expected invisible {expected_invisible:?} does not match actual {actual_invisible:?} by kind. Actual invisibles: {actual_invisibles:?}"
-                                )
-                            }
-                        },
-                        None => {
-                            panic!("Unexpected extra invisible {actual_invisible:?} at index {i}")
-                        }
-                    }
-                }
-                let missing_expected_invisibles = &expected_invisibles[i + 1..];
-                assert!(
-                    missing_expected_invisibles.is_empty(),
-                    "Missing expected invisibles after index {i}: {missing_expected_invisibles:?}"
-                );
-
-                editor_width += resize_step;
-            }
-        }
-    }
-
-    fn collect_invisibles_from_new_editor(
-        cx: &mut TestAppContext,
-        editor_mode: EditorMode,
-        input_text: &str,
-        editor_width: Pixels,
-        show_line_numbers: bool,
-    ) -> Vec<Invisible> {
-        info!(
-            "Creating editor with mode {editor_mode:?}, width {}px and text '{input_text}'",
-            f32::from(editor_width)
-        );
-        let window = cx.add_window(|window, cx| {
-            let buffer = MultiBuffer::build_simple(input_text, cx);
-            Editor::new(editor_mode, buffer, None, window, cx)
-        });
-        let cx = &mut VisualTestContext::from_window(*window, cx);
-        let editor = window.root(cx).unwrap();
-
-        let style = editor.update(cx, |editor, cx| editor.style(cx).clone());
-        window
-            .update(cx, |editor, _, cx| {
-                editor.set_soft_wrap_mode(language_settings::SoftWrap::EditorWidth, cx);
-                editor.set_wrap_width(Some(editor_width), cx);
-                editor.set_show_line_numbers(show_line_numbers, cx);
-            })
-            .unwrap();
-        let (_, state) = cx.draw(
-            point(px(500.), px(500.)),
-            size(px(500.), px(500.)),
-            |_, _| EditorElement::new(&editor, style),
-        );
-        state
-            .position_map
-            .line_layouts
-            .iter()
-            .flat_map(|line_with_invisibles| &line_with_invisibles.invisibles)
-            .cloned()
-            .collect()
-    }
-
-    #[gpui::test]
-    fn test_merge_overlapping_ranges() {
-        let base_bg = Hsla::white();
-        let color1 = Hsla {
-            h: 0.0,
-            s: 0.5,
-            l: 0.5,
-            a: 0.5,
-        };
-        let color2 = Hsla {
-            h: 120.0,
-            s: 0.5,
-            l: 0.5,
-            a: 0.5,
-        };
-
-        let display_point = |col| DisplayPoint::new(DisplayRow(0), col);
-        let cols = |v: &Vec<(Range<DisplayPoint>, Hsla)>| -> Vec<(u32, u32)> {
-            v.iter()
-                .map(|(r, _)| (r.start.column(), r.end.column()))
-                .collect()
-        };
-
-        // Test overlapping ranges blend colors
-        let overlapping = vec![
-            (display_point(5)..display_point(15), color1),
-            (display_point(10)..display_point(20), color2),
-        ];
-        let result = EditorElement::merge_overlapping_ranges(overlapping, base_bg);
-        assert_eq!(cols(&result), vec![(5, 10), (10, 15), (15, 20)]);
-
-        // Test middle segment should have blended color
-        let blended = Hsla::blend(Hsla::blend(base_bg, color1), color2);
-        assert_eq!(result[1].1, blended);
-
-        // Test adjacent same-color ranges merge
-        let adjacent_same = vec![
-            (display_point(5)..display_point(10), color1),
-            (display_point(10)..display_point(15), color1),
-        ];
-        let result = EditorElement::merge_overlapping_ranges(adjacent_same, base_bg);
-        assert_eq!(cols(&result), vec![(5, 15)]);
-
-        // Test contained range splits
-        let contained = vec![
-            (display_point(5)..display_point(20), color1),
-            (display_point(10)..display_point(15), color2),
-        ];
-        let result = EditorElement::merge_overlapping_ranges(contained, base_bg);
-        assert_eq!(cols(&result), vec![(5, 10), (10, 15), (15, 20)]);
-
-        // Test multiple overlaps split at every boundary
-        let color3 = Hsla {
-            h: 240.0,
-            s: 0.5,
-            l: 0.5,
-            a: 0.5,
-        };
-        let complex = vec![
-            (display_point(5)..display_point(12), color1),
-            (display_point(8)..display_point(16), color2),
-            (display_point(10)..display_point(14), color3),
-        ];
-        let result = EditorElement::merge_overlapping_ranges(complex, base_bg);
-        assert_eq!(
-            cols(&result),
-            vec![(5, 8), (8, 10), (10, 12), (12, 14), (14, 16)]
-        );
-    }
-
-    #[gpui::test]
-    fn test_bg_segments_per_row() {
-        let base_bg = Hsla::white();
-
-        // Case A: selection spans three display rows: row 1 [5, end), full row 2, row 3 [0, 7)
-        {
-            let selection_color = Hsla {
-                h: 200.0,
-                s: 0.5,
-                l: 0.5,
-                a: 0.5,
-            };
-            let player_color = PlayerColor {
-                cursor: selection_color,
-                background: selection_color,
-                selection: selection_color,
-            };
-
-            let spanning_selection = SelectionLayout {
-                head: DisplayPoint::new(DisplayRow(3), 7),
-                cursor_shape: CursorShape::Bar,
-                is_newest: true,
-                is_local: true,
-                range: DisplayPoint::new(DisplayRow(1), 5)..DisplayPoint::new(DisplayRow(3), 7),
-                active_rows: DisplayRow(1)..DisplayRow(4),
-                user_name: None,
-            };
-
-            let selections = vec![(player_color, vec![spanning_selection])];
-            let result = EditorElement::bg_segments_per_row(
-                DisplayRow(0)..DisplayRow(5),
-                &selections,
-                &[],
-                base_bg,
-            );
-
-            assert_eq!(result.len(), 5);
-            assert!(result[0].is_empty());
-            assert_eq!(result[1].len(), 1);
-            assert_eq!(result[2].len(), 1);
-            assert_eq!(result[3].len(), 1);
-            assert!(result[4].is_empty());
-
-            assert_eq!(result[1][0].0.start, DisplayPoint::new(DisplayRow(1), 5));
-            assert_eq!(result[1][0].0.end.row(), DisplayRow(1));
-            assert_eq!(result[1][0].0.end.column(), u32::MAX);
-            assert_eq!(result[2][0].0.start, DisplayPoint::new(DisplayRow(2), 0));
-            assert_eq!(result[2][0].0.end.row(), DisplayRow(2));
-            assert_eq!(result[2][0].0.end.column(), u32::MAX);
-            assert_eq!(result[3][0].0.start, DisplayPoint::new(DisplayRow(3), 0));
-            assert_eq!(result[3][0].0.end, DisplayPoint::new(DisplayRow(3), 7));
-        }
-
-        // Case B: selection ends exactly at the start of row 3, excluding row 3
-        {
-            let selection_color = Hsla {
-                h: 120.0,
-                s: 0.5,
-                l: 0.5,
-                a: 0.5,
-            };
-            let player_color = PlayerColor {
-                cursor: selection_color,
-                background: selection_color,
-                selection: selection_color,
-            };
-
-            let selection = SelectionLayout {
-                head: DisplayPoint::new(DisplayRow(2), 0),
-                cursor_shape: CursorShape::Bar,
-                is_newest: true,
-                is_local: true,
-                range: DisplayPoint::new(DisplayRow(1), 5)..DisplayPoint::new(DisplayRow(3), 0),
-                active_rows: DisplayRow(1)..DisplayRow(3),
-                user_name: None,
-            };
-
-            let selections = vec![(player_color, vec![selection])];
-            let result = EditorElement::bg_segments_per_row(
-                DisplayRow(0)..DisplayRow(4),
-                &selections,
-                &[],
-                base_bg,
-            );
-
-            assert_eq!(result.len(), 4);
-            assert!(result[0].is_empty());
-            assert_eq!(result[1].len(), 1);
-            assert_eq!(result[2].len(), 1);
-            assert!(result[3].is_empty());
-
-            assert_eq!(result[1][0].0.start, DisplayPoint::new(DisplayRow(1), 5));
-            assert_eq!(result[1][0].0.end.row(), DisplayRow(1));
-            assert_eq!(result[1][0].0.end.column(), u32::MAX);
-            assert_eq!(result[2][0].0.start, DisplayPoint::new(DisplayRow(2), 0));
-            assert_eq!(result[2][0].0.end.row(), DisplayRow(2));
-            assert_eq!(result[2][0].0.end.column(), u32::MAX);
-        }
-    }
-
-    #[cfg(test)]
-    fn generate_test_run(len: usize, color: Hsla) -> TextRun {
-        TextRun {
-            len,
-            color,
-            ..Default::default()
-        }
-    }
-
-    #[gpui::test]
-    fn test_split_runs_by_bg_segments(cx: &mut gpui::TestAppContext) {
-        init_test(cx, |_| {});
-
-        let dx = |start: u32, end: u32| {
-            DisplayPoint::new(DisplayRow(0), start)..DisplayPoint::new(DisplayRow(0), end)
-        };
-
-        let text_color = Hsla {
-            h: 210.0,
-            s: 0.1,
-            l: 0.4,
-            a: 1.0,
-        };
-        let bg_1 = Hsla {
-            h: 30.0,
-            s: 0.6,
-            l: 0.8,
-            a: 1.0,
-        };
-        let bg_2 = Hsla {
-            h: 200.0,
-            s: 0.6,
-            l: 0.2,
-            a: 1.0,
-        };
-        let min_contrast = 45.0;
-        let adjusted_bg1 = ensure_minimum_contrast(text_color, bg_1, min_contrast);
-        let adjusted_bg2 = ensure_minimum_contrast(text_color, bg_2, min_contrast);
-
-        // Case A: single run; disjoint segments inside the run
-        {
-            let runs = vec![generate_test_run(20, text_color)];
-            let segs = vec![(dx(5, 10), bg_1), (dx(12, 16), bg_2)];
-            let out = LineWithInvisibles::split_runs_by_bg_segments(&runs, &segs, min_contrast, 0);
-            // Expected slices: [0,5) [5,10) [10,12) [12,16) [16,20)
-            assert_eq!(
-                out.iter().map(|r| r.len).collect::<Vec<_>>(),
-                vec![5, 5, 2, 4, 4]
-            );
-            assert_eq!(out[0].color, text_color);
-            assert_eq!(out[1].color, adjusted_bg1);
-            assert_eq!(out[2].color, text_color);
-            assert_eq!(out[3].color, adjusted_bg2);
-            assert_eq!(out[4].color, text_color);
-        }
-
-        // Case B: multiple runs; segment extends to end of line (u32::MAX)
-        {
-            let runs = vec![
-                generate_test_run(8, text_color),
-                generate_test_run(7, text_color),
-            ];
-            let segs = vec![(dx(6, u32::MAX), bg_1)];
-            let out = LineWithInvisibles::split_runs_by_bg_segments(&runs, &segs, min_contrast, 0);
-            // Expected slices across runs: [0,6) [6,8) | [0,7)
-            assert_eq!(out.iter().map(|r| r.len).collect::<Vec<_>>(), vec![6, 2, 7]);
-            assert_eq!(out[0].color, text_color);
-            assert_eq!(out[1].color, adjusted_bg1);
-            assert_eq!(out[2].color, adjusted_bg1);
-        }
-
-        // Case C: multi-byte characters
-        {
-            // for text: "Hello 🌍 世界!"
-            let runs = vec![
-                generate_test_run(5, text_color), // "Hello"
-                generate_test_run(6, text_color), // " 🌍 "
-                generate_test_run(6, text_color), // "世界"
-                generate_test_run(1, text_color), // "!"
-            ];
-            // selecting "🌍 世"
-            let segs = vec![(dx(6, 14), bg_1)];
-            let out = LineWithInvisibles::split_runs_by_bg_segments(&runs, &segs, min_contrast, 0);
-            // "Hello" | " " | "🌍 " | "世" | "界" | "!"
-            assert_eq!(
-                out.iter().map(|r| r.len).collect::<Vec<_>>(),
-                vec![5, 1, 5, 3, 3, 1]
-            );
-            assert_eq!(out[0].color, text_color); // "Hello"
-            assert_eq!(out[2].color, adjusted_bg1); // "🌍 "
-            assert_eq!(out[3].color, adjusted_bg1); // "世"
-            assert_eq!(out[4].color, text_color); // "界"
-            assert_eq!(out[5].color, text_color); // "!"
-        }
-
-        // Case D: split multiple consecutive text runs with segments
-        {
-            let segs = vec![
-                (dx(2, 4), bg_1),   // selecting "cd"
-                (dx(4, 8), bg_2),   // selecting "efgh"
-                (dx(9, 11), bg_1),  // selecting "jk"
-                (dx(12, 16), bg_2), // selecting "mnop"
-                (dx(18, 19), bg_1), // selecting "s"
-            ];
-
-            // for text: "abcdef"
-            let runs = vec![
-                generate_test_run(2, text_color), // ab
-                generate_test_run(4, text_color), // cdef
-            ];
-            let out = LineWithInvisibles::split_runs_by_bg_segments(&runs, &segs, min_contrast, 0);
-            // new splits "ab", "cd", "ef"
-            assert_eq!(out.iter().map(|r| r.len).collect::<Vec<_>>(), vec![2, 2, 2]);
-            assert_eq!(out[0].color, text_color);
-            assert_eq!(out[1].color, adjusted_bg1);
-            assert_eq!(out[2].color, adjusted_bg2);
-
-            // for text: "ghijklmn"
-            let runs = vec![
-                generate_test_run(3, text_color), // ghi
-                generate_test_run(2, text_color), // jk
-                generate_test_run(3, text_color), // lmn
-            ];
-            let out = LineWithInvisibles::split_runs_by_bg_segments(&runs, &segs, min_contrast, 6); // 2 + 4 from first run
-            // new splits "gh", "i", "jk", "l", "mn"
-            assert_eq!(
-                out.iter().map(|r| r.len).collect::<Vec<_>>(),
-                vec![2, 1, 2, 1, 2]
-            );
-            assert_eq!(out[0].color, adjusted_bg2);
-            assert_eq!(out[1].color, text_color);
-            assert_eq!(out[2].color, adjusted_bg1);
-            assert_eq!(out[3].color, text_color);
-            assert_eq!(out[4].color, adjusted_bg2);
-
-            // for text: "opqrs"
-            let runs = vec![
-                generate_test_run(1, text_color), // o
-                generate_test_run(4, text_color), // pqrs
-            ];
-            let out = LineWithInvisibles::split_runs_by_bg_segments(&runs, &segs, min_contrast, 14); // 6 + 3 + 2 + 3 from first two runs
-            // new splits "o", "p", "qr", "s"
-            assert_eq!(
-                out.iter().map(|r| r.len).collect::<Vec<_>>(),
-                vec![1, 1, 2, 1]
-            );
-            assert_eq!(out[0].color, adjusted_bg2);
-            assert_eq!(out[1].color, adjusted_bg2);
-            assert_eq!(out[2].color, text_color);
-            assert_eq!(out[3].color, adjusted_bg1);
-        }
-    }
-}
diff --git a/crates/editor/src/git.rs b/crates/editor/src/git.rs
deleted file mode 100644
index 080babe4c6..0000000000
--- a/crates/editor/src/git.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub mod blame;
diff --git a/crates/editor/src/git/blame.rs b/crates/editor/src/git/blame.rs
deleted file mode 100644
index 67df69aada..0000000000
--- a/crates/editor/src/git/blame.rs
+++ /dev/null
@@ -1,1233 +0,0 @@
-use crate::Editor;
-use anyhow::Result;
-use collections::HashMap;
-use futures::StreamExt;
-use git::{
-    GitHostingProviderRegistry, GitRemote, Oid,
-    blame::{Blame, BlameEntry, ParsedCommitMessage},
-    parse_git_remote_url,
-};
-use gpui::{
-    AnyElement, App, AppContext as _, Context, Entity, Hsla, ScrollHandle, Subscription, Task,
-    TextStyle, WeakEntity, Window,
-};
-use itertools::Itertools;
-use language::{Bias, BufferSnapshot, Edit};
-use markdown::Markdown;
-use multi_buffer::{MultiBuffer, RowInfo};
-use project::{
-    Project, ProjectItem as _,
-    git_store::{GitStoreEvent, Repository},
-};
-use smallvec::SmallVec;
-use std::{sync::Arc, time::Duration};
-use sum_tree::SumTree;
-use text::BufferId;
-use workspace::Workspace;
-
-#[derive(Clone, Debug, Default)]
-pub struct GitBlameEntry {
-    pub rows: u32,
-    pub blame: Option<BlameEntry>,
-}
-
-#[derive(Clone, Debug, Default)]
-pub struct GitBlameEntrySummary {
-    rows: u32,
-}
-
-impl sum_tree::Item for GitBlameEntry {
-    type Summary = GitBlameEntrySummary;
-
-    fn summary(&self, _cx: ()) -> Self::Summary {
-        GitBlameEntrySummary { rows: self.rows }
-    }
-}
-
-impl sum_tree::ContextLessSummary for GitBlameEntrySummary {
-    fn zero() -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, summary: &Self) {
-        self.rows += summary.rows;
-    }
-}
-
-impl<'a> sum_tree::Dimension<'a, GitBlameEntrySummary> for u32 {
-    fn zero(_cx: ()) -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, summary: &'a GitBlameEntrySummary, _cx: ()) {
-        *self += summary.rows;
-    }
-}
-
-struct GitBlameBuffer {
-    entries: SumTree<GitBlameEntry>,
-    buffer_snapshot: BufferSnapshot,
-    buffer_edits: text::Subscription<usize>,
-    commit_details: HashMap<Oid, ParsedCommitMessage>,
-}
-
-pub struct GitBlame {
-    project: Entity<Project>,
-    multi_buffer: WeakEntity<MultiBuffer>,
-    buffers: HashMap<BufferId, GitBlameBuffer>,
-    task: Task<Result<()>>,
-    focused: bool,
-    changed_while_blurred: bool,
-    user_triggered: bool,
-    regenerate_on_edit_task: Task<Result<()>>,
-    _regenerate_subscriptions: Vec<Subscription>,
-}
-
-pub trait BlameRenderer {
-    fn max_author_length(&self) -> usize;
-
-    fn render_blame_entry(
-        &self,
-        _: &TextStyle,
-        _: BlameEntry,
-        _: Option<ParsedCommitMessage>,
-        _: Entity<Repository>,
-        _: WeakEntity<Workspace>,
-        _: Entity<Editor>,
-        _: usize,
-        _: Hsla,
-        window: &mut Window,
-        _: &mut App,
-    ) -> Option<AnyElement>;
-
-    fn render_inline_blame_entry(
-        &self,
-        _: &TextStyle,
-        _: BlameEntry,
-        _: &mut App,
-    ) -> Option<AnyElement>;
-
-    fn render_blame_entry_popover(
-        &self,
-        _: BlameEntry,
-        _: ScrollHandle,
-        _: Option<ParsedCommitMessage>,
-        _: Entity<Markdown>,
-        _: Entity<Repository>,
-        _: WeakEntity<Workspace>,
-        _: &mut Window,
-        _: &mut App,
-    ) -> Option<AnyElement>;
-
-    fn open_blame_commit(
-        &self,
-        _: BlameEntry,
-        _: Entity<Repository>,
-        _: WeakEntity<Workspace>,
-        _: &mut Window,
-        _: &mut App,
-    );
-}
-
-impl BlameRenderer for () {
-    fn max_author_length(&self) -> usize {
-        0
-    }
-
-    fn render_blame_entry(
-        &self,
-        _: &TextStyle,
-        _: BlameEntry,
-        _: Option<ParsedCommitMessage>,
-        _: Entity<Repository>,
-        _: WeakEntity<Workspace>,
-        _: Entity<Editor>,
-        _: usize,
-        _: Hsla,
-        _: &mut Window,
-        _: &mut App,
-    ) -> Option<AnyElement> {
-        None
-    }
-
-    fn render_inline_blame_entry(
-        &self,
-        _: &TextStyle,
-        _: BlameEntry,
-        _: &mut App,
-    ) -> Option<AnyElement> {
-        None
-    }
-
-    fn render_blame_entry_popover(
-        &self,
-        _: BlameEntry,
-        _: ScrollHandle,
-        _: Option<ParsedCommitMessage>,
-        _: Entity<Markdown>,
-        _: Entity<Repository>,
-        _: WeakEntity<Workspace>,
-        _: &mut Window,
-        _: &mut App,
-    ) -> Option<AnyElement> {
-        None
-    }
-
-    fn open_blame_commit(
-        &self,
-        _: BlameEntry,
-        _: Entity<Repository>,
-        _: WeakEntity<Workspace>,
-        _: &mut Window,
-        _: &mut App,
-    ) {
-    }
-}
-
-pub(crate) struct GlobalBlameRenderer(pub Arc<dyn BlameRenderer>);
-
-impl gpui::Global for GlobalBlameRenderer {}
-
-impl GitBlame {
-    pub fn new(
-        multi_buffer: Entity<MultiBuffer>,
-        project: Entity<Project>,
-        user_triggered: bool,
-        focused: bool,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let multi_buffer_subscription = cx.subscribe(
-            &multi_buffer,
-            |git_blame, multi_buffer, event, cx| match event {
-                multi_buffer::Event::DirtyChanged => {
-                    if !multi_buffer.read(cx).is_dirty(cx) {
-                        git_blame.generate(cx);
-                    }
-                }
-                multi_buffer::Event::ExcerptsAdded { .. }
-                | multi_buffer::Event::ExcerptsEdited { .. } => git_blame.regenerate_on_edit(cx),
-                _ => {}
-            },
-        );
-
-        let project_subscription = cx.subscribe(&project, {
-            let multi_buffer = multi_buffer.downgrade();
-
-            move |git_blame, _, event, cx| {
-                if let project::Event::WorktreeUpdatedEntries(_, updated) = event {
-                    let Some(multi_buffer) = multi_buffer.upgrade() else {
-                        return;
-                    };
-                    let project_entry_id = multi_buffer
-                        .read(cx)
-                        .as_singleton()
-                        .and_then(|it| it.read(cx).entry_id(cx));
-                    if updated
-                        .iter()
-                        .any(|(_, entry_id, _)| project_entry_id == Some(*entry_id))
-                    {
-                        log::debug!("Updated buffers. Regenerating blame data...",);
-                        git_blame.generate(cx);
-                    }
-                }
-            }
-        });
-
-        let git_store = project.read(cx).git_store().clone();
-        let git_store_subscription =
-            cx.subscribe(&git_store, move |this, _, event, cx| match event {
-                GitStoreEvent::RepositoryUpdated(_, _, _)
-                | GitStoreEvent::RepositoryAdded
-                | GitStoreEvent::RepositoryRemoved(_) => {
-                    log::debug!("Status of git repositories updated. Regenerating blame data...",);
-                    this.generate(cx);
-                }
-                _ => {}
-            });
-
-        let mut this = Self {
-            project,
-            multi_buffer: multi_buffer.downgrade(),
-            buffers: HashMap::default(),
-            user_triggered,
-            focused,
-            changed_while_blurred: false,
-            task: Task::ready(Ok(())),
-            regenerate_on_edit_task: Task::ready(Ok(())),
-            _regenerate_subscriptions: vec![
-                multi_buffer_subscription,
-                project_subscription,
-                git_store_subscription,
-            ],
-        };
-        this.generate(cx);
-        this
-    }
-
-    pub fn repository(&self, cx: &App, id: BufferId) -> Option<Entity<Repository>> {
-        self.project
-            .read(cx)
-            .git_store()
-            .read(cx)
-            .repository_and_path_for_buffer_id(id, cx)
-            .map(|(repo, _)| repo)
-    }
-
-    pub fn has_generated_entries(&self) -> bool {
-        !self.buffers.is_empty()
-    }
-
-    pub fn details_for_entry(
-        &self,
-        buffer: BufferId,
-        entry: &BlameEntry,
-    ) -> Option<ParsedCommitMessage> {
-        self.buffers
-            .get(&buffer)?
-            .commit_details
-            .get(&entry.sha)
-            .cloned()
-    }
-
-    pub fn blame_for_rows<'a>(
-        &'a mut self,
-        rows: &'a [RowInfo],
-        cx: &'a mut App,
-    ) -> impl Iterator<Item = Option<(BufferId, BlameEntry)>> + use<'a> {
-        rows.iter().map(move |info| {
-            let buffer_id = info.buffer_id?;
-            self.sync(cx, buffer_id);
-
-            let buffer_row = info.buffer_row?;
-            let mut cursor = self.buffers.get(&buffer_id)?.entries.cursor::<u32>(());
-            cursor.seek_forward(&buffer_row, Bias::Right);
-            Some((buffer_id, cursor.item()?.blame.clone()?))
-        })
-    }
-
-    pub fn max_author_length(&mut self, cx: &mut App) -> usize {
-        let mut max_author_length = 0;
-        self.sync_all(cx);
-
-        for buffer in self.buffers.values() {
-            for entry in buffer.entries.iter() {
-                let author_len = entry
-                    .blame
-                    .as_ref()
-                    .and_then(|entry| entry.author.as_ref())
-                    .map(|author| author.len());
-                if let Some(author_len) = author_len
-                    && author_len > max_author_length
-                {
-                    max_author_length = author_len;
-                }
-            }
-        }
-
-        max_author_length
-    }
-
-    pub fn blur(&mut self, _: &mut Context<Self>) {
-        self.focused = false;
-    }
-
-    pub fn focus(&mut self, cx: &mut Context<Self>) {
-        if self.focused {
-            return;
-        }
-        self.focused = true;
-        if self.changed_while_blurred {
-            self.changed_while_blurred = false;
-            self.generate(cx);
-        }
-    }
-
-    fn sync_all(&mut self, cx: &mut App) {
-        let Some(multi_buffer) = self.multi_buffer.upgrade() else {
-            return;
-        };
-        multi_buffer
-            .read(cx)
-            .excerpt_buffer_ids()
-            .into_iter()
-            .for_each(|id| self.sync(cx, id));
-    }
-
-    fn sync(&mut self, cx: &mut App, buffer_id: BufferId) {
-        let Some(blame_buffer) = self.buffers.get_mut(&buffer_id) else {
-            return;
-        };
-        let Some(buffer) = self
-            .multi_buffer
-            .upgrade()
-            .and_then(|multi_buffer| multi_buffer.read(cx).buffer(buffer_id))
-        else {
-            return;
-        };
-        let edits = blame_buffer.buffer_edits.consume();
-        let new_snapshot = buffer.read(cx).snapshot();
-
-        let mut row_edits = edits
-            .into_iter()
-            .map(|edit| {
-                let old_point_range = blame_buffer.buffer_snapshot.offset_to_point(edit.old.start)
-                    ..blame_buffer.buffer_snapshot.offset_to_point(edit.old.end);
-                let new_point_range = new_snapshot.offset_to_point(edit.new.start)
-                    ..new_snapshot.offset_to_point(edit.new.end);
-
-                if old_point_range.start.column
-                    == blame_buffer
-                        .buffer_snapshot
-                        .line_len(old_point_range.start.row)
-                    && (new_snapshot.chars_at(edit.new.start).next() == Some('\n')
-                        || blame_buffer
-                            .buffer_snapshot
-                            .line_len(old_point_range.end.row)
-                            == 0)
-                {
-                    Edit {
-                        old: old_point_range.start.row + 1..old_point_range.end.row + 1,
-                        new: new_point_range.start.row + 1..new_point_range.end.row + 1,
-                    }
-                } else if old_point_range.start.column == 0
-                    && old_point_range.end.column == 0
-                    && new_point_range.end.column == 0
-                {
-                    Edit {
-                        old: old_point_range.start.row..old_point_range.end.row,
-                        new: new_point_range.start.row..new_point_range.end.row,
-                    }
-                } else {
-                    Edit {
-                        old: old_point_range.start.row..old_point_range.end.row + 1,
-                        new: new_point_range.start.row..new_point_range.end.row + 1,
-                    }
-                }
-            })
-            .peekable();
-
-        let mut new_entries = SumTree::default();
-        let mut cursor = blame_buffer.entries.cursor::<u32>(());
-
-        while let Some(mut edit) = row_edits.next() {
-            while let Some(next_edit) = row_edits.peek() {
-                if edit.old.end >= next_edit.old.start {
-                    edit.old.end = next_edit.old.end;
-                    edit.new.end = next_edit.new.end;
-                    row_edits.next();
-                } else {
-                    break;
-                }
-            }
-
-            new_entries.append(cursor.slice(&edit.old.start, Bias::Right), ());
-
-            if edit.new.start > new_entries.summary().rows {
-                new_entries.push(
-                    GitBlameEntry {
-                        rows: edit.new.start - new_entries.summary().rows,
-                        blame: cursor.item().and_then(|entry| entry.blame.clone()),
-                    },
-                    (),
-                );
-            }
-
-            cursor.seek(&edit.old.end, Bias::Right);
-            if !edit.new.is_empty() {
-                new_entries.push(
-                    GitBlameEntry {
-                        rows: edit.new.len() as u32,
-                        blame: None,
-                    },
-                    (),
-                );
-            }
-
-            let old_end = cursor.end();
-            if row_edits
-                .peek()
-                .is_none_or(|next_edit| next_edit.old.start >= old_end)
-                && let Some(entry) = cursor.item()
-            {
-                if old_end > edit.old.end {
-                    new_entries.push(
-                        GitBlameEntry {
-                            rows: cursor.end() - edit.old.end,
-                            blame: entry.blame.clone(),
-                        },
-                        (),
-                    );
-                }
-
-                cursor.next();
-            }
-        }
-        new_entries.append(cursor.suffix(), ());
-        drop(cursor);
-
-        blame_buffer.buffer_snapshot = new_snapshot;
-        blame_buffer.entries = new_entries;
-    }
-
-    #[cfg(test)]
-    fn check_invariants(&mut self, cx: &mut Context<Self>) {
-        self.sync_all(cx);
-        for (&id, buffer) in &self.buffers {
-            assert_eq!(
-                buffer.entries.summary().rows,
-                self.multi_buffer
-                    .upgrade()
-                    .unwrap()
-                    .read(cx)
-                    .buffer(id)
-                    .unwrap()
-                    .read(cx)
-                    .max_point()
-                    .row
-                    + 1
-            );
-        }
-    }
-
-    fn generate(&mut self, cx: &mut Context<Self>) {
-        if !self.focused {
-            self.changed_while_blurred = true;
-            return;
-        }
-        let blame = self.project.update(cx, |project, cx| {
-            let Some(multi_buffer) = self.multi_buffer.upgrade() else {
-                return Vec::new();
-            };
-            multi_buffer
-                .read(cx)
-                .all_buffer_ids()
-                .into_iter()
-                .filter_map(|id| {
-                    let buffer = multi_buffer.read(cx).buffer(id)?;
-                    let snapshot = buffer.read(cx).snapshot();
-                    let buffer_edits = buffer.update(cx, |buffer, _| buffer.subscribe());
-
-                    let blame_buffer = project.blame_buffer(&buffer, None, cx);
-                    let remote_url = project
-                        .git_store()
-                        .read(cx)
-                        .repository_and_path_for_buffer_id(buffer.read(cx).remote_id(), cx)
-                        .and_then(|(repo, _)| {
-                            repo.read(cx)
-                                .remote_upstream_url
-                                .clone()
-                                .or(repo.read(cx).remote_origin_url.clone())
-                        });
-                    Some(
-                        async move { (id, snapshot, buffer_edits, blame_buffer.await, remote_url) },
-                    )
-                })
-                .collect::<Vec<_>>()
-        });
-        let provider_registry = GitHostingProviderRegistry::default_global(cx);
-
-        self.task = cx.spawn(async move |this, cx| {
-            let (result, errors) = cx
-                .background_spawn({
-                    async move {
-                        let blame = futures::stream::iter(blame)
-                            .buffered(4)
-                            .collect::<Vec<_>>()
-                            .await;
-                        let mut res = vec![];
-                        let mut errors = vec![];
-                        for (id, snapshot, buffer_edits, blame, remote_url) in blame {
-                            match blame {
-                                Ok(Some(Blame { entries, messages })) => {
-                                    let entries = build_blame_entry_sum_tree(
-                                        entries,
-                                        snapshot.max_point().row,
-                                    );
-                                    let commit_details = parse_commit_messages(
-                                        messages,
-                                        remote_url,
-                                        provider_registry.clone(),
-                                    )
-                                    .await;
-
-                                    res.push((
-                                        id,
-                                        snapshot,
-                                        buffer_edits,
-                                        Some(entries),
-                                        commit_details,
-                                    ));
-                                }
-                                Ok(None) => {
-                                    res.push((id, snapshot, buffer_edits, None, Default::default()))
-                                }
-                                Err(e) => errors.push(e),
-                            }
-                        }
-                        (res, errors)
-                    }
-                })
-                .await;
-
-            this.update(cx, |this, cx| {
-                this.buffers.clear();
-                for (id, snapshot, buffer_edits, entries, commit_details) in result {
-                    let Some(entries) = entries else {
-                        continue;
-                    };
-                    this.buffers.insert(
-                        id,
-                        GitBlameBuffer {
-                            buffer_edits,
-                            buffer_snapshot: snapshot,
-                            entries,
-                            commit_details,
-                        },
-                    );
-                }
-                cx.notify();
-                if !errors.is_empty() {
-                    this.project.update(cx, |_, cx| {
-                        if this.user_triggered {
-                            log::error!("failed to get git blame data: {errors:?}");
-                            let notification = errors
-                                .into_iter()
-                                .format_with(",", |e, f| f(&format_args!("{:#}", e)))
-                                .to_string();
-                            cx.emit(project::Event::Toast {
-                                notification_id: "git-blame".into(),
-                                message: notification,
-                            });
-                        } else {
-                            // If we weren't triggered by a user, we just log errors in the background, instead of sending
-                            // notifications.
-                            log::debug!("failed to get git blame data: {errors:?}");
-                        }
-                    })
-                }
-            })
-        });
-    }
-
-    fn regenerate_on_edit(&mut self, cx: &mut Context<Self>) {
-        // todo(lw): hot foreground spawn
-        self.regenerate_on_edit_task = cx.spawn(async move |this, cx| {
-            cx.background_executor()
-                .timer(REGENERATE_ON_EDIT_DEBOUNCE_INTERVAL)
-                .await;
-
-            this.update(cx, |this, cx| {
-                this.generate(cx);
-            })
-        });
-    }
-}
-
-const REGENERATE_ON_EDIT_DEBOUNCE_INTERVAL: Duration = Duration::from_secs(2);
-
-fn build_blame_entry_sum_tree(entries: Vec<BlameEntry>, max_row: u32) -> SumTree<GitBlameEntry> {
-    let mut current_row = 0;
-    let mut entries = SumTree::from_iter(
-        entries.into_iter().flat_map(|entry| {
-            let mut entries = SmallVec::<[GitBlameEntry; 2]>::new();
-
-            if entry.range.start > current_row {
-                let skipped_rows = entry.range.start - current_row;
-                entries.push(GitBlameEntry {
-                    rows: skipped_rows,
-                    blame: None,
-                });
-            }
-            entries.push(GitBlameEntry {
-                rows: entry.range.len() as u32,
-                blame: Some(entry.clone()),
-            });
-
-            current_row = entry.range.end;
-            entries
-        }),
-        (),
-    );
-
-    if max_row >= current_row {
-        entries.push(
-            GitBlameEntry {
-                rows: (max_row + 1) - current_row,
-                blame: None,
-            },
-            (),
-        );
-    }
-
-    entries
-}
-
-async fn parse_commit_messages(
-    messages: impl IntoIterator<Item = (Oid, String)>,
-    remote_url: Option<String>,
-    provider_registry: Arc<GitHostingProviderRegistry>,
-) -> HashMap<Oid, ParsedCommitMessage> {
-    let mut commit_details = HashMap::default();
-
-    let parsed_remote_url = remote_url
-        .as_deref()
-        .and_then(|remote_url| parse_git_remote_url(provider_registry, remote_url));
-
-    for (oid, message) in messages {
-        let permalink = if let Some((provider, git_remote)) = parsed_remote_url.as_ref() {
-            Some(provider.build_commit_permalink(
-                git_remote,
-                git::BuildCommitPermalinkParams {
-                    sha: oid.to_string().as_str(),
-                },
-            ))
-        } else {
-            None
-        };
-
-        let remote = parsed_remote_url
-            .as_ref()
-            .map(|(provider, remote)| GitRemote {
-                host: provider.clone(),
-                owner: remote.owner.clone().into(),
-                repo: remote.repo.clone().into(),
-            });
-
-        let pull_request = parsed_remote_url
-            .as_ref()
-            .and_then(|(provider, remote)| provider.extract_pull_request(remote, &message));
-
-        commit_details.insert(
-            oid,
-            ParsedCommitMessage {
-                message: message.into(),
-                permalink,
-                remote,
-                pull_request,
-            },
-        );
-    }
-
-    commit_details
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use git::repository::repo_path;
-    use gpui::Context;
-    use language::{Point, Rope};
-    use project::FakeFs;
-    use rand::prelude::*;
-    use serde_json::json;
-    use settings::SettingsStore;
-    use std::{cmp, env, ops::Range, path::Path};
-    use text::BufferId;
-    use unindent::Unindent as _;
-    use util::{RandomCharIter, path};
-
-    // macro_rules! assert_blame_rows {
-    //     ($blame:expr, $rows:expr, $expected:expr, $cx:expr) => {
-    //         assert_eq!(
-    //             $blame
-    //                 .blame_for_rows($rows.map(MultiBufferRow).map(Some), $cx)
-    //                 .collect::<Vec<_>>(),
-    //             $expected
-    //         );
-    //     };
-    // }
-
-    #[track_caller]
-    fn assert_blame_rows(
-        blame: &mut GitBlame,
-        buffer_id: BufferId,
-        rows: Range<u32>,
-        expected: Vec<Option<BlameEntry>>,
-        cx: &mut Context<GitBlame>,
-    ) {
-        pretty_assertions::assert_eq!(
-            blame
-                .blame_for_rows(
-                    &rows
-                        .map(|row| RowInfo {
-                            buffer_row: Some(row),
-                            buffer_id: Some(buffer_id),
-                            ..Default::default()
-                        })
-                        .collect::<Vec<_>>(),
-                    cx
-                )
-                .collect::<Vec<_>>(),
-            expected
-                .into_iter()
-                .map(|it| Some((buffer_id, it?)))
-                .collect::<Vec<_>>()
-        );
-    }
-
-    fn init_test(cx: &mut gpui::TestAppContext) {
-        cx.update(|cx| {
-            let settings = SettingsStore::test(cx);
-            cx.set_global(settings);
-
-            theme::init(theme::LoadThemes::JustBase, cx);
-
-            crate::init(cx);
-        });
-    }
-
-    #[gpui::test]
-    async fn test_blame_error_notifications(cx: &mut gpui::TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            "/my-repo",
-            json!({
-                ".git": {},
-                "file.txt": r#"
-                    irrelevant contents
-                "#
-                .unindent()
-            }),
-        )
-        .await;
-
-        // Creating a GitBlame without a corresponding blame state
-        // will result in an error.
-
-        let project = Project::test(fs, ["/my-repo".as_ref()], cx).await;
-        let buffer = project
-            .update(cx, |project, cx| {
-                project.open_local_buffer("/my-repo/file.txt", cx)
-            })
-            .await
-            .unwrap();
-        let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-
-        let blame = cx.new(|cx| GitBlame::new(buffer.clone(), project.clone(), true, true, cx));
-
-        let event = project.next_event(cx).await;
-        assert_eq!(
-            event,
-            project::Event::Toast {
-                notification_id: "git-blame".into(),
-                message: "Failed to blame \"file.txt\": failed to get blame for \"file.txt\""
-                    .to_string()
-            }
-        );
-
-        blame.update(cx, |blame, cx| {
-            assert_eq!(
-                blame
-                    .blame_for_rows(
-                        &(0..1)
-                            .map(|row| RowInfo {
-                                buffer_row: Some(row),
-                                ..Default::default()
-                            })
-                            .collect::<Vec<_>>(),
-                        cx
-                    )
-                    .collect::<Vec<_>>(),
-                vec![None]
-            );
-        });
-    }
-
-    #[gpui::test]
-    async fn test_blame_for_rows(cx: &mut gpui::TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            "/my-repo",
-            json!({
-                ".git": {},
-                "file.txt": r#"
-                    AAA Line 1
-                    BBB Line 2 - Modified 1
-                    CCC Line 3 - Modified 2
-                    modified in memory 1
-                    modified in memory 1
-                    DDD Line 4 - Modified 2
-                    EEE Line 5 - Modified 1
-                    FFF Line 6 - Modified 2
-                "#
-                .unindent()
-            }),
-        )
-        .await;
-
-        fs.set_blame_for_repo(
-            Path::new("/my-repo/.git"),
-            vec![(
-                repo_path("file.txt"),
-                Blame {
-                    entries: vec![
-                        blame_entry("1b1b1b", 0..1),
-                        blame_entry("0d0d0d", 1..2),
-                        blame_entry("3a3a3a", 2..3),
-                        blame_entry("3a3a3a", 5..6),
-                        blame_entry("0d0d0d", 6..7),
-                        blame_entry("3a3a3a", 7..8),
-                    ],
-                    ..Default::default()
-                },
-            )],
-        );
-        let project = Project::test(fs, ["/my-repo".as_ref()], cx).await;
-        let buffer = project
-            .update(cx, |project, cx| {
-                project.open_local_buffer("/my-repo/file.txt", cx)
-            })
-            .await
-            .unwrap();
-        let buffer_id = buffer.read_with(cx, |buffer, _| buffer.remote_id());
-        let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-
-        let git_blame = cx.new(|cx| GitBlame::new(buffer.clone(), project, false, true, cx));
-
-        cx.executor().run_until_parked();
-
-        git_blame.update(cx, |blame, cx| {
-            // All lines
-            pretty_assertions::assert_eq!(
-                blame
-                    .blame_for_rows(
-                        &(0..8)
-                            .map(|buffer_row| RowInfo {
-                                buffer_row: Some(buffer_row),
-                                buffer_id: Some(buffer_id),
-                                ..Default::default()
-                            })
-                            .collect::<Vec<_>>(),
-                        cx
-                    )
-                    .collect::<Vec<_>>(),
-                vec![
-                    Some((buffer_id, blame_entry("1b1b1b", 0..1))),
-                    Some((buffer_id, blame_entry("0d0d0d", 1..2))),
-                    Some((buffer_id, blame_entry("3a3a3a", 2..3))),
-                    None,
-                    None,
-                    Some((buffer_id, blame_entry("3a3a3a", 5..6))),
-                    Some((buffer_id, blame_entry("0d0d0d", 6..7))),
-                    Some((buffer_id, blame_entry("3a3a3a", 7..8))),
-                ]
-            );
-            // Subset of lines
-            pretty_assertions::assert_eq!(
-                blame
-                    .blame_for_rows(
-                        &(1..4)
-                            .map(|buffer_row| RowInfo {
-                                buffer_row: Some(buffer_row),
-                                buffer_id: Some(buffer_id),
-                                ..Default::default()
-                            })
-                            .collect::<Vec<_>>(),
-                        cx
-                    )
-                    .collect::<Vec<_>>(),
-                vec![
-                    Some((buffer_id, blame_entry("0d0d0d", 1..2))),
-                    Some((buffer_id, blame_entry("3a3a3a", 2..3))),
-                    None
-                ]
-            );
-            // Subset of lines, with some not displayed
-            pretty_assertions::assert_eq!(
-                blame
-                    .blame_for_rows(
-                        &[
-                            RowInfo {
-                                buffer_row: Some(1),
-                                buffer_id: Some(buffer_id),
-                                ..Default::default()
-                            },
-                            Default::default(),
-                            Default::default(),
-                        ],
-                        cx
-                    )
-                    .collect::<Vec<_>>(),
-                vec![Some((buffer_id, blame_entry("0d0d0d", 1..2))), None, None]
-            );
-        });
-    }
-
-    #[gpui::test]
-    async fn test_blame_for_rows_with_edits(cx: &mut gpui::TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/my-repo"),
-            json!({
-                ".git": {},
-                "file.txt": r#"
-                    Line 1
-                    Line 2
-                    Line 3
-                "#
-                .unindent()
-            }),
-        )
-        .await;
-
-        fs.set_blame_for_repo(
-            Path::new(path!("/my-repo/.git")),
-            vec![(
-                repo_path("file.txt"),
-                Blame {
-                    entries: vec![blame_entry("1b1b1b", 0..4)],
-                    ..Default::default()
-                },
-            )],
-        );
-
-        let project = Project::test(fs, [path!("/my-repo").as_ref()], cx).await;
-        let buffer = project
-            .update(cx, |project, cx| {
-                project.open_local_buffer(path!("/my-repo/file.txt"), cx)
-            })
-            .await
-            .unwrap();
-        let buffer_id = buffer.read_with(cx, |buffer, _| buffer.remote_id());
-        let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-
-        let git_blame = cx.new(|cx| GitBlame::new(buffer.clone(), project, false, true, cx));
-
-        cx.executor().run_until_parked();
-
-        git_blame.update(cx, |blame, cx| {
-            // Sanity check before edits: make sure that we get the same blame entry for all
-            // lines.
-            assert_blame_rows(
-                blame,
-                buffer_id,
-                0..4,
-                vec![
-                    Some(blame_entry("1b1b1b", 0..4)),
-                    Some(blame_entry("1b1b1b", 0..4)),
-                    Some(blame_entry("1b1b1b", 0..4)),
-                    Some(blame_entry("1b1b1b", 0..4)),
-                ],
-                cx,
-            );
-        });
-
-        // Modify a single line, at the start of the line
-        buffer.update(cx, |buffer, cx| {
-            buffer.edit([(Point::new(0, 0)..Point::new(0, 0), "X")], None, cx);
-        });
-        git_blame.update(cx, |blame, cx| {
-            assert_blame_rows(
-                blame,
-                buffer_id,
-                0..2,
-                vec![None, Some(blame_entry("1b1b1b", 0..4))],
-                cx,
-            );
-        });
-        // Modify a single line, in the middle of the line
-        buffer.update(cx, |buffer, cx| {
-            buffer.edit([(Point::new(1, 2)..Point::new(1, 2), "X")], None, cx);
-        });
-        git_blame.update(cx, |blame, cx| {
-            assert_blame_rows(
-                blame,
-                buffer_id,
-                1..4,
-                vec![
-                    None,
-                    Some(blame_entry("1b1b1b", 0..4)),
-                    Some(blame_entry("1b1b1b", 0..4)),
-                ],
-                cx,
-            );
-        });
-
-        // Before we insert a newline at the end, sanity check:
-        git_blame.update(cx, |blame, cx| {
-            assert_blame_rows(
-                blame,
-                buffer_id,
-                3..4,
-                vec![Some(blame_entry("1b1b1b", 0..4))],
-                cx,
-            );
-        });
-        // Insert a newline at the end
-        buffer.update(cx, |buffer, cx| {
-            buffer.edit([(Point::new(3, 6)..Point::new(3, 6), "\n")], None, cx);
-        });
-        // Only the new line is marked as edited:
-        git_blame.update(cx, |blame, cx| {
-            assert_blame_rows(
-                blame,
-                buffer_id,
-                3..5,
-                vec![Some(blame_entry("1b1b1b", 0..4)), None],
-                cx,
-            );
-        });
-
-        // Before we insert a newline at the start, sanity check:
-        git_blame.update(cx, |blame, cx| {
-            assert_blame_rows(
-                blame,
-                buffer_id,
-                2..3,
-                vec![Some(blame_entry("1b1b1b", 0..4))],
-                cx,
-            );
-        });
-
-        // Usage example
-        // Insert a newline at the start of the row
-        buffer.update(cx, |buffer, cx| {
-            buffer.edit([(Point::new(2, 0)..Point::new(2, 0), "\n")], None, cx);
-        });
-        // Only the new line is marked as edited:
-        git_blame.update(cx, |blame, cx| {
-            assert_blame_rows(
-                blame,
-                buffer_id,
-                2..4,
-                vec![None, Some(blame_entry("1b1b1b", 0..4))],
-                cx,
-            );
-        });
-    }
-
-    #[gpui::test(iterations = 100)]
-    async fn test_blame_random(mut rng: StdRng, cx: &mut gpui::TestAppContext) {
-        let operations = env::var("OPERATIONS")
-            .map(|i| i.parse().expect("invalid `OPERATIONS` variable"))
-            .unwrap_or(10);
-        let max_edits_per_operation = env::var("MAX_EDITS_PER_OPERATION")
-            .map(|i| {
-                i.parse()
-                    .expect("invalid `MAX_EDITS_PER_OPERATION` variable")
-            })
-            .unwrap_or(5);
-
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        let buffer_initial_text_len = rng.random_range(5..15);
-        let mut buffer_initial_text = Rope::from(
-            RandomCharIter::new(&mut rng)
-                .take(buffer_initial_text_len)
-                .collect::<String>()
-                .as_str(),
-        );
-
-        let mut newline_ixs = (0..buffer_initial_text_len).choose_multiple(&mut rng, 5);
-        newline_ixs.sort_unstable();
-        for newline_ix in newline_ixs.into_iter().rev() {
-            let newline_ix = buffer_initial_text.clip_offset(newline_ix, Bias::Right);
-            buffer_initial_text.replace(newline_ix..newline_ix, "\n");
-        }
-        log::info!("initial buffer text: {:?}", buffer_initial_text);
-
-        fs.insert_tree(
-            path!("/my-repo"),
-            json!({
-                ".git": {},
-                "file.txt": buffer_initial_text.to_string()
-            }),
-        )
-        .await;
-
-        let blame_entries = gen_blame_entries(buffer_initial_text.max_point().row, &mut rng);
-        log::info!("initial blame entries: {:?}", blame_entries);
-        fs.set_blame_for_repo(
-            Path::new(path!("/my-repo/.git")),
-            vec![(
-                repo_path("file.txt"),
-                Blame {
-                    entries: blame_entries,
-                    ..Default::default()
-                },
-            )],
-        );
-
-        let project = Project::test(fs.clone(), [path!("/my-repo").as_ref()], cx).await;
-        let buffer = project
-            .update(cx, |project, cx| {
-                project.open_local_buffer(path!("/my-repo/file.txt"), cx)
-            })
-            .await
-            .unwrap();
-        let mbuffer = cx.new(|cx| MultiBuffer::singleton(buffer.clone(), cx));
-
-        let git_blame = cx.new(|cx| GitBlame::new(mbuffer.clone(), project, false, true, cx));
-        cx.executor().run_until_parked();
-        git_blame.update(cx, |blame, cx| blame.check_invariants(cx));
-
-        for _ in 0..operations {
-            match rng.random_range(0..100) {
-                0..=19 => {
-                    log::info!("quiescing");
-                    cx.executor().run_until_parked();
-                }
-                20..=69 => {
-                    log::info!("editing buffer");
-                    buffer.update(cx, |buffer, cx| {
-                        buffer.randomly_edit(&mut rng, max_edits_per_operation, cx);
-                        log::info!("buffer text: {:?}", buffer.text());
-                    });
-
-                    let blame_entries = gen_blame_entries(
-                        buffer.read_with(cx, |buffer, _| buffer.max_point().row),
-                        &mut rng,
-                    );
-                    log::info!("regenerating blame entries: {:?}", blame_entries);
-
-                    fs.set_blame_for_repo(
-                        Path::new(path!("/my-repo/.git")),
-                        vec![(
-                            repo_path("file.txt"),
-                            Blame {
-                                entries: blame_entries,
-                                ..Default::default()
-                            },
-                        )],
-                    );
-                }
-                _ => {
-                    git_blame.update(cx, |blame, cx| blame.check_invariants(cx));
-                }
-            }
-        }
-
-        git_blame.update(cx, |blame, cx| blame.check_invariants(cx));
-    }
-
-    fn gen_blame_entries(max_row: u32, rng: &mut StdRng) -> Vec<BlameEntry> {
-        let mut last_row = 0;
-        let mut blame_entries = Vec::new();
-        for ix in 0..5 {
-            if last_row < max_row {
-                let row_start = rng.random_range(last_row..max_row);
-                let row_end = rng.random_range(row_start + 1..cmp::min(row_start + 3, max_row) + 1);
-                blame_entries.push(blame_entry(&ix.to_string(), row_start..row_end));
-                last_row = row_end;
-            } else {
-                break;
-            }
-        }
-        blame_entries
-    }
-
-    fn blame_entry(sha: &str, range: Range<u32>) -> BlameEntry {
-        BlameEntry {
-            sha: sha.parse().unwrap(),
-            range,
-            ..Default::default()
-        }
-    }
-}
diff --git a/crates/editor/src/highlight_matching_bracket.rs b/crates/editor/src/highlight_matching_bracket.rs
deleted file mode 100644
index 3ead3e2a11..0000000000
--- a/crates/editor/src/highlight_matching_bracket.rs
+++ /dev/null
@@ -1,173 +0,0 @@
-use crate::{Editor, RangeToAnchorExt};
-use gpui::{Context, HighlightStyle, Window};
-use language::CursorShape;
-use multi_buffer::MultiBufferOffset;
-use theme::ActiveTheme;
-
-enum MatchingBracketHighlight {}
-
-impl Editor {
-    #[ztracing::instrument(skip_all)]
-    pub fn refresh_matching_bracket_highlights(
-        &mut self,
-        window: &Window,
-        cx: &mut Context<Editor>,
-    ) {
-        self.clear_highlights::<MatchingBracketHighlight>(cx);
-
-        let snapshot = self.snapshot(window, cx);
-        let buffer_snapshot = snapshot.buffer_snapshot();
-        let newest_selection = self.selections.newest::<MultiBufferOffset>(&snapshot);
-        // Don't highlight brackets if the selection isn't empty
-        if !newest_selection.is_empty() {
-            return;
-        }
-
-        let head = newest_selection.head();
-        if head > buffer_snapshot.len() {
-            log::error!("bug: cursor offset is out of range while refreshing bracket highlights");
-            return;
-        }
-
-        let mut tail = head;
-        if (self.cursor_shape == CursorShape::Block || self.cursor_shape == CursorShape::Hollow)
-            && head < buffer_snapshot.len()
-        {
-            if let Some(tail_ch) = buffer_snapshot.chars_at(tail).next() {
-                tail += tail_ch.len_utf8();
-            }
-        }
-
-        if let Some((opening_range, closing_range)) =
-            buffer_snapshot.innermost_enclosing_bracket_ranges(head..tail, None)
-        {
-            self.highlight_text::<MatchingBracketHighlight>(
-                vec![
-                    opening_range.to_anchors(&buffer_snapshot),
-                    closing_range.to_anchors(&buffer_snapshot),
-                ],
-                HighlightStyle {
-                    background_color: Some(
-                        cx.theme()
-                            .colors()
-                            .editor_document_highlight_bracket_background,
-                    ),
-                    ..Default::default()
-                },
-                cx,
-            )
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::{editor_tests::init_test, test::editor_lsp_test_context::EditorLspTestContext};
-    use indoc::indoc;
-    use language::{BracketPair, BracketPairConfig, Language, LanguageConfig, LanguageMatcher};
-
-    #[gpui::test]
-    async fn test_matching_bracket_highlights(cx: &mut gpui::TestAppContext) {
-        init_test(cx, |_| {});
-
-        let mut cx = EditorLspTestContext::new(
-            Language::new(
-                LanguageConfig {
-                    name: "Rust".into(),
-                    matcher: LanguageMatcher {
-                        path_suffixes: vec!["rs".to_string()],
-                        ..Default::default()
-                    },
-                    brackets: BracketPairConfig {
-                        pairs: vec![
-                            BracketPair {
-                                start: "{".to_string(),
-                                end: "}".to_string(),
-                                close: false,
-                                surround: false,
-                                newline: true,
-                            },
-                            BracketPair {
-                                start: "(".to_string(),
-                                end: ")".to_string(),
-                                close: false,
-                                surround: false,
-                                newline: true,
-                            },
-                        ],
-                        ..Default::default()
-                    },
-                    ..Default::default()
-                },
-                Some(tree_sitter_rust::LANGUAGE.into()),
-            )
-            .with_brackets_query(indoc! {r#"
-                ("{" @open "}" @close)
-                ("(" @open ")" @close)
-                "#})
-            .unwrap(),
-            Default::default(),
-            cx,
-        )
-        .await;
-
-        // positioning cursor inside bracket highlights both
-        cx.set_state(indoc! {r#"
-            pub fn test("Test ˇargument") {
-                another_test(1, 2, 3);
-            }
-        "#});
-        cx.assert_editor_text_highlights::<MatchingBracketHighlight>(indoc! {r#"
-            pub fn test«(»"Test argument"«)» {
-                another_test(1, 2, 3);
-            }
-        "#});
-
-        cx.set_state(indoc! {r#"
-            pub fn test("Test argument") {
-                another_test(1, ˇ2, 3);
-            }
-        "#});
-        cx.assert_editor_text_highlights::<MatchingBracketHighlight>(indoc! {r#"
-            pub fn test("Test argument") {
-                another_test«(»1, 2, 3«)»;
-            }
-        "#});
-
-        cx.set_state(indoc! {r#"
-            pub fn test("Test argument") {
-                anotherˇ_test(1, 2, 3);
-            }
-        "#});
-        cx.assert_editor_text_highlights::<MatchingBracketHighlight>(indoc! {r#"
-            pub fn test("Test argument") «{»
-                another_test(1, 2, 3);
-            «}»
-        "#});
-
-        // positioning outside of brackets removes highlight
-        cx.set_state(indoc! {r#"
-            pub fˇn test("Test argument") {
-                another_test(1, 2, 3);
-            }
-        "#});
-        cx.assert_editor_text_highlights::<MatchingBracketHighlight>(indoc! {r#"
-            pub fn test("Test argument") {
-                another_test(1, 2, 3);
-            }
-        "#});
-
-        // non empty selection dismisses highlight
-        cx.set_state(indoc! {r#"
-            pub fn test("Te«st argˇ»ument") {
-                another_test(1, 2, 3);
-            }
-        "#});
-        cx.assert_editor_text_highlights::<MatchingBracketHighlight>(indoc! {r#"
-            pub fn test«("Test argument") {
-                another_test(1, 2, 3);
-            }
-        "#});
-    }
-}
diff --git a/crates/editor/src/hover_links.rs b/crates/editor/src/hover_links.rs
deleted file mode 100644
index 9d0261f00f..0000000000
--- a/crates/editor/src/hover_links.rs
+++ /dev/null
@@ -1,1709 +0,0 @@
-use crate::{
-    Anchor, Editor, EditorSettings, EditorSnapshot, FindAllReferences, GoToDefinition,
-    GoToDefinitionSplit, GoToTypeDefinition, GoToTypeDefinitionSplit, GotoDefinitionKind,
-    Navigated, PointForPosition, SelectPhase, editor_settings::GoToDefinitionFallback,
-    scroll::ScrollAmount,
-};
-use gpui::{App, AsyncWindowContext, Context, Entity, Modifiers, Task, Window, px};
-use language::{Bias, ToOffset};
-use linkify::{LinkFinder, LinkKind};
-use lsp::LanguageServerId;
-use project::{InlayId, LocationLink, Project, ResolvedPath};
-use settings::Settings;
-use std::ops::Range;
-use theme::ActiveTheme as _;
-use util::{ResultExt, TryFutureExt as _, maybe};
-
-#[derive(Debug)]
-pub struct HoveredLinkState {
-    pub last_trigger_point: TriggerPoint,
-    pub preferred_kind: GotoDefinitionKind,
-    pub symbol_range: Option<RangeInEditor>,
-    pub links: Vec<HoverLink>,
-    pub task: Option<Task<Option<()>>>,
-}
-
-#[derive(Debug, Eq, PartialEq, Clone)]
-pub enum RangeInEditor {
-    Text(Range<Anchor>),
-    Inlay(InlayHighlight),
-}
-
-impl RangeInEditor {
-    pub fn as_text_range(&self) -> Option<Range<Anchor>> {
-        match self {
-            Self::Text(range) => Some(range.clone()),
-            Self::Inlay(_) => None,
-        }
-    }
-
-    pub fn point_within_range(
-        &self,
-        trigger_point: &TriggerPoint,
-        snapshot: &EditorSnapshot,
-    ) -> bool {
-        match (self, trigger_point) {
-            (Self::Text(range), TriggerPoint::Text(point)) => {
-                let point_after_start = range.start.cmp(point, &snapshot.buffer_snapshot()).is_le();
-                point_after_start && range.end.cmp(point, &snapshot.buffer_snapshot()).is_ge()
-            }
-            (Self::Inlay(highlight), TriggerPoint::InlayHint(point, _, _)) => {
-                highlight.inlay == point.inlay
-                    && highlight.range.contains(&point.range.start)
-                    && highlight.range.contains(&point.range.end)
-            }
-            (Self::Inlay(_), TriggerPoint::Text(_))
-            | (Self::Text(_), TriggerPoint::InlayHint(_, _, _)) => false,
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub enum HoverLink {
-    Url(String),
-    File(ResolvedPath),
-    Text(LocationLink),
-    InlayHint(lsp::Location, LanguageServerId),
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct InlayHighlight {
-    pub inlay: InlayId,
-    pub inlay_position: Anchor,
-    pub range: Range<usize>,
-}
-
-#[derive(Debug, Clone, PartialEq)]
-pub enum TriggerPoint {
-    Text(Anchor),
-    InlayHint(InlayHighlight, lsp::Location, LanguageServerId),
-}
-
-impl TriggerPoint {
-    fn anchor(&self) -> &Anchor {
-        match self {
-            TriggerPoint::Text(anchor) => anchor,
-            TriggerPoint::InlayHint(inlay_range, _, _) => &inlay_range.inlay_position,
-        }
-    }
-}
-
-pub fn exclude_link_to_position(
-    buffer: &Entity<language::Buffer>,
-    current_position: &text::Anchor,
-    location: &LocationLink,
-    cx: &App,
-) -> bool {
-    // Exclude definition links that points back to cursor position.
-    // (i.e., currently cursor upon definition).
-    let snapshot = buffer.read(cx).snapshot();
-    !(buffer == &location.target.buffer
-        && current_position
-            .bias_right(&snapshot)
-            .cmp(&location.target.range.start, &snapshot)
-            .is_ge()
-        && current_position
-            .cmp(&location.target.range.end, &snapshot)
-            .is_le())
-}
-
-impl Editor {
-    pub(crate) fn update_hovered_link(
-        &mut self,
-        point_for_position: PointForPosition,
-        snapshot: &EditorSnapshot,
-        modifiers: Modifiers,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let hovered_link_modifier = Editor::is_cmd_or_ctrl_pressed(&modifiers, cx);
-        if !hovered_link_modifier || self.has_pending_selection() {
-            self.hide_hovered_link(cx);
-            return;
-        }
-
-        match point_for_position.as_valid() {
-            Some(point) => {
-                let trigger_point = TriggerPoint::Text(
-                    snapshot
-                        .buffer_snapshot()
-                        .anchor_before(point.to_offset(&snapshot.display_snapshot, Bias::Left)),
-                );
-
-                show_link_definition(modifiers.shift, self, trigger_point, snapshot, window, cx);
-            }
-            None => {
-                self.update_inlay_link_and_hover_points(
-                    snapshot,
-                    point_for_position,
-                    hovered_link_modifier,
-                    modifiers.shift,
-                    window,
-                    cx,
-                );
-            }
-        }
-    }
-
-    pub(crate) fn hide_hovered_link(&mut self, cx: &mut Context<Self>) {
-        self.hovered_link_state.take();
-        self.clear_highlights::<HoveredLinkState>(cx);
-    }
-
-    pub(crate) fn handle_click_hovered_link(
-        &mut self,
-        point: PointForPosition,
-        modifiers: Modifiers,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) {
-        let reveal_task = self.cmd_click_reveal_task(point, modifiers, window, cx);
-        cx.spawn_in(window, async move |editor, cx| {
-            let definition_revealed = reveal_task.await.log_err().unwrap_or(Navigated::No);
-            let find_references = editor
-                .update_in(cx, |editor, window, cx| {
-                    if definition_revealed == Navigated::Yes {
-                        return None;
-                    }
-                    match EditorSettings::get_global(cx).go_to_definition_fallback {
-                        GoToDefinitionFallback::None => None,
-                        GoToDefinitionFallback::FindAllReferences => {
-                            editor.find_all_references(&FindAllReferences::default(), window, cx)
-                        }
-                    }
-                })
-                .ok()
-                .flatten();
-            if let Some(find_references) = find_references {
-                find_references.await.log_err();
-            }
-        })
-        .detach();
-    }
-
-    pub fn scroll_hover(
-        &mut self,
-        amount: ScrollAmount,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> bool {
-        let selection = self.selections.newest_anchor().head();
-        let snapshot = self.snapshot(window, cx);
-
-        if let Some(popover) = self.hover_state.info_popovers.iter().find(|popover| {
-            popover
-                .symbol_range
-                .point_within_range(&TriggerPoint::Text(selection), &snapshot)
-        }) {
-            popover.scroll(amount, window, cx);
-            true
-        } else if let Some(context_menu) = self.context_menu.borrow_mut().as_mut() {
-            context_menu.scroll_aside(amount, window, cx);
-            true
-        } else {
-            false
-        }
-    }
-
-    fn cmd_click_reveal_task(
-        &mut self,
-        point: PointForPosition,
-        modifiers: Modifiers,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) -> Task<anyhow::Result<Navigated>> {
-        if let Some(hovered_link_state) = self.hovered_link_state.take() {
-            self.hide_hovered_link(cx);
-            if !hovered_link_state.links.is_empty() {
-                if !self.focus_handle.is_focused(window) {
-                    window.focus(&self.focus_handle);
-                }
-
-                // exclude links pointing back to the current anchor
-                let current_position = point
-                    .next_valid
-                    .to_point(&self.snapshot(window, cx).display_snapshot);
-                let Some((buffer, anchor)) = self
-                    .buffer()
-                    .read(cx)
-                    .text_anchor_for_position(current_position, cx)
-                else {
-                    return Task::ready(Ok(Navigated::No));
-                };
-                let links = hovered_link_state
-                    .links
-                    .into_iter()
-                    .filter(|link| {
-                        if let HoverLink::Text(location) = link {
-                            exclude_link_to_position(&buffer, &anchor, location, cx)
-                        } else {
-                            true
-                        }
-                    })
-                    .collect();
-                let split = Self::is_alt_pressed(&modifiers, cx);
-                let navigate_task = self.navigate_to_hover_links(None, links, split, window, cx);
-                self.select(SelectPhase::End, window, cx);
-                return navigate_task;
-            }
-        }
-
-        // We don't have the correct kind of link cached, set the selection on
-        // click and immediately trigger GoToDefinition.
-        self.select(
-            SelectPhase::Begin {
-                position: point.next_valid,
-                add: false,
-                click_count: 1,
-            },
-            window,
-            cx,
-        );
-
-        let navigate_task = if point.as_valid().is_some() {
-            let split = Self::is_alt_pressed(&modifiers, cx);
-            match (modifiers.shift, split) {
-                (true, true) => {
-                    self.go_to_type_definition_split(&GoToTypeDefinitionSplit, window, cx)
-                }
-                (true, false) => self.go_to_type_definition(&GoToTypeDefinition, window, cx),
-                (false, true) => self.go_to_definition_split(&GoToDefinitionSplit, window, cx),
-                (false, false) => self.go_to_definition(&GoToDefinition, window, cx),
-            }
-        } else {
-            Task::ready(Ok(Navigated::No))
-        };
-        self.select(SelectPhase::End, window, cx);
-        navigate_task
-    }
-}
-
-pub fn show_link_definition(
-    shift_held: bool,
-    editor: &mut Editor,
-    trigger_point: TriggerPoint,
-    snapshot: &EditorSnapshot,
-    window: &mut Window,
-    cx: &mut Context<Editor>,
-) {
-    let preferred_kind = match trigger_point {
-        TriggerPoint::Text(_) if !shift_held => GotoDefinitionKind::Symbol,
-        _ => GotoDefinitionKind::Type,
-    };
-
-    let (mut hovered_link_state, is_cached) =
-        if let Some(existing) = editor.hovered_link_state.take() {
-            (existing, true)
-        } else {
-            (
-                HoveredLinkState {
-                    last_trigger_point: trigger_point.clone(),
-                    symbol_range: None,
-                    preferred_kind,
-                    links: vec![],
-                    task: None,
-                },
-                false,
-            )
-        };
-
-    if editor.pending_rename.is_some() {
-        return;
-    }
-
-    let trigger_anchor = trigger_point.anchor();
-    let anchor = snapshot.buffer_snapshot().anchor_before(*trigger_anchor);
-    let Some(buffer) = editor.buffer().read(cx).buffer_for_anchor(anchor, cx) else {
-        return;
-    };
-    let Anchor {
-        excerpt_id,
-        text_anchor,
-        ..
-    } = anchor;
-    let same_kind = hovered_link_state.preferred_kind == preferred_kind
-        || hovered_link_state
-            .links
-            .first()
-            .is_some_and(|d| matches!(d, HoverLink::Url(_)));
-
-    if same_kind {
-        if is_cached && (hovered_link_state.last_trigger_point == trigger_point)
-            || hovered_link_state
-                .symbol_range
-                .as_ref()
-                .is_some_and(|symbol_range| {
-                    symbol_range.point_within_range(&trigger_point, snapshot)
-                })
-        {
-            editor.hovered_link_state = Some(hovered_link_state);
-            return;
-        }
-    } else {
-        editor.hide_hovered_link(cx)
-    }
-    let project = editor.project.clone();
-    let provider = editor.semantics_provider.clone();
-
-    let snapshot = snapshot.buffer_snapshot().clone();
-    hovered_link_state.task = Some(cx.spawn_in(window, async move |this, cx| {
-        async move {
-            let result = match &trigger_point {
-                TriggerPoint::Text(_) => {
-                    if let Some((url_range, url)) = find_url(&buffer, text_anchor, cx.clone()) {
-                        this.read_with(cx, |_, _| {
-                            let range = maybe!({
-                                let range =
-                                    snapshot.anchor_range_in_excerpt(excerpt_id, url_range)?;
-                                Some(RangeInEditor::Text(range))
-                            });
-                            (range, vec![HoverLink::Url(url)])
-                        })
-                        .ok()
-                    } else if let Some((filename_range, filename)) =
-                        find_file(&buffer, project.clone(), text_anchor, cx).await
-                    {
-                        let range = maybe!({
-                            let range =
-                                snapshot.anchor_range_in_excerpt(excerpt_id, filename_range)?;
-                            Some(RangeInEditor::Text(range))
-                        });
-
-                        Some((range, vec![HoverLink::File(filename)]))
-                    } else if let Some(provider) = provider {
-                        let task = cx.update(|_, cx| {
-                            provider.definitions(&buffer, text_anchor, preferred_kind, cx)
-                        })?;
-                        if let Some(task) = task {
-                            task.await.ok().flatten().map(|definition_result| {
-                                (
-                                    definition_result.iter().find_map(|link| {
-                                        link.origin.as_ref().and_then(|origin| {
-                                            let range = snapshot.anchor_range_in_excerpt(
-                                                excerpt_id,
-                                                origin.range.clone(),
-                                            )?;
-                                            Some(RangeInEditor::Text(range))
-                                        })
-                                    }),
-                                    definition_result.into_iter().map(HoverLink::Text).collect(),
-                                )
-                            })
-                        } else {
-                            None
-                        }
-                    } else {
-                        None
-                    }
-                }
-                TriggerPoint::InlayHint(highlight, lsp_location, server_id) => Some((
-                    Some(RangeInEditor::Inlay(highlight.clone())),
-                    vec![HoverLink::InlayHint(lsp_location.clone(), *server_id)],
-                )),
-            };
-
-            this.update(cx, |editor, cx| {
-                // Clear any existing highlights
-                editor.clear_highlights::<HoveredLinkState>(cx);
-                let Some(hovered_link_state) = editor.hovered_link_state.as_mut() else {
-                    editor.hide_hovered_link(cx);
-                    return;
-                };
-                hovered_link_state.preferred_kind = preferred_kind;
-                hovered_link_state.symbol_range = result
-                    .as_ref()
-                    .and_then(|(symbol_range, _)| symbol_range.clone());
-
-                if let Some((symbol_range, definitions)) = result {
-                    hovered_link_state.links = definitions;
-
-                    let underline_hovered_link = !hovered_link_state.links.is_empty()
-                        || hovered_link_state.symbol_range.is_some();
-
-                    if underline_hovered_link {
-                        let style = gpui::HighlightStyle {
-                            underline: Some(gpui::UnderlineStyle {
-                                thickness: px(1.),
-                                ..Default::default()
-                            }),
-                            color: Some(cx.theme().colors().link_text_hover),
-                            ..Default::default()
-                        };
-                        let highlight_range =
-                            symbol_range.unwrap_or_else(|| match &trigger_point {
-                                TriggerPoint::Text(trigger_anchor) => {
-                                    // If no symbol range returned from language server, use the surrounding word.
-                                    let (offset_range, _) =
-                                        snapshot.surrounding_word(*trigger_anchor, None);
-                                    RangeInEditor::Text(
-                                        snapshot.anchor_before(offset_range.start)
-                                            ..snapshot.anchor_after(offset_range.end),
-                                    )
-                                }
-                                TriggerPoint::InlayHint(highlight, _, _) => {
-                                    RangeInEditor::Inlay(highlight.clone())
-                                }
-                            });
-
-                        match highlight_range {
-                            RangeInEditor::Text(text_range) => editor
-                                .highlight_text::<HoveredLinkState>(vec![text_range], style, cx),
-                            RangeInEditor::Inlay(highlight) => editor
-                                .highlight_inlays::<HoveredLinkState>(vec![highlight], style, cx),
-                        }
-                    }
-                } else {
-                    editor.hide_hovered_link(cx);
-                }
-            })?;
-
-            anyhow::Ok(())
-        }
-        .log_err()
-        .await
-    }));
-
-    editor.hovered_link_state = Some(hovered_link_state);
-}
-
-pub(crate) fn find_url(
-    buffer: &Entity<language::Buffer>,
-    position: text::Anchor,
-    cx: AsyncWindowContext,
-) -> Option<(Range<text::Anchor>, String)> {
-    const LIMIT: usize = 2048;
-
-    let snapshot = buffer.read_with(&cx, |buffer, _| buffer.snapshot()).ok()?;
-
-    let offset = position.to_offset(&snapshot);
-    let mut token_start = offset;
-    let mut token_end = offset;
-    let mut found_start = false;
-    let mut found_end = false;
-
-    for ch in snapshot.reversed_chars_at(offset).take(LIMIT) {
-        if ch.is_whitespace() {
-            found_start = true;
-            break;
-        }
-        token_start -= ch.len_utf8();
-    }
-    // Check if we didn't find the starting whitespace or if we didn't reach the start of the buffer
-    if !found_start && token_start != 0 {
-        return None;
-    }
-
-    for ch in snapshot
-        .chars_at(offset)
-        .take(LIMIT - (offset - token_start))
-    {
-        if ch.is_whitespace() {
-            found_end = true;
-            break;
-        }
-        token_end += ch.len_utf8();
-    }
-    // Check if we didn't find the ending whitespace or if we read more or equal than LIMIT
-    // which at this point would happen only if we reached the end of buffer
-    if !found_end && (token_end - token_start >= LIMIT) {
-        return None;
-    }
-
-    let mut finder = LinkFinder::new();
-    finder.kinds(&[LinkKind::Url]);
-    let input = snapshot
-        .text_for_range(token_start..token_end)
-        .collect::<String>();
-
-    let relative_offset = offset - token_start;
-    for link in finder.links(&input) {
-        if link.start() <= relative_offset && link.end() >= relative_offset {
-            let range = snapshot.anchor_before(token_start + link.start())
-                ..snapshot.anchor_after(token_start + link.end());
-            return Some((range, link.as_str().to_string()));
-        }
-    }
-    None
-}
-
-pub(crate) fn find_url_from_range(
-    buffer: &Entity<language::Buffer>,
-    range: Range<text::Anchor>,
-    cx: AsyncWindowContext,
-) -> Option<String> {
-    const LIMIT: usize = 2048;
-
-    let Ok(snapshot) = buffer.read_with(&cx, |buffer, _| buffer.snapshot()) else {
-        return None;
-    };
-
-    let start_offset = range.start.to_offset(&snapshot);
-    let end_offset = range.end.to_offset(&snapshot);
-
-    let mut token_start = start_offset.min(end_offset);
-    let mut token_end = start_offset.max(end_offset);
-
-    let range_len = token_end - token_start;
-
-    if range_len >= LIMIT {
-        return None;
-    }
-
-    // Skip leading whitespace
-    for ch in snapshot.chars_at(token_start).take(range_len) {
-        if !ch.is_whitespace() {
-            break;
-        }
-        token_start += ch.len_utf8();
-    }
-
-    // Skip trailing whitespace
-    for ch in snapshot.reversed_chars_at(token_end).take(range_len) {
-        if !ch.is_whitespace() {
-            break;
-        }
-        token_end -= ch.len_utf8();
-    }
-
-    if token_start >= token_end {
-        return None;
-    }
-
-    let text = snapshot
-        .text_for_range(token_start..token_end)
-        .collect::<String>();
-
-    let mut finder = LinkFinder::new();
-    finder.kinds(&[LinkKind::Url]);
-
-    if let Some(link) = finder.links(&text).next()
-        && link.start() == 0
-        && link.end() == text.len()
-    {
-        return Some(link.as_str().to_string());
-    }
-
-    None
-}
-
-pub(crate) async fn find_file(
-    buffer: &Entity<language::Buffer>,
-    project: Option<Entity<Project>>,
-    position: text::Anchor,
-    cx: &mut AsyncWindowContext,
-) -> Option<(Range<text::Anchor>, ResolvedPath)> {
-    let project = project?;
-    let snapshot = buffer.read_with(cx, |buffer, _| buffer.snapshot()).ok()?;
-    let scope = snapshot.language_scope_at(position);
-    let (range, candidate_file_path) = surrounding_filename(snapshot, position)?;
-
-    async fn check_path(
-        candidate_file_path: &str,
-        project: &Entity<Project>,
-        buffer: &Entity<language::Buffer>,
-        cx: &mut AsyncWindowContext,
-    ) -> Option<ResolvedPath> {
-        project
-            .update(cx, |project, cx| {
-                project.resolve_path_in_buffer(candidate_file_path, buffer, cx)
-            })
-            .ok()?
-            .await
-            .filter(|s| s.is_file())
-    }
-
-    if let Some(existing_path) = check_path(&candidate_file_path, &project, buffer, cx).await {
-        return Some((range, existing_path));
-    }
-
-    if let Some(scope) = scope {
-        for suffix in scope.path_suffixes() {
-            if candidate_file_path.ends_with(format!(".{suffix}").as_str()) {
-                continue;
-            }
-
-            let suffixed_candidate = format!("{candidate_file_path}.{suffix}");
-            if let Some(existing_path) = check_path(&suffixed_candidate, &project, buffer, cx).await
-            {
-                return Some((range, existing_path));
-            }
-        }
-    }
-
-    None
-}
-
-fn surrounding_filename(
-    snapshot: language::BufferSnapshot,
-    position: text::Anchor,
-) -> Option<(Range<text::Anchor>, String)> {
-    const LIMIT: usize = 2048;
-
-    let offset = position.to_offset(&snapshot);
-    let mut token_start = offset;
-    let mut token_end = offset;
-    let mut found_start = false;
-    let mut found_end = false;
-    let mut inside_quotes = false;
-
-    let mut filename = String::new();
-
-    let mut backwards = snapshot.reversed_chars_at(offset).take(LIMIT).peekable();
-    while let Some(ch) = backwards.next() {
-        // Escaped whitespace
-        if ch.is_whitespace() && backwards.peek() == Some(&'\\') {
-            filename.push(ch);
-            token_start -= ch.len_utf8();
-            backwards.next();
-            token_start -= '\\'.len_utf8();
-            continue;
-        }
-        if ch.is_whitespace() {
-            found_start = true;
-            break;
-        }
-        if (ch == '"' || ch == '\'') && !inside_quotes {
-            found_start = true;
-            inside_quotes = true;
-            break;
-        }
-
-        filename.push(ch);
-        token_start -= ch.len_utf8();
-    }
-    if !found_start && token_start != 0 {
-        return None;
-    }
-
-    filename = filename.chars().rev().collect();
-
-    let mut forwards = snapshot
-        .chars_at(offset)
-        .take(LIMIT - (offset - token_start))
-        .peekable();
-    while let Some(ch) = forwards.next() {
-        // Skip escaped whitespace
-        if ch == '\\' && forwards.peek().is_some_and(|ch| ch.is_whitespace()) {
-            token_end += ch.len_utf8();
-            let whitespace = forwards.next().unwrap();
-            token_end += whitespace.len_utf8();
-            filename.push(whitespace);
-            continue;
-        }
-
-        if ch.is_whitespace() {
-            found_end = true;
-            break;
-        }
-        if ch == '"' || ch == '\'' {
-            // If we're inside quotes, we stop when we come across the next quote
-            if inside_quotes {
-                found_end = true;
-                break;
-            } else {
-                // Otherwise, we skip the quote
-                inside_quotes = true;
-                token_end += ch.len_utf8();
-                continue;
-            }
-        }
-        filename.push(ch);
-        token_end += ch.len_utf8();
-    }
-
-    if !found_end && (token_end - token_start >= LIMIT) {
-        return None;
-    }
-
-    if filename.is_empty() {
-        return None;
-    }
-
-    let range = snapshot.anchor_before(token_start)..snapshot.anchor_after(token_end);
-
-    Some((range, filename))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::{
-        DisplayPoint,
-        display_map::ToDisplayPoint,
-        editor_tests::init_test,
-        inlays::inlay_hints::tests::{cached_hint_labels, visible_hint_labels},
-        test::editor_lsp_test_context::EditorLspTestContext,
-    };
-    use futures::StreamExt;
-    use gpui::Modifiers;
-    use indoc::indoc;
-    use lsp::request::{GotoDefinition, GotoTypeDefinition};
-    use multi_buffer::MultiBufferOffset;
-    use settings::InlayHintSettingsContent;
-    use util::{assert_set_eq, path};
-    use workspace::item::Item;
-
-    #[gpui::test]
-    async fn test_hover_type_links(cx: &mut gpui::TestAppContext) {
-        init_test(cx, |_| {});
-
-        let mut cx = EditorLspTestContext::new_rust(
-            lsp::ServerCapabilities {
-                hover_provider: Some(lsp::HoverProviderCapability::Simple(true)),
-                type_definition_provider: Some(lsp::TypeDefinitionProviderCapability::Simple(true)),
-                ..Default::default()
-            },
-            cx,
-        )
-        .await;
-
-        cx.set_state(indoc! {"
-            struct A;
-            let vˇariable = A;
-        "});
-        let screen_coord = cx.editor(|editor, _, cx| editor.pixel_position_of_cursor(cx));
-
-        // Basic hold cmd+shift, expect highlight in region if response contains type definition
-        let symbol_range = cx.lsp_range(indoc! {"
-            struct A;
-            let «variable» = A;
-        "});
-        let target_range = cx.lsp_range(indoc! {"
-            struct «A»;
-            let variable = A;
-        "});
-
-        cx.run_until_parked();
-
-        let mut requests =
-            cx.set_request_handler::<GotoTypeDefinition, _, _>(move |url, _, _| async move {
-                Ok(Some(lsp::GotoTypeDefinitionResponse::Link(vec![
-                    lsp::LocationLink {
-                        origin_selection_range: Some(symbol_range),
-                        target_uri: url.clone(),
-                        target_range,
-                        target_selection_range: target_range,
-                    },
-                ])))
-            });
-
-        let modifiers = if cfg!(target_os = "macos") {
-            Modifiers::command_shift()
-        } else {
-            Modifiers::control_shift()
-        };
-
-        cx.simulate_mouse_move(screen_coord.unwrap(), None, modifiers);
-
-        requests.next().await;
-        cx.run_until_parked();
-        cx.assert_editor_text_highlights::<HoveredLinkState>(indoc! {"
-            struct A;
-            let «variable» = A;
-        "});
-
-        cx.simulate_modifiers_change(Modifiers::secondary_key());
-        cx.run_until_parked();
-        // Assert no link highlights
-        cx.assert_editor_text_highlights::<HoveredLinkState>(indoc! {"
-            struct A;
-            let variable = A;
-        "});
-
-        cx.simulate_click(screen_coord.unwrap(), modifiers);
-
-        cx.assert_editor_state(indoc! {"
-            struct «Aˇ»;
-            let variable = A;
-        "});
-    }
-
-    #[gpui::test]
-    async fn test_hover_links(cx: &mut gpui::TestAppContext) {
-        init_test(cx, |_| {});
-
-        let mut cx = EditorLspTestContext::new_rust(
-            lsp::ServerCapabilities {
-                hover_provider: Some(lsp::HoverProviderCapability::Simple(true)),
-                definition_provider: Some(lsp::OneOf::Left(true)),
-                ..Default::default()
-            },
-            cx,
-        )
-        .await;
-
-        cx.set_state(indoc! {"
-                fn ˇtest() { do_work(); }
-                fn do_work() { test(); }
-            "});
-
-        // Basic hold cmd, expect highlight in region if response contains definition
-        let hover_point = cx.pixel_position(indoc! {"
-                fn test() { do_wˇork(); }
-                fn do_work() { test(); }
-            "});
-        let symbol_range = cx.lsp_range(indoc! {"
-                fn test() { «do_work»(); }
-                fn do_work() { test(); }
-            "});
-        let target_range = cx.lsp_range(indoc! {"
-                fn test() { do_work(); }
-                fn «do_work»() { test(); }
-            "});
-
-        let mut requests =
-            cx.set_request_handler::<GotoDefinition, _, _>(move |url, _, _| async move {
-                Ok(Some(lsp::GotoDefinitionResponse::Link(vec![
-                    lsp::LocationLink {
-                        origin_selection_range: Some(symbol_range),
-                        target_uri: url.clone(),
-                        target_range,
-                        target_selection_range: target_range,
-                    },
-                ])))
-            });
-
-        cx.simulate_mouse_move(hover_point, None, Modifiers::secondary_key());
-        requests.next().await;
-        cx.background_executor.run_until_parked();
-        cx.assert_editor_text_highlights::<HoveredLinkState>(indoc! {"
-                fn test() { «do_work»(); }
-                fn do_work() { test(); }
-            "});
-
-        // Unpress cmd causes highlight to go away
-        cx.simulate_modifiers_change(Modifiers::none());
-        cx.assert_editor_text_highlights::<HoveredLinkState>(indoc! {"
-                fn test() { do_work(); }
-                fn do_work() { test(); }
-            "});
-
-        let mut requests =
-            cx.set_request_handler::<GotoDefinition, _, _>(move |url, _, _| async move {
-                Ok(Some(lsp::GotoDefinitionResponse::Link(vec![
-                    lsp::LocationLink {
-                        origin_selection_range: Some(symbol_range),
-                        target_uri: url.clone(),
-                        target_range,
-                        target_selection_range: target_range,
-                    },
-                ])))
-            });
-
-        cx.simulate_mouse_move(hover_point, None, Modifiers::secondary_key());
-        requests.next().await;
-        cx.background_executor.run_until_parked();
-        cx.assert_editor_text_highlights::<HoveredLinkState>(indoc! {"
-                fn test() { «do_work»(); }
-                fn do_work() { test(); }
-            "});
-
-        // Moving mouse to location with no response dismisses highlight
-        let hover_point = cx.pixel_position(indoc! {"
-                fˇn test() { do_work(); }
-                fn do_work() { test(); }
-            "});
-        let mut requests =
-            cx.lsp
-                .set_request_handler::<GotoDefinition, _, _>(move |_, _| async move {
-                    // No definitions returned
-                    Ok(Some(lsp::GotoDefinitionResponse::Link(vec![])))
-                });
-        cx.simulate_mouse_move(hover_point, None, Modifiers::secondary_key());
-
-        requests.next().await;
-        cx.background_executor.run_until_parked();
-
-        // Assert no link highlights
-        cx.assert_editor_text_highlights::<HoveredLinkState>(indoc! {"
-                fn test() { do_work(); }
-                fn do_work() { test(); }
-            "});
-
-        // // Move mouse without cmd and then pressing cmd triggers highlight
-        let hover_point = cx.pixel_position(indoc! {"
-                fn test() { do_work(); }
-                fn do_work() { teˇst(); }
-            "});
-        cx.simulate_mouse_move(hover_point, None, Modifiers::none());
-
-        // Assert no link highlights
-        cx.assert_editor_text_highlights::<HoveredLinkState>(indoc! {"
-                fn test() { do_work(); }
-                fn do_work() { test(); }
-            "});
-
-        let symbol_range = cx.lsp_range(indoc! {"
-                fn test() { do_work(); }
-                fn do_work() { «test»(); }
-            "});
-        let target_range = cx.lsp_range(indoc! {"
-                fn «test»() { do_work(); }
-                fn do_work() { test(); }
-            "});
-
-        let mut requests =
-            cx.set_request_handler::<GotoDefinition, _, _>(move |url, _, _| async move {
-                Ok(Some(lsp::GotoDefinitionResponse::Link(vec![
-                    lsp::LocationLink {
-                        origin_selection_range: Some(symbol_range),
-                        target_uri: url,
-                        target_range,
-                        target_selection_range: target_range,
-                    },
-                ])))
-            });
-
-        cx.simulate_modifiers_change(Modifiers::secondary_key());
-
-        requests.next().await;
-        cx.background_executor.run_until_parked();
-
-        cx.assert_editor_text_highlights::<HoveredLinkState>(indoc! {"
-                fn test() { do_work(); }
-                fn do_work() { «test»(); }
-            "});
-
-        cx.deactivate_window();
-        cx.assert_editor_text_highlights::<HoveredLinkState>(indoc! {"
-                fn test() { do_work(); }
-                fn do_work() { test(); }
-            "});
-
-        cx.simulate_mouse_move(hover_point, None, Modifiers::secondary_key());
-        cx.background_executor.run_until_parked();
-        cx.assert_editor_text_highlights::<HoveredLinkState>(indoc! {"
-                fn test() { do_work(); }
-                fn do_work() { «test»(); }
-            "});
-
-        // Moving again within the same symbol range doesn't re-request
-        let hover_point = cx.pixel_position(indoc! {"
-                fn test() { do_work(); }
-                fn do_work() { tesˇt(); }
-            "});
-        cx.simulate_mouse_move(hover_point, None, Modifiers::secondary_key());
-        cx.background_executor.run_until_parked();
-        cx.assert_editor_text_highlights::<HoveredLinkState>(indoc! {"
-                fn test() { do_work(); }
-                fn do_work() { «test»(); }
-            "});
-
-        // Cmd click with existing definition doesn't re-request and dismisses highlight
-        cx.simulate_click(hover_point, Modifiers::secondary_key());
-        cx.lsp
-            .set_request_handler::<GotoDefinition, _, _>(move |_, _| async move {
-                // Empty definition response to make sure we aren't hitting the lsp and using
-                // the cached location instead
-                Ok(Some(lsp::GotoDefinitionResponse::Link(vec![])))
-            });
-        cx.background_executor.run_until_parked();
-        cx.assert_editor_state(indoc! {"
-                fn «testˇ»() { do_work(); }
-                fn do_work() { test(); }
-            "});
-
-        // Assert no link highlights after jump
-        cx.assert_editor_text_highlights::<HoveredLinkState>(indoc! {"
-                fn test() { do_work(); }
-                fn do_work() { test(); }
-            "});
-
-        // Cmd click without existing definition requests and jumps
-        let hover_point = cx.pixel_position(indoc! {"
-                fn test() { do_wˇork(); }
-                fn do_work() { test(); }
-            "});
-        let target_range = cx.lsp_range(indoc! {"
-                fn test() { do_work(); }
-                fn «do_work»() { test(); }
-            "});
-
-        let mut requests =
-            cx.set_request_handler::<GotoDefinition, _, _>(move |url, _, _| async move {
-                Ok(Some(lsp::GotoDefinitionResponse::Link(vec![
-                    lsp::LocationLink {
-                        origin_selection_range: None,
-                        target_uri: url,
-                        target_range,
-                        target_selection_range: target_range,
-                    },
-                ])))
-            });
-        cx.simulate_click(hover_point, Modifiers::secondary_key());
-        requests.next().await;
-        cx.background_executor.run_until_parked();
-        cx.assert_editor_state(indoc! {"
-                fn test() { do_work(); }
-                fn «do_workˇ»() { test(); }
-            "});
-
-        // 1. We have a pending selection, mouse point is over a symbol that we have a response for, hitting cmd and nothing happens
-        // 2. Selection is completed, hovering
-        let hover_point = cx.pixel_position(indoc! {"
-                fn test() { do_wˇork(); }
-                fn do_work() { test(); }
-            "});
-        let target_range = cx.lsp_range(indoc! {"
-                fn test() { do_work(); }
-                fn «do_work»() { test(); }
-            "});
-        let mut requests =
-            cx.set_request_handler::<GotoDefinition, _, _>(move |url, _, _| async move {
-                Ok(Some(lsp::GotoDefinitionResponse::Link(vec![
-                    lsp::LocationLink {
-                        origin_selection_range: None,
-                        target_uri: url,
-                        target_range,
-                        target_selection_range: target_range,
-                    },
-                ])))
-            });
-
-        // create a pending selection
-        let selection_range = cx.ranges(indoc! {"
-                fn «test() { do_w»ork(); }
-                fn do_work() { test(); }
-            "})[0]
-            .clone();
-        cx.update_editor(|editor, window, cx| {
-            let snapshot = editor.buffer().read(cx).snapshot(cx);
-            let anchor_range = snapshot.anchor_before(MultiBufferOffset(selection_range.start))
-                ..snapshot.anchor_after(MultiBufferOffset(selection_range.end));
-            editor.change_selections(Default::default(), window, cx, |s| {
-                s.set_pending_anchor_range(anchor_range, crate::SelectMode::Character)
-            });
-        });
-        cx.simulate_mouse_move(hover_point, None, Modifiers::secondary_key());
-        cx.background_executor.run_until_parked();
-        assert!(requests.try_next().is_err());
-        cx.assert_editor_text_highlights::<HoveredLinkState>(indoc! {"
-                fn test() { do_work(); }
-                fn do_work() { test(); }
-            "});
-        cx.background_executor.run_until_parked();
-    }
-
-    #[gpui::test]
-    async fn test_inlay_hover_links(cx: &mut gpui::TestAppContext) {
-        init_test(cx, |settings| {
-            settings.defaults.inlay_hints = Some(InlayHintSettingsContent {
-                enabled: Some(true),
-                show_value_hints: Some(false),
-                edit_debounce_ms: Some(0),
-                scroll_debounce_ms: Some(0),
-                show_type_hints: Some(true),
-                show_parameter_hints: Some(true),
-                show_other_hints: Some(true),
-                show_background: Some(false),
-                toggle_on_modifiers_press: None,
-            })
-        });
-
-        let mut cx = EditorLspTestContext::new_rust(
-            lsp::ServerCapabilities {
-                inlay_hint_provider: Some(lsp::OneOf::Left(true)),
-                ..Default::default()
-            },
-            cx,
-        )
-        .await;
-        cx.set_state(indoc! {"
-                struct TestStruct;
-
-                fn main() {
-                    let variableˇ = TestStruct;
-                }
-            "});
-        let hint_start_offset = cx.ranges(indoc! {"
-                struct TestStruct;
-
-                fn main() {
-                    let variableˇ = TestStruct;
-                }
-            "})[0]
-            .start;
-        let hint_position = cx.to_lsp(MultiBufferOffset(hint_start_offset));
-        let target_range = cx.lsp_range(indoc! {"
-                struct «TestStruct»;
-
-                fn main() {
-                    let variable = TestStruct;
-                }
-            "});
-
-        let expected_uri = cx.buffer_lsp_url.clone();
-        let hint_label = ": TestStruct";
-        cx.lsp
-            .set_request_handler::<lsp::request::InlayHintRequest, _, _>(move |params, _| {
-                let expected_uri = expected_uri.clone();
-                async move {
-                    assert_eq!(params.text_document.uri, expected_uri);
-                    Ok(Some(vec![lsp::InlayHint {
-                        position: hint_position,
-                        label: lsp::InlayHintLabel::LabelParts(vec![lsp::InlayHintLabelPart {
-                            value: hint_label.to_string(),
-                            location: Some(lsp::Location {
-                                uri: params.text_document.uri,
-                                range: target_range,
-                            }),
-                            ..Default::default()
-                        }]),
-                        kind: Some(lsp::InlayHintKind::TYPE),
-                        text_edits: None,
-                        tooltip: None,
-                        padding_left: Some(false),
-                        padding_right: Some(false),
-                        data: None,
-                    }]))
-                }
-            })
-            .next()
-            .await;
-        cx.background_executor.run_until_parked();
-        cx.update_editor(|editor, _window, cx| {
-            let expected_layers = vec![hint_label.to_string()];
-            assert_eq!(expected_layers, cached_hint_labels(editor, cx));
-            assert_eq!(expected_layers, visible_hint_labels(editor, cx));
-        });
-
-        let inlay_range = cx
-            .ranges(indoc! {"
-                struct TestStruct;
-
-                fn main() {
-                    let variable« »= TestStruct;
-                }
-            "})
-            .first()
-            .cloned()
-            .unwrap();
-        let midpoint = cx.update_editor(|editor, window, cx| {
-            let snapshot = editor.snapshot(window, cx);
-            let previous_valid = MultiBufferOffset(inlay_range.start).to_display_point(&snapshot);
-            let next_valid = MultiBufferOffset(inlay_range.end).to_display_point(&snapshot);
-            assert_eq!(previous_valid.row(), next_valid.row());
-            assert!(previous_valid.column() < next_valid.column());
-            DisplayPoint::new(
-                previous_valid.row(),
-                previous_valid.column() + (hint_label.len() / 2) as u32,
-            )
-        });
-        // Press cmd to trigger highlight
-        let hover_point = cx.pixel_position_for(midpoint);
-        cx.simulate_mouse_move(hover_point, None, Modifiers::secondary_key());
-        cx.background_executor.run_until_parked();
-        cx.update_editor(|editor, window, cx| {
-            let snapshot = editor.snapshot(window, cx);
-            let actual_highlights = snapshot
-                .inlay_highlights::<HoveredLinkState>()
-                .into_iter()
-                .flat_map(|highlights| highlights.values().map(|(_, highlight)| highlight))
-                .collect::<Vec<_>>();
-
-            let buffer_snapshot = editor.buffer().update(cx, |buffer, cx| buffer.snapshot(cx));
-            let expected_highlight = InlayHighlight {
-                inlay: InlayId::Hint(0),
-                inlay_position: buffer_snapshot.anchor_after(MultiBufferOffset(inlay_range.start)),
-                range: 0..hint_label.len(),
-            };
-            assert_set_eq!(actual_highlights, vec![&expected_highlight]);
-        });
-
-        cx.simulate_mouse_move(hover_point, None, Modifiers::none());
-        // Assert no link highlights
-        cx.update_editor(|editor, window, cx| {
-                let snapshot = editor.snapshot(window, cx);
-                let actual_ranges = snapshot
-                    .text_highlight_ranges::<HoveredLinkState>()
-                    .map(|ranges| ranges.as_ref().clone().1)
-                    .unwrap_or_default();
-
-                assert!(actual_ranges.is_empty(), "When no cmd is pressed, should have no hint label selected, but got: {actual_ranges:?}");
-            });
-
-        cx.simulate_modifiers_change(Modifiers::secondary_key());
-        cx.background_executor.run_until_parked();
-        cx.simulate_click(hover_point, Modifiers::secondary_key());
-        cx.background_executor.run_until_parked();
-        cx.assert_editor_state(indoc! {"
-                struct «TestStructˇ»;
-
-                fn main() {
-                    let variable = TestStruct;
-                }
-            "});
-    }
-
-    #[gpui::test]
-    async fn test_urls(cx: &mut gpui::TestAppContext) {
-        init_test(cx, |_| {});
-        let mut cx = EditorLspTestContext::new_rust(
-            lsp::ServerCapabilities {
-                ..Default::default()
-            },
-            cx,
-        )
-        .await;
-
-        cx.set_state(indoc! {"
-            Let's test a [complex](https://zed.dev/channel/had-(oops)) caseˇ.
-        "});
-
-        let screen_coord = cx.pixel_position(indoc! {"
-            Let's test a [complex](https://zed.dev/channel/had-(ˇoops)) case.
-            "});
-
-        cx.simulate_mouse_move(screen_coord, None, Modifiers::secondary_key());
-        cx.assert_editor_text_highlights::<HoveredLinkState>(indoc! {"
-            Let's test a [complex](«https://zed.dev/channel/had-(oops)ˇ») case.
-        "});
-
-        cx.simulate_click(screen_coord, Modifiers::secondary_key());
-        assert_eq!(
-            cx.opened_url(),
-            Some("https://zed.dev/channel/had-(oops)".into())
-        );
-    }
-
-    #[gpui::test]
-    async fn test_urls_at_beginning_of_buffer(cx: &mut gpui::TestAppContext) {
-        init_test(cx, |_| {});
-        let mut cx = EditorLspTestContext::new_rust(
-            lsp::ServerCapabilities {
-                ..Default::default()
-            },
-            cx,
-        )
-        .await;
-
-        cx.set_state(indoc! {"https://zed.dev/releases is a cool ˇwebpage."});
-
-        let screen_coord =
-            cx.pixel_position(indoc! {"https://zed.dev/relˇeases is a cool webpage."});
-
-        cx.simulate_mouse_move(screen_coord, None, Modifiers::secondary_key());
-        cx.assert_editor_text_highlights::<HoveredLinkState>(
-            indoc! {"«https://zed.dev/releasesˇ» is a cool webpage."},
-        );
-
-        cx.simulate_click(screen_coord, Modifiers::secondary_key());
-        assert_eq!(cx.opened_url(), Some("https://zed.dev/releases".into()));
-    }
-
-    #[gpui::test]
-    async fn test_urls_at_end_of_buffer(cx: &mut gpui::TestAppContext) {
-        init_test(cx, |_| {});
-        let mut cx = EditorLspTestContext::new_rust(
-            lsp::ServerCapabilities {
-                ..Default::default()
-            },
-            cx,
-        )
-        .await;
-
-        cx.set_state(indoc! {"A cool ˇwebpage is https://zed.dev/releases"});
-
-        let screen_coord =
-            cx.pixel_position(indoc! {"A cool webpage is https://zed.dev/releˇases"});
-
-        cx.simulate_mouse_move(screen_coord, None, Modifiers::secondary_key());
-        cx.assert_editor_text_highlights::<HoveredLinkState>(
-            indoc! {"A cool webpage is «https://zed.dev/releasesˇ»"},
-        );
-
-        cx.simulate_click(screen_coord, Modifiers::secondary_key());
-        assert_eq!(cx.opened_url(), Some("https://zed.dev/releases".into()));
-    }
-
-    #[gpui::test]
-    async fn test_surrounding_filename(cx: &mut gpui::TestAppContext) {
-        init_test(cx, |_| {});
-        let mut cx = EditorLspTestContext::new_rust(
-            lsp::ServerCapabilities {
-                ..Default::default()
-            },
-            cx,
-        )
-        .await;
-
-        let test_cases = [
-            ("file ˇ name", None),
-            ("ˇfile name", Some("file")),
-            ("file ˇname", Some("name")),
-            ("fiˇle name", Some("file")),
-            ("filenˇame", Some("filename")),
-            // Absolute path
-            ("foobar ˇ/home/user/f.txt", Some("/home/user/f.txt")),
-            ("foobar /home/useˇr/f.txt", Some("/home/user/f.txt")),
-            // Windows
-            ("C:\\Useˇrs\\user\\f.txt", Some("C:\\Users\\user\\f.txt")),
-            // Whitespace
-            ("ˇfile\\ -\\ name.txt", Some("file - name.txt")),
-            ("file\\ -\\ naˇme.txt", Some("file - name.txt")),
-            // Tilde
-            ("ˇ~/file.txt", Some("~/file.txt")),
-            ("~/fiˇle.txt", Some("~/file.txt")),
-            // Double quotes
-            ("\"fˇile.txt\"", Some("file.txt")),
-            ("ˇ\"file.txt\"", Some("file.txt")),
-            ("ˇ\"fi\\ le.txt\"", Some("fi le.txt")),
-            // Single quotes
-            ("'fˇile.txt'", Some("file.txt")),
-            ("ˇ'file.txt'", Some("file.txt")),
-            ("ˇ'fi\\ le.txt'", Some("fi le.txt")),
-            // Quoted multibyte characters
-            (" ˇ\"常\"", Some("常")),
-            (" \"ˇ常\"", Some("常")),
-            ("ˇ\"常\"", Some("常")),
-        ];
-
-        for (input, expected) in test_cases {
-            cx.set_state(input);
-
-            let (position, snapshot) = cx.editor(|editor, _, cx| {
-                let positions = editor.selections.newest_anchor().head().text_anchor;
-                let snapshot = editor
-                    .buffer()
-                    .clone()
-                    .read(cx)
-                    .as_singleton()
-                    .unwrap()
-                    .read(cx)
-                    .snapshot();
-                (positions, snapshot)
-            });
-
-            let result = surrounding_filename(snapshot, position);
-
-            if let Some(expected) = expected {
-                assert!(result.is_some(), "Failed to find file path: {}", input);
-                let (_, path) = result.unwrap();
-                assert_eq!(&path, expected, "Incorrect file path for input: {}", input);
-            } else {
-                assert!(
-                    result.is_none(),
-                    "Expected no result, but got one: {:?}",
-                    result
-                );
-            }
-        }
-    }
-
-    #[gpui::test]
-    async fn test_hover_filenames(cx: &mut gpui::TestAppContext) {
-        init_test(cx, |_| {});
-        let mut cx = EditorLspTestContext::new_rust(
-            lsp::ServerCapabilities {
-                ..Default::default()
-            },
-            cx,
-        )
-        .await;
-
-        // Insert a new file
-        let fs = cx.update_workspace(|workspace, _, cx| workspace.project().read(cx).fs().clone());
-        fs.as_fake()
-            .insert_file(
-                path!("/root/dir/file2.rs"),
-                "This is file2.rs".as_bytes().to_vec(),
-            )
-            .await;
-
-        #[cfg(not(target_os = "windows"))]
-        cx.set_state(indoc! {"
-            You can't go to a file that does_not_exist.txt.
-            Go to file2.rs if you want.
-            Or go to ../dir/file2.rs if you want.
-            Or go to /root/dir/file2.rs if project is local.
-            Or go to /root/dir/file2 if this is a Rust file.ˇ
-            "});
-        #[cfg(target_os = "windows")]
-        cx.set_state(indoc! {"
-            You can't go to a file that does_not_exist.txt.
-            Go to file2.rs if you want.
-            Or go to ../dir/file2.rs if you want.
-            Or go to C:/root/dir/file2.rs if project is local.
-            Or go to C:/root/dir/file2 if this is a Rust file.ˇ
-        "});
-
-        // File does not exist
-        #[cfg(not(target_os = "windows"))]
-        let screen_coord = cx.pixel_position(indoc! {"
-            You can't go to a file that dˇoes_not_exist.txt.
-            Go to file2.rs if you want.
-            Or go to ../dir/file2.rs if you want.
-            Or go to /root/dir/file2.rs if project is local.
-            Or go to /root/dir/file2 if this is a Rust file.
-        "});
-        #[cfg(target_os = "windows")]
-        let screen_coord = cx.pixel_position(indoc! {"
-            You can't go to a file that dˇoes_not_exist.txt.
-            Go to file2.rs if you want.
-            Or go to ../dir/file2.rs if you want.
-            Or go to C:/root/dir/file2.rs if project is local.
-            Or go to C:/root/dir/file2 if this is a Rust file.
-        "});
-        cx.simulate_mouse_move(screen_coord, None, Modifiers::secondary_key());
-        // No highlight
-        cx.update_editor(|editor, window, cx| {
-            assert!(
-                editor
-                    .snapshot(window, cx)
-                    .text_highlight_ranges::<HoveredLinkState>()
-                    .unwrap_or_default()
-                    .1
-                    .is_empty()
-            );
-        });
-
-        // Moving the mouse over a file that does exist should highlight it.
-        #[cfg(not(target_os = "windows"))]
-        let screen_coord = cx.pixel_position(indoc! {"
-            You can't go to a file that does_not_exist.txt.
-            Go to fˇile2.rs if you want.
-            Or go to ../dir/file2.rs if you want.
-            Or go to /root/dir/file2.rs if project is local.
-            Or go to /root/dir/file2 if this is a Rust file.
-        "});
-        #[cfg(target_os = "windows")]
-        let screen_coord = cx.pixel_position(indoc! {"
-            You can't go to a file that does_not_exist.txt.
-            Go to fˇile2.rs if you want.
-            Or go to ../dir/file2.rs if you want.
-            Or go to C:/root/dir/file2.rs if project is local.
-            Or go to C:/root/dir/file2 if this is a Rust file.
-        "});
-
-        cx.simulate_mouse_move(screen_coord, None, Modifiers::secondary_key());
-        #[cfg(not(target_os = "windows"))]
-        cx.assert_editor_text_highlights::<HoveredLinkState>(indoc! {"
-            You can't go to a file that does_not_exist.txt.
-            Go to «file2.rsˇ» if you want.
-            Or go to ../dir/file2.rs if you want.
-            Or go to /root/dir/file2.rs if project is local.
-            Or go to /root/dir/file2 if this is a Rust file.
-        "});
-        #[cfg(target_os = "windows")]
-        cx.assert_editor_text_highlights::<HoveredLinkState>(indoc! {"
-            You can't go to a file that does_not_exist.txt.
-            Go to «file2.rsˇ» if you want.
-            Or go to ../dir/file2.rs if you want.
-            Or go to C:/root/dir/file2.rs if project is local.
-            Or go to C:/root/dir/file2 if this is a Rust file.
-        "});
-
-        // Moving the mouse over a relative path that does exist should highlight it
-        #[cfg(not(target_os = "windows"))]
-        let screen_coord = cx.pixel_position(indoc! {"
-            You can't go to a file that does_not_exist.txt.
-            Go to file2.rs if you want.
-            Or go to ../dir/fˇile2.rs if you want.
-            Or go to /root/dir/file2.rs if project is local.
-            Or go to /root/dir/file2 if this is a Rust file.
-        "});
-        #[cfg(target_os = "windows")]
-        let screen_coord = cx.pixel_position(indoc! {"
-            You can't go to a file that does_not_exist.txt.
-            Go to file2.rs if you want.
-            Or go to ../dir/fˇile2.rs if you want.
-            Or go to C:/root/dir/file2.rs if project is local.
-            Or go to C:/root/dir/file2 if this is a Rust file.
-        "});
-
-        cx.simulate_mouse_move(screen_coord, None, Modifiers::secondary_key());
-        #[cfg(not(target_os = "windows"))]
-        cx.assert_editor_text_highlights::<HoveredLinkState>(indoc! {"
-            You can't go to a file that does_not_exist.txt.
-            Go to file2.rs if you want.
-            Or go to «../dir/file2.rsˇ» if you want.
-            Or go to /root/dir/file2.rs if project is local.
-            Or go to /root/dir/file2 if this is a Rust file.
-        "});
-        #[cfg(target_os = "windows")]
-        cx.assert_editor_text_highlights::<HoveredLinkState>(indoc! {"
-            You can't go to a file that does_not_exist.txt.
-            Go to file2.rs if you want.
-            Or go to «../dir/file2.rsˇ» if you want.
-            Or go to C:/root/dir/file2.rs if project is local.
-            Or go to C:/root/dir/file2 if this is a Rust file.
-        "});
-
-        // Moving the mouse over an absolute path that does exist should highlight it
-        #[cfg(not(target_os = "windows"))]
-        let screen_coord = cx.pixel_position(indoc! {"
-            You can't go to a file that does_not_exist.txt.
-            Go to file2.rs if you want.
-            Or go to ../dir/file2.rs if you want.
-            Or go to /root/diˇr/file2.rs if project is local.
-            Or go to /root/dir/file2 if this is a Rust file.
-        "});
-
-        #[cfg(target_os = "windows")]
-        let screen_coord = cx.pixel_position(indoc! {"
-            You can't go to a file that does_not_exist.txt.
-            Go to file2.rs if you want.
-            Or go to ../dir/file2.rs if you want.
-            Or go to C:/root/diˇr/file2.rs if project is local.
-            Or go to C:/root/dir/file2 if this is a Rust file.
-        "});
-
-        cx.simulate_mouse_move(screen_coord, None, Modifiers::secondary_key());
-        #[cfg(not(target_os = "windows"))]
-        cx.assert_editor_text_highlights::<HoveredLinkState>(indoc! {"
-            You can't go to a file that does_not_exist.txt.
-            Go to file2.rs if you want.
-            Or go to ../dir/file2.rs if you want.
-            Or go to «/root/dir/file2.rsˇ» if project is local.
-            Or go to /root/dir/file2 if this is a Rust file.
-        "});
-        #[cfg(target_os = "windows")]
-        cx.assert_editor_text_highlights::<HoveredLinkState>(indoc! {"
-            You can't go to a file that does_not_exist.txt.
-            Go to file2.rs if you want.
-            Or go to ../dir/file2.rs if you want.
-            Or go to «C:/root/dir/file2.rsˇ» if project is local.
-            Or go to C:/root/dir/file2 if this is a Rust file.
-        "});
-
-        // Moving the mouse over a path that exists, if we add the language-specific suffix, it should highlight it
-        #[cfg(not(target_os = "windows"))]
-        let screen_coord = cx.pixel_position(indoc! {"
-            You can't go to a file that does_not_exist.txt.
-            Go to file2.rs if you want.
-            Or go to ../dir/file2.rs if you want.
-            Or go to /root/dir/file2.rs if project is local.
-            Or go to /root/diˇr/file2 if this is a Rust file.
-        "});
-        #[cfg(target_os = "windows")]
-        let screen_coord = cx.pixel_position(indoc! {"
-            You can't go to a file that does_not_exist.txt.
-            Go to file2.rs if you want.
-            Or go to ../dir/file2.rs if you want.
-            Or go to C:/root/dir/file2.rs if project is local.
-            Or go to C:/root/diˇr/file2 if this is a Rust file.
-        "});
-
-        cx.simulate_mouse_move(screen_coord, None, Modifiers::secondary_key());
-        #[cfg(not(target_os = "windows"))]
-        cx.assert_editor_text_highlights::<HoveredLinkState>(indoc! {"
-            You can't go to a file that does_not_exist.txt.
-            Go to file2.rs if you want.
-            Or go to ../dir/file2.rs if you want.
-            Or go to /root/dir/file2.rs if project is local.
-            Or go to «/root/dir/file2ˇ» if this is a Rust file.
-        "});
-        #[cfg(target_os = "windows")]
-        cx.assert_editor_text_highlights::<HoveredLinkState>(indoc! {"
-            You can't go to a file that does_not_exist.txt.
-            Go to file2.rs if you want.
-            Or go to ../dir/file2.rs if you want.
-            Or go to C:/root/dir/file2.rs if project is local.
-            Or go to «C:/root/dir/file2ˇ» if this is a Rust file.
-        "});
-
-        cx.simulate_click(screen_coord, Modifiers::secondary_key());
-
-        cx.update_workspace(|workspace, _, cx| assert_eq!(workspace.items(cx).count(), 2));
-        cx.update_workspace(|workspace, _, cx| {
-            let active_editor = workspace.active_item_as::<Editor>(cx).unwrap();
-
-            let buffer = active_editor
-                .read(cx)
-                .buffer()
-                .read(cx)
-                .as_singleton()
-                .unwrap();
-
-            let file = buffer.read(cx).file().unwrap();
-            let file_path = file.as_local().unwrap().abs_path(cx);
-
-            assert_eq!(
-                file_path,
-                std::path::PathBuf::from(path!("/root/dir/file2.rs"))
-            );
-        });
-    }
-
-    #[gpui::test]
-    async fn test_hover_directories(cx: &mut gpui::TestAppContext) {
-        init_test(cx, |_| {});
-        let mut cx = EditorLspTestContext::new_rust(
-            lsp::ServerCapabilities {
-                ..Default::default()
-            },
-            cx,
-        )
-        .await;
-
-        // Insert a new file
-        let fs = cx.update_workspace(|workspace, _, cx| workspace.project().read(cx).fs().clone());
-        fs.as_fake()
-            .insert_file("/root/dir/file2.rs", "This is file2.rs".as_bytes().to_vec())
-            .await;
-
-        cx.set_state(indoc! {"
-            You can't open ../diˇr because it's a directory.
-        "});
-
-        // File does not exist
-        let screen_coord = cx.pixel_position(indoc! {"
-            You can't open ../diˇr because it's a directory.
-        "});
-        cx.simulate_mouse_move(screen_coord, None, Modifiers::secondary_key());
-
-        // No highlight
-        cx.update_editor(|editor, window, cx| {
-            assert!(
-                editor
-                    .snapshot(window, cx)
-                    .text_highlight_ranges::<HoveredLinkState>()
-                    .unwrap_or_default()
-                    .1
-                    .is_empty()
-            );
-        });
-
-        // Does not open the directory
-        cx.simulate_click(screen_coord, Modifiers::secondary_key());
-        cx.update_workspace(|workspace, _, cx| assert_eq!(workspace.items(cx).count(), 1));
-    }
-
-    #[gpui::test]
-    async fn test_hover_unicode(cx: &mut gpui::TestAppContext) {
-        init_test(cx, |_| {});
-        let mut cx = EditorLspTestContext::new_rust(
-            lsp::ServerCapabilities {
-                ..Default::default()
-            },
-            cx,
-        )
-        .await;
-
-        cx.set_state(indoc! {"
-            You can't open ˇ\"🤩\" because it's an emoji.
-        "});
-
-        // File does not exist
-        let screen_coord = cx.pixel_position(indoc! {"
-            You can't open ˇ\"🤩\" because it's an emoji.
-        "});
-        cx.simulate_mouse_move(screen_coord, None, Modifiers::secondary_key());
-
-        // No highlight, does not panic...
-        cx.update_editor(|editor, window, cx| {
-            assert!(
-                editor
-                    .snapshot(window, cx)
-                    .text_highlight_ranges::<HoveredLinkState>()
-                    .unwrap_or_default()
-                    .1
-                    .is_empty()
-            );
-        });
-
-        // Does not open the directory
-        cx.simulate_click(screen_coord, Modifiers::secondary_key());
-        cx.update_workspace(|workspace, _, cx| assert_eq!(workspace.items(cx).count(), 1));
-    }
-}
diff --git a/crates/editor/src/hover_popover.rs b/crates/editor/src/hover_popover.rs
deleted file mode 100644
index edf10671b9..0000000000
--- a/crates/editor/src/hover_popover.rs
+++ /dev/null
@@ -1,1902 +0,0 @@
-use crate::{
-    ActiveDiagnostic, Anchor, AnchorRangeExt, DisplayPoint, DisplayRow, Editor, EditorSettings,
-    EditorSnapshot, GlobalDiagnosticRenderer, Hover,
-    display_map::{InlayOffset, ToDisplayPoint, is_invisible},
-    hover_links::{InlayHighlight, RangeInEditor},
-    movement::TextLayoutDetails,
-    scroll::ScrollAmount,
-};
-use anyhow::Context as _;
-use gpui::{
-    AnyElement, AsyncWindowContext, Context, Entity, Focusable as _, FontWeight, Hsla,
-    InteractiveElement, IntoElement, MouseButton, ParentElement, Pixels, ScrollHandle, Size,
-    StatefulInteractiveElement, StyleRefinement, Styled, Subscription, Task, TextStyleRefinement,
-    Window, div, px,
-};
-use itertools::Itertools;
-use language::{DiagnosticEntry, Language, LanguageRegistry};
-use lsp::DiagnosticSeverity;
-use markdown::{Markdown, MarkdownElement, MarkdownStyle};
-use multi_buffer::{MultiBufferOffset, ToOffset, ToPoint};
-use project::{HoverBlock, HoverBlockKind, InlayHintLabelPart};
-use settings::Settings;
-use std::{borrow::Cow, cell::RefCell};
-use std::{ops::Range, sync::Arc, time::Duration};
-use std::{path::PathBuf, rc::Rc};
-use theme::ThemeSettings;
-use ui::{Scrollbars, WithScrollbar, prelude::*, theme_is_transparent};
-use url::Url;
-use util::TryFutureExt;
-use workspace::{OpenOptions, OpenVisible, Workspace};
-
-pub const MIN_POPOVER_CHARACTER_WIDTH: f32 = 20.;
-pub const MIN_POPOVER_LINE_HEIGHT: f32 = 4.;
-pub const POPOVER_RIGHT_OFFSET: Pixels = px(8.0);
-pub const HOVER_POPOVER_GAP: Pixels = px(10.);
-
-/// Bindable action which uses the most recent selection head to trigger a hover
-pub fn hover(editor: &mut Editor, _: &Hover, window: &mut Window, cx: &mut Context<Editor>) {
-    let head = editor.selections.newest_anchor().head();
-    show_hover(editor, head, true, window, cx);
-}
-
-/// The internal hover action dispatches between `show_hover` or `hide_hover`
-/// depending on whether a point to hover over is provided.
-pub fn hover_at(
-    editor: &mut Editor,
-    anchor: Option<Anchor>,
-    window: &mut Window,
-    cx: &mut Context<Editor>,
-) {
-    if EditorSettings::get_global(cx).hover_popover_enabled {
-        if show_keyboard_hover(editor, window, cx) {
-            return;
-        }
-        if let Some(anchor) = anchor {
-            show_hover(editor, anchor, false, window, cx);
-        } else {
-            hide_hover(editor, cx);
-        }
-    }
-}
-
-pub fn show_keyboard_hover(
-    editor: &mut Editor,
-    window: &mut Window,
-    cx: &mut Context<Editor>,
-) -> bool {
-    if let Some(anchor) = editor.hover_state.info_popovers.iter().find_map(|p| {
-        if *p.keyboard_grace.borrow() {
-            p.anchor
-        } else {
-            None
-        }
-    }) {
-        show_hover(editor, anchor, false, window, cx);
-        return true;
-    }
-
-    if let Some(anchor) = editor
-        .hover_state
-        .diagnostic_popover
-        .as_ref()
-        .and_then(|d| {
-            if *d.keyboard_grace.borrow() {
-                Some(d.anchor)
-            } else {
-                None
-            }
-        })
-    {
-        show_hover(editor, anchor, false, window, cx);
-        return true;
-    }
-
-    false
-}
-
-pub struct InlayHover {
-    pub(crate) range: InlayHighlight,
-    pub tooltip: HoverBlock,
-}
-
-pub fn find_hovered_hint_part(
-    label_parts: Vec<InlayHintLabelPart>,
-    hint_start: InlayOffset,
-    hovered_offset: InlayOffset,
-) -> Option<(InlayHintLabelPart, Range<InlayOffset>)> {
-    if hovered_offset >= hint_start {
-        let mut hovered_character = hovered_offset - hint_start;
-        let mut part_start = hint_start;
-        for part in label_parts {
-            let part_len = part.value.chars().count();
-            if hovered_character > part_len {
-                hovered_character -= part_len;
-                part_start.0 += part_len;
-            } else {
-                let part_end = InlayOffset(part_start.0 + part_len);
-                return Some((part, part_start..part_end));
-            }
-        }
-    }
-    None
-}
-
-pub fn hover_at_inlay(
-    editor: &mut Editor,
-    inlay_hover: InlayHover,
-    window: &mut Window,
-    cx: &mut Context<Editor>,
-) {
-    if EditorSettings::get_global(cx).hover_popover_enabled {
-        if editor.pending_rename.is_some() {
-            return;
-        }
-
-        let Some(project) = editor.project.clone() else {
-            return;
-        };
-
-        if editor
-            .hover_state
-            .info_popovers
-            .iter()
-            .any(|InfoPopover { symbol_range, .. }| {
-                if let RangeInEditor::Inlay(range) = symbol_range
-                    && range == &inlay_hover.range
-                {
-                    // Hover triggered from same location as last time. Don't show again.
-                    return true;
-                }
-                false
-            })
-        {
-            hide_hover(editor, cx);
-        }
-
-        let hover_popover_delay = EditorSettings::get_global(cx).hover_popover_delay.0;
-
-        let task = cx.spawn_in(window, async move |this, cx| {
-            async move {
-                cx.background_executor()
-                    .timer(Duration::from_millis(hover_popover_delay))
-                    .await;
-                this.update(cx, |this, _| {
-                    this.hover_state.diagnostic_popover = None;
-                })?;
-
-                let language_registry = project.read_with(cx, |p, _| p.languages().clone())?;
-                let blocks = vec![inlay_hover.tooltip];
-                let parsed_content =
-                    parse_blocks(&blocks, Some(&language_registry), None, cx).await;
-
-                let scroll_handle = ScrollHandle::new();
-
-                let subscription = this
-                    .update(cx, |_, cx| {
-                        parsed_content.as_ref().map(|parsed_content| {
-                            cx.observe(parsed_content, |_, _, cx| cx.notify())
-                        })
-                    })
-                    .ok()
-                    .flatten();
-
-                let hover_popover = InfoPopover {
-                    symbol_range: RangeInEditor::Inlay(inlay_hover.range.clone()),
-                    parsed_content,
-                    scroll_handle,
-                    keyboard_grace: Rc::new(RefCell::new(false)),
-                    anchor: None,
-                    _subscription: subscription,
-                };
-
-                this.update(cx, |this, cx| {
-                    // TODO: no background highlights happen for inlays currently
-                    this.hover_state.info_popovers = vec![hover_popover];
-                    cx.notify();
-                })?;
-
-                anyhow::Ok(())
-            }
-            .log_err()
-            .await
-        });
-
-        editor.hover_state.info_task = Some(task);
-    }
-}
-
-/// Hides the type information popup.
-/// Triggered by the `Hover` action when the cursor is not over a symbol or when the
-/// selections changed.
-pub fn hide_hover(editor: &mut Editor, cx: &mut Context<Editor>) -> bool {
-    let info_popovers = editor.hover_state.info_popovers.drain(..);
-    let diagnostics_popover = editor.hover_state.diagnostic_popover.take();
-    let did_hide = info_popovers.count() > 0 || diagnostics_popover.is_some();
-
-    editor.hover_state.info_task = None;
-    editor.hover_state.triggered_from = None;
-
-    editor.clear_background_highlights::<HoverState>(cx);
-
-    if did_hide {
-        cx.notify();
-    }
-
-    did_hide
-}
-
-/// Queries the LSP and shows type info and documentation
-/// about the symbol the mouse is currently hovering over.
-/// Triggered by the `Hover` action when the cursor may be over a symbol.
-fn show_hover(
-    editor: &mut Editor,
-    anchor: Anchor,
-    ignore_timeout: bool,
-    window: &mut Window,
-    cx: &mut Context<Editor>,
-) -> Option<()> {
-    if editor.pending_rename.is_some() {
-        return None;
-    }
-
-    let snapshot = editor.snapshot(window, cx);
-
-    let (buffer, buffer_position) = editor
-        .buffer
-        .read(cx)
-        .text_anchor_for_position(anchor, cx)?;
-
-    let (excerpt_id, _, _) = editor.buffer().read(cx).excerpt_containing(anchor, cx)?;
-
-    let language_registry = editor
-        .project()
-        .map(|project| project.read(cx).languages().clone());
-    let provider = editor.semantics_provider.clone()?;
-
-    if !ignore_timeout {
-        if same_info_hover(editor, &snapshot, anchor)
-            || same_diagnostic_hover(editor, &snapshot, anchor)
-            || editor.hover_state.diagnostic_popover.is_some()
-        {
-            // Hover triggered from same location as last time. Don't show again.
-            return None;
-        } else {
-            hide_hover(editor, cx);
-        }
-    }
-
-    // Don't request again if the location is the same as the previous request
-    if let Some(triggered_from) = &editor.hover_state.triggered_from
-        && triggered_from
-            .cmp(&anchor, &snapshot.buffer_snapshot())
-            .is_eq()
-    {
-        return None;
-    }
-
-    let hover_popover_delay = EditorSettings::get_global(cx).hover_popover_delay.0;
-    let all_diagnostics_active = editor.active_diagnostics == ActiveDiagnostic::All;
-    let active_group_id = if let ActiveDiagnostic::Group(group) = &editor.active_diagnostics {
-        Some(group.group_id)
-    } else {
-        None
-    };
-
-    let renderer = GlobalDiagnosticRenderer::global(cx);
-    let task = cx.spawn_in(window, async move |this, cx| {
-        async move {
-            // If we need to delay, delay a set amount initially before making the lsp request
-            let delay = if ignore_timeout {
-                None
-            } else {
-                let lsp_request_early = hover_popover_delay / 2;
-                cx.background_executor()
-                    .timer(Duration::from_millis(
-                        hover_popover_delay - lsp_request_early,
-                    ))
-                    .await;
-
-                // Construct delay task to wait for later
-                let total_delay = Some(
-                    cx.background_executor()
-                        .timer(Duration::from_millis(lsp_request_early)),
-                );
-                total_delay
-            };
-
-            let hover_request = cx.update(|_, cx| provider.hover(&buffer, buffer_position, cx))?;
-
-            if let Some(delay) = delay {
-                delay.await;
-            }
-            let offset = anchor.to_offset(&snapshot.buffer_snapshot());
-            let local_diagnostic = if all_diagnostics_active {
-                None
-            } else {
-                snapshot
-                    .buffer_snapshot()
-                    .diagnostics_with_buffer_ids_in_range::<MultiBufferOffset>(offset..offset)
-                    .filter(|(_, diagnostic)| {
-                        Some(diagnostic.diagnostic.group_id) != active_group_id
-                    })
-                    // Find the entry with the most specific range
-                    .min_by_key(|(_, entry)| entry.range.end - entry.range.start)
-            };
-
-            let diagnostic_popover = if let Some((buffer_id, local_diagnostic)) = local_diagnostic {
-                let group = snapshot
-                    .buffer_snapshot()
-                    .diagnostic_group(buffer_id, local_diagnostic.diagnostic.group_id)
-                    .collect::<Vec<_>>();
-                let point_range = local_diagnostic
-                    .range
-                    .start
-                    .to_point(&snapshot.buffer_snapshot())
-                    ..local_diagnostic
-                        .range
-                        .end
-                        .to_point(&snapshot.buffer_snapshot());
-                let markdown = cx.update(|_, cx| {
-                    renderer
-                        .as_ref()
-                        .and_then(|renderer| {
-                            renderer.render_hover(
-                                group,
-                                point_range,
-                                buffer_id,
-                                language_registry.clone(),
-                                cx,
-                            )
-                        })
-                        .context("no rendered diagnostic")
-                })??;
-
-                let (background_color, border_color) = cx.update(|_, cx| {
-                    let status_colors = cx.theme().status();
-                    match local_diagnostic.diagnostic.severity {
-                        DiagnosticSeverity::ERROR => {
-                            (status_colors.error_background, status_colors.error_border)
-                        }
-                        DiagnosticSeverity::WARNING => (
-                            status_colors.warning_background,
-                            status_colors.warning_border,
-                        ),
-                        DiagnosticSeverity::INFORMATION => {
-                            (status_colors.info_background, status_colors.info_border)
-                        }
-                        DiagnosticSeverity::HINT => {
-                            (status_colors.hint_background, status_colors.hint_border)
-                        }
-                        _ => (
-                            status_colors.ignored_background,
-                            status_colors.ignored_border,
-                        ),
-                    }
-                })?;
-
-                let subscription =
-                    this.update(cx, |_, cx| cx.observe(&markdown, |_, _, cx| cx.notify()))?;
-
-                let local_diagnostic = DiagnosticEntry {
-                    diagnostic: local_diagnostic.diagnostic.to_owned(),
-                    range: snapshot
-                        .buffer_snapshot()
-                        .anchor_before(local_diagnostic.range.start)
-                        ..snapshot
-                            .buffer_snapshot()
-                            .anchor_after(local_diagnostic.range.end),
-                };
-
-                let scroll_handle = ScrollHandle::new();
-
-                Some(DiagnosticPopover {
-                    local_diagnostic,
-                    markdown,
-                    border_color,
-                    scroll_handle,
-                    background_color,
-                    keyboard_grace: Rc::new(RefCell::new(ignore_timeout)),
-                    anchor,
-                    _subscription: subscription,
-                })
-            } else {
-                None
-            };
-
-            this.update(cx, |this, _| {
-                this.hover_state.diagnostic_popover = diagnostic_popover;
-            })?;
-
-            let invisible_char = if let Some(invisible) = snapshot
-                .buffer_snapshot()
-                .chars_at(anchor)
-                .next()
-                .filter(|&c| is_invisible(c))
-            {
-                let after = snapshot.buffer_snapshot().anchor_after(
-                    anchor.to_offset(&snapshot.buffer_snapshot()) + invisible.len_utf8(),
-                );
-                Some((invisible, anchor..after))
-            } else if let Some(invisible) = snapshot
-                .buffer_snapshot()
-                .reversed_chars_at(anchor)
-                .next()
-                .filter(|&c| is_invisible(c))
-            {
-                let before = snapshot.buffer_snapshot().anchor_before(
-                    anchor.to_offset(&snapshot.buffer_snapshot()) - invisible.len_utf8(),
-                );
-
-                Some((invisible, before..anchor))
-            } else {
-                None
-            };
-
-            let hovers_response = if let Some(hover_request) = hover_request {
-                hover_request.await.unwrap_or_default()
-            } else {
-                Vec::new()
-            };
-            let snapshot = this.update_in(cx, |this, window, cx| this.snapshot(window, cx))?;
-            let mut hover_highlights = Vec::with_capacity(hovers_response.len());
-            let mut info_popovers = Vec::with_capacity(
-                hovers_response.len() + if invisible_char.is_some() { 1 } else { 0 },
-            );
-
-            if let Some((invisible, range)) = invisible_char {
-                let blocks = vec![HoverBlock {
-                    text: format!("Unicode character U+{:02X}", invisible as u32),
-                    kind: HoverBlockKind::PlainText,
-                }];
-                let parsed_content =
-                    parse_blocks(&blocks, language_registry.as_ref(), None, cx).await;
-                let scroll_handle = ScrollHandle::new();
-                let subscription = this
-                    .update(cx, |_, cx| {
-                        parsed_content.as_ref().map(|parsed_content| {
-                            cx.observe(parsed_content, |_, _, cx| cx.notify())
-                        })
-                    })
-                    .ok()
-                    .flatten();
-                info_popovers.push(InfoPopover {
-                    symbol_range: RangeInEditor::Text(range),
-                    parsed_content,
-                    scroll_handle,
-                    keyboard_grace: Rc::new(RefCell::new(ignore_timeout)),
-                    anchor: Some(anchor),
-                    _subscription: subscription,
-                })
-            }
-
-            for hover_result in hovers_response {
-                // Create symbol range of anchors for highlighting and filtering of future requests.
-                let range = hover_result
-                    .range
-                    .and_then(|range| {
-                        let range = snapshot
-                            .buffer_snapshot()
-                            .anchor_range_in_excerpt(excerpt_id, range)?;
-                        Some(range)
-                    })
-                    .or_else(|| {
-                        let snapshot = &snapshot.buffer_snapshot();
-                        let range = snapshot.syntax_ancestor(anchor..anchor)?.1;
-                        Some(snapshot.anchor_before(range.start)..snapshot.anchor_after(range.end))
-                    })
-                    .unwrap_or_else(|| anchor..anchor);
-
-                let blocks = hover_result.contents;
-                let language = hover_result.language;
-                let parsed_content =
-                    parse_blocks(&blocks, language_registry.as_ref(), language, cx).await;
-                let scroll_handle = ScrollHandle::new();
-                hover_highlights.push(range.clone());
-                let subscription = this
-                    .update(cx, |_, cx| {
-                        parsed_content.as_ref().map(|parsed_content| {
-                            cx.observe(parsed_content, |_, _, cx| cx.notify())
-                        })
-                    })
-                    .ok()
-                    .flatten();
-                info_popovers.push(InfoPopover {
-                    symbol_range: RangeInEditor::Text(range),
-                    parsed_content,
-                    scroll_handle,
-                    keyboard_grace: Rc::new(RefCell::new(ignore_timeout)),
-                    anchor: Some(anchor),
-                    _subscription: subscription,
-                });
-            }
-
-            this.update_in(cx, |editor, window, cx| {
-                if hover_highlights.is_empty() {
-                    editor.clear_background_highlights::<HoverState>(cx);
-                } else {
-                    // Highlight the selected symbol using a background highlight
-                    editor.highlight_background::<HoverState>(
-                        &hover_highlights,
-                        |_, theme| theme.colors().element_hover, // todo update theme
-                        cx,
-                    );
-                }
-
-                editor.hover_state.info_popovers = info_popovers;
-                cx.notify();
-                window.refresh();
-            })?;
-
-            anyhow::Ok(())
-        }
-        .log_err()
-        .await
-    });
-
-    editor.hover_state.info_task = Some(task);
-    None
-}
-
-fn same_info_hover(editor: &Editor, snapshot: &EditorSnapshot, anchor: Anchor) -> bool {
-    editor
-        .hover_state
-        .info_popovers
-        .iter()
-        .any(|InfoPopover { symbol_range, .. }| {
-            symbol_range
-                .as_text_range()
-                .map(|range| {
-                    let hover_range = range.to_offset(&snapshot.buffer_snapshot());
-                    let offset = anchor.to_offset(&snapshot.buffer_snapshot());
-                    // LSP returns a hover result for the end index of ranges that should be hovered, so we need to
-                    // use an inclusive range here to check if we should dismiss the popover
-                    (hover_range.start..=hover_range.end).contains(&offset)
-                })
-                .unwrap_or(false)
-        })
-}
-
-fn same_diagnostic_hover(editor: &Editor, snapshot: &EditorSnapshot, anchor: Anchor) -> bool {
-    editor
-        .hover_state
-        .diagnostic_popover
-        .as_ref()
-        .map(|diagnostic| {
-            let hover_range = diagnostic
-                .local_diagnostic
-                .range
-                .to_offset(&snapshot.buffer_snapshot());
-            let offset = anchor.to_offset(&snapshot.buffer_snapshot());
-
-            // Here we do basically the same as in `same_info_hover`, see comment there for an explanation
-            (hover_range.start..=hover_range.end).contains(&offset)
-        })
-        .unwrap_or(false)
-}
-
-async fn parse_blocks(
-    blocks: &[HoverBlock],
-    language_registry: Option<&Arc<LanguageRegistry>>,
-    language: Option<Arc<Language>>,
-    cx: &mut AsyncWindowContext,
-) -> Option<Entity<Markdown>> {
-    let combined_text = blocks
-        .iter()
-        .map(|block| match &block.kind {
-            project::HoverBlockKind::PlainText | project::HoverBlockKind::Markdown => {
-                Cow::Borrowed(block.text.trim())
-            }
-            project::HoverBlockKind::Code { language } => {
-                Cow::Owned(format!("```{}\n{}\n```", language, block.text.trim()))
-            }
-        })
-        .join("\n\n");
-
-    cx.new_window_entity(|_window, cx| {
-        Markdown::new(
-            combined_text.into(),
-            language_registry.cloned(),
-            language.map(|language| language.name()),
-            cx,
-        )
-    })
-    .ok()
-}
-
-pub fn hover_markdown_style(window: &Window, cx: &App) -> MarkdownStyle {
-    let settings = ThemeSettings::get_global(cx);
-    let ui_font_family = settings.ui_font.family.clone();
-    let ui_font_features = settings.ui_font.features.clone();
-    let ui_font_fallbacks = settings.ui_font.fallbacks.clone();
-    let buffer_font_family = settings.buffer_font.family.clone();
-    let buffer_font_features = settings.buffer_font.features.clone();
-    let buffer_font_fallbacks = settings.buffer_font.fallbacks.clone();
-
-    let mut base_text_style = window.text_style();
-    base_text_style.refine(&TextStyleRefinement {
-        font_family: Some(ui_font_family),
-        font_features: Some(ui_font_features),
-        font_fallbacks: ui_font_fallbacks,
-        color: Some(cx.theme().colors().editor_foreground),
-        ..Default::default()
-    });
-    MarkdownStyle {
-        base_text_style,
-        code_block: StyleRefinement::default()
-            .my(rems(1.))
-            .font_buffer(cx)
-            .font_features(buffer_font_features.clone()),
-        inline_code: TextStyleRefinement {
-            background_color: Some(cx.theme().colors().background),
-            font_family: Some(buffer_font_family),
-            font_features: Some(buffer_font_features),
-            font_fallbacks: buffer_font_fallbacks,
-            ..Default::default()
-        },
-        rule_color: cx.theme().colors().border,
-        block_quote_border_color: Color::Muted.color(cx),
-        block_quote: TextStyleRefinement {
-            color: Some(Color::Muted.color(cx)),
-            ..Default::default()
-        },
-        link: TextStyleRefinement {
-            color: Some(cx.theme().colors().editor_foreground),
-            underline: Some(gpui::UnderlineStyle {
-                thickness: px(1.),
-                color: Some(cx.theme().colors().editor_foreground),
-                wavy: false,
-            }),
-            ..Default::default()
-        },
-        syntax: cx.theme().syntax().clone(),
-        selection_background_color: cx.theme().colors().element_selection_background,
-        heading: StyleRefinement::default()
-            .font_weight(FontWeight::BOLD)
-            .text_base()
-            .mt(rems(1.))
-            .mb_0(),
-        ..Default::default()
-    }
-}
-
-pub fn diagnostics_markdown_style(window: &Window, cx: &App) -> MarkdownStyle {
-    let settings = ThemeSettings::get_global(cx);
-    let ui_font_family = settings.ui_font.family.clone();
-    let ui_font_fallbacks = settings.ui_font.fallbacks.clone();
-    let ui_font_features = settings.ui_font.features.clone();
-    let buffer_font_family = settings.buffer_font.family.clone();
-    let buffer_font_features = settings.buffer_font.features.clone();
-    let buffer_font_fallbacks = settings.buffer_font.fallbacks.clone();
-
-    let mut base_text_style = window.text_style();
-    base_text_style.refine(&TextStyleRefinement {
-        font_family: Some(ui_font_family),
-        font_features: Some(ui_font_features),
-        font_fallbacks: ui_font_fallbacks,
-        color: Some(cx.theme().colors().editor_foreground),
-        ..Default::default()
-    });
-    MarkdownStyle {
-        base_text_style,
-        code_block: StyleRefinement::default().my(rems(1.)).font_buffer(cx),
-        inline_code: TextStyleRefinement {
-            background_color: Some(cx.theme().colors().editor_background.opacity(0.5)),
-            font_family: Some(buffer_font_family),
-            font_features: Some(buffer_font_features),
-            font_fallbacks: buffer_font_fallbacks,
-            ..Default::default()
-        },
-        rule_color: cx.theme().colors().border,
-        block_quote_border_color: Color::Muted.color(cx),
-        block_quote: TextStyleRefinement {
-            color: Some(Color::Muted.color(cx)),
-            ..Default::default()
-        },
-        link: TextStyleRefinement {
-            color: Some(cx.theme().colors().editor_foreground),
-            underline: Some(gpui::UnderlineStyle {
-                thickness: px(1.),
-                color: Some(cx.theme().colors().editor_foreground),
-                wavy: false,
-            }),
-            ..Default::default()
-        },
-        syntax: cx.theme().syntax().clone(),
-        selection_background_color: cx.theme().colors().element_selection_background,
-        height_is_multiple_of_line_height: true,
-        heading: StyleRefinement::default()
-            .font_weight(FontWeight::BOLD)
-            .text_base()
-            .mb_0(),
-        ..Default::default()
-    }
-}
-
-pub fn open_markdown_url(link: SharedString, window: &mut Window, cx: &mut App) {
-    if let Ok(uri) = Url::parse(&link)
-        && uri.scheme() == "file"
-        && let Some(workspace) = window.root::<Workspace>().flatten()
-    {
-        workspace.update(cx, |workspace, cx| {
-            let task = workspace.open_abs_path(
-                PathBuf::from(uri.path()),
-                OpenOptions {
-                    visible: Some(OpenVisible::None),
-                    ..Default::default()
-                },
-                window,
-                cx,
-            );
-
-            cx.spawn_in(window, async move |_, cx| {
-                let item = task.await?;
-                // Ruby LSP uses URLs with #L1,1-4,4
-                // we'll just take the first number and assume it's a line number
-                let Some(fragment) = uri.fragment() else {
-                    return anyhow::Ok(());
-                };
-                let mut accum = 0u32;
-                for c in fragment.chars() {
-                    if c >= '0' && c <= '9' && accum < u32::MAX / 2 {
-                        accum *= 10;
-                        accum += c as u32 - '0' as u32;
-                    } else if accum > 0 {
-                        break;
-                    }
-                }
-                if accum == 0 {
-                    return Ok(());
-                }
-                let Some(editor) = cx.update(|_, cx| item.act_as::<Editor>(cx))? else {
-                    return Ok(());
-                };
-                editor.update_in(cx, |editor, window, cx| {
-                    editor.change_selections(Default::default(), window, cx, |selections| {
-                        selections.select_ranges([
-                            text::Point::new(accum - 1, 0)..text::Point::new(accum - 1, 0)
-                        ]);
-                    });
-                })
-            })
-            .detach_and_log_err(cx);
-        });
-        return;
-    }
-    cx.open_url(&link);
-}
-
-#[derive(Default)]
-pub struct HoverState {
-    pub info_popovers: Vec<InfoPopover>,
-    pub diagnostic_popover: Option<DiagnosticPopover>,
-    pub triggered_from: Option<Anchor>,
-    pub info_task: Option<Task<Option<()>>>,
-}
-
-impl HoverState {
-    pub fn visible(&self) -> bool {
-        !self.info_popovers.is_empty() || self.diagnostic_popover.is_some()
-    }
-
-    pub(crate) fn render(
-        &mut self,
-        snapshot: &EditorSnapshot,
-        visible_rows: Range<DisplayRow>,
-        max_size: Size<Pixels>,
-        text_layout_details: &TextLayoutDetails,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) -> Option<(DisplayPoint, Vec<AnyElement>)> {
-        if !self.visible() {
-            return None;
-        }
-        // If there is a diagnostic, position the popovers based on that.
-        // Otherwise use the start of the hover range
-        let anchor = self
-            .diagnostic_popover
-            .as_ref()
-            .map(|diagnostic_popover| &diagnostic_popover.local_diagnostic.range.start)
-            .or_else(|| {
-                self.info_popovers.iter().find_map(|info_popover| {
-                    match &info_popover.symbol_range {
-                        RangeInEditor::Text(range) => Some(&range.start),
-                        RangeInEditor::Inlay(_) => None,
-                    }
-                })
-            })
-            .or_else(|| {
-                self.info_popovers.iter().find_map(|info_popover| {
-                    match &info_popover.symbol_range {
-                        RangeInEditor::Text(_) => None,
-                        RangeInEditor::Inlay(range) => Some(&range.inlay_position),
-                    }
-                })
-            })?;
-        let mut point = anchor.to_display_point(&snapshot.display_snapshot);
-        // Clamp the point within the visible rows in case the popup source spans multiple lines
-        if visible_rows.end <= point.row() {
-            point = crate::movement::up_by_rows(
-                &snapshot.display_snapshot,
-                point,
-                1 + (point.row() - visible_rows.end).0,
-                text::SelectionGoal::None,
-                true,
-                text_layout_details,
-            )
-            .0;
-        } else if point.row() < visible_rows.start {
-            point = crate::movement::down_by_rows(
-                &snapshot.display_snapshot,
-                point,
-                (visible_rows.start - point.row()).0,
-                text::SelectionGoal::None,
-                true,
-                text_layout_details,
-            )
-            .0;
-        }
-
-        if !visible_rows.contains(&point.row()) {
-            log::error!("Hover popover point out of bounds after moving");
-            return None;
-        }
-
-        let mut elements = Vec::new();
-
-        if let Some(diagnostic_popover) = self.diagnostic_popover.as_ref() {
-            elements.push(diagnostic_popover.render(max_size, window, cx));
-        }
-        for info_popover in &mut self.info_popovers {
-            elements.push(info_popover.render(max_size, window, cx));
-        }
-
-        Some((point, elements))
-    }
-
-    pub fn focused(&self, window: &mut Window, cx: &mut Context<Editor>) -> bool {
-        let mut hover_popover_is_focused = false;
-        for info_popover in &self.info_popovers {
-            if let Some(markdown_view) = &info_popover.parsed_content
-                && markdown_view.focus_handle(cx).is_focused(window)
-            {
-                hover_popover_is_focused = true;
-            }
-        }
-        if let Some(diagnostic_popover) = &self.diagnostic_popover
-            && diagnostic_popover
-                .markdown
-                .focus_handle(cx)
-                .is_focused(window)
-        {
-            hover_popover_is_focused = true;
-        }
-        hover_popover_is_focused
-    }
-}
-
-pub struct InfoPopover {
-    pub symbol_range: RangeInEditor,
-    pub parsed_content: Option<Entity<Markdown>>,
-    pub scroll_handle: ScrollHandle,
-    pub keyboard_grace: Rc<RefCell<bool>>,
-    pub anchor: Option<Anchor>,
-    _subscription: Option<Subscription>,
-}
-
-impl InfoPopover {
-    pub(crate) fn render(
-        &mut self,
-        max_size: Size<Pixels>,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) -> AnyElement {
-        let keyboard_grace = Rc::clone(&self.keyboard_grace);
-        div()
-            .id("info_popover")
-            .occlude()
-            .elevation_2(cx)
-            // Prevent a mouse down/move on the popover from being propagated to the editor,
-            // because that would dismiss the popover.
-            .on_mouse_move(|_, _, cx| cx.stop_propagation())
-            .on_mouse_down(MouseButton::Left, move |_, _, cx| {
-                let mut keyboard_grace = keyboard_grace.borrow_mut();
-                *keyboard_grace = false;
-                cx.stop_propagation();
-            })
-            .when_some(self.parsed_content.clone(), |this, markdown| {
-                this.child(
-                    div()
-                        .id("info-md-container")
-                        .overflow_y_scroll()
-                        .max_w(max_size.width)
-                        .max_h(max_size.height)
-                        .track_scroll(&self.scroll_handle)
-                        .child(
-                            MarkdownElement::new(markdown, hover_markdown_style(window, cx))
-                                .code_block_renderer(markdown::CodeBlockRenderer::Default {
-                                    copy_button: false,
-                                    copy_button_on_hover: false,
-                                    border: false,
-                                })
-                                .on_url_click(open_markdown_url)
-                                .p_2(),
-                        ),
-                )
-                .custom_scrollbars(
-                    Scrollbars::for_settings::<EditorSettings>()
-                        .tracked_scroll_handle(&self.scroll_handle),
-                    window,
-                    cx,
-                )
-            })
-            .into_any_element()
-    }
-
-    pub fn scroll(&self, amount: ScrollAmount, window: &mut Window, cx: &mut Context<Editor>) {
-        let mut current = self.scroll_handle.offset();
-        current.y -= amount.pixels(
-            window.line_height(),
-            self.scroll_handle.bounds().size.height - px(16.),
-        ) / 2.0;
-        cx.notify();
-        self.scroll_handle.set_offset(current);
-    }
-}
-
-pub struct DiagnosticPopover {
-    pub(crate) local_diagnostic: DiagnosticEntry<Anchor>,
-    markdown: Entity<Markdown>,
-    border_color: Hsla,
-    background_color: Hsla,
-    pub keyboard_grace: Rc<RefCell<bool>>,
-    pub anchor: Anchor,
-    _subscription: Subscription,
-    pub scroll_handle: ScrollHandle,
-}
-
-impl DiagnosticPopover {
-    pub fn render(
-        &self,
-        max_size: Size<Pixels>,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) -> AnyElement {
-        let keyboard_grace = Rc::clone(&self.keyboard_grace);
-        let this = cx.entity().downgrade();
-        div()
-            .id("diagnostic")
-            .occlude()
-            .elevation_2_borderless(cx)
-            // Don't draw the background color if the theme
-            // allows transparent surfaces.
-            .when(theme_is_transparent(cx), |this| {
-                this.bg(gpui::transparent_black())
-            })
-            // Prevent a mouse move on the popover from being propagated to the editor,
-            // because that would dismiss the popover.
-            .on_mouse_move(|_, _, cx| cx.stop_propagation())
-            // Prevent a mouse down on the popover from being propagated to the editor,
-            // because that would move the cursor.
-            .on_mouse_down(MouseButton::Left, move |_, _, cx| {
-                let mut keyboard_grace = keyboard_grace.borrow_mut();
-                *keyboard_grace = false;
-                cx.stop_propagation();
-            })
-            .child(
-                div()
-                    .py_1()
-                    .px_2()
-                    .bg(self.background_color)
-                    .border_1()
-                    .border_color(self.border_color)
-                    .rounded_lg()
-                    .child(
-                        div()
-                            .id("diagnostic-content-container")
-                            .overflow_y_scroll()
-                            .max_w(max_size.width)
-                            .max_h(max_size.height)
-                            .track_scroll(&self.scroll_handle)
-                            .child(
-                                MarkdownElement::new(
-                                    self.markdown.clone(),
-                                    diagnostics_markdown_style(window, cx),
-                                )
-                                .code_block_renderer(markdown::CodeBlockRenderer::Default {
-                                    copy_button: false,
-                                    copy_button_on_hover: false,
-                                    border: false,
-                                })
-                                .on_url_click(
-                                    move |link, window, cx| {
-                                        if let Some(renderer) = GlobalDiagnosticRenderer::global(cx)
-                                        {
-                                            this.update(cx, |this, cx| {
-                                                renderer.as_ref().open_link(this, link, window, cx);
-                                            })
-                                            .ok();
-                                        }
-                                    },
-                                ),
-                            ),
-                    )
-                    .custom_scrollbars(
-                        Scrollbars::for_settings::<EditorSettings>()
-                            .tracked_scroll_handle(&self.scroll_handle),
-                        window,
-                        cx,
-                    ),
-            )
-            .into_any_element()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::{
-        PointForPosition,
-        actions::ConfirmCompletion,
-        editor_tests::{handle_completion_request, init_test},
-        inlays::inlay_hints::tests::{cached_hint_labels, visible_hint_labels},
-        test::editor_lsp_test_context::EditorLspTestContext,
-    };
-    use collections::BTreeSet;
-    use gpui::App;
-    use indoc::indoc;
-    use markdown::parser::MarkdownEvent;
-    use project::InlayId;
-    use settings::InlayHintSettingsContent;
-    use smol::stream::StreamExt;
-    use std::sync::atomic;
-    use std::sync::atomic::AtomicUsize;
-    use text::Bias;
-
-    fn get_hover_popover_delay(cx: &gpui::TestAppContext) -> u64 {
-        cx.read(|cx: &App| -> u64 { EditorSettings::get_global(cx).hover_popover_delay.0 })
-    }
-
-    impl InfoPopover {
-        fn get_rendered_text(&self, cx: &gpui::App) -> String {
-            let mut rendered_text = String::new();
-            if let Some(parsed_content) = self.parsed_content.clone() {
-                let markdown = parsed_content.read(cx);
-                let text = markdown.parsed_markdown().source().to_string();
-                let data = markdown.parsed_markdown().events();
-                let slice = data;
-
-                for (range, event) in slice.iter() {
-                    match event {
-                        MarkdownEvent::SubstitutedText(parsed) => {
-                            rendered_text.push_str(parsed.as_str())
-                        }
-                        MarkdownEvent::Text | MarkdownEvent::Code => {
-                            rendered_text.push_str(&text[range.clone()])
-                        }
-                        _ => {}
-                    }
-                }
-            }
-            rendered_text
-        }
-    }
-
-    #[gpui::test]
-    async fn test_mouse_hover_info_popover_with_autocomplete_popover(
-        cx: &mut gpui::TestAppContext,
-    ) {
-        init_test(cx, |_| {});
-
-        let mut cx = EditorLspTestContext::new_rust(
-            lsp::ServerCapabilities {
-                hover_provider: Some(lsp::HoverProviderCapability::Simple(true)),
-                completion_provider: Some(lsp::CompletionOptions {
-                    trigger_characters: Some(vec![".".to_string(), ":".to_string()]),
-                    resolve_provider: Some(true),
-                    ..Default::default()
-                }),
-                ..Default::default()
-            },
-            cx,
-        )
-        .await;
-        let counter = Arc::new(AtomicUsize::new(0));
-        // Basic hover delays and then pops without moving the mouse
-        cx.set_state(indoc! {"
-                oneˇ
-                two
-                three
-                fn test() { println!(); }
-            "});
-
-        //prompt autocompletion menu
-        cx.simulate_keystroke(".");
-        handle_completion_request(
-            indoc! {"
-                        one.|<>
-                        two
-                        three
-                    "},
-            vec!["first_completion", "second_completion"],
-            true,
-            counter.clone(),
-            &mut cx,
-        )
-        .await;
-        cx.condition(|editor, _| editor.context_menu_visible()) // wait until completion menu is visible
-            .await;
-        assert_eq!(counter.load(atomic::Ordering::Acquire), 1); // 1 completion request
-
-        let hover_point = cx.display_point(indoc! {"
-                one.
-                two
-                three
-                fn test() { printˇln!(); }
-            "});
-        cx.update_editor(|editor, window, cx| {
-            let snapshot = editor.snapshot(window, cx);
-            let anchor = snapshot
-                .buffer_snapshot()
-                .anchor_before(hover_point.to_offset(&snapshot, Bias::Left));
-            hover_at(editor, Some(anchor), window, cx)
-        });
-        assert!(!cx.editor(|editor, _window, _cx| editor.hover_state.visible()));
-
-        // After delay, hover should be visible.
-        let symbol_range = cx.lsp_range(indoc! {"
-                one.
-                two
-                three
-                fn test() { «println!»(); }
-            "});
-        let mut requests =
-            cx.set_request_handler::<lsp::request::HoverRequest, _, _>(move |_, _, _| async move {
-                Ok(Some(lsp::Hover {
-                    contents: lsp::HoverContents::Markup(lsp::MarkupContent {
-                        kind: lsp::MarkupKind::Markdown,
-                        value: "some basic docs".to_string(),
-                    }),
-                    range: Some(symbol_range),
-                }))
-            });
-        cx.background_executor
-            .advance_clock(Duration::from_millis(get_hover_popover_delay(&cx) + 100));
-        requests.next().await;
-
-        cx.editor(|editor, _window, cx| {
-            assert!(editor.hover_state.visible());
-            assert_eq!(
-                editor.hover_state.info_popovers.len(),
-                1,
-                "Expected exactly one hover but got: {:?}",
-                editor.hover_state.info_popovers.len()
-            );
-            let rendered_text = editor
-                .hover_state
-                .info_popovers
-                .first()
-                .unwrap()
-                .get_rendered_text(cx);
-            assert_eq!(rendered_text, "some basic docs".to_string())
-        });
-
-        // check that the completion menu is still visible and that there still has only been 1 completion request
-        cx.editor(|editor, _, _| assert!(editor.context_menu_visible()));
-        assert_eq!(counter.load(atomic::Ordering::Acquire), 1);
-
-        //apply a completion and check it was successfully applied
-        let _apply_additional_edits = cx.update_editor(|editor, window, cx| {
-            editor.context_menu_next(&Default::default(), window, cx);
-            editor
-                .confirm_completion(&ConfirmCompletion::default(), window, cx)
-                .unwrap()
-        });
-        cx.assert_editor_state(indoc! {"
-            one.second_completionˇ
-            two
-            three
-            fn test() { println!(); }
-        "});
-
-        // check that the completion menu is no longer visible and that there still has only been 1 completion request
-        cx.editor(|editor, _, _| assert!(!editor.context_menu_visible()));
-        assert_eq!(counter.load(atomic::Ordering::Acquire), 1);
-
-        //verify the information popover is still visible and unchanged
-        cx.editor(|editor, _, cx| {
-            assert!(editor.hover_state.visible());
-            assert_eq!(
-                editor.hover_state.info_popovers.len(),
-                1,
-                "Expected exactly one hover but got: {:?}",
-                editor.hover_state.info_popovers.len()
-            );
-            let rendered_text = editor
-                .hover_state
-                .info_popovers
-                .first()
-                .unwrap()
-                .get_rendered_text(cx);
-
-            assert_eq!(rendered_text, "some basic docs".to_string())
-        });
-
-        // Mouse moved with no hover response dismisses
-        let hover_point = cx.display_point(indoc! {"
-                one.second_completionˇ
-                two
-                three
-                fn teˇst() { println!(); }
-            "});
-        let mut request = cx
-            .lsp
-            .set_request_handler::<lsp::request::HoverRequest, _, _>(
-                |_, _| async move { Ok(None) },
-            );
-        cx.update_editor(|editor, window, cx| {
-            let snapshot = editor.snapshot(window, cx);
-            let anchor = snapshot
-                .buffer_snapshot()
-                .anchor_before(hover_point.to_offset(&snapshot, Bias::Left));
-            hover_at(editor, Some(anchor), window, cx)
-        });
-        cx.background_executor
-            .advance_clock(Duration::from_millis(get_hover_popover_delay(&cx) + 100));
-        request.next().await;
-
-        // verify that the information popover is no longer visible
-        cx.editor(|editor, _, _| {
-            assert!(!editor.hover_state.visible());
-        });
-    }
-
-    #[gpui::test]
-    async fn test_mouse_hover_info_popover(cx: &mut gpui::TestAppContext) {
-        init_test(cx, |_| {});
-
-        let mut cx = EditorLspTestContext::new_rust(
-            lsp::ServerCapabilities {
-                hover_provider: Some(lsp::HoverProviderCapability::Simple(true)),
-                ..Default::default()
-            },
-            cx,
-        )
-        .await;
-
-        // Basic hover delays and then pops without moving the mouse
-        cx.set_state(indoc! {"
-            fn ˇtest() { println!(); }
-        "});
-        let hover_point = cx.display_point(indoc! {"
-            fn test() { printˇln!(); }
-        "});
-
-        cx.update_editor(|editor, window, cx| {
-            let snapshot = editor.snapshot(window, cx);
-            let anchor = snapshot
-                .buffer_snapshot()
-                .anchor_before(hover_point.to_offset(&snapshot, Bias::Left));
-            hover_at(editor, Some(anchor), window, cx)
-        });
-        assert!(!cx.editor(|editor, _window, _cx| editor.hover_state.visible()));
-
-        // After delay, hover should be visible.
-        let symbol_range = cx.lsp_range(indoc! {"
-            fn test() { «println!»(); }
-        "});
-        let mut requests =
-            cx.set_request_handler::<lsp::request::HoverRequest, _, _>(move |_, _, _| async move {
-                Ok(Some(lsp::Hover {
-                    contents: lsp::HoverContents::Markup(lsp::MarkupContent {
-                        kind: lsp::MarkupKind::Markdown,
-                        value: "some basic docs".to_string(),
-                    }),
-                    range: Some(symbol_range),
-                }))
-            });
-        cx.background_executor
-            .advance_clock(Duration::from_millis(get_hover_popover_delay(&cx) + 100));
-        requests.next().await;
-
-        cx.editor(|editor, _, cx| {
-            assert!(editor.hover_state.visible());
-            assert_eq!(
-                editor.hover_state.info_popovers.len(),
-                1,
-                "Expected exactly one hover but got: {:?}",
-                editor.hover_state.info_popovers.len()
-            );
-            let rendered_text = editor
-                .hover_state
-                .info_popovers
-                .first()
-                .unwrap()
-                .get_rendered_text(cx);
-
-            assert_eq!(rendered_text, "some basic docs".to_string())
-        });
-
-        // Mouse moved with no hover response dismisses
-        let hover_point = cx.display_point(indoc! {"
-            fn teˇst() { println!(); }
-        "});
-        let mut request = cx
-            .lsp
-            .set_request_handler::<lsp::request::HoverRequest, _, _>(
-                |_, _| async move { Ok(None) },
-            );
-        cx.update_editor(|editor, window, cx| {
-            let snapshot = editor.snapshot(window, cx);
-            let anchor = snapshot
-                .buffer_snapshot()
-                .anchor_before(hover_point.to_offset(&snapshot, Bias::Left));
-            hover_at(editor, Some(anchor), window, cx)
-        });
-        cx.background_executor
-            .advance_clock(Duration::from_millis(get_hover_popover_delay(&cx) + 100));
-        request.next().await;
-        cx.editor(|editor, _, _| {
-            assert!(!editor.hover_state.visible());
-        });
-    }
-
-    #[gpui::test]
-    async fn test_keyboard_hover_info_popover(cx: &mut gpui::TestAppContext) {
-        init_test(cx, |_| {});
-
-        let mut cx = EditorLspTestContext::new_rust(
-            lsp::ServerCapabilities {
-                hover_provider: Some(lsp::HoverProviderCapability::Simple(true)),
-                ..Default::default()
-            },
-            cx,
-        )
-        .await;
-
-        // Hover with keyboard has no delay
-        cx.set_state(indoc! {"
-            fˇn test() { println!(); }
-        "});
-        cx.update_editor(|editor, window, cx| hover(editor, &Hover, window, cx));
-        let symbol_range = cx.lsp_range(indoc! {"
-            «fn» test() { println!(); }
-        "});
-
-        cx.editor(|editor, _window, _cx| {
-            assert!(!editor.hover_state.visible());
-
-            assert_eq!(
-                editor.hover_state.info_popovers.len(),
-                0,
-                "Expected no hovers but got but got: {:?}",
-                editor.hover_state.info_popovers.len()
-            );
-        });
-
-        let mut requests =
-            cx.set_request_handler::<lsp::request::HoverRequest, _, _>(move |_, _, _| async move {
-                Ok(Some(lsp::Hover {
-                    contents: lsp::HoverContents::Markup(lsp::MarkupContent {
-                        kind: lsp::MarkupKind::Markdown,
-                        value: "some other basic docs".to_string(),
-                    }),
-                    range: Some(symbol_range),
-                }))
-            });
-
-        requests.next().await;
-        cx.dispatch_action(Hover);
-
-        cx.condition(|editor, _| editor.hover_state.visible()).await;
-        cx.editor(|editor, _, cx| {
-            assert_eq!(
-                editor.hover_state.info_popovers.len(),
-                1,
-                "Expected exactly one hover but got: {:?}",
-                editor.hover_state.info_popovers.len()
-            );
-
-            let rendered_text = editor
-                .hover_state
-                .info_popovers
-                .first()
-                .unwrap()
-                .get_rendered_text(cx);
-
-            assert_eq!(rendered_text, "some other basic docs".to_string())
-        });
-    }
-
-    #[gpui::test]
-    async fn test_empty_hovers_filtered(cx: &mut gpui::TestAppContext) {
-        init_test(cx, |_| {});
-
-        let mut cx = EditorLspTestContext::new_rust(
-            lsp::ServerCapabilities {
-                hover_provider: Some(lsp::HoverProviderCapability::Simple(true)),
-                ..Default::default()
-            },
-            cx,
-        )
-        .await;
-
-        // Hover with keyboard has no delay
-        cx.set_state(indoc! {"
-            fˇn test() { println!(); }
-        "});
-        cx.update_editor(|editor, window, cx| hover(editor, &Hover, window, cx));
-        let symbol_range = cx.lsp_range(indoc! {"
-            «fn» test() { println!(); }
-        "});
-        cx.set_request_handler::<lsp::request::HoverRequest, _, _>(move |_, _, _| async move {
-            Ok(Some(lsp::Hover {
-                contents: lsp::HoverContents::Array(vec![
-                    lsp::MarkedString::String("regular text for hover to show".to_string()),
-                    lsp::MarkedString::String("".to_string()),
-                    lsp::MarkedString::LanguageString(lsp::LanguageString {
-                        language: "Rust".to_string(),
-                        value: "".to_string(),
-                    }),
-                ]),
-                range: Some(symbol_range),
-            }))
-        })
-        .next()
-        .await;
-        cx.dispatch_action(Hover);
-
-        cx.condition(|editor, _| editor.hover_state.visible()).await;
-        cx.editor(|editor, _, cx| {
-            assert_eq!(
-                editor.hover_state.info_popovers.len(),
-                1,
-                "Expected exactly one hover but got: {:?}",
-                editor.hover_state.info_popovers.len()
-            );
-            let rendered_text = editor
-                .hover_state
-                .info_popovers
-                .first()
-                .unwrap()
-                .get_rendered_text(cx);
-
-            assert_eq!(
-                rendered_text,
-                "regular text for hover to show".to_string(),
-                "No empty string hovers should be shown"
-            );
-        });
-    }
-
-    #[gpui::test]
-    async fn test_line_ends_trimmed(cx: &mut gpui::TestAppContext) {
-        init_test(cx, |_| {});
-
-        let mut cx = EditorLspTestContext::new_rust(
-            lsp::ServerCapabilities {
-                hover_provider: Some(lsp::HoverProviderCapability::Simple(true)),
-                ..Default::default()
-            },
-            cx,
-        )
-        .await;
-
-        // Hover with keyboard has no delay
-        cx.set_state(indoc! {"
-            fˇn test() { println!(); }
-        "});
-        cx.update_editor(|editor, window, cx| hover(editor, &Hover, window, cx));
-        let symbol_range = cx.lsp_range(indoc! {"
-            «fn» test() { println!(); }
-        "});
-
-        let code_str = "\nlet hovered_point: Vector2F // size = 8, align = 0x4\n";
-        let markdown_string = format!("\n```rust\n{code_str}```");
-
-        let closure_markdown_string = markdown_string.clone();
-        cx.set_request_handler::<lsp::request::HoverRequest, _, _>(move |_, _, _| {
-            let future_markdown_string = closure_markdown_string.clone();
-            async move {
-                Ok(Some(lsp::Hover {
-                    contents: lsp::HoverContents::Markup(lsp::MarkupContent {
-                        kind: lsp::MarkupKind::Markdown,
-                        value: future_markdown_string,
-                    }),
-                    range: Some(symbol_range),
-                }))
-            }
-        })
-        .next()
-        .await;
-
-        cx.dispatch_action(Hover);
-
-        cx.condition(|editor, _| editor.hover_state.visible()).await;
-        cx.editor(|editor, _, cx| {
-            assert_eq!(
-                editor.hover_state.info_popovers.len(),
-                1,
-                "Expected exactly one hover but got: {:?}",
-                editor.hover_state.info_popovers.len()
-            );
-            let rendered_text = editor
-                .hover_state
-                .info_popovers
-                .first()
-                .unwrap()
-                .get_rendered_text(cx);
-
-            assert_eq!(
-                rendered_text, code_str,
-                "Should not have extra line breaks at end of rendered hover"
-            );
-        });
-    }
-
-    #[gpui::test]
-    // https://github.com/zed-industries/zed/issues/15498
-    async fn test_info_hover_with_hrs(cx: &mut gpui::TestAppContext) {
-        init_test(cx, |_| {});
-
-        let mut cx = EditorLspTestContext::new_rust(
-            lsp::ServerCapabilities {
-                hover_provider: Some(lsp::HoverProviderCapability::Simple(true)),
-                ..Default::default()
-            },
-            cx,
-        )
-        .await;
-
-        cx.set_state(indoc! {"
-            fn fuˇnc(abc def: i32) -> u32 {
-            }
-        "});
-
-        cx.lsp
-            .set_request_handler::<lsp::request::HoverRequest, _, _>({
-                |_, _| async move {
-                    Ok(Some(lsp::Hover {
-                        contents: lsp::HoverContents::Markup(lsp::MarkupContent {
-                            kind: lsp::MarkupKind::Markdown,
-                            value: indoc!(
-                                r#"
-                    ### function `errands_data_read`
-
-                    ---
-                    → `char *`
-                    Function to read a file into a string
-
-                    ---
-                    ```cpp
-                    static char *errands_data_read()
-                    ```
-                    "#
-                            )
-                            .to_string(),
-                        }),
-                        range: None,
-                    }))
-                }
-            });
-        cx.update_editor(|editor, window, cx| hover(editor, &Default::default(), window, cx));
-        cx.run_until_parked();
-
-        cx.update_editor(|editor, _, cx| {
-            let popover = editor.hover_state.info_popovers.first().unwrap();
-            let content = popover.get_rendered_text(cx);
-
-            assert!(content.contains("Function to read a file"));
-        });
-    }
-
-    #[gpui::test]
-    async fn test_hover_inlay_label_parts(cx: &mut gpui::TestAppContext) {
-        init_test(cx, |settings| {
-            settings.defaults.inlay_hints = Some(InlayHintSettingsContent {
-                show_value_hints: Some(true),
-                enabled: Some(true),
-                edit_debounce_ms: Some(0),
-                scroll_debounce_ms: Some(0),
-                show_type_hints: Some(true),
-                show_parameter_hints: Some(true),
-                show_other_hints: Some(true),
-                show_background: Some(false),
-                toggle_on_modifiers_press: None,
-            })
-        });
-
-        let mut cx = EditorLspTestContext::new_rust(
-            lsp::ServerCapabilities {
-                inlay_hint_provider: Some(lsp::OneOf::Right(
-                    lsp::InlayHintServerCapabilities::Options(lsp::InlayHintOptions {
-                        resolve_provider: Some(true),
-                        ..Default::default()
-                    }),
-                )),
-                ..Default::default()
-            },
-            cx,
-        )
-        .await;
-
-        cx.set_state(indoc! {"
-            struct TestStruct;
-
-            // ==================
-
-            struct TestNewType<T>(T);
-
-            fn main() {
-                let variableˇ = TestNewType(TestStruct);
-            }
-        "});
-
-        let hint_start_offset = cx.ranges(indoc! {"
-            struct TestStruct;
-
-            // ==================
-
-            struct TestNewType<T>(T);
-
-            fn main() {
-                let variableˇ = TestNewType(TestStruct);
-            }
-        "})[0]
-            .start;
-        let hint_position = cx.to_lsp(MultiBufferOffset(hint_start_offset));
-        let new_type_target_range = cx.lsp_range(indoc! {"
-            struct TestStruct;
-
-            // ==================
-
-            struct «TestNewType»<T>(T);
-
-            fn main() {
-                let variable = TestNewType(TestStruct);
-            }
-        "});
-        let struct_target_range = cx.lsp_range(indoc! {"
-            struct «TestStruct»;
-
-            // ==================
-
-            struct TestNewType<T>(T);
-
-            fn main() {
-                let variable = TestNewType(TestStruct);
-            }
-        "});
-
-        let uri = cx.buffer_lsp_url.clone();
-        let new_type_label = "TestNewType";
-        let struct_label = "TestStruct";
-        let entire_hint_label = ": TestNewType<TestStruct>";
-        let closure_uri = uri.clone();
-        cx.lsp
-            .set_request_handler::<lsp::request::InlayHintRequest, _, _>(move |params, _| {
-                let task_uri = closure_uri.clone();
-                async move {
-                    assert_eq!(params.text_document.uri, task_uri);
-                    Ok(Some(vec![lsp::InlayHint {
-                        position: hint_position,
-                        label: lsp::InlayHintLabel::LabelParts(vec![lsp::InlayHintLabelPart {
-                            value: entire_hint_label.to_string(),
-                            ..Default::default()
-                        }]),
-                        kind: Some(lsp::InlayHintKind::TYPE),
-                        text_edits: None,
-                        tooltip: None,
-                        padding_left: Some(false),
-                        padding_right: Some(false),
-                        data: None,
-                    }]))
-                }
-            })
-            .next()
-            .await;
-        cx.background_executor.run_until_parked();
-        cx.update_editor(|editor, _, cx| {
-            let expected_layers = vec![entire_hint_label.to_string()];
-            assert_eq!(expected_layers, cached_hint_labels(editor, cx));
-            assert_eq!(expected_layers, visible_hint_labels(editor, cx));
-        });
-
-        let inlay_range = cx
-            .ranges(indoc! {"
-                struct TestStruct;
-
-                // ==================
-
-                struct TestNewType<T>(T);
-
-                fn main() {
-                    let variable« »= TestNewType(TestStruct);
-                }
-        "})
-            .first()
-            .cloned()
-            .unwrap();
-        let new_type_hint_part_hover_position = cx.update_editor(|editor, window, cx| {
-            let snapshot = editor.snapshot(window, cx);
-            let previous_valid = MultiBufferOffset(inlay_range.start).to_display_point(&snapshot);
-            let next_valid = MultiBufferOffset(inlay_range.end).to_display_point(&snapshot);
-            assert_eq!(previous_valid.row(), next_valid.row());
-            assert!(previous_valid.column() < next_valid.column());
-            let exact_unclipped = DisplayPoint::new(
-                previous_valid.row(),
-                previous_valid.column()
-                    + (entire_hint_label.find(new_type_label).unwrap() + new_type_label.len() / 2)
-                        as u32,
-            );
-            PointForPosition {
-                previous_valid,
-                next_valid,
-                exact_unclipped,
-                column_overshoot_after_line_end: 0,
-            }
-        });
-        cx.update_editor(|editor, window, cx| {
-            editor.update_inlay_link_and_hover_points(
-                &editor.snapshot(window, cx),
-                new_type_hint_part_hover_position,
-                true,
-                false,
-                window,
-                cx,
-            );
-        });
-
-        let resolve_closure_uri = uri.clone();
-        cx.lsp
-            .set_request_handler::<lsp::request::InlayHintResolveRequest, _, _>(
-                move |mut hint_to_resolve, _| {
-                    let mut resolved_hint_positions = BTreeSet::new();
-                    let task_uri = resolve_closure_uri.clone();
-                    async move {
-                        let inserted = resolved_hint_positions.insert(hint_to_resolve.position);
-                        assert!(inserted, "Hint {hint_to_resolve:?} was resolved twice");
-
-                        // `: TestNewType<TestStruct>`
-                        hint_to_resolve.label = lsp::InlayHintLabel::LabelParts(vec![
-                            lsp::InlayHintLabelPart {
-                                value: ": ".to_string(),
-                                ..Default::default()
-                            },
-                            lsp::InlayHintLabelPart {
-                                value: new_type_label.to_string(),
-                                location: Some(lsp::Location {
-                                    uri: task_uri.clone(),
-                                    range: new_type_target_range,
-                                }),
-                                tooltip: Some(lsp::InlayHintLabelPartTooltip::String(format!(
-                                    "A tooltip for `{new_type_label}`"
-                                ))),
-                                ..Default::default()
-                            },
-                            lsp::InlayHintLabelPart {
-                                value: "<".to_string(),
-                                ..Default::default()
-                            },
-                            lsp::InlayHintLabelPart {
-                                value: struct_label.to_string(),
-                                location: Some(lsp::Location {
-                                    uri: task_uri,
-                                    range: struct_target_range,
-                                }),
-                                tooltip: Some(lsp::InlayHintLabelPartTooltip::MarkupContent(
-                                    lsp::MarkupContent {
-                                        kind: lsp::MarkupKind::Markdown,
-                                        value: format!("A tooltip for `{struct_label}`"),
-                                    },
-                                )),
-                                ..Default::default()
-                            },
-                            lsp::InlayHintLabelPart {
-                                value: ">".to_string(),
-                                ..Default::default()
-                            },
-                        ]);
-
-                        Ok(hint_to_resolve)
-                    }
-                },
-            )
-            .next()
-            .await;
-        cx.background_executor.run_until_parked();
-
-        cx.update_editor(|editor, window, cx| {
-            editor.update_inlay_link_and_hover_points(
-                &editor.snapshot(window, cx),
-                new_type_hint_part_hover_position,
-                true,
-                false,
-                window,
-                cx,
-            );
-        });
-        cx.background_executor
-            .advance_clock(Duration::from_millis(get_hover_popover_delay(&cx) + 100));
-        cx.background_executor.run_until_parked();
-        cx.update_editor(|editor, _, cx| {
-            let hover_state = &editor.hover_state;
-            assert!(
-                hover_state.diagnostic_popover.is_none() && hover_state.info_popovers.len() == 1
-            );
-            let popover = hover_state.info_popovers.first().unwrap();
-            let buffer_snapshot = editor.buffer().update(cx, |buffer, cx| buffer.snapshot(cx));
-            assert_eq!(
-                popover.symbol_range,
-                RangeInEditor::Inlay(InlayHighlight {
-                    inlay: InlayId::Hint(0),
-                    inlay_position: buffer_snapshot
-                        .anchor_after(MultiBufferOffset(inlay_range.start)),
-                    range: ": ".len()..": ".len() + new_type_label.len(),
-                }),
-                "Popover range should match the new type label part"
-            );
-            assert_eq!(
-                popover.get_rendered_text(cx),
-                format!("A tooltip for {new_type_label}"),
-            );
-        });
-
-        let struct_hint_part_hover_position = cx.update_editor(|editor, window, cx| {
-            let snapshot = editor.snapshot(window, cx);
-            let previous_valid = MultiBufferOffset(inlay_range.start).to_display_point(&snapshot);
-            let next_valid = MultiBufferOffset(inlay_range.end).to_display_point(&snapshot);
-            assert_eq!(previous_valid.row(), next_valid.row());
-            assert!(previous_valid.column() < next_valid.column());
-            let exact_unclipped = DisplayPoint::new(
-                previous_valid.row(),
-                previous_valid.column()
-                    + (entire_hint_label.find(struct_label).unwrap() + struct_label.len() / 2)
-                        as u32,
-            );
-            PointForPosition {
-                previous_valid,
-                next_valid,
-                exact_unclipped,
-                column_overshoot_after_line_end: 0,
-            }
-        });
-        cx.update_editor(|editor, window, cx| {
-            editor.update_inlay_link_and_hover_points(
-                &editor.snapshot(window, cx),
-                struct_hint_part_hover_position,
-                true,
-                false,
-                window,
-                cx,
-            );
-        });
-        cx.background_executor
-            .advance_clock(Duration::from_millis(get_hover_popover_delay(&cx) + 100));
-        cx.background_executor.run_until_parked();
-        cx.update_editor(|editor, _, cx| {
-            let hover_state = &editor.hover_state;
-            assert!(
-                hover_state.diagnostic_popover.is_none() && hover_state.info_popovers.len() == 1
-            );
-            let popover = hover_state.info_popovers.first().unwrap();
-            let buffer_snapshot = editor.buffer().update(cx, |buffer, cx| buffer.snapshot(cx));
-            assert_eq!(
-                popover.symbol_range,
-                RangeInEditor::Inlay(InlayHighlight {
-                    inlay: InlayId::Hint(0),
-                    inlay_position: buffer_snapshot
-                        .anchor_after(MultiBufferOffset(inlay_range.start)),
-                    range: ": ".len() + new_type_label.len() + "<".len()
-                        ..": ".len() + new_type_label.len() + "<".len() + struct_label.len(),
-                }),
-                "Popover range should match the struct label part"
-            );
-            assert_eq!(
-                popover.get_rendered_text(cx),
-                format!("A tooltip for {struct_label}"),
-                "Rendered markdown element should remove backticks from text"
-            );
-        });
-    }
-}
diff --git a/crates/editor/src/indent_guides.rs b/crates/editor/src/indent_guides.rs
deleted file mode 100644
index f186f9da77..0000000000
--- a/crates/editor/src/indent_guides.rs
+++ /dev/null
@@ -1,250 +0,0 @@
-use std::{cmp::Ordering, ops::Range, time::Duration};
-
-use collections::HashSet;
-use gpui::{App, AppContext as _, Context, Task, Window};
-use language::language_settings::language_settings;
-use multi_buffer::{IndentGuide, MultiBufferRow, ToPoint};
-use text::{LineIndent, Point};
-use util::ResultExt;
-
-use crate::{DisplaySnapshot, Editor};
-
-struct ActiveIndentedRange {
-    row_range: Range<MultiBufferRow>,
-    indent: LineIndent,
-}
-
-#[derive(Default)]
-pub struct ActiveIndentGuidesState {
-    pub dirty: bool,
-    cursor_row: MultiBufferRow,
-    pending_refresh: Option<Task<()>>,
-    active_indent_range: Option<ActiveIndentedRange>,
-}
-
-impl ActiveIndentGuidesState {
-    pub fn should_refresh(&self) -> bool {
-        self.pending_refresh.is_none() && self.dirty
-    }
-}
-
-impl Editor {
-    pub fn indent_guides(
-        &self,
-        visible_buffer_range: Range<MultiBufferRow>,
-        snapshot: &DisplaySnapshot,
-        cx: &mut Context<Editor>,
-    ) -> Option<Vec<IndentGuide>> {
-        let show_indent_guides = self.should_show_indent_guides().unwrap_or_else(|| {
-            if let Some(buffer) = self.buffer().read(cx).as_singleton() {
-                language_settings(
-                    buffer.read(cx).language().map(|l| l.name()),
-                    buffer.read(cx).file(),
-                    cx,
-                )
-                .indent_guides
-                .enabled
-            } else {
-                true
-            }
-        });
-
-        if !show_indent_guides {
-            return None;
-        }
-
-        Some(indent_guides_in_range(
-            self,
-            visible_buffer_range,
-            self.should_show_indent_guides() == Some(true),
-            snapshot,
-            cx,
-        ))
-    }
-
-    pub fn find_active_indent_guide_indices(
-        &mut self,
-        indent_guides: &[IndentGuide],
-        snapshot: &DisplaySnapshot,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) -> Option<HashSet<usize>> {
-        let selection = self.selections.newest::<Point>(&self.display_snapshot(cx));
-        let cursor_row = MultiBufferRow(selection.head().row);
-
-        let state = &mut self.active_indent_guides_state;
-
-        if state
-            .active_indent_range
-            .as_ref()
-            .map(|active_indent_range| {
-                should_recalculate_indented_range(
-                    state.cursor_row,
-                    cursor_row,
-                    active_indent_range,
-                    snapshot,
-                )
-            })
-            .unwrap_or(true)
-        {
-            state.dirty = true;
-        } else {
-            state.cursor_row = cursor_row;
-        }
-
-        if state.should_refresh() {
-            state.cursor_row = cursor_row;
-            state.dirty = false;
-
-            if indent_guides.is_empty() {
-                return None;
-            }
-
-            let snapshot = snapshot.clone();
-
-            let task = cx.background_spawn(resolve_indented_range(snapshot, cursor_row));
-
-            // Try to resolve the indent in a short amount of time, otherwise move it to a background task.
-            match cx
-                .background_executor()
-                .block_with_timeout(Duration::from_micros(200), task)
-            {
-                Ok(result) => state.active_indent_range = result,
-                Err(future) => {
-                    state.pending_refresh = Some(cx.spawn_in(window, async move |editor, cx| {
-                        let result = cx.background_spawn(future).await;
-                        editor
-                            .update(cx, |editor, _| {
-                                editor.active_indent_guides_state.active_indent_range = result;
-                                editor.active_indent_guides_state.pending_refresh = None;
-                            })
-                            .log_err();
-                    }));
-                    return None;
-                }
-            }
-        }
-
-        let active_indent_range = state.active_indent_range.as_ref()?;
-
-        let candidates = indent_guides
-            .iter()
-            .enumerate()
-            .filter(|(_, indent_guide)| {
-                indent_guide.indent_level() == active_indent_range.indent.len(indent_guide.tab_size)
-            });
-
-        let mut matches = HashSet::default();
-        for (i, indent) in candidates {
-            // Find matches that are either an exact match, partially on screen, or inside the enclosing indent
-            if active_indent_range.row_range.start <= indent.end_row
-                && indent.start_row <= active_indent_range.row_range.end
-            {
-                matches.insert(i);
-            }
-        }
-        Some(matches)
-    }
-}
-
-pub fn indent_guides_in_range(
-    editor: &Editor,
-    visible_buffer_range: Range<MultiBufferRow>,
-    ignore_disabled_for_language: bool,
-    snapshot: &DisplaySnapshot,
-    cx: &App,
-) -> Vec<IndentGuide> {
-    let start_offset = snapshot
-        .buffer_snapshot()
-        .point_to_offset(Point::new(visible_buffer_range.start.0, 0));
-    let end_offset = snapshot
-        .buffer_snapshot()
-        .point_to_offset(Point::new(visible_buffer_range.end.0, 0));
-    let start_anchor = snapshot.buffer_snapshot().anchor_before(start_offset);
-    let end_anchor = snapshot.buffer_snapshot().anchor_after(end_offset);
-
-    let mut fold_ranges = Vec::<Range<Point>>::new();
-    let folds = snapshot.folds_in_range(start_offset..end_offset).peekable();
-    for fold in folds {
-        let start = fold.range.start.to_point(&snapshot.buffer_snapshot());
-        let end = fold.range.end.to_point(&snapshot.buffer_snapshot());
-        if let Some(last_range) = fold_ranges.last_mut()
-            && last_range.end >= start
-        {
-            last_range.end = last_range.end.max(end);
-            continue;
-        }
-        fold_ranges.push(start..end);
-    }
-
-    snapshot
-        .buffer_snapshot()
-        .indent_guides_in_range(start_anchor..end_anchor, ignore_disabled_for_language, cx)
-        .filter(|indent_guide| {
-            if editor.has_indent_guides_disabled_for_buffer(indent_guide.buffer_id) {
-                return false;
-            }
-
-            if editor.is_buffer_folded(indent_guide.buffer_id, cx) {
-                return false;
-            }
-
-            let has_containing_fold = fold_ranges
-                .binary_search_by(|fold_range| {
-                    if fold_range.start >= Point::new(indent_guide.start_row.0, 0) {
-                        Ordering::Greater
-                    } else if fold_range.end < Point::new(indent_guide.end_row.0, 0) {
-                        Ordering::Less
-                    } else {
-                        Ordering::Equal
-                    }
-                })
-                .is_ok();
-
-            !has_containing_fold
-        })
-        .collect()
-}
-
-async fn resolve_indented_range(
-    snapshot: DisplaySnapshot,
-    buffer_row: MultiBufferRow,
-) -> Option<ActiveIndentedRange> {
-    snapshot
-        .buffer_snapshot()
-        .enclosing_indent(buffer_row)
-        .await
-        .map(|(row_range, indent)| ActiveIndentedRange { row_range, indent })
-}
-
-fn should_recalculate_indented_range(
-    prev_row: MultiBufferRow,
-    new_row: MultiBufferRow,
-    current_indent_range: &ActiveIndentedRange,
-    snapshot: &DisplaySnapshot,
-) -> bool {
-    if prev_row.0 == new_row.0 {
-        return false;
-    }
-    if snapshot.buffer_snapshot().is_singleton() {
-        if !current_indent_range.row_range.contains(&new_row) {
-            return true;
-        }
-
-        let old_line_indent = snapshot.buffer_snapshot().line_indent_for_row(prev_row);
-        let new_line_indent = snapshot.buffer_snapshot().line_indent_for_row(new_row);
-
-        if old_line_indent.is_line_empty()
-            || new_line_indent.is_line_empty()
-            || old_line_indent != new_line_indent
-            || snapshot.buffer_snapshot().max_point().row == new_row.0
-        {
-            return true;
-        }
-
-        let next_line_indent = snapshot.buffer_snapshot().line_indent_for_row(new_row + 1);
-        next_line_indent.is_line_empty() || next_line_indent != old_line_indent
-    } else {
-        true
-    }
-}
diff --git a/crates/editor/src/inlays.rs b/crates/editor/src/inlays.rs
deleted file mode 100644
index f07bf0b315..0000000000
--- a/crates/editor/src/inlays.rs
+++ /dev/null
@@ -1,193 +0,0 @@
-//! The logic, responsible for managing [`Inlay`]s in the editor.
-//!
-//! Inlays are "not real" text that gets mixed into the "real" buffer's text.
-//! They are attached to a certain [`Anchor`], and display certain contents (usually, strings)
-//! between real text around that anchor.
-//!
-//! Inlay examples in Zed:
-//! * inlay hints, received from LSP
-//! * inline values, shown in the debugger
-//! * inline predictions, showing the Zeta/Copilot/etc. predictions
-//! * document color values, if configured to be displayed as inlays
-//! * ... anything else, potentially.
-//!
-//! Editor uses [`crate::DisplayMap`] and [`crate::display_map::InlayMap`] to manage what's rendered inside the editor, using
-//! [`InlaySplice`] to update this state.
-
-/// Logic, related to managing LSP inlay hint inlays.
-pub mod inlay_hints;
-
-use std::{any::TypeId, sync::OnceLock};
-
-use gpui::{Context, HighlightStyle, Hsla, Rgba, Task};
-use multi_buffer::Anchor;
-use project::{InlayHint, InlayId};
-use text::Rope;
-
-use crate::{Editor, hover_links::InlayHighlight};
-
-/// A splice to send into the `inlay_map` for updating the visible inlays on the screen.
-/// "Visible" inlays may not be displayed in the buffer right away, but those are ready to be displayed on further buffer scroll, pane item activations, etc. right away without additional LSP queries or settings changes.
-/// The data in the cache is never used directly for displaying inlays on the screen, to avoid races with updates from LSP queries and sync overhead.
-/// Splice is picked to help avoid extra hint flickering and "jumps" on the screen.
-#[derive(Debug, Default)]
-pub struct InlaySplice {
-    pub to_remove: Vec<InlayId>,
-    pub to_insert: Vec<Inlay>,
-}
-
-impl InlaySplice {
-    pub fn is_empty(&self) -> bool {
-        self.to_remove.is_empty() && self.to_insert.is_empty()
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct Inlay {
-    pub id: InlayId,
-    pub position: Anchor,
-    pub content: InlayContent,
-}
-
-#[derive(Debug, Clone)]
-pub enum InlayContent {
-    Text(text::Rope),
-    Color(Hsla),
-}
-
-impl Inlay {
-    pub fn hint(id: InlayId, position: Anchor, hint: &InlayHint) -> Self {
-        let mut text = hint.text();
-        if hint.padding_right && text.reversed_chars_at(text.len()).next() != Some(' ') {
-            text.push(" ");
-        }
-        if hint.padding_left && text.chars_at(0).next() != Some(' ') {
-            text.push_front(" ");
-        }
-        Self {
-            id,
-            position,
-            content: InlayContent::Text(text),
-        }
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn mock_hint(id: usize, position: Anchor, text: impl Into<Rope>) -> Self {
-        Self {
-            id: InlayId::Hint(id),
-            position,
-            content: InlayContent::Text(text.into()),
-        }
-    }
-
-    pub fn color(id: usize, position: Anchor, color: Rgba) -> Self {
-        Self {
-            id: InlayId::Color(id),
-            position,
-            content: InlayContent::Color(color.into()),
-        }
-    }
-
-    pub fn edit_prediction<T: Into<Rope>>(id: usize, position: Anchor, text: T) -> Self {
-        Self {
-            id: InlayId::EditPrediction(id),
-            position,
-            content: InlayContent::Text(text.into()),
-        }
-    }
-
-    pub fn debugger<T: Into<Rope>>(id: usize, position: Anchor, text: T) -> Self {
-        Self {
-            id: InlayId::DebuggerValue(id),
-            position,
-            content: InlayContent::Text(text.into()),
-        }
-    }
-
-    pub fn text(&self) -> &Rope {
-        static COLOR_TEXT: OnceLock<Rope> = OnceLock::new();
-        match &self.content {
-            InlayContent::Text(text) => text,
-            InlayContent::Color(_) => COLOR_TEXT.get_or_init(|| Rope::from("◼")),
-        }
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn get_color(&self) -> Option<Hsla> {
-        match self.content {
-            InlayContent::Color(color) => Some(color),
-            _ => None,
-        }
-    }
-}
-
-pub struct InlineValueCache {
-    pub enabled: bool,
-    pub inlays: Vec<InlayId>,
-    pub refresh_task: Task<Option<()>>,
-}
-
-impl InlineValueCache {
-    pub fn new(enabled: bool) -> Self {
-        Self {
-            enabled,
-            inlays: Vec::new(),
-            refresh_task: Task::ready(None),
-        }
-    }
-}
-
-impl Editor {
-    /// Modify which hints are displayed in the editor.
-    pub fn splice_inlays(
-        &mut self,
-        to_remove: &[InlayId],
-        to_insert: Vec<Inlay>,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(inlay_hints) = &mut self.inlay_hints {
-            for id_to_remove in to_remove {
-                inlay_hints.added_hints.remove(id_to_remove);
-            }
-        }
-        self.display_map.update(cx, |display_map, cx| {
-            display_map.splice_inlays(to_remove, to_insert, cx)
-        });
-        cx.notify();
-    }
-
-    pub(crate) fn highlight_inlays<T: 'static>(
-        &mut self,
-        highlights: Vec<InlayHighlight>,
-        style: HighlightStyle,
-        cx: &mut Context<Self>,
-    ) {
-        self.display_map.update(cx, |map, _| {
-            map.highlight_inlays(TypeId::of::<T>(), highlights, style)
-        });
-        cx.notify();
-    }
-
-    pub fn inline_values_enabled(&self) -> bool {
-        self.inline_value_cache.enabled
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn inline_value_inlays(&self, cx: &gpui::App) -> Vec<Inlay> {
-        self.display_map
-            .read(cx)
-            .current_inlays()
-            .filter(|inlay| matches!(inlay.id, InlayId::DebuggerValue(_)))
-            .cloned()
-            .collect()
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn all_inlays(&self, cx: &gpui::App) -> Vec<Inlay> {
-        self.display_map
-            .read(cx)
-            .current_inlays()
-            .cloned()
-            .collect()
-    }
-}
diff --git a/crates/editor/src/inlays/inlay_hints.rs b/crates/editor/src/inlays/inlay_hints.rs
deleted file mode 100644
index 18bbc56005..0000000000
--- a/crates/editor/src/inlays/inlay_hints.rs
+++ /dev/null
@@ -1,4180 +0,0 @@
-use std::{
-    collections::hash_map,
-    ops::{ControlFlow, Range},
-    time::Duration,
-};
-
-use clock::Global;
-use collections::{HashMap, HashSet};
-use futures::future::join_all;
-use gpui::{App, Entity, Task};
-use language::{
-    BufferRow,
-    language_settings::{InlayHintKind, InlayHintSettings, language_settings},
-};
-use lsp::LanguageServerId;
-use multi_buffer::{Anchor, ExcerptId, MultiBufferSnapshot};
-use project::{
-    HoverBlock, HoverBlockKind, InlayHintLabel, InlayHintLabelPartTooltip, InlayHintTooltip,
-    InvalidationStrategy, ResolveState,
-    lsp_store::{CacheInlayHints, ResolvedHint},
-};
-use text::{Bias, BufferId};
-use ui::{Context, Window};
-use util::debug_panic;
-
-use super::{Inlay, InlayId};
-use crate::{
-    Editor, EditorSnapshot, PointForPosition, ToggleInlayHints, ToggleInlineValues, debounce_value,
-    hover_links::{InlayHighlight, TriggerPoint, show_link_definition},
-    hover_popover::{self, InlayHover},
-    inlays::InlaySplice,
-};
-
-pub fn inlay_hint_settings(
-    location: Anchor,
-    snapshot: &MultiBufferSnapshot,
-    cx: &mut Context<Editor>,
-) -> InlayHintSettings {
-    let file = snapshot.file_at(location);
-    let language = snapshot.language_at(location).map(|l| l.name());
-    language_settings(language, file, cx).inlay_hints
-}
-
-#[derive(Debug)]
-pub struct LspInlayHintData {
-    enabled: bool,
-    modifiers_override: bool,
-    enabled_in_settings: bool,
-    allowed_hint_kinds: HashSet<Option<InlayHintKind>>,
-    invalidate_debounce: Option<Duration>,
-    append_debounce: Option<Duration>,
-    hint_refresh_tasks: HashMap<BufferId, Vec<Task<()>>>,
-    hint_chunk_fetching: HashMap<BufferId, (Global, HashSet<Range<BufferRow>>)>,
-    invalidate_hints_for_buffers: HashSet<BufferId>,
-    pub added_hints: HashMap<InlayId, Option<InlayHintKind>>,
-}
-
-impl LspInlayHintData {
-    pub fn new(settings: InlayHintSettings) -> Self {
-        Self {
-            modifiers_override: false,
-            enabled: settings.enabled,
-            enabled_in_settings: settings.enabled,
-            hint_refresh_tasks: HashMap::default(),
-            added_hints: HashMap::default(),
-            hint_chunk_fetching: HashMap::default(),
-            invalidate_hints_for_buffers: HashSet::default(),
-            invalidate_debounce: debounce_value(settings.edit_debounce_ms),
-            append_debounce: debounce_value(settings.scroll_debounce_ms),
-            allowed_hint_kinds: settings.enabled_inlay_hint_kinds(),
-        }
-    }
-
-    pub fn modifiers_override(&mut self, new_override: bool) -> Option<bool> {
-        if self.modifiers_override == new_override {
-            return None;
-        }
-        self.modifiers_override = new_override;
-        if (self.enabled && self.modifiers_override) || (!self.enabled && !self.modifiers_override)
-        {
-            self.clear();
-            Some(false)
-        } else {
-            Some(true)
-        }
-    }
-
-    pub fn toggle(&mut self, enabled: bool) -> bool {
-        if self.enabled == enabled {
-            return false;
-        }
-        self.enabled = enabled;
-        self.modifiers_override = false;
-        if !enabled {
-            self.clear();
-        }
-        true
-    }
-
-    pub fn clear(&mut self) {
-        self.hint_refresh_tasks.clear();
-        self.hint_chunk_fetching.clear();
-        self.added_hints.clear();
-    }
-
-    /// Checks inlay hint settings for enabled hint kinds and general enabled state.
-    /// Generates corresponding inlay_map splice updates on settings changes.
-    /// Does not update inlay hint cache state on disabling or inlay hint kinds change: only reenabling forces new LSP queries.
-    fn update_settings(
-        &mut self,
-        new_hint_settings: InlayHintSettings,
-        visible_hints: Vec<Inlay>,
-    ) -> ControlFlow<Option<InlaySplice>, Option<InlaySplice>> {
-        let old_enabled = self.enabled;
-        // If the setting for inlay hints has changed, update `enabled`. This condition avoids inlay
-        // hint visibility changes when other settings change (such as theme).
-        //
-        // Another option might be to store whether the user has manually toggled inlay hint
-        // visibility, and prefer this. This could lead to confusion as it means inlay hint
-        // visibility would not change when updating the setting if they were ever toggled.
-        if new_hint_settings.enabled != self.enabled_in_settings {
-            self.enabled = new_hint_settings.enabled;
-            self.enabled_in_settings = new_hint_settings.enabled;
-            self.modifiers_override = false;
-        };
-        self.invalidate_debounce = debounce_value(new_hint_settings.edit_debounce_ms);
-        self.append_debounce = debounce_value(new_hint_settings.scroll_debounce_ms);
-        let new_allowed_hint_kinds = new_hint_settings.enabled_inlay_hint_kinds();
-        match (old_enabled, self.enabled) {
-            (false, false) => {
-                self.allowed_hint_kinds = new_allowed_hint_kinds;
-                ControlFlow::Break(None)
-            }
-            (true, true) => {
-                if new_allowed_hint_kinds == self.allowed_hint_kinds {
-                    ControlFlow::Break(None)
-                } else {
-                    self.allowed_hint_kinds = new_allowed_hint_kinds;
-                    ControlFlow::Continue(
-                        Some(InlaySplice {
-                            to_remove: visible_hints
-                                .iter()
-                                .filter_map(|inlay| {
-                                    let inlay_kind = self.added_hints.get(&inlay.id).copied()?;
-                                    if !self.allowed_hint_kinds.contains(&inlay_kind) {
-                                        Some(inlay.id)
-                                    } else {
-                                        None
-                                    }
-                                })
-                                .collect(),
-                            to_insert: Vec::new(),
-                        })
-                        .filter(|splice| !splice.is_empty()),
-                    )
-                }
-            }
-            (true, false) => {
-                self.modifiers_override = false;
-                self.allowed_hint_kinds = new_allowed_hint_kinds;
-                if visible_hints.is_empty() {
-                    ControlFlow::Break(None)
-                } else {
-                    self.clear();
-                    ControlFlow::Break(Some(InlaySplice {
-                        to_remove: visible_hints.iter().map(|inlay| inlay.id).collect(),
-                        to_insert: Vec::new(),
-                    }))
-                }
-            }
-            (false, true) => {
-                self.modifiers_override = false;
-                self.allowed_hint_kinds = new_allowed_hint_kinds;
-                ControlFlow::Continue(
-                    Some(InlaySplice {
-                        to_remove: visible_hints
-                            .iter()
-                            .filter_map(|inlay| {
-                                let inlay_kind = self.added_hints.get(&inlay.id).copied()?;
-                                if !self.allowed_hint_kinds.contains(&inlay_kind) {
-                                    Some(inlay.id)
-                                } else {
-                                    None
-                                }
-                            })
-                            .collect(),
-                        to_insert: Vec::new(),
-                    })
-                    .filter(|splice| !splice.is_empty()),
-                )
-            }
-        }
-    }
-
-    pub(crate) fn remove_inlay_chunk_data<'a>(
-        &'a mut self,
-        removed_buffer_ids: impl IntoIterator<Item = &'a BufferId> + 'a,
-    ) {
-        for buffer_id in removed_buffer_ids {
-            self.hint_refresh_tasks.remove(buffer_id);
-            self.hint_chunk_fetching.remove(buffer_id);
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub enum InlayHintRefreshReason {
-    ModifiersChanged(bool),
-    Toggle(bool),
-    SettingsChange(InlayHintSettings),
-    NewLinesShown,
-    BufferEdited(BufferId),
-    RefreshRequested {
-        server_id: LanguageServerId,
-        request_id: Option<usize>,
-    },
-    ExcerptsRemoved(Vec<ExcerptId>),
-}
-
-impl Editor {
-    pub fn supports_inlay_hints(&self, cx: &mut App) -> bool {
-        let Some(provider) = self.semantics_provider.as_ref() else {
-            return false;
-        };
-
-        let mut supports = false;
-        self.buffer().update(cx, |this, cx| {
-            this.for_each_buffer(|buffer| {
-                supports |= provider.supports_inlay_hints(buffer, cx);
-            });
-        });
-
-        supports
-    }
-
-    pub fn toggle_inline_values(
-        &mut self,
-        _: &ToggleInlineValues,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.inline_value_cache.enabled = !self.inline_value_cache.enabled;
-
-        self.refresh_inline_values(cx);
-    }
-
-    pub fn toggle_inlay_hints(
-        &mut self,
-        _: &ToggleInlayHints,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.refresh_inlay_hints(
-            InlayHintRefreshReason::Toggle(!self.inlay_hints_enabled()),
-            cx,
-        );
-    }
-
-    pub fn inlay_hints_enabled(&self) -> bool {
-        self.inlay_hints.as_ref().is_some_and(|cache| cache.enabled)
-    }
-
-    /// Updates inlay hints for the visible ranges of the singleton buffer(s).
-    /// Based on its parameters, either invalidates the previous data, or appends to it.
-    pub(crate) fn refresh_inlay_hints(
-        &mut self,
-        reason: InlayHintRefreshReason,
-        cx: &mut Context<Self>,
-    ) {
-        if self.ignore_lsp_data() || self.inlay_hints.is_none() {
-            return;
-        }
-        let Some(semantics_provider) = self.semantics_provider() else {
-            return;
-        };
-        let Some(invalidate_cache) = self.refresh_editor_data(&reason, cx) else {
-            return;
-        };
-
-        let debounce = match &reason {
-            InlayHintRefreshReason::SettingsChange(_)
-            | InlayHintRefreshReason::Toggle(_)
-            | InlayHintRefreshReason::ExcerptsRemoved(_)
-            | InlayHintRefreshReason::ModifiersChanged(_) => None,
-            _may_need_lsp_call => self.inlay_hints.as_ref().and_then(|inlay_hints| {
-                if invalidate_cache.should_invalidate() {
-                    inlay_hints.invalidate_debounce
-                } else {
-                    inlay_hints.append_debounce
-                }
-            }),
-        };
-
-        let mut visible_excerpts = self.visible_excerpts(true, cx);
-        let mut invalidate_hints_for_buffers = HashSet::default();
-        let ignore_previous_fetches = match reason {
-            InlayHintRefreshReason::ModifiersChanged(_)
-            | InlayHintRefreshReason::Toggle(_)
-            | InlayHintRefreshReason::SettingsChange(_) => true,
-            InlayHintRefreshReason::NewLinesShown
-            | InlayHintRefreshReason::RefreshRequested { .. }
-            | InlayHintRefreshReason::ExcerptsRemoved(_) => false,
-            InlayHintRefreshReason::BufferEdited(buffer_id) => {
-                let Some(affected_language) = self
-                    .buffer()
-                    .read(cx)
-                    .buffer(buffer_id)
-                    .and_then(|buffer| buffer.read(cx).language().cloned())
-                else {
-                    return;
-                };
-
-                invalidate_hints_for_buffers.extend(
-                    self.buffer()
-                        .read(cx)
-                        .all_buffers()
-                        .into_iter()
-                        .filter_map(|buffer| {
-                            let buffer = buffer.read(cx);
-                            if buffer.language() == Some(&affected_language) {
-                                Some(buffer.remote_id())
-                            } else {
-                                None
-                            }
-                        }),
-                );
-
-                semantics_provider.invalidate_inlay_hints(&invalidate_hints_for_buffers, cx);
-                visible_excerpts.retain(|_, (visible_buffer, _, _)| {
-                    visible_buffer.read(cx).language() == Some(&affected_language)
-                });
-                false
-            }
-        };
-
-        let multi_buffer = self.buffer().clone();
-        let Some(inlay_hints) = self.inlay_hints.as_mut() else {
-            return;
-        };
-
-        if invalidate_cache.should_invalidate() {
-            inlay_hints.clear();
-        }
-        inlay_hints
-            .invalidate_hints_for_buffers
-            .extend(invalidate_hints_for_buffers);
-
-        let mut buffers_to_query = HashMap::default();
-        for (_, (buffer, buffer_version, visible_range)) in visible_excerpts {
-            let buffer_id = buffer.read(cx).remote_id();
-            if !self.registered_buffers.contains_key(&buffer_id) {
-                continue;
-            }
-
-            let buffer_snapshot = buffer.read(cx).snapshot();
-            let buffer_anchor_range = buffer_snapshot.anchor_before(visible_range.start)
-                ..buffer_snapshot.anchor_after(visible_range.end);
-
-            let visible_excerpts =
-                buffers_to_query
-                    .entry(buffer_id)
-                    .or_insert_with(|| VisibleExcerpts {
-                        ranges: Vec::new(),
-                        buffer_version: buffer_version.clone(),
-                        buffer: buffer.clone(),
-                    });
-            visible_excerpts.buffer_version = buffer_version;
-            visible_excerpts.ranges.push(buffer_anchor_range);
-        }
-
-        for (buffer_id, visible_excerpts) in buffers_to_query {
-            let Some(buffer) = multi_buffer.read(cx).buffer(buffer_id) else {
-                continue;
-            };
-
-            let (fetched_for_version, fetched_chunks) = inlay_hints
-                .hint_chunk_fetching
-                .entry(buffer_id)
-                .or_default();
-            if visible_excerpts
-                .buffer_version
-                .changed_since(fetched_for_version)
-            {
-                *fetched_for_version = visible_excerpts.buffer_version.clone();
-                fetched_chunks.clear();
-                inlay_hints.hint_refresh_tasks.remove(&buffer_id);
-            }
-
-            let known_chunks = if ignore_previous_fetches {
-                None
-            } else {
-                Some((fetched_for_version.clone(), fetched_chunks.clone()))
-            };
-
-            let mut applicable_chunks =
-                semantics_provider.applicable_inlay_chunks(&buffer, &visible_excerpts.ranges, cx);
-            applicable_chunks.retain(|chunk| fetched_chunks.insert(chunk.clone()));
-            if applicable_chunks.is_empty() && !ignore_previous_fetches {
-                continue;
-            }
-            inlay_hints
-                .hint_refresh_tasks
-                .entry(buffer_id)
-                .or_default()
-                .push(spawn_editor_hints_refresh(
-                    buffer_id,
-                    invalidate_cache,
-                    debounce,
-                    visible_excerpts,
-                    known_chunks,
-                    applicable_chunks,
-                    cx,
-                ));
-        }
-    }
-
-    pub fn clear_inlay_hints(&mut self, cx: &mut Context<Self>) {
-        let to_remove = self
-            .visible_inlay_hints(cx)
-            .into_iter()
-            .map(|inlay| {
-                let inlay_id = inlay.id;
-                if let Some(inlay_hints) = &mut self.inlay_hints {
-                    inlay_hints.added_hints.remove(&inlay_id);
-                }
-                inlay_id
-            })
-            .collect::<Vec<_>>();
-        self.splice_inlays(&to_remove, Vec::new(), cx);
-    }
-
-    fn refresh_editor_data(
-        &mut self,
-        reason: &InlayHintRefreshReason,
-        cx: &mut Context<'_, Editor>,
-    ) -> Option<InvalidationStrategy> {
-        let visible_inlay_hints = self.visible_inlay_hints(cx);
-        let Some(inlay_hints) = self.inlay_hints.as_mut() else {
-            return None;
-        };
-
-        let invalidate_cache = match reason {
-            InlayHintRefreshReason::ModifiersChanged(enabled) => {
-                match inlay_hints.modifiers_override(*enabled) {
-                    Some(enabled) => {
-                        if enabled {
-                            InvalidationStrategy::None
-                        } else {
-                            self.clear_inlay_hints(cx);
-                            return None;
-                        }
-                    }
-                    None => return None,
-                }
-            }
-            InlayHintRefreshReason::Toggle(enabled) => {
-                if inlay_hints.toggle(*enabled) {
-                    if *enabled {
-                        InvalidationStrategy::None
-                    } else {
-                        self.clear_inlay_hints(cx);
-                        return None;
-                    }
-                } else {
-                    return None;
-                }
-            }
-            InlayHintRefreshReason::SettingsChange(new_settings) => {
-                match inlay_hints.update_settings(*new_settings, visible_inlay_hints) {
-                    ControlFlow::Break(Some(InlaySplice {
-                        to_remove,
-                        to_insert,
-                    })) => {
-                        self.splice_inlays(&to_remove, to_insert, cx);
-                        return None;
-                    }
-                    ControlFlow::Break(None) => return None,
-                    ControlFlow::Continue(splice) => {
-                        if let Some(InlaySplice {
-                            to_remove,
-                            to_insert,
-                        }) = splice
-                        {
-                            self.splice_inlays(&to_remove, to_insert, cx);
-                        }
-                        InvalidationStrategy::None
-                    }
-                }
-            }
-            InlayHintRefreshReason::ExcerptsRemoved(excerpts_removed) => {
-                let to_remove = self
-                    .display_map
-                    .read(cx)
-                    .current_inlays()
-                    .filter_map(|inlay| {
-                        if excerpts_removed.contains(&inlay.position.excerpt_id) {
-                            Some(inlay.id)
-                        } else {
-                            None
-                        }
-                    })
-                    .collect::<Vec<_>>();
-                self.splice_inlays(&to_remove, Vec::new(), cx);
-                return None;
-            }
-            InlayHintRefreshReason::NewLinesShown => InvalidationStrategy::None,
-            InlayHintRefreshReason::BufferEdited(_) => InvalidationStrategy::BufferEdited,
-            InlayHintRefreshReason::RefreshRequested {
-                server_id,
-                request_id,
-            } => InvalidationStrategy::RefreshRequested {
-                server_id: *server_id,
-                request_id: *request_id,
-            },
-        };
-
-        match &mut self.inlay_hints {
-            Some(inlay_hints) => {
-                if !inlay_hints.enabled
-                    && !matches!(reason, InlayHintRefreshReason::ModifiersChanged(_))
-                {
-                    return None;
-                }
-            }
-            None => return None,
-        }
-
-        Some(invalidate_cache)
-    }
-
-    pub(crate) fn visible_inlay_hints(&self, cx: &Context<Editor>) -> Vec<Inlay> {
-        self.display_map
-            .read(cx)
-            .current_inlays()
-            .filter(move |inlay| matches!(inlay.id, InlayId::Hint(_)))
-            .cloned()
-            .collect()
-    }
-
-    pub fn update_inlay_link_and_hover_points(
-        &mut self,
-        snapshot: &EditorSnapshot,
-        point_for_position: PointForPosition,
-        secondary_held: bool,
-        shift_held: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(lsp_store) = self.project().map(|project| project.read(cx).lsp_store()) else {
-            return;
-        };
-        let hovered_offset = if point_for_position.column_overshoot_after_line_end == 0 {
-            Some(
-                snapshot
-                    .display_point_to_inlay_offset(point_for_position.exact_unclipped, Bias::Left),
-            )
-        } else {
-            None
-        };
-        let mut go_to_definition_updated = false;
-        let mut hover_updated = false;
-        if let Some(hovered_offset) = hovered_offset {
-            let buffer_snapshot = self.buffer().read(cx).snapshot(cx);
-            let previous_valid_anchor = buffer_snapshot.anchor_at(
-                point_for_position.previous_valid.to_point(snapshot),
-                Bias::Left,
-            );
-            let next_valid_anchor = buffer_snapshot.anchor_at(
-                point_for_position.next_valid.to_point(snapshot),
-                Bias::Right,
-            );
-            if let Some(hovered_hint) = self
-                .visible_inlay_hints(cx)
-                .into_iter()
-                .skip_while(|hint| {
-                    hint.position
-                        .cmp(&previous_valid_anchor, &buffer_snapshot)
-                        .is_lt()
-                })
-                .take_while(|hint| {
-                    hint.position
-                        .cmp(&next_valid_anchor, &buffer_snapshot)
-                        .is_le()
-                })
-                .max_by_key(|hint| hint.id)
-            {
-                if let Some(ResolvedHint::Resolved(cached_hint)) = hovered_hint
-                    .position
-                    .text_anchor
-                    .buffer_id
-                    .and_then(|buffer_id| {
-                        lsp_store.update(cx, |lsp_store, cx| {
-                            lsp_store.resolved_hint(buffer_id, hovered_hint.id, cx)
-                        })
-                    })
-                {
-                    match cached_hint.resolve_state {
-                        ResolveState::Resolved => {
-                            let mut extra_shift_left = 0;
-                            let mut extra_shift_right = 0;
-                            if cached_hint.padding_left {
-                                extra_shift_left += 1;
-                                extra_shift_right += 1;
-                            }
-                            if cached_hint.padding_right {
-                                extra_shift_right += 1;
-                            }
-                            match cached_hint.label {
-                                InlayHintLabel::String(_) => {
-                                    if let Some(tooltip) = cached_hint.tooltip {
-                                        hover_popover::hover_at_inlay(
-                                            self,
-                                            InlayHover {
-                                                tooltip: match tooltip {
-                                                    InlayHintTooltip::String(text) => HoverBlock {
-                                                        text,
-                                                        kind: HoverBlockKind::PlainText,
-                                                    },
-                                                    InlayHintTooltip::MarkupContent(content) => {
-                                                        HoverBlock {
-                                                            text: content.value,
-                                                            kind: content.kind,
-                                                        }
-                                                    }
-                                                },
-                                                range: InlayHighlight {
-                                                    inlay: hovered_hint.id,
-                                                    inlay_position: hovered_hint.position,
-                                                    range: extra_shift_left
-                                                        ..hovered_hint.text().len()
-                                                            + extra_shift_right,
-                                                },
-                                            },
-                                            window,
-                                            cx,
-                                        );
-                                        hover_updated = true;
-                                    }
-                                }
-                                InlayHintLabel::LabelParts(label_parts) => {
-                                    let hint_start =
-                                        snapshot.anchor_to_inlay_offset(hovered_hint.position);
-                                    if let Some((hovered_hint_part, part_range)) =
-                                        hover_popover::find_hovered_hint_part(
-                                            label_parts,
-                                            hint_start,
-                                            hovered_offset,
-                                        )
-                                    {
-                                        let highlight_start =
-                                            (part_range.start - hint_start) + extra_shift_left;
-                                        let highlight_end =
-                                            (part_range.end - hint_start) + extra_shift_right;
-                                        let highlight = InlayHighlight {
-                                            inlay: hovered_hint.id,
-                                            inlay_position: hovered_hint.position,
-                                            range: highlight_start..highlight_end,
-                                        };
-                                        if let Some(tooltip) = hovered_hint_part.tooltip {
-                                            hover_popover::hover_at_inlay(
-                                                self,
-                                                InlayHover {
-                                                    tooltip: match tooltip {
-                                                        InlayHintLabelPartTooltip::String(text) => {
-                                                            HoverBlock {
-                                                                text,
-                                                                kind: HoverBlockKind::PlainText,
-                                                            }
-                                                        }
-                                                        InlayHintLabelPartTooltip::MarkupContent(
-                                                            content,
-                                                        ) => HoverBlock {
-                                                            text: content.value,
-                                                            kind: content.kind,
-                                                        },
-                                                    },
-                                                    range: highlight.clone(),
-                                                },
-                                                window,
-                                                cx,
-                                            );
-                                            hover_updated = true;
-                                        }
-                                        if let Some((language_server_id, location)) =
-                                            hovered_hint_part.location
-                                            && secondary_held
-                                            && !self.has_pending_nonempty_selection()
-                                        {
-                                            go_to_definition_updated = true;
-                                            show_link_definition(
-                                                shift_held,
-                                                self,
-                                                TriggerPoint::InlayHint(
-                                                    highlight,
-                                                    location,
-                                                    language_server_id,
-                                                ),
-                                                snapshot,
-                                                window,
-                                                cx,
-                                            );
-                                        }
-                                    }
-                                }
-                            };
-                        }
-                        ResolveState::CanResolve(_, _) => debug_panic!(
-                            "Expected resolved_hint retrieval to return a resolved hint"
-                        ),
-                        ResolveState::Resolving => {}
-                    }
-                }
-            }
-        }
-
-        if !go_to_definition_updated {
-            self.hide_hovered_link(cx)
-        }
-        if !hover_updated {
-            hover_popover::hover_at(self, None, window, cx);
-        }
-    }
-
-    fn inlay_hints_for_buffer(
-        &mut self,
-        invalidate_cache: InvalidationStrategy,
-        buffer_excerpts: VisibleExcerpts,
-        known_chunks: Option<(Global, HashSet<Range<BufferRow>>)>,
-        cx: &mut Context<Self>,
-    ) -> Option<Vec<Task<(Range<BufferRow>, anyhow::Result<CacheInlayHints>)>>> {
-        let semantics_provider = self.semantics_provider()?;
-
-        let new_hint_tasks = semantics_provider
-            .inlay_hints(
-                invalidate_cache,
-                buffer_excerpts.buffer,
-                buffer_excerpts.ranges,
-                known_chunks,
-                cx,
-            )
-            .unwrap_or_default();
-
-        let mut hint_tasks = None;
-        for (row_range, new_hints_task) in new_hint_tasks {
-            hint_tasks
-                .get_or_insert_with(Vec::new)
-                .push(cx.spawn(async move |_, _| (row_range, new_hints_task.await)));
-        }
-        hint_tasks
-    }
-
-    fn apply_fetched_hints(
-        &mut self,
-        buffer_id: BufferId,
-        query_version: Global,
-        invalidate_cache: InvalidationStrategy,
-        new_hints: Vec<(Range<BufferRow>, anyhow::Result<CacheInlayHints>)>,
-        cx: &mut Context<Self>,
-    ) {
-        let visible_inlay_hint_ids = self
-            .visible_inlay_hints(cx)
-            .iter()
-            .filter(|inlay| inlay.position.text_anchor.buffer_id == Some(buffer_id))
-            .map(|inlay| inlay.id)
-            .collect::<Vec<_>>();
-        let Some(inlay_hints) = &mut self.inlay_hints else {
-            return;
-        };
-
-        let mut hints_to_remove = Vec::new();
-        let multi_buffer_snapshot = self.buffer.read(cx).snapshot(cx);
-
-        // If we've received hints from the cache, it means `invalidate_cache` had invalidated whatever possible there,
-        // and most probably there are no more hints with IDs from `visible_inlay_hint_ids` in the cache.
-        // So, if we hover such hints, no resolve will happen.
-        //
-        // Another issue is in the fact that changing one buffer may lead to other buffers' hints changing, so more cache entries may be removed.
-        // Hence, clear all excerpts' hints in the multi buffer: later, the invalidated ones will re-trigger the LSP query, the rest will be restored
-        // from the cache.
-        if invalidate_cache.should_invalidate() {
-            hints_to_remove.extend(visible_inlay_hint_ids);
-        }
-
-        let excerpts = self.buffer.read(cx).excerpt_ids();
-        let mut inserted_hint_text = HashMap::default();
-        let hints_to_insert = new_hints
-            .into_iter()
-            .filter_map(|(chunk_range, hints_result)| {
-                let chunks_fetched = inlay_hints.hint_chunk_fetching.get_mut(&buffer_id);
-                match hints_result {
-                    Ok(new_hints) => {
-                        if new_hints.is_empty() {
-                            if let Some((_, chunks_fetched)) = chunks_fetched {
-                                chunks_fetched.remove(&chunk_range);
-                            }
-                        }
-                        Some(new_hints)
-                    }
-                    Err(e) => {
-                        log::error!(
-                            "Failed to query inlays for buffer row range {chunk_range:?}, {e:#}"
-                        );
-                        if let Some((for_version, chunks_fetched)) = chunks_fetched {
-                            if for_version == &query_version {
-                                chunks_fetched.remove(&chunk_range);
-                            }
-                        }
-                        None
-                    }
-                }
-            })
-            .flat_map(|new_hints| {
-                let mut hints_deduplicated = Vec::new();
-
-                if new_hints.len() > 1 {
-                    for (server_id, new_hints) in new_hints {
-                        for (new_id, new_hint) in new_hints {
-                            let hints_text_for_position = inserted_hint_text
-                                .entry(new_hint.position)
-                                .or_insert_with(HashMap::default);
-                            let insert =
-                                match hints_text_for_position.entry(new_hint.text().to_string()) {
-                                    hash_map::Entry::Occupied(o) => o.get() == &server_id,
-                                    hash_map::Entry::Vacant(v) => {
-                                        v.insert(server_id);
-                                        true
-                                    }
-                                };
-
-                            if insert {
-                                hints_deduplicated.push((new_id, new_hint));
-                            }
-                        }
-                    }
-                } else {
-                    hints_deduplicated.extend(new_hints.into_values().flatten());
-                }
-
-                hints_deduplicated
-            })
-            .filter_map(|(hint_id, lsp_hint)| {
-                if inlay_hints.allowed_hint_kinds.contains(&lsp_hint.kind)
-                    && inlay_hints
-                        .added_hints
-                        .insert(hint_id, lsp_hint.kind)
-                        .is_none()
-                {
-                    let position = excerpts.iter().find_map(|excerpt_id| {
-                        multi_buffer_snapshot.anchor_in_excerpt(*excerpt_id, lsp_hint.position)
-                    })?;
-                    return Some(Inlay::hint(hint_id, position, &lsp_hint));
-                }
-                None
-            })
-            .collect::<Vec<_>>();
-
-        let invalidate_hints_for_buffers =
-            std::mem::take(&mut inlay_hints.invalidate_hints_for_buffers);
-        if !invalidate_hints_for_buffers.is_empty() {
-            hints_to_remove.extend(
-                self.visible_inlay_hints(cx)
-                    .iter()
-                    .filter(|inlay| {
-                        inlay
-                            .position
-                            .text_anchor
-                            .buffer_id
-                            .is_none_or(|buffer_id| {
-                                invalidate_hints_for_buffers.contains(&buffer_id)
-                            })
-                    })
-                    .map(|inlay| inlay.id),
-            );
-        }
-
-        self.splice_inlays(&hints_to_remove, hints_to_insert, cx);
-    }
-}
-
-#[derive(Debug)]
-struct VisibleExcerpts {
-    ranges: Vec<Range<text::Anchor>>,
-    buffer_version: Global,
-    buffer: Entity<language::Buffer>,
-}
-
-fn spawn_editor_hints_refresh(
-    buffer_id: BufferId,
-    invalidate_cache: InvalidationStrategy,
-    debounce: Option<Duration>,
-    buffer_excerpts: VisibleExcerpts,
-    known_chunks: Option<(Global, HashSet<Range<BufferRow>>)>,
-    applicable_chunks: Vec<Range<BufferRow>>,
-    cx: &mut Context<'_, Editor>,
-) -> Task<()> {
-    cx.spawn(async move |editor, cx| {
-        if let Some(debounce) = debounce {
-            cx.background_executor().timer(debounce).await;
-        }
-
-        let query_version = buffer_excerpts.buffer_version.clone();
-        let Some(hint_tasks) = editor
-            .update(cx, |editor, cx| {
-                editor.inlay_hints_for_buffer(invalidate_cache, buffer_excerpts, known_chunks, cx)
-            })
-            .ok()
-        else {
-            return;
-        };
-        let hint_tasks = hint_tasks.unwrap_or_default();
-        if hint_tasks.is_empty() {
-            editor
-                .update(cx, |editor, _| {
-                    if let Some((_, hint_chunk_fetching)) = editor
-                        .inlay_hints
-                        .as_mut()
-                        .and_then(|inlay_hints| inlay_hints.hint_chunk_fetching.get_mut(&buffer_id))
-                    {
-                        for applicable_chunks in &applicable_chunks {
-                            hint_chunk_fetching.remove(applicable_chunks);
-                        }
-                    }
-                })
-                .ok();
-            return;
-        }
-        let new_hints = join_all(hint_tasks).await;
-        editor
-            .update(cx, |editor, cx| {
-                editor.apply_fetched_hints(
-                    buffer_id,
-                    query_version,
-                    invalidate_cache,
-                    new_hints,
-                    cx,
-                );
-            })
-            .ok();
-    })
-}
-
-#[cfg(test)]
-pub mod tests {
-    use crate::editor_tests::update_test_language_settings;
-    use crate::inlays::inlay_hints::InlayHintRefreshReason;
-    use crate::scroll::ScrollAmount;
-    use crate::{Editor, SelectionEffects};
-    use crate::{ExcerptRange, scroll::Autoscroll};
-    use collections::HashSet;
-    use futures::{StreamExt, future};
-    use gpui::{AppContext as _, Context, TestAppContext, WindowHandle};
-    use itertools::Itertools as _;
-    use language::language_settings::InlayHintKind;
-    use language::{Capability, FakeLspAdapter};
-    use language::{Language, LanguageConfig, LanguageMatcher};
-    use languages::rust_lang;
-    use lsp::FakeLanguageServer;
-    use multi_buffer::{MultiBuffer, MultiBufferOffset};
-    use parking_lot::Mutex;
-    use pretty_assertions::assert_eq;
-    use project::{FakeFs, Project};
-    use serde_json::json;
-    use settings::{AllLanguageSettingsContent, InlayHintSettingsContent, SettingsStore};
-    use std::ops::Range;
-    use std::sync::Arc;
-    use std::sync::atomic::{AtomicBool, AtomicU32, AtomicUsize, Ordering};
-    use std::time::Duration;
-    use text::{OffsetRangeExt, Point};
-    use ui::App;
-    use util::path;
-    use util::paths::natural_sort;
-
-    #[gpui::test]
-    async fn test_basic_cache_update_with_duplicate_hints(cx: &mut gpui::TestAppContext) {
-        let allowed_hint_kinds = HashSet::from_iter([None, Some(InlayHintKind::Type)]);
-        init_test(cx, |settings| {
-            settings.defaults.inlay_hints = Some(InlayHintSettingsContent {
-                show_value_hints: Some(true),
-                enabled: Some(true),
-                edit_debounce_ms: Some(0),
-                scroll_debounce_ms: Some(0),
-                show_type_hints: Some(allowed_hint_kinds.contains(&Some(InlayHintKind::Type))),
-                show_parameter_hints: Some(
-                    allowed_hint_kinds.contains(&Some(InlayHintKind::Parameter)),
-                ),
-                show_other_hints: Some(allowed_hint_kinds.contains(&None)),
-                show_background: Some(false),
-                toggle_on_modifiers_press: None,
-            })
-        });
-        let (_, editor, fake_server) = prepare_test_objects(cx, |fake_server, file_with_hints| {
-            let lsp_request_count = Arc::new(AtomicU32::new(0));
-            fake_server.set_request_handler::<lsp::request::InlayHintRequest, _, _>(
-                move |params, _| {
-                    let task_lsp_request_count = Arc::clone(&lsp_request_count);
-                    async move {
-                        let i = task_lsp_request_count.fetch_add(1, Ordering::Release) + 1;
-                        assert_eq!(
-                            params.text_document.uri,
-                            lsp::Uri::from_file_path(file_with_hints).unwrap(),
-                        );
-                        Ok(Some(vec![lsp::InlayHint {
-                            position: lsp::Position::new(0, i),
-                            label: lsp::InlayHintLabel::String(i.to_string()),
-                            kind: None,
-                            text_edits: None,
-                            tooltip: None,
-                            padding_left: None,
-                            padding_right: None,
-                            data: None,
-                        }]))
-                    }
-                },
-            );
-        })
-        .await;
-        cx.executor().run_until_parked();
-
-        editor
-            .update(cx, |editor, _window, cx| {
-                let expected_hints = vec!["1".to_string()];
-                assert_eq!(
-                    expected_hints,
-                    cached_hint_labels(editor, cx),
-                    "Should get its first hints when opening the editor"
-                );
-                assert_eq!(expected_hints, visible_hint_labels(editor, cx));
-                assert_eq!(
-                    allowed_hint_kinds_for_editor(editor),
-                    allowed_hint_kinds,
-                    "Cache should use editor settings to get the allowed hint kinds"
-                );
-            })
-            .unwrap();
-
-        editor
-            .update(cx, |editor, window, cx| {
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.select_ranges([MultiBufferOffset(13)..MultiBufferOffset(13)])
-                });
-                editor.handle_input("some change", window, cx);
-            })
-            .unwrap();
-        cx.executor().run_until_parked();
-        editor
-            .update(cx, |editor, _window, cx| {
-                let expected_hints = vec!["2".to_string()];
-                assert_eq!(
-                    expected_hints,
-                    cached_hint_labels(editor, cx),
-                    "Should get new hints after an edit"
-                );
-                assert_eq!(expected_hints, visible_hint_labels(editor, cx));
-                assert_eq!(
-                    allowed_hint_kinds_for_editor(editor),
-                    allowed_hint_kinds,
-                    "Cache should use editor settings to get the allowed hint kinds"
-                );
-            })
-            .unwrap();
-
-        fake_server
-            .request::<lsp::request::InlayHintRefreshRequest>(())
-            .await
-            .into_response()
-            .expect("inlay refresh request failed");
-        cx.executor().run_until_parked();
-        editor
-            .update(cx, |editor, _window, cx| {
-                let expected_hints = vec!["3".to_string()];
-                assert_eq!(
-                    expected_hints,
-                    cached_hint_labels(editor, cx),
-                    "Should get new hints after hint refresh/ request"
-                );
-                assert_eq!(expected_hints, visible_hint_labels(editor, cx));
-                assert_eq!(
-                    allowed_hint_kinds_for_editor(editor),
-                    allowed_hint_kinds,
-                    "Cache should use editor settings to get the allowed hint kinds"
-                );
-            })
-            .unwrap();
-    }
-
-    #[gpui::test]
-    async fn test_racy_cache_updates(cx: &mut gpui::TestAppContext) {
-        init_test(cx, |settings| {
-            settings.defaults.inlay_hints = Some(InlayHintSettingsContent {
-                enabled: Some(true),
-                ..InlayHintSettingsContent::default()
-            })
-        });
-        let (_, editor, fake_server) = prepare_test_objects(cx, |fake_server, file_with_hints| {
-            let lsp_request_count = Arc::new(AtomicU32::new(0));
-            fake_server.set_request_handler::<lsp::request::InlayHintRequest, _, _>(
-                move |params, _| {
-                    let task_lsp_request_count = Arc::clone(&lsp_request_count);
-                    async move {
-                        let i = task_lsp_request_count.fetch_add(1, Ordering::Release) + 1;
-                        assert_eq!(
-                            params.text_document.uri,
-                            lsp::Uri::from_file_path(file_with_hints).unwrap(),
-                        );
-                        Ok(Some(vec![lsp::InlayHint {
-                            position: lsp::Position::new(0, i),
-                            label: lsp::InlayHintLabel::String(i.to_string()),
-                            kind: Some(lsp::InlayHintKind::TYPE),
-                            text_edits: None,
-                            tooltip: None,
-                            padding_left: None,
-                            padding_right: None,
-                            data: None,
-                        }]))
-                    }
-                },
-            );
-        })
-        .await;
-        cx.executor().advance_clock(Duration::from_secs(1));
-        cx.executor().run_until_parked();
-
-        editor
-            .update(cx, |editor, _window, cx| {
-                let expected_hints = vec!["1".to_string()];
-                assert_eq!(
-                    expected_hints,
-                    cached_hint_labels(editor, cx),
-                    "Should get its first hints when opening the editor"
-                );
-                assert_eq!(expected_hints, visible_hint_labels(editor, cx));
-            })
-            .unwrap();
-
-        // Emulate simultaneous events: both editing, refresh and, slightly after, scroll updates are triggered.
-        editor
-            .update(cx, |editor, window, cx| {
-                editor.handle_input("foo", window, cx);
-            })
-            .unwrap();
-        cx.executor().advance_clock(Duration::from_millis(5));
-        editor
-            .update(cx, |editor, _window, cx| {
-                editor.refresh_inlay_hints(
-                    InlayHintRefreshReason::RefreshRequested {
-                        server_id: fake_server.server.server_id(),
-                        request_id: Some(1),
-                    },
-                    cx,
-                );
-            })
-            .unwrap();
-        cx.executor().advance_clock(Duration::from_millis(5));
-        editor
-            .update(cx, |editor, _window, cx| {
-                editor.refresh_inlay_hints(InlayHintRefreshReason::NewLinesShown, cx);
-            })
-            .unwrap();
-        cx.executor().advance_clock(Duration::from_secs(1));
-        cx.executor().run_until_parked();
-        editor
-            .update(cx, |editor, _window, cx| {
-                let expected_hints = vec!["2".to_string()];
-                assert_eq!(expected_hints, cached_hint_labels(editor, cx), "Despite multiple simultaneous refreshes, only one inlay hint query should be issued");
-                assert_eq!(expected_hints, visible_hint_labels(editor, cx));
-            })
-            .unwrap();
-    }
-
-    #[gpui::test]
-    async fn test_cache_update_on_lsp_completion_tasks(cx: &mut gpui::TestAppContext) {
-        init_test(cx, |settings| {
-            settings.defaults.inlay_hints = Some(InlayHintSettingsContent {
-                show_value_hints: Some(true),
-                enabled: Some(true),
-                edit_debounce_ms: Some(0),
-                scroll_debounce_ms: Some(0),
-                show_type_hints: Some(true),
-                show_parameter_hints: Some(true),
-                show_other_hints: Some(true),
-                show_background: Some(false),
-                toggle_on_modifiers_press: None,
-            })
-        });
-
-        let (_, editor, fake_server) = prepare_test_objects(cx, |fake_server, file_with_hints| {
-            let lsp_request_count = Arc::new(AtomicU32::new(0));
-            fake_server.set_request_handler::<lsp::request::InlayHintRequest, _, _>(
-                move |params, _| {
-                    let task_lsp_request_count = Arc::clone(&lsp_request_count);
-                    async move {
-                        assert_eq!(
-                            params.text_document.uri,
-                            lsp::Uri::from_file_path(file_with_hints).unwrap(),
-                        );
-                        let current_call_id =
-                            Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::SeqCst);
-                        Ok(Some(vec![lsp::InlayHint {
-                            position: lsp::Position::new(0, current_call_id),
-                            label: lsp::InlayHintLabel::String(current_call_id.to_string()),
-                            kind: None,
-                            text_edits: None,
-                            tooltip: None,
-                            padding_left: None,
-                            padding_right: None,
-                            data: None,
-                        }]))
-                    }
-                },
-            );
-        })
-        .await;
-        cx.executor().run_until_parked();
-
-        editor
-            .update(cx, |editor, _, cx| {
-                let expected_hints = vec!["0".to_string()];
-                assert_eq!(
-                    expected_hints,
-                    cached_hint_labels(editor, cx),
-                    "Should get its first hints when opening the editor"
-                );
-                assert_eq!(expected_hints, visible_hint_labels(editor, cx));
-            })
-            .unwrap();
-
-        let progress_token = 42;
-        fake_server
-            .request::<lsp::request::WorkDoneProgressCreate>(lsp::WorkDoneProgressCreateParams {
-                token: lsp::ProgressToken::Number(progress_token),
-            })
-            .await
-            .into_response()
-            .expect("work done progress create request failed");
-        cx.executor().run_until_parked();
-        fake_server.notify::<lsp::notification::Progress>(lsp::ProgressParams {
-            token: lsp::ProgressToken::Number(progress_token),
-            value: lsp::ProgressParamsValue::WorkDone(lsp::WorkDoneProgress::Begin(
-                lsp::WorkDoneProgressBegin::default(),
-            )),
-        });
-        cx.executor().run_until_parked();
-
-        editor
-            .update(cx, |editor, _, cx| {
-                let expected_hints = vec!["0".to_string()];
-                assert_eq!(
-                    expected_hints,
-                    cached_hint_labels(editor, cx),
-                    "Should not update hints while the work task is running"
-                );
-                assert_eq!(expected_hints, visible_hint_labels(editor, cx));
-            })
-            .unwrap();
-
-        fake_server.notify::<lsp::notification::Progress>(lsp::ProgressParams {
-            token: lsp::ProgressToken::Number(progress_token),
-            value: lsp::ProgressParamsValue::WorkDone(lsp::WorkDoneProgress::End(
-                lsp::WorkDoneProgressEnd::default(),
-            )),
-        });
-        cx.executor().run_until_parked();
-
-        editor
-            .update(cx, |editor, _, cx| {
-                let expected_hints = vec!["1".to_string()];
-                assert_eq!(
-                    expected_hints,
-                    cached_hint_labels(editor, cx),
-                    "New hints should be queried after the work task is done"
-                );
-                assert_eq!(expected_hints, visible_hint_labels(editor, cx));
-            })
-            .unwrap();
-    }
-
-    #[gpui::test]
-    async fn test_no_hint_updates_for_unrelated_language_files(cx: &mut gpui::TestAppContext) {
-        init_test(cx, |settings| {
-            settings.defaults.inlay_hints = Some(InlayHintSettingsContent {
-                show_value_hints: Some(true),
-                enabled: Some(true),
-                edit_debounce_ms: Some(0),
-                scroll_debounce_ms: Some(0),
-                show_type_hints: Some(true),
-                show_parameter_hints: Some(true),
-                show_other_hints: Some(true),
-                show_background: Some(false),
-                toggle_on_modifiers_press: None,
-            })
-        });
-
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(
-            path!("/a"),
-            json!({
-                "main.rs": "fn main() { a } // and some long comment to ensure inlays are not trimmed out",
-                "other.md": "Test md file with some text",
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
-
-        let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-        let mut rs_fake_servers = None;
-        let mut md_fake_servers = None;
-        for (name, path_suffix) in [("Rust", "rs"), ("Markdown", "md")] {
-            language_registry.add(Arc::new(Language::new(
-                LanguageConfig {
-                    name: name.into(),
-                    matcher: LanguageMatcher {
-                        path_suffixes: vec![path_suffix.to_string()],
-                        ..Default::default()
-                    },
-                    ..Default::default()
-                },
-                Some(tree_sitter_rust::LANGUAGE.into()),
-            )));
-            let fake_servers = language_registry.register_fake_lsp(
-                name,
-                FakeLspAdapter {
-                    name,
-                    capabilities: lsp::ServerCapabilities {
-                        inlay_hint_provider: Some(lsp::OneOf::Left(true)),
-                        ..Default::default()
-                    },
-                    initializer: Some(Box::new({
-                        move |fake_server| {
-                            let rs_lsp_request_count = Arc::new(AtomicU32::new(0));
-                            let md_lsp_request_count = Arc::new(AtomicU32::new(0));
-                            fake_server
-                                .set_request_handler::<lsp::request::InlayHintRequest, _, _>(
-                                    move |params, _| {
-                                        let i = match name {
-                                            "Rust" => {
-                                                assert_eq!(
-                                                    params.text_document.uri,
-                                                    lsp::Uri::from_file_path(path!("/a/main.rs"))
-                                                        .unwrap(),
-                                                );
-                                                rs_lsp_request_count.fetch_add(1, Ordering::Release)
-                                                    + 1
-                                            }
-                                            "Markdown" => {
-                                                assert_eq!(
-                                                    params.text_document.uri,
-                                                    lsp::Uri::from_file_path(path!("/a/other.md"))
-                                                        .unwrap(),
-                                                );
-                                                md_lsp_request_count.fetch_add(1, Ordering::Release)
-                                                    + 1
-                                            }
-                                            unexpected => {
-                                                panic!("Unexpected language: {unexpected}")
-                                            }
-                                        };
-
-                                        async move {
-                                            let query_start = params.range.start;
-                                            Ok(Some(vec![lsp::InlayHint {
-                                                position: query_start,
-                                                label: lsp::InlayHintLabel::String(i.to_string()),
-                                                kind: None,
-                                                text_edits: None,
-                                                tooltip: None,
-                                                padding_left: None,
-                                                padding_right: None,
-                                                data: None,
-                                            }]))
-                                        }
-                                    },
-                                );
-                        }
-                    })),
-                    ..Default::default()
-                },
-            );
-            match name {
-                "Rust" => rs_fake_servers = Some(fake_servers),
-                "Markdown" => md_fake_servers = Some(fake_servers),
-                _ => unreachable!(),
-            }
-        }
-
-        let rs_buffer = project
-            .update(cx, |project, cx| {
-                project.open_local_buffer(path!("/a/main.rs"), cx)
-            })
-            .await
-            .unwrap();
-        let rs_editor = cx.add_window(|window, cx| {
-            Editor::for_buffer(rs_buffer, Some(project.clone()), window, cx)
-        });
-        cx.executor().run_until_parked();
-
-        let _rs_fake_server = rs_fake_servers.unwrap().next().await.unwrap();
-        cx.executor().run_until_parked();
-        rs_editor
-            .update(cx, |editor, _window, cx| {
-                let expected_hints = vec!["1".to_string()];
-                assert_eq!(
-                    expected_hints,
-                    cached_hint_labels(editor, cx),
-                    "Should get its first hints when opening the editor"
-                );
-                assert_eq!(expected_hints, visible_hint_labels(editor, cx));
-            })
-            .unwrap();
-
-        cx.executor().run_until_parked();
-        let md_buffer = project
-            .update(cx, |project, cx| {
-                project.open_local_buffer(path!("/a/other.md"), cx)
-            })
-            .await
-            .unwrap();
-        let md_editor =
-            cx.add_window(|window, cx| Editor::for_buffer(md_buffer, Some(project), window, cx));
-        cx.executor().run_until_parked();
-
-        let _md_fake_server = md_fake_servers.unwrap().next().await.unwrap();
-        cx.executor().run_until_parked();
-        md_editor
-            .update(cx, |editor, _window, cx| {
-                let expected_hints = vec!["1".to_string()];
-                assert_eq!(
-                    expected_hints,
-                    cached_hint_labels(editor, cx),
-                    "Markdown editor should have a separate version, repeating Rust editor rules"
-                );
-                assert_eq!(expected_hints, visible_hint_labels(editor, cx));
-            })
-            .unwrap();
-
-        rs_editor
-            .update(cx, |editor, window, cx| {
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.select_ranges([MultiBufferOffset(13)..MultiBufferOffset(13)])
-                });
-                editor.handle_input("some rs change", window, cx);
-            })
-            .unwrap();
-        cx.executor().run_until_parked();
-        rs_editor
-            .update(cx, |editor, _window, cx| {
-                let expected_hints = vec!["2".to_string()];
-                assert_eq!(
-                    expected_hints,
-                    cached_hint_labels(editor, cx),
-                    "Rust inlay cache should change after the edit"
-                );
-                assert_eq!(expected_hints, visible_hint_labels(editor, cx));
-            })
-            .unwrap();
-        md_editor
-            .update(cx, |editor, _window, cx| {
-                let expected_hints = vec!["1".to_string()];
-                assert_eq!(
-                    expected_hints,
-                    cached_hint_labels(editor, cx),
-                    "Markdown editor should not be affected by Rust editor changes"
-                );
-                assert_eq!(expected_hints, visible_hint_labels(editor, cx));
-            })
-            .unwrap();
-
-        md_editor
-            .update(cx, |editor, window, cx| {
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.select_ranges([MultiBufferOffset(13)..MultiBufferOffset(13)])
-                });
-                editor.handle_input("some md change", window, cx);
-            })
-            .unwrap();
-        cx.executor().run_until_parked();
-        md_editor
-            .update(cx, |editor, _window, cx| {
-                let expected_hints = vec!["2".to_string()];
-                assert_eq!(
-                    expected_hints,
-                    cached_hint_labels(editor, cx),
-                    "Rust editor should not be affected by Markdown editor changes"
-                );
-                assert_eq!(expected_hints, visible_hint_labels(editor, cx));
-            })
-            .unwrap();
-        rs_editor
-            .update(cx, |editor, _window, cx| {
-                let expected_hints = vec!["2".to_string()];
-                assert_eq!(
-                    expected_hints,
-                    cached_hint_labels(editor, cx),
-                    "Markdown editor should also change independently"
-                );
-                assert_eq!(expected_hints, visible_hint_labels(editor, cx));
-            })
-            .unwrap();
-    }
-
-    #[gpui::test]
-    async fn test_hint_setting_changes(cx: &mut gpui::TestAppContext) {
-        let allowed_hint_kinds = HashSet::from_iter([None, Some(InlayHintKind::Type)]);
-        init_test(cx, |settings| {
-            settings.defaults.inlay_hints = Some(InlayHintSettingsContent {
-                show_value_hints: Some(true),
-                enabled: Some(true),
-                edit_debounce_ms: Some(0),
-                scroll_debounce_ms: Some(0),
-                show_type_hints: Some(allowed_hint_kinds.contains(&Some(InlayHintKind::Type))),
-                show_parameter_hints: Some(
-                    allowed_hint_kinds.contains(&Some(InlayHintKind::Parameter)),
-                ),
-                show_other_hints: Some(allowed_hint_kinds.contains(&None)),
-                show_background: Some(false),
-                toggle_on_modifiers_press: None,
-            })
-        });
-
-        let lsp_request_count = Arc::new(AtomicUsize::new(0));
-        let (_, editor, fake_server) = prepare_test_objects(cx, {
-            let lsp_request_count = lsp_request_count.clone();
-            move |fake_server, file_with_hints| {
-                let lsp_request_count = lsp_request_count.clone();
-                fake_server.set_request_handler::<lsp::request::InlayHintRequest, _, _>(
-                    move |params, _| {
-                        lsp_request_count.fetch_add(1, Ordering::Release);
-                        async move {
-                            assert_eq!(
-                                params.text_document.uri,
-                                lsp::Uri::from_file_path(file_with_hints).unwrap(),
-                            );
-                            Ok(Some(vec![
-                                lsp::InlayHint {
-                                    position: lsp::Position::new(0, 1),
-                                    label: lsp::InlayHintLabel::String("type hint".to_string()),
-                                    kind: Some(lsp::InlayHintKind::TYPE),
-                                    text_edits: None,
-                                    tooltip: None,
-                                    padding_left: None,
-                                    padding_right: None,
-                                    data: None,
-                                },
-                                lsp::InlayHint {
-                                    position: lsp::Position::new(0, 2),
-                                    label: lsp::InlayHintLabel::String(
-                                        "parameter hint".to_string(),
-                                    ),
-                                    kind: Some(lsp::InlayHintKind::PARAMETER),
-                                    text_edits: None,
-                                    tooltip: None,
-                                    padding_left: None,
-                                    padding_right: None,
-                                    data: None,
-                                },
-                                lsp::InlayHint {
-                                    position: lsp::Position::new(0, 3),
-                                    label: lsp::InlayHintLabel::String("other hint".to_string()),
-                                    kind: None,
-                                    text_edits: None,
-                                    tooltip: None,
-                                    padding_left: None,
-                                    padding_right: None,
-                                    data: None,
-                                },
-                            ]))
-                        }
-                    },
-                );
-            }
-        })
-        .await;
-        cx.executor().run_until_parked();
-
-        editor
-            .update(cx, |editor, _, cx| {
-                assert_eq!(
-                    lsp_request_count.load(Ordering::Relaxed),
-                    1,
-                    "Should query new hints once"
-                );
-                assert_eq!(
-                    vec![
-                        "type hint".to_string(),
-                        "parameter hint".to_string(),
-                        "other hint".to_string(),
-                    ],
-                    cached_hint_labels(editor, cx),
-                    "Should get its first hints when opening the editor"
-                );
-                assert_eq!(
-                    vec!["type hint".to_string(), "other hint".to_string()],
-                    visible_hint_labels(editor, cx)
-                );
-                assert_eq!(
-                    allowed_hint_kinds_for_editor(editor),
-                    allowed_hint_kinds,
-                    "Cache should use editor settings to get the allowed hint kinds"
-                );
-            })
-            .unwrap();
-
-        fake_server
-            .request::<lsp::request::InlayHintRefreshRequest>(())
-            .await
-            .into_response()
-            .expect("inlay refresh request failed");
-        cx.executor().run_until_parked();
-        editor
-            .update(cx, |editor, _, cx| {
-                assert_eq!(
-                    lsp_request_count.load(Ordering::Relaxed),
-                    2,
-                    "Should load new hints twice"
-                );
-                assert_eq!(
-                    vec![
-                        "type hint".to_string(),
-                        "parameter hint".to_string(),
-                        "other hint".to_string(),
-                    ],
-                    cached_hint_labels(editor, cx),
-                    "Cached hints should not change due to allowed hint kinds settings update"
-                );
-                assert_eq!(
-                    vec!["type hint".to_string(), "other hint".to_string()],
-                    visible_hint_labels(editor, cx)
-                );
-            })
-            .unwrap();
-
-        for (new_allowed_hint_kinds, expected_visible_hints) in [
-            (HashSet::from_iter([None]), vec!["other hint".to_string()]),
-            (
-                HashSet::from_iter([Some(InlayHintKind::Type)]),
-                vec!["type hint".to_string()],
-            ),
-            (
-                HashSet::from_iter([Some(InlayHintKind::Parameter)]),
-                vec!["parameter hint".to_string()],
-            ),
-            (
-                HashSet::from_iter([None, Some(InlayHintKind::Type)]),
-                vec!["type hint".to_string(), "other hint".to_string()],
-            ),
-            (
-                HashSet::from_iter([None, Some(InlayHintKind::Parameter)]),
-                vec!["parameter hint".to_string(), "other hint".to_string()],
-            ),
-            (
-                HashSet::from_iter([Some(InlayHintKind::Type), Some(InlayHintKind::Parameter)]),
-                vec!["type hint".to_string(), "parameter hint".to_string()],
-            ),
-            (
-                HashSet::from_iter([
-                    None,
-                    Some(InlayHintKind::Type),
-                    Some(InlayHintKind::Parameter),
-                ]),
-                vec![
-                    "type hint".to_string(),
-                    "parameter hint".to_string(),
-                    "other hint".to_string(),
-                ],
-            ),
-        ] {
-            update_test_language_settings(cx, |settings| {
-                settings.defaults.inlay_hints = Some(InlayHintSettingsContent {
-                    show_value_hints: Some(true),
-                    enabled: Some(true),
-                    edit_debounce_ms: Some(0),
-                    scroll_debounce_ms: Some(0),
-                    show_type_hints: Some(
-                        new_allowed_hint_kinds.contains(&Some(InlayHintKind::Type)),
-                    ),
-                    show_parameter_hints: Some(
-                        new_allowed_hint_kinds.contains(&Some(InlayHintKind::Parameter)),
-                    ),
-                    show_other_hints: Some(new_allowed_hint_kinds.contains(&None)),
-                    show_background: Some(false),
-                    toggle_on_modifiers_press: None,
-                })
-            });
-            cx.executor().run_until_parked();
-            editor.update(cx, |editor, _, cx| {
-                assert_eq!(
-                    lsp_request_count.load(Ordering::Relaxed),
-                    2,
-                    "Should not load new hints on allowed hint kinds change for hint kinds {new_allowed_hint_kinds:?}"
-                );
-                assert_eq!(
-                    vec![
-                        "type hint".to_string(),
-                        "parameter hint".to_string(),
-                        "other hint".to_string(),
-                    ],
-                    cached_hint_labels(editor, cx),
-                    "Should get its cached hints unchanged after the settings change for hint kinds {new_allowed_hint_kinds:?}"
-                );
-                assert_eq!(
-                    expected_visible_hints,
-                    visible_hint_labels(editor, cx),
-                    "Should get its visible hints filtered after the settings change for hint kinds {new_allowed_hint_kinds:?}"
-                );
-                assert_eq!(
-                    allowed_hint_kinds_for_editor(editor),
-                    new_allowed_hint_kinds,
-                    "Cache should use editor settings to get the allowed hint kinds for hint kinds {new_allowed_hint_kinds:?}"
-                );
-            }).unwrap();
-        }
-
-        let another_allowed_hint_kinds = HashSet::from_iter([Some(InlayHintKind::Type)]);
-        update_test_language_settings(cx, |settings| {
-            settings.defaults.inlay_hints = Some(InlayHintSettingsContent {
-                show_value_hints: Some(true),
-                enabled: Some(false),
-                edit_debounce_ms: Some(0),
-                scroll_debounce_ms: Some(0),
-                show_type_hints: Some(
-                    another_allowed_hint_kinds.contains(&Some(InlayHintKind::Type)),
-                ),
-                show_parameter_hints: Some(
-                    another_allowed_hint_kinds.contains(&Some(InlayHintKind::Parameter)),
-                ),
-                show_other_hints: Some(another_allowed_hint_kinds.contains(&None)),
-                show_background: Some(false),
-                toggle_on_modifiers_press: None,
-            })
-        });
-        cx.executor().run_until_parked();
-        editor
-            .update(cx, |editor, _, cx| {
-                assert_eq!(
-                    lsp_request_count.load(Ordering::Relaxed),
-                    2,
-                    "Should not load new hints when hints got disabled"
-                );
-                assert_eq!(
-                    vec![
-                        "type hint".to_string(),
-                        "parameter hint".to_string(),
-                        "other hint".to_string(),
-                    ],
-                    cached_hint_labels(editor, cx),
-                    "Should not clear the cache when hints got disabled"
-                );
-                assert_eq!(
-                    Vec::<String>::new(),
-                    visible_hint_labels(editor, cx),
-                    "Should clear visible hints when hints got disabled"
-                );
-                assert_eq!(
-                    allowed_hint_kinds_for_editor(editor),
-                    another_allowed_hint_kinds,
-                    "Should update its allowed hint kinds even when hints got disabled"
-                );
-            })
-            .unwrap();
-
-        fake_server
-            .request::<lsp::request::InlayHintRefreshRequest>(())
-            .await
-            .into_response()
-            .expect("inlay refresh request failed");
-        cx.executor().run_until_parked();
-        editor
-            .update(cx, |editor, _window, cx| {
-                assert_eq!(
-                    lsp_request_count.load(Ordering::Relaxed),
-                    2,
-                    "Should not load new hints when they got disabled"
-                );
-                assert_eq!(
-                    vec![
-                        "type hint".to_string(),
-                        "parameter hint".to_string(),
-                        "other hint".to_string(),
-                    ],
-                    cached_hint_labels(editor, cx)
-                );
-                assert_eq!(Vec::<String>::new(), visible_hint_labels(editor, cx));
-            })
-            .unwrap();
-
-        let final_allowed_hint_kinds = HashSet::from_iter([Some(InlayHintKind::Parameter)]);
-        update_test_language_settings(cx, |settings| {
-            settings.defaults.inlay_hints = Some(InlayHintSettingsContent {
-                show_value_hints: Some(true),
-                enabled: Some(true),
-                edit_debounce_ms: Some(0),
-                scroll_debounce_ms: Some(0),
-                show_type_hints: Some(
-                    final_allowed_hint_kinds.contains(&Some(InlayHintKind::Type)),
-                ),
-                show_parameter_hints: Some(
-                    final_allowed_hint_kinds.contains(&Some(InlayHintKind::Parameter)),
-                ),
-                show_other_hints: Some(final_allowed_hint_kinds.contains(&None)),
-                show_background: Some(false),
-                toggle_on_modifiers_press: None,
-            })
-        });
-        cx.executor().run_until_parked();
-        editor
-            .update(cx, |editor, _, cx| {
-                assert_eq!(
-                    lsp_request_count.load(Ordering::Relaxed),
-                    2,
-                    "Should not query for new hints when they got re-enabled, as the file version did not change"
-                );
-                assert_eq!(
-                    vec![
-                        "type hint".to_string(),
-                        "parameter hint".to_string(),
-                        "other hint".to_string(),
-                    ],
-                    cached_hint_labels(editor, cx),
-                    "Should get its cached hints fully repopulated after the hints got re-enabled"
-                );
-                assert_eq!(
-                    vec!["parameter hint".to_string()],
-                    visible_hint_labels(editor, cx),
-                    "Should get its visible hints repopulated and filtered after the h"
-                );
-                assert_eq!(
-                    allowed_hint_kinds_for_editor(editor),
-                    final_allowed_hint_kinds,
-                    "Cache should update editor settings when hints got re-enabled"
-                );
-            })
-            .unwrap();
-
-        fake_server
-            .request::<lsp::request::InlayHintRefreshRequest>(())
-            .await
-            .into_response()
-            .expect("inlay refresh request failed");
-        cx.executor().run_until_parked();
-        editor
-            .update(cx, |editor, _, cx| {
-                assert_eq!(
-                    lsp_request_count.load(Ordering::Relaxed),
-                    3,
-                    "Should query for new hints again"
-                );
-                assert_eq!(
-                    vec![
-                        "type hint".to_string(),
-                        "parameter hint".to_string(),
-                        "other hint".to_string(),
-                    ],
-                    cached_hint_labels(editor, cx),
-                );
-                assert_eq!(
-                    vec!["parameter hint".to_string()],
-                    visible_hint_labels(editor, cx),
-                );
-            })
-            .unwrap();
-    }
-
-    #[gpui::test]
-    async fn test_hint_request_cancellation(cx: &mut gpui::TestAppContext) {
-        init_test(cx, |settings| {
-            settings.defaults.inlay_hints = Some(InlayHintSettingsContent {
-                show_value_hints: Some(true),
-                enabled: Some(true),
-                edit_debounce_ms: Some(0),
-                scroll_debounce_ms: Some(0),
-                show_type_hints: Some(true),
-                show_parameter_hints: Some(true),
-                show_other_hints: Some(true),
-                show_background: Some(false),
-                toggle_on_modifiers_press: None,
-            })
-        });
-
-        let lsp_request_count = Arc::new(AtomicU32::new(0));
-        let (_, editor, _) = prepare_test_objects(cx, {
-            let lsp_request_count = lsp_request_count.clone();
-            move |fake_server, file_with_hints| {
-                let lsp_request_count = lsp_request_count.clone();
-                fake_server.set_request_handler::<lsp::request::InlayHintRequest, _, _>(
-                    move |params, _| {
-                        let lsp_request_count = lsp_request_count.clone();
-                        async move {
-                            let i = lsp_request_count.fetch_add(1, Ordering::SeqCst) + 1;
-                            assert_eq!(
-                                params.text_document.uri,
-                                lsp::Uri::from_file_path(file_with_hints).unwrap(),
-                            );
-                            Ok(Some(vec![lsp::InlayHint {
-                                position: lsp::Position::new(0, i),
-                                label: lsp::InlayHintLabel::String(i.to_string()),
-                                kind: None,
-                                text_edits: None,
-                                tooltip: None,
-                                padding_left: None,
-                                padding_right: None,
-                                data: None,
-                            }]))
-                        }
-                    },
-                );
-            }
-        })
-        .await;
-
-        let mut expected_changes = Vec::new();
-        for change_after_opening in [
-            "initial change #1",
-            "initial change #2",
-            "initial change #3",
-        ] {
-            editor
-                .update(cx, |editor, window, cx| {
-                    editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                        s.select_ranges([MultiBufferOffset(13)..MultiBufferOffset(13)])
-                    });
-                    editor.handle_input(change_after_opening, window, cx);
-                })
-                .unwrap();
-            expected_changes.push(change_after_opening);
-        }
-
-        cx.executor().run_until_parked();
-
-        editor
-            .update(cx, |editor, _window, cx| {
-                let current_text = editor.text(cx);
-                for change in &expected_changes {
-                    assert!(
-                        current_text.contains(change),
-                        "Should apply all changes made"
-                    );
-                }
-                assert_eq!(
-                    lsp_request_count.load(Ordering::Relaxed),
-                    2,
-                    "Should query new hints twice: for editor init and for the last edit that interrupted all others"
-                );
-                let expected_hints = vec!["2".to_string()];
-                assert_eq!(
-                    expected_hints,
-                    cached_hint_labels(editor, cx),
-                    "Should get hints from the last edit landed only"
-                );
-                assert_eq!(expected_hints, visible_hint_labels(editor, cx));
-            })
-            .unwrap();
-
-        let mut edits = Vec::new();
-        for async_later_change in [
-            "another change #1",
-            "another change #2",
-            "another change #3",
-        ] {
-            expected_changes.push(async_later_change);
-            let task_editor = editor;
-            edits.push(cx.spawn(|mut cx| async move {
-                task_editor
-                    .update(&mut cx, |editor, window, cx| {
-                        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                            s.select_ranges([MultiBufferOffset(13)..MultiBufferOffset(13)])
-                        });
-                        editor.handle_input(async_later_change, window, cx);
-                    })
-                    .unwrap();
-            }));
-        }
-        let _ = future::join_all(edits).await;
-        cx.executor().run_until_parked();
-
-        editor
-            .update(cx, |editor, _, cx| {
-                let current_text = editor.text(cx);
-                for change in &expected_changes {
-                    assert!(
-                        current_text.contains(change),
-                        "Should apply all changes made"
-                    );
-                }
-                assert_eq!(
-                    lsp_request_count.load(Ordering::SeqCst),
-                    3,
-                    "Should query new hints one more time, for the last edit only"
-                );
-                let expected_hints = vec!["3".to_string()];
-                assert_eq!(
-                    expected_hints,
-                    cached_hint_labels(editor, cx),
-                    "Should get hints from the last edit landed only"
-                );
-                assert_eq!(expected_hints, visible_hint_labels(editor, cx));
-            })
-            .unwrap();
-    }
-
-    #[gpui::test(iterations = 4)]
-    async fn test_large_buffer_inlay_requests_split(cx: &mut gpui::TestAppContext) {
-        init_test(cx, |settings| {
-            settings.defaults.inlay_hints = Some(InlayHintSettingsContent {
-                enabled: Some(true),
-                ..InlayHintSettingsContent::default()
-            })
-        });
-
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(
-            path!("/a"),
-            json!({
-                "main.rs": format!("fn main() {{\n{}\n}}", "let i = 5;\n".repeat(500)),
-                "other.rs": "// Test file",
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
-
-        let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-        language_registry.add(rust_lang());
-
-        let lsp_request_ranges = Arc::new(Mutex::new(Vec::new()));
-        let lsp_request_count = Arc::new(AtomicUsize::new(0));
-        let mut fake_servers = language_registry.register_fake_lsp(
-            "Rust",
-            FakeLspAdapter {
-                capabilities: lsp::ServerCapabilities {
-                    inlay_hint_provider: Some(lsp::OneOf::Left(true)),
-                    ..lsp::ServerCapabilities::default()
-                },
-                initializer: Some(Box::new({
-                    let lsp_request_ranges = lsp_request_ranges.clone();
-                    let lsp_request_count = lsp_request_count.clone();
-                    move |fake_server| {
-                        let closure_lsp_request_ranges = Arc::clone(&lsp_request_ranges);
-                        let closure_lsp_request_count = Arc::clone(&lsp_request_count);
-                        fake_server.set_request_handler::<lsp::request::InlayHintRequest, _, _>(
-                            move |params, _| {
-                                let task_lsp_request_ranges =
-                                    Arc::clone(&closure_lsp_request_ranges);
-                                let task_lsp_request_count = Arc::clone(&closure_lsp_request_count);
-                                async move {
-                                    assert_eq!(
-                                        params.text_document.uri,
-                                        lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap(),
-                                    );
-
-                                    task_lsp_request_ranges.lock().push(params.range);
-                                    task_lsp_request_count.fetch_add(1, Ordering::Release);
-                                    Ok(Some(vec![lsp::InlayHint {
-                                        position: params.range.start,
-                                        label: lsp::InlayHintLabel::String(
-                                            params.range.end.line.to_string(),
-                                        ),
-                                        kind: None,
-                                        text_edits: None,
-                                        tooltip: None,
-                                        padding_left: None,
-                                        padding_right: None,
-                                        data: None,
-                                    }]))
-                                }
-                            },
-                        );
-                    }
-                })),
-                ..FakeLspAdapter::default()
-            },
-        );
-
-        let buffer = project
-            .update(cx, |project, cx| {
-                project.open_local_buffer(path!("/a/main.rs"), cx)
-            })
-            .await
-            .unwrap();
-        let editor =
-            cx.add_window(|window, cx| Editor::for_buffer(buffer, Some(project), window, cx));
-        cx.executor().run_until_parked();
-        let _fake_server = fake_servers.next().await.unwrap();
-        cx.executor().advance_clock(Duration::from_millis(100));
-        cx.executor().run_until_parked();
-
-        let ranges = lsp_request_ranges
-            .lock()
-            .drain(..)
-            .sorted_by_key(|r| r.start)
-            .collect::<Vec<_>>();
-        assert_eq!(
-            ranges.len(),
-            1,
-            "Should query 1 range initially, but got: {ranges:?}"
-        );
-
-        editor
-            .update(cx, |editor, window, cx| {
-                editor.scroll_screen(&ScrollAmount::Page(1.0), window, cx);
-            })
-            .unwrap();
-        // Wait for the first hints request to fire off
-        cx.executor().advance_clock(Duration::from_millis(100));
-        cx.executor().run_until_parked();
-        editor
-            .update(cx, |editor, window, cx| {
-                editor.scroll_screen(&ScrollAmount::Page(1.0), window, cx);
-            })
-            .unwrap();
-        cx.executor().advance_clock(Duration::from_millis(100));
-        cx.executor().run_until_parked();
-        let visible_range_after_scrolls = editor_visible_range(&editor, cx);
-        let visible_line_count = editor
-            .update(cx, |editor, _window, _| {
-                editor.visible_line_count().unwrap()
-            })
-            .unwrap();
-        let selection_in_cached_range = editor
-            .update(cx, |editor, _window, cx| {
-                let ranges = lsp_request_ranges
-                    .lock()
-                    .drain(..)
-                    .sorted_by_key(|r| r.start)
-                    .collect::<Vec<_>>();
-                assert_eq!(
-                    ranges.len(),
-                    2,
-                    "Should query 2 ranges after both scrolls, but got: {ranges:?}"
-                );
-                let first_scroll = &ranges[0];
-                let second_scroll = &ranges[1];
-                assert_eq!(
-                    first_scroll.end.line, second_scroll.start.line,
-                    "Should query 2 adjacent ranges after the scrolls, but got: {ranges:?}"
-                );
-
-                let lsp_requests = lsp_request_count.load(Ordering::Acquire);
-                assert_eq!(
-                    lsp_requests, 3,
-                    "Should query hints initially, and after each scroll (2 times)"
-                );
-                assert_eq!(
-                    vec!["50".to_string(), "100".to_string(), "150".to_string()],
-                    cached_hint_labels(editor, cx),
-                    "Chunks of 50 line width should have been queried each time"
-                );
-                assert_eq!(
-                    vec!["50".to_string(), "100".to_string(), "150".to_string()],
-                    visible_hint_labels(editor, cx),
-                    "Editor should show only hints that it's scrolled to"
-                );
-
-                let mut selection_in_cached_range = visible_range_after_scrolls.end;
-                selection_in_cached_range.row -= visible_line_count.ceil() as u32;
-                selection_in_cached_range
-            })
-            .unwrap();
-
-        editor
-            .update(cx, |editor, window, cx| {
-                editor.change_selections(
-                    SelectionEffects::scroll(Autoscroll::center()),
-                    window,
-                    cx,
-                    |s| s.select_ranges([selection_in_cached_range..selection_in_cached_range]),
-                );
-            })
-            .unwrap();
-        cx.executor().advance_clock(Duration::from_millis(100));
-        cx.executor().run_until_parked();
-        editor.update(cx, |_, _, _| {
-            let ranges = lsp_request_ranges
-                .lock()
-                .drain(..)
-                .sorted_by_key(|r| r.start)
-                .collect::<Vec<_>>();
-            assert!(ranges.is_empty(), "No new ranges or LSP queries should be made after returning to the selection with cached hints");
-            assert_eq!(lsp_request_count.load(Ordering::Acquire), 3, "No new requests should be made when selecting within cached chunks");
-        }).unwrap();
-
-        editor
-            .update(cx, |editor, window, cx| {
-                editor.handle_input("++++more text++++", window, cx);
-            })
-            .unwrap();
-        cx.executor().advance_clock(Duration::from_secs(1));
-        cx.executor().run_until_parked();
-        editor.update(cx, |editor, _window, cx| {
-            let mut ranges = lsp_request_ranges.lock().drain(..).collect::<Vec<_>>();
-            ranges.sort_by_key(|r| r.start);
-
-            assert_eq!(ranges.len(), 2,
-                "On edit, should scroll to selection and query a range around it: that range should split into 2 50 rows wide chunks. Instead, got query ranges {ranges:?}");
-            let first_chunk = &ranges[0];
-            let second_chunk = &ranges[1];
-            assert!(first_chunk.end.line == second_chunk.start.line,
-                "First chunk {first_chunk:?} should be before second chunk {second_chunk:?}");
-            assert!(first_chunk.start.line < selection_in_cached_range.row,
-                "Hints should be queried with the selected range after the query range start");
-
-            let lsp_requests = lsp_request_count.load(Ordering::Acquire);
-            assert_eq!(lsp_requests, 5, "Two chunks should be re-queried");
-            assert_eq!(vec!["100".to_string(), "150".to_string()], cached_hint_labels(editor, cx),
-                "Should have (less) hints from the new LSP response after the edit");
-            assert_eq!(vec!["100".to_string(), "150".to_string()], visible_hint_labels(editor, cx), "Should show only visible hints (in the center) from the new cached set");
-        }).unwrap();
-    }
-
-    fn editor_visible_range(
-        editor: &WindowHandle<Editor>,
-        cx: &mut gpui::TestAppContext,
-    ) -> Range<Point> {
-        let ranges = editor
-            .update(cx, |editor, _window, cx| editor.visible_excerpts(true, cx))
-            .unwrap();
-        assert_eq!(
-            ranges.len(),
-            1,
-            "Single buffer should produce a single excerpt with visible range"
-        );
-        let (_, (excerpt_buffer, _, excerpt_visible_range)) = ranges.into_iter().next().unwrap();
-        excerpt_buffer.read_with(cx, |buffer, _| {
-            excerpt_visible_range.to_point(&buffer.snapshot())
-        })
-    }
-
-    #[gpui::test]
-    async fn test_multiple_excerpts_large_multibuffer(cx: &mut gpui::TestAppContext) {
-        init_test(cx, |settings| {
-            settings.defaults.inlay_hints = Some(InlayHintSettingsContent {
-                show_value_hints: Some(true),
-                enabled: Some(true),
-                edit_debounce_ms: Some(0),
-                scroll_debounce_ms: Some(0),
-                show_type_hints: Some(true),
-                show_parameter_hints: Some(true),
-                show_other_hints: Some(true),
-                show_background: Some(false),
-                toggle_on_modifiers_press: None,
-            })
-        });
-
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(
-                path!("/a"),
-                json!({
-                    "main.rs": format!("fn main() {{\n{}\n}}", (0..501).map(|i| format!("let i = {i};\n")).collect::<Vec<_>>().join("")),
-                    "other.rs": format!("fn main() {{\n{}\n}}", (0..501).map(|j| format!("let j = {j};\n")).collect::<Vec<_>>().join("")),
-                }),
-            )
-            .await;
-
-        let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
-
-        let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-        let language = rust_lang();
-        language_registry.add(language);
-        let mut fake_servers = language_registry.register_fake_lsp(
-            "Rust",
-            FakeLspAdapter {
-                capabilities: lsp::ServerCapabilities {
-                    inlay_hint_provider: Some(lsp::OneOf::Left(true)),
-                    ..lsp::ServerCapabilities::default()
-                },
-                ..FakeLspAdapter::default()
-            },
-        );
-
-        let (buffer_1, _handle1) = project
-            .update(cx, |project, cx| {
-                project.open_local_buffer_with_lsp(path!("/a/main.rs"), cx)
-            })
-            .await
-            .unwrap();
-        let (buffer_2, _handle2) = project
-            .update(cx, |project, cx| {
-                project.open_local_buffer_with_lsp(path!("/a/other.rs"), cx)
-            })
-            .await
-            .unwrap();
-        let multibuffer = cx.new(|cx| {
-            let mut multibuffer = MultiBuffer::new(Capability::ReadWrite);
-            multibuffer.push_excerpts(
-                buffer_1.clone(),
-                [
-                    ExcerptRange::new(Point::new(0, 0)..Point::new(2, 0)),
-                    ExcerptRange::new(Point::new(4, 0)..Point::new(11, 0)),
-                    ExcerptRange::new(Point::new(22, 0)..Point::new(33, 0)),
-                    ExcerptRange::new(Point::new(44, 0)..Point::new(55, 0)),
-                    ExcerptRange::new(Point::new(56, 0)..Point::new(66, 0)),
-                    ExcerptRange::new(Point::new(67, 0)..Point::new(77, 0)),
-                ],
-                cx,
-            );
-            multibuffer.push_excerpts(
-                buffer_2.clone(),
-                [
-                    ExcerptRange::new(Point::new(0, 1)..Point::new(2, 1)),
-                    ExcerptRange::new(Point::new(4, 1)..Point::new(11, 1)),
-                    ExcerptRange::new(Point::new(22, 1)..Point::new(33, 1)),
-                    ExcerptRange::new(Point::new(44, 1)..Point::new(55, 1)),
-                    ExcerptRange::new(Point::new(56, 1)..Point::new(66, 1)),
-                    ExcerptRange::new(Point::new(67, 1)..Point::new(77, 1)),
-                ],
-                cx,
-            );
-            multibuffer
-        });
-
-        cx.executor().run_until_parked();
-        let editor = cx.add_window(|window, cx| {
-            Editor::for_multibuffer(multibuffer, Some(project.clone()), window, cx)
-        });
-
-        let editor_edited = Arc::new(AtomicBool::new(false));
-        let fake_server = fake_servers.next().await.unwrap();
-        let closure_editor_edited = Arc::clone(&editor_edited);
-        fake_server
-            .set_request_handler::<lsp::request::InlayHintRequest, _, _>(move |params, _| {
-                let task_editor_edited = Arc::clone(&closure_editor_edited);
-                async move {
-                    let hint_text = if params.text_document.uri
-                        == lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap()
-                    {
-                        "main hint"
-                    } else if params.text_document.uri
-                        == lsp::Uri::from_file_path(path!("/a/other.rs")).unwrap()
-                    {
-                        "other hint"
-                    } else {
-                        panic!("unexpected uri: {:?}", params.text_document.uri);
-                    };
-
-                    // one hint per excerpt
-                    let positions = [
-                        lsp::Position::new(0, 2),
-                        lsp::Position::new(4, 2),
-                        lsp::Position::new(22, 2),
-                        lsp::Position::new(44, 2),
-                        lsp::Position::new(56, 2),
-                        lsp::Position::new(67, 2),
-                    ];
-                    let out_of_range_hint = lsp::InlayHint {
-                        position: lsp::Position::new(
-                            params.range.start.line + 99,
-                            params.range.start.character + 99,
-                        ),
-                        label: lsp::InlayHintLabel::String(
-                            "out of excerpt range, should be ignored".to_string(),
-                        ),
-                        kind: None,
-                        text_edits: None,
-                        tooltip: None,
-                        padding_left: None,
-                        padding_right: None,
-                        data: None,
-                    };
-
-                    let edited = task_editor_edited.load(Ordering::Acquire);
-                    Ok(Some(
-                        std::iter::once(out_of_range_hint)
-                            .chain(positions.into_iter().enumerate().map(|(i, position)| {
-                                lsp::InlayHint {
-                                    position,
-                                    label: lsp::InlayHintLabel::String(format!(
-                                        "{hint_text}{E} #{i}",
-                                        E = if edited { "(edited)" } else { "" },
-                                    )),
-                                    kind: None,
-                                    text_edits: None,
-                                    tooltip: None,
-                                    padding_left: None,
-                                    padding_right: None,
-                                    data: None,
-                                }
-                            }))
-                            .collect(),
-                    ))
-                }
-            })
-            .next()
-            .await;
-        cx.executor().run_until_parked();
-
-        editor
-            .update(cx, |editor, _window, cx| {
-                let expected_hints = vec![
-                    "main hint #0".to_string(),
-                    "main hint #1".to_string(),
-                    "main hint #2".to_string(),
-                    "main hint #3".to_string(),
-                    "main hint #4".to_string(),
-                    "main hint #5".to_string(),
-                ];
-                assert_eq!(
-                    expected_hints,
-                    sorted_cached_hint_labels(editor, cx),
-                    "When scroll is at the edge of a multibuffer, its visible excerpts only should be queried for inlay hints"
-                );
-                assert_eq!(expected_hints, visible_hint_labels(editor, cx));
-            })
-            .unwrap();
-
-        editor
-            .update(cx, |editor, window, cx| {
-                editor.change_selections(
-                    SelectionEffects::scroll(Autoscroll::Next),
-                    window,
-                    cx,
-                    |s| s.select_ranges([Point::new(4, 0)..Point::new(4, 0)]),
-                );
-                editor.change_selections(
-                    SelectionEffects::scroll(Autoscroll::Next),
-                    window,
-                    cx,
-                    |s| s.select_ranges([Point::new(22, 0)..Point::new(22, 0)]),
-                );
-                editor.change_selections(
-                    SelectionEffects::scroll(Autoscroll::Next),
-                    window,
-                    cx,
-                    |s| s.select_ranges([Point::new(57, 0)..Point::new(57, 0)]),
-                );
-            })
-            .unwrap();
-        cx.executor().run_until_parked();
-        editor
-            .update(cx, |editor, _window, cx| {
-                let expected_hints = vec![
-                    "main hint #0".to_string(),
-                    "main hint #1".to_string(),
-                    "main hint #2".to_string(),
-                    "main hint #3".to_string(),
-                    "main hint #4".to_string(),
-                    "main hint #5".to_string(),
-                ];
-                assert_eq!(expected_hints, sorted_cached_hint_labels(editor, cx),
-                    "New hints are not shown right after scrolling, we need to wait for the buffer to be registered");
-                assert_eq!(expected_hints, visible_hint_labels(editor, cx));
-            })
-            .unwrap();
-        cx.executor().advance_clock(Duration::from_millis(100));
-        cx.executor().run_until_parked();
-        editor
-            .update(cx, |editor, _window, cx| {
-                let expected_hints = vec![
-                    "main hint #0".to_string(),
-                    "main hint #1".to_string(),
-                    "main hint #2".to_string(),
-                    "main hint #3".to_string(),
-                    "main hint #4".to_string(),
-                    "main hint #5".to_string(),
-                    "other hint #0".to_string(),
-                    "other hint #1".to_string(),
-                    "other hint #2".to_string(),
-                    "other hint #3".to_string(),
-                ];
-                assert_eq!(
-                    expected_hints,
-                    sorted_cached_hint_labels(editor, cx),
-                    "After scrolling to the new buffer and waiting for it to be registered, new hints should appear");
-                assert_eq!(
-                    expected_hints,
-                    visible_hint_labels(editor, cx),
-                    "Editor should show only visible hints",
-                );
-            })
-            .unwrap();
-
-        editor
-            .update(cx, |editor, window, cx| {
-                editor.change_selections(
-                    SelectionEffects::scroll(Autoscroll::Next),
-                    window,
-                    cx,
-                    |s| s.select_ranges([Point::new(100, 0)..Point::new(100, 0)]),
-                );
-            })
-            .unwrap();
-        cx.executor().advance_clock(Duration::from_millis(100));
-        cx.executor().run_until_parked();
-        editor
-            .update(cx, |editor, _window, cx| {
-                let expected_hints = vec![
-                    "main hint #0".to_string(),
-                    "main hint #1".to_string(),
-                    "main hint #2".to_string(),
-                    "main hint #3".to_string(),
-                    "main hint #4".to_string(),
-                    "main hint #5".to_string(),
-                    "other hint #0".to_string(),
-                    "other hint #1".to_string(),
-                    "other hint #2".to_string(),
-                    "other hint #3".to_string(),
-                    "other hint #4".to_string(),
-                    "other hint #5".to_string(),
-                ];
-                assert_eq!(
-                    expected_hints,
-                    sorted_cached_hint_labels(editor, cx),
-                    "After multibuffer was scrolled to the end, all hints for all excerpts should be fetched"
-                );
-                assert_eq!(
-                    expected_hints,
-                    visible_hint_labels(editor, cx),
-                    "Editor shows only hints for excerpts that were visible when scrolling"
-                );
-            })
-            .unwrap();
-
-        editor
-            .update(cx, |editor, window, cx| {
-                editor.change_selections(
-                    SelectionEffects::scroll(Autoscroll::Next),
-                    window,
-                    cx,
-                    |s| s.select_ranges([Point::new(4, 0)..Point::new(4, 0)]),
-                );
-            })
-            .unwrap();
-        cx.executor().run_until_parked();
-        editor
-            .update(cx, |editor, _window, cx| {
-                let expected_hints = vec![
-                    "main hint #0".to_string(),
-                    "main hint #1".to_string(),
-                    "main hint #2".to_string(),
-                    "main hint #3".to_string(),
-                    "main hint #4".to_string(),
-                    "main hint #5".to_string(),
-                    "other hint #0".to_string(),
-                    "other hint #1".to_string(),
-                    "other hint #2".to_string(),
-                    "other hint #3".to_string(),
-                    "other hint #4".to_string(),
-                    "other hint #5".to_string(),
-                ];
-                assert_eq!(
-                    expected_hints,
-                    sorted_cached_hint_labels(editor, cx),
-                    "After multibuffer was scrolled to the end, further scrolls up should not bring more hints"
-                );
-                assert_eq!(
-                    expected_hints,
-                    visible_hint_labels(editor, cx),
-                );
-            })
-            .unwrap();
-
-        // We prepare to change the scrolling on edit, but do not scroll yet
-        editor
-            .update(cx, |editor, window, cx| {
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.select_ranges([Point::new(57, 0)..Point::new(57, 0)])
-                });
-            })
-            .unwrap();
-        cx.executor().run_until_parked();
-        // Edit triggers the scrolling too
-        editor_edited.store(true, Ordering::Release);
-        editor
-            .update(cx, |editor, window, cx| {
-                editor.handle_input("++++more text++++", window, cx);
-            })
-            .unwrap();
-        cx.executor().run_until_parked();
-        // Wait again to trigger the inlay hints fetch on scroll
-        cx.executor().advance_clock(Duration::from_millis(100));
-        cx.executor().run_until_parked();
-        editor
-            .update(cx, |editor, _window, cx| {
-                let expected_hints = vec![
-                    "main hint(edited) #0".to_string(),
-                    "main hint(edited) #1".to_string(),
-                    "main hint(edited) #2".to_string(),
-                    "main hint(edited) #3".to_string(),
-                    "main hint(edited) #4".to_string(),
-                    "main hint(edited) #5".to_string(),
-                    "other hint(edited) #0".to_string(),
-                    "other hint(edited) #1".to_string(),
-                    "other hint(edited) #2".to_string(),
-                    "other hint(edited) #3".to_string(),
-                ];
-                assert_eq!(
-                    expected_hints,
-                    sorted_cached_hint_labels(editor, cx),
-                    "After multibuffer edit, editor gets scrolled back to the last selection; \
-                all hints should be invalidated and required for all of its visible excerpts"
-                );
-                assert_eq!(
-                    expected_hints,
-                    visible_hint_labels(editor, cx),
-                    "All excerpts should get their hints"
-                );
-            })
-            .unwrap();
-    }
-
-    #[gpui::test]
-    async fn test_editing_in_multi_buffer(cx: &mut gpui::TestAppContext) {
-        init_test(cx, |settings| {
-            settings.defaults.inlay_hints = Some(InlayHintSettingsContent {
-                enabled: Some(true),
-                ..InlayHintSettingsContent::default()
-            })
-        });
-
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(
-            path!("/a"),
-            json!({
-                "main.rs": format!("fn main() {{\n{}\n}}", (0..200).map(|i| format!("let i = {i};\n")).collect::<Vec<_>>().join("")),
-                "lib.rs": r#"let a = 1;
-let b = 2;
-let c = 3;"#
-            }),
-        )
-        .await;
-
-        let lsp_request_ranges = Arc::new(Mutex::new(Vec::new()));
-
-        let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
-        let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-        let language = rust_lang();
-        language_registry.add(language);
-
-        let closure_ranges_fetched = lsp_request_ranges.clone();
-        let mut fake_servers = language_registry.register_fake_lsp(
-            "Rust",
-            FakeLspAdapter {
-                capabilities: lsp::ServerCapabilities {
-                    inlay_hint_provider: Some(lsp::OneOf::Left(true)),
-                    ..lsp::ServerCapabilities::default()
-                },
-                initializer: Some(Box::new(move |fake_server| {
-                    let closure_ranges_fetched = closure_ranges_fetched.clone();
-                    fake_server.set_request_handler::<lsp::request::InlayHintRequest, _, _>(
-                        move |params, _| {
-                            let closure_ranges_fetched = closure_ranges_fetched.clone();
-                            async move {
-                                let prefix = if params.text_document.uri
-                                    == lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap()
-                                {
-                                    closure_ranges_fetched
-                                        .lock()
-                                        .push(("main.rs", params.range));
-                                    "main.rs"
-                                } else if params.text_document.uri
-                                    == lsp::Uri::from_file_path(path!("/a/lib.rs")).unwrap()
-                                {
-                                    closure_ranges_fetched.lock().push(("lib.rs", params.range));
-                                    "lib.rs"
-                                } else {
-                                    panic!("Unexpected file path {:?}", params.text_document.uri);
-                                };
-                                Ok(Some(
-                                    (params.range.start.line..params.range.end.line)
-                                        .map(|row| lsp::InlayHint {
-                                            position: lsp::Position::new(row, 0),
-                                            label: lsp::InlayHintLabel::String(format!(
-                                                "{prefix} Inlay hint #{row}"
-                                            )),
-                                            kind: Some(lsp::InlayHintKind::TYPE),
-                                            text_edits: None,
-                                            tooltip: None,
-                                            padding_left: None,
-                                            padding_right: None,
-                                            data: None,
-                                        })
-                                        .collect(),
-                                ))
-                            }
-                        },
-                    );
-                })),
-                ..FakeLspAdapter::default()
-            },
-        );
-
-        let (buffer_1, _handle_1) = project
-            .update(cx, |project, cx| {
-                project.open_local_buffer_with_lsp(path!("/a/main.rs"), cx)
-            })
-            .await
-            .unwrap();
-        let (buffer_2, _handle_2) = project
-            .update(cx, |project, cx| {
-                project.open_local_buffer_with_lsp(path!("/a/lib.rs"), cx)
-            })
-            .await
-            .unwrap();
-        let multi_buffer = cx.new(|cx| {
-            let mut multibuffer = MultiBuffer::new(Capability::ReadWrite);
-            multibuffer.push_excerpts(
-                buffer_1.clone(),
-                [
-                    // Have first excerpt to spawn over 2 chunks (50 lines each).
-                    ExcerptRange::new(Point::new(49, 0)..Point::new(53, 0)),
-                    // Have 2nd excerpt to be in the 2nd chunk only.
-                    ExcerptRange::new(Point::new(70, 0)..Point::new(73, 0)),
-                ],
-                cx,
-            );
-            multibuffer.push_excerpts(
-                buffer_2.clone(),
-                [ExcerptRange::new(Point::new(0, 0)..Point::new(4, 0))],
-                cx,
-            );
-            multibuffer
-        });
-
-        let editor = cx.add_window(|window, cx| {
-            let mut editor =
-                Editor::for_multibuffer(multi_buffer, Some(project.clone()), window, cx);
-            editor.change_selections(SelectionEffects::default(), window, cx, |s| {
-                s.select_ranges([MultiBufferOffset(0)..MultiBufferOffset(0)])
-            });
-            editor
-        });
-
-        let _fake_server = fake_servers.next().await.unwrap();
-        cx.executor().advance_clock(Duration::from_millis(100));
-        cx.executor().run_until_parked();
-
-        assert_eq!(
-            vec![
-                (
-                    "lib.rs",
-                    lsp::Range::new(lsp::Position::new(0, 0), lsp::Position::new(2, 10))
-                ),
-                (
-                    "main.rs",
-                    lsp::Range::new(lsp::Position::new(0, 0), lsp::Position::new(50, 0))
-                ),
-                (
-                    "main.rs",
-                    lsp::Range::new(lsp::Position::new(50, 0), lsp::Position::new(100, 0))
-                ),
-            ],
-            lsp_request_ranges
-                .lock()
-                .drain(..)
-                .sorted_by_key(|(prefix, r)| (prefix.to_owned(), r.start))
-                .collect::<Vec<_>>(),
-            "For large buffers, should query chunks that cover both visible excerpt"
-        );
-        editor
-            .update(cx, |editor, _window, cx| {
-                assert_eq!(
-                    (0..2)
-                        .map(|i| format!("lib.rs Inlay hint #{i}"))
-                        .chain((0..100).map(|i| format!("main.rs Inlay hint #{i}")))
-                        .collect::<Vec<_>>(),
-                    sorted_cached_hint_labels(editor, cx),
-                    "Both chunks should provide their inlay hints"
-                );
-                assert_eq!(
-                    vec![
-                        "main.rs Inlay hint #49".to_owned(),
-                        "main.rs Inlay hint #50".to_owned(),
-                        "main.rs Inlay hint #51".to_owned(),
-                        "main.rs Inlay hint #52".to_owned(),
-                        "main.rs Inlay hint #53".to_owned(),
-                        "main.rs Inlay hint #70".to_owned(),
-                        "main.rs Inlay hint #71".to_owned(),
-                        "main.rs Inlay hint #72".to_owned(),
-                        "main.rs Inlay hint #73".to_owned(),
-                        "lib.rs Inlay hint #0".to_owned(),
-                        "lib.rs Inlay hint #1".to_owned(),
-                    ],
-                    visible_hint_labels(editor, cx),
-                    "Only hints from visible excerpt should be added into the editor"
-                );
-            })
-            .unwrap();
-
-        editor
-            .update(cx, |editor, window, cx| {
-                editor.handle_input("a", window, cx);
-            })
-            .unwrap();
-        cx.executor().advance_clock(Duration::from_millis(1000));
-        cx.executor().run_until_parked();
-        assert_eq!(
-            vec![
-                (
-                    "lib.rs",
-                    lsp::Range::new(lsp::Position::new(0, 0), lsp::Position::new(2, 10))
-                ),
-                (
-                    "main.rs",
-                    lsp::Range::new(lsp::Position::new(0, 0), lsp::Position::new(50, 0))
-                ),
-                (
-                    "main.rs",
-                    lsp::Range::new(lsp::Position::new(50, 0), lsp::Position::new(100, 0))
-                ),
-            ],
-            lsp_request_ranges
-                .lock()
-                .drain(..)
-                .sorted_by_key(|(prefix, r)| (prefix.to_owned(), r.start))
-                .collect::<Vec<_>>(),
-            "Same chunks should be re-queried on edit"
-        );
-        editor
-            .update(cx, |editor, _window, cx| {
-                assert_eq!(
-                    (0..2)
-                        .map(|i| format!("lib.rs Inlay hint #{i}"))
-                        .chain((0..100).map(|i| format!("main.rs Inlay hint #{i}")))
-                        .collect::<Vec<_>>(),
-                    sorted_cached_hint_labels(editor, cx),
-                    "Same hints should be re-inserted after the edit"
-                );
-                assert_eq!(
-                    vec![
-                        "main.rs Inlay hint #49".to_owned(),
-                        "main.rs Inlay hint #50".to_owned(),
-                        "main.rs Inlay hint #51".to_owned(),
-                        "main.rs Inlay hint #52".to_owned(),
-                        "main.rs Inlay hint #53".to_owned(),
-                        "main.rs Inlay hint #70".to_owned(),
-                        "main.rs Inlay hint #71".to_owned(),
-                        "main.rs Inlay hint #72".to_owned(),
-                        "main.rs Inlay hint #73".to_owned(),
-                        "lib.rs Inlay hint #0".to_owned(),
-                        "lib.rs Inlay hint #1".to_owned(),
-                    ],
-                    visible_hint_labels(editor, cx),
-                    "Same hints should be re-inserted into the editor after the edit"
-                );
-            })
-            .unwrap();
-    }
-
-    #[gpui::test]
-    async fn test_excerpts_removed(cx: &mut gpui::TestAppContext) {
-        init_test(cx, |settings| {
-            settings.defaults.inlay_hints = Some(InlayHintSettingsContent {
-                show_value_hints: Some(true),
-                enabled: Some(true),
-                edit_debounce_ms: Some(0),
-                scroll_debounce_ms: Some(0),
-                show_type_hints: Some(false),
-                show_parameter_hints: Some(false),
-                show_other_hints: Some(false),
-                show_background: Some(false),
-                toggle_on_modifiers_press: None,
-            })
-        });
-
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(
-            path!("/a"),
-            json!({
-                "main.rs": format!("fn main() {{\n{}\n}}", (0..501).map(|i| format!("let i = {i};\n")).collect::<Vec<_>>().join("")),
-                "other.rs": format!("fn main() {{\n{}\n}}", (0..501).map(|j| format!("let j = {j};\n")).collect::<Vec<_>>().join("")),
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
-
-        let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-        language_registry.add(rust_lang());
-        let mut fake_servers = language_registry.register_fake_lsp(
-            "Rust",
-            FakeLspAdapter {
-                capabilities: lsp::ServerCapabilities {
-                    inlay_hint_provider: Some(lsp::OneOf::Left(true)),
-                    ..lsp::ServerCapabilities::default()
-                },
-                ..FakeLspAdapter::default()
-            },
-        );
-
-        let (buffer_1, _handle) = project
-            .update(cx, |project, cx| {
-                project.open_local_buffer_with_lsp(path!("/a/main.rs"), cx)
-            })
-            .await
-            .unwrap();
-        let (buffer_2, _handle2) = project
-            .update(cx, |project, cx| {
-                project.open_local_buffer_with_lsp(path!("/a/other.rs"), cx)
-            })
-            .await
-            .unwrap();
-        let multibuffer = cx.new(|_| MultiBuffer::new(Capability::ReadWrite));
-        let (buffer_1_excerpts, buffer_2_excerpts) = multibuffer.update(cx, |multibuffer, cx| {
-            let buffer_1_excerpts = multibuffer.push_excerpts(
-                buffer_1.clone(),
-                [ExcerptRange::new(Point::new(0, 0)..Point::new(2, 0))],
-                cx,
-            );
-            let buffer_2_excerpts = multibuffer.push_excerpts(
-                buffer_2.clone(),
-                [ExcerptRange::new(Point::new(0, 1)..Point::new(2, 1))],
-                cx,
-            );
-            (buffer_1_excerpts, buffer_2_excerpts)
-        });
-
-        assert!(!buffer_1_excerpts.is_empty());
-        assert!(!buffer_2_excerpts.is_empty());
-
-        cx.executor().run_until_parked();
-        let editor = cx.add_window(|window, cx| {
-            Editor::for_multibuffer(multibuffer, Some(project.clone()), window, cx)
-        });
-        let editor_edited = Arc::new(AtomicBool::new(false));
-        let fake_server = fake_servers.next().await.unwrap();
-        let closure_editor_edited = Arc::clone(&editor_edited);
-        fake_server
-            .set_request_handler::<lsp::request::InlayHintRequest, _, _>(move |params, _| {
-                let task_editor_edited = Arc::clone(&closure_editor_edited);
-                async move {
-                    let hint_text = if params.text_document.uri
-                        == lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap()
-                    {
-                        "main hint"
-                    } else if params.text_document.uri
-                        == lsp::Uri::from_file_path(path!("/a/other.rs")).unwrap()
-                    {
-                        "other hint"
-                    } else {
-                        panic!("unexpected uri: {:?}", params.text_document.uri);
-                    };
-
-                    let positions = [
-                        lsp::Position::new(0, 2),
-                        lsp::Position::new(4, 2),
-                        lsp::Position::new(22, 2),
-                        lsp::Position::new(44, 2),
-                        lsp::Position::new(56, 2),
-                        lsp::Position::new(67, 2),
-                    ];
-                    let out_of_range_hint = lsp::InlayHint {
-                        position: lsp::Position::new(
-                            params.range.start.line + 99,
-                            params.range.start.character + 99,
-                        ),
-                        label: lsp::InlayHintLabel::String(
-                            "out of excerpt range, should be ignored".to_string(),
-                        ),
-                        kind: None,
-                        text_edits: None,
-                        tooltip: None,
-                        padding_left: None,
-                        padding_right: None,
-                        data: None,
-                    };
-
-                    let edited = task_editor_edited.load(Ordering::Acquire);
-                    Ok(Some(
-                        std::iter::once(out_of_range_hint)
-                            .chain(positions.into_iter().enumerate().map(|(i, position)| {
-                                lsp::InlayHint {
-                                    position,
-                                    label: lsp::InlayHintLabel::String(format!(
-                                        "{hint_text}{} #{i}",
-                                        if edited { "(edited)" } else { "" },
-                                    )),
-                                    kind: None,
-                                    text_edits: None,
-                                    tooltip: None,
-                                    padding_left: None,
-                                    padding_right: None,
-                                    data: None,
-                                }
-                            }))
-                            .collect(),
-                    ))
-                }
-            })
-            .next()
-            .await;
-        cx.executor().advance_clock(Duration::from_millis(100));
-        cx.executor().run_until_parked();
-        editor
-            .update(cx, |editor, _, cx| {
-                assert_eq!(
-                    vec![
-                        "main hint #0".to_string(),
-                        "main hint #1".to_string(),
-                        "main hint #2".to_string(),
-                        "main hint #3".to_string(),
-                        "other hint #0".to_string(),
-                        "other hint #1".to_string(),
-                        "other hint #2".to_string(),
-                        "other hint #3".to_string(),
-                    ],
-                    sorted_cached_hint_labels(editor, cx),
-                    "Cache should update for both excerpts despite hints display was disabled; after selecting 2nd buffer, it's now registered with the langserever and should get its hints"
-                );
-                assert_eq!(
-                    Vec::<String>::new(),
-                    visible_hint_labels(editor, cx),
-                    "All hints are disabled and should not be shown despite being present in the cache"
-                );
-            })
-            .unwrap();
-
-        editor
-            .update(cx, |editor, _, cx| {
-                editor.buffer().update(cx, |multibuffer, cx| {
-                    multibuffer.remove_excerpts(buffer_2_excerpts, cx)
-                })
-            })
-            .unwrap();
-        cx.executor().run_until_parked();
-        editor
-            .update(cx, |editor, _, cx| {
-                assert_eq!(
-                    vec![
-                        "main hint #0".to_string(),
-                        "main hint #1".to_string(),
-                        "main hint #2".to_string(),
-                        "main hint #3".to_string(),
-                    ],
-                    cached_hint_labels(editor, cx),
-                    "For the removed excerpt, should clean corresponding cached hints as its buffer was dropped"
-                );
-                assert!(
-                visible_hint_labels(editor, cx).is_empty(),
-                "All hints are disabled and should not be shown despite being present in the cache"
-            );
-            })
-            .unwrap();
-
-        update_test_language_settings(cx, |settings| {
-            settings.defaults.inlay_hints = Some(InlayHintSettingsContent {
-                show_value_hints: Some(true),
-                enabled: Some(true),
-                edit_debounce_ms: Some(0),
-                scroll_debounce_ms: Some(0),
-                show_type_hints: Some(true),
-                show_parameter_hints: Some(true),
-                show_other_hints: Some(true),
-                show_background: Some(false),
-                toggle_on_modifiers_press: None,
-            })
-        });
-        cx.executor().run_until_parked();
-        editor
-            .update(cx, |editor, _, cx| {
-                assert_eq!(
-                    vec![
-                        "main hint #0".to_string(),
-                        "main hint #1".to_string(),
-                        "main hint #2".to_string(),
-                        "main hint #3".to_string(),
-                    ],
-                    cached_hint_labels(editor, cx),
-                    "Hint display settings change should not change the cache"
-                );
-                assert_eq!(
-                    vec![
-                        "main hint #0".to_string(),
-                    ],
-                    visible_hint_labels(editor, cx),
-                    "Settings change should make cached hints visible, but only the visible ones, from the remaining excerpt"
-                );
-            })
-            .unwrap();
-    }
-
-    #[gpui::test]
-    async fn test_inside_char_boundary_range_hints(cx: &mut gpui::TestAppContext) {
-        init_test(cx, |settings| {
-            settings.defaults.inlay_hints = Some(InlayHintSettingsContent {
-                show_value_hints: Some(true),
-                enabled: Some(true),
-                edit_debounce_ms: Some(0),
-                scroll_debounce_ms: Some(0),
-                show_type_hints: Some(true),
-                show_parameter_hints: Some(true),
-                show_other_hints: Some(true),
-                show_background: Some(false),
-                toggle_on_modifiers_press: None,
-            })
-        });
-
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(
-            path!("/a"),
-            json!({
-                "main.rs": format!(r#"fn main() {{\n{}\n}}"#, format!("let i = {};\n", "√".repeat(10)).repeat(500)),
-                "other.rs": "// Test file",
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
-
-        let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-        language_registry.add(rust_lang());
-        language_registry.register_fake_lsp(
-            "Rust",
-            FakeLspAdapter {
-                capabilities: lsp::ServerCapabilities {
-                    inlay_hint_provider: Some(lsp::OneOf::Left(true)),
-                    ..lsp::ServerCapabilities::default()
-                },
-                initializer: Some(Box::new(move |fake_server| {
-                    let lsp_request_count = Arc::new(AtomicU32::new(0));
-                    fake_server.set_request_handler::<lsp::request::InlayHintRequest, _, _>(
-                        move |params, _| {
-                            let i = lsp_request_count.fetch_add(1, Ordering::Release) + 1;
-                            async move {
-                                assert_eq!(
-                                    params.text_document.uri,
-                                    lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap(),
-                                );
-                                let query_start = params.range.start;
-                                Ok(Some(vec![lsp::InlayHint {
-                                    position: query_start,
-                                    label: lsp::InlayHintLabel::String(i.to_string()),
-                                    kind: None,
-                                    text_edits: None,
-                                    tooltip: None,
-                                    padding_left: None,
-                                    padding_right: None,
-                                    data: None,
-                                }]))
-                            }
-                        },
-                    );
-                })),
-                ..FakeLspAdapter::default()
-            },
-        );
-
-        let buffer = project
-            .update(cx, |project, cx| {
-                project.open_local_buffer(path!("/a/main.rs"), cx)
-            })
-            .await
-            .unwrap();
-        let editor =
-            cx.add_window(|window, cx| Editor::for_buffer(buffer, Some(project), window, cx));
-
-        cx.executor().run_until_parked();
-        editor
-            .update(cx, |editor, window, cx| {
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.select_ranges([Point::new(10, 0)..Point::new(10, 0)])
-                })
-            })
-            .unwrap();
-        cx.executor().run_until_parked();
-        editor
-            .update(cx, |editor, _, cx| {
-                let expected_hints = vec!["1".to_string()];
-                assert_eq!(expected_hints, cached_hint_labels(editor, cx));
-                assert_eq!(expected_hints, visible_hint_labels(editor, cx));
-            })
-            .unwrap();
-    }
-
-    #[gpui::test]
-    async fn test_toggle_inlay_hints(cx: &mut gpui::TestAppContext) {
-        init_test(cx, |settings| {
-            settings.defaults.inlay_hints = Some(InlayHintSettingsContent {
-                show_value_hints: Some(true),
-                enabled: Some(false),
-                edit_debounce_ms: Some(0),
-                scroll_debounce_ms: Some(0),
-                show_type_hints: Some(true),
-                show_parameter_hints: Some(true),
-                show_other_hints: Some(true),
-                show_background: Some(false),
-                toggle_on_modifiers_press: None,
-            })
-        });
-
-        let (_, editor, _fake_server) = prepare_test_objects(cx, |fake_server, file_with_hints| {
-            let lsp_request_count = Arc::new(AtomicU32::new(0));
-            fake_server.set_request_handler::<lsp::request::InlayHintRequest, _, _>(
-                move |params, _| {
-                    let lsp_request_count = lsp_request_count.clone();
-                    async move {
-                        assert_eq!(
-                            params.text_document.uri,
-                            lsp::Uri::from_file_path(file_with_hints).unwrap(),
-                        );
-
-                        let i = lsp_request_count.fetch_add(1, Ordering::AcqRel) + 1;
-                        Ok(Some(vec![lsp::InlayHint {
-                            position: lsp::Position::new(0, i),
-                            label: lsp::InlayHintLabel::String(i.to_string()),
-                            kind: None,
-                            text_edits: None,
-                            tooltip: None,
-                            padding_left: None,
-                            padding_right: None,
-                            data: None,
-                        }]))
-                    }
-                },
-            );
-        })
-        .await;
-
-        editor
-            .update(cx, |editor, window, cx| {
-                editor.toggle_inlay_hints(&crate::ToggleInlayHints, window, cx)
-            })
-            .unwrap();
-
-        cx.executor().run_until_parked();
-        editor
-            .update(cx, |editor, _, cx| {
-                let expected_hints = vec!["1".to_string()];
-                assert_eq!(
-                    expected_hints,
-                    cached_hint_labels(editor, cx),
-                    "Should display inlays after toggle despite them disabled in settings"
-                );
-                assert_eq!(expected_hints, visible_hint_labels(editor, cx));
-            })
-            .unwrap();
-
-        editor
-            .update(cx, |editor, window, cx| {
-                editor.toggle_inlay_hints(&crate::ToggleInlayHints, window, cx)
-            })
-            .unwrap();
-        cx.executor().run_until_parked();
-        editor
-            .update(cx, |editor, _, cx| {
-                assert_eq!(
-                    vec!["1".to_string()],
-                    cached_hint_labels(editor, cx),
-                    "Cache does not change because of toggles in the editor"
-                );
-                assert_eq!(
-                    Vec::<String>::new(),
-                    visible_hint_labels(editor, cx),
-                    "Should clear hints after 2nd toggle"
-                );
-            })
-            .unwrap();
-
-        update_test_language_settings(cx, |settings| {
-            settings.defaults.inlay_hints = Some(InlayHintSettingsContent {
-                show_value_hints: Some(true),
-                enabled: Some(true),
-                edit_debounce_ms: Some(0),
-                scroll_debounce_ms: Some(0),
-                show_type_hints: Some(true),
-                show_parameter_hints: Some(true),
-                show_other_hints: Some(true),
-                show_background: Some(false),
-                toggle_on_modifiers_press: None,
-            })
-        });
-        cx.executor().run_until_parked();
-        editor
-            .update(cx, |editor, _, cx| {
-                let expected_hints = vec!["1".to_string()];
-                assert_eq!(
-                    expected_hints,
-                    cached_hint_labels(editor, cx),
-                    "Should not query LSP hints after enabling hints in settings, as file version is the same"
-                );
-                assert_eq!(expected_hints, visible_hint_labels(editor, cx));
-            })
-            .unwrap();
-
-        editor
-            .update(cx, |editor, window, cx| {
-                editor.toggle_inlay_hints(&crate::ToggleInlayHints, window, cx)
-            })
-            .unwrap();
-        cx.executor().run_until_parked();
-        editor
-            .update(cx, |editor, _, cx| {
-                assert_eq!(
-                    vec!["1".to_string()],
-                    cached_hint_labels(editor, cx),
-                    "Cache does not change because of toggles in the editor"
-                );
-                assert_eq!(
-                    Vec::<String>::new(),
-                    visible_hint_labels(editor, cx),
-                    "Should clear hints after enabling in settings and a 3rd toggle"
-                );
-            })
-            .unwrap();
-
-        editor
-            .update(cx, |editor, window, cx| {
-                editor.toggle_inlay_hints(&crate::ToggleInlayHints, window, cx)
-            })
-            .unwrap();
-        cx.executor().run_until_parked();
-        editor.update(cx, |editor, _, cx| {
-            let expected_hints = vec!["1".to_string()];
-            assert_eq!(
-                expected_hints,
-                cached_hint_labels(editor,cx),
-                "Should not query LSP hints after enabling hints in settings and toggling them back on"
-            );
-            assert_eq!(expected_hints, visible_hint_labels(editor, cx));
-        }).unwrap();
-    }
-
-    #[gpui::test]
-    async fn test_modifiers_change(cx: &mut gpui::TestAppContext) {
-        init_test(cx, |settings| {
-            settings.defaults.inlay_hints = Some(InlayHintSettingsContent {
-                show_value_hints: Some(true),
-                enabled: Some(true),
-                edit_debounce_ms: Some(0),
-                scroll_debounce_ms: Some(0),
-                show_type_hints: Some(true),
-                show_parameter_hints: Some(true),
-                show_other_hints: Some(true),
-                show_background: Some(false),
-                toggle_on_modifiers_press: None,
-            })
-        });
-
-        let (_, editor, _fake_server) = prepare_test_objects(cx, |fake_server, file_with_hints| {
-            let lsp_request_count = Arc::new(AtomicU32::new(0));
-            fake_server.set_request_handler::<lsp::request::InlayHintRequest, _, _>(
-                move |params, _| {
-                    let lsp_request_count = lsp_request_count.clone();
-                    async move {
-                        assert_eq!(
-                            params.text_document.uri,
-                            lsp::Uri::from_file_path(file_with_hints).unwrap(),
-                        );
-
-                        let i = lsp_request_count.fetch_add(1, Ordering::AcqRel) + 1;
-                        Ok(Some(vec![lsp::InlayHint {
-                            position: lsp::Position::new(0, i),
-                            label: lsp::InlayHintLabel::String(i.to_string()),
-                            kind: None,
-                            text_edits: None,
-                            tooltip: None,
-                            padding_left: None,
-                            padding_right: None,
-                            data: None,
-                        }]))
-                    }
-                },
-            );
-        })
-        .await;
-
-        cx.executor().run_until_parked();
-        editor
-            .update(cx, |editor, _, cx| {
-                assert_eq!(
-                    vec!["1".to_string()],
-                    cached_hint_labels(editor, cx),
-                    "Should display inlays after toggle despite them disabled in settings"
-                );
-                assert_eq!(vec!["1".to_string()], visible_hint_labels(editor, cx));
-            })
-            .unwrap();
-
-        editor
-            .update(cx, |editor, _, cx| {
-                editor.refresh_inlay_hints(InlayHintRefreshReason::ModifiersChanged(true), cx);
-            })
-            .unwrap();
-        cx.executor().run_until_parked();
-        editor
-            .update(cx, |editor, _, cx| {
-                assert_eq!(
-                    vec!["1".to_string()],
-                    cached_hint_labels(editor, cx),
-                    "Nothing happens with the cache on modifiers change"
-                );
-                assert_eq!(
-                    Vec::<String>::new(),
-                    visible_hint_labels(editor, cx),
-                    "On modifiers change and hints toggled on, should hide editor inlays"
-                );
-            })
-            .unwrap();
-        editor
-            .update(cx, |editor, _, cx| {
-                editor.refresh_inlay_hints(InlayHintRefreshReason::ModifiersChanged(true), cx);
-            })
-            .unwrap();
-        cx.executor().run_until_parked();
-        editor
-            .update(cx, |editor, _, cx| {
-                assert_eq!(vec!["1".to_string()], cached_hint_labels(editor, cx));
-                assert_eq!(
-                    Vec::<String>::new(),
-                    visible_hint_labels(editor, cx),
-                    "Nothing changes on consequent modifiers change of the same kind"
-                );
-            })
-            .unwrap();
-
-        editor
-            .update(cx, |editor, _, cx| {
-                editor.refresh_inlay_hints(InlayHintRefreshReason::ModifiersChanged(false), cx);
-            })
-            .unwrap();
-        cx.executor().run_until_parked();
-        editor
-            .update(cx, |editor, _, cx| {
-                assert_eq!(
-                    vec!["1".to_string()],
-                    cached_hint_labels(editor, cx),
-                    "When modifiers change is off, no extra requests are sent"
-                );
-                assert_eq!(
-                    vec!["1".to_string()],
-                    visible_hint_labels(editor, cx),
-                    "When modifiers change is off, hints are back into the editor"
-                );
-            })
-            .unwrap();
-        editor
-            .update(cx, |editor, _, cx| {
-                editor.refresh_inlay_hints(InlayHintRefreshReason::ModifiersChanged(false), cx);
-            })
-            .unwrap();
-        cx.executor().run_until_parked();
-        editor
-            .update(cx, |editor, _, cx| {
-                assert_eq!(vec!["1".to_string()], cached_hint_labels(editor, cx));
-                assert_eq!(
-                    vec!["1".to_string()],
-                    visible_hint_labels(editor, cx),
-                    "Nothing changes on consequent modifiers change of the same kind (2)"
-                );
-            })
-            .unwrap();
-
-        editor
-            .update(cx, |editor, window, cx| {
-                editor.toggle_inlay_hints(&crate::ToggleInlayHints, window, cx)
-            })
-            .unwrap();
-        cx.executor().run_until_parked();
-        editor
-            .update(cx, |editor, _, cx| {
-                assert_eq!(
-                    vec!["1".to_string()],
-                    cached_hint_labels(editor, cx),
-                    "Nothing happens with the cache on modifiers change"
-                );
-                assert_eq!(
-                    Vec::<String>::new(),
-                    visible_hint_labels(editor, cx),
-                    "When toggled off, should hide editor inlays"
-                );
-            })
-            .unwrap();
-
-        editor
-            .update(cx, |editor, _, cx| {
-                editor.refresh_inlay_hints(InlayHintRefreshReason::ModifiersChanged(true), cx);
-            })
-            .unwrap();
-        cx.executor().run_until_parked();
-        editor
-            .update(cx, |editor, _, cx| {
-                assert_eq!(
-                    vec!["1".to_string()],
-                    cached_hint_labels(editor, cx),
-                    "Nothing happens with the cache on modifiers change"
-                );
-                assert_eq!(
-                    vec!["1".to_string()],
-                    visible_hint_labels(editor, cx),
-                    "On modifiers change & hints toggled off, should show editor inlays"
-                );
-            })
-            .unwrap();
-        editor
-            .update(cx, |editor, _, cx| {
-                editor.refresh_inlay_hints(InlayHintRefreshReason::ModifiersChanged(true), cx);
-            })
-            .unwrap();
-        cx.executor().run_until_parked();
-        editor
-            .update(cx, |editor, _, cx| {
-                assert_eq!(vec!["1".to_string()], cached_hint_labels(editor, cx));
-                assert_eq!(
-                    vec!["1".to_string()],
-                    visible_hint_labels(editor, cx),
-                    "Nothing changes on consequent modifiers change of the same kind"
-                );
-            })
-            .unwrap();
-
-        editor
-            .update(cx, |editor, _, cx| {
-                editor.refresh_inlay_hints(InlayHintRefreshReason::ModifiersChanged(false), cx);
-            })
-            .unwrap();
-        cx.executor().run_until_parked();
-        editor
-            .update(cx, |editor, _, cx| {
-                assert_eq!(
-                    vec!["1".to_string()],
-                    cached_hint_labels(editor, cx),
-                    "When modifiers change is off, no extra requests are sent"
-                );
-                assert_eq!(
-                    Vec::<String>::new(),
-                    visible_hint_labels(editor, cx),
-                    "When modifiers change is off, editor hints are back into their toggled off state"
-                );
-            })
-            .unwrap();
-        editor
-            .update(cx, |editor, _, cx| {
-                editor.refresh_inlay_hints(InlayHintRefreshReason::ModifiersChanged(false), cx);
-            })
-            .unwrap();
-        cx.executor().run_until_parked();
-        editor
-            .update(cx, |editor, _, cx| {
-                assert_eq!(vec!["1".to_string()], cached_hint_labels(editor, cx));
-                assert_eq!(
-                    Vec::<String>::new(),
-                    visible_hint_labels(editor, cx),
-                    "Nothing changes on consequent modifiers change of the same kind (3)"
-                );
-            })
-            .unwrap();
-    }
-
-    #[gpui::test]
-    async fn test_inlays_at_the_same_place(cx: &mut gpui::TestAppContext) {
-        init_test(cx, |settings| {
-            settings.defaults.inlay_hints = Some(InlayHintSettingsContent {
-                show_value_hints: Some(true),
-                enabled: Some(true),
-                edit_debounce_ms: Some(0),
-                scroll_debounce_ms: Some(0),
-                show_type_hints: Some(true),
-                show_parameter_hints: Some(true),
-                show_other_hints: Some(true),
-                show_background: Some(false),
-                toggle_on_modifiers_press: None,
-            })
-        });
-
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(
-            path!("/a"),
-            json!({
-                "main.rs": "fn main() {
-                    let x = 42;
-                    std::thread::scope(|s| {
-                        s.spawn(|| {
-                            let _x = x;
-                        });
-                    });
-                }",
-                "other.rs": "// Test file",
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
-
-        let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-        language_registry.add(rust_lang());
-        language_registry.register_fake_lsp(
-            "Rust",
-            FakeLspAdapter {
-                capabilities: lsp::ServerCapabilities {
-                    inlay_hint_provider: Some(lsp::OneOf::Left(true)),
-                    ..Default::default()
-                },
-                initializer: Some(Box::new(move |fake_server| {
-                    fake_server.set_request_handler::<lsp::request::InlayHintRequest, _, _>(
-                        move |params, _| async move {
-                            assert_eq!(
-                                params.text_document.uri,
-                                lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap(),
-                            );
-                            Ok(Some(
-                                serde_json::from_value(json!([
-                                    {
-                                        "position": {
-                                            "line": 3,
-                                            "character": 16
-                                        },
-                                        "label": "move",
-                                        "paddingLeft": false,
-                                        "paddingRight": false
-                                    },
-                                    {
-                                        "position": {
-                                            "line": 3,
-                                            "character": 16
-                                        },
-                                        "label": "(",
-                                        "paddingLeft": false,
-                                        "paddingRight": false
-                                    },
-                                    {
-                                        "position": {
-                                            "line": 3,
-                                            "character": 16
-                                        },
-                                        "label": [
-                                            {
-                                                "value": "&x"
-                                            }
-                                        ],
-                                        "paddingLeft": false,
-                                        "paddingRight": false,
-                                        "data": {
-                                            "file_id": 0
-                                        }
-                                    },
-                                    {
-                                        "position": {
-                                            "line": 3,
-                                            "character": 16
-                                        },
-                                        "label": ")",
-                                        "paddingLeft": false,
-                                        "paddingRight": true
-                                    },
-                                    // not a correct syntax, but checks that same symbols at the same place
-                                    // are not deduplicated
-                                    {
-                                        "position": {
-                                            "line": 3,
-                                            "character": 16
-                                        },
-                                        "label": ")",
-                                        "paddingLeft": false,
-                                        "paddingRight": true
-                                    },
-                                ]))
-                                .unwrap(),
-                            ))
-                        },
-                    );
-                })),
-                ..FakeLspAdapter::default()
-            },
-        );
-
-        let buffer = project
-            .update(cx, |project, cx| {
-                project.open_local_buffer(path!("/a/main.rs"), cx)
-            })
-            .await
-            .unwrap();
-        let editor =
-            cx.add_window(|window, cx| Editor::for_buffer(buffer, Some(project), window, cx));
-
-        cx.executor().run_until_parked();
-        editor
-            .update(cx, |editor, window, cx| {
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.select_ranges([Point::new(10, 0)..Point::new(10, 0)])
-                })
-            })
-            .unwrap();
-        cx.executor().run_until_parked();
-        editor
-            .update(cx, |editor, _window, cx| {
-                let expected_hints = vec![
-                    "move".to_string(),
-                    "(".to_string(),
-                    "&x".to_string(),
-                    ") ".to_string(),
-                    ") ".to_string(),
-                ];
-                assert_eq!(
-                    expected_hints,
-                    cached_hint_labels(editor, cx),
-                    "Editor inlay hints should repeat server's order when placed at the same spot"
-                );
-                assert_eq!(expected_hints, visible_hint_labels(editor, cx));
-            })
-            .unwrap();
-    }
-
-    #[gpui::test]
-    async fn test_invalidation_and_addition_race(cx: &mut gpui::TestAppContext) {
-        init_test(cx, |settings| {
-            settings.defaults.inlay_hints = Some(InlayHintSettingsContent {
-                enabled: Some(true),
-                ..InlayHintSettingsContent::default()
-            })
-        });
-
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(
-            path!("/a"),
-            json!({
-                "main.rs": r#"fn main() {
-                    let x = 1;
-                    ////
-                    ////
-                    ////
-                    ////
-                    ////
-                    ////
-                    ////
-                    ////
-                    ////
-                    ////
-                    ////
-                    ////
-                    ////
-                    ////
-                    ////
-                    ////
-                    ////
-                    let x = "2";
-                }
-"#,
-                "lib.rs": r#"fn aaa() {
-                    let aa = 22;
-                }
-                //
-                //
-                //
-                //
-                //
-                //
-                //
-                //
-                //
-                //
-                //
-                //
-                //
-                //
-                //
-                //
-                //
-                //
-                //
-                //
-                //
-                //
-                //
-                //
-
-                fn bb() {
-                    let bb = 33;
-                }
-"#
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
-        let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-        let language = rust_lang();
-        language_registry.add(language);
-
-        let requests_count = Arc::new(AtomicUsize::new(0));
-        let closure_requests_count = requests_count.clone();
-        let mut fake_servers = language_registry.register_fake_lsp(
-            "Rust",
-            FakeLspAdapter {
-                name: "rust-analyzer",
-                capabilities: lsp::ServerCapabilities {
-                    inlay_hint_provider: Some(lsp::OneOf::Left(true)),
-                    ..lsp::ServerCapabilities::default()
-                },
-                initializer: Some(Box::new(move |fake_server| {
-                    let requests_count = closure_requests_count.clone();
-                    fake_server.set_request_handler::<lsp::request::InlayHintRequest, _, _>(
-                        move |params, _| {
-                            let requests_count = requests_count.clone();
-                            async move {
-                                requests_count.fetch_add(1, Ordering::Release);
-                                if params.text_document.uri
-                                    == lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap()
-                                {
-                                    Ok(Some(vec![
-                                        lsp::InlayHint {
-                                            position: lsp::Position::new(1, 9),
-                                            label: lsp::InlayHintLabel::String(": i32".to_owned()),
-                                            kind: Some(lsp::InlayHintKind::TYPE),
-                                            text_edits: None,
-                                            tooltip: None,
-                                            padding_left: None,
-                                            padding_right: None,
-                                            data: None,
-                                        },
-                                        lsp::InlayHint {
-                                            position: lsp::Position::new(19, 9),
-                                            label: lsp::InlayHintLabel::String(": i33".to_owned()),
-                                            kind: Some(lsp::InlayHintKind::TYPE),
-                                            text_edits: None,
-                                            tooltip: None,
-                                            padding_left: None,
-                                            padding_right: None,
-                                            data: None,
-                                        },
-                                    ]))
-                                } else if params.text_document.uri
-                                    == lsp::Uri::from_file_path(path!("/a/lib.rs")).unwrap()
-                                {
-                                    Ok(Some(vec![
-                                        lsp::InlayHint {
-                                            position: lsp::Position::new(1, 10),
-                                            label: lsp::InlayHintLabel::String(": i34".to_owned()),
-                                            kind: Some(lsp::InlayHintKind::TYPE),
-                                            text_edits: None,
-                                            tooltip: None,
-                                            padding_left: None,
-                                            padding_right: None,
-                                            data: None,
-                                        },
-                                        lsp::InlayHint {
-                                            position: lsp::Position::new(29, 10),
-                                            label: lsp::InlayHintLabel::String(": i35".to_owned()),
-                                            kind: Some(lsp::InlayHintKind::TYPE),
-                                            text_edits: None,
-                                            tooltip: None,
-                                            padding_left: None,
-                                            padding_right: None,
-                                            data: None,
-                                        },
-                                    ]))
-                                } else {
-                                    panic!("Unexpected file path {:?}", params.text_document.uri);
-                                }
-                            }
-                        },
-                    );
-                })),
-                ..FakeLspAdapter::default()
-            },
-        );
-
-        // Add another server that does send the same, duplicate hints back
-        let mut fake_servers_2 = language_registry.register_fake_lsp(
-            "Rust",
-            FakeLspAdapter {
-                name: "CrabLang-ls",
-                capabilities: lsp::ServerCapabilities {
-                    inlay_hint_provider: Some(lsp::OneOf::Left(true)),
-                    ..lsp::ServerCapabilities::default()
-                },
-                initializer: Some(Box::new(move |fake_server| {
-                    fake_server.set_request_handler::<lsp::request::InlayHintRequest, _, _>(
-                        move |params, _| async move {
-                            if params.text_document.uri
-                                == lsp::Uri::from_file_path(path!("/a/main.rs")).unwrap()
-                            {
-                                Ok(Some(vec![
-                                    lsp::InlayHint {
-                                        position: lsp::Position::new(1, 9),
-                                        label: lsp::InlayHintLabel::String(": i32".to_owned()),
-                                        kind: Some(lsp::InlayHintKind::TYPE),
-                                        text_edits: None,
-                                        tooltip: None,
-                                        padding_left: None,
-                                        padding_right: None,
-                                        data: None,
-                                    },
-                                    lsp::InlayHint {
-                                        position: lsp::Position::new(19, 9),
-                                        label: lsp::InlayHintLabel::String(": i33".to_owned()),
-                                        kind: Some(lsp::InlayHintKind::TYPE),
-                                        text_edits: None,
-                                        tooltip: None,
-                                        padding_left: None,
-                                        padding_right: None,
-                                        data: None,
-                                    },
-                                ]))
-                            } else if params.text_document.uri
-                                == lsp::Uri::from_file_path(path!("/a/lib.rs")).unwrap()
-                            {
-                                Ok(Some(vec![
-                                    lsp::InlayHint {
-                                        position: lsp::Position::new(1, 10),
-                                        label: lsp::InlayHintLabel::String(": i34".to_owned()),
-                                        kind: Some(lsp::InlayHintKind::TYPE),
-                                        text_edits: None,
-                                        tooltip: None,
-                                        padding_left: None,
-                                        padding_right: None,
-                                        data: None,
-                                    },
-                                    lsp::InlayHint {
-                                        position: lsp::Position::new(29, 10),
-                                        label: lsp::InlayHintLabel::String(": i35".to_owned()),
-                                        kind: Some(lsp::InlayHintKind::TYPE),
-                                        text_edits: None,
-                                        tooltip: None,
-                                        padding_left: None,
-                                        padding_right: None,
-                                        data: None,
-                                    },
-                                ]))
-                            } else {
-                                panic!("Unexpected file path {:?}", params.text_document.uri);
-                            }
-                        },
-                    );
-                })),
-                ..FakeLspAdapter::default()
-            },
-        );
-
-        let (buffer_1, _handle_1) = project
-            .update(cx, |project, cx| {
-                project.open_local_buffer_with_lsp(path!("/a/main.rs"), cx)
-            })
-            .await
-            .unwrap();
-        let (buffer_2, _handle_2) = project
-            .update(cx, |project, cx| {
-                project.open_local_buffer_with_lsp(path!("/a/lib.rs"), cx)
-            })
-            .await
-            .unwrap();
-        let multi_buffer = cx.new(|cx| {
-            let mut multibuffer = MultiBuffer::new(Capability::ReadWrite);
-            multibuffer.push_excerpts(
-                buffer_2.clone(),
-                [
-                    ExcerptRange::new(Point::new(0, 0)..Point::new(10, 0)),
-                    ExcerptRange::new(Point::new(23, 0)..Point::new(34, 0)),
-                ],
-                cx,
-            );
-            multibuffer.push_excerpts(
-                buffer_1.clone(),
-                [
-                    ExcerptRange::new(Point::new(0, 0)..Point::new(10, 0)),
-                    ExcerptRange::new(Point::new(13, 0)..Point::new(23, 0)),
-                ],
-                cx,
-            );
-            multibuffer
-        });
-
-        let editor = cx.add_window(|window, cx| {
-            let mut editor =
-                Editor::for_multibuffer(multi_buffer, Some(project.clone()), window, cx);
-            editor.change_selections(SelectionEffects::default(), window, cx, |s| {
-                s.select_ranges([Point::new(3, 3)..Point::new(3, 3)])
-            });
-            editor
-        });
-
-        let fake_server = fake_servers.next().await.unwrap();
-        let _fake_server_2 = fake_servers_2.next().await.unwrap();
-        cx.executor().advance_clock(Duration::from_millis(100));
-        cx.executor().run_until_parked();
-
-        editor
-            .update(cx, |editor, _window, cx| {
-                assert_eq!(
-                    vec![
-                        ": i32".to_string(),
-                        ": i32".to_string(),
-                        ": i33".to_string(),
-                        ": i33".to_string(),
-                        ": i34".to_string(),
-                        ": i34".to_string(),
-                        ": i35".to_string(),
-                        ": i35".to_string(),
-                    ],
-                    sorted_cached_hint_labels(editor, cx),
-                    "We receive duplicate hints from 2 servers and cache them all"
-                );
-                assert_eq!(
-                    vec![
-                        ": i34".to_string(),
-                        ": i35".to_string(),
-                        ": i32".to_string(),
-                        ": i33".to_string(),
-                    ],
-                    visible_hint_labels(editor, cx),
-                    "lib.rs is added before main.rs , so its excerpts should be visible first; hints should be deduplicated per label"
-                );
-            })
-            .unwrap();
-        assert_eq!(
-            requests_count.load(Ordering::Acquire),
-            2,
-            "Should have queried hints once per each file"
-        );
-
-        // Scroll all the way down so the 1st buffer is out of sight.
-        // The selection is on the 1st buffer still.
-        editor
-            .update(cx, |editor, window, cx| {
-                editor.scroll_screen(&ScrollAmount::Line(88.0), window, cx);
-            })
-            .unwrap();
-        // Emulate a language server refresh request, coming in the background..
-        editor
-            .update(cx, |editor, _, cx| {
-                editor.refresh_inlay_hints(
-                    InlayHintRefreshReason::RefreshRequested {
-                        server_id: fake_server.server.server_id(),
-                        request_id: Some(1),
-                    },
-                    cx,
-                );
-            })
-            .unwrap();
-        // Edit the 1st buffer while scrolled down and not seeing that.
-        // The edit will auto scroll to the edit (1st buffer).
-        editor
-            .update(cx, |editor, window, cx| {
-                editor.handle_input("a", window, cx);
-            })
-            .unwrap();
-        // Add more racy additive hint tasks.
-        editor
-            .update(cx, |editor, window, cx| {
-                editor.scroll_screen(&ScrollAmount::Line(0.2), window, cx);
-            })
-            .unwrap();
-
-        cx.executor().advance_clock(Duration::from_millis(1000));
-        cx.executor().run_until_parked();
-        editor
-            .update(cx, |editor, _window, cx| {
-                assert_eq!(
-                    vec![
-                        ": i32".to_string(),
-                        ": i32".to_string(),
-                        ": i33".to_string(),
-                        ": i33".to_string(),
-                        ": i34".to_string(),
-                        ": i34".to_string(),
-                        ": i35".to_string(),
-                        ": i35".to_string(),
-                    ],
-                    sorted_cached_hint_labels(editor, cx),
-                    "No hint changes/duplicates should occur in the cache",
-                );
-                assert_eq!(
-                    vec![
-                        ": i34".to_string(),
-                        ": i35".to_string(),
-                        ": i32".to_string(),
-                        ": i33".to_string(),
-                    ],
-                    visible_hint_labels(editor, cx),
-                    "No hint changes/duplicates should occur in the editor excerpts",
-                );
-            })
-            .unwrap();
-        assert_eq!(
-            requests_count.load(Ordering::Acquire),
-            4,
-            "Should have queried hints once more per each file, after editing the file once"
-        );
-    }
-
-    pub(crate) fn init_test(cx: &mut TestAppContext, f: impl Fn(&mut AllLanguageSettingsContent)) {
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-            theme::init(theme::LoadThemes::JustBase, cx);
-            release_channel::init(semver::Version::new(0, 0, 0), cx);
-            crate::init(cx);
-        });
-
-        update_test_language_settings(cx, f);
-    }
-
-    async fn prepare_test_objects(
-        cx: &mut TestAppContext,
-        initialize: impl 'static + Send + Fn(&mut FakeLanguageServer, &'static str) + Send + Sync,
-    ) -> (&'static str, WindowHandle<Editor>, FakeLanguageServer) {
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(
-            path!("/a"),
-            json!({
-                "main.rs": "fn main() { a } // and some long comment to ensure inlays are not trimmed out",
-                "other.rs": "// Test file",
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
-        let file_path = path!("/a/main.rs");
-
-        let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-        language_registry.add(rust_lang());
-        let mut fake_servers = language_registry.register_fake_lsp(
-            "Rust",
-            FakeLspAdapter {
-                capabilities: lsp::ServerCapabilities {
-                    inlay_hint_provider: Some(lsp::OneOf::Left(true)),
-                    ..lsp::ServerCapabilities::default()
-                },
-                initializer: Some(Box::new(move |server| initialize(server, file_path))),
-                ..FakeLspAdapter::default()
-            },
-        );
-
-        let buffer = project
-            .update(cx, |project, cx| {
-                project.open_local_buffer(path!("/a/main.rs"), cx)
-            })
-            .await
-            .unwrap();
-        let editor =
-            cx.add_window(|window, cx| Editor::for_buffer(buffer, Some(project), window, cx));
-
-        editor
-            .update(cx, |editor, _, cx| {
-                assert!(cached_hint_labels(editor, cx).is_empty());
-                assert!(visible_hint_labels(editor, cx).is_empty());
-            })
-            .unwrap();
-
-        cx.executor().run_until_parked();
-        let fake_server = fake_servers.next().await.unwrap();
-        (file_path, editor, fake_server)
-    }
-
-    // Inlay hints in the cache are stored per excerpt as a key, and those keys are guaranteed to be ordered same as in the multi buffer.
-    // Ensure a stable order for testing.
-    fn sorted_cached_hint_labels(editor: &Editor, cx: &mut App) -> Vec<String> {
-        let mut labels = cached_hint_labels(editor, cx);
-        labels.sort_by(|a, b| natural_sort(a, b));
-        labels
-    }
-
-    pub fn cached_hint_labels(editor: &Editor, cx: &mut App) -> Vec<String> {
-        let lsp_store = editor.project().unwrap().read(cx).lsp_store();
-
-        let mut all_cached_labels = Vec::new();
-        let mut all_fetched_hints = Vec::new();
-        for buffer in editor.buffer.read(cx).all_buffers() {
-            lsp_store.update(cx, |lsp_store, cx| {
-                let hints = lsp_store.latest_lsp_data(&buffer, cx).inlay_hints();
-                all_cached_labels.extend(hints.all_cached_hints().into_iter().map(|hint| {
-                    let mut label = hint.text().to_string();
-                    if hint.padding_left {
-                        label.insert(0, ' ');
-                    }
-                    if hint.padding_right {
-                        label.push_str(" ");
-                    }
-                    label
-                }));
-                all_fetched_hints.extend(hints.all_fetched_hints());
-            });
-        }
-
-        all_cached_labels
-    }
-
-    pub fn visible_hint_labels(editor: &Editor, cx: &Context<Editor>) -> Vec<String> {
-        editor
-            .visible_inlay_hints(cx)
-            .into_iter()
-            .map(|hint| hint.text().to_string())
-            .collect()
-    }
-
-    fn allowed_hint_kinds_for_editor(editor: &Editor) -> HashSet<Option<InlayHintKind>> {
-        editor
-            .inlay_hints
-            .as_ref()
-            .unwrap()
-            .allowed_hint_kinds
-            .clone()
-    }
-}
diff --git a/crates/editor/src/items.rs b/crates/editor/src/items.rs
deleted file mode 100644
index 3b9c17f80f..0000000000
--- a/crates/editor/src/items.rs
+++ /dev/null
@@ -1,2175 +0,0 @@
-use crate::{
-    Anchor, Autoscroll, BufferSerialization, Editor, EditorEvent, EditorSettings, ExcerptId,
-    ExcerptRange, FormatTarget, MultiBuffer, MultiBufferSnapshot, NavigationData,
-    ReportEditorEvent, SearchWithinRange, SelectionEffects, ToPoint as _,
-    display_map::HighlightKey,
-    editor_settings::SeedQuerySetting,
-    persistence::{DB, SerializedEditor},
-    scroll::{ScrollAnchor, ScrollOffset},
-};
-use anyhow::{Context as _, Result, anyhow};
-use collections::{HashMap, HashSet};
-use file_icons::FileIcons;
-use futures::future::try_join_all;
-use git::status::GitSummary;
-use gpui::{
-    AnyElement, App, AsyncWindowContext, Context, Entity, EntityId, EventEmitter, IntoElement,
-    ParentElement, Pixels, SharedString, Styled, Task, WeakEntity, Window, point,
-};
-use language::{
-    Bias, Buffer, BufferRow, CharKind, CharScopeContext, DiskState, LocalFile, Point,
-    SelectionGoal, proto::serialize_anchor as serialize_text_anchor,
-};
-use lsp::DiagnosticSeverity;
-use multi_buffer::MultiBufferOffset;
-use project::{
-    File, Project, ProjectItem as _, ProjectPath, lsp_store::FormatTrigger,
-    project_settings::ProjectSettings, search::SearchQuery,
-};
-use rpc::proto::{self, update_view};
-use settings::Settings;
-use std::{
-    any::TypeId,
-    borrow::Cow,
-    cmp::{self, Ordering},
-    iter,
-    ops::Range,
-    path::{Path, PathBuf},
-    sync::Arc,
-};
-use text::{BufferId, BufferSnapshot, Selection};
-use theme::{Theme, ThemeSettings};
-use ui::{IconDecorationKind, prelude::*};
-use util::{ResultExt, TryFutureExt, paths::PathExt};
-use workspace::{
-    CollaboratorId, ItemId, ItemNavHistory, ToolbarItemLocation, ViewId, Workspace, WorkspaceId,
-    invalid_item_view::InvalidItemView,
-    item::{FollowableItem, Item, ItemBufferKind, ItemEvent, ProjectItem, SaveOptions},
-    searchable::{
-        Direction, FilteredSearchRange, SearchEvent, SearchableItem, SearchableItemHandle,
-    },
-};
-use workspace::{
-    OpenOptions,
-    item::{Dedup, ItemSettings, SerializableItem, TabContentParams},
-};
-use workspace::{
-    OpenVisible, Pane, WorkspaceSettings,
-    item::{BreadcrumbText, FollowEvent, ProjectItemKind},
-    searchable::SearchOptions,
-};
-
-pub const MAX_TAB_TITLE_LEN: usize = 24;
-
-impl FollowableItem for Editor {
-    fn remote_id(&self) -> Option<ViewId> {
-        self.remote_id
-    }
-
-    fn from_state_proto(
-        workspace: Entity<Workspace>,
-        remote_id: ViewId,
-        state: &mut Option<proto::view::Variant>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<Task<Result<Entity<Self>>>> {
-        let project = workspace.read(cx).project().to_owned();
-        let Some(proto::view::Variant::Editor(_)) = state else {
-            return None;
-        };
-        let Some(proto::view::Variant::Editor(state)) = state.take() else {
-            unreachable!()
-        };
-
-        let buffer_ids = state
-            .excerpts
-            .iter()
-            .map(|excerpt| excerpt.buffer_id)
-            .collect::<HashSet<_>>();
-        let buffers = project.update(cx, |project, cx| {
-            buffer_ids
-                .iter()
-                .map(|id| BufferId::new(*id).map(|id| project.open_buffer_by_id(id, cx)))
-                .collect::<Result<Vec<_>>>()
-        });
-
-        Some(window.spawn(cx, async move |cx| {
-            let mut buffers = futures::future::try_join_all(buffers?)
-                .await
-                .debug_assert_ok("leaders don't share views for unshared buffers")?;
-
-            let editor = cx.update(|window, cx| {
-                let multibuffer = cx.new(|cx| {
-                    let mut multibuffer;
-                    if state.singleton && buffers.len() == 1 {
-                        multibuffer = MultiBuffer::singleton(buffers.pop().unwrap(), cx)
-                    } else {
-                        multibuffer = MultiBuffer::new(project.read(cx).capability());
-                        let mut sorted_excerpts = state.excerpts.clone();
-                        sorted_excerpts.sort_by_key(|e| e.id);
-                        let sorted_excerpts = sorted_excerpts.into_iter().peekable();
-
-                        for excerpt in sorted_excerpts {
-                            let Ok(buffer_id) = BufferId::new(excerpt.buffer_id) else {
-                                continue;
-                            };
-
-                            let mut insert_position = ExcerptId::min();
-                            for e in &state.excerpts {
-                                if e.id == excerpt.id {
-                                    break;
-                                }
-                                if e.id < excerpt.id {
-                                    insert_position = ExcerptId::from_proto(e.id);
-                                }
-                            }
-
-                            let buffer =
-                                buffers.iter().find(|b| b.read(cx).remote_id() == buffer_id);
-
-                            let Some(excerpt) = deserialize_excerpt_range(excerpt) else {
-                                continue;
-                            };
-
-                            let Some(buffer) = buffer else { continue };
-
-                            multibuffer.insert_excerpts_with_ids_after(
-                                insert_position,
-                                buffer.clone(),
-                                [excerpt],
-                                cx,
-                            );
-                        }
-                    };
-
-                    if let Some(title) = &state.title {
-                        multibuffer = multibuffer.with_title(title.clone())
-                    }
-
-                    multibuffer
-                });
-
-                cx.new(|cx| {
-                    let mut editor =
-                        Editor::for_multibuffer(multibuffer, Some(project.clone()), window, cx);
-                    editor.remote_id = Some(remote_id);
-                    editor
-                })
-            })?;
-
-            update_editor_from_message(
-                editor.downgrade(),
-                project,
-                proto::update_view::Editor {
-                    selections: state.selections,
-                    pending_selection: state.pending_selection,
-                    scroll_top_anchor: state.scroll_top_anchor,
-                    scroll_x: state.scroll_x,
-                    scroll_y: state.scroll_y,
-                    ..Default::default()
-                },
-                cx,
-            )
-            .await?;
-
-            Ok(editor)
-        }))
-    }
-
-    fn set_leader_id(
-        &mut self,
-        leader_id: Option<CollaboratorId>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.leader_id = leader_id;
-        if self.leader_id.is_some() {
-            self.buffer.update(cx, |buffer, cx| {
-                buffer.remove_active_selections(cx);
-            });
-        } else if self.focus_handle.is_focused(window) {
-            self.buffer.update(cx, |buffer, cx| {
-                buffer.set_active_selections(
-                    &self.selections.disjoint_anchors_arc(),
-                    self.selections.line_mode(),
-                    self.cursor_shape,
-                    cx,
-                );
-            });
-        }
-        cx.notify();
-    }
-
-    fn to_state_proto(&self, _: &Window, cx: &App) -> Option<proto::view::Variant> {
-        let buffer = self.buffer.read(cx);
-        if buffer
-            .as_singleton()
-            .and_then(|buffer| buffer.read(cx).file())
-            .is_some_and(|file| file.is_private())
-        {
-            return None;
-        }
-
-        let scroll_anchor = self.scroll_manager.anchor();
-        let excerpts = buffer
-            .read(cx)
-            .excerpts()
-            .map(|(id, buffer, range)| proto::Excerpt {
-                id: id.to_proto(),
-                buffer_id: buffer.remote_id().into(),
-                context_start: Some(serialize_text_anchor(&range.context.start)),
-                context_end: Some(serialize_text_anchor(&range.context.end)),
-                primary_start: Some(serialize_text_anchor(&range.primary.start)),
-                primary_end: Some(serialize_text_anchor(&range.primary.end)),
-            })
-            .collect();
-        let snapshot = buffer.snapshot(cx);
-
-        Some(proto::view::Variant::Editor(proto::view::Editor {
-            singleton: buffer.is_singleton(),
-            title: buffer.explicit_title().map(ToOwned::to_owned),
-            excerpts,
-            scroll_top_anchor: Some(serialize_anchor(&scroll_anchor.anchor, &snapshot)),
-            scroll_x: scroll_anchor.offset.x,
-            scroll_y: scroll_anchor.offset.y,
-            selections: self
-                .selections
-                .disjoint_anchors_arc()
-                .iter()
-                .map(|s| serialize_selection(s, &snapshot))
-                .collect(),
-            pending_selection: self
-                .selections
-                .pending_anchor()
-                .as_ref()
-                .map(|s| serialize_selection(s, &snapshot)),
-        }))
-    }
-
-    fn to_follow_event(event: &EditorEvent) -> Option<workspace::item::FollowEvent> {
-        match event {
-            EditorEvent::Edited { .. } => Some(FollowEvent::Unfollow),
-            EditorEvent::SelectionsChanged { local }
-            | EditorEvent::ScrollPositionChanged { local, .. } => {
-                if *local {
-                    Some(FollowEvent::Unfollow)
-                } else {
-                    None
-                }
-            }
-            _ => None,
-        }
-    }
-
-    fn add_event_to_update_proto(
-        &self,
-        event: &EditorEvent,
-        update: &mut Option<proto::update_view::Variant>,
-        _: &Window,
-        cx: &App,
-    ) -> bool {
-        let update =
-            update.get_or_insert_with(|| proto::update_view::Variant::Editor(Default::default()));
-
-        match update {
-            proto::update_view::Variant::Editor(update) => match event {
-                EditorEvent::ExcerptsAdded {
-                    buffer,
-                    predecessor,
-                    excerpts,
-                } => {
-                    let buffer_id = buffer.read(cx).remote_id();
-                    let mut excerpts = excerpts.iter();
-                    if let Some((id, range)) = excerpts.next() {
-                        update.inserted_excerpts.push(proto::ExcerptInsertion {
-                            previous_excerpt_id: Some(predecessor.to_proto()),
-                            excerpt: serialize_excerpt(buffer_id, id, range),
-                        });
-                        update.inserted_excerpts.extend(excerpts.map(|(id, range)| {
-                            proto::ExcerptInsertion {
-                                previous_excerpt_id: None,
-                                excerpt: serialize_excerpt(buffer_id, id, range),
-                            }
-                        }))
-                    }
-                    true
-                }
-                EditorEvent::ExcerptsRemoved { ids, .. } => {
-                    update
-                        .deleted_excerpts
-                        .extend(ids.iter().copied().map(ExcerptId::to_proto));
-                    true
-                }
-                EditorEvent::ScrollPositionChanged { autoscroll, .. } if !autoscroll => {
-                    let snapshot = self.buffer.read(cx).snapshot(cx);
-                    let scroll_anchor = self.scroll_manager.anchor();
-                    update.scroll_top_anchor =
-                        Some(serialize_anchor(&scroll_anchor.anchor, &snapshot));
-                    update.scroll_x = scroll_anchor.offset.x;
-                    update.scroll_y = scroll_anchor.offset.y;
-                    true
-                }
-                EditorEvent::SelectionsChanged { .. } => {
-                    let snapshot = self.buffer.read(cx).snapshot(cx);
-                    update.selections = self
-                        .selections
-                        .disjoint_anchors_arc()
-                        .iter()
-                        .map(|s| serialize_selection(s, &snapshot))
-                        .collect();
-                    update.pending_selection = self
-                        .selections
-                        .pending_anchor()
-                        .as_ref()
-                        .map(|s| serialize_selection(s, &snapshot));
-                    true
-                }
-                _ => false,
-            },
-        }
-    }
-
-    fn apply_update_proto(
-        &mut self,
-        project: &Entity<Project>,
-        message: update_view::Variant,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let update_view::Variant::Editor(message) = message;
-        let project = project.clone();
-        cx.spawn_in(window, async move |this, cx| {
-            update_editor_from_message(this, project, message, cx).await
-        })
-    }
-
-    fn is_project_item(&self, _window: &Window, _cx: &App) -> bool {
-        true
-    }
-
-    fn dedup(&self, existing: &Self, _: &Window, cx: &App) -> Option<Dedup> {
-        let self_singleton = self.buffer.read(cx).as_singleton()?;
-        let other_singleton = existing.buffer.read(cx).as_singleton()?;
-        if self_singleton == other_singleton {
-            Some(Dedup::KeepExisting)
-        } else {
-            None
-        }
-    }
-
-    fn update_agent_location(
-        &mut self,
-        location: language::Anchor,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let buffer = self.buffer.read(cx);
-        let buffer = buffer.read(cx);
-        let Some(position) = buffer.as_singleton_anchor(location) else {
-            return;
-        };
-        let selection = Selection {
-            id: 0,
-            reversed: false,
-            start: position,
-            end: position,
-            goal: SelectionGoal::None,
-        };
-        drop(buffer);
-        self.set_selections_from_remote(vec![selection], None, window, cx);
-        self.request_autoscroll_remotely(Autoscroll::fit(), cx);
-    }
-}
-
-async fn update_editor_from_message(
-    this: WeakEntity<Editor>,
-    project: Entity<Project>,
-    message: proto::update_view::Editor,
-    cx: &mut AsyncWindowContext,
-) -> Result<()> {
-    // Open all of the buffers of which excerpts were added to the editor.
-    let inserted_excerpt_buffer_ids = message
-        .inserted_excerpts
-        .iter()
-        .filter_map(|insertion| Some(insertion.excerpt.as_ref()?.buffer_id))
-        .collect::<HashSet<_>>();
-    let inserted_excerpt_buffers = project.update(cx, |project, cx| {
-        inserted_excerpt_buffer_ids
-            .into_iter()
-            .map(|id| BufferId::new(id).map(|id| project.open_buffer_by_id(id, cx)))
-            .collect::<Result<Vec<_>>>()
-    })??;
-    let _inserted_excerpt_buffers = try_join_all(inserted_excerpt_buffers).await?;
-
-    // Update the editor's excerpts.
-    this.update(cx, |editor, cx| {
-        editor.buffer.update(cx, |multibuffer, cx| {
-            let mut removed_excerpt_ids = message
-                .deleted_excerpts
-                .into_iter()
-                .map(ExcerptId::from_proto)
-                .collect::<Vec<_>>();
-            removed_excerpt_ids.sort_by({
-                let multibuffer = multibuffer.read(cx);
-                move |a, b| a.cmp(b, &multibuffer)
-            });
-
-            let mut insertions = message.inserted_excerpts.into_iter().peekable();
-            while let Some(insertion) = insertions.next() {
-                let Some(excerpt) = insertion.excerpt else {
-                    continue;
-                };
-                let Some(previous_excerpt_id) = insertion.previous_excerpt_id else {
-                    continue;
-                };
-                let buffer_id = BufferId::new(excerpt.buffer_id)?;
-                let Some(buffer) = project.read(cx).buffer_for_id(buffer_id, cx) else {
-                    continue;
-                };
-
-                let adjacent_excerpts = iter::from_fn(|| {
-                    let insertion = insertions.peek()?;
-                    if insertion.previous_excerpt_id.is_none()
-                        && insertion.excerpt.as_ref()?.buffer_id == u64::from(buffer_id)
-                    {
-                        insertions.next()?.excerpt
-                    } else {
-                        None
-                    }
-                });
-
-                multibuffer.insert_excerpts_with_ids_after(
-                    ExcerptId::from_proto(previous_excerpt_id),
-                    buffer,
-                    [excerpt]
-                        .into_iter()
-                        .chain(adjacent_excerpts)
-                        .filter_map(deserialize_excerpt_range),
-                    cx,
-                );
-            }
-
-            multibuffer.remove_excerpts(removed_excerpt_ids, cx);
-            anyhow::Ok(())
-        })
-    })??;
-
-    // Deserialize the editor state.
-    let selections = message
-        .selections
-        .into_iter()
-        .filter_map(deserialize_selection)
-        .collect::<Vec<_>>();
-    let pending_selection = message.pending_selection.and_then(deserialize_selection);
-    let scroll_top_anchor = message.scroll_top_anchor.and_then(deserialize_anchor);
-
-    // Wait until the buffer has received all of the operations referenced by
-    // the editor's new state.
-    this.update(cx, |editor, cx| {
-        editor.buffer.update(cx, |buffer, cx| {
-            buffer.wait_for_anchors(
-                selections
-                    .iter()
-                    .chain(pending_selection.as_ref())
-                    .flat_map(|selection| [selection.start, selection.end])
-                    .chain(scroll_top_anchor),
-                cx,
-            )
-        })
-    })?
-    .await?;
-
-    // Update the editor's state.
-    this.update_in(cx, |editor, window, cx| {
-        if !selections.is_empty() || pending_selection.is_some() {
-            editor.set_selections_from_remote(selections, pending_selection, window, cx);
-            editor.request_autoscroll_remotely(Autoscroll::newest(), cx);
-        } else if let Some(scroll_top_anchor) = scroll_top_anchor {
-            editor.set_scroll_anchor_remote(
-                ScrollAnchor {
-                    anchor: scroll_top_anchor,
-                    offset: point(message.scroll_x, message.scroll_y),
-                },
-                window,
-                cx,
-            );
-        }
-    })?;
-    Ok(())
-}
-
-fn serialize_excerpt(
-    buffer_id: BufferId,
-    id: &ExcerptId,
-    range: &ExcerptRange<language::Anchor>,
-) -> Option<proto::Excerpt> {
-    Some(proto::Excerpt {
-        id: id.to_proto(),
-        buffer_id: buffer_id.into(),
-        context_start: Some(serialize_text_anchor(&range.context.start)),
-        context_end: Some(serialize_text_anchor(&range.context.end)),
-        primary_start: Some(serialize_text_anchor(&range.primary.start)),
-        primary_end: Some(serialize_text_anchor(&range.primary.end)),
-    })
-}
-
-fn serialize_selection(
-    selection: &Selection<Anchor>,
-    buffer: &MultiBufferSnapshot,
-) -> proto::Selection {
-    proto::Selection {
-        id: selection.id as u64,
-        start: Some(serialize_anchor(&selection.start, buffer)),
-        end: Some(serialize_anchor(&selection.end, buffer)),
-        reversed: selection.reversed,
-    }
-}
-
-fn serialize_anchor(anchor: &Anchor, buffer: &MultiBufferSnapshot) -> proto::EditorAnchor {
-    proto::EditorAnchor {
-        excerpt_id: buffer.latest_excerpt_id(anchor.excerpt_id).to_proto(),
-        anchor: Some(serialize_text_anchor(&anchor.text_anchor)),
-    }
-}
-
-fn deserialize_excerpt_range(
-    excerpt: proto::Excerpt,
-) -> Option<(ExcerptId, ExcerptRange<language::Anchor>)> {
-    let context = {
-        let start = language::proto::deserialize_anchor(excerpt.context_start?)?;
-        let end = language::proto::deserialize_anchor(excerpt.context_end?)?;
-        start..end
-    };
-    let primary = excerpt
-        .primary_start
-        .zip(excerpt.primary_end)
-        .and_then(|(start, end)| {
-            let start = language::proto::deserialize_anchor(start)?;
-            let end = language::proto::deserialize_anchor(end)?;
-            Some(start..end)
-        })
-        .unwrap_or_else(|| context.clone());
-    Some((
-        ExcerptId::from_proto(excerpt.id),
-        ExcerptRange { context, primary },
-    ))
-}
-
-fn deserialize_selection(selection: proto::Selection) -> Option<Selection<Anchor>> {
-    Some(Selection {
-        id: selection.id as usize,
-        start: deserialize_anchor(selection.start?)?,
-        end: deserialize_anchor(selection.end?)?,
-        reversed: selection.reversed,
-        goal: SelectionGoal::None,
-    })
-}
-
-fn deserialize_anchor(anchor: proto::EditorAnchor) -> Option<Anchor> {
-    let excerpt_id = ExcerptId::from_proto(anchor.excerpt_id);
-    Some(Anchor::in_buffer(
-        excerpt_id,
-        language::proto::deserialize_anchor(anchor.anchor?)?,
-    ))
-}
-
-impl Item for Editor {
-    type Event = EditorEvent;
-
-    fn act_as_type<'a>(
-        &'a self,
-        type_id: TypeId,
-        self_handle: &'a Entity<Self>,
-        cx: &'a App,
-    ) -> Option<gpui::AnyEntity> {
-        if TypeId::of::<Self>() == type_id {
-            Some(self_handle.clone().into())
-        } else if TypeId::of::<MultiBuffer>() == type_id {
-            Some(self_handle.read(cx).buffer.clone().into())
-        } else {
-            None
-        }
-    }
-
-    fn navigate(
-        &mut self,
-        data: Box<dyn std::any::Any>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> bool {
-        if let Ok(data) = data.downcast::<NavigationData>() {
-            let newest_selection = self.selections.newest::<Point>(&self.display_snapshot(cx));
-            let buffer = self.buffer.read(cx).read(cx);
-            let offset = if buffer.can_resolve(&data.cursor_anchor) {
-                data.cursor_anchor.to_point(&buffer)
-            } else {
-                buffer.clip_point(data.cursor_position, Bias::Left)
-            };
-
-            let mut scroll_anchor = data.scroll_anchor;
-            if !buffer.can_resolve(&scroll_anchor.anchor) {
-                scroll_anchor.anchor = buffer.anchor_before(
-                    buffer.clip_point(Point::new(data.scroll_top_row, 0), Bias::Left),
-                );
-            }
-
-            drop(buffer);
-
-            if newest_selection.head() == offset {
-                false
-            } else {
-                self.set_scroll_anchor(scroll_anchor, window, cx);
-                self.change_selections(
-                    SelectionEffects::default().nav_history(false),
-                    window,
-                    cx,
-                    |s| s.select_ranges([offset..offset]),
-                );
-                true
-            }
-        } else {
-            false
-        }
-    }
-
-    fn tab_tooltip_text(&self, cx: &App) -> Option<SharedString> {
-        self.buffer()
-            .read(cx)
-            .as_singleton()
-            .and_then(|buffer| buffer.read(cx).file())
-            .and_then(|file| File::from_dyn(Some(file)))
-            .map(|file| {
-                file.worktree
-                    .read(cx)
-                    .absolutize(&file.path)
-                    .compact()
-                    .to_string_lossy()
-                    .into_owned()
-                    .into()
-            })
-    }
-
-    fn telemetry_event_text(&self) -> Option<&'static str> {
-        None
-    }
-
-    fn tab_content_text(&self, detail: usize, cx: &App) -> SharedString {
-        if let Some(path) = path_for_buffer(&self.buffer, detail, true, cx) {
-            path.to_string().into()
-        } else {
-            // Use the same logic as the displayed title for consistency
-            self.buffer.read(cx).title(cx).to_string().into()
-        }
-    }
-
-    fn suggested_filename(&self, cx: &App) -> SharedString {
-        self.buffer.read(cx).title(cx).to_string().into()
-    }
-
-    fn tab_icon(&self, _: &Window, cx: &App) -> Option<Icon> {
-        ItemSettings::get_global(cx)
-            .file_icons
-            .then(|| {
-                path_for_buffer(&self.buffer, 0, true, cx)
-                    .and_then(|path| FileIcons::get_icon(Path::new(&*path), cx))
-            })
-            .flatten()
-            .map(Icon::from_path)
-    }
-
-    fn tab_content(&self, params: TabContentParams, _: &Window, cx: &App) -> AnyElement {
-        let label_color = if ItemSettings::get_global(cx).git_status {
-            self.buffer()
-                .read(cx)
-                .as_singleton()
-                .and_then(|buffer| {
-                    let buffer = buffer.read(cx);
-                    let path = buffer.project_path(cx)?;
-                    let buffer_id = buffer.remote_id();
-                    let project = self.project()?.read(cx);
-                    let entry = project.entry_for_path(&path, cx)?;
-                    let (repo, repo_path) = project
-                        .git_store()
-                        .read(cx)
-                        .repository_and_path_for_buffer_id(buffer_id, cx)?;
-                    let status = repo.read(cx).status_for_path(&repo_path)?.status;
-
-                    Some(entry_git_aware_label_color(
-                        status.summary(),
-                        entry.is_ignored,
-                        params.selected,
-                    ))
-                })
-                .unwrap_or_else(|| entry_label_color(params.selected))
-        } else {
-            entry_label_color(params.selected)
-        };
-
-        let description = params.detail.and_then(|detail| {
-            let path = path_for_buffer(&self.buffer, detail, false, cx)?;
-            let description = path.trim();
-
-            if description.is_empty() {
-                return None;
-            }
-
-            Some(util::truncate_and_trailoff(description, MAX_TAB_TITLE_LEN))
-        });
-
-        // Whether the file was saved in the past but is now deleted.
-        let was_deleted: bool = self
-            .buffer()
-            .read(cx)
-            .as_singleton()
-            .and_then(|buffer| buffer.read(cx).file())
-            .is_some_and(|file| file.disk_state() == DiskState::Deleted);
-
-        h_flex()
-            .gap_2()
-            .child(
-                Label::new(self.title(cx).to_string())
-                    .color(label_color)
-                    .when(params.preview, |this| this.italic())
-                    .when(was_deleted, |this| this.strikethrough()),
-            )
-            .when_some(description, |this, description| {
-                this.child(
-                    Label::new(description)
-                        .size(LabelSize::XSmall)
-                        .color(Color::Muted),
-                )
-            })
-            .into_any_element()
-    }
-
-    fn for_each_project_item(
-        &self,
-        cx: &App,
-        f: &mut dyn FnMut(EntityId, &dyn project::ProjectItem),
-    ) {
-        self.buffer
-            .read(cx)
-            .for_each_buffer(|buffer| f(buffer.entity_id(), buffer.read(cx)));
-    }
-
-    fn buffer_kind(&self, cx: &App) -> ItemBufferKind {
-        match self.buffer.read(cx).is_singleton() {
-            true => ItemBufferKind::Singleton,
-            false => ItemBufferKind::Multibuffer,
-        }
-    }
-
-    fn can_save_as(&self, cx: &App) -> bool {
-        self.buffer.read(cx).is_singleton()
-    }
-
-    fn can_split(&self) -> bool {
-        true
-    }
-
-    fn clone_on_split(
-        &self,
-        _workspace_id: Option<WorkspaceId>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Option<Entity<Editor>>>
-    where
-        Self: Sized,
-    {
-        Task::ready(Some(cx.new(|cx| self.clone(window, cx))))
-    }
-
-    fn set_nav_history(
-        &mut self,
-        history: ItemNavHistory,
-        _window: &mut Window,
-        _: &mut Context<Self>,
-    ) {
-        self.nav_history = Some(history);
-    }
-
-    fn on_removed(&self, cx: &App) {
-        self.report_editor_event(ReportEditorEvent::Closed, None, cx);
-    }
-
-    fn deactivated(&mut self, _: &mut Window, cx: &mut Context<Self>) {
-        let selection = self.selections.newest_anchor();
-        self.push_to_nav_history(selection.head(), None, true, false, cx);
-    }
-
-    fn workspace_deactivated(&mut self, _: &mut Window, cx: &mut Context<Self>) {
-        self.hide_hovered_link(cx);
-    }
-
-    fn is_dirty(&self, cx: &App) -> bool {
-        self.buffer().read(cx).read(cx).is_dirty()
-    }
-
-    fn has_deleted_file(&self, cx: &App) -> bool {
-        self.buffer().read(cx).read(cx).has_deleted_file()
-    }
-
-    fn has_conflict(&self, cx: &App) -> bool {
-        self.buffer().read(cx).read(cx).has_conflict()
-    }
-
-    fn can_save(&self, cx: &App) -> bool {
-        let buffer = &self.buffer().read(cx);
-        if let Some(buffer) = buffer.as_singleton() {
-            buffer.read(cx).project_path(cx).is_some()
-        } else {
-            true
-        }
-    }
-
-    fn save(
-        &mut self,
-        options: SaveOptions,
-        project: Entity<Project>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        // Add meta data tracking # of auto saves
-        if options.autosave {
-            self.report_editor_event(ReportEditorEvent::Saved { auto_saved: true }, None, cx);
-        } else {
-            self.report_editor_event(ReportEditorEvent::Saved { auto_saved: false }, None, cx);
-        }
-
-        let buffers = self.buffer().clone().read(cx).all_buffers();
-        let buffers = buffers
-            .into_iter()
-            .map(|handle| handle.read(cx).base_buffer().unwrap_or(handle.clone()))
-            .collect::<HashSet<_>>();
-
-        // let mut buffers_to_save =
-        let buffers_to_save = if self.buffer.read(cx).is_singleton() && !options.autosave {
-            buffers
-        } else {
-            buffers
-                .into_iter()
-                .filter(|buffer| buffer.read(cx).is_dirty())
-                .collect()
-        };
-
-        cx.spawn_in(window, async move |this, cx| {
-            if options.format {
-                this.update_in(cx, |editor, window, cx| {
-                    editor.perform_format(
-                        project.clone(),
-                        FormatTrigger::Save,
-                        FormatTarget::Buffers(buffers_to_save.clone()),
-                        window,
-                        cx,
-                    )
-                })?
-                .await?;
-            }
-
-            if !buffers_to_save.is_empty() {
-                project
-                    .update(cx, |project, cx| {
-                        project.save_buffers(buffers_to_save.clone(), cx)
-                    })?
-                    .await?;
-            }
-
-            Ok(())
-        })
-    }
-
-    fn save_as(
-        &mut self,
-        project: Entity<Project>,
-        path: ProjectPath,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let buffer = self
-            .buffer()
-            .read(cx)
-            .as_singleton()
-            .expect("cannot call save_as on an excerpt list");
-
-        let file_extension = path.path.extension().map(|a| a.to_string());
-        self.report_editor_event(
-            ReportEditorEvent::Saved { auto_saved: false },
-            file_extension,
-            cx,
-        );
-
-        project.update(cx, |project, cx| project.save_buffer_as(buffer, path, cx))
-    }
-
-    fn reload(
-        &mut self,
-        project: Entity<Project>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let buffer = self.buffer().clone();
-        let buffers = self.buffer.read(cx).all_buffers();
-        let reload_buffers =
-            project.update(cx, |project, cx| project.reload_buffers(buffers, true, cx));
-        cx.spawn_in(window, async move |this, cx| {
-            let transaction = reload_buffers.log_err().await;
-            this.update(cx, |editor, cx| {
-                editor.request_autoscroll(Autoscroll::fit(), cx)
-            })?;
-            buffer
-                .update(cx, |buffer, cx| {
-                    if let Some(transaction) = transaction
-                        && !buffer.is_singleton()
-                    {
-                        buffer.push_transaction(&transaction.0, cx);
-                    }
-                })
-                .ok();
-            Ok(())
-        })
-    }
-
-    fn as_searchable(
-        &self,
-        handle: &Entity<Self>,
-        _: &App,
-    ) -> Option<Box<dyn SearchableItemHandle>> {
-        Some(Box::new(handle.clone()))
-    }
-
-    fn pixel_position_of_cursor(&self, _: &App) -> Option<gpui::Point<Pixels>> {
-        self.pixel_position_of_newest_cursor
-    }
-
-    fn breadcrumb_location(&self, _: &App) -> ToolbarItemLocation {
-        if self.show_breadcrumbs {
-            ToolbarItemLocation::PrimaryLeft
-        } else {
-            ToolbarItemLocation::Hidden
-        }
-    }
-
-    fn breadcrumbs(&self, variant: &Theme, cx: &App) -> Option<Vec<BreadcrumbText>> {
-        let cursor = self.selections.newest_anchor().head();
-        let multibuffer = self.buffer().read(cx);
-        let (buffer_id, symbols) = multibuffer
-            .read(cx)
-            .symbols_containing(cursor, Some(variant.syntax()))?;
-        let buffer = multibuffer.buffer(buffer_id)?;
-
-        let buffer = buffer.read(cx);
-        let text = self.breadcrumb_header.clone().unwrap_or_else(|| {
-            buffer
-                .snapshot()
-                .resolve_file_path(
-                    self.project
-                        .as_ref()
-                        .map(|project| project.read(cx).visible_worktrees(cx).count() > 1)
-                        .unwrap_or_default(),
-                    cx,
-                )
-                .unwrap_or_else(|| {
-                    if multibuffer.is_singleton() {
-                        multibuffer.title(cx).to_string()
-                    } else {
-                        "untitled".to_string()
-                    }
-                })
-        });
-
-        let settings = ThemeSettings::get_global(cx);
-
-        let mut breadcrumbs = vec![BreadcrumbText {
-            text,
-            highlights: None,
-            font: Some(settings.buffer_font.clone()),
-        }];
-
-        breadcrumbs.extend(symbols.into_iter().map(|symbol| BreadcrumbText {
-            text: symbol.text,
-            highlights: Some(symbol.highlight_ranges),
-            font: Some(settings.buffer_font.clone()),
-        }));
-        Some(breadcrumbs)
-    }
-
-    fn added_to_workspace(
-        &mut self,
-        workspace: &mut Workspace,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.workspace = Some((workspace.weak_handle(), workspace.database_id()));
-        if let Some(workspace) = &workspace.weak_handle().upgrade() {
-            cx.subscribe(workspace, |editor, _, event: &workspace::Event, _cx| {
-                if let workspace::Event::ModalOpened = event {
-                    editor.mouse_context_menu.take();
-                    editor.inline_blame_popover.take();
-                }
-            })
-            .detach();
-        }
-    }
-
-    fn to_item_events(event: &EditorEvent, mut f: impl FnMut(ItemEvent)) {
-        match event {
-            EditorEvent::Saved | EditorEvent::TitleChanged => {
-                f(ItemEvent::UpdateTab);
-                f(ItemEvent::UpdateBreadcrumbs);
-            }
-
-            EditorEvent::Reparsed(_) => {
-                f(ItemEvent::UpdateBreadcrumbs);
-            }
-
-            EditorEvent::SelectionsChanged { local } if *local => {
-                f(ItemEvent::UpdateBreadcrumbs);
-            }
-
-            EditorEvent::BreadcrumbsChanged => {
-                f(ItemEvent::UpdateBreadcrumbs);
-            }
-
-            EditorEvent::DirtyChanged => {
-                f(ItemEvent::UpdateTab);
-            }
-
-            EditorEvent::BufferEdited => {
-                f(ItemEvent::Edit);
-                f(ItemEvent::UpdateBreadcrumbs);
-            }
-
-            EditorEvent::ExcerptsAdded { .. } | EditorEvent::ExcerptsRemoved { .. } => {
-                f(ItemEvent::Edit);
-            }
-
-            _ => {}
-        }
-    }
-
-    fn preserve_preview(&self, cx: &App) -> bool {
-        self.buffer.read(cx).preserve_preview(cx)
-    }
-}
-
-impl SerializableItem for Editor {
-    fn serialized_item_kind() -> &'static str {
-        "Editor"
-    }
-
-    fn cleanup(
-        workspace_id: WorkspaceId,
-        alive_items: Vec<ItemId>,
-        _window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<()>> {
-        workspace::delete_unloaded_items(alive_items, workspace_id, "editors", &DB, cx)
-    }
-
-    fn deserialize(
-        project: Entity<Project>,
-        workspace: WeakEntity<Workspace>,
-        workspace_id: workspace::WorkspaceId,
-        item_id: ItemId,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<Entity<Self>>> {
-        let serialized_editor = match DB
-            .get_serialized_editor(item_id, workspace_id)
-            .context("Failed to query editor state")
-        {
-            Ok(Some(serialized_editor)) => {
-                if ProjectSettings::get_global(cx)
-                    .session
-                    .restore_unsaved_buffers
-                {
-                    serialized_editor
-                } else {
-                    SerializedEditor {
-                        abs_path: serialized_editor.abs_path,
-                        contents: None,
-                        language: None,
-                        mtime: None,
-                    }
-                }
-            }
-            Ok(None) => {
-                return Task::ready(Err(anyhow!(
-                    "Unable to deserialize editor: No entry in database for item_id: {item_id} and workspace_id {workspace_id:?}"
-                )));
-            }
-            Err(error) => {
-                return Task::ready(Err(error));
-            }
-        };
-        log::debug!(
-            "Deserialized editor {item_id:?} in workspace {workspace_id:?}, {serialized_editor:?}"
-        );
-
-        match serialized_editor {
-            SerializedEditor {
-                abs_path: None,
-                contents: Some(contents),
-                language,
-                ..
-            } => window.spawn(cx, {
-                let project = project.clone();
-                async move |cx| {
-                    let language_registry =
-                        project.read_with(cx, |project, _| project.languages().clone())?;
-
-                    let language = if let Some(language_name) = language {
-                        // We don't fail here, because we'd rather not set the language if the name changed
-                        // than fail to restore the buffer.
-                        language_registry
-                            .language_for_name(&language_name)
-                            .await
-                            .ok()
-                    } else {
-                        None
-                    };
-
-                    // First create the empty buffer
-                    let buffer = project
-                        .update(cx, |project, cx| project.create_buffer(true, cx))?
-                        .await
-                        .context("Failed to create buffer while deserializing editor")?;
-
-                    // Then set the text so that the dirty bit is set correctly
-                    buffer.update(cx, |buffer, cx| {
-                        buffer.set_language_registry(language_registry);
-                        if let Some(language) = language {
-                            buffer.set_language(Some(language), cx);
-                        }
-                        buffer.set_text(contents, cx);
-                        if let Some(entry) = buffer.peek_undo_stack() {
-                            buffer.forget_transaction(entry.transaction_id());
-                        }
-                    })?;
-
-                    cx.update(|window, cx| {
-                        cx.new(|cx| {
-                            let mut editor = Editor::for_buffer(buffer, Some(project), window, cx);
-
-                            editor.read_metadata_from_db(item_id, workspace_id, window, cx);
-                            editor
-                        })
-                    })
-                }
-            }),
-            SerializedEditor {
-                abs_path: Some(abs_path),
-                contents,
-                mtime,
-                ..
-            } => {
-                let opened_buffer = project.update(cx, |project, cx| {
-                    let (worktree, path) = project.find_worktree(&abs_path, cx)?;
-                    let project_path = ProjectPath {
-                        worktree_id: worktree.read(cx).id(),
-                        path: path,
-                    };
-                    Some(project.open_path(project_path, cx))
-                });
-
-                match opened_buffer {
-                    Some(opened_buffer) => {
-                        window.spawn(cx, async move |cx| {
-                            let (_, buffer) = opened_buffer
-                                .await
-                                .context("Failed to open path in project")?;
-
-                            // This is a bit wasteful: we're loading the whole buffer from
-                            // disk and then overwrite the content.
-                            // But for now, it keeps the implementation of the content serialization
-                            // simple, because we don't have to persist all of the metadata that we get
-                            // by loading the file (git diff base, ...).
-                            if let Some(buffer_text) = contents {
-                                buffer.update(cx, |buffer, cx| {
-                                    // If we did restore an mtime, we want to store it on the buffer
-                                    // so that the next edit will mark the buffer as dirty/conflicted.
-                                    if mtime.is_some() {
-                                        buffer.did_reload(
-                                            buffer.version(),
-                                            buffer.line_ending(),
-                                            mtime,
-                                            cx,
-                                        );
-                                    }
-                                    buffer.set_text(buffer_text, cx);
-                                    if let Some(entry) = buffer.peek_undo_stack() {
-                                        buffer.forget_transaction(entry.transaction_id());
-                                    }
-                                })?;
-                            }
-
-                            cx.update(|window, cx| {
-                                cx.new(|cx| {
-                                    let mut editor =
-                                        Editor::for_buffer(buffer, Some(project), window, cx);
-
-                                    editor.read_metadata_from_db(item_id, workspace_id, window, cx);
-                                    editor
-                                })
-                            })
-                        })
-                    }
-                    None => {
-                        let open_by_abs_path = workspace.update(cx, |workspace, cx| {
-                            workspace.open_abs_path(
-                                abs_path.clone(),
-                                OpenOptions {
-                                    visible: Some(OpenVisible::None),
-                                    ..Default::default()
-                                },
-                                window,
-                                cx,
-                            )
-                        });
-                        window.spawn(cx, async move |cx| {
-                            let editor = open_by_abs_path?.await?.downcast::<Editor>().with_context(|| format!("Failed to downcast to Editor after opening abs path {abs_path:?}"))?;
-                            editor.update_in(cx, |editor, window, cx| {
-                                editor.read_metadata_from_db(item_id, workspace_id, window, cx);
-                            })?;
-                            Ok(editor)
-                        })
-                    }
-                }
-            }
-            SerializedEditor {
-                abs_path: None,
-                contents: None,
-                ..
-            } => window.spawn(cx, async move |cx| {
-                let buffer = project
-                    .update(cx, |project, cx| project.create_buffer(true, cx))?
-                    .await
-                    .context("Failed to create buffer")?;
-
-                cx.update(|window, cx| {
-                    cx.new(|cx| {
-                        let mut editor = Editor::for_buffer(buffer, Some(project), window, cx);
-
-                        editor.read_metadata_from_db(item_id, workspace_id, window, cx);
-                        editor
-                    })
-                })
-            }),
-        }
-    }
-
-    fn serialize(
-        &mut self,
-        workspace: &mut Workspace,
-        item_id: ItemId,
-        closing: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Task<Result<()>>> {
-        let buffer_serialization = self.buffer_serialization?;
-        let project = self.project.clone()?;
-
-        let serialize_dirty_buffers = match buffer_serialization {
-            // If we don't have a worktree, we don't serialize, because
-            // projects without worktrees aren't deserialized.
-            BufferSerialization::All => project.read(cx).visible_worktrees(cx).next().is_some(),
-            BufferSerialization::NonDirtyBuffers => false,
-        };
-
-        if closing && !serialize_dirty_buffers {
-            return None;
-        }
-
-        let workspace_id = workspace.database_id()?;
-
-        let buffer = self.buffer().read(cx).as_singleton()?;
-
-        let abs_path = buffer.read(cx).file().and_then(|file| {
-            let worktree_id = file.worktree_id(cx);
-            project
-                .read(cx)
-                .worktree_for_id(worktree_id, cx)
-                .map(|worktree| worktree.read(cx).absolutize(file.path()))
-                .or_else(|| {
-                    let full_path = file.full_path(cx);
-                    let project_path = project.read(cx).find_project_path(&full_path, cx)?;
-                    project.read(cx).absolute_path(&project_path, cx)
-                })
-        });
-
-        let is_dirty = buffer.read(cx).is_dirty();
-        let mtime = buffer.read(cx).saved_mtime();
-
-        let snapshot = buffer.read(cx).snapshot();
-
-        Some(cx.spawn_in(window, async move |_this, cx| {
-            cx.background_spawn(async move {
-                let (contents, language) = if serialize_dirty_buffers && is_dirty {
-                    let contents = snapshot.text();
-                    let language = snapshot.language().map(|lang| lang.name().to_string());
-                    (Some(contents), language)
-                } else {
-                    (None, None)
-                };
-
-                let editor = SerializedEditor {
-                    abs_path,
-                    contents,
-                    language,
-                    mtime,
-                };
-                log::debug!("Serializing editor {item_id:?} in workspace {workspace_id:?}");
-                DB.save_serialized_editor(item_id, workspace_id, editor)
-                    .await
-                    .context("failed to save serialized editor")
-            })
-            .await
-            .context("failed to save contents of buffer")?;
-
-            Ok(())
-        }))
-    }
-
-    fn should_serialize(&self, event: &Self::Event) -> bool {
-        self.should_serialize_buffer()
-            && matches!(
-                event,
-                EditorEvent::Saved | EditorEvent::DirtyChanged | EditorEvent::BufferEdited
-            )
-    }
-}
-
-#[derive(Debug, Default)]
-struct EditorRestorationData {
-    entries: HashMap<PathBuf, RestorationData>,
-}
-
-#[derive(Default, Debug)]
-pub struct RestorationData {
-    pub scroll_position: (BufferRow, gpui::Point<ScrollOffset>),
-    pub folds: Vec<Range<Point>>,
-    pub selections: Vec<Range<Point>>,
-}
-
-impl ProjectItem for Editor {
-    type Item = Buffer;
-
-    fn project_item_kind() -> Option<ProjectItemKind> {
-        Some(ProjectItemKind("Editor"))
-    }
-
-    fn for_project_item(
-        project: Entity<Project>,
-        pane: Option<&Pane>,
-        buffer: Entity<Buffer>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let mut editor = Self::for_buffer(buffer.clone(), Some(project), window, cx);
-        if let Some((excerpt_id, _, snapshot)) =
-            editor.buffer().read(cx).snapshot(cx).as_singleton()
-            && WorkspaceSettings::get(None, cx).restore_on_file_reopen
-            && let Some(restoration_data) = Self::project_item_kind()
-                .and_then(|kind| pane.as_ref()?.project_item_restoration_data.get(&kind))
-                .and_then(|data| data.downcast_ref::<EditorRestorationData>())
-                .and_then(|data| {
-                    let file = project::File::from_dyn(buffer.read(cx).file())?;
-                    data.entries.get(&file.abs_path(cx))
-                })
-        {
-            editor.fold_ranges(
-                clip_ranges(&restoration_data.folds, snapshot),
-                false,
-                window,
-                cx,
-            );
-            if !restoration_data.selections.is_empty() {
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.select_ranges(clip_ranges(&restoration_data.selections, snapshot));
-                });
-            }
-            let (top_row, offset) = restoration_data.scroll_position;
-            let anchor =
-                Anchor::in_buffer(*excerpt_id, snapshot.anchor_before(Point::new(top_row, 0)));
-            editor.set_scroll_anchor(ScrollAnchor { anchor, offset }, window, cx);
-        }
-
-        editor
-    }
-
-    fn for_broken_project_item(
-        abs_path: &Path,
-        is_local: bool,
-        e: &anyhow::Error,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<InvalidItemView> {
-        Some(InvalidItemView::new(abs_path, is_local, e, window, cx))
-    }
-}
-
-fn clip_ranges<'a>(
-    original: impl IntoIterator<Item = &'a Range<Point>> + 'a,
-    snapshot: &'a BufferSnapshot,
-) -> Vec<Range<Point>> {
-    original
-        .into_iter()
-        .map(|range| {
-            snapshot.clip_point(range.start, Bias::Left)
-                ..snapshot.clip_point(range.end, Bias::Right)
-        })
-        .collect()
-}
-
-impl EventEmitter<SearchEvent> for Editor {}
-
-impl Editor {
-    pub fn update_restoration_data(
-        &self,
-        cx: &mut Context<Self>,
-        write: impl for<'a> FnOnce(&'a mut RestorationData) + 'static,
-    ) {
-        if self.mode.is_minimap() || !WorkspaceSettings::get(None, cx).restore_on_file_reopen {
-            return;
-        }
-
-        let editor = cx.entity();
-        cx.defer(move |cx| {
-            editor.update(cx, |editor, cx| {
-                let kind = Editor::project_item_kind()?;
-                let pane = editor.workspace()?.read(cx).pane_for(&cx.entity())?;
-                let buffer = editor.buffer().read(cx).as_singleton()?;
-                let file_abs_path = project::File::from_dyn(buffer.read(cx).file())?.abs_path(cx);
-                pane.update(cx, |pane, _| {
-                    let data = pane
-                        .project_item_restoration_data
-                        .entry(kind)
-                        .or_insert_with(|| Box::new(EditorRestorationData::default()) as Box<_>);
-                    let data = match data.downcast_mut::<EditorRestorationData>() {
-                        Some(data) => data,
-                        None => {
-                            *data = Box::new(EditorRestorationData::default());
-                            data.downcast_mut::<EditorRestorationData>()
-                                .expect("just written the type downcasted to")
-                        }
-                    };
-
-                    let data = data.entries.entry(file_abs_path).or_default();
-                    write(data);
-                    Some(())
-                })
-            });
-        });
-    }
-}
-
-pub(crate) enum BufferSearchHighlights {}
-impl SearchableItem for Editor {
-    type Match = Range<Anchor>;
-
-    fn get_matches(&self, _window: &mut Window, _: &mut App) -> Vec<Range<Anchor>> {
-        self.background_highlights
-            .get(&HighlightKey::Type(TypeId::of::<BufferSearchHighlights>()))
-            .map_or(Vec::new(), |(_color, ranges)| {
-                ranges.iter().cloned().collect()
-            })
-    }
-
-    fn clear_matches(&mut self, _: &mut Window, cx: &mut Context<Self>) {
-        if self
-            .clear_background_highlights::<BufferSearchHighlights>(cx)
-            .is_some()
-        {
-            cx.emit(SearchEvent::MatchesInvalidated);
-        }
-    }
-
-    fn update_matches(
-        &mut self,
-        matches: &[Range<Anchor>],
-        active_match_index: Option<usize>,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let existing_range = self
-            .background_highlights
-            .get(&HighlightKey::Type(TypeId::of::<BufferSearchHighlights>()))
-            .map(|(_, range)| range.as_ref());
-        let updated = existing_range != Some(matches);
-        self.highlight_background::<BufferSearchHighlights>(
-            matches,
-            move |index, theme| {
-                if active_match_index == Some(*index) {
-                    theme.colors().search_active_match_background
-                } else {
-                    theme.colors().search_match_background
-                }
-            },
-            cx,
-        );
-        if updated {
-            cx.emit(SearchEvent::MatchesInvalidated);
-        }
-    }
-
-    fn has_filtered_search_ranges(&mut self) -> bool {
-        self.has_background_highlights::<SearchWithinRange>()
-    }
-
-    fn toggle_filtered_search_ranges(
-        &mut self,
-        enabled: Option<FilteredSearchRange>,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.has_filtered_search_ranges() {
-            self.previous_search_ranges = self
-                .clear_background_highlights::<SearchWithinRange>(cx)
-                .map(|(_, ranges)| ranges)
-        }
-
-        if let Some(range) = enabled {
-            let ranges = self.selections.disjoint_anchor_ranges().collect::<Vec<_>>();
-
-            if ranges.iter().any(|s| s.start != s.end) {
-                self.set_search_within_ranges(&ranges, cx);
-            } else if let Some(previous_search_ranges) = self.previous_search_ranges.take()
-                && range != FilteredSearchRange::Selection
-            {
-                self.set_search_within_ranges(&previous_search_ranges, cx);
-            }
-        }
-    }
-
-    fn supported_options(&self) -> SearchOptions {
-        if self.in_project_search {
-            SearchOptions {
-                case: true,
-                word: true,
-                regex: true,
-                replacement: false,
-                selection: false,
-                find_in_results: true,
-            }
-        } else {
-            SearchOptions {
-                case: true,
-                word: true,
-                regex: true,
-                replacement: true,
-                selection: true,
-                find_in_results: false,
-            }
-        }
-    }
-
-    fn query_suggestion(&mut self, window: &mut Window, cx: &mut Context<Self>) -> String {
-        let setting = EditorSettings::get_global(cx).seed_search_query_from_cursor;
-        let snapshot = self.snapshot(window, cx);
-        let selection = self.selections.newest_adjusted(&snapshot.display_snapshot);
-        let buffer_snapshot = snapshot.buffer_snapshot();
-
-        match setting {
-            SeedQuerySetting::Never => String::new(),
-            SeedQuerySetting::Selection | SeedQuerySetting::Always if !selection.is_empty() => {
-                let text: String = buffer_snapshot
-                    .text_for_range(selection.start..selection.end)
-                    .collect();
-                if text.contains('\n') {
-                    String::new()
-                } else {
-                    text
-                }
-            }
-            SeedQuerySetting::Selection => String::new(),
-            SeedQuerySetting::Always => {
-                let (range, kind) = buffer_snapshot
-                    .surrounding_word(selection.start, Some(CharScopeContext::Completion));
-                if kind == Some(CharKind::Word) {
-                    let text: String = buffer_snapshot.text_for_range(range).collect();
-                    if !text.trim().is_empty() {
-                        return text;
-                    }
-                }
-                String::new()
-            }
-        }
-    }
-
-    fn activate_match(
-        &mut self,
-        index: usize,
-        matches: &[Range<Anchor>],
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.unfold_ranges(&[matches[index].clone()], false, true, cx);
-        let range = self.range_for_match(&matches[index]);
-        let autoscroll = if EditorSettings::get_global(cx).search.center_on_match {
-            Autoscroll::center()
-        } else {
-            Autoscroll::fit()
-        };
-        self.change_selections(SelectionEffects::scroll(autoscroll), window, cx, |s| {
-            s.select_ranges([range]);
-        })
-    }
-
-    fn select_matches(
-        &mut self,
-        matches: &[Self::Match],
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.unfold_ranges(matches, false, false, cx);
-        self.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges(matches.iter().cloned())
-        });
-    }
-    fn replace(
-        &mut self,
-        identifier: &Self::Match,
-        query: &SearchQuery,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let text = self.buffer.read(cx);
-        let text = text.snapshot(cx);
-        let text = text.text_for_range(identifier.clone()).collect::<Vec<_>>();
-        let text: Cow<_> = if text.len() == 1 {
-            text.first().cloned().unwrap().into()
-        } else {
-            let joined_chunks = text.join("");
-            joined_chunks.into()
-        };
-
-        if let Some(replacement) = query.replacement_for(&text) {
-            self.transact(window, cx, |this, _, cx| {
-                this.edit([(identifier.clone(), Arc::from(&*replacement))], cx);
-            });
-        }
-    }
-    fn replace_all(
-        &mut self,
-        matches: &mut dyn Iterator<Item = &Self::Match>,
-        query: &SearchQuery,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let text = self.buffer.read(cx);
-        let text = text.snapshot(cx);
-        let mut edits = vec![];
-
-        for m in matches {
-            let text = text.text_for_range(m.clone()).collect::<Vec<_>>();
-
-            let text: Cow<_> = if text.len() == 1 {
-                text.first().cloned().unwrap().into()
-            } else {
-                let joined_chunks = text.join("");
-                joined_chunks.into()
-            };
-
-            if let Some(replacement) = query.replacement_for(&text) {
-                edits.push((m.clone(), Arc::from(&*replacement)));
-            }
-        }
-
-        if !edits.is_empty() {
-            self.transact(window, cx, |this, _, cx| {
-                this.edit(edits, cx);
-            });
-        }
-    }
-    fn match_index_for_direction(
-        &mut self,
-        matches: &[Range<Anchor>],
-        current_index: usize,
-        direction: Direction,
-        count: usize,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> usize {
-        let buffer = self.buffer().read(cx).snapshot(cx);
-        let current_index_position = if self.selections.disjoint_anchors_arc().len() == 1 {
-            self.selections.newest_anchor().head()
-        } else {
-            matches[current_index].start
-        };
-
-        let mut count = count % matches.len();
-        if count == 0 {
-            return current_index;
-        }
-        match direction {
-            Direction::Next => {
-                if matches[current_index]
-                    .start
-                    .cmp(&current_index_position, &buffer)
-                    .is_gt()
-                {
-                    count -= 1
-                }
-
-                (current_index + count) % matches.len()
-            }
-            Direction::Prev => {
-                if matches[current_index]
-                    .end
-                    .cmp(&current_index_position, &buffer)
-                    .is_lt()
-                {
-                    count -= 1;
-                }
-
-                if current_index >= count {
-                    current_index - count
-                } else {
-                    matches.len() - (count - current_index)
-                }
-            }
-        }
-    }
-
-    fn find_matches(
-        &mut self,
-        query: Arc<project::search::SearchQuery>,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Vec<Range<Anchor>>> {
-        let buffer = self.buffer().read(cx).snapshot(cx);
-        let search_within_ranges = self
-            .background_highlights
-            .get(&HighlightKey::Type(TypeId::of::<SearchWithinRange>()))
-            .map_or(vec![], |(_color, ranges)| {
-                ranges.iter().cloned().collect::<Vec<_>>()
-            });
-
-        cx.background_spawn(async move {
-            let mut ranges = Vec::new();
-
-            let search_within_ranges = if search_within_ranges.is_empty() {
-                vec![buffer.anchor_before(MultiBufferOffset(0))..buffer.anchor_after(buffer.len())]
-            } else {
-                search_within_ranges
-            };
-
-            for range in search_within_ranges {
-                for (search_buffer, search_range, excerpt_id, deleted_hunk_anchor) in
-                    buffer.range_to_buffer_ranges_with_deleted_hunks(range)
-                {
-                    ranges.extend(
-                        query
-                            .search(
-                                search_buffer,
-                                Some(search_range.start.0..search_range.end.0),
-                            )
-                            .await
-                            .into_iter()
-                            .map(|match_range| {
-                                if let Some(deleted_hunk_anchor) = deleted_hunk_anchor {
-                                    let start = search_buffer
-                                        .anchor_after(search_range.start + match_range.start);
-                                    let end = search_buffer
-                                        .anchor_before(search_range.start + match_range.end);
-                                    deleted_hunk_anchor.with_diff_base_anchor(start)
-                                        ..deleted_hunk_anchor.with_diff_base_anchor(end)
-                                } else {
-                                    let start = search_buffer
-                                        .anchor_after(search_range.start + match_range.start);
-                                    let end = search_buffer
-                                        .anchor_before(search_range.start + match_range.end);
-                                    Anchor::range_in_buffer(excerpt_id, start..end)
-                                }
-                            }),
-                    );
-                }
-            }
-
-            ranges
-        })
-    }
-
-    fn active_match_index(
-        &mut self,
-        direction: Direction,
-        matches: &[Range<Anchor>],
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<usize> {
-        active_match_index(
-            direction,
-            matches,
-            &self.selections.newest_anchor().head(),
-            &self.buffer().read(cx).snapshot(cx),
-        )
-    }
-
-    fn search_bar_visibility_changed(&mut self, _: bool, _: &mut Window, _: &mut Context<Self>) {
-        self.expect_bounds_change = self.last_bounds;
-    }
-
-    fn set_search_is_case_sensitive(
-        &mut self,
-        case_sensitive: Option<bool>,
-        _cx: &mut Context<Self>,
-    ) {
-        self.select_next_is_case_sensitive = case_sensitive;
-    }
-}
-
-pub fn active_match_index(
-    direction: Direction,
-    ranges: &[Range<Anchor>],
-    cursor: &Anchor,
-    buffer: &MultiBufferSnapshot,
-) -> Option<usize> {
-    if ranges.is_empty() {
-        None
-    } else {
-        let r = ranges.binary_search_by(|probe| {
-            if probe.end.cmp(cursor, buffer).is_lt() {
-                Ordering::Less
-            } else if probe.start.cmp(cursor, buffer).is_gt() {
-                Ordering::Greater
-            } else {
-                Ordering::Equal
-            }
-        });
-        match direction {
-            Direction::Prev => match r {
-                Ok(i) => Some(i),
-                Err(i) => Some(i.saturating_sub(1)),
-            },
-            Direction::Next => match r {
-                Ok(i) | Err(i) => Some(cmp::min(i, ranges.len() - 1)),
-            },
-        }
-    }
-}
-
-pub fn entry_label_color(selected: bool) -> Color {
-    if selected {
-        Color::Default
-    } else {
-        Color::Muted
-    }
-}
-
-pub fn entry_diagnostic_aware_icon_name_and_color(
-    diagnostic_severity: Option<DiagnosticSeverity>,
-) -> Option<(IconName, Color)> {
-    match diagnostic_severity {
-        Some(DiagnosticSeverity::ERROR) => Some((IconName::Close, Color::Error)),
-        Some(DiagnosticSeverity::WARNING) => Some((IconName::Triangle, Color::Warning)),
-        _ => None,
-    }
-}
-
-pub fn entry_diagnostic_aware_icon_decoration_and_color(
-    diagnostic_severity: Option<DiagnosticSeverity>,
-) -> Option<(IconDecorationKind, Color)> {
-    match diagnostic_severity {
-        Some(DiagnosticSeverity::ERROR) => Some((IconDecorationKind::X, Color::Error)),
-        Some(DiagnosticSeverity::WARNING) => Some((IconDecorationKind::Triangle, Color::Warning)),
-        _ => None,
-    }
-}
-
-pub fn entry_git_aware_label_color(git_status: GitSummary, ignored: bool, selected: bool) -> Color {
-    let tracked = git_status.index + git_status.worktree;
-    if ignored {
-        Color::Ignored
-    } else if git_status.conflict > 0 {
-        Color::Conflict
-    } else if tracked.modified > 0 {
-        Color::Modified
-    } else if tracked.added > 0 || git_status.untracked > 0 {
-        Color::Created
-    } else {
-        entry_label_color(selected)
-    }
-}
-
-fn path_for_buffer<'a>(
-    buffer: &Entity<MultiBuffer>,
-    height: usize,
-    include_filename: bool,
-    cx: &'a App,
-) -> Option<Cow<'a, str>> {
-    let file = buffer.read(cx).as_singleton()?.read(cx).file()?;
-    path_for_file(file, height, include_filename, cx)
-}
-
-fn path_for_file<'a>(
-    file: &'a Arc<dyn language::File>,
-    mut height: usize,
-    include_filename: bool,
-    cx: &'a App,
-) -> Option<Cow<'a, str>> {
-    if project::File::from_dyn(Some(file)).is_none() {
-        return None;
-    }
-
-    let file = file.as_ref();
-    // Ensure we always render at least the filename.
-    height += 1;
-
-    let mut prefix = file.path().as_ref();
-    while height > 0 {
-        if let Some(parent) = prefix.parent() {
-            prefix = parent;
-            height -= 1;
-        } else {
-            break;
-        }
-    }
-
-    // The full_path method allocates, so avoid calling it if height is zero.
-    if height > 0 {
-        let mut full_path = file.full_path(cx);
-        if !include_filename {
-            if !full_path.pop() {
-                return None;
-            }
-        }
-        Some(full_path.to_string_lossy().into_owned().into())
-    } else {
-        let mut path = file.path().strip_prefix(prefix).ok()?;
-        if !include_filename {
-            path = path.parent()?;
-        }
-        Some(path.display(file.path_style(cx)))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::editor_tests::init_test;
-    use fs::Fs;
-
-    use super::*;
-    use fs::MTime;
-    use gpui::{App, VisualTestContext};
-    use language::TestFile;
-    use project::FakeFs;
-    use std::path::{Path, PathBuf};
-    use util::{path, rel_path::RelPath};
-
-    #[gpui::test]
-    fn test_path_for_file(cx: &mut App) {
-        let file: Arc<dyn language::File> = Arc::new(TestFile {
-            path: RelPath::empty().into(),
-            root_name: String::new(),
-            local_root: None,
-        });
-        assert_eq!(path_for_file(&file, 0, false, cx), None);
-    }
-
-    async fn deserialize_editor(
-        item_id: ItemId,
-        workspace_id: WorkspaceId,
-        workspace: Entity<Workspace>,
-        project: Entity<Project>,
-        cx: &mut VisualTestContext,
-    ) -> Entity<Editor> {
-        workspace
-            .update_in(cx, |workspace, window, cx| {
-                let pane = workspace.active_pane();
-                pane.update(cx, |_, cx| {
-                    Editor::deserialize(
-                        project.clone(),
-                        workspace.weak_handle(),
-                        workspace_id,
-                        item_id,
-                        window,
-                        cx,
-                    )
-                })
-            })
-            .await
-            .unwrap()
-    }
-
-    #[gpui::test]
-    async fn test_deserialize(cx: &mut gpui::TestAppContext) {
-        init_test(cx, |_| {});
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_file(path!("/file.rs"), Default::default()).await;
-
-        // Test case 1: Deserialize with path and contents
-        {
-            let project = Project::test(fs.clone(), [path!("/file.rs").as_ref()], cx).await;
-            let (workspace, cx) =
-                cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-            let workspace_id = workspace::WORKSPACE_DB.next_id().await.unwrap();
-            let item_id = 1234 as ItemId;
-            let mtime = fs
-                .metadata(Path::new(path!("/file.rs")))
-                .await
-                .unwrap()
-                .unwrap()
-                .mtime;
-
-            let serialized_editor = SerializedEditor {
-                abs_path: Some(PathBuf::from(path!("/file.rs"))),
-                contents: Some("fn main() {}".to_string()),
-                language: Some("Rust".to_string()),
-                mtime: Some(mtime),
-            };
-
-            DB.save_serialized_editor(item_id, workspace_id, serialized_editor.clone())
-                .await
-                .unwrap();
-
-            let deserialized =
-                deserialize_editor(item_id, workspace_id, workspace, project, cx).await;
-
-            deserialized.update(cx, |editor, cx| {
-                assert_eq!(editor.text(cx), "fn main() {}");
-                assert!(editor.is_dirty(cx));
-                assert!(!editor.has_conflict(cx));
-                let buffer = editor.buffer().read(cx).as_singleton().unwrap().read(cx);
-                assert!(buffer.file().is_some());
-            });
-        }
-
-        // Test case 2: Deserialize with only path
-        {
-            let project = Project::test(fs.clone(), [path!("/file.rs").as_ref()], cx).await;
-            let (workspace, cx) =
-                cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-            let workspace_id = workspace::WORKSPACE_DB.next_id().await.unwrap();
-
-            let item_id = 5678 as ItemId;
-            let serialized_editor = SerializedEditor {
-                abs_path: Some(PathBuf::from(path!("/file.rs"))),
-                contents: None,
-                language: None,
-                mtime: None,
-            };
-
-            DB.save_serialized_editor(item_id, workspace_id, serialized_editor)
-                .await
-                .unwrap();
-
-            let deserialized =
-                deserialize_editor(item_id, workspace_id, workspace, project, cx).await;
-
-            deserialized.update(cx, |editor, cx| {
-                assert_eq!(editor.text(cx), ""); // The file should be empty as per our initial setup
-                assert!(!editor.is_dirty(cx));
-                assert!(!editor.has_conflict(cx));
-
-                let buffer = editor.buffer().read(cx).as_singleton().unwrap().read(cx);
-                assert!(buffer.file().is_some());
-            });
-        }
-
-        // Test case 3: Deserialize with no path (untitled buffer, with content and language)
-        {
-            let project = Project::test(fs.clone(), [path!("/file.rs").as_ref()], cx).await;
-            // Add Rust to the language, so that we can restore the language of the buffer
-            project.read_with(cx, |project, _| {
-                project.languages().add(languages::rust_lang())
-            });
-
-            let (workspace, cx) =
-                cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-            let workspace_id = workspace::WORKSPACE_DB.next_id().await.unwrap();
-
-            let item_id = 9012 as ItemId;
-            let serialized_editor = SerializedEditor {
-                abs_path: None,
-                contents: Some("hello".to_string()),
-                language: Some("Rust".to_string()),
-                mtime: None,
-            };
-
-            DB.save_serialized_editor(item_id, workspace_id, serialized_editor)
-                .await
-                .unwrap();
-
-            let deserialized =
-                deserialize_editor(item_id, workspace_id, workspace, project, cx).await;
-
-            deserialized.update(cx, |editor, cx| {
-                assert_eq!(editor.text(cx), "hello");
-                assert!(editor.is_dirty(cx)); // The editor should be dirty for an untitled buffer
-
-                let buffer = editor.buffer().read(cx).as_singleton().unwrap().read(cx);
-                assert_eq!(
-                    buffer.language().map(|lang| lang.name()),
-                    Some("Rust".into())
-                ); // Language should be set to Rust
-                assert!(buffer.file().is_none()); // The buffer should not have an associated file
-            });
-        }
-
-        // Test case 4: Deserialize with path, content, and old mtime
-        {
-            let project = Project::test(fs.clone(), [path!("/file.rs").as_ref()], cx).await;
-            let (workspace, cx) =
-                cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-            let workspace_id = workspace::WORKSPACE_DB.next_id().await.unwrap();
-
-            let item_id = 9345 as ItemId;
-            let old_mtime = MTime::from_seconds_and_nanos(0, 50);
-            let serialized_editor = SerializedEditor {
-                abs_path: Some(PathBuf::from(path!("/file.rs"))),
-                contents: Some("fn main() {}".to_string()),
-                language: Some("Rust".to_string()),
-                mtime: Some(old_mtime),
-            };
-
-            DB.save_serialized_editor(item_id, workspace_id, serialized_editor)
-                .await
-                .unwrap();
-
-            let deserialized =
-                deserialize_editor(item_id, workspace_id, workspace, project, cx).await;
-
-            deserialized.update(cx, |editor, cx| {
-                assert_eq!(editor.text(cx), "fn main() {}");
-                assert!(editor.has_conflict(cx)); // The editor should have a conflict
-            });
-        }
-
-        // Test case 5: Deserialize with no path, no content, no language, and no old mtime (new, empty, unsaved buffer)
-        {
-            let project = Project::test(fs.clone(), [path!("/file.rs").as_ref()], cx).await;
-            let (workspace, cx) =
-                cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-            let workspace_id = workspace::WORKSPACE_DB.next_id().await.unwrap();
-
-            let item_id = 10000 as ItemId;
-            let serialized_editor = SerializedEditor {
-                abs_path: None,
-                contents: None,
-                language: None,
-                mtime: None,
-            };
-
-            DB.save_serialized_editor(item_id, workspace_id, serialized_editor)
-                .await
-                .unwrap();
-
-            let deserialized =
-                deserialize_editor(item_id, workspace_id, workspace, project, cx).await;
-
-            deserialized.update(cx, |editor, cx| {
-                assert_eq!(editor.text(cx), "");
-                assert!(!editor.is_dirty(cx));
-                assert!(!editor.has_conflict(cx));
-
-                let buffer = editor.buffer().read(cx).as_singleton().unwrap().read(cx);
-                assert!(buffer.file().is_none());
-            });
-        }
-    }
-}
diff --git a/crates/editor/src/jsx_tag_auto_close.rs b/crates/editor/src/jsx_tag_auto_close.rs
deleted file mode 100644
index e22fde313d..0000000000
--- a/crates/editor/src/jsx_tag_auto_close.rs
+++ /dev/null
@@ -1,861 +0,0 @@
-use anyhow::{Context as _, Result, anyhow};
-use collections::HashMap;
-use gpui::{Context, Entity, Window};
-use multi_buffer::{BufferOffset, MultiBuffer, ToOffset};
-use std::ops::Range;
-use util::ResultExt as _;
-
-use language::{BufferSnapshot, JsxTagAutoCloseConfig, Node};
-use text::{Anchor, OffsetRangeExt as _};
-
-use crate::{Editor, SelectionEffects};
-
-pub struct JsxTagCompletionState {
-    edit_index: usize,
-    open_tag_range: Range<usize>,
-}
-
-/// Index of the named child within an open or close tag
-/// that corresponds to the tag name
-/// Note that this is not configurable, i.e. we assume the first
-/// named child of a tag node is the tag name
-const TS_NODE_TAG_NAME_CHILD_INDEX: usize = 0;
-
-/// Maximum number of parent elements to walk back when checking if an open tag
-/// is already closed.
-///
-/// See the comment in `generate_auto_close_edits` for more details
-const ALREADY_CLOSED_PARENT_ELEMENT_WALK_BACK_LIMIT: usize = 2;
-
-pub(crate) fn should_auto_close(
-    buffer: &BufferSnapshot,
-    edited_ranges: &[Range<Anchor>],
-    config: &JsxTagAutoCloseConfig,
-) -> Option<Vec<JsxTagCompletionState>> {
-    let mut to_auto_edit = vec![];
-    for (index, edited_range) in edited_ranges.iter().enumerate() {
-        let text = buffer
-            .text_for_range(edited_range.clone())
-            .collect::<String>();
-        let edited_range = edited_range.to_offset(buffer);
-        if !text.ends_with(">") {
-            continue;
-        }
-        let Some(layer) = buffer.smallest_syntax_layer_containing(edited_range.clone()) else {
-            continue;
-        };
-        let Some(node) = layer
-            .node()
-            .named_descendant_for_byte_range(edited_range.start, edited_range.end)
-        else {
-            continue;
-        };
-        let mut jsx_open_tag_node = node;
-        if node.grammar_name() != config.open_tag_node_name
-            && let Some(parent) = node.parent()
-            && parent.grammar_name() == config.open_tag_node_name
-        {
-            jsx_open_tag_node = parent;
-        }
-        if jsx_open_tag_node.grammar_name() != config.open_tag_node_name {
-            continue;
-        }
-
-        let first_two_chars: Option<[char; 2]> = {
-            let mut chars = buffer
-                .text_for_range(jsx_open_tag_node.byte_range())
-                .flat_map(|chunk| chunk.chars());
-            if let (Some(c1), Some(c2)) = (chars.next(), chars.next()) {
-                Some([c1, c2])
-            } else {
-                None
-            }
-        };
-        if let Some(chars) = first_two_chars {
-            if chars[0] != '<' {
-                continue;
-            }
-            if chars[1] == '!' || chars[1] == '/' {
-                continue;
-            }
-        }
-
-        to_auto_edit.push(JsxTagCompletionState {
-            edit_index: index,
-            open_tag_range: jsx_open_tag_node.byte_range(),
-        });
-    }
-    if to_auto_edit.is_empty() {
-        None
-    } else {
-        Some(to_auto_edit)
-    }
-}
-
-pub(crate) fn generate_auto_close_edits(
-    buffer: &BufferSnapshot,
-    ranges: &[Range<Anchor>],
-    config: &JsxTagAutoCloseConfig,
-    state: Vec<JsxTagCompletionState>,
-) -> Result<Vec<(Range<Anchor>, String)>> {
-    let mut edits = Vec::with_capacity(state.len());
-    for auto_edit in state {
-        let edited_range = ranges[auto_edit.edit_index].clone();
-        let Some(layer) = buffer.smallest_syntax_layer_containing(edited_range.clone()) else {
-            continue;
-        };
-        let layer_root_node = layer.node();
-        let Some(open_tag) = layer_root_node.descendant_for_byte_range(
-            auto_edit.open_tag_range.start,
-            auto_edit.open_tag_range.end,
-        ) else {
-            continue;
-        };
-        assert!(open_tag.kind() == config.open_tag_node_name);
-        let tag_name = open_tag
-            .named_child(TS_NODE_TAG_NAME_CHILD_INDEX)
-            .filter(|node| {
-                node.kind() == config.tag_name_node_name
-                    || config
-                        .tag_name_node_name_alternates
-                        .iter()
-                        .any(|alternate| alternate == node.kind())
-            })
-            .map_or("".to_string(), |node| {
-                buffer.text_for_range(node.byte_range()).collect::<String>()
-            });
-
-        /*
-         * Naive check to see if the tag is already closed
-         * Essentially all we do is count the number of open and close tags
-         * with the same tag name as the open tag just entered by the user
-         * The search is limited to some scope determined by
-         * `ALREADY_CLOSED_PARENT_ELEMENT_WALK_BACK_LIMIT`
-         *
-         * The limit is preferable to walking up the tree until we find a non-tag node,
-         * and then checking the entire tree, as this is unnecessarily expensive, and
-         * risks false positives
-         * eg. a `</div>` tag without a corresponding opening tag exists 25 lines away
-         *     and the user typed in `<div>`, intuitively we still want to auto-close it because
-         *     the other `</div>` tag is almost certainly not supposed to be the closing tag for the
-         *     current element
-         *
-         * We have to walk up the tree some amount because tree-sitters error correction is not
-         * designed to handle this case, and usually does not represent the tree structure
-         * in the way we might expect,
-         *
-         * We half to walk up the tree until we hit an element with a different open tag name (`doing_deep_search == true`)
-         * because tree-sitter may pair the new open tag with the root of the tree's closing tag leaving the
-         * root's opening tag unclosed.
-         * e.g
-         *      ```
-         *      <div>
-         *          <div>|cursor here|
-         *      </div>
-         *      ```
-         *     in Astro/vue/svelte tree-sitter represented the tree as
-         *      (
-         *          (jsx_element
-         *              (jsx_opening_element
-         *                  "<div>")
-         *          )
-         *          (jsx_element
-         *              (jsx_opening_element
-         *                  "<div>") // <- cursor is here
-         *              (jsx_closing_element
-         *                  "</div>")
-         *          )
-         *      )
-         *     so if we only walked to the first `jsx_element` node,
-         *     we would mistakenly identify the div entered by the
-         *     user as already being closed, despite this clearly
-         *     being false
-         *
-         * The errors with the tree-sitter tree caused by error correction,
-         * are also why the naive algorithm was chosen, as the alternative
-         * approach would be to maintain or construct a full parse tree (like tree-sitter)
-         * that better represents errors in a way that we can simply check
-         * the enclosing scope of the entered tag for a closing tag
-         * This is far more complex and expensive, and was deemed impractical
-         * given that the naive algorithm is sufficient in the majority of cases.
-         */
-        {
-            let tag_node_name_equals = |node: &Node, name: &str| {
-                let is_empty = name.is_empty();
-                if let Some(node_name) = node.named_child(TS_NODE_TAG_NAME_CHILD_INDEX) {
-                    let range = node_name.byte_range();
-                    return buffer.text_for_range(range).equals_str(name);
-                }
-                is_empty
-            };
-
-            let tree_root_node = {
-                let mut ancestors = Vec::with_capacity(
-                    // estimate of max, not based on any data,
-                    // but trying to avoid excessive reallocation
-                    16,
-                );
-                ancestors.push(layer_root_node);
-                let mut cur = layer_root_node;
-                // walk down the tree until we hit the open tag
-                // note: this is what node.parent() does internally
-                while let Some(descendant) = cur.child_with_descendant(open_tag) {
-                    if descendant == open_tag {
-                        break;
-                    }
-                    ancestors.push(descendant);
-                    cur = descendant;
-                }
-
-                assert!(!ancestors.is_empty());
-
-                let mut tree_root_node = open_tag;
-
-                let mut parent_element_node_count = 0;
-                let mut doing_deep_search = false;
-
-                for &ancestor in ancestors.iter().rev() {
-                    tree_root_node = ancestor;
-                    let is_element = ancestor.kind() == config.jsx_element_node_name;
-                    let is_error = ancestor.is_error();
-                    if is_error || !is_element {
-                        break;
-                    }
-                    if is_element {
-                        let is_first = parent_element_node_count == 0;
-                        if !is_first {
-                            let has_open_tag_with_same_tag_name = ancestor
-                                .named_child(0)
-                                .filter(|n| n.kind() == config.open_tag_node_name)
-                                .is_some_and(|element_open_tag_node| {
-                                    tag_node_name_equals(&element_open_tag_node, &tag_name)
-                                });
-                            if has_open_tag_with_same_tag_name {
-                                doing_deep_search = true;
-                            } else if doing_deep_search {
-                                break;
-                            }
-                        }
-                        parent_element_node_count += 1;
-                        if !doing_deep_search
-                            && parent_element_node_count
-                                >= ALREADY_CLOSED_PARENT_ELEMENT_WALK_BACK_LIMIT
-                        {
-                            break;
-                        }
-                    }
-                }
-                tree_root_node
-            };
-
-            let mut unclosed_open_tag_count: i32 = 0;
-
-            let mut cursor = layer_root_node.walk();
-
-            let mut stack = Vec::with_capacity(tree_root_node.descendant_count());
-            stack.extend(tree_root_node.children(&mut cursor));
-
-            let mut has_erroneous_close_tag = false;
-            let mut erroneous_close_tag_node_name = "";
-            if let Some(name) = config.erroneous_close_tag_node_name.as_deref() {
-                has_erroneous_close_tag = true;
-                erroneous_close_tag_node_name = name;
-            }
-
-            let is_after_open_tag = |node: &Node| {
-                node.start_byte() < open_tag.start_byte() && node.end_byte() < open_tag.start_byte()
-            };
-
-            // perf: use cursor for more efficient traversal
-            // if child -> go to child
-            // else if next sibling -> go to next sibling
-            // else -> go to parent
-            // if parent == tree_root_node -> break
-            while let Some(node) = stack.pop() {
-                let kind = node.kind();
-                if kind == config.open_tag_node_name {
-                    if tag_node_name_equals(&node, &tag_name) {
-                        unclosed_open_tag_count += 1;
-                    }
-                } else if kind == config.close_tag_node_name {
-                    if tag_node_name_equals(&node, &tag_name) {
-                        unclosed_open_tag_count -= 1;
-                    }
-                } else if has_erroneous_close_tag && kind == erroneous_close_tag_node_name {
-                    if tag_node_name_equals(&node, &tag_name) && !is_after_open_tag(&node) {
-                        unclosed_open_tag_count -= 1;
-                    }
-                } else if kind == config.jsx_element_node_name {
-                    // perf: filter only open,close,element,erroneous nodes
-                    stack.extend(node.children(&mut cursor));
-                }
-            }
-
-            if unclosed_open_tag_count <= 0 {
-                // skip if already closed
-                continue;
-            }
-        }
-        let edit_anchor = buffer.anchor_after(edited_range.end);
-        let edit_range = edit_anchor..edit_anchor;
-        edits.push((edit_range, format!("</{}>", tag_name)));
-    }
-    Ok(edits)
-}
-
-pub(crate) fn refresh_enabled_in_any_buffer(
-    editor: &mut Editor,
-    multi_buffer: &Entity<MultiBuffer>,
-    cx: &Context<Editor>,
-) {
-    editor.jsx_tag_auto_close_enabled_in_any_buffer = {
-        let multi_buffer = multi_buffer.read(cx);
-        let mut found_enabled = false;
-        multi_buffer.for_each_buffer(|buffer| {
-            if found_enabled {
-                return;
-            }
-
-            let buffer = buffer.read(cx);
-            let snapshot = buffer.snapshot();
-            for syntax_layer in snapshot.syntax_layers() {
-                let language = syntax_layer.language;
-                if language.config().jsx_tag_auto_close.is_none() {
-                    continue;
-                }
-                let language_settings = language::language_settings::language_settings(
-                    Some(language.name()),
-                    snapshot.file(),
-                    cx,
-                );
-                if language_settings.jsx_tag_auto_close {
-                    found_enabled = true;
-                }
-            }
-        });
-
-        found_enabled
-    };
-}
-
-pub(crate) type InitialBufferVersionsMap = HashMap<language::BufferId, clock::Global>;
-
-pub(crate) fn construct_initial_buffer_versions_map<
-    D: ToOffset + Copy,
-    _S: Into<std::sync::Arc<str>>,
->(
-    editor: &Editor,
-    edits: &[(Range<D>, _S)],
-    cx: &Context<Editor>,
-) -> InitialBufferVersionsMap {
-    let mut initial_buffer_versions = InitialBufferVersionsMap::default();
-
-    if !editor.jsx_tag_auto_close_enabled_in_any_buffer {
-        return initial_buffer_versions;
-    }
-
-    for (edit_range, _) in edits {
-        let edit_range_buffer = editor
-            .buffer()
-            .read(cx)
-            .excerpt_containing(edit_range.end, cx)
-            .map(|e| e.1);
-        if let Some(buffer) = edit_range_buffer {
-            let (buffer_id, buffer_version) =
-                buffer.read_with(cx, |buffer, _| (buffer.remote_id(), buffer.version.clone()));
-            initial_buffer_versions.insert(buffer_id, buffer_version);
-        }
-    }
-    initial_buffer_versions
-}
-
-pub(crate) fn handle_from(
-    editor: &Editor,
-    initial_buffer_versions: InitialBufferVersionsMap,
-    window: &mut Window,
-    cx: &mut Context<Editor>,
-) {
-    if !editor.jsx_tag_auto_close_enabled_in_any_buffer {
-        return;
-    }
-
-    struct JsxAutoCloseEditContext {
-        buffer: Entity<language::Buffer>,
-        config: language::JsxTagAutoCloseConfig,
-        edits: Vec<Range<Anchor>>,
-    }
-
-    let mut edit_contexts =
-        HashMap::<(language::BufferId, language::LanguageId), JsxAutoCloseEditContext>::default();
-
-    for (buffer_id, buffer_version_initial) in initial_buffer_versions {
-        let Some(buffer) = editor.buffer.read(cx).buffer(buffer_id) else {
-            continue;
-        };
-        let snapshot = buffer.read(cx).snapshot();
-        for (edit, range) in buffer
-            .read(cx)
-            .anchored_edits_since::<usize>(&buffer_version_initial)
-        {
-            let Some(language) = snapshot.language_at(edit.new.end) else {
-                continue;
-            };
-
-            let Some(config) = language.config().jsx_tag_auto_close.as_ref() else {
-                continue;
-            };
-
-            let language_settings = snapshot.settings_at(edit.new.end, cx);
-            if !language_settings.jsx_tag_auto_close {
-                continue;
-            }
-
-            edit_contexts
-                .entry((snapshot.remote_id(), language.id()))
-                .or_insert_with(|| JsxAutoCloseEditContext {
-                    buffer: buffer.clone(),
-                    config: config.clone(),
-                    edits: vec![],
-                })
-                .edits
-                .push(range);
-        }
-    }
-
-    for ((buffer_id, _), auto_close_context) in edit_contexts {
-        let JsxAutoCloseEditContext {
-            buffer,
-            config: jsx_tag_auto_close_config,
-            edits: edited_ranges,
-        } = auto_close_context;
-
-        let (buffer_version_initial, mut buffer_parse_status_rx) =
-            buffer.read_with(cx, |buffer, _| (buffer.version(), buffer.parse_status()));
-
-        cx.spawn_in(window, async move |this, cx| {
-            let Some(buffer_parse_status) = buffer_parse_status_rx.recv().await.ok() else {
-                return Some(());
-            };
-            if buffer_parse_status == language::ParseStatus::Parsing {
-                let Some(language::ParseStatus::Idle) = buffer_parse_status_rx.recv().await.ok()
-                else {
-                    return Some(());
-                };
-            }
-
-            let buffer_snapshot = buffer.read_with(cx, |buf, _| buf.snapshot()).ok()?;
-
-            let Some(edit_behavior_state) =
-                should_auto_close(&buffer_snapshot, &edited_ranges, &jsx_tag_auto_close_config)
-            else {
-                return Some(());
-            };
-
-            let ensure_no_edits_since_start = || -> Option<()> {
-                let has_edits_since_start = this
-                    .read_with(cx, |this, cx| {
-                        this.buffer.read(cx).buffer(buffer_id).is_none_or(|buffer| {
-                            buffer.read(cx).has_edits_since(&buffer_version_initial)
-                        })
-                    })
-                    .ok()?;
-
-                if has_edits_since_start {
-                    Err(anyhow!(
-                        "Auto-close Operation Failed - Buffer has edits since start"
-                    ))
-                    .log_err()?;
-                }
-
-                Some(())
-            };
-
-            ensure_no_edits_since_start()?;
-
-            let edits = cx
-                .background_executor()
-                .spawn({
-                    let buffer_snapshot = buffer_snapshot.clone();
-                    async move {
-                        generate_auto_close_edits(
-                            &buffer_snapshot,
-                            &edited_ranges,
-                            &jsx_tag_auto_close_config,
-                            edit_behavior_state,
-                        )
-                    }
-                })
-                .await;
-
-            let edits = edits
-                .context("Auto-close Operation Failed - Failed to compute edits")
-                .log_err()?;
-
-            if edits.is_empty() {
-                return Some(());
-            }
-
-            // check again after awaiting background task before applying edits
-            ensure_no_edits_since_start()?;
-
-            let multi_buffer_snapshot = this
-                .read_with(cx, |this, cx| this.buffer.read(cx).snapshot(cx))
-                .ok()?;
-
-            let mut base_selections = Vec::new();
-            let mut buffer_selection_map = HashMap::default();
-
-            {
-                let selections = this
-                    .read_with(cx, |this, _| this.selections.disjoint_anchors_arc())
-                    .ok()?;
-                for selection in selections.iter() {
-                    let Some(selection_buffer_offset_head) =
-                        multi_buffer_snapshot.point_to_buffer_offset(selection.head())
-                    else {
-                        base_selections.push(selection.clone());
-                        continue;
-                    };
-                    let Some(selection_buffer_offset_tail) =
-                        multi_buffer_snapshot.point_to_buffer_offset(selection.tail())
-                    else {
-                        base_selections.push(selection.clone());
-                        continue;
-                    };
-
-                    let is_entirely_in_buffer = selection_buffer_offset_head.0.remote_id()
-                        == buffer_id
-                        && selection_buffer_offset_tail.0.remote_id() == buffer_id;
-                    if !is_entirely_in_buffer {
-                        base_selections.push(selection.clone());
-                        continue;
-                    }
-
-                    let selection_buffer_offset_head = selection_buffer_offset_head.1;
-                    let selection_buffer_offset_tail = selection_buffer_offset_tail.1;
-                    buffer_selection_map.insert(
-                        (selection_buffer_offset_head, selection_buffer_offset_tail),
-                        (selection.clone(), None),
-                    );
-                }
-            }
-
-            let mut any_selections_need_update = false;
-            for edit in &edits {
-                let edit_range_offset = edit.0.to_offset(&buffer_snapshot);
-                if edit_range_offset.start != edit_range_offset.end {
-                    continue;
-                }
-                if let Some(selection) = buffer_selection_map.get_mut(&(
-                    BufferOffset(edit_range_offset.start),
-                    BufferOffset(edit_range_offset.end),
-                )) {
-                    if selection.0.head().bias() != text::Bias::Right
-                        || selection.0.tail().bias() != text::Bias::Right
-                    {
-                        continue;
-                    }
-                    if selection.1.is_none() {
-                        any_selections_need_update = true;
-                        selection.1 = Some(
-                            selection
-                                .0
-                                .clone()
-                                .map(|anchor| multi_buffer_snapshot.anchor_before(anchor)),
-                        );
-                    }
-                }
-            }
-
-            buffer
-                .update(cx, |buffer, cx| {
-                    buffer.edit(edits, None, cx);
-                })
-                .ok()?;
-
-            if any_selections_need_update {
-                let multi_buffer_snapshot = this
-                    .read_with(cx, |this, cx| {
-                        this.buffer.read_with(cx, |buffer, cx| buffer.snapshot(cx))
-                    })
-                    .ok()?;
-
-                base_selections.extend(buffer_selection_map.values().map(|selection| {
-                    match &selection.1 {
-                        Some(left_biased_selection) => left_biased_selection.clone(),
-                        None => selection.0.clone(),
-                    }
-                }));
-
-                let base_selections = base_selections
-                    .into_iter()
-                    .map(|selection| {
-                        selection.map(|anchor| anchor.to_offset(&multi_buffer_snapshot))
-                    })
-                    .collect::<Vec<_>>();
-                this.update_in(cx, |this, window, cx| {
-                    this.change_selections(
-                        SelectionEffects::no_scroll().completions(false),
-                        window,
-                        cx,
-                        |s| {
-                            s.select(base_selections);
-                        },
-                    );
-                })
-                .ok()?;
-            }
-
-            Some(())
-        })
-        .detach();
-    }
-}
-
-#[cfg(test)]
-mod jsx_tag_autoclose_tests {
-    use crate::{
-        editor_tests::init_test,
-        test::{build_editor, editor_test_context::EditorTestContext},
-    };
-
-    use super::*;
-    use gpui::{AppContext as _, TestAppContext};
-    use languages::language;
-    use multi_buffer::{ExcerptRange, MultiBufferOffset};
-    use text::Selection;
-
-    async fn test_setup(cx: &mut TestAppContext) -> EditorTestContext {
-        init_test(cx, |settings| {
-            settings
-                .defaults
-                .jsx_tag_auto_close
-                .get_or_insert_default()
-                .enabled = Some(true);
-        });
-
-        let mut cx = EditorTestContext::new(cx).await;
-        cx.update_buffer(|buffer, cx| {
-            let language = language("tsx", tree_sitter_typescript::LANGUAGE_TSX.into());
-
-            buffer.set_language(Some(language), cx)
-        });
-
-        cx
-    }
-
-    macro_rules! check {
-        ($name:ident, $initial:literal + $input:literal => $expected:expr) => {
-            #[gpui::test]
-            async fn $name(cx: &mut TestAppContext) {
-                let mut cx = test_setup(cx).await;
-                cx.set_state($initial);
-                cx.run_until_parked();
-
-                cx.update_editor(|editor, window, cx| {
-                    editor.handle_input($input, window, cx);
-                });
-                cx.run_until_parked();
-                cx.assert_editor_state($expected);
-            }
-        };
-    }
-
-    check!(
-        test_basic,
-        "<divˇ" + ">" => "<div>ˇ</div>"
-    );
-
-    check!(
-        test_basic_nested,
-        "<div><divˇ</div>" + ">" => "<div><div>ˇ</div></div>"
-    );
-
-    check!(
-        test_basic_ignore_already_closed,
-        "<div><divˇ</div></div>" + ">" => "<div><div>ˇ</div></div>"
-    );
-
-    check!(
-        test_doesnt_autoclose_closing_tag,
-        "</divˇ" + ">" => "</div>ˇ"
-    );
-
-    check!(
-        test_jsx_attr,
-        "<div attr={</div>}ˇ" + ">" => "<div attr={</div>}>ˇ</div>"
-    );
-
-    check!(
-        test_ignores_closing_tags_in_expr_block,
-        "<div><divˇ{</div>}</div>" + ">" => "<div><div>ˇ</div>{</div>}</div>"
-    );
-
-    check!(
-        test_doesnt_autoclose_on_gt_in_expr,
-        "<div attr={1 ˇ" + ">" => "<div attr={1 >ˇ"
-    );
-
-    check!(
-        test_ignores_closing_tags_with_different_tag_names,
-        "<div><divˇ</div></span>" + ">" => "<div><div>ˇ</div></div></span>"
-    );
-
-    check!(
-        test_autocloses_in_jsx_expression,
-        "<div>{<divˇ}</div>" + ">" => "<div>{<div>ˇ</div>}</div>"
-    );
-
-    check!(
-        test_doesnt_autoclose_already_closed_in_jsx_expression,
-        "<div>{<divˇ</div>}</div>" + ">" => "<div>{<div>ˇ</div>}</div>"
-    );
-
-    check!(
-        test_autocloses_fragment,
-        "<ˇ" + ">" => "<>ˇ</>"
-    );
-
-    check!(
-        test_does_not_include_type_argument_in_autoclose_tag_name,
-        "<Component<T> attr={boolean_value}ˇ" + ">" => "<Component<T> attr={boolean_value}>ˇ</Component>"
-    );
-
-    check!(
-        test_does_not_autoclose_doctype,
-        "<!DOCTYPE htmlˇ" + ">" => "<!DOCTYPE html>ˇ"
-    );
-
-    check!(
-        test_does_not_autoclose_comment,
-        "<!-- comment --ˇ" + ">" => "<!-- comment -->ˇ"
-    );
-
-    check!(
-        test_autocloses_dot_separated_component,
-        "<Component.Fooˇ" + ">" => "<Component.Foo>ˇ</Component.Foo>"
-    );
-
-    check!(
-        test_multi_cursor_autoclose_same_tag,
-        r#"
-        <divˇ
-        <divˇ
-        "#
-        + ">" =>
-        r#"
-        <div>ˇ</div>
-        <div>ˇ</div>
-        "#
-    );
-
-    check!(
-        test_multi_cursor_autoclose_different_tags,
-        r#"
-        <divˇ
-        <spanˇ
-        "#
-        + ">" =>
-        r#"
-        <div>ˇ</div>
-        <span>ˇ</span>
-        "#
-    );
-
-    check!(
-        test_multi_cursor_autoclose_some_dont_autoclose_others,
-        r#"
-        <divˇ
-        <div /ˇ
-        <spanˇ</span>
-        <!DOCTYPE htmlˇ
-        </headˇ
-        <Component<T>ˇ
-        ˇ
-        "#
-        + ">" =>
-        r#"
-        <div>ˇ</div>
-        <div />ˇ
-        <span>ˇ</span>
-        <!DOCTYPE html>ˇ
-        </head>ˇ
-        <Component<T>>ˇ</Component>
-        >ˇ
-        "#
-    );
-
-    check!(
-        test_doesnt_mess_up_trailing_text,
-        "<divˇfoobar" + ">" => "<div>ˇ</div>foobar"
-    );
-
-    #[gpui::test]
-    async fn test_multibuffer(cx: &mut TestAppContext) {
-        init_test(cx, |settings| {
-            settings
-                .defaults
-                .jsx_tag_auto_close
-                .get_or_insert_default()
-                .enabled = Some(true);
-        });
-
-        let buffer_a = cx.new(|cx| {
-            let mut buf = language::Buffer::local("<div", cx);
-            buf.set_language(
-                Some(language("tsx", tree_sitter_typescript::LANGUAGE_TSX.into())),
-                cx,
-            );
-            buf
-        });
-        let buffer_b = cx.new(|cx| {
-            let mut buf = language::Buffer::local("<pre", cx);
-            buf.set_language(
-                Some(language("tsx", tree_sitter_typescript::LANGUAGE_TSX.into())),
-                cx,
-            );
-            buf
-        });
-        let buffer_c = cx.new(|cx| language::Buffer::local("<span", cx));
-        let buffer = cx.new(|cx| {
-            let mut buf = MultiBuffer::new(language::Capability::ReadWrite);
-            buf.push_excerpts(
-                buffer_a,
-                [ExcerptRange::new(text::Anchor::MIN..text::Anchor::MAX)],
-                cx,
-            );
-            buf.push_excerpts(
-                buffer_b,
-                [ExcerptRange::new(text::Anchor::MIN..text::Anchor::MAX)],
-                cx,
-            );
-            buf.push_excerpts(
-                buffer_c,
-                [ExcerptRange::new(text::Anchor::MIN..text::Anchor::MAX)],
-                cx,
-            );
-            buf
-        });
-        let editor = cx.add_window(|window, cx| build_editor(buffer.clone(), window, cx));
-
-        let mut cx = EditorTestContext::for_editor(editor, cx).await;
-
-        cx.update_editor(|editor, window, cx| {
-            editor.change_selections(SelectionEffects::no_scroll(), window, cx, |selections| {
-                selections.select(vec![
-                    Selection::from_offset(MultiBufferOffset(4)),
-                    Selection::from_offset(MultiBufferOffset(9)),
-                    Selection::from_offset(MultiBufferOffset(15)),
-                ])
-            })
-        });
-        cx.run_until_parked();
-
-        cx.update_editor(|editor, window, cx| {
-            editor.handle_input(">", window, cx);
-        });
-        cx.run_until_parked();
-
-        cx.assert_editor_state("<div>ˇ</div>\n<pre>ˇ</pre>\n<span>ˇ");
-    }
-}
diff --git a/crates/editor/src/linked_editing_ranges.rs b/crates/editor/src/linked_editing_ranges.rs
deleted file mode 100644
index ff3096961d..0000000000
--- a/crates/editor/src/linked_editing_ranges.rs
+++ /dev/null
@@ -1,177 +0,0 @@
-use collections::HashMap;
-use gpui::{AppContext, Context, Window};
-use itertools::Itertools;
-use multi_buffer::MultiBufferOffset;
-use std::{ops::Range, time::Duration};
-use text::{AnchorRangeExt, BufferId, ToPoint};
-use util::ResultExt;
-
-use crate::Editor;
-
-#[derive(Clone, Default)]
-pub(super) struct LinkedEditingRanges(
-    /// Ranges are non-overlapping and sorted by .0 (thus, [x + 1].start > [x].end must hold)
-    pub HashMap<BufferId, Vec<(Range<text::Anchor>, Vec<Range<text::Anchor>>)>>,
-);
-
-impl LinkedEditingRanges {
-    pub(super) fn get(
-        &self,
-        id: BufferId,
-        anchor: Range<text::Anchor>,
-        snapshot: &text::BufferSnapshot,
-    ) -> Option<&(Range<text::Anchor>, Vec<Range<text::Anchor>>)> {
-        let ranges_for_buffer = self.0.get(&id)?;
-        let lower_bound = ranges_for_buffer
-            .partition_point(|(range, _)| range.start.cmp(&anchor.start, snapshot).is_le());
-        if lower_bound == 0 {
-            // None of the linked ranges contains `anchor`.
-            return None;
-        }
-        ranges_for_buffer
-            .get(lower_bound - 1)
-            .filter(|(range, _)| range.end.cmp(&anchor.end, snapshot).is_ge())
-    }
-    pub(super) fn is_empty(&self) -> bool {
-        self.0.is_empty()
-    }
-
-    pub(super) fn clear(&mut self) {
-        self.0.clear();
-    }
-}
-
-const UPDATE_DEBOUNCE: Duration = Duration::from_millis(50);
-
-// TODO do not refresh anything at all, if the settings/capabilities do not have it enabled.
-pub(super) fn refresh_linked_ranges(
-    editor: &mut Editor,
-    window: &mut Window,
-    cx: &mut Context<Editor>,
-) -> Option<()> {
-    if editor.ignore_lsp_data() || editor.pending_rename.is_some() {
-        return None;
-    }
-    let project = editor.project()?.downgrade();
-
-    editor.linked_editing_range_task = Some(cx.spawn_in(window, async move |editor, cx| {
-        cx.background_executor().timer(UPDATE_DEBOUNCE).await;
-
-        let mut applicable_selections = Vec::new();
-        editor
-            .update(cx, |editor, cx| {
-                let display_snapshot = editor.display_snapshot(cx);
-                let selections = editor
-                    .selections
-                    .all::<MultiBufferOffset>(&display_snapshot);
-                let snapshot = display_snapshot.buffer_snapshot();
-                let buffer = editor.buffer.read(cx);
-                for selection in selections {
-                    let cursor_position = selection.head();
-                    let start_position = snapshot.anchor_before(cursor_position);
-                    let end_position = snapshot.anchor_after(selection.tail());
-                    if start_position.text_anchor.buffer_id != end_position.text_anchor.buffer_id
-                        || end_position.text_anchor.buffer_id.is_none()
-                    {
-                        // Throw away selections spanning multiple buffers.
-                        continue;
-                    }
-                    if let Some(buffer) = buffer.buffer_for_anchor(end_position, cx) {
-                        applicable_selections.push((
-                            buffer,
-                            start_position.text_anchor,
-                            end_position.text_anchor,
-                        ));
-                    }
-                }
-            })
-            .ok()?;
-
-        if applicable_selections.is_empty() {
-            return None;
-        }
-
-        let highlights = project
-            .update(cx, |project, cx| {
-                let mut linked_edits_tasks = vec![];
-                for (buffer, start, end) in &applicable_selections {
-                    let linked_edits_task = project.linked_edits(buffer, *start, cx);
-                    let cx = cx.to_async();
-                    let highlights = async move {
-                        let edits = linked_edits_task.await.log_err()?;
-                        let snapshot = cx
-                            .read_entity(&buffer, |buffer, _| buffer.snapshot())
-                            .ok()?;
-                        let buffer_id = snapshot.remote_id();
-
-                        // Find the range containing our current selection.
-                        // We might not find one, because the selection contains both the start and end of the contained range
-                        // (think of selecting <`html>foo`</html> - even though there's a matching closing tag, the selection goes beyond the range of the opening tag)
-                        // or the language server may not have returned any ranges.
-
-                        let start_point = start.to_point(&snapshot);
-                        let end_point = end.to_point(&snapshot);
-                        let _current_selection_contains_range = edits.iter().find(|range| {
-                            range.start.to_point(&snapshot) <= start_point
-                                && range.end.to_point(&snapshot) >= end_point
-                        });
-                        _current_selection_contains_range?;
-                        // Now link every range as each-others sibling.
-                        let mut siblings: HashMap<Range<text::Anchor>, Vec<_>> = Default::default();
-                        let mut insert_sorted_anchor =
-                            |key: &Range<text::Anchor>, value: &Range<text::Anchor>| {
-                                siblings.entry(key.clone()).or_default().push(value.clone());
-                            };
-                        for items in edits.into_iter().combinations(2) {
-                            let Ok([first, second]): Result<[_; 2], _> = items.try_into() else {
-                                unreachable!()
-                            };
-
-                            insert_sorted_anchor(&first, &second);
-                            insert_sorted_anchor(&second, &first);
-                        }
-                        let mut siblings: Vec<(_, _)> = siblings.into_iter().collect();
-                        siblings.sort_by(|lhs, rhs| lhs.0.cmp(&rhs.0, &snapshot));
-                        Some((buffer_id, siblings))
-                    };
-                    linked_edits_tasks.push(highlights);
-                }
-                linked_edits_tasks
-            })
-            .ok()?;
-
-        let highlights = futures::future::join_all(highlights).await;
-
-        editor
-            .update(cx, |this, cx| {
-                this.linked_edit_ranges.0.clear();
-                if this.pending_rename.is_some() {
-                    return;
-                }
-                for (buffer_id, ranges) in highlights.into_iter().flatten() {
-                    this.linked_edit_ranges
-                        .0
-                        .entry(buffer_id)
-                        .or_default()
-                        .extend(ranges);
-                }
-                for (buffer_id, values) in this.linked_edit_ranges.0.iter_mut() {
-                    let Some(snapshot) = this
-                        .buffer
-                        .read(cx)
-                        .buffer(*buffer_id)
-                        .map(|buffer| buffer.read(cx).snapshot())
-                    else {
-                        continue;
-                    };
-                    values.sort_by(|lhs, rhs| lhs.0.cmp(&rhs.0, &snapshot));
-                }
-
-                cx.notify();
-            })
-            .ok()?;
-
-        Some(())
-    }));
-    None
-}
diff --git a/crates/editor/src/lsp_colors.rs b/crates/editor/src/lsp_colors.rs
deleted file mode 100644
index 2a98ad6bd4..0000000000
--- a/crates/editor/src/lsp_colors.rs
+++ /dev/null
@@ -1,416 +0,0 @@
-use std::{cmp, ops::Range};
-
-use collections::HashMap;
-use futures::future::join_all;
-use gpui::{Hsla, Rgba, Task};
-use itertools::Itertools;
-use language::point_from_lsp;
-use multi_buffer::Anchor;
-use project::{DocumentColor, InlayId};
-use settings::Settings as _;
-use text::{Bias, BufferId, OffsetRangeExt as _};
-use ui::{App, Context, Window};
-use util::post_inc;
-
-use crate::{
-    DisplayPoint, Editor, EditorSettings, EditorSnapshot, FETCH_COLORS_DEBOUNCE_TIMEOUT,
-    InlaySplice, RangeToAnchorExt, editor_settings::DocumentColorsRenderMode, inlays::Inlay,
-};
-
-#[derive(Debug)]
-pub(super) struct LspColorData {
-    buffer_colors: HashMap<BufferId, BufferColors>,
-    render_mode: DocumentColorsRenderMode,
-}
-
-#[derive(Debug, Default)]
-struct BufferColors {
-    colors: Vec<(Range<Anchor>, DocumentColor, InlayId)>,
-    inlay_colors: HashMap<InlayId, usize>,
-    cache_version_used: usize,
-}
-
-impl LspColorData {
-    pub fn new(cx: &App) -> Self {
-        Self {
-            buffer_colors: HashMap::default(),
-            render_mode: EditorSettings::get_global(cx).lsp_document_colors,
-        }
-    }
-
-    pub fn render_mode_updated(
-        &mut self,
-        new_render_mode: DocumentColorsRenderMode,
-    ) -> Option<InlaySplice> {
-        if self.render_mode == new_render_mode {
-            return None;
-        }
-        self.render_mode = new_render_mode;
-        match new_render_mode {
-            DocumentColorsRenderMode::Inlay => Some(InlaySplice {
-                to_remove: Vec::new(),
-                to_insert: self
-                    .buffer_colors
-                    .iter()
-                    .flat_map(|(_, buffer_colors)| buffer_colors.colors.iter())
-                    .map(|(range, color, id)| {
-                        Inlay::color(
-                            id.id(),
-                            range.start,
-                            Rgba {
-                                r: color.color.red,
-                                g: color.color.green,
-                                b: color.color.blue,
-                                a: color.color.alpha,
-                            },
-                        )
-                    })
-                    .collect(),
-            }),
-            DocumentColorsRenderMode::None => Some(InlaySplice {
-                to_remove: self
-                    .buffer_colors
-                    .drain()
-                    .flat_map(|(_, buffer_colors)| buffer_colors.inlay_colors)
-                    .map(|(id, _)| id)
-                    .collect(),
-                to_insert: Vec::new(),
-            }),
-            DocumentColorsRenderMode::Border | DocumentColorsRenderMode::Background => {
-                Some(InlaySplice {
-                    to_remove: self
-                        .buffer_colors
-                        .iter_mut()
-                        .flat_map(|(_, buffer_colors)| buffer_colors.inlay_colors.drain())
-                        .map(|(id, _)| id)
-                        .collect(),
-                    to_insert: Vec::new(),
-                })
-            }
-        }
-    }
-
-    fn set_colors(
-        &mut self,
-        buffer_id: BufferId,
-        colors: Vec<(Range<Anchor>, DocumentColor, InlayId)>,
-        cache_version: Option<usize>,
-    ) -> bool {
-        let buffer_colors = self.buffer_colors.entry(buffer_id).or_default();
-        if let Some(cache_version) = cache_version {
-            buffer_colors.cache_version_used = cache_version;
-        }
-        if buffer_colors.colors == colors {
-            return false;
-        }
-
-        buffer_colors.inlay_colors = colors
-            .iter()
-            .enumerate()
-            .map(|(i, (_, _, id))| (*id, i))
-            .collect();
-        buffer_colors.colors = colors;
-        true
-    }
-
-    pub fn editor_display_highlights(
-        &self,
-        snapshot: &EditorSnapshot,
-    ) -> (DocumentColorsRenderMode, Vec<(Range<DisplayPoint>, Hsla)>) {
-        let render_mode = self.render_mode;
-        let highlights = if render_mode == DocumentColorsRenderMode::None
-            || render_mode == DocumentColorsRenderMode::Inlay
-        {
-            Vec::new()
-        } else {
-            self.buffer_colors
-                .iter()
-                .flat_map(|(_, buffer_colors)| &buffer_colors.colors)
-                .map(|(range, color, _)| {
-                    let display_range = range.clone().to_display_points(snapshot);
-                    let color = Hsla::from(Rgba {
-                        r: color.color.red,
-                        g: color.color.green,
-                        b: color.color.blue,
-                        a: color.color.alpha,
-                    });
-                    (display_range, color)
-                })
-                .collect()
-        };
-        (render_mode, highlights)
-    }
-}
-
-impl Editor {
-    pub(super) fn refresh_colors_for_visible_range(
-        &mut self,
-        buffer_id: Option<BufferId>,
-        _: &Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.ignore_lsp_data() {
-            return;
-        }
-        let Some(project) = self.project.clone() else {
-            return;
-        };
-        if self
-            .colors
-            .as_ref()
-            .is_none_or(|colors| colors.render_mode == DocumentColorsRenderMode::None)
-        {
-            return;
-        }
-
-        let visible_buffers = self
-            .visible_excerpts(true, cx)
-            .into_values()
-            .map(|(buffer, ..)| buffer)
-            .filter(|editor_buffer| {
-                let editor_buffer_id = editor_buffer.read(cx).remote_id();
-                buffer_id.is_none_or(|buffer_id| buffer_id == editor_buffer_id)
-                    && self.registered_buffers.contains_key(&editor_buffer_id)
-            })
-            .unique_by(|buffer| buffer.read(cx).remote_id())
-            .collect::<Vec<_>>();
-
-        let all_colors_task = project.read(cx).lsp_store().update(cx, |lsp_store, cx| {
-            visible_buffers
-                .into_iter()
-                .filter_map(|buffer| {
-                    let buffer_id = buffer.read(cx).remote_id();
-                    let known_cache_version = self.colors.as_ref().and_then(|colors| {
-                        Some(colors.buffer_colors.get(&buffer_id)?.cache_version_used)
-                    });
-                    let colors_task = lsp_store.document_colors(known_cache_version, buffer, cx)?;
-                    Some(async move { (buffer_id, colors_task.await) })
-                })
-                .collect::<Vec<_>>()
-        });
-
-        if all_colors_task.is_empty() {
-            self.refresh_colors_task = Task::ready(());
-            return;
-        }
-
-        self.refresh_colors_task = cx.spawn(async move |editor, cx| {
-            cx.background_executor()
-                .timer(FETCH_COLORS_DEBOUNCE_TIMEOUT)
-                .await;
-
-            let all_colors = join_all(all_colors_task).await;
-            if all_colors.is_empty() {
-                return;
-            }
-            let Ok((multi_buffer_snapshot, editor_excerpts)) = editor.update(cx, |editor, cx| {
-                let multi_buffer_snapshot = editor.buffer().read(cx).snapshot(cx);
-                let editor_excerpts = multi_buffer_snapshot.excerpts().fold(
-                    HashMap::default(),
-                    |mut acc, (excerpt_id, buffer_snapshot, excerpt_range)| {
-                        let excerpt_data = acc
-                            .entry(buffer_snapshot.remote_id())
-                            .or_insert_with(Vec::new);
-                        let excerpt_point_range =
-                            excerpt_range.context.to_point_utf16(buffer_snapshot);
-                        excerpt_data.push((
-                            excerpt_id,
-                            buffer_snapshot.clone(),
-                            excerpt_point_range,
-                        ));
-                        acc
-                    },
-                );
-                (multi_buffer_snapshot, editor_excerpts)
-            }) else {
-                return;
-            };
-
-            let mut new_editor_colors = HashMap::default();
-            for (buffer_id, colors) in all_colors {
-                let Some(excerpts) = editor_excerpts.get(&buffer_id) else {
-                    continue;
-                };
-                match colors {
-                    Ok(colors) => {
-                        if colors.colors.is_empty() {
-                            let new_entry =
-                                new_editor_colors.entry(buffer_id).or_insert_with(|| {
-                                    (Vec::<(Range<Anchor>, DocumentColor)>::new(), None)
-                                });
-                            new_entry.0.clear();
-                            new_entry.1 = colors.cache_version;
-                        } else {
-                            for color in colors.colors {
-                                let color_start = point_from_lsp(color.lsp_range.start);
-                                let color_end = point_from_lsp(color.lsp_range.end);
-
-                                for (excerpt_id, buffer_snapshot, excerpt_range) in excerpts {
-                                    if !excerpt_range.contains(&color_start.0)
-                                        || !excerpt_range.contains(&color_end.0)
-                                    {
-                                        continue;
-                                    }
-                                    let start = buffer_snapshot.anchor_before(
-                                        buffer_snapshot.clip_point_utf16(color_start, Bias::Left),
-                                    );
-                                    let end = buffer_snapshot.anchor_after(
-                                        buffer_snapshot.clip_point_utf16(color_end, Bias::Right),
-                                    );
-                                    let Some(range) = multi_buffer_snapshot
-                                        .anchor_range_in_excerpt(*excerpt_id, start..end)
-                                    else {
-                                        continue;
-                                    };
-
-                                    let new_entry =
-                                        new_editor_colors.entry(buffer_id).or_insert_with(|| {
-                                            (Vec::<(Range<Anchor>, DocumentColor)>::new(), None)
-                                        });
-                                    new_entry.1 = colors.cache_version;
-                                    let new_buffer_colors = &mut new_entry.0;
-
-                                    let (Ok(i) | Err(i)) =
-                                        new_buffer_colors.binary_search_by(|(probe, _)| {
-                                            probe
-                                                .start
-                                                .cmp(&range.start, &multi_buffer_snapshot)
-                                                .then_with(|| {
-                                                    probe
-                                                        .end
-                                                        .cmp(&range.end, &multi_buffer_snapshot)
-                                                })
-                                        });
-                                    new_buffer_colors.insert(i, (range, color));
-                                    break;
-                                }
-                            }
-                        }
-                    }
-                    Err(e) => log::error!("Failed to retrieve document colors: {e}"),
-                }
-            }
-
-            editor
-                .update(cx, |editor, cx| {
-                    let mut colors_splice = InlaySplice::default();
-                    let Some(colors) = &mut editor.colors else {
-                        return;
-                    };
-                    let mut updated = false;
-                    for (buffer_id, (new_buffer_colors, new_cache_version)) in new_editor_colors {
-                        let mut new_buffer_color_inlays =
-                            Vec::with_capacity(new_buffer_colors.len());
-                        let mut existing_buffer_colors = colors
-                            .buffer_colors
-                            .entry(buffer_id)
-                            .or_default()
-                            .colors
-                            .iter()
-                            .peekable();
-                        for (new_range, new_color) in new_buffer_colors {
-                            let rgba_color = Rgba {
-                                r: new_color.color.red,
-                                g: new_color.color.green,
-                                b: new_color.color.blue,
-                                a: new_color.color.alpha,
-                            };
-
-                            loop {
-                                match existing_buffer_colors.peek() {
-                                    Some((existing_range, existing_color, existing_inlay_id)) => {
-                                        match existing_range
-                                            .start
-                                            .cmp(&new_range.start, &multi_buffer_snapshot)
-                                            .then_with(|| {
-                                                existing_range
-                                                    .end
-                                                    .cmp(&new_range.end, &multi_buffer_snapshot)
-                                            }) {
-                                            cmp::Ordering::Less => {
-                                                colors_splice.to_remove.push(*existing_inlay_id);
-                                                existing_buffer_colors.next();
-                                                continue;
-                                            }
-                                            cmp::Ordering::Equal => {
-                                                if existing_color == &new_color {
-                                                    new_buffer_color_inlays.push((
-                                                        new_range,
-                                                        new_color,
-                                                        *existing_inlay_id,
-                                                    ));
-                                                } else {
-                                                    colors_splice
-                                                        .to_remove
-                                                        .push(*existing_inlay_id);
-
-                                                    let inlay = Inlay::color(
-                                                        post_inc(&mut editor.next_color_inlay_id),
-                                                        new_range.start,
-                                                        rgba_color,
-                                                    );
-                                                    let inlay_id = inlay.id;
-                                                    colors_splice.to_insert.push(inlay);
-                                                    new_buffer_color_inlays
-                                                        .push((new_range, new_color, inlay_id));
-                                                }
-                                                existing_buffer_colors.next();
-                                                break;
-                                            }
-                                            cmp::Ordering::Greater => {
-                                                let inlay = Inlay::color(
-                                                    post_inc(&mut editor.next_color_inlay_id),
-                                                    new_range.start,
-                                                    rgba_color,
-                                                );
-                                                let inlay_id = inlay.id;
-                                                colors_splice.to_insert.push(inlay);
-                                                new_buffer_color_inlays
-                                                    .push((new_range, new_color, inlay_id));
-                                                break;
-                                            }
-                                        }
-                                    }
-                                    None => {
-                                        let inlay = Inlay::color(
-                                            post_inc(&mut editor.next_color_inlay_id),
-                                            new_range.start,
-                                            rgba_color,
-                                        );
-                                        let inlay_id = inlay.id;
-                                        colors_splice.to_insert.push(inlay);
-                                        new_buffer_color_inlays
-                                            .push((new_range, new_color, inlay_id));
-                                        break;
-                                    }
-                                }
-                            }
-                        }
-
-                        if existing_buffer_colors.peek().is_some() {
-                            colors_splice
-                                .to_remove
-                                .extend(existing_buffer_colors.map(|(_, _, id)| *id));
-                        }
-                        updated |= colors.set_colors(
-                            buffer_id,
-                            new_buffer_color_inlays,
-                            new_cache_version,
-                        );
-                    }
-
-                    if colors.render_mode == DocumentColorsRenderMode::Inlay
-                        && !colors_splice.is_empty()
-                    {
-                        editor.splice_inlays(&colors_splice.to_remove, colors_splice.to_insert, cx);
-                        updated = true;
-                    }
-
-                    if updated {
-                        cx.notify();
-                    }
-                })
-                .ok();
-        });
-    }
-}
diff --git a/crates/editor/src/lsp_ext.rs b/crates/editor/src/lsp_ext.rs
deleted file mode 100644
index 37cc734ab1..0000000000
--- a/crates/editor/src/lsp_ext.rs
+++ /dev/null
@@ -1,181 +0,0 @@
-use std::sync::Arc;
-use std::time::Duration;
-
-use crate::Editor;
-use collections::HashMap;
-use gpui::AsyncApp;
-use gpui::{App, Entity, Task};
-use itertools::Itertools;
-use language::Buffer;
-use language::Language;
-use lsp::LanguageServerId;
-use lsp::LanguageServerName;
-use multi_buffer::Anchor;
-use project::LanguageServerToQuery;
-use project::LocationLink;
-use project::Project;
-use project::TaskSourceKind;
-use project::lsp_store::lsp_ext_command::GetLspRunnables;
-use smol::future::FutureExt as _;
-use task::ResolvedTask;
-use task::TaskContext;
-use text::BufferId;
-use ui::SharedString;
-use util::ResultExt as _;
-
-pub(crate) fn find_specific_language_server_in_selection<F>(
-    editor: &Editor,
-    cx: &mut App,
-    filter_language: F,
-    language_server_name: LanguageServerName,
-) -> Option<(Anchor, Arc<Language>, LanguageServerId, Entity<Buffer>)>
-where
-    F: Fn(&Language) -> bool,
-{
-    let project = editor.project.clone()?;
-    editor
-        .selections
-        .disjoint_anchors_arc()
-        .iter()
-        .filter_map(|selection| Some((selection.head(), selection.head().text_anchor.buffer_id?)))
-        .unique_by(|(_, buffer_id)| *buffer_id)
-        .find_map(|(trigger_anchor, buffer_id)| {
-            let buffer = editor.buffer().read(cx).buffer(buffer_id)?;
-            let language = buffer.read(cx).language_at(trigger_anchor.text_anchor)?;
-            if filter_language(&language) {
-                let server_id = buffer.update(cx, |buffer, cx| {
-                    project
-                        .read(cx)
-                        .language_server_id_for_name(buffer, &language_server_name, cx)
-                })?;
-                Some((trigger_anchor, language, server_id, buffer))
-            } else {
-                None
-            }
-        })
-}
-
-async fn lsp_task_context(
-    project: &Entity<Project>,
-    buffer: &Entity<Buffer>,
-    cx: &mut AsyncApp,
-) -> Option<TaskContext> {
-    let (worktree_store, environment) = project
-        .read_with(cx, |project, _| {
-            (project.worktree_store(), project.environment().clone())
-        })
-        .ok()?;
-
-    let worktree_abs_path = cx
-        .update(|cx| {
-            let worktree_id = buffer.read(cx).file().map(|f| f.worktree_id(cx));
-
-            worktree_id
-                .and_then(|worktree_id| worktree_store.read(cx).worktree_for_id(worktree_id, cx))
-                .and_then(|worktree| worktree.read(cx).root_dir())
-        })
-        .ok()?;
-
-    let project_env = environment
-        .update(cx, |environment, cx| {
-            environment.buffer_environment(buffer, &worktree_store, cx)
-        })
-        .ok()?
-        .await;
-
-    Some(TaskContext {
-        cwd: worktree_abs_path.map(|p| p.to_path_buf()),
-        project_env: project_env.unwrap_or_default(),
-        ..TaskContext::default()
-    })
-}
-
-pub fn lsp_tasks(
-    project: Entity<Project>,
-    task_sources: &HashMap<LanguageServerName, Vec<BufferId>>,
-    for_position: Option<text::Anchor>,
-    cx: &mut App,
-) -> Task<Vec<(TaskSourceKind, Vec<(Option<LocationLink>, ResolvedTask)>)>> {
-    let lsp_task_sources = task_sources
-        .iter()
-        .filter_map(|(name, buffer_ids)| {
-            let buffers = buffer_ids
-                .iter()
-                .filter(|&&buffer_id| match for_position {
-                    Some(for_position) => for_position.buffer_id == Some(buffer_id),
-                    None => true,
-                })
-                .filter_map(|&buffer_id| project.read(cx).buffer_for_id(buffer_id, cx))
-                .collect::<Vec<_>>();
-
-            let server_id = buffers.iter().find_map(|buffer| {
-                project.read_with(cx, |project, cx| {
-                    project.language_server_id_for_name(buffer.read(cx), name, cx)
-                })
-            });
-            server_id.zip(Some(buffers))
-        })
-        .collect::<Vec<_>>();
-
-    cx.spawn(async move |cx| {
-        cx.spawn(async move |cx| {
-            let mut lsp_tasks = HashMap::default();
-            for (server_id, buffers) in lsp_task_sources {
-                let mut new_lsp_tasks = Vec::new();
-                for buffer in buffers {
-                    let source_kind = match buffer.update(cx, |buffer, _| {
-                        buffer.language().map(|language| language.name())
-                    }) {
-                        Ok(Some(language_name)) => TaskSourceKind::Lsp {
-                            server: server_id,
-                            language_name: SharedString::from(language_name),
-                        },
-                        Ok(None) => continue,
-                        Err(_) => return Vec::new(),
-                    };
-                    let id_base = source_kind.to_id_base();
-                    let lsp_buffer_context = lsp_task_context(&project, &buffer, cx)
-                        .await
-                        .unwrap_or_default();
-
-                    if let Ok(runnables_task) = project.update(cx, |project, cx| {
-                        let buffer_id = buffer.read(cx).remote_id();
-                        project.request_lsp(
-                            buffer,
-                            LanguageServerToQuery::Other(server_id),
-                            GetLspRunnables {
-                                buffer_id,
-                                position: for_position,
-                            },
-                            cx,
-                        )
-                    }) && let Some(new_runnables) = runnables_task.await.log_err()
-                    {
-                        new_lsp_tasks.extend(new_runnables.runnables.into_iter().filter_map(
-                            |(location, runnable)| {
-                                let resolved_task =
-                                    runnable.resolve_task(&id_base, &lsp_buffer_context)?;
-                                Some((location, resolved_task))
-                            },
-                        ));
-                    }
-                    lsp_tasks
-                        .entry(source_kind)
-                        .or_insert_with(Vec::new)
-                        .append(&mut new_lsp_tasks);
-                }
-            }
-            lsp_tasks.into_iter().collect()
-        })
-        .race({
-            // `lsp::LSP_REQUEST_TIMEOUT` is larger than we want for the modal to open fast
-            let timer = cx.background_executor().timer(Duration::from_millis(200));
-            async move {
-                timer.await;
-                log::info!("Timed out waiting for LSP tasks");
-                Vec::new()
-            }
-        })
-        .await
-    })
-}
diff --git a/crates/editor/src/mouse_context_menu.rs b/crates/editor/src/mouse_context_menu.rs
deleted file mode 100644
index 36521d46a6..0000000000
--- a/crates/editor/src/mouse_context_menu.rs
+++ /dev/null
@@ -1,373 +0,0 @@
-use crate::{
-    Copy, CopyAndTrim, CopyPermalinkToLine, Cut, DisplayPoint, DisplaySnapshot, Editor,
-    EvaluateSelectedText, FindAllReferences, GoToDeclaration, GoToDefinition, GoToImplementation,
-    GoToTypeDefinition, Paste, Rename, RevealInFileManager, RunToCursor, SelectMode,
-    SelectionEffects, SelectionExt, ToDisplayPoint, ToggleCodeActions,
-    actions::{Format, FormatSelections},
-    selections_collection::SelectionsCollection,
-};
-use gpui::prelude::FluentBuilder;
-use gpui::{Context, DismissEvent, Entity, Focusable as _, Pixels, Point, Subscription, Window};
-use project::DisableAiSettings;
-use settings::Settings;
-use std::ops::Range;
-use text::PointUtf16;
-use workspace::OpenInTerminal;
-use zed_actions::agent::AddSelectionToThread;
-
-#[derive(Debug)]
-pub enum MenuPosition {
-    /// When the editor is scrolled, the context menu stays on the exact
-    /// same position on the screen, never disappearing.
-    PinnedToScreen(Point<Pixels>),
-    /// When the editor is scrolled, the context menu follows the position it is associated with.
-    /// Disappears when the position is no longer visible.
-    PinnedToEditor {
-        source: multi_buffer::Anchor,
-        offset: Point<Pixels>,
-    },
-}
-
-pub struct MouseContextMenu {
-    pub(crate) position: MenuPosition,
-    pub(crate) context_menu: Entity<ui::ContextMenu>,
-    _dismiss_subscription: Subscription,
-    _cursor_move_subscription: Subscription,
-}
-
-impl std::fmt::Debug for MouseContextMenu {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("MouseContextMenu")
-            .field("position", &self.position)
-            .field("context_menu", &self.context_menu)
-            .finish()
-    }
-}
-
-impl MouseContextMenu {
-    pub(crate) fn pinned_to_editor(
-        editor: &mut Editor,
-        source: multi_buffer::Anchor,
-        position: Point<Pixels>,
-        context_menu: Entity<ui::ContextMenu>,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) -> Option<Self> {
-        let editor_snapshot = editor.snapshot(window, cx);
-        let content_origin = editor.last_bounds?.origin
-            + Point {
-                x: editor.gutter_dimensions.width,
-                y: Pixels::ZERO,
-            };
-        let source_position = editor.to_pixel_point(source, &editor_snapshot, window, cx)?;
-        let menu_position = MenuPosition::PinnedToEditor {
-            source,
-            offset: position - (source_position + content_origin),
-        };
-        Some(MouseContextMenu::new(
-            editor,
-            menu_position,
-            context_menu,
-            window,
-            cx,
-        ))
-    }
-
-    pub(crate) fn new(
-        editor: &Editor,
-        position: MenuPosition,
-        context_menu: Entity<ui::ContextMenu>,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) -> Self {
-        let context_menu_focus = context_menu.focus_handle(cx);
-
-        // Since `ContextMenu` is rendered in a deferred fashion its focus
-        // handle is not linked to the Editor's until after the deferred draw
-        // callback runs.
-        // We need to wait for that to happen before focusing it, so that
-        // calling `contains_focused` on the editor's focus handle returns
-        // `true` when the `ContextMenu` is focused.
-        let focus_handle = context_menu_focus.clone();
-        cx.on_next_frame(window, move |_, window, cx| {
-            cx.on_next_frame(window, move |_, window, _cx| {
-                window.focus(&focus_handle);
-            });
-        });
-
-        let _dismiss_subscription = cx.subscribe_in(&context_menu, window, {
-            let context_menu_focus = context_menu_focus.clone();
-            move |editor, _, _event: &DismissEvent, window, cx| {
-                editor.mouse_context_menu.take();
-                if context_menu_focus.contains_focused(window, cx) {
-                    window.focus(&editor.focus_handle(cx));
-                }
-            }
-        });
-
-        let selection_init = editor.selections.newest_anchor().clone();
-
-        let _cursor_move_subscription = cx.subscribe_in(
-            &cx.entity(),
-            window,
-            move |editor, _, event: &crate::EditorEvent, window, cx| {
-                let crate::EditorEvent::SelectionsChanged { local: true } = event else {
-                    return;
-                };
-                let display_snapshot = &editor
-                    .display_map
-                    .update(cx, |display_map, cx| display_map.snapshot(cx));
-                let selection_init_range = selection_init.display_range(display_snapshot);
-                let selection_now_range = editor
-                    .selections
-                    .newest_anchor()
-                    .display_range(display_snapshot);
-                if selection_now_range == selection_init_range {
-                    return;
-                }
-                editor.mouse_context_menu.take();
-                if context_menu_focus.contains_focused(window, cx) {
-                    window.focus(&editor.focus_handle(cx));
-                }
-            },
-        );
-
-        Self {
-            position,
-            context_menu,
-            _dismiss_subscription,
-            _cursor_move_subscription,
-        }
-    }
-}
-
-fn display_ranges<'a>(
-    display_map: &'a DisplaySnapshot,
-    selections: &'a SelectionsCollection,
-) -> impl Iterator<Item = Range<DisplayPoint>> + 'a {
-    let pending = selections.pending_anchor();
-    selections
-        .disjoint_anchors()
-        .iter()
-        .chain(pending)
-        .map(move |s| s.start.to_display_point(display_map)..s.end.to_display_point(display_map))
-}
-
-pub fn deploy_context_menu(
-    editor: &mut Editor,
-    position: Option<Point<Pixels>>,
-    point: DisplayPoint,
-    window: &mut Window,
-    cx: &mut Context<Editor>,
-) {
-    if !editor.is_focused(window) {
-        window.focus(&editor.focus_handle(cx));
-    }
-
-    // Don't show context menu for inline editors
-    if !editor.mode().is_full() {
-        return;
-    }
-
-    let display_map = editor.display_snapshot(cx);
-    let source_anchor = display_map.display_point_to_anchor(point, text::Bias::Right);
-    let context_menu = if let Some(custom) = editor.custom_context_menu.take() {
-        let menu = custom(editor, point, window, cx);
-        editor.custom_context_menu = Some(custom);
-        let Some(menu) = menu else {
-            return;
-        };
-        menu
-    } else {
-        // Don't show the context menu if there isn't a project associated with this editor
-        let Some(project) = editor.project.clone() else {
-            return;
-        };
-
-        let snapshot = editor.snapshot(window, cx);
-        let display_map = editor.display_snapshot(cx);
-        let buffer = snapshot.buffer_snapshot();
-        let anchor = buffer.anchor_before(point.to_point(&display_map));
-        if !display_ranges(&display_map, &editor.selections).any(|r| r.contains(&point)) {
-            // Move the cursor to the clicked location so that dispatched actions make sense
-            editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                s.clear_disjoint();
-                s.set_pending_anchor_range(anchor..anchor, SelectMode::Character);
-            });
-        }
-
-        let focus = window.focused(cx);
-        let has_reveal_target = editor.target_file(cx).is_some();
-        let has_selections = editor
-            .selections
-            .all::<PointUtf16>(&display_map)
-            .into_iter()
-            .any(|s| !s.is_empty());
-        let has_git_repo = buffer
-            .buffer_id_for_anchor(anchor)
-            .is_some_and(|buffer_id| {
-                project
-                    .read(cx)
-                    .git_store()
-                    .read(cx)
-                    .repository_and_path_for_buffer_id(buffer_id, cx)
-                    .is_some()
-            });
-
-        let evaluate_selection = window.is_action_available(&EvaluateSelectedText, cx);
-        let run_to_cursor = window.is_action_available(&RunToCursor, cx);
-        let disable_ai = DisableAiSettings::get_global(cx).disable_ai;
-
-        ui::ContextMenu::build(window, cx, |menu, _window, _cx| {
-            let builder = menu
-                .on_blur_subscription(Subscription::new(|| {}))
-                .when(run_to_cursor, |builder| {
-                    builder.action("Run to Cursor", Box::new(RunToCursor))
-                })
-                .when(evaluate_selection && has_selections, |builder| {
-                    builder.action("Evaluate Selection", Box::new(EvaluateSelectedText))
-                })
-                .when(
-                    run_to_cursor || (evaluate_selection && has_selections),
-                    |builder| builder.separator(),
-                )
-                .action("Go to Definition", Box::new(GoToDefinition))
-                .action("Go to Declaration", Box::new(GoToDeclaration))
-                .action("Go to Type Definition", Box::new(GoToTypeDefinition))
-                .action("Go to Implementation", Box::new(GoToImplementation))
-                .action(
-                    "Find All References",
-                    Box::new(FindAllReferences::default()),
-                )
-                .separator()
-                .action("Rename Symbol", Box::new(Rename))
-                .action("Format Buffer", Box::new(Format))
-                .when(has_selections, |cx| {
-                    cx.action("Format Selections", Box::new(FormatSelections))
-                })
-                .action(
-                    "Show Code Actions",
-                    Box::new(ToggleCodeActions {
-                        deployed_from: None,
-                        quick_launch: false,
-                    }),
-                )
-                .when(!disable_ai && has_selections, |this| {
-                    this.action("Add to Agent Thread", Box::new(AddSelectionToThread))
-                })
-                .separator()
-                .action("Cut", Box::new(Cut))
-                .action("Copy", Box::new(Copy))
-                .action("Copy and Trim", Box::new(CopyAndTrim))
-                .action("Paste", Box::new(Paste))
-                .separator()
-                .action_disabled_when(
-                    !has_reveal_target,
-                    if cfg!(target_os = "macos") {
-                        "Reveal in Finder"
-                    } else {
-                        "Reveal in File Manager"
-                    },
-                    Box::new(RevealInFileManager),
-                )
-                .action_disabled_when(
-                    !has_reveal_target,
-                    "Open in Terminal",
-                    Box::new(OpenInTerminal),
-                )
-                .action_disabled_when(
-                    !has_git_repo,
-                    "Copy Permalink",
-                    Box::new(CopyPermalinkToLine),
-                )
-                .action_disabled_when(
-                    !has_git_repo,
-                    "View File History",
-                    Box::new(git::FileHistory),
-                );
-            match focus {
-                Some(focus) => builder.context(focus),
-                None => builder,
-            }
-        })
-    };
-
-    editor.mouse_context_menu = match position {
-        Some(position) => MouseContextMenu::pinned_to_editor(
-            editor,
-            source_anchor,
-            position,
-            context_menu,
-            window,
-            cx,
-        ),
-        None => {
-            let character_size = editor.character_dimensions(window);
-            let menu_position = MenuPosition::PinnedToEditor {
-                source: source_anchor,
-                offset: gpui::point(character_size.em_width, character_size.line_height),
-            };
-            Some(MouseContextMenu::new(
-                editor,
-                menu_position,
-                context_menu,
-                window,
-                cx,
-            ))
-        }
-    };
-    cx.notify();
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::{editor_tests::init_test, test::editor_lsp_test_context::EditorLspTestContext};
-    use indoc::indoc;
-
-    #[gpui::test]
-    async fn test_mouse_context_menu(cx: &mut gpui::TestAppContext) {
-        init_test(cx, |_| {});
-
-        let mut cx = EditorLspTestContext::new_rust(
-            lsp::ServerCapabilities {
-                hover_provider: Some(lsp::HoverProviderCapability::Simple(true)),
-                ..Default::default()
-            },
-            cx,
-        )
-        .await;
-
-        cx.set_state(indoc! {"
-            fn teˇst() {
-                do_work();
-            }
-        "});
-        let point = cx.display_point(indoc! {"
-            fn test() {
-                do_wˇork();
-            }
-        "});
-        cx.editor(|editor, _window, _app| assert!(editor.mouse_context_menu.is_none()));
-
-        cx.update_editor(|editor, window, cx| {
-            deploy_context_menu(editor, Some(Default::default()), point, window, cx);
-
-            // Assert that, even after deploying the editor's mouse context
-            // menu, the editor's focus handle still contains the focused
-            // element. The pane's tab bar relies on this to determine whether
-            // to show the tab bar buttons and there was a small flicker when
-            // deploying the mouse context menu that would cause this to not be
-            // true, making it so that the buttons would disappear for a couple
-            // of frames.
-            assert!(editor.focus_handle.contains_focused(window, cx));
-        });
-
-        cx.assert_editor_state(indoc! {"
-            fn test() {
-                do_wˇork();
-            }
-        "});
-        cx.editor(|editor, _window, _app| assert!(editor.mouse_context_menu.is_some()));
-    }
-}
diff --git a/crates/editor/src/movement.rs b/crates/editor/src/movement.rs
deleted file mode 100644
index 8635d89ed1..0000000000
--- a/crates/editor/src/movement.rs
+++ /dev/null
@@ -1,1353 +0,0 @@
-//! Movement module contains helper functions for calculating intended position
-//! in editor given a given motion (e.g. it handles converting a "move left" command into coordinates in editor). It is exposed mostly for use by vim crate.
-
-use super::{Bias, DisplayPoint, DisplaySnapshot, SelectionGoal, ToDisplayPoint};
-use crate::{
-    DisplayRow, EditorStyle, ToOffset, ToPoint,
-    scroll::{ScrollAnchor, ScrollOffset},
-};
-use gpui::{Pixels, WindowTextSystem};
-use language::{CharClassifier, Point};
-use multi_buffer::{MultiBufferOffset, MultiBufferRow, MultiBufferSnapshot};
-use serde::Deserialize;
-use workspace::searchable::Direction;
-
-use std::{ops::Range, sync::Arc};
-
-/// Defines search strategy for items in `movement` module.
-/// `FindRange::SingeLine` only looks for a match on a single line at a time, whereas
-/// `FindRange::MultiLine` keeps going until the end of a string.
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Deserialize)]
-pub enum FindRange {
-    SingleLine,
-    MultiLine,
-}
-
-/// TextLayoutDetails encompasses everything we need to move vertically
-/// taking into account variable width characters.
-pub struct TextLayoutDetails {
-    pub(crate) text_system: Arc<WindowTextSystem>,
-    pub(crate) editor_style: EditorStyle,
-    pub(crate) rem_size: Pixels,
-    pub scroll_anchor: ScrollAnchor,
-    pub visible_rows: Option<f64>,
-    pub vertical_scroll_margin: ScrollOffset,
-}
-
-/// Returns a column to the left of the current point, wrapping
-/// to the previous line if that point is at the start of line.
-pub fn left(map: &DisplaySnapshot, mut point: DisplayPoint) -> DisplayPoint {
-    if point.column() > 0 {
-        *point.column_mut() -= 1;
-    } else if point.row().0 > 0 {
-        *point.row_mut() -= 1;
-        *point.column_mut() = map.line_len(point.row());
-    }
-    map.clip_point(point, Bias::Left)
-}
-
-/// Returns a column to the left of the current point, doing nothing if
-/// that point is already at the start of line.
-pub fn saturating_left(map: &DisplaySnapshot, mut point: DisplayPoint) -> DisplayPoint {
-    if point.column() > 0 {
-        *point.column_mut() -= 1;
-    } else if point.column() == 0 {
-        // If the current sofr_wrap mode is used, the column corresponding to the display is 0,
-        //  which does not necessarily mean that the actual beginning of a paragraph
-        if map.display_point_to_fold_point(point, Bias::Left).column() > 0 {
-            return left(map, point);
-        }
-    }
-    map.clip_point(point, Bias::Left)
-}
-
-/// Returns a column to the right of the current point, wrapping
-/// to the next line if that point is at the end of line.
-pub fn right(map: &DisplaySnapshot, mut point: DisplayPoint) -> DisplayPoint {
-    if point.column() < map.line_len(point.row()) {
-        *point.column_mut() += 1;
-    } else if point.row() < map.max_point().row() {
-        *point.row_mut() += 1;
-        *point.column_mut() = 0;
-    }
-    map.clip_point(point, Bias::Right)
-}
-
-/// Returns a column to the right of the current point, not performing any wrapping
-/// if that point is already at the end of line.
-pub fn saturating_right(map: &DisplaySnapshot, mut point: DisplayPoint) -> DisplayPoint {
-    *point.column_mut() += 1;
-    map.clip_point(point, Bias::Right)
-}
-
-/// Returns a display point for the preceding displayed line (which might be a soft-wrapped line).
-pub fn up(
-    map: &DisplaySnapshot,
-    start: DisplayPoint,
-    goal: SelectionGoal,
-    preserve_column_at_start: bool,
-    text_layout_details: &TextLayoutDetails,
-) -> (DisplayPoint, SelectionGoal) {
-    up_by_rows(
-        map,
-        start,
-        1,
-        goal,
-        preserve_column_at_start,
-        text_layout_details,
-    )
-}
-
-/// Returns a display point for the next displayed line (which might be a soft-wrapped line).
-pub fn down(
-    map: &DisplaySnapshot,
-    start: DisplayPoint,
-    goal: SelectionGoal,
-    preserve_column_at_end: bool,
-    text_layout_details: &TextLayoutDetails,
-) -> (DisplayPoint, SelectionGoal) {
-    down_by_rows(
-        map,
-        start,
-        1,
-        goal,
-        preserve_column_at_end,
-        text_layout_details,
-    )
-}
-
-pub(crate) fn up_by_rows(
-    map: &DisplaySnapshot,
-    start: DisplayPoint,
-    row_count: u32,
-    goal: SelectionGoal,
-    preserve_column_at_start: bool,
-    text_layout_details: &TextLayoutDetails,
-) -> (DisplayPoint, SelectionGoal) {
-    let goal_x = match goal {
-        SelectionGoal::HorizontalPosition(x) => x.into(),
-        SelectionGoal::WrappedHorizontalPosition((_, x)) => x.into(),
-        SelectionGoal::HorizontalRange { end, .. } => end.into(),
-        _ => map.x_for_display_point(start, text_layout_details),
-    };
-
-    let prev_row = DisplayRow(start.row().0.saturating_sub(row_count));
-    let mut point = map.clip_point(
-        DisplayPoint::new(prev_row, map.line_len(prev_row)),
-        Bias::Left,
-    );
-    if point.row() < start.row() {
-        *point.column_mut() = map.display_column_for_x(point.row(), goal_x, text_layout_details)
-    } else if preserve_column_at_start {
-        return (start, goal);
-    } else {
-        point = DisplayPoint::new(DisplayRow(0), 0);
-    }
-
-    let mut clipped_point = map.clip_point(point, Bias::Left);
-    if clipped_point.row() < point.row() {
-        clipped_point = map.clip_point(point, Bias::Right);
-    }
-    (
-        clipped_point,
-        SelectionGoal::HorizontalPosition(goal_x.into()),
-    )
-}
-
-pub(crate) fn down_by_rows(
-    map: &DisplaySnapshot,
-    start: DisplayPoint,
-    row_count: u32,
-    goal: SelectionGoal,
-    preserve_column_at_end: bool,
-    text_layout_details: &TextLayoutDetails,
-) -> (DisplayPoint, SelectionGoal) {
-    let goal_x = match goal {
-        SelectionGoal::HorizontalPosition(x) => x.into(),
-        SelectionGoal::WrappedHorizontalPosition((_, x)) => x.into(),
-        SelectionGoal::HorizontalRange { end, .. } => end.into(),
-        _ => map.x_for_display_point(start, text_layout_details),
-    };
-
-    let new_row = DisplayRow(start.row().0 + row_count);
-    let mut point = map.clip_point(DisplayPoint::new(new_row, 0), Bias::Right);
-    if point.row() > start.row() {
-        *point.column_mut() = map.display_column_for_x(point.row(), goal_x, text_layout_details)
-    } else if preserve_column_at_end {
-        return (start, goal);
-    } else {
-        point = map.max_point();
-    }
-
-    let mut clipped_point = map.clip_point(point, Bias::Right);
-    if clipped_point.row() > point.row() {
-        clipped_point = map.clip_point(point, Bias::Left);
-    }
-    (
-        clipped_point,
-        SelectionGoal::HorizontalPosition(goal_x.into()),
-    )
-}
-
-/// Returns a position of the start of line.
-/// If `stop_at_soft_boundaries` is true, the returned position is that of the
-/// displayed line (e.g. it could actually be in the middle of a text line if that line is soft-wrapped).
-/// Otherwise it's always going to be the start of a logical line.
-pub fn line_beginning(
-    map: &DisplaySnapshot,
-    display_point: DisplayPoint,
-    stop_at_soft_boundaries: bool,
-) -> DisplayPoint {
-    let point = display_point.to_point(map);
-    let soft_line_start = map.clip_point(DisplayPoint::new(display_point.row(), 0), Bias::Right);
-    let line_start = map.prev_line_boundary(point).1;
-
-    if stop_at_soft_boundaries && display_point != soft_line_start {
-        soft_line_start
-    } else {
-        line_start
-    }
-}
-
-/// Returns the last indented position on a given line.
-/// If `stop_at_soft_boundaries` is true, the returned [`DisplayPoint`] is that of a
-/// displayed line (e.g. if there's soft wrap it's gonna be returned),
-/// otherwise it's always going to be a start of a logical line.
-pub fn indented_line_beginning(
-    map: &DisplaySnapshot,
-    display_point: DisplayPoint,
-    stop_at_soft_boundaries: bool,
-    stop_at_indent: bool,
-) -> DisplayPoint {
-    let point = display_point.to_point(map);
-    let soft_line_start = map.clip_point(DisplayPoint::new(display_point.row(), 0), Bias::Right);
-    let indent_start = Point::new(
-        point.row,
-        map.buffer_snapshot()
-            .indent_size_for_line(MultiBufferRow(point.row))
-            .len,
-    )
-    .to_display_point(map);
-    let line_start = map.prev_line_boundary(point).1;
-
-    if stop_at_soft_boundaries && soft_line_start > indent_start && display_point != soft_line_start
-    {
-        soft_line_start
-    } else if stop_at_indent && (display_point > indent_start || display_point == line_start) {
-        indent_start
-    } else {
-        line_start
-    }
-}
-
-/// Returns a position of the end of line.
-///
-/// If `stop_at_soft_boundaries` is true, the returned position is that of the
-/// displayed line (e.g. it could actually be in the middle of a text line if that line is soft-wrapped).
-/// Otherwise it's always going to be the end of a logical line.
-pub fn line_end(
-    map: &DisplaySnapshot,
-    display_point: DisplayPoint,
-    stop_at_soft_boundaries: bool,
-) -> DisplayPoint {
-    let soft_line_end = map.clip_point(
-        DisplayPoint::new(display_point.row(), map.line_len(display_point.row())),
-        Bias::Left,
-    );
-    if stop_at_soft_boundaries && display_point != soft_line_end {
-        soft_line_end
-    } else {
-        map.next_line_boundary(display_point.to_point(map)).1
-    }
-}
-
-/// Returns a position of the previous word boundary, where a word character is defined as either
-/// uppercase letter, lowercase letter, '_' character or language-specific word character (like '-' in CSS).
-pub fn previous_word_start(map: &DisplaySnapshot, point: DisplayPoint) -> DisplayPoint {
-    let raw_point = point.to_point(map);
-    let classifier = map.buffer_snapshot().char_classifier_at(raw_point);
-
-    let mut is_first_iteration = true;
-    find_preceding_boundary_display_point(map, point, FindRange::MultiLine, |left, right| {
-        // Make alt-left skip punctuation to respect VSCode behaviour. For example: hello.| goes to |hello.
-        if is_first_iteration
-            && classifier.is_punctuation(right)
-            && !classifier.is_punctuation(left)
-            && left != '\n'
-        {
-            is_first_iteration = false;
-            return false;
-        }
-        is_first_iteration = false;
-
-        (classifier.kind(left) != classifier.kind(right) && !classifier.is_whitespace(right))
-            || left == '\n'
-    })
-}
-
-/// Returns a position of the previous word boundary, where a word character is defined as either
-/// uppercase letter, lowercase letter, '_' character, language-specific word character (like '-' in CSS) or newline.
-pub fn previous_word_start_or_newline(map: &DisplaySnapshot, point: DisplayPoint) -> DisplayPoint {
-    let raw_point = point.to_point(map);
-    let classifier = map.buffer_snapshot().char_classifier_at(raw_point);
-
-    find_preceding_boundary_display_point(map, point, FindRange::MultiLine, |left, right| {
-        (classifier.kind(left) != classifier.kind(right) && !classifier.is_whitespace(right))
-            || left == '\n'
-            || right == '\n'
-    })
-}
-
-/// Text movements are too greedy, making deletions too greedy too.
-/// Makes deletions more ergonomic by potentially reducing the deletion range based on its text contents:
-/// * whitespace sequences with length >= 2 stop the deletion after removal (despite movement jumping over the word behind the whitespaces)
-/// * brackets stop the deletion after removal (despite movement currently not accounting for these and jumping over)
-pub fn adjust_greedy_deletion(
-    map: &DisplaySnapshot,
-    delete_from: DisplayPoint,
-    delete_until: DisplayPoint,
-    ignore_brackets: bool,
-) -> DisplayPoint {
-    if delete_from == delete_until {
-        return delete_until;
-    }
-    let is_backward = delete_from > delete_until;
-    let delete_range = if is_backward {
-        map.display_point_to_point(delete_until, Bias::Left)
-            .to_offset(map.buffer_snapshot())
-            ..map
-                .display_point_to_point(delete_from, Bias::Right)
-                .to_offset(map.buffer_snapshot())
-    } else {
-        map.display_point_to_point(delete_from, Bias::Left)
-            .to_offset(map.buffer_snapshot())
-            ..map
-                .display_point_to_point(delete_until, Bias::Right)
-                .to_offset(map.buffer_snapshot())
-    };
-
-    let trimmed_delete_range = if ignore_brackets {
-        delete_range
-    } else {
-        let brackets_in_delete_range = map
-            .buffer_snapshot()
-            .bracket_ranges(delete_range.clone())
-            .into_iter()
-            .flatten()
-            .flat_map(|(left_bracket, right_bracket)| {
-                [
-                    left_bracket.start,
-                    left_bracket.end,
-                    right_bracket.start,
-                    right_bracket.end,
-                ]
-            })
-            .filter(|&bracket| delete_range.start < bracket && bracket < delete_range.end);
-        let closest_bracket = if is_backward {
-            brackets_in_delete_range.max()
-        } else {
-            brackets_in_delete_range.min()
-        };
-
-        if is_backward {
-            closest_bracket.unwrap_or(delete_range.start)..delete_range.end
-        } else {
-            delete_range.start..closest_bracket.unwrap_or(delete_range.end)
-        }
-    };
-
-    let mut whitespace_sequences = Vec::new();
-    let mut current_offset = trimmed_delete_range.start;
-    let mut whitespace_sequence_length = MultiBufferOffset(0);
-    let mut whitespace_sequence_start = MultiBufferOffset(0);
-    for ch in map
-        .buffer_snapshot()
-        .text_for_range(trimmed_delete_range.clone())
-        .flat_map(str::chars)
-    {
-        if ch.is_whitespace() {
-            if whitespace_sequence_length == MultiBufferOffset(0) {
-                whitespace_sequence_start = current_offset;
-            }
-            whitespace_sequence_length += 1;
-        } else {
-            if whitespace_sequence_length >= MultiBufferOffset(2) {
-                whitespace_sequences.push((whitespace_sequence_start, current_offset));
-            }
-            whitespace_sequence_start = MultiBufferOffset(0);
-            whitespace_sequence_length = MultiBufferOffset(0);
-        }
-        current_offset += ch.len_utf8();
-    }
-    if whitespace_sequence_length >= MultiBufferOffset(2) {
-        whitespace_sequences.push((whitespace_sequence_start, current_offset));
-    }
-
-    let closest_whitespace_end = if is_backward {
-        whitespace_sequences.last().map(|&(start, _)| start)
-    } else {
-        whitespace_sequences.first().map(|&(_, end)| end)
-    };
-
-    closest_whitespace_end
-        .unwrap_or_else(|| {
-            if is_backward {
-                trimmed_delete_range.start
-            } else {
-                trimmed_delete_range.end
-            }
-        })
-        .to_display_point(map)
-}
-
-/// Returns a position of the previous subword boundary, where a subword is defined as a run of
-/// word characters of the same "subkind" - where subcharacter kinds are '_' character,
-/// lowerspace characters and uppercase characters.
-pub fn previous_subword_start(map: &DisplaySnapshot, point: DisplayPoint) -> DisplayPoint {
-    let raw_point = point.to_point(map);
-    let classifier = map.buffer_snapshot().char_classifier_at(raw_point);
-
-    find_preceding_boundary_display_point(map, point, FindRange::MultiLine, |left, right| {
-        is_subword_start(left, right, &classifier) || left == '\n'
-    })
-}
-
-pub fn is_subword_start(left: char, right: char, classifier: &CharClassifier) -> bool {
-    let is_word_start = classifier.kind(left) != classifier.kind(right) && !right.is_whitespace();
-    let is_subword_start = classifier.is_word('-') && left == '-' && right != '-'
-        || left == '_' && right != '_'
-        || left.is_lowercase() && right.is_uppercase();
-    is_word_start || is_subword_start
-}
-
-/// Returns a position of the next word boundary, where a word character is defined as either
-/// uppercase letter, lowercase letter, '_' character or language-specific word character (like '-' in CSS).
-pub fn next_word_end(map: &DisplaySnapshot, point: DisplayPoint) -> DisplayPoint {
-    let raw_point = point.to_point(map);
-    let classifier = map.buffer_snapshot().char_classifier_at(raw_point);
-    let mut is_first_iteration = true;
-    find_boundary(map, point, FindRange::MultiLine, |left, right| {
-        // Make alt-right skip punctuation to respect VSCode behaviour. For example: |.hello goes to .hello|
-        if is_first_iteration
-            && classifier.is_punctuation(left)
-            && !classifier.is_punctuation(right)
-            && right != '\n'
-        {
-            is_first_iteration = false;
-            return false;
-        }
-        is_first_iteration = false;
-
-        (classifier.kind(left) != classifier.kind(right) && !classifier.is_whitespace(left))
-            || right == '\n'
-    })
-}
-
-/// Returns a position of the next word boundary, where a word character is defined as either
-/// uppercase letter, lowercase letter, '_' character, language-specific word character (like '-' in CSS) or newline.
-pub fn next_word_end_or_newline(map: &DisplaySnapshot, point: DisplayPoint) -> DisplayPoint {
-    let raw_point = point.to_point(map);
-    let classifier = map.buffer_snapshot().char_classifier_at(raw_point);
-
-    let mut on_starting_row = true;
-    find_boundary(map, point, FindRange::MultiLine, |left, right| {
-        if left == '\n' {
-            on_starting_row = false;
-        }
-        (classifier.kind(left) != classifier.kind(right)
-            && ((on_starting_row && !left.is_whitespace())
-                || (!on_starting_row && !right.is_whitespace())))
-            || right == '\n'
-    })
-}
-
-/// Returns a position of the next subword boundary, where a subword is defined as a run of
-/// word characters of the same "subkind" - where subcharacter kinds are '_' character,
-/// lowerspace characters and uppercase characters.
-pub fn next_subword_end(map: &DisplaySnapshot, point: DisplayPoint) -> DisplayPoint {
-    let raw_point = point.to_point(map);
-    let classifier = map.buffer_snapshot().char_classifier_at(raw_point);
-
-    find_boundary(map, point, FindRange::MultiLine, |left, right| {
-        is_subword_end(left, right, &classifier) || right == '\n'
-    })
-}
-
-pub fn is_subword_end(left: char, right: char, classifier: &CharClassifier) -> bool {
-    let is_word_end =
-        (classifier.kind(left) != classifier.kind(right)) && !classifier.is_whitespace(left);
-    let is_subword_end = classifier.is_word('-') && left != '-' && right == '-'
-        || left != '_' && right == '_'
-        || left.is_lowercase() && right.is_uppercase();
-    is_word_end || is_subword_end
-}
-
-/// Returns a position of the start of the current paragraph, where a paragraph
-/// is defined as a run of non-blank lines.
-pub fn start_of_paragraph(
-    map: &DisplaySnapshot,
-    display_point: DisplayPoint,
-    mut count: usize,
-) -> DisplayPoint {
-    let point = display_point.to_point(map);
-    if point.row == 0 {
-        return DisplayPoint::zero();
-    }
-
-    let mut found_non_blank_line = false;
-    for row in (0..point.row + 1).rev() {
-        let blank = map.buffer_snapshot().is_line_blank(MultiBufferRow(row));
-        if found_non_blank_line && blank {
-            if count <= 1 {
-                return Point::new(row, 0).to_display_point(map);
-            }
-            count -= 1;
-            found_non_blank_line = false;
-        }
-
-        found_non_blank_line |= !blank;
-    }
-
-    DisplayPoint::zero()
-}
-
-/// Returns a position of the end of the current paragraph, where a paragraph
-/// is defined as a run of non-blank lines.
-pub fn end_of_paragraph(
-    map: &DisplaySnapshot,
-    display_point: DisplayPoint,
-    mut count: usize,
-) -> DisplayPoint {
-    let point = display_point.to_point(map);
-    if point.row == map.buffer_snapshot().max_row().0 {
-        return map.max_point();
-    }
-
-    let mut found_non_blank_line = false;
-    for row in point.row..=map.buffer_snapshot().max_row().0 {
-        let blank = map.buffer_snapshot().is_line_blank(MultiBufferRow(row));
-        if found_non_blank_line && blank {
-            if count <= 1 {
-                return Point::new(row, 0).to_display_point(map);
-            }
-            count -= 1;
-            found_non_blank_line = false;
-        }
-
-        found_non_blank_line |= !blank;
-    }
-
-    map.max_point()
-}
-
-pub fn start_of_excerpt(
-    map: &DisplaySnapshot,
-    display_point: DisplayPoint,
-    direction: Direction,
-) -> DisplayPoint {
-    let point = map.display_point_to_point(display_point, Bias::Left);
-    let Some(excerpt) = map.buffer_snapshot().excerpt_containing(point..point) else {
-        return display_point;
-    };
-    match direction {
-        Direction::Prev => {
-            let mut start = excerpt.start_anchor().to_display_point(map);
-            if start >= display_point && start.row() > DisplayRow(0) {
-                let Some(excerpt) = map.buffer_snapshot().excerpt_before(excerpt.id()) else {
-                    return display_point;
-                };
-                start = excerpt.start_anchor().to_display_point(map);
-            }
-            start
-        }
-        Direction::Next => {
-            let mut end = excerpt.end_anchor().to_display_point(map);
-            *end.row_mut() += 1;
-            map.clip_point(end, Bias::Right)
-        }
-    }
-}
-
-pub fn end_of_excerpt(
-    map: &DisplaySnapshot,
-    display_point: DisplayPoint,
-    direction: Direction,
-) -> DisplayPoint {
-    let point = map.display_point_to_point(display_point, Bias::Left);
-    let Some(excerpt) = map.buffer_snapshot().excerpt_containing(point..point) else {
-        return display_point;
-    };
-    match direction {
-        Direction::Prev => {
-            let mut start = excerpt.start_anchor().to_display_point(map);
-            if start.row() > DisplayRow(0) {
-                *start.row_mut() -= 1;
-            }
-            start = map.clip_point(start, Bias::Left);
-            *start.column_mut() = 0;
-            start
-        }
-        Direction::Next => {
-            let mut end = excerpt.end_anchor().to_display_point(map);
-            *end.column_mut() = 0;
-            if end <= display_point {
-                *end.row_mut() += 1;
-                let point_end = map.display_point_to_point(end, Bias::Right);
-                let Some(excerpt) = map
-                    .buffer_snapshot()
-                    .excerpt_containing(point_end..point_end)
-                else {
-                    return display_point;
-                };
-                end = excerpt.end_anchor().to_display_point(map);
-                *end.column_mut() = 0;
-            }
-            end
-        }
-    }
-}
-
-/// Scans for a boundary preceding the given start point `from` until a boundary is found,
-/// indicated by the given predicate returning true.
-/// The predicate is called with the character to the left and right of the candidate boundary location.
-/// If FindRange::SingleLine is specified and no boundary is found before the start of the current line, the start of the current line will be returned.
-pub fn find_preceding_boundary_point(
-    buffer_snapshot: &MultiBufferSnapshot,
-    from: Point,
-    find_range: FindRange,
-    mut is_boundary: impl FnMut(char, char) -> bool,
-) -> Point {
-    let mut prev_ch = None;
-    let mut offset = from.to_offset(buffer_snapshot);
-
-    for ch in buffer_snapshot.reversed_chars_at(offset) {
-        if find_range == FindRange::SingleLine && ch == '\n' {
-            break;
-        }
-        if let Some(prev_ch) = prev_ch
-            && is_boundary(ch, prev_ch)
-        {
-            break;
-        }
-
-        offset -= ch.len_utf8();
-        prev_ch = Some(ch);
-    }
-
-    offset.to_point(buffer_snapshot)
-}
-
-/// Scans for a boundary preceding the given start point `from` until a boundary is found,
-/// indicated by the given predicate returning true.
-/// The predicate is called with the character to the left and right of the candidate boundary location.
-/// If FindRange::SingleLine is specified and no boundary is found before the start of the current line, the start of the current line will be returned.
-pub fn find_preceding_boundary_display_point(
-    map: &DisplaySnapshot,
-    from: DisplayPoint,
-    find_range: FindRange,
-    is_boundary: impl FnMut(char, char) -> bool,
-) -> DisplayPoint {
-    let result = find_preceding_boundary_point(
-        map.buffer_snapshot(),
-        from.to_point(map),
-        find_range,
-        is_boundary,
-    );
-    map.clip_point(result.to_display_point(map), Bias::Left)
-}
-
-/// Scans for a boundary following the given start point until a boundary is found, indicated by the
-/// given predicate returning true. The predicate is called with the character to the left and right
-/// of the candidate boundary location, and will be called with `\n` characters indicating the start
-/// or end of a line. The function supports optionally returning the point just before the boundary
-/// is found via return_point_before_boundary.
-pub fn find_boundary_point(
-    map: &DisplaySnapshot,
-    from: DisplayPoint,
-    find_range: FindRange,
-    mut is_boundary: impl FnMut(char, char) -> bool,
-    return_point_before_boundary: bool,
-) -> DisplayPoint {
-    let mut offset = from.to_offset(map, Bias::Right);
-    let mut prev_offset = offset;
-    let mut prev_ch = None;
-
-    for ch in map.buffer_snapshot().chars_at(offset) {
-        if find_range == FindRange::SingleLine && ch == '\n' {
-            break;
-        }
-        if let Some(prev_ch) = prev_ch
-            && is_boundary(prev_ch, ch)
-        {
-            if return_point_before_boundary {
-                return map.clip_point(prev_offset.to_display_point(map), Bias::Right);
-            } else {
-                break;
-            }
-        }
-        prev_offset = offset;
-        offset += ch.len_utf8();
-        prev_ch = Some(ch);
-    }
-    map.clip_point(offset.to_display_point(map), Bias::Right)
-}
-
-pub fn find_preceding_boundary_trail(
-    map: &DisplaySnapshot,
-    head: DisplayPoint,
-    mut is_boundary: impl FnMut(char, char) -> bool,
-) -> (Option<DisplayPoint>, DisplayPoint) {
-    let mut offset = head.to_offset(map, Bias::Left);
-    let mut trail_offset = None;
-
-    let mut prev_ch = map.buffer_snapshot().chars_at(offset).next();
-    let mut forward = map.buffer_snapshot().reversed_chars_at(offset).peekable();
-
-    // Skip newlines
-    while let Some(&ch) = forward.peek() {
-        if ch == '\n' {
-            prev_ch = forward.next();
-            offset -= ch.len_utf8();
-            trail_offset = Some(offset);
-        } else {
-            break;
-        }
-    }
-
-    // Find the boundary
-    let start_offset = offset;
-    for ch in forward {
-        if let Some(prev_ch) = prev_ch
-            && is_boundary(prev_ch, ch)
-        {
-            if start_offset == offset {
-                trail_offset = Some(offset);
-            } else {
-                break;
-            }
-        }
-        offset -= ch.len_utf8();
-        prev_ch = Some(ch);
-    }
-
-    let trail = trail_offset
-        .map(|trail_offset| map.clip_point(trail_offset.to_display_point(map), Bias::Left));
-
-    (
-        trail,
-        map.clip_point(offset.to_display_point(map), Bias::Left),
-    )
-}
-
-/// Finds the location of a boundary
-pub fn find_boundary_trail(
-    map: &DisplaySnapshot,
-    head: DisplayPoint,
-    mut is_boundary: impl FnMut(char, char) -> bool,
-) -> (Option<DisplayPoint>, DisplayPoint) {
-    let mut offset = head.to_offset(map, Bias::Right);
-    let mut trail_offset = None;
-
-    let mut prev_ch = map.buffer_snapshot().reversed_chars_at(offset).next();
-    let mut forward = map.buffer_snapshot().chars_at(offset).peekable();
-
-    // Skip newlines
-    while let Some(&ch) = forward.peek() {
-        if ch == '\n' {
-            prev_ch = forward.next();
-            offset += ch.len_utf8();
-            trail_offset = Some(offset);
-        } else {
-            break;
-        }
-    }
-
-    // Find the boundary
-    let start_offset = offset;
-    for ch in forward {
-        if let Some(prev_ch) = prev_ch
-            && is_boundary(prev_ch, ch)
-        {
-            if start_offset == offset {
-                trail_offset = Some(offset);
-            } else {
-                break;
-            }
-        }
-        offset += ch.len_utf8();
-        prev_ch = Some(ch);
-    }
-
-    let trail = trail_offset
-        .map(|trail_offset| map.clip_point(trail_offset.to_display_point(map), Bias::Right));
-
-    (
-        trail,
-        map.clip_point(offset.to_display_point(map), Bias::Right),
-    )
-}
-
-pub fn find_boundary(
-    map: &DisplaySnapshot,
-    from: DisplayPoint,
-    find_range: FindRange,
-    is_boundary: impl FnMut(char, char) -> bool,
-) -> DisplayPoint {
-    find_boundary_point(map, from, find_range, is_boundary, false)
-}
-
-pub fn find_boundary_exclusive(
-    map: &DisplaySnapshot,
-    from: DisplayPoint,
-    find_range: FindRange,
-    is_boundary: impl FnMut(char, char) -> bool,
-) -> DisplayPoint {
-    find_boundary_point(map, from, find_range, is_boundary, true)
-}
-
-/// Returns an iterator over the characters following a given offset in the [`DisplaySnapshot`].
-/// The returned value also contains a range of the start/end of a returned character in
-/// the [`DisplaySnapshot`]. The offsets are relative to the start of a buffer.
-pub fn chars_after(
-    map: &DisplaySnapshot,
-    mut offset: MultiBufferOffset,
-) -> impl Iterator<Item = (char, Range<MultiBufferOffset>)> + '_ {
-    map.buffer_snapshot().chars_at(offset).map(move |ch| {
-        let before = offset;
-        offset += ch.len_utf8();
-        (ch, before..offset)
-    })
-}
-
-/// Returns a reverse iterator over the characters following a given offset in the [`DisplaySnapshot`].
-/// The returned value also contains a range of the start/end of a returned character in
-/// the [`DisplaySnapshot`]. The offsets are relative to the start of a buffer.
-pub fn chars_before(
-    map: &DisplaySnapshot,
-    mut offset: MultiBufferOffset,
-) -> impl Iterator<Item = (char, Range<MultiBufferOffset>)> + '_ {
-    map.buffer_snapshot()
-        .reversed_chars_at(offset)
-        .map(move |ch| {
-            let after = offset;
-            offset -= ch.len_utf8();
-            (ch, offset..after)
-        })
-}
-
-/// Returns a list of lines (represented as a [`DisplayPoint`] range) contained
-/// within a passed range.
-///
-/// The line ranges are **always* going to be in bounds of a requested range, which means that
-/// the first and the last lines might not necessarily represent the
-/// full range of a logical line (as their `.start`/`.end` values are clipped to those of a passed in range).
-pub fn split_display_range_by_lines(
-    map: &DisplaySnapshot,
-    range: Range<DisplayPoint>,
-) -> Vec<Range<DisplayPoint>> {
-    let mut result = Vec::new();
-
-    let mut start = range.start;
-    // Loop over all the covered rows until the one containing the range end
-    for row in range.start.row().0..range.end.row().0 {
-        let row_end_column = map.line_len(DisplayRow(row));
-        let end = map.clip_point(
-            DisplayPoint::new(DisplayRow(row), row_end_column),
-            Bias::Left,
-        );
-        if start != end {
-            result.push(start..end);
-        }
-        start = map.clip_point(DisplayPoint::new(DisplayRow(row + 1), 0), Bias::Left);
-    }
-
-    // Add the final range from the start of the last end to the original range end.
-    result.push(start..range.end);
-
-    result
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::{
-        Buffer, DisplayMap, DisplayRow, ExcerptRange, FoldPlaceholder, MultiBuffer,
-        inlays::Inlay,
-        test::{editor_test_context::EditorTestContext, marked_display_snapshot},
-    };
-    use gpui::{AppContext as _, font, px};
-    use language::Capability;
-    use project::project_settings::DiagnosticSeverity;
-    use settings::SettingsStore;
-    use util::post_inc;
-
-    #[gpui::test]
-    fn test_previous_word_start(cx: &mut gpui::App) {
-        init_test(cx);
-
-        fn assert(marked_text: &str, cx: &mut gpui::App) {
-            let (snapshot, display_points) = marked_display_snapshot(marked_text, cx);
-            let actual = previous_word_start(&snapshot, display_points[1]);
-            let expected = display_points[0];
-            if actual != expected {
-                eprintln!(
-                    "previous_word_start mismatch for '{}': actual={:?}, expected={:?}",
-                    marked_text, actual, expected
-                );
-            }
-            assert_eq!(actual, expected);
-        }
-
-        assert("\nˇ   ˇlorem", cx);
-        assert("ˇ\nˇ   lorem", cx);
-        assert("    ˇloremˇ", cx);
-        assert("ˇ    ˇlorem", cx);
-        assert("    ˇlorˇem", cx);
-        assert("\nlorem\nˇ   ˇipsum", cx);
-        assert("\n\nˇ\nˇ", cx);
-        assert("    ˇlorem  ˇipsum", cx);
-        assert("ˇlorem-ˇipsum", cx);
-        assert("loremˇ-#$@ˇipsum", cx);
-        assert("ˇlorem_ˇipsum", cx);
-        assert(" ˇdefγˇ", cx);
-        assert(" ˇbcΔˇ", cx);
-        // Test punctuation skipping behavior
-        assert("ˇhello.ˇ", cx);
-        assert("helloˇ...ˇ", cx);
-        assert("helloˇ.---..ˇtest", cx);
-        assert("test  ˇ.--ˇtest", cx);
-        assert("oneˇ,;:!?ˇtwo", cx);
-    }
-
-    #[gpui::test]
-    fn test_previous_subword_start(cx: &mut gpui::App) {
-        init_test(cx);
-
-        fn assert(marked_text: &str, cx: &mut gpui::App) {
-            let (snapshot, display_points) = marked_display_snapshot(marked_text, cx);
-            assert_eq!(
-                previous_subword_start(&snapshot, display_points[1]),
-                display_points[0]
-            );
-        }
-
-        // Subword boundaries are respected
-        assert("lorem_ˇipˇsum", cx);
-        assert("lorem_ˇipsumˇ", cx);
-        assert("ˇlorem_ˇipsum", cx);
-        assert("lorem_ˇipsum_ˇdolor", cx);
-        assert("loremˇIpˇsum", cx);
-        assert("loremˇIpsumˇ", cx);
-
-        // Word boundaries are still respected
-        assert("\nˇ   ˇlorem", cx);
-        assert("    ˇloremˇ", cx);
-        assert("    ˇlorˇem", cx);
-        assert("\nlorem\nˇ   ˇipsum", cx);
-        assert("\n\nˇ\nˇ", cx);
-        assert("    ˇlorem  ˇipsum", cx);
-        assert("loremˇ-ˇipsum", cx);
-        assert("loremˇ-#$@ˇipsum", cx);
-        assert(" ˇdefγˇ", cx);
-        assert(" bcˇΔˇ", cx);
-        assert(" ˇbcδˇ", cx);
-        assert(" abˇ——ˇcd", cx);
-    }
-
-    #[gpui::test]
-    fn test_find_preceding_boundary(cx: &mut gpui::App) {
-        init_test(cx);
-
-        fn assert(
-            marked_text: &str,
-            cx: &mut gpui::App,
-            is_boundary: impl FnMut(char, char) -> bool,
-        ) {
-            let (snapshot, display_points) = marked_display_snapshot(marked_text, cx);
-            assert_eq!(
-                find_preceding_boundary_display_point(
-                    &snapshot,
-                    display_points[1],
-                    FindRange::MultiLine,
-                    is_boundary
-                ),
-                display_points[0]
-            );
-        }
-
-        assert("abcˇdef\ngh\nijˇk", cx, |left, right| {
-            left == 'c' && right == 'd'
-        });
-        assert("abcdef\nˇgh\nijˇk", cx, |left, right| {
-            left == '\n' && right == 'g'
-        });
-        let mut line_count = 0;
-        assert("abcdef\nˇgh\nijˇk", cx, |left, _| {
-            if left == '\n' {
-                line_count += 1;
-                line_count == 2
-            } else {
-                false
-            }
-        });
-    }
-
-    #[gpui::test]
-    fn test_find_preceding_boundary_with_inlays(cx: &mut gpui::App) {
-        init_test(cx);
-
-        let input_text = "abcdefghijklmnopqrstuvwxys";
-        let font = font("Helvetica");
-        let font_size = px(14.0);
-        let buffer = MultiBuffer::build_simple(input_text, cx);
-        let buffer_snapshot = buffer.read(cx).snapshot(cx);
-
-        let display_map = cx.new(|cx| {
-            DisplayMap::new(
-                buffer,
-                font,
-                font_size,
-                None,
-                1,
-                1,
-                FoldPlaceholder::test(),
-                DiagnosticSeverity::Warning,
-                cx,
-            )
-        });
-
-        // add all kinds of inlays between two word boundaries: we should be able to cross them all, when looking for another boundary
-        let mut id = 0;
-        let inlays = (0..buffer_snapshot.len().0)
-            .flat_map(|offset| {
-                let offset = MultiBufferOffset(offset);
-                [
-                    Inlay::edit_prediction(
-                        post_inc(&mut id),
-                        buffer_snapshot.anchor_before(offset),
-                        "test",
-                    ),
-                    Inlay::edit_prediction(
-                        post_inc(&mut id),
-                        buffer_snapshot.anchor_after(offset),
-                        "test",
-                    ),
-                    Inlay::mock_hint(
-                        post_inc(&mut id),
-                        buffer_snapshot.anchor_before(offset),
-                        "test",
-                    ),
-                    Inlay::mock_hint(
-                        post_inc(&mut id),
-                        buffer_snapshot.anchor_after(offset),
-                        "test",
-                    ),
-                ]
-            })
-            .collect();
-        let snapshot = display_map.update(cx, |map, cx| {
-            map.splice_inlays(&[], inlays, cx);
-            map.snapshot(cx)
-        });
-
-        assert_eq!(
-            find_preceding_boundary_display_point(
-                &snapshot,
-                buffer_snapshot.len().to_display_point(&snapshot),
-                FindRange::MultiLine,
-                |left, _| left == 'e',
-            ),
-            snapshot
-                .buffer_snapshot()
-                .offset_to_point(MultiBufferOffset(5))
-                .to_display_point(&snapshot),
-            "Should not stop at inlays when looking for boundaries"
-        );
-    }
-
-    #[gpui::test]
-    fn test_next_word_end(cx: &mut gpui::App) {
-        init_test(cx);
-
-        fn assert(marked_text: &str, cx: &mut gpui::App) {
-            let (snapshot, display_points) = marked_display_snapshot(marked_text, cx);
-            let actual = next_word_end(&snapshot, display_points[0]);
-            let expected = display_points[1];
-            if actual != expected {
-                eprintln!(
-                    "next_word_end mismatch for '{}': actual={:?}, expected={:?}",
-                    marked_text, actual, expected
-                );
-            }
-            assert_eq!(actual, expected);
-        }
-
-        assert("\nˇ   loremˇ", cx);
-        assert("    ˇloremˇ", cx);
-        assert("    lorˇemˇ", cx);
-        assert("    loremˇ    ˇ\nipsum\n", cx);
-        assert("\nˇ\nˇ\n\n", cx);
-        assert("loremˇ    ipsumˇ   ", cx);
-        assert("loremˇ-ipsumˇ", cx);
-        assert("loremˇ#$@-ˇipsum", cx);
-        assert("loremˇ_ipsumˇ", cx);
-        assert(" ˇbcΔˇ", cx);
-        assert(" abˇ——ˇcd", cx);
-        // Test punctuation skipping behavior
-        assert("ˇ.helloˇ", cx);
-        assert("display_pointsˇ[0ˇ]", cx);
-        assert("ˇ...ˇhello", cx);
-        assert("helloˇ.---..ˇtest", cx);
-        assert("testˇ.--ˇ test", cx);
-        assert("oneˇ,;:!?ˇtwo", cx);
-    }
-
-    #[gpui::test]
-    fn test_next_subword_end(cx: &mut gpui::App) {
-        init_test(cx);
-
-        fn assert(marked_text: &str, cx: &mut gpui::App) {
-            let (snapshot, display_points) = marked_display_snapshot(marked_text, cx);
-            assert_eq!(
-                next_subword_end(&snapshot, display_points[0]),
-                display_points[1]
-            );
-        }
-
-        // Subword boundaries are respected
-        assert("loˇremˇ_ipsum", cx);
-        assert("ˇloremˇ_ipsum", cx);
-        assert("loremˇ_ipsumˇ", cx);
-        assert("loremˇ_ipsumˇ_dolor", cx);
-        assert("loˇremˇIpsum", cx);
-        assert("loremˇIpsumˇDolor", cx);
-
-        // Word boundaries are still respected
-        assert("\nˇ   loremˇ", cx);
-        assert("    ˇloremˇ", cx);
-        assert("    lorˇemˇ", cx);
-        assert("    loremˇ    ˇ\nipsum\n", cx);
-        assert("\nˇ\nˇ\n\n", cx);
-        assert("loremˇ    ipsumˇ   ", cx);
-        assert("loremˇ-ˇipsum", cx);
-        assert("loremˇ#$@-ˇipsum", cx);
-        assert("loremˇ_ipsumˇ", cx);
-        assert(" ˇbcˇΔ", cx);
-        assert(" abˇ——ˇcd", cx);
-    }
-
-    #[gpui::test]
-    fn test_find_boundary(cx: &mut gpui::App) {
-        init_test(cx);
-
-        fn assert(
-            marked_text: &str,
-            cx: &mut gpui::App,
-            is_boundary: impl FnMut(char, char) -> bool,
-        ) {
-            let (snapshot, display_points) = marked_display_snapshot(marked_text, cx);
-            assert_eq!(
-                find_boundary(
-                    &snapshot,
-                    display_points[0],
-                    FindRange::MultiLine,
-                    is_boundary,
-                ),
-                display_points[1]
-            );
-        }
-
-        assert("abcˇdef\ngh\nijˇk", cx, |left, right| {
-            left == 'j' && right == 'k'
-        });
-        assert("abˇcdef\ngh\nˇijk", cx, |left, right| {
-            left == '\n' && right == 'i'
-        });
-        let mut line_count = 0;
-        assert("abcˇdef\ngh\nˇijk", cx, |left, _| {
-            if left == '\n' {
-                line_count += 1;
-                line_count == 2
-            } else {
-                false
-            }
-        });
-    }
-
-    #[gpui::test]
-    async fn test_move_up_and_down_with_excerpts(cx: &mut gpui::TestAppContext) {
-        cx.update(|cx| {
-            init_test(cx);
-        });
-
-        let mut cx = EditorTestContext::new(cx).await;
-        let editor = cx.editor.clone();
-        let window = cx.window;
-        _ = cx.update_window(window, |_, window, cx| {
-            let text_layout_details = editor.read(cx).text_layout_details(window);
-
-            let font = font("Helvetica");
-
-            let buffer = cx.new(|cx| Buffer::local("abc\ndefg\nhijkl\nmn", cx));
-            let multibuffer = cx.new(|cx| {
-                let mut multibuffer = MultiBuffer::new(Capability::ReadWrite);
-                multibuffer.push_excerpts(
-                    buffer.clone(),
-                    [
-                        ExcerptRange::new(Point::new(0, 0)..Point::new(1, 4)),
-                        ExcerptRange::new(Point::new(2, 0)..Point::new(3, 2)),
-                    ],
-                    cx,
-                );
-                multibuffer
-            });
-            let display_map = cx.new(|cx| {
-                DisplayMap::new(
-                    multibuffer,
-                    font,
-                    px(14.0),
-                    None,
-                    0,
-                    1,
-                    FoldPlaceholder::test(),
-                    DiagnosticSeverity::Warning,
-                    cx,
-                )
-            });
-            let snapshot = display_map.update(cx, |map, cx| map.snapshot(cx));
-
-            assert_eq!(snapshot.text(), "abc\ndefg\n\nhijkl\nmn");
-
-            let col_2_x = snapshot
-                .x_for_display_point(DisplayPoint::new(DisplayRow(0), 2), &text_layout_details);
-
-            // Can't move up into the first excerpt's header
-            assert_eq!(
-                up(
-                    &snapshot,
-                    DisplayPoint::new(DisplayRow(0), 2),
-                    SelectionGoal::HorizontalPosition(f64::from(col_2_x)),
-                    false,
-                    &text_layout_details
-                ),
-                (
-                    DisplayPoint::new(DisplayRow(0), 0),
-                    SelectionGoal::HorizontalPosition(f64::from(col_2_x)),
-                ),
-            );
-            assert_eq!(
-                up(
-                    &snapshot,
-                    DisplayPoint::new(DisplayRow(0), 0),
-                    SelectionGoal::None,
-                    false,
-                    &text_layout_details
-                ),
-                (
-                    DisplayPoint::new(DisplayRow(0), 0),
-                    SelectionGoal::HorizontalPosition(0.0),
-                ),
-            );
-
-            let col_4_x = snapshot
-                .x_for_display_point(DisplayPoint::new(DisplayRow(1), 4), &text_layout_details);
-
-            // Move up and down within first excerpt
-            assert_eq!(
-                up(
-                    &snapshot,
-                    DisplayPoint::new(DisplayRow(1), 4),
-                    SelectionGoal::HorizontalPosition(col_4_x.into()),
-                    false,
-                    &text_layout_details
-                ),
-                (
-                    DisplayPoint::new(DisplayRow(0), 3),
-                    SelectionGoal::HorizontalPosition(col_4_x.into())
-                ),
-            );
-            assert_eq!(
-                down(
-                    &snapshot,
-                    DisplayPoint::new(DisplayRow(0), 3),
-                    SelectionGoal::HorizontalPosition(col_4_x.into()),
-                    false,
-                    &text_layout_details
-                ),
-                (
-                    DisplayPoint::new(DisplayRow(1), 4),
-                    SelectionGoal::HorizontalPosition(col_4_x.into())
-                ),
-            );
-
-            let col_5_x = snapshot
-                .x_for_display_point(DisplayPoint::new(DisplayRow(3), 5), &text_layout_details);
-
-            // Move up and down across second excerpt's header
-            assert_eq!(
-                up(
-                    &snapshot,
-                    DisplayPoint::new(DisplayRow(3), 5),
-                    SelectionGoal::HorizontalPosition(col_5_x.into()),
-                    false,
-                    &text_layout_details
-                ),
-                (
-                    DisplayPoint::new(DisplayRow(1), 4),
-                    SelectionGoal::HorizontalPosition(col_5_x.into())
-                ),
-            );
-            assert_eq!(
-                down(
-                    &snapshot,
-                    DisplayPoint::new(DisplayRow(1), 4),
-                    SelectionGoal::HorizontalPosition(col_5_x.into()),
-                    false,
-                    &text_layout_details
-                ),
-                (
-                    DisplayPoint::new(DisplayRow(3), 5),
-                    SelectionGoal::HorizontalPosition(col_5_x.into())
-                ),
-            );
-
-            let max_point_x = snapshot
-                .x_for_display_point(DisplayPoint::new(DisplayRow(4), 2), &text_layout_details);
-
-            // Can't move down off the end, and attempting to do so leaves the selection goal unchanged
-            assert_eq!(
-                down(
-                    &snapshot,
-                    DisplayPoint::new(DisplayRow(4), 0),
-                    SelectionGoal::HorizontalPosition(0.0),
-                    false,
-                    &text_layout_details
-                ),
-                (
-                    DisplayPoint::new(DisplayRow(4), 2),
-                    SelectionGoal::HorizontalPosition(0.0)
-                ),
-            );
-            assert_eq!(
-                down(
-                    &snapshot,
-                    DisplayPoint::new(DisplayRow(4), 2),
-                    SelectionGoal::HorizontalPosition(max_point_x.into()),
-                    false,
-                    &text_layout_details
-                ),
-                (
-                    DisplayPoint::new(DisplayRow(4), 2),
-                    SelectionGoal::HorizontalPosition(max_point_x.into())
-                ),
-            );
-        });
-    }
-
-    fn init_test(cx: &mut gpui::App) {
-        let settings_store = SettingsStore::test(cx);
-        cx.set_global(settings_store);
-        theme::init(theme::LoadThemes::JustBase, cx);
-        crate::init(cx);
-    }
-}
diff --git a/crates/editor/src/persistence.rs b/crates/editor/src/persistence.rs
deleted file mode 100644
index 840398474b..0000000000
--- a/crates/editor/src/persistence.rs
+++ /dev/null
@@ -1,468 +0,0 @@
-use anyhow::Result;
-use db::{
-    query,
-    sqlez::{
-        bindable::{Bind, Column, StaticColumnCount},
-        domain::Domain,
-        statement::Statement,
-    },
-    sqlez_macros::sql,
-};
-use fs::MTime;
-use itertools::Itertools as _;
-use std::path::PathBuf;
-
-use workspace::{ItemId, WorkspaceDb, WorkspaceId};
-
-#[derive(Clone, Debug, PartialEq, Default)]
-pub(crate) struct SerializedEditor {
-    pub(crate) abs_path: Option<PathBuf>,
-    pub(crate) contents: Option<String>,
-    pub(crate) language: Option<String>,
-    pub(crate) mtime: Option<MTime>,
-}
-
-impl StaticColumnCount for SerializedEditor {
-    fn column_count() -> usize {
-        6
-    }
-}
-
-impl Bind for SerializedEditor {
-    fn bind(&self, statement: &Statement, start_index: i32) -> Result<i32> {
-        let start_index = statement.bind(&self.abs_path, start_index)?;
-        let start_index = statement.bind(
-            &self
-                .abs_path
-                .as_ref()
-                .map(|p| p.to_string_lossy().into_owned()),
-            start_index,
-        )?;
-        let start_index = statement.bind(&self.contents, start_index)?;
-        let start_index = statement.bind(&self.language, start_index)?;
-
-        let start_index = match self
-            .mtime
-            .and_then(|mtime| mtime.to_seconds_and_nanos_for_persistence())
-        {
-            Some((seconds, nanos)) => {
-                let start_index = statement.bind(&(seconds as i64), start_index)?;
-                statement.bind(&(nanos as i32), start_index)?
-            }
-            None => {
-                let start_index = statement.bind::<Option<i64>>(&None, start_index)?;
-                statement.bind::<Option<i32>>(&None, start_index)?
-            }
-        };
-        Ok(start_index)
-    }
-}
-
-impl Column for SerializedEditor {
-    fn column(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
-        let (abs_path, start_index): (Option<PathBuf>, i32) =
-            Column::column(statement, start_index)?;
-        let (_abs_path, start_index): (Option<PathBuf>, i32) =
-            Column::column(statement, start_index)?;
-        let (contents, start_index): (Option<String>, i32) =
-            Column::column(statement, start_index)?;
-        let (language, start_index): (Option<String>, i32) =
-            Column::column(statement, start_index)?;
-        let (mtime_seconds, start_index): (Option<i64>, i32) =
-            Column::column(statement, start_index)?;
-        let (mtime_nanos, start_index): (Option<i32>, i32) =
-            Column::column(statement, start_index)?;
-
-        let mtime = mtime_seconds
-            .zip(mtime_nanos)
-            .map(|(seconds, nanos)| MTime::from_seconds_and_nanos(seconds as u64, nanos as u32));
-
-        let editor = Self {
-            abs_path,
-            contents,
-            language,
-            mtime,
-        };
-        Ok((editor, start_index))
-    }
-}
-
-pub struct EditorDb(db::sqlez::thread_safe_connection::ThreadSafeConnection);
-
-impl Domain for EditorDb {
-    const NAME: &str = stringify!(EditorDb);
-
-    // Current schema shape using pseudo-rust syntax:
-    // editors(
-    //   item_id: usize,
-    //   workspace_id: usize,
-    //   path: Option<PathBuf>,
-    //   scroll_top_row: usize,
-    //   scroll_vertical_offset: f32,
-    //   scroll_horizontal_offset: f32,
-    //   contents: Option<String>,
-    //   language: Option<String>,
-    //   mtime_seconds: Option<i64>,
-    //   mtime_nanos: Option<i32>,
-    // )
-    //
-    // editor_selections(
-    //   item_id: usize,
-    //   editor_id: usize,
-    //   workspace_id: usize,
-    //   start: usize,
-    //   end: usize,
-    // )
-    //
-    // editor_folds(
-    //   item_id: usize,
-    //   editor_id: usize,
-    //   workspace_id: usize,
-    //   start: usize,
-    //   end: usize,
-    // )
-
-    const MIGRATIONS: &[&str] = &[
-        sql! (
-            CREATE TABLE editors(
-                item_id INTEGER NOT NULL,
-                workspace_id INTEGER NOT NULL,
-                path BLOB NOT NULL,
-                PRIMARY KEY(item_id, workspace_id),
-                FOREIGN KEY(workspace_id) REFERENCES workspaces(workspace_id)
-                ON DELETE CASCADE
-                ON UPDATE CASCADE
-            ) STRICT;
-        ),
-        sql! (
-            ALTER TABLE editors ADD COLUMN scroll_top_row INTEGER NOT NULL DEFAULT 0;
-            ALTER TABLE editors ADD COLUMN scroll_horizontal_offset REAL NOT NULL DEFAULT 0;
-            ALTER TABLE editors ADD COLUMN scroll_vertical_offset REAL NOT NULL DEFAULT 0;
-        ),
-        sql! (
-            // Since sqlite3 doesn't support ALTER COLUMN, we create a new
-            // table, move the data over, drop the old table, rename new table.
-            CREATE TABLE new_editors_tmp (
-                item_id INTEGER NOT NULL,
-                workspace_id INTEGER NOT NULL,
-                path BLOB, // <-- No longer "NOT NULL"
-                scroll_top_row INTEGER NOT NULL DEFAULT 0,
-                scroll_horizontal_offset REAL NOT NULL DEFAULT 0,
-                scroll_vertical_offset REAL NOT NULL DEFAULT 0,
-                contents TEXT, // New
-                language TEXT, // New
-                PRIMARY KEY(item_id, workspace_id),
-                FOREIGN KEY(workspace_id) REFERENCES workspaces(workspace_id)
-                ON DELETE CASCADE
-                ON UPDATE CASCADE
-            ) STRICT;
-
-            INSERT INTO new_editors_tmp(item_id, workspace_id, path, scroll_top_row, scroll_horizontal_offset, scroll_vertical_offset)
-            SELECT item_id, workspace_id, path, scroll_top_row, scroll_horizontal_offset, scroll_vertical_offset
-            FROM editors;
-
-            DROP TABLE editors;
-
-            ALTER TABLE new_editors_tmp RENAME TO editors;
-        ),
-        sql! (
-            ALTER TABLE editors ADD COLUMN mtime_seconds INTEGER DEFAULT NULL;
-            ALTER TABLE editors ADD COLUMN mtime_nanos INTEGER DEFAULT NULL;
-        ),
-        sql! (
-            CREATE TABLE editor_selections (
-                item_id INTEGER NOT NULL,
-                editor_id INTEGER NOT NULL,
-                workspace_id INTEGER NOT NULL,
-                start INTEGER NOT NULL,
-                end INTEGER NOT NULL,
-                PRIMARY KEY(item_id),
-                FOREIGN KEY(editor_id, workspace_id) REFERENCES editors(item_id, workspace_id)
-                ON DELETE CASCADE
-            ) STRICT;
-        ),
-        sql! (
-            ALTER TABLE editors ADD COLUMN buffer_path TEXT;
-            UPDATE editors SET buffer_path = CAST(path AS TEXT);
-        ),
-        sql! (
-            CREATE TABLE editor_folds (
-                item_id INTEGER NOT NULL,
-                editor_id INTEGER NOT NULL,
-                workspace_id INTEGER NOT NULL,
-                start INTEGER NOT NULL,
-                end INTEGER NOT NULL,
-                PRIMARY KEY(item_id),
-                FOREIGN KEY(editor_id, workspace_id) REFERENCES editors(item_id, workspace_id)
-                ON DELETE CASCADE
-            ) STRICT;
-        ),
-    ];
-}
-
-db::static_connection!(DB, EditorDb, [WorkspaceDb]);
-
-// https://www.sqlite.org/limits.html
-// > <..> the maximum value of a host parameter number is SQLITE_MAX_VARIABLE_NUMBER,
-// > which defaults to <..> 32766 for SQLite versions after 3.32.0.
-const MAX_QUERY_PLACEHOLDERS: usize = 32000;
-
-impl EditorDb {
-    query! {
-        pub fn get_serialized_editor(item_id: ItemId, workspace_id: WorkspaceId) -> Result<Option<SerializedEditor>> {
-            SELECT path, buffer_path, contents, language, mtime_seconds, mtime_nanos FROM editors
-            WHERE item_id = ? AND workspace_id = ?
-        }
-    }
-
-    query! {
-        pub async fn save_serialized_editor(item_id: ItemId, workspace_id: WorkspaceId, serialized_editor: SerializedEditor) -> Result<()> {
-            INSERT INTO editors
-                (item_id, workspace_id, path, buffer_path, contents, language, mtime_seconds, mtime_nanos)
-            VALUES
-                (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8)
-            ON CONFLICT DO UPDATE SET
-                item_id = ?1,
-                workspace_id = ?2,
-                path = ?3,
-                buffer_path = ?4,
-                contents = ?5,
-                language = ?6,
-                mtime_seconds = ?7,
-                mtime_nanos = ?8
-        }
-    }
-
-    // Returns the scroll top row, and offset
-    query! {
-        pub fn get_scroll_position(item_id: ItemId, workspace_id: WorkspaceId) -> Result<Option<(u32, f64, f64)>> {
-            SELECT scroll_top_row, scroll_horizontal_offset, scroll_vertical_offset
-            FROM editors
-            WHERE item_id = ? AND workspace_id = ?
-        }
-    }
-
-    query! {
-        pub async fn save_scroll_position(
-            item_id: ItemId,
-            workspace_id: WorkspaceId,
-            top_row: u32,
-            vertical_offset: f64,
-            horizontal_offset: f64
-        ) -> Result<()> {
-            UPDATE OR IGNORE editors
-            SET
-                scroll_top_row = ?3,
-                scroll_horizontal_offset = ?4,
-                scroll_vertical_offset = ?5
-            WHERE item_id = ?1 AND workspace_id = ?2
-        }
-    }
-
-    query! {
-        pub fn get_editor_selections(
-            editor_id: ItemId,
-            workspace_id: WorkspaceId
-        ) -> Result<Vec<(usize, usize)>> {
-            SELECT start, end
-            FROM editor_selections
-            WHERE editor_id = ?1 AND workspace_id = ?2
-        }
-    }
-
-    query! {
-        pub fn get_editor_folds(
-            editor_id: ItemId,
-            workspace_id: WorkspaceId
-        ) -> Result<Vec<(usize, usize)>> {
-            SELECT start, end
-            FROM editor_folds
-            WHERE editor_id = ?1 AND workspace_id = ?2
-        }
-    }
-
-    pub async fn save_editor_selections(
-        &self,
-        editor_id: ItemId,
-        workspace_id: WorkspaceId,
-        selections: Vec<(usize, usize)>,
-    ) -> Result<()> {
-        log::debug!("Saving selections for editor {editor_id} in workspace {workspace_id:?}");
-        let mut first_selection;
-        let mut last_selection = 0_usize;
-        for (count, placeholders) in std::iter::once("(?1, ?2, ?, ?)")
-            .cycle()
-            .take(selections.len())
-            .chunks(MAX_QUERY_PLACEHOLDERS / 4)
-            .into_iter()
-            .map(|chunk| {
-                let mut count = 0;
-                let placeholders = chunk
-                    .inspect(|_| {
-                        count += 1;
-                    })
-                    .join(", ");
-                (count, placeholders)
-            })
-            .collect::<Vec<_>>()
-        {
-            first_selection = last_selection;
-            last_selection = last_selection + count;
-            let query = format!(
-                r#"
-DELETE FROM editor_selections WHERE editor_id = ?1 AND workspace_id = ?2;
-
-INSERT OR IGNORE INTO editor_selections (editor_id, workspace_id, start, end)
-VALUES {placeholders};
-"#
-            );
-
-            let selections = selections[first_selection..last_selection].to_vec();
-            self.write(move |conn| {
-                let mut statement = Statement::prepare(conn, query)?;
-                statement.bind(&editor_id, 1)?;
-                let mut next_index = statement.bind(&workspace_id, 2)?;
-                for (start, end) in selections {
-                    next_index = statement.bind(&start, next_index)?;
-                    next_index = statement.bind(&end, next_index)?;
-                }
-                statement.exec()
-            })
-            .await?;
-        }
-        Ok(())
-    }
-
-    pub async fn save_editor_folds(
-        &self,
-        editor_id: ItemId,
-        workspace_id: WorkspaceId,
-        folds: Vec<(usize, usize)>,
-    ) -> Result<()> {
-        log::debug!("Saving folds for editor {editor_id} in workspace {workspace_id:?}");
-        let mut first_fold;
-        let mut last_fold = 0_usize;
-        for (count, placeholders) in std::iter::once("(?1, ?2, ?, ?)")
-            .cycle()
-            .take(folds.len())
-            .chunks(MAX_QUERY_PLACEHOLDERS / 4)
-            .into_iter()
-            .map(|chunk| {
-                let mut count = 0;
-                let placeholders = chunk
-                    .inspect(|_| {
-                        count += 1;
-                    })
-                    .join(", ");
-                (count, placeholders)
-            })
-            .collect::<Vec<_>>()
-        {
-            first_fold = last_fold;
-            last_fold = last_fold + count;
-            let query = format!(
-                r#"
-DELETE FROM editor_folds WHERE editor_id = ?1 AND workspace_id = ?2;
-
-INSERT OR IGNORE INTO editor_folds (editor_id, workspace_id, start, end)
-VALUES {placeholders};
-"#
-            );
-
-            let folds = folds[first_fold..last_fold].to_vec();
-            self.write(move |conn| {
-                let mut statement = Statement::prepare(conn, query)?;
-                statement.bind(&editor_id, 1)?;
-                let mut next_index = statement.bind(&workspace_id, 2)?;
-                for (start, end) in folds {
-                    next_index = statement.bind(&start, next_index)?;
-                    next_index = statement.bind(&end, next_index)?;
-                }
-                statement.exec()
-            })
-            .await?;
-        }
-        Ok(())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[gpui::test]
-    async fn test_save_and_get_serialized_editor() {
-        let workspace_id = workspace::WORKSPACE_DB.next_id().await.unwrap();
-
-        let serialized_editor = SerializedEditor {
-            abs_path: Some(PathBuf::from("testing.txt")),
-            contents: None,
-            language: None,
-            mtime: None,
-        };
-
-        DB.save_serialized_editor(1234, workspace_id, serialized_editor.clone())
-            .await
-            .unwrap();
-
-        let have = DB
-            .get_serialized_editor(1234, workspace_id)
-            .unwrap()
-            .unwrap();
-        assert_eq!(have, serialized_editor);
-
-        // Now update contents and language
-        let serialized_editor = SerializedEditor {
-            abs_path: Some(PathBuf::from("testing.txt")),
-            contents: Some("Test".to_owned()),
-            language: Some("Go".to_owned()),
-            mtime: None,
-        };
-
-        DB.save_serialized_editor(1234, workspace_id, serialized_editor.clone())
-            .await
-            .unwrap();
-
-        let have = DB
-            .get_serialized_editor(1234, workspace_id)
-            .unwrap()
-            .unwrap();
-        assert_eq!(have, serialized_editor);
-
-        // Now set all the fields to NULL
-        let serialized_editor = SerializedEditor {
-            abs_path: None,
-            contents: None,
-            language: None,
-            mtime: None,
-        };
-
-        DB.save_serialized_editor(1234, workspace_id, serialized_editor.clone())
-            .await
-            .unwrap();
-
-        let have = DB
-            .get_serialized_editor(1234, workspace_id)
-            .unwrap()
-            .unwrap();
-        assert_eq!(have, serialized_editor);
-
-        // Storing and retrieving mtime
-        let serialized_editor = SerializedEditor {
-            abs_path: None,
-            contents: None,
-            language: None,
-            mtime: Some(MTime::from_seconds_and_nanos(100, 42)),
-        };
-
-        DB.save_serialized_editor(1234, workspace_id, serialized_editor.clone())
-            .await
-            .unwrap();
-
-        let have = DB
-            .get_serialized_editor(1234, workspace_id)
-            .unwrap()
-            .unwrap();
-        assert_eq!(have, serialized_editor);
-    }
-}
diff --git a/crates/editor/src/rust_analyzer_ext.rs b/crates/editor/src/rust_analyzer_ext.rs
deleted file mode 100644
index f548db75ad..0000000000
--- a/crates/editor/src/rust_analyzer_ext.rs
+++ /dev/null
@@ -1,396 +0,0 @@
-use std::{fs, path::Path};
-
-use anyhow::Context as _;
-use gpui::{App, AppContext as _, Context, Entity, Window};
-use language::{Capability, Language, proto::serialize_anchor};
-use multi_buffer::MultiBuffer;
-use project::{
-    ProjectItem,
-    lsp_command::location_link_from_proto,
-    lsp_store::{
-        lsp_ext_command::{DocsUrls, ExpandMacro, ExpandedMacro},
-        rust_analyzer_ext::{RUST_ANALYZER_NAME, cancel_flycheck, clear_flycheck, run_flycheck},
-    },
-};
-use rpc::proto;
-use text::ToPointUtf16;
-
-use crate::{
-    CancelFlycheck, ClearFlycheck, Editor, ExpandMacroRecursively, GoToParentModule,
-    GotoDefinitionKind, OpenDocs, RunFlycheck, element::register_action, hover_links::HoverLink,
-    lsp_ext::find_specific_language_server_in_selection,
-};
-
-fn is_rust_language(language: &Language) -> bool {
-    language.name() == "Rust".into()
-}
-
-pub fn apply_related_actions(editor: &Entity<Editor>, window: &mut Window, cx: &mut App) {
-    if editor.read(cx).project().is_some_and(|project| {
-        project
-            .read(cx)
-            .language_server_statuses(cx)
-            .any(|(_, status)| status.name == RUST_ANALYZER_NAME)
-    }) {
-        register_action(editor, window, cancel_flycheck_action);
-        register_action(editor, window, run_flycheck_action);
-        register_action(editor, window, clear_flycheck_action);
-    }
-
-    if editor
-        .read(cx)
-        .buffer()
-        .read(cx)
-        .all_buffers()
-        .into_iter()
-        .filter_map(|buffer| buffer.read(cx).language())
-        .any(|language| is_rust_language(language))
-    {
-        register_action(editor, window, go_to_parent_module);
-        register_action(editor, window, expand_macro_recursively);
-        register_action(editor, window, open_docs);
-    }
-}
-
-pub fn go_to_parent_module(
-    editor: &mut Editor,
-    _: &GoToParentModule,
-    window: &mut Window,
-    cx: &mut Context<Editor>,
-) {
-    if editor.selections.count() == 0 {
-        return;
-    }
-    let Some(project) = &editor.project else {
-        return;
-    };
-
-    let Some((trigger_anchor, _, server_to_query, buffer)) =
-        find_specific_language_server_in_selection(
-            editor,
-            cx,
-            is_rust_language,
-            RUST_ANALYZER_NAME,
-        )
-    else {
-        return;
-    };
-
-    let project = project.clone();
-    let lsp_store = project.read(cx).lsp_store();
-    let upstream_client = lsp_store.read(cx).upstream_client();
-    cx.spawn_in(window, async move |editor, cx| {
-        let location_links = if let Some((client, project_id)) = upstream_client {
-            let buffer_id = buffer.read_with(cx, |buffer, _| buffer.remote_id())?;
-
-            let request = proto::LspExtGoToParentModule {
-                project_id,
-                buffer_id: buffer_id.to_proto(),
-                position: Some(serialize_anchor(&trigger_anchor.text_anchor)),
-            };
-            let response = client
-                .request(request)
-                .await
-                .context("lsp ext go to parent module proto request")?;
-            futures::future::join_all(
-                response
-                    .links
-                    .into_iter()
-                    .map(|link| location_link_from_proto(link, lsp_store.clone(), cx)),
-            )
-            .await
-            .into_iter()
-            .collect::<anyhow::Result<_>>()
-            .context("go to parent module via collab")?
-        } else {
-            let buffer_snapshot = buffer.read_with(cx, |buffer, _| buffer.snapshot())?;
-            let position = trigger_anchor.text_anchor.to_point_utf16(&buffer_snapshot);
-            project
-                .update(cx, |project, cx| {
-                    project.request_lsp(
-                        buffer,
-                        project::LanguageServerToQuery::Other(server_to_query),
-                        project::lsp_store::lsp_ext_command::GoToParentModule { position },
-                        cx,
-                    )
-                })?
-                .await
-                .context("go to parent module")?
-        };
-
-        editor
-            .update_in(cx, |editor, window, cx| {
-                editor.navigate_to_hover_links(
-                    Some(GotoDefinitionKind::Declaration),
-                    location_links.into_iter().map(HoverLink::Text).collect(),
-                    false,
-                    window,
-                    cx,
-                )
-            })?
-            .await?;
-        anyhow::Ok(())
-    })
-    .detach_and_log_err(cx);
-}
-
-pub fn expand_macro_recursively(
-    editor: &mut Editor,
-    _: &ExpandMacroRecursively,
-    window: &mut Window,
-    cx: &mut Context<Editor>,
-) {
-    let Some(project) = &editor.project else {
-        return;
-    };
-    let Some(workspace) = editor.workspace() else {
-        return;
-    };
-
-    let Some((trigger_anchor, rust_language, server_to_query, buffer)) =
-        find_specific_language_server_in_selection(
-            editor,
-            cx,
-            is_rust_language,
-            RUST_ANALYZER_NAME,
-        )
-    else {
-        return;
-    };
-    let project = project.clone();
-    let upstream_client = project.read(cx).lsp_store().read(cx).upstream_client();
-    cx.spawn_in(window, async move |_editor, cx| {
-        let macro_expansion = if let Some((client, project_id)) = upstream_client {
-            let buffer_id = buffer.update(cx, |buffer, _| buffer.remote_id())?;
-            let request = proto::LspExtExpandMacro {
-                project_id,
-                buffer_id: buffer_id.to_proto(),
-                position: Some(serialize_anchor(&trigger_anchor.text_anchor)),
-            };
-            let response = client
-                .request(request)
-                .await
-                .context("lsp ext expand macro proto request")?;
-            ExpandedMacro {
-                name: response.name,
-                expansion: response.expansion,
-            }
-        } else {
-            let buffer_snapshot = buffer.read_with(cx, |buffer, _| buffer.snapshot())?;
-            let position = trigger_anchor.text_anchor.to_point_utf16(&buffer_snapshot);
-            project
-                .update(cx, |project, cx| {
-                    project.request_lsp(
-                        buffer,
-                        project::LanguageServerToQuery::Other(server_to_query),
-                        ExpandMacro { position },
-                        cx,
-                    )
-                })?
-                .await
-                .context("expand macro")?
-        };
-
-        if macro_expansion.is_empty() {
-            log::info!(
-                "Empty macro expansion for position {:?}",
-                trigger_anchor.text_anchor
-            );
-            return Ok(());
-        }
-
-        let buffer = project
-            .update(cx, |project, cx| project.create_buffer(false, cx))?
-            .await?;
-        workspace.update_in(cx, |workspace, window, cx| {
-            buffer.update(cx, |buffer, cx| {
-                buffer.set_text(macro_expansion.expansion, cx);
-                buffer.set_language(Some(rust_language), cx);
-                buffer.set_capability(Capability::ReadOnly, cx);
-            });
-            let multibuffer =
-                cx.new(|cx| MultiBuffer::singleton(buffer, cx).with_title(macro_expansion.name));
-            workspace.add_item_to_active_pane(
-                Box::new(cx.new(|cx| {
-                    let mut editor = Editor::for_multibuffer(multibuffer, None, window, cx);
-                    editor.set_read_only(true);
-                    editor
-                })),
-                None,
-                true,
-                window,
-                cx,
-            );
-        })
-    })
-    .detach_and_log_err(cx);
-}
-
-pub fn open_docs(editor: &mut Editor, _: &OpenDocs, window: &mut Window, cx: &mut Context<Editor>) {
-    if editor.selections.count() == 0 {
-        return;
-    }
-    let Some(project) = &editor.project else {
-        return;
-    };
-    let Some(workspace) = editor.workspace() else {
-        return;
-    };
-
-    let Some((trigger_anchor, _, server_to_query, buffer)) =
-        find_specific_language_server_in_selection(
-            editor,
-            cx,
-            is_rust_language,
-            RUST_ANALYZER_NAME,
-        )
-    else {
-        return;
-    };
-
-    let project = project.clone();
-    let upstream_client = project.read(cx).lsp_store().read(cx).upstream_client();
-    cx.spawn_in(window, async move |_editor, cx| {
-        let docs_urls = if let Some((client, project_id)) = upstream_client {
-            let buffer_id = buffer.read_with(cx, |buffer, _| buffer.remote_id())?;
-            let request = proto::LspExtOpenDocs {
-                project_id,
-                buffer_id: buffer_id.to_proto(),
-                position: Some(serialize_anchor(&trigger_anchor.text_anchor)),
-            };
-            let response = client
-                .request(request)
-                .await
-                .context("lsp ext open docs proto request")?;
-            DocsUrls {
-                web: response.web,
-                local: response.local,
-            }
-        } else {
-            let buffer_snapshot = buffer.read_with(cx, |buffer, _| buffer.snapshot())?;
-            let position = trigger_anchor.text_anchor.to_point_utf16(&buffer_snapshot);
-            project
-                .update(cx, |project, cx| {
-                    project.request_lsp(
-                        buffer,
-                        project::LanguageServerToQuery::Other(server_to_query),
-                        project::lsp_store::lsp_ext_command::OpenDocs { position },
-                        cx,
-                    )
-                })?
-                .await
-                .context("open docs")?
-        };
-
-        if docs_urls.is_empty() {
-            log::debug!(
-                "Empty docs urls for position {:?}",
-                trigger_anchor.text_anchor
-            );
-            return Ok(());
-        }
-
-        workspace.update(cx, |_workspace, cx| {
-            // Check if the local document exists, otherwise fallback to the online document.
-            // Open with the default browser.
-            if let Some(local_url) = docs_urls.local
-                && fs::metadata(Path::new(&local_url[8..])).is_ok()
-            {
-                cx.open_url(&local_url);
-                return;
-            }
-
-            if let Some(web_url) = docs_urls.web {
-                cx.open_url(&web_url);
-            }
-        })
-    })
-    .detach_and_log_err(cx);
-}
-
-fn cancel_flycheck_action(
-    editor: &mut Editor,
-    _: &CancelFlycheck,
-    _: &mut Window,
-    cx: &mut Context<Editor>,
-) {
-    let Some(project) = &editor.project else {
-        return;
-    };
-    let buffer_id = editor
-        .selections
-        .disjoint_anchors_arc()
-        .iter()
-        .find_map(|selection| {
-            let buffer_id = selection
-                .start
-                .text_anchor
-                .buffer_id
-                .or(selection.end.text_anchor.buffer_id)?;
-            let project = project.read(cx);
-            let entry_id = project
-                .buffer_for_id(buffer_id, cx)?
-                .read(cx)
-                .entry_id(cx)?;
-            project.path_for_entry(entry_id, cx)
-        });
-    cancel_flycheck(project.clone(), buffer_id, cx).detach_and_log_err(cx);
-}
-
-fn run_flycheck_action(
-    editor: &mut Editor,
-    _: &RunFlycheck,
-    _: &mut Window,
-    cx: &mut Context<Editor>,
-) {
-    let Some(project) = &editor.project else {
-        return;
-    };
-    let buffer_id = editor
-        .selections
-        .disjoint_anchors_arc()
-        .iter()
-        .find_map(|selection| {
-            let buffer_id = selection
-                .start
-                .text_anchor
-                .buffer_id
-                .or(selection.end.text_anchor.buffer_id)?;
-            let project = project.read(cx);
-            let entry_id = project
-                .buffer_for_id(buffer_id, cx)?
-                .read(cx)
-                .entry_id(cx)?;
-            project.path_for_entry(entry_id, cx)
-        });
-    run_flycheck(project.clone(), buffer_id, cx).detach_and_log_err(cx);
-}
-
-fn clear_flycheck_action(
-    editor: &mut Editor,
-    _: &ClearFlycheck,
-    _: &mut Window,
-    cx: &mut Context<Editor>,
-) {
-    let Some(project) = &editor.project else {
-        return;
-    };
-    let buffer_id = editor
-        .selections
-        .disjoint_anchors_arc()
-        .iter()
-        .find_map(|selection| {
-            let buffer_id = selection
-                .start
-                .text_anchor
-                .buffer_id
-                .or(selection.end.text_anchor.buffer_id)?;
-            let project = project.read(cx);
-            let entry_id = project
-                .buffer_for_id(buffer_id, cx)?
-                .read(cx)
-                .entry_id(cx)?;
-            project.path_for_entry(entry_id, cx)
-        });
-    clear_flycheck(project.clone(), buffer_id, cx).detach_and_log_err(cx);
-}
diff --git a/crates/editor/src/scroll.rs b/crates/editor/src/scroll.rs
deleted file mode 100644
index a92735d186..0000000000
--- a/crates/editor/src/scroll.rs
+++ /dev/null
@@ -1,782 +0,0 @@
-mod actions;
-pub(crate) mod autoscroll;
-pub(crate) mod scroll_amount;
-
-use crate::editor_settings::ScrollBeyondLastLine;
-use crate::{
-    Anchor, DisplayPoint, DisplayRow, Editor, EditorEvent, EditorMode, EditorSettings,
-    InlayHintRefreshReason, MultiBufferSnapshot, RowExt, ToPoint,
-    display_map::{DisplaySnapshot, ToDisplayPoint},
-    hover_popover::hide_hover,
-    persistence::DB,
-};
-pub use autoscroll::{Autoscroll, AutoscrollStrategy};
-use core::fmt::Debug;
-use gpui::{Along, App, Axis, Context, Pixels, Task, Window, point, px};
-use language::language_settings::{AllLanguageSettings, SoftWrap};
-use language::{Bias, Point};
-pub use scroll_amount::ScrollAmount;
-use settings::Settings;
-use std::{
-    cmp::Ordering,
-    time::{Duration, Instant},
-};
-use ui::scrollbars::ScrollbarAutoHide;
-use util::ResultExt;
-use workspace::{ItemId, WorkspaceId};
-
-pub const SCROLL_EVENT_SEPARATION: Duration = Duration::from_millis(28);
-const SCROLLBAR_SHOW_INTERVAL: Duration = Duration::from_secs(1);
-
-pub struct WasScrolled(pub(crate) bool);
-
-pub type ScrollOffset = f64;
-pub type ScrollPixelOffset = f64;
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub struct ScrollAnchor {
-    pub offset: gpui::Point<ScrollOffset>,
-    pub anchor: Anchor,
-}
-
-impl ScrollAnchor {
-    pub(super) fn new() -> Self {
-        Self {
-            offset: gpui::Point::default(),
-            anchor: Anchor::min(),
-        }
-    }
-
-    pub fn scroll_position(&self, snapshot: &DisplaySnapshot) -> gpui::Point<ScrollOffset> {
-        self.offset.apply_along(Axis::Vertical, |offset| {
-            if self.anchor == Anchor::min() {
-                0.
-            } else {
-                let scroll_top = self.anchor.to_display_point(snapshot).row().as_f64();
-                (offset + scroll_top).max(0.)
-            }
-        })
-    }
-
-    pub fn top_row(&self, buffer: &MultiBufferSnapshot) -> u32 {
-        self.anchor.to_point(buffer).row
-    }
-}
-
-#[derive(Clone, Copy, Debug)]
-pub struct OngoingScroll {
-    last_event: Instant,
-    axis: Option<Axis>,
-}
-
-impl OngoingScroll {
-    fn new() -> Self {
-        Self {
-            last_event: Instant::now() - SCROLL_EVENT_SEPARATION,
-            axis: None,
-        }
-    }
-
-    pub fn filter(&self, delta: &mut gpui::Point<Pixels>) -> Option<Axis> {
-        const UNLOCK_PERCENT: f32 = 1.9;
-        const UNLOCK_LOWER_BOUND: Pixels = px(6.);
-        let mut axis = self.axis;
-
-        let x = delta.x.abs();
-        let y = delta.y.abs();
-        let duration = Instant::now().duration_since(self.last_event);
-        if duration > SCROLL_EVENT_SEPARATION {
-            //New ongoing scroll will start, determine axis
-            axis = if x <= y {
-                Some(Axis::Vertical)
-            } else {
-                Some(Axis::Horizontal)
-            };
-        } else if x.max(y) >= UNLOCK_LOWER_BOUND {
-            //Check if the current ongoing will need to unlock
-            match axis {
-                Some(Axis::Vertical) => {
-                    if x > y && x >= y * UNLOCK_PERCENT {
-                        axis = None;
-                    }
-                }
-
-                Some(Axis::Horizontal) => {
-                    if y > x && y >= x * UNLOCK_PERCENT {
-                        axis = None;
-                    }
-                }
-
-                None => {}
-            }
-        }
-
-        match axis {
-            Some(Axis::Vertical) => {
-                *delta = point(px(0.), delta.y);
-            }
-            Some(Axis::Horizontal) => {
-                *delta = point(delta.x, px(0.));
-            }
-            None => {}
-        }
-
-        axis
-    }
-}
-
-#[derive(Copy, Clone, Default, PartialEq, Eq)]
-pub enum ScrollbarThumbState {
-    #[default]
-    Idle,
-    Hovered,
-    Dragging,
-}
-
-#[derive(PartialEq, Eq)]
-pub struct ActiveScrollbarState {
-    axis: Axis,
-    thumb_state: ScrollbarThumbState,
-}
-
-impl ActiveScrollbarState {
-    pub fn new(axis: Axis, thumb_state: ScrollbarThumbState) -> Self {
-        ActiveScrollbarState { axis, thumb_state }
-    }
-
-    pub fn thumb_state_for_axis(&self, axis: Axis) -> Option<ScrollbarThumbState> {
-        (self.axis == axis).then_some(self.thumb_state)
-    }
-}
-
-pub struct ScrollManager {
-    pub(crate) vertical_scroll_margin: ScrollOffset,
-    anchor: ScrollAnchor,
-    ongoing: OngoingScroll,
-    /// The second element indicates whether the autoscroll request is local
-    /// (true) or remote (false). Local requests are initiated by user actions,
-    /// while remote requests come from external sources.
-    autoscroll_request: Option<(Autoscroll, bool)>,
-    last_autoscroll: Option<(
-        gpui::Point<ScrollOffset>,
-        ScrollOffset,
-        ScrollOffset,
-        AutoscrollStrategy,
-    )>,
-    show_scrollbars: bool,
-    hide_scrollbar_task: Option<Task<()>>,
-    active_scrollbar: Option<ActiveScrollbarState>,
-    visible_line_count: Option<f64>,
-    visible_column_count: Option<f64>,
-    forbid_vertical_scroll: bool,
-    minimap_thumb_state: Option<ScrollbarThumbState>,
-}
-
-impl ScrollManager {
-    pub fn new(cx: &mut App) -> Self {
-        ScrollManager {
-            vertical_scroll_margin: EditorSettings::get_global(cx).vertical_scroll_margin,
-            anchor: ScrollAnchor::new(),
-            ongoing: OngoingScroll::new(),
-            autoscroll_request: None,
-            show_scrollbars: true,
-            hide_scrollbar_task: None,
-            active_scrollbar: None,
-            last_autoscroll: None,
-            visible_line_count: None,
-            visible_column_count: None,
-            forbid_vertical_scroll: false,
-            minimap_thumb_state: None,
-        }
-    }
-
-    pub fn clone_state(&mut self, other: &Self) {
-        self.anchor = other.anchor;
-        self.ongoing = other.ongoing;
-    }
-
-    pub fn anchor(&self) -> ScrollAnchor {
-        self.anchor
-    }
-
-    pub fn ongoing_scroll(&self) -> OngoingScroll {
-        self.ongoing
-    }
-
-    pub fn update_ongoing_scroll(&mut self, axis: Option<Axis>) {
-        self.ongoing.last_event = Instant::now();
-        self.ongoing.axis = axis;
-    }
-
-    pub fn scroll_position(&self, snapshot: &DisplaySnapshot) -> gpui::Point<ScrollOffset> {
-        self.anchor.scroll_position(snapshot)
-    }
-
-    fn set_scroll_position(
-        &mut self,
-        scroll_position: gpui::Point<ScrollOffset>,
-        map: &DisplaySnapshot,
-        local: bool,
-        autoscroll: bool,
-        workspace_id: Option<WorkspaceId>,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) -> WasScrolled {
-        let scroll_top = scroll_position.y.max(0.);
-        let scroll_top = match EditorSettings::get_global(cx).scroll_beyond_last_line {
-            ScrollBeyondLastLine::OnePage => scroll_top,
-            ScrollBeyondLastLine::Off => {
-                if let Some(height_in_lines) = self.visible_line_count {
-                    let max_row = map.max_point().row().as_f64();
-                    scroll_top.min(max_row - height_in_lines + 1.).max(0.)
-                } else {
-                    scroll_top
-                }
-            }
-            ScrollBeyondLastLine::VerticalScrollMargin => {
-                if let Some(height_in_lines) = self.visible_line_count {
-                    let max_row = map.max_point().row().as_f64();
-                    scroll_top
-                        .min(max_row - height_in_lines + 1. + self.vertical_scroll_margin)
-                        .max(0.)
-                } else {
-                    scroll_top
-                }
-            }
-        };
-
-        let scroll_top_row = DisplayRow(scroll_top as u32);
-        let scroll_top_buffer_point = map
-            .clip_point(
-                DisplayPoint::new(scroll_top_row, scroll_position.x as u32),
-                Bias::Left,
-            )
-            .to_point(map);
-        let top_anchor = map.buffer_snapshot().anchor_after(scroll_top_buffer_point);
-
-        self.set_anchor(
-            ScrollAnchor {
-                anchor: top_anchor,
-                offset: point(
-                    scroll_position.x.max(0.),
-                    scroll_top - top_anchor.to_display_point(map).row().as_f64(),
-                ),
-            },
-            scroll_top_buffer_point.row,
-            local,
-            autoscroll,
-            workspace_id,
-            window,
-            cx,
-        )
-    }
-
-    fn set_anchor(
-        &mut self,
-        anchor: ScrollAnchor,
-        top_row: u32,
-        local: bool,
-        autoscroll: bool,
-        workspace_id: Option<WorkspaceId>,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) -> WasScrolled {
-        let adjusted_anchor = if self.forbid_vertical_scroll {
-            ScrollAnchor {
-                offset: gpui::Point::new(anchor.offset.x, self.anchor.offset.y),
-                anchor: self.anchor.anchor,
-            }
-        } else {
-            anchor
-        };
-
-        self.autoscroll_request.take();
-        if self.anchor == adjusted_anchor {
-            return WasScrolled(false);
-        }
-
-        self.anchor = adjusted_anchor;
-        cx.emit(EditorEvent::ScrollPositionChanged { local, autoscroll });
-        self.show_scrollbars(window, cx);
-        if let Some(workspace_id) = workspace_id {
-            let item_id = cx.entity().entity_id().as_u64() as ItemId;
-
-            cx.foreground_executor()
-                .spawn(async move {
-                    log::debug!(
-                        "Saving scroll position for item {item_id:?} in workspace {workspace_id:?}"
-                    );
-                    DB.save_scroll_position(
-                        item_id,
-                        workspace_id,
-                        top_row,
-                        anchor.offset.x,
-                        anchor.offset.y,
-                    )
-                    .await
-                    .log_err()
-                })
-                .detach()
-        }
-        cx.notify();
-
-        WasScrolled(true)
-    }
-
-    pub fn show_scrollbars(&mut self, window: &mut Window, cx: &mut Context<Editor>) {
-        if !self.show_scrollbars {
-            self.show_scrollbars = true;
-            cx.notify();
-        }
-
-        if cx.default_global::<ScrollbarAutoHide>().should_hide() {
-            self.hide_scrollbar_task = Some(cx.spawn_in(window, async move |editor, cx| {
-                cx.background_executor()
-                    .timer(SCROLLBAR_SHOW_INTERVAL)
-                    .await;
-                editor
-                    .update(cx, |editor, cx| {
-                        editor.scroll_manager.show_scrollbars = false;
-                        cx.notify();
-                    })
-                    .log_err();
-            }));
-        } else {
-            self.hide_scrollbar_task = None;
-        }
-    }
-
-    pub fn scrollbars_visible(&self) -> bool {
-        self.show_scrollbars
-    }
-
-    pub fn take_autoscroll_request(&mut self) -> Option<(Autoscroll, bool)> {
-        self.autoscroll_request.take()
-    }
-
-    pub fn active_scrollbar_state(&self) -> Option<&ActiveScrollbarState> {
-        self.active_scrollbar.as_ref()
-    }
-
-    pub fn dragging_scrollbar_axis(&self) -> Option<Axis> {
-        self.active_scrollbar
-            .as_ref()
-            .filter(|scrollbar| scrollbar.thumb_state == ScrollbarThumbState::Dragging)
-            .map(|scrollbar| scrollbar.axis)
-    }
-
-    pub fn any_scrollbar_dragged(&self) -> bool {
-        self.active_scrollbar
-            .as_ref()
-            .is_some_and(|scrollbar| scrollbar.thumb_state == ScrollbarThumbState::Dragging)
-    }
-
-    pub fn set_hovered_scroll_thumb_axis(&mut self, axis: Axis, cx: &mut Context<Editor>) {
-        self.update_active_scrollbar_state(
-            Some(ActiveScrollbarState::new(
-                axis,
-                ScrollbarThumbState::Hovered,
-            )),
-            cx,
-        );
-    }
-
-    pub fn set_dragged_scroll_thumb_axis(&mut self, axis: Axis, cx: &mut Context<Editor>) {
-        self.update_active_scrollbar_state(
-            Some(ActiveScrollbarState::new(
-                axis,
-                ScrollbarThumbState::Dragging,
-            )),
-            cx,
-        );
-    }
-
-    pub fn reset_scrollbar_state(&mut self, cx: &mut Context<Editor>) {
-        self.update_active_scrollbar_state(None, cx);
-    }
-
-    fn update_active_scrollbar_state(
-        &mut self,
-        new_state: Option<ActiveScrollbarState>,
-        cx: &mut Context<Editor>,
-    ) {
-        if self.active_scrollbar != new_state {
-            self.active_scrollbar = new_state;
-            cx.notify();
-        }
-    }
-
-    pub fn set_is_hovering_minimap_thumb(&mut self, hovered: bool, cx: &mut Context<Editor>) {
-        self.update_minimap_thumb_state(
-            Some(if hovered {
-                ScrollbarThumbState::Hovered
-            } else {
-                ScrollbarThumbState::Idle
-            }),
-            cx,
-        );
-    }
-
-    pub fn set_is_dragging_minimap(&mut self, cx: &mut Context<Editor>) {
-        self.update_minimap_thumb_state(Some(ScrollbarThumbState::Dragging), cx);
-    }
-
-    pub fn hide_minimap_thumb(&mut self, cx: &mut Context<Editor>) {
-        self.update_minimap_thumb_state(None, cx);
-    }
-
-    pub fn is_dragging_minimap(&self) -> bool {
-        self.minimap_thumb_state
-            .is_some_and(|state| state == ScrollbarThumbState::Dragging)
-    }
-
-    fn update_minimap_thumb_state(
-        &mut self,
-        thumb_state: Option<ScrollbarThumbState>,
-        cx: &mut Context<Editor>,
-    ) {
-        if self.minimap_thumb_state != thumb_state {
-            self.minimap_thumb_state = thumb_state;
-            cx.notify();
-        }
-    }
-
-    pub fn minimap_thumb_state(&self) -> Option<ScrollbarThumbState> {
-        self.minimap_thumb_state
-    }
-
-    pub fn clamp_scroll_left(&mut self, max: f64) -> bool {
-        if max < self.anchor.offset.x {
-            self.anchor.offset.x = max;
-            true
-        } else {
-            false
-        }
-    }
-
-    pub fn set_forbid_vertical_scroll(&mut self, forbid: bool) {
-        self.forbid_vertical_scroll = forbid;
-    }
-
-    pub fn forbid_vertical_scroll(&self) -> bool {
-        self.forbid_vertical_scroll
-    }
-}
-
-impl Editor {
-    pub fn vertical_scroll_margin(&self) -> usize {
-        self.scroll_manager.vertical_scroll_margin as usize
-    }
-
-    pub fn set_vertical_scroll_margin(&mut self, margin_rows: usize, cx: &mut Context<Self>) {
-        self.scroll_manager.vertical_scroll_margin = margin_rows as f64;
-        cx.notify();
-    }
-
-    pub fn visible_line_count(&self) -> Option<f64> {
-        self.scroll_manager.visible_line_count
-    }
-
-    pub fn visible_row_count(&self) -> Option<u32> {
-        self.visible_line_count()
-            .map(|line_count| line_count as u32 - 1)
-    }
-
-    pub fn visible_column_count(&self) -> Option<f64> {
-        self.scroll_manager.visible_column_count
-    }
-
-    pub(crate) fn set_visible_line_count(
-        &mut self,
-        lines: f64,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let opened_first_time = self.scroll_manager.visible_line_count.is_none();
-        self.scroll_manager.visible_line_count = Some(lines);
-        if opened_first_time {
-            self.post_scroll_update = cx.spawn_in(window, async move |editor, cx| {
-                editor
-                    .update_in(cx, |editor, window, cx| {
-                        editor.register_visible_buffers(cx);
-                        editor.refresh_inlay_hints(InlayHintRefreshReason::NewLinesShown, cx);
-                        editor.update_lsp_data(None, window, cx);
-                        editor.colorize_brackets(false, cx);
-                    })
-                    .ok();
-            });
-        }
-    }
-
-    pub(crate) fn set_visible_column_count(&mut self, columns: f64) {
-        self.scroll_manager.visible_column_count = Some(columns);
-    }
-
-    pub fn apply_scroll_delta(
-        &mut self,
-        scroll_delta: gpui::Point<f32>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let mut delta = scroll_delta;
-        if self.scroll_manager.forbid_vertical_scroll {
-            delta.y = 0.0;
-        }
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-        let position =
-            self.scroll_manager.anchor.scroll_position(&display_map) + delta.map(f64::from);
-        self.set_scroll_position_taking_display_map(position, true, false, display_map, window, cx);
-    }
-
-    pub fn set_scroll_position(
-        &mut self,
-        scroll_position: gpui::Point<ScrollOffset>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> WasScrolled {
-        let mut position = scroll_position;
-        if self.scroll_manager.forbid_vertical_scroll {
-            let current_position = self.scroll_position(cx);
-            position.y = current_position.y;
-        }
-        self.set_scroll_position_internal(position, true, false, window, cx)
-    }
-
-    /// Scrolls so that `row` is at the top of the editor view.
-    pub fn set_scroll_top_row(
-        &mut self,
-        row: DisplayRow,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) {
-        let snapshot = self.snapshot(window, cx).display_snapshot;
-        let new_screen_top = DisplayPoint::new(row, 0);
-        let new_screen_top = new_screen_top.to_offset(&snapshot, Bias::Left);
-        let new_anchor = snapshot.buffer_snapshot().anchor_before(new_screen_top);
-
-        self.set_scroll_anchor(
-            ScrollAnchor {
-                anchor: new_anchor,
-                offset: Default::default(),
-            },
-            window,
-            cx,
-        );
-    }
-
-    pub(crate) fn set_scroll_position_internal(
-        &mut self,
-        scroll_position: gpui::Point<ScrollOffset>,
-        local: bool,
-        autoscroll: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> WasScrolled {
-        let map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-        self.set_scroll_position_taking_display_map(
-            scroll_position,
-            local,
-            autoscroll,
-            map,
-            window,
-            cx,
-        )
-    }
-
-    fn set_scroll_position_taking_display_map(
-        &mut self,
-        scroll_position: gpui::Point<ScrollOffset>,
-        local: bool,
-        autoscroll: bool,
-        display_map: DisplaySnapshot,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> WasScrolled {
-        hide_hover(self, cx);
-        let workspace_id = self.workspace.as_ref().and_then(|workspace| workspace.1);
-
-        self.edit_prediction_preview
-            .set_previous_scroll_position(None);
-
-        let adjusted_position = if self.scroll_manager.forbid_vertical_scroll {
-            let current_position = self.scroll_manager.anchor.scroll_position(&display_map);
-            gpui::Point::new(scroll_position.x, current_position.y)
-        } else {
-            scroll_position
-        };
-
-        self.scroll_manager.set_scroll_position(
-            adjusted_position,
-            &display_map,
-            local,
-            autoscroll,
-            workspace_id,
-            window,
-            cx,
-        )
-    }
-
-    pub fn scroll_position(&self, cx: &mut Context<Self>) -> gpui::Point<ScrollOffset> {
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-        self.scroll_manager.anchor.scroll_position(&display_map)
-    }
-
-    pub fn set_scroll_anchor(
-        &mut self,
-        scroll_anchor: ScrollAnchor,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        hide_hover(self, cx);
-        let workspace_id = self.workspace.as_ref().and_then(|workspace| workspace.1);
-        let top_row = scroll_anchor
-            .anchor
-            .to_point(&self.buffer().read(cx).snapshot(cx))
-            .row;
-        self.scroll_manager.set_anchor(
-            scroll_anchor,
-            top_row,
-            true,
-            false,
-            workspace_id,
-            window,
-            cx,
-        );
-    }
-
-    pub(crate) fn set_scroll_anchor_remote(
-        &mut self,
-        scroll_anchor: ScrollAnchor,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        hide_hover(self, cx);
-        let workspace_id = self.workspace.as_ref().and_then(|workspace| workspace.1);
-        let snapshot = &self.buffer().read(cx).snapshot(cx);
-        if !scroll_anchor.anchor.is_valid(snapshot) {
-            log::warn!("Invalid scroll anchor: {:?}", scroll_anchor);
-            return;
-        }
-        let top_row = scroll_anchor.anchor.to_point(snapshot).row;
-        self.scroll_manager.set_anchor(
-            scroll_anchor,
-            top_row,
-            false,
-            false,
-            workspace_id,
-            window,
-            cx,
-        );
-    }
-
-    pub fn scroll_screen(
-        &mut self,
-        amount: &ScrollAmount,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if matches!(self.mode, EditorMode::SingleLine) {
-            cx.propagate();
-            return;
-        }
-
-        if self.take_rename(true, window, cx).is_some() {
-            return;
-        }
-
-        let mut current_position = self.scroll_position(cx);
-        let Some(visible_line_count) = self.visible_line_count() else {
-            return;
-        };
-        let Some(mut visible_column_count) = self.visible_column_count() else {
-            return;
-        };
-
-        // If the user has a preferred line length, and has the editor
-        // configured to wrap at the preferred line length, or bounded to it,
-        // use that value over the visible column count. This was mostly done so
-        // that tests could actually be written for vim's `z l`, `z h`, `z
-        // shift-l` and `z shift-h` commands, as there wasn't a good way to
-        // configure the editor to only display a certain number of columns. If
-        // that ever happens, this could probably be removed.
-        let settings = AllLanguageSettings::get_global(cx);
-        if matches!(
-            settings.defaults.soft_wrap,
-            SoftWrap::PreferredLineLength | SoftWrap::Bounded
-        ) && (settings.defaults.preferred_line_length as f64) < visible_column_count
-        {
-            visible_column_count = settings.defaults.preferred_line_length as f64;
-        }
-
-        // If the scroll position is currently at the left edge of the document
-        // (x == 0.0) and the intent is to scroll right, the gutter's margin
-        // should first be added to the current position, otherwise the cursor
-        // will end at the column position minus the margin, which looks off.
-        if current_position.x == 0.0
-            && amount.columns(visible_column_count) > 0.
-            && let Some(last_position_map) = &self.last_position_map
-        {
-            current_position.x +=
-                f64::from(self.gutter_dimensions.margin / last_position_map.em_advance);
-        }
-        let new_position = current_position
-            + point(
-                amount.columns(visible_column_count),
-                amount.lines(visible_line_count),
-            );
-        self.set_scroll_position(new_position, window, cx);
-    }
-
-    /// Returns an ordering. The newest selection is:
-    ///     Ordering::Equal => on screen
-    ///     Ordering::Less => above or to the left of the screen
-    ///     Ordering::Greater => below or to the right of the screen
-    pub fn newest_selection_on_screen(&self, cx: &mut App) -> Ordering {
-        let snapshot = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-        let newest_head = self
-            .selections
-            .newest_anchor()
-            .head()
-            .to_display_point(&snapshot);
-        let screen_top = self
-            .scroll_manager
-            .anchor
-            .anchor
-            .to_display_point(&snapshot);
-
-        if screen_top > newest_head {
-            return Ordering::Less;
-        }
-
-        if let (Some(visible_lines), Some(visible_columns)) =
-            (self.visible_line_count(), self.visible_column_count())
-            && newest_head.row() <= DisplayRow(screen_top.row().0 + visible_lines as u32)
-            && newest_head.column() <= screen_top.column() + visible_columns as u32
-        {
-            return Ordering::Equal;
-        }
-
-        Ordering::Greater
-    }
-
-    pub fn read_scroll_position_from_db(
-        &mut self,
-        item_id: u64,
-        workspace_id: WorkspaceId,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) {
-        let scroll_position = DB.get_scroll_position(item_id, workspace_id);
-        if let Ok(Some((top_row, x, y))) = scroll_position {
-            let top_anchor = self
-                .buffer()
-                .read(cx)
-                .snapshot(cx)
-                .anchor_before(Point::new(top_row, 0));
-            let scroll_anchor = ScrollAnchor {
-                offset: gpui::Point::new(x, y),
-                anchor: top_anchor,
-            };
-            self.set_scroll_anchor(scroll_anchor, window, cx);
-        }
-    }
-}
diff --git a/crates/editor/src/scroll/actions.rs b/crates/editor/src/scroll/actions.rs
deleted file mode 100644
index 5a1c849b24..0000000000
--- a/crates/editor/src/scroll/actions.rs
+++ /dev/null
@@ -1,130 +0,0 @@
-use super::Axis;
-use crate::{
-    Autoscroll, Editor, EditorMode, NextScreen, NextScrollCursorCenterTopBottom,
-    SCROLL_CENTER_TOP_BOTTOM_DEBOUNCE_TIMEOUT, ScrollCursorBottom, ScrollCursorCenter,
-    ScrollCursorCenterTopBottom, ScrollCursorTop, display_map::DisplayRow, scroll::ScrollOffset,
-};
-use gpui::{Context, Point, Window};
-
-impl Editor {
-    pub fn next_screen(&mut self, _: &NextScreen, window: &mut Window, cx: &mut Context<Editor>) {
-        if self.take_rename(true, window, cx).is_some() {
-            return;
-        }
-
-        if self.mouse_context_menu.is_some() {
-            return;
-        }
-
-        if matches!(self.mode, EditorMode::SingleLine) {
-            cx.propagate();
-            return;
-        }
-        self.request_autoscroll(Autoscroll::Next, cx);
-    }
-
-    pub fn scroll(
-        &mut self,
-        scroll_position: Point<ScrollOffset>,
-        axis: Option<Axis>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.scroll_manager.update_ongoing_scroll(axis);
-        self.set_scroll_position(scroll_position, window, cx);
-    }
-
-    pub fn scroll_cursor_center_top_bottom(
-        &mut self,
-        _: &ScrollCursorCenterTopBottom,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        match self.next_scroll_position {
-            NextScrollCursorCenterTopBottom::Center => {
-                self.scroll_cursor_center(&Default::default(), window, cx);
-            }
-            NextScrollCursorCenterTopBottom::Top => {
-                self.scroll_cursor_top(&Default::default(), window, cx);
-            }
-            NextScrollCursorCenterTopBottom::Bottom => {
-                self.scroll_cursor_bottom(&Default::default(), window, cx);
-            }
-        }
-
-        self.next_scroll_position = self.next_scroll_position.next();
-        self._scroll_cursor_center_top_bottom_task = cx.spawn(async move |editor, cx| {
-            cx.background_executor()
-                .timer(SCROLL_CENTER_TOP_BOTTOM_DEBOUNCE_TIMEOUT)
-                .await;
-            editor
-                .update(cx, |editor, _| {
-                    editor.next_scroll_position = NextScrollCursorCenterTopBottom::default();
-                })
-                .ok();
-        });
-    }
-
-    pub fn scroll_cursor_top(
-        &mut self,
-        _: &ScrollCursorTop,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) {
-        let display_snapshot = self.display_snapshot(cx);
-        let scroll_margin_rows = self.vertical_scroll_margin() as u32;
-        let new_screen_top = self
-            .selections
-            .newest_display(&display_snapshot)
-            .head()
-            .row()
-            .0;
-        let header_offset = display_snapshot
-            .buffer_snapshot()
-            .show_headers()
-            .then(|| display_snapshot.buffer_header_height())
-            .unwrap_or(0);
-        let new_screen_top = new_screen_top.saturating_sub(scroll_margin_rows + header_offset);
-        self.set_scroll_top_row(DisplayRow(new_screen_top), window, cx);
-    }
-
-    pub fn scroll_cursor_center(
-        &mut self,
-        _: &ScrollCursorCenter,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) {
-        let Some(visible_rows) = self.visible_line_count().map(|count| count as u32) else {
-            return;
-        };
-        let new_screen_top = self
-            .selections
-            .newest_display(&self.display_snapshot(cx))
-            .head()
-            .row()
-            .0;
-        let new_screen_top = new_screen_top.saturating_sub(visible_rows / 2);
-        self.set_scroll_top_row(DisplayRow(new_screen_top), window, cx);
-    }
-
-    pub fn scroll_cursor_bottom(
-        &mut self,
-        _: &ScrollCursorBottom,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) {
-        let scroll_margin_rows = self.vertical_scroll_margin() as u32;
-        let Some(visible_rows) = self.visible_line_count().map(|count| count as u32) else {
-            return;
-        };
-        let new_screen_top = self
-            .selections
-            .newest_display(&self.display_snapshot(cx))
-            .head()
-            .row()
-            .0;
-        let new_screen_top =
-            new_screen_top.saturating_sub(visible_rows.saturating_sub(scroll_margin_rows));
-        self.set_scroll_top_row(DisplayRow(new_screen_top), window, cx);
-    }
-}
diff --git a/crates/editor/src/scroll/autoscroll.rs b/crates/editor/src/scroll/autoscroll.rs
deleted file mode 100644
index 28fd944219..0000000000
--- a/crates/editor/src/scroll/autoscroll.rs
+++ /dev/null
@@ -1,372 +0,0 @@
-use crate::{
-    DisplayRow, Editor, EditorMode, LineWithInvisibles, RowExt, SelectionEffects,
-    display_map::ToDisplayPoint,
-    scroll::{ScrollOffset, WasScrolled},
-};
-use gpui::{Bounds, Context, Pixels, Window};
-use language::Point;
-use multi_buffer::Anchor;
-use std::cmp;
-
-#[derive(Debug, PartialEq, Eq, Clone, Copy)]
-pub enum Autoscroll {
-    Next,
-    Strategy(AutoscrollStrategy, Option<Anchor>),
-}
-
-impl Autoscroll {
-    /// scrolls the minimal amount to (try) and fit all cursors onscreen
-    pub fn fit() -> Self {
-        Self::Strategy(AutoscrollStrategy::Fit, None)
-    }
-
-    /// scrolls the minimal amount to fit the newest cursor
-    pub fn newest() -> Self {
-        Self::Strategy(AutoscrollStrategy::Newest, None)
-    }
-
-    /// scrolls so the newest cursor is vertically centered
-    pub fn center() -> Self {
-        Self::Strategy(AutoscrollStrategy::Center, None)
-    }
-
-    /// scrolls so the newest cursor is near the top
-    /// (offset by vertical_scroll_margin)
-    pub fn focused() -> Self {
-        Self::Strategy(AutoscrollStrategy::Focused, None)
-    }
-
-    /// Scrolls so that the newest cursor is roughly an n-th line from the top.
-    pub fn top_relative(n: usize) -> Self {
-        Self::Strategy(AutoscrollStrategy::TopRelative(n), None)
-    }
-
-    /// Scrolls so that the newest cursor is at the top.
-    pub fn top() -> Self {
-        Self::Strategy(AutoscrollStrategy::Top, None)
-    }
-
-    /// Scrolls so that the newest cursor is roughly an n-th line from the bottom.
-    pub fn bottom_relative(n: usize) -> Self {
-        Self::Strategy(AutoscrollStrategy::BottomRelative(n), None)
-    }
-
-    /// Scrolls so that the newest cursor is at the bottom.
-    pub fn bottom() -> Self {
-        Self::Strategy(AutoscrollStrategy::Bottom, None)
-    }
-
-    /// Applies a given auto-scroll strategy to a given anchor instead of a cursor.
-    /// E.G: Autoscroll::center().for_anchor(...) results in the anchor being at the center of the screen.
-    pub fn for_anchor(self, anchor: Anchor) -> Self {
-        match self {
-            Autoscroll::Next => self,
-            Autoscroll::Strategy(autoscroll_strategy, _) => {
-                Self::Strategy(autoscroll_strategy, Some(anchor))
-            }
-        }
-    }
-}
-
-impl Into<SelectionEffects> for Option<Autoscroll> {
-    fn into(self) -> SelectionEffects {
-        match self {
-            Some(autoscroll) => SelectionEffects::scroll(autoscroll),
-            None => SelectionEffects::no_scroll(),
-        }
-    }
-}
-
-#[derive(Debug, PartialEq, Eq, Default, Clone, Copy)]
-pub enum AutoscrollStrategy {
-    Fit,
-    Newest,
-    #[default]
-    Center,
-    Focused,
-    Top,
-    Bottom,
-    TopRelative(usize),
-    BottomRelative(usize),
-}
-
-impl AutoscrollStrategy {
-    fn next(&self) -> Self {
-        match self {
-            AutoscrollStrategy::Center => AutoscrollStrategy::Top,
-            AutoscrollStrategy::Top => AutoscrollStrategy::Bottom,
-            _ => AutoscrollStrategy::Center,
-        }
-    }
-}
-
-pub(crate) struct NeedsHorizontalAutoscroll(pub(crate) bool);
-
-impl Editor {
-    pub(crate) fn autoscroll_vertically(
-        &mut self,
-        bounds: Bounds<Pixels>,
-        line_height: Pixels,
-        max_scroll_top: ScrollOffset,
-        autoscroll_request: Option<(Autoscroll, bool)>,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) -> (NeedsHorizontalAutoscroll, WasScrolled) {
-        let viewport_height = bounds.size.height;
-        let visible_lines = ScrollOffset::from(viewport_height / line_height);
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-        let mut scroll_position = self.scroll_manager.scroll_position(&display_map);
-        let original_y = scroll_position.y;
-        if let Some(last_bounds) = self.expect_bounds_change.take()
-            && scroll_position.y != 0.
-        {
-            scroll_position.y +=
-                ScrollOffset::from((bounds.top() - last_bounds.top()) / line_height);
-            if scroll_position.y < 0. {
-                scroll_position.y = 0.;
-            }
-        }
-        if scroll_position.y > max_scroll_top {
-            scroll_position.y = max_scroll_top;
-        }
-
-        let editor_was_scrolled = if original_y != scroll_position.y {
-            self.set_scroll_position(scroll_position, window, cx)
-        } else {
-            WasScrolled(false)
-        };
-
-        let Some((autoscroll, local)) = autoscroll_request else {
-            return (NeedsHorizontalAutoscroll(false), editor_was_scrolled);
-        };
-
-        let mut target_top;
-        let mut target_bottom;
-        if let Some(first_highlighted_row) =
-            self.highlighted_display_row_for_autoscroll(&display_map)
-        {
-            target_top = first_highlighted_row.as_f64();
-            target_bottom = target_top + 1.;
-        } else {
-            let selections = self.selections.all::<Point>(&display_map);
-
-            target_top = selections
-                .first()
-                .unwrap()
-                .head()
-                .to_display_point(&display_map)
-                .row()
-                .as_f64();
-            target_bottom = selections
-                .last()
-                .unwrap()
-                .head()
-                .to_display_point(&display_map)
-                .row()
-                .next_row()
-                .as_f64();
-
-            let selections_fit = target_bottom - target_top <= visible_lines;
-            if matches!(
-                autoscroll,
-                Autoscroll::Strategy(AutoscrollStrategy::Newest, _)
-            ) || (matches!(autoscroll, Autoscroll::Strategy(AutoscrollStrategy::Fit, _))
-                && !selections_fit)
-            {
-                let newest_selection_top = selections
-                    .iter()
-                    .max_by_key(|s| s.id)
-                    .unwrap()
-                    .head()
-                    .to_display_point(&display_map)
-                    .row()
-                    .as_f64();
-                target_top = newest_selection_top;
-                target_bottom = newest_selection_top + 1.;
-            }
-        }
-
-        let margin = if matches!(self.mode, EditorMode::AutoHeight { .. }) {
-            0.
-        } else {
-            ((visible_lines - (target_bottom - target_top)) / 2.0).floor()
-        };
-
-        let strategy = match autoscroll {
-            Autoscroll::Strategy(strategy, _) => strategy,
-            Autoscroll::Next => {
-                let last_autoscroll = &self.scroll_manager.last_autoscroll;
-                if let Some(last_autoscroll) = last_autoscroll {
-                    if self.scroll_manager.anchor.offset == last_autoscroll.0
-                        && target_top == last_autoscroll.1
-                        && target_bottom == last_autoscroll.2
-                    {
-                        last_autoscroll.3.next()
-                    } else {
-                        AutoscrollStrategy::default()
-                    }
-                } else {
-                    AutoscrollStrategy::default()
-                }
-            }
-        };
-        if let Autoscroll::Strategy(_, Some(anchor)) = autoscroll {
-            target_top = anchor.to_display_point(&display_map).row().as_f64();
-            target_bottom = target_top + 1.;
-        }
-
-        let was_autoscrolled = match strategy {
-            AutoscrollStrategy::Fit | AutoscrollStrategy::Newest => {
-                let margin = margin.min(self.scroll_manager.vertical_scroll_margin);
-                let target_top = (target_top - margin).max(0.0);
-                let target_bottom = target_bottom + margin;
-                let start_row = scroll_position.y;
-                let end_row = start_row + visible_lines;
-
-                let needs_scroll_up = target_top < start_row;
-                let needs_scroll_down = target_bottom >= end_row;
-
-                if needs_scroll_up && !needs_scroll_down {
-                    scroll_position.y = target_top;
-                } else if !needs_scroll_up && needs_scroll_down {
-                    scroll_position.y = target_bottom - visible_lines;
-                }
-
-                if needs_scroll_up ^ needs_scroll_down {
-                    self.set_scroll_position_internal(scroll_position, local, true, window, cx)
-                } else {
-                    WasScrolled(false)
-                }
-            }
-            AutoscrollStrategy::Center => {
-                scroll_position.y = (target_top - margin).max(0.0);
-                self.set_scroll_position_internal(scroll_position, local, true, window, cx)
-            }
-            AutoscrollStrategy::Focused => {
-                let margin = margin.min(self.scroll_manager.vertical_scroll_margin);
-                scroll_position.y = (target_top - margin).max(0.0);
-                self.set_scroll_position_internal(scroll_position, local, true, window, cx)
-            }
-            AutoscrollStrategy::Top => {
-                scroll_position.y = (target_top).max(0.0);
-                self.set_scroll_position_internal(scroll_position, local, true, window, cx)
-            }
-            AutoscrollStrategy::Bottom => {
-                scroll_position.y = (target_bottom - visible_lines).max(0.0);
-                self.set_scroll_position_internal(scroll_position, local, true, window, cx)
-            }
-            AutoscrollStrategy::TopRelative(lines) => {
-                scroll_position.y = target_top - lines as ScrollOffset;
-                self.set_scroll_position_internal(scroll_position, local, true, window, cx)
-            }
-            AutoscrollStrategy::BottomRelative(lines) => {
-                scroll_position.y = target_bottom + lines as ScrollOffset;
-                self.set_scroll_position_internal(scroll_position, local, true, window, cx)
-            }
-        };
-
-        self.scroll_manager.last_autoscroll = Some((
-            self.scroll_manager.anchor.offset,
-            target_top,
-            target_bottom,
-            strategy,
-        ));
-
-        let was_scrolled = WasScrolled(editor_was_scrolled.0 || was_autoscrolled.0);
-        (NeedsHorizontalAutoscroll(true), was_scrolled)
-    }
-
-    pub(crate) fn autoscroll_horizontally(
-        &mut self,
-        start_row: DisplayRow,
-        viewport_width: Pixels,
-        scroll_width: Pixels,
-        em_advance: Pixels,
-        layouts: &[LineWithInvisibles],
-        autoscroll_request: Option<(Autoscroll, bool)>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<gpui::Point<ScrollOffset>> {
-        let (_, local) = autoscroll_request?;
-        let em_advance = ScrollOffset::from(em_advance);
-        let viewport_width = ScrollOffset::from(viewport_width);
-        let scroll_width = ScrollOffset::from(scroll_width);
-
-        let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
-        let selections = self.selections.all::<Point>(&display_map);
-        let mut scroll_position = self.scroll_manager.scroll_position(&display_map);
-
-        let mut target_left;
-        let mut target_right: f64;
-
-        if self
-            .highlighted_display_row_for_autoscroll(&display_map)
-            .is_none()
-        {
-            target_left = f64::INFINITY;
-            target_right = 0.;
-            for selection in selections {
-                let head = selection.head().to_display_point(&display_map);
-                if head.row() >= start_row
-                    && head.row() < DisplayRow(start_row.0 + layouts.len() as u32)
-                {
-                    let start_column = head.column();
-                    let end_column = cmp::min(display_map.line_len(head.row()), head.column());
-                    target_left = target_left.min(ScrollOffset::from(
-                        layouts[head.row().minus(start_row) as usize]
-                            .x_for_index(start_column as usize)
-                            + self.gutter_dimensions.margin,
-                    ));
-                    target_right = target_right.max(
-                        ScrollOffset::from(
-                            layouts[head.row().minus(start_row) as usize]
-                                .x_for_index(end_column as usize),
-                        ) + em_advance,
-                    );
-                }
-            }
-        } else {
-            target_left = 0.;
-            target_right = 0.;
-        }
-
-        target_right = target_right.min(scroll_width);
-
-        if target_right - target_left > viewport_width {
-            return None;
-        }
-
-        let scroll_left = self.scroll_manager.anchor.offset.x * em_advance;
-        let scroll_right = scroll_left + viewport_width;
-
-        let was_scrolled = if target_left < scroll_left {
-            scroll_position.x = target_left / em_advance;
-            self.set_scroll_position_internal(scroll_position, local, true, window, cx)
-        } else if target_right > scroll_right {
-            scroll_position.x = (target_right - viewport_width) / em_advance;
-            self.set_scroll_position_internal(scroll_position, local, true, window, cx)
-        } else {
-            WasScrolled(false)
-        };
-
-        if was_scrolled.0 {
-            Some(scroll_position)
-        } else {
-            None
-        }
-    }
-
-    pub fn request_autoscroll(&mut self, autoscroll: Autoscroll, cx: &mut Context<Self>) {
-        self.scroll_manager.autoscroll_request = Some((autoscroll, true));
-        cx.notify();
-    }
-
-    pub(crate) fn request_autoscroll_remotely(
-        &mut self,
-        autoscroll: Autoscroll,
-        cx: &mut Context<Self>,
-    ) {
-        self.scroll_manager.autoscroll_request = Some((autoscroll, false));
-        cx.notify();
-    }
-}
diff --git a/crates/editor/src/scroll/scroll_amount.rs b/crates/editor/src/scroll/scroll_amount.rs
deleted file mode 100644
index 3280290d6e..0000000000
--- a/crates/editor/src/scroll/scroll_amount.rs
+++ /dev/null
@@ -1,82 +0,0 @@
-use serde::Deserialize;
-use ui::Pixels;
-
-#[derive(Debug)]
-pub enum ScrollDirection {
-    Upwards,
-    Downwards,
-    Rightwards,
-    Leftwards,
-}
-
-impl ScrollDirection {
-    pub fn is_upwards(&self) -> bool {
-        matches!(self, ScrollDirection::Upwards)
-    }
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Deserialize)]
-pub enum ScrollAmount {
-    // Scroll N lines (positive is towards the end of the document)
-    Line(f32),
-    // Scroll N pages (positive is towards the end of the document)
-    Page(f32),
-    // Scroll N columns (positive is towards the right of the document)
-    Column(f32),
-    // Scroll N page width (positive is towards the right of the document)
-    PageWidth(f32),
-}
-
-impl ScrollAmount {
-    pub fn lines(&self, mut visible_line_count: f64) -> f64 {
-        match self {
-            Self::Line(count) => *count as f64,
-            Self::Page(count) => {
-                // for full pages subtract one to leave an anchor line
-                if self.is_full_page() {
-                    visible_line_count -= 1.0
-                }
-                (visible_line_count * (*count as f64)).trunc()
-            }
-            Self::Column(_count) => 0.0,
-            Self::PageWidth(_count) => 0.0,
-        }
-    }
-
-    pub fn columns(&self, visible_column_count: f64) -> f64 {
-        match self {
-            Self::Line(_count) => 0.0,
-            Self::Page(_count) => 0.0,
-            Self::Column(count) => *count as f64,
-            Self::PageWidth(count) => (visible_column_count * *count as f64).trunc(),
-        }
-    }
-
-    pub fn pixels(&self, line_height: Pixels, height: Pixels) -> Pixels {
-        match self {
-            ScrollAmount::Line(x) => line_height * *x,
-            ScrollAmount::Page(x) => height * *x,
-            // This function seems to only be leveraged by the popover that is
-            // displayed by the editor when, for example, viewing a function's
-            // documentation. Right now that only supports vertical scrolling,
-            // so I'm leaving this at 0.0 for now to try and make it clear that
-            // this should not have an impact on that?
-            ScrollAmount::Column(_) => Pixels::ZERO,
-            ScrollAmount::PageWidth(_) => Pixels::ZERO,
-        }
-    }
-
-    pub fn is_full_page(&self) -> bool {
-        matches!(self, ScrollAmount::Page(count) if count.abs() == 1.0)
-    }
-
-    pub fn direction(&self) -> ScrollDirection {
-        match self {
-            Self::Line(amount) if amount.is_sign_positive() => ScrollDirection::Downwards,
-            Self::Page(amount) if amount.is_sign_positive() => ScrollDirection::Downwards,
-            Self::Column(amount) if amount.is_sign_positive() => ScrollDirection::Rightwards,
-            Self::Column(amount) if amount.is_sign_negative() => ScrollDirection::Leftwards,
-            _ => ScrollDirection::Upwards,
-        }
-    }
-}
diff --git a/crates/editor/src/selections_collection.rs b/crates/editor/src/selections_collection.rs
deleted file mode 100644
index 6f744e1133..0000000000
--- a/crates/editor/src/selections_collection.rs
+++ /dev/null
@@ -1,1163 +0,0 @@
-use std::{
-    cmp, fmt, iter, mem,
-    ops::{AddAssign, Deref, DerefMut, Range, Sub},
-    sync::Arc,
-};
-
-use collections::HashMap;
-use gpui::Pixels;
-use itertools::Itertools as _;
-use language::{Bias, Point, Selection, SelectionGoal};
-use multi_buffer::{MultiBufferDimension, MultiBufferOffset};
-use util::post_inc;
-
-use crate::{
-    Anchor, DisplayPoint, DisplayRow, ExcerptId, MultiBufferSnapshot, SelectMode, ToOffset,
-    display_map::{DisplaySnapshot, ToDisplayPoint},
-    movement::TextLayoutDetails,
-};
-
-#[derive(Debug, Clone)]
-pub struct PendingSelection {
-    selection: Selection<Anchor>,
-    mode: SelectMode,
-}
-
-#[derive(Debug, Clone)]
-pub struct SelectionsCollection {
-    next_selection_id: usize,
-    line_mode: bool,
-    /// The non-pending, non-overlapping selections.
-    /// The [SelectionsCollection::pending] selection could possibly overlap these
-    disjoint: Arc<[Selection<Anchor>]>,
-    /// A pending selection, such as when the mouse is being dragged
-    pending: Option<PendingSelection>,
-    select_mode: SelectMode,
-    is_extending: bool,
-}
-
-impl SelectionsCollection {
-    pub fn new() -> Self {
-        Self {
-            next_selection_id: 1,
-            line_mode: false,
-            disjoint: Arc::default(),
-            pending: Some(PendingSelection {
-                selection: Selection {
-                    id: 0,
-                    start: Anchor::min(),
-                    end: Anchor::min(),
-                    reversed: false,
-                    goal: SelectionGoal::None,
-                },
-                mode: SelectMode::Character,
-            }),
-            select_mode: SelectMode::Character,
-            is_extending: false,
-        }
-    }
-
-    pub fn clone_state(&mut self, other: &SelectionsCollection) {
-        self.next_selection_id = other.next_selection_id;
-        self.line_mode = other.line_mode;
-        self.disjoint = other.disjoint.clone();
-        self.pending.clone_from(&other.pending);
-    }
-
-    pub fn count(&self) -> usize {
-        let mut count = self.disjoint.len();
-        if self.pending.is_some() {
-            count += 1;
-        }
-        count
-    }
-
-    /// The non-pending, non-overlapping selections. There could be a pending selection that
-    /// overlaps these if the mouse is being dragged, etc. This could also be empty if there is a
-    /// pending selection. Returned as selections over Anchors.
-    pub fn disjoint_anchors_arc(&self) -> Arc<[Selection<Anchor>]> {
-        self.disjoint.clone()
-    }
-
-    /// The non-pending, non-overlapping selections. There could be a pending selection that
-    /// overlaps these if the mouse is being dragged, etc. This could also be empty if there is a
-    /// pending selection. Returned as selections over Anchors.
-    pub fn disjoint_anchors(&self) -> &[Selection<Anchor>] {
-        &self.disjoint
-    }
-
-    pub fn disjoint_anchor_ranges(&self) -> impl Iterator<Item = Range<Anchor>> {
-        // Mapping the Arc slice would borrow it, whereas indexing captures it.
-        let disjoint = self.disjoint_anchors_arc();
-        (0..disjoint.len()).map(move |ix| disjoint[ix].range())
-    }
-
-    /// Non-overlapping selections using anchors, including the pending selection.
-    pub fn all_anchors(&self, snapshot: &DisplaySnapshot) -> Arc<[Selection<Anchor>]> {
-        if self.pending.is_none() {
-            self.disjoint_anchors_arc()
-        } else {
-            let all_offset_selections = self.all::<MultiBufferOffset>(snapshot);
-            all_offset_selections
-                .into_iter()
-                .map(|selection| selection_to_anchor_selection(selection, snapshot))
-                .collect()
-        }
-    }
-
-    pub fn pending_anchor(&self) -> Option<&Selection<Anchor>> {
-        self.pending.as_ref().map(|pending| &pending.selection)
-    }
-
-    pub fn pending_anchor_mut(&mut self) -> Option<&mut Selection<Anchor>> {
-        self.pending.as_mut().map(|pending| &mut pending.selection)
-    }
-
-    pub fn pending<D>(&self, snapshot: &DisplaySnapshot) -> Option<Selection<D>>
-    where
-        D: MultiBufferDimension + Sub + AddAssign<<D as Sub>::Output> + Ord,
-    {
-        resolve_selections_wrapping_blocks(self.pending_anchor(), &snapshot).next()
-    }
-
-    pub(crate) fn pending_mode(&self) -> Option<SelectMode> {
-        self.pending.as_ref().map(|pending| pending.mode.clone())
-    }
-
-    pub fn all<D>(&self, snapshot: &DisplaySnapshot) -> Vec<Selection<D>>
-    where
-        D: MultiBufferDimension + Sub + AddAssign<<D as Sub>::Output> + Ord,
-    {
-        let disjoint_anchors = &self.disjoint;
-        let mut disjoint =
-            resolve_selections_wrapping_blocks::<D, _>(disjoint_anchors.iter(), &snapshot)
-                .peekable();
-        let mut pending_opt = self.pending::<D>(&snapshot);
-        iter::from_fn(move || {
-            if let Some(pending) = pending_opt.as_mut() {
-                while let Some(next_selection) = disjoint.peek() {
-                    if pending.start <= next_selection.end && pending.end >= next_selection.start {
-                        let next_selection = disjoint.next().unwrap();
-                        if next_selection.start < pending.start {
-                            pending.start = next_selection.start;
-                        }
-                        if next_selection.end > pending.end {
-                            pending.end = next_selection.end;
-                        }
-                    } else if next_selection.end < pending.start {
-                        return disjoint.next();
-                    } else {
-                        break;
-                    }
-                }
-
-                pending_opt.take()
-            } else {
-                disjoint.next()
-            }
-        })
-        .collect()
-    }
-
-    /// Returns all of the selections, adjusted to take into account the selection line_mode
-    pub fn all_adjusted(&self, snapshot: &DisplaySnapshot) -> Vec<Selection<Point>> {
-        let mut selections = self.all::<Point>(&snapshot);
-        if self.line_mode {
-            for selection in &mut selections {
-                let new_range = snapshot.expand_to_line(selection.range());
-                selection.start = new_range.start;
-                selection.end = new_range.end;
-            }
-        }
-        selections
-    }
-
-    /// Returns the newest selection, adjusted to take into account the selection line_mode
-    pub fn newest_adjusted(&self, snapshot: &DisplaySnapshot) -> Selection<Point> {
-        let mut selection = self.newest::<Point>(&snapshot);
-        if self.line_mode {
-            let new_range = snapshot.expand_to_line(selection.range());
-            selection.start = new_range.start;
-            selection.end = new_range.end;
-        }
-        selection
-    }
-
-    pub fn all_adjusted_display(
-        &self,
-        display_map: &DisplaySnapshot,
-    ) -> Vec<Selection<DisplayPoint>> {
-        if self.line_mode {
-            let selections = self.all::<Point>(&display_map);
-            let result = selections
-                .into_iter()
-                .map(|mut selection| {
-                    let new_range = display_map.expand_to_line(selection.range());
-                    selection.start = new_range.start;
-                    selection.end = new_range.end;
-                    selection.map(|point| point.to_display_point(&display_map))
-                })
-                .collect();
-            result
-        } else {
-            self.all_display(display_map)
-        }
-    }
-
-    pub fn disjoint_in_range<D>(
-        &self,
-        range: Range<Anchor>,
-        snapshot: &DisplaySnapshot,
-    ) -> Vec<Selection<D>>
-    where
-        D: MultiBufferDimension + Sub + AddAssign<<D as Sub>::Output> + Ord + std::fmt::Debug,
-    {
-        let start_ix = match self
-            .disjoint
-            .binary_search_by(|probe| probe.end.cmp(&range.start, snapshot.buffer_snapshot()))
-        {
-            Ok(ix) | Err(ix) => ix,
-        };
-        let end_ix = match self
-            .disjoint
-            .binary_search_by(|probe| probe.start.cmp(&range.end, snapshot.buffer_snapshot()))
-        {
-            Ok(ix) => ix + 1,
-            Err(ix) => ix,
-        };
-        resolve_selections_wrapping_blocks(&self.disjoint[start_ix..end_ix], snapshot).collect()
-    }
-
-    pub fn all_display(&self, snapshot: &DisplaySnapshot) -> Vec<Selection<DisplayPoint>> {
-        let disjoint_anchors = &self.disjoint;
-        let mut disjoint =
-            resolve_selections_display(disjoint_anchors.iter(), &snapshot).peekable();
-        let mut pending_opt = resolve_selections_display(self.pending_anchor(), &snapshot).next();
-        iter::from_fn(move || {
-            if let Some(pending) = pending_opt.as_mut() {
-                while let Some(next_selection) = disjoint.peek() {
-                    if pending.start <= next_selection.end && pending.end >= next_selection.start {
-                        let next_selection = disjoint.next().unwrap();
-                        if next_selection.start < pending.start {
-                            pending.start = next_selection.start;
-                        }
-                        if next_selection.end > pending.end {
-                            pending.end = next_selection.end;
-                        }
-                    } else if next_selection.end < pending.start {
-                        return disjoint.next();
-                    } else {
-                        break;
-                    }
-                }
-
-                pending_opt.take()
-            } else {
-                disjoint.next()
-            }
-        })
-        .collect()
-    }
-
-    pub fn newest_anchor(&self) -> &Selection<Anchor> {
-        self.pending
-            .as_ref()
-            .map(|s| &s.selection)
-            .or_else(|| self.disjoint.iter().max_by_key(|s| s.id))
-            .unwrap()
-    }
-
-    pub fn newest<D>(&self, snapshot: &DisplaySnapshot) -> Selection<D>
-    where
-        D: MultiBufferDimension + Sub + AddAssign<<D as Sub>::Output> + Ord,
-    {
-        resolve_selections_wrapping_blocks([self.newest_anchor()], &snapshot)
-            .next()
-            .unwrap()
-    }
-
-    pub fn newest_display(&self, snapshot: &DisplaySnapshot) -> Selection<DisplayPoint> {
-        resolve_selections_display([self.newest_anchor()], &snapshot)
-            .next()
-            .unwrap()
-    }
-
-    pub fn oldest_anchor(&self) -> &Selection<Anchor> {
-        self.disjoint
-            .iter()
-            .min_by_key(|s| s.id)
-            .or_else(|| self.pending.as_ref().map(|p| &p.selection))
-            .unwrap()
-    }
-
-    pub fn oldest<D>(&self, snapshot: &DisplaySnapshot) -> Selection<D>
-    where
-        D: MultiBufferDimension + Sub + AddAssign<<D as Sub>::Output> + Ord,
-    {
-        resolve_selections_wrapping_blocks([self.oldest_anchor()], &snapshot)
-            .next()
-            .unwrap()
-    }
-
-    pub fn first_anchor(&self) -> Selection<Anchor> {
-        self.pending
-            .as_ref()
-            .map(|pending| pending.selection.clone())
-            .unwrap_or_else(|| self.disjoint.first().cloned().unwrap())
-    }
-
-    pub fn first<D>(&self, snapshot: &DisplaySnapshot) -> Selection<D>
-    where
-        D: MultiBufferDimension + Sub + AddAssign<<D as Sub>::Output> + Ord,
-    {
-        self.all(snapshot).first().unwrap().clone()
-    }
-
-    pub fn last<D>(&self, snapshot: &DisplaySnapshot) -> Selection<D>
-    where
-        D: MultiBufferDimension + Sub + AddAssign<<D as Sub>::Output> + Ord,
-    {
-        self.all(snapshot).last().unwrap().clone()
-    }
-
-    /// Returns a list of (potentially backwards!) ranges representing the selections.
-    /// Useful for test assertions, but prefer `.all()` instead.
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn ranges<D>(&self, snapshot: &DisplaySnapshot) -> Vec<Range<D>>
-    where
-        D: MultiBufferDimension + Sub + AddAssign<<D as Sub>::Output> + Ord,
-    {
-        self.all::<D>(snapshot)
-            .iter()
-            .map(|s| {
-                if s.reversed {
-                    s.end..s.start
-                } else {
-                    s.start..s.end
-                }
-            })
-            .collect()
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn display_ranges(&self, display_snapshot: &DisplaySnapshot) -> Vec<Range<DisplayPoint>> {
-        self.disjoint_anchors_arc()
-            .iter()
-            .chain(self.pending_anchor())
-            .map(|s| {
-                if s.reversed {
-                    s.end.to_display_point(display_snapshot)
-                        ..s.start.to_display_point(display_snapshot)
-                } else {
-                    s.start.to_display_point(display_snapshot)
-                        ..s.end.to_display_point(display_snapshot)
-                }
-            })
-            .collect()
-    }
-
-    /// Attempts to build a selection in the provided `DisplayRow` within the
-    /// same range as the provided range of `Pixels`.
-    /// Returns `None` if the range is not empty but it starts past the line's
-    /// length, meaning that the line isn't long enough to be contained within
-    /// part of the provided range.
-    pub fn build_columnar_selection(
-        &mut self,
-        display_map: &DisplaySnapshot,
-        row: DisplayRow,
-        positions: &Range<Pixels>,
-        reversed: bool,
-        text_layout_details: &TextLayoutDetails,
-    ) -> Option<Selection<Point>> {
-        let is_empty = positions.start == positions.end;
-        let line_len = display_map.line_len(row);
-        let line = display_map.layout_row(row, text_layout_details);
-        let start_col = line.closest_index_for_x(positions.start) as u32;
-
-        let (start, end) = if is_empty {
-            let point = DisplayPoint::new(row, std::cmp::min(start_col, line_len));
-            (point, point)
-        } else {
-            if start_col >= line_len {
-                return None;
-            }
-            let start = DisplayPoint::new(row, start_col);
-            let end_col = line.closest_index_for_x(positions.end) as u32;
-            let end = DisplayPoint::new(row, end_col);
-            (start, end)
-        };
-
-        Some(Selection {
-            id: post_inc(&mut self.next_selection_id),
-            start: start.to_point(display_map),
-            end: end.to_point(display_map),
-            reversed,
-            goal: SelectionGoal::HorizontalRange {
-                start: positions.start.into(),
-                end: positions.end.into(),
-            },
-        })
-    }
-
-    pub fn change_with<R>(
-        &mut self,
-        snapshot: &DisplaySnapshot,
-        change: impl FnOnce(&mut MutableSelectionsCollection<'_, '_>) -> R,
-    ) -> (bool, R) {
-        let mut mutable_collection = MutableSelectionsCollection {
-            snapshot,
-            collection: self,
-            selections_changed: false,
-        };
-
-        let result = change(&mut mutable_collection);
-        assert!(
-            !mutable_collection.disjoint.is_empty() || mutable_collection.pending.is_some(),
-            "There must be at least one selection"
-        );
-        if cfg!(debug_assertions) {
-            mutable_collection.disjoint.iter().for_each(|selection| {
-                assert!(
-                    snapshot.can_resolve(&selection.start),
-                    "disjoint selection start is not resolvable for the given snapshot:\n{selection:?}, {excerpt:?}",
-                    excerpt = snapshot.buffer_for_excerpt(selection.start.excerpt_id).map(|snapshot| snapshot.remote_id()),
-                );
-                assert!(
-                    snapshot.can_resolve(&selection.end),
-                    "disjoint selection end is not resolvable for the given snapshot: {selection:?}, {excerpt:?}",
-                    excerpt = snapshot.buffer_for_excerpt(selection.end.excerpt_id).map(|snapshot| snapshot.remote_id()),
-                );
-            });
-            if let Some(pending) = &mutable_collection.pending {
-                let selection = &pending.selection;
-                assert!(
-                    snapshot.can_resolve(&selection.start),
-                    "pending selection start is not resolvable for the given snapshot: {pending:?}, {excerpt:?}",
-                    excerpt = snapshot
-                        .buffer_for_excerpt(selection.start.excerpt_id)
-                        .map(|snapshot| snapshot.remote_id()),
-                );
-                assert!(
-                    snapshot.can_resolve(&selection.end),
-                    "pending selection end is not resolvable for the given snapshot: {pending:?}, {excerpt:?}",
-                    excerpt = snapshot
-                        .buffer_for_excerpt(selection.end.excerpt_id)
-                        .map(|snapshot| snapshot.remote_id()),
-                );
-            }
-        }
-        (mutable_collection.selections_changed, result)
-    }
-
-    pub fn next_selection_id(&self) -> usize {
-        self.next_selection_id
-    }
-
-    pub fn line_mode(&self) -> bool {
-        self.line_mode
-    }
-
-    pub fn set_line_mode(&mut self, line_mode: bool) {
-        self.line_mode = line_mode;
-    }
-
-    pub fn select_mode(&self) -> &SelectMode {
-        &self.select_mode
-    }
-
-    pub fn set_select_mode(&mut self, select_mode: SelectMode) {
-        self.select_mode = select_mode;
-    }
-
-    pub fn is_extending(&self) -> bool {
-        self.is_extending
-    }
-
-    pub fn set_is_extending(&mut self, is_extending: bool) {
-        self.is_extending = is_extending;
-    }
-}
-
-pub struct MutableSelectionsCollection<'snap, 'a> {
-    collection: &'a mut SelectionsCollection,
-    snapshot: &'snap DisplaySnapshot,
-    selections_changed: bool,
-}
-
-impl<'snap, 'a> fmt::Debug for MutableSelectionsCollection<'snap, 'a> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("MutableSelectionsCollection")
-            .field("collection", &self.collection)
-            .field("selections_changed", &self.selections_changed)
-            .finish()
-    }
-}
-
-impl<'snap, 'a> MutableSelectionsCollection<'snap, 'a> {
-    pub fn display_snapshot(&self) -> DisplaySnapshot {
-        self.snapshot.clone()
-    }
-
-    pub fn clear_disjoint(&mut self) {
-        self.collection.disjoint = Arc::default();
-    }
-
-    pub fn delete(&mut self, selection_id: usize) {
-        let mut changed = false;
-        self.collection.disjoint = self
-            .disjoint
-            .iter()
-            .filter(|selection| {
-                let found = selection.id == selection_id;
-                changed |= found;
-                !found
-            })
-            .cloned()
-            .collect();
-
-        self.selections_changed |= changed;
-    }
-
-    pub fn remove_selections_from_buffer(&mut self, buffer_id: language::BufferId) {
-        let mut changed = false;
-
-        let filtered_selections: Arc<[Selection<Anchor>]> = {
-            self.disjoint
-                .iter()
-                .filter(|selection| {
-                    if let Some(selection_buffer_id) =
-                        self.snapshot.buffer_id_for_anchor(selection.start)
-                    {
-                        let should_remove = selection_buffer_id == buffer_id;
-                        changed |= should_remove;
-                        !should_remove
-                    } else {
-                        true
-                    }
-                })
-                .cloned()
-                .collect()
-        };
-
-        if filtered_selections.is_empty() {
-            let buffer_snapshot = self.snapshot.buffer_snapshot();
-            let anchor = buffer_snapshot
-                .excerpts()
-                .find(|(_, buffer, _)| buffer.remote_id() == buffer_id)
-                .and_then(|(excerpt_id, _, range)| {
-                    buffer_snapshot.anchor_in_excerpt(excerpt_id, range.context.start)
-                })
-                .unwrap_or_else(|| self.snapshot.anchor_before(MultiBufferOffset(0)));
-            self.collection.disjoint = Arc::from([Selection {
-                id: post_inc(&mut self.collection.next_selection_id),
-                start: anchor,
-                end: anchor,
-                reversed: false,
-                goal: SelectionGoal::None,
-            }]);
-        } else {
-            self.collection.disjoint = filtered_selections;
-        }
-
-        self.selections_changed |= changed;
-    }
-
-    pub fn clear_pending(&mut self) {
-        if self.collection.pending.is_some() {
-            self.collection.pending = None;
-            self.selections_changed = true;
-        }
-    }
-
-    pub(crate) fn set_pending_anchor_range(&mut self, range: Range<Anchor>, mode: SelectMode) {
-        self.collection.pending = Some(PendingSelection {
-            selection: {
-                let mut start = range.start;
-                let mut end = range.end;
-                let reversed = if start.cmp(&end, self.snapshot).is_gt() {
-                    mem::swap(&mut start, &mut end);
-                    true
-                } else {
-                    false
-                };
-                Selection {
-                    id: post_inc(&mut self.collection.next_selection_id),
-                    start,
-                    end,
-                    reversed,
-                    goal: SelectionGoal::None,
-                }
-            },
-            mode,
-        });
-        self.selections_changed = true;
-    }
-
-    pub(crate) fn set_pending(&mut self, selection: Selection<Anchor>, mode: SelectMode) {
-        self.collection.pending = Some(PendingSelection { selection, mode });
-        self.selections_changed = true;
-    }
-
-    pub fn try_cancel(&mut self) -> bool {
-        if let Some(pending) = self.collection.pending.take() {
-            if self.disjoint.is_empty() {
-                self.collection.disjoint = Arc::from([pending.selection]);
-            }
-            self.selections_changed = true;
-            return true;
-        }
-
-        let mut oldest = self.oldest_anchor().clone();
-        if self.count() > 1 {
-            self.collection.disjoint = Arc::from([oldest]);
-            self.selections_changed = true;
-            return true;
-        }
-
-        if !oldest.start.cmp(&oldest.end, self.snapshot).is_eq() {
-            let head = oldest.head();
-            oldest.start = head;
-            oldest.end = head;
-            self.collection.disjoint = Arc::from([oldest]);
-            self.selections_changed = true;
-            return true;
-        }
-
-        false
-    }
-
-    pub fn insert_range<T>(&mut self, range: Range<T>)
-    where
-        T: ToOffset,
-    {
-        let display_map = self.display_snapshot();
-        let mut selections = self.collection.all(&display_map);
-        let mut start = range.start.to_offset(self.snapshot);
-        let mut end = range.end.to_offset(self.snapshot);
-        let reversed = if start > end {
-            mem::swap(&mut start, &mut end);
-            true
-        } else {
-            false
-        };
-        selections.push(Selection {
-            id: post_inc(&mut self.collection.next_selection_id),
-            start,
-            end,
-            reversed,
-            goal: SelectionGoal::None,
-        });
-        self.select(selections);
-    }
-
-    pub fn select<T>(&mut self, selections: Vec<Selection<T>>)
-    where
-        T: ToOffset + std::marker::Copy + std::fmt::Debug,
-    {
-        let mut selections = selections
-            .into_iter()
-            .map(|selection| selection.map(|it| it.to_offset(self.snapshot)))
-            .map(|mut selection| {
-                if selection.start > selection.end {
-                    mem::swap(&mut selection.start, &mut selection.end);
-                    selection.reversed = true
-                }
-                selection
-            })
-            .collect::<Vec<_>>();
-        selections.sort_unstable_by_key(|s| s.start);
-        // Merge overlapping selections.
-        let mut i = 1;
-        while i < selections.len() {
-            if selections[i].start <= selections[i - 1].end {
-                let removed = selections.remove(i);
-                if removed.start < selections[i - 1].start {
-                    selections[i - 1].start = removed.start;
-                }
-                if selections[i - 1].end < removed.end {
-                    selections[i - 1].end = removed.end;
-                }
-            } else {
-                i += 1;
-            }
-        }
-
-        self.collection.disjoint = Arc::from_iter(
-            selections
-                .into_iter()
-                .map(|selection| selection_to_anchor_selection(selection, self.snapshot)),
-        );
-        self.collection.pending = None;
-        self.selections_changed = true;
-    }
-
-    pub fn select_anchors(&mut self, selections: Vec<Selection<Anchor>>) {
-        let map = self.display_snapshot();
-        let resolved_selections =
-            resolve_selections_wrapping_blocks::<MultiBufferOffset, _>(&selections, &map)
-                .collect::<Vec<_>>();
-        self.select(resolved_selections);
-    }
-
-    pub fn select_ranges<I, T>(&mut self, ranges: I)
-    where
-        I: IntoIterator<Item = Range<T>>,
-        T: ToOffset,
-    {
-        let ranges = ranges
-            .into_iter()
-            .map(|range| range.start.to_offset(self.snapshot)..range.end.to_offset(self.snapshot));
-        self.select_offset_ranges(ranges);
-    }
-
-    fn select_offset_ranges<I>(&mut self, ranges: I)
-    where
-        I: IntoIterator<Item = Range<MultiBufferOffset>>,
-    {
-        let selections = ranges
-            .into_iter()
-            .map(|range| {
-                let mut start = range.start;
-                let mut end = range.end;
-                let reversed = if start > end {
-                    mem::swap(&mut start, &mut end);
-                    true
-                } else {
-                    false
-                };
-                Selection {
-                    id: post_inc(&mut self.collection.next_selection_id),
-                    start,
-                    end,
-                    reversed,
-                    goal: SelectionGoal::None,
-                }
-            })
-            .collect::<Vec<_>>();
-
-        self.select(selections)
-    }
-
-    pub fn select_anchor_ranges<I>(&mut self, ranges: I)
-    where
-        I: IntoIterator<Item = Range<Anchor>>,
-    {
-        let selections = ranges
-            .into_iter()
-            .map(|range| {
-                let mut start = range.start;
-                let mut end = range.end;
-                let reversed = if start.cmp(&end, self.snapshot).is_gt() {
-                    mem::swap(&mut start, &mut end);
-                    true
-                } else {
-                    false
-                };
-                Selection {
-                    id: post_inc(&mut self.collection.next_selection_id),
-                    start,
-                    end,
-                    reversed,
-                    goal: SelectionGoal::None,
-                }
-            })
-            .collect::<Vec<_>>();
-        self.select_anchors(selections)
-    }
-
-    pub fn new_selection_id(&mut self) -> usize {
-        post_inc(&mut self.next_selection_id)
-    }
-
-    pub fn select_display_ranges<T>(&mut self, ranges: T)
-    where
-        T: IntoIterator<Item = Range<DisplayPoint>>,
-    {
-        let selections = ranges
-            .into_iter()
-            .map(|range| {
-                let mut start = range.start;
-                let mut end = range.end;
-                let reversed = if start > end {
-                    mem::swap(&mut start, &mut end);
-                    true
-                } else {
-                    false
-                };
-                Selection {
-                    id: post_inc(&mut self.collection.next_selection_id),
-                    start: start.to_point(self.snapshot),
-                    end: end.to_point(self.snapshot),
-                    reversed,
-                    goal: SelectionGoal::None,
-                }
-            })
-            .collect();
-        self.select(selections);
-    }
-
-    pub fn reverse_selections(&mut self) {
-        let mut new_selections: Vec<Selection<Point>> = Vec::new();
-        let disjoint = self.disjoint.clone();
-        for selection in disjoint
-            .iter()
-            .sorted_by(|first, second| Ord::cmp(&second.id, &first.id))
-            .collect::<Vec<&Selection<Anchor>>>()
-        {
-            new_selections.push(Selection {
-                id: self.new_selection_id(),
-                start: selection
-                    .start
-                    .to_display_point(self.snapshot)
-                    .to_point(self.snapshot),
-                end: selection
-                    .end
-                    .to_display_point(self.snapshot)
-                    .to_point(self.snapshot),
-                reversed: selection.reversed,
-                goal: selection.goal,
-            });
-        }
-        self.select(new_selections);
-    }
-
-    pub fn move_with(
-        &mut self,
-        mut move_selection: impl FnMut(&DisplaySnapshot, &mut Selection<DisplayPoint>),
-    ) {
-        let mut changed = false;
-        let display_map = self.display_snapshot();
-        let selections = self.collection.all_display(&display_map);
-        let selections = selections
-            .into_iter()
-            .map(|selection| {
-                let mut moved_selection = selection.clone();
-                move_selection(&display_map, &mut moved_selection);
-                if selection != moved_selection {
-                    changed = true;
-                }
-                moved_selection.map(|display_point| display_point.to_point(&display_map))
-            })
-            .collect();
-
-        if changed {
-            self.select(selections)
-        }
-    }
-
-    pub fn move_offsets_with(
-        &mut self,
-        mut move_selection: impl FnMut(&MultiBufferSnapshot, &mut Selection<MultiBufferOffset>),
-    ) {
-        let mut changed = false;
-        let display_map = self.display_snapshot();
-        let selections = self
-            .collection
-            .all::<MultiBufferOffset>(&display_map)
-            .into_iter()
-            .map(|selection| {
-                let mut moved_selection = selection.clone();
-                move_selection(self.snapshot, &mut moved_selection);
-                if selection != moved_selection {
-                    changed = true;
-                }
-                moved_selection
-            })
-            .collect();
-
-        if changed {
-            self.select(selections)
-        }
-    }
-
-    pub fn move_heads_with(
-        &mut self,
-        mut update_head: impl FnMut(
-            &DisplaySnapshot,
-            DisplayPoint,
-            SelectionGoal,
-        ) -> (DisplayPoint, SelectionGoal),
-    ) {
-        self.move_with(|map, selection| {
-            let (new_head, new_goal) = update_head(map, selection.head(), selection.goal);
-            selection.set_head(new_head, new_goal);
-        });
-    }
-
-    pub fn move_cursors_with(
-        &mut self,
-        mut update_cursor_position: impl FnMut(
-            &DisplaySnapshot,
-            DisplayPoint,
-            SelectionGoal,
-        ) -> (DisplayPoint, SelectionGoal),
-    ) {
-        self.move_with(|map, selection| {
-            let (cursor, new_goal) = update_cursor_position(map, selection.head(), selection.goal);
-            selection.collapse_to(cursor, new_goal)
-        });
-    }
-
-    pub fn maybe_move_cursors_with(
-        &mut self,
-        mut update_cursor_position: impl FnMut(
-            &DisplaySnapshot,
-            DisplayPoint,
-            SelectionGoal,
-        ) -> Option<(DisplayPoint, SelectionGoal)>,
-    ) {
-        self.move_cursors_with(|map, point, goal| {
-            update_cursor_position(map, point, goal).unwrap_or((point, goal))
-        })
-    }
-
-    pub fn replace_cursors_with(
-        &mut self,
-        find_replacement_cursors: impl FnOnce(&DisplaySnapshot) -> Vec<DisplayPoint>,
-    ) {
-        let new_selections = find_replacement_cursors(self.snapshot)
-            .into_iter()
-            .map(|cursor| {
-                let cursor_point = cursor.to_point(self.snapshot);
-                Selection {
-                    id: post_inc(&mut self.collection.next_selection_id),
-                    start: cursor_point,
-                    end: cursor_point,
-                    reversed: false,
-                    goal: SelectionGoal::None,
-                }
-            })
-            .collect();
-        self.select(new_selections);
-    }
-
-    /// Compute new ranges for any selections that were located in excerpts that have
-    /// since been removed.
-    ///
-    /// Returns a `HashMap` indicating which selections whose former head position
-    /// was no longer present. The keys of the map are selection ids. The values are
-    /// the id of the new excerpt where the head of the selection has been moved.
-    pub fn refresh(&mut self) -> HashMap<usize, ExcerptId> {
-        let mut pending = self.collection.pending.take();
-        let mut selections_with_lost_position = HashMap::default();
-
-        let anchors_with_status = {
-            let disjoint_anchors = self
-                .disjoint
-                .iter()
-                .flat_map(|selection| [&selection.start, &selection.end]);
-            self.snapshot.refresh_anchors(disjoint_anchors)
-        };
-        let adjusted_disjoint: Vec<_> = anchors_with_status
-            .chunks(2)
-            .map(|selection_anchors| {
-                let (anchor_ix, start, kept_start) = selection_anchors[0];
-                let (_, end, kept_end) = selection_anchors[1];
-                let selection = &self.disjoint[anchor_ix / 2];
-                let kept_head = if selection.reversed {
-                    kept_start
-                } else {
-                    kept_end
-                };
-                if !kept_head {
-                    selections_with_lost_position.insert(selection.id, selection.head().excerpt_id);
-                }
-
-                Selection {
-                    id: selection.id,
-                    start,
-                    end,
-                    reversed: selection.reversed,
-                    goal: selection.goal,
-                }
-            })
-            .collect();
-
-        if !adjusted_disjoint.is_empty() {
-            let map = self.display_snapshot();
-            let resolved_selections =
-                resolve_selections_wrapping_blocks(adjusted_disjoint.iter(), &map).collect();
-            self.select::<MultiBufferOffset>(resolved_selections);
-        }
-
-        if let Some(pending) = pending.as_mut() {
-            let anchors = self
-                .snapshot
-                .refresh_anchors([&pending.selection.start, &pending.selection.end]);
-            let (_, start, kept_start) = anchors[0];
-            let (_, end, kept_end) = anchors[1];
-            let kept_head = if pending.selection.reversed {
-                kept_start
-            } else {
-                kept_end
-            };
-            if !kept_head {
-                selections_with_lost_position
-                    .insert(pending.selection.id, pending.selection.head().excerpt_id);
-            }
-
-            pending.selection.start = start;
-            pending.selection.end = end;
-        }
-        self.collection.pending = pending;
-        self.selections_changed = true;
-
-        selections_with_lost_position
-    }
-}
-
-impl Deref for MutableSelectionsCollection<'_, '_> {
-    type Target = SelectionsCollection;
-    fn deref(&self) -> &Self::Target {
-        self.collection
-    }
-}
-
-impl DerefMut for MutableSelectionsCollection<'_, '_> {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        self.collection
-    }
-}
-
-fn selection_to_anchor_selection(
-    selection: Selection<MultiBufferOffset>,
-    buffer: &MultiBufferSnapshot,
-) -> Selection<Anchor> {
-    let end_bias = if selection.start == selection.end {
-        Bias::Right
-    } else {
-        Bias::Left
-    };
-    Selection {
-        id: selection.id,
-        start: buffer.anchor_after(selection.start),
-        end: buffer.anchor_at(selection.end, end_bias),
-        reversed: selection.reversed,
-        goal: selection.goal,
-    }
-}
-
-fn resolve_selections_point<'a>(
-    selections: impl 'a + IntoIterator<Item = &'a Selection<Anchor>>,
-    map: &'a DisplaySnapshot,
-) -> impl 'a + Iterator<Item = Selection<Point>> {
-    let (to_summarize, selections) = selections.into_iter().tee();
-    let mut summaries = map
-        .buffer_snapshot()
-        .summaries_for_anchors::<Point, _>(to_summarize.flat_map(|s| [&s.start, &s.end]))
-        .into_iter();
-    selections.map(move |s| {
-        let start = summaries.next().unwrap();
-        let end = summaries.next().unwrap();
-        assert!(start <= end, "start: {:?}, end: {:?}", start, end);
-        Selection {
-            id: s.id,
-            start,
-            end,
-            reversed: s.reversed,
-            goal: s.goal,
-        }
-    })
-}
-
-/// Panics if passed selections are not in order
-/// Resolves the anchors to display positions
-fn resolve_selections_display<'a>(
-    selections: impl 'a + IntoIterator<Item = &'a Selection<Anchor>>,
-    map: &'a DisplaySnapshot,
-) -> impl 'a + Iterator<Item = Selection<DisplayPoint>> {
-    let selections = resolve_selections_point(selections, map).map(move |s| {
-        let display_start = map.point_to_display_point(s.start, Bias::Left);
-        let display_end = map.point_to_display_point(
-            s.end,
-            if s.start == s.end {
-                Bias::Right
-            } else {
-                Bias::Left
-            },
-        );
-        assert!(
-            display_start <= display_end,
-            "display_start: {:?}, display_end: {:?}",
-            display_start,
-            display_end
-        );
-        Selection {
-            id: s.id,
-            start: display_start,
-            end: display_end,
-            reversed: s.reversed,
-            goal: s.goal,
-        }
-    });
-    coalesce_selections(selections)
-}
-
-/// Resolves the passed in anchors to [`MultiBufferDimension`]s `D`
-/// wrapping around blocks inbetween.
-///
-/// # Panics
-///
-/// Panics if passed selections are not in order
-pub(crate) fn resolve_selections_wrapping_blocks<'a, D, I>(
-    selections: I,
-    map: &'a DisplaySnapshot,
-) -> impl 'a + Iterator<Item = Selection<D>>
-where
-    D: MultiBufferDimension + Sub + AddAssign<<D as Sub>::Output> + Ord,
-    I: 'a + IntoIterator<Item = &'a Selection<Anchor>>,
-{
-    // Transforms `Anchor -> DisplayPoint -> Point -> DisplayPoint -> D`
-    // todo(lw): We should be able to short circuit the `Anchor -> DisplayPoint -> Point` to `Anchor -> Point`
-    let (to_convert, selections) = resolve_selections_display(selections, map).tee();
-    let mut converted_endpoints =
-        map.buffer_snapshot()
-            .dimensions_from_points::<D>(to_convert.flat_map(|s| {
-                let start = map.display_point_to_point(s.start, Bias::Left);
-                let end = map.display_point_to_point(s.end, Bias::Right);
-                assert!(start <= end, "start: {:?}, end: {:?}", start, end);
-                [start, end]
-            }));
-    selections.map(move |s| {
-        let start = converted_endpoints.next().unwrap();
-        let end = converted_endpoints.next().unwrap();
-        assert!(start <= end, "start: {:?}, end: {:?}", start, end);
-        Selection {
-            id: s.id,
-            start,
-            end,
-            reversed: s.reversed,
-            goal: s.goal,
-        }
-    })
-}
-
-fn coalesce_selections<D: Ord + fmt::Debug + Copy>(
-    selections: impl Iterator<Item = Selection<D>>,
-) -> impl Iterator<Item = Selection<D>> {
-    let mut selections = selections.peekable();
-    iter::from_fn(move || {
-        let mut selection = selections.next()?;
-        while let Some(next_selection) = selections.peek() {
-            if selection.end >= next_selection.start {
-                if selection.reversed == next_selection.reversed {
-                    selection.end = cmp::max(selection.end, next_selection.end);
-                    selections.next();
-                } else {
-                    selection.end = cmp::max(selection.start, next_selection.start);
-                    break;
-                }
-            } else {
-                break;
-            }
-        }
-        assert!(
-            selection.start <= selection.end,
-            "selection.start: {:?}, selection.end: {:?}, selection.reversed: {:?}",
-            selection.start,
-            selection.end,
-            selection.reversed
-        );
-        Some(selection)
-    })
-}
diff --git a/crates/editor/src/signature_help.rs b/crates/editor/src/signature_help.rs
deleted file mode 100644
index 2554db2450..0000000000
--- a/crates/editor/src/signature_help.rs
+++ /dev/null
@@ -1,459 +0,0 @@
-use crate::actions::ShowSignatureHelp;
-use crate::hover_popover::open_markdown_url;
-use crate::{BufferOffset, Editor, EditorSettings, ToggleAutoSignatureHelp, hover_markdown_style};
-use gpui::{
-    App, Context, Entity, HighlightStyle, MouseButton, ScrollHandle, Size, StyledText, Task,
-    TextStyle, Window, combine_highlights,
-};
-use language::BufferSnapshot;
-use markdown::{Markdown, MarkdownElement};
-use multi_buffer::{Anchor, MultiBufferOffset, ToOffset};
-use settings::Settings;
-use std::ops::Range;
-use text::Rope;
-use theme::ThemeSettings;
-use ui::{
-    ActiveTheme, AnyElement, ButtonCommon, ButtonStyle, Clickable, FluentBuilder, IconButton,
-    IconButtonShape, IconName, IconSize, InteractiveElement, IntoElement, Label, LabelCommon,
-    LabelSize, ParentElement, Pixels, SharedString, StatefulInteractiveElement, Styled, StyledExt,
-    WithScrollbar, div, relative,
-};
-
-// Language-specific settings may define quotes as "brackets", so filter them out separately.
-const QUOTE_PAIRS: [(&str, &str); 3] = [("'", "'"), ("\"", "\""), ("`", "`")];
-
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub enum SignatureHelpHiddenBy {
-    AutoClose,
-    Escape,
-    Selection,
-}
-
-impl Editor {
-    pub fn toggle_auto_signature_help_menu(
-        &mut self,
-        _: &ToggleAutoSignatureHelp,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.auto_signature_help = self
-            .auto_signature_help
-            .map(|auto_signature_help| !auto_signature_help)
-            .or_else(|| Some(!EditorSettings::get_global(cx).auto_signature_help));
-        match self.auto_signature_help {
-            Some(true) => {
-                self.show_signature_help(&ShowSignatureHelp, window, cx);
-            }
-            Some(false) => {
-                self.hide_signature_help(cx, SignatureHelpHiddenBy::AutoClose);
-            }
-            None => {}
-        }
-    }
-
-    pub(super) fn hide_signature_help(
-        &mut self,
-        cx: &mut Context<Self>,
-        signature_help_hidden_by: SignatureHelpHiddenBy,
-    ) -> bool {
-        if self.signature_help_state.is_shown() {
-            self.signature_help_state.task = None;
-            self.signature_help_state.hide(signature_help_hidden_by);
-            cx.notify();
-            true
-        } else {
-            false
-        }
-    }
-
-    pub fn auto_signature_help_enabled(&self, cx: &App) -> bool {
-        if let Some(auto_signature_help) = self.auto_signature_help {
-            auto_signature_help
-        } else {
-            EditorSettings::get_global(cx).auto_signature_help
-        }
-    }
-
-    pub(super) fn should_open_signature_help_automatically(
-        &mut self,
-        old_cursor_position: &Anchor,
-        cx: &mut Context<Self>,
-    ) -> bool {
-        if !(self.signature_help_state.is_shown() || self.auto_signature_help_enabled(cx)) {
-            return false;
-        }
-        let newest_selection = self
-            .selections
-            .newest::<MultiBufferOffset>(&self.display_snapshot(cx));
-        let head = newest_selection.head();
-
-        if !newest_selection.is_empty() && head != newest_selection.tail() {
-            self.signature_help_state
-                .hide(SignatureHelpHiddenBy::Selection);
-            return false;
-        }
-
-        let buffer_snapshot = self.buffer().read(cx).snapshot(cx);
-        let bracket_range = |position: MultiBufferOffset| match (position, position + 1usize) {
-            (MultiBufferOffset(0), b) if b <= buffer_snapshot.len() => MultiBufferOffset(0)..b,
-            (MultiBufferOffset(0), b) => MultiBufferOffset(0)..b - 1,
-            (a, b) if b <= buffer_snapshot.len() => a - 1..b,
-            (a, b) => a - 1..b - 1,
-        };
-        let not_quote_like_brackets =
-            |buffer: &BufferSnapshot, start: Range<BufferOffset>, end: Range<BufferOffset>| {
-                let text_start = buffer.text_for_range(start).collect::<String>();
-                let text_end = buffer.text_for_range(end).collect::<String>();
-                QUOTE_PAIRS
-                    .into_iter()
-                    .all(|(start, end)| text_start != start && text_end != end)
-            };
-
-        let previous_position = old_cursor_position.to_offset(&buffer_snapshot);
-        let previous_brackets_range = bracket_range(previous_position);
-        let previous_brackets_surround = buffer_snapshot
-            .innermost_enclosing_bracket_ranges(
-                previous_brackets_range,
-                Some(&not_quote_like_brackets),
-            )
-            .filter(|(start_bracket_range, end_bracket_range)| {
-                start_bracket_range.start != previous_position
-                    && end_bracket_range.end != previous_position
-            });
-        let current_brackets_range = bracket_range(head);
-        let current_brackets_surround = buffer_snapshot
-            .innermost_enclosing_bracket_ranges(
-                current_brackets_range,
-                Some(&not_quote_like_brackets),
-            )
-            .filter(|(start_bracket_range, end_bracket_range)| {
-                start_bracket_range.start != head && end_bracket_range.end != head
-            });
-
-        match (previous_brackets_surround, current_brackets_surround) {
-            (None, None) => {
-                self.signature_help_state
-                    .hide(SignatureHelpHiddenBy::AutoClose);
-                false
-            }
-            (Some(_), None) => {
-                self.signature_help_state
-                    .hide(SignatureHelpHiddenBy::AutoClose);
-                false
-            }
-            (None, Some(_)) => true,
-            (Some(previous), Some(current)) => {
-                let condition = self.signature_help_state.hidden_by_selection()
-                    || previous != current
-                    || (previous == current && self.signature_help_state.is_shown());
-                if !condition {
-                    self.signature_help_state
-                        .hide(SignatureHelpHiddenBy::AutoClose);
-                }
-                condition
-            }
-        }
-    }
-
-    pub fn show_signature_help(
-        &mut self,
-        _: &ShowSignatureHelp,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.pending_rename.is_some() || self.has_visible_completions_menu() {
-            return;
-        }
-
-        let position = self.selections.newest_anchor().head();
-        let Some((buffer, buffer_position)) =
-            self.buffer.read(cx).text_anchor_for_position(position, cx)
-        else {
-            return;
-        };
-        let Some(lsp_store) = self.project().map(|p| p.read(cx).lsp_store()) else {
-            return;
-        };
-        let task = lsp_store.update(cx, |lsp_store, cx| {
-            lsp_store.signature_help(&buffer, buffer_position, cx)
-        });
-        let language = self.language_at(position, cx);
-
-        self.signature_help_state
-            .set_task(cx.spawn_in(window, async move |editor, cx| {
-                let signature_help = task.await;
-                editor
-                    .update(cx, |editor, cx| {
-                        let Some(mut signature_help) =
-                            signature_help.unwrap_or_default().into_iter().next()
-                        else {
-                            editor
-                                .signature_help_state
-                                .hide(SignatureHelpHiddenBy::AutoClose);
-                            return;
-                        };
-
-                        if let Some(language) = language {
-                            for signature in &mut signature_help.signatures {
-                                let text = Rope::from(signature.label.as_ref());
-                                let highlights = language
-                                    .highlight_text(&text, 0..signature.label.len())
-                                    .into_iter()
-                                    .flat_map(|(range, highlight_id)| {
-                                        Some((range, highlight_id.style(cx.theme().syntax())?))
-                                    });
-                                signature.highlights =
-                                    combine_highlights(signature.highlights.clone(), highlights)
-                                        .collect();
-                            }
-                        }
-                        let settings = ThemeSettings::get_global(cx);
-                        let style = TextStyle {
-                            color: cx.theme().colors().text,
-                            font_family: settings.buffer_font.family.clone(),
-                            font_fallbacks: settings.buffer_font.fallbacks.clone(),
-                            font_size: settings.buffer_font_size(cx).into(),
-                            font_weight: settings.buffer_font.weight,
-                            line_height: relative(settings.buffer_line_height.value()),
-                            ..TextStyle::default()
-                        };
-                        let scroll_handle = ScrollHandle::new();
-                        let signatures = signature_help
-                            .signatures
-                            .into_iter()
-                            .map(|s| SignatureHelp {
-                                label: s.label,
-                                documentation: s.documentation,
-                                highlights: s.highlights,
-                                active_parameter: s.active_parameter,
-                                parameter_documentation: s
-                                    .active_parameter
-                                    .and_then(|idx| s.parameters.get(idx))
-                                    .and_then(|param| param.documentation.clone()),
-                            })
-                            .collect::<Vec<_>>();
-
-                        if signatures.is_empty() {
-                            editor
-                                .signature_help_state
-                                .hide(SignatureHelpHiddenBy::AutoClose);
-                            return;
-                        }
-
-                        let current_signature = signature_help
-                            .active_signature
-                            .min(signatures.len().saturating_sub(1));
-
-                        let signature_help_popover = SignatureHelpPopover {
-                            style,
-                            signatures,
-                            current_signature,
-                            scroll_handle,
-                        };
-                        editor
-                            .signature_help_state
-                            .set_popover(signature_help_popover);
-                        cx.notify();
-                    })
-                    .ok();
-            }));
-    }
-}
-
-#[derive(Default, Debug)]
-pub struct SignatureHelpState {
-    task: Option<Task<()>>,
-    popover: Option<SignatureHelpPopover>,
-    hidden_by: Option<SignatureHelpHiddenBy>,
-}
-
-impl SignatureHelpState {
-    fn set_task(&mut self, task: Task<()>) {
-        self.task = Some(task);
-        self.hidden_by = None;
-    }
-
-    #[cfg(test)]
-    pub fn popover(&self) -> Option<&SignatureHelpPopover> {
-        self.popover.as_ref()
-    }
-
-    pub fn popover_mut(&mut self) -> Option<&mut SignatureHelpPopover> {
-        self.popover.as_mut()
-    }
-
-    fn set_popover(&mut self, popover: SignatureHelpPopover) {
-        self.popover = Some(popover);
-        self.hidden_by = None;
-    }
-
-    fn hide(&mut self, hidden_by: SignatureHelpHiddenBy) {
-        if self.hidden_by.is_none() {
-            self.popover = None;
-            self.hidden_by = Some(hidden_by);
-        }
-    }
-
-    fn hidden_by_selection(&self) -> bool {
-        self.hidden_by == Some(SignatureHelpHiddenBy::Selection)
-    }
-
-    pub fn is_shown(&self) -> bool {
-        self.popover.is_some()
-    }
-
-    pub fn has_multiple_signatures(&self) -> bool {
-        self.popover
-            .as_ref()
-            .is_some_and(|popover| popover.signatures.len() > 1)
-    }
-}
-
-#[cfg(test)]
-impl SignatureHelpState {
-    pub fn task(&self) -> Option<&Task<()>> {
-        self.task.as_ref()
-    }
-}
-
-#[derive(Clone, Debug, PartialEq)]
-pub struct SignatureHelp {
-    pub(crate) label: SharedString,
-    documentation: Option<Entity<Markdown>>,
-    highlights: Vec<(Range<usize>, HighlightStyle)>,
-    active_parameter: Option<usize>,
-    parameter_documentation: Option<Entity<Markdown>>,
-}
-
-#[derive(Clone, Debug)]
-pub struct SignatureHelpPopover {
-    pub style: TextStyle,
-    pub signatures: Vec<SignatureHelp>,
-    pub current_signature: usize,
-    scroll_handle: ScrollHandle,
-}
-
-impl SignatureHelpPopover {
-    pub fn render(
-        &mut self,
-        max_size: Size<Pixels>,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) -> AnyElement {
-        let Some(signature) = self.signatures.get(self.current_signature) else {
-            return div().into_any_element();
-        };
-
-        let main_content = div()
-            .occlude()
-            .p_2()
-            .child(
-                div()
-                    .id("signature_help_container")
-                    .overflow_y_scroll()
-                    .max_w(max_size.width)
-                    .max_h(max_size.height)
-                    .track_scroll(&self.scroll_handle)
-                    .child(
-                        StyledText::new(signature.label.clone()).with_default_highlights(
-                            &self.style,
-                            signature.highlights.iter().cloned(),
-                        ),
-                    )
-                    .when_some(
-                        signature.parameter_documentation.clone(),
-                        |this, param_doc| {
-                            this.child(div().h_px().bg(cx.theme().colors().border_variant).my_1())
-                                .child(
-                                    MarkdownElement::new(
-                                        param_doc,
-                                        hover_markdown_style(window, cx),
-                                    )
-                                    .code_block_renderer(markdown::CodeBlockRenderer::Default {
-                                        copy_button: false,
-                                        border: false,
-                                        copy_button_on_hover: false,
-                                    })
-                                    .on_url_click(open_markdown_url),
-                                )
-                        },
-                    )
-                    .when_some(signature.documentation.clone(), |this, description| {
-                        this.child(div().h_px().bg(cx.theme().colors().border_variant).my_1())
-                            .child(
-                                MarkdownElement::new(description, hover_markdown_style(window, cx))
-                                    .code_block_renderer(markdown::CodeBlockRenderer::Default {
-                                        copy_button: false,
-                                        border: false,
-                                        copy_button_on_hover: false,
-                                    })
-                                    .on_url_click(open_markdown_url),
-                            )
-                    }),
-            )
-            .vertical_scrollbar_for(&self.scroll_handle, window, cx);
-
-        let controls = if self.signatures.len() > 1 {
-            let prev_button = IconButton::new("signature_help_prev", IconName::ChevronUp)
-                .shape(IconButtonShape::Square)
-                .style(ButtonStyle::Subtle)
-                .icon_size(IconSize::Small)
-                .tooltip(move |_window, cx| {
-                    ui::Tooltip::for_action("Previous Signature", &crate::SignatureHelpPrevious, cx)
-                })
-                .on_click(cx.listener(|editor, _, window, cx| {
-                    editor.signature_help_prev(&crate::SignatureHelpPrevious, window, cx);
-                }));
-
-            let next_button = IconButton::new("signature_help_next", IconName::ChevronDown)
-                .shape(IconButtonShape::Square)
-                .style(ButtonStyle::Subtle)
-                .icon_size(IconSize::Small)
-                .tooltip(move |_window, cx| {
-                    ui::Tooltip::for_action("Next Signature", &crate::SignatureHelpNext, cx)
-                })
-                .on_click(cx.listener(|editor, _, window, cx| {
-                    editor.signature_help_next(&crate::SignatureHelpNext, window, cx);
-                }));
-
-            let page = Label::new(format!(
-                "{}/{}",
-                self.current_signature + 1,
-                self.signatures.len()
-            ))
-            .size(LabelSize::Small);
-
-            Some(
-                div()
-                    .flex()
-                    .flex_col()
-                    .items_center()
-                    .gap_0p5()
-                    .px_0p5()
-                    .py_0p5()
-                    .children([
-                        prev_button.into_any_element(),
-                        div().child(page).into_any_element(),
-                        next_button.into_any_element(),
-                    ])
-                    .into_any_element(),
-            )
-        } else {
-            None
-        };
-        div()
-            .elevation_2(cx)
-            .on_mouse_down(MouseButton::Left, |_, _, cx| cx.stop_propagation())
-            .on_mouse_move(|_, _, cx| cx.stop_propagation())
-            .flex()
-            .flex_row()
-            .when_some(controls, |this, controls| {
-                this.children(vec![
-                    div().flex().items_end().child(controls),
-                    div().w_px().bg(cx.theme().colors().border_variant),
-                ])
-            })
-            .child(main_content)
-            .into_any_element()
-    }
-}
diff --git a/crates/editor/src/split.rs b/crates/editor/src/split.rs
deleted file mode 100644
index 8a413a376f..0000000000
--- a/crates/editor/src/split.rs
+++ /dev/null
@@ -1,267 +0,0 @@
-use feature_flags::{FeatureFlag, FeatureFlagAppExt as _};
-use gpui::{
-    Action, AppContext as _, Entity, EventEmitter, Focusable, NoAction, Subscription, WeakEntity,
-};
-use multi_buffer::{MultiBuffer, MultiBufferFilterMode};
-use project::Project;
-use ui::{
-    App, Context, InteractiveElement as _, IntoElement as _, ParentElement as _, Render,
-    Styled as _, Window, div,
-};
-use workspace::{
-    ActivePaneDecorator, Item, ItemHandle, Pane, PaneGroup, SplitDirection, Workspace,
-};
-
-use crate::{Editor, EditorEvent};
-
-struct SplitDiffFeatureFlag;
-
-impl FeatureFlag for SplitDiffFeatureFlag {
-    const NAME: &'static str = "split-diff";
-
-    fn enabled_for_staff() -> bool {
-        true
-    }
-}
-
-#[derive(Clone, Copy, PartialEq, Eq, Action, Default)]
-#[action(namespace = editor)]
-struct SplitDiff;
-
-#[derive(Clone, Copy, PartialEq, Eq, Action, Default)]
-#[action(namespace = editor)]
-struct UnsplitDiff;
-
-pub struct SplittableEditor {
-    primary_editor: Entity<Editor>,
-    secondary: Option<SecondaryEditor>,
-    panes: PaneGroup,
-    workspace: WeakEntity<Workspace>,
-    _subscriptions: Vec<Subscription>,
-}
-
-struct SecondaryEditor {
-    editor: Entity<Editor>,
-    pane: Entity<Pane>,
-    has_latest_selection: bool,
-    _subscriptions: Vec<Subscription>,
-}
-
-impl SplittableEditor {
-    pub fn primary_editor(&self) -> &Entity<Editor> {
-        &self.primary_editor
-    }
-
-    pub fn last_selected_editor(&self) -> &Entity<Editor> {
-        if let Some(secondary) = &self.secondary
-            && secondary.has_latest_selection
-        {
-            &secondary.editor
-        } else {
-            &self.primary_editor
-        }
-    }
-
-    pub fn new_unsplit(
-        buffer: Entity<MultiBuffer>,
-        project: Entity<Project>,
-        workspace: Entity<Workspace>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let primary_editor =
-            cx.new(|cx| Editor::for_multibuffer(buffer, Some(project.clone()), window, cx));
-        let pane = cx.new(|cx| {
-            let mut pane = Pane::new(
-                workspace.downgrade(),
-                project,
-                Default::default(),
-                None,
-                NoAction.boxed_clone(),
-                true,
-                window,
-                cx,
-            );
-            pane.set_should_display_tab_bar(|_, _| false);
-            pane.add_item(primary_editor.boxed_clone(), true, true, None, window, cx);
-            pane
-        });
-        let panes = PaneGroup::new(pane);
-        // TODO(split-diff) we might want to tag editor events with whether they came from primary/secondary
-        let subscriptions =
-            vec![
-                cx.subscribe(&primary_editor, |this, _, event: &EditorEvent, cx| {
-                    if let EditorEvent::SelectionsChanged { .. } = event
-                        && let Some(secondary) = &mut this.secondary
-                    {
-                        secondary.has_latest_selection = false;
-                    }
-                    cx.emit(event.clone())
-                }),
-            ];
-
-        window.defer(cx, {
-            let workspace = workspace.downgrade();
-            let primary_editor = primary_editor.downgrade();
-            move |window, cx| {
-                workspace
-                    .update(cx, |workspace, cx| {
-                        primary_editor.update(cx, |editor, cx| {
-                            editor.added_to_workspace(workspace, window, cx);
-                        })
-                    })
-                    .ok();
-            }
-        });
-        Self {
-            primary_editor,
-            secondary: None,
-            panes,
-            workspace: workspace.downgrade(),
-            _subscriptions: subscriptions,
-        }
-    }
-
-    fn split(&mut self, _: &SplitDiff, window: &mut Window, cx: &mut Context<Self>) {
-        if !cx.has_flag::<SplitDiffFeatureFlag>() {
-            return;
-        }
-        if self.secondary.is_some() {
-            return;
-        }
-        let Some(workspace) = self.workspace.upgrade() else {
-            return;
-        };
-        let project = workspace.read(cx).project().clone();
-        let follower = self.primary_editor.update(cx, |primary, cx| {
-            primary.buffer().update(cx, |buffer, cx| {
-                let follower = buffer.get_or_create_follower(cx);
-                buffer.set_filter_mode(Some(MultiBufferFilterMode::KeepInsertions));
-                follower
-            })
-        });
-        follower.update(cx, |follower, _| {
-            follower.set_filter_mode(Some(MultiBufferFilterMode::KeepDeletions));
-        });
-        let secondary_editor = workspace.update(cx, |workspace, cx| {
-            cx.new(|cx| {
-                let mut editor = Editor::for_multibuffer(follower, Some(project), window, cx);
-                // TODO(split-diff) this should be at the multibuffer level
-                editor.set_use_base_text_line_numbers(true, cx);
-                editor.added_to_workspace(workspace, window, cx);
-                editor
-            })
-        });
-        let secondary_pane = cx.new(|cx| {
-            let mut pane = Pane::new(
-                workspace.downgrade(),
-                workspace.read(cx).project().clone(),
-                Default::default(),
-                None,
-                NoAction.boxed_clone(),
-                true,
-                window,
-                cx,
-            );
-            pane.set_should_display_tab_bar(|_, _| false);
-            pane.add_item(
-                ItemHandle::boxed_clone(&secondary_editor),
-                false,
-                false,
-                None,
-                window,
-                cx,
-            );
-            pane
-        });
-
-        let subscriptions =
-            vec![
-                cx.subscribe(&secondary_editor, |this, _, event: &EditorEvent, cx| {
-                    if let EditorEvent::SelectionsChanged { .. } = event
-                        && let Some(secondary) = &mut this.secondary
-                    {
-                        secondary.has_latest_selection = true;
-                    }
-                    cx.emit(event.clone())
-                }),
-            ];
-        self.secondary = Some(SecondaryEditor {
-            editor: secondary_editor,
-            pane: secondary_pane.clone(),
-            has_latest_selection: false,
-            _subscriptions: subscriptions,
-        });
-        let primary_pane = self.panes.first_pane();
-        self.panes
-            .split(&primary_pane, &secondary_pane, SplitDirection::Left)
-            .unwrap();
-        cx.notify();
-    }
-
-    fn unsplit(&mut self, _: &UnsplitDiff, _: &mut Window, cx: &mut Context<Self>) {
-        let Some(secondary) = self.secondary.take() else {
-            return;
-        };
-        self.panes.remove(&secondary.pane).unwrap();
-        self.primary_editor.update(cx, |primary, cx| {
-            primary.buffer().update(cx, |buffer, _| {
-                buffer.set_filter_mode(None);
-            });
-        });
-        cx.notify();
-    }
-
-    pub fn added_to_workspace(
-        &mut self,
-        workspace: &mut Workspace,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.workspace = workspace.weak_handle();
-        self.primary_editor.update(cx, |primary_editor, cx| {
-            primary_editor.added_to_workspace(workspace, window, cx);
-        });
-        if let Some(secondary) = &self.secondary {
-            secondary.editor.update(cx, |secondary_editor, cx| {
-                secondary_editor.added_to_workspace(workspace, window, cx);
-            });
-        }
-    }
-}
-
-impl EventEmitter<EditorEvent> for SplittableEditor {}
-impl Focusable for SplittableEditor {
-    fn focus_handle(&self, cx: &App) -> gpui::FocusHandle {
-        self.primary_editor.read(cx).focus_handle(cx)
-    }
-}
-
-impl Render for SplittableEditor {
-    fn render(
-        &mut self,
-        window: &mut ui::Window,
-        cx: &mut ui::Context<Self>,
-    ) -> impl ui::IntoElement {
-        let inner = if self.secondary.is_none() {
-            self.primary_editor.clone().into_any_element()
-        } else if let Some(active) = self.panes.panes().into_iter().next() {
-            self.panes
-                .render(
-                    None,
-                    &ActivePaneDecorator::new(active, &self.workspace),
-                    window,
-                    cx,
-                )
-                .into_any_element()
-        } else {
-            div().into_any_element()
-        };
-        div()
-            .id("splittable-editor")
-            .on_action(cx.listener(Self::split))
-            .on_action(cx.listener(Self::unsplit))
-            .size_full()
-            .child(inner)
-    }
-}
diff --git a/crates/editor/src/tasks.rs b/crates/editor/src/tasks.rs
deleted file mode 100644
index e39880ddc1..0000000000
--- a/crates/editor/src/tasks.rs
+++ /dev/null
@@ -1,110 +0,0 @@
-use crate::Editor;
-
-use collections::HashMap;
-use gpui::{App, Task, Window};
-use lsp::LanguageServerName;
-use project::{Location, project_settings::ProjectSettings};
-use settings::Settings as _;
-use task::{TaskContext, TaskVariables, VariableName};
-use text::{BufferId, ToOffset, ToPoint};
-
-impl Editor {
-    pub fn task_context(&self, window: &mut Window, cx: &mut App) -> Task<Option<TaskContext>> {
-        let Some(project) = self.project.clone() else {
-            return Task::ready(None);
-        };
-        let (selection, buffer, editor_snapshot) = {
-            let selection = self.selections.newest_adjusted(&self.display_snapshot(cx));
-            let Some((buffer, _)) = self
-                .buffer()
-                .read(cx)
-                .point_to_buffer_offset(selection.start, cx)
-            else {
-                return Task::ready(None);
-            };
-            let snapshot = self.snapshot(window, cx);
-            (selection, buffer, snapshot)
-        };
-        let selection_range = selection.range();
-        let start = editor_snapshot
-            .display_snapshot
-            .buffer_snapshot()
-            .anchor_after(selection_range.start)
-            .text_anchor;
-        let end = editor_snapshot
-            .display_snapshot
-            .buffer_snapshot()
-            .anchor_after(selection_range.end)
-            .text_anchor;
-        let location = Location {
-            buffer,
-            range: start..end,
-        };
-        let captured_variables = {
-            let mut variables = TaskVariables::default();
-            let buffer = location.buffer.read(cx);
-            let buffer_id = buffer.remote_id();
-            let snapshot = buffer.snapshot();
-            let starting_point = location.range.start.to_point(&snapshot);
-            let starting_offset = starting_point.to_offset(&snapshot);
-            for (_, tasks) in self
-                .tasks
-                .range((buffer_id, 0)..(buffer_id, starting_point.row + 1))
-            {
-                if !tasks
-                    .context_range
-                    .contains(&crate::BufferOffset(starting_offset))
-                {
-                    continue;
-                }
-                for (capture_name, value) in tasks.extra_variables.iter() {
-                    variables.insert(
-                        VariableName::Custom(capture_name.to_owned().into()),
-                        value.clone(),
-                    );
-                }
-            }
-            variables
-        };
-
-        project.update(cx, |project, cx| {
-            project.task_store().update(cx, |task_store, cx| {
-                task_store.task_context_for_location(captured_variables, location, cx)
-            })
-        })
-    }
-
-    pub fn lsp_task_sources(&self, cx: &App) -> HashMap<LanguageServerName, Vec<BufferId>> {
-        let lsp_settings = &ProjectSettings::get_global(cx).lsp;
-
-        self.buffer()
-            .read(cx)
-            .all_buffers()
-            .into_iter()
-            .filter_map(|buffer| {
-                let lsp_tasks_source = buffer
-                    .read(cx)
-                    .language()?
-                    .context_provider()?
-                    .lsp_task_source()?;
-                if lsp_settings
-                    .get(&lsp_tasks_source)
-                    .is_none_or(|s| s.enable_lsp_tasks)
-                {
-                    let buffer_id = buffer.read(cx).remote_id();
-                    Some((lsp_tasks_source, buffer_id))
-                } else {
-                    None
-                }
-            })
-            .fold(
-                HashMap::default(),
-                |mut acc, (lsp_task_source, buffer_id)| {
-                    acc.entry(lsp_task_source)
-                        .or_insert_with(Vec::new)
-                        .push(buffer_id);
-                    acc
-                },
-            )
-    }
-}
diff --git a/crates/editor/src/test.rs b/crates/editor/src/test.rs
deleted file mode 100644
index 5a0652bdd1..0000000000
--- a/crates/editor/src/test.rs
+++ /dev/null
@@ -1,253 +0,0 @@
-pub mod editor_lsp_test_context;
-pub mod editor_test_context;
-
-use std::{rc::Rc, sync::LazyLock};
-
-pub use crate::rust_analyzer_ext::expand_macro_recursively;
-use crate::{
-    DisplayPoint, Editor, EditorMode, FoldPlaceholder, MultiBuffer, SelectionEffects,
-    display_map::{
-        Block, BlockPlacement, CustomBlockId, DisplayMap, DisplayRow, DisplaySnapshot,
-        ToDisplayPoint,
-    },
-};
-use collections::HashMap;
-use gpui::{
-    AppContext as _, Context, Entity, EntityId, Font, FontFeatures, FontStyle, FontWeight, Pixels,
-    VisualTestContext, Window, font, size,
-};
-use multi_buffer::{MultiBufferOffset, ToPoint};
-use pretty_assertions::assert_eq;
-use project::{Project, project_settings::DiagnosticSeverity};
-use ui::{App, BorrowAppContext, px};
-use util::test::{generate_marked_text, marked_text_offsets, marked_text_ranges};
-
-#[cfg(test)]
-#[ctor::ctor]
-fn init_logger() {
-    zlog::init_test();
-}
-
-pub fn test_font() -> Font {
-    static TEST_FONT: LazyLock<Font> = LazyLock::new(|| {
-        #[cfg(not(target_os = "windows"))]
-        {
-            font("Helvetica")
-        }
-
-        #[cfg(target_os = "windows")]
-        {
-            font("Courier New")
-        }
-    });
-
-    TEST_FONT.clone()
-}
-
-// Returns a snapshot from text containing '|' character markers with the markers removed, and DisplayPoints for each one.
-#[track_caller]
-pub fn marked_display_snapshot(
-    text: &str,
-    cx: &mut gpui::App,
-) -> (DisplaySnapshot, Vec<DisplayPoint>) {
-    let (unmarked_text, markers) = marked_text_offsets(text);
-
-    let font = Font {
-        family: ".ZedMono".into(),
-        features: FontFeatures::default(),
-        fallbacks: None,
-        weight: FontWeight::default(),
-        style: FontStyle::default(),
-    };
-    let font_size: Pixels = 14usize.into();
-
-    let buffer = MultiBuffer::build_simple(&unmarked_text, cx);
-    let display_map = cx.new(|cx| {
-        DisplayMap::new(
-            buffer,
-            font,
-            font_size,
-            None,
-            1,
-            1,
-            FoldPlaceholder::test(),
-            DiagnosticSeverity::Warning,
-            cx,
-        )
-    });
-    let snapshot = display_map.update(cx, |map, cx| map.snapshot(cx));
-    let markers = markers
-        .into_iter()
-        .map(|offset| MultiBufferOffset(offset).to_display_point(&snapshot))
-        .collect();
-
-    (snapshot, markers)
-}
-
-#[track_caller]
-pub fn select_ranges(
-    editor: &mut Editor,
-    marked_text: &str,
-    window: &mut Window,
-    cx: &mut Context<Editor>,
-) {
-    let (unmarked_text, text_ranges) = marked_text_ranges(marked_text, true);
-    assert_eq!(editor.text(cx), unmarked_text);
-    editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-        s.select_ranges(
-            text_ranges
-                .into_iter()
-                .map(|range| MultiBufferOffset(range.start)..MultiBufferOffset(range.end)),
-        )
-    });
-}
-
-#[track_caller]
-pub fn assert_text_with_selections(
-    editor: &mut Editor,
-    marked_text: &str,
-    cx: &mut Context<Editor>,
-) {
-    let (unmarked_text, _text_ranges) = marked_text_ranges(marked_text, true);
-    assert_eq!(editor.text(cx), unmarked_text, "text doesn't match");
-    let actual = generate_marked_text(
-        &editor.text(cx),
-        &editor
-            .selections
-            .ranges::<MultiBufferOffset>(&editor.display_snapshot(cx))
-            .into_iter()
-            .map(|range| range.start.0..range.end.0)
-            .collect::<Vec<_>>(),
-        marked_text.contains("«"),
-    );
-    assert_eq!(actual, marked_text, "Selections don't match");
-}
-
-// RA thinks this is dead code even though it is used in a whole lot of tests
-#[allow(dead_code)]
-#[cfg(any(test, feature = "test-support"))]
-pub(crate) fn build_editor(
-    buffer: Entity<MultiBuffer>,
-    window: &mut Window,
-    cx: &mut Context<Editor>,
-) -> Editor {
-    Editor::new(EditorMode::full(), buffer, None, window, cx)
-}
-
-pub(crate) fn build_editor_with_project(
-    project: Entity<Project>,
-    buffer: Entity<MultiBuffer>,
-    window: &mut Window,
-    cx: &mut Context<Editor>,
-) -> Editor {
-    Editor::new(EditorMode::full(), buffer, Some(project), window, cx)
-}
-
-#[derive(Default)]
-struct TestBlockContent(
-    HashMap<(EntityId, CustomBlockId), Rc<dyn Fn(&mut VisualTestContext) -> String>>,
-);
-
-impl gpui::Global for TestBlockContent {}
-
-pub fn set_block_content_for_tests(
-    editor: &Entity<Editor>,
-    id: CustomBlockId,
-    cx: &mut App,
-    f: impl Fn(&mut VisualTestContext) -> String + 'static,
-) {
-    cx.update_default_global::<TestBlockContent, _>(|bc, _| {
-        bc.0.insert((editor.entity_id(), id), Rc::new(f))
-    });
-}
-
-pub fn block_content_for_tests(
-    editor: &Entity<Editor>,
-    id: CustomBlockId,
-    cx: &mut VisualTestContext,
-) -> Option<String> {
-    let f = cx.update(|_, cx| {
-        cx.default_global::<TestBlockContent>()
-            .0
-            .get(&(editor.entity_id(), id))
-            .cloned()
-    })?;
-    Some(f(cx))
-}
-
-pub fn editor_content_with_blocks(editor: &Entity<Editor>, cx: &mut VisualTestContext) -> String {
-    cx.draw(
-        gpui::Point::default(),
-        size(px(3000.0), px(3000.0)),
-        |_, _| editor.clone(),
-    );
-    let (snapshot, mut lines, blocks) = editor.update_in(cx, |editor, window, cx| {
-        let snapshot = editor.snapshot(window, cx);
-        let text = editor.display_text(cx);
-        let lines = text.lines().map(|s| s.to_string()).collect::<Vec<String>>();
-        let blocks = snapshot
-            .blocks_in_range(DisplayRow(0)..snapshot.max_point().row())
-            .map(|(row, block)| (row, block.clone()))
-            .collect::<Vec<_>>();
-        (snapshot, lines, blocks)
-    });
-    for (row, block) in blocks {
-        match block {
-            Block::Custom(custom_block) => {
-                if let BlockPlacement::Near(x) = &custom_block.placement
-                    && snapshot.intersects_fold(x.to_point(&snapshot.buffer_snapshot()))
-                {
-                    continue;
-                };
-                let content = block_content_for_tests(editor, custom_block.id, cx)
-                    .expect("block content not found");
-                // 2: "related info 1 for diagnostic 0"
-                if let Some(height) = custom_block.height {
-                    if height == 0 {
-                        lines[row.0 as usize - 1].push_str(" § ");
-                        lines[row.0 as usize - 1].push_str(&content);
-                    } else {
-                        let block_lines = content.lines().collect::<Vec<_>>();
-                        assert_eq!(block_lines.len(), height as usize);
-                        lines[row.0 as usize].push_str("§ ");
-                        lines[row.0 as usize].push_str(block_lines[0].trim_end());
-                        for i in 1..height as usize {
-                            if row.0 as usize + i >= lines.len() {
-                                lines.push("".to_string());
-                            };
-                            lines[row.0 as usize + i].push_str("§ ");
-                            lines[row.0 as usize + i].push_str(block_lines[i].trim_end());
-                        }
-                    }
-                }
-            }
-            Block::FoldedBuffer {
-                first_excerpt,
-                height,
-            } => {
-                lines[row.0 as usize].push_str(&cx.update(|_, cx| {
-                    format!("§ {}", first_excerpt.buffer.file().unwrap().file_name(cx))
-                }));
-                for row in row.0 + 1..row.0 + height {
-                    lines[row as usize].push_str("§ -----");
-                }
-            }
-            Block::ExcerptBoundary { height, .. } => {
-                for row in row.0..row.0 + height {
-                    lines[row as usize].push_str("§ -----");
-                }
-            }
-            Block::BufferHeader { excerpt, height } => {
-                lines[row.0 as usize].push_str(
-                    &cx.update(|_, cx| {
-                        format!("§ {}", excerpt.buffer.file().unwrap().file_name(cx))
-                    }),
-                );
-                for row in row.0 + 1..row.0 + height {
-                    lines[row as usize].push_str("§ -----");
-                }
-            }
-        }
-    }
-    lines.join("\n")
-}
diff --git a/crates/editor/src/test/editor_lsp_test_context.rs b/crates/editor/src/test/editor_lsp_test_context.rs
deleted file mode 100644
index 3afe0e6134..0000000000
--- a/crates/editor/src/test/editor_lsp_test_context.rs
+++ /dev/null
@@ -1,423 +0,0 @@
-use std::{
-    borrow::Cow,
-    ops::{Deref, DerefMut, Range},
-    path::Path,
-    sync::Arc,
-};
-
-use anyhow::Result;
-use language::{markdown_lang, rust_lang};
-use multi_buffer::MultiBufferOffset;
-use serde_json::json;
-
-use crate::{Editor, ToPoint};
-use collections::HashSet;
-use futures::Future;
-use gpui::{Context, Entity, Focusable as _, VisualTestContext, Window};
-use indoc::indoc;
-use language::{
-    BlockCommentConfig, FakeLspAdapter, Language, LanguageConfig, LanguageMatcher, LanguageQueries,
-    point_to_lsp,
-};
-use lsp::{notification, request};
-use project::Project;
-use smol::stream::StreamExt;
-use workspace::{AppState, Workspace, WorkspaceHandle};
-
-use super::editor_test_context::{AssertionContextManager, EditorTestContext};
-
-pub struct EditorLspTestContext {
-    pub cx: EditorTestContext,
-    pub lsp: lsp::FakeLanguageServer,
-    pub workspace: Entity<Workspace>,
-    pub buffer_lsp_url: lsp::Uri,
-}
-
-#[cfg(test)]
-pub(crate) fn git_commit_lang() -> Arc<Language> {
-    Arc::new(Language::new(
-        LanguageConfig {
-            name: "Git Commit".into(),
-            line_comments: vec!["#".into()],
-            ..Default::default()
-        },
-        None,
-    ))
-}
-
-impl EditorLspTestContext {
-    pub async fn new(
-        language: Language,
-        capabilities: lsp::ServerCapabilities,
-        cx: &mut gpui::TestAppContext,
-    ) -> EditorLspTestContext {
-        let app_state = cx.update(AppState::test);
-
-        cx.update(|cx| {
-            assets::Assets.load_test_fonts(cx);
-            crate::init(cx);
-            workspace::init(app_state.clone(), cx);
-        });
-
-        let file_name = format!(
-            "file.{}",
-            language
-                .path_suffixes()
-                .first()
-                .expect("language must have a path suffix for EditorLspTestContext")
-        );
-
-        let project = Project::test(app_state.fs.clone(), [], cx).await;
-
-        let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-        let mut fake_servers = language_registry.register_fake_lsp(
-            language.name(),
-            FakeLspAdapter {
-                capabilities,
-                ..Default::default()
-            },
-        );
-        language_registry.add(Arc::new(language));
-
-        let root = Self::root_path();
-
-        app_state
-            .fs
-            .as_fake()
-            .insert_tree(
-                root,
-                json!({
-                    ".git": {},
-                    "dir": {
-                        file_name.clone(): ""
-                    }
-                }),
-            )
-            .await;
-
-        let window = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-        let workspace = window.root(cx).unwrap();
-
-        let mut cx = VisualTestContext::from_window(*window.deref(), cx);
-        project
-            .update(&mut cx, |project, cx| {
-                project.find_or_create_worktree(root, true, cx)
-            })
-            .await
-            .unwrap();
-        cx.read(|cx| workspace.read(cx).worktree_scans_complete(cx))
-            .await;
-        let file = cx.read(|cx| workspace.file_project_paths(cx)[0].clone());
-        let item = workspace
-            .update_in(&mut cx, |workspace, window, cx| {
-                workspace.open_path(file, None, true, window, cx)
-            })
-            .await
-            .expect("Could not open test file");
-        let editor = cx.update(|_, cx| {
-            item.act_as::<Editor>(cx)
-                .expect("Opened test file wasn't an editor")
-        });
-        editor.update_in(&mut cx, |editor, window, cx| {
-            let nav_history = workspace
-                .read(cx)
-                .active_pane()
-                .read(cx)
-                .nav_history_for_item(&cx.entity());
-            editor.set_nav_history(Some(nav_history));
-            window.focus(&editor.focus_handle(cx))
-        });
-
-        let lsp = fake_servers.next().await.unwrap();
-        Self {
-            cx: EditorTestContext {
-                cx,
-                window: window.into(),
-                editor,
-                assertion_cx: AssertionContextManager::new(),
-            },
-            lsp,
-            workspace,
-            buffer_lsp_url: lsp::Uri::from_file_path(root.join("dir").join(file_name)).unwrap(),
-        }
-    }
-
-    pub async fn new_rust(
-        capabilities: lsp::ServerCapabilities,
-        cx: &mut gpui::TestAppContext,
-    ) -> EditorLspTestContext {
-        Self::new(Arc::into_inner(rust_lang()).unwrap(), capabilities, cx).await
-    }
-
-    pub async fn new_typescript(
-        capabilities: lsp::ServerCapabilities,
-        cx: &mut gpui::TestAppContext,
-    ) -> EditorLspTestContext {
-        let mut word_characters: HashSet<char> = Default::default();
-        word_characters.insert('$');
-        word_characters.insert('#');
-        let language = Language::new(
-            LanguageConfig {
-                name: "Typescript".into(),
-                matcher: LanguageMatcher {
-                    path_suffixes: vec!["ts".to_string()],
-                    ..Default::default()
-                },
-                brackets: language::BracketPairConfig {
-                    pairs: vec![language::BracketPair {
-                        start: "{".to_string(),
-                        end: "}".to_string(),
-                        close: true,
-                        surround: true,
-                        newline: true,
-                    }],
-                    disabled_scopes_by_bracket_ix: Default::default(),
-                },
-                word_characters,
-                ..Default::default()
-            },
-            Some(tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into()),
-        )
-        .with_queries(LanguageQueries {
-            brackets: Some(Cow::from(indoc! {r#"
-                ("(" @open ")" @close)
-                ("[" @open "]" @close)
-                ("{" @open "}" @close)
-                ("<" @open ">" @close)
-                ("'" @open "'" @close)
-                ("`" @open "`" @close)
-                ("\"" @open "\"" @close)"#})),
-            indents: Some(Cow::from(indoc! {r#"
-                [
-                    (call_expression)
-                    (assignment_expression)
-                    (member_expression)
-                    (lexical_declaration)
-                    (variable_declaration)
-                    (assignment_expression)
-                    (if_statement)
-                    (for_statement)
-                ] @indent
-
-                (_ "[" "]" @end) @indent
-                (_ "<" ">" @end) @indent
-                (_ "{" "}" @end) @indent
-                (_ "(" ")" @end) @indent
-                "#})),
-            ..Default::default()
-        })
-        .expect("Could not parse queries");
-
-        Self::new(language, capabilities, cx).await
-    }
-
-    pub async fn new_tsx(
-        capabilities: lsp::ServerCapabilities,
-        cx: &mut gpui::TestAppContext,
-    ) -> EditorLspTestContext {
-        let mut word_characters: HashSet<char> = Default::default();
-        word_characters.insert('$');
-        word_characters.insert('#');
-        let language = Language::new(
-            LanguageConfig {
-                name: "TSX".into(),
-                matcher: LanguageMatcher {
-                    path_suffixes: vec!["tsx".to_string()],
-                    ..Default::default()
-                },
-                brackets: language::BracketPairConfig {
-                    pairs: vec![language::BracketPair {
-                        start: "{".to_string(),
-                        end: "}".to_string(),
-                        close: true,
-                        surround: true,
-                        newline: true,
-                    }],
-                    disabled_scopes_by_bracket_ix: Default::default(),
-                },
-                word_characters,
-                ..Default::default()
-            },
-            Some(tree_sitter_typescript::LANGUAGE_TSX.into()),
-        )
-        .with_queries(LanguageQueries {
-            brackets: Some(Cow::from(indoc! {r#"
-                ("(" @open ")" @close)
-                ("[" @open "]" @close)
-                ("{" @open "}" @close)
-                ("<" @open ">" @close)
-                ("<" @open "/>" @close)
-                ("</" @open ">" @close)
-                ("\"" @open "\"" @close)
-                ("'" @open "'" @close)
-                ("`" @open "`" @close)
-                ((jsx_element (jsx_opening_element) @open (jsx_closing_element) @close) (#set! newline.only))"#})),
-            indents: Some(Cow::from(indoc! {r#"
-                [
-                    (call_expression)
-                    (assignment_expression)
-                    (member_expression)
-                    (lexical_declaration)
-                    (variable_declaration)
-                    (assignment_expression)
-                    (if_statement)
-                    (for_statement)
-                ] @indent
-
-                (_ "[" "]" @end) @indent
-                (_ "<" ">" @end) @indent
-                (_ "{" "}" @end) @indent
-                (_ "(" ")" @end) @indent
-
-                (jsx_opening_element ">" @end) @indent
-
-                (jsx_element
-                  (jsx_opening_element) @start
-                  (jsx_closing_element)? @end) @indent
-                "#})),
-            ..Default::default()
-        })
-        .expect("Could not parse queries");
-
-        Self::new(language, capabilities, cx).await
-    }
-
-    pub async fn new_html(cx: &mut gpui::TestAppContext) -> Self {
-        let language = Language::new(
-            LanguageConfig {
-                name: "HTML".into(),
-                matcher: LanguageMatcher {
-                    path_suffixes: vec!["html".into()],
-                    ..Default::default()
-                },
-                block_comment: Some(BlockCommentConfig {
-                    start: "<!--".into(),
-                    prefix: "".into(),
-                    end: "-->".into(),
-                    tab_size: 0,
-                }),
-                completion_query_characters: ['-'].into_iter().collect(),
-                ..Default::default()
-            },
-            Some(tree_sitter_html::LANGUAGE.into()),
-        )
-        .with_queries(LanguageQueries {
-            brackets: Some(Cow::from(indoc! {r#"
-                ("<" @open "/>" @close)
-                ("</" @open ">" @close)
-                ("<" @open ">" @close)
-                ("\"" @open "\"" @close)"#})),
-            ..Default::default()
-        })
-        .expect("Could not parse queries");
-        Self::new(language, Default::default(), cx).await
-    }
-
-    pub async fn new_markdown_with_rust(cx: &mut gpui::TestAppContext) -> Self {
-        let context = Self::new(
-            Arc::into_inner(markdown_lang()).unwrap(),
-            Default::default(),
-            cx,
-        )
-        .await;
-
-        let language_registry = context.workspace.read_with(cx, |workspace, cx| {
-            workspace.project().read(cx).languages().clone()
-        });
-        language_registry.add(rust_lang());
-
-        context
-    }
-
-    /// Constructs lsp range using a marked string with '[', ']' range delimiters
-    #[track_caller]
-    pub fn lsp_range(&mut self, marked_text: &str) -> lsp::Range {
-        let ranges = self.ranges(marked_text);
-        self.to_lsp_range(MultiBufferOffset(ranges[0].start)..MultiBufferOffset(ranges[0].end))
-    }
-
-    #[expect(clippy::wrong_self_convention, reason = "This is test code")]
-    pub fn to_lsp_range(&mut self, range: Range<MultiBufferOffset>) -> lsp::Range {
-        use language::ToPointUtf16;
-        let snapshot = self.update_editor(|editor, window, cx| editor.snapshot(window, cx));
-        let start_point = range.start.to_point(&snapshot.buffer_snapshot());
-        let end_point = range.end.to_point(&snapshot.buffer_snapshot());
-
-        self.editor(|editor, _, cx| {
-            let buffer = editor.buffer().read(cx);
-            let (start_buffer, start_offset) =
-                buffer.point_to_buffer_offset(start_point, cx).unwrap();
-            let start = point_to_lsp(start_offset.to_point_utf16(&start_buffer.read(cx)));
-            let (end_buffer, end_offset) = buffer.point_to_buffer_offset(end_point, cx).unwrap();
-            let end = point_to_lsp(end_offset.to_point_utf16(&end_buffer.read(cx)));
-            lsp::Range { start, end }
-        })
-    }
-
-    #[expect(clippy::wrong_self_convention, reason = "This is test code")]
-    pub fn to_lsp(&mut self, offset: MultiBufferOffset) -> lsp::Position {
-        use language::ToPointUtf16;
-
-        let snapshot = self.update_editor(|editor, window, cx| editor.snapshot(window, cx));
-        let point = offset.to_point(&snapshot.buffer_snapshot());
-
-        self.editor(|editor, _, cx| {
-            let buffer = editor.buffer().read(cx);
-            let (buffer, offset) = buffer.point_to_buffer_offset(point, cx).unwrap();
-            point_to_lsp(offset.to_point_utf16(&buffer.read(cx)))
-        })
-    }
-
-    pub fn update_workspace<F, T>(&mut self, update: F) -> T
-    where
-        F: FnOnce(&mut Workspace, &mut Window, &mut Context<Workspace>) -> T,
-    {
-        self.workspace.update_in(&mut self.cx.cx, update)
-    }
-
-    pub fn set_request_handler<T, F, Fut>(
-        &self,
-        mut handler: F,
-    ) -> futures::channel::mpsc::UnboundedReceiver<()>
-    where
-        T: 'static + request::Request,
-        T::Params: 'static + Send,
-        F: 'static + Send + FnMut(lsp::Uri, T::Params, gpui::AsyncApp) -> Fut,
-        Fut: 'static + Future<Output = Result<T::Result>>,
-    {
-        let url = self.buffer_lsp_url.clone();
-        self.lsp.set_request_handler::<T, _, _>(move |params, cx| {
-            let url = url.clone();
-            handler(url, params, cx)
-        })
-    }
-
-    pub fn notify<T: notification::Notification>(&self, params: T::Params) {
-        self.lsp.notify::<T>(params);
-    }
-
-    #[cfg(target_os = "windows")]
-    fn root_path() -> &'static Path {
-        Path::new("C:\\root")
-    }
-
-    #[cfg(not(target_os = "windows"))]
-    fn root_path() -> &'static Path {
-        Path::new("/root")
-    }
-}
-
-impl Deref for EditorLspTestContext {
-    type Target = EditorTestContext;
-
-    fn deref(&self) -> &Self::Target {
-        &self.cx
-    }
-}
-
-impl DerefMut for EditorLspTestContext {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.cx
-    }
-}
diff --git a/crates/editor/src/test/editor_test_context.rs b/crates/editor/src/test/editor_test_context.rs
deleted file mode 100644
index 511629c59d..0000000000
--- a/crates/editor/src/test/editor_test_context.rs
+++ /dev/null
@@ -1,821 +0,0 @@
-use crate::{
-    AnchorRangeExt, DisplayPoint, Editor, ExcerptId, MultiBuffer, MultiBufferSnapshot, RowExt,
-    display_map::{HighlightKey, ToDisplayPoint},
-};
-use buffer_diff::DiffHunkStatusKind;
-use collections::BTreeMap;
-use futures::Future;
-
-use git::repository::RepoPath;
-use gpui::{
-    AnyWindowHandle, App, Context, Entity, Focusable as _, Keystroke, Pixels, Point,
-    VisualTestContext, Window, WindowHandle, prelude::*,
-};
-use itertools::Itertools;
-use language::{Buffer, BufferSnapshot, LanguageRegistry};
-use multi_buffer::{Anchor, ExcerptRange, MultiBufferOffset, MultiBufferRow};
-use parking_lot::RwLock;
-use project::{FakeFs, Project};
-use std::{
-    any::TypeId,
-    ops::{Deref, DerefMut, Range},
-    path::Path,
-    sync::{
-        Arc,
-        atomic::{AtomicUsize, Ordering},
-    },
-};
-use text::Selection;
-use util::{
-    assert_set_eq,
-    test::{generate_marked_text, marked_text_ranges},
-};
-
-use super::{build_editor, build_editor_with_project};
-
-pub struct EditorTestContext {
-    pub cx: gpui::VisualTestContext,
-    pub window: AnyWindowHandle,
-    pub editor: Entity<Editor>,
-    pub assertion_cx: AssertionContextManager,
-}
-
-impl EditorTestContext {
-    pub async fn new(cx: &mut gpui::TestAppContext) -> EditorTestContext {
-        let fs = FakeFs::new(cx.executor());
-        let root = Self::root_path();
-        fs.insert_tree(
-            root,
-            serde_json::json!({
-                ".git": {},
-                "file": "",
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), [root], cx).await;
-        let buffer = project
-            .update(cx, |project, cx| {
-                project.open_local_buffer(root.join("file"), cx)
-            })
-            .await
-            .unwrap();
-
-        let language = project
-            .read_with(cx, |project, _cx| {
-                project.languages().language_for_name("Plain Text")
-            })
-            .await
-            .unwrap();
-        buffer.update(cx, |buffer, cx| {
-            buffer.set_language(Some(language), cx);
-        });
-
-        let editor = cx.add_window(|window, cx| {
-            let editor = build_editor_with_project(
-                project,
-                MultiBuffer::build_from_buffer(buffer, cx),
-                window,
-                cx,
-            );
-
-            window.focus(&editor.focus_handle(cx));
-            editor
-        });
-        let editor_view = editor.root(cx).unwrap();
-
-        cx.run_until_parked();
-        Self {
-            cx: VisualTestContext::from_window(*editor.deref(), cx),
-            window: editor.into(),
-            editor: editor_view,
-            assertion_cx: AssertionContextManager::new(),
-        }
-    }
-
-    #[cfg(target_os = "windows")]
-    fn root_path() -> &'static Path {
-        Path::new("C:\\root")
-    }
-
-    #[cfg(not(target_os = "windows"))]
-    fn root_path() -> &'static Path {
-        Path::new("/root")
-    }
-
-    pub async fn for_editor_in(editor: Entity<Editor>, cx: &mut gpui::VisualTestContext) -> Self {
-        cx.focus(&editor);
-        Self {
-            window: cx.windows()[0],
-            cx: cx.clone(),
-            editor,
-            assertion_cx: AssertionContextManager::new(),
-        }
-    }
-
-    pub async fn for_editor(editor: WindowHandle<Editor>, cx: &mut gpui::TestAppContext) -> Self {
-        let editor_view = editor.root(cx).unwrap();
-        Self {
-            cx: VisualTestContext::from_window(*editor.deref(), cx),
-            window: editor.into(),
-            editor: editor_view,
-            assertion_cx: AssertionContextManager::new(),
-        }
-    }
-
-    #[track_caller]
-    pub fn new_multibuffer<const COUNT: usize>(
-        cx: &mut gpui::TestAppContext,
-        excerpts: [&str; COUNT],
-    ) -> EditorTestContext {
-        let mut multibuffer = MultiBuffer::new(language::Capability::ReadWrite);
-        let buffer = cx.new(|cx| {
-            for excerpt in excerpts.into_iter() {
-                let (text, ranges) = marked_text_ranges(excerpt, false);
-                let buffer = cx.new(|cx| Buffer::local(text, cx));
-                multibuffer.push_excerpts(buffer, ranges.into_iter().map(ExcerptRange::new), cx);
-            }
-            multibuffer
-        });
-
-        let editor = cx.add_window(|window, cx| {
-            let editor = build_editor(buffer, window, cx);
-            window.focus(&editor.focus_handle(cx));
-
-            editor
-        });
-
-        let editor_view = editor.root(cx).unwrap();
-        Self {
-            cx: VisualTestContext::from_window(*editor.deref(), cx),
-            window: editor.into(),
-            editor: editor_view,
-            assertion_cx: AssertionContextManager::new(),
-        }
-    }
-
-    pub fn condition(
-        &self,
-        predicate: impl FnMut(&Editor, &App) -> bool,
-    ) -> impl Future<Output = ()> {
-        self.editor
-            .condition::<crate::EditorEvent>(&self.cx, predicate)
-    }
-
-    #[track_caller]
-    pub fn editor<F, T>(&mut self, read: F) -> T
-    where
-        F: FnOnce(&Editor, &Window, &mut Context<Editor>) -> T,
-    {
-        self.editor
-            .update_in(&mut self.cx, |this, window, cx| read(this, window, cx))
-    }
-
-    #[track_caller]
-    pub fn update_editor<F, T>(&mut self, update: F) -> T
-    where
-        F: FnOnce(&mut Editor, &mut Window, &mut Context<Editor>) -> T,
-    {
-        self.editor.update_in(&mut self.cx, update)
-    }
-
-    pub fn multibuffer<F, T>(&mut self, read: F) -> T
-    where
-        F: FnOnce(&MultiBuffer, &App) -> T,
-    {
-        self.editor(|editor, _, cx| read(editor.buffer().read(cx), cx))
-    }
-
-    pub fn update_multibuffer<F, T>(&mut self, update: F) -> T
-    where
-        F: FnOnce(&mut MultiBuffer, &mut Context<MultiBuffer>) -> T,
-    {
-        self.update_editor(|editor, _, cx| editor.buffer().update(cx, update))
-    }
-
-    pub fn buffer_text(&mut self) -> String {
-        self.multibuffer(|buffer, cx| buffer.snapshot(cx).text())
-    }
-
-    pub fn display_text(&mut self) -> String {
-        self.update_editor(|editor, _, cx| editor.display_text(cx))
-    }
-
-    pub fn buffer<F, T>(&mut self, read: F) -> T
-    where
-        F: FnOnce(&Buffer, &App) -> T,
-    {
-        self.multibuffer(|multibuffer, cx| {
-            let buffer = multibuffer.as_singleton().unwrap().read(cx);
-            read(buffer, cx)
-        })
-    }
-
-    pub fn language_registry(&mut self) -> Arc<LanguageRegistry> {
-        self.editor(|editor, _, cx| {
-            editor
-                .project
-                .as_ref()
-                .unwrap()
-                .read(cx)
-                .languages()
-                .clone()
-        })
-    }
-
-    pub fn update_buffer<F, T>(&mut self, update: F) -> T
-    where
-        F: FnOnce(&mut Buffer, &mut Context<Buffer>) -> T,
-    {
-        self.update_multibuffer(|multibuffer, cx| {
-            let buffer = multibuffer.as_singleton().unwrap();
-            buffer.update(cx, update)
-        })
-    }
-
-    pub fn buffer_snapshot(&mut self) -> BufferSnapshot {
-        self.buffer(|buffer, _| buffer.snapshot())
-    }
-
-    pub fn add_assertion_context(&self, context: String) -> ContextHandle {
-        self.assertion_cx.add_context(context)
-    }
-
-    pub fn assertion_context(&self) -> String {
-        self.assertion_cx.context()
-    }
-
-    // unlike cx.simulate_keystrokes(), this does not run_until_parked
-    // so you can use it to test detailed timing
-    pub fn simulate_keystroke(&mut self, keystroke_text: &str) {
-        let keystroke = Keystroke::parse(keystroke_text).unwrap();
-        self.cx.dispatch_keystroke(self.window, keystroke);
-    }
-
-    pub fn run_until_parked(&mut self) {
-        self.cx.background_executor.run_until_parked();
-    }
-
-    #[track_caller]
-    pub fn ranges(&mut self, marked_text: &str) -> Vec<Range<usize>> {
-        let (unmarked_text, ranges) = marked_text_ranges(marked_text, false);
-        assert_eq!(self.buffer_text(), unmarked_text);
-        ranges
-    }
-
-    pub fn display_point(&mut self, marked_text: &str) -> DisplayPoint {
-        let ranges = self.ranges(marked_text);
-        let snapshot = self.editor.update_in(&mut self.cx, |editor, window, cx| {
-            editor.snapshot(window, cx)
-        });
-        MultiBufferOffset(ranges[0].start).to_display_point(&snapshot)
-    }
-
-    pub fn pixel_position(&mut self, marked_text: &str) -> Point<Pixels> {
-        let display_point = self.display_point(marked_text);
-        self.pixel_position_for(display_point)
-    }
-
-    pub fn pixel_position_for(&mut self, display_point: DisplayPoint) -> Point<Pixels> {
-        self.update_editor(|editor, window, cx| {
-            let newest_point = editor
-                .selections
-                .newest_display(&editor.display_snapshot(cx))
-                .head();
-            let pixel_position = editor.pixel_position_of_newest_cursor.unwrap();
-            let line_height = editor
-                .style(cx)
-                .text
-                .line_height_in_pixels(window.rem_size());
-            let snapshot = editor.snapshot(window, cx);
-            let details = editor.text_layout_details(window);
-
-            let y = pixel_position.y
-                + f32::from(line_height)
-                    * Pixels::from(display_point.row().as_f64() - newest_point.row().as_f64());
-            let x = pixel_position.x + snapshot.x_for_display_point(display_point, &details)
-                - snapshot.x_for_display_point(newest_point, &details);
-            Point::new(x, y)
-        })
-    }
-
-    // Returns anchors for the current buffer using `«` and `»`
-    pub fn text_anchor_range(&mut self, marked_text: &str) -> Range<language::Anchor> {
-        let ranges = self.ranges(marked_text);
-        let snapshot = self.buffer_snapshot();
-        snapshot.anchor_before(ranges[0].start)..snapshot.anchor_after(ranges[0].end)
-    }
-
-    pub fn set_head_text(&mut self, diff_base: &str) {
-        self.cx.run_until_parked();
-        let fs =
-            self.update_editor(|editor, _, cx| editor.project().unwrap().read(cx).fs().as_fake());
-        let path = self.update_buffer(|buffer, _| buffer.file().unwrap().path().clone());
-        fs.set_head_for_repo(
-            &Self::root_path().join(".git"),
-            &[(path.as_unix_str(), diff_base.to_string())],
-            "deadbeef",
-        );
-        self.cx.run_until_parked();
-    }
-
-    pub fn clear_index_text(&mut self) {
-        self.cx.run_until_parked();
-        let fs =
-            self.update_editor(|editor, _, cx| editor.project().unwrap().read(cx).fs().as_fake());
-        fs.set_index_for_repo(&Self::root_path().join(".git"), &[]);
-        self.cx.run_until_parked();
-    }
-
-    pub fn set_index_text(&mut self, diff_base: &str) {
-        self.cx.run_until_parked();
-        let fs =
-            self.update_editor(|editor, _, cx| editor.project().unwrap().read(cx).fs().as_fake());
-        let path = self.update_buffer(|buffer, _| buffer.file().unwrap().path().clone());
-        fs.set_index_for_repo(
-            &Self::root_path().join(".git"),
-            &[(path.as_unix_str(), diff_base.to_string())],
-        );
-        self.cx.run_until_parked();
-    }
-
-    #[track_caller]
-    pub fn assert_index_text(&mut self, expected: Option<&str>) {
-        let fs =
-            self.update_editor(|editor, _, cx| editor.project().unwrap().read(cx).fs().as_fake());
-        let path = self.update_buffer(|buffer, _| buffer.file().unwrap().path().clone());
-        let mut found = None;
-        fs.with_git_state(&Self::root_path().join(".git"), false, |git_state| {
-            found = git_state
-                .index_contents
-                .get(&RepoPath::from_rel_path(&path))
-                .cloned();
-        })
-        .unwrap();
-        assert_eq!(expected, found.as_deref());
-    }
-
-    /// Change the editor's text and selections using a string containing
-    /// embedded range markers that represent the ranges and directions of
-    /// each selection.
-    ///
-    /// Returns a context handle so that assertion failures can print what
-    /// editor state was needed to cause the failure.
-    ///
-    /// See the `util::test::marked_text_ranges` function for more information.
-    #[track_caller]
-    pub fn set_state(&mut self, marked_text: &str) -> ContextHandle {
-        let state_context = self.add_assertion_context(format!(
-            "Initial Editor State: \"{}\"",
-            marked_text.escape_debug()
-        ));
-        let (unmarked_text, selection_ranges) = marked_text_ranges(marked_text, true);
-        self.editor.update_in(&mut self.cx, |editor, window, cx| {
-            editor.set_text(unmarked_text, window, cx);
-            editor.change_selections(Default::default(), window, cx, |s| {
-                s.select_ranges(
-                    selection_ranges
-                        .into_iter()
-                        .map(|range| MultiBufferOffset(range.start)..MultiBufferOffset(range.end)),
-                )
-            })
-        });
-        state_context
-    }
-
-    /// Only change the editor's selections
-    #[track_caller]
-    pub fn set_selections_state(&mut self, marked_text: &str) -> ContextHandle {
-        let state_context = self.add_assertion_context(format!(
-            "Initial Editor State: \"{}\"",
-            marked_text.escape_debug()
-        ));
-        let (unmarked_text, selection_ranges) = marked_text_ranges(marked_text, true);
-        self.editor.update_in(&mut self.cx, |editor, window, cx| {
-            assert_eq!(editor.text(cx), unmarked_text);
-            editor.change_selections(Default::default(), window, cx, |s| {
-                s.select_ranges(
-                    selection_ranges
-                        .into_iter()
-                        .map(|range| MultiBufferOffset(range.start)..MultiBufferOffset(range.end)),
-                )
-            })
-        });
-        state_context
-    }
-
-    /// Assert about the text of the editor, the selections, and the expanded
-    /// diff hunks.
-    ///
-    /// Diff hunks are indicated by lines starting with `+` and `-`.
-    #[track_caller]
-    pub fn assert_state_with_diff(&mut self, expected_diff_text: String) {
-        assert_state_with_diff(&self.editor, &mut self.cx, &expected_diff_text);
-    }
-
-    #[track_caller]
-    pub fn assert_excerpts_with_selections(&mut self, marked_text: &str) {
-        let actual_text = self.to_format_multibuffer_as_marked_text();
-        let fmt_additional_notes = || {
-            struct Format<'a, T: std::fmt::Display>(&'a str, &'a T);
-
-            impl<T: std::fmt::Display> std::fmt::Display for Format<'_, T> {
-                fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                    write!(
-                        f,
-                        "\n\n----- EXPECTED: -----\n\n{}\n\n----- ACTUAL: -----\n\n{}\n\n",
-                        self.0, self.1
-                    )
-                }
-            }
-
-            Format(marked_text, &actual_text)
-        };
-
-        let expected_excerpts = marked_text
-            .strip_prefix("[EXCERPT]\n")
-            .unwrap()
-            .split("[EXCERPT]\n")
-            .collect::<Vec<_>>();
-
-        let (multibuffer_snapshot, selections, excerpts) = self.update_editor(|editor, _, cx| {
-            let multibuffer_snapshot = editor.buffer.read(cx).snapshot(cx);
-
-            let selections = editor.selections.disjoint_anchors_arc();
-            let excerpts = multibuffer_snapshot
-                .excerpts()
-                .map(|(e_id, snapshot, range)| (e_id, snapshot.clone(), range))
-                .collect::<Vec<_>>();
-
-            (multibuffer_snapshot, selections, excerpts)
-        });
-
-        assert!(
-            excerpts.len() == expected_excerpts.len(),
-            "should have {} excerpts, got {}{}",
-            expected_excerpts.len(),
-            excerpts.len(),
-            fmt_additional_notes(),
-        );
-
-        for (ix, (excerpt_id, snapshot, range)) in excerpts.into_iter().enumerate() {
-            let is_folded = self
-                .update_editor(|editor, _, cx| editor.is_buffer_folded(snapshot.remote_id(), cx));
-            let (expected_text, expected_selections) =
-                marked_text_ranges(expected_excerpts[ix], true);
-            if expected_text == "[FOLDED]\n" {
-                assert!(is_folded, "excerpt {} should be folded", ix);
-                let is_selected = selections.iter().any(|s| s.head().excerpt_id == excerpt_id);
-                if !expected_selections.is_empty() {
-                    assert!(
-                        is_selected,
-                        "excerpt {ix} should contain selections. got {:?}{}",
-                        self.editor_state(),
-                        fmt_additional_notes(),
-                    );
-                } else {
-                    assert!(
-                        !is_selected,
-                        "excerpt {ix} should not contain selections, got: {selections:?}{}",
-                        fmt_additional_notes(),
-                    );
-                }
-                continue;
-            }
-            assert!(
-                !is_folded,
-                "excerpt {} should not be folded{}",
-                ix,
-                fmt_additional_notes()
-            );
-            assert_eq!(
-                multibuffer_snapshot
-                    .text_for_range(Anchor::range_in_buffer(excerpt_id, range.context.clone()))
-                    .collect::<String>(),
-                expected_text,
-                "{}",
-                fmt_additional_notes(),
-            );
-
-            let selections = selections
-                .iter()
-                .filter(|s| s.head().excerpt_id == excerpt_id)
-                .map(|s| {
-                    let head = text::ToOffset::to_offset(&s.head().text_anchor, &snapshot)
-                        - text::ToOffset::to_offset(&range.context.start, &snapshot);
-                    let tail = text::ToOffset::to_offset(&s.head().text_anchor, &snapshot)
-                        - text::ToOffset::to_offset(&range.context.start, &snapshot);
-                    tail..head
-                })
-                .collect::<Vec<_>>();
-            // todo: selections that cross excerpt boundaries..
-            assert_eq!(
-                selections,
-                expected_selections,
-                "excerpt {} has incorrect selections{}",
-                ix,
-                fmt_additional_notes()
-            );
-        }
-    }
-
-    fn to_format_multibuffer_as_marked_text(&mut self) -> FormatMultiBufferAsMarkedText {
-        let (multibuffer_snapshot, selections, excerpts) = self.update_editor(|editor, _, cx| {
-            let multibuffer_snapshot = editor.buffer.read(cx).snapshot(cx);
-
-            let selections = editor.selections.disjoint_anchors_arc().to_vec();
-            let excerpts = multibuffer_snapshot
-                .excerpts()
-                .map(|(e_id, snapshot, range)| {
-                    let is_folded = editor.is_buffer_folded(snapshot.remote_id(), cx);
-                    (e_id, snapshot.clone(), range, is_folded)
-                })
-                .collect::<Vec<_>>();
-
-            (multibuffer_snapshot, selections, excerpts)
-        });
-
-        FormatMultiBufferAsMarkedText {
-            multibuffer_snapshot,
-            selections,
-            excerpts,
-        }
-    }
-
-    /// Make an assertion about the editor's text and the ranges and directions
-    /// of its selections using a string containing embedded range markers.
-    ///
-    /// See the `util::test::marked_text_ranges` function for more information.
-    #[track_caller]
-    pub fn assert_editor_state(&mut self, marked_text: &str) {
-        let (expected_text, expected_selections) = marked_text_ranges(marked_text, true);
-        pretty_assertions::assert_eq!(self.buffer_text(), expected_text, "unexpected buffer text");
-        self.assert_selections(expected_selections, marked_text.to_string())
-    }
-
-    /// Make an assertion about the editor's text and the ranges and directions
-    /// of its selections using a string containing embedded range markers.
-    ///
-    /// See the `util::test::marked_text_ranges` function for more information.
-    #[track_caller]
-    pub fn assert_display_state(&mut self, marked_text: &str) {
-        let (expected_text, expected_selections) = marked_text_ranges(marked_text, true);
-        pretty_assertions::assert_eq!(self.display_text(), expected_text, "unexpected buffer text");
-        self.assert_selections(expected_selections, marked_text.to_string())
-    }
-
-    pub fn editor_state(&mut self) -> String {
-        generate_marked_text(self.buffer_text().as_str(), &self.editor_selections(), true)
-    }
-
-    #[track_caller]
-    pub fn assert_editor_background_highlights<Tag: 'static>(&mut self, marked_text: &str) {
-        let expected_ranges = self.ranges(marked_text);
-        let actual_ranges: Vec<Range<usize>> = self.update_editor(|editor, window, cx| {
-            let snapshot = editor.snapshot(window, cx);
-            editor
-                .background_highlights
-                .get(&HighlightKey::Type(TypeId::of::<Tag>()))
-                .map(|h| h.1.clone())
-                .unwrap_or_default()
-                .iter()
-                .map(|range| range.to_offset(&snapshot.buffer_snapshot()))
-                .map(|range| range.start.0..range.end.0)
-                .collect()
-        });
-        assert_set_eq!(actual_ranges, expected_ranges);
-    }
-
-    #[track_caller]
-    pub fn assert_editor_text_highlights<Tag: ?Sized + 'static>(&mut self, marked_text: &str) {
-        let expected_ranges = self.ranges(marked_text);
-        let snapshot = self.update_editor(|editor, window, cx| editor.snapshot(window, cx));
-        let actual_ranges: Vec<Range<usize>> = snapshot
-            .text_highlight_ranges::<Tag>()
-            .map(|ranges| ranges.as_ref().clone().1)
-            .unwrap_or_default()
-            .into_iter()
-            .map(|range| range.to_offset(&snapshot.buffer_snapshot()))
-            .map(|range| range.start.0..range.end.0)
-            .collect();
-        assert_set_eq!(actual_ranges, expected_ranges);
-    }
-
-    #[track_caller]
-    pub fn assert_editor_selections(&mut self, expected_selections: Vec<Range<usize>>) {
-        let expected_marked_text =
-            generate_marked_text(&self.buffer_text(), &expected_selections, true)
-                .replace(" \n", "•\n");
-
-        self.assert_selections(expected_selections, expected_marked_text)
-    }
-
-    #[track_caller]
-    fn editor_selections(&mut self) -> Vec<Range<usize>> {
-        self.editor
-            .update(&mut self.cx, |editor, cx| {
-                editor
-                    .selections
-                    .all::<MultiBufferOffset>(&editor.display_snapshot(cx))
-            })
-            .into_iter()
-            .map(|s| {
-                if s.reversed {
-                    s.end.0..s.start.0
-                } else {
-                    s.start.0..s.end.0
-                }
-            })
-            .collect::<Vec<_>>()
-    }
-
-    #[track_caller]
-    fn assert_selections(
-        &mut self,
-        expected_selections: Vec<Range<usize>>,
-        expected_marked_text: String,
-    ) {
-        let actual_selections = self.editor_selections();
-        let actual_marked_text =
-            generate_marked_text(&self.buffer_text(), &actual_selections, true)
-                .replace(" \n", "•\n");
-        if expected_selections != actual_selections {
-            pretty_assertions::assert_eq!(
-                actual_marked_text,
-                expected_marked_text,
-                "{}Editor has unexpected selections",
-                self.assertion_context(),
-            );
-        }
-    }
-}
-
-struct FormatMultiBufferAsMarkedText {
-    multibuffer_snapshot: MultiBufferSnapshot,
-    selections: Vec<Selection<Anchor>>,
-    excerpts: Vec<(ExcerptId, BufferSnapshot, ExcerptRange<text::Anchor>, bool)>,
-}
-
-impl std::fmt::Display for FormatMultiBufferAsMarkedText {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let Self {
-            multibuffer_snapshot,
-            selections,
-            excerpts,
-        } = self;
-
-        for (excerpt_id, snapshot, range, is_folded) in excerpts.into_iter() {
-            write!(f, "[EXCERPT]\n")?;
-            if *is_folded {
-                write!(f, "[FOLDED]\n")?;
-            }
-
-            let mut text = multibuffer_snapshot
-                .text_for_range(Anchor::range_in_buffer(*excerpt_id, range.context.clone()))
-                .collect::<String>();
-
-            let selections = selections
-                .iter()
-                .filter(|&s| s.head().excerpt_id == *excerpt_id)
-                .map(|s| {
-                    let head = text::ToOffset::to_offset(&s.head().text_anchor, &snapshot)
-                        - text::ToOffset::to_offset(&range.context.start, &snapshot);
-                    let tail = text::ToOffset::to_offset(&s.head().text_anchor, &snapshot)
-                        - text::ToOffset::to_offset(&range.context.start, &snapshot);
-                    tail..head
-                })
-                .rev()
-                .collect::<Vec<_>>();
-
-            for selection in selections {
-                if selection.is_empty() {
-                    text.insert(selection.start, 'ˇ');
-                    continue;
-                }
-                text.insert(selection.end, '»');
-                text.insert(selection.start, '«');
-            }
-
-            write!(f, "{text}")?;
-        }
-
-        Ok(())
-    }
-}
-
-#[track_caller]
-pub fn assert_state_with_diff(
-    editor: &Entity<Editor>,
-    cx: &mut VisualTestContext,
-    expected_diff_text: &str,
-) {
-    let (snapshot, selections) = editor.update_in(cx, |editor, window, cx| {
-        let snapshot = editor.snapshot(window, cx);
-        (
-            snapshot.buffer_snapshot().clone(),
-            editor
-                .selections
-                .ranges::<MultiBufferOffset>(&snapshot.display_snapshot)
-                .into_iter()
-                .map(|range| range.start.0..range.end.0)
-                .collect::<Vec<_>>(),
-        )
-    });
-
-    let actual_marked_text = generate_marked_text(&snapshot.text(), &selections, true);
-
-    // Read the actual diff.
-    let line_infos = snapshot.row_infos(MultiBufferRow(0)).collect::<Vec<_>>();
-    let has_diff = line_infos.iter().any(|info| info.diff_status.is_some());
-    let actual_diff = actual_marked_text
-        .split('\n')
-        .zip(line_infos)
-        .map(|(line, info)| {
-            let mut marker = match info.diff_status.map(|status| status.kind) {
-                Some(DiffHunkStatusKind::Added) => "+ ",
-                Some(DiffHunkStatusKind::Deleted) => "- ",
-                Some(DiffHunkStatusKind::Modified) => unreachable!(),
-                None => {
-                    if has_diff {
-                        "  "
-                    } else {
-                        ""
-                    }
-                }
-            };
-            if line.is_empty() {
-                marker = marker.trim();
-            }
-            format!("{marker}{line}")
-        })
-        .collect::<Vec<_>>()
-        .join("\n");
-
-    pretty_assertions::assert_eq!(actual_diff, expected_diff_text, "unexpected diff state");
-}
-
-impl Deref for EditorTestContext {
-    type Target = gpui::VisualTestContext;
-
-    fn deref(&self) -> &Self::Target {
-        &self.cx
-    }
-}
-
-impl DerefMut for EditorTestContext {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.cx
-    }
-}
-
-/// Tracks string context to be printed when assertions fail.
-/// Often this is done by storing a context string in the manager and returning the handle.
-#[derive(Clone)]
-pub struct AssertionContextManager {
-    id: Arc<AtomicUsize>,
-    contexts: Arc<RwLock<BTreeMap<usize, String>>>,
-}
-
-impl Default for AssertionContextManager {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl AssertionContextManager {
-    pub fn new() -> Self {
-        Self {
-            id: Arc::new(AtomicUsize::new(0)),
-            contexts: Arc::new(RwLock::new(BTreeMap::new())),
-        }
-    }
-
-    pub fn add_context(&self, context: String) -> ContextHandle {
-        let id = self.id.fetch_add(1, Ordering::Relaxed);
-        let mut contexts = self.contexts.write();
-        contexts.insert(id, context);
-        ContextHandle {
-            id,
-            manager: self.clone(),
-        }
-    }
-
-    pub fn context(&self) -> String {
-        let contexts = self.contexts.read();
-        format!("\n{}\n", contexts.values().join("\n"))
-    }
-}
-
-/// Used to track the lifetime of a piece of context so that it can be provided when an assertion fails.
-/// For example, in the EditorTestContext, `set_state` returns a context handle so that if an assertion fails,
-/// the state that was set initially for the failure can be printed in the error message
-pub struct ContextHandle {
-    id: usize,
-    manager: AssertionContextManager,
-}
-
-impl Drop for ContextHandle {
-    fn drop(&mut self) {
-        let mut contexts = self.manager.contexts.write();
-        contexts.remove(&self.id);
-    }
-}
diff --git a/crates/eval/.gitignore b/crates/eval/.gitignore
deleted file mode 100644
index 89fb02c122..0000000000
--- a/crates/eval/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-repos/
-worktrees/
-runs/
diff --git a/crates/eval/Cargo.toml b/crates/eval/Cargo.toml
deleted file mode 100644
index 30908be1e2..0000000000
--- a/crates/eval/Cargo.toml
+++ /dev/null
@@ -1,69 +0,0 @@
-[package]
-name = "eval"
-version = "0.1.0"
-publish.workspace = true
-edition.workspace = true
-license = "GPL-3.0-or-later"
-default-run = "eval"
-
-[lints]
-workspace = true
-
-[[bin]]
-name = "eval"
-path = "src/eval.rs"
-
-[[bin]]
-name = "explorer"
-path = "src/explorer.rs"
-
-[dependencies]
-acp_thread.workspace = true
-agent = { workspace = true, features = ["eval"] }
-agent-client-protocol.workspace = true
-agent_settings.workspace = true
-agent_ui.workspace = true
-anyhow.workspace = true
-async-trait.workspace = true
-buffer_diff.workspace = true
-chrono.workspace = true
-clap.workspace = true
-client.workspace = true
-collections.workspace = true
-debug_adapter_extension.workspace = true
-dirs.workspace = true
-dotenvy.workspace = true
-env_logger.workspace = true
-extension.workspace = true
-fs.workspace = true
-futures.workspace = true
-gpui.workspace = true
-gpui_tokio.workspace = true
-handlebars.workspace = true
-language.workspace = true
-language_extension.workspace = true
-language_model.workspace = true
-language_models.workspace = true
-languages = { workspace = true, features = ["load-grammars"] }
-markdown.workspace = true
-node_runtime.workspace = true
-pathdiff.workspace = true
-paths.workspace = true
-pretty_assertions.workspace = true
-project.workspace = true
-prompt_store.workspace = true
-regex.workspace = true
-rand.workspace = true
-release_channel.workspace = true
-reqwest_client.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-shellexpand.workspace = true
-telemetry.workspace = true
-terminal_view.workspace = true
-toml.workspace = true
-unindent.workspace = true
-util.workspace = true
-uuid.workspace = true
-watch.workspace = true
diff --git a/crates/eval/LICENSE-GPL b/crates/eval/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/eval/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/eval/README.md b/crates/eval/README.md
deleted file mode 100644
index c1543734b0..0000000000
--- a/crates/eval/README.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# Eval
-
-This eval assumes the working directory is the root of the repository. Run it with:
-
-```sh
-cargo run -p eval
-```
-
-The eval will optionally read a `.env` file in `crates/eval` if you need it to set environment variables, such as API keys.
-
-## Explorer Tool
-
-The explorer tool generates a self-contained HTML view from one or more thread
-JSON file. It provides a visual interface to explore the agent thread, including
-tool calls and results. See [./docs/explorer.md](./docs/explorer.md) for more details.
-
-### Usage
-
-```sh
-cargo run -p eval --bin explorer -- --input <path-to-json-files> --output <output-html-path>
-```
-
-Example:
-
-```sh
-cargo run -p eval --bin explorer -- --input ./runs/2025-04-23_15-53-30/fastmcp_bugifx/*/last.messages.json --output /tmp/explorer.html
-```
diff --git a/crates/eval/build.rs b/crates/eval/build.rs
deleted file mode 100644
index 9ab40da0fb..0000000000
--- a/crates/eval/build.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-fn main() {
-    let cargo_toml =
-        std::fs::read_to_string("../zed/Cargo.toml").expect("Failed to read crates/zed/Cargo.toml");
-    let version = cargo_toml
-        .lines()
-        .find(|line| line.starts_with("version = "))
-        .expect("Version not found in crates/zed/Cargo.toml")
-        .split('=')
-        .nth(1)
-        .expect("Invalid version format")
-        .trim()
-        .trim_matches('"');
-    println!("cargo:rustc-env=ZED_PKG_VERSION={}", version);
-}
diff --git a/crates/eval/docs/explorer.md b/crates/eval/docs/explorer.md
deleted file mode 100644
index 2ca3336a23..0000000000
--- a/crates/eval/docs/explorer.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# Explorer
-
-Threads Explorer is a single self-contained HTML file that gives an overview of
-evaluation runs, while allowing for some interactivity.
-
-When you open a file, it gives you a _thread overview_, which looks like this:
-
-| Turn | Text                                 | Tool                                         | Result                                        |
-| ---- | ------------------------------------ | -------------------------------------------- | --------------------------------------------- |
-| 1    | [User]:                              |                                              |                                               |
-|      | Fix the bug: kwargs not passed...    |                                              |                                               |
-| 2    | I'll help you fix that bug.          | **list_directory**(path="fastmcp")           | `fastmcp/src [...]`                           |
-|      |                                      |                                              |                                               |
-| 3    | Let's examine the code.              | **read_file**(path="fastmcp/main.py", [...]) | `def run_application(app, \*\*kwargs): [...]` |
-| 4    | I found the issue.                   | **edit_file**(path="fastmcp/core.py", [...]) | `Made edit to fastmcp/core.py`                |
-| 5    | Let's check if there are any errors. | **diagnostics**()                            | `No errors found`                             |
-
-### Implementation details
-
-`src/explorer.html` contains the template. You can open this template in a
-browser as is, and it will show some dummy values. But the main use is to set
-the `threadsData` variable with real data, which then will be used instead of
-the dummy values.
-
-`src/explorer.rs` takes one or more JSON files as generated by `cargo run -p
-eval`, and outputs an HTML file for rendering these threads. Refer dummy data
-in `explorer.html` for a sample format.
diff --git a/crates/eval/runner_settings.json b/crates/eval/runner_settings.json
deleted file mode 100644
index ea2ccb0511..0000000000
--- a/crates/eval/runner_settings.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "agent": {
-    "always_allow_tool_actions": true
-  }
-}
diff --git a/crates/eval/src/assertions.rs b/crates/eval/src/assertions.rs
deleted file mode 100644
index 01fac186d3..0000000000
--- a/crates/eval/src/assertions.rs
+++ /dev/null
@@ -1,170 +0,0 @@
-use serde::{Deserialize, Serialize};
-use std::fmt::Write;
-use std::fmt::{self};
-
-#[derive(Default, Debug, Serialize, Deserialize, Clone)]
-pub struct AssertionsReport {
-    pub ran: Vec<RanAssertion>,
-    pub max: Option<usize>,
-}
-
-#[derive(Debug, Serialize, Deserialize, Clone)]
-pub struct RanAssertion {
-    pub id: String,
-    pub result: Result<RanAssertionResult, String>,
-}
-
-#[derive(Debug, Serialize, Deserialize, Clone)]
-pub struct RanAssertionResult {
-    pub analysis: Option<String>,
-    pub passed: bool,
-}
-
-impl AssertionsReport {
-    pub fn new(max: Option<usize>) -> Self {
-        AssertionsReport {
-            ran: Vec::new(),
-            max,
-        }
-    }
-
-    pub fn error(msg: String) -> Self {
-        let assert = RanAssertion {
-            id: "no-unhandled-errors".into(),
-            result: Err(msg),
-        };
-        AssertionsReport {
-            ran: vec![assert],
-            max: Some(1),
-        }
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.ran.is_empty()
-    }
-
-    pub fn total_count(&self) -> usize {
-        self.run_count().max(self.max.unwrap_or(0))
-    }
-
-    pub fn run_count(&self) -> usize {
-        self.ran.len()
-    }
-
-    pub fn passed_count(&self) -> usize {
-        self.ran
-            .iter()
-            .filter(|a| a.result.as_ref().is_ok_and(|result| result.passed))
-            .count()
-    }
-
-    pub fn passed_percentage(&self) -> f32 {
-        if self.total_count() == 0 {
-            0.0
-        } else {
-            (self.passed_count() as f32 / self.total_count() as f32) * 100.0
-        }
-    }
-}
-
-const ROUND_WIDTH: usize = "Round".len();
-const ASSERTIONS_WIDTH: usize = 42;
-const RESULTS_WIDTH: usize = 8;
-
-pub fn print_table_header() {
-    println!(
-        "┌─{}─┬─{}─┬─{}─┐",
-        "─".repeat(ROUND_WIDTH),
-        "─".repeat(ASSERTIONS_WIDTH),
-        "─".repeat(RESULTS_WIDTH)
-    );
-
-    println!(
-        "│ {:^ROUND_WIDTH$} │ {:^ASSERTIONS_WIDTH$} │ {:^RESULTS_WIDTH$} │",
-        "Round", "Assertion", "Result"
-    );
-
-    println!(
-        "├─{}─┼─{}─┼─{}─┤",
-        "─".repeat(ROUND_WIDTH),
-        "─".repeat(ASSERTIONS_WIDTH),
-        "─".repeat(RESULTS_WIDTH)
-    )
-}
-
-pub fn display_error_row(f: &mut String, round: usize, error: String) -> fmt::Result {
-    let last_two_columns = ASSERTIONS_WIDTH + RESULTS_WIDTH;
-    writeln!(
-        f,
-        "│ {:^ROUND_WIDTH$} │ {:<last_two_columns$} |",
-        round,
-        truncate(&error, last_two_columns)
-    )
-}
-
-pub fn display_table_row(f: &mut String, round: usize, assertion: &RanAssertion) -> fmt::Result {
-    let result = match &assertion.result {
-        Ok(result) if result.passed => "\x1b[32m✔︎ Passed\x1b[0m",
-        Ok(_) => "\x1b[31m✗ Failed\x1b[0m",
-        Err(_) => "\x1b[31m💥 Judge Error\x1b[0m",
-    };
-
-    writeln!(
-        f,
-        "│ {:^ROUND_WIDTH$} │ {:<ASSERTIONS_WIDTH$} │ {:>RESULTS_WIDTH$} │",
-        round,
-        truncate(&assertion.id, ASSERTIONS_WIDTH),
-        result
-    )
-}
-
-pub fn print_table_round_summary<'a>(
-    round: &str,
-    reports: impl Iterator<Item = &'a AssertionsReport>,
-) {
-    let mut passed = 0;
-    let mut total = 0;
-    for report in reports {
-        passed += report.passed_count();
-        total += report.total_count();
-    }
-
-    println!(
-        "│ {:^ROUND_WIDTH$} │ {:<ASSERTIONS_WIDTH$} │ {:>RESULTS_WIDTH$} │",
-        round,
-        "total",
-        format!("{}%", (passed as f32 / total as f32 * 100.0).floor())
-    )
-}
-
-pub fn print_table_footer() {
-    println!(
-        "└─{}─┴─{}─┴─{}─┘",
-        "─".repeat(ROUND_WIDTH),
-        "─".repeat(ASSERTIONS_WIDTH),
-        "─".repeat(RESULTS_WIDTH)
-    )
-}
-
-pub fn print_table_divider() {
-    println!(
-        "├─{}─┼─{}─┼─{}─┤",
-        "─".repeat(ROUND_WIDTH),
-        "─".repeat(ASSERTIONS_WIDTH),
-        "─".repeat(RESULTS_WIDTH)
-    )
-}
-
-fn truncate(assertion: &str, max_width: usize) -> String {
-    let is_verbose = std::env::var("VERBOSE").is_ok_and(|v| !v.is_empty());
-
-    if assertion.len() <= max_width || is_verbose {
-        assertion.to_string()
-    } else {
-        let mut end_ix = max_width - 1;
-        while !assertion.is_char_boundary(end_ix) {
-            end_ix -= 1;
-        }
-        format!("{}…", &assertion[..end_ix])
-    }
-}
diff --git a/crates/eval/src/eval.rs b/crates/eval/src/eval.rs
deleted file mode 100644
index 80633696b7..0000000000
--- a/crates/eval/src/eval.rs
+++ /dev/null
@@ -1,740 +0,0 @@
-mod assertions;
-mod example;
-mod examples;
-mod explorer;
-mod ids;
-mod instance;
-mod tool_metrics;
-
-use assertions::{AssertionsReport, display_error_row};
-use instance::{ExampleInstance, JudgeOutput, RunOutput, run_git};
-use language_extension::LspAccess;
-pub(crate) use tool_metrics::*;
-
-use ::fs::RealFs;
-use clap::Parser;
-use client::{Client, ProxySettings, UserStore};
-use collections::{HashMap, HashSet};
-use extension::ExtensionHostProxy;
-use futures::future;
-use gpui::http_client::read_proxy_from_env;
-use gpui::{App, AppContext, Application, AsyncApp, Entity, UpdateGlobal};
-use gpui_tokio::Tokio;
-use language::LanguageRegistry;
-use language_model::{ConfiguredModel, LanguageModel, LanguageModelRegistry, SelectedModel};
-use node_runtime::{NodeBinaryOptions, NodeRuntime};
-use project::project_settings::ProjectSettings;
-use prompt_store::PromptBuilder;
-use release_channel::{AppCommitSha, AppVersion};
-use reqwest_client::ReqwestClient;
-use settings::{Settings, SettingsStore};
-use std::cell::RefCell;
-use std::collections::VecDeque;
-use std::env;
-use std::path::{Path, PathBuf};
-use std::rc::Rc;
-use std::str::FromStr;
-use std::sync::{Arc, LazyLock};
-use util::ResultExt as _;
-
-static CARGO_MANIFEST_DIR: LazyLock<PathBuf> =
-    LazyLock::new(|| PathBuf::from(env!("CARGO_MANIFEST_DIR")));
-
-#[derive(Parser, Debug)]
-#[command(name = "eval", disable_version_flag = true)]
-struct Args {
-    /// Runs all examples and threads that contain these substrings. If unspecified, all examples and threads are run.
-    #[arg(value_name = "EXAMPLE_SUBSTRING")]
-    filter: Vec<String>,
-    /// provider/model to use for agent
-    #[arg(long, default_value = "anthropic/claude-3-7-sonnet-latest")]
-    model: String,
-    /// provider/model to use for judges
-    #[arg(long, default_value = "anthropic/claude-3-7-sonnet-latest")]
-    judge_model: String,
-    #[arg(long, value_delimiter = ',', default_value = "rs,ts,py")]
-    languages: Vec<String>,
-    /// How many times to run each example.
-    #[arg(long, default_value = "8")]
-    repetitions: usize,
-    /// Maximum number of examples to run concurrently.
-    #[arg(long, default_value = "4")]
-    concurrency: usize,
-    /// Output current environment variables as JSON to stdout
-    #[arg(long, hide = true)]
-    printenv: bool,
-}
-
-fn main() {
-    let args = Args::parse();
-
-    // This prevents errors showing up in the logs, because
-    // project::environment::load_shell_environment() calls
-    // std::env::current_exe().unwrap() --printenv
-    if args.printenv {
-        util::shell_env::print_env();
-        return;
-    }
-
-    dotenvy::from_filename(CARGO_MANIFEST_DIR.join(".env")).ok();
-
-    env_logger::init();
-
-    let system_id = ids::get_or_create_id(&ids::eval_system_id_path()).ok();
-    let installation_id = ids::get_or_create_id(&ids::eval_installation_id_path()).ok();
-    let session_id = uuid::Uuid::new_v4().to_string();
-    let run_timestamp = chrono::Local::now().format("%Y-%m-%d_%H-%M-%S");
-    let run_id = match env::var("GITHUB_RUN_ID") {
-        Ok(run_id) => format!("github/{}", run_id),
-        Err(_) => format!("local/{}", run_timestamp),
-    };
-
-    let root_dir = Path::new(std::env!("CARGO_MANIFEST_DIR"))
-        .parent()
-        .unwrap()
-        .parent()
-        .unwrap()
-        .canonicalize()
-        .unwrap();
-    let eval_crate_dir = root_dir.join("crates").join("eval");
-    let repos_dir = eval_crate_dir.join("repos");
-    let worktrees_dir = eval_crate_dir.join("worktrees");
-    let examples_dir = eval_crate_dir.join("src").join("examples");
-    let run_dir = eval_crate_dir
-        .join("runs")
-        .join(format!("{}", run_timestamp));
-    std::fs::create_dir_all(&run_dir).unwrap();
-    std::fs::create_dir_all(&repos_dir).unwrap();
-    std::fs::create_dir_all(&worktrees_dir).unwrap();
-    std::fs::create_dir_all(&examples_dir).unwrap();
-    std::fs::create_dir_all(&paths::config_dir()).unwrap();
-
-    let zed_commit_sha = commit_sha_for_path(&root_dir);
-    let zed_branch_name = git_branch_for_path(&root_dir);
-    let languages: HashSet<String> = args.languages.into_iter().collect();
-
-    let http_client = Arc::new(ReqwestClient::new());
-    let app = Application::headless().with_http_client(http_client);
-    let all_threads = examples::all(&examples_dir);
-
-    app.run(move |cx| {
-        let app_state = init(cx);
-
-        let telemetry = app_state.client.telemetry();
-        telemetry.start(system_id, installation_id, session_id, cx);
-
-        let enable_telemetry = env::var("ZED_EVAL_TELEMETRY").is_ok_and(|value| value == "1")
-            && telemetry.has_checksum_seed();
-        if enable_telemetry {
-            println!("Telemetry enabled");
-            telemetry::event!(
-                "Agent Eval Started",
-                zed_commit_sha = zed_commit_sha,
-                zed_branch_name = zed_branch_name,
-                run_id = run_id,
-            );
-        }
-
-        let mut cumulative_tool_metrics = ToolMetrics::default();
-
-        let tasks = LanguageModelRegistry::global(cx).update(cx, |registry, cx| {
-            registry.providers().iter().map(|p| p.authenticate(cx)).collect::<Vec<_>>()
-        });
-
-        cx.spawn(async move |cx| {
-            future::join_all(tasks).await;
-            let judge_model = cx.update(|cx| {
-                let agent_model = load_model(&args.model, cx).unwrap();
-                let judge_model = load_model(&args.judge_model, cx).unwrap();
-                LanguageModelRegistry::global(cx).update(cx, |registry, cx| {
-                    registry.set_default_model(Some(agent_model.clone()), cx);
-                });
-                judge_model
-            })?;
-
-            let mut examples = Vec::new();
-
-            const COLORS: [&str; 12] = [
-                "\x1b[31m", // Red
-                "\x1b[32m", // Green
-                "\x1b[33m", // Yellow
-                "\x1b[34m", // Blue
-                "\x1b[35m", // Magenta
-                "\x1b[36m", // Cyan
-                "\x1b[91m", // Bright Red
-                "\x1b[92m", // Bright Green
-                "\x1b[93m", // Bright Yellow
-                "\x1b[94m", // Bright Blue
-                "\x1b[95m", // Bright Magenta
-                "\x1b[96m", // Bright Cyan
-            ];
-
-            let mut skipped = Vec::new();
-
-            for thread in all_threads {
-                let meta = thread.meta();
-                if !args.filter.is_empty() && !args.filter.iter().any(|sub| meta.name.contains(sub))
-                {
-                    skipped.push(meta.name);
-                    continue;
-                }
-
-                if let Some(language) = meta.language_server
-                    && !languages.contains(&language.file_extension) {
-                        panic!(
-                            "Eval for {:?} could not be run because no language server was found for extension {:?}",
-                            meta.name,
-                            language.file_extension
-                        );
-                    }
-
-                // TODO: This creates a worktree per repetition. Ideally these examples should
-                // either be run sequentially on the same worktree, or reuse worktrees when there
-                // are more examples to run than the concurrency limit.
-                for repetition_number in 0..args.repetitions {
-                    let example_instance = ExampleInstance::new(
-                        thread.clone(),
-                        &repos_dir,
-                        &run_dir,
-                        &worktrees_dir,
-                        repetition_number,
-                    );
-
-                    examples.push(example_instance);
-                }
-            }
-
-            if !skipped.is_empty() {
-                println!("Skipped threads: {}", skipped.join(", "));
-            }
-
-            if examples.is_empty() {
-                eprintln!("Filter matched no examples");
-                return cx.update(|cx| cx.quit());
-            }
-
-            let mut repo_urls = HashSet::default();
-            let mut clone_tasks = Vec::new();
-
-            let max_name_width = examples
-                .iter()
-                .map(|e| e.worktree_name().len())
-                .max()
-                .unwrap_or(0);
-
-            for (i, example_instance) in examples.iter_mut().enumerate() {
-                let color = COLORS[i % COLORS.len()].to_string();
-                example_instance.set_log_prefix_style(&color, max_name_width);
-
-                println!(
-                    "{}Logging to: {}",
-                    example_instance.log_prefix,
-                    example_instance.run_directory.display()
-                );
-
-                let repo_url = example_instance.repo_url();
-                if repo_urls.insert(repo_url.clone()) {
-                    let repo_path = example_instance.repo_path.clone();
-
-                    if !repo_path.join(".git").is_dir() {
-                        println!(
-                            "{:<width$} < {}",
-                            "↓ Cloning",
-                            repo_url,
-                            width = max_name_width
-                        );
-
-                        let git_task = cx.spawn(async move |_cx| {
-                            std::fs::create_dir_all(&repo_path)?;
-                            run_git(&repo_path, &["init"]).await?;
-                            run_git(&repo_path, &["remote", "add", "origin", &repo_url]).await
-                        });
-
-                        clone_tasks.push(git_task);
-                    } else {
-                        println!(
-                            "{:<width$}  < {}",
-                            "✔︎ Already cloned",
-                            repo_url,
-                            width = max_name_width
-                        );
-
-                        let actual_origin =
-                            run_git(&repo_path, &["remote", "get-url", "origin"]).await?;
-                        anyhow::ensure!(
-                            actual_origin == repo_url,
-                            "remote origin {actual_origin} does not match expected origin {repo_url}"
-                        );
-                    }
-                }
-            }
-
-            future::join_all(clone_tasks).await;
-
-            for example_instance in examples.iter_mut() {
-                example_instance.fetch().await?;
-            }
-
-            let examples = Rc::new(RefCell::new(VecDeque::from(examples)));
-            let results_by_example_name = Rc::new(RefCell::new(HashMap::default()));
-
-            future::join_all((0..args.concurrency).map(|_| {
-                let app_state = app_state.clone();
-                let judge_model = judge_model.model.clone();
-                let zed_commit_sha = zed_commit_sha.clone();
-                let zed_branch_name = zed_branch_name.clone();
-                let run_id = run_id.clone();
-                let examples = examples.clone();
-                let results = results_by_example_name.clone();
-                cx.spawn(async move |cx| {
-                    loop {
-                        let Some(mut example) = examples.borrow_mut().pop_front() else {
-                            break;
-                        };
-                        let result = async {
-                            example.setup().await?;
-                            let run_output = cx
-                                .update(|cx| example.run(app_state.clone(), cx))?
-                                .await?;
-                            let judge_output = judge_example(
-                                example.clone(),
-                                judge_model.clone(),
-                                &zed_commit_sha,
-                                &zed_branch_name,
-                                &run_id,
-                                &run_output,
-                                enable_telemetry,
-                                cx,
-                            )
-                            .await;
-                            anyhow::Ok((run_output, judge_output))
-                        }
-                        .await;
-                        results
-                            .borrow_mut()
-                            .entry(example.name.clone())
-                            .or_insert(Vec::new())
-                            .push((example.clone(), result));
-                    }
-                })
-            }))
-            .await;
-
-            print_report(
-                &mut results_by_example_name.borrow_mut(),
-                &mut cumulative_tool_metrics,
-                &run_dir,
-            )?;
-
-            app_state.client.telemetry().flush_events().await;
-
-            cx.update(|cx| cx.quit())
-        })
-        .detach_and_log_err(cx);
-    });
-}
-
-/// Subset of `workspace::AppState` needed by `HeadlessAssistant`, with additional fields.
-pub struct AgentAppState {
-    pub languages: Arc<LanguageRegistry>,
-    pub client: Arc<Client>,
-    pub user_store: Entity<UserStore>,
-    pub fs: Arc<dyn fs::Fs>,
-    pub node_runtime: NodeRuntime,
-
-    // Additional fields not present in `workspace::AppState`.
-    pub prompt_builder: Arc<PromptBuilder>,
-}
-
-pub fn init(cx: &mut App) -> Arc<AgentAppState> {
-    let app_commit_sha = option_env!("ZED_COMMIT_SHA").map(|s| AppCommitSha::new(s.to_owned()));
-
-    let app_version = AppVersion::load(
-        env!("ZED_PKG_VERSION"),
-        option_env!("ZED_BUILD_ID"),
-        app_commit_sha,
-    );
-
-    release_channel::init(app_version.clone(), cx);
-    gpui_tokio::init(cx);
-
-    let settings_store = SettingsStore::new(cx, &settings::default_settings());
-    cx.set_global(settings_store);
-
-    // Set User-Agent so we can download language servers from GitHub
-    let user_agent = format!(
-        "Zed Agent Eval/{} ({}; {})",
-        app_version,
-        std::env::consts::OS,
-        std::env::consts::ARCH
-    );
-    let proxy_str = ProxySettings::get_global(cx).proxy.to_owned();
-    let proxy_url = proxy_str
-        .as_ref()
-        .and_then(|input| input.parse().ok())
-        .or_else(read_proxy_from_env);
-    let http = {
-        let _guard = Tokio::handle(cx).enter();
-
-        ReqwestClient::proxy_and_user_agent(proxy_url, &user_agent)
-            .expect("could not start HTTP client")
-    };
-    cx.set_http_client(Arc::new(http));
-
-    let client = Client::production(cx);
-    cx.set_http_client(client.http_client());
-
-    let git_binary_path = None;
-    let fs = Arc::new(RealFs::new(
-        git_binary_path,
-        cx.background_executor().clone(),
-    ));
-
-    let mut languages = LanguageRegistry::new(cx.background_executor().clone());
-    languages.set_language_server_download_dir(paths::languages_dir().clone());
-    let languages = Arc::new(languages);
-
-    let user_store = cx.new(|cx| UserStore::new(client.clone(), cx));
-
-    extension::init(cx);
-
-    let (mut tx, rx) = watch::channel(None);
-    cx.observe_global::<SettingsStore>(move |cx| {
-        let settings = &ProjectSettings::get_global(cx).node;
-        let options = NodeBinaryOptions {
-            allow_path_lookup: !settings.ignore_system_version,
-            allow_binary_download: true,
-            use_paths: settings.path.as_ref().map(|node_path| {
-                let node_path = PathBuf::from(shellexpand::tilde(node_path).as_ref());
-                let npm_path = settings
-                    .npm_path
-                    .as_ref()
-                    .map(|path| PathBuf::from(shellexpand::tilde(&path).as_ref()));
-                (
-                    node_path.clone(),
-                    npm_path.unwrap_or_else(|| {
-                        let base_path = PathBuf::new();
-                        node_path.parent().unwrap_or(&base_path).join("npm")
-                    }),
-                )
-            }),
-        };
-        tx.send(Some(options)).log_err();
-    })
-    .detach();
-    let node_runtime = NodeRuntime::new(client.http_client(), None, rx);
-
-    let extension_host_proxy = ExtensionHostProxy::global(cx);
-    debug_adapter_extension::init(extension_host_proxy.clone(), cx);
-    language_extension::init(LspAccess::Noop, extension_host_proxy, languages.clone());
-    language_model::init(client.clone(), cx);
-    language_models::init(user_store.clone(), client.clone(), cx);
-    languages::init(languages.clone(), fs.clone(), node_runtime.clone(), cx);
-    prompt_store::init(cx);
-    terminal_view::init(cx);
-    let stdout_is_a_pty = false;
-    let prompt_builder = PromptBuilder::load(fs.clone(), stdout_is_a_pty, cx);
-    agent_ui::init(
-        fs.clone(),
-        client.clone(),
-        prompt_builder.clone(),
-        languages.clone(),
-        true,
-        cx,
-    );
-
-    SettingsStore::update_global(cx, |store, cx| {
-        store.set_user_settings(include_str!("../runner_settings.json"), cx)
-    })
-    .unwrap();
-
-    Arc::new(AgentAppState {
-        languages,
-        client,
-        user_store,
-        fs,
-        node_runtime,
-        prompt_builder,
-    })
-}
-
-pub fn find_model(
-    model_name: &str,
-    model_registry: &LanguageModelRegistry,
-    cx: &App,
-) -> anyhow::Result<Arc<dyn LanguageModel>> {
-    let selected = SelectedModel::from_str(model_name).map_err(|e| anyhow::anyhow!(e))?;
-    model_registry
-        .available_models(cx)
-        .find(|model| model.id() == selected.model && model.provider_id() == selected.provider)
-        .ok_or_else(|| {
-            anyhow::anyhow!(
-                "No language model with ID {}/{} was available. Available models: {}",
-                selected.provider.0,
-                selected.model.0,
-                model_registry
-                    .available_models(cx)
-                    .map(|model| format!("{}/{}", model.provider_id().0, model.id().0))
-                    .collect::<Vec<_>>()
-                    .join(", ")
-            )
-        })
-}
-
-pub fn load_model(model_name: &str, cx: &mut App) -> anyhow::Result<ConfiguredModel> {
-    let model = {
-        let model_registry = LanguageModelRegistry::read_global(cx);
-        find_model(model_name, model_registry, cx)?
-    };
-
-    let provider = {
-        let model_registry = LanguageModelRegistry::read_global(cx);
-        model_registry
-            .provider(&model.provider_id())
-            .ok_or_else(|| anyhow::anyhow!("Provider not found: {}", model.provider_id()))?
-    };
-
-    Ok(ConfiguredModel {
-        provider: provider.clone(),
-        model: model.clone(),
-    })
-}
-
-pub fn commit_sha_for_path(repo_path: &Path) -> String {
-    futures::executor::block_on(run_git(repo_path, &["rev-parse", "HEAD"])).unwrap()
-}
-
-pub fn git_branch_for_path(repo_path: &Path) -> String {
-    match std::env::var("GITHUB_REF_NAME") {
-        Ok(branch) => branch,
-        Err(_) => {
-            futures::executor::block_on(run_git(repo_path, &["rev-parse", "--abbrev-ref", "HEAD"]))
-                .unwrap_or_else(|_| "unknown".to_string())
-        }
-    }
-}
-
-async fn judge_example(
-    example: ExampleInstance,
-    model: Arc<dyn LanguageModel>,
-    zed_commit_sha: &str,
-    zed_branch_name: &str,
-    run_id: &str,
-    run_output: &RunOutput,
-    enable_telemetry: bool,
-    cx: &AsyncApp,
-) -> JudgeOutput {
-    let judge_output = example.judge(model.clone(), run_output, cx).await;
-
-    if enable_telemetry {
-        telemetry::event!(
-            "Agent Example Evaluated",
-            zed_commit_sha = zed_commit_sha,
-            zed_branch_name = zed_branch_name,
-            run_id = run_id,
-            example_name = example.name.clone(),
-            example_repetition = example.repetition,
-            diff_evaluation = judge_output.diff.clone(),
-            thread_evaluation = judge_output.thread,
-            tool_metrics = run_output.tool_metrics,
-            token_usage = run_output.token_usage,
-            model = model.telemetry_id(),
-            model_provider = model.provider_id().to_string(),
-            repository_url = example.repo_url(),
-            repository_revision = example.revision(),
-            diagnostic_summary_before = run_output.diagnostic_summary_before,
-            diagnostic_summary_after = run_output.diagnostic_summary_after,
-            diagnostics_before = run_output.diagnostics_before,
-            diagnostics_after = run_output.diagnostics_after,
-        );
-    }
-
-    judge_output
-}
-
-const HEADER_WIDTH: usize = 65;
-
-fn print_h1(header: &str) {
-    println!("\n\n{:=^HEADER_WIDTH$}", "");
-    println!("{:^HEADER_WIDTH$}", header);
-    println!("{:=^HEADER_WIDTH$}\n", "");
-}
-
-fn print_h2(header: &str) {
-    println!("\n{:-^HEADER_WIDTH$}", "");
-    println!("{:^HEADER_WIDTH$}", header);
-    println!("{:-^HEADER_WIDTH$}\n", "");
-}
-
-fn print_report(
-    results_by_example_name: &mut HashMap<
-        String,
-        Vec<(ExampleInstance, anyhow::Result<(RunOutput, JudgeOutput)>)>,
-    >,
-    cumulative_tool_metrics: &mut ToolMetrics,
-    run_dir: &Path,
-) -> anyhow::Result<()> {
-    print_h1("EVAL RESULTS");
-
-    let mut diff_scores = Vec::new();
-    let mut thread_scores = Vec::new();
-    let mut programmatic_scores = Vec::new();
-    let mut error_count = 0;
-
-    for (example_name, results) in results_by_example_name.iter_mut() {
-        print_h2(example_name);
-
-        results.sort_unstable_by_key(|(example, _)| example.repetition);
-        let mut example_cumulative_tool_metrics = ToolMetrics::default();
-
-        let mut table_rows = String::new();
-
-        for (example, result) in results.iter() {
-            match result {
-                Err(err) => {
-                    display_error_row(&mut table_rows, example.repetition, err.to_string())?;
-                    error_count += 1;
-                    programmatic_scores.push(0.0);
-                    diff_scores.push(0.0);
-                    thread_scores.push(0.0);
-                }
-                Ok((run_output, judge_output)) => {
-                    cumulative_tool_metrics.merge(&run_output.tool_metrics);
-                    example_cumulative_tool_metrics.merge(&run_output.tool_metrics);
-
-                    if run_output.programmatic_assertions.total_count() > 0 {
-                        for assertion in &run_output.programmatic_assertions.ran {
-                            assertions::display_table_row(
-                                &mut table_rows,
-                                example.repetition,
-                                assertion,
-                            )?;
-                        }
-
-                        programmatic_scores
-                            .push(run_output.programmatic_assertions.passed_percentage())
-                    }
-
-                    if !judge_output.diff.is_empty() {
-                        diff_scores.push(judge_output.diff.passed_percentage());
-
-                        for assertion in &judge_output.diff.ran {
-                            assertions::display_table_row(
-                                &mut table_rows,
-                                example.repetition,
-                                assertion,
-                            )?;
-                        }
-                    }
-
-                    if !judge_output.thread.is_empty() {
-                        thread_scores.push(judge_output.thread.passed_percentage());
-
-                        for assertion in &judge_output.thread.ran {
-                            assertions::display_table_row(
-                                &mut table_rows,
-                                example.repetition,
-                                assertion,
-                            )?;
-                        }
-                    }
-                }
-            }
-        }
-
-        let mut all_asserts = Vec::new();
-
-        if !table_rows.is_empty() {
-            assertions::print_table_header();
-            print!("{}", table_rows);
-
-            assertions::print_table_divider();
-
-            for (example, result) in results.iter() {
-                if let Ok((run_output, judge_output)) = result {
-                    let asserts = [
-                        run_output.programmatic_assertions.clone(),
-                        judge_output.diff.clone(),
-                        judge_output.thread.clone(),
-                    ];
-                    all_asserts.extend_from_slice(&asserts);
-                    assertions::print_table_round_summary(
-                        &example.repetition.to_string(),
-                        asserts.iter(),
-                    )
-                } else if let Err(err) = result {
-                    let assert = AssertionsReport::error(err.to_string());
-                    all_asserts.push(assert.clone());
-                    assertions::print_table_round_summary(
-                        &example.repetition.to_string(),
-                        [assert].iter(),
-                    )
-                }
-            }
-
-            assertions::print_table_divider();
-
-            assertions::print_table_round_summary("avg", all_asserts.iter());
-
-            assertions::print_table_footer();
-        }
-
-        if !example_cumulative_tool_metrics.is_empty() {
-            println!("{}", &example_cumulative_tool_metrics);
-        }
-    }
-
-    if results_by_example_name.len() > 1 {
-        print_h1("AGGREGATE");
-
-        if error_count > 0 {
-            println!("\n{error_count} examples failed to run!");
-        }
-
-        let programmatic_score_count = programmatic_scores.len();
-        if programmatic_score_count > 0 {
-            let average_programmatic_score = (programmatic_scores.into_iter().sum::<f32>()
-                / (programmatic_score_count as f32))
-                .floor();
-            println!("Average programmatic score: {average_programmatic_score}%");
-        }
-
-        let diff_score_count = diff_scores.len();
-        if diff_score_count > 0 {
-            let average_diff_score =
-                (diff_scores.into_iter().sum::<f32>() / (diff_score_count as f32)).floor();
-            println!("Average diff score: {average_diff_score}%");
-        }
-
-        let thread_score_count = thread_scores.len();
-
-        if thread_score_count > 0 {
-            let average_thread_score =
-                (thread_scores.into_iter().sum::<f32>() / (thread_score_count as f32)).floor();
-            println!("Average thread score: {average_thread_score}%");
-        }
-
-        println!();
-
-        print_h2("CUMULATIVE TOOL METRICS");
-        println!("{}", cumulative_tool_metrics);
-    }
-
-    let explorer_output_path = run_dir.join("overview.html");
-    let mut json_paths: Vec<PathBuf> = results_by_example_name
-        .values()
-        .flat_map(|results| {
-            results.iter().map(|(example, _)| {
-                let absolute_path = run_dir.join(example.run_directory.join("last.messages.json"));
-                let cwd = std::env::current_dir().expect("Can't get current dir");
-                pathdiff::diff_paths(&absolute_path, cwd).unwrap_or_else(|| absolute_path.clone())
-            })
-        })
-        .collect::<Vec<_>>();
-    json_paths.sort();
-    if let Err(err) = explorer::generate_explorer_html(&json_paths, &explorer_output_path) {
-        eprintln!("Failed to generate explorer HTML: {}", err);
-    }
-
-    Ok(())
-}
diff --git a/crates/eval/src/example.rs b/crates/eval/src/example.rs
deleted file mode 100644
index c4d076037f..0000000000
--- a/crates/eval/src/example.rs
+++ /dev/null
@@ -1,559 +0,0 @@
-use std::{
-    error::Error,
-    fmt::{self, Debug},
-    sync::{Arc, Mutex},
-    time::Duration,
-    u32,
-};
-
-use crate::{
-    ToolMetrics,
-    assertions::{AssertionsReport, RanAssertion, RanAssertionResult},
-};
-use acp_thread::UserMessageId;
-use agent::{Thread, ThreadEvent, UserMessageContent};
-use agent_client_protocol as acp;
-use agent_settings::AgentProfileId;
-use anyhow::{Result, anyhow};
-use async_trait::async_trait;
-use buffer_diff::DiffHunkStatus;
-use collections::HashMap;
-use futures::{FutureExt as _, StreamExt, select_biased};
-use gpui::{App, AppContext, AsyncApp, Entity};
-use language_model::Role;
-use util::rel_path::RelPath;
-
-pub const THREAD_EVENT_TIMEOUT: Duration = Duration::from_secs(60 * 2);
-
-#[async_trait(?Send)]
-pub trait Example {
-    fn meta(&self) -> ExampleMetadata;
-    async fn conversation(&self, cx: &mut ExampleContext) -> Result<()>;
-    fn diff_assertions(&self) -> Vec<JudgeAssertion> {
-        Vec::new()
-    }
-    fn thread_assertions(&self) -> Vec<JudgeAssertion> {
-        Vec::new()
-    }
-}
-
-#[derive(Clone, Debug)]
-pub struct JudgeAssertion {
-    pub id: String,
-    pub description: String,
-}
-
-#[derive(Clone, Debug)]
-pub struct ExampleMetadata {
-    pub name: String,
-    pub url: String,
-    pub revision: String,
-    pub language_server: Option<LanguageServer>,
-    pub max_assertions: Option<usize>,
-    pub profile_id: AgentProfileId,
-    pub existing_thread_json: Option<String>,
-    pub max_turns: Option<u32>,
-}
-
-#[derive(Clone, Debug)]
-pub struct LanguageServer {
-    pub file_extension: String,
-    pub allow_preexisting_diagnostics: bool,
-}
-
-impl ExampleMetadata {
-    pub fn repo_name(&self) -> String {
-        self.url
-            .split('/')
-            .next_back()
-            .unwrap_or("")
-            .trim_end_matches(".git")
-            .into()
-    }
-}
-
-pub struct FailedAssertion(pub String);
-
-impl fmt::Debug for FailedAssertion {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "Assertion failure: {}", self.0)
-    }
-}
-
-impl fmt::Display for FailedAssertion {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
-impl Error for FailedAssertion {}
-
-pub struct ExampleContext {
-    meta: ExampleMetadata,
-    log_prefix: String,
-    agent_thread: Entity<agent::Thread>,
-    app: AsyncApp,
-    pub assertions: AssertionsReport,
-    pub tool_metrics: Arc<Mutex<ToolMetrics>>,
-}
-
-impl ExampleContext {
-    pub fn new(
-        meta: ExampleMetadata,
-        log_prefix: String,
-        agent_thread: Entity<Thread>,
-        app: AsyncApp,
-    ) -> Self {
-        let assertions = AssertionsReport::new(meta.max_assertions);
-
-        Self {
-            meta,
-            log_prefix,
-            agent_thread,
-            assertions,
-            app,
-            tool_metrics: Arc::new(Mutex::new(ToolMetrics::default())),
-        }
-    }
-
-    pub fn assert(&mut self, expected: bool, message: impl ToString) -> Result<()> {
-        let message = message.to_string();
-        self.log_assertion(
-            if expected {
-                Ok(())
-            } else {
-                Err(anyhow::Error::from(FailedAssertion(message.clone())))
-            },
-            message,
-        )
-    }
-
-    pub fn assert_some<T>(&mut self, option: Option<T>, message: impl ToString) -> Result<T> {
-        let message = message.to_string();
-        self.log_assertion(
-            match option {
-                Some(value) => Ok(value),
-                None => Err(anyhow::Error::from(FailedAssertion(message.clone()))),
-            },
-            message,
-        )
-    }
-
-    #[allow(dead_code)]
-    pub fn assert_eq<T: PartialEq + Debug>(
-        &mut self,
-        left: T,
-        right: T,
-        message: impl ToString,
-    ) -> Result<()> {
-        let message = message.to_string();
-        self.log_assertion(
-            if left == right {
-                Ok(())
-            } else {
-                println!(
-                    "{}{}",
-                    self.log_prefix,
-                    pretty_assertions::Comparison::new(&left, &right)
-                );
-                Err(anyhow::Error::from(FailedAssertion(message.clone())))
-            },
-            message,
-        )
-    }
-
-    fn log_assertion<T>(&mut self, result: Result<T>, message: String) -> Result<T> {
-        if let Some(max) = self.meta.max_assertions {
-            anyhow::ensure!(
-                self.assertions.run_count() <= max,
-                "More assertions were run than the stated max_assertions of {max}"
-            );
-        }
-
-        self.assertions.ran.push(RanAssertion {
-            id: message.clone(),
-            result: Ok(RanAssertionResult {
-                analysis: None,
-                passed: result.is_ok(),
-            }),
-        });
-
-        if result.is_ok() {
-            println!("{}✅ {}", self.log_prefix, message);
-        } else {
-            println!("{}❌ {}", self.log_prefix, message);
-        }
-
-        result
-    }
-
-    pub async fn prompt(&mut self, prompt: impl Into<String>) -> Result<Response> {
-        self.prompt_with_max_turns(prompt, u32::MAX).await
-    }
-
-    pub async fn prompt_with_max_turns(
-        &mut self,
-        prompt: impl Into<String>,
-        max_turns: u32,
-    ) -> Result<Response> {
-        let content = vec![UserMessageContent::Text(prompt.into())];
-        self.run_turns(Some(content), max_turns).await
-    }
-
-    pub async fn proceed_with_max_turns(&mut self, max_turns: u32) -> Result<Response> {
-        self.run_turns(None, max_turns).await
-    }
-
-    async fn run_turns(
-        &mut self,
-        prompt: Option<Vec<UserMessageContent>>,
-        max_turns: u32,
-    ) -> Result<Response> {
-        let tool_metrics = self.tool_metrics.clone();
-        let log_prefix = self.log_prefix.clone();
-
-        let mut remaining_turns = max_turns;
-
-        let mut event_stream = self.agent_thread.update(&mut self.app, |thread, cx| {
-            if let Some(prompt) = prompt {
-                let id = UserMessageId::new();
-                thread.send(id, prompt, cx)
-            } else {
-                thread.proceed(cx)
-            }
-        })??;
-
-        let task = self.app.background_spawn(async move {
-            let mut messages = Vec::new();
-            let mut tool_uses_by_id = HashMap::default();
-            while let Some(event) = event_stream.next().await {
-                match event? {
-                    ThreadEvent::UserMessage(user_message) => {
-                        messages.push(Message {
-                            role: Role::User,
-                            text: user_message.to_markdown(),
-                            tool_use: Vec::new(),
-                        });
-                    }
-                    ThreadEvent::AgentThinking(text) | ThreadEvent::AgentText(text) => {
-                        if matches!(
-                            messages.last(),
-                            Some(Message {
-                                role: Role::Assistant,
-                                ..
-                            })
-                        ) {
-                            messages.last_mut().unwrap().text.push_str(&text);
-                        } else {
-                            messages.push(Message {
-                                role: Role::Assistant,
-                                text,
-                                tool_use: Vec::new(),
-                            });
-                        }
-                    }
-                    ThreadEvent::ToolCall(tool_call) => {
-                        let meta = tool_call.meta.expect("Missing meta field in tool_call");
-                        let tool_name = meta
-                            .get("tool_name")
-                            .expect("Missing tool_name field in meta")
-                            .as_str()
-                            .expect("Unknown tool_name content in meta");
-
-                        tool_uses_by_id.insert(
-                            tool_call.tool_call_id,
-                            ToolUse {
-                                name: tool_name.to_string(),
-                                value: tool_call.raw_input.unwrap_or_default(),
-                            },
-                        );
-                        if matches!(
-                            tool_call.status,
-                            acp::ToolCallStatus::Completed | acp::ToolCallStatus::Failed
-                        ) {
-                            panic!("Tool call completed without update");
-                        }
-                    }
-                    ThreadEvent::ToolCallUpdate(tool_call_update) => {
-                        if let acp_thread::ToolCallUpdate::UpdateFields(update) = tool_call_update {
-                            if let Some(raw_input) = update.fields.raw_input {
-                                if let Some(tool_use) =
-                                    tool_uses_by_id.get_mut(&update.tool_call_id)
-                                {
-                                    tool_use.value = raw_input;
-                                }
-                            }
-
-                            if matches!(
-                                update.fields.status,
-                                Some(acp::ToolCallStatus::Completed | acp::ToolCallStatus::Failed)
-                            ) {
-                                let succeeded =
-                                    update.fields.status == Some(acp::ToolCallStatus::Completed);
-
-                                let tool_use = tool_uses_by_id
-                                    .remove(&update.tool_call_id)
-                                    .expect("Unrecognized tool call completed");
-
-                                let log_message = if succeeded {
-                                    format!("✔︎ {}", tool_use.name)
-                                } else {
-                                    format!("✖︎ {}", tool_use.name)
-                                };
-                                println!("{log_prefix}{log_message}");
-
-                                tool_metrics
-                                    .lock()
-                                    .unwrap()
-                                    .insert(tool_use.name.clone().into(), succeeded);
-
-                                if let Some(message) = messages.last_mut() {
-                                    message.tool_use.push(tool_use);
-                                } else {
-                                    messages.push(Message {
-                                        role: Role::Assistant,
-                                        text: "".to_string(),
-                                        tool_use: vec![tool_use],
-                                    });
-                                }
-
-                                remaining_turns -= 1;
-                                if remaining_turns == 0 {
-                                    return Ok(messages);
-                                }
-                            }
-                        }
-                    }
-                    ThreadEvent::ToolCallAuthorization(_) => panic!(
-                        "{}Bug: Tool confirmation should not be required in eval",
-                        log_prefix
-                    ),
-                    ThreadEvent::Retry(status) => {
-                        println!("{log_prefix} Got retry: {status:?}");
-                    }
-                    ThreadEvent::Stop(stop_reason) => match stop_reason {
-                        acp::StopReason::EndTurn => {}
-                        acp::StopReason::MaxTokens => {
-                            return Err(anyhow!("Exceeded maximum tokens"));
-                        }
-                        acp::StopReason::MaxTurnRequests => {
-                            return Err(anyhow!("Exceeded maximum turn requests"));
-                        }
-                        stop_reason => return Err(anyhow!("{stop_reason:?}")),
-                    },
-                }
-            }
-            Ok(messages)
-        });
-
-        select_biased! {
-            result = task.fuse() => {
-                Ok(Response::new(result?))
-            }
-            _ = self.app.background_executor().timer(THREAD_EVENT_TIMEOUT).fuse() => {
-                anyhow::bail!("Agentic loop stalled - waited {THREAD_EVENT_TIMEOUT:?} without any events");
-            }
-        }
-    }
-
-    pub fn edits(&self) -> HashMap<Arc<RelPath>, FileEdits> {
-        self.agent_thread
-            .read_with(&self.app, |thread, cx| {
-                let action_log = thread.action_log().read(cx);
-                HashMap::from_iter(action_log.changed_buffers(cx).into_iter().map(
-                    |(buffer, diff)| {
-                        let snapshot = buffer.read(cx).snapshot();
-
-                        let file = snapshot.file().unwrap();
-                        let diff = diff.read(cx);
-                        let base_text = diff.base_text().text();
-
-                        let hunks = diff
-                            .hunks(&snapshot, cx)
-                            .map(|hunk| FileEditHunk {
-                                base_text: base_text[hunk.diff_base_byte_range.clone()].to_string(),
-                                text: snapshot
-                                    .text_for_range(hunk.range.clone())
-                                    .collect::<String>(),
-                                status: hunk.status(),
-                            })
-                            .collect();
-
-                        (file.path().clone(), FileEdits { hunks })
-                    },
-                ))
-            })
-            .unwrap()
-    }
-
-    pub fn agent_thread(&self) -> Entity<Thread> {
-        self.agent_thread.clone()
-    }
-}
-
-impl AppContext for ExampleContext {
-    type Result<T> = anyhow::Result<T>;
-
-    fn new<T: 'static>(
-        &mut self,
-        build_entity: impl FnOnce(&mut gpui::Context<T>) -> T,
-    ) -> Self::Result<Entity<T>> {
-        self.app.new(build_entity)
-    }
-
-    fn reserve_entity<T: 'static>(&mut self) -> Self::Result<gpui::Reservation<T>> {
-        self.app.reserve_entity()
-    }
-
-    fn insert_entity<T: 'static>(
-        &mut self,
-        reservation: gpui::Reservation<T>,
-        build_entity: impl FnOnce(&mut gpui::Context<T>) -> T,
-    ) -> Self::Result<Entity<T>> {
-        self.app.insert_entity(reservation, build_entity)
-    }
-
-    fn update_entity<T, R>(
-        &mut self,
-        handle: &Entity<T>,
-        update: impl FnOnce(&mut T, &mut gpui::Context<T>) -> R,
-    ) -> Self::Result<R>
-    where
-        T: 'static,
-    {
-        self.app.update_entity(handle, update)
-    }
-
-    fn as_mut<'a, T>(&'a mut self, handle: &Entity<T>) -> Self::Result<gpui::GpuiBorrow<'a, T>>
-    where
-        T: 'static,
-    {
-        self.app.as_mut(handle)
-    }
-
-    fn read_entity<T, R>(
-        &self,
-        handle: &Entity<T>,
-        read: impl FnOnce(&T, &App) -> R,
-    ) -> Self::Result<R>
-    where
-        T: 'static,
-    {
-        self.app.read_entity(handle, read)
-    }
-
-    fn update_window<T, F>(&mut self, window: gpui::AnyWindowHandle, f: F) -> Result<T>
-    where
-        F: FnOnce(gpui::AnyView, &mut gpui::Window, &mut App) -> T,
-    {
-        self.app.update_window(window, f)
-    }
-
-    fn read_window<T, R>(
-        &self,
-        window: &gpui::WindowHandle<T>,
-        read: impl FnOnce(Entity<T>, &App) -> R,
-    ) -> Result<R>
-    where
-        T: 'static,
-    {
-        self.app.read_window(window, read)
-    }
-
-    fn background_spawn<R>(
-        &self,
-        future: impl std::future::Future<Output = R> + Send + 'static,
-    ) -> gpui::Task<R>
-    where
-        R: Send + 'static,
-    {
-        self.app.background_spawn(future)
-    }
-
-    fn read_global<G, R>(&self, callback: impl FnOnce(&G, &App) -> R) -> Self::Result<R>
-    where
-        G: gpui::Global,
-    {
-        self.app.read_global(callback)
-    }
-}
-
-#[derive(Debug)]
-pub struct Response {
-    messages: Vec<Message>,
-}
-
-impl Response {
-    pub fn new(messages: Vec<Message>) -> Self {
-        Self { messages }
-    }
-
-    pub fn expect_tool_call(
-        &self,
-        tool_name: &'static str,
-        cx: &mut ExampleContext,
-    ) -> Result<&ToolUse> {
-        let result = self.find_tool_call(tool_name);
-        cx.assert_some(result, format!("called `{}`", tool_name))
-    }
-
-    pub fn find_tool_call(&self, tool_name: &str) -> Option<&ToolUse> {
-        self.messages.iter().rev().find_map(|msg| {
-            msg.tool_use
-                .iter()
-                .find(|tool_use| tool_use.name == tool_name)
-        })
-    }
-
-    pub fn tool_calls(&self) -> impl Iterator<Item = &ToolUse> {
-        self.messages.iter().flat_map(|msg| &msg.tool_use)
-    }
-
-    pub fn texts(&self) -> impl Iterator<Item = String> {
-        self.messages.iter().map(|message| message.text.clone())
-    }
-}
-
-#[derive(Debug)]
-pub struct Message {
-    role: Role,
-    text: String,
-    tool_use: Vec<ToolUse>,
-}
-
-#[derive(Debug)]
-pub struct ToolUse {
-    pub name: String,
-    value: serde_json::Value,
-}
-
-impl ToolUse {
-    pub fn parse_input<Input>(&self) -> Result<Input>
-    where
-        Input: for<'de> serde::Deserialize<'de>,
-    {
-        serde_json::from_value::<Input>(self.value.clone()).map_err(|err| anyhow!(err))
-    }
-}
-
-#[derive(Debug, Eq, PartialEq)]
-pub struct FileEdits {
-    pub hunks: Vec<FileEditHunk>,
-}
-
-#[derive(Debug, Eq, PartialEq)]
-pub struct FileEditHunk {
-    pub base_text: String,
-    pub text: String,
-    pub status: DiffHunkStatus,
-}
-
-impl FileEdits {
-    pub fn has_added_line(&self, line: &str) -> bool {
-        self.hunks.iter().any(|hunk| {
-            hunk.status == DiffHunkStatus::added_none()
-                && hunk.base_text.is_empty()
-                && hunk.text.contains(line)
-        })
-    }
-}
diff --git a/crates/eval/src/examples/add_arg_to_trait_method.rs b/crates/eval/src/examples/add_arg_to_trait_method.rs
deleted file mode 100644
index 1692932b33..0000000000
--- a/crates/eval/src/examples/add_arg_to_trait_method.rs
+++ /dev/null
@@ -1,116 +0,0 @@
-use agent_settings::AgentProfileId;
-use anyhow::Result;
-use async_trait::async_trait;
-use util::rel_path::RelPath;
-
-use crate::example::{Example, ExampleContext, ExampleMetadata, JudgeAssertion, LanguageServer};
-
-pub struct AddArgToTraitMethod;
-
-#[async_trait(?Send)]
-impl Example for AddArgToTraitMethod {
-    fn meta(&self) -> ExampleMetadata {
-        ExampleMetadata {
-            name: "add_arg_to_trait_method".to_string(),
-            url: "https://github.com/zed-industries/zed.git".to_string(),
-            revision: "f69aeb6311dde3c0b8979c293d019d66498d54f2".to_string(),
-            language_server: Some(LanguageServer {
-                file_extension: "rs".to_string(),
-                allow_preexisting_diagnostics: false,
-            }),
-            max_assertions: None,
-            profile_id: AgentProfileId::default(),
-            existing_thread_json: None,
-            max_turns: None,
-        }
-    }
-
-    async fn conversation(&self, cx: &mut ExampleContext) -> Result<()> {
-        const FILENAME: &str = "assistant_tool.rs";
-        let _ = cx.prompt(format!(
-            r#"
-            Add a `window: Option<gpui::AnyWindowHandle>` argument to the `Tool::run` trait method in {FILENAME},
-            and update all the implementations of the trait and call sites accordingly.
-            "#
-        )).await?;
-
-        // Adds ignored argument to all but `batch_tool`
-
-        let add_ignored_window_paths = &[
-            "code_action_tool",
-            "code_symbols_tool",
-            "contents_tool",
-            "copy_path_tool",
-            "create_directory_tool",
-            "create_file_tool",
-            "delete_path_tool",
-            "diagnostics_tool",
-            "edit_file_tool",
-            "fetch_tool",
-            "grep_tool",
-            "list_directory_tool",
-            "move_path_tool",
-            "now_tool",
-            "open_tool",
-            "path_search_tool",
-            "read_file_tool",
-            "rename_tool",
-            "symbol_info_tool",
-            "terminal_tool",
-            "thinking_tool",
-            "web_search_tool",
-        ];
-
-        let edits = cx.edits();
-
-        for tool_name in add_ignored_window_paths {
-            let path_str = format!("crates/assistant_tools/src/{}.rs", tool_name);
-            let edits = edits.get(RelPath::unix(&path_str).unwrap());
-
-            let ignored = edits.is_some_and(|edits| {
-                edits.has_added_line("        _window: Option<gpui::AnyWindowHandle>,\n")
-            });
-            let uningored = edits.is_some_and(|edits| {
-                edits.has_added_line("        window: Option<gpui::AnyWindowHandle>,\n")
-            });
-
-            cx.assert(ignored || uningored, format!("Argument:   {}", tool_name))
-                .ok();
-
-            cx.assert(ignored, format!("`_` prefix: {}", tool_name))
-                .ok();
-        }
-
-        // Adds unignored argument to `batch_tool`
-
-        let batch_tool_edits =
-            edits.get(RelPath::unix("crates/assistant_tools/src/batch_tool.rs").unwrap());
-
-        cx.assert(
-            batch_tool_edits.is_some_and(|edits| {
-                edits.has_added_line("        window: Option<gpui::AnyWindowHandle>,\n")
-            }),
-            "Argument:   batch_tool",
-        )
-        .ok();
-
-        Ok(())
-    }
-
-    fn diff_assertions(&self) -> Vec<JudgeAssertion> {
-        vec![
-            JudgeAssertion {
-                id: "batch tool passes window to each".to_string(),
-                description:
-                    "batch_tool is modified to pass a clone of the window to each tool it calls."
-                        .to_string(),
-            },
-            JudgeAssertion {
-                id: "tool tests updated".to_string(),
-                description:
-                    "tool tests are updated to pass the new `window` argument (`None` is ok)."
-                        .to_string(),
-            },
-        ]
-    }
-}
diff --git a/crates/eval/src/examples/code_block_citations.rs b/crates/eval/src/examples/code_block_citations.rs
deleted file mode 100644
index c8ba75e99f..0000000000
--- a/crates/eval/src/examples/code_block_citations.rs
+++ /dev/null
@@ -1,228 +0,0 @@
-use agent_settings::AgentProfileId;
-use anyhow::Result;
-use async_trait::async_trait;
-use markdown::PathWithRange;
-
-use crate::example::{Example, ExampleContext, ExampleMetadata, JudgeAssertion, LanguageServer};
-
-pub struct CodeBlockCitations;
-
-const FENCE: &str = "```";
-
-#[async_trait(?Send)]
-impl Example for CodeBlockCitations {
-    fn meta(&self) -> ExampleMetadata {
-        ExampleMetadata {
-            name: "code_block_citations".to_string(),
-            url: "https://github.com/zed-industries/zed.git".to_string(),
-            revision: "f69aeb6311dde3c0b8979c293d019d66498d54f2".to_string(),
-            language_server: Some(LanguageServer {
-                file_extension: "rs".to_string(),
-                allow_preexisting_diagnostics: false,
-            }),
-            max_assertions: None,
-            profile_id: AgentProfileId::default(),
-            existing_thread_json: None,
-            max_turns: None,
-        }
-    }
-
-    async fn conversation(&self, cx: &mut ExampleContext) -> Result<()> {
-        const FILENAME: &str = "assistant_tool.rs";
-
-        // Verify that the messages all have the correct formatting.
-        let texts: Vec<String> = cx
-            .prompt(format!(
-                r#"
-                Show me the method bodies of all the methods of the `Tool` trait in {FILENAME}.
-
-                Please show each method in a separate code snippet.
-                "#
-            ))
-            .await?
-            .texts()
-            .collect();
-        let closing_fence = format!("\n{FENCE}");
-
-        for text in texts.iter() {
-            let mut text = text.as_str();
-
-            while let Some(index) = text.find(FENCE) {
-                // Advance text past the opening backticks.
-                text = &text[index + FENCE.len()..];
-
-                // Find the closing backticks.
-                let content_len = text.find(&closing_fence);
-
-                // Verify the citation format - e.g. ```path/to/foo.txt#L123-456
-                if let Some(citation_len) = text.find('\n') {
-                    let citation = &text[..citation_len];
-
-                    if let Ok(()) =
-                        cx.assert(citation.contains("/"), format!("Slash in {citation:?}",))
-                    {
-                        let path_range = PathWithRange::new(citation);
-                        let path = cx
-                            .agent_thread()
-                            .update(cx, |thread, cx| {
-                                thread
-                                    .project()
-                                    .read(cx)
-                                    .find_project_path(path_range.path.as_ref(), cx)
-                            })
-                            .ok()
-                            .flatten();
-
-                        if let Ok(path) = cx.assert_some(path, format!("Valid path: {citation:?}"))
-                        {
-                            let buffer_text = {
-                                let buffer = match cx.agent_thread().update(cx, |thread, cx| {
-                                    thread
-                                        .project()
-                                        .update(cx, |project, cx| project.open_buffer(path, cx))
-                                }) {
-                                    Ok(buffer_task) => buffer_task.await.ok(),
-                                    Err(err) => {
-                                        cx.assert(
-                                            false,
-                                            format!("Expected Ok(buffer), not {err:?}"),
-                                        )
-                                        .ok();
-                                        break;
-                                    }
-                                };
-
-                                let Ok(buffer_text) = cx.assert_some(
-                                    buffer.and_then(|buffer| {
-                                        buffer.read_with(cx, |buffer, _| buffer.text()).ok()
-                                    }),
-                                    "Reading buffer text succeeded",
-                                ) else {
-                                    continue;
-                                };
-                                buffer_text
-                            };
-
-                            if let Some(content_len) = content_len {
-                                // + 1 because there's a newline character after the citation.
-                                let start_index = citation.len() + 1;
-                                let end_index = content_len.saturating_sub(start_index);
-
-                                if cx
-                                    .assert(
-                                        start_index <= end_index,
-                                        "Code block had a valid citation",
-                                    )
-                                    .is_ok()
-                                {
-                                    let content = &text[start_index..end_index];
-
-                                    // deindent (trim the start of each line) because sometimes the model
-                                    // chooses to deindent its code snippets for the sake of readability,
-                                    // which in markdown is not only reasonable but usually desirable.
-                                    cx.assert(
-                                        deindent(&buffer_text)
-                                            .trim()
-                                            .contains(deindent(&content).trim()),
-                                        "Code block content was found in file",
-                                    )
-                                    .ok();
-
-                                    if let Some(range) = path_range.range {
-                                        let start_line_index = range.start.line.saturating_sub(1);
-                                        let line_count =
-                                            range.end.line.saturating_sub(start_line_index);
-                                        let mut snippet = buffer_text
-                                            .lines()
-                                            .skip(start_line_index as usize)
-                                            .take(line_count as usize)
-                                            .collect::<Vec<&str>>()
-                                            .join("\n");
-
-                                        if let Some(start_col) = range.start.col {
-                                            snippet = snippet[start_col as usize..].to_string();
-                                        }
-
-                                        if let Some(end_col) = range.end.col {
-                                            let last_line = snippet.lines().last().unwrap();
-                                            snippet = snippet[..snippet.len() - last_line.len()
-                                                + end_col as usize]
-                                                .to_string();
-                                        }
-
-                                        // deindent (trim the start of each line) because sometimes the model
-                                        // chooses to deindent its code snippets for the sake of readability,
-                                        // which in markdown is not only reasonable but usually desirable.
-                                        cx.assert_eq(
-                                            deindent(snippet.as_str()).trim(),
-                                            deindent(content).trim(),
-                                            format!(
-                                                "Code block was at {:?}-{:?}",
-                                                range.start, range.end
-                                            ),
-                                        )
-                                        .ok();
-                                    }
-                                }
-                            }
-                        }
-                    }
-                } else {
-                    cx.assert(
-                        false,
-                        format!("Opening {FENCE} did not have a newline anywhere after it."),
-                    )
-                    .ok();
-                }
-
-                if let Some(content_len) = content_len {
-                    // Advance past the closing backticks
-                    text = &text[content_len + FENCE.len()..];
-                } else {
-                    // There were no closing backticks associated with these opening backticks.
-                    cx.assert(
-                        false,
-                        "Code block opening had matching closing backticks.".to_string(),
-                    )
-                    .ok();
-
-                    // There are no more code blocks to parse, so we're done.
-                    break;
-                }
-            }
-        }
-
-        Ok(())
-    }
-
-    fn thread_assertions(&self) -> Vec<JudgeAssertion> {
-        vec![
-            JudgeAssertion {
-                id: "trait method bodies are shown".to_string(),
-                description:
-                    "All method bodies of the Tool trait are shown."
-                        .to_string(),
-            },
-            JudgeAssertion {
-                id: "code blocks used".to_string(),
-                description:
-                   "All code snippets are rendered inside markdown code blocks (as opposed to any other formatting besides code blocks)."
-                        .to_string(),
-            },
-            JudgeAssertion {
-              id: "code blocks use backticks".to_string(),
-              description:
-                  format!("All markdown code blocks use backtick fences ({FENCE}) rather than indentation.")
-            }
-        ]
-    }
-}
-
-fn deindent(as_str: impl AsRef<str>) -> String {
-    as_str
-        .as_ref()
-        .lines()
-        .map(|line| line.trim_start())
-        .collect::<Vec<&str>>()
-        .join("\n")
-}
diff --git a/crates/eval/src/examples/comment_translation.rs b/crates/eval/src/examples/comment_translation.rs
deleted file mode 100644
index 421999893a..0000000000
--- a/crates/eval/src/examples/comment_translation.rs
+++ /dev/null
@@ -1,60 +0,0 @@
-use crate::example::{Example, ExampleContext, ExampleMetadata, JudgeAssertion};
-use agent::{EditFileMode, EditFileToolInput};
-use agent_settings::AgentProfileId;
-use anyhow::Result;
-use async_trait::async_trait;
-
-pub struct CommentTranslation;
-
-#[async_trait(?Send)]
-impl Example for CommentTranslation {
-    fn meta(&self) -> ExampleMetadata {
-        ExampleMetadata {
-            name: "comment_translation".to_string(),
-            url: "https://github.com/servo/font-kit.git".to_string(),
-            revision: "504d084e29bce4f60614bc702e91af7f7d9e60ad".to_string(),
-            language_server: None,
-            max_assertions: Some(1),
-            profile_id: AgentProfileId::default(),
-            existing_thread_json: None,
-            max_turns: None,
-        }
-    }
-
-    async fn conversation(&self, cx: &mut ExampleContext) -> Result<()> {
-        let response = cx.prompt(
-            r#"
-                Edit the following files and translate all their comments to italian, in this exact order:
-
-                - font-kit/src/family.rs
-                - font-kit/src/canvas.rs
-                - font-kit/src/error.rs
-            "#
-        ).await?;
-
-        let mut create_or_overwrite_count = 0;
-        for tool_call in response.tool_calls() {
-            if tool_call.name == "edit_file" {
-                let input = tool_call.parse_input::<EditFileToolInput>()?;
-                if !matches!(input.mode, EditFileMode::Edit) {
-                    create_or_overwrite_count += 1;
-                }
-            }
-        }
-
-        cx.assert_eq(create_or_overwrite_count, 0, "no_creation_or_overwrite")?;
-
-        Ok(())
-    }
-
-    fn diff_assertions(&self) -> Vec<JudgeAssertion> {
-        vec![JudgeAssertion {
-            id: "comments_translated".to_string(),
-            description: concat!(
-                "- Only `family.rs`, `canvas.rs` and `error.rs` should have changed.\n",
-                "- Their doc comments should have been all translated to Italian."
-            )
-            .into(),
-        }]
-    }
-}
diff --git a/crates/eval/src/examples/file_change_notification.rs b/crates/eval/src/examples/file_change_notification.rs
deleted file mode 100644
index 41ce10cd22..0000000000
--- a/crates/eval/src/examples/file_change_notification.rs
+++ /dev/null
@@ -1,74 +0,0 @@
-use agent_settings::AgentProfileId;
-use anyhow::Result;
-use async_trait::async_trait;
-
-use crate::example::{Example, ExampleContext, ExampleMetadata, JudgeAssertion};
-
-pub struct FileChangeNotificationExample;
-
-#[async_trait(?Send)]
-impl Example for FileChangeNotificationExample {
-    fn meta(&self) -> ExampleMetadata {
-        ExampleMetadata {
-            name: "file_change_notification".to_string(),
-            url: "https://github.com/octocat/hello-world".to_string(),
-            revision: "7fd1a60b01f91b314f59955a4e4d4e80d8edf11d".to_string(),
-            language_server: None,
-            max_assertions: None,
-            profile_id: AgentProfileId::default(),
-            existing_thread_json: None,
-            max_turns: Some(3),
-        }
-    }
-
-    async fn conversation(&self, cx: &mut ExampleContext) -> Result<()> {
-        // Track README so that the model gets notified of its changes
-        let project_path = cx.agent_thread().read_with(cx, |thread, cx| {
-            thread
-                .project()
-                .read(cx)
-                .find_project_path("README", cx)
-                .expect("README file should exist in this repo")
-        })?;
-
-        let buffer = {
-            cx.agent_thread()
-                .update(cx, |thread, cx| {
-                    thread
-                        .project()
-                        .update(cx, |project, cx| project.open_buffer(project_path, cx))
-                })?
-                .await?
-        };
-
-        cx.agent_thread().update(cx, |thread, cx| {
-            thread.action_log().update(cx, |action_log, cx| {
-                action_log.buffer_read(buffer.clone(), cx);
-            });
-        })?;
-
-        // Start conversation (specific message is not important)
-        cx.prompt_with_max_turns("Find all files in this repo", 1)
-            .await?;
-
-        // Edit the README buffer - the model should get a notification on next turn
-        buffer.update(cx, |buffer, cx| {
-            buffer.edit([(0..buffer.len(), "Surprise!")], None, cx);
-        })?;
-
-        // Run for some more turns.
-        // The model shouldn't thank us for letting it know about the file change.
-        cx.proceed_with_max_turns(3).await?;
-
-        Ok(())
-    }
-
-    fn thread_assertions(&self) -> Vec<JudgeAssertion> {
-        vec![JudgeAssertion {
-            id: "change-file-notification".into(),
-            description:
-                "Agent should not acknowledge or mention anything about files that have been changed"
-                    .into(),
-        }]
-    }
-}
diff --git a/crates/eval/src/examples/file_search.rs b/crates/eval/src/examples/file_search.rs
deleted file mode 100644
index 7de7a07d19..0000000000
--- a/crates/eval/src/examples/file_search.rs
+++ /dev/null
@@ -1,55 +0,0 @@
-use agent::FindPathToolInput;
-use agent_settings::AgentProfileId;
-use anyhow::Result;
-use async_trait::async_trait;
-use regex::Regex;
-
-use crate::example::{Example, ExampleContext, ExampleMetadata};
-
-pub struct FileSearchExample;
-
-#[async_trait(?Send)]
-impl Example for FileSearchExample {
-    fn meta(&self) -> ExampleMetadata {
-        ExampleMetadata {
-            name: "file_search".to_string(),
-            url: "https://github.com/zed-industries/zed.git".to_string(),
-            revision: "03ecb88fe30794873f191ddb728f597935b3101c".to_string(),
-            language_server: None,
-            max_assertions: Some(3),
-            profile_id: AgentProfileId::default(),
-            existing_thread_json: None,
-            max_turns: None,
-        }
-    }
-
-    async fn conversation(&self, cx: &mut ExampleContext) -> Result<()> {
-        const FILENAME: &str = "find_replace_file_tool.rs";
-
-        let prompt = format!(
-            r#"
-        Look at the `{FILENAME}`. I want to implement a card for it. The card should implement the `Render` trait.
-
-        The card should show a diff. It should be a beautifully presented diff. The card "box" should look like what we show for
-        markdown codeblocks (look at `MarkdownElement`). I want to see a red background for lines that were deleted and a green
-        background for lines that were added. We should have a div per diff line.
-        "#
-        );
-
-        let response = cx.prompt_with_max_turns(prompt, 1).await?;
-        let tool_use = response.expect_tool_call("find_path", cx)?;
-        let input = tool_use.parse_input::<FindPathToolInput>()?;
-
-        let glob = input.glob;
-        cx.assert(glob.ends_with(FILENAME), "glob ends with file name")?;
-
-        let without_filename = glob.replace(FILENAME, "");
-        let matches = Regex::new("(\\*\\*|zed)/(\\*\\*?/)?")
-            .unwrap()
-            .is_match(&without_filename);
-
-        cx.assert(matches, "glob starts with `**` or project")?;
-
-        Ok(())
-    }
-}
diff --git a/crates/eval/src/examples/find_and_replace_diff_card.toml b/crates/eval/src/examples/find_and_replace_diff_card.toml
deleted file mode 100644
index 0e1b9c3972..0000000000
--- a/crates/eval/src/examples/find_and_replace_diff_card.toml
+++ /dev/null
@@ -1,43 +0,0 @@
-url = "https://github.com/zed-industries/zed.git"
-revision = "38fcadf9481d018543c65f36ac3bafeba190179b"
-language_extension = "rs"
-
-prompt = """
-Look at the `find_replace_file_tool.rs`. I want to implement a card for it.
-The card should implement the `Render` trait.
-
-The card should show a diff. It should be a beautifully presented diff.
-The card "box" should look like what we show for markdown codeblocks (look at `MarkdownElement`).
-I want to see a red background for lines that were deleted and a green background for lines
-that were added. We should have a div per diff line.
-"""
-
-[diff_assertions]
-
-modify_find_and_replace_tool = """
-The changes must replace the previous output returned by `FindReplaceFileTool` with the new `ToolResult` struct.
-The struct should contain an `output` field that is the same as the task we were returning before,
-and a new `card` field that contains a view for the card.
-"""
-
-card_implementation = """
-The card should be a view that displays a diff.
-Each line in the diff should be colored according to whether it was added, removed or unchanged.
-"""
-
-[thread_assertions]
-
-path_search = """
-The first tool call should be to path search including "find_replace_file_tool.rs" in the string.
-(*Not* grep, for example, or reading the file based on a guess at the path.)
-This is because we gave the model a filename and it needs to turn that into a real path.
-"""
-
-read_file_from_path_search = """
-After obtaining the correct path of "zed/crates/assistant_tools/src/find_replace_file_tool.rs", it should read the contents of that path.
-"""
-
-symbol_search = """
-When trying to find information about the Render trait, it should *not* begin with a path search, because it doesn't yet have any information
-on what path the Render trait might be in.
-"""
diff --git a/crates/eval/src/examples/grep_params_escapement.rs b/crates/eval/src/examples/grep_params_escapement.rs
deleted file mode 100644
index 57086a1b9b..0000000000
--- a/crates/eval/src/examples/grep_params_escapement.rs
+++ /dev/null
@@ -1,59 +0,0 @@
-use agent::GrepToolInput;
-use agent_settings::AgentProfileId;
-use anyhow::Result;
-use async_trait::async_trait;
-
-use crate::example::{Example, ExampleContext, ExampleMetadata};
-
-pub struct GrepParamsEscapementExample;
-
-/*
-
-This eval checks that the model doesn't use HTML escapement for characters like `<` and
-`>` in tool parameters.
-
-                      original     +system_prompt change    +tool description
-  claude-opus-4        89%          92%                     97%+
-  claude-sonnet-4      100%
-  gpt-4.1-mini         100%
-  gemini-2.5-pro                    98%
-
-*/
-
-#[async_trait(?Send)]
-impl Example for GrepParamsEscapementExample {
-    fn meta(&self) -> ExampleMetadata {
-        ExampleMetadata {
-            name: "grep_params_escapement".to_string(),
-            url: "https://github.com/octocat/hello-world".to_string(),
-            revision: "7fd1a60b01f91b314f59955a4e4d4e80d8edf11d".to_string(),
-            language_server: None,
-            max_assertions: Some(1),
-            profile_id: AgentProfileId::default(),
-            existing_thread_json: None,
-            max_turns: Some(2),
-        }
-    }
-
-    async fn conversation(&self, cx: &mut ExampleContext) -> Result<()> {
-        let response = cx
-            .prompt_with_max_turns("Search for files containing the characters `>` or `<`", 2)
-            .await?;
-        let grep_input = response
-            .find_tool_call("grep")
-            .and_then(|tool_use| tool_use.parse_input::<GrepToolInput>().ok());
-
-        cx.assert_some(grep_input.as_ref(), "`grep` tool should be called")?;
-
-        cx.assert(
-            !contains_html_entities(&grep_input.unwrap().regex),
-            "Tool parameters should not be escaped",
-        )
-    }
-}
-
-fn contains_html_entities(pattern: &str) -> bool {
-    regex::Regex::new(r"&[a-zA-Z]+;|&#[0-9]+;|&#x[0-9a-fA-F]+;")
-        .unwrap()
-        .is_match(pattern)
-}
diff --git a/crates/eval/src/examples/hallucinated_tool_calls.toml b/crates/eval/src/examples/hallucinated_tool_calls.toml
deleted file mode 100644
index f12f01affe..0000000000
--- a/crates/eval/src/examples/hallucinated_tool_calls.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-url = "https://github.com/jlowin/fastmcp"
-revision = "a2c1e14e5d83af1c32b76280ab368df199c4e860"
-language_extension = "py"
-
-prompt = "Write a LICENSE file just saying 'Apache 2.0' and nothing else"
-
-profile_name = "ask"
-
-[thread_assertions]
-
-no_edit_attempts = """The agent should not claim that it edited or created the file. It should not pretend making any changes."""
-
-mention_insufficient_tools = """Agent should mention that it doesn't have relevant tools needed to make the change."""
diff --git a/crates/eval/src/examples/mod.rs b/crates/eval/src/examples/mod.rs
deleted file mode 100644
index aec1bce079..0000000000
--- a/crates/eval/src/examples/mod.rs
+++ /dev/null
@@ -1,173 +0,0 @@
-use agent_settings::AgentProfileId;
-use anyhow::Result;
-use async_trait::async_trait;
-use serde::Deserialize;
-use std::collections::BTreeMap;
-use std::fs;
-use std::{
-    path::{Path, PathBuf},
-    rc::Rc,
-};
-use util::serde::default_true;
-
-use crate::example::{Example, ExampleContext, ExampleMetadata, JudgeAssertion};
-
-mod add_arg_to_trait_method;
-mod code_block_citations;
-mod comment_translation;
-mod file_change_notification;
-mod file_search;
-mod grep_params_escapement;
-mod overwrite_file;
-mod planets;
-
-pub fn all(examples_dir: &Path) -> Vec<Rc<dyn Example>> {
-    let mut threads: Vec<Rc<dyn Example>> = vec![
-        Rc::new(file_search::FileSearchExample),
-        Rc::new(add_arg_to_trait_method::AddArgToTraitMethod),
-        Rc::new(code_block_citations::CodeBlockCitations),
-        Rc::new(planets::Planets),
-        Rc::new(comment_translation::CommentTranslation),
-        Rc::new(overwrite_file::FileOverwriteExample),
-        Rc::new(file_change_notification::FileChangeNotificationExample),
-        Rc::new(grep_params_escapement::GrepParamsEscapementExample),
-    ];
-
-    for example_path in list_declarative_examples(examples_dir).unwrap() {
-        threads.push(Rc::new(DeclarativeExample::load(&example_path).unwrap()));
-    }
-
-    threads
-}
-
-struct DeclarativeExample {
-    metadata: ExampleMetadata,
-    prompt: String,
-    diff_assertions: Vec<JudgeAssertion>,
-    thread_assertions: Vec<JudgeAssertion>,
-}
-
-impl DeclarativeExample {
-    pub fn load(example_path: &Path) -> Result<Self> {
-        let name = Self::name_from_path(example_path);
-        let base: ExampleToml = toml::from_str(&fs::read_to_string(&example_path)?)?;
-        let example_dir = example_path.parent().unwrap();
-
-        let language_server = if base.require_lsp {
-            Some(crate::example::LanguageServer {
-                file_extension: base
-                    .language_extension
-                    .expect("Language extension is required when require_lsp = true"),
-                allow_preexisting_diagnostics: base.allow_preexisting_diagnostics,
-            })
-        } else {
-            None
-        };
-
-        let profile_id = if let Some(profile_name) = base.profile_name {
-            AgentProfileId(profile_name.into())
-        } else {
-            AgentProfileId::default()
-        };
-
-        let existing_thread_json = if let Some(path) = base.existing_thread_path {
-            let content = fs::read_to_string(example_dir.join(&path))
-                .unwrap_or_else(|_| panic!("Failed to read existing thread file: {}", path));
-            Some(content)
-        } else {
-            None
-        };
-
-        let metadata = ExampleMetadata {
-            name,
-            url: base.url,
-            revision: base.revision,
-            language_server,
-            max_assertions: None,
-            profile_id,
-            existing_thread_json,
-            max_turns: base.max_turns,
-        };
-
-        Ok(DeclarativeExample {
-            metadata,
-            prompt: base.prompt,
-            thread_assertions: base
-                .thread_assertions
-                .into_iter()
-                .map(|(id, description)| JudgeAssertion { id, description })
-                .collect(),
-            diff_assertions: base
-                .diff_assertions
-                .into_iter()
-                .map(|(id, description)| JudgeAssertion { id, description })
-                .collect(),
-        })
-    }
-
-    pub fn name_from_path(path: &Path) -> String {
-        path.file_stem().unwrap().to_string_lossy().into_owned()
-    }
-}
-
-#[derive(Clone, Debug, Deserialize)]
-pub struct ExampleToml {
-    pub url: String,
-    pub revision: String,
-    pub language_extension: Option<String>,
-    #[expect(
-        unused,
-        reason = "This field was found to be unused with serde library bump; it's left as is due to insufficient context on PO's side, but it *may* be fine to remove"
-    )]
-    pub insert_id: Option<String>,
-    #[serde(default = "default_true")]
-    pub require_lsp: bool,
-    #[serde(default)]
-    pub allow_preexisting_diagnostics: bool,
-    pub prompt: String,
-    #[serde(default)]
-    pub profile_name: Option<String>,
-    #[serde(default)]
-    pub diff_assertions: BTreeMap<String, String>,
-    #[serde(default)]
-    pub thread_assertions: BTreeMap<String, String>,
-    #[serde(default)]
-    pub existing_thread_path: Option<String>,
-    #[serde(default)]
-    pub max_turns: Option<u32>,
-}
-
-#[async_trait(?Send)]
-impl Example for DeclarativeExample {
-    fn meta(&self) -> ExampleMetadata {
-        self.metadata.clone()
-    }
-
-    async fn conversation(&self, cx: &mut ExampleContext) -> Result<()> {
-        let max_turns = self.metadata.max_turns.unwrap_or(1000);
-        let _ = cx.prompt_with_max_turns(&self.prompt, max_turns).await;
-        Ok(())
-    }
-
-    fn diff_assertions(&self) -> Vec<JudgeAssertion> {
-        self.diff_assertions.clone()
-    }
-
-    fn thread_assertions(&self) -> Vec<JudgeAssertion> {
-        self.thread_assertions.clone()
-    }
-}
-
-fn list_declarative_examples(examples_dir: &Path) -> Result<Vec<PathBuf>> {
-    let path = std::fs::canonicalize(examples_dir).unwrap();
-    let entries = std::fs::read_dir(path).unwrap();
-    let mut result_paths = Vec::new();
-    for entry in entries {
-        let entry = entry?;
-        let path = entry.path();
-        if path.extension() == Some("toml".as_ref()) {
-            result_paths.push(path);
-        }
-    }
-    Ok(result_paths)
-}
diff --git a/crates/eval/src/examples/no_tools_enabled.toml b/crates/eval/src/examples/no_tools_enabled.toml
deleted file mode 100644
index 8f8f66244a..0000000000
--- a/crates/eval/src/examples/no_tools_enabled.toml
+++ /dev/null
@@ -1,19 +0,0 @@
-url = "https://github.com/zed-industries/zed"
-revision = "main"
-require_lsp = false
-prompt = """
-I need to explore the codebase to understand what files are available in the project. What can you tell me about the structure of the codebase?
-
-Please find all uses of the 'find_path' function in the src directory.
-
-Also, can you tell me what the capital of France is? And how does garbage collection work in programming languages?
-"""
-
-profile_name = "minimal"
-
-[thread_assertions]
-no_hallucinated_tool_calls = """The agent should not hallucinate tool calls - for example, by writing markdown code blocks that simulate commands like `find`, `grep`, `ls`, etc. - since no tools are available. However, it is totally fine if the agent describes to the user what should be done, e.g. telling the user \"You can run `find` to...\" etc."""
-
-doesnt_hallucinate_file_paths = """The agent should not make up file paths or pretend to know the structure of the project when tools are not available."""
-
-correctly_answers_general_questions = """The agent should correctly answer general knowledge questions about the capital of France and garbage collection without asking for more context, demonstrating it can still be helpful with areas it knows about."""
diff --git a/crates/eval/src/examples/overwrite_file.rs b/crates/eval/src/examples/overwrite_file.rs
deleted file mode 100644
index a4df1e97a3..0000000000
--- a/crates/eval/src/examples/overwrite_file.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-use agent::{EditFileMode, EditFileToolInput};
-use agent_settings::AgentProfileId;
-use anyhow::Result;
-use async_trait::async_trait;
-
-use crate::example::{Example, ExampleContext, ExampleMetadata};
-
-pub struct FileOverwriteExample;
-
-/*
-This eval tests a fix for a destructive behavior of the `edit_file` tool.
-Previously, it would rewrite existing files too aggressively, which often
-resulted in content loss.
-
-Model           | Pass rate
-----------------|----------
-Sonnet 3.7      | 100%
-Gemini 2.5 Pro  |  80%
-*/
-
-#[async_trait(?Send)]
-impl Example for FileOverwriteExample {
-    fn meta(&self) -> ExampleMetadata {
-        let thread_json = include_str!("threads/overwrite-file.json");
-
-        ExampleMetadata {
-            name: "file_overwrite".to_string(),
-            url: "https://github.com/zed-industries/zed.git".to_string(),
-            revision: "023a60806a8cc82e73bd8d88e63b4b07fc7a0040".to_string(),
-            language_server: None,
-            max_assertions: Some(1),
-            profile_id: AgentProfileId::default(),
-            existing_thread_json: Some(thread_json.to_string()),
-            max_turns: None,
-        }
-    }
-
-    async fn conversation(&self, cx: &mut ExampleContext) -> Result<()> {
-        let response = cx.proceed_with_max_turns(1).await?;
-        let tool_use = response.expect_tool_call("edit_file", cx)?;
-        let input = tool_use.parse_input::<EditFileToolInput>()?;
-        let file_overwritten = match input.mode {
-            EditFileMode::Edit => false,
-            EditFileMode::Create | EditFileMode::Overwrite => {
-                input.path.ends_with("src/language_model_selector.rs")
-            }
-        };
-
-        cx.assert(!file_overwritten, "File should be edited, not overwritten")
-    }
-}
diff --git a/crates/eval/src/examples/planets.rs b/crates/eval/src/examples/planets.rs
deleted file mode 100644
index 6b6ca0e3fe..0000000000
--- a/crates/eval/src/examples/planets.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-use agent::{AgentTool, OpenTool, TerminalTool};
-use agent_settings::AgentProfileId;
-use anyhow::Result;
-use async_trait::async_trait;
-
-use crate::example::{Example, ExampleContext, ExampleMetadata, JudgeAssertion};
-
-pub struct Planets;
-
-#[async_trait(?Send)]
-impl Example for Planets {
-    fn meta(&self) -> ExampleMetadata {
-        ExampleMetadata {
-            name: "planets".to_string(),
-            url: "https://github.com/roc-lang/roc".to_string(), // This commit in this repo is just the Apache2 license,
-            revision: "59e49c75214f60b4dc4a45092292061c8c26ce27".to_string(), // so effectively a blank project.
-            language_server: None,
-            max_assertions: None,
-            profile_id: AgentProfileId::default(),
-            existing_thread_json: None,
-            max_turns: None,
-        }
-    }
-
-    async fn conversation(&self, cx: &mut ExampleContext) -> Result<()> {
-        let response = cx
-            .prompt(
-                r#"
-            Make a plain JavaScript web page which renders an animated 3D solar system.
-            Let me drag to rotate the camera around.
-            Do not use npm.
-            "#,
-            )
-            .await?;
-        let mut open_tool_uses = 0;
-        let mut terminal_tool_uses = 0;
-
-        for tool_use in response.tool_calls() {
-            if tool_use.name == OpenTool::name() {
-                open_tool_uses += 1;
-            } else if tool_use.name == TerminalTool::name() {
-                terminal_tool_uses += 1;
-            }
-        }
-
-        // The open tool should only be used when requested, which it was not.
-        cx.assert_eq(open_tool_uses, 0, "`open` tool was not used")
-            .ok();
-        // No reason to use the terminal if not using npm.
-        cx.assert_eq(terminal_tool_uses, 0, "`terminal` tool was not used")
-            .ok();
-
-        Ok(())
-    }
-
-    fn diff_assertions(&self) -> Vec<JudgeAssertion> {
-        vec![
-            JudgeAssertion {
-                id: "animated solar system".to_string(),
-                description: "This page should render a solar system, and it should be animated."
-                    .to_string(),
-            },
-            JudgeAssertion {
-                id: "drag to rotate camera".to_string(),
-                description: "The user can drag to rotate the camera around.".to_string(),
-            },
-            JudgeAssertion {
-                id: "plain JavaScript".to_string(),
-                description:
-                    "The code base uses plain JavaScript and no npm, along with HTML and CSS."
-                        .to_string(),
-            },
-        ]
-    }
-}
diff --git a/crates/eval/src/examples/threads/overwrite-file.json b/crates/eval/src/examples/threads/overwrite-file.json
deleted file mode 100644
index 392ccde5b8..0000000000
--- a/crates/eval/src/examples/threads/overwrite-file.json
+++ /dev/null
@@ -1,262 +0,0 @@
-{
-  "completion_mode": "normal",
-  "cumulative_token_usage": {
-    "cache_creation_input_tokens": 18383,
-    "cache_read_input_tokens": 97250,
-    "input_tokens": 45,
-    "output_tokens": 776
-  },
-  "detailed_summary_state": "NotGenerated",
-  "exceeded_window_error": null,
-  "initial_project_snapshot": {
-    "timestamp": "2025-05-08T14:31:16.701157512Z",
-    "unsaved_buffer_paths": [],
-    "worktree_snapshots": [
-      {
-        "git_state": {
-          "current_branch": null,
-          "diff": "diff --git a/crates/language_model_selector/src/language_model_selector.rs b/crates/language_model_selector/src/language_model_selector.rs\nindex 6775bee98a..e25c9e1415 100644\n--- a/crates/language_model_selector/src/language_model_selector.rs\n+++ b/crates/language_model_selector/src/language_model_selector.rs\n@@ -410,7 +410,8 @@ impl ModelMatcher {\n     }\n \n     pub fn is_match(self: &Self, info: &ModelInfo) -> bool {\n-        self.matched_ids.contains(&info.model.id().0)\n+        let q = (info.model.provider_id(), info.model.id());\n+        self.matched_models.contains(&q)\n     }\n }\n \n",
-          "head_sha": "9245656485e58a5d6d717d82209bc8c57cb9c539",
-          "remote_url": "git@github.com:zed-industries/zed.git"
-        },
-        "worktree_path": "/home/silver/develop/zed"
-      }
-    ]
-  },
-  "messages": [
-    {
-      "context": "\n<context>\nThe following items were attached by the user. They are up-to-date and don't need to be re-read.\n\n<files>\n```rs zed/crates/language_model_selector/src/language_model_selector.rs\nconst TRY_ZED_PRO_URL [L28]\ntype OnModelChanged [L30]\ntype GetActiveModel [L31]\npub struct LanguageModelSelector [L33-37]\n picker [L34]\n _authenticate_all_providers_task [L35]\n _subscriptions [L36]\nimpl LanguageModelSelector [L39-231]\n pub fn new [L40-81]\n fn handle_language_model_registry_event [L83-104]\n fn authenticate_all_providers [L110-154]\n fn all_models [L156-204]\n pub fn active_model [L206-208]\n fn get_active_model_index [L210-230]\nimpl EventEmitter<DismissEvent> for LanguageModelSelector [L233]\nimpl Focusable for LanguageModelSelector [L235-239]\n fn focus_handle [L236-238]\nimpl Render for LanguageModelSelector [L241-245]\n fn render [L242-244]\npub struct LanguageModelSelectorPopoverMenu [L248-258]\n language_model_selector [L253]\n trigger [L254]\n tooltip [L255]\n handle [L256]\n anchor [L257]\nimpl LanguageModelSelectorPopoverMenu<T, TT> [L260-284]\n pub fn new [L265-278]\n pub fn with_handle [L280-283]\nimpl RenderOnce for LanguageModelSelectorPopoverMenu<T, TT> [L286-304]\n fn render [L291-303]\nstruct ModelInfo [L307-310]\n model [L308]\n icon [L309]\npub struct LanguageModelPickerDelegate [L312-319]\n language_model_selector [L313]\n on_model_changed [L314]\n get_active_model [L315]\n all_models [L316]\n filtered_entries [L317]\n selected_index [L318]\nstruct GroupedModels [L321-324]\n recommended [L322]\n other [L323]\nimpl GroupedModels [L326-385]\n pub fn new [L327-342]\n fn entries [L344-370]\n fn model_infos [L372-384]\nenum LanguageModelPickerEntry [L387-390]\n Model [L388]\n Separator [L389]\nstruct ModelMatcher [L392-396]\n models [L393]\n bg_executor [L394]\n candidates [L395]\nimpl ModelMatcher [L398-452]\n fn new [L399-406]\n pub fn fuzzy_search [L408-424]\n pub fn exact_search [L426-438]\n fn make_match_candidates [L440-451]\nimpl PickerDelegate for LanguageModelPickerDelegate [L454-693]\n type ListItem [L455]\n fn match_count [L457-459]\n fn selected_index [L461-463]\n fn set_selected_index [L465-468]\n fn can_select [L470-480]\n fn placeholder_text [L482-484]\n fn update_matches [L486-546]\n fn confirm [L548-560]\n fn dismissed [L562-566]\n fn render_match [L568-636]\n fn render_footer [L638-692]\n\nShowing symbols 1-71 (total symbols: 71)\n\n```\n</files>\n</context>\n",
-      "creases": [
-        {
-          "end": 140,
-          "icon_path": "icons/file_icons/rust.svg",
-          "label": "language_model_selector.rs",
-          "start": 38
-        }
-      ],
-      "id": 0,
-      "role": "user",
-      "segments": [
-        {
-          "text": "I recently introduced fuzzy search in [@language_model_selector.rs](@file:zed/crates/language_model_selector/src/language_model_selector.rs). Can you write unit-test that check it? You can find a test list of models on images. ",
-          "type": "text"
-        }
-      ],
-      "tool_results": [],
-      "tool_uses": []
-    },
-    {
-      "context": "",
-      "creases": [],
-      "id": 1,
-      "role": "assistant",
-      "segments": [
-        {
-          "text": "I'll help you write unit tests for the fuzzy search functionality in the language model selector. I see that you want to test the fuzzy search with the models shown in the images - both Claude models (3, 3.5, 3.7) and GPT models (GPT-3.5, GPT-4, GPT-4o, etc.).\n\nLet's start by examining the code structure to understand how the fuzzy search works.",
-          "type": "text"
-        }
-      ],
-      "tool_results": [
-        {
-          "content": "zed/crates/language_model_selector/Cargo.toml\nzed/crates/language_model_selector/LICENSE-GPL\nzed/crates/language_model_selector/src\n",
-          "is_error": false,
-          "output": null,
-          "tool_use_id": "toolu_01FvYMtHs763GL1wA5mpTpqn"
-        }
-      ],
-      "tool_uses": [
-        {
-          "id": "toolu_01FvYMtHs763GL1wA5mpTpqn",
-          "input": {
-            "path": "zed/crates/language_model_selector"
-          },
-          "name": "list_directory"
-        }
-      ]
-    },
-    {
-      "context": "",
-      "creases": [],
-      "id": 2,
-      "role": "assistant",
-      "segments": [
-        {
-          "text": "Let's look at the structure of the tests directory or see if there are existing tests:",
-          "type": "text"
-        }
-      ],
-      "tool_results": [
-        {
-          "content": "zed/crates/language_model_selector/src/language_model_selector.rs\n",
-          "is_error": false,
-          "output": null,
-          "tool_use_id": "toolu_01KSLDsLLrf7tgixB1sge3cm"
-        }
-      ],
-      "tool_uses": [
-        {
-          "id": "toolu_01KSLDsLLrf7tgixB1sge3cm",
-          "input": {
-            "path": "zed/crates/language_model_selector/src"
-          },
-          "name": "list_directory"
-        }
-      ]
-    },
-    {
-      "context": "",
-      "creases": [],
-      "id": 3,
-      "role": "assistant",
-      "segments": [
-        {
-          "text": "Let's check the Cargo.toml to understand the dependencies:",
-          "type": "text"
-        }
-      ],
-      "tool_results": [
-        {
-          "content": "[package]\nname = \"language_model_selector\"\nversion = \"0.1.0\"\nedition.workspace = true\npublish.workspace = true\nlicense = \"GPL-3.0-or-later\"\n\n[lints]\nworkspace = true\n\n[lib]\npath = \"src/language_model_selector.rs\"\n\n[dependencies]\ncollections.workspace = true\nfeature_flags.workspace = true\nfuzzy.workspace = true\ngpui.workspace = true\nlanguage_model.workspace = true\nlog.workspace = true\npicker.workspace = true\nproto.workspace = true\nui.workspace = true\n\nzed_actions.workspace = true\n",
-          "is_error": false,
-          "output": null,
-          "tool_use_id": "toolu_019Je2MLfJhpJr93g5igoRAH"
-        }
-      ],
-      "tool_uses": [
-        {
-          "id": "toolu_019Je2MLfJhpJr93g5igoRAH",
-          "input": {
-            "path": "zed/crates/language_model_selector/Cargo.toml"
-          },
-          "name": "read_file"
-        }
-      ]
-    },
-    {
-      "context": "",
-      "creases": [],
-      "id": 4,
-      "role": "assistant",
-      "segments": [
-        {
-          "text": "Now let's look at the fuzzy search implementation in detail:",
-          "type": "text"
-        }
-      ],
-      "tool_results": [
-        {
-          "content": "struct ModelMatcher {\n    models: Vec<ModelInfo>,\n    bg_executor: BackgroundExecutor,\n    candidates: Vec<StringMatchCandidate>,\n}\n\nimpl ModelMatcher {\n    fn new(models: Vec<ModelInfo>, bg_executor: BackgroundExecutor) -> ModelMatcher {\n        let candidates = Self::make_match_candidates(&models);\n        Self {\n            models,\n            bg_executor,\n            candidates,\n        }\n    }\n\n    pub fn fuzzy_search(&self, query: &str) -> Vec<ModelInfo> {\n        let matches = self.bg_executor.block(match_strings(\n            &self.candidates,\n            &query,\n            false,\n            100,\n            &Default::default(),\n            self.bg_executor.clone(),\n        ));\n\n        let matched_models: Vec<_> = matches\n            .into_iter()\n            .map(|m| self.models[m.candidate_id].clone())\n            .collect();\n\n        matched_models\n    }\n\n    pub fn exact_search(&self, query: &str) -> Vec<ModelInfo> {\n        self.models\n            .iter()\n            .filter(|m| {\n                m.model\n                    .name()\n                    .0\n                    .to_lowercase()\n                    .contains(&query.to_lowercase())\n            })\n            .cloned()\n            .collect::<Vec<_>>()\n    }\n\n    fn make_match_candidates(model_infos: &Vec<ModelInfo>) -> Vec<StringMatchCandidate> {\n        model_infos\n            .iter()\n            .enumerate()\n            .map(|(index, model)| {\n                StringMatchCandidate::new(\n                    index,\n                    &format!(\"{}/{}\", &model.model.provider_id().0, &model.model.name().0),\n                )\n            })\n            .collect::<Vec<_>>()\n    }\n}",
-          "is_error": false,
-          "output": null,
-          "tool_use_id": "toolu_01GpKFEn6hYrXGiS5yBF3urk"
-        }
-      ],
-      "tool_uses": [
-        {
-          "id": "toolu_01GpKFEn6hYrXGiS5yBF3urk",
-          "input": {
-            "end_line": 452,
-            "path": "zed/crates/language_model_selector/src/language_model_selector.rs",
-            "start_line": 392
-          },
-          "name": "read_file"
-        }
-      ]
-    },
-    {
-      "context": "",
-      "creases": [],
-      "id": 5,
-      "role": "assistant",
-      "segments": [
-        {
-          "text": "Let's now check if there's an existing test module:",
-          "type": "text"
-        }
-      ],
-      "tool_results": [
-        {
-          "content": "No matches found",
-          "is_error": false,
-          "output": null,
-          "tool_use_id": "toolu_01RZAvFvpMq16Dwh6d6cnVzy"
-        }
-      ],
-      "tool_uses": [
-        {
-          "id": "toolu_01RZAvFvpMq16Dwh6d6cnVzy",
-          "input": {
-            "include_pattern": "zed/crates/language_model_selector/**/*.rs",
-            "regex": "mod tests"
-          },
-          "name": "grep"
-        }
-      ]
-    },
-    {
-      "context": "",
-      "creases": [],
-      "id": 6,
-      "role": "assistant",
-      "segments": [
-        {
-          "text": "Now I'll create a test module for the ModelMatcher's fuzzy search functionality. Let's create this test module:",
-          "type": "text"
-        }
-      ],
-      "tool_results": [],
-      "tool_uses": []
-    }
-  ],
-  "model": {
-    "model": "claude-3-7-sonnet-latest",
-    "provider": "zed.dev"
-  },
-  "profile": "Write",
-  "request_token_usage": [
-    {
-      "cache_creation_input_tokens": 9581,
-      "input_tokens": 4,
-      "output_tokens": 5
-    },
-    {
-      "cache_creation_input_tokens": 204,
-      "cache_read_input_tokens": 9581,
-      "input_tokens": 6,
-      "output_tokens": 5
-    },
-    {
-      "cache_creation_input_tokens": 104,
-      "cache_read_input_tokens": 9785,
-      "input_tokens": 6,
-      "output_tokens": 5
-    },
-    {
-      "cache_creation_input_tokens": 239,
-      "cache_read_input_tokens": 9889,
-      "input_tokens": 6,
-      "output_tokens": 5
-    },
-    {
-      "cache_creation_input_tokens": 569,
-      "cache_read_input_tokens": 10128,
-      "input_tokens": 5,
-      "output_tokens": 5
-    },
-    {
-      "cache_creation_input_tokens": 87,
-      "cache_read_input_tokens": 10697,
-      "input_tokens": 5,
-      "output_tokens": 2
-    },
-    {
-      "cache_creation_input_tokens": 7355,
-      "cache_read_input_tokens": 10784,
-      "input_tokens": 5,
-      "output_tokens": 3
-    }
-  ],
-  "summary": "Fuzzy Search Testing Language Model Selector",
-  "updated_at": "2025-05-08T18:20:34.205405751Z",
-  "version": "0.2.0"
-}
diff --git a/crates/eval/src/examples/tree_sitter_drop_emscripten_dep.toml b/crates/eval/src/examples/tree_sitter_drop_emscripten_dep.toml
deleted file mode 100644
index a2846e9d15..0000000000
--- a/crates/eval/src/examples/tree_sitter_drop_emscripten_dep.toml
+++ /dev/null
@@ -1,53 +0,0 @@
-url = "https://github.com/tree-sitter/tree-sitter.git"
-revision = "635c49909ce4aa7f58a9375374f91b1b434f6f9c"
-language_extension = "rs"
-
-prompt = """
-Change `compile_parser_to_wasm` to use `wasi-sdk` instead of emscripten.
-Use `ureq` to download the SDK for the current platform and architecture.
-Extract the archive into a sibling of `lib` inside the `tree-sitter` directory in the cache_dir.
-Compile the parser to wasm using the `bin/clang` executable (or `bin/clang.exe` on windows)
-that's inside of the archive.
-Don't re-download the SDK if that executable already exists.
-
-Use these clang flags: -fPIC -shared -Os -Wl,--export=tree_sitter_{language_name}
-
-Here are the available wasi-sdk assets:
-- wasi-sdk-25.0-x86_64-macos.tar.gz
-- wasi-sdk-25.0-arm64-macos.tar.gz
-- wasi-sdk-25.0-x86_64-linux.tar.gz
-- wasi-sdk-25.0-arm64-linux.tar.gz
-- wasi-sdk-25.0-x86_64-linux.tar.gz
-- wasi-sdk-25.0-arm64-linux.tar.gz
-- wasi-sdk-25.0-x86_64-windows.tar.gz
-"""
-
-[diff_assertions]
-
-modify_function = """
-The patch modifies the `compile_parser_to_wasm` function, removing logic for running `emscripten`,
-and adding logic to download `wasi-sdk`.
-"""
-
-use_listed_assets = """
-The patch implements logic for selecting from the assets listed in the prompt by detecting the
-current platform and architecture.
-"""
-
-add_deps = """
-The patch adds a dependency for `ureq` to the Cargo.toml, and adds an import to the top of `loader/lib.rs`
-If the patch uses any other dependencies (such as `tar` or `flate2`), it also correctly adds them
-to the Cargo.toml and imports them.
-"""
-
-[thread_assertions]
-
-find_specified_function = """
-The agent finds the specified function `compile_parser_to_wasm` in a logical way.
-It does not begin by guessing any paths to files in the codebase, but rather searches for the function by name.
-"""
-
-no_syntax_errors = """
-As it edits the file, the agent never introduces syntax errors. It's ok if there are other compile errors,
-but it should not introduce glaring issues like mismatched curly braces.
-"""
diff --git a/crates/eval/src/explorer.html b/crates/eval/src/explorer.html
deleted file mode 100644
index 04c41090d3..0000000000
--- a/crates/eval/src/explorer.html
+++ /dev/null
@@ -1,949 +0,0 @@
-<!doctype html>
-<html lang="en">
-    <head>
-        <meta charset="UTF-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <title>Eval Explorer</title>
-        <style>
-            :root {
-                /* Light theme (default) */
-                --bg-color: #ffffff;
-                --text-color: #333333;
-                --header-bg: #f8f8f8;
-                --border-color: #eaeaea;
-                --code-bg: #f5f5f5;
-                --link-color: #0066cc;
-                --button-bg: #f5f5f5;
-                --button-border: #ddd;
-                --button-active-bg: #0066cc;
-                --button-active-color: white;
-                --button-active-border: #0055aa;
-                --preview-bg: #f5f5f5;
-                --table-line: #f0f0f0;
-            }
-
-            /* Dark theme */
-            [data-theme="dark"] {
-                --bg-color: #1e1e1e;
-                --text-color: #e0e0e0;
-                --header-bg: #2d2d2d;
-                --border-color: #444444;
-                --code-bg: #2a2a2a;
-                --link-color: #4da6ff;
-                --button-bg: #333333;
-                --button-border: #555555;
-                --button-active-bg: #0066cc;
-                --button-active-color: white;
-                --button-active-border: #0055aa;
-                --preview-bg: #2a2a2a;
-                --table-line: #333333;
-            }
-
-            /* Apply theme variables */
-            body {
-                font-family: monospace;
-                line-height: 1.6;
-                margin: 0;
-                padding: 20px;
-                color: var(--text-color);
-                max-width: 1200px;
-                margin: 0 auto;
-                background-color: var(--bg-color);
-            }
-            h1 {
-                margin-bottom: 20px;
-                border-bottom: 1px solid var(--border-color);
-                padding-bottom: 10px;
-                font-family: monospace;
-            }
-            table {
-                width: 100%;
-                border-collapse: collapse;
-                margin-bottom: 20px;
-                table-layout: fixed; /* Ensure fixed width columns */
-            }
-            th,
-            td {
-                padding: 10px;
-                text-align: left;
-                border-bottom: 1px dotted var(--border-color);
-                vertical-align: top;
-                word-wrap: break-word; /* Ensure long content wraps */
-                overflow-wrap: break-word;
-            }
-            th {
-                background-color: var(--header-bg);
-                font-weight: 600;
-            }
-            .collapsible {
-                cursor: pointer;
-                color: var(--link-color);
-                text-decoration: underline;
-            }
-            .hidden {
-                display: none;
-            }
-            .tool-name {
-                font-weight: bold;
-            }
-            .tool-params {
-                padding-left: 20px;
-                color: #666;
-            }
-            pre {
-                background-color: var(--code-bg);
-                padding: 10px;
-                border-radius: 5px;
-                overflow-x: auto;
-                max-height: 200px;
-                margin: 10px 0;
-                font-family: monospace;
-                width: 100%;
-                box-sizing: border-box;
-                white-space: pre-wrap; /* Ensure text wraps */
-                color: var(--text-color);
-            }
-            code {
-                font-family: monospace;
-            }
-
-            /* Column sizing */
-            .turn-column {
-                width: 3%;
-                max-width: 3%;
-            }
-            .text-column {
-                width: 22%;
-                max-width: 22%;
-            }
-            .tool-column {
-                width: 38%;
-                max-width: 38%;
-            }
-            .result-column {
-                width: 37%;
-                max-width: 37%;
-                overflow-x: auto;
-            }
-
-            /* Content formatting */
-            .text-content {
-                font-family:
-                    system-ui,
-                    -apple-system,
-                    BlinkMacSystemFont,
-                    "Segoe UI",
-                    Roboto,
-                    Oxygen,
-                    Ubuntu,
-                    Cantarell,
-                    "Open Sans",
-                    "Helvetica Neue",
-                    sans-serif;
-                font-size: 0.7rem;
-            }
-            .action-container .action-preview,
-            .action-container .action-full {
-                margin-bottom: 5px;
-            }
-            .preview-content {
-                white-space: pre-wrap;
-                margin-bottom: 5px;
-                background-color: var(--preview-bg);
-                padding: 10px;
-                border-radius: 5px;
-                font-family: monospace;
-                width: 100%;
-                box-sizing: border-box;
-                overflow-wrap: break-word;
-                color: var(--text-color);
-            }
-            .show-more {
-                color: var(--link-color);
-                cursor: pointer;
-                text-decoration: none;
-                display: block;
-                margin-top: 5px;
-            }
-            .more-inline {
-                color: var(--link-color);
-                cursor: pointer;
-                text-decoration: none;
-                display: inline;
-                margin-left: 5px;
-            }
-
-            /* Compact mode styles */
-            .compact-mode td {
-                padding: 5px; /* Reduced padding in compact mode */
-            }
-
-            .compact-mode .preview-content {
-                padding: 2px;
-                margin-bottom: 2px;
-            }
-
-            .compact-mode pre {
-                padding: 5px;
-                margin: 5px 0;
-                white-space: pre; /* Don't wrap code in compact mode */
-                overflow-x: auto; /* Add horizontal scrollbar */
-            }
-
-            .compact-mode .result-column pre,
-            .compact-mode .result-column .preview-content {
-                max-width: 100%;
-                overflow-x: auto;
-                white-space: pre;
-            }
-
-            /* Make action containers more compact */
-            .compact-mode .action-container {
-                margin-bottom: 2px;
-            }
-
-            /* Reduce space between turns */
-            .compact-mode tr {
-                border-bottom: 1px solid var(--table-line);
-            }
-
-            /* Tool params more compact */
-            .compact-mode .tool-params {
-                padding-left: 10px;
-                margin-top: 2px;
-            }
-
-            hr {
-                margin: 10px 0;
-                border: 0;
-                height: 1px;
-                background-color: var(--border-color);
-            }
-
-            /* View switcher */
-            .view-switcher {
-                display: flex;
-                gap: 10px;
-                margin-bottom: 20px;
-                align-items: center;
-            }
-
-            .view-button {
-                background-color: var(--button-bg);
-                border: 1px solid var(--button-border);
-                border-radius: 4px;
-                padding: 5px 15px;
-                cursor: pointer;
-                font-family: monospace;
-                font-size: 0.9rem;
-                transition: all 0.2s ease;
-                color: var(--text-color);
-            }
-
-            .view-button:hover {
-                background-color: var(--button-border);
-            }
-
-            .view-button.active {
-                background-color: var(--button-active-bg);
-                color: var(--button-active-color);
-                border-color: var(--button-active-border);
-            }
-
-            /* Navigation bar styles */
-            .thread-navigation {
-                display: flex;
-                align-items: center;
-                margin-bottom: 20px;
-                padding: 10px 0;
-                border-bottom: 1px solid var(--border-color);
-            }
-
-            .nav-button {
-                background-color: var(--button-bg);
-                border: 1px solid var(--button-border);
-                border-radius: 4px;
-                padding: 5px 15px;
-                cursor: pointer;
-                font-family: monospace;
-                font-size: 0.9rem;
-                transition: all 0.2s ease;
-                color: var(--text-color);
-            }
-
-            .nav-button:hover:not(:disabled) {
-                background-color: var(--button-border);
-            }
-
-            .nav-button:disabled {
-                opacity: 0.5;
-                cursor: not-allowed;
-            }
-
-            .thread-indicator {
-                margin: 0 15px;
-                font-size: 1rem;
-                flex-grow: 1;
-                text-align: center;
-            }
-
-            #thread-id {
-                font-weight: bold;
-            }
-
-            /* Theme switcher */
-            .theme-switcher {
-                margin-left: auto;
-                display: flex;
-                align-items: center;
-            }
-
-            .theme-button {
-                background-color: var(--button-bg);
-                border: 1px solid var(--button-border);
-                border-radius: 4px;
-                padding: 5px 10px;
-                cursor: pointer;
-                font-size: 0.9rem;
-                transition: all 0.2s ease;
-                color: var(--text-color);
-                display: flex;
-                align-items: center;
-            }
-
-            .theme-button:hover {
-                background-color: var(--button-border);
-            }
-
-            .theme-icon {
-                margin-right: 5px;
-                font-size: 1rem;
-            }
-        </style>
-    </head>
-    <body>
-        <h1 id="current-filename">Thread Explorer</h1>
-        <div class="view-switcher">
-            <button id="full-view" class="view-button active" onclick="switchView('full')">Full View</button>
-            <button id="compact-view" class="view-button" onclick="switchView('compact')">Compact View</button>
-            <button
-                id="export-button"
-                class="view-button"
-                onclick="exportThreadAsJson()"
-                title="Export current thread as JSON"
-            >
-                Export
-            </button>
-            <div class="theme-switcher">
-                <button id="theme-toggle" class="theme-button" onclick="toggleTheme()">
-                    <span id="theme-icon" class="theme-icon">☀️</span>
-                    <span id="theme-text">Light</span>
-                </button>
-            </div>
-        </div>
-        <div class="thread-navigation">
-            <button
-                id="prev-thread"
-                class="nav-button"
-                onclick="previousThread()"
-                title="Previous thread (Ctrl+←, k, or h)"
-                disabled
-            >
-                &larr; Previous
-            </button>
-            <div class="thread-indicator">
-                Thread <span id="current-thread-index">1</span> of <span id="total-threads">1</span>:
-                <span id="thread-id">Default Thread</span>
-            </div>
-            <button
-                id="next-thread"
-                class="nav-button"
-                onclick="nextThread()"
-                title="Next thread (Ctrl+→, j, or l)"
-                disabled
-            >
-                Next &rarr;
-            </button>
-        </div>
-        <table id="thread-table">
-            <thead>
-                <tr>
-                    <th class="turn-column">Turn</th>
-                    <th class="text-column">Text</th>
-                    <th class="tool-column">Tool</th>
-                    <th class="result-column">Result</th>
-                </tr>
-            </thead>
-            <tbody id="thread-body">
-                <!-- Content will be filled dynamically -->
-            </tbody>
-        </table>
-
-        <script>
-            // View mode - 'full' or 'compact'
-            let viewMode = "full";
-
-            // Theme mode - 'light', 'dark', or 'system'
-            let themeMode = localStorage.getItem("theme") || "system";
-
-            // Function to apply theme
-            function applyTheme(theme) {
-                const themeIcon = document.getElementById("theme-icon");
-                const themeText = document.getElementById("theme-text");
-
-                if (theme === "dark") {
-                    document.documentElement.setAttribute("data-theme", "dark");
-                    themeIcon.textContent = "🌙";
-                    themeText.textContent = "Dark";
-                } else {
-                    document.documentElement.removeAttribute("data-theme");
-                    themeIcon.textContent = "☀️";
-                    themeText.textContent = "Light";
-                }
-            }
-
-            // Function to toggle between light and dark themes
-            function toggleTheme() {
-                // If currently system or light, switch to dark
-                if (themeMode === "system") {
-                    const systemDark = window.matchMedia("(prefers-color-scheme: dark)").matches;
-                    themeMode = systemDark ? "light" : "dark";
-                } else {
-                    themeMode = themeMode === "light" ? "dark" : "light";
-                }
-
-                // Save preference
-                localStorage.setItem("theme", themeMode);
-
-                // Apply theme
-                applyTheme(themeMode);
-            }
-
-            // Initialize theme based on system or saved preference
-            function initTheme() {
-                if (themeMode === "system") {
-                    // Use system preference
-                    const systemDark = window.matchMedia("(prefers-color-scheme: dark)").matches;
-                    applyTheme(systemDark ? "dark" : "light");
-
-                    // Listen for system theme changes
-                    window.matchMedia("(prefers-color-scheme: dark)").addEventListener("change", (e) => {
-                        if (themeMode === "system") {
-                            applyTheme(e.matches ? "dark" : "light");
-                        }
-                    });
-                } else {
-                    // Use saved preference
-                    applyTheme(themeMode);
-                }
-            }
-
-            // Function to switch between view modes
-            function switchView(mode) {
-                viewMode = mode;
-
-                // Update button states
-                document.getElementById("full-view").classList.toggle("active", mode === "full");
-                document.getElementById("compact-view").classList.toggle("active", mode === "compact");
-
-                // Add or remove compact-mode class on the body
-                document.body.classList.toggle("compact-mode", mode === "compact");
-
-                // Re-render the thread with the new view mode
-                renderThread();
-            }
-
-            // Function to export the current thread as a JSON file
-            function exportThreadAsJson() {
-                // Clone the thread to avoid modifying the original
-                const threadToExport = JSON.parse(JSON.stringify(thread));
-
-                // Create a Blob with the JSON data
-                const blob = new Blob([JSON.stringify(threadToExport, null, 2)], { type: "application/json" });
-
-                // Create a download link
-                const url = URL.createObjectURL(blob);
-                const a = document.createElement("a");
-                a.href = url;
-
-                // Generate filename based on thread ID or index
-                const filename =
-                    threadToExport.thread_id || threadToExport.filename || `thread-${currentThreadIndex + 1}.json`;
-                a.download = filename.endsWith(".json") ? filename : `${filename}.json`;
-
-                // Trigger the download
-                document.body.appendChild(a);
-                a.click();
-
-                // Clean up
-                setTimeout(() => {
-                    document.body.removeChild(a);
-                    URL.revokeObjectURL(url);
-                }, 0);
-            }
-            // Default dummy thread data for preview purposes
-            let dummyThread = {
-                messages: [
-                    {
-                        role: "system",
-                        content: [{ Text: "System prompt..." }],
-                    },
-                    {
-                        role: "user",
-                        content: [{ Text: "Fix the bug: kwargs not passed..." }],
-                    },
-                    {
-                        role: "assistant",
-                        content: [
-                            { Text: "I'll help you fix that bug." },
-                            {
-                                ToolUse: {
-                                    name: "list_directory",
-                                    input: { path: "fastmcp" },
-                                    is_input_complete: true,
-                                },
-                            },
-                        ],
-                    },
-                    {
-                        role: "user",
-                        content: [
-                            {
-                                ToolResult: {
-                                    tool_name: "list_directory",
-                                    is_error: false,
-                                    content:
-                                        "fastmcp/src\nfastmcp/tests\nfastmcp/README.md\nfastmcp/pyproject.toml\nfastmcp/.gitignore\nfastmcp/setup.py\nfastmcp/examples\nfastmcp/LICENSE",
-                                },
-                            },
-                        ],
-                    },
-                    {
-                        role: "assistant",
-                        content: [
-                            { Text: "Let's examine the code." },
-                            {
-                                ToolUse: {
-                                    name: "read_file",
-                                    input: {
-                                        path: "fastmcp/main.py",
-                                        start_line: 253,
-                                        end_line: 360,
-                                    },
-                                    is_input_complete: true,
-                                },
-                            },
-                        ],
-                    },
-                    {
-                        role: "user",
-                        content: [
-                            {
-                                ToolResult: {
-                                    tool_name: "read_file",
-                                    is_error: false,
-                                    content:
-                                        "def run_application(app, **kwargs):\n    return anyio.run(app, **kwargs)\n\nasync def start_server():\n    # More code...\n    # Multiple lines of code that would be displayed\n    # when clicking on the show more link\n    app = create_app()\n    await run_app(app)\n\ndef main():\n    # Initialize everything\n    anyio.run(start_server)\n    # Even more code here\n    # that would be shown when the user\n    # expands the content",
-                                },
-                            },
-                        ],
-                    },
-                    {
-                        role: "assistant",
-                        content: [
-                            { Text: "I found the issue." },
-                            {
-                                ToolUse: {
-                                    name: "edit_file",
-                                    input: {
-                                        path: "fastmcp/core.py",
-                                        old_string: "def start_server(app):\n    anyio.run(app)",
-                                        new_string: "def start_server(app, **kwargs):\n    anyio.run(app, **kwargs)",
-                                        display_description: "Fix kwargs passing to anyio.run",
-                                    },
-                                    is_input_complete: true,
-                                },
-                            },
-                        ],
-                    },
-                    {
-                        role: "user",
-                        content: [
-                            {
-                                ToolResult: {
-                                    tool_name: "edit_file",
-                                    is_error: false,
-                                    content: "Made edit to fastmcp/core.py",
-                                },
-                            },
-                        ],
-                    },
-                    {
-                        role: "assistant",
-                        content: [
-                            { Text: "Let's check if there are any errors." },
-                            {
-                                ToolUse: {
-                                    name: "diagnostics",
-                                    input: {},
-                                    is_input_complete: true,
-                                },
-                            },
-                        ],
-                    },
-                    {
-                        role: "user",
-                        content: [
-                            {
-                                ToolResult: {
-                                    tool_name: "diagnostics",
-                                    is_error: false,
-                                    content: "No errors found",
-                                },
-                            },
-                        ],
-                    },
-                ],
-            };
-
-            // The actual thread data will be injected here when opened by eval
-            let threadsData = window.threadsData || { threads: [dummyThread] };
-
-            // Initialize thread variables
-            let threads = threadsData.threads;
-            let currentThreadIndex = 0;
-            let thread = threads[currentThreadIndex];
-
-            // Function to navigate to the previous thread
-            function previousThread() {
-                if (currentThreadIndex > 0) {
-                    currentThreadIndex--;
-                    switchToThread(currentThreadIndex);
-                }
-            }
-
-            // Function to navigate to the next thread
-            function nextThread() {
-                if (currentThreadIndex < threads.length - 1) {
-                    currentThreadIndex++;
-                    switchToThread(currentThreadIndex);
-                }
-            }
-
-            // Function to switch to a specific thread by index
-            function switchToThread(index) {
-                if (index >= 0 && index < threads.length) {
-                    currentThreadIndex = index;
-                    thread = threads[currentThreadIndex];
-                    updateNavigationButtons();
-                    renderThread();
-                }
-            }
-
-            // Function to update the navigation buttons state
-            function updateNavigationButtons() {
-                document.getElementById("prev-thread").disabled = currentThreadIndex <= 0;
-                document.getElementById("next-thread").disabled = currentThreadIndex >= threads.length - 1;
-                document.getElementById("current-thread-index").textContent = currentThreadIndex + 1;
-                document.getElementById("total-threads").textContent = threads.length;
-            }
-
-            function renderThread() {
-                const tbody = document.getElementById("thread-body");
-                tbody.innerHTML = ""; // Clear existing content
-
-                // Set thread name if available
-                const threadId = thread.thread_id || `Thread ${currentThreadIndex + 1}`;
-                document.getElementById("thread-id").textContent = threadId;
-
-                // Set filename in the header if available
-                const filename = thread.filename || `Thread ${currentThreadIndex + 1}`;
-                document.getElementById("current-filename").textContent = filename;
-
-                // Skip system message
-                const nonSystemMessages = thread.messages.filter((msg) => msg.role !== "system");
-
-                let turnNumber = 0;
-                processMessages(nonSystemMessages, tbody, turnNumber);
-            }
-
-            function processMessages(messages, tbody) {
-                let turnNumber = 0;
-
-                for (let i = 0; i < messages.length; i++) {
-                    const msg = messages[i];
-
-                    if (isUserQuery(msg)) {
-                        // User message starts a new turn
-                        turnNumber++;
-                        renderUserMessage(msg, turnNumber, tbody);
-                    } else if (msg.role === "assistant") {
-                        // Each assistant message is one turn
-                        turnNumber++;
-
-                        // Collect all text content and tool uses for this turn
-                        let assistantText = "";
-                        let toolUses = [];
-
-                        // First, collect all text content
-                        for (const content of msg.content) {
-                            if (content.hasOwnProperty("Text")) {
-                                if (assistantText) {
-                                    assistantText += "<br><br>" + formatContent(content.Text);
-                                } else {
-                                    assistantText = formatContent(content.Text);
-                                }
-                            } else if (content.hasOwnProperty("ToolUse")) {
-                                toolUses.push(content.ToolUse);
-                            }
-                        }
-
-                        // Create a single row for this turn with text and tools
-                        const row = document.createElement("tr");
-                        row.id = `assistant-turn-${turnNumber}`;
-
-                        // Start with the turn number and assistant text
-                        row.innerHTML = `
-                            <td class="text-content">${turnNumber}</td>
-                            <td class="text-content"><!--Assistant: <br/ -->${assistantText}</td>
-                            <td id="tools-${turnNumber}"></td>
-                            <td id="results-${turnNumber}"></td>
-                        `;
-
-                        tbody.appendChild(row);
-
-                        // Add all tool calls to the tools cell
-                        const toolsCell = document.getElementById(`tools-${turnNumber}`);
-                        const resultsCell = document.getElementById(`results-${turnNumber}`);
-
-                        // Process all tools and their results
-                        for (let j = 0; j < toolUses.length; j++) {
-                            const toolUse = toolUses[j];
-                            const toolCall = formatToolCall(toolUse.name, toolUse.input);
-
-                            // Add the tool call to the tools cell
-                            if (j > 0) toolsCell.innerHTML += "<hr>";
-                            toolsCell.innerHTML += toolCall;
-
-                            // Look for corresponding tool result
-                            if (hasMatchingToolResult(messages, i, toolUse.name)) {
-                                const resultMsg = messages[i + 1];
-                                const toolResult = findToolResult(resultMsg, toolUse.name);
-
-                                if (toolResult) {
-                                    // Add the result to the results cell
-                                    if (j > 0) resultsCell.innerHTML += "<hr>";
-
-                                    // Create a container for the result
-                                    const resultDiv = document.createElement("div");
-                                    resultDiv.className = "tool-result";
-
-                                    // Format and display the tool result
-                                    formatToolResultInline(toolResult.content.Text, resultDiv);
-                                    resultsCell.appendChild(resultDiv);
-
-                                    // Skip the result message in the next iteration
-                                    if (j === toolUses.length - 1) {
-                                        i++;
-                                    }
-                                }
-                            }
-                        }
-                    } else if (msg.role === "user" && msg.content.some((c) => c.hasOwnProperty("ToolResult"))) {
-                        // Skip tool result messages as they are handled with their corresponding tool use
-                        continue;
-                    }
-                }
-            }
-
-            function isUserQuery(message) {
-                return message.role === "user" && !message.content.some((c) => c.hasOwnProperty("ToolResult"));
-            }
-
-            function renderUserMessage(message, turnNumber, tbody) {
-                const row = document.createElement("tr");
-                row.innerHTML = `
-                    <td>${turnNumber}</td>
-                    <td class="text-content"><b>[User]:</b><br/> ${formatContent(message.content[0].Text)}</td>
-                    <td></td>
-                    <td></td>
-                `;
-                tbody.appendChild(row);
-            }
-
-            function hasMatchingToolResult(messages, currentIndex, toolName) {
-                return (
-                    currentIndex + 1 < messages.length &&
-                    messages[currentIndex + 1].role === "user" &&
-                    messages[currentIndex + 1].content.some(
-                        (c) => c.hasOwnProperty("ToolResult") && c.ToolResult.tool_name === toolName,
-                    )
-                );
-            }
-
-            function findToolResult(resultMessage, toolName) {
-                const toolResultContent = resultMessage.content.find(
-                    (c) => c.hasOwnProperty("ToolResult") && c.ToolResult.tool_name === toolName,
-                );
-
-                return toolResultContent ? toolResultContent.ToolResult : null;
-            }
-            function formatToolCall(name, input) {
-                // In compact mode, format tool calls on a single line
-                if (viewMode === "compact") {
-                    const params = [];
-                    const fullParams = [];
-
-                    // Process all parameters
-                    for (const [key, value] of Object.entries(input)) {
-                        if (value !== null && value !== undefined) {
-                            // Store full parameter for expanded view
-                            let fullValue = typeof value === "string" ? `"${value}"` : value;
-                            fullParams.push([key, fullValue]);
-
-                            // Abbreviated value for compact view
-                            let displayValue = fullValue;
-                            if (typeof value === "string" && value.length > 30) {
-                                displayValue = `"${value.substring(0, 30)}..."`;
-                            }
-                            params.push(`${key}=${displayValue}`);
-                        }
-                    }
-
-                    const paramString = params.join(", ");
-                    const fullLine = `<span class="tool-name">${name}</span>(${paramString})`;
-
-                    // If the line is too long, add a [more] link
-                    if (fullLine.length > 80 || params.length > 1) {
-                        // Create a container with the compact and full views
-                        const compactView = `<span class="tool-name">${name}</span>(${params[0]}, <span class="more-inline" onclick="toggleActionVisibility(this)">[...]</span>)`;
-
-                        // For the full view, use the original untruncated values
-                        let result = `<span class="tool-name">${name}</span>(`;
-                        const formattedParams = fullParams
-                            .map((p) => `&nbsp;&nbsp;&nbsp;&nbsp;${p[0]}=${p[1]}`)
-                            .join(",<br/>");
-                        const fullView = `${result}<br/>${formattedParams}<br/>)`;
-
-                        return `<div class="action-container">
-                            <div class="action-preview">${compactView}</div>
-                            <div class="action-full hidden">${fullView}</div>
-                        </div>`;
-                    }
-
-                    return fullLine;
-                }
-
-                // Regular (full) view formatting with multiple lines
-                let result = `<span class="tool-name">${name}</span>(`;
-                const params = [];
-                for (const [key, value] of Object.entries(input)) {
-                    if (value !== null && value !== undefined) {
-                        // Format different types of values
-                        let formattedValue = typeof value === "string" ? `"${value}"` : value;
-                        params.push([key, formattedValue]);
-                    }
-                }
-
-                if (params.length === 0) {
-                    return `${result})`;
-                } else if (params.length === 1) {
-                    // For single parameter, just show the value without the parameter name
-                    return `${result}${params[0][1]})`;
-                } else {
-                    // Format parameters
-                    const formattedParams = params.map((p) => `&nbsp;&nbsp;&nbsp;&nbsp;${p[0]}=${p[1]}`).join(",<br/>");
-                    return `${result}<br/>${formattedParams}<br/>)`;
-                }
-            }
-
-            function toggleActionVisibility(element, remainingLines) {
-                const container = element.closest(".action-container");
-                const preview = container.querySelector(".action-preview");
-                const full = container.querySelector(".action-full");
-
-                // Once expanded, keep it expanded
-                full.classList.remove("hidden");
-                preview.classList.add("hidden");
-            }
-
-            function formatToolResultInline(content, targetElement) {
-                // Count lines
-                const lines = content.split("\n");
-
-                // In compact mode, show only 1 line with [more] link
-                if (viewMode === "compact" && lines.length > 1) {
-                    // Create container
-                    const container = document.createElement("div");
-
-                    // Preview content
-                    const previewDiv = document.createElement("div");
-                    previewDiv.className = "preview-content";
-
-                    // Add the first line of content plus [more] link
-                    const previewContent = lines[0];
-                    previewDiv.innerHTML =
-                        escapeHtml(previewContent) +
-                        ` <span class="more-inline" onclick="toggleResultVisibility(this)">[...]</span>`;
-
-                    // Full content (initially hidden)
-                    const contentDiv = document.createElement("pre");
-                    contentDiv.className = "hidden";
-                    contentDiv.innerHTML = escapeHtml(content);
-
-                    container.appendChild(previewDiv);
-                    container.appendChild(contentDiv);
-                    targetElement.appendChild(container);
-                } else {
-                    // For full view or short results, display everything
-                    const preElement = document.createElement("pre");
-                    preElement.textContent = content;
-                    targetElement.appendChild(preElement);
-                }
-            }
-
-            function toggleResultVisibility(element, remainingLines) {
-                const container = element.parentElement.parentElement;
-                const preview = container.querySelector(".preview-content");
-                const full = container.querySelector("pre");
-
-                // Once expanded, keep it expanded
-                full.classList.remove("hidden");
-                preview.classList.add("hidden");
-            }
-
-            function formatContent(text) {
-                return escapeHtml(text);
-            }
-
-            function escapeHtml(text) {
-                const div = document.createElement("div");
-                div.textContent = text;
-                return div.innerHTML;
-            }
-
-            // Keyboard navigation handler
-            document.addEventListener("keydown", function (event) {
-                // previous thread
-                if ((event.ctrlKey && event.key === "ArrowLeft") || event.key === "h" || event.key === "k") {
-                    if (!document.getElementById("prev-thread").disabled) {
-                        previousThread();
-                    }
-                }
-                // next thread
-                else if ((event.ctrlKey && event.key === "ArrowRight") || event.key === "j" || event.key === "l") {
-                    if (!document.getElementById("next-thread").disabled) {
-                        nextThread();
-                    }
-                }
-            });
-
-            // Initialize the page
-            document.addEventListener("DOMContentLoaded", function () {
-                initTheme();
-                updateNavigationButtons();
-                renderThread();
-            });
-        </script>
-    </body>
-</html>
diff --git a/crates/eval/src/explorer.rs b/crates/eval/src/explorer.rs
deleted file mode 100644
index 3326070cea..0000000000
--- a/crates/eval/src/explorer.rs
+++ /dev/null
@@ -1,182 +0,0 @@
-use anyhow::{Context as _, Result};
-use clap::Parser;
-use serde_json::{Value, json};
-use std::fs;
-use std::path::{Path, PathBuf};
-
-#[derive(Parser, Debug)]
-#[clap(about = "Generate HTML explorer from JSON thread files")]
-struct Args {
-    /// Paths to JSON files or directories. If a directory is provided,
-    /// it will be searched for 'last.messages.json' files up to 2 levels deep.
-    #[clap(long, required = true, num_args = 1..)]
-    input: Vec<PathBuf>,
-
-    /// Path where the output HTML file will be written
-    #[clap(long)]
-    output: PathBuf,
-}
-
-/// Recursively finds files with `target_filename` in `dir_path` up to `max_depth`.
-#[allow(dead_code)]
-fn find_target_files_recursive(
-    dir_path: &Path,
-    target_filename: &str,
-    current_depth: u8,
-    max_depth: u8,
-    found_files: &mut Vec<PathBuf>,
-) -> Result<()> {
-    if current_depth > max_depth {
-        return Ok(());
-    }
-
-    for entry_result in fs::read_dir(dir_path)
-        .with_context(|| format!("Failed to read directory: {}", dir_path.display()))?
-    {
-        let entry = entry_result.with_context(|| {
-            format!("Failed to read directory entry in: {}", dir_path.display())
-        })?;
-        let path = entry.path();
-
-        if path.is_dir() {
-            find_target_files_recursive(
-                &path,
-                target_filename,
-                current_depth + 1,
-                max_depth,
-                found_files,
-            )?;
-        } else if path.is_file()
-            && let Some(filename_osstr) = path.file_name()
-            && let Some(filename_str) = filename_osstr.to_str()
-            && filename_str == target_filename
-        {
-            found_files.push(path);
-        }
-    }
-    Ok(())
-}
-
-pub fn generate_explorer_html(input_paths: &[PathBuf], output_path: &PathBuf) -> Result<String> {
-    if let Some(parent) = output_path.parent()
-        && !parent.exists()
-    {
-        fs::create_dir_all(parent).context(format!(
-            "Failed to create output directory: {}",
-            parent.display()
-        ))?;
-    }
-
-    let template_path = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("src/explorer.html");
-    let template_content = fs::read_to_string(&template_path).context(format!(
-        "Template file not found or couldn't be read: {}",
-        template_path.display()
-    ))?;
-
-    if input_paths.is_empty() {
-        println!(
-            "No input JSON files found to process. Explorer will be generated with template defaults or empty data."
-        );
-    }
-
-    let threads = input_paths
-        .iter()
-        .map(|input_path| {
-            let file_content = fs::read_to_string(input_path)
-                .context(format!("Failed to read file: {}", input_path.display()))?;
-            let mut thread_data: Value = file_content
-                .parse::<Value>()
-                .context(format!("Failed to parse JSON from file: {}", input_path.display()))?;
-
-            if let Some(obj) = thread_data.as_object_mut() {
-                obj.insert("filename".to_string(), json!(input_path.display().to_string()));
-            } else {
-                eprintln!("Warning: JSON data in {} is not a root object. Wrapping it to include filename.", input_path.display());
-                thread_data = json!({
-                    "original_data": thread_data,
-                    "filename": input_path.display().to_string()
-                });
-            }
-            Ok(thread_data)
-        })
-        .collect::<Result<Vec<_>>>()?;
-
-    let all_threads_data = json!({ "threads": threads });
-    let html_content = inject_thread_data(template_content, all_threads_data)?;
-    fs::write(&output_path, &html_content)
-        .context(format!("Failed to write output: {}", output_path.display()))?;
-
-    println!(
-        "Saved data from {} resolved file(s) ({} threads) to {}",
-        input_paths.len(),
-        threads.len(),
-        output_path.display()
-    );
-    Ok(html_content)
-}
-
-fn inject_thread_data(template: String, threads_data: Value) -> Result<String> {
-    let injection_marker = "let threadsData = window.threadsData || { threads: [dummyThread] };";
-    if !template.contains(injection_marker) {
-        anyhow::bail!(
-            "Could not find the thread injection point in the template. Expected: '{}'",
-            injection_marker
-        );
-    }
-
-    let threads_json_string = serde_json::to_string_pretty(&threads_data)
-        .context("Failed to serialize threads data to JSON")?
-        .replace("</script>", r"<\/script>");
-
-    let script_injection = format!("let threadsData = {};", threads_json_string);
-    let final_html = template.replacen(injection_marker, &script_injection, 1);
-
-    Ok(final_html)
-}
-
-#[cfg(not(any(test, doctest)))]
-#[allow(dead_code)]
-fn main() -> Result<()> {
-    let args = Args::parse();
-
-    const DEFAULT_FILENAME: &str = "last.messages.json";
-    const MAX_SEARCH_DEPTH: u8 = 2;
-
-    let mut resolved_input_files: Vec<PathBuf> = Vec::new();
-
-    for input_path_arg in &args.input {
-        if !input_path_arg.exists() {
-            eprintln!(
-                "Warning: Input path {} does not exist. Skipping.",
-                input_path_arg.display()
-            );
-            continue;
-        }
-
-        if input_path_arg.is_dir() {
-            find_target_files_recursive(
-                input_path_arg,
-                DEFAULT_FILENAME,
-                0, // starting depth
-                MAX_SEARCH_DEPTH,
-                &mut resolved_input_files,
-            )
-            .with_context(|| {
-                format!(
-                    "Error searching for '{}' files in directory: {}",
-                    DEFAULT_FILENAME,
-                    input_path_arg.display()
-                )
-            })?;
-        } else if input_path_arg.is_file() {
-            resolved_input_files.push(input_path_arg.clone());
-        }
-    }
-
-    resolved_input_files.sort_unstable();
-    resolved_input_files.dedup();
-
-    println!("No input paths provided/found.");
-
-    generate_explorer_html(&resolved_input_files, &args.output).map(|_| ())
-}
diff --git a/crates/eval/src/ids.rs b/crates/eval/src/ids.rs
deleted file mode 100644
index 7057344206..0000000000
--- a/crates/eval/src/ids.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-use anyhow::{Context as _, Result};
-use std::fs;
-use std::path::{Path, PathBuf};
-use uuid::Uuid;
-
-pub fn get_or_create_id(path: &Path) -> Result<String> {
-    if let Ok(id) = fs::read_to_string(path) {
-        let trimmed = id.trim();
-        if !trimmed.is_empty() {
-            return Ok(trimmed.to_string());
-        }
-    }
-    let new_id = Uuid::new_v4().to_string();
-    fs::create_dir_all(path.parent().context("invalid id path")?)?;
-    fs::write(path, &new_id)?;
-    Ok(new_id)
-}
-
-pub fn eval_system_id_path() -> PathBuf {
-    dirs::data_local_dir()
-        .unwrap_or_else(|| PathBuf::from("."))
-        .join("zed-eval-system-id")
-}
-
-pub fn eval_installation_id_path() -> PathBuf {
-    dirs::data_local_dir()
-        .unwrap_or_else(|| PathBuf::from("."))
-        .join("zed-eval-installation-id")
-}
diff --git a/crates/eval/src/instance.rs b/crates/eval/src/instance.rs
deleted file mode 100644
index 1af705cd4b..0000000000
--- a/crates/eval/src/instance.rs
+++ /dev/null
@@ -1,1424 +0,0 @@
-use agent::ContextServerRegistry;
-use agent_client_protocol as acp;
-use anyhow::{Context as _, Result, anyhow, bail};
-use client::proto::LspWorkProgress;
-use futures::channel::mpsc;
-use futures::future::Shared;
-use futures::{FutureExt as _, StreamExt as _, future};
-use gpui::{App, AppContext as _, AsyncApp, Entity, Task};
-use handlebars::Handlebars;
-use language::{Buffer, DiagnosticSeverity, OffsetRangeExt as _};
-use language_model::{
-    LanguageModel, LanguageModelCompletionEvent, LanguageModelRegistry, LanguageModelRequest,
-    LanguageModelRequestMessage, LanguageModelToolResultContent, MessageContent, Role, TokenUsage,
-};
-use project::{DiagnosticSummary, Project, ProjectPath, lsp_store::OpenLspBufferHandle};
-use prompt_store::{ProjectContext, WorktreeContext};
-use rand::{distr, prelude::*};
-use serde::{Deserialize, Serialize};
-use std::{
-    fmt::Write as _,
-    fs::{self, File},
-    io::Write as _,
-    path::{Path, PathBuf},
-    rc::Rc,
-    sync::{Arc, Mutex},
-    time::Duration,
-};
-use unindent::Unindent as _;
-use util::{ResultExt as _, command::new_smol_command, markdown::MarkdownCodeBlock};
-
-use crate::{
-    AgentAppState, ToolMetrics,
-    assertions::{AssertionsReport, RanAssertion, RanAssertionResult},
-    example::{Example, ExampleContext, FailedAssertion, JudgeAssertion},
-};
-
-pub const ZED_REPO_URL: &str = "https://github.com/zed-industries/zed.git";
-
-#[derive(Clone)]
-pub struct ExampleInstance {
-    pub thread: Rc<dyn Example>,
-    pub name: String,
-    pub run_directory: PathBuf,
-    pub log_prefix: String,
-    /// The repetition number for this example (0-based)
-    /// When running multiple repetitions of the same example, each instance is assigned a unique repetition number.
-    /// This affects the worktree path and log prefix to avoid clobbering results between runs.
-    pub repetition: usize,
-    pub repo_path: PathBuf,
-    /// Path to the directory containing the requests and responses for the agentic loop
-    worktrees_dir: PathBuf,
-}
-
-#[derive(Debug, Serialize, Clone)]
-pub struct RunOutput {
-    pub repository_diff: String,
-    pub diagnostic_summary_before: DiagnosticSummary,
-    pub diagnostic_summary_after: DiagnosticSummary,
-    pub diagnostics_before: Option<String>,
-    pub diagnostics_after: Option<String>,
-    pub token_usage: TokenUsage,
-    pub tool_metrics: ToolMetrics,
-    pub thread_markdown: String,
-    pub programmatic_assertions: AssertionsReport,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct JudgeDiffInput {
-    pub repository_diff: String,
-    pub assertion: String,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct JudgeThreadInput {
-    pub messages: String,
-    pub assertion: String,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct JudgeOutput {
-    pub thread: AssertionsReport,
-    pub diff: AssertionsReport,
-}
-
-impl ExampleInstance {
-    pub fn new(
-        thread: Rc<dyn Example>,
-        repos_dir: &Path,
-        run_dir: &Path,
-        worktrees_dir: &Path,
-        repetition: usize,
-    ) -> Self {
-        let name = thread.meta().name;
-        let run_directory = run_dir.join(&name).join(repetition.to_string());
-
-        let repo_path = repo_path_for_url(repos_dir, &thread.meta().url);
-
-        Self {
-            name,
-            thread,
-            log_prefix: String::new(),
-            run_directory,
-            repetition,
-            repo_path,
-            worktrees_dir: worktrees_dir.to_path_buf(),
-        }
-    }
-
-    pub fn repo_url(&self) -> String {
-        self.thread.meta().url
-    }
-
-    pub fn revision(&self) -> String {
-        self.thread.meta().revision
-    }
-
-    pub fn worktree_name(&self) -> String {
-        format!("{}-{}", self.name, self.repetition)
-    }
-
-    pub fn set_log_prefix_style(&mut self, color: &str, name_width: usize) {
-        self.log_prefix = format!(
-            "{}{:<width$}\x1b[0m | ",
-            color,
-            self.worktree_name(),
-            width = name_width
-        );
-    }
-
-    /// Set up the example by checking out the specified Git revision
-    pub async fn fetch(&mut self) -> Result<()> {
-        let meta = self.thread.meta();
-
-        let revision_exists = run_git(
-            &self.repo_path,
-            &["rev-parse", &format!("{}^{{commit}}", &meta.revision)],
-        )
-        .await
-        .is_ok();
-
-        if !revision_exists {
-            println!("{}Fetching revision {}", self.log_prefix, &meta.revision);
-            run_git(
-                &self.repo_path,
-                &["fetch", "--depth", "1", "origin", &meta.revision],
-            )
-            .await?;
-        }
-        Ok(())
-    }
-
-    /// Set up the example by checking out the specified Git revision
-    pub async fn setup(&mut self) -> Result<()> {
-        let worktree_path = self.worktree_path();
-        let meta = self.thread.meta();
-        if worktree_path.is_dir() {
-            println!("{}Resetting existing worktree", self.log_prefix);
-
-            // TODO: consider including "-x" to remove ignored files. The downside of this is that
-            // it will also remove build artifacts, and so prevent incremental reuse there.
-            run_git(&worktree_path, &["clean", "--force", "-d"]).await?;
-            run_git(&worktree_path, &["reset", "--hard", "HEAD"]).await?;
-            run_git(&worktree_path, &["checkout", &meta.revision]).await?;
-        } else {
-            println!("{}Creating worktree", self.log_prefix);
-
-            let worktree_path_string = worktree_path.to_string_lossy().into_owned();
-
-            run_git(
-                &self.repo_path,
-                &[
-                    "worktree",
-                    "add",
-                    "-f",
-                    &worktree_path_string,
-                    &meta.revision,
-                ],
-            )
-            .await?;
-        }
-
-        if meta.url == ZED_REPO_URL {
-            std::fs::write(worktree_path.join(".rules"), std::fs::read(".rules")?)?;
-        }
-
-        std::fs::create_dir_all(&self.run_directory)?;
-
-        Ok(())
-    }
-
-    pub fn worktree_path(&self) -> PathBuf {
-        self.worktrees_dir
-            .join(self.worktree_name())
-            .join(self.thread.meta().repo_name())
-    }
-
-    pub fn run(&self, app_state: Arc<AgentAppState>, cx: &mut App) -> Task<Result<RunOutput>> {
-        let project = Project::local(
-            app_state.client.clone(),
-            app_state.node_runtime.clone(),
-            app_state.user_store.clone(),
-            app_state.languages.clone(),
-            app_state.fs.clone(),
-            None,
-            cx,
-        );
-
-        let worktree = project.update(cx, |project, cx| {
-            project.create_worktree(self.worktree_path(), true, cx)
-        });
-
-        let meta = self.thread.meta();
-        let this = self.clone();
-
-        cx.spawn(async move |cx| {
-            let worktree = worktree.await?;
-
-            // Wait for worktree scan to finish before choosing a file to open.
-            worktree
-                .update(cx, |worktree, _cx| {
-                    worktree.as_local().unwrap().scan_complete()
-                })?
-                .await;
-
-            struct LanguageServerState {
-                _lsp_open_handle: OpenLspBufferHandle,
-                language_file_buffer: Entity<Buffer>,
-            }
-
-            let mut diagnostics_before = None;
-            let mut diagnostic_summary_before = DiagnosticSummary::default();
-
-            let lsp = if let Some(language_server) = &meta.language_server {
-                // Open a file that matches the language to cause LSP to start.
-                let language_file = worktree.read_with(cx, |worktree, _cx| {
-                    worktree
-                        .files(false, 0)
-                        .find_map(|e| {
-                            if e.path.clone().extension()
-                                == Some(&language_server.file_extension)
-                            {
-                                Some(ProjectPath {
-                                    worktree_id: worktree.id(),
-                                    path: e.path.clone(),
-                                })
-                            } else {
-                                None
-                            }
-                        })
-                        .context("Failed to find a file for example language")
-                })??;
-
-                let open_language_file_buffer_task = project.update(cx, |project, cx| {
-                    project.open_buffer(language_file.clone(), cx)
-                })?;
-
-                let language_file_buffer = open_language_file_buffer_task.await?;
-
-                let lsp_open_handle = project.update(cx, |project, cx| {
-                    project.register_buffer_with_language_servers(&language_file_buffer, cx)
-                })?;
-
-                wait_for_lang_server(&project, &language_file_buffer, this.log_prefix.clone(), cx).await?;
-
-                diagnostic_summary_before = project.read_with(cx, |project, cx| {
-                      project.diagnostic_summary(false, cx)
-                })?;
-
-                diagnostics_before = query_lsp_diagnostics(project.clone(), cx).await?;
-                if diagnostics_before.is_some() && language_server.allow_preexisting_diagnostics {
-                    anyhow::bail!("Example has pre-existing diagnostics. If you want to run this example regardless, set `allow_preexisting_diagnostics` to `true` in `base.toml`");
-                }
-
-                Some(LanguageServerState {
-                    _lsp_open_handle: lsp_open_handle,
-                    language_file_buffer,
-                })
-            } else {
-                None
-            };
-
-            anyhow::ensure!(std::env::var("ZED_EVAL_SETUP_ONLY").is_err(), "Setup only mode");
-
-            let last_diff_file_path = this.run_directory.join("last.diff");
-
-            // Write an empty "last.diff" so that it can be opened in Zed for convenient view of the
-            // history using undo/redo.
-            std::fs::write(&last_diff_file_path, "")?;
-
-            let thread = cx.update(|cx| {
-                //todo: Do we want to load rules files here?
-                let worktrees = project.read(cx).visible_worktrees(cx).map(|worktree| {
-                    let root_name = worktree.read(cx).root_name_str().into();
-                    let abs_path = worktree.read(cx).abs_path();
-
-                    WorktreeContext {
-                        root_name,
-                        abs_path,
-                        rules_file: None,
-                    }
-                }).collect::<Vec<_>>();
-                let project_context = cx.new(|_cx| ProjectContext::new(worktrees, vec![]));
-                let context_server_registry = cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
-
-                let thread = if let Some(json) = &meta.existing_thread_json {
-                    let session_id = acp::SessionId::new(
-                        rand::rng()
-                            .sample_iter(&distr::Alphanumeric)
-                            .take(7)
-                            .map(char::from)
-                            .collect::<String>(),
-                    );
-
-                    let db_thread = agent::DbThread::from_json(json.as_bytes()).expect("Can't read serialized thread");
-                    cx.new(|cx| agent::Thread::from_db(session_id, db_thread, project.clone(), project_context, context_server_registry, agent::Templates::new(), cx))
-                } else {
-                    cx.new(|cx| agent::Thread::new(project.clone(), project_context, context_server_registry, agent::Templates::new(), None, cx))
-                };
-
-                thread.update(cx, |thread, cx| {
-                    thread.add_default_tools(Rc::new(EvalThreadEnvironment {
-                        project: project.clone(),
-                    }), cx);
-                    thread.set_profile(meta.profile_id.clone(), cx);
-                    thread.set_model(
-                        LanguageModelInterceptor::new(
-                            LanguageModelRegistry::read_global(cx).default_model().expect("Missing model").model.clone(),
-                            this.run_directory.clone(),
-                            last_diff_file_path.clone(),
-                            this.run_directory.join("last.messages.json"),
-                            this.worktree_path(),
-                            this.repo_url(),
-                        ),
-                        cx,
-                    );
-                });
-
-                thread
-            }).unwrap();
-
-            let mut example_cx = ExampleContext::new(
-                meta.clone(),
-                this.log_prefix.clone(),
-                thread.clone(),
-                cx.clone(),
-            );
-            let result = this.thread.conversation(&mut example_cx).await;
-
-            if let Err(err) = result
-                && !err.is::<FailedAssertion>() {
-                    return Err(err);
-                }
-
-            println!("{}Stopped", this.log_prefix);
-
-            println!("{}Getting repository diff", this.log_prefix);
-            let repository_diff = Self::repository_diff(this.worktree_path(), &this.repo_url()).await?;
-
-            std::fs::write(last_diff_file_path, &repository_diff)?;
-
-
-            let mut diagnostics_after = None;
-            let mut diagnostic_summary_after = Default::default();
-
-            if let Some(language_server_state) = lsp {
-                wait_for_lang_server(&project, &language_server_state.language_file_buffer, this.log_prefix.clone(), cx).await?;
-
-                println!("{}Getting diagnostics", this.log_prefix);
-                diagnostics_after = cx
-                    .update(|cx| {
-                        let project = project.clone();
-                        cx.spawn(async move |cx| query_lsp_diagnostics(project, cx).await)
-                    })?
-                    .await?;
-                println!("{}Got diagnostics", this.log_prefix);
-
-                diagnostic_summary_after = project.read_with(cx, |project, cx| {
-                      project.diagnostic_summary(false, cx)
-                })?;
-
-            }
-
-            if let Some(diagnostics_before) = &diagnostics_before {
-                fs::write(this.run_directory.join("diagnostics_before.txt"), diagnostics_before)?;
-            }
-
-            if let Some(diagnostics_after) = &diagnostics_after {
-                fs::write(this.run_directory.join("diagnostics_after.txt"), diagnostics_after)?;
-            }
-
-            thread.update(cx, |thread, _cx| {
-                RunOutput {
-                    repository_diff,
-                    diagnostic_summary_before,
-                    diagnostic_summary_after,
-                    diagnostics_before,
-                    diagnostics_after,
-                    token_usage: thread.latest_request_token_usage().unwrap(),
-                    tool_metrics: example_cx.tool_metrics.lock().unwrap().clone(),
-                    thread_markdown: thread.to_markdown(),
-                    programmatic_assertions: example_cx.assertions,
-                }
-            })
-        })
-    }
-
-    async fn repository_diff(repository_path: PathBuf, repository_url: &str) -> Result<String> {
-        run_git(&repository_path, &["add", "."]).await?;
-        let mut diff_args = vec!["diff", "--staged"];
-        if repository_url == ZED_REPO_URL {
-            diff_args.push(":(exclude).rules");
-        }
-        run_git(&repository_path, &diff_args).await
-    }
-
-    pub async fn judge(
-        &self,
-        model: Arc<dyn LanguageModel>,
-        run_output: &RunOutput,
-        cx: &AsyncApp,
-    ) -> JudgeOutput {
-        let mut output_file =
-            File::create(self.run_directory.join("judge.md")).expect("failed to create judge.md");
-
-        let diff_task = self.judge_diff(model.clone(), run_output, cx);
-        let thread_task = self.judge_thread(model.clone(), run_output, cx);
-
-        let (diff_result, thread_result) = futures::join!(diff_task, thread_task);
-
-        let (diff_response, diff_output) = diff_result;
-        let (thread_response, thread_output) = thread_result;
-
-        writeln!(
-            &mut output_file,
-            "# Judgment\n\n## Thread\n\n{thread_response}\n\n## Diff\n\n{diff_response}",
-        )
-        .log_err();
-
-        JudgeOutput {
-            thread: thread_output,
-            diff: diff_output,
-        }
-    }
-
-    async fn judge_diff(
-        &self,
-        model: Arc<dyn LanguageModel>,
-        run_output: &RunOutput,
-        cx: &AsyncApp,
-    ) -> (String, AssertionsReport) {
-        let diff_assertions = self.thread.diff_assertions();
-
-        if diff_assertions.is_empty() {
-            return (
-                "No diff assertions".to_string(),
-                AssertionsReport::default(),
-            );
-        }
-
-        println!("{}Running diff judge", self.log_prefix);
-
-        let judge_diff_prompt = include_str!("judge_diff_prompt.hbs");
-        let judge_diff_prompt_name = "judge_diff_prompt";
-        let mut hbs = Handlebars::new();
-        hbs.register_template_string(judge_diff_prompt_name, judge_diff_prompt)
-            .unwrap();
-
-        let to_prompt = |assertion: String| {
-            hbs.render(
-                judge_diff_prompt_name,
-                &JudgeDiffInput {
-                    repository_diff: run_output.repository_diff.clone(),
-                    assertion,
-                },
-            )
-            .unwrap()
-        };
-
-        let (responses, report) = self
-            .judge_assertions(model, diff_assertions, to_prompt, cx)
-            .await;
-
-        println!(
-            "{}Judge - Diff score: {}%",
-            self.log_prefix,
-            report.passed_percentage()
-        );
-
-        (responses, report)
-    }
-
-    async fn judge_thread(
-        &self,
-        model: Arc<dyn LanguageModel>,
-        run_output: &RunOutput,
-        cx: &AsyncApp,
-    ) -> (String, AssertionsReport) {
-        let thread_assertions = self.thread.thread_assertions();
-
-        if thread_assertions.is_empty() {
-            return (
-                "No thread assertions".to_string(),
-                AssertionsReport::default(),
-            );
-        }
-
-        let judge_thread_prompt = include_str!("judge_thread_prompt.hbs");
-        let judge_thread_prompt_name = "judge_thread_prompt";
-        let mut hbs = Handlebars::new();
-        hbs.register_template_string(judge_thread_prompt_name, judge_thread_prompt)
-            .unwrap();
-
-        let complete_messages = &run_output.thread_markdown;
-        let to_prompt = |assertion: String| {
-            hbs.render(
-                judge_thread_prompt_name,
-                &JudgeThreadInput {
-                    messages: complete_messages.clone(),
-                    assertion,
-                },
-            )
-            .unwrap()
-        };
-
-        let (responses, report) = self
-            .judge_assertions(model, thread_assertions, to_prompt, cx)
-            .await;
-
-        println!(
-            "{}Judge - Thread score: {}%",
-            self.log_prefix,
-            report.passed_percentage()
-        );
-
-        (responses, report)
-    }
-
-    async fn judge_assertions(
-        &self,
-        model: Arc<dyn LanguageModel>,
-        assertions: Vec<JudgeAssertion>,
-        to_prompt: impl Fn(String) -> String,
-        cx: &AsyncApp,
-    ) -> (String, AssertionsReport) {
-        let assertions = assertions.into_iter().map(|assertion| {
-            let request = LanguageModelRequest {
-                thread_id: None,
-                prompt_id: None,
-                mode: None,
-                intent: None,
-                messages: vec![LanguageModelRequestMessage {
-                    role: Role::User,
-                    content: vec![MessageContent::Text(to_prompt(assertion.description))],
-                    cache: false,
-                    reasoning_details: None,
-                }],
-                temperature: None,
-                tools: Vec::new(),
-                tool_choice: None,
-                stop: Vec::new(),
-                thinking_allowed: true,
-            };
-
-            let model = model.clone();
-            let log_prefix = self.log_prefix.clone();
-            async move {
-                let response = send_language_model_request(model, request, cx).await;
-
-                let (response, result) = match response {
-                    Ok(response) => (
-                        response.clone(),
-                        parse_assertion_result(&response).map_err(|err| err.to_string()),
-                    ),
-                    Err(err) => (err.to_string(), Err(err.to_string())),
-                };
-
-                if result.is_ok() {
-                    println!("{}✅ {}", log_prefix, assertion.id);
-                } else {
-                    println!("{}❌ {}", log_prefix, assertion.id);
-                }
-
-                (
-                    response,
-                    RanAssertion {
-                        id: assertion.id,
-                        result,
-                    },
-                )
-            }
-        });
-
-        let mut responses = String::new();
-        let mut report = AssertionsReport::default();
-
-        for (response, assertion) in future::join_all(assertions).await {
-            writeln!(&mut responses, "# {}", assertion.id).unwrap();
-            writeln!(&mut responses, "{}\n\n", response).unwrap();
-            report.ran.push(assertion);
-        }
-
-        (responses, report)
-    }
-}
-
-struct EvalThreadEnvironment {
-    project: Entity<Project>,
-}
-
-struct EvalTerminalHandle {
-    terminal: Entity<acp_thread::Terminal>,
-}
-
-impl agent::TerminalHandle for EvalTerminalHandle {
-    fn id(&self, cx: &AsyncApp) -> Result<acp::TerminalId> {
-        self.terminal.read_with(cx, |term, _cx| term.id().clone())
-    }
-
-    fn wait_for_exit(&self, cx: &AsyncApp) -> Result<Shared<Task<acp::TerminalExitStatus>>> {
-        self.terminal
-            .read_with(cx, |term, _cx| term.wait_for_exit())
-    }
-
-    fn current_output(&self, cx: &AsyncApp) -> Result<acp::TerminalOutputResponse> {
-        self.terminal
-            .read_with(cx, |term, cx| term.current_output(cx))
-    }
-}
-
-impl agent::ThreadEnvironment for EvalThreadEnvironment {
-    fn create_terminal(
-        &self,
-        command: String,
-        cwd: Option<PathBuf>,
-        output_byte_limit: Option<u64>,
-        cx: &mut AsyncApp,
-    ) -> Task<Result<Rc<dyn agent::TerminalHandle>>> {
-        let project = self.project.clone();
-        cx.spawn(async move |cx| {
-            let language_registry =
-                project.read_with(cx, |project, _cx| project.languages().clone())?;
-            let id = acp::TerminalId::new(uuid::Uuid::new_v4().to_string());
-            let terminal =
-                acp_thread::create_terminal_entity(command, &[], vec![], cwd.clone(), &project, cx)
-                    .await?;
-            let terminal = cx.new(|cx| {
-                acp_thread::Terminal::new(
-                    id,
-                    "",
-                    cwd,
-                    output_byte_limit.map(|limit| limit as usize),
-                    terminal,
-                    language_registry,
-                    cx,
-                )
-            })?;
-            Ok(Rc::new(EvalTerminalHandle { terminal }) as Rc<dyn agent::TerminalHandle>)
-        })
-    }
-}
-
-struct LanguageModelInterceptor {
-    model: Arc<dyn LanguageModel>,
-    request_count: Arc<Mutex<usize>>,
-    previous_diff: Arc<Mutex<String>>,
-    example_output_dir: PathBuf,
-    last_diff_file_path: PathBuf,
-    messages_json_file_path: PathBuf,
-    repository_path: PathBuf,
-    repository_url: String,
-}
-
-impl LanguageModelInterceptor {
-    fn new(
-        model: Arc<dyn LanguageModel>,
-        example_output_dir: PathBuf,
-        last_diff_file_path: PathBuf,
-        messages_json_file_path: PathBuf,
-        repository_path: PathBuf,
-        repository_url: String,
-    ) -> Arc<Self> {
-        Arc::new(Self {
-            model,
-            request_count: Arc::new(Mutex::new(0)),
-            previous_diff: Arc::new(Mutex::new("".to_string())),
-            example_output_dir,
-            last_diff_file_path,
-            messages_json_file_path,
-            repository_path,
-            repository_url,
-        })
-    }
-}
-
-impl language_model::LanguageModel for LanguageModelInterceptor {
-    fn id(&self) -> language_model::LanguageModelId {
-        self.model.id()
-    }
-
-    fn name(&self) -> language_model::LanguageModelName {
-        self.model.name()
-    }
-
-    fn provider_id(&self) -> language_model::LanguageModelProviderId {
-        self.model.provider_id()
-    }
-
-    fn provider_name(&self) -> language_model::LanguageModelProviderName {
-        self.model.provider_name()
-    }
-
-    fn telemetry_id(&self) -> String {
-        self.model.telemetry_id()
-    }
-
-    fn supports_images(&self) -> bool {
-        self.model.supports_images()
-    }
-
-    fn supports_tools(&self) -> bool {
-        self.model.supports_tools()
-    }
-
-    fn supports_tool_choice(&self, choice: language_model::LanguageModelToolChoice) -> bool {
-        self.model.supports_tool_choice(choice)
-    }
-
-    fn max_token_count(&self) -> u64 {
-        self.model.max_token_count()
-    }
-
-    fn count_tokens(
-        &self,
-        request: LanguageModelRequest,
-        cx: &App,
-    ) -> future::BoxFuture<'static, Result<u64>> {
-        self.model.count_tokens(request, cx)
-    }
-
-    fn stream_completion(
-        &self,
-        request: LanguageModelRequest,
-        cx: &AsyncApp,
-    ) -> future::BoxFuture<
-        'static,
-        Result<
-            futures::stream::BoxStream<
-                'static,
-                Result<LanguageModelCompletionEvent, language_model::LanguageModelCompletionError>,
-            >,
-            language_model::LanguageModelCompletionError,
-        >,
-    > {
-        let stream = self.model.stream_completion(request.clone(), cx);
-        let request_count = self.request_count.clone();
-        let previous_diff = self.previous_diff.clone();
-        let example_output_dir = self.example_output_dir.clone();
-        let last_diff_file_path = self.last_diff_file_path.clone();
-        let messages_json_file_path = self.messages_json_file_path.clone();
-        let repository_path = self.repository_path.clone();
-        let repository_url = self.repository_url.clone();
-
-        Box::pin(async move {
-            let stream = stream.await?;
-
-            let response_events = Arc::new(Mutex::new(Vec::new()));
-            let request_clone = request.clone();
-
-            let wrapped_stream = stream.then(move |event| {
-                let response_events = response_events.clone();
-                let request = request_clone.clone();
-                let request_count = request_count.clone();
-                let previous_diff = previous_diff.clone();
-                let example_output_dir = example_output_dir.clone();
-                let last_diff_file_path = last_diff_file_path.clone();
-                let messages_json_file_path = messages_json_file_path.clone();
-                let repository_path = repository_path.clone();
-                let repository_url = repository_url.clone();
-
-                async move {
-                    let event_result = match &event {
-                        Ok(ev) => Ok(ev.clone()),
-                        Err(err) => Err(err.to_string()),
-                    };
-                    response_events.lock().unwrap().push(event_result);
-
-                    let should_execute = matches!(
-                        &event,
-                        Ok(LanguageModelCompletionEvent::Stop { .. }) | Err(_)
-                    );
-
-                    if should_execute {
-                        let current_request_count = {
-                            let mut count = request_count.lock().unwrap();
-                            *count += 1;
-                            *count
-                        };
-
-                        let messages_file_path =
-                            example_output_dir.join(format!("{current_request_count}.messages.md"));
-                        let diff_file_path =
-                            example_output_dir.join(format!("{current_request_count}.diff"));
-                        let last_messages_file_path = example_output_dir.join("last.messages.md");
-
-                        let collected_events = response_events.lock().unwrap().clone();
-                        let request_markdown = RequestMarkdown::new(&request);
-                        let response_events_markdown =
-                            response_events_to_markdown(&collected_events);
-                        let dialog = ThreadDialog::new(&request, &collected_events);
-                        let dialog_json =
-                            serde_json::to_string_pretty(&dialog.to_combined_request())
-                                .unwrap_or_default();
-
-                        let messages = format!(
-                            "{}\n\n{}",
-                            request_markdown.messages, response_events_markdown
-                        );
-                        fs::write(&messages_file_path, messages.clone())
-                            .expect("failed to write messages file");
-                        fs::write(&last_messages_file_path, messages)
-                            .expect("failed to write last messages file");
-                        fs::write(&messages_json_file_path, dialog_json)
-                            .expect("failed to write last.messages.json");
-
-                        // Get repository diff
-                        let diff_result =
-                            ExampleInstance::repository_diff(repository_path, &repository_url)
-                                .await;
-
-                        match diff_result {
-                            Ok(diff) => {
-                                let prev_diff = previous_diff.lock().unwrap().clone();
-                                if diff != prev_diff {
-                                    fs::write(&diff_file_path, &diff)
-                                        .expect("failed to write diff file");
-                                    fs::write(&last_diff_file_path, &diff)
-                                        .expect("failed to write last diff file");
-                                    *previous_diff.lock().unwrap() = diff;
-                                }
-                            }
-                            Err(err) => {
-                                let error_message = format!("{err:?}");
-                                fs::write(&diff_file_path, &error_message)
-                                    .expect("failed to write diff error to file");
-                                fs::write(&last_diff_file_path, &error_message)
-                                    .expect("failed to write last diff file");
-                            }
-                        }
-
-                        if current_request_count == 1 {
-                            let tools_file_path = example_output_dir.join("tools.md");
-                            fs::write(tools_file_path, request_markdown.tools)
-                                .expect("failed to write tools file");
-                        }
-                    }
-
-                    event
-                }
-            });
-
-            Ok(Box::pin(wrapped_stream)
-                as futures::stream::BoxStream<
-                    'static,
-                    Result<
-                        LanguageModelCompletionEvent,
-                        language_model::LanguageModelCompletionError,
-                    >,
-                >)
-        })
-    }
-}
-
-pub fn wait_for_lang_server(
-    project: &Entity<Project>,
-    buffer: &Entity<Buffer>,
-    log_prefix: String,
-    cx: &mut AsyncApp,
-) -> Task<Result<()>> {
-    if std::env::var("ZED_EVAL_SKIP_LS").is_ok() {
-        return Task::ready(Ok(()));
-    }
-
-    println!("{}⏵ Waiting for language server", log_prefix);
-
-    let (mut tx, mut rx) = mpsc::channel(1);
-
-    let lsp_store = project
-        .read_with(cx, |project, _| project.lsp_store())
-        .unwrap();
-
-    let has_lang_server = buffer
-        .update(cx, |buffer, cx| {
-            lsp_store.update(cx, |lsp_store, cx| {
-                lsp_store
-                    .running_language_servers_for_local_buffer(buffer, cx)
-                    .next()
-                    .is_some()
-            })
-        })
-        .unwrap_or(false);
-
-    if has_lang_server {
-        project
-            .update(cx, |project, cx| project.save_buffer(buffer.clone(), cx))
-            .unwrap()
-            .detach();
-    }
-
-    let subscriptions =
-        [
-            cx.subscribe(&lsp_store, {
-                let log_prefix = log_prefix.clone();
-                move |_, event, _| {
-                    if let project::LspStoreEvent::LanguageServerUpdate {
-                        message:
-                            client::proto::update_language_server::Variant::WorkProgress(
-                                LspWorkProgress {
-                                    message: Some(message),
-                                    ..
-                                },
-                            ),
-                        ..
-                    } = event
-                    {
-                        println!("{}⟲ {message}", log_prefix)
-                    }
-                }
-            }),
-            cx.subscribe(project, {
-                let buffer = buffer.clone();
-                move |project, event, cx| match event {
-                    project::Event::LanguageServerAdded(_, _, _) => {
-                        let buffer = buffer.clone();
-                        project
-                            .update(cx, |project, cx| project.save_buffer(buffer, cx))
-                            .detach();
-                    }
-                    project::Event::DiskBasedDiagnosticsFinished { .. } => {
-                        tx.try_send(()).ok();
-                    }
-                    _ => {}
-                }
-            }),
-        ];
-
-    cx.spawn(async move |cx| {
-        let timeout = cx.background_executor().timer(Duration::new(60 * 5, 0));
-        let result = futures::select! {
-            _ = rx.next() => {
-                println!("{}⚑ Language server idle", log_prefix);
-                anyhow::Ok(())
-            },
-            _ = timeout.fuse() => {
-                anyhow::bail!("LSP wait timed out after 5 minutes");
-            }
-        };
-        drop(subscriptions);
-        result
-    })
-}
-
-pub async fn query_lsp_diagnostics(
-    project: Entity<Project>,
-    cx: &mut AsyncApp,
-) -> Result<Option<String>> {
-    let paths_with_diagnostics = project.update(cx, |project, cx| {
-        project
-            .diagnostic_summaries(true, cx)
-            .filter(|(_, _, summary)| summary.error_count > 0 || summary.warning_count > 0)
-            .map(|(project_path, _, _)| project_path)
-            .collect::<Vec<_>>()
-    })?;
-
-    if paths_with_diagnostics.is_empty() {
-        return Ok(None);
-    }
-
-    let mut output = String::new();
-    for project_path in paths_with_diagnostics {
-        let buffer = project
-            .update(cx, |project, cx| project.open_buffer(project_path, cx))?
-            .await?;
-        let snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot())?;
-
-        for (_, group) in snapshot.diagnostic_groups(None) {
-            let entry = &group.entries[group.primary_ix];
-            let range = entry.range.to_point(&snapshot);
-            let severity = match entry.diagnostic.severity {
-                DiagnosticSeverity::ERROR => "error",
-                DiagnosticSeverity::WARNING => "warning",
-                _ => continue,
-            };
-
-            writeln!(
-                output,
-                "{} at line {}: {}",
-                severity,
-                range.start.row + 1,
-                entry.diagnostic.message
-            )?;
-        }
-    }
-    anyhow::Ok(Some(output))
-}
-
-fn parse_assertion_result(response: &str) -> Result<RanAssertionResult> {
-    let analysis = get_tag("analysis", response)?;
-    let passed = match get_tag("passed", response)?.to_lowercase().as_str() {
-        "true" => true,
-        "false" => false,
-        value @ _ => bail!("invalid judge `passed` tag: {value}"),
-    };
-    Ok(RanAssertionResult {
-        analysis: Some(analysis),
-        passed,
-    })
-}
-
-fn get_tag(name: &'static str, response: &str) -> Result<String> {
-    let start_tag = format!("<{}>", name);
-    let end_tag = format!("</{}>", name);
-
-    let start_ix = response
-        .find(&start_tag)
-        .context(format!("{} start tag not found", name))?;
-    let content_start_ix = start_ix + start_tag.len();
-
-    let end_ix = content_start_ix
-        + response[content_start_ix..]
-            .find(&end_tag)
-            .context(format!("{} end tag not found", name))?;
-
-    let content = response[content_start_ix..end_ix].trim().unindent();
-
-    anyhow::Ok(content)
-}
-
-pub fn repo_path_for_url(repos_dir: &Path, repo_url: &str) -> PathBuf {
-    let repo_name = repo_url
-        .trim_start_matches("https://")
-        .replace(|c: char| !c.is_alphanumeric(), "-");
-    Path::new(repos_dir).join(repo_name)
-}
-
-pub async fn run_git(repo_path: &Path, args: &[&str]) -> Result<String> {
-    let output = new_smol_command("git")
-        .current_dir(repo_path)
-        .args(args)
-        .output()
-        .await?;
-
-    anyhow::ensure!(
-        output.status.success(),
-        "`git {}` within `{}` failed with status: {}\nstderr:\n{}\nstdout:\n{}",
-        args.join(" "),
-        repo_path.display(),
-        output.status,
-        String::from_utf8_lossy(&output.stderr),
-        String::from_utf8_lossy(&output.stdout),
-    );
-    Ok(String::from_utf8(output.stdout)?.trim().to_string())
-}
-
-fn push_role(role: &Role, buf: &mut String, assistant_message_number: &mut u32) {
-    match role {
-        Role::System => buf.push_str("# ⚙️ SYSTEM\n\n"),
-        Role::User => buf.push_str("# 👤 USER\n\n"),
-        Role::Assistant => {
-            buf.push_str(&format!("# 🤖 ASSISTANT {assistant_message_number}\n\n"));
-            *assistant_message_number = *assistant_message_number + 1;
-        }
-    }
-}
-
-pub async fn send_language_model_request(
-    model: Arc<dyn LanguageModel>,
-    request: LanguageModelRequest,
-    cx: &AsyncApp,
-) -> anyhow::Result<String> {
-    match model.stream_completion_text(request, cx).await {
-        Ok(mut stream) => {
-            let mut full_response = String::new();
-            while let Some(chunk_result) = stream.stream.next().await {
-                match chunk_result {
-                    Ok(chunk_str) => {
-                        full_response.push_str(&chunk_str);
-                    }
-                    Err(err) => {
-                        anyhow::bail!("Error receiving response from language model: {err}");
-                    }
-                }
-            }
-            Ok(full_response)
-        }
-        Err(err) => Err(anyhow!(
-            "Failed to get response from language model. Error was: {err}"
-        )),
-    }
-}
-
-pub struct RequestMarkdown {
-    pub tools: String,
-    pub messages: String,
-}
-
-impl RequestMarkdown {
-    pub fn new(request: &LanguageModelRequest) -> Self {
-        let mut tools = String::new();
-        let mut messages = String::new();
-        let mut assistant_message_number: u32 = 1;
-
-        // Print the tools
-        if !request.tools.is_empty() {
-            for tool in &request.tools {
-                write!(&mut tools, "# {}\n\n", tool.name).unwrap();
-                write!(&mut tools, "{}\n\n", tool.description).unwrap();
-                writeln!(
-                    &mut tools,
-                    "{}",
-                    MarkdownCodeBlock {
-                        tag: "json",
-                        text: &format!("{:#}", tool.input_schema)
-                    }
-                )
-                .unwrap();
-            }
-        }
-
-        // Print the messages
-        for message in &request.messages {
-            push_role(&message.role, &mut messages, &mut assistant_message_number);
-
-            for content in &message.content {
-                match content {
-                    MessageContent::Text(text) => {
-                        messages.push_str(text);
-                        messages.push_str("\n\n");
-                    }
-                    MessageContent::Image(_) => {
-                        messages.push_str("[IMAGE DATA]\n\n");
-                    }
-                    MessageContent::Thinking { text, signature } => {
-                        messages.push_str("**Thinking**:\n\n");
-                        if let Some(sig) = signature {
-                            messages.push_str(&format!("Signature: {}\n\n", sig));
-                        }
-                        messages.push_str(text);
-                        messages.push_str("\n");
-                    }
-                    MessageContent::RedactedThinking(items) => {
-                        messages.push_str(&format!(
-                            "**Redacted Thinking**: {} item(s)\n\n",
-                            items.len()
-                        ));
-                    }
-                    MessageContent::ToolUse(tool_use) => {
-                        messages.push_str(&format!(
-                            "**Tool Use**: {} (ID: {})\n",
-                            tool_use.name, tool_use.id
-                        ));
-                        messages.push_str(&format!(
-                            "{}\n",
-                            MarkdownCodeBlock {
-                                tag: "json",
-                                text: &format!("{:#}", tool_use.input)
-                            }
-                        ));
-                    }
-                    MessageContent::ToolResult(tool_result) => {
-                        messages.push_str(&format!(
-                            "**Tool Result**: {} (ID: {})\n\n",
-                            tool_result.tool_name, tool_result.tool_use_id
-                        ));
-                        if tool_result.is_error {
-                            messages.push_str("**ERROR:**\n");
-                        }
-
-                        match &tool_result.content {
-                            LanguageModelToolResultContent::Text(text) => {
-                                writeln!(messages, "{text}\n").ok();
-                            }
-                            LanguageModelToolResultContent::Image(image) => {
-                                writeln!(messages, "![Image](data:base64,{})\n", image.source).ok();
-                            }
-                        }
-
-                        if let Some(output) = tool_result.output.as_ref() {
-                            writeln!(
-                                messages,
-                                "**Debug Output**:\n\n```json\n{}\n```\n",
-                                serde_json::to_string_pretty(output).unwrap()
-                            )
-                            .unwrap();
-                        }
-                    }
-                }
-            }
-        }
-
-        Self { tools, messages }
-    }
-}
-
-pub fn response_events_to_markdown(
-    response_events: &[std::result::Result<LanguageModelCompletionEvent, String>],
-) -> String {
-    let mut response = String::new();
-    // Print the response events if any
-    response.push_str("# Response\n\n");
-    let mut text_buffer = String::new();
-    let mut thinking_buffer = String::new();
-
-    let flush_buffers =
-        |output: &mut String, text_buffer: &mut String, thinking_buffer: &mut String| {
-            if !text_buffer.is_empty() {
-                output.push_str(&format!("**Text**:\n{}\n\n", text_buffer));
-                text_buffer.clear();
-            }
-            if !thinking_buffer.is_empty() {
-                output.push_str(&format!("**Thinking**:\n{}\n\n", thinking_buffer));
-                thinking_buffer.clear();
-            }
-        };
-
-    for event in response_events {
-        match event {
-            Ok(LanguageModelCompletionEvent::Text(text)) => {
-                text_buffer.push_str(text);
-            }
-            Ok(LanguageModelCompletionEvent::Thinking { text, .. }) => {
-                thinking_buffer.push_str(text);
-            }
-            Ok(LanguageModelCompletionEvent::RedactedThinking { .. }) => {}
-            Ok(LanguageModelCompletionEvent::Stop(reason)) => {
-                flush_buffers(&mut response, &mut text_buffer, &mut thinking_buffer);
-                response.push_str(&format!("**Stop**: {:?}\n\n", reason));
-            }
-            Ok(LanguageModelCompletionEvent::ToolUse(tool_use)) => {
-                flush_buffers(&mut response, &mut text_buffer, &mut thinking_buffer);
-                response.push_str(&format!(
-                    "**Tool Use**: {} (ID: {})\n",
-                    tool_use.name, tool_use.id
-                ));
-                response.push_str(&format!(
-                    "{}\n",
-                    MarkdownCodeBlock {
-                        tag: "json",
-                        text: &format!("{:#}", tool_use.input)
-                    }
-                ));
-            }
-            Ok(
-                LanguageModelCompletionEvent::UsageUpdate(_)
-                | LanguageModelCompletionEvent::ToolUseLimitReached
-                | LanguageModelCompletionEvent::StartMessage { .. }
-                | LanguageModelCompletionEvent::UsageUpdated { .. }
-                | LanguageModelCompletionEvent::Queued { .. }
-                | LanguageModelCompletionEvent::Started
-                | LanguageModelCompletionEvent::ReasoningDetails(_),
-            ) => {}
-            Ok(LanguageModelCompletionEvent::ToolUseJsonParseError {
-                json_parse_error, ..
-            }) => {
-                flush_buffers(&mut response, &mut text_buffer, &mut thinking_buffer);
-                response.push_str(&format!(
-                    "**Error**: parse error in tool use JSON: {}\n\n",
-                    json_parse_error
-                ));
-            }
-            Err(error) => {
-                flush_buffers(&mut response, &mut text_buffer, &mut thinking_buffer);
-                response.push_str(&format!("**Error**: {}\n\n", error));
-            }
-        }
-    }
-
-    flush_buffers(&mut response, &mut text_buffer, &mut thinking_buffer);
-
-    response
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
-pub struct ThreadDialog {
-    pub request: LanguageModelRequest,
-    pub response_events: Vec<std::result::Result<LanguageModelCompletionEvent, String>>,
-}
-
-impl ThreadDialog {
-    pub fn new(
-        request: &LanguageModelRequest,
-        response_events: &[std::result::Result<LanguageModelCompletionEvent, String>],
-    ) -> Self {
-        Self {
-            request: request.clone(),
-            response_events: response_events.to_vec(),
-        }
-    }
-
-    /// Represents all request and response messages in a unified format.
-    ///
-    /// Specifically, it appends the assistant's response (derived from response events)
-    /// as a new message to existing messages in the request.
-    pub fn to_combined_request(&self) -> LanguageModelRequest {
-        let mut request = self.request.clone();
-        if let Some(assistant_message) = self.response_events_to_message() {
-            request.messages.push(assistant_message);
-        }
-        request
-    }
-    fn response_events_to_message(&self) -> Option<LanguageModelRequestMessage> {
-        let response_events = &self.response_events;
-        let mut content: Vec<MessageContent> = Vec::new();
-        let mut current_text = String::new();
-
-        let flush_text = |text: &mut String, content: &mut Vec<MessageContent>| {
-            if !text.is_empty() {
-                content.push(MessageContent::Text(std::mem::take(text)));
-            }
-        };
-
-        for event in response_events {
-            match event {
-                Ok(LanguageModelCompletionEvent::Text(text)) => {
-                    current_text.push_str(text);
-                }
-
-                Ok(LanguageModelCompletionEvent::ToolUse(tool_use)) => {
-                    flush_text(&mut current_text, &mut content);
-                    if tool_use.is_input_complete {
-                        content.push(MessageContent::ToolUse(tool_use.clone()));
-                    }
-                }
-                Ok(LanguageModelCompletionEvent::Thinking { text, signature }) => {
-                    flush_text(&mut current_text, &mut content);
-                    content.push(MessageContent::Thinking {
-                        text: text.clone(),
-                        signature: signature.clone(),
-                    });
-                }
-
-                // Skip these
-                Ok(LanguageModelCompletionEvent::UsageUpdate(_))
-                | Ok(LanguageModelCompletionEvent::RedactedThinking { .. })
-                | Ok(LanguageModelCompletionEvent::StartMessage { .. })
-                | Ok(LanguageModelCompletionEvent::ReasoningDetails(_))
-                | Ok(LanguageModelCompletionEvent::Stop(_))
-                | Ok(LanguageModelCompletionEvent::Queued { .. })
-                | Ok(LanguageModelCompletionEvent::Started)
-                | Ok(LanguageModelCompletionEvent::UsageUpdated { .. })
-                | Ok(LanguageModelCompletionEvent::ToolUseLimitReached) => {}
-
-                Ok(LanguageModelCompletionEvent::ToolUseJsonParseError {
-                    json_parse_error,
-                    ..
-                }) => {
-                    flush_text(&mut current_text, &mut content);
-                    content.push(MessageContent::Text(format!(
-                        "ERROR: parse error in tool use JSON: {}",
-                        json_parse_error
-                    )));
-                }
-
-                Err(error) => {
-                    flush_text(&mut current_text, &mut content);
-                    content.push(MessageContent::Text(format!("ERROR: {}", error)));
-                }
-            }
-        }
-
-        flush_text(&mut current_text, &mut content);
-
-        if !content.is_empty() {
-            Some(LanguageModelRequestMessage {
-                role: Role::Assistant,
-                content,
-                cache: false,
-                reasoning_details: None,
-            })
-        } else {
-            None
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn test_parse_judge_output() {
-        let response = r#"
-            <analysis>The model did a good job but there were still compilations errors.</analysis>
-            <passed>true</passed>
-        "#
-        .unindent();
-
-        let output = parse_assertion_result(&response).unwrap();
-        assert_eq!(
-            output.analysis,
-            Some("The model did a good job but there were still compilations errors.".into())
-        );
-        assert!(output.passed);
-
-        let response = r#"
-            Text around ignored
-
-            <analysis>
-                Failed to compile:
-                - Error 1
-                - Error 2
-            </analysis>
-
-            <passed>false</passed>
-        "#
-        .unindent();
-
-        let output = parse_assertion_result(&response).unwrap();
-        assert_eq!(
-            output.analysis,
-            Some("Failed to compile:\n- Error 1\n- Error 2".into())
-        );
-        assert!(!output.passed);
-    }
-}
diff --git a/crates/eval/src/judge_diff_prompt.hbs b/crates/eval/src/judge_diff_prompt.hbs
deleted file mode 100644
index 24ef9ac97e..0000000000
--- a/crates/eval/src/judge_diff_prompt.hbs
+++ /dev/null
@@ -1,25 +0,0 @@
-You are an expert software developer. Your task is to evaluate a diff produced by an AI agent
-in response to a prompt. Here is the prompt and the diff:
-
-<prompt>
-{{{prompt}}}
-</prompt>
-
-<diff>
-{{{repository_diff}}}
-</diff>
-
-Evaluate whether or not the diff passes the following assertion:
-
-<assertion>
-{{assertion}}
-</assertion>
-
-Analyze the diff hunk by hunk, and structure your answer in the following XML format:
-
-```
-<analysis>{YOUR ANALYSIS HERE}</analysis>
-<passed>{PASSED_ASSERTION}</passed>
-```
-
-Where `PASSED_ASSERTION` is either `true` or `false`.
diff --git a/crates/eval/src/judge_thread_prompt.hbs b/crates/eval/src/judge_thread_prompt.hbs
deleted file mode 100644
index e80bafcce1..0000000000
--- a/crates/eval/src/judge_thread_prompt.hbs
+++ /dev/null
@@ -1,21 +0,0 @@
-You are an expert software developer.
-Your task is to evaluate an AI agent's messages and tool calls in this conversation:
-
-<messages>
-{{{messages}}}
-</messages>
-
-Evaluate whether or not the sequence of messages passes the following assertion:
-
-<assertion>
-{{{assertion}}}
-</assertion>
-
-Analyze the messages one by one, and structure your answer in the following XML format:
-
-```
-<analysis>{YOUR ANALYSIS HERE}</analysis>
-<passed>{PASSED_ASSERTION}</passed>
-```
-
-Where `PASSED_ASSERTION` is either `true` or `false`.
diff --git a/crates/eval/src/tool_metrics.rs b/crates/eval/src/tool_metrics.rs
deleted file mode 100644
index 63d8a4f2bc..0000000000
--- a/crates/eval/src/tool_metrics.rs
+++ /dev/null
@@ -1,106 +0,0 @@
-use collections::HashMap;
-use serde::{Deserialize, Serialize};
-use std::{fmt::Display, sync::Arc};
-
-#[derive(Debug, Default, Clone, Serialize, Deserialize)]
-pub struct ToolMetrics {
-    pub use_counts: HashMap<Arc<str>, u32>,
-    pub failure_counts: HashMap<Arc<str>, u32>,
-}
-
-impl ToolMetrics {
-    pub fn insert(&mut self, tool_name: Arc<str>, succeeded: bool) {
-        *self.use_counts.entry(tool_name.clone()).or_insert(0) += 1;
-        if !succeeded {
-            *self.failure_counts.entry(tool_name).or_insert(0) += 1;
-        }
-    }
-
-    pub fn merge(&mut self, other: &ToolMetrics) {
-        for (tool_name, use_count) in &other.use_counts {
-            *self.use_counts.entry(tool_name.clone()).or_insert(0) += use_count;
-        }
-        for (tool_name, failure_count) in &other.failure_counts {
-            *self.failure_counts.entry(tool_name.clone()).or_insert(0) += failure_count;
-        }
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.use_counts.is_empty() && self.failure_counts.is_empty()
-    }
-}
-
-impl Display for ToolMetrics {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let mut failure_rates: Vec<(Arc<str>, f64)> = Vec::new();
-
-        for (tool_name, use_count) in &self.use_counts {
-            let failure_count = self.failure_counts.get(tool_name).cloned().unwrap_or(0);
-            if *use_count > 0 {
-                let failure_rate = failure_count as f64 / *use_count as f64;
-                failure_rates.push((tool_name.clone(), failure_rate));
-            }
-        }
-
-        // Sort by failure rate descending
-        failure_rates.sort_by(|a, b| b.1.partial_cmp(&a.1).unwrap_or(std::cmp::Ordering::Equal));
-
-        // Table dimensions
-        let tool_width = 30;
-        let count_width = 10;
-        let rate_width = 10;
-
-        // Write table top border
-        writeln!(
-            f,
-            "┌{}┬{}┬{}┬{}┐",
-            "─".repeat(tool_width),
-            "─".repeat(count_width),
-            "─".repeat(count_width),
-            "─".repeat(rate_width)
-        )?;
-
-        // Write header row
-        writeln!(
-            f,
-            "│{:^30}│{:^10}│{:^10}│{:^10}│",
-            "Tool", "Uses", "Failures", "Rate"
-        )?;
-
-        // Write header-data separator
-        writeln!(
-            f,
-            "├{}┼{}┼{}┼{}┤",
-            "─".repeat(tool_width),
-            "─".repeat(count_width),
-            "─".repeat(count_width),
-            "─".repeat(rate_width)
-        )?;
-
-        // Write data rows
-        for (tool_name, failure_rate) in failure_rates {
-            let use_count = self.use_counts.get(&tool_name).cloned().unwrap_or(0);
-            let failure_count = self.failure_counts.get(&tool_name).cloned().unwrap_or(0);
-            writeln!(
-                f,
-                "│{:<30}│{:^10}│{:^10}│{:^10}│",
-                tool_name,
-                use_count,
-                failure_count,
-                format!("{}%", (failure_rate * 100.0).round())
-            )?;
-        }
-
-        // Write table bottom border
-        writeln!(
-            f,
-            "└{}┴{}┴{}┴{}┘",
-            "─".repeat(tool_width),
-            "─".repeat(count_width),
-            "─".repeat(count_width),
-            "─".repeat(rate_width)
-        )?;
-
-        Ok(())
-    }
-}
diff --git a/crates/eval_utils/Cargo.toml b/crates/eval_utils/Cargo.toml
deleted file mode 100644
index a512035f5d..0000000000
--- a/crates/eval_utils/Cargo.toml
+++ /dev/null
@@ -1,18 +0,0 @@
-[package]
-name = "eval_utils"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/eval_utils.rs"
-doctest = false
-
-[dependencies]
-gpui.workspace = true
-serde.workspace = true
-smol.workspace = true
diff --git a/crates/eval_utils/LICENSE-GPL b/crates/eval_utils/LICENSE-GPL
deleted file mode 120000
index e0f9dbd5d6..0000000000
--- a/crates/eval_utils/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-LICENSE-GPL
\ No newline at end of file
diff --git a/crates/eval_utils/README.md b/crates/eval_utils/README.md
deleted file mode 100644
index 617077a815..0000000000
--- a/crates/eval_utils/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# eval_utils
-
-Utilities for evals of agents.
diff --git a/crates/eval_utils/src/eval_utils.rs b/crates/eval_utils/src/eval_utils.rs
deleted file mode 100644
index 880b1a97e4..0000000000
--- a/crates/eval_utils/src/eval_utils.rs
+++ /dev/null
@@ -1,128 +0,0 @@
-//! Utilities for evaluation and benchmarking.
-
-use std::{
-    collections::HashMap,
-    sync::{Arc, mpsc},
-};
-
-fn report_progress(evaluated_count: usize, failed_count: usize, iterations: usize) {
-    let passed_count = evaluated_count - failed_count;
-    let passed_ratio = if evaluated_count == 0 {
-        0.0
-    } else {
-        passed_count as f64 / evaluated_count as f64
-    };
-    println!(
-        "\r\x1b[KEvaluated {}/{} ({:.2}% passed)",
-        evaluated_count,
-        iterations,
-        passed_ratio * 100.0
-    )
-}
-
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub enum OutcomeKind {
-    Passed,
-    Failed,
-    Error,
-}
-
-pub trait EvalOutputProcessor {
-    type Metadata: 'static + Send;
-    fn process(&mut self, output: &EvalOutput<Self::Metadata>);
-    fn assert(&mut self);
-}
-
-#[derive(Clone, Debug)]
-pub struct EvalOutput<M> {
-    pub outcome: OutcomeKind,
-    pub data: String,
-    pub metadata: M,
-}
-
-pub struct NoProcessor;
-impl EvalOutputProcessor for NoProcessor {
-    type Metadata = ();
-
-    fn process(&mut self, _output: &EvalOutput<Self::Metadata>) {}
-
-    fn assert(&mut self) {}
-}
-
-pub fn eval<P>(
-    iterations: usize,
-    expected_pass_ratio: f32,
-    mut processor: P,
-    evalf: impl Fn() -> EvalOutput<P::Metadata> + Send + Sync + 'static,
-) where
-    P: EvalOutputProcessor,
-{
-    let mut evaluated_count = 0;
-    let mut failed_count = 0;
-    let evalf = Arc::new(evalf);
-    report_progress(evaluated_count, failed_count, iterations);
-
-    let (tx, rx) = mpsc::channel();
-
-    let executor = gpui::background_executor();
-    let semaphore = Arc::new(smol::lock::Semaphore::new(32));
-    let evalf = Arc::new(evalf);
-    // Warm the cache once
-    let first_output = evalf();
-    tx.send(first_output).ok();
-
-    for _ in 1..iterations {
-        let tx = tx.clone();
-        let semaphore = semaphore.clone();
-        let evalf = evalf.clone();
-        executor
-            .spawn(async move {
-                let _guard = semaphore.acquire().await;
-                let output = evalf();
-                tx.send(output).ok();
-            })
-            .detach();
-    }
-    drop(tx);
-
-    let mut failed_evals = Vec::new();
-    let mut errored_evals = HashMap::new();
-    while let Ok(output) = rx.recv() {
-        processor.process(&output);
-
-        match output.outcome {
-            OutcomeKind::Passed => {}
-            OutcomeKind::Failed => {
-                failed_count += 1;
-                failed_evals.push(output);
-            }
-            OutcomeKind::Error => {
-                failed_count += 1;
-                *errored_evals.entry(output.data).or_insert(0) += 1;
-            }
-        }
-
-        evaluated_count += 1;
-        report_progress(evaluated_count, failed_count, iterations);
-    }
-
-    let actual_pass_ratio = (iterations - failed_count) as f32 / iterations as f32;
-    println!("Actual pass ratio: {}\n", actual_pass_ratio);
-    if actual_pass_ratio < expected_pass_ratio {
-        for (error, count) in errored_evals {
-            println!("Eval errored {} times. Error: {}", count, error);
-        }
-
-        for failed in failed_evals {
-            println!("Eval failed");
-            println!("{}", failed.data);
-        }
-
-        panic!(
-            "Actual pass ratio: {}\nExpected pass ratio: {}",
-            actual_pass_ratio, expected_pass_ratio
-        );
-    }
-
-    processor.assert();
-}
diff --git a/crates/explorer_command_injector/AppxManifest-Nightly.xml b/crates/explorer_command_injector/AppxManifest-Nightly.xml
deleted file mode 100644
index 32c33d2b0c..0000000000
--- a/crates/explorer_command_injector/AppxManifest-Nightly.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Package
-  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
-  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
-  xmlns:uap2="http://schemas.microsoft.com/appx/manifest/uap/windows10/2"
-  xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3"
-  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
-  xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10"
-  xmlns:desktop4="http://schemas.microsoft.com/appx/manifest/desktop/windows10/4"
-  xmlns:desktop5="http://schemas.microsoft.com/appx/manifest/desktop/windows10/5"
-  xmlns:desktop6="http://schemas.microsoft.com/appx/manifest/desktop/windows10/6"
-  xmlns:uap10="http://schemas.microsoft.com/appx/manifest/uap/windows10/10"
-  xmlns:com="http://schemas.microsoft.com/appx/manifest/com/windows10"
-  IgnorableNamespaces="uap uap2 uap3 rescap desktop desktop4 desktop5 desktop6 uap10 com">
-  <!-- TODO: Use Zed's signature here. -->
-  <Identity
-    Name="ZedIndustries.Zed.Nightly"
-    Publisher="CN=Zed Industries Inc, O=Zed Industries Inc, L=Denver, S=Colorado, C=US"
-    Version="1.0.0.0" />
-  <Properties>
-    <DisplayName>Zed Nightly</DisplayName>
-    <PublisherDisplayName>Zed Industries</PublisherDisplayName>
-    <!-- TODO: Use actual icon here. -->
-    <Logo>resources\logo_150x150.png</Logo>
-    <uap10:AllowExternalContent>true</uap10:AllowExternalContent>
-    <desktop6:RegistryWriteVirtualization>disabled</desktop6:RegistryWriteVirtualization>
-    <desktop6:FileSystemWriteVirtualization>disabled</desktop6:FileSystemWriteVirtualization>
-  </Properties>
-  <Resources>
-    <Resource Language="en-us" />
-    <Resource Language="zh-cn" />
-  </Resources>
-  <Dependencies>
-    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.19000.0" MaxVersionTested="10.0.22000.0" />
-  </Dependencies>
-  <Capabilities>
-    <rescap:Capability Name="runFullTrust" />
-    <rescap:Capability Name="unvirtualizedResources"/>
-  </Capabilities>
-  <Applications>
-    <Application Id="ZedNightly"
-      Executable="Zed.exe"
-      uap10:TrustLevel="mediumIL"
-      uap10:RuntimeBehavior="win32App">
-    <!-- TODO: Use actual icon here. -->
-      <uap:VisualElements
-        AppListEntry="none"
-        DisplayName="Zed Nightly"
-        Description="Zed Nightly explorer command injector"
-        BackgroundColor="transparent"
-        Square150x150Logo="resources\logo_150x150.png"
-        Square44x44Logo="resources\logo_70x70.png">
-      </uap:VisualElements>
-      <Extensions>
-        <desktop4:Extension Category="windows.fileExplorerContextMenus">
-          <desktop4:FileExplorerContextMenus>
-            <desktop5:ItemType Type="Directory">
-              <desktop5:Verb Id="OpenWithZedNightly" Clsid="266f2cfe-1653-42af-b55c-fe3590c83871" />
-            </desktop5:ItemType>
-            <desktop5:ItemType Type="Directory\Background">
-              <desktop5:Verb Id="OpenWithZedNightly" Clsid="266f2cfe-1653-42af-b55c-fe3590c83871" />
-            </desktop5:ItemType>
-            <desktop5:ItemType Type="*">
-              <desktop5:Verb Id="OpenWithZedNightly" Clsid="266f2cfe-1653-42af-b55c-fe3590c83871" />
-            </desktop5:ItemType>
-          </desktop4:FileExplorerContextMenus>
-        </desktop4:Extension>
-        <com:Extension Category="windows.comServer">
-          <com:ComServer>
-            <com:SurrogateServer DisplayName="Zed Nightly">
-              <com:Class Id="266f2cfe-1653-42af-b55c-fe3590c83871" Path="zed_explorer_command_injector.dll" ThreadingModel="STA"/>
-            </com:SurrogateServer>
-          </com:ComServer>
-        </com:Extension>
-      </Extensions>
-    </Application>
-  </Applications>
-</Package>
diff --git a/crates/explorer_command_injector/AppxManifest-Preview.xml b/crates/explorer_command_injector/AppxManifest-Preview.xml
deleted file mode 100644
index 2904653fb2..0000000000
--- a/crates/explorer_command_injector/AppxManifest-Preview.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Package
-  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
-  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
-  xmlns:uap2="http://schemas.microsoft.com/appx/manifest/uap/windows10/2"
-  xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3"
-  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
-  xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10"
-  xmlns:desktop4="http://schemas.microsoft.com/appx/manifest/desktop/windows10/4"
-  xmlns:desktop5="http://schemas.microsoft.com/appx/manifest/desktop/windows10/5"
-  xmlns:desktop6="http://schemas.microsoft.com/appx/manifest/desktop/windows10/6"
-  xmlns:uap10="http://schemas.microsoft.com/appx/manifest/uap/windows10/10"
-  xmlns:com="http://schemas.microsoft.com/appx/manifest/com/windows10"
-  IgnorableNamespaces="uap uap2 uap3 rescap desktop desktop4 desktop5 desktop6 uap10 com">
-  <!-- TODO: Use Zed's signature here. -->
-  <Identity
-    Name="ZedIndustries.Zed.Preview"
-    Publisher="CN=Zed Industries Inc, O=Zed Industries Inc, L=Denver, S=Colorado, C=US"
-    Version="1.0.0.0" />
-  <Properties>
-    <DisplayName>Zed Preview</DisplayName>
-    <PublisherDisplayName>Zed Industries</PublisherDisplayName>
-    <!-- TODO: Use actual icon here. -->
-    <Logo>resources\logo_150x150.png</Logo>
-    <uap10:AllowExternalContent>true</uap10:AllowExternalContent>
-    <desktop6:RegistryWriteVirtualization>disabled</desktop6:RegistryWriteVirtualization>
-    <desktop6:FileSystemWriteVirtualization>disabled</desktop6:FileSystemWriteVirtualization>
-  </Properties>
-  <Resources>
-    <Resource Language="en-us" />
-    <Resource Language="zh-cn" />
-  </Resources>
-  <Dependencies>
-    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.19000.0" MaxVersionTested="10.0.22000.0" />
-  </Dependencies>
-  <Capabilities>
-    <rescap:Capability Name="runFullTrust" />
-    <rescap:Capability Name="unvirtualizedResources"/>
-  </Capabilities>
-  <Applications>
-    <Application Id="ZedPreview"
-      Executable="Zed.exe"
-      uap10:TrustLevel="mediumIL"
-      uap10:RuntimeBehavior="win32App">
-    <!-- TODO: Use actual icon here. -->
-      <uap:VisualElements
-        AppListEntry="none"
-        DisplayName="Zed Preview"
-        Description="Zed Preview explorer command injector"
-        BackgroundColor="transparent"
-        Square150x150Logo="resources\logo_150x150.png"
-        Square44x44Logo="resources\logo_70x70.png">
-      </uap:VisualElements>
-      <Extensions>
-        <desktop4:Extension Category="windows.fileExplorerContextMenus">
-          <desktop4:FileExplorerContextMenus>
-            <desktop5:ItemType Type="Directory">
-              <desktop5:Verb Id="OpenWithZedPreview" Clsid="af8e85ea-fb20-4db2-93cf-56513c1ec697" />
-            </desktop5:ItemType>
-            <desktop5:ItemType Type="Directory\Background">
-              <desktop5:Verb Id="OpenWithZedPreview" Clsid="af8e85ea-fb20-4db2-93cf-56513c1ec697" />
-            </desktop5:ItemType>
-            <desktop5:ItemType Type="*">
-              <desktop5:Verb Id="OpenWithZedPreview" Clsid="af8e85ea-fb20-4db2-93cf-56513c1ec697" />
-            </desktop5:ItemType>
-          </desktop4:FileExplorerContextMenus>
-        </desktop4:Extension>
-        <com:Extension Category="windows.comServer">
-          <com:ComServer>
-            <com:SurrogateServer DisplayName="Zed Preview">
-              <com:Class Id="af8e85ea-fb20-4db2-93cf-56513c1ec697" Path="zed_explorer_command_injector.dll" ThreadingModel="STA"/>
-            </com:SurrogateServer>
-          </com:ComServer>
-        </com:Extension>
-      </Extensions>
-    </Application>
-  </Applications>
-</Package>
diff --git a/crates/explorer_command_injector/AppxManifest.xml b/crates/explorer_command_injector/AppxManifest.xml
deleted file mode 100644
index adf563fbc0..0000000000
--- a/crates/explorer_command_injector/AppxManifest.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Package
-  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
-  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
-  xmlns:uap2="http://schemas.microsoft.com/appx/manifest/uap/windows10/2"
-  xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3"
-  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
-  xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10"
-  xmlns:desktop4="http://schemas.microsoft.com/appx/manifest/desktop/windows10/4"
-  xmlns:desktop5="http://schemas.microsoft.com/appx/manifest/desktop/windows10/5"
-  xmlns:desktop6="http://schemas.microsoft.com/appx/manifest/desktop/windows10/6"
-  xmlns:uap10="http://schemas.microsoft.com/appx/manifest/uap/windows10/10"
-  xmlns:com="http://schemas.microsoft.com/appx/manifest/com/windows10"
-  IgnorableNamespaces="uap uap2 uap3 rescap desktop desktop4 desktop5 desktop6 uap10 com">
-  <!-- TODO: Use Zed's signature here. -->
-  <Identity
-    Name="ZedIndustries.Zed"
-    Publisher="CN=Zed Industries Inc, O=Zed Industries Inc, L=Denver, S=Colorado, C=US"
-    Version="1.0.0.0" />
-  <Properties>
-    <DisplayName>Zed</DisplayName>
-
-    <PublisherDisplayName>Zed Industries</PublisherDisplayName>
-    <!-- TODO: Use actual icon here. -->
-    <Logo>resources\logo_150x150.png</Logo>
-    <uap10:AllowExternalContent>true</uap10:AllowExternalContent>
-    <desktop6:RegistryWriteVirtualization>disabled</desktop6:RegistryWriteVirtualization>
-    <desktop6:FileSystemWriteVirtualization>disabled</desktop6:FileSystemWriteVirtualization>
-  </Properties>
-  <Resources>
-    <Resource Language="en-us" />
-    <Resource Language="zh-cn" />
-  </Resources>
-  <Dependencies>
-    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.19000.0" MaxVersionTested="10.0.22000.0" />
-  </Dependencies>
-  <Capabilities>
-    <rescap:Capability Name="runFullTrust" />
-    <rescap:Capability Name="unvirtualizedResources"/>
-  </Capabilities>
-  <Applications>
-    <Application Id="Zed"
-      Executable="Zed.exe"
-      uap10:TrustLevel="mediumIL"
-      uap10:RuntimeBehavior="win32App">
-    <!-- TODO: Use actual icon here. -->
-      <uap:VisualElements
-        AppListEntry="none"
-        DisplayName="Zed"
-        Description="Zed explorer command injector"
-        BackgroundColor="transparent"
-        Square150x150Logo="resources\logo_150x150.png"
-        Square44x44Logo="resources\logo_70x70.png">
-      </uap:VisualElements>
-      <Extensions>
-        <desktop4:Extension Category="windows.fileExplorerContextMenus">
-          <desktop4:FileExplorerContextMenus>
-            <desktop5:ItemType Type="Directory">
-              <desktop5:Verb Id="OpenWithZed" Clsid="6a1f6b13-3b82-48a1-9e06-7bb0a6d0bffd" />
-            </desktop5:ItemType>
-            <desktop5:ItemType Type="Directory\Background">
-              <desktop5:Verb Id="OpenWithZed" Clsid="6a1f6b13-3b82-48a1-9e06-7bb0a6d0bffd" />
-            </desktop5:ItemType>
-            <desktop5:ItemType Type="*">
-              <desktop5:Verb Id="OpenWithZed" Clsid="6a1f6b13-3b82-48a1-9e06-7bb0a6d0bffd" />
-            </desktop5:ItemType>
-          </desktop4:FileExplorerContextMenus>
-        </desktop4:Extension>
-        <com:Extension Category="windows.comServer">
-          <com:ComServer>
-            <com:SurrogateServer DisplayName="Zed">
-              <com:Class Id="6a1f6b13-3b82-48a1-9e06-7bb0a6d0bffd" Path="zed_explorer_command_injector.dll" ThreadingModel="STA"/>
-            </com:SurrogateServer>
-          </com:ComServer>
-        </com:Extension>
-      </Extensions>
-    </Application>
-  </Applications>
-</Package>
diff --git a/crates/explorer_command_injector/Cargo.toml b/crates/explorer_command_injector/Cargo.toml
deleted file mode 100644
index 8530329358..0000000000
--- a/crates/explorer_command_injector/Cargo.toml
+++ /dev/null
@@ -1,27 +0,0 @@
-[package]
-name = "explorer_command_injector"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-crate-type = ["cdylib"]
-path = "src/explorer_command_injector.rs"
-doctest = false
-
-[features]
-default = ["nightly"]
-stable = []
-preview = []
-nightly = []
-
-[target.'cfg(target_os = "windows")'.dependencies]
-windows.workspace = true
-windows-core.workspace = true
-windows-registry = "0.5"
-
-[dependencies]
diff --git a/crates/explorer_command_injector/LICENSE-GPL b/crates/explorer_command_injector/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/explorer_command_injector/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/explorer_command_injector/src/explorer_command_injector.rs b/crates/explorer_command_injector/src/explorer_command_injector.rs
deleted file mode 100644
index bfa2a0326c..0000000000
--- a/crates/explorer_command_injector/src/explorer_command_injector.rs
+++ /dev/null
@@ -1,202 +0,0 @@
-#![cfg(target_os = "windows")]
-
-use std::{os::windows::ffi::OsStringExt, path::PathBuf};
-
-use windows::{
-    Win32::{
-        Foundation::{
-            CLASS_E_CLASSNOTAVAILABLE, E_FAIL, E_INVALIDARG, E_NOTIMPL, ERROR_INSUFFICIENT_BUFFER,
-            GetLastError, HINSTANCE, MAX_PATH,
-        },
-        Globalization::u_strlen,
-        System::{
-            Com::{IBindCtx, IClassFactory, IClassFactory_Impl},
-            LibraryLoader::GetModuleFileNameW,
-            SystemServices::DLL_PROCESS_ATTACH,
-        },
-        UI::Shell::{
-            ECF_DEFAULT, ECS_ENABLED, IEnumExplorerCommand, IExplorerCommand,
-            IExplorerCommand_Impl, IShellItemArray, SHStrDupW, SIGDN_FILESYSPATH,
-        },
-    },
-    core::{BOOL, GUID, HRESULT, HSTRING, Interface, Ref, Result, implement},
-};
-
-static mut DLL_INSTANCE: HINSTANCE = HINSTANCE(std::ptr::null_mut());
-
-#[unsafe(no_mangle)]
-extern "system" fn DllMain(
-    hinstdll: HINSTANCE,
-    fdwreason: u32,
-    _lpvreserved: *mut core::ffi::c_void,
-) -> bool {
-    if fdwreason == DLL_PROCESS_ATTACH {
-        unsafe { DLL_INSTANCE = hinstdll };
-    }
-
-    true
-}
-
-#[implement(IExplorerCommand)]
-struct ExplorerCommandInjector;
-
-#[allow(non_snake_case)]
-impl IExplorerCommand_Impl for ExplorerCommandInjector_Impl {
-    fn GetTitle(&self, _: Ref<IShellItemArray>) -> Result<windows_core::PWSTR> {
-        let command_description =
-            retrieve_command_description().unwrap_or(HSTRING::from("Open with Zed"));
-        unsafe { SHStrDupW(&command_description) }
-    }
-
-    fn GetIcon(&self, _: Ref<IShellItemArray>) -> Result<windows_core::PWSTR> {
-        let Some(zed_exe) = get_zed_exe_path() else {
-            return Err(E_FAIL.into());
-        };
-        unsafe { SHStrDupW(&HSTRING::from(zed_exe)) }
-    }
-
-    fn GetToolTip(&self, _: Ref<IShellItemArray>) -> Result<windows_core::PWSTR> {
-        Err(E_NOTIMPL.into())
-    }
-
-    fn GetCanonicalName(&self) -> Result<windows_core::GUID> {
-        Ok(GUID::zeroed())
-    }
-
-    fn GetState(&self, _: Ref<IShellItemArray>, _: BOOL) -> Result<u32> {
-        Ok(ECS_ENABLED.0 as _)
-    }
-
-    fn Invoke(&self, psiitemarray: Ref<IShellItemArray>, _: Ref<IBindCtx>) -> Result<()> {
-        let items = psiitemarray.ok()?;
-        let Some(zed_exe) = get_zed_exe_path() else {
-            return Ok(());
-        };
-
-        let count = unsafe { items.GetCount()? };
-        for idx in 0..count {
-            let item = unsafe { items.GetItemAt(idx)? };
-            let item_path = unsafe { item.GetDisplayName(SIGDN_FILESYSPATH)?.to_string()? };
-            #[allow(clippy::disallowed_methods, reason = "no async context in sight..")]
-            std::process::Command::new(&zed_exe)
-                .arg(&item_path)
-                .spawn()
-                .map_err(|_| E_INVALIDARG)?;
-        }
-
-        Ok(())
-    }
-
-    fn GetFlags(&self) -> Result<u32> {
-        Ok(ECF_DEFAULT.0 as _)
-    }
-
-    fn EnumSubCommands(&self) -> Result<IEnumExplorerCommand> {
-        Err(E_NOTIMPL.into())
-    }
-}
-
-#[implement(IClassFactory)]
-struct ExplorerCommandInjectorFactory;
-
-impl IClassFactory_Impl for ExplorerCommandInjectorFactory_Impl {
-    fn CreateInstance(
-        &self,
-        punkouter: Ref<windows_core::IUnknown>,
-        riid: *const windows_core::GUID,
-        ppvobject: *mut *mut core::ffi::c_void,
-    ) -> Result<()> {
-        unsafe {
-            *ppvobject = std::ptr::null_mut();
-        }
-        if punkouter.is_none() {
-            let factory: IExplorerCommand = ExplorerCommandInjector {}.into();
-            let ret = unsafe { factory.query(riid, ppvobject).ok() };
-            if ret.is_ok() {
-                unsafe {
-                    *ppvobject = factory.into_raw();
-                }
-            }
-            ret
-        } else {
-            Err(E_INVALIDARG.into())
-        }
-    }
-
-    fn LockServer(&self, _: BOOL) -> Result<()> {
-        Ok(())
-    }
-}
-
-#[cfg(all(feature = "stable", not(feature = "preview"), not(feature = "nightly")))]
-const MODULE_ID: GUID = GUID::from_u128(0x6a1f6b13_3b82_48a1_9e06_7bb0a6d0bffd);
-#[cfg(all(feature = "preview", not(feature = "stable"), not(feature = "nightly")))]
-const MODULE_ID: GUID = GUID::from_u128(0xaf8e85ea_fb20_4db2_93cf_56513c1ec697);
-#[cfg(all(feature = "nightly", not(feature = "stable"), not(feature = "preview")))]
-const MODULE_ID: GUID = GUID::from_u128(0x266f2cfe_1653_42af_b55c_fe3590c83871);
-
-// Make cargo clippy happy
-#[cfg(all(feature = "nightly", feature = "stable", feature = "preview"))]
-const MODULE_ID: GUID = GUID::from_u128(0x685f4d49_6718_4c55_b271_ebb5c6a48d6f);
-
-#[unsafe(no_mangle)]
-extern "system" fn DllGetClassObject(
-    class_id: *const GUID,
-    iid: *const GUID,
-    out: *mut *mut std::ffi::c_void,
-) -> HRESULT {
-    unsafe {
-        *out = std::ptr::null_mut();
-    }
-    let class_id = unsafe { *class_id };
-    if class_id == MODULE_ID {
-        let instance: IClassFactory = ExplorerCommandInjectorFactory {}.into();
-        let ret = unsafe { instance.query(iid, out) };
-        if ret.is_ok() {
-            unsafe {
-                *out = instance.into_raw();
-            }
-        }
-        ret
-    } else {
-        CLASS_E_CLASSNOTAVAILABLE
-    }
-}
-
-fn get_zed_install_folder() -> Option<PathBuf> {
-    let mut buf = vec![0u16; MAX_PATH as usize];
-    unsafe { GetModuleFileNameW(Some(DLL_INSTANCE.into()), &mut buf) };
-
-    while unsafe { GetLastError() } == ERROR_INSUFFICIENT_BUFFER {
-        buf = vec![0u16; buf.len() * 2];
-        unsafe { GetModuleFileNameW(Some(DLL_INSTANCE.into()), &mut buf) };
-    }
-    let len = unsafe { u_strlen(buf.as_ptr()) };
-    let path: PathBuf = std::ffi::OsString::from_wide(&buf[..len as usize])
-        .into_string()
-        .ok()?
-        .into();
-    Some(path.parent()?.parent()?.to_path_buf())
-}
-
-#[inline]
-fn get_zed_exe_path() -> Option<String> {
-    get_zed_install_folder().map(|path| path.join("Zed.exe").to_string_lossy().into_owned())
-}
-
-#[inline]
-fn retrieve_command_description() -> Result<HSTRING> {
-    #[cfg(all(feature = "stable", not(feature = "preview"), not(feature = "nightly")))]
-    const REG_PATH: &str = "Software\\Classes\\ZedEditorContextMenu";
-    #[cfg(all(feature = "preview", not(feature = "stable"), not(feature = "nightly")))]
-    const REG_PATH: &str = "Software\\Classes\\ZedEditorPreviewContextMenu";
-    #[cfg(all(feature = "nightly", not(feature = "stable"), not(feature = "preview")))]
-    const REG_PATH: &str = "Software\\Classes\\ZedEditorNightlyContextMenu";
-
-    // Make cargo clippy happy
-    #[cfg(all(feature = "nightly", feature = "stable", feature = "preview"))]
-    const REG_PATH: &str = "Software\\Classes\\ZedEditorClippyContextMenu";
-
-    let key = windows_registry::CURRENT_USER.open(REG_PATH)?;
-    key.get_hstring("Title")
-}
diff --git a/crates/extension/Cargo.toml b/crates/extension/Cargo.toml
deleted file mode 100644
index 307a3a19bd..0000000000
--- a/crates/extension/Cargo.toml
+++ /dev/null
@@ -1,44 +0,0 @@
-[package]
-name = "extension"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/extension.rs"
-
-[dependencies]
-anyhow.workspace = true
-async-trait.workspace = true
-collections.workspace = true
-dap.workspace = true
-fs.workspace = true
-futures.workspace = true
-gpui.workspace = true
-heck.workspace = true
-http_client.workspace = true
-language.workspace = true
-log.workspace = true
-lsp.workspace = true
-parking_lot.workspace = true
-proto.workspace = true
-semver.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-task.workspace = true
-toml.workspace = true
-url.workspace = true
-util.workspace = true
-wasm-encoder.workspace = true
-wasmparser.workspace = true
-
-[dev-dependencies]
-fs = { workspace = true, "features" = ["test-support"] }
-gpui = { workspace = true, "features" = ["test-support"] }
-indoc.workspace = true
-pretty_assertions.workspace = true
-tempfile.workspace = true
diff --git a/crates/extension/LICENSE-GPL b/crates/extension/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/extension/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/extension/src/capabilities.rs b/crates/extension/src/capabilities.rs
deleted file mode 100644
index b8afc4ec06..0000000000
--- a/crates/extension/src/capabilities.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-mod download_file_capability;
-mod npm_install_package_capability;
-mod process_exec_capability;
-
-pub use download_file_capability::*;
-pub use npm_install_package_capability::*;
-pub use process_exec_capability::*;
-
-use serde::{Deserialize, Serialize};
-
-/// A capability for an extension.
-#[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize)]
-#[serde(tag = "kind", rename_all = "snake_case")]
-pub enum ExtensionCapability {
-    #[serde(rename = "process:exec")]
-    ProcessExec(ProcessExecCapability),
-    DownloadFile(DownloadFileCapability),
-    #[serde(rename = "npm:install")]
-    NpmInstallPackage(NpmInstallPackageCapability),
-}
diff --git a/crates/extension/src/capabilities/download_file_capability.rs b/crates/extension/src/capabilities/download_file_capability.rs
deleted file mode 100644
index a76755b593..0000000000
--- a/crates/extension/src/capabilities/download_file_capability.rs
+++ /dev/null
@@ -1,121 +0,0 @@
-use serde::{Deserialize, Serialize};
-use url::Url;
-
-#[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub struct DownloadFileCapability {
-    pub host: String,
-    pub path: Vec<String>,
-}
-
-impl DownloadFileCapability {
-    /// Returns whether the capability allows downloading a file from the given URL.
-    pub fn allows(&self, url: &Url) -> bool {
-        let Some(desired_host) = url.host_str() else {
-            return false;
-        };
-
-        let Some(desired_path) = url.path_segments() else {
-            return false;
-        };
-        let desired_path = desired_path.collect::<Vec<_>>();
-
-        if self.host != desired_host && self.host != "*" {
-            return false;
-        }
-
-        for (ix, path_segment) in self.path.iter().enumerate() {
-            if path_segment == "**" {
-                return true;
-            }
-
-            if ix >= desired_path.len() {
-                return false;
-            }
-
-            if path_segment != "*" && path_segment != desired_path[ix] {
-                return false;
-            }
-        }
-
-        if self.path.len() < desired_path.len() {
-            return false;
-        }
-
-        true
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use pretty_assertions::assert_eq;
-
-    use super::*;
-
-    #[test]
-    fn test_allows() {
-        let capability = DownloadFileCapability {
-            host: "*".to_string(),
-            path: vec!["**".to_string()],
-        };
-        assert_eq!(
-            capability.allows(&"https://example.com/some/path".parse().unwrap()),
-            true
-        );
-
-        let capability = DownloadFileCapability {
-            host: "github.com".to_string(),
-            path: vec!["**".to_string()],
-        };
-        assert_eq!(
-            capability.allows(&"https://github.com/some-owner/some-repo".parse().unwrap()),
-            true
-        );
-        assert_eq!(
-            capability.allows(
-                &"https://fake-github.com/some-owner/some-repo"
-                    .parse()
-                    .unwrap()
-            ),
-            false
-        );
-
-        let capability = DownloadFileCapability {
-            host: "github.com".to_string(),
-            path: vec!["specific-owner".to_string(), "*".to_string()],
-        };
-        assert_eq!(
-            capability.allows(&"https://github.com/some-owner/some-repo".parse().unwrap()),
-            false
-        );
-        assert_eq!(
-            capability.allows(
-                &"https://github.com/specific-owner/some-repo"
-                    .parse()
-                    .unwrap()
-            ),
-            true
-        );
-
-        let capability = DownloadFileCapability {
-            host: "github.com".to_string(),
-            path: vec!["specific-owner".to_string(), "*".to_string()],
-        };
-        assert_eq!(
-            capability.allows(
-                &"https://github.com/some-owner/some-repo/extra"
-                    .parse()
-                    .unwrap()
-            ),
-            false
-        );
-        assert_eq!(
-            capability.allows(
-                &"https://github.com/specific-owner/some-repo/extra"
-                    .parse()
-                    .unwrap()
-            ),
-            false
-        );
-    }
-}
diff --git a/crates/extension/src/capabilities/npm_install_package_capability.rs b/crates/extension/src/capabilities/npm_install_package_capability.rs
deleted file mode 100644
index 287645fc75..0000000000
--- a/crates/extension/src/capabilities/npm_install_package_capability.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub struct NpmInstallPackageCapability {
-    pub package: String,
-}
-
-impl NpmInstallPackageCapability {
-    /// Returns whether the capability allows installing the given NPM package.
-    pub fn allows(&self, package: &str) -> bool {
-        self.package == "*" || self.package == package
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use pretty_assertions::assert_eq;
-
-    use super::*;
-
-    #[test]
-    fn test_allows() {
-        let capability = NpmInstallPackageCapability {
-            package: "*".to_string(),
-        };
-        assert_eq!(capability.allows("package"), true);
-
-        let capability = NpmInstallPackageCapability {
-            package: "react".to_string(),
-        };
-        assert_eq!(capability.allows("react"), true);
-
-        let capability = NpmInstallPackageCapability {
-            package: "react".to_string(),
-        };
-        assert_eq!(capability.allows("malicious-package"), false);
-    }
-}
diff --git a/crates/extension/src/capabilities/process_exec_capability.rs b/crates/extension/src/capabilities/process_exec_capability.rs
deleted file mode 100644
index 053a7b212b..0000000000
--- a/crates/extension/src/capabilities/process_exec_capability.rs
+++ /dev/null
@@ -1,116 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub struct ProcessExecCapability {
-    /// The command to execute.
-    pub command: String,
-    /// The arguments to pass to the command. Use `*` for a single wildcard argument.
-    /// If the last element is `**`, then any trailing arguments are allowed.
-    pub args: Vec<String>,
-}
-
-impl ProcessExecCapability {
-    /// Returns whether the capability allows the given command and arguments.
-    pub fn allows(
-        &self,
-        desired_command: &str,
-        desired_args: &[impl AsRef<str> + std::fmt::Debug],
-    ) -> bool {
-        if self.command != desired_command && self.command != "*" {
-            return false;
-        }
-
-        for (ix, arg) in self.args.iter().enumerate() {
-            if arg == "**" {
-                return true;
-            }
-
-            if ix >= desired_args.len() {
-                return false;
-            }
-
-            if arg != "*" && arg != desired_args[ix].as_ref() {
-                return false;
-            }
-        }
-
-        if self.args.len() < desired_args.len() {
-            return false;
-        }
-
-        true
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use pretty_assertions::assert_eq;
-
-    use super::*;
-
-    #[test]
-    fn test_allows_with_exact_match() {
-        let capability = ProcessExecCapability {
-            command: "ls".to_string(),
-            args: vec!["-la".to_string()],
-        };
-
-        assert_eq!(capability.allows("ls", &["-la"]), true);
-        assert_eq!(capability.allows("ls", &["-l"]), false);
-        assert_eq!(capability.allows("pwd", &[] as &[&str]), false);
-    }
-
-    #[test]
-    fn test_allows_with_wildcard_arg() {
-        let capability = ProcessExecCapability {
-            command: "git".to_string(),
-            args: vec!["*".to_string()],
-        };
-
-        assert_eq!(capability.allows("git", &["status"]), true);
-        assert_eq!(capability.allows("git", &["commit"]), true);
-        // Too many args.
-        assert_eq!(capability.allows("git", &["status", "-s"]), false);
-        // Wrong command.
-        assert_eq!(capability.allows("npm", &["install"]), false);
-    }
-
-    #[test]
-    fn test_allows_with_double_wildcard() {
-        let capability = ProcessExecCapability {
-            command: "cargo".to_string(),
-            args: vec!["test".to_string(), "**".to_string()],
-        };
-
-        assert_eq!(capability.allows("cargo", &["test"]), true);
-        assert_eq!(capability.allows("cargo", &["test", "--all"]), true);
-        assert_eq!(
-            capability.allows("cargo", &["test", "--all", "--no-fail-fast"]),
-            true
-        );
-        // Wrong first arg.
-        assert_eq!(capability.allows("cargo", &["build"]), false);
-    }
-
-    #[test]
-    fn test_allows_with_mixed_wildcards() {
-        let capability = ProcessExecCapability {
-            command: "docker".to_string(),
-            args: vec!["run".to_string(), "*".to_string(), "**".to_string()],
-        };
-
-        assert_eq!(capability.allows("docker", &["run", "nginx"]), true);
-        assert_eq!(capability.allows("docker", &["run"]), false);
-        assert_eq!(
-            capability.allows("docker", &["run", "ubuntu", "bash"]),
-            true
-        );
-        assert_eq!(
-            capability.allows("docker", &["run", "alpine", "sh", "-c", "echo hello"]),
-            true
-        );
-        // Wrong first arg.
-        assert_eq!(capability.allows("docker", &["ps"]), false);
-    }
-}
diff --git a/crates/extension/src/extension.rs b/crates/extension/src/extension.rs
deleted file mode 100644
index 88f2bea0c0..0000000000
--- a/crates/extension/src/extension.rs
+++ /dev/null
@@ -1,210 +0,0 @@
-mod capabilities;
-pub mod extension_builder;
-mod extension_events;
-mod extension_host_proxy;
-mod extension_manifest;
-mod types;
-
-use std::path::{Path, PathBuf};
-use std::sync::Arc;
-
-use ::lsp::LanguageServerName;
-use anyhow::{Context as _, Result, bail};
-use async_trait::async_trait;
-use fs::normalize_path;
-use gpui::{App, Task};
-use language::LanguageName;
-use semver::Version;
-use task::{SpawnInTerminal, ZedDebugConfig};
-use util::rel_path::RelPath;
-
-pub use crate::capabilities::*;
-pub use crate::extension_events::*;
-pub use crate::extension_host_proxy::*;
-pub use crate::extension_manifest::*;
-pub use crate::types::*;
-
-/// Initializes the `extension` crate.
-pub fn init(cx: &mut App) {
-    extension_events::init(cx);
-    ExtensionHostProxy::default_global(cx);
-}
-
-#[async_trait]
-pub trait WorktreeDelegate: Send + Sync + 'static {
-    fn id(&self) -> u64;
-    fn root_path(&self) -> String;
-    async fn read_text_file(&self, path: &RelPath) -> Result<String>;
-    async fn which(&self, binary_name: String) -> Option<String>;
-    async fn shell_env(&self) -> Vec<(String, String)>;
-}
-
-pub trait ProjectDelegate: Send + Sync + 'static {
-    fn worktree_ids(&self) -> Vec<u64>;
-}
-
-pub trait KeyValueStoreDelegate: Send + Sync + 'static {
-    fn insert(&self, key: String, docs: String) -> Task<Result<()>>;
-}
-
-#[async_trait]
-pub trait Extension: Send + Sync + 'static {
-    /// Returns the [`ExtensionManifest`] for this extension.
-    fn manifest(&self) -> Arc<ExtensionManifest>;
-
-    /// Returns the path to this extension's working directory.
-    fn work_dir(&self) -> Arc<Path>;
-
-    /// Returns a path relative to this extension's working directory.
-    fn path_from_extension(&self, path: &Path) -> PathBuf {
-        normalize_path(&self.work_dir().join(path))
-    }
-
-    async fn language_server_command(
-        &self,
-        language_server_id: LanguageServerName,
-        language_name: LanguageName,
-        worktree: Arc<dyn WorktreeDelegate>,
-    ) -> Result<Command>;
-
-    async fn language_server_initialization_options(
-        &self,
-        language_server_id: LanguageServerName,
-        language_name: LanguageName,
-        worktree: Arc<dyn WorktreeDelegate>,
-    ) -> Result<Option<String>>;
-
-    async fn language_server_workspace_configuration(
-        &self,
-        language_server_id: LanguageServerName,
-        worktree: Arc<dyn WorktreeDelegate>,
-    ) -> Result<Option<String>>;
-
-    async fn language_server_additional_initialization_options(
-        &self,
-        language_server_id: LanguageServerName,
-        target_language_server_id: LanguageServerName,
-        worktree: Arc<dyn WorktreeDelegate>,
-    ) -> Result<Option<String>>;
-
-    async fn language_server_additional_workspace_configuration(
-        &self,
-        language_server_id: LanguageServerName,
-        target_language_server_id: LanguageServerName,
-        worktree: Arc<dyn WorktreeDelegate>,
-    ) -> Result<Option<String>>;
-
-    async fn labels_for_completions(
-        &self,
-        language_server_id: LanguageServerName,
-        completions: Vec<Completion>,
-    ) -> Result<Vec<Option<CodeLabel>>>;
-
-    async fn labels_for_symbols(
-        &self,
-        language_server_id: LanguageServerName,
-        symbols: Vec<Symbol>,
-    ) -> Result<Vec<Option<CodeLabel>>>;
-
-    async fn complete_slash_command_argument(
-        &self,
-        command: SlashCommand,
-        arguments: Vec<String>,
-    ) -> Result<Vec<SlashCommandArgumentCompletion>>;
-
-    async fn run_slash_command(
-        &self,
-        command: SlashCommand,
-        arguments: Vec<String>,
-        worktree: Option<Arc<dyn WorktreeDelegate>>,
-    ) -> Result<SlashCommandOutput>;
-
-    async fn context_server_command(
-        &self,
-        context_server_id: Arc<str>,
-        project: Arc<dyn ProjectDelegate>,
-    ) -> Result<Command>;
-
-    async fn context_server_configuration(
-        &self,
-        context_server_id: Arc<str>,
-        project: Arc<dyn ProjectDelegate>,
-    ) -> Result<Option<ContextServerConfiguration>>;
-
-    async fn suggest_docs_packages(&self, provider: Arc<str>) -> Result<Vec<String>>;
-
-    async fn index_docs(
-        &self,
-        provider: Arc<str>,
-        package_name: Arc<str>,
-        kv_store: Arc<dyn KeyValueStoreDelegate>,
-    ) -> Result<()>;
-
-    async fn get_dap_binary(
-        &self,
-        dap_name: Arc<str>,
-        config: DebugTaskDefinition,
-        user_installed_path: Option<PathBuf>,
-        worktree: Arc<dyn WorktreeDelegate>,
-    ) -> Result<DebugAdapterBinary>;
-
-    async fn dap_request_kind(
-        &self,
-        dap_name: Arc<str>,
-        config: serde_json::Value,
-    ) -> Result<StartDebuggingRequestArgumentsRequest>;
-
-    async fn dap_config_to_scenario(&self, config: ZedDebugConfig) -> Result<DebugScenario>;
-
-    async fn dap_locator_create_scenario(
-        &self,
-        locator_name: String,
-        build_config_template: BuildTaskTemplate,
-        resolved_label: String,
-        debug_adapter_name: String,
-    ) -> Result<Option<DebugScenario>>;
-    async fn run_dap_locator(
-        &self,
-        locator_name: String,
-        config: SpawnInTerminal,
-    ) -> Result<DebugRequest>;
-}
-
-pub fn parse_wasm_extension_version(extension_id: &str, wasm_bytes: &[u8]) -> Result<Version> {
-    let mut version = None;
-
-    for part in wasmparser::Parser::new(0).parse_all(wasm_bytes) {
-        if let wasmparser::Payload::CustomSection(s) =
-            part.context("error parsing wasm extension")?
-            && s.name() == "zed:api-version"
-        {
-            version = parse_wasm_extension_version_custom_section(s.data());
-            if version.is_none() {
-                bail!(
-                    "extension {} has invalid zed:api-version section: {:?}",
-                    extension_id,
-                    s.data()
-                );
-            }
-        }
-    }
-
-    // The reason we wait until we're done parsing all of the Wasm bytes to return the version
-    // is to work around a panic that can happen inside of Wasmtime when the bytes are invalid.
-    //
-    // By parsing the entirety of the Wasm bytes before we return, we're able to detect this problem
-    // earlier as an `Err` rather than as a panic.
-    version.with_context(|| format!("extension {extension_id} has no zed:api-version section"))
-}
-
-fn parse_wasm_extension_version_custom_section(data: &[u8]) -> Option<Version> {
-    if data.len() == 6 {
-        Some(Version::new(
-            u16::from_be_bytes([data[0], data[1]]) as _,
-            u16::from_be_bytes([data[2], data[3]]) as _,
-            u16::from_be_bytes([data[4], data[5]]) as _,
-        ))
-    } else {
-        None
-    }
-}
diff --git a/crates/extension/src/extension_builder.rs b/crates/extension/src/extension_builder.rs
deleted file mode 100644
index 8b9bf994d1..0000000000
--- a/crates/extension/src/extension_builder.rs
+++ /dev/null
@@ -1,826 +0,0 @@
-use crate::{
-    ExtensionLibraryKind, ExtensionManifest, GrammarManifestEntry, build_debug_adapter_schema_path,
-    parse_wasm_extension_version,
-};
-use ::fs::Fs;
-use anyhow::{Context as _, Result, bail};
-use futures::{AsyncReadExt, StreamExt};
-use heck::ToSnakeCase;
-use http_client::{self, AsyncBody, HttpClient};
-use serde::Deserialize;
-use std::{
-    env, fs, mem,
-    path::{Path, PathBuf},
-    process::Stdio,
-    str::FromStr,
-    sync::Arc,
-};
-use wasm_encoder::{ComponentSectionId, Encode as _, RawSection, Section as _};
-use wasmparser::Parser;
-
-/// Currently, we compile with Rust's `wasm32-wasip2` target, which works with WASI `preview2` and the component model.
-const RUST_TARGET: &str = "wasm32-wasip2";
-
-/// Compiling Tree-sitter parsers from C to WASM requires Clang 17, and a WASM build of libc
-/// and clang's runtime library. The `wasi-sdk` provides these binaries.
-///
-/// Once Clang 17 and its wasm target are available via system package managers, we won't need
-/// to download this.
-const WASI_SDK_URL: &str = "https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-25/";
-const WASI_SDK_ASSET_NAME: Option<&str> = if cfg!(all(target_os = "macos", target_arch = "x86_64"))
-{
-    Some("wasi-sdk-25.0-x86_64-macos.tar.gz")
-} else if cfg!(all(target_os = "macos", target_arch = "aarch64")) {
-    Some("wasi-sdk-25.0-arm64-macos.tar.gz")
-} else if cfg!(all(target_os = "linux", target_arch = "x86_64")) {
-    Some("wasi-sdk-25.0-x86_64-linux.tar.gz")
-} else if cfg!(all(target_os = "linux", target_arch = "aarch64")) {
-    Some("wasi-sdk-25.0-arm64-linux.tar.gz")
-} else if cfg!(all(target_os = "freebsd", target_arch = "x86_64")) {
-    Some("wasi-sdk-25.0-x86_64-linux.tar.gz")
-} else if cfg!(all(target_os = "freebsd", target_arch = "aarch64")) {
-    Some("wasi-sdk-25.0-arm64-linux.tar.gz")
-} else if cfg!(all(target_os = "windows", target_arch = "x86_64")) {
-    Some("wasi-sdk-25.0-x86_64-windows.tar.gz")
-} else {
-    None
-};
-
-pub struct ExtensionBuilder {
-    cache_dir: PathBuf,
-    pub http: Arc<dyn HttpClient>,
-}
-
-pub struct CompileExtensionOptions {
-    pub release: bool,
-}
-
-#[derive(Deserialize)]
-struct CargoToml {
-    package: CargoTomlPackage,
-}
-
-#[derive(Deserialize)]
-struct CargoTomlPackage {
-    name: String,
-}
-
-impl ExtensionBuilder {
-    pub fn new(http_client: Arc<dyn HttpClient>, cache_dir: PathBuf) -> Self {
-        Self {
-            cache_dir,
-            http: http_client,
-        }
-    }
-
-    pub async fn compile_extension(
-        &self,
-        extension_dir: &Path,
-        extension_manifest: &mut ExtensionManifest,
-        options: CompileExtensionOptions,
-        fs: Arc<dyn Fs>,
-    ) -> Result<()> {
-        populate_defaults(extension_manifest, extension_dir, fs).await?;
-
-        if extension_dir.is_relative() {
-            bail!(
-                "extension dir {} is not an absolute path",
-                extension_dir.display()
-            );
-        }
-
-        fs::create_dir_all(&self.cache_dir).context("failed to create cache dir")?;
-
-        if extension_manifest.lib.kind == Some(ExtensionLibraryKind::Rust) {
-            log::info!("compiling Rust extension {}", extension_dir.display());
-            self.compile_rust_extension(extension_dir, extension_manifest, options)
-                .await
-                .context("failed to compile Rust extension")?;
-            log::info!("compiled Rust extension {}", extension_dir.display());
-        }
-
-        for (debug_adapter_name, meta) in &mut extension_manifest.debug_adapters {
-            let debug_adapter_schema_path =
-                extension_dir.join(build_debug_adapter_schema_path(debug_adapter_name, meta));
-
-            let debug_adapter_schema = fs::read_to_string(&debug_adapter_schema_path)
-                .with_context(|| {
-                    format!("failed to read debug adapter schema for `{debug_adapter_name}` from `{debug_adapter_schema_path:?}`")
-                })?;
-            _ = serde_json::Value::from_str(&debug_adapter_schema).with_context(|| {
-                format!("Debug adapter schema for `{debug_adapter_name}` (path: `{debug_adapter_schema_path:?}`) is not a valid JSON")
-            })?;
-        }
-        for (grammar_name, grammar_metadata) in &extension_manifest.grammars {
-            let snake_cased_grammar_name = grammar_name.to_snake_case();
-            if grammar_name.as_ref() != snake_cased_grammar_name.as_str() {
-                bail!(
-                    "grammar name '{grammar_name}' must be written in snake_case: {snake_cased_grammar_name}"
-                );
-            }
-
-            log::info!(
-                "compiling grammar {grammar_name} for extension {}",
-                extension_dir.display()
-            );
-            self.compile_grammar(extension_dir, grammar_name.as_ref(), grammar_metadata)
-                .await
-                .with_context(|| format!("failed to compile grammar '{grammar_name}'"))?;
-            log::info!(
-                "compiled grammar {grammar_name} for extension {}",
-                extension_dir.display()
-            );
-        }
-
-        log::info!("finished compiling extension {}", extension_dir.display());
-        Ok(())
-    }
-
-    async fn compile_rust_extension(
-        &self,
-        extension_dir: &Path,
-        manifest: &mut ExtensionManifest,
-        options: CompileExtensionOptions,
-    ) -> anyhow::Result<()> {
-        self.install_rust_wasm_target_if_needed().await?;
-
-        let cargo_toml_content = fs::read_to_string(extension_dir.join("Cargo.toml"))?;
-        let cargo_toml: CargoToml = toml::from_str(&cargo_toml_content)?;
-
-        log::info!(
-            "compiling Rust crate for extension {}",
-            extension_dir.display()
-        );
-        let output = util::command::new_smol_command("cargo")
-            .args(["build", "--target", RUST_TARGET])
-            .args(options.release.then_some("--release"))
-            .arg("--target-dir")
-            .arg(extension_dir.join("target"))
-            // WASI builds do not work with sccache and just stuck, so disable it.
-            .env("RUSTC_WRAPPER", "")
-            .current_dir(extension_dir)
-            .output()
-            .await
-            .context("failed to run `cargo`")?;
-        if !output.status.success() {
-            bail!(
-                "failed to build extension {}",
-                String::from_utf8_lossy(&output.stderr)
-            );
-        }
-
-        log::info!(
-            "compiled Rust crate for extension {}",
-            extension_dir.display()
-        );
-
-        let mut wasm_path = PathBuf::from(extension_dir);
-        wasm_path.extend([
-            "target",
-            RUST_TARGET,
-            if options.release { "release" } else { "debug" },
-            &cargo_toml
-                .package
-                .name
-                // The wasm32-wasip2 target normalizes `-` in package names to `_` in the resulting `.wasm` file.
-                .replace('-', "_"),
-        ]);
-        wasm_path.set_extension("wasm");
-
-        log::info!(
-            "encoding wasm component for extension {}",
-            extension_dir.display()
-        );
-
-        let component_bytes = fs::read(&wasm_path)
-            .with_context(|| format!("failed to read output module `{}`", wasm_path.display()))?;
-
-        let component_bytes = self
-            .strip_custom_sections(&component_bytes)
-            .context("failed to strip debug sections from wasm component")?;
-
-        let wasm_extension_api_version =
-            parse_wasm_extension_version(&manifest.id, &component_bytes)
-                .context("compiled wasm did not contain a valid zed extension api version")?;
-        manifest.lib.version = Some(wasm_extension_api_version);
-
-        let extension_file = extension_dir.join("extension.wasm");
-        fs::write(extension_file.clone(), &component_bytes)
-            .context("failed to write extension.wasm")?;
-
-        log::info!(
-            "extension {} written to {}",
-            extension_dir.display(),
-            extension_file.display()
-        );
-
-        Ok(())
-    }
-
-    async fn compile_grammar(
-        &self,
-        extension_dir: &Path,
-        grammar_name: &str,
-        grammar_metadata: &GrammarManifestEntry,
-    ) -> Result<()> {
-        let clang_path = self.install_wasi_sdk_if_needed().await?;
-
-        let mut grammar_repo_dir = extension_dir.to_path_buf();
-        grammar_repo_dir.extend(["grammars", grammar_name]);
-
-        let mut grammar_wasm_path = grammar_repo_dir.clone();
-        grammar_wasm_path.set_extension("wasm");
-
-        log::info!("checking out {grammar_name} parser");
-        self.checkout_repo(
-            &grammar_repo_dir,
-            &grammar_metadata.repository,
-            &grammar_metadata.rev,
-        )
-        .await?;
-
-        let base_grammar_path = grammar_metadata
-            .path
-            .as_ref()
-            .map(|path| grammar_repo_dir.join(path))
-            .unwrap_or(grammar_repo_dir);
-
-        let src_path = base_grammar_path.join("src");
-        let parser_path = src_path.join("parser.c");
-        let scanner_path = src_path.join("scanner.c");
-
-        // Skip recompiling if the WASM object is already newer than the source files
-        if file_newer_than_deps(&grammar_wasm_path, &[&parser_path, &scanner_path]).unwrap_or(false)
-        {
-            log::info!(
-                "skipping compilation of {grammar_name} parser because the existing compiled grammar is up to date"
-            );
-        } else {
-            log::info!("compiling {grammar_name} parser");
-            let clang_output = util::command::new_smol_command(&clang_path)
-                .args(["-fPIC", "-shared", "-Os"])
-                .arg(format!("-Wl,--export=tree_sitter_{grammar_name}"))
-                .arg("-o")
-                .arg(&grammar_wasm_path)
-                .arg("-I")
-                .arg(&src_path)
-                .arg(&parser_path)
-                .args(scanner_path.exists().then_some(scanner_path))
-                .output()
-                .await
-                .context("failed to run clang")?;
-
-            if !clang_output.status.success() {
-                bail!(
-                    "failed to compile {} parser with clang: {}",
-                    grammar_name,
-                    String::from_utf8_lossy(&clang_output.stderr),
-                );
-            }
-        }
-
-        Ok(())
-    }
-
-    async fn checkout_repo(&self, directory: &Path, url: &str, rev: &str) -> Result<()> {
-        let git_dir = directory.join(".git");
-
-        if directory.exists() {
-            let remotes_output = util::command::new_smol_command("git")
-                .arg("--git-dir")
-                .arg(&git_dir)
-                .args(["remote", "-v"])
-                .output()
-                .await?;
-            let has_remote = remotes_output.status.success()
-                && String::from_utf8_lossy(&remotes_output.stdout)
-                    .lines()
-                    .any(|line| {
-                        let mut parts = line.split(|c: char| c.is_whitespace());
-                        parts.next() == Some("origin") && parts.any(|part| part == url)
-                    });
-            if !has_remote {
-                bail!(
-                    "grammar directory '{}' already exists, but is not a git clone of '{}'",
-                    directory.display(),
-                    url
-                );
-            }
-        } else {
-            fs::create_dir_all(directory).with_context(|| {
-                format!("failed to create grammar directory {}", directory.display(),)
-            })?;
-            let init_output = util::command::new_smol_command("git")
-                .arg("init")
-                .current_dir(directory)
-                .output()
-                .await?;
-            if !init_output.status.success() {
-                bail!(
-                    "failed to run `git init` in directory '{}'",
-                    directory.display()
-                );
-            }
-
-            let remote_add_output = util::command::new_smol_command("git")
-                .arg("--git-dir")
-                .arg(&git_dir)
-                .args(["remote", "add", "origin", url])
-                .output()
-                .await
-                .context("failed to execute `git remote add`")?;
-            if !remote_add_output.status.success() {
-                bail!(
-                    "failed to add remote {url} for git repository {}",
-                    git_dir.display()
-                );
-            }
-        }
-
-        let fetch_output = util::command::new_smol_command("git")
-            .arg("--git-dir")
-            .arg(&git_dir)
-            .args(["fetch", "--depth", "1", "origin", rev])
-            .output()
-            .await
-            .context("failed to execute `git fetch`")?;
-
-        let checkout_output = util::command::new_smol_command("git")
-            .arg("--git-dir")
-            .arg(&git_dir)
-            .args(["checkout", rev])
-            .current_dir(directory)
-            .output()
-            .await
-            .context("failed to execute `git checkout`")?;
-        if !checkout_output.status.success() {
-            if !fetch_output.status.success() {
-                bail!(
-                    "failed to fetch revision {} in directory '{}'",
-                    rev,
-                    directory.display()
-                );
-            }
-            bail!(
-                "failed to checkout revision {} in directory '{}': {}",
-                rev,
-                directory.display(),
-                String::from_utf8_lossy(&checkout_output.stderr)
-            );
-        }
-
-        Ok(())
-    }
-
-    async fn install_rust_wasm_target_if_needed(&self) -> Result<()> {
-        let rustc_output = util::command::new_smol_command("rustc")
-            .arg("--print")
-            .arg("sysroot")
-            .output()
-            .await
-            .context("failed to run rustc")?;
-        if !rustc_output.status.success() {
-            bail!(
-                "failed to retrieve rust sysroot: {}",
-                String::from_utf8_lossy(&rustc_output.stderr)
-            );
-        }
-
-        let sysroot = PathBuf::from(String::from_utf8(rustc_output.stdout)?.trim());
-        if sysroot.join("lib/rustlib").join(RUST_TARGET).exists() {
-            return Ok(());
-        }
-
-        let output = util::command::new_smol_command("rustup")
-            .args(["target", "add", RUST_TARGET])
-            .stderr(Stdio::piped())
-            .stdout(Stdio::inherit())
-            .output()
-            .await
-            .context("failed to run `rustup target add`")?;
-        if !output.status.success() {
-            bail!(
-                "failed to install the `{RUST_TARGET}` target: {}",
-                String::from_utf8_lossy(&rustc_output.stderr)
-            );
-        }
-
-        Ok(())
-    }
-
-    async fn install_wasi_sdk_if_needed(&self) -> Result<PathBuf> {
-        let url = if let Some(asset_name) = WASI_SDK_ASSET_NAME {
-            format!("{WASI_SDK_URL}{asset_name}")
-        } else {
-            bail!("wasi-sdk is not available for platform {}", env::consts::OS);
-        };
-
-        let wasi_sdk_dir = self.cache_dir.join("wasi-sdk");
-        let mut clang_path = wasi_sdk_dir.clone();
-        clang_path.extend(["bin", &format!("clang{}", env::consts::EXE_SUFFIX)]);
-
-        log::info!("downloading wasi-sdk to {}", wasi_sdk_dir.display());
-
-        if fs::metadata(&clang_path).is_ok_and(|metadata| metadata.is_file()) {
-            return Ok(clang_path);
-        }
-
-        let tar_out_dir = self.cache_dir.join("wasi-sdk-temp");
-
-        fs::remove_dir_all(&wasi_sdk_dir).ok();
-        fs::remove_dir_all(&tar_out_dir).ok();
-        fs::create_dir_all(&tar_out_dir).context("failed to create extraction directory")?;
-
-        let mut response = self.http.get(&url, AsyncBody::default(), true).await?;
-
-        // Write the response to a temporary file
-        let tar_gz_path = self.cache_dir.join("wasi-sdk.tar.gz");
-        let mut tar_gz_file =
-            fs::File::create(&tar_gz_path).context("failed to create temporary tar.gz file")?;
-        let response_body = response.body_mut();
-        let mut body_bytes = Vec::new();
-        response_body.read_to_end(&mut body_bytes).await?;
-        std::io::Write::write_all(&mut tar_gz_file, &body_bytes)?;
-        drop(tar_gz_file);
-
-        log::info!("un-tarring wasi-sdk to {}", tar_out_dir.display());
-
-        // Shell out to tar to extract the archive
-        let tar_output = util::command::new_smol_command("tar")
-            .arg("-xzf")
-            .arg(&tar_gz_path)
-            .arg("-C")
-            .arg(&tar_out_dir)
-            .output()
-            .await
-            .context("failed to run tar")?;
-
-        if !tar_output.status.success() {
-            bail!(
-                "failed to extract wasi-sdk archive: {}",
-                String::from_utf8_lossy(&tar_output.stderr)
-            );
-        }
-
-        log::info!("finished downloading wasi-sdk");
-
-        // Clean up the temporary tar.gz file
-        fs::remove_file(&tar_gz_path).ok();
-
-        let inner_dir = fs::read_dir(&tar_out_dir)?
-            .next()
-            .context("no content")?
-            .context("failed to read contents of extracted wasi archive directory")?
-            .path();
-        fs::rename(&inner_dir, &wasi_sdk_dir).context("failed to move extracted wasi dir")?;
-        fs::remove_dir_all(&tar_out_dir).ok();
-
-        Ok(clang_path)
-    }
-
-    // This was adapted from:
-    // https://github.com/bytecodealliance/wasm-tools/blob/e8809bb17fcf69aa8c85cd5e6db7cff5cf36b1de/src/bin/wasm-tools/strip.rs
-    fn strip_custom_sections(&self, input: &Vec<u8>) -> Result<Vec<u8>> {
-        use wasmparser::Payload::*;
-
-        let strip_custom_section = |name: &str| {
-            // Default strip everything but:
-            // * the `name` section
-            // * any `component-type` sections
-            // * the `dylink.0` section
-            // * our custom version section
-            name != "name"
-                && !name.starts_with("component-type:")
-                && name != "dylink.0"
-                && name != "zed:api-version"
-        };
-
-        let mut output = Vec::new();
-        let mut stack = Vec::new();
-
-        for payload in Parser::new(0).parse_all(input) {
-            let payload = payload?;
-
-            // Track nesting depth, so that we don't mess with inner producer sections:
-            match payload {
-                Version { encoding, .. } => {
-                    output.extend_from_slice(match encoding {
-                        wasmparser::Encoding::Component => &wasm_encoder::Component::HEADER,
-                        wasmparser::Encoding::Module => &wasm_encoder::Module::HEADER,
-                    });
-                }
-                ModuleSection { .. } | ComponentSection { .. } => {
-                    stack.push(mem::take(&mut output));
-                    continue;
-                }
-                End { .. } => {
-                    let mut parent = match stack.pop() {
-                        Some(c) => c,
-                        None => break,
-                    };
-                    if output.starts_with(&wasm_encoder::Component::HEADER) {
-                        parent.push(ComponentSectionId::Component as u8);
-                        output.encode(&mut parent);
-                    } else {
-                        parent.push(ComponentSectionId::CoreModule as u8);
-                        output.encode(&mut parent);
-                    }
-                    output = parent;
-                }
-                _ => {}
-            }
-
-            if let CustomSection(c) = &payload
-                && strip_custom_section(c.name())
-            {
-                continue;
-            }
-            if let Some((id, range)) = payload.as_section() {
-                RawSection {
-                    id,
-                    data: &input[range],
-                }
-                .append_to(&mut output);
-            }
-        }
-
-        Ok(output)
-    }
-}
-
-async fn populate_defaults(
-    manifest: &mut ExtensionManifest,
-    extension_path: &Path,
-    fs: Arc<dyn Fs>,
-) -> Result<()> {
-    // For legacy extensions on the v0 schema (aka, using `extension.json`), clear out any existing
-    // contents of the computed fields, since we don't care what the existing values are.
-    if manifest.schema_version.is_v0() {
-        manifest.languages.clear();
-        manifest.grammars.clear();
-        manifest.themes.clear();
-    }
-
-    let cargo_toml_path = extension_path.join("Cargo.toml");
-    if cargo_toml_path.exists() {
-        manifest.lib.kind = Some(ExtensionLibraryKind::Rust);
-    }
-
-    let languages_dir = extension_path.join("languages");
-    if fs.is_dir(&languages_dir).await {
-        let mut language_dir_entries = fs
-            .read_dir(&languages_dir)
-            .await
-            .context("failed to list languages dir")?;
-
-        while let Some(language_dir) = language_dir_entries.next().await {
-            let language_dir = language_dir?;
-            let config_path = language_dir.join("config.toml");
-            if fs.is_file(config_path.as_path()).await {
-                let relative_language_dir =
-                    language_dir.strip_prefix(extension_path)?.to_path_buf();
-                if !manifest.languages.contains(&relative_language_dir) {
-                    manifest.languages.push(relative_language_dir);
-                }
-            }
-        }
-    }
-
-    let themes_dir = extension_path.join("themes");
-    if fs.is_dir(&themes_dir).await {
-        let mut theme_dir_entries = fs
-            .read_dir(&themes_dir)
-            .await
-            .context("failed to list themes dir")?;
-
-        while let Some(theme_path) = theme_dir_entries.next().await {
-            let theme_path = theme_path?;
-            if theme_path.extension() == Some("json".as_ref()) {
-                let relative_theme_path = theme_path.strip_prefix(extension_path)?.to_path_buf();
-                if !manifest.themes.contains(&relative_theme_path) {
-                    manifest.themes.push(relative_theme_path);
-                }
-            }
-        }
-    }
-
-    let icon_themes_dir = extension_path.join("icon_themes");
-    if fs.is_dir(&icon_themes_dir).await {
-        let mut icon_theme_dir_entries = fs
-            .read_dir(&icon_themes_dir)
-            .await
-            .context("failed to list icon themes dir")?;
-
-        while let Some(icon_theme_path) = icon_theme_dir_entries.next().await {
-            let icon_theme_path = icon_theme_path?;
-            if icon_theme_path.extension() == Some("json".as_ref()) {
-                let relative_icon_theme_path =
-                    icon_theme_path.strip_prefix(extension_path)?.to_path_buf();
-                if !manifest.icon_themes.contains(&relative_icon_theme_path) {
-                    manifest.icon_themes.push(relative_icon_theme_path);
-                }
-            }
-        }
-    };
-    if manifest.snippets.is_none()
-        && let snippets_json_path = extension_path.join("snippets.json")
-        && fs.is_file(&snippets_json_path).await
-    {
-        manifest.snippets = Some("snippets.json".into());
-    }
-
-    // For legacy extensions on the v0 schema (aka, using `extension.json`), we want to populate the grammars in
-    // the manifest using the contents of the `grammars` directory.
-    if manifest.schema_version.is_v0() {
-        let grammars_dir = extension_path.join("grammars");
-        if fs.is_dir(&grammars_dir).await {
-            let mut grammar_dir_entries = fs
-                .read_dir(&grammars_dir)
-                .await
-                .context("failed to list grammars dir")?;
-
-            while let Some(grammar_path) = grammar_dir_entries.next().await {
-                let grammar_path = grammar_path?;
-                if grammar_path.extension() == Some("toml".as_ref()) {
-                    #[derive(Deserialize)]
-                    struct GrammarConfigToml {
-                        pub repository: String,
-                        pub commit: String,
-                        #[serde(default)]
-                        pub path: Option<String>,
-                    }
-
-                    let grammar_config = fs.load(&grammar_path).await?;
-                    let grammar_config: GrammarConfigToml = toml::from_str(&grammar_config)?;
-
-                    let grammar_name = grammar_path
-                        .file_stem()
-                        .and_then(|stem| stem.to_str())
-                        .context("no grammar name")?;
-                    if !manifest.grammars.contains_key(grammar_name) {
-                        manifest.grammars.insert(
-                            grammar_name.into(),
-                            GrammarManifestEntry {
-                                repository: grammar_config.repository,
-                                rev: grammar_config.commit,
-                                path: grammar_config.path,
-                            },
-                        );
-                    }
-                }
-            }
-        }
-    }
-
-    Ok(())
-}
-
-/// Returns `true` if the target exists and its last modified time is greater than that
-/// of each dependency which exists (i.e., dependency paths which do not exist are ignored).
-///
-/// # Errors
-///
-/// Returns `Err` if any of the underlying file I/O operations fail.
-fn file_newer_than_deps(target: &Path, dependencies: &[&Path]) -> Result<bool, std::io::Error> {
-    if !target.try_exists()? {
-        return Ok(false);
-    }
-    let target_modified = target.metadata()?.modified()?;
-    for dependency in dependencies {
-        if !dependency.try_exists()? {
-            continue;
-        }
-        let dep_modified = dependency.metadata()?.modified()?;
-        if target_modified < dep_modified {
-            return Ok(false);
-        }
-    }
-    Ok(true)
-}
-
-#[cfg(test)]
-mod tests {
-    use std::{
-        path::{Path, PathBuf},
-        str::FromStr,
-        thread::sleep,
-        time::Duration,
-    };
-
-    use gpui::TestAppContext;
-    use indoc::indoc;
-
-    use crate::{
-        ExtensionManifest,
-        extension_builder::{file_newer_than_deps, populate_defaults},
-    };
-
-    #[test]
-    fn test_file_newer_than_deps() {
-        // Don't use TempTree because we need to guarantee the order
-        let tmpdir = tempfile::tempdir().unwrap();
-        let target = tmpdir.path().join("target.wasm");
-        let dep1 = tmpdir.path().join("parser.c");
-        let dep2 = tmpdir.path().join("scanner.c");
-
-        assert!(
-            !file_newer_than_deps(&target, &[&dep1, &dep2]).unwrap(),
-            "target doesn't exist"
-        );
-        std::fs::write(&target, "foo").unwrap(); // Create target
-        assert!(
-            file_newer_than_deps(&target, &[&dep1, &dep2]).unwrap(),
-            "dependencies don't exist; target is newer"
-        );
-        sleep(Duration::from_secs(1));
-        std::fs::write(&dep1, "foo").unwrap(); // Create dep1 (newer than target)
-        // Dependency is newer
-        assert!(
-            !file_newer_than_deps(&target, &[&dep1, &dep2]).unwrap(),
-            "a dependency is newer (target {:?}, dep1 {:?})",
-            target.metadata().unwrap().modified().unwrap(),
-            dep1.metadata().unwrap().modified().unwrap(),
-        );
-        sleep(Duration::from_secs(1));
-        std::fs::write(&dep2, "foo").unwrap(); // Create dep2
-        sleep(Duration::from_secs(1));
-        std::fs::write(&target, "foobar").unwrap(); // Update target
-        assert!(
-            file_newer_than_deps(&target, &[&dep1, &dep2]).unwrap(),
-            "target is newer than dependencies (target {:?}, dep2 {:?})",
-            target.metadata().unwrap().modified().unwrap(),
-            dep2.metadata().unwrap().modified().unwrap(),
-        );
-    }
-
-    #[gpui::test]
-    async fn test_snippet_location_is_kept(cx: &mut TestAppContext) {
-        let fs = fs::FakeFs::new(cx.executor());
-        let extension_path = Path::new("/extension");
-
-        fs.insert_tree(
-            extension_path,
-            serde_json::json!({
-                "extension.toml": indoc! {r#"
-                    id = "test-manifest"
-                    name = "Test Manifest"
-                    version = "0.0.1"
-                    schema_version = 1
-
-                    snippets = "./snippets/snippets.json"
-                    "#
-                },
-                "snippets.json": "",
-            }),
-        )
-        .await;
-
-        let mut manifest = ExtensionManifest::load(fs.clone(), extension_path)
-            .await
-            .unwrap();
-
-        populate_defaults(&mut manifest, extension_path, fs.clone())
-            .await
-            .unwrap();
-
-        assert_eq!(
-            manifest.snippets,
-            Some(PathBuf::from_str("./snippets/snippets.json").unwrap())
-        )
-    }
-
-    #[gpui::test]
-    async fn test_automatic_snippet_location_is_relative(cx: &mut TestAppContext) {
-        let fs = fs::FakeFs::new(cx.executor());
-        let extension_path = Path::new("/extension");
-
-        fs.insert_tree(
-            extension_path,
-            serde_json::json!({
-                "extension.toml": indoc! {r#"
-                    id = "test-manifest"
-                    name = "Test Manifest"
-                    version = "0.0.1"
-                    schema_version = 1
-
-                    "#
-                },
-                "snippets.json": "",
-            }),
-        )
-        .await;
-
-        let mut manifest = ExtensionManifest::load(fs.clone(), extension_path)
-            .await
-            .unwrap();
-
-        populate_defaults(&mut manifest, extension_path, fs.clone())
-            .await
-            .unwrap();
-
-        assert_eq!(
-            manifest.snippets,
-            Some(PathBuf::from_str("snippets.json").unwrap())
-        )
-    }
-}
diff --git a/crates/extension/src/extension_events.rs b/crates/extension/src/extension_events.rs
deleted file mode 100644
index 6dc99470df..0000000000
--- a/crates/extension/src/extension_events.rs
+++ /dev/null
@@ -1,43 +0,0 @@
-use std::sync::Arc;
-
-use gpui::{App, AppContext as _, Context, Entity, EventEmitter, Global};
-
-use crate::ExtensionManifest;
-
-pub fn init(cx: &mut App) {
-    let extension_events = cx.new(ExtensionEvents::new);
-    cx.set_global(GlobalExtensionEvents(extension_events));
-}
-
-struct GlobalExtensionEvents(Entity<ExtensionEvents>);
-
-impl Global for GlobalExtensionEvents {}
-
-/// An event bus for broadcasting extension-related events throughout the app.
-pub struct ExtensionEvents;
-
-impl ExtensionEvents {
-    /// Returns the global [`ExtensionEvents`].
-    pub fn try_global(cx: &App) -> Option<Entity<Self>> {
-        cx.try_global::<GlobalExtensionEvents>()
-            .map(|g| g.0.clone())
-    }
-
-    fn new(_cx: &mut Context<Self>) -> Self {
-        Self
-    }
-
-    pub fn emit(&mut self, event: Event, cx: &mut Context<Self>) {
-        cx.emit(event)
-    }
-}
-
-#[derive(Clone, Debug)]
-pub enum Event {
-    ExtensionInstalled(Arc<ExtensionManifest>),
-    ExtensionUninstalled(Arc<ExtensionManifest>),
-    ExtensionsInstalledChanged,
-    ConfigureExtensionRequested(Arc<ExtensionManifest>),
-}
-
-impl EventEmitter<Event> for ExtensionEvents {}
diff --git a/crates/extension/src/extension_host_proxy.rs b/crates/extension/src/extension_host_proxy.rs
deleted file mode 100644
index 6a24e3ba3f..0000000000
--- a/crates/extension/src/extension_host_proxy.rs
+++ /dev/null
@@ -1,448 +0,0 @@
-use std::path::{Path, PathBuf};
-use std::sync::Arc;
-
-use anyhow::Result;
-use fs::Fs;
-use gpui::{App, Global, ReadGlobal, SharedString, Task};
-use language::{BinaryStatus, LanguageMatcher, LanguageName, LoadedLanguage};
-use lsp::LanguageServerName;
-use parking_lot::RwLock;
-
-use crate::{Extension, SlashCommand};
-
-#[derive(Default)]
-struct GlobalExtensionHostProxy(Arc<ExtensionHostProxy>);
-
-impl Global for GlobalExtensionHostProxy {}
-
-/// A proxy for interacting with the extension host.
-///
-/// This object implements each of the individual proxy types so that their
-/// methods can be called directly on it.
-#[derive(Default)]
-pub struct ExtensionHostProxy {
-    theme_proxy: RwLock<Option<Arc<dyn ExtensionThemeProxy>>>,
-    grammar_proxy: RwLock<Option<Arc<dyn ExtensionGrammarProxy>>>,
-    language_proxy: RwLock<Option<Arc<dyn ExtensionLanguageProxy>>>,
-    language_server_proxy: RwLock<Option<Arc<dyn ExtensionLanguageServerProxy>>>,
-    snippet_proxy: RwLock<Option<Arc<dyn ExtensionSnippetProxy>>>,
-    slash_command_proxy: RwLock<Option<Arc<dyn ExtensionSlashCommandProxy>>>,
-    context_server_proxy: RwLock<Option<Arc<dyn ExtensionContextServerProxy>>>,
-    debug_adapter_provider_proxy: RwLock<Option<Arc<dyn ExtensionDebugAdapterProviderProxy>>>,
-}
-
-impl ExtensionHostProxy {
-    /// Returns the global [`ExtensionHostProxy`].
-    pub fn global(cx: &App) -> Arc<Self> {
-        GlobalExtensionHostProxy::global(cx).0.clone()
-    }
-
-    /// Returns the global [`ExtensionHostProxy`].
-    ///
-    /// Inserts a default [`ExtensionHostProxy`] if one does not yet exist.
-    pub fn default_global(cx: &mut App) -> Arc<Self> {
-        cx.default_global::<GlobalExtensionHostProxy>().0.clone()
-    }
-
-    pub fn new() -> Self {
-        Self {
-            theme_proxy: RwLock::default(),
-            grammar_proxy: RwLock::default(),
-            language_proxy: RwLock::default(),
-            language_server_proxy: RwLock::default(),
-            snippet_proxy: RwLock::default(),
-            slash_command_proxy: RwLock::default(),
-            context_server_proxy: RwLock::default(),
-            debug_adapter_provider_proxy: RwLock::default(),
-        }
-    }
-
-    pub fn register_theme_proxy(&self, proxy: impl ExtensionThemeProxy) {
-        self.theme_proxy.write().replace(Arc::new(proxy));
-    }
-
-    pub fn register_grammar_proxy(&self, proxy: impl ExtensionGrammarProxy) {
-        self.grammar_proxy.write().replace(Arc::new(proxy));
-    }
-
-    pub fn register_language_proxy(&self, proxy: impl ExtensionLanguageProxy) {
-        self.language_proxy.write().replace(Arc::new(proxy));
-    }
-
-    pub fn register_language_server_proxy(&self, proxy: impl ExtensionLanguageServerProxy) {
-        self.language_server_proxy.write().replace(Arc::new(proxy));
-    }
-
-    pub fn register_snippet_proxy(&self, proxy: impl ExtensionSnippetProxy) {
-        self.snippet_proxy.write().replace(Arc::new(proxy));
-    }
-
-    pub fn register_slash_command_proxy(&self, proxy: impl ExtensionSlashCommandProxy) {
-        self.slash_command_proxy.write().replace(Arc::new(proxy));
-    }
-
-    pub fn register_context_server_proxy(&self, proxy: impl ExtensionContextServerProxy) {
-        self.context_server_proxy.write().replace(Arc::new(proxy));
-    }
-
-    pub fn register_debug_adapter_proxy(&self, proxy: impl ExtensionDebugAdapterProviderProxy) {
-        self.debug_adapter_provider_proxy
-            .write()
-            .replace(Arc::new(proxy));
-    }
-}
-
-pub trait ExtensionThemeProxy: Send + Sync + 'static {
-    fn set_extensions_loaded(&self);
-
-    fn list_theme_names(&self, theme_path: PathBuf, fs: Arc<dyn Fs>) -> Task<Result<Vec<String>>>;
-
-    fn remove_user_themes(&self, themes: Vec<SharedString>);
-
-    fn load_user_theme(&self, theme_path: PathBuf, fs: Arc<dyn Fs>) -> Task<Result<()>>;
-
-    fn reload_current_theme(&self, cx: &mut App);
-
-    fn list_icon_theme_names(
-        &self,
-        icon_theme_path: PathBuf,
-        fs: Arc<dyn Fs>,
-    ) -> Task<Result<Vec<String>>>;
-
-    fn remove_icon_themes(&self, icon_themes: Vec<SharedString>);
-
-    fn load_icon_theme(
-        &self,
-        icon_theme_path: PathBuf,
-        icons_root_dir: PathBuf,
-        fs: Arc<dyn Fs>,
-    ) -> Task<Result<()>>;
-
-    fn reload_current_icon_theme(&self, cx: &mut App);
-}
-
-impl ExtensionThemeProxy for ExtensionHostProxy {
-    fn set_extensions_loaded(&self) {
-        let Some(proxy) = self.theme_proxy.read().clone() else {
-            return;
-        };
-
-        proxy.set_extensions_loaded()
-    }
-
-    fn list_theme_names(&self, theme_path: PathBuf, fs: Arc<dyn Fs>) -> Task<Result<Vec<String>>> {
-        let Some(proxy) = self.theme_proxy.read().clone() else {
-            return Task::ready(Ok(Vec::new()));
-        };
-
-        proxy.list_theme_names(theme_path, fs)
-    }
-
-    fn remove_user_themes(&self, themes: Vec<SharedString>) {
-        let Some(proxy) = self.theme_proxy.read().clone() else {
-            return;
-        };
-
-        proxy.remove_user_themes(themes)
-    }
-
-    fn load_user_theme(&self, theme_path: PathBuf, fs: Arc<dyn Fs>) -> Task<Result<()>> {
-        let Some(proxy) = self.theme_proxy.read().clone() else {
-            return Task::ready(Ok(()));
-        };
-
-        proxy.load_user_theme(theme_path, fs)
-    }
-
-    fn reload_current_theme(&self, cx: &mut App) {
-        let Some(proxy) = self.theme_proxy.read().clone() else {
-            return;
-        };
-
-        proxy.reload_current_theme(cx)
-    }
-
-    fn list_icon_theme_names(
-        &self,
-        icon_theme_path: PathBuf,
-        fs: Arc<dyn Fs>,
-    ) -> Task<Result<Vec<String>>> {
-        let Some(proxy) = self.theme_proxy.read().clone() else {
-            return Task::ready(Ok(Vec::new()));
-        };
-
-        proxy.list_icon_theme_names(icon_theme_path, fs)
-    }
-
-    fn remove_icon_themes(&self, icon_themes: Vec<SharedString>) {
-        let Some(proxy) = self.theme_proxy.read().clone() else {
-            return;
-        };
-
-        proxy.remove_icon_themes(icon_themes)
-    }
-
-    fn load_icon_theme(
-        &self,
-        icon_theme_path: PathBuf,
-        icons_root_dir: PathBuf,
-        fs: Arc<dyn Fs>,
-    ) -> Task<Result<()>> {
-        let Some(proxy) = self.theme_proxy.read().clone() else {
-            return Task::ready(Ok(()));
-        };
-
-        proxy.load_icon_theme(icon_theme_path, icons_root_dir, fs)
-    }
-
-    fn reload_current_icon_theme(&self, cx: &mut App) {
-        let Some(proxy) = self.theme_proxy.read().clone() else {
-            return;
-        };
-
-        proxy.reload_current_icon_theme(cx)
-    }
-}
-
-pub trait ExtensionGrammarProxy: Send + Sync + 'static {
-    fn register_grammars(&self, grammars: Vec<(Arc<str>, PathBuf)>);
-}
-
-impl ExtensionGrammarProxy for ExtensionHostProxy {
-    fn register_grammars(&self, grammars: Vec<(Arc<str>, PathBuf)>) {
-        let Some(proxy) = self.grammar_proxy.read().clone() else {
-            return;
-        };
-
-        proxy.register_grammars(grammars)
-    }
-}
-
-pub trait ExtensionLanguageProxy: Send + Sync + 'static {
-    fn register_language(
-        &self,
-        language: LanguageName,
-        grammar: Option<Arc<str>>,
-        matcher: LanguageMatcher,
-        hidden: bool,
-        load: Arc<dyn Fn() -> Result<LoadedLanguage> + Send + Sync + 'static>,
-    );
-
-    fn remove_languages(
-        &self,
-        languages_to_remove: &[LanguageName],
-        grammars_to_remove: &[Arc<str>],
-    );
-}
-
-impl ExtensionLanguageProxy for ExtensionHostProxy {
-    fn register_language(
-        &self,
-        language: LanguageName,
-        grammar: Option<Arc<str>>,
-        matcher: LanguageMatcher,
-        hidden: bool,
-        load: Arc<dyn Fn() -> Result<LoadedLanguage> + Send + Sync + 'static>,
-    ) {
-        let Some(proxy) = self.language_proxy.read().clone() else {
-            return;
-        };
-
-        proxy.register_language(language, grammar, matcher, hidden, load)
-    }
-
-    fn remove_languages(
-        &self,
-        languages_to_remove: &[LanguageName],
-        grammars_to_remove: &[Arc<str>],
-    ) {
-        let Some(proxy) = self.language_proxy.read().clone() else {
-            return;
-        };
-
-        proxy.remove_languages(languages_to_remove, grammars_to_remove)
-    }
-}
-
-pub trait ExtensionLanguageServerProxy: Send + Sync + 'static {
-    fn register_language_server(
-        &self,
-        extension: Arc<dyn Extension>,
-        language_server_id: LanguageServerName,
-        language: LanguageName,
-    );
-
-    fn remove_language_server(
-        &self,
-        language: &LanguageName,
-        language_server_id: &LanguageServerName,
-        cx: &mut App,
-    ) -> Task<Result<()>>;
-
-    fn update_language_server_status(
-        &self,
-        language_server_id: LanguageServerName,
-        status: BinaryStatus,
-    );
-}
-
-impl ExtensionLanguageServerProxy for ExtensionHostProxy {
-    fn register_language_server(
-        &self,
-        extension: Arc<dyn Extension>,
-        language_server_id: LanguageServerName,
-        language: LanguageName,
-    ) {
-        let Some(proxy) = self.language_server_proxy.read().clone() else {
-            return;
-        };
-
-        proxy.register_language_server(extension, language_server_id, language)
-    }
-
-    fn remove_language_server(
-        &self,
-        language: &LanguageName,
-        language_server_id: &LanguageServerName,
-        cx: &mut App,
-    ) -> Task<Result<()>> {
-        let Some(proxy) = self.language_server_proxy.read().clone() else {
-            return Task::ready(Ok(()));
-        };
-
-        proxy.remove_language_server(language, language_server_id, cx)
-    }
-
-    fn update_language_server_status(
-        &self,
-        language_server_id: LanguageServerName,
-        status: BinaryStatus,
-    ) {
-        let Some(proxy) = self.language_server_proxy.read().clone() else {
-            return;
-        };
-
-        proxy.update_language_server_status(language_server_id, status)
-    }
-}
-
-pub trait ExtensionSnippetProxy: Send + Sync + 'static {
-    fn register_snippet(&self, path: &PathBuf, snippet_contents: &str) -> Result<()>;
-}
-
-impl ExtensionSnippetProxy for ExtensionHostProxy {
-    fn register_snippet(&self, path: &PathBuf, snippet_contents: &str) -> Result<()> {
-        let Some(proxy) = self.snippet_proxy.read().clone() else {
-            return Ok(());
-        };
-
-        proxy.register_snippet(path, snippet_contents)
-    }
-}
-
-pub trait ExtensionSlashCommandProxy: Send + Sync + 'static {
-    fn register_slash_command(&self, extension: Arc<dyn Extension>, command: SlashCommand);
-
-    fn unregister_slash_command(&self, command_name: Arc<str>);
-}
-
-impl ExtensionSlashCommandProxy for ExtensionHostProxy {
-    fn register_slash_command(&self, extension: Arc<dyn Extension>, command: SlashCommand) {
-        let Some(proxy) = self.slash_command_proxy.read().clone() else {
-            return;
-        };
-
-        proxy.register_slash_command(extension, command)
-    }
-
-    fn unregister_slash_command(&self, command_name: Arc<str>) {
-        let Some(proxy) = self.slash_command_proxy.read().clone() else {
-            return;
-        };
-
-        proxy.unregister_slash_command(command_name)
-    }
-}
-
-pub trait ExtensionContextServerProxy: Send + Sync + 'static {
-    fn register_context_server(
-        &self,
-        extension: Arc<dyn Extension>,
-        server_id: Arc<str>,
-        cx: &mut App,
-    );
-
-    fn unregister_context_server(&self, server_id: Arc<str>, cx: &mut App);
-}
-
-impl ExtensionContextServerProxy for ExtensionHostProxy {
-    fn register_context_server(
-        &self,
-        extension: Arc<dyn Extension>,
-        server_id: Arc<str>,
-        cx: &mut App,
-    ) {
-        let Some(proxy) = self.context_server_proxy.read().clone() else {
-            return;
-        };
-
-        proxy.register_context_server(extension, server_id, cx)
-    }
-
-    fn unregister_context_server(&self, server_id: Arc<str>, cx: &mut App) {
-        let Some(proxy) = self.context_server_proxy.read().clone() else {
-            return;
-        };
-
-        proxy.unregister_context_server(server_id, cx)
-    }
-}
-
-pub trait ExtensionDebugAdapterProviderProxy: Send + Sync + 'static {
-    fn register_debug_adapter(
-        &self,
-        extension: Arc<dyn Extension>,
-        debug_adapter_name: Arc<str>,
-        schema_path: &Path,
-    );
-    fn register_debug_locator(&self, extension: Arc<dyn Extension>, locator_name: Arc<str>);
-    fn unregister_debug_adapter(&self, debug_adapter_name: Arc<str>);
-    fn unregister_debug_locator(&self, locator_name: Arc<str>);
-}
-
-impl ExtensionDebugAdapterProviderProxy for ExtensionHostProxy {
-    fn register_debug_adapter(
-        &self,
-        extension: Arc<dyn Extension>,
-        debug_adapter_name: Arc<str>,
-        schema_path: &Path,
-    ) {
-        let Some(proxy) = self.debug_adapter_provider_proxy.read().clone() else {
-            return;
-        };
-
-        proxy.register_debug_adapter(extension, debug_adapter_name, schema_path)
-    }
-
-    fn register_debug_locator(&self, extension: Arc<dyn Extension>, locator_name: Arc<str>) {
-        let Some(proxy) = self.debug_adapter_provider_proxy.read().clone() else {
-            return;
-        };
-
-        proxy.register_debug_locator(extension, locator_name)
-    }
-    fn unregister_debug_adapter(&self, debug_adapter_name: Arc<str>) {
-        let Some(proxy) = self.debug_adapter_provider_proxy.read().clone() else {
-            return;
-        };
-
-        proxy.unregister_debug_adapter(debug_adapter_name)
-    }
-    fn unregister_debug_locator(&self, locator_name: Arc<str>) {
-        let Some(proxy) = self.debug_adapter_provider_proxy.read().clone() else {
-            return;
-        };
-
-        proxy.unregister_debug_locator(locator_name)
-    }
-}
diff --git a/crates/extension/src/extension_manifest.rs b/crates/extension/src/extension_manifest.rs
deleted file mode 100644
index 4ecdd378ca..0000000000
--- a/crates/extension/src/extension_manifest.rs
+++ /dev/null
@@ -1,522 +0,0 @@
-use anyhow::{Context as _, Result, anyhow, bail};
-use collections::{BTreeMap, HashMap};
-use fs::Fs;
-use language::LanguageName;
-use lsp::LanguageServerName;
-use semver::Version;
-use serde::{Deserialize, Serialize};
-use std::{
-    ffi::OsStr,
-    fmt,
-    path::{Path, PathBuf},
-    sync::Arc,
-};
-
-use crate::ExtensionCapability;
-
-/// This is the old version of the extension manifest, from when it was `extension.json`.
-#[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize)]
-pub struct OldExtensionManifest {
-    pub name: String,
-    pub version: Arc<str>,
-
-    #[serde(default)]
-    pub description: Option<String>,
-    #[serde(default)]
-    pub repository: Option<String>,
-    #[serde(default)]
-    pub authors: Vec<String>,
-
-    #[serde(default)]
-    pub themes: BTreeMap<Arc<str>, PathBuf>,
-    #[serde(default)]
-    pub languages: BTreeMap<Arc<str>, PathBuf>,
-    #[serde(default)]
-    pub grammars: BTreeMap<Arc<str>, PathBuf>,
-}
-
-/// The schema version of the [`ExtensionManifest`].
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy, Serialize, Deserialize)]
-pub struct SchemaVersion(pub i32);
-
-impl fmt::Display for SchemaVersion {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
-impl SchemaVersion {
-    pub const ZERO: Self = Self(0);
-
-    pub fn is_v0(&self) -> bool {
-        self == &Self::ZERO
-    }
-}
-
-#[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize)]
-pub struct ExtensionManifest {
-    pub id: Arc<str>,
-    pub name: String,
-    pub version: Arc<str>,
-    pub schema_version: SchemaVersion,
-
-    #[serde(default)]
-    pub description: Option<String>,
-    #[serde(default)]
-    pub repository: Option<String>,
-    #[serde(default)]
-    pub authors: Vec<String>,
-    #[serde(default)]
-    pub lib: LibManifestEntry,
-
-    #[serde(default)]
-    pub themes: Vec<PathBuf>,
-    #[serde(default)]
-    pub icon_themes: Vec<PathBuf>,
-    #[serde(default)]
-    pub languages: Vec<PathBuf>,
-    #[serde(default)]
-    pub grammars: BTreeMap<Arc<str>, GrammarManifestEntry>,
-    #[serde(default)]
-    pub language_servers: BTreeMap<LanguageServerName, LanguageServerManifestEntry>,
-    #[serde(default)]
-    pub context_servers: BTreeMap<Arc<str>, ContextServerManifestEntry>,
-    #[serde(default)]
-    pub agent_servers: BTreeMap<Arc<str>, AgentServerManifestEntry>,
-    #[serde(default)]
-    pub slash_commands: BTreeMap<Arc<str>, SlashCommandManifestEntry>,
-    #[serde(default)]
-    pub snippets: Option<PathBuf>,
-    #[serde(default)]
-    pub capabilities: Vec<ExtensionCapability>,
-    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
-    pub debug_adapters: BTreeMap<Arc<str>, DebugAdapterManifestEntry>,
-    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
-    pub debug_locators: BTreeMap<Arc<str>, DebugLocatorManifestEntry>,
-}
-
-impl ExtensionManifest {
-    pub fn allow_exec(
-        &self,
-        desired_command: &str,
-        desired_args: &[impl AsRef<str> + std::fmt::Debug],
-    ) -> Result<()> {
-        let is_allowed = self.capabilities.iter().any(|capability| match capability {
-            ExtensionCapability::ProcessExec(capability) => {
-                capability.allows(desired_command, desired_args)
-            }
-            _ => false,
-        });
-
-        if !is_allowed {
-            bail!(
-                "capability for process:exec {desired_command} {desired_args:?} was not listed in the extension manifest",
-            );
-        }
-
-        Ok(())
-    }
-
-    pub fn allow_remote_load(&self) -> bool {
-        !self.language_servers.is_empty()
-            || !self.debug_adapters.is_empty()
-            || !self.debug_locators.is_empty()
-    }
-}
-
-pub fn build_debug_adapter_schema_path(
-    adapter_name: &Arc<str>,
-    meta: &DebugAdapterManifestEntry,
-) -> PathBuf {
-    meta.schema_path.clone().unwrap_or_else(|| {
-        Path::new("debug_adapter_schemas")
-            .join(Path::new(adapter_name.as_ref()).with_extension("json"))
-    })
-}
-
-#[derive(Clone, Default, PartialEq, Eq, Debug, Deserialize, Serialize)]
-pub struct LibManifestEntry {
-    pub kind: Option<ExtensionLibraryKind>,
-    pub version: Option<Version>,
-}
-
-#[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]
-pub struct AgentServerManifestEntry {
-    /// Display name for the agent (shown in menus).
-    pub name: String,
-    /// Environment variables to set when launching the agent server.
-    #[serde(default)]
-    pub env: HashMap<String, String>,
-    /// Optional icon path (relative to extension root, e.g., "ai.svg").
-    /// Should be a small SVG icon for display in menus.
-    #[serde(default)]
-    pub icon: Option<String>,
-    /// Per-target configuration for archive-based installation.
-    /// The key format is "{os}-{arch}" where:
-    /// - os: "darwin" (macOS), "linux", "windows"
-    /// - arch: "aarch64" (arm64), "x86_64"
-    ///
-    /// Example:
-    /// ```toml
-    /// [agent_servers.myagent.targets.darwin-aarch64]
-    /// archive = "https://example.com/myagent-darwin-arm64.zip"
-    /// cmd = "./myagent"
-    /// args = ["--serve"]
-    /// sha256 = "abc123..."  # optional
-    /// ```
-    ///
-    /// For Node.js-based agents, you can use "node" as the cmd to automatically
-    /// use Zed's managed Node.js runtime instead of relying on the user's PATH:
-    /// ```toml
-    /// [agent_servers.nodeagent.targets.darwin-aarch64]
-    /// archive = "https://example.com/nodeagent.zip"
-    /// cmd = "node"
-    /// args = ["index.js", "--port", "3000"]
-    /// ```
-    ///
-    /// Note: All commands are executed with the archive extraction directory as the
-    /// working directory, so relative paths in args (like "index.js") will resolve
-    /// relative to the extracted archive contents.
-    pub targets: HashMap<String, TargetConfig>,
-}
-
-#[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]
-pub struct TargetConfig {
-    /// URL to download the archive from (e.g., "https://github.com/owner/repo/releases/download/v1.0.0/myagent-darwin-arm64.zip")
-    pub archive: String,
-    /// Command to run (e.g., "./myagent" or "./myagent.exe")
-    pub cmd: String,
-    /// Command-line arguments to pass to the agent server.
-    #[serde(default)]
-    pub args: Vec<String>,
-    /// Optional SHA-256 hash of the archive for verification.
-    /// If not provided and the URL is a GitHub release, we'll attempt to fetch it from GitHub.
-    #[serde(default)]
-    pub sha256: Option<String>,
-    /// Environment variables to set when launching the agent server.
-    /// These target-specific env vars will override any env vars set at the agent level.
-    #[serde(default)]
-    pub env: HashMap<String, String>,
-}
-
-impl TargetConfig {
-    pub fn from_proto(proto: proto::ExternalExtensionAgentTarget) -> Self {
-        Self {
-            archive: proto.archive,
-            cmd: proto.cmd,
-            args: proto.args,
-            sha256: proto.sha256,
-            env: proto.env.into_iter().collect(),
-        }
-    }
-
-    pub fn to_proto(&self) -> proto::ExternalExtensionAgentTarget {
-        proto::ExternalExtensionAgentTarget {
-            archive: self.archive.clone(),
-            cmd: self.cmd.clone(),
-            args: self.args.clone(),
-            sha256: self.sha256.clone(),
-            env: self
-                .env
-                .iter()
-                .map(|(k, v)| (k.clone(), v.clone()))
-                .collect(),
-        }
-    }
-}
-
-#[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]
-pub enum ExtensionLibraryKind {
-    Rust,
-}
-
-#[derive(Clone, Default, PartialEq, Eq, Debug, Deserialize, Serialize)]
-pub struct GrammarManifestEntry {
-    pub repository: String,
-    #[serde(alias = "commit")]
-    pub rev: String,
-    #[serde(default)]
-    pub path: Option<String>,
-}
-
-#[derive(Clone, Default, PartialEq, Eq, Debug, Deserialize, Serialize)]
-pub struct LanguageServerManifestEntry {
-    /// Deprecated in favor of `languages`.
-    #[serde(default)]
-    language: Option<LanguageName>,
-    /// The list of languages this language server should work with.
-    #[serde(default)]
-    languages: Vec<LanguageName>,
-    #[serde(default)]
-    pub language_ids: HashMap<LanguageName, String>,
-    #[serde(default)]
-    pub code_action_kinds: Option<Vec<lsp::CodeActionKind>>,
-}
-
-impl LanguageServerManifestEntry {
-    /// Returns the list of languages for the language server.
-    ///
-    /// Prefer this over accessing the `language` or `languages` fields directly,
-    /// as we currently support both.
-    ///
-    /// We can replace this with just field access for the `languages` field once
-    /// we have removed `language`.
-    pub fn languages(&self) -> impl IntoIterator<Item = LanguageName> + '_ {
-        let language = if self.languages.is_empty() {
-            self.language.clone()
-        } else {
-            None
-        };
-        self.languages.iter().cloned().chain(language)
-    }
-}
-
-#[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]
-pub struct ContextServerManifestEntry {}
-
-#[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]
-pub struct SlashCommandManifestEntry {
-    pub description: String,
-    pub requires_argument: bool,
-}
-
-#[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]
-pub struct DebugAdapterManifestEntry {
-    pub schema_path: Option<PathBuf>,
-}
-
-#[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]
-pub struct DebugLocatorManifestEntry {}
-
-impl ExtensionManifest {
-    pub async fn load(fs: Arc<dyn Fs>, extension_dir: &Path) -> Result<Self> {
-        let extension_name = extension_dir
-            .file_name()
-            .and_then(OsStr::to_str)
-            .context("invalid extension name")?;
-
-        let extension_manifest_path = extension_dir.join("extension.toml");
-        if fs.is_file(&extension_manifest_path).await {
-            let manifest_content = fs.load(&extension_manifest_path).await.with_context(|| {
-                format!("loading {extension_name} extension.toml, {extension_manifest_path:?}")
-            })?;
-            toml::from_str(&manifest_content).map_err(|err| {
-                anyhow!("Invalid extension.toml for extension {extension_name}:\n{err}")
-            })
-        } else if let extension_manifest_path = extension_manifest_path.with_extension("json")
-            && fs.is_file(&extension_manifest_path).await
-        {
-            let manifest_content = fs.load(&extension_manifest_path).await.with_context(|| {
-                format!("loading {extension_name} extension.json, {extension_manifest_path:?}")
-            })?;
-
-            serde_json::from_str::<OldExtensionManifest>(&manifest_content)
-                .with_context(|| format!("invalid extension.json for extension {extension_name}"))
-                .map(|manifest_json| manifest_from_old_manifest(manifest_json, extension_name))
-        } else {
-            anyhow::bail!("No extension manifest found for extension {extension_name}")
-        }
-    }
-}
-
-fn manifest_from_old_manifest(
-    manifest_json: OldExtensionManifest,
-    extension_id: &str,
-) -> ExtensionManifest {
-    ExtensionManifest {
-        id: extension_id.into(),
-        name: manifest_json.name,
-        version: manifest_json.version,
-        description: manifest_json.description,
-        repository: manifest_json.repository,
-        authors: manifest_json.authors,
-        schema_version: SchemaVersion::ZERO,
-        lib: Default::default(),
-        themes: {
-            let mut themes = manifest_json.themes.into_values().collect::<Vec<_>>();
-            themes.sort();
-            themes.dedup();
-            themes
-        },
-        icon_themes: Vec::new(),
-        languages: {
-            let mut languages = manifest_json.languages.into_values().collect::<Vec<_>>();
-            languages.sort();
-            languages.dedup();
-            languages
-        },
-        grammars: manifest_json
-            .grammars
-            .into_keys()
-            .map(|grammar_name| (grammar_name, Default::default()))
-            .collect(),
-        language_servers: Default::default(),
-        context_servers: BTreeMap::default(),
-        agent_servers: BTreeMap::default(),
-        slash_commands: BTreeMap::default(),
-        snippets: None,
-        capabilities: Vec::new(),
-        debug_adapters: Default::default(),
-        debug_locators: Default::default(),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use pretty_assertions::assert_eq;
-
-    use crate::ProcessExecCapability;
-
-    use super::*;
-
-    fn extension_manifest() -> ExtensionManifest {
-        ExtensionManifest {
-            id: "test".into(),
-            name: "Test".to_string(),
-            version: "1.0.0".into(),
-            schema_version: SchemaVersion::ZERO,
-            description: None,
-            repository: None,
-            authors: vec![],
-            lib: Default::default(),
-            themes: vec![],
-            icon_themes: vec![],
-            languages: vec![],
-            grammars: BTreeMap::default(),
-            language_servers: BTreeMap::default(),
-            context_servers: BTreeMap::default(),
-            agent_servers: BTreeMap::default(),
-            slash_commands: BTreeMap::default(),
-            snippets: None,
-            capabilities: vec![],
-            debug_adapters: Default::default(),
-            debug_locators: Default::default(),
-        }
-    }
-
-    #[test]
-    fn test_build_adapter_schema_path_with_schema_path() {
-        let adapter_name = Arc::from("my_adapter");
-        let entry = DebugAdapterManifestEntry {
-            schema_path: Some(PathBuf::from("foo/bar")),
-        };
-
-        let path = build_debug_adapter_schema_path(&adapter_name, &entry);
-        assert_eq!(path, PathBuf::from("foo/bar"));
-    }
-
-    #[test]
-    fn test_build_adapter_schema_path_without_schema_path() {
-        let adapter_name = Arc::from("my_adapter");
-        let entry = DebugAdapterManifestEntry { schema_path: None };
-
-        let path = build_debug_adapter_schema_path(&adapter_name, &entry);
-        assert_eq!(
-            path,
-            PathBuf::from("debug_adapter_schemas").join("my_adapter.json")
-        );
-    }
-
-    #[test]
-    fn test_allow_exec_exact_match() {
-        let manifest = ExtensionManifest {
-            capabilities: vec![ExtensionCapability::ProcessExec(ProcessExecCapability {
-                command: "ls".to_string(),
-                args: vec!["-la".to_string()],
-            })],
-            ..extension_manifest()
-        };
-
-        assert!(manifest.allow_exec("ls", &["-la"]).is_ok());
-        assert!(manifest.allow_exec("ls", &["-l"]).is_err());
-        assert!(manifest.allow_exec("pwd", &[] as &[&str]).is_err());
-    }
-
-    #[test]
-    fn test_allow_exec_wildcard_arg() {
-        let manifest = ExtensionManifest {
-            capabilities: vec![ExtensionCapability::ProcessExec(ProcessExecCapability {
-                command: "git".to_string(),
-                args: vec!["*".to_string()],
-            })],
-            ..extension_manifest()
-        };
-
-        assert!(manifest.allow_exec("git", &["status"]).is_ok());
-        assert!(manifest.allow_exec("git", &["commit"]).is_ok());
-        assert!(manifest.allow_exec("git", &["status", "-s"]).is_err()); // too many args
-        assert!(manifest.allow_exec("npm", &["install"]).is_err()); // wrong command
-    }
-
-    #[test]
-    fn test_allow_exec_double_wildcard() {
-        let manifest = ExtensionManifest {
-            capabilities: vec![ExtensionCapability::ProcessExec(ProcessExecCapability {
-                command: "cargo".to_string(),
-                args: vec!["test".to_string(), "**".to_string()],
-            })],
-            ..extension_manifest()
-        };
-
-        assert!(manifest.allow_exec("cargo", &["test"]).is_ok());
-        assert!(manifest.allow_exec("cargo", &["test", "--all"]).is_ok());
-        assert!(
-            manifest
-                .allow_exec("cargo", &["test", "--all", "--no-fail-fast"])
-                .is_ok()
-        );
-        assert!(manifest.allow_exec("cargo", &["build"]).is_err()); // wrong first arg
-    }
-
-    #[test]
-    fn test_allow_exec_mixed_wildcards() {
-        let manifest = ExtensionManifest {
-            capabilities: vec![ExtensionCapability::ProcessExec(ProcessExecCapability {
-                command: "docker".to_string(),
-                args: vec!["run".to_string(), "*".to_string(), "**".to_string()],
-            })],
-            ..extension_manifest()
-        };
-
-        assert!(manifest.allow_exec("docker", &["run", "nginx"]).is_ok());
-        assert!(manifest.allow_exec("docker", &["run"]).is_err());
-        assert!(
-            manifest
-                .allow_exec("docker", &["run", "ubuntu", "bash"])
-                .is_ok()
-        );
-        assert!(
-            manifest
-                .allow_exec("docker", &["run", "alpine", "sh", "-c", "echo hello"])
-                .is_ok()
-        );
-        assert!(manifest.allow_exec("docker", &["ps"]).is_err()); // wrong first arg
-    }
-    #[test]
-    fn parse_manifest_with_agent_server_archive_launcher() {
-        let toml_src = r#"
-id = "example.agent-server-ext"
-name = "Agent Server Example"
-version = "1.0.0"
-schema_version = 0
-
-[agent_servers.foo]
-name = "Foo Agent"
-
-[agent_servers.foo.targets.linux-x86_64]
-archive = "https://example.com/agent-linux-x64.tar.gz"
-cmd = "./agent"
-args = ["--serve"]
-"#;
-
-        let manifest: ExtensionManifest = toml::from_str(toml_src).expect("manifest should parse");
-        assert_eq!(manifest.id.as_ref(), "example.agent-server-ext");
-        assert!(manifest.agent_servers.contains_key("foo"));
-        let entry = manifest.agent_servers.get("foo").unwrap();
-        assert!(entry.targets.contains_key("linux-x86_64"));
-        let target = entry.targets.get("linux-x86_64").unwrap();
-        assert_eq!(target.archive, "https://example.com/agent-linux-x64.tar.gz");
-        assert_eq!(target.cmd, "./agent");
-        assert_eq!(target.args, vec!["--serve"]);
-    }
-}
diff --git a/crates/extension/src/types.rs b/crates/extension/src/types.rs
deleted file mode 100644
index ed9eb2ec2f..0000000000
--- a/crates/extension/src/types.rs
+++ /dev/null
@@ -1,71 +0,0 @@
-mod context_server;
-mod dap;
-mod lsp;
-mod slash_command;
-
-use std::{ops::Range, path::PathBuf};
-
-use util::redact::should_redact;
-
-pub use context_server::*;
-pub use dap::*;
-pub use lsp::*;
-pub use slash_command::*;
-
-/// A list of environment variables.
-pub type EnvVars = Vec<(String, String)>;
-
-/// A command.
-pub struct Command {
-    /// The command to execute.
-    pub command: PathBuf,
-    /// The arguments to pass to the command.
-    pub args: Vec<String>,
-    /// The environment variables to set for the command.
-    pub env: EnvVars,
-}
-
-impl std::fmt::Debug for Command {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let filtered_env = self
-            .env
-            .iter()
-            .map(|(k, v)| (k, if should_redact(k) { "[REDACTED]" } else { v }))
-            .collect::<Vec<_>>();
-
-        f.debug_struct("Command")
-            .field("command", &self.command)
-            .field("args", &self.args)
-            .field("env", &filtered_env)
-            .finish()
-    }
-}
-
-/// A label containing some code.
-#[derive(Debug, Clone)]
-pub struct CodeLabel {
-    /// The source code to parse with Tree-sitter.
-    pub code: String,
-    /// The spans to display in the label.
-    pub spans: Vec<CodeLabelSpan>,
-    /// The range of the displayed label to include when filtering.
-    pub filter_range: Range<usize>,
-}
-
-/// A span within a code label.
-#[derive(Debug, Clone)]
-pub enum CodeLabelSpan {
-    /// A range into the parsed code.
-    CodeRange(Range<usize>),
-    /// A span containing a code literal.
-    Literal(CodeLabelSpanLiteral),
-}
-
-/// A span containing a code literal.
-#[derive(Debug, Clone)]
-pub struct CodeLabelSpanLiteral {
-    /// The literal text.
-    pub text: String,
-    /// The name of the highlight to use for this literal.
-    pub highlight_name: Option<String>,
-}
diff --git a/crates/extension/src/types/context_server.rs b/crates/extension/src/types/context_server.rs
deleted file mode 100644
index 2e3d20b047..0000000000
--- a/crates/extension/src/types/context_server.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-/// Configuration for context server setup and installation.
-#[derive(Debug, Clone)]
-pub struct ContextServerConfiguration {
-    /// Installation instructions in Markdown format.
-    pub installation_instructions: String,
-    /// JSON schema for settings validation.
-    pub settings_schema: serde_json::Value,
-    /// Default settings template.
-    pub default_settings: String,
-}
diff --git a/crates/extension/src/types/dap.rs b/crates/extension/src/types/dap.rs
deleted file mode 100644
index 5dcd7f57d5..0000000000
--- a/crates/extension/src/types/dap.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-pub use dap::{
-    StartDebuggingRequestArguments, StartDebuggingRequestArgumentsRequest,
-    adapters::{DebugAdapterBinary, DebugTaskDefinition, TcpArguments},
-};
-pub use task::{
-    AttachRequest, BuildTaskDefinition, DebugRequest, DebugScenario, LaunchRequest,
-    TaskTemplate as BuildTaskTemplate, TcpArgumentsTemplate,
-};
diff --git a/crates/extension/src/types/lsp.rs b/crates/extension/src/types/lsp.rs
deleted file mode 100644
index 6e858211cd..0000000000
--- a/crates/extension/src/types/lsp.rs
+++ /dev/null
@@ -1,96 +0,0 @@
-use std::option::Option;
-
-/// An LSP completion.
-#[derive(Debug, Clone)]
-pub struct Completion {
-    pub label: String,
-    pub label_details: Option<CompletionLabelDetails>,
-    pub detail: Option<String>,
-    pub kind: Option<CompletionKind>,
-    pub insert_text_format: Option<InsertTextFormat>,
-}
-
-/// The kind of an LSP completion.
-#[derive(Debug, Clone, Copy)]
-pub enum CompletionKind {
-    Text,
-    Method,
-    Function,
-    Constructor,
-    Field,
-    Variable,
-    Class,
-    Interface,
-    Module,
-    Property,
-    Unit,
-    Value,
-    Enum,
-    Keyword,
-    Snippet,
-    Color,
-    File,
-    Reference,
-    Folder,
-    EnumMember,
-    Constant,
-    Struct,
-    Event,
-    Operator,
-    TypeParameter,
-    Other(i32),
-}
-
-/// Label details for an LSP completion.
-#[derive(Debug, Clone)]
-pub struct CompletionLabelDetails {
-    pub detail: Option<String>,
-    pub description: Option<String>,
-}
-
-/// Defines how to interpret the insert text in a completion item.
-#[derive(Debug, Clone, Copy)]
-pub enum InsertTextFormat {
-    PlainText,
-    Snippet,
-    Other(i32),
-}
-
-/// An LSP symbol.
-#[derive(Debug, Clone)]
-pub struct Symbol {
-    pub kind: SymbolKind,
-    pub name: String,
-}
-
-/// The kind of an LSP symbol.
-#[derive(Debug, Clone, Copy)]
-pub enum SymbolKind {
-    File,
-    Module,
-    Namespace,
-    Package,
-    Class,
-    Method,
-    Property,
-    Field,
-    Constructor,
-    Enum,
-    Interface,
-    Function,
-    Variable,
-    Constant,
-    String,
-    Number,
-    Boolean,
-    Array,
-    Object,
-    Key,
-    Null,
-    EnumMember,
-    Struct,
-    Event,
-    Operator,
-    TypeParameter,
-    Other(i32),
-}
diff --git a/crates/extension/src/types/slash_command.rs b/crates/extension/src/types/slash_command.rs
deleted file mode 100644
index 0b937984a5..0000000000
--- a/crates/extension/src/types/slash_command.rs
+++ /dev/null
@@ -1,43 +0,0 @@
-use std::ops::Range;
-
-/// A slash command for use in the Assistant.
-#[derive(Debug, Clone)]
-pub struct SlashCommand {
-    /// The name of the slash command.
-    pub name: String,
-    /// The description of the slash command.
-    pub description: String,
-    /// The tooltip text to display for the run button.
-    pub tooltip_text: String,
-    /// Whether this slash command requires an argument.
-    pub requires_argument: bool,
-}
-
-/// The output of a slash command.
-#[derive(Debug, Clone)]
-pub struct SlashCommandOutput {
-    /// The text produced by the slash command.
-    pub text: String,
-    /// The list of sections to show in the slash command placeholder.
-    pub sections: Vec<SlashCommandOutputSection>,
-}
-
-/// A section in the slash command output.
-#[derive(Debug, Clone)]
-pub struct SlashCommandOutputSection {
-    /// The range this section occupies.
-    pub range: Range<usize>,
-    /// The label to display in the placeholder for this section.
-    pub label: String,
-}
-
-/// A completion for a slash command argument.
-#[derive(Debug, Clone)]
-pub struct SlashCommandArgumentCompletion {
-    /// The label to display for this completion.
-    pub label: String,
-    /// The new text that should be inserted into the command when this completion is accepted.
-    pub new_text: String,
-    /// Whether the command should be run when accepting this completion.
-    pub run_command: bool,
-}
diff --git a/crates/extension_api/Cargo.toml b/crates/extension_api/Cargo.toml
deleted file mode 100644
index 829455e629..0000000000
--- a/crates/extension_api/Cargo.toml
+++ /dev/null
@@ -1,25 +0,0 @@
-[package]
-name = "zed_extension_api"
-version = "0.8.0"
-description = "APIs for creating Zed extensions in Rust"
-repository = "https://github.com/zed-industries/zed"
-documentation = "https://docs.rs/zed_extension_api"
-keywords = ["zed", "extension"]
-edition.workspace = true
-# Change back to `true` when we're ready to publish v0.8.0.
-publish = false
-license = "Apache-2.0"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/extension_api.rs"
-
-[dependencies]
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-wit-bindgen = "0.41"
-
-[package.metadata.component]
-target = { path = "wit" }
diff --git a/crates/extension_api/LICENSE-APACHE b/crates/extension_api/LICENSE-APACHE
deleted file mode 120000
index 1cd601d0a3..0000000000
--- a/crates/extension_api/LICENSE-APACHE
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-APACHE
\ No newline at end of file
diff --git a/crates/extension_api/PENDING_CHANGES.md b/crates/extension_api/PENDING_CHANGES.md
deleted file mode 100644
index 1d9875671b..0000000000
--- a/crates/extension_api/PENDING_CHANGES.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Pending Changes
-
-This is a list of pending changes to the Zed extension API that require a breaking change.
-
-This list should be updated as we notice things that should be changed so that we can batch them up in a single release.
-
-## vNext
-
-### Slash Commands
-
-- Rename `SlashCommand.tooltip_text` to `SlashCommand.menu_text`
-  - We may even want to remove it entirely, as right now this is only used for featured slash commands, and slash commands defined by extensions aren't currently able to be featured.
diff --git a/crates/extension_api/README.md b/crates/extension_api/README.md
deleted file mode 100644
index 89631269e7..0000000000
--- a/crates/extension_api/README.md
+++ /dev/null
@@ -1,77 +0,0 @@
-# The Zed Rust Extension API
-
-This crate lets you write extensions for Zed in Rust.
-
-## Extension Manifest
-
-You'll need an `extension.toml` file at the root of your extension directory, with the following structure:
-
-```toml
-id = "my-extension"
-name = "My Extension"
-description = "..."
-version = "0.0.1"
-schema_version = 1
-authors = ["Your Name <you@example.com>"]
-repository = "https://github.com/your/extension-repository"
-```
-
-## Cargo metadata
-
-Zed extensions are packaged as WebAssembly files. In your Cargo.toml, you'll
-need to set your `crate-type` accordingly:
-
-```toml
-[dependencies]
-zed_extension_api = "0.6.0"
-
-[lib]
-crate-type = ["cdylib"]
-```
-
-## Implementing an Extension
-
-To define your extension, create a type that implements the `Extension` trait, and register it.
-
-```rust
-use zed_extension_api as zed;
-
-struct MyExtension {
-    // ... state
-}
-
-impl zed::Extension for MyExtension {
-    // ...
-}
-
-zed::register_extension!(MyExtension);
-```
-
-## Testing your extension
-
-To run your extension in Zed as you're developing it:
-
-- Make sure you have [Rust installed](https://www.rust-lang.org/learn/get-started)
-- Have the `wasm32-wasip2` target installed (`rustup target add wasm32-wasip2`)
-- Open the extensions view using the `zed: extensions` action in the command palette.
-- Click the `Install Dev Extension` button in the top right
-- Choose the path to your extension directory.
-
-## Compatible Zed versions
-
-Extensions created using newer versions of the Zed extension API won't be compatible with older versions of Zed.
-
-Here is the compatibility of the `zed_extension_api` with versions of Zed:
-
-| Zed version | `zed_extension_api` version |
-| ----------- | --------------------------- |
-| `0.192.x`   | `0.0.1` - `0.6.0`           |
-| `0.186.x`   | `0.0.1` - `0.5.0`           |
-| `0.184.x`   | `0.0.1` - `0.4.0`           |
-| `0.178.x`   | `0.0.1` - `0.3.0`           |
-| `0.162.x`   | `0.0.1` - `0.2.0`           |
-| `0.149.x`   | `0.0.1` - `0.1.0`           |
-| `0.131.x`   | `0.0.1` - `0.0.6`           |
-| `0.130.x`   | `0.0.1` - `0.0.5`           |
-| `0.129.x`   | `0.0.1` - `0.0.4`           |
-| `0.128.x`   | `0.0.1`                     |
diff --git a/crates/extension_api/build.rs b/crates/extension_api/build.rs
deleted file mode 100644
index bd9149578a..0000000000
--- a/crates/extension_api/build.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-fn main() {
-    let version = std::env::var("CARGO_PKG_VERSION").unwrap();
-    let out_dir = std::env::var("OUT_DIR").unwrap();
-
-    let mut parts = version.split(|c: char| !c.is_ascii_digit());
-    let major = parts.next().unwrap().parse::<u16>().unwrap().to_be_bytes();
-    let minor = parts.next().unwrap().parse::<u16>().unwrap().to_be_bytes();
-    let patch = parts.next().unwrap().parse::<u16>().unwrap().to_be_bytes();
-
-    std::fs::write(
-        std::path::Path::new(&out_dir).join("version_bytes"),
-        [major[0], major[1], minor[0], minor[1], patch[0], patch[1]],
-    )
-    .unwrap();
-}
diff --git a/crates/extension_api/src/extension_api.rs b/crates/extension_api/src/extension_api.rs
deleted file mode 100644
index 9418623224..0000000000
--- a/crates/extension_api/src/extension_api.rs
+++ /dev/null
@@ -1,586 +0,0 @@
-//! The Zed Rust Extension API allows you write extensions for [Zed](https://zed.dev/) in Rust.
-
-pub mod http_client;
-pub mod process;
-pub mod settings;
-
-use core::fmt;
-
-use wit::*;
-
-pub use serde_json;
-
-// WIT re-exports.
-//
-// We explicitly enumerate the symbols we want to re-export, as there are some
-// that we may want to shadow to provide a cleaner Rust API.
-pub use wit::{
-    CodeLabel, CodeLabelSpan, CodeLabelSpanLiteral, Command, DownloadedFileType, EnvVars,
-    KeyValueStore, LanguageServerInstallationStatus, Project, Range, Worktree, download_file,
-    make_file_executable,
-    zed::extension::context_server::ContextServerConfiguration,
-    zed::extension::dap::{
-        AttachRequest, BuildTaskDefinition, BuildTaskDefinitionTemplatePayload, BuildTaskTemplate,
-        DebugAdapterBinary, DebugConfig, DebugRequest, DebugScenario, DebugTaskDefinition,
-        LaunchRequest, StartDebuggingRequestArguments, StartDebuggingRequestArgumentsRequest,
-        TaskTemplate, TcpArguments, TcpArgumentsTemplate, resolve_tcp_template,
-    },
-    zed::extension::github::{
-        GithubRelease, GithubReleaseAsset, GithubReleaseOptions, github_release_by_tag_name,
-        latest_github_release,
-    },
-    zed::extension::nodejs::{
-        node_binary_path, npm_install_package, npm_package_installed_version,
-        npm_package_latest_version,
-    },
-    zed::extension::platform::{Architecture, Os, current_platform},
-    zed::extension::slash_command::{
-        SlashCommand, SlashCommandArgumentCompletion, SlashCommandOutput, SlashCommandOutputSection,
-    },
-};
-
-// Undocumented WIT re-exports.
-//
-// These are symbols that need to be public for the purposes of implementing
-// the extension host, but aren't relevant to extension authors.
-#[doc(hidden)]
-pub use wit::Guest;
-
-/// Constructs for interacting with language servers over the
-/// Language Server Protocol (LSP).
-pub mod lsp {
-    pub use crate::wit::zed::extension::lsp::{
-        Completion, CompletionKind, InsertTextFormat, Symbol, SymbolKind,
-    };
-}
-
-/// A result returned from a Zed extension.
-pub type Result<T, E = String> = core::result::Result<T, E>;
-
-/// Updates the installation status for the given language server.
-pub fn set_language_server_installation_status(
-    language_server_id: &LanguageServerId,
-    status: &LanguageServerInstallationStatus,
-) {
-    wit::set_language_server_installation_status(&language_server_id.0, status)
-}
-
-/// A Zed extension.
-pub trait Extension: Send + Sync {
-    /// Returns a new instance of the extension.
-    fn new() -> Self
-    where
-        Self: Sized;
-
-    /// Returns the command used to start the language server for the specified
-    /// language.
-    fn language_server_command(
-        &mut self,
-        _language_server_id: &LanguageServerId,
-        _worktree: &Worktree,
-    ) -> Result<Command> {
-        Err("`language_server_command` not implemented".to_string())
-    }
-
-    /// Returns the initialization options to pass to the specified language server.
-    fn language_server_initialization_options(
-        &mut self,
-        _language_server_id: &LanguageServerId,
-        _worktree: &Worktree,
-    ) -> Result<Option<serde_json::Value>> {
-        Ok(None)
-    }
-
-    /// Returns the workspace configuration options to pass to the language server.
-    fn language_server_workspace_configuration(
-        &mut self,
-        _language_server_id: &LanguageServerId,
-        _worktree: &Worktree,
-    ) -> Result<Option<serde_json::Value>> {
-        Ok(None)
-    }
-
-    /// Returns the initialization options to pass to the other language server.
-    fn language_server_additional_initialization_options(
-        &mut self,
-        _language_server_id: &LanguageServerId,
-        _target_language_server_id: &LanguageServerId,
-        _worktree: &Worktree,
-    ) -> Result<Option<serde_json::Value>> {
-        Ok(None)
-    }
-
-    /// Returns the workspace configuration options to pass to the other language server.
-    fn language_server_additional_workspace_configuration(
-        &mut self,
-        _language_server_id: &LanguageServerId,
-        _target_language_server_id: &LanguageServerId,
-        _worktree: &Worktree,
-    ) -> Result<Option<serde_json::Value>> {
-        Ok(None)
-    }
-
-    /// Returns the label for the given completion.
-    fn label_for_completion(
-        &self,
-        _language_server_id: &LanguageServerId,
-        _completion: Completion,
-    ) -> Option<CodeLabel> {
-        None
-    }
-
-    /// Returns the label for the given symbol.
-    fn label_for_symbol(
-        &self,
-        _language_server_id: &LanguageServerId,
-        _symbol: Symbol,
-    ) -> Option<CodeLabel> {
-        None
-    }
-
-    /// Returns the completions that should be shown when completing the provided slash command with the given query.
-    fn complete_slash_command_argument(
-        &self,
-        _command: SlashCommand,
-        _args: Vec<String>,
-    ) -> Result<Vec<SlashCommandArgumentCompletion>, String> {
-        Ok(Vec::new())
-    }
-
-    /// Returns the output from running the provided slash command.
-    fn run_slash_command(
-        &self,
-        _command: SlashCommand,
-        _args: Vec<String>,
-        _worktree: Option<&Worktree>,
-    ) -> Result<SlashCommandOutput, String> {
-        Err("`run_slash_command` not implemented".to_string())
-    }
-
-    /// Returns the command used to start a context server.
-    fn context_server_command(
-        &mut self,
-        _context_server_id: &ContextServerId,
-        _project: &Project,
-    ) -> Result<Command> {
-        Err("`context_server_command` not implemented".to_string())
-    }
-
-    /// Returns the configuration options for the specified context server.
-    fn context_server_configuration(
-        &mut self,
-        _context_server_id: &ContextServerId,
-        _project: &Project,
-    ) -> Result<Option<ContextServerConfiguration>> {
-        Ok(None)
-    }
-
-    /// Returns a list of package names as suggestions to be included in the
-    /// search results of the `/docs` slash command.
-    ///
-    /// This can be used to provide completions for known packages (e.g., from the
-    /// local project or a registry) before a package has been indexed.
-    fn suggest_docs_packages(&self, _provider: String) -> Result<Vec<String>, String> {
-        Ok(Vec::new())
-    }
-
-    /// Indexes the docs for the specified package.
-    fn index_docs(
-        &self,
-        _provider: String,
-        _package: String,
-        _database: &KeyValueStore,
-    ) -> Result<(), String> {
-        Err("`index_docs` not implemented".to_string())
-    }
-
-    /// Returns the debug adapter binary for the specified adapter name and configuration.
-    fn get_dap_binary(
-        &mut self,
-        _adapter_name: String,
-        _config: DebugTaskDefinition,
-        _user_provided_debug_adapter_path: Option<String>,
-        _worktree: &Worktree,
-    ) -> Result<DebugAdapterBinary, String> {
-        Err("`get_dap_binary` not implemented".to_string())
-    }
-
-    /// Determines whether the specified adapter configuration should *launch* a new debuggee process
-    /// or *attach* to an existing one. This function should not perform any further validation (outside of determining the kind of a request).
-    /// This function should return an error when the kind cannot be determined (rather than fall back to a known default).
-    fn dap_request_kind(
-        &mut self,
-        _adapter_name: String,
-        _config: serde_json::Value,
-    ) -> Result<StartDebuggingRequestArgumentsRequest, String> {
-        Err("`dap_request_kind` not implemented".to_string())
-    }
-    /// Converts a high-level definition of a debug scenario (originating in a new session UI) to a "low-level" configuration suitable for a particular adapter.
-    ///
-    /// In layman's terms: given a program, list of arguments, current working directory and environment variables,
-    /// create a configuration that can be used to start a debug session.
-    fn dap_config_to_scenario(&mut self, _config: DebugConfig) -> Result<DebugScenario, String> {
-        Err("`dap_config_to_scenario` not implemented".to_string())
-    }
-
-    /// Locators are entities that convert a Zed task into a debug scenario.
-    ///
-    /// They can be provided even by extensions that don't provide a debug adapter.
-    /// For all tasks applicable to a given buffer, Zed will query all locators to find one that can turn the task into a debug scenario.
-    /// A converted debug scenario can include a build task (it shouldn't contain any configuration in such case); a build task result will later
-    /// be resolved with [`Extension::run_dap_locator`].
-    ///
-    /// To work through a real-world example, take a `cargo run` task and a hypothetical `cargo` locator:
-    /// 1. We may need to modify the task; in this case, it is problematic that `cargo run` spawns a binary. We should turn `cargo run` into a debug scenario with
-    ///    `cargo build` task. This is the decision we make at `dap_locator_create_scenario` scope.
-    /// 2. Then, after the build task finishes, we will run `run_dap_locator` of the locator that produced the build task to find the program to be debugged. This function
-    ///    should give us a debugger-agnostic configuration for launching a debug target (that we end up resolving with [`Extension::dap_config_to_scenario`]). It's almost as if the user
-    ///    found the artifact path by themselves.
-    ///
-    /// Note that you're not obliged to use build tasks with locators. Specifically, it is sufficient to provide a debug configuration directly in the return value of
-    /// `dap_locator_create_scenario` if you're able to do that. Make sure to not fill out `build` field in that case, as that will prevent Zed from running second phase of resolution in such case.
-    /// This might be of particular relevance to interpreted languages.
-    fn dap_locator_create_scenario(
-        &mut self,
-        _locator_name: String,
-        _build_task: TaskTemplate,
-        _resolved_label: String,
-        _debug_adapter_name: String,
-    ) -> Option<DebugScenario> {
-        None
-    }
-
-    /// Runs the second phase of locator resolution.
-    /// See [`Extension::dap_locator_create_scenario`] for a hefty comment on locators.
-    fn run_dap_locator(
-        &mut self,
-        _locator_name: String,
-        _build_task: TaskTemplate,
-    ) -> Result<DebugRequest, String> {
-        Err("`run_dap_locator` not implemented".to_string())
-    }
-}
-
-/// Registers the provided type as a Zed extension.
-///
-/// The type must implement the [`Extension`] trait.
-#[macro_export]
-macro_rules! register_extension {
-    ($extension_type:ty) => {
-        #[cfg(target_os = "wasi")]
-        mod wasi_ext {
-            unsafe extern "C" {
-                static mut errno: i32;
-                pub static mut __wasilibc_cwd: *mut std::ffi::c_char;
-            }
-
-            pub fn init_cwd() {
-                unsafe {
-                    // Ensure that our chdir function is linked, instead of the
-                    // one from wasi-libc in the chdir.o translation unit. Otherwise
-                    // we risk linking in `__wasilibc_find_relpath_alloc` which
-                    // is a weak symbol and is being used by
-                    // `__wasilibc_find_relpath`, which we do not want on
-                    // Windows.
-                    chdir(std::ptr::null());
-
-                    __wasilibc_cwd = std::ffi::CString::new(std::env::var("PWD").unwrap())
-                        .unwrap()
-                        .into_raw()
-                        .cast();
-                }
-            }
-
-            #[unsafe(no_mangle)]
-            pub unsafe extern "C" fn chdir(raw_path: *const std::ffi::c_char) -> i32 {
-                // Forbid extensions from changing CWD and so return an appropriate error code.
-                errno = 58; // NOTSUP
-                return -1;
-            }
-        }
-
-        #[unsafe(export_name = "init-extension")]
-        pub extern "C" fn __init_extension() {
-            #[cfg(target_os = "wasi")]
-            wasi_ext::init_cwd();
-
-            zed_extension_api::register_extension(|| {
-                Box::new(<$extension_type as zed_extension_api::Extension>::new())
-            });
-        }
-    };
-}
-
-#[doc(hidden)]
-pub fn register_extension(build_extension: fn() -> Box<dyn Extension>) {
-    unsafe { EXTENSION = Some((build_extension)()) }
-}
-
-fn extension() -> &'static mut dyn Extension {
-    #[expect(static_mut_refs)]
-    unsafe {
-        EXTENSION.as_deref_mut().unwrap()
-    }
-}
-
-static mut EXTENSION: Option<Box<dyn Extension>> = None;
-
-#[cfg(target_arch = "wasm32")]
-#[unsafe(link_section = "zed:api-version")]
-#[doc(hidden)]
-pub static ZED_API_VERSION: [u8; 6] = *include_bytes!(concat!(env!("OUT_DIR"), "/version_bytes"));
-
-mod wit {
-
-    wit_bindgen::generate!({
-        skip: ["init-extension"],
-        path: "./wit/since_v0.8.0",
-    });
-}
-
-wit::export!(Component);
-
-struct Component;
-
-impl wit::Guest for Component {
-    fn language_server_command(
-        language_server_id: String,
-        worktree: &wit::Worktree,
-    ) -> Result<wit::Command> {
-        let language_server_id = LanguageServerId(language_server_id);
-        extension().language_server_command(&language_server_id, worktree)
-    }
-
-    fn language_server_initialization_options(
-        language_server_id: String,
-        worktree: &Worktree,
-    ) -> Result<Option<String>, String> {
-        let language_server_id = LanguageServerId(language_server_id);
-        Ok(extension()
-            .language_server_initialization_options(&language_server_id, worktree)?
-            .and_then(|value| serde_json::to_string(&value).ok()))
-    }
-
-    fn language_server_workspace_configuration(
-        language_server_id: String,
-        worktree: &Worktree,
-    ) -> Result<Option<String>, String> {
-        let language_server_id = LanguageServerId(language_server_id);
-        Ok(extension()
-            .language_server_workspace_configuration(&language_server_id, worktree)?
-            .and_then(|value| serde_json::to_string(&value).ok()))
-    }
-
-    fn language_server_additional_initialization_options(
-        language_server_id: String,
-        target_language_server_id: String,
-        worktree: &Worktree,
-    ) -> Result<Option<String>, String> {
-        let language_server_id = LanguageServerId(language_server_id);
-        let target_language_server_id = LanguageServerId(target_language_server_id);
-        Ok(extension()
-            .language_server_additional_initialization_options(
-                &language_server_id,
-                &target_language_server_id,
-                worktree,
-            )?
-            .and_then(|value| serde_json::to_string(&value).ok()))
-    }
-
-    fn language_server_additional_workspace_configuration(
-        language_server_id: String,
-        target_language_server_id: String,
-        worktree: &Worktree,
-    ) -> Result<Option<String>, String> {
-        let language_server_id = LanguageServerId(language_server_id);
-        let target_language_server_id = LanguageServerId(target_language_server_id);
-        Ok(extension()
-            .language_server_additional_workspace_configuration(
-                &language_server_id,
-                &target_language_server_id,
-                worktree,
-            )?
-            .and_then(|value| serde_json::to_string(&value).ok()))
-    }
-
-    fn labels_for_completions(
-        language_server_id: String,
-        completions: Vec<Completion>,
-    ) -> Result<Vec<Option<CodeLabel>>, String> {
-        let language_server_id = LanguageServerId(language_server_id);
-        let mut labels = Vec::new();
-        for (ix, completion) in completions.into_iter().enumerate() {
-            let label = extension().label_for_completion(&language_server_id, completion);
-            if let Some(label) = label {
-                labels.resize(ix + 1, None);
-                *labels.last_mut().unwrap() = Some(label);
-            }
-        }
-        Ok(labels)
-    }
-
-    fn labels_for_symbols(
-        language_server_id: String,
-        symbols: Vec<Symbol>,
-    ) -> Result<Vec<Option<CodeLabel>>, String> {
-        let language_server_id = LanguageServerId(language_server_id);
-        let mut labels = Vec::new();
-        for (ix, symbol) in symbols.into_iter().enumerate() {
-            let label = extension().label_for_symbol(&language_server_id, symbol);
-            if let Some(label) = label {
-                labels.resize(ix + 1, None);
-                *labels.last_mut().unwrap() = Some(label);
-            }
-        }
-        Ok(labels)
-    }
-
-    fn complete_slash_command_argument(
-        command: SlashCommand,
-        args: Vec<String>,
-    ) -> Result<Vec<SlashCommandArgumentCompletion>, String> {
-        extension().complete_slash_command_argument(command, args)
-    }
-
-    fn run_slash_command(
-        command: SlashCommand,
-        args: Vec<String>,
-        worktree: Option<&Worktree>,
-    ) -> Result<SlashCommandOutput, String> {
-        extension().run_slash_command(command, args, worktree)
-    }
-
-    fn context_server_command(
-        context_server_id: String,
-        project: &Project,
-    ) -> Result<wit::Command> {
-        let context_server_id = ContextServerId(context_server_id);
-        extension().context_server_command(&context_server_id, project)
-    }
-
-    fn context_server_configuration(
-        context_server_id: String,
-        project: &Project,
-    ) -> Result<Option<ContextServerConfiguration>, String> {
-        let context_server_id = ContextServerId(context_server_id);
-        extension().context_server_configuration(&context_server_id, project)
-    }
-
-    fn suggest_docs_packages(provider: String) -> Result<Vec<String>, String> {
-        extension().suggest_docs_packages(provider)
-    }
-
-    fn index_docs(
-        provider: String,
-        package: String,
-        database: &KeyValueStore,
-    ) -> Result<(), String> {
-        extension().index_docs(provider, package, database)
-    }
-
-    fn get_dap_binary(
-        adapter_name: String,
-        config: DebugTaskDefinition,
-        user_installed_path: Option<String>,
-        worktree: &Worktree,
-    ) -> Result<wit::DebugAdapterBinary, String> {
-        extension().get_dap_binary(adapter_name, config, user_installed_path, worktree)
-    }
-
-    fn dap_request_kind(
-        adapter_name: String,
-        config: String,
-    ) -> Result<StartDebuggingRequestArgumentsRequest, String> {
-        extension().dap_request_kind(
-            adapter_name,
-            serde_json::from_str(&config).map_err(|e| format!("Failed to parse config: {e}"))?,
-        )
-    }
-    fn dap_config_to_scenario(config: DebugConfig) -> Result<DebugScenario, String> {
-        extension().dap_config_to_scenario(config)
-    }
-    fn dap_locator_create_scenario(
-        locator_name: String,
-        build_task: TaskTemplate,
-        resolved_label: String,
-        debug_adapter_name: String,
-    ) -> Option<DebugScenario> {
-        extension().dap_locator_create_scenario(
-            locator_name,
-            build_task,
-            resolved_label,
-            debug_adapter_name,
-        )
-    }
-    fn run_dap_locator(
-        locator_name: String,
-        build_task: TaskTemplate,
-    ) -> Result<DebugRequest, String> {
-        extension().run_dap_locator(locator_name, build_task)
-    }
-}
-
-/// The ID of a language server.
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone)]
-pub struct LanguageServerId(String);
-
-impl AsRef<str> for LanguageServerId {
-    fn as_ref(&self) -> &str {
-        &self.0
-    }
-}
-
-impl fmt::Display for LanguageServerId {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
-/// The ID of a context server.
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone)]
-pub struct ContextServerId(String);
-
-impl AsRef<str> for ContextServerId {
-    fn as_ref(&self) -> &str {
-        &self.0
-    }
-}
-
-impl fmt::Display for ContextServerId {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
-impl CodeLabelSpan {
-    /// Returns a [`CodeLabelSpan::CodeRange`].
-    pub fn code_range(range: impl Into<wit::Range>) -> Self {
-        Self::CodeRange(range.into())
-    }
-
-    /// Returns a [`CodeLabelSpan::Literal`].
-    pub fn literal(text: impl Into<String>, highlight_name: Option<String>) -> Self {
-        Self::Literal(CodeLabelSpanLiteral {
-            text: text.into(),
-            highlight_name,
-        })
-    }
-}
-
-impl From<std::ops::Range<u32>> for wit::Range {
-    fn from(value: std::ops::Range<u32>) -> Self {
-        Self {
-            start: value.start,
-            end: value.end,
-        }
-    }
-}
-
-impl From<std::ops::Range<usize>> for wit::Range {
-    fn from(value: std::ops::Range<usize>) -> Self {
-        Self {
-            start: value.start as u32,
-            end: value.end as u32,
-        }
-    }
-}
diff --git a/crates/extension_api/src/http_client.rs b/crates/extension_api/src/http_client.rs
deleted file mode 100644
index 9e30da8db4..0000000000
--- a/crates/extension_api/src/http_client.rs
+++ /dev/null
@@ -1,101 +0,0 @@
-//! An HTTP client.
-
-pub use crate::wit::zed::extension::http_client::{
-    HttpMethod, HttpRequest, HttpResponse, HttpResponseStream, RedirectPolicy, fetch, fetch_stream,
-};
-
-impl HttpRequest {
-    /// Returns a builder for an [`HttpRequest`].
-    pub fn builder() -> HttpRequestBuilder {
-        HttpRequestBuilder::new()
-    }
-
-    /// Executes the [`HttpRequest`] with [`fetch`].
-    pub fn fetch(&self) -> Result<HttpResponse, String> {
-        fetch(self)
-    }
-
-    /// Executes the [`HttpRequest`] with [`fetch_stream`].
-    pub fn fetch_stream(&self) -> Result<HttpResponseStream, String> {
-        fetch_stream(self)
-    }
-}
-
-/// A builder for an [`HttpRequest`].
-#[derive(Clone)]
-pub struct HttpRequestBuilder {
-    method: Option<HttpMethod>,
-    url: Option<String>,
-    headers: Vec<(String, String)>,
-    body: Option<Vec<u8>>,
-    redirect_policy: RedirectPolicy,
-}
-
-impl Default for HttpRequestBuilder {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl HttpRequestBuilder {
-    /// Returns a new [`HttpRequestBuilder`].
-    pub fn new() -> Self {
-        HttpRequestBuilder {
-            method: None,
-            url: None,
-            headers: Vec::new(),
-            body: None,
-            redirect_policy: RedirectPolicy::NoFollow,
-        }
-    }
-
-    /// Sets the HTTP method for the request.
-    pub fn method(mut self, method: HttpMethod) -> Self {
-        self.method = Some(method);
-        self
-    }
-
-    /// Sets the URL for the request.
-    pub fn url(mut self, url: impl Into<String>) -> Self {
-        self.url = Some(url.into());
-        self
-    }
-
-    /// Adds a header to the request.
-    pub fn header(mut self, name: impl Into<String>, value: impl Into<String>) -> Self {
-        self.headers.push((name.into(), value.into()));
-        self
-    }
-
-    /// Adds the specified headers to the request.
-    pub fn headers(mut self, headers: impl IntoIterator<Item = (String, String)>) -> Self {
-        self.headers.extend(headers);
-        self
-    }
-
-    /// Sets the body of the request.
-    pub fn body(mut self, body: impl Into<Vec<u8>>) -> Self {
-        self.body = Some(body.into());
-        self
-    }
-
-    /// Sets the redirect policy for the request.
-    pub fn redirect_policy(mut self, policy: RedirectPolicy) -> Self {
-        self.redirect_policy = policy;
-        self
-    }
-
-    /// Builds the [`HttpRequest`].
-    pub fn build(self) -> Result<HttpRequest, String> {
-        let method = self.method.ok_or_else(|| "Method not set".to_string())?;
-        let url = self.url.ok_or_else(|| "URL not set".to_string())?;
-
-        Ok(HttpRequest {
-            method,
-            url,
-            headers: self.headers,
-            body: self.body,
-            redirect_policy: self.redirect_policy,
-        })
-    }
-}
diff --git a/crates/extension_api/src/process.rs b/crates/extension_api/src/process.rs
deleted file mode 100644
index 1068fd9c17..0000000000
--- a/crates/extension_api/src/process.rs
+++ /dev/null
@@ -1,44 +0,0 @@
-//! A module for working with processes.
-
-use crate::wit::zed::extension::process;
-pub use crate::wit::zed::extension::process::{Command, Output};
-
-impl Command {
-    pub fn new(program: impl Into<String>) -> Self {
-        Self {
-            command: program.into(),
-            args: Vec::new(),
-            env: Vec::new(),
-        }
-    }
-
-    pub fn arg(mut self, arg: impl Into<String>) -> Self {
-        self.args.push(arg.into());
-        self
-    }
-
-    pub fn args(mut self, args: impl IntoIterator<Item = impl Into<String>>) -> Self {
-        self.args.extend(args.into_iter().map(Into::into));
-        self
-    }
-
-    pub fn env(mut self, key: impl Into<String>, value: impl Into<String>) -> Self {
-        self.env.push((key.into(), value.into()));
-        self
-    }
-
-    pub fn envs(
-        mut self,
-        envs: impl IntoIterator<Item = (impl Into<String>, impl Into<String>)>,
-    ) -> Self {
-        self.env.extend(
-            envs.into_iter()
-                .map(|(key, value)| (key.into(), value.into())),
-        );
-        self
-    }
-
-    pub fn output(&mut self) -> Result<Output, String> {
-        process::run_command(self)
-    }
-}
diff --git a/crates/extension_api/src/settings.rs b/crates/extension_api/src/settings.rs
deleted file mode 100644
index a133a8027a..0000000000
--- a/crates/extension_api/src/settings.rs
+++ /dev/null
@@ -1,56 +0,0 @@
-//! Provides access to Zed settings.
-
-#[path = "../wit/since_v0.2.0/settings.rs"]
-mod types;
-
-use crate::{Project, Result, SettingsLocation, Worktree, wit};
-use serde_json;
-pub use types::*;
-
-impl LanguageSettings {
-    /// Returns the [`LanguageSettings`] for the given language.
-    pub fn for_worktree(language: Option<&str>, worktree: &Worktree) -> Result<Self> {
-        get_settings("language", language, Some(worktree.id()))
-    }
-}
-
-impl LspSettings {
-    /// Returns the [`LspSettings`] for the given language server.
-    pub fn for_worktree(language_server_name: &str, worktree: &Worktree) -> Result<Self> {
-        get_settings("lsp", Some(language_server_name), Some(worktree.id()))
-    }
-}
-
-impl ContextServerSettings {
-    /// Returns the [`ContextServerSettings`] for the given context server.
-    pub fn for_project(context_server_id: &str, project: &Project) -> Result<Self> {
-        let global_setting: Self = get_settings("context_servers", Some(context_server_id), None)?;
-
-        for worktree_id in project.worktree_ids() {
-            let settings = get_settings(
-                "context_servers",
-                Some(context_server_id),
-                Some(worktree_id),
-            )?;
-            if settings != global_setting {
-                return Ok(settings);
-            }
-        }
-
-        Ok(global_setting)
-    }
-}
-
-fn get_settings<T: serde::de::DeserializeOwned>(
-    settings_type: &str,
-    settings_name: Option<&str>,
-    worktree_id: Option<u64>,
-) -> Result<T> {
-    let location = worktree_id.map(|worktree_id| SettingsLocation {
-        worktree_id,
-        path: String::new(),
-    });
-    let settings_json = wit::get_settings(location.as_ref(), settings_type, settings_name)?;
-    let settings: T = serde_json::from_str(&settings_json).map_err(|err| err.to_string())?;
-    Ok(settings)
-}
diff --git a/crates/extension_api/wit/since_v0.0.1/extension.wit b/crates/extension_api/wit/since_v0.0.1/extension.wit
deleted file mode 100644
index 339a974169..0000000000
--- a/crates/extension_api/wit/since_v0.0.1/extension.wit
+++ /dev/null
@@ -1,70 +0,0 @@
-package zed:extension;
-
-world extension {
-    use github.{github-release, github-release-options};
-    use platform.{os, architecture};
-
-    export init-extension: func();
-
-    enum downloaded-file-type {
-        gzip,
-        gzip-tar,
-        zip,
-        uncompressed,
-    }
-
-    variant language-server-installation-status {
-        checking-for-update,
-        downloaded,
-        downloading,
-        cached,
-        failed(string),
-    }
-
-    /// Gets the current operating system and architecture
-    import current-platform: func() -> tuple<os, architecture>;
-
-    /// Get the path to the node binary used by Zed.
-    import node-binary-path: func() -> result<string, string>;
-
-    /// Gets the latest version of the given NPM package.
-    import npm-package-latest-version: func(package-name: string) -> result<string, string>;
-
-    /// Returns the installed version of the given NPM package, if it exists.
-    import npm-package-installed-version: func(package-name: string) -> result<option<string>, string>;
-
-    /// Installs the specified NPM package.
-    import npm-install-package: func(package-name: string, version: string) -> result<_, string>;
-
-    /// Gets the latest release for the given GitHub repository.
-    import latest-github-release: func(repo: string, options: github-release-options) -> result<github-release, string>;
-
-    /// Downloads a file from the given url, and saves it to the given filename within the extension's
-    /// working directory. Extracts the file according to the given file type.
-    import download-file: func(url: string, output-filename: string, file-type: downloaded-file-type) -> result<_, string>;
-
-    /// Updates the installation status for the given language server.
-    import set-language-server-installation-status: func(language-server-name: string, status: language-server-installation-status);
-
-    type env-vars = list<tuple<string, string>>;
-
-    record command {
-        command: string,
-        args: list<string>,
-        env: env-vars,
-    }
-
-    resource worktree {
-        read-text-file: func(path: string) -> result<string, string>;
-        which: func(binary-name: string) -> option<string>;
-        shell-env: func() -> env-vars;
-    }
-
-    record language-server-config {
-        name: string,
-        language-name: string,
-    }
-
-    export language-server-command: func(config: language-server-config, worktree: borrow<worktree>) -> result<command, string>;
-    export language-server-initialization-options: func(config: language-server-config, worktree: borrow<worktree>) -> result<option<string>, string>;
-}
diff --git a/crates/extension_api/wit/since_v0.0.1/github.wit b/crates/extension_api/wit/since_v0.0.1/github.wit
deleted file mode 100644
index 53ecacb720..0000000000
--- a/crates/extension_api/wit/since_v0.0.1/github.wit
+++ /dev/null
@@ -1,28 +0,0 @@
-interface github {
-    /// A GitHub release.
-    record github-release {
-        /// The version of the release.
-        version: string,
-        /// The list of assets attached to the release.
-        assets: list<github-release-asset>,
-    }
-
-    /// An asset from a GitHub release.
-    record github-release-asset {
-        /// The name of the asset.
-        name: string,
-        /// The download URL for the asset.
-        download-url: string,
-    }
-
-    /// The options used to filter down GitHub releases.
-    record github-release-options {
-        /// Whether releases without assets should be included.
-        require-assets: bool,
-        /// Whether pre-releases should be included.
-        pre-release: bool,
-    }
-
-    /// Returns the latest release for the given GitHub repository.
-    latest-github-release: func(repo: string, options: github-release-options) -> result<github-release, string>;
-}
diff --git a/crates/extension_api/wit/since_v0.0.1/platform.wit b/crates/extension_api/wit/since_v0.0.1/platform.wit
deleted file mode 100644
index 48472a99bc..0000000000
--- a/crates/extension_api/wit/since_v0.0.1/platform.wit
+++ /dev/null
@@ -1,24 +0,0 @@
-interface platform {
-    /// An operating system.
-    enum os {
-        /// macOS.
-        mac,
-        /// Linux.
-        linux,
-        /// Windows.
-        windows,
-    }
-
-    /// A platform architecture.
-    enum architecture {
-        /// AArch64 (e.g., Apple Silicon).
-        aarch64,
-        /// x86.
-        x86,
-        /// x86-64.
-        x8664,
-    }
-
-    /// Gets the current operating system and architecture.
-    current-platform: func() -> tuple<os, architecture>;
-}
diff --git a/crates/extension_api/wit/since_v0.0.4/extension.wit b/crates/extension_api/wit/since_v0.0.4/extension.wit
deleted file mode 100644
index c6f3e73506..0000000000
--- a/crates/extension_api/wit/since_v0.0.4/extension.wit
+++ /dev/null
@@ -1,72 +0,0 @@
-package zed:extension;
-
-world extension {
-    use github.{github-release, github-release-options};
-    use platform.{os, architecture};
-
-    export init-extension: func();
-
-    enum downloaded-file-type {
-        gzip,
-        gzip-tar,
-        zip,
-        uncompressed,
-    }
-
-    variant language-server-installation-status {
-        none,
-        downloading,
-        checking-for-update,
-        failed(string),
-    }
-
-    /// Gets the current operating system and architecture
-    import current-platform: func() -> tuple<os, architecture>;
-
-    /// Get the path to the node binary used by Zed.
-    import node-binary-path: func() -> result<string, string>;
-
-    /// Gets the latest version of the given NPM package.
-    import npm-package-latest-version: func(package-name: string) -> result<string, string>;
-
-    /// Returns the installed version of the given NPM package, if it exists.
-    import npm-package-installed-version: func(package-name: string) -> result<option<string>, string>;
-
-    /// Installs the specified NPM package.
-    import npm-install-package: func(package-name: string, version: string) -> result<_, string>;
-
-    /// Gets the latest release for the given GitHub repository.
-    import latest-github-release: func(repo: string, options: github-release-options) -> result<github-release, string>;
-
-    /// Downloads a file from the given url, and saves it to the given path within the extension's
-    /// working directory. Extracts the file according to the given file type.
-    import download-file: func(url: string, file-path: string, file-type: downloaded-file-type) -> result<_, string>;
-
-    /// Makes the file at the given path executable.
-    import make-file-executable: func(filepath: string) -> result<_, string>;
-
-    /// Updates the installation status for the given language server.
-    import set-language-server-installation-status: func(language-server-name: string, status: language-server-installation-status);
-
-    type env-vars = list<tuple<string, string>>;
-
-    record command {
-        command: string,
-        args: list<string>,
-        env: env-vars,
-    }
-
-    resource worktree {
-        read-text-file: func(path: string) -> result<string, string>;
-        which: func(binary-name: string) -> option<string>;
-        shell-env: func() -> env-vars;
-    }
-
-    record language-server-config {
-        name: string,
-        language-name: string,
-    }
-
-    export language-server-command: func(config: language-server-config, worktree: borrow<worktree>) -> result<command, string>;
-    export language-server-initialization-options: func(config: language-server-config, worktree: borrow<worktree>) -> result<option<string>, string>;
-}
diff --git a/crates/extension_api/wit/since_v0.0.4/github.wit b/crates/extension_api/wit/since_v0.0.4/github.wit
deleted file mode 100644
index 53ecacb720..0000000000
--- a/crates/extension_api/wit/since_v0.0.4/github.wit
+++ /dev/null
@@ -1,28 +0,0 @@
-interface github {
-    /// A GitHub release.
-    record github-release {
-        /// The version of the release.
-        version: string,
-        /// The list of assets attached to the release.
-        assets: list<github-release-asset>,
-    }
-
-    /// An asset from a GitHub release.
-    record github-release-asset {
-        /// The name of the asset.
-        name: string,
-        /// The download URL for the asset.
-        download-url: string,
-    }
-
-    /// The options used to filter down GitHub releases.
-    record github-release-options {
-        /// Whether releases without assets should be included.
-        require-assets: bool,
-        /// Whether pre-releases should be included.
-        pre-release: bool,
-    }
-
-    /// Returns the latest release for the given GitHub repository.
-    latest-github-release: func(repo: string, options: github-release-options) -> result<github-release, string>;
-}
diff --git a/crates/extension_api/wit/since_v0.0.4/platform.wit b/crates/extension_api/wit/since_v0.0.4/platform.wit
deleted file mode 100644
index 48472a99bc..0000000000
--- a/crates/extension_api/wit/since_v0.0.4/platform.wit
+++ /dev/null
@@ -1,24 +0,0 @@
-interface platform {
-    /// An operating system.
-    enum os {
-        /// macOS.
-        mac,
-        /// Linux.
-        linux,
-        /// Windows.
-        windows,
-    }
-
-    /// A platform architecture.
-    enum architecture {
-        /// AArch64 (e.g., Apple Silicon).
-        aarch64,
-        /// x86.
-        x86,
-        /// x86-64.
-        x8664,
-    }
-
-    /// Gets the current operating system and architecture.
-    current-platform: func() -> tuple<os, architecture>;
-}
diff --git a/crates/extension_api/wit/since_v0.0.6/extension.wit b/crates/extension_api/wit/since_v0.0.6/extension.wit
deleted file mode 100644
index 2f42cc0365..0000000000
--- a/crates/extension_api/wit/since_v0.0.6/extension.wit
+++ /dev/null
@@ -1,130 +0,0 @@
-package zed:extension;
-
-world extension {
-    import github;
-    import platform;
-    import nodejs;
-
-    use lsp.{completion, symbol};
-
-    /// Initializes the extension.
-    export init-extension: func();
-
-    /// The type of a downloaded file.
-    enum downloaded-file-type {
-        /// A gzipped file (`.gz`).
-        gzip,
-        /// A gzipped tar archive (`.tar.gz`).
-        gzip-tar,
-        /// A ZIP file (`.zip`).
-        zip,
-        /// An uncompressed file.
-        uncompressed,
-    }
-
-    /// The installation status for a language server.
-    variant language-server-installation-status {
-        /// The language server has no installation status.
-        none,
-        /// The language server is being downloaded.
-        downloading,
-        /// The language server is checking for updates.
-        checking-for-update,
-        /// The language server installation failed for specified reason.
-        failed(string),
-    }
-
-    record settings-location {
-        worktree-id: u64,
-        path: string,
-    }
-
-    import get-settings: func(path: option<settings-location>, category: string, key: option<string>) -> result<string, string>;
-
-    /// Downloads a file from the given URL and saves it to the given path within the extension's
-    /// working directory.
-    ///
-    /// The file will be extracted according to the given file type.
-    import download-file: func(url: string, file-path: string, file-type: downloaded-file-type) -> result<_, string>;
-
-    /// Makes the file at the given path executable.
-    import make-file-executable: func(filepath: string) -> result<_, string>;
-
-    /// Updates the installation status for the given language server.
-    import set-language-server-installation-status: func(language-server-name: string, status: language-server-installation-status);
-
-    /// A list of environment variables.
-    type env-vars = list<tuple<string, string>>;
-
-    /// A command.
-    record command {
-        /// The command to execute.
-        command: string,
-        /// The arguments to pass to the command.
-        args: list<string>,
-        /// The environment variables to set for the command.
-        env: env-vars,
-    }
-
-    /// A Zed worktree.
-    resource worktree {
-        /// Returns the ID of the worktree.
-        id: func() -> u64;
-        /// Returns the root path of the worktree.
-        root-path: func() -> string;
-        /// Returns the textual contents of the specified file in the worktree.
-        read-text-file: func(path: string) -> result<string, string>;
-        /// Returns the path to the given binary name, if one is present on the `$PATH`.
-        which: func(binary-name: string) -> option<string>;
-        /// Returns the current shell environment.
-        shell-env: func() -> env-vars;
-    }
-
-    /// Returns the command used to start up the language server.
-    export language-server-command: func(language-server-id: string, worktree: borrow<worktree>) -> result<command, string>;
-
-    /// Returns the initialization options to pass to the language server on startup.
-    ///
-    /// The initialization options are represented as a JSON string.
-    export language-server-initialization-options: func(language-server-id: string, worktree: borrow<worktree>) -> result<option<string>, string>;
-
-    /// Returns the workspace configuration options to pass to the language server.
-    export language-server-workspace-configuration: func(language-server-id: string, worktree: borrow<worktree>) -> result<option<string>, string>;
-
-    /// A label containing some code.
-    record code-label {
-        /// The source code to parse with Tree-sitter.
-        code: string,
-        /// The spans to display in the label.
-        spans: list<code-label-span>,
-        /// The range of the displayed label to include when filtering.
-        filter-range: range,
-    }
-
-    /// A span within a code label.
-    variant code-label-span {
-        /// A range into the parsed code.
-        code-range(range),
-        /// A span containing a code literal.
-        literal(code-label-span-literal),
-    }
-
-    /// A span containing a code literal.
-    record code-label-span-literal {
-        /// The literal text.
-        text: string,
-        /// The name of the highlight to use for this literal.
-        highlight-name: option<string>,
-    }
-
-    /// A (half-open) range (`[start, end)`).
-    record range {
-        /// The start of the range (inclusive).
-        start: u32,
-        /// The end of the range (exclusive).
-        end: u32,
-    }
-
-    export labels-for-completions: func(language-server-id: string, completions: list<completion>) -> result<list<option<code-label>>, string>;
-    export labels-for-symbols: func(language-server-id: string, symbols: list<symbol>) -> result<list<option<code-label>>, string>;
-}
diff --git a/crates/extension_api/wit/since_v0.0.6/github.wit b/crates/extension_api/wit/since_v0.0.6/github.wit
deleted file mode 100644
index 53ecacb720..0000000000
--- a/crates/extension_api/wit/since_v0.0.6/github.wit
+++ /dev/null
@@ -1,28 +0,0 @@
-interface github {
-    /// A GitHub release.
-    record github-release {
-        /// The version of the release.
-        version: string,
-        /// The list of assets attached to the release.
-        assets: list<github-release-asset>,
-    }
-
-    /// An asset from a GitHub release.
-    record github-release-asset {
-        /// The name of the asset.
-        name: string,
-        /// The download URL for the asset.
-        download-url: string,
-    }
-
-    /// The options used to filter down GitHub releases.
-    record github-release-options {
-        /// Whether releases without assets should be included.
-        require-assets: bool,
-        /// Whether pre-releases should be included.
-        pre-release: bool,
-    }
-
-    /// Returns the latest release for the given GitHub repository.
-    latest-github-release: func(repo: string, options: github-release-options) -> result<github-release, string>;
-}
diff --git a/crates/extension_api/wit/since_v0.0.6/lsp.wit b/crates/extension_api/wit/since_v0.0.6/lsp.wit
deleted file mode 100644
index 19e81b6b14..0000000000
--- a/crates/extension_api/wit/since_v0.0.6/lsp.wit
+++ /dev/null
@@ -1,83 +0,0 @@
-interface lsp {
-    /// An LSP completion.
-    record completion {
-        label: string,
-        detail: option<string>,
-        kind: option<completion-kind>,
-        insert-text-format: option<insert-text-format>,
-    }
-
-    /// The kind of an LSP completion.
-    variant completion-kind {
-        text,
-        method,
-        function,
-        %constructor,
-        field,
-        variable,
-        class,
-        %interface,
-        module,
-        property,
-        unit,
-        value,
-        %enum,
-        keyword,
-        snippet,
-        color,
-        file,
-        reference,
-        folder,
-        enum-member,
-        constant,
-        struct,
-        event,
-        operator,
-        type-parameter,
-        other(s32),
-    }
-
-    /// Defines how to interpret the insert text in a completion item.
-    variant insert-text-format {
-        plain-text,
-        snippet,
-        other(s32),
-    }
-
-    /// An LSP symbol.
-    record symbol {
-        kind: symbol-kind,
-        name: string,
-    }
-
-    /// The kind of an LSP symbol.
-    variant symbol-kind {
-        file,
-        module,
-        namespace,
-        %package,
-        class,
-        method,
-        property,
-        field,
-        %constructor,
-        %enum,
-        %interface,
-        function,
-        variable,
-        constant,
-        %string,
-        number,
-        boolean,
-        array,
-        object,
-        key,
-        null,
-        enum-member,
-        struct,
-        event,
-        operator,
-        type-parameter,
-        other(s32),
-    }
-}
diff --git a/crates/extension_api/wit/since_v0.0.6/nodejs.wit b/crates/extension_api/wit/since_v0.0.6/nodejs.wit
deleted file mode 100644
index c814548314..0000000000
--- a/crates/extension_api/wit/since_v0.0.6/nodejs.wit
+++ /dev/null
@@ -1,13 +0,0 @@
-interface nodejs {
-    /// Returns the path to the Node binary used by Zed.
-    node-binary-path: func() -> result<string, string>;
-
-    /// Returns the latest version of the given NPM package.
-    npm-package-latest-version: func(package-name: string) -> result<string, string>;
-
-    /// Returns the installed version of the given NPM package, if it exists.
-    npm-package-installed-version: func(package-name: string) -> result<option<string>, string>;
-
-    /// Installs the specified NPM package.
-    npm-install-package: func(package-name: string, version: string) -> result<_, string>;
-}
diff --git a/crates/extension_api/wit/since_v0.0.6/platform.wit b/crates/extension_api/wit/since_v0.0.6/platform.wit
deleted file mode 100644
index 48472a99bc..0000000000
--- a/crates/extension_api/wit/since_v0.0.6/platform.wit
+++ /dev/null
@@ -1,24 +0,0 @@
-interface platform {
-    /// An operating system.
-    enum os {
-        /// macOS.
-        mac,
-        /// Linux.
-        linux,
-        /// Windows.
-        windows,
-    }
-
-    /// A platform architecture.
-    enum architecture {
-        /// AArch64 (e.g., Apple Silicon).
-        aarch64,
-        /// x86.
-        x86,
-        /// x86-64.
-        x8664,
-    }
-
-    /// Gets the current operating system and architecture.
-    current-platform: func() -> tuple<os, architecture>;
-}
diff --git a/crates/extension_api/wit/since_v0.0.6/settings.rs b/crates/extension_api/wit/since_v0.0.6/settings.rs
deleted file mode 100644
index 5c6cae7064..0000000000
--- a/crates/extension_api/wit/since_v0.0.6/settings.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-use serde::{Deserialize, Serialize};
-use std::num::NonZeroU32;
-
-/// The settings for a particular language.
-#[derive(Debug, Serialize, Deserialize)]
-pub struct LanguageSettings {
-    /// How many columns a tab should occupy.
-    pub tab_size: NonZeroU32,
-}
-
-/// The settings for a particular language server.
-#[derive(Default, Debug, Serialize, Deserialize)]
-pub struct LspSettings {
-    /// The settings for the language server binary.
-    pub binary: Option<BinarySettings>,
-    /// The initialization options to pass to the language server.
-    pub initialization_options: Option<serde_json::Value>,
-    /// The settings to pass to language server.
-    pub settings: Option<serde_json::Value>,
-}
-
-/// The settings for a language server binary.
-#[derive(Debug, Serialize, Deserialize)]
-pub struct BinarySettings {
-    /// The path to the binary.
-    pub path: Option<String>,
-    /// The arguments to pass to the binary.
-    pub arguments: Option<Vec<String>>,
-}
diff --git a/crates/extension_api/wit/since_v0.1.0/common.wit b/crates/extension_api/wit/since_v0.1.0/common.wit
deleted file mode 100644
index c4f321f4c7..0000000000
--- a/crates/extension_api/wit/since_v0.1.0/common.wit
+++ /dev/null
@@ -1,9 +0,0 @@
-interface common {
-    /// A (half-open) range (`[start, end)`).
-    record range {
-        /// The start of the range (inclusive).
-        start: u32,
-        /// The end of the range (exclusive).
-        end: u32,
-    }
-}
diff --git a/crates/extension_api/wit/since_v0.1.0/extension.wit b/crates/extension_api/wit/since_v0.1.0/extension.wit
deleted file mode 100644
index c7599f93ff..0000000000
--- a/crates/extension_api/wit/since_v0.1.0/extension.wit
+++ /dev/null
@@ -1,147 +0,0 @@
-package zed:extension;
-
-world extension {
-    import github;
-    import http-client;
-    import platform;
-    import nodejs;
-
-    use common.{range};
-    use lsp.{completion, symbol};
-    use slash-command.{slash-command, slash-command-argument-completion, slash-command-output};
-
-    /// Initializes the extension.
-    export init-extension: func();
-
-    /// The type of a downloaded file.
-    enum downloaded-file-type {
-        /// A gzipped file (`.gz`).
-        gzip,
-        /// A gzipped tar archive (`.tar.gz`).
-        gzip-tar,
-        /// A ZIP file (`.zip`).
-        zip,
-        /// An uncompressed file.
-        uncompressed,
-    }
-
-    /// The installation status for a language server.
-    variant language-server-installation-status {
-        /// The language server has no installation status.
-        none,
-        /// The language server is being downloaded.
-        downloading,
-        /// The language server is checking for updates.
-        checking-for-update,
-        /// The language server installation failed for specified reason.
-        failed(string),
-    }
-
-    record settings-location {
-        worktree-id: u64,
-        path: string,
-    }
-
-    import get-settings: func(path: option<settings-location>, category: string, key: option<string>) -> result<string, string>;
-
-    /// Downloads a file from the given URL and saves it to the given path within the extension's
-    /// working directory.
-    ///
-    /// The file will be extracted according to the given file type.
-    import download-file: func(url: string, file-path: string, file-type: downloaded-file-type) -> result<_, string>;
-
-    /// Makes the file at the given path executable.
-    import make-file-executable: func(filepath: string) -> result<_, string>;
-
-    /// Updates the installation status for the given language server.
-    import set-language-server-installation-status: func(language-server-name: string, status: language-server-installation-status);
-
-    /// A list of environment variables.
-    type env-vars = list<tuple<string, string>>;
-
-    /// A command.
-    record command {
-        /// The command to execute.
-        command: string,
-        /// The arguments to pass to the command.
-        args: list<string>,
-        /// The environment variables to set for the command.
-        env: env-vars,
-    }
-
-    /// A Zed worktree.
-    resource worktree {
-        /// Returns the ID of the worktree.
-        id: func() -> u64;
-        /// Returns the root path of the worktree.
-        root-path: func() -> string;
-        /// Returns the textual contents of the specified file in the worktree.
-        read-text-file: func(path: string) -> result<string, string>;
-        /// Returns the path to the given binary name, if one is present on the `$PATH`.
-        which: func(binary-name: string) -> option<string>;
-        /// Returns the current shell environment.
-        shell-env: func() -> env-vars;
-    }
-
-    /// A key-value store.
-    resource key-value-store {
-        /// Inserts an entry under the specified key.
-        insert: func(key: string, value: string) -> result<_, string>;
-    }
-
-    /// Returns the command used to start up the language server.
-    export language-server-command: func(language-server-id: string, worktree: borrow<worktree>) -> result<command, string>;
-
-    /// Returns the initialization options to pass to the language server on startup.
-    ///
-    /// The initialization options are represented as a JSON string.
-    export language-server-initialization-options: func(language-server-id: string, worktree: borrow<worktree>) -> result<option<string>, string>;
-
-    /// Returns the workspace configuration options to pass to the language server.
-    export language-server-workspace-configuration: func(language-server-id: string, worktree: borrow<worktree>) -> result<option<string>, string>;
-
-    /// A label containing some code.
-    record code-label {
-        /// The source code to parse with Tree-sitter.
-        code: string,
-        /// The spans to display in the label.
-        spans: list<code-label-span>,
-        /// The range of the displayed label to include when filtering.
-        filter-range: range,
-    }
-
-    /// A span within a code label.
-    variant code-label-span {
-        /// A range into the parsed code.
-        code-range(range),
-        /// A span containing a code literal.
-        literal(code-label-span-literal),
-    }
-
-    /// A span containing a code literal.
-    record code-label-span-literal {
-        /// The literal text.
-        text: string,
-        /// The name of the highlight to use for this literal.
-        highlight-name: option<string>,
-    }
-
-    export labels-for-completions: func(language-server-id: string, completions: list<completion>) -> result<list<option<code-label>>, string>;
-    export labels-for-symbols: func(language-server-id: string, symbols: list<symbol>) -> result<list<option<code-label>>, string>;
-
-    /// Returns the completions that should be shown when completing the provided slash command with the given query.
-    export complete-slash-command-argument: func(command: slash-command, args: list<string>) -> result<list<slash-command-argument-completion>, string>;
-
-    /// Returns the output from running the provided slash command.
-    export run-slash-command: func(command: slash-command, args: list<string>, worktree: option<borrow<worktree>>) -> result<slash-command-output, string>;
-
-    /// Returns a list of packages as suggestions to be included in the `/docs`
-    /// search results.
-    ///
-    /// This can be used to provide completions for known packages (e.g., from the
-    /// local project or a registry) before a package has been indexed.
-    export suggest-docs-packages: func(provider-name: string) -> result<list<string>, string>;
-
-    /// Indexes the docs for the specified package.
-    export index-docs: func(provider-name: string, package-name: string, database: borrow<key-value-store>) -> result<_, string>;
-}
diff --git a/crates/extension_api/wit/since_v0.1.0/github.wit b/crates/extension_api/wit/since_v0.1.0/github.wit
deleted file mode 100644
index bb138f5d31..0000000000
--- a/crates/extension_api/wit/since_v0.1.0/github.wit
+++ /dev/null
@@ -1,33 +0,0 @@
-interface github {
-    /// A GitHub release.
-    record github-release {
-        /// The version of the release.
-        version: string,
-        /// The list of assets attached to the release.
-        assets: list<github-release-asset>,
-    }
-
-    /// An asset from a GitHub release.
-    record github-release-asset {
-        /// The name of the asset.
-        name: string,
-        /// The download URL for the asset.
-        download-url: string,
-    }
-
-    /// The options used to filter down GitHub releases.
-    record github-release-options {
-        /// Whether releases without assets should be included.
-        require-assets: bool,
-        /// Whether pre-releases should be included.
-        pre-release: bool,
-    }
-
-    /// Returns the latest release for the given GitHub repository.
-    latest-github-release: func(repo: string, options: github-release-options) -> result<github-release, string>;
-
-    /// Returns the GitHub release with the specified tag name for the given GitHub repository.
-    ///
-    /// Returns an error if a release with the given tag name does not exist.
-    github-release-by-tag-name: func(repo: string, tag: string) -> result<github-release, string>;
-}
diff --git a/crates/extension_api/wit/since_v0.1.0/http-client.wit b/crates/extension_api/wit/since_v0.1.0/http-client.wit
deleted file mode 100644
index bb0206c17a..0000000000
--- a/crates/extension_api/wit/since_v0.1.0/http-client.wit
+++ /dev/null
@@ -1,67 +0,0 @@
-interface http-client {
-    /// An HTTP request.
-    record http-request {
-        /// The HTTP method for the request.
-        method: http-method,
-        /// The URL to which the request should be made.
-        url: string,
-        /// The headers for the request.
-        headers: list<tuple<string, string>>,
-        /// The request body.
-        body: option<list<u8>>,
-        /// The policy to use for redirects.
-        redirect-policy: redirect-policy,
-    }
-
-    /// HTTP methods.
-    enum http-method {
-        /// `GET`
-        get,
-        /// `HEAD`
-        head,
-        /// `POST`
-        post,
-        /// `PUT`
-        put,
-        /// `DELETE`
-        delete,
-        /// `OPTIONS`
-        options,
-        /// `PATCH`
-        patch,
-    }
-
-    /// The policy for dealing with redirects received from the server.
-    variant redirect-policy {
-        /// Redirects from the server will not be followed.
-        ///
-        /// This is the default behavior.
-        no-follow,
-        /// Redirects from the server will be followed up to the specified limit.
-        follow-limit(u32),
-        /// All redirects from the server will be followed.
-        follow-all,
-    }
-
-    /// An HTTP response.
-    record http-response {
-        /// The response headers.
-        headers: list<tuple<string, string>>,
-        /// The response body.
-        body: list<u8>,
-    }
-
-    /// Performs an HTTP request and returns the response.
-    fetch: func(req: http-request) -> result<http-response, string>;
-
-    /// An HTTP response stream.
-    resource http-response-stream {
-        /// Retrieves the next chunk of data from the response stream.
-        ///
-        /// Returns `Ok(None)` if the stream has ended.
-        next-chunk: func() -> result<option<list<u8>>, string>;
-    }
-
-    /// Performs an HTTP request and returns a response stream.
-    fetch-stream: func(req: http-request) -> result<http-response-stream, string>;
-}
diff --git a/crates/extension_api/wit/since_v0.1.0/lsp.wit b/crates/extension_api/wit/since_v0.1.0/lsp.wit
deleted file mode 100644
index 19e81b6b14..0000000000
--- a/crates/extension_api/wit/since_v0.1.0/lsp.wit
+++ /dev/null
@@ -1,83 +0,0 @@
-interface lsp {
-    /// An LSP completion.
-    record completion {
-        label: string,
-        detail: option<string>,
-        kind: option<completion-kind>,
-        insert-text-format: option<insert-text-format>,
-    }
-
-    /// The kind of an LSP completion.
-    variant completion-kind {
-        text,
-        method,
-        function,
-        %constructor,
-        field,
-        variable,
-        class,
-        %interface,
-        module,
-        property,
-        unit,
-        value,
-        %enum,
-        keyword,
-        snippet,
-        color,
-        file,
-        reference,
-        folder,
-        enum-member,
-        constant,
-        struct,
-        event,
-        operator,
-        type-parameter,
-        other(s32),
-    }
-
-    /// Defines how to interpret the insert text in a completion item.
-    variant insert-text-format {
-        plain-text,
-        snippet,
-        other(s32),
-    }
-
-    /// An LSP symbol.
-    record symbol {
-        kind: symbol-kind,
-        name: string,
-    }
-
-    /// The kind of an LSP symbol.
-    variant symbol-kind {
-        file,
-        module,
-        namespace,
-        %package,
-        class,
-        method,
-        property,
-        field,
-        %constructor,
-        %enum,
-        %interface,
-        function,
-        variable,
-        constant,
-        %string,
-        number,
-        boolean,
-        array,
-        object,
-        key,
-        null,
-        enum-member,
-        struct,
-        event,
-        operator,
-        type-parameter,
-        other(s32),
-    }
-}
diff --git a/crates/extension_api/wit/since_v0.1.0/nodejs.wit b/crates/extension_api/wit/since_v0.1.0/nodejs.wit
deleted file mode 100644
index c814548314..0000000000
--- a/crates/extension_api/wit/since_v0.1.0/nodejs.wit
+++ /dev/null
@@ -1,13 +0,0 @@
-interface nodejs {
-    /// Returns the path to the Node binary used by Zed.
-    node-binary-path: func() -> result<string, string>;
-
-    /// Returns the latest version of the given NPM package.
-    npm-package-latest-version: func(package-name: string) -> result<string, string>;
-
-    /// Returns the installed version of the given NPM package, if it exists.
-    npm-package-installed-version: func(package-name: string) -> result<option<string>, string>;
-
-    /// Installs the specified NPM package.
-    npm-install-package: func(package-name: string, version: string) -> result<_, string>;
-}
diff --git a/crates/extension_api/wit/since_v0.1.0/platform.wit b/crates/extension_api/wit/since_v0.1.0/platform.wit
deleted file mode 100644
index 48472a99bc..0000000000
--- a/crates/extension_api/wit/since_v0.1.0/platform.wit
+++ /dev/null
@@ -1,24 +0,0 @@
-interface platform {
-    /// An operating system.
-    enum os {
-        /// macOS.
-        mac,
-        /// Linux.
-        linux,
-        /// Windows.
-        windows,
-    }
-
-    /// A platform architecture.
-    enum architecture {
-        /// AArch64 (e.g., Apple Silicon).
-        aarch64,
-        /// x86.
-        x86,
-        /// x86-64.
-        x8664,
-    }
-
-    /// Gets the current operating system and architecture.
-    current-platform: func() -> tuple<os, architecture>;
-}
diff --git a/crates/extension_api/wit/since_v0.1.0/settings.rs b/crates/extension_api/wit/since_v0.1.0/settings.rs
deleted file mode 100644
index 5c6cae7064..0000000000
--- a/crates/extension_api/wit/since_v0.1.0/settings.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-use serde::{Deserialize, Serialize};
-use std::num::NonZeroU32;
-
-/// The settings for a particular language.
-#[derive(Debug, Serialize, Deserialize)]
-pub struct LanguageSettings {
-    /// How many columns a tab should occupy.
-    pub tab_size: NonZeroU32,
-}
-
-/// The settings for a particular language server.
-#[derive(Default, Debug, Serialize, Deserialize)]
-pub struct LspSettings {
-    /// The settings for the language server binary.
-    pub binary: Option<BinarySettings>,
-    /// The initialization options to pass to the language server.
-    pub initialization_options: Option<serde_json::Value>,
-    /// The settings to pass to language server.
-    pub settings: Option<serde_json::Value>,
-}
-
-/// The settings for a language server binary.
-#[derive(Debug, Serialize, Deserialize)]
-pub struct BinarySettings {
-    /// The path to the binary.
-    pub path: Option<String>,
-    /// The arguments to pass to the binary.
-    pub arguments: Option<Vec<String>>,
-}
diff --git a/crates/extension_api/wit/since_v0.1.0/slash-command.wit b/crates/extension_api/wit/since_v0.1.0/slash-command.wit
deleted file mode 100644
index f52561c2ef..0000000000
--- a/crates/extension_api/wit/since_v0.1.0/slash-command.wit
+++ /dev/null
@@ -1,41 +0,0 @@
-interface slash-command {
-    use common.{range};
-
-    /// A slash command for use in the Assistant.
-    record slash-command {
-        /// The name of the slash command.
-        name: string,
-        /// The description of the slash command.
-        description: string,
-        /// The tooltip text to display for the run button.
-        tooltip-text: string,
-        /// Whether this slash command requires an argument.
-        requires-argument: bool,
-    }
-
-    /// The output of a slash command.
-    record slash-command-output {
-        /// The text produced by the slash command.
-        text: string,
-        /// The list of sections to show in the slash command placeholder.
-        sections: list<slash-command-output-section>,
-    }
-
-    /// A section in the slash command output.
-    record slash-command-output-section {
-        /// The range this section occupies.
-        range: range,
-        /// The label to display in the placeholder for this section.
-        label: string,
-    }
-
-    /// A completion for a slash command argument.
-    record slash-command-argument-completion {
-        /// The label to display for this completion.
-        label: string,
-        /// The new text that should be inserted into the command when this completion is accepted.
-        new-text: string,
-        /// Whether the command should be run when accepting this completion.
-        run-command: bool,
-    }
-}
diff --git a/crates/extension_api/wit/since_v0.2.0/common.wit b/crates/extension_api/wit/since_v0.2.0/common.wit
deleted file mode 100644
index c4f321f4c7..0000000000
--- a/crates/extension_api/wit/since_v0.2.0/common.wit
+++ /dev/null
@@ -1,9 +0,0 @@
-interface common {
-    /// A (half-open) range (`[start, end)`).
-    record range {
-        /// The start of the range (inclusive).
-        start: u32,
-        /// The end of the range (exclusive).
-        end: u32,
-    }
-}
diff --git a/crates/extension_api/wit/since_v0.2.0/extension.wit b/crates/extension_api/wit/since_v0.2.0/extension.wit
deleted file mode 100644
index 3e54c5be89..0000000000
--- a/crates/extension_api/wit/since_v0.2.0/extension.wit
+++ /dev/null
@@ -1,156 +0,0 @@
-package zed:extension;
-
-world extension {
-    import github;
-    import http-client;
-    import platform;
-    import nodejs;
-
-    use common.{range};
-    use lsp.{completion, symbol};
-    use slash-command.{slash-command, slash-command-argument-completion, slash-command-output};
-
-    /// Initializes the extension.
-    export init-extension: func();
-
-    /// The type of a downloaded file.
-    enum downloaded-file-type {
-        /// A gzipped file (`.gz`).
-        gzip,
-        /// A gzipped tar archive (`.tar.gz`).
-        gzip-tar,
-        /// A ZIP file (`.zip`).
-        zip,
-        /// An uncompressed file.
-        uncompressed,
-    }
-
-    /// The installation status for a language server.
-    variant language-server-installation-status {
-        /// The language server has no installation status.
-        none,
-        /// The language server is being downloaded.
-        downloading,
-        /// The language server is checking for updates.
-        checking-for-update,
-        /// The language server installation failed for specified reason.
-        failed(string),
-    }
-
-    record settings-location {
-        worktree-id: u64,
-        path: string,
-    }
-
-    import get-settings: func(path: option<settings-location>, category: string, key: option<string>) -> result<string, string>;
-
-    /// Downloads a file from the given URL and saves it to the given path within the extension's
-    /// working directory.
-    ///
-    /// The file will be extracted according to the given file type.
-    import download-file: func(url: string, file-path: string, file-type: downloaded-file-type) -> result<_, string>;
-
-    /// Makes the file at the given path executable.
-    import make-file-executable: func(filepath: string) -> result<_, string>;
-
-    /// Updates the installation status for the given language server.
-    import set-language-server-installation-status: func(language-server-name: string, status: language-server-installation-status);
-
-    /// A list of environment variables.
-    type env-vars = list<tuple<string, string>>;
-
-    /// A command.
-    record command {
-        /// The command to execute.
-        command: string,
-        /// The arguments to pass to the command.
-        args: list<string>,
-        /// The environment variables to set for the command.
-        env: env-vars,
-    }
-
-    /// A Zed worktree.
-    resource worktree {
-        /// Returns the ID of the worktree.
-        id: func() -> u64;
-        /// Returns the root path of the worktree.
-        root-path: func() -> string;
-        /// Returns the textual contents of the specified file in the worktree.
-        read-text-file: func(path: string) -> result<string, string>;
-        /// Returns the path to the given binary name, if one is present on the `$PATH`.
-        which: func(binary-name: string) -> option<string>;
-        /// Returns the current shell environment.
-        shell-env: func() -> env-vars;
-    }
-
-    /// A Zed project.
-    resource project {
-        /// Returns the IDs of all of the worktrees in this project.
-        worktree-ids: func() -> list<u64>;
-    }
-
-    /// A key-value store.
-    resource key-value-store {
-        /// Inserts an entry under the specified key.
-        insert: func(key: string, value: string) -> result<_, string>;
-    }
-
-    /// Returns the command used to start up the language server.
-    export language-server-command: func(language-server-id: string, worktree: borrow<worktree>) -> result<command, string>;
-
-    /// Returns the initialization options to pass to the language server on startup.
-    ///
-    /// The initialization options are represented as a JSON string.
-    export language-server-initialization-options: func(language-server-id: string, worktree: borrow<worktree>) -> result<option<string>, string>;
-
-    /// Returns the workspace configuration options to pass to the language server.
-    export language-server-workspace-configuration: func(language-server-id: string, worktree: borrow<worktree>) -> result<option<string>, string>;
-
-    /// A label containing some code.
-    record code-label {
-        /// The source code to parse with Tree-sitter.
-        code: string,
-        /// The spans to display in the label.
-        spans: list<code-label-span>,
-        /// The range of the displayed label to include when filtering.
-        filter-range: range,
-    }
-
-    /// A span within a code label.
-    variant code-label-span {
-        /// A range into the parsed code.
-        code-range(range),
-        /// A span containing a code literal.
-        literal(code-label-span-literal),
-    }
-
-    /// A span containing a code literal.
-    record code-label-span-literal {
-        /// The literal text.
-        text: string,
-        /// The name of the highlight to use for this literal.
-        highlight-name: option<string>,
-    }
-
-    export labels-for-completions: func(language-server-id: string, completions: list<completion>) -> result<list<option<code-label>>, string>;
-    export labels-for-symbols: func(language-server-id: string, symbols: list<symbol>) -> result<list<option<code-label>>, string>;
-
-    /// Returns the completions that should be shown when completing the provided slash command with the given query.
-    export complete-slash-command-argument: func(command: slash-command, args: list<string>) -> result<list<slash-command-argument-completion>, string>;
-
-    /// Returns the output from running the provided slash command.
-    export run-slash-command: func(command: slash-command, args: list<string>, worktree: option<borrow<worktree>>) -> result<slash-command-output, string>;
-
-    /// Returns the command used to start up a context server.
-    export context-server-command: func(context-server-id: string, project: borrow<project>) -> result<command, string>;
-
-    /// Returns a list of packages as suggestions to be included in the `/docs`
-    /// search results.
-    ///
-    /// This can be used to provide completions for known packages (e.g., from the
-    /// local project or a registry) before a package has been indexed.
-    export suggest-docs-packages: func(provider-name: string) -> result<list<string>, string>;
-
-    /// Indexes the docs for the specified package.
-    export index-docs: func(provider-name: string, package-name: string, database: borrow<key-value-store>) -> result<_, string>;
-}
diff --git a/crates/extension_api/wit/since_v0.2.0/github.wit b/crates/extension_api/wit/since_v0.2.0/github.wit
deleted file mode 100644
index 21cd5d4805..0000000000
--- a/crates/extension_api/wit/since_v0.2.0/github.wit
+++ /dev/null
@@ -1,35 +0,0 @@
-interface github {
-    /// A GitHub release.
-    record github-release {
-        /// The version of the release.
-        version: string,
-        /// The list of assets attached to the release.
-        assets: list<github-release-asset>,
-    }
-
-    /// An asset from a GitHub release.
-    record github-release-asset {
-        /// The name of the asset.
-        name: string,
-        /// The download URL for the asset.
-        download-url: string,
-    }
-
-    /// The options used to filter down GitHub releases.
-    record github-release-options {
-        /// Whether releases without assets should be included.
-        require-assets: bool,
-        /// Whether pre-releases should be included.
-        pre-release: bool,
-    }
-
-    /// Returns the latest release for the given GitHub repository.
-    ///
-    /// Takes repo as a string in the form "<owner-name>/<repo-name>", for example: "zed-industries/zed".
-    latest-github-release: func(repo: string, options: github-release-options) -> result<github-release, string>;
-
-    /// Returns the GitHub release with the specified tag name for the given GitHub repository.
-    ///
-    /// Returns an error if a release with the given tag name does not exist.
-    github-release-by-tag-name: func(repo: string, tag: string) -> result<github-release, string>;
-}
diff --git a/crates/extension_api/wit/since_v0.2.0/http-client.wit b/crates/extension_api/wit/since_v0.2.0/http-client.wit
deleted file mode 100644
index bb0206c17a..0000000000
--- a/crates/extension_api/wit/since_v0.2.0/http-client.wit
+++ /dev/null
@@ -1,67 +0,0 @@
-interface http-client {
-    /// An HTTP request.
-    record http-request {
-        /// The HTTP method for the request.
-        method: http-method,
-        /// The URL to which the request should be made.
-        url: string,
-        /// The headers for the request.
-        headers: list<tuple<string, string>>,
-        /// The request body.
-        body: option<list<u8>>,
-        /// The policy to use for redirects.
-        redirect-policy: redirect-policy,
-    }
-
-    /// HTTP methods.
-    enum http-method {
-        /// `GET`
-        get,
-        /// `HEAD`
-        head,
-        /// `POST`
-        post,
-        /// `PUT`
-        put,
-        /// `DELETE`
-        delete,
-        /// `OPTIONS`
-        options,
-        /// `PATCH`
-        patch,
-    }
-
-    /// The policy for dealing with redirects received from the server.
-    variant redirect-policy {
-        /// Redirects from the server will not be followed.
-        ///
-        /// This is the default behavior.
-        no-follow,
-        /// Redirects from the server will be followed up to the specified limit.
-        follow-limit(u32),
-        /// All redirects from the server will be followed.
-        follow-all,
-    }
-
-    /// An HTTP response.
-    record http-response {
-        /// The response headers.
-        headers: list<tuple<string, string>>,
-        /// The response body.
-        body: list<u8>,
-    }
-
-    /// Performs an HTTP request and returns the response.
-    fetch: func(req: http-request) -> result<http-response, string>;
-
-    /// An HTTP response stream.
-    resource http-response-stream {
-        /// Retrieves the next chunk of data from the response stream.
-        ///
-        /// Returns `Ok(None)` if the stream has ended.
-        next-chunk: func() -> result<option<list<u8>>, string>;
-    }
-
-    /// Performs an HTTP request and returns a response stream.
-    fetch-stream: func(req: http-request) -> result<http-response-stream, string>;
-}
diff --git a/crates/extension_api/wit/since_v0.2.0/lsp.wit b/crates/extension_api/wit/since_v0.2.0/lsp.wit
deleted file mode 100644
index 91a36c93a6..0000000000
--- a/crates/extension_api/wit/since_v0.2.0/lsp.wit
+++ /dev/null
@@ -1,90 +0,0 @@
-interface lsp {
-    /// An LSP completion.
-    record completion {
-        label: string,
-        label-details: option<completion-label-details>,
-        detail: option<string>,
-        kind: option<completion-kind>,
-        insert-text-format: option<insert-text-format>,
-    }
-
-    /// The kind of an LSP completion.
-    variant completion-kind {
-        text,
-        method,
-        function,
-        %constructor,
-        field,
-        variable,
-        class,
-        %interface,
-        module,
-        property,
-        unit,
-        value,
-        %enum,
-        keyword,
-        snippet,
-        color,
-        file,
-        reference,
-        folder,
-        enum-member,
-        constant,
-        struct,
-        event,
-        operator,
-        type-parameter,
-        other(s32),
-    }
-
-    /// Label details for an LSP completion.
-    record completion-label-details {
-        detail: option<string>,
-        description: option<string>,
-    }
-
-    /// Defines how to interpret the insert text in a completion item.
-    variant insert-text-format {
-        plain-text,
-        snippet,
-        other(s32),
-    }
-
-    /// An LSP symbol.
-    record symbol {
-        kind: symbol-kind,
-        name: string,
-    }
-
-    /// The kind of an LSP symbol.
-    variant symbol-kind {
-        file,
-        module,
-        namespace,
-        %package,
-        class,
-        method,
-        property,
-        field,
-        %constructor,
-        %enum,
-        %interface,
-        function,
-        variable,
-        constant,
-        %string,
-        number,
-        boolean,
-        array,
-        object,
-        key,
-        null,
-        enum-member,
-        struct,
-        event,
-        operator,
-        type-parameter,
-        other(s32),
-    }
-}
diff --git a/crates/extension_api/wit/since_v0.2.0/nodejs.wit b/crates/extension_api/wit/since_v0.2.0/nodejs.wit
deleted file mode 100644
index c814548314..0000000000
--- a/crates/extension_api/wit/since_v0.2.0/nodejs.wit
+++ /dev/null
@@ -1,13 +0,0 @@
-interface nodejs {
-    /// Returns the path to the Node binary used by Zed.
-    node-binary-path: func() -> result<string, string>;
-
-    /// Returns the latest version of the given NPM package.
-    npm-package-latest-version: func(package-name: string) -> result<string, string>;
-
-    /// Returns the installed version of the given NPM package, if it exists.
-    npm-package-installed-version: func(package-name: string) -> result<option<string>, string>;
-
-    /// Installs the specified NPM package.
-    npm-install-package: func(package-name: string, version: string) -> result<_, string>;
-}
diff --git a/crates/extension_api/wit/since_v0.2.0/platform.wit b/crates/extension_api/wit/since_v0.2.0/platform.wit
deleted file mode 100644
index 48472a99bc..0000000000
--- a/crates/extension_api/wit/since_v0.2.0/platform.wit
+++ /dev/null
@@ -1,24 +0,0 @@
-interface platform {
-    /// An operating system.
-    enum os {
-        /// macOS.
-        mac,
-        /// Linux.
-        linux,
-        /// Windows.
-        windows,
-    }
-
-    /// A platform architecture.
-    enum architecture {
-        /// AArch64 (e.g., Apple Silicon).
-        aarch64,
-        /// x86.
-        x86,
-        /// x86-64.
-        x8664,
-    }
-
-    /// Gets the current operating system and architecture.
-    current-platform: func() -> tuple<os, architecture>;
-}
diff --git a/crates/extension_api/wit/since_v0.2.0/settings.rs b/crates/extension_api/wit/since_v0.2.0/settings.rs
deleted file mode 100644
index 19e28c1ba9..0000000000
--- a/crates/extension_api/wit/since_v0.2.0/settings.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-use serde::{Deserialize, Serialize};
-use std::{collections::HashMap, num::NonZeroU32};
-
-/// The settings for a particular language.
-#[derive(Debug, Serialize, Deserialize)]
-pub struct LanguageSettings {
-    /// How many columns a tab should occupy.
-    pub tab_size: NonZeroU32,
-}
-
-/// The settings for a particular language server.
-#[derive(Default, Debug, Serialize, Deserialize)]
-pub struct LspSettings {
-    /// The settings for the language server binary.
-    pub binary: Option<CommandSettings>,
-    /// The initialization options to pass to the language server.
-    pub initialization_options: Option<serde_json::Value>,
-    /// The settings to pass to language server.
-    pub settings: Option<serde_json::Value>,
-}
-
-/// The settings for a particular context server.
-#[derive(Default, Debug, Serialize, Deserialize, PartialEq, Eq)]
-pub struct ContextServerSettings {
-    /// The settings for the context server binary.
-    pub command: Option<CommandSettings>,
-    /// The settings to pass to the context server.
-    pub settings: Option<serde_json::Value>,
-}
-
-/// The settings for a command.
-#[derive(Debug, Serialize, Deserialize, PartialEq, Eq)]
-pub struct CommandSettings {
-    /// The path to the command.
-    pub path: Option<String>,
-    /// The arguments to pass to the command.
-    pub arguments: Option<Vec<String>>,
-    /// The environment variables.
-    pub env: Option<HashMap<String, String>>,
-}
diff --git a/crates/extension_api/wit/since_v0.2.0/slash-command.wit b/crates/extension_api/wit/since_v0.2.0/slash-command.wit
deleted file mode 100644
index f52561c2ef..0000000000
--- a/crates/extension_api/wit/since_v0.2.0/slash-command.wit
+++ /dev/null
@@ -1,41 +0,0 @@
-interface slash-command {
-    use common.{range};
-
-    /// A slash command for use in the Assistant.
-    record slash-command {
-        /// The name of the slash command.
-        name: string,
-        /// The description of the slash command.
-        description: string,
-        /// The tooltip text to display for the run button.
-        tooltip-text: string,
-        /// Whether this slash command requires an argument.
-        requires-argument: bool,
-    }
-
-    /// The output of a slash command.
-    record slash-command-output {
-        /// The text produced by the slash command.
-        text: string,
-        /// The list of sections to show in the slash command placeholder.
-        sections: list<slash-command-output-section>,
-    }
-
-    /// A section in the slash command output.
-    record slash-command-output-section {
-        /// The range this section occupies.
-        range: range,
-        /// The label to display in the placeholder for this section.
-        label: string,
-    }
-
-    /// A completion for a slash command argument.
-    record slash-command-argument-completion {
-        /// The label to display for this completion.
-        label: string,
-        /// The new text that should be inserted into the command when this completion is accepted.
-        new-text: string,
-        /// Whether the command should be run when accepting this completion.
-        run-command: bool,
-    }
-}
diff --git a/crates/extension_api/wit/since_v0.3.0/common.wit b/crates/extension_api/wit/since_v0.3.0/common.wit
deleted file mode 100644
index 139e7ba0ca..0000000000
--- a/crates/extension_api/wit/since_v0.3.0/common.wit
+++ /dev/null
@@ -1,12 +0,0 @@
-interface common {
-    /// A (half-open) range (`[start, end)`).
-    record range {
-        /// The start of the range (inclusive).
-        start: u32,
-        /// The end of the range (exclusive).
-        end: u32,
-    }
-
-    /// A list of environment variables.
-    type env-vars = list<tuple<string, string>>;
-}
diff --git a/crates/extension_api/wit/since_v0.3.0/extension.wit b/crates/extension_api/wit/since_v0.3.0/extension.wit
deleted file mode 100644
index 95aaec5469..0000000000
--- a/crates/extension_api/wit/since_v0.3.0/extension.wit
+++ /dev/null
@@ -1,145 +0,0 @@
-package zed:extension;
-
-world extension {
-    import github;
-    import http-client;
-    import platform;
-    import process;
-    import nodejs;
-
-    use common.{env-vars, range};
-    use lsp.{completion, symbol};
-    use process.{command};
-    use slash-command.{slash-command, slash-command-argument-completion, slash-command-output};
-
-    /// Initializes the extension.
-    export init-extension: func();
-
-    /// The type of a downloaded file.
-    enum downloaded-file-type {
-        /// A gzipped file (`.gz`).
-        gzip,
-        /// A gzipped tar archive (`.tar.gz`).
-        gzip-tar,
-        /// A ZIP file (`.zip`).
-        zip,
-        /// An uncompressed file.
-        uncompressed,
-    }
-
-    /// The installation status for a language server.
-    variant language-server-installation-status {
-        /// The language server has no installation status.
-        none,
-        /// The language server is being downloaded.
-        downloading,
-        /// The language server is checking for updates.
-        checking-for-update,
-        /// The language server installation failed for specified reason.
-        failed(string),
-    }
-
-    record settings-location {
-        worktree-id: u64,
-        path: string,
-    }
-
-    import get-settings: func(path: option<settings-location>, category: string, key: option<string>) -> result<string, string>;
-
-    /// Downloads a file from the given URL and saves it to the given path within the extension's
-    /// working directory.
-    ///
-    /// The file will be extracted according to the given file type.
-    import download-file: func(url: string, file-path: string, file-type: downloaded-file-type) -> result<_, string>;
-
-    /// Makes the file at the given path executable.
-    import make-file-executable: func(filepath: string) -> result<_, string>;
-
-    /// Updates the installation status for the given language server.
-    import set-language-server-installation-status: func(language-server-name: string, status: language-server-installation-status);
-
-    /// A Zed worktree.
-    resource worktree {
-        /// Returns the ID of the worktree.
-        id: func() -> u64;
-        /// Returns the root path of the worktree.
-        root-path: func() -> string;
-        /// Returns the textual contents of the specified file in the worktree.
-        read-text-file: func(path: string) -> result<string, string>;
-        /// Returns the path to the given binary name, if one is present on the `$PATH`.
-        which: func(binary-name: string) -> option<string>;
-        /// Returns the current shell environment.
-        shell-env: func() -> env-vars;
-    }
-
-    /// A Zed project.
-    resource project {
-        /// Returns the IDs of all of the worktrees in this project.
-        worktree-ids: func() -> list<u64>;
-    }
-
-    /// A key-value store.
-    resource key-value-store {
-        /// Inserts an entry under the specified key.
-        insert: func(key: string, value: string) -> result<_, string>;
-    }
-
-    /// Returns the command used to start up the language server.
-    export language-server-command: func(language-server-id: string, worktree: borrow<worktree>) -> result<command, string>;
-
-    /// Returns the initialization options to pass to the language server on startup.
-    ///
-    /// The initialization options are represented as a JSON string.
-    export language-server-initialization-options: func(language-server-id: string, worktree: borrow<worktree>) -> result<option<string>, string>;
-
-    /// Returns the workspace configuration options to pass to the language server.
-    export language-server-workspace-configuration: func(language-server-id: string, worktree: borrow<worktree>) -> result<option<string>, string>;
-
-    /// A label containing some code.
-    record code-label {
-        /// The source code to parse with Tree-sitter.
-        code: string,
-        /// The spans to display in the label.
-        spans: list<code-label-span>,
-        /// The range of the displayed label to include when filtering.
-        filter-range: range,
-    }
-
-    /// A span within a code label.
-    variant code-label-span {
-        /// A range into the parsed code.
-        code-range(range),
-        /// A span containing a code literal.
-        literal(code-label-span-literal),
-    }
-
-    /// A span containing a code literal.
-    record code-label-span-literal {
-        /// The literal text.
-        text: string,
-        /// The name of the highlight to use for this literal.
-        highlight-name: option<string>,
-    }
-
-    export labels-for-completions: func(language-server-id: string, completions: list<completion>) -> result<list<option<code-label>>, string>;
-    export labels-for-symbols: func(language-server-id: string, symbols: list<symbol>) -> result<list<option<code-label>>, string>;
-
-    /// Returns the completions that should be shown when completing the provided slash command with the given query.
-    export complete-slash-command-argument: func(command: slash-command, args: list<string>) -> result<list<slash-command-argument-completion>, string>;
-
-    /// Returns the output from running the provided slash command.
-    export run-slash-command: func(command: slash-command, args: list<string>, worktree: option<borrow<worktree>>) -> result<slash-command-output, string>;
-
-    /// Returns the command used to start up a context server.
-    export context-server-command: func(context-server-id: string, project: borrow<project>) -> result<command, string>;
-
-    /// Returns a list of packages as suggestions to be included in the `/docs`
-    /// search results.
-    ///
-    /// This can be used to provide completions for known packages (e.g., from the
-    /// local project or a registry) before a package has been indexed.
-    export suggest-docs-packages: func(provider-name: string) -> result<list<string>, string>;
-
-    /// Indexes the docs for the specified package.
-    export index-docs: func(provider-name: string, package-name: string, database: borrow<key-value-store>) -> result<_, string>;
-}
diff --git a/crates/extension_api/wit/since_v0.3.0/github.wit b/crates/extension_api/wit/since_v0.3.0/github.wit
deleted file mode 100644
index 21cd5d4805..0000000000
--- a/crates/extension_api/wit/since_v0.3.0/github.wit
+++ /dev/null
@@ -1,35 +0,0 @@
-interface github {
-    /// A GitHub release.
-    record github-release {
-        /// The version of the release.
-        version: string,
-        /// The list of assets attached to the release.
-        assets: list<github-release-asset>,
-    }
-
-    /// An asset from a GitHub release.
-    record github-release-asset {
-        /// The name of the asset.
-        name: string,
-        /// The download URL for the asset.
-        download-url: string,
-    }
-
-    /// The options used to filter down GitHub releases.
-    record github-release-options {
-        /// Whether releases without assets should be included.
-        require-assets: bool,
-        /// Whether pre-releases should be included.
-        pre-release: bool,
-    }
-
-    /// Returns the latest release for the given GitHub repository.
-    ///
-    /// Takes repo as a string in the form "<owner-name>/<repo-name>", for example: "zed-industries/zed".
-    latest-github-release: func(repo: string, options: github-release-options) -> result<github-release, string>;
-
-    /// Returns the GitHub release with the specified tag name for the given GitHub repository.
-    ///
-    /// Returns an error if a release with the given tag name does not exist.
-    github-release-by-tag-name: func(repo: string, tag: string) -> result<github-release, string>;
-}
diff --git a/crates/extension_api/wit/since_v0.3.0/http-client.wit b/crates/extension_api/wit/since_v0.3.0/http-client.wit
deleted file mode 100644
index bb0206c17a..0000000000
--- a/crates/extension_api/wit/since_v0.3.0/http-client.wit
+++ /dev/null
@@ -1,67 +0,0 @@
-interface http-client {
-    /// An HTTP request.
-    record http-request {
-        /// The HTTP method for the request.
-        method: http-method,
-        /// The URL to which the request should be made.
-        url: string,
-        /// The headers for the request.
-        headers: list<tuple<string, string>>,
-        /// The request body.
-        body: option<list<u8>>,
-        /// The policy to use for redirects.
-        redirect-policy: redirect-policy,
-    }
-
-    /// HTTP methods.
-    enum http-method {
-        /// `GET`
-        get,
-        /// `HEAD`
-        head,
-        /// `POST`
-        post,
-        /// `PUT`
-        put,
-        /// `DELETE`
-        delete,
-        /// `OPTIONS`
-        options,
-        /// `PATCH`
-        patch,
-    }
-
-    /// The policy for dealing with redirects received from the server.
-    variant redirect-policy {
-        /// Redirects from the server will not be followed.
-        ///
-        /// This is the default behavior.
-        no-follow,
-        /// Redirects from the server will be followed up to the specified limit.
-        follow-limit(u32),
-        /// All redirects from the server will be followed.
-        follow-all,
-    }
-
-    /// An HTTP response.
-    record http-response {
-        /// The response headers.
-        headers: list<tuple<string, string>>,
-        /// The response body.
-        body: list<u8>,
-    }
-
-    /// Performs an HTTP request and returns the response.
-    fetch: func(req: http-request) -> result<http-response, string>;
-
-    /// An HTTP response stream.
-    resource http-response-stream {
-        /// Retrieves the next chunk of data from the response stream.
-        ///
-        /// Returns `Ok(None)` if the stream has ended.
-        next-chunk: func() -> result<option<list<u8>>, string>;
-    }
-
-    /// Performs an HTTP request and returns a response stream.
-    fetch-stream: func(req: http-request) -> result<http-response-stream, string>;
-}
diff --git a/crates/extension_api/wit/since_v0.3.0/lsp.wit b/crates/extension_api/wit/since_v0.3.0/lsp.wit
deleted file mode 100644
index 91a36c93a6..0000000000
--- a/crates/extension_api/wit/since_v0.3.0/lsp.wit
+++ /dev/null
@@ -1,90 +0,0 @@
-interface lsp {
-    /// An LSP completion.
-    record completion {
-        label: string,
-        label-details: option<completion-label-details>,
-        detail: option<string>,
-        kind: option<completion-kind>,
-        insert-text-format: option<insert-text-format>,
-    }
-
-    /// The kind of an LSP completion.
-    variant completion-kind {
-        text,
-        method,
-        function,
-        %constructor,
-        field,
-        variable,
-        class,
-        %interface,
-        module,
-        property,
-        unit,
-        value,
-        %enum,
-        keyword,
-        snippet,
-        color,
-        file,
-        reference,
-        folder,
-        enum-member,
-        constant,
-        struct,
-        event,
-        operator,
-        type-parameter,
-        other(s32),
-    }
-
-    /// Label details for an LSP completion.
-    record completion-label-details {
-        detail: option<string>,
-        description: option<string>,
-    }
-
-    /// Defines how to interpret the insert text in a completion item.
-    variant insert-text-format {
-        plain-text,
-        snippet,
-        other(s32),
-    }
-
-    /// An LSP symbol.
-    record symbol {
-        kind: symbol-kind,
-        name: string,
-    }
-
-    /// The kind of an LSP symbol.
-    variant symbol-kind {
-        file,
-        module,
-        namespace,
-        %package,
-        class,
-        method,
-        property,
-        field,
-        %constructor,
-        %enum,
-        %interface,
-        function,
-        variable,
-        constant,
-        %string,
-        number,
-        boolean,
-        array,
-        object,
-        key,
-        null,
-        enum-member,
-        struct,
-        event,
-        operator,
-        type-parameter,
-        other(s32),
-    }
-}
diff --git a/crates/extension_api/wit/since_v0.3.0/nodejs.wit b/crates/extension_api/wit/since_v0.3.0/nodejs.wit
deleted file mode 100644
index c814548314..0000000000
--- a/crates/extension_api/wit/since_v0.3.0/nodejs.wit
+++ /dev/null
@@ -1,13 +0,0 @@
-interface nodejs {
-    /// Returns the path to the Node binary used by Zed.
-    node-binary-path: func() -> result<string, string>;
-
-    /// Returns the latest version of the given NPM package.
-    npm-package-latest-version: func(package-name: string) -> result<string, string>;
-
-    /// Returns the installed version of the given NPM package, if it exists.
-    npm-package-installed-version: func(package-name: string) -> result<option<string>, string>;
-
-    /// Installs the specified NPM package.
-    npm-install-package: func(package-name: string, version: string) -> result<_, string>;
-}
diff --git a/crates/extension_api/wit/since_v0.3.0/platform.wit b/crates/extension_api/wit/since_v0.3.0/platform.wit
deleted file mode 100644
index 48472a99bc..0000000000
--- a/crates/extension_api/wit/since_v0.3.0/platform.wit
+++ /dev/null
@@ -1,24 +0,0 @@
-interface platform {
-    /// An operating system.
-    enum os {
-        /// macOS.
-        mac,
-        /// Linux.
-        linux,
-        /// Windows.
-        windows,
-    }
-
-    /// A platform architecture.
-    enum architecture {
-        /// AArch64 (e.g., Apple Silicon).
-        aarch64,
-        /// x86.
-        x86,
-        /// x86-64.
-        x8664,
-    }
-
-    /// Gets the current operating system and architecture.
-    current-platform: func() -> tuple<os, architecture>;
-}
diff --git a/crates/extension_api/wit/since_v0.3.0/process.wit b/crates/extension_api/wit/since_v0.3.0/process.wit
deleted file mode 100644
index d9a5728a3d..0000000000
--- a/crates/extension_api/wit/since_v0.3.0/process.wit
+++ /dev/null
@@ -1,29 +0,0 @@
-interface process {
-    use common.{env-vars};
-
-    /// A command.
-    record command {
-        /// The command to execute.
-        command: string,
-        /// The arguments to pass to the command.
-        args: list<string>,
-        /// The environment variables to set for the command.
-        env: env-vars,
-    }
-
-    /// The output of a finished process.
-    record output {
-        /// The status (exit code) of the process.
-        ///
-        /// On Unix, this will be `None` if the process was terminated by a signal.
-        status: option<s32>,
-        /// The data that the process wrote to stdout.
-        stdout: list<u8>,
-        /// The data that the process wrote to stderr.
-        stderr: list<u8>,
-    }
-
-    /// Executes the given command as a child process, waiting for it to finish
-    /// and collecting all of its output.
-    run-command: func(command: command) -> result<output, string>;
-}
diff --git a/crates/extension_api/wit/since_v0.3.0/settings.rs b/crates/extension_api/wit/since_v0.3.0/settings.rs
deleted file mode 100644
index 19e28c1ba9..0000000000
--- a/crates/extension_api/wit/since_v0.3.0/settings.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-use serde::{Deserialize, Serialize};
-use std::{collections::HashMap, num::NonZeroU32};
-
-/// The settings for a particular language.
-#[derive(Debug, Serialize, Deserialize)]
-pub struct LanguageSettings {
-    /// How many columns a tab should occupy.
-    pub tab_size: NonZeroU32,
-}
-
-/// The settings for a particular language server.
-#[derive(Default, Debug, Serialize, Deserialize)]
-pub struct LspSettings {
-    /// The settings for the language server binary.
-    pub binary: Option<CommandSettings>,
-    /// The initialization options to pass to the language server.
-    pub initialization_options: Option<serde_json::Value>,
-    /// The settings to pass to language server.
-    pub settings: Option<serde_json::Value>,
-}
-
-/// The settings for a particular context server.
-#[derive(Default, Debug, Serialize, Deserialize, PartialEq, Eq)]
-pub struct ContextServerSettings {
-    /// The settings for the context server binary.
-    pub command: Option<CommandSettings>,
-    /// The settings to pass to the context server.
-    pub settings: Option<serde_json::Value>,
-}
-
-/// The settings for a command.
-#[derive(Debug, Serialize, Deserialize, PartialEq, Eq)]
-pub struct CommandSettings {
-    /// The path to the command.
-    pub path: Option<String>,
-    /// The arguments to pass to the command.
-    pub arguments: Option<Vec<String>>,
-    /// The environment variables.
-    pub env: Option<HashMap<String, String>>,
-}
diff --git a/crates/extension_api/wit/since_v0.3.0/slash-command.wit b/crates/extension_api/wit/since_v0.3.0/slash-command.wit
deleted file mode 100644
index f52561c2ef..0000000000
--- a/crates/extension_api/wit/since_v0.3.0/slash-command.wit
+++ /dev/null
@@ -1,41 +0,0 @@
-interface slash-command {
-    use common.{range};
-
-    /// A slash command for use in the Assistant.
-    record slash-command {
-        /// The name of the slash command.
-        name: string,
-        /// The description of the slash command.
-        description: string,
-        /// The tooltip text to display for the run button.
-        tooltip-text: string,
-        /// Whether this slash command requires an argument.
-        requires-argument: bool,
-    }
-
-    /// The output of a slash command.
-    record slash-command-output {
-        /// The text produced by the slash command.
-        text: string,
-        /// The list of sections to show in the slash command placeholder.
-        sections: list<slash-command-output-section>,
-    }
-
-    /// A section in the slash command output.
-    record slash-command-output-section {
-        /// The range this section occupies.
-        range: range,
-        /// The label to display in the placeholder for this section.
-        label: string,
-    }
-
-    /// A completion for a slash command argument.
-    record slash-command-argument-completion {
-        /// The label to display for this completion.
-        label: string,
-        /// The new text that should be inserted into the command when this completion is accepted.
-        new-text: string,
-        /// Whether the command should be run when accepting this completion.
-        run-command: bool,
-    }
-}
diff --git a/crates/extension_api/wit/since_v0.4.0/common.wit b/crates/extension_api/wit/since_v0.4.0/common.wit
deleted file mode 100644
index 139e7ba0ca..0000000000
--- a/crates/extension_api/wit/since_v0.4.0/common.wit
+++ /dev/null
@@ -1,12 +0,0 @@
-interface common {
-    /// A (half-open) range (`[start, end)`).
-    record range {
-        /// The start of the range (inclusive).
-        start: u32,
-        /// The end of the range (exclusive).
-        end: u32,
-    }
-
-    /// A list of environment variables.
-    type env-vars = list<tuple<string, string>>;
-}
diff --git a/crates/extension_api/wit/since_v0.4.0/extension.wit b/crates/extension_api/wit/since_v0.4.0/extension.wit
deleted file mode 100644
index 3caf8b60b7..0000000000
--- a/crates/extension_api/wit/since_v0.4.0/extension.wit
+++ /dev/null
@@ -1,151 +0,0 @@
-package zed:extension;
-
-world extension {
-    import github;
-    import http-client;
-    import platform;
-    import process;
-    import nodejs;
-
-    use common.{env-vars, range};
-    use lsp.{completion, symbol};
-    use process.{command};
-    use slash-command.{slash-command, slash-command-argument-completion, slash-command-output};
-
-    /// Initializes the extension.
-    export init-extension: func();
-
-    /// The type of a downloaded file.
-    enum downloaded-file-type {
-        /// A gzipped file (`.gz`).
-        gzip,
-        /// A gzipped tar archive (`.tar.gz`).
-        gzip-tar,
-        /// A ZIP file (`.zip`).
-        zip,
-        /// An uncompressed file.
-        uncompressed,
-    }
-
-    /// The installation status for a language server.
-    variant language-server-installation-status {
-        /// The language server has no installation status.
-        none,
-        /// The language server is being downloaded.
-        downloading,
-        /// The language server is checking for updates.
-        checking-for-update,
-        /// The language server installation failed for specified reason.
-        failed(string),
-    }
-
-    record settings-location {
-        worktree-id: u64,
-        path: string,
-    }
-
-    import get-settings: func(path: option<settings-location>, category: string, key: option<string>) -> result<string, string>;
-
-    /// Downloads a file from the given URL and saves it to the given path within the extension's
-    /// working directory.
-    ///
-    /// The file will be extracted according to the given file type.
-    import download-file: func(url: string, file-path: string, file-type: downloaded-file-type) -> result<_, string>;
-
-    /// Makes the file at the given path executable.
-    import make-file-executable: func(filepath: string) -> result<_, string>;
-
-    /// Updates the installation status for the given language server.
-    import set-language-server-installation-status: func(language-server-name: string, status: language-server-installation-status);
-
-    /// A Zed worktree.
-    resource worktree {
-        /// Returns the ID of the worktree.
-        id: func() -> u64;
-        /// Returns the root path of the worktree.
-        root-path: func() -> string;
-        /// Returns the textual contents of the specified file in the worktree.
-        read-text-file: func(path: string) -> result<string, string>;
-        /// Returns the path to the given binary name, if one is present on the `$PATH`.
-        which: func(binary-name: string) -> option<string>;
-        /// Returns the current shell environment.
-        shell-env: func() -> env-vars;
-    }
-
-    /// A Zed project.
-    resource project {
-        /// Returns the IDs of all of the worktrees in this project.
-        worktree-ids: func() -> list<u64>;
-    }
-
-    /// A key-value store.
-    resource key-value-store {
-        /// Inserts an entry under the specified key.
-        insert: func(key: string, value: string) -> result<_, string>;
-    }
-
-    /// Returns the command used to start up the language server.
-    export language-server-command: func(language-server-id: string, worktree: borrow<worktree>) -> result<command, string>;
-
-    /// Returns the initialization options to pass to the language server on startup.
-    ///
-    /// The initialization options are represented as a JSON string.
-    export language-server-initialization-options: func(language-server-id: string, worktree: borrow<worktree>) -> result<option<string>, string>;
-
-    /// Returns the workspace configuration options to pass to the language server.
-    export language-server-workspace-configuration: func(language-server-id: string, worktree: borrow<worktree>) -> result<option<string>, string>;
-
-    /// Returns the initialization options to pass to the other language server.
-    export language-server-additional-initialization-options: func(language-server-id: string, target-language-server-id: string, worktree: borrow<worktree>) -> result<option<string>, string>;
-
-    /// Returns the workspace configuration options to pass to the other language server.
-    export language-server-additional-workspace-configuration: func(language-server-id: string, target-language-server-id: string, worktree: borrow<worktree>) -> result<option<string>, string>;
-
-    /// A label containing some code.
-    record code-label {
-        /// The source code to parse with Tree-sitter.
-        code: string,
-        /// The spans to display in the label.
-        spans: list<code-label-span>,
-        /// The range of the displayed label to include when filtering.
-        filter-range: range,
-    }
-
-    /// A span within a code label.
-    variant code-label-span {
-        /// A range into the parsed code.
-        code-range(range),
-        /// A span containing a code literal.
-        literal(code-label-span-literal),
-    }
-
-    /// A span containing a code literal.
-    record code-label-span-literal {
-        /// The literal text.
-        text: string,
-        /// The name of the highlight to use for this literal.
-        highlight-name: option<string>,
-    }
-
-    export labels-for-completions: func(language-server-id: string, completions: list<completion>) -> result<list<option<code-label>>, string>;
-    export labels-for-symbols: func(language-server-id: string, symbols: list<symbol>) -> result<list<option<code-label>>, string>;
-
-    /// Returns the completions that should be shown when completing the provided slash command with the given query.
-    export complete-slash-command-argument: func(command: slash-command, args: list<string>) -> result<list<slash-command-argument-completion>, string>;
-
-    /// Returns the output from running the provided slash command.
-    export run-slash-command: func(command: slash-command, args: list<string>, worktree: option<borrow<worktree>>) -> result<slash-command-output, string>;
-
-    /// Returns the command used to start up a context server.
-    export context-server-command: func(context-server-id: string, project: borrow<project>) -> result<command, string>;
-
-    /// Returns a list of packages as suggestions to be included in the `/docs`
-    /// search results.
-    ///
-    /// This can be used to provide completions for known packages (e.g., from the
-    /// local project or a registry) before a package has been indexed.
-    export suggest-docs-packages: func(provider-name: string) -> result<list<string>, string>;
-
-    /// Indexes the docs for the specified package.
-    export index-docs: func(provider-name: string, package-name: string, database: borrow<key-value-store>) -> result<_, string>;
-}
diff --git a/crates/extension_api/wit/since_v0.4.0/github.wit b/crates/extension_api/wit/since_v0.4.0/github.wit
deleted file mode 100644
index 21cd5d4805..0000000000
--- a/crates/extension_api/wit/since_v0.4.0/github.wit
+++ /dev/null
@@ -1,35 +0,0 @@
-interface github {
-    /// A GitHub release.
-    record github-release {
-        /// The version of the release.
-        version: string,
-        /// The list of assets attached to the release.
-        assets: list<github-release-asset>,
-    }
-
-    /// An asset from a GitHub release.
-    record github-release-asset {
-        /// The name of the asset.
-        name: string,
-        /// The download URL for the asset.
-        download-url: string,
-    }
-
-    /// The options used to filter down GitHub releases.
-    record github-release-options {
-        /// Whether releases without assets should be included.
-        require-assets: bool,
-        /// Whether pre-releases should be included.
-        pre-release: bool,
-    }
-
-    /// Returns the latest release for the given GitHub repository.
-    ///
-    /// Takes repo as a string in the form "<owner-name>/<repo-name>", for example: "zed-industries/zed".
-    latest-github-release: func(repo: string, options: github-release-options) -> result<github-release, string>;
-
-    /// Returns the GitHub release with the specified tag name for the given GitHub repository.
-    ///
-    /// Returns an error if a release with the given tag name does not exist.
-    github-release-by-tag-name: func(repo: string, tag: string) -> result<github-release, string>;
-}
diff --git a/crates/extension_api/wit/since_v0.4.0/http-client.wit b/crates/extension_api/wit/since_v0.4.0/http-client.wit
deleted file mode 100644
index bb0206c17a..0000000000
--- a/crates/extension_api/wit/since_v0.4.0/http-client.wit
+++ /dev/null
@@ -1,67 +0,0 @@
-interface http-client {
-    /// An HTTP request.
-    record http-request {
-        /// The HTTP method for the request.
-        method: http-method,
-        /// The URL to which the request should be made.
-        url: string,
-        /// The headers for the request.
-        headers: list<tuple<string, string>>,
-        /// The request body.
-        body: option<list<u8>>,
-        /// The policy to use for redirects.
-        redirect-policy: redirect-policy,
-    }
-
-    /// HTTP methods.
-    enum http-method {
-        /// `GET`
-        get,
-        /// `HEAD`
-        head,
-        /// `POST`
-        post,
-        /// `PUT`
-        put,
-        /// `DELETE`
-        delete,
-        /// `OPTIONS`
-        options,
-        /// `PATCH`
-        patch,
-    }
-
-    /// The policy for dealing with redirects received from the server.
-    variant redirect-policy {
-        /// Redirects from the server will not be followed.
-        ///
-        /// This is the default behavior.
-        no-follow,
-        /// Redirects from the server will be followed up to the specified limit.
-        follow-limit(u32),
-        /// All redirects from the server will be followed.
-        follow-all,
-    }
-
-    /// An HTTP response.
-    record http-response {
-        /// The response headers.
-        headers: list<tuple<string, string>>,
-        /// The response body.
-        body: list<u8>,
-    }
-
-    /// Performs an HTTP request and returns the response.
-    fetch: func(req: http-request) -> result<http-response, string>;
-
-    /// An HTTP response stream.
-    resource http-response-stream {
-        /// Retrieves the next chunk of data from the response stream.
-        ///
-        /// Returns `Ok(None)` if the stream has ended.
-        next-chunk: func() -> result<option<list<u8>>, string>;
-    }
-
-    /// Performs an HTTP request and returns a response stream.
-    fetch-stream: func(req: http-request) -> result<http-response-stream, string>;
-}
diff --git a/crates/extension_api/wit/since_v0.4.0/lsp.wit b/crates/extension_api/wit/since_v0.4.0/lsp.wit
deleted file mode 100644
index 91a36c93a6..0000000000
--- a/crates/extension_api/wit/since_v0.4.0/lsp.wit
+++ /dev/null
@@ -1,90 +0,0 @@
-interface lsp {
-    /// An LSP completion.
-    record completion {
-        label: string,
-        label-details: option<completion-label-details>,
-        detail: option<string>,
-        kind: option<completion-kind>,
-        insert-text-format: option<insert-text-format>,
-    }
-
-    /// The kind of an LSP completion.
-    variant completion-kind {
-        text,
-        method,
-        function,
-        %constructor,
-        field,
-        variable,
-        class,
-        %interface,
-        module,
-        property,
-        unit,
-        value,
-        %enum,
-        keyword,
-        snippet,
-        color,
-        file,
-        reference,
-        folder,
-        enum-member,
-        constant,
-        struct,
-        event,
-        operator,
-        type-parameter,
-        other(s32),
-    }
-
-    /// Label details for an LSP completion.
-    record completion-label-details {
-        detail: option<string>,
-        description: option<string>,
-    }
-
-    /// Defines how to interpret the insert text in a completion item.
-    variant insert-text-format {
-        plain-text,
-        snippet,
-        other(s32),
-    }
-
-    /// An LSP symbol.
-    record symbol {
-        kind: symbol-kind,
-        name: string,
-    }
-
-    /// The kind of an LSP symbol.
-    variant symbol-kind {
-        file,
-        module,
-        namespace,
-        %package,
-        class,
-        method,
-        property,
-        field,
-        %constructor,
-        %enum,
-        %interface,
-        function,
-        variable,
-        constant,
-        %string,
-        number,
-        boolean,
-        array,
-        object,
-        key,
-        null,
-        enum-member,
-        struct,
-        event,
-        operator,
-        type-parameter,
-        other(s32),
-    }
-}
diff --git a/crates/extension_api/wit/since_v0.4.0/nodejs.wit b/crates/extension_api/wit/since_v0.4.0/nodejs.wit
deleted file mode 100644
index c814548314..0000000000
--- a/crates/extension_api/wit/since_v0.4.0/nodejs.wit
+++ /dev/null
@@ -1,13 +0,0 @@
-interface nodejs {
-    /// Returns the path to the Node binary used by Zed.
-    node-binary-path: func() -> result<string, string>;
-
-    /// Returns the latest version of the given NPM package.
-    npm-package-latest-version: func(package-name: string) -> result<string, string>;
-
-    /// Returns the installed version of the given NPM package, if it exists.
-    npm-package-installed-version: func(package-name: string) -> result<option<string>, string>;
-
-    /// Installs the specified NPM package.
-    npm-install-package: func(package-name: string, version: string) -> result<_, string>;
-}
diff --git a/crates/extension_api/wit/since_v0.4.0/platform.wit b/crates/extension_api/wit/since_v0.4.0/platform.wit
deleted file mode 100644
index 48472a99bc..0000000000
--- a/crates/extension_api/wit/since_v0.4.0/platform.wit
+++ /dev/null
@@ -1,24 +0,0 @@
-interface platform {
-    /// An operating system.
-    enum os {
-        /// macOS.
-        mac,
-        /// Linux.
-        linux,
-        /// Windows.
-        windows,
-    }
-
-    /// A platform architecture.
-    enum architecture {
-        /// AArch64 (e.g., Apple Silicon).
-        aarch64,
-        /// x86.
-        x86,
-        /// x86-64.
-        x8664,
-    }
-
-    /// Gets the current operating system and architecture.
-    current-platform: func() -> tuple<os, architecture>;
-}
diff --git a/crates/extension_api/wit/since_v0.4.0/process.wit b/crates/extension_api/wit/since_v0.4.0/process.wit
deleted file mode 100644
index d9a5728a3d..0000000000
--- a/crates/extension_api/wit/since_v0.4.0/process.wit
+++ /dev/null
@@ -1,29 +0,0 @@
-interface process {
-    use common.{env-vars};
-
-    /// A command.
-    record command {
-        /// The command to execute.
-        command: string,
-        /// The arguments to pass to the command.
-        args: list<string>,
-        /// The environment variables to set for the command.
-        env: env-vars,
-    }
-
-    /// The output of a finished process.
-    record output {
-        /// The status (exit code) of the process.
-        ///
-        /// On Unix, this will be `None` if the process was terminated by a signal.
-        status: option<s32>,
-        /// The data that the process wrote to stdout.
-        stdout: list<u8>,
-        /// The data that the process wrote to stderr.
-        stderr: list<u8>,
-    }
-
-    /// Executes the given command as a child process, waiting for it to finish
-    /// and collecting all of its output.
-    run-command: func(command: command) -> result<output, string>;
-}
diff --git a/crates/extension_api/wit/since_v0.4.0/settings.rs b/crates/extension_api/wit/since_v0.4.0/settings.rs
deleted file mode 100644
index 19e28c1ba9..0000000000
--- a/crates/extension_api/wit/since_v0.4.0/settings.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-use serde::{Deserialize, Serialize};
-use std::{collections::HashMap, num::NonZeroU32};
-
-/// The settings for a particular language.
-#[derive(Debug, Serialize, Deserialize)]
-pub struct LanguageSettings {
-    /// How many columns a tab should occupy.
-    pub tab_size: NonZeroU32,
-}
-
-/// The settings for a particular language server.
-#[derive(Default, Debug, Serialize, Deserialize)]
-pub struct LspSettings {
-    /// The settings for the language server binary.
-    pub binary: Option<CommandSettings>,
-    /// The initialization options to pass to the language server.
-    pub initialization_options: Option<serde_json::Value>,
-    /// The settings to pass to language server.
-    pub settings: Option<serde_json::Value>,
-}
-
-/// The settings for a particular context server.
-#[derive(Default, Debug, Serialize, Deserialize, PartialEq, Eq)]
-pub struct ContextServerSettings {
-    /// The settings for the context server binary.
-    pub command: Option<CommandSettings>,
-    /// The settings to pass to the context server.
-    pub settings: Option<serde_json::Value>,
-}
-
-/// The settings for a command.
-#[derive(Debug, Serialize, Deserialize, PartialEq, Eq)]
-pub struct CommandSettings {
-    /// The path to the command.
-    pub path: Option<String>,
-    /// The arguments to pass to the command.
-    pub arguments: Option<Vec<String>>,
-    /// The environment variables.
-    pub env: Option<HashMap<String, String>>,
-}
diff --git a/crates/extension_api/wit/since_v0.4.0/slash-command.wit b/crates/extension_api/wit/since_v0.4.0/slash-command.wit
deleted file mode 100644
index f52561c2ef..0000000000
--- a/crates/extension_api/wit/since_v0.4.0/slash-command.wit
+++ /dev/null
@@ -1,41 +0,0 @@
-interface slash-command {
-    use common.{range};
-
-    /// A slash command for use in the Assistant.
-    record slash-command {
-        /// The name of the slash command.
-        name: string,
-        /// The description of the slash command.
-        description: string,
-        /// The tooltip text to display for the run button.
-        tooltip-text: string,
-        /// Whether this slash command requires an argument.
-        requires-argument: bool,
-    }
-
-    /// The output of a slash command.
-    record slash-command-output {
-        /// The text produced by the slash command.
-        text: string,
-        /// The list of sections to show in the slash command placeholder.
-        sections: list<slash-command-output-section>,
-    }
-
-    /// A section in the slash command output.
-    record slash-command-output-section {
-        /// The range this section occupies.
-        range: range,
-        /// The label to display in the placeholder for this section.
-        label: string,
-    }
-
-    /// A completion for a slash command argument.
-    record slash-command-argument-completion {
-        /// The label to display for this completion.
-        label: string,
-        /// The new text that should be inserted into the command when this completion is accepted.
-        new-text: string,
-        /// Whether the command should be run when accepting this completion.
-        run-command: bool,
-    }
-}
diff --git a/crates/extension_api/wit/since_v0.5.0/common.wit b/crates/extension_api/wit/since_v0.5.0/common.wit
deleted file mode 100644
index 139e7ba0ca..0000000000
--- a/crates/extension_api/wit/since_v0.5.0/common.wit
+++ /dev/null
@@ -1,12 +0,0 @@
-interface common {
-    /// A (half-open) range (`[start, end)`).
-    record range {
-        /// The start of the range (inclusive).
-        start: u32,
-        /// The end of the range (exclusive).
-        end: u32,
-    }
-
-    /// A list of environment variables.
-    type env-vars = list<tuple<string, string>>;
-}
diff --git a/crates/extension_api/wit/since_v0.5.0/context-server.wit b/crates/extension_api/wit/since_v0.5.0/context-server.wit
deleted file mode 100644
index 7234e0e6d0..0000000000
--- a/crates/extension_api/wit/since_v0.5.0/context-server.wit
+++ /dev/null
@@ -1,11 +0,0 @@
-interface context-server {
-    /// Configuration for context server setup and installation.
-    record context-server-configuration {
-        /// Installation instructions in Markdown format.
-        installation-instructions: string,
-        /// JSON schema for settings validation.
-        settings-schema: string,
-        /// Default settings template.
-        default-settings: string,
-    }
-}
diff --git a/crates/extension_api/wit/since_v0.5.0/extension.wit b/crates/extension_api/wit/since_v0.5.0/extension.wit
deleted file mode 100644
index f21cc1bf21..0000000000
--- a/crates/extension_api/wit/since_v0.5.0/extension.wit
+++ /dev/null
@@ -1,156 +0,0 @@
-package zed:extension;
-
-world extension {
-    import context-server;
-    import github;
-    import http-client;
-    import platform;
-    import process;
-    import nodejs;
-
-    use common.{env-vars, range};
-    use context-server.{context-server-configuration};
-    use lsp.{completion, symbol};
-    use process.{command};
-    use slash-command.{slash-command, slash-command-argument-completion, slash-command-output};
-
-    /// Initializes the extension.
-    export init-extension: func();
-
-    /// The type of a downloaded file.
-    enum downloaded-file-type {
-        /// A gzipped file (`.gz`).
-        gzip,
-        /// A gzipped tar archive (`.tar.gz`).
-        gzip-tar,
-        /// A ZIP file (`.zip`).
-        zip,
-        /// An uncompressed file.
-        uncompressed,
-    }
-
-    /// The installation status for a language server.
-    variant language-server-installation-status {
-        /// The language server has no installation status.
-        none,
-        /// The language server is being downloaded.
-        downloading,
-        /// The language server is checking for updates.
-        checking-for-update,
-        /// The language server installation failed for specified reason.
-        failed(string),
-    }
-
-    record settings-location {
-        worktree-id: u64,
-        path: string,
-    }
-
-    import get-settings: func(path: option<settings-location>, category: string, key: option<string>) -> result<string, string>;
-
-    /// Downloads a file from the given URL and saves it to the given path within the extension's
-    /// working directory.
-    ///
-    /// The file will be extracted according to the given file type.
-    import download-file: func(url: string, file-path: string, file-type: downloaded-file-type) -> result<_, string>;
-
-    /// Makes the file at the given path executable.
-    import make-file-executable: func(filepath: string) -> result<_, string>;
-
-    /// Updates the installation status for the given language server.
-    import set-language-server-installation-status: func(language-server-name: string, status: language-server-installation-status);
-
-    /// A Zed worktree.
-    resource worktree {
-        /// Returns the ID of the worktree.
-        id: func() -> u64;
-        /// Returns the root path of the worktree.
-        root-path: func() -> string;
-        /// Returns the textual contents of the specified file in the worktree.
-        read-text-file: func(path: string) -> result<string, string>;
-        /// Returns the path to the given binary name, if one is present on the `$PATH`.
-        which: func(binary-name: string) -> option<string>;
-        /// Returns the current shell environment.
-        shell-env: func() -> env-vars;
-    }
-
-    /// A Zed project.
-    resource project {
-        /// Returns the IDs of all of the worktrees in this project.
-        worktree-ids: func() -> list<u64>;
-    }
-
-    /// A key-value store.
-    resource key-value-store {
-        /// Inserts an entry under the specified key.
-        insert: func(key: string, value: string) -> result<_, string>;
-    }
-
-    /// Returns the command used to start up the language server.
-    export language-server-command: func(language-server-id: string, worktree: borrow<worktree>) -> result<command, string>;
-
-    /// Returns the initialization options to pass to the language server on startup.
-    ///
-    /// The initialization options are represented as a JSON string.
-    export language-server-initialization-options: func(language-server-id: string, worktree: borrow<worktree>) -> result<option<string>, string>;
-
-    /// Returns the workspace configuration options to pass to the language server.
-    export language-server-workspace-configuration: func(language-server-id: string, worktree: borrow<worktree>) -> result<option<string>, string>;
-
-    /// Returns the initialization options to pass to the other language server.
-    export language-server-additional-initialization-options: func(language-server-id: string, target-language-server-id: string, worktree: borrow<worktree>) -> result<option<string>, string>;
-
-    /// Returns the workspace configuration options to pass to the other language server.
-    export language-server-additional-workspace-configuration: func(language-server-id: string, target-language-server-id: string, worktree: borrow<worktree>) -> result<option<string>, string>;
-
-    /// A label containing some code.
-    record code-label {
-        /// The source code to parse with Tree-sitter.
-        code: string,
-        /// The spans to display in the label.
-        spans: list<code-label-span>,
-        /// The range of the displayed label to include when filtering.
-        filter-range: range,
-    }
-
-    /// A span within a code label.
-    variant code-label-span {
-        /// A range into the parsed code.
-        code-range(range),
-        /// A span containing a code literal.
-        literal(code-label-span-literal),
-    }
-
-    /// A span containing a code literal.
-    record code-label-span-literal {
-        /// The literal text.
-        text: string,
-        /// The name of the highlight to use for this literal.
-        highlight-name: option<string>,
-    }
-
-    export labels-for-completions: func(language-server-id: string, completions: list<completion>) -> result<list<option<code-label>>, string>;
-    export labels-for-symbols: func(language-server-id: string, symbols: list<symbol>) -> result<list<option<code-label>>, string>;
-
-    /// Returns the completions that should be shown when completing the provided slash command with the given query.
-    export complete-slash-command-argument: func(command: slash-command, args: list<string>) -> result<list<slash-command-argument-completion>, string>;
-
-    /// Returns the output from running the provided slash command.
-    export run-slash-command: func(command: slash-command, args: list<string>, worktree: option<borrow<worktree>>) -> result<slash-command-output, string>;
-
-    /// Returns the command used to start up a context server.
-    export context-server-command: func(context-server-id: string, project: borrow<project>) -> result<command, string>;
-
-    /// Returns the configuration for a context server.
-    export context-server-configuration: func(context-server-id: string, project: borrow<project>) -> result<option<context-server-configuration>, string>;
-
-    /// Returns a list of packages as suggestions to be included in the `/docs`
-    /// search results.
-    ///
-    /// This can be used to provide completions for known packages (e.g., from the
-    /// local project or a registry) before a package has been indexed.
-    export suggest-docs-packages: func(provider-name: string) -> result<list<string>, string>;
-
-    /// Indexes the docs for the specified package.
-    export index-docs: func(provider-name: string, package-name: string, database: borrow<key-value-store>) -> result<_, string>;
-}
diff --git a/crates/extension_api/wit/since_v0.5.0/github.wit b/crates/extension_api/wit/since_v0.5.0/github.wit
deleted file mode 100644
index 21cd5d4805..0000000000
--- a/crates/extension_api/wit/since_v0.5.0/github.wit
+++ /dev/null
@@ -1,35 +0,0 @@
-interface github {
-    /// A GitHub release.
-    record github-release {
-        /// The version of the release.
-        version: string,
-        /// The list of assets attached to the release.
-        assets: list<github-release-asset>,
-    }
-
-    /// An asset from a GitHub release.
-    record github-release-asset {
-        /// The name of the asset.
-        name: string,
-        /// The download URL for the asset.
-        download-url: string,
-    }
-
-    /// The options used to filter down GitHub releases.
-    record github-release-options {
-        /// Whether releases without assets should be included.
-        require-assets: bool,
-        /// Whether pre-releases should be included.
-        pre-release: bool,
-    }
-
-    /// Returns the latest release for the given GitHub repository.
-    ///
-    /// Takes repo as a string in the form "<owner-name>/<repo-name>", for example: "zed-industries/zed".
-    latest-github-release: func(repo: string, options: github-release-options) -> result<github-release, string>;
-
-    /// Returns the GitHub release with the specified tag name for the given GitHub repository.
-    ///
-    /// Returns an error if a release with the given tag name does not exist.
-    github-release-by-tag-name: func(repo: string, tag: string) -> result<github-release, string>;
-}
diff --git a/crates/extension_api/wit/since_v0.5.0/http-client.wit b/crates/extension_api/wit/since_v0.5.0/http-client.wit
deleted file mode 100644
index bb0206c17a..0000000000
--- a/crates/extension_api/wit/since_v0.5.0/http-client.wit
+++ /dev/null
@@ -1,67 +0,0 @@
-interface http-client {
-    /// An HTTP request.
-    record http-request {
-        /// The HTTP method for the request.
-        method: http-method,
-        /// The URL to which the request should be made.
-        url: string,
-        /// The headers for the request.
-        headers: list<tuple<string, string>>,
-        /// The request body.
-        body: option<list<u8>>,
-        /// The policy to use for redirects.
-        redirect-policy: redirect-policy,
-    }
-
-    /// HTTP methods.
-    enum http-method {
-        /// `GET`
-        get,
-        /// `HEAD`
-        head,
-        /// `POST`
-        post,
-        /// `PUT`
-        put,
-        /// `DELETE`
-        delete,
-        /// `OPTIONS`
-        options,
-        /// `PATCH`
-        patch,
-    }
-
-    /// The policy for dealing with redirects received from the server.
-    variant redirect-policy {
-        /// Redirects from the server will not be followed.
-        ///
-        /// This is the default behavior.
-        no-follow,
-        /// Redirects from the server will be followed up to the specified limit.
-        follow-limit(u32),
-        /// All redirects from the server will be followed.
-        follow-all,
-    }
-
-    /// An HTTP response.
-    record http-response {
-        /// The response headers.
-        headers: list<tuple<string, string>>,
-        /// The response body.
-        body: list<u8>,
-    }
-
-    /// Performs an HTTP request and returns the response.
-    fetch: func(req: http-request) -> result<http-response, string>;
-
-    /// An HTTP response stream.
-    resource http-response-stream {
-        /// Retrieves the next chunk of data from the response stream.
-        ///
-        /// Returns `Ok(None)` if the stream has ended.
-        next-chunk: func() -> result<option<list<u8>>, string>;
-    }
-
-    /// Performs an HTTP request and returns a response stream.
-    fetch-stream: func(req: http-request) -> result<http-response-stream, string>;
-}
diff --git a/crates/extension_api/wit/since_v0.5.0/lsp.wit b/crates/extension_api/wit/since_v0.5.0/lsp.wit
deleted file mode 100644
index 91a36c93a6..0000000000
--- a/crates/extension_api/wit/since_v0.5.0/lsp.wit
+++ /dev/null
@@ -1,90 +0,0 @@
-interface lsp {
-    /// An LSP completion.
-    record completion {
-        label: string,
-        label-details: option<completion-label-details>,
-        detail: option<string>,
-        kind: option<completion-kind>,
-        insert-text-format: option<insert-text-format>,
-    }
-
-    /// The kind of an LSP completion.
-    variant completion-kind {
-        text,
-        method,
-        function,
-        %constructor,
-        field,
-        variable,
-        class,
-        %interface,
-        module,
-        property,
-        unit,
-        value,
-        %enum,
-        keyword,
-        snippet,
-        color,
-        file,
-        reference,
-        folder,
-        enum-member,
-        constant,
-        struct,
-        event,
-        operator,
-        type-parameter,
-        other(s32),
-    }
-
-    /// Label details for an LSP completion.
-    record completion-label-details {
-        detail: option<string>,
-        description: option<string>,
-    }
-
-    /// Defines how to interpret the insert text in a completion item.
-    variant insert-text-format {
-        plain-text,
-        snippet,
-        other(s32),
-    }
-
-    /// An LSP symbol.
-    record symbol {
-        kind: symbol-kind,
-        name: string,
-    }
-
-    /// The kind of an LSP symbol.
-    variant symbol-kind {
-        file,
-        module,
-        namespace,
-        %package,
-        class,
-        method,
-        property,
-        field,
-        %constructor,
-        %enum,
-        %interface,
-        function,
-        variable,
-        constant,
-        %string,
-        number,
-        boolean,
-        array,
-        object,
-        key,
-        null,
-        enum-member,
-        struct,
-        event,
-        operator,
-        type-parameter,
-        other(s32),
-    }
-}
diff --git a/crates/extension_api/wit/since_v0.5.0/nodejs.wit b/crates/extension_api/wit/since_v0.5.0/nodejs.wit
deleted file mode 100644
index c814548314..0000000000
--- a/crates/extension_api/wit/since_v0.5.0/nodejs.wit
+++ /dev/null
@@ -1,13 +0,0 @@
-interface nodejs {
-    /// Returns the path to the Node binary used by Zed.
-    node-binary-path: func() -> result<string, string>;
-
-    /// Returns the latest version of the given NPM package.
-    npm-package-latest-version: func(package-name: string) -> result<string, string>;
-
-    /// Returns the installed version of the given NPM package, if it exists.
-    npm-package-installed-version: func(package-name: string) -> result<option<string>, string>;
-
-    /// Installs the specified NPM package.
-    npm-install-package: func(package-name: string, version: string) -> result<_, string>;
-}
diff --git a/crates/extension_api/wit/since_v0.5.0/platform.wit b/crates/extension_api/wit/since_v0.5.0/platform.wit
deleted file mode 100644
index 48472a99bc..0000000000
--- a/crates/extension_api/wit/since_v0.5.0/platform.wit
+++ /dev/null
@@ -1,24 +0,0 @@
-interface platform {
-    /// An operating system.
-    enum os {
-        /// macOS.
-        mac,
-        /// Linux.
-        linux,
-        /// Windows.
-        windows,
-    }
-
-    /// A platform architecture.
-    enum architecture {
-        /// AArch64 (e.g., Apple Silicon).
-        aarch64,
-        /// x86.
-        x86,
-        /// x86-64.
-        x8664,
-    }
-
-    /// Gets the current operating system and architecture.
-    current-platform: func() -> tuple<os, architecture>;
-}
diff --git a/crates/extension_api/wit/since_v0.5.0/process.wit b/crates/extension_api/wit/since_v0.5.0/process.wit
deleted file mode 100644
index d9a5728a3d..0000000000
--- a/crates/extension_api/wit/since_v0.5.0/process.wit
+++ /dev/null
@@ -1,29 +0,0 @@
-interface process {
-    use common.{env-vars};
-
-    /// A command.
-    record command {
-        /// The command to execute.
-        command: string,
-        /// The arguments to pass to the command.
-        args: list<string>,
-        /// The environment variables to set for the command.
-        env: env-vars,
-    }
-
-    /// The output of a finished process.
-    record output {
-        /// The status (exit code) of the process.
-        ///
-        /// On Unix, this will be `None` if the process was terminated by a signal.
-        status: option<s32>,
-        /// The data that the process wrote to stdout.
-        stdout: list<u8>,
-        /// The data that the process wrote to stderr.
-        stderr: list<u8>,
-    }
-
-    /// Executes the given command as a child process, waiting for it to finish
-    /// and collecting all of its output.
-    run-command: func(command: command) -> result<output, string>;
-}
diff --git a/crates/extension_api/wit/since_v0.5.0/settings.rs b/crates/extension_api/wit/since_v0.5.0/settings.rs
deleted file mode 100644
index 19e28c1ba9..0000000000
--- a/crates/extension_api/wit/since_v0.5.0/settings.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-use serde::{Deserialize, Serialize};
-use std::{collections::HashMap, num::NonZeroU32};
-
-/// The settings for a particular language.
-#[derive(Debug, Serialize, Deserialize)]
-pub struct LanguageSettings {
-    /// How many columns a tab should occupy.
-    pub tab_size: NonZeroU32,
-}
-
-/// The settings for a particular language server.
-#[derive(Default, Debug, Serialize, Deserialize)]
-pub struct LspSettings {
-    /// The settings for the language server binary.
-    pub binary: Option<CommandSettings>,
-    /// The initialization options to pass to the language server.
-    pub initialization_options: Option<serde_json::Value>,
-    /// The settings to pass to language server.
-    pub settings: Option<serde_json::Value>,
-}
-
-/// The settings for a particular context server.
-#[derive(Default, Debug, Serialize, Deserialize, PartialEq, Eq)]
-pub struct ContextServerSettings {
-    /// The settings for the context server binary.
-    pub command: Option<CommandSettings>,
-    /// The settings to pass to the context server.
-    pub settings: Option<serde_json::Value>,
-}
-
-/// The settings for a command.
-#[derive(Debug, Serialize, Deserialize, PartialEq, Eq)]
-pub struct CommandSettings {
-    /// The path to the command.
-    pub path: Option<String>,
-    /// The arguments to pass to the command.
-    pub arguments: Option<Vec<String>>,
-    /// The environment variables.
-    pub env: Option<HashMap<String, String>>,
-}
diff --git a/crates/extension_api/wit/since_v0.5.0/slash-command.wit b/crates/extension_api/wit/since_v0.5.0/slash-command.wit
deleted file mode 100644
index f52561c2ef..0000000000
--- a/crates/extension_api/wit/since_v0.5.0/slash-command.wit
+++ /dev/null
@@ -1,41 +0,0 @@
-interface slash-command {
-    use common.{range};
-
-    /// A slash command for use in the Assistant.
-    record slash-command {
-        /// The name of the slash command.
-        name: string,
-        /// The description of the slash command.
-        description: string,
-        /// The tooltip text to display for the run button.
-        tooltip-text: string,
-        /// Whether this slash command requires an argument.
-        requires-argument: bool,
-    }
-
-    /// The output of a slash command.
-    record slash-command-output {
-        /// The text produced by the slash command.
-        text: string,
-        /// The list of sections to show in the slash command placeholder.
-        sections: list<slash-command-output-section>,
-    }
-
-    /// A section in the slash command output.
-    record slash-command-output-section {
-        /// The range this section occupies.
-        range: range,
-        /// The label to display in the placeholder for this section.
-        label: string,
-    }
-
-    /// A completion for a slash command argument.
-    record slash-command-argument-completion {
-        /// The label to display for this completion.
-        label: string,
-        /// The new text that should be inserted into the command when this completion is accepted.
-        new-text: string,
-        /// Whether the command should be run when accepting this completion.
-        run-command: bool,
-    }
-}
diff --git a/crates/extension_api/wit/since_v0.6.0/common.wit b/crates/extension_api/wit/since_v0.6.0/common.wit
deleted file mode 100644
index 139e7ba0ca..0000000000
--- a/crates/extension_api/wit/since_v0.6.0/common.wit
+++ /dev/null
@@ -1,12 +0,0 @@
-interface common {
-    /// A (half-open) range (`[start, end)`).
-    record range {
-        /// The start of the range (inclusive).
-        start: u32,
-        /// The end of the range (exclusive).
-        end: u32,
-    }
-
-    /// A list of environment variables.
-    type env-vars = list<tuple<string, string>>;
-}
diff --git a/crates/extension_api/wit/since_v0.6.0/context-server.wit b/crates/extension_api/wit/since_v0.6.0/context-server.wit
deleted file mode 100644
index 7234e0e6d0..0000000000
--- a/crates/extension_api/wit/since_v0.6.0/context-server.wit
+++ /dev/null
@@ -1,11 +0,0 @@
-interface context-server {
-    /// Configuration for context server setup and installation.
-    record context-server-configuration {
-        /// Installation instructions in Markdown format.
-        installation-instructions: string,
-        /// JSON schema for settings validation.
-        settings-schema: string,
-        /// Default settings template.
-        default-settings: string,
-    }
-}
diff --git a/crates/extension_api/wit/since_v0.6.0/dap.wit b/crates/extension_api/wit/since_v0.6.0/dap.wit
deleted file mode 100644
index 693befe02f..0000000000
--- a/crates/extension_api/wit/since_v0.6.0/dap.wit
+++ /dev/null
@@ -1,123 +0,0 @@
-interface dap {
-    use common.{env-vars};
-
-    /// Resolves a specified TcpArgumentsTemplate into TcpArguments
-    resolve-tcp-template: func(template: tcp-arguments-template) -> result<tcp-arguments, string>;
-
-    record launch-request {
-        program: string,
-        cwd: option<string>,
-        args: list<string>,
-        envs: env-vars,
-    }
-
-    record attach-request {
-        process-id: option<u32>,
-    }
-
-    variant debug-request {
-        launch(launch-request),
-        attach(attach-request)
-    }
-
-    record tcp-arguments {
-        port: u16,
-        host: u32,
-        timeout: option<u64>,
-    }
-
-    record tcp-arguments-template {
-        port: option<u16>,
-        host: option<u32>,
-        timeout: option<u64>,
-    }
-
-    /// Debug Config is the "highest-level" configuration for a debug session.
-    /// It comes from a new process modal UI; thus, it is essentially debug-adapter-agnostic.
-    /// It is expected of the extension to translate this generic configuration into something that can be debugged by the adapter (debug scenario).
-    record debug-config {
-        /// Name of the debug task
-        label: string,
-        /// The debug adapter to use
-        adapter: string,
-        request: debug-request,
-        stop-on-entry: option<bool>,
-    }
-
-    record task-template {
-        /// Human readable name of the task to display in the UI.
-        label: string,
-        /// Executable command to spawn.
-        command: string,
-        args: list<string>,
-        env: env-vars,
-        cwd: option<string>,
-    }
-
-    /// A task template with substituted task variables.
-    type resolved-task = task-template;
-
-    /// A task template for building a debug target.
-    type build-task-template = task-template;
-
-    variant build-task-definition {
-        by-name(string),
-        template(build-task-definition-template-payload )
-    }
-    record build-task-definition-template-payload {
-        locator-name: option<string>,
-        template: build-task-template
-    }
-
-    /// Debug Scenario is the user-facing configuration type (used in debug.json). It is still concerned with what to debug and not necessarily how to do it (except for any
-    /// debug-adapter-specific configuration options).
-    record debug-scenario {
-        /// Unsubstituted label for the task.DebugAdapterBinary
-        label: string,
-        /// Name of the Debug Adapter this configuration is intended for.
-        adapter: string,
-        /// An optional build step to be ran prior to starting a debug session. Build steps are used by Zed's locators to locate the executable to debug.
-        build: option<build-task-definition>,
-        /// JSON-encoded configuration for a given debug adapter.
-        config: string,
-        /// TCP connection parameters (if they were specified by user)
-        tcp-connection: option<tcp-arguments-template>,
-    }
-
-    enum start-debugging-request-arguments-request {
-        launch,
-        attach,
-    }
-
-    record debug-task-definition {
-        /// Unsubstituted label for the task.DebugAdapterBinary
-        label: string,
-        /// Name of the Debug Adapter this configuration is intended for.
-        adapter: string,
-        /// JSON-encoded configuration for a given debug adapter.
-        config: string,
-        /// TCP connection parameters (if they were specified by user)
-        tcp-connection: option<tcp-arguments-template>,
-    }
-
-    record start-debugging-request-arguments {
-        /// JSON-encoded configuration for a given debug adapter. It is specific to each debug adapter.
-        /// `configuration` will have it's Zed variable references substituted prior to being passed to the debug adapter.
-        configuration: string,
-        request: start-debugging-request-arguments-request,
-    }
-
-    /// The lowest-level representation of a debug session, which specifies:
-    /// - How to start a debug adapter process
-    /// - How to start a debug session with it (using DAP protocol)
-    /// for a given debug scenario.
-    record debug-adapter-binary {
-        command: option<string>,
-        arguments: list<string>,
-        envs: env-vars,
-        cwd: option<string>,
-        /// Zed will use TCP transport if `connection` is specified.
-        connection: option<tcp-arguments>,
-        request-args: start-debugging-request-arguments
-    }
-}
diff --git a/crates/extension_api/wit/since_v0.6.0/extension.wit b/crates/extension_api/wit/since_v0.6.0/extension.wit
deleted file mode 100644
index 8195162b89..0000000000
--- a/crates/extension_api/wit/since_v0.6.0/extension.wit
+++ /dev/null
@@ -1,167 +0,0 @@
-package zed:extension;
-
-world extension {
-    import context-server;
-    import dap;
-    import github;
-    import http-client;
-    import platform;
-    import process;
-    import nodejs;
-
-    use common.{env-vars, range};
-    use context-server.{context-server-configuration};
-    use dap.{attach-request, build-task-template, debug-config, debug-adapter-binary, debug-task-definition, debug-request, debug-scenario, launch-request, resolved-task, start-debugging-request-arguments-request};
-    use lsp.{completion, symbol};
-    use process.{command};
-    use slash-command.{slash-command, slash-command-argument-completion, slash-command-output};
-
-    /// Initializes the extension.
-    export init-extension: func();
-
-    /// The type of a downloaded file.
-    enum downloaded-file-type {
-        /// A gzipped file (`.gz`).
-        gzip,
-        /// A gzipped tar archive (`.tar.gz`).
-        gzip-tar,
-        /// A ZIP file (`.zip`).
-        zip,
-        /// An uncompressed file.
-        uncompressed,
-    }
-
-    /// The installation status for a language server.
-    variant language-server-installation-status {
-        /// The language server has no installation status.
-        none,
-        /// The language server is being downloaded.
-        downloading,
-        /// The language server is checking for updates.
-        checking-for-update,
-        /// The language server installation failed for specified reason.
-        failed(string),
-    }
-
-    record settings-location {
-        worktree-id: u64,
-        path: string,
-    }
-
-    import get-settings: func(path: option<settings-location>, category: string, key: option<string>) -> result<string, string>;
-
-    /// Downloads a file from the given URL and saves it to the given path within the extension's
-    /// working directory.
-    ///
-    /// The file will be extracted according to the given file type.
-    import download-file: func(url: string, file-path: string, file-type: downloaded-file-type) -> result<_, string>;
-
-    /// Makes the file at the given path executable.
-    import make-file-executable: func(filepath: string) -> result<_, string>;
-
-    /// Updates the installation status for the given language server.
-    import set-language-server-installation-status: func(language-server-name: string, status: language-server-installation-status);
-
-    /// A Zed worktree.
-    resource worktree {
-        /// Returns the ID of the worktree.
-        id: func() -> u64;
-        /// Returns the root path of the worktree.
-        root-path: func() -> string;
-        /// Returns the textual contents of the specified file in the worktree.
-        read-text-file: func(path: string) -> result<string, string>;
-        /// Returns the path to the given binary name, if one is present on the `$PATH`.
-        which: func(binary-name: string) -> option<string>;
-        /// Returns the current shell environment.
-        shell-env: func() -> env-vars;
-    }
-
-    /// A Zed project.
-    resource project {
-        /// Returns the IDs of all of the worktrees in this project.
-        worktree-ids: func() -> list<u64>;
-    }
-
-    /// A key-value store.
-    resource key-value-store {
-        /// Inserts an entry under the specified key.
-        insert: func(key: string, value: string) -> result<_, string>;
-    }
-
-    /// Returns the command used to start up the language server.
-    export language-server-command: func(language-server-id: string, worktree: borrow<worktree>) -> result<command, string>;
-
-    /// Returns the initialization options to pass to the language server on startup.
-    ///
-    /// The initialization options are represented as a JSON string.
-    export language-server-initialization-options: func(language-server-id: string, worktree: borrow<worktree>) -> result<option<string>, string>;
-
-    /// Returns the workspace configuration options to pass to the language server.
-    export language-server-workspace-configuration: func(language-server-id: string, worktree: borrow<worktree>) -> result<option<string>, string>;
-
-    /// Returns the initialization options to pass to the other language server.
-    export language-server-additional-initialization-options: func(language-server-id: string, target-language-server-id: string, worktree: borrow<worktree>) -> result<option<string>, string>;
-
-    /// Returns the workspace configuration options to pass to the other language server.
-    export language-server-additional-workspace-configuration: func(language-server-id: string, target-language-server-id: string, worktree: borrow<worktree>) -> result<option<string>, string>;
-
-    /// A label containing some code.
-    record code-label {
-        /// The source code to parse with Tree-sitter.
-        code: string,
-        /// The spans to display in the label.
-        spans: list<code-label-span>,
-        /// The range of the displayed label to include when filtering.
-        filter-range: range,
-    }
-
-    /// A span within a code label.
-    variant code-label-span {
-        /// A range into the parsed code.
-        code-range(range),
-        /// A span containing a code literal.
-        literal(code-label-span-literal),
-    }
-
-    /// A span containing a code literal.
-    record code-label-span-literal {
-        /// The literal text.
-        text: string,
-        /// The name of the highlight to use for this literal.
-        highlight-name: option<string>,
-    }
-
-    export labels-for-completions: func(language-server-id: string, completions: list<completion>) -> result<list<option<code-label>>, string>;
-    export labels-for-symbols: func(language-server-id: string, symbols: list<symbol>) -> result<list<option<code-label>>, string>;
-
-
-    /// Returns the completions that should be shown when completing the provided slash command with the given query.
-    export complete-slash-command-argument: func(command: slash-command, args: list<string>) -> result<list<slash-command-argument-completion>, string>;
-
-    /// Returns the output from running the provided slash command.
-    export run-slash-command: func(command: slash-command, args: list<string>, worktree: option<borrow<worktree>>) -> result<slash-command-output, string>;
-
-    /// Returns the command used to start up a context server.
-    export context-server-command: func(context-server-id: string, project: borrow<project>) -> result<command, string>;
-
-    /// Returns the configuration for a context server.
-    export context-server-configuration: func(context-server-id: string, project: borrow<project>) -> result<option<context-server-configuration>, string>;
-
-    /// Returns a list of packages as suggestions to be included in the `/docs`
-    /// search results.
-    ///
-    /// This can be used to provide completions for known packages (e.g., from the
-    /// local project or a registry) before a package has been indexed.
-    export suggest-docs-packages: func(provider-name: string) -> result<list<string>, string>;
-
-    /// Indexes the docs for the specified package.
-    export index-docs: func(provider-name: string, package-name: string, database: borrow<key-value-store>) -> result<_, string>;
-
-    /// Returns a configured debug adapter binary for a given debug task.
-    export get-dap-binary: func(adapter-name: string, config: debug-task-definition, user-installed-path: option<string>, worktree: borrow<worktree>) -> result<debug-adapter-binary, string>;
-    /// Returns the kind of a debug scenario (launch or attach).
-    export dap-request-kind: func(adapter-name: string, config: string) -> result<start-debugging-request-arguments-request, string>;
-    export dap-config-to-scenario: func(config: debug-config) -> result<debug-scenario, string>;
-    export dap-locator-create-scenario: func(locator-name: string, build-config-template: build-task-template, resolved-label: string, debug-adapter-name: string) -> option<debug-scenario>;
-    export run-dap-locator: func(locator-name: string, config: resolved-task) -> result<debug-request, string>;
-}
diff --git a/crates/extension_api/wit/since_v0.6.0/github.wit b/crates/extension_api/wit/since_v0.6.0/github.wit
deleted file mode 100644
index 21cd5d4805..0000000000
--- a/crates/extension_api/wit/since_v0.6.0/github.wit
+++ /dev/null
@@ -1,35 +0,0 @@
-interface github {
-    /// A GitHub release.
-    record github-release {
-        /// The version of the release.
-        version: string,
-        /// The list of assets attached to the release.
-        assets: list<github-release-asset>,
-    }
-
-    /// An asset from a GitHub release.
-    record github-release-asset {
-        /// The name of the asset.
-        name: string,
-        /// The download URL for the asset.
-        download-url: string,
-    }
-
-    /// The options used to filter down GitHub releases.
-    record github-release-options {
-        /// Whether releases without assets should be included.
-        require-assets: bool,
-        /// Whether pre-releases should be included.
-        pre-release: bool,
-    }
-
-    /// Returns the latest release for the given GitHub repository.
-    ///
-    /// Takes repo as a string in the form "<owner-name>/<repo-name>", for example: "zed-industries/zed".
-    latest-github-release: func(repo: string, options: github-release-options) -> result<github-release, string>;
-
-    /// Returns the GitHub release with the specified tag name for the given GitHub repository.
-    ///
-    /// Returns an error if a release with the given tag name does not exist.
-    github-release-by-tag-name: func(repo: string, tag: string) -> result<github-release, string>;
-}
diff --git a/crates/extension_api/wit/since_v0.6.0/http-client.wit b/crates/extension_api/wit/since_v0.6.0/http-client.wit
deleted file mode 100644
index bb0206c17a..0000000000
--- a/crates/extension_api/wit/since_v0.6.0/http-client.wit
+++ /dev/null
@@ -1,67 +0,0 @@
-interface http-client {
-    /// An HTTP request.
-    record http-request {
-        /// The HTTP method for the request.
-        method: http-method,
-        /// The URL to which the request should be made.
-        url: string,
-        /// The headers for the request.
-        headers: list<tuple<string, string>>,
-        /// The request body.
-        body: option<list<u8>>,
-        /// The policy to use for redirects.
-        redirect-policy: redirect-policy,
-    }
-
-    /// HTTP methods.
-    enum http-method {
-        /// `GET`
-        get,
-        /// `HEAD`
-        head,
-        /// `POST`
-        post,
-        /// `PUT`
-        put,
-        /// `DELETE`
-        delete,
-        /// `OPTIONS`
-        options,
-        /// `PATCH`
-        patch,
-    }
-
-    /// The policy for dealing with redirects received from the server.
-    variant redirect-policy {
-        /// Redirects from the server will not be followed.
-        ///
-        /// This is the default behavior.
-        no-follow,
-        /// Redirects from the server will be followed up to the specified limit.
-        follow-limit(u32),
-        /// All redirects from the server will be followed.
-        follow-all,
-    }
-
-    /// An HTTP response.
-    record http-response {
-        /// The response headers.
-        headers: list<tuple<string, string>>,
-        /// The response body.
-        body: list<u8>,
-    }
-
-    /// Performs an HTTP request and returns the response.
-    fetch: func(req: http-request) -> result<http-response, string>;
-
-    /// An HTTP response stream.
-    resource http-response-stream {
-        /// Retrieves the next chunk of data from the response stream.
-        ///
-        /// Returns `Ok(None)` if the stream has ended.
-        next-chunk: func() -> result<option<list<u8>>, string>;
-    }
-
-    /// Performs an HTTP request and returns a response stream.
-    fetch-stream: func(req: http-request) -> result<http-response-stream, string>;
-}
diff --git a/crates/extension_api/wit/since_v0.6.0/lsp.wit b/crates/extension_api/wit/since_v0.6.0/lsp.wit
deleted file mode 100644
index 91a36c93a6..0000000000
--- a/crates/extension_api/wit/since_v0.6.0/lsp.wit
+++ /dev/null
@@ -1,90 +0,0 @@
-interface lsp {
-    /// An LSP completion.
-    record completion {
-        label: string,
-        label-details: option<completion-label-details>,
-        detail: option<string>,
-        kind: option<completion-kind>,
-        insert-text-format: option<insert-text-format>,
-    }
-
-    /// The kind of an LSP completion.
-    variant completion-kind {
-        text,
-        method,
-        function,
-        %constructor,
-        field,
-        variable,
-        class,
-        %interface,
-        module,
-        property,
-        unit,
-        value,
-        %enum,
-        keyword,
-        snippet,
-        color,
-        file,
-        reference,
-        folder,
-        enum-member,
-        constant,
-        struct,
-        event,
-        operator,
-        type-parameter,
-        other(s32),
-    }
-
-    /// Label details for an LSP completion.
-    record completion-label-details {
-        detail: option<string>,
-        description: option<string>,
-    }
-
-    /// Defines how to interpret the insert text in a completion item.
-    variant insert-text-format {
-        plain-text,
-        snippet,
-        other(s32),
-    }
-
-    /// An LSP symbol.
-    record symbol {
-        kind: symbol-kind,
-        name: string,
-    }
-
-    /// The kind of an LSP symbol.
-    variant symbol-kind {
-        file,
-        module,
-        namespace,
-        %package,
-        class,
-        method,
-        property,
-        field,
-        %constructor,
-        %enum,
-        %interface,
-        function,
-        variable,
-        constant,
-        %string,
-        number,
-        boolean,
-        array,
-        object,
-        key,
-        null,
-        enum-member,
-        struct,
-        event,
-        operator,
-        type-parameter,
-        other(s32),
-    }
-}
diff --git a/crates/extension_api/wit/since_v0.6.0/nodejs.wit b/crates/extension_api/wit/since_v0.6.0/nodejs.wit
deleted file mode 100644
index c814548314..0000000000
--- a/crates/extension_api/wit/since_v0.6.0/nodejs.wit
+++ /dev/null
@@ -1,13 +0,0 @@
-interface nodejs {
-    /// Returns the path to the Node binary used by Zed.
-    node-binary-path: func() -> result<string, string>;
-
-    /// Returns the latest version of the given NPM package.
-    npm-package-latest-version: func(package-name: string) -> result<string, string>;
-
-    /// Returns the installed version of the given NPM package, if it exists.
-    npm-package-installed-version: func(package-name: string) -> result<option<string>, string>;
-
-    /// Installs the specified NPM package.
-    npm-install-package: func(package-name: string, version: string) -> result<_, string>;
-}
diff --git a/crates/extension_api/wit/since_v0.6.0/platform.wit b/crates/extension_api/wit/since_v0.6.0/platform.wit
deleted file mode 100644
index 48472a99bc..0000000000
--- a/crates/extension_api/wit/since_v0.6.0/platform.wit
+++ /dev/null
@@ -1,24 +0,0 @@
-interface platform {
-    /// An operating system.
-    enum os {
-        /// macOS.
-        mac,
-        /// Linux.
-        linux,
-        /// Windows.
-        windows,
-    }
-
-    /// A platform architecture.
-    enum architecture {
-        /// AArch64 (e.g., Apple Silicon).
-        aarch64,
-        /// x86.
-        x86,
-        /// x86-64.
-        x8664,
-    }
-
-    /// Gets the current operating system and architecture.
-    current-platform: func() -> tuple<os, architecture>;
-}
diff --git a/crates/extension_api/wit/since_v0.6.0/process.wit b/crates/extension_api/wit/since_v0.6.0/process.wit
deleted file mode 100644
index d9a5728a3d..0000000000
--- a/crates/extension_api/wit/since_v0.6.0/process.wit
+++ /dev/null
@@ -1,29 +0,0 @@
-interface process {
-    use common.{env-vars};
-
-    /// A command.
-    record command {
-        /// The command to execute.
-        command: string,
-        /// The arguments to pass to the command.
-        args: list<string>,
-        /// The environment variables to set for the command.
-        env: env-vars,
-    }
-
-    /// The output of a finished process.
-    record output {
-        /// The status (exit code) of the process.
-        ///
-        /// On Unix, this will be `None` if the process was terminated by a signal.
-        status: option<s32>,
-        /// The data that the process wrote to stdout.
-        stdout: list<u8>,
-        /// The data that the process wrote to stderr.
-        stderr: list<u8>,
-    }
-
-    /// Executes the given command as a child process, waiting for it to finish
-    /// and collecting all of its output.
-    run-command: func(command: command) -> result<output, string>;
-}
diff --git a/crates/extension_api/wit/since_v0.6.0/settings.rs b/crates/extension_api/wit/since_v0.6.0/settings.rs
deleted file mode 100644
index 19e28c1ba9..0000000000
--- a/crates/extension_api/wit/since_v0.6.0/settings.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-use serde::{Deserialize, Serialize};
-use std::{collections::HashMap, num::NonZeroU32};
-
-/// The settings for a particular language.
-#[derive(Debug, Serialize, Deserialize)]
-pub struct LanguageSettings {
-    /// How many columns a tab should occupy.
-    pub tab_size: NonZeroU32,
-}
-
-/// The settings for a particular language server.
-#[derive(Default, Debug, Serialize, Deserialize)]
-pub struct LspSettings {
-    /// The settings for the language server binary.
-    pub binary: Option<CommandSettings>,
-    /// The initialization options to pass to the language server.
-    pub initialization_options: Option<serde_json::Value>,
-    /// The settings to pass to language server.
-    pub settings: Option<serde_json::Value>,
-}
-
-/// The settings for a particular context server.
-#[derive(Default, Debug, Serialize, Deserialize, PartialEq, Eq)]
-pub struct ContextServerSettings {
-    /// The settings for the context server binary.
-    pub command: Option<CommandSettings>,
-    /// The settings to pass to the context server.
-    pub settings: Option<serde_json::Value>,
-}
-
-/// The settings for a command.
-#[derive(Debug, Serialize, Deserialize, PartialEq, Eq)]
-pub struct CommandSettings {
-    /// The path to the command.
-    pub path: Option<String>,
-    /// The arguments to pass to the command.
-    pub arguments: Option<Vec<String>>,
-    /// The environment variables.
-    pub env: Option<HashMap<String, String>>,
-}
diff --git a/crates/extension_api/wit/since_v0.6.0/slash-command.wit b/crates/extension_api/wit/since_v0.6.0/slash-command.wit
deleted file mode 100644
index f52561c2ef..0000000000
--- a/crates/extension_api/wit/since_v0.6.0/slash-command.wit
+++ /dev/null
@@ -1,41 +0,0 @@
-interface slash-command {
-    use common.{range};
-
-    /// A slash command for use in the Assistant.
-    record slash-command {
-        /// The name of the slash command.
-        name: string,
-        /// The description of the slash command.
-        description: string,
-        /// The tooltip text to display for the run button.
-        tooltip-text: string,
-        /// Whether this slash command requires an argument.
-        requires-argument: bool,
-    }
-
-    /// The output of a slash command.
-    record slash-command-output {
-        /// The text produced by the slash command.
-        text: string,
-        /// The list of sections to show in the slash command placeholder.
-        sections: list<slash-command-output-section>,
-    }
-
-    /// A section in the slash command output.
-    record slash-command-output-section {
-        /// The range this section occupies.
-        range: range,
-        /// The label to display in the placeholder for this section.
-        label: string,
-    }
-
-    /// A completion for a slash command argument.
-    record slash-command-argument-completion {
-        /// The label to display for this completion.
-        label: string,
-        /// The new text that should be inserted into the command when this completion is accepted.
-        new-text: string,
-        /// Whether the command should be run when accepting this completion.
-        run-command: bool,
-    }
-}
diff --git a/crates/extension_api/wit/since_v0.8.0/common.wit b/crates/extension_api/wit/since_v0.8.0/common.wit
deleted file mode 100644
index 139e7ba0ca..0000000000
--- a/crates/extension_api/wit/since_v0.8.0/common.wit
+++ /dev/null
@@ -1,12 +0,0 @@
-interface common {
-    /// A (half-open) range (`[start, end)`).
-    record range {
-        /// The start of the range (inclusive).
-        start: u32,
-        /// The end of the range (exclusive).
-        end: u32,
-    }
-
-    /// A list of environment variables.
-    type env-vars = list<tuple<string, string>>;
-}
diff --git a/crates/extension_api/wit/since_v0.8.0/context-server.wit b/crates/extension_api/wit/since_v0.8.0/context-server.wit
deleted file mode 100644
index 7234e0e6d0..0000000000
--- a/crates/extension_api/wit/since_v0.8.0/context-server.wit
+++ /dev/null
@@ -1,11 +0,0 @@
-interface context-server {
-    /// Configuration for context server setup and installation.
-    record context-server-configuration {
-        /// Installation instructions in Markdown format.
-        installation-instructions: string,
-        /// JSON schema for settings validation.
-        settings-schema: string,
-        /// Default settings template.
-        default-settings: string,
-    }
-}
diff --git a/crates/extension_api/wit/since_v0.8.0/dap.wit b/crates/extension_api/wit/since_v0.8.0/dap.wit
deleted file mode 100644
index 693befe02f..0000000000
--- a/crates/extension_api/wit/since_v0.8.0/dap.wit
+++ /dev/null
@@ -1,123 +0,0 @@
-interface dap {
-    use common.{env-vars};
-
-    /// Resolves a specified TcpArgumentsTemplate into TcpArguments
-    resolve-tcp-template: func(template: tcp-arguments-template) -> result<tcp-arguments, string>;
-
-    record launch-request {
-        program: string,
-        cwd: option<string>,
-        args: list<string>,
-        envs: env-vars,
-    }
-
-    record attach-request {
-        process-id: option<u32>,
-    }
-
-    variant debug-request {
-        launch(launch-request),
-        attach(attach-request)
-    }
-
-    record tcp-arguments {
-        port: u16,
-        host: u32,
-        timeout: option<u64>,
-    }
-
-    record tcp-arguments-template {
-        port: option<u16>,
-        host: option<u32>,
-        timeout: option<u64>,
-    }
-
-    /// Debug Config is the "highest-level" configuration for a debug session.
-    /// It comes from a new process modal UI; thus, it is essentially debug-adapter-agnostic.
-    /// It is expected of the extension to translate this generic configuration into something that can be debugged by the adapter (debug scenario).
-    record debug-config {
-        /// Name of the debug task
-        label: string,
-        /// The debug adapter to use
-        adapter: string,
-        request: debug-request,
-        stop-on-entry: option<bool>,
-    }
-
-    record task-template {
-        /// Human readable name of the task to display in the UI.
-        label: string,
-        /// Executable command to spawn.
-        command: string,
-        args: list<string>,
-        env: env-vars,
-        cwd: option<string>,
-    }
-
-    /// A task template with substituted task variables.
-    type resolved-task = task-template;
-
-    /// A task template for building a debug target.
-    type build-task-template = task-template;
-
-    variant build-task-definition {
-        by-name(string),
-        template(build-task-definition-template-payload )
-    }
-    record build-task-definition-template-payload {
-        locator-name: option<string>,
-        template: build-task-template
-    }
-
-    /// Debug Scenario is the user-facing configuration type (used in debug.json). It is still concerned with what to debug and not necessarily how to do it (except for any
-    /// debug-adapter-specific configuration options).
-    record debug-scenario {
-        /// Unsubstituted label for the task.DebugAdapterBinary
-        label: string,
-        /// Name of the Debug Adapter this configuration is intended for.
-        adapter: string,
-        /// An optional build step to be ran prior to starting a debug session. Build steps are used by Zed's locators to locate the executable to debug.
-        build: option<build-task-definition>,
-        /// JSON-encoded configuration for a given debug adapter.
-        config: string,
-        /// TCP connection parameters (if they were specified by user)
-        tcp-connection: option<tcp-arguments-template>,
-    }
-
-    enum start-debugging-request-arguments-request {
-        launch,
-        attach,
-    }
-
-    record debug-task-definition {
-        /// Unsubstituted label for the task.DebugAdapterBinary
-        label: string,
-        /// Name of the Debug Adapter this configuration is intended for.
-        adapter: string,
-        /// JSON-encoded configuration for a given debug adapter.
-        config: string,
-        /// TCP connection parameters (if they were specified by user)
-        tcp-connection: option<tcp-arguments-template>,
-    }
-
-    record start-debugging-request-arguments {
-        /// JSON-encoded configuration for a given debug adapter. It is specific to each debug adapter.
-        /// `configuration` will have it's Zed variable references substituted prior to being passed to the debug adapter.
-        configuration: string,
-        request: start-debugging-request-arguments-request,
-    }
-
-    /// The lowest-level representation of a debug session, which specifies:
-    /// - How to start a debug adapter process
-    /// - How to start a debug session with it (using DAP protocol)
-    /// for a given debug scenario.
-    record debug-adapter-binary {
-        command: option<string>,
-        arguments: list<string>,
-        envs: env-vars,
-        cwd: option<string>,
-        /// Zed will use TCP transport if `connection` is specified.
-        connection: option<tcp-arguments>,
-        request-args: start-debugging-request-arguments
-    }
-}
diff --git a/crates/extension_api/wit/since_v0.8.0/extension.wit b/crates/extension_api/wit/since_v0.8.0/extension.wit
deleted file mode 100644
index 8195162b89..0000000000
--- a/crates/extension_api/wit/since_v0.8.0/extension.wit
+++ /dev/null
@@ -1,167 +0,0 @@
-package zed:extension;
-
-world extension {
-    import context-server;
-    import dap;
-    import github;
-    import http-client;
-    import platform;
-    import process;
-    import nodejs;
-
-    use common.{env-vars, range};
-    use context-server.{context-server-configuration};
-    use dap.{attach-request, build-task-template, debug-config, debug-adapter-binary, debug-task-definition, debug-request, debug-scenario, launch-request, resolved-task, start-debugging-request-arguments-request};
-    use lsp.{completion, symbol};
-    use process.{command};
-    use slash-command.{slash-command, slash-command-argument-completion, slash-command-output};
-
-    /// Initializes the extension.
-    export init-extension: func();
-
-    /// The type of a downloaded file.
-    enum downloaded-file-type {
-        /// A gzipped file (`.gz`).
-        gzip,
-        /// A gzipped tar archive (`.tar.gz`).
-        gzip-tar,
-        /// A ZIP file (`.zip`).
-        zip,
-        /// An uncompressed file.
-        uncompressed,
-    }
-
-    /// The installation status for a language server.
-    variant language-server-installation-status {
-        /// The language server has no installation status.
-        none,
-        /// The language server is being downloaded.
-        downloading,
-        /// The language server is checking for updates.
-        checking-for-update,
-        /// The language server installation failed for specified reason.
-        failed(string),
-    }
-
-    record settings-location {
-        worktree-id: u64,
-        path: string,
-    }
-
-    import get-settings: func(path: option<settings-location>, category: string, key: option<string>) -> result<string, string>;
-
-    /// Downloads a file from the given URL and saves it to the given path within the extension's
-    /// working directory.
-    ///
-    /// The file will be extracted according to the given file type.
-    import download-file: func(url: string, file-path: string, file-type: downloaded-file-type) -> result<_, string>;
-
-    /// Makes the file at the given path executable.
-    import make-file-executable: func(filepath: string) -> result<_, string>;
-
-    /// Updates the installation status for the given language server.
-    import set-language-server-installation-status: func(language-server-name: string, status: language-server-installation-status);
-
-    /// A Zed worktree.
-    resource worktree {
-        /// Returns the ID of the worktree.
-        id: func() -> u64;
-        /// Returns the root path of the worktree.
-        root-path: func() -> string;
-        /// Returns the textual contents of the specified file in the worktree.
-        read-text-file: func(path: string) -> result<string, string>;
-        /// Returns the path to the given binary name, if one is present on the `$PATH`.
-        which: func(binary-name: string) -> option<string>;
-        /// Returns the current shell environment.
-        shell-env: func() -> env-vars;
-    }
-
-    /// A Zed project.
-    resource project {
-        /// Returns the IDs of all of the worktrees in this project.
-        worktree-ids: func() -> list<u64>;
-    }
-
-    /// A key-value store.
-    resource key-value-store {
-        /// Inserts an entry under the specified key.
-        insert: func(key: string, value: string) -> result<_, string>;
-    }
-
-    /// Returns the command used to start up the language server.
-    export language-server-command: func(language-server-id: string, worktree: borrow<worktree>) -> result<command, string>;
-
-    /// Returns the initialization options to pass to the language server on startup.
-    ///
-    /// The initialization options are represented as a JSON string.
-    export language-server-initialization-options: func(language-server-id: string, worktree: borrow<worktree>) -> result<option<string>, string>;
-
-    /// Returns the workspace configuration options to pass to the language server.
-    export language-server-workspace-configuration: func(language-server-id: string, worktree: borrow<worktree>) -> result<option<string>, string>;
-
-    /// Returns the initialization options to pass to the other language server.
-    export language-server-additional-initialization-options: func(language-server-id: string, target-language-server-id: string, worktree: borrow<worktree>) -> result<option<string>, string>;
-
-    /// Returns the workspace configuration options to pass to the other language server.
-    export language-server-additional-workspace-configuration: func(language-server-id: string, target-language-server-id: string, worktree: borrow<worktree>) -> result<option<string>, string>;
-
-    /// A label containing some code.
-    record code-label {
-        /// The source code to parse with Tree-sitter.
-        code: string,
-        /// The spans to display in the label.
-        spans: list<code-label-span>,
-        /// The range of the displayed label to include when filtering.
-        filter-range: range,
-    }
-
-    /// A span within a code label.
-    variant code-label-span {
-        /// A range into the parsed code.
-        code-range(range),
-        /// A span containing a code literal.
-        literal(code-label-span-literal),
-    }
-
-    /// A span containing a code literal.
-    record code-label-span-literal {
-        /// The literal text.
-        text: string,
-        /// The name of the highlight to use for this literal.
-        highlight-name: option<string>,
-    }
-
-    export labels-for-completions: func(language-server-id: string, completions: list<completion>) -> result<list<option<code-label>>, string>;
-    export labels-for-symbols: func(language-server-id: string, symbols: list<symbol>) -> result<list<option<code-label>>, string>;
-
-
-    /// Returns the completions that should be shown when completing the provided slash command with the given query.
-    export complete-slash-command-argument: func(command: slash-command, args: list<string>) -> result<list<slash-command-argument-completion>, string>;
-
-    /// Returns the output from running the provided slash command.
-    export run-slash-command: func(command: slash-command, args: list<string>, worktree: option<borrow<worktree>>) -> result<slash-command-output, string>;
-
-    /// Returns the command used to start up a context server.
-    export context-server-command: func(context-server-id: string, project: borrow<project>) -> result<command, string>;
-
-    /// Returns the configuration for a context server.
-    export context-server-configuration: func(context-server-id: string, project: borrow<project>) -> result<option<context-server-configuration>, string>;
-
-    /// Returns a list of packages as suggestions to be included in the `/docs`
-    /// search results.
-    ///
-    /// This can be used to provide completions for known packages (e.g., from the
-    /// local project or a registry) before a package has been indexed.
-    export suggest-docs-packages: func(provider-name: string) -> result<list<string>, string>;
-
-    /// Indexes the docs for the specified package.
-    export index-docs: func(provider-name: string, package-name: string, database: borrow<key-value-store>) -> result<_, string>;
-
-    /// Returns a configured debug adapter binary for a given debug task.
-    export get-dap-binary: func(adapter-name: string, config: debug-task-definition, user-installed-path: option<string>, worktree: borrow<worktree>) -> result<debug-adapter-binary, string>;
-    /// Returns the kind of a debug scenario (launch or attach).
-    export dap-request-kind: func(adapter-name: string, config: string) -> result<start-debugging-request-arguments-request, string>;
-    export dap-config-to-scenario: func(config: debug-config) -> result<debug-scenario, string>;
-    export dap-locator-create-scenario: func(locator-name: string, build-config-template: build-task-template, resolved-label: string, debug-adapter-name: string) -> option<debug-scenario>;
-    export run-dap-locator: func(locator-name: string, config: resolved-task) -> result<debug-request, string>;
-}
diff --git a/crates/extension_api/wit/since_v0.8.0/github.wit b/crates/extension_api/wit/since_v0.8.0/github.wit
deleted file mode 100644
index 21cd5d4805..0000000000
--- a/crates/extension_api/wit/since_v0.8.0/github.wit
+++ /dev/null
@@ -1,35 +0,0 @@
-interface github {
-    /// A GitHub release.
-    record github-release {
-        /// The version of the release.
-        version: string,
-        /// The list of assets attached to the release.
-        assets: list<github-release-asset>,
-    }
-
-    /// An asset from a GitHub release.
-    record github-release-asset {
-        /// The name of the asset.
-        name: string,
-        /// The download URL for the asset.
-        download-url: string,
-    }
-
-    /// The options used to filter down GitHub releases.
-    record github-release-options {
-        /// Whether releases without assets should be included.
-        require-assets: bool,
-        /// Whether pre-releases should be included.
-        pre-release: bool,
-    }
-
-    /// Returns the latest release for the given GitHub repository.
-    ///
-    /// Takes repo as a string in the form "<owner-name>/<repo-name>", for example: "zed-industries/zed".
-    latest-github-release: func(repo: string, options: github-release-options) -> result<github-release, string>;
-
-    /// Returns the GitHub release with the specified tag name for the given GitHub repository.
-    ///
-    /// Returns an error if a release with the given tag name does not exist.
-    github-release-by-tag-name: func(repo: string, tag: string) -> result<github-release, string>;
-}
diff --git a/crates/extension_api/wit/since_v0.8.0/http-client.wit b/crates/extension_api/wit/since_v0.8.0/http-client.wit
deleted file mode 100644
index bb0206c17a..0000000000
--- a/crates/extension_api/wit/since_v0.8.0/http-client.wit
+++ /dev/null
@@ -1,67 +0,0 @@
-interface http-client {
-    /// An HTTP request.
-    record http-request {
-        /// The HTTP method for the request.
-        method: http-method,
-        /// The URL to which the request should be made.
-        url: string,
-        /// The headers for the request.
-        headers: list<tuple<string, string>>,
-        /// The request body.
-        body: option<list<u8>>,
-        /// The policy to use for redirects.
-        redirect-policy: redirect-policy,
-    }
-
-    /// HTTP methods.
-    enum http-method {
-        /// `GET`
-        get,
-        /// `HEAD`
-        head,
-        /// `POST`
-        post,
-        /// `PUT`
-        put,
-        /// `DELETE`
-        delete,
-        /// `OPTIONS`
-        options,
-        /// `PATCH`
-        patch,
-    }
-
-    /// The policy for dealing with redirects received from the server.
-    variant redirect-policy {
-        /// Redirects from the server will not be followed.
-        ///
-        /// This is the default behavior.
-        no-follow,
-        /// Redirects from the server will be followed up to the specified limit.
-        follow-limit(u32),
-        /// All redirects from the server will be followed.
-        follow-all,
-    }
-
-    /// An HTTP response.
-    record http-response {
-        /// The response headers.
-        headers: list<tuple<string, string>>,
-        /// The response body.
-        body: list<u8>,
-    }
-
-    /// Performs an HTTP request and returns the response.
-    fetch: func(req: http-request) -> result<http-response, string>;
-
-    /// An HTTP response stream.
-    resource http-response-stream {
-        /// Retrieves the next chunk of data from the response stream.
-        ///
-        /// Returns `Ok(None)` if the stream has ended.
-        next-chunk: func() -> result<option<list<u8>>, string>;
-    }
-
-    /// Performs an HTTP request and returns a response stream.
-    fetch-stream: func(req: http-request) -> result<http-response-stream, string>;
-}
diff --git a/crates/extension_api/wit/since_v0.8.0/lsp.wit b/crates/extension_api/wit/since_v0.8.0/lsp.wit
deleted file mode 100644
index 91a36c93a6..0000000000
--- a/crates/extension_api/wit/since_v0.8.0/lsp.wit
+++ /dev/null
@@ -1,90 +0,0 @@
-interface lsp {
-    /// An LSP completion.
-    record completion {
-        label: string,
-        label-details: option<completion-label-details>,
-        detail: option<string>,
-        kind: option<completion-kind>,
-        insert-text-format: option<insert-text-format>,
-    }
-
-    /// The kind of an LSP completion.
-    variant completion-kind {
-        text,
-        method,
-        function,
-        %constructor,
-        field,
-        variable,
-        class,
-        %interface,
-        module,
-        property,
-        unit,
-        value,
-        %enum,
-        keyword,
-        snippet,
-        color,
-        file,
-        reference,
-        folder,
-        enum-member,
-        constant,
-        struct,
-        event,
-        operator,
-        type-parameter,
-        other(s32),
-    }
-
-    /// Label details for an LSP completion.
-    record completion-label-details {
-        detail: option<string>,
-        description: option<string>,
-    }
-
-    /// Defines how to interpret the insert text in a completion item.
-    variant insert-text-format {
-        plain-text,
-        snippet,
-        other(s32),
-    }
-
-    /// An LSP symbol.
-    record symbol {
-        kind: symbol-kind,
-        name: string,
-    }
-
-    /// The kind of an LSP symbol.
-    variant symbol-kind {
-        file,
-        module,
-        namespace,
-        %package,
-        class,
-        method,
-        property,
-        field,
-        %constructor,
-        %enum,
-        %interface,
-        function,
-        variable,
-        constant,
-        %string,
-        number,
-        boolean,
-        array,
-        object,
-        key,
-        null,
-        enum-member,
-        struct,
-        event,
-        operator,
-        type-parameter,
-        other(s32),
-    }
-}
diff --git a/crates/extension_api/wit/since_v0.8.0/nodejs.wit b/crates/extension_api/wit/since_v0.8.0/nodejs.wit
deleted file mode 100644
index c814548314..0000000000
--- a/crates/extension_api/wit/since_v0.8.0/nodejs.wit
+++ /dev/null
@@ -1,13 +0,0 @@
-interface nodejs {
-    /// Returns the path to the Node binary used by Zed.
-    node-binary-path: func() -> result<string, string>;
-
-    /// Returns the latest version of the given NPM package.
-    npm-package-latest-version: func(package-name: string) -> result<string, string>;
-
-    /// Returns the installed version of the given NPM package, if it exists.
-    npm-package-installed-version: func(package-name: string) -> result<option<string>, string>;
-
-    /// Installs the specified NPM package.
-    npm-install-package: func(package-name: string, version: string) -> result<_, string>;
-}
diff --git a/crates/extension_api/wit/since_v0.8.0/platform.wit b/crates/extension_api/wit/since_v0.8.0/platform.wit
deleted file mode 100644
index 48472a99bc..0000000000
--- a/crates/extension_api/wit/since_v0.8.0/platform.wit
+++ /dev/null
@@ -1,24 +0,0 @@
-interface platform {
-    /// An operating system.
-    enum os {
-        /// macOS.
-        mac,
-        /// Linux.
-        linux,
-        /// Windows.
-        windows,
-    }
-
-    /// A platform architecture.
-    enum architecture {
-        /// AArch64 (e.g., Apple Silicon).
-        aarch64,
-        /// x86.
-        x86,
-        /// x86-64.
-        x8664,
-    }
-
-    /// Gets the current operating system and architecture.
-    current-platform: func() -> tuple<os, architecture>;
-}
diff --git a/crates/extension_api/wit/since_v0.8.0/process.wit b/crates/extension_api/wit/since_v0.8.0/process.wit
deleted file mode 100644
index d9a5728a3d..0000000000
--- a/crates/extension_api/wit/since_v0.8.0/process.wit
+++ /dev/null
@@ -1,29 +0,0 @@
-interface process {
-    use common.{env-vars};
-
-    /// A command.
-    record command {
-        /// The command to execute.
-        command: string,
-        /// The arguments to pass to the command.
-        args: list<string>,
-        /// The environment variables to set for the command.
-        env: env-vars,
-    }
-
-    /// The output of a finished process.
-    record output {
-        /// The status (exit code) of the process.
-        ///
-        /// On Unix, this will be `None` if the process was terminated by a signal.
-        status: option<s32>,
-        /// The data that the process wrote to stdout.
-        stdout: list<u8>,
-        /// The data that the process wrote to stderr.
-        stderr: list<u8>,
-    }
-
-    /// Executes the given command as a child process, waiting for it to finish
-    /// and collecting all of its output.
-    run-command: func(command: command) -> result<output, string>;
-}
diff --git a/crates/extension_api/wit/since_v0.8.0/settings.rs b/crates/extension_api/wit/since_v0.8.0/settings.rs
deleted file mode 100644
index 19e28c1ba9..0000000000
--- a/crates/extension_api/wit/since_v0.8.0/settings.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-use serde::{Deserialize, Serialize};
-use std::{collections::HashMap, num::NonZeroU32};
-
-/// The settings for a particular language.
-#[derive(Debug, Serialize, Deserialize)]
-pub struct LanguageSettings {
-    /// How many columns a tab should occupy.
-    pub tab_size: NonZeroU32,
-}
-
-/// The settings for a particular language server.
-#[derive(Default, Debug, Serialize, Deserialize)]
-pub struct LspSettings {
-    /// The settings for the language server binary.
-    pub binary: Option<CommandSettings>,
-    /// The initialization options to pass to the language server.
-    pub initialization_options: Option<serde_json::Value>,
-    /// The settings to pass to language server.
-    pub settings: Option<serde_json::Value>,
-}
-
-/// The settings for a particular context server.
-#[derive(Default, Debug, Serialize, Deserialize, PartialEq, Eq)]
-pub struct ContextServerSettings {
-    /// The settings for the context server binary.
-    pub command: Option<CommandSettings>,
-    /// The settings to pass to the context server.
-    pub settings: Option<serde_json::Value>,
-}
-
-/// The settings for a command.
-#[derive(Debug, Serialize, Deserialize, PartialEq, Eq)]
-pub struct CommandSettings {
-    /// The path to the command.
-    pub path: Option<String>,
-    /// The arguments to pass to the command.
-    pub arguments: Option<Vec<String>>,
-    /// The environment variables.
-    pub env: Option<HashMap<String, String>>,
-}
diff --git a/crates/extension_api/wit/since_v0.8.0/slash-command.wit b/crates/extension_api/wit/since_v0.8.0/slash-command.wit
deleted file mode 100644
index f52561c2ef..0000000000
--- a/crates/extension_api/wit/since_v0.8.0/slash-command.wit
+++ /dev/null
@@ -1,41 +0,0 @@
-interface slash-command {
-    use common.{range};
-
-    /// A slash command for use in the Assistant.
-    record slash-command {
-        /// The name of the slash command.
-        name: string,
-        /// The description of the slash command.
-        description: string,
-        /// The tooltip text to display for the run button.
-        tooltip-text: string,
-        /// Whether this slash command requires an argument.
-        requires-argument: bool,
-    }
-
-    /// The output of a slash command.
-    record slash-command-output {
-        /// The text produced by the slash command.
-        text: string,
-        /// The list of sections to show in the slash command placeholder.
-        sections: list<slash-command-output-section>,
-    }
-
-    /// A section in the slash command output.
-    record slash-command-output-section {
-        /// The range this section occupies.
-        range: range,
-        /// The label to display in the placeholder for this section.
-        label: string,
-    }
-
-    /// A completion for a slash command argument.
-    record slash-command-argument-completion {
-        /// The label to display for this completion.
-        label: string,
-        /// The new text that should be inserted into the command when this completion is accepted.
-        new-text: string,
-        /// Whether the command should be run when accepting this completion.
-        run-command: bool,
-    }
-}
diff --git a/crates/extension_cli/Cargo.toml b/crates/extension_cli/Cargo.toml
deleted file mode 100644
index b2562a8e82..0000000000
--- a/crates/extension_cli/Cargo.toml
+++ /dev/null
@@ -1,32 +0,0 @@
-[package]
-name = "extension_cli"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[[bin]]
-name = "zed-extension"
-path = "src/main.rs"
-
-[dependencies]
-anyhow.workspace = true
-clap = { workspace = true, features = ["derive"] }
-env_logger.workspace = true
-extension.workspace = true
-fs.workspace = true
-gpui.workspace = true
-language.workspace = true
-log.workspace = true
-reqwest_client.workspace = true
-rpc.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-theme.workspace = true
-tokio = { workspace = true, features = ["full"] }
-toml.workspace = true
-tree-sitter.workspace = true
-wasmtime.workspace = true
diff --git a/crates/extension_cli/LICENSE-GPL b/crates/extension_cli/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/extension_cli/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/extension_cli/src/main.rs b/crates/extension_cli/src/main.rs
deleted file mode 100644
index 699a6b0143..0000000000
--- a/crates/extension_cli/src/main.rs
+++ /dev/null
@@ -1,421 +0,0 @@
-use std::collections::{BTreeSet, HashMap};
-use std::env;
-use std::fs;
-use std::path::{Path, PathBuf};
-use std::sync::Arc;
-
-use ::fs::{CopyOptions, Fs, RealFs, copy_recursive};
-use anyhow::{Context as _, Result, bail};
-use clap::Parser;
-use extension::ExtensionManifest;
-use extension::extension_builder::{CompileExtensionOptions, ExtensionBuilder};
-use language::LanguageConfig;
-use reqwest_client::ReqwestClient;
-use rpc::ExtensionProvides;
-use tokio::process::Command;
-use tree_sitter::{Language, Query, WasmStore};
-
-#[derive(Parser, Debug)]
-#[command(name = "zed-extension")]
-struct Args {
-    /// The path to the extension directory
-    #[arg(long)]
-    source_dir: PathBuf,
-    /// The output directory to place the packaged extension.
-    #[arg(long)]
-    output_dir: PathBuf,
-    /// The path to a directory where build dependencies are downloaded
-    #[arg(long)]
-    scratch_dir: PathBuf,
-}
-
-#[tokio::main]
-async fn main() -> Result<()> {
-    env_logger::init();
-
-    let args = Args::parse();
-    let fs = Arc::new(RealFs::new(None, gpui::background_executor()));
-    let engine = wasmtime::Engine::default();
-    let mut wasm_store = WasmStore::new(&engine)?;
-
-    let extension_path = args
-        .source_dir
-        .canonicalize()
-        .context("failed to canonicalize source_dir")?;
-    let scratch_dir = args
-        .scratch_dir
-        .canonicalize()
-        .context("failed to canonicalize scratch_dir")?;
-    let output_dir = if args.output_dir.is_relative() {
-        env::current_dir()?.join(&args.output_dir)
-    } else {
-        args.output_dir
-    };
-
-    log::info!("loading extension manifest");
-    let mut manifest = ExtensionManifest::load(fs.clone(), &extension_path).await?;
-
-    log::info!("compiling extension");
-
-    let user_agent = format!(
-        "Zed Extension CLI/{} ({}; {})",
-        env!("CARGO_PKG_VERSION"),
-        std::env::consts::OS,
-        std::env::consts::ARCH
-    );
-    let http_client = Arc::new(ReqwestClient::user_agent(&user_agent)?);
-
-    let builder = ExtensionBuilder::new(http_client, scratch_dir);
-    builder
-        .compile_extension(
-            &extension_path,
-            &mut manifest,
-            CompileExtensionOptions { release: true },
-            fs.clone(),
-        )
-        .await
-        .context("failed to compile extension")?;
-
-    let grammars = test_grammars(&manifest, &extension_path, &mut wasm_store)?;
-    test_languages(&manifest, &extension_path, &grammars)?;
-    test_themes(&manifest, &extension_path, fs.clone()).await?;
-
-    let archive_dir = output_dir.join("archive");
-    fs::remove_dir_all(&archive_dir).ok();
-    copy_extension_resources(&manifest, &extension_path, &archive_dir, fs.clone())
-        .await
-        .context("failed to copy extension resources")?;
-
-    let tar_output = Command::new("tar")
-        .current_dir(&output_dir)
-        .args(["-czvf", "archive.tar.gz", "-C", "archive", "."])
-        .output()
-        .await
-        .context("failed to run tar")?;
-    if !tar_output.status.success() {
-        bail!(
-            "failed to create archive.tar.gz: {}",
-            String::from_utf8_lossy(&tar_output.stderr)
-        );
-    }
-
-    let extension_provides = extension_provides(&manifest);
-
-    let manifest_json = serde_json::to_string(&rpc::ExtensionApiManifest {
-        name: manifest.name,
-        version: manifest.version,
-        description: manifest.description,
-        authors: manifest.authors,
-        schema_version: Some(manifest.schema_version.0),
-        repository: manifest
-            .repository
-            .context("missing repository in extension manifest")?,
-        wasm_api_version: manifest.lib.version.map(|version| version.to_string()),
-        provides: extension_provides,
-    })?;
-    fs::remove_dir_all(&archive_dir)?;
-    fs::write(output_dir.join("manifest.json"), manifest_json.as_bytes())?;
-
-    Ok(())
-}
-
-/// Returns the set of features provided by the extension.
-fn extension_provides(manifest: &ExtensionManifest) -> BTreeSet<ExtensionProvides> {
-    let mut provides = BTreeSet::default();
-    if !manifest.themes.is_empty() {
-        provides.insert(ExtensionProvides::Themes);
-    }
-
-    if !manifest.icon_themes.is_empty() {
-        provides.insert(ExtensionProvides::IconThemes);
-    }
-
-    if !manifest.languages.is_empty() {
-        provides.insert(ExtensionProvides::Languages);
-    }
-
-    if !manifest.grammars.is_empty() {
-        provides.insert(ExtensionProvides::Grammars);
-    }
-
-    if !manifest.language_servers.is_empty() {
-        provides.insert(ExtensionProvides::LanguageServers);
-    }
-
-    if !manifest.context_servers.is_empty() {
-        provides.insert(ExtensionProvides::ContextServers);
-    }
-
-    if !manifest.agent_servers.is_empty() {
-        provides.insert(ExtensionProvides::AgentServers);
-    }
-
-    if manifest.snippets.is_some() {
-        provides.insert(ExtensionProvides::Snippets);
-    }
-
-    if !manifest.debug_adapters.is_empty() {
-        provides.insert(ExtensionProvides::DebugAdapters);
-    }
-
-    provides
-}
-
-async fn copy_extension_resources(
-    manifest: &ExtensionManifest,
-    extension_path: &Path,
-    output_dir: &Path,
-    fs: Arc<dyn Fs>,
-) -> Result<()> {
-    fs::create_dir_all(output_dir).context("failed to create output dir")?;
-
-    let manifest_toml = toml::to_string(&manifest).context("failed to serialize manifest")?;
-    fs::write(output_dir.join("extension.toml"), &manifest_toml)
-        .context("failed to write extension.toml")?;
-
-    if manifest.lib.kind.is_some() {
-        fs::copy(
-            extension_path.join("extension.wasm"),
-            output_dir.join("extension.wasm"),
-        )
-        .context("failed to copy extension.wasm")?;
-    }
-
-    if !manifest.grammars.is_empty() {
-        let source_grammars_dir = extension_path.join("grammars");
-        let output_grammars_dir = output_dir.join("grammars");
-        fs::create_dir_all(&output_grammars_dir)?;
-        for grammar_name in manifest.grammars.keys() {
-            let mut grammar_filename = PathBuf::from(grammar_name.as_ref());
-            grammar_filename.set_extension("wasm");
-            fs::copy(
-                source_grammars_dir.join(&grammar_filename),
-                output_grammars_dir.join(&grammar_filename),
-            )
-            .with_context(|| format!("failed to copy grammar '{}'", grammar_filename.display()))?;
-        }
-    }
-
-    if !manifest.themes.is_empty() {
-        let output_themes_dir = output_dir.join("themes");
-        fs::create_dir_all(&output_themes_dir)?;
-        for theme_path in &manifest.themes {
-            fs::copy(
-                extension_path.join(theme_path),
-                output_themes_dir.join(theme_path.file_name().context("invalid theme path")?),
-            )
-            .with_context(|| format!("failed to copy theme '{}'", theme_path.display()))?;
-        }
-    }
-
-    if !manifest.icon_themes.is_empty() {
-        let output_icon_themes_dir = output_dir.join("icon_themes");
-        fs::create_dir_all(&output_icon_themes_dir)?;
-        for icon_theme_path in &manifest.icon_themes {
-            fs::copy(
-                extension_path.join(icon_theme_path),
-                output_icon_themes_dir.join(
-                    icon_theme_path
-                        .file_name()
-                        .context("invalid icon theme path")?,
-                ),
-            )
-            .with_context(|| {
-                format!("failed to copy icon theme '{}'", icon_theme_path.display())
-            })?;
-        }
-
-        let output_icons_dir = output_dir.join("icons");
-        fs::create_dir_all(&output_icons_dir)?;
-        copy_recursive(
-            fs.as_ref(),
-            &extension_path.join("icons"),
-            &output_icons_dir,
-            CopyOptions {
-                overwrite: true,
-                ignore_if_exists: false,
-            },
-        )
-        .await
-        .with_context(|| "failed to copy icons")?;
-    }
-
-    for (_, agent_entry) in &manifest.agent_servers {
-        if let Some(icon_path) = &agent_entry.icon {
-            let source_icon = extension_path.join(icon_path);
-            let dest_icon = output_dir.join(icon_path);
-
-            // Create parent directory if needed
-            if let Some(parent) = dest_icon.parent() {
-                fs::create_dir_all(parent)?;
-            }
-
-            fs::copy(&source_icon, &dest_icon)
-                .with_context(|| format!("failed to copy agent server icon '{}'", icon_path))?;
-        }
-    }
-
-    if !manifest.languages.is_empty() {
-        let output_languages_dir = output_dir.join("languages");
-        fs::create_dir_all(&output_languages_dir)?;
-        for language_path in &manifest.languages {
-            copy_recursive(
-                fs.as_ref(),
-                &extension_path.join(language_path),
-                &output_languages_dir
-                    .join(language_path.file_name().context("invalid language path")?),
-                CopyOptions {
-                    overwrite: true,
-                    ignore_if_exists: false,
-                },
-            )
-            .await
-            .with_context(|| {
-                format!("failed to copy language dir '{}'", language_path.display())
-            })?;
-        }
-    }
-
-    if !manifest.debug_adapters.is_empty() {
-        for (debug_adapter, entry) in &manifest.debug_adapters {
-            let schema_path = entry.schema_path.clone().unwrap_or_else(|| {
-                PathBuf::from("debug_adapter_schemas".to_owned())
-                    .join(debug_adapter.as_ref())
-                    .with_extension("json")
-            });
-            let parent = schema_path
-                .parent()
-                .with_context(|| format!("invalid empty schema path for {debug_adapter}"))?;
-            fs::create_dir_all(output_dir.join(parent))?;
-            copy_recursive(
-                fs.as_ref(),
-                &extension_path.join(&schema_path),
-                &output_dir.join(&schema_path),
-                CopyOptions {
-                    overwrite: true,
-                    ignore_if_exists: false,
-                },
-            )
-            .await
-            .with_context(|| {
-                format!(
-                    "failed to copy debug adapter schema '{}'",
-                    schema_path.display()
-                )
-            })?;
-        }
-    }
-
-    if let Some(snippets_path) = manifest.snippets.as_ref() {
-        let parent = snippets_path.parent();
-        if let Some(parent) = parent.filter(|p| p.components().next().is_some()) {
-            fs::create_dir_all(output_dir.join(parent))?;
-        }
-        copy_recursive(
-            fs.as_ref(),
-            &extension_path.join(&snippets_path),
-            &output_dir.join(&snippets_path),
-            CopyOptions {
-                overwrite: true,
-                ignore_if_exists: false,
-            },
-        )
-        .await
-        .with_context(|| format!("failed to copy snippets from '{}'", snippets_path.display()))?;
-    }
-
-    Ok(())
-}
-
-fn test_grammars(
-    manifest: &ExtensionManifest,
-    extension_path: &Path,
-    wasm_store: &mut WasmStore,
-) -> Result<HashMap<String, Language>> {
-    let mut grammars = HashMap::default();
-    let grammars_dir = extension_path.join("grammars");
-
-    for grammar_name in manifest.grammars.keys() {
-        let mut grammar_path = grammars_dir.join(grammar_name.as_ref());
-        grammar_path.set_extension("wasm");
-
-        let wasm = fs::read(&grammar_path)?;
-        let language = wasm_store.load_language(grammar_name, &wasm)?;
-        log::info!("loaded grammar {grammar_name}");
-        grammars.insert(grammar_name.to_string(), language);
-    }
-
-    Ok(grammars)
-}
-
-fn test_languages(
-    manifest: &ExtensionManifest,
-    extension_path: &Path,
-    grammars: &HashMap<String, Language>,
-) -> Result<()> {
-    for relative_language_dir in &manifest.languages {
-        let language_dir = extension_path.join(relative_language_dir);
-        let config_path = language_dir.join("config.toml");
-        let config_content = fs::read_to_string(&config_path)?;
-        let config: LanguageConfig = toml::from_str(&config_content)?;
-        let grammar = if let Some(name) = &config.grammar {
-            Some(
-                grammars
-                    .get(name.as_ref())
-                    .with_context(|| format!("grammar not found: '{name}'"))?,
-            )
-        } else {
-            None
-        };
-
-        let query_entries = fs::read_dir(&language_dir)?;
-        for entry in query_entries {
-            let entry = entry?;
-            let query_path = entry.path();
-            if query_path.extension() == Some("scm".as_ref()) {
-                let grammar = grammar.with_context(|| {
-                    format! {
-                        "language {} provides query {} but no grammar",
-                        config.name,
-                        query_path.display()
-                    }
-                })?;
-
-                let query_source = fs::read_to_string(&query_path)?;
-                let _query = Query::new(grammar, &query_source)?;
-            }
-        }
-
-        log::info!("loaded language {}", config.name);
-    }
-
-    Ok(())
-}
-
-async fn test_themes(
-    manifest: &ExtensionManifest,
-    extension_path: &Path,
-    fs: Arc<dyn Fs>,
-) -> Result<()> {
-    for relative_theme_path in &manifest.themes {
-        let theme_path = extension_path.join(relative_theme_path);
-        let theme_family = theme::read_user_theme(&theme_path, fs.clone()).await?;
-        log::info!("loaded theme family {}", theme_family.name);
-
-        for theme in &theme_family.themes {
-            if theme
-                .style
-                .colors
-                .deprecated_scrollbar_thumb_background
-                .is_some()
-            {
-                bail!(
-                    r#"Theme "{theme_name}" is using a deprecated style property: scrollbar_thumb.background. Use `scrollbar.thumb.background` instead."#,
-                    theme_name = theme.name
-                )
-            }
-        }
-    }
-
-    Ok(())
-}
diff --git a/crates/extension_host/Cargo.toml b/crates/extension_host/Cargo.toml
deleted file mode 100644
index 328b808b13..0000000000
--- a/crates/extension_host/Cargo.toml
+++ /dev/null
@@ -1,73 +0,0 @@
-[package]
-name = "extension_host"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/extension_host.rs"
-doctest = false
-
-[features]
-test-support = []
-
-[dependencies]
-anyhow.workspace = true
-async-compression.workspace = true
-async-tar.workspace = true
-async-trait.workspace = true
-client.workspace = true
-collections.workspace = true
-dap.workspace = true
-extension.workspace = true
-fs.workspace = true
-futures.workspace = true
-gpui.workspace = true
-gpui_tokio.workspace = true
-http_client.workspace = true
-language.workspace = true
-log.workspace = true
-lsp.workspace = true
-moka.workspace = true
-node_runtime.workspace = true
-paths.workspace = true
-project.workspace = true
-remote.workspace = true
-release_channel.workspace = true
-semver.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-serde_json_lenient.workspace = true
-settings.workspace = true
-task.workspace = true
-telemetry.workspace = true
-tempfile.workspace = true
-toml.workspace = true
-url.workspace = true
-util.workspace = true
-wasmparser.workspace = true
-wasmtime-wasi.workspace = true
-wasmtime.workspace = true
-
-[dev-dependencies]
-criterion.workspace = true
-ctor.workspace = true
-fs = { workspace = true, features = ["test-support"] }
-gpui = { workspace = true, features = ["test-support"] }
-language = { workspace = true, features = ["test-support"] }
-language_extension.workspace = true
-parking_lot.workspace = true
-project = { workspace = true, features = ["test-support"] }
-rand.workspace = true
-reqwest_client.workspace = true
-theme = { workspace = true, features = ["test-support"] }
-theme_extension.workspace = true
-zlog.workspace = true
-
-[[bench]]
-name = "extension_compilation_benchmark"
-harness = false
diff --git a/crates/extension_host/LICENSE-GPL b/crates/extension_host/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/extension_host/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/extension_host/benches/extension_compilation_benchmark.rs b/crates/extension_host/benches/extension_compilation_benchmark.rs
deleted file mode 100644
index a28f617dc3..0000000000
--- a/crates/extension_host/benches/extension_compilation_benchmark.rs
+++ /dev/null
@@ -1,155 +0,0 @@
-use std::{collections::BTreeMap, path::PathBuf, sync::Arc};
-
-use criterion::{BatchSize, BenchmarkId, Criterion, criterion_group, criterion_main};
-use extension::{
-    ExtensionCapability, ExtensionHostProxy, ExtensionLibraryKind, ExtensionManifest,
-    LanguageServerManifestEntry, LibManifestEntry, SchemaVersion,
-    extension_builder::{CompileExtensionOptions, ExtensionBuilder},
-};
-use extension_host::wasm_host::WasmHost;
-use fs::{Fs, RealFs};
-use gpui::{TestAppContext, TestDispatcher};
-use http_client::{FakeHttpClient, Response};
-use node_runtime::NodeRuntime;
-use rand::{SeedableRng, rngs::StdRng};
-use reqwest_client::ReqwestClient;
-use serde_json::json;
-use settings::SettingsStore;
-use util::test::TempTree;
-
-fn extension_benchmarks(c: &mut Criterion) {
-    let cx = init();
-    cx.update(gpui_tokio::init);
-
-    let mut group = c.benchmark_group("load");
-
-    let mut manifest = manifest();
-    let wasm_bytes = wasm_bytes(
-        &cx,
-        &mut manifest,
-        Arc::new(RealFs::new(None, cx.executor())),
-    );
-    let manifest = Arc::new(manifest);
-    let extensions_dir = TempTree::new(json!({
-        "installed": {},
-        "work": {}
-    }));
-    let wasm_host = wasm_host(&cx, &extensions_dir);
-
-    group.bench_function(BenchmarkId::from_parameter(1), |b| {
-        b.iter_batched(
-            || wasm_bytes.clone(),
-            |wasm_bytes| {
-                let _extension = cx
-                    .executor()
-                    .block(wasm_host.load_extension(wasm_bytes, &manifest, &cx.to_async()))
-                    .unwrap();
-            },
-            BatchSize::SmallInput,
-        );
-    });
-}
-
-fn init() -> TestAppContext {
-    const SEED: u64 = 9999;
-    let dispatcher = TestDispatcher::new(StdRng::seed_from_u64(SEED));
-    let cx = TestAppContext::build(dispatcher, None);
-    cx.executor().allow_parking();
-    cx.update(|cx| {
-        let store = SettingsStore::test(cx);
-        cx.set_global(store);
-        release_channel::init(semver::Version::new(0, 0, 0), cx);
-    });
-
-    cx
-}
-
-fn wasm_bytes(cx: &TestAppContext, manifest: &mut ExtensionManifest, fs: Arc<dyn Fs>) -> Vec<u8> {
-    let extension_builder = extension_builder();
-    let path = PathBuf::from(env!("CARGO_MANIFEST_DIR"))
-        .parent()
-        .unwrap()
-        .parent()
-        .unwrap()
-        .join("extensions/test-extension");
-    cx.executor()
-        .block(extension_builder.compile_extension(
-            &path,
-            manifest,
-            CompileExtensionOptions { release: true },
-            fs,
-        ))
-        .unwrap();
-    std::fs::read(path.join("extension.wasm")).unwrap()
-}
-
-fn extension_builder() -> ExtensionBuilder {
-    let user_agent = format!(
-        "Zed Extension CLI/{} ({}; {})",
-        env!("CARGO_PKG_VERSION"),
-        std::env::consts::OS,
-        std::env::consts::ARCH
-    );
-    let http_client = Arc::new(ReqwestClient::user_agent(&user_agent).unwrap());
-    // Local dir so that we don't have to download it on every run
-    let build_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("benches/.build");
-    ExtensionBuilder::new(http_client, build_dir)
-}
-
-fn wasm_host(cx: &TestAppContext, extensions_dir: &TempTree) -> Arc<WasmHost> {
-    let http_client = FakeHttpClient::create(async |_| {
-        Ok(Response::builder().status(404).body("not found".into())?)
-    });
-    let extensions_dir = extensions_dir.path().canonicalize().unwrap();
-    let work_dir = extensions_dir.join("work");
-    let fs = Arc::new(RealFs::new(None, cx.executor()));
-
-    cx.update(|cx| {
-        WasmHost::new(
-            fs,
-            http_client,
-            NodeRuntime::unavailable(),
-            Arc::new(ExtensionHostProxy::new()),
-            work_dir,
-            cx,
-        )
-    })
-}
-
-fn manifest() -> ExtensionManifest {
-    ExtensionManifest {
-        id: "test-extension".into(),
-        name: "Test Extension".into(),
-        version: "0.1.0".into(),
-        schema_version: SchemaVersion(1),
-        description: Some("An extension for use in tests.".into()),
-        authors: Vec::new(),
-        repository: None,
-        themes: Default::default(),
-        icon_themes: Vec::new(),
-        lib: LibManifestEntry {
-            kind: Some(ExtensionLibraryKind::Rust),
-            version: Some(semver::Version::new(0, 1, 0)),
-        },
-        languages: Vec::new(),
-        grammars: BTreeMap::default(),
-        language_servers: [("gleam".into(), LanguageServerManifestEntry::default())]
-            .into_iter()
-            .collect(),
-        context_servers: BTreeMap::default(),
-        agent_servers: BTreeMap::default(),
-        slash_commands: BTreeMap::default(),
-        snippets: None,
-        capabilities: vec![ExtensionCapability::ProcessExec(
-            extension::ProcessExecCapability {
-                command: "echo".into(),
-                args: vec!["hello!".into()],
-            },
-        )],
-        debug_adapters: Default::default(),
-        debug_locators: Default::default(),
-    }
-}
-
-criterion_group!(benches, extension_benchmarks);
-criterion_main!(benches);
diff --git a/crates/extension_host/build.rs b/crates/extension_host/build.rs
deleted file mode 100644
index f2c2b19998..0000000000
--- a/crates/extension_host/build.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-use std::env;
-use std::fs;
-use std::path::PathBuf;
-
-fn main() -> Result<(), Box<dyn std::error::Error>> {
-    copy_extension_api_rust_files()
-}
-
-/// rust-analyzer doesn't support include! for files from outside the crate.
-/// Copy them to the OUT_DIR, so we can include them from there, which is supported.
-fn copy_extension_api_rust_files() -> Result<(), Box<dyn std::error::Error>> {
-    let out_dir = env::var("OUT_DIR")?;
-    let input_dir = PathBuf::from("../extension_api/wit");
-    let output_dir = PathBuf::from(out_dir);
-
-    println!("cargo:rerun-if-changed={}", input_dir.display());
-
-    for entry in fs::read_dir(&input_dir)? {
-        let entry = entry?;
-        let path = entry.path();
-        if path.is_dir() {
-            println!("cargo:rerun-if-changed={}", path.display());
-
-            for subentry in fs::read_dir(&path)? {
-                let subentry = subentry?;
-                let subpath = subentry.path();
-                if subpath.extension() == Some(std::ffi::OsStr::new("rs")) {
-                    let relative_path = subpath.strip_prefix(&input_dir)?;
-                    let destination = output_dir.join(relative_path);
-
-                    fs::create_dir_all(destination.parent().unwrap())?;
-                    fs::copy(&subpath, &destination)?;
-                }
-            }
-        } else if path.extension() == Some(std::ffi::OsStr::new("rs")) {
-            let relative_path = path.strip_prefix(&input_dir)?;
-            let destination = output_dir.join(relative_path);
-
-            fs::create_dir_all(destination.parent().unwrap())?;
-            fs::copy(&path, &destination)?;
-            println!("cargo:rerun-if-changed={}", path.display());
-        }
-    }
-
-    Ok(())
-}
diff --git a/crates/extension_host/src/capability_granter.rs b/crates/extension_host/src/capability_granter.rs
deleted file mode 100644
index 9f27b5e480..0000000000
--- a/crates/extension_host/src/capability_granter.rs
+++ /dev/null
@@ -1,153 +0,0 @@
-use std::sync::Arc;
-
-use anyhow::{Result, bail};
-use extension::{ExtensionCapability, ExtensionManifest};
-use url::Url;
-
-pub struct CapabilityGranter {
-    granted_capabilities: Vec<ExtensionCapability>,
-    manifest: Arc<ExtensionManifest>,
-}
-
-impl CapabilityGranter {
-    pub fn new(
-        granted_capabilities: Vec<ExtensionCapability>,
-        manifest: Arc<ExtensionManifest>,
-    ) -> Self {
-        Self {
-            granted_capabilities,
-            manifest,
-        }
-    }
-
-    pub fn grant_exec(
-        &self,
-        desired_command: &str,
-        desired_args: &[impl AsRef<str> + std::fmt::Debug],
-    ) -> Result<()> {
-        self.manifest.allow_exec(desired_command, desired_args)?;
-
-        let is_allowed = self
-            .granted_capabilities
-            .iter()
-            .any(|capability| match capability {
-                ExtensionCapability::ProcessExec(capability) => {
-                    capability.allows(desired_command, desired_args)
-                }
-                _ => false,
-            });
-
-        if !is_allowed {
-            bail!(
-                "capability for process:exec {desired_command} {desired_args:?} is not granted by the extension host",
-            );
-        }
-
-        Ok(())
-    }
-
-    pub fn grant_download_file(&self, desired_url: &Url) -> Result<()> {
-        let is_allowed = self
-            .granted_capabilities
-            .iter()
-            .any(|capability| match capability {
-                ExtensionCapability::DownloadFile(capability) => capability.allows(desired_url),
-                _ => false,
-            });
-
-        if !is_allowed {
-            bail!(
-                "capability for download_file {desired_url} is not granted by the extension host",
-            );
-        }
-
-        Ok(())
-    }
-
-    pub fn grant_npm_install_package(&self, package_name: &str) -> Result<()> {
-        let is_allowed = self
-            .granted_capabilities
-            .iter()
-            .any(|capability| match capability {
-                ExtensionCapability::NpmInstallPackage(capability) => {
-                    capability.allows(package_name)
-                }
-                _ => false,
-            });
-
-        if !is_allowed {
-            bail!("capability for npm:install {package_name} is not granted by the extension host",);
-        }
-
-        Ok(())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::collections::BTreeMap;
-
-    use extension::{ProcessExecCapability, SchemaVersion};
-
-    use super::*;
-
-    fn extension_manifest() -> ExtensionManifest {
-        ExtensionManifest {
-            id: "test".into(),
-            name: "Test".to_string(),
-            version: "1.0.0".into(),
-            schema_version: SchemaVersion::ZERO,
-            description: None,
-            repository: None,
-            authors: vec![],
-            lib: Default::default(),
-            themes: vec![],
-            icon_themes: vec![],
-            languages: vec![],
-            grammars: BTreeMap::default(),
-            language_servers: BTreeMap::default(),
-            context_servers: BTreeMap::default(),
-            agent_servers: BTreeMap::default(),
-            slash_commands: BTreeMap::default(),
-            snippets: None,
-            capabilities: vec![],
-            debug_adapters: Default::default(),
-            debug_locators: Default::default(),
-        }
-    }
-
-    #[test]
-    fn test_grant_exec() {
-        let manifest = Arc::new(ExtensionManifest {
-            capabilities: vec![ExtensionCapability::ProcessExec(ProcessExecCapability {
-                command: "ls".to_string(),
-                args: vec!["-la".to_string()],
-            })],
-            ..extension_manifest()
-        });
-
-        // It returns an error when the extension host has no granted capabilities.
-        let granter = CapabilityGranter::new(Vec::new(), manifest.clone());
-        assert!(granter.grant_exec("ls", &["-la"]).is_err());
-
-        // It succeeds when the extension host has the exact capability.
-        let granter = CapabilityGranter::new(
-            vec![ExtensionCapability::ProcessExec(ProcessExecCapability {
-                command: "ls".to_string(),
-                args: vec!["-la".to_string()],
-            })],
-            manifest.clone(),
-        );
-        assert!(granter.grant_exec("ls", &["-la"]).is_ok());
-
-        // It succeeds when the extension host has a wildcard capability.
-        let granter = CapabilityGranter::new(
-            vec![ExtensionCapability::ProcessExec(ProcessExecCapability {
-                command: "*".to_string(),
-                args: vec!["**".to_string()],
-            })],
-            manifest,
-        );
-        assert!(granter.grant_exec("ls", &["-la"]).is_ok());
-    }
-}
diff --git a/crates/extension_host/src/extension_host.rs b/crates/extension_host/src/extension_host.rs
deleted file mode 100644
index 09e8259771..0000000000
--- a/crates/extension_host/src/extension_host.rs
+++ /dev/null
@@ -1,1878 +0,0 @@
-mod capability_granter;
-pub mod extension_settings;
-pub mod headless_host;
-pub mod wasm_host;
-
-#[cfg(test)]
-mod extension_store_test;
-
-use anyhow::{Context as _, Result, anyhow, bail};
-use async_compression::futures::bufread::GzipDecoder;
-use async_tar::Archive;
-use client::ExtensionProvides;
-use client::{Client, ExtensionMetadata, GetExtensionsResponse, proto, telemetry::Telemetry};
-use collections::{BTreeMap, BTreeSet, HashSet, btree_map};
-pub use extension::ExtensionManifest;
-use extension::extension_builder::{CompileExtensionOptions, ExtensionBuilder};
-use extension::{
-    ExtensionContextServerProxy, ExtensionDebugAdapterProviderProxy, ExtensionEvents,
-    ExtensionGrammarProxy, ExtensionHostProxy, ExtensionLanguageProxy,
-    ExtensionLanguageServerProxy, ExtensionSlashCommandProxy, ExtensionSnippetProxy,
-    ExtensionThemeProxy,
-};
-use fs::{Fs, RemoveOptions};
-use futures::future::join_all;
-use futures::{
-    AsyncReadExt as _, Future, FutureExt as _, StreamExt as _,
-    channel::{
-        mpsc::{UnboundedSender, unbounded},
-        oneshot,
-    },
-    io::BufReader,
-    select_biased,
-};
-use gpui::{
-    App, AppContext as _, AsyncApp, Context, Entity, EventEmitter, Global, Task, WeakEntity,
-    actions,
-};
-use http_client::{AsyncBody, HttpClient, HttpClientWithUrl};
-use language::{
-    LanguageConfig, LanguageMatcher, LanguageName, LanguageQueries, LoadedLanguage,
-    QUERY_FILENAME_PREFIXES, Rope,
-};
-use node_runtime::NodeRuntime;
-use project::ContextProviderWithTasks;
-use release_channel::ReleaseChannel;
-use remote::RemoteClient;
-use semver::Version;
-use serde::{Deserialize, Serialize};
-use settings::Settings;
-use std::ops::RangeInclusive;
-use std::str::FromStr;
-use std::{
-    cmp::Ordering,
-    path::{self, Path, PathBuf},
-    sync::Arc,
-    time::{Duration, Instant},
-};
-use url::Url;
-use util::{ResultExt, paths::RemotePathBuf};
-use wasm_host::{
-    WasmExtension, WasmHost,
-    wit::{is_supported_wasm_api_version, wasm_api_version_range},
-};
-
-pub use extension::{
-    ExtensionLibraryKind, GrammarManifestEntry, OldExtensionManifest, SchemaVersion,
-};
-pub use extension_settings::ExtensionSettings;
-
-pub const RELOAD_DEBOUNCE_DURATION: Duration = Duration::from_millis(200);
-const FS_WATCH_LATENCY: Duration = Duration::from_millis(100);
-
-/// The current extension [`SchemaVersion`] supported by Zed.
-const CURRENT_SCHEMA_VERSION: SchemaVersion = SchemaVersion(1);
-
-/// Extensions that should no longer be loaded or downloaded.
-///
-/// These snippets should no longer be downloaded or loaded, because their
-/// functionality has been integrated into the core editor.
-const SUPPRESSED_EXTENSIONS: &[&str] = &["snippets", "ruff", "ty", "basedpyright"];
-
-/// Returns the [`SchemaVersion`] range that is compatible with this version of Zed.
-pub fn schema_version_range() -> RangeInclusive<SchemaVersion> {
-    SchemaVersion::ZERO..=CURRENT_SCHEMA_VERSION
-}
-
-/// Returns whether the given extension version is compatible with this version of Zed.
-pub fn is_version_compatible(
-    release_channel: ReleaseChannel,
-    extension_version: &ExtensionMetadata,
-) -> bool {
-    let schema_version = extension_version.manifest.schema_version.unwrap_or(0);
-    if CURRENT_SCHEMA_VERSION.0 < schema_version {
-        return false;
-    }
-
-    if let Some(wasm_api_version) = extension_version
-        .manifest
-        .wasm_api_version
-        .as_ref()
-        .and_then(|wasm_api_version| Version::from_str(wasm_api_version).ok())
-        && !is_supported_wasm_api_version(release_channel, wasm_api_version)
-    {
-        return false;
-    }
-
-    true
-}
-
-pub struct ExtensionStore {
-    pub proxy: Arc<ExtensionHostProxy>,
-    pub builder: Arc<ExtensionBuilder>,
-    pub extension_index: ExtensionIndex,
-    pub fs: Arc<dyn Fs>,
-    pub http_client: Arc<HttpClientWithUrl>,
-    pub telemetry: Option<Arc<Telemetry>>,
-    pub reload_tx: UnboundedSender<Option<Arc<str>>>,
-    pub reload_complete_senders: Vec<oneshot::Sender<()>>,
-    pub installed_dir: PathBuf,
-    pub outstanding_operations: BTreeMap<Arc<str>, ExtensionOperation>,
-    pub index_path: PathBuf,
-    pub modified_extensions: HashSet<Arc<str>>,
-    pub wasm_host: Arc<WasmHost>,
-    pub wasm_extensions: Vec<(Arc<ExtensionManifest>, WasmExtension)>,
-    pub tasks: Vec<Task<()>>,
-    pub remote_clients: Vec<WeakEntity<RemoteClient>>,
-    pub ssh_registered_tx: UnboundedSender<()>,
-}
-
-#[derive(Clone, Copy)]
-pub enum ExtensionOperation {
-    Upgrade,
-    Install,
-    Remove,
-}
-
-#[derive(Clone)]
-pub enum Event {
-    ExtensionsUpdated,
-    StartedReloading,
-    ExtensionInstalled(Arc<str>),
-    ExtensionUninstalled(Arc<str>),
-    ExtensionFailedToLoad(Arc<str>),
-}
-
-impl EventEmitter<Event> for ExtensionStore {}
-
-struct GlobalExtensionStore(Entity<ExtensionStore>);
-
-impl Global for GlobalExtensionStore {}
-
-#[derive(Debug, Deserialize, Serialize, Default, PartialEq, Eq)]
-pub struct ExtensionIndex {
-    pub extensions: BTreeMap<Arc<str>, ExtensionIndexEntry>,
-    pub themes: BTreeMap<Arc<str>, ExtensionIndexThemeEntry>,
-    #[serde(default)]
-    pub icon_themes: BTreeMap<Arc<str>, ExtensionIndexIconThemeEntry>,
-    pub languages: BTreeMap<LanguageName, ExtensionIndexLanguageEntry>,
-}
-
-#[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]
-pub struct ExtensionIndexEntry {
-    pub manifest: Arc<ExtensionManifest>,
-    pub dev: bool,
-}
-
-#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Debug, Deserialize, Serialize)]
-pub struct ExtensionIndexThemeEntry {
-    pub extension: Arc<str>,
-    pub path: PathBuf,
-}
-
-#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Debug, Deserialize, Serialize)]
-pub struct ExtensionIndexIconThemeEntry {
-    pub extension: Arc<str>,
-    pub path: PathBuf,
-}
-
-#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Debug, Deserialize, Serialize)]
-pub struct ExtensionIndexLanguageEntry {
-    pub extension: Arc<str>,
-    pub path: PathBuf,
-    pub matcher: LanguageMatcher,
-    pub hidden: bool,
-    pub grammar: Option<Arc<str>>,
-}
-
-actions!(
-    zed,
-    [
-        /// Reloads all installed extensions.
-        ReloadExtensions
-    ]
-);
-
-pub fn init(
-    extension_host_proxy: Arc<ExtensionHostProxy>,
-    fs: Arc<dyn Fs>,
-    client: Arc<Client>,
-    node_runtime: NodeRuntime,
-    cx: &mut App,
-) {
-    let store = cx.new(move |cx| {
-        ExtensionStore::new(
-            paths::extensions_dir().clone(),
-            None,
-            extension_host_proxy,
-            fs,
-            client.http_client(),
-            client.http_client(),
-            Some(client.telemetry().clone()),
-            node_runtime,
-            cx,
-        )
-    });
-
-    cx.on_action(|_: &ReloadExtensions, cx| {
-        let store = cx.global::<GlobalExtensionStore>().0.clone();
-        store.update(cx, |store, cx| drop(store.reload(None, cx)));
-    });
-
-    cx.set_global(GlobalExtensionStore(store));
-}
-
-impl ExtensionStore {
-    pub fn try_global(cx: &App) -> Option<Entity<Self>> {
-        cx.try_global::<GlobalExtensionStore>()
-            .map(|store| store.0.clone())
-    }
-
-    pub fn global(cx: &App) -> Entity<Self> {
-        cx.global::<GlobalExtensionStore>().0.clone()
-    }
-
-    pub fn new(
-        extensions_dir: PathBuf,
-        build_dir: Option<PathBuf>,
-        extension_host_proxy: Arc<ExtensionHostProxy>,
-        fs: Arc<dyn Fs>,
-        http_client: Arc<HttpClientWithUrl>,
-        builder_client: Arc<dyn HttpClient>,
-        telemetry: Option<Arc<Telemetry>>,
-        node_runtime: NodeRuntime,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let work_dir = extensions_dir.join("work");
-        let build_dir = build_dir.unwrap_or_else(|| extensions_dir.join("build"));
-        let installed_dir = extensions_dir.join("installed");
-        let index_path = extensions_dir.join("index.json");
-
-        let (reload_tx, mut reload_rx) = unbounded();
-        let (connection_registered_tx, mut connection_registered_rx) = unbounded();
-        let mut this = Self {
-            proxy: extension_host_proxy.clone(),
-            extension_index: Default::default(),
-            installed_dir,
-            index_path,
-            builder: Arc::new(ExtensionBuilder::new(builder_client, build_dir)),
-            outstanding_operations: Default::default(),
-            modified_extensions: Default::default(),
-            reload_complete_senders: Vec::new(),
-            wasm_host: WasmHost::new(
-                fs.clone(),
-                http_client.clone(),
-                node_runtime,
-                extension_host_proxy,
-                work_dir,
-                cx,
-            ),
-            wasm_extensions: Vec::new(),
-            fs,
-            http_client,
-            telemetry,
-            reload_tx,
-            tasks: Vec::new(),
-
-            remote_clients: Default::default(),
-            ssh_registered_tx: connection_registered_tx,
-        };
-
-        // The extensions store maintains an index file, which contains a complete
-        // list of the installed extensions and the resources that they provide.
-        // This index is loaded synchronously on startup.
-        let (index_content, index_metadata, extensions_metadata) =
-            cx.background_executor().block(async {
-                futures::join!(
-                    this.fs.load(&this.index_path),
-                    this.fs.metadata(&this.index_path),
-                    this.fs.metadata(&this.installed_dir),
-                )
-            });
-
-        // Normally, there is no need to rebuild the index. But if the index file
-        // is invalid or is out-of-date according to the filesystem mtimes, then
-        // it must be asynchronously rebuilt.
-        let mut extension_index = ExtensionIndex::default();
-        let mut extension_index_needs_rebuild = true;
-        if let Ok(index_content) = index_content
-            && let Some(index) = serde_json::from_str(&index_content).log_err()
-        {
-            extension_index = index;
-            if let (Ok(Some(index_metadata)), Ok(Some(extensions_metadata))) =
-                (index_metadata, extensions_metadata)
-                && index_metadata
-                    .mtime
-                    .bad_is_greater_than(extensions_metadata.mtime)
-            {
-                extension_index_needs_rebuild = false;
-            }
-        }
-
-        // Immediately load all of the extensions in the initial manifest. If the
-        // index needs to be rebuild, then enqueue
-        let load_initial_extensions = this.extensions_updated(extension_index, cx);
-        let mut reload_future = None;
-        if extension_index_needs_rebuild {
-            reload_future = Some(this.reload(None, cx));
-        }
-
-        cx.spawn(async move |this, cx| {
-            if let Some(future) = reload_future {
-                future.await;
-            }
-            this.update(cx, |this, cx| this.auto_install_extensions(cx))
-                .ok();
-            this.update(cx, |this, cx| this.check_for_updates(cx)).ok();
-        })
-        .detach();
-
-        // Perform all extension loading in a single task to ensure that we
-        // never attempt to simultaneously load/unload extensions from multiple
-        // parallel tasks.
-        this.tasks.push(cx.spawn(async move |this, cx| {
-            async move {
-                load_initial_extensions.await;
-
-                let mut index_changed = false;
-                let mut debounce_timer = cx.background_spawn(futures::future::pending()).fuse();
-                loop {
-                    select_biased! {
-                        _ = debounce_timer => {
-                            if index_changed {
-                                let index = this
-                                    .update(cx, |this, cx| this.rebuild_extension_index(cx))?
-                                    .await;
-                                this.update(cx, |this, cx| this.extensions_updated(index, cx))?
-                                    .await;
-                                index_changed = false;
-                            }
-
-                            Self::update_remote_clients(&this, cx).await?;
-                        }
-                        _ = connection_registered_rx.next() => {
-                            debounce_timer = cx
-                                .background_executor()
-                                .timer(RELOAD_DEBOUNCE_DURATION)
-                                .fuse();
-                        }
-                        extension_id = reload_rx.next() => {
-                            let Some(extension_id) = extension_id else { break; };
-                            this.update(cx, |this, _| {
-                                this.modified_extensions.extend(extension_id);
-                            })?;
-                            index_changed = true;
-                            debounce_timer = cx
-                                .background_executor()
-                                .timer(RELOAD_DEBOUNCE_DURATION)
-                                .fuse();
-                        }
-                    }
-                }
-
-                anyhow::Ok(())
-            }
-            .map(drop)
-            .await;
-        }));
-
-        // Watch the installed extensions directory for changes. Whenever changes are
-        // detected, rebuild the extension index, and load/unload any extensions that
-        // have been added, removed, or modified.
-        this.tasks.push(cx.background_spawn({
-            let fs = this.fs.clone();
-            let reload_tx = this.reload_tx.clone();
-            let installed_dir = this.installed_dir.clone();
-            async move {
-                let (mut paths, _) = fs.watch(&installed_dir, FS_WATCH_LATENCY).await;
-                while let Some(events) = paths.next().await {
-                    for event in events {
-                        let Ok(event_path) = event.path.strip_prefix(&installed_dir) else {
-                            continue;
-                        };
-
-                        if let Some(path::Component::Normal(extension_dir_name)) =
-                            event_path.components().next()
-                            && let Some(extension_id) = extension_dir_name.to_str()
-                        {
-                            reload_tx.unbounded_send(Some(extension_id.into())).ok();
-                        }
-                    }
-                }
-            }
-        }));
-
-        this
-    }
-
-    pub fn reload(
-        &mut self,
-        modified_extension: Option<Arc<str>>,
-        cx: &mut Context<Self>,
-    ) -> impl Future<Output = ()> + use<> {
-        let (tx, rx) = oneshot::channel();
-        self.reload_complete_senders.push(tx);
-        self.reload_tx
-            .unbounded_send(modified_extension)
-            .expect("reload task exited");
-        cx.emit(Event::StartedReloading);
-
-        async move {
-            rx.await.ok();
-        }
-    }
-
-    fn extensions_dir(&self) -> PathBuf {
-        self.installed_dir.clone()
-    }
-
-    pub fn outstanding_operations(&self) -> &BTreeMap<Arc<str>, ExtensionOperation> {
-        &self.outstanding_operations
-    }
-
-    pub fn installed_extensions(&self) -> &BTreeMap<Arc<str>, ExtensionIndexEntry> {
-        &self.extension_index.extensions
-    }
-
-    pub fn dev_extensions(&self) -> impl Iterator<Item = &Arc<ExtensionManifest>> {
-        self.extension_index
-            .extensions
-            .values()
-            .filter_map(|extension| extension.dev.then_some(&extension.manifest))
-    }
-
-    pub fn extension_manifest_for_id(&self, extension_id: &str) -> Option<&Arc<ExtensionManifest>> {
-        self.extension_index
-            .extensions
-            .get(extension_id)
-            .map(|extension| &extension.manifest)
-    }
-
-    /// Returns the names of themes provided by extensions.
-    pub fn extension_themes<'a>(
-        &'a self,
-        extension_id: &'a str,
-    ) -> impl Iterator<Item = &'a Arc<str>> {
-        self.extension_index
-            .themes
-            .iter()
-            .filter_map(|(name, theme)| theme.extension.as_ref().eq(extension_id).then_some(name))
-    }
-
-    /// Returns the path to the theme file within an extension, if there is an
-    /// extension that provides the theme.
-    pub fn path_to_extension_theme(&self, theme_name: &str) -> Option<PathBuf> {
-        let entry = self.extension_index.themes.get(theme_name)?;
-
-        Some(
-            self.extensions_dir()
-                .join(entry.extension.as_ref())
-                .join(&entry.path),
-        )
-    }
-
-    /// Returns the names of icon themes provided by extensions.
-    pub fn extension_icon_themes<'a>(
-        &'a self,
-        extension_id: &'a str,
-    ) -> impl Iterator<Item = &'a Arc<str>> {
-        self.extension_index
-            .icon_themes
-            .iter()
-            .filter_map(|(name, icon_theme)| {
-                icon_theme
-                    .extension
-                    .as_ref()
-                    .eq(extension_id)
-                    .then_some(name)
-            })
-    }
-
-    /// Returns the path to the icon theme file within an extension, if there is
-    /// an extension that provides the icon theme.
-    pub fn path_to_extension_icon_theme(
-        &self,
-        icon_theme_name: &str,
-    ) -> Option<(PathBuf, PathBuf)> {
-        let entry = self.extension_index.icon_themes.get(icon_theme_name)?;
-
-        let icon_theme_path = self
-            .extensions_dir()
-            .join(entry.extension.as_ref())
-            .join(&entry.path);
-        let icons_root_path = self.extensions_dir().join(entry.extension.as_ref());
-
-        Some((icon_theme_path, icons_root_path))
-    }
-
-    pub fn fetch_extensions(
-        &self,
-        search: Option<&str>,
-        provides_filter: Option<&BTreeSet<ExtensionProvides>>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Vec<ExtensionMetadata>>> {
-        let version = CURRENT_SCHEMA_VERSION.to_string();
-        let mut query = vec![("max_schema_version", version.as_str())];
-        if let Some(search) = search {
-            query.push(("filter", search));
-        }
-
-        let provides_filter = provides_filter.map(|provides_filter| {
-            provides_filter
-                .iter()
-                .map(|provides| provides.to_string())
-                .collect::<Vec<_>>()
-                .join(",")
-        });
-        if let Some(provides_filter) = provides_filter.as_deref() {
-            query.push(("provides", provides_filter));
-        }
-
-        self.fetch_extensions_from_api("/extensions", &query, cx)
-    }
-
-    pub fn fetch_extensions_with_update_available(
-        &mut self,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Vec<ExtensionMetadata>>> {
-        let schema_versions = schema_version_range();
-        let wasm_api_versions = wasm_api_version_range(ReleaseChannel::global(cx));
-        let extension_settings = ExtensionSettings::get_global(cx);
-        let extension_ids = self
-            .extension_index
-            .extensions
-            .iter()
-            .filter(|(id, entry)| !entry.dev && extension_settings.should_auto_update(id))
-            .map(|(id, _)| id.as_ref())
-            .collect::<Vec<_>>()
-            .join(",");
-        let task = self.fetch_extensions_from_api(
-            "/extensions/updates",
-            &[
-                ("min_schema_version", &schema_versions.start().to_string()),
-                ("max_schema_version", &schema_versions.end().to_string()),
-                (
-                    "min_wasm_api_version",
-                    &wasm_api_versions.start().to_string(),
-                ),
-                ("max_wasm_api_version", &wasm_api_versions.end().to_string()),
-                ("ids", &extension_ids),
-            ],
-            cx,
-        );
-        cx.spawn(async move |this, cx| {
-            let extensions = task.await?;
-            this.update(cx, |this, _cx| {
-                extensions
-                    .into_iter()
-                    .filter(|extension| {
-                        this.extension_index
-                            .extensions
-                            .get(&extension.id)
-                            .is_none_or(|installed_extension| {
-                                installed_extension.manifest.version != extension.manifest.version
-                            })
-                    })
-                    .collect()
-            })
-        })
-    }
-
-    pub fn fetch_extension_versions(
-        &self,
-        extension_id: &str,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Vec<ExtensionMetadata>>> {
-        self.fetch_extensions_from_api(&format!("/extensions/{extension_id}"), &[], cx)
-    }
-
-    /// Installs any extensions that should be included with Zed by default.
-    ///
-    /// This can be used to make certain functionality provided by extensions
-    /// available out-of-the-box.
-    pub fn auto_install_extensions(&mut self, cx: &mut Context<Self>) {
-        if cfg!(test) {
-            return;
-        }
-
-        let extension_settings = ExtensionSettings::get_global(cx);
-
-        let extensions_to_install = extension_settings
-            .auto_install_extensions
-            .keys()
-            .filter(|extension_id| extension_settings.should_auto_install(extension_id))
-            .filter(|extension_id| {
-                let is_already_installed = self
-                    .extension_index
-                    .extensions
-                    .contains_key(extension_id.as_ref());
-                !is_already_installed && !SUPPRESSED_EXTENSIONS.contains(&extension_id.as_ref())
-            })
-            .cloned()
-            .collect::<Vec<_>>();
-
-        cx.spawn(async move |this, cx| {
-            for extension_id in extensions_to_install {
-                this.update(cx, |this, cx| {
-                    this.install_latest_extension(extension_id.clone(), cx);
-                })
-                .ok();
-            }
-        })
-        .detach();
-    }
-
-    pub fn check_for_updates(&mut self, cx: &mut Context<Self>) {
-        let task = self.fetch_extensions_with_update_available(cx);
-        cx.spawn(async move |this, cx| Self::upgrade_extensions(this, task.await?, cx).await)
-            .detach();
-    }
-
-    async fn upgrade_extensions(
-        this: WeakEntity<Self>,
-        extensions: Vec<ExtensionMetadata>,
-        cx: &mut AsyncApp,
-    ) -> Result<()> {
-        for extension in extensions {
-            let task = this.update(cx, |this, cx| {
-                if let Some(installed_extension) =
-                    this.extension_index.extensions.get(&extension.id)
-                {
-                    let installed_version =
-                        Version::from_str(&installed_extension.manifest.version).ok()?;
-                    let latest_version = Version::from_str(&extension.manifest.version).ok()?;
-
-                    if installed_version >= latest_version {
-                        return None;
-                    }
-                }
-
-                Some(this.upgrade_extension(extension.id, extension.manifest.version, cx))
-            })?;
-
-            if let Some(task) = task {
-                task.await.log_err();
-            }
-        }
-        anyhow::Ok(())
-    }
-
-    fn fetch_extensions_from_api(
-        &self,
-        path: &str,
-        query: &[(&str, &str)],
-        cx: &mut Context<ExtensionStore>,
-    ) -> Task<Result<Vec<ExtensionMetadata>>> {
-        let url = self.http_client.build_zed_api_url(path, query);
-        let http_client = self.http_client.clone();
-        cx.spawn(async move |_, _| {
-            let mut response = http_client
-                .get(url?.as_ref(), AsyncBody::empty(), true)
-                .await?;
-
-            let mut body = Vec::new();
-            response
-                .body_mut()
-                .read_to_end(&mut body)
-                .await
-                .context("error reading extensions")?;
-
-            if response.status().is_client_error() {
-                let text = String::from_utf8_lossy(body.as_slice());
-                bail!(
-                    "status error {}, response: {text:?}",
-                    response.status().as_u16()
-                );
-            }
-
-            let mut response: GetExtensionsResponse = serde_json::from_slice(&body)?;
-
-            response
-                .data
-                .retain(|extension| !SUPPRESSED_EXTENSIONS.contains(&extension.id.as_ref()));
-
-            Ok(response.data)
-        })
-    }
-
-    pub fn install_extension(
-        &mut self,
-        extension_id: Arc<str>,
-        version: Arc<str>,
-        cx: &mut Context<Self>,
-    ) {
-        self.install_or_upgrade_extension(extension_id, version, ExtensionOperation::Install, cx)
-            .detach_and_log_err(cx);
-    }
-
-    fn install_or_upgrade_extension_at_endpoint(
-        &mut self,
-        extension_id: Arc<str>,
-        url: Url,
-        operation: ExtensionOperation,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let extension_dir = self.installed_dir.join(extension_id.as_ref());
-        let http_client = self.http_client.clone();
-        let fs = self.fs.clone();
-
-        match self.outstanding_operations.entry(extension_id.clone()) {
-            btree_map::Entry::Occupied(_) => return Task::ready(Ok(())),
-            btree_map::Entry::Vacant(e) => e.insert(operation),
-        };
-        cx.notify();
-
-        cx.spawn(async move |this, cx| {
-            let _finish = cx.on_drop(&this, {
-                let extension_id = extension_id.clone();
-                move |this, cx| {
-                    this.outstanding_operations.remove(extension_id.as_ref());
-                    cx.notify();
-                }
-            });
-
-            let mut response = http_client
-                .get(url.as_ref(), Default::default(), true)
-                .await
-                .context("downloading extension")?;
-
-            fs.remove_dir(
-                &extension_dir,
-                RemoveOptions {
-                    recursive: true,
-                    ignore_if_not_exists: true,
-                },
-            )
-            .await?;
-
-            let content_length = response
-                .headers()
-                .get(http_client::http::header::CONTENT_LENGTH)
-                .and_then(|value| value.to_str().ok()?.parse::<usize>().ok());
-
-            let mut body = BufReader::new(response.body_mut());
-            let mut tar_gz_bytes = Vec::new();
-            body.read_to_end(&mut tar_gz_bytes).await?;
-
-            if let Some(content_length) = content_length {
-                let actual_len = tar_gz_bytes.len();
-                if content_length != actual_len {
-                    bail!(concat!(
-                        "downloaded extension size {actual_len} ",
-                        "does not match content length {content_length}"
-                    ));
-                }
-            }
-            let decompressed_bytes = GzipDecoder::new(BufReader::new(tar_gz_bytes.as_slice()));
-            let archive = Archive::new(decompressed_bytes);
-            archive.unpack(extension_dir).await?;
-            this.update(cx, |this, cx| this.reload(Some(extension_id.clone()), cx))?
-                .await;
-
-            if let ExtensionOperation::Install = operation {
-                this.update(cx, |this, cx| {
-                    cx.emit(Event::ExtensionInstalled(extension_id.clone()));
-                    if let Some(events) = ExtensionEvents::try_global(cx)
-                        && let Some(manifest) = this.extension_manifest_for_id(&extension_id)
-                    {
-                        events.update(cx, |this, cx| {
-                            this.emit(extension::Event::ExtensionInstalled(manifest.clone()), cx)
-                        });
-                    }
-                })
-                .ok();
-            }
-
-            anyhow::Ok(())
-        })
-    }
-
-    pub fn install_latest_extension(&mut self, extension_id: Arc<str>, cx: &mut Context<Self>) {
-        log::info!("installing extension {extension_id} latest version");
-
-        let schema_versions = schema_version_range();
-        let wasm_api_versions = wasm_api_version_range(ReleaseChannel::global(cx));
-
-        let Some(url) = self
-            .http_client
-            .build_zed_api_url(
-                &format!("/extensions/{extension_id}/download"),
-                &[
-                    ("min_schema_version", &schema_versions.start().to_string()),
-                    ("max_schema_version", &schema_versions.end().to_string()),
-                    (
-                        "min_wasm_api_version",
-                        &wasm_api_versions.start().to_string(),
-                    ),
-                    ("max_wasm_api_version", &wasm_api_versions.end().to_string()),
-                ],
-            )
-            .log_err()
-        else {
-            return;
-        };
-
-        self.install_or_upgrade_extension_at_endpoint(
-            extension_id,
-            url,
-            ExtensionOperation::Install,
-            cx,
-        )
-        .detach_and_log_err(cx);
-    }
-
-    pub fn upgrade_extension(
-        &mut self,
-        extension_id: Arc<str>,
-        version: Arc<str>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        self.install_or_upgrade_extension(extension_id, version, ExtensionOperation::Upgrade, cx)
-    }
-
-    fn install_or_upgrade_extension(
-        &mut self,
-        extension_id: Arc<str>,
-        version: Arc<str>,
-        operation: ExtensionOperation,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        log::info!("installing extension {extension_id} {version}");
-        let Some(url) = self
-            .http_client
-            .build_zed_api_url(
-                &format!("/extensions/{extension_id}/{version}/download"),
-                &[],
-            )
-            .log_err()
-        else {
-            return Task::ready(Ok(()));
-        };
-
-        self.install_or_upgrade_extension_at_endpoint(extension_id, url, operation, cx)
-    }
-
-    pub fn uninstall_extension(
-        &mut self,
-        extension_id: Arc<str>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let extension_dir = self.installed_dir.join(extension_id.as_ref());
-        let work_dir = self.wasm_host.work_dir.join(extension_id.as_ref());
-        let fs = self.fs.clone();
-
-        let extension_manifest = self.extension_manifest_for_id(&extension_id).cloned();
-
-        match self.outstanding_operations.entry(extension_id.clone()) {
-            btree_map::Entry::Occupied(_) => return Task::ready(Ok(())),
-            btree_map::Entry::Vacant(e) => e.insert(ExtensionOperation::Remove),
-        };
-
-        cx.spawn(async move |extension_store, cx| {
-            let _finish = cx.on_drop(&extension_store, {
-                let extension_id = extension_id.clone();
-                move |this, cx| {
-                    this.outstanding_operations.remove(extension_id.as_ref());
-                    cx.notify();
-                }
-            });
-
-            fs.remove_dir(
-                &extension_dir,
-                RemoveOptions {
-                    recursive: true,
-                    ignore_if_not_exists: true,
-                },
-            )
-            .await
-            .with_context(|| format!("Removing extension dir {extension_dir:?}"))?;
-
-            extension_store
-                .update(cx, |extension_store, cx| extension_store.reload(None, cx))?
-                .await;
-
-            // There's a race between wasm extension fully stopping and the directory removal.
-            // On Windows, it's impossible to remove a directory that has a process running in it.
-            for i in 0..3 {
-                cx.background_executor()
-                    .timer(Duration::from_millis(i * 100))
-                    .await;
-                let removal_result = fs
-                    .remove_dir(
-                        &work_dir,
-                        RemoveOptions {
-                            recursive: true,
-                            ignore_if_not_exists: true,
-                        },
-                    )
-                    .await;
-                match removal_result {
-                    Ok(()) => break,
-                    Err(e) => {
-                        if i == 2 {
-                            log::error!("Failed to remove extension work dir {work_dir:?} : {e}");
-                        }
-                    }
-                }
-            }
-
-            extension_store.update(cx, |_, cx| {
-                cx.emit(Event::ExtensionUninstalled(extension_id.clone()));
-                if let Some(events) = ExtensionEvents::try_global(cx)
-                    && let Some(manifest) = extension_manifest
-                {
-                    events.update(cx, |this, cx| {
-                        this.emit(extension::Event::ExtensionUninstalled(manifest.clone()), cx)
-                    });
-                }
-            })?;
-
-            anyhow::Ok(())
-        })
-    }
-
-    pub fn install_dev_extension(
-        &mut self,
-        extension_source_path: PathBuf,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let extensions_dir = self.extensions_dir();
-        let fs = self.fs.clone();
-        let builder = self.builder.clone();
-
-        cx.spawn(async move |this, cx| {
-            let mut extension_manifest =
-                ExtensionManifest::load(fs.clone(), &extension_source_path).await?;
-            let extension_id = extension_manifest.id.clone();
-
-            if let Some(uninstall_task) = this
-                .update(cx, |this, cx| {
-                    this.extension_index
-                        .extensions
-                        .get(extension_id.as_ref())
-                        .is_some_and(|index_entry| !index_entry.dev)
-                        .then(|| this.uninstall_extension(extension_id.clone(), cx))
-                })
-                .ok()
-                .flatten()
-            {
-                uninstall_task.await.log_err();
-            }
-
-            if !this.update(cx, |this, cx| {
-                match this.outstanding_operations.entry(extension_id.clone()) {
-                    btree_map::Entry::Occupied(_) => return false,
-                    btree_map::Entry::Vacant(e) => e.insert(ExtensionOperation::Install),
-                };
-                cx.notify();
-                true
-            })? {
-                return Ok(());
-            }
-
-            let _finish = cx.on_drop(&this, {
-                let extension_id = extension_id.clone();
-                move |this, cx| {
-                    this.outstanding_operations.remove(extension_id.as_ref());
-                    cx.notify();
-                }
-            });
-
-            cx.background_spawn({
-                let extension_source_path = extension_source_path.clone();
-                let fs = fs.clone();
-                async move {
-                    builder
-                        .compile_extension(
-                            &extension_source_path,
-                            &mut extension_manifest,
-                            CompileExtensionOptions { release: false },
-                            fs,
-                        )
-                        .await
-                }
-            })
-            .await
-            .inspect_err(|error| {
-                util::log_err(error);
-            })?;
-
-            let output_path = &extensions_dir.join(extension_id.as_ref());
-            if let Some(metadata) = fs.metadata(output_path).await? {
-                if metadata.is_symlink {
-                    fs.remove_file(
-                        output_path,
-                        RemoveOptions {
-                            recursive: false,
-                            ignore_if_not_exists: true,
-                        },
-                    )
-                    .await?;
-                } else {
-                    bail!("extension {extension_id} is still installed");
-                }
-            }
-
-            fs.create_symlink(output_path, extension_source_path)
-                .await?;
-
-            this.update(cx, |this, cx| this.reload(None, cx))?.await;
-            this.update(cx, |this, cx| {
-                cx.emit(Event::ExtensionInstalled(extension_id.clone()));
-                if let Some(events) = ExtensionEvents::try_global(cx)
-                    && let Some(manifest) = this.extension_manifest_for_id(&extension_id)
-                {
-                    events.update(cx, |this, cx| {
-                        this.emit(extension::Event::ExtensionInstalled(manifest.clone()), cx)
-                    });
-                }
-            })?;
-
-            Ok(())
-        })
-    }
-
-    pub fn rebuild_dev_extension(&mut self, extension_id: Arc<str>, cx: &mut Context<Self>) {
-        let path = self.installed_dir.join(extension_id.as_ref());
-        let builder = self.builder.clone();
-        let fs = self.fs.clone();
-
-        match self.outstanding_operations.entry(extension_id.clone()) {
-            btree_map::Entry::Occupied(_) => return,
-            btree_map::Entry::Vacant(e) => e.insert(ExtensionOperation::Upgrade),
-        };
-
-        cx.notify();
-        let compile = cx.background_spawn(async move {
-            let mut manifest = ExtensionManifest::load(fs.clone(), &path).await?;
-            builder
-                .compile_extension(
-                    &path,
-                    &mut manifest,
-                    CompileExtensionOptions { release: true },
-                    fs,
-                )
-                .await
-        });
-
-        cx.spawn(async move |this, cx| {
-            let result = compile.await;
-
-            this.update(cx, |this, cx| {
-                this.outstanding_operations.remove(&extension_id);
-                cx.notify();
-            })?;
-
-            if result.is_ok() {
-                this.update(cx, |this, cx| this.reload(Some(extension_id), cx))?
-                    .await;
-            }
-
-            result
-        })
-        .detach_and_log_err(cx)
-    }
-
-    /// Updates the set of installed extensions.
-    ///
-    /// First, this unloads any themes, languages, or grammars that are
-    /// no longer in the manifest, or whose files have changed on disk.
-    /// Then it loads any themes, languages, or grammars that are newly
-    /// added to the manifest, or whose files have changed on disk.
-    fn extensions_updated(
-        &mut self,
-        mut new_index: ExtensionIndex,
-        cx: &mut Context<Self>,
-    ) -> Task<()> {
-        let old_index = &self.extension_index;
-
-        new_index
-            .extensions
-            .retain(|extension_id, _| !SUPPRESSED_EXTENSIONS.contains(&extension_id.as_ref()));
-
-        // Determine which extensions need to be loaded and unloaded, based
-        // on the changes to the manifest and the extensions that we know have been
-        // modified.
-        let mut extensions_to_unload = Vec::default();
-        let mut extensions_to_load = Vec::default();
-        {
-            let mut old_keys = old_index.extensions.iter().peekable();
-            let mut new_keys = new_index.extensions.iter().peekable();
-            loop {
-                match (old_keys.peek(), new_keys.peek()) {
-                    (None, None) => break,
-                    (None, Some(_)) => {
-                        extensions_to_load.push(new_keys.next().unwrap().0.clone());
-                    }
-                    (Some(_), None) => {
-                        extensions_to_unload.push(old_keys.next().unwrap().0.clone());
-                    }
-                    (Some((old_key, _)), Some((new_key, _))) => match old_key.cmp(new_key) {
-                        Ordering::Equal => {
-                            let (old_key, old_value) = old_keys.next().unwrap();
-                            let (new_key, new_value) = new_keys.next().unwrap();
-                            if old_value != new_value || self.modified_extensions.contains(old_key)
-                            {
-                                extensions_to_unload.push(old_key.clone());
-                                extensions_to_load.push(new_key.clone());
-                            }
-                        }
-                        Ordering::Less => {
-                            extensions_to_unload.push(old_keys.next().unwrap().0.clone());
-                        }
-                        Ordering::Greater => {
-                            extensions_to_load.push(new_keys.next().unwrap().0.clone());
-                        }
-                    },
-                }
-            }
-            self.modified_extensions.clear();
-        }
-
-        if extensions_to_load.is_empty() && extensions_to_unload.is_empty() {
-            self.reload_complete_senders.clear();
-            return Task::ready(());
-        }
-
-        let reload_count = extensions_to_unload
-            .iter()
-            .filter(|id| extensions_to_load.contains(id))
-            .count();
-
-        log::info!(
-            "extensions updated. loading {}, reloading {}, unloading {}",
-            extensions_to_load.len() - reload_count,
-            reload_count,
-            extensions_to_unload.len() - reload_count
-        );
-
-        let extension_ids = extensions_to_load
-            .iter()
-            .filter_map(|id| {
-                Some((
-                    id.clone(),
-                    new_index.extensions.get(id)?.manifest.version.clone(),
-                ))
-            })
-            .collect::<Vec<_>>();
-
-        telemetry::event!("Extensions Loaded", id_and_versions = extension_ids);
-
-        let themes_to_remove = old_index
-            .themes
-            .iter()
-            .filter_map(|(name, entry)| {
-                if extensions_to_unload.contains(&entry.extension) {
-                    Some(name.clone().into())
-                } else {
-                    None
-                }
-            })
-            .collect::<Vec<_>>();
-        let icon_themes_to_remove = old_index
-            .icon_themes
-            .iter()
-            .filter_map(|(name, entry)| {
-                if extensions_to_unload.contains(&entry.extension) {
-                    Some(name.clone().into())
-                } else {
-                    None
-                }
-            })
-            .collect::<Vec<_>>();
-        let languages_to_remove = old_index
-            .languages
-            .iter()
-            .filter_map(|(name, entry)| {
-                if extensions_to_unload.contains(&entry.extension) {
-                    Some(name.clone())
-                } else {
-                    None
-                }
-            })
-            .collect::<Vec<_>>();
-        let mut grammars_to_remove = Vec::new();
-        let mut server_removal_tasks = Vec::with_capacity(extensions_to_unload.len());
-        for extension_id in &extensions_to_unload {
-            let Some(extension) = old_index.extensions.get(extension_id) else {
-                continue;
-            };
-            grammars_to_remove.extend(extension.manifest.grammars.keys().cloned());
-            for (language_server_name, config) in &extension.manifest.language_servers {
-                for language in config.languages() {
-                    server_removal_tasks.push(self.proxy.remove_language_server(
-                        &language,
-                        language_server_name,
-                        cx,
-                    ));
-                }
-            }
-
-            for server_id in extension.manifest.context_servers.keys() {
-                self.proxy.unregister_context_server(server_id.clone(), cx);
-            }
-            for adapter in extension.manifest.debug_adapters.keys() {
-                self.proxy.unregister_debug_adapter(adapter.clone());
-            }
-            for locator in extension.manifest.debug_locators.keys() {
-                self.proxy.unregister_debug_locator(locator.clone());
-            }
-            for command_name in extension.manifest.slash_commands.keys() {
-                self.proxy.unregister_slash_command(command_name.clone());
-            }
-        }
-
-        self.wasm_extensions
-            .retain(|(extension, _)| !extensions_to_unload.contains(&extension.id));
-        self.proxy.remove_user_themes(themes_to_remove);
-        self.proxy.remove_icon_themes(icon_themes_to_remove);
-        self.proxy
-            .remove_languages(&languages_to_remove, &grammars_to_remove);
-
-        let mut grammars_to_add = Vec::new();
-        let mut themes_to_add = Vec::new();
-        let mut icon_themes_to_add = Vec::new();
-        let mut snippets_to_add = Vec::new();
-        for extension_id in &extensions_to_load {
-            let Some(extension) = new_index.extensions.get(extension_id) else {
-                continue;
-            };
-
-            grammars_to_add.extend(extension.manifest.grammars.keys().map(|grammar_name| {
-                let mut grammar_path = self.installed_dir.clone();
-                grammar_path.extend([extension_id.as_ref(), "grammars"]);
-                grammar_path.push(grammar_name.as_ref());
-                grammar_path.set_extension("wasm");
-                (grammar_name.clone(), grammar_path)
-            }));
-            themes_to_add.extend(extension.manifest.themes.iter().map(|theme_path| {
-                let mut path = self.installed_dir.clone();
-                path.extend([Path::new(extension_id.as_ref()), theme_path.as_path()]);
-                path
-            }));
-            icon_themes_to_add.extend(extension.manifest.icon_themes.iter().map(
-                |icon_theme_path| {
-                    let mut path = self.installed_dir.clone();
-                    path.extend([Path::new(extension_id.as_ref()), icon_theme_path.as_path()]);
-
-                    let mut icons_root_path = self.installed_dir.clone();
-                    icons_root_path.extend([Path::new(extension_id.as_ref())]);
-
-                    (path, icons_root_path)
-                },
-            ));
-            snippets_to_add.extend(extension.manifest.snippets.iter().map(|snippets_path| {
-                let mut path = self.installed_dir.clone();
-                path.extend([Path::new(extension_id.as_ref()), snippets_path.as_path()]);
-                path
-            }));
-        }
-
-        self.proxy.register_grammars(grammars_to_add);
-        let languages_to_add = new_index
-            .languages
-            .iter()
-            .filter(|(_, entry)| extensions_to_load.contains(&entry.extension))
-            .collect::<Vec<_>>();
-        for (language_name, language) in languages_to_add {
-            let mut language_path = self.installed_dir.clone();
-            language_path.extend([
-                Path::new(language.extension.as_ref()),
-                language.path.as_path(),
-            ]);
-            self.proxy.register_language(
-                language_name.clone(),
-                language.grammar.clone(),
-                language.matcher.clone(),
-                language.hidden,
-                Arc::new(move || {
-                    let config = std::fs::read_to_string(language_path.join("config.toml"))?;
-                    let config: LanguageConfig = ::toml::from_str(&config)?;
-                    let queries = load_plugin_queries(&language_path);
-                    let context_provider =
-                        std::fs::read_to_string(language_path.join("tasks.json"))
-                            .ok()
-                            .and_then(|contents| {
-                                let definitions =
-                                    serde_json_lenient::from_str(&contents).log_err()?;
-                                Some(Arc::new(ContextProviderWithTasks::new(definitions)) as Arc<_>)
-                            });
-
-                    Ok(LoadedLanguage {
-                        config,
-                        queries,
-                        context_provider,
-                        toolchain_provider: None,
-                        manifest_name: None,
-                    })
-                }),
-            );
-        }
-
-        let fs = self.fs.clone();
-        let wasm_host = self.wasm_host.clone();
-        let root_dir = self.installed_dir.clone();
-        let proxy = self.proxy.clone();
-        let extension_entries = extensions_to_load
-            .iter()
-            .filter_map(|name| new_index.extensions.get(name).cloned())
-            .collect::<Vec<_>>();
-        self.extension_index = new_index;
-        cx.notify();
-        cx.emit(Event::ExtensionsUpdated);
-
-        cx.spawn(async move |this, cx| {
-            cx.background_spawn({
-                let fs = fs.clone();
-                async move {
-                    let _ = join_all(server_removal_tasks).await;
-                    for theme_path in themes_to_add {
-                        proxy
-                            .load_user_theme(theme_path, fs.clone())
-                            .await
-                            .log_err();
-                    }
-
-                    for (icon_theme_path, icons_root_path) in icon_themes_to_add {
-                        proxy
-                            .load_icon_theme(icon_theme_path, icons_root_path, fs.clone())
-                            .await
-                            .log_err();
-                    }
-
-                    for snippets_path in &snippets_to_add {
-                        match fs
-                            .load(snippets_path)
-                            .await
-                            .with_context(|| format!("Loading snippets from {snippets_path:?}"))
-                        {
-                            Ok(snippets_contents) => {
-                                proxy
-                                    .register_snippet(snippets_path, &snippets_contents)
-                                    .log_err();
-                            }
-                            Err(e) => log::error!("Cannot load snippets: {e:#}"),
-                        }
-                    }
-                }
-            })
-            .await;
-
-            let mut wasm_extensions = Vec::new();
-            for extension in extension_entries {
-                if extension.manifest.lib.kind.is_none() {
-                    continue;
-                };
-
-                let extension_path = root_dir.join(extension.manifest.id.as_ref());
-                let wasm_extension = WasmExtension::load(
-                    &extension_path,
-                    &extension.manifest,
-                    wasm_host.clone(),
-                    cx,
-                )
-                .await
-                .with_context(|| format!("Loading extension from {extension_path:?}"));
-
-                match wasm_extension {
-                    Ok(wasm_extension) => {
-                        wasm_extensions.push((extension.manifest.clone(), wasm_extension))
-                    }
-                    Err(e) => {
-                        log::error!(
-                            "Failed to load extension: {}, {:#}",
-                            extension.manifest.id,
-                            e
-                        );
-                        this.update(cx, |_, cx| {
-                            cx.emit(Event::ExtensionFailedToLoad(extension.manifest.id.clone()))
-                        })
-                        .ok();
-                    }
-                }
-            }
-
-            this.update(cx, |this, cx| {
-                this.reload_complete_senders.clear();
-
-                for (manifest, wasm_extension) in &wasm_extensions {
-                    let extension = Arc::new(wasm_extension.clone());
-
-                    for (language_server_id, language_server_config) in &manifest.language_servers {
-                        for language in language_server_config.languages() {
-                            this.proxy.register_language_server(
-                                extension.clone(),
-                                language_server_id.clone(),
-                                language.clone(),
-                            );
-                        }
-                    }
-
-                    for (slash_command_name, slash_command) in &manifest.slash_commands {
-                        this.proxy.register_slash_command(
-                            extension.clone(),
-                            extension::SlashCommand {
-                                name: slash_command_name.to_string(),
-                                description: slash_command.description.to_string(),
-                                // We don't currently expose this as a configurable option, as it currently drives
-                                // the `menu_text` on the `SlashCommand` trait, which is not used for slash commands
-                                // defined in extensions, as they are not able to be added to the menu.
-                                tooltip_text: String::new(),
-                                requires_argument: slash_command.requires_argument,
-                            },
-                        );
-                    }
-
-                    for id in manifest.context_servers.keys() {
-                        this.proxy
-                            .register_context_server(extension.clone(), id.clone(), cx);
-                    }
-
-                    for (debug_adapter, meta) in &manifest.debug_adapters {
-                        let mut path = root_dir.clone();
-                        path.push(Path::new(manifest.id.as_ref()));
-                        if let Some(schema_path) = &meta.schema_path {
-                            path.push(schema_path);
-                        } else {
-                            path.push("debug_adapter_schemas");
-                            path.push(Path::new(debug_adapter.as_ref()).with_extension("json"));
-                        }
-
-                        this.proxy.register_debug_adapter(
-                            extension.clone(),
-                            debug_adapter.clone(),
-                            &path,
-                        );
-                    }
-
-                    for debug_adapter in manifest.debug_locators.keys() {
-                        this.proxy
-                            .register_debug_locator(extension.clone(), debug_adapter.clone());
-                    }
-                }
-
-                this.wasm_extensions.extend(wasm_extensions);
-                this.proxy.set_extensions_loaded();
-                this.proxy.reload_current_theme(cx);
-                this.proxy.reload_current_icon_theme(cx);
-
-                if let Some(events) = ExtensionEvents::try_global(cx) {
-                    events.update(cx, |this, cx| {
-                        this.emit(extension::Event::ExtensionsInstalledChanged, cx)
-                    });
-                }
-            })
-            .ok();
-        })
-    }
-
-    fn rebuild_extension_index(&self, cx: &mut Context<Self>) -> Task<ExtensionIndex> {
-        let fs = self.fs.clone();
-        let work_dir = self.wasm_host.work_dir.clone();
-        let extensions_dir = self.installed_dir.clone();
-        let index_path = self.index_path.clone();
-        let proxy = self.proxy.clone();
-        cx.background_spawn(async move {
-            let start_time = Instant::now();
-            let mut index = ExtensionIndex::default();
-
-            fs.create_dir(&work_dir).await.log_err();
-            fs.create_dir(&extensions_dir).await.log_err();
-
-            let extension_paths = fs.read_dir(&extensions_dir).await;
-            if let Ok(mut extension_paths) = extension_paths {
-                while let Some(extension_dir) = extension_paths.next().await {
-                    let Ok(extension_dir) = extension_dir else {
-                        continue;
-                    };
-
-                    if extension_dir
-                        .file_name()
-                        .is_some_and(|file_name| file_name == ".DS_Store")
-                    {
-                        continue;
-                    }
-
-                    Self::add_extension_to_index(
-                        fs.clone(),
-                        extension_dir,
-                        &mut index,
-                        proxy.clone(),
-                    )
-                    .await
-                    .log_err();
-                }
-            }
-
-            if let Ok(index_json) = serde_json::to_string_pretty(&index) {
-                fs.save(&index_path, &index_json.as_str().into(), Default::default())
-                    .await
-                    .context("failed to save extension index")
-                    .log_err();
-            }
-
-            log::info!("rebuilt extension index in {:?}", start_time.elapsed());
-            index
-        })
-    }
-
-    async fn add_extension_to_index(
-        fs: Arc<dyn Fs>,
-        extension_dir: PathBuf,
-        index: &mut ExtensionIndex,
-        proxy: Arc<ExtensionHostProxy>,
-    ) -> Result<()> {
-        let mut extension_manifest = ExtensionManifest::load(fs.clone(), &extension_dir).await?;
-        let extension_id = extension_manifest.id.clone();
-
-        if SUPPRESSED_EXTENSIONS.contains(&extension_id.as_ref()) {
-            return Ok(());
-        }
-
-        // TODO: distinguish dev extensions more explicitly, by the absence
-        // of a checksum file that we'll create when downloading normal extensions.
-        let is_dev = fs
-            .metadata(&extension_dir)
-            .await?
-            .context("directory does not exist")?
-            .is_symlink;
-
-        if let Ok(mut language_paths) = fs.read_dir(&extension_dir.join("languages")).await {
-            while let Some(language_path) = language_paths.next().await {
-                let language_path = language_path?;
-                let Ok(relative_path) = language_path.strip_prefix(&extension_dir) else {
-                    continue;
-                };
-                let Ok(Some(fs_metadata)) = fs.metadata(&language_path).await else {
-                    continue;
-                };
-                if !fs_metadata.is_dir {
-                    continue;
-                }
-                let config = fs.load(&language_path.join("config.toml")).await?;
-                let config = ::toml::from_str::<LanguageConfig>(&config)?;
-
-                let relative_path = relative_path.to_path_buf();
-                if !extension_manifest.languages.contains(&relative_path) {
-                    extension_manifest.languages.push(relative_path.clone());
-                }
-
-                index.languages.insert(
-                    config.name.clone(),
-                    ExtensionIndexLanguageEntry {
-                        extension: extension_id.clone(),
-                        path: relative_path,
-                        matcher: config.matcher,
-                        hidden: config.hidden,
-                        grammar: config.grammar,
-                    },
-                );
-            }
-        }
-
-        if let Ok(mut theme_paths) = fs.read_dir(&extension_dir.join("themes")).await {
-            while let Some(theme_path) = theme_paths.next().await {
-                let theme_path = theme_path?;
-                let Ok(relative_path) = theme_path.strip_prefix(&extension_dir) else {
-                    continue;
-                };
-
-                let Some(theme_families) = proxy
-                    .list_theme_names(theme_path.clone(), fs.clone())
-                    .await
-                    .log_err()
-                else {
-                    continue;
-                };
-
-                let relative_path = relative_path.to_path_buf();
-                if !extension_manifest.themes.contains(&relative_path) {
-                    extension_manifest.themes.push(relative_path.clone());
-                }
-
-                for theme_name in theme_families {
-                    index.themes.insert(
-                        theme_name.into(),
-                        ExtensionIndexThemeEntry {
-                            extension: extension_id.clone(),
-                            path: relative_path.clone(),
-                        },
-                    );
-                }
-            }
-        }
-
-        if let Ok(mut icon_theme_paths) = fs.read_dir(&extension_dir.join("icon_themes")).await {
-            while let Some(icon_theme_path) = icon_theme_paths.next().await {
-                let icon_theme_path = icon_theme_path?;
-                let Ok(relative_path) = icon_theme_path.strip_prefix(&extension_dir) else {
-                    continue;
-                };
-
-                let Some(icon_theme_families) = proxy
-                    .list_icon_theme_names(icon_theme_path.clone(), fs.clone())
-                    .await
-                    .log_err()
-                else {
-                    continue;
-                };
-
-                let relative_path = relative_path.to_path_buf();
-                if !extension_manifest.icon_themes.contains(&relative_path) {
-                    extension_manifest.icon_themes.push(relative_path.clone());
-                }
-
-                for icon_theme_name in icon_theme_families {
-                    index.icon_themes.insert(
-                        icon_theme_name.into(),
-                        ExtensionIndexIconThemeEntry {
-                            extension: extension_id.clone(),
-                            path: relative_path.clone(),
-                        },
-                    );
-                }
-            }
-        }
-
-        let extension_wasm_path = extension_dir.join("extension.wasm");
-        if fs.is_file(&extension_wasm_path).await {
-            extension_manifest
-                .lib
-                .kind
-                .get_or_insert(ExtensionLibraryKind::Rust);
-        }
-
-        index.extensions.insert(
-            extension_id.clone(),
-            ExtensionIndexEntry {
-                dev: is_dev,
-                manifest: Arc::new(extension_manifest),
-            },
-        );
-
-        Ok(())
-    }
-
-    fn prepare_remote_extension(
-        &mut self,
-        extension_id: Arc<str>,
-        is_dev: bool,
-        tmp_dir: PathBuf,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let src_dir = self.extensions_dir().join(extension_id.as_ref());
-        let Some(loaded_extension) = self.extension_index.extensions.get(&extension_id).cloned()
-        else {
-            return Task::ready(Err(anyhow!("extension no longer installed")));
-        };
-        let fs = self.fs.clone();
-        cx.background_spawn(async move {
-            const EXTENSION_TOML: &str = "extension.toml";
-            const EXTENSION_WASM: &str = "extension.wasm";
-            const CONFIG_TOML: &str = "config.toml";
-
-            if is_dev {
-                let manifest_toml = toml::to_string(&loaded_extension.manifest)?;
-                fs.save(
-                    &tmp_dir.join(EXTENSION_TOML),
-                    &Rope::from(manifest_toml),
-                    language::LineEnding::Unix,
-                )
-                .await?;
-            } else {
-                fs.copy_file(
-                    &src_dir.join(EXTENSION_TOML),
-                    &tmp_dir.join(EXTENSION_TOML),
-                    fs::CopyOptions::default(),
-                )
-                .await?
-            }
-
-            if fs.is_file(&src_dir.join(EXTENSION_WASM)).await {
-                fs.copy_file(
-                    &src_dir.join(EXTENSION_WASM),
-                    &tmp_dir.join(EXTENSION_WASM),
-                    fs::CopyOptions::default(),
-                )
-                .await?
-            }
-
-            for language_path in loaded_extension.manifest.languages.iter() {
-                if fs
-                    .is_file(&src_dir.join(language_path).join(CONFIG_TOML))
-                    .await
-                {
-                    fs.create_dir(&tmp_dir.join(language_path)).await?;
-                    fs.copy_file(
-                        &src_dir.join(language_path).join(CONFIG_TOML),
-                        &tmp_dir.join(language_path).join(CONFIG_TOML),
-                        fs::CopyOptions::default(),
-                    )
-                    .await?
-                }
-            }
-
-            for (adapter_name, meta) in loaded_extension.manifest.debug_adapters.iter() {
-                let schema_path = &extension::build_debug_adapter_schema_path(adapter_name, meta);
-
-                if fs.is_file(&src_dir.join(schema_path)).await {
-                    if let Some(parent) = schema_path.parent() {
-                        fs.create_dir(&tmp_dir.join(parent)).await?
-                    }
-                    fs.copy_file(
-                        &src_dir.join(schema_path),
-                        &tmp_dir.join(schema_path),
-                        fs::CopyOptions::default(),
-                    )
-                    .await?
-                }
-            }
-
-            Ok(())
-        })
-    }
-
-    async fn sync_extensions_to_remotes(
-        this: &WeakEntity<Self>,
-        client: WeakEntity<RemoteClient>,
-        cx: &mut AsyncApp,
-    ) -> Result<()> {
-        let extensions = this.update(cx, |this, _cx| {
-            this.extension_index
-                .extensions
-                .iter()
-                .filter_map(|(id, entry)| {
-                    if !entry.manifest.allow_remote_load() {
-                        return None;
-                    }
-                    Some(proto::Extension {
-                        id: id.to_string(),
-                        version: entry.manifest.version.to_string(),
-                        dev: entry.dev,
-                    })
-                })
-                .collect()
-        })?;
-
-        let response = client
-            .update(cx, |client, _cx| {
-                client
-                    .proto_client()
-                    .request(proto::SyncExtensions { extensions })
-            })?
-            .await?;
-        let path_style = client.read_with(cx, |client, _| client.path_style())?;
-
-        for missing_extension in response.missing_extensions.into_iter() {
-            let tmp_dir = tempfile::tempdir()?;
-            this.update(cx, |this, cx| {
-                this.prepare_remote_extension(
-                    missing_extension.id.clone().into(),
-                    missing_extension.dev,
-                    tmp_dir.path().to_owned(),
-                    cx,
-                )
-            })?
-            .await?;
-            let dest_dir = RemotePathBuf::new(
-                path_style
-                    .join(&response.tmp_dir, &missing_extension.id)
-                    .with_context(|| {
-                        format!(
-                            "failed to construct destination path: {:?}, {:?}",
-                            response.tmp_dir, missing_extension.id,
-                        )
-                    })?,
-                path_style,
-            );
-            log::info!(
-                "Uploading extension {} to {:?}",
-                missing_extension.clone().id,
-                dest_dir
-            );
-
-            client
-                .update(cx, |client, cx| {
-                    client.upload_directory(tmp_dir.path().to_owned(), dest_dir.clone(), cx)
-                })?
-                .await?;
-
-            log::info!(
-                "Finished uploading extension {}",
-                missing_extension.clone().id
-            );
-
-            let result = client
-                .update(cx, |client, _cx| {
-                    client.proto_client().request(proto::InstallExtension {
-                        tmp_dir: dest_dir.to_proto(),
-                        extension: Some(missing_extension.clone()),
-                    })
-                })?
-                .await;
-
-            if let Err(e) = result {
-                log::error!(
-                    "Failed to install extension {}: {}",
-                    missing_extension.id,
-                    e
-                );
-            }
-        }
-
-        anyhow::Ok(())
-    }
-
-    pub async fn update_remote_clients(this: &WeakEntity<Self>, cx: &mut AsyncApp) -> Result<()> {
-        let clients = this.update(cx, |this, _cx| {
-            this.remote_clients.retain(|v| v.upgrade().is_some());
-            this.remote_clients.clone()
-        })?;
-
-        for client in clients {
-            Self::sync_extensions_to_remotes(this, client, cx)
-                .await
-                .log_err();
-        }
-
-        anyhow::Ok(())
-    }
-
-    pub fn register_remote_client(
-        &mut self,
-        client: Entity<RemoteClient>,
-        _cx: &mut Context<Self>,
-    ) {
-        self.remote_clients.push(client.downgrade());
-        self.ssh_registered_tx.unbounded_send(()).ok();
-    }
-}
-
-fn load_plugin_queries(root_path: &Path) -> LanguageQueries {
-    let mut result = LanguageQueries::default();
-    if let Some(entries) = std::fs::read_dir(root_path).log_err() {
-        for entry in entries {
-            let Some(entry) = entry.log_err() else {
-                continue;
-            };
-            let path = entry.path();
-            if let Some(remainder) = path.strip_prefix(root_path).ok().and_then(|p| p.to_str()) {
-                if !remainder.ends_with(".scm") {
-                    continue;
-                }
-                for (name, query) in QUERY_FILENAME_PREFIXES {
-                    if remainder.starts_with(name) {
-                        if let Some(contents) = std::fs::read_to_string(&path).log_err() {
-                            match query(&mut result) {
-                                None => *query(&mut result) = Some(contents.into()),
-                                Some(r) => r.to_mut().push_str(contents.as_ref()),
-                            }
-                        }
-                        break;
-                    }
-                }
-            }
-        }
-    }
-    result
-}
diff --git a/crates/extension_host/src/extension_settings.rs b/crates/extension_host/src/extension_settings.rs
deleted file mode 100644
index 736dd6b87a..0000000000
--- a/crates/extension_host/src/extension_settings.rs
+++ /dev/null
@@ -1,65 +0,0 @@
-use collections::HashMap;
-use extension::{
-    DownloadFileCapability, ExtensionCapability, NpmInstallPackageCapability, ProcessExecCapability,
-};
-use settings::{RegisterSetting, Settings};
-use std::sync::Arc;
-
-#[derive(Debug, Default, Clone, RegisterSetting)]
-pub struct ExtensionSettings {
-    /// The extensions that should be automatically installed by Zed.
-    ///
-    /// This is used to make functionality provided by extensions (e.g., language support)
-    /// available out-of-the-box.
-    ///
-    /// Default: { "html": true }
-    pub auto_install_extensions: HashMap<Arc<str>, bool>,
-    pub auto_update_extensions: HashMap<Arc<str>, bool>,
-    pub granted_capabilities: Vec<ExtensionCapability>,
-}
-
-impl ExtensionSettings {
-    /// Returns whether the given extension should be auto-installed.
-    pub fn should_auto_install(&self, extension_id: &str) -> bool {
-        self.auto_install_extensions
-            .get(extension_id)
-            .copied()
-            .unwrap_or(true)
-    }
-
-    pub fn should_auto_update(&self, extension_id: &str) -> bool {
-        self.auto_update_extensions
-            .get(extension_id)
-            .copied()
-            .unwrap_or(true)
-    }
-}
-
-impl Settings for ExtensionSettings {
-    fn from_settings(content: &settings::SettingsContent) -> Self {
-        Self {
-            auto_install_extensions: content.extension.auto_install_extensions.clone(),
-            auto_update_extensions: content.extension.auto_update_extensions.clone(),
-            granted_capabilities: content
-                .extension
-                .granted_extension_capabilities
-                .clone()
-                .unwrap_or_default()
-                .into_iter()
-                .map(|capability| match capability {
-                    settings::ExtensionCapabilityContent::ProcessExec { command, args } => {
-                        ExtensionCapability::ProcessExec(ProcessExecCapability { command, args })
-                    }
-                    settings::ExtensionCapabilityContent::DownloadFile { host, path } => {
-                        ExtensionCapability::DownloadFile(DownloadFileCapability { host, path })
-                    }
-                    settings::ExtensionCapabilityContent::NpmInstallPackage { package } => {
-                        ExtensionCapability::NpmInstallPackage(NpmInstallPackageCapability {
-                            package,
-                        })
-                    }
-                })
-                .collect(),
-        }
-    }
-}
diff --git a/crates/extension_host/src/extension_store_test.rs b/crates/extension_host/src/extension_store_test.rs
deleted file mode 100644
index 54b090347f..0000000000
--- a/crates/extension_host/src/extension_store_test.rs
+++ /dev/null
@@ -1,874 +0,0 @@
-use crate::{
-    Event, ExtensionIndex, ExtensionIndexEntry, ExtensionIndexLanguageEntry,
-    ExtensionIndexThemeEntry, ExtensionManifest, ExtensionStore, GrammarManifestEntry,
-    RELOAD_DEBOUNCE_DURATION, SchemaVersion,
-};
-use async_compression::futures::bufread::GzipEncoder;
-use collections::{BTreeMap, HashSet};
-use extension::ExtensionHostProxy;
-use fs::{FakeFs, Fs, RealFs};
-use futures::{AsyncReadExt, StreamExt, io::BufReader};
-use gpui::{AppContext as _, TestAppContext};
-use http_client::{FakeHttpClient, Response};
-use language::{BinaryStatus, LanguageMatcher, LanguageName, LanguageRegistry};
-use language_extension::LspAccess;
-use lsp::LanguageServerName;
-use node_runtime::NodeRuntime;
-use parking_lot::Mutex;
-use project::{DEFAULT_COMPLETION_CONTEXT, Project};
-use release_channel::AppVersion;
-use reqwest_client::ReqwestClient;
-use serde_json::json;
-use settings::SettingsStore;
-use std::{
-    ffi::OsString,
-    path::{Path, PathBuf},
-    sync::Arc,
-};
-use theme::ThemeRegistry;
-use util::test::TempTree;
-
-#[cfg(test)]
-#[ctor::ctor]
-fn init_logger() {
-    zlog::init_test();
-}
-
-#[gpui::test]
-async fn test_extension_store(cx: &mut TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    let http_client = FakeHttpClient::with_200_response();
-
-    fs.insert_tree(
-        "/the-extension-dir",
-        json!({
-            "installed": {
-                "zed-monokai": {
-                    "extension.json": r#"{
-                        "id": "zed-monokai",
-                        "name": "Zed Monokai",
-                        "version": "2.0.0",
-                        "themes": {
-                            "Monokai Dark": "themes/monokai.json",
-                            "Monokai Light": "themes/monokai.json",
-                            "Monokai Pro Dark": "themes/monokai-pro.json",
-                            "Monokai Pro Light": "themes/monokai-pro.json"
-                        }
-                    }"#,
-                    "themes": {
-                        "monokai.json": r#"{
-                            "name": "Monokai",
-                            "author": "Someone",
-                            "themes": [
-                                {
-                                    "name": "Monokai Dark",
-                                    "appearance": "dark",
-                                    "style": {}
-                                },
-                                {
-                                    "name": "Monokai Light",
-                                    "appearance": "light",
-                                    "style": {}
-                                }
-                            ]
-                        }"#,
-                        "monokai-pro.json": r#"{
-                            "name": "Monokai Pro",
-                            "author": "Someone",
-                            "themes": [
-                                {
-                                    "name": "Monokai Pro Dark",
-                                    "appearance": "dark",
-                                    "style": {}
-                                },
-                                {
-                                    "name": "Monokai Pro Light",
-                                    "appearance": "light",
-                                    "style": {}
-                                }
-                            ]
-                        }"#,
-                    }
-                },
-                "zed-ruby": {
-                    "extension.json": r#"{
-                        "id": "zed-ruby",
-                        "name": "Zed Ruby",
-                        "version": "1.0.0",
-                        "grammars": {
-                            "ruby": "grammars/ruby.wasm",
-                            "embedded_template": "grammars/embedded_template.wasm"
-                        },
-                        "languages": {
-                            "ruby": "languages/ruby",
-                            "erb": "languages/erb"
-                        }
-                    }"#,
-                    "grammars": {
-                        "ruby.wasm": "",
-                        "embedded_template.wasm": "",
-                    },
-                    "languages": {
-                        "ruby": {
-                            "config.toml": r#"
-                                name = "Ruby"
-                                grammar = "ruby"
-                                path_suffixes = ["rb"]
-                            "#,
-                            "highlights.scm": "",
-                        },
-                        "erb": {
-                            "config.toml": r#"
-                                name = "ERB"
-                                grammar = "embedded_template"
-                                path_suffixes = ["erb"]
-                            "#,
-                            "highlights.scm": "",
-                        }
-                    },
-                }
-            }
-        }),
-    )
-    .await;
-
-    let mut expected_index = ExtensionIndex {
-        extensions: [
-            (
-                "zed-ruby".into(),
-                ExtensionIndexEntry {
-                    manifest: Arc::new(ExtensionManifest {
-                        id: "zed-ruby".into(),
-                        name: "Zed Ruby".into(),
-                        version: "1.0.0".into(),
-                        schema_version: SchemaVersion::ZERO,
-                        description: None,
-                        authors: Vec::new(),
-                        repository: None,
-                        themes: Default::default(),
-                        icon_themes: Vec::new(),
-                        lib: Default::default(),
-                        languages: vec!["languages/erb".into(), "languages/ruby".into()],
-                        grammars: [
-                            ("embedded_template".into(), GrammarManifestEntry::default()),
-                            ("ruby".into(), GrammarManifestEntry::default()),
-                        ]
-                        .into_iter()
-                        .collect(),
-                        language_servers: BTreeMap::default(),
-                        context_servers: BTreeMap::default(),
-                        agent_servers: BTreeMap::default(),
-                        slash_commands: BTreeMap::default(),
-                        snippets: None,
-                        capabilities: Vec::new(),
-                        debug_adapters: Default::default(),
-                        debug_locators: Default::default(),
-                    }),
-                    dev: false,
-                },
-            ),
-            (
-                "zed-monokai".into(),
-                ExtensionIndexEntry {
-                    manifest: Arc::new(ExtensionManifest {
-                        id: "zed-monokai".into(),
-                        name: "Zed Monokai".into(),
-                        version: "2.0.0".into(),
-                        schema_version: SchemaVersion::ZERO,
-                        description: None,
-                        authors: vec![],
-                        repository: None,
-                        themes: vec![
-                            "themes/monokai-pro.json".into(),
-                            "themes/monokai.json".into(),
-                        ],
-                        icon_themes: Vec::new(),
-                        lib: Default::default(),
-                        languages: Default::default(),
-                        grammars: BTreeMap::default(),
-                        language_servers: BTreeMap::default(),
-                        context_servers: BTreeMap::default(),
-                        agent_servers: BTreeMap::default(),
-                        slash_commands: BTreeMap::default(),
-                        snippets: None,
-                        capabilities: Vec::new(),
-                        debug_adapters: Default::default(),
-                        debug_locators: Default::default(),
-                    }),
-                    dev: false,
-                },
-            ),
-        ]
-        .into_iter()
-        .collect(),
-        languages: [
-            (
-                "ERB".into(),
-                ExtensionIndexLanguageEntry {
-                    extension: "zed-ruby".into(),
-                    path: "languages/erb".into(),
-                    grammar: Some("embedded_template".into()),
-                    hidden: false,
-                    matcher: LanguageMatcher {
-                        path_suffixes: vec!["erb".into()],
-                        first_line_pattern: None,
-                    },
-                },
-            ),
-            (
-                "Ruby".into(),
-                ExtensionIndexLanguageEntry {
-                    extension: "zed-ruby".into(),
-                    path: "languages/ruby".into(),
-                    grammar: Some("ruby".into()),
-                    hidden: false,
-                    matcher: LanguageMatcher {
-                        path_suffixes: vec!["rb".into()],
-                        first_line_pattern: None,
-                    },
-                },
-            ),
-        ]
-        .into_iter()
-        .collect(),
-        themes: [
-            (
-                "Monokai Dark".into(),
-                ExtensionIndexThemeEntry {
-                    extension: "zed-monokai".into(),
-                    path: "themes/monokai.json".into(),
-                },
-            ),
-            (
-                "Monokai Light".into(),
-                ExtensionIndexThemeEntry {
-                    extension: "zed-monokai".into(),
-                    path: "themes/monokai.json".into(),
-                },
-            ),
-            (
-                "Monokai Pro Dark".into(),
-                ExtensionIndexThemeEntry {
-                    extension: "zed-monokai".into(),
-                    path: "themes/monokai-pro.json".into(),
-                },
-            ),
-            (
-                "Monokai Pro Light".into(),
-                ExtensionIndexThemeEntry {
-                    extension: "zed-monokai".into(),
-                    path: "themes/monokai-pro.json".into(),
-                },
-            ),
-        ]
-        .into_iter()
-        .collect(),
-        icon_themes: BTreeMap::default(),
-    };
-
-    let proxy = Arc::new(ExtensionHostProxy::new());
-    let theme_registry = Arc::new(ThemeRegistry::new(Box::new(())));
-    theme_extension::init(proxy.clone(), theme_registry.clone(), cx.executor());
-    let language_registry = Arc::new(LanguageRegistry::test(cx.executor()));
-    language_extension::init(LspAccess::Noop, proxy.clone(), language_registry.clone());
-    let node_runtime = NodeRuntime::unavailable();
-
-    let store = cx.new(|cx| {
-        ExtensionStore::new(
-            PathBuf::from("/the-extension-dir"),
-            None,
-            proxy.clone(),
-            fs.clone(),
-            http_client.clone(),
-            http_client.clone(),
-            None,
-            node_runtime.clone(),
-            cx,
-        )
-    });
-
-    cx.executor().advance_clock(RELOAD_DEBOUNCE_DURATION);
-    store.read_with(cx, |store, _| {
-        let index = &store.extension_index;
-        assert_eq!(index.extensions, expected_index.extensions);
-
-        for ((actual_key, actual_language), (expected_key, expected_language)) in
-            index.languages.iter().zip(expected_index.languages.iter())
-        {
-            assert_eq!(actual_key, expected_key);
-            assert_eq!(actual_language.grammar, expected_language.grammar);
-            assert_eq!(actual_language.matcher, expected_language.matcher);
-            assert_eq!(actual_language.hidden, expected_language.hidden);
-        }
-        assert_eq!(index.themes, expected_index.themes);
-
-        assert_eq!(
-            language_registry.language_names(),
-            [
-                LanguageName::new_static("ERB"),
-                LanguageName::new_static("Plain Text"),
-                LanguageName::new_static("Ruby"),
-            ]
-        );
-        assert_eq!(
-            theme_registry.list_names(),
-            [
-                "Monokai Dark",
-                "Monokai Light",
-                "Monokai Pro Dark",
-                "Monokai Pro Light",
-                "One Dark",
-            ]
-        );
-    });
-
-    fs.insert_tree(
-        "/the-extension-dir/installed/zed-gruvbox",
-        json!({
-            "extension.json": r#"{
-                "id": "zed-gruvbox",
-                "name": "Zed Gruvbox",
-                "version": "1.0.0",
-                "themes": {
-                    "Gruvbox": "themes/gruvbox.json"
-                }
-            }"#,
-            "themes": {
-                "gruvbox.json": r#"{
-                    "name": "Gruvbox",
-                    "author": "Someone Else",
-                    "themes": [
-                        {
-                            "name": "Gruvbox",
-                            "appearance": "dark",
-                            "style": {}
-                        }
-                    ]
-                }"#,
-            }
-        }),
-    )
-    .await;
-
-    expected_index.extensions.insert(
-        "zed-gruvbox".into(),
-        ExtensionIndexEntry {
-            manifest: Arc::new(ExtensionManifest {
-                id: "zed-gruvbox".into(),
-                name: "Zed Gruvbox".into(),
-                version: "1.0.0".into(),
-                schema_version: SchemaVersion::ZERO,
-                description: None,
-                authors: vec![],
-                repository: None,
-                themes: vec!["themes/gruvbox.json".into()],
-                icon_themes: Vec::new(),
-                lib: Default::default(),
-                languages: Default::default(),
-                grammars: BTreeMap::default(),
-                language_servers: BTreeMap::default(),
-                context_servers: BTreeMap::default(),
-                agent_servers: BTreeMap::default(),
-                slash_commands: BTreeMap::default(),
-                snippets: None,
-                capabilities: Vec::new(),
-                debug_adapters: Default::default(),
-                debug_locators: Default::default(),
-            }),
-            dev: false,
-        },
-    );
-    expected_index.themes.insert(
-        "Gruvbox".into(),
-        ExtensionIndexThemeEntry {
-            extension: "zed-gruvbox".into(),
-            path: "themes/gruvbox.json".into(),
-        },
-    );
-
-    #[allow(clippy::let_underscore_future)]
-    let _ = store.update(cx, |store, cx| store.reload(None, cx));
-
-    cx.executor().advance_clock(RELOAD_DEBOUNCE_DURATION);
-    store.read_with(cx, |store, _| {
-        let index = &store.extension_index;
-
-        for ((actual_key, actual_language), (expected_key, expected_language)) in
-            index.languages.iter().zip(expected_index.languages.iter())
-        {
-            assert_eq!(actual_key, expected_key);
-            assert_eq!(actual_language.grammar, expected_language.grammar);
-            assert_eq!(actual_language.matcher, expected_language.matcher);
-            assert_eq!(actual_language.hidden, expected_language.hidden);
-        }
-
-        assert_eq!(index.extensions, expected_index.extensions);
-        assert_eq!(index.themes, expected_index.themes);
-
-        assert_eq!(
-            theme_registry.list_names(),
-            [
-                "Gruvbox",
-                "Monokai Dark",
-                "Monokai Light",
-                "Monokai Pro Dark",
-                "Monokai Pro Light",
-                "One Dark",
-            ]
-        );
-    });
-
-    let prev_fs_metadata_call_count = fs.metadata_call_count();
-    let prev_fs_read_dir_call_count = fs.read_dir_call_count();
-
-    // Create new extension store, as if Zed were restarting.
-    drop(store);
-    let store = cx.new(|cx| {
-        ExtensionStore::new(
-            PathBuf::from("/the-extension-dir"),
-            None,
-            proxy,
-            fs.clone(),
-            http_client.clone(),
-            http_client.clone(),
-            None,
-            node_runtime.clone(),
-            cx,
-        )
-    });
-
-    cx.executor().run_until_parked();
-    store.read_with(cx, |store, _| {
-        assert_eq!(store.extension_index.extensions, expected_index.extensions);
-        assert_eq!(store.extension_index.themes, expected_index.themes);
-        assert_eq!(
-            store.extension_index.icon_themes,
-            expected_index.icon_themes
-        );
-
-        for ((actual_key, actual_language), (expected_key, expected_language)) in store
-            .extension_index
-            .languages
-            .iter()
-            .zip(expected_index.languages.iter())
-        {
-            assert_eq!(actual_key, expected_key);
-            assert_eq!(actual_language.grammar, expected_language.grammar);
-            assert_eq!(actual_language.matcher, expected_language.matcher);
-            assert_eq!(actual_language.hidden, expected_language.hidden);
-        }
-
-        assert_eq!(
-            language_registry.language_names(),
-            [
-                LanguageName::new_static("ERB"),
-                LanguageName::new_static("Plain Text"),
-                LanguageName::new_static("Ruby"),
-            ]
-        );
-        assert_eq!(
-            language_registry.grammar_names(),
-            ["embedded_template".into(), "ruby".into()]
-        );
-        assert_eq!(
-            theme_registry.list_names(),
-            [
-                "Gruvbox",
-                "Monokai Dark",
-                "Monokai Light",
-                "Monokai Pro Dark",
-                "Monokai Pro Light",
-                "One Dark",
-            ]
-        );
-
-        // The on-disk manifest limits the number of FS calls that need to be made
-        // on startup.
-        assert_eq!(fs.read_dir_call_count(), prev_fs_read_dir_call_count);
-        assert_eq!(fs.metadata_call_count(), prev_fs_metadata_call_count + 2);
-    });
-
-    store.update(cx, |store, cx| {
-        store
-            .uninstall_extension("zed-ruby".into(), cx)
-            .detach_and_log_err(cx);
-    });
-
-    cx.executor().advance_clock(RELOAD_DEBOUNCE_DURATION);
-    expected_index.extensions.remove("zed-ruby");
-    expected_index.languages.remove("Ruby");
-    expected_index.languages.remove("ERB");
-
-    store.read_with(cx, |store, _| {
-        assert_eq!(store.extension_index.extensions, expected_index.extensions);
-        assert_eq!(store.extension_index.themes, expected_index.themes);
-        assert_eq!(
-            store.extension_index.icon_themes,
-            expected_index.icon_themes
-        );
-
-        for ((actual_key, actual_language), (expected_key, expected_language)) in store
-            .extension_index
-            .languages
-            .iter()
-            .zip(expected_index.languages.iter())
-        {
-            assert_eq!(actual_key, expected_key);
-            assert_eq!(actual_language.grammar, expected_language.grammar);
-            assert_eq!(actual_language.matcher, expected_language.matcher);
-            assert_eq!(actual_language.hidden, expected_language.hidden);
-        }
-
-        assert_eq!(
-            language_registry.language_names(),
-            [LanguageName::new_static("Plain Text")]
-        );
-        assert_eq!(language_registry.grammar_names(), []);
-    });
-}
-
-#[gpui::test]
-async fn test_extension_store_with_test_extension(cx: &mut TestAppContext) {
-    log::info!("Initializing test");
-    init_test(cx);
-    cx.executor().allow_parking();
-
-    let root_dir = Path::new(env!("CARGO_MANIFEST_DIR"))
-        .parent()
-        .unwrap()
-        .parent()
-        .unwrap();
-    let cache_dir = root_dir.join("target");
-    let test_extension_id = "test-extension";
-    let test_extension_dir = root_dir.join("extensions").join(test_extension_id);
-
-    let fs = Arc::new(RealFs::new(None, cx.executor()));
-    let extensions_tree = TempTree::new(json!({
-        "installed": {},
-        "work": {}
-    }));
-    let project_dir = TempTree::new(json!({
-        "test.gleam": ""
-    }));
-
-    let extensions_dir = extensions_tree.path().canonicalize().unwrap();
-    let project_dir = project_dir.path().canonicalize().unwrap();
-
-    log::info!("Setting up test");
-
-    let project = Project::test(fs.clone(), [project_dir.as_path()], cx).await;
-
-    let proxy = Arc::new(ExtensionHostProxy::new());
-    let theme_registry = Arc::new(ThemeRegistry::new(Box::new(())));
-    theme_extension::init(proxy.clone(), theme_registry.clone(), cx.executor());
-    let language_registry = project.read_with(cx, |project, _cx| project.languages().clone());
-    language_extension::init(
-        LspAccess::ViaLspStore(project.update(cx, |project, _| project.lsp_store())),
-        proxy.clone(),
-        language_registry.clone(),
-    );
-    let node_runtime = NodeRuntime::unavailable();
-
-    let mut status_updates = language_registry.language_server_binary_statuses();
-
-    struct FakeLanguageServerVersion {
-        version: String,
-        binary_contents: String,
-        http_request_count: usize,
-    }
-
-    let language_server_version = Arc::new(Mutex::new(FakeLanguageServerVersion {
-        version: "v1.2.3".into(),
-        binary_contents: "the-binary-contents".into(),
-        http_request_count: 0,
-    }));
-
-    let extension_client = FakeHttpClient::create({
-        let language_server_version = language_server_version.clone();
-        move |request| {
-            let language_server_version = language_server_version.clone();
-            async move {
-                let version = language_server_version.lock().version.clone();
-                let binary_contents = language_server_version.lock().binary_contents.clone();
-
-                let github_releases_uri = "https://api.github.com/repos/gleam-lang/gleam/releases";
-                let asset_download_uri =
-                    format!("https://fake-download.example.com/gleam-{version}");
-
-                let uri = request.uri().to_string();
-                if uri == github_releases_uri {
-                    language_server_version.lock().http_request_count += 1;
-                    Ok(Response::new(
-                        json!([
-                            {
-                                "tag_name": version,
-                                "prerelease": false,
-                                "tarball_url": "",
-                                "zipball_url": "",
-                                "assets": [
-                                    {
-                                        "name": format!("gleam-{version}-aarch64-apple-darwin.tar.gz"),
-                                        "browser_download_url": asset_download_uri
-                                    },
-                                    {
-                                        "name": format!("gleam-{version}-x86_64-unknown-linux-musl.tar.gz"),
-                                        "browser_download_url": asset_download_uri
-                                    },
-                                    {
-                                        "name": format!("gleam-{version}-aarch64-unknown-linux-musl.tar.gz"),
-                                        "browser_download_url": asset_download_uri
-                                    },
-                                    {
-                                        "name": format!("gleam-{version}-x86_64-pc-windows-msvc.tar.gz"),
-                                        "browser_download_url": asset_download_uri
-                                    }
-                                ]
-                            }
-                        ])
-                        .to_string()
-                        .into(),
-                    ))
-                } else if uri == asset_download_uri {
-                    language_server_version.lock().http_request_count += 1;
-                    let mut bytes = Vec::<u8>::new();
-                    let mut archive = async_tar::Builder::new(&mut bytes);
-                    let mut header = async_tar::Header::new_gnu();
-                    header.set_size(binary_contents.len() as u64);
-                    archive
-                        .append_data(&mut header, "gleam", binary_contents.as_bytes())
-                        .await
-                        .unwrap();
-                    archive.into_inner().await.unwrap();
-                    let mut gzipped_bytes = Vec::new();
-                    let mut encoder = GzipEncoder::new(BufReader::new(bytes.as_slice()));
-                    encoder.read_to_end(&mut gzipped_bytes).await.unwrap();
-                    Ok(Response::new(gzipped_bytes.into()))
-                } else {
-                    Ok(Response::builder().status(404).body("not found".into())?)
-                }
-            }
-        }
-    });
-    let user_agent = cx.update(|cx| {
-        format!(
-            "Zed/{} ({}; {})",
-            AppVersion::global(cx),
-            std::env::consts::OS,
-            std::env::consts::ARCH
-        )
-    });
-    let builder_client =
-        Arc::new(ReqwestClient::user_agent(&user_agent).expect("Could not create HTTP client"));
-
-    let extension_store = cx.new(|cx| {
-        ExtensionStore::new(
-            extensions_dir.clone(),
-            Some(cache_dir),
-            proxy,
-            fs.clone(),
-            extension_client.clone(),
-            builder_client,
-            None,
-            node_runtime,
-            cx,
-        )
-    });
-
-    log::info!("Flushing events");
-
-    // Ensure that debounces fire.
-    let mut events = cx.events(&extension_store);
-    let executor = cx.executor();
-    let _task = cx.executor().spawn(async move {
-        while let Some(event) = events.next().await {
-            if let Event::StartedReloading = event {
-                executor.advance_clock(RELOAD_DEBOUNCE_DURATION);
-            }
-        }
-    });
-
-    extension_store.update(cx, |_, cx| {
-        cx.subscribe(&extension_store, |_, _, event, _| {
-            if matches!(event, Event::ExtensionFailedToLoad(_)) {
-                panic!("extension failed to load");
-            }
-        })
-        .detach();
-    });
-
-    extension_store
-        .update(cx, |store, cx| {
-            store.install_dev_extension(test_extension_dir.clone(), cx)
-        })
-        .await
-        .unwrap();
-
-    let mut fake_servers = language_registry.register_fake_lsp_server(
-        LanguageServerName("gleam".into()),
-        lsp::ServerCapabilities {
-            completion_provider: Some(Default::default()),
-            ..Default::default()
-        },
-        None,
-    );
-
-    let (buffer, _handle) = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer_with_lsp(project_dir.join("test.gleam"), cx)
-        })
-        .await
-        .unwrap();
-
-    let fake_server = fake_servers.next().await.unwrap();
-    let work_dir = extensions_dir.join(format!("work/{test_extension_id}"));
-    let expected_server_path = work_dir.join("gleam-v1.2.3/gleam");
-    let expected_binary_contents = language_server_version.lock().binary_contents.clone();
-
-    // check that IO operations in extension work correctly
-    assert!(work_dir.join("dir-created-with-rel-path").exists());
-    assert!(work_dir.join("dir-created-with-abs-path").exists());
-    assert!(work_dir.join("file-created-with-abs-path").exists());
-    assert!(work_dir.join("file-created-with-rel-path").exists());
-
-    assert_eq!(fake_server.binary.path, expected_server_path);
-    assert_eq!(fake_server.binary.arguments, [OsString::from("lsp")]);
-    assert_eq!(
-        fs.load(&expected_server_path).await.unwrap(),
-        expected_binary_contents
-    );
-    assert_eq!(language_server_version.lock().http_request_count, 2);
-    assert_eq!(
-        [
-            status_updates.next().await.unwrap(),
-            status_updates.next().await.unwrap(),
-            status_updates.next().await.unwrap(),
-            status_updates.next().await.unwrap(),
-        ],
-        [
-            (
-                LanguageServerName::new_static("gleam"),
-                BinaryStatus::Starting
-            ),
-            (
-                LanguageServerName::new_static("gleam"),
-                BinaryStatus::CheckingForUpdate
-            ),
-            (
-                LanguageServerName::new_static("gleam"),
-                BinaryStatus::Downloading
-            ),
-            (LanguageServerName::new_static("gleam"), BinaryStatus::None)
-        ]
-    );
-
-    // The extension creates custom labels for completion items.
-    fake_server.set_request_handler::<lsp::request::Completion, _, _>(|_, _| async move {
-        Ok(Some(lsp::CompletionResponse::Array(vec![
-            lsp::CompletionItem {
-                label: "foo".into(),
-                kind: Some(lsp::CompletionItemKind::FUNCTION),
-                detail: Some("fn() -> Result(Nil, Error)".into()),
-                ..Default::default()
-            },
-            lsp::CompletionItem {
-                label: "bar.baz".into(),
-                kind: Some(lsp::CompletionItemKind::FUNCTION),
-                detail: Some("fn(List(a)) -> a".into()),
-                ..Default::default()
-            },
-            lsp::CompletionItem {
-                label: "Quux".into(),
-                kind: Some(lsp::CompletionItemKind::CONSTRUCTOR),
-                detail: Some("fn(String) -> T".into()),
-                ..Default::default()
-            },
-            lsp::CompletionItem {
-                label: "my_string".into(),
-                kind: Some(lsp::CompletionItemKind::CONSTANT),
-                detail: Some("String".into()),
-                ..Default::default()
-            },
-        ])))
-    });
-
-    let completion_labels = project
-        .update(cx, |project, cx| {
-            project.completions(&buffer, 0, DEFAULT_COMPLETION_CONTEXT, cx)
-        })
-        .await
-        .unwrap()
-        .into_iter()
-        .flat_map(|response| response.completions)
-        .map(|c| c.label.text)
-        .collect::<Vec<_>>();
-    assert_eq!(
-        completion_labels,
-        [
-            "foo: fn() -> Result(Nil, Error)".to_string(),
-            "bar.baz: fn(List(a)) -> a".to_string(),
-            "Quux: fn(String) -> T".to_string(),
-            "my_string: String".to_string(),
-        ]
-    );
-
-    // Simulate a new version of the language server being released
-    language_server_version.lock().version = "v2.0.0".into();
-    language_server_version.lock().binary_contents = "the-new-binary-contents".into();
-    language_server_version.lock().http_request_count = 0;
-
-    // Start a new instance of the language server.
-    project.update(cx, |project, cx| {
-        project.restart_language_servers_for_buffers(vec![buffer.clone()], HashSet::default(), cx)
-    });
-    cx.executor().run_until_parked();
-
-    // The extension has cached the binary path, and does not attempt
-    // to reinstall it.
-    let fake_server = fake_servers.next().await.unwrap();
-    assert_eq!(fake_server.binary.path, expected_server_path);
-    assert_eq!(
-        fs.load(&expected_server_path).await.unwrap(),
-        expected_binary_contents
-    );
-    assert_eq!(language_server_version.lock().http_request_count, 0);
-
-    // Reload the extension, clearing its cache.
-    // Start a new instance of the language server.
-    extension_store
-        .update(cx, |store, cx| {
-            store.reload(Some("test-extension".into()), cx)
-        })
-        .await;
-    cx.executor().run_until_parked();
-    project.update(cx, |project, cx| {
-        project.restart_language_servers_for_buffers(vec![buffer.clone()], HashSet::default(), cx)
-    });
-
-    // The extension re-fetches the latest version of the language server.
-    let fake_server = fake_servers.next().await.unwrap();
-    let new_expected_server_path =
-        extensions_dir.join(format!("work/{test_extension_id}/gleam-v2.0.0/gleam"));
-    let expected_binary_contents = language_server_version.lock().binary_contents.clone();
-    assert_eq!(fake_server.binary.path, new_expected_server_path);
-    assert_eq!(fake_server.binary.arguments, [OsString::from("lsp")]);
-    assert_eq!(
-        fs.load(&new_expected_server_path).await.unwrap(),
-        expected_binary_contents
-    );
-
-    // The old language server directory has been cleaned up.
-    assert!(fs.metadata(&expected_server_path).await.unwrap().is_none());
-}
-
-fn init_test(cx: &mut TestAppContext) {
-    cx.update(|cx| {
-        let store = SettingsStore::test(cx);
-        cx.set_global(store);
-        release_channel::init(semver::Version::new(0, 0, 0), cx);
-        extension::init(cx);
-        theme::init(theme::LoadThemes::JustBase, cx);
-        gpui_tokio::init(cx);
-    });
-}
diff --git a/crates/extension_host/src/headless_host.rs b/crates/extension_host/src/headless_host.rs
deleted file mode 100644
index c3a290a55a..0000000000
--- a/crates/extension_host/src/headless_host.rs
+++ /dev/null
@@ -1,351 +0,0 @@
-use std::{path::PathBuf, sync::Arc};
-
-use anyhow::{Context as _, Result};
-use client::{TypedEnvelope, proto};
-use collections::{HashMap, HashSet};
-use extension::{
-    Extension, ExtensionDebugAdapterProviderProxy, ExtensionHostProxy, ExtensionLanguageProxy,
-    ExtensionLanguageServerProxy, ExtensionManifest,
-};
-use fs::{Fs, RemoveOptions, RenameOptions};
-use futures::future::join_all;
-use gpui::{App, AppContext as _, AsyncApp, Context, Entity, Task, WeakEntity};
-use http_client::HttpClient;
-use language::{LanguageConfig, LanguageName, LanguageQueries, LoadedLanguage};
-use lsp::LanguageServerName;
-use node_runtime::NodeRuntime;
-
-use crate::wasm_host::{WasmExtension, WasmHost};
-
-#[derive(Clone, Debug)]
-pub struct ExtensionVersion {
-    pub id: String,
-    pub version: String,
-    pub dev: bool,
-}
-
-pub struct HeadlessExtensionStore {
-    pub fs: Arc<dyn Fs>,
-    pub extension_dir: PathBuf,
-    pub proxy: Arc<ExtensionHostProxy>,
-    pub wasm_host: Arc<WasmHost>,
-    pub loaded_extensions: HashMap<Arc<str>, Arc<str>>,
-    pub loaded_languages: HashMap<Arc<str>, Vec<LanguageName>>,
-    pub loaded_language_servers: HashMap<Arc<str>, Vec<(LanguageServerName, LanguageName)>>,
-}
-
-impl HeadlessExtensionStore {
-    pub fn new(
-        fs: Arc<dyn Fs>,
-        http_client: Arc<dyn HttpClient>,
-        extension_dir: PathBuf,
-        extension_host_proxy: Arc<ExtensionHostProxy>,
-        node_runtime: NodeRuntime,
-        cx: &mut App,
-    ) -> Entity<Self> {
-        cx.new(|cx| Self {
-            fs: fs.clone(),
-            wasm_host: WasmHost::new(
-                fs.clone(),
-                http_client.clone(),
-                node_runtime,
-                extension_host_proxy.clone(),
-                extension_dir.join("work"),
-                cx,
-            ),
-            extension_dir,
-            proxy: extension_host_proxy,
-            loaded_extensions: Default::default(),
-            loaded_languages: Default::default(),
-            loaded_language_servers: Default::default(),
-        })
-    }
-
-    pub fn sync_extensions(
-        &mut self,
-        extensions: Vec<ExtensionVersion>,
-        cx: &Context<Self>,
-    ) -> Task<Result<Vec<ExtensionVersion>>> {
-        let on_client = HashSet::from_iter(extensions.iter().map(|e| e.id.as_str()));
-        let to_remove: Vec<Arc<str>> = self
-            .loaded_extensions
-            .keys()
-            .filter(|id| !on_client.contains(id.as_ref()))
-            .cloned()
-            .collect();
-        let to_load: Vec<ExtensionVersion> = extensions
-            .into_iter()
-            .filter(|e| {
-                if e.dev {
-                    return true;
-                }
-                self.loaded_extensions
-                    .get(e.id.as_str())
-                    .is_none_or(|loaded| loaded.as_ref() != e.version.as_str())
-            })
-            .collect();
-
-        cx.spawn(async move |this, cx| {
-            let mut missing = Vec::new();
-
-            for extension_id in to_remove {
-                log::info!("removing extension: {}", extension_id);
-                this.update(cx, |this, cx| this.uninstall_extension(&extension_id, cx))?
-                    .await?;
-            }
-
-            for extension in to_load {
-                if let Err(e) = Self::load_extension(this.clone(), extension.clone(), cx).await {
-                    log::info!("failed to load extension: {}, {:#}", extension.id, e);
-                    missing.push(extension)
-                } else if extension.dev {
-                    missing.push(extension)
-                }
-            }
-
-            Ok(missing)
-        })
-    }
-
-    pub async fn load_extension(
-        this: WeakEntity<Self>,
-        extension: ExtensionVersion,
-        cx: &mut AsyncApp,
-    ) -> Result<()> {
-        let (fs, wasm_host, extension_dir) = this.update(cx, |this, _cx| {
-            this.loaded_extensions.insert(
-                extension.id.clone().into(),
-                extension.version.clone().into(),
-            );
-            (
-                this.fs.clone(),
-                this.wasm_host.clone(),
-                this.extension_dir.join(&extension.id),
-            )
-        })?;
-
-        let manifest = Arc::new(ExtensionManifest::load(fs.clone(), &extension_dir).await?);
-
-        debug_assert!(!manifest.languages.is_empty() || manifest.allow_remote_load());
-
-        if manifest.version.as_ref() != extension.version.as_str() {
-            anyhow::bail!(
-                "mismatched versions: ({}) != ({})",
-                manifest.version,
-                extension.version
-            )
-        }
-
-        for language_path in &manifest.languages {
-            let language_path = extension_dir.join(language_path);
-            let config = fs.load(&language_path.join("config.toml")).await?;
-            let mut config = ::toml::from_str::<LanguageConfig>(&config)?;
-
-            this.update(cx, |this, _cx| {
-                this.loaded_languages
-                    .entry(manifest.id.clone())
-                    .or_default()
-                    .push(config.name.clone());
-
-                config.grammar = None;
-
-                this.proxy.register_language(
-                    config.name.clone(),
-                    None,
-                    config.matcher.clone(),
-                    config.hidden,
-                    Arc::new(move || {
-                        Ok(LoadedLanguage {
-                            config: config.clone(),
-                            queries: LanguageQueries::default(),
-                            context_provider: None,
-                            toolchain_provider: None,
-                            manifest_name: None,
-                        })
-                    }),
-                );
-            })?;
-        }
-
-        if !manifest.allow_remote_load() {
-            return Ok(());
-        }
-
-        let wasm_extension: Arc<dyn Extension> =
-            Arc::new(WasmExtension::load(&extension_dir, &manifest, wasm_host.clone(), cx).await?);
-
-        for (language_server_id, language_server_config) in &manifest.language_servers {
-            for language in language_server_config.languages() {
-                this.update(cx, |this, _cx| {
-                    this.loaded_language_servers
-                        .entry(manifest.id.clone())
-                        .or_default()
-                        .push((language_server_id.clone(), language.clone()));
-                    this.proxy.register_language_server(
-                        wasm_extension.clone(),
-                        language_server_id.clone(),
-                        language.clone(),
-                    );
-                })?;
-            }
-            log::info!("Loaded language server: {}", language_server_id);
-        }
-
-        for (debug_adapter, meta) in &manifest.debug_adapters {
-            let schema_path = extension::build_debug_adapter_schema_path(debug_adapter, meta);
-
-            this.update(cx, |this, _cx| {
-                this.proxy.register_debug_adapter(
-                    wasm_extension.clone(),
-                    debug_adapter.clone(),
-                    &extension_dir.join(schema_path),
-                );
-            })?;
-            log::info!("Loaded debug adapter: {}", debug_adapter);
-        }
-
-        for debug_locator in manifest.debug_locators.keys() {
-            this.update(cx, |this, _cx| {
-                this.proxy
-                    .register_debug_locator(wasm_extension.clone(), debug_locator.clone());
-            })?;
-            log::info!("Loaded debug locator: {}", debug_locator);
-        }
-
-        Ok(())
-    }
-
-    fn uninstall_extension(
-        &mut self,
-        extension_id: &Arc<str>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        self.loaded_extensions.remove(extension_id);
-
-        let languages_to_remove = self
-            .loaded_languages
-            .remove(extension_id)
-            .unwrap_or_default();
-        self.proxy.remove_languages(&languages_to_remove, &[]);
-
-        let servers_to_remove = self
-            .loaded_language_servers
-            .remove(extension_id)
-            .unwrap_or_default();
-        let proxy = self.proxy.clone();
-        let path = self.extension_dir.join(&extension_id.to_string());
-        let fs = self.fs.clone();
-        cx.spawn(async move |_, cx| {
-            let mut removal_tasks = Vec::with_capacity(servers_to_remove.len());
-            cx.update(|cx| {
-                for (language_server_name, language) in servers_to_remove {
-                    removal_tasks.push(proxy.remove_language_server(
-                        &language,
-                        &language_server_name,
-                        cx,
-                    ));
-                }
-            })
-            .ok();
-            let _ = join_all(removal_tasks).await;
-
-            fs.remove_dir(
-                &path,
-                RemoveOptions {
-                    recursive: true,
-                    ignore_if_not_exists: true,
-                },
-            )
-            .await
-            .with_context(|| format!("Removing directory {path:?}"))
-        })
-    }
-
-    pub fn install_extension(
-        &mut self,
-        extension: ExtensionVersion,
-        tmp_path: PathBuf,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let path = self.extension_dir.join(&extension.id);
-        let fs = self.fs.clone();
-
-        cx.spawn(async move |this, cx| {
-            if fs.is_dir(&path).await {
-                this.update(cx, |this, cx| {
-                    this.uninstall_extension(&extension.id.clone().into(), cx)
-                })?
-                .await?;
-            }
-
-            fs.rename(&tmp_path, &path, RenameOptions::default())
-                .await
-                .context("Failed to rename {tmp_path:?} to {path:?}")?;
-
-            Self::load_extension(this, extension, cx).await
-        })
-    }
-
-    pub async fn handle_sync_extensions(
-        extension_store: Entity<HeadlessExtensionStore>,
-        envelope: TypedEnvelope<proto::SyncExtensions>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::SyncExtensionsResponse> {
-        let requested_extensions =
-            envelope
-                .payload
-                .extensions
-                .into_iter()
-                .map(|p| ExtensionVersion {
-                    id: p.id,
-                    version: p.version,
-                    dev: p.dev,
-                });
-        let missing_extensions = extension_store
-            .update(&mut cx, |extension_store, cx| {
-                extension_store.sync_extensions(requested_extensions.collect(), cx)
-            })?
-            .await?;
-
-        Ok(proto::SyncExtensionsResponse {
-            missing_extensions: missing_extensions
-                .into_iter()
-                .map(|e| proto::Extension {
-                    id: e.id,
-                    version: e.version,
-                    dev: e.dev,
-                })
-                .collect(),
-            tmp_dir: paths::remote_extensions_uploads_dir()
-                .to_string_lossy()
-                .to_string(),
-        })
-    }
-
-    pub async fn handle_install_extension(
-        extensions: Entity<HeadlessExtensionStore>,
-        envelope: TypedEnvelope<proto::InstallExtension>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::Ack> {
-        let extension = envelope
-            .payload
-            .extension
-            .context("Invalid InstallExtension request")?;
-
-        extensions
-            .update(&mut cx, |extensions, cx| {
-                extensions.install_extension(
-                    ExtensionVersion {
-                        id: extension.id,
-                        version: extension.version,
-                        dev: extension.dev,
-                    },
-                    PathBuf::from(envelope.payload.tmp_dir),
-                    cx,
-                )
-            })?
-            .await?;
-
-        Ok(proto::Ack {})
-    }
-}
diff --git a/crates/extension_host/src/wasm_host.rs b/crates/extension_host/src/wasm_host.rs
deleted file mode 100644
index cecaf2039b..0000000000
--- a/crates/extension_host/src/wasm_host.rs
+++ /dev/null
@@ -1,900 +0,0 @@
-pub mod wit;
-
-use crate::capability_granter::CapabilityGranter;
-use crate::{ExtensionManifest, ExtensionSettings};
-use anyhow::{Context as _, Result, anyhow, bail};
-use async_trait::async_trait;
-use dap::{DebugRequest, StartDebuggingRequestArgumentsRequest};
-use extension::{
-    CodeLabel, Command, Completion, ContextServerConfiguration, DebugAdapterBinary,
-    DebugTaskDefinition, ExtensionCapability, ExtensionHostProxy, KeyValueStoreDelegate,
-    ProjectDelegate, SlashCommand, SlashCommandArgumentCompletion, SlashCommandOutput, Symbol,
-    WorktreeDelegate,
-};
-use fs::{Fs, normalize_path};
-use futures::future::LocalBoxFuture;
-use futures::{
-    Future, FutureExt, StreamExt as _,
-    channel::{
-        mpsc::{self, UnboundedSender},
-        oneshot,
-    },
-    future::BoxFuture,
-};
-use gpui::{App, AsyncApp, BackgroundExecutor, Task, Timer};
-use http_client::HttpClient;
-use language::LanguageName;
-use lsp::LanguageServerName;
-use moka::sync::Cache;
-use node_runtime::NodeRuntime;
-use release_channel::ReleaseChannel;
-use semver::Version;
-use settings::Settings;
-use std::{
-    borrow::Cow,
-    path::{Path, PathBuf},
-    sync::{
-        Arc, LazyLock, OnceLock,
-        atomic::{AtomicBool, Ordering},
-    },
-    time::Duration,
-};
-use task::{DebugScenario, SpawnInTerminal, TaskTemplate, ZedDebugConfig};
-use util::paths::SanitizedPath;
-use wasmtime::{
-    CacheStore, Engine, Store,
-    component::{Component, ResourceTable},
-};
-use wasmtime_wasi::{self as wasi, WasiView};
-use wit::Extension;
-
-pub struct WasmHost {
-    engine: Engine,
-    release_channel: ReleaseChannel,
-    http_client: Arc<dyn HttpClient>,
-    node_runtime: NodeRuntime,
-    pub(crate) proxy: Arc<ExtensionHostProxy>,
-    fs: Arc<dyn Fs>,
-    pub work_dir: PathBuf,
-    /// The capabilities granted to extensions running on the host.
-    pub(crate) granted_capabilities: Vec<ExtensionCapability>,
-    _main_thread_message_task: Task<()>,
-    main_thread_message_tx: mpsc::UnboundedSender<MainThreadCall>,
-}
-
-#[derive(Clone, Debug)]
-pub struct WasmExtension {
-    tx: UnboundedSender<ExtensionCall>,
-    pub manifest: Arc<ExtensionManifest>,
-    pub work_dir: Arc<Path>,
-    #[allow(unused)]
-    pub zed_api_version: Version,
-    _task: Arc<Task<Result<(), gpui_tokio::JoinError>>>,
-}
-
-impl Drop for WasmExtension {
-    fn drop(&mut self) {
-        self.tx.close_channel();
-    }
-}
-
-#[async_trait]
-impl extension::Extension for WasmExtension {
-    fn manifest(&self) -> Arc<ExtensionManifest> {
-        self.manifest.clone()
-    }
-
-    fn work_dir(&self) -> Arc<Path> {
-        self.work_dir.clone()
-    }
-
-    async fn language_server_command(
-        &self,
-        language_server_id: LanguageServerName,
-        language_name: LanguageName,
-        worktree: Arc<dyn WorktreeDelegate>,
-    ) -> Result<Command> {
-        self.call(|extension, store| {
-            async move {
-                let resource = store.data_mut().table().push(worktree)?;
-                let command = extension
-                    .call_language_server_command(
-                        store,
-                        &language_server_id,
-                        &language_name,
-                        resource,
-                    )
-                    .await?
-                    .map_err(|err| store.data().extension_error(err))?;
-
-                Ok(command.into())
-            }
-            .boxed()
-        })
-        .await?
-    }
-
-    async fn language_server_initialization_options(
-        &self,
-        language_server_id: LanguageServerName,
-        language_name: LanguageName,
-        worktree: Arc<dyn WorktreeDelegate>,
-    ) -> Result<Option<String>> {
-        self.call(|extension, store| {
-            async move {
-                let resource = store.data_mut().table().push(worktree)?;
-                let options = extension
-                    .call_language_server_initialization_options(
-                        store,
-                        &language_server_id,
-                        &language_name,
-                        resource,
-                    )
-                    .await?
-                    .map_err(|err| store.data().extension_error(err))?;
-                anyhow::Ok(options)
-            }
-            .boxed()
-        })
-        .await?
-    }
-
-    async fn language_server_workspace_configuration(
-        &self,
-        language_server_id: LanguageServerName,
-        worktree: Arc<dyn WorktreeDelegate>,
-    ) -> Result<Option<String>> {
-        self.call(|extension, store| {
-            async move {
-                let resource = store.data_mut().table().push(worktree)?;
-                let options = extension
-                    .call_language_server_workspace_configuration(
-                        store,
-                        &language_server_id,
-                        resource,
-                    )
-                    .await?
-                    .map_err(|err| store.data().extension_error(err))?;
-                anyhow::Ok(options)
-            }
-            .boxed()
-        })
-        .await?
-    }
-
-    async fn language_server_additional_initialization_options(
-        &self,
-        language_server_id: LanguageServerName,
-        target_language_server_id: LanguageServerName,
-        worktree: Arc<dyn WorktreeDelegate>,
-    ) -> Result<Option<String>> {
-        self.call(|extension, store| {
-            async move {
-                let resource = store.data_mut().table().push(worktree)?;
-                let options = extension
-                    .call_language_server_additional_initialization_options(
-                        store,
-                        &language_server_id,
-                        &target_language_server_id,
-                        resource,
-                    )
-                    .await?
-                    .map_err(|err| store.data().extension_error(err))?;
-                anyhow::Ok(options)
-            }
-            .boxed()
-        })
-        .await?
-    }
-
-    async fn language_server_additional_workspace_configuration(
-        &self,
-        language_server_id: LanguageServerName,
-        target_language_server_id: LanguageServerName,
-        worktree: Arc<dyn WorktreeDelegate>,
-    ) -> Result<Option<String>> {
-        self.call(|extension, store| {
-            async move {
-                let resource = store.data_mut().table().push(worktree)?;
-                let options = extension
-                    .call_language_server_additional_workspace_configuration(
-                        store,
-                        &language_server_id,
-                        &target_language_server_id,
-                        resource,
-                    )
-                    .await?
-                    .map_err(|err| store.data().extension_error(err))?;
-                anyhow::Ok(options)
-            }
-            .boxed()
-        })
-        .await?
-    }
-
-    async fn labels_for_completions(
-        &self,
-        language_server_id: LanguageServerName,
-        completions: Vec<Completion>,
-    ) -> Result<Vec<Option<CodeLabel>>> {
-        self.call(|extension, store| {
-            async move {
-                let labels = extension
-                    .call_labels_for_completions(
-                        store,
-                        &language_server_id,
-                        completions.into_iter().map(Into::into).collect(),
-                    )
-                    .await?
-                    .map_err(|err| store.data().extension_error(err))?;
-
-                Ok(labels
-                    .into_iter()
-                    .map(|label| label.map(Into::into))
-                    .collect())
-            }
-            .boxed()
-        })
-        .await?
-    }
-
-    async fn labels_for_symbols(
-        &self,
-        language_server_id: LanguageServerName,
-        symbols: Vec<Symbol>,
-    ) -> Result<Vec<Option<CodeLabel>>> {
-        self.call(|extension, store| {
-            async move {
-                let labels = extension
-                    .call_labels_for_symbols(
-                        store,
-                        &language_server_id,
-                        symbols.into_iter().map(Into::into).collect(),
-                    )
-                    .await?
-                    .map_err(|err| store.data().extension_error(err))?;
-
-                Ok(labels
-                    .into_iter()
-                    .map(|label| label.map(Into::into))
-                    .collect())
-            }
-            .boxed()
-        })
-        .await?
-    }
-
-    async fn complete_slash_command_argument(
-        &self,
-        command: SlashCommand,
-        arguments: Vec<String>,
-    ) -> Result<Vec<SlashCommandArgumentCompletion>> {
-        self.call(|extension, store| {
-            async move {
-                let completions = extension
-                    .call_complete_slash_command_argument(store, &command.into(), &arguments)
-                    .await?
-                    .map_err(|err| store.data().extension_error(err))?;
-
-                Ok(completions.into_iter().map(Into::into).collect())
-            }
-            .boxed()
-        })
-        .await?
-    }
-
-    async fn run_slash_command(
-        &self,
-        command: SlashCommand,
-        arguments: Vec<String>,
-        delegate: Option<Arc<dyn WorktreeDelegate>>,
-    ) -> Result<SlashCommandOutput> {
-        self.call(|extension, store| {
-            async move {
-                let resource = if let Some(delegate) = delegate {
-                    Some(store.data_mut().table().push(delegate)?)
-                } else {
-                    None
-                };
-
-                let output = extension
-                    .call_run_slash_command(store, &command.into(), &arguments, resource)
-                    .await?
-                    .map_err(|err| store.data().extension_error(err))?;
-
-                Ok(output.into())
-            }
-            .boxed()
-        })
-        .await?
-    }
-
-    async fn context_server_command(
-        &self,
-        context_server_id: Arc<str>,
-        project: Arc<dyn ProjectDelegate>,
-    ) -> Result<Command> {
-        self.call(|extension, store| {
-            async move {
-                let project_resource = store.data_mut().table().push(project)?;
-                let command = extension
-                    .call_context_server_command(store, context_server_id.clone(), project_resource)
-                    .await?
-                    .map_err(|err| store.data().extension_error(err))?;
-                anyhow::Ok(command.into())
-            }
-            .boxed()
-        })
-        .await?
-    }
-
-    async fn context_server_configuration(
-        &self,
-        context_server_id: Arc<str>,
-        project: Arc<dyn ProjectDelegate>,
-    ) -> Result<Option<ContextServerConfiguration>> {
-        self.call(|extension, store| {
-            async move {
-                let project_resource = store.data_mut().table().push(project)?;
-                let Some(configuration) = extension
-                    .call_context_server_configuration(
-                        store,
-                        context_server_id.clone(),
-                        project_resource,
-                    )
-                    .await?
-                    .map_err(|err| store.data().extension_error(err))?
-                else {
-                    return Ok(None);
-                };
-
-                Ok(Some(configuration.try_into()?))
-            }
-            .boxed()
-        })
-        .await?
-    }
-
-    async fn suggest_docs_packages(&self, provider: Arc<str>) -> Result<Vec<String>> {
-        self.call(|extension, store| {
-            async move {
-                let packages = extension
-                    .call_suggest_docs_packages(store, provider.as_ref())
-                    .await?
-                    .map_err(|err| store.data().extension_error(err))?;
-
-                Ok(packages)
-            }
-            .boxed()
-        })
-        .await?
-    }
-
-    async fn index_docs(
-        &self,
-        provider: Arc<str>,
-        package_name: Arc<str>,
-        kv_store: Arc<dyn KeyValueStoreDelegate>,
-    ) -> Result<()> {
-        self.call(|extension, store| {
-            async move {
-                let kv_store_resource = store.data_mut().table().push(kv_store)?;
-                extension
-                    .call_index_docs(
-                        store,
-                        provider.as_ref(),
-                        package_name.as_ref(),
-                        kv_store_resource,
-                    )
-                    .await?
-                    .map_err(|err| store.data().extension_error(err))?;
-
-                anyhow::Ok(())
-            }
-            .boxed()
-        })
-        .await?
-    }
-
-    async fn get_dap_binary(
-        &self,
-        dap_name: Arc<str>,
-        config: DebugTaskDefinition,
-        user_installed_path: Option<PathBuf>,
-        worktree: Arc<dyn WorktreeDelegate>,
-    ) -> Result<DebugAdapterBinary> {
-        self.call(|extension, store| {
-            async move {
-                let resource = store.data_mut().table().push(worktree)?;
-                let dap_binary = extension
-                    .call_get_dap_binary(store, dap_name, config, user_installed_path, resource)
-                    .await?
-                    .map_err(|err| store.data().extension_error(err))?;
-                let dap_binary = dap_binary.try_into()?;
-                Ok(dap_binary)
-            }
-            .boxed()
-        })
-        .await?
-    }
-    async fn dap_request_kind(
-        &self,
-        dap_name: Arc<str>,
-        config: serde_json::Value,
-    ) -> Result<StartDebuggingRequestArgumentsRequest> {
-        self.call(|extension, store| {
-            async move {
-                let kind = extension
-                    .call_dap_request_kind(store, dap_name, config)
-                    .await?
-                    .map_err(|err| store.data().extension_error(err))?;
-                Ok(kind.into())
-            }
-            .boxed()
-        })
-        .await?
-    }
-
-    async fn dap_config_to_scenario(&self, config: ZedDebugConfig) -> Result<DebugScenario> {
-        self.call(|extension, store| {
-            async move {
-                let kind = extension
-                    .call_dap_config_to_scenario(store, config)
-                    .await?
-                    .map_err(|err| store.data().extension_error(err))?;
-                Ok(kind)
-            }
-            .boxed()
-        })
-        .await?
-    }
-
-    async fn dap_locator_create_scenario(
-        &self,
-        locator_name: String,
-        build_config_template: TaskTemplate,
-        resolved_label: String,
-        debug_adapter_name: String,
-    ) -> Result<Option<DebugScenario>> {
-        self.call(|extension, store| {
-            async move {
-                extension
-                    .call_dap_locator_create_scenario(
-                        store,
-                        locator_name,
-                        build_config_template,
-                        resolved_label,
-                        debug_adapter_name,
-                    )
-                    .await
-            }
-            .boxed()
-        })
-        .await?
-    }
-    async fn run_dap_locator(
-        &self,
-        locator_name: String,
-        config: SpawnInTerminal,
-    ) -> Result<DebugRequest> {
-        self.call(|extension, store| {
-            async move {
-                extension
-                    .call_run_dap_locator(store, locator_name, config)
-                    .await?
-                    .map_err(|err| store.data().extension_error(err))
-            }
-            .boxed()
-        })
-        .await?
-    }
-}
-
-pub struct WasmState {
-    manifest: Arc<ExtensionManifest>,
-    pub table: ResourceTable,
-    ctx: wasi::WasiCtx,
-    pub host: Arc<WasmHost>,
-    pub(crate) capability_granter: CapabilityGranter,
-}
-
-std::thread_local! {
-    /// Used by the crash handler to ignore panics in extension-related threads.
-    pub static IS_WASM_THREAD: AtomicBool = const { AtomicBool::new(false) };
-}
-
-type MainThreadCall = Box<dyn Send + for<'a> FnOnce(&'a mut AsyncApp) -> LocalBoxFuture<'a, ()>>;
-
-type ExtensionCall = Box<
-    dyn Send + for<'a> FnOnce(&'a mut Extension, &'a mut Store<WasmState>) -> BoxFuture<'a, ()>,
->;
-
-fn wasm_engine(executor: &BackgroundExecutor) -> wasmtime::Engine {
-    static WASM_ENGINE: OnceLock<wasmtime::Engine> = OnceLock::new();
-    WASM_ENGINE
-        .get_or_init(|| {
-            let mut config = wasmtime::Config::new();
-            config.wasm_component_model(true);
-            config.async_support(true);
-            config
-                .enable_incremental_compilation(cache_store())
-                .unwrap();
-            // Async support introduces the issue that extension execution happens during `Future::poll`,
-            // which could block an async thread.
-            // https://docs.rs/wasmtime/latest/wasmtime/struct.Config.html#execution-in-poll
-            //
-            // Epoch interruption is a lightweight mechanism to allow the extensions to yield control
-            // back to the executor at regular intervals.
-            config.epoch_interruption(true);
-
-            let engine = wasmtime::Engine::new(&config).unwrap();
-
-            // It might be safer to do this on a non-async thread to make sure it makes progress
-            // regardless of if extensions are blocking.
-            // However, due to our current setup, this isn't a likely occurrence and we'd rather
-            // not have a dedicated thread just for this. If it becomes an issue, we can consider
-            // creating a separate thread for epoch interruption.
-            let engine_ref = engine.weak();
-            executor
-                .spawn(async move {
-                    // Somewhat arbitrary interval, as it isn't a guaranteed interval.
-                    // But this is a rough upper bound for how long the extension execution can block on
-                    // `Future::poll`.
-                    const EPOCH_INTERVAL: Duration = Duration::from_millis(100);
-                    let mut timer = Timer::interval(EPOCH_INTERVAL);
-                    while (timer.next().await).is_some() {
-                        // Exit the loop and thread once the engine is dropped.
-                        let Some(engine) = engine_ref.upgrade() else {
-                            break;
-                        };
-                        engine.increment_epoch();
-                    }
-                })
-                .detach();
-
-            engine
-        })
-        .clone()
-}
-
-fn cache_store() -> Arc<IncrementalCompilationCache> {
-    static CACHE_STORE: LazyLock<Arc<IncrementalCompilationCache>> =
-        LazyLock::new(|| Arc::new(IncrementalCompilationCache::new()));
-    CACHE_STORE.clone()
-}
-
-impl WasmHost {
-    pub fn new(
-        fs: Arc<dyn Fs>,
-        http_client: Arc<dyn HttpClient>,
-        node_runtime: NodeRuntime,
-        proxy: Arc<ExtensionHostProxy>,
-        work_dir: PathBuf,
-        cx: &mut App,
-    ) -> Arc<Self> {
-        let (tx, mut rx) = mpsc::unbounded::<MainThreadCall>();
-        let task = cx.spawn(async move |cx| {
-            while let Some(message) = rx.next().await {
-                message(cx).await;
-            }
-        });
-
-        let extension_settings = ExtensionSettings::get_global(cx);
-
-        Arc::new(Self {
-            engine: wasm_engine(cx.background_executor()),
-            fs,
-            work_dir,
-            http_client,
-            node_runtime,
-            proxy,
-            release_channel: ReleaseChannel::global(cx),
-            granted_capabilities: extension_settings.granted_capabilities.clone(),
-            _main_thread_message_task: task,
-            main_thread_message_tx: tx,
-        })
-    }
-
-    pub fn load_extension(
-        self: &Arc<Self>,
-        wasm_bytes: Vec<u8>,
-        manifest: &Arc<ExtensionManifest>,
-        cx: &AsyncApp,
-    ) -> Task<Result<WasmExtension>> {
-        let this = self.clone();
-        let manifest = manifest.clone();
-        let executor = cx.background_executor().clone();
-        let load_extension_task = async move {
-            let zed_api_version = parse_wasm_extension_version(&manifest.id, &wasm_bytes)?;
-
-            let component = Component::from_binary(&this.engine, &wasm_bytes)
-                .context("failed to compile wasm component")?;
-            let mut store = wasmtime::Store::new(
-                &this.engine,
-                WasmState {
-                    ctx: this.build_wasi_ctx(&manifest).await?,
-                    manifest: manifest.clone(),
-                    table: ResourceTable::new(),
-                    host: this.clone(),
-                    capability_granter: CapabilityGranter::new(
-                        this.granted_capabilities.clone(),
-                        manifest.clone(),
-                    ),
-                },
-            );
-            // Store will yield after 1 tick, and get a new deadline of 1 tick after each yield.
-            store.set_epoch_deadline(1);
-            store.epoch_deadline_async_yield_and_update(1);
-
-            let mut extension = Extension::instantiate_async(
-                &executor,
-                &mut store,
-                this.release_channel,
-                zed_api_version.clone(),
-                &component,
-            )
-            .await?;
-
-            extension
-                .call_init_extension(&mut store)
-                .await
-                .context("failed to initialize wasm extension")?;
-
-            let (tx, mut rx) = mpsc::unbounded::<ExtensionCall>();
-            let extension_task = async move {
-                // note: Setting the thread local here will slowly "poison" all tokio threads
-                // causing us to not record their panics any longer.
-                //
-                // This is fine though, the main zed binary only uses tokio for livekit and wasm extensions.
-                // Livekit seldom (if ever) panics 🤞 so the likelihood of us missing a panic in sentry is very low.
-                IS_WASM_THREAD.with(|v| v.store(true, Ordering::Release));
-                while let Some(call) = rx.next().await {
-                    (call)(&mut extension, &mut store).await;
-                }
-            };
-
-            anyhow::Ok((
-                extension_task,
-                manifest.clone(),
-                this.work_dir.join(manifest.id.as_ref()).into(),
-                tx,
-                zed_api_version,
-            ))
-        };
-        cx.spawn(async move |cx| {
-            let (extension_task, manifest, work_dir, tx, zed_api_version) =
-                cx.background_executor().spawn(load_extension_task).await?;
-            // we need to run run the task in a tokio context as wasmtime_wasi may
-            // call into tokio, accessing its runtime handle when we trigger the `engine.increment_epoch()` above.
-            let task = Arc::new(gpui_tokio::Tokio::spawn(cx, extension_task)?);
-
-            Ok(WasmExtension {
-                manifest,
-                work_dir,
-                tx,
-                zed_api_version,
-                _task: task,
-            })
-        })
-    }
-
-    async fn build_wasi_ctx(&self, manifest: &Arc<ExtensionManifest>) -> Result<wasi::WasiCtx> {
-        let extension_work_dir = self.work_dir.join(manifest.id.as_ref());
-        self.fs
-            .create_dir(&extension_work_dir)
-            .await
-            .context("failed to create extension work dir")?;
-
-        let file_perms = wasi::FilePerms::all();
-        let dir_perms = wasi::DirPerms::all();
-        let path = SanitizedPath::new(&extension_work_dir).to_string();
-        #[cfg(target_os = "windows")]
-        let path = path.replace('\\', "/");
-
-        let mut ctx = wasi::WasiCtxBuilder::new();
-        ctx.inherit_stdio()
-            .env("PWD", &path)
-            .env("RUST_BACKTRACE", "full");
-
-        ctx.preopened_dir(&path, ".", dir_perms, file_perms)?;
-        ctx.preopened_dir(&path, &path, dir_perms, file_perms)?;
-
-        Ok(ctx.build())
-    }
-
-    pub fn writeable_path_from_extension(&self, id: &Arc<str>, path: &Path) -> Result<PathBuf> {
-        let extension_work_dir = self.work_dir.join(id.as_ref());
-        let path = normalize_path(&extension_work_dir.join(path));
-        anyhow::ensure!(
-            path.starts_with(&extension_work_dir),
-            "cannot write to path {path:?}",
-        );
-        Ok(path)
-    }
-}
-
-pub fn parse_wasm_extension_version(extension_id: &str, wasm_bytes: &[u8]) -> Result<Version> {
-    let mut version = None;
-
-    for part in wasmparser::Parser::new(0).parse_all(wasm_bytes) {
-        if let wasmparser::Payload::CustomSection(s) =
-            part.context("error parsing wasm extension")?
-            && s.name() == "zed:api-version"
-        {
-            version = parse_wasm_extension_version_custom_section(s.data());
-            if version.is_none() {
-                bail!(
-                    "extension {} has invalid zed:api-version section: {:?}",
-                    extension_id,
-                    s.data()
-                );
-            }
-        }
-    }
-
-    // The reason we wait until we're done parsing all of the Wasm bytes to return the version
-    // is to work around a panic that can happen inside of Wasmtime when the bytes are invalid.
-    //
-    // By parsing the entirety of the Wasm bytes before we return, we're able to detect this problem
-    // earlier as an `Err` rather than as a panic.
-    version.with_context(|| format!("extension {extension_id} has no zed:api-version section"))
-}
-
-fn parse_wasm_extension_version_custom_section(data: &[u8]) -> Option<Version> {
-    if data.len() == 6 {
-        Some(Version::new(
-            u16::from_be_bytes([data[0], data[1]]) as _,
-            u16::from_be_bytes([data[2], data[3]]) as _,
-            u16::from_be_bytes([data[4], data[5]]) as _,
-        ))
-    } else {
-        None
-    }
-}
-
-impl WasmExtension {
-    pub async fn load(
-        extension_dir: &Path,
-        manifest: &Arc<ExtensionManifest>,
-        wasm_host: Arc<WasmHost>,
-        cx: &AsyncApp,
-    ) -> Result<Self> {
-        let path = extension_dir.join("extension.wasm");
-
-        let mut wasm_file = wasm_host
-            .fs
-            .open_sync(&path)
-            .await
-            .context(format!("opening wasm file, path: {path:?}"))?;
-
-        let mut wasm_bytes = Vec::new();
-        wasm_file
-            .read_to_end(&mut wasm_bytes)
-            .context(format!("reading wasm file, path: {path:?}"))?;
-
-        wasm_host
-            .load_extension(wasm_bytes, manifest, cx)
-            .await
-            .with_context(|| format!("loading wasm extension: {}", manifest.id))
-    }
-
-    pub async fn call<T, Fn>(&self, f: Fn) -> Result<T>
-    where
-        T: 'static + Send,
-        Fn: 'static
-            + Send
-            + for<'a> FnOnce(&'a mut Extension, &'a mut Store<WasmState>) -> BoxFuture<'a, T>,
-    {
-        let (return_tx, return_rx) = oneshot::channel();
-        self.tx
-            .unbounded_send(Box::new(move |extension, store| {
-                async {
-                    let result = f(extension, store).await;
-                    return_tx.send(result).ok();
-                }
-                .boxed()
-            }))
-            .map_err(|_| {
-                anyhow!(
-                    "wasm extension channel should not be closed yet, extension {} (id {})",
-                    self.manifest.name,
-                    self.manifest.id,
-                )
-            })?;
-        return_rx.await.with_context(|| {
-            format!(
-                "wasm extension channel, extension {} (id {})",
-                self.manifest.name, self.manifest.id,
-            )
-        })
-    }
-}
-
-impl WasmState {
-    fn on_main_thread<T, Fn>(&self, f: Fn) -> impl 'static + Future<Output = T>
-    where
-        T: 'static + Send,
-        Fn: 'static + Send + for<'a> FnOnce(&'a mut AsyncApp) -> LocalBoxFuture<'a, T>,
-    {
-        let (return_tx, return_rx) = oneshot::channel();
-        self.host
-            .main_thread_message_tx
-            .clone()
-            .unbounded_send(Box::new(move |cx| {
-                async {
-                    let result = f(cx).await;
-                    return_tx.send(result).ok();
-                }
-                .boxed_local()
-            }))
-            .unwrap_or_else(|_| {
-                panic!(
-                    "main thread message channel should not be closed yet, extension {} (id {})",
-                    self.manifest.name, self.manifest.id,
-                )
-            });
-        let name = self.manifest.name.clone();
-        let id = self.manifest.id.clone();
-        async move {
-            return_rx.await.unwrap_or_else(|_| {
-                panic!("main thread message channel, extension {name} (id {id})")
-            })
-        }
-    }
-
-    fn work_dir(&self) -> PathBuf {
-        self.host.work_dir.join(self.manifest.id.as_ref())
-    }
-
-    fn extension_error(&self, message: String) -> anyhow::Error {
-        anyhow!(
-            "from extension \"{}\" version {}: {}",
-            self.manifest.name,
-            self.manifest.version,
-            message
-        )
-    }
-}
-
-impl wasi::WasiView for WasmState {
-    fn table(&mut self) -> &mut ResourceTable {
-        &mut self.table
-    }
-
-    fn ctx(&mut self) -> &mut wasi::WasiCtx {
-        &mut self.ctx
-    }
-}
-
-/// Wrapper around a mini-moka bounded cache for storing incremental compilation artifacts.
-/// Since wasm modules have many similar elements, this can save us a lot of work at the
-/// cost of a small memory footprint. However, we don't want this to be unbounded, so we use
-/// a LFU/LRU cache to evict less used cache entries.
-#[derive(Debug)]
-struct IncrementalCompilationCache {
-    cache: Cache<Vec<u8>, Vec<u8>>,
-}
-
-impl IncrementalCompilationCache {
-    fn new() -> Self {
-        let cache = Cache::builder()
-            // Cap this at 32 MB for now. Our extensions turn into roughly 512kb in the cache,
-            // which means we could store 64 completely novel extensions in the cache, but in
-            // practice we will more than that, which is more than enough for our use case.
-            .max_capacity(32 * 1024 * 1024)
-            .weigher(|k: &Vec<u8>, v: &Vec<u8>| (k.len() + v.len()).try_into().unwrap_or(u32::MAX))
-            .build();
-        Self { cache }
-    }
-}
-
-impl CacheStore for IncrementalCompilationCache {
-    fn get(&self, key: &[u8]) -> Option<Cow<'_, [u8]>> {
-        self.cache.get(key).map(|v| v.into())
-    }
-
-    fn insert(&self, key: &[u8], value: Vec<u8>) -> bool {
-        self.cache.insert(key.to_vec(), value);
-        true
-    }
-}
diff --git a/crates/extension_host/src/wasm_host/wit.rs b/crates/extension_host/src/wasm_host/wit.rs
deleted file mode 100644
index 5058c63365..0000000000
--- a/crates/extension_host/src/wasm_host/wit.rs
+++ /dev/null
@@ -1,1124 +0,0 @@
-mod since_v0_0_1;
-mod since_v0_0_4;
-mod since_v0_0_6;
-mod since_v0_1_0;
-mod since_v0_2_0;
-mod since_v0_3_0;
-mod since_v0_4_0;
-mod since_v0_5_0;
-mod since_v0_6_0;
-mod since_v0_8_0;
-use dap::DebugRequest;
-use extension::{DebugTaskDefinition, KeyValueStoreDelegate, WorktreeDelegate};
-use gpui::BackgroundExecutor;
-use language::LanguageName;
-use lsp::LanguageServerName;
-use release_channel::ReleaseChannel;
-use task::{DebugScenario, SpawnInTerminal, TaskTemplate, ZedDebugConfig};
-
-use crate::wasm_host::wit::since_v0_6_0::dap::StartDebuggingRequestArgumentsRequest;
-
-use super::{WasmState, wasm_engine};
-use anyhow::{Context as _, Result, anyhow};
-use semver::Version;
-use since_v0_8_0 as latest;
-use std::{ops::RangeInclusive, path::PathBuf, sync::Arc};
-use wasmtime::{
-    Store,
-    component::{Component, Linker, Resource},
-};
-
-#[cfg(test)]
-pub use latest::CodeLabelSpanLiteral;
-pub use latest::{
-    CodeLabel, CodeLabelSpan, Command, DebugAdapterBinary, ExtensionProject, Range, SlashCommand,
-    zed::extension::context_server::ContextServerConfiguration,
-    zed::extension::lsp::{
-        Completion, CompletionKind, CompletionLabelDetails, InsertTextFormat, Symbol, SymbolKind,
-    },
-    zed::extension::slash_command::{SlashCommandArgumentCompletion, SlashCommandOutput},
-};
-pub use since_v0_0_4::LanguageServerConfig;
-
-pub fn new_linker(
-    executor: &BackgroundExecutor,
-    f: impl Fn(&mut Linker<WasmState>, fn(&mut WasmState) -> &mut WasmState) -> Result<()>,
-) -> Linker<WasmState> {
-    let mut linker = Linker::new(&wasm_engine(executor));
-    wasmtime_wasi::add_to_linker_async(&mut linker).unwrap();
-    f(&mut linker, wasi_view).unwrap();
-    linker
-}
-
-fn wasi_view(state: &mut WasmState) -> &mut WasmState {
-    state
-}
-
-/// Returns whether the given Wasm API version is supported by the Wasm host.
-pub fn is_supported_wasm_api_version(release_channel: ReleaseChannel, version: Version) -> bool {
-    wasm_api_version_range(release_channel).contains(&version)
-}
-
-/// Returns the Wasm API version range that is supported by the Wasm host.
-#[inline(always)]
-pub fn wasm_api_version_range(release_channel: ReleaseChannel) -> RangeInclusive<Version> {
-    // Note: The release channel can be used to stage a new version of the extension API.
-    let _ = release_channel;
-
-    let max_version = match release_channel {
-        ReleaseChannel::Dev | ReleaseChannel::Nightly => latest::MAX_VERSION,
-        ReleaseChannel::Stable | ReleaseChannel::Preview => since_v0_6_0::MAX_VERSION,
-    };
-
-    since_v0_0_1::MIN_VERSION..=max_version
-}
-
-/// Authorizes access to use unreleased versions of the Wasm API, based on the provided [`ReleaseChannel`].
-///
-/// Note: If there isn't currently an unreleased Wasm API version this function may be unused. Don't delete it!
-pub fn authorize_access_to_unreleased_wasm_api_version(
-    release_channel: ReleaseChannel,
-) -> Result<()> {
-    let allow_unreleased_version = match release_channel {
-        ReleaseChannel::Dev | ReleaseChannel::Nightly => true,
-        ReleaseChannel::Stable | ReleaseChannel::Preview => {
-            // We always allow the latest in tests so that the extension tests pass on release branches.
-            cfg!(any(test, feature = "test-support"))
-        }
-    };
-
-    anyhow::ensure!(
-        allow_unreleased_version,
-        "unreleased versions of the extension API can only be used on development builds of Zed"
-    );
-
-    Ok(())
-}
-
-pub enum Extension {
-    V0_8_0(since_v0_8_0::Extension),
-    V0_6_0(since_v0_6_0::Extension),
-    V0_5_0(since_v0_5_0::Extension),
-    V0_4_0(since_v0_4_0::Extension),
-    V0_3_0(since_v0_3_0::Extension),
-    V0_2_0(since_v0_2_0::Extension),
-    V0_1_0(since_v0_1_0::Extension),
-    V0_0_6(since_v0_0_6::Extension),
-    V0_0_4(since_v0_0_4::Extension),
-    V0_0_1(since_v0_0_1::Extension),
-}
-
-impl Extension {
-    pub async fn instantiate_async(
-        executor: &BackgroundExecutor,
-        store: &mut Store<WasmState>,
-        release_channel: ReleaseChannel,
-        version: Version,
-        component: &Component,
-    ) -> Result<Self> {
-        // Note: The release channel can be used to stage a new version of the extension API.
-        let _ = release_channel;
-
-        if version >= latest::MIN_VERSION {
-            authorize_access_to_unreleased_wasm_api_version(release_channel)?;
-
-            let extension =
-                latest::Extension::instantiate_async(store, component, latest::linker(executor))
-                    .await
-                    .context("failed to instantiate wasm extension")?;
-            Ok(Self::V0_8_0(extension))
-        } else if version >= since_v0_6_0::MIN_VERSION {
-            let extension = since_v0_6_0::Extension::instantiate_async(
-                store,
-                component,
-                since_v0_6_0::linker(executor),
-            )
-            .await
-            .context("failed to instantiate wasm extension")?;
-            Ok(Self::V0_6_0(extension))
-        } else if version >= since_v0_5_0::MIN_VERSION {
-            let extension = since_v0_5_0::Extension::instantiate_async(
-                store,
-                component,
-                since_v0_5_0::linker(executor),
-            )
-            .await
-            .context("failed to instantiate wasm extension")?;
-            Ok(Self::V0_5_0(extension))
-        } else if version >= since_v0_4_0::MIN_VERSION {
-            let extension = since_v0_4_0::Extension::instantiate_async(
-                store,
-                component,
-                since_v0_4_0::linker(executor),
-            )
-            .await
-            .context("failed to instantiate wasm extension")?;
-            Ok(Self::V0_4_0(extension))
-        } else if version >= since_v0_3_0::MIN_VERSION {
-            let extension = since_v0_3_0::Extension::instantiate_async(
-                store,
-                component,
-                since_v0_3_0::linker(executor),
-            )
-            .await
-            .context("failed to instantiate wasm extension")?;
-            Ok(Self::V0_3_0(extension))
-        } else if version >= since_v0_2_0::MIN_VERSION {
-            let extension = since_v0_2_0::Extension::instantiate_async(
-                store,
-                component,
-                since_v0_2_0::linker(executor),
-            )
-            .await
-            .context("failed to instantiate wasm extension")?;
-            Ok(Self::V0_2_0(extension))
-        } else if version >= since_v0_1_0::MIN_VERSION {
-            let extension = since_v0_1_0::Extension::instantiate_async(
-                store,
-                component,
-                since_v0_1_0::linker(executor),
-            )
-            .await
-            .context("failed to instantiate wasm extension")?;
-            Ok(Self::V0_1_0(extension))
-        } else if version >= since_v0_0_6::MIN_VERSION {
-            let extension = since_v0_0_6::Extension::instantiate_async(
-                store,
-                component,
-                since_v0_0_6::linker(executor),
-            )
-            .await
-            .context("failed to instantiate wasm extension")?;
-            Ok(Self::V0_0_6(extension))
-        } else if version >= since_v0_0_4::MIN_VERSION {
-            let extension = since_v0_0_4::Extension::instantiate_async(
-                store,
-                component,
-                since_v0_0_4::linker(executor),
-            )
-            .await
-            .context("failed to instantiate wasm extension")?;
-            Ok(Self::V0_0_4(extension))
-        } else {
-            let extension = since_v0_0_1::Extension::instantiate_async(
-                store,
-                component,
-                since_v0_0_1::linker(executor),
-            )
-            .await
-            .context("failed to instantiate wasm extension")?;
-            Ok(Self::V0_0_1(extension))
-        }
-    }
-
-    pub async fn call_init_extension(&self, store: &mut Store<WasmState>) -> Result<()> {
-        match self {
-            Extension::V0_8_0(ext) => ext.call_init_extension(store).await,
-            Extension::V0_6_0(ext) => ext.call_init_extension(store).await,
-            Extension::V0_5_0(ext) => ext.call_init_extension(store).await,
-            Extension::V0_4_0(ext) => ext.call_init_extension(store).await,
-            Extension::V0_3_0(ext) => ext.call_init_extension(store).await,
-            Extension::V0_2_0(ext) => ext.call_init_extension(store).await,
-            Extension::V0_1_0(ext) => ext.call_init_extension(store).await,
-            Extension::V0_0_6(ext) => ext.call_init_extension(store).await,
-            Extension::V0_0_4(ext) => ext.call_init_extension(store).await,
-            Extension::V0_0_1(ext) => ext.call_init_extension(store).await,
-        }
-    }
-
-    pub async fn call_language_server_command(
-        &self,
-        store: &mut Store<WasmState>,
-        language_server_id: &LanguageServerName,
-        language_name: &LanguageName,
-        resource: Resource<Arc<dyn WorktreeDelegate>>,
-    ) -> Result<Result<Command, String>> {
-        match self {
-            Extension::V0_8_0(ext) => {
-                ext.call_language_server_command(store, &language_server_id.0, resource)
-                    .await
-            }
-            Extension::V0_6_0(ext) => {
-                ext.call_language_server_command(store, &language_server_id.0, resource)
-                    .await
-            }
-            Extension::V0_5_0(ext) => {
-                ext.call_language_server_command(store, &language_server_id.0, resource)
-                    .await
-            }
-            Extension::V0_4_0(ext) => {
-                ext.call_language_server_command(store, &language_server_id.0, resource)
-                    .await
-            }
-            Extension::V0_3_0(ext) => {
-                ext.call_language_server_command(store, &language_server_id.0, resource)
-                    .await
-            }
-            Extension::V0_2_0(ext) => Ok(ext
-                .call_language_server_command(store, &language_server_id.0, resource)
-                .await?
-                .map(|command| command.into())),
-            Extension::V0_1_0(ext) => Ok(ext
-                .call_language_server_command(store, &language_server_id.0, resource)
-                .await?
-                .map(|command| command.into())),
-            Extension::V0_0_6(ext) => Ok(ext
-                .call_language_server_command(store, &language_server_id.0, resource)
-                .await?
-                .map(|command| command.into())),
-            Extension::V0_0_4(ext) => Ok(ext
-                .call_language_server_command(
-                    store,
-                    &LanguageServerConfig {
-                        name: language_server_id.0.to_string(),
-                        language_name: language_name.to_string(),
-                    },
-                    resource,
-                )
-                .await?
-                .map(|command| command.into())),
-            Extension::V0_0_1(ext) => Ok(ext
-                .call_language_server_command(
-                    store,
-                    &LanguageServerConfig {
-                        name: language_server_id.0.to_string(),
-                        language_name: language_name.to_string(),
-                    }
-                    .into(),
-                    resource,
-                )
-                .await?
-                .map(|command| command.into())),
-        }
-    }
-
-    pub async fn call_language_server_initialization_options(
-        &self,
-        store: &mut Store<WasmState>,
-        language_server_id: &LanguageServerName,
-        language_name: &LanguageName,
-        resource: Resource<Arc<dyn WorktreeDelegate>>,
-    ) -> Result<Result<Option<String>, String>> {
-        match self {
-            Extension::V0_8_0(ext) => {
-                ext.call_language_server_initialization_options(
-                    store,
-                    &language_server_id.0,
-                    resource,
-                )
-                .await
-            }
-            Extension::V0_6_0(ext) => {
-                ext.call_language_server_initialization_options(
-                    store,
-                    &language_server_id.0,
-                    resource,
-                )
-                .await
-            }
-            Extension::V0_5_0(ext) => {
-                ext.call_language_server_initialization_options(
-                    store,
-                    &language_server_id.0,
-                    resource,
-                )
-                .await
-            }
-            Extension::V0_4_0(ext) => {
-                ext.call_language_server_initialization_options(
-                    store,
-                    &language_server_id.0,
-                    resource,
-                )
-                .await
-            }
-            Extension::V0_3_0(ext) => {
-                ext.call_language_server_initialization_options(
-                    store,
-                    &language_server_id.0,
-                    resource,
-                )
-                .await
-            }
-            Extension::V0_2_0(ext) => {
-                ext.call_language_server_initialization_options(
-                    store,
-                    &language_server_id.0,
-                    resource,
-                )
-                .await
-            }
-            Extension::V0_1_0(ext) => {
-                ext.call_language_server_initialization_options(
-                    store,
-                    &language_server_id.0,
-                    resource,
-                )
-                .await
-            }
-            Extension::V0_0_6(ext) => {
-                ext.call_language_server_initialization_options(
-                    store,
-                    &language_server_id.0,
-                    resource,
-                )
-                .await
-            }
-            Extension::V0_0_4(ext) => {
-                ext.call_language_server_initialization_options(
-                    store,
-                    &LanguageServerConfig {
-                        name: language_server_id.0.to_string(),
-                        language_name: language_name.to_string(),
-                    },
-                    resource,
-                )
-                .await
-            }
-            Extension::V0_0_1(ext) => {
-                ext.call_language_server_initialization_options(
-                    store,
-                    &LanguageServerConfig {
-                        name: language_server_id.0.to_string(),
-                        language_name: language_name.to_string(),
-                    }
-                    .into(),
-                    resource,
-                )
-                .await
-            }
-        }
-    }
-
-    pub async fn call_language_server_workspace_configuration(
-        &self,
-        store: &mut Store<WasmState>,
-        language_server_id: &LanguageServerName,
-        resource: Resource<Arc<dyn WorktreeDelegate>>,
-    ) -> Result<Result<Option<String>, String>> {
-        match self {
-            Extension::V0_8_0(ext) => {
-                ext.call_language_server_workspace_configuration(
-                    store,
-                    &language_server_id.0,
-                    resource,
-                )
-                .await
-            }
-            Extension::V0_6_0(ext) => {
-                ext.call_language_server_workspace_configuration(
-                    store,
-                    &language_server_id.0,
-                    resource,
-                )
-                .await
-            }
-            Extension::V0_5_0(ext) => {
-                ext.call_language_server_workspace_configuration(
-                    store,
-                    &language_server_id.0,
-                    resource,
-                )
-                .await
-            }
-            Extension::V0_4_0(ext) => {
-                ext.call_language_server_workspace_configuration(
-                    store,
-                    &language_server_id.0,
-                    resource,
-                )
-                .await
-            }
-            Extension::V0_3_0(ext) => {
-                ext.call_language_server_workspace_configuration(
-                    store,
-                    &language_server_id.0,
-                    resource,
-                )
-                .await
-            }
-            Extension::V0_2_0(ext) => {
-                ext.call_language_server_workspace_configuration(
-                    store,
-                    &language_server_id.0,
-                    resource,
-                )
-                .await
-            }
-            Extension::V0_1_0(ext) => {
-                ext.call_language_server_workspace_configuration(
-                    store,
-                    &language_server_id.0,
-                    resource,
-                )
-                .await
-            }
-            Extension::V0_0_6(ext) => {
-                ext.call_language_server_workspace_configuration(
-                    store,
-                    &language_server_id.0,
-                    resource,
-                )
-                .await
-            }
-            Extension::V0_0_4(_) | Extension::V0_0_1(_) => Ok(Ok(None)),
-        }
-    }
-
-    pub async fn call_language_server_additional_initialization_options(
-        &self,
-        store: &mut Store<WasmState>,
-        language_server_id: &LanguageServerName,
-        target_language_server_id: &LanguageServerName,
-        resource: Resource<Arc<dyn WorktreeDelegate>>,
-    ) -> Result<Result<Option<String>, String>> {
-        match self {
-            Extension::V0_8_0(ext) => {
-                ext.call_language_server_additional_initialization_options(
-                    store,
-                    &language_server_id.0,
-                    &target_language_server_id.0,
-                    resource,
-                )
-                .await
-            }
-            Extension::V0_6_0(ext) => {
-                ext.call_language_server_additional_initialization_options(
-                    store,
-                    &language_server_id.0,
-                    &target_language_server_id.0,
-                    resource,
-                )
-                .await
-            }
-            Extension::V0_5_0(ext) => {
-                ext.call_language_server_additional_initialization_options(
-                    store,
-                    &language_server_id.0,
-                    &target_language_server_id.0,
-                    resource,
-                )
-                .await
-            }
-            Extension::V0_4_0(ext) => {
-                ext.call_language_server_additional_initialization_options(
-                    store,
-                    &language_server_id.0,
-                    &target_language_server_id.0,
-                    resource,
-                )
-                .await
-            }
-            Extension::V0_3_0(_)
-            | Extension::V0_2_0(_)
-            | Extension::V0_1_0(_)
-            | Extension::V0_0_6(_)
-            | Extension::V0_0_4(_)
-            | Extension::V0_0_1(_) => Ok(Ok(None)),
-        }
-    }
-
-    pub async fn call_language_server_additional_workspace_configuration(
-        &self,
-        store: &mut Store<WasmState>,
-        language_server_id: &LanguageServerName,
-        target_language_server_id: &LanguageServerName,
-        resource: Resource<Arc<dyn WorktreeDelegate>>,
-    ) -> Result<Result<Option<String>, String>> {
-        match self {
-            Extension::V0_8_0(ext) => {
-                ext.call_language_server_additional_workspace_configuration(
-                    store,
-                    &language_server_id.0,
-                    &target_language_server_id.0,
-                    resource,
-                )
-                .await
-            }
-            Extension::V0_6_0(ext) => {
-                ext.call_language_server_additional_workspace_configuration(
-                    store,
-                    &language_server_id.0,
-                    &target_language_server_id.0,
-                    resource,
-                )
-                .await
-            }
-            Extension::V0_5_0(ext) => {
-                ext.call_language_server_additional_workspace_configuration(
-                    store,
-                    &language_server_id.0,
-                    &target_language_server_id.0,
-                    resource,
-                )
-                .await
-            }
-            Extension::V0_4_0(ext) => {
-                ext.call_language_server_additional_workspace_configuration(
-                    store,
-                    &language_server_id.0,
-                    &target_language_server_id.0,
-                    resource,
-                )
-                .await
-            }
-            Extension::V0_3_0(_)
-            | Extension::V0_2_0(_)
-            | Extension::V0_1_0(_)
-            | Extension::V0_0_6(_)
-            | Extension::V0_0_4(_)
-            | Extension::V0_0_1(_) => Ok(Ok(None)),
-        }
-    }
-
-    pub async fn call_labels_for_completions(
-        &self,
-        store: &mut Store<WasmState>,
-        language_server_id: &LanguageServerName,
-        completions: Vec<latest::Completion>,
-    ) -> Result<Result<Vec<Option<CodeLabel>>, String>> {
-        match self {
-            Extension::V0_8_0(ext) => {
-                ext.call_labels_for_completions(store, &language_server_id.0, &completions)
-                    .await
-            }
-            Extension::V0_6_0(ext) => Ok(ext
-                .call_labels_for_completions(
-                    store,
-                    &language_server_id.0,
-                    &completions.into_iter().collect::<Vec<_>>(),
-                )
-                .await?
-                .map(|labels| {
-                    labels
-                        .into_iter()
-                        .map(|label| label.map(Into::into))
-                        .collect()
-                })),
-            Extension::V0_5_0(ext) => Ok(ext
-                .call_labels_for_completions(
-                    store,
-                    &language_server_id.0,
-                    &completions.into_iter().collect::<Vec<_>>(),
-                )
-                .await?
-                .map(|labels| {
-                    labels
-                        .into_iter()
-                        .map(|label| label.map(Into::into))
-                        .collect()
-                })),
-            Extension::V0_4_0(ext) => Ok(ext
-                .call_labels_for_completions(
-                    store,
-                    &language_server_id.0,
-                    &completions.into_iter().collect::<Vec<_>>(),
-                )
-                .await?
-                .map(|labels| {
-                    labels
-                        .into_iter()
-                        .map(|label| label.map(Into::into))
-                        .collect()
-                })),
-            Extension::V0_3_0(ext) => Ok(ext
-                .call_labels_for_completions(
-                    store,
-                    &language_server_id.0,
-                    &completions.into_iter().collect::<Vec<_>>(),
-                )
-                .await?
-                .map(|labels| {
-                    labels
-                        .into_iter()
-                        .map(|label| label.map(Into::into))
-                        .collect()
-                })),
-            Extension::V0_2_0(ext) => Ok(ext
-                .call_labels_for_completions(
-                    store,
-                    &language_server_id.0,
-                    &completions.into_iter().collect::<Vec<_>>(),
-                )
-                .await?
-                .map(|labels| {
-                    labels
-                        .into_iter()
-                        .map(|label| label.map(Into::into))
-                        .collect()
-                })),
-            Extension::V0_1_0(ext) => Ok(ext
-                .call_labels_for_completions(
-                    store,
-                    &language_server_id.0,
-                    &completions.into_iter().map(Into::into).collect::<Vec<_>>(),
-                )
-                .await?
-                .map(|labels| {
-                    labels
-                        .into_iter()
-                        .map(|label| label.map(Into::into))
-                        .collect()
-                })),
-            Extension::V0_0_6(ext) => Ok(ext
-                .call_labels_for_completions(
-                    store,
-                    &language_server_id.0,
-                    &completions.into_iter().map(Into::into).collect::<Vec<_>>(),
-                )
-                .await?
-                .map(|labels| {
-                    labels
-                        .into_iter()
-                        .map(|label| label.map(Into::into))
-                        .collect()
-                })),
-            Extension::V0_0_1(_) | Extension::V0_0_4(_) => Ok(Ok(Vec::new())),
-        }
-    }
-
-    pub async fn call_labels_for_symbols(
-        &self,
-        store: &mut Store<WasmState>,
-        language_server_id: &LanguageServerName,
-        symbols: Vec<latest::Symbol>,
-    ) -> Result<Result<Vec<Option<CodeLabel>>, String>> {
-        match self {
-            Extension::V0_8_0(ext) => {
-                ext.call_labels_for_symbols(store, &language_server_id.0, &symbols)
-                    .await
-            }
-            Extension::V0_6_0(ext) => Ok(ext
-                .call_labels_for_symbols(
-                    store,
-                    &language_server_id.0,
-                    &symbols.into_iter().collect::<Vec<_>>(),
-                )
-                .await?
-                .map(|labels| {
-                    labels
-                        .into_iter()
-                        .map(|label| label.map(Into::into))
-                        .collect()
-                })),
-            Extension::V0_5_0(ext) => Ok(ext
-                .call_labels_for_symbols(
-                    store,
-                    &language_server_id.0,
-                    &symbols.into_iter().collect::<Vec<_>>(),
-                )
-                .await?
-                .map(|labels| {
-                    labels
-                        .into_iter()
-                        .map(|label| label.map(Into::into))
-                        .collect()
-                })),
-            Extension::V0_4_0(ext) => Ok(ext
-                .call_labels_for_symbols(
-                    store,
-                    &language_server_id.0,
-                    &symbols.into_iter().collect::<Vec<_>>(),
-                )
-                .await?
-                .map(|labels| {
-                    labels
-                        .into_iter()
-                        .map(|label| label.map(Into::into))
-                        .collect()
-                })),
-            Extension::V0_3_0(ext) => Ok(ext
-                .call_labels_for_symbols(
-                    store,
-                    &language_server_id.0,
-                    &symbols.into_iter().collect::<Vec<_>>(),
-                )
-                .await?
-                .map(|labels| {
-                    labels
-                        .into_iter()
-                        .map(|label| label.map(Into::into))
-                        .collect()
-                })),
-            Extension::V0_2_0(ext) => Ok(ext
-                .call_labels_for_symbols(
-                    store,
-                    &language_server_id.0,
-                    &symbols.into_iter().collect::<Vec<_>>(),
-                )
-                .await?
-                .map(|labels| {
-                    labels
-                        .into_iter()
-                        .map(|label| label.map(Into::into))
-                        .collect()
-                })),
-            Extension::V0_1_0(ext) => Ok(ext
-                .call_labels_for_symbols(
-                    store,
-                    &language_server_id.0,
-                    &symbols.into_iter().map(Into::into).collect::<Vec<_>>(),
-                )
-                .await?
-                .map(|labels| {
-                    labels
-                        .into_iter()
-                        .map(|label| label.map(Into::into))
-                        .collect()
-                })),
-            Extension::V0_0_6(ext) => Ok(ext
-                .call_labels_for_symbols(
-                    store,
-                    &language_server_id.0,
-                    &symbols.into_iter().map(Into::into).collect::<Vec<_>>(),
-                )
-                .await?
-                .map(|labels| {
-                    labels
-                        .into_iter()
-                        .map(|label| label.map(Into::into))
-                        .collect()
-                })),
-            Extension::V0_0_1(_) | Extension::V0_0_4(_) => Ok(Ok(Vec::new())),
-        }
-    }
-
-    pub async fn call_complete_slash_command_argument(
-        &self,
-        store: &mut Store<WasmState>,
-        command: &SlashCommand,
-        arguments: &[String],
-    ) -> Result<Result<Vec<SlashCommandArgumentCompletion>, String>> {
-        match self {
-            Extension::V0_8_0(ext) => {
-                ext.call_complete_slash_command_argument(store, command, arguments)
-                    .await
-            }
-            Extension::V0_6_0(ext) => {
-                ext.call_complete_slash_command_argument(store, command, arguments)
-                    .await
-            }
-            Extension::V0_5_0(ext) => {
-                ext.call_complete_slash_command_argument(store, command, arguments)
-                    .await
-            }
-            Extension::V0_4_0(ext) => {
-                ext.call_complete_slash_command_argument(store, command, arguments)
-                    .await
-            }
-            Extension::V0_3_0(ext) => {
-                ext.call_complete_slash_command_argument(store, command, arguments)
-                    .await
-            }
-            Extension::V0_2_0(ext) => {
-                ext.call_complete_slash_command_argument(store, command, arguments)
-                    .await
-            }
-            Extension::V0_1_0(ext) => {
-                ext.call_complete_slash_command_argument(store, command, arguments)
-                    .await
-            }
-            Extension::V0_0_1(_) | Extension::V0_0_4(_) | Extension::V0_0_6(_) => {
-                Ok(Ok(Vec::new()))
-            }
-        }
-    }
-
-    pub async fn call_run_slash_command(
-        &self,
-        store: &mut Store<WasmState>,
-        command: &SlashCommand,
-        arguments: &[String],
-        resource: Option<Resource<Arc<dyn WorktreeDelegate>>>,
-    ) -> Result<Result<SlashCommandOutput, String>> {
-        match self {
-            Extension::V0_8_0(ext) => {
-                ext.call_run_slash_command(store, command, arguments, resource)
-                    .await
-            }
-            Extension::V0_6_0(ext) => {
-                ext.call_run_slash_command(store, command, arguments, resource)
-                    .await
-            }
-            Extension::V0_5_0(ext) => {
-                ext.call_run_slash_command(store, command, arguments, resource)
-                    .await
-            }
-            Extension::V0_4_0(ext) => {
-                ext.call_run_slash_command(store, command, arguments, resource)
-                    .await
-            }
-            Extension::V0_3_0(ext) => {
-                ext.call_run_slash_command(store, command, arguments, resource)
-                    .await
-            }
-            Extension::V0_2_0(ext) => {
-                ext.call_run_slash_command(store, command, arguments, resource)
-                    .await
-            }
-            Extension::V0_1_0(ext) => {
-                ext.call_run_slash_command(store, command, arguments, resource)
-                    .await
-            }
-            Extension::V0_0_1(_) | Extension::V0_0_4(_) | Extension::V0_0_6(_) => {
-                anyhow::bail!("`run_slash_command` not available prior to v0.1.0");
-            }
-        }
-    }
-
-    pub async fn call_context_server_command(
-        &self,
-        store: &mut Store<WasmState>,
-        context_server_id: Arc<str>,
-        project: Resource<ExtensionProject>,
-    ) -> Result<Result<Command, String>> {
-        match self {
-            Extension::V0_8_0(ext) => {
-                ext.call_context_server_command(store, &context_server_id, project)
-                    .await
-            }
-            Extension::V0_6_0(ext) => {
-                ext.call_context_server_command(store, &context_server_id, project)
-                    .await
-            }
-            Extension::V0_5_0(ext) => {
-                ext.call_context_server_command(store, &context_server_id, project)
-                    .await
-            }
-            Extension::V0_4_0(ext) => {
-                ext.call_context_server_command(store, &context_server_id, project)
-                    .await
-            }
-            Extension::V0_3_0(ext) => {
-                ext.call_context_server_command(store, &context_server_id, project)
-                    .await
-            }
-            Extension::V0_2_0(ext) => Ok(ext
-                .call_context_server_command(store, &context_server_id, project)
-                .await?
-                .map(Into::into)),
-            Extension::V0_0_1(_)
-            | Extension::V0_0_4(_)
-            | Extension::V0_0_6(_)
-            | Extension::V0_1_0(_) => {
-                anyhow::bail!("`context_server_command` not available prior to v0.2.0");
-            }
-        }
-    }
-
-    pub async fn call_context_server_configuration(
-        &self,
-        store: &mut Store<WasmState>,
-        context_server_id: Arc<str>,
-        project: Resource<ExtensionProject>,
-    ) -> Result<Result<Option<ContextServerConfiguration>, String>> {
-        match self {
-            Extension::V0_8_0(ext) => {
-                ext.call_context_server_configuration(store, &context_server_id, project)
-                    .await
-            }
-            Extension::V0_6_0(ext) => {
-                ext.call_context_server_configuration(store, &context_server_id, project)
-                    .await
-            }
-            Extension::V0_5_0(ext) => {
-                ext.call_context_server_configuration(store, &context_server_id, project)
-                    .await
-            }
-            Extension::V0_0_1(_)
-            | Extension::V0_0_4(_)
-            | Extension::V0_0_6(_)
-            | Extension::V0_1_0(_)
-            | Extension::V0_2_0(_)
-            | Extension::V0_3_0(_)
-            | Extension::V0_4_0(_) => {
-                anyhow::bail!("`context_server_configuration` not available prior to v0.5.0");
-            }
-        }
-    }
-
-    pub async fn call_suggest_docs_packages(
-        &self,
-        store: &mut Store<WasmState>,
-        provider: &str,
-    ) -> Result<Result<Vec<String>, String>> {
-        match self {
-            Extension::V0_8_0(ext) => ext.call_suggest_docs_packages(store, provider).await,
-            Extension::V0_6_0(ext) => ext.call_suggest_docs_packages(store, provider).await,
-            Extension::V0_5_0(ext) => ext.call_suggest_docs_packages(store, provider).await,
-            Extension::V0_4_0(ext) => ext.call_suggest_docs_packages(store, provider).await,
-            Extension::V0_3_0(ext) => ext.call_suggest_docs_packages(store, provider).await,
-            Extension::V0_2_0(ext) => ext.call_suggest_docs_packages(store, provider).await,
-            Extension::V0_1_0(ext) => ext.call_suggest_docs_packages(store, provider).await,
-            Extension::V0_0_1(_) | Extension::V0_0_4(_) | Extension::V0_0_6(_) => {
-                anyhow::bail!("`suggest_docs_packages` not available prior to v0.1.0");
-            }
-        }
-    }
-
-    pub async fn call_index_docs(
-        &self,
-        store: &mut Store<WasmState>,
-        provider: &str,
-        package_name: &str,
-        kv_store: Resource<Arc<dyn KeyValueStoreDelegate>>,
-    ) -> Result<Result<(), String>> {
-        match self {
-            Extension::V0_8_0(ext) => {
-                ext.call_index_docs(store, provider, package_name, kv_store)
-                    .await
-            }
-            Extension::V0_6_0(ext) => {
-                ext.call_index_docs(store, provider, package_name, kv_store)
-                    .await
-            }
-            Extension::V0_5_0(ext) => {
-                ext.call_index_docs(store, provider, package_name, kv_store)
-                    .await
-            }
-            Extension::V0_4_0(ext) => {
-                ext.call_index_docs(store, provider, package_name, kv_store)
-                    .await
-            }
-            Extension::V0_3_0(ext) => {
-                ext.call_index_docs(store, provider, package_name, kv_store)
-                    .await
-            }
-            Extension::V0_2_0(ext) => {
-                ext.call_index_docs(store, provider, package_name, kv_store)
-                    .await
-            }
-            Extension::V0_1_0(ext) => {
-                ext.call_index_docs(store, provider, package_name, kv_store)
-                    .await
-            }
-            Extension::V0_0_1(_) | Extension::V0_0_4(_) | Extension::V0_0_6(_) => {
-                anyhow::bail!("`index_docs` not available prior to v0.1.0");
-            }
-        }
-    }
-
-    pub async fn call_get_dap_binary(
-        &self,
-        store: &mut Store<WasmState>,
-        adapter_name: Arc<str>,
-        task: DebugTaskDefinition,
-        user_installed_path: Option<PathBuf>,
-        resource: Resource<Arc<dyn WorktreeDelegate>>,
-    ) -> Result<Result<DebugAdapterBinary, String>> {
-        match self {
-            Extension::V0_6_0(ext) => {
-                let dap_binary = ext
-                    .call_get_dap_binary(
-                        store,
-                        &adapter_name,
-                        &task.try_into()?,
-                        user_installed_path.as_ref().and_then(|p| p.to_str()),
-                        resource,
-                    )
-                    .await?
-                    .map_err(|e| anyhow!("{e:?}"))?;
-
-                Ok(Ok(dap_binary))
-            }
-            _ => anyhow::bail!("`get_dap_binary` not available prior to v0.6.0"),
-        }
-    }
-
-    pub async fn call_dap_request_kind(
-        &self,
-        store: &mut Store<WasmState>,
-        adapter_name: Arc<str>,
-        config: serde_json::Value,
-    ) -> Result<Result<StartDebuggingRequestArgumentsRequest, String>> {
-        match self {
-            Extension::V0_6_0(ext) => {
-                let config =
-                    serde_json::to_string(&config).context("Adapter config is not a valid JSON")?;
-                let dap_binary = ext
-                    .call_dap_request_kind(store, &adapter_name, &config)
-                    .await?
-                    .map_err(|e| anyhow!("{e:?}"))?;
-
-                Ok(Ok(dap_binary))
-            }
-            _ => anyhow::bail!("`dap_request_kind` not available prior to v0.6.0"),
-        }
-    }
-
-    pub async fn call_dap_config_to_scenario(
-        &self,
-        store: &mut Store<WasmState>,
-        config: ZedDebugConfig,
-    ) -> Result<Result<DebugScenario, String>> {
-        match self {
-            Extension::V0_6_0(ext) => {
-                let config = config.into();
-                let dap_binary = ext
-                    .call_dap_config_to_scenario(store, &config)
-                    .await?
-                    .map_err(|e| anyhow!("{e:?}"))?;
-
-                Ok(Ok(dap_binary.try_into()?))
-            }
-            _ => anyhow::bail!("`dap_config_to_scenario` not available prior to v0.6.0"),
-        }
-    }
-
-    pub async fn call_dap_locator_create_scenario(
-        &self,
-        store: &mut Store<WasmState>,
-        locator_name: String,
-        build_config_template: TaskTemplate,
-        resolved_label: String,
-        debug_adapter_name: String,
-    ) -> Result<Option<DebugScenario>> {
-        match self {
-            Extension::V0_6_0(ext) => {
-                let build_config_template = build_config_template.into();
-                let dap_binary = ext
-                    .call_dap_locator_create_scenario(
-                        store,
-                        &locator_name,
-                        &build_config_template,
-                        &resolved_label,
-                        &debug_adapter_name,
-                    )
-                    .await?;
-
-                Ok(dap_binary.map(TryInto::try_into).transpose()?)
-            }
-            _ => anyhow::bail!("`dap_locator_create_scenario` not available prior to v0.6.0"),
-        }
-    }
-
-    pub async fn call_run_dap_locator(
-        &self,
-        store: &mut Store<WasmState>,
-        locator_name: String,
-        resolved_build_task: SpawnInTerminal,
-    ) -> Result<Result<DebugRequest, String>> {
-        match self {
-            Extension::V0_6_0(ext) => {
-                let build_config_template = resolved_build_task.try_into()?;
-                let dap_request = ext
-                    .call_run_dap_locator(store, &locator_name, &build_config_template)
-                    .await?
-                    .map_err(|e| anyhow!("{e:?}"))?;
-
-                Ok(Ok(dap_request.into()))
-            }
-            _ => anyhow::bail!("`dap_locator_create_scenario` not available prior to v0.6.0"),
-        }
-    }
-}
-
-trait ToWasmtimeResult<T> {
-    fn to_wasmtime_result(self) -> wasmtime::Result<Result<T, String>>;
-}
-
-impl<T> ToWasmtimeResult<T> for Result<T> {
-    fn to_wasmtime_result(self) -> wasmtime::Result<Result<T, String>> {
-        Ok(self.map_err(|error| format!("{error:?}")))
-    }
-}
diff --git a/crates/extension_host/src/wasm_host/wit/since_v0_0_1.rs b/crates/extension_host/src/wasm_host/wit/since_v0_0_1.rs
deleted file mode 100644
index 17d5c00a9a..0000000000
--- a/crates/extension_host/src/wasm_host/wit/since_v0_0_1.rs
+++ /dev/null
@@ -1,158 +0,0 @@
-use super::latest;
-use crate::wasm_host::WasmState;
-use crate::wasm_host::wit::since_v0_0_4;
-use anyhow::Result;
-use extension::{ExtensionLanguageServerProxy, WorktreeDelegate};
-use gpui::BackgroundExecutor;
-use language::BinaryStatus;
-use semver::Version;
-use std::sync::{Arc, OnceLock};
-use wasmtime::component::{Linker, Resource};
-
-pub const MIN_VERSION: Version = Version::new(0, 0, 1);
-
-wasmtime::component::bindgen!({
-    async: true,
-    trappable_imports: true,
-    path: "../extension_api/wit/since_v0.0.1",
-    with: {
-         "worktree": ExtensionWorktree,
-         "zed:extension/github": latest::zed::extension::github,
-         "zed:extension/platform": latest::zed::extension::platform,
-    },
-});
-
-pub type ExtensionWorktree = Arc<dyn WorktreeDelegate>;
-
-pub fn linker(executor: &BackgroundExecutor) -> &'static Linker<WasmState> {
-    static LINKER: OnceLock<Linker<WasmState>> = OnceLock::new();
-    LINKER.get_or_init(|| super::new_linker(executor, Extension::add_to_linker))
-}
-
-impl From<DownloadedFileType> for latest::DownloadedFileType {
-    fn from(value: DownloadedFileType) -> Self {
-        match value {
-            DownloadedFileType::Gzip => latest::DownloadedFileType::Gzip,
-            DownloadedFileType::GzipTar => latest::DownloadedFileType::GzipTar,
-            DownloadedFileType::Zip => latest::DownloadedFileType::Zip,
-            DownloadedFileType::Uncompressed => latest::DownloadedFileType::Uncompressed,
-        }
-    }
-}
-
-impl From<since_v0_0_4::LanguageServerConfig> for LanguageServerConfig {
-    fn from(value: since_v0_0_4::LanguageServerConfig) -> Self {
-        Self {
-            name: value.name,
-            language_name: value.language_name,
-        }
-    }
-}
-
-impl From<Command> for latest::Command {
-    fn from(value: Command) -> Self {
-        Self {
-            command: value.command,
-            args: value.args,
-            env: value.env,
-        }
-    }
-}
-
-impl HostWorktree for WasmState {
-    async fn read_text_file(
-        &mut self,
-        delegate: Resource<Arc<dyn WorktreeDelegate>>,
-        path: String,
-    ) -> wasmtime::Result<Result<String, String>> {
-        latest::HostWorktree::read_text_file(self, delegate, path).await
-    }
-
-    async fn shell_env(
-        &mut self,
-        delegate: Resource<Arc<dyn WorktreeDelegate>>,
-    ) -> wasmtime::Result<EnvVars> {
-        latest::HostWorktree::shell_env(self, delegate).await
-    }
-
-    async fn which(
-        &mut self,
-        delegate: Resource<Arc<dyn WorktreeDelegate>>,
-        binary_name: String,
-    ) -> wasmtime::Result<Option<String>> {
-        latest::HostWorktree::which(self, delegate, binary_name).await
-    }
-
-    async fn drop(&mut self, _worktree: Resource<Worktree>) -> Result<()> {
-        Ok(())
-    }
-}
-
-impl ExtensionImports for WasmState {
-    async fn node_binary_path(&mut self) -> wasmtime::Result<Result<String, String>> {
-        latest::nodejs::Host::node_binary_path(self).await
-    }
-
-    async fn npm_package_latest_version(
-        &mut self,
-        package_name: String,
-    ) -> wasmtime::Result<Result<String, String>> {
-        latest::nodejs::Host::npm_package_latest_version(self, package_name).await
-    }
-
-    async fn npm_package_installed_version(
-        &mut self,
-        package_name: String,
-    ) -> wasmtime::Result<Result<Option<String>, String>> {
-        latest::nodejs::Host::npm_package_installed_version(self, package_name).await
-    }
-
-    async fn npm_install_package(
-        &mut self,
-        package_name: String,
-        version: String,
-    ) -> wasmtime::Result<Result<(), String>> {
-        latest::nodejs::Host::npm_install_package(self, package_name, version).await
-    }
-
-    async fn latest_github_release(
-        &mut self,
-        repo: String,
-        options: GithubReleaseOptions,
-    ) -> wasmtime::Result<Result<GithubRelease, String>> {
-        latest::zed::extension::github::Host::latest_github_release(self, repo, options).await
-    }
-
-    async fn current_platform(&mut self) -> Result<(Os, Architecture)> {
-        latest::zed::extension::platform::Host::current_platform(self).await
-    }
-
-    async fn set_language_server_installation_status(
-        &mut self,
-        server_name: String,
-        status: LanguageServerInstallationStatus,
-    ) -> wasmtime::Result<()> {
-        let status = match status {
-            LanguageServerInstallationStatus::CheckingForUpdate => BinaryStatus::CheckingForUpdate,
-            LanguageServerInstallationStatus::Downloading => BinaryStatus::Downloading,
-            LanguageServerInstallationStatus::Cached
-            | LanguageServerInstallationStatus::Downloaded => BinaryStatus::None,
-            LanguageServerInstallationStatus::Failed(error) => BinaryStatus::Failed { error },
-        };
-
-        self.host
-            .proxy
-            .update_language_server_status(lsp::LanguageServerName(server_name.into()), status);
-
-        Ok(())
-    }
-
-    async fn download_file(
-        &mut self,
-        url: String,
-        path: String,
-        file_type: DownloadedFileType,
-    ) -> wasmtime::Result<Result<(), String>> {
-        latest::ExtensionImports::download_file(self, url, path, file_type.into()).await
-    }
-}
diff --git a/crates/extension_host/src/wasm_host/wit/since_v0_0_4.rs b/crates/extension_host/src/wasm_host/wit/since_v0_0_4.rs
deleted file mode 100644
index 11b2e9f661..0000000000
--- a/crates/extension_host/src/wasm_host/wit/since_v0_0_4.rs
+++ /dev/null
@@ -1,164 +0,0 @@
-use super::latest;
-use crate::wasm_host::WasmState;
-use anyhow::Result;
-use extension::WorktreeDelegate;
-use gpui::BackgroundExecutor;
-use semver::Version;
-use std::sync::{Arc, OnceLock};
-use wasmtime::component::{Linker, Resource};
-
-pub const MIN_VERSION: Version = Version::new(0, 0, 4);
-
-wasmtime::component::bindgen!({
-    async: true,
-    trappable_imports: true,
-    path: "../extension_api/wit/since_v0.0.4",
-    with: {
-         "worktree": ExtensionWorktree,
-         "zed:extension/github": latest::zed::extension::github,
-         "zed:extension/platform": latest::zed::extension::platform,
-    },
-});
-
-pub type ExtensionWorktree = Arc<dyn WorktreeDelegate>;
-
-pub fn linker(executor: &BackgroundExecutor) -> &'static Linker<WasmState> {
-    static LINKER: OnceLock<Linker<WasmState>> = OnceLock::new();
-    LINKER.get_or_init(|| super::new_linker(executor, Extension::add_to_linker))
-}
-
-impl From<DownloadedFileType> for latest::DownloadedFileType {
-    fn from(value: DownloadedFileType) -> Self {
-        match value {
-            DownloadedFileType::Gzip => latest::DownloadedFileType::Gzip,
-            DownloadedFileType::GzipTar => latest::DownloadedFileType::GzipTar,
-            DownloadedFileType::Zip => latest::DownloadedFileType::Zip,
-            DownloadedFileType::Uncompressed => latest::DownloadedFileType::Uncompressed,
-        }
-    }
-}
-
-impl From<LanguageServerInstallationStatus> for latest::LanguageServerInstallationStatus {
-    fn from(value: LanguageServerInstallationStatus) -> Self {
-        match value {
-            LanguageServerInstallationStatus::None => {
-                latest::LanguageServerInstallationStatus::None
-            }
-            LanguageServerInstallationStatus::Downloading => {
-                latest::LanguageServerInstallationStatus::Downloading
-            }
-            LanguageServerInstallationStatus::CheckingForUpdate => {
-                latest::LanguageServerInstallationStatus::CheckingForUpdate
-            }
-            LanguageServerInstallationStatus::Failed(error) => {
-                latest::LanguageServerInstallationStatus::Failed(error)
-            }
-        }
-    }
-}
-
-impl From<Command> for latest::Command {
-    fn from(value: Command) -> Self {
-        Self {
-            command: value.command,
-            args: value.args,
-            env: value.env,
-        }
-    }
-}
-
-impl HostWorktree for WasmState {
-    async fn read_text_file(
-        &mut self,
-        delegate: Resource<Arc<dyn WorktreeDelegate>>,
-        path: String,
-    ) -> wasmtime::Result<Result<String, String>> {
-        latest::HostWorktree::read_text_file(self, delegate, path).await
-    }
-
-    async fn shell_env(
-        &mut self,
-        delegate: Resource<Arc<dyn WorktreeDelegate>>,
-    ) -> wasmtime::Result<EnvVars> {
-        latest::HostWorktree::shell_env(self, delegate).await
-    }
-
-    async fn which(
-        &mut self,
-        delegate: Resource<Arc<dyn WorktreeDelegate>>,
-        binary_name: String,
-    ) -> wasmtime::Result<Option<String>> {
-        latest::HostWorktree::which(self, delegate, binary_name).await
-    }
-
-    async fn drop(&mut self, _worktree: Resource<Worktree>) -> Result<()> {
-        // We only ever hand out borrows of worktrees.
-        Ok(())
-    }
-}
-
-impl ExtensionImports for WasmState {
-    async fn node_binary_path(&mut self) -> wasmtime::Result<Result<String, String>> {
-        latest::nodejs::Host::node_binary_path(self).await
-    }
-
-    async fn npm_package_latest_version(
-        &mut self,
-        package_name: String,
-    ) -> wasmtime::Result<Result<String, String>> {
-        latest::nodejs::Host::npm_package_latest_version(self, package_name).await
-    }
-
-    async fn npm_package_installed_version(
-        &mut self,
-        package_name: String,
-    ) -> wasmtime::Result<Result<Option<String>, String>> {
-        latest::nodejs::Host::npm_package_installed_version(self, package_name).await
-    }
-
-    async fn npm_install_package(
-        &mut self,
-        package_name: String,
-        version: String,
-    ) -> wasmtime::Result<Result<(), String>> {
-        latest::nodejs::Host::npm_install_package(self, package_name, version).await
-    }
-
-    async fn latest_github_release(
-        &mut self,
-        repo: String,
-        options: GithubReleaseOptions,
-    ) -> wasmtime::Result<Result<GithubRelease, String>> {
-        latest::zed::extension::github::Host::latest_github_release(self, repo, options).await
-    }
-
-    async fn current_platform(&mut self) -> Result<(Os, Architecture)> {
-        latest::zed::extension::platform::Host::current_platform(self).await
-    }
-
-    async fn set_language_server_installation_status(
-        &mut self,
-        server_name: String,
-        status: LanguageServerInstallationStatus,
-    ) -> wasmtime::Result<()> {
-        latest::ExtensionImports::set_language_server_installation_status(
-            self,
-            server_name,
-            status.into(),
-        )
-        .await
-    }
-
-    async fn download_file(
-        &mut self,
-        url: String,
-        path: String,
-        file_type: DownloadedFileType,
-    ) -> wasmtime::Result<Result<(), String>> {
-        latest::ExtensionImports::download_file(self, url, path, file_type.into()).await
-    }
-
-    async fn make_file_executable(&mut self, path: String) -> wasmtime::Result<Result<(), String>> {
-        latest::ExtensionImports::make_file_executable(self, path).await
-    }
-}
diff --git a/crates/extension_host/src/wasm_host/wit/since_v0_0_6.rs b/crates/extension_host/src/wasm_host/wit/since_v0_0_6.rs
deleted file mode 100644
index 835a2b30fb..0000000000
--- a/crates/extension_host/src/wasm_host/wit/since_v0_0_6.rs
+++ /dev/null
@@ -1,197 +0,0 @@
-use super::{latest, since_v0_1_0};
-use crate::wasm_host::WasmState;
-use anyhow::Result;
-use extension::WorktreeDelegate;
-use gpui::BackgroundExecutor;
-use semver::Version;
-use std::sync::{Arc, OnceLock};
-use wasmtime::component::{Linker, Resource};
-
-pub const MIN_VERSION: Version = Version::new(0, 0, 6);
-
-wasmtime::component::bindgen!({
-    async: true,
-    trappable_imports: true,
-    path: "../extension_api/wit/since_v0.0.6",
-    with: {
-         "worktree": ExtensionWorktree,
-         "zed:extension/github": latest::zed::extension::github,
-         "zed:extension/lsp": since_v0_1_0::zed::extension::lsp,
-         "zed:extension/nodejs": latest::zed::extension::nodejs,
-         "zed:extension/platform": latest::zed::extension::platform,
-    },
-});
-
-mod settings {
-    #![allow(dead_code)]
-    include!(concat!(env!("OUT_DIR"), "/since_v0.0.6/settings.rs"));
-}
-
-pub type ExtensionWorktree = Arc<dyn WorktreeDelegate>;
-
-pub fn linker(executor: &BackgroundExecutor) -> &'static Linker<WasmState> {
-    static LINKER: OnceLock<Linker<WasmState>> = OnceLock::new();
-    LINKER.get_or_init(|| super::new_linker(executor, Extension::add_to_linker))
-}
-
-impl From<Command> for latest::Command {
-    fn from(value: Command) -> Self {
-        Self {
-            command: value.command,
-            args: value.args,
-            env: value.env,
-        }
-    }
-}
-
-impl From<SettingsLocation> for latest::SettingsLocation {
-    fn from(value: SettingsLocation) -> Self {
-        Self {
-            worktree_id: value.worktree_id,
-            path: value.path,
-        }
-    }
-}
-
-impl From<LanguageServerInstallationStatus> for latest::LanguageServerInstallationStatus {
-    fn from(value: LanguageServerInstallationStatus) -> Self {
-        match value {
-            LanguageServerInstallationStatus::None => Self::None,
-            LanguageServerInstallationStatus::Downloading => Self::Downloading,
-            LanguageServerInstallationStatus::CheckingForUpdate => Self::CheckingForUpdate,
-            LanguageServerInstallationStatus::Failed(message) => Self::Failed(message),
-        }
-    }
-}
-
-impl From<DownloadedFileType> for latest::DownloadedFileType {
-    fn from(value: DownloadedFileType) -> Self {
-        match value {
-            DownloadedFileType::Gzip => Self::Gzip,
-            DownloadedFileType::GzipTar => Self::GzipTar,
-            DownloadedFileType::Zip => Self::Zip,
-            DownloadedFileType::Uncompressed => Self::Uncompressed,
-        }
-    }
-}
-
-impl From<Range> for latest::Range {
-    fn from(value: Range) -> Self {
-        Self {
-            start: value.start,
-            end: value.end,
-        }
-    }
-}
-
-impl From<CodeLabelSpan> for latest::CodeLabelSpan {
-    fn from(value: CodeLabelSpan) -> Self {
-        match value {
-            CodeLabelSpan::CodeRange(range) => Self::CodeRange(range.into()),
-            CodeLabelSpan::Literal(literal) => Self::Literal(literal.into()),
-        }
-    }
-}
-
-impl From<CodeLabelSpanLiteral> for latest::CodeLabelSpanLiteral {
-    fn from(value: CodeLabelSpanLiteral) -> Self {
-        Self {
-            text: value.text,
-            highlight_name: value.highlight_name,
-        }
-    }
-}
-
-impl From<CodeLabel> for latest::CodeLabel {
-    fn from(value: CodeLabel) -> Self {
-        Self {
-            code: value.code,
-            spans: value.spans.into_iter().map(Into::into).collect(),
-            filter_range: value.filter_range.into(),
-        }
-    }
-}
-
-impl HostWorktree for WasmState {
-    async fn id(&mut self, delegate: Resource<Arc<dyn WorktreeDelegate>>) -> wasmtime::Result<u64> {
-        latest::HostWorktree::id(self, delegate).await
-    }
-
-    async fn root_path(
-        &mut self,
-        delegate: Resource<Arc<dyn WorktreeDelegate>>,
-    ) -> wasmtime::Result<String> {
-        latest::HostWorktree::root_path(self, delegate).await
-    }
-
-    async fn read_text_file(
-        &mut self,
-        delegate: Resource<Arc<dyn WorktreeDelegate>>,
-        path: String,
-    ) -> wasmtime::Result<Result<String, String>> {
-        latest::HostWorktree::read_text_file(self, delegate, path).await
-    }
-
-    async fn shell_env(
-        &mut self,
-        delegate: Resource<Arc<dyn WorktreeDelegate>>,
-    ) -> wasmtime::Result<EnvVars> {
-        latest::HostWorktree::shell_env(self, delegate).await
-    }
-
-    async fn which(
-        &mut self,
-        delegate: Resource<Arc<dyn WorktreeDelegate>>,
-        binary_name: String,
-    ) -> wasmtime::Result<Option<String>> {
-        latest::HostWorktree::which(self, delegate, binary_name).await
-    }
-
-    async fn drop(&mut self, _worktree: Resource<Worktree>) -> Result<()> {
-        // We only ever hand out borrows of worktrees.
-        Ok(())
-    }
-}
-
-impl ExtensionImports for WasmState {
-    async fn get_settings(
-        &mut self,
-        location: Option<self::SettingsLocation>,
-        category: String,
-        key: Option<String>,
-    ) -> wasmtime::Result<Result<String, String>> {
-        latest::ExtensionImports::get_settings(
-            self,
-            location.map(|location| location.into()),
-            category,
-            key,
-        )
-        .await
-    }
-
-    async fn set_language_server_installation_status(
-        &mut self,
-        server_name: String,
-        status: LanguageServerInstallationStatus,
-    ) -> wasmtime::Result<()> {
-        latest::ExtensionImports::set_language_server_installation_status(
-            self,
-            server_name,
-            status.into(),
-        )
-        .await
-    }
-
-    async fn download_file(
-        &mut self,
-        url: String,
-        path: String,
-        file_type: DownloadedFileType,
-    ) -> wasmtime::Result<Result<(), String>> {
-        latest::ExtensionImports::download_file(self, url, path, file_type.into()).await
-    }
-
-    async fn make_file_executable(&mut self, path: String) -> wasmtime::Result<Result<(), String>> {
-        latest::ExtensionImports::make_file_executable(self, path).await
-    }
-}
diff --git a/crates/extension_host/src/wasm_host/wit/since_v0_1_0.rs b/crates/extension_host/src/wasm_host/wit/since_v0_1_0.rs
deleted file mode 100644
index a7a20f6dc7..0000000000
--- a/crates/extension_host/src/wasm_host/wit/since_v0_1_0.rs
+++ /dev/null
@@ -1,575 +0,0 @@
-use crate::wasm_host::{WasmState, wit::ToWasmtimeResult};
-use ::http_client::{AsyncBody, HttpRequestExt};
-use ::settings::{Settings, WorktreeId};
-use anyhow::{Context as _, Result, bail};
-use async_compression::futures::bufread::GzipDecoder;
-use async_tar::Archive;
-use extension::{ExtensionLanguageServerProxy, KeyValueStoreDelegate, WorktreeDelegate};
-use futures::{AsyncReadExt, lock::Mutex};
-use futures::{FutureExt as _, io::BufReader};
-use gpui::BackgroundExecutor;
-use language::LanguageName;
-use language::{BinaryStatus, language_settings::AllLanguageSettings};
-use project::project_settings::ProjectSettings;
-use semver::Version;
-use std::{
-    path::{Path, PathBuf},
-    sync::{Arc, OnceLock},
-};
-use util::paths::PathStyle;
-use util::rel_path::RelPath;
-use util::{archive::extract_zip, fs::make_file_executable, maybe};
-use wasmtime::component::{Linker, Resource};
-
-use super::latest;
-
-pub const MIN_VERSION: Version = Version::new(0, 1, 0);
-
-wasmtime::component::bindgen!({
-    async: true,
-    trappable_imports: true,
-    path: "../extension_api/wit/since_v0.1.0",
-    with: {
-         "worktree": ExtensionWorktree,
-         "key-value-store": ExtensionKeyValueStore,
-         "zed:extension/http-client/http-response-stream": ExtensionHttpResponseStream,
-         "zed:extension/github": latest::zed::extension::github,
-         "zed:extension/nodejs": latest::zed::extension::nodejs,
-         "zed:extension/platform": latest::zed::extension::platform,
-         "zed:extension/slash-command": latest::zed::extension::slash_command,
-    },
-});
-
-pub use self::zed::extension::*;
-
-mod settings {
-    include!(concat!(env!("OUT_DIR"), "/since_v0.1.0/settings.rs"));
-}
-
-pub type ExtensionWorktree = Arc<dyn WorktreeDelegate>;
-pub type ExtensionKeyValueStore = Arc<dyn KeyValueStoreDelegate>;
-pub type ExtensionHttpResponseStream = Arc<Mutex<::http_client::Response<AsyncBody>>>;
-
-pub fn linker(executor: &BackgroundExecutor) -> &'static Linker<WasmState> {
-    static LINKER: OnceLock<Linker<WasmState>> = OnceLock::new();
-    LINKER.get_or_init(|| super::new_linker(executor, Extension::add_to_linker))
-}
-
-impl From<Command> for latest::Command {
-    fn from(value: Command) -> Self {
-        Self {
-            command: value.command,
-            args: value.args,
-            env: value.env,
-        }
-    }
-}
-
-impl From<SettingsLocation> for latest::SettingsLocation {
-    fn from(value: SettingsLocation) -> Self {
-        Self {
-            worktree_id: value.worktree_id,
-            path: value.path,
-        }
-    }
-}
-
-impl From<LanguageServerInstallationStatus> for latest::LanguageServerInstallationStatus {
-    fn from(value: LanguageServerInstallationStatus) -> Self {
-        match value {
-            LanguageServerInstallationStatus::None => Self::None,
-            LanguageServerInstallationStatus::Downloading => Self::Downloading,
-            LanguageServerInstallationStatus::CheckingForUpdate => Self::CheckingForUpdate,
-            LanguageServerInstallationStatus::Failed(message) => Self::Failed(message),
-        }
-    }
-}
-
-impl From<DownloadedFileType> for latest::DownloadedFileType {
-    fn from(value: DownloadedFileType) -> Self {
-        match value {
-            DownloadedFileType::Gzip => Self::Gzip,
-            DownloadedFileType::GzipTar => Self::GzipTar,
-            DownloadedFileType::Zip => Self::Zip,
-            DownloadedFileType::Uncompressed => Self::Uncompressed,
-        }
-    }
-}
-
-impl From<Range> for latest::Range {
-    fn from(value: Range) -> Self {
-        Self {
-            start: value.start,
-            end: value.end,
-        }
-    }
-}
-
-impl From<CodeLabelSpan> for latest::CodeLabelSpan {
-    fn from(value: CodeLabelSpan) -> Self {
-        match value {
-            CodeLabelSpan::CodeRange(range) => Self::CodeRange(range.into()),
-            CodeLabelSpan::Literal(literal) => Self::Literal(literal.into()),
-        }
-    }
-}
-
-impl From<CodeLabelSpanLiteral> for latest::CodeLabelSpanLiteral {
-    fn from(value: CodeLabelSpanLiteral) -> Self {
-        Self {
-            text: value.text,
-            highlight_name: value.highlight_name,
-        }
-    }
-}
-
-impl From<CodeLabel> for latest::CodeLabel {
-    fn from(value: CodeLabel) -> Self {
-        Self {
-            code: value.code,
-            spans: value.spans.into_iter().map(Into::into).collect(),
-            filter_range: value.filter_range.into(),
-        }
-    }
-}
-
-impl From<latest::Completion> for Completion {
-    fn from(value: latest::Completion) -> Self {
-        Self {
-            label: value.label,
-            detail: value.detail,
-            kind: value.kind.map(Into::into),
-            insert_text_format: value.insert_text_format.map(Into::into),
-        }
-    }
-}
-
-impl From<latest::lsp::CompletionKind> for lsp::CompletionKind {
-    fn from(value: latest::lsp::CompletionKind) -> Self {
-        match value {
-            latest::lsp::CompletionKind::Text => Self::Text,
-            latest::lsp::CompletionKind::Method => Self::Method,
-            latest::lsp::CompletionKind::Function => Self::Function,
-            latest::lsp::CompletionKind::Constructor => Self::Constructor,
-            latest::lsp::CompletionKind::Field => Self::Field,
-            latest::lsp::CompletionKind::Variable => Self::Variable,
-            latest::lsp::CompletionKind::Class => Self::Class,
-            latest::lsp::CompletionKind::Interface => Self::Interface,
-            latest::lsp::CompletionKind::Module => Self::Module,
-            latest::lsp::CompletionKind::Property => Self::Property,
-            latest::lsp::CompletionKind::Unit => Self::Unit,
-            latest::lsp::CompletionKind::Value => Self::Value,
-            latest::lsp::CompletionKind::Enum => Self::Enum,
-            latest::lsp::CompletionKind::Keyword => Self::Keyword,
-            latest::lsp::CompletionKind::Snippet => Self::Snippet,
-            latest::lsp::CompletionKind::Color => Self::Color,
-            latest::lsp::CompletionKind::File => Self::File,
-            latest::lsp::CompletionKind::Reference => Self::Reference,
-            latest::lsp::CompletionKind::Folder => Self::Folder,
-            latest::lsp::CompletionKind::EnumMember => Self::EnumMember,
-            latest::lsp::CompletionKind::Constant => Self::Constant,
-            latest::lsp::CompletionKind::Struct => Self::Struct,
-            latest::lsp::CompletionKind::Event => Self::Event,
-            latest::lsp::CompletionKind::Operator => Self::Operator,
-            latest::lsp::CompletionKind::TypeParameter => Self::TypeParameter,
-            latest::lsp::CompletionKind::Other(kind) => Self::Other(kind),
-        }
-    }
-}
-
-impl From<latest::lsp::InsertTextFormat> for lsp::InsertTextFormat {
-    fn from(value: latest::lsp::InsertTextFormat) -> Self {
-        match value {
-            latest::lsp::InsertTextFormat::PlainText => Self::PlainText,
-            latest::lsp::InsertTextFormat::Snippet => Self::Snippet,
-            latest::lsp::InsertTextFormat::Other(value) => Self::Other(value),
-        }
-    }
-}
-
-impl From<latest::lsp::Symbol> for lsp::Symbol {
-    fn from(value: latest::lsp::Symbol) -> Self {
-        Self {
-            name: value.name,
-            kind: value.kind.into(),
-        }
-    }
-}
-
-impl From<latest::lsp::SymbolKind> for lsp::SymbolKind {
-    fn from(value: latest::lsp::SymbolKind) -> Self {
-        match value {
-            latest::lsp::SymbolKind::File => Self::File,
-            latest::lsp::SymbolKind::Module => Self::Module,
-            latest::lsp::SymbolKind::Namespace => Self::Namespace,
-            latest::lsp::SymbolKind::Package => Self::Package,
-            latest::lsp::SymbolKind::Class => Self::Class,
-            latest::lsp::SymbolKind::Method => Self::Method,
-            latest::lsp::SymbolKind::Property => Self::Property,
-            latest::lsp::SymbolKind::Field => Self::Field,
-            latest::lsp::SymbolKind::Constructor => Self::Constructor,
-            latest::lsp::SymbolKind::Enum => Self::Enum,
-            latest::lsp::SymbolKind::Interface => Self::Interface,
-            latest::lsp::SymbolKind::Function => Self::Function,
-            latest::lsp::SymbolKind::Variable => Self::Variable,
-            latest::lsp::SymbolKind::Constant => Self::Constant,
-            latest::lsp::SymbolKind::String => Self::String,
-            latest::lsp::SymbolKind::Number => Self::Number,
-            latest::lsp::SymbolKind::Boolean => Self::Boolean,
-            latest::lsp::SymbolKind::Array => Self::Array,
-            latest::lsp::SymbolKind::Object => Self::Object,
-            latest::lsp::SymbolKind::Key => Self::Key,
-            latest::lsp::SymbolKind::Null => Self::Null,
-            latest::lsp::SymbolKind::EnumMember => Self::EnumMember,
-            latest::lsp::SymbolKind::Struct => Self::Struct,
-            latest::lsp::SymbolKind::Event => Self::Event,
-            latest::lsp::SymbolKind::Operator => Self::Operator,
-            latest::lsp::SymbolKind::TypeParameter => Self::TypeParameter,
-            latest::lsp::SymbolKind::Other(kind) => Self::Other(kind),
-        }
-    }
-}
-
-impl HostKeyValueStore for WasmState {
-    async fn insert(
-        &mut self,
-        kv_store: Resource<ExtensionKeyValueStore>,
-        key: String,
-        value: String,
-    ) -> wasmtime::Result<Result<(), String>> {
-        let kv_store = self.table.get(&kv_store)?;
-        kv_store.insert(key, value).await.to_wasmtime_result()
-    }
-
-    async fn drop(&mut self, _worktree: Resource<ExtensionKeyValueStore>) -> Result<()> {
-        // We only ever hand out borrows of key-value stores.
-        Ok(())
-    }
-}
-
-impl HostWorktree for WasmState {
-    async fn id(&mut self, delegate: Resource<Arc<dyn WorktreeDelegate>>) -> wasmtime::Result<u64> {
-        latest::HostWorktree::id(self, delegate).await
-    }
-
-    async fn root_path(
-        &mut self,
-        delegate: Resource<Arc<dyn WorktreeDelegate>>,
-    ) -> wasmtime::Result<String> {
-        latest::HostWorktree::root_path(self, delegate).await
-    }
-
-    async fn read_text_file(
-        &mut self,
-        delegate: Resource<Arc<dyn WorktreeDelegate>>,
-        path: String,
-    ) -> wasmtime::Result<Result<String, String>> {
-        latest::HostWorktree::read_text_file(self, delegate, path).await
-    }
-
-    async fn shell_env(
-        &mut self,
-        delegate: Resource<Arc<dyn WorktreeDelegate>>,
-    ) -> wasmtime::Result<EnvVars> {
-        latest::HostWorktree::shell_env(self, delegate).await
-    }
-
-    async fn which(
-        &mut self,
-        delegate: Resource<Arc<dyn WorktreeDelegate>>,
-        binary_name: String,
-    ) -> wasmtime::Result<Option<String>> {
-        latest::HostWorktree::which(self, delegate, binary_name).await
-    }
-
-    async fn drop(&mut self, _worktree: Resource<Worktree>) -> Result<()> {
-        // We only ever hand out borrows of worktrees.
-        Ok(())
-    }
-}
-
-impl common::Host for WasmState {}
-
-impl http_client::Host for WasmState {
-    async fn fetch(
-        &mut self,
-        request: http_client::HttpRequest,
-    ) -> wasmtime::Result<Result<http_client::HttpResponse, String>> {
-        maybe!(async {
-            let url = &request.url;
-            let request = convert_request(&request)?;
-            let mut response = self.host.http_client.send(request).await?;
-
-            if response.status().is_client_error() || response.status().is_server_error() {
-                bail!("failed to fetch '{url}': status code {}", response.status())
-            }
-            convert_response(&mut response).await
-        })
-        .await
-        .to_wasmtime_result()
-    }
-
-    async fn fetch_stream(
-        &mut self,
-        request: http_client::HttpRequest,
-    ) -> wasmtime::Result<Result<Resource<ExtensionHttpResponseStream>, String>> {
-        let request = convert_request(&request)?;
-        let response = self.host.http_client.send(request);
-        maybe!(async {
-            let response = response.await?;
-            let stream = Arc::new(Mutex::new(response));
-            let resource = self.table.push(stream)?;
-            Ok(resource)
-        })
-        .await
-        .to_wasmtime_result()
-    }
-}
-
-impl http_client::HostHttpResponseStream for WasmState {
-    async fn next_chunk(
-        &mut self,
-        resource: Resource<ExtensionHttpResponseStream>,
-    ) -> wasmtime::Result<Result<Option<Vec<u8>>, String>> {
-        let stream = self.table.get(&resource)?.clone();
-        maybe!(async move {
-            let mut response = stream.lock().await;
-            let mut buffer = vec![0; 8192]; // 8KB buffer
-            let bytes_read = response.body_mut().read(&mut buffer).await?;
-            if bytes_read == 0 {
-                Ok(None)
-            } else {
-                buffer.truncate(bytes_read);
-                Ok(Some(buffer))
-            }
-        })
-        .await
-        .to_wasmtime_result()
-    }
-
-    async fn drop(&mut self, _resource: Resource<ExtensionHttpResponseStream>) -> Result<()> {
-        Ok(())
-    }
-}
-
-impl From<http_client::HttpMethod> for ::http_client::Method {
-    fn from(value: http_client::HttpMethod) -> Self {
-        match value {
-            http_client::HttpMethod::Get => Self::GET,
-            http_client::HttpMethod::Post => Self::POST,
-            http_client::HttpMethod::Put => Self::PUT,
-            http_client::HttpMethod::Delete => Self::DELETE,
-            http_client::HttpMethod::Head => Self::HEAD,
-            http_client::HttpMethod::Options => Self::OPTIONS,
-            http_client::HttpMethod::Patch => Self::PATCH,
-        }
-    }
-}
-
-fn convert_request(
-    extension_request: &http_client::HttpRequest,
-) -> anyhow::Result<::http_client::Request<AsyncBody>> {
-    let mut request = ::http_client::Request::builder()
-        .method(::http_client::Method::from(extension_request.method))
-        .uri(&extension_request.url)
-        .follow_redirects(match extension_request.redirect_policy {
-            http_client::RedirectPolicy::NoFollow => ::http_client::RedirectPolicy::NoFollow,
-            http_client::RedirectPolicy::FollowLimit(limit) => {
-                ::http_client::RedirectPolicy::FollowLimit(limit)
-            }
-            http_client::RedirectPolicy::FollowAll => ::http_client::RedirectPolicy::FollowAll,
-        });
-    for (key, value) in &extension_request.headers {
-        request = request.header(key, value);
-    }
-    let body = extension_request
-        .body
-        .clone()
-        .map(AsyncBody::from)
-        .unwrap_or_default();
-    request.body(body).map_err(anyhow::Error::from)
-}
-
-async fn convert_response(
-    response: &mut ::http_client::Response<AsyncBody>,
-) -> anyhow::Result<http_client::HttpResponse> {
-    let mut extension_response = http_client::HttpResponse {
-        body: Vec::new(),
-        headers: Vec::new(),
-    };
-
-    for (key, value) in response.headers() {
-        extension_response
-            .headers
-            .push((key.to_string(), value.to_str().unwrap_or("").to_string()));
-    }
-
-    response
-        .body_mut()
-        .read_to_end(&mut extension_response.body)
-        .await?;
-
-    Ok(extension_response)
-}
-
-impl lsp::Host for WasmState {}
-
-impl ExtensionImports for WasmState {
-    async fn get_settings(
-        &mut self,
-        location: Option<self::SettingsLocation>,
-        category: String,
-        key: Option<String>,
-    ) -> wasmtime::Result<Result<String, String>> {
-        self.on_main_thread(|cx| {
-            async move {
-                let path = location.as_ref().and_then(|location| {
-                    RelPath::new(Path::new(&location.path), PathStyle::Posix).ok()
-                });
-                let location = path
-                    .as_ref()
-                    .zip(location.as_ref())
-                    .map(|(path, location)| ::settings::SettingsLocation {
-                        worktree_id: WorktreeId::from_proto(location.worktree_id),
-                        path,
-                    });
-
-                cx.update(|cx| match category.as_str() {
-                    "language" => {
-                        let key = key.map(|k| LanguageName::new(&k));
-                        let settings = AllLanguageSettings::get(location, cx).language(
-                            location,
-                            key.as_ref(),
-                            cx,
-                        );
-                        Ok(serde_json::to_string(&settings::LanguageSettings {
-                            tab_size: settings.tab_size,
-                        })?)
-                    }
-                    "lsp" => {
-                        let settings = key
-                            .and_then(|key| {
-                                ProjectSettings::get(location, cx)
-                                    .lsp
-                                    .get(&::lsp::LanguageServerName(key.into()))
-                            })
-                            .cloned()
-                            .unwrap_or_default();
-                        Ok(serde_json::to_string(&settings::LspSettings {
-                            binary: settings.binary.map(|binary| settings::BinarySettings {
-                                path: binary.path,
-                                arguments: binary.arguments,
-                            }),
-                            settings: settings.settings,
-                            initialization_options: settings.initialization_options,
-                        })?)
-                    }
-                    _ => {
-                        bail!("Unknown settings category: {}", category);
-                    }
-                })
-            }
-            .boxed_local()
-        })
-        .await?
-        .to_wasmtime_result()
-    }
-
-    async fn set_language_server_installation_status(
-        &mut self,
-        server_name: String,
-        status: LanguageServerInstallationStatus,
-    ) -> wasmtime::Result<()> {
-        let status = match status {
-            LanguageServerInstallationStatus::CheckingForUpdate => BinaryStatus::CheckingForUpdate,
-            LanguageServerInstallationStatus::Downloading => BinaryStatus::Downloading,
-            LanguageServerInstallationStatus::None => BinaryStatus::None,
-            LanguageServerInstallationStatus::Failed(error) => BinaryStatus::Failed { error },
-        };
-
-        self.host
-            .proxy
-            .update_language_server_status(::lsp::LanguageServerName(server_name.into()), status);
-
-        Ok(())
-    }
-
-    async fn download_file(
-        &mut self,
-        url: String,
-        path: String,
-        file_type: DownloadedFileType,
-    ) -> wasmtime::Result<Result<(), String>> {
-        maybe!(async {
-            let path = PathBuf::from(path);
-            let extension_work_dir = self.host.work_dir.join(self.manifest.id.as_ref());
-
-            self.host.fs.create_dir(&extension_work_dir).await?;
-
-            let destination_path = self
-                .host
-                .writeable_path_from_extension(&self.manifest.id, &path)?;
-
-            let mut response = self
-                .host
-                .http_client
-                .get(&url, Default::default(), true)
-                .await
-                .context("downloading release")?;
-
-            anyhow::ensure!(
-                response.status().is_success(),
-                "download failed with status {}",
-                response.status()
-            );
-            let body = BufReader::new(response.body_mut());
-
-            match file_type {
-                DownloadedFileType::Uncompressed => {
-                    futures::pin_mut!(body);
-                    self.host
-                        .fs
-                        .create_file_with(&destination_path, body)
-                        .await?;
-                }
-                DownloadedFileType::Gzip => {
-                    let body = GzipDecoder::new(body);
-                    futures::pin_mut!(body);
-                    self.host
-                        .fs
-                        .create_file_with(&destination_path, body)
-                        .await?;
-                }
-                DownloadedFileType::GzipTar => {
-                    let body = GzipDecoder::new(body);
-                    futures::pin_mut!(body);
-                    self.host
-                        .fs
-                        .extract_tar_file(&destination_path, Archive::new(body))
-                        .await?;
-                }
-                DownloadedFileType::Zip => {
-                    futures::pin_mut!(body);
-                    extract_zip(&destination_path, body)
-                        .await
-                        .with_context(|| format!("unzipping {path:?} archive"))?;
-                }
-            }
-
-            Ok(())
-        })
-        .await
-        .to_wasmtime_result()
-    }
-
-    async fn make_file_executable(&mut self, path: String) -> wasmtime::Result<Result<(), String>> {
-        let path = self
-            .host
-            .writeable_path_from_extension(&self.manifest.id, Path::new(&path))?;
-
-        make_file_executable(&path)
-            .await
-            .with_context(|| format!("setting permissions for path {path:?}"))
-            .to_wasmtime_result()
-    }
-}
diff --git a/crates/extension_host/src/wasm_host/wit/since_v0_2_0.rs b/crates/extension_host/src/wasm_host/wit/since_v0_2_0.rs
deleted file mode 100644
index 05e3f5a4e7..0000000000
--- a/crates/extension_host/src/wasm_host/wit/since_v0_2_0.rs
+++ /dev/null
@@ -1,238 +0,0 @@
-use crate::wasm_host::WasmState;
-use anyhow::Result;
-use extension::{KeyValueStoreDelegate, ProjectDelegate, WorktreeDelegate};
-use gpui::BackgroundExecutor;
-use semver::Version;
-use std::sync::{Arc, OnceLock};
-use wasmtime::component::{Linker, Resource};
-
-use super::latest;
-
-pub const MIN_VERSION: Version = Version::new(0, 2, 0);
-
-wasmtime::component::bindgen!({
-    async: true,
-    trappable_imports: true,
-    path: "../extension_api/wit/since_v0.2.0",
-    with: {
-         "worktree": ExtensionWorktree,
-         "project": ExtensionProject,
-         "key-value-store": ExtensionKeyValueStore,
-         "zed:extension/github": latest::zed::extension::github,
-         "zed:extension/http-client": latest::zed::extension::http_client,
-         "zed:extension/lsp": latest::zed::extension::lsp,
-         "zed:extension/nodejs": latest::zed::extension::nodejs,
-         "zed:extension/platform": latest::zed::extension::platform,
-         "zed:extension/slash-command": latest::zed::extension::slash_command,
-    },
-});
-
-pub use self::zed::extension::*;
-
-mod settings {
-    #![allow(dead_code)]
-    include!(concat!(env!("OUT_DIR"), "/since_v0.2.0/settings.rs"));
-}
-
-pub type ExtensionWorktree = Arc<dyn WorktreeDelegate>;
-pub type ExtensionProject = Arc<dyn ProjectDelegate>;
-pub type ExtensionKeyValueStore = Arc<dyn KeyValueStoreDelegate>;
-
-pub fn linker(executor: &BackgroundExecutor) -> &'static Linker<WasmState> {
-    static LINKER: OnceLock<Linker<WasmState>> = OnceLock::new();
-    LINKER.get_or_init(|| super::new_linker(executor, Extension::add_to_linker))
-}
-
-impl From<Command> for latest::Command {
-    fn from(value: Command) -> Self {
-        Self {
-            command: value.command,
-            args: value.args,
-            env: value.env,
-        }
-    }
-}
-
-impl From<SettingsLocation> for latest::SettingsLocation {
-    fn from(value: SettingsLocation) -> Self {
-        Self {
-            worktree_id: value.worktree_id,
-            path: value.path,
-        }
-    }
-}
-
-impl From<LanguageServerInstallationStatus> for latest::LanguageServerInstallationStatus {
-    fn from(value: LanguageServerInstallationStatus) -> Self {
-        match value {
-            LanguageServerInstallationStatus::None => Self::None,
-            LanguageServerInstallationStatus::Downloading => Self::Downloading,
-            LanguageServerInstallationStatus::CheckingForUpdate => Self::CheckingForUpdate,
-            LanguageServerInstallationStatus::Failed(message) => Self::Failed(message),
-        }
-    }
-}
-
-impl From<DownloadedFileType> for latest::DownloadedFileType {
-    fn from(value: DownloadedFileType) -> Self {
-        match value {
-            DownloadedFileType::Gzip => Self::Gzip,
-            DownloadedFileType::GzipTar => Self::GzipTar,
-            DownloadedFileType::Zip => Self::Zip,
-            DownloadedFileType::Uncompressed => Self::Uncompressed,
-        }
-    }
-}
-
-impl From<Range> for latest::Range {
-    fn from(value: Range) -> Self {
-        Self {
-            start: value.start,
-            end: value.end,
-        }
-    }
-}
-
-impl From<CodeLabelSpan> for latest::CodeLabelSpan {
-    fn from(value: CodeLabelSpan) -> Self {
-        match value {
-            CodeLabelSpan::CodeRange(range) => Self::CodeRange(range.into()),
-            CodeLabelSpan::Literal(literal) => Self::Literal(literal.into()),
-        }
-    }
-}
-
-impl From<CodeLabelSpanLiteral> for latest::CodeLabelSpanLiteral {
-    fn from(value: CodeLabelSpanLiteral) -> Self {
-        Self {
-            text: value.text,
-            highlight_name: value.highlight_name,
-        }
-    }
-}
-
-impl From<CodeLabel> for latest::CodeLabel {
-    fn from(value: CodeLabel) -> Self {
-        Self {
-            code: value.code,
-            spans: value.spans.into_iter().map(Into::into).collect(),
-            filter_range: value.filter_range.into(),
-        }
-    }
-}
-
-impl HostKeyValueStore for WasmState {
-    async fn insert(
-        &mut self,
-        kv_store: Resource<ExtensionKeyValueStore>,
-        key: String,
-        value: String,
-    ) -> wasmtime::Result<Result<(), String>> {
-        latest::HostKeyValueStore::insert(self, kv_store, key, value).await
-    }
-
-    async fn drop(&mut self, _worktree: Resource<ExtensionKeyValueStore>) -> Result<()> {
-        // We only ever hand out borrows of key-value stores.
-        Ok(())
-    }
-}
-
-impl HostProject for WasmState {
-    async fn worktree_ids(
-        &mut self,
-        project: Resource<ExtensionProject>,
-    ) -> wasmtime::Result<Vec<u64>> {
-        latest::HostProject::worktree_ids(self, project).await
-    }
-
-    async fn drop(&mut self, _project: Resource<Project>) -> Result<()> {
-        // We only ever hand out borrows of projects.
-        Ok(())
-    }
-}
-
-impl HostWorktree for WasmState {
-    async fn id(&mut self, delegate: Resource<Arc<dyn WorktreeDelegate>>) -> wasmtime::Result<u64> {
-        latest::HostWorktree::id(self, delegate).await
-    }
-
-    async fn root_path(
-        &mut self,
-        delegate: Resource<Arc<dyn WorktreeDelegate>>,
-    ) -> wasmtime::Result<String> {
-        latest::HostWorktree::root_path(self, delegate).await
-    }
-
-    async fn read_text_file(
-        &mut self,
-        delegate: Resource<Arc<dyn WorktreeDelegate>>,
-        path: String,
-    ) -> wasmtime::Result<Result<String, String>> {
-        latest::HostWorktree::read_text_file(self, delegate, path).await
-    }
-
-    async fn shell_env(
-        &mut self,
-        delegate: Resource<Arc<dyn WorktreeDelegate>>,
-    ) -> wasmtime::Result<EnvVars> {
-        latest::HostWorktree::shell_env(self, delegate).await
-    }
-
-    async fn which(
-        &mut self,
-        delegate: Resource<Arc<dyn WorktreeDelegate>>,
-        binary_name: String,
-    ) -> wasmtime::Result<Option<String>> {
-        latest::HostWorktree::which(self, delegate, binary_name).await
-    }
-
-    async fn drop(&mut self, _worktree: Resource<Worktree>) -> Result<()> {
-        // We only ever hand out borrows of worktrees.
-        Ok(())
-    }
-}
-
-impl common::Host for WasmState {}
-
-impl ExtensionImports for WasmState {
-    async fn get_settings(
-        &mut self,
-        location: Option<self::SettingsLocation>,
-        category: String,
-        key: Option<String>,
-    ) -> wasmtime::Result<Result<String, String>> {
-        latest::ExtensionImports::get_settings(
-            self,
-            location.map(|location| location.into()),
-            category,
-            key,
-        )
-        .await
-    }
-
-    async fn set_language_server_installation_status(
-        &mut self,
-        server_name: String,
-        status: LanguageServerInstallationStatus,
-    ) -> wasmtime::Result<()> {
-        latest::ExtensionImports::set_language_server_installation_status(
-            self,
-            server_name,
-            status.into(),
-        )
-        .await
-    }
-
-    async fn download_file(
-        &mut self,
-        url: String,
-        path: String,
-        file_type: DownloadedFileType,
-    ) -> wasmtime::Result<Result<(), String>> {
-        latest::ExtensionImports::download_file(self, url, path, file_type.into()).await
-    }
-
-    async fn make_file_executable(&mut self, path: String) -> wasmtime::Result<Result<(), String>> {
-        latest::ExtensionImports::make_file_executable(self, path).await
-    }
-}
diff --git a/crates/extension_host/src/wasm_host/wit/since_v0_3_0.rs b/crates/extension_host/src/wasm_host/wit/since_v0_3_0.rs
deleted file mode 100644
index 08393934fe..0000000000
--- a/crates/extension_host/src/wasm_host/wit/since_v0_3_0.rs
+++ /dev/null
@@ -1,217 +0,0 @@
-use crate::wasm_host::WasmState;
-use anyhow::Result;
-use extension::{KeyValueStoreDelegate, ProjectDelegate, WorktreeDelegate};
-use gpui::BackgroundExecutor;
-use semver::Version;
-use std::sync::{Arc, OnceLock};
-use wasmtime::component::{Linker, Resource};
-
-use super::latest;
-
-pub const MIN_VERSION: Version = Version::new(0, 3, 0);
-
-wasmtime::component::bindgen!({
-    async: true,
-    trappable_imports: true,
-    path: "../extension_api/wit/since_v0.3.0",
-    with: {
-         "worktree": ExtensionWorktree,
-         "project": ExtensionProject,
-         "key-value-store": ExtensionKeyValueStore,
-         "zed:extension/common": latest::zed::extension::common,
-         "zed:extension/github": latest::zed::extension::github,
-         "zed:extension/http-client": latest::zed::extension::http_client,
-         "zed:extension/lsp": latest::zed::extension::lsp,
-         "zed:extension/nodejs": latest::zed::extension::nodejs,
-         "zed:extension/platform": latest::zed::extension::platform,
-         "zed:extension/process": latest::zed::extension::process,
-         "zed:extension/slash-command": latest::zed::extension::slash_command,
-    },
-});
-
-mod settings {
-    #![allow(dead_code)]
-    include!(concat!(env!("OUT_DIR"), "/since_v0.3.0/settings.rs"));
-}
-
-pub type ExtensionWorktree = Arc<dyn WorktreeDelegate>;
-pub type ExtensionProject = Arc<dyn ProjectDelegate>;
-pub type ExtensionKeyValueStore = Arc<dyn KeyValueStoreDelegate>;
-
-pub fn linker(executor: &BackgroundExecutor) -> &'static Linker<WasmState> {
-    static LINKER: OnceLock<Linker<WasmState>> = OnceLock::new();
-    LINKER.get_or_init(|| super::new_linker(executor, Extension::add_to_linker))
-}
-
-impl From<CodeLabel> for latest::CodeLabel {
-    fn from(value: CodeLabel) -> Self {
-        Self {
-            code: value.code,
-            spans: value.spans.into_iter().map(Into::into).collect(),
-            filter_range: value.filter_range,
-        }
-    }
-}
-
-impl From<CodeLabelSpan> for latest::CodeLabelSpan {
-    fn from(value: CodeLabelSpan) -> Self {
-        match value {
-            CodeLabelSpan::CodeRange(range) => Self::CodeRange(range),
-            CodeLabelSpan::Literal(literal) => Self::Literal(literal.into()),
-        }
-    }
-}
-
-impl From<CodeLabelSpanLiteral> for latest::CodeLabelSpanLiteral {
-    fn from(value: CodeLabelSpanLiteral) -> Self {
-        Self {
-            text: value.text,
-            highlight_name: value.highlight_name,
-        }
-    }
-}
-
-impl From<SettingsLocation> for latest::SettingsLocation {
-    fn from(value: SettingsLocation) -> Self {
-        Self {
-            worktree_id: value.worktree_id,
-            path: value.path,
-        }
-    }
-}
-
-impl From<LanguageServerInstallationStatus> for latest::LanguageServerInstallationStatus {
-    fn from(value: LanguageServerInstallationStatus) -> Self {
-        match value {
-            LanguageServerInstallationStatus::None => Self::None,
-            LanguageServerInstallationStatus::Downloading => Self::Downloading,
-            LanguageServerInstallationStatus::CheckingForUpdate => Self::CheckingForUpdate,
-            LanguageServerInstallationStatus::Failed(message) => Self::Failed(message),
-        }
-    }
-}
-
-impl From<DownloadedFileType> for latest::DownloadedFileType {
-    fn from(value: DownloadedFileType) -> Self {
-        match value {
-            DownloadedFileType::Gzip => Self::Gzip,
-            DownloadedFileType::GzipTar => Self::GzipTar,
-            DownloadedFileType::Zip => Self::Zip,
-            DownloadedFileType::Uncompressed => Self::Uncompressed,
-        }
-    }
-}
-
-impl HostKeyValueStore for WasmState {
-    async fn insert(
-        &mut self,
-        kv_store: Resource<ExtensionKeyValueStore>,
-        key: String,
-        value: String,
-    ) -> wasmtime::Result<Result<(), String>> {
-        latest::HostKeyValueStore::insert(self, kv_store, key, value).await
-    }
-
-    async fn drop(&mut self, _worktree: Resource<ExtensionKeyValueStore>) -> Result<()> {
-        // We only ever hand out borrows of key-value stores.
-        Ok(())
-    }
-}
-
-impl HostProject for WasmState {
-    async fn worktree_ids(
-        &mut self,
-        project: Resource<ExtensionProject>,
-    ) -> wasmtime::Result<Vec<u64>> {
-        latest::HostProject::worktree_ids(self, project).await
-    }
-
-    async fn drop(&mut self, _project: Resource<Project>) -> Result<()> {
-        // We only ever hand out borrows of projects.
-        Ok(())
-    }
-}
-
-impl HostWorktree for WasmState {
-    async fn id(&mut self, delegate: Resource<Arc<dyn WorktreeDelegate>>) -> wasmtime::Result<u64> {
-        latest::HostWorktree::id(self, delegate).await
-    }
-
-    async fn root_path(
-        &mut self,
-        delegate: Resource<Arc<dyn WorktreeDelegate>>,
-    ) -> wasmtime::Result<String> {
-        latest::HostWorktree::root_path(self, delegate).await
-    }
-
-    async fn read_text_file(
-        &mut self,
-        delegate: Resource<Arc<dyn WorktreeDelegate>>,
-        path: String,
-    ) -> wasmtime::Result<Result<String, String>> {
-        latest::HostWorktree::read_text_file(self, delegate, path).await
-    }
-
-    async fn shell_env(
-        &mut self,
-        delegate: Resource<Arc<dyn WorktreeDelegate>>,
-    ) -> wasmtime::Result<EnvVars> {
-        latest::HostWorktree::shell_env(self, delegate).await
-    }
-
-    async fn which(
-        &mut self,
-        delegate: Resource<Arc<dyn WorktreeDelegate>>,
-        binary_name: String,
-    ) -> wasmtime::Result<Option<String>> {
-        latest::HostWorktree::which(self, delegate, binary_name).await
-    }
-
-    async fn drop(&mut self, _worktree: Resource<Worktree>) -> Result<()> {
-        // We only ever hand out borrows of worktrees.
-        Ok(())
-    }
-}
-
-impl ExtensionImports for WasmState {
-    async fn get_settings(
-        &mut self,
-        location: Option<self::SettingsLocation>,
-        category: String,
-        key: Option<String>,
-    ) -> wasmtime::Result<Result<String, String>> {
-        latest::ExtensionImports::get_settings(
-            self,
-            location.map(|location| location.into()),
-            category,
-            key,
-        )
-        .await
-    }
-
-    async fn set_language_server_installation_status(
-        &mut self,
-        server_name: String,
-        status: LanguageServerInstallationStatus,
-    ) -> wasmtime::Result<()> {
-        latest::ExtensionImports::set_language_server_installation_status(
-            self,
-            server_name,
-            status.into(),
-        )
-        .await
-    }
-
-    async fn download_file(
-        &mut self,
-        url: String,
-        path: String,
-        file_type: DownloadedFileType,
-    ) -> wasmtime::Result<Result<(), String>> {
-        latest::ExtensionImports::download_file(self, url, path, file_type.into()).await
-    }
-
-    async fn make_file_executable(&mut self, path: String) -> wasmtime::Result<Result<(), String>> {
-        latest::ExtensionImports::make_file_executable(self, path).await
-    }
-}
diff --git a/crates/extension_host/src/wasm_host/wit/since_v0_4_0.rs b/crates/extension_host/src/wasm_host/wit/since_v0_4_0.rs
deleted file mode 100644
index 1b2a95023b..0000000000
--- a/crates/extension_host/src/wasm_host/wit/since_v0_4_0.rs
+++ /dev/null
@@ -1,217 +0,0 @@
-use crate::wasm_host::WasmState;
-use anyhow::Result;
-use extension::{KeyValueStoreDelegate, ProjectDelegate, WorktreeDelegate};
-use gpui::BackgroundExecutor;
-use semver::Version;
-use std::sync::{Arc, OnceLock};
-use wasmtime::component::{Linker, Resource};
-
-use super::latest;
-
-pub const MIN_VERSION: Version = Version::new(0, 4, 0);
-
-wasmtime::component::bindgen!({
-    async: true,
-    trappable_imports: true,
-    path: "../extension_api/wit/since_v0.4.0",
-    with: {
-        "worktree": ExtensionWorktree,
-        "project": ExtensionProject,
-        "key-value-store": ExtensionKeyValueStore,
-        "zed:extension/common": latest::zed::extension::common,
-        "zed:extension/github": latest::zed::extension::github,
-        "zed:extension/http-client": latest::zed::extension::http_client,
-        "zed:extension/lsp": latest::zed::extension::lsp,
-        "zed:extension/nodejs": latest::zed::extension::nodejs,
-        "zed:extension/platform": latest::zed::extension::platform,
-        "zed:extension/process": latest::zed::extension::process,
-        "zed:extension/slash-command": latest::zed::extension::slash_command,
-    },
-});
-
-mod settings {
-    #![allow(dead_code)]
-    include!(concat!(env!("OUT_DIR"), "/since_v0.4.0/settings.rs"));
-}
-
-pub type ExtensionWorktree = Arc<dyn WorktreeDelegate>;
-pub type ExtensionProject = Arc<dyn ProjectDelegate>;
-pub type ExtensionKeyValueStore = Arc<dyn KeyValueStoreDelegate>;
-
-pub fn linker(executor: &BackgroundExecutor) -> &'static Linker<WasmState> {
-    static LINKER: OnceLock<Linker<WasmState>> = OnceLock::new();
-    LINKER.get_or_init(|| super::new_linker(executor, Extension::add_to_linker))
-}
-
-impl From<CodeLabel> for latest::CodeLabel {
-    fn from(value: CodeLabel) -> Self {
-        Self {
-            code: value.code,
-            spans: value.spans.into_iter().map(Into::into).collect(),
-            filter_range: value.filter_range,
-        }
-    }
-}
-
-impl From<CodeLabelSpan> for latest::CodeLabelSpan {
-    fn from(value: CodeLabelSpan) -> Self {
-        match value {
-            CodeLabelSpan::CodeRange(range) => Self::CodeRange(range),
-            CodeLabelSpan::Literal(literal) => Self::Literal(literal.into()),
-        }
-    }
-}
-
-impl From<CodeLabelSpanLiteral> for latest::CodeLabelSpanLiteral {
-    fn from(value: CodeLabelSpanLiteral) -> Self {
-        Self {
-            text: value.text,
-            highlight_name: value.highlight_name,
-        }
-    }
-}
-
-impl From<SettingsLocation> for latest::SettingsLocation {
-    fn from(value: SettingsLocation) -> Self {
-        Self {
-            worktree_id: value.worktree_id,
-            path: value.path,
-        }
-    }
-}
-
-impl From<LanguageServerInstallationStatus> for latest::LanguageServerInstallationStatus {
-    fn from(value: LanguageServerInstallationStatus) -> Self {
-        match value {
-            LanguageServerInstallationStatus::None => Self::None,
-            LanguageServerInstallationStatus::Downloading => Self::Downloading,
-            LanguageServerInstallationStatus::CheckingForUpdate => Self::CheckingForUpdate,
-            LanguageServerInstallationStatus::Failed(message) => Self::Failed(message),
-        }
-    }
-}
-
-impl From<DownloadedFileType> for latest::DownloadedFileType {
-    fn from(value: DownloadedFileType) -> Self {
-        match value {
-            DownloadedFileType::Gzip => Self::Gzip,
-            DownloadedFileType::GzipTar => Self::GzipTar,
-            DownloadedFileType::Zip => Self::Zip,
-            DownloadedFileType::Uncompressed => Self::Uncompressed,
-        }
-    }
-}
-
-impl HostKeyValueStore for WasmState {
-    async fn insert(
-        &mut self,
-        kv_store: Resource<ExtensionKeyValueStore>,
-        key: String,
-        value: String,
-    ) -> wasmtime::Result<Result<(), String>> {
-        latest::HostKeyValueStore::insert(self, kv_store, key, value).await
-    }
-
-    async fn drop(&mut self, _worktree: Resource<ExtensionKeyValueStore>) -> Result<()> {
-        // We only ever hand out borrows of key-value stores.
-        Ok(())
-    }
-}
-
-impl HostProject for WasmState {
-    async fn worktree_ids(
-        &mut self,
-        project: Resource<ExtensionProject>,
-    ) -> wasmtime::Result<Vec<u64>> {
-        latest::HostProject::worktree_ids(self, project).await
-    }
-
-    async fn drop(&mut self, _project: Resource<Project>) -> Result<()> {
-        // We only ever hand out borrows of projects.
-        Ok(())
-    }
-}
-
-impl HostWorktree for WasmState {
-    async fn id(&mut self, delegate: Resource<Arc<dyn WorktreeDelegate>>) -> wasmtime::Result<u64> {
-        latest::HostWorktree::id(self, delegate).await
-    }
-
-    async fn root_path(
-        &mut self,
-        delegate: Resource<Arc<dyn WorktreeDelegate>>,
-    ) -> wasmtime::Result<String> {
-        latest::HostWorktree::root_path(self, delegate).await
-    }
-
-    async fn read_text_file(
-        &mut self,
-        delegate: Resource<Arc<dyn WorktreeDelegate>>,
-        path: String,
-    ) -> wasmtime::Result<Result<String, String>> {
-        latest::HostWorktree::read_text_file(self, delegate, path).await
-    }
-
-    async fn shell_env(
-        &mut self,
-        delegate: Resource<Arc<dyn WorktreeDelegate>>,
-    ) -> wasmtime::Result<EnvVars> {
-        latest::HostWorktree::shell_env(self, delegate).await
-    }
-
-    async fn which(
-        &mut self,
-        delegate: Resource<Arc<dyn WorktreeDelegate>>,
-        binary_name: String,
-    ) -> wasmtime::Result<Option<String>> {
-        latest::HostWorktree::which(self, delegate, binary_name).await
-    }
-
-    async fn drop(&mut self, _worktree: Resource<Worktree>) -> Result<()> {
-        // We only ever hand out borrows of worktrees.
-        Ok(())
-    }
-}
-
-impl ExtensionImports for WasmState {
-    async fn get_settings(
-        &mut self,
-        location: Option<self::SettingsLocation>,
-        category: String,
-        key: Option<String>,
-    ) -> wasmtime::Result<Result<String, String>> {
-        latest::ExtensionImports::get_settings(
-            self,
-            location.map(|location| location.into()),
-            category,
-            key,
-        )
-        .await
-    }
-
-    async fn set_language_server_installation_status(
-        &mut self,
-        server_name: String,
-        status: LanguageServerInstallationStatus,
-    ) -> wasmtime::Result<()> {
-        latest::ExtensionImports::set_language_server_installation_status(
-            self,
-            server_name,
-            status.into(),
-        )
-        .await
-    }
-
-    async fn download_file(
-        &mut self,
-        url: String,
-        path: String,
-        file_type: DownloadedFileType,
-    ) -> wasmtime::Result<Result<(), String>> {
-        latest::ExtensionImports::download_file(self, url, path, file_type.into()).await
-    }
-
-    async fn make_file_executable(&mut self, path: String) -> wasmtime::Result<Result<(), String>> {
-        latest::ExtensionImports::make_file_executable(self, path).await
-    }
-}
diff --git a/crates/extension_host/src/wasm_host/wit/since_v0_5_0.rs b/crates/extension_host/src/wasm_host/wit/since_v0_5_0.rs
deleted file mode 100644
index 23701c9d03..0000000000
--- a/crates/extension_host/src/wasm_host/wit/since_v0_5_0.rs
+++ /dev/null
@@ -1,218 +0,0 @@
-use crate::wasm_host::WasmState;
-use anyhow::Result;
-use extension::{KeyValueStoreDelegate, ProjectDelegate, WorktreeDelegate};
-use gpui::BackgroundExecutor;
-use semver::Version;
-use std::sync::{Arc, OnceLock};
-use wasmtime::component::{Linker, Resource};
-
-use super::latest;
-
-pub const MIN_VERSION: Version = Version::new(0, 5, 0);
-
-wasmtime::component::bindgen!({
-    async: true,
-    trappable_imports: true,
-    path: "../extension_api/wit/since_v0.5.0",
-    with: {
-        "worktree": ExtensionWorktree,
-        "project": ExtensionProject,
-        "key-value-store": ExtensionKeyValueStore,
-        "zed:extension/common": latest::zed::extension::common,
-        "zed:extension/github": latest::zed::extension::github,
-        "zed:extension/http-client": latest::zed::extension::http_client,
-        "zed:extension/lsp": latest::zed::extension::lsp,
-        "zed:extension/nodejs": latest::zed::extension::nodejs,
-        "zed:extension/platform": latest::zed::extension::platform,
-        "zed:extension/process": latest::zed::extension::process,
-        "zed:extension/slash-command": latest::zed::extension::slash_command,
-        "zed:extension/context-server": latest::zed::extension::context_server,
-    },
-});
-
-mod settings {
-    #![allow(dead_code)]
-    include!(concat!(env!("OUT_DIR"), "/since_v0.5.0/settings.rs"));
-}
-
-pub type ExtensionWorktree = Arc<dyn WorktreeDelegate>;
-pub type ExtensionProject = Arc<dyn ProjectDelegate>;
-pub type ExtensionKeyValueStore = Arc<dyn KeyValueStoreDelegate>;
-
-pub fn linker(executor: &BackgroundExecutor) -> &'static Linker<WasmState> {
-    static LINKER: OnceLock<Linker<WasmState>> = OnceLock::new();
-    LINKER.get_or_init(|| super::new_linker(executor, Extension::add_to_linker))
-}
-
-impl From<CodeLabel> for latest::CodeLabel {
-    fn from(value: CodeLabel) -> Self {
-        Self {
-            code: value.code,
-            spans: value.spans.into_iter().map(Into::into).collect(),
-            filter_range: value.filter_range,
-        }
-    }
-}
-
-impl From<CodeLabelSpan> for latest::CodeLabelSpan {
-    fn from(value: CodeLabelSpan) -> Self {
-        match value {
-            CodeLabelSpan::CodeRange(range) => Self::CodeRange(range),
-            CodeLabelSpan::Literal(literal) => Self::Literal(literal.into()),
-        }
-    }
-}
-
-impl From<CodeLabelSpanLiteral> for latest::CodeLabelSpanLiteral {
-    fn from(value: CodeLabelSpanLiteral) -> Self {
-        Self {
-            text: value.text,
-            highlight_name: value.highlight_name,
-        }
-    }
-}
-
-impl From<SettingsLocation> for latest::SettingsLocation {
-    fn from(value: SettingsLocation) -> Self {
-        Self {
-            worktree_id: value.worktree_id,
-            path: value.path,
-        }
-    }
-}
-
-impl From<LanguageServerInstallationStatus> for latest::LanguageServerInstallationStatus {
-    fn from(value: LanguageServerInstallationStatus) -> Self {
-        match value {
-            LanguageServerInstallationStatus::None => Self::None,
-            LanguageServerInstallationStatus::Downloading => Self::Downloading,
-            LanguageServerInstallationStatus::CheckingForUpdate => Self::CheckingForUpdate,
-            LanguageServerInstallationStatus::Failed(message) => Self::Failed(message),
-        }
-    }
-}
-
-impl From<DownloadedFileType> for latest::DownloadedFileType {
-    fn from(value: DownloadedFileType) -> Self {
-        match value {
-            DownloadedFileType::Gzip => Self::Gzip,
-            DownloadedFileType::GzipTar => Self::GzipTar,
-            DownloadedFileType::Zip => Self::Zip,
-            DownloadedFileType::Uncompressed => Self::Uncompressed,
-        }
-    }
-}
-
-impl HostKeyValueStore for WasmState {
-    async fn insert(
-        &mut self,
-        kv_store: Resource<ExtensionKeyValueStore>,
-        key: String,
-        value: String,
-    ) -> wasmtime::Result<Result<(), String>> {
-        latest::HostKeyValueStore::insert(self, kv_store, key, value).await
-    }
-
-    async fn drop(&mut self, _worktree: Resource<ExtensionKeyValueStore>) -> Result<()> {
-        // We only ever hand out borrows of key-value stores.
-        Ok(())
-    }
-}
-
-impl HostProject for WasmState {
-    async fn worktree_ids(
-        &mut self,
-        project: Resource<ExtensionProject>,
-    ) -> wasmtime::Result<Vec<u64>> {
-        latest::HostProject::worktree_ids(self, project).await
-    }
-
-    async fn drop(&mut self, _project: Resource<Project>) -> Result<()> {
-        // We only ever hand out borrows of projects.
-        Ok(())
-    }
-}
-
-impl HostWorktree for WasmState {
-    async fn id(&mut self, delegate: Resource<Arc<dyn WorktreeDelegate>>) -> wasmtime::Result<u64> {
-        latest::HostWorktree::id(self, delegate).await
-    }
-
-    async fn root_path(
-        &mut self,
-        delegate: Resource<Arc<dyn WorktreeDelegate>>,
-    ) -> wasmtime::Result<String> {
-        latest::HostWorktree::root_path(self, delegate).await
-    }
-
-    async fn read_text_file(
-        &mut self,
-        delegate: Resource<Arc<dyn WorktreeDelegate>>,
-        path: String,
-    ) -> wasmtime::Result<Result<String, String>> {
-        latest::HostWorktree::read_text_file(self, delegate, path).await
-    }
-
-    async fn shell_env(
-        &mut self,
-        delegate: Resource<Arc<dyn WorktreeDelegate>>,
-    ) -> wasmtime::Result<EnvVars> {
-        latest::HostWorktree::shell_env(self, delegate).await
-    }
-
-    async fn which(
-        &mut self,
-        delegate: Resource<Arc<dyn WorktreeDelegate>>,
-        binary_name: String,
-    ) -> wasmtime::Result<Option<String>> {
-        latest::HostWorktree::which(self, delegate, binary_name).await
-    }
-
-    async fn drop(&mut self, _worktree: Resource<Worktree>) -> Result<()> {
-        // We only ever hand out borrows of worktrees.
-        Ok(())
-    }
-}
-
-impl ExtensionImports for WasmState {
-    async fn get_settings(
-        &mut self,
-        location: Option<self::SettingsLocation>,
-        category: String,
-        key: Option<String>,
-    ) -> wasmtime::Result<Result<String, String>> {
-        latest::ExtensionImports::get_settings(
-            self,
-            location.map(|location| location.into()),
-            category,
-            key,
-        )
-        .await
-    }
-
-    async fn set_language_server_installation_status(
-        &mut self,
-        server_name: String,
-        status: LanguageServerInstallationStatus,
-    ) -> wasmtime::Result<()> {
-        latest::ExtensionImports::set_language_server_installation_status(
-            self,
-            server_name,
-            status.into(),
-        )
-        .await
-    }
-
-    async fn download_file(
-        &mut self,
-        url: String,
-        path: String,
-        file_type: DownloadedFileType,
-    ) -> wasmtime::Result<Result<(), String>> {
-        latest::ExtensionImports::download_file(self, url, path, file_type.into()).await
-    }
-
-    async fn make_file_executable(&mut self, path: String) -> wasmtime::Result<Result<(), String>> {
-        latest::ExtensionImports::make_file_executable(self, path).await
-    }
-}
diff --git a/crates/extension_host/src/wasm_host/wit/since_v0_6_0.rs b/crates/extension_host/src/wasm_host/wit/since_v0_6_0.rs
deleted file mode 100644
index 8595c278b9..0000000000
--- a/crates/extension_host/src/wasm_host/wit/since_v0_6_0.rs
+++ /dev/null
@@ -1,222 +0,0 @@
-use crate::wasm_host::WasmState;
-use anyhow::Result;
-use extension::{KeyValueStoreDelegate, ProjectDelegate, WorktreeDelegate};
-use gpui::BackgroundExecutor;
-use semver::Version;
-use std::sync::{Arc, OnceLock};
-use wasmtime::component::{Linker, Resource};
-
-use super::latest;
-
-pub const MIN_VERSION: Version = Version::new(0, 6, 0);
-pub const MAX_VERSION: Version = Version::new(0, 7, 0);
-
-wasmtime::component::bindgen!({
-    async: true,
-    trappable_imports: true,
-    path: "../extension_api/wit/since_v0.6.0",
-    with: {
-        "worktree": ExtensionWorktree,
-        "project": ExtensionProject,
-        "key-value-store": ExtensionKeyValueStore,
-        "zed:extension/common": latest::zed::extension::common,
-        "zed:extension/github": latest::zed::extension::github,
-        "zed:extension/http-client": latest::zed::extension::http_client,
-        "zed:extension/lsp": latest::zed::extension::lsp,
-        "zed:extension/nodejs": latest::zed::extension::nodejs,
-        "zed:extension/platform": latest::zed::extension::platform,
-        "zed:extension/process": latest::zed::extension::process,
-        "zed:extension/slash-command": latest::zed::extension::slash_command,
-        "zed:extension/context-server": latest::zed::extension::context_server,
-        "zed:extension/dap": latest::zed::extension::dap,
-    },
-});
-
-pub use self::zed::extension::*;
-
-mod settings {
-    #![allow(dead_code)]
-    include!(concat!(env!("OUT_DIR"), "/since_v0.6.0/settings.rs"));
-}
-
-pub type ExtensionWorktree = Arc<dyn WorktreeDelegate>;
-pub type ExtensionProject = Arc<dyn ProjectDelegate>;
-pub type ExtensionKeyValueStore = Arc<dyn KeyValueStoreDelegate>;
-
-pub fn linker(executor: &BackgroundExecutor) -> &'static Linker<WasmState> {
-    static LINKER: OnceLock<Linker<WasmState>> = OnceLock::new();
-    LINKER.get_or_init(|| super::new_linker(executor, Extension::add_to_linker))
-}
-
-impl From<CodeLabel> for latest::CodeLabel {
-    fn from(value: CodeLabel) -> Self {
-        Self {
-            code: value.code,
-            spans: value.spans.into_iter().map(Into::into).collect(),
-            filter_range: value.filter_range,
-        }
-    }
-}
-
-impl From<CodeLabelSpan> for latest::CodeLabelSpan {
-    fn from(value: CodeLabelSpan) -> Self {
-        match value {
-            CodeLabelSpan::CodeRange(range) => Self::CodeRange(range),
-            CodeLabelSpan::Literal(literal) => Self::Literal(literal.into()),
-        }
-    }
-}
-
-impl From<CodeLabelSpanLiteral> for latest::CodeLabelSpanLiteral {
-    fn from(value: CodeLabelSpanLiteral) -> Self {
-        Self {
-            text: value.text,
-            highlight_name: value.highlight_name,
-        }
-    }
-}
-
-impl From<SettingsLocation> for latest::SettingsLocation {
-    fn from(value: SettingsLocation) -> Self {
-        Self {
-            worktree_id: value.worktree_id,
-            path: value.path,
-        }
-    }
-}
-
-impl From<LanguageServerInstallationStatus> for latest::LanguageServerInstallationStatus {
-    fn from(value: LanguageServerInstallationStatus) -> Self {
-        match value {
-            LanguageServerInstallationStatus::None => Self::None,
-            LanguageServerInstallationStatus::Downloading => Self::Downloading,
-            LanguageServerInstallationStatus::CheckingForUpdate => Self::CheckingForUpdate,
-            LanguageServerInstallationStatus::Failed(message) => Self::Failed(message),
-        }
-    }
-}
-
-impl From<DownloadedFileType> for latest::DownloadedFileType {
-    fn from(value: DownloadedFileType) -> Self {
-        match value {
-            DownloadedFileType::Gzip => Self::Gzip,
-            DownloadedFileType::GzipTar => Self::GzipTar,
-            DownloadedFileType::Zip => Self::Zip,
-            DownloadedFileType::Uncompressed => Self::Uncompressed,
-        }
-    }
-}
-
-impl HostKeyValueStore for WasmState {
-    async fn insert(
-        &mut self,
-        kv_store: Resource<ExtensionKeyValueStore>,
-        key: String,
-        value: String,
-    ) -> wasmtime::Result<Result<(), String>> {
-        latest::HostKeyValueStore::insert(self, kv_store, key, value).await
-    }
-
-    async fn drop(&mut self, _worktree: Resource<ExtensionKeyValueStore>) -> Result<()> {
-        // We only ever hand out borrows of key-value stores.
-        Ok(())
-    }
-}
-
-impl HostProject for WasmState {
-    async fn worktree_ids(
-        &mut self,
-        project: Resource<ExtensionProject>,
-    ) -> wasmtime::Result<Vec<u64>> {
-        latest::HostProject::worktree_ids(self, project).await
-    }
-
-    async fn drop(&mut self, _project: Resource<Project>) -> Result<()> {
-        // We only ever hand out borrows of projects.
-        Ok(())
-    }
-}
-
-impl HostWorktree for WasmState {
-    async fn id(&mut self, delegate: Resource<Arc<dyn WorktreeDelegate>>) -> wasmtime::Result<u64> {
-        latest::HostWorktree::id(self, delegate).await
-    }
-
-    async fn root_path(
-        &mut self,
-        delegate: Resource<Arc<dyn WorktreeDelegate>>,
-    ) -> wasmtime::Result<String> {
-        latest::HostWorktree::root_path(self, delegate).await
-    }
-
-    async fn read_text_file(
-        &mut self,
-        delegate: Resource<Arc<dyn WorktreeDelegate>>,
-        path: String,
-    ) -> wasmtime::Result<Result<String, String>> {
-        latest::HostWorktree::read_text_file(self, delegate, path).await
-    }
-
-    async fn shell_env(
-        &mut self,
-        delegate: Resource<Arc<dyn WorktreeDelegate>>,
-    ) -> wasmtime::Result<EnvVars> {
-        latest::HostWorktree::shell_env(self, delegate).await
-    }
-
-    async fn which(
-        &mut self,
-        delegate: Resource<Arc<dyn WorktreeDelegate>>,
-        binary_name: String,
-    ) -> wasmtime::Result<Option<String>> {
-        latest::HostWorktree::which(self, delegate, binary_name).await
-    }
-
-    async fn drop(&mut self, _worktree: Resource<Worktree>) -> Result<()> {
-        // We only ever hand out borrows of worktrees.
-        Ok(())
-    }
-}
-
-impl ExtensionImports for WasmState {
-    async fn get_settings(
-        &mut self,
-        location: Option<self::SettingsLocation>,
-        category: String,
-        key: Option<String>,
-    ) -> wasmtime::Result<Result<String, String>> {
-        latest::ExtensionImports::get_settings(
-            self,
-            location.map(|location| location.into()),
-            category,
-            key,
-        )
-        .await
-    }
-
-    async fn set_language_server_installation_status(
-        &mut self,
-        server_name: String,
-        status: LanguageServerInstallationStatus,
-    ) -> wasmtime::Result<()> {
-        latest::ExtensionImports::set_language_server_installation_status(
-            self,
-            server_name,
-            status.into(),
-        )
-        .await
-    }
-
-    async fn download_file(
-        &mut self,
-        url: String,
-        path: String,
-        file_type: DownloadedFileType,
-    ) -> wasmtime::Result<Result<(), String>> {
-        latest::ExtensionImports::download_file(self, url, path, file_type.into()).await
-    }
-
-    async fn make_file_executable(&mut self, path: String) -> wasmtime::Result<Result<(), String>> {
-        latest::ExtensionImports::make_file_executable(self, path).await
-    }
-}
diff --git a/crates/extension_host/src/wasm_host/wit/since_v0_8_0.rs b/crates/extension_host/src/wasm_host/wit/since_v0_8_0.rs
deleted file mode 100644
index a2776f9f3b..0000000000
--- a/crates/extension_host/src/wasm_host/wit/since_v0_8_0.rs
+++ /dev/null
@@ -1,1109 +0,0 @@
-use crate::wasm_host::wit::since_v0_6_0::{
-    dap::{
-        AttachRequest, BuildTaskDefinition, BuildTaskDefinitionTemplatePayload, LaunchRequest,
-        StartDebuggingRequestArguments, TcpArguments, TcpArgumentsTemplate,
-    },
-    slash_command::SlashCommandOutputSection,
-};
-use crate::wasm_host::wit::{CompletionKind, CompletionLabelDetails, InsertTextFormat, SymbolKind};
-use crate::wasm_host::{WasmState, wit::ToWasmtimeResult};
-use ::http_client::{AsyncBody, HttpRequestExt};
-use ::settings::{Settings, WorktreeId};
-use anyhow::{Context as _, Result, bail};
-use async_compression::futures::bufread::GzipDecoder;
-use async_tar::Archive;
-use async_trait::async_trait;
-use extension::{
-    ExtensionLanguageServerProxy, KeyValueStoreDelegate, ProjectDelegate, WorktreeDelegate,
-};
-use futures::{AsyncReadExt, lock::Mutex};
-use futures::{FutureExt as _, io::BufReader};
-use gpui::{BackgroundExecutor, SharedString};
-use language::{BinaryStatus, LanguageName, language_settings::AllLanguageSettings};
-use project::project_settings::ProjectSettings;
-use semver::Version;
-use std::{
-    env,
-    net::Ipv4Addr,
-    path::{Path, PathBuf},
-    str::FromStr,
-    sync::{Arc, OnceLock},
-};
-use task::{SpawnInTerminal, ZedDebugConfig};
-use url::Url;
-use util::{
-    archive::extract_zip, fs::make_file_executable, maybe, paths::PathStyle, rel_path::RelPath,
-};
-use wasmtime::component::{Linker, Resource};
-
-pub const MIN_VERSION: Version = Version::new(0, 8, 0);
-pub const MAX_VERSION: Version = Version::new(0, 8, 0);
-
-wasmtime::component::bindgen!({
-    async: true,
-    trappable_imports: true,
-    path: "../extension_api/wit/since_v0.8.0",
-    with: {
-         "worktree": ExtensionWorktree,
-         "project": ExtensionProject,
-         "key-value-store": ExtensionKeyValueStore,
-         "zed:extension/http-client/http-response-stream": ExtensionHttpResponseStream
-    },
-});
-
-pub use self::zed::extension::*;
-
-mod settings {
-    #![allow(dead_code)]
-    include!(concat!(env!("OUT_DIR"), "/since_v0.8.0/settings.rs"));
-}
-
-pub type ExtensionWorktree = Arc<dyn WorktreeDelegate>;
-pub type ExtensionProject = Arc<dyn ProjectDelegate>;
-pub type ExtensionKeyValueStore = Arc<dyn KeyValueStoreDelegate>;
-pub type ExtensionHttpResponseStream = Arc<Mutex<::http_client::Response<AsyncBody>>>;
-
-pub fn linker(executor: &BackgroundExecutor) -> &'static Linker<WasmState> {
-    static LINKER: OnceLock<Linker<WasmState>> = OnceLock::new();
-    LINKER.get_or_init(|| super::new_linker(executor, Extension::add_to_linker))
-}
-
-impl From<Range> for std::ops::Range<usize> {
-    fn from(range: Range) -> Self {
-        let start = range.start as usize;
-        let end = range.end as usize;
-        start..end
-    }
-}
-
-impl From<Command> for extension::Command {
-    fn from(value: Command) -> Self {
-        Self {
-            command: value.command.into(),
-            args: value.args,
-            env: value.env,
-        }
-    }
-}
-
-impl From<StartDebuggingRequestArgumentsRequest>
-    for extension::StartDebuggingRequestArgumentsRequest
-{
-    fn from(value: StartDebuggingRequestArgumentsRequest) -> Self {
-        match value {
-            StartDebuggingRequestArgumentsRequest::Launch => Self::Launch,
-            StartDebuggingRequestArgumentsRequest::Attach => Self::Attach,
-        }
-    }
-}
-impl TryFrom<StartDebuggingRequestArguments> for extension::StartDebuggingRequestArguments {
-    type Error = anyhow::Error;
-
-    fn try_from(value: StartDebuggingRequestArguments) -> Result<Self, Self::Error> {
-        Ok(Self {
-            configuration: serde_json::from_str(&value.configuration)?,
-            request: value.request.into(),
-        })
-    }
-}
-impl From<TcpArguments> for extension::TcpArguments {
-    fn from(value: TcpArguments) -> Self {
-        Self {
-            host: value.host.into(),
-            port: value.port,
-            timeout: value.timeout,
-        }
-    }
-}
-
-impl From<extension::TcpArgumentsTemplate> for TcpArgumentsTemplate {
-    fn from(value: extension::TcpArgumentsTemplate) -> Self {
-        Self {
-            host: value.host.map(Ipv4Addr::to_bits),
-            port: value.port,
-            timeout: value.timeout,
-        }
-    }
-}
-
-impl From<TcpArgumentsTemplate> for extension::TcpArgumentsTemplate {
-    fn from(value: TcpArgumentsTemplate) -> Self {
-        Self {
-            host: value.host.map(Ipv4Addr::from_bits),
-            port: value.port,
-            timeout: value.timeout,
-        }
-    }
-}
-
-impl TryFrom<extension::DebugTaskDefinition> for DebugTaskDefinition {
-    type Error = anyhow::Error;
-    fn try_from(value: extension::DebugTaskDefinition) -> Result<Self, Self::Error> {
-        Ok(Self {
-            label: value.label.to_string(),
-            adapter: value.adapter.to_string(),
-            config: value.config.to_string(),
-            tcp_connection: value.tcp_connection.map(Into::into),
-        })
-    }
-}
-
-impl From<task::DebugRequest> for DebugRequest {
-    fn from(value: task::DebugRequest) -> Self {
-        match value {
-            task::DebugRequest::Launch(launch_request) => Self::Launch(launch_request.into()),
-            task::DebugRequest::Attach(attach_request) => Self::Attach(attach_request.into()),
-        }
-    }
-}
-
-impl From<DebugRequest> for task::DebugRequest {
-    fn from(value: DebugRequest) -> Self {
-        match value {
-            DebugRequest::Launch(launch_request) => Self::Launch(launch_request.into()),
-            DebugRequest::Attach(attach_request) => Self::Attach(attach_request.into()),
-        }
-    }
-}
-
-impl From<task::LaunchRequest> for LaunchRequest {
-    fn from(value: task::LaunchRequest) -> Self {
-        Self {
-            program: value.program,
-            cwd: value.cwd.map(|p| p.to_string_lossy().into_owned()),
-            args: value.args,
-            envs: value.env.into_iter().collect(),
-        }
-    }
-}
-
-impl From<task::AttachRequest> for AttachRequest {
-    fn from(value: task::AttachRequest) -> Self {
-        Self {
-            process_id: value.process_id,
-        }
-    }
-}
-
-impl From<LaunchRequest> for task::LaunchRequest {
-    fn from(value: LaunchRequest) -> Self {
-        Self {
-            program: value.program,
-            cwd: value.cwd.map(|p| p.into()),
-            args: value.args,
-            env: value.envs.into_iter().collect(),
-        }
-    }
-}
-impl From<AttachRequest> for task::AttachRequest {
-    fn from(value: AttachRequest) -> Self {
-        Self {
-            process_id: value.process_id,
-        }
-    }
-}
-
-impl From<ZedDebugConfig> for DebugConfig {
-    fn from(value: ZedDebugConfig) -> Self {
-        Self {
-            label: value.label.into(),
-            adapter: value.adapter.into(),
-            request: value.request.into(),
-            stop_on_entry: value.stop_on_entry,
-        }
-    }
-}
-impl TryFrom<DebugAdapterBinary> for extension::DebugAdapterBinary {
-    type Error = anyhow::Error;
-    fn try_from(value: DebugAdapterBinary) -> Result<Self, Self::Error> {
-        Ok(Self {
-            command: value.command,
-            arguments: value.arguments,
-            envs: value.envs.into_iter().collect(),
-            cwd: value.cwd.map(|s| s.into()),
-            connection: value.connection.map(Into::into),
-            request_args: value.request_args.try_into()?,
-        })
-    }
-}
-
-impl From<BuildTaskDefinition> for extension::BuildTaskDefinition {
-    fn from(value: BuildTaskDefinition) -> Self {
-        match value {
-            BuildTaskDefinition::ByName(name) => Self::ByName(name.into()),
-            BuildTaskDefinition::Template(build_task_template) => Self::Template {
-                task_template: build_task_template.template.into(),
-                locator_name: build_task_template.locator_name.map(SharedString::from),
-            },
-        }
-    }
-}
-
-impl From<extension::BuildTaskDefinition> for BuildTaskDefinition {
-    fn from(value: extension::BuildTaskDefinition) -> Self {
-        match value {
-            extension::BuildTaskDefinition::ByName(name) => Self::ByName(name.into()),
-            extension::BuildTaskDefinition::Template {
-                task_template,
-                locator_name,
-            } => Self::Template(BuildTaskDefinitionTemplatePayload {
-                template: task_template.into(),
-                locator_name: locator_name.map(String::from),
-            }),
-        }
-    }
-}
-impl From<BuildTaskTemplate> for extension::BuildTaskTemplate {
-    fn from(value: BuildTaskTemplate) -> Self {
-        Self {
-            label: value.label,
-            command: value.command,
-            args: value.args,
-            env: value.env.into_iter().collect(),
-            cwd: value.cwd,
-            ..Default::default()
-        }
-    }
-}
-impl From<extension::BuildTaskTemplate> for BuildTaskTemplate {
-    fn from(value: extension::BuildTaskTemplate) -> Self {
-        Self {
-            label: value.label,
-            command: value.command,
-            args: value.args,
-            env: value.env.into_iter().collect(),
-            cwd: value.cwd,
-        }
-    }
-}
-
-impl TryFrom<DebugScenario> for extension::DebugScenario {
-    type Error = anyhow::Error;
-
-    fn try_from(value: DebugScenario) -> std::result::Result<Self, Self::Error> {
-        Ok(Self {
-            adapter: value.adapter.into(),
-            label: value.label.into(),
-            build: value.build.map(Into::into),
-            config: serde_json::Value::from_str(&value.config)?,
-            tcp_connection: value.tcp_connection.map(Into::into),
-        })
-    }
-}
-
-impl From<extension::DebugScenario> for DebugScenario {
-    fn from(value: extension::DebugScenario) -> Self {
-        Self {
-            adapter: value.adapter.into(),
-            label: value.label.into(),
-            build: value.build.map(Into::into),
-            config: value.config.to_string(),
-            tcp_connection: value.tcp_connection.map(Into::into),
-        }
-    }
-}
-
-impl TryFrom<SpawnInTerminal> for ResolvedTask {
-    type Error = anyhow::Error;
-
-    fn try_from(value: SpawnInTerminal) -> Result<Self, Self::Error> {
-        Ok(Self {
-            label: value.label,
-            command: value.command.context("missing command")?,
-            args: value.args,
-            env: value.env.into_iter().collect(),
-            cwd: value.cwd.map(|s| {
-                let s = s.to_string_lossy();
-                if cfg!(target_os = "windows") {
-                    s.replace('\\', "/")
-                } else {
-                    s.into_owned()
-                }
-            }),
-        })
-    }
-}
-
-impl From<CodeLabel> for extension::CodeLabel {
-    fn from(value: CodeLabel) -> Self {
-        Self {
-            code: value.code,
-            spans: value.spans.into_iter().map(Into::into).collect(),
-            filter_range: value.filter_range.into(),
-        }
-    }
-}
-
-impl From<CodeLabelSpan> for extension::CodeLabelSpan {
-    fn from(value: CodeLabelSpan) -> Self {
-        match value {
-            CodeLabelSpan::CodeRange(range) => Self::CodeRange(range.into()),
-            CodeLabelSpan::Literal(literal) => Self::Literal(literal.into()),
-        }
-    }
-}
-
-impl From<CodeLabelSpanLiteral> for extension::CodeLabelSpanLiteral {
-    fn from(value: CodeLabelSpanLiteral) -> Self {
-        Self {
-            text: value.text,
-            highlight_name: value.highlight_name,
-        }
-    }
-}
-
-impl From<extension::Completion> for Completion {
-    fn from(value: extension::Completion) -> Self {
-        Self {
-            label: value.label,
-            label_details: value.label_details.map(Into::into),
-            detail: value.detail,
-            kind: value.kind.map(Into::into),
-            insert_text_format: value.insert_text_format.map(Into::into),
-        }
-    }
-}
-
-impl From<extension::CompletionLabelDetails> for CompletionLabelDetails {
-    fn from(value: extension::CompletionLabelDetails) -> Self {
-        Self {
-            detail: value.detail,
-            description: value.description,
-        }
-    }
-}
-
-impl From<extension::CompletionKind> for CompletionKind {
-    fn from(value: extension::CompletionKind) -> Self {
-        match value {
-            extension::CompletionKind::Text => Self::Text,
-            extension::CompletionKind::Method => Self::Method,
-            extension::CompletionKind::Function => Self::Function,
-            extension::CompletionKind::Constructor => Self::Constructor,
-            extension::CompletionKind::Field => Self::Field,
-            extension::CompletionKind::Variable => Self::Variable,
-            extension::CompletionKind::Class => Self::Class,
-            extension::CompletionKind::Interface => Self::Interface,
-            extension::CompletionKind::Module => Self::Module,
-            extension::CompletionKind::Property => Self::Property,
-            extension::CompletionKind::Unit => Self::Unit,
-            extension::CompletionKind::Value => Self::Value,
-            extension::CompletionKind::Enum => Self::Enum,
-            extension::CompletionKind::Keyword => Self::Keyword,
-            extension::CompletionKind::Snippet => Self::Snippet,
-            extension::CompletionKind::Color => Self::Color,
-            extension::CompletionKind::File => Self::File,
-            extension::CompletionKind::Reference => Self::Reference,
-            extension::CompletionKind::Folder => Self::Folder,
-            extension::CompletionKind::EnumMember => Self::EnumMember,
-            extension::CompletionKind::Constant => Self::Constant,
-            extension::CompletionKind::Struct => Self::Struct,
-            extension::CompletionKind::Event => Self::Event,
-            extension::CompletionKind::Operator => Self::Operator,
-            extension::CompletionKind::TypeParameter => Self::TypeParameter,
-            extension::CompletionKind::Other(value) => Self::Other(value),
-        }
-    }
-}
-
-impl From<extension::InsertTextFormat> for InsertTextFormat {
-    fn from(value: extension::InsertTextFormat) -> Self {
-        match value {
-            extension::InsertTextFormat::PlainText => Self::PlainText,
-            extension::InsertTextFormat::Snippet => Self::Snippet,
-            extension::InsertTextFormat::Other(value) => Self::Other(value),
-        }
-    }
-}
-
-impl From<extension::Symbol> for Symbol {
-    fn from(value: extension::Symbol) -> Self {
-        Self {
-            kind: value.kind.into(),
-            name: value.name,
-        }
-    }
-}
-
-impl From<extension::SymbolKind> for SymbolKind {
-    fn from(value: extension::SymbolKind) -> Self {
-        match value {
-            extension::SymbolKind::File => Self::File,
-            extension::SymbolKind::Module => Self::Module,
-            extension::SymbolKind::Namespace => Self::Namespace,
-            extension::SymbolKind::Package => Self::Package,
-            extension::SymbolKind::Class => Self::Class,
-            extension::SymbolKind::Method => Self::Method,
-            extension::SymbolKind::Property => Self::Property,
-            extension::SymbolKind::Field => Self::Field,
-            extension::SymbolKind::Constructor => Self::Constructor,
-            extension::SymbolKind::Enum => Self::Enum,
-            extension::SymbolKind::Interface => Self::Interface,
-            extension::SymbolKind::Function => Self::Function,
-            extension::SymbolKind::Variable => Self::Variable,
-            extension::SymbolKind::Constant => Self::Constant,
-            extension::SymbolKind::String => Self::String,
-            extension::SymbolKind::Number => Self::Number,
-            extension::SymbolKind::Boolean => Self::Boolean,
-            extension::SymbolKind::Array => Self::Array,
-            extension::SymbolKind::Object => Self::Object,
-            extension::SymbolKind::Key => Self::Key,
-            extension::SymbolKind::Null => Self::Null,
-            extension::SymbolKind::EnumMember => Self::EnumMember,
-            extension::SymbolKind::Struct => Self::Struct,
-            extension::SymbolKind::Event => Self::Event,
-            extension::SymbolKind::Operator => Self::Operator,
-            extension::SymbolKind::TypeParameter => Self::TypeParameter,
-            extension::SymbolKind::Other(value) => Self::Other(value),
-        }
-    }
-}
-
-impl From<extension::SlashCommand> for SlashCommand {
-    fn from(value: extension::SlashCommand) -> Self {
-        Self {
-            name: value.name,
-            description: value.description,
-            tooltip_text: value.tooltip_text,
-            requires_argument: value.requires_argument,
-        }
-    }
-}
-
-impl From<SlashCommandOutput> for extension::SlashCommandOutput {
-    fn from(value: SlashCommandOutput) -> Self {
-        Self {
-            text: value.text,
-            sections: value.sections.into_iter().map(Into::into).collect(),
-        }
-    }
-}
-
-impl From<SlashCommandOutputSection> for extension::SlashCommandOutputSection {
-    fn from(value: SlashCommandOutputSection) -> Self {
-        Self {
-            range: value.range.start as usize..value.range.end as usize,
-            label: value.label,
-        }
-    }
-}
-
-impl From<SlashCommandArgumentCompletion> for extension::SlashCommandArgumentCompletion {
-    fn from(value: SlashCommandArgumentCompletion) -> Self {
-        Self {
-            label: value.label,
-            new_text: value.new_text,
-            run_command: value.run_command,
-        }
-    }
-}
-
-impl TryFrom<ContextServerConfiguration> for extension::ContextServerConfiguration {
-    type Error = anyhow::Error;
-
-    fn try_from(value: ContextServerConfiguration) -> Result<Self, Self::Error> {
-        let settings_schema: serde_json::Value = serde_json::from_str(&value.settings_schema)
-            .context("Failed to parse settings_schema")?;
-
-        Ok(Self {
-            installation_instructions: value.installation_instructions,
-            default_settings: value.default_settings,
-            settings_schema,
-        })
-    }
-}
-
-impl HostKeyValueStore for WasmState {
-    async fn insert(
-        &mut self,
-        kv_store: Resource<ExtensionKeyValueStore>,
-        key: String,
-        value: String,
-    ) -> wasmtime::Result<Result<(), String>> {
-        let kv_store = self.table.get(&kv_store)?;
-        kv_store.insert(key, value).await.to_wasmtime_result()
-    }
-
-    async fn drop(&mut self, _worktree: Resource<ExtensionKeyValueStore>) -> Result<()> {
-        // We only ever hand out borrows of key-value stores.
-        Ok(())
-    }
-}
-
-impl HostProject for WasmState {
-    async fn worktree_ids(
-        &mut self,
-        project: Resource<ExtensionProject>,
-    ) -> wasmtime::Result<Vec<u64>> {
-        let project = self.table.get(&project)?;
-        Ok(project.worktree_ids())
-    }
-
-    async fn drop(&mut self, _project: Resource<Project>) -> Result<()> {
-        // We only ever hand out borrows of projects.
-        Ok(())
-    }
-}
-
-impl HostWorktree for WasmState {
-    async fn id(&mut self, delegate: Resource<Arc<dyn WorktreeDelegate>>) -> wasmtime::Result<u64> {
-        let delegate = self.table.get(&delegate)?;
-        Ok(delegate.id())
-    }
-
-    async fn root_path(
-        &mut self,
-        delegate: Resource<Arc<dyn WorktreeDelegate>>,
-    ) -> wasmtime::Result<String> {
-        let delegate = self.table.get(&delegate)?;
-        Ok(delegate.root_path())
-    }
-
-    async fn read_text_file(
-        &mut self,
-        delegate: Resource<Arc<dyn WorktreeDelegate>>,
-        path: String,
-    ) -> wasmtime::Result<Result<String, String>> {
-        let delegate = self.table.get(&delegate)?;
-        Ok(delegate
-            .read_text_file(&RelPath::new(Path::new(&path), PathStyle::Posix)?)
-            .await
-            .map_err(|error| error.to_string()))
-    }
-
-    async fn shell_env(
-        &mut self,
-        delegate: Resource<Arc<dyn WorktreeDelegate>>,
-    ) -> wasmtime::Result<EnvVars> {
-        let delegate = self.table.get(&delegate)?;
-        Ok(delegate.shell_env().await.into_iter().collect())
-    }
-
-    async fn which(
-        &mut self,
-        delegate: Resource<Arc<dyn WorktreeDelegate>>,
-        binary_name: String,
-    ) -> wasmtime::Result<Option<String>> {
-        let delegate = self.table.get(&delegate)?;
-        Ok(delegate.which(binary_name).await)
-    }
-
-    async fn drop(&mut self, _worktree: Resource<Worktree>) -> Result<()> {
-        // We only ever hand out borrows of worktrees.
-        Ok(())
-    }
-}
-
-impl common::Host for WasmState {}
-
-impl http_client::Host for WasmState {
-    async fn fetch(
-        &mut self,
-        request: http_client::HttpRequest,
-    ) -> wasmtime::Result<Result<http_client::HttpResponse, String>> {
-        maybe!(async {
-            let url = &request.url;
-            let request = convert_request(&request)?;
-            let mut response = self.host.http_client.send(request).await?;
-
-            if response.status().is_client_error() || response.status().is_server_error() {
-                bail!("failed to fetch '{url}': status code {}", response.status())
-            }
-            convert_response(&mut response).await
-        })
-        .await
-        .to_wasmtime_result()
-    }
-
-    async fn fetch_stream(
-        &mut self,
-        request: http_client::HttpRequest,
-    ) -> wasmtime::Result<Result<Resource<ExtensionHttpResponseStream>, String>> {
-        let request = convert_request(&request)?;
-        let response = self.host.http_client.send(request);
-        maybe!(async {
-            let response = response.await?;
-            let stream = Arc::new(Mutex::new(response));
-            let resource = self.table.push(stream)?;
-            Ok(resource)
-        })
-        .await
-        .to_wasmtime_result()
-    }
-}
-
-impl http_client::HostHttpResponseStream for WasmState {
-    async fn next_chunk(
-        &mut self,
-        resource: Resource<ExtensionHttpResponseStream>,
-    ) -> wasmtime::Result<Result<Option<Vec<u8>>, String>> {
-        let stream = self.table.get(&resource)?.clone();
-        maybe!(async move {
-            let mut response = stream.lock().await;
-            let mut buffer = vec![0; 8192]; // 8KB buffer
-            let bytes_read = response.body_mut().read(&mut buffer).await?;
-            if bytes_read == 0 {
-                Ok(None)
-            } else {
-                buffer.truncate(bytes_read);
-                Ok(Some(buffer))
-            }
-        })
-        .await
-        .to_wasmtime_result()
-    }
-
-    async fn drop(&mut self, _resource: Resource<ExtensionHttpResponseStream>) -> Result<()> {
-        Ok(())
-    }
-}
-
-impl From<http_client::HttpMethod> for ::http_client::Method {
-    fn from(value: http_client::HttpMethod) -> Self {
-        match value {
-            http_client::HttpMethod::Get => Self::GET,
-            http_client::HttpMethod::Post => Self::POST,
-            http_client::HttpMethod::Put => Self::PUT,
-            http_client::HttpMethod::Delete => Self::DELETE,
-            http_client::HttpMethod::Head => Self::HEAD,
-            http_client::HttpMethod::Options => Self::OPTIONS,
-            http_client::HttpMethod::Patch => Self::PATCH,
-        }
-    }
-}
-
-fn convert_request(
-    extension_request: &http_client::HttpRequest,
-) -> anyhow::Result<::http_client::Request<AsyncBody>> {
-    let mut request = ::http_client::Request::builder()
-        .method(::http_client::Method::from(extension_request.method))
-        .uri(&extension_request.url)
-        .follow_redirects(match extension_request.redirect_policy {
-            http_client::RedirectPolicy::NoFollow => ::http_client::RedirectPolicy::NoFollow,
-            http_client::RedirectPolicy::FollowLimit(limit) => {
-                ::http_client::RedirectPolicy::FollowLimit(limit)
-            }
-            http_client::RedirectPolicy::FollowAll => ::http_client::RedirectPolicy::FollowAll,
-        });
-    for (key, value) in &extension_request.headers {
-        request = request.header(key, value);
-    }
-    let body = extension_request
-        .body
-        .clone()
-        .map(AsyncBody::from)
-        .unwrap_or_default();
-    request.body(body).map_err(anyhow::Error::from)
-}
-
-async fn convert_response(
-    response: &mut ::http_client::Response<AsyncBody>,
-) -> anyhow::Result<http_client::HttpResponse> {
-    let mut extension_response = http_client::HttpResponse {
-        body: Vec::new(),
-        headers: Vec::new(),
-    };
-
-    for (key, value) in response.headers() {
-        extension_response
-            .headers
-            .push((key.to_string(), value.to_str().unwrap_or("").to_string()));
-    }
-
-    response
-        .body_mut()
-        .read_to_end(&mut extension_response.body)
-        .await?;
-
-    Ok(extension_response)
-}
-
-impl nodejs::Host for WasmState {
-    async fn node_binary_path(&mut self) -> wasmtime::Result<Result<String, String>> {
-        self.host
-            .node_runtime
-            .binary_path()
-            .await
-            .map(|path| path.to_string_lossy().into_owned())
-            .to_wasmtime_result()
-    }
-
-    async fn npm_package_latest_version(
-        &mut self,
-        package_name: String,
-    ) -> wasmtime::Result<Result<String, String>> {
-        self.host
-            .node_runtime
-            .npm_package_latest_version(&package_name)
-            .await
-            .to_wasmtime_result()
-    }
-
-    async fn npm_package_installed_version(
-        &mut self,
-        package_name: String,
-    ) -> wasmtime::Result<Result<Option<String>, String>> {
-        self.host
-            .node_runtime
-            .npm_package_installed_version(&self.work_dir(), &package_name)
-            .await
-            .to_wasmtime_result()
-    }
-
-    async fn npm_install_package(
-        &mut self,
-        package_name: String,
-        version: String,
-    ) -> wasmtime::Result<Result<(), String>> {
-        self.capability_granter
-            .grant_npm_install_package(&package_name)?;
-
-        self.host
-            .node_runtime
-            .npm_install_packages(&self.work_dir(), &[(&package_name, &version)])
-            .await
-            .to_wasmtime_result()
-    }
-}
-
-#[async_trait]
-impl lsp::Host for WasmState {}
-
-impl From<::http_client::github::GithubRelease> for github::GithubRelease {
-    fn from(value: ::http_client::github::GithubRelease) -> Self {
-        Self {
-            version: value.tag_name,
-            assets: value.assets.into_iter().map(Into::into).collect(),
-        }
-    }
-}
-
-impl From<::http_client::github::GithubReleaseAsset> for github::GithubReleaseAsset {
-    fn from(value: ::http_client::github::GithubReleaseAsset) -> Self {
-        Self {
-            name: value.name,
-            download_url: value.browser_download_url,
-        }
-    }
-}
-
-impl github::Host for WasmState {
-    async fn latest_github_release(
-        &mut self,
-        repo: String,
-        options: github::GithubReleaseOptions,
-    ) -> wasmtime::Result<Result<github::GithubRelease, String>> {
-        maybe!(async {
-            let release = ::http_client::github::latest_github_release(
-                &repo,
-                options.require_assets,
-                options.pre_release,
-                self.host.http_client.clone(),
-            )
-            .await?;
-            Ok(release.into())
-        })
-        .await
-        .to_wasmtime_result()
-    }
-
-    async fn github_release_by_tag_name(
-        &mut self,
-        repo: String,
-        tag: String,
-    ) -> wasmtime::Result<Result<github::GithubRelease, String>> {
-        maybe!(async {
-            let release = ::http_client::github::get_release_by_tag_name(
-                &repo,
-                &tag,
-                self.host.http_client.clone(),
-            )
-            .await?;
-            Ok(release.into())
-        })
-        .await
-        .to_wasmtime_result()
-    }
-}
-
-impl platform::Host for WasmState {
-    async fn current_platform(&mut self) -> Result<(platform::Os, platform::Architecture)> {
-        Ok((
-            match env::consts::OS {
-                "macos" => platform::Os::Mac,
-                "linux" => platform::Os::Linux,
-                "windows" => platform::Os::Windows,
-                _ => panic!("unsupported os"),
-            },
-            match env::consts::ARCH {
-                "aarch64" => platform::Architecture::Aarch64,
-                "x86" => platform::Architecture::X86,
-                "x86_64" => platform::Architecture::X8664,
-                _ => panic!("unsupported architecture"),
-            },
-        ))
-    }
-}
-
-impl From<std::process::Output> for process::Output {
-    fn from(output: std::process::Output) -> Self {
-        Self {
-            status: output.status.code(),
-            stdout: output.stdout,
-            stderr: output.stderr,
-        }
-    }
-}
-
-impl process::Host for WasmState {
-    async fn run_command(
-        &mut self,
-        command: process::Command,
-    ) -> wasmtime::Result<Result<process::Output, String>> {
-        maybe!(async {
-            self.capability_granter
-                .grant_exec(&command.command, &command.args)?;
-
-            let output = util::command::new_smol_command(command.command.as_str())
-                .args(&command.args)
-                .envs(command.env)
-                .output()
-                .await?;
-
-            Ok(output.into())
-        })
-        .await
-        .to_wasmtime_result()
-    }
-}
-
-#[async_trait]
-impl slash_command::Host for WasmState {}
-
-#[async_trait]
-impl context_server::Host for WasmState {}
-
-impl dap::Host for WasmState {
-    async fn resolve_tcp_template(
-        &mut self,
-        template: TcpArgumentsTemplate,
-    ) -> wasmtime::Result<Result<TcpArguments, String>> {
-        maybe!(async {
-            let (host, port, timeout) =
-                ::dap::configure_tcp_connection(task::TcpArgumentsTemplate {
-                    port: template.port,
-                    host: template.host.map(Ipv4Addr::from_bits),
-                    timeout: template.timeout,
-                })
-                .await?;
-            Ok(TcpArguments {
-                port,
-                host: host.to_bits(),
-                timeout,
-            })
-        })
-        .await
-        .to_wasmtime_result()
-    }
-}
-
-impl ExtensionImports for WasmState {
-    async fn get_settings(
-        &mut self,
-        location: Option<self::SettingsLocation>,
-        category: String,
-        key: Option<String>,
-    ) -> wasmtime::Result<Result<String, String>> {
-        self.on_main_thread(|cx| {
-            async move {
-                let path = location.as_ref().and_then(|location| {
-                    RelPath::new(Path::new(&location.path), PathStyle::Posix).ok()
-                });
-                let location = path
-                    .as_ref()
-                    .zip(location.as_ref())
-                    .map(|(path, location)| ::settings::SettingsLocation {
-                        worktree_id: WorktreeId::from_proto(location.worktree_id),
-                        path,
-                    });
-
-                cx.update(|cx| match category.as_str() {
-                    "language" => {
-                        let key = key.map(|k| LanguageName::new(&k));
-                        let settings = AllLanguageSettings::get(location, cx).language(
-                            location,
-                            key.as_ref(),
-                            cx,
-                        );
-                        Ok(serde_json::to_string(&settings::LanguageSettings {
-                            tab_size: settings.tab_size,
-                        })?)
-                    }
-                    "lsp" => {
-                        let settings = key
-                            .and_then(|key| {
-                                ProjectSettings::get(location, cx)
-                                    .lsp
-                                    .get(&::lsp::LanguageServerName::from_proto(key))
-                            })
-                            .cloned()
-                            .unwrap_or_default();
-                        Ok(serde_json::to_string(&settings::LspSettings {
-                            binary: settings.binary.map(|binary| settings::CommandSettings {
-                                path: binary.path,
-                                arguments: binary.arguments,
-                                env: binary.env.map(|env| env.into_iter().collect()),
-                            }),
-                            settings: settings.settings,
-                            initialization_options: settings.initialization_options,
-                        })?)
-                    }
-                    "context_servers" => {
-                        let settings = key
-                            .and_then(|key| {
-                                ProjectSettings::get(location, cx)
-                                    .context_servers
-                                    .get(key.as_str())
-                            })
-                            .cloned()
-                            .unwrap_or_else(|| {
-                                project::project_settings::ContextServerSettings::default_extension(
-                                )
-                            });
-
-                        match settings {
-                            project::project_settings::ContextServerSettings::Stdio {
-                                enabled: _,
-                                command,
-                            } => Ok(serde_json::to_string(&settings::ContextServerSettings {
-                                command: Some(settings::CommandSettings {
-                                    path: command.path.to_str().map(|path| path.to_string()),
-                                    arguments: Some(command.args),
-                                    env: command.env.map(|env| env.into_iter().collect()),
-                                }),
-                                settings: None,
-                            })?),
-                            project::project_settings::ContextServerSettings::Extension {
-                                enabled: _,
-                                settings,
-                            } => Ok(serde_json::to_string(&settings::ContextServerSettings {
-                                command: None,
-                                settings: Some(settings),
-                            })?),
-                            project::project_settings::ContextServerSettings::Http { .. } => {
-                                bail!("remote context server settings not supported in 0.6.0")
-                            }
-                        }
-                    }
-                    _ => {
-                        bail!("Unknown settings category: {}", category);
-                    }
-                })
-            }
-            .boxed_local()
-        })
-        .await?
-        .to_wasmtime_result()
-    }
-
-    async fn set_language_server_installation_status(
-        &mut self,
-        server_name: String,
-        status: LanguageServerInstallationStatus,
-    ) -> wasmtime::Result<()> {
-        let status = match status {
-            LanguageServerInstallationStatus::CheckingForUpdate => BinaryStatus::CheckingForUpdate,
-            LanguageServerInstallationStatus::Downloading => BinaryStatus::Downloading,
-            LanguageServerInstallationStatus::None => BinaryStatus::None,
-            LanguageServerInstallationStatus::Failed(error) => BinaryStatus::Failed { error },
-        };
-
-        self.host
-            .proxy
-            .update_language_server_status(::lsp::LanguageServerName(server_name.into()), status);
-
-        Ok(())
-    }
-
-    async fn download_file(
-        &mut self,
-        url: String,
-        path: String,
-        file_type: DownloadedFileType,
-    ) -> wasmtime::Result<Result<(), String>> {
-        maybe!(async {
-            let parsed_url = Url::parse(&url)?;
-            self.capability_granter.grant_download_file(&parsed_url)?;
-
-            let path = PathBuf::from(path);
-            let extension_work_dir = self.host.work_dir.join(self.manifest.id.as_ref());
-
-            self.host.fs.create_dir(&extension_work_dir).await?;
-
-            let destination_path = self
-                .host
-                .writeable_path_from_extension(&self.manifest.id, &path)?;
-
-            let mut response = self
-                .host
-                .http_client
-                .get(&url, Default::default(), true)
-                .await
-                .context("downloading release")?;
-
-            anyhow::ensure!(
-                response.status().is_success(),
-                "download failed with status {}",
-                response.status()
-            );
-            let body = BufReader::new(response.body_mut());
-
-            match file_type {
-                DownloadedFileType::Uncompressed => {
-                    futures::pin_mut!(body);
-                    self.host
-                        .fs
-                        .create_file_with(&destination_path, body)
-                        .await?;
-                }
-                DownloadedFileType::Gzip => {
-                    let body = GzipDecoder::new(body);
-                    futures::pin_mut!(body);
-                    self.host
-                        .fs
-                        .create_file_with(&destination_path, body)
-                        .await?;
-                }
-                DownloadedFileType::GzipTar => {
-                    let body = GzipDecoder::new(body);
-                    futures::pin_mut!(body);
-                    self.host
-                        .fs
-                        .extract_tar_file(&destination_path, Archive::new(body))
-                        .await?;
-                }
-                DownloadedFileType::Zip => {
-                    futures::pin_mut!(body);
-                    extract_zip(&destination_path, body)
-                        .await
-                        .with_context(|| format!("unzipping {path:?} archive"))?;
-                }
-            }
-
-            Ok(())
-        })
-        .await
-        .to_wasmtime_result()
-    }
-
-    async fn make_file_executable(&mut self, path: String) -> wasmtime::Result<Result<(), String>> {
-        let path = self
-            .host
-            .writeable_path_from_extension(&self.manifest.id, Path::new(&path))?;
-
-        make_file_executable(&path)
-            .await
-            .with_context(|| format!("setting permissions for path {path:?}"))
-            .to_wasmtime_result()
-    }
-}
diff --git a/crates/extensions_ui/Cargo.toml b/crates/extensions_ui/Cargo.toml
deleted file mode 100644
index 707938a9eb..0000000000
--- a/crates/extensions_ui/Cargo.toml
+++ /dev/null
@@ -1,45 +0,0 @@
-[package]
-name = "extensions_ui"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/extensions_ui.rs"
-
-[dependencies]
-anyhow.workspace = true
-client.workspace = true
-collections.workspace = true
-db.workspace = true
-editor.workspace = true
-extension.workspace = true
-extension_host.workspace = true
-fs.workspace = true
-fuzzy.workspace = true
-gpui.workspace = true
-language.workspace = true
-log.workspace = true
-num-format.workspace = true
-picker.workspace = true
-project.workspace = true
-release_channel.workspace = true
-semver.workspace = true
-serde.workspace = true
-settings.workspace = true
-smallvec.workspace = true
-strum.workspace = true
-telemetry.workspace = true
-theme.workspace = true
-ui.workspace = true
-util.workspace = true
-vim_mode_setting.workspace = true
-workspace.workspace = true
-zed_actions.workspace = true
-
-[dev-dependencies]
-editor = { workspace = true, features = ["test-support"] }
diff --git a/crates/extensions_ui/LICENSE-GPL b/crates/extensions_ui/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/extensions_ui/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/extensions_ui/src/components.rs b/crates/extensions_ui/src/components.rs
deleted file mode 100644
index bf11abd679..0000000000
--- a/crates/extensions_ui/src/components.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-mod extension_card;
-
-pub use extension_card::*;
diff --git a/crates/extensions_ui/src/components/extension_card.rs b/crates/extensions_ui/src/components/extension_card.rs
deleted file mode 100644
index 524f90c7f0..0000000000
--- a/crates/extensions_ui/src/components/extension_card.rs
+++ /dev/null
@@ -1,61 +0,0 @@
-use gpui::{AnyElement, prelude::*};
-use smallvec::SmallVec;
-use ui::prelude::*;
-
-#[derive(IntoElement)]
-pub struct ExtensionCard {
-    overridden_by_dev_extension: bool,
-    children: SmallVec<[AnyElement; 2]>,
-}
-
-impl ExtensionCard {
-    pub fn new() -> Self {
-        Self {
-            overridden_by_dev_extension: false,
-            children: SmallVec::new(),
-        }
-    }
-
-    pub fn overridden_by_dev_extension(mut self, overridden: bool) -> Self {
-        self.overridden_by_dev_extension = overridden;
-        self
-    }
-}
-
-impl ParentElement for ExtensionCard {
-    fn extend(&mut self, elements: impl IntoIterator<Item = AnyElement>) {
-        self.children.extend(elements)
-    }
-}
-
-impl RenderOnce for ExtensionCard {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        div().w_full().child(
-            v_flex()
-                .mt_4()
-                .w_full()
-                .h(rems_from_px(110.))
-                .p_3()
-                .gap_2()
-                .bg(cx.theme().colors().elevated_surface_background.opacity(0.5))
-                .border_1()
-                .border_color(cx.theme().colors().border_variant)
-                .rounded_md()
-                .children(self.children)
-                .when(self.overridden_by_dev_extension, |card| {
-                    card.child(
-                        h_flex()
-                            .absolute()
-                            .top_0()
-                            .left_0()
-                            .block_mouse_except_scroll()
-                            .cursor_default()
-                            .size_full()
-                            .justify_center()
-                            .bg(cx.theme().colors().elevated_surface_background.alpha(0.8))
-                            .child(Label::new("Overridden by dev extension.")),
-                    )
-                }),
-        )
-    }
-}
diff --git a/crates/extensions_ui/src/extension_suggest.rs b/crates/extensions_ui/src/extension_suggest.rs
deleted file mode 100644
index 7ad4c1540a..0000000000
--- a/crates/extensions_ui/src/extension_suggest.rs
+++ /dev/null
@@ -1,248 +0,0 @@
-use std::collections::HashMap;
-use std::sync::{Arc, OnceLock};
-
-use db::kvp::KEY_VALUE_STORE;
-use editor::Editor;
-use extension_host::ExtensionStore;
-use gpui::{AppContext as _, Context, Entity, SharedString, Window};
-use language::Buffer;
-use ui::prelude::*;
-use util::rel_path::RelPath;
-use workspace::notifications::simple_message_notification::MessageNotification;
-use workspace::{Workspace, notifications::NotificationId};
-
-const SUGGESTIONS_BY_EXTENSION_ID: &[(&str, &[&str])] = &[
-    ("astro", &["astro"]),
-    ("beancount", &["beancount"]),
-    ("clojure", &["bb", "clj", "cljc", "cljs", "edn"]),
-    ("neocmake", &["CMakeLists.txt", "cmake"]),
-    ("csharp", &["cs"]),
-    ("cython", &["pyx", "pxd", "pxi"]),
-    ("dart", &["dart"]),
-    ("dockerfile", &["Dockerfile"]),
-    ("elisp", &["el"]),
-    ("elixir", &["ex", "exs", "heex"]),
-    ("elm", &["elm"]),
-    ("erlang", &["erl", "hrl"]),
-    ("fish", &["fish"]),
-    (
-        "git-firefly",
-        &[
-            ".gitconfig",
-            ".gitignore",
-            "COMMIT_EDITMSG",
-            "EDIT_DESCRIPTION",
-            "MERGE_MSG",
-            "NOTES_EDITMSG",
-            "TAG_EDITMSG",
-            "git-rebase-todo",
-        ],
-    ),
-    ("gleam", &["gleam"]),
-    ("glsl", &["vert", "frag"]),
-    ("graphql", &["gql", "graphql"]),
-    ("haskell", &["hs"]),
-    ("html", &["htm", "html", "shtml"]),
-    ("java", &["java"]),
-    ("kotlin", &["kt"]),
-    ("latex", &["tex"]),
-    ("log", &["log"]),
-    ("lua", &["lua"]),
-    ("make", &["Makefile"]),
-    ("nim", &["nim"]),
-    ("nix", &["nix"]),
-    ("nu", &["nu"]),
-    ("ocaml", &["ml", "mli"]),
-    ("php", &["php"]),
-    ("powershell", &["ps1", "psm1"]),
-    ("prisma", &["prisma"]),
-    ("proto", &["proto"]),
-    ("purescript", &["purs"]),
-    ("r", &["r", "R"]),
-    ("racket", &["rkt"]),
-    ("rescript", &["res", "resi"]),
-    ("rst", &["rst"]),
-    ("ruby", &["rb", "erb"]),
-    ("scheme", &["scm"]),
-    ("scss", &["scss"]),
-    ("sql", &["sql"]),
-    ("svelte", &["svelte"]),
-    ("swift", &["swift"]),
-    ("templ", &["templ"]),
-    ("terraform", &["tf", "tfvars", "hcl"]),
-    ("toml", &["Cargo.lock", "toml"]),
-    ("typst", &["typ"]),
-    ("vue", &["vue"]),
-    ("wgsl", &["wgsl"]),
-    ("wit", &["wit"]),
-    ("xml", &["xml"]),
-    ("zig", &["zig"]),
-];
-
-fn suggested_extensions() -> &'static HashMap<&'static str, Arc<str>> {
-    static SUGGESTIONS_BY_PATH_SUFFIX: OnceLock<HashMap<&str, Arc<str>>> = OnceLock::new();
-    SUGGESTIONS_BY_PATH_SUFFIX.get_or_init(|| {
-        SUGGESTIONS_BY_EXTENSION_ID
-            .iter()
-            .flat_map(|(name, path_suffixes)| {
-                let name = Arc::<str>::from(*name);
-                path_suffixes
-                    .iter()
-                    .map(move |suffix| (*suffix, name.clone()))
-            })
-            .collect()
-    })
-}
-
-#[derive(Debug, PartialEq, Eq, Clone)]
-struct SuggestedExtension {
-    pub extension_id: Arc<str>,
-    pub file_name_or_extension: Arc<str>,
-}
-
-/// Returns the suggested extension for the given [`Path`].
-fn suggested_extension(path: &RelPath) -> Option<SuggestedExtension> {
-    let file_extension: Option<Arc<str>> = path.extension().map(|extension| extension.into());
-    let file_name: Option<Arc<str>> = path.file_name().map(|name| name.into());
-
-    let (file_name_or_extension, extension_id) = None
-        // We suggest against file names first, as these suggestions will be more
-        // specific than ones based on the file extension.
-        .or_else(|| {
-            file_name.clone().zip(
-                file_name
-                    .as_deref()
-                    .and_then(|file_name| suggested_extensions().get(file_name)),
-            )
-        })
-        .or_else(|| {
-            file_extension.clone().zip(
-                file_extension
-                    .as_deref()
-                    .and_then(|file_extension| suggested_extensions().get(file_extension)),
-            )
-        })?;
-
-    Some(SuggestedExtension {
-        extension_id: extension_id.clone(),
-        file_name_or_extension,
-    })
-}
-
-fn language_extension_key(extension_id: &str) -> String {
-    format!("{}_extension_suggest", extension_id)
-}
-
-pub(crate) fn suggest(buffer: Entity<Buffer>, window: &mut Window, cx: &mut Context<Workspace>) {
-    let Some(file) = buffer.read(cx).file().cloned() else {
-        return;
-    };
-
-    let Some(SuggestedExtension {
-        extension_id,
-        file_name_or_extension,
-    }) = suggested_extension(file.path())
-    else {
-        return;
-    };
-
-    let key = language_extension_key(&extension_id);
-    let Ok(None) = KEY_VALUE_STORE.read_kvp(&key) else {
-        return;
-    };
-
-    cx.on_next_frame(window, move |workspace, _, cx| {
-        let Some(editor) = workspace.active_item_as::<Editor>(cx) else {
-            return;
-        };
-
-        if editor.read(cx).buffer().read(cx).as_singleton().as_ref() != Some(&buffer) {
-            return;
-        }
-
-        struct ExtensionSuggestionNotification;
-
-        let notification_id = NotificationId::composite::<ExtensionSuggestionNotification>(
-            SharedString::from(extension_id.clone()),
-        );
-
-        workspace.show_notification(notification_id, cx, |cx| {
-            cx.new(move |cx| {
-                MessageNotification::new(
-                    format!(
-                        "Do you want to install the recommended '{}' extension for '{}' files?",
-                        extension_id, file_name_or_extension
-                    ),
-                    cx,
-                )
-                .primary_message("Yes, install extension")
-                .primary_icon(IconName::Check)
-                .primary_icon_color(Color::Success)
-                .primary_on_click({
-                    let extension_id = extension_id.clone();
-                    move |_window, cx| {
-                        let extension_id = extension_id.clone();
-                        let extension_store = ExtensionStore::global(cx);
-                        extension_store.update(cx, move |store, cx| {
-                            store.install_latest_extension(extension_id, cx);
-                        });
-                    }
-                })
-                .secondary_message("No, don't install it")
-                .secondary_icon(IconName::Close)
-                .secondary_icon_color(Color::Error)
-                .secondary_on_click(move |_window, cx| {
-                    let key = language_extension_key(&extension_id);
-                    db::write_and_log(cx, move || {
-                        KEY_VALUE_STORE.write_kvp(key, "dismissed".to_string())
-                    });
-                })
-            })
-        });
-    })
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use util::rel_path::rel_path;
-
-    #[test]
-    pub fn test_suggested_extension() {
-        assert_eq!(
-            suggested_extension(rel_path("Cargo.toml")),
-            Some(SuggestedExtension {
-                extension_id: "toml".into(),
-                file_name_or_extension: "toml".into()
-            })
-        );
-        assert_eq!(
-            suggested_extension(rel_path("Cargo.lock")),
-            Some(SuggestedExtension {
-                extension_id: "toml".into(),
-                file_name_or_extension: "Cargo.lock".into()
-            })
-        );
-        assert_eq!(
-            suggested_extension(rel_path("Dockerfile")),
-            Some(SuggestedExtension {
-                extension_id: "dockerfile".into(),
-                file_name_or_extension: "Dockerfile".into()
-            })
-        );
-        assert_eq!(
-            suggested_extension(rel_path("a/b/c/d/.gitignore")),
-            Some(SuggestedExtension {
-                extension_id: "git-firefly".into(),
-                file_name_or_extension: ".gitignore".into()
-            })
-        );
-        assert_eq!(
-            suggested_extension(rel_path("a/b/c/d/test.gleam")),
-            Some(SuggestedExtension {
-                extension_id: "gleam".into(),
-                file_name_or_extension: "gleam".into()
-            })
-        );
-    }
-}
diff --git a/crates/extensions_ui/src/extension_version_selector.rs b/crates/extensions_ui/src/extension_version_selector.rs
deleted file mode 100644
index 17d293da76..0000000000
--- a/crates/extensions_ui/src/extension_version_selector.rs
+++ /dev/null
@@ -1,251 +0,0 @@
-use std::str::FromStr;
-use std::sync::Arc;
-
-use client::ExtensionMetadata;
-use extension_host::ExtensionStore;
-use fs::Fs;
-use fuzzy::{StringMatch, StringMatchCandidate, match_strings};
-use gpui::{App, DismissEvent, Entity, EventEmitter, Focusable, Task, WeakEntity, prelude::*};
-use picker::{Picker, PickerDelegate};
-use release_channel::ReleaseChannel;
-use semver::Version;
-use settings::update_settings_file;
-use ui::{HighlightedLabel, ListItem, ListItemSpacing, prelude::*};
-use util::ResultExt;
-use workspace::ModalView;
-
-pub struct ExtensionVersionSelector {
-    picker: Entity<Picker<ExtensionVersionSelectorDelegate>>,
-}
-
-impl ModalView for ExtensionVersionSelector {}
-
-impl EventEmitter<DismissEvent> for ExtensionVersionSelector {}
-
-impl Focusable for ExtensionVersionSelector {
-    fn focus_handle(&self, cx: &App) -> gpui::FocusHandle {
-        self.picker.focus_handle(cx)
-    }
-}
-
-impl Render for ExtensionVersionSelector {
-    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex().w(rems(34.)).child(self.picker.clone())
-    }
-}
-
-impl ExtensionVersionSelector {
-    pub fn new(
-        delegate: ExtensionVersionSelectorDelegate,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx));
-        Self { picker }
-    }
-}
-
-pub struct ExtensionVersionSelectorDelegate {
-    fs: Arc<dyn Fs>,
-    selector: WeakEntity<ExtensionVersionSelector>,
-    extension_versions: Vec<ExtensionMetadata>,
-    selected_index: usize,
-    matches: Vec<StringMatch>,
-}
-
-impl ExtensionVersionSelectorDelegate {
-    pub fn new(
-        fs: Arc<dyn Fs>,
-        selector: WeakEntity<ExtensionVersionSelector>,
-        mut extension_versions: Vec<ExtensionMetadata>,
-    ) -> Self {
-        extension_versions.sort_unstable_by(|a, b| {
-            let a_version = Version::from_str(&a.manifest.version);
-            let b_version = Version::from_str(&b.manifest.version);
-
-            match (a_version, b_version) {
-                (Ok(a_version), Ok(b_version)) => b_version.cmp(&a_version),
-                _ => b.published_at.cmp(&a.published_at),
-            }
-        });
-
-        let matches = extension_versions
-            .iter()
-            .map(|extension| StringMatch {
-                candidate_id: 0,
-                score: 0.0,
-                positions: Default::default(),
-                string: format!("v{}", extension.manifest.version),
-            })
-            .collect();
-
-        Self {
-            fs,
-            selector,
-            extension_versions,
-            selected_index: 0,
-            matches,
-        }
-    }
-}
-
-impl PickerDelegate for ExtensionVersionSelectorDelegate {
-    type ListItem = ui::ListItem;
-
-    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
-        "Select extension version...".into()
-    }
-
-    fn match_count(&self) -> usize {
-        self.matches.len()
-    }
-
-    fn selected_index(&self) -> usize {
-        self.selected_index
-    }
-
-    fn set_selected_index(
-        &mut self,
-        ix: usize,
-        _window: &mut Window,
-        _cx: &mut Context<Picker<Self>>,
-    ) {
-        self.selected_index = ix;
-    }
-
-    fn update_matches(
-        &mut self,
-        query: String,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Task<()> {
-        let background_executor = cx.background_executor().clone();
-        let candidates = self
-            .extension_versions
-            .iter()
-            .enumerate()
-            .map(|(id, extension)| {
-                StringMatchCandidate::new(id, &format!("v{}", extension.manifest.version))
-            })
-            .collect::<Vec<_>>();
-
-        cx.spawn_in(window, async move |this, cx| {
-            let matches = if query.is_empty() {
-                candidates
-                    .into_iter()
-                    .enumerate()
-                    .map(|(index, candidate)| StringMatch {
-                        candidate_id: index,
-                        string: candidate.string,
-                        positions: Vec::new(),
-                        score: 0.0,
-                    })
-                    .collect()
-            } else {
-                match_strings(
-                    &candidates,
-                    &query,
-                    false,
-                    true,
-                    100,
-                    &Default::default(),
-                    background_executor,
-                )
-                .await
-            };
-
-            this.update(cx, |this, _cx| {
-                this.delegate.matches = matches;
-                this.delegate.selected_index = this
-                    .delegate
-                    .selected_index
-                    .min(this.delegate.matches.len().saturating_sub(1));
-            })
-            .log_err();
-        })
-    }
-
-    fn confirm(&mut self, _secondary: bool, window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        if self.matches.is_empty() {
-            self.dismissed(window, cx);
-            return;
-        }
-
-        let candidate_id = self.matches[self.selected_index].candidate_id;
-        let extension_version = &self.extension_versions[candidate_id];
-
-        if !extension_host::is_version_compatible(ReleaseChannel::global(cx), extension_version) {
-            return;
-        }
-
-        let extension_store = ExtensionStore::global(cx);
-        extension_store.update(cx, |store, cx| {
-            let extension_id = extension_version.id.clone();
-            let version = extension_version.manifest.version.clone();
-
-            update_settings_file(self.fs.clone(), cx, {
-                let extension_id = extension_id.clone();
-                move |settings, _| {
-                    settings
-                        .extension
-                        .auto_update_extensions
-                        .insert(extension_id, false);
-                }
-            });
-
-            store.install_extension(extension_id, version, cx);
-        });
-    }
-
-    fn dismissed(&mut self, _: &mut Window, cx: &mut Context<Picker<Self>>) {
-        self.selector
-            .update(cx, |_, cx| cx.emit(DismissEvent))
-            .log_err();
-    }
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        _: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<Self::ListItem> {
-        let version_match = &self.matches.get(ix)?;
-        let extension_version = &self.extension_versions.get(version_match.candidate_id)?;
-
-        let is_version_compatible =
-            extension_host::is_version_compatible(ReleaseChannel::global(cx), extension_version);
-        let disabled = !is_version_compatible;
-
-        Some(
-            ListItem::new(ix)
-                .inset(true)
-                .spacing(ListItemSpacing::Sparse)
-                .toggle_state(selected)
-                .disabled(disabled)
-                .child(
-                    HighlightedLabel::new(
-                        version_match.string.clone(),
-                        version_match.positions.clone(),
-                    )
-                    .when(disabled, |label| label.color(Color::Muted)),
-                )
-                .end_slot(
-                    h_flex()
-                        .gap_2()
-                        .when(!is_version_compatible, |this| {
-                            this.child(Label::new("Incompatible").color(Color::Muted))
-                        })
-                        .child(
-                            Label::new(
-                                extension_version
-                                    .published_at
-                                    .format("%Y-%m-%d")
-                                    .to_string(),
-                            )
-                            .when(disabled, |label| label.color(Color::Muted)),
-                        ),
-                ),
-        )
-    }
-}
diff --git a/crates/extensions_ui/src/extensions_ui.rs b/crates/extensions_ui/src/extensions_ui.rs
deleted file mode 100644
index 3dd4803ce1..0000000000
--- a/crates/extensions_ui/src/extensions_ui.rs
+++ /dev/null
@@ -1,1784 +0,0 @@
-mod components;
-mod extension_suggest;
-mod extension_version_selector;
-
-use std::sync::OnceLock;
-use std::time::Duration;
-use std::{ops::Range, sync::Arc};
-
-use anyhow::Context as _;
-use client::{ExtensionMetadata, ExtensionProvides};
-use collections::{BTreeMap, BTreeSet};
-use editor::{Editor, EditorElement, EditorStyle};
-use extension_host::{ExtensionManifest, ExtensionOperation, ExtensionStore};
-use fuzzy::{StringMatchCandidate, match_strings};
-use gpui::{
-    Action, App, ClipboardItem, Context, Corner, Entity, EventEmitter, Flatten, Focusable,
-    InteractiveElement, KeyContext, ParentElement, Point, Render, Styled, Task, TextStyle,
-    UniformListScrollHandle, WeakEntity, Window, actions, point, uniform_list,
-};
-use num_format::{Locale, ToFormattedString};
-use project::DirectoryLister;
-use release_channel::ReleaseChannel;
-use settings::{Settings, SettingsContent};
-use strum::IntoEnumIterator as _;
-use theme::ThemeSettings;
-use ui::{
-    Banner, Chip, ContextMenu, Divider, PopoverMenu, ScrollableHandle, Switch, ToggleButtonGroup,
-    ToggleButtonGroupSize, ToggleButtonGroupStyle, ToggleButtonSimple, Tooltip, WithScrollbar,
-    prelude::*,
-};
-use vim_mode_setting::VimModeSetting;
-use workspace::{
-    Workspace,
-    item::{Item, ItemEvent},
-};
-use zed_actions::ExtensionCategoryFilter;
-
-use crate::components::ExtensionCard;
-use crate::extension_version_selector::{
-    ExtensionVersionSelector, ExtensionVersionSelectorDelegate,
-};
-
-actions!(
-    zed,
-    [
-        /// Installs an extension from a local directory for development.
-        InstallDevExtension
-    ]
-);
-
-pub fn init(cx: &mut App) {
-    cx.observe_new(move |workspace: &mut Workspace, window, cx| {
-        let Some(window) = window else {
-            return;
-        };
-        workspace
-            .register_action(
-                move |workspace, action: &zed_actions::Extensions, window, cx| {
-                    let provides_filter = action.category_filter.map(|category| match category {
-                        ExtensionCategoryFilter::Themes => ExtensionProvides::Themes,
-                        ExtensionCategoryFilter::IconThemes => ExtensionProvides::IconThemes,
-                        ExtensionCategoryFilter::Languages => ExtensionProvides::Languages,
-                        ExtensionCategoryFilter::Grammars => ExtensionProvides::Grammars,
-                        ExtensionCategoryFilter::LanguageServers => {
-                            ExtensionProvides::LanguageServers
-                        }
-                        ExtensionCategoryFilter::ContextServers => {
-                            ExtensionProvides::ContextServers
-                        }
-                        ExtensionCategoryFilter::AgentServers => ExtensionProvides::AgentServers,
-                        ExtensionCategoryFilter::SlashCommands => ExtensionProvides::SlashCommands,
-                        ExtensionCategoryFilter::IndexedDocsProviders => {
-                            ExtensionProvides::IndexedDocsProviders
-                        }
-                        ExtensionCategoryFilter::Snippets => ExtensionProvides::Snippets,
-                        ExtensionCategoryFilter::DebugAdapters => ExtensionProvides::DebugAdapters,
-                    });
-
-                    let existing = workspace
-                        .active_pane()
-                        .read(cx)
-                        .items()
-                        .find_map(|item| item.downcast::<ExtensionsPage>());
-
-                    if let Some(existing) = existing {
-                        existing.update(cx, |extensions_page, cx| {
-                            if provides_filter.is_some() {
-                                extensions_page.change_provides_filter(provides_filter, cx);
-                            }
-                            if let Some(id) = action.id.as_ref() {
-                                extensions_page.focus_extension(id, window, cx);
-                            }
-                        });
-
-                        workspace.activate_item(&existing, true, true, window, cx);
-                    } else {
-                        let extensions_page = ExtensionsPage::new(
-                            workspace,
-                            provides_filter,
-                            action.id.as_deref(),
-                            window,
-                            cx,
-                        );
-                        workspace.add_item_to_active_pane(
-                            Box::new(extensions_page),
-                            None,
-                            true,
-                            window,
-                            cx,
-                        )
-                    }
-                },
-            )
-            .register_action(move |workspace, _: &InstallDevExtension, window, cx| {
-                let store = ExtensionStore::global(cx);
-                let prompt = workspace.prompt_for_open_path(
-                    gpui::PathPromptOptions {
-                        files: false,
-                        directories: true,
-                        multiple: false,
-                        prompt: None,
-                    },
-                    DirectoryLister::Local(
-                        workspace.project().clone(),
-                        workspace.app_state().fs.clone(),
-                    ),
-                    window,
-                    cx,
-                );
-
-                let workspace_handle = cx.entity().downgrade();
-                window
-                    .spawn(cx, async move |cx| {
-                        let extension_path =
-                            match Flatten::flatten(prompt.await.map_err(|e| e.into())) {
-                                Ok(Some(mut paths)) => paths.pop()?,
-                                Ok(None) => return None,
-                                Err(err) => {
-                                    workspace_handle
-                                        .update(cx, |workspace, cx| {
-                                            workspace.show_portal_error(err.to_string(), cx);
-                                        })
-                                        .ok();
-                                    return None;
-                                }
-                            };
-
-                        let install_task = store
-                            .update(cx, |store, cx| {
-                                store.install_dev_extension(extension_path, cx)
-                            })
-                            .ok()?;
-
-                        match install_task.await {
-                            Ok(_) => {}
-                            Err(err) => {
-                                log::error!("Failed to install dev extension: {:?}", err);
-                                workspace_handle
-                                    .update(cx, |workspace, cx| {
-                                        workspace.show_error(
-                                            // NOTE: using `anyhow::context` here ends up not printing
-                                            // the error
-                                            &format!("Failed to install dev extension: {}", err),
-                                            cx,
-                                        );
-                                    })
-                                    .ok();
-                            }
-                        }
-
-                        Some(())
-                    })
-                    .detach();
-            });
-
-        cx.subscribe_in(workspace.project(), window, |_, _, event, window, cx| {
-            if let project::Event::LanguageNotFound(buffer) = event {
-                extension_suggest::suggest(buffer.clone(), window, cx);
-            }
-        })
-        .detach();
-    })
-    .detach();
-}
-
-fn extension_provides_label(provides: ExtensionProvides) -> &'static str {
-    match provides {
-        ExtensionProvides::Themes => "Themes",
-        ExtensionProvides::IconThemes => "Icon Themes",
-        ExtensionProvides::Languages => "Languages",
-        ExtensionProvides::Grammars => "Grammars",
-        ExtensionProvides::LanguageServers => "Language Servers",
-        ExtensionProvides::ContextServers => "MCP Servers",
-        ExtensionProvides::AgentServers => "Agent Servers",
-        ExtensionProvides::SlashCommands => "Slash Commands",
-        ExtensionProvides::IndexedDocsProviders => "Indexed Docs Providers",
-        ExtensionProvides::Snippets => "Snippets",
-        ExtensionProvides::DebugAdapters => "Debug Adapters",
-    }
-}
-
-#[derive(Clone)]
-pub enum ExtensionStatus {
-    NotInstalled,
-    Installing,
-    Upgrading,
-    Installed(Arc<str>),
-    Removing,
-}
-
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
-enum ExtensionFilter {
-    All,
-    Installed,
-    NotInstalled,
-}
-
-impl ExtensionFilter {
-    pub fn include_dev_extensions(&self) -> bool {
-        match self {
-            Self::All | Self::Installed => true,
-            Self::NotInstalled => false,
-        }
-    }
-}
-
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
-enum Feature {
-    AgentClaude,
-    AgentCodex,
-    AgentGemini,
-    ExtensionBasedpyright,
-    ExtensionRuff,
-    ExtensionTailwind,
-    ExtensionTy,
-    Git,
-    LanguageBash,
-    LanguageC,
-    LanguageCpp,
-    LanguageGo,
-    LanguagePython,
-    LanguageReact,
-    LanguageRust,
-    LanguageTypescript,
-    OpenIn,
-    Vim,
-}
-
-fn keywords_by_feature() -> &'static BTreeMap<Feature, Vec<&'static str>> {
-    static KEYWORDS_BY_FEATURE: OnceLock<BTreeMap<Feature, Vec<&'static str>>> = OnceLock::new();
-    KEYWORDS_BY_FEATURE.get_or_init(|| {
-        BTreeMap::from_iter([
-            (Feature::AgentClaude, vec!["claude", "claude code"]),
-            (Feature::AgentCodex, vec!["codex", "codex cli"]),
-            (Feature::AgentGemini, vec!["gemini", "gemini cli"]),
-            (
-                Feature::ExtensionBasedpyright,
-                vec!["basedpyright", "pyright"],
-            ),
-            (Feature::ExtensionRuff, vec!["ruff"]),
-            (Feature::ExtensionTailwind, vec!["tail", "tailwind"]),
-            (Feature::ExtensionTy, vec!["ty"]),
-            (Feature::Git, vec!["git"]),
-            (Feature::LanguageBash, vec!["sh", "bash"]),
-            (Feature::LanguageC, vec!["c", "clang"]),
-            (Feature::LanguageCpp, vec!["c++", "cpp", "clang"]),
-            (Feature::LanguageGo, vec!["go", "golang"]),
-            (Feature::LanguagePython, vec!["python", "py"]),
-            (Feature::LanguageReact, vec!["react"]),
-            (Feature::LanguageRust, vec!["rust", "rs"]),
-            (
-                Feature::LanguageTypescript,
-                vec!["type", "typescript", "ts"],
-            ),
-            (
-                Feature::OpenIn,
-                vec![
-                    "github",
-                    "gitlab",
-                    "bitbucket",
-                    "codeberg",
-                    "sourcehut",
-                    "permalink",
-                    "link",
-                    "open in",
-                ],
-            ),
-            (Feature::Vim, vec!["vim"]),
-        ])
-    })
-}
-
-struct ExtensionCardButtons {
-    install_or_uninstall: Button,
-    upgrade: Option<Button>,
-    configure: Option<Button>,
-}
-
-pub struct ExtensionsPage {
-    workspace: WeakEntity<Workspace>,
-    list: UniformListScrollHandle,
-    is_fetching_extensions: bool,
-    fetch_failed: bool,
-    filter: ExtensionFilter,
-    remote_extension_entries: Vec<ExtensionMetadata>,
-    dev_extension_entries: Vec<Arc<ExtensionManifest>>,
-    filtered_remote_extension_indices: Vec<usize>,
-    query_editor: Entity<Editor>,
-    query_contains_error: bool,
-    provides_filter: Option<ExtensionProvides>,
-    _subscriptions: [gpui::Subscription; 2],
-    extension_fetch_task: Option<Task<()>>,
-    upsells: BTreeSet<Feature>,
-}
-
-impl ExtensionsPage {
-    pub fn new(
-        workspace: &Workspace,
-        provides_filter: Option<ExtensionProvides>,
-        focus_extension_id: Option<&str>,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) -> Entity<Self> {
-        cx.new(|cx| {
-            let store = ExtensionStore::global(cx);
-            let workspace_handle = workspace.weak_handle();
-            let subscriptions = [
-                cx.observe(&store, |_: &mut Self, _, cx| cx.notify()),
-                cx.subscribe_in(
-                    &store,
-                    window,
-                    move |this, _, event, window, cx| match event {
-                        extension_host::Event::ExtensionsUpdated => {
-                            this.fetch_extensions_debounced(None, cx)
-                        }
-                        extension_host::Event::ExtensionInstalled(extension_id) => this
-                            .on_extension_installed(
-                                workspace_handle.clone(),
-                                extension_id,
-                                window,
-                                cx,
-                            ),
-                        _ => {}
-                    },
-                ),
-            ];
-
-            let query_editor = cx.new(|cx| {
-                let mut input = Editor::single_line(window, cx);
-                input.set_placeholder_text("Search extensions...", window, cx);
-                if let Some(id) = focus_extension_id {
-                    input.set_text(format!("id:{id}"), window, cx);
-                }
-                input
-            });
-            cx.subscribe(&query_editor, Self::on_query_change).detach();
-
-            let scroll_handle = UniformListScrollHandle::new();
-
-            let mut this = Self {
-                workspace: workspace.weak_handle(),
-                list: scroll_handle,
-                is_fetching_extensions: false,
-                fetch_failed: false,
-                filter: ExtensionFilter::All,
-                dev_extension_entries: Vec::new(),
-                filtered_remote_extension_indices: Vec::new(),
-                remote_extension_entries: Vec::new(),
-                query_contains_error: false,
-                provides_filter,
-                extension_fetch_task: None,
-                _subscriptions: subscriptions,
-                query_editor,
-                upsells: BTreeSet::default(),
-            };
-            this.fetch_extensions(
-                this.search_query(cx),
-                Some(BTreeSet::from_iter(this.provides_filter)),
-                None,
-                cx,
-            );
-            this
-        })
-    }
-
-    fn on_extension_installed(
-        &mut self,
-        workspace: WeakEntity<Workspace>,
-        extension_id: &str,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let extension_store = ExtensionStore::global(cx).read(cx);
-        let themes = extension_store
-            .extension_themes(extension_id)
-            .map(|name| name.to_string())
-            .collect::<Vec<_>>();
-        if !themes.is_empty() {
-            workspace
-                .update(cx, |_workspace, cx| {
-                    window.dispatch_action(
-                        zed_actions::theme_selector::Toggle {
-                            themes_filter: Some(themes),
-                        }
-                        .boxed_clone(),
-                        cx,
-                    );
-                })
-                .ok();
-            return;
-        }
-
-        let icon_themes = extension_store
-            .extension_icon_themes(extension_id)
-            .map(|name| name.to_string())
-            .collect::<Vec<_>>();
-        if !icon_themes.is_empty() {
-            workspace
-                .update(cx, |_workspace, cx| {
-                    window.dispatch_action(
-                        zed_actions::icon_theme_selector::Toggle {
-                            themes_filter: Some(icon_themes),
-                        }
-                        .boxed_clone(),
-                        cx,
-                    );
-                })
-                .ok();
-        }
-    }
-
-    /// Returns whether a dev extension currently exists for the extension with the given ID.
-    fn dev_extension_exists(extension_id: &str, cx: &mut Context<Self>) -> bool {
-        let extension_store = ExtensionStore::global(cx).read(cx);
-
-        extension_store
-            .dev_extensions()
-            .any(|dev_extension| dev_extension.id.as_ref() == extension_id)
-    }
-
-    fn extension_status(extension_id: &str, cx: &mut Context<Self>) -> ExtensionStatus {
-        let extension_store = ExtensionStore::global(cx).read(cx);
-
-        match extension_store.outstanding_operations().get(extension_id) {
-            Some(ExtensionOperation::Install) => ExtensionStatus::Installing,
-            Some(ExtensionOperation::Remove) => ExtensionStatus::Removing,
-            Some(ExtensionOperation::Upgrade) => ExtensionStatus::Upgrading,
-            None => match extension_store.installed_extensions().get(extension_id) {
-                Some(extension) => ExtensionStatus::Installed(extension.manifest.version.clone()),
-                None => ExtensionStatus::NotInstalled,
-            },
-        }
-    }
-
-    fn filter_extension_entries(&mut self, cx: &mut Context<Self>) {
-        self.filtered_remote_extension_indices.clear();
-        self.filtered_remote_extension_indices.extend(
-            self.remote_extension_entries
-                .iter()
-                .enumerate()
-                .filter(|(_, extension)| match self.filter {
-                    ExtensionFilter::All => true,
-                    ExtensionFilter::Installed => {
-                        let status = Self::extension_status(&extension.id, cx);
-                        matches!(status, ExtensionStatus::Installed(_))
-                    }
-                    ExtensionFilter::NotInstalled => {
-                        let status = Self::extension_status(&extension.id, cx);
-
-                        matches!(status, ExtensionStatus::NotInstalled)
-                    }
-                })
-                .map(|(ix, _)| ix),
-        );
-        cx.notify();
-    }
-
-    fn scroll_to_top(&mut self, cx: &mut Context<Self>) {
-        self.list.set_offset(point(px(0.), px(0.)));
-        cx.notify();
-    }
-
-    fn fetch_extensions(
-        &mut self,
-        search: Option<String>,
-        provides_filter: Option<BTreeSet<ExtensionProvides>>,
-        on_complete: Option<Box<dyn FnOnce(&mut Self, &mut Context<Self>) + Send>>,
-        cx: &mut Context<Self>,
-    ) {
-        self.is_fetching_extensions = true;
-        self.fetch_failed = false;
-        cx.notify();
-
-        let extension_store = ExtensionStore::global(cx);
-
-        let dev_extensions = extension_store
-            .read(cx)
-            .dev_extensions()
-            .cloned()
-            .collect::<Vec<_>>();
-
-        let remote_extensions =
-            if let Some(id) = search.as_ref().and_then(|s| s.strip_prefix("id:")) {
-                let versions =
-                    extension_store.update(cx, |store, cx| store.fetch_extension_versions(id, cx));
-                cx.foreground_executor().spawn(async move {
-                    let versions = versions.await?;
-                    let latest = versions
-                        .into_iter()
-                        .max_by_key(|v| v.published_at)
-                        .context("no extension found")?;
-                    Ok(vec![latest])
-                })
-            } else {
-                extension_store.update(cx, |store, cx| {
-                    store.fetch_extensions(search.as_deref(), provides_filter.as_ref(), cx)
-                })
-            };
-
-        cx.spawn(async move |this, cx| {
-            let dev_extensions = if let Some(search) = search {
-                let match_candidates = dev_extensions
-                    .iter()
-                    .enumerate()
-                    .map(|(ix, manifest)| StringMatchCandidate::new(ix, &manifest.name))
-                    .collect::<Vec<_>>();
-
-                let matches = match_strings(
-                    &match_candidates,
-                    &search,
-                    false,
-                    true,
-                    match_candidates.len(),
-                    &Default::default(),
-                    cx.background_executor().clone(),
-                )
-                .await;
-                matches
-                    .into_iter()
-                    .map(|mat| dev_extensions[mat.candidate_id].clone())
-                    .collect()
-            } else {
-                dev_extensions
-            };
-
-            let fetch_result = remote_extensions.await;
-
-            let result = this.update(cx, |this, cx| {
-                cx.notify();
-                this.dev_extension_entries = dev_extensions;
-                this.is_fetching_extensions = false;
-
-                match fetch_result {
-                    Ok(extensions) => {
-                        this.fetch_failed = false;
-                        this.remote_extension_entries = extensions;
-                        this.filter_extension_entries(cx);
-                        if let Some(callback) = on_complete {
-                            callback(this, cx);
-                        }
-                        Ok(())
-                    }
-                    Err(err) => {
-                        this.fetch_failed = true;
-                        this.filter_extension_entries(cx);
-                        Err(err)
-                    }
-                }
-            });
-
-            result?
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn render_extensions(
-        &mut self,
-        range: Range<usize>,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Vec<ExtensionCard> {
-        let dev_extension_entries_len = if self.filter.include_dev_extensions() {
-            self.dev_extension_entries.len()
-        } else {
-            0
-        };
-        range
-            .map(|ix| {
-                if ix < dev_extension_entries_len {
-                    let extension = &self.dev_extension_entries[ix];
-                    self.render_dev_extension(extension, cx)
-                } else {
-                    let extension_ix =
-                        self.filtered_remote_extension_indices[ix - dev_extension_entries_len];
-                    let extension = &self.remote_extension_entries[extension_ix];
-                    self.render_remote_extension(extension, cx)
-                }
-            })
-            .collect()
-    }
-
-    fn render_dev_extension(
-        &self,
-        extension: &ExtensionManifest,
-        cx: &mut Context<Self>,
-    ) -> ExtensionCard {
-        let status = Self::extension_status(&extension.id, cx);
-
-        let repository_url = extension.repository.clone();
-
-        let can_configure = !extension.context_servers.is_empty();
-
-        ExtensionCard::new()
-            .child(
-                h_flex()
-                    .justify_between()
-                    .child(
-                        h_flex()
-                            .gap_2()
-                            .items_end()
-                            .child(Headline::new(extension.name.clone()).size(HeadlineSize::Medium))
-                            .child(
-                                Headline::new(format!("v{}", extension.version))
-                                    .size(HeadlineSize::XSmall),
-                            ),
-                    )
-                    .child(
-                        h_flex()
-                            .gap_1()
-                            .justify_between()
-                            .child(
-                                Button::new(
-                                    SharedString::from(format!("rebuild-{}", extension.id)),
-                                    "Rebuild",
-                                )
-                                .color(Color::Accent)
-                                .disabled(matches!(status, ExtensionStatus::Upgrading))
-                                .on_click({
-                                    let extension_id = extension.id.clone();
-                                    move |_, _, cx| {
-                                        ExtensionStore::global(cx).update(cx, |store, cx| {
-                                            store.rebuild_dev_extension(extension_id.clone(), cx)
-                                        });
-                                    }
-                                }),
-                            )
-                            .child(
-                                Button::new(SharedString::from(extension.id.clone()), "Uninstall")
-                                    .color(Color::Accent)
-                                    .disabled(matches!(status, ExtensionStatus::Removing))
-                                    .on_click({
-                                        let extension_id = extension.id.clone();
-                                        move |_, _, cx| {
-                                            ExtensionStore::global(cx).update(cx, |store, cx| {
-                                                store.uninstall_extension(extension_id.clone(), cx).detach_and_log_err(cx);
-                                            });
-                                        }
-                                    }),
-                            )
-                            .when(can_configure, |this| {
-                                this.child(
-                                    Button::new(
-                                        SharedString::from(format!("configure-{}", extension.id)),
-                                        "Configure",
-                                    )
-                                    .color(Color::Accent)
-                                    .disabled(matches!(status, ExtensionStatus::Installing))
-                                    .on_click({
-                                        let manifest = Arc::new(extension.clone());
-                                        move |_, _, cx| {
-                                            if let Some(events) =
-                                                extension::ExtensionEvents::try_global(cx)
-                                            {
-                                                events.update(cx, |this, cx| {
-                                                    this.emit(
-                                                        extension::Event::ConfigureExtensionRequested(
-                                                            manifest.clone(),
-                                                        ),
-                                                        cx,
-                                                    )
-                                                });
-                                            }
-                                        }
-                                    }),
-                                )
-                            }),
-                    ),
-            )
-            .child(
-                h_flex()
-                    .gap_2()
-                    .justify_between()
-                    .child(
-                        Label::new(format!(
-                            "{}: {}",
-                            if extension.authors.len() > 1 {
-                                "Authors"
-                            } else {
-                                "Author"
-                            },
-                            extension.authors.join(", ")
-                        ))
-                        .size(LabelSize::Small)
-                        .color(Color::Muted)
-                        .truncate(),
-                    )
-                    .child(Label::new("<>").size(LabelSize::Small)),
-            )
-            .child(
-                h_flex()
-                    .gap_2()
-                    .justify_between()
-                    .children(extension.description.as_ref().map(|description| {
-                        Label::new(description.clone())
-                            .size(LabelSize::Small)
-                            .color(Color::Default)
-                            .truncate()
-                    }))
-                    .children(repository_url.map(|repository_url| {
-                        IconButton::new(
-                            SharedString::from(format!("repository-{}", extension.id)),
-                            IconName::Github,
-                        )
-                        .icon_color(Color::Accent)
-                        .icon_size(IconSize::Small)
-                        .on_click(cx.listener({
-                            let repository_url = repository_url.clone();
-                            move |_, _, _, cx| {
-                                cx.open_url(&repository_url);
-                            }
-                        }))
-                        .tooltip(Tooltip::text(repository_url))
-                    })),
-            )
-    }
-
-    fn render_remote_extension(
-        &self,
-        extension: &ExtensionMetadata,
-        cx: &mut Context<Self>,
-    ) -> ExtensionCard {
-        let this = cx.weak_entity();
-        let status = Self::extension_status(&extension.id, cx);
-        let has_dev_extension = Self::dev_extension_exists(&extension.id, cx);
-
-        let extension_id = extension.id.clone();
-        let buttons = self.buttons_for_entry(extension, &status, has_dev_extension, cx);
-        let version = extension.manifest.version.clone();
-        let repository_url = extension.manifest.repository.clone();
-        let authors = extension.manifest.authors.clone();
-
-        let installed_version = match status {
-            ExtensionStatus::Installed(installed_version) => Some(installed_version),
-            _ => None,
-        };
-
-        ExtensionCard::new()
-            .overridden_by_dev_extension(has_dev_extension)
-            .child(
-                h_flex()
-                    .justify_between()
-                    .child(
-                        h_flex()
-                            .gap_2()
-                            .child(
-                                Headline::new(extension.manifest.name.clone())
-                                    .size(HeadlineSize::Small),
-                            )
-                            .child(Headline::new(format!("v{version}")).size(HeadlineSize::XSmall))
-                            .children(
-                                installed_version
-                                    .filter(|installed_version| *installed_version != version)
-                                    .map(|installed_version| {
-                                        Headline::new(format!("(v{installed_version} installed)",))
-                                            .size(HeadlineSize::XSmall)
-                                    }),
-                            )
-                            .map(|parent| {
-                                if extension.manifest.provides.is_empty() {
-                                    return parent;
-                                }
-
-                                parent.child(
-                                    h_flex().gap_1().children(
-                                        extension
-                                            .manifest
-                                            .provides
-                                            .iter()
-                                            .filter_map(|provides| {
-                                                match provides {
-                                                    ExtensionProvides::SlashCommands
-                                                    | ExtensionProvides::IndexedDocsProviders => {
-                                                        return None;
-                                                    }
-                                                    _ => {}
-                                                }
-
-                                                Some(Chip::new(extension_provides_label(*provides)))
-                                            })
-                                            .collect::<Vec<_>>(),
-                                    ),
-                                )
-                            }),
-                    )
-                    .child(
-                        h_flex()
-                            .gap_1()
-                            .children(buttons.upgrade)
-                            .children(buttons.configure)
-                            .child(buttons.install_or_uninstall),
-                    ),
-            )
-            .child(
-                h_flex()
-                    .gap_2()
-                    .justify_between()
-                    .children(extension.manifest.description.as_ref().map(|description| {
-                        Label::new(description.clone())
-                            .size(LabelSize::Small)
-                            .color(Color::Default)
-                            .truncate()
-                    }))
-                    .child(
-                        Label::new(format!(
-                            "Downloads: {}",
-                            extension.download_count.to_formatted_string(&Locale::en)
-                        ))
-                        .size(LabelSize::Small),
-                    ),
-            )
-            .child(
-                h_flex()
-                    .justify_between()
-                    .child(
-                        h_flex()
-                            .gap_1()
-                            .child(
-                                Icon::new(IconName::Person)
-                                    .size(IconSize::XSmall)
-                                    .color(Color::Muted),
-                            )
-                            .child(
-                                Label::new(extension.manifest.authors.join(", "))
-                                    .size(LabelSize::Small)
-                                    .color(Color::Muted)
-                                    .truncate(),
-                            ),
-                    )
-                    .child(
-                        h_flex()
-                            .gap_1()
-                            .child({
-                                let repo_url_for_tooltip = repository_url.clone();
-
-                                IconButton::new(
-                                    SharedString::from(format!("repository-{}", extension.id)),
-                                    IconName::Github,
-                                )
-                                .icon_size(IconSize::Small)
-                                .tooltip(move |_, cx| {
-                                    Tooltip::with_meta(
-                                        "Visit Extension Repository",
-                                        None,
-                                        repo_url_for_tooltip.clone(),
-                                        cx,
-                                    )
-                                })
-                                .on_click(cx.listener(
-                                    move |_, _, _, cx| {
-                                        cx.open_url(&repository_url);
-                                    },
-                                ))
-                            })
-                            .child(
-                                PopoverMenu::new(SharedString::from(format!(
-                                    "more-{}",
-                                    extension.id
-                                )))
-                                .trigger(
-                                    IconButton::new(
-                                        SharedString::from(format!("more-{}", extension.id)),
-                                        IconName::Ellipsis,
-                                    )
-                                    .icon_size(IconSize::Small),
-                                )
-                                .anchor(Corner::TopRight)
-                                .offset(Point {
-                                    x: px(0.0),
-                                    y: px(2.0),
-                                })
-                                .menu(move |window, cx| {
-                                    this.upgrade().map(|this| {
-                                        Self::render_remote_extension_context_menu(
-                                            &this,
-                                            extension_id.clone(),
-                                            authors.clone(),
-                                            window,
-                                            cx,
-                                        )
-                                    })
-                                }),
-                            ),
-                    ),
-            )
-    }
-
-    fn render_remote_extension_context_menu(
-        this: &Entity<Self>,
-        extension_id: Arc<str>,
-        authors: Vec<String>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Entity<ContextMenu> {
-        ContextMenu::build(window, cx, |context_menu, window, _| {
-            context_menu
-                .entry(
-                    "Install Another Version...",
-                    None,
-                    window.handler_for(this, {
-                        let extension_id = extension_id.clone();
-                        move |this, window, cx| {
-                            this.show_extension_version_list(extension_id.clone(), window, cx)
-                        }
-                    }),
-                )
-                .entry("Copy Extension ID", None, {
-                    let extension_id = extension_id.clone();
-                    move |_, cx| {
-                        cx.write_to_clipboard(ClipboardItem::new_string(extension_id.to_string()));
-                    }
-                })
-                .entry("Copy Author Info", None, {
-                    let authors = authors.clone();
-                    move |_, cx| {
-                        cx.write_to_clipboard(ClipboardItem::new_string(authors.join(", ")));
-                    }
-                })
-        })
-    }
-
-    fn show_extension_version_list(
-        &mut self,
-        extension_id: Arc<str>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(workspace) = self.workspace.upgrade() else {
-            return;
-        };
-
-        cx.spawn_in(window, async move |this, cx| {
-            let extension_versions_task = this.update(cx, |_, cx| {
-                let extension_store = ExtensionStore::global(cx);
-
-                extension_store.update(cx, |store, cx| {
-                    store.fetch_extension_versions(&extension_id, cx)
-                })
-            })?;
-
-            let extension_versions = extension_versions_task.await?;
-
-            workspace.update_in(cx, |workspace, window, cx| {
-                let fs = workspace.project().read(cx).fs().clone();
-                workspace.toggle_modal(window, cx, |window, cx| {
-                    let delegate = ExtensionVersionSelectorDelegate::new(
-                        fs,
-                        cx.entity().downgrade(),
-                        extension_versions,
-                    );
-
-                    ExtensionVersionSelector::new(delegate, window, cx)
-                });
-            })?;
-
-            anyhow::Ok(())
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn buttons_for_entry(
-        &self,
-        extension: &ExtensionMetadata,
-        status: &ExtensionStatus,
-        has_dev_extension: bool,
-        cx: &mut Context<Self>,
-    ) -> ExtensionCardButtons {
-        let is_compatible =
-            extension_host::is_version_compatible(ReleaseChannel::global(cx), extension);
-
-        if has_dev_extension {
-            // If we have a dev extension for the given extension, just treat it as uninstalled.
-            // The button here is a placeholder, as it won't be interactable anyways.
-            return ExtensionCardButtons {
-                install_or_uninstall: Button::new(
-                    SharedString::from(extension.id.clone()),
-                    "Install",
-                ),
-                configure: None,
-                upgrade: None,
-            };
-        }
-
-        let is_configurable = extension
-            .manifest
-            .provides
-            .contains(&ExtensionProvides::ContextServers);
-
-        match status.clone() {
-            ExtensionStatus::NotInstalled => ExtensionCardButtons {
-                install_or_uninstall: Button::new(
-                    SharedString::from(extension.id.clone()),
-                    "Install",
-                )
-                .style(ButtonStyle::Tinted(ui::TintColor::Accent))
-                .icon(IconName::Download)
-                .icon_size(IconSize::Small)
-                .icon_color(Color::Muted)
-                .icon_position(IconPosition::Start)
-                .on_click({
-                    let extension_id = extension.id.clone();
-                    move |_, _, cx| {
-                        telemetry::event!("Extension Installed");
-                        ExtensionStore::global(cx).update(cx, |store, cx| {
-                            store.install_latest_extension(extension_id.clone(), cx)
-                        });
-                    }
-                }),
-                configure: None,
-                upgrade: None,
-            },
-            ExtensionStatus::Installing => ExtensionCardButtons {
-                install_or_uninstall: Button::new(
-                    SharedString::from(extension.id.clone()),
-                    "Install",
-                )
-                .style(ButtonStyle::Tinted(ui::TintColor::Accent))
-                .icon(IconName::Download)
-                .icon_size(IconSize::Small)
-                .icon_color(Color::Muted)
-                .icon_position(IconPosition::Start)
-                .disabled(true),
-                configure: None,
-                upgrade: None,
-            },
-            ExtensionStatus::Upgrading => ExtensionCardButtons {
-                install_or_uninstall: Button::new(
-                    SharedString::from(extension.id.clone()),
-                    "Uninstall",
-                )
-                .style(ButtonStyle::OutlinedGhost)
-                .disabled(true),
-                configure: is_configurable.then(|| {
-                    Button::new(
-                        SharedString::from(format!("configure-{}", extension.id)),
-                        "Configure",
-                    )
-                    .disabled(true)
-                }),
-                upgrade: Some(
-                    Button::new(SharedString::from(extension.id.clone()), "Upgrade").disabled(true),
-                ),
-            },
-            ExtensionStatus::Installed(installed_version) => ExtensionCardButtons {
-                install_or_uninstall: Button::new(
-                    SharedString::from(extension.id.clone()),
-                    "Uninstall",
-                )
-                .style(ButtonStyle::OutlinedGhost)
-                .on_click({
-                    let extension_id = extension.id.clone();
-                    move |_, _, cx| {
-                        telemetry::event!("Extension Uninstalled", extension_id);
-                        ExtensionStore::global(cx).update(cx, |store, cx| {
-                            store
-                                .uninstall_extension(extension_id.clone(), cx)
-                                .detach_and_log_err(cx);
-                        });
-                    }
-                }),
-                configure: is_configurable.then(|| {
-                    Button::new(
-                        SharedString::from(format!("configure-{}", extension.id)),
-                        "Configure",
-                    )
-                    .style(ButtonStyle::OutlinedGhost)
-                    .on_click({
-                        let extension_id = extension.id.clone();
-                        move |_, _, cx| {
-                            if let Some(manifest) = ExtensionStore::global(cx)
-                                .read(cx)
-                                .extension_manifest_for_id(&extension_id)
-                                .cloned()
-                                && let Some(events) = extension::ExtensionEvents::try_global(cx)
-                            {
-                                events.update(cx, |this, cx| {
-                                    this.emit(
-                                        extension::Event::ConfigureExtensionRequested(manifest),
-                                        cx,
-                                    )
-                                });
-                            }
-                        }
-                    })
-                }),
-                upgrade: if installed_version == extension.manifest.version {
-                    None
-                } else {
-                    Some(
-                        Button::new(SharedString::from(extension.id.clone()), "Upgrade")
-                          .style(ButtonStyle::Tinted(ui::TintColor::Accent))
-                            .when(!is_compatible, |upgrade_button| {
-                                upgrade_button.disabled(true).tooltip({
-                                    let version = extension.manifest.version.clone();
-                                    move |_, cx| {
-                                        Tooltip::simple(
-                                            format!(
-                                                "v{version} is not compatible with this version of Zed.",
-                                            ),
-                                             cx,
-                                        )
-                                    }
-                                })
-                            })
-                            .disabled(!is_compatible)
-                            .on_click({
-                                let extension_id = extension.id.clone();
-                                let version = extension.manifest.version.clone();
-                                move |_, _, cx| {
-                                    telemetry::event!("Extension Installed", extension_id, version);
-                                    ExtensionStore::global(cx).update(cx, |store, cx| {
-                                        store
-                                            .upgrade_extension(
-                                                extension_id.clone(),
-                                                version.clone(),
-                                                cx,
-                                            )
-                                            .detach_and_log_err(cx)
-                                    });
-                                }
-                            }),
-                    )
-                },
-            },
-            ExtensionStatus::Removing => ExtensionCardButtons {
-                install_or_uninstall: Button::new(
-                    SharedString::from(extension.id.clone()),
-                    "Uninstall",
-                )
-                .style(ButtonStyle::OutlinedGhost)
-                .disabled(true),
-                configure: is_configurable.then(|| {
-                    Button::new(
-                        SharedString::from(format!("configure-{}", extension.id)),
-                        "Configure",
-                    )
-                    .disabled(true)
-                }),
-                upgrade: None,
-            },
-        }
-    }
-
-    fn render_search(&self, cx: &mut Context<Self>) -> Div {
-        let mut key_context = KeyContext::new_with_defaults();
-        key_context.add("BufferSearchBar");
-
-        let editor_border = if self.query_contains_error {
-            Color::Error.color(cx)
-        } else {
-            cx.theme().colors().border
-        };
-
-        h_flex()
-            .key_context(key_context)
-            .h_8()
-            .min_w(rems_from_px(384.))
-            .flex_1()
-            .pl_1p5()
-            .pr_2()
-            .gap_2()
-            .border_1()
-            .border_color(editor_border)
-            .rounded_md()
-            .child(Icon::new(IconName::MagnifyingGlass).color(Color::Muted))
-            .child(self.render_text_input(&self.query_editor, cx))
-    }
-
-    fn render_text_input(
-        &self,
-        editor: &Entity<Editor>,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let settings = ThemeSettings::get_global(cx);
-        let text_style = TextStyle {
-            color: if editor.read(cx).read_only(cx) {
-                cx.theme().colors().text_disabled
-            } else {
-                cx.theme().colors().text
-            },
-            font_family: settings.ui_font.family.clone(),
-            font_features: settings.ui_font.features.clone(),
-            font_fallbacks: settings.ui_font.fallbacks.clone(),
-            font_size: rems(0.875).into(),
-            font_weight: settings.ui_font.weight,
-            line_height: relative(1.3),
-            ..Default::default()
-        };
-
-        EditorElement::new(
-            editor,
-            EditorStyle {
-                background: cx.theme().colors().editor_background,
-                local_player: cx.theme().players().local(),
-                text: text_style,
-                ..Default::default()
-            },
-        )
-    }
-
-    fn on_query_change(
-        &mut self,
-        _: Entity<Editor>,
-        event: &editor::EditorEvent,
-        cx: &mut Context<Self>,
-    ) {
-        if let editor::EditorEvent::Edited { .. } = event {
-            self.query_contains_error = false;
-            self.refresh_search(cx);
-        }
-    }
-
-    fn refresh_search(&mut self, cx: &mut Context<Self>) {
-        self.fetch_extensions_debounced(
-            Some(Box::new(|this, cx| {
-                this.scroll_to_top(cx);
-            })),
-            cx,
-        );
-        self.refresh_feature_upsells(cx);
-    }
-
-    pub fn focus_extension(&mut self, id: &str, window: &mut Window, cx: &mut Context<Self>) {
-        self.query_editor.update(cx, |editor, cx| {
-            editor.set_text(format!("id:{id}"), window, cx)
-        });
-        self.refresh_search(cx);
-    }
-
-    pub fn change_provides_filter(
-        &mut self,
-        provides_filter: Option<ExtensionProvides>,
-        cx: &mut Context<Self>,
-    ) {
-        self.provides_filter = provides_filter;
-        self.refresh_search(cx);
-    }
-
-    fn fetch_extensions_debounced(
-        &mut self,
-        on_complete: Option<Box<dyn FnOnce(&mut Self, &mut Context<Self>) + Send>>,
-        cx: &mut Context<ExtensionsPage>,
-    ) {
-        self.extension_fetch_task = Some(cx.spawn(async move |this, cx| {
-            let search = this
-                .update(cx, |this, cx| this.search_query(cx))
-                .ok()
-                .flatten();
-
-            // Only debounce the fetching of extensions if we have a search
-            // query.
-            //
-            // If the search was just cleared then we can just reload the list
-            // of extensions without a debounce, which allows us to avoid seeing
-            // an intermittent flash of a "no extensions" state.
-            if search.is_some() {
-                cx.background_executor()
-                    .timer(Duration::from_millis(250))
-                    .await;
-            };
-
-            this.update(cx, |this, cx| {
-                this.fetch_extensions(
-                    search,
-                    Some(BTreeSet::from_iter(this.provides_filter)),
-                    on_complete,
-                    cx,
-                );
-            })
-            .ok();
-        }));
-    }
-
-    pub fn search_query(&self, cx: &mut App) -> Option<String> {
-        let search = self.query_editor.read(cx).text(cx);
-        if search.trim().is_empty() {
-            None
-        } else {
-            Some(search)
-        }
-    }
-
-    fn render_empty_state(&self, cx: &mut Context<Self>) -> impl IntoElement {
-        let has_search = self.search_query(cx).is_some();
-
-        let message = if self.is_fetching_extensions {
-            "Loading extensions…"
-        } else if self.fetch_failed {
-            "Failed to load extensions. Please check your connection and try again."
-        } else {
-            match self.filter {
-                ExtensionFilter::All => {
-                    if has_search {
-                        "No extensions that match your search."
-                    } else {
-                        "No extensions."
-                    }
-                }
-                ExtensionFilter::Installed => {
-                    if has_search {
-                        "No installed extensions that match your search."
-                    } else {
-                        "No installed extensions."
-                    }
-                }
-                ExtensionFilter::NotInstalled => {
-                    if has_search {
-                        "No not installed extensions that match your search."
-                    } else {
-                        "No not installed extensions."
-                    }
-                }
-            }
-        };
-
-        h_flex()
-            .py_4()
-            .gap_1p5()
-            .when(self.fetch_failed, |this| {
-                this.child(
-                    Icon::new(IconName::Warning)
-                        .size(IconSize::Small)
-                        .color(Color::Warning),
-                )
-            })
-            .child(Label::new(message))
-    }
-
-    fn update_settings(
-        &mut self,
-        selection: &ToggleState,
-
-        cx: &mut Context<Self>,
-        callback: impl 'static + Send + Fn(&mut SettingsContent, bool),
-    ) {
-        if let Some(workspace) = self.workspace.upgrade() {
-            let fs = workspace.read(cx).app_state().fs.clone();
-            let selection = *selection;
-            settings::update_settings_file(fs, cx, move |settings, _| {
-                let value = match selection {
-                    ToggleState::Unselected => false,
-                    ToggleState::Selected => true,
-                    _ => return,
-                };
-
-                callback(settings, value)
-            });
-        }
-    }
-
-    fn refresh_feature_upsells(&mut self, cx: &mut Context<Self>) {
-        let Some(search) = self.search_query(cx) else {
-            self.upsells.clear();
-            return;
-        };
-
-        if let Some(id) = search.strip_prefix("id:") {
-            self.upsells.clear();
-
-            let upsell = match id.to_lowercase().as_str() {
-                "ruff" => Some(Feature::ExtensionRuff),
-                "basedpyright" => Some(Feature::ExtensionBasedpyright),
-                "ty" => Some(Feature::ExtensionTy),
-                _ => None,
-            };
-
-            if let Some(upsell) = upsell {
-                self.upsells.insert(upsell);
-            }
-
-            return;
-        }
-
-        let search = search.to_lowercase();
-        let search_terms = search
-            .split_whitespace()
-            .map(|term| term.trim())
-            .collect::<Vec<_>>();
-
-        for (feature, keywords) in keywords_by_feature() {
-            if keywords
-                .iter()
-                .any(|keyword| search_terms.contains(keyword))
-            {
-                self.upsells.insert(*feature);
-            } else {
-                self.upsells.remove(feature);
-            }
-        }
-    }
-
-    fn render_feature_upsell_banner(
-        &self,
-        label: SharedString,
-        docs_url: SharedString,
-        vim: bool,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let docs_url_button = Button::new("open_docs", "View Documentation")
-            .icon(IconName::ArrowUpRight)
-            .icon_size(IconSize::Small)
-            .icon_position(IconPosition::End)
-            .on_click({
-                move |_event, _window, cx| {
-                    telemetry::event!(
-                        "Documentation Viewed",
-                        source = "Feature Upsell",
-                        url = docs_url,
-                    );
-                    cx.open_url(&docs_url)
-                }
-            });
-
-        div()
-            .pt_4()
-            .px_4()
-            .child(
-                Banner::new()
-                    .severity(Severity::Success)
-                    .child(Label::new(label).mt_0p5())
-                    .map(|this| {
-                        if vim {
-                            this.action_slot(
-                                h_flex()
-                                    .gap_1()
-                                    .child(docs_url_button)
-                                    .child(Divider::vertical().color(ui::DividerColor::Border))
-                                    .child(
-                                        h_flex()
-                                            .pl_1()
-                                            .gap_1()
-                                            .child(Label::new("Enable Vim mode"))
-                                            .child(
-                                                Switch::new(
-                                                    "enable-vim",
-                                                    if VimModeSetting::get_global(cx).0 {
-                                                        ui::ToggleState::Selected
-                                                    } else {
-                                                        ui::ToggleState::Unselected
-                                                    },
-                                                )
-                                                .on_click(cx.listener(
-                                                    move |this, selection, _, cx| {
-                                                        telemetry::event!(
-                                                            "Vim Mode Toggled",
-                                                            source = "Feature Upsell"
-                                                        );
-                                                        this.update_settings(
-                                                            selection,
-                                                            cx,
-                                                            |setting, value| {
-                                                                setting.vim_mode = Some(value)
-                                                            },
-                                                        );
-                                                    },
-                                                )),
-                                            ),
-                                    ),
-                            )
-                        } else {
-                            this.action_slot(docs_url_button)
-                        }
-                    }),
-            )
-            .into_any_element()
-    }
-
-    fn render_feature_upsells(&self, cx: &mut Context<Self>) -> impl IntoElement {
-        let mut container = v_flex();
-
-        for feature in &self.upsells {
-            let banner = match feature {
-                Feature::AgentClaude => self.render_feature_upsell_banner(
-                    "Claude Code support is built-in to Zed!".into(),
-                    "https://zed.dev/docs/ai/external-agents#claude-code".into(),
-                    false,
-                    cx,
-                ),
-                Feature::AgentCodex => self.render_feature_upsell_banner(
-                    "Codex CLI support is built-in to Zed!".into(),
-                    "https://zed.dev/docs/ai/external-agents#codex-cli".into(),
-                    false,
-                    cx,
-                ),
-                Feature::AgentGemini => self.render_feature_upsell_banner(
-                    "Gemini CLI support is built-in to Zed!".into(),
-                    "https://zed.dev/docs/ai/external-agents#gemini-cli".into(),
-                    false,
-                    cx,
-                ),
-                Feature::ExtensionBasedpyright => self.render_feature_upsell_banner(
-                    "Basedpyright (Python language server) support is built-in to Zed!".into(),
-                    "https://zed.dev/docs/languages/python#basedpyright".into(),
-                    false,
-                    cx,
-                ),
-                Feature::ExtensionRuff => self.render_feature_upsell_banner(
-                    "Ruff (linter for Python) support is built-in to Zed!".into(),
-                    "https://zed.dev/docs/languages/python#code-formatting--linting".into(),
-                    false,
-                    cx,
-                ),
-                Feature::ExtensionTailwind => self.render_feature_upsell_banner(
-                    "Tailwind CSS support is built-in to Zed!".into(),
-                    "https://zed.dev/docs/languages/tailwindcss".into(),
-                    false,
-                    cx,
-                ),
-                Feature::ExtensionTy => self.render_feature_upsell_banner(
-                    "Ty (Python language server) support is built-in to Zed!".into(),
-                    "https://zed.dev/docs/languages/python".into(),
-                    false,
-                    cx,
-                ),
-                Feature::Git => self.render_feature_upsell_banner(
-                    "Zed comes with basic Git support—more features are coming in the future."
-                        .into(),
-                    "https://zed.dev/docs/git".into(),
-                    false,
-                    cx,
-                ),
-                Feature::LanguageBash => self.render_feature_upsell_banner(
-                    "Shell support is built-in to Zed!".into(),
-                    "https://zed.dev/docs/languages/bash".into(),
-                    false,
-                    cx,
-                ),
-                Feature::LanguageC => self.render_feature_upsell_banner(
-                    "C support is built-in to Zed!".into(),
-                    "https://zed.dev/docs/languages/c".into(),
-                    false,
-                    cx,
-                ),
-                Feature::LanguageCpp => self.render_feature_upsell_banner(
-                    "C++ support is built-in to Zed!".into(),
-                    "https://zed.dev/docs/languages/cpp".into(),
-                    false,
-                    cx,
-                ),
-                Feature::LanguageGo => self.render_feature_upsell_banner(
-                    "Go support is built-in to Zed!".into(),
-                    "https://zed.dev/docs/languages/go".into(),
-                    false,
-                    cx,
-                ),
-                Feature::LanguagePython => self.render_feature_upsell_banner(
-                    "Python support is built-in to Zed!".into(),
-                    "https://zed.dev/docs/languages/python".into(),
-                    false,
-                    cx,
-                ),
-                Feature::LanguageReact => self.render_feature_upsell_banner(
-                    "React support is built-in to Zed!".into(),
-                    "https://zed.dev/docs/languages/typescript".into(),
-                    false,
-                    cx,
-                ),
-                Feature::LanguageRust => self.render_feature_upsell_banner(
-                    "Rust support is built-in to Zed!".into(),
-                    "https://zed.dev/docs/languages/rust".into(),
-                    false,
-                    cx,
-                ),
-                Feature::LanguageTypescript => self.render_feature_upsell_banner(
-                    "Typescript support is built-in to Zed!".into(),
-                    "https://zed.dev/docs/languages/typescript".into(),
-                    false,
-                    cx,
-                ),
-                Feature::OpenIn => self.render_feature_upsell_banner(
-                    "Zed supports linking to a source line on GitHub and others.".into(),
-                    "https://zed.dev/docs/git#git-integrations".into(),
-                    false,
-                    cx,
-                ),
-                Feature::Vim => self.render_feature_upsell_banner(
-                    "Vim support is built-in to Zed!".into(),
-                    "https://zed.dev/docs/vim".into(),
-                    true,
-                    cx,
-                ),
-            };
-            container = container.child(banner);
-        }
-
-        container
-    }
-}
-
-impl Render for ExtensionsPage {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .size_full()
-            .bg(cx.theme().colors().editor_background)
-            .child(
-                v_flex()
-                    .gap_4()
-                    .pt_4()
-                    .px_4()
-                    .bg(cx.theme().colors().editor_background)
-                    .child(
-                        h_flex()
-                            .w_full()
-                            .gap_1p5()
-                            .justify_between()
-                            .child(Headline::new("Extensions").size(HeadlineSize::XLarge))
-                            .child(
-                                Button::new("install-dev-extension", "Install Dev Extension")
-                                    .style(ButtonStyle::Outlined)
-                                    .size(ButtonSize::Medium)
-                                    .on_click(|_event, window, cx| {
-                                        window.dispatch_action(Box::new(InstallDevExtension), cx)
-                                    }),
-                            ),
-                    )
-                    .child(
-                        h_flex()
-                            .w_full()
-                            .flex_wrap()
-                            .gap_2()
-                            .child(self.render_search(cx))
-                            .child(
-                                div().child(
-                                    ToggleButtonGroup::single_row(
-                                        "filter-buttons",
-                                        [
-                                            ToggleButtonSimple::new(
-                                                "All",
-                                                cx.listener(|this, _event, _, cx| {
-                                                    this.filter = ExtensionFilter::All;
-                                                    this.filter_extension_entries(cx);
-                                                    this.scroll_to_top(cx);
-                                                }),
-                                            ),
-                                            ToggleButtonSimple::new(
-                                                "Installed",
-                                                cx.listener(|this, _event, _, cx| {
-                                                    this.filter = ExtensionFilter::Installed;
-                                                    this.filter_extension_entries(cx);
-                                                    this.scroll_to_top(cx);
-                                                }),
-                                            ),
-                                            ToggleButtonSimple::new(
-                                                "Not Installed",
-                                                cx.listener(|this, _event, _, cx| {
-                                                    this.filter = ExtensionFilter::NotInstalled;
-                                                    this.filter_extension_entries(cx);
-                                                    this.scroll_to_top(cx);
-                                                }),
-                                            ),
-                                        ],
-                                    )
-                                    .style(ToggleButtonGroupStyle::Outlined)
-                                    .size(ToggleButtonGroupSize::Custom(rems_from_px(30.))) // Perfectly matches the input
-                                    .label_size(LabelSize::Default)
-                                    .auto_width()
-                                    .selected_index(match self.filter {
-                                        ExtensionFilter::All => 0,
-                                        ExtensionFilter::Installed => 1,
-                                        ExtensionFilter::NotInstalled => 2,
-                                    })
-                                    .into_any_element(),
-                                ),
-                            ),
-                    ),
-            )
-            .child(
-                h_flex()
-                    .id("filter-row")
-                    .gap_2()
-                    .py_2p5()
-                    .px_4()
-                    .border_b_1()
-                    .border_color(cx.theme().colors().border_variant)
-                    .overflow_x_scroll()
-                    .child(
-                        Button::new("filter-all-categories", "All")
-                            .when(self.provides_filter.is_none(), |button| {
-                                button.style(ButtonStyle::Filled)
-                            })
-                            .when(self.provides_filter.is_some(), |button| {
-                                button.style(ButtonStyle::Subtle)
-                            })
-                            .toggle_state(self.provides_filter.is_none())
-                            .on_click(cx.listener(|this, _event, _, cx| {
-                                this.change_provides_filter(None, cx);
-                            })),
-                    )
-                    .children(ExtensionProvides::iter().filter_map(|provides| {
-                        match provides {
-                            ExtensionProvides::SlashCommands
-                            | ExtensionProvides::IndexedDocsProviders => return None,
-                            _ => {}
-                        }
-
-                        let label = extension_provides_label(provides);
-                        let button_id = SharedString::from(format!("filter-category-{}", label));
-
-                        Some(
-                            Button::new(button_id, label)
-                                .style(if self.provides_filter == Some(provides) {
-                                    ButtonStyle::Filled
-                                } else {
-                                    ButtonStyle::Subtle
-                                })
-                                .toggle_state(self.provides_filter == Some(provides))
-                                .on_click({
-                                    cx.listener(move |this, _event, _, cx| {
-                                        this.change_provides_filter(Some(provides), cx);
-                                    })
-                                }),
-                        )
-                    })),
-            )
-            .child(self.render_feature_upsells(cx))
-            .child(v_flex().px_4().size_full().overflow_y_hidden().map(|this| {
-                let mut count = self.filtered_remote_extension_indices.len();
-                if self.filter.include_dev_extensions() {
-                    count += self.dev_extension_entries.len();
-                }
-
-                if count == 0 {
-                    this.child(self.render_empty_state(cx)).into_any_element()
-                } else {
-                    let scroll_handle = &self.list;
-                    this.child(
-                        uniform_list("entries", count, cx.processor(Self::render_extensions))
-                            .flex_grow()
-                            .pb_4()
-                            .track_scroll(scroll_handle),
-                    )
-                    .vertical_scrollbar_for(scroll_handle, window, cx)
-                    .into_any_element()
-                }
-            }))
-    }
-}
-
-impl EventEmitter<ItemEvent> for ExtensionsPage {}
-
-impl Focusable for ExtensionsPage {
-    fn focus_handle(&self, cx: &App) -> gpui::FocusHandle {
-        self.query_editor.read(cx).focus_handle(cx)
-    }
-}
-
-impl Item for ExtensionsPage {
-    type Event = ItemEvent;
-
-    fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString {
-        "Extensions".into()
-    }
-
-    fn telemetry_event_text(&self) -> Option<&'static str> {
-        Some("Extensions Page Opened")
-    }
-
-    fn show_toolbar(&self) -> bool {
-        false
-    }
-
-    fn to_item_events(event: &Self::Event, mut f: impl FnMut(workspace::item::ItemEvent)) {
-        f(*event)
-    }
-}
diff --git a/crates/feature_flags/Cargo.toml b/crates/feature_flags/Cargo.toml
deleted file mode 100644
index 65d6942d50..0000000000
--- a/crates/feature_flags/Cargo.toml
+++ /dev/null
@@ -1,17 +0,0 @@
-[package]
-name = "feature_flags"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/feature_flags.rs"
-
-[dependencies]
-futures.workspace = true
-gpui.workspace = true
-smol.workspace = true
diff --git a/crates/feature_flags/LICENSE-GPL b/crates/feature_flags/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/feature_flags/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/feature_flags/src/feature_flags.rs b/crates/feature_flags/src/feature_flags.rs
deleted file mode 100644
index 1b66b291b5..0000000000
--- a/crates/feature_flags/src/feature_flags.rs
+++ /dev/null
@@ -1,245 +0,0 @@
-mod flags;
-
-use std::cell::RefCell;
-use std::rc::Rc;
-use std::sync::LazyLock;
-use std::time::Duration;
-use std::{future::Future, pin::Pin, task::Poll};
-
-use futures::channel::oneshot;
-use futures::{FutureExt, select_biased};
-use gpui::{App, Context, Global, Subscription, Task, Window};
-
-pub use flags::*;
-
-#[derive(Default)]
-struct FeatureFlags {
-    flags: Vec<String>,
-    staff: bool,
-}
-
-pub static ZED_DISABLE_STAFF: LazyLock<bool> = LazyLock::new(|| {
-    std::env::var("ZED_DISABLE_STAFF").is_ok_and(|value| !value.is_empty() && value != "0")
-});
-
-impl FeatureFlags {
-    fn has_flag<T: FeatureFlag>(&self) -> bool {
-        if T::enabled_for_all() {
-            return true;
-        }
-
-        if (cfg!(debug_assertions) || self.staff) && !*ZED_DISABLE_STAFF && T::enabled_for_staff() {
-            return true;
-        }
-
-        self.flags.iter().any(|f| f.as_str() == T::NAME)
-    }
-}
-
-impl Global for FeatureFlags {}
-
-/// To create a feature flag, implement this trait on a trivial type and use it as
-/// a generic parameter when called [`FeatureFlagAppExt::has_flag`].
-///
-/// Feature flags are enabled for members of Zed staff by default. To disable this behavior
-/// so you can test flags being disabled, set ZED_DISABLE_STAFF=1 in your environment,
-/// which will force Zed to treat the current user as non-staff.
-pub trait FeatureFlag {
-    const NAME: &'static str;
-
-    /// Returns whether this feature flag is enabled for Zed staff.
-    fn enabled_for_staff() -> bool {
-        true
-    }
-
-    /// Returns whether this feature flag is enabled for everyone.
-    ///
-    /// This is generally done on the server, but we provide this as a way to entirely enable a feature flag client-side
-    /// without needing to remove all of the call sites.
-    fn enabled_for_all() -> bool {
-        false
-    }
-}
-
-pub trait FeatureFlagViewExt<V: 'static> {
-    fn observe_flag<T: FeatureFlag, F>(&mut self, window: &Window, callback: F) -> Subscription
-    where
-        F: Fn(bool, &mut V, &mut Window, &mut Context<V>) + Send + Sync + 'static;
-
-    fn when_flag_enabled<T: FeatureFlag>(
-        &mut self,
-        window: &mut Window,
-        callback: impl Fn(&mut V, &mut Window, &mut Context<V>) + Send + Sync + 'static,
-    );
-}
-
-impl<V> FeatureFlagViewExt<V> for Context<'_, V>
-where
-    V: 'static,
-{
-    fn observe_flag<T: FeatureFlag, F>(&mut self, window: &Window, callback: F) -> Subscription
-    where
-        F: Fn(bool, &mut V, &mut Window, &mut Context<V>) + 'static,
-    {
-        self.observe_global_in::<FeatureFlags>(window, move |v, window, cx| {
-            let feature_flags = cx.global::<FeatureFlags>();
-            callback(feature_flags.has_flag::<T>(), v, window, cx);
-        })
-    }
-
-    fn when_flag_enabled<T: FeatureFlag>(
-        &mut self,
-        window: &mut Window,
-        callback: impl Fn(&mut V, &mut Window, &mut Context<V>) + Send + Sync + 'static,
-    ) {
-        if self
-            .try_global::<FeatureFlags>()
-            .is_some_and(|f| f.has_flag::<T>())
-        {
-            self.defer_in(window, move |view, window, cx| {
-                callback(view, window, cx);
-            });
-            return;
-        }
-        let subscription = Rc::new(RefCell::new(None));
-        let inner = self.observe_global_in::<FeatureFlags>(window, {
-            let subscription = subscription.clone();
-            move |v, window, cx| {
-                let feature_flags = cx.global::<FeatureFlags>();
-                if feature_flags.has_flag::<T>() {
-                    callback(v, window, cx);
-                    subscription.take();
-                }
-            }
-        });
-        subscription.borrow_mut().replace(inner);
-    }
-}
-
-#[derive(Debug)]
-pub struct OnFlagsReady {
-    pub is_staff: bool,
-}
-
-pub trait FeatureFlagAppExt {
-    fn wait_for_flag<T: FeatureFlag>(&mut self) -> WaitForFlag;
-
-    /// Waits for the specified feature flag to resolve, up to the given timeout.
-    fn wait_for_flag_or_timeout<T: FeatureFlag>(&mut self, timeout: Duration) -> Task<bool>;
-
-    fn update_flags(&mut self, staff: bool, flags: Vec<String>);
-    fn set_staff(&mut self, staff: bool);
-    fn has_flag<T: FeatureFlag>(&self) -> bool;
-    fn is_staff(&self) -> bool;
-
-    fn on_flags_ready<F>(&mut self, callback: F) -> Subscription
-    where
-        F: FnMut(OnFlagsReady, &mut App) + 'static;
-
-    fn observe_flag<T: FeatureFlag, F>(&mut self, callback: F) -> Subscription
-    where
-        F: FnMut(bool, &mut App) + 'static;
-}
-
-impl FeatureFlagAppExt for App {
-    fn update_flags(&mut self, staff: bool, flags: Vec<String>) {
-        let feature_flags = self.default_global::<FeatureFlags>();
-        feature_flags.staff = staff;
-        feature_flags.flags = flags;
-    }
-
-    fn set_staff(&mut self, staff: bool) {
-        let feature_flags = self.default_global::<FeatureFlags>();
-        feature_flags.staff = staff;
-    }
-
-    fn has_flag<T: FeatureFlag>(&self) -> bool {
-        self.try_global::<FeatureFlags>()
-            .map(|flags| flags.has_flag::<T>())
-            .unwrap_or_else(|| {
-                (cfg!(debug_assertions) && T::enabled_for_staff() && !*ZED_DISABLE_STAFF)
-                    || T::enabled_for_all()
-            })
-    }
-
-    fn is_staff(&self) -> bool {
-        self.try_global::<FeatureFlags>()
-            .map(|flags| flags.staff)
-            .unwrap_or(false)
-    }
-
-    fn on_flags_ready<F>(&mut self, mut callback: F) -> Subscription
-    where
-        F: FnMut(OnFlagsReady, &mut App) + 'static,
-    {
-        self.observe_global::<FeatureFlags>(move |cx| {
-            let feature_flags = cx.global::<FeatureFlags>();
-            callback(
-                OnFlagsReady {
-                    is_staff: feature_flags.staff,
-                },
-                cx,
-            );
-        })
-    }
-
-    fn observe_flag<T: FeatureFlag, F>(&mut self, mut callback: F) -> Subscription
-    where
-        F: FnMut(bool, &mut App) + 'static,
-    {
-        self.observe_global::<FeatureFlags>(move |cx| {
-            let feature_flags = cx.global::<FeatureFlags>();
-            callback(feature_flags.has_flag::<T>(), cx);
-        })
-    }
-
-    fn wait_for_flag<T: FeatureFlag>(&mut self) -> WaitForFlag {
-        let (tx, rx) = oneshot::channel::<bool>();
-        let mut tx = Some(tx);
-        let subscription: Option<Subscription>;
-
-        match self.try_global::<FeatureFlags>() {
-            Some(feature_flags) => {
-                subscription = None;
-                tx.take().unwrap().send(feature_flags.has_flag::<T>()).ok();
-            }
-            None => {
-                subscription = Some(self.observe_global::<FeatureFlags>(move |cx| {
-                    let feature_flags = cx.global::<FeatureFlags>();
-                    if let Some(tx) = tx.take() {
-                        tx.send(feature_flags.has_flag::<T>()).ok();
-                    }
-                }));
-            }
-        }
-
-        WaitForFlag(rx, subscription)
-    }
-
-    fn wait_for_flag_or_timeout<T: FeatureFlag>(&mut self, timeout: Duration) -> Task<bool> {
-        let wait_for_flag = self.wait_for_flag::<T>();
-
-        self.spawn(async move |_cx| {
-            let mut wait_for_flag = wait_for_flag.fuse();
-            let mut timeout = FutureExt::fuse(smol::Timer::after(timeout));
-
-            select_biased! {
-                is_enabled = wait_for_flag => is_enabled,
-                _ = timeout => false,
-            }
-        })
-    }
-}
-
-pub struct WaitForFlag(oneshot::Receiver<bool>, Option<Subscription>);
-
-impl Future for WaitForFlag {
-    type Output = bool;
-
-    fn poll(mut self: Pin<&mut Self>, cx: &mut core::task::Context<'_>) -> Poll<Self::Output> {
-        self.0.poll_unpin(cx).map(|result| {
-            self.1.take();
-            result.unwrap_or(false)
-        })
-    }
-}
diff --git a/crates/feature_flags/src/flags.rs b/crates/feature_flags/src/flags.rs
deleted file mode 100644
index 61d9a34e38..0000000000
--- a/crates/feature_flags/src/flags.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-use crate::FeatureFlag;
-
-pub struct NotebookFeatureFlag;
-
-impl FeatureFlag for NotebookFeatureFlag {
-    const NAME: &'static str = "notebooks";
-}
-
-pub struct PanicFeatureFlag;
-
-impl FeatureFlag for PanicFeatureFlag {
-    const NAME: &'static str = "panic";
-}
-
-pub struct InlineAssistantV2FeatureFlag;
-
-impl FeatureFlag for InlineAssistantV2FeatureFlag {
-    const NAME: &'static str = "inline-assistant-v2";
-
-    fn enabled_for_staff() -> bool {
-        false
-    }
-}
diff --git a/crates/feedback/Cargo.toml b/crates/feedback/Cargo.toml
deleted file mode 100644
index 0a53a1b6f3..0000000000
--- a/crates/feedback/Cargo.toml
+++ /dev/null
@@ -1,26 +0,0 @@
-[package]
-name = "feedback"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/feedback.rs"
-
-[features]
-test-support = []
-
-[dependencies]
-gpui.workspace = true
-system_specs.workspace = true
-urlencoding.workspace = true
-util.workspace = true
-workspace.workspace = true
-zed_actions.workspace = true
-
-[dev-dependencies]
-editor = { workspace = true, features = ["test-support"] }
diff --git a/crates/feedback/LICENSE-GPL b/crates/feedback/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/feedback/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/feedback/src/feedback.rs b/crates/feedback/src/feedback.rs
deleted file mode 100644
index 57bddb6ae7..0000000000
--- a/crates/feedback/src/feedback.rs
+++ /dev/null
@@ -1,98 +0,0 @@
-use gpui::{App, ClipboardItem, PromptLevel, actions};
-use system_specs::{CopySystemSpecsIntoClipboard, SystemSpecs};
-use util::ResultExt;
-use workspace::Workspace;
-use zed_actions::feedback::{EmailZed, FileBugReport, RequestFeature};
-
-actions!(
-    zed,
-    [
-        /// Opens the Zed repository on GitHub.
-        OpenZedRepo,
-    ]
-);
-
-const ZED_REPO_URL: &str = "https://github.com/zed-industries/zed";
-
-const REQUEST_FEATURE_URL: &str = "https://github.com/zed-industries/zed/discussions/new/choose";
-
-fn file_bug_report_url(specs: &SystemSpecs) -> String {
-    format!(
-        concat!(
-            "https://github.com/zed-industries/zed/issues/new",
-            "?",
-            "template=10_bug_report.yml",
-            "&",
-            "environment={}"
-        ),
-        urlencoding::encode(&specs.to_string())
-    )
-}
-
-fn email_zed_url(specs: &SystemSpecs) -> String {
-    format!(
-        concat!("mailto:hi@zed.dev", "?", "body={}"),
-        email_body(specs)
-    )
-}
-
-fn email_body(specs: &SystemSpecs) -> String {
-    let body = format!("\n\nSystem Information:\n\n{}", specs);
-    urlencoding::encode(&body).to_string()
-}
-
-pub fn init(cx: &mut App) {
-    cx.observe_new(|workspace: &mut Workspace, _, _| {
-        workspace
-            .register_action(|_, _: &CopySystemSpecsIntoClipboard, window, cx| {
-                let specs = SystemSpecs::new(window, cx);
-
-                cx.spawn_in(window, async move |_, cx| {
-                    let specs = specs.await.to_string();
-
-                    cx.update(|_, cx| {
-                        cx.write_to_clipboard(ClipboardItem::new_string(specs.clone()))
-                    })
-                    .log_err();
-
-                    cx.prompt(
-                        PromptLevel::Info,
-                        "Copied into clipboard",
-                        Some(&specs),
-                        &["OK"],
-                    )
-                    .await
-                })
-                .detach();
-            })
-            .register_action(|_, _: &RequestFeature, _, cx| {
-                cx.open_url(REQUEST_FEATURE_URL);
-            })
-            .register_action(move |_, _: &FileBugReport, window, cx| {
-                let specs = SystemSpecs::new(window, cx);
-                cx.spawn_in(window, async move |_, cx| {
-                    let specs = specs.await;
-                    cx.update(|_, cx| {
-                        cx.open_url(&file_bug_report_url(&specs));
-                    })
-                    .log_err();
-                })
-                .detach();
-            })
-            .register_action(move |_, _: &EmailZed, window, cx| {
-                let specs = SystemSpecs::new(window, cx);
-                cx.spawn_in(window, async move |_, cx| {
-                    let specs = specs.await;
-                    cx.update(|_, cx| {
-                        cx.open_url(&email_zed_url(&specs));
-                    })
-                    .log_err();
-                })
-                .detach();
-            })
-            .register_action(move |_, _: &OpenZedRepo, _, cx| {
-                cx.open_url(ZED_REPO_URL);
-            });
-    })
-    .detach();
-}
diff --git a/crates/file_finder/Cargo.toml b/crates/file_finder/Cargo.toml
deleted file mode 100644
index 46257b1f49..0000000000
--- a/crates/file_finder/Cargo.toml
+++ /dev/null
@@ -1,46 +0,0 @@
-[package]
-name = "file_finder"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/file_finder.rs"
-doctest = false
-
-[dependencies]
-anyhow.workspace = true
-collections.workspace = true
-editor.workspace = true
-file_icons.workspace = true
-futures.workspace = true
-fuzzy.workspace = true
-gpui.workspace = true
-menu.workspace = true
-picker.workspace = true
-project.workspace = true
-schemars.workspace = true
-search.workspace = true
-settings.workspace = true
-serde.workspace = true
-text.workspace = true
-theme.workspace = true
-ui.workspace = true
-util.workspace = true
-workspace.workspace = true
-
-[dev-dependencies]
-ctor.workspace = true
-editor = { workspace = true, features = ["test-support"] }
-gpui = { workspace = true, features = ["test-support"] }
-language = { workspace = true, features = ["test-support"] }
-picker = { workspace = true, features = ["test-support"] }
-pretty_assertions.workspace = true
-serde_json.workspace = true
-theme = { workspace = true, features = ["test-support"] }
-workspace = { workspace = true, features = ["test-support"] }
-zlog.workspace = true
diff --git a/crates/file_finder/LICENSE-GPL b/crates/file_finder/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/file_finder/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/file_finder/src/file_finder.rs b/crates/file_finder/src/file_finder.rs
deleted file mode 100644
index 050d7a45a1..0000000000
--- a/crates/file_finder/src/file_finder.rs
+++ /dev/null
@@ -1,1911 +0,0 @@
-#[cfg(test)]
-mod file_finder_tests;
-#[cfg(test)]
-mod open_path_prompt_tests;
-
-pub mod file_finder_settings;
-mod open_path_prompt;
-
-use futures::future::join_all;
-pub use open_path_prompt::OpenPathDelegate;
-
-use collections::HashMap;
-use editor::Editor;
-use file_finder_settings::{FileFinderSettings, FileFinderWidth};
-use file_icons::FileIcons;
-use fuzzy::{CharBag, PathMatch, PathMatchCandidate};
-use gpui::{
-    Action, AnyElement, App, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable,
-    KeyContext, Modifiers, ModifiersChangedEvent, ParentElement, Render, Styled, Task, WeakEntity,
-    Window, actions, rems,
-};
-use open_path_prompt::OpenPathPrompt;
-use picker::{Picker, PickerDelegate};
-use project::{
-    PathMatchCandidateSet, Project, ProjectPath, WorktreeId, worktree_store::WorktreeStore,
-};
-use search::ToggleIncludeIgnored;
-use settings::Settings;
-use std::{
-    borrow::Cow,
-    cmp,
-    ops::Range,
-    path::{Component, Path, PathBuf},
-    sync::{
-        Arc,
-        atomic::{self, AtomicBool},
-    },
-};
-use text::Point;
-use ui::{
-    ButtonLike, ContextMenu, HighlightedLabel, Indicator, KeyBinding, ListItem, ListItemSpacing,
-    PopoverMenu, PopoverMenuHandle, TintColor, Tooltip, prelude::*,
-};
-use util::{
-    ResultExt, maybe,
-    paths::{PathStyle, PathWithPosition},
-    post_inc,
-    rel_path::RelPath,
-};
-use workspace::{
-    ModalView, OpenOptions, OpenVisible, SplitDirection, Workspace, item::PreviewTabsSettings,
-    notifications::NotifyResultExt, pane,
-};
-
-actions!(
-    file_finder,
-    [
-        /// Selects the previous item in the file finder.
-        SelectPrevious,
-        /// Toggles the file filter menu.
-        ToggleFilterMenu,
-        /// Toggles the split direction menu.
-        ToggleSplitMenu
-    ]
-);
-
-impl ModalView for FileFinder {
-    fn on_before_dismiss(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> workspace::DismissDecision {
-        let submenu_focused = self.picker.update(cx, |picker, cx| {
-            picker
-                .delegate
-                .filter_popover_menu_handle
-                .is_focused(window, cx)
-                || picker
-                    .delegate
-                    .split_popover_menu_handle
-                    .is_focused(window, cx)
-        });
-        workspace::DismissDecision::Dismiss(!submenu_focused)
-    }
-}
-
-pub struct FileFinder {
-    picker: Entity<Picker<FileFinderDelegate>>,
-    picker_focus_handle: FocusHandle,
-    init_modifiers: Option<Modifiers>,
-}
-
-pub fn init(cx: &mut App) {
-    cx.observe_new(FileFinder::register).detach();
-    cx.observe_new(OpenPathPrompt::register).detach();
-    cx.observe_new(OpenPathPrompt::register_new_path).detach();
-}
-
-impl FileFinder {
-    fn register(
-        workspace: &mut Workspace,
-        _window: Option<&mut Window>,
-        _: &mut Context<Workspace>,
-    ) {
-        workspace.register_action(
-            |workspace, action: &workspace::ToggleFileFinder, window, cx| {
-                let Some(file_finder) = workspace.active_modal::<Self>(cx) else {
-                    Self::open(workspace, action.separate_history, window, cx).detach();
-                    return;
-                };
-
-                file_finder.update(cx, |file_finder, cx| {
-                    file_finder.init_modifiers = Some(window.modifiers());
-                    file_finder.picker.update(cx, |picker, cx| {
-                        picker.cycle_selection(window, cx);
-                    });
-                });
-            },
-        );
-    }
-
-    fn open(
-        workspace: &mut Workspace,
-        separate_history: bool,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) -> Task<()> {
-        let project = workspace.project().read(cx);
-        let fs = project.fs();
-
-        let currently_opened_path = workspace.active_item(cx).and_then(|item| {
-            let project_path = item.project_path(cx)?;
-            let abs_path = project
-                .worktree_for_id(project_path.worktree_id, cx)?
-                .read(cx)
-                .absolutize(&project_path.path);
-            Some(FoundPath::new(project_path, abs_path))
-        });
-
-        let history_items = workspace
-            .recent_navigation_history(Some(MAX_RECENT_SELECTIONS), cx)
-            .into_iter()
-            .filter_map(|(project_path, abs_path)| {
-                if project.entry_for_path(&project_path, cx).is_some() {
-                    return Some(Task::ready(Some(FoundPath::new(project_path, abs_path?))));
-                }
-                let abs_path = abs_path?;
-                if project.is_local() {
-                    let fs = fs.clone();
-                    Some(cx.background_spawn(async move {
-                        if fs.is_file(&abs_path).await {
-                            Some(FoundPath::new(project_path, abs_path))
-                        } else {
-                            None
-                        }
-                    }))
-                } else {
-                    Some(Task::ready(Some(FoundPath::new(project_path, abs_path))))
-                }
-            })
-            .collect::<Vec<_>>();
-        cx.spawn_in(window, async move |workspace, cx| {
-            let history_items = join_all(history_items).await.into_iter().flatten();
-
-            workspace
-                .update_in(cx, |workspace, window, cx| {
-                    let project = workspace.project().clone();
-                    let weak_workspace = cx.entity().downgrade();
-                    workspace.toggle_modal(window, cx, |window, cx| {
-                        let delegate = FileFinderDelegate::new(
-                            cx.entity().downgrade(),
-                            weak_workspace,
-                            project,
-                            currently_opened_path,
-                            history_items.collect(),
-                            separate_history,
-                            window,
-                            cx,
-                        );
-
-                        FileFinder::new(delegate, window, cx)
-                    });
-                })
-                .ok();
-        })
-    }
-
-    fn new(delegate: FileFinderDelegate, window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx));
-        let picker_focus_handle = picker.focus_handle(cx);
-        picker.update(cx, |picker, _| {
-            picker.delegate.focus_handle = picker_focus_handle.clone();
-        });
-        Self {
-            picker,
-            picker_focus_handle,
-            init_modifiers: window.modifiers().modified().then_some(window.modifiers()),
-        }
-    }
-
-    fn handle_modifiers_changed(
-        &mut self,
-        event: &ModifiersChangedEvent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(init_modifiers) = self.init_modifiers.take() else {
-            return;
-        };
-        if self.picker.read(cx).delegate.has_changed_selected_index
-            && (!event.modified() || !init_modifiers.is_subset_of(event))
-        {
-            self.init_modifiers = None;
-            window.dispatch_action(menu::Confirm.boxed_clone(), cx);
-        }
-    }
-
-    fn handle_select_prev(
-        &mut self,
-        _: &SelectPrevious,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.init_modifiers = Some(window.modifiers());
-        window.dispatch_action(Box::new(menu::SelectPrevious), cx);
-    }
-
-    fn handle_filter_toggle_menu(
-        &mut self,
-        _: &ToggleFilterMenu,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.picker.update(cx, |picker, cx| {
-            let menu_handle = &picker.delegate.filter_popover_menu_handle;
-            if menu_handle.is_deployed() {
-                menu_handle.hide(cx);
-            } else {
-                menu_handle.show(window, cx);
-            }
-        });
-    }
-
-    fn handle_split_toggle_menu(
-        &mut self,
-        _: &ToggleSplitMenu,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.picker.update(cx, |picker, cx| {
-            let menu_handle = &picker.delegate.split_popover_menu_handle;
-            if menu_handle.is_deployed() {
-                menu_handle.hide(cx);
-            } else {
-                menu_handle.show(window, cx);
-            }
-        });
-    }
-
-    fn handle_toggle_ignored(
-        &mut self,
-        _: &ToggleIncludeIgnored,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.picker.update(cx, |picker, cx| {
-            picker.delegate.include_ignored = match picker.delegate.include_ignored {
-                Some(true) => FileFinderSettings::get_global(cx)
-                    .include_ignored
-                    .map(|_| false),
-                Some(false) => Some(true),
-                None => Some(true),
-            };
-            picker.delegate.include_ignored_refresh =
-                picker.delegate.update_matches(picker.query(cx), window, cx);
-        });
-    }
-
-    fn go_to_file_split_left(
-        &mut self,
-        _: &pane::SplitLeft,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.go_to_file_split_inner(SplitDirection::Left, window, cx)
-    }
-
-    fn go_to_file_split_right(
-        &mut self,
-        _: &pane::SplitRight,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.go_to_file_split_inner(SplitDirection::Right, window, cx)
-    }
-
-    fn go_to_file_split_up(
-        &mut self,
-        _: &pane::SplitUp,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.go_to_file_split_inner(SplitDirection::Up, window, cx)
-    }
-
-    fn go_to_file_split_down(
-        &mut self,
-        _: &pane::SplitDown,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.go_to_file_split_inner(SplitDirection::Down, window, cx)
-    }
-
-    fn go_to_file_split_inner(
-        &mut self,
-        split_direction: SplitDirection,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.picker.update(cx, |picker, cx| {
-            let delegate = &mut picker.delegate;
-            if let Some(workspace) = delegate.workspace.upgrade()
-                && let Some(m) = delegate.matches.get(delegate.selected_index())
-            {
-                let path = match &m {
-                    Match::History { path, .. } => {
-                        let worktree_id = path.project.worktree_id;
-                        ProjectPath {
-                            worktree_id,
-                            path: Arc::clone(&path.project.path),
-                        }
-                    }
-                    Match::Search(m) => ProjectPath {
-                        worktree_id: WorktreeId::from_usize(m.0.worktree_id),
-                        path: m.0.path.clone(),
-                    },
-                    Match::CreateNew(p) => p.clone(),
-                };
-                let open_task = workspace.update(cx, move |workspace, cx| {
-                    workspace.split_path_preview(path, false, Some(split_direction), window, cx)
-                });
-                open_task.detach_and_log_err(cx);
-            }
-        })
-    }
-
-    pub fn modal_max_width(width_setting: FileFinderWidth, window: &mut Window) -> Pixels {
-        let window_width = window.viewport_size().width;
-        let small_width = rems(34.).to_pixels(window.rem_size());
-
-        match width_setting {
-            FileFinderWidth::Small => small_width,
-            FileFinderWidth::Full => window_width,
-            FileFinderWidth::XLarge => (window_width - px(512.)).max(small_width),
-            FileFinderWidth::Large => (window_width - px(768.)).max(small_width),
-            FileFinderWidth::Medium => (window_width - px(1024.)).max(small_width),
-        }
-    }
-}
-
-impl EventEmitter<DismissEvent> for FileFinder {}
-
-impl Focusable for FileFinder {
-    fn focus_handle(&self, _: &App) -> FocusHandle {
-        self.picker_focus_handle.clone()
-    }
-}
-
-impl Render for FileFinder {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let key_context = self.picker.read(cx).delegate.key_context(window, cx);
-
-        let file_finder_settings = FileFinderSettings::get_global(cx);
-        let modal_max_width = Self::modal_max_width(file_finder_settings.modal_max_width, window);
-
-        v_flex()
-            .key_context(key_context)
-            .w(modal_max_width)
-            .on_modifiers_changed(cx.listener(Self::handle_modifiers_changed))
-            .on_action(cx.listener(Self::handle_select_prev))
-            .on_action(cx.listener(Self::handle_filter_toggle_menu))
-            .on_action(cx.listener(Self::handle_split_toggle_menu))
-            .on_action(cx.listener(Self::handle_toggle_ignored))
-            .on_action(cx.listener(Self::go_to_file_split_left))
-            .on_action(cx.listener(Self::go_to_file_split_right))
-            .on_action(cx.listener(Self::go_to_file_split_up))
-            .on_action(cx.listener(Self::go_to_file_split_down))
-            .child(self.picker.clone())
-    }
-}
-
-pub struct FileFinderDelegate {
-    file_finder: WeakEntity<FileFinder>,
-    workspace: WeakEntity<Workspace>,
-    project: Entity<Project>,
-    search_count: usize,
-    latest_search_id: usize,
-    latest_search_did_cancel: bool,
-    latest_search_query: Option<FileSearchQuery>,
-    currently_opened_path: Option<FoundPath>,
-    matches: Matches,
-    selected_index: usize,
-    has_changed_selected_index: bool,
-    cancel_flag: Arc<AtomicBool>,
-    history_items: Vec<FoundPath>,
-    separate_history: bool,
-    first_update: bool,
-    filter_popover_menu_handle: PopoverMenuHandle<ContextMenu>,
-    split_popover_menu_handle: PopoverMenuHandle<ContextMenu>,
-    focus_handle: FocusHandle,
-    include_ignored: Option<bool>,
-    include_ignored_refresh: Task<()>,
-}
-
-/// Use a custom ordering for file finder: the regular one
-/// defines max element with the highest score and the latest alphanumerical path (in case of a tie on other params), e.g:
-/// `[{score: 0.5, path = "c/d" }, { score: 0.5, path = "/a/b" }]`
-///
-/// In the file finder, we would prefer to have the max element with the highest score and the earliest alphanumerical path, e.g:
-/// `[{ score: 0.5, path = "/a/b" }, {score: 0.5, path = "c/d" }]`
-/// as the files are shown in the project panel lists.
-#[derive(Debug, Clone, PartialEq, Eq)]
-struct ProjectPanelOrdMatch(PathMatch);
-
-impl Ord for ProjectPanelOrdMatch {
-    fn cmp(&self, other: &Self) -> cmp::Ordering {
-        self.0
-            .score
-            .partial_cmp(&other.0.score)
-            .unwrap_or(cmp::Ordering::Equal)
-            .then_with(|| self.0.worktree_id.cmp(&other.0.worktree_id))
-            .then_with(|| {
-                other
-                    .0
-                    .distance_to_relative_ancestor
-                    .cmp(&self.0.distance_to_relative_ancestor)
-            })
-            .then_with(|| self.0.path.cmp(&other.0.path).reverse())
-    }
-}
-
-impl PartialOrd for ProjectPanelOrdMatch {
-    fn partial_cmp(&self, other: &Self) -> Option<cmp::Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-#[derive(Debug, Default)]
-struct Matches {
-    separate_history: bool,
-    matches: Vec<Match>,
-}
-
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone)]
-enum Match {
-    History {
-        path: FoundPath,
-        panel_match: Option<ProjectPanelOrdMatch>,
-    },
-    Search(ProjectPanelOrdMatch),
-    CreateNew(ProjectPath),
-}
-
-impl Match {
-    fn relative_path(&self) -> Option<&Arc<RelPath>> {
-        match self {
-            Match::History { path, .. } => Some(&path.project.path),
-            Match::Search(panel_match) => Some(&panel_match.0.path),
-            Match::CreateNew(_) => None,
-        }
-    }
-
-    fn abs_path(&self, project: &Entity<Project>, cx: &App) -> Option<PathBuf> {
-        match self {
-            Match::History { path, .. } => Some(path.absolute.clone()),
-            Match::Search(ProjectPanelOrdMatch(path_match)) => Some(
-                project
-                    .read(cx)
-                    .worktree_for_id(WorktreeId::from_usize(path_match.worktree_id), cx)?
-                    .read(cx)
-                    .absolutize(&path_match.path),
-            ),
-            Match::CreateNew(_) => None,
-        }
-    }
-
-    fn panel_match(&self) -> Option<&ProjectPanelOrdMatch> {
-        match self {
-            Match::History { panel_match, .. } => panel_match.as_ref(),
-            Match::Search(panel_match) => Some(panel_match),
-            Match::CreateNew(_) => None,
-        }
-    }
-}
-
-impl Matches {
-    fn len(&self) -> usize {
-        self.matches.len()
-    }
-
-    fn get(&self, index: usize) -> Option<&Match> {
-        self.matches.get(index)
-    }
-
-    fn position(
-        &self,
-        entry: &Match,
-        currently_opened: Option<&FoundPath>,
-    ) -> Result<usize, usize> {
-        if let Match::History {
-            path,
-            panel_match: None,
-        } = entry
-        {
-            // Slow case: linear search by path. Should not happen actually,
-            // since we call `position` only if matches set changed, but the query has not changed.
-            // And History entries do not have panel_match if query is empty, so there's no
-            // reason for the matches set to change.
-            self.matches
-                .iter()
-                .position(|m| match m.relative_path() {
-                    Some(p) => path.project.path == *p,
-                    None => false,
-                })
-                .ok_or(0)
-        } else {
-            self.matches.binary_search_by(|m| {
-                // `reverse()` since if cmp_matches(a, b) == Ordering::Greater, then a is better than b.
-                // And we want the better entries go first.
-                Self::cmp_matches(self.separate_history, currently_opened, m, entry).reverse()
-            })
-        }
-    }
-
-    fn push_new_matches<'a>(
-        &'a mut self,
-        worktree_store: Entity<WorktreeStore>,
-        cx: &'a App,
-        history_items: impl IntoIterator<Item = &'a FoundPath> + Clone,
-        currently_opened: Option<&'a FoundPath>,
-        query: Option<&FileSearchQuery>,
-        new_search_matches: impl Iterator<Item = ProjectPanelOrdMatch>,
-        extend_old_matches: bool,
-        path_style: PathStyle,
-    ) {
-        let Some(query) = query else {
-            // assuming that if there's no query, then there's no search matches.
-            self.matches.clear();
-            let path_to_entry = |found_path: &FoundPath| Match::History {
-                path: found_path.clone(),
-                panel_match: None,
-            };
-
-            self.matches
-                .extend(history_items.into_iter().map(path_to_entry));
-            return;
-        };
-        // If several worktress are open we have to set the worktree root names in path prefix
-        let several_worktrees = worktree_store.read(cx).worktrees().count() > 1;
-        let worktree_name_by_id = several_worktrees.then(|| {
-            worktree_store
-                .read(cx)
-                .worktrees()
-                .map(|worktree| {
-                    let snapshot = worktree.read(cx).snapshot();
-                    (snapshot.id(), snapshot.root_name().into())
-                })
-                .collect()
-        });
-        let new_history_matches = matching_history_items(
-            history_items,
-            currently_opened,
-            worktree_name_by_id,
-            query,
-            path_style,
-        );
-        let new_search_matches: Vec<Match> = new_search_matches
-            .filter(|path_match| {
-                !new_history_matches.contains_key(&ProjectPath {
-                    path: path_match.0.path.clone(),
-                    worktree_id: WorktreeId::from_usize(path_match.0.worktree_id),
-                })
-            })
-            .map(Match::Search)
-            .collect();
-
-        if extend_old_matches {
-            // since we take history matches instead of new search matches
-            // and history matches has not changed(since the query has not changed and we do not extend old matches otherwise),
-            // old matches can't contain paths present in history_matches as well.
-            self.matches.retain(|m| matches!(m, Match::Search(_)));
-        } else {
-            self.matches.clear();
-        }
-
-        // At this point we have an unsorted set of new history matches, an unsorted set of new search matches
-        // and a sorted set of old search matches.
-        // It is possible that the new search matches' paths contain some of the old search matches' paths.
-        // History matches' paths are unique, since store in a HashMap by path.
-        // We build a sorted Vec<Match>, eliminating duplicate search matches.
-        // Search matches with the same paths should have equal `ProjectPanelOrdMatch`, so we should
-        // not have any duplicates after building the final list.
-        for new_match in new_history_matches
-            .into_values()
-            .chain(new_search_matches.into_iter())
-        {
-            match self.position(&new_match, currently_opened) {
-                Ok(_duplicate) => continue,
-                Err(i) => {
-                    self.matches.insert(i, new_match);
-                    if self.matches.len() == 100 {
-                        break;
-                    }
-                }
-            }
-        }
-    }
-
-    /// If a < b, then a is a worse match, aligning with the `ProjectPanelOrdMatch` ordering.
-    fn cmp_matches(
-        separate_history: bool,
-        currently_opened: Option<&FoundPath>,
-        a: &Match,
-        b: &Match,
-    ) -> cmp::Ordering {
-        // Handle CreateNew variant - always put it at the end
-        match (a, b) {
-            (Match::CreateNew(_), _) => return cmp::Ordering::Less,
-            (_, Match::CreateNew(_)) => return cmp::Ordering::Greater,
-            _ => {}
-        }
-        debug_assert!(a.panel_match().is_some() && b.panel_match().is_some());
-
-        match (&a, &b) {
-            // bubble currently opened files to the top
-            (Match::History { path, .. }, _) if Some(path) == currently_opened => {
-                return cmp::Ordering::Greater;
-            }
-            (_, Match::History { path, .. }) if Some(path) == currently_opened => {
-                return cmp::Ordering::Less;
-            }
-
-            _ => {}
-        }
-
-        if separate_history {
-            match (a, b) {
-                (Match::History { .. }, Match::Search(_)) => return cmp::Ordering::Greater,
-                (Match::Search(_), Match::History { .. }) => return cmp::Ordering::Less,
-
-                _ => {}
-            }
-        }
-
-        let a_panel_match = match a.panel_match() {
-            Some(pm) => pm,
-            None => {
-                return if b.panel_match().is_some() {
-                    cmp::Ordering::Less
-                } else {
-                    cmp::Ordering::Equal
-                };
-            }
-        };
-
-        let b_panel_match = match b.panel_match() {
-            Some(pm) => pm,
-            None => return cmp::Ordering::Greater,
-        };
-
-        let a_in_filename = Self::is_filename_match(a_panel_match);
-        let b_in_filename = Self::is_filename_match(b_panel_match);
-
-        match (a_in_filename, b_in_filename) {
-            (true, false) => return cmp::Ordering::Greater,
-            (false, true) => return cmp::Ordering::Less,
-            _ => {} // Both are filename matches or both are path matches
-        }
-
-        a_panel_match.cmp(b_panel_match)
-    }
-
-    /// Determines if the match occurred within the filename rather than in the path
-    fn is_filename_match(panel_match: &ProjectPanelOrdMatch) -> bool {
-        if panel_match.0.positions.is_empty() {
-            return false;
-        }
-
-        if let Some(filename) = panel_match.0.path.file_name() {
-            let path_str = panel_match.0.path.as_unix_str();
-
-            if let Some(filename_pos) = path_str.rfind(filename)
-                && panel_match.0.positions[0] >= filename_pos
-            {
-                let mut prev_position = panel_match.0.positions[0];
-                for p in &panel_match.0.positions[1..] {
-                    if *p != prev_position + 1 {
-                        return false;
-                    }
-                    prev_position = *p;
-                }
-                return true;
-            }
-        }
-
-        false
-    }
-}
-
-fn matching_history_items<'a>(
-    history_items: impl IntoIterator<Item = &'a FoundPath>,
-    currently_opened: Option<&'a FoundPath>,
-    worktree_name_by_id: Option<HashMap<WorktreeId, Arc<RelPath>>>,
-    query: &FileSearchQuery,
-    path_style: PathStyle,
-) -> HashMap<ProjectPath, Match> {
-    let mut candidates_paths = HashMap::default();
-
-    let history_items_by_worktrees = history_items
-        .into_iter()
-        .chain(currently_opened)
-        .filter_map(|found_path| {
-            let candidate = PathMatchCandidate {
-                is_dir: false, // You can't open directories as project items
-                path: &found_path.project.path,
-                // Only match history items names, otherwise their paths may match too many queries, producing false positives.
-                // E.g. `foo` would match both `something/foo/bar.rs` and `something/foo/foo.rs` and if the former is a history item,
-                // it would be shown first always, despite the latter being a better match.
-                char_bag: CharBag::from_iter(
-                    found_path
-                        .project
-                        .path
-                        .file_name()?
-                        .to_string()
-                        .to_lowercase()
-                        .chars(),
-                ),
-            };
-            candidates_paths.insert(&found_path.project, found_path);
-            Some((found_path.project.worktree_id, candidate))
-        })
-        .fold(
-            HashMap::default(),
-            |mut candidates, (worktree_id, new_candidate)| {
-                candidates
-                    .entry(worktree_id)
-                    .or_insert_with(Vec::new)
-                    .push(new_candidate);
-                candidates
-            },
-        );
-    let mut matching_history_paths = HashMap::default();
-    for (worktree, candidates) in history_items_by_worktrees {
-        let max_results = candidates.len() + 1;
-        let worktree_root_name = worktree_name_by_id
-            .as_ref()
-            .and_then(|w| w.get(&worktree).cloned());
-        matching_history_paths.extend(
-            fuzzy::match_fixed_path_set(
-                candidates,
-                worktree.to_usize(),
-                worktree_root_name,
-                query.path_query(),
-                false,
-                max_results,
-                path_style,
-            )
-            .into_iter()
-            .filter_map(|path_match| {
-                candidates_paths
-                    .remove_entry(&ProjectPath {
-                        worktree_id: WorktreeId::from_usize(path_match.worktree_id),
-                        path: Arc::clone(&path_match.path),
-                    })
-                    .map(|(project_path, found_path)| {
-                        (
-                            project_path.clone(),
-                            Match::History {
-                                path: found_path.clone(),
-                                panel_match: Some(ProjectPanelOrdMatch(path_match)),
-                            },
-                        )
-                    })
-            }),
-        );
-    }
-    matching_history_paths
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
-struct FoundPath {
-    project: ProjectPath,
-    absolute: PathBuf,
-}
-
-impl FoundPath {
-    fn new(project: ProjectPath, absolute: PathBuf) -> Self {
-        Self { project, absolute }
-    }
-}
-
-const MAX_RECENT_SELECTIONS: usize = 20;
-
-pub enum Event {
-    Selected(ProjectPath),
-    Dismissed,
-}
-
-#[derive(Debug, Clone)]
-struct FileSearchQuery {
-    raw_query: String,
-    file_query_end: Option<usize>,
-    path_position: PathWithPosition,
-}
-
-impl FileSearchQuery {
-    fn path_query(&self) -> &str {
-        match self.file_query_end {
-            Some(file_path_end) => &self.raw_query[..file_path_end],
-            None => &self.raw_query,
-        }
-    }
-}
-
-impl FileFinderDelegate {
-    fn new(
-        file_finder: WeakEntity<FileFinder>,
-        workspace: WeakEntity<Workspace>,
-        project: Entity<Project>,
-        currently_opened_path: Option<FoundPath>,
-        history_items: Vec<FoundPath>,
-        separate_history: bool,
-        window: &mut Window,
-        cx: &mut Context<FileFinder>,
-    ) -> Self {
-        Self::subscribe_to_updates(&project, window, cx);
-        Self {
-            file_finder,
-            workspace,
-            project,
-            search_count: 0,
-            latest_search_id: 0,
-            latest_search_did_cancel: false,
-            latest_search_query: None,
-            currently_opened_path,
-            matches: Matches::default(),
-            has_changed_selected_index: false,
-            selected_index: 0,
-            cancel_flag: Arc::new(AtomicBool::new(false)),
-            history_items,
-            separate_history,
-            first_update: true,
-            filter_popover_menu_handle: PopoverMenuHandle::default(),
-            split_popover_menu_handle: PopoverMenuHandle::default(),
-            focus_handle: cx.focus_handle(),
-            include_ignored: FileFinderSettings::get_global(cx).include_ignored,
-            include_ignored_refresh: Task::ready(()),
-        }
-    }
-
-    fn subscribe_to_updates(
-        project: &Entity<Project>,
-        window: &mut Window,
-        cx: &mut Context<FileFinder>,
-    ) {
-        cx.subscribe_in(project, window, |file_finder, _, event, window, cx| {
-            match event {
-                project::Event::WorktreeUpdatedEntries(_, _)
-                | project::Event::WorktreeAdded(_)
-                | project::Event::WorktreeRemoved(_) => file_finder
-                    .picker
-                    .update(cx, |picker, cx| picker.refresh(window, cx)),
-                _ => {}
-            };
-        })
-        .detach();
-    }
-
-    fn spawn_search(
-        &mut self,
-        query: FileSearchQuery,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Task<()> {
-        let relative_to = self
-            .currently_opened_path
-            .as_ref()
-            .map(|found_path| Arc::clone(&found_path.project.path));
-        let worktrees = self
-            .project
-            .read(cx)
-            .worktree_store()
-            .read(cx)
-            .visible_worktrees_and_single_files(cx)
-            .collect::<Vec<_>>();
-        let include_root_name = worktrees.len() > 1;
-        let candidate_sets = worktrees
-            .into_iter()
-            .map(|worktree| {
-                let worktree = worktree.read(cx);
-                PathMatchCandidateSet {
-                    snapshot: worktree.snapshot(),
-                    include_ignored: self.include_ignored.unwrap_or_else(|| {
-                        worktree.root_entry().is_some_and(|entry| entry.is_ignored)
-                    }),
-                    include_root_name,
-                    candidates: project::Candidates::Files,
-                }
-            })
-            .collect::<Vec<_>>();
-
-        let search_id = util::post_inc(&mut self.search_count);
-        self.cancel_flag.store(true, atomic::Ordering::Release);
-        self.cancel_flag = Arc::new(AtomicBool::new(false));
-        let cancel_flag = self.cancel_flag.clone();
-        cx.spawn_in(window, async move |picker, cx| {
-            let matches = fuzzy::match_path_sets(
-                candidate_sets.as_slice(),
-                query.path_query(),
-                &relative_to,
-                false,
-                100,
-                &cancel_flag,
-                cx.background_executor().clone(),
-            )
-            .await
-            .into_iter()
-            .map(ProjectPanelOrdMatch);
-            let did_cancel = cancel_flag.load(atomic::Ordering::Acquire);
-            picker
-                .update(cx, |picker, cx| {
-                    picker
-                        .delegate
-                        .set_search_matches(search_id, did_cancel, query, matches, cx)
-                })
-                .log_err();
-        })
-    }
-
-    fn set_search_matches(
-        &mut self,
-        search_id: usize,
-        did_cancel: bool,
-        query: FileSearchQuery,
-        matches: impl IntoIterator<Item = ProjectPanelOrdMatch>,
-        cx: &mut Context<Picker<Self>>,
-    ) {
-        if search_id >= self.latest_search_id {
-            self.latest_search_id = search_id;
-            let query_changed = Some(query.path_query())
-                != self
-                    .latest_search_query
-                    .as_ref()
-                    .map(|query| query.path_query());
-            let extend_old_matches = self.latest_search_did_cancel && !query_changed;
-
-            let selected_match = if query_changed {
-                None
-            } else {
-                self.matches.get(self.selected_index).cloned()
-            };
-
-            let path_style = self.project.read(cx).path_style(cx);
-            self.matches.push_new_matches(
-                self.project.read(cx).worktree_store(),
-                cx,
-                &self.history_items,
-                self.currently_opened_path.as_ref(),
-                Some(&query),
-                matches.into_iter(),
-                extend_old_matches,
-                path_style,
-            );
-
-            let query_path = query.raw_query.as_str();
-            if let Ok(mut query_path) = RelPath::new(Path::new(query_path), path_style) {
-                let available_worktree = self
-                    .project
-                    .read(cx)
-                    .visible_worktrees(cx)
-                    .filter(|worktree| !worktree.read(cx).is_single_file())
-                    .collect::<Vec<_>>();
-                let worktree_count = available_worktree.len();
-                let mut expect_worktree = available_worktree.first().cloned();
-                for worktree in available_worktree {
-                    let worktree_root = worktree.read(cx).root_name();
-                    if worktree_count > 1 {
-                        if let Ok(suffix) = query_path.strip_prefix(worktree_root) {
-                            query_path = Cow::Owned(suffix.to_owned());
-                            expect_worktree = Some(worktree);
-                            break;
-                        }
-                    }
-                }
-
-                if let Some(FoundPath { ref project, .. }) = self.currently_opened_path {
-                    let worktree_id = project.worktree_id;
-                    expect_worktree = self.project.read(cx).worktree_for_id(worktree_id, cx);
-                }
-
-                if let Some(worktree) = expect_worktree {
-                    let worktree = worktree.read(cx);
-                    if worktree.entry_for_path(&query_path).is_none()
-                        && !query.raw_query.ends_with("/")
-                        && !(path_style.is_windows() && query.raw_query.ends_with("\\"))
-                    {
-                        self.matches.matches.push(Match::CreateNew(ProjectPath {
-                            worktree_id: worktree.id(),
-                            path: query_path.into_arc(),
-                        }));
-                    }
-                }
-            }
-
-            self.selected_index = selected_match.map_or_else(
-                || self.calculate_selected_index(cx),
-                |m| {
-                    self.matches
-                        .position(&m, self.currently_opened_path.as_ref())
-                        .unwrap_or(0)
-                },
-            );
-
-            self.latest_search_query = Some(query);
-            self.latest_search_did_cancel = did_cancel;
-
-            cx.notify();
-        }
-    }
-
-    fn labels_for_match(
-        &self,
-        path_match: &Match,
-        window: &mut Window,
-        cx: &App,
-    ) -> (HighlightedLabel, HighlightedLabel) {
-        let path_style = self.project.read(cx).path_style(cx);
-        let (file_name, file_name_positions, mut full_path, mut full_path_positions) =
-            match &path_match {
-                Match::History {
-                    path: entry_path,
-                    panel_match,
-                } => {
-                    let worktree_id = entry_path.project.worktree_id;
-                    let worktree = self
-                        .project
-                        .read(cx)
-                        .worktree_for_id(worktree_id, cx)
-                        .filter(|worktree| worktree.read(cx).is_visible());
-
-                    if let Some(panel_match) = panel_match {
-                        self.labels_for_path_match(&panel_match.0, path_style)
-                    } else if let Some(worktree) = worktree {
-                        let full_path =
-                            worktree.read(cx).root_name().join(&entry_path.project.path);
-                        let mut components = full_path.components();
-                        let filename = components.next_back().unwrap_or("");
-                        let prefix = components.rest();
-                        (
-                            filename.to_string(),
-                            Vec::new(),
-                            prefix.display(path_style).to_string() + path_style.primary_separator(),
-                            Vec::new(),
-                        )
-                    } else {
-                        (
-                            entry_path
-                                .absolute
-                                .file_name()
-                                .map_or(String::new(), |f| f.to_string_lossy().into_owned()),
-                            Vec::new(),
-                            entry_path.absolute.parent().map_or(String::new(), |path| {
-                                path.to_string_lossy().into_owned() + path_style.primary_separator()
-                            }),
-                            Vec::new(),
-                        )
-                    }
-                }
-                Match::Search(path_match) => self.labels_for_path_match(&path_match.0, path_style),
-                Match::CreateNew(project_path) => (
-                    format!("Create file: {}", project_path.path.display(path_style)),
-                    vec![],
-                    String::from(""),
-                    vec![],
-                ),
-            };
-
-        if file_name_positions.is_empty() {
-            let user_home_path = util::paths::home_dir().to_string_lossy();
-            if !user_home_path.is_empty() && full_path.starts_with(&*user_home_path) {
-                full_path.replace_range(0..user_home_path.len(), "~");
-                full_path_positions.retain_mut(|pos| {
-                    if *pos >= user_home_path.len() {
-                        *pos -= user_home_path.len();
-                        *pos += 1;
-                        true
-                    } else {
-                        false
-                    }
-                })
-            }
-        }
-
-        if full_path.is_ascii() {
-            let file_finder_settings = FileFinderSettings::get_global(cx);
-            let max_width =
-                FileFinder::modal_max_width(file_finder_settings.modal_max_width, window);
-            let (normal_em, small_em) = {
-                let style = window.text_style();
-                let font_id = window.text_system().resolve_font(&style.font());
-                let font_size = TextSize::Default.rems(cx).to_pixels(window.rem_size());
-                let normal = cx
-                    .text_system()
-                    .em_width(font_id, font_size)
-                    .unwrap_or(px(16.));
-                let font_size = TextSize::Small.rems(cx).to_pixels(window.rem_size());
-                let small = cx
-                    .text_system()
-                    .em_width(font_id, font_size)
-                    .unwrap_or(px(10.));
-                (normal, small)
-            };
-            let budget = full_path_budget(&file_name, normal_em, small_em, max_width);
-            // If the computed budget is zero, we certainly won't be able to achieve it,
-            // so no point trying to elide the path.
-            if budget > 0 && full_path.len() > budget {
-                let components = PathComponentSlice::new(&full_path);
-                if let Some(elided_range) =
-                    components.elision_range(budget - 1, &full_path_positions)
-                {
-                    let elided_len = elided_range.end - elided_range.start;
-                    let placeholder = "…";
-                    full_path_positions.retain_mut(|mat| {
-                        if *mat >= elided_range.end {
-                            *mat -= elided_len;
-                            *mat += placeholder.len();
-                        } else if *mat >= elided_range.start {
-                            return false;
-                        }
-                        true
-                    });
-                    full_path.replace_range(elided_range, placeholder);
-                }
-            }
-        }
-
-        (
-            HighlightedLabel::new(file_name, file_name_positions),
-            HighlightedLabel::new(full_path, full_path_positions)
-                .size(LabelSize::Small)
-                .color(Color::Muted),
-        )
-    }
-
-    fn labels_for_path_match(
-        &self,
-        path_match: &PathMatch,
-        path_style: PathStyle,
-    ) -> (String, Vec<usize>, String, Vec<usize>) {
-        let full_path = path_match.path_prefix.join(&path_match.path);
-        let mut path_positions = path_match.positions.clone();
-
-        let file_name = full_path.file_name().unwrap_or("");
-        let file_name_start = full_path.as_unix_str().len() - file_name.len();
-        let file_name_positions = path_positions
-            .iter()
-            .filter_map(|pos| {
-                if pos >= &file_name_start {
-                    Some(pos - file_name_start)
-                } else {
-                    None
-                }
-            })
-            .collect::<Vec<_>>();
-
-        let full_path = full_path
-            .display(path_style)
-            .trim_end_matches(&file_name)
-            .to_string();
-        path_positions.retain(|idx| *idx < full_path.len());
-
-        debug_assert!(
-            file_name_positions
-                .iter()
-                .all(|ix| file_name[*ix..].chars().next().is_some()),
-            "invalid file name positions {file_name:?} {file_name_positions:?}"
-        );
-        debug_assert!(
-            path_positions
-                .iter()
-                .all(|ix| full_path[*ix..].chars().next().is_some()),
-            "invalid path positions {full_path:?} {path_positions:?}"
-        );
-
-        (
-            file_name.to_string(),
-            file_name_positions,
-            full_path,
-            path_positions,
-        )
-    }
-
-    /// Attempts to resolve an absolute file path and update the search matches if found.
-    ///
-    /// If the query path resolves to an absolute file that exists in the project,
-    /// this method will find the corresponding worktree and relative path, create a
-    /// match for it, and update the picker's search results.
-    ///
-    /// Returns `true` if the absolute path exists, otherwise returns `false`.
-    fn lookup_absolute_path(
-        &self,
-        query: FileSearchQuery,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Task<bool> {
-        cx.spawn_in(window, async move |picker, cx| {
-            let Some(project) = picker
-                .read_with(cx, |picker, _| picker.delegate.project.clone())
-                .log_err()
-            else {
-                return false;
-            };
-
-            let query_path = Path::new(query.path_query());
-            let mut path_matches = Vec::new();
-
-            let abs_file_exists = if let Ok(task) = project.update(cx, |this, cx| {
-                this.resolve_abs_file_path(query.path_query(), cx)
-            }) {
-                task.await.is_some()
-            } else {
-                false
-            };
-
-            if abs_file_exists {
-                let update_result = project
-                    .update(cx, |project, cx| {
-                        if let Some((worktree, relative_path)) =
-                            project.find_worktree(query_path, cx)
-                        {
-                            path_matches.push(ProjectPanelOrdMatch(PathMatch {
-                                score: 1.0,
-                                positions: Vec::new(),
-                                worktree_id: worktree.read(cx).id().to_usize(),
-                                path: relative_path,
-                                path_prefix: RelPath::empty().into(),
-                                is_dir: false, // File finder doesn't support directories
-                                distance_to_relative_ancestor: usize::MAX,
-                            }));
-                        }
-                    })
-                    .log_err();
-                if update_result.is_none() {
-                    return abs_file_exists;
-                }
-            }
-
-            picker
-                .update_in(cx, |picker, _, cx| {
-                    let picker_delegate = &mut picker.delegate;
-                    let search_id = util::post_inc(&mut picker_delegate.search_count);
-                    picker_delegate.set_search_matches(search_id, false, query, path_matches, cx);
-
-                    anyhow::Ok(())
-                })
-                .log_err();
-            abs_file_exists
-        })
-    }
-
-    /// Skips first history match (that is displayed topmost) if it's currently opened.
-    fn calculate_selected_index(&self, cx: &mut Context<Picker<Self>>) -> usize {
-        if FileFinderSettings::get_global(cx).skip_focus_for_active_in_search
-            && let Some(Match::History { path, .. }) = self.matches.get(0)
-            && Some(path) == self.currently_opened_path.as_ref()
-        {
-            let elements_after_first = self.matches.len() - 1;
-            if elements_after_first > 0 {
-                return 1;
-            }
-        }
-
-        0
-    }
-
-    fn key_context(&self, window: &Window, cx: &App) -> KeyContext {
-        let mut key_context = KeyContext::new_with_defaults();
-        key_context.add("FileFinder");
-
-        if self.filter_popover_menu_handle.is_focused(window, cx) {
-            key_context.add("filter_menu_open");
-        }
-
-        if self.split_popover_menu_handle.is_focused(window, cx) {
-            key_context.add("split_menu_open");
-        }
-        key_context
-    }
-}
-
-fn full_path_budget(
-    file_name: &str,
-    normal_em: Pixels,
-    small_em: Pixels,
-    max_width: Pixels,
-) -> usize {
-    (((max_width / 0.8) - file_name.len() * normal_em) / small_em) as usize
-}
-
-impl PickerDelegate for FileFinderDelegate {
-    type ListItem = ListItem;
-
-    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
-        "Search project files...".into()
-    }
-
-    fn match_count(&self) -> usize {
-        self.matches.len()
-    }
-
-    fn selected_index(&self) -> usize {
-        self.selected_index
-    }
-
-    fn set_selected_index(&mut self, ix: usize, _: &mut Window, cx: &mut Context<Picker<Self>>) {
-        self.has_changed_selected_index = true;
-        self.selected_index = ix;
-        cx.notify();
-    }
-
-    fn separators_after_indices(&self) -> Vec<usize> {
-        if self.separate_history {
-            let first_non_history_index = self
-                .matches
-                .matches
-                .iter()
-                .enumerate()
-                .find(|(_, m)| !matches!(m, Match::History { .. }))
-                .map(|(i, _)| i);
-            if let Some(first_non_history_index) = first_non_history_index
-                && first_non_history_index > 0
-            {
-                return vec![first_non_history_index - 1];
-            }
-        }
-        Vec::new()
-    }
-
-    fn update_matches(
-        &mut self,
-        raw_query: String,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Task<()> {
-        let raw_query = raw_query.replace(' ', "");
-        let raw_query = raw_query.trim();
-
-        let raw_query = match &raw_query.get(0..2) {
-            Some(".\\" | "./") => &raw_query[2..],
-            Some(prefix @ ("a\\" | "a/" | "b\\" | "b/")) => {
-                if self
-                    .workspace
-                    .upgrade()
-                    .into_iter()
-                    .flat_map(|workspace| workspace.read(cx).worktrees(cx))
-                    .all(|worktree| {
-                        worktree
-                            .read(cx)
-                            .entry_for_path(RelPath::unix(prefix.split_at(1).0).unwrap())
-                            .is_none_or(|entry| !entry.is_dir())
-                    })
-                {
-                    &raw_query[2..]
-                } else {
-                    raw_query
-                }
-            }
-            _ => raw_query,
-        };
-
-        if raw_query.is_empty() {
-            // if there was no query before, and we already have some (history) matches
-            // there's no need to update anything, since nothing has changed.
-            // We also want to populate matches set from history entries on the first update.
-            if self.latest_search_query.is_some() || self.first_update {
-                let project = self.project.read(cx);
-
-                self.latest_search_id = post_inc(&mut self.search_count);
-                self.latest_search_query = None;
-                self.matches = Matches {
-                    separate_history: self.separate_history,
-                    ..Matches::default()
-                };
-                let path_style = self.project.read(cx).path_style(cx);
-
-                self.matches.push_new_matches(
-                    project.worktree_store(),
-                    cx,
-                    self.history_items.iter().filter(|history_item| {
-                        project
-                            .worktree_for_id(history_item.project.worktree_id, cx)
-                            .is_some()
-                            || project.is_local()
-                            || project.is_via_remote_server()
-                    }),
-                    self.currently_opened_path.as_ref(),
-                    None,
-                    None.into_iter(),
-                    false,
-                    path_style,
-                );
-
-                self.first_update = false;
-                self.selected_index = 0;
-            }
-            cx.notify();
-            Task::ready(())
-        } else {
-            let path_position = PathWithPosition::parse_str(raw_query);
-            let raw_query = raw_query.trim().trim_end_matches(':').to_owned();
-            let path = path_position.path.clone();
-            let path_str = path_position.path.to_str();
-            let path_trimmed = path_str.unwrap_or(&raw_query).trim_end_matches(':');
-            let file_query_end = if path_trimmed == raw_query {
-                None
-            } else {
-                // Safe to unwrap as we won't get here when the unwrap in if fails
-                Some(path_str.unwrap().len())
-            };
-
-            let query = FileSearchQuery {
-                raw_query,
-                file_query_end,
-                path_position,
-            };
-
-            cx.spawn_in(window, async move |this, cx| {
-                let _ = maybe!(async move {
-                    let is_absolute_path = path.is_absolute();
-                    let did_resolve_abs_path = is_absolute_path
-                        && this
-                            .update_in(cx, |this, window, cx| {
-                                this.delegate
-                                    .lookup_absolute_path(query.clone(), window, cx)
-                            })?
-                            .await;
-
-                    // Only check for relative paths if no absolute paths were
-                    // found.
-                    if !did_resolve_abs_path {
-                        this.update_in(cx, |this, window, cx| {
-                            this.delegate.spawn_search(query, window, cx)
-                        })?
-                        .await;
-                    }
-                    anyhow::Ok(())
-                })
-                .await;
-            })
-        }
-    }
-
-    fn confirm(
-        &mut self,
-        secondary: bool,
-        window: &mut Window,
-        cx: &mut Context<Picker<FileFinderDelegate>>,
-    ) {
-        if let Some(m) = self.matches.get(self.selected_index())
-            && let Some(workspace) = self.workspace.upgrade()
-        {
-            let open_task = workspace.update(cx, |workspace, cx| {
-                let split_or_open =
-                    |workspace: &mut Workspace,
-                     project_path,
-                     window: &mut Window,
-                     cx: &mut Context<Workspace>| {
-                        let allow_preview =
-                            PreviewTabsSettings::get_global(cx).enable_preview_from_file_finder;
-                        if secondary {
-                            workspace.split_path_preview(
-                                project_path,
-                                allow_preview,
-                                None,
-                                window,
-                                cx,
-                            )
-                        } else {
-                            workspace.open_path_preview(
-                                project_path,
-                                None,
-                                true,
-                                allow_preview,
-                                true,
-                                window,
-                                cx,
-                            )
-                        }
-                    };
-                match &m {
-                    Match::CreateNew(project_path) => {
-                        // Create a new file with the given filename
-                        if secondary {
-                            workspace.split_path_preview(
-                                project_path.clone(),
-                                false,
-                                None,
-                                window,
-                                cx,
-                            )
-                        } else {
-                            workspace.open_path_preview(
-                                project_path.clone(),
-                                None,
-                                true,
-                                false,
-                                true,
-                                window,
-                                cx,
-                            )
-                        }
-                    }
-
-                    Match::History { path, .. } => {
-                        let worktree_id = path.project.worktree_id;
-                        if workspace
-                            .project()
-                            .read(cx)
-                            .worktree_for_id(worktree_id, cx)
-                            .is_some()
-                        {
-                            split_or_open(
-                                workspace,
-                                ProjectPath {
-                                    worktree_id,
-                                    path: Arc::clone(&path.project.path),
-                                },
-                                window,
-                                cx,
-                            )
-                        } else if secondary {
-                            workspace.split_abs_path(path.absolute.clone(), false, window, cx)
-                        } else {
-                            workspace.open_abs_path(
-                                path.absolute.clone(),
-                                OpenOptions {
-                                    visible: Some(OpenVisible::None),
-                                    ..Default::default()
-                                },
-                                window,
-                                cx,
-                            )
-                        }
-                    }
-                    Match::Search(m) => split_or_open(
-                        workspace,
-                        ProjectPath {
-                            worktree_id: WorktreeId::from_usize(m.0.worktree_id),
-                            path: m.0.path.clone(),
-                        },
-                        window,
-                        cx,
-                    ),
-                }
-            });
-
-            let row = self
-                .latest_search_query
-                .as_ref()
-                .and_then(|query| query.path_position.row)
-                .map(|row| row.saturating_sub(1));
-            let col = self
-                .latest_search_query
-                .as_ref()
-                .and_then(|query| query.path_position.column)
-                .unwrap_or(0)
-                .saturating_sub(1);
-            let finder = self.file_finder.clone();
-
-            cx.spawn_in(window, async move |_, cx| {
-                let item = open_task.await.notify_async_err(cx)?;
-                if let Some(row) = row
-                    && let Some(active_editor) = item.downcast::<Editor>()
-                {
-                    active_editor
-                        .downgrade()
-                        .update_in(cx, |editor, window, cx| {
-                            editor.go_to_singleton_buffer_point(Point::new(row, col), window, cx);
-                        })
-                        .log_err();
-                }
-                finder.update(cx, |_, cx| cx.emit(DismissEvent)).ok()?;
-
-                Some(())
-            })
-            .detach();
-        }
-    }
-
-    fn dismissed(&mut self, _: &mut Window, cx: &mut Context<Picker<FileFinderDelegate>>) {
-        self.file_finder
-            .update(cx, |_, cx| cx.emit(DismissEvent))
-            .log_err();
-    }
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<Self::ListItem> {
-        let settings = FileFinderSettings::get_global(cx);
-
-        let path_match = self.matches.get(ix)?;
-
-        let history_icon = match &path_match {
-            Match::History { .. } => Icon::new(IconName::HistoryRerun)
-                .color(Color::Muted)
-                .size(IconSize::Small)
-                .into_any_element(),
-            Match::Search(_) => v_flex()
-                .flex_none()
-                .size(IconSize::Small.rems())
-                .into_any_element(),
-            Match::CreateNew(_) => Icon::new(IconName::Plus)
-                .color(Color::Muted)
-                .size(IconSize::Small)
-                .into_any_element(),
-        };
-        let (file_name_label, full_path_label) = self.labels_for_match(path_match, window, cx);
-
-        let file_icon = maybe!({
-            if !settings.file_icons {
-                return None;
-            }
-            let abs_path = path_match.abs_path(&self.project, cx)?;
-            let file_name = abs_path.file_name()?;
-            let icon = FileIcons::get_icon(file_name.as_ref(), cx)?;
-            Some(Icon::from_path(icon).color(Color::Muted))
-        });
-
-        Some(
-            ListItem::new(ix)
-                .spacing(ListItemSpacing::Sparse)
-                .start_slot::<Icon>(file_icon)
-                .end_slot::<AnyElement>(history_icon)
-                .inset(true)
-                .toggle_state(selected)
-                .child(
-                    h_flex()
-                        .gap_2()
-                        .py_px()
-                        .child(file_name_label)
-                        .child(full_path_label),
-                ),
-        )
-    }
-
-    fn render_footer(&self, _: &mut Window, cx: &mut Context<Picker<Self>>) -> Option<AnyElement> {
-        let focus_handle = self.focus_handle.clone();
-
-        Some(
-            h_flex()
-                .w_full()
-                .p_1p5()
-                .justify_between()
-                .border_t_1()
-                .border_color(cx.theme().colors().border_variant)
-                .child(
-                    PopoverMenu::new("filter-menu-popover")
-                        .with_handle(self.filter_popover_menu_handle.clone())
-                        .attach(gpui::Corner::BottomRight)
-                        .anchor(gpui::Corner::BottomLeft)
-                        .offset(gpui::Point {
-                            x: px(1.0),
-                            y: px(1.0),
-                        })
-                        .trigger_with_tooltip(
-                            IconButton::new("filter-trigger", IconName::Sliders)
-                                .icon_size(IconSize::Small)
-                                .icon_size(IconSize::Small)
-                                .toggle_state(self.include_ignored.unwrap_or(false))
-                                .when(self.include_ignored.is_some(), |this| {
-                                    this.indicator(Indicator::dot().color(Color::Info))
-                                }),
-                            {
-                                let focus_handle = focus_handle.clone();
-                                move |_window, cx| {
-                                    Tooltip::for_action_in(
-                                        "Filter Options",
-                                        &ToggleFilterMenu,
-                                        &focus_handle,
-                                        cx,
-                                    )
-                                }
-                            },
-                        )
-                        .menu({
-                            let focus_handle = focus_handle.clone();
-                            let include_ignored = self.include_ignored;
-
-                            move |window, cx| {
-                                Some(ContextMenu::build(window, cx, {
-                                    let focus_handle = focus_handle.clone();
-                                    move |menu, _, _| {
-                                        menu.context(focus_handle.clone())
-                                            .header("Filter Options")
-                                            .toggleable_entry(
-                                                "Include Ignored Files",
-                                                include_ignored.unwrap_or(false),
-                                                ui::IconPosition::End,
-                                                Some(ToggleIncludeIgnored.boxed_clone()),
-                                                move |window, cx| {
-                                                    window.focus(&focus_handle);
-                                                    window.dispatch_action(
-                                                        ToggleIncludeIgnored.boxed_clone(),
-                                                        cx,
-                                                    );
-                                                },
-                                            )
-                                    }
-                                }))
-                            }
-                        }),
-                )
-                .child(
-                    h_flex()
-                        .gap_0p5()
-                        .child(
-                            PopoverMenu::new("split-menu-popover")
-                                .with_handle(self.split_popover_menu_handle.clone())
-                                .attach(gpui::Corner::BottomRight)
-                                .anchor(gpui::Corner::BottomLeft)
-                                .offset(gpui::Point {
-                                    x: px(1.0),
-                                    y: px(1.0),
-                                })
-                                .trigger(
-                                    ButtonLike::new("split-trigger")
-                                        .child(Label::new("Split…"))
-                                        .selected_style(ButtonStyle::Tinted(TintColor::Accent))
-                                        .child(
-                                            KeyBinding::for_action_in(
-                                                &ToggleSplitMenu,
-                                                &focus_handle,
-                                                cx,
-                                            )
-                                            .size(rems_from_px(12.)),
-                                        ),
-                                )
-                                .menu({
-                                    let focus_handle = focus_handle.clone();
-
-                                    move |window, cx| {
-                                        Some(ContextMenu::build(window, cx, {
-                                            let focus_handle = focus_handle.clone();
-                                            move |menu, _, _| {
-                                                menu.context(focus_handle)
-                                                    .action(
-                                                        "Split Left",
-                                                        pane::SplitLeft.boxed_clone(),
-                                                    )
-                                                    .action(
-                                                        "Split Right",
-                                                        pane::SplitRight.boxed_clone(),
-                                                    )
-                                                    .action("Split Up", pane::SplitUp.boxed_clone())
-                                                    .action(
-                                                        "Split Down",
-                                                        pane::SplitDown.boxed_clone(),
-                                                    )
-                                            }
-                                        }))
-                                    }
-                                }),
-                        )
-                        .child(
-                            Button::new("open-selection", "Open")
-                                .key_binding(
-                                    KeyBinding::for_action_in(&menu::Confirm, &focus_handle, cx)
-                                        .map(|kb| kb.size(rems_from_px(12.))),
-                                )
-                                .on_click(|_, window, cx| {
-                                    window.dispatch_action(menu::Confirm.boxed_clone(), cx)
-                                }),
-                        ),
-                )
-                .into_any(),
-        )
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-struct PathComponentSlice<'a> {
-    path: Cow<'a, Path>,
-    path_str: Cow<'a, str>,
-    component_ranges: Vec<(Component<'a>, Range<usize>)>,
-}
-
-impl<'a> PathComponentSlice<'a> {
-    fn new(path: &'a str) -> Self {
-        let trimmed_path = Path::new(path).components().as_path().as_os_str();
-        let mut component_ranges = Vec::new();
-        let mut components = Path::new(trimmed_path).components();
-        let len = trimmed_path.as_encoded_bytes().len();
-        let mut pos = 0;
-        while let Some(component) = components.next() {
-            component_ranges.push((component, pos..0));
-            pos = len - components.as_path().as_os_str().as_encoded_bytes().len();
-        }
-        for ((_, range), ancestor) in component_ranges
-            .iter_mut()
-            .rev()
-            .zip(Path::new(trimmed_path).ancestors())
-        {
-            range.end = ancestor.as_os_str().as_encoded_bytes().len();
-        }
-        Self {
-            path: Cow::Borrowed(Path::new(path)),
-            path_str: Cow::Borrowed(path),
-            component_ranges,
-        }
-    }
-
-    fn elision_range(&self, budget: usize, matches: &[usize]) -> Option<Range<usize>> {
-        let eligible_range = {
-            assert!(matches.windows(2).all(|w| w[0] <= w[1]));
-            let mut matches = matches.iter().copied().peekable();
-            let mut longest: Option<Range<usize>> = None;
-            let mut cur = 0..0;
-            let mut seen_normal = false;
-            for (i, (component, range)) in self.component_ranges.iter().enumerate() {
-                let is_normal = matches!(component, Component::Normal(_));
-                let is_first_normal = is_normal && !seen_normal;
-                seen_normal |= is_normal;
-                let is_last = i == self.component_ranges.len() - 1;
-                let contains_match = matches.peek().is_some_and(|mat| range.contains(mat));
-                if contains_match {
-                    matches.next();
-                }
-                if is_first_normal || is_last || !is_normal || contains_match {
-                    if longest
-                        .as_ref()
-                        .is_none_or(|old| old.end - old.start <= cur.end - cur.start)
-                    {
-                        longest = Some(cur);
-                    }
-                    cur = i + 1..i + 1;
-                } else {
-                    cur.end = i + 1;
-                }
-            }
-            if longest
-                .as_ref()
-                .is_none_or(|old| old.end - old.start <= cur.end - cur.start)
-            {
-                longest = Some(cur);
-            }
-            longest
-        };
-
-        let eligible_range = eligible_range?;
-        assert!(eligible_range.start <= eligible_range.end);
-        if eligible_range.is_empty() {
-            return None;
-        }
-
-        let elided_range: Range<usize> = {
-            let byte_range = self.component_ranges[eligible_range.start].1.start
-                ..self.component_ranges[eligible_range.end - 1].1.end;
-            let midpoint = self.path_str.len() / 2;
-            let distance_from_start = byte_range.start.abs_diff(midpoint);
-            let distance_from_end = byte_range.end.abs_diff(midpoint);
-            let pick_from_end = distance_from_start > distance_from_end;
-            let mut len_with_elision = self.path_str.len();
-            let mut i = eligible_range.start;
-            while i < eligible_range.end {
-                let x = if pick_from_end {
-                    eligible_range.end - i + eligible_range.start - 1
-                } else {
-                    i
-                };
-                len_with_elision -= self.component_ranges[x]
-                    .0
-                    .as_os_str()
-                    .as_encoded_bytes()
-                    .len()
-                    + 1;
-                if len_with_elision <= budget {
-                    break;
-                }
-                i += 1;
-            }
-            if len_with_elision > budget {
-                return None;
-            } else if pick_from_end {
-                let x = eligible_range.end - i + eligible_range.start - 1;
-                x..eligible_range.end
-            } else {
-                let x = i;
-                eligible_range.start..x + 1
-            }
-        };
-
-        let byte_range = self.component_ranges[elided_range.start].1.start
-            ..self.component_ranges[elided_range.end - 1].1.end;
-        Some(byte_range)
-    }
-}
diff --git a/crates/file_finder/src/file_finder_settings.rs b/crates/file_finder/src/file_finder_settings.rs
deleted file mode 100644
index 36f05e89bd..0000000000
--- a/crates/file_finder/src/file_finder_settings.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use settings::{RegisterSetting, Settings};
-
-#[derive(Deserialize, Debug, Clone, Copy, PartialEq, RegisterSetting)]
-pub struct FileFinderSettings {
-    pub file_icons: bool,
-    pub modal_max_width: FileFinderWidth,
-    pub skip_focus_for_active_in_search: bool,
-    pub include_ignored: Option<bool>,
-}
-
-impl Settings for FileFinderSettings {
-    fn from_settings(content: &settings::SettingsContent) -> Self {
-        let file_finder = content.file_finder.as_ref().unwrap();
-
-        Self {
-            file_icons: file_finder.file_icons.unwrap(),
-            modal_max_width: file_finder.modal_max_width.unwrap().into(),
-            skip_focus_for_active_in_search: file_finder.skip_focus_for_active_in_search.unwrap(),
-            include_ignored: match file_finder.include_ignored.unwrap() {
-                settings::IncludeIgnoredContent::All => Some(true),
-                settings::IncludeIgnoredContent::Indexed => Some(false),
-                settings::IncludeIgnoredContent::Smart => None,
-            },
-        }
-    }
-}
-
-#[derive(Debug, PartialEq, Eq, Clone, Copy, Default, Serialize, Deserialize, JsonSchema)]
-#[serde(rename_all = "lowercase")]
-pub enum FileFinderWidth {
-    #[default]
-    Small,
-    Medium,
-    Large,
-    XLarge,
-    Full,
-}
-
-impl From<settings::FileFinderWidthContent> for FileFinderWidth {
-    fn from(content: settings::FileFinderWidthContent) -> Self {
-        match content {
-            settings::FileFinderWidthContent::Small => FileFinderWidth::Small,
-            settings::FileFinderWidthContent::Medium => FileFinderWidth::Medium,
-            settings::FileFinderWidthContent::Large => FileFinderWidth::Large,
-            settings::FileFinderWidthContent::XLarge => FileFinderWidth::XLarge,
-            settings::FileFinderWidthContent::Full => FileFinderWidth::Full,
-        }
-    }
-}
diff --git a/crates/file_finder/src/file_finder_tests.rs b/crates/file_finder/src/file_finder_tests.rs
deleted file mode 100644
index aeb9d794c2..0000000000
--- a/crates/file_finder/src/file_finder_tests.rs
+++ /dev/null
@@ -1,3550 +0,0 @@
-use std::{future::IntoFuture, path::Path, time::Duration};
-
-use super::*;
-use editor::Editor;
-use gpui::{Entity, TestAppContext, VisualTestContext};
-use menu::{Confirm, SelectNext, SelectPrevious};
-use pretty_assertions::{assert_eq, assert_matches};
-use project::{FS_WATCH_LATENCY, RemoveOptions};
-use serde_json::json;
-use settings::SettingsStore;
-use util::{path, rel_path::rel_path};
-use workspace::{AppState, CloseActiveItem, OpenOptions, ToggleFileFinder, Workspace, open_paths};
-
-#[ctor::ctor]
-fn init_logger() {
-    zlog::init_test();
-}
-
-#[test]
-fn test_path_elision() {
-    #[track_caller]
-    fn check(path: &str, budget: usize, matches: impl IntoIterator<Item = usize>, expected: &str) {
-        let mut path = path.to_owned();
-        let slice = PathComponentSlice::new(&path);
-        let matches = Vec::from_iter(matches);
-        if let Some(range) = slice.elision_range(budget - 1, &matches) {
-            path.replace_range(range, "…");
-        }
-        assert_eq!(path, expected);
-    }
-
-    // Simple cases, mostly to check that different path shapes are handled gracefully.
-    check("p/a/b/c/d/", 6, [], "p/…/d/");
-    check("p/a/b/c/d/", 1, [2, 4, 6], "p/a/b/c/d/");
-    check("p/a/b/c/d/", 10, [2, 6], "p/a/…/c/d/");
-    check("p/a/b/c/d/", 8, [6], "p/…/c/d/");
-
-    check("p/a/b/c/d", 5, [], "p/…/d");
-    check("p/a/b/c/d", 9, [2, 4, 6], "p/a/b/c/d");
-    check("p/a/b/c/d", 9, [2, 6], "p/a/…/c/d");
-    check("p/a/b/c/d", 7, [6], "p/…/c/d");
-
-    check("/p/a/b/c/d/", 7, [], "/p/…/d/");
-    check("/p/a/b/c/d/", 11, [3, 5, 7], "/p/a/b/c/d/");
-    check("/p/a/b/c/d/", 11, [3, 7], "/p/a/…/c/d/");
-    check("/p/a/b/c/d/", 9, [7], "/p/…/c/d/");
-
-    // If the budget can't be met, no elision is done.
-    check(
-        "project/dir/child/grandchild",
-        5,
-        [],
-        "project/dir/child/grandchild",
-    );
-
-    // The longest unmatched segment is picked for elision.
-    check(
-        "project/one/two/X/three/sub",
-        21,
-        [16],
-        "project/…/X/three/sub",
-    );
-
-    // Elision stops when the budget is met, even though there are more components in the chosen segment.
-    // It proceeds from the end of the unmatched segment that is closer to the midpoint of the path.
-    check(
-        "project/one/two/three/X/sub",
-        21,
-        [22],
-        "project/…/three/X/sub",
-    )
-}
-
-#[test]
-fn test_custom_project_search_ordering_in_file_finder() {
-    let mut file_finder_sorted_output = vec![
-        ProjectPanelOrdMatch(PathMatch {
-            score: 0.5,
-            positions: Vec::new(),
-            worktree_id: 0,
-            path: rel_path("b0.5").into(),
-            path_prefix: rel_path("").into(),
-            distance_to_relative_ancestor: 0,
-            is_dir: false,
-        }),
-        ProjectPanelOrdMatch(PathMatch {
-            score: 1.0,
-            positions: Vec::new(),
-            worktree_id: 0,
-            path: rel_path("c1.0").into(),
-            path_prefix: rel_path("").into(),
-            distance_to_relative_ancestor: 0,
-            is_dir: false,
-        }),
-        ProjectPanelOrdMatch(PathMatch {
-            score: 1.0,
-            positions: Vec::new(),
-            worktree_id: 0,
-            path: rel_path("a1.0").into(),
-            path_prefix: rel_path("").into(),
-            distance_to_relative_ancestor: 0,
-            is_dir: false,
-        }),
-        ProjectPanelOrdMatch(PathMatch {
-            score: 0.5,
-            positions: Vec::new(),
-            worktree_id: 0,
-            path: rel_path("a0.5").into(),
-            path_prefix: rel_path("").into(),
-            distance_to_relative_ancestor: 0,
-            is_dir: false,
-        }),
-        ProjectPanelOrdMatch(PathMatch {
-            score: 1.0,
-            positions: Vec::new(),
-            worktree_id: 0,
-            path: rel_path("b1.0").into(),
-            path_prefix: rel_path("").into(),
-            distance_to_relative_ancestor: 0,
-            is_dir: false,
-        }),
-    ];
-    file_finder_sorted_output.sort_by(|a, b| b.cmp(a));
-
-    assert_eq!(
-        file_finder_sorted_output,
-        vec![
-            ProjectPanelOrdMatch(PathMatch {
-                score: 1.0,
-                positions: Vec::new(),
-                worktree_id: 0,
-                path: rel_path("a1.0").into(),
-                path_prefix: rel_path("").into(),
-                distance_to_relative_ancestor: 0,
-                is_dir: false,
-            }),
-            ProjectPanelOrdMatch(PathMatch {
-                score: 1.0,
-                positions: Vec::new(),
-                worktree_id: 0,
-                path: rel_path("b1.0").into(),
-                path_prefix: rel_path("").into(),
-                distance_to_relative_ancestor: 0,
-                is_dir: false,
-            }),
-            ProjectPanelOrdMatch(PathMatch {
-                score: 1.0,
-                positions: Vec::new(),
-                worktree_id: 0,
-                path: rel_path("c1.0").into(),
-                path_prefix: rel_path("").into(),
-                distance_to_relative_ancestor: 0,
-                is_dir: false,
-            }),
-            ProjectPanelOrdMatch(PathMatch {
-                score: 0.5,
-                positions: Vec::new(),
-                worktree_id: 0,
-                path: rel_path("a0.5").into(),
-                path_prefix: rel_path("").into(),
-                distance_to_relative_ancestor: 0,
-                is_dir: false,
-            }),
-            ProjectPanelOrdMatch(PathMatch {
-                score: 0.5,
-                positions: Vec::new(),
-                worktree_id: 0,
-                path: rel_path("b0.5").into(),
-                path_prefix: rel_path("").into(),
-                distance_to_relative_ancestor: 0,
-                is_dir: false,
-            }),
-        ]
-    );
-}
-
-#[gpui::test]
-async fn test_matching_paths(cx: &mut TestAppContext) {
-    let app_state = init_test(cx);
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/root"),
-            json!({
-                "a": {
-                    "banana": "",
-                    "bandana": "",
-                }
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), [path!("/root").as_ref()], cx).await;
-
-    let (picker, workspace, cx) = build_find_picker(project, cx);
-
-    cx.simulate_input("bna");
-    picker.update(cx, |picker, _| {
-        assert_eq!(picker.delegate.matches.len(), 3);
-    });
-    cx.dispatch_action(SelectNext);
-    cx.dispatch_action(Confirm);
-    cx.read(|cx| {
-        let active_editor = workspace.read(cx).active_item_as::<Editor>(cx).unwrap();
-        assert_eq!(active_editor.read(cx).title(cx), "bandana");
-    });
-
-    for bandana_query in [
-        "bandana",
-        "./bandana",
-        ".\\bandana",
-        util::path!("a/bandana"),
-        "b/bandana",
-        "b\\bandana",
-        " bandana",
-        "bandana ",
-        " bandana ",
-        " ndan ",
-        " band ",
-        "a bandana",
-        "bandana:",
-    ] {
-        picker
-            .update_in(cx, |picker, window, cx| {
-                picker
-                    .delegate
-                    .update_matches(bandana_query.to_string(), window, cx)
-            })
-            .await;
-        picker.update(cx, |picker, _| {
-            assert_eq!(
-                picker.delegate.matches.len(),
-                // existence of CreateNew option depends on whether path already exists
-                if bandana_query == util::path!("a/bandana") {
-                    1
-                } else {
-                    2
-                },
-                "Wrong number of matches for bandana query '{bandana_query}'. Matches: {:?}",
-                picker.delegate.matches
-            );
-        });
-        cx.dispatch_action(SelectNext);
-        cx.dispatch_action(Confirm);
-        cx.read(|cx| {
-            let active_editor = workspace.read(cx).active_item_as::<Editor>(cx).unwrap();
-            assert_eq!(
-                active_editor.read(cx).title(cx),
-                "bandana",
-                "Wrong match for bandana query '{bandana_query}'"
-            );
-        });
-    }
-}
-
-#[gpui::test]
-async fn test_matching_paths_with_colon(cx: &mut TestAppContext) {
-    let app_state = init_test(cx);
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/root"),
-            json!({
-                "a": {
-                    "foo:bar.rs": "",
-                    "foo.rs": "",
-                }
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), [path!("/root").as_ref()], cx).await;
-
-    let (picker, _, cx) = build_find_picker(project, cx);
-
-    // 'foo:' matches both files
-    cx.simulate_input("foo:");
-    picker.update(cx, |picker, _| {
-        assert_eq!(picker.delegate.matches.len(), 3);
-        assert_match_at_position(picker, 0, "foo.rs");
-        assert_match_at_position(picker, 1, "foo:bar.rs");
-    });
-
-    // 'foo:b' matches one of the files
-    cx.simulate_input("b");
-    picker.update(cx, |picker, _| {
-        assert_eq!(picker.delegate.matches.len(), 2);
-        assert_match_at_position(picker, 0, "foo:bar.rs");
-    });
-
-    cx.dispatch_action(editor::actions::Backspace);
-
-    // 'foo:1' matches both files, specifying which row to jump to
-    cx.simulate_input("1");
-    picker.update(cx, |picker, _| {
-        assert_eq!(picker.delegate.matches.len(), 3);
-        assert_match_at_position(picker, 0, "foo.rs");
-        assert_match_at_position(picker, 1, "foo:bar.rs");
-    });
-}
-
-#[gpui::test]
-async fn test_unicode_paths(cx: &mut TestAppContext) {
-    let app_state = init_test(cx);
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/root"),
-            json!({
-                "a": {
-                    "İg": " ",
-                }
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), [path!("/root").as_ref()], cx).await;
-
-    let (picker, workspace, cx) = build_find_picker(project, cx);
-
-    cx.simulate_input("g");
-    picker.update(cx, |picker, _| {
-        assert_eq!(picker.delegate.matches.len(), 2);
-        assert_match_at_position(picker, 1, "g");
-    });
-    cx.dispatch_action(Confirm);
-    cx.read(|cx| {
-        let active_editor = workspace.read(cx).active_item_as::<Editor>(cx).unwrap();
-        assert_eq!(active_editor.read(cx).title(cx), "İg");
-    });
-}
-
-#[gpui::test]
-async fn test_absolute_paths(cx: &mut TestAppContext) {
-    let app_state = init_test(cx);
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/root"),
-            json!({
-                "a": {
-                    "file1.txt": "",
-                    "b": {
-                        "file2.txt": "",
-                    },
-                }
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), [path!("/root").as_ref()], cx).await;
-
-    let (picker, workspace, cx) = build_find_picker(project, cx);
-
-    let matching_abs_path = path!("/root/a/b/file2.txt").to_string();
-    picker
-        .update_in(cx, |picker, window, cx| {
-            picker
-                .delegate
-                .update_matches(matching_abs_path, window, cx)
-        })
-        .await;
-    picker.update(cx, |picker, _| {
-        assert_eq!(
-            collect_search_matches(picker).search_paths_only(),
-            vec![rel_path("a/b/file2.txt").into()],
-            "Matching abs path should be the only match"
-        )
-    });
-    cx.dispatch_action(SelectNext);
-    cx.dispatch_action(Confirm);
-    cx.read(|cx| {
-        let active_editor = workspace.read(cx).active_item_as::<Editor>(cx).unwrap();
-        assert_eq!(active_editor.read(cx).title(cx), "file2.txt");
-    });
-
-    let mismatching_abs_path = path!("/root/a/b/file1.txt").to_string();
-    picker
-        .update_in(cx, |picker, window, cx| {
-            picker
-                .delegate
-                .update_matches(mismatching_abs_path, window, cx)
-        })
-        .await;
-    picker.update(cx, |picker, _| {
-        assert_eq!(
-            collect_search_matches(picker).search_paths_only(),
-            Vec::new(),
-            "Mismatching abs path should produce no matches"
-        )
-    });
-}
-
-#[gpui::test]
-async fn test_complex_path(cx: &mut TestAppContext) {
-    let app_state = init_test(cx);
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/root"),
-            json!({
-                "其他": {
-                    "S数据表格": {
-                        "task.xlsx": "some content",
-                    },
-                }
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), [path!("/root").as_ref()], cx).await;
-
-    let (picker, workspace, cx) = build_find_picker(project, cx);
-
-    cx.simulate_input("t");
-    picker.update(cx, |picker, _| {
-        assert_eq!(picker.delegate.matches.len(), 2);
-        assert_eq!(
-            collect_search_matches(picker).search_paths_only(),
-            vec![rel_path("其他/S数据表格/task.xlsx").into()],
-        )
-    });
-    cx.dispatch_action(Confirm);
-    cx.read(|cx| {
-        let active_editor = workspace.read(cx).active_item_as::<Editor>(cx).unwrap();
-        assert_eq!(active_editor.read(cx).title(cx), "task.xlsx");
-    });
-}
-
-#[gpui::test]
-async fn test_row_column_numbers_query_inside_file(cx: &mut TestAppContext) {
-    let app_state = init_test(cx);
-
-    let first_file_name = "first.rs";
-    let first_file_contents = "// First Rust file";
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/src"),
-            json!({
-                "test": {
-                    first_file_name: first_file_contents,
-                    "second.rs": "// Second Rust file",
-                }
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), [path!("/src").as_ref()], cx).await;
-
-    let (picker, workspace, cx) = build_find_picker(project, cx);
-
-    let file_query = &first_file_name[..3];
-    let file_row = 1;
-    let file_column = 3;
-    assert!(file_column <= first_file_contents.len());
-    let query_inside_file = format!("{file_query}:{file_row}:{file_column}");
-    picker
-        .update_in(cx, |finder, window, cx| {
-            finder
-                .delegate
-                .update_matches(query_inside_file.to_string(), window, cx)
-        })
-        .await;
-    picker.update(cx, |finder, _| {
-        assert_match_at_position(finder, 1, &query_inside_file.to_string());
-        let finder = &finder.delegate;
-        assert_eq!(finder.matches.len(), 2);
-        let latest_search_query = finder
-            .latest_search_query
-            .as_ref()
-            .expect("Finder should have a query after the update_matches call");
-        assert_eq!(latest_search_query.raw_query, query_inside_file);
-        assert_eq!(latest_search_query.file_query_end, Some(file_query.len()));
-        assert_eq!(latest_search_query.path_position.row, Some(file_row));
-        assert_eq!(
-            latest_search_query.path_position.column,
-            Some(file_column as u32)
-        );
-    });
-
-    cx.dispatch_action(Confirm);
-
-    let editor = cx.update(|_, cx| workspace.read(cx).active_item_as::<Editor>(cx).unwrap());
-    cx.executor().advance_clock(Duration::from_secs(2));
-
-    editor.update(cx, |editor, cx| {
-            let all_selections = editor.selections.all_adjusted(&editor.display_snapshot(cx));
-            assert_eq!(
-                all_selections.len(),
-                1,
-                "Expected to have 1 selection (caret) after file finder confirm, but got: {all_selections:?}"
-            );
-            let caret_selection = all_selections.into_iter().next().unwrap();
-            assert_eq!(caret_selection.start, caret_selection.end,
-                "Caret selection should have its start and end at the same position");
-            assert_eq!(file_row, caret_selection.start.row + 1,
-                "Query inside file should get caret with the same focus row");
-            assert_eq!(file_column, caret_selection.start.column as usize + 1,
-                "Query inside file should get caret with the same focus column");
-        });
-}
-
-#[gpui::test]
-async fn test_row_column_numbers_query_outside_file(cx: &mut TestAppContext) {
-    let app_state = init_test(cx);
-
-    let first_file_name = "first.rs";
-    let first_file_contents = "// First Rust file";
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/src"),
-            json!({
-                "test": {
-                    first_file_name: first_file_contents,
-                    "second.rs": "// Second Rust file",
-                }
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), [path!("/src").as_ref()], cx).await;
-
-    let (picker, workspace, cx) = build_find_picker(project, cx);
-
-    let file_query = &first_file_name[..3];
-    let file_row = 200;
-    let file_column = 300;
-    assert!(file_column > first_file_contents.len());
-    let query_outside_file = format!("{file_query}:{file_row}:{file_column}");
-    picker
-        .update_in(cx, |picker, window, cx| {
-            picker
-                .delegate
-                .update_matches(query_outside_file.to_string(), window, cx)
-        })
-        .await;
-    picker.update(cx, |finder, _| {
-        assert_match_at_position(finder, 1, &query_outside_file.to_string());
-        let delegate = &finder.delegate;
-        assert_eq!(delegate.matches.len(), 2);
-        let latest_search_query = delegate
-            .latest_search_query
-            .as_ref()
-            .expect("Finder should have a query after the update_matches call");
-        assert_eq!(latest_search_query.raw_query, query_outside_file);
-        assert_eq!(latest_search_query.file_query_end, Some(file_query.len()));
-        assert_eq!(latest_search_query.path_position.row, Some(file_row));
-        assert_eq!(
-            latest_search_query.path_position.column,
-            Some(file_column as u32)
-        );
-    });
-
-    cx.dispatch_action(Confirm);
-
-    let editor = cx.update(|_, cx| workspace.read(cx).active_item_as::<Editor>(cx).unwrap());
-    cx.executor().advance_clock(Duration::from_secs(2));
-
-    editor.update(cx, |editor, cx| {
-            let all_selections = editor.selections.all_adjusted(&editor.display_snapshot(cx));
-            assert_eq!(
-                all_selections.len(),
-                1,
-                "Expected to have 1 selection (caret) after file finder confirm, but got: {all_selections:?}"
-            );
-            let caret_selection = all_selections.into_iter().next().unwrap();
-            assert_eq!(caret_selection.start, caret_selection.end,
-                "Caret selection should have its start and end at the same position");
-            assert_eq!(0, caret_selection.start.row,
-                "Excessive rows (as in query outside file borders) should get trimmed to last file row");
-            assert_eq!(first_file_contents.len(), caret_selection.start.column as usize,
-                "Excessive columns (as in query outside file borders) should get trimmed to selected row's last column");
-        });
-}
-
-#[gpui::test]
-async fn test_matching_cancellation(cx: &mut TestAppContext) {
-    let app_state = init_test(cx);
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            "/dir",
-            json!({
-                "hello": "",
-                "goodbye": "",
-                "halogen-light": "",
-                "happiness": "",
-                "height": "",
-                "hi": "",
-                "hiccup": "",
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), ["/dir".as_ref()], cx).await;
-
-    let (picker, _, cx) = build_find_picker(project, cx);
-
-    let query = test_path_position("hi");
-    picker
-        .update_in(cx, |picker, window, cx| {
-            picker.delegate.spawn_search(query.clone(), window, cx)
-        })
-        .await;
-
-    picker.update(cx, |picker, _cx| {
-        // CreateNew option not shown in this case since file already exists
-        assert_eq!(picker.delegate.matches.len(), 5);
-    });
-
-    picker.update_in(cx, |picker, window, cx| {
-        let matches = collect_search_matches(picker).search_matches_only();
-        let delegate = &mut picker.delegate;
-
-        // Simulate a search being cancelled after the time limit,
-        // returning only a subset of the matches that would have been found.
-        drop(delegate.spawn_search(query.clone(), window, cx));
-        delegate.set_search_matches(
-            delegate.latest_search_id,
-            true, // did-cancel
-            query.clone(),
-            vec![
-                ProjectPanelOrdMatch(matches[1].clone()),
-                ProjectPanelOrdMatch(matches[3].clone()),
-            ],
-            cx,
-        );
-
-        // Simulate another cancellation.
-        drop(delegate.spawn_search(query.clone(), window, cx));
-        delegate.set_search_matches(
-            delegate.latest_search_id,
-            true, // did-cancel
-            query.clone(),
-            vec![
-                ProjectPanelOrdMatch(matches[0].clone()),
-                ProjectPanelOrdMatch(matches[2].clone()),
-                ProjectPanelOrdMatch(matches[3].clone()),
-            ],
-            cx,
-        );
-
-        assert_eq!(
-            collect_search_matches(picker)
-                .search_matches_only()
-                .as_slice(),
-            &matches[0..4]
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_ignored_root_with_file_inclusions(cx: &mut TestAppContext) {
-    let app_state = init_test(cx);
-    cx.update(|cx| {
-        cx.update_global::<SettingsStore, _>(|store, cx| {
-            store.update_user_settings(cx, |settings| {
-                settings.project.worktree.file_scan_inclusions = Some(vec![
-                    "height_demo/**/hi_bonjour".to_string(),
-                    "**/height_1".to_string(),
-                ]);
-            });
-        })
-    });
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            "/ancestor",
-            json!({
-                ".gitignore": "ignored-root",
-                "ignored-root": {
-                    "happiness": "",
-                    "height": "",
-                    "hi": "",
-                    "hiccup": "",
-                },
-                "tracked-root": {
-                    ".gitignore": "height*",
-                    "happiness": "",
-                    "height": "",
-                    "heights": {
-                        "height_1": "",
-                        "height_2": "",
-                    },
-                    "height_demo": {
-                        "test_1": {
-                            "hi_bonjour": "hi_bonjour",
-                            "hi": "hello",
-                        },
-                        "hihi": "bye",
-                        "test_2": {
-                            "hoi": "nl"
-                        }
-                    },
-                    "height_include": {
-                        "height_1_include": "",
-                        "height_2_include": "",
-                    },
-                    "hi": "",
-                    "hiccup": "",
-                },
-            }),
-        )
-        .await;
-
-    let project = Project::test(
-        app_state.fs.clone(),
-        [
-            Path::new(path!("/ancestor/tracked-root")),
-            Path::new(path!("/ancestor/ignored-root")),
-        ],
-        cx,
-    )
-    .await;
-    let (picker, _workspace, cx) = build_find_picker(project, cx);
-
-    picker
-        .update_in(cx, |picker, window, cx| {
-            picker
-                .delegate
-                .spawn_search(test_path_position("hi"), window, cx)
-        })
-        .await;
-    picker.update(cx, |picker, _| {
-        let matches = collect_search_matches(picker);
-        assert_eq!(matches.history.len(), 0);
-        assert_eq!(
-            matches.search,
-            vec![
-                rel_path("ignored-root/hi").into(),
-                rel_path("tracked-root/hi").into(),
-                rel_path("ignored-root/hiccup").into(),
-                rel_path("tracked-root/hiccup").into(),
-                rel_path("tracked-root/height_demo/test_1/hi_bonjour").into(),
-                rel_path("ignored-root/height").into(),
-                rel_path("tracked-root/heights/height_1").into(),
-                rel_path("ignored-root/happiness").into(),
-                rel_path("tracked-root/happiness").into(),
-            ],
-            "All ignored files that were indexed are found for default ignored mode"
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_ignored_root_with_file_inclusions_repro(cx: &mut TestAppContext) {
-    let app_state = init_test(cx);
-    cx.update(|cx| {
-        cx.update_global::<SettingsStore, _>(|store, cx| {
-            store.update_user_settings(cx, |settings| {
-                settings.project.worktree.file_scan_inclusions = Some(vec!["**/.env".to_string()]);
-            });
-        })
-    });
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            "/src",
-            json!({
-                ".gitignore": "node_modules",
-                "node_modules": {
-                    "package.json": "// package.json",
-                    ".env": "BAR=FOO"
-                },
-                ".env": "FOO=BAR"
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), [Path::new(path!("/src"))], cx).await;
-    let (picker, _workspace, cx) = build_find_picker(project, cx);
-
-    picker
-        .update_in(cx, |picker, window, cx| {
-            picker
-                .delegate
-                .spawn_search(test_path_position("json"), window, cx)
-        })
-        .await;
-    picker.update(cx, |picker, _| {
-        let matches = collect_search_matches(picker);
-        assert_eq!(matches.history.len(), 0);
-        assert_eq!(
-            matches.search,
-            vec![],
-            "All ignored files that were indexed are found for default ignored mode"
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_ignored_root(cx: &mut TestAppContext) {
-    let app_state = init_test(cx);
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            "/ancestor",
-            json!({
-                ".gitignore": "ignored-root",
-                "ignored-root": {
-                    "happiness": "",
-                    "height": "",
-                    "hi": "",
-                    "hiccup": "",
-                },
-                "tracked-root": {
-                    ".gitignore": "height*",
-                    "happiness": "",
-                    "height": "",
-                    "heights": {
-                        "height_1": "",
-                        "height_2": "",
-                    },
-                    "hi": "",
-                    "hiccup": "",
-                },
-            }),
-        )
-        .await;
-
-    let project = Project::test(
-        app_state.fs.clone(),
-        [
-            Path::new(path!("/ancestor/tracked-root")),
-            Path::new(path!("/ancestor/ignored-root")),
-        ],
-        cx,
-    )
-    .await;
-    let (picker, workspace, cx) = build_find_picker(project, cx);
-
-    picker
-        .update_in(cx, |picker, window, cx| {
-            picker
-                .delegate
-                .spawn_search(test_path_position("hi"), window, cx)
-        })
-        .await;
-    picker.update(cx, |picker, _| {
-        let matches = collect_search_matches(picker);
-        assert_eq!(matches.history.len(), 0);
-        assert_eq!(
-            matches.search,
-            vec![
-                rel_path("ignored-root/hi").into(),
-                rel_path("tracked-root/hi").into(),
-                rel_path("ignored-root/hiccup").into(),
-                rel_path("tracked-root/hiccup").into(),
-                rel_path("ignored-root/height").into(),
-                rel_path("ignored-root/happiness").into(),
-                rel_path("tracked-root/happiness").into(),
-            ],
-            "All ignored files that were indexed are found for default ignored mode"
-        );
-    });
-    cx.dispatch_action(ToggleIncludeIgnored);
-    picker
-        .update_in(cx, |picker, window, cx| {
-            picker
-                .delegate
-                .spawn_search(test_path_position("hi"), window, cx)
-        })
-        .await;
-    picker.update(cx, |picker, _| {
-        let matches = collect_search_matches(picker);
-        assert_eq!(matches.history.len(), 0);
-        assert_eq!(
-            matches.search,
-            vec![
-                rel_path("ignored-root/hi").into(),
-                rel_path("tracked-root/hi").into(),
-                rel_path("ignored-root/hiccup").into(),
-                rel_path("tracked-root/hiccup").into(),
-                rel_path("ignored-root/height").into(),
-                rel_path("tracked-root/height").into(),
-                rel_path("ignored-root/happiness").into(),
-                rel_path("tracked-root/happiness").into(),
-            ],
-            "All ignored files should be found, for the toggled on ignored mode"
-        );
-    });
-
-    picker
-        .update_in(cx, |picker, window, cx| {
-            picker.delegate.include_ignored = Some(false);
-            picker
-                .delegate
-                .spawn_search(test_path_position("hi"), window, cx)
-        })
-        .await;
-    picker.update(cx, |picker, _| {
-        let matches = collect_search_matches(picker);
-        assert_eq!(matches.history.len(), 0);
-        assert_eq!(
-            matches.search,
-            vec![
-                rel_path("tracked-root/hi").into(),
-                rel_path("tracked-root/hiccup").into(),
-                rel_path("tracked-root/happiness").into(),
-            ],
-            "Only non-ignored files should be found for the turned off ignored mode"
-        );
-    });
-
-    workspace
-        .update_in(cx, |workspace, window, cx| {
-            workspace.open_abs_path(
-                PathBuf::from(path!("/ancestor/tracked-root/heights/height_1")),
-                OpenOptions {
-                    visible: Some(OpenVisible::None),
-                    ..OpenOptions::default()
-                },
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-    cx.run_until_parked();
-    workspace
-        .update_in(cx, |workspace, window, cx| {
-            workspace.active_pane().update(cx, |pane, cx| {
-                pane.close_active_item(&CloseActiveItem::default(), window, cx)
-            })
-        })
-        .await
-        .unwrap();
-    cx.run_until_parked();
-
-    picker
-        .update_in(cx, |picker, window, cx| {
-            picker.delegate.include_ignored = None;
-            picker
-                .delegate
-                .spawn_search(test_path_position("hi"), window, cx)
-        })
-        .await;
-    picker.update(cx, |picker, _| {
-        let matches = collect_search_matches(picker);
-        assert_eq!(matches.history.len(), 0);
-        assert_eq!(
-            matches.search,
-            vec![
-                rel_path("ignored-root/hi").into(),
-                rel_path("tracked-root/hi").into(),
-                rel_path("ignored-root/hiccup").into(),
-                rel_path("tracked-root/hiccup").into(),
-                rel_path("ignored-root/height").into(),
-                rel_path("ignored-root/happiness").into(),
-                rel_path("tracked-root/happiness").into(),
-            ],
-            "Only for the worktree with the ignored root, all indexed ignored files are found in the auto ignored mode"
-        );
-    });
-
-    picker
-        .update_in(cx, |picker, window, cx| {
-            picker.delegate.include_ignored = Some(true);
-            picker
-                .delegate
-                .spawn_search(test_path_position("hi"), window, cx)
-        })
-        .await;
-    picker.update(cx, |picker, _| {
-        let matches = collect_search_matches(picker);
-        assert_eq!(matches.history.len(), 0);
-        assert_eq!(
-            matches.search,
-            vec![
-                rel_path("ignored-root/hi").into(),
-                rel_path("tracked-root/hi").into(),
-                rel_path("ignored-root/hiccup").into(),
-                rel_path("tracked-root/hiccup").into(),
-                rel_path("ignored-root/height").into(),
-                rel_path("tracked-root/height").into(),
-                rel_path("tracked-root/heights/height_1").into(),
-                rel_path("tracked-root/heights/height_2").into(),
-                rel_path("ignored-root/happiness").into(),
-                rel_path("tracked-root/happiness").into(),
-            ],
-            "All ignored files that were indexed are found in the turned on ignored mode"
-        );
-    });
-
-    picker
-        .update_in(cx, |picker, window, cx| {
-            picker.delegate.include_ignored = Some(false);
-            picker
-                .delegate
-                .spawn_search(test_path_position("hi"), window, cx)
-        })
-        .await;
-    picker.update(cx, |picker, _| {
-        let matches = collect_search_matches(picker);
-        assert_eq!(matches.history.len(), 0);
-        assert_eq!(
-            matches.search,
-            vec![
-                rel_path("tracked-root/hi").into(),
-                rel_path("tracked-root/hiccup").into(),
-                rel_path("tracked-root/happiness").into(),
-            ],
-            "Only non-ignored files should be found for the turned off ignored mode"
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_single_file_worktrees(cx: &mut TestAppContext) {
-    let app_state = init_test(cx);
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree("/root", json!({ "the-parent-dir": { "the-file": "" } }))
-        .await;
-
-    let project = Project::test(
-        app_state.fs.clone(),
-        ["/root/the-parent-dir/the-file".as_ref()],
-        cx,
-    )
-    .await;
-
-    let (picker, _, cx) = build_find_picker(project, cx);
-
-    // Even though there is only one worktree, that worktree's filename
-    // is included in the matching, because the worktree is a single file.
-    picker
-        .update_in(cx, |picker, window, cx| {
-            picker
-                .delegate
-                .spawn_search(test_path_position("thf"), window, cx)
-        })
-        .await;
-    cx.read(|cx| {
-        let picker = picker.read(cx);
-        let delegate = &picker.delegate;
-        let matches = collect_search_matches(picker).search_matches_only();
-        assert_eq!(matches.len(), 1);
-
-        let (file_name, file_name_positions, full_path, full_path_positions) =
-            delegate.labels_for_path_match(&matches[0], PathStyle::local());
-        assert_eq!(file_name, "the-file");
-        assert_eq!(file_name_positions, &[0, 1, 4]);
-        assert_eq!(full_path, "");
-        assert_eq!(full_path_positions, &[0; 0]);
-    });
-
-    // Since the worktree root is a file, searching for its name followed by a slash does
-    // not match anything.
-    picker
-        .update_in(cx, |picker, window, cx| {
-            picker
-                .delegate
-                .spawn_search(test_path_position("thf/"), window, cx)
-        })
-        .await;
-    picker.update(cx, |f, _| assert_eq!(f.delegate.matches.len(), 0));
-}
-
-#[gpui::test]
-async fn test_history_items_uniqueness_for_multiple_worktree(cx: &mut TestAppContext) {
-    let app_state = init_test(cx);
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/repo1"),
-            json!({
-                "package.json": r#"{"name": "repo1"}"#,
-                "src": {
-                    "index.js": "// Repo 1 index",
-                }
-            }),
-        )
-        .await;
-
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/repo2"),
-            json!({
-                "package.json": r#"{"name": "repo2"}"#,
-                "src": {
-                    "index.js": "// Repo 2 index",
-                }
-            }),
-        )
-        .await;
-
-    let project = Project::test(
-        app_state.fs.clone(),
-        [path!("/repo1").as_ref(), path!("/repo2").as_ref()],
-        cx,
-    )
-    .await;
-
-    let (workspace, cx) = cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-    let (worktree_id1, worktree_id2) = cx.read(|cx| {
-        let worktrees = workspace.read(cx).worktrees(cx).collect::<Vec<_>>();
-        (worktrees[0].read(cx).id(), worktrees[1].read(cx).id())
-    });
-
-    workspace
-        .update_in(cx, |workspace, window, cx| {
-            workspace.open_path(
-                ProjectPath {
-                    worktree_id: worktree_id1,
-                    path: rel_path("package.json").into(),
-                },
-                None,
-                true,
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-
-    cx.dispatch_action(workspace::CloseActiveItem {
-        save_intent: None,
-        close_pinned: false,
-    });
-
-    let picker = open_file_picker(&workspace, cx);
-    cx.simulate_input("package.json");
-
-    picker.update(cx, |finder, _| {
-        let matches = &finder.delegate.matches.matches;
-
-        assert_eq!(
-            matches.len(),
-            2,
-            "Expected 1 history match + 1 search matches, but got {} matches: {:?}",
-            matches.len(),
-            matches
-        );
-
-        assert_matches!(matches[0], Match::History { .. });
-
-        let search_matches = collect_search_matches(finder);
-        assert_eq!(
-            search_matches.history.len(),
-            1,
-            "Should have exactly 1 history match"
-        );
-        assert_eq!(
-            search_matches.search.len(),
-            1,
-            "Should have exactly 1 search match (the other package.json)"
-        );
-
-        if let Match::History { path, .. } = &matches[0] {
-            assert_eq!(path.project.worktree_id, worktree_id1);
-            assert_eq!(path.project.path.as_ref(), rel_path("package.json"));
-        }
-
-        if let Match::Search(path_match) = &matches[1] {
-            assert_eq!(
-                WorktreeId::from_usize(path_match.0.worktree_id),
-                worktree_id2
-            );
-            assert_eq!(path_match.0.path.as_ref(), rel_path("package.json"));
-        }
-    });
-}
-
-#[gpui::test]
-async fn test_create_file_for_multiple_worktrees(cx: &mut TestAppContext) {
-    let app_state = init_test(cx);
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/roota"),
-            json!({ "the-parent-dira": { "filea": "" } }),
-        )
-        .await;
-
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/rootb"),
-            json!({ "the-parent-dirb": { "fileb": "" } }),
-        )
-        .await;
-
-    let project = Project::test(
-        app_state.fs.clone(),
-        [path!("/roota").as_ref(), path!("/rootb").as_ref()],
-        cx,
-    )
-    .await;
-
-    let (workspace, cx) = cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-    let (_worktree_id1, worktree_id2) = cx.read(|cx| {
-        let worktrees = workspace.read(cx).worktrees(cx).collect::<Vec<_>>();
-        (
-            WorktreeId::from_usize(worktrees[0].entity_id().as_u64() as usize),
-            WorktreeId::from_usize(worktrees[1].entity_id().as_u64() as usize),
-        )
-    });
-
-    let b_path = ProjectPath {
-        worktree_id: worktree_id2,
-        path: rel_path("the-parent-dirb/fileb").into(),
-    };
-    workspace
-        .update_in(cx, |workspace, window, cx| {
-            workspace.open_path(b_path, None, true, window, cx)
-        })
-        .await
-        .unwrap();
-
-    let finder = open_file_picker(&workspace, cx);
-
-    finder
-        .update_in(cx, |f, window, cx| {
-            f.delegate.spawn_search(
-                test_path_position(path!("the-parent-dirb/filec")),
-                window,
-                cx,
-            )
-        })
-        .await;
-    cx.run_until_parked();
-    finder.update_in(cx, |picker, window, cx| {
-        assert_eq!(picker.delegate.matches.len(), 1);
-        picker.delegate.confirm(false, window, cx)
-    });
-    cx.run_until_parked();
-    cx.read(|cx| {
-        let active_editor = workspace.read(cx).active_item_as::<Editor>(cx).unwrap();
-        let project_path = active_editor.read(cx).project_path(cx);
-        assert_eq!(
-            project_path,
-            Some(ProjectPath {
-                worktree_id: worktree_id2,
-                path: rel_path("the-parent-dirb/filec").into()
-            })
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_create_file_no_focused_with_multiple_worktrees(cx: &mut TestAppContext) {
-    let app_state = init_test(cx);
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/roota"),
-            json!({ "the-parent-dira": { "filea": "" } }),
-        )
-        .await;
-
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/rootb"),
-            json!({ "the-parent-dirb": { "fileb": "" } }),
-        )
-        .await;
-
-    let project = Project::test(
-        app_state.fs.clone(),
-        [path!("/roota").as_ref(), path!("/rootb").as_ref()],
-        cx,
-    )
-    .await;
-
-    let (workspace, cx) = cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-    let (_worktree_id1, worktree_id2) = cx.read(|cx| {
-        let worktrees = workspace.read(cx).worktrees(cx).collect::<Vec<_>>();
-        (worktrees[0].read(cx).id(), worktrees[1].read(cx).id())
-    });
-
-    let finder = open_file_picker(&workspace, cx);
-
-    finder
-        .update_in(cx, |f, window, cx| {
-            f.delegate
-                .spawn_search(test_path_position(path!("rootb/filec")), window, cx)
-        })
-        .await;
-    cx.run_until_parked();
-    finder.update_in(cx, |picker, window, cx| {
-        assert_eq!(picker.delegate.matches.len(), 1);
-        picker.delegate.confirm(false, window, cx)
-    });
-    cx.run_until_parked();
-    cx.read(|cx| {
-        let active_editor = workspace.read(cx).active_item_as::<Editor>(cx).unwrap();
-        let project_path = active_editor.read(cx).project_path(cx);
-        assert_eq!(
-            project_path,
-            Some(ProjectPath {
-                worktree_id: worktree_id2,
-                path: rel_path("filec").into()
-            })
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_path_distance_ordering(cx: &mut TestAppContext) {
-    let app_state = init_test(cx);
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/root"),
-            json!({
-                "dir1": { "a.txt": "" },
-                "dir2": {
-                    "a.txt": "",
-                    "b.txt": ""
-                }
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), [path!("/root").as_ref()], cx).await;
-    let (workspace, cx) = cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-
-    let worktree_id = cx.read(|cx| {
-        let worktrees = workspace.read(cx).worktrees(cx).collect::<Vec<_>>();
-        assert_eq!(worktrees.len(), 1);
-        WorktreeId::from_usize(worktrees[0].entity_id().as_u64() as usize)
-    });
-
-    // When workspace has an active item, sort items which are closer to that item
-    // first when they have the same name. In this case, b.txt is closer to dir2's a.txt
-    // so that one should be sorted earlier
-    let b_path = ProjectPath {
-        worktree_id,
-        path: rel_path("dir2/b.txt").into(),
-    };
-    workspace
-        .update_in(cx, |workspace, window, cx| {
-            workspace.open_path(b_path, None, true, window, cx)
-        })
-        .await
-        .unwrap();
-    let finder = open_file_picker(&workspace, cx);
-    finder
-        .update_in(cx, |f, window, cx| {
-            f.delegate
-                .spawn_search(test_path_position("a.txt"), window, cx)
-        })
-        .await;
-
-    finder.update(cx, |picker, _| {
-        let matches = collect_search_matches(picker).search_paths_only();
-        assert_eq!(matches[0].as_ref(), rel_path("dir2/a.txt"));
-        assert_eq!(matches[1].as_ref(), rel_path("dir1/a.txt"));
-    });
-}
-
-#[gpui::test]
-async fn test_search_worktree_without_files(cx: &mut TestAppContext) {
-    let app_state = init_test(cx);
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            "/root",
-            json!({
-                "dir1": {},
-                "dir2": {
-                    "dir3": {}
-                }
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), ["/root".as_ref()], cx).await;
-    let (picker, _workspace, cx) = build_find_picker(project, cx);
-
-    picker
-        .update_in(cx, |f, window, cx| {
-            f.delegate
-                .spawn_search(test_path_position("dir"), window, cx)
-        })
-        .await;
-    cx.read(|cx| {
-        let finder = picker.read(cx);
-        assert_eq!(finder.delegate.matches.len(), 1);
-        assert_match_at_position(finder, 0, "dir");
-    });
-}
-
-#[gpui::test]
-async fn test_query_history(cx: &mut gpui::TestAppContext) {
-    let app_state = init_test(cx);
-
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/src"),
-            json!({
-                "test": {
-                    "first.rs": "// First Rust file",
-                    "second.rs": "// Second Rust file",
-                    "third.rs": "// Third Rust file",
-                }
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), [path!("/src").as_ref()], cx).await;
-    let (workspace, cx) = cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-    let worktree_id = cx.read(|cx| {
-        let worktrees = workspace.read(cx).worktrees(cx).collect::<Vec<_>>();
-        assert_eq!(worktrees.len(), 1);
-        WorktreeId::from_usize(worktrees[0].entity_id().as_u64() as usize)
-    });
-
-    // Open and close panels, getting their history items afterwards.
-    // Ensure history items get populated with opened items, and items are kept in a certain order.
-    // The history lags one opened buffer behind, since it's updated in the search panel only on its reopen.
-    //
-    // TODO: without closing, the opened items do not propagate their history changes for some reason
-    // it does work in real app though, only tests do not propagate.
-    workspace.update_in(cx, |_workspace, window, cx| window.focused(cx));
-
-    let initial_history = open_close_queried_buffer("fir", 1, "first.rs", &workspace, cx).await;
-    assert!(
-        initial_history.is_empty(),
-        "Should have no history before opening any files"
-    );
-
-    let history_after_first =
-        open_close_queried_buffer("sec", 1, "second.rs", &workspace, cx).await;
-    assert_eq!(
-        history_after_first,
-        vec![FoundPath::new(
-            ProjectPath {
-                worktree_id,
-                path: rel_path("test/first.rs").into(),
-            },
-            PathBuf::from(path!("/src/test/first.rs"))
-        )],
-        "Should show 1st opened item in the history when opening the 2nd item"
-    );
-
-    let history_after_second =
-        open_close_queried_buffer("thi", 1, "third.rs", &workspace, cx).await;
-    assert_eq!(
-        history_after_second,
-        vec![
-            FoundPath::new(
-                ProjectPath {
-                    worktree_id,
-                    path: rel_path("test/second.rs").into(),
-                },
-                PathBuf::from(path!("/src/test/second.rs"))
-            ),
-            FoundPath::new(
-                ProjectPath {
-                    worktree_id,
-                    path: rel_path("test/first.rs").into(),
-                },
-                PathBuf::from(path!("/src/test/first.rs"))
-            ),
-        ],
-        "Should show 1st and 2nd opened items in the history when opening the 3rd item. \
-    2nd item should be the first in the history, as the last opened."
-    );
-
-    let history_after_third =
-        open_close_queried_buffer("sec", 1, "second.rs", &workspace, cx).await;
-    assert_eq!(
-        history_after_third,
-        vec![
-            FoundPath::new(
-                ProjectPath {
-                    worktree_id,
-                    path: rel_path("test/third.rs").into(),
-                },
-                PathBuf::from(path!("/src/test/third.rs"))
-            ),
-            FoundPath::new(
-                ProjectPath {
-                    worktree_id,
-                    path: rel_path("test/second.rs").into(),
-                },
-                PathBuf::from(path!("/src/test/second.rs"))
-            ),
-            FoundPath::new(
-                ProjectPath {
-                    worktree_id,
-                    path: rel_path("test/first.rs").into(),
-                },
-                PathBuf::from(path!("/src/test/first.rs"))
-            ),
-        ],
-        "Should show 1st, 2nd and 3rd opened items in the history when opening the 2nd item again. \
-    3rd item should be the first in the history, as the last opened."
-    );
-
-    let history_after_second_again =
-        open_close_queried_buffer("thi", 1, "third.rs", &workspace, cx).await;
-    assert_eq!(
-        history_after_second_again,
-        vec![
-            FoundPath::new(
-                ProjectPath {
-                    worktree_id,
-                    path: rel_path("test/second.rs").into(),
-                },
-                PathBuf::from(path!("/src/test/second.rs"))
-            ),
-            FoundPath::new(
-                ProjectPath {
-                    worktree_id,
-                    path: rel_path("test/third.rs").into(),
-                },
-                PathBuf::from(path!("/src/test/third.rs"))
-            ),
-            FoundPath::new(
-                ProjectPath {
-                    worktree_id,
-                    path: rel_path("test/first.rs").into(),
-                },
-                PathBuf::from(path!("/src/test/first.rs"))
-            ),
-        ],
-        "Should show 1st, 2nd and 3rd opened items in the history when opening the 3rd item again. \
-    2nd item, as the last opened, 3rd item should go next as it was opened right before."
-    );
-}
-
-#[gpui::test]
-async fn test_history_match_positions(cx: &mut gpui::TestAppContext) {
-    let app_state = init_test(cx);
-
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/src"),
-            json!({
-                "test": {
-                    "first.rs": "// First Rust file",
-                    "second.rs": "// Second Rust file",
-                    "third.rs": "// Third Rust file",
-                }
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), [path!("/src").as_ref()], cx).await;
-    let (workspace, cx) = cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-
-    workspace.update_in(cx, |_workspace, window, cx| window.focused(cx));
-
-    open_close_queried_buffer("efir", 1, "first.rs", &workspace, cx).await;
-    let history = open_close_queried_buffer("second", 1, "second.rs", &workspace, cx).await;
-    assert_eq!(history.len(), 1);
-
-    let picker = open_file_picker(&workspace, cx);
-    cx.simulate_input("fir");
-    picker.update_in(cx, |finder, window, cx| {
-        let matches = &finder.delegate.matches.matches;
-        assert_matches!(
-            matches.as_slice(),
-            [Match::History { .. }, Match::CreateNew { .. }]
-        );
-        assert_eq!(
-            matches[0].panel_match().unwrap().0.path.as_ref(),
-            rel_path("test/first.rs")
-        );
-        assert_eq!(matches[0].panel_match().unwrap().0.positions, &[5, 6, 7]);
-
-        let (file_label, path_label) =
-            finder
-                .delegate
-                .labels_for_match(&finder.delegate.matches.matches[0], window, cx);
-        assert_eq!(file_label.text(), "first.rs");
-        assert_eq!(file_label.highlight_indices(), &[0, 1, 2]);
-        assert_eq!(
-            path_label.text(),
-            format!("test{}", PathStyle::local().primary_separator())
-        );
-        assert_eq!(path_label.highlight_indices(), &[] as &[usize]);
-    });
-}
-
-#[gpui::test]
-async fn test_external_files_history(cx: &mut gpui::TestAppContext) {
-    let app_state = init_test(cx);
-
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/src"),
-            json!({
-                "test": {
-                    "first.rs": "// First Rust file",
-                    "second.rs": "// Second Rust file",
-                }
-            }),
-        )
-        .await;
-
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/external-src"),
-            json!({
-                "test": {
-                    "third.rs": "// Third Rust file",
-                    "fourth.rs": "// Fourth Rust file",
-                }
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), [path!("/src").as_ref()], cx).await;
-    cx.update(|cx| {
-        project.update(cx, |project, cx| {
-            project.find_or_create_worktree(path!("/external-src"), false, cx)
-        })
-    })
-    .detach();
-    cx.background_executor.run_until_parked();
-
-    let (workspace, cx) = cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-    let worktree_id = cx.read(|cx| {
-        let worktrees = workspace.read(cx).worktrees(cx).collect::<Vec<_>>();
-        assert_eq!(worktrees.len(), 1,);
-
-        WorktreeId::from_usize(worktrees[0].entity_id().as_u64() as usize)
-    });
-    workspace
-        .update_in(cx, |workspace, window, cx| {
-            workspace.open_abs_path(
-                PathBuf::from(path!("/external-src/test/third.rs")),
-                OpenOptions {
-                    visible: Some(OpenVisible::None),
-                    ..Default::default()
-                },
-                window,
-                cx,
-            )
-        })
-        .detach();
-    cx.background_executor.run_until_parked();
-    let external_worktree_id = cx.read(|cx| {
-        let worktrees = workspace.read(cx).worktrees(cx).collect::<Vec<_>>();
-        assert_eq!(
-            worktrees.len(),
-            2,
-            "External file should get opened in a new worktree"
-        );
-
-        WorktreeId::from_usize(
-            worktrees
-                .into_iter()
-                .find(|worktree| worktree.entity_id().as_u64() as usize != worktree_id.to_usize())
-                .expect("New worktree should have a different id")
-                .entity_id()
-                .as_u64() as usize,
-        )
-    });
-    cx.dispatch_action(workspace::CloseActiveItem {
-        save_intent: None,
-        close_pinned: false,
-    });
-
-    let initial_history_items =
-        open_close_queried_buffer("sec", 1, "second.rs", &workspace, cx).await;
-    assert_eq!(
-        initial_history_items,
-        vec![FoundPath::new(
-            ProjectPath {
-                worktree_id: external_worktree_id,
-                path: rel_path("").into(),
-            },
-            PathBuf::from(path!("/external-src/test/third.rs"))
-        )],
-        "Should show external file with its full path in the history after it was open"
-    );
-
-    let updated_history_items =
-        open_close_queried_buffer("fir", 1, "first.rs", &workspace, cx).await;
-    assert_eq!(
-        updated_history_items,
-        vec![
-            FoundPath::new(
-                ProjectPath {
-                    worktree_id,
-                    path: rel_path("test/second.rs").into(),
-                },
-                PathBuf::from(path!("/src/test/second.rs"))
-            ),
-            FoundPath::new(
-                ProjectPath {
-                    worktree_id: external_worktree_id,
-                    path: rel_path("").into(),
-                },
-                PathBuf::from(path!("/external-src/test/third.rs"))
-            ),
-        ],
-        "Should keep external file with history updates",
-    );
-}
-
-#[gpui::test]
-async fn test_toggle_panel_new_selections(cx: &mut gpui::TestAppContext) {
-    let app_state = init_test(cx);
-
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/src"),
-            json!({
-                "test": {
-                    "first.rs": "// First Rust file",
-                    "second.rs": "// Second Rust file",
-                    "third.rs": "// Third Rust file",
-                }
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), [path!("/src").as_ref()], cx).await;
-    let (workspace, cx) = cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-
-    // generate some history to select from
-    open_close_queried_buffer("fir", 1, "first.rs", &workspace, cx).await;
-    open_close_queried_buffer("sec", 1, "second.rs", &workspace, cx).await;
-    open_close_queried_buffer("thi", 1, "third.rs", &workspace, cx).await;
-    let current_history = open_close_queried_buffer("sec", 1, "second.rs", &workspace, cx).await;
-
-    for expected_selected_index in 0..current_history.len() {
-        cx.dispatch_action(ToggleFileFinder::default());
-        let picker = active_file_picker(&workspace, cx);
-        let selected_index = picker.update(cx, |picker, _| picker.delegate.selected_index());
-        assert_eq!(
-            selected_index, expected_selected_index,
-            "Should select the next item in the history"
-        );
-    }
-
-    cx.dispatch_action(ToggleFileFinder::default());
-    let selected_index = workspace.update(cx, |workspace, cx| {
-        workspace
-            .active_modal::<FileFinder>(cx)
-            .unwrap()
-            .read(cx)
-            .picker
-            .read(cx)
-            .delegate
-            .selected_index()
-    });
-    assert_eq!(
-        selected_index, 0,
-        "Should wrap around the history and start all over"
-    );
-}
-
-#[gpui::test]
-async fn test_search_preserves_history_items(cx: &mut gpui::TestAppContext) {
-    let app_state = init_test(cx);
-
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/src"),
-            json!({
-                "test": {
-                    "first.rs": "// First Rust file",
-                    "second.rs": "// Second Rust file",
-                    "third.rs": "// Third Rust file",
-                    "fourth.rs": "// Fourth Rust file",
-                }
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), [path!("/src").as_ref()], cx).await;
-    let (workspace, cx) = cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-    let worktree_id = cx.read(|cx| {
-        let worktrees = workspace.read(cx).worktrees(cx).collect::<Vec<_>>();
-        assert_eq!(worktrees.len(), 1,);
-
-        WorktreeId::from_usize(worktrees[0].entity_id().as_u64() as usize)
-    });
-
-    // generate some history to select from
-    open_close_queried_buffer("fir", 1, "first.rs", &workspace, cx).await;
-    open_close_queried_buffer("sec", 1, "second.rs", &workspace, cx).await;
-    open_close_queried_buffer("thi", 1, "third.rs", &workspace, cx).await;
-    open_close_queried_buffer("sec", 1, "second.rs", &workspace, cx).await;
-
-    let finder = open_file_picker(&workspace, cx);
-    let first_query = "f";
-    finder
-        .update_in(cx, |finder, window, cx| {
-            finder
-                .delegate
-                .update_matches(first_query.to_string(), window, cx)
-        })
-        .await;
-    finder.update(cx, |picker, _| {
-            let matches = collect_search_matches(picker);
-            assert_eq!(matches.history.len(), 1, "Only one history item contains {first_query}, it should be present and others should be filtered out");
-            let history_match = matches.history_found_paths.first().expect("Should have path matches for history items after querying");
-            assert_eq!(history_match, &FoundPath::new(
-                ProjectPath {
-                    worktree_id,
-                    path: rel_path("test/first.rs").into(),
-                },
-                PathBuf::from(path!("/src/test/first.rs")),
-            ));
-            assert_eq!(matches.search.len(), 1, "Only one non-history item contains {first_query}, it should be present");
-            assert_eq!(matches.search.first().unwrap().as_ref(), rel_path("test/fourth.rs"));
-        });
-
-    let second_query = "fsdasdsa";
-    let finder = active_file_picker(&workspace, cx);
-    finder
-        .update_in(cx, |finder, window, cx| {
-            finder
-                .delegate
-                .update_matches(second_query.to_string(), window, cx)
-        })
-        .await;
-    finder.update(cx, |picker, _| {
-        assert!(
-            collect_search_matches(picker)
-                .search_paths_only()
-                .is_empty(),
-            "No search entries should match {second_query}"
-        );
-    });
-
-    let first_query_again = first_query;
-
-    let finder = active_file_picker(&workspace, cx);
-    finder
-        .update_in(cx, |finder, window, cx| {
-            finder
-                .delegate
-                .update_matches(first_query_again.to_string(), window, cx)
-        })
-        .await;
-    finder.update(cx, |picker, _| {
-            let matches = collect_search_matches(picker);
-            assert_eq!(matches.history.len(), 1, "Only one history item contains {first_query_again}, it should be present and others should be filtered out, even after non-matching query");
-            let history_match = matches.history_found_paths.first().expect("Should have path matches for history items after querying");
-            assert_eq!(history_match, &FoundPath::new(
-                ProjectPath {
-                    worktree_id,
-                    path: rel_path("test/first.rs").into(),
-                },
-                PathBuf::from(path!("/src/test/first.rs"))
-            ));
-            assert_eq!(matches.search.len(), 1, "Only one non-history item contains {first_query_again}, it should be present, even after non-matching query");
-            assert_eq!(matches.search.first().unwrap().as_ref(), rel_path("test/fourth.rs"));
-        });
-}
-
-#[gpui::test]
-async fn test_search_sorts_history_items(cx: &mut gpui::TestAppContext) {
-    let app_state = init_test(cx);
-
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/root"),
-            json!({
-                "test": {
-                    "1_qw": "// First file that matches the query",
-                    "2_second": "// Second file",
-                    "3_third": "// Third file",
-                    "4_fourth": "// Fourth file",
-                    "5_qwqwqw": "// A file with 3 more matches than the first one",
-                    "6_qwqwqw": "// Same query matches as above, but closer to the end of the list due to the name",
-                    "7_qwqwqw": "// One more, same amount of query matches as above",
-                }
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), [path!("/root").as_ref()], cx).await;
-    let (workspace, cx) = cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-    // generate some history to select from
-    open_close_queried_buffer("1", 1, "1_qw", &workspace, cx).await;
-    open_close_queried_buffer("2", 1, "2_second", &workspace, cx).await;
-    open_close_queried_buffer("3", 1, "3_third", &workspace, cx).await;
-    open_close_queried_buffer("2", 1, "2_second", &workspace, cx).await;
-    open_close_queried_buffer("6", 1, "6_qwqwqw", &workspace, cx).await;
-
-    let finder = open_file_picker(&workspace, cx);
-    let query = "qw";
-    finder
-        .update_in(cx, |finder, window, cx| {
-            finder
-                .delegate
-                .update_matches(query.to_string(), window, cx)
-        })
-        .await;
-    finder.update(cx, |finder, _| {
-        let search_matches = collect_search_matches(finder);
-        assert_eq!(
-            search_matches.history,
-            vec![
-                rel_path("test/1_qw").into(),
-                rel_path("test/6_qwqwqw").into()
-            ],
-        );
-        assert_eq!(
-            search_matches.search,
-            vec![
-                rel_path("test/5_qwqwqw").into(),
-                rel_path("test/7_qwqwqw").into()
-            ],
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_select_current_open_file_when_no_history(cx: &mut gpui::TestAppContext) {
-    let app_state = init_test(cx);
-
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/root"),
-            json!({
-                "test": {
-                    "1_qw": "",
-                }
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), [path!("/root").as_ref()], cx).await;
-    let (workspace, cx) = cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-    // Open new buffer
-    open_queried_buffer("1", 1, "1_qw", &workspace, cx).await;
-
-    let picker = open_file_picker(&workspace, cx);
-    picker.update(cx, |finder, _| {
-        assert_match_selection(finder, 0, "1_qw");
-    });
-}
-
-#[gpui::test]
-async fn test_keep_opened_file_on_top_of_search_results_and_select_next_one(
-    cx: &mut TestAppContext,
-) {
-    let app_state = init_test(cx);
-
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/src"),
-            json!({
-                "test": {
-                    "bar.rs": "// Bar file",
-                    "lib.rs": "// Lib file",
-                    "maaa.rs": "// Maaaaaaa",
-                    "main.rs": "// Main file",
-                    "moo.rs": "// Moooooo",
-                }
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), [path!("/src").as_ref()], cx).await;
-    let (workspace, cx) = cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-
-    open_close_queried_buffer("bar", 1, "bar.rs", &workspace, cx).await;
-    open_close_queried_buffer("lib", 1, "lib.rs", &workspace, cx).await;
-    open_queried_buffer("main", 1, "main.rs", &workspace, cx).await;
-
-    // main.rs is on top, previously used is selected
-    let picker = open_file_picker(&workspace, cx);
-    picker.update(cx, |finder, _| {
-        assert_eq!(finder.delegate.matches.len(), 3);
-        assert_match_selection(finder, 0, "main.rs");
-        assert_match_at_position(finder, 1, "lib.rs");
-        assert_match_at_position(finder, 2, "bar.rs");
-    });
-
-    // all files match, main.rs is still on top, but the second item is selected
-    picker
-        .update_in(cx, |finder, window, cx| {
-            finder
-                .delegate
-                .update_matches(".rs".to_string(), window, cx)
-        })
-        .await;
-    picker.update(cx, |finder, _| {
-        assert_eq!(finder.delegate.matches.len(), 6);
-        assert_match_at_position(finder, 0, "main.rs");
-        assert_match_selection(finder, 1, "bar.rs");
-        assert_match_at_position(finder, 2, "lib.rs");
-        assert_match_at_position(finder, 3, "moo.rs");
-        assert_match_at_position(finder, 4, "maaa.rs");
-        assert_match_at_position(finder, 5, ".rs");
-    });
-
-    // main.rs is not among matches, select top item
-    picker
-        .update_in(cx, |finder, window, cx| {
-            finder.delegate.update_matches("b".to_string(), window, cx)
-        })
-        .await;
-    picker.update(cx, |finder, _| {
-        assert_eq!(finder.delegate.matches.len(), 3);
-        assert_match_at_position(finder, 0, "bar.rs");
-        assert_match_at_position(finder, 1, "lib.rs");
-        assert_match_at_position(finder, 2, "b");
-    });
-
-    // main.rs is back, put it on top and select next item
-    picker
-        .update_in(cx, |finder, window, cx| {
-            finder.delegate.update_matches("m".to_string(), window, cx)
-        })
-        .await;
-    picker.update(cx, |finder, _| {
-        assert_eq!(finder.delegate.matches.len(), 4);
-        assert_match_at_position(finder, 0, "main.rs");
-        assert_match_selection(finder, 1, "moo.rs");
-        assert_match_at_position(finder, 2, "maaa.rs");
-        assert_match_at_position(finder, 3, "m");
-    });
-
-    // get back to the initial state
-    picker
-        .update_in(cx, |finder, window, cx| {
-            finder.delegate.update_matches("".to_string(), window, cx)
-        })
-        .await;
-    picker.update(cx, |finder, _| {
-        assert_eq!(finder.delegate.matches.len(), 3);
-        assert_match_selection(finder, 0, "main.rs");
-        assert_match_at_position(finder, 1, "lib.rs");
-        assert_match_at_position(finder, 2, "bar.rs");
-    });
-}
-
-#[gpui::test]
-async fn test_setting_auto_select_first_and_select_active_file(cx: &mut TestAppContext) {
-    let app_state = init_test(cx);
-
-    cx.update(|cx| {
-        let settings = *FileFinderSettings::get_global(cx);
-
-        FileFinderSettings::override_global(
-            FileFinderSettings {
-                skip_focus_for_active_in_search: false,
-                ..settings
-            },
-            cx,
-        );
-    });
-
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/src"),
-            json!({
-                "test": {
-                    "bar.rs": "// Bar file",
-                    "lib.rs": "// Lib file",
-                    "maaa.rs": "// Maaaaaaa",
-                    "main.rs": "// Main file",
-                    "moo.rs": "// Moooooo",
-                }
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), [path!("/src").as_ref()], cx).await;
-    let (workspace, cx) = cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-
-    open_close_queried_buffer("bar", 1, "bar.rs", &workspace, cx).await;
-    open_close_queried_buffer("lib", 1, "lib.rs", &workspace, cx).await;
-    open_queried_buffer("main", 1, "main.rs", &workspace, cx).await;
-
-    // main.rs is on top, previously used is selected
-    let picker = open_file_picker(&workspace, cx);
-    picker.update(cx, |finder, _| {
-        assert_eq!(finder.delegate.matches.len(), 3);
-        assert_match_selection(finder, 0, "main.rs");
-        assert_match_at_position(finder, 1, "lib.rs");
-        assert_match_at_position(finder, 2, "bar.rs");
-    });
-
-    // all files match, main.rs is on top, and is selected
-    picker
-        .update_in(cx, |finder, window, cx| {
-            finder
-                .delegate
-                .update_matches(".rs".to_string(), window, cx)
-        })
-        .await;
-    picker.update(cx, |finder, _| {
-        assert_eq!(finder.delegate.matches.len(), 6);
-        assert_match_selection(finder, 0, "main.rs");
-        assert_match_at_position(finder, 1, "bar.rs");
-        assert_match_at_position(finder, 2, "lib.rs");
-        assert_match_at_position(finder, 3, "moo.rs");
-        assert_match_at_position(finder, 4, "maaa.rs");
-        assert_match_at_position(finder, 5, ".rs");
-    });
-}
-
-#[gpui::test]
-async fn test_non_separate_history_items(cx: &mut TestAppContext) {
-    let app_state = init_test(cx);
-
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/src"),
-            json!({
-                "test": {
-                    "bar.rs": "// Bar file",
-                    "lib.rs": "// Lib file",
-                    "maaa.rs": "// Maaaaaaa",
-                    "main.rs": "// Main file",
-                    "moo.rs": "// Moooooo",
-                }
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), [path!("/src").as_ref()], cx).await;
-    let (workspace, cx) = cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-
-    open_close_queried_buffer("bar", 1, "bar.rs", &workspace, cx).await;
-    open_close_queried_buffer("lib", 1, "lib.rs", &workspace, cx).await;
-    open_queried_buffer("main", 1, "main.rs", &workspace, cx).await;
-
-    cx.dispatch_action(ToggleFileFinder::default());
-    let picker = active_file_picker(&workspace, cx);
-    // main.rs is on top, previously used is selected
-    picker.update(cx, |finder, _| {
-        assert_eq!(finder.delegate.matches.len(), 3);
-        assert_match_selection(finder, 0, "main.rs");
-        assert_match_at_position(finder, 1, "lib.rs");
-        assert_match_at_position(finder, 2, "bar.rs");
-    });
-
-    // all files match, main.rs is still on top, but the second item is selected
-    picker
-        .update_in(cx, |finder, window, cx| {
-            finder
-                .delegate
-                .update_matches(".rs".to_string(), window, cx)
-        })
-        .await;
-    picker.update(cx, |finder, _| {
-        assert_eq!(finder.delegate.matches.len(), 6);
-        assert_match_at_position(finder, 0, "main.rs");
-        assert_match_selection(finder, 1, "moo.rs");
-        assert_match_at_position(finder, 2, "bar.rs");
-        assert_match_at_position(finder, 3, "lib.rs");
-        assert_match_at_position(finder, 4, "maaa.rs");
-        assert_match_at_position(finder, 5, ".rs");
-    });
-
-    // main.rs is not among matches, select top item
-    picker
-        .update_in(cx, |finder, window, cx| {
-            finder.delegate.update_matches("b".to_string(), window, cx)
-        })
-        .await;
-    picker.update(cx, |finder, _| {
-        assert_eq!(finder.delegate.matches.len(), 3);
-        assert_match_at_position(finder, 0, "bar.rs");
-        assert_match_at_position(finder, 1, "lib.rs");
-        assert_match_at_position(finder, 2, "b");
-    });
-
-    // main.rs is back, put it on top and select next item
-    picker
-        .update_in(cx, |finder, window, cx| {
-            finder.delegate.update_matches("m".to_string(), window, cx)
-        })
-        .await;
-    picker.update(cx, |finder, _| {
-        assert_eq!(finder.delegate.matches.len(), 4);
-        assert_match_at_position(finder, 0, "main.rs");
-        assert_match_selection(finder, 1, "moo.rs");
-        assert_match_at_position(finder, 2, "maaa.rs");
-        assert_match_at_position(finder, 3, "m");
-    });
-
-    // get back to the initial state
-    picker
-        .update_in(cx, |finder, window, cx| {
-            finder.delegate.update_matches("".to_string(), window, cx)
-        })
-        .await;
-    picker.update(cx, |finder, _| {
-        assert_eq!(finder.delegate.matches.len(), 3);
-        assert_match_selection(finder, 0, "main.rs");
-        assert_match_at_position(finder, 1, "lib.rs");
-        assert_match_at_position(finder, 2, "bar.rs");
-    });
-}
-
-#[gpui::test]
-async fn test_history_items_shown_in_order_of_open(cx: &mut TestAppContext) {
-    let app_state = init_test(cx);
-
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/test"),
-            json!({
-                "test": {
-                    "1.txt": "// One",
-                    "2.txt": "// Two",
-                    "3.txt": "// Three",
-                }
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), [path!("/test").as_ref()], cx).await;
-    let (workspace, cx) = cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-
-    open_queried_buffer("1", 1, "1.txt", &workspace, cx).await;
-    open_queried_buffer("2", 1, "2.txt", &workspace, cx).await;
-    open_queried_buffer("3", 1, "3.txt", &workspace, cx).await;
-
-    let picker = open_file_picker(&workspace, cx);
-    picker.update(cx, |finder, _| {
-        assert_eq!(finder.delegate.matches.len(), 3);
-        assert_match_selection(finder, 0, "3.txt");
-        assert_match_at_position(finder, 1, "2.txt");
-        assert_match_at_position(finder, 2, "1.txt");
-    });
-
-    cx.dispatch_action(SelectNext);
-    cx.dispatch_action(Confirm); // Open 2.txt
-
-    let picker = open_file_picker(&workspace, cx);
-    picker.update(cx, |finder, _| {
-        assert_eq!(finder.delegate.matches.len(), 3);
-        assert_match_selection(finder, 0, "2.txt");
-        assert_match_at_position(finder, 1, "3.txt");
-        assert_match_at_position(finder, 2, "1.txt");
-    });
-
-    cx.dispatch_action(SelectNext);
-    cx.dispatch_action(SelectNext);
-    cx.dispatch_action(Confirm); // Open 1.txt
-
-    let picker = open_file_picker(&workspace, cx);
-    picker.update(cx, |finder, _| {
-        assert_eq!(finder.delegate.matches.len(), 3);
-        assert_match_selection(finder, 0, "1.txt");
-        assert_match_at_position(finder, 1, "2.txt");
-        assert_match_at_position(finder, 2, "3.txt");
-    });
-}
-
-#[gpui::test]
-async fn test_selected_history_item_stays_selected_on_worktree_updated(cx: &mut TestAppContext) {
-    let app_state = init_test(cx);
-
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/test"),
-            json!({
-                "test": {
-                    "1.txt": "// One",
-                    "2.txt": "// Two",
-                    "3.txt": "// Three",
-                }
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), [path!("/test").as_ref()], cx).await;
-    let (workspace, cx) = cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-
-    open_close_queried_buffer("1", 1, "1.txt", &workspace, cx).await;
-    open_close_queried_buffer("2", 1, "2.txt", &workspace, cx).await;
-    open_close_queried_buffer("3", 1, "3.txt", &workspace, cx).await;
-
-    let picker = open_file_picker(&workspace, cx);
-    picker.update(cx, |finder, _| {
-        assert_eq!(finder.delegate.matches.len(), 3);
-        assert_match_selection(finder, 0, "3.txt");
-        assert_match_at_position(finder, 1, "2.txt");
-        assert_match_at_position(finder, 2, "1.txt");
-    });
-
-    cx.dispatch_action(SelectNext);
-
-    // Add more files to the worktree to trigger update matches
-    for i in 0..5 {
-        let filename = if cfg!(windows) {
-            format!("C:/test/{}.txt", 4 + i)
-        } else {
-            format!("/test/{}.txt", 4 + i)
-        };
-        app_state
-            .fs
-            .create_file(Path::new(&filename), Default::default())
-            .await
-            .expect("unable to create file");
-    }
-
-    cx.executor().advance_clock(FS_WATCH_LATENCY);
-
-    picker.update(cx, |finder, _| {
-        assert_eq!(finder.delegate.matches.len(), 3);
-        assert_match_at_position(finder, 0, "3.txt");
-        assert_match_selection(finder, 1, "2.txt");
-        assert_match_at_position(finder, 2, "1.txt");
-    });
-}
-
-#[gpui::test]
-async fn test_history_items_vs_very_good_external_match(cx: &mut gpui::TestAppContext) {
-    let app_state = init_test(cx);
-
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/src"),
-            json!({
-                "collab_ui": {
-                    "first.rs": "// First Rust file",
-                    "second.rs": "// Second Rust file",
-                    "third.rs": "// Third Rust file",
-                    "collab_ui.rs": "// Fourth Rust file",
-                }
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), [path!("/src").as_ref()], cx).await;
-    let (workspace, cx) = cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-    // generate some history to select from
-    open_close_queried_buffer("fir", 1, "first.rs", &workspace, cx).await;
-    open_close_queried_buffer("sec", 1, "second.rs", &workspace, cx).await;
-    open_close_queried_buffer("thi", 1, "third.rs", &workspace, cx).await;
-    open_close_queried_buffer("sec", 1, "second.rs", &workspace, cx).await;
-
-    let finder = open_file_picker(&workspace, cx);
-    let query = "collab_ui";
-    cx.simulate_input(query);
-    finder.update(cx, |picker, _| {
-            let search_entries = collect_search_matches(picker).search_paths_only();
-            assert_eq!(
-                search_entries,
-                vec![
-                    rel_path("collab_ui/collab_ui.rs").into(),
-                    rel_path("collab_ui/first.rs").into(),
-                    rel_path("collab_ui/third.rs").into(),
-                    rel_path("collab_ui/second.rs").into(),
-                ],
-                "Despite all search results having the same directory name, the most matching one should be on top"
-            );
-        });
-}
-
-#[gpui::test]
-async fn test_nonexistent_history_items_not_shown(cx: &mut gpui::TestAppContext) {
-    let app_state = init_test(cx);
-
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/src"),
-            json!({
-                "test": {
-                    "first.rs": "// First Rust file",
-                    "nonexistent.rs": "// Second Rust file",
-                    "third.rs": "// Third Rust file",
-                }
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), [path!("/src").as_ref()], cx).await;
-    let (workspace, cx) = cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx)); // generate some history to select from
-    open_close_queried_buffer("fir", 1, "first.rs", &workspace, cx).await;
-    open_close_queried_buffer("non", 1, "nonexistent.rs", &workspace, cx).await;
-    open_close_queried_buffer("thi", 1, "third.rs", &workspace, cx).await;
-    open_close_queried_buffer("fir", 1, "first.rs", &workspace, cx).await;
-    app_state
-        .fs
-        .remove_file(
-            Path::new(path!("/src/test/nonexistent.rs")),
-            RemoveOptions::default(),
-        )
-        .await
-        .unwrap();
-    cx.run_until_parked();
-
-    let picker = open_file_picker(&workspace, cx);
-    cx.simulate_input("rs");
-
-    picker.update(cx, |picker, _| {
-        assert_eq!(
-            collect_search_matches(picker).history,
-            vec![
-                rel_path("test/first.rs").into(),
-                rel_path("test/third.rs").into()
-            ],
-            "Should have all opened files in the history, except the ones that do not exist on disk"
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_search_results_refreshed_on_worktree_updates(cx: &mut gpui::TestAppContext) {
-    let app_state = init_test(cx);
-
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            "/src",
-            json!({
-                "lib.rs": "// Lib file",
-                "main.rs": "// Bar file",
-                "read.me": "// Readme file",
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), ["/src".as_ref()], cx).await;
-    let (workspace, cx) =
-        cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-    // Initial state
-    let picker = open_file_picker(&workspace, cx);
-    cx.simulate_input("rs");
-    picker.update(cx, |finder, _| {
-        assert_eq!(finder.delegate.matches.len(), 3);
-        assert_match_at_position(finder, 0, "lib.rs");
-        assert_match_at_position(finder, 1, "main.rs");
-        assert_match_at_position(finder, 2, "rs");
-    });
-    // Delete main.rs
-    app_state
-        .fs
-        .remove_file("/src/main.rs".as_ref(), Default::default())
-        .await
-        .expect("unable to remove file");
-    cx.executor().advance_clock(FS_WATCH_LATENCY);
-
-    // main.rs is in not among search results anymore
-    picker.update(cx, |finder, _| {
-        assert_eq!(finder.delegate.matches.len(), 2);
-        assert_match_at_position(finder, 0, "lib.rs");
-        assert_match_at_position(finder, 1, "rs");
-    });
-
-    // Create util.rs
-    app_state
-        .fs
-        .create_file("/src/util.rs".as_ref(), Default::default())
-        .await
-        .expect("unable to create file");
-    cx.executor().advance_clock(FS_WATCH_LATENCY);
-
-    // util.rs is among search results
-    picker.update(cx, |finder, _| {
-        assert_eq!(finder.delegate.matches.len(), 3);
-        assert_match_at_position(finder, 0, "lib.rs");
-        assert_match_at_position(finder, 1, "util.rs");
-        assert_match_at_position(finder, 2, "rs");
-    });
-}
-
-#[gpui::test]
-async fn test_search_results_refreshed_on_standalone_file_creation(cx: &mut gpui::TestAppContext) {
-    let app_state = init_test(cx);
-
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            "/src",
-            json!({
-                "lib.rs": "// Lib file",
-                "main.rs": "// Bar file",
-                "read.me": "// Readme file",
-            }),
-        )
-        .await;
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            "/test",
-            json!({
-                "new.rs": "// New file",
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), ["/src".as_ref()], cx).await;
-    let (workspace, cx) =
-        cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-    cx.update(|_, cx| {
-        open_paths(
-            &[PathBuf::from(path!("/test/new.rs"))],
-            app_state,
-            workspace::OpenOptions::default(),
-            cx,
-        )
-    })
-    .await
-    .unwrap();
-    assert_eq!(cx.update(|_, cx| cx.windows().len()), 1);
-
-    let initial_history = open_close_queried_buffer("new", 1, "new.rs", &workspace, cx).await;
-    assert_eq!(
-        initial_history.first().unwrap().absolute,
-        PathBuf::from(path!("/test/new.rs")),
-        "Should show 1st opened item in the history when opening the 2nd item"
-    );
-
-    let history_after_first = open_close_queried_buffer("lib", 1, "lib.rs", &workspace, cx).await;
-    assert_eq!(
-        history_after_first.first().unwrap().absolute,
-        PathBuf::from(path!("/test/new.rs")),
-        "Should show 1st opened item in the history when opening the 2nd item"
-    );
-}
-
-#[gpui::test]
-async fn test_search_results_refreshed_on_adding_and_removing_worktrees(
-    cx: &mut gpui::TestAppContext,
-) {
-    let app_state = init_test(cx);
-
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            "/test",
-            json!({
-                "project_1": {
-                    "bar.rs": "// Bar file",
-                    "lib.rs": "// Lib file",
-                },
-                "project_2": {
-                    "Cargo.toml": "// Cargo file",
-                    "main.rs": "// Main file",
-                }
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), ["/test/project_1".as_ref()], cx).await;
-    let (workspace, cx) =
-        cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let worktree_1_id = project.update(cx, |project, cx| {
-        let worktree = project.worktrees(cx).last().expect("worktree not found");
-        worktree.read(cx).id()
-    });
-
-    // Initial state
-    let picker = open_file_picker(&workspace, cx);
-    cx.simulate_input("rs");
-    picker.update(cx, |finder, _| {
-        assert_eq!(finder.delegate.matches.len(), 3);
-        assert_match_at_position(finder, 0, "bar.rs");
-        assert_match_at_position(finder, 1, "lib.rs");
-        assert_match_at_position(finder, 2, "rs");
-    });
-
-    // Add new worktree
-    project
-        .update(cx, |project, cx| {
-            project
-                .find_or_create_worktree("/test/project_2", true, cx)
-                .into_future()
-        })
-        .await
-        .expect("unable to create workdir");
-    cx.executor().advance_clock(FS_WATCH_LATENCY);
-
-    // main.rs is among search results
-    picker.update(cx, |finder, _| {
-        assert_eq!(finder.delegate.matches.len(), 4);
-        assert_match_at_position(finder, 0, "bar.rs");
-        assert_match_at_position(finder, 1, "lib.rs");
-        assert_match_at_position(finder, 2, "main.rs");
-        assert_match_at_position(finder, 3, "rs");
-    });
-
-    // Remove the first worktree
-    project.update(cx, |project, cx| {
-        project.remove_worktree(worktree_1_id, cx);
-    });
-    cx.executor().advance_clock(FS_WATCH_LATENCY);
-
-    // Files from the first worktree are not in the search results anymore
-    picker.update(cx, |finder, _| {
-        assert_eq!(finder.delegate.matches.len(), 2);
-        assert_match_at_position(finder, 0, "main.rs");
-        assert_match_at_position(finder, 1, "rs");
-    });
-}
-
-#[gpui::test]
-async fn test_history_items_uniqueness_for_multiple_worktree_open_all_files(
-    cx: &mut TestAppContext,
-) {
-    let app_state = init_test(cx);
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/repo1"),
-            json!({
-                "package.json": r#"{"name": "repo1"}"#,
-                "src": {
-                    "index.js": "// Repo 1 index",
-                }
-            }),
-        )
-        .await;
-
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/repo2"),
-            json!({
-                "package.json": r#"{"name": "repo2"}"#,
-                "src": {
-                    "index.js": "// Repo 2 index",
-                }
-            }),
-        )
-        .await;
-
-    let project = Project::test(
-        app_state.fs.clone(),
-        [path!("/repo1").as_ref(), path!("/repo2").as_ref()],
-        cx,
-    )
-    .await;
-
-    let (workspace, cx) = cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-    let (worktree_id1, worktree_id2) = cx.read(|cx| {
-        let worktrees = workspace.read(cx).worktrees(cx).collect::<Vec<_>>();
-        (worktrees[0].read(cx).id(), worktrees[1].read(cx).id())
-    });
-
-    workspace
-        .update_in(cx, |workspace, window, cx| {
-            workspace.open_path(
-                ProjectPath {
-                    worktree_id: worktree_id1,
-                    path: rel_path("package.json").into(),
-                },
-                None,
-                true,
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-
-    cx.dispatch_action(workspace::CloseActiveItem {
-        save_intent: None,
-        close_pinned: false,
-    });
-    workspace
-        .update_in(cx, |workspace, window, cx| {
-            workspace.open_path(
-                ProjectPath {
-                    worktree_id: worktree_id2,
-                    path: rel_path("package.json").into(),
-                },
-                None,
-                true,
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-
-    cx.dispatch_action(workspace::CloseActiveItem {
-        save_intent: None,
-        close_pinned: false,
-    });
-
-    let picker = open_file_picker(&workspace, cx);
-    cx.simulate_input("package.json");
-
-    picker.update(cx, |finder, _| {
-        let matches = &finder.delegate.matches.matches;
-
-        assert_eq!(
-            matches.len(),
-            2,
-            "Expected 1 history match + 1 search matches, but got {} matches: {:?}",
-            matches.len(),
-            matches
-        );
-
-        assert_matches!(matches[0], Match::History { .. });
-
-        let search_matches = collect_search_matches(finder);
-        assert_eq!(
-            search_matches.history.len(),
-            2,
-            "Should have exactly 2 history match"
-        );
-        assert_eq!(
-            search_matches.search.len(),
-            0,
-            "Should have exactly 0 search match (because we already opened the 2 package.json)"
-        );
-
-        if let Match::History { path, panel_match } = &matches[0] {
-            assert_eq!(path.project.worktree_id, worktree_id2);
-            assert_eq!(path.project.path.as_ref(), rel_path("package.json"));
-            let panel_match = panel_match.as_ref().unwrap();
-            assert_eq!(panel_match.0.path_prefix, rel_path("repo2").into());
-            assert_eq!(panel_match.0.path, rel_path("package.json").into());
-            assert_eq!(
-                panel_match.0.positions,
-                vec![6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17]
-            );
-        }
-
-        if let Match::History { path, panel_match } = &matches[1] {
-            assert_eq!(path.project.worktree_id, worktree_id1);
-            assert_eq!(path.project.path.as_ref(), rel_path("package.json"));
-            let panel_match = panel_match.as_ref().unwrap();
-            assert_eq!(panel_match.0.path_prefix, rel_path("repo1").into());
-            assert_eq!(panel_match.0.path, rel_path("package.json").into());
-            assert_eq!(
-                panel_match.0.positions,
-                vec![6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17]
-            );
-        }
-    });
-}
-
-#[gpui::test]
-async fn test_selected_match_stays_selected_after_matches_refreshed(cx: &mut gpui::TestAppContext) {
-    let app_state = init_test(cx);
-
-    app_state.fs.as_fake().insert_tree("/src", json!({})).await;
-
-    app_state
-        .fs
-        .create_dir("/src/even".as_ref())
-        .await
-        .expect("unable to create dir");
-
-    let initial_files_num = 5;
-    for i in 0..initial_files_num {
-        let filename = format!("/src/even/file_{}.txt", 10 + i);
-        app_state
-            .fs
-            .create_file(Path::new(&filename), Default::default())
-            .await
-            .expect("unable to create file");
-    }
-
-    let project = Project::test(app_state.fs.clone(), ["/src".as_ref()], cx).await;
-    let (workspace, cx) =
-        cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-    // Initial state
-    let picker = open_file_picker(&workspace, cx);
-    cx.simulate_input("file");
-    let selected_index = 3;
-    // Checking only the filename, not the whole path
-    let selected_file = format!("file_{}.txt", 10 + selected_index);
-    // Select even/file_13.txt
-    for _ in 0..selected_index {
-        cx.dispatch_action(SelectNext);
-    }
-
-    picker.update(cx, |finder, _| {
-        assert_match_selection(finder, selected_index, &selected_file)
-    });
-
-    // Add more matches to the search results
-    let files_to_add = 10;
-    for i in 0..files_to_add {
-        let filename = format!("/src/file_{}.txt", 20 + i);
-        app_state
-            .fs
-            .create_file(Path::new(&filename), Default::default())
-            .await
-            .expect("unable to create file");
-    }
-    cx.executor().advance_clock(FS_WATCH_LATENCY);
-
-    // file_13.txt is still selected
-    picker.update(cx, |finder, _| {
-        let expected_selected_index = selected_index + files_to_add;
-        assert_match_selection(finder, expected_selected_index, &selected_file);
-    });
-}
-
-#[gpui::test]
-async fn test_first_match_selected_if_previous_one_is_not_in_the_match_list(
-    cx: &mut gpui::TestAppContext,
-) {
-    let app_state = init_test(cx);
-
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            "/src",
-            json!({
-                "file_1.txt": "// file_1",
-                "file_2.txt": "// file_2",
-                "file_3.txt": "// file_3",
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), ["/src".as_ref()], cx).await;
-    let (workspace, cx) =
-        cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-    // Initial state
-    let picker = open_file_picker(&workspace, cx);
-    cx.simulate_input("file");
-    // Select even/file_2.txt
-    cx.dispatch_action(SelectNext);
-
-    // Remove the selected entry
-    app_state
-        .fs
-        .remove_file("/src/file_2.txt".as_ref(), Default::default())
-        .await
-        .expect("unable to remove file");
-    cx.executor().advance_clock(FS_WATCH_LATENCY);
-
-    // file_1.txt is now selected
-    picker.update(cx, |finder, _| {
-        assert_match_selection(finder, 0, "file_1.txt");
-    });
-}
-
-#[gpui::test]
-async fn test_keeps_file_finder_open_after_modifier_keys_release(cx: &mut gpui::TestAppContext) {
-    let app_state = init_test(cx);
-
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/test"),
-            json!({
-                "1.txt": "// One",
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), [path!("/test").as_ref()], cx).await;
-    let (workspace, cx) = cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-
-    open_queried_buffer("1", 1, "1.txt", &workspace, cx).await;
-
-    cx.simulate_modifiers_change(Modifiers::secondary_key());
-    open_file_picker(&workspace, cx);
-
-    cx.simulate_modifiers_change(Modifiers::none());
-    active_file_picker(&workspace, cx);
-}
-
-#[gpui::test]
-async fn test_opens_file_on_modifier_keys_release(cx: &mut gpui::TestAppContext) {
-    let app_state = init_test(cx);
-
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/test"),
-            json!({
-                "1.txt": "// One",
-                "2.txt": "// Two",
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), [path!("/test").as_ref()], cx).await;
-    let (workspace, cx) = cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-
-    open_queried_buffer("1", 1, "1.txt", &workspace, cx).await;
-    open_queried_buffer("2", 1, "2.txt", &workspace, cx).await;
-
-    cx.simulate_modifiers_change(Modifiers::secondary_key());
-    let picker = open_file_picker(&workspace, cx);
-    picker.update(cx, |finder, _| {
-        assert_eq!(finder.delegate.matches.len(), 2);
-        assert_match_selection(finder, 0, "2.txt");
-        assert_match_at_position(finder, 1, "1.txt");
-    });
-
-    cx.dispatch_action(SelectNext);
-    cx.simulate_modifiers_change(Modifiers::none());
-    cx.read(|cx| {
-        let active_editor = workspace.read(cx).active_item_as::<Editor>(cx).unwrap();
-        assert_eq!(active_editor.read(cx).title(cx), "1.txt");
-    });
-}
-
-#[gpui::test]
-async fn test_switches_between_release_norelease_modes_on_forward_nav(
-    cx: &mut gpui::TestAppContext,
-) {
-    let app_state = init_test(cx);
-
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/test"),
-            json!({
-                "1.txt": "// One",
-                "2.txt": "// Two",
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), [path!("/test").as_ref()], cx).await;
-    let (workspace, cx) = cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-
-    open_queried_buffer("1", 1, "1.txt", &workspace, cx).await;
-    open_queried_buffer("2", 1, "2.txt", &workspace, cx).await;
-
-    // Open with a shortcut
-    cx.simulate_modifiers_change(Modifiers::secondary_key());
-    let picker = open_file_picker(&workspace, cx);
-    picker.update(cx, |finder, _| {
-        assert_eq!(finder.delegate.matches.len(), 2);
-        assert_match_selection(finder, 0, "2.txt");
-        assert_match_at_position(finder, 1, "1.txt");
-    });
-
-    // Switch to navigating with other shortcuts
-    // Don't open file on modifiers release
-    cx.simulate_modifiers_change(Modifiers::control());
-    cx.dispatch_action(SelectNext);
-    cx.simulate_modifiers_change(Modifiers::none());
-    picker.update(cx, |finder, _| {
-        assert_eq!(finder.delegate.matches.len(), 2);
-        assert_match_at_position(finder, 0, "2.txt");
-        assert_match_selection(finder, 1, "1.txt");
-    });
-
-    // Back to navigation with initial shortcut
-    // Open file on modifiers release
-    cx.simulate_modifiers_change(Modifiers::secondary_key());
-    cx.dispatch_action(ToggleFileFinder::default());
-    cx.simulate_modifiers_change(Modifiers::none());
-    cx.read(|cx| {
-        let active_editor = workspace.read(cx).active_item_as::<Editor>(cx).unwrap();
-        assert_eq!(active_editor.read(cx).title(cx), "2.txt");
-    });
-}
-
-#[gpui::test]
-async fn test_switches_between_release_norelease_modes_on_backward_nav(
-    cx: &mut gpui::TestAppContext,
-) {
-    let app_state = init_test(cx);
-
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/test"),
-            json!({
-                "1.txt": "// One",
-                "2.txt": "// Two",
-                "3.txt": "// Three"
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), [path!("/test").as_ref()], cx).await;
-    let (workspace, cx) = cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-
-    open_queried_buffer("1", 1, "1.txt", &workspace, cx).await;
-    open_queried_buffer("2", 1, "2.txt", &workspace, cx).await;
-    open_queried_buffer("3", 1, "3.txt", &workspace, cx).await;
-
-    // Open with a shortcut
-    cx.simulate_modifiers_change(Modifiers::secondary_key());
-    let picker = open_file_picker(&workspace, cx);
-    picker.update(cx, |finder, _| {
-        assert_eq!(finder.delegate.matches.len(), 3);
-        assert_match_selection(finder, 0, "3.txt");
-        assert_match_at_position(finder, 1, "2.txt");
-        assert_match_at_position(finder, 2, "1.txt");
-    });
-
-    // Switch to navigating with other shortcuts
-    // Don't open file on modifiers release
-    cx.simulate_modifiers_change(Modifiers::control());
-    cx.dispatch_action(menu::SelectPrevious);
-    cx.simulate_modifiers_change(Modifiers::none());
-    picker.update(cx, |finder, _| {
-        assert_eq!(finder.delegate.matches.len(), 3);
-        assert_match_at_position(finder, 0, "3.txt");
-        assert_match_at_position(finder, 1, "2.txt");
-        assert_match_selection(finder, 2, "1.txt");
-    });
-
-    // Back to navigation with initial shortcut
-    // Open file on modifiers release
-    cx.simulate_modifiers_change(Modifiers::secondary_key());
-    cx.dispatch_action(SelectPrevious); // <-- File Finder's SelectPrevious, not menu's
-    cx.simulate_modifiers_change(Modifiers::none());
-    cx.read(|cx| {
-        let active_editor = workspace.read(cx).active_item_as::<Editor>(cx).unwrap();
-        assert_eq!(active_editor.read(cx).title(cx), "3.txt");
-    });
-}
-
-#[gpui::test]
-async fn test_extending_modifiers_does_not_confirm_selection(cx: &mut gpui::TestAppContext) {
-    let app_state = init_test(cx);
-
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/test"),
-            json!({
-                "1.txt": "// One",
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), [path!("/test").as_ref()], cx).await;
-    let (workspace, cx) = cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-
-    open_queried_buffer("1", 1, "1.txt", &workspace, cx).await;
-
-    cx.simulate_modifiers_change(Modifiers::secondary_key());
-    open_file_picker(&workspace, cx);
-
-    cx.simulate_modifiers_change(Modifiers::command_shift());
-    active_file_picker(&workspace, cx);
-}
-
-#[gpui::test]
-async fn test_repeat_toggle_action(cx: &mut gpui::TestAppContext) {
-    let app_state = init_test(cx);
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            "/test",
-            json!({
-                "00.txt": "",
-                "01.txt": "",
-                "02.txt": "",
-                "03.txt": "",
-                "04.txt": "",
-                "05.txt": "",
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), ["/test".as_ref()], cx).await;
-    let (workspace, cx) = cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-
-    cx.dispatch_action(ToggleFileFinder::default());
-    let picker = active_file_picker(&workspace, cx);
-
-    picker.update_in(cx, |picker, window, cx| {
-        picker.update_matches(".txt".to_string(), window, cx)
-    });
-
-    cx.run_until_parked();
-
-    picker.update(cx, |picker, _| {
-        assert_eq!(picker.delegate.matches.len(), 7);
-        assert_eq!(picker.delegate.selected_index, 0);
-    });
-
-    // When toggling repeatedly, the picker scrolls to reveal the selected item.
-    cx.dispatch_action(ToggleFileFinder::default());
-    cx.dispatch_action(ToggleFileFinder::default());
-    cx.dispatch_action(ToggleFileFinder::default());
-
-    cx.run_until_parked();
-
-    picker.update(cx, |picker, _| {
-        assert_eq!(picker.delegate.matches.len(), 7);
-        assert_eq!(picker.delegate.selected_index, 3);
-    });
-}
-
-async fn open_close_queried_buffer(
-    input: &str,
-    expected_matches: usize,
-    expected_editor_title: &str,
-    workspace: &Entity<Workspace>,
-    cx: &mut gpui::VisualTestContext,
-) -> Vec<FoundPath> {
-    let history_items = open_queried_buffer(
-        input,
-        expected_matches,
-        expected_editor_title,
-        workspace,
-        cx,
-    )
-    .await;
-
-    cx.dispatch_action(workspace::CloseActiveItem {
-        save_intent: None,
-        close_pinned: false,
-    });
-
-    history_items
-}
-
-async fn open_queried_buffer(
-    input: &str,
-    expected_matches: usize,
-    expected_editor_title: &str,
-    workspace: &Entity<Workspace>,
-    cx: &mut gpui::VisualTestContext,
-) -> Vec<FoundPath> {
-    let picker = open_file_picker(workspace, cx);
-    cx.simulate_input(input);
-
-    let history_items = picker.update(cx, |finder, _| {
-        assert_eq!(
-            finder.delegate.matches.len(),
-            expected_matches + 1, // +1 from CreateNew option
-            "Unexpected number of matches found for query `{input}`, matches: {:?}",
-            finder.delegate.matches
-        );
-        finder.delegate.history_items.clone()
-    });
-
-    cx.dispatch_action(Confirm);
-
-    cx.read(|cx| {
-        let active_editor = workspace.read(cx).active_item_as::<Editor>(cx).unwrap();
-        let active_editor_title = active_editor.read(cx).title(cx);
-        assert_eq!(
-            expected_editor_title, active_editor_title,
-            "Unexpected editor title for query `{input}`"
-        );
-    });
-
-    history_items
-}
-
-fn init_test(cx: &mut TestAppContext) -> Arc<AppState> {
-    cx.update(|cx| {
-        let state = AppState::test(cx);
-        theme::init(theme::LoadThemes::JustBase, cx);
-        super::init(cx);
-        editor::init(cx);
-        state
-    })
-}
-
-fn test_path_position(test_str: &str) -> FileSearchQuery {
-    let path_position = PathWithPosition::parse_str(test_str);
-
-    FileSearchQuery {
-        raw_query: test_str.to_owned(),
-        file_query_end: if path_position.path.to_str().unwrap() == test_str {
-            None
-        } else {
-            Some(path_position.path.to_str().unwrap().len())
-        },
-        path_position,
-    }
-}
-
-fn build_find_picker(
-    project: Entity<Project>,
-    cx: &mut TestAppContext,
-) -> (
-    Entity<Picker<FileFinderDelegate>>,
-    Entity<Workspace>,
-    &mut VisualTestContext,
-) {
-    let (workspace, cx) = cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-    let picker = open_file_picker(&workspace, cx);
-    (picker, workspace, cx)
-}
-
-#[track_caller]
-fn open_file_picker(
-    workspace: &Entity<Workspace>,
-    cx: &mut VisualTestContext,
-) -> Entity<Picker<FileFinderDelegate>> {
-    cx.dispatch_action(ToggleFileFinder {
-        separate_history: true,
-    });
-    active_file_picker(workspace, cx)
-}
-
-#[track_caller]
-fn active_file_picker(
-    workspace: &Entity<Workspace>,
-    cx: &mut VisualTestContext,
-) -> Entity<Picker<FileFinderDelegate>> {
-    workspace.update(cx, |workspace, cx| {
-        workspace
-            .active_modal::<FileFinder>(cx)
-            .expect("file finder is not open")
-            .read(cx)
-            .picker
-            .clone()
-    })
-}
-
-#[derive(Debug, Default)]
-struct SearchEntries {
-    history: Vec<Arc<RelPath>>,
-    history_found_paths: Vec<FoundPath>,
-    search: Vec<Arc<RelPath>>,
-    search_matches: Vec<PathMatch>,
-}
-
-impl SearchEntries {
-    #[track_caller]
-    fn search_paths_only(self) -> Vec<Arc<RelPath>> {
-        assert!(
-            self.history.is_empty(),
-            "Should have no history matches, but got: {:?}",
-            self.history
-        );
-        self.search
-    }
-
-    #[track_caller]
-    fn search_matches_only(self) -> Vec<PathMatch> {
-        assert!(
-            self.history.is_empty(),
-            "Should have no history matches, but got: {:?}",
-            self.history
-        );
-        self.search_matches
-    }
-}
-
-fn collect_search_matches(picker: &Picker<FileFinderDelegate>) -> SearchEntries {
-    let mut search_entries = SearchEntries::default();
-    for m in &picker.delegate.matches.matches {
-        match &m {
-            Match::History {
-                path: history_path,
-                panel_match: path_match,
-            } => {
-                if let Some(path_match) = path_match.as_ref() {
-                    search_entries
-                        .history
-                        .push(path_match.0.path_prefix.join(&path_match.0.path));
-                } else {
-                    // This occurs when the query is empty and we show history matches
-                    // that are outside the project.
-                    panic!("currently not exercised in tests");
-                }
-                search_entries
-                    .history_found_paths
-                    .push(history_path.clone());
-            }
-            Match::Search(path_match) => {
-                search_entries
-                    .search
-                    .push(path_match.0.path_prefix.join(&path_match.0.path));
-                search_entries.search_matches.push(path_match.0.clone());
-            }
-            Match::CreateNew(_) => {}
-        }
-    }
-    search_entries
-}
-
-#[track_caller]
-fn assert_match_selection(
-    finder: &Picker<FileFinderDelegate>,
-    expected_selection_index: usize,
-    expected_file_name: &str,
-) {
-    assert_eq!(
-        finder.delegate.selected_index(),
-        expected_selection_index,
-        "Match is not selected"
-    );
-    assert_match_at_position(finder, expected_selection_index, expected_file_name);
-}
-
-#[track_caller]
-fn assert_match_at_position(
-    finder: &Picker<FileFinderDelegate>,
-    match_index: usize,
-    expected_file_name: &str,
-) {
-    let match_item = finder
-        .delegate
-        .matches
-        .get(match_index)
-        .unwrap_or_else(|| panic!("Finder has no match for index {match_index}"));
-    let match_file_name = match &match_item {
-        Match::History { path, .. } => path.absolute.file_name().and_then(|s| s.to_str()),
-        Match::Search(path_match) => path_match.0.path.file_name(),
-        Match::CreateNew(project_path) => project_path.path.file_name(),
-    }
-    .unwrap();
-    assert_eq!(match_file_name, expected_file_name);
-}
-
-#[gpui::test]
-async fn test_filename_precedence(cx: &mut TestAppContext) {
-    let app_state = init_test(cx);
-
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/src"),
-            json!({
-                "layout": {
-                    "app.css": "",
-                    "app.d.ts": "",
-                    "app.html": "",
-                    "+page.svelte": "",
-                },
-                "routes": {
-                    "+layout.svelte": "",
-                }
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), [path!("/src").as_ref()], cx).await;
-    let (picker, _, cx) = build_find_picker(project, cx);
-
-    cx.simulate_input("layout");
-
-    picker.update(cx, |finder, _| {
-        let search_matches = collect_search_matches(finder).search_paths_only();
-
-        assert_eq!(
-            search_matches,
-            vec![
-                rel_path("routes/+layout.svelte").into(),
-                rel_path("layout/app.css").into(),
-                rel_path("layout/app.d.ts").into(),
-                rel_path("layout/app.html").into(),
-                rel_path("layout/+page.svelte").into(),
-            ],
-            "File with 'layout' in filename should be prioritized over files in 'layout' directory"
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_paths_with_starting_slash(cx: &mut TestAppContext) {
-    let app_state = init_test(cx);
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/root"),
-            json!({
-                "a": {
-                    "file1.txt": "",
-                    "b": {
-                        "file2.txt": "",
-                    },
-                }
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), [path!("/root").as_ref()], cx).await;
-
-    let (picker, workspace, cx) = build_find_picker(project, cx);
-
-    let matching_abs_path = "/file1.txt".to_string();
-    picker
-        .update_in(cx, |picker, window, cx| {
-            picker
-                .delegate
-                .update_matches(matching_abs_path, window, cx)
-        })
-        .await;
-    picker.update(cx, |picker, _| {
-        assert_eq!(
-            collect_search_matches(picker).search_paths_only(),
-            vec![rel_path("a/file1.txt").into()],
-            "Relative path starting with slash should match"
-        )
-    });
-    cx.dispatch_action(SelectNext);
-    cx.dispatch_action(Confirm);
-    cx.read(|cx| {
-        let active_editor = workspace.read(cx).active_item_as::<Editor>(cx).unwrap();
-        assert_eq!(active_editor.read(cx).title(cx), "file1.txt");
-    });
-}
-
-#[gpui::test]
-async fn test_clear_navigation_history(cx: &mut TestAppContext) {
-    let app_state = init_test(cx);
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/src"),
-            json!({
-                "test": {
-                    "first.rs": "// First file",
-                    "second.rs": "// Second file",
-                    "third.rs": "// Third file",
-                }
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), [path!("/src").as_ref()], cx).await;
-    let (workspace, cx) = cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-
-    workspace.update_in(cx, |_workspace, window, cx| window.focused(cx));
-
-    // Open some files to generate navigation history
-    open_close_queried_buffer("fir", 1, "first.rs", &workspace, cx).await;
-    open_close_queried_buffer("sec", 1, "second.rs", &workspace, cx).await;
-    let history_before_clear =
-        open_close_queried_buffer("thi", 1, "third.rs", &workspace, cx).await;
-
-    assert_eq!(
-        history_before_clear.len(),
-        2,
-        "Should have history items before clearing"
-    );
-
-    // Verify that file finder shows history items
-    let picker = open_file_picker(&workspace, cx);
-    cx.simulate_input("fir");
-    picker.update(cx, |finder, _| {
-        let matches = collect_search_matches(finder);
-        assert!(
-            !matches.history.is_empty(),
-            "File finder should show history items before clearing"
-        );
-    });
-    workspace.update_in(cx, |_, window, cx| {
-        window.dispatch_action(menu::Cancel.boxed_clone(), cx);
-    });
-
-    // Verify navigation state before clear
-    workspace.update(cx, |workspace, cx| {
-        let pane = workspace.active_pane();
-        pane.read(cx).can_navigate_backward()
-    });
-
-    // Clear navigation history
-    cx.dispatch_action(workspace::ClearNavigationHistory);
-
-    // Verify that navigation is disabled immediately after clear
-    workspace.update(cx, |workspace, cx| {
-        let pane = workspace.active_pane();
-        assert!(
-            !pane.read(cx).can_navigate_backward(),
-            "Should not be able to navigate backward after clearing history"
-        );
-        assert!(
-            !pane.read(cx).can_navigate_forward(),
-            "Should not be able to navigate forward after clearing history"
-        );
-    });
-
-    // Verify that file finder no longer shows history items
-    let picker = open_file_picker(&workspace, cx);
-    cx.simulate_input("fir");
-    picker.update(cx, |finder, _| {
-        let matches = collect_search_matches(finder);
-        assert!(
-            matches.history.is_empty(),
-            "File finder should not show history items after clearing"
-        );
-    });
-    workspace.update_in(cx, |_, window, cx| {
-        window.dispatch_action(menu::Cancel.boxed_clone(), cx);
-    });
-
-    // Verify history is empty by opening a new file
-    // (this should not show any previous history)
-    let history_after_clear =
-        open_close_queried_buffer("sec", 1, "second.rs", &workspace, cx).await;
-    assert_eq!(
-        history_after_clear.len(),
-        0,
-        "Should have no history items after clearing"
-    );
-}
diff --git a/crates/file_finder/src/open_path_prompt.rs b/crates/file_finder/src/open_path_prompt.rs
deleted file mode 100644
index 2ae0c47776..0000000000
--- a/crates/file_finder/src/open_path_prompt.rs
+++ /dev/null
@@ -1,995 +0,0 @@
-use crate::file_finder_settings::FileFinderSettings;
-use file_icons::FileIcons;
-use futures::channel::oneshot;
-use fuzzy::{CharBag, StringMatch, StringMatchCandidate};
-use gpui::{HighlightStyle, StyledText, Task};
-use picker::{Picker, PickerDelegate};
-use project::{DirectoryItem, DirectoryLister};
-use settings::Settings;
-use std::{
-    path::{self, Path, PathBuf},
-    sync::{
-        Arc,
-        atomic::{self, AtomicBool},
-    },
-};
-use ui::{Context, LabelLike, ListItem, Window};
-use ui::{HighlightedLabel, ListItemSpacing, prelude::*};
-use util::{
-    maybe,
-    paths::{PathStyle, compare_paths},
-};
-use workspace::Workspace;
-
-pub(crate) struct OpenPathPrompt;
-
-pub struct OpenPathDelegate {
-    tx: Option<oneshot::Sender<Option<Vec<PathBuf>>>>,
-    lister: DirectoryLister,
-    selected_index: usize,
-    directory_state: DirectoryState,
-    string_matches: Vec<StringMatch>,
-    cancel_flag: Arc<AtomicBool>,
-    should_dismiss: bool,
-    prompt_root: String,
-    path_style: PathStyle,
-    replace_prompt: Task<()>,
-    render_footer:
-        Arc<dyn Fn(&mut Window, &mut Context<Picker<Self>>) -> Option<AnyElement> + 'static>,
-    hidden_entries: bool,
-}
-
-impl OpenPathDelegate {
-    pub fn new(
-        tx: oneshot::Sender<Option<Vec<PathBuf>>>,
-        lister: DirectoryLister,
-        creating_path: bool,
-        path_style: PathStyle,
-    ) -> Self {
-        Self {
-            tx: Some(tx),
-            lister,
-            selected_index: 0,
-            directory_state: DirectoryState::None {
-                create: creating_path,
-            },
-            string_matches: Vec::new(),
-            cancel_flag: Arc::new(AtomicBool::new(false)),
-            should_dismiss: true,
-            prompt_root: match path_style {
-                PathStyle::Posix => "/".to_string(),
-                PathStyle::Windows => "C:\\".to_string(),
-            },
-            path_style,
-            replace_prompt: Task::ready(()),
-            render_footer: Arc::new(|_, _| None),
-            hidden_entries: false,
-        }
-    }
-
-    pub fn with_footer(
-        mut self,
-        footer: Arc<
-            dyn Fn(&mut Window, &mut Context<Picker<Self>>) -> Option<AnyElement> + 'static,
-        >,
-    ) -> Self {
-        self.render_footer = footer;
-        self
-    }
-
-    pub fn show_hidden(mut self) -> Self {
-        self.hidden_entries = true;
-        self
-    }
-    fn get_entry(&self, selected_match_index: usize) -> Option<CandidateInfo> {
-        match &self.directory_state {
-            DirectoryState::List { entries, .. } => {
-                let id = self.string_matches.get(selected_match_index)?.candidate_id;
-                entries.iter().find(|entry| entry.path.id == id).cloned()
-            }
-            DirectoryState::Create {
-                user_input,
-                entries,
-                ..
-            } => {
-                let mut i = selected_match_index;
-                if let Some(user_input) = user_input
-                    && (!user_input.exists || !user_input.is_dir)
-                {
-                    if i == 0 {
-                        return Some(CandidateInfo {
-                            path: user_input.file.clone(),
-                            is_dir: false,
-                        });
-                    } else {
-                        i -= 1;
-                    }
-                }
-                let id = self.string_matches.get(i)?.candidate_id;
-                entries.iter().find(|entry| entry.path.id == id).cloned()
-            }
-            DirectoryState::None { .. } => None,
-        }
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn collect_match_candidates(&self) -> Vec<String> {
-        match &self.directory_state {
-            DirectoryState::List { entries, .. } => self
-                .string_matches
-                .iter()
-                .filter_map(|string_match| {
-                    entries
-                        .iter()
-                        .find(|entry| entry.path.id == string_match.candidate_id)
-                        .map(|candidate| candidate.path.string.clone())
-                })
-                .collect(),
-            DirectoryState::Create {
-                user_input,
-                entries,
-                ..
-            } => user_input
-                .iter()
-                .filter(|user_input| !user_input.exists || !user_input.is_dir)
-                .map(|user_input| user_input.file.string.clone())
-                .chain(self.string_matches.iter().filter_map(|string_match| {
-                    entries
-                        .iter()
-                        .find(|entry| entry.path.id == string_match.candidate_id)
-                        .map(|candidate| candidate.path.string.clone())
-                }))
-                .collect(),
-            DirectoryState::None { .. } => Vec::new(),
-        }
-    }
-
-    fn current_dir(&self) -> &'static str {
-        match self.path_style {
-            PathStyle::Posix => "./",
-            PathStyle::Windows => ".\\",
-        }
-    }
-}
-
-#[derive(Debug)]
-enum DirectoryState {
-    List {
-        parent_path: String,
-        entries: Vec<CandidateInfo>,
-        error: Option<SharedString>,
-    },
-    Create {
-        parent_path: String,
-        user_input: Option<UserInput>,
-        entries: Vec<CandidateInfo>,
-    },
-    None {
-        create: bool,
-    },
-}
-
-#[derive(Debug, Clone)]
-struct UserInput {
-    file: StringMatchCandidate,
-    exists: bool,
-    is_dir: bool,
-}
-
-#[derive(Debug, Clone)]
-struct CandidateInfo {
-    path: StringMatchCandidate,
-    is_dir: bool,
-}
-
-impl OpenPathPrompt {
-    pub(crate) fn register(
-        workspace: &mut Workspace,
-        _window: Option<&mut Window>,
-        _: &mut Context<Workspace>,
-    ) {
-        workspace.set_prompt_for_open_path(Box::new(|workspace, lister, window, cx| {
-            let (tx, rx) = futures::channel::oneshot::channel();
-            Self::prompt_for_open_path(workspace, lister, false, tx, window, cx);
-            rx
-        }));
-    }
-
-    pub(crate) fn register_new_path(
-        workspace: &mut Workspace,
-        _window: Option<&mut Window>,
-        _: &mut Context<Workspace>,
-    ) {
-        workspace.set_prompt_for_new_path(Box::new(|workspace, lister, window, cx| {
-            let (tx, rx) = futures::channel::oneshot::channel();
-            Self::prompt_for_open_path(workspace, lister, true, tx, window, cx);
-            rx
-        }));
-    }
-
-    fn prompt_for_open_path(
-        workspace: &mut Workspace,
-        lister: DirectoryLister,
-        creating_path: bool,
-        tx: oneshot::Sender<Option<Vec<PathBuf>>>,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        workspace.toggle_modal(window, cx, |window, cx| {
-            let delegate =
-                OpenPathDelegate::new(tx, lister.clone(), creating_path, PathStyle::local());
-            let picker = Picker::uniform_list(delegate, window, cx).width(rems(34.));
-            let query = lister.default_query(cx);
-            picker.set_query(query, window, cx);
-            picker
-        });
-    }
-}
-
-impl PickerDelegate for OpenPathDelegate {
-    type ListItem = ui::ListItem;
-
-    fn match_count(&self) -> usize {
-        let user_input = if let DirectoryState::Create { user_input, .. } = &self.directory_state {
-            user_input
-                .as_ref()
-                .filter(|input| !input.exists || !input.is_dir)
-                .into_iter()
-                .count()
-        } else {
-            0
-        };
-        self.string_matches.len() + user_input
-    }
-
-    fn selected_index(&self) -> usize {
-        self.selected_index
-    }
-
-    fn set_selected_index(&mut self, ix: usize, _: &mut Window, cx: &mut Context<Picker<Self>>) {
-        self.selected_index = ix;
-        cx.notify();
-    }
-
-    fn update_matches(
-        &mut self,
-        query: String,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Task<()> {
-        let lister = &self.lister;
-        let input_is_empty = query.is_empty();
-        let (dir, suffix) = get_dir_and_suffix(query, self.path_style);
-
-        let query = match &self.directory_state {
-            DirectoryState::List { parent_path, .. } => {
-                if parent_path == &dir {
-                    None
-                } else {
-                    Some(lister.list_directory(dir.clone(), cx))
-                }
-            }
-            DirectoryState::Create {
-                parent_path,
-                user_input,
-                ..
-            } => {
-                if parent_path == &dir
-                    && user_input.as_ref().map(|input| &input.file.string) == Some(&suffix)
-                {
-                    None
-                } else {
-                    Some(lister.list_directory(dir.clone(), cx))
-                }
-            }
-            DirectoryState::None { .. } => Some(lister.list_directory(dir.clone(), cx)),
-        };
-        self.cancel_flag.store(true, atomic::Ordering::Release);
-        self.cancel_flag = Arc::new(AtomicBool::new(false));
-        let cancel_flag = self.cancel_flag.clone();
-        let hidden_entries = self.hidden_entries;
-        let parent_path_is_root = self.prompt_root == dir;
-        let current_dir = self.current_dir();
-        cx.spawn_in(window, async move |this, cx| {
-            if let Some(query) = query {
-                let paths = query.await;
-                if cancel_flag.load(atomic::Ordering::Acquire) {
-                    return;
-                }
-
-                if this
-                    .update(cx, |this, _| {
-                        let new_state = match &this.delegate.directory_state {
-                            DirectoryState::None { create: false }
-                            | DirectoryState::List { .. } => match paths {
-                                Ok(paths) => DirectoryState::List {
-                                    entries: path_candidates(parent_path_is_root, paths),
-                                    parent_path: dir.clone(),
-                                    error: None,
-                                },
-                                Err(e) => DirectoryState::List {
-                                    entries: Vec::new(),
-                                    parent_path: dir.clone(),
-                                    error: Some(SharedString::from(e.to_string())),
-                                },
-                            },
-                            DirectoryState::None { create: true }
-                            | DirectoryState::Create { .. } => match paths {
-                                Ok(paths) => {
-                                    let mut entries = path_candidates(parent_path_is_root, paths);
-                                    let mut exists = false;
-                                    let mut is_dir = false;
-                                    let mut new_id = None;
-                                    entries.retain(|entry| {
-                                        new_id = new_id.max(Some(entry.path.id));
-                                        if entry.path.string == suffix {
-                                            exists = true;
-                                            is_dir = entry.is_dir;
-                                        }
-                                        !exists || is_dir
-                                    });
-
-                                    let new_id = new_id.map(|id| id + 1).unwrap_or(0);
-                                    let user_input = if suffix.is_empty() {
-                                        None
-                                    } else {
-                                        Some(UserInput {
-                                            file: StringMatchCandidate::new(new_id, &suffix),
-                                            exists,
-                                            is_dir,
-                                        })
-                                    };
-                                    DirectoryState::Create {
-                                        entries,
-                                        parent_path: dir.clone(),
-                                        user_input,
-                                    }
-                                }
-                                Err(_) => DirectoryState::Create {
-                                    entries: Vec::new(),
-                                    parent_path: dir.clone(),
-                                    user_input: Some(UserInput {
-                                        exists: false,
-                                        is_dir: false,
-                                        file: StringMatchCandidate::new(0, &suffix),
-                                    }),
-                                },
-                            },
-                        };
-                        this.delegate.directory_state = new_state;
-                    })
-                    .is_err()
-                {
-                    return;
-                }
-            }
-
-            let Ok(mut new_entries) =
-                this.update(cx, |this, _| match &this.delegate.directory_state {
-                    DirectoryState::List {
-                        entries,
-                        error: None,
-                        ..
-                    }
-                    | DirectoryState::Create { entries, .. } => entries.clone(),
-                    DirectoryState::List { error: Some(_), .. } | DirectoryState::None { .. } => {
-                        Vec::new()
-                    }
-                })
-            else {
-                return;
-            };
-
-            let mut max_id = 0;
-            if !suffix.starts_with('.') && !hidden_entries {
-                new_entries.retain(|entry| {
-                    max_id = max_id.max(entry.path.id);
-                    !entry.path.string.starts_with('.')
-                });
-            }
-
-            if suffix.is_empty() {
-                let should_prepend_with_current_dir = this
-                    .read_with(cx, |picker, _| {
-                        !input_is_empty
-                            && match &picker.delegate.directory_state {
-                                DirectoryState::List { error, .. } => error.is_none(),
-                                DirectoryState::Create { .. } => false,
-                                DirectoryState::None { .. } => false,
-                            }
-                    })
-                    .unwrap_or(false);
-
-                let current_dir_in_new_entries = new_entries
-                    .iter()
-                    .any(|entry| &entry.path.string == current_dir);
-
-                if should_prepend_with_current_dir && !current_dir_in_new_entries {
-                    new_entries.insert(
-                        0,
-                        CandidateInfo {
-                            path: StringMatchCandidate {
-                                id: max_id + 1,
-                                string: current_dir.to_string(),
-                                char_bag: CharBag::from(current_dir),
-                            },
-                            is_dir: true,
-                        },
-                    );
-                }
-
-                this.update(cx, |this, cx| {
-                    this.delegate.selected_index = 0;
-                    this.delegate.string_matches = new_entries
-                        .iter()
-                        .map(|m| StringMatch {
-                            candidate_id: m.path.id,
-                            score: 0.0,
-                            positions: Vec::new(),
-                            string: m.path.string.clone(),
-                        })
-                        .collect();
-                    this.delegate.directory_state =
-                        match &this.delegate.directory_state {
-                            DirectoryState::None { create: false }
-                            | DirectoryState::List { .. } => DirectoryState::List {
-                                parent_path: dir.clone(),
-                                entries: new_entries,
-                                error: None,
-                            },
-                            DirectoryState::None { create: true }
-                            | DirectoryState::Create { .. } => DirectoryState::Create {
-                                parent_path: dir.clone(),
-                                user_input: None,
-                                entries: new_entries,
-                            },
-                        };
-                    cx.notify();
-                })
-                .ok();
-                return;
-            }
-
-            let Ok(is_create_state) =
-                this.update(cx, |this, _| match &this.delegate.directory_state {
-                    DirectoryState::Create { .. } => true,
-                    DirectoryState::List { .. } => false,
-                    DirectoryState::None { create } => *create,
-                })
-            else {
-                return;
-            };
-
-            let candidates = new_entries
-                .iter()
-                .filter_map(|entry| {
-                    if is_create_state && !entry.is_dir && Some(&suffix) == Some(&entry.path.string)
-                    {
-                        None
-                    } else {
-                        Some(&entry.path)
-                    }
-                })
-                .collect::<Vec<_>>();
-
-            let matches = fuzzy::match_strings(
-                candidates.as_slice(),
-                &suffix,
-                false,
-                true,
-                100,
-                &cancel_flag,
-                cx.background_executor().clone(),
-            )
-            .await;
-            if cancel_flag.load(atomic::Ordering::Acquire) {
-                return;
-            }
-
-            this.update(cx, |this, cx| {
-                this.delegate.selected_index = 0;
-                this.delegate.string_matches = matches.clone();
-                this.delegate.string_matches.sort_by_key(|m| {
-                    (
-                        new_entries
-                            .iter()
-                            .find(|entry| entry.path.id == m.candidate_id)
-                            .map(|entry| &entry.path)
-                            .map(|candidate| !candidate.string.starts_with(&suffix)),
-                        m.candidate_id,
-                    )
-                });
-                this.delegate.directory_state = match &this.delegate.directory_state {
-                    DirectoryState::None { create: false } | DirectoryState::List { .. } => {
-                        DirectoryState::List {
-                            entries: new_entries,
-                            parent_path: dir.clone(),
-                            error: None,
-                        }
-                    }
-                    DirectoryState::None { create: true } => DirectoryState::Create {
-                        entries: new_entries,
-                        parent_path: dir.clone(),
-                        user_input: Some(UserInput {
-                            file: StringMatchCandidate::new(0, &suffix),
-                            exists: false,
-                            is_dir: false,
-                        }),
-                    },
-                    DirectoryState::Create { user_input, .. } => {
-                        let (new_id, exists, is_dir) = user_input
-                            .as_ref()
-                            .map(|input| (input.file.id, input.exists, input.is_dir))
-                            .unwrap_or_else(|| (0, false, false));
-                        DirectoryState::Create {
-                            entries: new_entries,
-                            parent_path: dir.clone(),
-                            user_input: Some(UserInput {
-                                file: StringMatchCandidate::new(new_id, &suffix),
-                                exists,
-                                is_dir,
-                            }),
-                        }
-                    }
-                };
-
-                cx.notify();
-            })
-            .ok();
-        })
-    }
-
-    fn confirm_completion(
-        &mut self,
-        query: String,
-        _window: &mut Window,
-        _: &mut Context<Picker<Self>>,
-    ) -> Option<String> {
-        let candidate = self.get_entry(self.selected_index)?;
-        if candidate.path.string.is_empty() || candidate.path.string == self.current_dir() {
-            return None;
-        }
-
-        let path_style = self.path_style;
-        Some(
-            maybe!({
-                match &self.directory_state {
-                    DirectoryState::Create { parent_path, .. } => Some(format!(
-                        "{}{}{}",
-                        parent_path,
-                        candidate.path.string,
-                        if candidate.is_dir {
-                            path_style.primary_separator()
-                        } else {
-                            ""
-                        }
-                    )),
-                    DirectoryState::List { parent_path, .. } => Some(format!(
-                        "{}{}{}",
-                        parent_path,
-                        candidate.path.string,
-                        if candidate.is_dir {
-                            path_style.primary_separator()
-                        } else {
-                            ""
-                        }
-                    )),
-                    DirectoryState::None { .. } => return None,
-                }
-            })
-            .unwrap_or(query),
-        )
-    }
-
-    fn confirm(&mut self, _: bool, window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        let Some(candidate) = self.get_entry(self.selected_index) else {
-            return;
-        };
-
-        match &self.directory_state {
-            DirectoryState::None { .. } => return,
-            DirectoryState::List { parent_path, .. } => {
-                let confirmed_path =
-                    if parent_path == &self.prompt_root && candidate.path.string.is_empty() {
-                        PathBuf::from(&self.prompt_root)
-                    } else {
-                        Path::new(self.lister.resolve_tilde(parent_path, cx).as_ref())
-                            .join(&candidate.path.string)
-                    };
-                if let Some(tx) = self.tx.take() {
-                    tx.send(Some(vec![confirmed_path])).ok();
-                }
-            }
-            DirectoryState::Create {
-                parent_path,
-                user_input,
-                ..
-            } => match user_input {
-                None => return,
-                Some(user_input) => {
-                    if user_input.is_dir {
-                        return;
-                    }
-                    let prompted_path =
-                        if parent_path == &self.prompt_root && user_input.file.string.is_empty() {
-                            PathBuf::from(&self.prompt_root)
-                        } else {
-                            Path::new(self.lister.resolve_tilde(parent_path, cx).as_ref())
-                                .join(&user_input.file.string)
-                        };
-                    if user_input.exists {
-                        self.should_dismiss = false;
-                        let answer = window.prompt(
-                            gpui::PromptLevel::Critical,
-                            &format!("{prompted_path:?} already exists. Do you want to replace it?"),
-                            Some(
-                                "A file or folder with the same name already exists. Replacing it will overwrite its current contents.",
-                            ),
-                            &["Replace", "Cancel"],
-                            cx
-                        );
-                        self.replace_prompt = cx.spawn_in(window, async move |picker, cx| {
-                            let answer = answer.await.ok();
-                            picker
-                                .update(cx, |picker, cx| {
-                                    picker.delegate.should_dismiss = true;
-                                    if answer != Some(0) {
-                                        return;
-                                    }
-                                    if let Some(tx) = picker.delegate.tx.take() {
-                                        tx.send(Some(vec![prompted_path])).ok();
-                                    }
-                                    cx.emit(gpui::DismissEvent);
-                                })
-                                .ok();
-                        });
-                        return;
-                    } else if let Some(tx) = self.tx.take() {
-                        tx.send(Some(vec![prompted_path])).ok();
-                    }
-                }
-            },
-        }
-
-        cx.emit(gpui::DismissEvent);
-    }
-
-    fn should_dismiss(&self) -> bool {
-        self.should_dismiss
-    }
-
-    fn dismissed(&mut self, _: &mut Window, cx: &mut Context<Picker<Self>>) {
-        if let Some(tx) = self.tx.take() {
-            tx.send(None).ok();
-        }
-        cx.emit(gpui::DismissEvent)
-    }
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<Self::ListItem> {
-        let settings = FileFinderSettings::get_global(cx);
-        let candidate = self.get_entry(ix)?;
-        let mut match_positions = match &self.directory_state {
-            DirectoryState::List { .. } => self.string_matches.get(ix)?.positions.clone(),
-            DirectoryState::Create { user_input, .. } => {
-                if let Some(user_input) = user_input {
-                    if !user_input.exists || !user_input.is_dir {
-                        if ix == 0 {
-                            Vec::new()
-                        } else {
-                            self.string_matches.get(ix - 1)?.positions.clone()
-                        }
-                    } else {
-                        self.string_matches.get(ix)?.positions.clone()
-                    }
-                } else {
-                    self.string_matches.get(ix)?.positions.clone()
-                }
-            }
-            DirectoryState::None { .. } => Vec::new(),
-        };
-
-        let is_current_dir_candidate = candidate.path.string == self.current_dir();
-
-        let file_icon = maybe!({
-            if !settings.file_icons {
-                return None;
-            }
-
-            let path = path::Path::new(&candidate.path.string);
-            let icon = if candidate.is_dir {
-                if is_current_dir_candidate {
-                    return Some(Icon::new(IconName::ReplyArrowRight).color(Color::Muted));
-                } else {
-                    FileIcons::get_folder_icon(false, path, cx)?
-                }
-            } else {
-                FileIcons::get_icon(path, cx)?
-            };
-            Some(Icon::from_path(icon).color(Color::Muted))
-        });
-
-        match &self.directory_state {
-            DirectoryState::List { parent_path, .. } => {
-                let (label, indices) = if is_current_dir_candidate {
-                    ("open this directory".to_string(), vec![])
-                } else if *parent_path == self.prompt_root {
-                    match_positions.iter_mut().for_each(|position| {
-                        *position += self.prompt_root.len();
-                    });
-                    (
-                        format!("{}{}", self.prompt_root, candidate.path.string),
-                        match_positions,
-                    )
-                } else {
-                    (candidate.path.string, match_positions)
-                };
-                Some(
-                    ListItem::new(ix)
-                        .spacing(ListItemSpacing::Sparse)
-                        .start_slot::<Icon>(file_icon)
-                        .inset(true)
-                        .toggle_state(selected)
-                        .child(HighlightedLabel::new(label, indices)),
-                )
-            }
-            DirectoryState::Create {
-                parent_path,
-                user_input,
-                ..
-            } => {
-                let (label, delta) = if *parent_path == self.prompt_root {
-                    match_positions.iter_mut().for_each(|position| {
-                        *position += self.prompt_root.len();
-                    });
-                    (
-                        format!("{}{}", self.prompt_root, candidate.path.string),
-                        self.prompt_root.len(),
-                    )
-                } else {
-                    (candidate.path.string.clone(), 0)
-                };
-
-                let label_with_highlights = match user_input {
-                    Some(user_input) => {
-                        let label_len = label.len();
-                        if user_input.file.string == candidate.path.string {
-                            if user_input.exists {
-                                let label = if user_input.is_dir {
-                                    label
-                                } else {
-                                    format!("{label} (replace)")
-                                };
-                                StyledText::new(label)
-                                    .with_default_highlights(
-                                        &window.text_style(),
-                                        vec![(
-                                            delta..label_len,
-                                            HighlightStyle::color(Color::Conflict.color(cx)),
-                                        )],
-                                    )
-                                    .into_any_element()
-                            } else {
-                                StyledText::new(format!("{label} (create)"))
-                                    .with_default_highlights(
-                                        &window.text_style(),
-                                        vec![(
-                                            delta..label_len,
-                                            HighlightStyle::color(Color::Created.color(cx)),
-                                        )],
-                                    )
-                                    .into_any_element()
-                            }
-                        } else {
-                            HighlightedLabel::new(label, match_positions).into_any_element()
-                        }
-                    }
-                    None => HighlightedLabel::new(label, match_positions).into_any_element(),
-                };
-
-                Some(
-                    ListItem::new(ix)
-                        .spacing(ListItemSpacing::Sparse)
-                        .start_slot::<Icon>(file_icon)
-                        .inset(true)
-                        .toggle_state(selected)
-                        .child(LabelLike::new().child(label_with_highlights)),
-                )
-            }
-            DirectoryState::None { .. } => None,
-        }
-    }
-
-    fn render_footer(
-        &self,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<AnyElement> {
-        (self.render_footer)(window, cx)
-    }
-
-    fn no_matches_text(&self, _window: &mut Window, _cx: &mut App) -> Option<SharedString> {
-        Some(match &self.directory_state {
-            DirectoryState::Create { .. } => SharedString::from("Type a path…"),
-            DirectoryState::List {
-                error: Some(error), ..
-            } => error.clone(),
-            DirectoryState::List { .. } | DirectoryState::None { .. } => {
-                SharedString::from("No such file or directory")
-            }
-        })
-    }
-
-    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
-        Arc::from(
-            format!(
-                "[directory{}]filename.ext",
-                self.path_style.primary_separator()
-            )
-            .as_str(),
-        )
-    }
-
-    fn separators_after_indices(&self) -> Vec<usize> {
-        let Some(m) = self.string_matches.first() else {
-            return Vec::new();
-        };
-        if m.string == self.current_dir() {
-            vec![0]
-        } else {
-            Vec::new()
-        }
-    }
-}
-
-fn path_candidates(
-    parent_path_is_root: bool,
-    mut children: Vec<DirectoryItem>,
-) -> Vec<CandidateInfo> {
-    if parent_path_is_root {
-        children.push(DirectoryItem {
-            is_dir: true,
-            path: PathBuf::default(),
-        });
-    }
-
-    children.sort_by(|a, b| compare_paths((&a.path, true), (&b.path, true)));
-    children
-        .iter()
-        .enumerate()
-        .map(|(ix, item)| CandidateInfo {
-            path: StringMatchCandidate::new(ix, &item.path.to_string_lossy()),
-            is_dir: item.is_dir,
-        })
-        .collect()
-}
-
-#[cfg(target_os = "windows")]
-fn get_dir_and_suffix(query: String, path_style: PathStyle) -> (String, String) {
-    let last_item = Path::new(&query)
-        .file_name()
-        .unwrap_or_default()
-        .to_string_lossy();
-    let (mut dir, suffix) = if let Some(dir) = query.strip_suffix(last_item.as_ref()) {
-        (dir.to_string(), last_item.into_owned())
-    } else {
-        (query.to_string(), String::new())
-    };
-    match path_style {
-        PathStyle::Posix => {
-            if dir.is_empty() {
-                dir = "/".to_string();
-            }
-        }
-        PathStyle::Windows => {
-            if dir.len() < 3 {
-                dir = "C:\\".to_string();
-            }
-        }
-    }
-    (dir, suffix)
-}
-
-#[cfg(not(target_os = "windows"))]
-fn get_dir_and_suffix(query: String, path_style: PathStyle) -> (String, String) {
-    match path_style {
-        PathStyle::Posix => {
-            let (mut dir, suffix) = if let Some(index) = query.rfind('/') {
-                (query[..index].to_string(), query[index + 1..].to_string())
-            } else {
-                (query, String::new())
-            };
-            if !dir.ends_with('/') {
-                dir.push('/');
-            }
-            (dir, suffix)
-        }
-        PathStyle::Windows => {
-            let (mut dir, suffix) = if let Some(index) = query.rfind('\\') {
-                (query[..index].to_string(), query[index + 1..].to_string())
-            } else {
-                (query, String::new())
-            };
-            if dir.len() < 3 {
-                dir = "C:\\".to_string();
-            }
-            if !dir.ends_with('\\') {
-                dir.push('\\');
-            }
-            (dir, suffix)
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use util::paths::PathStyle;
-
-    use crate::open_path_prompt::get_dir_and_suffix;
-
-    #[test]
-    fn test_get_dir_and_suffix_with_windows_style() {
-        let (dir, suffix) = get_dir_and_suffix("".into(), PathStyle::Windows);
-        assert_eq!(dir, "C:\\");
-        assert_eq!(suffix, "");
-
-        let (dir, suffix) = get_dir_and_suffix("C:".into(), PathStyle::Windows);
-        assert_eq!(dir, "C:\\");
-        assert_eq!(suffix, "");
-
-        let (dir, suffix) = get_dir_and_suffix("C:\\".into(), PathStyle::Windows);
-        assert_eq!(dir, "C:\\");
-        assert_eq!(suffix, "");
-
-        let (dir, suffix) = get_dir_and_suffix("C:\\Use".into(), PathStyle::Windows);
-        assert_eq!(dir, "C:\\");
-        assert_eq!(suffix, "Use");
-
-        let (dir, suffix) =
-            get_dir_and_suffix("C:\\Users\\Junkui\\Docum".into(), PathStyle::Windows);
-        assert_eq!(dir, "C:\\Users\\Junkui\\");
-        assert_eq!(suffix, "Docum");
-
-        let (dir, suffix) =
-            get_dir_and_suffix("C:\\Users\\Junkui\\Documents".into(), PathStyle::Windows);
-        assert_eq!(dir, "C:\\Users\\Junkui\\");
-        assert_eq!(suffix, "Documents");
-
-        let (dir, suffix) =
-            get_dir_and_suffix("C:\\Users\\Junkui\\Documents\\".into(), PathStyle::Windows);
-        assert_eq!(dir, "C:\\Users\\Junkui\\Documents\\");
-        assert_eq!(suffix, "");
-    }
-
-    #[test]
-    fn test_get_dir_and_suffix_with_posix_style() {
-        let (dir, suffix) = get_dir_and_suffix("".into(), PathStyle::Posix);
-        assert_eq!(dir, "/");
-        assert_eq!(suffix, "");
-
-        let (dir, suffix) = get_dir_and_suffix("/".into(), PathStyle::Posix);
-        assert_eq!(dir, "/");
-        assert_eq!(suffix, "");
-
-        let (dir, suffix) = get_dir_and_suffix("/Use".into(), PathStyle::Posix);
-        assert_eq!(dir, "/");
-        assert_eq!(suffix, "Use");
-
-        let (dir, suffix) = get_dir_and_suffix("/Users/Junkui/Docum".into(), PathStyle::Posix);
-        assert_eq!(dir, "/Users/Junkui/");
-        assert_eq!(suffix, "Docum");
-
-        let (dir, suffix) = get_dir_and_suffix("/Users/Junkui/Documents".into(), PathStyle::Posix);
-        assert_eq!(dir, "/Users/Junkui/");
-        assert_eq!(suffix, "Documents");
-
-        let (dir, suffix) = get_dir_and_suffix("/Users/Junkui/Documents/".into(), PathStyle::Posix);
-        assert_eq!(dir, "/Users/Junkui/Documents/");
-        assert_eq!(suffix, "");
-    }
-}
diff --git a/crates/file_finder/src/open_path_prompt_tests.rs b/crates/file_finder/src/open_path_prompt_tests.rs
deleted file mode 100644
index dea188034b..0000000000
--- a/crates/file_finder/src/open_path_prompt_tests.rs
+++ /dev/null
@@ -1,463 +0,0 @@
-use std::sync::Arc;
-
-use gpui::{AppContext, Entity, TestAppContext, VisualTestContext};
-use picker::{Picker, PickerDelegate};
-use project::Project;
-use serde_json::json;
-use ui::rems;
-use util::{path, paths::PathStyle};
-use workspace::{AppState, Workspace};
-
-use crate::OpenPathDelegate;
-
-#[gpui::test]
-async fn test_open_path_prompt(cx: &mut TestAppContext) {
-    let app_state = init_test(cx);
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/root"),
-            json!({
-                "a1": "A1",
-                "a2": "A2",
-                "a3": "A3",
-                "dir1": {},
-                "dir2": {
-                    "c": "C",
-                    "d1": "D1",
-                    "d2": "D2",
-                    "d3": "D3",
-                    "dir3": {},
-                    "dir4": {}
-                }
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), [path!("/root").as_ref()], cx).await;
-
-    let (picker, cx) = build_open_path_prompt(project, false, PathStyle::local(), cx);
-
-    insert_query(path!("sadjaoislkdjasldj"), &picker, cx).await;
-    assert_eq!(collect_match_candidates(&picker, cx), Vec::<String>::new());
-
-    let query = path!("/root");
-    insert_query(query, &picker, cx).await;
-    assert_eq!(collect_match_candidates(&picker, cx), vec!["root"]);
-
-    #[cfg(not(windows))]
-    let expected_separator = "./";
-    #[cfg(windows)]
-    let expected_separator = ".\\";
-
-    // If the query ends with a slash, the picker should show the contents of the directory.
-    let query = path!("/root/");
-    insert_query(query, &picker, cx).await;
-    assert_eq!(
-        collect_match_candidates(&picker, cx),
-        vec![expected_separator, "a1", "a2", "a3", "dir1", "dir2"]
-    );
-
-    // Show candidates for the query "a".
-    let query = path!("/root/a");
-    insert_query(query, &picker, cx).await;
-    assert_eq!(
-        collect_match_candidates(&picker, cx),
-        vec!["a1", "a2", "a3"]
-    );
-
-    // Show candidates for the query "d".
-    let query = path!("/root/d");
-    insert_query(query, &picker, cx).await;
-    assert_eq!(collect_match_candidates(&picker, cx), vec!["dir1", "dir2"]);
-
-    let query = path!("/root/dir2");
-    insert_query(query, &picker, cx).await;
-    assert_eq!(collect_match_candidates(&picker, cx), vec!["dir2"]);
-
-    let query = path!("/root/dir2/");
-    insert_query(query, &picker, cx).await;
-    assert_eq!(
-        collect_match_candidates(&picker, cx),
-        vec![expected_separator, "c", "d1", "d2", "d3", "dir3", "dir4"]
-    );
-
-    // Show candidates for the query "d".
-    let query = path!("/root/dir2/d");
-    insert_query(query, &picker, cx).await;
-    assert_eq!(
-        collect_match_candidates(&picker, cx),
-        vec!["d1", "d2", "d3", "dir3", "dir4"]
-    );
-
-    let query = path!("/root/dir2/di");
-    insert_query(query, &picker, cx).await;
-    assert_eq!(collect_match_candidates(&picker, cx), vec!["dir3", "dir4"]);
-}
-
-#[gpui::test]
-async fn test_open_path_prompt_completion(cx: &mut TestAppContext) {
-    let app_state = init_test(cx);
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/root"),
-            json!({
-                "a": "A",
-                "dir1": {},
-                "dir2": {
-                    "c": "C",
-                    "d": "D",
-                    "dir3": {},
-                    "dir4": {}
-                }
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), [path!("/root").as_ref()], cx).await;
-
-    let (picker, cx) = build_open_path_prompt(project, false, PathStyle::local(), cx);
-
-    // Confirm completion for the query "/root", since it's a directory, it should add a trailing slash.
-    let query = path!("/root");
-    insert_query(query, &picker, cx).await;
-    assert_eq!(
-        confirm_completion(query, 0, &picker, cx).unwrap(),
-        path!("/root/")
-    );
-
-    // Confirm completion for the query "/root/", selecting the first candidate "a", since it's a file, it should not add a trailing slash.
-    let query = path!("/root/");
-    insert_query(query, &picker, cx).await;
-    assert_eq!(
-        confirm_completion(query, 0, &picker, cx),
-        None,
-        "First entry is `./` and when we confirm completion, it is tabbed below"
-    );
-    assert_eq!(
-        confirm_completion(query, 1, &picker, cx).unwrap(),
-        path!("/root/a"),
-        "Second entry is the first entry of a directory that we want to be completed"
-    );
-
-    // Confirm completion for the query "/root/", selecting the second candidate "dir1", since it's a directory, it should add a trailing slash.
-    let query = path!("/root/");
-    insert_query(query, &picker, cx).await;
-    assert_eq!(
-        confirm_completion(query, 2, &picker, cx).unwrap(),
-        path!("/root/dir1/")
-    );
-
-    let query = path!("/root/a");
-    insert_query(query, &picker, cx).await;
-    assert_eq!(
-        confirm_completion(query, 0, &picker, cx).unwrap(),
-        path!("/root/a")
-    );
-
-    let query = path!("/root/d");
-    insert_query(query, &picker, cx).await;
-    assert_eq!(
-        confirm_completion(query, 1, &picker, cx).unwrap(),
-        path!("/root/dir2/")
-    );
-
-    let query = path!("/root/dir2");
-    insert_query(query, &picker, cx).await;
-    assert_eq!(
-        confirm_completion(query, 0, &picker, cx).unwrap(),
-        path!("/root/dir2/")
-    );
-
-    let query = path!("/root/dir2/");
-    insert_query(query, &picker, cx).await;
-    assert_eq!(
-        confirm_completion(query, 1, &picker, cx).unwrap(),
-        path!("/root/dir2/c")
-    );
-
-    let query = path!("/root/dir2/");
-    insert_query(query, &picker, cx).await;
-    assert_eq!(
-        confirm_completion(query, 3, &picker, cx).unwrap(),
-        path!("/root/dir2/dir3/")
-    );
-
-    let query = path!("/root/dir2/d");
-    insert_query(query, &picker, cx).await;
-    assert_eq!(
-        confirm_completion(query, 0, &picker, cx).unwrap(),
-        path!("/root/dir2/d")
-    );
-
-    let query = path!("/root/dir2/d");
-    insert_query(query, &picker, cx).await;
-    assert_eq!(
-        confirm_completion(query, 1, &picker, cx).unwrap(),
-        path!("/root/dir2/dir3/")
-    );
-
-    let query = path!("/root/dir2/di");
-    insert_query(query, &picker, cx).await;
-    assert_eq!(
-        confirm_completion(query, 1, &picker, cx).unwrap(),
-        path!("/root/dir2/dir4/")
-    );
-}
-
-#[gpui::test]
-#[cfg_attr(not(target_os = "windows"), ignore)]
-async fn test_open_path_prompt_on_windows(cx: &mut TestAppContext) {
-    let app_state = init_test(cx);
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/root"),
-            json!({
-                "a": "A",
-                "dir1": {},
-                "dir2": {}
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), [path!("/root").as_ref()], cx).await;
-
-    let (picker, cx) = build_open_path_prompt(project, false, PathStyle::local(), cx);
-
-    // Support both forward and backward slashes.
-    let query = "C:/root/";
-    insert_query(query, &picker, cx).await;
-    assert_eq!(
-        collect_match_candidates(&picker, cx),
-        vec![".\\", "a", "dir1", "dir2"]
-    );
-    assert_eq!(
-        confirm_completion(query, 0, &picker, cx),
-        None,
-        "First entry is `.\\` and when we confirm completion, it is tabbed below"
-    );
-    assert_eq!(
-        confirm_completion(query, 1, &picker, cx).unwrap(),
-        "C:/root/a",
-        "Second entry is the first entry of a directory that we want to be completed"
-    );
-
-    let query = "C:\\root/";
-    insert_query(query, &picker, cx).await;
-    assert_eq!(
-        collect_match_candidates(&picker, cx),
-        vec![".\\", "a", "dir1", "dir2"]
-    );
-    assert_eq!(
-        confirm_completion(query, 1, &picker, cx).unwrap(),
-        "C:\\root/a"
-    );
-
-    let query = "C:\\root\\";
-    insert_query(query, &picker, cx).await;
-    assert_eq!(
-        collect_match_candidates(&picker, cx),
-        vec![".\\", "a", "dir1", "dir2"]
-    );
-    assert_eq!(
-        confirm_completion(query, 1, &picker, cx).unwrap(),
-        "C:\\root\\a"
-    );
-
-    // Confirm completion for the query "C:/root/d", selecting the second candidate "dir2", since it's a directory, it should add a trailing slash.
-    let query = "C:/root/d";
-    insert_query(query, &picker, cx).await;
-    assert_eq!(collect_match_candidates(&picker, cx), vec!["dir1", "dir2"]);
-    assert_eq!(
-        confirm_completion(query, 1, &picker, cx).unwrap(),
-        "C:/root/dir2\\"
-    );
-
-    let query = "C:\\root/d";
-    insert_query(query, &picker, cx).await;
-    assert_eq!(collect_match_candidates(&picker, cx), vec!["dir1", "dir2"]);
-    assert_eq!(
-        confirm_completion(query, 0, &picker, cx).unwrap(),
-        "C:\\root/dir1\\"
-    );
-
-    let query = "C:\\root\\d";
-    insert_query(query, &picker, cx).await;
-    assert_eq!(collect_match_candidates(&picker, cx), vec!["dir1", "dir2"]);
-    assert_eq!(
-        confirm_completion(query, 0, &picker, cx).unwrap(),
-        "C:\\root\\dir1\\"
-    );
-}
-
-#[gpui::test]
-#[cfg_attr(not(target_os = "windows"), ignore)]
-async fn test_open_path_prompt_on_windows_with_remote(cx: &mut TestAppContext) {
-    let app_state = init_test(cx);
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            "/root",
-            json!({
-                "a": "A",
-                "dir1": {},
-                "dir2": {}
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), ["/root".as_ref()], cx).await;
-
-    let (picker, cx) = build_open_path_prompt(project, false, PathStyle::Posix, cx);
-
-    let query = "/root/";
-    insert_query(query, &picker, cx).await;
-    assert_eq!(
-        collect_match_candidates(&picker, cx),
-        vec!["./", "a", "dir1", "dir2"]
-    );
-    assert_eq!(
-        confirm_completion(query, 1, &picker, cx).unwrap(),
-        "/root/a"
-    );
-
-    // Confirm completion for the query "/root/d", selecting the second candidate "dir2", since it's a directory, it should add a trailing slash.
-    let query = "/root/d";
-    insert_query(query, &picker, cx).await;
-    assert_eq!(collect_match_candidates(&picker, cx), vec!["dir1", "dir2"]);
-    assert_eq!(
-        confirm_completion(query, 1, &picker, cx).unwrap(),
-        "/root/dir2/"
-    );
-
-    let query = "/root/d";
-    insert_query(query, &picker, cx).await;
-    assert_eq!(collect_match_candidates(&picker, cx), vec!["dir1", "dir2"]);
-    assert_eq!(
-        confirm_completion(query, 0, &picker, cx).unwrap(),
-        "/root/dir1/"
-    );
-}
-
-#[gpui::test]
-async fn test_new_path_prompt(cx: &mut TestAppContext) {
-    let app_state = init_test(cx);
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/root"),
-            json!({
-                "a1": "A1",
-                "a2": "A2",
-                "a3": "A3",
-                "dir1": {},
-                "dir2": {
-                    "c": "C",
-                    "d1": "D1",
-                    "d2": "D2",
-                    "d3": "D3",
-                    "dir3": {},
-                    "dir4": {}
-                }
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), [path!("/root").as_ref()], cx).await;
-
-    let (picker, cx) = build_open_path_prompt(project, true, PathStyle::local(), cx);
-
-    insert_query(path!("/root"), &picker, cx).await;
-    assert_eq!(collect_match_candidates(&picker, cx), vec!["root"]);
-
-    insert_query(path!("/root/d"), &picker, cx).await;
-    assert_eq!(
-        collect_match_candidates(&picker, cx),
-        vec!["d", "dir1", "dir2"]
-    );
-
-    insert_query(path!("/root/dir1"), &picker, cx).await;
-    assert_eq!(collect_match_candidates(&picker, cx), vec!["dir1"]);
-
-    insert_query(path!("/root/dir12"), &picker, cx).await;
-    assert_eq!(collect_match_candidates(&picker, cx), vec!["dir12"]);
-
-    insert_query(path!("/root/dir1"), &picker, cx).await;
-    assert_eq!(collect_match_candidates(&picker, cx), vec!["dir1"]);
-}
-
-fn init_test(cx: &mut TestAppContext) -> Arc<AppState> {
-    cx.update(|cx| {
-        let state = AppState::test(cx);
-        theme::init(theme::LoadThemes::JustBase, cx);
-        super::init(cx);
-        editor::init(cx);
-        state
-    })
-}
-
-fn build_open_path_prompt(
-    project: Entity<Project>,
-    creating_path: bool,
-    path_style: PathStyle,
-    cx: &mut TestAppContext,
-) -> (Entity<Picker<OpenPathDelegate>>, &mut VisualTestContext) {
-    let (tx, _) = futures::channel::oneshot::channel();
-    let lister = project::DirectoryLister::Project(project.clone());
-    let delegate = OpenPathDelegate::new(tx, lister.clone(), creating_path, path_style);
-
-    let (workspace, cx) = cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-    (
-        workspace.update_in(cx, |_, window, cx| {
-            cx.new(|cx| {
-                let picker = Picker::uniform_list(delegate, window, cx)
-                    .width(rems(34.))
-                    .modal(false);
-                let query = lister.default_query(cx);
-                picker.set_query(query, window, cx);
-                picker
-            })
-        }),
-        cx,
-    )
-}
-
-async fn insert_query(
-    query: &str,
-    picker: &Entity<Picker<OpenPathDelegate>>,
-    cx: &mut VisualTestContext,
-) {
-    picker
-        .update_in(cx, |f, window, cx| {
-            f.delegate.update_matches(query.to_string(), window, cx)
-        })
-        .await;
-}
-
-fn confirm_completion(
-    query: &str,
-    select: usize,
-    picker: &Entity<Picker<OpenPathDelegate>>,
-    cx: &mut VisualTestContext,
-) -> Option<String> {
-    picker.update_in(cx, |f, window, cx| {
-        if f.delegate.selected_index() != select {
-            f.delegate.set_selected_index(select, window, cx);
-        }
-        f.delegate.confirm_completion(query.to_string(), window, cx)
-    })
-}
-
-fn collect_match_candidates(
-    picker: &Entity<Picker<OpenPathDelegate>>,
-    cx: &mut VisualTestContext,
-) -> Vec<String> {
-    picker.update(cx, |f, _| f.delegate.collect_match_candidates())
-}
diff --git a/crates/file_icons/Cargo.toml b/crates/file_icons/Cargo.toml
deleted file mode 100644
index d45b606e5a..0000000000
--- a/crates/file_icons/Cargo.toml
+++ /dev/null
@@ -1,19 +0,0 @@
-[package]
-name = "file_icons"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/file_icons.rs"
-doctest = false
-
-[dependencies]
-gpui.workspace = true
-serde.workspace = true
-theme.workspace = true
-util.workspace = true
diff --git a/crates/file_icons/LICENSE-GPL b/crates/file_icons/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/file_icons/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/file_icons/src/file_icons.rs b/crates/file_icons/src/file_icons.rs
deleted file mode 100644
index e8650a83b9..0000000000
--- a/crates/file_icons/src/file_icons.rs
+++ /dev/null
@@ -1,166 +0,0 @@
-use std::sync::Arc;
-use std::{path::Path, str};
-
-use gpui::{App, SharedString};
-use theme::{GlobalTheme, IconTheme, ThemeRegistry};
-use util::paths::PathExt;
-
-#[derive(Debug)]
-pub struct FileIcons {
-    icon_theme: Arc<IconTheme>,
-}
-
-impl FileIcons {
-    pub fn get(cx: &App) -> Self {
-        Self {
-            icon_theme: GlobalTheme::icon_theme(cx).clone(),
-        }
-    }
-
-    pub fn get_icon(path: &Path, cx: &App) -> Option<SharedString> {
-        let this = Self::get(cx);
-
-        let get_icon_from_suffix = |suffix: &str| -> Option<SharedString> {
-            this.icon_theme
-                .file_stems
-                .get(suffix)
-                .or_else(|| this.icon_theme.file_suffixes.get(suffix))
-                .and_then(|typ| this.get_icon_for_type(typ, cx))
-        };
-        // TODO: Associate a type with the languages and have the file's language
-        //       override these associations
-
-        if let Some(mut typ) = path.file_name().and_then(|typ| typ.to_str()) {
-            // check if file name is in suffixes
-            // e.g. catch file named `eslint.config.js` instead of `.eslint.config.js`
-            let maybe_path = get_icon_from_suffix(typ);
-            if maybe_path.is_some() {
-                return maybe_path;
-            }
-
-            // check if suffix based on first dot is in suffixes
-            // e.g. consider `module.js` as suffix to angular's module file named `auth.module.js`
-            while let Some((_, suffix)) = typ.split_once('.') {
-                let maybe_path = get_icon_from_suffix(suffix);
-                if maybe_path.is_some() {
-                    return maybe_path;
-                }
-                typ = suffix;
-            }
-        }
-
-        // handle cases where the file extension is made up of multiple important
-        // parts (e.g Component.stories.tsx) that refer to an alternative icon style
-        if let Some(suffix) = path.multiple_extensions() {
-            let maybe_path = get_icon_from_suffix(suffix.as_str());
-            if maybe_path.is_some() {
-                return maybe_path;
-            }
-        }
-
-        // primary case: check if the files extension or the hidden file name
-        // matches some icon path
-        if let Some(suffix) = path.extension_or_hidden_file_name() {
-            let maybe_path = get_icon_from_suffix(suffix);
-            if maybe_path.is_some() {
-                return maybe_path;
-            }
-        }
-
-        // this _should_ only happen when the file is hidden (has leading '.')
-        // and is not a "special" file we have an icon (e.g. not `.eslint.config.js`)
-        // that should be caught above. In the remaining cases, we want to check
-        // for a normal supported extension e.g. `.data.json` -> `json`
-        let extension = path.extension().and_then(|ext| ext.to_str());
-        if let Some(extension) = extension {
-            let maybe_path = get_icon_from_suffix(extension);
-            if maybe_path.is_some() {
-                return maybe_path;
-            }
-        }
-        this.get_icon_for_type("default", cx)
-    }
-
-    fn default_icon_theme(cx: &App) -> Option<Arc<IconTheme>> {
-        let theme_registry = ThemeRegistry::global(cx);
-        theme_registry.default_icon_theme().ok()
-    }
-
-    pub fn get_icon_for_type(&self, typ: &str, cx: &App) -> Option<SharedString> {
-        fn get_icon_for_type(icon_theme: &Arc<IconTheme>, typ: &str) -> Option<SharedString> {
-            icon_theme
-                .file_icons
-                .get(typ)
-                .map(|icon_definition| icon_definition.path.clone())
-        }
-
-        get_icon_for_type(GlobalTheme::icon_theme(cx), typ).or_else(|| {
-            Self::default_icon_theme(cx).and_then(|icon_theme| get_icon_for_type(&icon_theme, typ))
-        })
-    }
-
-    pub fn get_folder_icon(expanded: bool, path: &Path, cx: &App) -> Option<SharedString> {
-        fn get_folder_icon(
-            icon_theme: &Arc<IconTheme>,
-            path: &Path,
-            expanded: bool,
-        ) -> Option<SharedString> {
-            let name = path.file_name()?.to_str()?.trim();
-            if name.is_empty() {
-                return None;
-            }
-
-            let directory_icons = icon_theme.named_directory_icons.get(name)?;
-
-            if expanded {
-                directory_icons.expanded.clone()
-            } else {
-                directory_icons.collapsed.clone()
-            }
-        }
-
-        get_folder_icon(GlobalTheme::icon_theme(cx), path, expanded)
-            .or_else(|| {
-                Self::default_icon_theme(cx)
-                    .and_then(|icon_theme| get_folder_icon(&icon_theme, path, expanded))
-            })
-            .or_else(|| {
-                // If we can't find a specific folder icon for the folder at the given path, fall back to the generic folder
-                // icon.
-                Self::get_generic_folder_icon(expanded, cx)
-            })
-    }
-
-    fn get_generic_folder_icon(expanded: bool, cx: &App) -> Option<SharedString> {
-        fn get_generic_folder_icon(
-            icon_theme: &Arc<IconTheme>,
-            expanded: bool,
-        ) -> Option<SharedString> {
-            if expanded {
-                icon_theme.directory_icons.expanded.clone()
-            } else {
-                icon_theme.directory_icons.collapsed.clone()
-            }
-        }
-
-        get_generic_folder_icon(GlobalTheme::icon_theme(cx), expanded).or_else(|| {
-            Self::default_icon_theme(cx)
-                .and_then(|icon_theme| get_generic_folder_icon(&icon_theme, expanded))
-        })
-    }
-
-    pub fn get_chevron_icon(expanded: bool, cx: &App) -> Option<SharedString> {
-        fn get_chevron_icon(icon_theme: &Arc<IconTheme>, expanded: bool) -> Option<SharedString> {
-            if expanded {
-                icon_theme.chevron_icons.expanded.clone()
-            } else {
-                icon_theme.chevron_icons.collapsed.clone()
-            }
-        }
-
-        get_chevron_icon(GlobalTheme::icon_theme(cx), expanded).or_else(|| {
-            Self::default_icon_theme(cx)
-                .and_then(|icon_theme| get_chevron_icon(&icon_theme, expanded))
-        })
-    }
-}
diff --git a/crates/fs/Cargo.toml b/crates/fs/Cargo.toml
deleted file mode 100644
index 52063eeddc..0000000000
--- a/crates/fs/Cargo.toml
+++ /dev/null
@@ -1,57 +0,0 @@
-[package]
-name = "fs"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/fs.rs"
-
-[dependencies]
-anyhow.workspace = true
-async-tar.workspace = true
-async-trait.workspace = true
-collections.workspace = true
-futures.workspace = true
-git.workspace = true
-gpui.workspace = true
-ignore.workspace = true
-libc.workspace = true
-log.workspace = true
-parking_lot.workspace = true
-paths.workspace = true
-rope.workspace = true
-proto.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-smol.workspace = true
-tempfile.workspace = true
-text.workspace = true
-time.workspace = true
-util.workspace = true
-is_executable = "1.0.5"
-
-[target.'cfg(target_os = "macos")'.dependencies]
-fsevent.workspace = true
-objc.workspace = true
-cocoa = "0.26"
-
-[target.'cfg(not(target_os = "macos"))'.dependencies]
-notify = "8.2.0"
-
-[target.'cfg(target_os = "windows")'.dependencies]
-windows.workspace = true
-
-[target.'cfg(any(target_os = "linux", target_os = "freebsd"))'.dependencies]
-ashpd.workspace = true
-
-[dev-dependencies]
-gpui = { workspace = true, features = ["test-support"] }
-git = { workspace = true, features = ["test-support"] }
-
-[features]
-test-support = ["gpui/test-support", "git/test-support"]
diff --git a/crates/fs/LICENSE-GPL b/crates/fs/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/fs/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/fs/src/fake_git_repo.rs b/crates/fs/src/fake_git_repo.rs
deleted file mode 100644
index be9b84ff6a..0000000000
--- a/crates/fs/src/fake_git_repo.rs
+++ /dev/null
@@ -1,793 +0,0 @@
-use crate::{FakeFs, FakeFsEntry, Fs};
-use anyhow::{Context as _, Result, bail};
-use collections::{HashMap, HashSet};
-use futures::future::{self, BoxFuture, join_all};
-use git::{
-    Oid, RunHook,
-    blame::Blame,
-    repository::{
-        AskPassDelegate, Branch, CommitDetails, CommitOptions, FetchOptions, GitRepository,
-        GitRepositoryCheckpoint, PushOptions, Remote, RepoPath, ResetMode, Worktree,
-    },
-    status::{
-        DiffTreeType, FileStatus, GitStatus, StatusCode, TrackedStatus, TreeDiff, TreeDiffStatus,
-        UnmergedStatus,
-    },
-};
-use gpui::{AsyncApp, BackgroundExecutor, SharedString, Task, TaskLabel};
-use ignore::gitignore::GitignoreBuilder;
-use parking_lot::Mutex;
-use rope::Rope;
-use smol::future::FutureExt as _;
-use std::{
-    path::PathBuf,
-    sync::{Arc, LazyLock},
-};
-use text::LineEnding;
-use util::{paths::PathStyle, rel_path::RelPath};
-
-pub static LOAD_INDEX_TEXT_TASK: LazyLock<TaskLabel> = LazyLock::new(TaskLabel::new);
-pub static LOAD_HEAD_TEXT_TASK: LazyLock<TaskLabel> = LazyLock::new(TaskLabel::new);
-
-#[derive(Clone)]
-pub struct FakeGitRepository {
-    pub(crate) fs: Arc<FakeFs>,
-    pub(crate) checkpoints: Arc<Mutex<HashMap<Oid, FakeFsEntry>>>,
-    pub(crate) executor: BackgroundExecutor,
-    pub(crate) dot_git_path: PathBuf,
-    pub(crate) repository_dir_path: PathBuf,
-    pub(crate) common_dir_path: PathBuf,
-}
-
-#[derive(Debug, Clone)]
-pub struct FakeGitRepositoryState {
-    pub event_emitter: smol::channel::Sender<PathBuf>,
-    pub unmerged_paths: HashMap<RepoPath, UnmergedStatus>,
-    pub head_contents: HashMap<RepoPath, String>,
-    pub index_contents: HashMap<RepoPath, String>,
-    // everything in commit contents is in oids
-    pub merge_base_contents: HashMap<RepoPath, Oid>,
-    pub oids: HashMap<Oid, String>,
-    pub blames: HashMap<RepoPath, Blame>,
-    pub current_branch_name: Option<String>,
-    pub branches: HashSet<String>,
-    /// List of remotes, keys are names and values are URLs
-    pub remotes: HashMap<String, String>,
-    pub simulated_index_write_error_message: Option<String>,
-    pub refs: HashMap<String, String>,
-}
-
-impl FakeGitRepositoryState {
-    pub fn new(event_emitter: smol::channel::Sender<PathBuf>) -> Self {
-        FakeGitRepositoryState {
-            event_emitter,
-            head_contents: Default::default(),
-            index_contents: Default::default(),
-            unmerged_paths: Default::default(),
-            blames: Default::default(),
-            current_branch_name: Default::default(),
-            branches: Default::default(),
-            simulated_index_write_error_message: Default::default(),
-            refs: HashMap::from_iter([("HEAD".into(), "abc".into())]),
-            merge_base_contents: Default::default(),
-            oids: Default::default(),
-            remotes: HashMap::default(),
-        }
-    }
-}
-
-impl FakeGitRepository {
-    fn with_state_async<F, T>(&self, write: bool, f: F) -> BoxFuture<'static, Result<T>>
-    where
-        F: 'static + Send + FnOnce(&mut FakeGitRepositoryState) -> Result<T>,
-        T: Send,
-    {
-        let fs = self.fs.clone();
-        let executor = self.executor.clone();
-        let dot_git_path = self.dot_git_path.clone();
-        async move {
-            executor.simulate_random_delay().await;
-            fs.with_git_state(&dot_git_path, write, f)?
-        }
-        .boxed()
-    }
-}
-
-impl GitRepository for FakeGitRepository {
-    fn reload_index(&self) {}
-
-    fn load_index_text(&self, path: RepoPath) -> BoxFuture<'_, Option<String>> {
-        let fut = self.with_state_async(false, move |state| {
-            state
-                .index_contents
-                .get(&path)
-                .context("not present in index")
-                .cloned()
-        });
-        self.executor
-            .spawn_labeled(*LOAD_INDEX_TEXT_TASK, async move { fut.await.ok() })
-            .boxed()
-    }
-
-    fn load_committed_text(&self, path: RepoPath) -> BoxFuture<'_, Option<String>> {
-        let fut = self.with_state_async(false, move |state| {
-            state
-                .head_contents
-                .get(&path)
-                .context("not present in HEAD")
-                .cloned()
-        });
-        self.executor
-            .spawn_labeled(*LOAD_HEAD_TEXT_TASK, async move { fut.await.ok() })
-            .boxed()
-    }
-
-    fn load_blob_content(&self, oid: git::Oid) -> BoxFuture<'_, Result<String>> {
-        self.with_state_async(false, move |state| {
-            state.oids.get(&oid).cloned().context("oid does not exist")
-        })
-        .boxed()
-    }
-
-    fn load_commit(
-        &self,
-        _commit: String,
-        _cx: AsyncApp,
-    ) -> BoxFuture<'_, Result<git::repository::CommitDiff>> {
-        unimplemented!()
-    }
-
-    fn set_index_text(
-        &self,
-        path: RepoPath,
-        content: Option<String>,
-        _env: Arc<HashMap<String, String>>,
-        _is_executable: bool,
-    ) -> BoxFuture<'_, anyhow::Result<()>> {
-        self.with_state_async(true, move |state| {
-            if let Some(message) = &state.simulated_index_write_error_message {
-                anyhow::bail!("{message}");
-            } else if let Some(content) = content {
-                state.index_contents.insert(path, content);
-            } else {
-                state.index_contents.remove(&path);
-            }
-            Ok(())
-        })
-    }
-
-    fn remote_url(&self, _name: &str) -> BoxFuture<'_, Option<String>> {
-        async move { None }.boxed()
-    }
-
-    fn diff_tree(&self, _request: DiffTreeType) -> BoxFuture<'_, Result<TreeDiff>> {
-        let mut entries = HashMap::default();
-        self.with_state_async(false, |state| {
-            for (path, content) in &state.head_contents {
-                let status = if let Some((oid, original)) = state
-                    .merge_base_contents
-                    .get(path)
-                    .map(|oid| (oid, &state.oids[oid]))
-                {
-                    if original == content {
-                        continue;
-                    }
-                    TreeDiffStatus::Modified { old: *oid }
-                } else {
-                    TreeDiffStatus::Added
-                };
-                entries.insert(path.clone(), status);
-            }
-            for (path, oid) in &state.merge_base_contents {
-                if !entries.contains_key(path) {
-                    entries.insert(path.clone(), TreeDiffStatus::Deleted { old: *oid });
-                }
-            }
-            Ok(TreeDiff { entries })
-        })
-        .boxed()
-    }
-
-    fn revparse_batch(&self, revs: Vec<String>) -> BoxFuture<'_, Result<Vec<Option<String>>>> {
-        self.with_state_async(false, |state| {
-            Ok(revs
-                .into_iter()
-                .map(|rev| state.refs.get(&rev).cloned())
-                .collect())
-        })
-    }
-
-    fn show(&self, commit: String) -> BoxFuture<'_, Result<CommitDetails>> {
-        async {
-            Ok(CommitDetails {
-                sha: commit.into(),
-                message: "initial commit".into(),
-                ..Default::default()
-            })
-        }
-        .boxed()
-    }
-
-    fn reset(
-        &self,
-        _commit: String,
-        _mode: ResetMode,
-        _env: Arc<HashMap<String, String>>,
-    ) -> BoxFuture<'_, Result<()>> {
-        unimplemented!()
-    }
-
-    fn checkout_files(
-        &self,
-        _commit: String,
-        _paths: Vec<RepoPath>,
-        _env: Arc<HashMap<String, String>>,
-    ) -> BoxFuture<'_, Result<()>> {
-        unimplemented!()
-    }
-
-    fn path(&self) -> PathBuf {
-        self.repository_dir_path.clone()
-    }
-
-    fn main_repository_path(&self) -> PathBuf {
-        self.common_dir_path.clone()
-    }
-
-    fn merge_message(&self) -> BoxFuture<'_, Option<String>> {
-        async move { None }.boxed()
-    }
-
-    fn status(&self, path_prefixes: &[RepoPath]) -> Task<Result<GitStatus>> {
-        let workdir_path = self.dot_git_path.parent().unwrap();
-
-        // Load gitignores
-        let ignores = workdir_path
-            .ancestors()
-            .filter_map(|dir| {
-                let ignore_path = dir.join(".gitignore");
-                let content = self.fs.read_file_sync(ignore_path).ok()?;
-                let content = String::from_utf8(content).ok()?;
-                let mut builder = GitignoreBuilder::new(dir);
-                for line in content.lines() {
-                    builder.add_line(Some(dir.into()), line).ok()?;
-                }
-                builder.build().ok()
-            })
-            .collect::<Vec<_>>();
-
-        // Load working copy files.
-        let git_files: HashMap<RepoPath, (String, bool)> = self
-            .fs
-            .files()
-            .iter()
-            .filter_map(|path| {
-                // TODO better simulate git status output in the case of submodules and worktrees
-                let repo_path = path.strip_prefix(workdir_path).ok()?;
-                let mut is_ignored = repo_path.starts_with(".git");
-                for ignore in &ignores {
-                    match ignore.matched_path_or_any_parents(path, false) {
-                        ignore::Match::None => {}
-                        ignore::Match::Ignore(_) => is_ignored = true,
-                        ignore::Match::Whitelist(_) => break,
-                    }
-                }
-                let content = self
-                    .fs
-                    .read_file_sync(path)
-                    .ok()
-                    .map(|content| String::from_utf8(content).unwrap())?;
-                let repo_path = RelPath::new(repo_path, PathStyle::local()).ok()?;
-                Some((RepoPath::from_rel_path(&repo_path), (content, is_ignored)))
-            })
-            .collect();
-
-        let result = self.fs.with_git_state(&self.dot_git_path, false, |state| {
-            let mut entries = Vec::new();
-            let paths = state
-                .head_contents
-                .keys()
-                .chain(state.index_contents.keys())
-                .chain(git_files.keys())
-                .collect::<HashSet<_>>();
-            for path in paths {
-                if !path_prefixes.iter().any(|prefix| path.starts_with(prefix)) {
-                    continue;
-                }
-
-                let head = state.head_contents.get(path);
-                let index = state.index_contents.get(path);
-                let unmerged = state.unmerged_paths.get(path);
-                let fs = git_files.get(path);
-                let status = match (unmerged, head, index, fs) {
-                    (Some(unmerged), _, _, _) => FileStatus::Unmerged(*unmerged),
-                    (_, Some(head), Some(index), Some((fs, _))) => {
-                        FileStatus::Tracked(TrackedStatus {
-                            index_status: if head == index {
-                                StatusCode::Unmodified
-                            } else {
-                                StatusCode::Modified
-                            },
-                            worktree_status: if fs == index {
-                                StatusCode::Unmodified
-                            } else {
-                                StatusCode::Modified
-                            },
-                        })
-                    }
-                    (_, Some(head), Some(index), None) => FileStatus::Tracked(TrackedStatus {
-                        index_status: if head == index {
-                            StatusCode::Unmodified
-                        } else {
-                            StatusCode::Modified
-                        },
-                        worktree_status: StatusCode::Deleted,
-                    }),
-                    (_, Some(_), None, Some(_)) => FileStatus::Tracked(TrackedStatus {
-                        index_status: StatusCode::Deleted,
-                        worktree_status: StatusCode::Added,
-                    }),
-                    (_, Some(_), None, None) => FileStatus::Tracked(TrackedStatus {
-                        index_status: StatusCode::Deleted,
-                        worktree_status: StatusCode::Deleted,
-                    }),
-                    (_, None, Some(index), Some((fs, _))) => FileStatus::Tracked(TrackedStatus {
-                        index_status: StatusCode::Added,
-                        worktree_status: if fs == index {
-                            StatusCode::Unmodified
-                        } else {
-                            StatusCode::Modified
-                        },
-                    }),
-                    (_, None, Some(_), None) => FileStatus::Tracked(TrackedStatus {
-                        index_status: StatusCode::Added,
-                        worktree_status: StatusCode::Deleted,
-                    }),
-                    (_, None, None, Some((_, is_ignored))) => {
-                        if *is_ignored {
-                            continue;
-                        }
-                        FileStatus::Untracked
-                    }
-                    (_, None, None, None) => {
-                        unreachable!();
-                    }
-                };
-                if status
-                    != FileStatus::Tracked(TrackedStatus {
-                        index_status: StatusCode::Unmodified,
-                        worktree_status: StatusCode::Unmodified,
-                    })
-                {
-                    entries.push((path.clone(), status));
-                }
-            }
-            entries.sort_by(|a, b| a.0.cmp(&b.0));
-            anyhow::Ok(GitStatus {
-                entries: entries.into(),
-            })
-        });
-        Task::ready(match result {
-            Ok(result) => result,
-            Err(e) => Err(e),
-        })
-    }
-
-    fn stash_entries(&self) -> BoxFuture<'_, Result<git::stash::GitStash>> {
-        async { Ok(git::stash::GitStash::default()) }.boxed()
-    }
-
-    fn branches(&self) -> BoxFuture<'_, Result<Vec<Branch>>> {
-        self.with_state_async(false, move |state| {
-            let current_branch = &state.current_branch_name;
-            Ok(state
-                .branches
-                .iter()
-                .map(|branch_name| {
-                    let ref_name = if branch_name.starts_with("refs/") {
-                        branch_name.into()
-                    } else {
-                        format!("refs/heads/{branch_name}").into()
-                    };
-                    Branch {
-                        is_head: Some(branch_name) == current_branch.as_ref(),
-                        ref_name,
-                        most_recent_commit: None,
-                        upstream: None,
-                    }
-                })
-                .collect())
-        })
-    }
-
-    fn worktrees(&self) -> BoxFuture<'_, Result<Vec<Worktree>>> {
-        unimplemented!()
-    }
-
-    fn create_worktree(
-        &self,
-        _: String,
-        _: PathBuf,
-        _: Option<String>,
-    ) -> BoxFuture<'_, Result<()>> {
-        unimplemented!()
-    }
-
-    fn change_branch(&self, name: String) -> BoxFuture<'_, Result<()>> {
-        self.with_state_async(true, |state| {
-            state.current_branch_name = Some(name);
-            Ok(())
-        })
-    }
-
-    fn create_branch(
-        &self,
-        name: String,
-        _base_branch: Option<String>,
-    ) -> BoxFuture<'_, Result<()>> {
-        self.with_state_async(true, move |state| {
-            state.branches.insert(name);
-            Ok(())
-        })
-    }
-
-    fn rename_branch(&self, branch: String, new_name: String) -> BoxFuture<'_, Result<()>> {
-        self.with_state_async(true, move |state| {
-            if !state.branches.remove(&branch) {
-                bail!("no such branch: {branch}");
-            }
-            state.branches.insert(new_name.clone());
-            if state.current_branch_name == Some(branch) {
-                state.current_branch_name = Some(new_name);
-            }
-            Ok(())
-        })
-    }
-
-    fn delete_branch(&self, name: String) -> BoxFuture<'_, Result<()>> {
-        self.with_state_async(true, move |state| {
-            if !state.branches.remove(&name) {
-                bail!("no such branch: {name}");
-            }
-            Ok(())
-        })
-    }
-
-    fn blame(
-        &self,
-        path: RepoPath,
-        _content: Rope,
-        _line_ending: LineEnding,
-    ) -> BoxFuture<'_, Result<git::blame::Blame>> {
-        self.with_state_async(false, move |state| {
-            state
-                .blames
-                .get(&path)
-                .with_context(|| format!("failed to get blame for {:?}", path))
-                .cloned()
-        })
-    }
-
-    fn file_history(&self, path: RepoPath) -> BoxFuture<'_, Result<git::repository::FileHistory>> {
-        self.file_history_paginated(path, 0, None)
-    }
-
-    fn file_history_paginated(
-        &self,
-        path: RepoPath,
-        _skip: usize,
-        _limit: Option<usize>,
-    ) -> BoxFuture<'_, Result<git::repository::FileHistory>> {
-        async move {
-            Ok(git::repository::FileHistory {
-                entries: Vec::new(),
-                path,
-            })
-        }
-        .boxed()
-    }
-
-    fn stage_paths(
-        &self,
-        paths: Vec<RepoPath>,
-        _env: Arc<HashMap<String, String>>,
-    ) -> BoxFuture<'_, Result<()>> {
-        Box::pin(async move {
-            let contents = paths
-                .into_iter()
-                .map(|path| {
-                    let abs_path = self
-                        .dot_git_path
-                        .parent()
-                        .unwrap()
-                        .join(&path.as_std_path());
-                    Box::pin(async move { (path.clone(), self.fs.load(&abs_path).await.ok()) })
-                })
-                .collect::<Vec<_>>();
-            let contents = join_all(contents).await;
-            self.with_state_async(true, move |state| {
-                for (path, content) in contents {
-                    if let Some(content) = content {
-                        state.index_contents.insert(path, content);
-                    } else {
-                        state.index_contents.remove(&path);
-                    }
-                }
-                Ok(())
-            })
-            .await
-        })
-    }
-
-    fn unstage_paths(
-        &self,
-        paths: Vec<RepoPath>,
-        _env: Arc<HashMap<String, String>>,
-    ) -> BoxFuture<'_, Result<()>> {
-        self.with_state_async(true, move |state| {
-            for path in paths {
-                match state.head_contents.get(&path) {
-                    Some(content) => state.index_contents.insert(path, content.clone()),
-                    None => state.index_contents.remove(&path),
-                };
-            }
-            Ok(())
-        })
-    }
-
-    fn stash_paths(
-        &self,
-        _paths: Vec<RepoPath>,
-        _env: Arc<HashMap<String, String>>,
-    ) -> BoxFuture<'_, Result<()>> {
-        unimplemented!()
-    }
-
-    fn stash_pop(
-        &self,
-        _index: Option<usize>,
-        _env: Arc<HashMap<String, String>>,
-    ) -> BoxFuture<'_, Result<()>> {
-        unimplemented!()
-    }
-
-    fn stash_apply(
-        &self,
-        _index: Option<usize>,
-        _env: Arc<HashMap<String, String>>,
-    ) -> BoxFuture<'_, Result<()>> {
-        unimplemented!()
-    }
-
-    fn stash_drop(
-        &self,
-        _index: Option<usize>,
-        _env: Arc<HashMap<String, String>>,
-    ) -> BoxFuture<'_, Result<()>> {
-        unimplemented!()
-    }
-
-    fn commit(
-        &self,
-        _message: gpui::SharedString,
-        _name_and_email: Option<(gpui::SharedString, gpui::SharedString)>,
-        _options: CommitOptions,
-        _askpass: AskPassDelegate,
-        _env: Arc<HashMap<String, String>>,
-    ) -> BoxFuture<'_, Result<()>> {
-        async { Ok(()) }.boxed()
-    }
-
-    fn run_hook(
-        &self,
-        _hook: RunHook,
-        _env: Arc<HashMap<String, String>>,
-    ) -> BoxFuture<'_, Result<()>> {
-        async { Ok(()) }.boxed()
-    }
-
-    fn push(
-        &self,
-        _branch: String,
-        _remote: String,
-        _options: Option<PushOptions>,
-        _askpass: AskPassDelegate,
-        _env: Arc<HashMap<String, String>>,
-        _cx: AsyncApp,
-    ) -> BoxFuture<'_, Result<git::repository::RemoteCommandOutput>> {
-        unimplemented!()
-    }
-
-    fn pull(
-        &self,
-        _branch: Option<String>,
-        _remote: String,
-        _rebase: bool,
-        _askpass: AskPassDelegate,
-        _env: Arc<HashMap<String, String>>,
-        _cx: AsyncApp,
-    ) -> BoxFuture<'_, Result<git::repository::RemoteCommandOutput>> {
-        unimplemented!()
-    }
-
-    fn fetch(
-        &self,
-        _fetch_options: FetchOptions,
-        _askpass: AskPassDelegate,
-        _env: Arc<HashMap<String, String>>,
-        _cx: AsyncApp,
-    ) -> BoxFuture<'_, Result<git::repository::RemoteCommandOutput>> {
-        unimplemented!()
-    }
-
-    fn get_all_remotes(&self) -> BoxFuture<'_, Result<Vec<Remote>>> {
-        self.with_state_async(false, move |state| {
-            let remotes = state
-                .remotes
-                .keys()
-                .map(|r| Remote {
-                    name: r.clone().into(),
-                })
-                .collect::<Vec<_>>();
-            Ok(remotes)
-        })
-    }
-
-    fn get_push_remote(&self, _branch: String) -> BoxFuture<'_, Result<Option<Remote>>> {
-        unimplemented!()
-    }
-
-    fn get_branch_remote(&self, _branch: String) -> BoxFuture<'_, Result<Option<Remote>>> {
-        unimplemented!()
-    }
-
-    fn check_for_pushed_commit(&self) -> BoxFuture<'_, Result<Vec<gpui::SharedString>>> {
-        future::ready(Ok(Vec::new())).boxed()
-    }
-
-    fn diff(&self, _diff: git::repository::DiffType) -> BoxFuture<'_, Result<String>> {
-        unimplemented!()
-    }
-
-    fn checkpoint(&self) -> BoxFuture<'static, Result<GitRepositoryCheckpoint>> {
-        let executor = self.executor.clone();
-        let fs = self.fs.clone();
-        let checkpoints = self.checkpoints.clone();
-        let repository_dir_path = self.repository_dir_path.parent().unwrap().to_path_buf();
-        async move {
-            executor.simulate_random_delay().await;
-            let oid = git::Oid::random(&mut executor.rng());
-            let entry = fs.entry(&repository_dir_path)?;
-            checkpoints.lock().insert(oid, entry);
-            Ok(GitRepositoryCheckpoint { commit_sha: oid })
-        }
-        .boxed()
-    }
-
-    fn restore_checkpoint(&self, checkpoint: GitRepositoryCheckpoint) -> BoxFuture<'_, Result<()>> {
-        let executor = self.executor.clone();
-        let fs = self.fs.clone();
-        let checkpoints = self.checkpoints.clone();
-        let repository_dir_path = self.repository_dir_path.parent().unwrap().to_path_buf();
-        async move {
-            executor.simulate_random_delay().await;
-            let checkpoints = checkpoints.lock();
-            let entry = checkpoints
-                .get(&checkpoint.commit_sha)
-                .context(format!("invalid checkpoint: {}", checkpoint.commit_sha))?;
-            fs.insert_entry(&repository_dir_path, entry.clone())?;
-            Ok(())
-        }
-        .boxed()
-    }
-
-    fn compare_checkpoints(
-        &self,
-        left: GitRepositoryCheckpoint,
-        right: GitRepositoryCheckpoint,
-    ) -> BoxFuture<'_, Result<bool>> {
-        let executor = self.executor.clone();
-        let checkpoints = self.checkpoints.clone();
-        async move {
-            executor.simulate_random_delay().await;
-            let checkpoints = checkpoints.lock();
-            let left = checkpoints
-                .get(&left.commit_sha)
-                .context(format!("invalid left checkpoint: {}", left.commit_sha))?;
-            let right = checkpoints
-                .get(&right.commit_sha)
-                .context(format!("invalid right checkpoint: {}", right.commit_sha))?;
-
-            Ok(left == right)
-        }
-        .boxed()
-    }
-
-    fn diff_checkpoints(
-        &self,
-        _base_checkpoint: GitRepositoryCheckpoint,
-        _target_checkpoint: GitRepositoryCheckpoint,
-    ) -> BoxFuture<'_, Result<String>> {
-        unimplemented!()
-    }
-
-    fn default_branch(&self) -> BoxFuture<'_, Result<Option<SharedString>>> {
-        async { Ok(Some("main".into())) }.boxed()
-    }
-
-    fn create_remote(&self, name: String, url: String) -> BoxFuture<'_, Result<()>> {
-        self.with_state_async(true, move |state| {
-            state.remotes.insert(name, url);
-            Ok(())
-        })
-    }
-
-    fn remove_remote(&self, name: String) -> BoxFuture<'_, Result<()>> {
-        self.with_state_async(true, move |state| {
-            state.remotes.remove(&name);
-            Ok(())
-        })
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::{FakeFs, Fs};
-    use gpui::BackgroundExecutor;
-    use serde_json::json;
-    use std::path::Path;
-    use util::path;
-
-    #[gpui::test]
-    async fn test_checkpoints(executor: BackgroundExecutor) {
-        let fs = FakeFs::new(executor);
-        fs.insert_tree(
-            path!("/"),
-            json!({
-                "bar": {
-                    "baz": "qux"
-                },
-                "foo": {
-                    ".git": {},
-                    "a": "lorem",
-                    "b": "ipsum",
-                },
-            }),
-        )
-        .await;
-        fs.with_git_state(Path::new("/foo/.git"), true, |_git| {})
-            .unwrap();
-        let repository = fs
-            .open_repo(Path::new("/foo/.git"), Some("git".as_ref()))
-            .unwrap();
-
-        let checkpoint_1 = repository.checkpoint().await.unwrap();
-        fs.write(Path::new("/foo/b"), b"IPSUM").await.unwrap();
-        fs.write(Path::new("/foo/c"), b"dolor").await.unwrap();
-        let checkpoint_2 = repository.checkpoint().await.unwrap();
-        let checkpoint_3 = repository.checkpoint().await.unwrap();
-
-        assert!(
-            repository
-                .compare_checkpoints(checkpoint_2.clone(), checkpoint_3.clone())
-                .await
-                .unwrap()
-        );
-        assert!(
-            !repository
-                .compare_checkpoints(checkpoint_1.clone(), checkpoint_2.clone())
-                .await
-                .unwrap()
-        );
-
-        repository.restore_checkpoint(checkpoint_1).await.unwrap();
-        assert_eq!(
-            fs.files_with_contents(Path::new("")),
-            [
-                (Path::new(path!("/bar/baz")).into(), b"qux".into()),
-                (Path::new(path!("/foo/a")).into(), b"lorem".into()),
-                (Path::new(path!("/foo/b")).into(), b"ipsum".into())
-            ]
-        );
-    }
-}
diff --git a/crates/fs/src/fs.rs b/crates/fs/src/fs.rs
deleted file mode 100644
index e8357e3596..0000000000
--- a/crates/fs/src/fs.rs
+++ /dev/null
@@ -1,3453 +0,0 @@
-#[cfg(target_os = "macos")]
-mod mac_watcher;
-
-#[cfg(not(target_os = "macos"))]
-pub mod fs_watcher;
-
-use parking_lot::Mutex;
-use std::sync::atomic::{AtomicUsize, Ordering};
-use std::time::Instant;
-
-use anyhow::{Context as _, Result, anyhow};
-#[cfg(any(target_os = "linux", target_os = "freebsd"))]
-use ashpd::desktop::trash;
-use futures::stream::iter;
-use gpui::App;
-use gpui::BackgroundExecutor;
-use gpui::Global;
-use gpui::ReadGlobal as _;
-use gpui::SharedString;
-use std::borrow::Cow;
-use util::command::new_smol_command;
-
-#[cfg(unix)]
-use std::os::fd::{AsFd, AsRawFd};
-
-#[cfg(unix)]
-use std::os::unix::fs::{FileTypeExt, MetadataExt};
-
-#[cfg(any(target_os = "macos", target_os = "freebsd"))]
-use std::mem::MaybeUninit;
-
-use async_tar::Archive;
-use futures::{AsyncRead, Stream, StreamExt, future::BoxFuture};
-use git::repository::{GitRepository, RealGitRepository};
-use is_executable::IsExecutable;
-use rope::Rope;
-use serde::{Deserialize, Serialize};
-use smol::io::AsyncWriteExt;
-use std::{
-    io::{self, Write},
-    path::{Component, Path, PathBuf},
-    pin::Pin,
-    sync::Arc,
-    time::{Duration, SystemTime, UNIX_EPOCH},
-};
-use tempfile::TempDir;
-use text::LineEnding;
-
-#[cfg(any(test, feature = "test-support"))]
-mod fake_git_repo;
-#[cfg(any(test, feature = "test-support"))]
-use collections::{BTreeMap, btree_map};
-#[cfg(any(test, feature = "test-support"))]
-use fake_git_repo::FakeGitRepositoryState;
-#[cfg(any(test, feature = "test-support"))]
-use git::{
-    repository::{RepoPath, repo_path},
-    status::{FileStatus, StatusCode, TrackedStatus, UnmergedStatus},
-};
-
-#[cfg(any(test, feature = "test-support"))]
-use smol::io::AsyncReadExt;
-#[cfg(any(test, feature = "test-support"))]
-use std::ffi::OsStr;
-
-#[cfg(any(test, feature = "test-support"))]
-pub use fake_git_repo::{LOAD_HEAD_TEXT_TASK, LOAD_INDEX_TEXT_TASK};
-
-pub trait Watcher: Send + Sync {
-    fn add(&self, path: &Path) -> Result<()>;
-    fn remove(&self, path: &Path) -> Result<()>;
-}
-
-#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Debug)]
-pub enum PathEventKind {
-    Removed,
-    Created,
-    Changed,
-}
-
-#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Debug)]
-pub struct PathEvent {
-    pub path: PathBuf,
-    pub kind: Option<PathEventKind>,
-}
-
-impl From<PathEvent> for PathBuf {
-    fn from(event: PathEvent) -> Self {
-        event.path
-    }
-}
-
-#[async_trait::async_trait]
-pub trait Fs: Send + Sync {
-    async fn create_dir(&self, path: &Path) -> Result<()>;
-    async fn create_symlink(&self, path: &Path, target: PathBuf) -> Result<()>;
-    async fn create_file(&self, path: &Path, options: CreateOptions) -> Result<()>;
-    async fn create_file_with(
-        &self,
-        path: &Path,
-        content: Pin<&mut (dyn AsyncRead + Send)>,
-    ) -> Result<()>;
-    async fn extract_tar_file(
-        &self,
-        path: &Path,
-        content: Archive<Pin<&mut (dyn AsyncRead + Send)>>,
-    ) -> Result<()>;
-    async fn copy_file(&self, source: &Path, target: &Path, options: CopyOptions) -> Result<()>;
-    async fn rename(&self, source: &Path, target: &Path, options: RenameOptions) -> Result<()>;
-    async fn remove_dir(&self, path: &Path, options: RemoveOptions) -> Result<()>;
-    async fn trash_dir(&self, path: &Path, options: RemoveOptions) -> Result<()> {
-        self.remove_dir(path, options).await
-    }
-    async fn remove_file(&self, path: &Path, options: RemoveOptions) -> Result<()>;
-    async fn trash_file(&self, path: &Path, options: RemoveOptions) -> Result<()> {
-        self.remove_file(path, options).await
-    }
-    async fn open_handle(&self, path: &Path) -> Result<Arc<dyn FileHandle>>;
-    async fn open_sync(&self, path: &Path) -> Result<Box<dyn io::Read + Send + Sync>>;
-    async fn load(&self, path: &Path) -> Result<String> {
-        Ok(String::from_utf8(self.load_bytes(path).await?)?)
-    }
-    async fn load_bytes(&self, path: &Path) -> Result<Vec<u8>>;
-    async fn atomic_write(&self, path: PathBuf, text: String) -> Result<()>;
-    async fn save(&self, path: &Path, text: &Rope, line_ending: LineEnding) -> Result<()>;
-    async fn write(&self, path: &Path, content: &[u8]) -> Result<()>;
-    async fn canonicalize(&self, path: &Path) -> Result<PathBuf>;
-    async fn is_file(&self, path: &Path) -> bool;
-    async fn is_dir(&self, path: &Path) -> bool;
-    async fn metadata(&self, path: &Path) -> Result<Option<Metadata>>;
-    async fn read_link(&self, path: &Path) -> Result<PathBuf>;
-    async fn read_dir(
-        &self,
-        path: &Path,
-    ) -> Result<Pin<Box<dyn Send + Stream<Item = Result<PathBuf>>>>>;
-
-    async fn watch(
-        &self,
-        path: &Path,
-        latency: Duration,
-    ) -> (
-        Pin<Box<dyn Send + Stream<Item = Vec<PathEvent>>>>,
-        Arc<dyn Watcher>,
-    );
-
-    fn open_repo(
-        &self,
-        abs_dot_git: &Path,
-        system_git_binary_path: Option<&Path>,
-    ) -> Option<Arc<dyn GitRepository>>;
-    async fn git_init(&self, abs_work_directory: &Path, fallback_branch_name: String)
-    -> Result<()>;
-    async fn git_clone(&self, repo_url: &str, abs_work_directory: &Path) -> Result<()>;
-    fn is_fake(&self) -> bool;
-    async fn is_case_sensitive(&self) -> Result<bool>;
-    fn subscribe_to_jobs(&self) -> JobEventReceiver;
-
-    #[cfg(any(test, feature = "test-support"))]
-    fn as_fake(&self) -> Arc<FakeFs> {
-        panic!("called as_fake on a real fs");
-    }
-}
-
-struct GlobalFs(Arc<dyn Fs>);
-
-impl Global for GlobalFs {}
-
-impl dyn Fs {
-    /// Returns the global [`Fs`].
-    pub fn global(cx: &App) -> Arc<Self> {
-        GlobalFs::global(cx).0.clone()
-    }
-
-    /// Sets the global [`Fs`].
-    pub fn set_global(fs: Arc<Self>, cx: &mut App) {
-        cx.set_global(GlobalFs(fs));
-    }
-}
-
-#[derive(Copy, Clone, Default)]
-pub struct CreateOptions {
-    pub overwrite: bool,
-    pub ignore_if_exists: bool,
-}
-
-#[derive(Copy, Clone, Default)]
-pub struct CopyOptions {
-    pub overwrite: bool,
-    pub ignore_if_exists: bool,
-}
-
-#[derive(Copy, Clone, Default)]
-pub struct RenameOptions {
-    pub overwrite: bool,
-    pub ignore_if_exists: bool,
-    /// Whether to create parent directories if they do not exist.
-    pub create_parents: bool,
-}
-
-#[derive(Copy, Clone, Default)]
-pub struct RemoveOptions {
-    pub recursive: bool,
-    pub ignore_if_not_exists: bool,
-}
-
-#[derive(Copy, Clone, Debug)]
-pub struct Metadata {
-    pub inode: u64,
-    pub mtime: MTime,
-    pub is_symlink: bool,
-    pub is_dir: bool,
-    pub len: u64,
-    pub is_fifo: bool,
-    pub is_executable: bool,
-}
-
-/// Filesystem modification time. The purpose of this newtype is to discourage use of operations
-/// that do not make sense for mtimes. In particular, it is not always valid to compare mtimes using
-/// `<` or `>`, as there are many things that can cause the mtime of a file to be earlier than it
-/// was. See ["mtime comparison considered harmful" - apenwarr](https://apenwarr.ca/log/20181113).
-///
-/// Do not derive Ord, PartialOrd, or arithmetic operation traits.
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Deserialize, Serialize)]
-#[serde(transparent)]
-pub struct MTime(SystemTime);
-
-pub type JobId = usize;
-
-#[derive(Clone, Debug)]
-pub struct JobInfo {
-    pub start: Instant,
-    pub message: SharedString,
-    pub id: JobId,
-}
-
-#[derive(Debug, Clone)]
-pub enum JobEvent {
-    Started { info: JobInfo },
-    Completed { id: JobId },
-}
-
-pub type JobEventSender = futures::channel::mpsc::UnboundedSender<JobEvent>;
-pub type JobEventReceiver = futures::channel::mpsc::UnboundedReceiver<JobEvent>;
-
-struct JobTracker {
-    id: JobId,
-    subscribers: Arc<Mutex<Vec<JobEventSender>>>,
-}
-
-impl JobTracker {
-    fn new(info: JobInfo, subscribers: Arc<Mutex<Vec<JobEventSender>>>) -> Self {
-        let id = info.id;
-        {
-            let mut subs = subscribers.lock();
-            subs.retain(|sender| {
-                sender
-                    .unbounded_send(JobEvent::Started { info: info.clone() })
-                    .is_ok()
-            });
-        }
-        Self { id, subscribers }
-    }
-}
-
-impl Drop for JobTracker {
-    fn drop(&mut self) {
-        let mut subs = self.subscribers.lock();
-        subs.retain(|sender| {
-            sender
-                .unbounded_send(JobEvent::Completed { id: self.id })
-                .is_ok()
-        });
-    }
-}
-
-impl MTime {
-    /// Conversion intended for persistence and testing.
-    pub fn from_seconds_and_nanos(secs: u64, nanos: u32) -> Self {
-        MTime(UNIX_EPOCH + Duration::new(secs, nanos))
-    }
-
-    /// Conversion intended for persistence.
-    pub fn to_seconds_and_nanos_for_persistence(self) -> Option<(u64, u32)> {
-        self.0
-            .duration_since(UNIX_EPOCH)
-            .ok()
-            .map(|duration| (duration.as_secs(), duration.subsec_nanos()))
-    }
-
-    /// Returns the value wrapped by this `MTime`, for presentation to the user. The name including
-    /// "_for_user" is to discourage misuse - this method should not be used when making decisions
-    /// about file dirtiness.
-    pub fn timestamp_for_user(self) -> SystemTime {
-        self.0
-    }
-
-    /// Temporary method to split out the behavior changes from introduction of this newtype.
-    pub fn bad_is_greater_than(self, other: MTime) -> bool {
-        self.0 > other.0
-    }
-}
-
-impl From<proto::Timestamp> for MTime {
-    fn from(timestamp: proto::Timestamp) -> Self {
-        MTime(timestamp.into())
-    }
-}
-
-impl From<MTime> for proto::Timestamp {
-    fn from(mtime: MTime) -> Self {
-        mtime.0.into()
-    }
-}
-
-pub struct RealFs {
-    bundled_git_binary_path: Option<PathBuf>,
-    executor: BackgroundExecutor,
-    next_job_id: Arc<AtomicUsize>,
-    job_event_subscribers: Arc<Mutex<Vec<JobEventSender>>>,
-}
-
-pub trait FileHandle: Send + Sync + std::fmt::Debug {
-    fn current_path(&self, fs: &Arc<dyn Fs>) -> Result<PathBuf>;
-}
-
-impl FileHandle for std::fs::File {
-    #[cfg(target_os = "macos")]
-    fn current_path(&self, _: &Arc<dyn Fs>) -> Result<PathBuf> {
-        use std::{
-            ffi::{CStr, OsStr},
-            os::unix::ffi::OsStrExt,
-        };
-
-        let fd = self.as_fd();
-        let mut path_buf = MaybeUninit::<[u8; libc::PATH_MAX as usize]>::uninit();
-
-        let result = unsafe { libc::fcntl(fd.as_raw_fd(), libc::F_GETPATH, path_buf.as_mut_ptr()) };
-        if result == -1 {
-            anyhow::bail!("fcntl returned -1".to_string());
-        }
-
-        // SAFETY: `fcntl` will initialize the path buffer.
-        let c_str = unsafe { CStr::from_ptr(path_buf.as_ptr().cast()) };
-        let path = PathBuf::from(OsStr::from_bytes(c_str.to_bytes()));
-        Ok(path)
-    }
-
-    #[cfg(target_os = "linux")]
-    fn current_path(&self, _: &Arc<dyn Fs>) -> Result<PathBuf> {
-        let fd = self.as_fd();
-        let fd_path = format!("/proc/self/fd/{}", fd.as_raw_fd());
-        let new_path = std::fs::read_link(fd_path)?;
-        if new_path
-            .file_name()
-            .is_some_and(|f| f.to_string_lossy().ends_with(" (deleted)"))
-        {
-            anyhow::bail!("file was deleted")
-        };
-
-        Ok(new_path)
-    }
-
-    #[cfg(target_os = "freebsd")]
-    fn current_path(&self, _: &Arc<dyn Fs>) -> Result<PathBuf> {
-        use std::{
-            ffi::{CStr, OsStr},
-            os::unix::ffi::OsStrExt,
-        };
-
-        let fd = self.as_fd();
-        let mut kif = MaybeUninit::<libc::kinfo_file>::uninit();
-        kif.kf_structsize = libc::KINFO_FILE_SIZE;
-
-        let result = unsafe { libc::fcntl(fd.as_raw_fd(), libc::F_KINFO, kif.as_mut_ptr()) };
-        if result == -1 {
-            anyhow::bail!("fcntl returned -1".to_string());
-        }
-
-        // SAFETY: `fcntl` will initialize the kif.
-        let c_str = unsafe { CStr::from_ptr(kif.assume_init().kf_path.as_ptr()) };
-        let path = PathBuf::from(OsStr::from_bytes(c_str.to_bytes()));
-        Ok(path)
-    }
-
-    #[cfg(target_os = "windows")]
-    fn current_path(&self, _: &Arc<dyn Fs>) -> Result<PathBuf> {
-        use std::ffi::OsString;
-        use std::os::windows::ffi::OsStringExt;
-        use std::os::windows::io::AsRawHandle;
-
-        use windows::Win32::Foundation::HANDLE;
-        use windows::Win32::Storage::FileSystem::{
-            FILE_NAME_NORMALIZED, GetFinalPathNameByHandleW,
-        };
-
-        let handle = HANDLE(self.as_raw_handle() as _);
-
-        // Query required buffer size (in wide chars)
-        let required_len =
-            unsafe { GetFinalPathNameByHandleW(handle, &mut [], FILE_NAME_NORMALIZED) };
-        if required_len == 0 {
-            anyhow::bail!("GetFinalPathNameByHandleW returned 0 length");
-        }
-
-        // Allocate buffer and retrieve the path
-        let mut buf: Vec<u16> = vec![0u16; required_len as usize + 1];
-        let written = unsafe { GetFinalPathNameByHandleW(handle, &mut buf, FILE_NAME_NORMALIZED) };
-        if written == 0 {
-            anyhow::bail!("GetFinalPathNameByHandleW failed to write path");
-        }
-
-        let os_str: OsString = OsString::from_wide(&buf[..written as usize]);
-        Ok(PathBuf::from(os_str))
-    }
-}
-
-pub struct RealWatcher {}
-
-impl RealFs {
-    pub fn new(git_binary_path: Option<PathBuf>, executor: BackgroundExecutor) -> Self {
-        Self {
-            bundled_git_binary_path: git_binary_path,
-            executor,
-            next_job_id: Arc::new(AtomicUsize::new(0)),
-            job_event_subscribers: Arc::new(Mutex::new(Vec::new())),
-        }
-    }
-
-    #[cfg(target_os = "windows")]
-    fn canonicalize(path: &Path) -> Result<PathBuf> {
-        let mut strip_prefix = None;
-
-        let mut new_path = PathBuf::new();
-        for component in path.components() {
-            match component {
-                std::path::Component::Prefix(_) => {
-                    let canonicalized = std::fs::canonicalize(component)?;
-
-                    let mut strip = PathBuf::new();
-                    for component in canonicalized.components() {
-                        match component {
-                            Component::Prefix(prefix_component) => {
-                                match prefix_component.kind() {
-                                    std::path::Prefix::Verbatim(os_str) => {
-                                        strip.push(os_str);
-                                    }
-                                    std::path::Prefix::VerbatimUNC(host, share) => {
-                                        strip.push("\\\\");
-                                        strip.push(host);
-                                        strip.push(share);
-                                    }
-                                    std::path::Prefix::VerbatimDisk(disk) => {
-                                        strip.push(format!("{}:", disk as char));
-                                    }
-                                    _ => strip.push(component),
-                                };
-                            }
-                            _ => strip.push(component),
-                        }
-                    }
-                    strip_prefix = Some(strip);
-                    new_path.push(component);
-                }
-                std::path::Component::RootDir => {
-                    new_path.push(component);
-                }
-                std::path::Component::CurDir => {
-                    if strip_prefix.is_none() {
-                        // unrooted path
-                        new_path.push(component);
-                    }
-                }
-                std::path::Component::ParentDir => {
-                    if strip_prefix.is_some() {
-                        // rooted path
-                        new_path.pop();
-                    } else {
-                        new_path.push(component);
-                    }
-                }
-                std::path::Component::Normal(_) => {
-                    if let Ok(link) = std::fs::read_link(new_path.join(component)) {
-                        let link = match &strip_prefix {
-                            Some(e) => link.strip_prefix(e).unwrap_or(&link),
-                            None => &link,
-                        };
-                        new_path.extend(link);
-                    } else {
-                        new_path.push(component);
-                    }
-                }
-            }
-        }
-
-        Ok(new_path)
-    }
-}
-
-#[async_trait::async_trait]
-impl Fs for RealFs {
-    async fn create_dir(&self, path: &Path) -> Result<()> {
-        Ok(smol::fs::create_dir_all(path).await?)
-    }
-
-    async fn create_symlink(&self, path: &Path, target: PathBuf) -> Result<()> {
-        #[cfg(unix)]
-        smol::fs::unix::symlink(target, path).await?;
-
-        #[cfg(windows)]
-        if smol::fs::metadata(&target).await?.is_dir() {
-            let status = new_smol_command("cmd")
-                .args(["/C", "mklink", "/J"])
-                .args([path, target.as_path()])
-                .status()
-                .await?;
-
-            if !status.success() {
-                return Err(anyhow::anyhow!(
-                    "Failed to create junction from {:?} to {:?}",
-                    path,
-                    target
-                ));
-            }
-        } else {
-            smol::fs::windows::symlink_file(target, path).await?
-        }
-
-        Ok(())
-    }
-
-    async fn create_file(&self, path: &Path, options: CreateOptions) -> Result<()> {
-        let mut open_options = smol::fs::OpenOptions::new();
-        open_options.write(true).create(true);
-        if options.overwrite {
-            open_options.truncate(true);
-        } else if !options.ignore_if_exists {
-            open_options.create_new(true);
-        }
-        open_options.open(path).await?;
-        Ok(())
-    }
-
-    async fn create_file_with(
-        &self,
-        path: &Path,
-        content: Pin<&mut (dyn AsyncRead + Send)>,
-    ) -> Result<()> {
-        let mut file = smol::fs::File::create(&path).await?;
-        futures::io::copy(content, &mut file).await?;
-        Ok(())
-    }
-
-    async fn extract_tar_file(
-        &self,
-        path: &Path,
-        content: Archive<Pin<&mut (dyn AsyncRead + Send)>>,
-    ) -> Result<()> {
-        content.unpack(path).await?;
-        Ok(())
-    }
-
-    async fn copy_file(&self, source: &Path, target: &Path, options: CopyOptions) -> Result<()> {
-        if !options.overwrite && smol::fs::metadata(target).await.is_ok() {
-            if options.ignore_if_exists {
-                return Ok(());
-            } else {
-                anyhow::bail!("{target:?} already exists");
-            }
-        }
-
-        smol::fs::copy(source, target).await?;
-        Ok(())
-    }
-
-    async fn rename(&self, source: &Path, target: &Path, options: RenameOptions) -> Result<()> {
-        if !options.overwrite && smol::fs::metadata(target).await.is_ok() {
-            if options.ignore_if_exists {
-                return Ok(());
-            } else {
-                anyhow::bail!("{target:?} already exists");
-            }
-        }
-
-        if options.create_parents {
-            if let Some(parent) = target.parent() {
-                self.create_dir(parent).await?;
-            }
-        }
-
-        smol::fs::rename(source, target).await?;
-        Ok(())
-    }
-
-    async fn remove_dir(&self, path: &Path, options: RemoveOptions) -> Result<()> {
-        let result = if options.recursive {
-            smol::fs::remove_dir_all(path).await
-        } else {
-            smol::fs::remove_dir(path).await
-        };
-        match result {
-            Ok(()) => Ok(()),
-            Err(err) if err.kind() == io::ErrorKind::NotFound && options.ignore_if_not_exists => {
-                Ok(())
-            }
-            Err(err) => Err(err)?,
-        }
-    }
-
-    async fn remove_file(&self, path: &Path, options: RemoveOptions) -> Result<()> {
-        #[cfg(windows)]
-        if let Ok(Some(metadata)) = self.metadata(path).await
-            && metadata.is_symlink
-            && metadata.is_dir
-        {
-            self.remove_dir(
-                path,
-                RemoveOptions {
-                    recursive: false,
-                    ignore_if_not_exists: true,
-                },
-            )
-            .await?;
-            return Ok(());
-        }
-
-        match smol::fs::remove_file(path).await {
-            Ok(()) => Ok(()),
-            Err(err) if err.kind() == io::ErrorKind::NotFound && options.ignore_if_not_exists => {
-                Ok(())
-            }
-            Err(err) => Err(err)?,
-        }
-    }
-
-    #[cfg(target_os = "macos")]
-    async fn trash_file(&self, path: &Path, _options: RemoveOptions) -> Result<()> {
-        use cocoa::{
-            base::{id, nil},
-            foundation::{NSAutoreleasePool, NSString},
-        };
-        use objc::{class, msg_send, sel, sel_impl};
-
-        unsafe {
-            unsafe fn ns_string(string: &str) -> id {
-                unsafe { NSString::alloc(nil).init_str(string).autorelease() }
-            }
-
-            let url: id = msg_send![class!(NSURL), fileURLWithPath: ns_string(path.to_string_lossy().as_ref())];
-            let array: id = msg_send![class!(NSArray), arrayWithObject: url];
-            let workspace: id = msg_send![class!(NSWorkspace), sharedWorkspace];
-
-            let _: id = msg_send![workspace, recycleURLs: array completionHandler: nil];
-        }
-        Ok(())
-    }
-
-    #[cfg(any(target_os = "linux", target_os = "freebsd"))]
-    async fn trash_file(&self, path: &Path, _options: RemoveOptions) -> Result<()> {
-        if let Ok(Some(metadata)) = self.metadata(path).await
-            && metadata.is_symlink
-        {
-            // TODO: trash_file does not support trashing symlinks yet - https://github.com/bilelmoussaoui/ashpd/issues/255
-            return self.remove_file(path, RemoveOptions::default()).await;
-        }
-        let file = smol::fs::File::open(path).await?;
-        match trash::trash_file(&file.as_fd()).await {
-            Ok(_) => Ok(()),
-            Err(err) => {
-                log::error!("Failed to trash file: {}", err);
-                // Trashing files can fail if you don't have a trashing dbus service configured.
-                // In that case, delete the file directly instead.
-                return self.remove_file(path, RemoveOptions::default()).await;
-            }
-        }
-    }
-
-    #[cfg(target_os = "windows")]
-    async fn trash_file(&self, path: &Path, _options: RemoveOptions) -> Result<()> {
-        use util::paths::SanitizedPath;
-        use windows::{
-            Storage::{StorageDeleteOption, StorageFile},
-            core::HSTRING,
-        };
-        // todo(windows)
-        // When new version of `windows-rs` release, make this operation `async`
-        let path = path.canonicalize()?;
-        let path = SanitizedPath::new(&path);
-        let path_string = path.to_string();
-        let file = StorageFile::GetFileFromPathAsync(&HSTRING::from(path_string))?.get()?;
-        file.DeleteAsync(StorageDeleteOption::Default)?.get()?;
-        Ok(())
-    }
-
-    #[cfg(target_os = "macos")]
-    async fn trash_dir(&self, path: &Path, options: RemoveOptions) -> Result<()> {
-        self.trash_file(path, options).await
-    }
-
-    #[cfg(any(target_os = "linux", target_os = "freebsd"))]
-    async fn trash_dir(&self, path: &Path, options: RemoveOptions) -> Result<()> {
-        self.trash_file(path, options).await
-    }
-
-    #[cfg(target_os = "windows")]
-    async fn trash_dir(&self, path: &Path, _options: RemoveOptions) -> Result<()> {
-        use util::paths::SanitizedPath;
-        use windows::{
-            Storage::{StorageDeleteOption, StorageFolder},
-            core::HSTRING,
-        };
-
-        // todo(windows)
-        // When new version of `windows-rs` release, make this operation `async`
-        let path = path.canonicalize()?;
-        let path = SanitizedPath::new(&path);
-        let path_string = path.to_string();
-        let folder = StorageFolder::GetFolderFromPathAsync(&HSTRING::from(path_string))?.get()?;
-        folder.DeleteAsync(StorageDeleteOption::Default)?.get()?;
-        Ok(())
-    }
-
-    async fn open_sync(&self, path: &Path) -> Result<Box<dyn io::Read + Send + Sync>> {
-        Ok(Box::new(std::fs::File::open(path)?))
-    }
-
-    async fn open_handle(&self, path: &Path) -> Result<Arc<dyn FileHandle>> {
-        let mut options = std::fs::OpenOptions::new();
-        options.read(true);
-        #[cfg(windows)]
-        {
-            use std::os::windows::fs::OpenOptionsExt;
-            options.custom_flags(windows::Win32::Storage::FileSystem::FILE_FLAG_BACKUP_SEMANTICS.0);
-        }
-        Ok(Arc::new(options.open(path)?))
-    }
-
-    async fn load(&self, path: &Path) -> Result<String> {
-        let path = path.to_path_buf();
-        self.executor
-            .spawn(async move { Ok(std::fs::read_to_string(path)?) })
-            .await
-    }
-
-    async fn load_bytes(&self, path: &Path) -> Result<Vec<u8>> {
-        let path = path.to_path_buf();
-        let bytes = self
-            .executor
-            .spawn(async move { std::fs::read(path) })
-            .await?;
-        Ok(bytes)
-    }
-
-    #[cfg(not(target_os = "windows"))]
-    async fn atomic_write(&self, path: PathBuf, data: String) -> Result<()> {
-        smol::unblock(move || {
-            // Use the directory of the destination as temp dir to avoid
-            // invalid cross-device link error, and XDG_CACHE_DIR for fallback.
-            // See https://github.com/zed-industries/zed/pull/8437 for more details.
-            let mut tmp_file =
-                tempfile::NamedTempFile::new_in(path.parent().unwrap_or(paths::temp_dir()))?;
-            tmp_file.write_all(data.as_bytes())?;
-            tmp_file.persist(path)?;
-            anyhow::Ok(())
-        })
-        .await?;
-
-        Ok(())
-    }
-
-    #[cfg(target_os = "windows")]
-    async fn atomic_write(&self, path: PathBuf, data: String) -> Result<()> {
-        smol::unblock(move || {
-            // If temp dir is set to a different drive than the destination,
-            // we receive error:
-            //
-            // failed to persist temporary file:
-            // The system cannot move the file to a different disk drive. (os error 17)
-            //
-            // This is because `ReplaceFileW` does not support cross volume moves.
-            // See the remark section: "The backup file, replaced file, and replacement file must all reside on the same volume."
-            // https://learn.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-replacefilew#remarks
-            //
-            // So we use the directory of the destination as a temp dir to avoid it.
-            // https://github.com/zed-industries/zed/issues/16571
-            let temp_dir = TempDir::new_in(path.parent().unwrap_or(paths::temp_dir()))?;
-            let temp_file = {
-                let temp_file_path = temp_dir.path().join("temp_file");
-                let mut file = std::fs::File::create_new(&temp_file_path)?;
-                file.write_all(data.as_bytes())?;
-                temp_file_path
-            };
-            atomic_replace(path.as_path(), temp_file.as_path())?;
-            anyhow::Ok(())
-        })
-        .await?;
-        Ok(())
-    }
-
-    async fn save(&self, path: &Path, text: &Rope, line_ending: LineEnding) -> Result<()> {
-        let buffer_size = text.summary().len.min(10 * 1024);
-        if let Some(path) = path.parent() {
-            self.create_dir(path).await?;
-        }
-        let file = smol::fs::File::create(path).await?;
-        let mut writer = smol::io::BufWriter::with_capacity(buffer_size, file);
-        for chunk in text::chunks_with_line_ending(text, line_ending) {
-            writer.write_all(chunk.as_bytes()).await?;
-        }
-        writer.flush().await?;
-        Ok(())
-    }
-
-    async fn write(&self, path: &Path, content: &[u8]) -> Result<()> {
-        if let Some(path) = path.parent() {
-            self.create_dir(path).await?;
-        }
-        let path = path.to_owned();
-        let contents = content.to_owned();
-        self.executor
-            .spawn(async move {
-                std::fs::write(path, contents)?;
-                Ok(())
-            })
-            .await
-    }
-
-    async fn canonicalize(&self, path: &Path) -> Result<PathBuf> {
-        let path = path.to_owned();
-        self.executor
-            .spawn(async move {
-                #[cfg(target_os = "windows")]
-                let result = Self::canonicalize(&path);
-
-                #[cfg(not(target_os = "windows"))]
-                let result = std::fs::canonicalize(&path);
-
-                result.with_context(|| format!("canonicalizing {path:?}"))
-            })
-            .await
-    }
-
-    async fn is_file(&self, path: &Path) -> bool {
-        let path = path.to_owned();
-        self.executor
-            .spawn(async move { std::fs::metadata(path).is_ok_and(|metadata| metadata.is_file()) })
-            .await
-    }
-
-    async fn is_dir(&self, path: &Path) -> bool {
-        let path = path.to_owned();
-        self.executor
-            .spawn(async move { std::fs::metadata(path).is_ok_and(|metadata| metadata.is_dir()) })
-            .await
-    }
-
-    async fn metadata(&self, path: &Path) -> Result<Option<Metadata>> {
-        let path_buf = path.to_owned();
-        let symlink_metadata = match self
-            .executor
-            .spawn(async move { std::fs::symlink_metadata(&path_buf) })
-            .await
-        {
-            Ok(metadata) => metadata,
-            Err(err) => {
-                return match err.kind() {
-                    io::ErrorKind::NotFound | io::ErrorKind::NotADirectory => Ok(None),
-                    _ => Err(anyhow::Error::new(err)),
-                };
-            }
-        };
-
-        let is_symlink = symlink_metadata.file_type().is_symlink();
-        let metadata = if is_symlink {
-            let path_buf = path.to_path_buf();
-            let path_exists = self
-                .executor
-                .spawn(async move {
-                    path_buf
-                        .try_exists()
-                        .with_context(|| format!("checking existence for path {path_buf:?}"))
-                })
-                .await?;
-            if path_exists {
-                let path_buf = path.to_path_buf();
-                self.executor
-                    .spawn(async move { std::fs::metadata(path_buf) })
-                    .await
-                    .with_context(|| "accessing symlink for path {path}")?
-            } else {
-                symlink_metadata
-            }
-        } else {
-            symlink_metadata
-        };
-
-        #[cfg(unix)]
-        let inode = metadata.ino();
-
-        #[cfg(windows)]
-        let inode = file_id(path).await?;
-
-        #[cfg(windows)]
-        let is_fifo = false;
-
-        #[cfg(unix)]
-        let is_fifo = metadata.file_type().is_fifo();
-
-        let path_buf = path.to_path_buf();
-        let is_executable = self
-            .executor
-            .spawn(async move { path_buf.is_executable() })
-            .await;
-
-        Ok(Some(Metadata {
-            inode,
-            mtime: MTime(metadata.modified().unwrap_or(SystemTime::UNIX_EPOCH)),
-            len: metadata.len(),
-            is_symlink,
-            is_dir: metadata.file_type().is_dir(),
-            is_fifo,
-            is_executable,
-        }))
-    }
-
-    async fn read_link(&self, path: &Path) -> Result<PathBuf> {
-        let path = path.to_owned();
-        let path = self
-            .executor
-            .spawn(async move { std::fs::read_link(&path) })
-            .await?;
-        Ok(path)
-    }
-
-    async fn read_dir(
-        &self,
-        path: &Path,
-    ) -> Result<Pin<Box<dyn Send + Stream<Item = Result<PathBuf>>>>> {
-        let path = path.to_owned();
-        let result = iter(
-            self.executor
-                .spawn(async move { std::fs::read_dir(path) })
-                .await?,
-        )
-        .map(|entry| match entry {
-            Ok(entry) => Ok(entry.path()),
-            Err(error) => Err(anyhow!("failed to read dir entry {error:?}")),
-        });
-        Ok(Box::pin(result))
-    }
-
-    #[cfg(target_os = "macos")]
-    async fn watch(
-        &self,
-        path: &Path,
-        latency: Duration,
-    ) -> (
-        Pin<Box<dyn Send + Stream<Item = Vec<PathEvent>>>>,
-        Arc<dyn Watcher>,
-    ) {
-        use fsevent::StreamFlags;
-
-        let (events_tx, events_rx) = smol::channel::unbounded();
-        let handles = Arc::new(parking_lot::Mutex::new(collections::BTreeMap::default()));
-        let watcher = Arc::new(mac_watcher::MacWatcher::new(
-            events_tx,
-            Arc::downgrade(&handles),
-            latency,
-        ));
-        watcher.add(path).expect("handles can't be dropped");
-
-        (
-            Box::pin(
-                events_rx
-                    .map(|events| {
-                        events
-                            .into_iter()
-                            .map(|event| {
-                                log::trace!("fs path event: {event:?}");
-                                let kind = if event.flags.contains(StreamFlags::ITEM_REMOVED) {
-                                    Some(PathEventKind::Removed)
-                                } else if event.flags.contains(StreamFlags::ITEM_CREATED) {
-                                    Some(PathEventKind::Created)
-                                } else if event.flags.contains(StreamFlags::ITEM_MODIFIED)
-                                    | event.flags.contains(StreamFlags::ITEM_RENAMED)
-                                {
-                                    Some(PathEventKind::Changed)
-                                } else {
-                                    None
-                                };
-                                PathEvent {
-                                    path: event.path,
-                                    kind,
-                                }
-                            })
-                            .collect()
-                    })
-                    .chain(futures::stream::once(async move {
-                        drop(handles);
-                        vec![]
-                    })),
-            ),
-            watcher,
-        )
-    }
-
-    #[cfg(not(target_os = "macos"))]
-    async fn watch(
-        &self,
-        path: &Path,
-        latency: Duration,
-    ) -> (
-        Pin<Box<dyn Send + Stream<Item = Vec<PathEvent>>>>,
-        Arc<dyn Watcher>,
-    ) {
-        use util::{ResultExt as _, paths::SanitizedPath};
-
-        let (tx, rx) = smol::channel::unbounded();
-        let pending_paths: Arc<Mutex<Vec<PathEvent>>> = Default::default();
-        let watcher = Arc::new(fs_watcher::FsWatcher::new(tx, pending_paths.clone()));
-
-        // If the path doesn't exist yet (e.g. settings.json), watch the parent dir to learn when it's created.
-        if let Err(e) = watcher.add(path)
-            && let Some(parent) = path.parent()
-            && let Err(parent_e) = watcher.add(parent)
-        {
-            log::warn!(
-                "Failed to watch {} and its parent directory {}:\n{e}\n{parent_e}",
-                path.display(),
-                parent.display()
-            );
-        }
-
-        // Check if path is a symlink and follow the target parent
-        if let Some(mut target) = self.read_link(path).await.ok() {
-            log::trace!("watch symlink {path:?} -> {target:?}");
-            // Check if symlink target is relative path, if so make it absolute
-            if target.is_relative()
-                && let Some(parent) = path.parent()
-            {
-                target = parent.join(target);
-                if let Ok(canonical) = self.canonicalize(&target).await {
-                    target = SanitizedPath::new(&canonical).as_path().to_path_buf();
-                }
-            }
-            watcher.add(&target).ok();
-            if let Some(parent) = target.parent() {
-                watcher.add(parent).log_err();
-            }
-        }
-
-        (
-            Box::pin(rx.filter_map({
-                let watcher = watcher.clone();
-                move |_| {
-                    let _ = watcher.clone();
-                    let pending_paths = pending_paths.clone();
-                    async move {
-                        smol::Timer::after(latency).await;
-                        let paths = std::mem::take(&mut *pending_paths.lock());
-                        (!paths.is_empty()).then_some(paths)
-                    }
-                }
-            })),
-            watcher,
-        )
-    }
-
-    fn open_repo(
-        &self,
-        dotgit_path: &Path,
-        system_git_binary_path: Option<&Path>,
-    ) -> Option<Arc<dyn GitRepository>> {
-        Some(Arc::new(RealGitRepository::new(
-            dotgit_path,
-            self.bundled_git_binary_path.clone(),
-            system_git_binary_path.map(|path| path.to_path_buf()),
-            self.executor.clone(),
-        )?))
-    }
-
-    async fn git_init(
-        &self,
-        abs_work_directory_path: &Path,
-        fallback_branch_name: String,
-    ) -> Result<()> {
-        let config = new_smol_command("git")
-            .current_dir(abs_work_directory_path)
-            .args(&["config", "--global", "--get", "init.defaultBranch"])
-            .output()
-            .await?;
-
-        let branch_name;
-
-        if config.status.success() && !config.stdout.is_empty() {
-            branch_name = String::from_utf8_lossy(&config.stdout);
-        } else {
-            branch_name = Cow::Borrowed(fallback_branch_name.as_str());
-        }
-
-        new_smol_command("git")
-            .current_dir(abs_work_directory_path)
-            .args(&["init", "-b"])
-            .arg(branch_name.trim())
-            .output()
-            .await?;
-
-        Ok(())
-    }
-
-    async fn git_clone(&self, repo_url: &str, abs_work_directory: &Path) -> Result<()> {
-        let job_id = self.next_job_id.fetch_add(1, Ordering::SeqCst);
-        let job_info = JobInfo {
-            id: job_id,
-            start: Instant::now(),
-            message: SharedString::from(format!("Cloning {}", repo_url)),
-        };
-
-        let _job_tracker = JobTracker::new(job_info, self.job_event_subscribers.clone());
-
-        let output = new_smol_command("git")
-            .current_dir(abs_work_directory)
-            .args(&["clone", repo_url])
-            .output()
-            .await?;
-
-        if !output.status.success() {
-            anyhow::bail!(
-                "git clone failed: {}",
-                String::from_utf8_lossy(&output.stderr)
-            );
-        }
-
-        Ok(())
-    }
-
-    fn is_fake(&self) -> bool {
-        false
-    }
-
-    fn subscribe_to_jobs(&self) -> JobEventReceiver {
-        let (sender, receiver) = futures::channel::mpsc::unbounded();
-        self.job_event_subscribers.lock().push(sender);
-        receiver
-    }
-
-    /// Checks whether the file system is case sensitive by attempting to create two files
-    /// that have the same name except for the casing.
-    ///
-    /// It creates both files in a temporary directory it removes at the end.
-    async fn is_case_sensitive(&self) -> Result<bool> {
-        let temp_dir = TempDir::new()?;
-        let test_file_1 = temp_dir.path().join("case_sensitivity_test.tmp");
-        let test_file_2 = temp_dir.path().join("CASE_SENSITIVITY_TEST.TMP");
-
-        let create_opts = CreateOptions {
-            overwrite: false,
-            ignore_if_exists: false,
-        };
-
-        // Create file1
-        self.create_file(&test_file_1, create_opts).await?;
-
-        // Now check whether it's possible to create file2
-        let case_sensitive = match self.create_file(&test_file_2, create_opts).await {
-            Ok(_) => Ok(true),
-            Err(e) => {
-                if let Some(io_error) = e.downcast_ref::<io::Error>() {
-                    if io_error.kind() == io::ErrorKind::AlreadyExists {
-                        Ok(false)
-                    } else {
-                        Err(e)
-                    }
-                } else {
-                    Err(e)
-                }
-            }
-        };
-
-        temp_dir.close()?;
-        case_sensitive
-    }
-}
-
-#[cfg(not(any(target_os = "linux", target_os = "freebsd")))]
-impl Watcher for RealWatcher {
-    fn add(&self, _: &Path) -> Result<()> {
-        Ok(())
-    }
-
-    fn remove(&self, _: &Path) -> Result<()> {
-        Ok(())
-    }
-}
-
-#[cfg(any(test, feature = "test-support"))]
-pub struct FakeFs {
-    this: std::sync::Weak<Self>,
-    // Use an unfair lock to ensure tests are deterministic.
-    state: Arc<Mutex<FakeFsState>>,
-    executor: gpui::BackgroundExecutor,
-}
-
-#[cfg(any(test, feature = "test-support"))]
-struct FakeFsState {
-    root: FakeFsEntry,
-    next_inode: u64,
-    next_mtime: SystemTime,
-    git_event_tx: smol::channel::Sender<PathBuf>,
-    event_txs: Vec<(PathBuf, smol::channel::Sender<Vec<PathEvent>>)>,
-    events_paused: bool,
-    buffered_events: Vec<PathEvent>,
-    metadata_call_count: usize,
-    read_dir_call_count: usize,
-    path_write_counts: std::collections::HashMap<PathBuf, usize>,
-    moves: std::collections::HashMap<u64, PathBuf>,
-    job_event_subscribers: Arc<Mutex<Vec<JobEventSender>>>,
-}
-
-#[cfg(any(test, feature = "test-support"))]
-#[derive(Clone, Debug)]
-enum FakeFsEntry {
-    File {
-        inode: u64,
-        mtime: MTime,
-        len: u64,
-        content: Vec<u8>,
-        // The path to the repository state directory, if this is a gitfile.
-        git_dir_path: Option<PathBuf>,
-    },
-    Dir {
-        inode: u64,
-        mtime: MTime,
-        len: u64,
-        entries: BTreeMap<String, FakeFsEntry>,
-        git_repo_state: Option<Arc<Mutex<FakeGitRepositoryState>>>,
-    },
-    Symlink {
-        target: PathBuf,
-    },
-}
-
-#[cfg(any(test, feature = "test-support"))]
-impl PartialEq for FakeFsEntry {
-    fn eq(&self, other: &Self) -> bool {
-        match (self, other) {
-            (
-                Self::File {
-                    inode: l_inode,
-                    mtime: l_mtime,
-                    len: l_len,
-                    content: l_content,
-                    git_dir_path: l_git_dir_path,
-                },
-                Self::File {
-                    inode: r_inode,
-                    mtime: r_mtime,
-                    len: r_len,
-                    content: r_content,
-                    git_dir_path: r_git_dir_path,
-                },
-            ) => {
-                l_inode == r_inode
-                    && l_mtime == r_mtime
-                    && l_len == r_len
-                    && l_content == r_content
-                    && l_git_dir_path == r_git_dir_path
-            }
-            (
-                Self::Dir {
-                    inode: l_inode,
-                    mtime: l_mtime,
-                    len: l_len,
-                    entries: l_entries,
-                    git_repo_state: l_git_repo_state,
-                },
-                Self::Dir {
-                    inode: r_inode,
-                    mtime: r_mtime,
-                    len: r_len,
-                    entries: r_entries,
-                    git_repo_state: r_git_repo_state,
-                },
-            ) => {
-                let same_repo_state = match (l_git_repo_state.as_ref(), r_git_repo_state.as_ref()) {
-                    (Some(l), Some(r)) => Arc::ptr_eq(l, r),
-                    (None, None) => true,
-                    _ => false,
-                };
-                l_inode == r_inode
-                    && l_mtime == r_mtime
-                    && l_len == r_len
-                    && l_entries == r_entries
-                    && same_repo_state
-            }
-            (Self::Symlink { target: l_target }, Self::Symlink { target: r_target }) => {
-                l_target == r_target
-            }
-            _ => false,
-        }
-    }
-}
-
-#[cfg(any(test, feature = "test-support"))]
-impl FakeFsState {
-    fn get_and_increment_mtime(&mut self) -> MTime {
-        let mtime = self.next_mtime;
-        self.next_mtime += FakeFs::SYSTEMTIME_INTERVAL;
-        MTime(mtime)
-    }
-
-    fn get_and_increment_inode(&mut self) -> u64 {
-        let inode = self.next_inode;
-        self.next_inode += 1;
-        inode
-    }
-
-    fn canonicalize(&self, target: &Path, follow_symlink: bool) -> Option<PathBuf> {
-        let mut canonical_path = PathBuf::new();
-        let mut path = target.to_path_buf();
-        let mut entry_stack = Vec::new();
-        'outer: loop {
-            let mut path_components = path.components().peekable();
-            let mut prefix = None;
-            while let Some(component) = path_components.next() {
-                match component {
-                    Component::Prefix(prefix_component) => prefix = Some(prefix_component),
-                    Component::RootDir => {
-                        entry_stack.clear();
-                        entry_stack.push(&self.root);
-                        canonical_path.clear();
-                        match prefix {
-                            Some(prefix_component) => {
-                                canonical_path = PathBuf::from(prefix_component.as_os_str());
-                                // Prefixes like `C:\\` are represented without their trailing slash, so we have to re-add it.
-                                canonical_path.push(std::path::MAIN_SEPARATOR_STR);
-                            }
-                            None => canonical_path = PathBuf::from(std::path::MAIN_SEPARATOR_STR),
-                        }
-                    }
-                    Component::CurDir => {}
-                    Component::ParentDir => {
-                        entry_stack.pop()?;
-                        canonical_path.pop();
-                    }
-                    Component::Normal(name) => {
-                        let current_entry = *entry_stack.last()?;
-                        if let FakeFsEntry::Dir { entries, .. } = current_entry {
-                            let entry = entries.get(name.to_str().unwrap())?;
-                            if (path_components.peek().is_some() || follow_symlink)
-                                && let FakeFsEntry::Symlink { target, .. } = entry
-                            {
-                                let mut target = target.clone();
-                                target.extend(path_components);
-                                path = target;
-                                continue 'outer;
-                            }
-                            entry_stack.push(entry);
-                            canonical_path = canonical_path.join(name);
-                        } else {
-                            return None;
-                        }
-                    }
-                }
-            }
-            break;
-        }
-
-        if entry_stack.is_empty() {
-            None
-        } else {
-            Some(canonical_path)
-        }
-    }
-
-    fn try_entry(
-        &mut self,
-        target: &Path,
-        follow_symlink: bool,
-    ) -> Option<(&mut FakeFsEntry, PathBuf)> {
-        let canonical_path = self.canonicalize(target, follow_symlink)?;
-
-        let mut components = canonical_path
-            .components()
-            .skip_while(|component| matches!(component, Component::Prefix(_)));
-        let Some(Component::RootDir) = components.next() else {
-            panic!(
-                "the path {:?} was not canonicalized properly {:?}",
-                target, canonical_path
-            )
-        };
-
-        let mut entry = &mut self.root;
-        for component in components {
-            match component {
-                Component::Normal(name) => {
-                    if let FakeFsEntry::Dir { entries, .. } = entry {
-                        entry = entries.get_mut(name.to_str().unwrap())?;
-                    } else {
-                        return None;
-                    }
-                }
-                _ => {
-                    panic!(
-                        "the path {:?} was not canonicalized properly {:?}",
-                        target, canonical_path
-                    )
-                }
-            }
-        }
-
-        Some((entry, canonical_path))
-    }
-
-    fn entry(&mut self, target: &Path) -> Result<&mut FakeFsEntry> {
-        Ok(self
-            .try_entry(target, true)
-            .ok_or_else(|| {
-                anyhow!(io::Error::new(
-                    io::ErrorKind::NotFound,
-                    format!("not found: {target:?}")
-                ))
-            })?
-            .0)
-    }
-
-    fn write_path<Fn, T>(&mut self, path: &Path, callback: Fn) -> Result<T>
-    where
-        Fn: FnOnce(btree_map::Entry<String, FakeFsEntry>) -> Result<T>,
-    {
-        let path = normalize_path(path);
-        let filename = path.file_name().context("cannot overwrite the root")?;
-        let parent_path = path.parent().unwrap();
-
-        let parent = self.entry(parent_path)?;
-        let new_entry = parent
-            .dir_entries(parent_path)?
-            .entry(filename.to_str().unwrap().into());
-        callback(new_entry)
-    }
-
-    fn emit_event<I, T>(&mut self, paths: I)
-    where
-        I: IntoIterator<Item = (T, Option<PathEventKind>)>,
-        T: Into<PathBuf>,
-    {
-        self.buffered_events
-            .extend(paths.into_iter().map(|(path, kind)| PathEvent {
-                path: path.into(),
-                kind,
-            }));
-
-        if !self.events_paused {
-            self.flush_events(self.buffered_events.len());
-        }
-    }
-
-    fn flush_events(&mut self, mut count: usize) {
-        count = count.min(self.buffered_events.len());
-        let events = self.buffered_events.drain(0..count).collect::<Vec<_>>();
-        self.event_txs.retain(|(_, tx)| {
-            let _ = tx.try_send(events.clone());
-            !tx.is_closed()
-        });
-    }
-}
-
-#[cfg(any(test, feature = "test-support"))]
-pub static FS_DOT_GIT: std::sync::LazyLock<&'static OsStr> =
-    std::sync::LazyLock::new(|| OsStr::new(".git"));
-
-#[cfg(any(test, feature = "test-support"))]
-impl FakeFs {
-    /// We need to use something large enough for Windows and Unix to consider this a new file.
-    /// https://doc.rust-lang.org/nightly/std/time/struct.SystemTime.html#platform-specific-behavior
-    const SYSTEMTIME_INTERVAL: Duration = Duration::from_nanos(100);
-
-    pub fn new(executor: gpui::BackgroundExecutor) -> Arc<Self> {
-        let (tx, rx) = smol::channel::bounded::<PathBuf>(10);
-
-        let this = Arc::new_cyclic(|this| Self {
-            this: this.clone(),
-            executor: executor.clone(),
-            state: Arc::new(Mutex::new(FakeFsState {
-                root: FakeFsEntry::Dir {
-                    inode: 0,
-                    mtime: MTime(UNIX_EPOCH),
-                    len: 0,
-                    entries: Default::default(),
-                    git_repo_state: None,
-                },
-                git_event_tx: tx,
-                next_mtime: UNIX_EPOCH + Self::SYSTEMTIME_INTERVAL,
-                next_inode: 1,
-                event_txs: Default::default(),
-                buffered_events: Vec::new(),
-                events_paused: false,
-                read_dir_call_count: 0,
-                metadata_call_count: 0,
-                path_write_counts: Default::default(),
-                moves: Default::default(),
-                job_event_subscribers: Arc::new(Mutex::new(Vec::new())),
-            })),
-        });
-
-        executor.spawn({
-            let this = this.clone();
-            async move {
-                while let Ok(git_event) = rx.recv().await {
-                    if let Some(mut state) = this.state.try_lock() {
-                        state.emit_event([(git_event, Some(PathEventKind::Changed))]);
-                    } else {
-                        panic!("Failed to lock file system state, this execution would have caused a test hang");
-                    }
-                }
-            }
-        }).detach();
-
-        this
-    }
-
-    pub fn set_next_mtime(&self, next_mtime: SystemTime) {
-        let mut state = self.state.lock();
-        state.next_mtime = next_mtime;
-    }
-
-    pub fn get_and_increment_mtime(&self) -> MTime {
-        let mut state = self.state.lock();
-        state.get_and_increment_mtime()
-    }
-
-    pub async fn touch_path(&self, path: impl AsRef<Path>) {
-        let mut state = self.state.lock();
-        let path = path.as_ref();
-        let new_mtime = state.get_and_increment_mtime();
-        let new_inode = state.get_and_increment_inode();
-        state
-            .write_path(path, move |entry| {
-                match entry {
-                    btree_map::Entry::Vacant(e) => {
-                        e.insert(FakeFsEntry::File {
-                            inode: new_inode,
-                            mtime: new_mtime,
-                            content: Vec::new(),
-                            len: 0,
-                            git_dir_path: None,
-                        });
-                    }
-                    btree_map::Entry::Occupied(mut e) => match &mut *e.get_mut() {
-                        FakeFsEntry::File { mtime, .. } => *mtime = new_mtime,
-                        FakeFsEntry::Dir { mtime, .. } => *mtime = new_mtime,
-                        FakeFsEntry::Symlink { .. } => {}
-                    },
-                }
-                Ok(())
-            })
-            .unwrap();
-        state.emit_event([(path.to_path_buf(), Some(PathEventKind::Changed))]);
-    }
-
-    pub async fn insert_file(&self, path: impl AsRef<Path>, content: Vec<u8>) {
-        self.write_file_internal(path, content, true).unwrap()
-    }
-
-    pub async fn insert_symlink(&self, path: impl AsRef<Path>, target: PathBuf) {
-        let mut state = self.state.lock();
-        let path = path.as_ref();
-        let file = FakeFsEntry::Symlink { target };
-        state
-            .write_path(path.as_ref(), move |e| match e {
-                btree_map::Entry::Vacant(e) => {
-                    e.insert(file);
-                    Ok(())
-                }
-                btree_map::Entry::Occupied(mut e) => {
-                    *e.get_mut() = file;
-                    Ok(())
-                }
-            })
-            .unwrap();
-        state.emit_event([(path, Some(PathEventKind::Created))]);
-    }
-
-    fn write_file_internal(
-        &self,
-        path: impl AsRef<Path>,
-        new_content: Vec<u8>,
-        recreate_inode: bool,
-    ) -> Result<()> {
-        let mut state = self.state.lock();
-        let path_buf = path.as_ref().to_path_buf();
-        *state.path_write_counts.entry(path_buf).or_insert(0) += 1;
-        let new_inode = state.get_and_increment_inode();
-        let new_mtime = state.get_and_increment_mtime();
-        let new_len = new_content.len() as u64;
-        let mut kind = None;
-        state.write_path(path.as_ref(), |entry| {
-            match entry {
-                btree_map::Entry::Vacant(e) => {
-                    kind = Some(PathEventKind::Created);
-                    e.insert(FakeFsEntry::File {
-                        inode: new_inode,
-                        mtime: new_mtime,
-                        len: new_len,
-                        content: new_content,
-                        git_dir_path: None,
-                    });
-                }
-                btree_map::Entry::Occupied(mut e) => {
-                    kind = Some(PathEventKind::Changed);
-                    if let FakeFsEntry::File {
-                        inode,
-                        mtime,
-                        len,
-                        content,
-                        ..
-                    } = e.get_mut()
-                    {
-                        *mtime = new_mtime;
-                        *content = new_content;
-                        *len = new_len;
-                        if recreate_inode {
-                            *inode = new_inode;
-                        }
-                    } else {
-                        anyhow::bail!("not a file")
-                    }
-                }
-            }
-            Ok(())
-        })?;
-        state.emit_event([(path.as_ref(), kind)]);
-        Ok(())
-    }
-
-    pub fn read_file_sync(&self, path: impl AsRef<Path>) -> Result<Vec<u8>> {
-        let path = path.as_ref();
-        let path = normalize_path(path);
-        let mut state = self.state.lock();
-        let entry = state.entry(&path)?;
-        entry.file_content(&path).cloned()
-    }
-
-    async fn load_internal(&self, path: impl AsRef<Path>) -> Result<Vec<u8>> {
-        let path = path.as_ref();
-        let path = normalize_path(path);
-        self.simulate_random_delay().await;
-        let mut state = self.state.lock();
-        let entry = state.entry(&path)?;
-        entry.file_content(&path).cloned()
-    }
-
-    pub fn pause_events(&self) {
-        self.state.lock().events_paused = true;
-    }
-
-    pub fn unpause_events_and_flush(&self) {
-        self.state.lock().events_paused = false;
-        self.flush_events(usize::MAX);
-    }
-
-    pub fn buffered_event_count(&self) -> usize {
-        self.state.lock().buffered_events.len()
-    }
-
-    pub fn flush_events(&self, count: usize) {
-        self.state.lock().flush_events(count);
-    }
-
-    pub(crate) fn entry(&self, target: &Path) -> Result<FakeFsEntry> {
-        self.state.lock().entry(target).cloned()
-    }
-
-    pub(crate) fn insert_entry(&self, target: &Path, new_entry: FakeFsEntry) -> Result<()> {
-        let mut state = self.state.lock();
-        state.write_path(target, |entry| {
-            match entry {
-                btree_map::Entry::Vacant(vacant_entry) => {
-                    vacant_entry.insert(new_entry);
-                }
-                btree_map::Entry::Occupied(mut occupied_entry) => {
-                    occupied_entry.insert(new_entry);
-                }
-            }
-            Ok(())
-        })
-    }
-
-    #[must_use]
-    pub fn insert_tree<'a>(
-        &'a self,
-        path: impl 'a + AsRef<Path> + Send,
-        tree: serde_json::Value,
-    ) -> futures::future::BoxFuture<'a, ()> {
-        use futures::FutureExt as _;
-        use serde_json::Value::*;
-
-        async move {
-            let path = path.as_ref();
-
-            match tree {
-                Object(map) => {
-                    self.create_dir(path).await.unwrap();
-                    for (name, contents) in map {
-                        let mut path = PathBuf::from(path);
-                        path.push(name);
-                        self.insert_tree(&path, contents).await;
-                    }
-                }
-                Null => {
-                    self.create_dir(path).await.unwrap();
-                }
-                String(contents) => {
-                    self.insert_file(&path, contents.into_bytes()).await;
-                }
-                _ => {
-                    panic!("JSON object must contain only objects, strings, or null");
-                }
-            }
-        }
-        .boxed()
-    }
-
-    pub fn insert_tree_from_real_fs<'a>(
-        &'a self,
-        path: impl 'a + AsRef<Path> + Send,
-        src_path: impl 'a + AsRef<Path> + Send,
-    ) -> futures::future::BoxFuture<'a, ()> {
-        use futures::FutureExt as _;
-
-        async move {
-            let path = path.as_ref();
-            if std::fs::metadata(&src_path).unwrap().is_file() {
-                let contents = std::fs::read(src_path).unwrap();
-                self.insert_file(path, contents).await;
-            } else {
-                self.create_dir(path).await.unwrap();
-                for entry in std::fs::read_dir(&src_path).unwrap() {
-                    let entry = entry.unwrap();
-                    self.insert_tree_from_real_fs(path.join(entry.file_name()), entry.path())
-                        .await;
-                }
-            }
-        }
-        .boxed()
-    }
-
-    pub fn with_git_state_and_paths<T, F>(
-        &self,
-        dot_git: &Path,
-        emit_git_event: bool,
-        f: F,
-    ) -> Result<T>
-    where
-        F: FnOnce(&mut FakeGitRepositoryState, &Path, &Path) -> T,
-    {
-        let mut state = self.state.lock();
-        let git_event_tx = state.git_event_tx.clone();
-        let entry = state.entry(dot_git).context("open .git")?;
-
-        if let FakeFsEntry::Dir { git_repo_state, .. } = entry {
-            let repo_state = git_repo_state.get_or_insert_with(|| {
-                log::debug!("insert git state for {dot_git:?}");
-                Arc::new(Mutex::new(FakeGitRepositoryState::new(git_event_tx)))
-            });
-            let mut repo_state = repo_state.lock();
-
-            let result = f(&mut repo_state, dot_git, dot_git);
-
-            drop(repo_state);
-            if emit_git_event {
-                state.emit_event([(dot_git, Some(PathEventKind::Changed))]);
-            }
-
-            Ok(result)
-        } else if let FakeFsEntry::File {
-            content,
-            git_dir_path,
-            ..
-        } = &mut *entry
-        {
-            let path = match git_dir_path {
-                Some(path) => path,
-                None => {
-                    let path = std::str::from_utf8(content)
-                        .ok()
-                        .and_then(|content| content.strip_prefix("gitdir:"))
-                        .context("not a valid gitfile")?
-                        .trim();
-                    git_dir_path.insert(normalize_path(&dot_git.parent().unwrap().join(path)))
-                }
-            }
-            .clone();
-            let Some((git_dir_entry, canonical_path)) = state.try_entry(&path, true) else {
-                anyhow::bail!("pointed-to git dir {path:?} not found")
-            };
-            let FakeFsEntry::Dir {
-                git_repo_state,
-                entries,
-                ..
-            } = git_dir_entry
-            else {
-                anyhow::bail!("gitfile points to a non-directory")
-            };
-            let common_dir = if let Some(child) = entries.get("commondir") {
-                Path::new(
-                    std::str::from_utf8(child.file_content("commondir".as_ref())?)
-                        .context("commondir content")?,
-                )
-                .to_owned()
-            } else {
-                canonical_path.clone()
-            };
-            let repo_state = git_repo_state.get_or_insert_with(|| {
-                Arc::new(Mutex::new(FakeGitRepositoryState::new(git_event_tx)))
-            });
-            let mut repo_state = repo_state.lock();
-
-            let result = f(&mut repo_state, &canonical_path, &common_dir);
-
-            if emit_git_event {
-                drop(repo_state);
-                state.emit_event([(canonical_path, Some(PathEventKind::Changed))]);
-            }
-
-            Ok(result)
-        } else {
-            anyhow::bail!("not a valid git repository");
-        }
-    }
-
-    pub fn with_git_state<T, F>(&self, dot_git: &Path, emit_git_event: bool, f: F) -> Result<T>
-    where
-        F: FnOnce(&mut FakeGitRepositoryState) -> T,
-    {
-        self.with_git_state_and_paths(dot_git, emit_git_event, |state, _, _| f(state))
-    }
-
-    pub fn set_branch_name(&self, dot_git: &Path, branch: Option<impl Into<String>>) {
-        self.with_git_state(dot_git, true, |state| {
-            let branch = branch.map(Into::into);
-            state.branches.extend(branch.clone());
-            state.current_branch_name = branch
-        })
-        .unwrap();
-    }
-
-    pub fn insert_branches(&self, dot_git: &Path, branches: &[&str]) {
-        self.with_git_state(dot_git, true, |state| {
-            if let Some(first) = branches.first()
-                && state.current_branch_name.is_none()
-            {
-                state.current_branch_name = Some(first.to_string())
-            }
-            state
-                .branches
-                .extend(branches.iter().map(ToString::to_string));
-        })
-        .unwrap();
-    }
-
-    pub fn set_unmerged_paths_for_repo(
-        &self,
-        dot_git: &Path,
-        unmerged_state: &[(RepoPath, UnmergedStatus)],
-    ) {
-        self.with_git_state(dot_git, true, |state| {
-            state.unmerged_paths.clear();
-            state.unmerged_paths.extend(
-                unmerged_state
-                    .iter()
-                    .map(|(path, content)| (path.clone(), *content)),
-            );
-        })
-        .unwrap();
-    }
-
-    pub fn set_index_for_repo(&self, dot_git: &Path, index_state: &[(&str, String)]) {
-        self.with_git_state(dot_git, true, |state| {
-            state.index_contents.clear();
-            state.index_contents.extend(
-                index_state
-                    .iter()
-                    .map(|(path, content)| (repo_path(path), content.clone())),
-            );
-        })
-        .unwrap();
-    }
-
-    pub fn set_head_for_repo(
-        &self,
-        dot_git: &Path,
-        head_state: &[(&str, String)],
-        sha: impl Into<String>,
-    ) {
-        self.with_git_state(dot_git, true, |state| {
-            state.head_contents.clear();
-            state.head_contents.extend(
-                head_state
-                    .iter()
-                    .map(|(path, content)| (repo_path(path), content.clone())),
-            );
-            state.refs.insert("HEAD".into(), sha.into());
-        })
-        .unwrap();
-    }
-
-    pub fn set_head_and_index_for_repo(&self, dot_git: &Path, contents_by_path: &[(&str, String)]) {
-        self.with_git_state(dot_git, true, |state| {
-            state.head_contents.clear();
-            state.head_contents.extend(
-                contents_by_path
-                    .iter()
-                    .map(|(path, contents)| (repo_path(path), contents.clone())),
-            );
-            state.index_contents = state.head_contents.clone();
-        })
-        .unwrap();
-    }
-
-    pub fn set_merge_base_content_for_repo(
-        &self,
-        dot_git: &Path,
-        contents_by_path: &[(&str, String)],
-    ) {
-        self.with_git_state(dot_git, true, |state| {
-            use git::Oid;
-
-            state.merge_base_contents.clear();
-            let oids = (1..)
-                .map(|n| n.to_string())
-                .map(|n| Oid::from_bytes(n.repeat(20).as_bytes()).unwrap());
-            for ((path, content), oid) in contents_by_path.iter().zip(oids) {
-                state.merge_base_contents.insert(repo_path(path), oid);
-                state.oids.insert(oid, content.clone());
-            }
-        })
-        .unwrap();
-    }
-
-    pub fn set_blame_for_repo(&self, dot_git: &Path, blames: Vec<(RepoPath, git::blame::Blame)>) {
-        self.with_git_state(dot_git, true, |state| {
-            state.blames.clear();
-            state.blames.extend(blames);
-        })
-        .unwrap();
-    }
-
-    /// Put the given git repository into a state with the given status,
-    /// by mutating the head, index, and unmerged state.
-    pub fn set_status_for_repo(&self, dot_git: &Path, statuses: &[(&str, FileStatus)]) {
-        let workdir_path = dot_git.parent().unwrap();
-        let workdir_contents = self.files_with_contents(workdir_path);
-        self.with_git_state(dot_git, true, |state| {
-            state.index_contents.clear();
-            state.head_contents.clear();
-            state.unmerged_paths.clear();
-            for (path, content) in workdir_contents {
-                use util::{paths::PathStyle, rel_path::RelPath};
-
-                let repo_path = RelPath::new(path.strip_prefix(&workdir_path).unwrap(), PathStyle::local()).unwrap();
-                let repo_path = RepoPath::from_rel_path(&repo_path);
-                let status = statuses
-                    .iter()
-                    .find_map(|(p, status)| (*p == repo_path.as_unix_str()).then_some(status));
-                let mut content = String::from_utf8_lossy(&content).to_string();
-
-                let mut index_content = None;
-                let mut head_content = None;
-                match status {
-                    None => {
-                        index_content = Some(content.clone());
-                        head_content = Some(content);
-                    }
-                    Some(FileStatus::Untracked | FileStatus::Ignored) => {}
-                    Some(FileStatus::Unmerged(unmerged_status)) => {
-                        state
-                            .unmerged_paths
-                            .insert(repo_path.clone(), *unmerged_status);
-                        content.push_str(" (unmerged)");
-                        index_content = Some(content.clone());
-                        head_content = Some(content);
-                    }
-                    Some(FileStatus::Tracked(TrackedStatus {
-                        index_status,
-                        worktree_status,
-                    })) => {
-                        match worktree_status {
-                            StatusCode::Modified => {
-                                let mut content = content.clone();
-                                content.push_str(" (modified in working copy)");
-                                index_content = Some(content);
-                            }
-                            StatusCode::TypeChanged | StatusCode::Unmodified => {
-                                index_content = Some(content.clone());
-                            }
-                            StatusCode::Added => {}
-                            StatusCode::Deleted | StatusCode::Renamed | StatusCode::Copied => {
-                                panic!("cannot create these statuses for an existing file");
-                            }
-                        };
-                        match index_status {
-                            StatusCode::Modified => {
-                                let mut content = index_content.clone().expect(
-                                    "file cannot be both modified in index and created in working copy",
-                                );
-                                content.push_str(" (modified in index)");
-                                head_content = Some(content);
-                            }
-                            StatusCode::TypeChanged | StatusCode::Unmodified => {
-                                head_content = Some(index_content.clone().expect("file cannot be both unmodified in index and created in working copy"));
-                            }
-                            StatusCode::Added => {}
-                            StatusCode::Deleted  => {
-                                head_content = Some("".into());
-                            }
-                            StatusCode::Renamed | StatusCode::Copied => {
-                                panic!("cannot create these statuses for an existing file");
-                            }
-                        };
-                    }
-                };
-
-                if let Some(content) = index_content {
-                    state.index_contents.insert(repo_path.clone(), content);
-                }
-                if let Some(content) = head_content {
-                    state.head_contents.insert(repo_path.clone(), content);
-                }
-            }
-        }).unwrap();
-    }
-
-    pub fn set_error_message_for_index_write(&self, dot_git: &Path, message: Option<String>) {
-        self.with_git_state(dot_git, true, |state| {
-            state.simulated_index_write_error_message = message;
-        })
-        .unwrap();
-    }
-
-    pub fn paths(&self, include_dot_git: bool) -> Vec<PathBuf> {
-        let mut result = Vec::new();
-        let mut queue = collections::VecDeque::new();
-        let state = &*self.state.lock();
-        queue.push_back((PathBuf::from(util::path!("/")), &state.root));
-        while let Some((path, entry)) = queue.pop_front() {
-            if let FakeFsEntry::Dir { entries, .. } = entry {
-                for (name, entry) in entries {
-                    queue.push_back((path.join(name), entry));
-                }
-            }
-            if include_dot_git
-                || !path
-                    .components()
-                    .any(|component| component.as_os_str() == *FS_DOT_GIT)
-            {
-                result.push(path);
-            }
-        }
-        result
-    }
-
-    pub fn directories(&self, include_dot_git: bool) -> Vec<PathBuf> {
-        let mut result = Vec::new();
-        let mut queue = collections::VecDeque::new();
-        let state = &*self.state.lock();
-        queue.push_back((PathBuf::from(util::path!("/")), &state.root));
-        while let Some((path, entry)) = queue.pop_front() {
-            if let FakeFsEntry::Dir { entries, .. } = entry {
-                for (name, entry) in entries {
-                    queue.push_back((path.join(name), entry));
-                }
-                if include_dot_git
-                    || !path
-                        .components()
-                        .any(|component| component.as_os_str() == *FS_DOT_GIT)
-                {
-                    result.push(path);
-                }
-            }
-        }
-        result
-    }
-
-    pub fn files(&self) -> Vec<PathBuf> {
-        let mut result = Vec::new();
-        let mut queue = collections::VecDeque::new();
-        let state = &*self.state.lock();
-        queue.push_back((PathBuf::from(util::path!("/")), &state.root));
-        while let Some((path, entry)) = queue.pop_front() {
-            match entry {
-                FakeFsEntry::File { .. } => result.push(path),
-                FakeFsEntry::Dir { entries, .. } => {
-                    for (name, entry) in entries {
-                        queue.push_back((path.join(name), entry));
-                    }
-                }
-                FakeFsEntry::Symlink { .. } => {}
-            }
-        }
-        result
-    }
-
-    pub fn files_with_contents(&self, prefix: &Path) -> Vec<(PathBuf, Vec<u8>)> {
-        let mut result = Vec::new();
-        let mut queue = collections::VecDeque::new();
-        let state = &*self.state.lock();
-        queue.push_back((PathBuf::from(util::path!("/")), &state.root));
-        while let Some((path, entry)) = queue.pop_front() {
-            match entry {
-                FakeFsEntry::File { content, .. } => {
-                    if path.starts_with(prefix) {
-                        result.push((path, content.clone()));
-                    }
-                }
-                FakeFsEntry::Dir { entries, .. } => {
-                    for (name, entry) in entries {
-                        queue.push_back((path.join(name), entry));
-                    }
-                }
-                FakeFsEntry::Symlink { .. } => {}
-            }
-        }
-        result
-    }
-
-    /// How many `read_dir` calls have been issued.
-    pub fn read_dir_call_count(&self) -> usize {
-        self.state.lock().read_dir_call_count
-    }
-
-    pub fn watched_paths(&self) -> Vec<PathBuf> {
-        let state = self.state.lock();
-        state
-            .event_txs
-            .iter()
-            .filter_map(|(path, tx)| Some(path.clone()).filter(|_| !tx.is_closed()))
-            .collect()
-    }
-
-    /// How many `metadata` calls have been issued.
-    pub fn metadata_call_count(&self) -> usize {
-        self.state.lock().metadata_call_count
-    }
-
-    /// How many write operations have been issued for a specific path.
-    pub fn write_count_for_path(&self, path: impl AsRef<Path>) -> usize {
-        let path = path.as_ref().to_path_buf();
-        self.state
-            .lock()
-            .path_write_counts
-            .get(&path)
-            .copied()
-            .unwrap_or(0)
-    }
-
-    pub fn emit_fs_event(&self, path: impl Into<PathBuf>, event: Option<PathEventKind>) {
-        self.state.lock().emit_event(std::iter::once((path, event)));
-    }
-
-    fn simulate_random_delay(&self) -> impl futures::Future<Output = ()> {
-        self.executor.simulate_random_delay()
-    }
-}
-
-#[cfg(any(test, feature = "test-support"))]
-impl FakeFsEntry {
-    fn is_file(&self) -> bool {
-        matches!(self, Self::File { .. })
-    }
-
-    fn is_symlink(&self) -> bool {
-        matches!(self, Self::Symlink { .. })
-    }
-
-    fn file_content(&self, path: &Path) -> Result<&Vec<u8>> {
-        if let Self::File { content, .. } = self {
-            Ok(content)
-        } else {
-            anyhow::bail!("not a file: {path:?}");
-        }
-    }
-
-    fn dir_entries(&mut self, path: &Path) -> Result<&mut BTreeMap<String, FakeFsEntry>> {
-        if let Self::Dir { entries, .. } = self {
-            Ok(entries)
-        } else {
-            anyhow::bail!("not a directory: {path:?}");
-        }
-    }
-}
-
-#[cfg(any(test, feature = "test-support"))]
-struct FakeWatcher {
-    tx: smol::channel::Sender<Vec<PathEvent>>,
-    original_path: PathBuf,
-    fs_state: Arc<Mutex<FakeFsState>>,
-    prefixes: Mutex<Vec<PathBuf>>,
-}
-
-#[cfg(any(test, feature = "test-support"))]
-impl Watcher for FakeWatcher {
-    fn add(&self, path: &Path) -> Result<()> {
-        if path.starts_with(&self.original_path) {
-            return Ok(());
-        }
-        self.fs_state
-            .try_lock()
-            .unwrap()
-            .event_txs
-            .push((path.to_owned(), self.tx.clone()));
-        self.prefixes.lock().push(path.to_owned());
-        Ok(())
-    }
-
-    fn remove(&self, _: &Path) -> Result<()> {
-        Ok(())
-    }
-}
-
-#[cfg(any(test, feature = "test-support"))]
-#[derive(Debug)]
-struct FakeHandle {
-    inode: u64,
-}
-
-#[cfg(any(test, feature = "test-support"))]
-impl FileHandle for FakeHandle {
-    fn current_path(&self, fs: &Arc<dyn Fs>) -> Result<PathBuf> {
-        let fs = fs.as_fake();
-        let mut state = fs.state.lock();
-        let Some(target) = state.moves.get(&self.inode).cloned() else {
-            anyhow::bail!("fake fd not moved")
-        };
-
-        if state.try_entry(&target, false).is_some() {
-            return Ok(target);
-        }
-        anyhow::bail!("fake fd target not found")
-    }
-}
-
-#[cfg(any(test, feature = "test-support"))]
-#[async_trait::async_trait]
-impl Fs for FakeFs {
-    async fn create_dir(&self, path: &Path) -> Result<()> {
-        self.simulate_random_delay().await;
-
-        let mut created_dirs = Vec::new();
-        let mut cur_path = PathBuf::new();
-        for component in path.components() {
-            let should_skip = matches!(component, Component::Prefix(..) | Component::RootDir);
-            cur_path.push(component);
-            if should_skip {
-                continue;
-            }
-            let mut state = self.state.lock();
-
-            let inode = state.get_and_increment_inode();
-            let mtime = state.get_and_increment_mtime();
-            state.write_path(&cur_path, |entry| {
-                entry.or_insert_with(|| {
-                    created_dirs.push((cur_path.clone(), Some(PathEventKind::Created)));
-                    FakeFsEntry::Dir {
-                        inode,
-                        mtime,
-                        len: 0,
-                        entries: Default::default(),
-                        git_repo_state: None,
-                    }
-                });
-                Ok(())
-            })?
-        }
-
-        self.state.lock().emit_event(created_dirs);
-        Ok(())
-    }
-
-    async fn create_file(&self, path: &Path, options: CreateOptions) -> Result<()> {
-        self.simulate_random_delay().await;
-        let mut state = self.state.lock();
-        let inode = state.get_and_increment_inode();
-        let mtime = state.get_and_increment_mtime();
-        let file = FakeFsEntry::File {
-            inode,
-            mtime,
-            len: 0,
-            content: Vec::new(),
-            git_dir_path: None,
-        };
-        let mut kind = Some(PathEventKind::Created);
-        state.write_path(path, |entry| {
-            match entry {
-                btree_map::Entry::Occupied(mut e) => {
-                    if options.overwrite {
-                        kind = Some(PathEventKind::Changed);
-                        *e.get_mut() = file;
-                    } else if !options.ignore_if_exists {
-                        anyhow::bail!("path already exists: {path:?}");
-                    }
-                }
-                btree_map::Entry::Vacant(e) => {
-                    e.insert(file);
-                }
-            }
-            Ok(())
-        })?;
-        state.emit_event([(path, kind)]);
-        Ok(())
-    }
-
-    async fn create_symlink(&self, path: &Path, target: PathBuf) -> Result<()> {
-        let mut state = self.state.lock();
-        let file = FakeFsEntry::Symlink { target };
-        state
-            .write_path(path.as_ref(), move |e| match e {
-                btree_map::Entry::Vacant(e) => {
-                    e.insert(file);
-                    Ok(())
-                }
-                btree_map::Entry::Occupied(mut e) => {
-                    *e.get_mut() = file;
-                    Ok(())
-                }
-            })
-            .unwrap();
-        state.emit_event([(path, Some(PathEventKind::Created))]);
-
-        Ok(())
-    }
-
-    async fn create_file_with(
-        &self,
-        path: &Path,
-        mut content: Pin<&mut (dyn AsyncRead + Send)>,
-    ) -> Result<()> {
-        let mut bytes = Vec::new();
-        content.read_to_end(&mut bytes).await?;
-        self.write_file_internal(path, bytes, true)?;
-        Ok(())
-    }
-
-    async fn extract_tar_file(
-        &self,
-        path: &Path,
-        content: Archive<Pin<&mut (dyn AsyncRead + Send)>>,
-    ) -> Result<()> {
-        let mut entries = content.entries()?;
-        while let Some(entry) = entries.next().await {
-            let mut entry = entry?;
-            if entry.header().entry_type().is_file() {
-                let path = path.join(entry.path()?.as_ref());
-                let mut bytes = Vec::new();
-                entry.read_to_end(&mut bytes).await?;
-                self.create_dir(path.parent().unwrap()).await?;
-                self.write_file_internal(&path, bytes, true)?;
-            }
-        }
-        Ok(())
-    }
-
-    async fn rename(&self, old_path: &Path, new_path: &Path, options: RenameOptions) -> Result<()> {
-        self.simulate_random_delay().await;
-
-        let old_path = normalize_path(old_path);
-        let new_path = normalize_path(new_path);
-
-        if options.create_parents {
-            if let Some(parent) = new_path.parent() {
-                self.create_dir(parent).await?;
-            }
-        }
-
-        let mut state = self.state.lock();
-        let moved_entry = state.write_path(&old_path, |e| {
-            if let btree_map::Entry::Occupied(e) = e {
-                Ok(e.get().clone())
-            } else {
-                anyhow::bail!("path does not exist: {old_path:?}")
-            }
-        })?;
-
-        let inode = match moved_entry {
-            FakeFsEntry::File { inode, .. } => inode,
-            FakeFsEntry::Dir { inode, .. } => inode,
-            _ => 0,
-        };
-
-        state.moves.insert(inode, new_path.clone());
-
-        state.write_path(&new_path, |e| {
-            match e {
-                btree_map::Entry::Occupied(mut e) => {
-                    if options.overwrite {
-                        *e.get_mut() = moved_entry;
-                    } else if !options.ignore_if_exists {
-                        anyhow::bail!("path already exists: {new_path:?}");
-                    }
-                }
-                btree_map::Entry::Vacant(e) => {
-                    e.insert(moved_entry);
-                }
-            }
-            Ok(())
-        })?;
-
-        state
-            .write_path(&old_path, |e| {
-                if let btree_map::Entry::Occupied(e) = e {
-                    Ok(e.remove())
-                } else {
-                    unreachable!()
-                }
-            })
-            .unwrap();
-
-        state.emit_event([
-            (old_path, Some(PathEventKind::Removed)),
-            (new_path, Some(PathEventKind::Created)),
-        ]);
-        Ok(())
-    }
-
-    async fn copy_file(&self, source: &Path, target: &Path, options: CopyOptions) -> Result<()> {
-        self.simulate_random_delay().await;
-
-        let source = normalize_path(source);
-        let target = normalize_path(target);
-        let mut state = self.state.lock();
-        let mtime = state.get_and_increment_mtime();
-        let inode = state.get_and_increment_inode();
-        let source_entry = state.entry(&source)?;
-        let content = source_entry.file_content(&source)?.clone();
-        let mut kind = Some(PathEventKind::Created);
-        state.write_path(&target, |e| match e {
-            btree_map::Entry::Occupied(e) => {
-                if options.overwrite {
-                    kind = Some(PathEventKind::Changed);
-                    Ok(Some(e.get().clone()))
-                } else if !options.ignore_if_exists {
-                    anyhow::bail!("{target:?} already exists");
-                } else {
-                    Ok(None)
-                }
-            }
-            btree_map::Entry::Vacant(e) => Ok(Some(
-                e.insert(FakeFsEntry::File {
-                    inode,
-                    mtime,
-                    len: content.len() as u64,
-                    content,
-                    git_dir_path: None,
-                })
-                .clone(),
-            )),
-        })?;
-        state.emit_event([(target, kind)]);
-        Ok(())
-    }
-
-    async fn remove_dir(&self, path: &Path, options: RemoveOptions) -> Result<()> {
-        self.simulate_random_delay().await;
-
-        let path = normalize_path(path);
-        let parent_path = path.parent().context("cannot remove the root")?;
-        let base_name = path.file_name().context("cannot remove the root")?;
-
-        let mut state = self.state.lock();
-        let parent_entry = state.entry(parent_path)?;
-        let entry = parent_entry
-            .dir_entries(parent_path)?
-            .entry(base_name.to_str().unwrap().into());
-
-        match entry {
-            btree_map::Entry::Vacant(_) => {
-                if !options.ignore_if_not_exists {
-                    anyhow::bail!("{path:?} does not exist");
-                }
-            }
-            btree_map::Entry::Occupied(mut entry) => {
-                {
-                    let children = entry.get_mut().dir_entries(&path)?;
-                    if !options.recursive && !children.is_empty() {
-                        anyhow::bail!("{path:?} is not empty");
-                    }
-                }
-                entry.remove();
-            }
-        }
-        state.emit_event([(path, Some(PathEventKind::Removed))]);
-        Ok(())
-    }
-
-    async fn remove_file(&self, path: &Path, options: RemoveOptions) -> Result<()> {
-        self.simulate_random_delay().await;
-
-        let path = normalize_path(path);
-        let parent_path = path.parent().context("cannot remove the root")?;
-        let base_name = path.file_name().unwrap();
-        let mut state = self.state.lock();
-        let parent_entry = state.entry(parent_path)?;
-        let entry = parent_entry
-            .dir_entries(parent_path)?
-            .entry(base_name.to_str().unwrap().into());
-        match entry {
-            btree_map::Entry::Vacant(_) => {
-                if !options.ignore_if_not_exists {
-                    anyhow::bail!("{path:?} does not exist");
-                }
-            }
-            btree_map::Entry::Occupied(mut entry) => {
-                entry.get_mut().file_content(&path)?;
-                entry.remove();
-            }
-        }
-        state.emit_event([(path, Some(PathEventKind::Removed))]);
-        Ok(())
-    }
-
-    async fn open_sync(&self, path: &Path) -> Result<Box<dyn io::Read + Send + Sync>> {
-        let bytes = self.load_internal(path).await?;
-        Ok(Box::new(io::Cursor::new(bytes)))
-    }
-
-    async fn open_handle(&self, path: &Path) -> Result<Arc<dyn FileHandle>> {
-        self.simulate_random_delay().await;
-        let mut state = self.state.lock();
-        let inode = match state.entry(path)? {
-            FakeFsEntry::File { inode, .. } => *inode,
-            FakeFsEntry::Dir { inode, .. } => *inode,
-            _ => unreachable!(),
-        };
-        Ok(Arc::new(FakeHandle { inode }))
-    }
-
-    async fn load(&self, path: &Path) -> Result<String> {
-        let content = self.load_internal(path).await?;
-        Ok(String::from_utf8(content)?)
-    }
-
-    async fn load_bytes(&self, path: &Path) -> Result<Vec<u8>> {
-        self.load_internal(path).await
-    }
-
-    async fn atomic_write(&self, path: PathBuf, data: String) -> Result<()> {
-        self.simulate_random_delay().await;
-        let path = normalize_path(path.as_path());
-        if let Some(path) = path.parent() {
-            self.create_dir(path).await?;
-        }
-        self.write_file_internal(path, data.into_bytes(), true)?;
-        Ok(())
-    }
-
-    async fn save(&self, path: &Path, text: &Rope, line_ending: LineEnding) -> Result<()> {
-        self.simulate_random_delay().await;
-        let path = normalize_path(path);
-        let content = text::chunks_with_line_ending(text, line_ending).collect::<String>();
-        if let Some(path) = path.parent() {
-            self.create_dir(path).await?;
-        }
-        self.write_file_internal(path, content.into_bytes(), false)?;
-        Ok(())
-    }
-
-    async fn write(&self, path: &Path, content: &[u8]) -> Result<()> {
-        self.simulate_random_delay().await;
-        let path = normalize_path(path);
-        if let Some(path) = path.parent() {
-            self.create_dir(path).await?;
-        }
-        self.write_file_internal(path, content.to_vec(), false)?;
-        Ok(())
-    }
-
-    async fn canonicalize(&self, path: &Path) -> Result<PathBuf> {
-        let path = normalize_path(path);
-        self.simulate_random_delay().await;
-        let state = self.state.lock();
-        let canonical_path = state
-            .canonicalize(&path, true)
-            .with_context(|| format!("path does not exist: {path:?}"))?;
-        Ok(canonical_path)
-    }
-
-    async fn is_file(&self, path: &Path) -> bool {
-        let path = normalize_path(path);
-        self.simulate_random_delay().await;
-        let mut state = self.state.lock();
-        if let Some((entry, _)) = state.try_entry(&path, true) {
-            entry.is_file()
-        } else {
-            false
-        }
-    }
-
-    async fn is_dir(&self, path: &Path) -> bool {
-        self.metadata(path)
-            .await
-            .is_ok_and(|metadata| metadata.is_some_and(|metadata| metadata.is_dir))
-    }
-
-    async fn metadata(&self, path: &Path) -> Result<Option<Metadata>> {
-        self.simulate_random_delay().await;
-        let path = normalize_path(path);
-        let mut state = self.state.lock();
-        state.metadata_call_count += 1;
-        if let Some((mut entry, _)) = state.try_entry(&path, false) {
-            let is_symlink = entry.is_symlink();
-            if is_symlink {
-                if let Some(e) = state.try_entry(&path, true).map(|e| e.0) {
-                    entry = e;
-                } else {
-                    return Ok(None);
-                }
-            }
-
-            Ok(Some(match &*entry {
-                FakeFsEntry::File {
-                    inode, mtime, len, ..
-                } => Metadata {
-                    inode: *inode,
-                    mtime: *mtime,
-                    len: *len,
-                    is_dir: false,
-                    is_symlink,
-                    is_fifo: false,
-                    is_executable: false,
-                },
-                FakeFsEntry::Dir {
-                    inode, mtime, len, ..
-                } => Metadata {
-                    inode: *inode,
-                    mtime: *mtime,
-                    len: *len,
-                    is_dir: true,
-                    is_symlink,
-                    is_fifo: false,
-                    is_executable: false,
-                },
-                FakeFsEntry::Symlink { .. } => unreachable!(),
-            }))
-        } else {
-            Ok(None)
-        }
-    }
-
-    async fn read_link(&self, path: &Path) -> Result<PathBuf> {
-        self.simulate_random_delay().await;
-        let path = normalize_path(path);
-        let mut state = self.state.lock();
-        let (entry, _) = state
-            .try_entry(&path, false)
-            .with_context(|| format!("path does not exist: {path:?}"))?;
-        if let FakeFsEntry::Symlink { target } = entry {
-            Ok(target.clone())
-        } else {
-            anyhow::bail!("not a symlink: {path:?}")
-        }
-    }
-
-    async fn read_dir(
-        &self,
-        path: &Path,
-    ) -> Result<Pin<Box<dyn Send + Stream<Item = Result<PathBuf>>>>> {
-        self.simulate_random_delay().await;
-        let path = normalize_path(path);
-        let mut state = self.state.lock();
-        state.read_dir_call_count += 1;
-        let entry = state.entry(&path)?;
-        let children = entry.dir_entries(&path)?;
-        let paths = children
-            .keys()
-            .map(|file_name| Ok(path.join(file_name)))
-            .collect::<Vec<_>>();
-        Ok(Box::pin(futures::stream::iter(paths)))
-    }
-
-    async fn watch(
-        &self,
-        path: &Path,
-        _: Duration,
-    ) -> (
-        Pin<Box<dyn Send + Stream<Item = Vec<PathEvent>>>>,
-        Arc<dyn Watcher>,
-    ) {
-        self.simulate_random_delay().await;
-        let (tx, rx) = smol::channel::unbounded();
-        let path = path.to_path_buf();
-        self.state.lock().event_txs.push((path.clone(), tx.clone()));
-        let executor = self.executor.clone();
-        let watcher = Arc::new(FakeWatcher {
-            tx,
-            original_path: path.to_owned(),
-            fs_state: self.state.clone(),
-            prefixes: Mutex::new(vec![path]),
-        });
-        (
-            Box::pin(futures::StreamExt::filter(rx, {
-                let watcher = watcher.clone();
-                move |events| {
-                    let result = events.iter().any(|evt_path| {
-                        watcher
-                            .prefixes
-                            .lock()
-                            .iter()
-                            .any(|prefix| evt_path.path.starts_with(prefix))
-                    });
-                    let executor = executor.clone();
-                    async move {
-                        executor.simulate_random_delay().await;
-                        result
-                    }
-                }
-            })),
-            watcher,
-        )
-    }
-
-    fn open_repo(
-        &self,
-        abs_dot_git: &Path,
-        _system_git_binary: Option<&Path>,
-    ) -> Option<Arc<dyn GitRepository>> {
-        use util::ResultExt as _;
-
-        self.with_git_state_and_paths(
-            abs_dot_git,
-            false,
-            |_, repository_dir_path, common_dir_path| {
-                Arc::new(fake_git_repo::FakeGitRepository {
-                    fs: self.this.upgrade().unwrap(),
-                    executor: self.executor.clone(),
-                    dot_git_path: abs_dot_git.to_path_buf(),
-                    repository_dir_path: repository_dir_path.to_owned(),
-                    common_dir_path: common_dir_path.to_owned(),
-                    checkpoints: Arc::default(),
-                }) as _
-            },
-        )
-        .log_err()
-    }
-
-    async fn git_init(
-        &self,
-        abs_work_directory_path: &Path,
-        _fallback_branch_name: String,
-    ) -> Result<()> {
-        self.create_dir(&abs_work_directory_path.join(".git")).await
-    }
-
-    async fn git_clone(&self, _repo_url: &str, _abs_work_directory: &Path) -> Result<()> {
-        anyhow::bail!("Git clone is not supported in fake Fs")
-    }
-
-    fn is_fake(&self) -> bool {
-        true
-    }
-
-    async fn is_case_sensitive(&self) -> Result<bool> {
-        Ok(true)
-    }
-
-    fn subscribe_to_jobs(&self) -> JobEventReceiver {
-        let (sender, receiver) = futures::channel::mpsc::unbounded();
-        self.state.lock().job_event_subscribers.lock().push(sender);
-        receiver
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    fn as_fake(&self) -> Arc<FakeFs> {
-        self.this.upgrade().unwrap()
-    }
-}
-
-pub fn normalize_path(path: &Path) -> PathBuf {
-    let mut components = path.components().peekable();
-    let mut ret = if let Some(c @ Component::Prefix(..)) = components.peek().cloned() {
-        components.next();
-        PathBuf::from(c.as_os_str())
-    } else {
-        PathBuf::new()
-    };
-
-    for component in components {
-        match component {
-            Component::Prefix(..) => unreachable!(),
-            Component::RootDir => {
-                ret.push(component.as_os_str());
-            }
-            Component::CurDir => {}
-            Component::ParentDir => {
-                ret.pop();
-            }
-            Component::Normal(c) => {
-                ret.push(c);
-            }
-        }
-    }
-    ret
-}
-
-pub async fn copy_recursive<'a>(
-    fs: &'a dyn Fs,
-    source: &'a Path,
-    target: &'a Path,
-    options: CopyOptions,
-) -> Result<()> {
-    for (item, is_dir) in read_dir_items(fs, source).await? {
-        let Ok(item_relative_path) = item.strip_prefix(source) else {
-            continue;
-        };
-        let target_item = if item_relative_path == Path::new("") {
-            target.to_path_buf()
-        } else {
-            target.join(item_relative_path)
-        };
-        if is_dir {
-            if !options.overwrite && fs.metadata(&target_item).await.is_ok_and(|m| m.is_some()) {
-                if options.ignore_if_exists {
-                    continue;
-                } else {
-                    anyhow::bail!("{target_item:?} already exists");
-                }
-            }
-            let _ = fs
-                .remove_dir(
-                    &target_item,
-                    RemoveOptions {
-                        recursive: true,
-                        ignore_if_not_exists: true,
-                    },
-                )
-                .await;
-            fs.create_dir(&target_item).await?;
-        } else {
-            fs.copy_file(&item, &target_item, options).await?;
-        }
-    }
-    Ok(())
-}
-
-/// Recursively reads all of the paths in the given directory.
-///
-/// Returns a vector of tuples of (path, is_dir).
-pub async fn read_dir_items<'a>(fs: &'a dyn Fs, source: &'a Path) -> Result<Vec<(PathBuf, bool)>> {
-    let mut items = Vec::new();
-    read_recursive(fs, source, &mut items).await?;
-    Ok(items)
-}
-
-fn read_recursive<'a>(
-    fs: &'a dyn Fs,
-    source: &'a Path,
-    output: &'a mut Vec<(PathBuf, bool)>,
-) -> BoxFuture<'a, Result<()>> {
-    use futures::future::FutureExt;
-
-    async move {
-        let metadata = fs
-            .metadata(source)
-            .await?
-            .with_context(|| format!("path does not exist: {source:?}"))?;
-
-        if metadata.is_dir {
-            output.push((source.to_path_buf(), true));
-            let mut children = fs.read_dir(source).await?;
-            while let Some(child_path) = children.next().await {
-                if let Ok(child_path) = child_path {
-                    read_recursive(fs, &child_path, output).await?;
-                }
-            }
-        } else {
-            output.push((source.to_path_buf(), false));
-        }
-        Ok(())
-    }
-    .boxed()
-}
-
-// todo(windows)
-// can we get file id not open the file twice?
-// https://github.com/rust-lang/rust/issues/63010
-#[cfg(target_os = "windows")]
-async fn file_id(path: impl AsRef<Path>) -> Result<u64> {
-    use std::os::windows::io::AsRawHandle;
-
-    use smol::fs::windows::OpenOptionsExt;
-    use windows::Win32::{
-        Foundation::HANDLE,
-        Storage::FileSystem::{
-            BY_HANDLE_FILE_INFORMATION, FILE_FLAG_BACKUP_SEMANTICS, GetFileInformationByHandle,
-        },
-    };
-
-    let file = smol::fs::OpenOptions::new()
-        .read(true)
-        .custom_flags(FILE_FLAG_BACKUP_SEMANTICS.0)
-        .open(path)
-        .await?;
-
-    let mut info: BY_HANDLE_FILE_INFORMATION = unsafe { std::mem::zeroed() };
-    // https://learn.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-getfileinformationbyhandle
-    // This function supports Windows XP+
-    smol::unblock(move || {
-        unsafe { GetFileInformationByHandle(HANDLE(file.as_raw_handle() as _), &mut info)? };
-
-        Ok(((info.nFileIndexHigh as u64) << 32) | (info.nFileIndexLow as u64))
-    })
-    .await
-}
-
-#[cfg(target_os = "windows")]
-fn atomic_replace<P: AsRef<Path>>(
-    replaced_file: P,
-    replacement_file: P,
-) -> windows::core::Result<()> {
-    use windows::{
-        Win32::Storage::FileSystem::{REPLACE_FILE_FLAGS, ReplaceFileW},
-        core::HSTRING,
-    };
-
-    // If the file does not exist, create it.
-    let _ = std::fs::File::create_new(replaced_file.as_ref());
-
-    unsafe {
-        ReplaceFileW(
-            &HSTRING::from(replaced_file.as_ref().to_string_lossy().into_owned()),
-            &HSTRING::from(replacement_file.as_ref().to_string_lossy().into_owned()),
-            None,
-            REPLACE_FILE_FLAGS::default(),
-            None,
-            None,
-        )
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use gpui::BackgroundExecutor;
-    use serde_json::json;
-    use util::path;
-
-    #[gpui::test]
-    async fn test_fake_fs(executor: BackgroundExecutor) {
-        let fs = FakeFs::new(executor.clone());
-        fs.insert_tree(
-            path!("/root"),
-            json!({
-                "dir1": {
-                    "a": "A",
-                    "b": "B"
-                },
-                "dir2": {
-                    "c": "C",
-                    "dir3": {
-                        "d": "D"
-                    }
-                }
-            }),
-        )
-        .await;
-
-        assert_eq!(
-            fs.files(),
-            vec![
-                PathBuf::from(path!("/root/dir1/a")),
-                PathBuf::from(path!("/root/dir1/b")),
-                PathBuf::from(path!("/root/dir2/c")),
-                PathBuf::from(path!("/root/dir2/dir3/d")),
-            ]
-        );
-
-        fs.create_symlink(path!("/root/dir2/link-to-dir3").as_ref(), "./dir3".into())
-            .await
-            .unwrap();
-
-        assert_eq!(
-            fs.canonicalize(path!("/root/dir2/link-to-dir3").as_ref())
-                .await
-                .unwrap(),
-            PathBuf::from(path!("/root/dir2/dir3")),
-        );
-        assert_eq!(
-            fs.canonicalize(path!("/root/dir2/link-to-dir3/d").as_ref())
-                .await
-                .unwrap(),
-            PathBuf::from(path!("/root/dir2/dir3/d")),
-        );
-        assert_eq!(
-            fs.load(path!("/root/dir2/link-to-dir3/d").as_ref())
-                .await
-                .unwrap(),
-            "D",
-        );
-    }
-
-    #[gpui::test]
-    async fn test_copy_recursive_with_single_file(executor: BackgroundExecutor) {
-        let fs = FakeFs::new(executor.clone());
-        fs.insert_tree(
-            path!("/outer"),
-            json!({
-                "a": "A",
-                "b": "B",
-                "inner": {}
-            }),
-        )
-        .await;
-
-        assert_eq!(
-            fs.files(),
-            vec![
-                PathBuf::from(path!("/outer/a")),
-                PathBuf::from(path!("/outer/b")),
-            ]
-        );
-
-        let source = Path::new(path!("/outer/a"));
-        let target = Path::new(path!("/outer/a copy"));
-        copy_recursive(fs.as_ref(), source, target, Default::default())
-            .await
-            .unwrap();
-
-        assert_eq!(
-            fs.files(),
-            vec![
-                PathBuf::from(path!("/outer/a")),
-                PathBuf::from(path!("/outer/a copy")),
-                PathBuf::from(path!("/outer/b")),
-            ]
-        );
-
-        let source = Path::new(path!("/outer/a"));
-        let target = Path::new(path!("/outer/inner/a copy"));
-        copy_recursive(fs.as_ref(), source, target, Default::default())
-            .await
-            .unwrap();
-
-        assert_eq!(
-            fs.files(),
-            vec![
-                PathBuf::from(path!("/outer/a")),
-                PathBuf::from(path!("/outer/a copy")),
-                PathBuf::from(path!("/outer/b")),
-                PathBuf::from(path!("/outer/inner/a copy")),
-            ]
-        );
-    }
-
-    #[gpui::test]
-    async fn test_copy_recursive_with_single_dir(executor: BackgroundExecutor) {
-        let fs = FakeFs::new(executor.clone());
-        fs.insert_tree(
-            path!("/outer"),
-            json!({
-                "a": "A",
-                "empty": {},
-                "non-empty": {
-                    "b": "B",
-                }
-            }),
-        )
-        .await;
-
-        assert_eq!(
-            fs.files(),
-            vec![
-                PathBuf::from(path!("/outer/a")),
-                PathBuf::from(path!("/outer/non-empty/b")),
-            ]
-        );
-        assert_eq!(
-            fs.directories(false),
-            vec![
-                PathBuf::from(path!("/")),
-                PathBuf::from(path!("/outer")),
-                PathBuf::from(path!("/outer/empty")),
-                PathBuf::from(path!("/outer/non-empty")),
-            ]
-        );
-
-        let source = Path::new(path!("/outer/empty"));
-        let target = Path::new(path!("/outer/empty copy"));
-        copy_recursive(fs.as_ref(), source, target, Default::default())
-            .await
-            .unwrap();
-
-        assert_eq!(
-            fs.files(),
-            vec![
-                PathBuf::from(path!("/outer/a")),
-                PathBuf::from(path!("/outer/non-empty/b")),
-            ]
-        );
-        assert_eq!(
-            fs.directories(false),
-            vec![
-                PathBuf::from(path!("/")),
-                PathBuf::from(path!("/outer")),
-                PathBuf::from(path!("/outer/empty")),
-                PathBuf::from(path!("/outer/empty copy")),
-                PathBuf::from(path!("/outer/non-empty")),
-            ]
-        );
-
-        let source = Path::new(path!("/outer/non-empty"));
-        let target = Path::new(path!("/outer/non-empty copy"));
-        copy_recursive(fs.as_ref(), source, target, Default::default())
-            .await
-            .unwrap();
-
-        assert_eq!(
-            fs.files(),
-            vec![
-                PathBuf::from(path!("/outer/a")),
-                PathBuf::from(path!("/outer/non-empty/b")),
-                PathBuf::from(path!("/outer/non-empty copy/b")),
-            ]
-        );
-        assert_eq!(
-            fs.directories(false),
-            vec![
-                PathBuf::from(path!("/")),
-                PathBuf::from(path!("/outer")),
-                PathBuf::from(path!("/outer/empty")),
-                PathBuf::from(path!("/outer/empty copy")),
-                PathBuf::from(path!("/outer/non-empty")),
-                PathBuf::from(path!("/outer/non-empty copy")),
-            ]
-        );
-    }
-
-    #[gpui::test]
-    async fn test_copy_recursive(executor: BackgroundExecutor) {
-        let fs = FakeFs::new(executor.clone());
-        fs.insert_tree(
-            path!("/outer"),
-            json!({
-                "inner1": {
-                    "a": "A",
-                    "b": "B",
-                    "inner3": {
-                        "d": "D",
-                    },
-                    "inner4": {}
-                },
-                "inner2": {
-                    "c": "C",
-                }
-            }),
-        )
-        .await;
-
-        assert_eq!(
-            fs.files(),
-            vec![
-                PathBuf::from(path!("/outer/inner1/a")),
-                PathBuf::from(path!("/outer/inner1/b")),
-                PathBuf::from(path!("/outer/inner2/c")),
-                PathBuf::from(path!("/outer/inner1/inner3/d")),
-            ]
-        );
-        assert_eq!(
-            fs.directories(false),
-            vec![
-                PathBuf::from(path!("/")),
-                PathBuf::from(path!("/outer")),
-                PathBuf::from(path!("/outer/inner1")),
-                PathBuf::from(path!("/outer/inner2")),
-                PathBuf::from(path!("/outer/inner1/inner3")),
-                PathBuf::from(path!("/outer/inner1/inner4")),
-            ]
-        );
-
-        let source = Path::new(path!("/outer"));
-        let target = Path::new(path!("/outer/inner1/outer"));
-        copy_recursive(fs.as_ref(), source, target, Default::default())
-            .await
-            .unwrap();
-
-        assert_eq!(
-            fs.files(),
-            vec![
-                PathBuf::from(path!("/outer/inner1/a")),
-                PathBuf::from(path!("/outer/inner1/b")),
-                PathBuf::from(path!("/outer/inner2/c")),
-                PathBuf::from(path!("/outer/inner1/inner3/d")),
-                PathBuf::from(path!("/outer/inner1/outer/inner1/a")),
-                PathBuf::from(path!("/outer/inner1/outer/inner1/b")),
-                PathBuf::from(path!("/outer/inner1/outer/inner2/c")),
-                PathBuf::from(path!("/outer/inner1/outer/inner1/inner3/d")),
-            ]
-        );
-        assert_eq!(
-            fs.directories(false),
-            vec![
-                PathBuf::from(path!("/")),
-                PathBuf::from(path!("/outer")),
-                PathBuf::from(path!("/outer/inner1")),
-                PathBuf::from(path!("/outer/inner2")),
-                PathBuf::from(path!("/outer/inner1/inner3")),
-                PathBuf::from(path!("/outer/inner1/inner4")),
-                PathBuf::from(path!("/outer/inner1/outer")),
-                PathBuf::from(path!("/outer/inner1/outer/inner1")),
-                PathBuf::from(path!("/outer/inner1/outer/inner2")),
-                PathBuf::from(path!("/outer/inner1/outer/inner1/inner3")),
-                PathBuf::from(path!("/outer/inner1/outer/inner1/inner4")),
-            ]
-        );
-    }
-
-    #[gpui::test]
-    async fn test_copy_recursive_with_overwriting(executor: BackgroundExecutor) {
-        let fs = FakeFs::new(executor.clone());
-        fs.insert_tree(
-            path!("/outer"),
-            json!({
-                "inner1": {
-                    "a": "A",
-                    "b": "B",
-                    "outer": {
-                        "inner1": {
-                            "a": "B"
-                        }
-                    }
-                },
-                "inner2": {
-                    "c": "C",
-                }
-            }),
-        )
-        .await;
-
-        assert_eq!(
-            fs.files(),
-            vec![
-                PathBuf::from(path!("/outer/inner1/a")),
-                PathBuf::from(path!("/outer/inner1/b")),
-                PathBuf::from(path!("/outer/inner2/c")),
-                PathBuf::from(path!("/outer/inner1/outer/inner1/a")),
-            ]
-        );
-        assert_eq!(
-            fs.load(path!("/outer/inner1/outer/inner1/a").as_ref())
-                .await
-                .unwrap(),
-            "B",
-        );
-
-        let source = Path::new(path!("/outer"));
-        let target = Path::new(path!("/outer/inner1/outer"));
-        copy_recursive(
-            fs.as_ref(),
-            source,
-            target,
-            CopyOptions {
-                overwrite: true,
-                ..Default::default()
-            },
-        )
-        .await
-        .unwrap();
-
-        assert_eq!(
-            fs.files(),
-            vec![
-                PathBuf::from(path!("/outer/inner1/a")),
-                PathBuf::from(path!("/outer/inner1/b")),
-                PathBuf::from(path!("/outer/inner2/c")),
-                PathBuf::from(path!("/outer/inner1/outer/inner1/a")),
-                PathBuf::from(path!("/outer/inner1/outer/inner1/b")),
-                PathBuf::from(path!("/outer/inner1/outer/inner2/c")),
-                PathBuf::from(path!("/outer/inner1/outer/inner1/outer/inner1/a")),
-            ]
-        );
-        assert_eq!(
-            fs.load(path!("/outer/inner1/outer/inner1/a").as_ref())
-                .await
-                .unwrap(),
-            "A"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_copy_recursive_with_ignoring(executor: BackgroundExecutor) {
-        let fs = FakeFs::new(executor.clone());
-        fs.insert_tree(
-            path!("/outer"),
-            json!({
-                "inner1": {
-                    "a": "A",
-                    "b": "B",
-                    "outer": {
-                        "inner1": {
-                            "a": "B"
-                        }
-                    }
-                },
-                "inner2": {
-                    "c": "C",
-                }
-            }),
-        )
-        .await;
-
-        assert_eq!(
-            fs.files(),
-            vec![
-                PathBuf::from(path!("/outer/inner1/a")),
-                PathBuf::from(path!("/outer/inner1/b")),
-                PathBuf::from(path!("/outer/inner2/c")),
-                PathBuf::from(path!("/outer/inner1/outer/inner1/a")),
-            ]
-        );
-        assert_eq!(
-            fs.load(path!("/outer/inner1/outer/inner1/a").as_ref())
-                .await
-                .unwrap(),
-            "B",
-        );
-
-        let source = Path::new(path!("/outer"));
-        let target = Path::new(path!("/outer/inner1/outer"));
-        copy_recursive(
-            fs.as_ref(),
-            source,
-            target,
-            CopyOptions {
-                ignore_if_exists: true,
-                ..Default::default()
-            },
-        )
-        .await
-        .unwrap();
-
-        assert_eq!(
-            fs.files(),
-            vec![
-                PathBuf::from(path!("/outer/inner1/a")),
-                PathBuf::from(path!("/outer/inner1/b")),
-                PathBuf::from(path!("/outer/inner2/c")),
-                PathBuf::from(path!("/outer/inner1/outer/inner1/a")),
-                PathBuf::from(path!("/outer/inner1/outer/inner1/b")),
-                PathBuf::from(path!("/outer/inner1/outer/inner2/c")),
-                PathBuf::from(path!("/outer/inner1/outer/inner1/outer/inner1/a")),
-            ]
-        );
-        assert_eq!(
-            fs.load(path!("/outer/inner1/outer/inner1/a").as_ref())
-                .await
-                .unwrap(),
-            "B"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_realfs_atomic_write(executor: BackgroundExecutor) {
-        // With the file handle still open, the file should be replaced
-        // https://github.com/zed-industries/zed/issues/30054
-        let fs = RealFs {
-            bundled_git_binary_path: None,
-            executor,
-            next_job_id: Arc::new(AtomicUsize::new(0)),
-            job_event_subscribers: Arc::new(Mutex::new(Vec::new())),
-        };
-        let temp_dir = TempDir::new().unwrap();
-        let file_to_be_replaced = temp_dir.path().join("file.txt");
-        let mut file = std::fs::File::create_new(&file_to_be_replaced).unwrap();
-        file.write_all(b"Hello").unwrap();
-        // drop(file);  // We still hold the file handle here
-        let content = std::fs::read_to_string(&file_to_be_replaced).unwrap();
-        assert_eq!(content, "Hello");
-        smol::block_on(fs.atomic_write(file_to_be_replaced.clone(), "World".into())).unwrap();
-        let content = std::fs::read_to_string(&file_to_be_replaced).unwrap();
-        assert_eq!(content, "World");
-    }
-
-    #[gpui::test]
-    async fn test_realfs_atomic_write_non_existing_file(executor: BackgroundExecutor) {
-        let fs = RealFs {
-            bundled_git_binary_path: None,
-            executor,
-            next_job_id: Arc::new(AtomicUsize::new(0)),
-            job_event_subscribers: Arc::new(Mutex::new(Vec::new())),
-        };
-        let temp_dir = TempDir::new().unwrap();
-        let file_to_be_replaced = temp_dir.path().join("file.txt");
-        smol::block_on(fs.atomic_write(file_to_be_replaced.clone(), "Hello".into())).unwrap();
-        let content = std::fs::read_to_string(&file_to_be_replaced).unwrap();
-        assert_eq!(content, "Hello");
-    }
-
-    #[gpui::test]
-    async fn test_rename(executor: BackgroundExecutor) {
-        let fs = FakeFs::new(executor.clone());
-        fs.insert_tree(
-            path!("/root"),
-            json!({
-                "src": {
-                    "file_a.txt": "content a",
-                    "file_b.txt": "content b"
-                }
-            }),
-        )
-        .await;
-
-        fs.rename(
-            Path::new(path!("/root/src/file_a.txt")),
-            Path::new(path!("/root/src/new/renamed_a.txt")),
-            RenameOptions {
-                create_parents: true,
-                ..Default::default()
-            },
-        )
-        .await
-        .unwrap();
-
-        // Assert that the `file_a.txt` file was being renamed and moved to a
-        // different directory that did not exist before.
-        assert_eq!(
-            fs.files(),
-            vec![
-                PathBuf::from(path!("/root/src/file_b.txt")),
-                PathBuf::from(path!("/root/src/new/renamed_a.txt")),
-            ]
-        );
-
-        let result = fs
-            .rename(
-                Path::new(path!("/root/src/file_b.txt")),
-                Path::new(path!("/root/src/old/renamed_b.txt")),
-                RenameOptions {
-                    create_parents: false,
-                    ..Default::default()
-                },
-            )
-            .await;
-
-        // Assert that the `file_b.txt` file was not renamed nor moved, as
-        // `create_parents` was set to `false`.
-        // different directory that did not exist before.
-        assert!(result.is_err());
-        assert_eq!(
-            fs.files(),
-            vec![
-                PathBuf::from(path!("/root/src/file_b.txt")),
-                PathBuf::from(path!("/root/src/new/renamed_a.txt")),
-            ]
-        );
-    }
-}
diff --git a/crates/fs/src/fs_watcher.rs b/crates/fs/src/fs_watcher.rs
deleted file mode 100644
index 18d5dbeeb9..0000000000
--- a/crates/fs/src/fs_watcher.rs
+++ /dev/null
@@ -1,265 +0,0 @@
-use notify::EventKind;
-use parking_lot::Mutex;
-use std::{
-    collections::{BTreeMap, HashMap},
-    ops::DerefMut,
-    sync::{Arc, OnceLock},
-};
-use util::{ResultExt, paths::SanitizedPath};
-
-use crate::{PathEvent, PathEventKind, Watcher};
-
-pub struct FsWatcher {
-    tx: smol::channel::Sender<()>,
-    pending_path_events: Arc<Mutex<Vec<PathEvent>>>,
-    registrations: Mutex<BTreeMap<Arc<std::path::Path>, WatcherRegistrationId>>,
-}
-
-impl FsWatcher {
-    pub fn new(
-        tx: smol::channel::Sender<()>,
-        pending_path_events: Arc<Mutex<Vec<PathEvent>>>,
-    ) -> Self {
-        Self {
-            tx,
-            pending_path_events,
-            registrations: Default::default(),
-        }
-    }
-}
-
-impl Drop for FsWatcher {
-    fn drop(&mut self) {
-        let mut registrations = BTreeMap::new();
-        {
-            let old = &mut self.registrations.lock();
-            std::mem::swap(old.deref_mut(), &mut registrations);
-        }
-
-        let _ = global(|g| {
-            for (_, registration) in registrations {
-                g.remove(registration);
-            }
-        });
-    }
-}
-
-impl Watcher for FsWatcher {
-    fn add(&self, path: &std::path::Path) -> anyhow::Result<()> {
-        log::trace!("watcher add: {path:?}");
-        let tx = self.tx.clone();
-        let pending_paths = self.pending_path_events.clone();
-
-        #[cfg(target_os = "windows")]
-        {
-            // Return early if an ancestor of this path was already being watched.
-            // saves a huge amount of memory
-            if let Some((watched_path, _)) = self
-                .registrations
-                .lock()
-                .range::<std::path::Path, _>((
-                    std::ops::Bound::Unbounded,
-                    std::ops::Bound::Included(path),
-                ))
-                .next_back()
-                && path.starts_with(watched_path.as_ref())
-            {
-                log::trace!(
-                    "path to watch is covered by existing registration: {path:?}, {watched_path:?}"
-                );
-                return Ok(());
-            }
-        }
-        #[cfg(target_os = "linux")]
-        {
-            if self.registrations.lock().contains_key(path) {
-                log::trace!("path to watch is already watched: {path:?}");
-                return Ok(());
-            }
-        }
-
-        let root_path = SanitizedPath::new_arc(path);
-        let path: Arc<std::path::Path> = path.into();
-
-        #[cfg(target_os = "windows")]
-        let mode = notify::RecursiveMode::Recursive;
-        #[cfg(target_os = "linux")]
-        let mode = notify::RecursiveMode::NonRecursive;
-
-        let registration_id = global({
-            let path = path.clone();
-            |g| {
-                g.add(path, mode, move |event: &notify::Event| {
-                    log::trace!("watcher received event: {event:?}");
-                    let kind = match event.kind {
-                        EventKind::Create(_) => Some(PathEventKind::Created),
-                        EventKind::Modify(_) => Some(PathEventKind::Changed),
-                        EventKind::Remove(_) => Some(PathEventKind::Removed),
-                        _ => None,
-                    };
-                    let mut path_events = event
-                        .paths
-                        .iter()
-                        .filter_map(|event_path| {
-                            let event_path = SanitizedPath::new(event_path);
-                            event_path.starts_with(&root_path).then(|| PathEvent {
-                                path: event_path.as_path().to_path_buf(),
-                                kind,
-                            })
-                        })
-                        .collect::<Vec<_>>();
-
-                    if !path_events.is_empty() {
-                        path_events.sort();
-                        let mut pending_paths = pending_paths.lock();
-                        if pending_paths.is_empty() {
-                            tx.try_send(()).ok();
-                        }
-                        util::extend_sorted(
-                            &mut *pending_paths,
-                            path_events,
-                            usize::MAX,
-                            |a, b| a.path.cmp(&b.path),
-                        );
-                    }
-                })
-            }
-        })??;
-
-        self.registrations.lock().insert(path, registration_id);
-
-        Ok(())
-    }
-
-    fn remove(&self, path: &std::path::Path) -> anyhow::Result<()> {
-        log::trace!("remove watched path: {path:?}");
-        let Some(registration) = self.registrations.lock().remove(path) else {
-            return Ok(());
-        };
-
-        global(|w| w.remove(registration))
-    }
-}
-
-#[derive(Default, Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub struct WatcherRegistrationId(u32);
-
-struct WatcherRegistrationState {
-    callback: Arc<dyn Fn(&notify::Event) + Send + Sync>,
-    path: Arc<std::path::Path>,
-}
-
-struct WatcherState {
-    watchers: HashMap<WatcherRegistrationId, WatcherRegistrationState>,
-    path_registrations: HashMap<Arc<std::path::Path>, u32>,
-    last_registration: WatcherRegistrationId,
-}
-
-pub struct GlobalWatcher {
-    state: Mutex<WatcherState>,
-
-    // DANGER: never keep the state lock while holding the watcher lock
-    // two mutexes because calling watcher.add triggers an watcher.event, which needs watchers.
-    #[cfg(target_os = "linux")]
-    watcher: Mutex<notify::INotifyWatcher>,
-    #[cfg(target_os = "freebsd")]
-    watcher: Mutex<notify::KqueueWatcher>,
-    #[cfg(target_os = "windows")]
-    watcher: Mutex<notify::ReadDirectoryChangesWatcher>,
-}
-
-impl GlobalWatcher {
-    #[must_use]
-    fn add(
-        &self,
-        path: Arc<std::path::Path>,
-        mode: notify::RecursiveMode,
-        cb: impl Fn(&notify::Event) + Send + Sync + 'static,
-    ) -> anyhow::Result<WatcherRegistrationId> {
-        use notify::Watcher;
-
-        self.watcher.lock().watch(&path, mode)?;
-
-        let mut state = self.state.lock();
-
-        let id = state.last_registration;
-        state.last_registration = WatcherRegistrationId(id.0 + 1);
-
-        let registration_state = WatcherRegistrationState {
-            callback: Arc::new(cb),
-            path: path.clone(),
-        };
-        state.watchers.insert(id, registration_state);
-        *state.path_registrations.entry(path).or_insert(0) += 1;
-
-        Ok(id)
-    }
-
-    pub fn remove(&self, id: WatcherRegistrationId) {
-        use notify::Watcher;
-        let mut state = self.state.lock();
-        let Some(registration_state) = state.watchers.remove(&id) else {
-            return;
-        };
-
-        let Some(count) = state.path_registrations.get_mut(&registration_state.path) else {
-            return;
-        };
-        *count -= 1;
-        if *count == 0 {
-            state.path_registrations.remove(&registration_state.path);
-
-            drop(state);
-            self.watcher
-                .lock()
-                .unwatch(&registration_state.path)
-                .log_err();
-        }
-    }
-}
-
-static FS_WATCHER_INSTANCE: OnceLock<anyhow::Result<GlobalWatcher, notify::Error>> =
-    OnceLock::new();
-
-fn handle_event(event: Result<notify::Event, notify::Error>) {
-    log::trace!("global handle event: {event:?}");
-    // Filter out access events, which could lead to a weird bug on Linux after upgrading notify
-    // https://github.com/zed-industries/zed/actions/runs/14085230504/job/39449448832
-    let Some(event) = event
-        .log_err()
-        .filter(|event| !matches!(event.kind, EventKind::Access(_)))
-    else {
-        return;
-    };
-    global::<()>(move |watcher| {
-        let callbacks = {
-            let state = watcher.state.lock();
-            state
-                .watchers
-                .values()
-                .map(|r| r.callback.clone())
-                .collect::<Vec<_>>()
-        };
-        for callback in callbacks {
-            callback(&event);
-        }
-    })
-    .log_err();
-}
-
-pub fn global<T>(f: impl FnOnce(&GlobalWatcher) -> T) -> anyhow::Result<T> {
-    let result = FS_WATCHER_INSTANCE.get_or_init(|| {
-        notify::recommended_watcher(handle_event).map(|file_watcher| GlobalWatcher {
-            state: Mutex::new(WatcherState {
-                watchers: Default::default(),
-                path_registrations: Default::default(),
-                last_registration: Default::default(),
-            }),
-            watcher: Mutex::new(file_watcher),
-        })
-    });
-    match result {
-        Ok(g) => Ok(f(g)),
-        Err(e) => Err(anyhow::anyhow!("{e}")),
-    }
-}
diff --git a/crates/fs/src/mac_watcher.rs b/crates/fs/src/mac_watcher.rs
deleted file mode 100644
index b781a231ba..0000000000
--- a/crates/fs/src/mac_watcher.rs
+++ /dev/null
@@ -1,77 +0,0 @@
-use crate::Watcher;
-use anyhow::{Context as _, Result};
-use collections::{BTreeMap, Bound};
-use fsevent::EventStream;
-use parking_lot::Mutex;
-use std::{
-    path::{Path, PathBuf},
-    sync::Weak,
-    thread,
-    time::Duration,
-};
-
-pub struct MacWatcher {
-    events_tx: smol::channel::Sender<Vec<fsevent::Event>>,
-    handles: Weak<Mutex<BTreeMap<PathBuf, fsevent::Handle>>>,
-    latency: Duration,
-}
-
-impl MacWatcher {
-    pub fn new(
-        events_tx: smol::channel::Sender<Vec<fsevent::Event>>,
-        handles: Weak<Mutex<BTreeMap<PathBuf, fsevent::Handle>>>,
-        latency: Duration,
-    ) -> Self {
-        Self {
-            events_tx,
-            handles,
-            latency,
-        }
-    }
-}
-
-impl Watcher for MacWatcher {
-    fn add(&self, path: &Path) -> Result<()> {
-        log::trace!("mac watcher add: {:?}", path);
-        let handles = self
-            .handles
-            .upgrade()
-            .context("unable to watch path, receiver dropped")?;
-        let mut handles = handles.lock();
-
-        // Return early if an ancestor of this path was already being watched.
-        if let Some((watched_path, _)) = handles
-            .range::<Path, _>((Bound::Unbounded, Bound::Included(path)))
-            .next_back()
-            && path.starts_with(watched_path)
-        {
-            log::trace!(
-                "mac watched path starts with existing watched path: {watched_path:?}, {path:?}"
-            );
-            return Ok(());
-        }
-
-        let (stream, handle) = EventStream::new(&[path], self.latency);
-        let tx = self.events_tx.clone();
-        thread::Builder::new()
-            .name("MacWatcher".to_owned())
-            .spawn(move || {
-                stream.run(move |events| smol::block_on(tx.send(events)).is_ok());
-            })
-            .unwrap();
-        handles.insert(path.into(), handle);
-
-        Ok(())
-    }
-
-    fn remove(&self, path: &Path) -> anyhow::Result<()> {
-        let handles = self
-            .handles
-            .upgrade()
-            .context("unable to remove path, receiver dropped")?;
-
-        let mut handles = handles.lock();
-        handles.remove(path);
-        Ok(())
-    }
-}
diff --git a/crates/fs_benchmarks/Cargo.toml b/crates/fs_benchmarks/Cargo.toml
deleted file mode 100644
index f207a2db3b..0000000000
--- a/crates/fs_benchmarks/Cargo.toml
+++ /dev/null
@@ -1,12 +0,0 @@
-[package]
-name = "fs_benchmarks"
-version = "0.1.0"
-publish.workspace = true
-edition.workspace = true
-
-[dependencies]
-fs.workspace = true
-gpui = {workspace = true, features = ["windows-manifest"]}
-
-[lints]
-workspace = true
diff --git a/crates/fs_benchmarks/LICENSE-GPL b/crates/fs_benchmarks/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/fs_benchmarks/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/fs_benchmarks/src/main.rs b/crates/fs_benchmarks/src/main.rs
deleted file mode 100644
index 12df32f076..0000000000
--- a/crates/fs_benchmarks/src/main.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-use fs::Fs;
-use gpui::{AppContext, Application};
-fn main() {
-    let Some(path_to_read) = std::env::args().nth(1) else {
-        println!("Expected path to read as 1st argument.");
-        return;
-    };
-
-    let _ = Application::headless().run(|cx| {
-        let fs = fs::RealFs::new(None, cx.background_executor().clone());
-        cx.background_spawn(async move {
-            let timer = std::time::Instant::now();
-            let result = fs.load_bytes(path_to_read.as_ref()).await;
-            let elapsed = timer.elapsed();
-            if let Err(e) = result {
-                println!("Failed `load_bytes` after {elapsed:?} with error `{e}`");
-            } else {
-                println!("Took {elapsed:?} to read {} bytes", result.unwrap().len());
-            };
-            let timer = std::time::Instant::now();
-            let result = fs.metadata(path_to_read.as_ref()).await;
-            let elapsed = timer.elapsed();
-            if let Err(e) = result {
-                println!("Failed `metadata` after {elapsed:?} with error `{e}`");
-            } else {
-                println!("Took {elapsed:?} to query metadata");
-            };
-            std::process::exit(0);
-        })
-        .detach();
-    });
-}
diff --git a/crates/fsevent/Cargo.toml b/crates/fsevent/Cargo.toml
deleted file mode 100644
index 635b36ebe1..0000000000
--- a/crates/fsevent/Cargo.toml
+++ /dev/null
@@ -1,28 +0,0 @@
-[package]
-name = "fsevent"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/fsevent.rs"
-doctest = false
-
-[dependencies]
-bitflags.workspace = true
-parking_lot.workspace = true
-log.workspace = true
-
-[target.'cfg(target_os = "macos")'.dependencies]
-core-foundation.workspace = true
-fsevent-sys = "3.0.2"
-
-[dev-dependencies]
-tempfile.workspace = true
-
-[package.metadata.docs.rs]
-targets = ["x86_64-apple-darwin"]
diff --git a/crates/fsevent/LICENSE-GPL b/crates/fsevent/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/fsevent/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/fsevent/examples/events.rs b/crates/fsevent/examples/events.rs
deleted file mode 100644
index bae9e73425..0000000000
--- a/crates/fsevent/examples/events.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-#[cfg(target_os = "macos")]
-fn main() {
-    use fsevent::EventStream;
-    use std::{env::args, path::Path, time::Duration};
-
-    let paths = args().skip(1).collect::<Vec<_>>();
-    let paths = paths.iter().map(Path::new).collect::<Vec<_>>();
-    assert!(!paths.is_empty(), "Must pass 1 or more paths as arguments");
-
-    let (stream, _handle) = EventStream::new(&paths, Duration::from_millis(100));
-    stream.run(|events| {
-        eprintln!("event batch");
-        for event in events {
-            eprintln!("  {:?}", event);
-        }
-        true
-    });
-}
-
-#[cfg(not(target_os = "macos"))]
-fn main() {
-    eprintln!("This example only works on macOS");
-}
diff --git a/crates/fsevent/src/fsevent.rs b/crates/fsevent/src/fsevent.rs
deleted file mode 100644
index 8af57c19ee..0000000000
--- a/crates/fsevent/src/fsevent.rs
+++ /dev/null
@@ -1,515 +0,0 @@
-#![cfg(target_os = "macos")]
-
-use bitflags::bitflags;
-use fsevent_sys::{self as fs, core_foundation as cf};
-use parking_lot::Mutex;
-use std::{
-    convert::AsRef,
-    ffi::{CStr, OsStr, c_void},
-    os::unix::ffi::OsStrExt,
-    path::{Path, PathBuf},
-    ptr, slice,
-    sync::Arc,
-    time::Duration,
-};
-
-#[derive(Clone, Debug)]
-pub struct Event {
-    pub event_id: u64,
-    pub flags: StreamFlags,
-    pub path: PathBuf,
-}
-
-pub struct EventStream {
-    lifecycle: Arc<Mutex<Lifecycle>>,
-    state: Box<State>,
-}
-
-struct State {
-    latency: Duration,
-    paths: cf::CFMutableArrayRef,
-    callback: Option<Box<dyn FnMut(Vec<Event>) -> bool>>,
-    last_valid_event_id: Option<fs::FSEventStreamEventId>,
-    stream: fs::FSEventStreamRef,
-}
-
-impl Drop for State {
-    fn drop(&mut self) {
-        unsafe {
-            cf::CFRelease(self.paths);
-            fs::FSEventStreamStop(self.stream);
-            fs::FSEventStreamInvalidate(self.stream);
-            fs::FSEventStreamRelease(self.stream);
-        }
-    }
-}
-
-enum Lifecycle {
-    New,
-    Running(cf::CFRunLoopRef),
-    Stopped,
-}
-
-pub struct Handle(Arc<Mutex<Lifecycle>>);
-
-unsafe impl Send for EventStream {}
-unsafe impl Send for Lifecycle {}
-
-impl EventStream {
-    pub fn new(paths: &[&Path], latency: Duration) -> (Self, Handle) {
-        unsafe {
-            let cf_paths =
-                cf::CFArrayCreateMutable(cf::kCFAllocatorDefault, 0, &cf::kCFTypeArrayCallBacks);
-            assert!(!cf_paths.is_null());
-
-            for path in paths {
-                let path_bytes = path.as_os_str().as_bytes();
-                let cf_url = cf::CFURLCreateFromFileSystemRepresentation(
-                    cf::kCFAllocatorDefault,
-                    path_bytes.as_ptr() as *const i8,
-                    path_bytes.len() as cf::CFIndex,
-                    false,
-                );
-                if !cf_url.is_null() {
-                    let cf_path = cf::CFURLCopyFileSystemPath(cf_url, cf::kCFURLPOSIXPathStyle);
-                    cf::CFArrayAppendValue(cf_paths, cf_path);
-                    cf::CFRelease(cf_path);
-                    cf::CFRelease(cf_url);
-                } else {
-                    log::error!("Failed to create CFURL for path: {}", path.display());
-                }
-            }
-
-            let mut state = Box::new(State {
-                latency,
-                paths: cf_paths,
-                callback: None,
-                last_valid_event_id: None,
-                stream: ptr::null_mut(),
-            });
-            let stream_context = fs::FSEventStreamContext {
-                version: 0,
-                info: state.as_ref() as *const _ as *mut c_void,
-                retain: None,
-                release: None,
-                copy_description: None,
-            };
-            let stream = fs::FSEventStreamCreate(
-                cf::kCFAllocatorDefault,
-                Self::trampoline,
-                &stream_context,
-                cf_paths,
-                FSEventsGetCurrentEventId(),
-                latency.as_secs_f64(),
-                fs::kFSEventStreamCreateFlagFileEvents
-                    | fs::kFSEventStreamCreateFlagNoDefer
-                    | fs::kFSEventStreamCreateFlagWatchRoot,
-            );
-            state.stream = stream;
-
-            let lifecycle = Arc::new(Mutex::new(Lifecycle::New));
-            (
-                EventStream {
-                    lifecycle: lifecycle.clone(),
-                    state,
-                },
-                Handle(lifecycle),
-            )
-        }
-    }
-
-    pub fn run<F>(mut self, f: F)
-    where
-        F: FnMut(Vec<Event>) -> bool + 'static,
-    {
-        self.state.callback = Some(Box::new(f));
-        unsafe {
-            let run_loop =
-                core_foundation::base::CFRetain(cf::CFRunLoopGetCurrent()) as *mut c_void;
-            {
-                let mut state = self.lifecycle.lock();
-                match *state {
-                    Lifecycle::New => *state = Lifecycle::Running(run_loop),
-                    Lifecycle::Running(_) => unreachable!(),
-                    Lifecycle::Stopped => return,
-                }
-            }
-            fs::FSEventStreamScheduleWithRunLoop(
-                self.state.stream,
-                run_loop,
-                cf::kCFRunLoopDefaultMode,
-            );
-            fs::FSEventStreamStart(self.state.stream);
-            cf::CFRunLoopRun();
-        }
-    }
-
-    extern "C" fn trampoline(
-        stream_ref: fs::FSEventStreamRef,
-        info: *mut ::std::os::raw::c_void,
-        num: usize,                                 // size_t numEvents
-        event_paths: *mut ::std::os::raw::c_void,   // void *eventPaths
-        event_flags: *const ::std::os::raw::c_void, // const FSEventStreamEventFlags eventFlags[]
-        event_ids: *const ::std::os::raw::c_void,   // const FSEventStreamEventId eventIds[]
-    ) {
-        unsafe {
-            let event_paths = event_paths as *const *const ::std::os::raw::c_char;
-            let e_ptr = event_flags as *mut u32;
-            let i_ptr = event_ids as *mut u64;
-            let state = (info as *mut State).as_mut().unwrap();
-            let callback = if let Some(callback) = state.callback.as_mut() {
-                callback
-            } else {
-                return;
-            };
-
-            let paths = slice::from_raw_parts(event_paths, num);
-            let flags = slice::from_raw_parts_mut(e_ptr, num);
-            let ids = slice::from_raw_parts_mut(i_ptr, num);
-            let mut stream_restarted = false;
-
-            // Sometimes FSEvents reports a "dropped" event, an indication that either the kernel
-            // or our code couldn't keep up with the sheer volume of file-system events that were
-            // generated. If we observed a valid event before this happens, we'll try to read the
-            // file-system journal by stopping the current stream and creating a new one starting at
-            // such event. Otherwise, we'll let invoke the callback with the dropped event, which
-            // will likely perform a re-scan of one of the root directories.
-            if flags
-                .iter()
-                .copied()
-                .filter_map(StreamFlags::from_bits)
-                .any(|flags| {
-                    flags.contains(StreamFlags::USER_DROPPED)
-                        || flags.contains(StreamFlags::KERNEL_DROPPED)
-                })
-                && let Some(last_valid_event_id) = state.last_valid_event_id.take()
-            {
-                fs::FSEventStreamStop(state.stream);
-                fs::FSEventStreamInvalidate(state.stream);
-                fs::FSEventStreamRelease(state.stream);
-
-                let stream_context = fs::FSEventStreamContext {
-                    version: 0,
-                    info,
-                    retain: None,
-                    release: None,
-                    copy_description: None,
-                };
-                let stream = fs::FSEventStreamCreate(
-                    cf::kCFAllocatorDefault,
-                    Self::trampoline,
-                    &stream_context,
-                    state.paths,
-                    last_valid_event_id,
-                    state.latency.as_secs_f64(),
-                    fs::kFSEventStreamCreateFlagFileEvents
-                        | fs::kFSEventStreamCreateFlagNoDefer
-                        | fs::kFSEventStreamCreateFlagWatchRoot,
-                );
-
-                state.stream = stream;
-                fs::FSEventStreamScheduleWithRunLoop(
-                    state.stream,
-                    cf::CFRunLoopGetCurrent(),
-                    cf::kCFRunLoopDefaultMode,
-                );
-                fs::FSEventStreamStart(state.stream);
-                stream_restarted = true;
-            }
-
-            if !stream_restarted {
-                let mut events = Vec::with_capacity(num);
-                for p in 0..num {
-                    if let Some(flag) = StreamFlags::from_bits(flags[p]) {
-                        if !flag.contains(StreamFlags::HISTORY_DONE) {
-                            let path_c_str = CStr::from_ptr(paths[p]);
-                            let path = PathBuf::from(OsStr::from_bytes(path_c_str.to_bytes()));
-                            let event = Event {
-                                event_id: ids[p],
-                                flags: flag,
-                                path,
-                            };
-                            state.last_valid_event_id = Some(event.event_id);
-                            events.push(event);
-                        }
-                    } else {
-                        debug_assert!(false, "unknown flag set for fs event: {}", flags[p]);
-                    }
-                }
-
-                if !events.is_empty() && !callback(events) {
-                    fs::FSEventStreamStop(stream_ref);
-                    cf::CFRunLoopStop(cf::CFRunLoopGetCurrent());
-                }
-            }
-        }
-    }
-}
-
-impl Drop for Handle {
-    fn drop(&mut self) {
-        let mut state = self.0.lock();
-        if let Lifecycle::Running(run_loop) = *state {
-            unsafe {
-                cf::CFRunLoopStop(run_loop);
-                cf::CFRelease(run_loop)
-            }
-        }
-        *state = Lifecycle::Stopped;
-    }
-}
-
-// Synchronize with
-// /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/FSEvents.framework/Versions/A/Headers/FSEvents.h
-bitflags! {
-    #[derive(Debug, PartialEq, Eq, Clone, Copy)]
-  #[repr(C)]
-  pub struct StreamFlags: u32 {
-    const NONE = 0x00000000;
-    const MUST_SCAN_SUBDIRS = 0x00000001;
-    const USER_DROPPED = 0x00000002;
-    const KERNEL_DROPPED = 0x00000004;
-    const IDS_WRAPPED = 0x00000008;
-    const HISTORY_DONE = 0x00000010;
-    const ROOT_CHANGED = 0x00000020;
-    const MOUNT = 0x00000040;
-    const UNMOUNT = 0x00000080;
-    const ITEM_CREATED = 0x00000100;
-    const ITEM_REMOVED = 0x00000200;
-    const INODE_META_MOD = 0x00000400;
-    const ITEM_RENAMED = 0x00000800;
-    const ITEM_MODIFIED = 0x00001000;
-    const FINDER_INFO_MOD = 0x00002000;
-    const ITEM_CHANGE_OWNER = 0x00004000;
-    const ITEM_XATTR_MOD = 0x00008000;
-    const IS_FILE = 0x00010000;
-    const IS_DIR = 0x00020000;
-    const IS_SYMLINK = 0x00040000;
-    const OWN_EVENT = 0x00080000;
-    const IS_HARDLINK = 0x00100000;
-    const IS_LAST_HARDLINK = 0x00200000;
-    const ITEM_CLONED = 0x400000;
-  }
-}
-
-impl std::fmt::Display for StreamFlags {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        if self.contains(StreamFlags::MUST_SCAN_SUBDIRS) {
-            let _d = write!(f, "MUST_SCAN_SUBDIRS ");
-        }
-        if self.contains(StreamFlags::USER_DROPPED) {
-            let _d = write!(f, "USER_DROPPED ");
-        }
-        if self.contains(StreamFlags::KERNEL_DROPPED) {
-            let _d = write!(f, "KERNEL_DROPPED ");
-        }
-        if self.contains(StreamFlags::IDS_WRAPPED) {
-            let _d = write!(f, "IDS_WRAPPED ");
-        }
-        if self.contains(StreamFlags::HISTORY_DONE) {
-            let _d = write!(f, "HISTORY_DONE ");
-        }
-        if self.contains(StreamFlags::ROOT_CHANGED) {
-            let _d = write!(f, "ROOT_CHANGED ");
-        }
-        if self.contains(StreamFlags::MOUNT) {
-            let _d = write!(f, "MOUNT ");
-        }
-        if self.contains(StreamFlags::UNMOUNT) {
-            let _d = write!(f, "UNMOUNT ");
-        }
-        if self.contains(StreamFlags::ITEM_CREATED) {
-            let _d = write!(f, "ITEM_CREATED ");
-        }
-        if self.contains(StreamFlags::ITEM_REMOVED) {
-            let _d = write!(f, "ITEM_REMOVED ");
-        }
-        if self.contains(StreamFlags::INODE_META_MOD) {
-            let _d = write!(f, "INODE_META_MOD ");
-        }
-        if self.contains(StreamFlags::ITEM_RENAMED) {
-            let _d = write!(f, "ITEM_RENAMED ");
-        }
-        if self.contains(StreamFlags::ITEM_MODIFIED) {
-            let _d = write!(f, "ITEM_MODIFIED ");
-        }
-        if self.contains(StreamFlags::FINDER_INFO_MOD) {
-            let _d = write!(f, "FINDER_INFO_MOD ");
-        }
-        if self.contains(StreamFlags::ITEM_CHANGE_OWNER) {
-            let _d = write!(f, "ITEM_CHANGE_OWNER ");
-        }
-        if self.contains(StreamFlags::ITEM_XATTR_MOD) {
-            let _d = write!(f, "ITEM_XATTR_MOD ");
-        }
-        if self.contains(StreamFlags::IS_FILE) {
-            let _d = write!(f, "IS_FILE ");
-        }
-        if self.contains(StreamFlags::IS_DIR) {
-            let _d = write!(f, "IS_DIR ");
-        }
-        if self.contains(StreamFlags::IS_SYMLINK) {
-            let _d = write!(f, "IS_SYMLINK ");
-        }
-        if self.contains(StreamFlags::OWN_EVENT) {
-            let _d = write!(f, "OWN_EVENT ");
-        }
-        if self.contains(StreamFlags::IS_LAST_HARDLINK) {
-            let _d = write!(f, "IS_LAST_HARDLINK ");
-        }
-        if self.contains(StreamFlags::IS_HARDLINK) {
-            let _d = write!(f, "IS_HARDLINK ");
-        }
-        if self.contains(StreamFlags::ITEM_CLONED) {
-            let _d = write!(f, "ITEM_CLONED ");
-        }
-        write!(f, "")
-    }
-}
-
-#[link(name = "CoreServices", kind = "framework")]
-unsafe extern "C" {
-    pub fn FSEventsGetCurrentEventId() -> u64;
-}
-
-// These tests are disabled by default because they seem to be unresolvably flaky.
-// Feel free to bring them back to help test this code
-#[cfg(false)]
-mod tests {
-    use super::*;
-    use std::{fs, sync::mpsc, thread, time::Duration};
-
-    #[test]
-    fn test_event_stream_simple() {
-        for _ in 0..3 {
-            let dir = tempfile::Builder::new()
-                .prefix("test-event-stream")
-                .tempdir()
-                .unwrap();
-            let path = dir.path().canonicalize().unwrap();
-            for i in 0..10 {
-                fs::write(path.join(format!("existing-file-{}", i)), "").unwrap();
-            }
-            flush_historical_events();
-
-            let (tx, rx) = mpsc::channel();
-            let (stream, handle) = EventStream::new(&[&path], Duration::from_millis(50));
-            thread::spawn(move || stream.run(move |events| tx.send(events.to_vec()).is_ok()));
-
-            fs::write(path.join("new-file"), "").unwrap();
-            let events = rx.recv_timeout(timeout()).unwrap();
-            let event = events.last().unwrap();
-            assert_eq!(event.path, path.join("new-file"));
-            assert!(event.flags.contains(StreamFlags::ITEM_CREATED));
-
-            fs::remove_file(path.join("existing-file-5")).unwrap();
-            let mut events = rx.recv_timeout(timeout()).unwrap();
-            let mut event = events.last().unwrap();
-            // we see this duplicate about 1/100 test runs.
-            if event.path == path.join("new-file")
-                && event.flags.contains(StreamFlags::ITEM_CREATED)
-            {
-                events = rx.recv_timeout(timeout()).unwrap();
-                event = events.last().unwrap();
-            }
-            assert_eq!(event.path, path.join("existing-file-5"));
-            assert!(event.flags.contains(StreamFlags::ITEM_REMOVED));
-            drop(handle);
-        }
-    }
-
-    #[test]
-    fn test_event_stream_delayed_start() {
-        for _ in 0..3 {
-            let dir = tempfile::Builder::new()
-                .prefix("test-event-stream")
-                .tempdir()
-                .unwrap();
-            let path = dir.path().canonicalize().unwrap();
-            for i in 0..10 {
-                fs::write(path.join(format!("existing-file-{}", i)), "").unwrap();
-            }
-            flush_historical_events();
-
-            let (tx, rx) = mpsc::channel();
-            let (stream, handle) = EventStream::new(&[&path], Duration::from_millis(50));
-
-            // Delay the call to `run` in order to make sure we don't miss any events that occur
-            // between creating the `EventStream` and calling `run`.
-            thread::spawn(move || {
-                thread::sleep(Duration::from_millis(100));
-                stream.run(move |events| tx.send(events.to_vec()).is_ok())
-            });
-
-            fs::write(path.join("new-file"), "").unwrap();
-            let events = rx.recv_timeout(timeout()).unwrap();
-            let event = events.last().unwrap();
-            assert_eq!(event.path, path.join("new-file"));
-            assert!(event.flags.contains(StreamFlags::ITEM_CREATED));
-
-            fs::remove_file(path.join("existing-file-5")).unwrap();
-            let events = rx.recv_timeout(timeout()).unwrap();
-            let event = events.last().unwrap();
-            assert_eq!(event.path, path.join("existing-file-5"));
-            assert!(event.flags.contains(StreamFlags::ITEM_REMOVED));
-            drop(handle);
-        }
-    }
-
-    #[test]
-    fn test_event_stream_shutdown_by_dropping_handle() {
-        let dir = tempfile::Builder::new()
-            .prefix("test-event-stream")
-            .tempdir()
-            .unwrap();
-        let path = dir.path().canonicalize().unwrap();
-        flush_historical_events();
-
-        let (tx, rx) = mpsc::channel();
-        let (stream, handle) = EventStream::new(&[&path], Duration::from_millis(50));
-        thread::spawn(move || {
-            stream.run({
-                let tx = tx.clone();
-                move |_| {
-                    tx.send("running").unwrap();
-                    true
-                }
-            });
-            tx.send("stopped").unwrap();
-        });
-
-        fs::write(path.join("new-file"), "").unwrap();
-        assert_eq!(rx.recv_timeout(timeout()).unwrap(), "running");
-
-        // Dropping the handle causes `EventStream::run` to return.
-        drop(handle);
-        assert_eq!(rx.recv_timeout(timeout()).unwrap(), "stopped");
-    }
-
-    #[test]
-    fn test_event_stream_shutdown_before_run() {
-        let dir = tempfile::Builder::new()
-            .prefix("test-event-stream")
-            .tempdir()
-            .unwrap();
-        let path = dir.path().canonicalize().unwrap();
-
-        let (stream, handle) = EventStream::new(&[&path], Duration::from_millis(50));
-        drop(handle);
-
-        // This returns immediately because the handle was already dropped.
-        stream.run(|_| true);
-    }
-
-    fn flush_historical_events() {
-        thread::sleep(timeout());
-    }
-
-    fn timeout() -> Duration {
-        if std::env::var("CI").is_ok() {
-            Duration::from_secs(4)
-        } else {
-            Duration::from_millis(500)
-        }
-    }
-}
diff --git a/crates/fuzzy/Cargo.toml b/crates/fuzzy/Cargo.toml
deleted file mode 100644
index 7df2142fa1..0000000000
--- a/crates/fuzzy/Cargo.toml
+++ /dev/null
@@ -1,21 +0,0 @@
-[package]
-name = "fuzzy"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/fuzzy.rs"
-doctest = false
-
-[dependencies]
-gpui.workspace = true
-util.workspace = true
-log.workspace = true
-
-[dev-dependencies]
-util = {workspace = true, features = ["test-support"]}
diff --git a/crates/fuzzy/LICENSE-GPL b/crates/fuzzy/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/fuzzy/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/fuzzy/src/char_bag.rs b/crates/fuzzy/src/char_bag.rs
deleted file mode 100644
index 13b00816ed..0000000000
--- a/crates/fuzzy/src/char_bag.rs
+++ /dev/null
@@ -1,63 +0,0 @@
-use std::iter::FromIterator;
-
-#[derive(Copy, Clone, Debug, Default, PartialEq, Eq, Hash)]
-pub struct CharBag(u64);
-
-impl CharBag {
-    pub fn is_superset(self, other: CharBag) -> bool {
-        self.0 & other.0 == other.0
-    }
-
-    fn insert(&mut self, c: char) {
-        let c = c.to_ascii_lowercase();
-        if c.is_ascii_lowercase() {
-            let mut count = self.0;
-            let idx = c as u8 - b'a';
-            count >>= idx * 2;
-            count = ((count << 1) | 1) & 3;
-            count <<= idx * 2;
-            self.0 |= count;
-        } else if c.is_ascii_digit() {
-            let idx = c as u8 - b'0';
-            self.0 |= 1 << (idx + 52);
-        } else if c == '-' {
-            self.0 |= 1 << 62;
-        }
-    }
-}
-
-impl Extend<char> for CharBag {
-    fn extend<T: IntoIterator<Item = char>>(&mut self, iter: T) {
-        for c in iter {
-            self.insert(c);
-        }
-    }
-}
-
-impl FromIterator<char> for CharBag {
-    fn from_iter<T: IntoIterator<Item = char>>(iter: T) -> Self {
-        let mut result = Self::default();
-        result.extend(iter);
-        result
-    }
-}
-
-impl From<&str> for CharBag {
-    fn from(s: &str) -> Self {
-        let mut bag = Self(0);
-        for c in s.chars() {
-            bag.insert(c);
-        }
-        bag
-    }
-}
-
-impl From<&[char]> for CharBag {
-    fn from(chars: &[char]) -> Self {
-        let mut bag = Self(0);
-        for c in chars {
-            bag.insert(*c);
-        }
-        bag
-    }
-}
diff --git a/crates/fuzzy/src/fuzzy.rs b/crates/fuzzy/src/fuzzy.rs
deleted file mode 100644
index 2d8c318c9f..0000000000
--- a/crates/fuzzy/src/fuzzy.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-mod char_bag;
-mod matcher;
-mod paths;
-mod strings;
-
-pub use char_bag::CharBag;
-pub use paths::{
-    PathMatch, PathMatchCandidate, PathMatchCandidateSet, match_fixed_path_set, match_path_sets,
-};
-pub use strings::{StringMatch, StringMatchCandidate, match_strings};
diff --git a/crates/fuzzy/src/matcher.rs b/crates/fuzzy/src/matcher.rs
deleted file mode 100644
index 782c9caca8..0000000000
--- a/crates/fuzzy/src/matcher.rs
+++ /dev/null
@@ -1,611 +0,0 @@
-use std::{
-    borrow::Borrow,
-    collections::BTreeMap,
-    sync::atomic::{self, AtomicBool},
-};
-
-use crate::CharBag;
-
-const BASE_DISTANCE_PENALTY: f64 = 0.6;
-const ADDITIONAL_DISTANCE_PENALTY: f64 = 0.05;
-const MIN_DISTANCE_PENALTY: f64 = 0.2;
-
-// TODO:
-// Use `Path` instead of `&str` for paths.
-pub struct Matcher<'a> {
-    query: &'a [char],
-    lowercase_query: &'a [char],
-    query_char_bag: CharBag,
-    smart_case: bool,
-    penalize_length: bool,
-    min_score: f64,
-    match_positions: Vec<usize>,
-    last_positions: Vec<usize>,
-    score_matrix: Vec<Option<f64>>,
-    best_position_matrix: Vec<usize>,
-}
-
-pub trait MatchCandidate {
-    fn has_chars(&self, bag: CharBag) -> bool;
-    fn candidate_chars(&self) -> impl Iterator<Item = char>;
-}
-
-impl<'a> Matcher<'a> {
-    pub fn new(
-        query: &'a [char],
-        lowercase_query: &'a [char],
-        query_char_bag: CharBag,
-        smart_case: bool,
-        penalize_length: bool,
-    ) -> Self {
-        Self {
-            query,
-            lowercase_query,
-            query_char_bag,
-            min_score: 0.0,
-            last_positions: vec![0; lowercase_query.len()],
-            match_positions: vec![0; query.len()],
-            score_matrix: Vec::new(),
-            best_position_matrix: Vec::new(),
-            smart_case,
-            penalize_length,
-        }
-    }
-
-    /// Filter and score fuzzy match candidates. Results are returned unsorted, in the same order as
-    /// the input candidates.
-    pub(crate) fn match_candidates<C, R, F, T>(
-        &mut self,
-        prefix: &[char],
-        lowercase_prefix: &[char],
-        candidates: impl Iterator<Item = T>,
-        results: &mut Vec<R>,
-        cancel_flag: &AtomicBool,
-        build_match: F,
-    ) where
-        C: MatchCandidate,
-        T: Borrow<C>,
-        F: Fn(&C, f64, &Vec<usize>) -> R,
-    {
-        let mut candidate_chars = Vec::new();
-        let mut lowercase_candidate_chars = Vec::new();
-        let mut extra_lowercase_chars = BTreeMap::new();
-
-        for candidate in candidates {
-            if !candidate.borrow().has_chars(self.query_char_bag) {
-                continue;
-            }
-
-            if cancel_flag.load(atomic::Ordering::Acquire) {
-                break;
-            }
-
-            candidate_chars.clear();
-            lowercase_candidate_chars.clear();
-            extra_lowercase_chars.clear();
-            for (i, c) in candidate.borrow().candidate_chars().enumerate() {
-                candidate_chars.push(c);
-                let mut char_lowercased = c.to_lowercase().collect::<Vec<_>>();
-                if char_lowercased.len() > 1 {
-                    extra_lowercase_chars.insert(i, char_lowercased.len() - 1);
-                }
-                lowercase_candidate_chars.append(&mut char_lowercased);
-            }
-
-            if !self.find_last_positions(lowercase_prefix, &lowercase_candidate_chars) {
-                continue;
-            }
-
-            let matrix_len =
-                self.query.len() * (lowercase_prefix.len() + lowercase_candidate_chars.len());
-            self.score_matrix.clear();
-            self.score_matrix.resize(matrix_len, None);
-            self.best_position_matrix.clear();
-            self.best_position_matrix.resize(matrix_len, 0);
-
-            let score = self.score_match(
-                &candidate_chars,
-                &lowercase_candidate_chars,
-                prefix,
-                lowercase_prefix,
-                &extra_lowercase_chars,
-            );
-
-            if score > 0.0 {
-                results.push(build_match(
-                    candidate.borrow(),
-                    score,
-                    &self.match_positions,
-                ));
-            }
-        }
-    }
-
-    fn find_last_positions(
-        &mut self,
-        lowercase_prefix: &[char],
-        lowercase_candidate: &[char],
-    ) -> bool {
-        let mut lowercase_prefix = lowercase_prefix.iter();
-        let mut lowercase_candidate = lowercase_candidate.iter();
-        for (i, char) in self.lowercase_query.iter().enumerate().rev() {
-            if let Some(j) = lowercase_candidate.rposition(|c| c == char) {
-                self.last_positions[i] = j + lowercase_prefix.len();
-            } else if let Some(j) = lowercase_prefix.rposition(|c| c == char) {
-                self.last_positions[i] = j;
-            } else {
-                return false;
-            }
-        }
-        true
-    }
-
-    fn score_match(
-        &mut self,
-        path: &[char],
-        path_lowercased: &[char],
-        prefix: &[char],
-        lowercase_prefix: &[char],
-        extra_lowercase_chars: &BTreeMap<usize, usize>,
-    ) -> f64 {
-        let score = self.recursive_score_match(
-            path,
-            path_lowercased,
-            prefix,
-            lowercase_prefix,
-            0,
-            0,
-            self.query.len() as f64,
-            extra_lowercase_chars,
-        ) * self.query.len() as f64;
-
-        if score <= 0.0 {
-            return 0.0;
-        }
-        let path_len = prefix.len() + path.len();
-        let mut cur_start = 0;
-        let mut byte_ix = 0;
-        let mut char_ix = 0;
-        for i in 0..self.query.len() {
-            let match_char_ix = self.best_position_matrix[i * path_len + cur_start];
-            while char_ix < match_char_ix {
-                let ch = prefix
-                    .get(char_ix)
-                    .or_else(|| path.get(char_ix - prefix.len()))
-                    .unwrap();
-                byte_ix += ch.len_utf8();
-                char_ix += 1;
-            }
-
-            self.match_positions[i] = byte_ix;
-
-            let matched_ch = prefix
-                .get(match_char_ix)
-                .or_else(|| path.get(match_char_ix - prefix.len()))
-                .unwrap();
-            byte_ix += matched_ch.len_utf8();
-
-            cur_start = match_char_ix + 1;
-            char_ix = match_char_ix + 1;
-        }
-
-        score
-    }
-
-    fn recursive_score_match(
-        &mut self,
-        path: &[char],
-        path_lowercased: &[char],
-        prefix: &[char],
-        lowercase_prefix: &[char],
-        query_idx: usize,
-        path_idx: usize,
-        cur_score: f64,
-        extra_lowercase_chars: &BTreeMap<usize, usize>,
-    ) -> f64 {
-        if query_idx == self.query.len() {
-            return 1.0;
-        }
-
-        let limit = self.last_positions[query_idx];
-        let max_valid_index = (prefix.len() + path_lowercased.len()).saturating_sub(1);
-        let safe_limit = limit.min(max_valid_index);
-
-        if path_idx > safe_limit {
-            return 0.0;
-        }
-
-        let path_len = prefix.len() + path.len();
-        if let Some(memoized) = self.score_matrix[query_idx * path_len + path_idx] {
-            return memoized;
-        }
-
-        let mut score = 0.0;
-        let mut best_position = 0;
-
-        let query_char = self.lowercase_query[query_idx];
-
-        let mut last_slash = 0;
-
-        for j in path_idx..=safe_limit {
-            let extra_lowercase_chars_count = extra_lowercase_chars
-                .iter()
-                .take_while(|&(&i, _)| i < j)
-                .map(|(_, increment)| increment)
-                .sum::<usize>();
-            let j_regular = j - extra_lowercase_chars_count;
-
-            let path_char = if j < prefix.len() {
-                lowercase_prefix[j]
-            } else {
-                let path_index = j - prefix.len();
-                match path_lowercased.get(path_index) {
-                    Some(&char) => char,
-                    None => continue,
-                }
-            };
-            let is_path_sep = path_char == '/';
-
-            if query_idx == 0 && is_path_sep {
-                last_slash = j_regular;
-            }
-            let need_to_score = query_char == path_char || (is_path_sep && query_char == '_');
-            if need_to_score {
-                let curr = match prefix.get(j_regular) {
-                    Some(&curr) => curr,
-                    None => path[j_regular - prefix.len()],
-                };
-
-                let mut char_score = 1.0;
-                if j > path_idx {
-                    let last = match prefix.get(j_regular - 1) {
-                        Some(&last) => last,
-                        None => path[j_regular - 1 - prefix.len()],
-                    };
-
-                    if last == '/' {
-                        char_score = 0.9;
-                    } else if (last == '-' || last == '_' || last == ' ' || last.is_numeric())
-                        || (last.is_lowercase() && curr.is_uppercase())
-                    {
-                        char_score = 0.8;
-                    } else if last == '.' {
-                        char_score = 0.7;
-                    } else if query_idx == 0 {
-                        char_score = BASE_DISTANCE_PENALTY;
-                    } else {
-                        char_score = MIN_DISTANCE_PENALTY.max(
-                            BASE_DISTANCE_PENALTY
-                                - (j - path_idx - 1) as f64 * ADDITIONAL_DISTANCE_PENALTY,
-                        );
-                    }
-                }
-
-                // Apply a severe penalty if the case doesn't match.
-                // This will make the exact matches have higher score than the case-insensitive and the
-                // path insensitive matches.
-                if (self.smart_case || curr == '/') && self.query[query_idx] != curr {
-                    char_score *= 0.001;
-                }
-
-                let mut multiplier = char_score;
-
-                // Scale the score based on how deep within the path we found the match.
-                if self.penalize_length && query_idx == 0 {
-                    multiplier /= ((prefix.len() + path.len()) - last_slash) as f64;
-                }
-
-                let mut next_score = 1.0;
-                if self.min_score > 0.0 {
-                    next_score = cur_score * multiplier;
-                    // Scores only decrease. If we can't pass the previous best, bail
-                    if next_score < self.min_score {
-                        // Ensure that score is non-zero so we use it in the memo table.
-                        if score == 0.0 {
-                            score = 1e-18;
-                        }
-                        continue;
-                    }
-                }
-
-                let new_score = self.recursive_score_match(
-                    path,
-                    path_lowercased,
-                    prefix,
-                    lowercase_prefix,
-                    query_idx + 1,
-                    j + 1,
-                    next_score,
-                    extra_lowercase_chars,
-                ) * multiplier;
-
-                if new_score > score {
-                    score = new_score;
-                    best_position = j_regular;
-                    // Optimization: can't score better than 1.
-                    if new_score == 1.0 {
-                        break;
-                    }
-                }
-            }
-        }
-
-        if best_position != 0 {
-            self.best_position_matrix[query_idx * path_len + path_idx] = best_position;
-        }
-
-        self.score_matrix[query_idx * path_len + path_idx] = Some(score);
-        score
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use util::rel_path::{RelPath, rel_path};
-
-    use crate::{PathMatch, PathMatchCandidate};
-
-    use super::*;
-    use std::sync::Arc;
-
-    #[test]
-    fn test_get_last_positions() {
-        let mut query: &[char] = &['d', 'c'];
-        let mut matcher = Matcher::new(query, query, query.into(), false, true);
-        let result = matcher.find_last_positions(&['a', 'b', 'c'], &['b', 'd', 'e', 'f']);
-        assert!(!result);
-
-        query = &['c', 'd'];
-        let mut matcher = Matcher::new(query, query, query.into(), false, true);
-        let result = matcher.find_last_positions(&['a', 'b', 'c'], &['b', 'd', 'e', 'f']);
-        assert!(result);
-        assert_eq!(matcher.last_positions, vec![2, 4]);
-
-        query = &['z', '/', 'z', 'f'];
-        let mut matcher = Matcher::new(query, query, query.into(), false, true);
-        let result = matcher.find_last_positions(&['z', 'e', 'd', '/'], &['z', 'e', 'd', '/', 'f']);
-        assert!(result);
-        assert_eq!(matcher.last_positions, vec![0, 3, 4, 8]);
-    }
-
-    #[test]
-    fn test_match_path_entries() {
-        let paths = vec![
-            "",
-            "a",
-            "ab",
-            "abC",
-            "abcd",
-            "alphabravocharlie",
-            "AlphaBravoCharlie",
-            "thisisatestdir",
-            "ThisIsATestDir",
-            "this/is/a/test/dir",
-            "test/tiatd",
-        ];
-
-        assert_eq!(
-            match_single_path_query("abc", false, &paths),
-            vec![
-                ("abC", vec![0, 1, 2]),
-                ("abcd", vec![0, 1, 2]),
-                ("AlphaBravoCharlie", vec![0, 5, 10]),
-                ("alphabravocharlie", vec![4, 5, 10]),
-            ]
-        );
-        assert_eq!(
-            match_single_path_query("t/i/a/t/d", false, &paths),
-            vec![("this/is/a/test/dir", vec![0, 4, 5, 7, 8, 9, 10, 14, 15]),]
-        );
-
-        assert_eq!(
-            match_single_path_query("tiatd", false, &paths),
-            vec![
-                ("test/tiatd", vec![5, 6, 7, 8, 9]),
-                ("ThisIsATestDir", vec![0, 4, 6, 7, 11]),
-                ("this/is/a/test/dir", vec![0, 5, 8, 10, 15]),
-                ("thisisatestdir", vec![0, 2, 6, 7, 11]),
-            ]
-        );
-    }
-
-    #[test]
-    fn test_lowercase_longer_than_uppercase() {
-        // This character has more chars in lower-case than in upper-case.
-        let paths = vec!["\u{0130}"];
-        let query = "\u{0130}";
-        assert_eq!(
-            match_single_path_query(query, false, &paths),
-            vec![("\u{0130}", vec![0])]
-        );
-
-        // Path is the lower-case version of the query
-        let paths = vec!["i\u{307}"];
-        let query = "\u{0130}";
-        assert_eq!(
-            match_single_path_query(query, false, &paths),
-            vec![("i\u{307}", vec![0])]
-        );
-    }
-
-    #[test]
-    fn test_match_multibyte_path_entries() {
-        let paths = vec![
-            "aαbβ/cγdδ",
-            "αβγδ/bcde",
-            "c1️⃣2️⃣3️⃣/d4️⃣5️⃣6️⃣/e7️⃣8️⃣9️⃣/f",
-            "d/🆒/h",
-        ];
-        assert_eq!("1️⃣".len(), 7);
-        assert_eq!(
-            match_single_path_query("bcd", false, &paths),
-            vec![
-                ("αβγδ/bcde", vec![9, 10, 11]),
-                ("aαbβ/cγdδ", vec![3, 7, 10]),
-            ]
-        );
-        assert_eq!(
-            match_single_path_query("cde", false, &paths),
-            vec![
-                ("αβγδ/bcde", vec![10, 11, 12]),
-                ("c1️⃣2️⃣3️⃣/d4️⃣5️⃣6️⃣/e7️⃣8️⃣9️⃣/f", vec![0, 23, 46]),
-            ]
-        );
-    }
-
-    #[test]
-    fn match_unicode_path_entries() {
-        let mixed_unicode_paths = vec![
-            "İolu/oluş",
-            "İstanbul/code",
-            "Athens/Şanlıurfa",
-            "Çanakkale/scripts",
-            "paris/Düzce_İl",
-            "Berlin_Önemli_Ğündem",
-            "KİTAPLIK/london/dosya",
-            "tokyo/kyoto/fuji",
-            "new_york/san_francisco",
-        ];
-
-        assert_eq!(
-            match_single_path_query("İo/oluş", false, &mixed_unicode_paths),
-            vec![("İolu/oluş", vec![0, 2, 4, 6, 8, 10, 12])]
-        );
-
-        assert_eq!(
-            match_single_path_query("İst/code", false, &mixed_unicode_paths),
-            vec![("İstanbul/code", vec![0, 2, 4, 6, 8, 10, 12, 14])]
-        );
-
-        assert_eq!(
-            match_single_path_query("athens/şa", false, &mixed_unicode_paths),
-            vec![("Athens/Şanlıurfa", vec![0, 1, 2, 3, 4, 5, 6, 7, 9])]
-        );
-
-        assert_eq!(
-            match_single_path_query("BerlinÖĞ", false, &mixed_unicode_paths),
-            vec![("Berlin_Önemli_Ğündem", vec![0, 1, 2, 3, 4, 5, 7, 15])]
-        );
-
-        assert_eq!(
-            match_single_path_query("tokyo/fuji", false, &mixed_unicode_paths),
-            vec![("tokyo/kyoto/fuji", vec![0, 1, 2, 3, 4, 5, 12, 13, 14, 15])]
-        );
-
-        let mixed_script_paths = vec![
-            "résumé_Москва",
-            "naïve_київ_implementation",
-            "café_北京_app",
-            "東京_über_driver",
-            "déjà_vu_cairo",
-            "seoul_piñata_game",
-            "voilà_istanbul_result",
-        ];
-
-        assert_eq!(
-            match_single_path_query("résmé", false, &mixed_script_paths),
-            vec![("résumé_Москва", vec![0, 1, 3, 5, 6])]
-        );
-
-        assert_eq!(
-            match_single_path_query("café北京", false, &mixed_script_paths),
-            vec![("café_北京_app", vec![0, 1, 2, 3, 6, 9])]
-        );
-
-        assert_eq!(
-            match_single_path_query("ista", false, &mixed_script_paths),
-            vec![("voilà_istanbul_result", vec![7, 8, 9, 10])]
-        );
-
-        let complex_paths = vec![
-            "document_📚_library",
-            "project_👨‍👩‍👧‍👦_family",
-            "flags_🇯🇵🇺🇸🇪🇺_world",
-            "code_😀😃😄😁_happy",
-            "photo_👩‍👩‍👧‍👦_album",
-        ];
-
-        assert_eq!(
-            match_single_path_query("doc📚lib", false, &complex_paths),
-            vec![("document_📚_library", vec![0, 1, 2, 9, 14, 15, 16])]
-        );
-
-        assert_eq!(
-            match_single_path_query("codehappy", false, &complex_paths),
-            vec![("code_😀😃😄😁_happy", vec![0, 1, 2, 3, 22, 23, 24, 25, 26])]
-        );
-    }
-
-    fn match_single_path_query<'a>(
-        query: &str,
-        smart_case: bool,
-        paths: &[&'a str],
-    ) -> Vec<(&'a str, Vec<usize>)> {
-        let lowercase_query = query.to_lowercase().chars().collect::<Vec<_>>();
-        let query = query.chars().collect::<Vec<_>>();
-        let query_chars = CharBag::from(&lowercase_query[..]);
-
-        let path_arcs: Vec<Arc<RelPath>> = paths
-            .iter()
-            .map(|path| Arc::from(rel_path(path)))
-            .collect::<Vec<_>>();
-        let mut path_entries = Vec::new();
-        for (i, path) in paths.iter().enumerate() {
-            let lowercase_path = path.to_lowercase().chars().collect::<Vec<_>>();
-            let char_bag = CharBag::from(lowercase_path.as_slice());
-            path_entries.push(PathMatchCandidate {
-                is_dir: false,
-                char_bag,
-                path: &path_arcs[i],
-            });
-        }
-
-        let mut matcher = Matcher::new(&query, &lowercase_query, query_chars, smart_case, true);
-
-        let cancel_flag = AtomicBool::new(false);
-        let mut results = Vec::new();
-
-        matcher.match_candidates(
-            &[],
-            &[],
-            path_entries.into_iter(),
-            &mut results,
-            &cancel_flag,
-            |candidate, score, positions| PathMatch {
-                score,
-                worktree_id: 0,
-                positions: positions.clone(),
-                path: candidate.path.into(),
-                path_prefix: RelPath::empty().into(),
-                distance_to_relative_ancestor: usize::MAX,
-                is_dir: false,
-            },
-        );
-        results.sort_by(|a, b| b.cmp(a));
-
-        results
-            .into_iter()
-            .map(|result| {
-                (
-                    paths
-                        .iter()
-                        .copied()
-                        .find(|p| result.path.as_ref() == rel_path(p))
-                        .unwrap(),
-                    result.positions,
-                )
-            })
-            .collect()
-    }
-
-    /// Test for https://github.com/zed-industries/zed/issues/44324
-    #[test]
-    fn test_recursive_score_match_index_out_of_bounds() {
-        let paths = vec!["İ/İ/İ/İ"];
-        let query = "İ/İ";
-
-        // This panicked with "index out of bounds: the len is 21 but the index is 22"
-        let result = match_single_path_query(query, false, &paths);
-        let _ = result;
-    }
-}
diff --git a/crates/fuzzy/src/paths.rs b/crates/fuzzy/src/paths.rs
deleted file mode 100644
index cce0e08284..0000000000
--- a/crates/fuzzy/src/paths.rs
+++ /dev/null
@@ -1,291 +0,0 @@
-use gpui::BackgroundExecutor;
-use std::{
-    cmp::{self, Ordering},
-    sync::{
-        Arc,
-        atomic::{self, AtomicBool},
-    },
-};
-use util::{paths::PathStyle, rel_path::RelPath};
-
-use crate::{
-    CharBag,
-    matcher::{MatchCandidate, Matcher},
-};
-
-#[derive(Clone, Debug)]
-pub struct PathMatchCandidate<'a> {
-    pub is_dir: bool,
-    pub path: &'a RelPath,
-    pub char_bag: CharBag,
-}
-
-#[derive(Clone, Debug)]
-pub struct PathMatch {
-    pub score: f64,
-    pub positions: Vec<usize>,
-    pub worktree_id: usize,
-    pub path: Arc<RelPath>,
-    pub path_prefix: Arc<RelPath>,
-    pub is_dir: bool,
-    /// Number of steps removed from a shared parent with the relative path
-    /// Used to order closer paths first in the search list
-    pub distance_to_relative_ancestor: usize,
-}
-
-pub trait PathMatchCandidateSet<'a>: Send + Sync {
-    type Candidates: Iterator<Item = PathMatchCandidate<'a>>;
-    fn id(&self) -> usize;
-    fn len(&self) -> usize;
-    fn is_empty(&self) -> bool {
-        self.len() == 0
-    }
-    fn root_is_file(&self) -> bool;
-    fn prefix(&self) -> Arc<RelPath>;
-    fn candidates(&'a self, start: usize) -> Self::Candidates;
-    fn path_style(&self) -> PathStyle;
-}
-
-impl<'a> MatchCandidate for PathMatchCandidate<'a> {
-    fn has_chars(&self, bag: CharBag) -> bool {
-        self.char_bag.is_superset(bag)
-    }
-
-    fn candidate_chars(&self) -> impl Iterator<Item = char> {
-        self.path.as_unix_str().chars()
-    }
-}
-
-impl PartialEq for PathMatch {
-    fn eq(&self, other: &Self) -> bool {
-        self.cmp(other).is_eq()
-    }
-}
-
-impl Eq for PathMatch {}
-
-impl PartialOrd for PathMatch {
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-impl Ord for PathMatch {
-    fn cmp(&self, other: &Self) -> Ordering {
-        self.score
-            .partial_cmp(&other.score)
-            .unwrap_or(Ordering::Equal)
-            .then_with(|| self.worktree_id.cmp(&other.worktree_id))
-            .then_with(|| {
-                other
-                    .distance_to_relative_ancestor
-                    .cmp(&self.distance_to_relative_ancestor)
-            })
-            .then_with(|| self.path.cmp(&other.path))
-    }
-}
-
-pub fn match_fixed_path_set(
-    candidates: Vec<PathMatchCandidate>,
-    worktree_id: usize,
-    worktree_root_name: Option<Arc<RelPath>>,
-    query: &str,
-    smart_case: bool,
-    max_results: usize,
-    path_style: PathStyle,
-) -> Vec<PathMatch> {
-    let lowercase_query = query.to_lowercase().chars().collect::<Vec<_>>();
-    let query = query.chars().collect::<Vec<_>>();
-    let query_char_bag = CharBag::from(&lowercase_query[..]);
-
-    let mut matcher = Matcher::new(&query, &lowercase_query, query_char_bag, smart_case, true);
-
-    let mut results = Vec::with_capacity(candidates.len());
-    let (path_prefix, path_prefix_chars, lowercase_prefix) = match worktree_root_name {
-        Some(worktree_root_name) => {
-            let mut path_prefix_chars = worktree_root_name
-                .display(path_style)
-                .chars()
-                .collect::<Vec<_>>();
-            path_prefix_chars.extend(path_style.primary_separator().chars());
-            let lowercase_pfx = path_prefix_chars
-                .iter()
-                .map(|c| c.to_ascii_lowercase())
-                .collect::<Vec<_>>();
-
-            (worktree_root_name, path_prefix_chars, lowercase_pfx)
-        }
-        None => (
-            RelPath::empty().into(),
-            Default::default(),
-            Default::default(),
-        ),
-    };
-
-    matcher.match_candidates(
-        &path_prefix_chars,
-        &lowercase_prefix,
-        candidates.into_iter(),
-        &mut results,
-        &AtomicBool::new(false),
-        |candidate, score, positions| PathMatch {
-            score,
-            worktree_id,
-            positions: positions.clone(),
-            is_dir: candidate.is_dir,
-            path: candidate.path.into(),
-            path_prefix: path_prefix.clone(),
-            distance_to_relative_ancestor: usize::MAX,
-        },
-    );
-    util::truncate_to_bottom_n_sorted_by(&mut results, max_results, &|a, b| b.cmp(a));
-    results
-}
-
-pub async fn match_path_sets<'a, Set: PathMatchCandidateSet<'a>>(
-    candidate_sets: &'a [Set],
-    query: &str,
-    relative_to: &Option<Arc<RelPath>>,
-    smart_case: bool,
-    max_results: usize,
-    cancel_flag: &AtomicBool,
-    executor: BackgroundExecutor,
-) -> Vec<PathMatch> {
-    let path_count: usize = candidate_sets.iter().map(|s| s.len()).sum();
-    if path_count == 0 {
-        return Vec::new();
-    }
-
-    let path_style = candidate_sets[0].path_style();
-
-    let query = query
-        .chars()
-        .map(|char| {
-            if path_style.is_windows() && char == '\\' {
-                '/'
-            } else {
-                char
-            }
-        })
-        .collect::<Vec<_>>();
-
-    let lowercase_query = query
-        .iter()
-        .map(|query| query.to_ascii_lowercase())
-        .collect::<Vec<_>>();
-
-    let query = &query;
-    let lowercase_query = &lowercase_query;
-    let query_char_bag = CharBag::from_iter(lowercase_query.iter().copied());
-
-    let num_cpus = executor.num_cpus().min(path_count);
-    let segment_size = path_count.div_ceil(num_cpus);
-    let mut segment_results = (0..num_cpus)
-        .map(|_| Vec::with_capacity(max_results))
-        .collect::<Vec<_>>();
-
-    executor
-        .scoped(|scope| {
-            for (segment_idx, results) in segment_results.iter_mut().enumerate() {
-                scope.spawn(async move {
-                    let segment_start = segment_idx * segment_size;
-                    let segment_end = segment_start + segment_size;
-                    let mut matcher =
-                        Matcher::new(query, lowercase_query, query_char_bag, smart_case, true);
-
-                    let mut tree_start = 0;
-                    for candidate_set in candidate_sets {
-                        if cancel_flag.load(atomic::Ordering::Acquire) {
-                            break;
-                        }
-
-                        let tree_end = tree_start + candidate_set.len();
-
-                        if tree_start < segment_end && segment_start < tree_end {
-                            let start = cmp::max(tree_start, segment_start) - tree_start;
-                            let end = cmp::min(tree_end, segment_end) - tree_start;
-                            let candidates = candidate_set.candidates(start).take(end - start);
-
-                            let worktree_id = candidate_set.id();
-                            let mut prefix = candidate_set
-                                .prefix()
-                                .as_unix_str()
-                                .chars()
-                                .collect::<Vec<_>>();
-                            if !candidate_set.root_is_file() && !prefix.is_empty() {
-                                prefix.push('/');
-                            }
-                            let lowercase_prefix = prefix
-                                .iter()
-                                .map(|c| c.to_ascii_lowercase())
-                                .collect::<Vec<_>>();
-                            matcher.match_candidates(
-                                &prefix,
-                                &lowercase_prefix,
-                                candidates,
-                                results,
-                                cancel_flag,
-                                |candidate, score, positions| PathMatch {
-                                    score,
-                                    worktree_id,
-                                    positions: positions.clone(),
-                                    path: Arc::from(candidate.path),
-                                    is_dir: candidate.is_dir,
-                                    path_prefix: candidate_set.prefix(),
-                                    distance_to_relative_ancestor: relative_to.as_ref().map_or(
-                                        usize::MAX,
-                                        |relative_to| {
-                                            distance_between_paths(
-                                                candidate.path,
-                                                relative_to.as_ref(),
-                                            )
-                                        },
-                                    ),
-                                },
-                            );
-                        }
-                        if tree_end >= segment_end {
-                            break;
-                        }
-                        tree_start = tree_end;
-                    }
-                })
-            }
-        })
-        .await;
-
-    if cancel_flag.load(atomic::Ordering::Acquire) {
-        return Vec::new();
-    }
-
-    let mut results = segment_results.concat();
-    util::truncate_to_bottom_n_sorted_by(&mut results, max_results, &|a, b| b.cmp(a));
-    results
-}
-
-/// Compute the distance from a given path to some other path
-/// If there is no shared path, returns usize::MAX
-fn distance_between_paths(path: &RelPath, relative_to: &RelPath) -> usize {
-    let mut path_components = path.components();
-    let mut relative_components = relative_to.components();
-
-    while path_components
-        .next()
-        .zip(relative_components.next())
-        .map(|(path_component, relative_component)| path_component == relative_component)
-        .unwrap_or_default()
-    {}
-    path_components.count() + relative_components.count() + 1
-}
-
-#[cfg(test)]
-mod tests {
-    use util::rel_path::RelPath;
-
-    use super::distance_between_paths;
-
-    #[test]
-    fn test_distance_between_paths_empty() {
-        distance_between_paths(RelPath::empty(), RelPath::empty());
-    }
-}
diff --git a/crates/fuzzy/src/strings.rs b/crates/fuzzy/src/strings.rs
deleted file mode 100644
index 54539840cf..0000000000
--- a/crates/fuzzy/src/strings.rs
+++ /dev/null
@@ -1,199 +0,0 @@
-use crate::{
-    CharBag,
-    matcher::{MatchCandidate, Matcher},
-};
-use gpui::BackgroundExecutor;
-use std::{
-    borrow::Borrow,
-    cmp::{self, Ordering},
-    iter,
-    ops::Range,
-    sync::atomic::{self, AtomicBool},
-};
-
-#[derive(Clone, Debug)]
-pub struct StringMatchCandidate {
-    pub id: usize,
-    pub string: String,
-    pub char_bag: CharBag,
-}
-
-impl StringMatchCandidate {
-    pub fn new(id: usize, string: &str) -> Self {
-        Self {
-            id,
-            string: string.into(),
-            char_bag: string.into(),
-        }
-    }
-}
-
-impl MatchCandidate for &StringMatchCandidate {
-    fn has_chars(&self, bag: CharBag) -> bool {
-        self.char_bag.is_superset(bag)
-    }
-
-    fn candidate_chars(&self) -> impl Iterator<Item = char> {
-        self.string.chars()
-    }
-}
-
-#[derive(Clone, Debug)]
-pub struct StringMatch {
-    pub candidate_id: usize,
-    pub score: f64,
-    pub positions: Vec<usize>,
-    pub string: String,
-}
-
-impl StringMatch {
-    pub fn ranges(&self) -> impl '_ + Iterator<Item = Range<usize>> {
-        let mut positions = self.positions.iter().peekable();
-        iter::from_fn(move || {
-            if let Some(start) = positions.next().copied() {
-                let Some(char_len) = self.char_len_at_index(start) else {
-                    log::error!(
-                        "Invariant violation: Index {start} out of range or not on a utf-8 boundary in string {:?}",
-                        self.string
-                    );
-                    return None;
-                };
-                let mut end = start + char_len;
-                while let Some(next_start) = positions.peek() {
-                    if end == **next_start {
-                        let Some(char_len) = self.char_len_at_index(end) else {
-                            log::error!(
-                                "Invariant violation: Index {end} out of range or not on a utf-8 boundary in string {:?}",
-                                self.string
-                            );
-                            return None;
-                        };
-                        end += char_len;
-                        positions.next();
-                    } else {
-                        break;
-                    }
-                }
-
-                return Some(start..end);
-            }
-            None
-        })
-    }
-
-    /// Gets the byte length of the utf-8 character at a byte offset. If the index is out of range
-    /// or not on a utf-8 boundary then None is returned.
-    fn char_len_at_index(&self, ix: usize) -> Option<usize> {
-        self.string
-            .get(ix..)
-            .and_then(|slice| slice.chars().next().map(|char| char.len_utf8()))
-    }
-}
-
-impl PartialEq for StringMatch {
-    fn eq(&self, other: &Self) -> bool {
-        self.cmp(other).is_eq()
-    }
-}
-
-impl Eq for StringMatch {}
-
-impl PartialOrd for StringMatch {
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-impl Ord for StringMatch {
-    fn cmp(&self, other: &Self) -> Ordering {
-        self.score
-            .partial_cmp(&other.score)
-            .unwrap_or(Ordering::Equal)
-            .then_with(|| self.candidate_id.cmp(&other.candidate_id))
-    }
-}
-
-pub async fn match_strings<T>(
-    candidates: &[T],
-    query: &str,
-    smart_case: bool,
-    penalize_length: bool,
-    max_results: usize,
-    cancel_flag: &AtomicBool,
-    executor: BackgroundExecutor,
-) -> Vec<StringMatch>
-where
-    T: Borrow<StringMatchCandidate> + Sync,
-{
-    if candidates.is_empty() || max_results == 0 {
-        return Default::default();
-    }
-
-    if query.is_empty() {
-        return candidates
-            .iter()
-            .map(|candidate| StringMatch {
-                candidate_id: candidate.borrow().id,
-                score: 0.,
-                positions: Default::default(),
-                string: candidate.borrow().string.clone(),
-            })
-            .collect();
-    }
-
-    let lowercase_query = query.to_lowercase().chars().collect::<Vec<_>>();
-    let query = query.chars().collect::<Vec<_>>();
-
-    let lowercase_query = &lowercase_query;
-    let query = &query;
-    let query_char_bag = CharBag::from(&lowercase_query[..]);
-
-    let num_cpus = executor.num_cpus().min(candidates.len());
-    let segment_size = candidates.len().div_ceil(num_cpus);
-    let mut segment_results = (0..num_cpus)
-        .map(|_| Vec::with_capacity(max_results.min(candidates.len())))
-        .collect::<Vec<_>>();
-
-    executor
-        .scoped(|scope| {
-            for (segment_idx, results) in segment_results.iter_mut().enumerate() {
-                let cancel_flag = &cancel_flag;
-                scope.spawn(async move {
-                    let segment_start = cmp::min(segment_idx * segment_size, candidates.len());
-                    let segment_end = cmp::min(segment_start + segment_size, candidates.len());
-                    let mut matcher = Matcher::new(
-                        query,
-                        lowercase_query,
-                        query_char_bag,
-                        smart_case,
-                        penalize_length,
-                    );
-
-                    matcher.match_candidates(
-                        &[],
-                        &[],
-                        candidates[segment_start..segment_end]
-                            .iter()
-                            .map(|c| c.borrow()),
-                        results,
-                        cancel_flag,
-                        |candidate: &&StringMatchCandidate, score, positions| StringMatch {
-                            candidate_id: candidate.id,
-                            score,
-                            positions: positions.clone(),
-                            string: candidate.string.to_string(),
-                        },
-                    );
-                });
-            }
-        })
-        .await;
-
-    if cancel_flag.load(atomic::Ordering::Acquire) {
-        return Vec::new();
-    }
-
-    let mut results = segment_results.concat();
-    util::truncate_to_bottom_n_sorted_by(&mut results, max_results, &|a, b| b.cmp(a));
-    results
-}
diff --git a/crates/git/Cargo.toml b/crates/git/Cargo.toml
deleted file mode 100644
index 0a99b0ad27..0000000000
--- a/crates/git/Cargo.toml
+++ /dev/null
@@ -1,52 +0,0 @@
-[package]
-name = "git"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/git.rs"
-
-[features]
-test-support = ["rand"]
-
-[dependencies]
-anyhow.workspace = true
-askpass.workspace = true
-async-trait.workspace = true
-collections.workspace = true
-derive_more.workspace = true
-git2.workspace = true
-gpui.workspace = true
-http_client.workspace = true
-itertools.workspace = true
-log.workspace = true
-parking_lot.workspace = true
-regex.workspace = true
-rand = { workspace = true, optional = true }
-rope.workspace = true
-schemars.workspace = true
-serde.workspace = true
-smol.workspace = true
-sum_tree.workspace = true
-text.workspace = true
-thiserror.workspace = true
-time.workspace = true
-url.workspace = true
-urlencoding.workspace = true
-util.workspace = true
-uuid.workspace = true
-futures.workspace = true
-
-[dev-dependencies]
-pretty_assertions.workspace = true
-serde_json.workspace = true
-text = { workspace = true, features = ["test-support"] }
-unindent.workspace = true
-gpui = { workspace = true, features = ["test-support"] }
-tempfile.workspace = true
-rand.workspace = true
diff --git a/crates/git/LICENSE-GPL b/crates/git/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/git/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/git/src/blame.rs b/crates/git/src/blame.rs
deleted file mode 100644
index c3bbeff3f7..0000000000
--- a/crates/git/src/blame.rs
+++ /dev/null
@@ -1,367 +0,0 @@
-use crate::commit::get_messages;
-use crate::repository::RepoPath;
-use crate::{GitRemote, Oid};
-use anyhow::{Context as _, Result};
-use collections::{HashMap, HashSet};
-use futures::AsyncWriteExt;
-use gpui::SharedString;
-use serde::{Deserialize, Serialize};
-use std::process::Stdio;
-use std::{ops::Range, path::Path};
-use text::{LineEnding, Rope};
-use time::OffsetDateTime;
-use time::UtcOffset;
-use time::macros::format_description;
-
-pub use git2 as libgit;
-
-#[derive(Debug, Clone, Default)]
-pub struct Blame {
-    pub entries: Vec<BlameEntry>,
-    pub messages: HashMap<Oid, String>,
-}
-
-#[derive(Clone, Debug, Default)]
-pub struct ParsedCommitMessage {
-    pub message: SharedString,
-    pub permalink: Option<url::Url>,
-    pub pull_request: Option<crate::hosting_provider::PullRequest>,
-    pub remote: Option<GitRemote>,
-}
-
-impl Blame {
-    pub async fn for_path(
-        git_binary: &Path,
-        working_directory: &Path,
-        path: &RepoPath,
-        content: &Rope,
-        line_ending: LineEnding,
-    ) -> Result<Self> {
-        let output =
-            run_git_blame(git_binary, working_directory, path, content, line_ending).await?;
-        let mut entries = parse_git_blame(&output)?;
-        entries.sort_unstable_by(|a, b| a.range.start.cmp(&b.range.start));
-
-        let mut unique_shas = HashSet::default();
-
-        for entry in entries.iter_mut() {
-            unique_shas.insert(entry.sha);
-        }
-
-        let shas = unique_shas.into_iter().collect::<Vec<_>>();
-        let messages = get_messages(working_directory, &shas)
-            .await
-            .context("failed to get commit messages")?;
-
-        Ok(Self { entries, messages })
-    }
-}
-
-const GIT_BLAME_NO_COMMIT_ERROR: &str = "fatal: no such ref: HEAD";
-const GIT_BLAME_NO_PATH: &str = "fatal: no such path";
-
-async fn run_git_blame(
-    git_binary: &Path,
-    working_directory: &Path,
-    path: &RepoPath,
-    contents: &Rope,
-    line_ending: LineEnding,
-) -> Result<String> {
-    let mut child = util::command::new_smol_command(git_binary)
-        .current_dir(working_directory)
-        .arg("blame")
-        .arg("--incremental")
-        .arg("--contents")
-        .arg("-")
-        .arg(path.as_unix_str())
-        .stdin(Stdio::piped())
-        .stdout(Stdio::piped())
-        .stderr(Stdio::piped())
-        .spawn()
-        .context("starting git blame process")?;
-
-    let stdin = child
-        .stdin
-        .as_mut()
-        .context("failed to get pipe to stdin of git blame command")?;
-
-    for chunk in text::chunks_with_line_ending(contents, line_ending) {
-        stdin.write_all(chunk.as_bytes()).await?;
-    }
-    stdin.flush().await?;
-
-    let output = child.output().await.context("reading git blame output")?;
-
-    if !output.status.success() {
-        let stderr = String::from_utf8_lossy(&output.stderr);
-        let trimmed = stderr.trim();
-        if trimmed == GIT_BLAME_NO_COMMIT_ERROR || trimmed.contains(GIT_BLAME_NO_PATH) {
-            return Ok(String::new());
-        }
-        anyhow::bail!("git blame process failed: {stderr}");
-    }
-
-    Ok(String::from_utf8(output.stdout)?)
-}
-
-#[derive(Serialize, Deserialize, Default, Debug, Clone, PartialEq, Eq)]
-pub struct BlameEntry {
-    pub sha: Oid,
-
-    pub range: Range<u32>,
-
-    pub original_line_number: u32,
-
-    pub author: Option<String>,
-    pub author_mail: Option<String>,
-    pub author_time: Option<i64>,
-    pub author_tz: Option<String>,
-
-    pub committer_name: Option<String>,
-    pub committer_email: Option<String>,
-    pub committer_time: Option<i64>,
-    pub committer_tz: Option<String>,
-
-    pub summary: Option<String>,
-
-    pub previous: Option<String>,
-    pub filename: String,
-}
-
-impl BlameEntry {
-    // Returns a BlameEntry by parsing the first line of a `git blame --incremental`
-    // entry. The line MUST have this format:
-    //
-    //     <40-byte-hex-sha1> <sourceline> <resultline> <num-lines>
-    fn new_from_blame_line(line: &str) -> Result<BlameEntry> {
-        let mut parts = line.split_whitespace();
-
-        let sha = parts
-            .next()
-            .and_then(|line| line.parse::<Oid>().ok())
-            .context("parsing sha")?;
-
-        let original_line_number = parts
-            .next()
-            .and_then(|line| line.parse::<u32>().ok())
-            .context("parsing original line number")?;
-        let final_line_number = parts
-            .next()
-            .and_then(|line| line.parse::<u32>().ok())
-            .context("parsing final line number")?;
-
-        let line_count = parts
-            .next()
-            .and_then(|line| line.parse::<u32>().ok())
-            .context("parsing line count")?;
-
-        let start_line = final_line_number.saturating_sub(1);
-        let end_line = start_line + line_count;
-        let range = start_line..end_line;
-
-        Ok(Self {
-            sha,
-            range,
-            original_line_number,
-            ..Default::default()
-        })
-    }
-
-    pub fn author_offset_date_time(&self) -> Result<time::OffsetDateTime> {
-        if let (Some(author_time), Some(author_tz)) = (self.author_time, &self.author_tz) {
-            let format = format_description!("[offset_hour][offset_minute]");
-            let offset = UtcOffset::parse(author_tz, &format)?;
-            let date_time_utc = OffsetDateTime::from_unix_timestamp(author_time)?;
-
-            Ok(date_time_utc.to_offset(offset))
-        } else {
-            // Directly return current time in UTC if there's no committer time or timezone
-            Ok(time::OffsetDateTime::now_utc())
-        }
-    }
-}
-
-// parse_git_blame parses the output of `git blame --incremental`, which returns
-// all the blame-entries for a given path incrementally, as it finds them.
-//
-// Each entry *always* starts with:
-//
-//     <40-byte-hex-sha1> <sourceline> <resultline> <num-lines>
-//
-// Each entry *always* ends with:
-//
-//     filename <whitespace-quoted-filename-goes-here>
-//
-// Line numbers are 1-indexed.
-//
-// A `git blame --incremental` entry looks like this:
-//
-//    6ad46b5257ba16d12c5ca9f0d4900320959df7f4 2 2 1
-//    author Joe Schmoe
-//    author-mail <joe.schmoe@example.com>
-//    author-time 1709741400
-//    author-tz +0100
-//    committer Joe Schmoe
-//    committer-mail <joe.schmoe@example.com>
-//    committer-time 1709741400
-//    committer-tz +0100
-//    summary Joe's cool commit
-//    previous 486c2409237a2c627230589e567024a96751d475 index.js
-//    filename index.js
-//
-// If the entry has the same SHA as an entry that was already printed then no
-// signature information is printed:
-//
-//    6ad46b5257ba16d12c5ca9f0d4900320959df7f4 3 4 1
-//    previous 486c2409237a2c627230589e567024a96751d475 index.js
-//    filename index.js
-//
-// More about `--incremental` output: https://mirrors.edge.kernel.org/pub/software/scm/git/docs/git-blame.html
-fn parse_git_blame(output: &str) -> Result<Vec<BlameEntry>> {
-    let mut entries: Vec<BlameEntry> = Vec::new();
-    let mut index: HashMap<Oid, usize> = HashMap::default();
-
-    let mut current_entry: Option<BlameEntry> = None;
-
-    for line in output.lines() {
-        let mut done = false;
-
-        match &mut current_entry {
-            None => {
-                let mut new_entry = BlameEntry::new_from_blame_line(line)?;
-
-                if let Some(existing_entry) = index
-                    .get(&new_entry.sha)
-                    .and_then(|slot| entries.get(*slot))
-                {
-                    new_entry.author.clone_from(&existing_entry.author);
-                    new_entry
-                        .author_mail
-                        .clone_from(&existing_entry.author_mail);
-                    new_entry.author_time = existing_entry.author_time;
-                    new_entry.author_tz.clone_from(&existing_entry.author_tz);
-                    new_entry
-                        .committer_name
-                        .clone_from(&existing_entry.committer_name);
-                    new_entry
-                        .committer_email
-                        .clone_from(&existing_entry.committer_email);
-                    new_entry.committer_time = existing_entry.committer_time;
-                    new_entry
-                        .committer_tz
-                        .clone_from(&existing_entry.committer_tz);
-                    new_entry.summary.clone_from(&existing_entry.summary);
-                }
-
-                current_entry.replace(new_entry);
-            }
-            Some(entry) => {
-                let Some((key, value)) = line.split_once(' ') else {
-                    continue;
-                };
-                let is_committed = !entry.sha.is_zero();
-                match key {
-                    "filename" => {
-                        entry.filename = value.into();
-                        done = true;
-                    }
-                    "previous" => entry.previous = Some(value.into()),
-
-                    "summary" if is_committed => entry.summary = Some(value.into()),
-                    "author" if is_committed => entry.author = Some(value.into()),
-                    "author-mail" if is_committed => entry.author_mail = Some(value.into()),
-                    "author-time" if is_committed => {
-                        entry.author_time = Some(value.parse::<i64>()?)
-                    }
-                    "author-tz" if is_committed => entry.author_tz = Some(value.into()),
-
-                    "committer" if is_committed => entry.committer_name = Some(value.into()),
-                    "committer-mail" if is_committed => entry.committer_email = Some(value.into()),
-                    "committer-time" if is_committed => {
-                        entry.committer_time = Some(value.parse::<i64>()?)
-                    }
-                    "committer-tz" if is_committed => entry.committer_tz = Some(value.into()),
-                    _ => {}
-                }
-            }
-        };
-
-        if done && let Some(entry) = current_entry.take() {
-            index.insert(entry.sha, entries.len());
-
-            // We only want annotations that have a commit.
-            if !entry.sha.is_zero() {
-                entries.push(entry);
-            }
-        }
-    }
-
-    Ok(entries)
-}
-
-#[cfg(test)]
-mod tests {
-    use std::path::PathBuf;
-
-    use super::BlameEntry;
-    use super::parse_git_blame;
-
-    fn read_test_data(filename: &str) -> String {
-        let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-        path.push("test_data");
-        path.push(filename);
-
-        std::fs::read_to_string(&path)
-            .unwrap_or_else(|_| panic!("Could not read test data at {:?}. Is it generated?", path))
-    }
-
-    fn assert_eq_golden(entries: &Vec<BlameEntry>, golden_filename: &str) {
-        let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-        path.push("test_data");
-        path.push("golden");
-        path.push(format!("{}.json", golden_filename));
-
-        let mut have_json =
-            serde_json::to_string_pretty(&entries).expect("could not serialize entries to JSON");
-        // We always want to save with a trailing newline.
-        have_json.push('\n');
-
-        let update = std::env::var("UPDATE_GOLDEN")
-            .map(|val| val.eq_ignore_ascii_case("true"))
-            .unwrap_or(false);
-
-        if update {
-            std::fs::create_dir_all(path.parent().unwrap())
-                .expect("could not create golden test data directory");
-            std::fs::write(&path, have_json).expect("could not write out golden data");
-        } else {
-            let want_json =
-                std::fs::read_to_string(&path).unwrap_or_else(|_| {
-                    panic!("could not read golden test data file at {:?}. Did you run the test with UPDATE_GOLDEN=true before?", path);
-                }).replace("\r\n", "\n");
-
-            pretty_assertions::assert_eq!(have_json, want_json, "wrong blame entries");
-        }
-    }
-
-    #[test]
-    fn test_parse_git_blame_not_committed() {
-        let output = read_test_data("blame_incremental_not_committed");
-        let entries = parse_git_blame(&output).unwrap();
-        assert_eq_golden(&entries, "blame_incremental_not_committed");
-    }
-
-    #[test]
-    fn test_parse_git_blame_simple() {
-        let output = read_test_data("blame_incremental_simple");
-        let entries = parse_git_blame(&output).unwrap();
-        assert_eq_golden(&entries, "blame_incremental_simple");
-    }
-
-    #[test]
-    fn test_parse_git_blame_complex() {
-        let output = read_test_data("blame_incremental_complex");
-        let entries = parse_git_blame(&output).unwrap();
-        assert_eq_golden(&entries, "blame_incremental_complex");
-    }
-}
diff --git a/crates/git/src/checkpoint.gitignore b/crates/git/src/checkpoint.gitignore
deleted file mode 100644
index 8921e677df..0000000000
--- a/crates/git/src/checkpoint.gitignore
+++ /dev/null
@@ -1,91 +0,0 @@
-# This lists files that we don't track in checkpoints
-
-# Compiled source and executables
-*.exe
-*.dll
-*.so
-*.dylib
-*.a
-*.lib
-*.o
-*.obj
-*.elf
-*.out
-*.app
-*.deb
-*.rpm
-*.dmg
-*.pkg
-*.msi
-
-# Archives and compressed files
-*.7z
-*.zip
-*.tar
-*.tar.gz
-*.tgz
-*.tar.bz2
-*.tbz2
-*.tar.xz
-*.txz
-*.rar
-*.jar
-*.war
-*.ear
-
-# Media files
-*.jpg
-*.jpeg
-*.png
-*.gif
-*.ico
-*.svg
-*.webp
-*.bmp
-*.tiff
-*.mp3
-*.mp4
-*.avi
-*.mov
-*.wmv
-*.flv
-*.mkv
-*.webm
-*.wav
-*.flac
-*.aac
-
-# Database files
-*.db
-*.sqlite
-*.sqlite3
-*.mdb
-
-# Documents (often binary)
-*.pdf
-*.doc
-*.docx
-*.xls
-*.xlsx
-*.ppt
-*.pptx
-
-# IDE and editor files
-.idea/
-.vscode/
-*.swp
-*.swo
-*~
-.DS_Store
-Thumbs.db
-
-# Language-specific files
-*.rlib
-*.rmeta
-*.pdb
-*.class
-*.egg
-*.egg-info/
-*.pyc
-*.pto
-__pycache__
diff --git a/crates/git/src/commit.rs b/crates/git/src/commit.rs
deleted file mode 100644
index ece1d76b8a..0000000000
--- a/crates/git/src/commit.rs
+++ /dev/null
@@ -1,119 +0,0 @@
-use crate::{Oid, status::StatusCode};
-use anyhow::{Context as _, Result};
-use collections::HashMap;
-use std::path::Path;
-
-pub async fn get_messages(working_directory: &Path, shas: &[Oid]) -> Result<HashMap<Oid, String>> {
-    if shas.is_empty() {
-        return Ok(HashMap::default());
-    }
-
-    let output = if cfg!(windows) {
-        // Windows has a maximum invocable command length, so we chunk the input.
-        // Actual max is 32767, but we leave some room for the rest of the command as we aren't in precise control of what std might do here
-        const MAX_CMD_LENGTH: usize = 30000;
-        // 40 bytes of hash, 2 quotes and a separating space
-        const SHA_LENGTH: usize = 40 + 2 + 1;
-        const MAX_ENTRIES_PER_INVOCATION: usize = MAX_CMD_LENGTH / SHA_LENGTH;
-
-        let mut result = vec![];
-        for shas in shas.chunks(MAX_ENTRIES_PER_INVOCATION) {
-            let partial = get_messages_impl(working_directory, shas).await?;
-            result.extend(partial);
-        }
-        result
-    } else {
-        get_messages_impl(working_directory, shas).await?
-    };
-
-    Ok(shas
-        .iter()
-        .cloned()
-        .zip(output)
-        .collect::<HashMap<Oid, String>>())
-}
-
-async fn get_messages_impl(working_directory: &Path, shas: &[Oid]) -> Result<Vec<String>> {
-    const MARKER: &str = "<MARKER>";
-    let mut cmd = util::command::new_smol_command("git");
-    cmd.current_dir(working_directory)
-        .arg("show")
-        .arg("-s")
-        .arg(format!("--format=%B{}", MARKER))
-        .args(shas.iter().map(ToString::to_string));
-    let output = cmd
-        .output()
-        .await
-        .with_context(|| format!("starting git blame process: {:?}", cmd))?;
-    anyhow::ensure!(
-        output.status.success(),
-        "'git show' failed with error {:?}",
-        output.status
-    );
-    Ok(String::from_utf8_lossy(&output.stdout)
-        .trim()
-        .split_terminator(MARKER)
-        .map(|str| str.trim().replace("<", "&lt;").replace(">", "&gt;"))
-        .collect::<Vec<_>>())
-}
-
-/// Parse the output of `git diff --name-status -z`
-pub fn parse_git_diff_name_status(content: &str) -> impl Iterator<Item = (&str, StatusCode)> {
-    let mut parts = content.split('\0');
-    std::iter::from_fn(move || {
-        loop {
-            let status_str = parts.next()?;
-            let path = parts.next()?;
-            let status = match status_str {
-                "M" => StatusCode::Modified,
-                "A" => StatusCode::Added,
-                "D" => StatusCode::Deleted,
-                _ => continue,
-            };
-            return Some((path, status));
-        }
-    })
-}
-
-#[cfg(test)]
-mod tests {
-
-    use super::*;
-
-    #[test]
-    fn test_parse_git_diff_name_status() {
-        let input = concat!(
-            "M\x00Cargo.lock\x00",
-            "M\x00crates/project/Cargo.toml\x00",
-            "M\x00crates/project/src/buffer_store.rs\x00",
-            "D\x00crates/project/src/git.rs\x00",
-            "A\x00crates/project/src/git_store.rs\x00",
-            "A\x00crates/project/src/git_store/git_traversal.rs\x00",
-            "M\x00crates/project/src/project.rs\x00",
-            "M\x00crates/project/src/worktree_store.rs\x00",
-            "M\x00crates/project_panel/src/project_panel.rs\x00",
-        );
-
-        let output = parse_git_diff_name_status(input).collect::<Vec<_>>();
-        assert_eq!(
-            output,
-            &[
-                ("Cargo.lock", StatusCode::Modified),
-                ("crates/project/Cargo.toml", StatusCode::Modified),
-                ("crates/project/src/buffer_store.rs", StatusCode::Modified),
-                ("crates/project/src/git.rs", StatusCode::Deleted),
-                ("crates/project/src/git_store.rs", StatusCode::Added),
-                (
-                    "crates/project/src/git_store/git_traversal.rs",
-                    StatusCode::Added,
-                ),
-                ("crates/project/src/project.rs", StatusCode::Modified),
-                ("crates/project/src/worktree_store.rs", StatusCode::Modified),
-                (
-                    "crates/project_panel/src/project_panel.rs",
-                    StatusCode::Modified
-                ),
-            ]
-        );
-    }
-}
diff --git a/crates/git/src/git.rs b/crates/git/src/git.rs
deleted file mode 100644
index 8b8f88ef65..0000000000
--- a/crates/git/src/git.rs
+++ /dev/null
@@ -1,254 +0,0 @@
-pub mod blame;
-pub mod commit;
-mod hosting_provider;
-mod remote;
-pub mod repository;
-pub mod stash;
-pub mod status;
-
-pub use crate::hosting_provider::*;
-pub use crate::remote::*;
-use anyhow::{Context as _, Result};
-pub use git2 as libgit;
-use gpui::{Action, actions};
-pub use repository::RemoteCommandOutput;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use std::fmt;
-use std::str::FromStr;
-
-pub const DOT_GIT: &str = ".git";
-pub const GITIGNORE: &str = ".gitignore";
-pub const FSMONITOR_DAEMON: &str = "fsmonitor--daemon";
-pub const LFS_DIR: &str = "lfs";
-pub const COMMIT_MESSAGE: &str = "COMMIT_EDITMSG";
-pub const INDEX_LOCK: &str = "index.lock";
-
-actions!(
-    git,
-    [
-        // per-hunk
-        /// Toggles the staged state of the hunk or status entry at cursor.
-        ToggleStaged,
-        /// Stage status entries between an anchor entry and the cursor.
-        StageRange,
-        /// Stages the current hunk and moves to the next one.
-        StageAndNext,
-        /// Unstages the current hunk and moves to the next one.
-        UnstageAndNext,
-        /// Restores the selected hunks to their original state.
-        #[action(deprecated_aliases = ["editor::RevertSelectedHunks"])]
-        Restore,
-        // per-file
-        /// Shows git blame information for the current file.
-        #[action(deprecated_aliases = ["editor::ToggleGitBlame"])]
-        Blame,
-        /// Shows the git history for the current file.
-        FileHistory,
-        /// Stages the current file.
-        StageFile,
-        /// Unstages the current file.
-        UnstageFile,
-        // repo-wide
-        /// Stages all changes in the repository.
-        StageAll,
-        /// Unstages all changes in the repository.
-        UnstageAll,
-        /// Stashes all changes in the repository, including untracked files.
-        StashAll,
-        /// Pops the most recent stash.
-        StashPop,
-        /// Apply the most recent stash.
-        StashApply,
-        /// Restores all tracked files to their last committed state.
-        RestoreTrackedFiles,
-        /// Moves all untracked files to trash.
-        TrashUntrackedFiles,
-        /// Undoes the last commit, keeping changes in the working directory.
-        Uncommit,
-        /// Pushes commits to the remote repository.
-        Push,
-        /// Pushes commits to a specific remote branch.
-        PushTo,
-        /// Force pushes commits to the remote repository.
-        ForcePush,
-        /// Pulls changes from the remote repository.
-        Pull,
-        /// Pulls changes from the remote repository with rebase.
-        PullRebase,
-        /// Fetches changes from the remote repository.
-        Fetch,
-        /// Fetches changes from a specific remote.
-        FetchFrom,
-        /// Creates a new commit with staged changes.
-        Commit,
-        /// Amends the last commit with staged changes.
-        Amend,
-        /// Enable the --signoff option.
-        Signoff,
-        /// Cancels the current git operation.
-        Cancel,
-        /// Expands the commit message editor.
-        ExpandCommitEditor,
-        /// Generates a commit message using AI.
-        GenerateCommitMessage,
-        /// Initializes a new git repository.
-        Init,
-        /// Opens all modified files in the editor.
-        OpenModifiedFiles,
-        /// Clones a repository.
-        Clone,
-        /// Adds a file to .gitignore.
-        AddToGitignore,
-    ]
-);
-
-/// Renames a git branch.
-#[derive(Clone, Debug, Default, PartialEq, Deserialize, JsonSchema, Action)]
-#[action(namespace = git)]
-#[serde(deny_unknown_fields)]
-pub struct RenameBranch {
-    /// The branch to rename.
-    ///
-    /// Default: the current branch.
-    #[serde(default)]
-    pub branch: Option<String>,
-}
-
-/// Restores a file to its last committed state, discarding local changes.
-#[derive(Clone, Debug, Default, PartialEq, Deserialize, JsonSchema, Action)]
-#[action(namespace = git, deprecated_aliases = ["editor::RevertFile"])]
-#[serde(deny_unknown_fields)]
-pub struct RestoreFile {
-    #[serde(default)]
-    pub skip_prompt: bool,
-}
-
-/// The length of a Git short SHA.
-pub const SHORT_SHA_LENGTH: usize = 7;
-
-#[derive(Clone, Copy, Eq, Hash, PartialEq)]
-pub struct Oid(libgit::Oid);
-
-impl Oid {
-    pub fn from_bytes(bytes: &[u8]) -> Result<Self> {
-        let oid = libgit::Oid::from_bytes(bytes).context("failed to parse bytes into git oid")?;
-        Ok(Self(oid))
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn random(rng: &mut impl rand::Rng) -> Self {
-        let mut bytes = [0; 20];
-        rng.fill(&mut bytes);
-        Self::from_bytes(&bytes).unwrap()
-    }
-
-    pub fn as_bytes(&self) -> &[u8] {
-        self.0.as_bytes()
-    }
-
-    pub(crate) fn is_zero(&self) -> bool {
-        self.0.is_zero()
-    }
-
-    /// Returns this [`Oid`] as a short SHA.
-    pub fn display_short(&self) -> String {
-        self.to_string().chars().take(SHORT_SHA_LENGTH).collect()
-    }
-}
-
-impl FromStr for Oid {
-    type Err = anyhow::Error;
-
-    fn from_str(s: &str) -> std::prelude::v1::Result<Self, Self::Err> {
-        libgit::Oid::from_str(s)
-            .context("parsing git oid")
-            .map(Self)
-    }
-}
-
-impl fmt::Debug for Oid {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        fmt::Display::fmt(self, f)
-    }
-}
-
-impl fmt::Display for Oid {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        self.0.fmt(f)
-    }
-}
-
-impl Serialize for Oid {
-    fn serialize<S>(&self, serializer: S) -> std::prelude::v1::Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        serializer.serialize_str(&self.0.to_string())
-    }
-}
-
-impl<'de> Deserialize<'de> for Oid {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        let s = String::deserialize(deserializer)?;
-        s.parse::<Oid>().map_err(serde::de::Error::custom)
-    }
-}
-
-impl Default for Oid {
-    fn default() -> Self {
-        Self(libgit::Oid::zero())
-    }
-}
-
-impl From<Oid> for u32 {
-    fn from(oid: Oid) -> Self {
-        let bytes = oid.0.as_bytes();
-        debug_assert!(bytes.len() > 4);
-
-        let mut u32_bytes: [u8; 4] = [0; 4];
-        u32_bytes.copy_from_slice(&bytes[..4]);
-
-        u32::from_ne_bytes(u32_bytes)
-    }
-}
-
-impl From<Oid> for usize {
-    fn from(oid: Oid) -> Self {
-        let bytes = oid.0.as_bytes();
-        debug_assert!(bytes.len() > 8);
-
-        let mut u64_bytes: [u8; 8] = [0; 8];
-        u64_bytes.copy_from_slice(&bytes[..8]);
-
-        u64::from_ne_bytes(u64_bytes) as usize
-    }
-}
-
-#[repr(i32)]
-#[derive(Copy, Clone, Debug)]
-pub enum RunHook {
-    PreCommit,
-}
-
-impl RunHook {
-    pub fn as_str(&self) -> &str {
-        match self {
-            Self::PreCommit => "pre-commit",
-        }
-    }
-
-    pub fn to_proto(&self) -> i32 {
-        *self as i32
-    }
-
-    pub fn from_proto(value: i32) -> Option<Self> {
-        match value {
-            0 => Some(Self::PreCommit),
-            _ => None,
-        }
-    }
-}
diff --git a/crates/git/src/hosting_provider.rs b/crates/git/src/hosting_provider.rs
deleted file mode 100644
index 225d4a3e23..0000000000
--- a/crates/git/src/hosting_provider.rs
+++ /dev/null
@@ -1,244 +0,0 @@
-use std::{ops::Range, sync::Arc};
-
-use anyhow::Result;
-use async_trait::async_trait;
-use derive_more::{Deref, DerefMut};
-use gpui::{App, Global, SharedString};
-use http_client::HttpClient;
-use itertools::Itertools;
-use parking_lot::RwLock;
-use url::Url;
-
-use crate::repository::RepoPath;
-
-#[derive(Debug, PartialEq, Eq, Clone)]
-pub struct PullRequest {
-    pub number: u32,
-    pub url: Url,
-}
-
-#[derive(Clone)]
-pub struct GitRemote {
-    pub host: Arc<dyn GitHostingProvider + Send + Sync + 'static>,
-    pub owner: SharedString,
-    pub repo: SharedString,
-}
-
-impl std::fmt::Debug for GitRemote {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("GitRemote")
-            .field("host", &self.host.name())
-            .field("owner", &self.owner)
-            .field("repo", &self.repo)
-            .finish()
-    }
-}
-
-impl GitRemote {
-    pub fn host_supports_avatars(&self) -> bool {
-        self.host.supports_avatars()
-    }
-
-    pub async fn avatar_url(
-        &self,
-        commit: SharedString,
-        client: Arc<dyn HttpClient>,
-    ) -> Option<Url> {
-        self.host
-            .commit_author_avatar_url(&self.owner, &self.repo, commit, client)
-            .await
-            .ok()
-            .flatten()
-    }
-}
-
-pub struct BuildCommitPermalinkParams<'a> {
-    pub sha: &'a str,
-}
-
-pub struct BuildPermalinkParams<'a> {
-    pub sha: &'a str,
-    /// URL-escaped path using unescaped `/` as the directory separator.
-    pub path: String,
-    pub selection: Option<Range<u32>>,
-}
-
-impl<'a> BuildPermalinkParams<'a> {
-    pub fn new(sha: &'a str, path: &RepoPath, selection: Option<Range<u32>>) -> Self {
-        Self {
-            sha,
-            path: path.components().map(urlencoding::encode).join("/"),
-            selection,
-        }
-    }
-}
-
-/// A Git hosting provider.
-#[async_trait]
-pub trait GitHostingProvider {
-    /// Returns the name of the provider.
-    fn name(&self) -> String;
-
-    /// Returns the base URL of the provider.
-    fn base_url(&self) -> Url;
-
-    /// Returns a permalink to a Git commit on this hosting provider.
-    fn build_commit_permalink(
-        &self,
-        remote: &ParsedGitRemote,
-        params: BuildCommitPermalinkParams,
-    ) -> Url;
-
-    /// Returns a permalink to a file and/or selection on this hosting provider.
-    fn build_permalink(&self, remote: ParsedGitRemote, params: BuildPermalinkParams) -> Url;
-
-    /// Returns whether this provider supports avatars.
-    fn supports_avatars(&self) -> bool;
-
-    /// Returns a URL fragment to the given line selection.
-    fn line_fragment(&self, selection: &Range<u32>) -> String {
-        if selection.start == selection.end {
-            let line = selection.start + 1;
-
-            self.format_line_number(line)
-        } else {
-            let start_line = selection.start + 1;
-            let end_line = selection.end + 1;
-
-            self.format_line_numbers(start_line, end_line)
-        }
-    }
-
-    /// Returns a formatted line number to be placed in a permalink URL.
-    fn format_line_number(&self, line: u32) -> String;
-
-    /// Returns a formatted range of line numbers to be placed in a permalink URL.
-    fn format_line_numbers(&self, start_line: u32, end_line: u32) -> String;
-
-    fn parse_remote_url(&self, url: &str) -> Option<ParsedGitRemote>;
-
-    fn extract_pull_request(
-        &self,
-        _remote: &ParsedGitRemote,
-        _message: &str,
-    ) -> Option<PullRequest> {
-        None
-    }
-
-    async fn commit_author_avatar_url(
-        &self,
-        _repo_owner: &str,
-        _repo: &str,
-        _commit: SharedString,
-        _http_client: Arc<dyn HttpClient>,
-    ) -> Result<Option<Url>> {
-        Ok(None)
-    }
-}
-
-#[derive(Default, Deref, DerefMut)]
-struct GlobalGitHostingProviderRegistry(Arc<GitHostingProviderRegistry>);
-
-impl Global for GlobalGitHostingProviderRegistry {}
-
-#[derive(Default)]
-struct GitHostingProviderRegistryState {
-    default_providers: Vec<Arc<dyn GitHostingProvider + Send + Sync + 'static>>,
-    setting_providers: Vec<Arc<dyn GitHostingProvider + Send + Sync + 'static>>,
-}
-
-#[derive(Default)]
-pub struct GitHostingProviderRegistry {
-    state: RwLock<GitHostingProviderRegistryState>,
-}
-
-impl GitHostingProviderRegistry {
-    /// Returns the global [`GitHostingProviderRegistry`].
-    #[track_caller]
-    pub fn global(cx: &App) -> Arc<Self> {
-        cx.global::<GlobalGitHostingProviderRegistry>().0.clone()
-    }
-
-    /// Returns the global [`GitHostingProviderRegistry`], if one is set.
-    pub fn try_global(cx: &App) -> Option<Arc<Self>> {
-        cx.try_global::<GlobalGitHostingProviderRegistry>()
-            .map(|registry| registry.0.clone())
-    }
-
-    /// Returns the global [`GitHostingProviderRegistry`].
-    ///
-    /// Inserts a default [`GitHostingProviderRegistry`] if one does not yet exist.
-    pub fn default_global(cx: &mut App) -> Arc<Self> {
-        cx.default_global::<GlobalGitHostingProviderRegistry>()
-            .0
-            .clone()
-    }
-
-    /// Sets the global [`GitHostingProviderRegistry`].
-    pub fn set_global(registry: Arc<GitHostingProviderRegistry>, cx: &mut App) {
-        cx.set_global(GlobalGitHostingProviderRegistry(registry));
-    }
-
-    /// Returns a new [`GitHostingProviderRegistry`].
-    pub fn new() -> Self {
-        Self {
-            state: RwLock::new(GitHostingProviderRegistryState {
-                setting_providers: Vec::default(),
-                default_providers: Vec::default(),
-            }),
-        }
-    }
-
-    /// Returns the list of all [`GitHostingProvider`]s in the registry.
-    pub fn list_hosting_providers(
-        &self,
-    ) -> Vec<Arc<dyn GitHostingProvider + Send + Sync + 'static>> {
-        let state = self.state.read();
-        state
-            .default_providers
-            .iter()
-            .cloned()
-            .chain(state.setting_providers.iter().cloned())
-            .collect()
-    }
-
-    pub fn set_setting_providers(
-        &self,
-        providers: impl IntoIterator<Item = Arc<dyn GitHostingProvider + Send + Sync + 'static>>,
-    ) {
-        let mut state = self.state.write();
-        state.setting_providers.clear();
-        state.setting_providers.extend(providers);
-    }
-
-    /// Adds the provided [`GitHostingProvider`] to the registry.
-    pub fn register_hosting_provider(
-        &self,
-        provider: Arc<dyn GitHostingProvider + Send + Sync + 'static>,
-    ) {
-        self.state.write().default_providers.push(provider);
-    }
-}
-
-#[derive(Debug, PartialEq)]
-pub struct ParsedGitRemote {
-    pub owner: Arc<str>,
-    pub repo: Arc<str>,
-}
-
-pub fn parse_git_remote_url(
-    provider_registry: Arc<GitHostingProviderRegistry>,
-    url: &str,
-) -> Option<(
-    Arc<dyn GitHostingProvider + Send + Sync + 'static>,
-    ParsedGitRemote,
-)> {
-    provider_registry
-        .list_hosting_providers()
-        .into_iter()
-        .find_map(|provider| {
-            provider
-                .parse_remote_url(url)
-                .map(|parsed_remote| (provider, parsed_remote))
-        })
-}
diff --git a/crates/git/src/remote.rs b/crates/git/src/remote.rs
deleted file mode 100644
index 8fb4483984..0000000000
--- a/crates/git/src/remote.rs
+++ /dev/null
@@ -1,98 +0,0 @@
-use std::str::FromStr;
-use std::sync::LazyLock;
-
-use derive_more::Deref;
-use regex::Regex;
-use url::Url;
-
-/// The URL to a Git remote.
-#[derive(Debug, PartialEq, Eq, Clone, Deref)]
-pub struct RemoteUrl(Url);
-
-static USERNAME_REGEX: LazyLock<Regex> =
-    LazyLock::new(|| Regex::new(r"^[0-9a-zA-Z\-_]+@").expect("Failed to create USERNAME_REGEX"));
-
-impl FromStr for RemoteUrl {
-    type Err = url::ParseError;
-
-    fn from_str(input: &str) -> Result<Self, Self::Err> {
-        if USERNAME_REGEX.is_match(input) {
-            // Rewrite remote URLs like `git@github.com:user/repo.git` to `ssh://git@github.com/user/repo.git`
-            let ssh_url = format!("ssh://{}", input.replacen(':', "/", 1));
-            Ok(RemoteUrl(Url::parse(&ssh_url)?))
-        } else {
-            Ok(RemoteUrl(Url::parse(input)?))
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use pretty_assertions::assert_eq;
-
-    use super::*;
-
-    #[test]
-    fn test_parsing_valid_remote_urls() {
-        let valid_urls = vec![
-            (
-                "https://github.com/octocat/zed.git",
-                "https",
-                "github.com",
-                "/octocat/zed.git",
-            ),
-            (
-                "git@github.com:octocat/zed.git",
-                "ssh",
-                "github.com",
-                "/octocat/zed.git",
-            ),
-            (
-                "org-000000@github.com:octocat/zed.git",
-                "ssh",
-                "github.com",
-                "/octocat/zed.git",
-            ),
-            (
-                "ssh://git@github.com/octocat/zed.git",
-                "ssh",
-                "github.com",
-                "/octocat/zed.git",
-            ),
-            (
-                "file:///path/to/local/zed",
-                "file",
-                "",
-                "/path/to/local/zed",
-            ),
-        ];
-
-        for (input, expected_scheme, expected_host, expected_path) in valid_urls {
-            let parsed = input.parse::<RemoteUrl>().expect("failed to parse URL");
-            let url = parsed.0;
-            assert_eq!(
-                url.scheme(),
-                expected_scheme,
-                "unexpected scheme for {input:?}",
-            );
-            assert_eq!(
-                url.host_str().unwrap_or(""),
-                expected_host,
-                "unexpected host for {input:?}",
-            );
-            assert_eq!(url.path(), expected_path, "unexpected path for {input:?}");
-        }
-    }
-
-    #[test]
-    fn test_parsing_invalid_remote_urls() {
-        let invalid_urls = vec!["not_a_url", "http://"];
-
-        for url in invalid_urls {
-            assert!(
-                url.parse::<RemoteUrl>().is_err(),
-                "expected \"{url}\" to not parse as a Git remote URL",
-            );
-        }
-    }
-}
diff --git a/crates/git/src/repository.rs b/crates/git/src/repository.rs
deleted file mode 100644
index c3dd0995ff..0000000000
--- a/crates/git/src/repository.rs
+++ /dev/null
@@ -1,3147 +0,0 @@
-use crate::commit::parse_git_diff_name_status;
-use crate::stash::GitStash;
-use crate::status::{DiffTreeType, GitStatus, StatusCode, TreeDiff};
-use crate::{Oid, RunHook, SHORT_SHA_LENGTH};
-use anyhow::{Context as _, Result, anyhow, bail};
-use collections::HashMap;
-use futures::future::BoxFuture;
-use futures::io::BufWriter;
-use futures::{AsyncWriteExt, FutureExt as _, select_biased};
-use git2::{BranchType, ErrorCode};
-use gpui::{AppContext as _, AsyncApp, BackgroundExecutor, SharedString, Task};
-use parking_lot::Mutex;
-use rope::Rope;
-use schemars::JsonSchema;
-use serde::Deserialize;
-use smol::io::{AsyncBufReadExt, AsyncReadExt, BufReader};
-use text::LineEnding;
-
-use std::collections::HashSet;
-use std::ffi::{OsStr, OsString};
-use std::process::{ExitStatus, Stdio};
-use std::{
-    cmp::Ordering,
-    future,
-    path::{Path, PathBuf},
-    sync::Arc,
-};
-use sum_tree::MapSeekTarget;
-use thiserror::Error;
-use util::command::new_smol_command;
-use util::paths::PathStyle;
-use util::rel_path::RelPath;
-use util::{ResultExt, paths};
-use uuid::Uuid;
-
-pub use askpass::{AskPassDelegate, AskPassResult, AskPassSession};
-
-pub const REMOTE_CANCELLED_BY_USER: &str = "Operation cancelled by user";
-
-#[derive(Clone, Debug, Hash, PartialEq, Eq)]
-pub struct Branch {
-    pub is_head: bool,
-    pub ref_name: SharedString,
-    pub upstream: Option<Upstream>,
-    pub most_recent_commit: Option<CommitSummary>,
-}
-
-impl Branch {
-    pub fn name(&self) -> &str {
-        self.ref_name
-            .as_ref()
-            .strip_prefix("refs/heads/")
-            .or_else(|| self.ref_name.as_ref().strip_prefix("refs/remotes/"))
-            .unwrap_or(self.ref_name.as_ref())
-    }
-
-    pub fn is_remote(&self) -> bool {
-        self.ref_name.starts_with("refs/remotes/")
-    }
-
-    pub fn remote_name(&self) -> Option<&str> {
-        self.ref_name
-            .strip_prefix("refs/remotes/")
-            .and_then(|stripped| stripped.split("/").next())
-    }
-
-    pub fn tracking_status(&self) -> Option<UpstreamTrackingStatus> {
-        self.upstream
-            .as_ref()
-            .and_then(|upstream| upstream.tracking.status())
-    }
-
-    pub fn priority_key(&self) -> (bool, Option<i64>) {
-        (
-            self.is_head,
-            self.most_recent_commit
-                .as_ref()
-                .map(|commit| commit.commit_timestamp),
-        )
-    }
-}
-
-#[derive(Clone, Debug, Hash, PartialEq, Eq)]
-pub struct Worktree {
-    pub path: PathBuf,
-    pub ref_name: SharedString,
-    pub sha: SharedString,
-}
-
-impl Worktree {
-    pub fn branch(&self) -> &str {
-        self.ref_name
-            .as_ref()
-            .strip_prefix("refs/heads/")
-            .or_else(|| self.ref_name.as_ref().strip_prefix("refs/remotes/"))
-            .unwrap_or(self.ref_name.as_ref())
-    }
-}
-
-pub fn parse_worktrees_from_str<T: AsRef<str>>(raw_worktrees: T) -> Vec<Worktree> {
-    let mut worktrees = Vec::new();
-    let entries = raw_worktrees.as_ref().split("\n\n");
-    for entry in entries {
-        let mut parts = entry.splitn(3, '\n');
-        let path = parts
-            .next()
-            .and_then(|p| p.split_once(' ').map(|(_, path)| path.to_string()));
-        let sha = parts
-            .next()
-            .and_then(|p| p.split_once(' ').map(|(_, sha)| sha.to_string()));
-        let ref_name = parts
-            .next()
-            .and_then(|p| p.split_once(' ').map(|(_, ref_name)| ref_name.to_string()));
-
-        if let (Some(path), Some(sha), Some(ref_name)) = (path, sha, ref_name) {
-            worktrees.push(Worktree {
-                path: PathBuf::from(path),
-                ref_name: ref_name.into(),
-                sha: sha.into(),
-            })
-        }
-    }
-
-    worktrees
-}
-
-#[derive(Clone, Debug, Hash, PartialEq, Eq)]
-pub struct Upstream {
-    pub ref_name: SharedString,
-    pub tracking: UpstreamTracking,
-}
-
-impl Upstream {
-    pub fn is_remote(&self) -> bool {
-        self.remote_name().is_some()
-    }
-
-    pub fn remote_name(&self) -> Option<&str> {
-        self.ref_name
-            .strip_prefix("refs/remotes/")
-            .and_then(|stripped| stripped.split("/").next())
-    }
-
-    pub fn stripped_ref_name(&self) -> Option<&str> {
-        self.ref_name.strip_prefix("refs/remotes/")
-    }
-}
-
-#[derive(Clone, Copy, Default)]
-pub struct CommitOptions {
-    pub amend: bool,
-    pub signoff: bool,
-}
-
-#[derive(Clone, Copy, Debug, Hash, PartialEq, Eq)]
-pub enum UpstreamTracking {
-    /// Remote ref not present in local repository.
-    Gone,
-    /// Remote ref present in local repository (fetched from remote).
-    Tracked(UpstreamTrackingStatus),
-}
-
-impl From<UpstreamTrackingStatus> for UpstreamTracking {
-    fn from(status: UpstreamTrackingStatus) -> Self {
-        UpstreamTracking::Tracked(status)
-    }
-}
-
-impl UpstreamTracking {
-    pub fn is_gone(&self) -> bool {
-        matches!(self, UpstreamTracking::Gone)
-    }
-
-    pub fn status(&self) -> Option<UpstreamTrackingStatus> {
-        match self {
-            UpstreamTracking::Gone => None,
-            UpstreamTracking::Tracked(status) => Some(*status),
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct RemoteCommandOutput {
-    pub stdout: String,
-    pub stderr: String,
-}
-
-impl RemoteCommandOutput {
-    pub fn is_empty(&self) -> bool {
-        self.stdout.is_empty() && self.stderr.is_empty()
-    }
-}
-
-#[derive(Clone, Copy, Debug, Hash, PartialEq, Eq)]
-pub struct UpstreamTrackingStatus {
-    pub ahead: u32,
-    pub behind: u32,
-}
-
-#[derive(Clone, Debug, Hash, PartialEq, Eq)]
-pub struct CommitSummary {
-    pub sha: SharedString,
-    pub subject: SharedString,
-    /// This is a unix timestamp
-    pub commit_timestamp: i64,
-    pub author_name: SharedString,
-    pub has_parent: bool,
-}
-
-#[derive(Clone, Debug, Default, Hash, PartialEq, Eq)]
-pub struct CommitDetails {
-    pub sha: SharedString,
-    pub message: SharedString,
-    pub commit_timestamp: i64,
-    pub author_email: SharedString,
-    pub author_name: SharedString,
-}
-
-#[derive(Clone, Debug, Hash, PartialEq, Eq)]
-pub struct FileHistoryEntry {
-    pub sha: SharedString,
-    pub subject: SharedString,
-    pub message: SharedString,
-    pub commit_timestamp: i64,
-    pub author_name: SharedString,
-    pub author_email: SharedString,
-}
-
-#[derive(Debug, Clone)]
-pub struct FileHistory {
-    pub entries: Vec<FileHistoryEntry>,
-    pub path: RepoPath,
-}
-
-#[derive(Debug)]
-pub struct CommitDiff {
-    pub files: Vec<CommitFile>,
-}
-
-#[derive(Debug)]
-pub struct CommitFile {
-    pub path: RepoPath,
-    pub old_text: Option<String>,
-    pub new_text: Option<String>,
-}
-
-impl CommitDetails {
-    pub fn short_sha(&self) -> SharedString {
-        self.sha[..SHORT_SHA_LENGTH].to_string().into()
-    }
-}
-
-#[derive(Debug, Clone, Hash, PartialEq, Eq)]
-pub struct Remote {
-    pub name: SharedString,
-}
-
-pub enum ResetMode {
-    /// Reset the branch pointer, leave index and worktree unchanged (this will make it look like things that were
-    /// committed are now staged).
-    Soft,
-    /// Reset the branch pointer and index, leave worktree unchanged (this makes it look as though things that were
-    /// committed are now unstaged).
-    Mixed,
-}
-
-#[derive(Debug, Clone, Hash, PartialEq, Eq)]
-pub enum FetchOptions {
-    All,
-    Remote(Remote),
-}
-
-impl FetchOptions {
-    pub fn to_proto(&self) -> Option<String> {
-        match self {
-            FetchOptions::All => None,
-            FetchOptions::Remote(remote) => Some(remote.clone().name.into()),
-        }
-    }
-
-    pub fn from_proto(remote_name: Option<String>) -> Self {
-        match remote_name {
-            Some(name) => FetchOptions::Remote(Remote { name: name.into() }),
-            None => FetchOptions::All,
-        }
-    }
-
-    pub fn name(&self) -> SharedString {
-        match self {
-            Self::All => "Fetch all remotes".into(),
-            Self::Remote(remote) => remote.name.clone(),
-        }
-    }
-}
-
-impl std::fmt::Display for FetchOptions {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            FetchOptions::All => write!(f, "--all"),
-            FetchOptions::Remote(remote) => write!(f, "{}", remote.name),
-        }
-    }
-}
-
-/// Modifies .git/info/exclude temporarily
-pub struct GitExcludeOverride {
-    git_exclude_path: PathBuf,
-    original_excludes: Option<String>,
-    added_excludes: Option<String>,
-}
-
-impl GitExcludeOverride {
-    const START_BLOCK_MARKER: &str = "\n\n#  ====== Auto-added by Zed: =======\n";
-    const END_BLOCK_MARKER: &str = "\n#  ====== End of auto-added by Zed =======\n";
-
-    pub async fn new(git_exclude_path: PathBuf) -> Result<Self> {
-        let original_excludes =
-            smol::fs::read_to_string(&git_exclude_path)
-                .await
-                .ok()
-                .map(|content| {
-                    // Auto-generated lines are normally cleaned up in
-                    // `restore_original()` or `drop()`, but may stuck in rare cases.
-                    // Make sure to remove them.
-                    Self::remove_auto_generated_block(&content)
-                });
-
-        Ok(GitExcludeOverride {
-            git_exclude_path,
-            original_excludes,
-            added_excludes: None,
-        })
-    }
-
-    pub async fn add_excludes(&mut self, excludes: &str) -> Result<()> {
-        self.added_excludes = Some(if let Some(ref already_added) = self.added_excludes {
-            format!("{already_added}\n{excludes}")
-        } else {
-            excludes.to_string()
-        });
-
-        let mut content = self.original_excludes.clone().unwrap_or_default();
-
-        content.push_str(Self::START_BLOCK_MARKER);
-        content.push_str(self.added_excludes.as_ref().unwrap());
-        content.push_str(Self::END_BLOCK_MARKER);
-
-        smol::fs::write(&self.git_exclude_path, content).await?;
-        Ok(())
-    }
-
-    pub async fn restore_original(&mut self) -> Result<()> {
-        if let Some(ref original) = self.original_excludes {
-            smol::fs::write(&self.git_exclude_path, original).await?;
-        } else if self.git_exclude_path.exists() {
-            smol::fs::remove_file(&self.git_exclude_path).await?;
-        }
-
-        self.added_excludes = None;
-
-        Ok(())
-    }
-
-    fn remove_auto_generated_block(content: &str) -> String {
-        let start_marker = Self::START_BLOCK_MARKER;
-        let end_marker = Self::END_BLOCK_MARKER;
-        let mut content = content.to_string();
-
-        let start_index = content.find(start_marker);
-        let end_index = content.rfind(end_marker);
-
-        if let (Some(start), Some(end)) = (start_index, end_index) {
-            if end > start {
-                content.replace_range(start..end + end_marker.len(), "");
-            }
-        }
-
-        // Older versions of Zed didn't have end-of-block markers,
-        // so it's impossible to determine auto-generated lines.
-        // Conservatively remove the standard list of excludes
-        let standard_excludes = format!(
-            "{}{}",
-            Self::START_BLOCK_MARKER,
-            include_str!("./checkpoint.gitignore")
-        );
-        content = content.replace(&standard_excludes, "");
-
-        content
-    }
-}
-
-impl Drop for GitExcludeOverride {
-    fn drop(&mut self) {
-        if self.added_excludes.is_some() {
-            let git_exclude_path = self.git_exclude_path.clone();
-            let original_excludes = self.original_excludes.clone();
-            smol::spawn(async move {
-                if let Some(original) = original_excludes {
-                    smol::fs::write(&git_exclude_path, original).await
-                } else {
-                    smol::fs::remove_file(&git_exclude_path).await
-                }
-            })
-            .detach();
-        }
-    }
-}
-
-pub trait GitRepository: Send + Sync {
-    fn reload_index(&self);
-
-    /// Returns the contents of an entry in the repository's index, or None if there is no entry for the given path.
-    ///
-    /// Also returns `None` for symlinks.
-    fn load_index_text(&self, path: RepoPath) -> BoxFuture<'_, Option<String>>;
-
-    /// Returns the contents of an entry in the repository's HEAD, or None if HEAD does not exist or has no entry for the given path.
-    ///
-    /// Also returns `None` for symlinks.
-    fn load_committed_text(&self, path: RepoPath) -> BoxFuture<'_, Option<String>>;
-    fn load_blob_content(&self, oid: Oid) -> BoxFuture<'_, Result<String>>;
-
-    fn set_index_text(
-        &self,
-        path: RepoPath,
-        content: Option<String>,
-        env: Arc<HashMap<String, String>>,
-        is_executable: bool,
-    ) -> BoxFuture<'_, anyhow::Result<()>>;
-
-    /// Returns the URL of the remote with the given name.
-    fn remote_url(&self, name: &str) -> BoxFuture<'_, Option<String>>;
-
-    /// Resolve a list of refs to SHAs.
-    fn revparse_batch(&self, revs: Vec<String>) -> BoxFuture<'_, Result<Vec<Option<String>>>>;
-
-    fn head_sha(&self) -> BoxFuture<'_, Option<String>> {
-        async move {
-            self.revparse_batch(vec!["HEAD".into()])
-                .await
-                .unwrap_or_default()
-                .into_iter()
-                .next()
-                .flatten()
-        }
-        .boxed()
-    }
-
-    fn merge_message(&self) -> BoxFuture<'_, Option<String>>;
-
-    fn status(&self, path_prefixes: &[RepoPath]) -> Task<Result<GitStatus>>;
-    fn diff_tree(&self, request: DiffTreeType) -> BoxFuture<'_, Result<TreeDiff>>;
-
-    fn stash_entries(&self) -> BoxFuture<'_, Result<GitStash>>;
-
-    fn branches(&self) -> BoxFuture<'_, Result<Vec<Branch>>>;
-
-    fn change_branch(&self, name: String) -> BoxFuture<'_, Result<()>>;
-    fn create_branch(&self, name: String, base_branch: Option<String>)
-    -> BoxFuture<'_, Result<()>>;
-    fn rename_branch(&self, branch: String, new_name: String) -> BoxFuture<'_, Result<()>>;
-
-    fn delete_branch(&self, name: String) -> BoxFuture<'_, Result<()>>;
-
-    fn worktrees(&self) -> BoxFuture<'_, Result<Vec<Worktree>>>;
-
-    fn create_worktree(
-        &self,
-        name: String,
-        directory: PathBuf,
-        from_commit: Option<String>,
-    ) -> BoxFuture<'_, Result<()>>;
-
-    fn reset(
-        &self,
-        commit: String,
-        mode: ResetMode,
-        env: Arc<HashMap<String, String>>,
-    ) -> BoxFuture<'_, Result<()>>;
-
-    fn checkout_files(
-        &self,
-        commit: String,
-        paths: Vec<RepoPath>,
-        env: Arc<HashMap<String, String>>,
-    ) -> BoxFuture<'_, Result<()>>;
-
-    fn show(&self, commit: String) -> BoxFuture<'_, Result<CommitDetails>>;
-
-    fn load_commit(&self, commit: String, cx: AsyncApp) -> BoxFuture<'_, Result<CommitDiff>>;
-    fn blame(
-        &self,
-        path: RepoPath,
-        content: Rope,
-        line_ending: LineEnding,
-    ) -> BoxFuture<'_, Result<crate::blame::Blame>>;
-    fn file_history(&self, path: RepoPath) -> BoxFuture<'_, Result<FileHistory>>;
-    fn file_history_paginated(
-        &self,
-        path: RepoPath,
-        skip: usize,
-        limit: Option<usize>,
-    ) -> BoxFuture<'_, Result<FileHistory>>;
-
-    /// Returns the absolute path to the repository. For worktrees, this will be the path to the
-    /// worktree's gitdir within the main repository (typically `.git/worktrees/<name>`).
-    fn path(&self) -> PathBuf;
-
-    fn main_repository_path(&self) -> PathBuf;
-
-    /// Updates the index to match the worktree at the given paths.
-    ///
-    /// If any of the paths have been deleted from the worktree, they will be removed from the index if found there.
-    fn stage_paths(
-        &self,
-        paths: Vec<RepoPath>,
-        env: Arc<HashMap<String, String>>,
-    ) -> BoxFuture<'_, Result<()>>;
-    /// Updates the index to match HEAD at the given paths.
-    ///
-    /// If any of the paths were previously staged but do not exist in HEAD, they will be removed from the index.
-    fn unstage_paths(
-        &self,
-        paths: Vec<RepoPath>,
-        env: Arc<HashMap<String, String>>,
-    ) -> BoxFuture<'_, Result<()>>;
-
-    fn run_hook(
-        &self,
-        hook: RunHook,
-        env: Arc<HashMap<String, String>>,
-    ) -> BoxFuture<'_, Result<()>>;
-
-    fn commit(
-        &self,
-        message: SharedString,
-        name_and_email: Option<(SharedString, SharedString)>,
-        options: CommitOptions,
-        askpass: AskPassDelegate,
-        env: Arc<HashMap<String, String>>,
-    ) -> BoxFuture<'_, Result<()>>;
-
-    fn stash_paths(
-        &self,
-        paths: Vec<RepoPath>,
-        env: Arc<HashMap<String, String>>,
-    ) -> BoxFuture<'_, Result<()>>;
-
-    fn stash_pop(
-        &self,
-        index: Option<usize>,
-        env: Arc<HashMap<String, String>>,
-    ) -> BoxFuture<'_, Result<()>>;
-
-    fn stash_apply(
-        &self,
-        index: Option<usize>,
-        env: Arc<HashMap<String, String>>,
-    ) -> BoxFuture<'_, Result<()>>;
-
-    fn stash_drop(
-        &self,
-        index: Option<usize>,
-        env: Arc<HashMap<String, String>>,
-    ) -> BoxFuture<'_, Result<()>>;
-
-    fn push(
-        &self,
-        branch_name: String,
-        upstream_name: String,
-        options: Option<PushOptions>,
-        askpass: AskPassDelegate,
-        env: Arc<HashMap<String, String>>,
-        // This method takes an AsyncApp to ensure it's invoked on the main thread,
-        // otherwise git-credentials-manager won't work.
-        cx: AsyncApp,
-    ) -> BoxFuture<'_, Result<RemoteCommandOutput>>;
-
-    fn pull(
-        &self,
-        branch_name: Option<String>,
-        upstream_name: String,
-        rebase: bool,
-        askpass: AskPassDelegate,
-        env: Arc<HashMap<String, String>>,
-        // This method takes an AsyncApp to ensure it's invoked on the main thread,
-        // otherwise git-credentials-manager won't work.
-        cx: AsyncApp,
-    ) -> BoxFuture<'_, Result<RemoteCommandOutput>>;
-
-    fn fetch(
-        &self,
-        fetch_options: FetchOptions,
-        askpass: AskPassDelegate,
-        env: Arc<HashMap<String, String>>,
-        // This method takes an AsyncApp to ensure it's invoked on the main thread,
-        // otherwise git-credentials-manager won't work.
-        cx: AsyncApp,
-    ) -> BoxFuture<'_, Result<RemoteCommandOutput>>;
-
-    fn get_push_remote(&self, branch: String) -> BoxFuture<'_, Result<Option<Remote>>>;
-
-    fn get_branch_remote(&self, branch: String) -> BoxFuture<'_, Result<Option<Remote>>>;
-
-    fn get_all_remotes(&self) -> BoxFuture<'_, Result<Vec<Remote>>>;
-
-    fn remove_remote(&self, name: String) -> BoxFuture<'_, Result<()>>;
-
-    fn create_remote(&self, name: String, url: String) -> BoxFuture<'_, Result<()>>;
-
-    /// returns a list of remote branches that contain HEAD
-    fn check_for_pushed_commit(&self) -> BoxFuture<'_, Result<Vec<SharedString>>>;
-
-    /// Run git diff
-    fn diff(&self, diff: DiffType) -> BoxFuture<'_, Result<String>>;
-
-    /// Creates a checkpoint for the repository.
-    fn checkpoint(&self) -> BoxFuture<'static, Result<GitRepositoryCheckpoint>>;
-
-    /// Resets to a previously-created checkpoint.
-    fn restore_checkpoint(&self, checkpoint: GitRepositoryCheckpoint) -> BoxFuture<'_, Result<()>>;
-
-    /// Compares two checkpoints, returning true if they are equal
-    fn compare_checkpoints(
-        &self,
-        left: GitRepositoryCheckpoint,
-        right: GitRepositoryCheckpoint,
-    ) -> BoxFuture<'_, Result<bool>>;
-
-    /// Computes a diff between two checkpoints.
-    fn diff_checkpoints(
-        &self,
-        base_checkpoint: GitRepositoryCheckpoint,
-        target_checkpoint: GitRepositoryCheckpoint,
-    ) -> BoxFuture<'_, Result<String>>;
-
-    fn default_branch(&self) -> BoxFuture<'_, Result<Option<SharedString>>>;
-}
-
-pub enum DiffType {
-    HeadToIndex,
-    HeadToWorktree,
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Deserialize, JsonSchema)]
-pub enum PushOptions {
-    SetUpstream,
-    Force,
-}
-
-impl std::fmt::Debug for dyn GitRepository {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("dyn GitRepository<...>").finish()
-    }
-}
-
-pub struct RealGitRepository {
-    pub repository: Arc<Mutex<git2::Repository>>,
-    pub system_git_binary_path: Option<PathBuf>,
-    pub any_git_binary_path: PathBuf,
-    any_git_binary_help_output: Arc<Mutex<Option<SharedString>>>,
-    executor: BackgroundExecutor,
-}
-
-impl RealGitRepository {
-    pub fn new(
-        dotgit_path: &Path,
-        bundled_git_binary_path: Option<PathBuf>,
-        system_git_binary_path: Option<PathBuf>,
-        executor: BackgroundExecutor,
-    ) -> Option<Self> {
-        let any_git_binary_path = system_git_binary_path.clone().or(bundled_git_binary_path)?;
-        let workdir_root = dotgit_path.parent()?;
-        let repository = git2::Repository::open(workdir_root).log_err()?;
-        Some(Self {
-            repository: Arc::new(Mutex::new(repository)),
-            system_git_binary_path,
-            any_git_binary_path,
-            executor,
-            any_git_binary_help_output: Arc::new(Mutex::new(None)),
-        })
-    }
-
-    fn working_directory(&self) -> Result<PathBuf> {
-        self.repository
-            .lock()
-            .workdir()
-            .context("failed to read git work directory")
-            .map(Path::to_path_buf)
-    }
-
-    async fn any_git_binary_help_output(&self) -> SharedString {
-        if let Some(output) = self.any_git_binary_help_output.lock().clone() {
-            return output;
-        }
-        let git_binary_path = self.any_git_binary_path.clone();
-        let executor = self.executor.clone();
-        let working_directory = self.working_directory();
-        let output: SharedString = self
-            .executor
-            .spawn(async move {
-                GitBinary::new(git_binary_path, working_directory?, executor)
-                    .run(["help", "-a"])
-                    .await
-            })
-            .await
-            .unwrap_or_default()
-            .into();
-        *self.any_git_binary_help_output.lock() = Some(output.clone());
-        output
-    }
-}
-
-#[derive(Clone, Debug)]
-pub struct GitRepositoryCheckpoint {
-    pub commit_sha: Oid,
-}
-
-#[derive(Debug)]
-pub struct GitCommitter {
-    pub name: Option<String>,
-    pub email: Option<String>,
-}
-
-pub async fn get_git_committer(cx: &AsyncApp) -> GitCommitter {
-    if cfg!(any(feature = "test-support", test)) {
-        return GitCommitter {
-            name: None,
-            email: None,
-        };
-    }
-
-    let git_binary_path =
-        if cfg!(target_os = "macos") && option_env!("ZED_BUNDLE").as_deref() == Some("true") {
-            cx.update(|cx| {
-                cx.path_for_auxiliary_executable("git")
-                    .context("could not find git binary path")
-                    .log_err()
-            })
-            .ok()
-            .flatten()
-        } else {
-            None
-        };
-
-    let git = GitBinary::new(
-        git_binary_path.unwrap_or(PathBuf::from("git")),
-        paths::home_dir().clone(),
-        cx.background_executor().clone(),
-    );
-
-    cx.background_spawn(async move {
-        let name = git.run(["config", "--global", "user.name"]).await.log_err();
-        let email = git
-            .run(["config", "--global", "user.email"])
-            .await
-            .log_err();
-        GitCommitter { name, email }
-    })
-    .await
-}
-
-impl GitRepository for RealGitRepository {
-    fn reload_index(&self) {
-        if let Ok(mut index) = self.repository.lock().index() {
-            _ = index.read(false);
-        }
-    }
-
-    fn path(&self) -> PathBuf {
-        let repo = self.repository.lock();
-        repo.path().into()
-    }
-
-    fn main_repository_path(&self) -> PathBuf {
-        let repo = self.repository.lock();
-        repo.commondir().into()
-    }
-
-    fn show(&self, commit: String) -> BoxFuture<'_, Result<CommitDetails>> {
-        let git_binary_path = self.any_git_binary_path.clone();
-        let working_directory = self.working_directory();
-        self.executor
-            .spawn(async move {
-                let working_directory = working_directory?;
-                let output = new_smol_command(git_binary_path)
-                    .current_dir(&working_directory)
-                    .args([
-                        "--no-optional-locks",
-                        "show",
-                        "--no-patch",
-                        "--format=%H%x00%B%x00%at%x00%ae%x00%an%x00",
-                        &commit,
-                    ])
-                    .output()
-                    .await?;
-                let output = std::str::from_utf8(&output.stdout)?;
-                let fields = output.split('\0').collect::<Vec<_>>();
-                if fields.len() != 6 {
-                    bail!("unexpected git-show output for {commit:?}: {output:?}")
-                }
-                let sha = fields[0].to_string().into();
-                let message = fields[1].to_string().into();
-                let commit_timestamp = fields[2].parse()?;
-                let author_email = fields[3].to_string().into();
-                let author_name = fields[4].to_string().into();
-                Ok(CommitDetails {
-                    sha,
-                    message,
-                    commit_timestamp,
-                    author_email,
-                    author_name,
-                })
-            })
-            .boxed()
-    }
-
-    fn load_commit(&self, commit: String, cx: AsyncApp) -> BoxFuture<'_, Result<CommitDiff>> {
-        let Some(working_directory) = self.repository.lock().workdir().map(ToOwned::to_owned)
-        else {
-            return future::ready(Err(anyhow!("no working directory"))).boxed();
-        };
-        let git_binary_path = self.any_git_binary_path.clone();
-        cx.background_spawn(async move {
-            let show_output = util::command::new_smol_command(&git_binary_path)
-                .current_dir(&working_directory)
-                .args([
-                    "--no-optional-locks",
-                    "show",
-                    "--format=",
-                    "-z",
-                    "--no-renames",
-                    "--name-status",
-                    "--first-parent",
-                ])
-                .arg(&commit)
-                .stdin(Stdio::null())
-                .stdout(Stdio::piped())
-                .stderr(Stdio::piped())
-                .output()
-                .await
-                .context("starting git show process")?;
-
-            let show_stdout = String::from_utf8_lossy(&show_output.stdout);
-            let changes = parse_git_diff_name_status(&show_stdout);
-            let parent_sha = format!("{}^", commit);
-
-            let mut cat_file_process = util::command::new_smol_command(&git_binary_path)
-                .current_dir(&working_directory)
-                .args(["--no-optional-locks", "cat-file", "--batch=%(objectsize)"])
-                .stdin(Stdio::piped())
-                .stdout(Stdio::piped())
-                .stderr(Stdio::piped())
-                .spawn()
-                .context("starting git cat-file process")?;
-
-            let mut files = Vec::<CommitFile>::new();
-            let mut stdin = BufWriter::with_capacity(512, cat_file_process.stdin.take().unwrap());
-            let mut stdout = BufReader::new(cat_file_process.stdout.take().unwrap());
-            let mut info_line = String::new();
-            let mut newline = [b'\0'];
-            for (path, status_code) in changes {
-                // git-show outputs `/`-delimited paths even on Windows.
-                let Some(rel_path) = RelPath::unix(path).log_err() else {
-                    continue;
-                };
-
-                match status_code {
-                    StatusCode::Modified => {
-                        stdin.write_all(commit.as_bytes()).await?;
-                        stdin.write_all(b":").await?;
-                        stdin.write_all(path.as_bytes()).await?;
-                        stdin.write_all(b"\n").await?;
-                        stdin.write_all(parent_sha.as_bytes()).await?;
-                        stdin.write_all(b":").await?;
-                        stdin.write_all(path.as_bytes()).await?;
-                        stdin.write_all(b"\n").await?;
-                    }
-                    StatusCode::Added => {
-                        stdin.write_all(commit.as_bytes()).await?;
-                        stdin.write_all(b":").await?;
-                        stdin.write_all(path.as_bytes()).await?;
-                        stdin.write_all(b"\n").await?;
-                    }
-                    StatusCode::Deleted => {
-                        stdin.write_all(parent_sha.as_bytes()).await?;
-                        stdin.write_all(b":").await?;
-                        stdin.write_all(path.as_bytes()).await?;
-                        stdin.write_all(b"\n").await?;
-                    }
-                    _ => continue,
-                }
-                stdin.flush().await?;
-
-                info_line.clear();
-                stdout.read_line(&mut info_line).await?;
-
-                let len = info_line.trim_end().parse().with_context(|| {
-                    format!("invalid object size output from cat-file {info_line}")
-                })?;
-                let mut text = vec![0; len];
-                stdout.read_exact(&mut text).await?;
-                stdout.read_exact(&mut newline).await?;
-                let text = String::from_utf8_lossy(&text).to_string();
-
-                let mut old_text = None;
-                let mut new_text = None;
-                match status_code {
-                    StatusCode::Modified => {
-                        info_line.clear();
-                        stdout.read_line(&mut info_line).await?;
-                        let len = info_line.trim_end().parse().with_context(|| {
-                            format!("invalid object size output from cat-file {}", info_line)
-                        })?;
-                        let mut parent_text = vec![0; len];
-                        stdout.read_exact(&mut parent_text).await?;
-                        stdout.read_exact(&mut newline).await?;
-                        old_text = Some(String::from_utf8_lossy(&parent_text).to_string());
-                        new_text = Some(text);
-                    }
-                    StatusCode::Added => new_text = Some(text),
-                    StatusCode::Deleted => old_text = Some(text),
-                    _ => continue,
-                }
-
-                files.push(CommitFile {
-                    path: RepoPath(Arc::from(rel_path)),
-                    old_text,
-                    new_text,
-                })
-            }
-
-            Ok(CommitDiff { files })
-        })
-        .boxed()
-    }
-
-    fn reset(
-        &self,
-        commit: String,
-        mode: ResetMode,
-        env: Arc<HashMap<String, String>>,
-    ) -> BoxFuture<'_, Result<()>> {
-        async move {
-            let working_directory = self.working_directory();
-
-            let mode_flag = match mode {
-                ResetMode::Mixed => "--mixed",
-                ResetMode::Soft => "--soft",
-            };
-
-            let output = new_smol_command(&self.any_git_binary_path)
-                .envs(env.iter())
-                .current_dir(&working_directory?)
-                .args(["reset", mode_flag, &commit])
-                .output()
-                .await?;
-            anyhow::ensure!(
-                output.status.success(),
-                "Failed to reset:\n{}",
-                String::from_utf8_lossy(&output.stderr),
-            );
-            Ok(())
-        }
-        .boxed()
-    }
-
-    fn checkout_files(
-        &self,
-        commit: String,
-        paths: Vec<RepoPath>,
-        env: Arc<HashMap<String, String>>,
-    ) -> BoxFuture<'_, Result<()>> {
-        let working_directory = self.working_directory();
-        let git_binary_path = self.any_git_binary_path.clone();
-        async move {
-            if paths.is_empty() {
-                return Ok(());
-            }
-
-            let output = new_smol_command(&git_binary_path)
-                .current_dir(&working_directory?)
-                .envs(env.iter())
-                .args(["checkout", &commit, "--"])
-                .args(paths.iter().map(|path| path.as_unix_str()))
-                .output()
-                .await?;
-            anyhow::ensure!(
-                output.status.success(),
-                "Failed to checkout files:\n{}",
-                String::from_utf8_lossy(&output.stderr),
-            );
-            Ok(())
-        }
-        .boxed()
-    }
-
-    fn load_index_text(&self, path: RepoPath) -> BoxFuture<'_, Option<String>> {
-        // https://git-scm.com/book/en/v2/Git-Internals-Git-Objects
-        const GIT_MODE_SYMLINK: u32 = 0o120000;
-
-        let repo = self.repository.clone();
-        self.executor
-            .spawn(async move {
-                fn logic(repo: &git2::Repository, path: &RepoPath) -> Result<Option<String>> {
-                    // This check is required because index.get_path() unwraps internally :(
-                    let mut index = repo.index()?;
-                    index.read(false)?;
-
-                    const STAGE_NORMAL: i32 = 0;
-                    let path = path.as_std_path();
-                    // `RepoPath` contains a `RelPath` which normalizes `.` into an empty path
-                    // `get_path` unwraps on empty paths though, so undo that normalization here
-                    let path = if path.components().next().is_none() {
-                        ".".as_ref()
-                    } else {
-                        path
-                    };
-                    let oid = match index.get_path(path, STAGE_NORMAL) {
-                        Some(entry) if entry.mode != GIT_MODE_SYMLINK => entry.id,
-                        _ => return Ok(None),
-                    };
-
-                    let content = repo.find_blob(oid)?.content().to_owned();
-                    Ok(String::from_utf8(content).ok())
-                }
-
-                match logic(&repo.lock(), &path) {
-                    Ok(value) => return value,
-                    Err(err) => log::error!("Error loading index text: {:?}", err),
-                }
-                None
-            })
-            .boxed()
-    }
-
-    fn load_committed_text(&self, path: RepoPath) -> BoxFuture<'_, Option<String>> {
-        let repo = self.repository.clone();
-        self.executor
-            .spawn(async move {
-                let repo = repo.lock();
-                let head = repo.head().ok()?.peel_to_tree().log_err()?;
-                let entry = head.get_path(path.as_std_path()).ok()?;
-                if entry.filemode() == i32::from(git2::FileMode::Link) {
-                    return None;
-                }
-                let content = repo.find_blob(entry.id()).log_err()?.content().to_owned();
-                String::from_utf8(content).ok()
-            })
-            .boxed()
-    }
-
-    fn load_blob_content(&self, oid: Oid) -> BoxFuture<'_, Result<String>> {
-        let repo = self.repository.clone();
-        self.executor
-            .spawn(async move {
-                let repo = repo.lock();
-                let content = repo.find_blob(oid.0)?.content().to_owned();
-                Ok(String::from_utf8(content)?)
-            })
-            .boxed()
-    }
-
-    fn set_index_text(
-        &self,
-        path: RepoPath,
-        content: Option<String>,
-        env: Arc<HashMap<String, String>>,
-        is_executable: bool,
-    ) -> BoxFuture<'_, anyhow::Result<()>> {
-        let working_directory = self.working_directory();
-        let git_binary_path = self.any_git_binary_path.clone();
-        self.executor
-            .spawn(async move {
-                let working_directory = working_directory?;
-                let mode = if is_executable { "100755" } else { "100644" };
-
-                if let Some(content) = content {
-                    let mut child = new_smol_command(&git_binary_path)
-                        .current_dir(&working_directory)
-                        .envs(env.iter())
-                        .args(["hash-object", "-w", "--stdin"])
-                        .stdin(Stdio::piped())
-                        .stdout(Stdio::piped())
-                        .spawn()?;
-                    let mut stdin = child.stdin.take().unwrap();
-                    stdin.write_all(content.as_bytes()).await?;
-                    stdin.flush().await?;
-                    drop(stdin);
-                    let output = child.output().await?.stdout;
-                    let sha = str::from_utf8(&output)?.trim();
-
-                    log::debug!("indexing SHA: {sha}, path {path:?}");
-
-                    let output = new_smol_command(&git_binary_path)
-                        .current_dir(&working_directory)
-                        .envs(env.iter())
-                        .args(["update-index", "--add", "--cacheinfo", mode, sha])
-                        .arg(path.as_unix_str())
-                        .output()
-                        .await?;
-
-                    anyhow::ensure!(
-                        output.status.success(),
-                        "Failed to stage:\n{}",
-                        String::from_utf8_lossy(&output.stderr)
-                    );
-                } else {
-                    log::debug!("removing path {path:?} from the index");
-                    let output = new_smol_command(&git_binary_path)
-                        .current_dir(&working_directory)
-                        .envs(env.iter())
-                        .args(["update-index", "--force-remove"])
-                        .arg(path.as_unix_str())
-                        .output()
-                        .await?;
-                    anyhow::ensure!(
-                        output.status.success(),
-                        "Failed to unstage:\n{}",
-                        String::from_utf8_lossy(&output.stderr)
-                    );
-                }
-
-                Ok(())
-            })
-            .boxed()
-    }
-
-    fn remote_url(&self, name: &str) -> BoxFuture<'_, Option<String>> {
-        let repo = self.repository.clone();
-        let name = name.to_owned();
-        self.executor
-            .spawn(async move {
-                let repo = repo.lock();
-                let remote = repo.find_remote(&name).ok()?;
-                remote.url().map(|url| url.to_string())
-            })
-            .boxed()
-    }
-
-    fn revparse_batch(&self, revs: Vec<String>) -> BoxFuture<'_, Result<Vec<Option<String>>>> {
-        let working_directory = self.working_directory();
-        let git_binary_path = self.any_git_binary_path.clone();
-        self.executor
-            .spawn(async move {
-                let working_directory = working_directory?;
-                let mut process = new_smol_command(&git_binary_path)
-                    .current_dir(&working_directory)
-                    .args([
-                        "--no-optional-locks",
-                        "cat-file",
-                        "--batch-check=%(objectname)",
-                    ])
-                    .stdin(Stdio::piped())
-                    .stdout(Stdio::piped())
-                    .stderr(Stdio::piped())
-                    .spawn()?;
-
-                let stdin = process
-                    .stdin
-                    .take()
-                    .context("no stdin for git cat-file subprocess")?;
-                let mut stdin = BufWriter::new(stdin);
-                for rev in &revs {
-                    stdin.write_all(rev.as_bytes()).await?;
-                    stdin.write_all(b"\n").await?;
-                }
-                stdin.flush().await?;
-                drop(stdin);
-
-                let output = process.output().await?;
-                let output = std::str::from_utf8(&output.stdout)?;
-                let shas = output
-                    .lines()
-                    .map(|line| {
-                        if line.ends_with("missing") {
-                            None
-                        } else {
-                            Some(line.to_string())
-                        }
-                    })
-                    .collect::<Vec<_>>();
-
-                if shas.len() != revs.len() {
-                    // In an octopus merge, git cat-file still only outputs the first sha from MERGE_HEAD.
-                    bail!("unexpected number of shas")
-                }
-
-                Ok(shas)
-            })
-            .boxed()
-    }
-
-    fn merge_message(&self) -> BoxFuture<'_, Option<String>> {
-        let path = self.path().join("MERGE_MSG");
-        self.executor
-            .spawn(async move { std::fs::read_to_string(&path).ok() })
-            .boxed()
-    }
-
-    fn status(&self, path_prefixes: &[RepoPath]) -> Task<Result<GitStatus>> {
-        let git_binary_path = self.any_git_binary_path.clone();
-        let working_directory = match self.working_directory() {
-            Ok(working_directory) => working_directory,
-            Err(e) => return Task::ready(Err(e)),
-        };
-        let args = git_status_args(path_prefixes);
-        log::debug!("Checking for git status in {path_prefixes:?}");
-        self.executor.spawn(async move {
-            let output = new_smol_command(&git_binary_path)
-                .current_dir(working_directory)
-                .args(args)
-                .output()
-                .await?;
-            if output.status.success() {
-                let stdout = String::from_utf8_lossy(&output.stdout);
-                stdout.parse()
-            } else {
-                let stderr = String::from_utf8_lossy(&output.stderr);
-                anyhow::bail!("git status failed: {stderr}");
-            }
-        })
-    }
-
-    fn diff_tree(&self, request: DiffTreeType) -> BoxFuture<'_, Result<TreeDiff>> {
-        let git_binary_path = self.any_git_binary_path.clone();
-        let working_directory = match self.working_directory() {
-            Ok(working_directory) => working_directory,
-            Err(e) => return Task::ready(Err(e)).boxed(),
-        };
-
-        let mut args = vec![
-            OsString::from("--no-optional-locks"),
-            OsString::from("diff-tree"),
-            OsString::from("-r"),
-            OsString::from("-z"),
-            OsString::from("--no-renames"),
-        ];
-        match request {
-            DiffTreeType::MergeBase { base, head } => {
-                args.push("--merge-base".into());
-                args.push(OsString::from(base.as_str()));
-                args.push(OsString::from(head.as_str()));
-            }
-            DiffTreeType::Since { base, head } => {
-                args.push(OsString::from(base.as_str()));
-                args.push(OsString::from(head.as_str()));
-            }
-        }
-
-        self.executor
-            .spawn(async move {
-                let output = new_smol_command(&git_binary_path)
-                    .current_dir(working_directory)
-                    .args(args)
-                    .output()
-                    .await?;
-                if output.status.success() {
-                    let stdout = String::from_utf8_lossy(&output.stdout);
-                    stdout.parse()
-                } else {
-                    let stderr = String::from_utf8_lossy(&output.stderr);
-                    anyhow::bail!("git status failed: {stderr}");
-                }
-            })
-            .boxed()
-    }
-
-    fn stash_entries(&self) -> BoxFuture<'_, Result<GitStash>> {
-        let git_binary_path = self.any_git_binary_path.clone();
-        let working_directory = self.working_directory();
-        self.executor
-            .spawn(async move {
-                let output = new_smol_command(&git_binary_path)
-                    .current_dir(working_directory?)
-                    .args(&["stash", "list", "--pretty=format:%gd%x00%H%x00%ct%x00%s"])
-                    .output()
-                    .await?;
-                if output.status.success() {
-                    let stdout = String::from_utf8_lossy(&output.stdout);
-                    stdout.parse()
-                } else {
-                    let stderr = String::from_utf8_lossy(&output.stderr);
-                    anyhow::bail!("git status failed: {stderr}");
-                }
-            })
-            .boxed()
-    }
-
-    fn branches(&self) -> BoxFuture<'_, Result<Vec<Branch>>> {
-        let working_directory = self.working_directory();
-        let git_binary_path = self.any_git_binary_path.clone();
-        self.executor
-            .spawn(async move {
-                let fields = [
-                    "%(HEAD)",
-                    "%(objectname)",
-                    "%(parent)",
-                    "%(refname)",
-                    "%(upstream)",
-                    "%(upstream:track)",
-                    "%(committerdate:unix)",
-                    "%(authorname)",
-                    "%(contents:subject)",
-                ]
-                .join("%00");
-                let args = vec![
-                    "for-each-ref",
-                    "refs/heads/**/*",
-                    "refs/remotes/**/*",
-                    "--format",
-                    &fields,
-                ];
-                let working_directory = working_directory?;
-                let output = new_smol_command(&git_binary_path)
-                    .current_dir(&working_directory)
-                    .args(args)
-                    .output()
-                    .await?;
-
-                anyhow::ensure!(
-                    output.status.success(),
-                    "Failed to git git branches:\n{}",
-                    String::from_utf8_lossy(&output.stderr)
-                );
-
-                let input = String::from_utf8_lossy(&output.stdout);
-
-                let mut branches = parse_branch_input(&input)?;
-                if branches.is_empty() {
-                    let args = vec!["symbolic-ref", "--quiet", "HEAD"];
-
-                    let output = new_smol_command(&git_binary_path)
-                        .current_dir(&working_directory)
-                        .args(args)
-                        .output()
-                        .await?;
-
-                    // git symbolic-ref returns a non-0 exit code if HEAD points
-                    // to something other than a branch
-                    if output.status.success() {
-                        let name = String::from_utf8_lossy(&output.stdout).trim().to_string();
-
-                        branches.push(Branch {
-                            ref_name: name.into(),
-                            is_head: true,
-                            upstream: None,
-                            most_recent_commit: None,
-                        });
-                    }
-                }
-
-                Ok(branches)
-            })
-            .boxed()
-    }
-
-    fn worktrees(&self) -> BoxFuture<'_, Result<Vec<Worktree>>> {
-        let git_binary_path = self.any_git_binary_path.clone();
-        let working_directory = self.working_directory();
-        self.executor
-            .spawn(async move {
-                let output = new_smol_command(&git_binary_path)
-                    .current_dir(working_directory?)
-                    .args(&["--no-optional-locks", "worktree", "list", "--porcelain"])
-                    .output()
-                    .await?;
-                if output.status.success() {
-                    let stdout = String::from_utf8_lossy(&output.stdout);
-                    Ok(parse_worktrees_from_str(&stdout))
-                } else {
-                    let stderr = String::from_utf8_lossy(&output.stderr);
-                    anyhow::bail!("git worktree list failed: {stderr}");
-                }
-            })
-            .boxed()
-    }
-
-    fn create_worktree(
-        &self,
-        name: String,
-        directory: PathBuf,
-        from_commit: Option<String>,
-    ) -> BoxFuture<'_, Result<()>> {
-        let git_binary_path = self.any_git_binary_path.clone();
-        let working_directory = self.working_directory();
-        let final_path = directory.join(&name);
-        let mut args = vec![
-            OsString::from("--no-optional-locks"),
-            OsString::from("worktree"),
-            OsString::from("add"),
-            OsString::from(final_path.as_os_str()),
-        ];
-        if let Some(from_commit) = from_commit {
-            args.extend([
-                OsString::from("-b"),
-                OsString::from(name.as_str()),
-                OsString::from(from_commit),
-            ]);
-        }
-        self.executor
-            .spawn(async move {
-                let output = new_smol_command(&git_binary_path)
-                    .current_dir(working_directory?)
-                    .args(args)
-                    .output()
-                    .await?;
-                if output.status.success() {
-                    Ok(())
-                } else {
-                    let stderr = String::from_utf8_lossy(&output.stderr);
-                    anyhow::bail!("git worktree list failed: {stderr}");
-                }
-            })
-            .boxed()
-    }
-
-    fn change_branch(&self, name: String) -> BoxFuture<'_, Result<()>> {
-        let repo = self.repository.clone();
-        let working_directory = self.working_directory();
-        let git_binary_path = self.any_git_binary_path.clone();
-        let executor = self.executor.clone();
-        let branch = self.executor.spawn(async move {
-            let repo = repo.lock();
-            let branch = if let Ok(branch) = repo.find_branch(&name, BranchType::Local) {
-                branch
-            } else if let Ok(revision) = repo.find_branch(&name, BranchType::Remote) {
-                let (_, branch_name) = name.split_once("/").context("Unexpected branch format")?;
-
-                let revision = revision.get();
-                let branch_commit = revision.peel_to_commit()?;
-                let mut branch = match repo.branch(&branch_name, &branch_commit, false) {
-                    Ok(branch) => branch,
-                    Err(err) if err.code() == ErrorCode::Exists => {
-                        repo.find_branch(&branch_name, BranchType::Local)?
-                    }
-                    Err(err) => {
-                        return Err(err.into());
-                    }
-                };
-
-                branch.set_upstream(Some(&name))?;
-                branch
-            } else {
-                anyhow::bail!("Branch '{}' not found", name);
-            };
-
-            Ok(branch
-                .name()?
-                .context("cannot checkout anonymous branch")?
-                .to_string())
-        });
-
-        self.executor
-            .spawn(async move {
-                let branch = branch.await?;
-                GitBinary::new(git_binary_path, working_directory?, executor)
-                    .run(&["checkout", &branch])
-                    .await?;
-                anyhow::Ok(())
-            })
-            .boxed()
-    }
-
-    fn create_branch(
-        &self,
-        name: String,
-        base_branch: Option<String>,
-    ) -> BoxFuture<'_, Result<()>> {
-        let git_binary_path = self.any_git_binary_path.clone();
-        let working_directory = self.working_directory();
-        let executor = self.executor.clone();
-
-        self.executor
-            .spawn(async move {
-                let mut args = vec!["switch", "-c", &name];
-                let base_branch_str;
-                if let Some(ref base) = base_branch {
-                    base_branch_str = base.clone();
-                    args.push(&base_branch_str);
-                }
-
-                GitBinary::new(git_binary_path, working_directory?, executor)
-                    .run(&args)
-                    .await?;
-                anyhow::Ok(())
-            })
-            .boxed()
-    }
-
-    fn rename_branch(&self, branch: String, new_name: String) -> BoxFuture<'_, Result<()>> {
-        let git_binary_path = self.any_git_binary_path.clone();
-        let working_directory = self.working_directory();
-        let executor = self.executor.clone();
-
-        self.executor
-            .spawn(async move {
-                GitBinary::new(git_binary_path, working_directory?, executor)
-                    .run(&["branch", "-m", &branch, &new_name])
-                    .await?;
-                anyhow::Ok(())
-            })
-            .boxed()
-    }
-
-    fn delete_branch(&self, name: String) -> BoxFuture<'_, Result<()>> {
-        let git_binary_path = self.any_git_binary_path.clone();
-        let working_directory = self.working_directory();
-        let executor = self.executor.clone();
-
-        self.executor
-            .spawn(async move {
-                GitBinary::new(git_binary_path, working_directory?, executor)
-                    .run(&["branch", "-d", &name])
-                    .await?;
-                anyhow::Ok(())
-            })
-            .boxed()
-    }
-
-    fn blame(
-        &self,
-        path: RepoPath,
-        content: Rope,
-        line_ending: LineEnding,
-    ) -> BoxFuture<'_, Result<crate::blame::Blame>> {
-        let working_directory = self.working_directory();
-        let git_binary_path = self.any_git_binary_path.clone();
-        let executor = self.executor.clone();
-
-        executor
-            .spawn(async move {
-                crate::blame::Blame::for_path(
-                    &git_binary_path,
-                    &working_directory?,
-                    &path,
-                    &content,
-                    line_ending,
-                )
-                .await
-            })
-            .boxed()
-    }
-
-    fn file_history(&self, path: RepoPath) -> BoxFuture<'_, Result<FileHistory>> {
-        self.file_history_paginated(path, 0, None)
-    }
-
-    fn file_history_paginated(
-        &self,
-        path: RepoPath,
-        skip: usize,
-        limit: Option<usize>,
-    ) -> BoxFuture<'_, Result<FileHistory>> {
-        let working_directory = self.working_directory();
-        let git_binary_path = self.any_git_binary_path.clone();
-        self.executor
-            .spawn(async move {
-                let working_directory = working_directory?;
-                // Use a unique delimiter with a hardcoded UUID to separate commits
-                // This essentially eliminates any chance of encountering the delimiter in actual commit data
-                let commit_delimiter =
-                    concat!("<<COMMIT_END-", "3f8a9c2e-7d4b-4e1a-9f6c-8b5d2a1e4c3f>>",);
-
-                let format_string = format!(
-                    "--pretty=format:%H%x00%s%x00%B%x00%at%x00%an%x00%ae{}",
-                    commit_delimiter
-                );
-
-                let mut args = vec!["--no-optional-locks", "log", "--follow", &format_string];
-
-                let skip_str;
-                let limit_str;
-                if skip > 0 {
-                    skip_str = skip.to_string();
-                    args.push("--skip");
-                    args.push(&skip_str);
-                }
-                if let Some(n) = limit {
-                    limit_str = n.to_string();
-                    args.push("-n");
-                    args.push(&limit_str);
-                }
-
-                args.push("--");
-
-                let output = new_smol_command(&git_binary_path)
-                    .current_dir(&working_directory)
-                    .args(&args)
-                    .arg(path.as_unix_str())
-                    .output()
-                    .await?;
-
-                if !output.status.success() {
-                    let stderr = String::from_utf8_lossy(&output.stderr);
-                    bail!("git log failed: {stderr}");
-                }
-
-                let stdout = std::str::from_utf8(&output.stdout)?;
-                let mut entries = Vec::new();
-
-                for commit_block in stdout.split(commit_delimiter) {
-                    let commit_block = commit_block.trim();
-                    if commit_block.is_empty() {
-                        continue;
-                    }
-
-                    let fields: Vec<&str> = commit_block.split('\0').collect();
-                    if fields.len() >= 6 {
-                        let sha = fields[0].trim().to_string().into();
-                        let subject = fields[1].trim().to_string().into();
-                        let message = fields[2].trim().to_string().into();
-                        let commit_timestamp = fields[3].trim().parse().unwrap_or(0);
-                        let author_name = fields[4].trim().to_string().into();
-                        let author_email = fields[5].trim().to_string().into();
-
-                        entries.push(FileHistoryEntry {
-                            sha,
-                            subject,
-                            message,
-                            commit_timestamp,
-                            author_name,
-                            author_email,
-                        });
-                    }
-                }
-
-                Ok(FileHistory { entries, path })
-            })
-            .boxed()
-    }
-
-    fn diff(&self, diff: DiffType) -> BoxFuture<'_, Result<String>> {
-        let working_directory = self.working_directory();
-        let git_binary_path = self.any_git_binary_path.clone();
-        self.executor
-            .spawn(async move {
-                let args = match diff {
-                    DiffType::HeadToIndex => Some("--staged"),
-                    DiffType::HeadToWorktree => None,
-                };
-
-                let output = new_smol_command(&git_binary_path)
-                    .current_dir(&working_directory?)
-                    .args(["diff"])
-                    .args(args)
-                    .output()
-                    .await?;
-
-                anyhow::ensure!(
-                    output.status.success(),
-                    "Failed to run git diff:\n{}",
-                    String::from_utf8_lossy(&output.stderr)
-                );
-                Ok(String::from_utf8_lossy(&output.stdout).to_string())
-            })
-            .boxed()
-    }
-
-    fn stage_paths(
-        &self,
-        paths: Vec<RepoPath>,
-        env: Arc<HashMap<String, String>>,
-    ) -> BoxFuture<'_, Result<()>> {
-        let working_directory = self.working_directory();
-        let git_binary_path = self.any_git_binary_path.clone();
-        self.executor
-            .spawn(async move {
-                if !paths.is_empty() {
-                    let output = new_smol_command(&git_binary_path)
-                        .current_dir(&working_directory?)
-                        .envs(env.iter())
-                        .args(["update-index", "--add", "--remove", "--"])
-                        .args(paths.iter().map(|p| p.as_unix_str()))
-                        .output()
-                        .await?;
-                    anyhow::ensure!(
-                        output.status.success(),
-                        "Failed to stage paths:\n{}",
-                        String::from_utf8_lossy(&output.stderr),
-                    );
-                }
-                Ok(())
-            })
-            .boxed()
-    }
-
-    fn unstage_paths(
-        &self,
-        paths: Vec<RepoPath>,
-        env: Arc<HashMap<String, String>>,
-    ) -> BoxFuture<'_, Result<()>> {
-        let working_directory = self.working_directory();
-        let git_binary_path = self.any_git_binary_path.clone();
-
-        self.executor
-            .spawn(async move {
-                if !paths.is_empty() {
-                    let output = new_smol_command(&git_binary_path)
-                        .current_dir(&working_directory?)
-                        .envs(env.iter())
-                        .args(["reset", "--quiet", "--"])
-                        .args(paths.iter().map(|p| p.as_std_path()))
-                        .output()
-                        .await?;
-
-                    anyhow::ensure!(
-                        output.status.success(),
-                        "Failed to unstage:\n{}",
-                        String::from_utf8_lossy(&output.stderr),
-                    );
-                }
-                Ok(())
-            })
-            .boxed()
-    }
-
-    fn stash_paths(
-        &self,
-        paths: Vec<RepoPath>,
-        env: Arc<HashMap<String, String>>,
-    ) -> BoxFuture<'_, Result<()>> {
-        let working_directory = self.working_directory();
-        let git_binary_path = self.any_git_binary_path.clone();
-        self.executor
-            .spawn(async move {
-                let mut cmd = new_smol_command(&git_binary_path);
-                cmd.current_dir(&working_directory?)
-                    .envs(env.iter())
-                    .args(["stash", "push", "--quiet"])
-                    .arg("--include-untracked");
-
-                cmd.args(paths.iter().map(|p| p.as_unix_str()));
-
-                let output = cmd.output().await?;
-
-                anyhow::ensure!(
-                    output.status.success(),
-                    "Failed to stash:\n{}",
-                    String::from_utf8_lossy(&output.stderr)
-                );
-                Ok(())
-            })
-            .boxed()
-    }
-
-    fn stash_pop(
-        &self,
-        index: Option<usize>,
-        env: Arc<HashMap<String, String>>,
-    ) -> BoxFuture<'_, Result<()>> {
-        let working_directory = self.working_directory();
-        let git_binary_path = self.any_git_binary_path.clone();
-        self.executor
-            .spawn(async move {
-                let mut cmd = new_smol_command(git_binary_path);
-                let mut args = vec!["stash".to_string(), "pop".to_string()];
-                if let Some(index) = index {
-                    args.push(format!("stash@{{{}}}", index));
-                }
-                cmd.current_dir(&working_directory?)
-                    .envs(env.iter())
-                    .args(args);
-
-                let output = cmd.output().await?;
-
-                anyhow::ensure!(
-                    output.status.success(),
-                    "Failed to stash pop:\n{}",
-                    String::from_utf8_lossy(&output.stderr)
-                );
-                Ok(())
-            })
-            .boxed()
-    }
-
-    fn stash_apply(
-        &self,
-        index: Option<usize>,
-        env: Arc<HashMap<String, String>>,
-    ) -> BoxFuture<'_, Result<()>> {
-        let working_directory = self.working_directory();
-        let git_binary_path = self.any_git_binary_path.clone();
-        self.executor
-            .spawn(async move {
-                let mut cmd = new_smol_command(git_binary_path);
-                let mut args = vec!["stash".to_string(), "apply".to_string()];
-                if let Some(index) = index {
-                    args.push(format!("stash@{{{}}}", index));
-                }
-                cmd.current_dir(&working_directory?)
-                    .envs(env.iter())
-                    .args(args);
-
-                let output = cmd.output().await?;
-
-                anyhow::ensure!(
-                    output.status.success(),
-                    "Failed to apply stash:\n{}",
-                    String::from_utf8_lossy(&output.stderr)
-                );
-                Ok(())
-            })
-            .boxed()
-    }
-
-    fn stash_drop(
-        &self,
-        index: Option<usize>,
-        env: Arc<HashMap<String, String>>,
-    ) -> BoxFuture<'_, Result<()>> {
-        let working_directory = self.working_directory();
-        let git_binary_path = self.any_git_binary_path.clone();
-        self.executor
-            .spawn(async move {
-                let mut cmd = new_smol_command(git_binary_path);
-                let mut args = vec!["stash".to_string(), "drop".to_string()];
-                if let Some(index) = index {
-                    args.push(format!("stash@{{{}}}", index));
-                }
-                cmd.current_dir(&working_directory?)
-                    .envs(env.iter())
-                    .args(args);
-
-                let output = cmd.output().await?;
-
-                anyhow::ensure!(
-                    output.status.success(),
-                    "Failed to stash drop:\n{}",
-                    String::from_utf8_lossy(&output.stderr)
-                );
-                Ok(())
-            })
-            .boxed()
-    }
-
-    fn commit(
-        &self,
-        message: SharedString,
-        name_and_email: Option<(SharedString, SharedString)>,
-        options: CommitOptions,
-        ask_pass: AskPassDelegate,
-        env: Arc<HashMap<String, String>>,
-    ) -> BoxFuture<'_, Result<()>> {
-        let working_directory = self.working_directory();
-        let git_binary_path = self.any_git_binary_path.clone();
-        let executor = self.executor.clone();
-        // Note: Do not spawn this command on the background thread, it might pop open the credential helper
-        // which we want to block on.
-        async move {
-            let mut cmd = new_smol_command(git_binary_path);
-            cmd.current_dir(&working_directory?)
-                .envs(env.iter())
-                .args(["commit", "--quiet", "-m"])
-                .arg(&message.to_string())
-                .arg("--cleanup=strip")
-                .arg("--no-verify")
-                .stdout(smol::process::Stdio::piped())
-                .stderr(smol::process::Stdio::piped());
-
-            if options.amend {
-                cmd.arg("--amend");
-            }
-
-            if options.signoff {
-                cmd.arg("--signoff");
-            }
-
-            if let Some((name, email)) = name_and_email {
-                cmd.arg("--author").arg(&format!("{name} <{email}>"));
-            }
-
-            run_git_command(env, ask_pass, cmd, &executor).await?;
-
-            Ok(())
-        }
-        .boxed()
-    }
-
-    fn push(
-        &self,
-        branch_name: String,
-        remote_name: String,
-        options: Option<PushOptions>,
-        ask_pass: AskPassDelegate,
-        env: Arc<HashMap<String, String>>,
-        cx: AsyncApp,
-    ) -> BoxFuture<'_, Result<RemoteCommandOutput>> {
-        let working_directory = self.working_directory();
-        let executor = cx.background_executor().clone();
-        let git_binary_path = self.system_git_binary_path.clone();
-        // Note: Do not spawn this command on the background thread, it might pop open the credential helper
-        // which we want to block on.
-        async move {
-            let git_binary_path = git_binary_path.context("git not found on $PATH, can't push")?;
-            let working_directory = working_directory?;
-            let mut command = new_smol_command(git_binary_path);
-            command
-                .envs(env.iter())
-                .current_dir(&working_directory)
-                .args(["push"])
-                .args(options.map(|option| match option {
-                    PushOptions::SetUpstream => "--set-upstream",
-                    PushOptions::Force => "--force-with-lease",
-                }))
-                .arg(remote_name)
-                .arg(format!("{}:{}", branch_name, branch_name))
-                .stdin(smol::process::Stdio::null())
-                .stdout(smol::process::Stdio::piped())
-                .stderr(smol::process::Stdio::piped());
-
-            run_git_command(env, ask_pass, command, &executor).await
-        }
-        .boxed()
-    }
-
-    fn pull(
-        &self,
-        branch_name: Option<String>,
-        remote_name: String,
-        rebase: bool,
-        ask_pass: AskPassDelegate,
-        env: Arc<HashMap<String, String>>,
-        cx: AsyncApp,
-    ) -> BoxFuture<'_, Result<RemoteCommandOutput>> {
-        let working_directory = self.working_directory();
-        let executor = cx.background_executor().clone();
-        let git_binary_path = self.system_git_binary_path.clone();
-        // Note: Do not spawn this command on the background thread, it might pop open the credential helper
-        // which we want to block on.
-        async move {
-            let git_binary_path = git_binary_path.context("git not found on $PATH, can't pull")?;
-            let mut command = new_smol_command(git_binary_path);
-            command
-                .envs(env.iter())
-                .current_dir(&working_directory?)
-                .arg("pull");
-
-            if rebase {
-                command.arg("--rebase");
-            }
-
-            command
-                .arg(remote_name)
-                .args(branch_name)
-                .stdout(smol::process::Stdio::piped())
-                .stderr(smol::process::Stdio::piped());
-
-            run_git_command(env, ask_pass, command, &executor).await
-        }
-        .boxed()
-    }
-
-    fn fetch(
-        &self,
-        fetch_options: FetchOptions,
-        ask_pass: AskPassDelegate,
-        env: Arc<HashMap<String, String>>,
-        cx: AsyncApp,
-    ) -> BoxFuture<'_, Result<RemoteCommandOutput>> {
-        let working_directory = self.working_directory();
-        let remote_name = format!("{}", fetch_options);
-        let git_binary_path = self.system_git_binary_path.clone();
-        let executor = cx.background_executor().clone();
-        // Note: Do not spawn this command on the background thread, it might pop open the credential helper
-        // which we want to block on.
-        async move {
-            let git_binary_path = git_binary_path.context("git not found on $PATH, can't fetch")?;
-            let mut command = new_smol_command(git_binary_path);
-            command
-                .envs(env.iter())
-                .current_dir(&working_directory?)
-                .args(["fetch", &remote_name])
-                .stdout(smol::process::Stdio::piped())
-                .stderr(smol::process::Stdio::piped());
-
-            run_git_command(env, ask_pass, command, &executor).await
-        }
-        .boxed()
-    }
-
-    fn get_push_remote(&self, branch: String) -> BoxFuture<'_, Result<Option<Remote>>> {
-        let working_directory = self.working_directory();
-        let git_binary_path = self.any_git_binary_path.clone();
-        self.executor
-            .spawn(async move {
-                let working_directory = working_directory?;
-                let output = new_smol_command(&git_binary_path)
-                    .current_dir(&working_directory)
-                    .args(["rev-parse", "--abbrev-ref"])
-                    .arg(format!("{branch}@{{push}}"))
-                    .output()
-                    .await?;
-                if !output.status.success() {
-                    return Ok(None);
-                }
-                let remote_name = String::from_utf8_lossy(&output.stdout)
-                    .split('/')
-                    .next()
-                    .map(|name| Remote {
-                        name: name.trim().to_string().into(),
-                    });
-
-                Ok(remote_name)
-            })
-            .boxed()
-    }
-
-    fn get_branch_remote(&self, branch: String) -> BoxFuture<'_, Result<Option<Remote>>> {
-        let working_directory = self.working_directory();
-        let git_binary_path = self.any_git_binary_path.clone();
-        self.executor
-            .spawn(async move {
-                let working_directory = working_directory?;
-                let output = new_smol_command(&git_binary_path)
-                    .current_dir(&working_directory)
-                    .args(["config", "--get"])
-                    .arg(format!("branch.{branch}.remote"))
-                    .output()
-                    .await?;
-                if !output.status.success() {
-                    return Ok(None);
-                }
-
-                let remote_name = String::from_utf8_lossy(&output.stdout);
-                return Ok(Some(Remote {
-                    name: remote_name.trim().to_string().into(),
-                }));
-            })
-            .boxed()
-    }
-
-    fn get_all_remotes(&self) -> BoxFuture<'_, Result<Vec<Remote>>> {
-        let working_directory = self.working_directory();
-        let git_binary_path = self.any_git_binary_path.clone();
-        self.executor
-            .spawn(async move {
-                let working_directory = working_directory?;
-                let output = new_smol_command(&git_binary_path)
-                    .current_dir(&working_directory)
-                    .args(["remote", "-v"])
-                    .output()
-                    .await?;
-
-                anyhow::ensure!(
-                    output.status.success(),
-                    "Failed to get all remotes:\n{}",
-                    String::from_utf8_lossy(&output.stderr)
-                );
-                let remote_names: HashSet<Remote> = String::from_utf8_lossy(&output.stdout)
-                    .lines()
-                    .filter(|line| !line.is_empty())
-                    .filter_map(|line| {
-                        let mut split_line = line.split_whitespace();
-                        let remote_name = split_line.next()?;
-
-                        Some(Remote {
-                            name: remote_name.trim().to_string().into(),
-                        })
-                    })
-                    .collect();
-
-                Ok(remote_names.into_iter().collect())
-            })
-            .boxed()
-    }
-
-    fn remove_remote(&self, name: String) -> BoxFuture<'_, Result<()>> {
-        let repo = self.repository.clone();
-        self.executor
-            .spawn(async move {
-                let repo = repo.lock();
-                repo.remote_delete(&name)?;
-
-                Ok(())
-            })
-            .boxed()
-    }
-
-    fn create_remote(&self, name: String, url: String) -> BoxFuture<'_, Result<()>> {
-        let repo = self.repository.clone();
-        self.executor
-            .spawn(async move {
-                let repo = repo.lock();
-                repo.remote(&name, url.as_ref())?;
-                Ok(())
-            })
-            .boxed()
-    }
-
-    fn check_for_pushed_commit(&self) -> BoxFuture<'_, Result<Vec<SharedString>>> {
-        let working_directory = self.working_directory();
-        let git_binary_path = self.any_git_binary_path.clone();
-        self.executor
-            .spawn(async move {
-                let working_directory = working_directory?;
-                let git_cmd = async |args: &[&str]| -> Result<String> {
-                    let output = new_smol_command(&git_binary_path)
-                        .current_dir(&working_directory)
-                        .args(args)
-                        .output()
-                        .await?;
-                    anyhow::ensure!(
-                        output.status.success(),
-                        String::from_utf8_lossy(&output.stderr).to_string()
-                    );
-                    Ok(String::from_utf8(output.stdout)?)
-                };
-
-                let head = git_cmd(&["rev-parse", "HEAD"])
-                    .await
-                    .context("Failed to get HEAD")?
-                    .trim()
-                    .to_owned();
-
-                let mut remote_branches = vec![];
-                let mut add_if_matching = async |remote_head: &str| {
-                    if let Ok(merge_base) = git_cmd(&["merge-base", &head, remote_head]).await
-                        && merge_base.trim() == head
-                        && let Some(s) = remote_head.strip_prefix("refs/remotes/")
-                    {
-                        remote_branches.push(s.to_owned().into());
-                    }
-                };
-
-                // check the main branch of each remote
-                let remotes = git_cmd(&["remote"])
-                    .await
-                    .context("Failed to get remotes")?;
-                for remote in remotes.lines() {
-                    if let Ok(remote_head) =
-                        git_cmd(&["symbolic-ref", &format!("refs/remotes/{remote}/HEAD")]).await
-                    {
-                        add_if_matching(remote_head.trim()).await;
-                    }
-                }
-
-                // ... and the remote branch that the checked-out one is tracking
-                if let Ok(remote_head) =
-                    git_cmd(&["rev-parse", "--symbolic-full-name", "@{u}"]).await
-                {
-                    add_if_matching(remote_head.trim()).await;
-                }
-
-                Ok(remote_branches)
-            })
-            .boxed()
-    }
-
-    fn checkpoint(&self) -> BoxFuture<'static, Result<GitRepositoryCheckpoint>> {
-        let working_directory = self.working_directory();
-        let git_binary_path = self.any_git_binary_path.clone();
-        let executor = self.executor.clone();
-        self.executor
-            .spawn(async move {
-                let working_directory = working_directory?;
-                let mut git = GitBinary::new(git_binary_path, working_directory.clone(), executor)
-                    .envs(checkpoint_author_envs());
-                git.with_temp_index(async |git| {
-                    let head_sha = git.run(&["rev-parse", "HEAD"]).await.ok();
-                    let mut excludes = exclude_files(git).await?;
-
-                    git.run(&["add", "--all"]).await?;
-                    let tree = git.run(&["write-tree"]).await?;
-                    let checkpoint_sha = if let Some(head_sha) = head_sha.as_deref() {
-                        git.run(&["commit-tree", &tree, "-p", head_sha, "-m", "Checkpoint"])
-                            .await?
-                    } else {
-                        git.run(&["commit-tree", &tree, "-m", "Checkpoint"]).await?
-                    };
-
-                    excludes.restore_original().await?;
-
-                    Ok(GitRepositoryCheckpoint {
-                        commit_sha: checkpoint_sha.parse()?,
-                    })
-                })
-                .await
-            })
-            .boxed()
-    }
-
-    fn restore_checkpoint(&self, checkpoint: GitRepositoryCheckpoint) -> BoxFuture<'_, Result<()>> {
-        let working_directory = self.working_directory();
-        let git_binary_path = self.any_git_binary_path.clone();
-
-        let executor = self.executor.clone();
-        self.executor
-            .spawn(async move {
-                let working_directory = working_directory?;
-
-                let git = GitBinary::new(git_binary_path, working_directory, executor);
-                git.run(&[
-                    "restore",
-                    "--source",
-                    &checkpoint.commit_sha.to_string(),
-                    "--worktree",
-                    ".",
-                ])
-                .await?;
-
-                // TODO: We don't track binary and large files anymore,
-                //       so the following call would delete them.
-                //       Implement an alternative way to track files added by agent.
-                //
-                // git.with_temp_index(async move |git| {
-                //     git.run(&["read-tree", &checkpoint.commit_sha.to_string()])
-                //         .await?;
-                //     git.run(&["clean", "-d", "--force"]).await
-                // })
-                // .await?;
-
-                Ok(())
-            })
-            .boxed()
-    }
-
-    fn compare_checkpoints(
-        &self,
-        left: GitRepositoryCheckpoint,
-        right: GitRepositoryCheckpoint,
-    ) -> BoxFuture<'_, Result<bool>> {
-        let working_directory = self.working_directory();
-        let git_binary_path = self.any_git_binary_path.clone();
-
-        let executor = self.executor.clone();
-        self.executor
-            .spawn(async move {
-                let working_directory = working_directory?;
-                let git = GitBinary::new(git_binary_path, working_directory, executor);
-                let result = git
-                    .run(&[
-                        "diff-tree",
-                        "--quiet",
-                        &left.commit_sha.to_string(),
-                        &right.commit_sha.to_string(),
-                    ])
-                    .await;
-                match result {
-                    Ok(_) => Ok(true),
-                    Err(error) => {
-                        if let Some(GitBinaryCommandError { status, .. }) =
-                            error.downcast_ref::<GitBinaryCommandError>()
-                            && status.code() == Some(1)
-                        {
-                            return Ok(false);
-                        }
-
-                        Err(error)
-                    }
-                }
-            })
-            .boxed()
-    }
-
-    fn diff_checkpoints(
-        &self,
-        base_checkpoint: GitRepositoryCheckpoint,
-        target_checkpoint: GitRepositoryCheckpoint,
-    ) -> BoxFuture<'_, Result<String>> {
-        let working_directory = self.working_directory();
-        let git_binary_path = self.any_git_binary_path.clone();
-
-        let executor = self.executor.clone();
-        self.executor
-            .spawn(async move {
-                let working_directory = working_directory?;
-                let git = GitBinary::new(git_binary_path, working_directory, executor);
-                git.run(&[
-                    "diff",
-                    "--find-renames",
-                    "--patch",
-                    &base_checkpoint.commit_sha.to_string(),
-                    &target_checkpoint.commit_sha.to_string(),
-                ])
-                .await
-            })
-            .boxed()
-    }
-
-    fn default_branch(&self) -> BoxFuture<'_, Result<Option<SharedString>>> {
-        let working_directory = self.working_directory();
-        let git_binary_path = self.any_git_binary_path.clone();
-
-        let executor = self.executor.clone();
-        self.executor
-            .spawn(async move {
-                let working_directory = working_directory?;
-                let git = GitBinary::new(git_binary_path, working_directory, executor);
-
-                if let Ok(output) = git
-                    .run(&["symbolic-ref", "refs/remotes/upstream/HEAD"])
-                    .await
-                {
-                    let output = output
-                        .strip_prefix("refs/remotes/upstream/")
-                        .map(|s| SharedString::from(s.to_owned()));
-                    return Ok(output);
-                }
-
-                if let Ok(output) = git.run(&["symbolic-ref", "refs/remotes/origin/HEAD"]).await {
-                    return Ok(output
-                        .strip_prefix("refs/remotes/origin/")
-                        .map(|s| SharedString::from(s.to_owned())));
-                }
-
-                if let Ok(default_branch) = git.run(&["config", "init.defaultBranch"]).await {
-                    if git.run(&["rev-parse", &default_branch]).await.is_ok() {
-                        return Ok(Some(default_branch.into()));
-                    }
-                }
-
-                if git.run(&["rev-parse", "master"]).await.is_ok() {
-                    return Ok(Some("master".into()));
-                }
-
-                Ok(None)
-            })
-            .boxed()
-    }
-
-    fn run_hook(
-        &self,
-        hook: RunHook,
-        env: Arc<HashMap<String, String>>,
-    ) -> BoxFuture<'_, Result<()>> {
-        let working_directory = self.working_directory();
-        let repository = self.repository.clone();
-        let git_binary_path = self.any_git_binary_path.clone();
-        let executor = self.executor.clone();
-        let help_output = self.any_git_binary_help_output();
-
-        // Note: Do not spawn these commands on the background thread, as this causes some git hooks to hang.
-        async move {
-            let working_directory = working_directory?;
-            if !help_output
-                .await
-                .lines()
-                .any(|line| line.trim().starts_with("hook "))
-            {
-                let hook_abs_path = repository.lock().path().join("hooks").join(hook.as_str());
-                if hook_abs_path.is_file() {
-                    let output = new_smol_command(&hook_abs_path)
-                        .envs(env.iter())
-                        .current_dir(&working_directory)
-                        .output()
-                        .await?;
-
-                    if !output.status.success() {
-                        return Err(GitBinaryCommandError {
-                            stdout: String::from_utf8_lossy(&output.stdout).into_owned(),
-                            stderr: String::from_utf8_lossy(&output.stderr).into_owned(),
-                            status: output.status,
-                        }
-                        .into());
-                    }
-                }
-
-                return Ok(());
-            }
-
-            let git = GitBinary::new(git_binary_path, working_directory, executor)
-                .envs(HashMap::clone(&env));
-            git.run(&["hook", "run", "--ignore-missing", hook.as_str()])
-                .await?;
-            Ok(())
-        }
-        .boxed()
-    }
-}
-
-fn git_status_args(path_prefixes: &[RepoPath]) -> Vec<OsString> {
-    let mut args = vec![
-        OsString::from("--no-optional-locks"),
-        OsString::from("status"),
-        OsString::from("--porcelain=v1"),
-        OsString::from("--untracked-files=all"),
-        OsString::from("--no-renames"),
-        OsString::from("-z"),
-    ];
-    args.extend(
-        path_prefixes
-            .iter()
-            .map(|path_prefix| path_prefix.as_std_path().into()),
-    );
-    args.extend(path_prefixes.iter().map(|path_prefix| {
-        if path_prefix.is_empty() {
-            Path::new(".").into()
-        } else {
-            path_prefix.as_std_path().into()
-        }
-    }));
-    args
-}
-
-/// Temporarily git-ignore commonly ignored files and files over 2MB
-async fn exclude_files(git: &GitBinary) -> Result<GitExcludeOverride> {
-    const MAX_SIZE: u64 = 2 * 1024 * 1024; // 2 MB
-    let mut excludes = git.with_exclude_overrides().await?;
-    excludes
-        .add_excludes(include_str!("./checkpoint.gitignore"))
-        .await?;
-
-    let working_directory = git.working_directory.clone();
-    let untracked_files = git.list_untracked_files().await?;
-    let excluded_paths = untracked_files.into_iter().map(|path| {
-        let working_directory = working_directory.clone();
-        smol::spawn(async move {
-            let full_path = working_directory.join(path.clone());
-            match smol::fs::metadata(&full_path).await {
-                Ok(metadata) if metadata.is_file() && metadata.len() >= MAX_SIZE => {
-                    Some(PathBuf::from("/").join(path.clone()))
-                }
-                _ => None,
-            }
-        })
-    });
-
-    let excluded_paths = futures::future::join_all(excluded_paths).await;
-    let excluded_paths = excluded_paths.into_iter().flatten().collect::<Vec<_>>();
-
-    if !excluded_paths.is_empty() {
-        let exclude_patterns = excluded_paths
-            .into_iter()
-            .map(|path| path.to_string_lossy().into_owned())
-            .collect::<Vec<_>>()
-            .join("\n");
-        excludes.add_excludes(&exclude_patterns).await?;
-    }
-
-    Ok(excludes)
-}
-
-struct GitBinary {
-    git_binary_path: PathBuf,
-    working_directory: PathBuf,
-    executor: BackgroundExecutor,
-    index_file_path: Option<PathBuf>,
-    envs: HashMap<String, String>,
-}
-
-impl GitBinary {
-    fn new(
-        git_binary_path: PathBuf,
-        working_directory: PathBuf,
-        executor: BackgroundExecutor,
-    ) -> Self {
-        Self {
-            git_binary_path,
-            working_directory,
-            executor,
-            index_file_path: None,
-            envs: HashMap::default(),
-        }
-    }
-
-    async fn list_untracked_files(&self) -> Result<Vec<PathBuf>> {
-        let status_output = self
-            .run(&["status", "--porcelain=v1", "--untracked-files=all", "-z"])
-            .await?;
-
-        let paths = status_output
-            .split('\0')
-            .filter(|entry| entry.len() >= 3 && entry.starts_with("?? "))
-            .map(|entry| PathBuf::from(&entry[3..]))
-            .collect::<Vec<_>>();
-        Ok(paths)
-    }
-
-    fn envs(mut self, envs: HashMap<String, String>) -> Self {
-        self.envs = envs;
-        self
-    }
-
-    pub async fn with_temp_index<R>(
-        &mut self,
-        f: impl AsyncFnOnce(&Self) -> Result<R>,
-    ) -> Result<R> {
-        let index_file_path = self.path_for_index_id(Uuid::new_v4());
-
-        let delete_temp_index = util::defer({
-            let index_file_path = index_file_path.clone();
-            let executor = self.executor.clone();
-            move || {
-                executor
-                    .spawn(async move {
-                        smol::fs::remove_file(index_file_path).await.log_err();
-                    })
-                    .detach();
-            }
-        });
-
-        // Copy the default index file so that Git doesn't have to rebuild the
-        // whole index from scratch. This might fail if this is an empty repository.
-        smol::fs::copy(
-            self.working_directory.join(".git").join("index"),
-            &index_file_path,
-        )
-        .await
-        .ok();
-
-        self.index_file_path = Some(index_file_path.clone());
-        let result = f(self).await;
-        self.index_file_path = None;
-        let result = result?;
-
-        smol::fs::remove_file(index_file_path).await.ok();
-        delete_temp_index.abort();
-
-        Ok(result)
-    }
-
-    pub async fn with_exclude_overrides(&self) -> Result<GitExcludeOverride> {
-        let path = self
-            .working_directory
-            .join(".git")
-            .join("info")
-            .join("exclude");
-
-        GitExcludeOverride::new(path).await
-    }
-
-    fn path_for_index_id(&self, id: Uuid) -> PathBuf {
-        self.working_directory
-            .join(".git")
-            .join(format!("index-{}.tmp", id))
-    }
-
-    pub async fn run<S>(&self, args: impl IntoIterator<Item = S>) -> Result<String>
-    where
-        S: AsRef<OsStr>,
-    {
-        let mut stdout = self.run_raw(args).await?;
-        if stdout.chars().last() == Some('\n') {
-            stdout.pop();
-        }
-        Ok(stdout)
-    }
-
-    /// Returns the result of the command without trimming the trailing newline.
-    pub async fn run_raw<S>(&self, args: impl IntoIterator<Item = S>) -> Result<String>
-    where
-        S: AsRef<OsStr>,
-    {
-        let mut command = self.build_command(args);
-        let output = command.output().await?;
-        anyhow::ensure!(
-            output.status.success(),
-            GitBinaryCommandError {
-                stdout: String::from_utf8_lossy(&output.stdout).to_string(),
-                stderr: String::from_utf8_lossy(&output.stderr).to_string(),
-                status: output.status,
-            }
-        );
-        Ok(String::from_utf8(output.stdout)?)
-    }
-
-    fn build_command<S>(&self, args: impl IntoIterator<Item = S>) -> smol::process::Command
-    where
-        S: AsRef<OsStr>,
-    {
-        let mut command = new_smol_command(&self.git_binary_path);
-        command.current_dir(&self.working_directory);
-        command.args(args);
-        if let Some(index_file_path) = self.index_file_path.as_ref() {
-            command.env("GIT_INDEX_FILE", index_file_path);
-        }
-        command.envs(&self.envs);
-        command
-    }
-}
-
-#[derive(Error, Debug)]
-#[error("Git command failed:\n{stdout}{stderr}\n")]
-struct GitBinaryCommandError {
-    stdout: String,
-    stderr: String,
-    status: ExitStatus,
-}
-
-async fn run_git_command(
-    env: Arc<HashMap<String, String>>,
-    ask_pass: AskPassDelegate,
-    mut command: smol::process::Command,
-    executor: &BackgroundExecutor,
-) -> Result<RemoteCommandOutput> {
-    if env.contains_key("GIT_ASKPASS") {
-        let git_process = command.spawn()?;
-        let output = git_process.output().await?;
-        anyhow::ensure!(
-            output.status.success(),
-            "{}",
-            String::from_utf8_lossy(&output.stderr)
-        );
-        Ok(RemoteCommandOutput {
-            stdout: String::from_utf8_lossy(&output.stdout).to_string(),
-            stderr: String::from_utf8_lossy(&output.stderr).to_string(),
-        })
-    } else {
-        let ask_pass = AskPassSession::new(executor, ask_pass).await?;
-        command
-            .env("GIT_ASKPASS", ask_pass.script_path())
-            .env("SSH_ASKPASS", ask_pass.script_path())
-            .env("SSH_ASKPASS_REQUIRE", "force");
-        let git_process = command.spawn()?;
-
-        run_askpass_command(ask_pass, git_process).await
-    }
-}
-
-async fn run_askpass_command(
-    mut ask_pass: AskPassSession,
-    git_process: smol::process::Child,
-) -> anyhow::Result<RemoteCommandOutput> {
-    select_biased! {
-        result = ask_pass.run().fuse() => {
-            match result {
-                AskPassResult::CancelledByUser => {
-                    Err(anyhow!(REMOTE_CANCELLED_BY_USER))?
-                }
-                AskPassResult::Timedout => {
-                    Err(anyhow!("Connecting to host timed out"))?
-                }
-            }
-        }
-        output = git_process.output().fuse() => {
-            let output = output?;
-            anyhow::ensure!(
-                output.status.success(),
-                "{}",
-                String::from_utf8_lossy(&output.stderr)
-            );
-            Ok(RemoteCommandOutput {
-                stdout: String::from_utf8_lossy(&output.stdout).to_string(),
-                stderr: String::from_utf8_lossy(&output.stderr).to_string(),
-            })
-        }
-    }
-}
-
-#[derive(Clone, Ord, Hash, PartialOrd, Eq, PartialEq)]
-pub struct RepoPath(Arc<RelPath>);
-
-impl std::fmt::Debug for RepoPath {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        self.0.fmt(f)
-    }
-}
-
-impl RepoPath {
-    pub fn new<S: AsRef<str> + ?Sized>(s: &S) -> Result<Self> {
-        let rel_path = RelPath::unix(s.as_ref())?;
-        Ok(Self::from_rel_path(rel_path))
-    }
-
-    pub fn from_std_path(path: &Path, path_style: PathStyle) -> Result<Self> {
-        let rel_path = RelPath::new(path, path_style)?;
-        Ok(Self::from_rel_path(&rel_path))
-    }
-
-    pub fn from_proto(proto: &str) -> Result<Self> {
-        let rel_path = RelPath::from_proto(proto)?;
-        Ok(Self(rel_path))
-    }
-
-    pub fn from_rel_path(path: &RelPath) -> RepoPath {
-        Self(Arc::from(path))
-    }
-
-    pub fn as_std_path(&self) -> &Path {
-        // git2 does not like empty paths and our RelPath infra turns `.` into ``
-        // so undo that here
-        if self.is_empty() {
-            Path::new(".")
-        } else {
-            self.0.as_std_path()
-        }
-    }
-}
-
-#[cfg(any(test, feature = "test-support"))]
-pub fn repo_path<S: AsRef<str> + ?Sized>(s: &S) -> RepoPath {
-    RepoPath(RelPath::unix(s.as_ref()).unwrap().into())
-}
-
-impl AsRef<Arc<RelPath>> for RepoPath {
-    fn as_ref(&self) -> &Arc<RelPath> {
-        &self.0
-    }
-}
-
-impl std::ops::Deref for RepoPath {
-    type Target = RelPath;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-#[derive(Debug)]
-pub struct RepoPathDescendants<'a>(pub &'a RepoPath);
-
-impl MapSeekTarget<RepoPath> for RepoPathDescendants<'_> {
-    fn cmp_cursor(&self, key: &RepoPath) -> Ordering {
-        if key.starts_with(self.0) {
-            Ordering::Greater
-        } else {
-            self.0.cmp(key)
-        }
-    }
-}
-
-fn parse_branch_input(input: &str) -> Result<Vec<Branch>> {
-    let mut branches = Vec::new();
-    for line in input.split('\n') {
-        if line.is_empty() {
-            continue;
-        }
-        let mut fields = line.split('\x00');
-        let Some(head) = fields.next() else {
-            continue;
-        };
-        let Some(head_sha) = fields.next().map(|f| f.to_string().into()) else {
-            continue;
-        };
-        let Some(parent_sha) = fields.next().map(|f| f.to_string()) else {
-            continue;
-        };
-        let Some(ref_name) = fields.next().map(|f| f.to_string().into()) else {
-            continue;
-        };
-        let Some(upstream_name) = fields.next().map(|f| f.to_string()) else {
-            continue;
-        };
-        let Some(upstream_tracking) = fields.next().and_then(|f| parse_upstream_track(f).ok())
-        else {
-            continue;
-        };
-        let Some(commiterdate) = fields.next().and_then(|f| f.parse::<i64>().ok()) else {
-            continue;
-        };
-        let Some(author_name) = fields.next().map(|f| f.to_string().into()) else {
-            continue;
-        };
-        let Some(subject) = fields.next().map(|f| f.to_string().into()) else {
-            continue;
-        };
-
-        branches.push(Branch {
-            is_head: head == "*",
-            ref_name,
-            most_recent_commit: Some(CommitSummary {
-                sha: head_sha,
-                subject,
-                commit_timestamp: commiterdate,
-                author_name: author_name,
-                has_parent: !parent_sha.is_empty(),
-            }),
-            upstream: if upstream_name.is_empty() {
-                None
-            } else {
-                Some(Upstream {
-                    ref_name: upstream_name.into(),
-                    tracking: upstream_tracking,
-                })
-            },
-        })
-    }
-
-    Ok(branches)
-}
-
-fn parse_upstream_track(upstream_track: &str) -> Result<UpstreamTracking> {
-    if upstream_track.is_empty() {
-        return Ok(UpstreamTracking::Tracked(UpstreamTrackingStatus {
-            ahead: 0,
-            behind: 0,
-        }));
-    }
-
-    let upstream_track = upstream_track.strip_prefix("[").context("missing [")?;
-    let upstream_track = upstream_track.strip_suffix("]").context("missing [")?;
-    let mut ahead: u32 = 0;
-    let mut behind: u32 = 0;
-    for component in upstream_track.split(", ") {
-        if component == "gone" {
-            return Ok(UpstreamTracking::Gone);
-        }
-        if let Some(ahead_num) = component.strip_prefix("ahead ") {
-            ahead = ahead_num.parse::<u32>()?;
-        }
-        if let Some(behind_num) = component.strip_prefix("behind ") {
-            behind = behind_num.parse::<u32>()?;
-        }
-    }
-    Ok(UpstreamTracking::Tracked(UpstreamTrackingStatus {
-        ahead,
-        behind,
-    }))
-}
-
-fn checkpoint_author_envs() -> HashMap<String, String> {
-    HashMap::from_iter([
-        ("GIT_AUTHOR_NAME".to_string(), "Zed".to_string()),
-        ("GIT_AUTHOR_EMAIL".to_string(), "hi@zed.dev".to_string()),
-        ("GIT_COMMITTER_NAME".to_string(), "Zed".to_string()),
-        ("GIT_COMMITTER_EMAIL".to_string(), "hi@zed.dev".to_string()),
-    ])
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use gpui::TestAppContext;
-
-    fn disable_git_global_config() {
-        unsafe {
-            std::env::set_var("GIT_CONFIG_GLOBAL", "");
-            std::env::set_var("GIT_CONFIG_SYSTEM", "");
-        }
-    }
-
-    #[gpui::test]
-    async fn test_checkpoint_basic(cx: &mut TestAppContext) {
-        disable_git_global_config();
-
-        cx.executor().allow_parking();
-
-        let repo_dir = tempfile::tempdir().unwrap();
-
-        git2::Repository::init(repo_dir.path()).unwrap();
-        let file_path = repo_dir.path().join("file");
-        smol::fs::write(&file_path, "initial").await.unwrap();
-
-        let repo = RealGitRepository::new(
-            &repo_dir.path().join(".git"),
-            None,
-            Some("git".into()),
-            cx.executor(),
-        )
-        .unwrap();
-
-        repo.stage_paths(vec![repo_path("file")], Arc::new(HashMap::default()))
-            .await
-            .unwrap();
-        repo.commit(
-            "Initial commit".into(),
-            None,
-            CommitOptions::default(),
-            AskPassDelegate::new(&mut cx.to_async(), |_, _, _| {}),
-            Arc::new(checkpoint_author_envs()),
-        )
-        .await
-        .unwrap();
-
-        smol::fs::write(&file_path, "modified before checkpoint")
-            .await
-            .unwrap();
-        smol::fs::write(repo_dir.path().join("new_file_before_checkpoint"), "1")
-            .await
-            .unwrap();
-        let checkpoint = repo.checkpoint().await.unwrap();
-
-        // Ensure the user can't see any branches after creating a checkpoint.
-        assert_eq!(repo.branches().await.unwrap().len(), 1);
-
-        smol::fs::write(&file_path, "modified after checkpoint")
-            .await
-            .unwrap();
-        repo.stage_paths(vec![repo_path("file")], Arc::new(HashMap::default()))
-            .await
-            .unwrap();
-        repo.commit(
-            "Commit after checkpoint".into(),
-            None,
-            CommitOptions::default(),
-            AskPassDelegate::new(&mut cx.to_async(), |_, _, _| {}),
-            Arc::new(checkpoint_author_envs()),
-        )
-        .await
-        .unwrap();
-
-        smol::fs::remove_file(repo_dir.path().join("new_file_before_checkpoint"))
-            .await
-            .unwrap();
-        smol::fs::write(repo_dir.path().join("new_file_after_checkpoint"), "2")
-            .await
-            .unwrap();
-
-        // Ensure checkpoint stays alive even after a Git GC.
-        repo.gc().await.unwrap();
-        repo.restore_checkpoint(checkpoint.clone()).await.unwrap();
-
-        assert_eq!(
-            smol::fs::read_to_string(&file_path).await.unwrap(),
-            "modified before checkpoint"
-        );
-        assert_eq!(
-            smol::fs::read_to_string(repo_dir.path().join("new_file_before_checkpoint"))
-                .await
-                .unwrap(),
-            "1"
-        );
-        // See TODO above
-        // assert_eq!(
-        //     smol::fs::read_to_string(repo_dir.path().join("new_file_after_checkpoint"))
-        //         .await
-        //         .ok(),
-        //     None
-        // );
-    }
-
-    #[gpui::test]
-    async fn test_checkpoint_empty_repo(cx: &mut TestAppContext) {
-        disable_git_global_config();
-
-        cx.executor().allow_parking();
-
-        let repo_dir = tempfile::tempdir().unwrap();
-        git2::Repository::init(repo_dir.path()).unwrap();
-        let repo = RealGitRepository::new(
-            &repo_dir.path().join(".git"),
-            None,
-            Some("git".into()),
-            cx.executor(),
-        )
-        .unwrap();
-
-        smol::fs::write(repo_dir.path().join("foo"), "foo")
-            .await
-            .unwrap();
-        let checkpoint_sha = repo.checkpoint().await.unwrap();
-
-        // Ensure the user can't see any branches after creating a checkpoint.
-        assert_eq!(repo.branches().await.unwrap().len(), 1);
-
-        smol::fs::write(repo_dir.path().join("foo"), "bar")
-            .await
-            .unwrap();
-        smol::fs::write(repo_dir.path().join("baz"), "qux")
-            .await
-            .unwrap();
-        repo.restore_checkpoint(checkpoint_sha).await.unwrap();
-        assert_eq!(
-            smol::fs::read_to_string(repo_dir.path().join("foo"))
-                .await
-                .unwrap(),
-            "foo"
-        );
-        // See TODOs above
-        // assert_eq!(
-        //     smol::fs::read_to_string(repo_dir.path().join("baz"))
-        //         .await
-        //         .ok(),
-        //     None
-        // );
-    }
-
-    #[gpui::test]
-    async fn test_compare_checkpoints(cx: &mut TestAppContext) {
-        disable_git_global_config();
-
-        cx.executor().allow_parking();
-
-        let repo_dir = tempfile::tempdir().unwrap();
-        git2::Repository::init(repo_dir.path()).unwrap();
-        let repo = RealGitRepository::new(
-            &repo_dir.path().join(".git"),
-            None,
-            Some("git".into()),
-            cx.executor(),
-        )
-        .unwrap();
-
-        smol::fs::write(repo_dir.path().join("file1"), "content1")
-            .await
-            .unwrap();
-        let checkpoint1 = repo.checkpoint().await.unwrap();
-
-        smol::fs::write(repo_dir.path().join("file2"), "content2")
-            .await
-            .unwrap();
-        let checkpoint2 = repo.checkpoint().await.unwrap();
-
-        assert!(
-            !repo
-                .compare_checkpoints(checkpoint1, checkpoint2.clone())
-                .await
-                .unwrap()
-        );
-
-        let checkpoint3 = repo.checkpoint().await.unwrap();
-        assert!(
-            repo.compare_checkpoints(checkpoint2, checkpoint3)
-                .await
-                .unwrap()
-        );
-    }
-
-    #[gpui::test]
-    async fn test_checkpoint_exclude_binary_files(cx: &mut TestAppContext) {
-        disable_git_global_config();
-
-        cx.executor().allow_parking();
-
-        let repo_dir = tempfile::tempdir().unwrap();
-        let text_path = repo_dir.path().join("main.rs");
-        let bin_path = repo_dir.path().join("binary.o");
-
-        git2::Repository::init(repo_dir.path()).unwrap();
-
-        smol::fs::write(&text_path, "fn main() {}").await.unwrap();
-
-        smol::fs::write(&bin_path, "some binary file here")
-            .await
-            .unwrap();
-
-        let repo = RealGitRepository::new(
-            &repo_dir.path().join(".git"),
-            None,
-            Some("git".into()),
-            cx.executor(),
-        )
-        .unwrap();
-
-        // initial commit
-        repo.stage_paths(vec![repo_path("main.rs")], Arc::new(HashMap::default()))
-            .await
-            .unwrap();
-        repo.commit(
-            "Initial commit".into(),
-            None,
-            CommitOptions::default(),
-            AskPassDelegate::new(&mut cx.to_async(), |_, _, _| {}),
-            Arc::new(checkpoint_author_envs()),
-        )
-        .await
-        .unwrap();
-
-        let checkpoint = repo.checkpoint().await.unwrap();
-
-        smol::fs::write(&text_path, "fn main() { println!(\"Modified\"); }")
-            .await
-            .unwrap();
-        smol::fs::write(&bin_path, "Modified binary file")
-            .await
-            .unwrap();
-
-        repo.restore_checkpoint(checkpoint).await.unwrap();
-
-        // Text files should be restored to checkpoint state,
-        // but binaries should not (they aren't tracked)
-        assert_eq!(
-            smol::fs::read_to_string(&text_path).await.unwrap(),
-            "fn main() {}"
-        );
-
-        assert_eq!(
-            smol::fs::read_to_string(&bin_path).await.unwrap(),
-            "Modified binary file"
-        );
-    }
-
-    #[test]
-    fn test_branches_parsing() {
-        // suppress "help: octal escapes are not supported, `\0` is always null"
-        #[allow(clippy::octal_escapes)]
-        let input = "*\0060964da10574cd9bf06463a53bf6e0769c5c45e\0\0refs/heads/zed-patches\0refs/remotes/origin/zed-patches\0\01733187470\0John Doe\0generated protobuf\n";
-        assert_eq!(
-            parse_branch_input(input).unwrap(),
-            vec![Branch {
-                is_head: true,
-                ref_name: "refs/heads/zed-patches".into(),
-                upstream: Some(Upstream {
-                    ref_name: "refs/remotes/origin/zed-patches".into(),
-                    tracking: UpstreamTracking::Tracked(UpstreamTrackingStatus {
-                        ahead: 0,
-                        behind: 0
-                    })
-                }),
-                most_recent_commit: Some(CommitSummary {
-                    sha: "060964da10574cd9bf06463a53bf6e0769c5c45e".into(),
-                    subject: "generated protobuf".into(),
-                    commit_timestamp: 1733187470,
-                    author_name: SharedString::new("John Doe"),
-                    has_parent: false,
-                })
-            }]
-        )
-    }
-
-    #[test]
-    fn test_branches_parsing_containing_refs_with_missing_fields() {
-        #[allow(clippy::octal_escapes)]
-        let input = " \090012116c03db04344ab10d50348553aa94f1ea0\0refs/heads/broken\n \0eb0cae33272689bd11030822939dd2701c52f81e\0895951d681e5561478c0acdd6905e8aacdfd2249\0refs/heads/dev\0\0\01762948725\0Zed\0Add feature\n*\0895951d681e5561478c0acdd6905e8aacdfd2249\0\0refs/heads/main\0\0\01762948695\0Zed\0Initial commit\n";
-
-        let branches = parse_branch_input(input).unwrap();
-        assert_eq!(branches.len(), 2);
-        assert_eq!(
-            branches,
-            vec![
-                Branch {
-                    is_head: false,
-                    ref_name: "refs/heads/dev".into(),
-                    upstream: None,
-                    most_recent_commit: Some(CommitSummary {
-                        sha: "eb0cae33272689bd11030822939dd2701c52f81e".into(),
-                        subject: "Add feature".into(),
-                        commit_timestamp: 1762948725,
-                        author_name: SharedString::new("Zed"),
-                        has_parent: true,
-                    })
-                },
-                Branch {
-                    is_head: true,
-                    ref_name: "refs/heads/main".into(),
-                    upstream: None,
-                    most_recent_commit: Some(CommitSummary {
-                        sha: "895951d681e5561478c0acdd6905e8aacdfd2249".into(),
-                        subject: "Initial commit".into(),
-                        commit_timestamp: 1762948695,
-                        author_name: SharedString::new("Zed"),
-                        has_parent: false,
-                    })
-                }
-            ]
-        )
-    }
-
-    impl RealGitRepository {
-        /// Force a Git garbage collection on the repository.
-        fn gc(&self) -> BoxFuture<'_, Result<()>> {
-            let working_directory = self.working_directory();
-            let git_binary_path = self.any_git_binary_path.clone();
-            let executor = self.executor.clone();
-            self.executor
-                .spawn(async move {
-                    let git_binary_path = git_binary_path.clone();
-                    let working_directory = working_directory?;
-                    let git = GitBinary::new(git_binary_path, working_directory, executor);
-                    git.run(&["gc", "--prune"]).await?;
-                    Ok(())
-                })
-                .boxed()
-        }
-    }
-}
diff --git a/crates/git/src/stash.rs b/crates/git/src/stash.rs
deleted file mode 100644
index f7379f5212..0000000000
--- a/crates/git/src/stash.rs
+++ /dev/null
@@ -1,223 +0,0 @@
-use crate::Oid;
-use anyhow::{Context, Result, anyhow};
-use std::{str::FromStr, sync::Arc};
-
-#[derive(Clone, Debug, Eq, Hash, PartialEq)]
-pub struct StashEntry {
-    pub index: usize,
-    pub oid: Oid,
-    pub message: String,
-    pub branch: Option<String>,
-    pub timestamp: i64,
-}
-
-#[derive(Clone, Debug, Default, Eq, Hash, PartialEq)]
-pub struct GitStash {
-    pub entries: Arc<[StashEntry]>,
-}
-
-impl GitStash {
-    pub fn apply(&mut self, other: GitStash) {
-        self.entries = other.entries;
-    }
-}
-
-impl FromStr for GitStash {
-    type Err = anyhow::Error;
-
-    fn from_str(s: &str) -> Result<Self> {
-        if s.trim().is_empty() {
-            return Ok(Self::default());
-        }
-
-        let mut entries = Vec::new();
-        let mut errors = Vec::new();
-
-        for (line_num, line) in s.lines().enumerate() {
-            if line.trim().is_empty() {
-                continue;
-            }
-
-            match parse_stash_line(line) {
-                Ok(entry) => entries.push(entry),
-                Err(e) => {
-                    errors.push(format!("Line {}: {}", line_num + 1, e));
-                }
-            }
-        }
-
-        // If we have some valid entries but also some errors, log the errors but continue
-        if !errors.is_empty() && !entries.is_empty() {
-            log::warn!("Failed to parse some stash entries: {}", errors.join(", "));
-        } else if !errors.is_empty() {
-            return Err(anyhow!(
-                "Failed to parse stash entries: {}",
-                errors.join(", ")
-            ));
-        }
-
-        Ok(Self {
-            entries: entries.into(),
-        })
-    }
-}
-
-/// Parse a single stash line in the format: "stash@{N}\0<oid>\0<timestamp>\0<message>"
-fn parse_stash_line(line: &str) -> Result<StashEntry> {
-    let parts: Vec<&str> = line.splitn(4, '\0').collect();
-
-    if parts.len() != 4 {
-        return Err(anyhow!(
-            "Expected 4 null-separated parts, got {}",
-            parts.len()
-        ));
-    }
-
-    let index = parse_stash_index(parts[0])
-        .with_context(|| format!("Failed to parse stash index from '{}'", parts[0]))?;
-
-    let oid = Oid::from_str(parts[1])
-        .with_context(|| format!("Failed to parse OID from '{}'", parts[1]))?;
-
-    let timestamp = parts[2]
-        .parse::<i64>()
-        .with_context(|| format!("Failed to parse timestamp from '{}'", parts[2]))?;
-
-    let (branch, message) = parse_stash_message(parts[3]);
-
-    Ok(StashEntry {
-        index,
-        oid,
-        message: message.to_string(),
-        branch: branch.map(Into::into),
-        timestamp,
-    })
-}
-
-/// Parse stash index from format "stash@{N}" where N is the index
-fn parse_stash_index(input: &str) -> Result<usize> {
-    let trimmed = input.trim();
-
-    if !trimmed.starts_with("stash@{") || !trimmed.ends_with('}') {
-        return Err(anyhow!(
-            "Invalid stash index format: expected 'stash@{{N}}'"
-        ));
-    }
-
-    let index_str = trimmed
-        .strip_prefix("stash@{")
-        .and_then(|s| s.strip_suffix('}'))
-        .ok_or_else(|| anyhow!("Failed to extract index from stash reference"))?;
-
-    index_str
-        .parse::<usize>()
-        .with_context(|| format!("Invalid stash index number: '{}'", index_str))
-}
-
-/// Parse stash message and extract branch information if present
-///
-/// Handles the following formats:
-/// - "WIP on <branch>: <message>" -> (Some(branch), message)
-/// - "On <branch>: <message>" -> (Some(branch), message)
-/// - "<message>" -> (None, message)
-fn parse_stash_message(input: &str) -> (Option<&str>, &str) {
-    // Handle "WIP on <branch>: <message>" pattern
-    if let Some(stripped) = input.strip_prefix("WIP on ")
-        && let Some(colon_pos) = stripped.find(": ")
-    {
-        let branch = &stripped[..colon_pos];
-        let message = &stripped[colon_pos + 2..];
-        if !branch.is_empty() && !message.is_empty() {
-            return (Some(branch), message);
-        }
-    }
-
-    // Handle "On <branch>: <message>" pattern
-    if let Some(stripped) = input.strip_prefix("On ")
-        && let Some(colon_pos) = stripped.find(": ")
-    {
-        let branch = &stripped[..colon_pos];
-        let message = &stripped[colon_pos + 2..];
-        if !branch.is_empty() && !message.is_empty() {
-            return (Some(branch), message);
-        }
-    }
-
-    // Fallback: treat entire input as message with no branch
-    (None, input)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_parse_stash_index() {
-        assert_eq!(parse_stash_index("stash@{0}").unwrap(), 0);
-        assert_eq!(parse_stash_index("stash@{42}").unwrap(), 42);
-        assert_eq!(parse_stash_index("  stash@{5}  ").unwrap(), 5);
-
-        assert!(parse_stash_index("invalid").is_err());
-        assert!(parse_stash_index("stash@{not_a_number}").is_err());
-        assert!(parse_stash_index("stash@{0").is_err());
-    }
-
-    #[test]
-    fn test_parse_stash_message() {
-        // WIP format
-        let (branch, message) = parse_stash_message("WIP on main: working on feature");
-        assert_eq!(branch, Some("main"));
-        assert_eq!(message, "working on feature");
-
-        // On format
-        let (branch, message) = parse_stash_message("On feature-branch: some changes");
-        assert_eq!(branch, Some("feature-branch"));
-        assert_eq!(message, "some changes");
-
-        // No branch format
-        let (branch, message) = parse_stash_message("just a regular message");
-        assert_eq!(branch, None);
-        assert_eq!(message, "just a regular message");
-
-        // Edge cases
-        let (branch, message) = parse_stash_message("WIP on : empty message");
-        assert_eq!(branch, None);
-        assert_eq!(message, "WIP on : empty message");
-
-        let (branch, message) = parse_stash_message("On branch-name:");
-        assert_eq!(branch, None);
-        assert_eq!(message, "On branch-name:");
-    }
-
-    #[test]
-    fn test_parse_stash_line() {
-        let line = "stash@{0}\u{0000}abc123\u{0000}1234567890\u{0000}WIP on main: test commit";
-        let entry = parse_stash_line(line).unwrap();
-
-        assert_eq!(entry.index, 0);
-        assert_eq!(entry.message, "test commit");
-        assert_eq!(entry.branch, Some("main".to_string()));
-        assert_eq!(entry.timestamp, 1234567890);
-    }
-
-    #[test]
-    fn test_git_stash_from_str() {
-        let input = "stash@{0}\u{0000}abc123\u{0000}1234567890\u{0000}WIP on main: first stash\nstash@{1}\u{0000}def456\u{0000}1234567891\u{0000}On feature: second stash";
-        let stash = GitStash::from_str(input).unwrap();
-
-        assert_eq!(stash.entries.len(), 2);
-        assert_eq!(stash.entries[0].index, 0);
-        assert_eq!(stash.entries[0].branch, Some("main".to_string()));
-        assert_eq!(stash.entries[1].index, 1);
-        assert_eq!(stash.entries[1].branch, Some("feature".to_string()));
-    }
-
-    #[test]
-    fn test_git_stash_empty_input() {
-        let stash = GitStash::from_str("").unwrap();
-        assert_eq!(stash.entries.len(), 0);
-
-        let stash = GitStash::from_str("   \n  \n  ").unwrap();
-        assert_eq!(stash.entries.len(), 0);
-    }
-}
diff --git a/crates/git/src/status.rs b/crates/git/src/status.rs
deleted file mode 100644
index 2cf7cc7c18..0000000000
--- a/crates/git/src/status.rs
+++ /dev/null
@@ -1,619 +0,0 @@
-use crate::{Oid, repository::RepoPath};
-use anyhow::{Result, anyhow};
-use collections::HashMap;
-use gpui::SharedString;
-use serde::{Deserialize, Serialize};
-use std::{str::FromStr, sync::Arc};
-use util::{ResultExt, rel_path::RelPath};
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
-pub enum FileStatus {
-    Untracked,
-    Ignored,
-    Unmerged(UnmergedStatus),
-    Tracked(TrackedStatus),
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
-pub struct UnmergedStatus {
-    pub first_head: UnmergedStatusCode,
-    pub second_head: UnmergedStatusCode,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
-pub enum UnmergedStatusCode {
-    Added,
-    Deleted,
-    Updated,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
-pub struct TrackedStatus {
-    pub index_status: StatusCode,
-    pub worktree_status: StatusCode,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
-pub enum StatusCode {
-    Modified,
-    TypeChanged,
-    Added,
-    Deleted,
-    Renamed,
-    Copied,
-    Unmodified,
-}
-
-impl From<UnmergedStatus> for FileStatus {
-    fn from(value: UnmergedStatus) -> Self {
-        FileStatus::Unmerged(value)
-    }
-}
-
-impl From<TrackedStatus> for FileStatus {
-    fn from(value: TrackedStatus) -> Self {
-        FileStatus::Tracked(value)
-    }
-}
-
-#[derive(Debug, PartialEq, Eq, Clone, Copy)]
-pub enum StageStatus {
-    Staged,
-    Unstaged,
-    PartiallyStaged,
-}
-
-impl StageStatus {
-    pub const fn is_fully_staged(&self) -> bool {
-        matches!(self, StageStatus::Staged)
-    }
-
-    pub const fn is_fully_unstaged(&self) -> bool {
-        matches!(self, StageStatus::Unstaged)
-    }
-
-    pub const fn has_staged(&self) -> bool {
-        matches!(self, StageStatus::Staged | StageStatus::PartiallyStaged)
-    }
-
-    pub const fn has_unstaged(&self) -> bool {
-        matches!(self, StageStatus::Unstaged | StageStatus::PartiallyStaged)
-    }
-
-    pub const fn as_bool(self) -> Option<bool> {
-        match self {
-            StageStatus::Staged => Some(true),
-            StageStatus::Unstaged => Some(false),
-            StageStatus::PartiallyStaged => None,
-        }
-    }
-}
-
-impl FileStatus {
-    pub const fn worktree(worktree_status: StatusCode) -> Self {
-        FileStatus::Tracked(TrackedStatus {
-            index_status: StatusCode::Unmodified,
-            worktree_status,
-        })
-    }
-
-    pub const fn index(index_status: StatusCode) -> Self {
-        FileStatus::Tracked(TrackedStatus {
-            worktree_status: StatusCode::Unmodified,
-            index_status,
-        })
-    }
-
-    /// Generate a FileStatus Code from a byte pair, as described in
-    /// https://git-scm.com/docs/git-status#_output
-    ///
-    /// NOTE: That instead of '', we use ' ' to denote no change
-    fn from_bytes(bytes: [u8; 2]) -> anyhow::Result<Self> {
-        let status = match bytes {
-            [b'?', b'?'] => FileStatus::Untracked,
-            [b'!', b'!'] => FileStatus::Ignored,
-            [b'A', b'A'] => UnmergedStatus {
-                first_head: UnmergedStatusCode::Added,
-                second_head: UnmergedStatusCode::Added,
-            }
-            .into(),
-            [b'D', b'D'] => UnmergedStatus {
-                first_head: UnmergedStatusCode::Added,
-                second_head: UnmergedStatusCode::Added,
-            }
-            .into(),
-            [x, b'U'] => UnmergedStatus {
-                first_head: UnmergedStatusCode::from_byte(x)?,
-                second_head: UnmergedStatusCode::Updated,
-            }
-            .into(),
-            [b'U', y] => UnmergedStatus {
-                first_head: UnmergedStatusCode::Updated,
-                second_head: UnmergedStatusCode::from_byte(y)?,
-            }
-            .into(),
-            [x, y] => TrackedStatus {
-                index_status: StatusCode::from_byte(x)?,
-                worktree_status: StatusCode::from_byte(y)?,
-            }
-            .into(),
-        };
-        Ok(status)
-    }
-
-    pub fn staging(self) -> StageStatus {
-        match self {
-            FileStatus::Untracked | FileStatus::Ignored | FileStatus::Unmerged { .. } => {
-                StageStatus::Unstaged
-            }
-            FileStatus::Tracked(tracked) => match (tracked.index_status, tracked.worktree_status) {
-                (StatusCode::Unmodified, _) => StageStatus::Unstaged,
-                (_, StatusCode::Unmodified) => StageStatus::Staged,
-                _ => StageStatus::PartiallyStaged,
-            },
-        }
-    }
-
-    pub fn is_conflicted(self) -> bool {
-        matches!(self, FileStatus::Unmerged { .. })
-    }
-
-    pub fn is_ignored(self) -> bool {
-        matches!(self, FileStatus::Ignored)
-    }
-
-    pub fn has_changes(&self) -> bool {
-        self.is_modified()
-            || self.is_created()
-            || self.is_deleted()
-            || self.is_untracked()
-            || self.is_conflicted()
-    }
-
-    pub fn is_modified(self) -> bool {
-        match self {
-            FileStatus::Tracked(tracked) => matches!(
-                (tracked.index_status, tracked.worktree_status),
-                (StatusCode::Modified, _) | (_, StatusCode::Modified)
-            ),
-            _ => false,
-        }
-    }
-
-    pub fn is_created(self) -> bool {
-        match self {
-            FileStatus::Tracked(tracked) => matches!(
-                (tracked.index_status, tracked.worktree_status),
-                (StatusCode::Added, _) | (_, StatusCode::Added)
-            ),
-            FileStatus::Untracked => true,
-            _ => false,
-        }
-    }
-
-    pub fn is_deleted(self) -> bool {
-        let FileStatus::Tracked(tracked) = self else {
-            return false;
-        };
-        tracked.index_status == StatusCode::Deleted && tracked.worktree_status != StatusCode::Added
-            || tracked.worktree_status == StatusCode::Deleted
-    }
-
-    pub fn is_untracked(self) -> bool {
-        matches!(self, FileStatus::Untracked)
-    }
-
-    pub fn summary(self) -> GitSummary {
-        match self {
-            FileStatus::Ignored => GitSummary::UNCHANGED,
-            FileStatus::Untracked => GitSummary::UNTRACKED,
-            FileStatus::Unmerged(_) => GitSummary::CONFLICT,
-            FileStatus::Tracked(TrackedStatus {
-                index_status,
-                worktree_status,
-            }) => GitSummary {
-                index: index_status.to_summary(),
-                worktree: worktree_status.to_summary(),
-                conflict: 0,
-                untracked: 0,
-                count: 1,
-            },
-        }
-    }
-}
-
-impl StatusCode {
-    fn from_byte(byte: u8) -> anyhow::Result<Self> {
-        match byte {
-            b'M' => Ok(StatusCode::Modified),
-            b'T' => Ok(StatusCode::TypeChanged),
-            b'A' => Ok(StatusCode::Added),
-            b'D' => Ok(StatusCode::Deleted),
-            b'R' => Ok(StatusCode::Renamed),
-            b'C' => Ok(StatusCode::Copied),
-            b' ' => Ok(StatusCode::Unmodified),
-            _ => anyhow::bail!("Invalid status code: {byte}"),
-        }
-    }
-
-    fn to_summary(self) -> TrackedSummary {
-        match self {
-            StatusCode::Modified | StatusCode::TypeChanged => TrackedSummary {
-                modified: 1,
-                ..TrackedSummary::UNCHANGED
-            },
-            StatusCode::Added => TrackedSummary {
-                added: 1,
-                ..TrackedSummary::UNCHANGED
-            },
-            StatusCode::Deleted => TrackedSummary {
-                deleted: 1,
-                ..TrackedSummary::UNCHANGED
-            },
-            StatusCode::Renamed | StatusCode::Copied | StatusCode::Unmodified => {
-                TrackedSummary::UNCHANGED
-            }
-        }
-    }
-
-    pub fn index(self) -> FileStatus {
-        FileStatus::Tracked(TrackedStatus {
-            index_status: self,
-            worktree_status: StatusCode::Unmodified,
-        })
-    }
-
-    pub fn worktree(self) -> FileStatus {
-        FileStatus::Tracked(TrackedStatus {
-            index_status: StatusCode::Unmodified,
-            worktree_status: self,
-        })
-    }
-}
-
-impl UnmergedStatusCode {
-    fn from_byte(byte: u8) -> anyhow::Result<Self> {
-        match byte {
-            b'A' => Ok(UnmergedStatusCode::Added),
-            b'D' => Ok(UnmergedStatusCode::Deleted),
-            b'U' => Ok(UnmergedStatusCode::Updated),
-            _ => anyhow::bail!("Invalid unmerged status code: {byte}"),
-        }
-    }
-}
-
-#[derive(Clone, Debug, Default, Copy, PartialEq, Eq)]
-pub struct TrackedSummary {
-    pub added: usize,
-    pub modified: usize,
-    pub deleted: usize,
-}
-
-impl TrackedSummary {
-    pub const UNCHANGED: Self = Self {
-        added: 0,
-        modified: 0,
-        deleted: 0,
-    };
-
-    pub const ADDED: Self = Self {
-        added: 1,
-        modified: 0,
-        deleted: 0,
-    };
-
-    pub const MODIFIED: Self = Self {
-        added: 0,
-        modified: 1,
-        deleted: 0,
-    };
-
-    pub const DELETED: Self = Self {
-        added: 0,
-        modified: 0,
-        deleted: 1,
-    };
-}
-
-impl std::ops::AddAssign for TrackedSummary {
-    fn add_assign(&mut self, rhs: Self) {
-        self.added += rhs.added;
-        self.modified += rhs.modified;
-        self.deleted += rhs.deleted;
-    }
-}
-
-impl std::ops::Add for TrackedSummary {
-    type Output = Self;
-
-    fn add(self, rhs: Self) -> Self::Output {
-        TrackedSummary {
-            added: self.added + rhs.added,
-            modified: self.modified + rhs.modified,
-            deleted: self.deleted + rhs.deleted,
-        }
-    }
-}
-
-impl std::ops::Sub for TrackedSummary {
-    type Output = Self;
-
-    fn sub(self, rhs: Self) -> Self::Output {
-        TrackedSummary {
-            added: self.added - rhs.added,
-            modified: self.modified - rhs.modified,
-            deleted: self.deleted - rhs.deleted,
-        }
-    }
-}
-
-#[derive(Clone, Debug, Default, Copy, PartialEq, Eq)]
-pub struct GitSummary {
-    pub index: TrackedSummary,
-    pub worktree: TrackedSummary,
-    pub conflict: usize,
-    pub untracked: usize,
-    pub count: usize,
-}
-
-impl GitSummary {
-    pub const CONFLICT: Self = Self {
-        conflict: 1,
-        count: 1,
-        ..Self::UNCHANGED
-    };
-
-    pub const UNTRACKED: Self = Self {
-        untracked: 1,
-        count: 1,
-        ..Self::UNCHANGED
-    };
-
-    pub const UNCHANGED: Self = Self {
-        index: TrackedSummary::UNCHANGED,
-        worktree: TrackedSummary::UNCHANGED,
-        conflict: 0,
-        untracked: 0,
-        count: 0,
-    };
-}
-
-impl From<FileStatus> for GitSummary {
-    fn from(status: FileStatus) -> Self {
-        status.summary()
-    }
-}
-
-impl sum_tree::ContextLessSummary for GitSummary {
-    fn zero() -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, rhs: &Self) {
-        *self += *rhs;
-    }
-}
-
-impl std::ops::Add<Self> for GitSummary {
-    type Output = Self;
-
-    fn add(mut self, rhs: Self) -> Self {
-        self += rhs;
-        self
-    }
-}
-
-impl std::ops::AddAssign for GitSummary {
-    fn add_assign(&mut self, rhs: Self) {
-        self.index += rhs.index;
-        self.worktree += rhs.worktree;
-        self.conflict += rhs.conflict;
-        self.untracked += rhs.untracked;
-        self.count += rhs.count;
-    }
-}
-
-impl std::ops::Sub for GitSummary {
-    type Output = GitSummary;
-
-    fn sub(self, rhs: Self) -> Self::Output {
-        GitSummary {
-            index: self.index - rhs.index,
-            worktree: self.worktree - rhs.worktree,
-            conflict: self.conflict - rhs.conflict,
-            untracked: self.untracked - rhs.untracked,
-            count: self.count - rhs.count,
-        }
-    }
-}
-
-#[derive(Clone, Debug)]
-pub struct GitStatus {
-    pub entries: Arc<[(RepoPath, FileStatus)]>,
-}
-
-impl FromStr for GitStatus {
-    type Err = anyhow::Error;
-
-    fn from_str(s: &str) -> Result<Self> {
-        let mut entries = s
-            .split('\0')
-            .filter_map(|entry| {
-                let sep = entry.get(2..3)?;
-                if sep != " " {
-                    return None;
-                };
-                let path = &entry[3..];
-                // The git status output includes untracked directories as well as untracked files.
-                // We do our own processing to compute the "summary" status of each directory,
-                // so just skip any directories in the output, since they'll otherwise interfere
-                // with our handling of nested repositories.
-                if path.ends_with('/') {
-                    return None;
-                }
-                let status = entry.as_bytes()[0..2].try_into().unwrap();
-                let status = FileStatus::from_bytes(status).log_err()?;
-                // git-status outputs `/`-delimited repo paths, even on Windows.
-                let path = RepoPath::from_rel_path(RelPath::unix(path).log_err()?);
-                Some((path, status))
-            })
-            .collect::<Vec<_>>();
-        entries.sort_unstable_by(|(a, _), (b, _)| a.cmp(b));
-        // When a file exists in HEAD, is deleted in the index, and exists again in the working copy,
-        // git produces two lines for it, one reading `D ` (deleted in index, unmodified in working copy)
-        // and the other reading `??` (untracked). Merge these two into the equivalent of `DA`.
-        entries.dedup_by(|(a, a_status), (b, b_status)| {
-            const INDEX_DELETED: FileStatus = FileStatus::index(StatusCode::Deleted);
-            if a.ne(&b) {
-                return false;
-            }
-            match (*a_status, *b_status) {
-                (INDEX_DELETED, FileStatus::Untracked) | (FileStatus::Untracked, INDEX_DELETED) => {
-                    *b_status = TrackedStatus {
-                        index_status: StatusCode::Deleted,
-                        worktree_status: StatusCode::Added,
-                    }
-                    .into();
-                }
-                _ => panic!("Unexpected duplicated status entries: {a_status:?} and {b_status:?}"),
-            }
-            true
-        });
-        Ok(Self {
-            entries: entries.into(),
-        })
-    }
-}
-
-impl Default for GitStatus {
-    fn default() -> Self {
-        Self {
-            entries: Arc::new([]),
-        }
-    }
-}
-
-pub enum DiffTreeType {
-    MergeBase {
-        base: SharedString,
-        head: SharedString,
-    },
-    Since {
-        base: SharedString,
-        head: SharedString,
-    },
-}
-
-impl DiffTreeType {
-    pub fn base(&self) -> &SharedString {
-        match self {
-            DiffTreeType::MergeBase { base, .. } => base,
-            DiffTreeType::Since { base, .. } => base,
-        }
-    }
-
-    pub fn head(&self) -> &SharedString {
-        match self {
-            DiffTreeType::MergeBase { head, .. } => head,
-            DiffTreeType::Since { head, .. } => head,
-        }
-    }
-}
-
-#[derive(Debug, PartialEq)]
-pub struct TreeDiff {
-    pub entries: HashMap<RepoPath, TreeDiffStatus>,
-}
-
-#[derive(Debug, Clone, PartialEq)]
-pub enum TreeDiffStatus {
-    Added,
-    Modified { old: Oid },
-    Deleted { old: Oid },
-}
-
-impl FromStr for TreeDiff {
-    type Err = anyhow::Error;
-
-    fn from_str(s: &str) -> Result<Self> {
-        let mut fields = s.split('\0');
-        let mut parsed = HashMap::default();
-        while let Some((status, path)) = fields.next().zip(fields.next()) {
-            let path = RepoPath::from_rel_path(RelPath::unix(path)?);
-
-            let mut fields = status.split(" ").skip(2);
-            let old_sha = fields
-                .next()
-                .ok_or_else(|| anyhow!("expected to find old_sha"))?
-                .to_owned()
-                .parse()?;
-            let _new_sha = fields
-                .next()
-                .ok_or_else(|| anyhow!("expected to find new_sha"))?;
-            let status = fields
-                .next()
-                .and_then(|s| {
-                    if s.len() == 1 {
-                        s.as_bytes().first()
-                    } else {
-                        None
-                    }
-                })
-                .ok_or_else(|| anyhow!("expected to find status"))?;
-
-            let result = match StatusCode::from_byte(*status)? {
-                StatusCode::Modified => TreeDiffStatus::Modified { old: old_sha },
-                StatusCode::Added => TreeDiffStatus::Added,
-                StatusCode::Deleted => TreeDiffStatus::Deleted { old: old_sha },
-                _status => continue,
-            };
-
-            parsed.insert(path, result);
-        }
-
-        Ok(Self { entries: parsed })
-    }
-}
-
-#[cfg(test)]
-mod tests {
-
-    use crate::{
-        repository::RepoPath,
-        status::{TreeDiff, TreeDiffStatus},
-    };
-
-    #[test]
-    fn test_tree_diff_parsing() {
-        let input = ":000000 100644 0000000000000000000000000000000000000000 0062c311b8727c3a2e3cd7a41bc9904feacf8f98 A\x00.zed/settings.json\x00".to_owned() +
-            ":100644 000000 bb3e9ed2e97a8c02545bae243264d342c069afb3 0000000000000000000000000000000000000000 D\x00README.md\x00" +
-            ":100644 100644 42f097005a1f21eb2260fad02ec8c991282beee8 a437d85f63bb8c62bd78f83f40c506631fabf005 M\x00parallel.go\x00";
-
-        let output: TreeDiff = input.parse().unwrap();
-        assert_eq!(
-            output,
-            TreeDiff {
-                entries: [
-                    (
-                        RepoPath::new(".zed/settings.json").unwrap(),
-                        TreeDiffStatus::Added,
-                    ),
-                    (
-                        RepoPath::new("README.md").unwrap(),
-                        TreeDiffStatus::Deleted {
-                            old: "bb3e9ed2e97a8c02545bae243264d342c069afb3".parse().unwrap()
-                        }
-                    ),
-                    (
-                        RepoPath::new("parallel.go").unwrap(),
-                        TreeDiffStatus::Modified {
-                            old: "42f097005a1f21eb2260fad02ec8c991282beee8".parse().unwrap(),
-                        }
-                    ),
-                ]
-                .into_iter()
-                .collect()
-            }
-        )
-    }
-}
diff --git a/crates/git/test_data/blame_incremental_complex b/crates/git/test_data/blame_incremental_complex
deleted file mode 100644
index 76829b6481..0000000000
--- a/crates/git/test_data/blame_incremental_complex
+++ /dev/null
@@ -1,194 +0,0 @@
-5c4f3c0ceaa0b2270c8f4fc8ee32b85c70810206 6 6 3
-author Mahdy M. Karam
-author-mail <64036912+mmkaram@users.noreply.github.com>
-author-time 1708621949
-author-tz -0800
-committer GitHub
-committer-mail <noreply@github.com>
-committer-time 1708621949
-committer-tz -0700
-summary Add option to either use system clipboard or vim clipboard (#7936)
-previous c6826a61a0a947acf09d65ada568c9c4e4494cb2 crates/vim/src/utils.rs
-filename crates/vim/src/utils.rs
-5c4f3c0ceaa0b2270c8f4fc8ee32b85c70810206 12 12 2
-previous c6826a61a0a947acf09d65ada568c9c4e4494cb2 crates/vim/src/utils.rs
-filename crates/vim/src/utils.rs
-5c4f3c0ceaa0b2270c8f4fc8ee32b85c70810206 18 18 1
-previous c6826a61a0a947acf09d65ada568c9c4e4494cb2 crates/vim/src/utils.rs
-filename crates/vim/src/utils.rs
-5c4f3c0ceaa0b2270c8f4fc8ee32b85c70810206 21 21 7
-previous c6826a61a0a947acf09d65ada568c9c4e4494cb2 crates/vim/src/utils.rs
-filename crates/vim/src/utils.rs
-5c4f3c0ceaa0b2270c8f4fc8ee32b85c70810206 31 31 1
-previous c6826a61a0a947acf09d65ada568c9c4e4494cb2 crates/vim/src/utils.rs
-filename crates/vim/src/utils.rs
-5c4f3c0ceaa0b2270c8f4fc8ee32b85c70810206 34 34 1
-previous c6826a61a0a947acf09d65ada568c9c4e4494cb2 crates/vim/src/utils.rs
-filename crates/vim/src/utils.rs
-5c4f3c0ceaa0b2270c8f4fc8ee32b85c70810206 86 86 16
-previous c6826a61a0a947acf09d65ada568c9c4e4494cb2 crates/vim/src/utils.rs
-filename crates/vim/src/utils.rs
-3635d2dcedd83f1b6702f33ca2673317f7fa4695 1 1 2
-author Conrad Irwin
-author-mail <conrad@zed.dev>
-author-time 1707520689
-author-tz -0700
-committer GitHub
-committer-mail <noreply@github.com>
-committer-time 1707520689
-committer-tz -0700
-summary Highlight selections on vim yank (#7638)
-previous efe23ebfcdd653b13be79132b1e2925bcd7bde45 crates/vim/src/utils.rs
-filename crates/vim/src/utils.rs
-3635d2dcedd83f1b6702f33ca2673317f7fa4695 4 4 1
-previous efe23ebfcdd653b13be79132b1e2925bcd7bde45 crates/vim/src/utils.rs
-filename crates/vim/src/utils.rs
-3635d2dcedd83f1b6702f33ca2673317f7fa4695 7 10 2
-previous efe23ebfcdd653b13be79132b1e2925bcd7bde45 crates/vim/src/utils.rs
-filename crates/vim/src/utils.rs
-3635d2dcedd83f1b6702f33ca2673317f7fa4695 10 14 4
-previous efe23ebfcdd653b13be79132b1e2925bcd7bde45 crates/vim/src/utils.rs
-filename crates/vim/src/utils.rs
-3635d2dcedd83f1b6702f33ca2673317f7fa4695 15 19 2
-previous efe23ebfcdd653b13be79132b1e2925bcd7bde45 crates/vim/src/utils.rs
-filename crates/vim/src/utils.rs
-3635d2dcedd83f1b6702f33ca2673317f7fa4695 19 28 3
-previous efe23ebfcdd653b13be79132b1e2925bcd7bde45 crates/vim/src/utils.rs
-filename crates/vim/src/utils.rs
-3635d2dcedd83f1b6702f33ca2673317f7fa4695 22 32 2
-previous efe23ebfcdd653b13be79132b1e2925bcd7bde45 crates/vim/src/utils.rs
-filename crates/vim/src/utils.rs
-3635d2dcedd83f1b6702f33ca2673317f7fa4695 25 35 2
-previous efe23ebfcdd653b13be79132b1e2925bcd7bde45 crates/vim/src/utils.rs
-filename crates/vim/src/utils.rs
-3635d2dcedd83f1b6702f33ca2673317f7fa4695 31 41 1
-previous efe23ebfcdd653b13be79132b1e2925bcd7bde45 crates/vim/src/utils.rs
-filename crates/vim/src/utils.rs
-3635d2dcedd83f1b6702f33ca2673317f7fa4695 57 67 5
-previous efe23ebfcdd653b13be79132b1e2925bcd7bde45 crates/vim/src/utils.rs
-filename crates/vim/src/utils.rs
-3635d2dcedd83f1b6702f33ca2673317f7fa4695 78 102 18
-previous efe23ebfcdd653b13be79132b1e2925bcd7bde45 crates/vim/src/utils.rs
-filename crates/vim/src/utils.rs
-b65cf6d2d9576171edb407f5bbaa231c33af1f71 3 5 1
-author Max Brunsfeld
-author-mail <maxbrunsfeld@gmail.com>
-author-time 1705619094
-author-tz -0800
-committer Max Brunsfeld
-committer-mail <maxbrunsfeld@gmail.com>
-committer-time 1705619205
-committer-tz -0800
-summary Merge branch 'main' into language-api-docs
-previous 6457ccf9ece3b36a37e675783abee9748a443115 crates/vim/src/utils.rs
-filename crates/vim/src/utils.rs
-b65cf6d2d9576171edb407f5bbaa231c33af1f71 51 121 8
-previous 6457ccf9ece3b36a37e675783abee9748a443115 crates/vim/src/utils.rs
-filename crates/vim/src/utils.rs
-b02bd9bce1db3a68dcd606718fa02709020860af 29 61 1
-author Conrad Irwin
-author-mail <conrad@zed.dev>
-author-time 1694798044
-author-tz -0600
-committer Conrad Irwin
-committer-mail <conrad@zed.dev>
-committer-time 1694798044
-committer-tz -0600
-summary Fix Y on last line with no trailing new line
-previous 7c77baa7c17eea106330622e70513ea9389d50a1 crates/vim/src/utils.rs
-filename crates/vim/src/utils.rs
-b02bd9bce1db3a68dcd606718fa02709020860af 33 65 1
-previous 7c77baa7c17eea106330622e70513ea9389d50a1 crates/vim/src/utils.rs
-filename crates/vim/src/utils.rs
-e4794e3134b6449e36ed2771a8849046489cc252 13 45 1
-author Conrad Irwin
-author-mail <conrad@zed.dev>
-author-time 1692855942
-author-tz -0600
-committer Conrad Irwin
-committer-mail <conrad@zed.dev>
-committer-time 1692856812
-committer-tz -0600
-summary vim: Fix linewise copy of last line with no trailing newline
-previous 26c3312049a9c73bc3350528c1defd3820a7a8c7 crates/vim/src/utils.rs
-filename crates/vim/src/utils.rs
-e4794e3134b6449e36ed2771a8849046489cc252 21 53 8
-previous 26c3312049a9c73bc3350528c1defd3820a7a8c7 crates/vim/src/utils.rs
-filename crates/vim/src/utils.rs
-e4794e3134b6449e36ed2771a8849046489cc252 29 62 3
-previous 26c3312049a9c73bc3350528c1defd3820a7a8c7 crates/vim/src/utils.rs
-filename crates/vim/src/utils.rs
-e4794e3134b6449e36ed2771a8849046489cc252 33 66 1
-previous 26c3312049a9c73bc3350528c1defd3820a7a8c7 crates/vim/src/utils.rs
-filename crates/vim/src/utils.rs
-e4794e3134b6449e36ed2771a8849046489cc252 37 75 3
-previous 26c3312049a9c73bc3350528c1defd3820a7a8c7 crates/vim/src/utils.rs
-filename crates/vim/src/utils.rs
-33d7fe02ee560f6ed57d1425c43e60aef3b66e64 10 43 1
-author Conrad Irwin
-author-mail <conrad@zed.dev>
-author-time 1692644159
-author-tz -0600
-committer Conrad Irwin
-committer-mail <conrad@zed.dev>
-committer-time 1692732477
-committer-tz -0600
-summary Rewrite paste
-previous 31db5e4f62e8fca75aa0870f903ae044524c3580 crates/vim/src/utils.rs
-filename crates/vim/src/utils.rs
-33d7fe02ee560f6ed57d1425c43e60aef3b66e64 14 47 6
-previous 31db5e4f62e8fca75aa0870f903ae044524c3580 crates/vim/src/utils.rs
-filename crates/vim/src/utils.rs
-868c46062008bb0bcab2d41a38b4295996b9b958 20 81 1
-author Max Brunsfeld
-author-mail <maxbrunsfeld@gmail.com>
-author-time 1659072896
-author-tz -0700
-committer Max Brunsfeld
-committer-mail <maxbrunsfeld@gmail.com>
-committer-time 1659073230
-committer-tz -0700
-summary :art: Rename and simplify some autoindent stuff
-previous 7a26fa18c7fee3fe031b991e18b55fd8f9c4eb1b crates/vim/src/utils.rs
-filename crates/vim/src/utils.rs
-e93c49f4f02b3edaddae6a6a4cc0ac433f242357 5 37 1
-author Kaylee Simmons
-author-mail <kay@the-simmons.net>
-author-time 1653424557
-author-tz -0700
-committer Kaylee Simmons
-committer-mail <kay@the-simmons.net>
-committer-time 1653609725
-committer-tz -0700
-summary Unify visual line_mode and non line_mode operators
-previous 11569a869a72f786a9798c53266e28c05c79f824 crates/vim/src/utils.rs
-filename crates/vim/src/utils.rs
-082036161fd3815c831ceedfd28ba15b0ed6eb9f 1 3 1
-author Kaylee Simmons
-author-mail <kay@the-simmons.net>
-author-time 1653007350
-author-tz -0700
-committer Kaylee Simmons
-committer-mail <kay@the-simmons.net>
-committer-time 1653609725
-committer-tz -0700
-summary Enable copy and paste in vim mode
-filename crates/vim/src/utils.rs
-082036161fd3815c831ceedfd28ba15b0ed6eb9f 4 9 1
-filename crates/vim/src/utils.rs
-082036161fd3815c831ceedfd28ba15b0ed6eb9f 7 38 3
-filename crates/vim/src/utils.rs
-082036161fd3815c831ceedfd28ba15b0ed6eb9f 10 42 1
-filename crates/vim/src/utils.rs
-082036161fd3815c831ceedfd28ba15b0ed6eb9f 11 44 1
-filename crates/vim/src/utils.rs
-082036161fd3815c831ceedfd28ba15b0ed6eb9f 14 46 1
-filename crates/vim/src/utils.rs
-082036161fd3815c831ceedfd28ba15b0ed6eb9f 15 72 3
-filename crates/vim/src/utils.rs
-082036161fd3815c831ceedfd28ba15b0ed6eb9f 18 78 3
-filename crates/vim/src/utils.rs
-082036161fd3815c831ceedfd28ba15b0ed6eb9f 21 82 4
-filename crates/vim/src/utils.rs
-082036161fd3815c831ceedfd28ba15b0ed6eb9f 26 120 1
-filename crates/vim/src/utils.rs
diff --git a/crates/git/test_data/blame_incremental_not_committed b/crates/git/test_data/blame_incremental_not_committed
deleted file mode 100644
index dcac2ac742..0000000000
--- a/crates/git/test_data/blame_incremental_not_committed
+++ /dev/null
@@ -1,64 +0,0 @@
-0000000000000000000000000000000000000000 4 4 3
-author External file (--contents)
-author-mail <external.file>
-author-time 1710764166
-author-tz +0100
-committer External file (--contents)
-committer-mail <external.file>
-committer-time 1710764166
-committer-tz +0100
-summary Version of file_b.txt from file_b_memory.txt
-previous 4aaba34cb86b12f3a749dd6ddbf185de88de6527 file_b.txt
-filename file_b.txt
-0000000000000000000000000000000000000000 10 10 1
-previous 4aaba34cb86b12f3a749dd6ddbf185de88de6527 file_b.txt
-filename file_b.txt
-0000000000000000000000000000000000000000 15 15 2
-previous 4aaba34cb86b12f3a749dd6ddbf185de88de6527 file_b.txt
-filename file_b.txt
-4aaba34cb86b12f3a749dd6ddbf185de88de6527 4 7 2
-author Thorsten Ball
-author-mail <mrnugget@gmail.com>
-author-time 1710764113
-author-tz +0100
-committer Thorsten Ball
-committer-mail <mrnugget@gmail.com>
-committer-time 1710764113
-committer-tz +0100
-summary Another commit
-previous b2f6b0d982a9e7654bbb6d979c9ccb00b1d2e913 file_b.txt
-filename file_b.txt
-4aaba34cb86b12f3a749dd6ddbf185de88de6527 11 17 2
-previous b2f6b0d982a9e7654bbb6d979c9ccb00b1d2e913 file_b.txt
-filename file_b.txt
-b2f6b0d982a9e7654bbb6d979c9ccb00b1d2e913 6 9 1
-author Thorsten Ball
-author-mail <mrnugget@gmail.com>
-author-time 1710764087
-author-tz +0100
-committer Thorsten Ball
-committer-mail <mrnugget@gmail.com>
-committer-time 1710764087
-committer-tz +0100
-summary Another commit
-previous 7aef8a9a211ebc86824769c89f48e4f64aa6183f file_b.txt
-filename file_b.txt
-b2f6b0d982a9e7654bbb6d979c9ccb00b1d2e913 7 11 2
-previous 7aef8a9a211ebc86824769c89f48e4f64aa6183f file_b.txt
-filename file_b.txt
-e6d34e8fb494fe2b576d16037c61ba9d10722ba3 1 1 3
-author Thorsten Ball
-author-mail <mrnugget@gmail.com>
-author-time 1709299737
-author-tz +0100
-committer Thorsten Ball
-committer-mail <mrnugget@gmail.com>
-committer-time 1709299737
-committer-tz +0100
-summary Initial
-boundary
-filename file_b.txt
-e6d34e8fb494fe2b576d16037c61ba9d10722ba3 9 13 2
-filename file_b.txt
-e6d34e8fb494fe2b576d16037c61ba9d10722ba3 13 19 1
-filename file_b.txt
diff --git a/crates/git/test_data/blame_incremental_simple b/crates/git/test_data/blame_incremental_simple
deleted file mode 100644
index 58b0e3d5d4..0000000000
--- a/crates/git/test_data/blame_incremental_simple
+++ /dev/null
@@ -1,70 +0,0 @@
-0000000000000000000000000000000000000000 3 3 1
-author Not Committed Yet
-author-mail <not.committed.yet>
-author-time 1709895274
-author-tz +0100
-committer Not Committed Yet
-committer-mail <not.committed.yet>
-committer-time 1709895274
-committer-tz +0100
-summary Version of index.js from index.js
-previous a7037b4567dd171bfe563c761354ec9236c803b3 index.js
-filename index.js
-0000000000000000000000000000000000000000 7 7 2
-previous a7037b4567dd171bfe563c761354ec9236c803b3 index.js
-filename index.js
-c8d34ae30c87e59aaa5eb65f6c64d6206f525d7c 7 6 1
-author Thorsten Ball
-author-mail <mrnugget@example.com>
-author-time 1709808710
-author-tz +0100
-committer Thorsten Ball
-committer-mail <mrnugget@example.com>
-committer-time 1709808710
-committer-tz +0100
-summary Make a commit
-previous 6ad46b5257ba16d12c5ca9f0d4900320959df7f4 index.js
-filename index.js
-6ad46b5257ba16d12c5ca9f0d4900320959df7f4 2 2 1
-author Joe Schmoe
-author-mail <joe.schmoe@example.com>
-author-time 1709741400
-author-tz +0100
-committer Joe Schmoe
-committer-mail <joe.schmoe@example.com>
-committer-time 1709741400
-committer-tz +0100
-summary Joe's cool commit
-previous 486c2409237a2c627230589e567024a96751d475 index.js
-filename index.js
-6ad46b5257ba16d12c5ca9f0d4900320959df7f4 3 4 1
-previous 486c2409237a2c627230589e567024a96751d475 index.js
-filename index.js
-6ad46b5257ba16d12c5ca9f0d4900320959df7f4 13 9 1
-previous 486c2409237a2c627230589e567024a96751d475 index.js
-filename index.js
-486c2409237a2c627230589e567024a96751d475 3 1 1
-author Thorsten Ball
-author-mail <mrnugget@example.com>
-author-time 1709129122
-author-tz +0100
-committer Thorsten Ball
-committer-mail <mrnugget@example.com>
-committer-time 1709129122
-committer-tz +0100
-summary Get to a state where eslint would change code and imports
-previous 504065e448b467e79920040f22153e9d2ea0fd6e index.js
-filename index.js
-504065e448b467e79920040f22153e9d2ea0fd6e 3 5 1
-author Thorsten Ball
-author-mail <mrnugget@example.com>
-author-time 1709128963
-author-tz +0100
-committer Thorsten Ball
-committer-mail <mrnugget@example.com>
-committer-time 1709128963
-committer-tz +0100
-summary Add some stuff
-filename index.js
-504065e448b467e79920040f22153e9d2ea0fd6e 21 10 1
-filename index.js
diff --git a/crates/git/test_data/golden/blame_incremental_complex.json b/crates/git/test_data/golden/blame_incremental_complex.json
deleted file mode 100644
index 1f05fea8f5..0000000000
--- a/crates/git/test_data/golden/blame_incremental_complex.json
+++ /dev/null
@@ -1,781 +0,0 @@
-[
-  {
-    "sha": "5c4f3c0ceaa0b2270c8f4fc8ee32b85c70810206",
-    "range": {
-      "start": 5,
-      "end": 8
-    },
-    "original_line_number": 6,
-    "author": "Mahdy M. Karam",
-    "author_mail": "<64036912+mmkaram@users.noreply.github.com>",
-    "author_time": 1708621949,
-    "author_tz": "-0800",
-    "committer_name": "GitHub",
-    "committer_email": "<noreply@github.com>",
-    "committer_time": 1708621949,
-    "committer_tz": "-0700",
-    "summary": "Add option to either use system clipboard or vim clipboard (#7936)",
-    "previous": "c6826a61a0a947acf09d65ada568c9c4e4494cb2 crates/vim/src/utils.rs",
-    "filename": "crates/vim/src/utils.rs"
-  },
-  {
-    "sha": "5c4f3c0ceaa0b2270c8f4fc8ee32b85c70810206",
-    "range": {
-      "start": 11,
-      "end": 13
-    },
-    "original_line_number": 12,
-    "author": "Mahdy M. Karam",
-    "author_mail": "<64036912+mmkaram@users.noreply.github.com>",
-    "author_time": 1708621949,
-    "author_tz": "-0800",
-    "committer_name": "GitHub",
-    "committer_email": "<noreply@github.com>",
-    "committer_time": 1708621949,
-    "committer_tz": "-0700",
-    "summary": "Add option to either use system clipboard or vim clipboard (#7936)",
-    "previous": "c6826a61a0a947acf09d65ada568c9c4e4494cb2 crates/vim/src/utils.rs",
-    "filename": "crates/vim/src/utils.rs"
-  },
-  {
-    "sha": "5c4f3c0ceaa0b2270c8f4fc8ee32b85c70810206",
-    "range": {
-      "start": 17,
-      "end": 18
-    },
-    "original_line_number": 18,
-    "author": "Mahdy M. Karam",
-    "author_mail": "<64036912+mmkaram@users.noreply.github.com>",
-    "author_time": 1708621949,
-    "author_tz": "-0800",
-    "committer_name": "GitHub",
-    "committer_email": "<noreply@github.com>",
-    "committer_time": 1708621949,
-    "committer_tz": "-0700",
-    "summary": "Add option to either use system clipboard or vim clipboard (#7936)",
-    "previous": "c6826a61a0a947acf09d65ada568c9c4e4494cb2 crates/vim/src/utils.rs",
-    "filename": "crates/vim/src/utils.rs"
-  },
-  {
-    "sha": "5c4f3c0ceaa0b2270c8f4fc8ee32b85c70810206",
-    "range": {
-      "start": 20,
-      "end": 27
-    },
-    "original_line_number": 21,
-    "author": "Mahdy M. Karam",
-    "author_mail": "<64036912+mmkaram@users.noreply.github.com>",
-    "author_time": 1708621949,
-    "author_tz": "-0800",
-    "committer_name": "GitHub",
-    "committer_email": "<noreply@github.com>",
-    "committer_time": 1708621949,
-    "committer_tz": "-0700",
-    "summary": "Add option to either use system clipboard or vim clipboard (#7936)",
-    "previous": "c6826a61a0a947acf09d65ada568c9c4e4494cb2 crates/vim/src/utils.rs",
-    "filename": "crates/vim/src/utils.rs"
-  },
-  {
-    "sha": "5c4f3c0ceaa0b2270c8f4fc8ee32b85c70810206",
-    "range": {
-      "start": 30,
-      "end": 31
-    },
-    "original_line_number": 31,
-    "author": "Mahdy M. Karam",
-    "author_mail": "<64036912+mmkaram@users.noreply.github.com>",
-    "author_time": 1708621949,
-    "author_tz": "-0800",
-    "committer_name": "GitHub",
-    "committer_email": "<noreply@github.com>",
-    "committer_time": 1708621949,
-    "committer_tz": "-0700",
-    "summary": "Add option to either use system clipboard or vim clipboard (#7936)",
-    "previous": "c6826a61a0a947acf09d65ada568c9c4e4494cb2 crates/vim/src/utils.rs",
-    "filename": "crates/vim/src/utils.rs"
-  },
-  {
-    "sha": "5c4f3c0ceaa0b2270c8f4fc8ee32b85c70810206",
-    "range": {
-      "start": 33,
-      "end": 34
-    },
-    "original_line_number": 34,
-    "author": "Mahdy M. Karam",
-    "author_mail": "<64036912+mmkaram@users.noreply.github.com>",
-    "author_time": 1708621949,
-    "author_tz": "-0800",
-    "committer_name": "GitHub",
-    "committer_email": "<noreply@github.com>",
-    "committer_time": 1708621949,
-    "committer_tz": "-0700",
-    "summary": "Add option to either use system clipboard or vim clipboard (#7936)",
-    "previous": "c6826a61a0a947acf09d65ada568c9c4e4494cb2 crates/vim/src/utils.rs",
-    "filename": "crates/vim/src/utils.rs"
-  },
-  {
-    "sha": "5c4f3c0ceaa0b2270c8f4fc8ee32b85c70810206",
-    "range": {
-      "start": 85,
-      "end": 101
-    },
-    "original_line_number": 86,
-    "author": "Mahdy M. Karam",
-    "author_mail": "<64036912+mmkaram@users.noreply.github.com>",
-    "author_time": 1708621949,
-    "author_tz": "-0800",
-    "committer_name": "GitHub",
-    "committer_email": "<noreply@github.com>",
-    "committer_time": 1708621949,
-    "committer_tz": "-0700",
-    "summary": "Add option to either use system clipboard or vim clipboard (#7936)",
-    "previous": "c6826a61a0a947acf09d65ada568c9c4e4494cb2 crates/vim/src/utils.rs",
-    "filename": "crates/vim/src/utils.rs"
-  },
-  {
-    "sha": "3635d2dcedd83f1b6702f33ca2673317f7fa4695",
-    "range": {
-      "start": 0,
-      "end": 2
-    },
-    "original_line_number": 1,
-    "author": "Conrad Irwin",
-    "author_mail": "<conrad@zed.dev>",
-    "author_time": 1707520689,
-    "author_tz": "-0700",
-    "committer_name": "GitHub",
-    "committer_email": "<noreply@github.com>",
-    "committer_time": 1707520689,
-    "committer_tz": "-0700",
-    "summary": "Highlight selections on vim yank (#7638)",
-    "previous": "efe23ebfcdd653b13be79132b1e2925bcd7bde45 crates/vim/src/utils.rs",
-    "filename": "crates/vim/src/utils.rs"
-  },
-  {
-    "sha": "3635d2dcedd83f1b6702f33ca2673317f7fa4695",
-    "range": {
-      "start": 3,
-      "end": 4
-    },
-    "original_line_number": 4,
-    "author": "Conrad Irwin",
-    "author_mail": "<conrad@zed.dev>",
-    "author_time": 1707520689,
-    "author_tz": "-0700",
-    "committer_name": "GitHub",
-    "committer_email": "<noreply@github.com>",
-    "committer_time": 1707520689,
-    "committer_tz": "-0700",
-    "summary": "Highlight selections on vim yank (#7638)",
-    "previous": "efe23ebfcdd653b13be79132b1e2925bcd7bde45 crates/vim/src/utils.rs",
-    "filename": "crates/vim/src/utils.rs"
-  },
-  {
-    "sha": "3635d2dcedd83f1b6702f33ca2673317f7fa4695",
-    "range": {
-      "start": 9,
-      "end": 11
-    },
-    "original_line_number": 7,
-    "author": "Conrad Irwin",
-    "author_mail": "<conrad@zed.dev>",
-    "author_time": 1707520689,
-    "author_tz": "-0700",
-    "committer_name": "GitHub",
-    "committer_email": "<noreply@github.com>",
-    "committer_time": 1707520689,
-    "committer_tz": "-0700",
-    "summary": "Highlight selections on vim yank (#7638)",
-    "previous": "efe23ebfcdd653b13be79132b1e2925bcd7bde45 crates/vim/src/utils.rs",
-    "filename": "crates/vim/src/utils.rs"
-  },
-  {
-    "sha": "3635d2dcedd83f1b6702f33ca2673317f7fa4695",
-    "range": {
-      "start": 13,
-      "end": 17
-    },
-    "original_line_number": 10,
-    "author": "Conrad Irwin",
-    "author_mail": "<conrad@zed.dev>",
-    "author_time": 1707520689,
-    "author_tz": "-0700",
-    "committer_name": "GitHub",
-    "committer_email": "<noreply@github.com>",
-    "committer_time": 1707520689,
-    "committer_tz": "-0700",
-    "summary": "Highlight selections on vim yank (#7638)",
-    "previous": "efe23ebfcdd653b13be79132b1e2925bcd7bde45 crates/vim/src/utils.rs",
-    "filename": "crates/vim/src/utils.rs"
-  },
-  {
-    "sha": "3635d2dcedd83f1b6702f33ca2673317f7fa4695",
-    "range": {
-      "start": 18,
-      "end": 20
-    },
-    "original_line_number": 15,
-    "author": "Conrad Irwin",
-    "author_mail": "<conrad@zed.dev>",
-    "author_time": 1707520689,
-    "author_tz": "-0700",
-    "committer_name": "GitHub",
-    "committer_email": "<noreply@github.com>",
-    "committer_time": 1707520689,
-    "committer_tz": "-0700",
-    "summary": "Highlight selections on vim yank (#7638)",
-    "previous": "efe23ebfcdd653b13be79132b1e2925bcd7bde45 crates/vim/src/utils.rs",
-    "filename": "crates/vim/src/utils.rs"
-  },
-  {
-    "sha": "3635d2dcedd83f1b6702f33ca2673317f7fa4695",
-    "range": {
-      "start": 27,
-      "end": 30
-    },
-    "original_line_number": 19,
-    "author": "Conrad Irwin",
-    "author_mail": "<conrad@zed.dev>",
-    "author_time": 1707520689,
-    "author_tz": "-0700",
-    "committer_name": "GitHub",
-    "committer_email": "<noreply@github.com>",
-    "committer_time": 1707520689,
-    "committer_tz": "-0700",
-    "summary": "Highlight selections on vim yank (#7638)",
-    "previous": "efe23ebfcdd653b13be79132b1e2925bcd7bde45 crates/vim/src/utils.rs",
-    "filename": "crates/vim/src/utils.rs"
-  },
-  {
-    "sha": "3635d2dcedd83f1b6702f33ca2673317f7fa4695",
-    "range": {
-      "start": 31,
-      "end": 33
-    },
-    "original_line_number": 22,
-    "author": "Conrad Irwin",
-    "author_mail": "<conrad@zed.dev>",
-    "author_time": 1707520689,
-    "author_tz": "-0700",
-    "committer_name": "GitHub",
-    "committer_email": "<noreply@github.com>",
-    "committer_time": 1707520689,
-    "committer_tz": "-0700",
-    "summary": "Highlight selections on vim yank (#7638)",
-    "previous": "efe23ebfcdd653b13be79132b1e2925bcd7bde45 crates/vim/src/utils.rs",
-    "filename": "crates/vim/src/utils.rs"
-  },
-  {
-    "sha": "3635d2dcedd83f1b6702f33ca2673317f7fa4695",
-    "range": {
-      "start": 34,
-      "end": 36
-    },
-    "original_line_number": 25,
-    "author": "Conrad Irwin",
-    "author_mail": "<conrad@zed.dev>",
-    "author_time": 1707520689,
-    "author_tz": "-0700",
-    "committer_name": "GitHub",
-    "committer_email": "<noreply@github.com>",
-    "committer_time": 1707520689,
-    "committer_tz": "-0700",
-    "summary": "Highlight selections on vim yank (#7638)",
-    "previous": "efe23ebfcdd653b13be79132b1e2925bcd7bde45 crates/vim/src/utils.rs",
-    "filename": "crates/vim/src/utils.rs"
-  },
-  {
-    "sha": "3635d2dcedd83f1b6702f33ca2673317f7fa4695",
-    "range": {
-      "start": 40,
-      "end": 41
-    },
-    "original_line_number": 31,
-    "author": "Conrad Irwin",
-    "author_mail": "<conrad@zed.dev>",
-    "author_time": 1707520689,
-    "author_tz": "-0700",
-    "committer_name": "GitHub",
-    "committer_email": "<noreply@github.com>",
-    "committer_time": 1707520689,
-    "committer_tz": "-0700",
-    "summary": "Highlight selections on vim yank (#7638)",
-    "previous": "efe23ebfcdd653b13be79132b1e2925bcd7bde45 crates/vim/src/utils.rs",
-    "filename": "crates/vim/src/utils.rs"
-  },
-  {
-    "sha": "3635d2dcedd83f1b6702f33ca2673317f7fa4695",
-    "range": {
-      "start": 66,
-      "end": 71
-    },
-    "original_line_number": 57,
-    "author": "Conrad Irwin",
-    "author_mail": "<conrad@zed.dev>",
-    "author_time": 1707520689,
-    "author_tz": "-0700",
-    "committer_name": "GitHub",
-    "committer_email": "<noreply@github.com>",
-    "committer_time": 1707520689,
-    "committer_tz": "-0700",
-    "summary": "Highlight selections on vim yank (#7638)",
-    "previous": "efe23ebfcdd653b13be79132b1e2925bcd7bde45 crates/vim/src/utils.rs",
-    "filename": "crates/vim/src/utils.rs"
-  },
-  {
-    "sha": "3635d2dcedd83f1b6702f33ca2673317f7fa4695",
-    "range": {
-      "start": 101,
-      "end": 119
-    },
-    "original_line_number": 78,
-    "author": "Conrad Irwin",
-    "author_mail": "<conrad@zed.dev>",
-    "author_time": 1707520689,
-    "author_tz": "-0700",
-    "committer_name": "GitHub",
-    "committer_email": "<noreply@github.com>",
-    "committer_time": 1707520689,
-    "committer_tz": "-0700",
-    "summary": "Highlight selections on vim yank (#7638)",
-    "previous": "efe23ebfcdd653b13be79132b1e2925bcd7bde45 crates/vim/src/utils.rs",
-    "filename": "crates/vim/src/utils.rs"
-  },
-  {
-    "sha": "b65cf6d2d9576171edb407f5bbaa231c33af1f71",
-    "range": {
-      "start": 4,
-      "end": 5
-    },
-    "original_line_number": 3,
-    "author": "Max Brunsfeld",
-    "author_mail": "<maxbrunsfeld@gmail.com>",
-    "author_time": 1705619094,
-    "author_tz": "-0800",
-    "committer_name": "Max Brunsfeld",
-    "committer_email": "<maxbrunsfeld@gmail.com>",
-    "committer_time": 1705619205,
-    "committer_tz": "-0800",
-    "summary": "Merge branch 'main' into language-api-docs",
-    "previous": "6457ccf9ece3b36a37e675783abee9748a443115 crates/vim/src/utils.rs",
-    "filename": "crates/vim/src/utils.rs"
-  },
-  {
-    "sha": "b65cf6d2d9576171edb407f5bbaa231c33af1f71",
-    "range": {
-      "start": 120,
-      "end": 128
-    },
-    "original_line_number": 51,
-    "author": "Max Brunsfeld",
-    "author_mail": "<maxbrunsfeld@gmail.com>",
-    "author_time": 1705619094,
-    "author_tz": "-0800",
-    "committer_name": "Max Brunsfeld",
-    "committer_email": "<maxbrunsfeld@gmail.com>",
-    "committer_time": 1705619205,
-    "committer_tz": "-0800",
-    "summary": "Merge branch 'main' into language-api-docs",
-    "previous": "6457ccf9ece3b36a37e675783abee9748a443115 crates/vim/src/utils.rs",
-    "filename": "crates/vim/src/utils.rs"
-  },
-  {
-    "sha": "b02bd9bce1db3a68dcd606718fa02709020860af",
-    "range": {
-      "start": 60,
-      "end": 61
-    },
-    "original_line_number": 29,
-    "author": "Conrad Irwin",
-    "author_mail": "<conrad@zed.dev>",
-    "author_time": 1694798044,
-    "author_tz": "-0600",
-    "committer_name": "Conrad Irwin",
-    "committer_email": "<conrad@zed.dev>",
-    "committer_time": 1694798044,
-    "committer_tz": "-0600",
-    "summary": "Fix Y on last line with no trailing new line",
-    "previous": "7c77baa7c17eea106330622e70513ea9389d50a1 crates/vim/src/utils.rs",
-    "filename": "crates/vim/src/utils.rs"
-  },
-  {
-    "sha": "b02bd9bce1db3a68dcd606718fa02709020860af",
-    "range": {
-      "start": 64,
-      "end": 65
-    },
-    "original_line_number": 33,
-    "author": "Conrad Irwin",
-    "author_mail": "<conrad@zed.dev>",
-    "author_time": 1694798044,
-    "author_tz": "-0600",
-    "committer_name": "Conrad Irwin",
-    "committer_email": "<conrad@zed.dev>",
-    "committer_time": 1694798044,
-    "committer_tz": "-0600",
-    "summary": "Fix Y on last line with no trailing new line",
-    "previous": "7c77baa7c17eea106330622e70513ea9389d50a1 crates/vim/src/utils.rs",
-    "filename": "crates/vim/src/utils.rs"
-  },
-  {
-    "sha": "e4794e3134b6449e36ed2771a8849046489cc252",
-    "range": {
-      "start": 44,
-      "end": 45
-    },
-    "original_line_number": 13,
-    "author": "Conrad Irwin",
-    "author_mail": "<conrad@zed.dev>",
-    "author_time": 1692855942,
-    "author_tz": "-0600",
-    "committer_name": "Conrad Irwin",
-    "committer_email": "<conrad@zed.dev>",
-    "committer_time": 1692856812,
-    "committer_tz": "-0600",
-    "summary": "vim: Fix linewise copy of last line with no trailing newline",
-    "previous": "26c3312049a9c73bc3350528c1defd3820a7a8c7 crates/vim/src/utils.rs",
-    "filename": "crates/vim/src/utils.rs"
-  },
-  {
-    "sha": "e4794e3134b6449e36ed2771a8849046489cc252",
-    "range": {
-      "start": 52,
-      "end": 60
-    },
-    "original_line_number": 21,
-    "author": "Conrad Irwin",
-    "author_mail": "<conrad@zed.dev>",
-    "author_time": 1692855942,
-    "author_tz": "-0600",
-    "committer_name": "Conrad Irwin",
-    "committer_email": "<conrad@zed.dev>",
-    "committer_time": 1692856812,
-    "committer_tz": "-0600",
-    "summary": "vim: Fix linewise copy of last line with no trailing newline",
-    "previous": "26c3312049a9c73bc3350528c1defd3820a7a8c7 crates/vim/src/utils.rs",
-    "filename": "crates/vim/src/utils.rs"
-  },
-  {
-    "sha": "e4794e3134b6449e36ed2771a8849046489cc252",
-    "range": {
-      "start": 61,
-      "end": 64
-    },
-    "original_line_number": 29,
-    "author": "Conrad Irwin",
-    "author_mail": "<conrad@zed.dev>",
-    "author_time": 1692855942,
-    "author_tz": "-0600",
-    "committer_name": "Conrad Irwin",
-    "committer_email": "<conrad@zed.dev>",
-    "committer_time": 1692856812,
-    "committer_tz": "-0600",
-    "summary": "vim: Fix linewise copy of last line with no trailing newline",
-    "previous": "26c3312049a9c73bc3350528c1defd3820a7a8c7 crates/vim/src/utils.rs",
-    "filename": "crates/vim/src/utils.rs"
-  },
-  {
-    "sha": "e4794e3134b6449e36ed2771a8849046489cc252",
-    "range": {
-      "start": 65,
-      "end": 66
-    },
-    "original_line_number": 33,
-    "author": "Conrad Irwin",
-    "author_mail": "<conrad@zed.dev>",
-    "author_time": 1692855942,
-    "author_tz": "-0600",
-    "committer_name": "Conrad Irwin",
-    "committer_email": "<conrad@zed.dev>",
-    "committer_time": 1692856812,
-    "committer_tz": "-0600",
-    "summary": "vim: Fix linewise copy of last line with no trailing newline",
-    "previous": "26c3312049a9c73bc3350528c1defd3820a7a8c7 crates/vim/src/utils.rs",
-    "filename": "crates/vim/src/utils.rs"
-  },
-  {
-    "sha": "e4794e3134b6449e36ed2771a8849046489cc252",
-    "range": {
-      "start": 74,
-      "end": 77
-    },
-    "original_line_number": 37,
-    "author": "Conrad Irwin",
-    "author_mail": "<conrad@zed.dev>",
-    "author_time": 1692855942,
-    "author_tz": "-0600",
-    "committer_name": "Conrad Irwin",
-    "committer_email": "<conrad@zed.dev>",
-    "committer_time": 1692856812,
-    "committer_tz": "-0600",
-    "summary": "vim: Fix linewise copy of last line with no trailing newline",
-    "previous": "26c3312049a9c73bc3350528c1defd3820a7a8c7 crates/vim/src/utils.rs",
-    "filename": "crates/vim/src/utils.rs"
-  },
-  {
-    "sha": "33d7fe02ee560f6ed57d1425c43e60aef3b66e64",
-    "range": {
-      "start": 42,
-      "end": 43
-    },
-    "original_line_number": 10,
-    "author": "Conrad Irwin",
-    "author_mail": "<conrad@zed.dev>",
-    "author_time": 1692644159,
-    "author_tz": "-0600",
-    "committer_name": "Conrad Irwin",
-    "committer_email": "<conrad@zed.dev>",
-    "committer_time": 1692732477,
-    "committer_tz": "-0600",
-    "summary": "Rewrite paste",
-    "previous": "31db5e4f62e8fca75aa0870f903ae044524c3580 crates/vim/src/utils.rs",
-    "filename": "crates/vim/src/utils.rs"
-  },
-  {
-    "sha": "33d7fe02ee560f6ed57d1425c43e60aef3b66e64",
-    "range": {
-      "start": 46,
-      "end": 52
-    },
-    "original_line_number": 14,
-    "author": "Conrad Irwin",
-    "author_mail": "<conrad@zed.dev>",
-    "author_time": 1692644159,
-    "author_tz": "-0600",
-    "committer_name": "Conrad Irwin",
-    "committer_email": "<conrad@zed.dev>",
-    "committer_time": 1692732477,
-    "committer_tz": "-0600",
-    "summary": "Rewrite paste",
-    "previous": "31db5e4f62e8fca75aa0870f903ae044524c3580 crates/vim/src/utils.rs",
-    "filename": "crates/vim/src/utils.rs"
-  },
-  {
-    "sha": "868c46062008bb0bcab2d41a38b4295996b9b958",
-    "range": {
-      "start": 80,
-      "end": 81
-    },
-    "original_line_number": 20,
-    "author": "Max Brunsfeld",
-    "author_mail": "<maxbrunsfeld@gmail.com>",
-    "author_time": 1659072896,
-    "author_tz": "-0700",
-    "committer_name": "Max Brunsfeld",
-    "committer_email": "<maxbrunsfeld@gmail.com>",
-    "committer_time": 1659073230,
-    "committer_tz": "-0700",
-    "summary": ":art: Rename and simplify some autoindent stuff",
-    "previous": "7a26fa18c7fee3fe031b991e18b55fd8f9c4eb1b crates/vim/src/utils.rs",
-    "filename": "crates/vim/src/utils.rs"
-  },
-  {
-    "sha": "e93c49f4f02b3edaddae6a6a4cc0ac433f242357",
-    "range": {
-      "start": 36,
-      "end": 37
-    },
-    "original_line_number": 5,
-    "author": "Kaylee Simmons",
-    "author_mail": "<kay@the-simmons.net>",
-    "author_time": 1653424557,
-    "author_tz": "-0700",
-    "committer_name": "Kaylee Simmons",
-    "committer_email": "<kay@the-simmons.net>",
-    "committer_time": 1653609725,
-    "committer_tz": "-0700",
-    "summary": "Unify visual line_mode and non line_mode operators",
-    "previous": "11569a869a72f786a9798c53266e28c05c79f824 crates/vim/src/utils.rs",
-    "filename": "crates/vim/src/utils.rs"
-  },
-  {
-    "sha": "082036161fd3815c831ceedfd28ba15b0ed6eb9f",
-    "range": {
-      "start": 2,
-      "end": 3
-    },
-    "original_line_number": 1,
-    "author": "Kaylee Simmons",
-    "author_mail": "<kay@the-simmons.net>",
-    "author_time": 1653007350,
-    "author_tz": "-0700",
-    "committer_name": "Kaylee Simmons",
-    "committer_email": "<kay@the-simmons.net>",
-    "committer_time": 1653609725,
-    "committer_tz": "-0700",
-    "summary": "Enable copy and paste in vim mode",
-    "previous": null,
-    "filename": "crates/vim/src/utils.rs"
-  },
-  {
-    "sha": "082036161fd3815c831ceedfd28ba15b0ed6eb9f",
-    "range": {
-      "start": 8,
-      "end": 9
-    },
-    "original_line_number": 4,
-    "author": "Kaylee Simmons",
-    "author_mail": "<kay@the-simmons.net>",
-    "author_time": 1653007350,
-    "author_tz": "-0700",
-    "committer_name": "Kaylee Simmons",
-    "committer_email": "<kay@the-simmons.net>",
-    "committer_time": 1653609725,
-    "committer_tz": "-0700",
-    "summary": "Enable copy and paste in vim mode",
-    "previous": null,
-    "filename": "crates/vim/src/utils.rs"
-  },
-  {
-    "sha": "082036161fd3815c831ceedfd28ba15b0ed6eb9f",
-    "range": {
-      "start": 37,
-      "end": 40
-    },
-    "original_line_number": 7,
-    "author": "Kaylee Simmons",
-    "author_mail": "<kay@the-simmons.net>",
-    "author_time": 1653007350,
-    "author_tz": "-0700",
-    "committer_name": "Kaylee Simmons",
-    "committer_email": "<kay@the-simmons.net>",
-    "committer_time": 1653609725,
-    "committer_tz": "-0700",
-    "summary": "Enable copy and paste in vim mode",
-    "previous": null,
-    "filename": "crates/vim/src/utils.rs"
-  },
-  {
-    "sha": "082036161fd3815c831ceedfd28ba15b0ed6eb9f",
-    "range": {
-      "start": 41,
-      "end": 42
-    },
-    "original_line_number": 10,
-    "author": "Kaylee Simmons",
-    "author_mail": "<kay@the-simmons.net>",
-    "author_time": 1653007350,
-    "author_tz": "-0700",
-    "committer_name": "Kaylee Simmons",
-    "committer_email": "<kay@the-simmons.net>",
-    "committer_time": 1653609725,
-    "committer_tz": "-0700",
-    "summary": "Enable copy and paste in vim mode",
-    "previous": null,
-    "filename": "crates/vim/src/utils.rs"
-  },
-  {
-    "sha": "082036161fd3815c831ceedfd28ba15b0ed6eb9f",
-    "range": {
-      "start": 43,
-      "end": 44
-    },
-    "original_line_number": 11,
-    "author": "Kaylee Simmons",
-    "author_mail": "<kay@the-simmons.net>",
-    "author_time": 1653007350,
-    "author_tz": "-0700",
-    "committer_name": "Kaylee Simmons",
-    "committer_email": "<kay@the-simmons.net>",
-    "committer_time": 1653609725,
-    "committer_tz": "-0700",
-    "summary": "Enable copy and paste in vim mode",
-    "previous": null,
-    "filename": "crates/vim/src/utils.rs"
-  },
-  {
-    "sha": "082036161fd3815c831ceedfd28ba15b0ed6eb9f",
-    "range": {
-      "start": 45,
-      "end": 46
-    },
-    "original_line_number": 14,
-    "author": "Kaylee Simmons",
-    "author_mail": "<kay@the-simmons.net>",
-    "author_time": 1653007350,
-    "author_tz": "-0700",
-    "committer_name": "Kaylee Simmons",
-    "committer_email": "<kay@the-simmons.net>",
-    "committer_time": 1653609725,
-    "committer_tz": "-0700",
-    "summary": "Enable copy and paste in vim mode",
-    "previous": null,
-    "filename": "crates/vim/src/utils.rs"
-  },
-  {
-    "sha": "082036161fd3815c831ceedfd28ba15b0ed6eb9f",
-    "range": {
-      "start": 71,
-      "end": 74
-    },
-    "original_line_number": 15,
-    "author": "Kaylee Simmons",
-    "author_mail": "<kay@the-simmons.net>",
-    "author_time": 1653007350,
-    "author_tz": "-0700",
-    "committer_name": "Kaylee Simmons",
-    "committer_email": "<kay@the-simmons.net>",
-    "committer_time": 1653609725,
-    "committer_tz": "-0700",
-    "summary": "Enable copy and paste in vim mode",
-    "previous": null,
-    "filename": "crates/vim/src/utils.rs"
-  },
-  {
-    "sha": "082036161fd3815c831ceedfd28ba15b0ed6eb9f",
-    "range": {
-      "start": 77,
-      "end": 80
-    },
-    "original_line_number": 18,
-    "author": "Kaylee Simmons",
-    "author_mail": "<kay@the-simmons.net>",
-    "author_time": 1653007350,
-    "author_tz": "-0700",
-    "committer_name": "Kaylee Simmons",
-    "committer_email": "<kay@the-simmons.net>",
-    "committer_time": 1653609725,
-    "committer_tz": "-0700",
-    "summary": "Enable copy and paste in vim mode",
-    "previous": null,
-    "filename": "crates/vim/src/utils.rs"
-  },
-  {
-    "sha": "082036161fd3815c831ceedfd28ba15b0ed6eb9f",
-    "range": {
-      "start": 81,
-      "end": 85
-    },
-    "original_line_number": 21,
-    "author": "Kaylee Simmons",
-    "author_mail": "<kay@the-simmons.net>",
-    "author_time": 1653007350,
-    "author_tz": "-0700",
-    "committer_name": "Kaylee Simmons",
-    "committer_email": "<kay@the-simmons.net>",
-    "committer_time": 1653609725,
-    "committer_tz": "-0700",
-    "summary": "Enable copy and paste in vim mode",
-    "previous": null,
-    "filename": "crates/vim/src/utils.rs"
-  },
-  {
-    "sha": "082036161fd3815c831ceedfd28ba15b0ed6eb9f",
-    "range": {
-      "start": 119,
-      "end": 120
-    },
-    "original_line_number": 26,
-    "author": "Kaylee Simmons",
-    "author_mail": "<kay@the-simmons.net>",
-    "author_time": 1653007350,
-    "author_tz": "-0700",
-    "committer_name": "Kaylee Simmons",
-    "committer_email": "<kay@the-simmons.net>",
-    "committer_time": 1653609725,
-    "committer_tz": "-0700",
-    "summary": "Enable copy and paste in vim mode",
-    "previous": null,
-    "filename": "crates/vim/src/utils.rs"
-  }
-]
diff --git a/crates/git/test_data/golden/blame_incremental_not_committed.json b/crates/git/test_data/golden/blame_incremental_not_committed.json
deleted file mode 100644
index b50c793ad9..0000000000
--- a/crates/git/test_data/golden/blame_incremental_not_committed.json
+++ /dev/null
@@ -1,135 +0,0 @@
-[
-  {
-    "sha": "4aaba34cb86b12f3a749dd6ddbf185de88de6527",
-    "range": {
-      "start": 6,
-      "end": 8
-    },
-    "original_line_number": 4,
-    "author": "Thorsten Ball",
-    "author_mail": "<mrnugget@gmail.com>",
-    "author_time": 1710764113,
-    "author_tz": "+0100",
-    "committer_name": "Thorsten Ball",
-    "committer_email": "<mrnugget@gmail.com>",
-    "committer_time": 1710764113,
-    "committer_tz": "+0100",
-    "summary": "Another commit",
-    "previous": "b2f6b0d982a9e7654bbb6d979c9ccb00b1d2e913 file_b.txt",
-    "filename": "file_b.txt"
-  },
-  {
-    "sha": "4aaba34cb86b12f3a749dd6ddbf185de88de6527",
-    "range": {
-      "start": 16,
-      "end": 18
-    },
-    "original_line_number": 11,
-    "author": "Thorsten Ball",
-    "author_mail": "<mrnugget@gmail.com>",
-    "author_time": 1710764113,
-    "author_tz": "+0100",
-    "committer_name": "Thorsten Ball",
-    "committer_email": "<mrnugget@gmail.com>",
-    "committer_time": 1710764113,
-    "committer_tz": "+0100",
-    "summary": "Another commit",
-    "previous": "b2f6b0d982a9e7654bbb6d979c9ccb00b1d2e913 file_b.txt",
-    "filename": "file_b.txt"
-  },
-  {
-    "sha": "b2f6b0d982a9e7654bbb6d979c9ccb00b1d2e913",
-    "range": {
-      "start": 8,
-      "end": 9
-    },
-    "original_line_number": 6,
-    "author": "Thorsten Ball",
-    "author_mail": "<mrnugget@gmail.com>",
-    "author_time": 1710764087,
-    "author_tz": "+0100",
-    "committer_name": "Thorsten Ball",
-    "committer_email": "<mrnugget@gmail.com>",
-    "committer_time": 1710764087,
-    "committer_tz": "+0100",
-    "summary": "Another commit",
-    "previous": "7aef8a9a211ebc86824769c89f48e4f64aa6183f file_b.txt",
-    "filename": "file_b.txt"
-  },
-  {
-    "sha": "b2f6b0d982a9e7654bbb6d979c9ccb00b1d2e913",
-    "range": {
-      "start": 10,
-      "end": 12
-    },
-    "original_line_number": 7,
-    "author": "Thorsten Ball",
-    "author_mail": "<mrnugget@gmail.com>",
-    "author_time": 1710764087,
-    "author_tz": "+0100",
-    "committer_name": "Thorsten Ball",
-    "committer_email": "<mrnugget@gmail.com>",
-    "committer_time": 1710764087,
-    "committer_tz": "+0100",
-    "summary": "Another commit",
-    "previous": "7aef8a9a211ebc86824769c89f48e4f64aa6183f file_b.txt",
-    "filename": "file_b.txt"
-  },
-  {
-    "sha": "e6d34e8fb494fe2b576d16037c61ba9d10722ba3",
-    "range": {
-      "start": 0,
-      "end": 3
-    },
-    "original_line_number": 1,
-    "author": "Thorsten Ball",
-    "author_mail": "<mrnugget@gmail.com>",
-    "author_time": 1709299737,
-    "author_tz": "+0100",
-    "committer_name": "Thorsten Ball",
-    "committer_email": "<mrnugget@gmail.com>",
-    "committer_time": 1709299737,
-    "committer_tz": "+0100",
-    "summary": "Initial",
-    "previous": null,
-    "filename": "file_b.txt"
-  },
-  {
-    "sha": "e6d34e8fb494fe2b576d16037c61ba9d10722ba3",
-    "range": {
-      "start": 12,
-      "end": 14
-    },
-    "original_line_number": 9,
-    "author": "Thorsten Ball",
-    "author_mail": "<mrnugget@gmail.com>",
-    "author_time": 1709299737,
-    "author_tz": "+0100",
-    "committer_name": "Thorsten Ball",
-    "committer_email": "<mrnugget@gmail.com>",
-    "committer_time": 1709299737,
-    "committer_tz": "+0100",
-    "summary": "Initial",
-    "previous": null,
-    "filename": "file_b.txt"
-  },
-  {
-    "sha": "e6d34e8fb494fe2b576d16037c61ba9d10722ba3",
-    "range": {
-      "start": 18,
-      "end": 19
-    },
-    "original_line_number": 13,
-    "author": "Thorsten Ball",
-    "author_mail": "<mrnugget@gmail.com>",
-    "author_time": 1709299737,
-    "author_tz": "+0100",
-    "committer_name": "Thorsten Ball",
-    "committer_email": "<mrnugget@gmail.com>",
-    "committer_time": 1709299737,
-    "committer_tz": "+0100",
-    "summary": "Initial",
-    "previous": null,
-    "filename": "file_b.txt"
-  }
-]
diff --git a/crates/git/test_data/golden/blame_incremental_simple.json b/crates/git/test_data/golden/blame_incremental_simple.json
deleted file mode 100644
index 6e46ca3b69..0000000000
--- a/crates/git/test_data/golden/blame_incremental_simple.json
+++ /dev/null
@@ -1,135 +0,0 @@
-[
-  {
-    "sha": "c8d34ae30c87e59aaa5eb65f6c64d6206f525d7c",
-    "range": {
-      "start": 5,
-      "end": 6
-    },
-    "original_line_number": 7,
-    "author": "Thorsten Ball",
-    "author_mail": "<mrnugget@example.com>",
-    "author_time": 1709808710,
-    "author_tz": "+0100",
-    "committer_name": "Thorsten Ball",
-    "committer_email": "<mrnugget@example.com>",
-    "committer_time": 1709808710,
-    "committer_tz": "+0100",
-    "summary": "Make a commit",
-    "previous": "6ad46b5257ba16d12c5ca9f0d4900320959df7f4 index.js",
-    "filename": "index.js"
-  },
-  {
-    "sha": "6ad46b5257ba16d12c5ca9f0d4900320959df7f4",
-    "range": {
-      "start": 1,
-      "end": 2
-    },
-    "original_line_number": 2,
-    "author": "Joe Schmoe",
-    "author_mail": "<joe.schmoe@example.com>",
-    "author_time": 1709741400,
-    "author_tz": "+0100",
-    "committer_name": "Joe Schmoe",
-    "committer_email": "<joe.schmoe@example.com>",
-    "committer_time": 1709741400,
-    "committer_tz": "+0100",
-    "summary": "Joe's cool commit",
-    "previous": "486c2409237a2c627230589e567024a96751d475 index.js",
-    "filename": "index.js"
-  },
-  {
-    "sha": "6ad46b5257ba16d12c5ca9f0d4900320959df7f4",
-    "range": {
-      "start": 3,
-      "end": 4
-    },
-    "original_line_number": 3,
-    "author": "Joe Schmoe",
-    "author_mail": "<joe.schmoe@example.com>",
-    "author_time": 1709741400,
-    "author_tz": "+0100",
-    "committer_name": "Joe Schmoe",
-    "committer_email": "<joe.schmoe@example.com>",
-    "committer_time": 1709741400,
-    "committer_tz": "+0100",
-    "summary": "Joe's cool commit",
-    "previous": "486c2409237a2c627230589e567024a96751d475 index.js",
-    "filename": "index.js"
-  },
-  {
-    "sha": "6ad46b5257ba16d12c5ca9f0d4900320959df7f4",
-    "range": {
-      "start": 8,
-      "end": 9
-    },
-    "original_line_number": 13,
-    "author": "Joe Schmoe",
-    "author_mail": "<joe.schmoe@example.com>",
-    "author_time": 1709741400,
-    "author_tz": "+0100",
-    "committer_name": "Joe Schmoe",
-    "committer_email": "<joe.schmoe@example.com>",
-    "committer_time": 1709741400,
-    "committer_tz": "+0100",
-    "summary": "Joe's cool commit",
-    "previous": "486c2409237a2c627230589e567024a96751d475 index.js",
-    "filename": "index.js"
-  },
-  {
-    "sha": "486c2409237a2c627230589e567024a96751d475",
-    "range": {
-      "start": 0,
-      "end": 1
-    },
-    "original_line_number": 3,
-    "author": "Thorsten Ball",
-    "author_mail": "<mrnugget@example.com>",
-    "author_time": 1709129122,
-    "author_tz": "+0100",
-    "committer_name": "Thorsten Ball",
-    "committer_email": "<mrnugget@example.com>",
-    "committer_time": 1709129122,
-    "committer_tz": "+0100",
-    "summary": "Get to a state where eslint would change code and imports",
-    "previous": "504065e448b467e79920040f22153e9d2ea0fd6e index.js",
-    "filename": "index.js"
-  },
-  {
-    "sha": "504065e448b467e79920040f22153e9d2ea0fd6e",
-    "range": {
-      "start": 4,
-      "end": 5
-    },
-    "original_line_number": 3,
-    "author": "Thorsten Ball",
-    "author_mail": "<mrnugget@example.com>",
-    "author_time": 1709128963,
-    "author_tz": "+0100",
-    "committer_name": "Thorsten Ball",
-    "committer_email": "<mrnugget@example.com>",
-    "committer_time": 1709128963,
-    "committer_tz": "+0100",
-    "summary": "Add some stuff",
-    "previous": null,
-    "filename": "index.js"
-  },
-  {
-    "sha": "504065e448b467e79920040f22153e9d2ea0fd6e",
-    "range": {
-      "start": 9,
-      "end": 10
-    },
-    "original_line_number": 21,
-    "author": "Thorsten Ball",
-    "author_mail": "<mrnugget@example.com>",
-    "author_time": 1709128963,
-    "author_tz": "+0100",
-    "committer_name": "Thorsten Ball",
-    "committer_email": "<mrnugget@example.com>",
-    "committer_time": 1709128963,
-    "committer_tz": "+0100",
-    "summary": "Add some stuff",
-    "previous": null,
-    "filename": "index.js"
-  }
-]
diff --git a/crates/git_hosting_providers/Cargo.toml b/crates/git_hosting_providers/Cargo.toml
deleted file mode 100644
index 9480e0ec28..0000000000
--- a/crates/git_hosting_providers/Cargo.toml
+++ /dev/null
@@ -1,34 +0,0 @@
-[package]
-name = "git_hosting_providers"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/git_hosting_providers.rs"
-
-[dependencies]
-anyhow.workspace = true
-async-trait.workspace = true
-futures.workspace = true
-git.workspace = true
-gpui.workspace = true
-http_client.workspace = true
-itertools.workspace = true
-regex.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-url.workspace = true
-urlencoding.workspace = true
-util.workspace = true
-
-[dev-dependencies]
-indoc.workspace = true
-serde_json.workspace = true
-pretty_assertions.workspace = true
-git = { workspace = true, features = ["test-support"] }
diff --git a/crates/git_hosting_providers/LICENSE-GPL b/crates/git_hosting_providers/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/git_hosting_providers/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/git_hosting_providers/src/git_hosting_providers.rs b/crates/git_hosting_providers/src/git_hosting_providers.rs
deleted file mode 100644
index 37cf588205..0000000000
--- a/crates/git_hosting_providers/src/git_hosting_providers.rs
+++ /dev/null
@@ -1,101 +0,0 @@
-mod providers;
-mod settings;
-
-use std::sync::Arc;
-
-use anyhow::Context as _;
-use anyhow::Result;
-use git::GitHostingProviderRegistry;
-use git::repository::GitRepository;
-use gpui::App;
-use url::Url;
-use util::maybe;
-
-pub use crate::providers::*;
-pub use crate::settings::*;
-
-/// Initializes the Git hosting providers.
-pub fn init(cx: &mut App) {
-    crate::settings::init(cx);
-
-    let provider_registry = GitHostingProviderRegistry::global(cx);
-    provider_registry.register_hosting_provider(Arc::new(Bitbucket::public_instance()));
-    provider_registry.register_hosting_provider(Arc::new(Chromium));
-    provider_registry.register_hosting_provider(Arc::new(Forgejo::public_instance()));
-    provider_registry.register_hosting_provider(Arc::new(Gitea::public_instance()));
-    provider_registry.register_hosting_provider(Arc::new(Gitee));
-    provider_registry.register_hosting_provider(Arc::new(Github::public_instance()));
-    provider_registry.register_hosting_provider(Arc::new(Gitlab::public_instance()));
-    provider_registry.register_hosting_provider(Arc::new(SourceHut::public_instance()));
-}
-
-/// Registers additional Git hosting providers.
-///
-/// These require information from the Git repository to construct, so their
-/// registration is deferred until we have a Git repository initialized.
-pub async fn register_additional_providers(
-    provider_registry: Arc<GitHostingProviderRegistry>,
-    repository: Arc<dyn GitRepository>,
-) {
-    let Some(origin_url) = repository.remote_url("origin").await else {
-        return;
-    };
-
-    if let Ok(gitlab_self_hosted) = Gitlab::from_remote_url(&origin_url) {
-        provider_registry.register_hosting_provider(Arc::new(gitlab_self_hosted));
-    } else if let Ok(github_self_hosted) = Github::from_remote_url(&origin_url) {
-        provider_registry.register_hosting_provider(Arc::new(github_self_hosted));
-    } else if let Ok(forgejo_self_hosted) = Forgejo::from_remote_url(&origin_url) {
-        provider_registry.register_hosting_provider(Arc::new(forgejo_self_hosted));
-    } else if let Ok(gitea_self_hosted) = Gitea::from_remote_url(&origin_url) {
-        provider_registry.register_hosting_provider(Arc::new(gitea_self_hosted));
-    } else if let Ok(bitbucket_self_hosted) = Bitbucket::from_remote_url(&origin_url) {
-        provider_registry.register_hosting_provider(Arc::new(bitbucket_self_hosted));
-    } else if let Ok(sourcehut_self_hosted) = SourceHut::from_remote_url(&origin_url) {
-        provider_registry.register_hosting_provider(Arc::new(sourcehut_self_hosted));
-    }
-}
-
-pub fn get_host_from_git_remote_url(remote_url: &str) -> Result<String> {
-    maybe!({
-        if let Some(remote_url) = remote_url.strip_prefix("git@")
-            && let Some((host, _)) = remote_url.trim_start_matches("git@").split_once(':')
-        {
-            return Some(host.to_string());
-        }
-
-        Url::parse(remote_url)
-            .ok()
-            .and_then(|remote_url| remote_url.host_str().map(|host| host.to_string()))
-    })
-    .context("URL has no host")
-}
-
-#[cfg(test)]
-mod tests {
-    use super::get_host_from_git_remote_url;
-    use pretty_assertions::assert_eq;
-
-    #[test]
-    fn test_get_host_from_git_remote_url() {
-        let tests = [
-            (
-                "https://jlannister@github.com/some-org/some-repo.git",
-                Some("github.com".to_string()),
-            ),
-            (
-                "git@github.com:zed-industries/zed.git",
-                Some("github.com".to_string()),
-            ),
-            (
-                "git@my.super.long.subdomain.com:zed-industries/zed.git",
-                Some("my.super.long.subdomain.com".to_string()),
-            ),
-        ];
-
-        for (remote_url, expected_host) in tests {
-            let host = get_host_from_git_remote_url(remote_url).ok();
-            assert_eq!(host, expected_host);
-        }
-    }
-}
diff --git a/crates/git_hosting_providers/src/providers.rs b/crates/git_hosting_providers/src/providers.rs
deleted file mode 100644
index f3b2fe4794..0000000000
--- a/crates/git_hosting_providers/src/providers.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-mod bitbucket;
-mod chromium;
-mod forgejo;
-mod gitea;
-mod gitee;
-mod github;
-mod gitlab;
-mod sourcehut;
-
-pub use bitbucket::*;
-pub use chromium::*;
-pub use forgejo::*;
-pub use gitea::*;
-pub use gitee::*;
-pub use github::*;
-pub use gitlab::*;
-pub use sourcehut::*;
diff --git a/crates/git_hosting_providers/src/providers/bitbucket.rs b/crates/git_hosting_providers/src/providers/bitbucket.rs
deleted file mode 100644
index 07c6898d4e..0000000000
--- a/crates/git_hosting_providers/src/providers/bitbucket.rs
+++ /dev/null
@@ -1,591 +0,0 @@
-use std::sync::LazyLock;
-use std::{str::FromStr, sync::Arc};
-
-use anyhow::{Context as _, Result, bail};
-use async_trait::async_trait;
-use futures::AsyncReadExt;
-use gpui::SharedString;
-use http_client::{AsyncBody, HttpClient, HttpRequestExt, Request};
-use itertools::Itertools as _;
-use regex::Regex;
-use serde::Deserialize;
-use url::Url;
-
-use git::{
-    BuildCommitPermalinkParams, BuildPermalinkParams, GitHostingProvider, ParsedGitRemote,
-    PullRequest, RemoteUrl,
-};
-
-use crate::get_host_from_git_remote_url;
-
-fn pull_request_regex() -> &'static Regex {
-    static PULL_REQUEST_REGEX: LazyLock<Regex> = LazyLock::new(|| {
-        // This matches Bitbucket PR reference pattern: (pull request #xxx)
-        Regex::new(r"\(pull request #(\d+)\)").unwrap()
-    });
-    &PULL_REQUEST_REGEX
-}
-
-#[derive(Debug, Deserialize)]
-struct CommitDetails {
-    author: Author,
-}
-
-#[derive(Debug, Deserialize)]
-struct Author {
-    user: Account,
-}
-
-#[derive(Debug, Deserialize)]
-struct Account {
-    links: AccountLinks,
-}
-
-#[derive(Debug, Deserialize)]
-struct AccountLinks {
-    avatar: Option<Link>,
-}
-
-#[derive(Debug, Deserialize)]
-struct Link {
-    href: String,
-}
-
-#[derive(Debug, Deserialize)]
-struct CommitDetailsSelfHosted {
-    author: AuthorSelfHosted,
-}
-
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct AuthorSelfHosted {
-    avatar_url: Option<String>,
-}
-
-pub struct Bitbucket {
-    name: String,
-    base_url: Url,
-}
-
-impl Bitbucket {
-    pub fn new(name: impl Into<String>, base_url: Url) -> Self {
-        Self {
-            name: name.into(),
-            base_url,
-        }
-    }
-
-    pub fn public_instance() -> Self {
-        Self::new("Bitbucket", Url::parse("https://bitbucket.org").unwrap())
-    }
-
-    pub fn from_remote_url(remote_url: &str) -> Result<Self> {
-        let host = get_host_from_git_remote_url(remote_url)?;
-        if host == "bitbucket.org" {
-            bail!("the BitBucket instance is not self-hosted");
-        }
-
-        // TODO: detecting self hosted instances by checking whether "bitbucket" is in the url or not
-        // is not very reliable. See https://github.com/zed-industries/zed/issues/26393 for more
-        // information.
-        if !host.contains("bitbucket") {
-            bail!("not a BitBucket URL");
-        }
-
-        Ok(Self::new(
-            "BitBucket Self-Hosted",
-            Url::parse(&format!("https://{}", host))?,
-        ))
-    }
-
-    fn is_self_hosted(&self) -> bool {
-        self.base_url
-            .host_str()
-            .is_some_and(|host| host != "bitbucket.org")
-    }
-
-    async fn fetch_bitbucket_commit_author(
-        &self,
-        repo_owner: &str,
-        repo: &str,
-        commit: &str,
-        client: &Arc<dyn HttpClient>,
-    ) -> Result<Option<String>> {
-        let Some(host) = self.base_url.host_str() else {
-            bail!("failed to get host from bitbucket base url");
-        };
-        let is_self_hosted = self.is_self_hosted();
-        let url = if is_self_hosted {
-            format!(
-                "https://{host}/rest/api/latest/projects/{repo_owner}/repos/{repo}/commits/{commit}?avatarSize=128"
-            )
-        } else {
-            format!("https://api.{host}/2.0/repositories/{repo_owner}/{repo}/commit/{commit}")
-        };
-
-        let request = Request::get(&url)
-            .header("Content-Type", "application/json")
-            .follow_redirects(http_client::RedirectPolicy::FollowAll);
-
-        let mut response = client
-            .send(request.body(AsyncBody::default())?)
-            .await
-            .with_context(|| format!("error fetching BitBucket commit details at {:?}", url))?;
-
-        let mut body = Vec::new();
-        response.body_mut().read_to_end(&mut body).await?;
-
-        if response.status().is_client_error() {
-            let text = String::from_utf8_lossy(body.as_slice());
-            bail!(
-                "status error {}, response: {text:?}",
-                response.status().as_u16()
-            );
-        }
-
-        let body_str = std::str::from_utf8(&body)?;
-
-        if is_self_hosted {
-            serde_json::from_str::<CommitDetailsSelfHosted>(body_str)
-                .map(|commit| commit.author.avatar_url)
-        } else {
-            serde_json::from_str::<CommitDetails>(body_str)
-                .map(|commit| commit.author.user.links.avatar.map(|link| link.href))
-        }
-        .context("failed to deserialize BitBucket commit details")
-    }
-}
-
-#[async_trait]
-impl GitHostingProvider for Bitbucket {
-    fn name(&self) -> String {
-        self.name.clone()
-    }
-
-    fn base_url(&self) -> Url {
-        self.base_url.clone()
-    }
-
-    fn supports_avatars(&self) -> bool {
-        true
-    }
-
-    fn format_line_number(&self, line: u32) -> String {
-        if self.is_self_hosted() {
-            return format!("{line}");
-        }
-        format!("lines-{line}")
-    }
-
-    fn format_line_numbers(&self, start_line: u32, end_line: u32) -> String {
-        if self.is_self_hosted() {
-            return format!("{start_line}-{end_line}");
-        }
-        format!("lines-{start_line}:{end_line}")
-    }
-
-    fn parse_remote_url(&self, url: &str) -> Option<ParsedGitRemote> {
-        let url = RemoteUrl::from_str(url).ok()?;
-
-        let host = url.host_str()?;
-        if host != self.base_url.host_str()? {
-            return None;
-        }
-
-        let mut path_segments = url.path_segments()?.collect::<Vec<_>>();
-        let repo = path_segments.pop()?.trim_end_matches(".git");
-        let owner = if path_segments.get(0).is_some_and(|v| *v == "scm") && path_segments.len() > 1
-        {
-            // Skip the "scm" segment if it's not the only segment
-            // https://github.com/gitkraken/vscode-gitlens/blob/a6e3c6fbb255116507eaabaa9940c192ed7bb0e1/src/git/remotes/bitbucket-server.ts#L72-L74
-            path_segments.into_iter().skip(1).join("/")
-        } else {
-            path_segments.into_iter().join("/")
-        };
-
-        Some(ParsedGitRemote {
-            owner: owner.into(),
-            repo: repo.into(),
-        })
-    }
-
-    fn build_commit_permalink(
-        &self,
-        remote: &ParsedGitRemote,
-        params: BuildCommitPermalinkParams,
-    ) -> Url {
-        let BuildCommitPermalinkParams { sha } = params;
-        let ParsedGitRemote { owner, repo } = remote;
-        if self.is_self_hosted() {
-            return self
-                .base_url()
-                .join(&format!("projects/{owner}/repos/{repo}/commits/{sha}"))
-                .unwrap();
-        }
-        self.base_url()
-            .join(&format!("{owner}/{repo}/commits/{sha}"))
-            .unwrap()
-    }
-
-    fn build_permalink(&self, remote: ParsedGitRemote, params: BuildPermalinkParams) -> Url {
-        let ParsedGitRemote { owner, repo } = remote;
-        let BuildPermalinkParams {
-            sha,
-            path,
-            selection,
-        } = params;
-
-        let mut permalink = if self.is_self_hosted() {
-            self.base_url()
-                .join(&format!(
-                    "projects/{owner}/repos/{repo}/browse/{path}?at={sha}"
-                ))
-                .unwrap()
-        } else {
-            self.base_url()
-                .join(&format!("{owner}/{repo}/src/{sha}/{path}"))
-                .unwrap()
-        };
-
-        permalink.set_fragment(
-            selection
-                .map(|selection| self.line_fragment(&selection))
-                .as_deref(),
-        );
-        permalink
-    }
-
-    fn extract_pull_request(&self, remote: &ParsedGitRemote, message: &str) -> Option<PullRequest> {
-        // Check first line of commit message for PR references
-        let first_line = message.lines().next()?;
-
-        // Try to match against our PR patterns
-        let capture = pull_request_regex().captures(first_line)?;
-        let number = capture.get(1)?.as_str().parse::<u32>().ok()?;
-
-        // Construct the PR URL in Bitbucket format
-        let mut url = self.base_url();
-        let path = if self.is_self_hosted() {
-            format!(
-                "/projects/{}/repos/{}/pull-requests/{}",
-                remote.owner, remote.repo, number
-            )
-        } else {
-            format!("/{}/{}/pull-requests/{}", remote.owner, remote.repo, number)
-        };
-        url.set_path(&path);
-
-        Some(PullRequest { number, url })
-    }
-
-    async fn commit_author_avatar_url(
-        &self,
-        repo_owner: &str,
-        repo: &str,
-        commit: SharedString,
-        http_client: Arc<dyn HttpClient>,
-    ) -> Result<Option<Url>> {
-        let commit = commit.to_string();
-        let avatar_url = self
-            .fetch_bitbucket_commit_author(repo_owner, repo, &commit, &http_client)
-            .await?
-            .map(|avatar_url| Url::parse(&avatar_url))
-            .transpose()?;
-        Ok(avatar_url)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use git::repository::repo_path;
-    use pretty_assertions::assert_eq;
-
-    use super::*;
-
-    #[test]
-    fn test_parse_remote_url_given_ssh_url() {
-        let parsed_remote = Bitbucket::public_instance()
-            .parse_remote_url("git@bitbucket.org:zed-industries/zed.git")
-            .unwrap();
-
-        assert_eq!(
-            parsed_remote,
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            }
-        );
-    }
-
-    #[test]
-    fn test_parse_remote_url_given_https_url() {
-        let parsed_remote = Bitbucket::public_instance()
-            .parse_remote_url("https://bitbucket.org/zed-industries/zed.git")
-            .unwrap();
-
-        assert_eq!(
-            parsed_remote,
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            }
-        );
-    }
-
-    #[test]
-    fn test_parse_remote_url_given_https_url_with_username() {
-        let parsed_remote = Bitbucket::public_instance()
-            .parse_remote_url("https://thorstenballzed@bitbucket.org/zed-industries/zed.git")
-            .unwrap();
-
-        assert_eq!(
-            parsed_remote,
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            }
-        );
-    }
-
-    #[test]
-    fn test_parse_remote_url_given_self_hosted_ssh_url() {
-        let remote_url = "git@bitbucket.company.com:zed-industries/zed.git";
-
-        let parsed_remote = Bitbucket::from_remote_url(remote_url)
-            .unwrap()
-            .parse_remote_url(remote_url)
-            .unwrap();
-
-        assert_eq!(
-            parsed_remote,
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            }
-        );
-    }
-
-    #[test]
-    fn test_parse_remote_url_given_self_hosted_https_url() {
-        let remote_url = "https://bitbucket.company.com/zed-industries/zed.git";
-
-        let parsed_remote = Bitbucket::from_remote_url(remote_url)
-            .unwrap()
-            .parse_remote_url(remote_url)
-            .unwrap();
-
-        assert_eq!(
-            parsed_remote,
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            }
-        );
-
-        // Test with "scm" in the path
-        let remote_url = "https://bitbucket.company.com/scm/zed-industries/zed.git";
-
-        let parsed_remote = Bitbucket::from_remote_url(remote_url)
-            .unwrap()
-            .parse_remote_url(remote_url)
-            .unwrap();
-
-        assert_eq!(
-            parsed_remote,
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            }
-        );
-
-        // Test with only "scm" as owner
-        let remote_url = "https://bitbucket.company.com/scm/zed.git";
-
-        let parsed_remote = Bitbucket::from_remote_url(remote_url)
-            .unwrap()
-            .parse_remote_url(remote_url)
-            .unwrap();
-
-        assert_eq!(
-            parsed_remote,
-            ParsedGitRemote {
-                owner: "scm".into(),
-                repo: "zed".into(),
-            }
-        );
-    }
-
-    #[test]
-    fn test_parse_remote_url_given_self_hosted_https_url_with_username() {
-        let remote_url = "https://thorstenballzed@bitbucket.company.com/zed-industries/zed.git";
-
-        let parsed_remote = Bitbucket::from_remote_url(remote_url)
-            .unwrap()
-            .parse_remote_url(remote_url)
-            .unwrap();
-
-        assert_eq!(
-            parsed_remote,
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            }
-        );
-    }
-
-    #[test]
-    fn test_build_bitbucket_permalink() {
-        let permalink = Bitbucket::public_instance().build_permalink(
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            },
-            BuildPermalinkParams::new("f00b4r", &repo_path("main.rs"), None),
-        );
-
-        let expected_url = "https://bitbucket.org/zed-industries/zed/src/f00b4r/main.rs";
-        assert_eq!(permalink.to_string(), expected_url.to_string())
-    }
-
-    #[test]
-    fn test_build_bitbucket_self_hosted_permalink() {
-        let permalink =
-            Bitbucket::from_remote_url("git@bitbucket.company.com:zed-industries/zed.git")
-                .unwrap()
-                .build_permalink(
-                    ParsedGitRemote {
-                        owner: "zed-industries".into(),
-                        repo: "zed".into(),
-                    },
-                    BuildPermalinkParams::new("f00b4r", &repo_path("main.rs"), None),
-                );
-
-        let expected_url = "https://bitbucket.company.com/projects/zed-industries/repos/zed/browse/main.rs?at=f00b4r";
-        assert_eq!(permalink.to_string(), expected_url.to_string())
-    }
-
-    #[test]
-    fn test_build_bitbucket_permalink_with_single_line_selection() {
-        let permalink = Bitbucket::public_instance().build_permalink(
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            },
-            BuildPermalinkParams::new("f00b4r", &repo_path("main.rs"), Some(6..6)),
-        );
-
-        let expected_url = "https://bitbucket.org/zed-industries/zed/src/f00b4r/main.rs#lines-7";
-        assert_eq!(permalink.to_string(), expected_url.to_string())
-    }
-
-    #[test]
-    fn test_build_bitbucket_self_hosted_permalink_with_single_line_selection() {
-        let permalink =
-            Bitbucket::from_remote_url("https://bitbucket.company.com/zed-industries/zed.git")
-                .unwrap()
-                .build_permalink(
-                    ParsedGitRemote {
-                        owner: "zed-industries".into(),
-                        repo: "zed".into(),
-                    },
-                    BuildPermalinkParams::new("f00b4r", &repo_path("main.rs"), Some(6..6)),
-                );
-
-        let expected_url = "https://bitbucket.company.com/projects/zed-industries/repos/zed/browse/main.rs?at=f00b4r#7";
-        assert_eq!(permalink.to_string(), expected_url.to_string())
-    }
-
-    #[test]
-    fn test_build_bitbucket_permalink_with_multi_line_selection() {
-        let permalink = Bitbucket::public_instance().build_permalink(
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            },
-            BuildPermalinkParams::new("f00b4r", &repo_path("main.rs"), Some(23..47)),
-        );
-
-        let expected_url =
-            "https://bitbucket.org/zed-industries/zed/src/f00b4r/main.rs#lines-24:48";
-        assert_eq!(permalink.to_string(), expected_url.to_string())
-    }
-
-    #[test]
-    fn test_build_bitbucket_self_hosted_permalink_with_multi_line_selection() {
-        let permalink =
-            Bitbucket::from_remote_url("git@bitbucket.company.com:zed-industries/zed.git")
-                .unwrap()
-                .build_permalink(
-                    ParsedGitRemote {
-                        owner: "zed-industries".into(),
-                        repo: "zed".into(),
-                    },
-                    BuildPermalinkParams::new("f00b4r", &repo_path("main.rs"), Some(23..47)),
-                );
-
-        let expected_url = "https://bitbucket.company.com/projects/zed-industries/repos/zed/browse/main.rs?at=f00b4r#24-48";
-        assert_eq!(permalink.to_string(), expected_url.to_string())
-    }
-
-    #[test]
-    fn test_bitbucket_pull_requests() {
-        use indoc::indoc;
-
-        let remote = ParsedGitRemote {
-            owner: "zed-industries".into(),
-            repo: "zed".into(),
-        };
-
-        let bitbucket = Bitbucket::public_instance();
-
-        // Test message without PR reference
-        let message = "This does not contain a pull request";
-        assert!(bitbucket.extract_pull_request(&remote, message).is_none());
-
-        // Pull request number at end of first line
-        let message = indoc! {r#"
-            Merged in feature-branch (pull request #123)
-
-            Some detailed description of the changes.
-        "#};
-
-        let pr = bitbucket.extract_pull_request(&remote, message).unwrap();
-        assert_eq!(pr.number, 123);
-        assert_eq!(
-            pr.url.as_str(),
-            "https://bitbucket.org/zed-industries/zed/pull-requests/123"
-        );
-    }
-
-    #[test]
-    fn test_bitbucket_self_hosted_pull_requests() {
-        use indoc::indoc;
-
-        let remote = ParsedGitRemote {
-            owner: "zed-industries".into(),
-            repo: "zed".into(),
-        };
-
-        let bitbucket =
-            Bitbucket::from_remote_url("https://bitbucket.company.com/zed-industries/zed.git")
-                .unwrap();
-
-        // Test message without PR reference
-        let message = "This does not contain a pull request";
-        assert!(bitbucket.extract_pull_request(&remote, message).is_none());
-
-        // Pull request number at end of first line
-        let message = indoc! {r#"
-            Merged in feature-branch (pull request #123)
-
-            Some detailed description of the changes.
-        "#};
-
-        let pr = bitbucket.extract_pull_request(&remote, message).unwrap();
-        assert_eq!(pr.number, 123);
-        assert_eq!(
-            pr.url.as_str(),
-            "https://bitbucket.company.com/projects/zed-industries/repos/zed/pull-requests/123"
-        );
-    }
-}
diff --git a/crates/git_hosting_providers/src/providers/chromium.rs b/crates/git_hosting_providers/src/providers/chromium.rs
deleted file mode 100644
index 0826e31b30..0000000000
--- a/crates/git_hosting_providers/src/providers/chromium.rs
+++ /dev/null
@@ -1,303 +0,0 @@
-use std::str::FromStr;
-use std::sync::{Arc, LazyLock};
-
-use anyhow::{Context as _, Result, bail};
-use async_trait::async_trait;
-use futures::AsyncReadExt;
-use git::{
-    BuildCommitPermalinkParams, BuildPermalinkParams, GitHostingProvider, ParsedGitRemote,
-    PullRequest, RemoteUrl,
-};
-use gpui::SharedString;
-use http_client::{AsyncBody, HttpClient, HttpRequestExt, Request};
-use regex::Regex;
-use serde::Deserialize;
-use url::Url;
-
-const CHROMIUM_REVIEW_URL: &str = "https://chromium-review.googlesource.com";
-
-/// Parses Gerrit URLs like
-/// https://chromium-review.googlesource.com/c/chromium/src/+/3310961.
-fn pull_request_regex() -> &'static Regex {
-    static PULL_REQUEST_NUMBER_REGEX: LazyLock<Regex> = LazyLock::new(|| {
-        Regex::new(&format!(
-            r#"Reviewed-on: ({CHROMIUM_REVIEW_URL}/c/(.*)/\+/(\d+))"#
-        ))
-        .unwrap()
-    });
-    &PULL_REQUEST_NUMBER_REGEX
-}
-
-/// https://gerrit-review.googlesource.com/Documentation/rest-api-changes.html
-#[derive(Debug, Deserialize)]
-struct ChangeInfo {
-    owner: AccountInfo,
-}
-
-#[derive(Debug, Deserialize)]
-pub struct AccountInfo {
-    #[serde(rename = "_account_id")]
-    id: u64,
-}
-
-pub struct Chromium;
-
-impl Chromium {
-    async fn fetch_chromium_commit_author(
-        &self,
-        _repo: &str,
-        commit: &str,
-        client: &Arc<dyn HttpClient>,
-    ) -> Result<Option<AccountInfo>> {
-        let url = format!("{CHROMIUM_REVIEW_URL}/changes/{commit}");
-
-        let request = Request::get(&url)
-            .header("Content-Type", "application/json")
-            .follow_redirects(http_client::RedirectPolicy::FollowAll);
-
-        let mut response = client
-            .send(request.body(AsyncBody::default())?)
-            .await
-            .with_context(|| format!("error fetching Gerrit commit details at {:?}", url))?;
-
-        let mut body = Vec::new();
-        response.body_mut().read_to_end(&mut body).await?;
-
-        if response.status().is_client_error() {
-            let text = String::from_utf8_lossy(body.as_slice());
-            bail!(
-                "status error {}, response: {text:?}",
-                response.status().as_u16()
-            );
-        }
-
-        // Remove XSSI protection prefix.
-        let body_str = std::str::from_utf8(&body)?.trim_start_matches(")]}'");
-
-        serde_json::from_str::<ChangeInfo>(body_str)
-            .map(|change| Some(change.owner))
-            .context("failed to deserialize Gerrit change info")
-    }
-}
-
-#[async_trait]
-impl GitHostingProvider for Chromium {
-    fn name(&self) -> String {
-        "Chromium".to_string()
-    }
-
-    fn base_url(&self) -> Url {
-        Url::parse("https://chromium.googlesource.com").unwrap()
-    }
-
-    fn supports_avatars(&self) -> bool {
-        true
-    }
-
-    fn format_line_number(&self, line: u32) -> String {
-        format!("{line}")
-    }
-
-    fn format_line_numbers(&self, start_line: u32, _end_line: u32) -> String {
-        format!("{start_line}")
-    }
-
-    fn parse_remote_url(&self, url: &str) -> Option<ParsedGitRemote> {
-        let url = RemoteUrl::from_str(url).ok()?;
-
-        let host = url.host_str()?;
-        if host != self.base_url().host_str()? {
-            return None;
-        }
-
-        let path_segments = url.path_segments()?.collect::<Vec<_>>();
-        let joined_path = path_segments.join("/");
-        let repo = joined_path.trim_end_matches(".git");
-
-        Some(ParsedGitRemote {
-            owner: Arc::from(""),
-            repo: repo.into(),
-        })
-    }
-
-    fn build_commit_permalink(
-        &self,
-        remote: &ParsedGitRemote,
-        params: BuildCommitPermalinkParams,
-    ) -> Url {
-        let BuildCommitPermalinkParams { sha } = params;
-        let ParsedGitRemote { owner: _, repo } = remote;
-
-        self.base_url().join(&format!("{repo}/+/{sha}")).unwrap()
-    }
-
-    fn build_permalink(&self, remote: ParsedGitRemote, params: BuildPermalinkParams) -> Url {
-        let ParsedGitRemote { owner: _, repo } = remote;
-        let BuildPermalinkParams {
-            sha,
-            path,
-            selection,
-        } = params;
-
-        let mut permalink = self
-            .base_url()
-            .join(&format!("{repo}/+/{sha}/{path}"))
-            .unwrap();
-        permalink.set_fragment(
-            selection
-                .map(|selection| self.line_fragment(&selection))
-                .as_deref(),
-        );
-        permalink
-    }
-
-    fn extract_pull_request(&self, remote: &ParsedGitRemote, message: &str) -> Option<PullRequest> {
-        let capture = pull_request_regex().captures(message)?;
-        let url = Url::parse(capture.get(1)?.as_str()).unwrap();
-        let repo = capture.get(2)?.as_str();
-        if repo != remote.repo.as_ref() {
-            return None;
-        }
-
-        let number = capture.get(3)?.as_str().parse::<u32>().ok()?;
-
-        Some(PullRequest { number, url })
-    }
-
-    async fn commit_author_avatar_url(
-        &self,
-        _repo_owner: &str,
-        repo: &str,
-        commit: SharedString,
-        http_client: Arc<dyn HttpClient>,
-    ) -> Result<Option<Url>> {
-        let commit = commit.to_string();
-        let Some(author) = self
-            .fetch_chromium_commit_author(repo, &commit, &http_client)
-            .await?
-        else {
-            return Ok(None);
-        };
-
-        let mut avatar_url = Url::parse(&format!(
-            "{CHROMIUM_REVIEW_URL}/accounts/{}/avatar",
-            &author.id
-        ))?;
-        avatar_url.set_query(Some("size=128"));
-
-        Ok(Some(avatar_url))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use git::repository::repo_path;
-    use indoc::indoc;
-    use pretty_assertions::assert_eq;
-
-    use super::*;
-
-    #[test]
-    fn test_parse_remote_url_given_https_url() {
-        let parsed_remote = Chromium
-            .parse_remote_url("https://chromium.googlesource.com/chromium/src")
-            .unwrap();
-
-        assert_eq!(
-            parsed_remote,
-            ParsedGitRemote {
-                owner: Arc::from(""),
-                repo: "chromium/src".into(),
-            }
-        );
-    }
-
-    #[test]
-    fn test_build_chromium_permalink() {
-        let permalink = Chromium.build_permalink(
-            ParsedGitRemote {
-                owner: Arc::from(""),
-                repo: "chromium/src".into(),
-            },
-            BuildPermalinkParams::new(
-                "fea5080b182fc92e3be0c01c5dece602fe70b588",
-                &repo_path("ui/base/cursor/cursor.h"),
-                None,
-            ),
-        );
-
-        let expected_url = "https://chromium.googlesource.com/chromium/src/+/fea5080b182fc92e3be0c01c5dece602fe70b588/ui/base/cursor/cursor.h";
-        assert_eq!(permalink.to_string(), expected_url.to_string())
-    }
-
-    #[test]
-    fn test_build_chromium_permalink_with_single_line_selection() {
-        let permalink = Chromium.build_permalink(
-            ParsedGitRemote {
-                owner: Arc::from(""),
-                repo: "chromium/src".into(),
-            },
-            BuildPermalinkParams::new(
-                "fea5080b182fc92e3be0c01c5dece602fe70b588",
-                &repo_path("ui/base/cursor/cursor.h"),
-                Some(18..18),
-            ),
-        );
-
-        let expected_url = "https://chromium.googlesource.com/chromium/src/+/fea5080b182fc92e3be0c01c5dece602fe70b588/ui/base/cursor/cursor.h#19";
-        assert_eq!(permalink.to_string(), expected_url.to_string())
-    }
-
-    #[test]
-    fn test_build_chromium_permalink_with_multi_line_selection() {
-        let permalink = Chromium.build_permalink(
-            ParsedGitRemote {
-                owner: Arc::from(""),
-                repo: "chromium/src".into(),
-            },
-            BuildPermalinkParams::new(
-                "fea5080b182fc92e3be0c01c5dece602fe70b588",
-                &repo_path("ui/base/cursor/cursor.h"),
-                Some(18..30),
-            ),
-        );
-
-        let expected_url = "https://chromium.googlesource.com/chromium/src/+/fea5080b182fc92e3be0c01c5dece602fe70b588/ui/base/cursor/cursor.h#19";
-        assert_eq!(permalink.to_string(), expected_url.to_string())
-    }
-
-    #[test]
-    fn test_chromium_pull_requests() {
-        let remote = ParsedGitRemote {
-            owner: Arc::from(""),
-            repo: "chromium/src".into(),
-        };
-
-        let message = "This does not contain a pull request";
-        assert!(Chromium.extract_pull_request(&remote, message).is_none());
-
-        // Pull request number at end of "Reviewed-on:" line
-        let message = indoc! {r#"
-                Test commit header
-
-                Test commit description with multiple
-                lines.
-
-                Bug: 1193775, 1270302
-                Change-Id: Id15e9b4d75cce43ebd5fe34f0fb37d5e1e811b66
-                Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3310961
-                Reviewed-by: Test reviewer <test@example.com>
-                Cr-Commit-Position: refs/heads/main@{#1054973}
-                "#
-        };
-
-        assert_eq!(
-            Chromium
-                .extract_pull_request(&remote, message)
-                .unwrap()
-                .url
-                .as_str(),
-            "https://chromium-review.googlesource.com/c/chromium/src/+/3310961"
-        );
-    }
-}
diff --git a/crates/git_hosting_providers/src/providers/forgejo.rs b/crates/git_hosting_providers/src/providers/forgejo.rs
deleted file mode 100644
index 3944b7a165..0000000000
--- a/crates/git_hosting_providers/src/providers/forgejo.rs
+++ /dev/null
@@ -1,433 +0,0 @@
-use std::str::FromStr;
-use std::sync::Arc;
-
-use anyhow::{Context as _, Result, bail};
-use async_trait::async_trait;
-use futures::AsyncReadExt;
-use gpui::SharedString;
-use http_client::{AsyncBody, HttpClient, HttpRequestExt, Request};
-use serde::Deserialize;
-use url::Url;
-
-use git::{
-    BuildCommitPermalinkParams, BuildPermalinkParams, GitHostingProvider, ParsedGitRemote,
-    RemoteUrl,
-};
-
-use crate::get_host_from_git_remote_url;
-
-#[derive(Debug, Deserialize)]
-struct CommitDetails {
-    #[expect(
-        unused,
-        reason = "This field was found to be unused with serde library bump; it's left as is due to insufficient context on PO's side, but it *may* be fine to remove"
-    )]
-    commit: Commit,
-    author: Option<User>,
-}
-
-#[derive(Debug, Deserialize)]
-struct Commit {
-    #[expect(
-        unused,
-        reason = "This field was found to be unused with serde library bump; it's left as is due to insufficient context on PO's side, but it *may* be fine to remove"
-    )]
-    author: Author,
-}
-
-#[derive(Debug, Deserialize)]
-struct Author {
-    #[expect(
-        unused,
-        reason = "This field was found to be unused with serde library bump; it's left as is due to insufficient context on PO's side, but it *may* be fine to remove"
-    )]
-    name: String,
-    #[expect(
-        unused,
-        reason = "This field was found to be unused with serde library bump; it's left as is due to insufficient context on PO's side, but it *may* be fine to remove"
-    )]
-    email: String,
-    #[expect(
-        unused,
-        reason = "This field was found to be unused with serde library bump; it's left as is due to insufficient context on PO's side, but it *may* be fine to remove"
-    )]
-    date: String,
-}
-
-#[derive(Debug, Deserialize)]
-struct User {
-    #[expect(
-        unused,
-        reason = "This field was found to be unused with serde library bump; it's left as is due to insufficient context on PO's side, but it *may* be fine to remove"
-    )]
-    pub login: String,
-    #[expect(
-        unused,
-        reason = "This field was found to be unused with serde library bump; it's left as is due to insufficient context on PO's side, but it *may* be fine to remove"
-    )]
-    pub id: u64,
-    pub avatar_url: String,
-}
-
-pub struct Forgejo {
-    name: String,
-    base_url: Url,
-}
-
-impl Forgejo {
-    pub fn new(name: impl Into<String>, base_url: Url) -> Self {
-        Self {
-            name: name.into(),
-            base_url,
-        }
-    }
-
-    pub fn public_instance() -> Self {
-        Self::new("Codeberg", Url::parse("https://codeberg.org").unwrap())
-    }
-
-    pub fn from_remote_url(remote_url: &str) -> Result<Self> {
-        let host = get_host_from_git_remote_url(remote_url)?;
-        if host == "codeberg.org" {
-            bail!("the Forgejo instance is not self-hosted");
-        }
-
-        // TODO: detecting self hosted instances by checking whether "forgejo" is in the url or not
-        // is not very reliable. See https://github.com/zed-industries/zed/issues/26393 for more
-        // information.
-        if !host.contains("forgejo") {
-            bail!("not a Forgejo URL");
-        }
-
-        Ok(Self::new(
-            "Forgejo Self-Hosted",
-            Url::parse(&format!("https://{}", host))?,
-        ))
-    }
-
-    async fn fetch_forgejo_commit_author(
-        &self,
-        repo_owner: &str,
-        repo: &str,
-        commit: &str,
-        client: &Arc<dyn HttpClient>,
-    ) -> Result<Option<User>> {
-        let Some(host) = self.base_url.host_str() else {
-            bail!("failed to get host from forgejo base url");
-        };
-        let url = format!(
-            "https://{host}/api/v1/repos/{repo_owner}/{repo}/git/commits/{commit}?stat=false&verification=false&files=false"
-        );
-
-        let mut request = Request::get(&url)
-            .header("Content-Type", "application/json")
-            .follow_redirects(http_client::RedirectPolicy::FollowAll);
-
-        // TODO: not renamed yet for compatibility reasons, may require a refactor later
-        // see https://github.com/zed-industries/zed/issues/11043#issuecomment-3480446231
-        if host == "codeberg.org"
-            && let Ok(codeberg_token) = std::env::var("CODEBERG_TOKEN")
-        {
-            request = request.header("Authorization", format!("Bearer {}", codeberg_token));
-        }
-
-        let mut response = client
-            .send(request.body(AsyncBody::default())?)
-            .await
-            .with_context(|| format!("error fetching Forgejo commit details at {:?}", url))?;
-
-        let mut body = Vec::new();
-        response.body_mut().read_to_end(&mut body).await?;
-
-        if response.status().is_client_error() {
-            let text = String::from_utf8_lossy(body.as_slice());
-            bail!(
-                "status error {}, response: {text:?}",
-                response.status().as_u16()
-            );
-        }
-
-        let body_str = std::str::from_utf8(&body)?;
-
-        serde_json::from_str::<CommitDetails>(body_str)
-            .map(|commit| commit.author)
-            .context("failed to deserialize Forgejo commit details")
-    }
-}
-
-#[async_trait]
-impl GitHostingProvider for Forgejo {
-    fn name(&self) -> String {
-        self.name.clone()
-    }
-
-    fn base_url(&self) -> Url {
-        self.base_url.clone()
-    }
-
-    fn supports_avatars(&self) -> bool {
-        true
-    }
-
-    fn format_line_number(&self, line: u32) -> String {
-        format!("L{line}")
-    }
-
-    fn format_line_numbers(&self, start_line: u32, end_line: u32) -> String {
-        format!("L{start_line}-L{end_line}")
-    }
-
-    fn parse_remote_url(&self, url: &str) -> Option<ParsedGitRemote> {
-        let url = RemoteUrl::from_str(url).ok()?;
-
-        let host = url.host_str()?;
-        if host != self.base_url.host_str()? {
-            return None;
-        }
-
-        let mut path_segments = url.path_segments()?;
-        let owner = path_segments.next()?;
-        let repo = path_segments.next()?.trim_end_matches(".git");
-
-        Some(ParsedGitRemote {
-            owner: owner.into(),
-            repo: repo.into(),
-        })
-    }
-
-    fn build_commit_permalink(
-        &self,
-        remote: &ParsedGitRemote,
-        params: BuildCommitPermalinkParams,
-    ) -> Url {
-        let BuildCommitPermalinkParams { sha } = params;
-        let ParsedGitRemote { owner, repo } = remote;
-
-        self.base_url()
-            .join(&format!("{owner}/{repo}/commit/{sha}"))
-            .unwrap()
-    }
-
-    fn build_permalink(&self, remote: ParsedGitRemote, params: BuildPermalinkParams) -> Url {
-        let ParsedGitRemote { owner, repo } = remote;
-        let BuildPermalinkParams {
-            sha,
-            path,
-            selection,
-        } = params;
-
-        let mut permalink = self
-            .base_url()
-            .join(&format!("{owner}/{repo}/src/commit/{sha}/{path}"))
-            .unwrap();
-        permalink.set_fragment(
-            selection
-                .map(|selection| self.line_fragment(&selection))
-                .as_deref(),
-        );
-        permalink
-    }
-
-    async fn commit_author_avatar_url(
-        &self,
-        repo_owner: &str,
-        repo: &str,
-        commit: SharedString,
-        http_client: Arc<dyn HttpClient>,
-    ) -> Result<Option<Url>> {
-        let commit = commit.to_string();
-        let avatar_url = self
-            .fetch_forgejo_commit_author(repo_owner, repo, &commit, &http_client)
-            .await?
-            .map(|author| -> Result<Url, url::ParseError> {
-                let mut url = Url::parse(&author.avatar_url)?;
-                if let Some(host) = url.host_str() {
-                    let size_query = if host.contains("gravatar") || host.contains("libravatar") {
-                        Some("s=128")
-                    } else if self
-                        .base_url
-                        .host_str()
-                        .is_some_and(|base_host| host.contains(base_host))
-                    {
-                        // This parameter exists on Codeberg but does not seem to take effect. setting it anyway
-                        Some("size=128")
-                    } else {
-                        None
-                    };
-                    url.set_query(size_query);
-                }
-                Ok(url)
-            })
-            .transpose()?;
-        Ok(avatar_url)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use git::repository::repo_path;
-    use pretty_assertions::assert_eq;
-
-    use super::*;
-
-    #[test]
-    fn test_parse_remote_url_given_ssh_url() {
-        let parsed_remote = Forgejo::public_instance()
-            .parse_remote_url("git@codeberg.org:zed-industries/zed.git")
-            .unwrap();
-
-        assert_eq!(
-            parsed_remote,
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            }
-        );
-    }
-
-    #[test]
-    fn test_parse_remote_url_given_https_url() {
-        let parsed_remote = Forgejo::public_instance()
-            .parse_remote_url("https://codeberg.org/zed-industries/zed.git")
-            .unwrap();
-
-        assert_eq!(
-            parsed_remote,
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            }
-        );
-    }
-
-    #[test]
-    fn test_parse_remote_url_given_self_hosted_ssh_url() {
-        let remote_url = "git@forgejo.my-enterprise.com:zed-industries/zed.git";
-
-        let parsed_remote = Forgejo::from_remote_url(remote_url)
-            .unwrap()
-            .parse_remote_url(remote_url)
-            .unwrap();
-
-        assert_eq!(
-            parsed_remote,
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            }
-        );
-    }
-
-    #[test]
-    fn test_parse_remote_url_given_self_hosted_https_url() {
-        let remote_url = "https://forgejo.my-enterprise.com/zed-industries/zed.git";
-        let parsed_remote = Forgejo::from_remote_url(remote_url)
-            .unwrap()
-            .parse_remote_url(remote_url)
-            .unwrap();
-
-        assert_eq!(
-            parsed_remote,
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            }
-        );
-    }
-
-    #[test]
-    fn test_build_codeberg_permalink() {
-        let permalink = Forgejo::public_instance().build_permalink(
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            },
-            BuildPermalinkParams::new(
-                "faa6f979be417239b2e070dbbf6392b909224e0b",
-                &repo_path("crates/editor/src/git/permalink.rs"),
-                None,
-            ),
-        );
-
-        let expected_url = "https://codeberg.org/zed-industries/zed/src/commit/faa6f979be417239b2e070dbbf6392b909224e0b/crates/editor/src/git/permalink.rs";
-        assert_eq!(permalink.to_string(), expected_url.to_string())
-    }
-
-    #[test]
-    fn test_build_codeberg_permalink_with_single_line_selection() {
-        let permalink = Forgejo::public_instance().build_permalink(
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            },
-            BuildPermalinkParams::new(
-                "faa6f979be417239b2e070dbbf6392b909224e0b",
-                &repo_path("crates/editor/src/git/permalink.rs"),
-                Some(6..6),
-            ),
-        );
-
-        let expected_url = "https://codeberg.org/zed-industries/zed/src/commit/faa6f979be417239b2e070dbbf6392b909224e0b/crates/editor/src/git/permalink.rs#L7";
-        assert_eq!(permalink.to_string(), expected_url.to_string())
-    }
-
-    #[test]
-    fn test_build_codeberg_permalink_with_multi_line_selection() {
-        let permalink = Forgejo::public_instance().build_permalink(
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            },
-            BuildPermalinkParams::new(
-                "faa6f979be417239b2e070dbbf6392b909224e0b",
-                &repo_path("crates/editor/src/git/permalink.rs"),
-                Some(23..47),
-            ),
-        );
-
-        let expected_url = "https://codeberg.org/zed-industries/zed/src/commit/faa6f979be417239b2e070dbbf6392b909224e0b/crates/editor/src/git/permalink.rs#L24-L48";
-        assert_eq!(permalink.to_string(), expected_url.to_string())
-    }
-
-    #[test]
-    fn test_build_forgejo_self_hosted_permalink_from_ssh_url() {
-        let forgejo =
-            Forgejo::from_remote_url("git@forgejo.some-enterprise.com:zed-industries/zed.git")
-                .unwrap();
-        let permalink = forgejo.build_permalink(
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            },
-            BuildPermalinkParams::new(
-                "e6ebe7974deb6bb6cc0e2595c8ec31f0c71084b7",
-                &repo_path("crates/editor/src/git/permalink.rs"),
-                None,
-            ),
-        );
-
-        let expected_url = "https://forgejo.some-enterprise.com/zed-industries/zed/src/commit/e6ebe7974deb6bb6cc0e2595c8ec31f0c71084b7/crates/editor/src/git/permalink.rs";
-        assert_eq!(permalink.to_string(), expected_url.to_string())
-    }
-
-    #[test]
-    fn test_build_forgejo_self_hosted_permalink_from_https_url() {
-        let forgejo =
-            Forgejo::from_remote_url("https://forgejo-instance.big-co.com/zed-industries/zed.git")
-                .unwrap();
-        let permalink = forgejo.build_permalink(
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            },
-            BuildPermalinkParams::new(
-                "b2efec9824c45fcc90c9a7eb107a50d1772a60aa",
-                &repo_path("crates/zed/src/main.rs"),
-                None,
-            ),
-        );
-
-        let expected_url = "https://forgejo-instance.big-co.com/zed-industries/zed/src/commit/b2efec9824c45fcc90c9a7eb107a50d1772a60aa/crates/zed/src/main.rs";
-        assert_eq!(permalink.to_string(), expected_url.to_string())
-    }
-}
diff --git a/crates/git_hosting_providers/src/providers/gitea.rs b/crates/git_hosting_providers/src/providers/gitea.rs
deleted file mode 100644
index d3e62fe6a8..0000000000
--- a/crates/git_hosting_providers/src/providers/gitea.rs
+++ /dev/null
@@ -1,380 +0,0 @@
-use std::str::FromStr;
-use std::sync::Arc;
-
-use anyhow::{Context as _, Result, bail};
-use async_trait::async_trait;
-use futures::AsyncReadExt;
-use gpui::SharedString;
-use http_client::{AsyncBody, HttpClient, HttpRequestExt, Request};
-use serde::Deserialize;
-use url::Url;
-
-use git::{
-    BuildCommitPermalinkParams, BuildPermalinkParams, GitHostingProvider, ParsedGitRemote,
-    RemoteUrl,
-};
-
-use crate::get_host_from_git_remote_url;
-
-#[derive(Debug, Deserialize)]
-struct CommitDetails {
-    author: Option<User>,
-}
-
-#[derive(Debug, Deserialize)]
-struct User {
-    pub avatar_url: String,
-}
-
-pub struct Gitea {
-    name: String,
-    base_url: Url,
-}
-
-impl Gitea {
-    pub fn new(name: impl Into<String>, base_url: Url) -> Self {
-        Self {
-            name: name.into(),
-            base_url,
-        }
-    }
-
-    pub fn public_instance() -> Self {
-        Self::new("Gitea", Url::parse("https://gitea.com").unwrap())
-    }
-
-    pub fn from_remote_url(remote_url: &str) -> Result<Self> {
-        let host = get_host_from_git_remote_url(remote_url)?;
-        if host == "gitea.com" {
-            bail!("the Gitea instance is not self-hosted");
-        }
-
-        // TODO: detecting self hosted instances by checking whether "gitea" is in the url or not
-        // is not very reliable. See https://github.com/zed-industries/zed/issues/26393 for more
-        // information.
-        if !host.contains("gitea") {
-            bail!("not a Gitea URL");
-        }
-
-        Ok(Self::new(
-            "Gitea Self-Hosted",
-            Url::parse(&format!("https://{}", host))?,
-        ))
-    }
-
-    async fn fetch_gitea_commit_author(
-        &self,
-        repo_owner: &str,
-        repo: &str,
-        commit: &str,
-        client: &Arc<dyn HttpClient>,
-    ) -> Result<Option<User>> {
-        let Some(host) = self.base_url.host_str() else {
-            bail!("failed to get host from gitea base url");
-        };
-        let url = format!(
-            "https://{host}/api/v1/repos/{repo_owner}/{repo}/git/commits/{commit}?stat=false&verification=false&files=false"
-        );
-
-        let request = Request::get(&url)
-            .header("Content-Type", "application/json")
-            .follow_redirects(http_client::RedirectPolicy::FollowAll);
-
-        let mut response = client
-            .send(request.body(AsyncBody::default())?)
-            .await
-            .with_context(|| format!("error fetching Gitea commit details at {:?}", url))?;
-
-        let mut body = Vec::new();
-        response.body_mut().read_to_end(&mut body).await?;
-
-        if response.status().is_client_error() {
-            let text = String::from_utf8_lossy(body.as_slice());
-            bail!(
-                "status error {}, response: {text:?}",
-                response.status().as_u16()
-            );
-        }
-
-        let body_str = std::str::from_utf8(&body)?;
-
-        serde_json::from_str::<CommitDetails>(body_str)
-            .map(|commit| commit.author)
-            .context("failed to deserialize Gitea commit details")
-    }
-}
-
-#[async_trait]
-impl GitHostingProvider for Gitea {
-    fn name(&self) -> String {
-        self.name.clone()
-    }
-
-    fn base_url(&self) -> Url {
-        self.base_url.clone()
-    }
-
-    fn supports_avatars(&self) -> bool {
-        true
-    }
-
-    fn format_line_number(&self, line: u32) -> String {
-        format!("L{line}")
-    }
-
-    fn format_line_numbers(&self, start_line: u32, end_line: u32) -> String {
-        format!("L{start_line}-L{end_line}")
-    }
-
-    fn parse_remote_url(&self, url: &str) -> Option<ParsedGitRemote> {
-        let url = RemoteUrl::from_str(url).ok()?;
-
-        let host = url.host_str()?;
-        if host != self.base_url.host_str()? {
-            return None;
-        }
-
-        let mut path_segments = url.path_segments()?;
-        let owner = path_segments.next()?;
-        let repo = path_segments.next()?.trim_end_matches(".git");
-
-        Some(ParsedGitRemote {
-            owner: owner.into(),
-            repo: repo.into(),
-        })
-    }
-
-    fn build_commit_permalink(
-        &self,
-        remote: &ParsedGitRemote,
-        params: BuildCommitPermalinkParams,
-    ) -> Url {
-        let BuildCommitPermalinkParams { sha } = params;
-        let ParsedGitRemote { owner, repo } = remote;
-
-        self.base_url()
-            .join(&format!("{owner}/{repo}/commit/{sha}"))
-            .unwrap()
-    }
-
-    fn build_permalink(&self, remote: ParsedGitRemote, params: BuildPermalinkParams) -> Url {
-        let ParsedGitRemote { owner, repo } = remote;
-        let BuildPermalinkParams {
-            sha,
-            path,
-            selection,
-        } = params;
-
-        let mut permalink = self
-            .base_url()
-            .join(&format!("{owner}/{repo}/src/commit/{sha}/{path}"))
-            .unwrap();
-        permalink.set_fragment(
-            selection
-                .map(|selection| self.line_fragment(&selection))
-                .as_deref(),
-        );
-        permalink
-    }
-
-    async fn commit_author_avatar_url(
-        &self,
-        repo_owner: &str,
-        repo: &str,
-        commit: SharedString,
-        http_client: Arc<dyn HttpClient>,
-    ) -> Result<Option<Url>> {
-        let commit = commit.to_string();
-        let avatar_url = self
-            .fetch_gitea_commit_author(repo_owner, repo, &commit, &http_client)
-            .await?
-            .map(|author| -> Result<Url, url::ParseError> {
-                let mut url = Url::parse(&author.avatar_url)?;
-                if let Some(host) = url.host_str() {
-                    let size_query = if host.contains("gravatar") || host.contains("libravatar") {
-                        Some("s=128")
-                    } else if self
-                        .base_url
-                        .host_str()
-                        .is_some_and(|base_host| host.contains(base_host))
-                    {
-                        Some("size=128")
-                    } else {
-                        None
-                    };
-                    url.set_query(size_query);
-                }
-                Ok(url)
-            })
-            .transpose()?;
-        Ok(avatar_url)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use git::repository::repo_path;
-    use pretty_assertions::assert_eq;
-
-    use super::*;
-
-    #[test]
-    fn test_parse_remote_url_given_ssh_url() {
-        let parsed_remote = Gitea::public_instance()
-            .parse_remote_url("git@gitea.com:zed-industries/zed.git")
-            .unwrap();
-
-        assert_eq!(
-            parsed_remote,
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            }
-        );
-    }
-
-    #[test]
-    fn test_parse_remote_url_given_https_url() {
-        let parsed_remote = Gitea::public_instance()
-            .parse_remote_url("https://gitea.com/zed-industries/zed.git")
-            .unwrap();
-
-        assert_eq!(
-            parsed_remote,
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            }
-        );
-    }
-
-    #[test]
-    fn test_parse_remote_url_given_self_hosted_ssh_url() {
-        let remote_url = "git@gitea.my-enterprise.com:zed-industries/zed.git";
-
-        let parsed_remote = Gitea::from_remote_url(remote_url)
-            .unwrap()
-            .parse_remote_url(remote_url)
-            .unwrap();
-
-        assert_eq!(
-            parsed_remote,
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            }
-        );
-    }
-
-    #[test]
-    fn test_parse_remote_url_given_self_hosted_https_url() {
-        let remote_url = "https://gitea.my-enterprise.com/zed-industries/zed.git";
-        let parsed_remote = Gitea::from_remote_url(remote_url)
-            .unwrap()
-            .parse_remote_url(remote_url)
-            .unwrap();
-
-        assert_eq!(
-            parsed_remote,
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            }
-        );
-    }
-
-    #[test]
-    fn test_build_codeberg_permalink() {
-        let permalink = Gitea::public_instance().build_permalink(
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            },
-            BuildPermalinkParams::new(
-                "faa6f979be417239b2e070dbbf6392b909224e0b",
-                &repo_path("crates/editor/src/git/permalink.rs"),
-                None,
-            ),
-        );
-
-        let expected_url = "https://gitea.com/zed-industries/zed/src/commit/faa6f979be417239b2e070dbbf6392b909224e0b/crates/editor/src/git/permalink.rs";
-        assert_eq!(permalink.to_string(), expected_url.to_string())
-    }
-
-    #[test]
-    fn test_build_codeberg_permalink_with_single_line_selection() {
-        let permalink = Gitea::public_instance().build_permalink(
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            },
-            BuildPermalinkParams::new(
-                "faa6f979be417239b2e070dbbf6392b909224e0b",
-                &repo_path("crates/editor/src/git/permalink.rs"),
-                Some(6..6),
-            ),
-        );
-
-        let expected_url = "https://gitea.com/zed-industries/zed/src/commit/faa6f979be417239b2e070dbbf6392b909224e0b/crates/editor/src/git/permalink.rs#L7";
-        assert_eq!(permalink.to_string(), expected_url.to_string())
-    }
-
-    #[test]
-    fn test_build_codeberg_permalink_with_multi_line_selection() {
-        let permalink = Gitea::public_instance().build_permalink(
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            },
-            BuildPermalinkParams::new(
-                "faa6f979be417239b2e070dbbf6392b909224e0b",
-                &repo_path("crates/editor/src/git/permalink.rs"),
-                Some(23..47),
-            ),
-        );
-
-        let expected_url = "https://gitea.com/zed-industries/zed/src/commit/faa6f979be417239b2e070dbbf6392b909224e0b/crates/editor/src/git/permalink.rs#L24-L48";
-        assert_eq!(permalink.to_string(), expected_url.to_string())
-    }
-
-    #[test]
-    fn test_build_gitea_self_hosted_permalink_from_ssh_url() {
-        let gitea =
-            Gitea::from_remote_url("git@gitea.some-enterprise.com:zed-industries/zed.git").unwrap();
-        let permalink = gitea.build_permalink(
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            },
-            BuildPermalinkParams::new(
-                "e6ebe7974deb6bb6cc0e2595c8ec31f0c71084b7",
-                &repo_path("crates/editor/src/git/permalink.rs"),
-                None,
-            ),
-        );
-
-        let expected_url = "https://gitea.some-enterprise.com/zed-industries/zed/src/commit/e6ebe7974deb6bb6cc0e2595c8ec31f0c71084b7/crates/editor/src/git/permalink.rs";
-        assert_eq!(permalink.to_string(), expected_url.to_string())
-    }
-
-    #[test]
-    fn test_build_gitea_self_hosted_permalink_from_https_url() {
-        let gitea =
-            Gitea::from_remote_url("https://gitea-instance.big-co.com/zed-industries/zed.git")
-                .unwrap();
-        let permalink = gitea.build_permalink(
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            },
-            BuildPermalinkParams::new(
-                "b2efec9824c45fcc90c9a7eb107a50d1772a60aa",
-                &repo_path("crates/zed/src/main.rs"),
-                None,
-            ),
-        );
-
-        let expected_url = "https://gitea-instance.big-co.com/zed-industries/zed/src/commit/b2efec9824c45fcc90c9a7eb107a50d1772a60aa/crates/zed/src/main.rs";
-        assert_eq!(permalink.to_string(), expected_url.to_string())
-    }
-}
diff --git a/crates/git_hosting_providers/src/providers/gitee.rs b/crates/git_hosting_providers/src/providers/gitee.rs
deleted file mode 100644
index 120a360cb1..0000000000
--- a/crates/git_hosting_providers/src/providers/gitee.rs
+++ /dev/null
@@ -1,250 +0,0 @@
-use std::{str::FromStr, sync::Arc};
-
-use anyhow::{Context as _, Result, bail};
-use async_trait::async_trait;
-use futures::AsyncReadExt;
-use gpui::SharedString;
-use http_client::{AsyncBody, HttpClient, HttpRequestExt, Request};
-use serde::Deserialize;
-use url::Url;
-
-use git::{
-    BuildCommitPermalinkParams, BuildPermalinkParams, GitHostingProvider, ParsedGitRemote,
-    RemoteUrl,
-};
-
-pub struct Gitee;
-
-#[derive(Debug, Deserialize)]
-struct CommitDetails {
-    author: Option<Author>,
-}
-
-#[derive(Debug, Deserialize)]
-struct Author {
-    avatar_url: String,
-}
-
-impl Gitee {
-    async fn fetch_gitee_commit_author(
-        &self,
-        repo_owner: &str,
-        repo: &str,
-        commit: &str,
-        client: &Arc<dyn HttpClient>,
-    ) -> Result<Option<Author>> {
-        let url = format!("https://gitee.com/api/v5/repos/{repo_owner}/{repo}/commits/{commit}");
-
-        let request = Request::get(&url)
-            .header("Content-Type", "application/json")
-            .follow_redirects(http_client::RedirectPolicy::FollowAll);
-
-        let mut response = client
-            .send(request.body(AsyncBody::default())?)
-            .await
-            .with_context(|| format!("error fetching Gitee commit details at {:?}", url))?;
-
-        let mut body = Vec::new();
-        response.body_mut().read_to_end(&mut body).await?;
-
-        if response.status().is_client_error() {
-            let text = String::from_utf8_lossy(body.as_slice());
-            bail!(
-                "status error {}, response: {text:?}",
-                response.status().as_u16()
-            );
-        }
-
-        let body_str = std::str::from_utf8(&body)?;
-
-        serde_json::from_str::<CommitDetails>(body_str)
-            .map(|commit| commit.author)
-            .context("failed to deserialize Gitee commit details")
-    }
-}
-
-#[async_trait]
-impl GitHostingProvider for Gitee {
-    fn name(&self) -> String {
-        "Gitee".to_string()
-    }
-
-    fn base_url(&self) -> Url {
-        Url::parse("https://gitee.com").unwrap()
-    }
-
-    fn supports_avatars(&self) -> bool {
-        true
-    }
-
-    fn format_line_number(&self, line: u32) -> String {
-        format!("L{line}")
-    }
-
-    fn format_line_numbers(&self, start_line: u32, end_line: u32) -> String {
-        format!("L{start_line}-{end_line}")
-    }
-
-    fn parse_remote_url(&self, url: &str) -> Option<ParsedGitRemote> {
-        let url = RemoteUrl::from_str(url).ok()?;
-
-        let host = url.host_str()?;
-        if host != "gitee.com" {
-            return None;
-        }
-
-        let mut path_segments = url.path_segments()?;
-        let owner = path_segments.next()?;
-        let repo = path_segments.next()?.trim_end_matches(".git");
-
-        Some(ParsedGitRemote {
-            owner: owner.into(),
-            repo: repo.into(),
-        })
-    }
-
-    fn build_commit_permalink(
-        &self,
-        remote: &ParsedGitRemote,
-        params: BuildCommitPermalinkParams,
-    ) -> Url {
-        let BuildCommitPermalinkParams { sha } = params;
-        let ParsedGitRemote { owner, repo } = remote;
-
-        self.base_url()
-            .join(&format!("{owner}/{repo}/commit/{sha}"))
-            .unwrap()
-    }
-
-    fn build_permalink(&self, remote: ParsedGitRemote, params: BuildPermalinkParams) -> Url {
-        let ParsedGitRemote { owner, repo } = remote;
-        let BuildPermalinkParams {
-            sha,
-            path,
-            selection,
-        } = params;
-
-        let mut permalink = self
-            .base_url()
-            .join(&format!("{owner}/{repo}/blob/{sha}/{path}"))
-            .unwrap();
-        permalink.set_fragment(
-            selection
-                .map(|selection| self.line_fragment(&selection))
-                .as_deref(),
-        );
-        permalink
-    }
-
-    async fn commit_author_avatar_url(
-        &self,
-        repo_owner: &str,
-        repo: &str,
-        commit: SharedString,
-        http_client: Arc<dyn HttpClient>,
-    ) -> Result<Option<Url>> {
-        let commit = commit.to_string();
-        let avatar_url = self
-            .fetch_gitee_commit_author(repo_owner, repo, &commit, &http_client)
-            .await?
-            .map(|author| -> Result<Url, url::ParseError> {
-                let mut url = Url::parse(&author.avatar_url)?;
-                url.set_query(Some("width=128"));
-                Ok(url)
-            })
-            .transpose()?;
-        Ok(avatar_url)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use git::repository::repo_path;
-    use pretty_assertions::assert_eq;
-
-    use super::*;
-
-    #[test]
-    fn test_parse_remote_url_given_ssh_url() {
-        let parsed_remote = Gitee
-            .parse_remote_url("git@gitee.com:zed-industries/zed.git")
-            .unwrap();
-
-        assert_eq!(
-            parsed_remote,
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            }
-        );
-    }
-
-    #[test]
-    fn test_parse_remote_url_given_https_url() {
-        let parsed_remote = Gitee
-            .parse_remote_url("https://gitee.com/zed-industries/zed.git")
-            .unwrap();
-
-        assert_eq!(
-            parsed_remote,
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            }
-        );
-    }
-
-    #[test]
-    fn test_build_gitee_permalink() {
-        let permalink = Gitee.build_permalink(
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            },
-            BuildPermalinkParams::new(
-                "e5fe811d7ad0fc26934edd76f891d20bdc3bb194",
-                &repo_path("crates/editor/src/git/permalink.rs"),
-                None,
-            ),
-        );
-
-        let expected_url = "https://gitee.com/zed-industries/zed/blob/e5fe811d7ad0fc26934edd76f891d20bdc3bb194/crates/editor/src/git/permalink.rs";
-        assert_eq!(permalink.to_string(), expected_url.to_string())
-    }
-
-    #[test]
-    fn test_build_gitee_permalink_with_single_line_selection() {
-        let permalink = Gitee.build_permalink(
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            },
-            BuildPermalinkParams::new(
-                "e5fe811d7ad0fc26934edd76f891d20bdc3bb194",
-                &repo_path("crates/editor/src/git/permalink.rs"),
-                Some(6..6),
-            ),
-        );
-
-        let expected_url = "https://gitee.com/zed-industries/zed/blob/e5fe811d7ad0fc26934edd76f891d20bdc3bb194/crates/editor/src/git/permalink.rs#L7";
-        assert_eq!(permalink.to_string(), expected_url.to_string())
-    }
-
-    #[test]
-    fn test_build_gitee_permalink_with_multi_line_selection() {
-        let permalink = Gitee.build_permalink(
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            },
-            BuildPermalinkParams::new(
-                "e5fe811d7ad0fc26934edd76f891d20bdc3bb194",
-                &repo_path("crates/editor/src/git/permalink.rs"),
-                Some(23..47),
-            ),
-        );
-
-        let expected_url = "https://gitee.com/zed-industries/zed/blob/e5fe811d7ad0fc26934edd76f891d20bdc3bb194/crates/editor/src/git/permalink.rs#L24-48";
-        assert_eq!(permalink.to_string(), expected_url.to_string())
-    }
-}
diff --git a/crates/git_hosting_providers/src/providers/github.rs b/crates/git_hosting_providers/src/providers/github.rs
deleted file mode 100644
index 4f5c71830d..0000000000
--- a/crates/git_hosting_providers/src/providers/github.rs
+++ /dev/null
@@ -1,529 +0,0 @@
-use std::str::FromStr;
-use std::sync::{Arc, LazyLock};
-
-use anyhow::{Context as _, Result, bail};
-use async_trait::async_trait;
-use futures::AsyncReadExt;
-use gpui::SharedString;
-use http_client::{AsyncBody, HttpClient, HttpRequestExt, Request};
-use regex::Regex;
-use serde::Deserialize;
-use url::Url;
-
-use git::{
-    BuildCommitPermalinkParams, BuildPermalinkParams, GitHostingProvider, ParsedGitRemote,
-    PullRequest, RemoteUrl,
-};
-
-use crate::get_host_from_git_remote_url;
-
-fn pull_request_number_regex() -> &'static Regex {
-    static PULL_REQUEST_NUMBER_REGEX: LazyLock<Regex> =
-        LazyLock::new(|| Regex::new(r"\(#(\d+)\)$").unwrap());
-    &PULL_REQUEST_NUMBER_REGEX
-}
-
-#[derive(Debug, Deserialize)]
-struct CommitDetails {
-    #[expect(
-        unused,
-        reason = "This field was found to be unused with serde library bump; it's left as is due to insufficient context on PO's side, but it *may* be fine to remove"
-    )]
-    commit: Commit,
-    author: Option<User>,
-}
-
-#[derive(Debug, Deserialize)]
-struct Commit {
-    #[expect(
-        unused,
-        reason = "This field was found to be unused with serde library bump; it's left as is due to insufficient context on PO's side, but it *may* be fine to remove"
-    )]
-    author: Author,
-}
-
-#[derive(Debug, Deserialize)]
-struct Author {
-    #[expect(
-        unused,
-        reason = "This field was found to be unused with serde library bump; it's left as is due to insufficient context on PO's side, but it *may* be fine to remove"
-    )]
-    email: String,
-}
-
-#[derive(Debug, Deserialize)]
-struct User {
-    #[expect(
-        unused,
-        reason = "This field was found to be unused with serde library bump; it's left as is due to insufficient context on PO's side, but it *may* be fine to remove"
-    )]
-    pub id: u64,
-    pub avatar_url: String,
-}
-
-#[derive(Debug)]
-pub struct Github {
-    name: String,
-    base_url: Url,
-}
-
-impl Github {
-    pub fn new(name: impl Into<String>, base_url: Url) -> Self {
-        Self {
-            name: name.into(),
-            base_url,
-        }
-    }
-
-    pub fn public_instance() -> Self {
-        Self::new("GitHub", Url::parse("https://github.com").unwrap())
-    }
-
-    pub fn from_remote_url(remote_url: &str) -> Result<Self> {
-        let host = get_host_from_git_remote_url(remote_url)?;
-        if host == "github.com" {
-            bail!("the GitHub instance is not self-hosted");
-        }
-
-        // TODO: detecting self hosted instances by checking whether "github" is in the url or not
-        // is not very reliable. See https://github.com/zed-industries/zed/issues/26393 for more
-        // information.
-        if !host.contains("github") {
-            bail!("not a GitHub URL");
-        }
-
-        Ok(Self::new(
-            "GitHub Self-Hosted",
-            Url::parse(&format!("https://{}", host))?,
-        ))
-    }
-
-    async fn fetch_github_commit_author(
-        &self,
-        repo_owner: &str,
-        repo: &str,
-        commit: &str,
-        client: &Arc<dyn HttpClient>,
-    ) -> Result<Option<User>> {
-        let Some(host) = self.base_url.host_str() else {
-            bail!("failed to get host from github base url");
-        };
-        let url = format!("https://api.{host}/repos/{repo_owner}/{repo}/commits/{commit}");
-
-        let mut request = Request::get(&url)
-            .header("Content-Type", "application/json")
-            .follow_redirects(http_client::RedirectPolicy::FollowAll);
-
-        if let Ok(github_token) = std::env::var("GITHUB_TOKEN") {
-            request = request.header("Authorization", format!("Bearer {}", github_token));
-        }
-
-        let mut response = client
-            .send(request.body(AsyncBody::default())?)
-            .await
-            .with_context(|| format!("error fetching GitHub commit details at {:?}", url))?;
-
-        let mut body = Vec::new();
-        response.body_mut().read_to_end(&mut body).await?;
-
-        if response.status().is_client_error() {
-            let text = String::from_utf8_lossy(body.as_slice());
-            bail!(
-                "status error {}, response: {text:?}",
-                response.status().as_u16()
-            );
-        }
-
-        let body_str = std::str::from_utf8(&body)?;
-
-        serde_json::from_str::<CommitDetails>(body_str)
-            .map(|commit| commit.author)
-            .context("failed to deserialize GitHub commit details")
-    }
-}
-
-#[async_trait]
-impl GitHostingProvider for Github {
-    fn name(&self) -> String {
-        self.name.clone()
-    }
-
-    fn base_url(&self) -> Url {
-        self.base_url.clone()
-    }
-
-    fn supports_avatars(&self) -> bool {
-        // Avatars are not supported for self-hosted GitHub instances
-        // See tracking issue: https://github.com/zed-industries/zed/issues/11043
-        &self.name == "GitHub"
-    }
-
-    fn format_line_number(&self, line: u32) -> String {
-        format!("L{line}")
-    }
-
-    fn format_line_numbers(&self, start_line: u32, end_line: u32) -> String {
-        format!("L{start_line}-L{end_line}")
-    }
-
-    fn parse_remote_url(&self, url: &str) -> Option<ParsedGitRemote> {
-        let url = RemoteUrl::from_str(url).ok()?;
-
-        let host = url.host_str()?;
-        if host != self.base_url.host_str()? {
-            return None;
-        }
-
-        let mut path_segments = url.path_segments()?;
-        let mut owner = path_segments.next()?;
-        if owner.is_empty() {
-            owner = path_segments.next()?;
-        }
-
-        let repo = path_segments.next()?.trim_end_matches(".git");
-
-        Some(ParsedGitRemote {
-            owner: owner.into(),
-            repo: repo.into(),
-        })
-    }
-
-    fn build_commit_permalink(
-        &self,
-        remote: &ParsedGitRemote,
-        params: BuildCommitPermalinkParams,
-    ) -> Url {
-        let BuildCommitPermalinkParams { sha } = params;
-        let ParsedGitRemote { owner, repo } = remote;
-
-        self.base_url()
-            .join(&format!("{owner}/{repo}/commit/{sha}"))
-            .unwrap()
-    }
-
-    fn build_permalink(&self, remote: ParsedGitRemote, params: BuildPermalinkParams) -> Url {
-        let ParsedGitRemote { owner, repo } = remote;
-        let BuildPermalinkParams {
-            sha,
-            path,
-            selection,
-        } = params;
-
-        let mut permalink = self
-            .base_url()
-            .join(&format!("{owner}/{repo}/blob/{sha}/{path}"))
-            .unwrap();
-        if path.ends_with(".md") {
-            permalink.set_query(Some("plain=1"));
-        }
-        permalink.set_fragment(
-            selection
-                .map(|selection| self.line_fragment(&selection))
-                .as_deref(),
-        );
-        permalink
-    }
-
-    fn extract_pull_request(&self, remote: &ParsedGitRemote, message: &str) -> Option<PullRequest> {
-        let line = message.lines().next()?;
-        let capture = pull_request_number_regex().captures(line)?;
-        let number = capture.get(1)?.as_str().parse::<u32>().ok()?;
-
-        let mut url = self.base_url();
-        let path = format!("/{}/{}/pull/{}", remote.owner, remote.repo, number);
-        url.set_path(&path);
-
-        Some(PullRequest { number, url })
-    }
-
-    async fn commit_author_avatar_url(
-        &self,
-        repo_owner: &str,
-        repo: &str,
-        commit: SharedString,
-        http_client: Arc<dyn HttpClient>,
-    ) -> Result<Option<Url>> {
-        let commit = commit.to_string();
-        let avatar_url = self
-            .fetch_github_commit_author(repo_owner, repo, &commit, &http_client)
-            .await?
-            .map(|author| -> Result<Url, url::ParseError> {
-                let mut url = Url::parse(&author.avatar_url)?;
-                url.set_query(Some("size=128"));
-                Ok(url)
-            })
-            .transpose()?;
-        Ok(avatar_url)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use git::repository::repo_path;
-    use indoc::indoc;
-    use pretty_assertions::assert_eq;
-
-    use super::*;
-
-    #[test]
-    fn test_remote_url_with_root_slash() {
-        let remote_url = "git@github.com:/zed-industries/zed";
-        let parsed_remote = Github::public_instance()
-            .parse_remote_url(remote_url)
-            .unwrap();
-
-        assert_eq!(
-            parsed_remote,
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            }
-        );
-    }
-
-    #[test]
-    fn test_invalid_self_hosted_remote_url() {
-        let remote_url = "git@github.com:zed-industries/zed.git";
-        let github = Github::from_remote_url(remote_url);
-        assert!(github.is_err());
-    }
-
-    #[test]
-    fn test_from_remote_url_ssh() {
-        let remote_url = "git@github.my-enterprise.com:zed-industries/zed.git";
-        let github = Github::from_remote_url(remote_url).unwrap();
-
-        assert!(!github.supports_avatars());
-        assert_eq!(github.name, "GitHub Self-Hosted".to_string());
-        assert_eq!(
-            github.base_url,
-            Url::parse("https://github.my-enterprise.com").unwrap()
-        );
-    }
-
-    #[test]
-    fn test_from_remote_url_https() {
-        let remote_url = "https://github.my-enterprise.com/zed-industries/zed.git";
-        let github = Github::from_remote_url(remote_url).unwrap();
-
-        assert!(!github.supports_avatars());
-        assert_eq!(github.name, "GitHub Self-Hosted".to_string());
-        assert_eq!(
-            github.base_url,
-            Url::parse("https://github.my-enterprise.com").unwrap()
-        );
-    }
-
-    #[test]
-    fn test_parse_remote_url_given_self_hosted_ssh_url() {
-        let remote_url = "git@github.my-enterprise.com:zed-industries/zed.git";
-        let parsed_remote = Github::from_remote_url(remote_url)
-            .unwrap()
-            .parse_remote_url(remote_url)
-            .unwrap();
-
-        assert_eq!(
-            parsed_remote,
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            }
-        );
-    }
-
-    #[test]
-    fn test_parse_remote_url_given_self_hosted_https_url_with_subgroup() {
-        let remote_url = "https://github.my-enterprise.com/zed-industries/zed.git";
-        let parsed_remote = Github::from_remote_url(remote_url)
-            .unwrap()
-            .parse_remote_url(remote_url)
-            .unwrap();
-
-        assert_eq!(
-            parsed_remote,
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            }
-        );
-    }
-
-    #[test]
-    fn test_parse_remote_url_given_ssh_url() {
-        let parsed_remote = Github::public_instance()
-            .parse_remote_url("git@github.com:zed-industries/zed.git")
-            .unwrap();
-
-        assert_eq!(
-            parsed_remote,
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            }
-        );
-    }
-
-    #[test]
-    fn test_parse_remote_url_given_https_url() {
-        let parsed_remote = Github::public_instance()
-            .parse_remote_url("https://github.com/zed-industries/zed.git")
-            .unwrap();
-
-        assert_eq!(
-            parsed_remote,
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            }
-        );
-    }
-
-    #[test]
-    fn test_parse_remote_url_given_https_url_with_username() {
-        let parsed_remote = Github::public_instance()
-            .parse_remote_url("https://jlannister@github.com/some-org/some-repo.git")
-            .unwrap();
-
-        assert_eq!(
-            parsed_remote,
-            ParsedGitRemote {
-                owner: "some-org".into(),
-                repo: "some-repo".into(),
-            }
-        );
-    }
-
-    #[test]
-    fn test_build_github_permalink_from_ssh_url() {
-        let remote = ParsedGitRemote {
-            owner: "zed-industries".into(),
-            repo: "zed".into(),
-        };
-        let permalink = Github::public_instance().build_permalink(
-            remote,
-            BuildPermalinkParams::new(
-                "e6ebe7974deb6bb6cc0e2595c8ec31f0c71084b7",
-                &repo_path("crates/editor/src/git/permalink.rs"),
-                None,
-            ),
-        );
-
-        let expected_url = "https://github.com/zed-industries/zed/blob/e6ebe7974deb6bb6cc0e2595c8ec31f0c71084b7/crates/editor/src/git/permalink.rs";
-        assert_eq!(permalink.to_string(), expected_url.to_string())
-    }
-
-    #[test]
-    fn test_build_github_permalink() {
-        let permalink = Github::public_instance().build_permalink(
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            },
-            BuildPermalinkParams::new(
-                "b2efec9824c45fcc90c9a7eb107a50d1772a60aa",
-                &repo_path("crates/zed/src/main.rs"),
-                None,
-            ),
-        );
-
-        let expected_url = "https://github.com/zed-industries/zed/blob/b2efec9824c45fcc90c9a7eb107a50d1772a60aa/crates/zed/src/main.rs";
-        assert_eq!(permalink.to_string(), expected_url.to_string())
-    }
-
-    #[test]
-    fn test_build_github_permalink_with_single_line_selection() {
-        let permalink = Github::public_instance().build_permalink(
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            },
-            BuildPermalinkParams::new(
-                "e6ebe7974deb6bb6cc0e2595c8ec31f0c71084b7",
-                &repo_path("crates/editor/src/git/permalink.rs"),
-                Some(6..6),
-            ),
-        );
-
-        let expected_url = "https://github.com/zed-industries/zed/blob/e6ebe7974deb6bb6cc0e2595c8ec31f0c71084b7/crates/editor/src/git/permalink.rs#L7";
-        assert_eq!(permalink.to_string(), expected_url.to_string())
-    }
-
-    #[test]
-    fn test_build_github_permalink_with_multi_line_selection() {
-        let permalink = Github::public_instance().build_permalink(
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            },
-            BuildPermalinkParams::new(
-                "e6ebe7974deb6bb6cc0e2595c8ec31f0c71084b7",
-                &repo_path("crates/editor/src/git/permalink.rs"),
-                Some(23..47),
-            ),
-        );
-
-        let expected_url = "https://github.com/zed-industries/zed/blob/e6ebe7974deb6bb6cc0e2595c8ec31f0c71084b7/crates/editor/src/git/permalink.rs#L24-L48";
-        assert_eq!(permalink.to_string(), expected_url.to_string())
-    }
-
-    #[test]
-    fn test_github_pull_requests() {
-        let remote = ParsedGitRemote {
-            owner: "zed-industries".into(),
-            repo: "zed".into(),
-        };
-
-        let github = Github::public_instance();
-        let message = "This does not contain a pull request";
-        assert!(github.extract_pull_request(&remote, message).is_none());
-
-        // Pull request number at end of first line
-        let message = indoc! {r#"
-            project panel: do not expand collapsed worktrees on "collapse all entries" (#10687)
-
-            Fixes #10597
-
-            Release Notes:
-
-            - Fixed "project panel: collapse all entries" expanding collapsed worktrees.
-            "#
-        };
-
-        assert_eq!(
-            github
-                .extract_pull_request(&remote, message)
-                .unwrap()
-                .url
-                .as_str(),
-            "https://github.com/zed-industries/zed/pull/10687"
-        );
-
-        // Pull request number in middle of line, which we want to ignore
-        let message = indoc! {r#"
-            Follow-up to #10687 to fix problems
-
-            See the original PR, this is a fix.
-            "#
-        };
-        assert_eq!(github.extract_pull_request(&remote, message), None);
-    }
-
-    /// Regression test for issue #39875
-    #[test]
-    fn test_git_permalink_url_escaping() {
-        let permalink = Github::public_instance().build_permalink(
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "nonexistent".into(),
-            },
-            BuildPermalinkParams::new(
-                "3ef1539900037dd3601be7149b2b39ed6d0ce3db",
-                &repo_path("app/blog/[slug]/page.tsx"),
-                Some(7..7),
-            ),
-        );
-
-        let expected_url = "https://github.com/zed-industries/nonexistent/blob/3ef1539900037dd3601be7149b2b39ed6d0ce3db/app/blog/%5Bslug%5D/page.tsx#L8";
-        assert_eq!(permalink.to_string(), expected_url.to_string())
-    }
-}
diff --git a/crates/git_hosting_providers/src/providers/gitlab.rs b/crates/git_hosting_providers/src/providers/gitlab.rs
deleted file mode 100644
index af3bb17494..0000000000
--- a/crates/git_hosting_providers/src/providers/gitlab.rs
+++ /dev/null
@@ -1,420 +0,0 @@
-use std::{str::FromStr, sync::Arc};
-
-use anyhow::{Context as _, Result, bail};
-use async_trait::async_trait;
-use futures::AsyncReadExt;
-use gpui::SharedString;
-use http_client::{AsyncBody, HttpClient, HttpRequestExt, Request};
-use serde::Deserialize;
-use url::Url;
-
-use git::{
-    BuildCommitPermalinkParams, BuildPermalinkParams, GitHostingProvider, ParsedGitRemote,
-    RemoteUrl,
-};
-
-use crate::get_host_from_git_remote_url;
-
-#[derive(Debug, Deserialize)]
-struct CommitDetails {
-    author_email: String,
-}
-
-#[derive(Debug, Deserialize)]
-struct AvatarInfo {
-    avatar_url: String,
-}
-
-#[derive(Debug)]
-pub struct Gitlab {
-    name: String,
-    base_url: Url,
-}
-
-impl Gitlab {
-    pub fn new(name: impl Into<String>, base_url: Url) -> Self {
-        Self {
-            name: name.into(),
-            base_url,
-        }
-    }
-
-    pub fn public_instance() -> Self {
-        Self::new("GitLab", Url::parse("https://gitlab.com").unwrap())
-    }
-
-    pub fn from_remote_url(remote_url: &str) -> Result<Self> {
-        let host = get_host_from_git_remote_url(remote_url)?;
-        if host == "gitlab.com" {
-            bail!("the GitLab instance is not self-hosted");
-        }
-
-        // TODO: detecting self hosted instances by checking whether "gitlab" is in the url or not
-        // is not very reliable. See https://github.com/zed-industries/zed/issues/26393 for more
-        // information.
-        if !host.contains("gitlab") {
-            bail!("not a GitLab URL");
-        }
-
-        Ok(Self::new(
-            "GitLab Self-Hosted",
-            Url::parse(&format!("https://{}", host))?,
-        ))
-    }
-
-    async fn fetch_gitlab_commit_author(
-        &self,
-        repo_owner: &str,
-        repo: &str,
-        commit: &str,
-        client: &Arc<dyn HttpClient>,
-    ) -> Result<Option<AvatarInfo>> {
-        let Some(host) = self.base_url.host_str() else {
-            bail!("failed to get host from gitlab base url");
-        };
-        let project_path = format!("{}/{}", repo_owner, repo);
-        let project_path_encoded = urlencoding::encode(&project_path);
-        let url = format!(
-            "https://{host}/api/v4/projects/{project_path_encoded}/repository/commits/{commit}"
-        );
-
-        let request = Request::get(&url)
-            .header("Content-Type", "application/json")
-            .follow_redirects(http_client::RedirectPolicy::FollowAll);
-
-        let mut response = client
-            .send(request.body(AsyncBody::default())?)
-            .await
-            .with_context(|| format!("error fetching GitLab commit details at {:?}", url))?;
-
-        let mut body = Vec::new();
-        response.body_mut().read_to_end(&mut body).await?;
-
-        if response.status().is_client_error() {
-            let text = String::from_utf8_lossy(body.as_slice());
-            bail!(
-                "status error {}, response: {text:?}",
-                response.status().as_u16()
-            );
-        }
-
-        let body_str = std::str::from_utf8(&body)?;
-
-        let author_email = serde_json::from_str::<CommitDetails>(body_str)
-            .map(|commit| commit.author_email)
-            .context("failed to deserialize GitLab commit details")?;
-
-        let avatar_info_url = format!("https://{host}/api/v4/avatar?email={author_email}");
-
-        let request = Request::get(&avatar_info_url)
-            .header("Content-Type", "application/json")
-            .follow_redirects(http_client::RedirectPolicy::FollowAll);
-
-        let mut response = client
-            .send(request.body(AsyncBody::default())?)
-            .await
-            .with_context(|| format!("error fetching GitLab avatar info at {:?}", url))?;
-
-        let mut body = Vec::new();
-        response.body_mut().read_to_end(&mut body).await?;
-
-        if response.status().is_client_error() {
-            let text = String::from_utf8_lossy(body.as_slice());
-            bail!(
-                "status error {}, response: {text:?}",
-                response.status().as_u16()
-            );
-        }
-
-        let body_str = std::str::from_utf8(&body)?;
-
-        serde_json::from_str::<Option<AvatarInfo>>(body_str)
-            .context("failed to deserialize GitLab avatar info")
-    }
-}
-
-#[async_trait]
-impl GitHostingProvider for Gitlab {
-    fn name(&self) -> String {
-        self.name.clone()
-    }
-
-    fn base_url(&self) -> Url {
-        self.base_url.clone()
-    }
-
-    fn supports_avatars(&self) -> bool {
-        true
-    }
-
-    fn format_line_number(&self, line: u32) -> String {
-        format!("L{line}")
-    }
-
-    fn format_line_numbers(&self, start_line: u32, end_line: u32) -> String {
-        format!("L{start_line}-{end_line}")
-    }
-
-    fn parse_remote_url(&self, url: &str) -> Option<ParsedGitRemote> {
-        let url = RemoteUrl::from_str(url).ok()?;
-
-        let host = url.host_str()?;
-        if host != self.base_url.host_str()? {
-            return None;
-        }
-
-        let mut path_segments = url.path_segments()?.collect::<Vec<_>>();
-        let repo = path_segments.pop()?.trim_end_matches(".git");
-        let owner = path_segments.join("/");
-
-        Some(ParsedGitRemote {
-            owner: owner.into(),
-            repo: repo.into(),
-        })
-    }
-
-    fn build_commit_permalink(
-        &self,
-        remote: &ParsedGitRemote,
-        params: BuildCommitPermalinkParams,
-    ) -> Url {
-        let BuildCommitPermalinkParams { sha } = params;
-        let ParsedGitRemote { owner, repo } = remote;
-
-        self.base_url()
-            .join(&format!("{owner}/{repo}/-/commit/{sha}"))
-            .unwrap()
-    }
-
-    fn build_permalink(&self, remote: ParsedGitRemote, params: BuildPermalinkParams) -> Url {
-        let ParsedGitRemote { owner, repo } = remote;
-        let BuildPermalinkParams {
-            sha,
-            path,
-            selection,
-        } = params;
-
-        let mut permalink = self
-            .base_url()
-            .join(&format!("{owner}/{repo}/-/blob/{sha}/{path}"))
-            .unwrap();
-        if path.ends_with(".md") {
-            permalink.set_query(Some("plain=1"));
-        }
-        permalink.set_fragment(
-            selection
-                .map(|selection| self.line_fragment(&selection))
-                .as_deref(),
-        );
-        permalink
-    }
-
-    async fn commit_author_avatar_url(
-        &self,
-        repo_owner: &str,
-        repo: &str,
-        commit: SharedString,
-        http_client: Arc<dyn HttpClient>,
-    ) -> Result<Option<Url>> {
-        let commit = commit.to_string();
-        let avatar_url = self
-            .fetch_gitlab_commit_author(repo_owner, repo, &commit, &http_client)
-            .await?
-            .map(|author| -> Result<Url, url::ParseError> {
-                let mut url = Url::parse(&author.avatar_url)?;
-                if let Some(host) = url.host_str() {
-                    let size_query = if host.contains("gravatar") || host.contains("libravatar") {
-                        Some("s=128")
-                    } else if self
-                        .base_url
-                        .host_str()
-                        .is_some_and(|base_host| host.contains(base_host))
-                    {
-                        Some("width=128")
-                    } else {
-                        None
-                    };
-                    url.set_query(size_query);
-                }
-                Ok(url)
-            })
-            .transpose()?;
-        Ok(avatar_url)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use git::repository::repo_path;
-    use pretty_assertions::assert_eq;
-
-    use super::*;
-
-    #[test]
-    fn test_invalid_self_hosted_remote_url() {
-        let remote_url = "https://gitlab.com/zed-industries/zed.git";
-        let gitlab = Gitlab::from_remote_url(remote_url);
-        assert!(gitlab.is_err());
-    }
-
-    #[test]
-    fn test_parse_remote_url_given_ssh_url() {
-        let parsed_remote = Gitlab::public_instance()
-            .parse_remote_url("git@gitlab.com:zed-industries/zed.git")
-            .unwrap();
-
-        assert_eq!(
-            parsed_remote,
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            }
-        );
-    }
-
-    #[test]
-    fn test_parse_remote_url_given_https_url() {
-        let parsed_remote = Gitlab::public_instance()
-            .parse_remote_url("https://gitlab.com/zed-industries/zed.git")
-            .unwrap();
-
-        assert_eq!(
-            parsed_remote,
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            }
-        );
-    }
-
-    #[test]
-    fn test_parse_remote_url_given_self_hosted_ssh_url() {
-        let remote_url = "git@gitlab.my-enterprise.com:zed-industries/zed.git";
-
-        let parsed_remote = Gitlab::from_remote_url(remote_url)
-            .unwrap()
-            .parse_remote_url(remote_url)
-            .unwrap();
-
-        assert_eq!(
-            parsed_remote,
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            }
-        );
-    }
-
-    #[test]
-    fn test_parse_remote_url_given_self_hosted_https_url_with_subgroup() {
-        let remote_url = "https://gitlab.my-enterprise.com/group/subgroup/zed.git";
-        let parsed_remote = Gitlab::from_remote_url(remote_url)
-            .unwrap()
-            .parse_remote_url(remote_url)
-            .unwrap();
-
-        assert_eq!(
-            parsed_remote,
-            ParsedGitRemote {
-                owner: "group/subgroup".into(),
-                repo: "zed".into(),
-            }
-        );
-    }
-
-    #[test]
-    fn test_build_gitlab_permalink() {
-        let permalink = Gitlab::public_instance().build_permalink(
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            },
-            BuildPermalinkParams::new(
-                "e6ebe7974deb6bb6cc0e2595c8ec31f0c71084b7",
-                &repo_path("crates/editor/src/git/permalink.rs"),
-                None,
-            ),
-        );
-
-        let expected_url = "https://gitlab.com/zed-industries/zed/-/blob/e6ebe7974deb6bb6cc0e2595c8ec31f0c71084b7/crates/editor/src/git/permalink.rs";
-        assert_eq!(permalink.to_string(), expected_url.to_string())
-    }
-
-    #[test]
-    fn test_build_gitlab_permalink_with_single_line_selection() {
-        let permalink = Gitlab::public_instance().build_permalink(
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            },
-            BuildPermalinkParams::new(
-                "e6ebe7974deb6bb6cc0e2595c8ec31f0c71084b7",
-                &repo_path("crates/editor/src/git/permalink.rs"),
-                Some(6..6),
-            ),
-        );
-
-        let expected_url = "https://gitlab.com/zed-industries/zed/-/blob/e6ebe7974deb6bb6cc0e2595c8ec31f0c71084b7/crates/editor/src/git/permalink.rs#L7";
-        assert_eq!(permalink.to_string(), expected_url.to_string())
-    }
-
-    #[test]
-    fn test_build_gitlab_permalink_with_multi_line_selection() {
-        let permalink = Gitlab::public_instance().build_permalink(
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            },
-            BuildPermalinkParams::new(
-                "e6ebe7974deb6bb6cc0e2595c8ec31f0c71084b7",
-                &repo_path("crates/editor/src/git/permalink.rs"),
-                Some(23..47),
-            ),
-        );
-
-        let expected_url = "https://gitlab.com/zed-industries/zed/-/blob/e6ebe7974deb6bb6cc0e2595c8ec31f0c71084b7/crates/editor/src/git/permalink.rs#L24-48";
-        assert_eq!(permalink.to_string(), expected_url.to_string())
-    }
-
-    #[test]
-    fn test_build_gitlab_self_hosted_permalink_from_ssh_url() {
-        let gitlab =
-            Gitlab::from_remote_url("git@gitlab.some-enterprise.com:zed-industries/zed.git")
-                .unwrap();
-        let permalink = gitlab.build_permalink(
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            },
-            BuildPermalinkParams::new(
-                "e6ebe7974deb6bb6cc0e2595c8ec31f0c71084b7",
-                &repo_path("crates/editor/src/git/permalink.rs"),
-                None,
-            ),
-        );
-
-        let expected_url = "https://gitlab.some-enterprise.com/zed-industries/zed/-/blob/e6ebe7974deb6bb6cc0e2595c8ec31f0c71084b7/crates/editor/src/git/permalink.rs";
-        assert_eq!(permalink.to_string(), expected_url.to_string())
-    }
-
-    #[test]
-    fn test_build_gitlab_self_hosted_permalink_from_https_url() {
-        let gitlab =
-            Gitlab::from_remote_url("https://gitlab-instance.big-co.com/zed-industries/zed.git")
-                .unwrap();
-        let permalink = gitlab.build_permalink(
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            },
-            BuildPermalinkParams::new(
-                "b2efec9824c45fcc90c9a7eb107a50d1772a60aa",
-                &repo_path("crates/zed/src/main.rs"),
-                None,
-            ),
-        );
-
-        let expected_url = "https://gitlab-instance.big-co.com/zed-industries/zed/-/blob/b2efec9824c45fcc90c9a7eb107a50d1772a60aa/crates/zed/src/main.rs";
-        assert_eq!(permalink.to_string(), expected_url.to_string())
-    }
-}
diff --git a/crates/git_hosting_providers/src/providers/sourcehut.rs b/crates/git_hosting_providers/src/providers/sourcehut.rs
deleted file mode 100644
index 41011b023b..0000000000
--- a/crates/git_hosting_providers/src/providers/sourcehut.rs
+++ /dev/null
@@ -1,385 +0,0 @@
-use std::str::FromStr;
-
-use anyhow::{Result, bail};
-use url::Url;
-
-use git::{
-    BuildCommitPermalinkParams, BuildPermalinkParams, GitHostingProvider, ParsedGitRemote,
-    RemoteUrl,
-};
-
-use crate::get_host_from_git_remote_url;
-
-pub struct SourceHut {
-    name: String,
-    base_url: Url,
-}
-
-impl SourceHut {
-    pub fn new(name: &str, base_url: Url) -> Self {
-        Self {
-            name: name.to_string(),
-            base_url,
-        }
-    }
-
-    pub fn public_instance() -> Self {
-        Self::new("SourceHut", Url::parse("https://git.sr.ht").unwrap())
-    }
-
-    pub fn from_remote_url(remote_url: &str) -> Result<Self> {
-        let host = get_host_from_git_remote_url(remote_url)?;
-        if host == "git.sr.ht" {
-            bail!("the SourceHut instance is not self-hosted");
-        }
-
-        // TODO: detecting self hosted instances by checking whether "sourcehut" is in the url or not
-        // is not very reliable. See https://github.com/zed-industries/zed/issues/26393 for more
-        // information.
-        if !host.contains("sourcehut") {
-            bail!("not a SourceHut URL");
-        }
-
-        Ok(Self::new(
-            "SourceHut Self-Hosted",
-            Url::parse(&format!("https://{}", host))?,
-        ))
-    }
-}
-
-impl GitHostingProvider for SourceHut {
-    fn name(&self) -> String {
-        self.name.clone()
-    }
-
-    fn base_url(&self) -> Url {
-        self.base_url.clone()
-    }
-
-    fn supports_avatars(&self) -> bool {
-        false
-    }
-
-    fn format_line_number(&self, line: u32) -> String {
-        format!("L{line}")
-    }
-
-    fn format_line_numbers(&self, start_line: u32, end_line: u32) -> String {
-        format!("L{start_line}-{end_line}")
-    }
-
-    fn parse_remote_url(&self, url: &str) -> Option<ParsedGitRemote> {
-        let url = RemoteUrl::from_str(url).ok()?;
-
-        let host = url.host_str()?;
-        if host != self.base_url.host_str()? {
-            return None;
-        }
-
-        let mut path_segments = url.path_segments()?;
-        let owner = path_segments.next()?.trim_start_matches('~');
-        // We don't trim the `.git` suffix here like we do elsewhere, as
-        // sourcehut treats a repo with `.git` suffix as a separate repo.
-        //
-        // For example, `git@git.sr.ht:~username/repo` and `git@git.sr.ht:~username/repo.git`
-        // are two distinct repositories.
-        let repo = path_segments.next()?;
-
-        Some(ParsedGitRemote {
-            owner: owner.into(),
-            repo: repo.into(),
-        })
-    }
-
-    fn build_commit_permalink(
-        &self,
-        remote: &ParsedGitRemote,
-        params: BuildCommitPermalinkParams,
-    ) -> Url {
-        let BuildCommitPermalinkParams { sha } = params;
-        let ParsedGitRemote { owner, repo } = remote;
-
-        self.base_url()
-            .join(&format!("~{owner}/{repo}/commit/{sha}"))
-            .unwrap()
-    }
-
-    fn build_permalink(&self, remote: ParsedGitRemote, params: BuildPermalinkParams) -> Url {
-        let ParsedGitRemote { owner, repo } = remote;
-        let BuildPermalinkParams {
-            sha,
-            path,
-            selection,
-        } = params;
-
-        let mut permalink = self
-            .base_url()
-            .join(&format!("~{owner}/{repo}/tree/{sha}/item/{path}"))
-            .unwrap();
-        permalink.set_fragment(
-            selection
-                .map(|selection| self.line_fragment(&selection))
-                .as_deref(),
-        );
-        permalink
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use git::repository::repo_path;
-    use pretty_assertions::assert_eq;
-
-    use super::*;
-
-    #[test]
-    fn test_parse_remote_url_given_ssh_url() {
-        let parsed_remote = SourceHut::public_instance()
-            .parse_remote_url("git@git.sr.ht:~zed-industries/zed")
-            .unwrap();
-
-        assert_eq!(
-            parsed_remote,
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            }
-        );
-    }
-
-    #[test]
-    fn test_parse_remote_url_given_ssh_url_with_git_suffix() {
-        let parsed_remote = SourceHut::public_instance()
-            .parse_remote_url("git@git.sr.ht:~zed-industries/zed.git")
-            .unwrap();
-
-        assert_eq!(
-            parsed_remote,
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed.git".into(),
-            }
-        );
-    }
-
-    #[test]
-    fn test_parse_remote_url_given_https_url() {
-        let parsed_remote = SourceHut::public_instance()
-            .parse_remote_url("https://git.sr.ht/~zed-industries/zed")
-            .unwrap();
-
-        assert_eq!(
-            parsed_remote,
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            }
-        );
-    }
-
-    #[test]
-    fn test_parse_remote_url_given_self_hosted_ssh_url() {
-        let remote_url = "git@sourcehut.org:~zed-industries/zed";
-
-        let parsed_remote = SourceHut::from_remote_url(remote_url)
-            .unwrap()
-            .parse_remote_url(remote_url)
-            .unwrap();
-
-        assert_eq!(
-            parsed_remote,
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            }
-        );
-    }
-
-    #[test]
-    fn test_parse_remote_url_given_self_hosted_ssh_url_with_git_suffix() {
-        let remote_url = "git@sourcehut.org:~zed-industries/zed.git";
-
-        let parsed_remote = SourceHut::from_remote_url(remote_url)
-            .unwrap()
-            .parse_remote_url(remote_url)
-            .unwrap();
-
-        assert_eq!(
-            parsed_remote,
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed.git".into(),
-            }
-        );
-    }
-
-    #[test]
-    fn test_parse_remote_url_given_self_hosted_https_url() {
-        let remote_url = "https://sourcehut.org/~zed-industries/zed";
-
-        let parsed_remote = SourceHut::from_remote_url(remote_url)
-            .unwrap()
-            .parse_remote_url(remote_url)
-            .unwrap();
-
-        assert_eq!(
-            parsed_remote,
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            }
-        );
-    }
-
-    #[test]
-    fn test_build_sourcehut_permalink() {
-        let permalink = SourceHut::public_instance().build_permalink(
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            },
-            BuildPermalinkParams::new(
-                "faa6f979be417239b2e070dbbf6392b909224e0b",
-                &repo_path("crates/editor/src/git/permalink.rs"),
-                None,
-            ),
-        );
-
-        let expected_url = "https://git.sr.ht/~zed-industries/zed/tree/faa6f979be417239b2e070dbbf6392b909224e0b/item/crates/editor/src/git/permalink.rs";
-        assert_eq!(permalink.to_string(), expected_url.to_string())
-    }
-
-    #[test]
-    fn test_build_sourcehut_permalink_with_git_suffix() {
-        let permalink = SourceHut::public_instance().build_permalink(
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed.git".into(),
-            },
-            BuildPermalinkParams::new(
-                "faa6f979be417239b2e070dbbf6392b909224e0b",
-                &repo_path("crates/editor/src/git/permalink.rs"),
-                None,
-            ),
-        );
-
-        let expected_url = "https://git.sr.ht/~zed-industries/zed.git/tree/faa6f979be417239b2e070dbbf6392b909224e0b/item/crates/editor/src/git/permalink.rs";
-        assert_eq!(permalink.to_string(), expected_url.to_string())
-    }
-
-    #[test]
-    fn test_build_sourcehut_self_hosted_permalink() {
-        let permalink = SourceHut::from_remote_url("https://sourcehut.org/~zed-industries/zed")
-            .unwrap()
-            .build_permalink(
-                ParsedGitRemote {
-                    owner: "zed-industries".into(),
-                    repo: "zed".into(),
-                },
-                BuildPermalinkParams::new(
-                    "faa6f979be417239b2e070dbbf6392b909224e0b",
-                    &repo_path("crates/editor/src/git/permalink.rs"),
-                    None,
-                ),
-            );
-
-        let expected_url = "https://sourcehut.org/~zed-industries/zed/tree/faa6f979be417239b2e070dbbf6392b909224e0b/item/crates/editor/src/git/permalink.rs";
-        assert_eq!(permalink.to_string(), expected_url.to_string())
-    }
-
-    #[test]
-    fn test_build_sourcehut_self_hosted_permalink_with_git_suffix() {
-        let permalink = SourceHut::from_remote_url("https://sourcehut.org/~zed-industries/zed.git")
-            .unwrap()
-            .build_permalink(
-                ParsedGitRemote {
-                    owner: "zed-industries".into(),
-                    repo: "zed.git".into(),
-                },
-                BuildPermalinkParams::new(
-                    "faa6f979be417239b2e070dbbf6392b909224e0b",
-                    &repo_path("crates/editor/src/git/permalink.rs"),
-                    None,
-                ),
-            );
-
-        let expected_url = "https://sourcehut.org/~zed-industries/zed.git/tree/faa6f979be417239b2e070dbbf6392b909224e0b/item/crates/editor/src/git/permalink.rs";
-        assert_eq!(permalink.to_string(), expected_url.to_string())
-    }
-
-    #[test]
-    fn test_build_sourcehut_permalink_with_single_line_selection() {
-        let permalink = SourceHut::public_instance().build_permalink(
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            },
-            BuildPermalinkParams::new(
-                "faa6f979be417239b2e070dbbf6392b909224e0b",
-                &repo_path("crates/editor/src/git/permalink.rs"),
-                Some(6..6),
-            ),
-        );
-
-        let expected_url = "https://git.sr.ht/~zed-industries/zed/tree/faa6f979be417239b2e070dbbf6392b909224e0b/item/crates/editor/src/git/permalink.rs#L7";
-        assert_eq!(permalink.to_string(), expected_url.to_string())
-    }
-
-    #[test]
-    fn test_build_sourcehut_permalink_with_multi_line_selection() {
-        let permalink = SourceHut::public_instance().build_permalink(
-            ParsedGitRemote {
-                owner: "zed-industries".into(),
-                repo: "zed".into(),
-            },
-            BuildPermalinkParams::new(
-                "faa6f979be417239b2e070dbbf6392b909224e0b",
-                &repo_path("crates/editor/src/git/permalink.rs"),
-                Some(23..47),
-            ),
-        );
-
-        let expected_url = "https://git.sr.ht/~zed-industries/zed/tree/faa6f979be417239b2e070dbbf6392b909224e0b/item/crates/editor/src/git/permalink.rs#L24-48";
-        assert_eq!(permalink.to_string(), expected_url.to_string())
-    }
-
-    #[test]
-    fn test_build_sourcehut_self_hosted_permalink_with_single_line_selection() {
-        let permalink = SourceHut::from_remote_url("https://sourcehut.org/~zed-industries/zed")
-            .unwrap()
-            .build_permalink(
-                ParsedGitRemote {
-                    owner: "zed-industries".into(),
-                    repo: "zed".into(),
-                },
-                BuildPermalinkParams::new(
-                    "faa6f979be417239b2e070dbbf6392b909224e0b",
-                    &repo_path("crates/editor/src/git/permalink.rs"),
-                    Some(6..6),
-                ),
-            );
-
-        let expected_url = "https://sourcehut.org/~zed-industries/zed/tree/faa6f979be417239b2e070dbbf6392b909224e0b/item/crates/editor/src/git/permalink.rs#L7";
-        assert_eq!(permalink.to_string(), expected_url.to_string())
-    }
-
-    #[test]
-    fn test_build_sourcehut_self_hosted_permalink_with_multi_line_selection() {
-        let permalink = SourceHut::from_remote_url("https://sourcehut.org/~zed-industries/zed")
-            .unwrap()
-            .build_permalink(
-                ParsedGitRemote {
-                    owner: "zed-industries".into(),
-                    repo: "zed".into(),
-                },
-                BuildPermalinkParams::new(
-                    "faa6f979be417239b2e070dbbf6392b909224e0b",
-                    &repo_path("crates/editor/src/git/permalink.rs"),
-                    Some(23..47),
-                ),
-            );
-
-        let expected_url = "https://sourcehut.org/~zed-industries/zed/tree/faa6f979be417239b2e070dbbf6392b909224e0b/item/crates/editor/src/git/permalink.rs#L24-48";
-        assert_eq!(permalink.to_string(), expected_url.to_string())
-    }
-}
diff --git a/crates/git_hosting_providers/src/settings.rs b/crates/git_hosting_providers/src/settings.rs
deleted file mode 100644
index 95243cbe4e..0000000000
--- a/crates/git_hosting_providers/src/settings.rs
+++ /dev/null
@@ -1,76 +0,0 @@
-use std::sync::Arc;
-
-use git::GitHostingProviderRegistry;
-use gpui::App;
-use settings::{
-    GitHostingProviderConfig, GitHostingProviderKind, RegisterSetting, Settings, SettingsStore,
-};
-use url::Url;
-use util::ResultExt as _;
-
-use crate::{Bitbucket, Forgejo, Gitea, Github, Gitlab, SourceHut};
-
-pub(crate) fn init(cx: &mut App) {
-    init_git_hosting_provider_settings(cx);
-}
-
-fn init_git_hosting_provider_settings(cx: &mut App) {
-    update_git_hosting_providers_from_settings(cx);
-
-    cx.observe_global::<SettingsStore>(update_git_hosting_providers_from_settings)
-        .detach();
-}
-
-fn update_git_hosting_providers_from_settings(cx: &mut App) {
-    let settings_store = cx.global::<SettingsStore>();
-    let settings = GitHostingProviderSettings::get_global(cx);
-    let provider_registry = GitHostingProviderRegistry::global(cx);
-
-    let local_values: Vec<GitHostingProviderConfig> = settings_store
-        .get_all_locals::<GitHostingProviderSettings>()
-        .into_iter()
-        .flat_map(|(_, _, providers)| providers.git_hosting_providers.clone())
-        .collect();
-
-    let iter = settings
-        .git_hosting_providers
-        .clone()
-        .into_iter()
-        .chain(local_values)
-        .filter_map(|provider| {
-            let url = Url::parse(&provider.base_url).log_err()?;
-
-            Some(match provider.provider {
-                GitHostingProviderKind::Bitbucket => {
-                    Arc::new(Bitbucket::new(&provider.name, url)) as _
-                }
-                GitHostingProviderKind::Github => Arc::new(Github::new(&provider.name, url)) as _,
-                GitHostingProviderKind::Gitlab => Arc::new(Gitlab::new(&provider.name, url)) as _,
-                GitHostingProviderKind::Gitea => Arc::new(Gitea::new(&provider.name, url)) as _,
-                GitHostingProviderKind::Forgejo => Arc::new(Forgejo::new(&provider.name, url)) as _,
-                GitHostingProviderKind::SourceHut => {
-                    Arc::new(SourceHut::new(&provider.name, url)) as _
-                }
-            })
-        });
-
-    provider_registry.set_setting_providers(iter);
-}
-
-#[derive(Debug, Clone, RegisterSetting)]
-pub struct GitHostingProviderSettings {
-    pub git_hosting_providers: Vec<GitHostingProviderConfig>,
-}
-
-impl Settings for GitHostingProviderSettings {
-    fn from_settings(content: &settings::SettingsContent) -> Self {
-        Self {
-            git_hosting_providers: content
-                .project
-                .git_hosting_providers
-                .clone()
-                .unwrap()
-                .into(),
-        }
-    }
-}
diff --git a/crates/git_ui/Cargo.toml b/crates/git_ui/Cargo.toml
deleted file mode 100644
index beaf192b0e..0000000000
--- a/crates/git_ui/Cargo.toml
+++ /dev/null
@@ -1,83 +0,0 @@
-[package]
-name = "git_ui"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-name = "git_ui"
-path = "src/git_ui.rs"
-
-[features]
-test-support = ["multi_buffer/test-support"]
-
-[dependencies]
-agent_settings.workspace = true
-anyhow.workspace = true
-askpass.workspace = true
-buffer_diff.workspace = true
-call.workspace = true
-cloud_llm_client.workspace = true
-collections.workspace = true
-command_palette_hooks.workspace = true
-component.workspace = true
-db.workspace = true
-editor.workspace = true
-futures.workspace = true
-fuzzy.workspace = true
-git.workspace = true
-gpui.workspace = true
-itertools.workspace = true
-language.workspace = true
-language_model.workspace = true
-linkify.workspace = true
-log.workspace = true
-markdown.workspace = true
-menu.workspace = true
-multi_buffer.workspace = true
-notifications.workspace = true
-panel.workspace = true
-picker.workspace = true
-project.workspace = true
-recent_projects.workspace = true
-remote.workspace = true
-schemars.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-smol.workspace = true
-strum.workspace = true
-telemetry.workspace = true
-theme.workspace = true
-time.workspace = true
-time_format.workspace = true
-ui.workspace = true
-util.workspace = true
-watch.workspace = true
-workspace.workspace = true
-zed_actions.workspace = true
-zeroize.workspace = true
-ztracing.workspace = true
-tracing.workspace = true
-[target.'cfg(windows)'.dependencies]
-windows.workspace = true
-
-[dev-dependencies]
-ctor.workspace = true
-editor = { workspace = true, features = ["test-support"] }
-git_hosting_providers.workspace = true
-gpui = { workspace = true, features = ["test-support"] }
-indoc.workspace = true
-pretty_assertions.workspace = true
-project = { workspace = true, features = ["test-support"] }
-settings = { workspace = true, features = ["test-support"] }
-unindent.workspace = true
-workspace = { workspace = true, features = ["test-support"] }
-zlog.workspace = true
-
-[package.metadata.cargo-machete]
-ignored = ["tracing"]
diff --git a/crates/git_ui/LICENSE-GPL b/crates/git_ui/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/git_ui/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/git_ui/src/askpass_modal.rs b/crates/git_ui/src/askpass_modal.rs
deleted file mode 100644
index bbd507cfc4..0000000000
--- a/crates/git_ui/src/askpass_modal.rs
+++ /dev/null
@@ -1,147 +0,0 @@
-use askpass::EncryptedPassword;
-use editor::Editor;
-use futures::channel::oneshot;
-use gpui::{AppContext, DismissEvent, Entity, EventEmitter, Focusable, Styled};
-use ui::{
-    ActiveTheme, AnyElement, App, Button, Clickable, Color, Context, DynamicSpacing, Headline,
-    HeadlineSize, Icon, IconName, IconSize, InteractiveElement, IntoElement, Label, LabelCommon,
-    LabelSize, ParentElement, Render, SharedString, StyledExt, StyledTypography, Window, div,
-    h_flex, v_flex,
-};
-use util::maybe;
-use workspace::ModalView;
-use zeroize::Zeroize;
-
-pub(crate) struct AskPassModal {
-    operation: SharedString,
-    prompt: SharedString,
-    editor: Entity<Editor>,
-    tx: Option<oneshot::Sender<EncryptedPassword>>,
-}
-
-impl EventEmitter<DismissEvent> for AskPassModal {}
-impl ModalView for AskPassModal {}
-impl Focusable for AskPassModal {
-    fn focus_handle(&self, cx: &App) -> gpui::FocusHandle {
-        self.editor.focus_handle(cx)
-    }
-}
-
-impl AskPassModal {
-    pub fn new(
-        operation: SharedString,
-        prompt: SharedString,
-        tx: oneshot::Sender<EncryptedPassword>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let editor = cx.new(|cx| {
-            let mut editor = Editor::single_line(window, cx);
-            if prompt.contains("yes/no") || prompt.contains("Username") {
-                editor.set_masked(false, cx);
-            } else {
-                editor.set_masked(true, cx);
-            }
-            editor
-        });
-        Self {
-            operation,
-            prompt,
-            editor,
-            tx: Some(tx),
-        }
-    }
-
-    fn cancel(&mut self, _: &menu::Cancel, _window: &mut Window, cx: &mut Context<Self>) {
-        cx.emit(DismissEvent);
-    }
-
-    fn confirm(&mut self, _: &menu::Confirm, window: &mut Window, cx: &mut Context<Self>) {
-        maybe!({
-            let tx = self.tx.take()?;
-            let mut text = self.editor.update(cx, |this, cx| {
-                let text = this.text(cx);
-                this.clear(window, cx);
-                text
-            });
-            let pw = askpass::EncryptedPassword::try_from(text.as_ref()).ok()?;
-            text.zeroize();
-            tx.send(pw).ok();
-            Some(())
-        });
-
-        cx.emit(DismissEvent);
-    }
-
-    fn render_hint(&mut self, cx: &mut Context<Self>) -> Option<AnyElement> {
-        let color = cx.theme().status().info_background;
-        if (self.prompt.contains("Password") || self.prompt.contains("Username"))
-            && self.prompt.contains("github.com")
-        {
-            return Some(
-            div()
-                .p_2()
-                .bg(color)
-                .border_t_1()
-                .border_color(cx.theme().status().info_border)
-                .child(
-                    h_flex().gap_2()
-                        .child(
-                            Icon::new(IconName::Github).size(IconSize::Small)
-                        )
-                        .child(
-                            Label::new("You may need to configure git for Github.")
-                                .size(LabelSize::Small),
-                        )
-                        .child(Button::new("learn-more", "Learn more").color(Color::Accent).label_size(LabelSize::Small).on_click(|_, _, cx| {
-                            cx.open_url("https://docs.github.com/en/get-started/git-basics/set-up-git#authenticating-with-github-from-git")
-                        })),
-                )
-                .into_any_element(),
-        );
-        }
-        None
-    }
-}
-
-impl Render for AskPassModal {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .key_context("PasswordPrompt")
-            .on_action(cx.listener(Self::cancel))
-            .on_action(cx.listener(Self::confirm))
-            .elevation_2(cx)
-            .size_full()
-            .child(
-                h_flex()
-                    .font_buffer(cx)
-                    .px(DynamicSpacing::Base12.rems(cx))
-                    .pt(DynamicSpacing::Base08.rems(cx))
-                    .pb(DynamicSpacing::Base04.rems(cx))
-                    .rounded_t_sm()
-                    .w_full()
-                    .gap_1p5()
-                    .child(Icon::new(IconName::GitBranch).size(IconSize::XSmall))
-                    .child(h_flex().gap_1().overflow_x_hidden().child(
-                        div().max_w_96().overflow_x_hidden().text_ellipsis().child(
-                            Headline::new(self.operation.clone()).size(HeadlineSize::XSmall),
-                        ),
-                    )),
-            )
-            .child(
-                div()
-                    .font_buffer(cx)
-                    .text_buffer(cx)
-                    .py_2()
-                    .px_3()
-                    .bg(cx.theme().colors().editor_background)
-                    .border_t_1()
-                    .border_color(cx.theme().colors().border_variant)
-                    .size_full()
-                    .overflow_hidden()
-                    .child(self.prompt.clone())
-                    .child(self.editor.clone()),
-            )
-            .children(self.render_hint(cx))
-    }
-}
diff --git a/crates/git_ui/src/blame_ui.rs b/crates/git_ui/src/blame_ui.rs
deleted file mode 100644
index 09ab3229bc..0000000000
--- a/crates/git_ui/src/blame_ui.rs
+++ /dev/null
@@ -1,427 +0,0 @@
-use crate::{
-    commit_tooltip::{CommitAvatar, CommitTooltip},
-    commit_view::CommitView,
-};
-use editor::{BlameRenderer, Editor, hover_markdown_style};
-use git::{
-    blame::{BlameEntry, ParsedCommitMessage},
-    repository::CommitSummary,
-};
-use gpui::{
-    ClipboardItem, Entity, Hsla, MouseButton, ScrollHandle, Subscription, TextStyle,
-    TextStyleRefinement, UnderlineStyle, WeakEntity, prelude::*,
-};
-use markdown::{Markdown, MarkdownElement};
-use project::{git_store::Repository, project_settings::ProjectSettings};
-use settings::Settings as _;
-use theme::ThemeSettings;
-use time::OffsetDateTime;
-use ui::{ContextMenu, Divider, prelude::*, tooltip_container};
-use workspace::Workspace;
-
-const GIT_BLAME_MAX_AUTHOR_CHARS_DISPLAYED: usize = 20;
-
-pub struct GitBlameRenderer;
-
-impl BlameRenderer for GitBlameRenderer {
-    fn max_author_length(&self) -> usize {
-        GIT_BLAME_MAX_AUTHOR_CHARS_DISPLAYED
-    }
-
-    fn render_blame_entry(
-        &self,
-        style: &TextStyle,
-        blame_entry: BlameEntry,
-        details: Option<ParsedCommitMessage>,
-        repository: Entity<Repository>,
-        workspace: WeakEntity<Workspace>,
-        editor: Entity<Editor>,
-        ix: usize,
-        sha_color: Hsla,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<AnyElement> {
-        let relative_timestamp = blame_entry_relative_timestamp(&blame_entry);
-        let short_commit_id = blame_entry.sha.display_short();
-        let author_name = blame_entry.author.as_deref().unwrap_or("<no name>");
-        let name = util::truncate_and_trailoff(author_name, GIT_BLAME_MAX_AUTHOR_CHARS_DISPLAYED);
-
-        let avatar = if ProjectSettings::get_global(cx).git.blame.show_avatar {
-            Some(
-                CommitAvatar::new(
-                    &blame_entry.sha.to_string().into(),
-                    details.as_ref().and_then(|it| it.remote.as_ref()),
-                )
-                .render(window, cx),
-            )
-        } else {
-            None
-        };
-
-        Some(
-            div()
-                .mr_2()
-                .child(
-                    h_flex()
-                        .id(("blame", ix))
-                        .w_full()
-                        .gap_2()
-                        .justify_between()
-                        .font(style.font())
-                        .line_height(style.line_height)
-                        .text_color(cx.theme().status().hint)
-                        .child(
-                            h_flex()
-                                .gap_2()
-                                .child(div().text_color(sha_color).child(short_commit_id))
-                                .children(avatar)
-                                .child(name),
-                        )
-                        .child(relative_timestamp)
-                        .hover(|style| style.bg(cx.theme().colors().element_hover))
-                        .cursor_pointer()
-                        .on_mouse_down(MouseButton::Right, {
-                            let blame_entry = blame_entry.clone();
-                            let details = details.clone();
-                            let editor = editor.clone();
-                            move |event, window, cx| {
-                                cx.stop_propagation();
-
-                                deploy_blame_entry_context_menu(
-                                    &blame_entry,
-                                    details.as_ref(),
-                                    editor.clone(),
-                                    event.position,
-                                    window,
-                                    cx,
-                                );
-                            }
-                        })
-                        .on_click({
-                            let blame_entry = blame_entry.clone();
-                            let repository = repository.clone();
-                            let workspace = workspace.clone();
-                            move |_, window, cx| {
-                                CommitView::open(
-                                    blame_entry.sha.to_string(),
-                                    repository.downgrade(),
-                                    workspace.clone(),
-                                    None,
-                                    None,
-                                    window,
-                                    cx,
-                                )
-                            }
-                        })
-                        .when(!editor.read(cx).has_mouse_context_menu(), |el| {
-                            el.hoverable_tooltip(move |_window, cx| {
-                                cx.new(|cx| {
-                                    CommitTooltip::blame_entry(
-                                        &blame_entry,
-                                        details.clone(),
-                                        repository.clone(),
-                                        workspace.clone(),
-                                        cx,
-                                    )
-                                })
-                                .into()
-                            })
-                        }),
-                )
-                .into_any(),
-        )
-    }
-
-    fn render_inline_blame_entry(
-        &self,
-        style: &TextStyle,
-        blame_entry: BlameEntry,
-        cx: &mut App,
-    ) -> Option<AnyElement> {
-        let relative_timestamp = blame_entry_relative_timestamp(&blame_entry);
-        let author = blame_entry.author.as_deref().unwrap_or_default();
-        let summary_enabled = ProjectSettings::get_global(cx)
-            .git
-            .inline_blame
-            .show_commit_summary;
-
-        let text = match blame_entry.summary.as_ref() {
-            Some(summary) if summary_enabled => {
-                format!("{}, {} - {}", author, relative_timestamp, summary)
-            }
-            _ => format!("{}, {}", author, relative_timestamp),
-        };
-
-        Some(
-            h_flex()
-                .id("inline-blame")
-                .w_full()
-                .font(style.font())
-                .text_color(cx.theme().status().hint)
-                .line_height(style.line_height)
-                .child(Icon::new(IconName::FileGit).color(Color::Hint))
-                .child(text)
-                .gap_2()
-                .into_any(),
-        )
-    }
-
-    fn render_blame_entry_popover(
-        &self,
-        blame: BlameEntry,
-        scroll_handle: ScrollHandle,
-        details: Option<ParsedCommitMessage>,
-        markdown: Entity<Markdown>,
-        repository: Entity<Repository>,
-        workspace: WeakEntity<Workspace>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<AnyElement> {
-        let commit_time = blame
-            .committer_time
-            .and_then(|t| OffsetDateTime::from_unix_timestamp(t).ok())
-            .unwrap_or(OffsetDateTime::now_utc());
-
-        let sha = blame.sha.to_string().into();
-        let author: SharedString = blame
-            .author
-            .clone()
-            .unwrap_or("<no name>".to_string())
-            .into();
-        let author_email = blame.author_mail.as_deref().unwrap_or_default();
-        let avatar = CommitAvatar::new(&sha, details.as_ref().and_then(|it| it.remote.as_ref()))
-            .render(window, cx);
-
-        let short_commit_id = sha
-            .get(..8)
-            .map(|sha| sha.to_string().into())
-            .unwrap_or_else(|| sha.clone());
-        let local_offset = time::UtcOffset::current_local_offset().unwrap_or(time::UtcOffset::UTC);
-        let absolute_timestamp = time_format::format_localized_timestamp(
-            commit_time,
-            OffsetDateTime::now_utc(),
-            local_offset,
-            time_format::TimestampFormat::MediumAbsolute,
-        );
-        let link_color = cx.theme().colors().text_accent;
-        let markdown_style = {
-            let mut style = hover_markdown_style(window, cx);
-            style.link.refine(&TextStyleRefinement {
-                color: Some(link_color),
-                underline: Some(UnderlineStyle {
-                    color: Some(link_color.opacity(0.4)),
-                    thickness: px(1.0),
-                    ..Default::default()
-                }),
-                ..Default::default()
-            });
-            style
-        };
-
-        let message = details
-            .as_ref()
-            .map(|_| MarkdownElement::new(markdown.clone(), markdown_style).into_any())
-            .unwrap_or("<no commit message>".into_any());
-
-        let pull_request = details
-            .as_ref()
-            .and_then(|details| details.pull_request.clone());
-
-        let ui_font_size = ThemeSettings::get_global(cx).ui_font_size(cx);
-        let message_max_height = window.line_height() * 12 + (ui_font_size / 0.4);
-        let commit_summary = CommitSummary {
-            sha: sha.clone(),
-            subject: details
-                .as_ref()
-                .and_then(|details| {
-                    Some(
-                        details
-                            .message
-                            .split('\n')
-                            .next()?
-                            .trim_end()
-                            .to_string()
-                            .into(),
-                    )
-                })
-                .unwrap_or_default(),
-            commit_timestamp: commit_time.unix_timestamp(),
-            author_name: author.clone(),
-            has_parent: false,
-        };
-
-        Some(
-            tooltip_container(cx, |this, cx| {
-                this.occlude()
-                    .on_mouse_move(|_, _, cx| cx.stop_propagation())
-                    .on_mouse_down(MouseButton::Left, |_, _, cx| cx.stop_propagation())
-                    .child(
-                        v_flex()
-                            .w(gpui::rems(30.))
-                            .child(
-                                h_flex()
-                                    .pb_1()
-                                    .gap_2()
-                                    .overflow_x_hidden()
-                                    .flex_wrap()
-                                    .border_b_1()
-                                    .border_color(cx.theme().colors().border_variant)
-                                    .child(avatar)
-                                    .child(author)
-                                    .when(!author_email.is_empty(), |this| {
-                                        this.child(
-                                            div()
-                                                .text_color(cx.theme().colors().text_muted)
-                                                .child(author_email.to_owned()),
-                                        )
-                                    }),
-                            )
-                            .child(
-                                div()
-                                    .id("inline-blame-commit-message")
-                                    .track_scroll(&scroll_handle)
-                                    .py_1p5()
-                                    .max_h(message_max_height)
-                                    .overflow_y_scroll()
-                                    .child(message),
-                            )
-                            .child(
-                                h_flex()
-                                    .text_color(cx.theme().colors().text_muted)
-                                    .w_full()
-                                    .justify_between()
-                                    .pt_1()
-                                    .border_t_1()
-                                    .border_color(cx.theme().colors().border_variant)
-                                    .child(absolute_timestamp)
-                                    .child(
-                                        h_flex()
-                                            .gap_1()
-                                            .when_some(pull_request, |this, pr| {
-                                                this.child(
-                                                    Button::new(
-                                                        "pull-request-button",
-                                                        format!("#{}", pr.number),
-                                                    )
-                                                    .color(Color::Muted)
-                                                    .icon(IconName::PullRequest)
-                                                    .icon_color(Color::Muted)
-                                                    .icon_position(IconPosition::Start)
-                                                    .icon_size(IconSize::Small)
-                                                    .on_click(move |_, _, cx| {
-                                                        cx.stop_propagation();
-                                                        cx.open_url(pr.url.as_str())
-                                                    }),
-                                                )
-                                                .child(Divider::vertical())
-                                            })
-                                            .child(
-                                                Button::new(
-                                                    "commit-sha-button",
-                                                    short_commit_id.clone(),
-                                                )
-                                                .color(Color::Muted)
-                                                .icon(IconName::FileGit)
-                                                .icon_color(Color::Muted)
-                                                .icon_position(IconPosition::Start)
-                                                .icon_size(IconSize::Small)
-                                                .on_click(move |_, window, cx| {
-                                                    CommitView::open(
-                                                        commit_summary.sha.clone().into(),
-                                                        repository.downgrade(),
-                                                        workspace.clone(),
-                                                        None,
-                                                        None,
-                                                        window,
-                                                        cx,
-                                                    );
-                                                    cx.stop_propagation();
-                                                }),
-                                            )
-                                            .child(
-                                                IconButton::new("copy-sha-button", IconName::Copy)
-                                                    .icon_size(IconSize::Small)
-                                                    .icon_color(Color::Muted)
-                                                    .on_click(move |_, _, cx| {
-                                                        cx.stop_propagation();
-                                                        cx.write_to_clipboard(
-                                                            ClipboardItem::new_string(
-                                                                sha.to_string(),
-                                                            ),
-                                                        )
-                                                    }),
-                                            ),
-                                    ),
-                            ),
-                    )
-            })
-            .into_any_element(),
-        )
-    }
-
-    fn open_blame_commit(
-        &self,
-        blame_entry: BlameEntry,
-        repository: Entity<Repository>,
-        workspace: WeakEntity<Workspace>,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        CommitView::open(
-            blame_entry.sha.to_string(),
-            repository.downgrade(),
-            workspace,
-            None,
-            None,
-            window,
-            cx,
-        )
-    }
-}
-
-fn deploy_blame_entry_context_menu(
-    blame_entry: &BlameEntry,
-    details: Option<&ParsedCommitMessage>,
-    editor: Entity<Editor>,
-    position: gpui::Point<Pixels>,
-    window: &mut Window,
-    cx: &mut App,
-) {
-    let context_menu = ContextMenu::build(window, cx, move |menu, _, _| {
-        let sha = format!("{}", blame_entry.sha);
-        menu.on_blur_subscription(Subscription::new(|| {}))
-            .entry("Copy commit SHA", None, move |_, cx| {
-                cx.write_to_clipboard(ClipboardItem::new_string(sha.clone()));
-            })
-            .when_some(
-                details.and_then(|details| details.permalink.clone()),
-                |this, url| {
-                    this.entry("Open permalink", None, move |_, cx| {
-                        cx.open_url(url.as_str())
-                    })
-                },
-            )
-    });
-
-    editor.update(cx, move |editor, cx| {
-        editor.hide_blame_popover(false, cx);
-        editor.deploy_mouse_context_menu(position, context_menu, window, cx);
-        cx.notify();
-    });
-}
-
-fn blame_entry_relative_timestamp(blame_entry: &BlameEntry) -> String {
-    match blame_entry.author_offset_date_time() {
-        Ok(timestamp) => {
-            let local_offset =
-                time::UtcOffset::current_local_offset().unwrap_or(time::UtcOffset::UTC);
-            time_format::format_localized_timestamp(
-                timestamp,
-                time::OffsetDateTime::now_utc(),
-                local_offset,
-                time_format::TimestampFormat::Relative,
-            )
-        }
-        Err(_) => "Error parsing date".to_string(),
-    }
-}
diff --git a/crates/git_ui/src/branch_picker.rs b/crates/git_ui/src/branch_picker.rs
deleted file mode 100644
index 90b5c4bb28..0000000000
--- a/crates/git_ui/src/branch_picker.rs
+++ /dev/null
@@ -1,1828 +0,0 @@
-use anyhow::Context as _;
-use editor::Editor;
-use fuzzy::StringMatchCandidate;
-
-use collections::HashSet;
-use git::repository::Branch;
-use gpui::http_client::Url;
-use gpui::{
-    Action, App, AsyncApp, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable,
-    InteractiveElement, IntoElement, Modifiers, ModifiersChangedEvent, ParentElement, Render,
-    SharedString, Styled, Subscription, Task, WeakEntity, Window, actions, rems,
-};
-use picker::{Picker, PickerDelegate, PickerEditorPosition};
-use project::git_store::Repository;
-use project::project_settings::ProjectSettings;
-use settings::Settings;
-use std::sync::Arc;
-use time::OffsetDateTime;
-use ui::{
-    CommonAnimationExt, Divider, HighlightedLabel, KeyBinding, ListHeader, ListItem,
-    ListItemSpacing, Tooltip, prelude::*,
-};
-use util::ResultExt;
-use workspace::notifications::DetachAndPromptErr;
-use workspace::{ModalView, Workspace};
-
-use crate::{branch_picker, git_panel::show_error_toast};
-
-actions!(
-    branch_picker,
-    [
-        /// Deletes the selected git branch or remote.
-        DeleteBranch,
-        /// Filter the list of remotes
-        FilterRemotes
-    ]
-);
-
-pub fn register(workspace: &mut Workspace) {
-    workspace.register_action(|workspace, branch: &zed_actions::git::Branch, window, cx| {
-        open(workspace, branch, window, cx);
-    });
-    workspace.register_action(switch);
-    workspace.register_action(checkout_branch);
-}
-
-pub fn checkout_branch(
-    workspace: &mut Workspace,
-    _: &zed_actions::git::CheckoutBranch,
-    window: &mut Window,
-    cx: &mut Context<Workspace>,
-) {
-    open(workspace, &zed_actions::git::Branch, window, cx);
-}
-
-pub fn switch(
-    workspace: &mut Workspace,
-    _: &zed_actions::git::Switch,
-    window: &mut Window,
-    cx: &mut Context<Workspace>,
-) {
-    open(workspace, &zed_actions::git::Branch, window, cx);
-}
-
-pub fn open(
-    workspace: &mut Workspace,
-    _: &zed_actions::git::Branch,
-    window: &mut Window,
-    cx: &mut Context<Workspace>,
-) {
-    let workspace_handle = workspace.weak_handle();
-    let repository = workspace.project().read(cx).active_repository(cx);
-    let style = BranchListStyle::Modal;
-    workspace.toggle_modal(window, cx, |window, cx| {
-        BranchList::new(
-            Some(workspace_handle),
-            repository,
-            style,
-            rems(34.),
-            window,
-            cx,
-        )
-    })
-}
-
-pub fn popover(
-    repository: Option<Entity<Repository>>,
-    window: &mut Window,
-    cx: &mut App,
-) -> Entity<BranchList> {
-    cx.new(|cx| {
-        let list = BranchList::new(
-            None,
-            repository,
-            BranchListStyle::Popover,
-            rems(20.),
-            window,
-            cx,
-        );
-        list.focus_handle(cx).focus(window);
-        list
-    })
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-enum BranchListStyle {
-    Modal,
-    Popover,
-}
-
-pub struct BranchList {
-    width: Rems,
-    pub picker: Entity<Picker<BranchListDelegate>>,
-    picker_focus_handle: FocusHandle,
-    _subscription: Subscription,
-}
-
-impl BranchList {
-    fn new(
-        workspace: Option<WeakEntity<Workspace>>,
-        repository: Option<Entity<Repository>>,
-        style: BranchListStyle,
-        width: Rems,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let all_branches_request = repository
-            .clone()
-            .map(|repository| repository.update(cx, |repository, _| repository.branches()));
-        let default_branch_request = repository
-            .clone()
-            .map(|repository| repository.update(cx, |repository, _| repository.default_branch()));
-
-        cx.spawn_in(window, async move |this, cx| {
-            let mut all_branches = all_branches_request
-                .context("No active repository")?
-                .await??;
-            let default_branch = default_branch_request
-                .context("No active repository")?
-                .await
-                .map(Result::ok)
-                .ok()
-                .flatten()
-                .flatten();
-
-            let all_branches = cx
-                .background_spawn(async move {
-                    let remote_upstreams: HashSet<_> = all_branches
-                        .iter()
-                        .filter_map(|branch| {
-                            branch
-                                .upstream
-                                .as_ref()
-                                .filter(|upstream| upstream.is_remote())
-                                .map(|upstream| upstream.ref_name.clone())
-                        })
-                        .collect();
-
-                    all_branches.retain(|branch| !remote_upstreams.contains(&branch.ref_name));
-
-                    all_branches.sort_by_key(|branch| {
-                        (
-                            !branch.is_head, // Current branch (is_head=true) comes first
-                            branch
-                                .most_recent_commit
-                                .as_ref()
-                                .map(|commit| 0 - commit.commit_timestamp),
-                        )
-                    });
-
-                    all_branches
-                })
-                .await;
-
-            let _ = this.update_in(cx, |this, window, cx| {
-                this.picker.update(cx, |picker, cx| {
-                    picker.delegate.default_branch = default_branch;
-                    picker.delegate.all_branches = Some(all_branches);
-                    picker.refresh(window, cx);
-                })
-            });
-
-            anyhow::Ok(())
-        })
-        .detach_and_log_err(cx);
-
-        let delegate = BranchListDelegate::new(workspace, repository, style, cx);
-        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx));
-        let picker_focus_handle = picker.focus_handle(cx);
-        picker.update(cx, |picker, _| {
-            picker.delegate.focus_handle = picker_focus_handle.clone();
-        });
-
-        let _subscription = cx.subscribe(&picker, |_, _, _, cx| {
-            cx.emit(DismissEvent);
-        });
-
-        Self {
-            picker,
-            picker_focus_handle,
-            width,
-            _subscription,
-        }
-    }
-
-    fn handle_modifiers_changed(
-        &mut self,
-        ev: &ModifiersChangedEvent,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.picker
-            .update(cx, |picker, _| picker.delegate.modifiers = ev.modifiers)
-    }
-
-    fn handle_delete(
-        &mut self,
-        _: &branch_picker::DeleteBranch,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.picker.update(cx, |picker, cx| {
-            picker
-                .delegate
-                .delete_at(picker.delegate.selected_index, window, cx)
-        })
-    }
-
-    fn handle_filter(
-        &mut self,
-        _: &branch_picker::FilterRemotes,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.picker.update(cx, |this, cx| {
-            this.delegate.display_remotes = !this.delegate.display_remotes;
-            cx.spawn_in(window, async move |this, cx| {
-                this.update_in(cx, |picker, window, cx| {
-                    let last_query = picker.delegate.last_query.clone();
-                    picker.delegate.update_matches(last_query, window, cx)
-                })?
-                .await;
-
-                Result::Ok::<_, anyhow::Error>(())
-            })
-            .detach_and_log_err(cx);
-        });
-
-        cx.notify();
-    }
-}
-impl ModalView for BranchList {}
-impl EventEmitter<DismissEvent> for BranchList {}
-
-impl Focusable for BranchList {
-    fn focus_handle(&self, _cx: &App) -> FocusHandle {
-        self.picker_focus_handle.clone()
-    }
-}
-
-impl Render for BranchList {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .key_context("GitBranchSelector")
-            .w(self.width)
-            .on_modifiers_changed(cx.listener(Self::handle_modifiers_changed))
-            .on_action(cx.listener(Self::handle_delete))
-            .on_action(cx.listener(Self::handle_filter))
-            .child(self.picker.clone())
-            .on_mouse_down_out({
-                cx.listener(move |this, _, window, cx| {
-                    this.picker.update(cx, |this, cx| {
-                        this.cancel(&Default::default(), window, cx);
-                    })
-                })
-            })
-    }
-}
-
-#[derive(Debug, Clone, PartialEq)]
-enum Entry {
-    Branch {
-        branch: Branch,
-        positions: Vec<usize>,
-    },
-    NewUrl {
-        url: String,
-    },
-    NewBranch {
-        name: String,
-    },
-}
-
-impl Entry {
-    fn as_branch(&self) -> Option<&Branch> {
-        match self {
-            Entry::Branch { branch, .. } => Some(branch),
-            _ => None,
-        }
-    }
-
-    fn name(&self) -> &str {
-        match self {
-            Entry::Branch { branch, .. } => branch.name(),
-            Entry::NewUrl { url, .. } => url.as_str(),
-            Entry::NewBranch { name, .. } => name.as_str(),
-        }
-    }
-
-    #[cfg(test)]
-    fn is_new_url(&self) -> bool {
-        matches!(self, Self::NewUrl { .. })
-    }
-
-    #[cfg(test)]
-    fn is_new_branch(&self) -> bool {
-        matches!(self, Self::NewBranch { .. })
-    }
-}
-
-pub struct BranchListDelegate {
-    workspace: Option<WeakEntity<Workspace>>,
-    matches: Vec<Entry>,
-    all_branches: Option<Vec<Branch>>,
-    default_branch: Option<SharedString>,
-    repo: Option<Entity<Repository>>,
-    style: BranchListStyle,
-    selected_index: usize,
-    last_query: String,
-    modifiers: Modifiers,
-    display_remotes: bool,
-    state: PickerState,
-    loading: bool,
-    focus_handle: FocusHandle,
-}
-
-#[derive(Debug)]
-enum PickerState {
-    /// When we display list of branches/remotes
-    List,
-    /// When we set an url to create a new remote
-    NewRemote,
-    /// When we confirm the new remote url (after NewRemote)
-    CreateRemote(SharedString),
-    /// When we set a new branch to create
-    NewBranch,
-}
-
-impl BranchListDelegate {
-    fn new(
-        workspace: Option<WeakEntity<Workspace>>,
-        repo: Option<Entity<Repository>>,
-        style: BranchListStyle,
-        cx: &mut Context<BranchList>,
-    ) -> Self {
-        Self {
-            workspace,
-            matches: vec![],
-            repo,
-            style,
-            all_branches: None,
-            default_branch: None,
-            selected_index: 0,
-            last_query: Default::default(),
-            modifiers: Default::default(),
-            display_remotes: false,
-            state: PickerState::List,
-            loading: false,
-            focus_handle: cx.focus_handle(),
-        }
-    }
-
-    fn create_branch(
-        &self,
-        from_branch: Option<SharedString>,
-        new_branch_name: SharedString,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) {
-        let Some(repo) = self.repo.clone() else {
-            return;
-        };
-        let new_branch_name = new_branch_name.to_string().replace(' ', "-");
-        let base_branch = from_branch.map(|b| b.to_string());
-        cx.spawn(async move |_, cx| {
-            repo.update(cx, |repo, _| {
-                repo.create_branch(new_branch_name, base_branch)
-            })?
-            .await??;
-
-            Ok(())
-        })
-        .detach_and_prompt_err("Failed to create branch", window, cx, |e, _, _| {
-            Some(e.to_string())
-        });
-        cx.emit(DismissEvent);
-    }
-
-    fn create_remote(
-        &self,
-        remote_name: String,
-        remote_url: String,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) {
-        let Some(repo) = self.repo.clone() else {
-            return;
-        };
-        cx.spawn(async move |this, cx| {
-            this.update(cx, |picker, cx| {
-                picker.delegate.loading = true;
-                cx.notify();
-            })
-            .log_err();
-
-            let stop_loader = |this: &WeakEntity<Picker<BranchListDelegate>>, cx: &mut AsyncApp| {
-                this.update(cx, |picker, cx| {
-                    picker.delegate.loading = false;
-                    cx.notify();
-                })
-                .log_err();
-            };
-            repo.update(cx, |repo, _| repo.create_remote(remote_name, remote_url))
-                .inspect_err(|_err| {
-                    stop_loader(&this, cx);
-                })?
-                .await
-                .inspect_err(|_err| {
-                    stop_loader(&this, cx);
-                })?
-                .inspect_err(|_err| {
-                    stop_loader(&this, cx);
-                })?;
-            stop_loader(&this, cx);
-            Ok(())
-        })
-        .detach_and_prompt_err("Failed to create remote", window, cx, |e, _, _cx| {
-            Some(e.to_string())
-        });
-        cx.emit(DismissEvent);
-    }
-
-    fn delete_at(&self, idx: usize, window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        let Some(entry) = self.matches.get(idx).cloned() else {
-            return;
-        };
-        let Some(repo) = self.repo.clone() else {
-            return;
-        };
-
-        let workspace = self.workspace.clone();
-
-        cx.spawn_in(window, async move |picker, cx| {
-            let mut is_remote = false;
-            let result = match &entry {
-                Entry::Branch { branch, .. } => match branch.remote_name() {
-                    Some(remote_name) => {
-                        is_remote = true;
-                        repo.update(cx, |repo, _| repo.remove_remote(remote_name.to_string()))?
-                            .await?
-                    }
-                    None => {
-                        repo.update(cx, |repo, _| repo.delete_branch(branch.name().to_string()))?
-                            .await?
-                    }
-                },
-                _ => {
-                    log::error!("Failed to delete remote: wrong entry to delete");
-                    return Ok(());
-                }
-            };
-
-            if let Err(e) = result {
-                if is_remote {
-                    log::error!("Failed to delete remote: {}", e);
-                } else {
-                    log::error!("Failed to delete branch: {}", e);
-                }
-
-                if let Some(workspace) = workspace.and_then(|w| w.upgrade()) {
-                    cx.update(|_window, cx| {
-                        if is_remote {
-                            show_error_toast(
-                                workspace,
-                                format!("remote remove {}", entry.name()),
-                                e,
-                                cx,
-                            )
-                        } else {
-                            show_error_toast(
-                                workspace,
-                                format!("branch -d {}", entry.name()),
-                                e,
-                                cx,
-                            )
-                        }
-                    })?;
-                }
-
-                return Ok(());
-            }
-
-            picker.update_in(cx, |picker, _, cx| {
-                picker.delegate.matches.retain(|e| e != &entry);
-
-                if let Entry::Branch { branch, .. } = &entry {
-                    if let Some(all_branches) = &mut picker.delegate.all_branches {
-                        all_branches.retain(|e| e.ref_name != branch.ref_name);
-                    }
-                }
-
-                if picker.delegate.matches.is_empty() {
-                    picker.delegate.selected_index = 0;
-                } else if picker.delegate.selected_index >= picker.delegate.matches.len() {
-                    picker.delegate.selected_index = picker.delegate.matches.len() - 1;
-                }
-
-                cx.notify();
-            })?;
-
-            anyhow::Ok(())
-        })
-        .detach();
-    }
-}
-
-impl PickerDelegate for BranchListDelegate {
-    type ListItem = ListItem;
-
-    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
-        "Select branch…".into()
-    }
-
-    fn render_editor(
-        &self,
-        editor: &Entity<Editor>,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Div {
-        cx.update_entity(editor, move |editor, cx| {
-            let placeholder = match self.state {
-                PickerState::List | PickerState::NewRemote | PickerState::NewBranch => {
-                    if self.display_remotes {
-                        "Select remote…"
-                    } else {
-                        "Select branch…"
-                    }
-                }
-                PickerState::CreateRemote(_) => "Choose a name…",
-            };
-            editor.set_placeholder_text(placeholder, window, cx);
-        });
-
-        let focus_handle = self.focus_handle.clone();
-
-        v_flex()
-            .when(
-                self.editor_position() == PickerEditorPosition::End,
-                |this| this.child(Divider::horizontal()),
-            )
-            .child(
-                h_flex()
-                    .overflow_hidden()
-                    .flex_none()
-                    .h_9()
-                    .px_2p5()
-                    .child(editor.clone())
-                    .when(
-                        self.editor_position() == PickerEditorPosition::End,
-                        |this| {
-                            let tooltip_label = if self.display_remotes {
-                                "Turn Off Remote Filter"
-                            } else {
-                                "Filter Remote Branches"
-                            };
-
-                            this.gap_1().justify_between().child({
-                                IconButton::new("filter-remotes", IconName::Filter)
-                                    .disabled(self.loading)
-                                    .toggle_state(self.display_remotes)
-                                    .tooltip(move |_, cx| {
-                                        Tooltip::for_action_in(
-                                            tooltip_label,
-                                            &branch_picker::FilterRemotes,
-                                            &focus_handle,
-                                            cx,
-                                        )
-                                    })
-                                    .on_click(|_click, window, cx| {
-                                        window.dispatch_action(
-                                            branch_picker::FilterRemotes.boxed_clone(),
-                                            cx,
-                                        );
-                                    })
-                            })
-                        },
-                    ),
-            )
-            .when(
-                self.editor_position() == PickerEditorPosition::Start,
-                |this| this.child(Divider::horizontal()),
-            )
-    }
-
-    fn editor_position(&self) -> PickerEditorPosition {
-        match self.style {
-            BranchListStyle::Modal => PickerEditorPosition::Start,
-            BranchListStyle::Popover => PickerEditorPosition::End,
-        }
-    }
-
-    fn match_count(&self) -> usize {
-        self.matches.len()
-    }
-
-    fn selected_index(&self) -> usize {
-        self.selected_index
-    }
-
-    fn set_selected_index(
-        &mut self,
-        ix: usize,
-        _window: &mut Window,
-        _: &mut Context<Picker<Self>>,
-    ) {
-        self.selected_index = ix;
-    }
-
-    fn update_matches(
-        &mut self,
-        query: String,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Task<()> {
-        let Some(all_branches) = self.all_branches.clone() else {
-            return Task::ready(());
-        };
-
-        const RECENT_BRANCHES_COUNT: usize = 10;
-        let display_remotes = self.display_remotes;
-        cx.spawn_in(window, async move |picker, cx| {
-            let mut matches: Vec<Entry> = if query.is_empty() {
-                all_branches
-                    .into_iter()
-                    .filter(|branch| {
-                        if display_remotes {
-                            branch.is_remote()
-                        } else {
-                            !branch.is_remote()
-                        }
-                    })
-                    .take(RECENT_BRANCHES_COUNT)
-                    .map(|branch| Entry::Branch {
-                        branch,
-                        positions: Vec::new(),
-                    })
-                    .collect()
-            } else {
-                let branches = all_branches
-                    .iter()
-                    .filter(|branch| {
-                        if display_remotes {
-                            branch.is_remote()
-                        } else {
-                            !branch.is_remote()
-                        }
-                    })
-                    .collect::<Vec<_>>();
-                let candidates = branches
-                    .iter()
-                    .enumerate()
-                    .map(|(ix, branch)| StringMatchCandidate::new(ix, branch.name()))
-                    .collect::<Vec<StringMatchCandidate>>();
-                fuzzy::match_strings(
-                    &candidates,
-                    &query,
-                    true,
-                    true,
-                    10000,
-                    &Default::default(),
-                    cx.background_executor().clone(),
-                )
-                .await
-                .into_iter()
-                .map(|candidate| Entry::Branch {
-                    branch: branches[candidate.candidate_id].clone(),
-                    positions: candidate.positions,
-                })
-                .collect()
-            };
-            picker
-                .update(cx, |picker, _| {
-                    if matches!(picker.delegate.state, PickerState::CreateRemote(_)) {
-                        picker.delegate.last_query = query;
-                        picker.delegate.matches = Vec::new();
-                        picker.delegate.selected_index = 0;
-
-                        return;
-                    }
-
-                    if !query.is_empty()
-                        && !matches.first().is_some_and(|entry| entry.name() == query)
-                    {
-                        let query = query.replace(' ', "-");
-                        let is_url = query.trim_start_matches("git@").parse::<Url>().is_ok();
-                        let entry = if is_url {
-                            Entry::NewUrl { url: query }
-                        } else {
-                            Entry::NewBranch { name: query }
-                        };
-                        // Only transition to NewBranch/NewRemote states when we only show their list item
-                        // Otherwise, stay in List state so footer buttons remain visible
-                        picker.delegate.state = if matches.is_empty() {
-                            if is_url {
-                                PickerState::NewRemote
-                            } else {
-                                PickerState::NewBranch
-                            }
-                        } else {
-                            PickerState::List
-                        };
-                        matches.push(entry);
-                    } else {
-                        picker.delegate.state = PickerState::List;
-                    }
-                    let delegate = &mut picker.delegate;
-                    delegate.matches = matches;
-                    if delegate.matches.is_empty() {
-                        delegate.selected_index = 0;
-                    } else {
-                        delegate.selected_index =
-                            core::cmp::min(delegate.selected_index, delegate.matches.len() - 1);
-                    }
-                    delegate.last_query = query;
-                })
-                .log_err();
-        })
-    }
-
-    fn confirm(&mut self, secondary: bool, window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        if let PickerState::CreateRemote(remote_url) = &self.state {
-            self.create_remote(self.last_query.clone(), remote_url.to_string(), window, cx);
-            self.state = PickerState::List;
-            cx.notify();
-            return;
-        }
-
-        let Some(entry) = self.matches.get(self.selected_index()) else {
-            return;
-        };
-
-        match entry {
-            Entry::Branch { branch, .. } => {
-                let current_branch = self.repo.as_ref().map(|repo| {
-                    repo.read_with(cx, |repo, _| {
-                        repo.branch.as_ref().map(|branch| branch.ref_name.clone())
-                    })
-                });
-
-                if current_branch
-                    .flatten()
-                    .is_some_and(|current_branch| current_branch == branch.ref_name)
-                {
-                    cx.emit(DismissEvent);
-                    return;
-                }
-
-                let Some(repo) = self.repo.clone() else {
-                    return;
-                };
-
-                let branch = branch.clone();
-                cx.spawn(async move |_, cx| {
-                    repo.update(cx, |repo, _| repo.change_branch(branch.name().to_string()))?
-                        .await??;
-
-                    anyhow::Ok(())
-                })
-                .detach_and_prompt_err(
-                    "Failed to change branch",
-                    window,
-                    cx,
-                    |_, _, _| None,
-                );
-            }
-            Entry::NewUrl { url } => {
-                self.state = PickerState::CreateRemote(url.clone().into());
-                self.matches = Vec::new();
-                self.selected_index = 0;
-                cx.spawn_in(window, async move |this, cx| {
-                    this.update_in(cx, |picker, window, cx| {
-                        picker.set_query("", window, cx);
-                    })
-                })
-                .detach_and_log_err(cx);
-                cx.notify();
-            }
-            Entry::NewBranch { name } => {
-                let from_branch = if secondary {
-                    self.default_branch.clone()
-                } else {
-                    None
-                };
-                self.create_branch(from_branch, name.into(), window, cx);
-            }
-        }
-
-        cx.emit(DismissEvent);
-    }
-
-    fn dismissed(&mut self, _: &mut Window, cx: &mut Context<Picker<Self>>) {
-        self.state = PickerState::List;
-        cx.emit(DismissEvent);
-    }
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        _window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<Self::ListItem> {
-        let entry = &self.matches.get(ix)?;
-
-        let (commit_time, author_name, subject) = entry
-            .as_branch()
-            .and_then(|branch| {
-                branch.most_recent_commit.as_ref().map(|commit| {
-                    let subject = commit.subject.clone();
-                    let commit_time = OffsetDateTime::from_unix_timestamp(commit.commit_timestamp)
-                        .unwrap_or_else(|_| OffsetDateTime::now_utc());
-                    let local_offset =
-                        time::UtcOffset::current_local_offset().unwrap_or(time::UtcOffset::UTC);
-                    let formatted_time = time_format::format_localized_timestamp(
-                        commit_time,
-                        OffsetDateTime::now_utc(),
-                        local_offset,
-                        time_format::TimestampFormat::Relative,
-                    );
-                    let author = commit.author_name.clone();
-                    (Some(formatted_time), Some(author), Some(subject))
-                })
-            })
-            .unwrap_or_else(|| (None, None, None));
-
-        let entry_icon = match entry {
-            Entry::NewUrl { .. } | Entry::NewBranch { .. } => {
-                Icon::new(IconName::Plus).color(Color::Muted)
-            }
-
-            Entry::Branch { .. } => {
-                if self.display_remotes {
-                    Icon::new(IconName::Screen).color(Color::Muted)
-                } else {
-                    Icon::new(IconName::GitBranchAlt).color(Color::Muted)
-                }
-            }
-        };
-
-        let entry_title = match entry {
-            Entry::NewUrl { .. } => Label::new("Create Remote Repository")
-                .single_line()
-                .truncate()
-                .into_any_element(),
-            Entry::NewBranch { name } => Label::new(format!("Create Branch: \"{name}\"…"))
-                .single_line()
-                .truncate()
-                .into_any_element(),
-            Entry::Branch { branch, positions } => {
-                HighlightedLabel::new(branch.name().to_string(), positions.clone())
-                    .single_line()
-                    .truncate()
-                    .into_any_element()
-            }
-        };
-
-        let focus_handle = self.focus_handle.clone();
-        let is_new_items = matches!(entry, Entry::NewUrl { .. } | Entry::NewBranch { .. });
-
-        let delete_branch_button = IconButton::new("delete", IconName::Trash)
-            .tooltip(move |_, cx| {
-                Tooltip::for_action_in(
-                    "Delete Branch",
-                    &branch_picker::DeleteBranch,
-                    &focus_handle,
-                    cx,
-                )
-            })
-            .on_click(cx.listener(|this, _, window, cx| {
-                let selected_idx = this.delegate.selected_index();
-                this.delegate.delete_at(selected_idx, window, cx);
-            }));
-
-        let create_from_default_button = self.default_branch.as_ref().map(|default_branch| {
-            let tooltip_label: SharedString = format!("Create New From: {default_branch}").into();
-            let focus_handle = self.focus_handle.clone();
-
-            IconButton::new("create_from_default", IconName::GitBranchPlus)
-                .tooltip(move |_, cx| {
-                    Tooltip::for_action_in(
-                        tooltip_label.clone(),
-                        &menu::SecondaryConfirm,
-                        &focus_handle,
-                        cx,
-                    )
-                })
-                .on_click(cx.listener(|this, _, window, cx| {
-                    this.delegate.confirm(true, window, cx);
-                }))
-                .into_any_element()
-        });
-
-        Some(
-            ListItem::new(format!("vcs-menu-{ix}"))
-                .inset(true)
-                .spacing(ListItemSpacing::Sparse)
-                .toggle_state(selected)
-                .child(
-                    h_flex()
-                        .w_full()
-                        .gap_3()
-                        .flex_grow()
-                        .child(entry_icon)
-                        .child(
-                            v_flex()
-                                .id("info_container")
-                                .w_full()
-                                .child(entry_title)
-                                .child(
-                                    h_flex()
-                                        .w_full()
-                                        .justify_between()
-                                        .gap_1p5()
-                                        .when(self.style == BranchListStyle::Modal, |el| {
-                                            el.child(div().max_w_96().child({
-                                                let message = match entry {
-                                                    Entry::NewUrl { url } => {
-                                                        format!("Based off {url}")
-                                                    }
-                                                    Entry::NewBranch { .. } => {
-                                                        if let Some(current_branch) =
-                                                            self.repo.as_ref().and_then(|repo| {
-                                                                repo.read(cx)
-                                                                    .branch
-                                                                    .as_ref()
-                                                                    .map(|b| b.name())
-                                                            })
-                                                        {
-                                                            format!("Based off {}", current_branch)
-                                                        } else {
-                                                            "Based off the current branch"
-                                                                .to_string()
-                                                        }
-                                                    }
-                                                    Entry::Branch { .. } => {
-                                                        let show_author_name =
-                                                            ProjectSettings::get_global(cx)
-                                                                .git
-                                                                .branch_picker
-                                                                .show_author_name;
-
-                                                        subject.map_or(
-                                                            "No commits found".into(),
-                                                            |subject| {
-                                                                if show_author_name
-                                                                    && author_name.is_some()
-                                                                {
-                                                                    format!(
-                                                                        "{}  •  {}",
-                                                                        author_name.unwrap(),
-                                                                        subject
-                                                                    )
-                                                                } else {
-                                                                    subject.to_string()
-                                                                }
-                                                            },
-                                                        )
-                                                    }
-                                                };
-
-                                                Label::new(message)
-                                                    .size(LabelSize::Small)
-                                                    .color(Color::Muted)
-                                                    .truncate()
-                                            }))
-                                        })
-                                        .when_some(commit_time, |label, commit_time| {
-                                            label.child(
-                                                Label::new(commit_time)
-                                                    .size(LabelSize::Small)
-                                                    .color(Color::Muted),
-                                            )
-                                        }),
-                                )
-                                .when_some(
-                                    entry.as_branch().map(|b| b.name().to_string()),
-                                    |this, branch_name| this.tooltip(Tooltip::text(branch_name)),
-                                ),
-                        ),
-                )
-                .when(
-                    self.editor_position() == PickerEditorPosition::End && !is_new_items,
-                    |this| {
-                        this.map(|this| {
-                            if self.selected_index() == ix {
-                                this.end_slot(delete_branch_button)
-                            } else {
-                                this.end_hover_slot(delete_branch_button)
-                            }
-                        })
-                    },
-                )
-                .when_some(
-                    if self.editor_position() == PickerEditorPosition::End && is_new_items {
-                        create_from_default_button
-                    } else {
-                        None
-                    },
-                    |this, create_from_default_button| {
-                        this.map(|this| {
-                            if self.selected_index() == ix {
-                                this.end_slot(create_from_default_button)
-                            } else {
-                                this.end_hover_slot(create_from_default_button)
-                            }
-                        })
-                    },
-                ),
-        )
-    }
-
-    fn render_header(
-        &self,
-        _window: &mut Window,
-        _cx: &mut Context<Picker<Self>>,
-    ) -> Option<AnyElement> {
-        matches!(self.state, PickerState::List).then(|| {
-            let label = if self.display_remotes {
-                "Remote"
-            } else {
-                "Local"
-            };
-
-            ListHeader::new(label).inset(true).into_any_element()
-        })
-    }
-
-    fn render_footer(&self, _: &mut Window, cx: &mut Context<Picker<Self>>) -> Option<AnyElement> {
-        if self.editor_position() == PickerEditorPosition::End {
-            return None;
-        }
-
-        let focus_handle = self.focus_handle.clone();
-        let loading_icon = Icon::new(IconName::LoadCircle)
-            .size(IconSize::Small)
-            .with_rotate_animation(3);
-
-        let footer_container = || {
-            h_flex()
-                .w_full()
-                .p_1p5()
-                .border_t_1()
-                .border_color(cx.theme().colors().border_variant)
-        };
-
-        match self.state {
-            PickerState::List => {
-                let selected_entry = self.matches.get(self.selected_index);
-
-                let branch_from_default_button = self
-                    .default_branch
-                    .as_ref()
-                    .filter(|_| matches!(selected_entry, Some(Entry::NewBranch { .. })))
-                    .map(|default_branch| {
-                        let button_label = format!("Create New From: {default_branch}");
-
-                        Button::new("branch-from-default", button_label)
-                            .key_binding(
-                                KeyBinding::for_action_in(
-                                    &menu::SecondaryConfirm,
-                                    &focus_handle,
-                                    cx,
-                                )
-                                .map(|kb| kb.size(rems_from_px(12.))),
-                            )
-                            .on_click(cx.listener(|this, _, window, cx| {
-                                this.delegate.confirm(true, window, cx);
-                            }))
-                    });
-
-                let delete_and_select_btns = h_flex()
-                    .gap_1()
-                    .child(
-                        Button::new("delete-branch", "Delete")
-                            .disabled(self.loading)
-                            .key_binding(
-                                KeyBinding::for_action_in(
-                                    &branch_picker::DeleteBranch,
-                                    &focus_handle,
-                                    cx,
-                                )
-                                .map(|kb| kb.size(rems_from_px(12.))),
-                            )
-                            .on_click(|_, window, cx| {
-                                window
-                                    .dispatch_action(branch_picker::DeleteBranch.boxed_clone(), cx);
-                            }),
-                    )
-                    .child(
-                        Button::new("select_branch", "Select")
-                            .key_binding(
-                                KeyBinding::for_action_in(&menu::Confirm, &focus_handle, cx)
-                                    .map(|kb| kb.size(rems_from_px(12.))),
-                            )
-                            .on_click(cx.listener(|this, _, window, cx| {
-                                this.delegate.confirm(false, window, cx);
-                            })),
-                    );
-
-                Some(
-                    footer_container()
-                        .map(|this| {
-                            if branch_from_default_button.is_some() {
-                                this.justify_end().when_some(
-                                    branch_from_default_button,
-                                    |this, button| {
-                                        this.child(button).child(
-                                            Button::new("create", "Create")
-                                                .key_binding(
-                                                    KeyBinding::for_action_in(
-                                                        &menu::Confirm,
-                                                        &focus_handle,
-                                                        cx,
-                                                    )
-                                                    .map(|kb| kb.size(rems_from_px(12.))),
-                                                )
-                                                .on_click(cx.listener(|this, _, window, cx| {
-                                                    this.delegate.confirm(false, window, cx);
-                                                })),
-                                        )
-                                    },
-                                )
-                            } else if self.loading {
-                                this.justify_between()
-                                    .child(loading_icon)
-                                    .child(delete_and_select_btns)
-                            } else {
-                                this.justify_between()
-                                    .child({
-                                        let focus_handle = focus_handle.clone();
-                                        Button::new("filter-remotes", "Filter Remotes")
-                                            .disabled(self.loading)
-                                            .toggle_state(self.display_remotes)
-                                            .key_binding(
-                                                KeyBinding::for_action_in(
-                                                    &branch_picker::FilterRemotes,
-                                                    &focus_handle,
-                                                    cx,
-                                                )
-                                                .map(|kb| kb.size(rems_from_px(12.))),
-                                            )
-                                            .on_click(|_click, window, cx| {
-                                                window.dispatch_action(
-                                                    branch_picker::FilterRemotes.boxed_clone(),
-                                                    cx,
-                                                );
-                                            })
-                                    })
-                                    .child(delete_and_select_btns)
-                            }
-                        })
-                        .into_any_element(),
-                )
-            }
-            PickerState::NewBranch => {
-                let branch_from_default_button =
-                    self.default_branch.as_ref().map(|default_branch| {
-                        let button_label = format!("Create New From: {default_branch}");
-
-                        Button::new("branch-from-default", button_label)
-                            .key_binding(
-                                KeyBinding::for_action_in(
-                                    &menu::SecondaryConfirm,
-                                    &focus_handle,
-                                    cx,
-                                )
-                                .map(|kb| kb.size(rems_from_px(12.))),
-                            )
-                            .on_click(cx.listener(|this, _, window, cx| {
-                                this.delegate.confirm(true, window, cx);
-                            }))
-                    });
-
-                Some(
-                    footer_container()
-                        .gap_1()
-                        .justify_end()
-                        .when_some(branch_from_default_button, |this, button| {
-                            this.child(button)
-                        })
-                        .child(
-                            Button::new("branch-from-default", "Create")
-                                .key_binding(
-                                    KeyBinding::for_action_in(&menu::Confirm, &focus_handle, cx)
-                                        .map(|kb| kb.size(rems_from_px(12.))),
-                                )
-                                .on_click(cx.listener(|this, _, window, cx| {
-                                    this.delegate.confirm(false, window, cx);
-                                })),
-                        )
-                        .into_any_element(),
-                )
-            }
-            PickerState::CreateRemote(_) => Some(
-                footer_container()
-                    .justify_end()
-                    .child(
-                        Label::new("Choose a name for this remote repository")
-                            .size(LabelSize::Small)
-                            .color(Color::Muted),
-                    )
-                    .child(
-                        Label::new("Save")
-                            .size(LabelSize::Small)
-                            .color(Color::Muted),
-                    )
-                    .into_any_element(),
-            ),
-            PickerState::NewRemote => None,
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::collections::HashSet;
-
-    use super::*;
-    use git::repository::{CommitSummary, Remote};
-    use gpui::{TestAppContext, VisualTestContext};
-    use project::{FakeFs, Project};
-    use serde_json::json;
-    use settings::SettingsStore;
-    use util::path;
-
-    fn init_test(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-            theme::init(theme::LoadThemes::JustBase, cx);
-        });
-    }
-
-    fn create_test_branch(
-        name: &str,
-        is_head: bool,
-        remote_name: Option<&str>,
-        timestamp: Option<i64>,
-    ) -> Branch {
-        let ref_name = match remote_name {
-            Some(remote_name) => format!("refs/remotes/{remote_name}/{name}"),
-            None => format!("refs/heads/{name}"),
-        };
-
-        Branch {
-            is_head,
-            ref_name: ref_name.into(),
-            upstream: None,
-            most_recent_commit: timestamp.map(|ts| CommitSummary {
-                sha: "abc123".into(),
-                commit_timestamp: ts,
-                author_name: "Test Author".into(),
-                subject: "Test commit".into(),
-                has_parent: true,
-            }),
-        }
-    }
-
-    fn create_test_branches() -> Vec<Branch> {
-        vec![
-            create_test_branch("main", true, None, Some(1000)),
-            create_test_branch("feature-auth", false, None, Some(900)),
-            create_test_branch("feature-ui", false, None, Some(800)),
-            create_test_branch("develop", false, None, Some(700)),
-        ]
-    }
-
-    fn init_branch_list_test(
-        cx: &mut TestAppContext,
-        repository: Option<Entity<Repository>>,
-        branches: Vec<Branch>,
-    ) -> (VisualTestContext, Entity<BranchList>) {
-        let window = cx.add_window(|window, cx| {
-            let mut delegate =
-                BranchListDelegate::new(None, repository, BranchListStyle::Modal, cx);
-            delegate.all_branches = Some(branches);
-            let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx));
-            let picker_focus_handle = picker.focus_handle(cx);
-            picker.update(cx, |picker, _| {
-                picker.delegate.focus_handle = picker_focus_handle.clone();
-            });
-
-            let _subscription = cx.subscribe(&picker, |_, _, _, cx| {
-                cx.emit(DismissEvent);
-            });
-
-            BranchList {
-                picker,
-                picker_focus_handle,
-                width: rems(34.),
-                _subscription,
-            }
-        });
-
-        let branch_list = window.root(cx).unwrap();
-        let cx = VisualTestContext::from_window(*window, cx);
-
-        (cx, branch_list)
-    }
-
-    async fn init_fake_repository(cx: &mut TestAppContext) -> Entity<Repository> {
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/dir"),
-            json!({
-                ".git": {},
-                "file.txt": "buffer_text".to_string()
-            }),
-        )
-        .await;
-        fs.set_head_for_repo(
-            path!("/dir/.git").as_ref(),
-            &[("file.txt", "test".to_string())],
-            "deadbeef",
-        );
-        fs.set_index_for_repo(
-            path!("/dir/.git").as_ref(),
-            &[("file.txt", "index_text".to_string())],
-        );
-
-        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let repository = cx.read(|cx| project.read(cx).active_repository(cx));
-
-        repository.unwrap()
-    }
-
-    #[gpui::test]
-    async fn test_update_branch_matches_with_query(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let branches = create_test_branches();
-        let (mut ctx, branch_list) = init_branch_list_test(cx, None, branches);
-        let cx = &mut ctx;
-
-        branch_list
-            .update_in(cx, |branch_list, window, cx| {
-                let query = "feature".to_string();
-                branch_list.picker.update(cx, |picker, cx| {
-                    picker.delegate.update_matches(query, window, cx)
-                })
-            })
-            .await;
-        cx.run_until_parked();
-
-        branch_list.update(cx, |branch_list, cx| {
-            branch_list.picker.update(cx, |picker, _cx| {
-                // Should have 2 existing branches + 1 "create new branch" entry = 3 total
-                assert_eq!(picker.delegate.matches.len(), 3);
-                assert!(
-                    picker
-                        .delegate
-                        .matches
-                        .iter()
-                        .any(|m| m.name() == "feature-auth")
-                );
-                assert!(
-                    picker
-                        .delegate
-                        .matches
-                        .iter()
-                        .any(|m| m.name() == "feature-ui")
-                );
-                // Verify the last entry is the "create new branch" option
-                let last_match = picker.delegate.matches.last().unwrap();
-                assert!(last_match.is_new_branch());
-            })
-        });
-    }
-
-    async fn update_branch_list_matches_with_empty_query(
-        branch_list: &Entity<BranchList>,
-        cx: &mut VisualTestContext,
-    ) {
-        branch_list
-            .update_in(cx, |branch_list, window, cx| {
-                branch_list.picker.update(cx, |picker, cx| {
-                    picker.delegate.update_matches(String::new(), window, cx)
-                })
-            })
-            .await;
-        cx.run_until_parked();
-    }
-
-    #[gpui::test]
-    async fn test_delete_branch(cx: &mut TestAppContext) {
-        init_test(cx);
-        let repository = init_fake_repository(cx).await;
-
-        let branches = create_test_branches();
-
-        let branch_names = branches
-            .iter()
-            .map(|branch| branch.name().to_string())
-            .collect::<Vec<String>>();
-        let repo = repository.clone();
-        cx.spawn(async move |mut cx| {
-            for branch in branch_names {
-                repo.update(&mut cx, |repo, _| repo.create_branch(branch, None))
-                    .unwrap()
-                    .await
-                    .unwrap()
-                    .unwrap();
-            }
-        })
-        .await;
-        cx.run_until_parked();
-
-        let (mut ctx, branch_list) = init_branch_list_test(cx, repository.into(), branches);
-        let cx = &mut ctx;
-
-        update_branch_list_matches_with_empty_query(&branch_list, cx).await;
-
-        let branch_to_delete = branch_list.update_in(cx, |branch_list, window, cx| {
-            branch_list.picker.update(cx, |picker, cx| {
-                assert_eq!(picker.delegate.matches.len(), 4);
-                let branch_to_delete = picker.delegate.matches.get(1).unwrap().name().to_string();
-                picker.delegate.delete_at(1, window, cx);
-                branch_to_delete
-            })
-        });
-        cx.run_until_parked();
-
-        branch_list.update(cx, move |branch_list, cx| {
-            branch_list.picker.update(cx, move |picker, _cx| {
-                assert_eq!(picker.delegate.matches.len(), 3);
-                let branches = picker
-                    .delegate
-                    .matches
-                    .iter()
-                    .map(|be| be.name())
-                    .collect::<HashSet<_>>();
-                assert_eq!(
-                    branches,
-                    ["main", "feature-auth", "feature-ui", "develop"]
-                        .into_iter()
-                        .filter(|name| name != &branch_to_delete)
-                        .collect::<HashSet<_>>()
-                );
-            })
-        });
-    }
-
-    #[gpui::test]
-    async fn test_delete_remote(cx: &mut TestAppContext) {
-        init_test(cx);
-        let repository = init_fake_repository(cx).await;
-        let branches = vec![
-            create_test_branch("main", true, Some("origin"), Some(1000)),
-            create_test_branch("feature-auth", false, Some("origin"), Some(900)),
-            create_test_branch("feature-ui", false, Some("fork"), Some(800)),
-            create_test_branch("develop", false, Some("private"), Some(700)),
-        ];
-
-        let remote_names = branches
-            .iter()
-            .filter_map(|branch| branch.remote_name().map(|r| r.to_string()))
-            .collect::<Vec<String>>();
-        let repo = repository.clone();
-        cx.spawn(async move |mut cx| {
-            for branch in remote_names {
-                repo.update(&mut cx, |repo, _| {
-                    repo.create_remote(branch, String::from("test"))
-                })
-                .unwrap()
-                .await
-                .unwrap()
-                .unwrap();
-            }
-        })
-        .await;
-        cx.run_until_parked();
-
-        let (mut ctx, branch_list) = init_branch_list_test(cx, repository.into(), branches);
-        let cx = &mut ctx;
-        // Enable remote filter
-        branch_list.update(cx, |branch_list, cx| {
-            branch_list.picker.update(cx, |picker, _cx| {
-                picker.delegate.display_remotes = true;
-            });
-        });
-        update_branch_list_matches_with_empty_query(&branch_list, cx).await;
-
-        // Check matches, it should match all existing branches and no option to create new branch
-        let branch_to_delete = branch_list.update_in(cx, |branch_list, window, cx| {
-            branch_list.picker.update(cx, |picker, cx| {
-                assert_eq!(picker.delegate.matches.len(), 4);
-                let branch_to_delete = picker.delegate.matches.get(1).unwrap().name().to_string();
-                picker.delegate.delete_at(1, window, cx);
-                branch_to_delete
-            })
-        });
-        cx.run_until_parked();
-
-        // Check matches, it should match one less branch than before
-        branch_list.update(cx, move |branch_list, cx| {
-            branch_list.picker.update(cx, move |picker, _cx| {
-                assert_eq!(picker.delegate.matches.len(), 3);
-                let branches = picker
-                    .delegate
-                    .matches
-                    .iter()
-                    .map(|be| be.name())
-                    .collect::<HashSet<_>>();
-                assert_eq!(
-                    branches,
-                    [
-                        "origin/main",
-                        "origin/feature-auth",
-                        "fork/feature-ui",
-                        "private/develop"
-                    ]
-                    .into_iter()
-                    .filter(|name| name != &branch_to_delete)
-                    .collect::<HashSet<_>>()
-                );
-            })
-        });
-    }
-
-    #[gpui::test]
-    async fn test_update_remote_matches_with_query(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let branches = vec![
-            create_test_branch("main", true, Some("origin"), Some(1000)),
-            create_test_branch("feature-auth", false, Some("fork"), Some(900)),
-            create_test_branch("feature-ui", false, None, Some(800)),
-            create_test_branch("develop", false, None, Some(700)),
-        ];
-
-        let (mut ctx, branch_list) = init_branch_list_test(cx, None, branches);
-        let cx = &mut ctx;
-
-        update_branch_list_matches_with_empty_query(&branch_list, cx).await;
-
-        // Check matches, it should match all existing branches and no option to create new branch
-        branch_list
-            .update_in(cx, |branch_list, window, cx| {
-                branch_list.picker.update(cx, |picker, cx| {
-                    assert_eq!(picker.delegate.matches.len(), 2);
-                    let branches = picker
-                        .delegate
-                        .matches
-                        .iter()
-                        .map(|be| be.name())
-                        .collect::<HashSet<_>>();
-                    assert_eq!(
-                        branches,
-                        ["feature-ui", "develop"]
-                            .into_iter()
-                            .collect::<HashSet<_>>()
-                    );
-
-                    // Verify the last entry is NOT the "create new branch" option
-                    let last_match = picker.delegate.matches.last().unwrap();
-                    assert!(!last_match.is_new_branch());
-                    assert!(!last_match.is_new_url());
-                    picker.delegate.display_remotes = true;
-                    picker.delegate.update_matches(String::new(), window, cx)
-                })
-            })
-            .await;
-        cx.run_until_parked();
-
-        branch_list
-            .update_in(cx, |branch_list, window, cx| {
-                branch_list.picker.update(cx, |picker, cx| {
-                    assert_eq!(picker.delegate.matches.len(), 2);
-                    let branches = picker
-                        .delegate
-                        .matches
-                        .iter()
-                        .map(|be| be.name())
-                        .collect::<HashSet<_>>();
-                    assert_eq!(
-                        branches,
-                        ["origin/main", "fork/feature-auth"]
-                            .into_iter()
-                            .collect::<HashSet<_>>()
-                    );
-
-                    // Verify the last entry is NOT the "create new branch" option
-                    let last_match = picker.delegate.matches.last().unwrap();
-                    assert!(!last_match.is_new_url());
-                    picker.delegate.display_remotes = true;
-                    picker
-                        .delegate
-                        .update_matches(String::from("fork"), window, cx)
-                })
-            })
-            .await;
-        cx.run_until_parked();
-
-        branch_list.update(cx, |branch_list, cx| {
-            branch_list.picker.update(cx, |picker, _cx| {
-                // Should have 1 existing branch + 1 "create new branch" entry = 2 total
-                assert_eq!(picker.delegate.matches.len(), 2);
-                assert!(
-                    picker
-                        .delegate
-                        .matches
-                        .iter()
-                        .any(|m| m.name() == "fork/feature-auth")
-                );
-                // Verify the last entry is the "create new branch" option
-                let last_match = picker.delegate.matches.last().unwrap();
-                assert!(last_match.is_new_branch());
-            })
-        });
-    }
-
-    #[gpui::test]
-    async fn test_new_branch_creation_with_query(test_cx: &mut TestAppContext) {
-        init_test(test_cx);
-        let repository = init_fake_repository(test_cx).await;
-
-        let branches = vec![
-            create_test_branch("main", true, None, Some(1000)),
-            create_test_branch("feature", false, None, Some(900)),
-        ];
-
-        let (mut ctx, branch_list) = init_branch_list_test(test_cx, repository.into(), branches);
-        let cx = &mut ctx;
-
-        branch_list
-            .update_in(cx, |branch_list, window, cx| {
-                branch_list.picker.update(cx, |picker, cx| {
-                    let query = "new-feature-branch".to_string();
-                    picker.delegate.update_matches(query, window, cx)
-                })
-            })
-            .await;
-
-        cx.run_until_parked();
-
-        branch_list.update_in(cx, |branch_list, window, cx| {
-            branch_list.picker.update(cx, |picker, cx| {
-                let last_match = picker.delegate.matches.last().unwrap();
-                assert!(last_match.is_new_branch());
-                assert_eq!(last_match.name(), "new-feature-branch");
-                // State is NewBranch because no existing branches fuzzy-match the query
-                assert!(matches!(picker.delegate.state, PickerState::NewBranch));
-                picker.delegate.confirm(false, window, cx);
-            })
-        });
-        cx.run_until_parked();
-
-        let branches = branch_list
-            .update(cx, |branch_list, cx| {
-                branch_list.picker.update(cx, |picker, cx| {
-                    picker
-                        .delegate
-                        .repo
-                        .as_ref()
-                        .unwrap()
-                        .update(cx, |repo, _cx| repo.branches())
-                })
-            })
-            .await
-            .unwrap()
-            .unwrap();
-
-        let new_branch = branches
-            .into_iter()
-            .find(|branch| branch.name() == "new-feature-branch")
-            .expect("new-feature-branch should exist");
-        assert_eq!(
-            new_branch.ref_name.as_ref(),
-            "refs/heads/new-feature-branch",
-            "branch ref_name should not have duplicate refs/heads/ prefix"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_remote_url_detection_https(cx: &mut TestAppContext) {
-        init_test(cx);
-        let repository = init_fake_repository(cx).await;
-        let branches = vec![create_test_branch("main", true, None, Some(1000))];
-
-        let (mut ctx, branch_list) = init_branch_list_test(cx, repository.into(), branches);
-        let cx = &mut ctx;
-
-        branch_list
-            .update_in(cx, |branch_list, window, cx| {
-                branch_list.picker.update(cx, |picker, cx| {
-                    let query = "https://github.com/user/repo.git".to_string();
-                    picker.delegate.update_matches(query, window, cx)
-                })
-            })
-            .await;
-
-        cx.run_until_parked();
-
-        branch_list
-            .update_in(cx, |branch_list, window, cx| {
-                branch_list.picker.update(cx, |picker, cx| {
-                    let last_match = picker.delegate.matches.last().unwrap();
-                    assert!(last_match.is_new_url());
-                    assert!(matches!(picker.delegate.state, PickerState::NewRemote));
-                    picker.delegate.confirm(false, window, cx);
-                    assert_eq!(picker.delegate.matches.len(), 0);
-                    if let PickerState::CreateRemote(remote_url) = &picker.delegate.state
-                        && remote_url.as_ref() == "https://github.com/user/repo.git"
-                    {
-                    } else {
-                        panic!("wrong picker state");
-                    }
-                    picker
-                        .delegate
-                        .update_matches("my_new_remote".to_string(), window, cx)
-                })
-            })
-            .await;
-
-        cx.run_until_parked();
-
-        branch_list.update_in(cx, |branch_list, window, cx| {
-            branch_list.picker.update(cx, |picker, cx| {
-                picker.delegate.confirm(false, window, cx);
-                assert_eq!(picker.delegate.matches.len(), 0);
-            })
-        });
-        cx.run_until_parked();
-
-        // List remotes
-        let remotes = branch_list
-            .update(cx, |branch_list, cx| {
-                branch_list.picker.update(cx, |picker, cx| {
-                    picker
-                        .delegate
-                        .repo
-                        .as_ref()
-                        .unwrap()
-                        .update(cx, |repo, _cx| repo.get_remotes(None, false))
-                })
-            })
-            .await
-            .unwrap()
-            .unwrap();
-        assert_eq!(
-            remotes,
-            vec![Remote {
-                name: SharedString::from("my_new_remote".to_string())
-            }]
-        );
-    }
-
-    #[gpui::test]
-    async fn test_confirm_remote_url_transitions(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let branches = vec![create_test_branch("main_branch", true, None, Some(1000))];
-        let (mut ctx, branch_list) = init_branch_list_test(cx, None, branches);
-        let cx = &mut ctx;
-
-        branch_list
-            .update_in(cx, |branch_list, window, cx| {
-                branch_list.picker.update(cx, |picker, cx| {
-                    let query = "https://github.com/user/repo.git".to_string();
-                    picker.delegate.update_matches(query, window, cx)
-                })
-            })
-            .await;
-        cx.run_until_parked();
-
-        // Try to create a new remote but cancel in the middle of the process
-        branch_list
-            .update_in(cx, |branch_list, window, cx| {
-                branch_list.picker.update(cx, |picker, cx| {
-                    picker.delegate.selected_index = picker.delegate.matches.len() - 1;
-                    picker.delegate.confirm(false, window, cx);
-
-                    assert!(matches!(
-                        picker.delegate.state,
-                        PickerState::CreateRemote(_)
-                    ));
-                    if let PickerState::CreateRemote(ref url) = picker.delegate.state {
-                        assert_eq!(url.as_ref(), "https://github.com/user/repo.git");
-                    }
-                    assert_eq!(picker.delegate.matches.len(), 0);
-                    picker.delegate.dismissed(window, cx);
-                    assert!(matches!(picker.delegate.state, PickerState::List));
-                    let query = "main".to_string();
-                    picker.delegate.update_matches(query, window, cx)
-                })
-            })
-            .await;
-        cx.run_until_parked();
-
-        // Try to search a branch again to see if the state is restored properly
-        branch_list.update(cx, |branch_list, cx| {
-            branch_list.picker.update(cx, |picker, _cx| {
-                // Should have 1 existing branch + 1 "create new branch" entry = 2 total
-                assert_eq!(picker.delegate.matches.len(), 2);
-                assert!(
-                    picker
-                        .delegate
-                        .matches
-                        .iter()
-                        .any(|m| m.name() == "main_branch")
-                );
-                // Verify the last entry is the "create new branch" option
-                let last_match = picker.delegate.matches.last().unwrap();
-                assert!(last_match.is_new_branch());
-            })
-        });
-    }
-}
diff --git a/crates/git_ui/src/commit_message_prompt.txt b/crates/git_ui/src/commit_message_prompt.txt
deleted file mode 100644
index 64c2f7d2f9..0000000000
--- a/crates/git_ui/src/commit_message_prompt.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-You are an expert at writing Git commits. Your job is to write a short clear commit message that summarizes the changes.
-
-If you can accurately express the change in just the subject line, don't include anything in the message body. Only use the body when it is providing *useful* information.
-
-Don't repeat information from the subject line in the message body.
-
-Only return the commit message in your response. Do not include any additional meta-commentary about the task. Do not include the raw diff output in the commit message.
-
-Follow good Git style:
-
-- Separate the subject from the body with a blank line
-- Try to limit the subject line to 50 characters
-- Capitalize the subject line
-- Do not end the subject line with any punctuation
-- Use the imperative mood in the subject line
-- Wrap the body at 72 characters
-- Keep the body short and concise (omit it entirely if not useful)
diff --git a/crates/git_ui/src/commit_modal.rs b/crates/git_ui/src/commit_modal.rs
deleted file mode 100644
index 822b2c8385..0000000000
--- a/crates/git_ui/src/commit_modal.rs
+++ /dev/null
@@ -1,593 +0,0 @@
-use crate::branch_picker::{self, BranchList};
-use crate::git_panel::{GitPanel, commit_message_editor};
-use git::repository::CommitOptions;
-use git::{Amend, Commit, GenerateCommitMessage, Signoff};
-use panel::{panel_button, panel_editor_style};
-use project::DisableAiSettings;
-use settings::Settings;
-use ui::{
-    ContextMenu, KeybindingHint, PopoverMenu, PopoverMenuHandle, SplitButton, Tooltip, prelude::*,
-};
-
-use editor::{Editor, EditorElement};
-use gpui::*;
-use util::ResultExt;
-use workspace::{
-    ModalView, Workspace,
-    dock::{Dock, PanelHandle},
-};
-
-// nate: It is a pain to get editors to size correctly and not overflow.
-//
-// this can get replaced with a simple flex layout with more time/a more thoughtful approach.
-#[derive(Debug, Clone, Copy)]
-pub struct ModalContainerProperties {
-    pub modal_width: f32,
-    pub editor_height: f32,
-    pub footer_height: f32,
-    pub container_padding: f32,
-    pub modal_border_radius: f32,
-}
-
-impl ModalContainerProperties {
-    pub fn new(window: &Window, preferred_char_width: usize) -> Self {
-        let container_padding = 5.0;
-
-        // Calculate width based on character width
-        let mut modal_width = 460.0;
-        let style = window.text_style();
-        let font_id = window.text_system().resolve_font(&style.font());
-        let font_size = style.font_size.to_pixels(window.rem_size());
-
-        if let Ok(em_width) = window.text_system().em_width(font_id, font_size) {
-            modal_width =
-                f32::from(preferred_char_width as f32 * em_width + px(container_padding * 2.0));
-        }
-
-        Self {
-            modal_width,
-            editor_height: 300.0,
-            footer_height: 24.0,
-            container_padding,
-            modal_border_radius: 12.0,
-        }
-    }
-
-    pub fn editor_border_radius(&self) -> Pixels {
-        px(self.modal_border_radius - self.container_padding / 2.0)
-    }
-}
-
-pub struct CommitModal {
-    git_panel: Entity<GitPanel>,
-    commit_editor: Entity<Editor>,
-    restore_dock: RestoreDock,
-    properties: ModalContainerProperties,
-    branch_list_handle: PopoverMenuHandle<BranchList>,
-    commit_menu_handle: PopoverMenuHandle<ContextMenu>,
-}
-
-impl Focusable for CommitModal {
-    fn focus_handle(&self, cx: &App) -> gpui::FocusHandle {
-        self.commit_editor.focus_handle(cx)
-    }
-}
-
-impl EventEmitter<DismissEvent> for CommitModal {}
-impl ModalView for CommitModal {
-    fn on_before_dismiss(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> workspace::DismissDecision {
-        self.git_panel.update(cx, |git_panel, cx| {
-            git_panel.set_modal_open(false, cx);
-        });
-        self.restore_dock
-            .dock
-            .update(cx, |dock, cx| {
-                if let Some(active_index) = self.restore_dock.active_index {
-                    dock.activate_panel(active_index, window, cx)
-                }
-                dock.set_open(self.restore_dock.is_open, window, cx)
-            })
-            .log_err();
-        workspace::DismissDecision::Dismiss(true)
-    }
-}
-
-struct RestoreDock {
-    dock: WeakEntity<Dock>,
-    is_open: bool,
-    active_index: Option<usize>,
-}
-
-pub enum ForceMode {
-    Amend,
-    Commit,
-}
-
-impl CommitModal {
-    pub fn register(workspace: &mut Workspace) {
-        workspace.register_action(|workspace, _: &Commit, window, cx| {
-            CommitModal::toggle(workspace, Some(ForceMode::Commit), window, cx);
-        });
-        workspace.register_action(|workspace, _: &Amend, window, cx| {
-            CommitModal::toggle(workspace, Some(ForceMode::Amend), window, cx);
-        });
-    }
-
-    pub fn toggle(
-        workspace: &mut Workspace,
-        force_mode: Option<ForceMode>,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        let Some(git_panel) = workspace.panel::<GitPanel>(cx) else {
-            return;
-        };
-
-        git_panel.update(cx, |git_panel, cx| {
-            if let Some(force_mode) = force_mode {
-                match force_mode {
-                    ForceMode::Amend => {
-                        if git_panel
-                            .active_repository
-                            .as_ref()
-                            .and_then(|repo| repo.read(cx).head_commit.as_ref())
-                            .is_some()
-                            && !git_panel.amend_pending()
-                        {
-                            git_panel.set_amend_pending(true, cx);
-                            git_panel.load_last_commit_message(cx);
-                        }
-                    }
-                    ForceMode::Commit => {
-                        if git_panel.amend_pending() {
-                            git_panel.set_amend_pending(false, cx);
-                        }
-                    }
-                }
-            }
-            git_panel.set_modal_open(true, cx);
-            git_panel.load_local_committer(cx);
-        });
-
-        let dock = workspace.dock_at_position(git_panel.position(window, cx));
-        let is_open = dock.read(cx).is_open();
-        let active_index = dock.read(cx).active_panel_index();
-        let dock = dock.downgrade();
-        let restore_dock_position = RestoreDock {
-            dock,
-            is_open,
-            active_index,
-        };
-
-        workspace.open_panel::<GitPanel>(window, cx);
-        workspace.toggle_modal(window, cx, move |window, cx| {
-            CommitModal::new(git_panel, restore_dock_position, window, cx)
-        })
-    }
-
-    fn new(
-        git_panel: Entity<GitPanel>,
-        restore_dock: RestoreDock,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let panel = git_panel.read(cx);
-        let suggested_commit_message = panel.suggest_commit_message(cx);
-
-        let commit_editor = git_panel.update(cx, |git_panel, cx| {
-            git_panel.set_modal_open(true, cx);
-            let buffer = git_panel.commit_message_buffer(cx);
-            let panel_editor = git_panel.commit_editor.clone();
-            let project = git_panel.project.clone();
-
-            cx.new(|cx| {
-                let mut editor =
-                    commit_message_editor(buffer, None, project.clone(), false, window, cx);
-                editor.sync_selections(panel_editor, cx).detach();
-
-                editor
-            })
-        });
-
-        let commit_message = commit_editor.read(cx).text(cx);
-
-        if let Some(suggested_commit_message) = suggested_commit_message
-            && commit_message.is_empty()
-        {
-            commit_editor.update(cx, |editor, cx| {
-                editor.set_placeholder_text(&suggested_commit_message, window, cx);
-            });
-        }
-
-        let focus_handle = commit_editor.focus_handle(cx);
-
-        cx.on_focus_out(&focus_handle, window, |this, _, window, cx| {
-            if !this.branch_list_handle.is_focused(window, cx)
-                && !this.commit_menu_handle.is_focused(window, cx)
-            {
-                cx.emit(DismissEvent);
-            }
-        })
-        .detach();
-
-        let properties = ModalContainerProperties::new(window, 50);
-
-        Self {
-            git_panel,
-            commit_editor,
-            restore_dock,
-            properties,
-            branch_list_handle: PopoverMenuHandle::default(),
-            commit_menu_handle: PopoverMenuHandle::default(),
-        }
-    }
-
-    fn commit_editor_element(&self, window: &mut Window, cx: &mut Context<Self>) -> EditorElement {
-        let editor_style = panel_editor_style(true, window, cx);
-        EditorElement::new(&self.commit_editor, editor_style)
-    }
-
-    pub fn render_commit_editor(
-        &self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let properties = self.properties;
-        let padding_t = 3.0;
-        let padding_b = 6.0;
-        // magic number for editor not to overflow the container??
-        let extra_space_hack = 1.5 * window.line_height();
-
-        v_flex()
-            .h(px(properties.editor_height + padding_b + padding_t) + extra_space_hack)
-            .w_full()
-            .flex_none()
-            .rounded(properties.editor_border_radius())
-            .overflow_hidden()
-            .px_1p5()
-            .pt(px(padding_t))
-            .pb(px(padding_b))
-            .child(
-                div()
-                    .h(px(properties.editor_height))
-                    .w_full()
-                    .child(self.commit_editor_element(window, cx)),
-            )
-    }
-
-    fn render_git_commit_menu(
-        &self,
-        id: impl Into<ElementId>,
-        keybinding_target: Option<FocusHandle>,
-    ) -> impl IntoElement {
-        PopoverMenu::new(id.into())
-            .trigger(
-                ui::ButtonLike::new_rounded_right("commit-split-button-right")
-                    .layer(ui::ElevationIndex::ModalSurface)
-                    .size(ui::ButtonSize::None)
-                    .child(
-                        div()
-                            .px_1()
-                            .child(Icon::new(IconName::ChevronDown).size(IconSize::XSmall)),
-                    ),
-            )
-            .menu({
-                let git_panel_entity = self.git_panel.clone();
-                move |window, cx| {
-                    let git_panel = git_panel_entity.read(cx);
-                    let amend_enabled = git_panel.amend_pending();
-                    let signoff_enabled = git_panel.signoff_enabled();
-                    let has_previous_commit = git_panel.head_commit(cx).is_some();
-
-                    Some(ContextMenu::build(window, cx, |context_menu, _, _| {
-                        context_menu
-                            .when_some(keybinding_target.clone(), |el, keybinding_target| {
-                                el.context(keybinding_target)
-                            })
-                            .when(has_previous_commit, |this| {
-                                this.toggleable_entry(
-                                    "Amend",
-                                    amend_enabled,
-                                    IconPosition::Start,
-                                    Some(Box::new(Amend)),
-                                    {
-                                        let git_panel = git_panel_entity.downgrade();
-                                        move |_, cx| {
-                                            git_panel
-                                                .update(cx, |git_panel, cx| {
-                                                    git_panel.toggle_amend_pending(cx);
-                                                })
-                                                .ok();
-                                        }
-                                    },
-                                )
-                            })
-                            .toggleable_entry(
-                                "Signoff",
-                                signoff_enabled,
-                                IconPosition::Start,
-                                Some(Box::new(Signoff)),
-                                {
-                                    let git_panel = git_panel_entity.clone();
-                                    move |window, cx| {
-                                        git_panel.update(cx, |git_panel, cx| {
-                                            git_panel.toggle_signoff_enabled(&Signoff, window, cx);
-                                        })
-                                    }
-                                },
-                            )
-                    }))
-                }
-            })
-            .with_handle(self.commit_menu_handle.clone())
-            .anchor(Corner::TopRight)
-    }
-
-    pub fn render_footer(&self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let (
-            can_commit,
-            tooltip,
-            commit_label,
-            co_authors,
-            generate_commit_message,
-            active_repo,
-            is_amend_pending,
-            is_signoff_enabled,
-        ) = self.git_panel.update(cx, |git_panel, cx| {
-            let (can_commit, tooltip) = git_panel.configure_commit_button(cx);
-            let title = git_panel.commit_button_title();
-            let co_authors = git_panel.render_co_authors(cx);
-            let generate_commit_message = git_panel.render_generate_commit_message_button(cx);
-            let active_repo = git_panel.active_repository.clone();
-            let is_amend_pending = git_panel.amend_pending();
-            let is_signoff_enabled = git_panel.signoff_enabled();
-            (
-                can_commit,
-                tooltip,
-                title,
-                co_authors,
-                generate_commit_message,
-                active_repo,
-                is_amend_pending,
-                is_signoff_enabled,
-            )
-        });
-
-        let branch = active_repo
-            .as_ref()
-            .and_then(|repo| repo.read(cx).branch.as_ref())
-            .map(|b| b.name().to_owned())
-            .unwrap_or_else(|| "<no branch>".to_owned());
-
-        let branch_picker_button = panel_button(branch)
-            .icon(IconName::GitBranch)
-            .icon_size(IconSize::Small)
-            .icon_color(Color::Placeholder)
-            .color(Color::Muted)
-            .icon_position(IconPosition::Start)
-            .on_click(cx.listener(|_, _, window, cx| {
-                window.dispatch_action(zed_actions::git::Branch.boxed_clone(), cx);
-            }))
-            .style(ButtonStyle::Transparent);
-
-        let branch_picker = PopoverMenu::new("popover-button")
-            .menu(move |window, cx| Some(branch_picker::popover(active_repo.clone(), window, cx)))
-            .with_handle(self.branch_list_handle.clone())
-            .trigger_with_tooltip(
-                branch_picker_button,
-                Tooltip::for_action_title("Switch Branch", &zed_actions::git::Branch),
-            )
-            .anchor(Corner::BottomLeft)
-            .offset(gpui::Point {
-                x: px(0.0),
-                y: px(-2.0),
-            });
-        let focus_handle = self.focus_handle(cx);
-
-        let close_kb_hint = ui::KeyBinding::for_action(&menu::Cancel, cx).map(|close_kb| {
-            KeybindingHint::new(close_kb, cx.theme().colors().editor_background).suffix("Cancel")
-        });
-
-        h_flex()
-            .group("commit_editor_footer")
-            .flex_none()
-            .w_full()
-            .items_center()
-            .justify_between()
-            .w_full()
-            .h(px(self.properties.footer_height))
-            .gap_1()
-            .child(
-                h_flex()
-                    .gap_1()
-                    .flex_shrink()
-                    .overflow_x_hidden()
-                    .child(
-                        h_flex()
-                            .flex_shrink()
-                            .overflow_x_hidden()
-                            .child(branch_picker),
-                    )
-                    .children(generate_commit_message)
-                    .children(co_authors),
-            )
-            .child(div().flex_1())
-            .child(
-                h_flex()
-                    .items_center()
-                    .justify_end()
-                    .flex_none()
-                    .px_1()
-                    .gap_4()
-                    .child(close_kb_hint)
-                    .child(SplitButton::new(
-                        ui::ButtonLike::new_rounded_left(ElementId::Name(
-                            format!("split-button-left-{}", commit_label).into(),
-                        ))
-                        .layer(ui::ElevationIndex::ModalSurface)
-                        .size(ui::ButtonSize::Compact)
-                        .child(
-                            div()
-                                .child(Label::new(commit_label).size(LabelSize::Small))
-                                .mr_0p5(),
-                        )
-                        .on_click(cx.listener(move |this, _: &ClickEvent, window, cx| {
-                            telemetry::event!("Git Committed", source = "Git Modal");
-                            this.git_panel.update(cx, |git_panel, cx| {
-                                git_panel.commit_changes(
-                                    CommitOptions {
-                                        amend: is_amend_pending,
-                                        signoff: is_signoff_enabled,
-                                    },
-                                    window,
-                                    cx,
-                                )
-                            });
-                            cx.emit(DismissEvent);
-                        }))
-                        .disabled(!can_commit)
-                        .tooltip({
-                            let focus_handle = focus_handle.clone();
-                            move |_window, cx| {
-                                if can_commit {
-                                    Tooltip::with_meta_in(
-                                        tooltip,
-                                        Some(if is_amend_pending {
-                                            &git::Amend
-                                        } else {
-                                            &git::Commit
-                                        }),
-                                        format!(
-                                            "git commit{}{}",
-                                            if is_amend_pending { " --amend" } else { "" },
-                                            if is_signoff_enabled { " --signoff" } else { "" }
-                                        ),
-                                        &focus_handle.clone(),
-                                        cx,
-                                    )
-                                } else {
-                                    Tooltip::simple(tooltip, cx)
-                                }
-                            }
-                        }),
-                        self.render_git_commit_menu(
-                            ElementId::Name(format!("split-button-right-{}", commit_label).into()),
-                            Some(focus_handle),
-                        )
-                        .into_any_element(),
-                    )),
-            )
-    }
-
-    fn dismiss(&mut self, _: &menu::Cancel, _: &mut Window, cx: &mut Context<Self>) {
-        if self.git_panel.read(cx).amend_pending() {
-            self.git_panel
-                .update(cx, |git_panel, cx| git_panel.set_amend_pending(false, cx));
-        } else {
-            cx.emit(DismissEvent);
-        }
-    }
-
-    fn on_commit(&mut self, _: &git::Commit, window: &mut Window, cx: &mut Context<Self>) {
-        if self.git_panel.update(cx, |git_panel, cx| {
-            git_panel.commit(&self.commit_editor.focus_handle(cx), window, cx)
-        }) {
-            telemetry::event!("Git Committed", source = "Git Modal");
-            cx.emit(DismissEvent);
-        }
-    }
-
-    fn on_amend(&mut self, _: &git::Amend, window: &mut Window, cx: &mut Context<Self>) {
-        if self.git_panel.update(cx, |git_panel, cx| {
-            git_panel.amend(&self.commit_editor.focus_handle(cx), window, cx)
-        }) {
-            telemetry::event!("Git Amended", source = "Git Modal");
-            cx.emit(DismissEvent);
-        }
-    }
-
-    fn toggle_branch_selector(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if self.branch_list_handle.is_focused(window, cx) {
-            self.focus_handle(cx).focus(window)
-        } else {
-            self.branch_list_handle.toggle(window, cx);
-        }
-    }
-}
-
-impl Render for CommitModal {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let properties = self.properties;
-        let width = px(properties.modal_width);
-        let container_padding = px(properties.container_padding);
-        let border_radius = properties.modal_border_radius;
-        let editor_focus_handle = self.commit_editor.focus_handle(cx);
-
-        v_flex()
-            .id("commit-modal")
-            .key_context("GitCommit")
-            .on_action(cx.listener(Self::dismiss))
-            .on_action(cx.listener(Self::on_commit))
-            .on_action(cx.listener(Self::on_amend))
-            .when(!DisableAiSettings::get_global(cx).disable_ai, |this| {
-                this.on_action(cx.listener(|this, _: &GenerateCommitMessage, _, cx| {
-                    this.git_panel.update(cx, |panel, cx| {
-                        panel.generate_commit_message(cx);
-                    })
-                }))
-            })
-            .on_action(
-                cx.listener(|this, _: &zed_actions::git::Branch, window, cx| {
-                    this.toggle_branch_selector(window, cx);
-                }),
-            )
-            .on_action(
-                cx.listener(|this, _: &zed_actions::git::CheckoutBranch, window, cx| {
-                    this.toggle_branch_selector(window, cx);
-                }),
-            )
-            .on_action(
-                cx.listener(|this, _: &zed_actions::git::Switch, window, cx| {
-                    this.toggle_branch_selector(window, cx);
-                }),
-            )
-            .elevation_3(cx)
-            .overflow_hidden()
-            .flex_none()
-            .relative()
-            .bg(cx.theme().colors().elevated_surface_background)
-            .rounded(px(border_radius))
-            .border_1()
-            .border_color(cx.theme().colors().border)
-            .w(width)
-            .p(container_padding)
-            .child(
-                v_flex()
-                    .id("editor-container")
-                    .justify_between()
-                    .p_2()
-                    .size_full()
-                    .gap_2()
-                    .rounded(properties.editor_border_radius())
-                    .overflow_hidden()
-                    .cursor_text()
-                    .bg(cx.theme().colors().editor_background)
-                    .border_1()
-                    .border_color(cx.theme().colors().border_variant)
-                    .on_click(cx.listener(move |_, _: &ClickEvent, window, _cx| {
-                        window.focus(&editor_focus_handle);
-                    }))
-                    .child(
-                        div()
-                            .flex_1()
-                            .size_full()
-                            .child(self.render_commit_editor(window, cx)),
-                    )
-                    .child(self.render_footer(window, cx)),
-            )
-    }
-}
diff --git a/crates/git_ui/src/commit_tooltip.rs b/crates/git_ui/src/commit_tooltip.rs
deleted file mode 100644
index cf6512b076..0000000000
--- a/crates/git_ui/src/commit_tooltip.rs
+++ /dev/null
@@ -1,381 +0,0 @@
-use crate::commit_view::CommitView;
-use editor::hover_markdown_style;
-use futures::Future;
-use git::blame::BlameEntry;
-use git::repository::CommitSummary;
-use git::{GitRemote, blame::ParsedCommitMessage};
-use gpui::{
-    App, Asset, ClipboardItem, Element, Entity, MouseButton, ParentElement, Render, ScrollHandle,
-    StatefulInteractiveElement, WeakEntity, prelude::*,
-};
-use markdown::{Markdown, MarkdownElement};
-use project::git_store::Repository;
-use settings::Settings;
-use std::hash::Hash;
-use theme::ThemeSettings;
-use time::{OffsetDateTime, UtcOffset};
-use ui::{Avatar, Divider, IconButtonShape, prelude::*, tooltip_container};
-use workspace::Workspace;
-
-#[derive(Clone, Debug)]
-pub struct CommitDetails {
-    pub sha: SharedString,
-    pub author_name: SharedString,
-    pub author_email: SharedString,
-    pub commit_time: OffsetDateTime,
-    pub message: Option<ParsedCommitMessage>,
-}
-
-pub struct CommitAvatar<'a> {
-    sha: &'a SharedString,
-    remote: Option<&'a GitRemote>,
-    size: Option<IconSize>,
-}
-
-impl<'a> CommitAvatar<'a> {
-    pub fn new(sha: &'a SharedString, remote: Option<&'a GitRemote>) -> Self {
-        Self {
-            sha,
-            remote,
-            size: None,
-        }
-    }
-
-    pub fn from_commit_details(details: &'a CommitDetails) -> Self {
-        Self {
-            sha: &details.sha,
-            remote: details
-                .message
-                .as_ref()
-                .and_then(|details| details.remote.as_ref()),
-            size: None,
-        }
-    }
-
-    pub fn size(mut self, size: IconSize) -> Self {
-        self.size = Some(size);
-        self
-    }
-
-    pub fn render(&'a self, window: &mut Window, cx: &mut App) -> AnyElement {
-        match self.avatar(window, cx) {
-            // Loading or no avatar found
-            None => Icon::new(IconName::Person)
-                .color(Color::Muted)
-                .when_some(self.size, |this, size| this.size(size))
-                .into_any_element(),
-            // Found
-            Some(avatar) => avatar
-                .when_some(self.size, |this, size| this.size(size.rems()))
-                .into_any_element(),
-        }
-    }
-
-    pub fn avatar(&'a self, window: &mut Window, cx: &mut App) -> Option<Avatar> {
-        let remote = self
-            .remote
-            .filter(|remote| remote.host_supports_avatars())?;
-        let avatar_url = CommitAvatarAsset::new(remote.clone(), self.sha.clone());
-
-        let url = window.use_asset::<CommitAvatarAsset>(&avatar_url, cx)??;
-        Some(Avatar::new(url.to_string()))
-    }
-}
-
-#[derive(Clone, Debug)]
-struct CommitAvatarAsset {
-    sha: SharedString,
-    remote: GitRemote,
-}
-
-impl Hash for CommitAvatarAsset {
-    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-        self.sha.hash(state);
-        self.remote.host.name().hash(state);
-    }
-}
-
-impl CommitAvatarAsset {
-    fn new(remote: GitRemote, sha: SharedString) -> Self {
-        Self { remote, sha }
-    }
-}
-
-impl Asset for CommitAvatarAsset {
-    type Source = Self;
-    type Output = Option<SharedString>;
-
-    fn load(
-        source: Self::Source,
-        cx: &mut App,
-    ) -> impl Future<Output = Self::Output> + Send + 'static {
-        let client = cx.http_client();
-
-        async move {
-            source
-                .remote
-                .avatar_url(source.sha, client)
-                .await
-                .map(|url| SharedString::from(url.to_string()))
-        }
-    }
-}
-
-pub struct CommitTooltip {
-    commit: CommitDetails,
-    scroll_handle: ScrollHandle,
-    markdown: Entity<Markdown>,
-    repository: Entity<Repository>,
-    workspace: WeakEntity<Workspace>,
-}
-
-impl CommitTooltip {
-    pub fn blame_entry(
-        blame: &BlameEntry,
-        details: Option<ParsedCommitMessage>,
-        repository: Entity<Repository>,
-        workspace: WeakEntity<Workspace>,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let commit_time = blame
-            .committer_time
-            .and_then(|t| OffsetDateTime::from_unix_timestamp(t).ok())
-            .unwrap_or(OffsetDateTime::now_utc());
-
-        Self::new(
-            CommitDetails {
-                sha: blame.sha.to_string().into(),
-                commit_time,
-                author_name: blame
-                    .author
-                    .clone()
-                    .unwrap_or("<no name>".to_string())
-                    .into(),
-                author_email: blame.author_mail.clone().unwrap_or("".to_string()).into(),
-                message: details,
-            },
-            repository,
-            workspace,
-            cx,
-        )
-    }
-
-    pub fn new(
-        commit: CommitDetails,
-        repository: Entity<Repository>,
-        workspace: WeakEntity<Workspace>,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let markdown = cx.new(|cx| {
-            Markdown::new(
-                commit
-                    .message
-                    .as_ref()
-                    .map(|message| message.message.clone())
-                    .unwrap_or_default(),
-                None,
-                None,
-                cx,
-            )
-        });
-        Self {
-            commit,
-            repository,
-            workspace,
-            scroll_handle: ScrollHandle::new(),
-            markdown,
-        }
-    }
-}
-
-impl Render for CommitTooltip {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let avatar = CommitAvatar::from_commit_details(&self.commit).render(window, cx);
-
-        let author = self.commit.author_name.clone();
-
-        let author_email = self.commit.author_email.clone();
-
-        let short_commit_id = self
-            .commit
-            .sha
-            .get(0..8)
-            .map(|sha| sha.to_string().into())
-            .unwrap_or_else(|| self.commit.sha.clone());
-        let full_sha = self.commit.sha.to_string();
-        let local_offset = UtcOffset::current_local_offset().unwrap_or(UtcOffset::UTC);
-        let absolute_timestamp = time_format::format_localized_timestamp(
-            self.commit.commit_time,
-            OffsetDateTime::now_utc(),
-            local_offset,
-            time_format::TimestampFormat::MediumAbsolute,
-        );
-        let markdown_style = {
-            let style = hover_markdown_style(window, cx);
-            style
-        };
-
-        let message = self
-            .commit
-            .message
-            .as_ref()
-            .map(|_| MarkdownElement::new(self.markdown.clone(), markdown_style).into_any())
-            .unwrap_or("<no commit message>".into_any());
-
-        let pull_request = self
-            .commit
-            .message
-            .as_ref()
-            .and_then(|details| details.pull_request.clone());
-
-        let ui_font_size = ThemeSettings::get_global(cx).ui_font_size(cx);
-        let message_max_height = window.line_height() * 12 + (ui_font_size / 0.4);
-        let repo = self.repository.clone();
-        let workspace = self.workspace.clone();
-        let commit_summary = CommitSummary {
-            sha: self.commit.sha.clone(),
-            subject: self
-                .commit
-                .message
-                .as_ref()
-                .map_or(Default::default(), |message| {
-                    message
-                        .message
-                        .split('\n')
-                        .next()
-                        .unwrap()
-                        .trim_end()
-                        .to_string()
-                        .into()
-                }),
-            commit_timestamp: self.commit.commit_time.unix_timestamp(),
-            author_name: self.commit.author_name.clone(),
-            has_parent: false,
-        };
-
-        tooltip_container(cx, move |this, cx| {
-            this.occlude()
-                .on_mouse_move(|_, _, cx| cx.stop_propagation())
-                .on_mouse_down(MouseButton::Left, |_, _, cx| cx.stop_propagation())
-                .child(
-                    v_flex()
-                        .w(gpui::rems(30.))
-                        .gap_4()
-                        .child(
-                            h_flex()
-                                .pb_1p5()
-                                .gap_x_2()
-                                .overflow_x_hidden()
-                                .flex_wrap()
-                                .child(avatar)
-                                .child(author)
-                                .when(!author_email.is_empty(), |this| {
-                                    this.child(
-                                        div()
-                                            .text_color(cx.theme().colors().text_muted)
-                                            .child(author_email),
-                                    )
-                                })
-                                .border_b_1()
-                                .border_color(cx.theme().colors().border_variant),
-                        )
-                        .child(
-                            div()
-                                .id("inline-blame-commit-message")
-                                .child(message)
-                                .max_h(message_max_height)
-                                .overflow_y_scroll()
-                                .track_scroll(&self.scroll_handle),
-                        )
-                        .child(
-                            h_flex()
-                                .text_color(cx.theme().colors().text_muted)
-                                .w_full()
-                                .justify_between()
-                                .pt_1p5()
-                                .border_t_1()
-                                .border_color(cx.theme().colors().border_variant)
-                                .child(absolute_timestamp)
-                                .child(
-                                    h_flex()
-                                        .gap_1p5()
-                                        .when_some(pull_request, |this, pr| {
-                                            this.child(
-                                                Button::new(
-                                                    "pull-request-button",
-                                                    format!("#{}", pr.number),
-                                                )
-                                                .color(Color::Muted)
-                                                .icon(IconName::PullRequest)
-                                                .icon_color(Color::Muted)
-                                                .icon_position(IconPosition::Start)
-                                                .style(ButtonStyle::Subtle)
-                                                .on_click(move |_, _, cx| {
-                                                    cx.stop_propagation();
-                                                    cx.open_url(pr.url.as_str())
-                                                }),
-                                            )
-                                        })
-                                        .child(Divider::vertical())
-                                        .child(
-                                            Button::new(
-                                                "commit-sha-button",
-                                                short_commit_id.clone(),
-                                            )
-                                            .style(ButtonStyle::Subtle)
-                                            .color(Color::Muted)
-                                            .icon(IconName::FileGit)
-                                            .icon_color(Color::Muted)
-                                            .icon_position(IconPosition::Start)
-                                            .on_click(
-                                                move |_, window, cx| {
-                                                    CommitView::open(
-                                                        commit_summary.sha.to_string(),
-                                                        repo.downgrade(),
-                                                        workspace.clone(),
-                                                        None,
-                                                        None,
-                                                        window,
-                                                        cx,
-                                                    );
-                                                    cx.stop_propagation();
-                                                },
-                                            ),
-                                        )
-                                        .child(
-                                            IconButton::new("copy-sha-button", IconName::Copy)
-                                                .shape(IconButtonShape::Square)
-                                                .icon_size(IconSize::Small)
-                                                .icon_color(Color::Muted)
-                                                .on_click(move |_, _, cx| {
-                                                    cx.stop_propagation();
-                                                    cx.write_to_clipboard(
-                                                        ClipboardItem::new_string(full_sha.clone()),
-                                                    )
-                                                }),
-                                        ),
-                                ),
-                        ),
-                )
-        })
-    }
-}
-
-fn blame_entry_timestamp(blame_entry: &BlameEntry, format: time_format::TimestampFormat) -> String {
-    match blame_entry.author_offset_date_time() {
-        Ok(timestamp) => {
-            let local_offset = UtcOffset::current_local_offset().unwrap_or(UtcOffset::UTC);
-            time_format::format_localized_timestamp(
-                timestamp,
-                time::OffsetDateTime::now_utc(),
-                local_offset,
-                format,
-            )
-        }
-        Err(_) => "Error parsing date".to_string(),
-    }
-}
-
-pub fn blame_entry_relative_timestamp(blame_entry: &BlameEntry) -> String {
-    blame_entry_timestamp(blame_entry, time_format::TimestampFormat::Relative)
-}
diff --git a/crates/git_ui/src/commit_view.rs b/crates/git_ui/src/commit_view.rs
deleted file mode 100644
index b83ad6d8a6..0000000000
--- a/crates/git_ui/src/commit_view.rs
+++ /dev/null
@@ -1,1028 +0,0 @@
-use anyhow::{Context as _, Result};
-use buffer_diff::{BufferDiff, BufferDiffSnapshot};
-use editor::display_map::{BlockPlacement, BlockProperties, BlockStyle};
-use editor::{Editor, EditorEvent, ExcerptRange, MultiBuffer, multibuffer_context_lines};
-use git::repository::{CommitDetails, CommitDiff, RepoPath};
-use git::{GitHostingProviderRegistry, GitRemote, parse_git_remote_url};
-use gpui::{
-    AnyElement, App, AppContext as _, AsyncApp, AsyncWindowContext, Context, Element, Entity,
-    EventEmitter, FocusHandle, Focusable, InteractiveElement, IntoElement, ParentElement,
-    PromptLevel, Render, Styled, Task, WeakEntity, Window, actions,
-};
-use language::{
-    Anchor, Buffer, Capability, DiskState, File, LanguageRegistry, LineEnding, OffsetRangeExt as _,
-    Point, ReplicaId, Rope, TextBuffer,
-};
-use multi_buffer::PathKey;
-use project::{Project, WorktreeId, git_store::Repository};
-use std::{
-    any::{Any, TypeId},
-    path::PathBuf,
-    sync::Arc,
-};
-use theme::ActiveTheme;
-use ui::{DiffStat, Tooltip, prelude::*};
-use util::{ResultExt, paths::PathStyle, rel_path::RelPath, truncate_and_trailoff};
-use workspace::item::TabTooltipContent;
-use workspace::{
-    Item, ItemHandle, ItemNavHistory, ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView,
-    Workspace,
-    item::{BreadcrumbText, ItemEvent, TabContentParams},
-    notifications::NotifyTaskExt,
-    pane::SaveIntent,
-    searchable::SearchableItemHandle,
-};
-
-use crate::commit_tooltip::CommitAvatar;
-use crate::git_panel::GitPanel;
-
-actions!(git, [ApplyCurrentStash, PopCurrentStash, DropCurrentStash,]);
-
-pub fn init(cx: &mut App) {
-    cx.observe_new(|workspace: &mut Workspace, _window, _cx| {
-        workspace.register_action(|workspace, _: &ApplyCurrentStash, window, cx| {
-            CommitView::apply_stash(workspace, window, cx);
-        });
-        workspace.register_action(|workspace, _: &DropCurrentStash, window, cx| {
-            CommitView::remove_stash(workspace, window, cx);
-        });
-        workspace.register_action(|workspace, _: &PopCurrentStash, window, cx| {
-            CommitView::pop_stash(workspace, window, cx);
-        });
-    })
-    .detach();
-}
-
-pub struct CommitView {
-    commit: CommitDetails,
-    editor: Entity<Editor>,
-    stash: Option<usize>,
-    multibuffer: Entity<MultiBuffer>,
-    repository: Entity<Repository>,
-    remote: Option<GitRemote>,
-}
-
-struct GitBlob {
-    path: RepoPath,
-    worktree_id: WorktreeId,
-    is_deleted: bool,
-    display_name: Arc<str>,
-}
-
-const COMMIT_MESSAGE_SORT_PREFIX: u64 = 0;
-const FILE_NAMESPACE_SORT_PREFIX: u64 = 1;
-
-impl CommitView {
-    pub fn open(
-        commit_sha: String,
-        repo: WeakEntity<Repository>,
-        workspace: WeakEntity<Workspace>,
-        stash: Option<usize>,
-        file_filter: Option<RepoPath>,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        let commit_diff = repo
-            .update(cx, |repo, _| repo.load_commit_diff(commit_sha.clone()))
-            .ok();
-        let commit_details = repo
-            .update(cx, |repo, _| repo.show(commit_sha.clone()))
-            .ok();
-
-        window
-            .spawn(cx, async move |cx| {
-                let (commit_diff, commit_details) = futures::join!(commit_diff?, commit_details?);
-                let mut commit_diff = commit_diff.log_err()?.log_err()?;
-                let commit_details = commit_details.log_err()?.log_err()?;
-
-                // Filter to specific file if requested
-                if let Some(ref filter_path) = file_filter {
-                    commit_diff.files.retain(|f| &f.path == filter_path);
-                }
-
-                let repo = repo.upgrade()?;
-
-                workspace
-                    .update_in(cx, |workspace, window, cx| {
-                        let project = workspace.project();
-                        let commit_view = cx.new(|cx| {
-                            CommitView::new(
-                                commit_details,
-                                commit_diff,
-                                repo,
-                                project.clone(),
-                                stash,
-                                window,
-                                cx,
-                            )
-                        });
-
-                        let pane = workspace.active_pane();
-                        pane.update(cx, |pane, cx| {
-                            let ix = pane.items().position(|item| {
-                                let commit_view = item.downcast::<CommitView>();
-                                commit_view
-                                    .is_some_and(|view| view.read(cx).commit.sha == commit_sha)
-                            });
-                            if let Some(ix) = ix {
-                                pane.activate_item(ix, true, true, window, cx);
-                            } else {
-                                pane.add_item(Box::new(commit_view), true, true, None, window, cx);
-                            }
-                        })
-                    })
-                    .log_err()
-            })
-            .detach();
-    }
-
-    fn new(
-        commit: CommitDetails,
-        commit_diff: CommitDiff,
-        repository: Entity<Repository>,
-        project: Entity<Project>,
-        stash: Option<usize>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let language_registry = project.read(cx).languages().clone();
-        let multibuffer = cx.new(|_| MultiBuffer::new(Capability::ReadOnly));
-
-        let message_buffer = cx.new(|cx| {
-            let mut buffer = Buffer::local(commit.message.clone(), cx);
-            buffer.set_capability(Capability::ReadOnly, cx);
-            buffer
-        });
-
-        multibuffer.update(cx, |multibuffer, cx| {
-            let snapshot = message_buffer.read(cx).snapshot();
-            let full_range = Point::zero()..snapshot.max_point();
-            let range = ExcerptRange {
-                context: full_range.clone(),
-                primary: full_range,
-            };
-            multibuffer.set_excerpt_ranges_for_path(
-                PathKey::with_sort_prefix(
-                    COMMIT_MESSAGE_SORT_PREFIX,
-                    RelPath::unix("commit message").unwrap().into(),
-                ),
-                message_buffer.clone(),
-                &snapshot,
-                vec![range],
-                cx,
-            )
-        });
-
-        let editor = cx.new(|cx| {
-            let mut editor =
-                Editor::for_multibuffer(multibuffer.clone(), Some(project.clone()), window, cx);
-
-            editor.disable_inline_diagnostics();
-            editor.set_show_breakpoints(false, cx);
-            editor.set_expand_all_diff_hunks(cx);
-            editor.disable_header_for_buffer(message_buffer.read(cx).remote_id(), cx);
-            editor.disable_indent_guides_for_buffer(message_buffer.read(cx).remote_id(), cx);
-
-            editor.insert_blocks(
-                [BlockProperties {
-                    placement: BlockPlacement::Above(editor::Anchor::min()),
-                    height: Some(1),
-                    style: BlockStyle::Sticky,
-                    render: Arc::new(|_| gpui::Empty.into_any_element()),
-                    priority: 0,
-                }]
-                .into_iter()
-                .chain(
-                    editor
-                        .buffer()
-                        .read(cx)
-                        .buffer_anchor_to_anchor(&message_buffer, Anchor::MAX, cx)
-                        .map(|anchor| BlockProperties {
-                            placement: BlockPlacement::Below(anchor),
-                            height: Some(1),
-                            style: BlockStyle::Sticky,
-                            render: Arc::new(|_| gpui::Empty.into_any_element()),
-                            priority: 0,
-                        }),
-                ),
-                None,
-                cx,
-            );
-
-            editor
-        });
-
-        let commit_sha = Arc::<str>::from(commit.sha.as_ref());
-
-        let first_worktree_id = project
-            .read(cx)
-            .worktrees(cx)
-            .next()
-            .map(|worktree| worktree.read(cx).id());
-
-        let repository_clone = repository.clone();
-
-        cx.spawn(async move |this, cx| {
-            for file in commit_diff.files {
-                let is_deleted = file.new_text.is_none();
-                let new_text = file.new_text.unwrap_or_default();
-                let old_text = file.old_text;
-                let worktree_id = repository_clone
-                    .update(cx, |repository, cx| {
-                        repository
-                            .repo_path_to_project_path(&file.path, cx)
-                            .map(|path| path.worktree_id)
-                            .or(first_worktree_id)
-                    })?
-                    .context("project has no worktrees")?;
-                let short_sha = commit_sha.get(0..7).unwrap_or(&commit_sha);
-                let file_name = file
-                    .path
-                    .file_name()
-                    .map(|name| name.to_string())
-                    .unwrap_or_else(|| file.path.display(PathStyle::Posix).to_string());
-                let display_name: Arc<str> =
-                    Arc::from(format!("{short_sha} - {file_name}").into_boxed_str());
-
-                let file = Arc::new(GitBlob {
-                    path: file.path.clone(),
-                    is_deleted,
-                    worktree_id,
-                    display_name,
-                }) as Arc<dyn language::File>;
-
-                let buffer = build_buffer(new_text, file, &language_registry, cx).await?;
-                let buffer_diff =
-                    build_buffer_diff(old_text, &buffer, &language_registry, cx).await?;
-
-                this.update(cx, |this, cx| {
-                    this.multibuffer.update(cx, |multibuffer, cx| {
-                        let snapshot = buffer.read(cx).snapshot();
-                        let path = snapshot.file().unwrap().path().clone();
-                        let excerpt_ranges = {
-                            let mut hunks = buffer_diff.read(cx).hunks(&snapshot, cx).peekable();
-                            if hunks.peek().is_none() {
-                                vec![language::Point::zero()..snapshot.max_point()]
-                            } else {
-                                hunks
-                                    .map(|hunk| hunk.buffer_range.to_point(&snapshot))
-                                    .collect::<Vec<_>>()
-                            }
-                        };
-
-                        let _is_newly_added = multibuffer.set_excerpts_for_path(
-                            PathKey::with_sort_prefix(FILE_NAMESPACE_SORT_PREFIX, path),
-                            buffer,
-                            excerpt_ranges,
-                            multibuffer_context_lines(cx),
-                            cx,
-                        );
-                        multibuffer.add_diff(buffer_diff, cx);
-                    });
-                })?;
-            }
-
-            anyhow::Ok(())
-        })
-        .detach();
-
-        let snapshot = repository.read(cx).snapshot();
-        let remote_url = snapshot
-            .remote_upstream_url
-            .as_ref()
-            .or(snapshot.remote_origin_url.as_ref());
-
-        let remote = remote_url.and_then(|url| {
-            let provider_registry = GitHostingProviderRegistry::default_global(cx);
-            parse_git_remote_url(provider_registry, url).map(|(host, parsed)| GitRemote {
-                host,
-                owner: parsed.owner.into(),
-                repo: parsed.repo.into(),
-            })
-        });
-
-        Self {
-            commit,
-            editor,
-            multibuffer,
-            stash,
-            repository,
-            remote,
-        }
-    }
-
-    fn render_commit_avatar(
-        &self,
-        sha: &SharedString,
-        size: impl Into<gpui::AbsoluteLength>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> AnyElement {
-        let size = size.into();
-        let avatar = CommitAvatar::new(sha, self.remote.as_ref());
-
-        v_flex()
-            .w(size)
-            .h(size)
-            .border_1()
-            .border_color(cx.theme().colors().border)
-            .rounded_full()
-            .justify_center()
-            .items_center()
-            .child(
-                avatar
-                    .avatar(window, cx)
-                    .map(|a| a.size(size).into_any_element())
-                    .unwrap_or_else(|| {
-                        Icon::new(IconName::Person)
-                            .color(Color::Muted)
-                            .size(IconSize::Medium)
-                            .into_any_element()
-                    }),
-            )
-            .into_any()
-    }
-
-    fn calculate_changed_lines(&self, cx: &App) -> (u32, u32) {
-        let snapshot = self.multibuffer.read(cx).snapshot(cx);
-        let mut total_additions = 0u32;
-        let mut total_deletions = 0u32;
-
-        let mut seen_buffers = std::collections::HashSet::new();
-        for (_, buffer, _) in snapshot.excerpts() {
-            let buffer_id = buffer.remote_id();
-            if !seen_buffers.insert(buffer_id) {
-                continue;
-            }
-
-            let Some(diff) = snapshot.diff_for_buffer_id(buffer_id) else {
-                continue;
-            };
-
-            let base_text = diff.base_text();
-
-            for hunk in diff.hunks_intersecting_range(Anchor::MIN..Anchor::MAX, buffer) {
-                let added_rows = hunk.range.end.row.saturating_sub(hunk.range.start.row);
-                total_additions += added_rows;
-
-                let base_start = base_text
-                    .offset_to_point(hunk.diff_base_byte_range.start)
-                    .row;
-                let base_end = base_text.offset_to_point(hunk.diff_base_byte_range.end).row;
-                let deleted_rows = base_end.saturating_sub(base_start);
-
-                total_deletions += deleted_rows;
-            }
-        }
-
-        (total_additions, total_deletions)
-    }
-
-    fn render_header(&self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let commit = &self.commit;
-        let author_name = commit.author_name.clone();
-        let commit_date = time::OffsetDateTime::from_unix_timestamp(commit.commit_timestamp)
-            .unwrap_or_else(|_| time::OffsetDateTime::now_utc());
-        let local_offset = time::UtcOffset::current_local_offset().unwrap_or(time::UtcOffset::UTC);
-        let date_string = time_format::format_localized_timestamp(
-            commit_date,
-            time::OffsetDateTime::now_utc(),
-            local_offset,
-            time_format::TimestampFormat::MediumAbsolute,
-        );
-
-        let github_url = self.remote.as_ref().map(|remote| {
-            format!(
-                "{}/{}/{}/commit/{}",
-                remote.host.base_url(),
-                remote.owner,
-                remote.repo,
-                commit.sha
-            )
-        });
-
-        let (additions, deletions) = self.calculate_changed_lines(cx);
-
-        let commit_diff_stat = if additions > 0 || deletions > 0 {
-            Some(DiffStat::new(
-                "commit-diff-stat",
-                additions as usize,
-                deletions as usize,
-            ))
-        } else {
-            None
-        };
-
-        let gutter_width = self.editor.update(cx, |editor, cx| {
-            let snapshot = editor.snapshot(window, cx);
-            let style = editor.style(cx);
-            let font_id = window.text_system().resolve_font(&style.text.font());
-            let font_size = style.text.font_size.to_pixels(window.rem_size());
-            snapshot
-                .gutter_dimensions(font_id, font_size, style, window, cx)
-                .full_width()
-        });
-
-        h_flex()
-            .border_b_1()
-            .border_color(cx.theme().colors().border_variant)
-            .w_full()
-            .child(
-                h_flex()
-                    .w(gutter_width)
-                    .justify_center()
-                    .child(self.render_commit_avatar(&commit.sha, rems_from_px(48.), window, cx)),
-            )
-            .child(
-                h_flex()
-                    .py_4()
-                    .pl_1()
-                    .pr_4()
-                    .w_full()
-                    .items_start()
-                    .justify_between()
-                    .flex_wrap()
-                    .child(
-                        v_flex()
-                            .child(
-                                h_flex()
-                                    .gap_1()
-                                    .child(Label::new(author_name).color(Color::Default))
-                                    .child(
-                                        Label::new(format!("Commit:{}", commit.sha))
-                                            .color(Color::Muted)
-                                            .size(LabelSize::Small)
-                                            .truncate()
-                                            .buffer_font(cx),
-                                    ),
-                            )
-                            .child(
-                                h_flex()
-                                    .gap_1p5()
-                                    .child(
-                                        Label::new(date_string)
-                                            .color(Color::Muted)
-                                            .size(LabelSize::Small),
-                                    )
-                                    .child(
-                                        Label::new("•")
-                                            .color(Color::Ignored)
-                                            .size(LabelSize::Small),
-                                    )
-                                    .children(commit_diff_stat),
-                            ),
-                    )
-                    .children(github_url.map(|url| {
-                        Button::new("view_on_github", "View on GitHub")
-                            .icon(IconName::Github)
-                            .icon_color(Color::Muted)
-                            .icon_size(IconSize::Small)
-                            .icon_position(IconPosition::Start)
-                            .on_click(move |_, _, cx| cx.open_url(&url))
-                    })),
-            )
-    }
-
-    fn apply_stash(workspace: &mut Workspace, window: &mut Window, cx: &mut App) {
-        Self::stash_action(
-            workspace,
-            "Apply",
-            window,
-            cx,
-            async move |repository, sha, stash, commit_view, workspace, cx| {
-                let result = repository.update(cx, |repo, cx| {
-                    if !stash_matches_index(&sha, stash, repo) {
-                        return Err(anyhow::anyhow!("Stash has changed, not applying"));
-                    }
-                    Ok(repo.stash_apply(Some(stash), cx))
-                })?;
-
-                match result {
-                    Ok(task) => task.await?,
-                    Err(err) => {
-                        Self::close_commit_view(commit_view, workspace, cx).await?;
-                        return Err(err);
-                    }
-                };
-                Self::close_commit_view(commit_view, workspace, cx).await?;
-                anyhow::Ok(())
-            },
-        );
-    }
-
-    fn pop_stash(workspace: &mut Workspace, window: &mut Window, cx: &mut App) {
-        Self::stash_action(
-            workspace,
-            "Pop",
-            window,
-            cx,
-            async move |repository, sha, stash, commit_view, workspace, cx| {
-                let result = repository.update(cx, |repo, cx| {
-                    if !stash_matches_index(&sha, stash, repo) {
-                        return Err(anyhow::anyhow!("Stash has changed, pop aborted"));
-                    }
-                    Ok(repo.stash_pop(Some(stash), cx))
-                })?;
-
-                match result {
-                    Ok(task) => task.await?,
-                    Err(err) => {
-                        Self::close_commit_view(commit_view, workspace, cx).await?;
-                        return Err(err);
-                    }
-                };
-                Self::close_commit_view(commit_view, workspace, cx).await?;
-                anyhow::Ok(())
-            },
-        );
-    }
-
-    fn remove_stash(workspace: &mut Workspace, window: &mut Window, cx: &mut App) {
-        Self::stash_action(
-            workspace,
-            "Drop",
-            window,
-            cx,
-            async move |repository, sha, stash, commit_view, workspace, cx| {
-                let result = repository.update(cx, |repo, cx| {
-                    if !stash_matches_index(&sha, stash, repo) {
-                        return Err(anyhow::anyhow!("Stash has changed, drop aborted"));
-                    }
-                    Ok(repo.stash_drop(Some(stash), cx))
-                })?;
-
-                match result {
-                    Ok(task) => task.await??,
-                    Err(err) => {
-                        Self::close_commit_view(commit_view, workspace, cx).await?;
-                        return Err(err);
-                    }
-                };
-                Self::close_commit_view(commit_view, workspace, cx).await?;
-                anyhow::Ok(())
-            },
-        );
-    }
-
-    fn stash_action<AsyncFn>(
-        workspace: &mut Workspace,
-        str_action: &str,
-        window: &mut Window,
-        cx: &mut App,
-        callback: AsyncFn,
-    ) where
-        AsyncFn: AsyncFnOnce(
-                Entity<Repository>,
-                &SharedString,
-                usize,
-                Entity<CommitView>,
-                WeakEntity<Workspace>,
-                &mut AsyncWindowContext,
-            ) -> anyhow::Result<()>
-            + 'static,
-    {
-        let Some(commit_view) = workspace.active_item_as::<CommitView>(cx) else {
-            return;
-        };
-        let Some(stash) = commit_view.read(cx).stash else {
-            return;
-        };
-        let sha = commit_view.read(cx).commit.sha.clone();
-        let answer = window.prompt(
-            PromptLevel::Info,
-            &format!("{} stash@{{{}}}?", str_action, stash),
-            None,
-            &[str_action, "Cancel"],
-            cx,
-        );
-
-        let workspace_weak = workspace.weak_handle();
-        let commit_view_entity = commit_view;
-
-        window
-            .spawn(cx, async move |cx| {
-                if answer.await != Ok(0) {
-                    return anyhow::Ok(());
-                }
-
-                let Some(workspace) = workspace_weak.upgrade() else {
-                    return Ok(());
-                };
-
-                let repo = workspace.update(cx, |workspace, cx| {
-                    workspace
-                        .panel::<GitPanel>(cx)
-                        .and_then(|p| p.read(cx).active_repository.clone())
-                })?;
-
-                let Some(repo) = repo else {
-                    return Ok(());
-                };
-
-                callback(repo, &sha, stash, commit_view_entity, workspace_weak, cx).await?;
-                anyhow::Ok(())
-            })
-            .detach_and_notify_err(window, cx);
-    }
-
-    async fn close_commit_view(
-        commit_view: Entity<CommitView>,
-        workspace: WeakEntity<Workspace>,
-        cx: &mut AsyncWindowContext,
-    ) -> anyhow::Result<()> {
-        workspace
-            .update_in(cx, |workspace, window, cx| {
-                let active_pane = workspace.active_pane();
-                let commit_view_id = commit_view.entity_id();
-                active_pane.update(cx, |pane, cx| {
-                    pane.close_item_by_id(commit_view_id, SaveIntent::Skip, window, cx)
-                })
-            })?
-            .await?;
-        anyhow::Ok(())
-    }
-}
-
-impl language::File for GitBlob {
-    fn as_local(&self) -> Option<&dyn language::LocalFile> {
-        None
-    }
-
-    fn disk_state(&self) -> DiskState {
-        if self.is_deleted {
-            DiskState::Deleted
-        } else {
-            DiskState::New
-        }
-    }
-
-    fn path_style(&self, _: &App) -> PathStyle {
-        PathStyle::Posix
-    }
-
-    fn path(&self) -> &Arc<RelPath> {
-        self.path.as_ref()
-    }
-
-    fn full_path(&self, _: &App) -> PathBuf {
-        self.path.as_std_path().to_path_buf()
-    }
-
-    fn file_name<'a>(&'a self, _: &'a App) -> &'a str {
-        self.display_name.as_ref()
-    }
-
-    fn worktree_id(&self, _: &App) -> WorktreeId {
-        self.worktree_id
-    }
-
-    fn to_proto(&self, _cx: &App) -> language::proto::File {
-        unimplemented!()
-    }
-
-    fn is_private(&self) -> bool {
-        false
-    }
-}
-
-// No longer needed since metadata buffer is not created
-// impl language::File for CommitMetadataFile {
-//     fn as_local(&self) -> Option<&dyn language::LocalFile> {
-//         None
-//     }
-//
-//     fn disk_state(&self) -> DiskState {
-//         DiskState::New
-//     }
-//
-//     fn path_style(&self, _: &App) -> PathStyle {
-//         PathStyle::Posix
-//     }
-//
-//     fn path(&self) -> &Arc<RelPath> {
-//         &self.title
-//     }
-//
-//     fn full_path(&self, _: &App) -> PathBuf {
-//         self.title.as_std_path().to_path_buf()
-//     }
-//
-//     fn file_name<'a>(&'a self, _: &'a App) -> &'a str {
-//         self.title.file_name().unwrap_or("commit")
-//     }
-//
-//     fn worktree_id(&self, _: &App) -> WorktreeId {
-//         self.worktree_id
-//     }
-//
-//     fn to_proto(&self, _cx: &App) -> language::proto::File {
-//         unimplemented!()
-//     }
-//
-//     fn is_private(&self) -> bool {
-//         false
-//     }
-// }
-
-async fn build_buffer(
-    mut text: String,
-    blob: Arc<dyn File>,
-    language_registry: &Arc<language::LanguageRegistry>,
-    cx: &mut AsyncApp,
-) -> Result<Entity<Buffer>> {
-    let line_ending = LineEnding::detect(&text);
-    LineEnding::normalize(&mut text);
-    let text = Rope::from(text);
-    let language = cx.update(|cx| language_registry.language_for_file(&blob, Some(&text), cx))?;
-    let language = if let Some(language) = language {
-        language_registry
-            .load_language(&language)
-            .await
-            .ok()
-            .and_then(|e| e.log_err())
-    } else {
-        None
-    };
-    let buffer = cx.new(|cx| {
-        let buffer = TextBuffer::new_normalized(
-            ReplicaId::LOCAL,
-            cx.entity_id().as_non_zero_u64().into(),
-            line_ending,
-            text,
-        );
-        let mut buffer = Buffer::build(buffer, Some(blob), Capability::ReadWrite);
-        buffer.set_language_async(language, cx);
-        buffer
-    })?;
-    Ok(buffer)
-}
-
-async fn build_buffer_diff(
-    mut old_text: Option<String>,
-    buffer: &Entity<Buffer>,
-    language_registry: &Arc<LanguageRegistry>,
-    cx: &mut AsyncApp,
-) -> Result<Entity<BufferDiff>> {
-    if let Some(old_text) = &mut old_text {
-        LineEnding::normalize(old_text);
-    }
-
-    let buffer = cx.update(|cx| buffer.read(cx).snapshot())?;
-
-    let base_buffer = cx
-        .update(|cx| {
-            Buffer::build_snapshot(
-                old_text.as_deref().unwrap_or("").into(),
-                buffer.language().cloned(),
-                Some(language_registry.clone()),
-                cx,
-            )
-        })?
-        .await;
-
-    let diff_snapshot = cx
-        .update(|cx| {
-            BufferDiffSnapshot::new_with_base_buffer(
-                buffer.text.clone(),
-                old_text.map(Arc::new),
-                base_buffer,
-                cx,
-            )
-        })?
-        .await;
-
-    cx.new(|cx| {
-        let mut diff = BufferDiff::new(&buffer.text, cx);
-        diff.set_snapshot(diff_snapshot, &buffer.text, cx);
-        diff
-    })
-}
-
-impl EventEmitter<EditorEvent> for CommitView {}
-
-impl Focusable for CommitView {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        self.editor.focus_handle(cx)
-    }
-}
-
-impl Item for CommitView {
-    type Event = EditorEvent;
-
-    fn tab_icon(&self, _window: &Window, _cx: &App) -> Option<Icon> {
-        Some(Icon::new(IconName::GitBranch).color(Color::Muted))
-    }
-
-    fn tab_content(&self, params: TabContentParams, _window: &Window, cx: &App) -> AnyElement {
-        Label::new(self.tab_content_text(params.detail.unwrap_or_default(), cx))
-            .color(if params.selected {
-                Color::Default
-            } else {
-                Color::Muted
-            })
-            .into_any_element()
-    }
-
-    fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString {
-        let short_sha = self.commit.sha.get(0..7).unwrap_or(&*self.commit.sha);
-        let subject = truncate_and_trailoff(self.commit.message.split('\n').next().unwrap(), 20);
-        format!("{short_sha} — {subject}").into()
-    }
-
-    fn tab_tooltip_content(&self, _: &App) -> Option<TabTooltipContent> {
-        let short_sha = self.commit.sha.get(0..16).unwrap_or(&*self.commit.sha);
-        let subject = self.commit.message.split('\n').next().unwrap();
-
-        Some(TabTooltipContent::Custom(Box::new(Tooltip::element({
-            let subject = subject.to_string();
-            let short_sha = short_sha.to_string();
-
-            move |_, _| {
-                v_flex()
-                    .child(Label::new(subject.clone()))
-                    .child(
-                        Label::new(short_sha.clone())
-                            .color(Color::Muted)
-                            .size(LabelSize::Small),
-                    )
-                    .into_any_element()
-            }
-        }))))
-    }
-
-    fn to_item_events(event: &EditorEvent, f: impl FnMut(ItemEvent)) {
-        Editor::to_item_events(event, f)
-    }
-
-    fn telemetry_event_text(&self) -> Option<&'static str> {
-        Some("Commit View Opened")
-    }
-
-    fn deactivated(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.editor
-            .update(cx, |editor, cx| editor.deactivated(window, cx));
-    }
-
-    fn act_as_type<'a>(
-        &'a self,
-        type_id: TypeId,
-        self_handle: &'a Entity<Self>,
-        _: &'a App,
-    ) -> Option<gpui::AnyEntity> {
-        if type_id == TypeId::of::<Self>() {
-            Some(self_handle.clone().into())
-        } else if type_id == TypeId::of::<Editor>() {
-            Some(self.editor.clone().into())
-        } else {
-            None
-        }
-    }
-
-    fn as_searchable(&self, _: &Entity<Self>, _: &App) -> Option<Box<dyn SearchableItemHandle>> {
-        Some(Box::new(self.editor.clone()))
-    }
-
-    fn for_each_project_item(
-        &self,
-        cx: &App,
-        f: &mut dyn FnMut(gpui::EntityId, &dyn project::ProjectItem),
-    ) {
-        self.editor.for_each_project_item(cx, f)
-    }
-
-    fn set_nav_history(
-        &mut self,
-        nav_history: ItemNavHistory,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.editor.update(cx, |editor, _| {
-            editor.set_nav_history(Some(nav_history));
-        });
-    }
-
-    fn navigate(
-        &mut self,
-        data: Box<dyn Any>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> bool {
-        self.editor
-            .update(cx, |editor, cx| editor.navigate(data, window, cx))
-    }
-
-    fn breadcrumb_location(&self, _: &App) -> ToolbarItemLocation {
-        ToolbarItemLocation::Hidden
-    }
-
-    fn breadcrumbs(&self, _theme: &theme::Theme, _cx: &App) -> Option<Vec<BreadcrumbText>> {
-        None
-    }
-
-    fn added_to_workspace(
-        &mut self,
-        workspace: &mut Workspace,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.editor.update(cx, |editor, cx| {
-            editor.added_to_workspace(workspace, window, cx)
-        });
-    }
-
-    fn can_split(&self) -> bool {
-        true
-    }
-
-    fn clone_on_split(
-        &self,
-        _workspace_id: Option<workspace::WorkspaceId>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Option<Entity<Self>>>
-    where
-        Self: Sized,
-    {
-        Task::ready(Some(cx.new(|cx| {
-            let editor = cx.new(|cx| {
-                self.editor
-                    .update(cx, |editor, cx| editor.clone(window, cx))
-            });
-            let multibuffer = editor.read(cx).buffer().clone();
-            Self {
-                editor,
-                multibuffer,
-                commit: self.commit.clone(),
-                stash: self.stash,
-                repository: self.repository.clone(),
-                remote: self.remote.clone(),
-            }
-        })))
-    }
-}
-
-impl Render for CommitView {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let is_stash = self.stash.is_some();
-
-        v_flex()
-            .key_context(if is_stash { "StashDiff" } else { "CommitDiff" })
-            .size_full()
-            .bg(cx.theme().colors().editor_background)
-            .child(self.render_header(window, cx))
-            .when(!self.editor.read(cx).is_empty(cx), |this| {
-                this.child(div().flex_grow().child(self.editor.clone()))
-            })
-    }
-}
-
-pub struct CommitViewToolbar {
-    commit_view: Option<WeakEntity<CommitView>>,
-}
-
-impl CommitViewToolbar {
-    pub fn new() -> Self {
-        Self { commit_view: None }
-    }
-}
-
-impl EventEmitter<ToolbarItemEvent> for CommitViewToolbar {}
-
-impl Render for CommitViewToolbar {
-    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
-        div().hidden()
-    }
-}
-
-impl ToolbarItemView for CommitViewToolbar {
-    fn set_active_pane_item(
-        &mut self,
-        active_pane_item: Option<&dyn ItemHandle>,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> ToolbarItemLocation {
-        if let Some(entity) = active_pane_item.and_then(|i| i.act_as::<CommitView>(cx))
-            && entity.read(cx).stash.is_some()
-        {
-            self.commit_view = Some(entity.downgrade());
-            return ToolbarItemLocation::PrimaryRight;
-        }
-        ToolbarItemLocation::Hidden
-    }
-
-    fn pane_focus_update(
-        &mut self,
-        _pane_focused: bool,
-        _window: &mut Window,
-        _cx: &mut Context<Self>,
-    ) {
-    }
-}
-
-fn stash_matches_index(sha: &str, stash_index: usize, repo: &Repository) -> bool {
-    repo.stash_entries
-        .entries
-        .get(stash_index)
-        .map(|entry| entry.oid.to_string() == sha)
-        .unwrap_or(false)
-}
diff --git a/crates/git_ui/src/conflict_view.rs b/crates/git_ui/src/conflict_view.rs
deleted file mode 100644
index 813e63ab8c..0000000000
--- a/crates/git_ui/src/conflict_view.rs
+++ /dev/null
@@ -1,520 +0,0 @@
-use collections::{HashMap, HashSet};
-use editor::{
-    ConflictsOurs, ConflictsOursMarker, ConflictsOuter, ConflictsTheirs, ConflictsTheirsMarker,
-    Editor, EditorEvent, ExcerptId, MultiBuffer, RowHighlightOptions,
-    display_map::{BlockContext, BlockPlacement, BlockProperties, BlockStyle, CustomBlockId},
-};
-use gpui::{
-    App, Context, Entity, InteractiveElement as _, ParentElement as _, Subscription, Task,
-    WeakEntity,
-};
-use language::{Anchor, Buffer, BufferId};
-use project::{ConflictRegion, ConflictSet, ConflictSetUpdate, ProjectItem as _};
-use std::{ops::Range, sync::Arc};
-use ui::{ActiveTheme, Element as _, Styled, Window, prelude::*};
-use util::{ResultExt as _, debug_panic, maybe};
-
-pub(crate) struct ConflictAddon {
-    buffers: HashMap<BufferId, BufferConflicts>,
-}
-
-impl ConflictAddon {
-    pub(crate) fn conflict_set(&self, buffer_id: BufferId) -> Option<Entity<ConflictSet>> {
-        self.buffers
-            .get(&buffer_id)
-            .map(|entry| entry.conflict_set.clone())
-    }
-}
-
-struct BufferConflicts {
-    block_ids: Vec<(Range<Anchor>, CustomBlockId)>,
-    conflict_set: Entity<ConflictSet>,
-    _subscription: Subscription,
-}
-
-impl editor::Addon for ConflictAddon {
-    fn to_any(&self) -> &dyn std::any::Any {
-        self
-    }
-
-    fn to_any_mut(&mut self) -> Option<&mut dyn std::any::Any> {
-        Some(self)
-    }
-}
-
-pub fn register_editor(editor: &mut Editor, buffer: Entity<MultiBuffer>, cx: &mut Context<Editor>) {
-    // Only show conflict UI for singletons and in the project diff.
-    if !editor.mode().is_full()
-        || (!editor.buffer().read(cx).is_singleton()
-            && !editor.buffer().read(cx).all_diff_hunks_expanded())
-    {
-        return;
-    }
-
-    editor.register_addon(ConflictAddon {
-        buffers: Default::default(),
-    });
-
-    let buffers = buffer.read(cx).all_buffers();
-    for buffer in buffers {
-        buffer_added(editor, buffer, cx);
-    }
-
-    cx.subscribe(&cx.entity(), |editor, _, event, cx| match event {
-        EditorEvent::ExcerptsAdded { buffer, .. } => buffer_added(editor, buffer.clone(), cx),
-        EditorEvent::ExcerptsExpanded { ids } => {
-            let multibuffer = editor.buffer().read(cx).snapshot(cx);
-            for excerpt_id in ids {
-                let Some(buffer) = multibuffer.buffer_for_excerpt(*excerpt_id) else {
-                    continue;
-                };
-                let addon = editor.addon::<ConflictAddon>().unwrap();
-                let Some(conflict_set) = addon.conflict_set(buffer.remote_id()).clone() else {
-                    return;
-                };
-                excerpt_for_buffer_updated(editor, conflict_set, cx);
-            }
-        }
-        EditorEvent::ExcerptsRemoved {
-            removed_buffer_ids, ..
-        } => buffers_removed(editor, removed_buffer_ids, cx),
-        _ => {}
-    })
-    .detach();
-}
-
-fn excerpt_for_buffer_updated(
-    editor: &mut Editor,
-    conflict_set: Entity<ConflictSet>,
-    cx: &mut Context<Editor>,
-) {
-    let conflicts_len = conflict_set.read(cx).snapshot().conflicts.len();
-    let buffer_id = conflict_set.read(cx).snapshot().buffer_id;
-    let Some(buffer_conflicts) = editor
-        .addon_mut::<ConflictAddon>()
-        .unwrap()
-        .buffers
-        .get(&buffer_id)
-    else {
-        return;
-    };
-    let addon_conflicts_len = buffer_conflicts.block_ids.len();
-    conflicts_updated(
-        editor,
-        conflict_set,
-        &ConflictSetUpdate {
-            buffer_range: None,
-            old_range: 0..addon_conflicts_len,
-            new_range: 0..conflicts_len,
-        },
-        cx,
-    );
-}
-
-#[ztracing::instrument(skip_all)]
-fn buffer_added(editor: &mut Editor, buffer: Entity<Buffer>, cx: &mut Context<Editor>) {
-    let Some(project) = editor.project() else {
-        return;
-    };
-    let git_store = project.read(cx).git_store().clone();
-
-    let buffer_conflicts = editor
-        .addon_mut::<ConflictAddon>()
-        .unwrap()
-        .buffers
-        .entry(buffer.read(cx).remote_id())
-        .or_insert_with(|| {
-            let conflict_set = git_store.update(cx, |git_store, cx| {
-                git_store.open_conflict_set(buffer.clone(), cx)
-            });
-            let subscription = cx.subscribe(&conflict_set, conflicts_updated);
-            BufferConflicts {
-                block_ids: Vec::new(),
-                conflict_set,
-                _subscription: subscription,
-            }
-        });
-
-    let conflict_set = buffer_conflicts.conflict_set.clone();
-    let conflicts_len = conflict_set.read(cx).snapshot().conflicts.len();
-    let addon_conflicts_len = buffer_conflicts.block_ids.len();
-    conflicts_updated(
-        editor,
-        conflict_set,
-        &ConflictSetUpdate {
-            buffer_range: None,
-            old_range: 0..addon_conflicts_len,
-            new_range: 0..conflicts_len,
-        },
-        cx,
-    );
-}
-
-fn buffers_removed(editor: &mut Editor, removed_buffer_ids: &[BufferId], cx: &mut Context<Editor>) {
-    let mut removed_block_ids = HashSet::default();
-    editor
-        .addon_mut::<ConflictAddon>()
-        .unwrap()
-        .buffers
-        .retain(|buffer_id, buffer| {
-            if removed_buffer_ids.contains(buffer_id) {
-                removed_block_ids.extend(buffer.block_ids.iter().map(|(_, block_id)| *block_id));
-                false
-            } else {
-                true
-            }
-        });
-    editor.remove_blocks(removed_block_ids, None, cx);
-}
-
-#[ztracing::instrument(skip_all)]
-fn conflicts_updated(
-    editor: &mut Editor,
-    conflict_set: Entity<ConflictSet>,
-    event: &ConflictSetUpdate,
-    cx: &mut Context<Editor>,
-) {
-    let buffer_id = conflict_set.read(cx).snapshot.buffer_id;
-    let conflict_set = conflict_set.read(cx).snapshot();
-    let multibuffer = editor.buffer().read(cx);
-    let snapshot = multibuffer.snapshot(cx);
-    let excerpts = multibuffer.excerpts_for_buffer(buffer_id, cx);
-    let Some(buffer_snapshot) = excerpts
-        .first()
-        .and_then(|(excerpt_id, _)| snapshot.buffer_for_excerpt(*excerpt_id))
-    else {
-        return;
-    };
-
-    let old_range = maybe!({
-        let conflict_addon = editor.addon_mut::<ConflictAddon>().unwrap();
-        let buffer_conflicts = conflict_addon.buffers.get(&buffer_id)?;
-        match buffer_conflicts.block_ids.get(event.old_range.clone()) {
-            Some(_) => Some(event.old_range.clone()),
-            None => {
-                debug_panic!(
-                    "conflicts updated event old range is invalid for buffer conflicts view (block_ids len is {:?}, old_range is {:?})",
-                    buffer_conflicts.block_ids.len(),
-                    event.old_range,
-                );
-                if event.old_range.start <= event.old_range.end {
-                    Some(
-                        event.old_range.start.min(buffer_conflicts.block_ids.len())
-                            ..event.old_range.end.min(buffer_conflicts.block_ids.len()),
-                    )
-                } else {
-                    None
-                }
-            }
-        }
-    });
-
-    // Remove obsolete highlights and blocks
-    let conflict_addon = editor.addon_mut::<ConflictAddon>().unwrap();
-    if let Some((buffer_conflicts, old_range)) = conflict_addon
-        .buffers
-        .get_mut(&buffer_id)
-        .zip(old_range.clone())
-    {
-        let old_conflicts = buffer_conflicts.block_ids[old_range].to_owned();
-        let mut removed_highlighted_ranges = Vec::new();
-        let mut removed_block_ids = HashSet::default();
-        for (conflict_range, block_id) in old_conflicts {
-            let Some((excerpt_id, _)) = excerpts.iter().find(|(_, range)| {
-                let precedes_start = range
-                    .context
-                    .start
-                    .cmp(&conflict_range.start, buffer_snapshot)
-                    .is_le();
-                let follows_end = range
-                    .context
-                    .end
-                    .cmp(&conflict_range.start, buffer_snapshot)
-                    .is_ge();
-                precedes_start && follows_end
-            }) else {
-                continue;
-            };
-            let excerpt_id = *excerpt_id;
-            let Some(range) = snapshot.anchor_range_in_excerpt(excerpt_id, conflict_range) else {
-                continue;
-            };
-            removed_highlighted_ranges.push(range.clone());
-            removed_block_ids.insert(block_id);
-        }
-
-        editor.remove_gutter_highlights::<ConflictsOuter>(removed_highlighted_ranges.clone(), cx);
-
-        editor.remove_highlighted_rows::<ConflictsOuter>(removed_highlighted_ranges.clone(), cx);
-        editor.remove_highlighted_rows::<ConflictsOurs>(removed_highlighted_ranges.clone(), cx);
-        editor
-            .remove_highlighted_rows::<ConflictsOursMarker>(removed_highlighted_ranges.clone(), cx);
-        editor.remove_highlighted_rows::<ConflictsTheirs>(removed_highlighted_ranges.clone(), cx);
-        editor.remove_highlighted_rows::<ConflictsTheirsMarker>(
-            removed_highlighted_ranges.clone(),
-            cx,
-        );
-        editor.remove_blocks(removed_block_ids, None, cx);
-    }
-
-    // Add new highlights and blocks
-    let editor_handle = cx.weak_entity();
-    let new_conflicts = &conflict_set.conflicts[event.new_range.clone()];
-    let mut blocks = Vec::new();
-    for conflict in new_conflicts {
-        let Some((excerpt_id, _)) = excerpts.iter().find(|(_, range)| {
-            let precedes_start = range
-                .context
-                .start
-                .cmp(&conflict.range.start, buffer_snapshot)
-                .is_le();
-            let follows_end = range
-                .context
-                .end
-                .cmp(&conflict.range.start, buffer_snapshot)
-                .is_ge();
-            precedes_start && follows_end
-        }) else {
-            continue;
-        };
-        let excerpt_id = *excerpt_id;
-
-        update_conflict_highlighting(editor, conflict, &snapshot, excerpt_id, cx);
-
-        let Some(anchor) = snapshot.anchor_in_excerpt(excerpt_id, conflict.range.start) else {
-            continue;
-        };
-
-        let editor_handle = editor_handle.clone();
-        blocks.push(BlockProperties {
-            placement: BlockPlacement::Above(anchor),
-            height: Some(1),
-            style: BlockStyle::Fixed,
-            render: Arc::new({
-                let conflict = conflict.clone();
-                move |cx| render_conflict_buttons(&conflict, excerpt_id, editor_handle.clone(), cx)
-            }),
-            priority: 0,
-        })
-    }
-    let new_block_ids = editor.insert_blocks(blocks, None, cx);
-
-    let conflict_addon = editor.addon_mut::<ConflictAddon>().unwrap();
-    if let Some((buffer_conflicts, old_range)) =
-        conflict_addon.buffers.get_mut(&buffer_id).zip(old_range)
-    {
-        buffer_conflicts.block_ids.splice(
-            old_range,
-            new_conflicts
-                .iter()
-                .map(|conflict| conflict.range.clone())
-                .zip(new_block_ids),
-        );
-    }
-}
-
-#[ztracing::instrument(skip_all)]
-fn update_conflict_highlighting(
-    editor: &mut Editor,
-    conflict: &ConflictRegion,
-    buffer: &editor::MultiBufferSnapshot,
-    excerpt_id: editor::ExcerptId,
-    cx: &mut Context<Editor>,
-) -> Option<()> {
-    log::debug!("update conflict highlighting for {conflict:?}");
-
-    let outer = buffer.anchor_range_in_excerpt(excerpt_id, conflict.range.clone())?;
-    let ours = buffer.anchor_range_in_excerpt(excerpt_id, conflict.ours.clone())?;
-    let theirs = buffer.anchor_range_in_excerpt(excerpt_id, conflict.theirs.clone())?;
-
-    let ours_background = cx.theme().colors().version_control_conflict_marker_ours;
-    let theirs_background = cx.theme().colors().version_control_conflict_marker_theirs;
-
-    let options = RowHighlightOptions {
-        include_gutter: true,
-        ..Default::default()
-    };
-
-    editor.insert_gutter_highlight::<ConflictsOuter>(
-        outer.start..theirs.end,
-        |cx| cx.theme().colors().editor_background,
-        cx,
-    );
-
-    // Prevent diff hunk highlighting within the entire conflict region.
-    editor.highlight_rows::<ConflictsOuter>(outer.clone(), theirs_background, options, cx);
-    editor.highlight_rows::<ConflictsOurs>(ours.clone(), ours_background, options, cx);
-    editor.highlight_rows::<ConflictsOursMarker>(
-        outer.start..ours.start,
-        ours_background,
-        options,
-        cx,
-    );
-    editor.highlight_rows::<ConflictsTheirs>(theirs.clone(), theirs_background, options, cx);
-    editor.highlight_rows::<ConflictsTheirsMarker>(
-        theirs.end..outer.end,
-        theirs_background,
-        options,
-        cx,
-    );
-
-    Some(())
-}
-
-fn render_conflict_buttons(
-    conflict: &ConflictRegion,
-    excerpt_id: ExcerptId,
-    editor: WeakEntity<Editor>,
-    cx: &mut BlockContext,
-) -> AnyElement {
-    h_flex()
-        .id(cx.block_id)
-        .h(cx.line_height)
-        .ml(cx.margins.gutter.width)
-        .items_end()
-        .gap_1()
-        .bg(cx.theme().colors().editor_background)
-        .child(
-            Button::new("head", format!("Use {}", conflict.ours_branch_name))
-                .label_size(LabelSize::Small)
-                .on_click({
-                    let editor = editor.clone();
-                    let conflict = conflict.clone();
-                    let ours = conflict.ours.clone();
-                    move |_, window, cx| {
-                        resolve_conflict(
-                            editor.clone(),
-                            excerpt_id,
-                            conflict.clone(),
-                            vec![ours.clone()],
-                            window,
-                            cx,
-                        )
-                        .detach()
-                    }
-                }),
-        )
-        .child(
-            Button::new("origin", format!("Use {}", conflict.theirs_branch_name))
-                .label_size(LabelSize::Small)
-                .on_click({
-                    let editor = editor.clone();
-                    let conflict = conflict.clone();
-                    let theirs = conflict.theirs.clone();
-                    move |_, window, cx| {
-                        resolve_conflict(
-                            editor.clone(),
-                            excerpt_id,
-                            conflict.clone(),
-                            vec![theirs.clone()],
-                            window,
-                            cx,
-                        )
-                        .detach()
-                    }
-                }),
-        )
-        .child(
-            Button::new("both", "Use Both")
-                .label_size(LabelSize::Small)
-                .on_click({
-                    let conflict = conflict.clone();
-                    let ours = conflict.ours.clone();
-                    let theirs = conflict.theirs.clone();
-                    move |_, window, cx| {
-                        resolve_conflict(
-                            editor.clone(),
-                            excerpt_id,
-                            conflict.clone(),
-                            vec![ours.clone(), theirs.clone()],
-                            window,
-                            cx,
-                        )
-                        .detach()
-                    }
-                }),
-        )
-        .into_any()
-}
-
-pub(crate) fn resolve_conflict(
-    editor: WeakEntity<Editor>,
-    excerpt_id: ExcerptId,
-    resolved_conflict: ConflictRegion,
-    ranges: Vec<Range<Anchor>>,
-    window: &mut Window,
-    cx: &mut App,
-) -> Task<()> {
-    window.spawn(cx, async move |cx| {
-        let Some((workspace, project, multibuffer, buffer)) = editor
-            .update(cx, |editor, cx| {
-                let workspace = editor.workspace()?;
-                let project = editor.project()?.clone();
-                let multibuffer = editor.buffer().clone();
-                let buffer_id = resolved_conflict.ours.end.buffer_id?;
-                let buffer = multibuffer.read(cx).buffer(buffer_id)?;
-                resolved_conflict.resolve(buffer.clone(), &ranges, cx);
-                let conflict_addon = editor.addon_mut::<ConflictAddon>().unwrap();
-                let snapshot = multibuffer.read(cx).snapshot(cx);
-                let buffer_snapshot = buffer.read(cx).snapshot();
-                let state = conflict_addon
-                    .buffers
-                    .get_mut(&buffer_snapshot.remote_id())?;
-                let ix = state
-                    .block_ids
-                    .binary_search_by(|(range, _)| {
-                        range
-                            .start
-                            .cmp(&resolved_conflict.range.start, &buffer_snapshot)
-                    })
-                    .ok()?;
-                let &(_, block_id) = &state.block_ids[ix];
-                let range =
-                    snapshot.anchor_range_in_excerpt(excerpt_id, resolved_conflict.range)?;
-
-                editor.remove_gutter_highlights::<ConflictsOuter>(vec![range.clone()], cx);
-
-                editor.remove_highlighted_rows::<ConflictsOuter>(vec![range.clone()], cx);
-                editor.remove_highlighted_rows::<ConflictsOurs>(vec![range.clone()], cx);
-                editor.remove_highlighted_rows::<ConflictsTheirs>(vec![range.clone()], cx);
-                editor.remove_highlighted_rows::<ConflictsOursMarker>(vec![range.clone()], cx);
-                editor.remove_highlighted_rows::<ConflictsTheirsMarker>(vec![range], cx);
-                editor.remove_blocks(HashSet::from_iter([block_id]), None, cx);
-                Some((workspace, project, multibuffer, buffer))
-            })
-            .ok()
-            .flatten()
-        else {
-            return;
-        };
-        let Some(save) = project
-            .update(cx, |project, cx| {
-                if multibuffer.read(cx).all_diff_hunks_expanded() {
-                    project.save_buffer(buffer.clone(), cx)
-                } else {
-                    Task::ready(Ok(()))
-                }
-            })
-            .ok()
-        else {
-            return;
-        };
-        if save.await.log_err().is_none() {
-            let open_path = maybe!({
-                let path = buffer
-                    .read_with(cx, |buffer, cx| buffer.project_path(cx))
-                    .ok()
-                    .flatten()?;
-                workspace
-                    .update_in(cx, |workspace, window, cx| {
-                        workspace.open_path_preview(path, None, false, false, false, window, cx)
-                    })
-                    .ok()
-            });
-
-            if let Some(open_path) = open_path {
-                open_path.await.log_err();
-            }
-        }
-    })
-}
diff --git a/crates/git_ui/src/file_diff_view.rs b/crates/git_ui/src/file_diff_view.rs
deleted file mode 100644
index b020d7a9f3..0000000000
--- a/crates/git_ui/src/file_diff_view.rs
+++ /dev/null
@@ -1,577 +0,0 @@
-//! FileDiffView provides a UI for displaying differences between two buffers.
-
-use anyhow::Result;
-use buffer_diff::{BufferDiff, BufferDiffSnapshot};
-use editor::{Editor, EditorEvent, MultiBuffer};
-use futures::{FutureExt, select_biased};
-use gpui::{
-    AnyElement, App, AppContext as _, AsyncApp, Context, Entity, EventEmitter, FocusHandle,
-    Focusable, IntoElement, Render, Task, Window,
-};
-use language::Buffer;
-use project::Project;
-use std::{
-    any::{Any, TypeId},
-    path::PathBuf,
-    pin::pin,
-    sync::Arc,
-    time::Duration,
-};
-use ui::{Color, Icon, IconName, Label, LabelCommon as _, SharedString};
-use util::paths::PathExt as _;
-use workspace::{
-    Item, ItemHandle as _, ItemNavHistory, ToolbarItemLocation, Workspace,
-    item::{BreadcrumbText, ItemEvent, SaveOptions, TabContentParams},
-    searchable::SearchableItemHandle,
-};
-
-pub struct FileDiffView {
-    editor: Entity<Editor>,
-    old_buffer: Entity<Buffer>,
-    new_buffer: Entity<Buffer>,
-    buffer_changes_tx: watch::Sender<()>,
-    _recalculate_diff_task: Task<Result<()>>,
-}
-
-const RECALCULATE_DIFF_DEBOUNCE: Duration = Duration::from_millis(250);
-
-impl FileDiffView {
-    pub fn open(
-        old_path: PathBuf,
-        new_path: PathBuf,
-        workspace: &Workspace,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<Entity<Self>>> {
-        let workspace = workspace.weak_handle();
-        window.spawn(cx, async move |cx| {
-            let project = workspace.update(cx, |workspace, _| workspace.project().clone())?;
-            let old_buffer = project
-                .update(cx, |project, cx| project.open_local_buffer(&old_path, cx))?
-                .await?;
-            let new_buffer = project
-                .update(cx, |project, cx| project.open_local_buffer(&new_path, cx))?
-                .await?;
-
-            let buffer_diff = build_buffer_diff(&old_buffer, &new_buffer, cx).await?;
-
-            workspace.update_in(cx, |workspace, window, cx| {
-                let diff_view = cx.new(|cx| {
-                    FileDiffView::new(
-                        old_buffer,
-                        new_buffer,
-                        buffer_diff,
-                        project.clone(),
-                        window,
-                        cx,
-                    )
-                });
-
-                let pane = workspace.active_pane();
-                pane.update(cx, |pane, cx| {
-                    pane.add_item(Box::new(diff_view.clone()), true, true, None, window, cx);
-                });
-
-                diff_view
-            })
-        })
-    }
-
-    pub fn new(
-        old_buffer: Entity<Buffer>,
-        new_buffer: Entity<Buffer>,
-        diff: Entity<BufferDiff>,
-        project: Entity<Project>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let multibuffer = cx.new(|cx| {
-            let mut multibuffer = MultiBuffer::singleton(new_buffer.clone(), cx);
-            multibuffer.add_diff(diff.clone(), cx);
-            multibuffer
-        });
-        let editor = cx.new(|cx| {
-            let mut editor =
-                Editor::for_multibuffer(multibuffer.clone(), Some(project.clone()), window, cx);
-            editor.start_temporary_diff_override();
-            editor.disable_diagnostics(cx);
-            editor.set_expand_all_diff_hunks(cx);
-            editor.set_render_diff_hunk_controls(
-                Arc::new(|_, _, _, _, _, _, _, _| gpui::Empty.into_any_element()),
-                cx,
-            );
-            editor
-        });
-
-        let (buffer_changes_tx, mut buffer_changes_rx) = watch::channel(());
-
-        for buffer in [&old_buffer, &new_buffer] {
-            cx.subscribe(buffer, move |this, _, event, _| match event {
-                language::BufferEvent::Edited
-                | language::BufferEvent::LanguageChanged(_)
-                | language::BufferEvent::Reparsed => {
-                    this.buffer_changes_tx.send(()).ok();
-                }
-                _ => {}
-            })
-            .detach();
-        }
-
-        Self {
-            editor,
-            buffer_changes_tx,
-            old_buffer,
-            new_buffer,
-            _recalculate_diff_task: cx.spawn(async move |this, cx| {
-                while buffer_changes_rx.recv().await.is_ok() {
-                    loop {
-                        let mut timer = cx
-                            .background_executor()
-                            .timer(RECALCULATE_DIFF_DEBOUNCE)
-                            .fuse();
-                        let mut recv = pin!(buffer_changes_rx.recv().fuse());
-                        select_biased! {
-                            _ = timer => break,
-                            _ = recv => continue,
-                        }
-                    }
-
-                    log::trace!("start recalculating");
-                    let (old_snapshot, new_snapshot) = this.update(cx, |this, cx| {
-                        (
-                            this.old_buffer.read(cx).snapshot(),
-                            this.new_buffer.read(cx).snapshot(),
-                        )
-                    })?;
-                    let diff_snapshot = cx
-                        .update(|cx| {
-                            BufferDiffSnapshot::new_with_base_buffer(
-                                new_snapshot.text.clone(),
-                                Some(old_snapshot.text().into()),
-                                old_snapshot,
-                                cx,
-                            )
-                        })?
-                        .await;
-                    diff.update(cx, |diff, cx| {
-                        diff.set_snapshot(diff_snapshot, &new_snapshot, cx)
-                    })?;
-                    log::trace!("finish recalculating");
-                }
-                Ok(())
-            }),
-        }
-    }
-}
-
-async fn build_buffer_diff(
-    old_buffer: &Entity<Buffer>,
-    new_buffer: &Entity<Buffer>,
-    cx: &mut AsyncApp,
-) -> Result<Entity<BufferDiff>> {
-    let old_buffer_snapshot = old_buffer.read_with(cx, |buffer, _| buffer.snapshot())?;
-    let new_buffer_snapshot = new_buffer.read_with(cx, |buffer, _| buffer.snapshot())?;
-
-    let diff_snapshot = cx
-        .update(|cx| {
-            BufferDiffSnapshot::new_with_base_buffer(
-                new_buffer_snapshot.text.clone(),
-                Some(old_buffer_snapshot.text().into()),
-                old_buffer_snapshot,
-                cx,
-            )
-        })?
-        .await;
-
-    cx.new(|cx| {
-        let mut diff = BufferDiff::new(&new_buffer_snapshot.text, cx);
-        diff.set_snapshot(diff_snapshot, &new_buffer_snapshot.text, cx);
-        diff
-    })
-}
-
-impl EventEmitter<EditorEvent> for FileDiffView {}
-
-impl Focusable for FileDiffView {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        self.editor.focus_handle(cx)
-    }
-}
-
-impl Item for FileDiffView {
-    type Event = EditorEvent;
-
-    fn tab_icon(&self, _window: &Window, _cx: &App) -> Option<Icon> {
-        Some(Icon::new(IconName::Diff).color(Color::Muted))
-    }
-
-    fn tab_content(&self, params: TabContentParams, _window: &Window, cx: &App) -> AnyElement {
-        Label::new(self.tab_content_text(params.detail.unwrap_or_default(), cx))
-            .color(if params.selected {
-                Color::Default
-            } else {
-                Color::Muted
-            })
-            .into_any_element()
-    }
-
-    fn tab_content_text(&self, _detail: usize, cx: &App) -> SharedString {
-        let title_text = |buffer: &Entity<Buffer>| {
-            buffer
-                .read(cx)
-                .file()
-                .and_then(|file| {
-                    Some(
-                        file.full_path(cx)
-                            .file_name()?
-                            .to_string_lossy()
-                            .to_string(),
-                    )
-                })
-                .unwrap_or_else(|| "untitled".into())
-        };
-        let old_filename = title_text(&self.old_buffer);
-        let new_filename = title_text(&self.new_buffer);
-
-        format!("{old_filename} ↔ {new_filename}").into()
-    }
-
-    fn tab_tooltip_text(&self, cx: &App) -> Option<ui::SharedString> {
-        let path = |buffer: &Entity<Buffer>| {
-            buffer
-                .read(cx)
-                .file()
-                .map(|file| file.full_path(cx).compact().to_string_lossy().into_owned())
-                .unwrap_or_else(|| "untitled".into())
-        };
-        let old_path = path(&self.old_buffer);
-        let new_path = path(&self.new_buffer);
-
-        Some(format!("{old_path} ↔ {new_path}").into())
-    }
-
-    fn to_item_events(event: &EditorEvent, f: impl FnMut(ItemEvent)) {
-        Editor::to_item_events(event, f)
-    }
-
-    fn telemetry_event_text(&self) -> Option<&'static str> {
-        Some("Diff View Opened")
-    }
-
-    fn deactivated(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.editor
-            .update(cx, |editor, cx| editor.deactivated(window, cx));
-    }
-
-    fn act_as_type<'a>(
-        &'a self,
-        type_id: TypeId,
-        self_handle: &'a Entity<Self>,
-        _: &'a App,
-    ) -> Option<gpui::AnyEntity> {
-        if type_id == TypeId::of::<Self>() {
-            Some(self_handle.clone().into())
-        } else if type_id == TypeId::of::<Editor>() {
-            Some(self.editor.clone().into())
-        } else {
-            None
-        }
-    }
-
-    fn as_searchable(&self, _: &Entity<Self>, _: &App) -> Option<Box<dyn SearchableItemHandle>> {
-        Some(Box::new(self.editor.clone()))
-    }
-
-    fn for_each_project_item(
-        &self,
-        cx: &App,
-        f: &mut dyn FnMut(gpui::EntityId, &dyn project::ProjectItem),
-    ) {
-        self.editor.for_each_project_item(cx, f)
-    }
-
-    fn set_nav_history(
-        &mut self,
-        nav_history: ItemNavHistory,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.editor.update(cx, |editor, _| {
-            editor.set_nav_history(Some(nav_history));
-        });
-    }
-
-    fn navigate(
-        &mut self,
-        data: Box<dyn Any>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> bool {
-        self.editor
-            .update(cx, |editor, cx| editor.navigate(data, window, cx))
-    }
-
-    fn breadcrumb_location(&self, _: &App) -> ToolbarItemLocation {
-        ToolbarItemLocation::PrimaryLeft
-    }
-
-    fn breadcrumbs(&self, theme: &theme::Theme, cx: &App) -> Option<Vec<BreadcrumbText>> {
-        self.editor.breadcrumbs(theme, cx)
-    }
-
-    fn added_to_workspace(
-        &mut self,
-        workspace: &mut Workspace,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.editor.update(cx, |editor, cx| {
-            editor.added_to_workspace(workspace, window, cx)
-        });
-    }
-
-    fn can_save(&self, cx: &App) -> bool {
-        // The editor handles the new buffer, so delegate to it
-        self.editor.read(cx).can_save(cx)
-    }
-
-    fn save(
-        &mut self,
-        options: SaveOptions,
-        project: Entity<Project>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        // Delegate saving to the editor, which manages the new buffer
-        self.editor
-            .update(cx, |editor, cx| editor.save(options, project, window, cx))
-    }
-}
-
-impl Render for FileDiffView {
-    fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
-        self.editor.clone()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use editor::test::editor_test_context::assert_state_with_diff;
-    use gpui::TestAppContext;
-    use project::{FakeFs, Fs, Project};
-    use settings::SettingsStore;
-    use std::path::PathBuf;
-    use unindent::unindent;
-    use util::path;
-    use workspace::Workspace;
-
-    fn init_test(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-            theme::init(theme::LoadThemes::JustBase, cx);
-        });
-    }
-
-    #[gpui::test]
-    async fn test_diff_view(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/test"),
-            serde_json::json!({
-                "old_file.txt": "old line 1\nline 2\nold line 3\nline 4\n",
-                "new_file.txt": "new line 1\nline 2\nnew line 3\nline 4\n"
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs.clone(), [path!("/test").as_ref()], cx).await;
-
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-        let diff_view = workspace
-            .update_in(cx, |workspace, window, cx| {
-                FileDiffView::open(
-                    path!("/test/old_file.txt").into(),
-                    path!("/test/new_file.txt").into(),
-                    workspace,
-                    window,
-                    cx,
-                )
-            })
-            .await
-            .unwrap();
-
-        // Verify initial diff
-        assert_state_with_diff(
-            &diff_view.read_with(cx, |diff_view, _| diff_view.editor.clone()),
-            cx,
-            &unindent(
-                "
-                - old line 1
-                + ˇnew line 1
-                  line 2
-                - old line 3
-                + new line 3
-                  line 4
-                ",
-            ),
-        );
-
-        // Modify the new file on disk
-        fs.save(
-            path!("/test/new_file.txt").as_ref(),
-            &unindent(
-                "
-                new line 1
-                line 2
-                new line 3
-                line 4
-                new line 5
-                ",
-            )
-            .into(),
-            Default::default(),
-        )
-        .await
-        .unwrap();
-
-        // The diff now reflects the changes to the new file
-        cx.executor().advance_clock(RECALCULATE_DIFF_DEBOUNCE);
-        assert_state_with_diff(
-            &diff_view.read_with(cx, |diff_view, _| diff_view.editor.clone()),
-            cx,
-            &unindent(
-                "
-                - old line 1
-                + ˇnew line 1
-                  line 2
-                - old line 3
-                + new line 3
-                  line 4
-                + new line 5
-                ",
-            ),
-        );
-
-        // Modify the old file on disk
-        fs.save(
-            path!("/test/old_file.txt").as_ref(),
-            &unindent(
-                "
-                new line 1
-                line 2
-                old line 3
-                line 4
-                ",
-            )
-            .into(),
-            Default::default(),
-        )
-        .await
-        .unwrap();
-
-        // The diff now reflects the changes to the new file
-        cx.executor().advance_clock(RECALCULATE_DIFF_DEBOUNCE);
-        assert_state_with_diff(
-            &diff_view.read_with(cx, |diff_view, _| diff_view.editor.clone()),
-            cx,
-            &unindent(
-                "
-                  ˇnew line 1
-                  line 2
-                - old line 3
-                + new line 3
-                  line 4
-                + new line 5
-                ",
-            ),
-        );
-
-        diff_view.read_with(cx, |diff_view, cx| {
-            assert_eq!(
-                diff_view.tab_content_text(0, cx),
-                "old_file.txt ↔ new_file.txt"
-            );
-            assert_eq!(
-                diff_view.tab_tooltip_text(cx).unwrap(),
-                format!(
-                    "{} ↔ {}",
-                    path!("test/old_file.txt"),
-                    path!("test/new_file.txt")
-                )
-            );
-        })
-    }
-
-    #[gpui::test]
-    async fn test_save_changes_in_diff_view(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/test"),
-            serde_json::json!({
-                "old_file.txt": "old line 1\nline 2\nold line 3\nline 4\n",
-                "new_file.txt": "new line 1\nline 2\nnew line 3\nline 4\n"
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs.clone(), ["/test".as_ref()], cx).await;
-
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-        let diff_view = workspace
-            .update_in(cx, |workspace, window, cx| {
-                FileDiffView::open(
-                    PathBuf::from(path!("/test/old_file.txt")),
-                    PathBuf::from(path!("/test/new_file.txt")),
-                    workspace,
-                    window,
-                    cx,
-                )
-            })
-            .await
-            .unwrap();
-
-        diff_view.update_in(cx, |diff_view, window, cx| {
-            diff_view.editor.update(cx, |editor, cx| {
-                editor.insert("modified ", window, cx);
-            });
-        });
-
-        diff_view.update_in(cx, |diff_view, _, cx| {
-            let buffer = diff_view.new_buffer.read(cx);
-            assert!(buffer.is_dirty(), "Buffer should be dirty after edits");
-        });
-
-        let save_task = diff_view.update_in(cx, |diff_view, window, cx| {
-            workspace::Item::save(
-                diff_view,
-                workspace::item::SaveOptions::default(),
-                project.clone(),
-                window,
-                cx,
-            )
-        });
-
-        save_task.await.expect("Save should succeed");
-
-        let saved_content = fs.load(path!("/test/new_file.txt").as_ref()).await.unwrap();
-        assert_eq!(
-            saved_content,
-            "modified new line 1\nline 2\nnew line 3\nline 4\n"
-        );
-
-        diff_view.update_in(cx, |diff_view, _, cx| {
-            let buffer = diff_view.new_buffer.read(cx);
-            assert!(!buffer.is_dirty(), "Buffer should not be dirty after save");
-        });
-    }
-}
diff --git a/crates/git_ui/src/file_history_view.rs b/crates/git_ui/src/file_history_view.rs
deleted file mode 100644
index 5b3588d296..0000000000
--- a/crates/git_ui/src/file_history_view.rs
+++ /dev/null
@@ -1,588 +0,0 @@
-use anyhow::Result;
-use futures::Future;
-use git::repository::{FileHistory, FileHistoryEntry, RepoPath};
-use git::{GitHostingProviderRegistry, GitRemote, parse_git_remote_url};
-use gpui::{
-    AnyElement, AnyEntity, App, Asset, Context, Entity, EventEmitter, FocusHandle, Focusable,
-    IntoElement, Render, Task, UniformListScrollHandle, WeakEntity, Window, actions, uniform_list,
-};
-use project::{
-    Project, ProjectPath,
-    git_store::{GitStore, Repository},
-};
-use std::any::{Any, TypeId};
-
-use time::OffsetDateTime;
-use ui::{Avatar, Chip, Divider, ListItem, WithScrollbar, prelude::*};
-use util::ResultExt;
-use workspace::{
-    Item, Workspace,
-    item::{ItemEvent, SaveOptions},
-};
-
-use crate::commit_view::CommitView;
-
-actions!(git, [ViewCommitFromHistory, LoadMoreHistory]);
-
-pub fn init(cx: &mut App) {
-    cx.observe_new(|workspace: &mut Workspace, _window, _cx| {
-        workspace.register_action(|_workspace, _: &ViewCommitFromHistory, _window, _cx| {});
-        workspace.register_action(|_workspace, _: &LoadMoreHistory, _window, _cx| {});
-    })
-    .detach();
-}
-
-const PAGE_SIZE: usize = 50;
-
-pub struct FileHistoryView {
-    history: FileHistory,
-    repository: WeakEntity<Repository>,
-    git_store: WeakEntity<GitStore>,
-    workspace: WeakEntity<Workspace>,
-    remote: Option<GitRemote>,
-    selected_entry: Option<usize>,
-    scroll_handle: UniformListScrollHandle,
-    focus_handle: FocusHandle,
-    loading_more: bool,
-    has_more: bool,
-}
-
-impl FileHistoryView {
-    pub fn open(
-        path: RepoPath,
-        git_store: WeakEntity<GitStore>,
-        repo: WeakEntity<Repository>,
-        workspace: WeakEntity<Workspace>,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        let file_history_task = git_store
-            .update(cx, |git_store, cx| {
-                repo.upgrade().map(|repo| {
-                    git_store.file_history_paginated(&repo, path.clone(), 0, Some(PAGE_SIZE), cx)
-                })
-            })
-            .ok()
-            .flatten();
-
-        window
-            .spawn(cx, async move |cx| {
-                let file_history = file_history_task?.await.log_err()?;
-                let repo = repo.upgrade()?;
-
-                workspace
-                    .update_in(cx, |workspace, window, cx| {
-                        let project = workspace.project();
-                        let view = cx.new(|cx| {
-                            FileHistoryView::new(
-                                file_history,
-                                git_store.clone(),
-                                repo.clone(),
-                                workspace.weak_handle(),
-                                project.clone(),
-                                window,
-                                cx,
-                            )
-                        });
-
-                        let pane = workspace.active_pane();
-                        pane.update(cx, |pane, cx| {
-                            let ix = pane.items().position(|item| {
-                                let view = item.downcast::<FileHistoryView>();
-                                view.is_some_and(|v| v.read(cx).history.path == path)
-                            });
-                            if let Some(ix) = ix {
-                                pane.activate_item(ix, true, true, window, cx);
-                            } else {
-                                pane.add_item(Box::new(view), true, true, None, window, cx);
-                            }
-                        })
-                    })
-                    .log_err()
-            })
-            .detach();
-    }
-
-    fn new(
-        history: FileHistory,
-        git_store: WeakEntity<GitStore>,
-        repository: Entity<Repository>,
-        workspace: WeakEntity<Workspace>,
-        _project: Entity<Project>,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let focus_handle = cx.focus_handle();
-        let scroll_handle = UniformListScrollHandle::new();
-        let has_more = history.entries.len() >= PAGE_SIZE;
-
-        let snapshot = repository.read(cx).snapshot();
-        let remote_url = snapshot
-            .remote_upstream_url
-            .as_ref()
-            .or(snapshot.remote_origin_url.as_ref());
-
-        let remote = remote_url.and_then(|url| {
-            let provider_registry = GitHostingProviderRegistry::default_global(cx);
-            parse_git_remote_url(provider_registry, url).map(|(host, parsed)| GitRemote {
-                host,
-                owner: parsed.owner.into(),
-                repo: parsed.repo.into(),
-            })
-        });
-
-        Self {
-            history,
-            git_store,
-            repository: repository.downgrade(),
-            workspace,
-            remote,
-            selected_entry: None,
-            scroll_handle,
-            focus_handle,
-            loading_more: false,
-            has_more,
-        }
-    }
-
-    fn load_more(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if self.loading_more || !self.has_more {
-            return;
-        }
-
-        self.loading_more = true;
-        cx.notify();
-
-        let current_count = self.history.entries.len();
-        let path = self.history.path.clone();
-        let git_store = self.git_store.clone();
-        let repo = self.repository.clone();
-
-        let this = cx.weak_entity();
-        let task = window.spawn(cx, async move |cx| {
-            let file_history_task = git_store
-                .update(cx, |git_store, cx| {
-                    repo.upgrade().map(|repo| {
-                        git_store.file_history_paginated(
-                            &repo,
-                            path,
-                            current_count,
-                            Some(PAGE_SIZE),
-                            cx,
-                        )
-                    })
-                })
-                .ok()
-                .flatten();
-
-            if let Some(task) = file_history_task {
-                if let Ok(more_history) = task.await {
-                    this.update(cx, |this, cx| {
-                        this.loading_more = false;
-                        this.has_more = more_history.entries.len() >= PAGE_SIZE;
-                        this.history.entries.extend(more_history.entries);
-                        cx.notify();
-                    })
-                    .ok();
-                }
-            }
-        });
-
-        task.detach();
-    }
-
-    fn render_commit_avatar(
-        &self,
-        sha: &SharedString,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> impl IntoElement {
-        let remote = self.remote.as_ref().filter(|r| r.host_supports_avatars());
-        let size = rems_from_px(20.);
-
-        if let Some(remote) = remote {
-            let avatar_asset = CommitAvatarAsset::new(remote.clone(), sha.clone());
-            if let Some(Some(url)) = window.use_asset::<CommitAvatarAsset>(&avatar_asset, cx) {
-                Avatar::new(url.to_string()).size(size)
-            } else {
-                Avatar::new("").size(size)
-            }
-        } else {
-            Avatar::new("").size(size)
-        }
-    }
-
-    fn render_commit_entry(
-        &self,
-        ix: usize,
-        entry: &FileHistoryEntry,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> AnyElement {
-        let pr_number = entry
-            .subject
-            .rfind("(#")
-            .and_then(|start| {
-                let rest = &entry.subject[start + 2..];
-                rest.find(')')
-                    .and_then(|end| rest[..end].parse::<u32>().ok())
-            })
-            .map(|num| format!("#{}", num))
-            .unwrap_or_else(|| {
-                if entry.sha.len() >= 7 {
-                    entry.sha[..7].to_string()
-                } else {
-                    entry.sha.to_string()
-                }
-            });
-
-        let commit_time = OffsetDateTime::from_unix_timestamp(entry.commit_timestamp)
-            .unwrap_or_else(|_| OffsetDateTime::UNIX_EPOCH);
-        let relative_timestamp = time_format::format_localized_timestamp(
-            commit_time,
-            OffsetDateTime::now_utc(),
-            time::UtcOffset::current_local_offset().unwrap_or(time::UtcOffset::UTC),
-            time_format::TimestampFormat::Relative,
-        );
-
-        let sha = entry.sha.clone();
-        let repo = self.repository.clone();
-        let workspace = self.workspace.clone();
-        let file_path = self.history.path.clone();
-
-        ListItem::new(("commit", ix))
-            .child(
-                h_flex()
-                    .h_8()
-                    .w_full()
-                    .pl_0p5()
-                    .pr_2p5()
-                    .gap_2()
-                    .child(
-                        div()
-                            .w(rems_from_px(52.))
-                            .flex_none()
-                            .child(Chip::new(pr_number)),
-                    )
-                    .child(self.render_commit_avatar(&entry.sha, window, cx))
-                    .child(
-                        h_flex()
-                            .min_w_0()
-                            .w_full()
-                            .justify_between()
-                            .child(
-                                h_flex()
-                                    .min_w_0()
-                                    .w_full()
-                                    .gap_1()
-                                    .child(
-                                        Label::new(entry.author_name.clone())
-                                            .size(LabelSize::Small)
-                                            .color(Color::Default)
-                                            .truncate(),
-                                    )
-                                    .child(
-                                        Label::new(&entry.subject)
-                                            .size(LabelSize::Small)
-                                            .color(Color::Muted)
-                                            .truncate(),
-                                    ),
-                            )
-                            .child(
-                                h_flex().flex_none().child(
-                                    Label::new(relative_timestamp)
-                                        .size(LabelSize::Small)
-                                        .color(Color::Muted),
-                                ),
-                            ),
-                    ),
-            )
-            .on_click(cx.listener(move |this, _, window, cx| {
-                this.selected_entry = Some(ix);
-                cx.notify();
-
-                if let Some(repo) = repo.upgrade() {
-                    let sha_str = sha.to_string();
-                    CommitView::open(
-                        sha_str,
-                        repo.downgrade(),
-                        workspace.clone(),
-                        None,
-                        Some(file_path.clone()),
-                        window,
-                        cx,
-                    );
-                }
-            }))
-            .into_any_element()
-    }
-}
-
-#[derive(Clone, Debug)]
-struct CommitAvatarAsset {
-    sha: SharedString,
-    remote: GitRemote,
-}
-
-impl std::hash::Hash for CommitAvatarAsset {
-    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-        self.sha.hash(state);
-        self.remote.host.name().hash(state);
-    }
-}
-
-impl CommitAvatarAsset {
-    fn new(remote: GitRemote, sha: SharedString) -> Self {
-        Self { remote, sha }
-    }
-}
-
-impl Asset for CommitAvatarAsset {
-    type Source = Self;
-    type Output = Option<SharedString>;
-
-    fn load(
-        source: Self::Source,
-        cx: &mut App,
-    ) -> impl Future<Output = Self::Output> + Send + 'static {
-        let client = cx.http_client();
-        async move {
-            match source
-                .remote
-                .host
-                .commit_author_avatar_url(
-                    &source.remote.owner,
-                    &source.remote.repo,
-                    source.sha.clone(),
-                    client,
-                )
-                .await
-            {
-                Ok(Some(url)) => Some(SharedString::from(url.to_string())),
-                Ok(None) => None,
-                Err(_) => None,
-            }
-        }
-    }
-}
-
-impl EventEmitter<ItemEvent> for FileHistoryView {}
-
-impl Focusable for FileHistoryView {
-    fn focus_handle(&self, _cx: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl Render for FileHistoryView {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let _file_name = self.history.path.file_name().unwrap_or("File");
-        let entry_count = self.history.entries.len();
-
-        v_flex()
-            .size_full()
-            .bg(cx.theme().colors().editor_background)
-            .child(
-                h_flex()
-                    .h(rems_from_px(41.))
-                    .pl_3()
-                    .pr_2()
-                    .justify_between()
-                    .border_b_1()
-                    .border_color(cx.theme().colors().border_variant)
-                    .child(
-                        Label::new(self.history.path.as_unix_str().to_string())
-                            .color(Color::Muted)
-                            .buffer_font(cx),
-                    )
-                    .child(
-                        h_flex()
-                            .gap_1p5()
-                            .child(
-                                Label::new(format!("{} commits", entry_count))
-                                    .size(LabelSize::Small)
-                                    .color(Color::Muted)
-                                    .when(self.has_more, |this| this.mr_1()),
-                            )
-                            .when(self.has_more, |this| {
-                                this.child(Divider::vertical()).child(
-                                    Button::new("load-more", "Load More")
-                                        .disabled(self.loading_more)
-                                        .label_size(LabelSize::Small)
-                                        .icon(IconName::ArrowCircle)
-                                        .icon_size(IconSize::Small)
-                                        .icon_color(Color::Muted)
-                                        .icon_position(IconPosition::Start)
-                                        .on_click(cx.listener(|this, _, window, cx| {
-                                            this.load_more(window, cx);
-                                        })),
-                                )
-                            }),
-                    ),
-            )
-            .child(
-                v_flex()
-                    .flex_1()
-                    .size_full()
-                    .child({
-                        let view = cx.weak_entity();
-                        uniform_list(
-                            "file-history-list",
-                            entry_count,
-                            move |range, window, cx| {
-                                let Some(view) = view.upgrade() else {
-                                    return Vec::new();
-                                };
-                                view.update(cx, |this, cx| {
-                                    let mut items = Vec::with_capacity(range.end - range.start);
-                                    for ix in range {
-                                        if let Some(entry) = this.history.entries.get(ix) {
-                                            items.push(
-                                                this.render_commit_entry(ix, entry, window, cx),
-                                            );
-                                        }
-                                    }
-                                    items
-                                })
-                            },
-                        )
-                        .flex_1()
-                        .size_full()
-                        .track_scroll(&self.scroll_handle)
-                    })
-                    .vertical_scrollbar_for(&self.scroll_handle, window, cx),
-            )
-    }
-}
-
-impl Item for FileHistoryView {
-    type Event = ItemEvent;
-
-    fn to_item_events(event: &Self::Event, mut f: impl FnMut(ItemEvent)) {
-        f(*event)
-    }
-
-    fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString {
-        let file_name = self
-            .history
-            .path
-            .file_name()
-            .map(|name| name.to_string())
-            .unwrap_or_else(|| "File".to_string());
-        format!("History: {}", file_name).into()
-    }
-
-    fn tab_tooltip_text(&self, _cx: &App) -> Option<SharedString> {
-        Some(format!("Git history for {}", self.history.path.as_unix_str()).into())
-    }
-
-    fn tab_icon(&self, _window: &Window, _cx: &App) -> Option<Icon> {
-        Some(Icon::new(IconName::GitBranch))
-    }
-
-    fn telemetry_event_text(&self) -> Option<&'static str> {
-        Some("file history")
-    }
-
-    fn clone_on_split(
-        &self,
-        _workspace_id: Option<workspace::WorkspaceId>,
-        _window: &mut Window,
-        _cx: &mut Context<Self>,
-    ) -> Task<Option<Entity<Self>>> {
-        Task::ready(None)
-    }
-
-    fn navigate(&mut self, _: Box<dyn Any>, _window: &mut Window, _: &mut Context<Self>) -> bool {
-        false
-    }
-
-    fn deactivated(&mut self, _window: &mut Window, _: &mut Context<Self>) {}
-
-    fn can_save(&self, _: &App) -> bool {
-        false
-    }
-
-    fn save(
-        &mut self,
-        _options: SaveOptions,
-        _project: Entity<Project>,
-        _window: &mut Window,
-        _: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        Task::ready(Ok(()))
-    }
-
-    fn save_as(
-        &mut self,
-        _project: Entity<Project>,
-        _path: ProjectPath,
-        _window: &mut Window,
-        _: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        Task::ready(Ok(()))
-    }
-
-    fn reload(
-        &mut self,
-        _project: Entity<Project>,
-        _window: &mut Window,
-        _: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        Task::ready(Ok(()))
-    }
-
-    fn is_dirty(&self, _: &App) -> bool {
-        false
-    }
-
-    fn has_conflict(&self, _: &App) -> bool {
-        false
-    }
-
-    fn breadcrumbs(
-        &self,
-        _theme: &theme::Theme,
-        _cx: &App,
-    ) -> Option<Vec<workspace::item::BreadcrumbText>> {
-        None
-    }
-
-    fn added_to_workspace(
-        &mut self,
-        _workspace: &mut Workspace,
-        window: &mut Window,
-        _cx: &mut Context<Self>,
-    ) {
-        window.focus(&self.focus_handle);
-    }
-
-    fn show_toolbar(&self) -> bool {
-        true
-    }
-
-    fn pixel_position_of_cursor(&self, _: &App) -> Option<gpui::Point<gpui::Pixels>> {
-        None
-    }
-
-    fn set_nav_history(
-        &mut self,
-        _: workspace::ItemNavHistory,
-        _window: &mut Window,
-        _: &mut Context<Self>,
-    ) {
-    }
-
-    fn act_as_type<'a>(
-        &'a self,
-        type_id: TypeId,
-        self_handle: &'a Entity<Self>,
-        _: &'a App,
-    ) -> Option<AnyEntity> {
-        if type_id == TypeId::of::<Self>() {
-            Some(self_handle.clone().into())
-        } else {
-            None
-        }
-    }
-}
diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
deleted file mode 100644
index 81d2a547bf..0000000000
--- a/crates/git_ui/src/git_panel.rs
+++ /dev/null
@@ -1,7008 +0,0 @@
-use crate::askpass_modal::AskPassModal;
-use crate::commit_modal::CommitModal;
-use crate::commit_tooltip::CommitTooltip;
-use crate::commit_view::CommitView;
-use crate::project_diff::{self, Diff, ProjectDiff};
-use crate::remote_output::{self, RemoteAction, SuccessMessage};
-use crate::{branch_picker, picker_prompt, render_remote_button};
-use crate::{
-    file_history_view::FileHistoryView, git_panel_settings::GitPanelSettings, git_status_icon,
-    repository_selector::RepositorySelector,
-};
-use agent_settings::AgentSettings;
-use anyhow::Context as _;
-use askpass::AskPassDelegate;
-use cloud_llm_client::CompletionIntent;
-use collections::{BTreeMap, HashMap, HashSet};
-use db::kvp::KEY_VALUE_STORE;
-use editor::{
-    Direction, Editor, EditorElement, EditorMode, MultiBuffer, MultiBufferOffset,
-    actions::ExpandAllDiffHunks,
-};
-use futures::StreamExt as _;
-use git::blame::ParsedCommitMessage;
-use git::repository::{
-    Branch, CommitDetails, CommitOptions, CommitSummary, DiffType, FetchOptions, GitCommitter,
-    PushOptions, Remote, RemoteCommandOutput, ResetMode, Upstream, UpstreamTracking,
-    UpstreamTrackingStatus, get_git_committer,
-};
-use git::stash::GitStash;
-use git::status::StageStatus;
-use git::{Amend, Signoff, ToggleStaged, repository::RepoPath, status::FileStatus};
-use git::{
-    ExpandCommitEditor, RestoreTrackedFiles, StageAll, StashAll, StashApply, StashPop,
-    TrashUntrackedFiles, UnstageAll,
-};
-use gpui::{
-    Action, AsyncApp, AsyncWindowContext, Bounds, ClickEvent, Corner, DismissEvent, Entity,
-    EventEmitter, FocusHandle, Focusable, KeyContext, ListHorizontalSizingBehavior,
-    ListSizingBehavior, MouseButton, MouseDownEvent, Point, PromptLevel, ScrollStrategy,
-    Subscription, Task, UniformListScrollHandle, WeakEntity, actions, anchored, deferred, point,
-    size, uniform_list,
-};
-use itertools::Itertools;
-use language::{Buffer, File};
-use language_model::{
-    ConfiguredModel, LanguageModelRegistry, LanguageModelRequest, LanguageModelRequestMessage, Role,
-};
-use menu::{Confirm, SecondaryConfirm, SelectFirst, SelectLast, SelectNext, SelectPrevious};
-use multi_buffer::ExcerptInfo;
-use notifications::status_toast::{StatusToast, ToastIcon};
-use panel::{
-    PanelHeader, panel_button, panel_editor_container, panel_editor_style, panel_filled_button,
-    panel_icon_button,
-};
-use project::{
-    Fs, Project, ProjectPath,
-    git_store::{GitStoreEvent, Repository, RepositoryEvent, RepositoryId, pending_op},
-    project_settings::{GitPathStyle, ProjectSettings},
-};
-use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsStore, StatusStyle};
-use std::future::Future;
-use std::ops::Range;
-use std::path::Path;
-use std::{sync::Arc, time::Duration, usize};
-use strum::{IntoEnumIterator, VariantNames};
-use time::OffsetDateTime;
-use ui::{
-    ButtonLike, Checkbox, CommonAnimationExt, ContextMenu, ElevationIndex, IndentGuideColors,
-    PopoverMenu, RenderedIndentGuide, ScrollAxes, Scrollbars, SplitButton, Tooltip, WithScrollbar,
-    prelude::*,
-};
-use util::paths::PathStyle;
-use util::{ResultExt, TryFutureExt, maybe};
-use workspace::SERIALIZATION_THROTTLE_TIME;
-use workspace::{
-    Workspace,
-    dock::{DockPosition, Panel, PanelEvent},
-    notifications::{DetachAndPromptErr, ErrorMessagePrompt, NotificationId, NotifyResultExt},
-};
-actions!(
-    git_panel,
-    [
-        /// Closes the git panel.
-        Close,
-        /// Toggles focus on the git panel.
-        ToggleFocus,
-        /// Opens the git panel menu.
-        OpenMenu,
-        /// Focuses on the commit message editor.
-        FocusEditor,
-        /// Focuses on the changes list.
-        FocusChanges,
-        /// Toggles automatic co-author suggestions.
-        ToggleFillCoAuthors,
-        /// Toggles sorting entries by path vs status.
-        ToggleSortByPath,
-        /// Toggles showing entries in tree vs flat view.
-        ToggleTreeView,
-    ]
-);
-
-fn prompt<T>(
-    msg: &str,
-    detail: Option<&str>,
-    window: &mut Window,
-    cx: &mut App,
-) -> Task<anyhow::Result<T>>
-where
-    T: IntoEnumIterator + VariantNames + 'static,
-{
-    let rx = window.prompt(PromptLevel::Info, msg, detail, T::VARIANTS, cx);
-    cx.spawn(async move |_| Ok(T::iter().nth(rx.await?).unwrap()))
-}
-
-#[derive(strum::EnumIter, strum::VariantNames)]
-#[strum(serialize_all = "title_case")]
-enum TrashCancel {
-    Trash,
-    Cancel,
-}
-
-struct GitMenuState {
-    has_tracked_changes: bool,
-    has_staged_changes: bool,
-    has_unstaged_changes: bool,
-    has_new_changes: bool,
-    sort_by_path: bool,
-    has_stash_items: bool,
-    tree_view: bool,
-}
-
-fn git_panel_context_menu(
-    focus_handle: FocusHandle,
-    state: GitMenuState,
-    window: &mut Window,
-    cx: &mut App,
-) -> Entity<ContextMenu> {
-    ContextMenu::build(window, cx, move |context_menu, _, _| {
-        context_menu
-            .context(focus_handle)
-            .action_disabled_when(
-                !state.has_unstaged_changes,
-                "Stage All",
-                StageAll.boxed_clone(),
-            )
-            .action_disabled_when(
-                !state.has_staged_changes,
-                "Unstage All",
-                UnstageAll.boxed_clone(),
-            )
-            .separator()
-            .action_disabled_when(
-                !(state.has_new_changes || state.has_tracked_changes),
-                "Stash All",
-                StashAll.boxed_clone(),
-            )
-            .action_disabled_when(!state.has_stash_items, "Stash Pop", StashPop.boxed_clone())
-            .action("View Stash", zed_actions::git::ViewStash.boxed_clone())
-            .separator()
-            .action("Open Diff", project_diff::Diff.boxed_clone())
-            .separator()
-            .action_disabled_when(
-                !state.has_tracked_changes,
-                "Discard Tracked Changes",
-                RestoreTrackedFiles.boxed_clone(),
-            )
-            .action_disabled_when(
-                !state.has_new_changes,
-                "Trash Untracked Files",
-                TrashUntrackedFiles.boxed_clone(),
-            )
-            .separator()
-            .entry(
-                if state.tree_view {
-                    "Flat View"
-                } else {
-                    "Tree View"
-                },
-                Some(Box::new(ToggleTreeView)),
-                move |window, cx| window.dispatch_action(Box::new(ToggleTreeView), cx),
-            )
-            .when(!state.tree_view, |this| {
-                this.entry(
-                    if state.sort_by_path {
-                        "Sort by Status"
-                    } else {
-                        "Sort by Path"
-                    },
-                    Some(Box::new(ToggleSortByPath)),
-                    move |window, cx| window.dispatch_action(Box::new(ToggleSortByPath), cx),
-                )
-            })
-    })
-}
-
-const GIT_PANEL_KEY: &str = "GitPanel";
-
-const UPDATE_DEBOUNCE: Duration = Duration::from_millis(50);
-// TODO: We should revise this part. It seems the indentation width is not aligned with the one in project panel
-const TREE_INDENT: f32 = 12.0;
-const TREE_INDENT_GUIDE_OFFSET: f32 = 16.0;
-
-pub fn register(workspace: &mut Workspace) {
-    workspace.register_action(|workspace, _: &ToggleFocus, window, cx| {
-        workspace.toggle_panel_focus::<GitPanel>(window, cx);
-    });
-    workspace.register_action(|workspace, _: &ExpandCommitEditor, window, cx| {
-        CommitModal::toggle(workspace, None, window, cx)
-    });
-}
-
-#[derive(Debug, Clone)]
-pub enum Event {
-    Focus,
-}
-
-#[derive(Serialize, Deserialize)]
-struct SerializedGitPanel {
-    width: Option<Pixels>,
-    #[serde(default)]
-    amend_pending: bool,
-    #[serde(default)]
-    signoff_enabled: bool,
-}
-
-#[derive(Debug, PartialEq, Eq, Clone, Copy, Hash)]
-enum Section {
-    Conflict,
-    Tracked,
-    New,
-}
-
-#[derive(Debug, PartialEq, Eq, Clone)]
-struct GitHeaderEntry {
-    header: Section,
-}
-
-impl GitHeaderEntry {
-    pub fn contains(&self, status_entry: &GitStatusEntry, repo: &Repository) -> bool {
-        let this = &self.header;
-        let status = status_entry.status;
-        match this {
-            Section::Conflict => {
-                repo.had_conflict_on_last_merge_head_change(&status_entry.repo_path)
-            }
-            Section::Tracked => !status.is_created(),
-            Section::New => status.is_created(),
-        }
-    }
-    pub fn title(&self) -> &'static str {
-        match self.header {
-            Section::Conflict => "Conflicts",
-            Section::Tracked => "Tracked",
-            Section::New => "Untracked",
-        }
-    }
-}
-
-#[derive(Debug, PartialEq, Eq, Clone)]
-enum GitListEntry {
-    Status(GitStatusEntry),
-    TreeStatus(GitTreeStatusEntry),
-    Directory(GitTreeDirEntry),
-    Header(GitHeaderEntry),
-}
-
-impl GitListEntry {
-    fn status_entry(&self) -> Option<&GitStatusEntry> {
-        match self {
-            GitListEntry::Status(entry) => Some(entry),
-            GitListEntry::TreeStatus(entry) => Some(&entry.entry),
-            _ => None,
-        }
-    }
-}
-
-enum GitPanelViewMode {
-    Flat,
-    Tree(TreeViewState),
-}
-
-impl GitPanelViewMode {
-    fn from_settings(cx: &App) -> Self {
-        if GitPanelSettings::get_global(cx).tree_view {
-            GitPanelViewMode::Tree(TreeViewState::default())
-        } else {
-            GitPanelViewMode::Flat
-        }
-    }
-
-    fn tree_state(&self) -> Option<&TreeViewState> {
-        match self {
-            GitPanelViewMode::Tree(state) => Some(state),
-            GitPanelViewMode::Flat => None,
-        }
-    }
-
-    fn tree_state_mut(&mut self) -> Option<&mut TreeViewState> {
-        match self {
-            GitPanelViewMode::Tree(state) => Some(state),
-            GitPanelViewMode::Flat => None,
-        }
-    }
-}
-
-#[derive(Default)]
-struct TreeViewState {
-    // Maps visible index to actual entry index.
-    // Length equals the number of visible entries.
-    // This is needed because some entries (like collapsed directories) may be hidden.
-    logical_indices: Vec<usize>,
-    expanded_dirs: HashMap<TreeKey, bool>,
-    directory_descendants: HashMap<TreeKey, Vec<GitStatusEntry>>,
-}
-
-impl TreeViewState {
-    fn build_tree_entries(
-        &mut self,
-        section: Section,
-        mut entries: Vec<GitStatusEntry>,
-        repo: &Repository,
-        seen_directories: &mut HashSet<TreeKey>,
-        optimistic_staging: &HashMap<RepoPath, bool>,
-    ) -> Vec<(GitListEntry, bool)> {
-        if entries.is_empty() {
-            return Vec::new();
-        }
-
-        entries.sort_by(|a, b| a.repo_path.cmp(&b.repo_path));
-
-        let mut root = TreeNode::default();
-        for entry in entries {
-            let components: Vec<&str> = entry.repo_path.components().collect();
-            if components.is_empty() {
-                root.files.push(entry);
-                continue;
-            }
-
-            let mut current = &mut root;
-            let mut current_path = String::new();
-
-            for (ix, component) in components.iter().enumerate() {
-                if ix == components.len() - 1 {
-                    current.files.push(entry.clone());
-                } else {
-                    if !current_path.is_empty() {
-                        current_path.push('/');
-                    }
-                    current_path.push_str(component);
-                    let dir_path = RepoPath::new(&current_path)
-                        .expect("repo path from status entry component");
-
-                    let component = SharedString::from(component.to_string());
-
-                    current = current
-                        .children
-                        .entry(component.clone())
-                        .or_insert_with(|| TreeNode {
-                            name: component,
-                            path: Some(dir_path),
-                            ..Default::default()
-                        });
-                }
-            }
-        }
-
-        let (flattened, _) = self.flatten_tree(
-            &root,
-            section,
-            0,
-            repo,
-            seen_directories,
-            optimistic_staging,
-        );
-        flattened
-    }
-
-    fn flatten_tree(
-        &mut self,
-        node: &TreeNode,
-        section: Section,
-        depth: usize,
-        repo: &Repository,
-        seen_directories: &mut HashSet<TreeKey>,
-        optimistic_staging: &HashMap<RepoPath, bool>,
-    ) -> (Vec<(GitListEntry, bool)>, Vec<GitStatusEntry>) {
-        let mut all_statuses = Vec::new();
-        let mut flattened = Vec::new();
-
-        for child in node.children.values() {
-            let (terminal, name) = Self::compact_directory_chain(child);
-            let Some(path) = terminal.path.clone().or_else(|| child.path.clone()) else {
-                continue;
-            };
-            let (child_flattened, mut child_statuses) = self.flatten_tree(
-                terminal,
-                section,
-                depth + 1,
-                repo,
-                seen_directories,
-                optimistic_staging,
-            );
-            let key = TreeKey { section, path };
-            let expanded = *self.expanded_dirs.get(&key).unwrap_or(&true);
-            self.expanded_dirs.entry(key.clone()).or_insert(true);
-            seen_directories.insert(key.clone());
-
-            let staged_count = child_statuses
-                .iter()
-                .filter(|entry| Self::is_entry_staged(entry, repo, optimistic_staging))
-                .count();
-            let staged_state =
-                GitPanel::toggle_state_for_counts(staged_count, child_statuses.len());
-
-            self.directory_descendants
-                .insert(key.clone(), child_statuses.clone());
-
-            flattened.push((
-                GitListEntry::Directory(GitTreeDirEntry {
-                    key,
-                    name,
-                    depth,
-                    staged_state,
-                    expanded,
-                }),
-                true,
-            ));
-
-            if expanded {
-                flattened.extend(child_flattened);
-            } else {
-                flattened.extend(child_flattened.into_iter().map(|(child, _)| (child, false)));
-            }
-
-            all_statuses.append(&mut child_statuses);
-        }
-
-        for file in &node.files {
-            all_statuses.push(file.clone());
-            flattened.push((
-                GitListEntry::TreeStatus(GitTreeStatusEntry {
-                    entry: file.clone(),
-                    depth,
-                }),
-                true,
-            ));
-        }
-
-        (flattened, all_statuses)
-    }
-
-    fn compact_directory_chain(mut node: &TreeNode) -> (&TreeNode, SharedString) {
-        let mut parts = vec![node.name.clone()];
-        while node.files.is_empty() && node.children.len() == 1 {
-            let Some(child) = node.children.values().next() else {
-                continue;
-            };
-            if child.path.is_none() {
-                break;
-            }
-            parts.push(child.name.clone());
-            node = child;
-        }
-        let name = parts.join("/");
-        (node, SharedString::from(name))
-    }
-
-    fn is_entry_staged(
-        entry: &GitStatusEntry,
-        repo: &Repository,
-        optimistic_staging: &HashMap<RepoPath, bool>,
-    ) -> bool {
-        if let Some(optimistic) = optimistic_staging.get(&entry.repo_path) {
-            return *optimistic;
-        }
-        repo.pending_ops_for_path(&entry.repo_path)
-            .map(|ops| ops.staging() || ops.staged())
-            .or_else(|| {
-                repo.status_for_path(&entry.repo_path)
-                    .and_then(|status| status.status.staging().as_bool())
-            })
-            .unwrap_or(entry.staging.has_staged())
-    }
-}
-
-#[derive(Debug, PartialEq, Eq, Clone)]
-struct GitTreeStatusEntry {
-    entry: GitStatusEntry,
-    depth: usize,
-}
-
-#[derive(Debug, PartialEq, Eq, Clone, Hash)]
-struct TreeKey {
-    section: Section,
-    path: RepoPath,
-}
-
-#[derive(Debug, PartialEq, Eq, Clone)]
-struct GitTreeDirEntry {
-    key: TreeKey,
-    name: SharedString,
-    depth: usize,
-    staged_state: ToggleState,
-    expanded: bool,
-}
-
-#[derive(Default)]
-struct TreeNode {
-    name: SharedString,
-    path: Option<RepoPath>,
-    children: BTreeMap<SharedString, TreeNode>,
-    files: Vec<GitStatusEntry>,
-}
-
-#[derive(Debug, PartialEq, Eq, Clone)]
-pub struct GitStatusEntry {
-    pub(crate) repo_path: RepoPath,
-    pub(crate) status: FileStatus,
-    pub(crate) staging: StageStatus,
-}
-
-impl GitStatusEntry {
-    fn display_name(&self, path_style: PathStyle) -> String {
-        self.repo_path
-            .file_name()
-            .map(|name| name.to_owned())
-            .unwrap_or_else(|| self.repo_path.display(path_style).to_string())
-    }
-
-    fn parent_dir(&self, path_style: PathStyle) -> Option<String> {
-        self.repo_path
-            .parent()
-            .map(|parent| parent.display(path_style).to_string())
-    }
-}
-
-struct TruncatedPatch {
-    header: String,
-    hunks: Vec<String>,
-    hunks_to_keep: usize,
-}
-
-impl TruncatedPatch {
-    fn from_unified_diff(patch_str: &str) -> Option<Self> {
-        let lines: Vec<&str> = patch_str.lines().collect();
-        if lines.len() < 2 {
-            return None;
-        }
-        let header = format!("{}\n{}\n", lines[0], lines[1]);
-        let mut hunks = Vec::new();
-        let mut current_hunk = String::new();
-        for line in &lines[2..] {
-            if line.starts_with("@@") {
-                if !current_hunk.is_empty() {
-                    hunks.push(current_hunk);
-                }
-                current_hunk = format!("{}\n", line);
-            } else if !current_hunk.is_empty() {
-                current_hunk.push_str(line);
-                current_hunk.push('\n');
-            }
-        }
-        if !current_hunk.is_empty() {
-            hunks.push(current_hunk);
-        }
-        if hunks.is_empty() {
-            return None;
-        }
-        let hunks_to_keep = hunks.len();
-        Some(TruncatedPatch {
-            header,
-            hunks,
-            hunks_to_keep,
-        })
-    }
-    fn calculate_size(&self) -> usize {
-        let mut size = self.header.len();
-        for (i, hunk) in self.hunks.iter().enumerate() {
-            if i < self.hunks_to_keep {
-                size += hunk.len();
-            }
-        }
-        size
-    }
-    fn to_string(&self) -> String {
-        let mut out = self.header.clone();
-        for (i, hunk) in self.hunks.iter().enumerate() {
-            if i < self.hunks_to_keep {
-                out.push_str(hunk);
-            }
-        }
-        let skipped_hunks = self.hunks.len() - self.hunks_to_keep;
-        if skipped_hunks > 0 {
-            out.push_str(&format!("[...skipped {} hunks...]\n", skipped_hunks));
-        }
-        out
-    }
-}
-
-pub struct GitPanel {
-    pub(crate) active_repository: Option<Entity<Repository>>,
-    pub(crate) commit_editor: Entity<Editor>,
-    conflicted_count: usize,
-    conflicted_staged_count: usize,
-    add_coauthors: bool,
-    generate_commit_message_task: Option<Task<Option<()>>>,
-    entries: Vec<GitListEntry>,
-    view_mode: GitPanelViewMode,
-    entries_indices: HashMap<RepoPath, usize>,
-    single_staged_entry: Option<GitStatusEntry>,
-    single_tracked_entry: Option<GitStatusEntry>,
-    focus_handle: FocusHandle,
-    fs: Arc<dyn Fs>,
-    new_count: usize,
-    entry_count: usize,
-    changes_count: usize,
-    new_staged_count: usize,
-    pending_commit: Option<Task<()>>,
-    amend_pending: bool,
-    original_commit_message: Option<String>,
-    signoff_enabled: bool,
-    pending_serialization: Task<()>,
-    pub(crate) project: Entity<Project>,
-    scroll_handle: UniformListScrollHandle,
-    max_width_item_index: Option<usize>,
-    selected_entry: Option<usize>,
-    marked_entries: Vec<usize>,
-    tracked_count: usize,
-    tracked_staged_count: usize,
-    update_visible_entries_task: Task<()>,
-    width: Option<Pixels>,
-    workspace: WeakEntity<Workspace>,
-    context_menu: Option<(Entity<ContextMenu>, Point<Pixels>, Subscription)>,
-    modal_open: bool,
-    show_placeholders: bool,
-    local_committer: Option<GitCommitter>,
-    local_committer_task: Option<Task<()>>,
-    bulk_staging: Option<BulkStaging>,
-    stash_entries: GitStash,
-    optimistic_staging: HashMap<RepoPath, bool>,
-    _settings_subscription: Subscription,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-struct BulkStaging {
-    repo_id: RepositoryId,
-    anchor: RepoPath,
-}
-
-const MAX_PANEL_EDITOR_LINES: usize = 6;
-
-pub(crate) fn commit_message_editor(
-    commit_message_buffer: Entity<Buffer>,
-    placeholder: Option<SharedString>,
-    project: Entity<Project>,
-    in_panel: bool,
-    window: &mut Window,
-    cx: &mut Context<Editor>,
-) -> Editor {
-    let buffer = cx.new(|cx| MultiBuffer::singleton(commit_message_buffer, cx));
-    let max_lines = if in_panel { MAX_PANEL_EDITOR_LINES } else { 18 };
-    let mut commit_editor = Editor::new(
-        EditorMode::AutoHeight {
-            min_lines: max_lines,
-            max_lines: Some(max_lines),
-        },
-        buffer,
-        None,
-        window,
-        cx,
-    );
-    commit_editor.set_collaboration_hub(Box::new(project));
-    commit_editor.set_use_autoclose(false);
-    commit_editor.set_show_gutter(false, cx);
-    commit_editor.set_use_modal_editing(true);
-    commit_editor.set_show_wrap_guides(false, cx);
-    commit_editor.set_show_indent_guides(false, cx);
-    let placeholder = placeholder.unwrap_or("Enter commit message".into());
-    commit_editor.set_placeholder_text(&placeholder, window, cx);
-    commit_editor
-}
-
-impl GitPanel {
-    fn new(
-        workspace: &mut Workspace,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) -> Entity<Self> {
-        let project = workspace.project().clone();
-        let app_state = workspace.app_state().clone();
-        let fs = app_state.fs.clone();
-        let git_store = project.read(cx).git_store().clone();
-        let active_repository = project.read(cx).active_repository(cx);
-
-        cx.new(|cx| {
-            let focus_handle = cx.focus_handle();
-            cx.on_focus(&focus_handle, window, Self::focus_in).detach();
-
-            let mut was_sort_by_path = GitPanelSettings::get_global(cx).sort_by_path;
-            let mut was_tree_view = GitPanelSettings::get_global(cx).tree_view;
-            cx.observe_global_in::<SettingsStore>(window, move |this, window, cx| {
-                let sort_by_path = GitPanelSettings::get_global(cx).sort_by_path;
-                let tree_view = GitPanelSettings::get_global(cx).tree_view;
-                if tree_view != was_tree_view {
-                    this.view_mode = GitPanelViewMode::from_settings(cx);
-                }
-                if sort_by_path != was_sort_by_path || tree_view != was_tree_view {
-                    this.bulk_staging.take();
-                    this.update_visible_entries(window, cx);
-                }
-                was_sort_by_path = sort_by_path;
-                was_tree_view = tree_view;
-            })
-            .detach();
-
-            // just to let us render a placeholder editor.
-            // Once the active git repo is set, this buffer will be replaced.
-            let temporary_buffer = cx.new(|cx| Buffer::local("", cx));
-            let commit_editor = cx.new(|cx| {
-                commit_message_editor(temporary_buffer, None, project.clone(), true, window, cx)
-            });
-
-            commit_editor.update(cx, |editor, cx| {
-                editor.clear(window, cx);
-            });
-
-            let scroll_handle = UniformListScrollHandle::new();
-
-            let mut was_ai_enabled = AgentSettings::get_global(cx).enabled(cx);
-            let _settings_subscription = cx.observe_global::<SettingsStore>(move |_, cx| {
-                let is_ai_enabled = AgentSettings::get_global(cx).enabled(cx);
-                if was_ai_enabled != is_ai_enabled {
-                    was_ai_enabled = is_ai_enabled;
-                    cx.notify();
-                }
-            });
-
-            cx.subscribe_in(
-                &git_store,
-                window,
-                move |this, _git_store, event, window, cx| match event {
-                    GitStoreEvent::ActiveRepositoryChanged(_) => {
-                        this.active_repository = this.project.read(cx).active_repository(cx);
-                        this.schedule_update(window, cx);
-                    }
-                    GitStoreEvent::RepositoryUpdated(
-                        _,
-                        RepositoryEvent::StatusesChanged
-                        | RepositoryEvent::BranchChanged
-                        | RepositoryEvent::MergeHeadsChanged,
-                        true,
-                    )
-                    | GitStoreEvent::RepositoryAdded
-                    | GitStoreEvent::RepositoryRemoved(_) => {
-                        this.schedule_update(window, cx);
-                    }
-                    GitStoreEvent::IndexWriteError(error) => {
-                        this.workspace
-                            .update(cx, |workspace, cx| {
-                                workspace.show_error(error, cx);
-                            })
-                            .ok();
-                    }
-                    GitStoreEvent::RepositoryUpdated(_, _, _) => {}
-                    GitStoreEvent::JobsUpdated | GitStoreEvent::ConflictsUpdated => {}
-                },
-            )
-            .detach();
-
-            let mut this = Self {
-                active_repository,
-                commit_editor,
-                conflicted_count: 0,
-                conflicted_staged_count: 0,
-                add_coauthors: true,
-                generate_commit_message_task: None,
-                entries: Vec::new(),
-                view_mode: GitPanelViewMode::from_settings(cx),
-                entries_indices: HashMap::default(),
-                focus_handle: cx.focus_handle(),
-                fs,
-                new_count: 0,
-                new_staged_count: 0,
-                changes_count: 0,
-                pending_commit: None,
-                amend_pending: false,
-                original_commit_message: None,
-                signoff_enabled: false,
-                pending_serialization: Task::ready(()),
-                single_staged_entry: None,
-                single_tracked_entry: None,
-                project,
-                scroll_handle,
-                max_width_item_index: None,
-                selected_entry: None,
-                marked_entries: Vec::new(),
-                tracked_count: 0,
-                tracked_staged_count: 0,
-                update_visible_entries_task: Task::ready(()),
-                width: None,
-                show_placeholders: false,
-                local_committer: None,
-                local_committer_task: None,
-                context_menu: None,
-                workspace: workspace.weak_handle(),
-                modal_open: false,
-                entry_count: 0,
-                bulk_staging: None,
-                stash_entries: Default::default(),
-                optimistic_staging: HashMap::default(),
-                _settings_subscription,
-            };
-
-            this.schedule_update(window, cx);
-            this
-        })
-    }
-
-    pub fn entry_by_path(&self, path: &RepoPath) -> Option<usize> {
-        self.entries_indices.get(path).copied()
-    }
-
-    pub fn select_entry_by_path(
-        &mut self,
-        path: ProjectPath,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(git_repo) = self.active_repository.as_ref() else {
-            return;
-        };
-        let Some(repo_path) = git_repo.read(cx).project_path_to_repo_path(&path, cx) else {
-            return;
-        };
-        let Some(ix) = self.entry_by_path(&repo_path) else {
-            return;
-        };
-        self.selected_entry = Some(ix);
-        cx.notify();
-    }
-
-    fn serialization_key(workspace: &Workspace) -> Option<String> {
-        workspace
-            .database_id()
-            .map(|id| i64::from(id).to_string())
-            .or(workspace.session_id())
-            .map(|id| format!("{}-{:?}", GIT_PANEL_KEY, id))
-    }
-
-    fn serialize(&mut self, cx: &mut Context<Self>) {
-        let width = self.width;
-        let amend_pending = self.amend_pending;
-        let signoff_enabled = self.signoff_enabled;
-
-        self.pending_serialization = cx.spawn(async move |git_panel, cx| {
-            cx.background_executor()
-                .timer(SERIALIZATION_THROTTLE_TIME)
-                .await;
-            let Some(serialization_key) = git_panel
-                .update(cx, |git_panel, cx| {
-                    git_panel
-                        .workspace
-                        .read_with(cx, |workspace, _| Self::serialization_key(workspace))
-                        .ok()
-                        .flatten()
-                })
-                .ok()
-                .flatten()
-            else {
-                return;
-            };
-            cx.background_spawn(
-                async move {
-                    KEY_VALUE_STORE
-                        .write_kvp(
-                            serialization_key,
-                            serde_json::to_string(&SerializedGitPanel {
-                                width,
-                                amend_pending,
-                                signoff_enabled,
-                            })?,
-                        )
-                        .await?;
-                    anyhow::Ok(())
-                }
-                .log_err(),
-            )
-            .await;
-        });
-    }
-
-    pub(crate) fn set_modal_open(&mut self, open: bool, cx: &mut Context<Self>) {
-        self.modal_open = open;
-        cx.notify();
-    }
-
-    fn dispatch_context(&self, window: &mut Window, cx: &Context<Self>) -> KeyContext {
-        let mut dispatch_context = KeyContext::new_with_defaults();
-        dispatch_context.add("GitPanel");
-
-        if window
-            .focused(cx)
-            .is_some_and(|focused| self.focus_handle == focused)
-        {
-            dispatch_context.add("menu");
-            dispatch_context.add("ChangesList");
-        }
-
-        if self.commit_editor.read(cx).is_focused(window) {
-            dispatch_context.add("CommitEditor");
-        }
-
-        dispatch_context
-    }
-
-    fn close_panel(&mut self, _: &Close, _window: &mut Window, cx: &mut Context<Self>) {
-        cx.emit(PanelEvent::Close);
-    }
-
-    fn focus_in(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if !self.focus_handle.contains_focused(window, cx) {
-            cx.emit(Event::Focus);
-        }
-    }
-
-    fn scroll_to_selected_entry(&mut self, cx: &mut Context<Self>) {
-        if let Some(selected_entry) = self.selected_entry {
-            self.scroll_handle
-                .scroll_to_item(selected_entry, ScrollStrategy::Center);
-        }
-
-        cx.notify();
-    }
-
-    fn first_status_entry_index(&self) -> Option<usize> {
-        self.entries
-            .iter()
-            .position(|entry| entry.status_entry().is_some())
-    }
-
-    fn select_first(&mut self, _: &SelectFirst, _window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(first_entry) = self.first_status_entry_index() {
-            self.selected_entry = Some(first_entry);
-            self.scroll_to_selected_entry(cx);
-        }
-    }
-
-    fn select_previous(
-        &mut self,
-        _: &SelectPrevious,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let item_count = self.entries.len();
-        if item_count == 0 {
-            return;
-        }
-
-        if let Some(selected_entry) = self.selected_entry {
-            let new_selected_entry = if selected_entry > 0 {
-                selected_entry - 1
-            } else {
-                selected_entry
-            };
-
-            if matches!(
-                self.entries.get(new_selected_entry),
-                Some(GitListEntry::Header(..))
-            ) {
-                if new_selected_entry > 0 {
-                    self.selected_entry = Some(new_selected_entry - 1)
-                }
-            } else {
-                self.selected_entry = Some(new_selected_entry);
-            }
-
-            self.scroll_to_selected_entry(cx);
-        }
-
-        cx.notify();
-    }
-
-    fn select_next(&mut self, _: &SelectNext, _window: &mut Window, cx: &mut Context<Self>) {
-        let item_count = self.entries.len();
-        if item_count == 0 {
-            return;
-        }
-
-        if let Some(selected_entry) = self.selected_entry {
-            let new_selected_entry = if selected_entry < item_count - 1 {
-                selected_entry + 1
-            } else {
-                selected_entry
-            };
-            if matches!(
-                self.entries.get(new_selected_entry),
-                Some(GitListEntry::Header(..))
-            ) {
-                self.selected_entry = Some(new_selected_entry + 1);
-            } else {
-                self.selected_entry = Some(new_selected_entry);
-            }
-
-            self.scroll_to_selected_entry(cx);
-        }
-
-        cx.notify();
-    }
-
-    fn select_last(&mut self, _: &SelectLast, _window: &mut Window, cx: &mut Context<Self>) {
-        if self.entries.last().is_some() {
-            self.selected_entry = Some(self.entries.len() - 1);
-            self.scroll_to_selected_entry(cx);
-        }
-    }
-
-    fn focus_editor(&mut self, _: &FocusEditor, window: &mut Window, cx: &mut Context<Self>) {
-        self.commit_editor.update(cx, |editor, cx| {
-            window.focus(&editor.focus_handle(cx));
-        });
-        cx.notify();
-    }
-
-    fn select_first_entry_if_none(&mut self, cx: &mut Context<Self>) {
-        let have_entries = self
-            .active_repository
-            .as_ref()
-            .is_some_and(|active_repository| active_repository.read(cx).status_summary().count > 0);
-        if have_entries && self.selected_entry.is_none() {
-            self.selected_entry = self.first_status_entry_index();
-            self.scroll_to_selected_entry(cx);
-            cx.notify();
-        }
-    }
-
-    fn focus_changes_list(
-        &mut self,
-        _: &FocusChanges,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.select_first_entry_if_none(cx);
-
-        self.focus_handle.focus(window);
-        cx.notify();
-    }
-
-    fn get_selected_entry(&self) -> Option<&GitListEntry> {
-        self.selected_entry.and_then(|i| self.entries.get(i))
-    }
-
-    fn open_diff(&mut self, _: &menu::Confirm, window: &mut Window, cx: &mut Context<Self>) {
-        maybe!({
-            let entry = self.entries.get(self.selected_entry?)?.status_entry()?;
-            let workspace = self.workspace.upgrade()?;
-            let git_repo = self.active_repository.as_ref()?;
-
-            if let Some(project_diff) = workspace.read(cx).active_item_as::<ProjectDiff>(cx)
-                && let Some(project_path) = project_diff.read(cx).active_path(cx)
-                && Some(&entry.repo_path)
-                    == git_repo
-                        .read(cx)
-                        .project_path_to_repo_path(&project_path, cx)
-                        .as_ref()
-            {
-                project_diff.focus_handle(cx).focus(window);
-                project_diff.update(cx, |project_diff, cx| project_diff.autoscroll(cx));
-                return None;
-            };
-
-            self.workspace
-                .update(cx, |workspace, cx| {
-                    ProjectDiff::deploy_at(workspace, Some(entry.clone()), window, cx);
-                })
-                .ok();
-            self.focus_handle.focus(window);
-
-            Some(())
-        });
-    }
-
-    fn file_history(&mut self, _: &git::FileHistory, window: &mut Window, cx: &mut Context<Self>) {
-        maybe!({
-            let entry = self.entries.get(self.selected_entry?)?.status_entry()?;
-            let active_repo = self.active_repository.as_ref()?;
-            let repo_path = entry.repo_path.clone();
-            let git_store = self.project.read(cx).git_store();
-
-            FileHistoryView::open(
-                repo_path,
-                git_store.downgrade(),
-                active_repo.downgrade(),
-                self.workspace.clone(),
-                window,
-                cx,
-            );
-
-            Some(())
-        });
-    }
-
-    fn open_file(
-        &mut self,
-        _: &menu::SecondaryConfirm,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        maybe!({
-            let entry = self.entries.get(self.selected_entry?)?.status_entry()?;
-            let active_repo = self.active_repository.as_ref()?;
-            let path = active_repo
-                .read(cx)
-                .repo_path_to_project_path(&entry.repo_path, cx)?;
-            if entry.status.is_deleted() {
-                return None;
-            }
-
-            let open_task = self
-                .workspace
-                .update(cx, |workspace, cx| {
-                    workspace.open_path_preview(path, None, false, false, true, window, cx)
-                })
-                .ok()?;
-
-            cx.spawn_in(window, async move |_, mut cx| {
-                let item = open_task
-                    .await
-                    .notify_async_err(&mut cx)
-                    .ok_or_else(|| anyhow::anyhow!("Failed to open file"))?;
-                if let Some(active_editor) = item.downcast::<Editor>() {
-                    if let Some(diff_task) =
-                        active_editor.update(cx, |editor, _cx| editor.wait_for_diff_to_load())?
-                    {
-                        diff_task.await;
-                    }
-
-                    cx.update(|window, cx| {
-                        active_editor.update(cx, |editor, cx| {
-                            editor.expand_all_diff_hunks(&ExpandAllDiffHunks, window, cx);
-
-                            let snapshot = editor.snapshot(window, cx);
-                            editor.go_to_hunk_before_or_after_position(
-                                &snapshot,
-                                language::Point::new(0, 0),
-                                Direction::Next,
-                                window,
-                                cx,
-                            );
-                        })
-                    })?;
-                }
-
-                anyhow::Ok(())
-            })
-            .detach();
-
-            Some(())
-        });
-    }
-
-    fn revert_selected(
-        &mut self,
-        action: &git::RestoreFile,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let path_style = self.project.read(cx).path_style(cx);
-        maybe!({
-            let list_entry = self.entries.get(self.selected_entry?)?.clone();
-            let entry = list_entry.status_entry()?.to_owned();
-            let skip_prompt = action.skip_prompt || entry.status.is_created();
-
-            let prompt = if skip_prompt {
-                Task::ready(Ok(0))
-            } else {
-                let prompt = window.prompt(
-                    PromptLevel::Warning,
-                    &format!(
-                        "Are you sure you want to restore {}?",
-                        entry
-                            .repo_path
-                            .file_name()
-                            .unwrap_or(entry.repo_path.display(path_style).as_ref()),
-                    ),
-                    None,
-                    &["Restore", "Cancel"],
-                    cx,
-                );
-                cx.background_spawn(prompt)
-            };
-
-            let this = cx.weak_entity();
-            window
-                .spawn(cx, async move |cx| {
-                    if prompt.await? != 0 {
-                        return anyhow::Ok(());
-                    }
-
-                    this.update_in(cx, |this, window, cx| {
-                        this.revert_entry(&entry, window, cx);
-                    })?;
-
-                    Ok(())
-                })
-                .detach();
-            Some(())
-        });
-    }
-
-    fn add_to_gitignore(
-        &mut self,
-        _: &git::AddToGitignore,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        maybe!({
-            let list_entry = self.entries.get(self.selected_entry?)?.clone();
-            let entry = list_entry.status_entry()?.to_owned();
-
-            if !entry.status.is_created() {
-                return Some(());
-            }
-
-            let project = self.project.downgrade();
-            let repo_path = entry.repo_path;
-            let active_repository = self.active_repository.as_ref()?.downgrade();
-
-            cx.spawn(async move |_, cx| {
-                let file_path_str = repo_path.as_ref().display(PathStyle::Posix);
-
-                let repo_root = active_repository.read_with(cx, |repository, _| {
-                    repository.snapshot().work_directory_abs_path
-                })?;
-
-                let gitignore_abs_path = repo_root.join(".gitignore");
-
-                let buffer = project
-                    .update(cx, |project, cx| {
-                        project.open_local_buffer(gitignore_abs_path, cx)
-                    })?
-                    .await?;
-
-                let mut should_save = false;
-                buffer.update(cx, |buffer, cx| {
-                    let existing_content = buffer.text();
-
-                    if existing_content
-                        .lines()
-                        .any(|line| line.trim() == file_path_str)
-                    {
-                        return;
-                    }
-
-                    let insert_position = existing_content.len();
-                    let new_entry = if existing_content.is_empty() {
-                        format!("{}\n", file_path_str)
-                    } else if existing_content.ends_with('\n') {
-                        format!("{}\n", file_path_str)
-                    } else {
-                        format!("\n{}\n", file_path_str)
-                    };
-
-                    buffer.edit([(insert_position..insert_position, new_entry)], None, cx);
-                    should_save = true;
-                })?;
-
-                if should_save {
-                    project
-                        .update(cx, |project, cx| project.save_buffer(buffer, cx))?
-                        .await?;
-                }
-
-                anyhow::Ok(())
-            })
-            .detach_and_log_err(cx);
-
-            Some(())
-        });
-    }
-
-    fn revert_entry(
-        &mut self,
-        entry: &GitStatusEntry,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        maybe!({
-            let active_repo = self.active_repository.clone()?;
-            let path = active_repo
-                .read(cx)
-                .repo_path_to_project_path(&entry.repo_path, cx)?;
-            let workspace = self.workspace.clone();
-
-            if entry.status.staging().has_staged() {
-                self.change_file_stage(false, vec![entry.clone()], cx);
-            }
-            let filename = path.path.file_name()?.to_string();
-
-            if !entry.status.is_created() {
-                self.perform_checkout(vec![entry.clone()], window, cx);
-            } else {
-                let prompt = prompt(&format!("Trash {}?", filename), None, window, cx);
-                cx.spawn_in(window, async move |_, cx| {
-                    match prompt.await? {
-                        TrashCancel::Trash => {}
-                        TrashCancel::Cancel => return Ok(()),
-                    }
-                    let task = workspace.update(cx, |workspace, cx| {
-                        workspace
-                            .project()
-                            .update(cx, |project, cx| project.delete_file(path, true, cx))
-                    })?;
-                    if let Some(task) = task {
-                        task.await?;
-                    }
-                    Ok(())
-                })
-                .detach_and_prompt_err(
-                    "Failed to trash file",
-                    window,
-                    cx,
-                    |e, _, _| Some(format!("{e}")),
-                );
-            }
-            Some(())
-        });
-    }
-
-    fn perform_checkout(
-        &mut self,
-        entries: Vec<GitStatusEntry>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let workspace = self.workspace.clone();
-        let Some(active_repository) = self.active_repository.clone() else {
-            return;
-        };
-
-        let task = cx.spawn_in(window, async move |this, cx| {
-            let tasks: Vec<_> = workspace.update(cx, |workspace, cx| {
-                workspace.project().update(cx, |project, cx| {
-                    entries
-                        .iter()
-                        .filter_map(|entry| {
-                            let path = active_repository
-                                .read(cx)
-                                .repo_path_to_project_path(&entry.repo_path, cx)?;
-                            Some(project.open_buffer(path, cx))
-                        })
-                        .collect()
-                })
-            })?;
-
-            let buffers = futures::future::join_all(tasks).await;
-
-            this.update_in(cx, |this, window, cx| {
-                let task = active_repository.update(cx, |repo, cx| {
-                    repo.checkout_files(
-                        "HEAD",
-                        entries
-                            .into_iter()
-                            .map(|entries| entries.repo_path)
-                            .collect(),
-                        cx,
-                    )
-                });
-                this.update_visible_entries(window, cx);
-                cx.notify();
-                task
-            })?
-            .await?;
-
-            let tasks: Vec<_> = cx.update(|_, cx| {
-                buffers
-                    .iter()
-                    .filter_map(|buffer| {
-                        buffer.as_ref().ok()?.update(cx, |buffer, cx| {
-                            buffer.is_dirty().then(|| buffer.reload(cx))
-                        })
-                    })
-                    .collect()
-            })?;
-
-            futures::future::join_all(tasks).await;
-
-            Ok(())
-        });
-
-        cx.spawn_in(window, async move |this, cx| {
-            let result = task.await;
-
-            this.update_in(cx, |this, window, cx| {
-                if let Err(err) = result {
-                    this.update_visible_entries(window, cx);
-                    this.show_error_toast("checkout", err, cx);
-                }
-            })
-            .ok();
-        })
-        .detach();
-    }
-
-    fn restore_tracked_files(
-        &mut self,
-        _: &RestoreTrackedFiles,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let entries = self
-            .entries
-            .iter()
-            .filter_map(|entry| entry.status_entry().cloned())
-            .filter(|status_entry| !status_entry.status.is_created())
-            .collect::<Vec<_>>();
-
-        match entries.len() {
-            0 => return,
-            1 => return self.revert_entry(&entries[0], window, cx),
-            _ => {}
-        }
-        let mut details = entries
-            .iter()
-            .filter_map(|entry| entry.repo_path.as_ref().file_name())
-            .map(|filename| filename.to_string())
-            .take(5)
-            .join("\n");
-        if entries.len() > 5 {
-            details.push_str(&format!("\nand {} more…", entries.len() - 5))
-        }
-
-        #[derive(strum::EnumIter, strum::VariantNames)]
-        #[strum(serialize_all = "title_case")]
-        enum RestoreCancel {
-            RestoreTrackedFiles,
-            Cancel,
-        }
-        let prompt = prompt(
-            "Discard changes to these files?",
-            Some(&details),
-            window,
-            cx,
-        );
-        cx.spawn_in(window, async move |this, cx| {
-            if let Ok(RestoreCancel::RestoreTrackedFiles) = prompt.await {
-                this.update_in(cx, |this, window, cx| {
-                    this.perform_checkout(entries, window, cx);
-                })
-                .ok();
-            }
-        })
-        .detach();
-    }
-
-    fn clean_all(&mut self, _: &TrashUntrackedFiles, window: &mut Window, cx: &mut Context<Self>) {
-        let workspace = self.workspace.clone();
-        let Some(active_repo) = self.active_repository.clone() else {
-            return;
-        };
-        let to_delete = self
-            .entries
-            .iter()
-            .filter_map(|entry| entry.status_entry())
-            .filter(|status_entry| status_entry.status.is_created())
-            .cloned()
-            .collect::<Vec<_>>();
-
-        match to_delete.len() {
-            0 => return,
-            1 => return self.revert_entry(&to_delete[0], window, cx),
-            _ => {}
-        };
-
-        let mut details = to_delete
-            .iter()
-            .map(|entry| {
-                entry
-                    .repo_path
-                    .as_ref()
-                    .file_name()
-                    .map(|f| f.to_string())
-                    .unwrap_or_default()
-            })
-            .take(5)
-            .join("\n");
-
-        if to_delete.len() > 5 {
-            details.push_str(&format!("\nand {} more…", to_delete.len() - 5))
-        }
-
-        let prompt = prompt("Trash these files?", Some(&details), window, cx);
-        cx.spawn_in(window, async move |this, cx| {
-            match prompt.await? {
-                TrashCancel::Trash => {}
-                TrashCancel::Cancel => return Ok(()),
-            }
-            let tasks = workspace.update(cx, |workspace, cx| {
-                to_delete
-                    .iter()
-                    .filter_map(|entry| {
-                        workspace.project().update(cx, |project, cx| {
-                            let project_path = active_repo
-                                .read(cx)
-                                .repo_path_to_project_path(&entry.repo_path, cx)?;
-                            project.delete_file(project_path, true, cx)
-                        })
-                    })
-                    .collect::<Vec<_>>()
-            })?;
-            let to_unstage = to_delete
-                .into_iter()
-                .filter(|entry| !entry.status.staging().is_fully_unstaged())
-                .collect();
-            this.update(cx, |this, cx| this.change_file_stage(false, to_unstage, cx))?;
-            for task in tasks {
-                task.await?;
-            }
-            Ok(())
-        })
-        .detach_and_prompt_err("Failed to trash files", window, cx, |e, _, _| {
-            Some(format!("{e}"))
-        });
-    }
-
-    fn change_all_files_stage(&mut self, stage: bool, cx: &mut Context<Self>) {
-        let Some(active_repository) = self.active_repository.clone() else {
-            return;
-        };
-        cx.spawn({
-            async move |this, cx| {
-                let result = this
-                    .update(cx, |this, cx| {
-                        let task = active_repository.update(cx, |repo, cx| {
-                            if stage {
-                                repo.stage_all(cx)
-                            } else {
-                                repo.unstage_all(cx)
-                            }
-                        });
-                        this.update_counts(active_repository.read(cx));
-                        cx.notify();
-                        task
-                    })?
-                    .await;
-
-                this.update(cx, |this, cx| {
-                    if let Err(err) = result {
-                        this.show_error_toast(if stage { "add" } else { "reset" }, err, cx);
-                    }
-                    cx.notify()
-                })
-            }
-        })
-        .detach();
-    }
-
-    fn is_entry_staged(&self, entry: &GitStatusEntry, repo: &Repository) -> bool {
-        // Checking for current staged/unstaged file status is a chained operation:
-        // 1. first, we check for any pending operation recorded in repository
-        // 2. if there are no pending ops either running or finished, we then ask the repository
-        //    for the most up-to-date file status read from disk - we do this since `entry` arg to this function `render_entry`
-        //    is likely to be staled, and may lead to weird artifacts in the form of subsecond auto-uncheck/check on
-        //    the checkbox's state (or flickering) which is undesirable.
-        // 3. finally, if there is no info about this `entry` in the repo, we fall back to whatever status is encoded
-        //    in `entry` arg.
-        if let Some(optimistic) = self.optimistic_staging.get(&entry.repo_path) {
-            return *optimistic;
-        }
-        repo.pending_ops_for_path(&entry.repo_path)
-            .map(|ops| ops.staging() || ops.staged())
-            .or_else(|| {
-                repo.status_for_path(&entry.repo_path)
-                    .and_then(|status| status.status.staging().as_bool())
-            })
-            .unwrap_or(entry.staging.has_staged())
-    }
-
-    fn toggle_state_for_counts(staged_count: usize, total: usize) -> ToggleState {
-        if staged_count == 0 || total == 0 {
-            ToggleState::Unselected
-        } else if staged_count == total {
-            ToggleState::Selected
-        } else {
-            ToggleState::Indeterminate
-        }
-    }
-
-    pub fn stage_all(&mut self, _: &StageAll, _window: &mut Window, cx: &mut Context<Self>) {
-        self.change_all_files_stage(true, cx);
-    }
-
-    pub fn unstage_all(&mut self, _: &UnstageAll, _window: &mut Window, cx: &mut Context<Self>) {
-        self.change_all_files_stage(false, cx);
-    }
-
-    fn toggle_staged_for_entry(
-        &mut self,
-        entry: &GitListEntry,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(active_repository) = self.active_repository.clone() else {
-            return;
-        };
-        let mut set_anchor: Option<RepoPath> = None;
-        let mut clear_anchor = None;
-
-        let (stage, repo_paths) = {
-            let repo = active_repository.read(cx);
-            match entry {
-                GitListEntry::Status(status_entry) => {
-                    let repo_paths = vec![status_entry.clone()];
-                    let stage = if self.is_entry_staged(status_entry, &repo) {
-                        if let Some(op) = self.bulk_staging.clone()
-                            && op.anchor == status_entry.repo_path
-                        {
-                            clear_anchor = Some(op.anchor);
-                        }
-                        false
-                    } else {
-                        set_anchor = Some(status_entry.repo_path.clone());
-                        true
-                    };
-                    (stage, repo_paths)
-                }
-                GitListEntry::TreeStatus(status_entry) => {
-                    let repo_paths = vec![status_entry.entry.clone()];
-                    let stage = if self.is_entry_staged(&status_entry.entry, &repo) {
-                        if let Some(op) = self.bulk_staging.clone()
-                            && op.anchor == status_entry.entry.repo_path
-                        {
-                            clear_anchor = Some(op.anchor);
-                        }
-                        false
-                    } else {
-                        set_anchor = Some(status_entry.entry.repo_path.clone());
-                        true
-                    };
-                    (stage, repo_paths)
-                }
-                GitListEntry::Header(section) => {
-                    let goal_staged_state = !self.header_state(section.header).selected();
-                    let entries = self
-                        .entries
-                        .iter()
-                        .filter_map(|entry| entry.status_entry())
-                        .filter(|status_entry| {
-                            section.contains(status_entry, &repo)
-                                && status_entry.staging.as_bool() != Some(goal_staged_state)
-                        })
-                        .cloned()
-                        .collect::<Vec<_>>();
-
-                    (goal_staged_state, entries)
-                }
-                GitListEntry::Directory(entry) => {
-                    let goal_staged_state = entry.staged_state != ToggleState::Selected;
-                    let entries = self
-                        .view_mode
-                        .tree_state()
-                        .and_then(|state| state.directory_descendants.get(&entry.key))
-                        .cloned()
-                        .unwrap_or_default()
-                        .into_iter()
-                        .filter(|status_entry| {
-                            self.is_entry_staged(status_entry, &repo) != goal_staged_state
-                        })
-                        .collect::<Vec<_>>();
-                    (goal_staged_state, entries)
-                }
-            }
-        };
-        if let Some(anchor) = clear_anchor {
-            if let Some(op) = self.bulk_staging.clone()
-                && op.anchor == anchor
-            {
-                self.bulk_staging = None;
-            }
-        }
-        if let Some(anchor) = set_anchor {
-            self.set_bulk_staging_anchor(anchor, cx);
-        }
-
-        let repo = active_repository.read(cx);
-        self.apply_optimistic_stage(&repo_paths, stage, &repo);
-        cx.notify();
-
-        self.change_file_stage(stage, repo_paths, cx);
-    }
-
-    fn change_file_stage(
-        &mut self,
-        stage: bool,
-        entries: Vec<GitStatusEntry>,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(active_repository) = self.active_repository.clone() else {
-            return;
-        };
-        cx.spawn({
-            async move |this, cx| {
-                let result = this
-                    .update(cx, |this, cx| {
-                        let task = active_repository.update(cx, |repo, cx| {
-                            let repo_paths = entries
-                                .iter()
-                                .map(|entry| entry.repo_path.clone())
-                                .collect();
-                            if stage {
-                                repo.stage_entries(repo_paths, cx)
-                            } else {
-                                repo.unstage_entries(repo_paths, cx)
-                            }
-                        });
-                        this.update_counts(active_repository.read(cx));
-                        cx.notify();
-                        task
-                    })?
-                    .await;
-
-                this.update(cx, |this, cx| {
-                    if let Err(err) = result {
-                        this.show_error_toast(if stage { "add" } else { "reset" }, err, cx);
-                    }
-                    cx.notify();
-                })
-            }
-        })
-        .detach();
-    }
-
-    fn apply_optimistic_stage(
-        &mut self,
-        entries: &[GitStatusEntry],
-        stage: bool,
-        repo: &Repository,
-    ) {
-        // This “optimistic” pass keeps all checkboxes—files, folders, and section headers—visually in sync the moment you click,
-        // even though `change_file_stage` is still talking to the repository in the background.
-        // Before, the UI would wait for Git, causing checkbox flicker or stale parent states;
-        // Now, users see instant feedback and accurate parent/child tri-states while the async staging operation completes.
-        //
-        // Description:
-        // It records the desired state in `self.optimistic_staging` (a map from path → bool),
-        // walks the rendered entries, and swaps their `staging` flags based on that map.
-        // In tree view it also recomputes every directory’s tri-state checkbox using the updated child data,
-        // so parent folders flip between selected/indeterminate/empty in the same frame.
-        let new_stage = if stage {
-            StageStatus::Staged
-        } else {
-            StageStatus::Unstaged
-        };
-
-        self.optimistic_staging
-            .extend(entries.iter().map(|entry| (entry.repo_path.clone(), stage)));
-
-        let staged_states: HashMap<TreeKey, ToggleState> = self
-            .view_mode
-            .tree_state()
-            .map(|state| state.directory_descendants.iter())
-            .into_iter()
-            .flatten()
-            .map(|(key, descendants)| {
-                let staged_count = descendants
-                    .iter()
-                    .filter(|entry| self.is_entry_staged(entry, repo))
-                    .count();
-                (
-                    key.clone(),
-                    Self::toggle_state_for_counts(staged_count, descendants.len()),
-                )
-            })
-            .collect();
-
-        for list_entry in &mut self.entries {
-            match list_entry {
-                GitListEntry::Status(status) => {
-                    if self
-                        .optimistic_staging
-                        .get(&status.repo_path)
-                        .is_some_and(|s| *s == stage)
-                    {
-                        status.staging = new_stage;
-                    }
-                }
-                GitListEntry::TreeStatus(status) => {
-                    if self
-                        .optimistic_staging
-                        .get(&status.entry.repo_path)
-                        .is_some_and(|s| *s == stage)
-                    {
-                        status.entry.staging = new_stage;
-                    }
-                }
-                GitListEntry::Directory(dir) => {
-                    if let Some(state) = staged_states.get(&dir.key) {
-                        dir.staged_state = *state;
-                    }
-                }
-                _ => {}
-            }
-        }
-
-        self.update_counts(repo);
-    }
-
-    pub fn total_staged_count(&self) -> usize {
-        self.tracked_staged_count + self.new_staged_count + self.conflicted_staged_count
-    }
-
-    pub fn stash_pop(&mut self, _: &StashPop, _window: &mut Window, cx: &mut Context<Self>) {
-        let Some(active_repository) = self.active_repository.clone() else {
-            return;
-        };
-
-        cx.spawn({
-            async move |this, cx| {
-                let stash_task = active_repository
-                    .update(cx, |repo, cx| repo.stash_pop(None, cx))?
-                    .await;
-                this.update(cx, |this, cx| {
-                    stash_task
-                        .map_err(|e| {
-                            this.show_error_toast("stash pop", e, cx);
-                        })
-                        .ok();
-                    cx.notify();
-                })
-            }
-        })
-        .detach();
-    }
-
-    pub fn stash_apply(&mut self, _: &StashApply, _window: &mut Window, cx: &mut Context<Self>) {
-        let Some(active_repository) = self.active_repository.clone() else {
-            return;
-        };
-
-        cx.spawn({
-            async move |this, cx| {
-                let stash_task = active_repository
-                    .update(cx, |repo, cx| repo.stash_apply(None, cx))?
-                    .await;
-                this.update(cx, |this, cx| {
-                    stash_task
-                        .map_err(|e| {
-                            this.show_error_toast("stash apply", e, cx);
-                        })
-                        .ok();
-                    cx.notify();
-                })
-            }
-        })
-        .detach();
-    }
-
-    pub fn stash_all(&mut self, _: &StashAll, _window: &mut Window, cx: &mut Context<Self>) {
-        let Some(active_repository) = self.active_repository.clone() else {
-            return;
-        };
-
-        cx.spawn({
-            async move |this, cx| {
-                let stash_task = active_repository
-                    .update(cx, |repo, cx| repo.stash_all(cx))?
-                    .await;
-                this.update(cx, |this, cx| {
-                    stash_task
-                        .map_err(|e| {
-                            this.show_error_toast("stash", e, cx);
-                        })
-                        .ok();
-                    cx.notify();
-                })
-            }
-        })
-        .detach();
-    }
-
-    pub fn commit_message_buffer(&self, cx: &App) -> Entity<Buffer> {
-        self.commit_editor
-            .read(cx)
-            .buffer()
-            .read(cx)
-            .as_singleton()
-            .unwrap()
-    }
-
-    fn toggle_staged_for_selected(
-        &mut self,
-        _: &git::ToggleStaged,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(selected_entry) = self.get_selected_entry().cloned() {
-            self.toggle_staged_for_entry(&selected_entry, window, cx);
-        }
-    }
-
-    fn stage_range(&mut self, _: &git::StageRange, _window: &mut Window, cx: &mut Context<Self>) {
-        let Some(index) = self.selected_entry else {
-            return;
-        };
-        self.stage_bulk(index, cx);
-    }
-
-    fn stage_selected(&mut self, _: &git::StageFile, _window: &mut Window, cx: &mut Context<Self>) {
-        let Some(selected_entry) = self.get_selected_entry() else {
-            return;
-        };
-        let Some(status_entry) = selected_entry.status_entry() else {
-            return;
-        };
-        if status_entry.staging != StageStatus::Staged {
-            self.change_file_stage(true, vec![status_entry.clone()], cx);
-        }
-    }
-
-    fn unstage_selected(
-        &mut self,
-        _: &git::UnstageFile,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(selected_entry) = self.get_selected_entry() else {
-            return;
-        };
-        let Some(status_entry) = selected_entry.status_entry() else {
-            return;
-        };
-        if status_entry.staging != StageStatus::Unstaged {
-            self.change_file_stage(false, vec![status_entry.clone()], cx);
-        }
-    }
-
-    fn on_commit(&mut self, _: &git::Commit, window: &mut Window, cx: &mut Context<Self>) {
-        if self.commit(&self.commit_editor.focus_handle(cx), window, cx) {
-            telemetry::event!("Git Committed", source = "Git Panel");
-        }
-    }
-
-    /// Commits staged changes with the current commit message.
-    ///
-    /// Returns `true` if the commit was executed, `false` otherwise.
-    pub(crate) fn commit(
-        &mut self,
-        commit_editor_focus_handle: &FocusHandle,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> bool {
-        if self.amend_pending {
-            return false;
-        }
-
-        if commit_editor_focus_handle.contains_focused(window, cx) {
-            self.commit_changes(
-                CommitOptions {
-                    amend: false,
-                    signoff: self.signoff_enabled,
-                },
-                window,
-                cx,
-            );
-            true
-        } else {
-            cx.propagate();
-            false
-        }
-    }
-
-    fn on_amend(&mut self, _: &git::Amend, window: &mut Window, cx: &mut Context<Self>) {
-        if self.amend(&self.commit_editor.focus_handle(cx), window, cx) {
-            telemetry::event!("Git Amended", source = "Git Panel");
-        }
-    }
-
-    /// Amends the most recent commit with staged changes and/or an updated commit message.
-    ///
-    /// Uses a two-stage workflow where the first invocation loads the commit
-    /// message for editing, second invocation performs the amend. Returns
-    /// `true` if the amend was executed, `false` otherwise.
-    pub(crate) fn amend(
-        &mut self,
-        commit_editor_focus_handle: &FocusHandle,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> bool {
-        if commit_editor_focus_handle.contains_focused(window, cx) {
-            if self.head_commit(cx).is_some() {
-                if !self.amend_pending {
-                    self.set_amend_pending(true, cx);
-                    self.load_last_commit_message(cx);
-
-                    return false;
-                } else {
-                    self.commit_changes(
-                        CommitOptions {
-                            amend: true,
-                            signoff: self.signoff_enabled,
-                        },
-                        window,
-                        cx,
-                    );
-
-                    return true;
-                }
-            }
-            return false;
-        } else {
-            cx.propagate();
-            return false;
-        }
-    }
-    pub fn head_commit(&self, cx: &App) -> Option<CommitDetails> {
-        self.active_repository
-            .as_ref()
-            .and_then(|repo| repo.read(cx).head_commit.as_ref())
-            .cloned()
-    }
-
-    pub fn load_last_commit_message(&mut self, cx: &mut Context<Self>) {
-        let Some(head_commit) = self.head_commit(cx) else {
-            return;
-        };
-
-        let recent_sha = head_commit.sha.to_string();
-        let detail_task = self.load_commit_details(recent_sha, cx);
-        cx.spawn(async move |this, cx| {
-            if let Ok(message) = detail_task.await.map(|detail| detail.message) {
-                this.update(cx, |this, cx| {
-                    this.commit_message_buffer(cx).update(cx, |buffer, cx| {
-                        let start = buffer.anchor_before(0);
-                        let end = buffer.anchor_after(buffer.len());
-                        buffer.edit([(start..end, message)], None, cx);
-                    });
-                })
-                .log_err();
-            }
-        })
-        .detach();
-    }
-
-    fn custom_or_suggested_commit_message(
-        &self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<String> {
-        let git_commit_language = self
-            .commit_editor
-            .read(cx)
-            .language_at(MultiBufferOffset(0), cx);
-        let message = self.commit_editor.read(cx).text(cx);
-        if message.is_empty() {
-            return self
-                .suggest_commit_message(cx)
-                .filter(|message| !message.trim().is_empty());
-        } else if message.trim().is_empty() {
-            return None;
-        }
-        let buffer = cx.new(|cx| {
-            let mut buffer = Buffer::local(message, cx);
-            buffer.set_language(git_commit_language, cx);
-            buffer
-        });
-        let editor = cx.new(|cx| Editor::for_buffer(buffer, None, window, cx));
-        let wrapped_message = editor.update(cx, |editor, cx| {
-            editor.select_all(&Default::default(), window, cx);
-            editor.rewrap(&Default::default(), window, cx);
-            editor.text(cx)
-        });
-        if wrapped_message.trim().is_empty() {
-            return None;
-        }
-        Some(wrapped_message)
-    }
-
-    fn has_commit_message(&self, cx: &mut Context<Self>) -> bool {
-        let text = self.commit_editor.read(cx).text(cx);
-        if !text.trim().is_empty() {
-            true
-        } else if text.is_empty() {
-            self.suggest_commit_message(cx)
-                .is_some_and(|text| !text.trim().is_empty())
-        } else {
-            false
-        }
-    }
-
-    pub(crate) fn commit_changes(
-        &mut self,
-        options: CommitOptions,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(active_repository) = self.active_repository.clone() else {
-            return;
-        };
-        let error_spawn = |message, window: &mut Window, cx: &mut App| {
-            let prompt = window.prompt(PromptLevel::Warning, message, None, &["Ok"], cx);
-            cx.spawn(async move |_| {
-                prompt.await.ok();
-            })
-            .detach();
-        };
-
-        if self.has_unstaged_conflicts() {
-            error_spawn(
-                "There are still conflicts. You must stage these before committing",
-                window,
-                cx,
-            );
-            return;
-        }
-
-        let askpass = self.askpass_delegate("git commit", window, cx);
-        let commit_message = self.custom_or_suggested_commit_message(window, cx);
-
-        let Some(mut message) = commit_message else {
-            self.commit_editor.read(cx).focus_handle(cx).focus(window);
-            return;
-        };
-
-        if self.add_coauthors {
-            self.fill_co_authors(&mut message, cx);
-        }
-
-        let task = if self.has_staged_changes() {
-            // Repository serializes all git operations, so we can just send a commit immediately
-            let commit_task = active_repository.update(cx, |repo, cx| {
-                repo.commit(message.into(), None, options, askpass, cx)
-            });
-            cx.background_spawn(async move { commit_task.await? })
-        } else {
-            let changed_files = self
-                .entries
-                .iter()
-                .filter_map(|entry| entry.status_entry())
-                .filter(|status_entry| !status_entry.status.is_created())
-                .map(|status_entry| status_entry.repo_path.clone())
-                .collect::<Vec<_>>();
-
-            if changed_files.is_empty() && !options.amend {
-                error_spawn("No changes to commit", window, cx);
-                return;
-            }
-
-            let stage_task =
-                active_repository.update(cx, |repo, cx| repo.stage_entries(changed_files, cx));
-            cx.spawn(async move |_, cx| {
-                stage_task.await?;
-                let commit_task = active_repository.update(cx, |repo, cx| {
-                    repo.commit(message.into(), None, options, askpass, cx)
-                })?;
-                commit_task.await?
-            })
-        };
-        let task = cx.spawn_in(window, async move |this, cx| {
-            let result = task.await;
-            this.update_in(cx, |this, window, cx| {
-                this.pending_commit.take();
-
-                match result {
-                    Ok(()) => {
-                        if options.amend {
-                            this.set_amend_pending(false, cx);
-                        } else {
-                            this.commit_editor
-                                .update(cx, |editor, cx| editor.clear(window, cx));
-                            this.original_commit_message = None;
-                        }
-                    }
-                    Err(e) => this.show_error_toast("commit", e, cx),
-                }
-            })
-            .ok();
-        });
-
-        self.pending_commit = Some(task);
-    }
-
-    pub(crate) fn uncommit(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let Some(repo) = self.active_repository.clone() else {
-            return;
-        };
-        telemetry::event!("Git Uncommitted");
-
-        let confirmation = self.check_for_pushed_commits(window, cx);
-        let prior_head = self.load_commit_details("HEAD".to_string(), cx);
-
-        let task = cx.spawn_in(window, async move |this, cx| {
-            let result = maybe!(async {
-                if let Ok(true) = confirmation.await {
-                    let prior_head = prior_head.await?;
-
-                    repo.update(cx, |repo, cx| {
-                        repo.reset("HEAD^".to_string(), ResetMode::Soft, cx)
-                    })?
-                    .await??;
-
-                    Ok(Some(prior_head))
-                } else {
-                    Ok(None)
-                }
-            })
-            .await;
-
-            this.update_in(cx, |this, window, cx| {
-                this.pending_commit.take();
-                match result {
-                    Ok(None) => {}
-                    Ok(Some(prior_commit)) => {
-                        this.commit_editor.update(cx, |editor, cx| {
-                            editor.set_text(prior_commit.message, window, cx)
-                        });
-                    }
-                    Err(e) => this.show_error_toast("reset", e, cx),
-                }
-            })
-            .ok();
-        });
-
-        self.pending_commit = Some(task);
-    }
-
-    fn check_for_pushed_commits(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl Future<Output = anyhow::Result<bool>> + use<> {
-        let repo = self.active_repository.clone();
-        let mut cx = window.to_async(cx);
-
-        async move {
-            let repo = repo.context("No active repository")?;
-
-            let pushed_to: Vec<SharedString> = repo
-                .update(&mut cx, |repo, _| repo.check_for_pushed_commits())?
-                .await??;
-
-            if pushed_to.is_empty() {
-                Ok(true)
-            } else {
-                #[derive(strum::EnumIter, strum::VariantNames)]
-                #[strum(serialize_all = "title_case")]
-                enum CancelUncommit {
-                    Uncommit,
-                    Cancel,
-                }
-                let detail = format!(
-                    "This commit was already pushed to {}.",
-                    pushed_to.into_iter().join(", ")
-                );
-                let result = cx
-                    .update(|window, cx| prompt("Are you sure?", Some(&detail), window, cx))?
-                    .await?;
-
-                match result {
-                    CancelUncommit::Cancel => Ok(false),
-                    CancelUncommit::Uncommit => Ok(true),
-                }
-            }
-        }
-    }
-
-    /// Suggests a commit message based on the changed files and their statuses
-    pub fn suggest_commit_message(&self, cx: &App) -> Option<String> {
-        if let Some(merge_message) = self
-            .active_repository
-            .as_ref()
-            .and_then(|repo| repo.read(cx).merge.message.as_ref())
-        {
-            return Some(merge_message.to_string());
-        }
-
-        let git_status_entry = if let Some(staged_entry) = &self.single_staged_entry {
-            Some(staged_entry)
-        } else if self.total_staged_count() == 0
-            && let Some(single_tracked_entry) = &self.single_tracked_entry
-        {
-            Some(single_tracked_entry)
-        } else {
-            None
-        }?;
-
-        let action_text = if git_status_entry.status.is_deleted() {
-            Some("Delete")
-        } else if git_status_entry.status.is_created() {
-            Some("Create")
-        } else if git_status_entry.status.is_modified() {
-            Some("Update")
-        } else {
-            None
-        }?;
-
-        let file_name = git_status_entry
-            .repo_path
-            .file_name()
-            .unwrap_or_default()
-            .to_string();
-
-        Some(format!("{} {}", action_text, file_name))
-    }
-
-    fn generate_commit_message_action(
-        &mut self,
-        _: &git::GenerateCommitMessage,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.generate_commit_message(cx);
-    }
-
-    fn split_patch(patch: &str) -> Vec<String> {
-        let mut result = Vec::new();
-        let mut current_patch = String::new();
-
-        for line in patch.lines() {
-            if line.starts_with("---") && !current_patch.is_empty() {
-                result.push(current_patch.trim_end_matches('\n').into());
-                current_patch = String::new();
-            }
-            current_patch.push_str(line);
-            current_patch.push('\n');
-        }
-
-        if !current_patch.is_empty() {
-            result.push(current_patch.trim_end_matches('\n').into());
-        }
-
-        result
-    }
-    fn truncate_iteratively(patch: &str, max_bytes: usize) -> String {
-        let mut current_size = patch.len();
-        if current_size <= max_bytes {
-            return patch.to_string();
-        }
-        let file_patches = Self::split_patch(patch);
-        let mut file_infos: Vec<TruncatedPatch> = file_patches
-            .iter()
-            .filter_map(|patch| TruncatedPatch::from_unified_diff(patch))
-            .collect();
-
-        if file_infos.is_empty() {
-            return patch.to_string();
-        }
-
-        current_size = file_infos.iter().map(|f| f.calculate_size()).sum::<usize>();
-        while current_size > max_bytes {
-            let file_idx = file_infos
-                .iter()
-                .enumerate()
-                .filter(|(_, f)| f.hunks_to_keep > 1)
-                .max_by_key(|(_, f)| f.hunks_to_keep)
-                .map(|(idx, _)| idx);
-            match file_idx {
-                Some(idx) => {
-                    let file = &mut file_infos[idx];
-                    let size_before = file.calculate_size();
-                    file.hunks_to_keep -= 1;
-                    let size_after = file.calculate_size();
-                    let saved = size_before.saturating_sub(size_after);
-                    current_size = current_size.saturating_sub(saved);
-                }
-                None => {
-                    break;
-                }
-            }
-        }
-
-        file_infos
-            .iter()
-            .map(|info| info.to_string())
-            .collect::<Vec<_>>()
-            .join("\n")
-    }
-
-    pub fn compress_commit_diff(diff_text: &str, max_bytes: usize) -> String {
-        if diff_text.len() <= max_bytes {
-            return diff_text.to_string();
-        }
-
-        let mut compressed = diff_text
-            .lines()
-            .map(|line| {
-                if line.len() > 256 {
-                    format!("{}...[truncated]\n", &line[..line.floor_char_boundary(256)])
-                } else {
-                    format!("{}\n", line)
-                }
-            })
-            .collect::<Vec<_>>()
-            .join("");
-
-        if compressed.len() <= max_bytes {
-            return compressed;
-        }
-
-        compressed = Self::truncate_iteratively(&compressed, max_bytes);
-
-        compressed
-    }
-
-    /// Generates a commit message using an LLM.
-    pub fn generate_commit_message(&mut self, cx: &mut Context<Self>) {
-        if !self.can_commit() || !AgentSettings::get_global(cx).enabled(cx) {
-            return;
-        }
-
-        let Some(ConfiguredModel { provider, model }) =
-            LanguageModelRegistry::read_global(cx).commit_message_model()
-        else {
-            return;
-        };
-
-        let Some(repo) = self.active_repository.as_ref() else {
-            return;
-        };
-
-        telemetry::event!("Git Commit Message Generated");
-
-        let diff = repo.update(cx, |repo, cx| {
-            if self.has_staged_changes() {
-                repo.diff(DiffType::HeadToIndex, cx)
-            } else {
-                repo.diff(DiffType::HeadToWorktree, cx)
-            }
-        });
-
-        let temperature = AgentSettings::temperature_for_model(&model, cx);
-
-        self.generate_commit_message_task = Some(cx.spawn(async move |this, cx| {
-             async move {
-                let _defer = cx.on_drop(&this, |this, _cx| {
-                    this.generate_commit_message_task.take();
-                });
-
-                if let Some(task) = cx.update(|cx| {
-                    if !provider.is_authenticated(cx) {
-                        Some(provider.authenticate(cx))
-                    } else {
-                        None
-                    }
-                })? {
-                    task.await.log_err();
-                };
-
-                let mut diff_text = match diff.await {
-                    Ok(result) => match result {
-                        Ok(text) => text,
-                        Err(e) => {
-                            Self::show_commit_message_error(&this, &e, cx);
-                            return anyhow::Ok(());
-                        }
-                    },
-                    Err(e) => {
-                        Self::show_commit_message_error(&this, &e, cx);
-                        return anyhow::Ok(());
-                    }
-                };
-
-                const MAX_DIFF_BYTES: usize = 20_000;
-                diff_text = Self::compress_commit_diff(&diff_text, MAX_DIFF_BYTES);
-
-                let subject = this.update(cx, |this, cx| {
-                    this.commit_editor.read(cx).text(cx).lines().next().map(ToOwned::to_owned).unwrap_or_default()
-                })?;
-
-                let text_empty = subject.trim().is_empty();
-
-                let content = if text_empty {
-                    format!("{PROMPT}\nHere are the changes in this commit:\n{diff_text}")
-                } else {
-                    format!("{PROMPT}\nHere is the user's subject line:\n{subject}\nHere are the changes in this commit:\n{diff_text}\n")
-                };
-
-                const PROMPT: &str = include_str!("commit_message_prompt.txt");
-
-                let request = LanguageModelRequest {
-                    thread_id: None,
-                    prompt_id: None,
-                    intent: Some(CompletionIntent::GenerateGitCommitMessage),
-                    mode: None,
-                    messages: vec![LanguageModelRequestMessage {
-                        role: Role::User,
-                        content: vec![content.into()],
-                        cache: false,
-            reasoning_details: None,
-                    }],
-                    tools: Vec::new(),
-                    tool_choice: None,
-                    stop: Vec::new(),
-                    temperature,
-                    thinking_allowed: false,
-                };
-
-                let stream = model.stream_completion_text(request, cx);
-                match stream.await {
-                    Ok(mut messages) => {
-                        if !text_empty {
-                            this.update(cx, |this, cx| {
-                                this.commit_message_buffer(cx).update(cx, |buffer, cx| {
-                                    let insert_position = buffer.anchor_before(buffer.len());
-                                    buffer.edit([(insert_position..insert_position, "\n")], None, cx)
-                                });
-                            })?;
-                        }
-
-                        while let Some(message) = messages.stream.next().await {
-                            match message {
-                                Ok(text) => {
-                                    this.update(cx, |this, cx| {
-                                        this.commit_message_buffer(cx).update(cx, |buffer, cx| {
-                                            let insert_position = buffer.anchor_before(buffer.len());
-                                            buffer.edit([(insert_position..insert_position, text)], None, cx);
-                                        });
-                                    })?;
-                                }
-                                Err(e) => {
-                                    Self::show_commit_message_error(&this, &e, cx);
-                                    break;
-                                }
-                            }
-                        }
-                    }
-                    Err(e) => {
-                        Self::show_commit_message_error(&this, &e, cx);
-                    }
-                }
-
-                anyhow::Ok(())
-            }
-            .log_err().await
-        }));
-    }
-
-    fn get_fetch_options(
-        &self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Option<FetchOptions>> {
-        let repo = self.active_repository.clone();
-        let workspace = self.workspace.clone();
-
-        cx.spawn_in(window, async move |_, cx| {
-            let repo = repo?;
-            let remotes = repo
-                .update(cx, |repo, _| repo.get_remotes(None, false))
-                .ok()?
-                .await
-                .ok()?
-                .log_err()?;
-
-            let mut remotes: Vec<_> = remotes.into_iter().map(FetchOptions::Remote).collect();
-            if remotes.len() > 1 {
-                remotes.push(FetchOptions::All);
-            }
-            let selection = cx
-                .update(|window, cx| {
-                    picker_prompt::prompt(
-                        "Pick which remote to fetch",
-                        remotes.iter().map(|r| r.name()).collect(),
-                        workspace,
-                        window,
-                        cx,
-                    )
-                })
-                .ok()?
-                .await?;
-            remotes.get(selection).cloned()
-        })
-    }
-
-    pub(crate) fn fetch(
-        &mut self,
-        is_fetch_all: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if !self.can_push_and_pull(cx) {
-            return;
-        }
-
-        let Some(repo) = self.active_repository.clone() else {
-            return;
-        };
-        telemetry::event!("Git Fetched");
-        let askpass = self.askpass_delegate("git fetch", window, cx);
-        let this = cx.weak_entity();
-
-        let fetch_options = if is_fetch_all {
-            Task::ready(Some(FetchOptions::All))
-        } else {
-            self.get_fetch_options(window, cx)
-        };
-
-        window
-            .spawn(cx, async move |cx| {
-                let Some(fetch_options) = fetch_options.await else {
-                    return Ok(());
-                };
-                let fetch = repo.update(cx, |repo, cx| {
-                    repo.fetch(fetch_options.clone(), askpass, cx)
-                })?;
-
-                let remote_message = fetch.await?;
-                this.update(cx, |this, cx| {
-                    let action = match fetch_options {
-                        FetchOptions::All => RemoteAction::Fetch(None),
-                        FetchOptions::Remote(remote) => RemoteAction::Fetch(Some(remote)),
-                    };
-                    match remote_message {
-                        Ok(remote_message) => this.show_remote_output(action, remote_message, cx),
-                        Err(e) => {
-                            log::error!("Error while fetching {:?}", e);
-                            this.show_error_toast(action.name(), e, cx)
-                        }
-                    }
-
-                    anyhow::Ok(())
-                })
-                .ok();
-                anyhow::Ok(())
-            })
-            .detach_and_log_err(cx);
-    }
-
-    pub(crate) fn git_clone(&mut self, repo: String, window: &mut Window, cx: &mut Context<Self>) {
-        let path = cx.prompt_for_paths(gpui::PathPromptOptions {
-            files: false,
-            directories: true,
-            multiple: false,
-            prompt: Some("Select as Repository Destination".into()),
-        });
-
-        let workspace = self.workspace.clone();
-
-        cx.spawn_in(window, async move |this, cx| {
-            let mut paths = path.await.ok()?.ok()??;
-            let mut path = paths.pop()?;
-            let repo_name = repo.split("/").last()?.strip_suffix(".git")?.to_owned();
-
-            let fs = this.read_with(cx, |this, _| this.fs.clone()).ok()?;
-
-            let prompt_answer = match fs.git_clone(&repo, path.as_path()).await {
-                Ok(_) => cx.update(|window, cx| {
-                    window.prompt(
-                        PromptLevel::Info,
-                        &format!("Git Clone: {}", repo_name),
-                        None,
-                        &["Add repo to project", "Open repo in new project"],
-                        cx,
-                    )
-                }),
-                Err(e) => {
-                    this.update(cx, |this: &mut GitPanel, cx| {
-                        let toast = StatusToast::new(e.to_string(), cx, |this, _| {
-                            this.icon(ToastIcon::new(IconName::XCircle).color(Color::Error))
-                                .dismiss_button(true)
-                        });
-
-                        this.workspace
-                            .update(cx, |workspace, cx| {
-                                workspace.toggle_status_toast(toast, cx);
-                            })
-                            .ok();
-                    })
-                    .ok()?;
-
-                    return None;
-                }
-            }
-            .ok()?;
-
-            path.push(repo_name);
-            match prompt_answer.await.ok()? {
-                0 => {
-                    workspace
-                        .update(cx, |workspace, cx| {
-                            workspace
-                                .project()
-                                .update(cx, |project, cx| {
-                                    project.create_worktree(path.as_path(), true, cx)
-                                })
-                                .detach();
-                        })
-                        .ok();
-                }
-                1 => {
-                    workspace
-                        .update(cx, move |workspace, cx| {
-                            workspace::open_new(
-                                Default::default(),
-                                workspace.app_state().clone(),
-                                cx,
-                                move |workspace, _, cx| {
-                                    cx.activate(true);
-                                    workspace
-                                        .project()
-                                        .update(cx, |project, cx| {
-                                            project.create_worktree(&path, true, cx)
-                                        })
-                                        .detach();
-                                },
-                            )
-                            .detach();
-                        })
-                        .ok();
-                }
-                _ => {}
-            }
-
-            Some(())
-        })
-        .detach();
-    }
-
-    pub(crate) fn git_init(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let worktrees = self
-            .project
-            .read(cx)
-            .visible_worktrees(cx)
-            .collect::<Vec<_>>();
-
-        let worktree = if worktrees.len() == 1 {
-            Task::ready(Some(worktrees.first().unwrap().clone()))
-        } else if worktrees.is_empty() {
-            let result = window.prompt(
-                PromptLevel::Warning,
-                "Unable to initialize a git repository",
-                Some("Open a directory first"),
-                &["Ok"],
-                cx,
-            );
-            cx.background_executor()
-                .spawn(async move {
-                    result.await.ok();
-                })
-                .detach();
-            return;
-        } else {
-            let worktree_directories = worktrees
-                .iter()
-                .map(|worktree| worktree.read(cx).abs_path())
-                .map(|worktree_abs_path| {
-                    if let Ok(path) = worktree_abs_path.strip_prefix(util::paths::home_dir()) {
-                        Path::new("~")
-                            .join(path)
-                            .to_string_lossy()
-                            .to_string()
-                            .into()
-                    } else {
-                        worktree_abs_path.to_string_lossy().into_owned().into()
-                    }
-                })
-                .collect_vec();
-            let prompt = picker_prompt::prompt(
-                "Where would you like to initialize this git repository?",
-                worktree_directories,
-                self.workspace.clone(),
-                window,
-                cx,
-            );
-
-            cx.spawn(async move |_, _| prompt.await.map(|ix| worktrees[ix].clone()))
-        };
-
-        cx.spawn_in(window, async move |this, cx| {
-            let worktree = match worktree.await {
-                Some(worktree) => worktree,
-                None => {
-                    return;
-                }
-            };
-
-            let Ok(result) = this.update(cx, |this, cx| {
-                let fallback_branch_name = GitPanelSettings::get_global(cx)
-                    .fallback_branch_name
-                    .clone();
-                this.project.read(cx).git_init(
-                    worktree.read(cx).abs_path(),
-                    fallback_branch_name,
-                    cx,
-                )
-            }) else {
-                return;
-            };
-
-            let result = result.await;
-
-            this.update_in(cx, |this, _, cx| match result {
-                Ok(()) => {}
-                Err(e) => this.show_error_toast("init", e, cx),
-            })
-            .ok();
-        })
-        .detach();
-    }
-
-    pub(crate) fn pull(&mut self, rebase: bool, window: &mut Window, cx: &mut Context<Self>) {
-        if !self.can_push_and_pull(cx) {
-            return;
-        }
-        let Some(repo) = self.active_repository.clone() else {
-            return;
-        };
-        let Some(branch) = repo.read(cx).branch.as_ref() else {
-            return;
-        };
-        telemetry::event!("Git Pulled");
-        let branch = branch.clone();
-        let remote = self.get_remote(false, false, window, cx);
-        cx.spawn_in(window, async move |this, cx| {
-            let remote = match remote.await {
-                Ok(Some(remote)) => remote,
-                Ok(None) => {
-                    return Ok(());
-                }
-                Err(e) => {
-                    log::error!("Failed to get current remote: {}", e);
-                    this.update(cx, |this, cx| this.show_error_toast("pull", e, cx))
-                        .ok();
-                    return Ok(());
-                }
-            };
-
-            let askpass = this.update_in(cx, |this, window, cx| {
-                this.askpass_delegate(format!("git pull {}", remote.name), window, cx)
-            })?;
-
-            let branch_name = branch
-                .upstream
-                .is_none()
-                .then(|| branch.name().to_owned().into());
-
-            let pull = repo.update(cx, |repo, cx| {
-                repo.pull(branch_name, remote.name.clone(), rebase, askpass, cx)
-            })?;
-
-            let remote_message = pull.await?;
-
-            let action = RemoteAction::Pull(remote);
-            this.update(cx, |this, cx| match remote_message {
-                Ok(remote_message) => this.show_remote_output(action, remote_message, cx),
-                Err(e) => {
-                    log::error!("Error while pulling {:?}", e);
-                    this.show_error_toast(action.name(), e, cx)
-                }
-            })
-            .ok();
-
-            anyhow::Ok(())
-        })
-        .detach_and_log_err(cx);
-    }
-
-    pub(crate) fn push(
-        &mut self,
-        force_push: bool,
-        select_remote: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if !self.can_push_and_pull(cx) {
-            return;
-        }
-        let Some(repo) = self.active_repository.clone() else {
-            return;
-        };
-        let Some(branch) = repo.read(cx).branch.as_ref() else {
-            return;
-        };
-        telemetry::event!("Git Pushed");
-        let branch = branch.clone();
-
-        let options = if force_push {
-            Some(PushOptions::Force)
-        } else {
-            match branch.upstream {
-                Some(Upstream {
-                    tracking: UpstreamTracking::Gone,
-                    ..
-                })
-                | None => Some(PushOptions::SetUpstream),
-                _ => None,
-            }
-        };
-        let remote = self.get_remote(select_remote, true, window, cx);
-
-        cx.spawn_in(window, async move |this, cx| {
-            let remote = match remote.await {
-                Ok(Some(remote)) => remote,
-                Ok(None) => {
-                    return Ok(());
-                }
-                Err(e) => {
-                    log::error!("Failed to get current remote: {}", e);
-                    this.update(cx, |this, cx| this.show_error_toast("push", e, cx))
-                        .ok();
-                    return Ok(());
-                }
-            };
-
-            let askpass_delegate = this.update_in(cx, |this, window, cx| {
-                this.askpass_delegate(format!("git push {}", remote.name), window, cx)
-            })?;
-
-            let push = repo.update(cx, |repo, cx| {
-                repo.push(
-                    branch.name().to_owned().into(),
-                    remote.name.clone(),
-                    options,
-                    askpass_delegate,
-                    cx,
-                )
-            })?;
-
-            let remote_output = push.await?;
-
-            let action = RemoteAction::Push(branch.name().to_owned().into(), remote);
-            this.update(cx, |this, cx| match remote_output {
-                Ok(remote_message) => this.show_remote_output(action, remote_message, cx),
-                Err(e) => {
-                    log::error!("Error while pushing {:?}", e);
-                    this.show_error_toast(action.name(), e, cx)
-                }
-            })?;
-
-            anyhow::Ok(())
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn askpass_delegate(
-        &self,
-        operation: impl Into<SharedString>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> AskPassDelegate {
-        let this = cx.weak_entity();
-        let operation = operation.into();
-        let window = window.window_handle();
-        AskPassDelegate::new(&mut cx.to_async(), move |prompt, tx, cx| {
-            window
-                .update(cx, |_, window, cx| {
-                    this.update(cx, |this, cx| {
-                        this.workspace.update(cx, |workspace, cx| {
-                            workspace.toggle_modal(window, cx, |window, cx| {
-                                AskPassModal::new(operation.clone(), prompt.into(), tx, window, cx)
-                            });
-                        })
-                    })
-                })
-                .ok();
-        })
-    }
-
-    fn can_push_and_pull(&self, cx: &App) -> bool {
-        !self.project.read(cx).is_via_collab()
-    }
-
-    fn get_remote(
-        &mut self,
-        always_select: bool,
-        is_push: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl Future<Output = anyhow::Result<Option<Remote>>> + use<> {
-        let repo = self.active_repository.clone();
-        let workspace = self.workspace.clone();
-        let mut cx = window.to_async(cx);
-
-        async move {
-            let repo = repo.context("No active repository")?;
-            let current_remotes: Vec<Remote> = repo
-                .update(&mut cx, |repo, _| {
-                    let current_branch = if always_select {
-                        None
-                    } else {
-                        let current_branch = repo.branch.as_ref().context("No active branch")?;
-                        Some(current_branch.name().to_string())
-                    };
-                    anyhow::Ok(repo.get_remotes(current_branch, is_push))
-                })??
-                .await??;
-
-            let current_remotes: Vec<_> = current_remotes
-                .into_iter()
-                .map(|remotes| remotes.name)
-                .collect();
-            let selection = cx
-                .update(|window, cx| {
-                    picker_prompt::prompt(
-                        "Pick which remote to push to",
-                        current_remotes.clone(),
-                        workspace,
-                        window,
-                        cx,
-                    )
-                })?
-                .await;
-
-            Ok(selection.map(|selection| Remote {
-                name: current_remotes[selection].clone(),
-            }))
-        }
-    }
-
-    pub fn load_local_committer(&mut self, cx: &Context<Self>) {
-        if self.local_committer_task.is_none() {
-            self.local_committer_task = Some(cx.spawn(async move |this, cx| {
-                let committer = get_git_committer(cx).await;
-                this.update(cx, |this, cx| {
-                    this.local_committer = Some(committer);
-                    cx.notify()
-                })
-                .ok();
-            }));
-        }
-    }
-
-    fn potential_co_authors(&self, cx: &App) -> Vec<(String, String)> {
-        let mut new_co_authors = Vec::new();
-        let project = self.project.read(cx);
-
-        let Some(room) = self
-            .workspace
-            .upgrade()
-            .and_then(|workspace| workspace.read(cx).active_call()?.read(cx).room().cloned())
-        else {
-            return Vec::default();
-        };
-
-        let room = room.read(cx);
-
-        for (peer_id, collaborator) in project.collaborators() {
-            if collaborator.is_host {
-                continue;
-            }
-
-            let Some(participant) = room.remote_participant_for_peer_id(*peer_id) else {
-                continue;
-            };
-            if !participant.can_write() {
-                continue;
-            }
-            if let Some(email) = &collaborator.committer_email {
-                let name = collaborator
-                    .committer_name
-                    .clone()
-                    .or_else(|| participant.user.name.clone())
-                    .unwrap_or_else(|| participant.user.github_login.clone().to_string());
-                new_co_authors.push((name.clone(), email.clone()))
-            }
-        }
-        if !project.is_local()
-            && !project.is_read_only(cx)
-            && let Some(local_committer) = self.local_committer(room, cx)
-        {
-            new_co_authors.push(local_committer);
-        }
-        new_co_authors
-    }
-
-    fn local_committer(&self, room: &call::Room, cx: &App) -> Option<(String, String)> {
-        let user = room.local_participant_user(cx)?;
-        let committer = self.local_committer.as_ref()?;
-        let email = committer.email.clone()?;
-        let name = committer
-            .name
-            .clone()
-            .or_else(|| user.name.clone())
-            .unwrap_or_else(|| user.github_login.clone().to_string());
-        Some((name, email))
-    }
-
-    fn toggle_fill_co_authors(
-        &mut self,
-        _: &ToggleFillCoAuthors,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.add_coauthors = !self.add_coauthors;
-        cx.notify();
-    }
-
-    fn toggle_sort_by_path(
-        &mut self,
-        _: &ToggleSortByPath,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let current_setting = GitPanelSettings::get_global(cx).sort_by_path;
-        if let Some(workspace) = self.workspace.upgrade() {
-            let workspace = workspace.read(cx);
-            let fs = workspace.app_state().fs.clone();
-            cx.update_global::<SettingsStore, _>(|store, _cx| {
-                store.update_settings_file(fs, move |settings, _cx| {
-                    settings.git_panel.get_or_insert_default().sort_by_path =
-                        Some(!current_setting);
-                });
-            });
-        }
-    }
-
-    fn toggle_tree_view(&mut self, _: &ToggleTreeView, _: &mut Window, cx: &mut Context<Self>) {
-        let current_setting = GitPanelSettings::get_global(cx).tree_view;
-        if let Some(workspace) = self.workspace.upgrade() {
-            let workspace = workspace.read(cx);
-            let fs = workspace.app_state().fs.clone();
-            cx.update_global::<SettingsStore, _>(|store, _cx| {
-                store.update_settings_file(fs, move |settings, _cx| {
-                    settings.git_panel.get_or_insert_default().tree_view = Some(!current_setting);
-                });
-            })
-        }
-    }
-
-    fn toggle_directory(&mut self, key: &TreeKey, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(state) = self.view_mode.tree_state_mut() {
-            let expanded = state.expanded_dirs.entry(key.clone()).or_insert(true);
-            *expanded = !*expanded;
-            self.update_visible_entries(window, cx);
-        } else {
-            util::debug_panic!("Attempted to toggle directory in flat Git Panel state");
-        }
-    }
-
-    fn fill_co_authors(&mut self, message: &mut String, cx: &mut Context<Self>) {
-        const CO_AUTHOR_PREFIX: &str = "Co-authored-by: ";
-
-        let existing_text = message.to_ascii_lowercase();
-        let lowercase_co_author_prefix = CO_AUTHOR_PREFIX.to_lowercase();
-        let mut ends_with_co_authors = false;
-        let existing_co_authors = existing_text
-            .lines()
-            .filter_map(|line| {
-                let line = line.trim();
-                if line.starts_with(&lowercase_co_author_prefix) {
-                    ends_with_co_authors = true;
-                    Some(line)
-                } else {
-                    ends_with_co_authors = false;
-                    None
-                }
-            })
-            .collect::<HashSet<_>>();
-
-        let new_co_authors = self
-            .potential_co_authors(cx)
-            .into_iter()
-            .filter(|(_, email)| {
-                !existing_co_authors
-                    .iter()
-                    .any(|existing| existing.contains(email.as_str()))
-            })
-            .collect::<Vec<_>>();
-
-        if new_co_authors.is_empty() {
-            return;
-        }
-
-        if !ends_with_co_authors {
-            message.push('\n');
-        }
-        for (name, email) in new_co_authors {
-            message.push('\n');
-            message.push_str(CO_AUTHOR_PREFIX);
-            message.push_str(&name);
-            message.push_str(" <");
-            message.push_str(&email);
-            message.push('>');
-        }
-        message.push('\n');
-    }
-
-    fn schedule_update(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let handle = cx.entity().downgrade();
-        self.reopen_commit_buffer(window, cx);
-        self.update_visible_entries_task = cx.spawn_in(window, async move |_, cx| {
-            cx.background_executor().timer(UPDATE_DEBOUNCE).await;
-            if let Some(git_panel) = handle.upgrade() {
-                git_panel
-                    .update_in(cx, |git_panel, window, cx| {
-                        git_panel.update_visible_entries(window, cx);
-                    })
-                    .ok();
-            }
-        });
-    }
-
-    fn reopen_commit_buffer(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let Some(active_repo) = self.active_repository.as_ref() else {
-            return;
-        };
-        let load_buffer = active_repo.update(cx, |active_repo, cx| {
-            let project = self.project.read(cx);
-            active_repo.open_commit_buffer(
-                Some(project.languages().clone()),
-                project.buffer_store().clone(),
-                cx,
-            )
-        });
-
-        cx.spawn_in(window, async move |git_panel, cx| {
-            let buffer = load_buffer.await?;
-            git_panel.update_in(cx, |git_panel, window, cx| {
-                if git_panel
-                    .commit_editor
-                    .read(cx)
-                    .buffer()
-                    .read(cx)
-                    .as_singleton()
-                    .as_ref()
-                    != Some(&buffer)
-                {
-                    git_panel.commit_editor = cx.new(|cx| {
-                        commit_message_editor(
-                            buffer,
-                            git_panel.suggest_commit_message(cx).map(SharedString::from),
-                            git_panel.project.clone(),
-                            true,
-                            window,
-                            cx,
-                        )
-                    });
-                }
-            })
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn update_visible_entries(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let path_style = self.project.read(cx).path_style(cx);
-        let bulk_staging = self.bulk_staging.take();
-        let last_staged_path_prev_index = bulk_staging
-            .as_ref()
-            .and_then(|op| self.entry_by_path(&op.anchor));
-
-        self.entries.clear();
-        self.entries_indices.clear();
-        self.single_staged_entry.take();
-        self.single_tracked_entry.take();
-        self.conflicted_count = 0;
-        self.conflicted_staged_count = 0;
-        self.changes_count = 0;
-        self.new_count = 0;
-        self.tracked_count = 0;
-        self.new_staged_count = 0;
-        self.tracked_staged_count = 0;
-        self.entry_count = 0;
-        self.max_width_item_index = None;
-
-        let sort_by_path = GitPanelSettings::get_global(cx).sort_by_path;
-        let is_tree_view = matches!(self.view_mode, GitPanelViewMode::Tree(_));
-        let group_by_status = is_tree_view || !sort_by_path;
-
-        let mut changed_entries = Vec::new();
-        let mut new_entries = Vec::new();
-        let mut conflict_entries = Vec::new();
-        let mut single_staged_entry = None;
-        let mut staged_count = 0;
-        let mut seen_directories = HashSet::default();
-        let mut max_width_estimate = 0usize;
-        let mut max_width_item_index = None;
-
-        let Some(repo) = self.active_repository.as_ref() else {
-            // Just clear entries if no repository is active.
-            cx.notify();
-            return;
-        };
-
-        let repo = repo.read(cx);
-
-        self.stash_entries = repo.cached_stash();
-
-        for entry in repo.cached_status() {
-            self.changes_count += 1;
-            let is_conflict = repo.had_conflict_on_last_merge_head_change(&entry.repo_path);
-            let is_new = entry.status.is_created();
-            let staging = entry.status.staging();
-
-            if let Some(pending) = repo.pending_ops_for_path(&entry.repo_path)
-                && pending
-                    .ops
-                    .iter()
-                    .any(|op| op.git_status == pending_op::GitStatus::Reverted && op.finished())
-            {
-                continue;
-            }
-
-            let entry = GitStatusEntry {
-                repo_path: entry.repo_path.clone(),
-                status: entry.status,
-                staging,
-            };
-
-            if staging.has_staged() {
-                staged_count += 1;
-                single_staged_entry = Some(entry.clone());
-            }
-
-            if group_by_status && is_conflict {
-                conflict_entries.push(entry);
-            } else if group_by_status && is_new {
-                new_entries.push(entry);
-            } else {
-                changed_entries.push(entry);
-            }
-        }
-
-        if conflict_entries.is_empty() {
-            if staged_count == 1
-                && let Some(entry) = single_staged_entry.as_ref()
-            {
-                if let Some(ops) = repo.pending_ops_for_path(&entry.repo_path) {
-                    if ops.staged() {
-                        self.single_staged_entry = single_staged_entry;
-                    }
-                } else {
-                    self.single_staged_entry = single_staged_entry;
-                }
-            } else if repo.pending_ops_summary().item_summary.staging_count == 1
-                && let Some(ops) = repo.pending_ops().find(|ops| ops.staging())
-            {
-                self.single_staged_entry =
-                    repo.status_for_path(&ops.repo_path)
-                        .map(|status| GitStatusEntry {
-                            repo_path: ops.repo_path.clone(),
-                            status: status.status,
-                            staging: StageStatus::Staged,
-                        });
-            }
-        }
-
-        if conflict_entries.is_empty() && changed_entries.len() == 1 {
-            self.single_tracked_entry = changed_entries.first().cloned();
-        }
-
-        let mut push_entry =
-            |this: &mut Self,
-             entry: GitListEntry,
-             is_visible: bool,
-             logical_indices: Option<&mut Vec<usize>>| {
-                if let Some(estimate) =
-                    this.width_estimate_for_list_entry(is_tree_view, &entry, path_style)
-                {
-                    if estimate > max_width_estimate {
-                        max_width_estimate = estimate;
-                        max_width_item_index = Some(this.entries.len());
-                    }
-                }
-
-                if let Some(repo_path) = entry.status_entry().map(|status| status.repo_path.clone())
-                {
-                    this.entries_indices.insert(repo_path, this.entries.len());
-                }
-
-                if let (Some(indices), true) = (logical_indices, is_visible) {
-                    indices.push(this.entries.len());
-                }
-
-                this.entries.push(entry);
-            };
-
-        macro_rules! take_section_entries {
-            () => {
-                [
-                    (Section::Conflict, std::mem::take(&mut conflict_entries)),
-                    (Section::Tracked, std::mem::take(&mut changed_entries)),
-                    (Section::New, std::mem::take(&mut new_entries)),
-                ]
-            };
-        }
-
-        match &mut self.view_mode {
-            GitPanelViewMode::Tree(tree_state) => {
-                tree_state.logical_indices.clear();
-                tree_state.directory_descendants.clear();
-
-                // This is just to get around the borrow checker
-                // because push_entry mutably borrows self
-                let mut tree_state = std::mem::take(tree_state);
-
-                for (section, entries) in take_section_entries!() {
-                    if entries.is_empty() {
-                        continue;
-                    }
-
-                    push_entry(
-                        self,
-                        GitListEntry::Header(GitHeaderEntry { header: section }),
-                        true,
-                        Some(&mut tree_state.logical_indices),
-                    );
-
-                    for (entry, is_visible) in tree_state.build_tree_entries(
-                        section,
-                        entries,
-                        &repo,
-                        &mut seen_directories,
-                        &self.optimistic_staging,
-                    ) {
-                        push_entry(
-                            self,
-                            entry,
-                            is_visible,
-                            Some(&mut tree_state.logical_indices),
-                        );
-                    }
-                }
-
-                tree_state
-                    .expanded_dirs
-                    .retain(|key, _| seen_directories.contains(key));
-                self.view_mode = GitPanelViewMode::Tree(tree_state);
-            }
-            GitPanelViewMode::Flat => {
-                for (section, entries) in take_section_entries!() {
-                    if entries.is_empty() {
-                        continue;
-                    }
-
-                    if section != Section::Tracked || !sort_by_path {
-                        push_entry(
-                            self,
-                            GitListEntry::Header(GitHeaderEntry { header: section }),
-                            true,
-                            None,
-                        );
-                    }
-
-                    for entry in entries {
-                        push_entry(self, GitListEntry::Status(entry), true, None);
-                    }
-                }
-            }
-        }
-
-        self.max_width_item_index = max_width_item_index;
-
-        self.update_counts(repo);
-        let visible_paths: HashSet<RepoPath> = self
-            .entries
-            .iter()
-            .filter_map(|entry| entry.status_entry().map(|e| e.repo_path.clone()))
-            .collect();
-        self.optimistic_staging
-            .retain(|path, _| visible_paths.contains(path));
-
-        let bulk_staging_anchor_new_index = bulk_staging
-            .as_ref()
-            .filter(|op| op.repo_id == repo.id)
-            .and_then(|op| self.entry_by_path(&op.anchor));
-        if bulk_staging_anchor_new_index == last_staged_path_prev_index
-            && let Some(index) = bulk_staging_anchor_new_index
-            && let Some(entry) = self.entries.get(index)
-            && let Some(entry) = entry.status_entry()
-            && self.is_entry_staged(entry, &repo)
-        {
-            self.bulk_staging = bulk_staging;
-        }
-
-        self.select_first_entry_if_none(cx);
-
-        let suggested_commit_message = self.suggest_commit_message(cx);
-        let placeholder_text = suggested_commit_message.unwrap_or("Enter commit message".into());
-
-        self.commit_editor.update(cx, |editor, cx| {
-            editor.set_placeholder_text(&placeholder_text, window, cx)
-        });
-
-        cx.notify();
-    }
-
-    fn header_state(&self, header_type: Section) -> ToggleState {
-        let (staged_count, count) = match header_type {
-            Section::New => (self.new_staged_count, self.new_count),
-            Section::Tracked => (self.tracked_staged_count, self.tracked_count),
-            Section::Conflict => (self.conflicted_staged_count, self.conflicted_count),
-        };
-        if staged_count == 0 {
-            ToggleState::Unselected
-        } else if count == staged_count {
-            ToggleState::Selected
-        } else {
-            ToggleState::Indeterminate
-        }
-    }
-
-    fn update_counts(&mut self, repo: &Repository) {
-        self.show_placeholders = false;
-        self.conflicted_count = 0;
-        self.conflicted_staged_count = 0;
-        self.new_count = 0;
-        self.tracked_count = 0;
-        self.new_staged_count = 0;
-        self.tracked_staged_count = 0;
-        self.entry_count = 0;
-
-        for status_entry in self.entries.iter().filter_map(|entry| entry.status_entry()) {
-            self.entry_count += 1;
-            let is_staging_or_staged = self.is_entry_staged(status_entry, repo);
-
-            if repo.had_conflict_on_last_merge_head_change(&status_entry.repo_path) {
-                self.conflicted_count += 1;
-                if is_staging_or_staged {
-                    self.conflicted_staged_count += 1;
-                }
-            } else if status_entry.status.is_created() {
-                self.new_count += 1;
-                if is_staging_or_staged {
-                    self.new_staged_count += 1;
-                }
-            } else {
-                self.tracked_count += 1;
-                if is_staging_or_staged {
-                    self.tracked_staged_count += 1;
-                }
-            }
-        }
-    }
-
-    pub(crate) fn has_staged_changes(&self) -> bool {
-        self.tracked_staged_count > 0
-            || self.new_staged_count > 0
-            || self.conflicted_staged_count > 0
-    }
-
-    pub(crate) fn has_unstaged_changes(&self) -> bool {
-        self.tracked_count > self.tracked_staged_count
-            || self.new_count > self.new_staged_count
-            || self.conflicted_count > self.conflicted_staged_count
-    }
-
-    fn has_tracked_changes(&self) -> bool {
-        self.tracked_count > 0
-    }
-
-    pub fn has_unstaged_conflicts(&self) -> bool {
-        self.conflicted_count > 0 && self.conflicted_count != self.conflicted_staged_count
-    }
-
-    fn show_error_toast(&self, action: impl Into<SharedString>, e: anyhow::Error, cx: &mut App) {
-        let Some(workspace) = self.workspace.upgrade() else {
-            return;
-        };
-        show_error_toast(workspace, action, e, cx)
-    }
-
-    fn show_commit_message_error<E>(weak_this: &WeakEntity<Self>, err: &E, cx: &mut AsyncApp)
-    where
-        E: std::fmt::Debug + std::fmt::Display,
-    {
-        if let Ok(Some(workspace)) = weak_this.update(cx, |this, _cx| this.workspace.upgrade()) {
-            let _ = workspace.update(cx, |workspace, cx| {
-                struct CommitMessageError;
-                let notification_id = NotificationId::unique::<CommitMessageError>();
-                workspace.show_notification(notification_id, cx, |cx| {
-                    cx.new(|cx| {
-                        ErrorMessagePrompt::new(
-                            format!("Failed to generate commit message: {err}"),
-                            cx,
-                        )
-                    })
-                });
-            });
-        }
-    }
-
-    fn show_remote_output(&self, action: RemoteAction, info: RemoteCommandOutput, cx: &mut App) {
-        let Some(workspace) = self.workspace.upgrade() else {
-            return;
-        };
-
-        workspace.update(cx, |workspace, cx| {
-            let SuccessMessage { message, style } = remote_output::format_output(&action, info);
-            let workspace_weak = cx.weak_entity();
-            let operation = action.name();
-
-            let status_toast = StatusToast::new(message, cx, move |this, _cx| {
-                use remote_output::SuccessStyle::*;
-                match style {
-                    Toast => this.icon(ToastIcon::new(IconName::GitBranchAlt).color(Color::Muted)),
-                    ToastWithLog { output } => this
-                        .icon(ToastIcon::new(IconName::GitBranchAlt).color(Color::Muted))
-                        .action("View Log", move |window, cx| {
-                            let output = output.clone();
-                            let output =
-                                format!("stdout:\n{}\nstderr:\n{}", output.stdout, output.stderr);
-                            workspace_weak
-                                .update(cx, move |workspace, cx| {
-                                    open_output(operation, workspace, &output, window, cx)
-                                })
-                                .ok();
-                        }),
-                    PushPrLink { text, link } => this
-                        .icon(ToastIcon::new(IconName::GitBranchAlt).color(Color::Muted))
-                        .action(text, move |_, cx| cx.open_url(&link)),
-                }
-            });
-            workspace.toggle_status_toast(status_toast, cx)
-        });
-    }
-
-    pub fn can_commit(&self) -> bool {
-        (self.has_staged_changes() || self.has_tracked_changes()) && !self.has_unstaged_conflicts()
-    }
-
-    pub fn can_stage_all(&self) -> bool {
-        self.has_unstaged_changes()
-    }
-
-    pub fn can_unstage_all(&self) -> bool {
-        self.has_staged_changes()
-    }
-
-    fn status_width_estimate(
-        tree_view: bool,
-        entry: &GitStatusEntry,
-        path_style: PathStyle,
-        depth: usize,
-    ) -> usize {
-        if tree_view {
-            Self::item_width_estimate(0, entry.display_name(path_style).len(), depth)
-        } else {
-            Self::item_width_estimate(
-                entry.parent_dir(path_style).map(|s| s.len()).unwrap_or(0),
-                entry.display_name(path_style).len(),
-                0,
-            )
-        }
-    }
-
-    fn width_estimate_for_list_entry(
-        &self,
-        tree_view: bool,
-        entry: &GitListEntry,
-        path_style: PathStyle,
-    ) -> Option<usize> {
-        match entry {
-            GitListEntry::Status(status) => Some(Self::status_width_estimate(
-                tree_view, status, path_style, 0,
-            )),
-            GitListEntry::TreeStatus(status) => Some(Self::status_width_estimate(
-                tree_view,
-                &status.entry,
-                path_style,
-                status.depth,
-            )),
-            GitListEntry::Directory(dir) => {
-                Some(Self::item_width_estimate(0, dir.name.len(), dir.depth))
-            }
-            GitListEntry::Header(_) => None,
-        }
-    }
-
-    fn item_width_estimate(path: usize, file_name: usize, depth: usize) -> usize {
-        path + file_name + depth * 2
-    }
-
-    fn render_overflow_menu(&self, id: impl Into<ElementId>) -> impl IntoElement {
-        let focus_handle = self.focus_handle.clone();
-        let has_tracked_changes = self.has_tracked_changes();
-        let has_staged_changes = self.has_staged_changes();
-        let has_unstaged_changes = self.has_unstaged_changes();
-        let has_new_changes = self.new_count > 0;
-        let has_stash_items = self.stash_entries.entries.len() > 0;
-
-        PopoverMenu::new(id.into())
-            .trigger(
-                IconButton::new("overflow-menu-trigger", IconName::Ellipsis)
-                    .icon_size(IconSize::Small)
-                    .icon_color(Color::Muted),
-            )
-            .menu(move |window, cx| {
-                Some(git_panel_context_menu(
-                    focus_handle.clone(),
-                    GitMenuState {
-                        has_tracked_changes,
-                        has_staged_changes,
-                        has_unstaged_changes,
-                        has_new_changes,
-                        sort_by_path: GitPanelSettings::get_global(cx).sort_by_path,
-                        has_stash_items,
-                        tree_view: GitPanelSettings::get_global(cx).tree_view,
-                    },
-                    window,
-                    cx,
-                ))
-            })
-            .anchor(Corner::TopRight)
-    }
-
-    pub(crate) fn render_generate_commit_message_button(
-        &self,
-        cx: &Context<Self>,
-    ) -> Option<AnyElement> {
-        if !agent_settings::AgentSettings::get_global(cx).enabled(cx)
-            || LanguageModelRegistry::read_global(cx)
-                .commit_message_model()
-                .is_none()
-        {
-            return None;
-        }
-
-        if self.generate_commit_message_task.is_some() {
-            return Some(
-                h_flex()
-                    .gap_1()
-                    .child(
-                        Icon::new(IconName::ArrowCircle)
-                            .size(IconSize::XSmall)
-                            .color(Color::Info)
-                            .with_rotate_animation(2),
-                    )
-                    .child(
-                        Label::new("Generating Commit...")
-                            .size(LabelSize::Small)
-                            .color(Color::Muted),
-                    )
-                    .into_any_element(),
-            );
-        }
-
-        let can_commit = self.can_commit();
-        let editor_focus_handle = self.commit_editor.focus_handle(cx);
-        Some(
-            IconButton::new("generate-commit-message", IconName::AiEdit)
-                .shape(ui::IconButtonShape::Square)
-                .icon_color(Color::Muted)
-                .tooltip(move |_window, cx| {
-                    if can_commit {
-                        Tooltip::for_action_in(
-                            "Generate Commit Message",
-                            &git::GenerateCommitMessage,
-                            &editor_focus_handle,
-                            cx,
-                        )
-                    } else {
-                        Tooltip::simple("No changes to commit", cx)
-                    }
-                })
-                .disabled(!can_commit)
-                .on_click(cx.listener(move |this, _event, _window, cx| {
-                    this.generate_commit_message(cx);
-                }))
-                .into_any_element(),
-        )
-    }
-
-    pub(crate) fn render_co_authors(&self, cx: &Context<Self>) -> Option<AnyElement> {
-        let potential_co_authors = self.potential_co_authors(cx);
-
-        let (tooltip_label, icon) = if self.add_coauthors {
-            ("Remove co-authored-by", IconName::Person)
-        } else {
-            ("Add co-authored-by", IconName::UserCheck)
-        };
-
-        if potential_co_authors.is_empty() {
-            None
-        } else {
-            Some(
-                IconButton::new("co-authors", icon)
-                    .shape(ui::IconButtonShape::Square)
-                    .icon_color(Color::Disabled)
-                    .selected_icon_color(Color::Selected)
-                    .toggle_state(self.add_coauthors)
-                    .tooltip(move |_, cx| {
-                        let title = format!(
-                            "{}:{}{}",
-                            tooltip_label,
-                            if potential_co_authors.len() == 1 {
-                                ""
-                            } else {
-                                "\n"
-                            },
-                            potential_co_authors
-                                .iter()
-                                .map(|(name, email)| format!(" {} <{}>", name, email))
-                                .join("\n")
-                        );
-                        Tooltip::simple(title, cx)
-                    })
-                    .on_click(cx.listener(|this, _, _, cx| {
-                        this.add_coauthors = !this.add_coauthors;
-                        cx.notify();
-                    }))
-                    .into_any_element(),
-            )
-        }
-    }
-
-    fn render_git_commit_menu(
-        &self,
-        id: impl Into<ElementId>,
-        keybinding_target: Option<FocusHandle>,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        PopoverMenu::new(id.into())
-            .trigger(
-                ui::ButtonLike::new_rounded_right("commit-split-button-right")
-                    .layer(ui::ElevationIndex::ModalSurface)
-                    .size(ButtonSize::None)
-                    .child(
-                        h_flex()
-                            .px_1()
-                            .h_full()
-                            .justify_center()
-                            .border_l_1()
-                            .border_color(cx.theme().colors().border)
-                            .child(Icon::new(IconName::ChevronDown).size(IconSize::XSmall)),
-                    ),
-            )
-            .menu({
-                let git_panel = cx.entity();
-                let has_previous_commit = self.head_commit(cx).is_some();
-                let amend = self.amend_pending();
-                let signoff = self.signoff_enabled;
-
-                move |window, cx| {
-                    Some(ContextMenu::build(window, cx, |context_menu, _, _| {
-                        context_menu
-                            .when_some(keybinding_target.clone(), |el, keybinding_target| {
-                                el.context(keybinding_target)
-                            })
-                            .when(has_previous_commit, |this| {
-                                this.toggleable_entry(
-                                    "Amend",
-                                    amend,
-                                    IconPosition::Start,
-                                    Some(Box::new(Amend)),
-                                    {
-                                        let git_panel = git_panel.downgrade();
-                                        move |_, cx| {
-                                            git_panel
-                                                .update(cx, |git_panel, cx| {
-                                                    git_panel.toggle_amend_pending(cx);
-                                                })
-                                                .ok();
-                                        }
-                                    },
-                                )
-                            })
-                            .toggleable_entry(
-                                "Signoff",
-                                signoff,
-                                IconPosition::Start,
-                                Some(Box::new(Signoff)),
-                                move |window, cx| window.dispatch_action(Box::new(Signoff), cx),
-                            )
-                    }))
-                }
-            })
-            .anchor(Corner::TopRight)
-    }
-
-    pub fn configure_commit_button(&self, cx: &mut Context<Self>) -> (bool, &'static str) {
-        if self.has_unstaged_conflicts() {
-            (false, "You must resolve conflicts before committing")
-        } else if !self.has_staged_changes() && !self.has_tracked_changes() && !self.amend_pending {
-            (false, "No changes to commit")
-        } else if self.pending_commit.is_some() {
-            (false, "Commit in progress")
-        } else if !self.has_commit_message(cx) {
-            (false, "No commit message")
-        } else if !self.has_write_access(cx) {
-            (false, "You do not have write access to this project")
-        } else {
-            (true, self.commit_button_title())
-        }
-    }
-
-    pub fn commit_button_title(&self) -> &'static str {
-        if self.amend_pending {
-            if self.has_staged_changes() {
-                "Amend"
-            } else if self.has_tracked_changes() {
-                "Amend Tracked"
-            } else {
-                "Amend"
-            }
-        } else if self.has_staged_changes() {
-            "Commit"
-        } else {
-            "Commit Tracked"
-        }
-    }
-
-    fn expand_commit_editor(
-        &mut self,
-        _: &git::ExpandCommitEditor,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let workspace = self.workspace.clone();
-        window.defer(cx, move |window, cx| {
-            workspace
-                .update(cx, |workspace, cx| {
-                    CommitModal::toggle(workspace, None, window, cx)
-                })
-                .ok();
-        })
-    }
-
-    fn render_panel_header(
-        &self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<impl IntoElement> {
-        self.active_repository.as_ref()?;
-
-        let (text, action, stage, tooltip) =
-            if self.total_staged_count() == self.entry_count && self.entry_count > 0 {
-                ("Unstage All", UnstageAll.boxed_clone(), false, "git reset")
-            } else {
-                ("Stage All", StageAll.boxed_clone(), true, "git add --all")
-            };
-
-        let change_string = match self.changes_count {
-            0 => "No Changes".to_string(),
-            1 => "1 Change".to_string(),
-            count => format!("{} Changes", count),
-        };
-
-        Some(
-            self.panel_header_container(window, cx)
-                .px_2()
-                .justify_between()
-                .child(
-                    panel_button(change_string)
-                        .color(Color::Muted)
-                        .tooltip(Tooltip::for_action_title_in(
-                            "Open Diff",
-                            &Diff,
-                            &self.focus_handle,
-                        ))
-                        .on_click(|_, _, cx| {
-                            cx.defer(|cx| {
-                                cx.dispatch_action(&Diff);
-                            })
-                        }),
-                )
-                .child(
-                    h_flex()
-                        .gap_1()
-                        .child(self.render_overflow_menu("overflow_menu"))
-                        .child(
-                            panel_filled_button(text)
-                                .tooltip(Tooltip::for_action_title_in(
-                                    tooltip,
-                                    action.as_ref(),
-                                    &self.focus_handle,
-                                ))
-                                .disabled(self.entry_count == 0)
-                                .on_click({
-                                    let git_panel = cx.weak_entity();
-                                    move |_, _, cx| {
-                                        git_panel
-                                            .update(cx, |git_panel, cx| {
-                                                git_panel.change_all_files_stage(stage, cx);
-                                            })
-                                            .ok();
-                                    }
-                                }),
-                        ),
-                ),
-        )
-    }
-
-    pub(crate) fn render_remote_button(&self, cx: &mut Context<Self>) -> Option<AnyElement> {
-        let branch = self.active_repository.as_ref()?.read(cx).branch.clone();
-        if !self.can_push_and_pull(cx) {
-            return None;
-        }
-        Some(
-            h_flex()
-                .gap_1()
-                .flex_shrink_0()
-                .when_some(branch, |this, branch| {
-                    let focus_handle = Some(self.focus_handle(cx));
-
-                    this.children(render_remote_button(
-                        "remote-button",
-                        &branch,
-                        focus_handle,
-                        true,
-                    ))
-                })
-                .into_any_element(),
-        )
-    }
-
-    pub fn render_footer(
-        &self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<impl IntoElement> {
-        let active_repository = self.active_repository.clone()?;
-        let panel_editor_style = panel_editor_style(true, window, cx);
-        let enable_coauthors = self.render_co_authors(cx);
-
-        let editor_focus_handle = self.commit_editor.focus_handle(cx);
-        let expand_tooltip_focus_handle = editor_focus_handle;
-
-        let branch = active_repository.read(cx).branch.clone();
-        let head_commit = active_repository.read(cx).head_commit.clone();
-
-        let footer_size = px(32.);
-        let gap = px(9.0);
-        let max_height = panel_editor_style
-            .text
-            .line_height_in_pixels(window.rem_size())
-            * MAX_PANEL_EDITOR_LINES
-            + gap;
-
-        let git_panel = cx.entity();
-        let display_name = SharedString::from(Arc::from(
-            active_repository
-                .read(cx)
-                .display_name()
-                .trim_end_matches("/"),
-        ));
-        let editor_is_long = self.commit_editor.update(cx, |editor, cx| {
-            editor.max_point(cx).row().0 >= MAX_PANEL_EDITOR_LINES as u32
-        });
-
-        let footer = v_flex()
-            .child(PanelRepoFooter::new(
-                display_name,
-                branch,
-                head_commit,
-                Some(git_panel),
-            ))
-            .child(
-                panel_editor_container(window, cx)
-                    .id("commit-editor-container")
-                    .relative()
-                    .w_full()
-                    .h(max_height + footer_size)
-                    .border_t_1()
-                    .border_color(cx.theme().colors().border)
-                    .cursor_text()
-                    .on_click(cx.listener(move |this, _: &ClickEvent, window, cx| {
-                        window.focus(&this.commit_editor.focus_handle(cx));
-                    }))
-                    .child(
-                        h_flex()
-                            .id("commit-footer")
-                            .border_t_1()
-                            .when(editor_is_long, |el| {
-                                el.border_color(cx.theme().colors().border_variant)
-                            })
-                            .absolute()
-                            .bottom_0()
-                            .left_0()
-                            .w_full()
-                            .px_2()
-                            .h(footer_size)
-                            .flex_none()
-                            .justify_between()
-                            .child(
-                                self.render_generate_commit_message_button(cx)
-                                    .unwrap_or_else(|| div().into_any_element()),
-                            )
-                            .child(
-                                h_flex()
-                                    .gap_0p5()
-                                    .children(enable_coauthors)
-                                    .child(self.render_commit_button(cx)),
-                            ),
-                    )
-                    .child(
-                        div()
-                            .pr_2p5()
-                            .on_action(|&editor::actions::MoveUp, _, cx| {
-                                cx.stop_propagation();
-                            })
-                            .on_action(|&editor::actions::MoveDown, _, cx| {
-                                cx.stop_propagation();
-                            })
-                            .child(EditorElement::new(&self.commit_editor, panel_editor_style)),
-                    )
-                    .child(
-                        h_flex()
-                            .absolute()
-                            .top_2()
-                            .right_2()
-                            .opacity(0.5)
-                            .hover(|this| this.opacity(1.0))
-                            .child(
-                                panel_icon_button("expand-commit-editor", IconName::Maximize)
-                                    .icon_size(IconSize::Small)
-                                    .size(ui::ButtonSize::Default)
-                                    .tooltip(move |_window, cx| {
-                                        Tooltip::for_action_in(
-                                            "Open Commit Modal",
-                                            &git::ExpandCommitEditor,
-                                            &expand_tooltip_focus_handle,
-                                            cx,
-                                        )
-                                    })
-                                    .on_click(cx.listener({
-                                        move |_, _, window, cx| {
-                                            window.dispatch_action(
-                                                git::ExpandCommitEditor.boxed_clone(),
-                                                cx,
-                                            )
-                                        }
-                                    })),
-                            ),
-                    ),
-            );
-
-        Some(footer)
-    }
-
-    fn render_commit_button(&self, cx: &mut Context<Self>) -> impl IntoElement {
-        let (can_commit, tooltip) = self.configure_commit_button(cx);
-        let title = self.commit_button_title();
-        let commit_tooltip_focus_handle = self.commit_editor.focus_handle(cx);
-        let amend = self.amend_pending();
-        let signoff = self.signoff_enabled;
-
-        let label_color = if self.pending_commit.is_some() {
-            Color::Disabled
-        } else {
-            Color::Default
-        };
-
-        div()
-            .id("commit-wrapper")
-            .on_hover(cx.listener(move |this, hovered, _, cx| {
-                this.show_placeholders =
-                    *hovered && !this.has_staged_changes() && !this.has_unstaged_conflicts();
-                cx.notify()
-            }))
-            .child(SplitButton::new(
-                ButtonLike::new_rounded_left(ElementId::Name(
-                    format!("split-button-left-{}", title).into(),
-                ))
-                .layer(ElevationIndex::ModalSurface)
-                .size(ButtonSize::Compact)
-                .child(
-                    Label::new(title)
-                        .size(LabelSize::Small)
-                        .color(label_color)
-                        .mr_0p5(),
-                )
-                .on_click({
-                    let git_panel = cx.weak_entity();
-                    move |_, window, cx| {
-                        telemetry::event!("Git Committed", source = "Git Panel");
-                        git_panel
-                            .update(cx, |git_panel, cx| {
-                                git_panel.commit_changes(
-                                    CommitOptions { amend, signoff },
-                                    window,
-                                    cx,
-                                );
-                            })
-                            .ok();
-                    }
-                })
-                .disabled(!can_commit || self.modal_open)
-                .tooltip({
-                    let handle = commit_tooltip_focus_handle.clone();
-                    move |_window, cx| {
-                        if can_commit {
-                            Tooltip::with_meta_in(
-                                tooltip,
-                                Some(if amend { &git::Amend } else { &git::Commit }),
-                                format!(
-                                    "git commit{}{}",
-                                    if amend { " --amend" } else { "" },
-                                    if signoff { " --signoff" } else { "" }
-                                ),
-                                &handle.clone(),
-                                cx,
-                            )
-                        } else {
-                            Tooltip::simple(tooltip, cx)
-                        }
-                    }
-                }),
-                self.render_git_commit_menu(
-                    ElementId::Name(format!("split-button-right-{}", title).into()),
-                    Some(commit_tooltip_focus_handle),
-                    cx,
-                )
-                .into_any_element(),
-            ))
-    }
-
-    fn render_pending_amend(&self, cx: &mut Context<Self>) -> impl IntoElement {
-        h_flex()
-            .py_1p5()
-            .px_2()
-            .gap_1p5()
-            .justify_between()
-            .border_t_1()
-            .border_color(cx.theme().colors().border.opacity(0.8))
-            .child(
-                div()
-                    .flex_grow()
-                    .overflow_hidden()
-                    .max_w(relative(0.85))
-                    .child(
-                        Label::new("This will update your most recent commit.")
-                            .size(LabelSize::Small)
-                            .truncate(),
-                    ),
-            )
-            .child(
-                panel_button("Cancel")
-                    .size(ButtonSize::Default)
-                    .on_click(cx.listener(|this, _, _, cx| this.set_amend_pending(false, cx))),
-            )
-    }
-
-    fn render_previous_commit(&self, cx: &mut Context<Self>) -> Option<impl IntoElement> {
-        let active_repository = self.active_repository.as_ref()?;
-        let branch = active_repository.read(cx).branch.as_ref()?;
-        let commit = branch.most_recent_commit.as_ref()?.clone();
-        let workspace = self.workspace.clone();
-        let this = cx.entity();
-
-        Some(
-            h_flex()
-                .py_1p5()
-                .px_2()
-                .gap_1p5()
-                .justify_between()
-                .border_t_1()
-                .border_color(cx.theme().colors().border.opacity(0.8))
-                .child(
-                    div()
-                        .cursor_pointer()
-                        .overflow_hidden()
-                        .line_clamp(1)
-                        .child(
-                            Label::new(commit.subject.clone())
-                                .size(LabelSize::Small)
-                                .truncate(),
-                        )
-                        .id("commit-msg-hover")
-                        .on_click({
-                            let commit = commit.clone();
-                            let repo = active_repository.downgrade();
-                            move |_, window, cx| {
-                                CommitView::open(
-                                    commit.sha.to_string(),
-                                    repo.clone(),
-                                    workspace.clone(),
-                                    None,
-                                    None,
-                                    window,
-                                    cx,
-                                );
-                            }
-                        })
-                        .hoverable_tooltip({
-                            let repo = active_repository.clone();
-                            move |window, cx| {
-                                GitPanelMessageTooltip::new(
-                                    this.clone(),
-                                    commit.sha.clone(),
-                                    repo.clone(),
-                                    window,
-                                    cx,
-                                )
-                                .into()
-                            }
-                        }),
-                )
-                .when(commit.has_parent, |this| {
-                    let has_unstaged = self.has_unstaged_changes();
-                    this.child(
-                        panel_icon_button("undo", IconName::Undo)
-                            .icon_size(IconSize::XSmall)
-                            .icon_color(Color::Muted)
-                            .tooltip(move |_window, cx| {
-                                Tooltip::with_meta(
-                                    "Uncommit",
-                                    Some(&git::Uncommit),
-                                    if has_unstaged {
-                                        "git reset HEAD^ --soft"
-                                    } else {
-                                        "git reset HEAD^"
-                                    },
-                                    cx,
-                                )
-                            })
-                            .on_click(cx.listener(|this, _, window, cx| this.uncommit(window, cx))),
-                    )
-                }),
-        )
-    }
-
-    fn render_empty_state(&self, cx: &mut Context<Self>) -> impl IntoElement {
-        h_flex().h_full().flex_grow().justify_center().child(
-            v_flex()
-                .gap_2()
-                .child(h_flex().w_full().justify_around().child(
-                    if self.active_repository.is_some() {
-                        "No changes to commit"
-                    } else {
-                        "No Git repositories"
-                    },
-                ))
-                .children({
-                    let worktree_count = self.project.read(cx).visible_worktrees(cx).count();
-                    (worktree_count > 0 && self.active_repository.is_none()).then(|| {
-                        h_flex().w_full().justify_around().child(
-                            panel_filled_button("Initialize Repository")
-                                .tooltip(Tooltip::for_action_title_in(
-                                    "git init",
-                                    &git::Init,
-                                    &self.focus_handle,
-                                ))
-                                .on_click(move |_, _, cx| {
-                                    cx.defer(move |cx| {
-                                        cx.dispatch_action(&git::Init);
-                                    })
-                                }),
-                        )
-                    })
-                })
-                .text_ui_sm(cx)
-                .mx_auto()
-                .text_color(Color::Placeholder.color(cx)),
-        )
-    }
-
-    fn render_buffer_header_controls(
-        &self,
-        entity: &Entity<Self>,
-        file: &Arc<dyn File>,
-        _: &Window,
-        cx: &App,
-    ) -> Option<AnyElement> {
-        let repo = self.active_repository.as_ref()?.read(cx);
-        let project_path = (file.worktree_id(cx), file.path().clone()).into();
-        let repo_path = repo.project_path_to_repo_path(&project_path, cx)?;
-        let ix = self.entry_by_path(&repo_path)?;
-        let entry = self.entries.get(ix)?;
-
-        let is_staging_or_staged = repo
-            .pending_ops_for_path(&repo_path)
-            .map(|ops| ops.staging() || ops.staged())
-            .or_else(|| {
-                repo.status_for_path(&repo_path)
-                    .and_then(|status| status.status.staging().as_bool())
-            })
-            .or_else(|| {
-                entry
-                    .status_entry()
-                    .and_then(|entry| entry.staging.as_bool())
-            });
-
-        let checkbox = Checkbox::new("stage-file", is_staging_or_staged.into())
-            .disabled(!self.has_write_access(cx))
-            .fill()
-            .elevation(ElevationIndex::Surface)
-            .on_click({
-                let entry = entry.clone();
-                let git_panel = entity.downgrade();
-                move |_, window, cx| {
-                    git_panel
-                        .update(cx, |this, cx| {
-                            this.toggle_staged_for_entry(&entry, window, cx);
-                            cx.stop_propagation();
-                        })
-                        .ok();
-                }
-            });
-        Some(
-            h_flex()
-                .id("start-slot")
-                .text_lg()
-                .child(checkbox)
-                .on_mouse_down(MouseButton::Left, |_, _, cx| {
-                    // prevent the list item active state triggering when toggling checkbox
-                    cx.stop_propagation();
-                })
-                .into_any_element(),
-        )
-    }
-
-    fn render_entries(
-        &self,
-        has_write_access: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let (is_tree_view, entry_count) = match &self.view_mode {
-            GitPanelViewMode::Tree(state) => (true, state.logical_indices.len()),
-            GitPanelViewMode::Flat => (false, self.entries.len()),
-        };
-
-        v_flex()
-            .flex_1()
-            .size_full()
-            .overflow_hidden()
-            .relative()
-            .child(
-                h_flex()
-                    .flex_1()
-                    .size_full()
-                    .relative()
-                    .overflow_hidden()
-                    .child(
-                        uniform_list(
-                            "entries",
-                            entry_count,
-                            cx.processor(move |this, range: Range<usize>, window, cx| {
-                                let mut items = Vec::with_capacity(range.end - range.start);
-
-                                for ix in range.into_iter().map(|ix| match &this.view_mode {
-                                    GitPanelViewMode::Tree(state) => state.logical_indices[ix],
-                                    GitPanelViewMode::Flat => ix,
-                                }) {
-                                    match &this.entries.get(ix) {
-                                        Some(GitListEntry::Status(entry)) => {
-                                            items.push(this.render_status_entry(
-                                                ix,
-                                                entry,
-                                                0,
-                                                has_write_access,
-                                                window,
-                                                cx,
-                                            ));
-                                        }
-                                        Some(GitListEntry::TreeStatus(entry)) => {
-                                            items.push(this.render_status_entry(
-                                                ix,
-                                                &entry.entry,
-                                                entry.depth,
-                                                has_write_access,
-                                                window,
-                                                cx,
-                                            ));
-                                        }
-                                        Some(GitListEntry::Directory(entry)) => {
-                                            items.push(this.render_directory_entry(
-                                                ix,
-                                                entry,
-                                                has_write_access,
-                                                window,
-                                                cx,
-                                            ));
-                                        }
-                                        Some(GitListEntry::Header(header)) => {
-                                            items.push(this.render_list_header(
-                                                ix,
-                                                header,
-                                                has_write_access,
-                                                window,
-                                                cx,
-                                            ));
-                                        }
-                                        None => {}
-                                    }
-                                }
-
-                                items
-                            }),
-                        )
-                        .when(is_tree_view, |list| {
-                            let indent_size = px(TREE_INDENT);
-                            list.with_decoration(
-                                ui::indent_guides(indent_size, IndentGuideColors::panel(cx))
-                                    .with_compute_indents_fn(
-                                        cx.entity(),
-                                        |this, range, _window, _cx| {
-                                            range
-                                                .map(|ix| match this.entries.get(ix) {
-                                                    Some(GitListEntry::Directory(dir)) => dir.depth,
-                                                    Some(GitListEntry::TreeStatus(status)) => {
-                                                        status.depth
-                                                    }
-                                                    _ => 0,
-                                                })
-                                                .collect()
-                                        },
-                                    )
-                                    .with_render_fn(cx.entity(), |_, params, _, _| {
-                                        let left_offset = px(TREE_INDENT_GUIDE_OFFSET);
-                                        let indent_size = params.indent_size;
-                                        let item_height = params.item_height;
-
-                                        params
-                                            .indent_guides
-                                            .into_iter()
-                                            .map(|layout| {
-                                                let bounds = Bounds::new(
-                                                    point(
-                                                        layout.offset.x * indent_size + left_offset,
-                                                        layout.offset.y * item_height,
-                                                    ),
-                                                    size(px(1.), layout.length * item_height),
-                                                );
-                                                RenderedIndentGuide {
-                                                    bounds,
-                                                    layout,
-                                                    is_active: false,
-                                                    hitbox: None,
-                                                }
-                                            })
-                                            .collect()
-                                    }),
-                            )
-                        })
-                        .size_full()
-                        .flex_grow()
-                        .with_sizing_behavior(ListSizingBehavior::Auto)
-                        .with_horizontal_sizing_behavior(
-                            ListHorizontalSizingBehavior::Unconstrained,
-                        )
-                        .with_width_from_item(self.max_width_item_index)
-                        .track_scroll(&self.scroll_handle),
-                    )
-                    .on_mouse_down(
-                        MouseButton::Right,
-                        cx.listener(move |this, event: &MouseDownEvent, window, cx| {
-                            this.deploy_panel_context_menu(event.position, window, cx)
-                        }),
-                    )
-                    .custom_scrollbars(
-                        Scrollbars::for_settings::<GitPanelSettings>()
-                            .tracked_scroll_handle(&self.scroll_handle)
-                            .with_track_along(
-                                ScrollAxes::Horizontal,
-                                cx.theme().colors().panel_background,
-                            ),
-                        window,
-                        cx,
-                    ),
-            )
-    }
-
-    fn entry_label(&self, label: impl Into<SharedString>, color: Color) -> Label {
-        Label::new(label.into()).color(color).single_line()
-    }
-
-    fn list_item_height(&self) -> Rems {
-        rems(1.75)
-    }
-
-    fn render_list_header(
-        &self,
-        ix: usize,
-        header: &GitHeaderEntry,
-        _: bool,
-        _: &Window,
-        _: &Context<Self>,
-    ) -> AnyElement {
-        let id: ElementId = ElementId::Name(format!("header_{}", ix).into());
-
-        h_flex()
-            .id(id)
-            .h(self.list_item_height())
-            .w_full()
-            .items_end()
-            .px(rems(0.75)) // ~12px
-            .pb(rems(0.3125)) // ~ 5px
-            .child(
-                Label::new(header.title())
-                    .color(Color::Muted)
-                    .size(LabelSize::Small)
-                    .line_height_style(LineHeightStyle::UiLabel)
-                    .single_line(),
-            )
-            .into_any_element()
-    }
-
-    pub fn load_commit_details(
-        &self,
-        sha: String,
-        cx: &mut Context<Self>,
-    ) -> Task<anyhow::Result<CommitDetails>> {
-        let Some(repo) = self.active_repository.clone() else {
-            return Task::ready(Err(anyhow::anyhow!("no active repo")));
-        };
-        repo.update(cx, |repo, cx| {
-            let show = repo.show(sha);
-            cx.spawn(async move |_, _| show.await?)
-        })
-    }
-
-    fn deploy_entry_context_menu(
-        &mut self,
-        position: Point<Pixels>,
-        ix: usize,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(entry) = self.entries.get(ix).and_then(|e| e.status_entry()) else {
-            return;
-        };
-        let stage_title = if entry.status.staging().is_fully_staged() {
-            "Unstage File"
-        } else {
-            "Stage File"
-        };
-        let restore_title = if entry.status.is_created() {
-            "Trash File"
-        } else {
-            "Restore File"
-        };
-        let context_menu = ContextMenu::build(window, cx, |context_menu, _, _| {
-            let is_created = entry.status.is_created();
-            context_menu
-                .context(self.focus_handle.clone())
-                .action(stage_title, ToggleStaged.boxed_clone())
-                .action(restore_title, git::RestoreFile::default().boxed_clone())
-                .action_disabled_when(
-                    !is_created,
-                    "Add to .gitignore",
-                    git::AddToGitignore.boxed_clone(),
-                )
-                .separator()
-                .action("Open Diff", Confirm.boxed_clone())
-                .action("Open File", SecondaryConfirm.boxed_clone())
-                .separator()
-                .action_disabled_when(is_created, "View File History", Box::new(git::FileHistory))
-        });
-        self.selected_entry = Some(ix);
-        self.set_context_menu(context_menu, position, window, cx);
-    }
-
-    fn deploy_panel_context_menu(
-        &mut self,
-        position: Point<Pixels>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let context_menu = git_panel_context_menu(
-            self.focus_handle.clone(),
-            GitMenuState {
-                has_tracked_changes: self.has_tracked_changes(),
-                has_staged_changes: self.has_staged_changes(),
-                has_unstaged_changes: self.has_unstaged_changes(),
-                has_new_changes: self.new_count > 0,
-                sort_by_path: GitPanelSettings::get_global(cx).sort_by_path,
-                has_stash_items: self.stash_entries.entries.len() > 0,
-                tree_view: GitPanelSettings::get_global(cx).tree_view,
-            },
-            window,
-            cx,
-        );
-        self.set_context_menu(context_menu, position, window, cx);
-    }
-
-    fn set_context_menu(
-        &mut self,
-        context_menu: Entity<ContextMenu>,
-        position: Point<Pixels>,
-        window: &Window,
-        cx: &mut Context<Self>,
-    ) {
-        let subscription = cx.subscribe_in(
-            &context_menu,
-            window,
-            |this, _, _: &DismissEvent, window, cx| {
-                if this.context_menu.as_ref().is_some_and(|context_menu| {
-                    context_menu.0.focus_handle(cx).contains_focused(window, cx)
-                }) {
-                    cx.focus_self(window);
-                }
-                this.context_menu.take();
-                cx.notify();
-            },
-        );
-        self.context_menu = Some((context_menu, position, subscription));
-        cx.notify();
-    }
-
-    fn render_status_entry(
-        &self,
-        ix: usize,
-        entry: &GitStatusEntry,
-        depth: usize,
-        has_write_access: bool,
-        window: &Window,
-        cx: &Context<Self>,
-    ) -> AnyElement {
-        let tree_view = GitPanelSettings::get_global(cx).tree_view;
-        let path_style = self.project.read(cx).path_style(cx);
-        let git_path_style = ProjectSettings::get_global(cx).git.path_style;
-        let display_name = entry.display_name(path_style);
-
-        let selected = self.selected_entry == Some(ix);
-        let marked = self.marked_entries.contains(&ix);
-        let status_style = GitPanelSettings::get_global(cx).status_style;
-        let status = entry.status;
-
-        let has_conflict = status.is_conflicted();
-        let is_modified = status.is_modified();
-        let is_deleted = status.is_deleted();
-
-        let label_color = if status_style == StatusStyle::LabelColor {
-            if has_conflict {
-                Color::VersionControlConflict
-            } else if is_modified {
-                Color::VersionControlModified
-            } else if is_deleted {
-                // We don't want a bunch of red labels in the list
-                Color::Disabled
-            } else {
-                Color::VersionControlAdded
-            }
-        } else {
-            Color::Default
-        };
-
-        let path_color = if status.is_deleted() {
-            Color::Disabled
-        } else {
-            Color::Muted
-        };
-
-        let id: ElementId = ElementId::Name(format!("entry_{}_{}", display_name, ix).into());
-        let checkbox_wrapper_id: ElementId =
-            ElementId::Name(format!("entry_{}_{}_checkbox_wrapper", display_name, ix).into());
-        let checkbox_id: ElementId =
-            ElementId::Name(format!("entry_{}_{}_checkbox", display_name, ix).into());
-
-        let active_repo = self
-            .project
-            .read(cx)
-            .active_repository(cx)
-            .expect("active repository must be set");
-        let repo = active_repo.read(cx);
-        let is_staging_or_staged = self.is_entry_staged(entry, &repo);
-        let mut is_staged: ToggleState = is_staging_or_staged.into();
-        if self.show_placeholders && !self.has_staged_changes() && !entry.status.is_created() {
-            is_staged = ToggleState::Selected;
-        }
-
-        let handle = cx.weak_entity();
-
-        let selected_bg_alpha = 0.08;
-        let marked_bg_alpha = 0.12;
-        let state_opacity_step = 0.04;
-
-        let base_bg = match (selected, marked) {
-            (true, true) => cx
-                .theme()
-                .status()
-                .info
-                .alpha(selected_bg_alpha + marked_bg_alpha),
-            (true, false) => cx.theme().status().info.alpha(selected_bg_alpha),
-            (false, true) => cx.theme().status().info.alpha(marked_bg_alpha),
-            _ => cx.theme().colors().ghost_element_background,
-        };
-
-        let hover_bg = if selected {
-            cx.theme()
-                .status()
-                .info
-                .alpha(selected_bg_alpha + state_opacity_step)
-        } else {
-            cx.theme().colors().ghost_element_hover
-        };
-
-        let active_bg = if selected {
-            cx.theme()
-                .status()
-                .info
-                .alpha(selected_bg_alpha + state_opacity_step * 2.0)
-        } else {
-            cx.theme().colors().ghost_element_active
-        };
-
-        let mut name_row = h_flex()
-            .items_center()
-            .gap_1()
-            .flex_1()
-            .pl(if tree_view {
-                px(depth as f32 * TREE_INDENT)
-            } else {
-                px(0.)
-            })
-            .child(git_status_icon(status));
-
-        name_row = if tree_view {
-            name_row.child(
-                self.entry_label(display_name, label_color)
-                    .when(status.is_deleted(), Label::strikethrough)
-                    .truncate(),
-            )
-        } else {
-            name_row.child(h_flex().items_center().flex_1().map(|this| {
-                self.path_formatted(
-                    this,
-                    entry.parent_dir(path_style),
-                    path_color,
-                    display_name,
-                    label_color,
-                    path_style,
-                    git_path_style,
-                    status.is_deleted(),
-                )
-            }))
-        };
-
-        h_flex()
-            .id(id)
-            .h(self.list_item_height())
-            .w_full()
-            .items_center()
-            .border_1()
-            .when(selected && self.focus_handle.is_focused(window), |el| {
-                el.border_color(cx.theme().colors().border_focused)
-            })
-            .px(rems(0.75)) // ~12px
-            .overflow_hidden()
-            .flex_none()
-            .gap_1p5()
-            .bg(base_bg)
-            .hover(|this| this.bg(hover_bg))
-            .active(|this| this.bg(active_bg))
-            .on_click({
-                cx.listener(move |this, event: &ClickEvent, window, cx| {
-                    this.selected_entry = Some(ix);
-                    cx.notify();
-                    if event.modifiers().secondary() {
-                        this.open_file(&Default::default(), window, cx)
-                    } else {
-                        this.open_diff(&Default::default(), window, cx);
-                        this.focus_handle.focus(window);
-                    }
-                })
-            })
-            .on_mouse_down(
-                MouseButton::Right,
-                move |event: &MouseDownEvent, window, cx| {
-                    // why isn't this happening automatically? we are passing MouseButton::Right to `on_mouse_down`?
-                    if event.button != MouseButton::Right {
-                        return;
-                    }
-
-                    let Some(this) = handle.upgrade() else {
-                        return;
-                    };
-                    this.update(cx, |this, cx| {
-                        this.deploy_entry_context_menu(event.position, ix, window, cx);
-                    });
-                    cx.stop_propagation();
-                },
-            )
-            .child(name_row)
-            .child(
-                div()
-                    .id(checkbox_wrapper_id)
-                    .flex_none()
-                    .occlude()
-                    .cursor_pointer()
-                    .child(
-                        Checkbox::new(checkbox_id, is_staged)
-                            .disabled(!has_write_access)
-                            .fill()
-                            .elevation(ElevationIndex::Surface)
-                            .on_click_ext({
-                                let entry = entry.clone();
-                                let this = cx.weak_entity();
-                                move |_, click, window, cx| {
-                                    this.update(cx, |this, cx| {
-                                        if !has_write_access {
-                                            return;
-                                        }
-                                        if click.modifiers().shift {
-                                            this.stage_bulk(ix, cx);
-                                        } else {
-                                            let list_entry =
-                                                if GitPanelSettings::get_global(cx).tree_view {
-                                                    GitListEntry::TreeStatus(GitTreeStatusEntry {
-                                                        entry: entry.clone(),
-                                                        depth,
-                                                    })
-                                                } else {
-                                                    GitListEntry::Status(entry.clone())
-                                                };
-                                            this.toggle_staged_for_entry(&list_entry, window, cx);
-                                        }
-                                        cx.stop_propagation();
-                                    })
-                                    .ok();
-                                }
-                            })
-                            .tooltip(move |_window, cx| {
-                                // If is_staging_or_staged is None, this implies the file was partially staged, and so
-                                // we allow the user to stage it in full by displaying `Stage` in the tooltip.
-                                let action = if is_staging_or_staged {
-                                    "Unstage"
-                                } else {
-                                    "Stage"
-                                };
-                                let tooltip_name = action.to_string();
-
-                                Tooltip::for_action(tooltip_name, &ToggleStaged, cx)
-                            }),
-                    ),
-            )
-            .into_any_element()
-    }
-
-    fn render_directory_entry(
-        &self,
-        ix: usize,
-        entry: &GitTreeDirEntry,
-        has_write_access: bool,
-        window: &Window,
-        cx: &Context<Self>,
-    ) -> AnyElement {
-        // TODO: Have not yet plugin the self.marked_entries. Not sure when and why we need that
-        let selected = self.selected_entry == Some(ix);
-        let label_color = Color::Muted;
-
-        let id: ElementId = ElementId::Name(format!("dir_{}_{}", entry.name, ix).into());
-        let checkbox_id: ElementId =
-            ElementId::Name(format!("dir_checkbox_{}_{}", entry.name, ix).into());
-        let checkbox_wrapper_id: ElementId =
-            ElementId::Name(format!("dir_checkbox_wrapper_{}_{}", entry.name, ix).into());
-
-        let selected_bg_alpha = 0.08;
-        let state_opacity_step = 0.04;
-
-        let base_bg = if selected {
-            cx.theme().status().info.alpha(selected_bg_alpha)
-        } else {
-            cx.theme().colors().ghost_element_background
-        };
-
-        let hover_bg = if selected {
-            cx.theme()
-                .status()
-                .info
-                .alpha(selected_bg_alpha + state_opacity_step)
-        } else {
-            cx.theme().colors().ghost_element_hover
-        };
-
-        let active_bg = if selected {
-            cx.theme()
-                .status()
-                .info
-                .alpha(selected_bg_alpha + state_opacity_step * 2.0)
-        } else {
-            cx.theme().colors().ghost_element_active
-        };
-        let folder_icon = if entry.expanded {
-            IconName::FolderOpen
-        } else {
-            IconName::Folder
-        };
-        let staged_state = entry.staged_state;
-
-        let name_row = h_flex()
-            .items_center()
-            .gap_1()
-            .flex_1()
-            .pl(px(entry.depth as f32 * TREE_INDENT))
-            .child(
-                Icon::new(folder_icon)
-                    .size(IconSize::Small)
-                    .color(Color::Muted),
-            )
-            .child(self.entry_label(entry.name.clone(), label_color).truncate());
-
-        h_flex()
-            .id(id)
-            .h(self.list_item_height())
-            .w_full()
-            .items_center()
-            .border_1()
-            .when(selected && self.focus_handle.is_focused(window), |el| {
-                el.border_color(cx.theme().colors().border_focused)
-            })
-            .px(rems(0.75))
-            .overflow_hidden()
-            .flex_none()
-            .gap_1p5()
-            .bg(base_bg)
-            .hover(|this| this.bg(hover_bg))
-            .active(|this| this.bg(active_bg))
-            .on_click({
-                let key = entry.key.clone();
-                cx.listener(move |this, _event: &ClickEvent, window, cx| {
-                    this.selected_entry = Some(ix);
-                    this.toggle_directory(&key, window, cx);
-                })
-            })
-            .child(name_row)
-            .child(
-                div()
-                    .id(checkbox_wrapper_id)
-                    .flex_none()
-                    .occlude()
-                    .cursor_pointer()
-                    .child(
-                        Checkbox::new(checkbox_id, staged_state)
-                            .disabled(!has_write_access)
-                            .fill()
-                            .elevation(ElevationIndex::Surface)
-                            .on_click({
-                                let entry = entry.clone();
-                                let this = cx.weak_entity();
-                                move |_, window, cx| {
-                                    this.update(cx, |this, cx| {
-                                        if !has_write_access {
-                                            return;
-                                        }
-                                        this.toggle_staged_for_entry(
-                                            &GitListEntry::Directory(entry.clone()),
-                                            window,
-                                            cx,
-                                        );
-                                        cx.stop_propagation();
-                                    })
-                                    .ok();
-                                }
-                            })
-                            .tooltip(move |_window, cx| {
-                                let action = if staged_state.selected() {
-                                    "Unstage"
-                                } else {
-                                    "Stage"
-                                };
-                                Tooltip::simple(format!("{action} folder"), cx)
-                            }),
-                    ),
-            )
-            .into_any_element()
-    }
-
-    fn path_formatted(
-        &self,
-        parent: Div,
-        directory: Option<String>,
-        path_color: Color,
-        file_name: String,
-        label_color: Color,
-        path_style: PathStyle,
-        git_path_style: GitPathStyle,
-        strikethrough: bool,
-    ) -> Div {
-        parent
-            .when(git_path_style == GitPathStyle::FileNameFirst, |this| {
-                this.child(
-                    self.entry_label(
-                        match directory.as_ref().is_none_or(|d| d.is_empty()) {
-                            true => file_name.clone(),
-                            false => format!("{file_name} "),
-                        },
-                        label_color,
-                    )
-                    .when(strikethrough, Label::strikethrough),
-                )
-            })
-            .when_some(directory, |this, dir| {
-                match (
-                    !dir.is_empty(),
-                    git_path_style == GitPathStyle::FileNameFirst,
-                ) {
-                    (true, true) => this.child(
-                        self.entry_label(dir, path_color)
-                            .when(strikethrough, Label::strikethrough),
-                    ),
-                    (true, false) => this.child(
-                        self.entry_label(
-                            format!("{dir}{}", path_style.primary_separator()),
-                            path_color,
-                        )
-                        .when(strikethrough, Label::strikethrough),
-                    ),
-                    _ => this,
-                }
-            })
-            .when(git_path_style == GitPathStyle::FilePathFirst, |this| {
-                this.child(
-                    self.entry_label(file_name, label_color)
-                        .when(strikethrough, Label::strikethrough),
-                )
-            })
-    }
-
-    fn has_write_access(&self, cx: &App) -> bool {
-        !self.project.read(cx).is_read_only(cx)
-    }
-
-    pub fn amend_pending(&self) -> bool {
-        self.amend_pending
-    }
-
-    /// Sets the pending amend state, ensuring that the original commit message
-    /// is either saved, when `value` is `true` and there's no pending amend, or
-    /// restored, when `value` is `false` and there's a pending amend.
-    pub fn set_amend_pending(&mut self, value: bool, cx: &mut Context<Self>) {
-        if value && !self.amend_pending {
-            let current_message = self.commit_message_buffer(cx).read(cx).text();
-            self.original_commit_message = if current_message.trim().is_empty() {
-                None
-            } else {
-                Some(current_message)
-            };
-        } else if !value && self.amend_pending {
-            let message = self.original_commit_message.take().unwrap_or_default();
-            self.commit_message_buffer(cx).update(cx, |buffer, cx| {
-                let start = buffer.anchor_before(0);
-                let end = buffer.anchor_after(buffer.len());
-                buffer.edit([(start..end, message)], None, cx);
-            });
-        }
-
-        self.amend_pending = value;
-        self.serialize(cx);
-        cx.notify();
-    }
-
-    pub fn signoff_enabled(&self) -> bool {
-        self.signoff_enabled
-    }
-
-    pub fn set_signoff_enabled(&mut self, value: bool, cx: &mut Context<Self>) {
-        self.signoff_enabled = value;
-        self.serialize(cx);
-        cx.notify();
-    }
-
-    pub fn toggle_signoff_enabled(
-        &mut self,
-        _: &Signoff,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.set_signoff_enabled(!self.signoff_enabled, cx);
-    }
-
-    pub async fn load(
-        workspace: WeakEntity<Workspace>,
-        mut cx: AsyncWindowContext,
-    ) -> anyhow::Result<Entity<Self>> {
-        let serialized_panel = match workspace
-            .read_with(&cx, |workspace, _| Self::serialization_key(workspace))
-            .ok()
-            .flatten()
-        {
-            Some(serialization_key) => cx
-                .background_spawn(async move { KEY_VALUE_STORE.read_kvp(&serialization_key) })
-                .await
-                .context("loading git panel")
-                .log_err()
-                .flatten()
-                .map(|panel| serde_json::from_str::<SerializedGitPanel>(&panel))
-                .transpose()
-                .log_err()
-                .flatten(),
-            None => None,
-        };
-
-        workspace.update_in(&mut cx, |workspace, window, cx| {
-            let panel = GitPanel::new(workspace, window, cx);
-
-            if let Some(serialized_panel) = serialized_panel {
-                panel.update(cx, |panel, cx| {
-                    panel.width = serialized_panel.width;
-                    panel.amend_pending = serialized_panel.amend_pending;
-                    panel.signoff_enabled = serialized_panel.signoff_enabled;
-                    cx.notify();
-                })
-            }
-
-            panel
-        })
-    }
-
-    fn stage_bulk(&mut self, mut index: usize, cx: &mut Context<'_, Self>) {
-        let Some(op) = self.bulk_staging.as_ref() else {
-            return;
-        };
-        let Some(mut anchor_index) = self.entry_by_path(&op.anchor) else {
-            return;
-        };
-        if let Some(entry) = self.entries.get(index)
-            && let Some(entry) = entry.status_entry()
-        {
-            self.set_bulk_staging_anchor(entry.repo_path.clone(), cx);
-        }
-        if index < anchor_index {
-            std::mem::swap(&mut index, &mut anchor_index);
-        }
-        let entries = self
-            .entries
-            .get(anchor_index..=index)
-            .unwrap_or_default()
-            .iter()
-            .filter_map(|entry| entry.status_entry().cloned())
-            .collect::<Vec<_>>();
-        self.change_file_stage(true, entries, cx);
-    }
-
-    fn set_bulk_staging_anchor(&mut self, path: RepoPath, cx: &mut Context<'_, GitPanel>) {
-        let Some(repo) = self.active_repository.as_ref() else {
-            return;
-        };
-        self.bulk_staging = Some(BulkStaging {
-            repo_id: repo.read(cx).id,
-            anchor: path,
-        });
-    }
-
-    pub(crate) fn toggle_amend_pending(&mut self, cx: &mut Context<Self>) {
-        self.set_amend_pending(!self.amend_pending, cx);
-        if self.amend_pending {
-            self.load_last_commit_message(cx);
-        }
-    }
-}
-
-impl Render for GitPanel {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let project = self.project.read(cx);
-        let has_entries = !self.entries.is_empty();
-        let room = self
-            .workspace
-            .upgrade()
-            .and_then(|workspace| workspace.read(cx).active_call()?.read(cx).room().cloned());
-
-        let has_write_access = self.has_write_access(cx);
-
-        let has_co_authors = room.is_some_and(|room| {
-            self.load_local_committer(cx);
-            let room = room.read(cx);
-            room.remote_participants()
-                .values()
-                .any(|remote_participant| remote_participant.can_write())
-        });
-
-        v_flex()
-            .id("git_panel")
-            .key_context(self.dispatch_context(window, cx))
-            .track_focus(&self.focus_handle)
-            .when(has_write_access && !project.is_read_only(cx), |this| {
-                this.on_action(cx.listener(Self::toggle_staged_for_selected))
-                    .on_action(cx.listener(Self::stage_range))
-                    .on_action(cx.listener(GitPanel::on_commit))
-                    .on_action(cx.listener(GitPanel::on_amend))
-                    .on_action(cx.listener(GitPanel::toggle_signoff_enabled))
-                    .on_action(cx.listener(Self::stage_all))
-                    .on_action(cx.listener(Self::unstage_all))
-                    .on_action(cx.listener(Self::stage_selected))
-                    .on_action(cx.listener(Self::unstage_selected))
-                    .on_action(cx.listener(Self::restore_tracked_files))
-                    .on_action(cx.listener(Self::revert_selected))
-                    .on_action(cx.listener(Self::add_to_gitignore))
-                    .on_action(cx.listener(Self::clean_all))
-                    .on_action(cx.listener(Self::generate_commit_message_action))
-                    .on_action(cx.listener(Self::stash_all))
-                    .on_action(cx.listener(Self::stash_pop))
-            })
-            .on_action(cx.listener(Self::select_first))
-            .on_action(cx.listener(Self::select_next))
-            .on_action(cx.listener(Self::select_previous))
-            .on_action(cx.listener(Self::select_last))
-            .on_action(cx.listener(Self::close_panel))
-            .on_action(cx.listener(Self::open_diff))
-            .on_action(cx.listener(Self::open_file))
-            .on_action(cx.listener(Self::file_history))
-            .on_action(cx.listener(Self::focus_changes_list))
-            .on_action(cx.listener(Self::focus_editor))
-            .on_action(cx.listener(Self::expand_commit_editor))
-            .when(has_write_access && has_co_authors, |git_panel| {
-                git_panel.on_action(cx.listener(Self::toggle_fill_co_authors))
-            })
-            .on_action(cx.listener(Self::toggle_sort_by_path))
-            .on_action(cx.listener(Self::toggle_tree_view))
-            .size_full()
-            .overflow_hidden()
-            .bg(cx.theme().colors().panel_background)
-            .child(
-                v_flex()
-                    .size_full()
-                    .children(self.render_panel_header(window, cx))
-                    .map(|this| {
-                        if has_entries {
-                            this.child(self.render_entries(has_write_access, window, cx))
-                        } else {
-                            this.child(self.render_empty_state(cx).into_any_element())
-                        }
-                    })
-                    .children(self.render_footer(window, cx))
-                    .when(self.amend_pending, |this| {
-                        this.child(self.render_pending_amend(cx))
-                    })
-                    .when(!self.amend_pending, |this| {
-                        this.children(self.render_previous_commit(cx))
-                    })
-                    .into_any_element(),
-            )
-            .children(self.context_menu.as_ref().map(|(menu, position, _)| {
-                deferred(
-                    anchored()
-                        .position(*position)
-                        .anchor(Corner::TopLeft)
-                        .child(menu.clone()),
-                )
-                .with_priority(1)
-            }))
-    }
-}
-
-impl Focusable for GitPanel {
-    fn focus_handle(&self, cx: &App) -> gpui::FocusHandle {
-        if self.entries.is_empty() {
-            self.commit_editor.focus_handle(cx)
-        } else {
-            self.focus_handle.clone()
-        }
-    }
-}
-
-impl EventEmitter<Event> for GitPanel {}
-
-impl EventEmitter<PanelEvent> for GitPanel {}
-
-pub(crate) struct GitPanelAddon {
-    pub(crate) workspace: WeakEntity<Workspace>,
-}
-
-impl editor::Addon for GitPanelAddon {
-    fn to_any(&self) -> &dyn std::any::Any {
-        self
-    }
-
-    fn render_buffer_header_controls(
-        &self,
-        excerpt_info: &ExcerptInfo,
-        window: &Window,
-        cx: &App,
-    ) -> Option<AnyElement> {
-        let file = excerpt_info.buffer.file()?;
-        let git_panel = self.workspace.upgrade()?.read(cx).panel::<GitPanel>(cx)?;
-
-        git_panel
-            .read(cx)
-            .render_buffer_header_controls(&git_panel, file, window, cx)
-    }
-}
-
-impl Panel for GitPanel {
-    fn persistent_name() -> &'static str {
-        "GitPanel"
-    }
-
-    fn panel_key() -> &'static str {
-        GIT_PANEL_KEY
-    }
-
-    fn position(&self, _: &Window, cx: &App) -> DockPosition {
-        GitPanelSettings::get_global(cx).dock
-    }
-
-    fn position_is_valid(&self, position: DockPosition) -> bool {
-        matches!(position, DockPosition::Left | DockPosition::Right)
-    }
-
-    fn set_position(&mut self, position: DockPosition, _: &mut Window, cx: &mut Context<Self>) {
-        settings::update_settings_file(self.fs.clone(), cx, move |settings, _| {
-            settings.git_panel.get_or_insert_default().dock = Some(position.into())
-        });
-    }
-
-    fn size(&self, _: &Window, cx: &App) -> Pixels {
-        self.width
-            .unwrap_or_else(|| GitPanelSettings::get_global(cx).default_width)
-    }
-
-    fn set_size(&mut self, size: Option<Pixels>, _: &mut Window, cx: &mut Context<Self>) {
-        self.width = size;
-        self.serialize(cx);
-        cx.notify();
-    }
-
-    fn icon(&self, _: &Window, cx: &App) -> Option<ui::IconName> {
-        Some(ui::IconName::GitBranchAlt).filter(|_| GitPanelSettings::get_global(cx).button)
-    }
-
-    fn icon_tooltip(&self, _window: &Window, _cx: &App) -> Option<&'static str> {
-        Some("Git Panel")
-    }
-
-    fn toggle_action(&self) -> Box<dyn Action> {
-        Box::new(ToggleFocus)
-    }
-
-    fn activation_priority(&self) -> u32 {
-        2
-    }
-}
-
-impl PanelHeader for GitPanel {}
-
-struct GitPanelMessageTooltip {
-    commit_tooltip: Option<Entity<CommitTooltip>>,
-}
-
-impl GitPanelMessageTooltip {
-    fn new(
-        git_panel: Entity<GitPanel>,
-        sha: SharedString,
-        repository: Entity<Repository>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Entity<Self> {
-        cx.new(|cx| {
-            cx.spawn_in(window, async move |this, cx| {
-                let (details, workspace) = git_panel.update(cx, |git_panel, cx| {
-                    (
-                        git_panel.load_commit_details(sha.to_string(), cx),
-                        git_panel.workspace.clone(),
-                    )
-                })?;
-                let details = details.await?;
-
-                let commit_details = crate::commit_tooltip::CommitDetails {
-                    sha: details.sha.clone(),
-                    author_name: details.author_name.clone(),
-                    author_email: details.author_email.clone(),
-                    commit_time: OffsetDateTime::from_unix_timestamp(details.commit_timestamp)?,
-                    message: Some(ParsedCommitMessage {
-                        message: details.message,
-                        ..Default::default()
-                    }),
-                };
-
-                this.update(cx, |this: &mut GitPanelMessageTooltip, cx| {
-                    this.commit_tooltip = Some(cx.new(move |cx| {
-                        CommitTooltip::new(commit_details, repository, workspace, cx)
-                    }));
-                    cx.notify();
-                })
-            })
-            .detach();
-
-            Self {
-                commit_tooltip: None,
-            }
-        })
-    }
-}
-
-impl Render for GitPanelMessageTooltip {
-    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
-        if let Some(commit_tooltip) = &self.commit_tooltip {
-            commit_tooltip.clone().into_any_element()
-        } else {
-            gpui::Empty.into_any_element()
-        }
-    }
-}
-
-#[derive(IntoElement, RegisterComponent)]
-pub struct PanelRepoFooter {
-    active_repository: SharedString,
-    branch: Option<Branch>,
-    head_commit: Option<CommitDetails>,
-
-    // Getting a GitPanel in previews will be difficult.
-    //
-    // For now just take an option here, and we won't bind handlers to buttons in previews.
-    git_panel: Option<Entity<GitPanel>>,
-}
-
-impl PanelRepoFooter {
-    pub fn new(
-        active_repository: SharedString,
-        branch: Option<Branch>,
-        head_commit: Option<CommitDetails>,
-        git_panel: Option<Entity<GitPanel>>,
-    ) -> Self {
-        Self {
-            active_repository,
-            branch,
-            head_commit,
-            git_panel,
-        }
-    }
-
-    pub fn new_preview(active_repository: SharedString, branch: Option<Branch>) -> Self {
-        Self {
-            active_repository,
-            branch,
-            head_commit: None,
-            git_panel: None,
-        }
-    }
-}
-
-impl RenderOnce for PanelRepoFooter {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let project = self
-            .git_panel
-            .as_ref()
-            .map(|panel| panel.read(cx).project.clone());
-
-        let repo = self
-            .git_panel
-            .as_ref()
-            .and_then(|panel| panel.read(cx).active_repository.clone());
-
-        let single_repo = project
-            .as_ref()
-            .map(|project| project.read(cx).git_store().read(cx).repositories().len() == 1)
-            .unwrap_or(true);
-
-        const MAX_BRANCH_LEN: usize = 16;
-        const MAX_REPO_LEN: usize = 16;
-        const LABEL_CHARACTER_BUDGET: usize = MAX_BRANCH_LEN + MAX_REPO_LEN;
-        const MAX_SHORT_SHA_LEN: usize = 8;
-        let branch_name = self
-            .branch
-            .as_ref()
-            .map(|branch| branch.name().to_owned())
-            .or_else(|| {
-                self.head_commit.as_ref().map(|commit| {
-                    commit
-                        .sha
-                        .chars()
-                        .take(MAX_SHORT_SHA_LEN)
-                        .collect::<String>()
-                })
-            })
-            .unwrap_or_else(|| " (no branch)".to_owned());
-        let show_separator = self.branch.is_some() || self.head_commit.is_some();
-
-        let active_repo_name = self.active_repository.clone();
-
-        let branch_actual_len = branch_name.len();
-        let repo_actual_len = active_repo_name.len();
-
-        // ideally, show the whole branch and repo names but
-        // when we can't, use a budget to allocate space between the two
-        let (repo_display_len, branch_display_len) =
-            if branch_actual_len + repo_actual_len <= LABEL_CHARACTER_BUDGET {
-                (repo_actual_len, branch_actual_len)
-            } else if branch_actual_len <= MAX_BRANCH_LEN {
-                let repo_space = (LABEL_CHARACTER_BUDGET - branch_actual_len).min(MAX_REPO_LEN);
-                (repo_space, branch_actual_len)
-            } else if repo_actual_len <= MAX_REPO_LEN {
-                let branch_space = (LABEL_CHARACTER_BUDGET - repo_actual_len).min(MAX_BRANCH_LEN);
-                (repo_actual_len, branch_space)
-            } else {
-                (MAX_REPO_LEN, MAX_BRANCH_LEN)
-            };
-
-        let truncated_repo_name = if repo_actual_len <= repo_display_len {
-            active_repo_name.to_string()
-        } else {
-            util::truncate_and_trailoff(active_repo_name.trim_ascii(), repo_display_len)
-        };
-
-        let truncated_branch_name = if branch_actual_len <= branch_display_len {
-            branch_name
-        } else {
-            util::truncate_and_trailoff(branch_name.trim_ascii(), branch_display_len)
-        };
-
-        let repo_selector_trigger = Button::new("repo-selector", truncated_repo_name)
-            .size(ButtonSize::None)
-            .label_size(LabelSize::Small)
-            .color(Color::Muted);
-
-        let repo_selector = PopoverMenu::new("repository-switcher")
-            .menu({
-                let project = project;
-                move |window, cx| {
-                    let project = project.clone()?;
-                    Some(cx.new(|cx| RepositorySelector::new(project, rems(16.), window, cx)))
-                }
-            })
-            .trigger_with_tooltip(
-                repo_selector_trigger.disabled(single_repo).truncate(true),
-                Tooltip::text("Switch Active Repository"),
-            )
-            .anchor(Corner::BottomLeft)
-            .into_any_element();
-
-        let branch_selector_button = Button::new("branch-selector", truncated_branch_name)
-            .size(ButtonSize::None)
-            .label_size(LabelSize::Small)
-            .truncate(true)
-            .on_click(|_, window, cx| {
-                window.dispatch_action(zed_actions::git::Switch.boxed_clone(), cx);
-            });
-
-        let branch_selector = PopoverMenu::new("popover-button")
-            .menu(move |window, cx| Some(branch_picker::popover(repo.clone(), window, cx)))
-            .trigger_with_tooltip(
-                branch_selector_button,
-                Tooltip::for_action_title("Switch Branch", &zed_actions::git::Switch),
-            )
-            .anchor(Corner::BottomLeft)
-            .offset(gpui::Point {
-                x: px(0.0),
-                y: px(-2.0),
-            });
-
-        h_flex()
-            .h(px(36.))
-            .w_full()
-            .px_2()
-            .justify_between()
-            .gap_1()
-            .child(
-                h_flex()
-                    .flex_1()
-                    .overflow_hidden()
-                    .gap_px()
-                    .child(
-                        Icon::new(IconName::GitBranchAlt)
-                            .size(IconSize::Small)
-                            .color(if single_repo {
-                                Color::Disabled
-                            } else {
-                                Color::Muted
-                            }),
-                    )
-                    .child(repo_selector)
-                    .when(show_separator, |this| {
-                        this.child(
-                            div()
-                                .text_sm()
-                                .text_color(cx.theme().colors().icon_muted.opacity(0.5))
-                                .child("/"),
-                        )
-                    })
-                    .child(branch_selector),
-            )
-            .children(if let Some(git_panel) = self.git_panel {
-                git_panel.update(cx, |git_panel, cx| git_panel.render_remote_button(cx))
-            } else {
-                None
-            })
-    }
-}
-
-impl Component for PanelRepoFooter {
-    fn scope() -> ComponentScope {
-        ComponentScope::VersionControl
-    }
-
-    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
-        let unknown_upstream = None;
-        let no_remote_upstream = Some(UpstreamTracking::Gone);
-        let ahead_of_upstream = Some(
-            UpstreamTrackingStatus {
-                ahead: 2,
-                behind: 0,
-            }
-            .into(),
-        );
-        let behind_upstream = Some(
-            UpstreamTrackingStatus {
-                ahead: 0,
-                behind: 2,
-            }
-            .into(),
-        );
-        let ahead_and_behind_upstream = Some(
-            UpstreamTrackingStatus {
-                ahead: 3,
-                behind: 1,
-            }
-            .into(),
-        );
-
-        let not_ahead_or_behind_upstream = Some(
-            UpstreamTrackingStatus {
-                ahead: 0,
-                behind: 0,
-            }
-            .into(),
-        );
-
-        fn branch(upstream: Option<UpstreamTracking>) -> Branch {
-            Branch {
-                is_head: true,
-                ref_name: "some-branch".into(),
-                upstream: upstream.map(|tracking| Upstream {
-                    ref_name: "origin/some-branch".into(),
-                    tracking,
-                }),
-                most_recent_commit: Some(CommitSummary {
-                    sha: "abc123".into(),
-                    subject: "Modify stuff".into(),
-                    commit_timestamp: 1710932954,
-                    author_name: "John Doe".into(),
-                    has_parent: true,
-                }),
-            }
-        }
-
-        fn custom(branch_name: &str, upstream: Option<UpstreamTracking>) -> Branch {
-            Branch {
-                is_head: true,
-                ref_name: branch_name.to_string().into(),
-                upstream: upstream.map(|tracking| Upstream {
-                    ref_name: format!("zed/{}", branch_name).into(),
-                    tracking,
-                }),
-                most_recent_commit: Some(CommitSummary {
-                    sha: "abc123".into(),
-                    subject: "Modify stuff".into(),
-                    commit_timestamp: 1710932954,
-                    author_name: "John Doe".into(),
-                    has_parent: true,
-                }),
-            }
-        }
-
-        fn active_repository(id: usize) -> SharedString {
-            format!("repo-{}", id).into()
-        }
-
-        let example_width = px(340.);
-        Some(
-            v_flex()
-                .gap_6()
-                .w_full()
-                .flex_none()
-                .children(vec![
-                    example_group_with_title(
-                        "Action Button States",
-                        vec![
-                            single_example(
-                                "No Branch",
-                                div()
-                                    .w(example_width)
-                                    .overflow_hidden()
-                                    .child(PanelRepoFooter::new_preview(active_repository(1), None))
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Remote status unknown",
-                                div()
-                                    .w(example_width)
-                                    .overflow_hidden()
-                                    .child(PanelRepoFooter::new_preview(
-                                        active_repository(2),
-                                        Some(branch(unknown_upstream)),
-                                    ))
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "No Remote Upstream",
-                                div()
-                                    .w(example_width)
-                                    .overflow_hidden()
-                                    .child(PanelRepoFooter::new_preview(
-                                        active_repository(3),
-                                        Some(branch(no_remote_upstream)),
-                                    ))
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Not Ahead or Behind",
-                                div()
-                                    .w(example_width)
-                                    .overflow_hidden()
-                                    .child(PanelRepoFooter::new_preview(
-                                        active_repository(4),
-                                        Some(branch(not_ahead_or_behind_upstream)),
-                                    ))
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Behind remote",
-                                div()
-                                    .w(example_width)
-                                    .overflow_hidden()
-                                    .child(PanelRepoFooter::new_preview(
-                                        active_repository(5),
-                                        Some(branch(behind_upstream)),
-                                    ))
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Ahead of remote",
-                                div()
-                                    .w(example_width)
-                                    .overflow_hidden()
-                                    .child(PanelRepoFooter::new_preview(
-                                        active_repository(6),
-                                        Some(branch(ahead_of_upstream)),
-                                    ))
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Ahead and behind remote",
-                                div()
-                                    .w(example_width)
-                                    .overflow_hidden()
-                                    .child(PanelRepoFooter::new_preview(
-                                        active_repository(7),
-                                        Some(branch(ahead_and_behind_upstream)),
-                                    ))
-                                    .into_any_element(),
-                            ),
-                        ],
-                    )
-                    .grow()
-                    .vertical(),
-                ])
-                .children(vec![
-                    example_group_with_title(
-                        "Labels",
-                        vec![
-                            single_example(
-                                "Short Branch & Repo",
-                                div()
-                                    .w(example_width)
-                                    .overflow_hidden()
-                                    .child(PanelRepoFooter::new_preview(
-                                        SharedString::from("zed"),
-                                        Some(custom("main", behind_upstream)),
-                                    ))
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Long Branch",
-                                div()
-                                    .w(example_width)
-                                    .overflow_hidden()
-                                    .child(PanelRepoFooter::new_preview(
-                                        SharedString::from("zed"),
-                                        Some(custom(
-                                            "redesign-and-update-git-ui-list-entry-style",
-                                            behind_upstream,
-                                        )),
-                                    ))
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Long Repo",
-                                div()
-                                    .w(example_width)
-                                    .overflow_hidden()
-                                    .child(PanelRepoFooter::new_preview(
-                                        SharedString::from("zed-industries-community-examples"),
-                                        Some(custom("gpui", ahead_of_upstream)),
-                                    ))
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Long Repo & Branch",
-                                div()
-                                    .w(example_width)
-                                    .overflow_hidden()
-                                    .child(PanelRepoFooter::new_preview(
-                                        SharedString::from("zed-industries-community-examples"),
-                                        Some(custom(
-                                            "redesign-and-update-git-ui-list-entry-style",
-                                            behind_upstream,
-                                        )),
-                                    ))
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Uppercase Repo",
-                                div()
-                                    .w(example_width)
-                                    .overflow_hidden()
-                                    .child(PanelRepoFooter::new_preview(
-                                        SharedString::from("LICENSES"),
-                                        Some(custom("main", ahead_of_upstream)),
-                                    ))
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Uppercase Branch",
-                                div()
-                                    .w(example_width)
-                                    .overflow_hidden()
-                                    .child(PanelRepoFooter::new_preview(
-                                        SharedString::from("zed"),
-                                        Some(custom("update-README", behind_upstream)),
-                                    ))
-                                    .into_any_element(),
-                            ),
-                        ],
-                    )
-                    .grow()
-                    .vertical(),
-                ])
-                .into_any_element(),
-        )
-    }
-}
-
-fn open_output(
-    operation: impl Into<SharedString>,
-    workspace: &mut Workspace,
-    output: &str,
-    window: &mut Window,
-    cx: &mut Context<Workspace>,
-) {
-    let operation = operation.into();
-    let buffer = cx.new(|cx| Buffer::local(output, cx));
-    buffer.update(cx, |buffer, cx| {
-        buffer.set_capability(language::Capability::ReadOnly, cx);
-    });
-    let editor = cx.new(|cx| {
-        let mut editor = Editor::for_buffer(buffer, None, window, cx);
-        editor.buffer().update(cx, |buffer, cx| {
-            buffer.set_title(format!("Output from git {operation}"), cx);
-        });
-        editor.set_read_only(true);
-        editor
-    });
-
-    workspace.add_item_to_center(Box::new(editor), window, cx);
-}
-
-pub(crate) fn show_error_toast(
-    workspace: Entity<Workspace>,
-    action: impl Into<SharedString>,
-    e: anyhow::Error,
-    cx: &mut App,
-) {
-    let action = action.into();
-    let message = e.to_string().trim().to_string();
-    if message
-        .matches(git::repository::REMOTE_CANCELLED_BY_USER)
-        .next()
-        .is_some()
-    { // Hide the cancelled by user message
-    } else {
-        workspace.update(cx, |workspace, cx| {
-            let workspace_weak = cx.weak_entity();
-            let toast = StatusToast::new(format!("git {} failed", action), cx, |this, _cx| {
-                this.icon(ToastIcon::new(IconName::XCircle).color(Color::Error))
-                    .action("View Log", move |window, cx| {
-                        let message = message.clone();
-                        let action = action.clone();
-                        workspace_weak
-                            .update(cx, move |workspace, cx| {
-                                open_output(action, workspace, &message, window, cx)
-                            })
-                            .ok();
-                    })
-            });
-            workspace.toggle_status_toast(toast, cx)
-        });
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use git::{
-        repository::repo_path,
-        status::{StatusCode, UnmergedStatus, UnmergedStatusCode},
-    };
-    use gpui::{TestAppContext, UpdateGlobal, VisualTestContext};
-    use indoc::indoc;
-    use project::FakeFs;
-    use serde_json::json;
-    use settings::SettingsStore;
-    use theme::LoadThemes;
-    use util::path;
-    use util::rel_path::rel_path;
-
-    use super::*;
-
-    fn init_test(cx: &mut gpui::TestAppContext) {
-        zlog::init_test();
-
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-            theme::init(LoadThemes::JustBase, cx);
-            editor::init(cx);
-            crate::init(cx);
-        });
-    }
-
-    #[gpui::test]
-    async fn test_entry_worktree_paths(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(
-            "/root",
-            json!({
-                "zed": {
-                    ".git": {},
-                    "crates": {
-                        "gpui": {
-                            "gpui.rs": "fn main() {}"
-                        },
-                        "util": {
-                            "util.rs": "fn do_it() {}"
-                        }
-                    }
-                },
-            }),
-        )
-        .await;
-
-        fs.set_status_for_repo(
-            Path::new(path!("/root/zed/.git")),
-            &[
-                ("crates/gpui/gpui.rs", StatusCode::Modified.worktree()),
-                ("crates/util/util.rs", StatusCode::Modified.worktree()),
-            ],
-        );
-
-        let project =
-            Project::test(fs.clone(), [path!("/root/zed/crates/gpui").as_ref()], cx).await;
-        let workspace =
-            cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-        cx.read(|cx| {
-            project
-                .read(cx)
-                .worktrees(cx)
-                .next()
-                .unwrap()
-                .read(cx)
-                .as_local()
-                .unwrap()
-                .scan_complete()
-        })
-        .await;
-
-        cx.executor().run_until_parked();
-
-        let panel = workspace.update(cx, GitPanel::new).unwrap();
-
-        let handle = cx.update_window_entity(&panel, |panel, _, _| {
-            std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
-        });
-        cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
-        handle.await;
-
-        let entries = panel.read_with(cx, |panel, _| panel.entries.clone());
-        pretty_assertions::assert_eq!(
-            entries,
-            [
-                GitListEntry::Header(GitHeaderEntry {
-                    header: Section::Tracked
-                }),
-                GitListEntry::Status(GitStatusEntry {
-                    repo_path: repo_path("crates/gpui/gpui.rs"),
-                    status: StatusCode::Modified.worktree(),
-                    staging: StageStatus::Unstaged,
-                }),
-                GitListEntry::Status(GitStatusEntry {
-                    repo_path: repo_path("crates/util/util.rs"),
-                    status: StatusCode::Modified.worktree(),
-                    staging: StageStatus::Unstaged,
-                },),
-            ],
-        );
-
-        let handle = cx.update_window_entity(&panel, |panel, _, _| {
-            std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
-        });
-        cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
-        handle.await;
-        let entries = panel.read_with(cx, |panel, _| panel.entries.clone());
-        pretty_assertions::assert_eq!(
-            entries,
-            [
-                GitListEntry::Header(GitHeaderEntry {
-                    header: Section::Tracked
-                }),
-                GitListEntry::Status(GitStatusEntry {
-                    repo_path: repo_path("crates/gpui/gpui.rs"),
-                    status: StatusCode::Modified.worktree(),
-                    staging: StageStatus::Unstaged,
-                }),
-                GitListEntry::Status(GitStatusEntry {
-                    repo_path: repo_path("crates/util/util.rs"),
-                    status: StatusCode::Modified.worktree(),
-                    staging: StageStatus::Unstaged,
-                },),
-            ],
-        );
-    }
-
-    #[gpui::test]
-    async fn test_bulk_staging(cx: &mut TestAppContext) {
-        use GitListEntry::*;
-
-        init_test(cx);
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(
-            "/root",
-            json!({
-                "project": {
-                    ".git": {},
-                    "src": {
-                        "main.rs": "fn main() {}",
-                        "lib.rs": "pub fn hello() {}",
-                        "utils.rs": "pub fn util() {}"
-                    },
-                    "tests": {
-                        "test.rs": "fn test() {}"
-                    },
-                    "new_file.txt": "new content",
-                    "another_new.rs": "// new file",
-                    "conflict.txt": "conflicted content"
-                }
-            }),
-        )
-        .await;
-
-        fs.set_status_for_repo(
-            Path::new(path!("/root/project/.git")),
-            &[
-                ("src/main.rs", StatusCode::Modified.worktree()),
-                ("src/lib.rs", StatusCode::Modified.worktree()),
-                ("tests/test.rs", StatusCode::Modified.worktree()),
-                ("new_file.txt", FileStatus::Untracked),
-                ("another_new.rs", FileStatus::Untracked),
-                ("src/utils.rs", FileStatus::Untracked),
-                (
-                    "conflict.txt",
-                    UnmergedStatus {
-                        first_head: UnmergedStatusCode::Updated,
-                        second_head: UnmergedStatusCode::Updated,
-                    }
-                    .into(),
-                ),
-            ],
-        );
-
-        let project = Project::test(fs.clone(), [Path::new(path!("/root/project"))], cx).await;
-        let workspace =
-            cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-        cx.read(|cx| {
-            project
-                .read(cx)
-                .worktrees(cx)
-                .next()
-                .unwrap()
-                .read(cx)
-                .as_local()
-                .unwrap()
-                .scan_complete()
-        })
-        .await;
-
-        cx.executor().run_until_parked();
-
-        let panel = workspace.update(cx, GitPanel::new).unwrap();
-
-        let handle = cx.update_window_entity(&panel, |panel, _, _| {
-            std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
-        });
-        cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
-        handle.await;
-
-        let entries = panel.read_with(cx, |panel, _| panel.entries.clone());
-        #[rustfmt::skip]
-        pretty_assertions::assert_matches!(
-            entries.as_slice(),
-            &[
-                Header(GitHeaderEntry { header: Section::Conflict }),
-                Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
-                Header(GitHeaderEntry { header: Section::Tracked }),
-                Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
-                Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
-                Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
-                Header(GitHeaderEntry { header: Section::New }),
-                Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
-                Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
-                Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
-            ],
-        );
-
-        let second_status_entry = entries[3].clone();
-        panel.update_in(cx, |panel, window, cx| {
-            panel.toggle_staged_for_entry(&second_status_entry, window, cx);
-        });
-
-        panel.update_in(cx, |panel, window, cx| {
-            panel.selected_entry = Some(7);
-            panel.stage_range(&git::StageRange, window, cx);
-        });
-
-        cx.read(|cx| {
-            project
-                .read(cx)
-                .worktrees(cx)
-                .next()
-                .unwrap()
-                .read(cx)
-                .as_local()
-                .unwrap()
-                .scan_complete()
-        })
-        .await;
-
-        cx.executor().run_until_parked();
-
-        let handle = cx.update_window_entity(&panel, |panel, _, _| {
-            std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
-        });
-        cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
-        handle.await;
-
-        let entries = panel.read_with(cx, |panel, _| panel.entries.clone());
-        #[rustfmt::skip]
-        pretty_assertions::assert_matches!(
-            entries.as_slice(),
-            &[
-                Header(GitHeaderEntry { header: Section::Conflict }),
-                Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
-                Header(GitHeaderEntry { header: Section::Tracked }),
-                Status(GitStatusEntry { staging: StageStatus::Staged, .. }),
-                Status(GitStatusEntry { staging: StageStatus::Staged, .. }),
-                Status(GitStatusEntry { staging: StageStatus::Staged, .. }),
-                Header(GitHeaderEntry { header: Section::New }),
-                Status(GitStatusEntry { staging: StageStatus::Staged, .. }),
-                Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
-                Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
-            ],
-        );
-
-        let third_status_entry = entries[4].clone();
-        panel.update_in(cx, |panel, window, cx| {
-            panel.toggle_staged_for_entry(&third_status_entry, window, cx);
-        });
-
-        panel.update_in(cx, |panel, window, cx| {
-            panel.selected_entry = Some(9);
-            panel.stage_range(&git::StageRange, window, cx);
-        });
-
-        cx.read(|cx| {
-            project
-                .read(cx)
-                .worktrees(cx)
-                .next()
-                .unwrap()
-                .read(cx)
-                .as_local()
-                .unwrap()
-                .scan_complete()
-        })
-        .await;
-
-        cx.executor().run_until_parked();
-
-        let handle = cx.update_window_entity(&panel, |panel, _, _| {
-            std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
-        });
-        cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
-        handle.await;
-
-        let entries = panel.read_with(cx, |panel, _| panel.entries.clone());
-        #[rustfmt::skip]
-        pretty_assertions::assert_matches!(
-            entries.as_slice(),
-            &[
-                Header(GitHeaderEntry { header: Section::Conflict }),
-                Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
-                Header(GitHeaderEntry { header: Section::Tracked }),
-                Status(GitStatusEntry { staging: StageStatus::Staged, .. }),
-                Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
-                Status(GitStatusEntry { staging: StageStatus::Staged, .. }),
-                Header(GitHeaderEntry { header: Section::New }),
-                Status(GitStatusEntry { staging: StageStatus::Staged, .. }),
-                Status(GitStatusEntry { staging: StageStatus::Staged, .. }),
-                Status(GitStatusEntry { staging: StageStatus::Staged, .. }),
-            ],
-        );
-    }
-
-    #[gpui::test]
-    async fn test_bulk_staging_with_sort_by_paths(cx: &mut TestAppContext) {
-        use GitListEntry::*;
-
-        init_test(cx);
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(
-            "/root",
-            json!({
-                "project": {
-                    ".git": {},
-                    "src": {
-                        "main.rs": "fn main() {}",
-                        "lib.rs": "pub fn hello() {}",
-                        "utils.rs": "pub fn util() {}"
-                    },
-                    "tests": {
-                        "test.rs": "fn test() {}"
-                    },
-                    "new_file.txt": "new content",
-                    "another_new.rs": "// new file",
-                    "conflict.txt": "conflicted content"
-                }
-            }),
-        )
-        .await;
-
-        fs.set_status_for_repo(
-            Path::new(path!("/root/project/.git")),
-            &[
-                ("src/main.rs", StatusCode::Modified.worktree()),
-                ("src/lib.rs", StatusCode::Modified.worktree()),
-                ("tests/test.rs", StatusCode::Modified.worktree()),
-                ("new_file.txt", FileStatus::Untracked),
-                ("another_new.rs", FileStatus::Untracked),
-                ("src/utils.rs", FileStatus::Untracked),
-                (
-                    "conflict.txt",
-                    UnmergedStatus {
-                        first_head: UnmergedStatusCode::Updated,
-                        second_head: UnmergedStatusCode::Updated,
-                    }
-                    .into(),
-                ),
-            ],
-        );
-
-        let project = Project::test(fs.clone(), [Path::new(path!("/root/project"))], cx).await;
-        let workspace =
-            cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-        cx.read(|cx| {
-            project
-                .read(cx)
-                .worktrees(cx)
-                .next()
-                .unwrap()
-                .read(cx)
-                .as_local()
-                .unwrap()
-                .scan_complete()
-        })
-        .await;
-
-        cx.executor().run_until_parked();
-
-        let panel = workspace.update(cx, GitPanel::new).unwrap();
-
-        let handle = cx.update_window_entity(&panel, |panel, _, _| {
-            std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
-        });
-        cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
-        handle.await;
-
-        let entries = panel.read_with(cx, |panel, _| panel.entries.clone());
-        #[rustfmt::skip]
-        pretty_assertions::assert_matches!(
-            entries.as_slice(),
-            &[
-                Header(GitHeaderEntry { header: Section::Conflict }),
-                Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
-                Header(GitHeaderEntry { header: Section::Tracked }),
-                Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
-                Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
-                Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
-                Header(GitHeaderEntry { header: Section::New }),
-                Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
-                Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
-                Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
-            ],
-        );
-
-        assert_entry_paths(
-            &entries,
-            &[
-                None,
-                Some("conflict.txt"),
-                None,
-                Some("src/lib.rs"),
-                Some("src/main.rs"),
-                Some("tests/test.rs"),
-                None,
-                Some("another_new.rs"),
-                Some("new_file.txt"),
-                Some("src/utils.rs"),
-            ],
-        );
-
-        let second_status_entry = entries[3].clone();
-        panel.update_in(cx, |panel, window, cx| {
-            panel.toggle_staged_for_entry(&second_status_entry, window, cx);
-        });
-
-        cx.update(|_window, cx| {
-            SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |settings| {
-                    settings.git_panel.get_or_insert_default().sort_by_path = Some(true);
-                })
-            });
-        });
-
-        panel.update_in(cx, |panel, window, cx| {
-            panel.selected_entry = Some(7);
-            panel.stage_range(&git::StageRange, window, cx);
-        });
-
-        cx.read(|cx| {
-            project
-                .read(cx)
-                .worktrees(cx)
-                .next()
-                .unwrap()
-                .read(cx)
-                .as_local()
-                .unwrap()
-                .scan_complete()
-        })
-        .await;
-
-        cx.executor().run_until_parked();
-
-        let handle = cx.update_window_entity(&panel, |panel, _, _| {
-            std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
-        });
-        cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
-        handle.await;
-
-        let entries = panel.read_with(cx, |panel, _| panel.entries.clone());
-        #[rustfmt::skip]
-        pretty_assertions::assert_matches!(
-            entries.as_slice(),
-            &[
-                Status(GitStatusEntry { status: FileStatus::Untracked, staging: StageStatus::Unstaged, .. }),
-                Status(GitStatusEntry { status: FileStatus::Unmerged(..), staging: StageStatus::Unstaged, .. }),
-                Status(GitStatusEntry { status: FileStatus::Untracked, staging: StageStatus::Unstaged, .. }),
-                Status(GitStatusEntry { status: FileStatus::Tracked(..), staging: StageStatus::Staged, .. }),
-                Status(GitStatusEntry { status: FileStatus::Tracked(..), staging: StageStatus::Unstaged, .. }),
-                Status(GitStatusEntry { status: FileStatus::Untracked, staging: StageStatus::Unstaged, .. }),
-                Status(GitStatusEntry { status: FileStatus::Tracked(..), staging: StageStatus::Unstaged, .. }),
-            ],
-        );
-
-        assert_entry_paths(
-            &entries,
-            &[
-                Some("another_new.rs"),
-                Some("conflict.txt"),
-                Some("new_file.txt"),
-                Some("src/lib.rs"),
-                Some("src/main.rs"),
-                Some("src/utils.rs"),
-                Some("tests/test.rs"),
-            ],
-        );
-
-        let third_status_entry = entries[4].clone();
-        panel.update_in(cx, |panel, window, cx| {
-            panel.toggle_staged_for_entry(&third_status_entry, window, cx);
-        });
-
-        panel.update_in(cx, |panel, window, cx| {
-            panel.selected_entry = Some(9);
-            panel.stage_range(&git::StageRange, window, cx);
-        });
-
-        cx.read(|cx| {
-            project
-                .read(cx)
-                .worktrees(cx)
-                .next()
-                .unwrap()
-                .read(cx)
-                .as_local()
-                .unwrap()
-                .scan_complete()
-        })
-        .await;
-
-        cx.executor().run_until_parked();
-
-        let handle = cx.update_window_entity(&panel, |panel, _, _| {
-            std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
-        });
-        cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
-        handle.await;
-
-        let entries = panel.read_with(cx, |panel, _| panel.entries.clone());
-        #[rustfmt::skip]
-        pretty_assertions::assert_matches!(
-            entries.as_slice(),
-            &[
-                Status(GitStatusEntry { status: FileStatus::Untracked, staging: StageStatus::Unstaged, .. }),
-                Status(GitStatusEntry { status: FileStatus::Unmerged(..), staging: StageStatus::Unstaged, .. }),
-                Status(GitStatusEntry { status: FileStatus::Untracked, staging: StageStatus::Unstaged, .. }),
-                Status(GitStatusEntry { status: FileStatus::Tracked(..), staging: StageStatus::Staged, .. }),
-                Status(GitStatusEntry { status: FileStatus::Tracked(..), staging: StageStatus::Staged, .. }),
-                Status(GitStatusEntry { status: FileStatus::Untracked, staging: StageStatus::Unstaged, .. }),
-                Status(GitStatusEntry { status: FileStatus::Tracked(..), staging: StageStatus::Unstaged, .. }),
-            ],
-        );
-
-        assert_entry_paths(
-            &entries,
-            &[
-                Some("another_new.rs"),
-                Some("conflict.txt"),
-                Some("new_file.txt"),
-                Some("src/lib.rs"),
-                Some("src/main.rs"),
-                Some("src/utils.rs"),
-                Some("tests/test.rs"),
-            ],
-        );
-    }
-
-    #[gpui::test]
-    async fn test_amend_commit_message_handling(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(
-            "/root",
-            json!({
-                "project": {
-                    ".git": {},
-                    "src": {
-                        "main.rs": "fn main() {}"
-                    }
-                }
-            }),
-        )
-        .await;
-
-        fs.set_status_for_repo(
-            Path::new(path!("/root/project/.git")),
-            &[("src/main.rs", StatusCode::Modified.worktree())],
-        );
-
-        let project = Project::test(fs.clone(), [Path::new(path!("/root/project"))], cx).await;
-        let workspace =
-            cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-        let panel = workspace.update(cx, GitPanel::new).unwrap();
-
-        // Test: User has commit message, enables amend (saves message), then disables (restores message)
-        panel.update(cx, |panel, cx| {
-            panel.commit_message_buffer(cx).update(cx, |buffer, cx| {
-                let start = buffer.anchor_before(0);
-                let end = buffer.anchor_after(buffer.len());
-                buffer.edit([(start..end, "Initial commit message")], None, cx);
-            });
-
-            panel.set_amend_pending(true, cx);
-            assert!(panel.original_commit_message.is_some());
-
-            panel.set_amend_pending(false, cx);
-            let current_message = panel.commit_message_buffer(cx).read(cx).text();
-            assert_eq!(current_message, "Initial commit message");
-            assert!(panel.original_commit_message.is_none());
-        });
-
-        // Test: User has empty commit message, enables amend, then disables (clears message)
-        panel.update(cx, |panel, cx| {
-            panel.commit_message_buffer(cx).update(cx, |buffer, cx| {
-                let start = buffer.anchor_before(0);
-                let end = buffer.anchor_after(buffer.len());
-                buffer.edit([(start..end, "")], None, cx);
-            });
-
-            panel.set_amend_pending(true, cx);
-            assert!(panel.original_commit_message.is_none());
-
-            panel.commit_message_buffer(cx).update(cx, |buffer, cx| {
-                let start = buffer.anchor_before(0);
-                let end = buffer.anchor_after(buffer.len());
-                buffer.edit([(start..end, "Previous commit message")], None, cx);
-            });
-
-            panel.set_amend_pending(false, cx);
-            let current_message = panel.commit_message_buffer(cx).read(cx).text();
-            assert_eq!(current_message, "");
-        });
-    }
-
-    #[gpui::test]
-    async fn test_amend(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(
-            "/root",
-            json!({
-                "project": {
-                    ".git": {},
-                    "src": {
-                        "main.rs": "fn main() {}"
-                    }
-                }
-            }),
-        )
-        .await;
-
-        fs.set_status_for_repo(
-            Path::new(path!("/root/project/.git")),
-            &[("src/main.rs", StatusCode::Modified.worktree())],
-        );
-
-        let project = Project::test(fs.clone(), [Path::new(path!("/root/project"))], cx).await;
-        let workspace =
-            cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-        // Wait for the project scanning to finish so that `head_commit(cx)` is
-        // actually set, otherwise no head commit would be available from which
-        // to fetch the latest commit message from.
-        cx.executor().run_until_parked();
-
-        let panel = workspace.update(cx, GitPanel::new).unwrap();
-        panel.read_with(cx, |panel, cx| {
-            assert!(panel.active_repository.is_some());
-            assert!(panel.head_commit(cx).is_some());
-        });
-
-        panel.update_in(cx, |panel, window, cx| {
-            // Update the commit editor's message to ensure that its contents
-            // are later restored, after amending is finished.
-            panel.commit_message_buffer(cx).update(cx, |buffer, cx| {
-                buffer.set_text("refactor: update main.rs", cx);
-            });
-
-            // Start amending the previous commit.
-            panel.focus_editor(&Default::default(), window, cx);
-            panel.on_amend(&Amend, window, cx);
-        });
-
-        // Since `GitPanel.amend` attempts to fetch the latest commit message in
-        // a background task, we need to wait for it to complete before being
-        // able to assert that the commit message editor's state has been
-        // updated.
-        cx.run_until_parked();
-
-        panel.update_in(cx, |panel, window, cx| {
-            assert_eq!(
-                panel.commit_message_buffer(cx).read(cx).text(),
-                "initial commit"
-            );
-            assert_eq!(
-                panel.original_commit_message,
-                Some("refactor: update main.rs".to_string())
-            );
-
-            // Finish amending the previous commit.
-            panel.focus_editor(&Default::default(), window, cx);
-            panel.on_amend(&Amend, window, cx);
-        });
-
-        // Since the actual commit logic is run in a background task, we need to
-        // await its completion to actually ensure that the commit message
-        // editor's contents are set to the original message and haven't been
-        // cleared.
-        cx.run_until_parked();
-
-        panel.update_in(cx, |panel, _window, cx| {
-            // After amending, the commit editor's message should be restored to
-            // the original message.
-            assert_eq!(
-                panel.commit_message_buffer(cx).read(cx).text(),
-                "refactor: update main.rs"
-            );
-            assert!(panel.original_commit_message.is_none());
-        });
-    }
-
-    #[gpui::test]
-    async fn test_open_diff(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(
-            path!("/project"),
-            json!({
-                ".git": {},
-                "tracked": "tracked\n",
-                "untracked": "\n",
-            }),
-        )
-        .await;
-
-        fs.set_head_and_index_for_repo(
-            path!("/project/.git").as_ref(),
-            &[("tracked", "old tracked\n".into())],
-        );
-
-        let project = Project::test(fs.clone(), [Path::new(path!("/project"))], cx).await;
-        let workspace =
-            cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let cx = &mut VisualTestContext::from_window(*workspace, cx);
-        let panel = workspace.update(cx, GitPanel::new).unwrap();
-
-        // Enable the `sort_by_path` setting and wait for entries to be updated,
-        // as there should no longer be separators between Tracked and Untracked
-        // files.
-        cx.update(|_window, cx| {
-            SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |settings| {
-                    settings.git_panel.get_or_insert_default().sort_by_path = Some(true);
-                })
-            });
-        });
-
-        cx.update_window_entity(&panel, |panel, _, _| {
-            std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
-        })
-        .await;
-
-        // Confirm that `Open Diff` still works for the untracked file, updating
-        // the Project Diff's active path.
-        panel.update_in(cx, |panel, window, cx| {
-            panel.selected_entry = Some(1);
-            panel.open_diff(&Confirm, window, cx);
-        });
-        cx.run_until_parked();
-
-        let _ = workspace.update(cx, |workspace, _window, cx| {
-            let active_path = workspace
-                .item_of_type::<ProjectDiff>(cx)
-                .expect("ProjectDiff should exist")
-                .read(cx)
-                .active_path(cx)
-                .expect("active_path should exist");
-
-            assert_eq!(active_path.path, rel_path("untracked").into_arc());
-        });
-    }
-
-    fn assert_entry_paths(entries: &[GitListEntry], expected_paths: &[Option<&str>]) {
-        assert_eq!(entries.len(), expected_paths.len());
-        for (entry, expected_path) in entries.iter().zip(expected_paths) {
-            assert_eq!(
-                entry.status_entry().map(|status| status
-                    .repo_path
-                    .as_ref()
-                    .as_std_path()
-                    .to_string_lossy()
-                    .to_string()),
-                expected_path.map(|s| s.to_string())
-            );
-        }
-    }
-
-    #[test]
-    fn test_compress_diff_no_truncation() {
-        let diff = indoc! {"
-            --- a/file.txt
-            +++ b/file.txt
-            @@ -1,2 +1,2 @@
-            -old
-            +new
-        "};
-        let result = GitPanel::compress_commit_diff(diff, 1000);
-        assert_eq!(result, diff);
-    }
-
-    #[test]
-    fn test_compress_diff_truncate_long_lines() {
-        let long_line = "🦀".repeat(300);
-        let diff = indoc::formatdoc! {"
-            --- a/file.txt
-            +++ b/file.txt
-            @@ -1,2 +1,3 @@
-             context
-            +{}
-             more context
-        ", long_line};
-        let result = GitPanel::compress_commit_diff(&diff, 100);
-        assert!(result.contains("...[truncated]"));
-        assert!(result.len() < diff.len());
-    }
-
-    #[test]
-    fn test_compress_diff_truncate_hunks() {
-        let diff = indoc! {"
-            --- a/file.txt
-            +++ b/file.txt
-            @@ -1,2 +1,2 @@
-             context
-            -old1
-            +new1
-            @@ -5,2 +5,2 @@
-             context 2
-            -old2
-            +new2
-            @@ -10,2 +10,2 @@
-             context 3
-            -old3
-            +new3
-        "};
-        let result = GitPanel::compress_commit_diff(diff, 100);
-        let expected = indoc! {"
-            --- a/file.txt
-            +++ b/file.txt
-            @@ -1,2 +1,2 @@
-             context
-            -old1
-            +new1
-            [...skipped 2 hunks...]
-        "};
-        assert_eq!(result, expected);
-    }
-
-    #[gpui::test]
-    async fn test_suggest_commit_message(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(
-            path!("/project"),
-            json!({
-                ".git": {},
-                "tracked": "tracked\n",
-                "untracked": "\n",
-            }),
-        )
-        .await;
-
-        fs.set_head_and_index_for_repo(
-            path!("/project/.git").as_ref(),
-            &[("tracked", "old tracked\n".into())],
-        );
-
-        let project = Project::test(fs.clone(), [Path::new(path!("/project"))], cx).await;
-        let workspace =
-            cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let cx = &mut VisualTestContext::from_window(*workspace, cx);
-        let panel = workspace.update(cx, GitPanel::new).unwrap();
-
-        let handle = cx.update_window_entity(&panel, |panel, _, _| {
-            std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
-        });
-        cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
-        handle.await;
-
-        let entries = panel.read_with(cx, |panel, _| panel.entries.clone());
-
-        // GitPanel
-        // - Tracked:
-        // - [] tracked
-        // - Untracked
-        // - [] untracked
-        //
-        // The commit message should now read:
-        // "Update tracked"
-        let message = panel.update(cx, |panel, cx| panel.suggest_commit_message(cx));
-        assert_eq!(message, Some("Update tracked".to_string()));
-
-        let first_status_entry = entries[1].clone();
-        panel.update_in(cx, |panel, window, cx| {
-            panel.toggle_staged_for_entry(&first_status_entry, window, cx);
-        });
-
-        cx.read(|cx| {
-            project
-                .read(cx)
-                .worktrees(cx)
-                .next()
-                .unwrap()
-                .read(cx)
-                .as_local()
-                .unwrap()
-                .scan_complete()
-        })
-        .await;
-
-        cx.executor().run_until_parked();
-
-        let handle = cx.update_window_entity(&panel, |panel, _, _| {
-            std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
-        });
-        cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
-        handle.await;
-
-        // GitPanel
-        // - Tracked:
-        // - [x] tracked
-        // - Untracked
-        // - [] untracked
-        //
-        // The commit message should still read:
-        // "Update tracked"
-        let message = panel.update(cx, |panel, cx| panel.suggest_commit_message(cx));
-        assert_eq!(message, Some("Update tracked".to_string()));
-
-        let second_status_entry = entries[3].clone();
-        panel.update_in(cx, |panel, window, cx| {
-            panel.toggle_staged_for_entry(&second_status_entry, window, cx);
-        });
-
-        cx.read(|cx| {
-            project
-                .read(cx)
-                .worktrees(cx)
-                .next()
-                .unwrap()
-                .read(cx)
-                .as_local()
-                .unwrap()
-                .scan_complete()
-        })
-        .await;
-
-        cx.executor().run_until_parked();
-
-        let handle = cx.update_window_entity(&panel, |panel, _, _| {
-            std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
-        });
-        cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
-        handle.await;
-
-        // GitPanel
-        // - Tracked:
-        // - [x] tracked
-        // - Untracked
-        // - [x] untracked
-        //
-        // The commit message should now read:
-        // "Enter commit message"
-        // (which means we should see None returned).
-        let message = panel.update(cx, |panel, cx| panel.suggest_commit_message(cx));
-        assert!(message.is_none());
-
-        panel.update_in(cx, |panel, window, cx| {
-            panel.toggle_staged_for_entry(&first_status_entry, window, cx);
-        });
-
-        cx.read(|cx| {
-            project
-                .read(cx)
-                .worktrees(cx)
-                .next()
-                .unwrap()
-                .read(cx)
-                .as_local()
-                .unwrap()
-                .scan_complete()
-        })
-        .await;
-
-        cx.executor().run_until_parked();
-
-        let handle = cx.update_window_entity(&panel, |panel, _, _| {
-            std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
-        });
-        cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
-        handle.await;
-
-        // GitPanel
-        // - Tracked:
-        // - [] tracked
-        // - Untracked
-        // - [x] untracked
-        //
-        // The commit message should now read:
-        // "Update untracked"
-        let message = panel.update(cx, |panel, cx| panel.suggest_commit_message(cx));
-        assert_eq!(message, Some("Create untracked".to_string()));
-
-        panel.update_in(cx, |panel, window, cx| {
-            panel.toggle_staged_for_entry(&second_status_entry, window, cx);
-        });
-
-        cx.read(|cx| {
-            project
-                .read(cx)
-                .worktrees(cx)
-                .next()
-                .unwrap()
-                .read(cx)
-                .as_local()
-                .unwrap()
-                .scan_complete()
-        })
-        .await;
-
-        cx.executor().run_until_parked();
-
-        let handle = cx.update_window_entity(&panel, |panel, _, _| {
-            std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
-        });
-        cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
-        handle.await;
-
-        // GitPanel
-        // - Tracked:
-        // - [] tracked
-        // - Untracked
-        // - [] untracked
-        //
-        // The commit message should now read:
-        // "Update tracked"
-        let message = panel.update(cx, |panel, cx| panel.suggest_commit_message(cx));
-        assert_eq!(message, Some("Update tracked".to_string()));
-    }
-}
diff --git a/crates/git_ui/src/git_panel_settings.rs b/crates/git_ui/src/git_panel_settings.rs
deleted file mode 100644
index 6b5334e555..0000000000
--- a/crates/git_ui/src/git_panel_settings.rs
+++ /dev/null
@@ -1,63 +0,0 @@
-use editor::EditorSettings;
-use gpui::Pixels;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use settings::{RegisterSetting, Settings, StatusStyle};
-use ui::{
-    px,
-    scrollbars::{ScrollbarVisibility, ShowScrollbar},
-};
-use workspace::dock::DockPosition;
-
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
-pub struct ScrollbarSettings {
-    pub show: Option<ShowScrollbar>,
-}
-
-#[derive(Debug, Clone, PartialEq, RegisterSetting)]
-pub struct GitPanelSettings {
-    pub button: bool,
-    pub dock: DockPosition,
-    pub default_width: Pixels,
-    pub status_style: StatusStyle,
-    pub scrollbar: ScrollbarSettings,
-    pub fallback_branch_name: String,
-    pub sort_by_path: bool,
-    pub collapse_untracked_diff: bool,
-    pub tree_view: bool,
-}
-
-impl ScrollbarVisibility for GitPanelSettings {
-    fn visibility(&self, cx: &ui::App) -> ShowScrollbar {
-        // TODO: This PR should have defined Editor's `scrollbar.axis`
-        // as an Option<ScrollbarAxis>, not a ScrollbarAxes as it would allow you to
-        // `.unwrap_or(EditorSettings::get_global(cx).scrollbar.show)`.
-        //
-        // Once this is fixed we can extend the GitPanelSettings with a `scrollbar.axis`
-        // so we can show each axis based on the settings.
-        //
-        // We should fix this. PR: https://github.com/zed-industries/zed/pull/19495
-        self.scrollbar
-            .show
-            .unwrap_or_else(|| EditorSettings::get_global(cx).scrollbar.show)
-    }
-}
-
-impl Settings for GitPanelSettings {
-    fn from_settings(content: &settings::SettingsContent) -> Self {
-        let git_panel = content.git_panel.clone().unwrap();
-        Self {
-            button: git_panel.button.unwrap(),
-            dock: git_panel.dock.unwrap().into(),
-            default_width: px(git_panel.default_width.unwrap()),
-            status_style: git_panel.status_style.unwrap(),
-            scrollbar: ScrollbarSettings {
-                show: git_panel.scrollbar.unwrap().show.map(Into::into),
-            },
-            fallback_branch_name: git_panel.fallback_branch_name.unwrap(),
-            sort_by_path: git_panel.sort_by_path.unwrap(),
-            collapse_untracked_diff: git_panel.collapse_untracked_diff.unwrap(),
-            tree_view: git_panel.tree_view.unwrap(),
-        }
-    }
-}
diff --git a/crates/git_ui/src/git_ui.rs b/crates/git_ui/src/git_ui.rs
deleted file mode 100644
index 54adc8130d..0000000000
--- a/crates/git_ui/src/git_ui.rs
+++ /dev/null
@@ -1,888 +0,0 @@
-use std::any::Any;
-
-use command_palette_hooks::CommandPaletteFilter;
-use commit_modal::CommitModal;
-use editor::{Editor, actions::DiffClipboardWithSelectionData};
-use project::ProjectPath;
-use ui::{
-    Headline, HeadlineSize, Icon, IconName, IconSize, IntoElement, ParentElement, Render, Styled,
-    StyledExt, div, h_flex, rems, v_flex,
-};
-
-mod blame_ui;
-
-use git::{
-    repository::{Branch, Upstream, UpstreamTracking, UpstreamTrackingStatus},
-    status::{FileStatus, StatusCode, UnmergedStatus, UnmergedStatusCode},
-};
-use gpui::{
-    Action, App, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, SharedString,
-    Window, actions,
-};
-use menu::{Cancel, Confirm};
-use onboarding::GitOnboardingModal;
-use project::git_store::Repository;
-use project_diff::ProjectDiff;
-use ui::prelude::*;
-use workspace::{ModalView, Workspace, notifications::DetachAndPromptErr};
-use zed_actions;
-
-use crate::{git_panel::GitPanel, text_diff_view::TextDiffView};
-
-mod askpass_modal;
-pub mod branch_picker;
-mod commit_modal;
-pub mod commit_tooltip;
-pub mod commit_view;
-mod conflict_view;
-pub mod file_diff_view;
-pub mod file_history_view;
-pub mod git_panel;
-mod git_panel_settings;
-pub mod onboarding;
-pub mod picker_prompt;
-pub mod project_diff;
-pub(crate) mod remote_output;
-pub mod repository_selector;
-pub mod stash_picker;
-pub mod text_diff_view;
-pub mod worktree_picker;
-
-actions!(
-    git,
-    [
-        /// Resets the git onboarding state to show the tutorial again.
-        ResetOnboarding
-    ]
-);
-
-pub fn init(cx: &mut App) {
-    editor::set_blame_renderer(blame_ui::GitBlameRenderer, cx);
-    commit_view::init(cx);
-    file_history_view::init(cx);
-
-    cx.observe_new(|editor: &mut Editor, _, cx| {
-        conflict_view::register_editor(editor, editor.buffer().clone(), cx);
-    })
-    .detach();
-
-    cx.observe_new(|workspace: &mut Workspace, _, cx| {
-        ProjectDiff::register(workspace, cx);
-        CommitModal::register(workspace);
-        git_panel::register(workspace);
-        repository_selector::register(workspace);
-        branch_picker::register(workspace);
-        worktree_picker::register(workspace);
-        stash_picker::register(workspace);
-
-        let project = workspace.project().read(cx);
-        if project.is_read_only(cx) {
-            return;
-        }
-        if !project.is_via_collab() {
-            workspace.register_action(|workspace, _: &git::Fetch, window, cx| {
-                let Some(panel) = workspace.panel::<git_panel::GitPanel>(cx) else {
-                    return;
-                };
-                panel.update(cx, |panel, cx| {
-                    panel.fetch(true, window, cx);
-                });
-            });
-            workspace.register_action(|workspace, _: &git::FetchFrom, window, cx| {
-                let Some(panel) = workspace.panel::<git_panel::GitPanel>(cx) else {
-                    return;
-                };
-                panel.update(cx, |panel, cx| {
-                    panel.fetch(false, window, cx);
-                });
-            });
-            workspace.register_action(|workspace, _: &git::Push, window, cx| {
-                let Some(panel) = workspace.panel::<git_panel::GitPanel>(cx) else {
-                    return;
-                };
-                panel.update(cx, |panel, cx| {
-                    panel.push(false, false, window, cx);
-                });
-            });
-            workspace.register_action(|workspace, _: &git::PushTo, window, cx| {
-                let Some(panel) = workspace.panel::<git_panel::GitPanel>(cx) else {
-                    return;
-                };
-                panel.update(cx, |panel, cx| {
-                    panel.push(false, true, window, cx);
-                });
-            });
-            workspace.register_action(|workspace, _: &git::ForcePush, window, cx| {
-                let Some(panel) = workspace.panel::<git_panel::GitPanel>(cx) else {
-                    return;
-                };
-                panel.update(cx, |panel, cx| {
-                    panel.push(true, false, window, cx);
-                });
-            });
-            workspace.register_action(|workspace, _: &git::Pull, window, cx| {
-                let Some(panel) = workspace.panel::<git_panel::GitPanel>(cx) else {
-                    return;
-                };
-                panel.update(cx, |panel, cx| {
-                    panel.pull(false, window, cx);
-                });
-            });
-            workspace.register_action(|workspace, _: &git::PullRebase, window, cx| {
-                let Some(panel) = workspace.panel::<git_panel::GitPanel>(cx) else {
-                    return;
-                };
-                panel.update(cx, |panel, cx| {
-                    panel.pull(true, window, cx);
-                });
-            });
-        }
-        workspace.register_action(|workspace, action: &git::StashAll, window, cx| {
-            let Some(panel) = workspace.panel::<git_panel::GitPanel>(cx) else {
-                return;
-            };
-            panel.update(cx, |panel, cx| {
-                panel.stash_all(action, window, cx);
-            });
-        });
-        workspace.register_action(|workspace, action: &git::StashPop, window, cx| {
-            let Some(panel) = workspace.panel::<git_panel::GitPanel>(cx) else {
-                return;
-            };
-            panel.update(cx, |panel, cx| {
-                panel.stash_pop(action, window, cx);
-            });
-        });
-        workspace.register_action(|workspace, action: &git::StashApply, window, cx| {
-            let Some(panel) = workspace.panel::<git_panel::GitPanel>(cx) else {
-                return;
-            };
-            panel.update(cx, |panel, cx| {
-                panel.stash_apply(action, window, cx);
-            });
-        });
-        workspace.register_action(|workspace, action: &git::StageAll, window, cx| {
-            let Some(panel) = workspace.panel::<git_panel::GitPanel>(cx) else {
-                return;
-            };
-            panel.update(cx, |panel, cx| {
-                panel.stage_all(action, window, cx);
-            });
-        });
-        workspace.register_action(|workspace, action: &git::UnstageAll, window, cx| {
-            let Some(panel) = workspace.panel::<git_panel::GitPanel>(cx) else {
-                return;
-            };
-            panel.update(cx, |panel, cx| {
-                panel.unstage_all(action, window, cx);
-            });
-        });
-        workspace.register_action(|workspace, _: &git::Uncommit, window, cx| {
-            let Some(panel) = workspace.panel::<git_panel::GitPanel>(cx) else {
-                return;
-            };
-            panel.update(cx, |panel, cx| {
-                panel.uncommit(window, cx);
-            })
-        });
-        CommandPaletteFilter::update_global(cx, |filter, _cx| {
-            filter.hide_action_types(&[
-                zed_actions::OpenGitIntegrationOnboarding.type_id(),
-                // ResetOnboarding.type_id(),
-            ]);
-        });
-        workspace.register_action(
-            move |workspace, _: &zed_actions::OpenGitIntegrationOnboarding, window, cx| {
-                GitOnboardingModal::toggle(workspace, window, cx)
-            },
-        );
-        workspace.register_action(move |_, _: &ResetOnboarding, window, cx| {
-            window.dispatch_action(workspace::RestoreBanner.boxed_clone(), cx);
-            window.refresh();
-        });
-        workspace.register_action(|workspace, _action: &git::Init, window, cx| {
-            let Some(panel) = workspace.panel::<git_panel::GitPanel>(cx) else {
-                return;
-            };
-            panel.update(cx, |panel, cx| {
-                panel.git_init(window, cx);
-            });
-        });
-        workspace.register_action(|workspace, _action: &git::Clone, window, cx| {
-            let Some(panel) = workspace.panel::<git_panel::GitPanel>(cx) else {
-                return;
-            };
-
-            workspace.toggle_modal(window, cx, |window, cx| {
-                GitCloneModal::show(panel, window, cx)
-            });
-        });
-        workspace.register_action(|workspace, _: &git::OpenModifiedFiles, window, cx| {
-            open_modified_files(workspace, window, cx);
-        });
-        workspace.register_action(|workspace, _: &git::RenameBranch, window, cx| {
-            rename_current_branch(workspace, window, cx);
-        });
-        workspace.register_action(
-            |workspace, action: &DiffClipboardWithSelectionData, window, cx| {
-                if let Some(task) = TextDiffView::open(action, workspace, window, cx) {
-                    task.detach();
-                };
-            },
-        );
-        workspace.register_action(|workspace, _: &git::FileHistory, window, cx| {
-            let Some(active_item) = workspace.active_item(cx) else {
-                return;
-            };
-            let Some(editor) = active_item.downcast::<Editor>() else {
-                return;
-            };
-            let Some(buffer) = editor.read(cx).buffer().read(cx).as_singleton() else {
-                return;
-            };
-            let Some(file) = buffer.read(cx).file() else {
-                return;
-            };
-            let worktree_id = file.worktree_id(cx);
-            let project_path = ProjectPath {
-                worktree_id,
-                path: file.path().clone(),
-            };
-            let project = workspace.project();
-            let git_store = project.read(cx).git_store();
-            let Some((repo, repo_path)) = git_store
-                .read(cx)
-                .repository_and_path_for_project_path(&project_path, cx)
-            else {
-                return;
-            };
-            file_history_view::FileHistoryView::open(
-                repo_path,
-                git_store.downgrade(),
-                repo.downgrade(),
-                workspace.weak_handle(),
-                window,
-                cx,
-            );
-        });
-    })
-    .detach();
-}
-
-fn open_modified_files(
-    workspace: &mut Workspace,
-    window: &mut Window,
-    cx: &mut Context<Workspace>,
-) {
-    let Some(panel) = workspace.panel::<git_panel::GitPanel>(cx) else {
-        return;
-    };
-    let modified_paths: Vec<_> = panel.update(cx, |panel, cx| {
-        let Some(repo) = panel.active_repository.as_ref() else {
-            return Vec::new();
-        };
-        let repo = repo.read(cx);
-        repo.cached_status()
-            .filter_map(|entry| {
-                if entry.status.is_modified() {
-                    repo.repo_path_to_project_path(&entry.repo_path, cx)
-                } else {
-                    None
-                }
-            })
-            .collect()
-    });
-    for path in modified_paths {
-        workspace.open_path(path, None, true, window, cx).detach();
-    }
-}
-
-pub fn git_status_icon(status: FileStatus) -> impl IntoElement {
-    GitStatusIcon::new(status)
-}
-
-struct RenameBranchModal {
-    current_branch: SharedString,
-    editor: Entity<Editor>,
-    repo: Entity<Repository>,
-}
-
-impl RenameBranchModal {
-    fn new(
-        current_branch: String,
-        repo: Entity<Repository>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let editor = cx.new(|cx| {
-            let mut editor = Editor::single_line(window, cx);
-            editor.set_text(current_branch.clone(), window, cx);
-            editor
-        });
-        Self {
-            current_branch: current_branch.into(),
-            editor,
-            repo,
-        }
-    }
-
-    fn cancel(&mut self, _: &Cancel, _window: &mut Window, cx: &mut Context<Self>) {
-        cx.emit(DismissEvent);
-    }
-
-    fn confirm(&mut self, _: &Confirm, window: &mut Window, cx: &mut Context<Self>) {
-        let new_name = self.editor.read(cx).text(cx);
-        if new_name.is_empty() || new_name == self.current_branch.as_ref() {
-            cx.emit(DismissEvent);
-            return;
-        }
-
-        let repo = self.repo.clone();
-        let current_branch = self.current_branch.to_string();
-        cx.spawn(async move |_, cx| {
-            match repo
-                .update(cx, |repo, _| {
-                    repo.rename_branch(current_branch, new_name.clone())
-                })?
-                .await
-            {
-                Ok(Ok(_)) => Ok(()),
-                Ok(Err(error)) => Err(error),
-                Err(_) => Err(anyhow::anyhow!("Operation was canceled")),
-            }
-        })
-        .detach_and_prompt_err("Failed to rename branch", window, cx, |_, _, _| None);
-        cx.emit(DismissEvent);
-    }
-}
-
-impl EventEmitter<DismissEvent> for RenameBranchModal {}
-impl ModalView for RenameBranchModal {}
-impl Focusable for RenameBranchModal {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        self.editor.focus_handle(cx)
-    }
-}
-
-impl Render for RenameBranchModal {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .key_context("RenameBranchModal")
-            .on_action(cx.listener(Self::cancel))
-            .on_action(cx.listener(Self::confirm))
-            .elevation_2(cx)
-            .w(rems(34.))
-            .child(
-                h_flex()
-                    .px_3()
-                    .pt_2()
-                    .pb_1()
-                    .w_full()
-                    .gap_1p5()
-                    .child(Icon::new(IconName::GitBranch).size(IconSize::XSmall))
-                    .child(
-                        Headline::new(format!("Rename Branch ({})", self.current_branch))
-                            .size(HeadlineSize::XSmall),
-                    ),
-            )
-            .child(div().px_3().pb_3().w_full().child(self.editor.clone()))
-    }
-}
-
-fn rename_current_branch(
-    workspace: &mut Workspace,
-    window: &mut Window,
-    cx: &mut Context<Workspace>,
-) {
-    let Some(panel) = workspace.panel::<git_panel::GitPanel>(cx) else {
-        return;
-    };
-    let current_branch: Option<String> = panel.update(cx, |panel, cx| {
-        let repo = panel.active_repository.as_ref()?;
-        let repo = repo.read(cx);
-        repo.branch.as_ref().map(|branch| branch.name().to_string())
-    });
-
-    let Some(current_branch_name) = current_branch else {
-        return;
-    };
-
-    let repo = panel.read(cx).active_repository.clone();
-    let Some(repo) = repo else {
-        return;
-    };
-
-    workspace.toggle_modal(window, cx, |window, cx| {
-        RenameBranchModal::new(current_branch_name, repo, window, cx)
-    });
-}
-
-fn render_remote_button(
-    id: impl Into<SharedString>,
-    branch: &Branch,
-    keybinding_target: Option<FocusHandle>,
-    show_fetch_button: bool,
-) -> Option<impl IntoElement> {
-    let id = id.into();
-    let upstream = branch.upstream.as_ref();
-    match upstream {
-        Some(Upstream {
-            tracking: UpstreamTracking::Tracked(UpstreamTrackingStatus { ahead, behind }),
-            ..
-        }) => match (*ahead, *behind) {
-            (0, 0) if show_fetch_button => {
-                Some(remote_button::render_fetch_button(keybinding_target, id))
-            }
-            (0, 0) => None,
-            (ahead, 0) => Some(remote_button::render_push_button(
-                keybinding_target,
-                id,
-                ahead,
-            )),
-            (ahead, behind) => Some(remote_button::render_pull_button(
-                keybinding_target,
-                id,
-                ahead,
-                behind,
-            )),
-        },
-        Some(Upstream {
-            tracking: UpstreamTracking::Gone,
-            ..
-        }) => Some(remote_button::render_republish_button(
-            keybinding_target,
-            id,
-        )),
-        None => Some(remote_button::render_publish_button(keybinding_target, id)),
-    }
-}
-
-mod remote_button {
-    use gpui::{Action, AnyView, ClickEvent, Corner, FocusHandle};
-    use ui::{
-        App, ButtonCommon, Clickable, ContextMenu, ElementId, FluentBuilder, Icon, IconName,
-        IconSize, IntoElement, Label, LabelCommon, LabelSize, LineHeightStyle, ParentElement,
-        PopoverMenu, SharedString, SplitButton, Styled, Tooltip, Window, div, h_flex, rems,
-    };
-
-    pub fn render_fetch_button(
-        keybinding_target: Option<FocusHandle>,
-        id: SharedString,
-    ) -> SplitButton {
-        split_button(
-            id,
-            "Fetch",
-            0,
-            0,
-            Some(IconName::ArrowCircle),
-            keybinding_target.clone(),
-            move |_, window, cx| {
-                window.dispatch_action(Box::new(git::Fetch), cx);
-            },
-            move |_window, cx| {
-                git_action_tooltip(
-                    "Fetch updates from remote",
-                    &git::Fetch,
-                    "git fetch",
-                    keybinding_target.clone(),
-                    cx,
-                )
-            },
-        )
-    }
-
-    pub fn render_push_button(
-        keybinding_target: Option<FocusHandle>,
-        id: SharedString,
-        ahead: u32,
-    ) -> SplitButton {
-        split_button(
-            id,
-            "Push",
-            ahead as usize,
-            0,
-            None,
-            keybinding_target.clone(),
-            move |_, window, cx| {
-                window.dispatch_action(Box::new(git::Push), cx);
-            },
-            move |_window, cx| {
-                git_action_tooltip(
-                    "Push committed changes to remote",
-                    &git::Push,
-                    "git push",
-                    keybinding_target.clone(),
-                    cx,
-                )
-            },
-        )
-    }
-
-    pub fn render_pull_button(
-        keybinding_target: Option<FocusHandle>,
-        id: SharedString,
-        ahead: u32,
-        behind: u32,
-    ) -> SplitButton {
-        split_button(
-            id,
-            "Pull",
-            ahead as usize,
-            behind as usize,
-            None,
-            keybinding_target.clone(),
-            move |_, window, cx| {
-                window.dispatch_action(Box::new(git::Pull), cx);
-            },
-            move |_window, cx| {
-                git_action_tooltip(
-                    "Pull",
-                    &git::Pull,
-                    "git pull",
-                    keybinding_target.clone(),
-                    cx,
-                )
-            },
-        )
-    }
-
-    pub fn render_publish_button(
-        keybinding_target: Option<FocusHandle>,
-        id: SharedString,
-    ) -> SplitButton {
-        split_button(
-            id,
-            "Publish",
-            0,
-            0,
-            Some(IconName::ExpandUp),
-            keybinding_target.clone(),
-            move |_, window, cx| {
-                window.dispatch_action(Box::new(git::Push), cx);
-            },
-            move |_window, cx| {
-                git_action_tooltip(
-                    "Publish branch to remote",
-                    &git::Push,
-                    "git push --set-upstream",
-                    keybinding_target.clone(),
-                    cx,
-                )
-            },
-        )
-    }
-
-    pub fn render_republish_button(
-        keybinding_target: Option<FocusHandle>,
-        id: SharedString,
-    ) -> SplitButton {
-        split_button(
-            id,
-            "Republish",
-            0,
-            0,
-            Some(IconName::ExpandUp),
-            keybinding_target.clone(),
-            move |_, window, cx| {
-                window.dispatch_action(Box::new(git::Push), cx);
-            },
-            move |_window, cx| {
-                git_action_tooltip(
-                    "Re-publish branch to remote",
-                    &git::Push,
-                    "git push --set-upstream",
-                    keybinding_target.clone(),
-                    cx,
-                )
-            },
-        )
-    }
-
-    fn git_action_tooltip(
-        label: impl Into<SharedString>,
-        action: &dyn Action,
-        command: impl Into<SharedString>,
-        focus_handle: Option<FocusHandle>,
-        cx: &mut App,
-    ) -> AnyView {
-        let label = label.into();
-        let command = command.into();
-
-        if let Some(handle) = focus_handle {
-            Tooltip::with_meta_in(label, Some(action), command, &handle, cx)
-        } else {
-            Tooltip::with_meta(label, Some(action), command, cx)
-        }
-    }
-
-    fn render_git_action_menu(
-        id: impl Into<ElementId>,
-        keybinding_target: Option<FocusHandle>,
-    ) -> impl IntoElement {
-        PopoverMenu::new(id.into())
-            .trigger(
-                ui::ButtonLike::new_rounded_right("split-button-right")
-                    .layer(ui::ElevationIndex::ModalSurface)
-                    .size(ui::ButtonSize::None)
-                    .child(
-                        div()
-                            .px_1()
-                            .child(Icon::new(IconName::ChevronDown).size(IconSize::XSmall)),
-                    ),
-            )
-            .menu(move |window, cx| {
-                Some(ContextMenu::build(window, cx, |context_menu, _, _| {
-                    context_menu
-                        .when_some(keybinding_target.clone(), |el, keybinding_target| {
-                            el.context(keybinding_target)
-                        })
-                        .action("Fetch", git::Fetch.boxed_clone())
-                        .action("Fetch From", git::FetchFrom.boxed_clone())
-                        .action("Pull", git::Pull.boxed_clone())
-                        .action("Pull (Rebase)", git::PullRebase.boxed_clone())
-                        .separator()
-                        .action("Push", git::Push.boxed_clone())
-                        .action("Push To", git::PushTo.boxed_clone())
-                        .action("Force Push", git::ForcePush.boxed_clone())
-                }))
-            })
-            .anchor(Corner::TopRight)
-    }
-
-    #[allow(clippy::too_many_arguments)]
-    fn split_button(
-        id: SharedString,
-        left_label: impl Into<SharedString>,
-        ahead_count: usize,
-        behind_count: usize,
-        left_icon: Option<IconName>,
-        keybinding_target: Option<FocusHandle>,
-        left_on_click: impl Fn(&ClickEvent, &mut Window, &mut App) + 'static,
-        tooltip: impl Fn(&mut Window, &mut App) -> AnyView + 'static,
-    ) -> SplitButton {
-        fn count(count: usize) -> impl IntoElement {
-            h_flex()
-                .ml_neg_px()
-                .h(rems(0.875))
-                .items_center()
-                .overflow_hidden()
-                .px_0p5()
-                .child(
-                    Label::new(count.to_string())
-                        .size(LabelSize::XSmall)
-                        .line_height_style(LineHeightStyle::UiLabel),
-                )
-        }
-
-        let should_render_counts = left_icon.is_none() && (ahead_count > 0 || behind_count > 0);
-
-        let left = ui::ButtonLike::new_rounded_left(ElementId::Name(
-            format!("split-button-left-{}", id).into(),
-        ))
-        .layer(ui::ElevationIndex::ModalSurface)
-        .size(ui::ButtonSize::Compact)
-        .when(should_render_counts, |this| {
-            this.child(
-                h_flex()
-                    .ml_neg_0p5()
-                    .when(behind_count > 0, |this| {
-                        this.child(Icon::new(IconName::ArrowDown).size(IconSize::XSmall))
-                            .child(count(behind_count))
-                    })
-                    .when(ahead_count > 0, |this| {
-                        this.child(Icon::new(IconName::ArrowUp).size(IconSize::XSmall))
-                            .child(count(ahead_count))
-                    }),
-            )
-        })
-        .when_some(left_icon, |this, left_icon| {
-            this.child(
-                h_flex()
-                    .ml_neg_0p5()
-                    .child(Icon::new(left_icon).size(IconSize::XSmall)),
-            )
-        })
-        .child(
-            div()
-                .child(Label::new(left_label).size(LabelSize::Small))
-                .mr_0p5(),
-        )
-        .on_click(left_on_click)
-        .tooltip(tooltip);
-
-        let right = render_git_action_menu(
-            ElementId::Name(format!("split-button-right-{}", id).into()),
-            keybinding_target,
-        )
-        .into_any_element();
-
-        SplitButton::new(left, right)
-    }
-}
-
-/// A visual representation of a file's Git status.
-#[derive(IntoElement, RegisterComponent)]
-pub struct GitStatusIcon {
-    status: FileStatus,
-}
-
-impl GitStatusIcon {
-    pub fn new(status: FileStatus) -> Self {
-        Self { status }
-    }
-}
-
-impl RenderOnce for GitStatusIcon {
-    fn render(self, _window: &mut ui::Window, cx: &mut App) -> impl IntoElement {
-        let status = self.status;
-
-        let (icon_name, color) = if status.is_conflicted() {
-            (
-                IconName::Warning,
-                cx.theme().colors().version_control_conflict,
-            )
-        } else if status.is_deleted() {
-            (
-                IconName::SquareMinus,
-                cx.theme().colors().version_control_deleted,
-            )
-        } else if status.is_modified() {
-            (
-                IconName::SquareDot,
-                cx.theme().colors().version_control_modified,
-            )
-        } else {
-            (
-                IconName::SquarePlus,
-                cx.theme().colors().version_control_added,
-            )
-        };
-
-        Icon::new(icon_name).color(Color::Custom(color))
-    }
-}
-
-// View this component preview using `workspace: open component-preview`
-impl Component for GitStatusIcon {
-    fn scope() -> ComponentScope {
-        ComponentScope::VersionControl
-    }
-
-    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
-        fn tracked_file_status(code: StatusCode) -> FileStatus {
-            FileStatus::Tracked(git::status::TrackedStatus {
-                index_status: code,
-                worktree_status: code,
-            })
-        }
-
-        let modified = tracked_file_status(StatusCode::Modified);
-        let added = tracked_file_status(StatusCode::Added);
-        let deleted = tracked_file_status(StatusCode::Deleted);
-        let conflict = UnmergedStatus {
-            first_head: UnmergedStatusCode::Updated,
-            second_head: UnmergedStatusCode::Updated,
-        }
-        .into();
-
-        Some(
-            v_flex()
-                .gap_6()
-                .children(vec![example_group(vec![
-                    single_example("Modified", GitStatusIcon::new(modified).into_any_element()),
-                    single_example("Added", GitStatusIcon::new(added).into_any_element()),
-                    single_example("Deleted", GitStatusIcon::new(deleted).into_any_element()),
-                    single_example(
-                        "Conflicted",
-                        GitStatusIcon::new(conflict).into_any_element(),
-                    ),
-                ])])
-                .into_any_element(),
-        )
-    }
-}
-
-struct GitCloneModal {
-    panel: Entity<GitPanel>,
-    repo_input: Entity<Editor>,
-    focus_handle: FocusHandle,
-}
-
-impl GitCloneModal {
-    pub fn show(panel: Entity<GitPanel>, window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let repo_input = cx.new(|cx| {
-            let mut editor = Editor::single_line(window, cx);
-            editor.set_placeholder_text("Enter repository URL…", window, cx);
-            editor
-        });
-        let focus_handle = repo_input.focus_handle(cx);
-
-        window.focus(&focus_handle);
-
-        Self {
-            panel,
-            repo_input,
-            focus_handle,
-        }
-    }
-}
-
-impl Focusable for GitCloneModal {
-    fn focus_handle(&self, _: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl Render for GitCloneModal {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        div()
-            .elevation_3(cx)
-            .w(rems(34.))
-            .flex_1()
-            .overflow_hidden()
-            .child(
-                div()
-                    .w_full()
-                    .p_2()
-                    .border_b_1()
-                    .border_color(cx.theme().colors().border_variant)
-                    .child(self.repo_input.clone()),
-            )
-            .child(
-                h_flex()
-                    .w_full()
-                    .p_2()
-                    .gap_0p5()
-                    .rounded_b_sm()
-                    .bg(cx.theme().colors().editor_background)
-                    .child(
-                        Label::new("Clone a repository from GitHub or other sources.")
-                            .color(Color::Muted)
-                            .size(LabelSize::Small),
-                    )
-                    .child(
-                        Button::new("learn-more", "Learn More")
-                            .label_size(LabelSize::Small)
-                            .icon(IconName::ArrowUpRight)
-                            .icon_size(IconSize::XSmall)
-                            .on_click(|_, _, cx| {
-                                cx.open_url("https://github.com/git-guides/git-clone");
-                            }),
-                    ),
-            )
-            .on_action(cx.listener(|_, _: &menu::Cancel, _, cx| {
-                cx.emit(DismissEvent);
-            }))
-            .on_action(cx.listener(|this, _: &menu::Confirm, window, cx| {
-                let repo = this.repo_input.read(cx).text(cx);
-                this.panel.update(cx, |panel, cx| {
-                    panel.git_clone(repo, window, cx);
-                });
-                cx.emit(DismissEvent);
-            }))
-    }
-}
-
-impl EventEmitter<DismissEvent> for GitCloneModal {}
-
-impl ModalView for GitCloneModal {}
diff --git a/crates/git_ui/src/onboarding.rs b/crates/git_ui/src/onboarding.rs
deleted file mode 100644
index d1709e043b..0000000000
--- a/crates/git_ui/src/onboarding.rs
+++ /dev/null
@@ -1,145 +0,0 @@
-use gpui::{
-    ClickEvent, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, MouseDownEvent, Render,
-    svg,
-};
-use ui::{TintColor, prelude::*};
-use workspace::{ModalView, Workspace};
-
-use crate::git_panel::GitPanel;
-
-macro_rules! git_onboarding_event {
-    ($name:expr) => {
-        telemetry::event!($name, source = "Git Onboarding");
-    };
-    ($name:expr, $($key:ident $(= $value:expr)?),+ $(,)?) => {
-        telemetry::event!($name, source = "Git Onboarding", $($key $(= $value)?),+);
-    };
-}
-
-/// Introduces user to the Git Panel and overall improved Git support
-pub struct GitOnboardingModal {
-    focus_handle: FocusHandle,
-    workspace: Entity<Workspace>,
-}
-
-impl GitOnboardingModal {
-    pub fn toggle(workspace: &mut Workspace, window: &mut Window, cx: &mut Context<Workspace>) {
-        let workspace_entity = cx.entity();
-        workspace.toggle_modal(window, cx, |_window, cx| Self {
-            workspace: workspace_entity,
-            focus_handle: cx.focus_handle(),
-        });
-    }
-
-    fn open_panel(&mut self, _: &ClickEvent, window: &mut Window, cx: &mut Context<Self>) {
-        self.workspace.update(cx, |workspace, cx| {
-            workspace.focus_panel::<GitPanel>(window, cx);
-        });
-
-        cx.emit(DismissEvent);
-
-        git_onboarding_event!("Open Panel Clicked");
-    }
-
-    fn view_blog(&mut self, _: &ClickEvent, _: &mut Window, cx: &mut Context<Self>) {
-        cx.open_url("https://zed.dev/blog/git");
-        cx.notify();
-
-        git_onboarding_event!("Blog Link Clicked");
-    }
-
-    fn cancel(&mut self, _: &menu::Cancel, _: &mut Window, cx: &mut Context<Self>) {
-        cx.emit(DismissEvent);
-    }
-}
-
-impl EventEmitter<DismissEvent> for GitOnboardingModal {}
-
-impl Focusable for GitOnboardingModal {
-    fn focus_handle(&self, _cx: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl ModalView for GitOnboardingModal {}
-
-impl Render for GitOnboardingModal {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let window_height = window.viewport_size().height;
-        let max_height = window_height - px(200.);
-
-        let base = v_flex()
-            .id("git-onboarding")
-            .key_context("GitOnboardingModal")
-            .relative()
-            .w(px(450.))
-            .h_full()
-            .max_h(max_height)
-            .p_4()
-            .gap_2()
-            .elevation_3(cx)
-            .track_focus(&self.focus_handle(cx))
-            .overflow_hidden()
-            .on_action(cx.listener(Self::cancel))
-            .on_action(cx.listener(|_, _: &menu::Cancel, _window, cx| {
-                git_onboarding_event!("Cancelled", trigger = "Action");
-                cx.emit(DismissEvent);
-            }))
-            .on_any_mouse_down(cx.listener(|this, _: &MouseDownEvent, window, _cx| {
-                this.focus_handle.focus(window);
-            }))
-            .child(
-                div().p_1p5().absolute().inset_0().h(px(160.)).child(
-                    svg()
-                        .path("icons/git_onboarding_bg.svg")
-                        .text_color(cx.theme().colors().icon_disabled)
-                        .w(px(420.))
-                        .h(px(128.))
-                        .overflow_hidden(),
-                ),
-            )
-            .child(
-                v_flex()
-                    .w_full()
-                    .gap_1()
-                    .child(
-                        Label::new("Introducing")
-                            .size(LabelSize::Small)
-                            .color(Color::Muted),
-                    )
-                    .child(Headline::new("Native Git Support").size(HeadlineSize::Large)),
-            )
-            .child(h_flex().absolute().top_2().right_2().child(
-                IconButton::new("cancel", IconName::Close).on_click(cx.listener(
-                    |_, _: &ClickEvent, _window, cx| {
-                        git_onboarding_event!("Cancelled", trigger = "X click");
-                        cx.emit(DismissEvent);
-                    },
-                )),
-            ));
-
-        let open_panel_button = Button::new("open-panel", "Get Started with the Git Panel")
-            .icon_size(IconSize::Indicator)
-            .style(ButtonStyle::Tinted(TintColor::Accent))
-            .full_width()
-            .on_click(cx.listener(Self::open_panel));
-
-        let blog_post_button = Button::new("view-blog", "Check out the Blog Post")
-            .icon(IconName::ArrowUpRight)
-            .icon_size(IconSize::Indicator)
-            .icon_color(Color::Muted)
-            .full_width()
-            .on_click(cx.listener(Self::view_blog));
-
-        let copy = "First-class support for staging, committing, pulling, pushing, viewing diffs, and more. All without leaving Zed.";
-
-        base.child(Label::new(copy).color(Color::Muted)).child(
-            v_flex()
-                .w_full()
-                .mt_2()
-                .gap_2()
-                .child(open_panel_button)
-                .child(blog_post_button),
-        )
-    }
-}
diff --git a/crates/git_ui/src/picker_prompt.rs b/crates/git_ui/src/picker_prompt.rs
deleted file mode 100644
index 14daedda61..0000000000
--- a/crates/git_ui/src/picker_prompt.rs
+++ /dev/null
@@ -1,239 +0,0 @@
-use futures::channel::oneshot;
-use fuzzy::{StringMatch, StringMatchCandidate};
-
-use core::cmp;
-use gpui::{
-    App, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, InteractiveElement,
-    IntoElement, ParentElement, Render, SharedString, Styled, Subscription, Task, WeakEntity,
-    Window, rems,
-};
-use picker::{Picker, PickerDelegate};
-use std::sync::Arc;
-use ui::{HighlightedLabel, ListItem, ListItemSpacing, prelude::*};
-use util::ResultExt;
-use workspace::{ModalView, Workspace};
-
-pub struct PickerPrompt {
-    pub picker: Entity<Picker<PickerPromptDelegate>>,
-    rem_width: f32,
-    _subscription: Subscription,
-}
-
-pub fn prompt(
-    prompt: &str,
-    options: Vec<SharedString>,
-    workspace: WeakEntity<Workspace>,
-    window: &mut Window,
-    cx: &mut App,
-) -> Task<Option<usize>> {
-    if options.is_empty() {
-        return Task::ready(None);
-    } else if options.len() == 1 {
-        return Task::ready(Some(0));
-    }
-    let prompt = prompt.to_string().into();
-
-    window.spawn(cx, async move |cx| {
-        // Modal branch picker has a longer trailoff than a popover one.
-        let (tx, rx) = oneshot::channel();
-        let delegate = PickerPromptDelegate::new(prompt, options, tx, 70);
-
-        workspace
-            .update_in(cx, |workspace, window, cx| {
-                workspace.toggle_modal(window, cx, |window, cx| {
-                    PickerPrompt::new(delegate, 34., window, cx)
-                })
-            })
-            .ok();
-
-        (rx.await).ok()
-    })
-}
-
-impl PickerPrompt {
-    fn new(
-        delegate: PickerPromptDelegate,
-        rem_width: f32,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx));
-        let _subscription = cx.subscribe(&picker, |_, _, _, cx| cx.emit(DismissEvent));
-        Self {
-            picker,
-            rem_width,
-            _subscription,
-        }
-    }
-}
-impl ModalView for PickerPrompt {}
-impl EventEmitter<DismissEvent> for PickerPrompt {}
-
-impl Focusable for PickerPrompt {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        self.picker.focus_handle(cx)
-    }
-}
-
-impl Render for PickerPrompt {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .w(rems(self.rem_width))
-            .child(self.picker.clone())
-            .on_mouse_down_out(cx.listener(|this, _, window, cx| {
-                this.picker.update(cx, |this, cx| {
-                    this.cancel(&Default::default(), window, cx);
-                })
-            }))
-    }
-}
-
-pub struct PickerPromptDelegate {
-    prompt: Arc<str>,
-    matches: Vec<StringMatch>,
-    all_options: Vec<SharedString>,
-    selected_index: usize,
-    max_match_length: usize,
-    tx: Option<oneshot::Sender<usize>>,
-}
-
-impl PickerPromptDelegate {
-    pub fn new(
-        prompt: Arc<str>,
-        options: Vec<SharedString>,
-        tx: oneshot::Sender<usize>,
-        max_chars: usize,
-    ) -> Self {
-        Self {
-            prompt,
-            all_options: options,
-            matches: vec![],
-            selected_index: 0,
-            max_match_length: max_chars,
-            tx: Some(tx),
-        }
-    }
-}
-
-impl PickerDelegate for PickerPromptDelegate {
-    type ListItem = ListItem;
-
-    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
-        self.prompt.clone()
-    }
-
-    fn match_count(&self) -> usize {
-        self.matches.len()
-    }
-
-    fn selected_index(&self) -> usize {
-        self.selected_index
-    }
-
-    fn set_selected_index(
-        &mut self,
-        ix: usize,
-        _window: &mut Window,
-        _: &mut Context<Picker<Self>>,
-    ) {
-        self.selected_index = ix;
-    }
-
-    fn update_matches(
-        &mut self,
-        query: String,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Task<()> {
-        cx.spawn_in(window, async move |picker, cx| {
-            let candidates = picker.read_with(cx, |picker, _| {
-                picker
-                    .delegate
-                    .all_options
-                    .iter()
-                    .enumerate()
-                    .map(|(ix, option)| StringMatchCandidate::new(ix, option))
-                    .collect::<Vec<StringMatchCandidate>>()
-            });
-            let Some(candidates) = candidates.log_err() else {
-                return;
-            };
-            let matches: Vec<StringMatch> = if query.is_empty() {
-                candidates
-                    .into_iter()
-                    .enumerate()
-                    .map(|(index, candidate)| StringMatch {
-                        candidate_id: index,
-                        string: candidate.string,
-                        positions: Vec::new(),
-                        score: 0.0,
-                    })
-                    .collect()
-            } else {
-                fuzzy::match_strings(
-                    &candidates,
-                    &query,
-                    true,
-                    true,
-                    10000,
-                    &Default::default(),
-                    cx.background_executor().clone(),
-                )
-                .await
-            };
-            picker
-                .update(cx, |picker, _| {
-                    let delegate = &mut picker.delegate;
-                    delegate.matches = matches;
-                    if delegate.matches.is_empty() {
-                        delegate.selected_index = 0;
-                    } else {
-                        delegate.selected_index =
-                            cmp::min(delegate.selected_index, delegate.matches.len() - 1);
-                    }
-                })
-                .log_err();
-        })
-    }
-
-    fn confirm(&mut self, _: bool, _window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        let Some(option) = self.matches.get(self.selected_index()) else {
-            return;
-        };
-
-        self.tx.take().map(|tx| tx.send(option.candidate_id));
-        cx.emit(DismissEvent);
-    }
-
-    fn dismissed(&mut self, _: &mut Window, cx: &mut Context<Picker<Self>>) {
-        cx.emit(DismissEvent);
-    }
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        _window: &mut Window,
-        _cx: &mut Context<Picker<Self>>,
-    ) -> Option<Self::ListItem> {
-        let hit = &self.matches.get(ix)?;
-        let shortened_option = util::truncate_and_trailoff(&hit.string, self.max_match_length);
-
-        Some(
-            ListItem::new(format!("picker-prompt-menu-{ix}"))
-                .inset(true)
-                .spacing(ListItemSpacing::Sparse)
-                .toggle_state(selected)
-                .map(|el| {
-                    let highlights: Vec<_> = hit
-                        .positions
-                        .iter()
-                        .filter(|&&index| index < self.max_match_length)
-                        .copied()
-                        .collect();
-
-                    el.child(HighlightedLabel::new(shortened_option, highlights))
-                }),
-        )
-    }
-}
diff --git a/crates/git_ui/src/project_diff.rs b/crates/git_ui/src/project_diff.rs
deleted file mode 100644
index f40d70da64..0000000000
--- a/crates/git_ui/src/project_diff.rs
+++ /dev/null
@@ -1,2380 +0,0 @@
-use crate::{
-    conflict_view::ConflictAddon,
-    git_panel::{GitPanel, GitPanelAddon, GitStatusEntry},
-    git_panel_settings::GitPanelSettings,
-    remote_button::{render_publish_button, render_push_button},
-};
-use anyhow::{Context as _, Result, anyhow};
-use buffer_diff::{BufferDiff, DiffHunkSecondaryStatus};
-use collections::{HashMap, HashSet};
-use editor::{
-    Addon, Editor, EditorEvent, SelectionEffects, SplittableEditor,
-    actions::{GoToHunk, GoToPreviousHunk},
-    multibuffer_context_lines,
-    scroll::Autoscroll,
-};
-use git::{
-    Commit, StageAll, StageAndNext, ToggleStaged, UnstageAll, UnstageAndNext,
-    repository::{Branch, RepoPath, Upstream, UpstreamTracking, UpstreamTrackingStatus},
-    status::FileStatus,
-};
-use gpui::{
-    Action, AnyElement, App, AppContext as _, AsyncWindowContext, Entity, EventEmitter,
-    FocusHandle, Focusable, Render, Subscription, Task, WeakEntity, actions,
-};
-use language::{Anchor, Buffer, Capability, OffsetRangeExt};
-use multi_buffer::{MultiBuffer, PathKey};
-use project::{
-    Project, ProjectPath,
-    git_store::{
-        Repository,
-        branch_diff::{self, BranchDiffEvent, DiffBase},
-    },
-};
-use settings::{Settings, SettingsStore};
-use smol::future::yield_now;
-use std::any::{Any, TypeId};
-use std::sync::Arc;
-use theme::ActiveTheme;
-use ui::{KeyBinding, Tooltip, prelude::*, vertical_divider};
-use util::{ResultExt as _, rel_path::RelPath};
-use workspace::{
-    CloseActiveItem, ItemNavHistory, SerializableItem, ToolbarItemEvent, ToolbarItemLocation,
-    ToolbarItemView, Workspace,
-    item::{BreadcrumbText, Item, ItemEvent, ItemHandle, SaveOptions, TabContentParams},
-    notifications::NotifyTaskExt,
-    searchable::SearchableItemHandle,
-};
-use ztracing::instrument;
-
-actions!(
-    git,
-    [
-        /// Shows the diff between the working directory and the index.
-        Diff,
-        /// Adds files to the git staging area.
-        Add,
-        /// Shows the diff between the working directory and your default
-        /// branch (typically main or master).
-        BranchDiff,
-        LeaderAndFollower,
-    ]
-);
-
-pub struct ProjectDiff {
-    project: Entity<Project>,
-    multibuffer: Entity<MultiBuffer>,
-    branch_diff: Entity<branch_diff::BranchDiff>,
-    editor: Entity<SplittableEditor>,
-    buffer_diff_subscriptions: HashMap<Arc<RelPath>, (Entity<BufferDiff>, Subscription)>,
-    workspace: WeakEntity<Workspace>,
-    focus_handle: FocusHandle,
-    pending_scroll: Option<PathKey>,
-    _task: Task<Result<()>>,
-    _subscription: Subscription,
-}
-
-const CONFLICT_SORT_PREFIX: u64 = 1;
-const TRACKED_SORT_PREFIX: u64 = 2;
-const NEW_SORT_PREFIX: u64 = 3;
-
-impl ProjectDiff {
-    pub(crate) fn register(workspace: &mut Workspace, cx: &mut Context<Workspace>) {
-        workspace.register_action(Self::deploy);
-        workspace.register_action(Self::deploy_branch_diff);
-        workspace.register_action(|workspace, _: &Add, window, cx| {
-            Self::deploy(workspace, &Diff, window, cx);
-        });
-        workspace::register_serializable_item::<ProjectDiff>(cx);
-    }
-
-    fn deploy(
-        workspace: &mut Workspace,
-        _: &Diff,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        Self::deploy_at(workspace, None, window, cx)
-    }
-
-    fn deploy_branch_diff(
-        workspace: &mut Workspace,
-        _: &BranchDiff,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        telemetry::event!("Git Branch Diff Opened");
-        let project = workspace.project().clone();
-
-        let existing = workspace
-            .items_of_type::<Self>(cx)
-            .find(|item| matches!(item.read(cx).diff_base(cx), DiffBase::Merge { .. }));
-        if let Some(existing) = existing {
-            workspace.activate_item(&existing, true, true, window, cx);
-            return;
-        }
-        let workspace = cx.entity();
-        window
-            .spawn(cx, async move |cx| {
-                let this = cx
-                    .update(|window, cx| {
-                        Self::new_with_default_branch(project, workspace.clone(), window, cx)
-                    })?
-                    .await?;
-                workspace
-                    .update_in(cx, |workspace, window, cx| {
-                        workspace.add_item_to_active_pane(Box::new(this), None, true, window, cx);
-                    })
-                    .ok();
-                anyhow::Ok(())
-            })
-            .detach_and_notify_err(window, cx);
-    }
-
-    pub fn deploy_at(
-        workspace: &mut Workspace,
-        entry: Option<GitStatusEntry>,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        telemetry::event!(
-            "Git Diff Opened",
-            source = if entry.is_some() {
-                "Git Panel"
-            } else {
-                "Action"
-            }
-        );
-        let existing = workspace
-            .items_of_type::<Self>(cx)
-            .find(|item| matches!(item.read(cx).diff_base(cx), DiffBase::Head));
-        let project_diff = if let Some(existing) = existing {
-            workspace.activate_item(&existing, true, true, window, cx);
-            existing
-        } else {
-            let workspace_handle = cx.entity();
-            let project_diff =
-                cx.new(|cx| Self::new(workspace.project().clone(), workspace_handle, window, cx));
-            workspace.add_item_to_active_pane(
-                Box::new(project_diff.clone()),
-                None,
-                true,
-                window,
-                cx,
-            );
-            project_diff
-        };
-        if let Some(entry) = entry {
-            project_diff.update(cx, |project_diff, cx| {
-                project_diff.move_to_entry(entry, window, cx);
-            })
-        }
-    }
-
-    pub fn autoscroll(&self, cx: &mut Context<Self>) {
-        self.editor.update(cx, |editor, cx| {
-            editor.primary_editor().update(cx, |editor, cx| {
-                editor.request_autoscroll(Autoscroll::fit(), cx);
-            })
-        })
-    }
-
-    fn new_with_default_branch(
-        project: Entity<Project>,
-        workspace: Entity<Workspace>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<Entity<Self>>> {
-        let Some(repo) = project.read(cx).git_store().read(cx).active_repository() else {
-            return Task::ready(Err(anyhow!("No active repository")));
-        };
-        let main_branch = repo.update(cx, |repo, _| repo.default_branch());
-        window.spawn(cx, async move |cx| {
-            let main_branch = main_branch
-                .await??
-                .context("Could not determine default branch")?;
-
-            let branch_diff = cx.new_window_entity(|window, cx| {
-                branch_diff::BranchDiff::new(
-                    DiffBase::Merge {
-                        base_ref: main_branch,
-                    },
-                    project.clone(),
-                    window,
-                    cx,
-                )
-            })?;
-            cx.new_window_entity(|window, cx| {
-                Self::new_impl(branch_diff, project, workspace, window, cx)
-            })
-        })
-    }
-
-    fn new(
-        project: Entity<Project>,
-        workspace: Entity<Workspace>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let branch_diff =
-            cx.new(|cx| branch_diff::BranchDiff::new(DiffBase::Head, project.clone(), window, cx));
-        Self::new_impl(branch_diff, project, workspace, window, cx)
-    }
-
-    fn new_impl(
-        branch_diff: Entity<branch_diff::BranchDiff>,
-        project: Entity<Project>,
-        workspace: Entity<Workspace>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let focus_handle = cx.focus_handle();
-        let multibuffer = cx.new(|cx| {
-            let mut multibuffer = MultiBuffer::new(Capability::ReadWrite);
-            multibuffer.set_all_diff_hunks_expanded(cx);
-            multibuffer
-        });
-
-        let editor = cx.new(|cx| {
-            let diff_display_editor = SplittableEditor::new_unsplit(
-                multibuffer.clone(),
-                project.clone(),
-                workspace.clone(),
-                window,
-                cx,
-            );
-            diff_display_editor
-                .primary_editor()
-                .update(cx, |editor, cx| {
-                    editor.disable_diagnostics(cx);
-
-                    match branch_diff.read(cx).diff_base() {
-                        DiffBase::Head => {
-                            editor.register_addon(GitPanelAddon {
-                                workspace: workspace.downgrade(),
-                            });
-                        }
-                        DiffBase::Merge { .. } => {
-                            editor.register_addon(BranchDiffAddon {
-                                branch_diff: branch_diff.clone(),
-                            });
-                            editor.start_temporary_diff_override();
-                            editor.set_render_diff_hunk_controls(
-                                Arc::new(|_, _, _, _, _, _, _, _| gpui::Empty.into_any_element()),
-                                cx,
-                            );
-                        }
-                    }
-                });
-            diff_display_editor
-        });
-        cx.subscribe_in(&editor, window, Self::handle_editor_event)
-            .detach();
-
-        let branch_diff_subscription = cx.subscribe_in(
-            &branch_diff,
-            window,
-            move |this, _git_store, event, window, cx| match event {
-                BranchDiffEvent::FileListChanged => {
-                    this._task = window.spawn(cx, {
-                        let this = cx.weak_entity();
-                        async |cx| Self::refresh(this, cx).await
-                    })
-                }
-            },
-        );
-
-        let mut was_sort_by_path = GitPanelSettings::get_global(cx).sort_by_path;
-        let mut was_collapse_untracked_diff =
-            GitPanelSettings::get_global(cx).collapse_untracked_diff;
-        cx.observe_global_in::<SettingsStore>(window, move |this, window, cx| {
-            let is_sort_by_path = GitPanelSettings::get_global(cx).sort_by_path;
-            let is_collapse_untracked_diff =
-                GitPanelSettings::get_global(cx).collapse_untracked_diff;
-            if is_sort_by_path != was_sort_by_path
-                || is_collapse_untracked_diff != was_collapse_untracked_diff
-            {
-                this._task = {
-                    window.spawn(cx, {
-                        let this = cx.weak_entity();
-                        async |cx| Self::refresh(this, cx).await
-                    })
-                }
-            }
-            was_sort_by_path = is_sort_by_path;
-            was_collapse_untracked_diff = is_collapse_untracked_diff;
-        })
-        .detach();
-
-        let task = window.spawn(cx, {
-            let this = cx.weak_entity();
-            async |cx| Self::refresh(this, cx).await
-        });
-
-        Self {
-            project,
-            workspace: workspace.downgrade(),
-            branch_diff,
-            focus_handle,
-            editor,
-            multibuffer,
-            buffer_diff_subscriptions: Default::default(),
-            pending_scroll: None,
-            _task: task,
-            _subscription: branch_diff_subscription,
-        }
-    }
-
-    pub fn diff_base<'a>(&'a self, cx: &'a App) -> &'a DiffBase {
-        self.branch_diff.read(cx).diff_base()
-    }
-
-    pub fn move_to_entry(
-        &mut self,
-        entry: GitStatusEntry,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(git_repo) = self.branch_diff.read(cx).repo() else {
-            return;
-        };
-        let repo = git_repo.read(cx);
-        let sort_prefix = sort_prefix(repo, &entry.repo_path, entry.status, cx);
-        let path_key = PathKey::with_sort_prefix(sort_prefix, entry.repo_path.as_ref().clone());
-
-        self.move_to_path(path_key, window, cx)
-    }
-
-    pub fn active_path(&self, cx: &App) -> Option<ProjectPath> {
-        let editor = self.editor.read(cx).last_selected_editor().read(cx);
-        let position = editor.selections.newest_anchor().head();
-        let multi_buffer = editor.buffer().read(cx);
-        let (_, buffer, _) = multi_buffer.excerpt_containing(position, cx)?;
-
-        let file = buffer.read(cx).file()?;
-        Some(ProjectPath {
-            worktree_id: file.worktree_id(cx),
-            path: file.path().clone(),
-        })
-    }
-
-    fn move_to_path(&mut self, path_key: PathKey, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(position) = self.multibuffer.read(cx).location_for_path(&path_key, cx) {
-            self.editor.update(cx, |editor, cx| {
-                editor.primary_editor().update(cx, |editor, cx| {
-                    editor.change_selections(
-                        SelectionEffects::scroll(Autoscroll::focused()),
-                        window,
-                        cx,
-                        |s| {
-                            s.select_ranges([position..position]);
-                        },
-                    )
-                })
-            });
-        } else {
-            self.pending_scroll = Some(path_key);
-        }
-    }
-
-    fn button_states(&self, cx: &App) -> ButtonStates {
-        let editor = self.editor.read(cx).primary_editor().read(cx);
-        let snapshot = self.multibuffer.read(cx).snapshot(cx);
-        let prev_next = snapshot.diff_hunks().nth(1).is_some();
-        let mut selection = true;
-
-        let mut ranges = editor
-            .selections
-            .disjoint_anchor_ranges()
-            .collect::<Vec<_>>();
-        if !ranges.iter().any(|range| range.start != range.end) {
-            selection = false;
-            if let Some((excerpt_id, _, range)) = self
-                .editor
-                .read(cx)
-                .primary_editor()
-                .read(cx)
-                .active_excerpt(cx)
-            {
-                ranges = vec![multi_buffer::Anchor::range_in_buffer(excerpt_id, range)];
-            } else {
-                ranges = Vec::default();
-            }
-        }
-        let mut has_staged_hunks = false;
-        let mut has_unstaged_hunks = false;
-        for hunk in editor.diff_hunks_in_ranges(&ranges, &snapshot) {
-            match hunk.secondary_status {
-                DiffHunkSecondaryStatus::HasSecondaryHunk
-                | DiffHunkSecondaryStatus::SecondaryHunkAdditionPending => {
-                    has_unstaged_hunks = true;
-                }
-                DiffHunkSecondaryStatus::OverlapsWithSecondaryHunk => {
-                    has_staged_hunks = true;
-                    has_unstaged_hunks = true;
-                }
-                DiffHunkSecondaryStatus::NoSecondaryHunk
-                | DiffHunkSecondaryStatus::SecondaryHunkRemovalPending => {
-                    has_staged_hunks = true;
-                }
-            }
-        }
-        let mut stage_all = false;
-        let mut unstage_all = false;
-        self.workspace
-            .read_with(cx, |workspace, cx| {
-                if let Some(git_panel) = workspace.panel::<GitPanel>(cx) {
-                    let git_panel = git_panel.read(cx);
-                    stage_all = git_panel.can_stage_all();
-                    unstage_all = git_panel.can_unstage_all();
-                }
-            })
-            .ok();
-
-        ButtonStates {
-            stage: has_unstaged_hunks,
-            unstage: has_staged_hunks,
-            prev_next,
-            selection,
-            stage_all,
-            unstage_all,
-        }
-    }
-
-    fn handle_editor_event(
-        &mut self,
-        editor: &Entity<SplittableEditor>,
-        event: &EditorEvent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let EditorEvent::SelectionsChanged { local: true } = event {
-            let Some(project_path) = self.active_path(cx) else {
-                return;
-            };
-            self.workspace
-                .update(cx, |workspace, cx| {
-                    if let Some(git_panel) = workspace.panel::<GitPanel>(cx) {
-                        git_panel.update(cx, |git_panel, cx| {
-                            git_panel.select_entry_by_path(project_path, window, cx)
-                        })
-                    }
-                })
-                .ok();
-        }
-        if editor.focus_handle(cx).contains_focused(window, cx)
-            && self.multibuffer.read(cx).is_empty()
-        {
-            self.focus_handle.focus(window)
-        }
-    }
-
-    #[instrument(skip_all)]
-    fn register_buffer(
-        &mut self,
-        path_key: PathKey,
-        file_status: FileStatus,
-        buffer: Entity<Buffer>,
-        diff: Entity<BufferDiff>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let subscription = cx.subscribe_in(&diff, window, move |this, _, _, window, cx| {
-            this._task = window.spawn(cx, {
-                let this = cx.weak_entity();
-                async |cx| Self::refresh(this, cx).await
-            })
-        });
-        self.buffer_diff_subscriptions
-            .insert(path_key.path.clone(), (diff.clone(), subscription));
-
-        // TODO(split-diff) we shouldn't have a conflict addon when split
-        let conflict_addon = self
-            .editor
-            .read(cx)
-            .primary_editor()
-            .read(cx)
-            .addon::<ConflictAddon>()
-            .expect("project diff editor should have a conflict addon");
-
-        let snapshot = buffer.read(cx).snapshot();
-        let diff_read = diff.read(cx);
-
-        let excerpt_ranges = {
-            let diff_hunk_ranges = diff_read
-                .hunks_intersecting_range(
-                    Anchor::min_max_range_for_buffer(diff_read.buffer_id),
-                    &snapshot,
-                    cx,
-                )
-                .map(|diff_hunk| diff_hunk.buffer_range.to_point(&snapshot));
-            let conflicts = conflict_addon
-                .conflict_set(snapshot.remote_id())
-                .map(|conflict_set| conflict_set.read(cx).snapshot().conflicts)
-                .unwrap_or_default();
-            let mut conflicts = conflicts
-                .iter()
-                .map(|conflict| conflict.range.to_point(&snapshot))
-                .peekable();
-
-            if conflicts.peek().is_some() {
-                conflicts.collect::<Vec<_>>()
-            } else {
-                diff_hunk_ranges.collect()
-            }
-        };
-
-        let (was_empty, is_excerpt_newly_added) = self.multibuffer.update(cx, |multibuffer, cx| {
-            let was_empty = multibuffer.is_empty();
-            let (_, is_newly_added) = multibuffer.set_excerpts_for_path(
-                path_key.clone(),
-                buffer,
-                excerpt_ranges,
-                multibuffer_context_lines(cx),
-                cx,
-            );
-            if self.branch_diff.read(cx).diff_base().is_merge_base() {
-                multibuffer.add_diff(diff.clone(), cx);
-            }
-            (was_empty, is_newly_added)
-        });
-
-        self.editor.update(cx, |editor, cx| {
-            editor.primary_editor().update(cx, |editor, cx| {
-                if was_empty {
-                    editor.change_selections(
-                        SelectionEffects::no_scroll(),
-                        window,
-                        cx,
-                        |selections| {
-                            selections.select_ranges([
-                                multi_buffer::Anchor::min()..multi_buffer::Anchor::min()
-                            ])
-                        },
-                    );
-                }
-                if is_excerpt_newly_added
-                    && (file_status.is_deleted()
-                        || (file_status.is_untracked()
-                            && GitPanelSettings::get_global(cx).collapse_untracked_diff))
-                {
-                    editor.fold_buffer(snapshot.text.remote_id(), cx)
-                }
-            })
-        });
-
-        if self.multibuffer.read(cx).is_empty()
-            && self
-                .editor
-                .read(cx)
-                .focus_handle(cx)
-                .contains_focused(window, cx)
-        {
-            self.focus_handle.focus(window);
-        } else if self.focus_handle.is_focused(window) && !self.multibuffer.read(cx).is_empty() {
-            self.editor.update(cx, |editor, cx| {
-                editor.focus_handle(cx).focus(window);
-            });
-        }
-        if self.pending_scroll.as_ref() == Some(&path_key) {
-            self.move_to_path(path_key, window, cx);
-        }
-    }
-
-    pub async fn refresh(this: WeakEntity<Self>, cx: &mut AsyncWindowContext) -> Result<()> {
-        let mut path_keys = Vec::new();
-        let buffers_to_load = this.update(cx, |this, cx| {
-            let (repo, buffers_to_load) = this.branch_diff.update(cx, |branch_diff, cx| {
-                let load_buffers = branch_diff.load_buffers(cx);
-                (branch_diff.repo().cloned(), load_buffers)
-            });
-            let mut previous_paths = this.multibuffer.read(cx).paths().collect::<HashSet<_>>();
-
-            if let Some(repo) = repo {
-                let repo = repo.read(cx);
-
-                path_keys = Vec::with_capacity(buffers_to_load.len());
-                for entry in buffers_to_load.iter() {
-                    let sort_prefix = sort_prefix(&repo, &entry.repo_path, entry.file_status, cx);
-                    let path_key =
-                        PathKey::with_sort_prefix(sort_prefix, entry.repo_path.as_ref().clone());
-                    previous_paths.remove(&path_key);
-                    path_keys.push(path_key)
-                }
-            }
-
-            this.multibuffer.update(cx, |multibuffer, cx| {
-                for path in previous_paths {
-                    this.buffer_diff_subscriptions.remove(&path.path);
-                    multibuffer.remove_excerpts_for_path(path, cx);
-                }
-            });
-            buffers_to_load
-        })?;
-
-        for (entry, path_key) in buffers_to_load.into_iter().zip(path_keys.into_iter()) {
-            if let Some((buffer, diff)) = entry.load.await.log_err() {
-                // We might be lagging behind enough that all future entry.load futures are no longer pending.
-                // If that is the case, this task will never yield, starving the foreground thread of execution time.
-                yield_now().await;
-                cx.update(|window, cx| {
-                    this.update(cx, |this, cx| {
-                        this.register_buffer(path_key, entry.file_status, buffer, diff, window, cx)
-                    })
-                    .ok();
-                })?;
-            }
-        }
-        this.update(cx, |this, cx| {
-            this.pending_scroll.take();
-            cx.notify();
-        })?;
-
-        Ok(())
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn excerpt_paths(&self, cx: &App) -> Vec<std::sync::Arc<util::rel_path::RelPath>> {
-        self.multibuffer
-            .read(cx)
-            .excerpt_paths()
-            .map(|key| key.path.clone())
-            .collect()
-    }
-}
-
-fn sort_prefix(repo: &Repository, repo_path: &RepoPath, status: FileStatus, cx: &App) -> u64 {
-    let settings = GitPanelSettings::get_global(cx);
-
-    // Tree view can only sort by path
-    if settings.sort_by_path || settings.tree_view {
-        TRACKED_SORT_PREFIX
-    } else if repo.had_conflict_on_last_merge_head_change(repo_path) {
-        CONFLICT_SORT_PREFIX
-    } else if status.is_created() {
-        NEW_SORT_PREFIX
-    } else {
-        TRACKED_SORT_PREFIX
-    }
-}
-
-impl EventEmitter<EditorEvent> for ProjectDiff {}
-
-impl Focusable for ProjectDiff {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        if self.multibuffer.read(cx).is_empty() {
-            self.focus_handle.clone()
-        } else {
-            self.editor.focus_handle(cx)
-        }
-    }
-}
-
-impl Item for ProjectDiff {
-    type Event = EditorEvent;
-
-    fn tab_icon(&self, _window: &Window, _cx: &App) -> Option<Icon> {
-        Some(Icon::new(IconName::GitBranch).color(Color::Muted))
-    }
-
-    fn to_item_events(event: &EditorEvent, f: impl FnMut(ItemEvent)) {
-        Editor::to_item_events(event, f)
-    }
-
-    fn deactivated(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.editor.update(cx, |editor, cx| {
-            editor.primary_editor().update(cx, |primary_editor, cx| {
-                primary_editor.deactivated(window, cx);
-            })
-        });
-    }
-
-    fn navigate(
-        &mut self,
-        data: Box<dyn Any>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> bool {
-        self.editor.update(cx, |editor, cx| {
-            editor.primary_editor().update(cx, |primary_editor, cx| {
-                primary_editor.navigate(data, window, cx)
-            })
-        })
-    }
-
-    fn tab_tooltip_text(&self, _: &App) -> Option<SharedString> {
-        Some("Project Diff".into())
-    }
-
-    fn tab_content(&self, params: TabContentParams, _window: &Window, cx: &App) -> AnyElement {
-        Label::new(self.tab_content_text(0, cx))
-            .color(if params.selected {
-                Color::Default
-            } else {
-                Color::Muted
-            })
-            .into_any_element()
-    }
-
-    fn tab_content_text(&self, _detail: usize, cx: &App) -> SharedString {
-        match self.branch_diff.read(cx).diff_base() {
-            DiffBase::Head => "Uncommitted Changes".into(),
-            DiffBase::Merge { base_ref } => format!("Changes since {}", base_ref).into(),
-        }
-    }
-
-    fn telemetry_event_text(&self) -> Option<&'static str> {
-        Some("Project Diff Opened")
-    }
-
-    fn as_searchable(&self, _: &Entity<Self>, cx: &App) -> Option<Box<dyn SearchableItemHandle>> {
-        // TODO(split-diff) SplitEditor should be searchable
-        Some(Box::new(self.editor.read(cx).primary_editor().clone()))
-    }
-
-    fn for_each_project_item(
-        &self,
-        cx: &App,
-        f: &mut dyn FnMut(gpui::EntityId, &dyn project::ProjectItem),
-    ) {
-        self.editor
-            .read(cx)
-            .primary_editor()
-            .read(cx)
-            .for_each_project_item(cx, f)
-    }
-
-    fn set_nav_history(
-        &mut self,
-        nav_history: ItemNavHistory,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.editor.update(cx, |editor, cx| {
-            editor.primary_editor().update(cx, |primary_editor, _| {
-                primary_editor.set_nav_history(Some(nav_history));
-            })
-        });
-    }
-
-    fn can_split(&self) -> bool {
-        true
-    }
-
-    fn clone_on_split(
-        &self,
-        _workspace_id: Option<workspace::WorkspaceId>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Option<Entity<Self>>>
-    where
-        Self: Sized,
-    {
-        let Some(workspace) = self.workspace.upgrade() else {
-            return Task::ready(None);
-        };
-        Task::ready(Some(cx.new(|cx| {
-            ProjectDiff::new(self.project.clone(), workspace, window, cx)
-        })))
-    }
-
-    fn is_dirty(&self, cx: &App) -> bool {
-        self.multibuffer.read(cx).is_dirty(cx)
-    }
-
-    fn has_conflict(&self, cx: &App) -> bool {
-        self.multibuffer.read(cx).has_conflict(cx)
-    }
-
-    fn can_save(&self, _: &App) -> bool {
-        true
-    }
-
-    fn save(
-        &mut self,
-        options: SaveOptions,
-        project: Entity<Project>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        self.editor.update(cx, |editor, cx| {
-            editor.primary_editor().update(cx, |primary_editor, cx| {
-                primary_editor.save(options, project, window, cx)
-            })
-        })
-    }
-
-    fn save_as(
-        &mut self,
-        _: Entity<Project>,
-        _: ProjectPath,
-        _window: &mut Window,
-        _: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        unreachable!()
-    }
-
-    fn reload(
-        &mut self,
-        project: Entity<Project>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        self.editor.update(cx, |editor, cx| {
-            editor.primary_editor().update(cx, |primary_editor, cx| {
-                primary_editor.reload(project, window, cx)
-            })
-        })
-    }
-
-    fn act_as_type<'a>(
-        &'a self,
-        type_id: TypeId,
-        self_handle: &'a Entity<Self>,
-        cx: &'a App,
-    ) -> Option<gpui::AnyEntity> {
-        if type_id == TypeId::of::<Self>() {
-            Some(self_handle.clone().into())
-        } else if type_id == TypeId::of::<Editor>() {
-            Some(self.editor.read(cx).primary_editor().clone().into())
-        } else {
-            None
-        }
-    }
-
-    fn breadcrumb_location(&self, _: &App) -> ToolbarItemLocation {
-        ToolbarItemLocation::PrimaryLeft
-    }
-
-    fn breadcrumbs(&self, theme: &theme::Theme, cx: &App) -> Option<Vec<BreadcrumbText>> {
-        self.editor
-            .read(cx)
-            .last_selected_editor()
-            .read(cx)
-            .breadcrumbs(theme, cx)
-    }
-
-    fn added_to_workspace(
-        &mut self,
-        workspace: &mut Workspace,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.editor.update(cx, |editor, cx| {
-            editor.added_to_workspace(workspace, window, cx)
-        });
-    }
-}
-
-impl Render for ProjectDiff {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let is_empty = self.multibuffer.read(cx).is_empty();
-
-        div()
-            .track_focus(&self.focus_handle)
-            .key_context(if is_empty { "EmptyPane" } else { "GitDiff" })
-            .bg(cx.theme().colors().editor_background)
-            .flex()
-            .items_center()
-            .justify_center()
-            .size_full()
-            .when(is_empty, |el| {
-                let remote_button = if let Some(panel) = self
-                    .workspace
-                    .upgrade()
-                    .and_then(|workspace| workspace.read(cx).panel::<GitPanel>(cx))
-                {
-                    panel.update(cx, |panel, cx| panel.render_remote_button(cx))
-                } else {
-                    None
-                };
-                let keybinding_focus_handle = self.focus_handle(cx);
-                el.child(
-                    v_flex()
-                        .gap_1()
-                        .child(
-                            h_flex()
-                                .justify_around()
-                                .child(Label::new("No uncommitted changes")),
-                        )
-                        .map(|el| match remote_button {
-                            Some(button) => el.child(h_flex().justify_around().child(button)),
-                            None => el.child(
-                                h_flex()
-                                    .justify_around()
-                                    .child(Label::new("Remote up to date")),
-                            ),
-                        })
-                        .child(
-                            h_flex().justify_around().mt_1().child(
-                                Button::new("project-diff-close-button", "Close")
-                                    // .style(ButtonStyle::Transparent)
-                                    .key_binding(KeyBinding::for_action_in(
-                                        &CloseActiveItem::default(),
-                                        &keybinding_focus_handle,
-                                        cx,
-                                    ))
-                                    .on_click(move |_, window, cx| {
-                                        window.focus(&keybinding_focus_handle);
-                                        window.dispatch_action(
-                                            Box::new(CloseActiveItem::default()),
-                                            cx,
-                                        );
-                                    }),
-                            ),
-                        ),
-                )
-            })
-            .when(!is_empty, |el| el.child(self.editor.clone()))
-    }
-}
-
-impl SerializableItem for ProjectDiff {
-    fn serialized_item_kind() -> &'static str {
-        "ProjectDiff"
-    }
-
-    fn cleanup(
-        _: workspace::WorkspaceId,
-        _: Vec<workspace::ItemId>,
-        _: &mut Window,
-        _: &mut App,
-    ) -> Task<Result<()>> {
-        Task::ready(Ok(()))
-    }
-
-    fn deserialize(
-        project: Entity<Project>,
-        workspace: WeakEntity<Workspace>,
-        workspace_id: workspace::WorkspaceId,
-        item_id: workspace::ItemId,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<Entity<Self>>> {
-        window.spawn(cx, async move |cx| {
-            let diff_base = persistence::PROJECT_DIFF_DB.get_diff_base(item_id, workspace_id)?;
-
-            let diff = cx.update(|window, cx| {
-                let branch_diff = cx
-                    .new(|cx| branch_diff::BranchDiff::new(diff_base, project.clone(), window, cx));
-                let workspace = workspace.upgrade().context("workspace gone")?;
-                anyhow::Ok(
-                    cx.new(|cx| ProjectDiff::new_impl(branch_diff, project, workspace, window, cx)),
-                )
-            })??;
-
-            Ok(diff)
-        })
-    }
-
-    fn serialize(
-        &mut self,
-        workspace: &mut Workspace,
-        item_id: workspace::ItemId,
-        _closing: bool,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Task<Result<()>>> {
-        let workspace_id = workspace.database_id()?;
-        let diff_base = self.diff_base(cx).clone();
-
-        Some(cx.background_spawn({
-            async move {
-                persistence::PROJECT_DIFF_DB
-                    .save_diff_base(item_id, workspace_id, diff_base.clone())
-                    .await
-            }
-        }))
-    }
-
-    fn should_serialize(&self, _: &Self::Event) -> bool {
-        false
-    }
-}
-
-mod persistence {
-
-    use anyhow::Context as _;
-    use db::{
-        sqlez::{domain::Domain, thread_safe_connection::ThreadSafeConnection},
-        sqlez_macros::sql,
-    };
-    use project::git_store::branch_diff::DiffBase;
-    use workspace::{ItemId, WorkspaceDb, WorkspaceId};
-
-    pub struct ProjectDiffDb(ThreadSafeConnection);
-
-    impl Domain for ProjectDiffDb {
-        const NAME: &str = stringify!(ProjectDiffDb);
-
-        const MIGRATIONS: &[&str] = &[sql!(
-                CREATE TABLE project_diffs(
-                    workspace_id INTEGER,
-                    item_id INTEGER UNIQUE,
-
-                    diff_base TEXT,
-
-                    PRIMARY KEY(workspace_id, item_id),
-                    FOREIGN KEY(workspace_id) REFERENCES workspaces(workspace_id)
-                    ON DELETE CASCADE
-                ) STRICT;
-        )];
-    }
-
-    db::static_connection!(PROJECT_DIFF_DB, ProjectDiffDb, [WorkspaceDb]);
-
-    impl ProjectDiffDb {
-        pub async fn save_diff_base(
-            &self,
-            item_id: ItemId,
-            workspace_id: WorkspaceId,
-            diff_base: DiffBase,
-        ) -> anyhow::Result<()> {
-            self.write(move |connection| {
-                let sql_stmt = sql!(
-                    INSERT OR REPLACE INTO project_diffs(item_id, workspace_id, diff_base) VALUES (?, ?, ?)
-                );
-                let diff_base_str = serde_json::to_string(&diff_base)?;
-                let mut query = connection.exec_bound::<(ItemId, WorkspaceId, String)>(sql_stmt)?;
-                query((item_id, workspace_id, diff_base_str)).context(format!(
-                    "exec_bound failed to execute or parse for: {}",
-                    sql_stmt
-                ))
-            })
-            .await
-        }
-
-        pub fn get_diff_base(
-            &self,
-            item_id: ItemId,
-            workspace_id: WorkspaceId,
-        ) -> anyhow::Result<DiffBase> {
-            let sql_stmt =
-                sql!(SELECT diff_base FROM project_diffs WHERE item_id =  ?AND workspace_id =  ?);
-            let diff_base_str = self.select_row_bound::<(ItemId, WorkspaceId), String>(sql_stmt)?(
-                (item_id, workspace_id),
-            )
-            .context(::std::format!(
-                "Error in get_diff_base, select_row_bound failed to execute or parse for: {}",
-                sql_stmt
-            ))?;
-            let Some(diff_base_str) = diff_base_str else {
-                return Ok(DiffBase::Head);
-            };
-            serde_json::from_str(&diff_base_str).context("deserializing diff base")
-        }
-    }
-}
-
-pub struct ProjectDiffToolbar {
-    project_diff: Option<WeakEntity<ProjectDiff>>,
-    workspace: WeakEntity<Workspace>,
-}
-
-impl ProjectDiffToolbar {
-    pub fn new(workspace: &Workspace, _: &mut Context<Self>) -> Self {
-        Self {
-            project_diff: None,
-            workspace: workspace.weak_handle(),
-        }
-    }
-
-    fn project_diff(&self, _: &App) -> Option<Entity<ProjectDiff>> {
-        self.project_diff.as_ref()?.upgrade()
-    }
-
-    fn dispatch_action(&self, action: &dyn Action, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(project_diff) = self.project_diff(cx) {
-            project_diff.focus_handle(cx).focus(window);
-        }
-        let action = action.boxed_clone();
-        cx.defer(move |cx| {
-            cx.dispatch_action(action.as_ref());
-        })
-    }
-
-    fn stage_all(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.workspace
-            .update(cx, |workspace, cx| {
-                if let Some(panel) = workspace.panel::<GitPanel>(cx) {
-                    panel.update(cx, |panel, cx| {
-                        panel.stage_all(&Default::default(), window, cx);
-                    });
-                }
-            })
-            .ok();
-    }
-
-    fn unstage_all(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.workspace
-            .update(cx, |workspace, cx| {
-                let Some(panel) = workspace.panel::<GitPanel>(cx) else {
-                    return;
-                };
-                panel.update(cx, |panel, cx| {
-                    panel.unstage_all(&Default::default(), window, cx);
-                });
-            })
-            .ok();
-    }
-}
-
-impl EventEmitter<ToolbarItemEvent> for ProjectDiffToolbar {}
-
-impl ToolbarItemView for ProjectDiffToolbar {
-    fn set_active_pane_item(
-        &mut self,
-        active_pane_item: Option<&dyn ItemHandle>,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> ToolbarItemLocation {
-        self.project_diff = active_pane_item
-            .and_then(|item| item.act_as::<ProjectDiff>(cx))
-            .filter(|item| item.read(cx).diff_base(cx) == &DiffBase::Head)
-            .map(|entity| entity.downgrade());
-        if self.project_diff.is_some() {
-            ToolbarItemLocation::PrimaryRight
-        } else {
-            ToolbarItemLocation::Hidden
-        }
-    }
-
-    fn pane_focus_update(
-        &mut self,
-        _pane_focused: bool,
-        _window: &mut Window,
-        _cx: &mut Context<Self>,
-    ) {
-    }
-}
-
-struct ButtonStates {
-    stage: bool,
-    unstage: bool,
-    prev_next: bool,
-    selection: bool,
-    stage_all: bool,
-    unstage_all: bool,
-}
-
-impl Render for ProjectDiffToolbar {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let Some(project_diff) = self.project_diff(cx) else {
-            return div();
-        };
-        let focus_handle = project_diff.focus_handle(cx);
-        let button_states = project_diff.read(cx).button_states(cx);
-
-        h_group_xl()
-            .my_neg_1()
-            .py_1()
-            .items_center()
-            .flex_wrap()
-            .justify_between()
-            .child(
-                h_group_sm()
-                    .when(button_states.selection, |el| {
-                        el.child(
-                            Button::new("stage", "Toggle Staged")
-                                .tooltip(Tooltip::for_action_title_in(
-                                    "Toggle Staged",
-                                    &ToggleStaged,
-                                    &focus_handle,
-                                ))
-                                .disabled(!button_states.stage && !button_states.unstage)
-                                .on_click(cx.listener(|this, _, window, cx| {
-                                    this.dispatch_action(&ToggleStaged, window, cx)
-                                })),
-                        )
-                    })
-                    .when(!button_states.selection, |el| {
-                        el.child(
-                            Button::new("stage", "Stage")
-                                .tooltip(Tooltip::for_action_title_in(
-                                    "Stage and go to next hunk",
-                                    &StageAndNext,
-                                    &focus_handle,
-                                ))
-                                .disabled(
-                                    !button_states.prev_next
-                                        && !button_states.stage_all
-                                        && !button_states.unstage_all,
-                                )
-                                .on_click(cx.listener(|this, _, window, cx| {
-                                    this.dispatch_action(&StageAndNext, window, cx)
-                                })),
-                        )
-                        .child(
-                            Button::new("unstage", "Unstage")
-                                .tooltip(Tooltip::for_action_title_in(
-                                    "Unstage and go to next hunk",
-                                    &UnstageAndNext,
-                                    &focus_handle,
-                                ))
-                                .disabled(
-                                    !button_states.prev_next
-                                        && !button_states.stage_all
-                                        && !button_states.unstage_all,
-                                )
-                                .on_click(cx.listener(|this, _, window, cx| {
-                                    this.dispatch_action(&UnstageAndNext, window, cx)
-                                })),
-                        )
-                    }),
-            )
-            // n.b. the only reason these arrows are here is because we don't
-            // support "undo" for staging so we need a way to go back.
-            .child(
-                h_group_sm()
-                    .child(
-                        IconButton::new("up", IconName::ArrowUp)
-                            .shape(ui::IconButtonShape::Square)
-                            .tooltip(Tooltip::for_action_title_in(
-                                "Go to previous hunk",
-                                &GoToPreviousHunk,
-                                &focus_handle,
-                            ))
-                            .disabled(!button_states.prev_next)
-                            .on_click(cx.listener(|this, _, window, cx| {
-                                this.dispatch_action(&GoToPreviousHunk, window, cx)
-                            })),
-                    )
-                    .child(
-                        IconButton::new("down", IconName::ArrowDown)
-                            .shape(ui::IconButtonShape::Square)
-                            .tooltip(Tooltip::for_action_title_in(
-                                "Go to next hunk",
-                                &GoToHunk,
-                                &focus_handle,
-                            ))
-                            .disabled(!button_states.prev_next)
-                            .on_click(cx.listener(|this, _, window, cx| {
-                                this.dispatch_action(&GoToHunk, window, cx)
-                            })),
-                    ),
-            )
-            .child(vertical_divider())
-            .child(
-                h_group_sm()
-                    .when(
-                        button_states.unstage_all && !button_states.stage_all,
-                        |el| {
-                            el.child(
-                                Button::new("unstage-all", "Unstage All")
-                                    .tooltip(Tooltip::for_action_title_in(
-                                        "Unstage all changes",
-                                        &UnstageAll,
-                                        &focus_handle,
-                                    ))
-                                    .on_click(cx.listener(|this, _, window, cx| {
-                                        this.unstage_all(window, cx)
-                                    })),
-                            )
-                        },
-                    )
-                    .when(
-                        !button_states.unstage_all || button_states.stage_all,
-                        |el| {
-                            el.child(
-                                // todo make it so that changing to say "Unstaged"
-                                // doesn't change the position.
-                                div().child(
-                                    Button::new("stage-all", "Stage All")
-                                        .disabled(!button_states.stage_all)
-                                        .tooltip(Tooltip::for_action_title_in(
-                                            "Stage all changes",
-                                            &StageAll,
-                                            &focus_handle,
-                                        ))
-                                        .on_click(cx.listener(|this, _, window, cx| {
-                                            this.stage_all(window, cx)
-                                        })),
-                                ),
-                            )
-                        },
-                    )
-                    .child(
-                        Button::new("commit", "Commit")
-                            .tooltip(Tooltip::for_action_title_in(
-                                "Commit",
-                                &Commit,
-                                &focus_handle,
-                            ))
-                            .on_click(cx.listener(|this, _, window, cx| {
-                                this.dispatch_action(&Commit, window, cx);
-                            })),
-                    ),
-            )
-    }
-}
-
-#[derive(IntoElement, RegisterComponent)]
-pub struct ProjectDiffEmptyState {
-    pub no_repo: bool,
-    pub can_push_and_pull: bool,
-    pub focus_handle: Option<FocusHandle>,
-    pub current_branch: Option<Branch>,
-    // has_pending_commits: bool,
-    // ahead_of_remote: bool,
-    // no_git_repository: bool,
-}
-
-impl RenderOnce for ProjectDiffEmptyState {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let status_against_remote = |ahead_by: usize, behind_by: usize| -> bool {
-            matches!(self.current_branch, Some(Branch {
-                    upstream:
-                        Some(Upstream {
-                            tracking:
-                                UpstreamTracking::Tracked(UpstreamTrackingStatus {
-                                    ahead, behind, ..
-                                }),
-                            ..
-                        }),
-                    ..
-                }) if (ahead > 0) == (ahead_by > 0) && (behind > 0) == (behind_by > 0))
-        };
-
-        let change_count = |current_branch: &Branch| -> (usize, usize) {
-            match current_branch {
-                Branch {
-                    upstream:
-                        Some(Upstream {
-                            tracking:
-                                UpstreamTracking::Tracked(UpstreamTrackingStatus {
-                                    ahead, behind, ..
-                                }),
-                            ..
-                        }),
-                    ..
-                } => (*ahead as usize, *behind as usize),
-                _ => (0, 0),
-            }
-        };
-
-        let not_ahead_or_behind = status_against_remote(0, 0);
-        let ahead_of_remote = status_against_remote(1, 0);
-        let branch_not_on_remote = if let Some(branch) = self.current_branch.as_ref() {
-            branch.upstream.is_none()
-        } else {
-            false
-        };
-
-        let has_branch_container = |branch: &Branch| {
-            h_flex()
-                .max_w(px(420.))
-                .bg(cx.theme().colors().text.opacity(0.05))
-                .border_1()
-                .border_color(cx.theme().colors().border)
-                .rounded_sm()
-                .gap_8()
-                .px_6()
-                .py_4()
-                .map(|this| {
-                    if ahead_of_remote {
-                        let ahead_count = change_count(branch).0;
-                        let ahead_string = format!("{} Commits Ahead", ahead_count);
-                        this.child(
-                            v_flex()
-                                .child(Headline::new(ahead_string).size(HeadlineSize::Small))
-                                .child(
-                                    Label::new(format!("Push your changes to {}", branch.name()))
-                                        .color(Color::Muted),
-                                ),
-                        )
-                        .child(div().child(render_push_button(
-                            self.focus_handle,
-                            "push".into(),
-                            ahead_count as u32,
-                        )))
-                    } else if branch_not_on_remote {
-                        this.child(
-                            v_flex()
-                                .child(Headline::new("Publish Branch").size(HeadlineSize::Small))
-                                .child(
-                                    Label::new(format!("Create {} on remote", branch.name()))
-                                        .color(Color::Muted),
-                                ),
-                        )
-                        .child(
-                            div().child(render_publish_button(self.focus_handle, "publish".into())),
-                        )
-                    } else {
-                        this.child(Label::new("Remote status unknown").color(Color::Muted))
-                    }
-                })
-        };
-
-        v_flex().size_full().items_center().justify_center().child(
-            v_flex()
-                .gap_1()
-                .when(self.no_repo, |this| {
-                    // TODO: add git init
-                    this.text_center()
-                        .child(Label::new("No Repository").color(Color::Muted))
-                })
-                .map(|this| {
-                    if not_ahead_or_behind && self.current_branch.is_some() {
-                        this.text_center()
-                            .child(Label::new("No Changes").color(Color::Muted))
-                    } else {
-                        this.when_some(self.current_branch.as_ref(), |this, branch| {
-                            this.child(has_branch_container(branch))
-                        })
-                    }
-                }),
-        )
-    }
-}
-
-mod preview {
-    use git::repository::{
-        Branch, CommitSummary, Upstream, UpstreamTracking, UpstreamTrackingStatus,
-    };
-    use ui::prelude::*;
-
-    use super::ProjectDiffEmptyState;
-
-    // View this component preview using `workspace: open component-preview`
-    impl Component for ProjectDiffEmptyState {
-        fn scope() -> ComponentScope {
-            ComponentScope::VersionControl
-        }
-
-        fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
-            let unknown_upstream: Option<UpstreamTracking> = None;
-            let ahead_of_upstream: Option<UpstreamTracking> = Some(
-                UpstreamTrackingStatus {
-                    ahead: 2,
-                    behind: 0,
-                }
-                .into(),
-            );
-
-            let not_ahead_or_behind_upstream: Option<UpstreamTracking> = Some(
-                UpstreamTrackingStatus {
-                    ahead: 0,
-                    behind: 0,
-                }
-                .into(),
-            );
-
-            fn branch(upstream: Option<UpstreamTracking>) -> Branch {
-                Branch {
-                    is_head: true,
-                    ref_name: "some-branch".into(),
-                    upstream: upstream.map(|tracking| Upstream {
-                        ref_name: "origin/some-branch".into(),
-                        tracking,
-                    }),
-                    most_recent_commit: Some(CommitSummary {
-                        sha: "abc123".into(),
-                        subject: "Modify stuff".into(),
-                        commit_timestamp: 1710932954,
-                        author_name: "John Doe".into(),
-                        has_parent: true,
-                    }),
-                }
-            }
-
-            let no_repo_state = ProjectDiffEmptyState {
-                no_repo: true,
-                can_push_and_pull: false,
-                focus_handle: None,
-                current_branch: None,
-            };
-
-            let no_changes_state = ProjectDiffEmptyState {
-                no_repo: false,
-                can_push_and_pull: true,
-                focus_handle: None,
-                current_branch: Some(branch(not_ahead_or_behind_upstream)),
-            };
-
-            let ahead_of_upstream_state = ProjectDiffEmptyState {
-                no_repo: false,
-                can_push_and_pull: true,
-                focus_handle: None,
-                current_branch: Some(branch(ahead_of_upstream)),
-            };
-
-            let unknown_upstream_state = ProjectDiffEmptyState {
-                no_repo: false,
-                can_push_and_pull: true,
-                focus_handle: None,
-                current_branch: Some(branch(unknown_upstream)),
-            };
-
-            let (width, height) = (px(480.), px(320.));
-
-            Some(
-                v_flex()
-                    .gap_6()
-                    .children(vec![
-                        example_group(vec![
-                            single_example(
-                                "No Repo",
-                                div()
-                                    .w(width)
-                                    .h(height)
-                                    .child(no_repo_state)
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "No Changes",
-                                div()
-                                    .w(width)
-                                    .h(height)
-                                    .child(no_changes_state)
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Unknown Upstream",
-                                div()
-                                    .w(width)
-                                    .h(height)
-                                    .child(unknown_upstream_state)
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Ahead of Remote",
-                                div()
-                                    .w(width)
-                                    .h(height)
-                                    .child(ahead_of_upstream_state)
-                                    .into_any_element(),
-                            ),
-                        ])
-                        .vertical(),
-                    ])
-                    .into_any_element(),
-            )
-        }
-    }
-}
-
-struct BranchDiffAddon {
-    branch_diff: Entity<branch_diff::BranchDiff>,
-}
-
-impl Addon for BranchDiffAddon {
-    fn to_any(&self) -> &dyn std::any::Any {
-        self
-    }
-
-    fn override_status_for_buffer_id(
-        &self,
-        buffer_id: language::BufferId,
-        cx: &App,
-    ) -> Option<FileStatus> {
-        self.branch_diff
-            .read(cx)
-            .status_for_buffer_id(buffer_id, cx)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use collections::HashMap;
-    use db::indoc;
-    use editor::test::editor_test_context::{EditorTestContext, assert_state_with_diff};
-    use git::status::{TrackedStatus, UnmergedStatus, UnmergedStatusCode};
-    use gpui::TestAppContext;
-    use project::FakeFs;
-    use serde_json::json;
-    use settings::SettingsStore;
-    use std::path::Path;
-    use unindent::Unindent as _;
-    use util::{
-        path,
-        rel_path::{RelPath, rel_path},
-    };
-
-    use super::*;
-
-    #[ctor::ctor]
-    fn init_logger() {
-        zlog::init_test();
-    }
-
-    fn init_test(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let store = SettingsStore::test(cx);
-            cx.set_global(store);
-            theme::init(theme::LoadThemes::JustBase, cx);
-            editor::init(cx);
-            crate::init(cx);
-        });
-    }
-
-    #[gpui::test]
-    async fn test_save_after_restore(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/project"),
-            json!({
-                ".git": {},
-                "foo.txt": "FOO\n",
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let diff = cx.new_window_entity(|window, cx| {
-            ProjectDiff::new(project.clone(), workspace, window, cx)
-        });
-        cx.run_until_parked();
-
-        fs.set_head_for_repo(
-            path!("/project/.git").as_ref(),
-            &[("foo.txt", "foo\n".into())],
-            "deadbeef",
-        );
-        fs.set_index_for_repo(
-            path!("/project/.git").as_ref(),
-            &[("foo.txt", "foo\n".into())],
-        );
-        cx.run_until_parked();
-
-        let editor = diff.read_with(cx, |diff, cx| diff.editor.read(cx).primary_editor().clone());
-        assert_state_with_diff(
-            &editor,
-            cx,
-            &"
-                - foo
-                + ˇFOO
-            "
-            .unindent(),
-        );
-
-        editor.update_in(cx, |editor, window, cx| {
-            editor.git_restore(&Default::default(), window, cx);
-        });
-        cx.run_until_parked();
-
-        assert_state_with_diff(&editor, cx, &"ˇ".unindent());
-
-        let text = String::from_utf8(fs.read_file_sync("/project/foo.txt").unwrap()).unwrap();
-        assert_eq!(text, "foo\n");
-    }
-
-    #[gpui::test]
-    async fn test_scroll_to_beginning_with_deletion(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/project"),
-            json!({
-                ".git": {},
-                "bar": "BAR\n",
-                "foo": "FOO\n",
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let diff = cx.new_window_entity(|window, cx| {
-            ProjectDiff::new(project.clone(), workspace, window, cx)
-        });
-        cx.run_until_parked();
-
-        fs.set_head_and_index_for_repo(
-            path!("/project/.git").as_ref(),
-            &[("bar", "bar\n".into()), ("foo", "foo\n".into())],
-        );
-        cx.run_until_parked();
-
-        let editor = cx.update_window_entity(&diff, |diff, window, cx| {
-            diff.move_to_path(
-                PathKey::with_sort_prefix(TRACKED_SORT_PREFIX, rel_path("foo").into_arc()),
-                window,
-                cx,
-            );
-            diff.editor.read(cx).primary_editor().clone()
-        });
-        assert_state_with_diff(
-            &editor,
-            cx,
-            &"
-                - bar
-                + BAR
-
-                - ˇfoo
-                + FOO
-            "
-            .unindent(),
-        );
-
-        let editor = cx.update_window_entity(&diff, |diff, window, cx| {
-            diff.move_to_path(
-                PathKey::with_sort_prefix(TRACKED_SORT_PREFIX, rel_path("bar").into_arc()),
-                window,
-                cx,
-            );
-            diff.editor.read(cx).primary_editor().clone()
-        });
-        assert_state_with_diff(
-            &editor,
-            cx,
-            &"
-                - ˇbar
-                + BAR
-
-                - foo
-                + FOO
-            "
-            .unindent(),
-        );
-    }
-
-    #[gpui::test]
-    async fn test_hunks_after_restore_then_modify(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/project"),
-            json!({
-                ".git": {},
-                "foo": "modified\n",
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let buffer = project
-            .update(cx, |project, cx| {
-                project.open_local_buffer(path!("/project/foo"), cx)
-            })
-            .await
-            .unwrap();
-        let buffer_editor = cx.new_window_entity(|window, cx| {
-            Editor::for_buffer(buffer, Some(project.clone()), window, cx)
-        });
-        let diff = cx.new_window_entity(|window, cx| {
-            ProjectDiff::new(project.clone(), workspace, window, cx)
-        });
-        cx.run_until_parked();
-
-        fs.set_head_for_repo(
-            path!("/project/.git").as_ref(),
-            &[("foo", "original\n".into())],
-            "deadbeef",
-        );
-        cx.run_until_parked();
-
-        let diff_editor =
-            diff.read_with(cx, |diff, cx| diff.editor.read(cx).primary_editor().clone());
-
-        assert_state_with_diff(
-            &diff_editor,
-            cx,
-            &"
-                - original
-                + ˇmodified
-            "
-            .unindent(),
-        );
-
-        let prev_buffer_hunks =
-            cx.update_window_entity(&buffer_editor, |buffer_editor, window, cx| {
-                let snapshot = buffer_editor.snapshot(window, cx);
-                let snapshot = &snapshot.buffer_snapshot();
-                let prev_buffer_hunks = buffer_editor
-                    .diff_hunks_in_ranges(&[editor::Anchor::min()..editor::Anchor::max()], snapshot)
-                    .collect::<Vec<_>>();
-                buffer_editor.git_restore(&Default::default(), window, cx);
-                prev_buffer_hunks
-            });
-        assert_eq!(prev_buffer_hunks.len(), 1);
-        cx.run_until_parked();
-
-        let new_buffer_hunks =
-            cx.update_window_entity(&buffer_editor, |buffer_editor, window, cx| {
-                let snapshot = buffer_editor.snapshot(window, cx);
-                let snapshot = &snapshot.buffer_snapshot();
-                buffer_editor
-                    .diff_hunks_in_ranges(&[editor::Anchor::min()..editor::Anchor::max()], snapshot)
-                    .collect::<Vec<_>>()
-            });
-        assert_eq!(new_buffer_hunks.as_slice(), &[]);
-
-        cx.update_window_entity(&buffer_editor, |buffer_editor, window, cx| {
-            buffer_editor.set_text("different\n", window, cx);
-            buffer_editor.save(
-                SaveOptions {
-                    format: false,
-                    autosave: false,
-                },
-                project.clone(),
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-
-        cx.run_until_parked();
-
-        cx.update_window_entity(&buffer_editor, |buffer_editor, window, cx| {
-            buffer_editor.expand_all_diff_hunks(&Default::default(), window, cx);
-        });
-
-        assert_state_with_diff(
-            &buffer_editor,
-            cx,
-            &"
-                - original
-                + different
-                  ˇ"
-            .unindent(),
-        );
-
-        assert_state_with_diff(
-            &diff_editor,
-            cx,
-            &"
-                - original
-                + ˇdifferent
-            "
-            .unindent(),
-        );
-    }
-
-    use crate::{
-        conflict_view::resolve_conflict,
-        project_diff::{self, ProjectDiff},
-    };
-
-    #[gpui::test]
-    async fn test_go_to_prev_hunk_multibuffer(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/a"),
-            json!({
-                ".git": {},
-                "a.txt": "created\n",
-                "b.txt": "really changed\n",
-                "c.txt": "unchanged\n"
-            }),
-        )
-        .await;
-
-        fs.set_head_and_index_for_repo(
-            Path::new(path!("/a/.git")),
-            &[
-                ("b.txt", "before\n".to_string()),
-                ("c.txt", "unchanged\n".to_string()),
-                ("d.txt", "deleted\n".to_string()),
-            ],
-        );
-
-        let project = Project::test(fs, [Path::new(path!("/a"))], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-
-        cx.run_until_parked();
-
-        cx.focus(&workspace);
-        cx.update(|window, cx| {
-            window.dispatch_action(project_diff::Diff.boxed_clone(), cx);
-        });
-
-        cx.run_until_parked();
-
-        let item = workspace.update(cx, |workspace, cx| {
-            workspace.active_item_as::<ProjectDiff>(cx).unwrap()
-        });
-        cx.focus(&item);
-        let editor = item.read_with(cx, |item, cx| item.editor.read(cx).primary_editor().clone());
-
-        let mut cx = EditorTestContext::for_editor_in(editor, cx).await;
-
-        cx.assert_excerpts_with_selections(indoc!(
-            "
-            [EXCERPT]
-            before
-            really changed
-            [EXCERPT]
-            [FOLDED]
-            [EXCERPT]
-            ˇcreated
-        "
-        ));
-
-        cx.dispatch_action(editor::actions::GoToPreviousHunk);
-
-        cx.assert_excerpts_with_selections(indoc!(
-            "
-            [EXCERPT]
-            before
-            really changed
-            [EXCERPT]
-            ˇ[FOLDED]
-            [EXCERPT]
-            created
-        "
-        ));
-
-        cx.dispatch_action(editor::actions::GoToPreviousHunk);
-
-        cx.assert_excerpts_with_selections(indoc!(
-            "
-            [EXCERPT]
-            ˇbefore
-            really changed
-            [EXCERPT]
-            [FOLDED]
-            [EXCERPT]
-            created
-        "
-        ));
-    }
-
-    #[gpui::test]
-    async fn test_excerpts_splitting_after_restoring_the_middle_excerpt(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let git_contents = indoc! {r#"
-            #[rustfmt::skip]
-            fn main() {
-                let x = 0.0; // this line will be removed
-                // 1
-                // 2
-                // 3
-                let y = 0.0; // this line will be removed
-                // 1
-                // 2
-                // 3
-                let arr = [
-                    0.0, // this line will be removed
-                    0.0, // this line will be removed
-                    0.0, // this line will be removed
-                    0.0, // this line will be removed
-                ];
-            }
-        "#};
-        let buffer_contents = indoc! {"
-            #[rustfmt::skip]
-            fn main() {
-                // 1
-                // 2
-                // 3
-                // 1
-                // 2
-                // 3
-                let arr = [
-                ];
-            }
-        "};
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/a"),
-            json!({
-                ".git": {},
-                "main.rs": buffer_contents,
-            }),
-        )
-        .await;
-
-        fs.set_head_and_index_for_repo(
-            Path::new(path!("/a/.git")),
-            &[("main.rs", git_contents.to_owned())],
-        );
-
-        let project = Project::test(fs, [Path::new(path!("/a"))], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-
-        cx.run_until_parked();
-
-        cx.focus(&workspace);
-        cx.update(|window, cx| {
-            window.dispatch_action(project_diff::Diff.boxed_clone(), cx);
-        });
-
-        cx.run_until_parked();
-
-        let item = workspace.update(cx, |workspace, cx| {
-            workspace.active_item_as::<ProjectDiff>(cx).unwrap()
-        });
-        cx.focus(&item);
-        let editor = item.read_with(cx, |item, cx| item.editor.read(cx).primary_editor().clone());
-
-        let mut cx = EditorTestContext::for_editor_in(editor, cx).await;
-
-        cx.assert_excerpts_with_selections(&format!("[EXCERPT]\nˇ{git_contents}"));
-
-        cx.dispatch_action(editor::actions::GoToHunk);
-        cx.dispatch_action(editor::actions::GoToHunk);
-        cx.dispatch_action(git::Restore);
-        cx.dispatch_action(editor::actions::MoveToBeginning);
-
-        cx.assert_excerpts_with_selections(&format!("[EXCERPT]\nˇ{git_contents}"));
-    }
-
-    #[gpui::test]
-    async fn test_saving_resolved_conflicts(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/project"),
-            json!({
-                ".git": {},
-                "foo": "<<<<<<< x\nours\n=======\ntheirs\n>>>>>>> y\n",
-            }),
-        )
-        .await;
-        fs.set_status_for_repo(
-            Path::new(path!("/project/.git")),
-            &[(
-                "foo",
-                UnmergedStatus {
-                    first_head: UnmergedStatusCode::Updated,
-                    second_head: UnmergedStatusCode::Updated,
-                }
-                .into(),
-            )],
-        );
-        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let diff = cx.new_window_entity(|window, cx| {
-            ProjectDiff::new(project.clone(), workspace, window, cx)
-        });
-        cx.run_until_parked();
-
-        cx.update(|window, cx| {
-            let editor = diff.read(cx).editor.read(cx).primary_editor().clone();
-            let excerpt_ids = editor.read(cx).buffer().read(cx).excerpt_ids();
-            assert_eq!(excerpt_ids.len(), 1);
-            let excerpt_id = excerpt_ids[0];
-            let buffer = editor
-                .read(cx)
-                .buffer()
-                .read(cx)
-                .all_buffers()
-                .into_iter()
-                .next()
-                .unwrap();
-            let buffer_id = buffer.read(cx).remote_id();
-            let conflict_set = diff
-                .read(cx)
-                .editor
-                .read(cx)
-                .primary_editor()
-                .read(cx)
-                .addon::<ConflictAddon>()
-                .unwrap()
-                .conflict_set(buffer_id)
-                .unwrap();
-            assert!(conflict_set.read(cx).has_conflict);
-            let snapshot = conflict_set.read(cx).snapshot();
-            assert_eq!(snapshot.conflicts.len(), 1);
-
-            let ours_range = snapshot.conflicts[0].ours.clone();
-
-            resolve_conflict(
-                editor.downgrade(),
-                excerpt_id,
-                snapshot.conflicts[0].clone(),
-                vec![ours_range],
-                window,
-                cx,
-            )
-        })
-        .await;
-
-        let contents = fs.read_file_sync(path!("/project/foo")).unwrap();
-        let contents = String::from_utf8(contents).unwrap();
-        assert_eq!(contents, "ours\n");
-    }
-
-    #[gpui::test]
-    async fn test_new_hunk_in_modified_file(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/project"),
-            json!({
-                ".git": {},
-                "foo.txt": "
-                    one
-                    two
-                    three
-                    four
-                    five
-                    six
-                    seven
-                    eight
-                    nine
-                    ten
-                    ELEVEN
-                    twelve
-                ".unindent()
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let diff = cx.new_window_entity(|window, cx| {
-            ProjectDiff::new(project.clone(), workspace, window, cx)
-        });
-        cx.run_until_parked();
-
-        fs.set_head_and_index_for_repo(
-            Path::new(path!("/project/.git")),
-            &[(
-                "foo.txt",
-                "
-                    one
-                    two
-                    three
-                    four
-                    five
-                    six
-                    seven
-                    eight
-                    nine
-                    ten
-                    eleven
-                    twelve
-                "
-                .unindent(),
-            )],
-        );
-        cx.run_until_parked();
-
-        let editor = diff.read_with(cx, |diff, cx| diff.editor.read(cx).primary_editor().clone());
-
-        assert_state_with_diff(
-            &editor,
-            cx,
-            &"
-                  ˇnine
-                  ten
-                - eleven
-                + ELEVEN
-                  twelve
-            "
-            .unindent(),
-        );
-
-        // The project diff updates its excerpts when a new hunk appears in a buffer that already has a diff.
-        let buffer = project
-            .update(cx, |project, cx| {
-                project.open_local_buffer(path!("/project/foo.txt"), cx)
-            })
-            .await
-            .unwrap();
-        buffer.update(cx, |buffer, cx| {
-            buffer.edit_via_marked_text(
-                &"
-                    one
-                    «TWO»
-                    three
-                    four
-                    five
-                    six
-                    seven
-                    eight
-                    nine
-                    ten
-                    ELEVEN
-                    twelve
-                "
-                .unindent(),
-                None,
-                cx,
-            );
-        });
-        project
-            .update(cx, |project, cx| project.save_buffer(buffer.clone(), cx))
-            .await
-            .unwrap();
-        cx.run_until_parked();
-
-        assert_state_with_diff(
-            &editor,
-            cx,
-            &"
-                  one
-                - two
-                + TWO
-                  three
-                  four
-                  five
-                  ˇnine
-                  ten
-                - eleven
-                + ELEVEN
-                  twelve
-            "
-            .unindent(),
-        );
-    }
-
-    #[gpui::test]
-    async fn test_branch_diff(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/project"),
-            json!({
-                ".git": {},
-                "a.txt": "C",
-                "b.txt": "new",
-                "c.txt": "in-merge-base-and-work-tree",
-                "d.txt": "created-in-head",
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let diff = cx
-            .update(|window, cx| {
-                ProjectDiff::new_with_default_branch(project.clone(), workspace, window, cx)
-            })
-            .await
-            .unwrap();
-        cx.run_until_parked();
-
-        fs.set_head_for_repo(
-            Path::new(path!("/project/.git")),
-            &[("a.txt", "B".into()), ("d.txt", "created-in-head".into())],
-            "sha",
-        );
-        // fs.set_index_for_repo(dot_git, index_state);
-        fs.set_merge_base_content_for_repo(
-            Path::new(path!("/project/.git")),
-            &[
-                ("a.txt", "A".into()),
-                ("c.txt", "in-merge-base-and-work-tree".into()),
-            ],
-        );
-        cx.run_until_parked();
-
-        let editor = diff.read_with(cx, |diff, cx| diff.editor.read(cx).primary_editor().clone());
-
-        assert_state_with_diff(
-            &editor,
-            cx,
-            &"
-                - A
-                + ˇC
-                + new
-                + created-in-head"
-                .unindent(),
-        );
-
-        let statuses: HashMap<Arc<RelPath>, Option<FileStatus>> =
-            editor.update(cx, |editor, cx| {
-                editor
-                    .buffer()
-                    .read(cx)
-                    .all_buffers()
-                    .iter()
-                    .map(|buffer| {
-                        (
-                            buffer.read(cx).file().unwrap().path().clone(),
-                            editor.status_for_buffer_id(buffer.read(cx).remote_id(), cx),
-                        )
-                    })
-                    .collect()
-            });
-
-        assert_eq!(
-            statuses,
-            HashMap::from_iter([
-                (
-                    rel_path("a.txt").into_arc(),
-                    Some(FileStatus::Tracked(TrackedStatus {
-                        index_status: git::status::StatusCode::Modified,
-                        worktree_status: git::status::StatusCode::Modified
-                    }))
-                ),
-                (rel_path("b.txt").into_arc(), Some(FileStatus::Untracked)),
-                (
-                    rel_path("d.txt").into_arc(),
-                    Some(FileStatus::Tracked(TrackedStatus {
-                        index_status: git::status::StatusCode::Added,
-                        worktree_status: git::status::StatusCode::Added
-                    }))
-                )
-            ])
-        );
-    }
-
-    #[gpui::test]
-    async fn test_update_on_uncommit(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/project"),
-            json!({
-                ".git": {},
-                "README.md": "# My cool project\n".to_owned()
-            }),
-        )
-        .await;
-        fs.set_head_and_index_for_repo(
-            Path::new(path!("/project/.git")),
-            &[("README.md", "# My cool project\n".to_owned())],
-        );
-        let project = Project::test(fs.clone(), [Path::new(path!("/project"))], cx).await;
-        let worktree_id = project.read_with(cx, |project, cx| {
-            project.worktrees(cx).next().unwrap().read(cx).id()
-        });
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        cx.run_until_parked();
-
-        let _editor = workspace
-            .update_in(cx, |workspace, window, cx| {
-                workspace.open_path((worktree_id, rel_path("README.md")), None, true, window, cx)
-            })
-            .await
-            .unwrap()
-            .downcast::<Editor>()
-            .unwrap();
-
-        cx.focus(&workspace);
-        cx.update(|window, cx| {
-            window.dispatch_action(project_diff::Diff.boxed_clone(), cx);
-        });
-        cx.run_until_parked();
-        let item = workspace.update(cx, |workspace, cx| {
-            workspace.active_item_as::<ProjectDiff>(cx).unwrap()
-        });
-        cx.focus(&item);
-        let editor = item.read_with(cx, |item, cx| item.editor.read(cx).primary_editor().clone());
-
-        fs.set_head_and_index_for_repo(
-            Path::new(path!("/project/.git")),
-            &[(
-                "README.md",
-                "# My cool project\nDetails to come.\n".to_owned(),
-            )],
-        );
-        cx.run_until_parked();
-
-        let mut cx = EditorTestContext::for_editor_in(editor, cx).await;
-
-        cx.assert_excerpts_with_selections("[EXCERPT]\nˇ# My cool project\nDetails to come.\n");
-    }
-}
diff --git a/crates/git_ui/src/remote_output.rs b/crates/git_ui/src/remote_output.rs
deleted file mode 100644
index 7fe863ee29..0000000000
--- a/crates/git_ui/src/remote_output.rs
+++ /dev/null
@@ -1,300 +0,0 @@
-use anyhow::Context as _;
-
-use git::repository::{Remote, RemoteCommandOutput};
-use linkify::{LinkFinder, LinkKind};
-use ui::SharedString;
-use util::ResultExt as _;
-
-#[derive(Clone)]
-pub enum RemoteAction {
-    Fetch(Option<Remote>),
-    Pull(Remote),
-    Push(SharedString, Remote),
-}
-
-impl RemoteAction {
-    pub fn name(&self) -> &'static str {
-        match self {
-            RemoteAction::Fetch(_) => "fetch",
-            RemoteAction::Pull(_) => "pull",
-            RemoteAction::Push(_, _) => "push",
-        }
-    }
-}
-
-pub enum SuccessStyle {
-    Toast,
-    ToastWithLog { output: RemoteCommandOutput },
-    PushPrLink { text: String, link: String },
-}
-
-pub struct SuccessMessage {
-    pub message: String,
-    pub style: SuccessStyle,
-}
-
-pub fn format_output(action: &RemoteAction, output: RemoteCommandOutput) -> SuccessMessage {
-    match action {
-        RemoteAction::Fetch(remote) => {
-            if output.stderr.is_empty() {
-                SuccessMessage {
-                    message: "Fetch: Already up to date".into(),
-                    style: SuccessStyle::Toast,
-                }
-            } else {
-                let message = match remote {
-                    Some(remote) => format!("Synchronized with {}", remote.name),
-                    None => "Synchronized with remotes".into(),
-                };
-                SuccessMessage {
-                    message,
-                    style: SuccessStyle::ToastWithLog { output },
-                }
-            }
-        }
-        RemoteAction::Pull(remote_ref) => {
-            let get_changes = |output: &RemoteCommandOutput| -> anyhow::Result<u32> {
-                let last_line = output
-                    .stdout
-                    .lines()
-                    .last()
-                    .context("Failed to get last line of output")?
-                    .trim();
-
-                let files_changed = last_line
-                    .split_whitespace()
-                    .next()
-                    .context("Failed to get first word of last line")?
-                    .parse()?;
-
-                Ok(files_changed)
-            };
-            if output.stdout.ends_with("Already up to date.\n") {
-                SuccessMessage {
-                    message: "Pull: Already up to date".into(),
-                    style: SuccessStyle::Toast,
-                }
-            } else if output.stdout.starts_with("Updating") {
-                let files_changed = get_changes(&output).log_err();
-                let message = if let Some(files_changed) = files_changed {
-                    format!(
-                        "Received {} file change{} from {}",
-                        files_changed,
-                        if files_changed == 1 { "" } else { "s" },
-                        remote_ref.name
-                    )
-                } else {
-                    format!("Fast forwarded from {}", remote_ref.name)
-                };
-                SuccessMessage {
-                    message,
-                    style: SuccessStyle::ToastWithLog { output },
-                }
-            } else if output.stdout.starts_with("Merge") {
-                let files_changed = get_changes(&output).log_err();
-                let message = if let Some(files_changed) = files_changed {
-                    format!(
-                        "Merged {} file change{} from {}",
-                        files_changed,
-                        if files_changed == 1 { "" } else { "s" },
-                        remote_ref.name
-                    )
-                } else {
-                    format!("Merged from {}", remote_ref.name)
-                };
-                SuccessMessage {
-                    message,
-                    style: SuccessStyle::ToastWithLog { output },
-                }
-            } else if output.stdout.contains("Successfully rebased") {
-                SuccessMessage {
-                    message: format!("Successfully rebased from {}", remote_ref.name),
-                    style: SuccessStyle::ToastWithLog { output },
-                }
-            } else {
-                SuccessMessage {
-                    message: format!("Successfully pulled from {}", remote_ref.name),
-                    style: SuccessStyle::ToastWithLog { output },
-                }
-            }
-        }
-        RemoteAction::Push(branch_name, remote_ref) => {
-            let message = if output.stderr.ends_with("Everything up-to-date\n") {
-                "Push: Everything is up-to-date".to_string()
-            } else {
-                format!("Pushed {} to {}", branch_name, remote_ref.name)
-            };
-
-            let style = if output.stderr.ends_with("Everything up-to-date\n") {
-                Some(SuccessStyle::Toast)
-            } else if output.stderr.contains("\nremote: ") {
-                let pr_hints = [
-                    ("Create a pull request", "Create Pull Request"), // GitHub
-                    ("Create pull request", "Create Pull Request"),   // Bitbucket
-                    ("create a merge request", "Create Merge Request"), // GitLab
-                    ("View merge request", "View Merge Request"),     // GitLab
-                ];
-                pr_hints
-                    .iter()
-                    .find(|(indicator, _)| output.stderr.contains(indicator))
-                    .and_then(|(_, mapped)| {
-                        let finder = LinkFinder::new();
-                        finder
-                            .links(&output.stderr)
-                            .filter(|link| *link.kind() == LinkKind::Url)
-                            .map(|link| link.start()..link.end())
-                            .next()
-                            .map(|link| SuccessStyle::PushPrLink {
-                                text: mapped.to_string(),
-                                link: output.stderr[link].to_string(),
-                            })
-                    })
-            } else {
-                None
-            };
-            SuccessMessage {
-                message,
-                style: style.unwrap_or(SuccessStyle::ToastWithLog { output }),
-            }
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use indoc::indoc;
-
-    #[test]
-    fn test_push_new_branch_pull_request() {
-        let action = RemoteAction::Push(
-            SharedString::new("test_branch"),
-            Remote {
-                name: SharedString::new("test_remote"),
-            },
-        );
-
-        let output = RemoteCommandOutput {
-            stdout: String::new(),
-            stderr: indoc! { "
-                Total 0 (delta 0), reused 0 (delta 0), pack-reused 0 (from 0)
-                remote:
-                remote: Create a pull request for 'test' on GitHub by visiting:
-                remote:      https://example.com/test/test/pull/new/test
-                remote:
-                To example.com:test/test.git
-                 * [new branch]      test -> test
-                "}
-            .to_string(),
-        };
-
-        let msg = format_output(&action, output);
-
-        if let SuccessStyle::PushPrLink { text: hint, link } = &msg.style {
-            assert_eq!(hint, "Create Pull Request");
-            assert_eq!(link, "https://example.com/test/test/pull/new/test");
-        } else {
-            panic!("Expected PushPrLink variant");
-        }
-    }
-
-    #[test]
-    fn test_push_new_branch_merge_request() {
-        let action = RemoteAction::Push(
-            SharedString::new("test_branch"),
-            Remote {
-                name: SharedString::new("test_remote"),
-            },
-        );
-
-        let output = RemoteCommandOutput {
-            stdout: String::new(),
-            stderr: indoc! {"
-                Total 0 (delta 0), reused 0 (delta 0), pack-reused 0 (from 0)
-                remote:
-                remote: To create a merge request for test, visit:
-                remote:   https://example.com/test/test/-/merge_requests/new?merge_request%5Bsource_branch%5D=test
-                remote:
-                To example.com:test/test.git
-                 * [new branch]      test -> test
-                "}
-            .to_string()
-            };
-
-        let msg = format_output(&action, output);
-
-        if let SuccessStyle::PushPrLink { text, link } = &msg.style {
-            assert_eq!(text, "Create Merge Request");
-            assert_eq!(
-                link,
-                "https://example.com/test/test/-/merge_requests/new?merge_request%5Bsource_branch%5D=test"
-            );
-        } else {
-            panic!("Expected PushPrLink variant");
-        }
-    }
-
-    #[test]
-    fn test_push_branch_existing_merge_request() {
-        let action = RemoteAction::Push(
-            SharedString::new("test_branch"),
-            Remote {
-                name: SharedString::new("test_remote"),
-            },
-        );
-
-        let output = RemoteCommandOutput {
-            stdout: String::new(),
-            stderr: indoc! {"
-                Total 0 (delta 0), reused 0 (delta 0), pack-reused 0 (from 0)
-                remote:
-                remote: View merge request for test:
-                remote:    https://example.com/test/test/-/merge_requests/99999
-                remote:
-                To example.com:test/test.git
-                    + 80bd3c83be...e03d499d2e test -> test
-                "}
-            .to_string(),
-        };
-
-        let msg = format_output(&action, output);
-
-        if let SuccessStyle::PushPrLink { text, link } = &msg.style {
-            assert_eq!(text, "View Merge Request");
-            assert_eq!(link, "https://example.com/test/test/-/merge_requests/99999");
-        } else {
-            panic!("Expected PushPrLink variant");
-        }
-    }
-
-    #[test]
-    fn test_push_new_branch_no_link() {
-        let action = RemoteAction::Push(
-            SharedString::new("test_branch"),
-            Remote {
-                name: SharedString::new("test_remote"),
-            },
-        );
-
-        let output = RemoteCommandOutput {
-            stdout: String::new(),
-            stderr: indoc! { "
-                To http://example.com/test/test.git
-                 * [new branch]      test -> test
-                ",
-            }
-            .to_string(),
-        };
-
-        let msg = format_output(&action, output);
-
-        if let SuccessStyle::ToastWithLog { output } = &msg.style {
-            assert_eq!(
-                output.stderr,
-                "To http://example.com/test/test.git\n * [new branch]      test -> test\n"
-            );
-        } else {
-            panic!("Expected ToastWithLog variant");
-        }
-    }
-}
diff --git a/crates/git_ui/src/repository_selector.rs b/crates/git_ui/src/repository_selector.rs
deleted file mode 100644
index 5e60bebc42..0000000000
--- a/crates/git_ui/src/repository_selector.rs
+++ /dev/null
@@ -1,238 +0,0 @@
-use gpui::{App, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, Task, WeakEntity};
-use itertools::Itertools;
-use picker::{Picker, PickerDelegate, PickerEditorPosition};
-use project::{Project, git_store::Repository};
-use std::sync::Arc;
-use ui::{ListItem, ListItemSpacing, prelude::*};
-use workspace::{ModalView, Workspace};
-
-pub fn register(workspace: &mut Workspace) {
-    workspace.register_action(open);
-}
-
-pub fn open(
-    workspace: &mut Workspace,
-    _: &zed_actions::git::SelectRepo,
-    window: &mut Window,
-    cx: &mut Context<Workspace>,
-) {
-    let project = workspace.project().clone();
-    workspace.toggle_modal(window, cx, |window, cx| {
-        RepositorySelector::new(project, rems(34.), window, cx)
-    })
-}
-
-pub struct RepositorySelector {
-    width: Rems,
-    picker: Entity<Picker<RepositorySelectorDelegate>>,
-}
-
-impl RepositorySelector {
-    pub fn new(
-        project_handle: Entity<Project>,
-        width: Rems,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let git_store = project_handle.read(cx).git_store().clone();
-        let repository_entries = git_store.update(cx, |git_store, _cx| {
-            let mut repos: Vec<_> = git_store.repositories().values().cloned().collect();
-
-            repos.sort_by_key(|a| a.read(_cx).display_name());
-
-            repos
-        });
-        let filtered_repositories = repository_entries.clone();
-
-        let widest_item_ix = repository_entries.iter().position_max_by(|a, b| {
-            a.read(cx)
-                .display_name()
-                .len()
-                .cmp(&b.read(cx).display_name().len())
-        });
-
-        let delegate = RepositorySelectorDelegate {
-            repository_selector: cx.entity().downgrade(),
-            repository_entries,
-            filtered_repositories,
-            selected_index: 0,
-        };
-
-        let picker = cx.new(|cx| {
-            Picker::uniform_list(delegate, window, cx)
-                .widest_item(widest_item_ix)
-                .max_height(Some(rems(20.).into()))
-        });
-
-        RepositorySelector { picker, width }
-    }
-}
-
-//pub(crate) fn filtered_repository_entries(
-//    git_store: &GitStore,
-//    cx: &App,
-//) -> Vec<Entity<Repository>> {
-//    let repositories = git_store
-//        .repositories()
-//        .values()
-//        .sorted_by_key(|repo| {
-//            let repo = repo.read(cx);
-//            (
-//                repo.dot_git_abs_path.clone(),
-//                repo.worktree_abs_path.clone(),
-//            )
-//        })
-//        .collect::<Vec<&Entity<Repository>>>();
-//
-//    repositories
-//        .chunk_by(|a, b| a.read(cx).dot_git_abs_path == b.read(cx).dot_git_abs_path)
-//        .flat_map(|chunk| {
-//            let has_non_single_file_worktree = chunk
-//                .iter()
-//                .any(|repo| !repo.read(cx).is_from_single_file_worktree);
-//            chunk.iter().filter(move |repo| {
-//                // Remove any entry that comes from a single file worktree and represents a repository that is also represented by a non-single-file worktree.
-//                !repo.read(cx).is_from_single_file_worktree || !has_non_single_file_worktree
-//            })
-//        })
-//        .map(|&repo| repo.clone())
-//        .collect()
-//}
-
-impl EventEmitter<DismissEvent> for RepositorySelector {}
-
-impl Focusable for RepositorySelector {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        self.picker.focus_handle(cx)
-    }
-}
-
-impl Render for RepositorySelector {
-    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
-        div()
-            .key_context("GitRepositorySelector")
-            .w(self.width)
-            .child(self.picker.clone())
-    }
-}
-
-impl ModalView for RepositorySelector {}
-
-pub struct RepositorySelectorDelegate {
-    repository_selector: WeakEntity<RepositorySelector>,
-    repository_entries: Vec<Entity<Repository>>,
-    filtered_repositories: Vec<Entity<Repository>>,
-    selected_index: usize,
-}
-
-impl RepositorySelectorDelegate {
-    pub fn update_repository_entries(&mut self, all_repositories: Vec<Entity<Repository>>) {
-        self.repository_entries = all_repositories.clone();
-        self.filtered_repositories = all_repositories;
-        self.selected_index = 0;
-    }
-}
-
-impl PickerDelegate for RepositorySelectorDelegate {
-    type ListItem = ListItem;
-
-    fn match_count(&self) -> usize {
-        self.filtered_repositories.len()
-    }
-
-    fn selected_index(&self) -> usize {
-        self.selected_index
-    }
-
-    fn set_selected_index(
-        &mut self,
-        ix: usize,
-        _window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) {
-        self.selected_index = ix.min(self.filtered_repositories.len().saturating_sub(1));
-        cx.notify();
-    }
-
-    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
-        "Select a repository...".into()
-    }
-
-    fn editor_position(&self) -> PickerEditorPosition {
-        PickerEditorPosition::End
-    }
-
-    fn update_matches(
-        &mut self,
-        query: String,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Task<()> {
-        let all_repositories = self.repository_entries.clone();
-
-        let repo_names: Vec<(Entity<Repository>, String)> = all_repositories
-            .iter()
-            .map(|repo| (repo.clone(), repo.read(cx).display_name().to_lowercase()))
-            .collect();
-
-        cx.spawn_in(window, async move |this, cx| {
-            let filtered_repositories = cx
-                .background_spawn(async move {
-                    if query.is_empty() {
-                        all_repositories
-                    } else {
-                        let query_lower = query.to_lowercase();
-                        repo_names
-                            .into_iter()
-                            .filter(|(_, display_name)| display_name.contains(&query_lower))
-                            .map(|(repo, _)| repo)
-                            .collect()
-                    }
-                })
-                .await;
-
-            this.update_in(cx, |this, window, cx| {
-                let mut sorted_repositories = filtered_repositories;
-                sorted_repositories.sort_by_key(|a| a.read(cx).display_name());
-                this.delegate.filtered_repositories = sorted_repositories;
-                this.delegate.set_selected_index(0, window, cx);
-                cx.notify();
-            })
-            .ok();
-        })
-    }
-
-    fn confirm(&mut self, _secondary: bool, window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        let Some(selected_repo) = self.filtered_repositories.get(self.selected_index) else {
-            return;
-        };
-        selected_repo.update(cx, |selected_repo, cx| {
-            selected_repo.set_as_active_repository(cx)
-        });
-        self.dismissed(window, cx);
-    }
-
-    fn dismissed(&mut self, _window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        self.repository_selector
-            .update(cx, |_this, cx| cx.emit(DismissEvent))
-            .ok();
-    }
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        _window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<Self::ListItem> {
-        let repo_info = self.filtered_repositories.get(ix)?;
-        let display_name = repo_info.read(cx).display_name();
-        Some(
-            ListItem::new(ix)
-                .inset(true)
-                .spacing(ListItemSpacing::Sparse)
-                .toggle_state(selected)
-                .child(Label::new(display_name)),
-        )
-    }
-}
diff --git a/crates/git_ui/src/stash_picker.rs b/crates/git_ui/src/stash_picker.rs
deleted file mode 100644
index 6d0a9d291e..0000000000
--- a/crates/git_ui/src/stash_picker.rs
+++ /dev/null
@@ -1,547 +0,0 @@
-use fuzzy::StringMatchCandidate;
-
-use git::stash::StashEntry;
-use gpui::{
-    Action, AnyElement, App, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable,
-    InteractiveElement, IntoElement, Modifiers, ModifiersChangedEvent, ParentElement, Render,
-    SharedString, Styled, Subscription, Task, WeakEntity, Window, actions, rems,
-};
-use picker::{Picker, PickerDelegate};
-use project::git_store::{Repository, RepositoryEvent};
-use std::sync::Arc;
-use time::{OffsetDateTime, UtcOffset};
-use time_format;
-use ui::{HighlightedLabel, KeyBinding, ListItem, ListItemSpacing, Tooltip, prelude::*};
-use util::ResultExt;
-use workspace::notifications::DetachAndPromptErr;
-use workspace::{ModalView, Workspace};
-
-use crate::commit_view::CommitView;
-use crate::stash_picker;
-
-actions!(
-    stash_picker,
-    [
-        /// Drop the selected stash entry.
-        DropStashItem,
-        /// Show the diff view of the selected stash entry.
-        ShowStashItem,
-    ]
-);
-
-pub fn register(workspace: &mut Workspace) {
-    workspace.register_action(open);
-}
-
-pub fn open(
-    workspace: &mut Workspace,
-    _: &zed_actions::git::ViewStash,
-    window: &mut Window,
-    cx: &mut Context<Workspace>,
-) {
-    let repository = workspace.project().read(cx).active_repository(cx);
-    let weak_workspace = workspace.weak_handle();
-    workspace.toggle_modal(window, cx, |window, cx| {
-        StashList::new(repository, weak_workspace, rems(34.), window, cx)
-    })
-}
-
-pub struct StashList {
-    width: Rems,
-    pub picker: Entity<Picker<StashListDelegate>>,
-    picker_focus_handle: FocusHandle,
-    _subscriptions: Vec<Subscription>,
-}
-
-impl StashList {
-    fn new(
-        repository: Option<Entity<Repository>>,
-        workspace: WeakEntity<Workspace>,
-        width: Rems,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let mut _subscriptions = Vec::new();
-        let stash_request = repository
-            .clone()
-            .map(|repository| repository.read_with(cx, |repo, _| repo.cached_stash()));
-
-        if let Some(repo) = repository.clone() {
-            _subscriptions.push(
-                cx.subscribe_in(&repo, window, |this, _, event, window, cx| {
-                    if matches!(event, RepositoryEvent::StashEntriesChanged) {
-                        let stash_entries = this.picker.read_with(cx, |picker, cx| {
-                            picker
-                                .delegate
-                                .repo
-                                .clone()
-                                .map(|repo| repo.read(cx).cached_stash().entries.to_vec())
-                        });
-                        this.picker.update(cx, |this, cx| {
-                            this.delegate.all_stash_entries = stash_entries;
-                            this.refresh(window, cx);
-                        });
-                    }
-                }),
-            )
-        }
-
-        cx.spawn_in(window, async move |this, cx| {
-            let stash_entries = stash_request
-                .map(|git_stash| git_stash.entries.to_vec())
-                .unwrap_or_default();
-
-            this.update_in(cx, |this, window, cx| {
-                this.picker.update(cx, |picker, cx| {
-                    picker.delegate.all_stash_entries = Some(stash_entries);
-                    picker.refresh(window, cx);
-                })
-            })?;
-
-            anyhow::Ok(())
-        })
-        .detach_and_log_err(cx);
-
-        let delegate = StashListDelegate::new(repository, workspace, window, cx);
-        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx));
-        let picker_focus_handle = picker.focus_handle(cx);
-        picker.update(cx, |picker, _| {
-            picker.delegate.focus_handle = picker_focus_handle.clone();
-        });
-
-        _subscriptions.push(cx.subscribe(&picker, |_, _, _, cx| {
-            cx.emit(DismissEvent);
-        }));
-
-        Self {
-            picker,
-            picker_focus_handle,
-            width,
-            _subscriptions,
-        }
-    }
-
-    fn handle_drop_stash(
-        &mut self,
-        _: &DropStashItem,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.picker.update(cx, |picker, cx| {
-            picker
-                .delegate
-                .drop_stash_at(picker.delegate.selected_index(), window, cx);
-        });
-        cx.notify();
-    }
-
-    fn handle_show_stash(
-        &mut self,
-        _: &ShowStashItem,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.picker.update(cx, |picker, cx| {
-            picker
-                .delegate
-                .show_stash_at(picker.delegate.selected_index(), window, cx);
-        });
-        cx.notify();
-    }
-
-    fn handle_modifiers_changed(
-        &mut self,
-        ev: &ModifiersChangedEvent,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.picker
-            .update(cx, |picker, _| picker.delegate.modifiers = ev.modifiers)
-    }
-}
-
-impl ModalView for StashList {}
-impl EventEmitter<DismissEvent> for StashList {}
-impl Focusable for StashList {
-    fn focus_handle(&self, _: &App) -> FocusHandle {
-        self.picker_focus_handle.clone()
-    }
-}
-
-impl Render for StashList {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .key_context("StashList")
-            .w(self.width)
-            .on_modifiers_changed(cx.listener(Self::handle_modifiers_changed))
-            .on_action(cx.listener(Self::handle_drop_stash))
-            .on_action(cx.listener(Self::handle_show_stash))
-            .child(self.picker.clone())
-    }
-}
-
-#[derive(Debug, Clone)]
-struct StashEntryMatch {
-    entry: StashEntry,
-    positions: Vec<usize>,
-    formatted_timestamp: String,
-}
-
-pub struct StashListDelegate {
-    matches: Vec<StashEntryMatch>,
-    all_stash_entries: Option<Vec<StashEntry>>,
-    repo: Option<Entity<Repository>>,
-    workspace: WeakEntity<Workspace>,
-    selected_index: usize,
-    last_query: String,
-    modifiers: Modifiers,
-    focus_handle: FocusHandle,
-    timezone: UtcOffset,
-}
-
-impl StashListDelegate {
-    fn new(
-        repo: Option<Entity<Repository>>,
-        workspace: WeakEntity<Workspace>,
-        _window: &mut Window,
-        cx: &mut Context<StashList>,
-    ) -> Self {
-        let timezone = UtcOffset::current_local_offset().unwrap_or(UtcOffset::UTC);
-
-        Self {
-            matches: vec![],
-            repo,
-            workspace,
-            all_stash_entries: None,
-            selected_index: 0,
-            last_query: Default::default(),
-            modifiers: Default::default(),
-            focus_handle: cx.focus_handle(),
-            timezone,
-        }
-    }
-
-    fn format_message(ix: usize, message: &String) -> String {
-        format!("#{}: {}", ix, message)
-    }
-
-    fn format_timestamp(timestamp: i64, timezone: UtcOffset) -> String {
-        let timestamp =
-            OffsetDateTime::from_unix_timestamp(timestamp).unwrap_or(OffsetDateTime::now_utc());
-        time_format::format_localized_timestamp(
-            timestamp,
-            OffsetDateTime::now_utc(),
-            timezone,
-            time_format::TimestampFormat::EnhancedAbsolute,
-        )
-    }
-
-    fn drop_stash_at(&self, ix: usize, window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        let Some(entry_match) = self.matches.get(ix) else {
-            return;
-        };
-        let stash_index = entry_match.entry.index;
-        let Some(repo) = self.repo.clone() else {
-            return;
-        };
-
-        cx.spawn(async move |_, cx| {
-            repo.update(cx, |repo, cx| repo.stash_drop(Some(stash_index), cx))?
-                .await??;
-            Ok(())
-        })
-        .detach_and_prompt_err("Failed to drop stash", window, cx, |e, _, _| {
-            Some(e.to_string())
-        });
-    }
-
-    fn show_stash_at(&self, ix: usize, window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        let Some(entry_match) = self.matches.get(ix) else {
-            return;
-        };
-        let stash_sha = entry_match.entry.oid.to_string();
-        let stash_index = entry_match.entry.index;
-        let Some(repo) = self.repo.clone() else {
-            return;
-        };
-        CommitView::open(
-            stash_sha,
-            repo.downgrade(),
-            self.workspace.clone(),
-            Some(stash_index),
-            None,
-            window,
-            cx,
-        );
-    }
-
-    fn pop_stash(&self, stash_index: usize, window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        let Some(repo) = self.repo.clone() else {
-            return;
-        };
-
-        cx.spawn(async move |_, cx| {
-            repo.update(cx, |repo, cx| repo.stash_pop(Some(stash_index), cx))?
-                .await?;
-            Ok(())
-        })
-        .detach_and_prompt_err("Failed to pop stash", window, cx, |e, _, _| {
-            Some(e.to_string())
-        });
-        cx.emit(DismissEvent);
-    }
-
-    fn apply_stash(&self, stash_index: usize, window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        let Some(repo) = self.repo.clone() else {
-            return;
-        };
-
-        cx.spawn(async move |_, cx| {
-            repo.update(cx, |repo, cx| repo.stash_apply(Some(stash_index), cx))?
-                .await?;
-            Ok(())
-        })
-        .detach_and_prompt_err("Failed to apply stash", window, cx, |e, _, _| {
-            Some(e.to_string())
-        });
-        cx.emit(DismissEvent);
-    }
-}
-
-impl PickerDelegate for StashListDelegate {
-    type ListItem = ListItem;
-
-    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
-        "Select a stash…".into()
-    }
-
-    fn match_count(&self) -> usize {
-        self.matches.len()
-    }
-
-    fn selected_index(&self) -> usize {
-        self.selected_index
-    }
-
-    fn set_selected_index(
-        &mut self,
-        ix: usize,
-        _window: &mut Window,
-        _: &mut Context<Picker<Self>>,
-    ) {
-        self.selected_index = ix;
-    }
-
-    fn update_matches(
-        &mut self,
-        query: String,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Task<()> {
-        let Some(all_stash_entries) = self.all_stash_entries.clone() else {
-            return Task::ready(());
-        };
-
-        let timezone = self.timezone;
-
-        cx.spawn_in(window, async move |picker, cx| {
-            let matches: Vec<StashEntryMatch> = if query.is_empty() {
-                all_stash_entries
-                    .into_iter()
-                    .map(|entry| {
-                        let formatted_timestamp = Self::format_timestamp(entry.timestamp, timezone);
-
-                        StashEntryMatch {
-                            entry,
-                            positions: Vec::new(),
-                            formatted_timestamp,
-                        }
-                    })
-                    .collect()
-            } else {
-                let candidates = all_stash_entries
-                    .iter()
-                    .enumerate()
-                    .map(|(ix, entry)| {
-                        StringMatchCandidate::new(
-                            ix,
-                            &Self::format_message(entry.index, &entry.message),
-                        )
-                    })
-                    .collect::<Vec<StringMatchCandidate>>();
-                fuzzy::match_strings(
-                    &candidates,
-                    &query,
-                    false,
-                    true,
-                    10000,
-                    &Default::default(),
-                    cx.background_executor().clone(),
-                )
-                .await
-                .into_iter()
-                .map(|candidate| {
-                    let entry = all_stash_entries[candidate.candidate_id].clone();
-                    let formatted_timestamp = Self::format_timestamp(entry.timestamp, timezone);
-
-                    StashEntryMatch {
-                        entry,
-                        positions: candidate.positions,
-                        formatted_timestamp,
-                    }
-                })
-                .collect()
-            };
-
-            picker
-                .update(cx, |picker, _| {
-                    let delegate = &mut picker.delegate;
-                    delegate.matches = matches;
-                    if delegate.matches.is_empty() {
-                        delegate.selected_index = 0;
-                    } else {
-                        delegate.selected_index =
-                            core::cmp::min(delegate.selected_index, delegate.matches.len() - 1);
-                    }
-                    delegate.last_query = query;
-                })
-                .log_err();
-        })
-    }
-
-    fn confirm(&mut self, secondary: bool, window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        let Some(entry_match) = self.matches.get(self.selected_index()) else {
-            return;
-        };
-        let stash_index = entry_match.entry.index;
-        if secondary {
-            self.pop_stash(stash_index, window, cx);
-        } else {
-            self.apply_stash(stash_index, window, cx);
-        }
-    }
-
-    fn dismissed(&mut self, _: &mut Window, cx: &mut Context<Picker<Self>>) {
-        cx.emit(DismissEvent);
-    }
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        _window: &mut Window,
-        _cx: &mut Context<Picker<Self>>,
-    ) -> Option<Self::ListItem> {
-        let entry_match = &self.matches[ix];
-
-        let stash_message =
-            Self::format_message(entry_match.entry.index, &entry_match.entry.message);
-        let positions = entry_match.positions.clone();
-        let stash_label = HighlightedLabel::new(stash_message, positions)
-            .truncate()
-            .into_any_element();
-
-        let branch_name = entry_match.entry.branch.clone().unwrap_or_default();
-        let branch_info = h_flex()
-            .gap_1p5()
-            .w_full()
-            .child(
-                Label::new(branch_name)
-                    .truncate()
-                    .color(Color::Muted)
-                    .size(LabelSize::Small),
-            )
-            .child(
-                Label::new("•")
-                    .alpha(0.5)
-                    .color(Color::Muted)
-                    .size(LabelSize::Small),
-            )
-            .child(
-                Label::new(entry_match.formatted_timestamp.clone())
-                    .color(Color::Muted)
-                    .size(LabelSize::Small),
-            );
-
-        Some(
-            ListItem::new(format!("stash-{ix}"))
-                .inset(true)
-                .spacing(ListItemSpacing::Sparse)
-                .toggle_state(selected)
-                .child(v_flex().w_full().child(stash_label).child(branch_info))
-                .tooltip(Tooltip::text(format!(
-                    "stash@{{{}}}",
-                    entry_match.entry.index
-                ))),
-        )
-    }
-
-    fn no_matches_text(&self, _window: &mut Window, _cx: &mut App) -> Option<SharedString> {
-        Some("No stashes found".into())
-    }
-
-    fn render_footer(&self, _: &mut Window, cx: &mut Context<Picker<Self>>) -> Option<AnyElement> {
-        let focus_handle = self.focus_handle.clone();
-
-        Some(
-            h_flex()
-                .w_full()
-                .p_1p5()
-                .gap_0p5()
-                .justify_end()
-                .border_t_1()
-                .border_color(cx.theme().colors().border_variant)
-                .child(
-                    Button::new("drop-stash", "Drop")
-                        .key_binding(
-                            KeyBinding::for_action_in(
-                                &stash_picker::DropStashItem,
-                                &focus_handle,
-                                cx,
-                            )
-                            .map(|kb| kb.size(rems_from_px(12.))),
-                        )
-                        .on_click(|_, window, cx| {
-                            window.dispatch_action(stash_picker::DropStashItem.boxed_clone(), cx)
-                        }),
-                )
-                .child(
-                    Button::new("view-stash", "View")
-                        .key_binding(
-                            KeyBinding::for_action_in(
-                                &stash_picker::ShowStashItem,
-                                &focus_handle,
-                                cx,
-                            )
-                            .map(|kb| kb.size(rems_from_px(12.))),
-                        )
-                        .on_click(cx.listener(move |picker, _, window, cx| {
-                            cx.stop_propagation();
-                            let selected_ix = picker.delegate.selected_index();
-                            picker.delegate.show_stash_at(selected_ix, window, cx);
-                        })),
-                )
-                .child(
-                    Button::new("pop-stash", "Pop")
-                        .key_binding(
-                            KeyBinding::for_action_in(&menu::SecondaryConfirm, &focus_handle, cx)
-                                .map(|kb| kb.size(rems_from_px(12.))),
-                        )
-                        .on_click(|_, window, cx| {
-                            window.dispatch_action(menu::SecondaryConfirm.boxed_clone(), cx)
-                        }),
-                )
-                .child(
-                    Button::new("apply-stash", "Apply")
-                        .key_binding(
-                            KeyBinding::for_action_in(&menu::Confirm, &focus_handle, cx)
-                                .map(|kb| kb.size(rems_from_px(12.))),
-                        )
-                        .on_click(|_, window, cx| {
-                            window.dispatch_action(menu::Confirm.boxed_clone(), cx)
-                        }),
-                )
-                .into_any(),
-        )
-    }
-}
diff --git a/crates/git_ui/src/text_diff_view.rs b/crates/git_ui/src/text_diff_view.rs
deleted file mode 100644
index 56d55415ba..0000000000
--- a/crates/git_ui/src/text_diff_view.rs
+++ /dev/null
@@ -1,736 +0,0 @@
-//! TextDiffView currently provides a UI for displaying differences between the clipboard and selected text.
-
-use anyhow::Result;
-use buffer_diff::{BufferDiff, BufferDiffSnapshot};
-use editor::{Editor, EditorEvent, MultiBuffer, ToPoint, actions::DiffClipboardWithSelectionData};
-use futures::{FutureExt, select_biased};
-use gpui::{
-    AnyElement, App, AppContext as _, AsyncApp, Context, Entity, EventEmitter, FocusHandle,
-    Focusable, IntoElement, Render, Task, Window,
-};
-use language::{self, Buffer, Point};
-use project::Project;
-use std::{
-    any::{Any, TypeId},
-    cmp,
-    ops::Range,
-    pin::pin,
-    sync::Arc,
-    time::Duration,
-};
-use ui::{Color, Icon, IconName, Label, LabelCommon as _, SharedString};
-use util::paths::PathExt;
-
-use workspace::{
-    Item, ItemHandle as _, ItemNavHistory, ToolbarItemLocation, Workspace,
-    item::{BreadcrumbText, ItemEvent, SaveOptions, TabContentParams},
-    searchable::SearchableItemHandle,
-};
-
-pub struct TextDiffView {
-    diff_editor: Entity<Editor>,
-    title: SharedString,
-    path: Option<SharedString>,
-    buffer_changes_tx: watch::Sender<()>,
-    _recalculate_diff_task: Task<Result<()>>,
-}
-
-const RECALCULATE_DIFF_DEBOUNCE: Duration = Duration::from_millis(250);
-
-impl TextDiffView {
-    pub fn open(
-        diff_data: &DiffClipboardWithSelectionData,
-        workspace: &Workspace,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<Task<Result<Entity<Self>>>> {
-        let source_editor = diff_data.editor.clone();
-
-        let selection_data = source_editor.update(cx, |editor, cx| {
-            let multibuffer = editor.buffer().read(cx);
-            let source_buffer = multibuffer.as_singleton()?;
-            let selections = editor.selections.all::<Point>(&editor.display_snapshot(cx));
-            let buffer_snapshot = source_buffer.read(cx);
-            let first_selection = selections.first()?;
-            let max_point = buffer_snapshot.max_point();
-
-            if first_selection.is_empty() {
-                let full_range = Point::new(0, 0)..max_point;
-                return Some((source_buffer, full_range));
-            }
-
-            let start = first_selection.start;
-            let end = first_selection.end;
-            let expanded_start = Point::new(start.row, 0);
-
-            let expanded_end = if end.column > 0 {
-                let next_row = end.row + 1;
-                cmp::min(max_point, Point::new(next_row, 0))
-            } else {
-                end
-            };
-            Some((source_buffer, expanded_start..expanded_end))
-        });
-
-        let Some((source_buffer, expanded_selection_range)) = selection_data else {
-            log::warn!("There should always be at least one selection in Zed. This is a bug.");
-            return None;
-        };
-
-        source_editor.update(cx, |source_editor, cx| {
-            source_editor.change_selections(Default::default(), window, cx, |s| {
-                s.select_ranges(vec![
-                    expanded_selection_range.start..expanded_selection_range.end,
-                ]);
-            })
-        });
-
-        let source_buffer_snapshot = source_buffer.read(cx).snapshot();
-        let mut clipboard_text = diff_data.clipboard_text.clone();
-
-        if !clipboard_text.ends_with("\n") {
-            clipboard_text.push_str("\n");
-        }
-
-        let workspace = workspace.weak_handle();
-        let diff_buffer = cx.new(|cx| BufferDiff::new(&source_buffer_snapshot.text, cx));
-        let clipboard_buffer = build_clipboard_buffer(
-            clipboard_text,
-            &source_buffer,
-            expanded_selection_range.clone(),
-            cx,
-        );
-
-        let task = window.spawn(cx, async move |cx| {
-            let project = workspace.update(cx, |workspace, _| workspace.project().clone())?;
-
-            update_diff_buffer(&diff_buffer, &source_buffer, &clipboard_buffer, cx).await?;
-
-            workspace.update_in(cx, |workspace, window, cx| {
-                let diff_view = cx.new(|cx| {
-                    TextDiffView::new(
-                        clipboard_buffer,
-                        source_editor,
-                        source_buffer,
-                        expanded_selection_range,
-                        diff_buffer,
-                        project,
-                        window,
-                        cx,
-                    )
-                });
-
-                let pane = workspace.active_pane();
-                pane.update(cx, |pane, cx| {
-                    pane.add_item(Box::new(diff_view.clone()), true, true, None, window, cx);
-                });
-
-                diff_view
-            })
-        });
-
-        Some(task)
-    }
-
-    pub fn new(
-        clipboard_buffer: Entity<Buffer>,
-        source_editor: Entity<Editor>,
-        source_buffer: Entity<Buffer>,
-        source_range: Range<Point>,
-        diff_buffer: Entity<BufferDiff>,
-        project: Entity<Project>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let multibuffer = cx.new(|cx| {
-            let mut multibuffer = MultiBuffer::new(language::Capability::ReadWrite);
-
-            multibuffer.push_excerpts(
-                source_buffer.clone(),
-                [editor::ExcerptRange::new(source_range)],
-                cx,
-            );
-
-            multibuffer.add_diff(diff_buffer.clone(), cx);
-            multibuffer
-        });
-        let diff_editor = cx.new(|cx| {
-            let mut editor = Editor::for_multibuffer(multibuffer, Some(project), window, cx);
-            editor.start_temporary_diff_override();
-            editor.disable_diagnostics(cx);
-            editor.set_expand_all_diff_hunks(cx);
-            editor.set_render_diff_hunk_controls(
-                Arc::new(|_, _, _, _, _, _, _, _| gpui::Empty.into_any_element()),
-                cx,
-            );
-            editor
-        });
-
-        let (buffer_changes_tx, mut buffer_changes_rx) = watch::channel(());
-
-        cx.subscribe(&source_buffer, move |this, _, event, _| match event {
-            language::BufferEvent::Edited
-            | language::BufferEvent::LanguageChanged(_)
-            | language::BufferEvent::Reparsed => {
-                this.buffer_changes_tx.send(()).ok();
-            }
-            _ => {}
-        })
-        .detach();
-
-        let editor = source_editor.read(cx);
-        let title = editor.buffer().read(cx).title(cx).to_string();
-        let selection_location_text = selection_location_text(editor, cx);
-        let selection_location_title = selection_location_text
-            .as_ref()
-            .map(|text| format!("{} @ {}", title, text))
-            .unwrap_or(title);
-
-        let path = editor
-            .buffer()
-            .read(cx)
-            .as_singleton()
-            .and_then(|b| {
-                b.read(cx)
-                    .file()
-                    .map(|f| f.full_path(cx).compact().to_string_lossy().into_owned())
-            })
-            .unwrap_or("untitled".into());
-
-        let selection_location_path = selection_location_text
-            .map(|text| format!("{} @ {}", path, text))
-            .unwrap_or(path);
-
-        Self {
-            diff_editor,
-            title: format!("Clipboard ↔ {selection_location_title}").into(),
-            path: Some(format!("Clipboard ↔ {selection_location_path}").into()),
-            buffer_changes_tx,
-            _recalculate_diff_task: cx.spawn(async move |_, cx| {
-                while buffer_changes_rx.recv().await.is_ok() {
-                    loop {
-                        let mut timer = cx
-                            .background_executor()
-                            .timer(RECALCULATE_DIFF_DEBOUNCE)
-                            .fuse();
-                        let mut recv = pin!(buffer_changes_rx.recv().fuse());
-                        select_biased! {
-                            _ = timer => break,
-                            _ = recv => continue,
-                        }
-                    }
-
-                    log::trace!("start recalculating");
-                    update_diff_buffer(&diff_buffer, &source_buffer, &clipboard_buffer, cx).await?;
-                    log::trace!("finish recalculating");
-                }
-                Ok(())
-            }),
-        }
-    }
-}
-
-fn build_clipboard_buffer(
-    text: String,
-    source_buffer: &Entity<Buffer>,
-    replacement_range: Range<Point>,
-    cx: &mut App,
-) -> Entity<Buffer> {
-    let source_buffer_snapshot = source_buffer.read(cx).snapshot();
-    cx.new(|cx| {
-        let mut buffer = language::Buffer::local(source_buffer_snapshot.text(), cx);
-        let language = source_buffer.read(cx).language().cloned();
-        buffer.set_language(language, cx);
-
-        let range_start = source_buffer_snapshot.point_to_offset(replacement_range.start);
-        let range_end = source_buffer_snapshot.point_to_offset(replacement_range.end);
-        buffer.edit([(range_start..range_end, text)], None, cx);
-
-        buffer
-    })
-}
-
-async fn update_diff_buffer(
-    diff: &Entity<BufferDiff>,
-    source_buffer: &Entity<Buffer>,
-    clipboard_buffer: &Entity<Buffer>,
-    cx: &mut AsyncApp,
-) -> Result<()> {
-    let source_buffer_snapshot = source_buffer.read_with(cx, |buffer, _| buffer.snapshot())?;
-
-    let base_buffer_snapshot = clipboard_buffer.read_with(cx, |buffer, _| buffer.snapshot())?;
-    let base_text = base_buffer_snapshot.text();
-
-    let diff_snapshot = cx
-        .update(|cx| {
-            BufferDiffSnapshot::new_with_base_buffer(
-                source_buffer_snapshot.text.clone(),
-                Some(Arc::new(base_text)),
-                base_buffer_snapshot,
-                cx,
-            )
-        })?
-        .await;
-
-    diff.update(cx, |diff, cx| {
-        diff.set_snapshot(diff_snapshot, &source_buffer_snapshot.text, cx);
-    })?;
-    Ok(())
-}
-
-impl EventEmitter<EditorEvent> for TextDiffView {}
-
-impl Focusable for TextDiffView {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        self.diff_editor.focus_handle(cx)
-    }
-}
-
-impl Item for TextDiffView {
-    type Event = EditorEvent;
-
-    fn tab_icon(&self, _window: &Window, _cx: &App) -> Option<Icon> {
-        Some(Icon::new(IconName::Diff).color(Color::Muted))
-    }
-
-    fn tab_content(&self, params: TabContentParams, _window: &Window, cx: &App) -> AnyElement {
-        Label::new(self.tab_content_text(params.detail.unwrap_or_default(), cx))
-            .color(if params.selected {
-                Color::Default
-            } else {
-                Color::Muted
-            })
-            .into_any_element()
-    }
-
-    fn tab_content_text(&self, _detail: usize, _: &App) -> SharedString {
-        self.title.clone()
-    }
-
-    fn tab_tooltip_text(&self, _: &App) -> Option<SharedString> {
-        self.path.clone()
-    }
-
-    fn to_item_events(event: &EditorEvent, f: impl FnMut(ItemEvent)) {
-        Editor::to_item_events(event, f)
-    }
-
-    fn telemetry_event_text(&self) -> Option<&'static str> {
-        Some("Selection Diff View Opened")
-    }
-
-    fn deactivated(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.diff_editor
-            .update(cx, |editor, cx| editor.deactivated(window, cx));
-    }
-
-    fn act_as_type<'a>(
-        &'a self,
-        type_id: TypeId,
-        self_handle: &'a Entity<Self>,
-        _: &'a App,
-    ) -> Option<gpui::AnyEntity> {
-        if type_id == TypeId::of::<Self>() {
-            Some(self_handle.clone().into())
-        } else if type_id == TypeId::of::<Editor>() {
-            Some(self.diff_editor.clone().into())
-        } else {
-            None
-        }
-    }
-
-    fn as_searchable(&self, _: &Entity<Self>, _: &App) -> Option<Box<dyn SearchableItemHandle>> {
-        Some(Box::new(self.diff_editor.clone()))
-    }
-
-    fn for_each_project_item(
-        &self,
-        cx: &App,
-        f: &mut dyn FnMut(gpui::EntityId, &dyn project::ProjectItem),
-    ) {
-        self.diff_editor.for_each_project_item(cx, f)
-    }
-
-    fn set_nav_history(
-        &mut self,
-        nav_history: ItemNavHistory,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.diff_editor.update(cx, |editor, _| {
-            editor.set_nav_history(Some(nav_history));
-        });
-    }
-
-    fn navigate(
-        &mut self,
-        data: Box<dyn Any>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> bool {
-        self.diff_editor
-            .update(cx, |editor, cx| editor.navigate(data, window, cx))
-    }
-
-    fn breadcrumb_location(&self, _: &App) -> ToolbarItemLocation {
-        ToolbarItemLocation::PrimaryLeft
-    }
-
-    fn breadcrumbs(&self, theme: &theme::Theme, cx: &App) -> Option<Vec<BreadcrumbText>> {
-        self.diff_editor.breadcrumbs(theme, cx)
-    }
-
-    fn added_to_workspace(
-        &mut self,
-        workspace: &mut Workspace,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.diff_editor.update(cx, |editor, cx| {
-            editor.added_to_workspace(workspace, window, cx)
-        });
-    }
-
-    fn can_save(&self, cx: &App) -> bool {
-        // The editor handles the new buffer, so delegate to it
-        self.diff_editor.read(cx).can_save(cx)
-    }
-
-    fn save(
-        &mut self,
-        options: SaveOptions,
-        project: Entity<Project>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        // Delegate saving to the editor, which manages the new buffer
-        self.diff_editor
-            .update(cx, |editor, cx| editor.save(options, project, window, cx))
-    }
-}
-
-pub fn selection_location_text(editor: &Editor, cx: &App) -> Option<String> {
-    let buffer = editor.buffer().read(cx);
-    let buffer_snapshot = buffer.snapshot(cx);
-    let first_selection = editor.selections.disjoint_anchors().first()?;
-
-    let selection_start = first_selection.start.to_point(&buffer_snapshot);
-    let selection_end = first_selection.end.to_point(&buffer_snapshot);
-
-    let start_row = selection_start.row;
-    let start_column = selection_start.column;
-    let end_row = selection_end.row;
-    let end_column = selection_end.column;
-
-    let range_text = if start_row == end_row {
-        format!("L{}:{}-{}", start_row + 1, start_column + 1, end_column + 1)
-    } else {
-        format!(
-            "L{}:{}-L{}:{}",
-            start_row + 1,
-            start_column + 1,
-            end_row + 1,
-            end_column + 1
-        )
-    };
-
-    Some(range_text)
-}
-
-impl Render for TextDiffView {
-    fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
-        self.diff_editor.clone()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use editor::{MultiBufferOffset, test::editor_test_context::assert_state_with_diff};
-    use gpui::{TestAppContext, VisualContext};
-    use project::{FakeFs, Project};
-    use serde_json::json;
-    use settings::SettingsStore;
-    use unindent::unindent;
-    use util::{path, test::marked_text_ranges};
-
-    fn init_test(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-            theme::init(theme::LoadThemes::JustBase, cx);
-        });
-    }
-
-    #[gpui::test]
-    async fn test_diffing_clipboard_against_empty_selection_uses_full_buffer_selection(
-        cx: &mut TestAppContext,
-    ) {
-        base_test(
-            path!("/test"),
-            path!("/test/text.txt"),
-            "def process_incoming_inventory(items, warehouse_id):\n    pass\n",
-            "def process_outgoing_inventory(items, warehouse_id):\n    passˇ\n",
-            &unindent(
-                "
-                - def process_incoming_inventory(items, warehouse_id):
-                + ˇdef process_outgoing_inventory(items, warehouse_id):
-                      pass
-                ",
-            ),
-            "Clipboard ↔ text.txt @ L1:1-L3:1",
-            &format!("Clipboard ↔ {} @ L1:1-L3:1", path!("test/text.txt")),
-            cx,
-        )
-        .await;
-    }
-
-    #[gpui::test]
-    async fn test_diffing_clipboard_against_multiline_selection_expands_to_full_lines(
-        cx: &mut TestAppContext,
-    ) {
-        base_test(
-            path!("/test"),
-            path!("/test/text.txt"),
-            "def process_incoming_inventory(items, warehouse_id):\n    pass\n",
-            "«def process_outgoing_inventory(items, warehouse_id):\n    passˇ»\n",
-            &unindent(
-                "
-                - def process_incoming_inventory(items, warehouse_id):
-                + ˇdef process_outgoing_inventory(items, warehouse_id):
-                      pass
-                ",
-            ),
-            "Clipboard ↔ text.txt @ L1:1-L3:1",
-            &format!("Clipboard ↔ {} @ L1:1-L3:1", path!("test/text.txt")),
-            cx,
-        )
-        .await;
-    }
-
-    #[gpui::test]
-    async fn test_diffing_clipboard_against_single_line_selection(cx: &mut TestAppContext) {
-        base_test(
-            path!("/test"),
-            path!("/test/text.txt"),
-            "a",
-            "«bbˇ»",
-            &unindent(
-                "
-                - a
-                + ˇbb",
-            ),
-            "Clipboard ↔ text.txt @ L1:1-3",
-            &format!("Clipboard ↔ {} @ L1:1-3", path!("test/text.txt")),
-            cx,
-        )
-        .await;
-    }
-
-    #[gpui::test]
-    async fn test_diffing_clipboard_with_leading_whitespace_against_line(cx: &mut TestAppContext) {
-        base_test(
-            path!("/test"),
-            path!("/test/text.txt"),
-            "    a",
-            "«bbˇ»",
-            &unindent(
-                "
-                -     a
-                + ˇbb",
-            ),
-            "Clipboard ↔ text.txt @ L1:1-3",
-            &format!("Clipboard ↔ {} @ L1:1-3", path!("test/text.txt")),
-            cx,
-        )
-        .await;
-    }
-
-    #[gpui::test]
-    async fn test_diffing_clipboard_against_line_with_leading_whitespace(cx: &mut TestAppContext) {
-        base_test(
-            path!("/test"),
-            path!("/test/text.txt"),
-            "a",
-            "    «bbˇ»",
-            &unindent(
-                "
-                - a
-                + ˇ    bb",
-            ),
-            "Clipboard ↔ text.txt @ L1:1-7",
-            &format!("Clipboard ↔ {} @ L1:1-7", path!("test/text.txt")),
-            cx,
-        )
-        .await;
-    }
-
-    #[gpui::test]
-    async fn test_diffing_clipboard_against_line_with_leading_whitespace_included_in_selection(
-        cx: &mut TestAppContext,
-    ) {
-        base_test(
-            path!("/test"),
-            path!("/test/text.txt"),
-            "a",
-            "«    bbˇ»",
-            &unindent(
-                "
-                - a
-                + ˇ    bb",
-            ),
-            "Clipboard ↔ text.txt @ L1:1-7",
-            &format!("Clipboard ↔ {} @ L1:1-7", path!("test/text.txt")),
-            cx,
-        )
-        .await;
-    }
-
-    #[gpui::test]
-    async fn test_diffing_clipboard_with_leading_whitespace_against_line_with_leading_whitespace(
-        cx: &mut TestAppContext,
-    ) {
-        base_test(
-            path!("/test"),
-            path!("/test/text.txt"),
-            "    a",
-            "    «bbˇ»",
-            &unindent(
-                "
-                -     a
-                + ˇ    bb",
-            ),
-            "Clipboard ↔ text.txt @ L1:1-7",
-            &format!("Clipboard ↔ {} @ L1:1-7", path!("test/text.txt")),
-            cx,
-        )
-        .await;
-    }
-
-    #[gpui::test]
-    async fn test_diffing_clipboard_with_leading_whitespace_against_line_with_leading_whitespace_included_in_selection(
-        cx: &mut TestAppContext,
-    ) {
-        base_test(
-            path!("/test"),
-            path!("/test/text.txt"),
-            "    a",
-            "«    bbˇ»",
-            &unindent(
-                "
-                -     a
-                + ˇ    bb",
-            ),
-            "Clipboard ↔ text.txt @ L1:1-7",
-            &format!("Clipboard ↔ {} @ L1:1-7", path!("test/text.txt")),
-            cx,
-        )
-        .await;
-    }
-
-    #[gpui::test]
-    async fn test_diffing_clipboard_against_partial_selection_expands_to_include_trailing_characters(
-        cx: &mut TestAppContext,
-    ) {
-        base_test(
-            path!("/test"),
-            path!("/test/text.txt"),
-            "a",
-            "«bˇ»b",
-            &unindent(
-                "
-                - a
-                + ˇbb",
-            ),
-            "Clipboard ↔ text.txt @ L1:1-3",
-            &format!("Clipboard ↔ {} @ L1:1-3", path!("test/text.txt")),
-            cx,
-        )
-        .await;
-    }
-
-    async fn base_test(
-        project_root: &str,
-        file_path: &str,
-        clipboard_text: &str,
-        editor_text: &str,
-        expected_diff: &str,
-        expected_tab_title: &str,
-        expected_tab_tooltip: &str,
-        cx: &mut TestAppContext,
-    ) {
-        init_test(cx);
-
-        let file_name = std::path::Path::new(file_path)
-            .file_name()
-            .unwrap()
-            .to_str()
-            .unwrap();
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            project_root,
-            json!({
-                file_name: editor_text
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs, [project_root.as_ref()], cx).await;
-
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-        let buffer = project
-            .update(cx, |project, cx| project.open_local_buffer(file_path, cx))
-            .await
-            .unwrap();
-
-        let editor = cx.new_window_entity(|window, cx| {
-            let mut editor = Editor::for_buffer(buffer, None, window, cx);
-            let (unmarked_text, selection_ranges) = marked_text_ranges(editor_text, false);
-            editor.set_text(unmarked_text, window, cx);
-            editor.change_selections(Default::default(), window, cx, |s| {
-                s.select_ranges(
-                    selection_ranges
-                        .into_iter()
-                        .map(|range| MultiBufferOffset(range.start)..MultiBufferOffset(range.end)),
-                )
-            });
-
-            editor
-        });
-
-        let diff_view = workspace
-            .update_in(cx, |workspace, window, cx| {
-                TextDiffView::open(
-                    &DiffClipboardWithSelectionData {
-                        clipboard_text: clipboard_text.to_string(),
-                        editor,
-                    },
-                    workspace,
-                    window,
-                    cx,
-                )
-            })
-            .unwrap()
-            .await
-            .unwrap();
-
-        cx.executor().run_until_parked();
-
-        assert_state_with_diff(
-            &diff_view.read_with(cx, |diff_view, _| diff_view.diff_editor.clone()),
-            cx,
-            expected_diff,
-        );
-
-        diff_view.read_with(cx, |diff_view, cx| {
-            assert_eq!(diff_view.tab_content_text(0, cx), expected_tab_title);
-            assert_eq!(
-                diff_view.tab_tooltip_text(cx).unwrap(),
-                expected_tab_tooltip
-            );
-        });
-    }
-}
diff --git a/crates/git_ui/src/worktree_picker.rs b/crates/git_ui/src/worktree_picker.rs
deleted file mode 100644
index f6b3e47dec..0000000000
--- a/crates/git_ui/src/worktree_picker.rs
+++ /dev/null
@@ -1,743 +0,0 @@
-use anyhow::Context as _;
-use fuzzy::StringMatchCandidate;
-
-use git::repository::Worktree as GitWorktree;
-use gpui::{
-    Action, App, AsyncApp, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable,
-    InteractiveElement, IntoElement, Modifiers, ModifiersChangedEvent, ParentElement,
-    PathPromptOptions, Render, SharedString, Styled, Subscription, Task, WeakEntity, Window,
-    actions, rems,
-};
-use picker::{Picker, PickerDelegate, PickerEditorPosition};
-use project::{DirectoryLister, git_store::Repository};
-use recent_projects::{RemoteConnectionModal, connect};
-use remote::{RemoteConnectionOptions, remote_client::ConnectionIdentifier};
-use std::{path::PathBuf, sync::Arc};
-use ui::{HighlightedLabel, KeyBinding, ListItem, ListItemSpacing, Tooltip, prelude::*};
-use util::ResultExt;
-use workspace::{ModalView, Workspace, notifications::DetachAndPromptErr};
-
-actions!(git, [WorktreeFromDefault, WorktreeFromDefaultOnWindow]);
-
-pub fn register(workspace: &mut Workspace) {
-    workspace.register_action(open);
-}
-
-pub fn open(
-    workspace: &mut Workspace,
-    _: &zed_actions::git::Worktree,
-    window: &mut Window,
-    cx: &mut Context<Workspace>,
-) {
-    let repository = workspace.project().read(cx).active_repository(cx);
-    let workspace_handle = workspace.weak_handle();
-    workspace.toggle_modal(window, cx, |window, cx| {
-        WorktreeList::new(repository, workspace_handle, rems(34.), window, cx)
-    })
-}
-
-pub struct WorktreeList {
-    width: Rems,
-    pub picker: Entity<Picker<WorktreeListDelegate>>,
-    picker_focus_handle: FocusHandle,
-    _subscription: Subscription,
-}
-
-impl WorktreeList {
-    fn new(
-        repository: Option<Entity<Repository>>,
-        workspace: WeakEntity<Workspace>,
-        width: Rems,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let all_worktrees_request = repository
-            .clone()
-            .map(|repository| repository.update(cx, |repository, _| repository.worktrees()));
-
-        let default_branch_request = repository
-            .clone()
-            .map(|repository| repository.update(cx, |repository, _| repository.default_branch()));
-
-        cx.spawn_in(window, async move |this, cx| {
-            let all_worktrees = all_worktrees_request
-                .context("No active repository")?
-                .await??;
-
-            let default_branch = default_branch_request
-                .context("No active repository")?
-                .await
-                .map(Result::ok)
-                .ok()
-                .flatten()
-                .flatten();
-
-            this.update_in(cx, |this, window, cx| {
-                this.picker.update(cx, |picker, cx| {
-                    picker.delegate.all_worktrees = Some(all_worktrees);
-                    picker.delegate.default_branch = default_branch;
-                    picker.refresh(window, cx);
-                })
-            })?;
-
-            anyhow::Ok(())
-        })
-        .detach_and_log_err(cx);
-
-        let delegate = WorktreeListDelegate::new(workspace, repository, window, cx);
-        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx));
-        let picker_focus_handle = picker.focus_handle(cx);
-        picker.update(cx, |picker, _| {
-            picker.delegate.focus_handle = picker_focus_handle.clone();
-        });
-
-        let _subscription = cx.subscribe(&picker, |_, _, _, cx| {
-            cx.emit(DismissEvent);
-        });
-
-        Self {
-            picker,
-            picker_focus_handle,
-            width,
-            _subscription,
-        }
-    }
-
-    fn handle_modifiers_changed(
-        &mut self,
-        ev: &ModifiersChangedEvent,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.picker
-            .update(cx, |picker, _| picker.delegate.modifiers = ev.modifiers)
-    }
-
-    fn handle_new_worktree(
-        &mut self,
-        replace_current_window: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.picker.update(cx, |picker, cx| {
-            let ix = picker.delegate.selected_index();
-            let Some(entry) = picker.delegate.matches.get(ix) else {
-                return;
-            };
-            let Some(default_branch) = picker.delegate.default_branch.clone() else {
-                return;
-            };
-            if !entry.is_new {
-                return;
-            }
-            picker.delegate.create_worktree(
-                entry.worktree.branch(),
-                replace_current_window,
-                Some(default_branch.into()),
-                window,
-                cx,
-            );
-        })
-    }
-}
-impl ModalView for WorktreeList {}
-impl EventEmitter<DismissEvent> for WorktreeList {}
-
-impl Focusable for WorktreeList {
-    fn focus_handle(&self, _: &App) -> FocusHandle {
-        self.picker_focus_handle.clone()
-    }
-}
-
-impl Render for WorktreeList {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .key_context("GitWorktreeSelector")
-            .w(self.width)
-            .on_modifiers_changed(cx.listener(Self::handle_modifiers_changed))
-            .on_action(cx.listener(|this, _: &WorktreeFromDefault, w, cx| {
-                this.handle_new_worktree(false, w, cx)
-            }))
-            .on_action(cx.listener(|this, _: &WorktreeFromDefaultOnWindow, w, cx| {
-                this.handle_new_worktree(true, w, cx)
-            }))
-            .child(self.picker.clone())
-            .on_mouse_down_out({
-                cx.listener(move |this, _, window, cx| {
-                    this.picker.update(cx, |this, cx| {
-                        this.cancel(&Default::default(), window, cx);
-                    })
-                })
-            })
-    }
-}
-
-#[derive(Debug, Clone)]
-struct WorktreeEntry {
-    worktree: GitWorktree,
-    positions: Vec<usize>,
-    is_new: bool,
-}
-
-pub struct WorktreeListDelegate {
-    matches: Vec<WorktreeEntry>,
-    all_worktrees: Option<Vec<GitWorktree>>,
-    workspace: WeakEntity<Workspace>,
-    repo: Option<Entity<Repository>>,
-    selected_index: usize,
-    last_query: String,
-    modifiers: Modifiers,
-    focus_handle: FocusHandle,
-    default_branch: Option<SharedString>,
-}
-
-impl WorktreeListDelegate {
-    fn new(
-        workspace: WeakEntity<Workspace>,
-        repo: Option<Entity<Repository>>,
-        _window: &mut Window,
-        cx: &mut Context<WorktreeList>,
-    ) -> Self {
-        Self {
-            matches: vec![],
-            all_worktrees: None,
-            workspace,
-            selected_index: 0,
-            repo,
-            last_query: Default::default(),
-            modifiers: Default::default(),
-            focus_handle: cx.focus_handle(),
-            default_branch: None,
-        }
-    }
-
-    fn create_worktree(
-        &self,
-        worktree_branch: &str,
-        replace_current_window: bool,
-        commit: Option<String>,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) {
-        let workspace = self.workspace.clone();
-        let Some(repo) = self.repo.clone() else {
-            return;
-        };
-
-        let worktree_path = self
-            .workspace
-            .clone()
-            .update(cx, |this, cx| {
-                this.prompt_for_open_path(
-                    PathPromptOptions {
-                        files: false,
-                        directories: true,
-                        multiple: false,
-                        prompt: Some("Select directory for new worktree".into()),
-                    },
-                    DirectoryLister::Project(this.project().clone()),
-                    window,
-                    cx,
-                )
-            })
-            .log_err();
-        let Some(worktree_path) = worktree_path else {
-            return;
-        };
-
-        let branch = worktree_branch.to_string();
-        let window_handle = window.window_handle();
-        cx.spawn_in(window, async move |_, cx| {
-            let Some(paths) = worktree_path.await? else {
-                return anyhow::Ok(());
-            };
-            let path = paths.get(0).cloned().context("No path selected")?;
-
-            repo.update(cx, |repo, _| {
-                repo.create_worktree(branch.clone(), path.clone(), commit)
-            })?
-            .await??;
-
-            let final_path = path.join(branch);
-
-            let (connection_options, app_state, is_local) =
-                workspace.update(cx, |workspace, cx| {
-                    let project = workspace.project().clone();
-                    let connection_options = project.read(cx).remote_connection_options(cx);
-                    let app_state = workspace.app_state().clone();
-                    let is_local = project.read(cx).is_local();
-                    (connection_options, app_state, is_local)
-                })?;
-
-            if is_local {
-                workspace
-                    .update_in(cx, |workspace, window, cx| {
-                        workspace.open_workspace_for_paths(
-                            replace_current_window,
-                            vec![final_path],
-                            window,
-                            cx,
-                        )
-                    })?
-                    .await?;
-            } else if let Some(connection_options) = connection_options {
-                open_remote_worktree(
-                    connection_options,
-                    vec![final_path],
-                    app_state,
-                    window_handle,
-                    replace_current_window,
-                    cx,
-                )
-                .await?;
-            }
-
-            anyhow::Ok(())
-        })
-        .detach_and_prompt_err("Failed to create worktree", window, cx, |e, _, _| {
-            Some(e.to_string())
-        });
-    }
-
-    fn open_worktree(
-        &self,
-        worktree_path: &PathBuf,
-        replace_current_window: bool,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) {
-        let workspace = self.workspace.clone();
-        let path = worktree_path.clone();
-
-        let Some((connection_options, app_state, is_local)) = workspace
-            .update(cx, |workspace, cx| {
-                let project = workspace.project().clone();
-                let connection_options = project.read(cx).remote_connection_options(cx);
-                let app_state = workspace.app_state().clone();
-                let is_local = project.read(cx).is_local();
-                (connection_options, app_state, is_local)
-            })
-            .log_err()
-        else {
-            return;
-        };
-
-        if is_local {
-            let open_task = workspace.update(cx, |workspace, cx| {
-                workspace.open_workspace_for_paths(replace_current_window, vec![path], window, cx)
-            });
-            cx.spawn(async move |_, _| {
-                open_task?.await?;
-                anyhow::Ok(())
-            })
-            .detach_and_prompt_err(
-                "Failed to open worktree",
-                window,
-                cx,
-                |e, _, _| Some(e.to_string()),
-            );
-        } else if let Some(connection_options) = connection_options {
-            let window_handle = window.window_handle();
-            cx.spawn_in(window, async move |_, cx| {
-                open_remote_worktree(
-                    connection_options,
-                    vec![path],
-                    app_state,
-                    window_handle,
-                    replace_current_window,
-                    cx,
-                )
-                .await
-            })
-            .detach_and_prompt_err(
-                "Failed to open worktree",
-                window,
-                cx,
-                |e, _, _| Some(e.to_string()),
-            );
-        }
-
-        cx.emit(DismissEvent);
-    }
-
-    fn base_branch<'a>(&'a self, cx: &'a mut Context<Picker<Self>>) -> Option<&'a str> {
-        self.repo
-            .as_ref()
-            .and_then(|repo| repo.read(cx).branch.as_ref().map(|b| b.name()))
-    }
-}
-
-async fn open_remote_worktree(
-    connection_options: RemoteConnectionOptions,
-    paths: Vec<PathBuf>,
-    app_state: Arc<workspace::AppState>,
-    window: gpui::AnyWindowHandle,
-    replace_current_window: bool,
-    cx: &mut AsyncApp,
-) -> anyhow::Result<()> {
-    let workspace_window = window
-        .downcast::<Workspace>()
-        .ok_or_else(|| anyhow::anyhow!("Window is not a Workspace window"))?;
-
-    let connect_task = workspace_window.update(cx, |workspace, window, cx| {
-        workspace.toggle_modal(window, cx, |window, cx| {
-            RemoteConnectionModal::new(&connection_options, Vec::new(), window, cx)
-        });
-
-        let prompt = workspace
-            .active_modal::<RemoteConnectionModal>(cx)
-            .expect("Modal just created")
-            .read(cx)
-            .prompt
-            .clone();
-
-        connect(
-            ConnectionIdentifier::setup(),
-            connection_options.clone(),
-            prompt,
-            window,
-            cx,
-        )
-        .prompt_err("Failed to connect", window, cx, |_, _, _| None)
-    })?;
-
-    let session = connect_task.await;
-
-    workspace_window.update(cx, |workspace, _window, cx| {
-        if let Some(prompt) = workspace.active_modal::<RemoteConnectionModal>(cx) {
-            prompt.update(cx, |prompt, cx| prompt.finished(cx))
-        }
-    })?;
-
-    let Some(Some(session)) = session else {
-        return Ok(());
-    };
-
-    let new_project = cx.update(|cx| {
-        project::Project::remote(
-            session,
-            app_state.client.clone(),
-            app_state.node_runtime.clone(),
-            app_state.user_store.clone(),
-            app_state.languages.clone(),
-            app_state.fs.clone(),
-            cx,
-        )
-    })?;
-
-    let window_to_use = if replace_current_window {
-        workspace_window
-    } else {
-        let workspace_position = cx
-            .update(|cx| {
-                workspace::remote_workspace_position_from_db(connection_options.clone(), &paths, cx)
-            })?
-            .await
-            .context("fetching workspace position from db")?;
-
-        let mut options =
-            cx.update(|cx| (app_state.build_window_options)(workspace_position.display, cx))?;
-        options.window_bounds = workspace_position.window_bounds;
-
-        cx.open_window(options, |window, cx| {
-            cx.new(|cx| {
-                let mut workspace =
-                    Workspace::new(None, new_project.clone(), app_state.clone(), window, cx);
-                workspace.centered_layout = workspace_position.centered_layout;
-                workspace
-            })
-        })?
-    };
-
-    workspace::open_remote_project_with_existing_connection(
-        connection_options,
-        new_project,
-        paths,
-        app_state,
-        window_to_use,
-        cx,
-    )
-    .await?;
-
-    Ok(())
-}
-
-impl PickerDelegate for WorktreeListDelegate {
-    type ListItem = ListItem;
-
-    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
-        "Select worktree…".into()
-    }
-
-    fn editor_position(&self) -> PickerEditorPosition {
-        PickerEditorPosition::Start
-    }
-
-    fn match_count(&self) -> usize {
-        self.matches.len()
-    }
-
-    fn selected_index(&self) -> usize {
-        self.selected_index
-    }
-
-    fn set_selected_index(
-        &mut self,
-        ix: usize,
-        _window: &mut Window,
-        _: &mut Context<Picker<Self>>,
-    ) {
-        self.selected_index = ix;
-    }
-
-    fn update_matches(
-        &mut self,
-        query: String,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Task<()> {
-        let Some(all_worktrees) = self.all_worktrees.clone() else {
-            return Task::ready(());
-        };
-
-        cx.spawn_in(window, async move |picker, cx| {
-            let mut matches: Vec<WorktreeEntry> = if query.is_empty() {
-                all_worktrees
-                    .into_iter()
-                    .map(|worktree| WorktreeEntry {
-                        worktree,
-                        positions: Vec::new(),
-                        is_new: false,
-                    })
-                    .collect()
-            } else {
-                let candidates = all_worktrees
-                    .iter()
-                    .enumerate()
-                    .map(|(ix, worktree)| StringMatchCandidate::new(ix, worktree.branch()))
-                    .collect::<Vec<StringMatchCandidate>>();
-                fuzzy::match_strings(
-                    &candidates,
-                    &query,
-                    true,
-                    true,
-                    10000,
-                    &Default::default(),
-                    cx.background_executor().clone(),
-                )
-                .await
-                .into_iter()
-                .map(|candidate| WorktreeEntry {
-                    worktree: all_worktrees[candidate.candidate_id].clone(),
-                    positions: candidate.positions,
-                    is_new: false,
-                })
-                .collect()
-            };
-            picker
-                .update(cx, |picker, _| {
-                    if !query.is_empty()
-                        && !matches
-                            .first()
-                            .is_some_and(|entry| entry.worktree.branch() == query)
-                    {
-                        let query = query.replace(' ', "-");
-                        matches.push(WorktreeEntry {
-                            worktree: GitWorktree {
-                                path: Default::default(),
-                                ref_name: format!("refs/heads/{query}").into(),
-                                sha: Default::default(),
-                            },
-                            positions: Vec::new(),
-                            is_new: true,
-                        })
-                    }
-                    let delegate = &mut picker.delegate;
-                    delegate.matches = matches;
-                    if delegate.matches.is_empty() {
-                        delegate.selected_index = 0;
-                    } else {
-                        delegate.selected_index =
-                            core::cmp::min(delegate.selected_index, delegate.matches.len() - 1);
-                    }
-                    delegate.last_query = query;
-                })
-                .log_err();
-        })
-    }
-
-    fn confirm(&mut self, secondary: bool, window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        let Some(entry) = self.matches.get(self.selected_index()) else {
-            return;
-        };
-        if entry.is_new {
-            self.create_worktree(&entry.worktree.branch(), secondary, None, window, cx);
-        } else {
-            self.open_worktree(&entry.worktree.path, secondary, window, cx);
-        }
-
-        cx.emit(DismissEvent);
-    }
-
-    fn dismissed(&mut self, _: &mut Window, cx: &mut Context<Picker<Self>>) {
-        cx.emit(DismissEvent);
-    }
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        _window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<Self::ListItem> {
-        let entry = &self.matches.get(ix)?;
-        let path = entry.worktree.path.to_string_lossy().to_string();
-        let sha = entry
-            .worktree
-            .sha
-            .clone()
-            .chars()
-            .take(7)
-            .collect::<String>();
-
-        let focus_handle = self.focus_handle.clone();
-        let icon = if let Some(default_branch) = self.default_branch.clone()
-            && entry.is_new
-        {
-            Some(
-                IconButton::new("worktree-from-default", IconName::GitBranchAlt)
-                    .on_click(|_, window, cx| {
-                        window.dispatch_action(WorktreeFromDefault.boxed_clone(), cx)
-                    })
-                    .on_right_click(|_, window, cx| {
-                        window.dispatch_action(WorktreeFromDefaultOnWindow.boxed_clone(), cx)
-                    })
-                    .tooltip(move |_, cx| {
-                        Tooltip::for_action_in(
-                            format!("From default branch {default_branch}"),
-                            &WorktreeFromDefault,
-                            &focus_handle,
-                            cx,
-                        )
-                    }),
-            )
-        } else {
-            None
-        };
-
-        let branch_name = if entry.is_new {
-            h_flex()
-                .gap_1()
-                .child(
-                    Icon::new(IconName::Plus)
-                        .size(IconSize::Small)
-                        .color(Color::Muted),
-                )
-                .child(
-                    Label::new(format!("Create worktree \"{}\"…", entry.worktree.branch()))
-                        .single_line()
-                        .truncate(),
-                )
-                .into_any_element()
-        } else {
-            h_flex()
-                .gap_1()
-                .child(
-                    Icon::new(IconName::GitBranch)
-                        .size(IconSize::Small)
-                        .color(Color::Muted),
-                )
-                .child(HighlightedLabel::new(
-                    entry.worktree.branch().to_owned(),
-                    entry.positions.clone(),
-                ))
-                .truncate()
-                .into_any_element()
-        };
-
-        let sublabel = if entry.is_new {
-            format!(
-                "based off {}",
-                self.base_branch(cx).unwrap_or("the current branch")
-            )
-        } else {
-            format!("at {}", path)
-        };
-
-        Some(
-            ListItem::new(format!("worktree-menu-{ix}"))
-                .inset(true)
-                .spacing(ListItemSpacing::Sparse)
-                .toggle_state(selected)
-                .child(
-                    v_flex()
-                        .w_full()
-                        .overflow_hidden()
-                        .child(
-                            h_flex()
-                                .gap_6()
-                                .justify_between()
-                                .overflow_x_hidden()
-                                .child(branch_name)
-                                .when(!entry.is_new, |el| {
-                                    el.child(
-                                        Label::new(sha)
-                                            .size(LabelSize::Small)
-                                            .color(Color::Muted)
-                                            .into_element(),
-                                    )
-                                }),
-                        )
-                        .child(
-                            div().max_w_96().child(
-                                Label::new(sublabel)
-                                    .size(LabelSize::Small)
-                                    .color(Color::Muted)
-                                    .truncate()
-                                    .into_any_element(),
-                            ),
-                        ),
-                )
-                .end_slot::<IconButton>(icon),
-        )
-    }
-
-    fn no_matches_text(&self, _window: &mut Window, _cx: &mut App) -> Option<SharedString> {
-        Some("No worktrees found".into())
-    }
-
-    fn render_footer(&self, _: &mut Window, cx: &mut Context<Picker<Self>>) -> Option<AnyElement> {
-        let focus_handle = self.focus_handle.clone();
-
-        Some(
-            h_flex()
-                .w_full()
-                .p_1p5()
-                .gap_0p5()
-                .justify_end()
-                .border_t_1()
-                .border_color(cx.theme().colors().border_variant)
-                .child(
-                    Button::new("open-in-new-window", "Open in new window")
-                        .key_binding(
-                            KeyBinding::for_action_in(&menu::Confirm, &focus_handle, cx)
-                                .map(|kb| kb.size(rems_from_px(12.))),
-                        )
-                        .on_click(|_, window, cx| {
-                            window.dispatch_action(menu::Confirm.boxed_clone(), cx)
-                        }),
-                )
-                .child(
-                    Button::new("open-in-window", "Open")
-                        .key_binding(
-                            KeyBinding::for_action_in(&menu::SecondaryConfirm, &focus_handle, cx)
-                                .map(|kb| kb.size(rems_from_px(12.))),
-                        )
-                        .on_click(|_, window, cx| {
-                            window.dispatch_action(menu::SecondaryConfirm.boxed_clone(), cx)
-                        }),
-                )
-                .into_any(),
-        )
-    }
-}
diff --git a/crates/go_to_line/Cargo.toml b/crates/go_to_line/Cargo.toml
deleted file mode 100644
index 0260cd2d12..0000000000
--- a/crates/go_to_line/Cargo.toml
+++ /dev/null
@@ -1,39 +0,0 @@
-[package]
-name = "go_to_line"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/go_to_line.rs"
-doctest = false
-
-[dependencies]
-editor.workspace = true
-gpui.workspace = true
-language.workspace = true
-menu.workspace = true
-serde.workspace = true
-settings.workspace = true
-text.workspace = true
-theme.workspace = true
-ui.workspace = true
-util.workspace = true
-workspace.workspace = true
-
-[dev-dependencies]
-editor = { workspace = true, features = ["test-support"] }
-gpui = { workspace = true, features = ["test-support"] }
-indoc.workspace = true
-language = { workspace = true, features = ["test-support"] }
-menu.workspace = true
-project = { workspace = true, features = ["test-support"] }
-rope.workspace = true
-serde_json.workspace = true
-tree-sitter-rust.workspace = true
-tree-sitter-typescript.workspace = true
-workspace = { workspace = true, features = ["test-support"] }
diff --git a/crates/go_to_line/LICENSE-GPL b/crates/go_to_line/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/go_to_line/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/go_to_line/src/cursor_position.rs b/crates/go_to_line/src/cursor_position.rs
deleted file mode 100644
index 042d9a46b6..0000000000
--- a/crates/go_to_line/src/cursor_position.rs
+++ /dev/null
@@ -1,315 +0,0 @@
-use editor::{Editor, EditorEvent, MBTextSummary, MultiBufferSnapshot};
-use gpui::{App, Entity, FocusHandle, Focusable, Styled, Subscription, Task, WeakEntity};
-use settings::{RegisterSetting, Settings};
-use std::{fmt::Write, num::NonZeroU32, time::Duration};
-use text::{Point, Selection};
-use ui::{
-    Button, ButtonCommon, Clickable, Context, FluentBuilder, IntoElement, LabelSize, ParentElement,
-    Render, Tooltip, Window, div,
-};
-use util::paths::FILE_ROW_COLUMN_DELIMITER;
-use workspace::{StatusBarSettings, StatusItemView, Workspace, item::ItemHandle};
-
-#[derive(Copy, Clone, Debug, Default, PartialOrd, PartialEq)]
-pub(crate) struct SelectionStats {
-    pub lines: usize,
-    pub characters: usize,
-    pub selections: usize,
-}
-
-pub struct CursorPosition {
-    position: Option<UserCaretPosition>,
-    selected_count: SelectionStats,
-    context: Option<FocusHandle>,
-    workspace: WeakEntity<Workspace>,
-    update_position: Task<()>,
-    _observe_active_editor: Option<Subscription>,
-}
-
-/// A position in the editor, where user's caret is located at.
-/// Lines are never zero as there is always at least one line in the editor.
-/// Characters may start with zero as the caret may be at the beginning of a line, but all editors start counting characters from 1,
-/// where "1" will mean "before the first character".
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub struct UserCaretPosition {
-    pub line: NonZeroU32,
-    pub character: NonZeroU32,
-}
-
-impl UserCaretPosition {
-    pub(crate) fn at_selection_end(
-        selection: &Selection<Point>,
-        snapshot: &MultiBufferSnapshot,
-    ) -> Self {
-        let selection_end = selection.head();
-        let (line, character) = if let Some((buffer_snapshot, point, _)) =
-            snapshot.point_to_buffer_point(selection_end)
-        {
-            let line_start = Point::new(point.row, 0);
-
-            let chars_to_last_position = buffer_snapshot
-                .text_summary_for_range::<text::TextSummary, _>(line_start..point)
-                .chars as u32;
-            (line_start.row, chars_to_last_position)
-        } else {
-            let line_start = Point::new(selection_end.row, 0);
-
-            let chars_to_last_position = snapshot
-                .text_summary_for_range::<MBTextSummary, _>(line_start..selection_end)
-                .chars as u32;
-            (selection_end.row, chars_to_last_position)
-        };
-
-        Self {
-            line: NonZeroU32::new(line + 1).expect("added 1"),
-            character: NonZeroU32::new(character + 1).expect("added 1"),
-        }
-    }
-}
-
-impl CursorPosition {
-    pub fn new(workspace: &Workspace) -> Self {
-        Self {
-            position: None,
-            context: None,
-            selected_count: Default::default(),
-            workspace: workspace.weak_handle(),
-            update_position: Task::ready(()),
-            _observe_active_editor: None,
-        }
-    }
-
-    fn update_position(
-        &mut self,
-        editor: &Entity<Editor>,
-        debounce: Option<Duration>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let editor = editor.downgrade();
-        self.update_position = cx.spawn_in(window, async move |cursor_position, cx| {
-            let is_singleton = editor
-                .update(cx, |editor, cx| editor.buffer().read(cx).is_singleton())
-                .ok()
-                .unwrap_or(true);
-
-            if !is_singleton && let Some(debounce) = debounce {
-                cx.background_executor().timer(debounce).await;
-            }
-
-            editor
-                .update(cx, |editor, cx| {
-                    cursor_position.update(cx, |cursor_position, cx| {
-                        cursor_position.selected_count = SelectionStats::default();
-                        cursor_position.selected_count.selections = editor.selections.count();
-                        match editor.mode() {
-                            editor::EditorMode::AutoHeight { .. }
-                            | editor::EditorMode::SingleLine
-                            | editor::EditorMode::Minimap { .. } => {
-                                cursor_position.position = None;
-                                cursor_position.context = None;
-                            }
-                            editor::EditorMode::Full { .. } => {
-                                let mut last_selection = None::<Selection<Point>>;
-                                let snapshot = editor.display_snapshot(cx);
-                                if snapshot.buffer_snapshot().excerpts().count() > 0 {
-                                    for selection in editor.selections.all_adjusted(&snapshot) {
-                                        let selection_summary = snapshot
-                                            .buffer_snapshot()
-                                            .text_summary_for_range::<MBTextSummary, _>(
-                                            selection.start..selection.end,
-                                        );
-                                        cursor_position.selected_count.characters +=
-                                            selection_summary.chars;
-                                        if selection.end != selection.start {
-                                            cursor_position.selected_count.lines +=
-                                                (selection.end.row - selection.start.row) as usize;
-                                            if selection.end.column != 0 {
-                                                cursor_position.selected_count.lines += 1;
-                                            }
-                                        }
-                                        if last_selection.as_ref().is_none_or(|last_selection| {
-                                            selection.id > last_selection.id
-                                        }) {
-                                            last_selection = Some(selection);
-                                        }
-                                    }
-                                }
-                                cursor_position.position = last_selection.map(|s| {
-                                    UserCaretPosition::at_selection_end(
-                                        &s,
-                                        snapshot.buffer_snapshot(),
-                                    )
-                                });
-                                cursor_position.context = Some(editor.focus_handle(cx));
-                            }
-                        }
-
-                        cx.notify();
-                    })
-                })
-                .ok()
-                .transpose()
-                .ok()
-                .flatten();
-        });
-    }
-
-    fn write_position(&self, text: &mut String, cx: &App) {
-        if self.selected_count
-            <= (SelectionStats {
-                selections: 1,
-                ..Default::default()
-            })
-        {
-            // Do not write out anything if we have just one empty selection.
-            return;
-        }
-        let SelectionStats {
-            lines,
-            characters,
-            selections,
-        } = self.selected_count;
-        let format = LineIndicatorFormat::get(None, cx);
-        let is_short_format = format == &LineIndicatorFormat::Short;
-        let lines = (lines > 1).then_some((lines, "line"));
-        let selections = (selections > 1).then_some((selections, "selection"));
-        let characters = (characters > 0).then_some((characters, "character"));
-        if (None, None, None) == (characters, selections, lines) {
-            // Nothing to display.
-            return;
-        }
-        write!(text, " (").unwrap();
-        let mut wrote_once = false;
-        for (count, name) in [selections, lines, characters].into_iter().flatten() {
-            if wrote_once {
-                write!(text, ", ").unwrap();
-            }
-            let name = if is_short_format { &name[..1] } else { name };
-            let plural_suffix = if count > 1 && !is_short_format {
-                "s"
-            } else {
-                ""
-            };
-            write!(text, "{count} {name}{plural_suffix}").unwrap();
-            wrote_once = true;
-        }
-        text.push(')');
-    }
-
-    #[cfg(test)]
-    pub(crate) fn selection_stats(&self) -> &SelectionStats {
-        &self.selected_count
-    }
-
-    #[cfg(test)]
-    pub(crate) fn position(&self) -> Option<UserCaretPosition> {
-        self.position
-    }
-}
-
-impl Render for CursorPosition {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        if !StatusBarSettings::get_global(cx).cursor_position_button {
-            return div().hidden();
-        }
-
-        div().when_some(self.position, |el, position| {
-            let mut text = format!(
-                "{}{FILE_ROW_COLUMN_DELIMITER}{}",
-                position.line, position.character,
-            );
-            self.write_position(&mut text, cx);
-
-            let context = self.context.clone();
-
-            el.child(
-                Button::new("go-to-line-column", text)
-                    .label_size(LabelSize::Small)
-                    .on_click(cx.listener(|this, _, window, cx| {
-                        if let Some(workspace) = this.workspace.upgrade() {
-                            workspace.update(cx, |workspace, cx| {
-                                if let Some(editor) = workspace
-                                    .active_item(cx)
-                                    .and_then(|item| item.act_as::<Editor>(cx))
-                                    && let Some((_, buffer, _)) = editor.read(cx).active_excerpt(cx)
-                                {
-                                    workspace.toggle_modal(window, cx, |window, cx| {
-                                        crate::GoToLine::new(editor, buffer, window, cx)
-                                    })
-                                }
-                            });
-                        }
-                    }))
-                    .tooltip(move |_window, cx| match context.as_ref() {
-                        Some(context) => Tooltip::for_action_in(
-                            "Go to Line/Column",
-                            &editor::actions::ToggleGoToLine,
-                            context,
-                            cx,
-                        ),
-                        None => Tooltip::for_action(
-                            "Go to Line/Column",
-                            &editor::actions::ToggleGoToLine,
-                            cx,
-                        ),
-                    }),
-            )
-        })
-    }
-}
-
-const UPDATE_DEBOUNCE: Duration = Duration::from_millis(50);
-
-impl StatusItemView for CursorPosition {
-    fn set_active_pane_item(
-        &mut self,
-        active_pane_item: Option<&dyn ItemHandle>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(editor) = active_pane_item.and_then(|item| item.act_as::<Editor>(cx)) {
-            self._observe_active_editor = Some(cx.subscribe_in(
-                &editor,
-                window,
-                |cursor_position, editor, event, window, cx| match event {
-                    EditorEvent::SelectionsChanged { .. } => Self::update_position(
-                        cursor_position,
-                        editor,
-                        Some(UPDATE_DEBOUNCE),
-                        window,
-                        cx,
-                    ),
-                    _ => {}
-                },
-            ));
-            self.update_position(&editor, None, window, cx);
-        } else {
-            self.position = None;
-            self._observe_active_editor = None;
-        }
-
-        cx.notify();
-    }
-}
-
-#[derive(Clone, Copy, PartialEq, Eq, RegisterSetting)]
-pub enum LineIndicatorFormat {
-    Short,
-    Long,
-}
-
-impl From<settings::LineIndicatorFormat> for LineIndicatorFormat {
-    fn from(format: settings::LineIndicatorFormat) -> Self {
-        match format {
-            settings::LineIndicatorFormat::Short => LineIndicatorFormat::Short,
-            settings::LineIndicatorFormat::Long => LineIndicatorFormat::Long,
-        }
-    }
-}
-
-impl Settings for LineIndicatorFormat {
-    fn from_settings(content: &settings::SettingsContent) -> Self {
-        content.line_indicator_format.unwrap().into()
-    }
-}
diff --git a/crates/go_to_line/src/go_to_line.rs b/crates/go_to_line/src/go_to_line.rs
deleted file mode 100644
index 461b0be659..0000000000
--- a/crates/go_to_line/src/go_to_line.rs
+++ /dev/null
@@ -1,943 +0,0 @@
-pub mod cursor_position;
-
-use cursor_position::UserCaretPosition;
-use editor::{
-    Anchor, Editor, MultiBufferSnapshot, RowHighlightOptions, SelectionEffects, ToOffset, ToPoint,
-    actions::Tab,
-    scroll::{Autoscroll, ScrollOffset},
-};
-use gpui::{
-    App, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, Render, SharedString, Styled,
-    Subscription, div, prelude::*,
-};
-use language::Buffer;
-use text::{Bias, Point};
-use theme::ActiveTheme;
-use ui::prelude::*;
-use util::paths::FILE_ROW_COLUMN_DELIMITER;
-use workspace::{DismissDecision, ModalView};
-
-pub fn init(cx: &mut App) {
-    cx.observe_new(GoToLine::register).detach();
-}
-
-pub struct GoToLine {
-    line_editor: Entity<Editor>,
-    active_editor: Entity<Editor>,
-    current_text: SharedString,
-    prev_scroll_position: Option<gpui::Point<ScrollOffset>>,
-    _subscriptions: Vec<Subscription>,
-}
-
-impl ModalView for GoToLine {
-    fn on_before_dismiss(
-        &mut self,
-        _window: &mut Window,
-        _cx: &mut Context<Self>,
-    ) -> DismissDecision {
-        self.prev_scroll_position.take();
-        DismissDecision::Dismiss(true)
-    }
-}
-
-impl Focusable for GoToLine {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        self.line_editor.focus_handle(cx)
-    }
-}
-impl EventEmitter<DismissEvent> for GoToLine {}
-
-enum GoToLineRowHighlights {}
-
-impl GoToLine {
-    fn register(editor: &mut Editor, _window: Option<&mut Window>, cx: &mut Context<Editor>) {
-        let handle = cx.entity().downgrade();
-        editor
-            .register_action(move |_: &editor::actions::ToggleGoToLine, window, cx| {
-                let Some(editor_handle) = handle.upgrade() else {
-                    return;
-                };
-                let Some(workspace) = editor_handle.read(cx).workspace() else {
-                    return;
-                };
-                let editor = editor_handle.read(cx);
-                let Some((_, buffer, _)) = editor.active_excerpt(cx) else {
-                    return;
-                };
-                workspace.update(cx, |workspace, cx| {
-                    workspace.toggle_modal(window, cx, move |window, cx| {
-                        GoToLine::new(editor_handle, buffer, window, cx)
-                    });
-                })
-            })
-            .detach();
-    }
-
-    pub fn new(
-        active_editor: Entity<Editor>,
-        active_buffer: Entity<Buffer>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let (user_caret, last_line, scroll_position) = active_editor.update(cx, |editor, cx| {
-            let user_caret = UserCaretPosition::at_selection_end(
-                &editor
-                    .selections
-                    .last::<Point>(&editor.display_snapshot(cx)),
-                &editor.buffer().read(cx).snapshot(cx),
-            );
-
-            let snapshot = active_buffer.read(cx).snapshot();
-            let last_line = editor
-                .buffer()
-                .read(cx)
-                .excerpts_for_buffer(snapshot.remote_id(), cx)
-                .into_iter()
-                .map(move |(_, range)| text::ToPoint::to_point(&range.context.end, &snapshot).row)
-                .max()
-                .unwrap_or(0);
-
-            (user_caret, last_line, editor.scroll_position(cx))
-        });
-
-        let line = user_caret.line.get();
-        let column = user_caret.character.get();
-
-        let line_editor = cx.new(|cx| {
-            let mut editor = Editor::single_line(window, cx);
-            let editor_handle = cx.entity().downgrade();
-            editor
-                .register_action::<Tab>({
-                    move |_, window, cx| {
-                        let Some(editor) = editor_handle.upgrade() else {
-                            return;
-                        };
-                        editor.update(cx, |editor, cx| {
-                            if let Some(placeholder_text) = editor.placeholder_text(cx)
-                                && editor.text(cx).is_empty()
-                            {
-                                editor.set_text(placeholder_text, window, cx);
-                            }
-                        });
-                    }
-                })
-                .detach();
-            editor.set_placeholder_text(
-                &format!("{line}{FILE_ROW_COLUMN_DELIMITER}{column}"),
-                window,
-                cx,
-            );
-            editor
-        });
-        let line_editor_change = cx.subscribe_in(&line_editor, window, Self::on_line_editor_event);
-
-        let current_text = format!(
-            "Current Line: {} of {} (column {})",
-            line,
-            last_line + 1,
-            column
-        );
-
-        Self {
-            line_editor,
-            active_editor,
-            current_text: current_text.into(),
-            prev_scroll_position: Some(scroll_position),
-            _subscriptions: vec![line_editor_change, cx.on_release_in(window, Self::release)],
-        }
-    }
-
-    fn release(&mut self, window: &mut Window, cx: &mut App) {
-        let scroll_position = self.prev_scroll_position.take();
-        self.active_editor.update(cx, |editor, cx| {
-            editor.clear_row_highlights::<GoToLineRowHighlights>();
-            if let Some(scroll_position) = scroll_position {
-                editor.set_scroll_position(scroll_position, window, cx);
-            }
-            cx.notify();
-        })
-    }
-
-    fn on_line_editor_event(
-        &mut self,
-        _: &Entity<Editor>,
-        event: &editor::EditorEvent,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            editor::EditorEvent::Blurred => {
-                self.prev_scroll_position.take();
-                cx.emit(DismissEvent)
-            }
-            editor::EditorEvent::BufferEdited => self.highlight_current_line(cx),
-            _ => {}
-        }
-    }
-
-    fn highlight_current_line(&mut self, cx: &mut Context<Self>) {
-        self.active_editor.update(cx, |editor, cx| {
-            editor.clear_row_highlights::<GoToLineRowHighlights>();
-            let snapshot = editor.buffer().read(cx).snapshot(cx);
-            let Some(start) = self.anchor_from_query(&snapshot, cx) else {
-                return;
-            };
-            let mut start_point = start.to_point(&snapshot);
-            start_point.column = 0;
-            // Force non-empty range to ensure the line is highlighted.
-            let mut end_point = snapshot.clip_point(start_point + Point::new(0, 1), Bias::Left);
-            if start_point == end_point {
-                end_point = snapshot.clip_point(start_point + Point::new(1, 0), Bias::Left);
-            }
-
-            let end = snapshot.anchor_after(end_point);
-            editor.highlight_rows::<GoToLineRowHighlights>(
-                start..end,
-                cx.theme().colors().editor_highlighted_line_background,
-                RowHighlightOptions {
-                    autoscroll: true,
-                    ..Default::default()
-                },
-                cx,
-            );
-            editor.request_autoscroll(Autoscroll::center(), cx);
-        });
-        cx.notify();
-    }
-
-    fn anchor_from_query(
-        &self,
-        snapshot: &MultiBufferSnapshot,
-        cx: &Context<Editor>,
-    ) -> Option<Anchor> {
-        let (query_row, query_char) = self.line_and_char_from_query(cx)?;
-        let row = query_row.saturating_sub(1);
-        let character = query_char.unwrap_or(0).saturating_sub(1);
-
-        let start_offset = Point::new(row, 0).to_offset(snapshot);
-        const MAX_BYTES_IN_UTF_8: u32 = 4;
-        let max_end_offset = snapshot
-            .clip_point(
-                Point::new(row, character * MAX_BYTES_IN_UTF_8 + 1),
-                Bias::Right,
-            )
-            .to_offset(snapshot);
-
-        let mut chars_to_iterate = character;
-        let mut end_offset = start_offset;
-        'outer: for text_chunk in snapshot.text_for_range(start_offset..max_end_offset) {
-            let mut offset_increment = 0;
-            for c in text_chunk.chars() {
-                if chars_to_iterate == 0 {
-                    end_offset += offset_increment;
-                    break 'outer;
-                } else {
-                    chars_to_iterate -= 1;
-                    offset_increment += c.len_utf8();
-                }
-            }
-            end_offset += offset_increment;
-        }
-        Some(snapshot.anchor_before(snapshot.clip_offset(end_offset, Bias::Left)))
-    }
-
-    fn line_and_char_from_query(&self, cx: &App) -> Option<(u32, Option<u32>)> {
-        let input = self.line_editor.read(cx).text(cx);
-        let mut components = input
-            .splitn(2, FILE_ROW_COLUMN_DELIMITER)
-            .map(str::trim)
-            .fuse();
-        let row = components.next().and_then(|row| row.parse::<u32>().ok())?;
-        let column = components.next().and_then(|col| col.parse::<u32>().ok());
-        Some((row, column))
-    }
-
-    fn cancel(&mut self, _: &menu::Cancel, _: &mut Window, cx: &mut Context<Self>) {
-        cx.emit(DismissEvent);
-    }
-
-    fn confirm(&mut self, _: &menu::Confirm, window: &mut Window, cx: &mut Context<Self>) {
-        self.active_editor.update(cx, |editor, cx| {
-            let snapshot = editor.buffer().read(cx).snapshot(cx);
-            let Some(start) = self.anchor_from_query(&snapshot, cx) else {
-                return;
-            };
-            editor.change_selections(
-                SelectionEffects::scroll(Autoscroll::center()),
-                window,
-                cx,
-                |s| s.select_anchor_ranges([start..start]),
-            );
-            editor.focus_handle(cx).focus(window);
-            cx.notify()
-        });
-        self.prev_scroll_position.take();
-
-        cx.emit(DismissEvent);
-    }
-}
-
-impl Render for GoToLine {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let help_text = match self.line_and_char_from_query(cx) {
-            Some((line, Some(character))) => {
-                format!("Go to line {line}, character {character}").into()
-            }
-            Some((line, None)) => format!("Go to line {line}").into(),
-            None => self.current_text.clone(),
-        };
-
-        v_flex()
-            .w(rems(24.))
-            .elevation_2(cx)
-            .key_context("GoToLine")
-            .on_action(cx.listener(Self::cancel))
-            .on_action(cx.listener(Self::confirm))
-            .child(
-                div()
-                    .border_b_1()
-                    .border_color(cx.theme().colors().border_variant)
-                    .px_2()
-                    .py_1()
-                    .child(self.line_editor.clone()),
-            )
-            .child(
-                h_flex()
-                    .px_2()
-                    .py_1()
-                    .gap_1()
-                    .child(Label::new(help_text).color(Color::Muted)),
-            )
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use cursor_position::{CursorPosition, SelectionStats, UserCaretPosition};
-    use editor::actions::{MoveRight, MoveToBeginning, SelectAll};
-    use gpui::{TestAppContext, VisualTestContext};
-    use indoc::indoc;
-    use project::{FakeFs, Project};
-    use serde_json::json;
-    use std::{num::NonZeroU32, sync::Arc, time::Duration};
-    use util::{path, rel_path::rel_path};
-    use workspace::{AppState, Workspace};
-
-    #[gpui::test]
-    async fn test_go_to_line_view_row_highlights(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/dir"),
-            json!({
-                "a.rs": indoc!{"
-                    struct SingleLine; // display line 0
-                                       // display line 1
-                    struct MultiLine { // display line 2
-                        field_1: i32,  // display line 3
-                        field_2: i32,  // display line 4
-                    }                  // display line 5
-                                       // display line 6
-                    struct Another {   // display line 7
-                        field_1: i32,  // display line 8
-                        field_2: i32,  // display line 9
-                        field_3: i32,  // display line 10
-                        field_4: i32,  // display line 11
-                    }                  // display line 12
-                "}
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let worktree_id = workspace.update(cx, |workspace, cx| {
-            workspace.project().update(cx, |project, cx| {
-                project.worktrees(cx).next().unwrap().read(cx).id()
-            })
-        });
-        let _buffer = project
-            .update(cx, |project, cx| {
-                project.open_local_buffer(path!("/dir/a.rs"), cx)
-            })
-            .await
-            .unwrap();
-        let editor = workspace
-            .update_in(cx, |workspace, window, cx| {
-                workspace.open_path((worktree_id, rel_path("a.rs")), None, true, window, cx)
-            })
-            .await
-            .unwrap()
-            .downcast::<Editor>()
-            .unwrap();
-
-        let go_to_line_view = open_go_to_line_view(&workspace, cx);
-        assert_eq!(
-            highlighted_display_rows(&editor, cx),
-            Vec::<u32>::new(),
-            "Initially opened go to line modal should not highlight any rows"
-        );
-        assert_single_caret_at_row(&editor, 0, cx);
-
-        cx.simulate_input("1");
-        assert_eq!(
-            highlighted_display_rows(&editor, cx),
-            vec![0],
-            "Go to line modal should highlight a row, corresponding to the query"
-        );
-        assert_single_caret_at_row(&editor, 0, cx);
-
-        cx.simulate_input("8");
-        assert_eq!(
-            highlighted_display_rows(&editor, cx),
-            vec![13],
-            "If the query is too large, the last row should be highlighted"
-        );
-        assert_single_caret_at_row(&editor, 0, cx);
-
-        cx.dispatch_action(menu::Cancel);
-        drop(go_to_line_view);
-        editor.update(cx, |_, _| {});
-        assert_eq!(
-            highlighted_display_rows(&editor, cx),
-            Vec::<u32>::new(),
-            "After cancelling and closing the modal, no rows should be highlighted"
-        );
-        assert_single_caret_at_row(&editor, 0, cx);
-
-        let go_to_line_view = open_go_to_line_view(&workspace, cx);
-        assert_eq!(
-            highlighted_display_rows(&editor, cx),
-            Vec::<u32>::new(),
-            "Reopened modal should not highlight any rows"
-        );
-        assert_single_caret_at_row(&editor, 0, cx);
-
-        let expected_highlighted_row = 4;
-        cx.simulate_input("5");
-        assert_eq!(
-            highlighted_display_rows(&editor, cx),
-            vec![expected_highlighted_row]
-        );
-        assert_single_caret_at_row(&editor, 0, cx);
-        cx.dispatch_action(menu::Confirm);
-        drop(go_to_line_view);
-        editor.update(cx, |_, _| {});
-        assert_eq!(
-            highlighted_display_rows(&editor, cx),
-            Vec::<u32>::new(),
-            "After confirming and closing the modal, no rows should be highlighted"
-        );
-        // On confirm, should place the caret on the highlighted row.
-        assert_single_caret_at_row(&editor, expected_highlighted_row, cx);
-    }
-
-    #[gpui::test]
-    async fn test_unicode_characters_selection(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/dir"),
-            json!({
-                "a.rs": "ēlo"
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        workspace.update_in(cx, |workspace, window, cx| {
-            let cursor_position = cx.new(|_| CursorPosition::new(workspace));
-            workspace.status_bar().update(cx, |status_bar, cx| {
-                status_bar.add_right_item(cursor_position, window, cx);
-            });
-        });
-
-        let worktree_id = workspace.update(cx, |workspace, cx| {
-            workspace.project().update(cx, |project, cx| {
-                project.worktrees(cx).next().unwrap().read(cx).id()
-            })
-        });
-        let _buffer = project
-            .update(cx, |project, cx| {
-                project.open_local_buffer(path!("/dir/a.rs"), cx)
-            })
-            .await
-            .unwrap();
-        let editor = workspace
-            .update_in(cx, |workspace, window, cx| {
-                workspace.open_path((worktree_id, rel_path("a.rs")), None, true, window, cx)
-            })
-            .await
-            .unwrap()
-            .downcast::<Editor>()
-            .unwrap();
-
-        cx.executor().advance_clock(Duration::from_millis(200));
-        workspace.update(cx, |workspace, cx| {
-            assert_eq!(
-                &SelectionStats {
-                    lines: 0,
-                    characters: 0,
-                    selections: 1,
-                },
-                workspace
-                    .status_bar()
-                    .read(cx)
-                    .item_of_type::<CursorPosition>()
-                    .expect("missing cursor position item")
-                    .read(cx)
-                    .selection_stats(),
-                "No selections should be initially"
-            );
-        });
-        editor.update_in(cx, |editor, window, cx| {
-            editor.select_all(&SelectAll, window, cx)
-        });
-        cx.executor().advance_clock(Duration::from_millis(200));
-        workspace.update(cx, |workspace, cx| {
-            assert_eq!(
-                &SelectionStats {
-                    lines: 1,
-                    characters: 3,
-                    selections: 1,
-                },
-                workspace
-                    .status_bar()
-                    .read(cx)
-                    .item_of_type::<CursorPosition>()
-                    .expect("missing cursor position item")
-                    .read(cx)
-                    .selection_stats(),
-                "After selecting a text with multibyte unicode characters, the character count should be correct"
-            );
-        });
-    }
-
-    #[gpui::test]
-    async fn test_unicode_line_numbers(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let text = "ēlo你好";
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/dir"),
-            json!({
-                "a.rs": text
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        workspace.update_in(cx, |workspace, window, cx| {
-            let cursor_position = cx.new(|_| CursorPosition::new(workspace));
-            workspace.status_bar().update(cx, |status_bar, cx| {
-                status_bar.add_right_item(cursor_position, window, cx);
-            });
-        });
-
-        let worktree_id = workspace.update(cx, |workspace, cx| {
-            workspace.project().update(cx, |project, cx| {
-                project.worktrees(cx).next().unwrap().read(cx).id()
-            })
-        });
-        let _buffer = project
-            .update(cx, |project, cx| {
-                project.open_local_buffer(path!("/dir/a.rs"), cx)
-            })
-            .await
-            .unwrap();
-        let editor = workspace
-            .update_in(cx, |workspace, window, cx| {
-                workspace.open_path((worktree_id, rel_path("a.rs")), None, true, window, cx)
-            })
-            .await
-            .unwrap()
-            .downcast::<Editor>()
-            .unwrap();
-
-        editor.update_in(cx, |editor, window, cx| {
-            editor.move_to_beginning(&MoveToBeginning, window, cx)
-        });
-        cx.executor().advance_clock(Duration::from_millis(200));
-        assert_eq!(
-            user_caret_position(1, 1),
-            current_position(&workspace, cx),
-            "Beginning of the line should be at first line, before any characters"
-        );
-
-        for (i, c) in text.chars().enumerate() {
-            let i = i as u32 + 1;
-            editor.update_in(cx, |editor, window, cx| {
-                editor.move_right(&MoveRight, window, cx)
-            });
-            cx.executor().advance_clock(Duration::from_millis(200));
-            assert_eq!(
-                user_caret_position(1, i + 1),
-                current_position(&workspace, cx),
-                "Wrong position for char '{c}' in string '{text}'",
-            );
-        }
-
-        editor.update_in(cx, |editor, window, cx| {
-            editor.move_right(&MoveRight, window, cx)
-        });
-        cx.executor().advance_clock(Duration::from_millis(200));
-        assert_eq!(
-            user_caret_position(1, text.chars().count() as u32 + 1),
-            current_position(&workspace, cx),
-            "After reaching the end of the text, position should not change when moving right"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_go_into_unicode(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let text = "ēlo你好";
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/dir"),
-            json!({
-                "a.rs": text
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        workspace.update_in(cx, |workspace, window, cx| {
-            let cursor_position = cx.new(|_| CursorPosition::new(workspace));
-            workspace.status_bar().update(cx, |status_bar, cx| {
-                status_bar.add_right_item(cursor_position, window, cx);
-            });
-        });
-
-        let worktree_id = workspace.update(cx, |workspace, cx| {
-            workspace.project().update(cx, |project, cx| {
-                project.worktrees(cx).next().unwrap().read(cx).id()
-            })
-        });
-        let _buffer = project
-            .update(cx, |project, cx| {
-                project.open_local_buffer(path!("/dir/a.rs"), cx)
-            })
-            .await
-            .unwrap();
-        let editor = workspace
-            .update_in(cx, |workspace, window, cx| {
-                workspace.open_path((worktree_id, rel_path("a.rs")), None, true, window, cx)
-            })
-            .await
-            .unwrap()
-            .downcast::<Editor>()
-            .unwrap();
-
-        editor.update_in(cx, |editor, window, cx| {
-            editor.move_to_beginning(&MoveToBeginning, window, cx)
-        });
-        cx.executor().advance_clock(Duration::from_millis(200));
-        assert_eq!(user_caret_position(1, 1), current_position(&workspace, cx));
-
-        for (i, c) in text.chars().enumerate() {
-            let i = i as u32 + 1;
-            let point = user_caret_position(1, i + 1);
-            go_to_point(point, user_caret_position(1, i), &workspace, cx);
-            cx.executor().advance_clock(Duration::from_millis(200));
-            assert_eq!(
-                point,
-                current_position(&workspace, cx),
-                "When going to {point:?}, expecting the cursor to be at char '{c}' in string '{text}'",
-            );
-        }
-
-        go_to_point(
-            user_caret_position(111, 222),
-            user_caret_position(1, text.chars().count() as u32 + 1),
-            &workspace,
-            cx,
-        );
-        cx.executor().advance_clock(Duration::from_millis(200));
-        assert_eq!(
-            user_caret_position(1, text.chars().count() as u32 + 1),
-            current_position(&workspace, cx),
-            "When going into too large point, should go to the end of the text"
-        );
-    }
-
-    fn current_position(
-        workspace: &Entity<Workspace>,
-        cx: &mut VisualTestContext,
-    ) -> UserCaretPosition {
-        workspace.update(cx, |workspace, cx| {
-            workspace
-                .status_bar()
-                .read(cx)
-                .item_of_type::<CursorPosition>()
-                .expect("missing cursor position item")
-                .read(cx)
-                .position()
-                .expect("No position found")
-        })
-    }
-
-    fn user_caret_position(line: u32, character: u32) -> UserCaretPosition {
-        UserCaretPosition {
-            line: NonZeroU32::new(line).unwrap(),
-            character: NonZeroU32::new(character).unwrap(),
-        }
-    }
-
-    fn go_to_point(
-        new_point: UserCaretPosition,
-        expected_placeholder: UserCaretPosition,
-        workspace: &Entity<Workspace>,
-        cx: &mut VisualTestContext,
-    ) {
-        let go_to_line_view = open_go_to_line_view(workspace, cx);
-        go_to_line_view.update(cx, |go_to_line_view, cx| {
-            assert_eq!(
-                go_to_line_view.line_editor.update(cx, |line_editor, cx| {
-                    line_editor
-                        .placeholder_text(cx)
-                        .expect("No placeholder text")
-                }),
-                format!(
-                    "{}:{}",
-                    expected_placeholder.line, expected_placeholder.character
-                )
-            );
-        });
-        cx.simulate_input(&format!("{}:{}", new_point.line, new_point.character));
-        cx.dispatch_action(menu::Confirm);
-    }
-
-    fn open_go_to_line_view(
-        workspace: &Entity<Workspace>,
-        cx: &mut VisualTestContext,
-    ) -> Entity<GoToLine> {
-        cx.dispatch_action(editor::actions::ToggleGoToLine);
-        workspace.update(cx, |workspace, cx| {
-            workspace.active_modal::<GoToLine>(cx).unwrap()
-        })
-    }
-
-    fn highlighted_display_rows(editor: &Entity<Editor>, cx: &mut VisualTestContext) -> Vec<u32> {
-        editor.update_in(cx, |editor, window, cx| {
-            editor
-                .highlighted_display_rows(window, cx)
-                .into_keys()
-                .map(|r| r.0)
-                .collect()
-        })
-    }
-
-    #[track_caller]
-    fn assert_single_caret_at_row(
-        editor: &Entity<Editor>,
-        buffer_row: u32,
-        cx: &mut VisualTestContext,
-    ) {
-        let selections = editor.update(cx, |editor, cx| {
-            editor
-                .selections
-                .all::<rope::Point>(&editor.display_snapshot(cx))
-                .into_iter()
-                .map(|s| s.start..s.end)
-                .collect::<Vec<_>>()
-        });
-        assert!(
-            selections.len() == 1,
-            "Expected one caret selection but got: {selections:?}"
-        );
-        let selection = &selections[0];
-        assert!(
-            selection.start == selection.end,
-            "Expected a single caret selection, but got: {selection:?}"
-        );
-        assert_eq!(selection.start.row, buffer_row);
-    }
-
-    fn init_test(cx: &mut TestAppContext) -> Arc<AppState> {
-        cx.update(|cx| {
-            let state = AppState::test(cx);
-            crate::init(cx);
-            editor::init(cx);
-            state
-        })
-    }
-
-    #[gpui::test]
-    async fn test_scroll_position_on_outside_click(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        let file_content = (0..100)
-            .map(|i| format!("struct Line{};", i))
-            .collect::<Vec<_>>()
-            .join("\n");
-        fs.insert_tree(path!("/dir"), json!({"a.rs": file_content}))
-            .await;
-
-        let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let worktree_id = workspace.update(cx, |workspace, cx| {
-            workspace.project().update(cx, |project, cx| {
-                project.worktrees(cx).next().unwrap().read(cx).id()
-            })
-        });
-        let _buffer = project
-            .update(cx, |project, cx| {
-                project.open_local_buffer(path!("/dir/a.rs"), cx)
-            })
-            .await
-            .unwrap();
-        let editor = workspace
-            .update_in(cx, |workspace, window, cx| {
-                workspace.open_path((worktree_id, rel_path("a.rs")), None, true, window, cx)
-            })
-            .await
-            .unwrap()
-            .downcast::<Editor>()
-            .unwrap();
-        let go_to_line_view = open_go_to_line_view(&workspace, cx);
-
-        let scroll_position_before_input =
-            editor.update(cx, |editor, cx| editor.scroll_position(cx));
-        cx.simulate_input("47");
-        let scroll_position_after_input =
-            editor.update(cx, |editor, cx| editor.scroll_position(cx));
-        assert_ne!(scroll_position_before_input, scroll_position_after_input);
-
-        drop(go_to_line_view);
-        workspace.update_in(cx, |workspace, window, cx| {
-            workspace.hide_modal(window, cx);
-        });
-        cx.run_until_parked();
-
-        let scroll_position_after_auto_dismiss =
-            editor.update(cx, |editor, cx| editor.scroll_position(cx));
-        assert_eq!(
-            scroll_position_after_auto_dismiss, scroll_position_after_input,
-            "Dismissing via outside click should maintain new scroll position"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_scroll_position_on_cancel(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        let file_content = (0..100)
-            .map(|i| format!("struct Line{};", i))
-            .collect::<Vec<_>>()
-            .join("\n");
-        fs.insert_tree(path!("/dir"), json!({"a.rs": file_content}))
-            .await;
-
-        let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let worktree_id = workspace.update(cx, |workspace, cx| {
-            workspace.project().update(cx, |project, cx| {
-                project.worktrees(cx).next().unwrap().read(cx).id()
-            })
-        });
-        let _buffer = project
-            .update(cx, |project, cx| {
-                project.open_local_buffer(path!("/dir/a.rs"), cx)
-            })
-            .await
-            .unwrap();
-        let editor = workspace
-            .update_in(cx, |workspace, window, cx| {
-                workspace.open_path((worktree_id, rel_path("a.rs")), None, true, window, cx)
-            })
-            .await
-            .unwrap()
-            .downcast::<Editor>()
-            .unwrap();
-        let go_to_line_view = open_go_to_line_view(&workspace, cx);
-
-        let scroll_position_before_input =
-            editor.update(cx, |editor, cx| editor.scroll_position(cx));
-        cx.simulate_input("47");
-        let scroll_position_after_input =
-            editor.update(cx, |editor, cx| editor.scroll_position(cx));
-        assert_ne!(scroll_position_before_input, scroll_position_after_input);
-
-        cx.dispatch_action(menu::Cancel);
-        drop(go_to_line_view);
-        cx.run_until_parked();
-
-        let scroll_position_after_cancel =
-            editor.update(cx, |editor, cx| editor.scroll_position(cx));
-        assert_eq!(
-            scroll_position_after_cancel, scroll_position_after_input,
-            "Cancel should maintain new scroll position"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_scroll_position_on_confirm(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        let file_content = (0..100)
-            .map(|i| format!("struct Line{};", i))
-            .collect::<Vec<_>>()
-            .join("\n");
-        fs.insert_tree(path!("/dir"), json!({"a.rs": file_content}))
-            .await;
-
-        let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let worktree_id = workspace.update(cx, |workspace, cx| {
-            workspace.project().update(cx, |project, cx| {
-                project.worktrees(cx).next().unwrap().read(cx).id()
-            })
-        });
-        let _buffer = project
-            .update(cx, |project, cx| {
-                project.open_local_buffer(path!("/dir/a.rs"), cx)
-            })
-            .await
-            .unwrap();
-        let editor = workspace
-            .update_in(cx, |workspace, window, cx| {
-                workspace.open_path((worktree_id, rel_path("a.rs")), None, true, window, cx)
-            })
-            .await
-            .unwrap()
-            .downcast::<Editor>()
-            .unwrap();
-        let go_to_line_view = open_go_to_line_view(&workspace, cx);
-
-        let scroll_position_before_input =
-            editor.update(cx, |editor, cx| editor.scroll_position(cx));
-        cx.simulate_input("47");
-        let scroll_position_after_input =
-            editor.update(cx, |editor, cx| editor.scroll_position(cx));
-        assert_ne!(scroll_position_before_input, scroll_position_after_input);
-
-        cx.dispatch_action(menu::Confirm);
-        drop(go_to_line_view);
-        cx.run_until_parked();
-
-        let scroll_position_after_confirm =
-            editor.update(cx, |editor, cx| editor.scroll_position(cx));
-        assert_eq!(
-            scroll_position_after_confirm, scroll_position_after_input,
-            "Confirm should maintain new scroll position"
-        );
-    }
-}
diff --git a/crates/google_ai/Cargo.toml b/crates/google_ai/Cargo.toml
deleted file mode 100644
index 81e05e4836..0000000000
--- a/crates/google_ai/Cargo.toml
+++ /dev/null
@@ -1,25 +0,0 @@
-[package]
-name = "google_ai"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/google_ai.rs"
-
-[features]
-schemars = ["dep:schemars"]
-
-[dependencies]
-anyhow.workspace = true
-futures.workspace = true
-http_client.workspace = true
-schemars = { workspace = true, optional = true }
-serde.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-strum.workspace = true
diff --git a/crates/google_ai/LICENSE-GPL b/crates/google_ai/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/google_ai/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/google_ai/src/google_ai.rs b/crates/google_ai/src/google_ai.rs
deleted file mode 100644
index 3eff860e16..0000000000
--- a/crates/google_ai/src/google_ai.rs
+++ /dev/null
@@ -1,717 +0,0 @@
-use std::mem;
-
-use anyhow::{Result, anyhow, bail};
-use futures::{AsyncBufReadExt, AsyncReadExt, StreamExt, io::BufReader, stream::BoxStream};
-use http_client::{AsyncBody, HttpClient, Method, Request as HttpRequest};
-use serde::{Deserialize, Deserializer, Serialize, Serializer};
-pub use settings::ModelMode as GoogleModelMode;
-
-pub const API_URL: &str = "https://generativelanguage.googleapis.com";
-
-pub async fn stream_generate_content(
-    client: &dyn HttpClient,
-    api_url: &str,
-    api_key: &str,
-    mut request: GenerateContentRequest,
-) -> Result<BoxStream<'static, Result<GenerateContentResponse>>> {
-    let api_key = api_key.trim();
-    validate_generate_content_request(&request)?;
-
-    // The `model` field is emptied as it is provided as a path parameter.
-    let model_id = mem::take(&mut request.model.model_id);
-
-    let uri =
-        format!("{api_url}/v1beta/models/{model_id}:streamGenerateContent?alt=sse&key={api_key}",);
-
-    let request_builder = HttpRequest::builder()
-        .method(Method::POST)
-        .uri(uri)
-        .header("Content-Type", "application/json");
-
-    let request = request_builder.body(AsyncBody::from(serde_json::to_string(&request)?))?;
-    let mut response = client.send(request).await?;
-    if response.status().is_success() {
-        let reader = BufReader::new(response.into_body());
-        Ok(reader
-            .lines()
-            .filter_map(|line| async move {
-                match line {
-                    Ok(line) => {
-                        if let Some(line) = line.strip_prefix("data: ") {
-                            match serde_json::from_str(line) {
-                                Ok(response) => Some(Ok(response)),
-                                Err(error) => Some(Err(anyhow!(format!(
-                                    "Error parsing JSON: {error:?}\n{line:?}"
-                                )))),
-                            }
-                        } else {
-                            None
-                        }
-                    }
-                    Err(error) => Some(Err(anyhow!(error))),
-                }
-            })
-            .boxed())
-    } else {
-        let mut text = String::new();
-        response.body_mut().read_to_string(&mut text).await?;
-        Err(anyhow!(
-            "error during streamGenerateContent, status code: {:?}, body: {}",
-            response.status(),
-            text
-        ))
-    }
-}
-
-pub async fn count_tokens(
-    client: &dyn HttpClient,
-    api_url: &str,
-    api_key: &str,
-    request: CountTokensRequest,
-) -> Result<CountTokensResponse> {
-    validate_generate_content_request(&request.generate_content_request)?;
-
-    let uri = format!(
-        "{api_url}/v1beta/models/{model_id}:countTokens?key={api_key}",
-        model_id = &request.generate_content_request.model.model_id,
-    );
-
-    let request = serde_json::to_string(&request)?;
-    let request_builder = HttpRequest::builder()
-        .method(Method::POST)
-        .uri(&uri)
-        .header("Content-Type", "application/json");
-    let http_request = request_builder.body(AsyncBody::from(request))?;
-
-    let mut response = client.send(http_request).await?;
-    let mut text = String::new();
-    response.body_mut().read_to_string(&mut text).await?;
-    anyhow::ensure!(
-        response.status().is_success(),
-        "error during countTokens, status code: {:?}, body: {}",
-        response.status(),
-        text
-    );
-    Ok(serde_json::from_str::<CountTokensResponse>(&text)?)
-}
-
-pub fn validate_generate_content_request(request: &GenerateContentRequest) -> Result<()> {
-    if request.model.is_empty() {
-        bail!("Model must be specified");
-    }
-
-    if request.contents.is_empty() {
-        bail!("Request must contain at least one content item");
-    }
-
-    if let Some(user_content) = request
-        .contents
-        .iter()
-        .find(|content| content.role == Role::User)
-        && user_content.parts.is_empty()
-    {
-        bail!("User content must contain at least one part");
-    }
-
-    Ok(())
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub enum Task {
-    #[serde(rename = "generateContent")]
-    GenerateContent,
-    #[serde(rename = "streamGenerateContent")]
-    StreamGenerateContent,
-    #[serde(rename = "countTokens")]
-    CountTokens,
-    #[serde(rename = "embedContent")]
-    EmbedContent,
-    #[serde(rename = "batchEmbedContents")]
-    BatchEmbedContents,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct GenerateContentRequest {
-    #[serde(default, skip_serializing_if = "ModelName::is_empty")]
-    pub model: ModelName,
-    pub contents: Vec<Content>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub system_instruction: Option<SystemInstruction>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub generation_config: Option<GenerationConfig>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub safety_settings: Option<Vec<SafetySetting>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub tools: Option<Vec<Tool>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub tool_config: Option<ToolConfig>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct GenerateContentResponse {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub candidates: Option<Vec<GenerateContentCandidate>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub prompt_feedback: Option<PromptFeedback>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub usage_metadata: Option<UsageMetadata>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct GenerateContentCandidate {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub index: Option<usize>,
-    pub content: Content,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub finish_reason: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub finish_message: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub safety_ratings: Option<Vec<SafetyRating>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub citation_metadata: Option<CitationMetadata>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Content {
-    #[serde(default)]
-    pub parts: Vec<Part>,
-    pub role: Role,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SystemInstruction {
-    pub parts: Vec<Part>,
-}
-
-#[derive(Debug, PartialEq, Deserialize, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub enum Role {
-    User,
-    Model,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(untagged)]
-pub enum Part {
-    TextPart(TextPart),
-    InlineDataPart(InlineDataPart),
-    FunctionCallPart(FunctionCallPart),
-    FunctionResponsePart(FunctionResponsePart),
-    ThoughtPart(ThoughtPart),
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct TextPart {
-    pub text: String,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct InlineDataPart {
-    pub inline_data: GenerativeContentBlob,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct GenerativeContentBlob {
-    pub mime_type: String,
-    pub data: String,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct FunctionCallPart {
-    pub function_call: FunctionCall,
-    /// Thought signature returned by the model for function calls.
-    /// Only present on the first function call in parallel call scenarios.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub thought_signature: Option<String>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct FunctionResponsePart {
-    pub function_response: FunctionResponse,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ThoughtPart {
-    pub thought: bool,
-    pub thought_signature: String,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct CitationSource {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub start_index: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub end_index: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub uri: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub license: Option<String>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct CitationMetadata {
-    pub citation_sources: Vec<CitationSource>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct PromptFeedback {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub block_reason: Option<String>,
-    pub safety_ratings: Option<Vec<SafetyRating>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub block_reason_message: Option<String>,
-}
-
-#[derive(Debug, Serialize, Deserialize, Default)]
-#[serde(rename_all = "camelCase")]
-pub struct UsageMetadata {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub prompt_token_count: Option<u64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub cached_content_token_count: Option<u64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub candidates_token_count: Option<u64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub tool_use_prompt_token_count: Option<u64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub thoughts_token_count: Option<u64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub total_token_count: Option<u64>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ThinkingConfig {
-    pub thinking_budget: u32,
-}
-
-#[derive(Debug, Deserialize, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct GenerationConfig {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub candidate_count: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub stop_sequences: Option<Vec<String>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub max_output_tokens: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub temperature: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub top_p: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub top_k: Option<usize>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub thinking_config: Option<ThinkingConfig>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SafetySetting {
-    pub category: HarmCategory,
-    pub threshold: HarmBlockThreshold,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub enum HarmCategory {
-    #[serde(rename = "HARM_CATEGORY_UNSPECIFIED")]
-    Unspecified,
-    #[serde(rename = "HARM_CATEGORY_DEROGATORY")]
-    Derogatory,
-    #[serde(rename = "HARM_CATEGORY_TOXICITY")]
-    Toxicity,
-    #[serde(rename = "HARM_CATEGORY_VIOLENCE")]
-    Violence,
-    #[serde(rename = "HARM_CATEGORY_SEXUAL")]
-    Sexual,
-    #[serde(rename = "HARM_CATEGORY_MEDICAL")]
-    Medical,
-    #[serde(rename = "HARM_CATEGORY_DANGEROUS")]
-    Dangerous,
-    #[serde(rename = "HARM_CATEGORY_HARASSMENT")]
-    Harassment,
-    #[serde(rename = "HARM_CATEGORY_HATE_SPEECH")]
-    HateSpeech,
-    #[serde(rename = "HARM_CATEGORY_SEXUALLY_EXPLICIT")]
-    SexuallyExplicit,
-    #[serde(rename = "HARM_CATEGORY_DANGEROUS_CONTENT")]
-    DangerousContent,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
-pub enum HarmBlockThreshold {
-    #[serde(rename = "HARM_BLOCK_THRESHOLD_UNSPECIFIED")]
-    Unspecified,
-    BlockLowAndAbove,
-    BlockMediumAndAbove,
-    BlockOnlyHigh,
-    BlockNone,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
-pub enum HarmProbability {
-    #[serde(rename = "HARM_PROBABILITY_UNSPECIFIED")]
-    Unspecified,
-    Negligible,
-    Low,
-    Medium,
-    High,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SafetyRating {
-    pub category: HarmCategory,
-    pub probability: HarmProbability,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct CountTokensRequest {
-    pub generate_content_request: GenerateContentRequest,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct CountTokensResponse {
-    pub total_tokens: u64,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct FunctionCall {
-    pub name: String,
-    pub args: serde_json::Value,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct FunctionResponse {
-    pub name: String,
-    pub response: serde_json::Value,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Tool {
-    pub function_declarations: Vec<FunctionDeclaration>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ToolConfig {
-    pub function_calling_config: FunctionCallingConfig,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct FunctionCallingConfig {
-    pub mode: FunctionCallingMode,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub allowed_function_names: Option<Vec<String>>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "lowercase")]
-pub enum FunctionCallingMode {
-    Auto,
-    Any,
-    None,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct FunctionDeclaration {
-    pub name: String,
-    pub description: String,
-    pub parameters: serde_json::Value,
-}
-
-#[derive(Debug, Default)]
-pub struct ModelName {
-    pub model_id: String,
-}
-
-impl ModelName {
-    pub fn is_empty(&self) -> bool {
-        self.model_id.is_empty()
-    }
-}
-
-const MODEL_NAME_PREFIX: &str = "models/";
-
-impl Serialize for ModelName {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        serializer.serialize_str(&format!("{MODEL_NAME_PREFIX}{}", &self.model_id))
-    }
-}
-
-impl<'de> Deserialize<'de> for ModelName {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        let string = String::deserialize(deserializer)?;
-        if let Some(id) = string.strip_prefix(MODEL_NAME_PREFIX) {
-            Ok(Self {
-                model_id: id.to_string(),
-            })
-        } else {
-            Err(serde::de::Error::custom(format!(
-                "Expected model name to begin with {}, got: {}",
-                MODEL_NAME_PREFIX, string
-            )))
-        }
-    }
-}
-
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
-#[derive(Clone, Default, Debug, Deserialize, Serialize, PartialEq, Eq, strum::EnumIter)]
-pub enum Model {
-    #[serde(
-        rename = "gemini-2.5-flash-lite",
-        alias = "gemini-2.5-flash-lite-preview-06-17",
-        alias = "gemini-2.0-flash-lite-preview"
-    )]
-    Gemini25FlashLite,
-    #[serde(
-        rename = "gemini-2.5-flash",
-        alias = "gemini-2.0-flash-thinking-exp",
-        alias = "gemini-2.5-flash-preview-04-17",
-        alias = "gemini-2.5-flash-preview-05-20",
-        alias = "gemini-2.5-flash-preview-latest",
-        alias = "gemini-2.0-flash"
-    )]
-    #[default]
-    Gemini25Flash,
-    #[serde(
-        rename = "gemini-2.5-pro",
-        alias = "gemini-2.0-pro-exp",
-        alias = "gemini-2.5-pro-preview-latest",
-        alias = "gemini-2.5-pro-exp-03-25",
-        alias = "gemini-2.5-pro-preview-03-25",
-        alias = "gemini-2.5-pro-preview-05-06",
-        alias = "gemini-2.5-pro-preview-06-05"
-    )]
-    Gemini25Pro,
-    #[serde(rename = "gemini-3-pro-preview")]
-    Gemini3Pro,
-    #[serde(rename = "custom")]
-    Custom {
-        name: String,
-        /// The name displayed in the UI, such as in the assistant panel model dropdown menu.
-        display_name: Option<String>,
-        max_tokens: u64,
-        #[serde(default)]
-        mode: GoogleModelMode,
-    },
-}
-
-impl Model {
-    pub fn default_fast() -> Self {
-        Self::Gemini25FlashLite
-    }
-
-    pub fn id(&self) -> &str {
-        match self {
-            Self::Gemini25FlashLite => "gemini-2.5-flash-lite",
-            Self::Gemini25Flash => "gemini-2.5-flash",
-            Self::Gemini25Pro => "gemini-2.5-pro",
-            Self::Gemini3Pro => "gemini-3-pro-preview",
-            Self::Custom { name, .. } => name,
-        }
-    }
-    pub fn request_id(&self) -> &str {
-        match self {
-            Self::Gemini25FlashLite => "gemini-2.5-flash-lite",
-            Self::Gemini25Flash => "gemini-2.5-flash",
-            Self::Gemini25Pro => "gemini-2.5-pro",
-            Self::Gemini3Pro => "gemini-3-pro-preview",
-            Self::Custom { name, .. } => name,
-        }
-    }
-
-    pub fn display_name(&self) -> &str {
-        match self {
-            Self::Gemini25FlashLite => "Gemini 2.5 Flash-Lite",
-            Self::Gemini25Flash => "Gemini 2.5 Flash",
-            Self::Gemini25Pro => "Gemini 2.5 Pro",
-            Self::Gemini3Pro => "Gemini 3 Pro",
-            Self::Custom {
-                name, display_name, ..
-            } => display_name.as_ref().unwrap_or(name),
-        }
-    }
-
-    pub fn max_token_count(&self) -> u64 {
-        match self {
-            Self::Gemini25FlashLite => 1_048_576,
-            Self::Gemini25Flash => 1_048_576,
-            Self::Gemini25Pro => 1_048_576,
-            Self::Gemini3Pro => 1_048_576,
-            Self::Custom { max_tokens, .. } => *max_tokens,
-        }
-    }
-
-    pub fn max_output_tokens(&self) -> Option<u64> {
-        match self {
-            Model::Gemini25FlashLite => Some(65_536),
-            Model::Gemini25Flash => Some(65_536),
-            Model::Gemini25Pro => Some(65_536),
-            Model::Gemini3Pro => Some(65_536),
-            Model::Custom { .. } => None,
-        }
-    }
-
-    pub fn supports_tools(&self) -> bool {
-        true
-    }
-
-    pub fn supports_images(&self) -> bool {
-        true
-    }
-
-    pub fn mode(&self) -> GoogleModelMode {
-        match self {
-            Self::Gemini25FlashLite
-            | Self::Gemini25Flash
-            | Self::Gemini25Pro
-            | Self::Gemini3Pro => {
-                GoogleModelMode::Thinking {
-                    // By default these models are set to "auto", so we preserve that behavior
-                    // but indicate they are capable of thinking mode
-                    budget_tokens: None,
-                }
-            }
-            Self::Custom { mode, .. } => *mode,
-        }
-    }
-}
-
-impl std::fmt::Display for Model {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.id())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use serde_json::json;
-
-    #[test]
-    fn test_function_call_part_with_signature_serializes_correctly() {
-        let part = FunctionCallPart {
-            function_call: FunctionCall {
-                name: "test_function".to_string(),
-                args: json!({"arg": "value"}),
-            },
-            thought_signature: Some("test_signature".to_string()),
-        };
-
-        let serialized = serde_json::to_value(&part).unwrap();
-
-        assert_eq!(serialized["functionCall"]["name"], "test_function");
-        assert_eq!(serialized["functionCall"]["args"]["arg"], "value");
-        assert_eq!(serialized["thoughtSignature"], "test_signature");
-    }
-
-    #[test]
-    fn test_function_call_part_without_signature_omits_field() {
-        let part = FunctionCallPart {
-            function_call: FunctionCall {
-                name: "test_function".to_string(),
-                args: json!({"arg": "value"}),
-            },
-            thought_signature: None,
-        };
-
-        let serialized = serde_json::to_value(&part).unwrap();
-
-        assert_eq!(serialized["functionCall"]["name"], "test_function");
-        assert_eq!(serialized["functionCall"]["args"]["arg"], "value");
-        // thoughtSignature field should not be present when None
-        assert!(serialized.get("thoughtSignature").is_none());
-    }
-
-    #[test]
-    fn test_function_call_part_deserializes_with_signature() {
-        let json = json!({
-            "functionCall": {
-                "name": "test_function",
-                "args": {"arg": "value"}
-            },
-            "thoughtSignature": "test_signature"
-        });
-
-        let part: FunctionCallPart = serde_json::from_value(json).unwrap();
-
-        assert_eq!(part.function_call.name, "test_function");
-        assert_eq!(part.thought_signature, Some("test_signature".to_string()));
-    }
-
-    #[test]
-    fn test_function_call_part_deserializes_without_signature() {
-        let json = json!({
-            "functionCall": {
-                "name": "test_function",
-                "args": {"arg": "value"}
-            }
-        });
-
-        let part: FunctionCallPart = serde_json::from_value(json).unwrap();
-
-        assert_eq!(part.function_call.name, "test_function");
-        assert_eq!(part.thought_signature, None);
-    }
-
-    #[test]
-    fn test_function_call_part_round_trip() {
-        let original = FunctionCallPart {
-            function_call: FunctionCall {
-                name: "test_function".to_string(),
-                args: json!({"arg": "value", "nested": {"key": "val"}}),
-            },
-            thought_signature: Some("round_trip_signature".to_string()),
-        };
-
-        let serialized = serde_json::to_value(&original).unwrap();
-        let deserialized: FunctionCallPart = serde_json::from_value(serialized).unwrap();
-
-        assert_eq!(deserialized.function_call.name, original.function_call.name);
-        assert_eq!(deserialized.function_call.args, original.function_call.args);
-        assert_eq!(deserialized.thought_signature, original.thought_signature);
-    }
-
-    #[test]
-    fn test_function_call_part_with_empty_signature_serializes() {
-        let part = FunctionCallPart {
-            function_call: FunctionCall {
-                name: "test_function".to_string(),
-                args: json!({"arg": "value"}),
-            },
-            thought_signature: Some("".to_string()),
-        };
-
-        let serialized = serde_json::to_value(&part).unwrap();
-
-        // Empty string should still be serialized (normalization happens at a higher level)
-        assert_eq!(serialized["thoughtSignature"], "");
-    }
-}
diff --git a/crates/http_client/src/http_client.rs b/crates/http_client/src/http_client.rs
index 1182ef74ca..2e814ccdc3 100644
--- a/crates/http_client/src/http_client.rs
+++ b/crates/http_client/src/http_client.rs
@@ -10,7 +10,7 @@ pub use http::{self, Method, Request, Response, StatusCode, Uri, request::Builde
 
 use futures::future::BoxFuture;
 use parking_lot::Mutex;
-use serde::Serialize;
+
 use std::sync::Arc;
 #[cfg(feature = "test-support")]
 use std::{any::type_name, fmt};
@@ -208,63 +208,6 @@ impl HttpClientWithUrl {
         format!("{}{}", self.base_url(), path)
     }
 
-    /// Builds a Zed API URL using the given path.
-    pub fn build_zed_api_url(&self, path: &str, query: &[(&str, &str)]) -> Result<Url> {
-        let base_url = self.base_url();
-        let base_api_url = match base_url.as_ref() {
-            "https://zed.dev" => "https://api.zed.dev",
-            "https://staging.zed.dev" => "https://api-staging.zed.dev",
-            "http://localhost:3000" => "http://localhost:8080",
-            other => other,
-        };
-
-        Ok(Url::parse_with_params(
-            &format!("{}{}", base_api_url, path),
-            query,
-        )?)
-    }
-
-    /// Builds a Zed Cloud URL using the given path.
-    pub fn build_zed_cloud_url(&self, path: &str) -> Result<Url> {
-        let base_url = self.base_url();
-        let base_api_url = match base_url.as_ref() {
-            "https://zed.dev" => "https://cloud.zed.dev",
-            "https://staging.zed.dev" => "https://cloud.zed.dev",
-            "http://localhost:3000" => "http://localhost:8787",
-            other => other,
-        };
-
-        Ok(Url::parse(&format!("{}{}", base_api_url, path))?)
-    }
-
-    /// Builds a Zed Cloud URL using the given path and query params.
-    pub fn build_zed_cloud_url_with_query(&self, path: &str, query: impl Serialize) -> Result<Url> {
-        let base_url = self.base_url();
-        let base_api_url = match base_url.as_ref() {
-            "https://zed.dev" => "https://cloud.zed.dev",
-            "https://staging.zed.dev" => "https://cloud.zed.dev",
-            "http://localhost:3000" => "http://localhost:8787",
-            other => other,
-        };
-        let query = serde_urlencoded::to_string(&query)?;
-        Ok(Url::parse(&format!("{}{}?{}", base_api_url, path, query))?)
-    }
-
-    /// Builds a Zed LLM URL using the given path.
-    pub fn build_zed_llm_url(&self, path: &str, query: &[(&str, &str)]) -> Result<Url> {
-        let base_url = self.base_url();
-        let base_api_url = match base_url.as_ref() {
-            "https://zed.dev" => "https://cloud.zed.dev",
-            "https://staging.zed.dev" => "https://llm-staging.zed.dev",
-            "http://localhost:3000" => "http://localhost:8787",
-            other => other,
-        };
-
-        Ok(Url::parse_with_params(
-            &format!("{}{}", base_api_url, path),
-            query,
-        )?)
-    }
 }
 
 impl HttpClient for HttpClientWithUrl {
diff --git a/crates/icons/Cargo.toml b/crates/icons/Cargo.toml
deleted file mode 100644
index fc00165843..0000000000
--- a/crates/icons/Cargo.toml
+++ /dev/null
@@ -1,16 +0,0 @@
-[package]
-name = "icons"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/icons.rs"
-
-[dependencies]
-serde.workspace = true
-strum.workspace = true
diff --git a/crates/icons/LICENSE-GPL b/crates/icons/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/icons/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/icons/README.md b/crates/icons/README.md
deleted file mode 100644
index e340a00277..0000000000
--- a/crates/icons/README.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# Zed Icons
-
-## Guidelines
-
-Icons are a big part of Zed, and they're how we convey hundreds of actions without relying on labeled buttons.
-When introducing a new icon, it's important to ensure consistency with the existing set, which follows these guidelines:
-
-1. The SVG view box should be 16x16.
-2. For outlined icons, use a 1.2px stroke width.
-3. Not all icons are mathematically aligned; there's quite a bit of optical adjustment. However, try to keep the icon within an internal 12x12 bounding box as much as possible while ensuring proper visibility.
-4. Use the `filled` and `outlined` terminology when introducing icons that will have these two variants.
-5. Icons that are deeply contextual may have the feature context as their name prefix. For example, `ToolWeb`, `ReplPlay`, `DebugStepInto`, etc.
-6. Avoid complex layer structures in the icon SVG, like clipping masks and similar elements. When the shape becomes too complex, we recommend running the SVG through [SVGOMG](https://jakearchibald.github.io/svgomg/) to clean it up.
-
-## Sourcing
-
-Most icons are created by sourcing them from [Lucide](https://lucide.dev/).
-Then, they're modified, adjusted, cleaned up, and simplified depending on their use and overall fit with Zed.
-
-Sometimes, we may use other sources like [Phosphor](https://phosphoricons.com/), but we also design many icons completely from scratch.
-
-## Contributing
-
-To introduce a new icon, add the `.svg` file to the `assets/icon` directory and then add its corresponding item to the `icons.rs` file within the `crates` directory.
-
-- SVG files in the assets folder follow a snake_case name format.
-- Icons in the `icons.rs` file follow the PascalCase name format.
-
-Make sure to tag a member of Zed's design team so we can review and adjust any newly introduced icon.
diff --git a/crates/icons/src/icons.rs b/crates/icons/src/icons.rs
deleted file mode 100644
index bf4c74f984..0000000000
--- a/crates/icons/src/icons.rs
+++ /dev/null
@@ -1,282 +0,0 @@
-use std::sync::Arc;
-
-use serde::{Deserialize, Serialize};
-use strum::{EnumIter, EnumString, IntoStaticStr};
-
-#[derive(
-    Debug, PartialEq, Eq, Copy, Clone, EnumIter, EnumString, IntoStaticStr, Serialize, Deserialize,
-)]
-#[strum(serialize_all = "snake_case")]
-pub enum IconName {
-    Ai,
-    AiAnthropic,
-    AiBedrock,
-    AiClaude,
-    AiDeepSeek,
-    AiEdit,
-    AiGemini,
-    AiGoogle,
-    AiLmStudio,
-    AiMistral,
-    AiOllama,
-    AiOpenAi,
-    AiOpenAiCompat,
-    AiOpenRouter,
-    AiVZero,
-    AiXAi,
-    AiZed,
-    ArrowCircle,
-    ArrowDown,
-    ArrowDown10,
-    ArrowDownRight,
-    ArrowLeft,
-    ArrowRight,
-    ArrowRightLeft,
-    ArrowUp,
-    ArrowUpRight,
-    AtSign,
-    Attach,
-    AudioOff,
-    AudioOn,
-    Backspace,
-    Bell,
-    BellDot,
-    BellOff,
-    BellRing,
-    Binary,
-    Blocks,
-    BoltFilled,
-    BoltOutlined,
-    Book,
-    BookCopy,
-    Box,
-    CaseSensitive,
-    Chat,
-    Check,
-    CheckDouble,
-    ChevronDown,
-    ChevronDownUp,
-    ChevronLeft,
-    ChevronRight,
-    ChevronUp,
-    ChevronUpDown,
-    Circle,
-    CircleHelp,
-    Close,
-    CloudDownload,
-    Code,
-    Cog,
-    Command,
-    Control,
-    Copilot,
-    CopilotDisabled,
-    CopilotError,
-    CopilotInit,
-    Copy,
-    CountdownTimer,
-    Crosshair,
-    CursorIBeam,
-    Dash,
-    DatabaseZap,
-    Debug,
-    DebugBreakpoint,
-    DebugContinue,
-    DebugDetach,
-    DebugDisabledBreakpoint,
-    DebugDisabledLogBreakpoint,
-    DebugIgnoreBreakpoints,
-    DebugLogBreakpoint,
-    DebugPause,
-    DebugStepInto,
-    DebugStepOut,
-    DebugStepOver,
-    Diff,
-    Disconnected,
-    Download,
-    EditorAtom,
-    EditorCursor,
-    EditorEmacs,
-    EditorJetBrains,
-    EditorSublime,
-    EditorVsCode,
-    Ellipsis,
-    EllipsisVertical,
-    Envelope,
-    Eraser,
-    Escape,
-    Exit,
-    ExpandDown,
-    ExpandUp,
-    ExpandVertical,
-    Eye,
-    File,
-    FileCode,
-    FileDiff,
-    FileDoc,
-    FileGeneric,
-    FileGit,
-    FileLock,
-    FileMarkdown,
-    FileRust,
-    FileTextFilled,
-    FileTextOutlined,
-    FileToml,
-    FileTree,
-    Filter,
-    Flame,
-    Folder,
-    FolderOpen,
-    FolderSearch,
-    Font,
-    FontSize,
-    FontWeight,
-    ForwardArrow,
-    GenericClose,
-    GenericMaximize,
-    GenericMinimize,
-    GenericRestore,
-    GitBranch,
-    GitBranchAlt,
-    GitBranchPlus,
-    Github,
-    Hash,
-    HistoryRerun,
-    Image,
-    Inception,
-    Indicator,
-    Info,
-    Json,
-    Keyboard,
-    Library,
-    LineHeight,
-    Link,
-    Linux,
-    ListCollapse,
-    ListFilter,
-    ListTodo,
-    ListTree,
-    ListX,
-    LoadCircle,
-    LocationEdit,
-    LockOutlined,
-    MagnifyingGlass,
-    Maximize,
-    Menu,
-    MenuAlt,
-    MenuAltTemp,
-    Mic,
-    MicMute,
-    Minimize,
-    Notepad,
-    Option,
-    PageDown,
-    PageUp,
-    Paperclip,
-    Pencil,
-    PencilUnavailable,
-    Person,
-    Pin,
-    PlayFilled,
-    PlayOutlined,
-    Plus,
-    Power,
-    Public,
-    PullRequest,
-    Quote,
-    Reader,
-    RefreshTitle,
-    Regex,
-    ReplNeutral,
-    Replace,
-    ReplaceAll,
-    ReplaceNext,
-    ReplyArrowRight,
-    Rerun,
-    Return,
-    RotateCcw,
-    RotateCw,
-    Scissors,
-    Screen,
-    SelectAll,
-    Send,
-    Server,
-    Settings,
-    ShieldCheck,
-    Shift,
-    Slash,
-    Sliders,
-    Space,
-    Sparkle,
-    Split,
-    SplitAlt,
-    SquareDot,
-    SquareMinus,
-    SquarePlus,
-    Star,
-    StarFilled,
-    Stop,
-    Supermaven,
-    SupermavenDisabled,
-    SupermavenError,
-    SupermavenInit,
-    SwatchBook,
-    SweepAi,
-    Tab,
-    Terminal,
-    TerminalAlt,
-    TerminalGhost,
-    TextSnippet,
-    TextThread,
-    Thread,
-    ThreadFromSummary,
-    ThumbsDown,
-    ThumbsUp,
-    TodoComplete,
-    TodoPending,
-    TodoProgress,
-    ToolCopy,
-    ToolDeleteFile,
-    ToolDiagnostics,
-    ToolFolder,
-    ToolHammer,
-    ToolNotification,
-    ToolPencil,
-    ToolRead,
-    ToolRegex,
-    ToolSearch,
-    ToolTerminal,
-    ToolThink,
-    ToolWeb,
-    Trash,
-    Triangle,
-    TriangleRight,
-    Undo,
-    Unpin,
-    UserCheck,
-    UserGroup,
-    UserRoundPen,
-    Warning,
-    WholeWord,
-    XCircle,
-    XCircleFilled,
-    ZedAgent,
-    ZedAssistant,
-    ZedBurnMode,
-    ZedBurnModeOn,
-    ZedPredict,
-    ZedPredictDisabled,
-    ZedPredictDown,
-    ZedPredictError,
-    ZedPredictUp,
-    ZedSrcCustom,
-    ZedSrcExtension,
-    ZedXCopilot,
-}
-
-impl IconName {
-    /// Returns the path to this icon.
-    pub fn path(&self) -> Arc<str> {
-        let file_stem: &'static str = self.into();
-        format!("icons/{file_stem}.svg").into()
-    }
-}
diff --git a/crates/image_viewer/Cargo.toml b/crates/image_viewer/Cargo.toml
deleted file mode 100644
index 92386e8ba8..0000000000
--- a/crates/image_viewer/Cargo.toml
+++ /dev/null
@@ -1,35 +0,0 @@
-[package]
-name = "image_viewer"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/image_viewer.rs"
-doctest = false
-
-[features]
-test-support = ["gpui/test-support", "editor/test-support"]
-
-[dependencies]
-anyhow.workspace = true
-db.workspace = true
-editor.workspace = true
-file_icons.workspace = true
-gpui.workspace = true
-language.workspace = true
-log.workspace = true
-project.workspace = true
-serde.workspace = true
-settings.workspace = true
-theme.workspace = true
-ui.workspace = true
-util.workspace = true
-workspace.workspace = true
-
-[dev-dependencies]
-editor = { workspace = true, features = ["test-support"] }
diff --git a/crates/image_viewer/LICENSE-GPL b/crates/image_viewer/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/image_viewer/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/image_viewer/src/image_info.rs b/crates/image_viewer/src/image_info.rs
deleted file mode 100644
index 6eedb13ed1..0000000000
--- a/crates/image_viewer/src/image_info.rs
+++ /dev/null
@@ -1,105 +0,0 @@
-use gpui::{Context, Entity, IntoElement, ParentElement, Render, Subscription, div};
-use project::image_store::{ImageFormat, ImageMetadata};
-use settings::Settings;
-use ui::prelude::*;
-use util::size::format_file_size;
-use workspace::{ItemHandle, StatusItemView, Workspace};
-
-use crate::{ImageFileSizeUnit, ImageView, ImageViewerSettings};
-
-pub struct ImageInfo {
-    metadata: Option<ImageMetadata>,
-    _observe_active_image: Option<Subscription>,
-    observe_image_item: Option<Subscription>,
-}
-
-impl ImageInfo {
-    pub fn new(_workspace: &Workspace) -> Self {
-        Self {
-            metadata: None,
-            _observe_active_image: None,
-            observe_image_item: None,
-        }
-    }
-
-    fn update_metadata(&mut self, image_view: &Entity<ImageView>, cx: &mut Context<Self>) {
-        let image_item = image_view.read(cx).image_item.clone();
-        let current_metadata = image_item.read(cx).image_metadata;
-        if current_metadata.is_some() {
-            self.metadata = current_metadata;
-            cx.notify();
-        } else {
-            self.observe_image_item = Some(cx.observe(&image_item, |this, item, cx| {
-                this.metadata = item.read(cx).image_metadata;
-                cx.notify();
-            }));
-        }
-    }
-}
-
-fn format_image_size(size: u64, image_unit_type: ImageFileSizeUnit) -> String {
-    let use_decimal = matches!(image_unit_type, ImageFileSizeUnit::Decimal);
-    format_file_size(size, use_decimal)
-}
-
-impl Render for ImageInfo {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let settings = ImageViewerSettings::get_global(cx);
-
-        let Some(metadata) = self.metadata.as_ref() else {
-            return div().hidden();
-        };
-
-        let mut components = Vec::new();
-        components.push(format!("{}x{}", metadata.width, metadata.height));
-        components.push(format_image_size(metadata.file_size, settings.unit));
-
-        if let Some(colors) = metadata.colors {
-            components.push(format!(
-                "{} channels, {} bits per pixel",
-                colors.channels,
-                colors.bits_per_pixel()
-            ));
-        }
-
-        components.push(
-            match metadata.format {
-                ImageFormat::Png => "PNG",
-                ImageFormat::Jpeg => "JPEG",
-                ImageFormat::Gif => "GIF",
-                ImageFormat::WebP => "WebP",
-                ImageFormat::Tiff => "TIFF",
-                ImageFormat::Bmp => "BMP",
-                ImageFormat::Ico => "ICO",
-                ImageFormat::Avif => "Avif",
-                _ => "Unknown",
-            }
-            .to_string(),
-        );
-
-        div().child(Label::new(components.join(" • ")).size(LabelSize::Small))
-    }
-}
-
-impl StatusItemView for ImageInfo {
-    fn set_active_pane_item(
-        &mut self,
-        active_pane_item: Option<&dyn ItemHandle>,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self._observe_active_image = None;
-        self.observe_image_item = None;
-
-        if let Some(image_view) = active_pane_item.and_then(|item| item.act_as::<ImageView>(cx)) {
-            self.update_metadata(&image_view, cx);
-
-            self._observe_active_image = Some(cx.observe(&image_view, |this, view, cx| {
-                this.update_metadata(&view, cx);
-            }));
-        } else {
-            self.metadata = None;
-        }
-        cx.notify();
-    }
-}
diff --git a/crates/image_viewer/src/image_viewer.rs b/crates/image_viewer/src/image_viewer.rs
deleted file mode 100644
index d7c2341723..0000000000
--- a/crates/image_viewer/src/image_viewer.rs
+++ /dev/null
@@ -1,470 +0,0 @@
-mod image_info;
-mod image_viewer_settings;
-
-use std::path::Path;
-
-use anyhow::Context as _;
-use editor::{EditorSettings, items::entry_git_aware_label_color};
-use file_icons::FileIcons;
-use gpui::{
-    AnyElement, App, Bounds, Context, Entity, EventEmitter, FocusHandle, Focusable,
-    InteractiveElement, IntoElement, ObjectFit, ParentElement, Render, Styled, Task, WeakEntity,
-    Window, canvas, div, fill, img, opaque_grey, point, size,
-};
-use language::{DiskState, File as _};
-use persistence::IMAGE_VIEWER;
-use project::{ImageItem, Project, ProjectPath, image_store::ImageItemEvent};
-use settings::Settings;
-use theme::{Theme, ThemeSettings};
-use ui::prelude::*;
-use util::paths::PathExt;
-use workspace::{
-    ItemId, ItemSettings, Pane, ToolbarItemLocation, Workspace, WorkspaceId, delete_unloaded_items,
-    invalid_item_view::InvalidItemView,
-    item::{BreadcrumbText, Item, ProjectItem, SerializableItem, TabContentParams},
-};
-
-pub use crate::image_info::*;
-pub use crate::image_viewer_settings::*;
-
-pub struct ImageView {
-    image_item: Entity<ImageItem>,
-    project: Entity<Project>,
-    focus_handle: FocusHandle,
-}
-
-impl ImageView {
-    pub fn new(
-        image_item: Entity<ImageItem>,
-        project: Entity<Project>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        cx.subscribe(&image_item, Self::on_image_event).detach();
-        cx.on_release_in(window, |this, window, cx| {
-            let image_data = this.image_item.read(cx).image.clone();
-            if let Some(image) = image_data.clone().get_render_image(window, cx) {
-                cx.drop_image(image, None);
-            }
-            image_data.remove_asset(cx);
-        })
-        .detach();
-
-        Self {
-            image_item,
-            project,
-            focus_handle: cx.focus_handle(),
-        }
-    }
-
-    fn on_image_event(
-        &mut self,
-        _: Entity<ImageItem>,
-        event: &ImageItemEvent,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            ImageItemEvent::MetadataUpdated
-            | ImageItemEvent::FileHandleChanged
-            | ImageItemEvent::Reloaded => {
-                cx.emit(ImageViewEvent::TitleChanged);
-                cx.notify();
-            }
-            ImageItemEvent::ReloadNeeded => {}
-        }
-    }
-}
-
-pub enum ImageViewEvent {
-    TitleChanged,
-}
-
-impl EventEmitter<ImageViewEvent> for ImageView {}
-
-impl Item for ImageView {
-    type Event = ImageViewEvent;
-
-    fn to_item_events(event: &Self::Event, mut f: impl FnMut(workspace::item::ItemEvent)) {
-        match event {
-            ImageViewEvent::TitleChanged => {
-                f(workspace::item::ItemEvent::UpdateTab);
-                f(workspace::item::ItemEvent::UpdateBreadcrumbs);
-            }
-        }
-    }
-
-    fn for_each_project_item(
-        &self,
-        cx: &App,
-        f: &mut dyn FnMut(gpui::EntityId, &dyn project::ProjectItem),
-    ) {
-        f(self.image_item.entity_id(), self.image_item.read(cx))
-    }
-
-    fn tab_tooltip_text(&self, cx: &App) -> Option<SharedString> {
-        let abs_path = self.image_item.read(cx).abs_path(cx)?;
-        let file_path = abs_path.compact().to_string_lossy().into_owned();
-        Some(file_path.into())
-    }
-
-    fn tab_content(&self, params: TabContentParams, _window: &Window, cx: &App) -> AnyElement {
-        let project_path = self.image_item.read(cx).project_path(cx);
-
-        let label_color = if ItemSettings::get_global(cx).git_status {
-            let git_status = self
-                .project
-                .read(cx)
-                .project_path_git_status(&project_path, cx)
-                .map(|status| status.summary())
-                .unwrap_or_default();
-
-            self.project
-                .read(cx)
-                .entry_for_path(&project_path, cx)
-                .map(|entry| {
-                    entry_git_aware_label_color(git_status, entry.is_ignored, params.selected)
-                })
-                .unwrap_or_else(|| params.text_color())
-        } else {
-            params.text_color()
-        };
-
-        Label::new(self.tab_content_text(params.detail.unwrap_or_default(), cx))
-            .single_line()
-            .color(label_color)
-            .when(params.preview, |this| this.italic())
-            .into_any_element()
-    }
-
-    fn tab_content_text(&self, _: usize, cx: &App) -> SharedString {
-        self.image_item
-            .read(cx)
-            .file
-            .file_name(cx)
-            .to_string()
-            .into()
-    }
-
-    fn tab_icon(&self, _: &Window, cx: &App) -> Option<Icon> {
-        let path = self.image_item.read(cx).abs_path(cx)?;
-        ItemSettings::get_global(cx)
-            .file_icons
-            .then(|| FileIcons::get_icon(&path, cx))
-            .flatten()
-            .map(Icon::from_path)
-    }
-
-    fn breadcrumb_location(&self, cx: &App) -> ToolbarItemLocation {
-        let show_breadcrumb = EditorSettings::get_global(cx).toolbar.breadcrumbs;
-        if show_breadcrumb {
-            ToolbarItemLocation::PrimaryLeft
-        } else {
-            ToolbarItemLocation::Hidden
-        }
-    }
-
-    fn breadcrumbs(&self, _theme: &Theme, cx: &App) -> Option<Vec<BreadcrumbText>> {
-        let text = breadcrumbs_text_for_image(self.project.read(cx), self.image_item.read(cx), cx);
-        let settings = ThemeSettings::get_global(cx);
-
-        Some(vec![BreadcrumbText {
-            text,
-            highlights: None,
-            font: Some(settings.buffer_font.clone()),
-        }])
-    }
-
-    fn can_split(&self) -> bool {
-        true
-    }
-
-    fn clone_on_split(
-        &self,
-        _workspace_id: Option<WorkspaceId>,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Option<Entity<Self>>>
-    where
-        Self: Sized,
-    {
-        Task::ready(Some(cx.new(|cx| Self {
-            image_item: self.image_item.clone(),
-            project: self.project.clone(),
-            focus_handle: cx.focus_handle(),
-        })))
-    }
-
-    fn has_deleted_file(&self, cx: &App) -> bool {
-        self.image_item.read(cx).file.disk_state() == DiskState::Deleted
-    }
-    fn buffer_kind(&self, _: &App) -> workspace::item::ItemBufferKind {
-        workspace::item::ItemBufferKind::Singleton
-    }
-}
-
-fn breadcrumbs_text_for_image(project: &Project, image: &ImageItem, cx: &App) -> String {
-    let mut path = image.file.path().clone();
-    if project.visible_worktrees(cx).count() > 1
-        && let Some(worktree) = project.worktree_for_id(image.project_path(cx).worktree_id, cx)
-    {
-        path = worktree.read(cx).root_name().join(&path);
-    }
-
-    path.display(project.path_style(cx)).to_string()
-}
-
-impl SerializableItem for ImageView {
-    fn serialized_item_kind() -> &'static str {
-        "ImageView"
-    }
-
-    fn deserialize(
-        project: Entity<Project>,
-        _workspace: WeakEntity<Workspace>,
-        workspace_id: WorkspaceId,
-        item_id: ItemId,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<anyhow::Result<Entity<Self>>> {
-        window.spawn(cx, async move |cx| {
-            let image_path = IMAGE_VIEWER
-                .get_image_path(item_id, workspace_id)?
-                .context("No image path found")?;
-
-            let (worktree, relative_path) = project
-                .update(cx, |project, cx| {
-                    project.find_or_create_worktree(image_path.clone(), false, cx)
-                })?
-                .await
-                .context("Path not found")?;
-            let worktree_id = worktree.update(cx, |worktree, _cx| worktree.id())?;
-
-            let project_path = ProjectPath {
-                worktree_id,
-                path: relative_path,
-            };
-
-            let image_item = project
-                .update(cx, |project, cx| project.open_image(project_path, cx))?
-                .await?;
-
-            cx.update(
-                |window, cx| Ok(cx.new(|cx| ImageView::new(image_item, project, window, cx))),
-            )?
-        })
-    }
-
-    fn cleanup(
-        workspace_id: WorkspaceId,
-        alive_items: Vec<ItemId>,
-        _window: &mut Window,
-        cx: &mut App,
-    ) -> Task<anyhow::Result<()>> {
-        delete_unloaded_items(
-            alive_items,
-            workspace_id,
-            "image_viewers",
-            &IMAGE_VIEWER,
-            cx,
-        )
-    }
-
-    fn serialize(
-        &mut self,
-        workspace: &mut Workspace,
-        item_id: ItemId,
-        _closing: bool,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Task<anyhow::Result<()>>> {
-        let workspace_id = workspace.database_id()?;
-        let image_path = self.image_item.read(cx).abs_path(cx)?;
-
-        Some(cx.background_spawn({
-            async move {
-                log::debug!("Saving image at path {image_path:?}");
-                IMAGE_VIEWER
-                    .save_image_path(item_id, workspace_id, image_path)
-                    .await
-            }
-        }))
-    }
-
-    fn should_serialize(&self, _event: &Self::Event) -> bool {
-        false
-    }
-}
-
-impl EventEmitter<()> for ImageView {}
-impl Focusable for ImageView {
-    fn focus_handle(&self, _cx: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl Render for ImageView {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let image = self.image_item.read(cx).image.clone();
-        let checkered_background =
-            |bounds: Bounds<Pixels>, _, window: &mut Window, _cx: &mut App| {
-                let square_size: f32 = 32.0;
-
-                let start_y = bounds.origin.y.into();
-                let height: f32 = bounds.size.height.into();
-                let start_x = bounds.origin.x.into();
-                let width: f32 = bounds.size.width.into();
-
-                let mut y = start_y;
-                let mut x = start_x;
-                let mut color_swapper = true;
-                // draw checkerboard pattern
-                while y < start_y + height {
-                    // Keeping track of the grid in order to be resilient to resizing
-                    let start_swap = color_swapper;
-                    while x < start_x + width {
-                        // Clamp square dimensions to not exceed bounds
-                        let square_width = square_size.min(start_x + width - x);
-                        let square_height = square_size.min(start_y + height - y);
-
-                        let rect = Bounds::new(
-                            point(px(x), px(y)),
-                            size(px(square_width), px(square_height)),
-                        );
-
-                        let color = if color_swapper {
-                            opaque_grey(0.6, 0.4)
-                        } else {
-                            opaque_grey(0.7, 0.4)
-                        };
-
-                        window.paint_quad(fill(rect, color));
-                        color_swapper = !color_swapper;
-                        x += square_size;
-                    }
-                    x = start_x;
-                    color_swapper = !start_swap;
-                    y += square_size;
-                }
-            };
-
-        div().track_focus(&self.focus_handle(cx)).size_full().child(
-            div()
-                .flex()
-                .justify_center()
-                .items_center()
-                .w_full()
-                // TODO: In browser based Tailwind & Flex this would be h-screen and we'd use w-full
-                .h_full()
-                .child(
-                    div()
-                        .relative()
-                        .max_w_full()
-                        .max_h_full()
-                        .child(
-                            canvas(|_, _, _| (), checkered_background)
-                                .border_2()
-                                .border_color(cx.theme().styles.colors.border)
-                                .size_full()
-                                .absolute()
-                                .top_0()
-                                .left_0(),
-                        )
-                        .child(
-                            img(image)
-                                .object_fit(ObjectFit::ScaleDown)
-                                .max_w_full()
-                                .max_h_full()
-                                .id("img"),
-                        ),
-                ),
-        )
-    }
-}
-
-impl ProjectItem for ImageView {
-    type Item = ImageItem;
-
-    fn for_project_item(
-        project: Entity<Project>,
-        _: Option<&Pane>,
-        item: Entity<Self::Item>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self
-    where
-        Self: Sized,
-    {
-        Self::new(item, project, window, cx)
-    }
-
-    fn for_broken_project_item(
-        abs_path: &Path,
-        is_local: bool,
-        e: &anyhow::Error,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<InvalidItemView>
-    where
-        Self: Sized,
-    {
-        Some(InvalidItemView::new(abs_path, is_local, e, window, cx))
-    }
-}
-
-pub fn init(cx: &mut App) {
-    workspace::register_project_item::<ImageView>(cx);
-    workspace::register_serializable_item::<ImageView>(cx);
-}
-
-mod persistence {
-    use std::path::PathBuf;
-
-    use db::{
-        query,
-        sqlez::{domain::Domain, thread_safe_connection::ThreadSafeConnection},
-        sqlez_macros::sql,
-    };
-    use workspace::{ItemId, WorkspaceDb, WorkspaceId};
-
-    pub struct ImageViewerDb(ThreadSafeConnection);
-
-    impl Domain for ImageViewerDb {
-        const NAME: &str = stringify!(ImageViewerDb);
-
-        const MIGRATIONS: &[&str] = &[sql!(
-                CREATE TABLE image_viewers (
-                    workspace_id INTEGER,
-                    item_id INTEGER UNIQUE,
-
-                    image_path BLOB,
-
-                    PRIMARY KEY(workspace_id, item_id),
-                    FOREIGN KEY(workspace_id) REFERENCES workspaces(workspace_id)
-                    ON DELETE CASCADE
-                ) STRICT;
-        )];
-    }
-
-    db::static_connection!(IMAGE_VIEWER, ImageViewerDb, [WorkspaceDb]);
-
-    impl ImageViewerDb {
-        query! {
-            pub async fn save_image_path(
-                item_id: ItemId,
-                workspace_id: WorkspaceId,
-                image_path: PathBuf
-            ) -> Result<()> {
-                INSERT OR REPLACE INTO image_viewers(item_id, workspace_id, image_path)
-                VALUES (?, ?, ?)
-            }
-        }
-
-        query! {
-            pub fn get_image_path(item_id: ItemId, workspace_id: WorkspaceId) -> Result<Option<PathBuf>> {
-                SELECT image_path
-                FROM image_viewers
-                WHERE item_id = ? AND workspace_id = ?
-            }
-        }
-    }
-}
diff --git a/crates/image_viewer/src/image_viewer_settings.rs b/crates/image_viewer/src/image_viewer_settings.rs
deleted file mode 100644
index c490d1c46f..0000000000
--- a/crates/image_viewer/src/image_viewer_settings.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-pub use settings::ImageFileSizeUnit;
-use settings::{RegisterSetting, Settings};
-
-/// The settings for the image viewer.
-#[derive(Clone, Debug, Default, RegisterSetting)]
-pub struct ImageViewerSettings {
-    /// The unit to use for displaying image file sizes.
-    ///
-    /// Default: "binary"
-    pub unit: ImageFileSizeUnit,
-}
-
-impl Settings for ImageViewerSettings {
-    fn from_settings(content: &settings::SettingsContent) -> Self {
-        Self {
-            unit: content.image_viewer.clone().unwrap().unit.unwrap(),
-        }
-    }
-}
diff --git a/crates/inspector_ui/Cargo.toml b/crates/inspector_ui/Cargo.toml
deleted file mode 100644
index aaf40b2f8d..0000000000
--- a/crates/inspector_ui/Cargo.toml
+++ /dev/null
@@ -1,30 +0,0 @@
-[package]
-name = "inspector_ui"
-version = "0.1.0"
-publish.workspace = true
-edition.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/inspector_ui.rs"
-
-[dependencies]
-anyhow.workspace = true
-command_palette_hooks.workspace = true
-editor.workspace = true
-fuzzy.workspace = true
-gpui.workspace = true
-language.workspace = true
-project.workspace = true
-serde_json.workspace = true
-serde_json_lenient.workspace = true
-theme.workspace = true
-title_bar.workspace = true
-ui.workspace = true
-util.workspace = true
-util_macros.workspace = true
-workspace.workspace = true
-zed_actions.workspace = true
diff --git a/crates/inspector_ui/LICENSE-GPL b/crates/inspector_ui/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/inspector_ui/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/inspector_ui/README.md b/crates/inspector_ui/README.md
deleted file mode 100644
index 74886e6111..0000000000
--- a/crates/inspector_ui/README.md
+++ /dev/null
@@ -1,112 +0,0 @@
-# Inspector
-
-This is a tool for inspecting and manipulating rendered elements in Zed. It is only available in debug builds. Use the `dev::ToggleInspector` action to toggle inspector mode and click on UI elements to inspect them.
-
-# Current features
-
-* Picking of elements via the mouse, with scroll wheel to inspect occluded elements.
-
-* Temporary manipulation of the selected element.
-
-* Layout info for `Div`.
-
-* Both Rust and JSON-based style manipulation of `Div` style. The rust style editor only supports argumentless `Styled` and `StyledExt` method calls.
-
-* Navigation to code that constructed the element.
-
-# Known bugs
-
-## JSON style editor undo history doesn't get reset
-
-The JSON style editor appends to its undo stack on every change of the active inspected element.
-
-I attempted to fix it by creating a new buffer and setting the buffer associated with the `json_style_buffer` entity. Unfortunately this doesn't work because the language server uses the `version: clock::Global` to figure out the changes, so would need some way to start the new buffer's text at that version.
-
-```
-        json_style_buffer.update(cx, |json_style_buffer, cx| {
-            let language = json_style_buffer.language().cloned();
-            let file = json_style_buffer.file().cloned();
-
-            *json_style_buffer = Buffer::local("", cx);
-
-            json_style_buffer.set_language(language, cx);
-            if let Some(file) = file {
-                json_style_buffer.file_updated(file, cx);
-            }
-        });
-```
-
-# Future features
-
-* Action and keybinding for entering pick mode.
-
-* Ability to highlight current element after it's been picked.
-
-* Info and manipulation of element types other than `Div`.
-
-* Indicate when the picked element has disappeared.
-
-* To inspect elements that disappear, it would be helpful to be able to pause the UI.
-
-* Hierarchy view?
-
-## Methods that take arguments in Rust style editor
-
-Could use TreeSitter to parse out the fluent style method chain and arguments. Tricky part of this is completions - ideally the Rust Analyzer already being used by the developer's Zed would be used.
-
-## Edit original code in Rust style editor
-
-Two approaches:
-
-1. Open an excerpt of the original file.
-
-2. Communicate with the Zed process that has the repo open - it would send the code for the element. This seems like a lot of work, but would be very nice for rapid development, and it would allow use of rust analyzer.
-
-With both approaches, would need to record the buffer version and use that when referring to source locations, since editing elements can cause code layout shift.
-
-## Source location UI improvements
-
-* Mode to navigate to source code on every element change while picking.
-
-* Tracking of more source locations - currently the source location is often in a ui component. Ideally this would have a way for the components to indicate that they are probably not the source location the user is looking for.
-
-  - Could have `InspectorElementId` be `Vec<(ElementId, Option<Location>)>`, but if there are multiple code paths that construct the same element this would cause them to be considered different.
-
-  - Probably better to have a separate `Vec<Option<Location>>` that uses the same indices as `GlobalElementId`.
-
-## Persistent modification
-
-Currently, element modifications disappear when picker mode is started. Handling this well is tricky. Potential features:
-
-* Support modifying multiple elements at once. This requires a way to specify which elements are modified - possibly wildcards in a match of the `InspectorElementId` path. This might default to ignoring all numeric parts and just matching on the names.
-
-* Show a list of active modifications in the UI.
-
-* Support for modifications being partial overrides instead of snapshots. A trickiness here is that multiple modifications may apply to the same element.
-
-* The code should probably distinguish the data that is provided by the element and the modifications from the inspector. Currently these are conflated in element states.
-
-If support is added for editing original code, then the logical selector in this case would be just matches of the source path.
-
-# Code cleanups
-
-## Consider removing special side pane rendering
-
-Currently the inspector has special rendering in the UI, but maybe it could just be a workspace item.
-
-## Pull more inspector logic out of GPUI
-
-Currently `crates/gpui/inspector.rs` and `crates/inspector_ui/inspector.rs` are quite entangled.  It seems cleaner to pull as much logic a possible out of GPUI.
-
-## Cleaner lifecycle for inspector state viewers / editors
-
-Currently element state inspectors are just called on render. Ideally instead they would be implementors of some trait like:
-
-```
-trait StateInspector: Render {
-    fn new(cx: &mut App) -> Task<Self>;
-    fn element_changed(inspector_id: &InspectorElementId, window: &mut Window, cx: &mut App);
-}
-```
-
-See `div_inspector.rs` - it needs to initialize itself, keep track of its own loading state, and keep track of the last inspected ID in its render function.
diff --git a/crates/inspector_ui/build.rs b/crates/inspector_ui/build.rs
deleted file mode 100644
index e7d393b5ef..0000000000
--- a/crates/inspector_ui/build.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-fn main() {
-    let cargo_manifest_dir = std::env::var("CARGO_MANIFEST_DIR").unwrap();
-    let mut path = std::path::PathBuf::from(&cargo_manifest_dir);
-
-    if path.file_name().as_ref().and_then(|name| name.to_str()) != Some("inspector_ui") {
-        panic!(
-            "expected CARGO_MANIFEST_DIR to end with crates/inspector_ui, but got {cargo_manifest_dir}"
-        );
-    }
-    path.pop();
-
-    if path.file_name().as_ref().and_then(|name| name.to_str()) != Some("crates") {
-        panic!(
-            "expected CARGO_MANIFEST_DIR to end with crates/inspector_ui, but got {cargo_manifest_dir}"
-        );
-    }
-    path.pop();
-
-    println!("cargo:rustc-env=ZED_REPO_DIR={}", path.display());
-}
diff --git a/crates/inspector_ui/src/div_inspector.rs b/crates/inspector_ui/src/div_inspector.rs
deleted file mode 100644
index 9b145e920e..0000000000
--- a/crates/inspector_ui/src/div_inspector.rs
+++ /dev/null
@@ -1,732 +0,0 @@
-use anyhow::{Result, anyhow};
-use editor::{
-    Bias, CompletionProvider, Editor, EditorEvent, EditorMode, ExcerptId, MinimapVisibility,
-    MultiBuffer,
-};
-use fuzzy::StringMatch;
-use gpui::{
-    AsyncWindowContext, DivInspectorState, Entity, InspectorElementId, IntoElement,
-    StyleRefinement, Task, Window, inspector_reflection::FunctionReflection, styled_reflection,
-};
-use language::language_settings::SoftWrap;
-use language::{
-    Anchor, Buffer, BufferSnapshot, CodeLabel, Diagnostic, DiagnosticEntry, DiagnosticSet,
-    DiagnosticSeverity, LanguageServerId, Point, ToOffset as _, ToPoint as _,
-};
-use project::lsp_store::CompletionDocumentation;
-use project::{
-    Completion, CompletionDisplayOptions, CompletionResponse, CompletionSource, Project,
-    ProjectPath,
-};
-use std::fmt::Write as _;
-use std::ops::Range;
-use std::path::Path;
-use std::rc::Rc;
-use std::sync::LazyLock;
-use ui::{Label, LabelSize, Tooltip, prelude::*, styled_ext_reflection, v_flex};
-use util::rel_path::RelPath;
-use util::split_str_with_ranges;
-
-/// Path used for unsaved buffer that contains style json. To support the json language server, this
-/// matches the name used in the generated schemas.
-const ZED_INSPECTOR_STYLE_JSON: &str = util_macros::path!("/zed-inspector-style.json");
-
-pub(crate) struct DivInspector {
-    state: State,
-    project: Entity<Project>,
-    inspector_id: Option<InspectorElementId>,
-    inspector_state: Option<DivInspectorState>,
-    /// Value of `DivInspectorState.base_style` when initially picked.
-    initial_style: StyleRefinement,
-    /// Portion of `initial_style` that can't be converted to rust code.
-    unconvertible_style: StyleRefinement,
-    /// Edits the user has made to the json buffer: `json_editor - (unconvertible_style + rust_editor)`.
-    json_style_overrides: StyleRefinement,
-    /// Error to display from parsing the json, or if serialization errors somehow occur.
-    json_style_error: Option<SharedString>,
-    /// Currently selected completion.
-    rust_completion: Option<String>,
-    /// Range that will be replaced by the completion if selected.
-    rust_completion_replace_range: Option<Range<Anchor>>,
-}
-
-enum State {
-    Loading,
-    BuffersLoaded {
-        rust_style_buffer: Entity<Buffer>,
-        json_style_buffer: Entity<Buffer>,
-    },
-    Ready {
-        rust_style_buffer: Entity<Buffer>,
-        rust_style_editor: Entity<Editor>,
-        json_style_buffer: Entity<Buffer>,
-        json_style_editor: Entity<Editor>,
-    },
-    LoadError {
-        message: SharedString,
-    },
-}
-
-impl DivInspector {
-    pub fn new(
-        project: Entity<Project>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> DivInspector {
-        // Open the buffers once, so they can then be used for each editor.
-        cx.spawn_in(window, {
-            let languages = project.read(cx).languages().clone();
-            let project = project.clone();
-            async move |this, cx| {
-                // Open the JSON style buffer in the inspector-specific project, so that it runs the
-                // JSON language server.
-                let json_style_buffer =
-                    Self::create_buffer_in_project(ZED_INSPECTOR_STYLE_JSON, &project, cx).await;
-
-                // Create Rust style buffer without adding it to the project / buffer_store, so that
-                // Rust Analyzer doesn't get started for it.
-                let rust_language_result = languages.language_for_name("Rust").await;
-                let rust_style_buffer = rust_language_result.and_then(|rust_language| {
-                    cx.new(|cx| Buffer::local("", cx).with_language_async(rust_language, cx))
-                });
-
-                match json_style_buffer.and_then(|json_style_buffer| {
-                    rust_style_buffer
-                        .map(|rust_style_buffer| (json_style_buffer, rust_style_buffer))
-                }) {
-                    Ok((json_style_buffer, rust_style_buffer)) => {
-                        this.update_in(cx, |this, window, cx| {
-                            this.state = State::BuffersLoaded {
-                                json_style_buffer,
-                                rust_style_buffer,
-                            };
-
-                            // Initialize editors immediately instead of waiting for
-                            // `update_inspected_element`. This avoids continuing to show
-                            // "Loading..." until the user moves the mouse to a different element.
-                            if let Some(id) = this.inspector_id.take() {
-                                let inspector_state =
-                                    window.with_inspector_state(Some(&id), cx, |state, _window| {
-                                        state.clone()
-                                    });
-                                if let Some(inspector_state) = inspector_state {
-                                    this.update_inspected_element(&id, inspector_state, window, cx);
-                                    cx.notify();
-                                }
-                            }
-                        })
-                        .ok();
-                    }
-                    Err(err) => {
-                        this.update(cx, |this, _cx| {
-                            this.state = State::LoadError {
-                                message: format!(
-                                    "Failed to create buffers for style editing: {err}"
-                                )
-                                .into(),
-                            };
-                        })
-                        .ok();
-                    }
-                }
-            }
-        })
-        .detach();
-
-        DivInspector {
-            state: State::Loading,
-            project,
-            inspector_id: None,
-            inspector_state: None,
-            initial_style: StyleRefinement::default(),
-            unconvertible_style: StyleRefinement::default(),
-            json_style_overrides: StyleRefinement::default(),
-            rust_completion: None,
-            rust_completion_replace_range: None,
-            json_style_error: None,
-        }
-    }
-
-    pub fn update_inspected_element(
-        &mut self,
-        id: &InspectorElementId,
-        inspector_state: DivInspectorState,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let style = (*inspector_state.base_style).clone();
-        self.inspector_state = Some(inspector_state);
-
-        if self.inspector_id.as_ref() == Some(id) {
-            return;
-        }
-
-        self.inspector_id = Some(id.clone());
-        self.initial_style = style.clone();
-
-        let (rust_style_buffer, json_style_buffer) = match &self.state {
-            State::BuffersLoaded {
-                rust_style_buffer,
-                json_style_buffer,
-            }
-            | State::Ready {
-                rust_style_buffer,
-                json_style_buffer,
-                ..
-            } => (rust_style_buffer.clone(), json_style_buffer.clone()),
-            State::Loading | State::LoadError { .. } => return,
-        };
-
-        let json_style_editor = self.create_editor(json_style_buffer.clone(), window, cx);
-        let rust_style_editor = self.create_editor(rust_style_buffer.clone(), window, cx);
-
-        rust_style_editor.update(cx, {
-            let div_inspector = cx.entity();
-            |rust_style_editor, _cx| {
-                rust_style_editor.set_completion_provider(Some(Rc::new(
-                    RustStyleCompletionProvider { div_inspector },
-                )));
-            }
-        });
-
-        let rust_style = match self.reset_style_editors(&rust_style_buffer, &json_style_buffer, cx)
-        {
-            Ok(rust_style) => {
-                self.json_style_error = None;
-                rust_style
-            }
-            Err(err) => {
-                self.json_style_error = Some(format!("{err}").into());
-                return;
-            }
-        };
-
-        cx.subscribe_in(&json_style_editor, window, {
-            let id = id.clone();
-            let rust_style_buffer = rust_style_buffer.clone();
-            move |this, editor, event: &EditorEvent, window, cx| {
-                if event == &EditorEvent::BufferEdited {
-                    let style_json = editor.read(cx).text(cx);
-                    match serde_json_lenient::from_str_lenient::<StyleRefinement>(&style_json) {
-                        Ok(new_style) => {
-                            let (rust_style, _) = this.style_from_rust_buffer_snapshot(
-                                &rust_style_buffer.read(cx).snapshot(),
-                            );
-
-                            let mut unconvertible_plus_rust = this.unconvertible_style.clone();
-                            unconvertible_plus_rust.refine(&rust_style);
-
-                            // The serialization of `DefiniteLength::Fraction` does not perfectly
-                            // roundtrip because with f32, `(x / 100.0 * 100.0) == x` is not always
-                            // true (such as for `p_1_3`). This can cause these values to
-                            // erroneously appear in `json_style_overrides` since they are not
-                            // perfectly equal. Roundtripping before `subtract` fixes this.
-                            unconvertible_plus_rust =
-                                serde_json::to_string(&unconvertible_plus_rust)
-                                    .ok()
-                                    .and_then(|json| {
-                                        serde_json_lenient::from_str_lenient(&json).ok()
-                                    })
-                                    .unwrap_or(unconvertible_plus_rust);
-
-                            this.json_style_overrides =
-                                new_style.subtract(&unconvertible_plus_rust);
-
-                            window.with_inspector_state::<DivInspectorState, _>(
-                                Some(&id),
-                                cx,
-                                |inspector_state, _window| {
-                                    if let Some(inspector_state) = inspector_state.as_mut() {
-                                        *inspector_state.base_style = new_style;
-                                    }
-                                },
-                            );
-                            window.refresh();
-                            this.json_style_error = None;
-                        }
-                        Err(err) => this.json_style_error = Some(err.to_string().into()),
-                    }
-                }
-            }
-        })
-        .detach();
-
-        cx.subscribe(&rust_style_editor, {
-            let json_style_buffer = json_style_buffer.clone();
-            let rust_style_buffer = rust_style_buffer.clone();
-            move |this, _editor, event: &EditorEvent, cx| {
-                if let EditorEvent::BufferEdited = event {
-                    this.update_json_style_from_rust(&json_style_buffer, &rust_style_buffer, cx);
-                }
-            }
-        })
-        .detach();
-
-        self.unconvertible_style = style.subtract(&rust_style);
-        self.json_style_overrides = StyleRefinement::default();
-        self.state = State::Ready {
-            rust_style_buffer,
-            rust_style_editor,
-            json_style_buffer,
-            json_style_editor,
-        };
-    }
-
-    fn reset_style(&mut self, cx: &mut App) {
-        if let State::Ready {
-            rust_style_buffer,
-            json_style_buffer,
-            ..
-        } = &self.state
-        {
-            if let Err(err) =
-                self.reset_style_editors(&rust_style_buffer.clone(), &json_style_buffer.clone(), cx)
-            {
-                self.json_style_error = Some(format!("{err}").into());
-            } else {
-                self.json_style_error = None;
-            }
-        }
-    }
-
-    fn reset_style_editors(
-        &self,
-        rust_style_buffer: &Entity<Buffer>,
-        json_style_buffer: &Entity<Buffer>,
-        cx: &mut App,
-    ) -> Result<StyleRefinement> {
-        let json_text = match serde_json::to_string_pretty(&self.initial_style) {
-            Ok(json_text) => json_text,
-            Err(err) => {
-                return Err(anyhow!("Failed to convert style to JSON: {err}"));
-            }
-        };
-
-        let (rust_code, rust_style) = guess_rust_code_from_style(&self.initial_style);
-        rust_style_buffer.update(cx, |rust_style_buffer, cx| {
-            rust_style_buffer.set_text(rust_code, cx);
-            let snapshot = rust_style_buffer.snapshot();
-            let (_, unrecognized_ranges) = self.style_from_rust_buffer_snapshot(&snapshot);
-            Self::set_rust_buffer_diagnostics(
-                unrecognized_ranges,
-                rust_style_buffer,
-                &snapshot,
-                cx,
-            );
-        });
-        json_style_buffer.update(cx, |json_style_buffer, cx| {
-            json_style_buffer.set_text(json_text, cx);
-        });
-
-        Ok(rust_style)
-    }
-
-    fn handle_rust_completion_selection_change(
-        &mut self,
-        rust_completion: Option<String>,
-        cx: &mut Context<Self>,
-    ) {
-        self.rust_completion = rust_completion;
-        if let State::Ready {
-            rust_style_buffer,
-            json_style_buffer,
-            ..
-        } = &self.state
-        {
-            self.update_json_style_from_rust(
-                &json_style_buffer.clone(),
-                &rust_style_buffer.clone(),
-                cx,
-            );
-        }
-    }
-
-    fn update_json_style_from_rust(
-        &mut self,
-        json_style_buffer: &Entity<Buffer>,
-        rust_style_buffer: &Entity<Buffer>,
-        cx: &mut Context<Self>,
-    ) {
-        let rust_style = rust_style_buffer.update(cx, |rust_style_buffer, cx| {
-            let snapshot = rust_style_buffer.snapshot();
-            let (rust_style, unrecognized_ranges) = self.style_from_rust_buffer_snapshot(&snapshot);
-            Self::set_rust_buffer_diagnostics(
-                unrecognized_ranges,
-                rust_style_buffer,
-                &snapshot,
-                cx,
-            );
-            rust_style
-        });
-
-        // Preserve parts of the json style which do not come from the unconvertible style or rust
-        // style. This way user edits to the json style are preserved when they are not overridden
-        // by the rust style.
-        //
-        // This results in a behavior where user changes to the json style that do overlap with the
-        // rust style will get set to the rust style when the user edits the rust style. It would be
-        // possible to update the rust style when the json style changes, but this is undesirable
-        // as the user may be working on the actual code in the rust style.
-        let mut new_style = self.unconvertible_style.clone();
-        new_style.refine(&self.json_style_overrides);
-        let new_style = new_style.refined(rust_style);
-
-        match serde_json::to_string_pretty(&new_style) {
-            Ok(json) => {
-                json_style_buffer.update(cx, |json_style_buffer, cx| {
-                    json_style_buffer.set_text(json, cx);
-                });
-            }
-            Err(err) => {
-                self.json_style_error = Some(err.to_string().into());
-            }
-        }
-    }
-
-    fn style_from_rust_buffer_snapshot(
-        &self,
-        snapshot: &BufferSnapshot,
-    ) -> (StyleRefinement, Vec<Range<Anchor>>) {
-        let method_names = if let Some((completion, completion_range)) = self
-            .rust_completion
-            .as_ref()
-            .zip(self.rust_completion_replace_range.as_ref())
-        {
-            let before_text = snapshot
-                .text_for_range(0..completion_range.start.to_offset(snapshot))
-                .collect::<String>();
-            let after_text = snapshot
-                .text_for_range(
-                    completion_range.end.to_offset(snapshot)
-                        ..snapshot.clip_offset(usize::MAX, Bias::Left),
-                )
-                .collect::<String>();
-            let mut method_names = split_str_with_ranges(&before_text, is_not_identifier_char)
-                .into_iter()
-                .map(|(range, name)| (Some(range), name.to_string()))
-                .collect::<Vec<_>>();
-            method_names.push((None, completion.clone()));
-            method_names.extend(
-                split_str_with_ranges(&after_text, is_not_identifier_char)
-                    .into_iter()
-                    .map(|(range, name)| (Some(range), name.to_string())),
-            );
-            method_names
-        } else {
-            split_str_with_ranges(&snapshot.text(), is_not_identifier_char)
-                .into_iter()
-                .map(|(range, name)| (Some(range), name.to_string()))
-                .collect::<Vec<_>>()
-        };
-
-        let mut style = StyleRefinement::default();
-        let mut unrecognized_ranges = Vec::new();
-        for (range, name) in method_names {
-            if let Some((_, method)) = STYLE_METHODS.iter().find(|(_, m)| m.name == name) {
-                style = method.invoke(style);
-            } else if let Some(range) = range {
-                unrecognized_ranges
-                    .push(snapshot.anchor_before(range.start)..snapshot.anchor_before(range.end));
-            }
-        }
-
-        (style, unrecognized_ranges)
-    }
-
-    fn set_rust_buffer_diagnostics(
-        unrecognized_ranges: Vec<Range<Anchor>>,
-        rust_style_buffer: &mut Buffer,
-        snapshot: &BufferSnapshot,
-        cx: &mut Context<Buffer>,
-    ) {
-        let diagnostic_entries = unrecognized_ranges
-            .into_iter()
-            .enumerate()
-            .map(|(ix, range)| DiagnosticEntry {
-                range,
-                diagnostic: Diagnostic {
-                    message: "unrecognized".to_string(),
-                    severity: DiagnosticSeverity::WARNING,
-                    is_primary: true,
-                    group_id: ix,
-                    ..Default::default()
-                },
-            });
-        let diagnostics = DiagnosticSet::from_sorted_entries(diagnostic_entries, snapshot);
-        rust_style_buffer.update_diagnostics(LanguageServerId(0), diagnostics, cx);
-    }
-
-    async fn create_buffer_in_project(
-        path: impl AsRef<Path>,
-        project: &Entity<Project>,
-        cx: &mut AsyncWindowContext,
-    ) -> Result<Entity<Buffer>> {
-        let worktree = project
-            .update(cx, |project, cx| project.create_worktree(path, false, cx))?
-            .await?;
-
-        let project_path = worktree.read_with(cx, |worktree, _cx| ProjectPath {
-            worktree_id: worktree.id(),
-            path: RelPath::empty().into(),
-        })?;
-
-        let buffer = project
-            .update(cx, |project, cx| project.open_path(project_path, cx))?
-            .await?
-            .1;
-
-        Ok(buffer)
-    }
-
-    fn create_editor(
-        &self,
-        buffer: Entity<Buffer>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Entity<Editor> {
-        cx.new(|cx| {
-            let multi_buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-            let mut editor = Editor::new(
-                EditorMode::full(),
-                multi_buffer,
-                Some(self.project.clone()),
-                window,
-                cx,
-            );
-            editor.set_soft_wrap_mode(SoftWrap::EditorWidth, cx);
-            editor.set_show_line_numbers(false, cx);
-            editor.set_show_code_actions(false, cx);
-            editor.set_show_breakpoints(false, cx);
-            editor.set_show_git_diff_gutter(false, cx);
-            editor.set_show_runnables(false, cx);
-            editor.set_show_edit_predictions(Some(false), window, cx);
-            editor.set_minimap_visibility(MinimapVisibility::Disabled, window, cx);
-            editor
-        })
-    }
-}
-
-impl Render for DivInspector {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .size_full()
-            .gap_2()
-            .when_some(self.inspector_state.as_ref(), |this, inspector_state| {
-                this.child(
-                    v_flex()
-                        .child(Label::new("Layout").size(LabelSize::Large))
-                        .child(render_layout_state(inspector_state, cx)),
-                )
-            })
-            .map(|this| match &self.state {
-                State::Loading | State::BuffersLoaded { .. } => {
-                    this.child(Label::new("Loading..."))
-                }
-                State::LoadError { message } => this.child(
-                    div()
-                        .w_full()
-                        .border_1()
-                        .border_color(Color::Error.color(cx))
-                        .child(Label::new(message)),
-                ),
-                State::Ready {
-                    rust_style_editor,
-                    json_style_editor,
-                    ..
-                } => this
-                    .child(
-                        v_flex()
-                            .gap_2()
-                            .child(
-                                h_flex()
-                                    .justify_between()
-                                    .child(Label::new("Rust Style").size(LabelSize::Large))
-                                    .child(
-                                        IconButton::new("reset-style", IconName::Eraser)
-                                            .tooltip(Tooltip::text("Reset style"))
-                                            .on_click(cx.listener(|this, _, _window, cx| {
-                                                this.reset_style(cx);
-                                            })),
-                                    ),
-                            )
-                            .child(div().h_64().child(rust_style_editor.clone())),
-                    )
-                    .child(
-                        v_flex()
-                            .gap_2()
-                            .child(Label::new("JSON Style").size(LabelSize::Large))
-                            .child(div().h_128().child(json_style_editor.clone()))
-                            .when_some(self.json_style_error.as_ref(), |this, last_error| {
-                                this.child(
-                                    div()
-                                        .w_full()
-                                        .border_1()
-                                        .border_color(Color::Error.color(cx))
-                                        .child(Label::new(last_error)),
-                                )
-                            }),
-                    ),
-            })
-            .into_any_element()
-    }
-}
-
-fn render_layout_state(inspector_state: &DivInspectorState, cx: &App) -> Div {
-    v_flex()
-        .child(
-            div()
-                .text_ui(cx)
-                .child(format!(
-                    "Bounds: ⌜{} - {}⌟",
-                    inspector_state.bounds.origin,
-                    inspector_state.bounds.bottom_right()
-                ))
-                .child(format!("Size: {}", inspector_state.bounds.size)),
-        )
-        .child(
-            div()
-                .id("content-size")
-                .text_ui(cx)
-                .tooltip(Tooltip::text("Size of the element's children"))
-                .child(
-                    if inspector_state.content_size != inspector_state.bounds.size {
-                        format!("Content size: {}", inspector_state.content_size)
-                    } else {
-                        "".to_string()
-                    },
-                ),
-        )
-}
-
-static STYLE_METHODS: LazyLock<Vec<(Box<StyleRefinement>, FunctionReflection<StyleRefinement>)>> =
-    LazyLock::new(|| {
-        // Include StyledExt methods first so that those methods take precedence.
-        styled_ext_reflection::methods::<StyleRefinement>()
-            .into_iter()
-            .chain(styled_reflection::methods::<StyleRefinement>())
-            .map(|method| (Box::new(method.invoke(StyleRefinement::default())), method))
-            .collect()
-    });
-
-fn guess_rust_code_from_style(goal_style: &StyleRefinement) -> (String, StyleRefinement) {
-    let mut subset_methods = Vec::new();
-    for (style, method) in STYLE_METHODS.iter() {
-        if goal_style.is_superset_of(style) {
-            subset_methods.push(method);
-        }
-    }
-
-    let mut code = "fn build() -> Div {\n    div()".to_string();
-    let mut style = StyleRefinement::default();
-    for method in subset_methods {
-        let before_change = style.clone();
-        style = method.invoke(style);
-        if before_change != style {
-            let _ = write!(code, "\n        .{}()", &method.name);
-        }
-    }
-    code.push_str("\n}");
-
-    (code, style)
-}
-
-fn is_not_identifier_char(c: char) -> bool {
-    !c.is_alphanumeric() && c != '_'
-}
-
-struct RustStyleCompletionProvider {
-    div_inspector: Entity<DivInspector>,
-}
-
-impl CompletionProvider for RustStyleCompletionProvider {
-    fn completions(
-        &self,
-        _excerpt_id: ExcerptId,
-        buffer: &Entity<Buffer>,
-        position: Anchor,
-        _: editor::CompletionContext,
-        _window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) -> Task<Result<Vec<CompletionResponse>>> {
-        let Some(replace_range) = completion_replace_range(&buffer.read(cx).snapshot(), &position)
-        else {
-            return Task::ready(Ok(Vec::new()));
-        };
-
-        self.div_inspector.update(cx, |div_inspector, _cx| {
-            div_inspector.rust_completion_replace_range = Some(replace_range.clone());
-        });
-
-        Task::ready(Ok(vec![CompletionResponse {
-            completions: STYLE_METHODS
-                .iter()
-                .map(|(_, method)| Completion {
-                    replace_range: replace_range.clone(),
-                    new_text: format!(".{}()", method.name),
-                    label: CodeLabel::plain(method.name.to_string(), None),
-                    match_start: None,
-                    snippet_deduplication_key: None,
-                    icon_path: None,
-                    documentation: method.documentation.map(|documentation| {
-                        CompletionDocumentation::MultiLineMarkdown(documentation.into())
-                    }),
-                    source: CompletionSource::Custom,
-                    insert_text_mode: None,
-                    confirm: None,
-                })
-                .collect(),
-            display_options: CompletionDisplayOptions::default(),
-            is_incomplete: false,
-        }]))
-    }
-
-    fn is_completion_trigger(
-        &self,
-        buffer: &Entity<language::Buffer>,
-        position: language::Anchor,
-        _text: &str,
-        _trigger_in_words: bool,
-        cx: &mut Context<Editor>,
-    ) -> bool {
-        completion_replace_range(&buffer.read(cx).snapshot(), &position).is_some()
-    }
-
-    fn selection_changed(&self, mat: Option<&StringMatch>, _window: &mut Window, cx: &mut App) {
-        let div_inspector = self.div_inspector.clone();
-        let rust_completion = mat.as_ref().map(|mat| mat.string.clone());
-        cx.defer(move |cx| {
-            div_inspector.update(cx, |div_inspector, cx| {
-                div_inspector.handle_rust_completion_selection_change(rust_completion, cx);
-            });
-        });
-    }
-
-    fn sort_completions(&self) -> bool {
-        false
-    }
-}
-
-fn completion_replace_range(snapshot: &BufferSnapshot, anchor: &Anchor) -> Option<Range<Anchor>> {
-    let point = anchor.to_point(snapshot);
-    let offset = point.to_offset(snapshot);
-    let line_start = Point::new(point.row, 0).to_offset(snapshot);
-    let line_end = Point::new(point.row, snapshot.line_len(point.row)).to_offset(snapshot);
-    let mut lines = snapshot.text_for_range(line_start..line_end).lines();
-    let line = lines.next()?;
-
-    let start_in_line = &line[..offset - line_start]
-        .rfind(|c| is_not_identifier_char(c) && c != '.')
-        .map(|ix| ix + 1)
-        .unwrap_or(0);
-    let end_in_line = &line[offset - line_start..]
-        .rfind(|c| is_not_identifier_char(c) && c != '(' && c != ')')
-        .unwrap_or(line_end - line_start);
-
-    if end_in_line > start_in_line {
-        let replace_start = snapshot.anchor_before(line_start + start_in_line);
-        let replace_end = snapshot.anchor_after(line_start + end_in_line);
-        Some(replace_start..replace_end)
-    } else {
-        None
-    }
-}
diff --git a/crates/inspector_ui/src/inspector.rs b/crates/inspector_ui/src/inspector.rs
deleted file mode 100644
index 7f7985df9b..0000000000
--- a/crates/inspector_ui/src/inspector.rs
+++ /dev/null
@@ -1,183 +0,0 @@
-use anyhow::{Context as _, anyhow};
-use gpui::{App, DivInspectorState, Inspector, InspectorElementId, IntoElement, Window};
-use std::{cell::OnceCell, path::Path, sync::Arc};
-use title_bar::platform_title_bar::PlatformTitleBar;
-use ui::{Label, Tooltip, prelude::*};
-use util::{ResultExt as _, command::new_smol_command};
-use workspace::AppState;
-
-use crate::div_inspector::DivInspector;
-
-pub fn init(app_state: Arc<AppState>, cx: &mut App) {
-    cx.on_action(|_: &zed_actions::dev::ToggleInspector, cx| {
-        let Some(active_window) = cx
-            .active_window()
-            .context("no active window to toggle inspector")
-            .log_err()
-        else {
-            return;
-        };
-        // This is deferred to avoid double lease due to window already being updated.
-        cx.defer(move |cx| {
-            active_window
-                .update(cx, |_, window, cx| window.toggle_inspector(cx))
-                .log_err();
-        });
-    });
-
-    // Project used for editor buffers with LSP support
-    let project = project::Project::local(
-        app_state.client.clone(),
-        app_state.node_runtime.clone(),
-        app_state.user_store.clone(),
-        app_state.languages.clone(),
-        app_state.fs.clone(),
-        None,
-        cx,
-    );
-
-    let div_inspector = OnceCell::new();
-    cx.register_inspector_element(move |id, state: &DivInspectorState, window, cx| {
-        let div_inspector = div_inspector
-            .get_or_init(|| cx.new(|cx| DivInspector::new(project.clone(), window, cx)));
-        div_inspector.update(cx, |div_inspector, cx| {
-            div_inspector.update_inspected_element(&id, state.clone(), window, cx);
-            div_inspector.render(window, cx).into_any_element()
-        })
-    });
-
-    cx.set_inspector_renderer(Box::new(render_inspector));
-}
-
-fn render_inspector(
-    inspector: &mut Inspector,
-    window: &mut Window,
-    cx: &mut Context<Inspector>,
-) -> AnyElement {
-    let ui_font = theme::setup_ui_font(window, cx);
-    let colors = cx.theme().colors();
-    let inspector_id = inspector.active_element_id();
-    let toolbar_height = PlatformTitleBar::height(window);
-
-    v_flex()
-        .size_full()
-        .bg(colors.panel_background)
-        .text_color(colors.text)
-        .font(ui_font)
-        .border_l_1()
-        .border_color(colors.border)
-        .child(
-            h_flex()
-                .justify_between()
-                .pr_2()
-                .pl_1()
-                .mt_px()
-                .h(toolbar_height)
-                .border_b_1()
-                .border_color(colors.border_variant)
-                .child(
-                    IconButton::new("pick-mode", IconName::MagnifyingGlass)
-                        .tooltip(Tooltip::text("Start inspector pick mode"))
-                        .selected_icon_color(Color::Selected)
-                        .toggle_state(inspector.is_picking())
-                        .on_click(cx.listener(|inspector, _, window, _cx| {
-                            inspector.start_picking();
-                            window.refresh();
-                        })),
-                )
-                .child(h_flex().justify_end().child(Label::new("GPUI Inspector"))),
-        )
-        .child(
-            v_flex()
-                .id("gpui-inspector-content")
-                .overflow_y_scroll()
-                .px_2()
-                .py_0p5()
-                .gap_2()
-                .when_some(inspector_id, |this, inspector_id| {
-                    this.child(render_inspector_id(inspector_id, cx))
-                })
-                .children(inspector.render_inspector_states(window, cx)),
-        )
-        .into_any_element()
-}
-
-fn render_inspector_id(inspector_id: &InspectorElementId, cx: &App) -> Div {
-    let source_location = inspector_id.path.source_location;
-    // For unknown reasons, for some elements the path is absolute.
-    let source_location_string = source_location.to_string();
-    let source_location_string = source_location_string
-        .strip_prefix(env!("ZED_REPO_DIR"))
-        .and_then(|s| s.strip_prefix("/"))
-        .map(|s| s.to_string())
-        .unwrap_or(source_location_string);
-
-    v_flex()
-        .child(
-            h_flex()
-                .justify_between()
-                .child(Label::new("Element ID").size(LabelSize::Large))
-                .child(
-                    div()
-                        .id("instance-id")
-                        .text_ui(cx)
-                        .tooltip(Tooltip::text(
-                            "Disambiguates elements from the same source location",
-                        ))
-                        .child(format!("Instance {}", inspector_id.instance_id)),
-                ),
-        )
-        .child(
-            div()
-                .id("source-location")
-                .text_ui(cx)
-                .bg(cx.theme().colors().editor_foreground.opacity(0.025))
-                .underline()
-                .font_buffer(cx)
-                .text_xs()
-                .child(source_location_string)
-                .tooltip(Tooltip::text("Click to open by running Zed CLI"))
-                .on_click(move |_, _window, cx| {
-                    cx.background_spawn(open_zed_source_location(source_location))
-                        .detach_and_log_err(cx);
-                }),
-        )
-        .child(
-            div()
-                .id("global-id")
-                .text_ui(cx)
-                .min_h_20()
-                .tooltip(Tooltip::text(
-                    "GlobalElementId of the nearest ancestor with an ID",
-                ))
-                .child(inspector_id.path.global_id.to_string()),
-        )
-}
-
-async fn open_zed_source_location(
-    location: &'static std::panic::Location<'static>,
-) -> anyhow::Result<()> {
-    let mut path = Path::new(env!("ZED_REPO_DIR")).to_path_buf();
-    path.push(Path::new(location.file()));
-    let path_arg = format!(
-        "{}:{}:{}",
-        path.display(),
-        location.line(),
-        location.column()
-    );
-
-    let output = new_smol_command("zed")
-        .arg(&path_arg)
-        .output()
-        .await
-        .with_context(|| format!("running zed to open {path_arg} failed"))?;
-
-    if !output.status.success() {
-        Err(anyhow!(
-            "running zed to open {path_arg} failed with stderr: {}",
-            String::from_utf8_lossy(&output.stderr)
-        ))
-    } else {
-        Ok(())
-    }
-}
diff --git a/crates/inspector_ui/src/inspector_ui.rs b/crates/inspector_ui/src/inspector_ui.rs
deleted file mode 100644
index 1342007005..0000000000
--- a/crates/inspector_ui/src/inspector_ui.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-#[cfg(debug_assertions)]
-mod div_inspector;
-#[cfg(debug_assertions)]
-mod inspector;
-
-#[cfg(debug_assertions)]
-pub use inspector::init;
-
-#[cfg(not(debug_assertions))]
-pub fn init(_app_state: std::sync::Arc<workspace::AppState>, cx: &mut gpui::App) {
-    use std::any::TypeId;
-    use workspace::notifications::NotifyResultExt as _;
-
-    cx.on_action(|_: &zed_actions::dev::ToggleInspector, cx| {
-        Err::<(), anyhow::Error>(anyhow::anyhow!(
-            "dev::ToggleInspector is only available in debug builds"
-        ))
-        .notify_app_err(cx);
-    });
-
-    command_palette_hooks::CommandPaletteFilter::update_global(cx, |filter, _cx| {
-        filter.hide_action_types(&[TypeId::of::<zed_actions::dev::ToggleInspector>()]);
-    });
-}
diff --git a/crates/install_cli/Cargo.toml b/crates/install_cli/Cargo.toml
deleted file mode 100644
index 1eede025e5..0000000000
--- a/crates/install_cli/Cargo.toml
+++ /dev/null
@@ -1,24 +0,0 @@
-[package]
-name = "install_cli"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/install_cli.rs"
-
-[features]
-test-support = []
-
-[dependencies]
-anyhow.workspace = true
-client.workspace = true
-gpui.workspace = true
-release_channel.workspace = true
-smol.workspace = true
-util.workspace = true
-workspace.workspace = true
diff --git a/crates/install_cli/LICENSE-GPL b/crates/install_cli/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/install_cli/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/install_cli/src/install_cli.rs b/crates/install_cli/src/install_cli.rs
deleted file mode 100644
index 281069020a..0000000000
--- a/crates/install_cli/src/install_cli.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-#[cfg(not(target_os = "windows"))]
-mod install_cli_binary;
-mod register_zed_scheme;
-
-#[cfg(not(target_os = "windows"))]
-pub use install_cli_binary::{InstallCliBinary, install_cli_binary};
-pub use register_zed_scheme::{RegisterZedScheme, register_zed_scheme};
diff --git a/crates/install_cli/src/install_cli_binary.rs b/crates/install_cli/src/install_cli_binary.rs
deleted file mode 100644
index 414bdabc70..0000000000
--- a/crates/install_cli/src/install_cli_binary.rs
+++ /dev/null
@@ -1,101 +0,0 @@
-use super::register_zed_scheme;
-use anyhow::{Context as _, Result};
-use gpui::{AppContext as _, AsyncApp, Context, PromptLevel, Window, actions};
-use release_channel::ReleaseChannel;
-use std::ops::Deref;
-use std::path::{Path, PathBuf};
-use util::ResultExt;
-use workspace::notifications::{DetachAndPromptErr, NotificationId};
-use workspace::{Toast, Workspace};
-
-actions!(
-    cli,
-    [
-        /// Installs the Zed CLI tool to the system PATH.
-        InstallCliBinary,
-    ]
-);
-
-async fn install_script(cx: &AsyncApp) -> Result<PathBuf> {
-    let cli_path = cx.update(|cx| cx.path_for_auxiliary_executable("cli"))??;
-    let link_path = Path::new("/usr/local/bin/zed");
-    let bin_dir_path = link_path.parent().unwrap();
-
-    // Don't re-create symlink if it points to the same CLI binary.
-    if smol::fs::read_link(link_path).await.ok().as_ref() == Some(&cli_path) {
-        return Ok(link_path.into());
-    }
-
-    // If the symlink is not there or is outdated, first try replacing it
-    // without escalating.
-    smol::fs::remove_file(link_path).await.log_err();
-    if smol::fs::unix::symlink(&cli_path, link_path)
-        .await
-        .log_err()
-        .is_some()
-    {
-        return Ok(link_path.into());
-    }
-
-    // The symlink could not be created, so use osascript with admin privileges
-    // to create it.
-    let status = smol::process::Command::new("/usr/bin/osascript")
-        .args([
-            "-e",
-            &format!(
-                "do shell script \" \
-                    mkdir -p \'{}\' && \
-                    ln -sf \'{}\' \'{}\' \
-                \" with administrator privileges",
-                bin_dir_path.to_string_lossy(),
-                cli_path.to_string_lossy(),
-                link_path.to_string_lossy(),
-            ),
-        ])
-        .stdout(smol::process::Stdio::inherit())
-        .stderr(smol::process::Stdio::inherit())
-        .output()
-        .await?
-        .status;
-    anyhow::ensure!(status.success(), "error running osascript");
-    Ok(link_path.into())
-}
-
-pub fn install_cli_binary(window: &mut Window, cx: &mut Context<Workspace>) {
-    const LINUX_PROMPT_DETAIL: &str = "If you installed Zed from our official release add ~/.local/bin to your PATH.\n\nIf you installed Zed from a different source like your package manager, then you may need to create an alias/symlink manually.\n\nDepending on your package manager, the CLI might be named zeditor, zedit, zed-editor or something else.";
-
-    cx.spawn_in(window, async move |workspace, cx| {
-        if cfg!(any(target_os = "linux", target_os = "freebsd")) {
-            let prompt = cx.prompt(
-                PromptLevel::Warning,
-                "CLI should already be installed",
-                Some(LINUX_PROMPT_DETAIL),
-                &["Ok"],
-            );
-            cx.background_spawn(prompt).detach();
-            return Ok(());
-        }
-        let path = install_script(cx.deref())
-            .await
-            .context("error creating CLI symlink")?;
-
-        workspace.update_in(cx, |workspace, _, cx| {
-            struct InstalledZedCli;
-
-            workspace.show_toast(
-                Toast::new(
-                    NotificationId::unique::<InstalledZedCli>(),
-                    format!(
-                        "Installed `zed` to {}. You can launch {} from your terminal.",
-                        path.to_string_lossy(),
-                        ReleaseChannel::global(cx).display_name()
-                    ),
-                ),
-                cx,
-            )
-        })?;
-        register_zed_scheme(cx).await.log_err();
-        Ok(())
-    })
-    .detach_and_prompt_err("Error installing zed cli", window, cx, |_, _, _| None);
-}
diff --git a/crates/install_cli/src/register_zed_scheme.rs b/crates/install_cli/src/register_zed_scheme.rs
deleted file mode 100644
index 819287c5d0..0000000000
--- a/crates/install_cli/src/register_zed_scheme.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-use client::ZED_URL_SCHEME;
-use gpui::{AsyncApp, actions};
-
-actions!(
-    cli,
-    [
-        /// Registers the zed:// URL scheme handler.
-        RegisterZedScheme
-    ]
-);
-
-pub async fn register_zed_scheme(cx: &AsyncApp) -> anyhow::Result<()> {
-    cx.update(|cx| cx.register_url_scheme(ZED_URL_SCHEME))?
-        .await
-}
diff --git a/crates/journal/Cargo.toml b/crates/journal/Cargo.toml
deleted file mode 100644
index a78a2cc3b2..0000000000
--- a/crates/journal/Cargo.toml
+++ /dev/null
@@ -1,27 +0,0 @@
-[package]
-name = "journal"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/journal.rs"
-doctest = false
-
-[dependencies]
-anyhow.workspace = true
-chrono.workspace = true
-editor.workspace = true
-gpui.workspace = true
-log.workspace = true
-serde.workspace = true
-settings.workspace = true
-shellexpand.workspace = true
-workspace.workspace = true
-
-[dev-dependencies]
-editor = { workspace = true, features = ["test-support"] }
diff --git a/crates/journal/LICENSE-GPL b/crates/journal/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/journal/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/journal/src/journal.rs b/crates/journal/src/journal.rs
deleted file mode 100644
index f43949c005..0000000000
--- a/crates/journal/src/journal.rs
+++ /dev/null
@@ -1,294 +0,0 @@
-use chrono::{Datelike, Local, NaiveTime, Timelike};
-use editor::scroll::Autoscroll;
-use editor::{Editor, SelectionEffects};
-use gpui::{App, AppContext as _, Context, Window, actions};
-pub use settings::HourFormat;
-use settings::{RegisterSetting, Settings};
-use std::{
-    fs::OpenOptions,
-    path::{Path, PathBuf},
-    sync::Arc,
-};
-use workspace::{AppState, OpenVisible, Workspace};
-
-actions!(
-    journal,
-    [
-        /// Creates a new journal entry for today.
-        NewJournalEntry
-    ]
-);
-
-/// Settings specific to journaling
-#[derive(Clone, Debug, RegisterSetting)]
-pub struct JournalSettings {
-    /// The path of the directory where journal entries are stored.
-    ///
-    /// Default: `~`
-    pub path: String,
-    /// What format to display the hours in.
-    ///
-    /// Default: hour12
-    pub hour_format: HourFormat,
-}
-
-impl settings::Settings for JournalSettings {
-    fn from_settings(content: &settings::SettingsContent) -> Self {
-        let journal = content.journal.clone().unwrap();
-
-        Self {
-            path: journal.path.unwrap(),
-            hour_format: journal.hour_format.unwrap(),
-        }
-    }
-}
-
-pub fn init(_: Arc<AppState>, cx: &mut App) {
-    cx.observe_new(
-        |workspace: &mut Workspace, _window, _cx: &mut Context<Workspace>| {
-            workspace.register_action(|workspace, _: &NewJournalEntry, window, cx| {
-                new_journal_entry(workspace, window, cx);
-            });
-        },
-    )
-    .detach();
-}
-
-pub fn new_journal_entry(workspace: &Workspace, window: &mut Window, cx: &mut App) {
-    let settings = JournalSettings::get_global(cx);
-    let journal_dir = match journal_dir(&settings.path) {
-        Some(journal_dir) => journal_dir,
-        None => {
-            log::error!("Can't determine journal directory");
-            return;
-        }
-    };
-    let journal_dir_clone = journal_dir.clone();
-
-    let now = Local::now();
-    let month_dir = journal_dir
-        .join(format!("{:02}", now.year()))
-        .join(format!("{:02}", now.month()));
-    let entry_path = month_dir.join(format!("{:02}.md", now.day()));
-    let now = now.time();
-    let entry_heading = heading_entry(now, &settings.hour_format);
-
-    let create_entry = cx.background_spawn(async move {
-        std::fs::create_dir_all(month_dir)?;
-        OpenOptions::new()
-            .create(true)
-            .truncate(false)
-            .write(true)
-            .open(&entry_path)?;
-        Ok::<_, std::io::Error>((journal_dir, entry_path))
-    });
-
-    let worktrees = workspace.visible_worktrees(cx).collect::<Vec<_>>();
-    let mut open_new_workspace = true;
-    'outer: for worktree in worktrees.iter() {
-        let worktree_root = worktree.read(cx).abs_path();
-        if *worktree_root == journal_dir_clone {
-            open_new_workspace = false;
-            break;
-        }
-        for directory in worktree.read(cx).directories(true, 1) {
-            let full_directory_path = worktree_root.join(directory.path.as_std_path());
-            if full_directory_path.ends_with(&journal_dir_clone) {
-                open_new_workspace = false;
-                break 'outer;
-            }
-        }
-    }
-
-    let app_state = workspace.app_state().clone();
-    let view_snapshot = workspace.weak_handle();
-
-    window
-        .spawn(cx, async move |cx| {
-            let (journal_dir, entry_path) = create_entry.await?;
-            let opened = if open_new_workspace {
-                let (new_workspace, _) = cx
-                    .update(|_window, cx| {
-                        workspace::open_paths(
-                            &[journal_dir],
-                            app_state,
-                            workspace::OpenOptions::default(),
-                            cx,
-                        )
-                    })?
-                    .await?;
-                new_workspace
-                    .update(cx, |workspace, window, cx| {
-                        workspace.open_paths(
-                            vec![entry_path],
-                            workspace::OpenOptions {
-                                visible: Some(OpenVisible::All),
-                                ..Default::default()
-                            },
-                            None,
-                            window,
-                            cx,
-                        )
-                    })?
-                    .await
-            } else {
-                view_snapshot
-                    .update_in(cx, |workspace, window, cx| {
-                        workspace.open_paths(
-                            vec![entry_path],
-                            workspace::OpenOptions {
-                                visible: Some(OpenVisible::All),
-                                ..Default::default()
-                            },
-                            None,
-                            window,
-                            cx,
-                        )
-                    })?
-                    .await
-            };
-
-            if let Some(Some(Ok(item))) = opened.first()
-                && let Some(editor) = item.downcast::<Editor>().map(|editor| editor.downgrade())
-            {
-                editor.update_in(cx, |editor, window, cx| {
-                    let len = editor.buffer().read(cx).len(cx);
-                    editor.change_selections(
-                        SelectionEffects::scroll(Autoscroll::center()),
-                        window,
-                        cx,
-                        |s| s.select_ranges([len..len]),
-                    );
-                    if len.0 > 0 {
-                        editor.insert("\n\n", window, cx);
-                    }
-                    editor.insert(&entry_heading, window, cx);
-                    editor.insert("\n\n", window, cx);
-                })?;
-            }
-
-            anyhow::Ok(())
-        })
-        .detach_and_log_err(cx);
-}
-
-fn journal_dir(path: &str) -> Option<PathBuf> {
-    let expanded = shellexpand::full(path).ok()?;
-    let base_path = Path::new(expanded.as_ref());
-    let absolute_path = if base_path.is_absolute() {
-        base_path.to_path_buf()
-    } else {
-        log::warn!("Invalid journal path {path:?} (not absolute), falling back to home directory",);
-        std::env::home_dir()?
-    };
-    Some(absolute_path.join("journal"))
-}
-
-fn heading_entry(now: NaiveTime, hour_format: &HourFormat) -> String {
-    match hour_format {
-        HourFormat::Hour24 => {
-            let hour = now.hour();
-            format!("# {}:{:02}", hour, now.minute())
-        }
-        HourFormat::Hour12 => {
-            let (pm, hour) = now.hour12();
-            let am_or_pm = if pm { "PM" } else { "AM" };
-            format!("# {}:{:02} {}", hour, now.minute(), am_or_pm)
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    mod heading_entry_tests {
-        use super::super::*;
-
-        #[test]
-        fn test_heading_entry_defaults_to_hour_12() {
-            let naive_time = NaiveTime::from_hms_milli_opt(15, 0, 0, 0).unwrap();
-            let actual_heading_entry = heading_entry(naive_time, &HourFormat::Hour12);
-            let expected_heading_entry = "# 3:00 PM";
-
-            assert_eq!(actual_heading_entry, expected_heading_entry);
-        }
-
-        #[test]
-        fn test_heading_entry_is_hour_12() {
-            let naive_time = NaiveTime::from_hms_milli_opt(15, 0, 0, 0).unwrap();
-            let actual_heading_entry = heading_entry(naive_time, &HourFormat::Hour12);
-            let expected_heading_entry = "# 3:00 PM";
-
-            assert_eq!(actual_heading_entry, expected_heading_entry);
-        }
-
-        #[test]
-        fn test_heading_entry_is_hour_24() {
-            let naive_time = NaiveTime::from_hms_milli_opt(15, 0, 0, 0).unwrap();
-            let actual_heading_entry = heading_entry(naive_time, &HourFormat::Hour24);
-            let expected_heading_entry = "# 15:00";
-
-            assert_eq!(actual_heading_entry, expected_heading_entry);
-        }
-    }
-
-    mod journal_dir_tests {
-        use super::super::*;
-
-        #[test]
-        #[cfg(target_family = "unix")]
-        fn test_absolute_unix_path() {
-            let result = journal_dir("/home/user");
-            assert!(result.is_some());
-            let path = result.unwrap();
-            assert!(path.is_absolute());
-            assert_eq!(path, PathBuf::from("/home/user/journal"));
-        }
-
-        #[test]
-        fn test_tilde_expansion() {
-            let result = journal_dir("~/documents");
-            assert!(result.is_some());
-            let path = result.unwrap();
-
-            assert!(path.is_absolute(), "Tilde should expand to absolute path");
-
-            if let Some(home) = std::env::home_dir() {
-                assert_eq!(path, home.join("documents").join("journal"));
-            }
-        }
-
-        #[test]
-        fn test_relative_path_falls_back_to_home() {
-            for relative_path in ["relative/path", "NONEXT/some/path", "../some/path"] {
-                let result = journal_dir(relative_path);
-                assert!(result.is_some(), "Failed for path: {}", relative_path);
-                let path = result.unwrap();
-
-                assert!(
-                    path.is_absolute(),
-                    "Path should be absolute for input '{}', got: {:?}",
-                    relative_path,
-                    path
-                );
-
-                if let Some(home) = std::env::home_dir() {
-                    assert_eq!(
-                        path,
-                        home.join("journal"),
-                        "Should fall back to home directory for input '{}'",
-                        relative_path
-                    );
-                }
-            }
-        }
-
-        #[test]
-        #[cfg(target_os = "windows")]
-        fn test_absolute_path_windows_style() {
-            let result = journal_dir("C:\\Users\\user\\Documents");
-            assert!(result.is_some());
-            let path = result.unwrap();
-            assert_eq!(path, PathBuf::from("C:\\Users\\user\\Documents\\journal"));
-        }
-    }
-}
diff --git a/crates/json_schema_store/Cargo.toml b/crates/json_schema_store/Cargo.toml
deleted file mode 100644
index efb1b36e79..0000000000
--- a/crates/json_schema_store/Cargo.toml
+++ /dev/null
@@ -1,40 +0,0 @@
-[package]
-name = "json_schema_store"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/json_schema_store.rs"
-
-[features]
-default = []
-
-[dependencies]
-anyhow.workspace = true
-dap.workspace = true
-extension.workspace = true
-gpui.workspace = true
-language.workspace = true
-paths.workspace = true
-project.workspace = true
-schemars.workspace = true
-serde_json.workspace = true
-serde.workspace = true
-settings.workspace = true
-snippet_provider.workspace = true
-task.workspace = true
-theme.workspace = true
-util.workspace = true
-
-
-
-# Uncomment other workspace dependencies as needed
-# assistant.workspace = true
-# client.workspace = true
-# project.workspace = true
-# settings.workspace = true
diff --git a/crates/json_schema_store/LICENSE-GPL b/crates/json_schema_store/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/json_schema_store/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/json_schema_store/src/json_schema_store.rs b/crates/json_schema_store/src/json_schema_store.rs
deleted file mode 100644
index 18041545cc..0000000000
--- a/crates/json_schema_store/src/json_schema_store.rs
+++ /dev/null
@@ -1,356 +0,0 @@
-//! # json_schema_store
-use std::{str::FromStr, sync::Arc};
-
-use anyhow::{Context as _, Result};
-use gpui::{App, AsyncApp, BorrowAppContext as _, Entity, WeakEntity};
-use language::{LanguageRegistry, language_settings::all_language_settings};
-use project::LspStore;
-use util::schemars::{AllowTrailingCommas, DefaultDenyUnknownFields};
-
-// Origin: https://github.com/SchemaStore/schemastore
-const TSCONFIG_SCHEMA: &str = include_str!("schemas/tsconfig.json");
-const PACKAGE_JSON_SCHEMA: &str = include_str!("schemas/package.json");
-
-pub fn init(cx: &mut App) {
-    cx.set_global(SchemaStore::default());
-    project::lsp_store::json_language_server_ext::register_schema_handler(
-        handle_schema_request,
-        cx,
-    );
-
-    cx.observe_new(|_, _, cx| {
-        let lsp_store = cx.weak_entity();
-        cx.global_mut::<SchemaStore>().lsp_stores.push(lsp_store);
-    })
-    .detach();
-
-    if let Some(extension_events) = extension::ExtensionEvents::try_global(cx) {
-        cx.subscribe(&extension_events, |_, evt, cx| {
-            match evt {
-                extension::Event::ExtensionInstalled(_)
-                | extension::Event::ExtensionUninstalled(_)
-                | extension::Event::ConfigureExtensionRequested(_) => return,
-                extension::Event::ExtensionsInstalledChanged => {}
-            }
-            cx.update_global::<SchemaStore, _>(|schema_store, cx| {
-                schema_store.notify_schema_changed("zed://schemas/settings", cx);
-            });
-        })
-        .detach();
-    }
-
-    cx.observe_global::<dap::DapRegistry>(|cx| {
-        cx.update_global::<SchemaStore, _>(|schema_store, cx| {
-            schema_store.notify_schema_changed("zed://schemas/debug_tasks", cx);
-        });
-    })
-    .detach();
-}
-
-#[derive(Default)]
-pub struct SchemaStore {
-    lsp_stores: Vec<WeakEntity<LspStore>>,
-}
-
-impl gpui::Global for SchemaStore {}
-
-impl SchemaStore {
-    fn notify_schema_changed(&mut self, uri: &str, cx: &mut App) {
-        let uri = uri.to_string();
-        self.lsp_stores.retain(|lsp_store| {
-            let Some(lsp_store) = lsp_store.upgrade() else {
-                return false;
-            };
-            project::lsp_store::json_language_server_ext::notify_schema_changed(
-                lsp_store,
-                uri.clone(),
-                cx,
-            );
-            true
-        })
-    }
-}
-
-fn handle_schema_request(
-    lsp_store: Entity<LspStore>,
-    uri: String,
-    cx: &mut AsyncApp,
-) -> Result<String> {
-    let languages = lsp_store.read_with(cx, |lsp_store, _| lsp_store.languages.clone())?;
-    let schema = resolve_schema_request(&languages, uri, cx)?;
-    serde_json::to_string(&schema).context("Failed to serialize schema")
-}
-
-pub fn resolve_schema_request(
-    languages: &Arc<LanguageRegistry>,
-    uri: String,
-    cx: &mut AsyncApp,
-) -> Result<serde_json::Value> {
-    let path = uri.strip_prefix("zed://schemas/").context("Invalid URI")?;
-    resolve_schema_request_inner(languages, path, cx)
-}
-
-pub fn resolve_schema_request_inner(
-    languages: &Arc<LanguageRegistry>,
-    path: &str,
-    cx: &mut AsyncApp,
-) -> Result<serde_json::Value> {
-    let (schema_name, rest) = path.split_once('/').unzip();
-    let schema_name = schema_name.unwrap_or(path);
-
-    let schema = match schema_name {
-        "settings" => cx.update(|cx| {
-            let font_names = &cx.text_system().all_font_names();
-            let language_names = &languages
-                .language_names()
-                .into_iter()
-                .map(|name| name.to_string())
-                .collect::<Vec<_>>();
-
-            let mut icon_theme_names = vec![];
-            let mut theme_names = vec![];
-            if let Some(registry) = theme::ThemeRegistry::try_global(cx) {
-                icon_theme_names.extend(
-                    registry
-                        .list_icon_themes()
-                        .into_iter()
-                        .map(|icon_theme| icon_theme.name),
-                );
-                theme_names.extend(registry.list_names());
-            }
-            let icon_theme_names = icon_theme_names.as_slice();
-            let theme_names = theme_names.as_slice();
-
-            cx.global::<settings::SettingsStore>().json_schema(
-                &settings::SettingsJsonSchemaParams {
-                    language_names,
-                    font_names,
-                    theme_names,
-                    icon_theme_names,
-                },
-            )
-        })?,
-        "keymap" => cx.update(settings::KeymapFile::generate_json_schema_for_registered_actions)?,
-        "action" => {
-            let normalized_action_name = rest.context("No Action name provided")?;
-            let action_name = denormalize_action_name(normalized_action_name);
-            let mut generator = settings::KeymapFile::action_schema_generator();
-            let schema = cx
-                // PERF: cx.action_schema_by_name(action_name, &mut generator)
-                .update(|cx| cx.action_schemas(&mut generator))?
-                .into_iter()
-                .find_map(|(name, schema)| (name == action_name).then_some(schema))
-                .flatten();
-            root_schema_from_action_schema(schema, &mut generator).to_value()
-        }
-        "tasks" => task::TaskTemplates::generate_json_schema(),
-        "debug_tasks" => {
-            let adapter_schemas = cx.read_global::<dap::DapRegistry, _>(|dap_registry, _| {
-                dap_registry.adapters_schema()
-            })?;
-            task::DebugTaskFile::generate_json_schema(&adapter_schemas)
-        }
-        "package_json" => package_json_schema(),
-        "tsconfig" => tsconfig_schema(),
-        "zed_inspector_style" => {
-            if cfg!(debug_assertions) {
-                generate_inspector_style_schema()
-            } else {
-                schemars::json_schema!(true).to_value()
-            }
-        }
-        "snippets" => snippet_provider::format::VsSnippetsFile::generate_json_schema(),
-        "jsonc" => jsonc_schema(),
-        _ => {
-            anyhow::bail!("Unrecognized builtin JSON schema: {schema_name}");
-        }
-    };
-    Ok(schema)
-}
-
-const JSONC_LANGUAGE_NAME: &str = "JSONC";
-
-pub fn all_schema_file_associations(
-    languages: &Arc<LanguageRegistry>,
-    cx: &mut App,
-) -> serde_json::Value {
-    let extension_globs = languages
-        .available_language_for_name(JSONC_LANGUAGE_NAME)
-        .map(|language| language.matcher().path_suffixes.clone())
-        .into_iter()
-        .flatten()
-        // Path suffixes can be entire file names or just their extensions.
-        .flat_map(|path_suffix| [format!("*.{path_suffix}"), path_suffix]);
-    let override_globs = all_language_settings(None, cx)
-        .file_types
-        .get(JSONC_LANGUAGE_NAME)
-        .into_iter()
-        .flat_map(|(_, glob_strings)| glob_strings)
-        .cloned();
-    let jsonc_globs = extension_globs.chain(override_globs).collect::<Vec<_>>();
-
-    let mut file_associations = serde_json::json!([
-        {
-            "fileMatch": [
-                schema_file_match(paths::settings_file()),
-                paths::local_settings_file_relative_path()
-            ],
-            "url": "zed://schemas/settings",
-        },
-        {
-            "fileMatch": [schema_file_match(paths::keymap_file())],
-            "url": "zed://schemas/keymap",
-        },
-        {
-            "fileMatch": [
-                schema_file_match(paths::tasks_file()),
-                paths::local_tasks_file_relative_path()
-            ],
-            "url": "zed://schemas/tasks",
-        },
-        {
-            "fileMatch": [
-                schema_file_match(paths::debug_scenarios_file()),
-                paths::local_debug_file_relative_path()
-            ],
-            "url": "zed://schemas/debug_tasks",
-        },
-        {
-            "fileMatch": [
-                schema_file_match(
-                    paths::snippets_dir()
-                        .join("*.json")
-                        .as_path()
-                )
-            ],
-            "url": "zed://schemas/snippets",
-        },
-        {
-            "fileMatch": ["tsconfig.json"],
-            "url": "zed://schemas/tsconfig"
-        },
-        {
-            "fileMatch": ["package.json"],
-            "url": "zed://schemas/package_json"
-        },
-        {
-            "fileMatch": &jsonc_globs,
-            "url": "zed://schemas/jsonc"
-        },
-    ]);
-
-    #[cfg(debug_assertions)]
-    {
-        file_associations
-            .as_array_mut()
-            .unwrap()
-            .push(serde_json::json!({
-                "fileMatch": [
-                    "zed-inspector-style.json"
-                ],
-                "url": "zed://schemas/zed_inspector_style"
-            }));
-    }
-
-    file_associations.as_array_mut().unwrap().extend(
-        // ?PERF: use all_action_schemas() and don't include action schemas with no arguments
-        cx.all_action_names().into_iter().map(|&name| {
-            let normalized_name = normalize_action_name(name);
-            let file_name = normalized_action_name_to_file_name(normalized_name.clone());
-            serde_json::json!({
-                "fileMatch": [file_name],
-                "url": format!("zed://schemas/action/{normalized_name}")
-            })
-        }),
-    );
-
-    file_associations
-}
-
-fn tsconfig_schema() -> serde_json::Value {
-    serde_json::Value::from_str(TSCONFIG_SCHEMA).unwrap()
-}
-
-fn package_json_schema() -> serde_json::Value {
-    serde_json::Value::from_str(PACKAGE_JSON_SCHEMA).unwrap()
-}
-
-fn jsonc_schema() -> serde_json::Value {
-    let generator = schemars::generate::SchemaSettings::draft2019_09()
-        .with_transform(DefaultDenyUnknownFields)
-        .with_transform(AllowTrailingCommas)
-        .into_generator();
-    let meta_schema = generator
-        .settings()
-        .meta_schema
-        .as_ref()
-        .expect("meta_schema should be present in schemars settings")
-        .to_string();
-    let defs = generator.definitions();
-    let schema = schemars::json_schema!({
-        "$schema": meta_schema,
-        "allowTrailingCommas": true,
-        "$defs": defs,
-    });
-    serde_json::to_value(schema).unwrap()
-}
-
-fn generate_inspector_style_schema() -> serde_json::Value {
-    let schema = schemars::generate::SchemaSettings::draft2019_09()
-        .with_transform(util::schemars::DefaultDenyUnknownFields)
-        .into_generator()
-        .root_schema_for::<gpui::StyleRefinement>();
-
-    serde_json::to_value(schema).unwrap()
-}
-
-pub fn normalize_action_name(action_name: &str) -> String {
-    action_name.replace("::", "__")
-}
-
-pub fn denormalize_action_name(action_name: &str) -> String {
-    action_name.replace("__", "::")
-}
-
-pub fn normalized_action_file_name(action_name: &str) -> String {
-    normalized_action_name_to_file_name(normalize_action_name(action_name))
-}
-
-pub fn normalized_action_name_to_file_name(mut normalized_action_name: String) -> String {
-    normalized_action_name.push_str(".json");
-    normalized_action_name
-}
-
-fn root_schema_from_action_schema(
-    action_schema: Option<schemars::Schema>,
-    generator: &mut schemars::SchemaGenerator,
-) -> schemars::Schema {
-    let Some(mut action_schema) = action_schema else {
-        return schemars::json_schema!(false);
-    };
-    let meta_schema = generator
-        .settings()
-        .meta_schema
-        .as_ref()
-        .expect("meta_schema should be present in schemars settings")
-        .to_string();
-    let defs = generator.definitions();
-    let mut schema = schemars::json_schema!({
-        "$schema": meta_schema,
-        "allowTrailingCommas": true,
-        "$defs": defs,
-    });
-    schema
-        .ensure_object()
-        .extend(std::mem::take(action_schema.ensure_object()));
-    schema
-}
-
-#[inline]
-fn schema_file_match(path: &std::path::Path) -> String {
-    path.strip_prefix(path.parent().unwrap().parent().unwrap())
-        .unwrap()
-        .display()
-        .to_string()
-        .replace('\\', "/")
-}
diff --git a/crates/json_schema_store/src/schemas/package.json b/crates/json_schema_store/src/schemas/package.json
deleted file mode 100644
index 0906dcf36e..0000000000
--- a/crates/json_schema_store/src/schemas/package.json
+++ /dev/null
@@ -1,1309 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "JSON schema for NPM package.json files",
-  "definitions": {
-    "person": {
-      "description": "A person who has been involved in creating or maintaining this package.",
-      "type": [
-        "object",
-        "string"
-      ],
-      "required": [
-        "name"
-      ],
-      "properties": {
-        "name": {
-          "type": "string"
-        },
-        "url": {
-          "type": "string",
-          "format": "uri"
-        },
-        "email": {
-          "type": "string",
-          "format": "email"
-        }
-      }
-    },
-    "dependency": {
-      "description": "Dependencies are specified with a simple hash of package name to version range. The version range is a string which has one or more space-separated descriptors. Dependencies can also be identified with a tarball or git URL.",
-      "type": "object",
-      "additionalProperties": {
-        "type": "string"
-      }
-    },
-    "devDependency": {
-      "description": "Specifies dependencies that are required for the development and testing of the project. These dependencies are not needed in the production environment.",
-      "type": "object",
-      "additionalProperties": {
-        "type": "string"
-      }
-    },
-    "optionalDependency": {
-      "description": "Specifies dependencies that are optional for your project. These dependencies are attempted to be installed during the npm install process, but if they fail to install, the installation process will not fail.",
-      "type": "object",
-      "additionalProperties": {
-        "type": "string"
-      }
-    },
-    "peerDependency": {
-      "description": "Specifies dependencies that are required by the package but are expected to be provided by the consumer of the package.",
-      "type": "object",
-      "additionalProperties": {
-        "type": "string"
-      }
-    },
-    "peerDependencyMeta": {
-      "description": "When a user installs your package, warnings are emitted if packages specified in \"peerDependencies\" are not already installed. The \"peerDependenciesMeta\" field serves to provide more information on how your peer dependencies are utilized. Most commonly, it allows peer dependencies to be marked as optional. Metadata for this field is specified with a simple hash of the package name to a metadata object.",
-      "type": "object",
-      "additionalProperties": {
-        "type": "object",
-        "additionalProperties": true,
-        "properties": {
-          "optional": {
-            "description": "Specifies that this peer dependency is optional and should not be installed automatically.",
-            "type": "boolean"
-          }
-        }
-      }
-    },
-    "license": {
-      "anyOf": [
-        {
-          "type": "string"
-        },
-        {
-          "enum": [
-            "AGPL-3.0-only",
-            "Apache-2.0",
-            "BSD-2-Clause",
-            "BSD-3-Clause",
-            "BSL-1.0",
-            "CC0-1.0",
-            "CDDL-1.0",
-            "CDDL-1.1",
-            "EPL-1.0",
-            "EPL-2.0",
-            "GPL-2.0-only",
-            "GPL-3.0-only",
-            "ISC",
-            "LGPL-2.0-only",
-            "LGPL-2.1-only",
-            "LGPL-2.1-or-later",
-            "LGPL-3.0-only",
-            "LGPL-3.0-or-later",
-            "MIT",
-            "MPL-2.0",
-            "MS-PL",
-            "UNLICENSED"
-          ]
-        }
-      ]
-    },
-    "scriptsInstallAfter": {
-      "description": "Run AFTER the package is installed.",
-      "type": "string",
-      "x-intellij-language-injection": "Shell Script"
-    },
-    "scriptsPublishAfter": {
-      "description": "Run AFTER the package is published.",
-      "type": "string",
-      "x-intellij-language-injection": "Shell Script"
-    },
-    "scriptsRestart": {
-      "description": "Run by the 'npm restart' command. Note: 'npm restart' will run the stop and start scripts if no restart script is provided.",
-      "type": "string",
-      "x-intellij-language-injection": "Shell Script"
-    },
-    "scriptsStart": {
-      "description": "Run by the 'npm start' command.",
-      "type": "string",
-      "x-intellij-language-injection": "Shell Script"
-    },
-    "scriptsStop": {
-      "description": "Run by the 'npm stop' command.",
-      "type": "string",
-      "x-intellij-language-injection": "Shell Script"
-    },
-    "scriptsTest": {
-      "description": "Run by the 'npm test' command.",
-      "type": "string",
-      "x-intellij-language-injection": "Shell Script"
-    },
-    "scriptsUninstallBefore": {
-      "description": "Run BEFORE the package is uninstalled.",
-      "type": "string",
-      "x-intellij-language-injection": "Shell Script"
-    },
-    "scriptsVersionBefore": {
-      "description": "Run BEFORE bump the package version.",
-      "type": "string",
-      "x-intellij-language-injection": "Shell Script"
-    },
-    "packageExportsEntryPath": {
-      "type": [
-        "string",
-        "null"
-      ],
-      "description": "The module path that is resolved when this specifier is imported. Set to `null` to disallow importing this module.",
-      "pattern": "^\\./"
-    },
-    "packageExportsEntryObject": {
-      "type": "object",
-      "description": "Used to specify conditional exports, note that Conditional exports are unsupported in older environments, so it's recommended to use the fallback array option if support for those environments is a concern.",
-      "properties": {
-        "require": {
-          "$ref": "#/definitions/packageExportsEntryOrFallback",
-          "description": "The module path that is resolved when this specifier is imported as a CommonJS module using the `require(...)` function."
-        },
-        "import": {
-          "$ref": "#/definitions/packageExportsEntryOrFallback",
-          "description": "The module path that is resolved when this specifier is imported as an ECMAScript module using an `import` declaration or the dynamic `import(...)` function."
-        },
-        "module-sync": {
-          "$ref": "#/definitions/packageExportsEntryOrFallback",
-          "$comment": "https://nodejs.org/api/packages.html#conditional-exports#:~:text=%22module-sync%22",
-          "description": "The same as `import`, but can be used with require(esm) in Node 20+. This requires the files to not use any top-level awaits."
-        },
-        "node": {
-          "$ref": "#/definitions/packageExportsEntryOrFallback",
-          "description": "The module path that is resolved when this environment is Node.js."
-        },
-        "default": {
-          "$ref": "#/definitions/packageExportsEntryOrFallback",
-          "description": "The module path that is resolved when no other export type matches."
-        },
-        "types": {
-          "$ref": "#/definitions/packageExportsEntryOrFallback",
-          "description": "The module path that is resolved for TypeScript types when this specifier is imported. Should be listed before other conditions. Additionally, versioned \"types\" condition in the form \"types@{selector}\" are supported."
-        }
-      },
-      "patternProperties": {
-        "^[^.0-9]+$": {
-          "$ref": "#/definitions/packageExportsEntryOrFallback",
-          "description": "The module path that is resolved when this environment matches the property name."
-        },
-        "^types@.+$": {
-          "$ref": "#/definitions/packageExportsEntryOrFallback",
-          "description": "The module path that is resolved for TypeScript types when this specifier is imported. Should be listed before other conditions. Additionally, versioned \"types\" condition in the form \"types@{selector}\" are supported."
-        }
-      },
-      "additionalProperties": false
-    },
-    "packageExportsEntry": {
-      "oneOf": [
-        {
-          "$ref": "#/definitions/packageExportsEntryPath"
-        },
-        {
-          "$ref": "#/definitions/packageExportsEntryObject"
-        }
-      ]
-    },
-    "packageExportsFallback": {
-      "type": "array",
-      "description": "Used to allow fallbacks in case this environment doesn't support the preceding entries.",
-      "items": {
-        "$ref": "#/definitions/packageExportsEntry"
-      }
-    },
-    "packageExportsEntryOrFallback": {
-      "oneOf": [
-        {
-          "$ref": "#/definitions/packageExportsEntry"
-        },
-        {
-          "$ref": "#/definitions/packageExportsFallback"
-        }
-      ]
-    },
-    "packageImportsEntryPath": {
-      "type": [
-        "string",
-        "null"
-      ],
-      "description": "The module path that is resolved when this specifier is imported. Set to `null` to disallow importing this module."
-    },
-    "packageImportsEntryObject": {
-      "type": "object",
-      "description": "Used to specify conditional exports, note that Conditional exports are unsupported in older environments, so it's recommended to use the fallback array option if support for those environments is a concern.",
-      "properties": {
-        "require": {
-          "$ref": "#/definitions/packageImportsEntryOrFallback",
-          "description": "The module path that is resolved when this specifier is imported as a CommonJS module using the `require(...)` function."
-        },
-        "import": {
-          "$ref": "#/definitions/packageImportsEntryOrFallback",
-          "description": "The module path that is resolved when this specifier is imported as an ECMAScript module using an `import` declaration or the dynamic `import(...)` function."
-        },
-        "node": {
-          "$ref": "#/definitions/packageImportsEntryOrFallback",
-          "description": "The module path that is resolved when this environment is Node.js."
-        },
-        "default": {
-          "$ref": "#/definitions/packageImportsEntryOrFallback",
-          "description": "The module path that is resolved when no other export type matches."
-        },
-        "types": {
-          "$ref": "#/definitions/packageImportsEntryOrFallback",
-          "description": "The module path that is resolved for TypeScript types when this specifier is imported. Should be listed before other conditions. Additionally, versioned \"types\" condition in the form \"types@{selector}\" are supported."
-        }
-      },
-      "patternProperties": {
-        "^[^.0-9]+$": {
-          "$ref": "#/definitions/packageImportsEntryOrFallback",
-          "description": "The module path that is resolved when this environment matches the property name."
-        },
-        "^types@.+$": {
-          "$ref": "#/definitions/packageImportsEntryOrFallback",
-          "description": "The module path that is resolved for TypeScript types when this specifier is imported. Should be listed before other conditions. Additionally, versioned \"types\" condition in the form \"types@{selector}\" are supported."
-        }
-      },
-      "additionalProperties": false
-    },
-    "packageImportsEntry": {
-      "oneOf": [
-        {
-          "$ref": "#/definitions/packageImportsEntryPath"
-        },
-        {
-          "$ref": "#/definitions/packageImportsEntryObject"
-        }
-      ]
-    },
-    "packageImportsFallback": {
-      "type": "array",
-      "description": "Used to allow fallbacks in case this environment doesn't support the preceding entries.",
-      "items": {
-        "$ref": "#/definitions/packageImportsEntry"
-      }
-    },
-    "packageImportsEntryOrFallback": {
-      "oneOf": [
-        {
-          "$ref": "#/definitions/packageImportsEntry"
-        },
-        {
-          "$ref": "#/definitions/packageImportsFallback"
-        }
-      ]
-    },
-    "fundingUrl": {
-      "type": "string",
-      "format": "uri",
-      "description": "URL to a website with details about how to fund the package."
-    },
-    "fundingWay": {
-      "type": "object",
-      "description": "Used to inform about ways to help fund development of the package.",
-      "properties": {
-        "url": {
-          "$ref": "#/definitions/fundingUrl"
-        },
-        "type": {
-          "type": "string",
-          "description": "The type of funding or the platform through which funding can be provided, e.g. patreon, opencollective, tidelift or github."
-        }
-      },
-      "additionalProperties": false,
-      "required": [
-        "url"
-      ]
-    },
-    "devEngineDependency": {
-      "description": "Specifies requirements for development environment components such as operating systems, runtimes, or package managers. Used to ensure consistent development environments across the team.",
-      "type": "object",
-      "required": [
-        "name"
-      ],
-      "properties": {
-        "name": {
-          "type": "string",
-          "description": "The name of the dependency, with allowed values depending on the parent field"
-        },
-        "version": {
-          "type": "string",
-          "description": "The version range for the dependency"
-        },
-        "onFail": {
-          "type": "string",
-          "enum": [
-            "ignore",
-            "warn",
-            "error",
-            "download"
-          ],
-          "description": "What action to take if validation fails"
-        }
-      }
-    }
-  },
-  "type": "object",
-  "patternProperties": {
-    "^_": {
-      "description": "Any property starting with _ is valid.",
-      "tsType": "any"
-    }
-  },
-  "properties": {
-    "name": {
-      "description": "The name of the package.",
-      "type": "string",
-      "maxLength": 214,
-      "minLength": 1,
-      "pattern": "^(?:(?:@(?:[a-z0-9-*~][a-z0-9-*._~]*)?/[a-z0-9-._~])|[a-z0-9-~])[a-z0-9-._~]*$"
-    },
-    "version": {
-      "description": "Version must be parsable by node-semver, which is bundled with npm as a dependency.",
-      "type": "string"
-    },
-    "description": {
-      "description": "This helps people discover your package, as it's listed in 'npm search'.",
-      "type": "string"
-    },
-    "keywords": {
-      "description": "This helps people discover your package as it's listed in 'npm search'.",
-      "type": "array",
-      "items": {
-        "type": "string"
-      }
-    },
-    "homepage": {
-      "description": "The url to the project homepage.",
-      "type": "string"
-    },
-    "bugs": {
-      "description": "The url to your project's issue tracker and / or the email address to which issues should be reported. These are helpful for people who encounter issues with your package.",
-      "type": [
-        "object",
-        "string"
-      ],
-      "properties": {
-        "url": {
-          "type": "string",
-          "description": "The url to your project's issue tracker.",
-          "format": "uri"
-        },
-        "email": {
-          "type": "string",
-          "description": "The email address to which issues should be reported.",
-          "format": "email"
-        }
-      }
-    },
-    "license": {
-      "$ref": "#/definitions/license",
-      "description": "You should specify a license for your package so that people know how they are permitted to use it, and any restrictions you're placing on it."
-    },
-    "licenses": {
-      "description": "DEPRECATED: Instead, use SPDX expressions, like this: { \"license\": \"ISC\" } or { \"license\": \"(MIT OR Apache-2.0)\" } see: 'https://docs.npmjs.com/files/package.json#license'.",
-      "type": "array",
-      "items": {
-        "type": "object",
-        "properties": {
-          "type": {
-            "$ref": "#/definitions/license"
-          },
-          "url": {
-            "type": "string",
-            "format": "uri"
-          }
-        }
-      }
-    },
-    "author": {
-      "$ref": "#/definitions/person"
-    },
-    "contributors": {
-      "description": "A list of people who contributed to this package.",
-      "type": "array",
-      "items": {
-        "$ref": "#/definitions/person"
-      }
-    },
-    "maintainers": {
-      "description": "A list of people who maintains this package.",
-      "type": "array",
-      "items": {
-        "$ref": "#/definitions/person"
-      }
-    },
-    "files": {
-      "description": "The 'files' field is an array of files to include in your project. If you name a folder in the array, then it will also include the files inside that folder.",
-      "type": "array",
-      "items": {
-        "type": "string"
-      }
-    },
-    "main": {
-      "description": "The main field is a module ID that is the primary entry point to your program.",
-      "type": "string"
-    },
-    "exports": {
-      "description": "The \"exports\" field is used to restrict external access to non-exported module files, also enables a module to import itself using \"name\".",
-      "oneOf": [
-        {
-          "$ref": "#/definitions/packageExportsEntryPath",
-          "description": "The module path that is resolved when the module specifier matches \"name\", shadows the \"main\" field."
-        },
-        {
-          "type": "object",
-          "properties": {
-            ".": {
-              "$ref": "#/definitions/packageExportsEntryOrFallback",
-              "description": "The module path that is resolved when the module specifier matches \"name\", shadows the \"main\" field."
-            }
-          },
-          "patternProperties": {
-            "^\\./.+": {
-              "$ref": "#/definitions/packageExportsEntryOrFallback",
-              "description": "The module path prefix that is resolved when the module specifier starts with \"name/\", set to \"./*\" to allow external modules to import any subpath."
-            }
-          },
-          "additionalProperties": false
-        },
-        {
-          "$ref": "#/definitions/packageExportsEntryObject",
-          "description": "The module path that is resolved when the module specifier matches \"name\", shadows the \"main\" field."
-        },
-        {
-          "$ref": "#/definitions/packageExportsFallback",
-          "description": "The module path that is resolved when the module specifier matches \"name\", shadows the \"main\" field."
-        }
-      ]
-    },
-    "imports": {
-      "description": "The \"imports\" field is used to create private mappings that only apply to import specifiers from within the package itself.",
-      "type": "object",
-      "patternProperties": {
-        "^#.+$": {
-          "$ref": "#/definitions/packageImportsEntryOrFallback",
-          "description": "The module path that is resolved when this environment matches the property name."
-        }
-      },
-      "additionalProperties": false
-    },
-    "bin": {
-      "type": [
-        "string",
-        "object"
-      ],
-      "additionalProperties": {
-        "type": "string"
-      }
-    },
-    "type": {
-      "description": "When set to \"module\", the type field allows a package to specify all .js files within are ES modules. If the \"type\" field is omitted or set to \"commonjs\", all .js files are treated as CommonJS.",
-      "type": "string",
-      "enum": [
-        "commonjs",
-        "module"
-      ],
-      "default": "commonjs"
-    },
-    "types": {
-      "description": "Set the types property to point to your bundled declaration file.",
-      "type": "string"
-    },
-    "typings": {
-      "description": "Note that the \"typings\" field is synonymous with \"types\", and could be used as well.",
-      "type": "string"
-    },
-    "typesVersions": {
-      "description": "The \"typesVersions\" field is used since TypeScript 3.1 to support features that were only made available in newer TypeScript versions.",
-      "type": "object",
-      "additionalProperties": {
-        "description": "Contains overrides for the TypeScript version that matches the version range matching the property key.",
-        "type": "object",
-        "properties": {
-          "*": {
-            "description": "Maps all file paths to the file paths specified in the array.",
-            "type": "array",
-            "items": {
-              "type": "string",
-              "pattern": "^[^*]*(?:\\*[^*]*)?$"
-            }
-          }
-        },
-        "patternProperties": {
-          "^[^*]+$": {
-            "description": "Maps the file path matching the property key to the file paths specified in the array.",
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
-          },
-          "^[^*]*\\*[^*]*$": {
-            "description": "Maps file paths matching the pattern specified in property key to file paths specified in the array.",
-            "type": "array",
-            "items": {
-              "type": "string",
-              "pattern": "^[^*]*(?:\\*[^*]*)?$"
-            }
-          }
-        },
-        "additionalProperties": false
-      }
-    },
-    "man": {
-      "type": [
-        "array",
-        "string"
-      ],
-      "description": "Specify either a single file or an array of filenames to put in place for the man program to find.",
-      "items": {
-        "type": "string"
-      }
-    },
-    "directories": {
-      "type": "object",
-      "properties": {
-        "bin": {
-          "description": "If you specify a 'bin' directory, then all the files in that folder will be used as the 'bin' hash.",
-          "type": "string"
-        },
-        "doc": {
-          "description": "Put markdown files in here. Eventually, these will be displayed nicely, maybe, someday.",
-          "type": "string"
-        },
-        "example": {
-          "description": "Put example scripts in here. Someday, it might be exposed in some clever way.",
-          "type": "string"
-        },
-        "lib": {
-          "description": "Tell people where the bulk of your library is. Nothing special is done with the lib folder in any way, but it's useful meta info.",
-          "type": "string"
-        },
-        "man": {
-          "description": "A folder that is full of man pages. Sugar to generate a 'man' array by walking the folder.",
-          "type": "string"
-        },
-        "test": {
-          "type": "string"
-        }
-      }
-    },
-    "repository": {
-      "description": "Specify the place where your code lives. This is helpful for people who want to contribute.",
-      "type": [
-        "object",
-        "string"
-      ],
-      "properties": {
-        "type": {
-          "type": "string"
-        },
-        "url": {
-          "type": "string"
-        },
-        "directory": {
-          "type": "string"
-        }
-      }
-    },
-    "funding": {
-      "oneOf": [
-        {
-          "$ref": "#/definitions/fundingUrl"
-        },
-        {
-          "$ref": "#/definitions/fundingWay"
-        },
-        {
-          "type": "array",
-          "items": {
-            "oneOf": [
-              {
-                "$ref": "#/definitions/fundingUrl"
-              },
-              {
-                "$ref": "#/definitions/fundingWay"
-              }
-            ]
-          },
-          "minItems": 1,
-          "uniqueItems": true
-        }
-      ]
-    },
-    "scripts": {
-      "description": "The 'scripts' member is an object hash of script commands that are run at various times in the lifecycle of your package. The key is the lifecycle event, and the value is the command to run at that point.",
-      "type": "object",
-      "properties": {
-        "lint": {
-          "type": "string",
-          "description": "Run code quality tools, e.g. ESLint, TSLint, etc."
-        },
-        "prepublish": {
-          "type": "string",
-          "description": "Run BEFORE the package is published (Also run on local npm install without any arguments)."
-        },
-        "prepare": {
-          "type": "string",
-          "description": "Runs BEFORE the package is packed, i.e. during \"npm publish\" and \"npm pack\", and on local \"npm install\" without any arguments. This is run AFTER \"prepublish\", but BEFORE \"prepublishOnly\"."
-        },
-        "prepublishOnly": {
-          "type": "string",
-          "description": "Run BEFORE the package is prepared and packed, ONLY on npm publish."
-        },
-        "prepack": {
-          "type": "string",
-          "description": "run BEFORE a tarball is packed (on npm pack, npm publish, and when installing git dependencies)."
-        },
-        "postpack": {
-          "type": "string",
-          "description": "Run AFTER the tarball has been generated and moved to its final destination."
-        },
-        "publish": {
-          "type": "string",
-          "description": "Publishes a package to the registry so that it can be installed by name. See https://docs.npmjs.com/cli/v8/commands/npm-publish"
-        },
-        "postpublish": {
-          "$ref": "#/definitions/scriptsPublishAfter"
-        },
-        "preinstall": {
-          "type": "string",
-          "description": "Run BEFORE the package is installed."
-        },
-        "install": {
-          "$ref": "#/definitions/scriptsInstallAfter"
-        },
-        "postinstall": {
-          "$ref": "#/definitions/scriptsInstallAfter"
-        },
-        "preuninstall": {
-          "$ref": "#/definitions/scriptsUninstallBefore"
-        },
-        "uninstall": {
-          "$ref": "#/definitions/scriptsUninstallBefore"
-        },
-        "postuninstall": {
-          "type": "string",
-          "description": "Run AFTER the package is uninstalled."
-        },
-        "preversion": {
-          "$ref": "#/definitions/scriptsVersionBefore"
-        },
-        "version": {
-          "$ref": "#/definitions/scriptsVersionBefore"
-        },
-        "postversion": {
-          "type": "string",
-          "description": "Run AFTER bump the package version."
-        },
-        "pretest": {
-          "$ref": "#/definitions/scriptsTest"
-        },
-        "test": {
-          "$ref": "#/definitions/scriptsTest"
-        },
-        "posttest": {
-          "$ref": "#/definitions/scriptsTest"
-        },
-        "prestop": {
-          "$ref": "#/definitions/scriptsStop"
-        },
-        "stop": {
-          "$ref": "#/definitions/scriptsStop"
-        },
-        "poststop": {
-          "$ref": "#/definitions/scriptsStop"
-        },
-        "prestart": {
-          "$ref": "#/definitions/scriptsStart"
-        },
-        "start": {
-          "$ref": "#/definitions/scriptsStart"
-        },
-        "poststart": {
-          "$ref": "#/definitions/scriptsStart"
-        },
-        "prerestart": {
-          "$ref": "#/definitions/scriptsRestart"
-        },
-        "restart": {
-          "$ref": "#/definitions/scriptsRestart"
-        },
-        "postrestart": {
-          "$ref": "#/definitions/scriptsRestart"
-        },
-        "serve": {
-          "type": "string",
-          "description": "Start dev server to serve application files"
-        }
-      },
-      "additionalProperties": {
-        "type": "string",
-        "tsType": "string | undefined",
-        "x-intellij-language-injection": "Shell Script"
-      }
-    },
-    "config": {
-      "description": "A 'config' hash can be used to set configuration parameters used in package scripts that persist across upgrades.",
-      "type": "object",
-      "additionalProperties": true
-    },
-    "dependencies": {
-      "$ref": "#/definitions/dependency"
-    },
-    "devDependencies": {
-      "$ref": "#/definitions/devDependency"
-    },
-    "optionalDependencies": {
-      "$ref": "#/definitions/optionalDependency"
-    },
-    "peerDependencies": {
-      "$ref": "#/definitions/peerDependency"
-    },
-    "peerDependenciesMeta": {
-      "$ref": "#/definitions/peerDependencyMeta"
-    },
-    "bundleDependencies": {
-      "description": "Array of package names that will be bundled when publishing the package.",
-      "oneOf": [
-        {
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        },
-        {
-          "type": "boolean"
-        }
-      ]
-    },
-    "bundledDependencies": {
-      "description": "DEPRECATED: This field is honored, but \"bundleDependencies\" is the correct field name.",
-      "oneOf": [
-        {
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        },
-        {
-          "type": "boolean"
-        }
-      ]
-    },
-    "resolutions": {
-      "description": "Resolutions is used to support selective version resolutions using yarn, which lets you define custom package versions or ranges inside your dependencies. For npm, use overrides instead. See: https://yarnpkg.com/configuration/manifest#resolutions",
-      "type": "object"
-    },
-    "overrides": {
-      "description": "Overrides is used to support selective version overrides using npm, which lets you define custom package versions or ranges inside your dependencies. For yarn, use resolutions instead. See: https://docs.npmjs.com/cli/v9/configuring-npm/package-json#overrides",
-      "type": "object"
-    },
-    "packageManager": {
-      "description": "Defines which package manager is expected to be used when working on the current project. This field is currently experimental and needs to be opted-in; see https://nodejs.org/api/corepack.html",
-      "type": "string",
-      "pattern": "(npm|pnpm|yarn|bun)@\\d+\\.\\d+\\.\\d+(-.+)?"
-    },
-    "engines": {
-      "type": "object",
-      "properties": {
-        "node": {
-          "type": "string"
-        }
-      },
-      "additionalProperties": {
-        "type": "string"
-      }
-    },
-    "volta": {
-      "description": "Defines which tools and versions are expected to be used when Volta is installed.",
-      "type": "object",
-      "properties": {
-        "extends": {
-          "description": "The value of that entry should be a path to another JSON file which also has a \"volta\" section",
-          "type": "string"
-        }
-      },
-      "patternProperties": {
-        "(node|npm|pnpm|yarn)": {
-          "type": "string"
-        }
-      }
-    },
-    "engineStrict": {
-      "type": "boolean"
-    },
-    "os": {
-      "description": "Specify which operating systems your module will run on.",
-      "type": "array",
-      "items": {
-        "type": "string"
-      }
-    },
-    "cpu": {
-      "description": "Specify that your code only runs on certain cpu architectures.",
-      "type": "array",
-      "items": {
-        "type": "string"
-      }
-    },
-    "devEngines": {
-      "description": "Define the runtime and package manager for developing the current project.",
-      "type": "object",
-      "properties": {
-        "os": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/devEngineDependency"
-            },
-            {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/devEngineDependency"
-              }
-            }
-          ],
-          "description": "Specifies which operating systems are supported for development"
-        },
-        "cpu": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/devEngineDependency"
-            },
-            {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/devEngineDependency"
-              }
-            }
-          ],
-          "description": "Specifies which CPU architectures are supported for development"
-        },
-        "libc": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/devEngineDependency"
-            },
-            {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/devEngineDependency"
-              }
-            }
-          ],
-          "description": "Specifies which C standard libraries are supported for development"
-        },
-        "runtime": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/devEngineDependency"
-            },
-            {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/devEngineDependency"
-              }
-            }
-          ],
-          "description": "Specifies which JavaScript runtimes (like Node.js, Deno, Bun) are supported for development. Values should use WinterCG Runtime Keys (see https://runtime-keys.proposal.wintercg.org/)"
-        },
-        "packageManager": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/devEngineDependency"
-            },
-            {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/devEngineDependency"
-              }
-            }
-          ],
-          "description": "Specifies which package managers are supported for development"
-        }
-      }
-    },
-    "preferGlobal": {
-      "type": "boolean",
-      "description": "DEPRECATED: This option used to trigger an npm warning, but it will no longer warn. It is purely there for informational purposes. It is now recommended that you install any binaries as local devDependencies wherever possible."
-    },
-    "private": {
-      "description": "If set to true, then npm will refuse to publish it.",
-      "oneOf": [
-        {
-          "type": "boolean"
-        },
-        {
-          "enum": [
-            "false",
-            "true"
-          ]
-        }
-      ]
-    },
-    "publishConfig": {
-      "type": "object",
-      "properties": {
-        "access": {
-          "type": "string",
-          "enum": [
-            "public",
-            "restricted"
-          ]
-        },
-        "tag": {
-          "type": "string"
-        },
-        "registry": {
-          "type": "string",
-          "format": "uri"
-        },
-        "provenance": {
-          "type": "boolean"
-        }
-      },
-      "additionalProperties": true
-    },
-    "dist": {
-      "type": "object",
-      "properties": {
-        "shasum": {
-          "type": "string"
-        },
-        "tarball": {
-          "type": "string"
-        }
-      }
-    },
-    "readme": {
-      "type": "string"
-    },
-    "module": {
-      "description": "An ECMAScript module ID that is the primary entry point to your program.",
-      "type": "string"
-    },
-    "esnext": {
-      "description": "A module ID with untranspiled code that is the primary entry point to your program.",
-      "type": [
-        "string",
-        "object"
-      ],
-      "properties": {
-        "main": {
-          "type": "string"
-        },
-        "browser": {
-          "type": "string"
-        }
-      },
-      "additionalProperties": {
-        "type": "string"
-      }
-    },
-    "workspaces": {
-      "description": "Allows packages within a directory to depend on one another using direct linking of local files. Additionally, dependencies within a workspace are hoisted to the workspace root when possible to reduce duplication. Note: It's also a good idea to set \"private\" to true when using this feature.",
-      "anyOf": [
-        {
-          "type": "array",
-          "description": "Workspace package paths. Glob patterns are supported.",
-          "items": {
-            "type": "string"
-          }
-        },
-        {
-          "type": "object",
-          "properties": {
-            "packages": {
-              "type": "array",
-              "description": "Workspace package paths. Glob patterns are supported.",
-              "items": {
-                "type": "string"
-              }
-            },
-            "nohoist": {
-              "type": "array",
-              "description": "Packages to block from hoisting to the workspace root. Currently only supported in Yarn only.",
-              "items": {
-                "type": "string"
-              }
-            }
-          }
-        }
-      ]
-    },
-    "jspm": {
-      "$ref": "#"
-    },
-    "eslintConfig": {
-      "$ref": "https://www.schemastore.org/eslintrc.json"
-    },
-    "prettier": {
-      "$ref": "https://www.schemastore.org/prettierrc.json"
-    },
-    "stylelint": {
-      "$ref": "https://www.schemastore.org/stylelintrc.json"
-    },
-    "ava": {
-      "$ref": "https://www.schemastore.org/ava.json"
-    },
-    "release": {
-      "$ref": "https://www.schemastore.org/semantic-release.json"
-    },
-    "jscpd": {
-      "$ref": "https://www.schemastore.org/jscpd.json"
-    },
-    "pnpm": {
-      "description": "Defines pnpm specific configuration.",
-      "type": "object",
-      "properties": {
-        "overrides": {
-          "description": "Used to override any dependency in the dependency graph.",
-          "type": "object"
-        },
-        "packageExtensions": {
-          "description": "Used to extend the existing package definitions with additional information.",
-          "type": "object",
-          "patternProperties": {
-            "^.+$": {
-              "type": "object",
-              "properties": {
-                "dependencies": {
-                  "$ref": "#/definitions/dependency"
-                },
-                "optionalDependencies": {
-                  "$ref": "#/definitions/optionalDependency"
-                },
-                "peerDependencies": {
-                  "$ref": "#/definitions/peerDependency"
-                },
-                "peerDependenciesMeta": {
-                  "$ref": "#/definitions/peerDependencyMeta"
-                }
-              },
-              "additionalProperties": false
-            }
-          },
-          "additionalProperties": false
-        },
-        "peerDependencyRules": {
-          "type": "object",
-          "properties": {
-            "ignoreMissing": {
-              "description": "pnpm will not print warnings about missing peer dependencies from this list.",
-              "type": "array",
-              "items": {
-                "type": "string"
-              }
-            },
-            "allowedVersions": {
-              "description": "Unmet peer dependency warnings will not be printed for peer dependencies of the specified range.",
-              "type": "object"
-            },
-            "allowAny": {
-              "description": "Any peer dependency matching the pattern will be resolved from any version, regardless of the range specified in \"peerDependencies\".",
-              "type": "array",
-              "items": {
-                "type": "string"
-              }
-            }
-          },
-          "additionalProperties": false
-        },
-        "neverBuiltDependencies": {
-          "description": "A list of dependencies to run builds for.",
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        },
-        "onlyBuiltDependencies": {
-          "description": "A list of package names that are allowed to be executed during installation.",
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        },
-        "onlyBuiltDependenciesFile": {
-          "description": "Specifies a JSON file that lists the only packages permitted to run installation scripts during the pnpm install process.",
-          "type": "string"
-        },
-        "ignoredBuiltDependencies": {
-          "description": "A list of package names that should not be built during installation.",
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        },
-        "allowedDeprecatedVersions": {
-          "description": "A list of deprecated versions that the warnings are suppressed.",
-          "type": "object"
-        },
-        "patchedDependencies": {
-          "description": "A list of dependencies that are patched.",
-          "type": "object"
-        },
-        "allowNonAppliedPatches": {
-          "description": "When true, installation won't fail if some of the patches from the \"patchedDependencies\" field were not applied.",
-          "type": "boolean"
-        },
-        "allowUnusedPatches": {
-          "description": "When true, installation won't fail if some of the patches from the \"patchedDependencies\" field were not applied.",
-          "type": "boolean"
-        },
-        "updateConfig": {
-          "type": "object",
-          "properties": {
-            "ignoreDependencies": {
-              "description": "A list of packages that should be ignored when running \"pnpm outdated\" or \"pnpm update --latest\".",
-              "type": "array",
-              "items": {
-                "type": "string"
-              }
-            }
-          },
-          "additionalProperties": false
-        },
-        "configDependencies": {
-          "type": "object",
-          "description": "Configurational dependencies are installed before all the other types of dependencies (before 'dependencies', 'devDependencies', 'optionalDependencies')."
-        },
-        "auditConfig": {
-          "type": "object",
-          "properties": {
-            "ignoreCves": {
-              "description": "A list of CVE IDs that will be ignored by \"pnpm audit\".",
-              "type": "array",
-              "items": {
-                "type": "string",
-                "pattern": "^CVE-\\d{4}-\\d{4,7}$"
-              }
-            },
-            "ignoreGhsas": {
-              "description": "A list of GHSA Codes that will be ignored by \"pnpm audit\".",
-              "type": "array",
-              "items": {
-                "type": "string",
-                "pattern": "^GHSA(-[23456789cfghjmpqrvwx]{4}){3}$"
-              }
-            }
-          },
-          "additionalProperties": false
-        },
-        "requiredScripts": {
-          "description": "A list of scripts that must exist in each project.",
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        },
-        "supportedArchitectures": {
-          "description": "Specifies architectures for which you'd like to install optional dependencies, even if they don't match the architecture of the system running the install.",
-          "type": "object",
-          "properties": {
-            "os": {
-              "type": "array",
-              "items": {
-                "type": "string"
-              }
-            },
-            "cpu": {
-              "type": "array",
-              "items": {
-                "type": "string"
-              }
-            },
-            "libc": {
-              "type": "array",
-              "items": {
-                "type": "string"
-              }
-            }
-          },
-          "additionalProperties": false
-        },
-        "ignoredOptionalDependencies": {
-          "description": "A list of optional dependencies that the install should be skipped.",
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        },
-        "executionEnv": {
-          "type": "object",
-          "properties": {
-            "nodeVersion": {
-              "description": "Specifies which exact Node.js version should be used for the project's runtime.",
-              "type": "string"
-            }
-          },
-          "additionalProperties": false
-        }
-      },
-      "additionalProperties": false
-    },
-    "stackblitz": {
-      "description": "Defines the StackBlitz configuration for the project.",
-      "type": "object",
-      "properties": {
-        "installDependencies": {
-          "description": "StackBlitz automatically installs npm dependencies when opening a project.",
-          "type": "boolean"
-        },
-        "startCommand": {
-          "description": "A terminal command to be executed when opening the project, after installing npm dependencies.",
-          "type": [
-            "string",
-            "boolean"
-          ]
-        },
-        "compileTrigger": {
-          "description": "The compileTrigger option controls how file changes in the editor are written to the WebContainers in-memory filesystem. ",
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "auto",
-                "keystroke",
-                "save"
-              ]
-            }
-          ]
-        },
-        "env": {
-          "description": "A map of default environment variables that will be set in each top-level shell process.",
-          "type": "object"
-        }
-      },
-      "additionalProperties": false
-    }
-  },
-  "anyOf": [
-    {
-      "type": "object",
-      "not": {
-        "required": [
-          "bundledDependencies",
-          "bundleDependencies"
-        ]
-      }
-    },
-    {
-      "type": "object",
-      "not": {
-        "required": [
-          "bundleDependencies"
-        ]
-      },
-      "required": [
-        "bundledDependencies"
-      ]
-    },
-    {
-      "type": "object",
-      "not": {
-        "required": [
-          "bundledDependencies"
-        ]
-      },
-      "required": [
-        "bundleDependencies"
-      ]
-    }
-  ],
-  "$id": "https://www.schemastore.org/package.json"
-}
diff --git a/crates/json_schema_store/src/schemas/tsconfig.json b/crates/json_schema_store/src/schemas/tsconfig.json
deleted file mode 100644
index 9484c027df..0000000000
--- a/crates/json_schema_store/src/schemas/tsconfig.json
+++ /dev/null
@@ -1,1472 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "allowTrailingCommas": true,
-  "allOf": [
-    {
-      "$ref": "#/definitions/compilerOptionsDefinition"
-    },
-    {
-      "$ref": "#/definitions/compileOnSaveDefinition"
-    },
-    {
-      "$ref": "#/definitions/typeAcquisitionDefinition"
-    },
-    {
-      "$ref": "#/definitions/extendsDefinition"
-    },
-    {
-      "$ref": "#/definitions/watchOptionsDefinition"
-    },
-    {
-      "$ref": "#/definitions/buildOptionsDefinition"
-    },
-    {
-      "$ref": "#/definitions/tsNodeDefinition"
-    },
-    {
-      "anyOf": [
-        {
-          "$ref": "#/definitions/filesDefinition"
-        },
-        {
-          "$ref": "#/definitions/excludeDefinition"
-        },
-        {
-          "$ref": "#/definitions/includeDefinition"
-        },
-        {
-          "$ref": "#/definitions/referencesDefinition"
-        }
-      ]
-    }
-  ],
-  "definitions": {
-    "//": {
-      "explainer": "https://www.typescriptlang.org/docs/handbook/tsconfig-json.html#overview",
-      "reference": "https://www.typescriptlang.org/tsconfig",
-      "reference metadata": "https://github.com/microsoft/TypeScript-Website/blob/v2/packages/tsconfig-reference/scripts/tsconfigRules.ts"
-    },
-    "filesDefinition": {
-      "properties": {
-        "files": {
-          "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-          "description": "If no 'files' or 'include' property is present in a tsconfig.json, the compiler defaults to including all files in the containing directory and subdirectories except those specified by 'exclude'. When a 'files' property is specified, only those files and those specified by 'include' are included.",
-          "type": ["array", "null"],
-          "uniqueItems": true,
-          "items": {
-            "type": ["string", "null"]
-          }
-        }
-      }
-    },
-    "excludeDefinition": {
-      "properties": {
-        "exclude": {
-          "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-          "description": "Specifies a list of files to be excluded from compilation. The 'exclude' property only affects the files included via the 'include' property and not the 'files' property. Glob patterns require TypeScript version 2.0 or later.",
-          "type": ["array", "null"],
-          "uniqueItems": true,
-          "items": {
-            "type": ["string", "null"]
-          }
-        }
-      }
-    },
-    "includeDefinition": {
-      "properties": {
-        "include": {
-          "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-          "description": "Specifies a list of glob patterns that match files to be included in compilation. If no 'files' or 'include' property is present in a tsconfig.json, the compiler defaults to including all files in the containing directory and subdirectories except those specified by 'exclude'. Requires TypeScript version 2.0 or later.",
-          "type": ["array", "null"],
-          "uniqueItems": true,
-          "items": {
-            "type": ["string", "null"]
-          }
-        }
-      }
-    },
-    "compileOnSaveDefinition": {
-      "properties": {
-        "compileOnSave": {
-          "description": "Enable Compile-on-Save for this project.",
-          "type": ["boolean", "null"]
-        }
-      }
-    },
-    "extendsDefinition": {
-      "properties": {
-        "extends": {
-          "description": "Path to base configuration file to inherit from (requires TypeScript version 2.1 or later), or array of base files, with the rightmost files having the greater priority (requires TypeScript version 5.0 or later).",
-          "oneOf": [
-            {
-              "default": "",
-              "type": "string"
-            },
-            {
-              "default": [],
-              "items": {
-                "type": "string"
-              },
-              "type": "array"
-            }
-          ]
-        }
-      }
-    },
-    "buildOptionsDefinition": {
-      "properties": {
-        "buildOptions": {
-          "properties": {
-            "dry": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "~",
-              "type": ["boolean", "null"],
-              "default": false
-            },
-            "force": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Build all projects, including those that appear to be up to date",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Build all projects, including those that appear to be up to date\n\nSee more: https://www.typescriptlang.org/tsconfig#force"
-            },
-            "verbose": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Enable verbose logging",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Enable verbose logging\n\nSee more: https://www.typescriptlang.org/tsconfig#verbose"
-            },
-            "incremental": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Save .tsbuildinfo files to allow for incremental compilation of projects.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Save .tsbuildinfo files to allow for incremental compilation of projects.\n\nSee more: https://www.typescriptlang.org/tsconfig#incremental"
-            },
-            "assumeChangesOnlyAffectDirectDependencies": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Have recompiles in projects that use `incremental` and `watch` mode assume that changes within a file will only affect files directly depending on it.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Have recompiles in projects that use `incremental` and `watch` mode assume that changes within a file will only affect files directly depending on it.\n\nSee more: https://www.typescriptlang.org/tsconfig#assumeChangesOnlyAffectDirectDependencies"
-            },
-            "traceResolution": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Log paths used during the `moduleResolution` process.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Log paths used during the `moduleResolution` process.\n\nSee more: https://www.typescriptlang.org/tsconfig#traceResolution"
-            }
-          }
-        }
-      }
-    },
-    "watchOptionsDefinition": {
-      "properties": {
-        "watchOptions": {
-          "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-          "type": ["object", "null"],
-          "description": "Settings for the watch mode in TypeScript.",
-          "properties": {
-            "force": {
-              "description": "~",
-              "type": ["string", "null"]
-            },
-            "watchFile": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specify how the TypeScript watch mode works.",
-              "type": ["string", "null"],
-              "markdownDescription": "Specify how the TypeScript watch mode works.\n\nSee more: https://www.typescriptlang.org/tsconfig#watchFile"
-            },
-            "watchDirectory": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specify how directories are watched on systems that lack recursive file-watching functionality.",
-              "type": ["string", "null"],
-              "markdownDescription": "Specify how directories are watched on systems that lack recursive file-watching functionality.\n\nSee more: https://www.typescriptlang.org/tsconfig#watchDirectory"
-            },
-            "fallbackPolling": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specify what approach the watcher should use if the system runs out of native file watchers.",
-              "type": ["string", "null"],
-              "markdownDescription": "Specify what approach the watcher should use if the system runs out of native file watchers.\n\nSee more: https://www.typescriptlang.org/tsconfig#fallbackPolling"
-            },
-            "synchronousWatchDirectory": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Synchronously call callbacks and update the state of directory watchers on platforms that don`t support recursive watching natively.",
-              "type": ["boolean", "null"],
-              "markdownDescription": "Synchronously call callbacks and update the state of directory watchers on platforms that don`t support recursive watching natively.\n\nSee more: https://www.typescriptlang.org/tsconfig#synchronousWatchDirectory"
-            },
-            "excludeFiles": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Remove a list of files from the watch mode's processing.",
-              "type": ["array", "null"],
-              "uniqueItems": true,
-              "items": {
-                "type": ["string", "null"]
-              },
-              "markdownDescription": "Remove a list of files from the watch mode's processing.\n\nSee more: https://www.typescriptlang.org/tsconfig#excludeFiles"
-            },
-            "excludeDirectories": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Remove a list of directories from the watch process.",
-              "type": ["array", "null"],
-              "uniqueItems": true,
-              "items": {
-                "type": ["string", "null"]
-              },
-              "markdownDescription": "Remove a list of directories from the watch process.\n\nSee more: https://www.typescriptlang.org/tsconfig#excludeDirectories"
-            }
-          }
-        }
-      }
-    },
-    "compilerOptionsDefinition": {
-      "properties": {
-        "compilerOptions": {
-          "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-          "type": ["object", "null"],
-          "description": "Instructs the TypeScript compiler how to compile .ts files.",
-          "properties": {
-            "allowArbitraryExtensions": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Enable importing files with any extension, provided a declaration file is present.",
-              "type": ["boolean", "null"],
-              "markdownDescription": "Enable importing files with any extension, provided a declaration file is present.\n\nSee more: https://www.typescriptlang.org/tsconfig#allowArbitraryExtensions"
-            },
-            "allowImportingTsExtensions": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set.",
-              "type": ["boolean", "null"],
-              "markdownDescription": "Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set.\n\nSee more: https://www.typescriptlang.org/tsconfig#allowImportingTsExtensions"
-            },
-            "charset": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "No longer supported. In early versions, manually set the text encoding for reading files.",
-              "type": ["string", "null"],
-              "markdownDescription": "No longer supported. In early versions, manually set the text encoding for reading files.\n\nSee more: https://www.typescriptlang.org/tsconfig#charset"
-            },
-            "composite": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Enable constraints that allow a TypeScript project to be used with project references.",
-              "type": ["boolean", "null"],
-              "default": true,
-              "markdownDescription": "Enable constraints that allow a TypeScript project to be used with project references.\n\nSee more: https://www.typescriptlang.org/tsconfig#composite"
-            },
-            "customConditions": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Conditions to set in addition to the resolver-specific defaults when resolving imports.",
-              "type": ["array", "null"],
-              "uniqueItems": true,
-              "items": {
-                "type": ["string", "null"]
-              },
-              "markdownDescription": "Conditions to set in addition to the resolver-specific defaults when resolving imports.\n\nSee more: https://www.typescriptlang.org/tsconfig#customConditions"
-            },
-            "declaration": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Generate .d.ts files from TypeScript and JavaScript files in your project.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Generate .d.ts files from TypeScript and JavaScript files in your project.\n\nSee more: https://www.typescriptlang.org/tsconfig#declaration"
-            },
-            "declarationDir": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specify the output directory for generated declaration files.",
-              "type": ["string", "null"],
-              "markdownDescription": "Specify the output directory for generated declaration files.\n\nSee more: https://www.typescriptlang.org/tsconfig#declarationDir"
-            },
-            "diagnostics": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Output compiler performance information after building.",
-              "type": ["boolean", "null"],
-              "markdownDescription": "Output compiler performance information after building.\n\nSee more: https://www.typescriptlang.org/tsconfig#diagnostics"
-            },
-            "disableReferencedProjectLoad": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Reduce the number of projects loaded automatically by TypeScript.",
-              "type": ["boolean", "null"],
-              "markdownDescription": "Reduce the number of projects loaded automatically by TypeScript.\n\nSee more: https://www.typescriptlang.org/tsconfig#disableReferencedProjectLoad"
-            },
-            "noPropertyAccessFromIndexSignature": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Enforces using indexed accessors for keys declared using an indexed type",
-              "type": ["boolean", "null"],
-              "markdownDescription": "Enforces using indexed accessors for keys declared using an indexed type\n\nSee more: https://www.typescriptlang.org/tsconfig#noPropertyAccessFromIndexSignature"
-            },
-            "emitBOM": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files.\n\nSee more: https://www.typescriptlang.org/tsconfig#emitBOM"
-            },
-            "emitDeclarationOnly": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Only output d.ts files and not JavaScript files.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Only output d.ts files and not JavaScript files.\n\nSee more: https://www.typescriptlang.org/tsconfig#emitDeclarationOnly"
-            },
-            "exactOptionalPropertyTypes": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Differentiate between undefined and not present when type checking",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Differentiate between undefined and not present when type checking\n\nSee more: https://www.typescriptlang.org/tsconfig#exactOptionalPropertyTypes"
-            },
-            "incremental": {
-              "description": "Enable incremental compilation. Requires TypeScript version 3.4 or later.",
-              "type": ["boolean", "null"]
-            },
-            "tsBuildInfoFile": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specify the folder for .tsbuildinfo incremental compilation files.",
-              "default": ".tsbuildinfo",
-              "type": ["string", "null"],
-              "markdownDescription": "Specify the folder for .tsbuildinfo incremental compilation files.\n\nSee more: https://www.typescriptlang.org/tsconfig#tsBuildInfoFile"
-            },
-            "inlineSourceMap": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Include sourcemap files inside the emitted JavaScript.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Include sourcemap files inside the emitted JavaScript.\n\nSee more: https://www.typescriptlang.org/tsconfig#inlineSourceMap"
-            },
-            "inlineSources": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Include source code in the sourcemaps inside the emitted JavaScript.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Include source code in the sourcemaps inside the emitted JavaScript.\n\nSee more: https://www.typescriptlang.org/tsconfig#inlineSources"
-            },
-            "jsx": {
-              "description": "Specify what JSX code is generated.",
-              "enum": [
-                "preserve",
-                "react",
-                "react-jsx",
-                "react-jsxdev",
-                "react-native"
-              ]
-            },
-            "reactNamespace": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specify the object invoked for `createElement`. This only applies when targeting `react` JSX emit.",
-              "type": ["string", "null"],
-              "default": "React",
-              "markdownDescription": "Specify the object invoked for `createElement`. This only applies when targeting `react` JSX emit.\n\nSee more: https://www.typescriptlang.org/tsconfig#reactNamespace"
-            },
-            "jsxFactory": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'",
-              "type": ["string", "null"],
-              "default": "React.createElement",
-              "markdownDescription": "Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'\n\nSee more: https://www.typescriptlang.org/tsconfig#jsxFactory"
-            },
-            "jsxFragmentFactory": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'.",
-              "type": ["string", "null"],
-              "default": "React.Fragment",
-              "markdownDescription": "Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'.\n\nSee more: https://www.typescriptlang.org/tsconfig#jsxFragmentFactory"
-            },
-            "jsxImportSource": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specify module specifier used to import the JSX factory functions when using `jsx: react-jsx`.",
-              "type": ["string", "null"],
-              "default": "react",
-              "markdownDescription": "Specify module specifier used to import the JSX factory functions when using `jsx: react-jsx`.\n\nSee more: https://www.typescriptlang.org/tsconfig#jsxImportSource"
-            },
-            "listFiles": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Print all of the files read during the compilation.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Print all of the files read during the compilation.\n\nSee more: https://www.typescriptlang.org/tsconfig#listFiles"
-            },
-            "mapRoot": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specify the location where debugger should locate map files instead of generated locations.",
-              "type": ["string", "null"],
-              "markdownDescription": "Specify the location where debugger should locate map files instead of generated locations.\n\nSee more: https://www.typescriptlang.org/tsconfig#mapRoot"
-            },
-            "module": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specify what module code is generated.",
-              "type": ["string", "null"],
-              "anyOf": [
-                {
-                  "enum": [
-                    "CommonJS",
-                    "AMD",
-                    "System",
-                    "UMD",
-                    "ES6",
-                    "ES2015",
-                    "ES2020",
-                    "ESNext",
-                    "None",
-                    "ES2022",
-                    "Node16",
-                    "NodeNext",
-                    "Preserve"
-                  ]
-                },
-                {
-                  "pattern": "^([Cc][Oo][Mm][Mm][Oo][Nn][Jj][Ss]|[AaUu][Mm][Dd]|[Ss][Yy][Ss][Tt][Ee][Mm]|[Ee][Ss]([356]|20(1[567]|2[02])|[Nn][Ee][Xx][Tt])|[Nn][Oo][dD][Ee]16|[Nn][Oo][Dd][Ee][Nn][Ee][Xx][Tt]|[Nn][Oo][Nn][Ee]|[Pp][Rr][Ee][Ss][Ee][Rr][Vv][Ee])$"
-                }
-              ],
-              "markdownDescription": "Specify what module code is generated.\n\nSee more: https://www.typescriptlang.org/tsconfig#module"
-            },
-            "moduleResolution": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specify how TypeScript looks up a file from a given module specifier.",
-              "type": ["string", "null"],
-              "anyOf": [
-                {
-                  "enum": [
-                    "classic",
-                    "node",
-                    "node10",
-                    "node16",
-                    "nodenext",
-                    "bundler"
-                  ],
-                  "markdownEnumDescriptions": [
-                    "It’s recommended to use `\"node16\"` instead",
-                    "Deprecated, use `\"node10\"` in TypeScript 5.0+ instead",
-                    "It’s recommended to use `\"node16\"` instead",
-                    "This is the recommended setting for libraries and Node.js applications",
-                    "This is the recommended setting for libraries and Node.js applications",
-                    "This is the recommended setting in TypeScript 5.0+ for applications that use a bundler"
-                  ]
-                },
-                {
-                  "pattern": "^(([Nn]ode)|([Nn]ode1[06])|([Nn]ode[Nn]ext)|([Cc]lassic)|([Bb]undler))$"
-                }
-              ],
-              "markdownDescription": "Specify how TypeScript looks up a file from a given module specifier.\n\nSee more: https://www.typescriptlang.org/tsconfig#moduleResolution"
-            },
-            "newLine": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Set the newline character for emitting files.",
-              "type": ["string", "null"],
-              "default": "lf",
-              "anyOf": [
-                {
-                  "enum": ["crlf", "lf"]
-                },
-                {
-                  "pattern": "^(CRLF|LF|crlf|lf)$"
-                }
-              ],
-              "markdownDescription": "Set the newline character for emitting files.\n\nSee more: https://www.typescriptlang.org/tsconfig#newLine"
-            },
-            "noEmit": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Disable emitting file from a compilation.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Disable emitting file from a compilation.\n\nSee more: https://www.typescriptlang.org/tsconfig#noEmit"
-            },
-            "noEmitHelpers": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Disable generating custom helper functions like `__extends` in compiled output.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Disable generating custom helper functions like `__extends` in compiled output.\n\nSee more: https://www.typescriptlang.org/tsconfig#noEmitHelpers"
-            },
-            "noEmitOnError": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Disable emitting files if any type checking errors are reported.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Disable emitting files if any type checking errors are reported.\n\nSee more: https://www.typescriptlang.org/tsconfig#noEmitOnError"
-            },
-            "noImplicitAny": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Enable error reporting for expressions and declarations with an implied `any` type..",
-              "type": ["boolean", "null"],
-              "markdownDescription": "Enable error reporting for expressions and declarations with an implied `any` type..\n\nSee more: https://www.typescriptlang.org/tsconfig#noImplicitAny"
-            },
-            "noImplicitThis": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Enable error reporting when `this` is given the type `any`.",
-              "type": ["boolean", "null"],
-              "markdownDescription": "Enable error reporting when `this` is given the type `any`.\n\nSee more: https://www.typescriptlang.org/tsconfig#noImplicitThis"
-            },
-            "noUnusedLocals": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Enable error reporting when a local variable isn't read.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Enable error reporting when a local variable isn't read.\n\nSee more: https://www.typescriptlang.org/tsconfig#noUnusedLocals"
-            },
-            "noUnusedParameters": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Raise an error when a function parameter isn't read",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Raise an error when a function parameter isn't read\n\nSee more: https://www.typescriptlang.org/tsconfig#noUnusedParameters"
-            },
-            "noLib": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Disable including any library files, including the default lib.d.ts.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Disable including any library files, including the default lib.d.ts.\n\nSee more: https://www.typescriptlang.org/tsconfig#noLib"
-            },
-            "noResolve": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Disallow `import`s, `require`s or `<reference>`s from expanding the number of files TypeScript should add to a project.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Disallow `import`s, `require`s or `<reference>`s from expanding the number of files TypeScript should add to a project.\n\nSee more: https://www.typescriptlang.org/tsconfig#noResolve"
-            },
-            "noStrictGenericChecks": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Disable strict checking of generic signatures in function types.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Disable strict checking of generic signatures in function types.\n\nSee more: https://www.typescriptlang.org/tsconfig#noStrictGenericChecks"
-            },
-            "skipDefaultLibCheck": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Skip type checking .d.ts files that are included with TypeScript.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Skip type checking .d.ts files that are included with TypeScript.\n\nSee more: https://www.typescriptlang.org/tsconfig#skipDefaultLibCheck"
-            },
-            "skipLibCheck": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Skip type checking all .d.ts files.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Skip type checking all .d.ts files.\n\nSee more: https://www.typescriptlang.org/tsconfig#skipLibCheck"
-            },
-            "outFile": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specify a file that bundles all outputs into one JavaScript file. If `declaration` is true, also designates a file that bundles all .d.ts output.",
-              "type": ["string", "null"],
-              "markdownDescription": "Specify a file that bundles all outputs into one JavaScript file. If `declaration` is true, also designates a file that bundles all .d.ts output.\n\nSee more: https://www.typescriptlang.org/tsconfig#outFile"
-            },
-            "outDir": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specify an output folder for all emitted files.",
-              "type": ["string", "null"],
-              "markdownDescription": "Specify an output folder for all emitted files.\n\nSee more: https://www.typescriptlang.org/tsconfig#outDir"
-            },
-            "preserveConstEnums": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Disable erasing `const enum` declarations in generated code.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Disable erasing `const enum` declarations in generated code.\n\nSee more: https://www.typescriptlang.org/tsconfig#preserveConstEnums"
-            },
-            "preserveSymlinks": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Disable resolving symlinks to their realpath. This correlates to the same flag in node.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Disable resolving symlinks to their realpath. This correlates to the same flag in node.\n\nSee more: https://www.typescriptlang.org/tsconfig#preserveSymlinks"
-            },
-            "preserveValueImports": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Preserve unused imported values in the JavaScript output that would otherwise be removed",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Preserve unused imported values in the JavaScript output that would otherwise be removed\n\nSee more: https://www.typescriptlang.org/tsconfig#preserveValueImports"
-            },
-            "preserveWatchOutput": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Disable wiping the console in watch mode",
-              "type": ["boolean", "null"],
-              "markdownDescription": "Disable wiping the console in watch mode\n\nSee more: https://www.typescriptlang.org/tsconfig#preserveWatchOutput"
-            },
-            "pretty": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Enable color and formatting in output to make compiler errors easier to read",
-              "type": ["boolean", "null"],
-              "default": true,
-              "markdownDescription": "Enable color and formatting in output to make compiler errors easier to read\n\nSee more: https://www.typescriptlang.org/tsconfig#pretty"
-            },
-            "removeComments": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Disable emitting comments.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Disable emitting comments.\n\nSee more: https://www.typescriptlang.org/tsconfig#removeComments"
-            },
-            "rootDir": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specify the root folder within your source files.",
-              "type": ["string", "null"],
-              "markdownDescription": "Specify the root folder within your source files.\n\nSee more: https://www.typescriptlang.org/tsconfig#rootDir"
-            },
-            "isolatedModules": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Ensure that each file can be safely transpiled without relying on other imports.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Ensure that each file can be safely transpiled without relying on other imports.\n\nSee more: https://www.typescriptlang.org/tsconfig#isolatedModules"
-            },
-            "sourceMap": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Create source map files for emitted JavaScript files.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Create source map files for emitted JavaScript files.\n\nSee more: https://www.typescriptlang.org/tsconfig#sourceMap"
-            },
-            "sourceRoot": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specify the root path for debuggers to find the reference source code.",
-              "type": ["string", "null"],
-              "markdownDescription": "Specify the root path for debuggers to find the reference source code.\n\nSee more: https://www.typescriptlang.org/tsconfig#sourceRoot"
-            },
-            "suppressExcessPropertyErrors": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Disable reporting of excess property errors during the creation of object literals.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Disable reporting of excess property errors during the creation of object literals.\n\nSee more: https://www.typescriptlang.org/tsconfig#suppressExcessPropertyErrors"
-            },
-            "suppressImplicitAnyIndexErrors": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Suppress `noImplicitAny` errors when indexing objects that lack index signatures.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Suppress `noImplicitAny` errors when indexing objects that lack index signatures.\n\nSee more: https://www.typescriptlang.org/tsconfig#suppressImplicitAnyIndexErrors"
-            },
-            "stripInternal": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Disable emitting declarations that have `@internal` in their JSDoc comments.",
-              "type": ["boolean", "null"],
-              "markdownDescription": "Disable emitting declarations that have `@internal` in their JSDoc comments.\n\nSee more: https://www.typescriptlang.org/tsconfig#stripInternal"
-            },
-            "target": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Set the JavaScript language version for emitted JavaScript and include compatible library declarations.",
-              "type": ["string", "null"],
-              "default": "ES3",
-              "anyOf": [
-                {
-                  "enum": [
-                    "ES3",
-                    "ES5",
-                    "ES6",
-                    "ES2015",
-                    "ES2016",
-                    "ES2017",
-                    "ES2018",
-                    "ES2019",
-                    "ES2020",
-                    "ES2021",
-                    "ES2022",
-                    "ES2023",
-                    "ES2024",
-                    "ESNext"
-                  ]
-                },
-                {
-                  "pattern": "^([Ee][Ss]([356]|(20(1[56789]|2[01234]))|[Nn][Ee][Xx][Tt]))$"
-                }
-              ],
-              "markdownDescription": "Set the JavaScript language version for emitted JavaScript and include compatible library declarations.\n\nSee more: https://www.typescriptlang.org/tsconfig#target"
-            },
-            "useUnknownInCatchVariables": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Default catch clause variables as `unknown` instead of `any`.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Default catch clause variables as `unknown` instead of `any`.\n\nSee more: https://www.typescriptlang.org/tsconfig#useUnknownInCatchVariables"
-            },
-            "watch": {
-              "description": "Watch input files.",
-              "type": ["boolean", "null"]
-            },
-            "fallbackPolling": {
-              "description": "Specify the polling strategy to use when the system runs out of or doesn't support native file watchers. Requires TypeScript version 3.8 or later.",
-              "enum": [
-                "fixedPollingInterval",
-                "priorityPollingInterval",
-                "dynamicPriorityPolling",
-                "fixedInterval",
-                "priorityInterval",
-                "dynamicPriority",
-                "fixedChunkSize"
-              ]
-            },
-            "watchDirectory": {
-              "description": "Specify the strategy for watching directories under systems that lack recursive file-watching functionality. Requires TypeScript version 3.8 or later.",
-              "enum": [
-                "useFsEvents",
-                "fixedPollingInterval",
-                "dynamicPriorityPolling",
-                "fixedChunkSizePolling"
-              ],
-              "default": "useFsEvents"
-            },
-            "watchFile": {
-              "description": "Specify the strategy for watching individual files. Requires TypeScript version 3.8 or later.",
-              "enum": [
-                "fixedPollingInterval",
-                "priorityPollingInterval",
-                "dynamicPriorityPolling",
-                "useFsEvents",
-                "useFsEventsOnParentDirectory",
-                "fixedChunkSizePolling"
-              ],
-              "default": "useFsEvents"
-            },
-            "experimentalDecorators": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Enable experimental support for TC39 stage 2 draft decorators.",
-              "type": ["boolean", "null"],
-              "markdownDescription": "Enable experimental support for TC39 stage 2 draft decorators.\n\nSee more: https://www.typescriptlang.org/tsconfig#experimentalDecorators"
-            },
-            "emitDecoratorMetadata": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Emit design-type metadata for decorated declarations in source files.",
-              "type": ["boolean", "null"],
-              "markdownDescription": "Emit design-type metadata for decorated declarations in source files.\n\nSee more: https://www.typescriptlang.org/tsconfig#emitDecoratorMetadata"
-            },
-            "allowUnusedLabels": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Disable error reporting for unused labels.",
-              "type": ["boolean", "null"],
-              "markdownDescription": "Disable error reporting for unused labels.\n\nSee more: https://www.typescriptlang.org/tsconfig#allowUnusedLabels"
-            },
-            "noImplicitReturns": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Enable error reporting for codepaths that do not explicitly return in a function.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Enable error reporting for codepaths that do not explicitly return in a function.\n\nSee more: https://www.typescriptlang.org/tsconfig#noImplicitReturns"
-            },
-            "noUncheckedIndexedAccess": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Add `undefined` to a type when accessed using an index.",
-              "type": ["boolean", "null"],
-              "markdownDescription": "Add `undefined` to a type when accessed using an index.\n\nSee more: https://www.typescriptlang.org/tsconfig#noUncheckedIndexedAccess"
-            },
-            "noFallthroughCasesInSwitch": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Enable error reporting for fallthrough cases in switch statements.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Enable error reporting for fallthrough cases in switch statements.\n\nSee more: https://www.typescriptlang.org/tsconfig#noFallthroughCasesInSwitch"
-            },
-            "noImplicitOverride": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Ensure overriding members in derived classes are marked with an override modifier.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Ensure overriding members in derived classes are marked with an override modifier.\n\nSee more: https://www.typescriptlang.org/tsconfig#noImplicitOverride"
-            },
-            "allowUnreachableCode": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Disable error reporting for unreachable code.",
-              "type": ["boolean", "null"],
-              "markdownDescription": "Disable error reporting for unreachable code.\n\nSee more: https://www.typescriptlang.org/tsconfig#allowUnreachableCode"
-            },
-            "forceConsistentCasingInFileNames": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Ensure that casing is correct in imports.",
-              "type": ["boolean", "null"],
-              "default": true,
-              "markdownDescription": "Ensure that casing is correct in imports.\n\nSee more: https://www.typescriptlang.org/tsconfig#forceConsistentCasingInFileNames"
-            },
-            "generateCpuProfile": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Emit a v8 CPU profile of the compiler run for debugging.",
-              "type": ["string", "null"],
-              "default": "profile.cpuprofile",
-              "markdownDescription": "Emit a v8 CPU profile of the compiler run for debugging.\n\nSee more: https://www.typescriptlang.org/tsconfig#generateCpuProfile"
-            },
-            "baseUrl": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specify the base directory to resolve non-relative module names.",
-              "type": ["string", "null"],
-              "markdownDescription": "Specify the base directory to resolve non-relative module names.\n\nSee more: https://www.typescriptlang.org/tsconfig#baseUrl"
-            },
-            "paths": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specify a set of entries that re-map imports to additional lookup locations.",
-              "type": ["object", "null"],
-              "additionalProperties": {
-                "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-                "type": ["array", "null"],
-                "uniqueItems": true,
-                "items": {
-                  "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-                  "type": ["string", "null"],
-                  "description": "Path mapping to be computed relative to baseUrl option."
-                }
-              },
-              "markdownDescription": "Specify a set of entries that re-map imports to additional lookup locations.\n\nSee more: https://www.typescriptlang.org/tsconfig#paths"
-            },
-            "plugins": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specify a list of language service plugins to include.",
-              "type": ["array", "null"],
-              "items": {
-                "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-                "type": ["object", "null"],
-                "properties": {
-                  "name": {
-                    "description": "Plugin name.",
-                    "type": ["string", "null"]
-                  }
-                }
-              },
-              "markdownDescription": "Specify a list of language service plugins to include.\n\nSee more: https://www.typescriptlang.org/tsconfig#plugins"
-            },
-            "rootDirs": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Allow multiple folders to be treated as one when resolving modules.",
-              "type": ["array", "null"],
-              "uniqueItems": true,
-              "items": {
-                "type": ["string", "null"]
-              },
-              "markdownDescription": "Allow multiple folders to be treated as one when resolving modules.\n\nSee more: https://www.typescriptlang.org/tsconfig#rootDirs"
-            },
-            "typeRoots": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specify multiple folders that act like `./node_modules/@types`.",
-              "type": ["array", "null"],
-              "uniqueItems": true,
-              "items": {
-                "type": ["string", "null"]
-              },
-              "markdownDescription": "Specify multiple folders that act like `./node_modules/@types`.\n\nSee more: https://www.typescriptlang.org/tsconfig#typeRoots"
-            },
-            "types": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specify type package names to be included without being referenced in a source file.",
-              "type": ["array", "null"],
-              "uniqueItems": true,
-              "items": {
-                "type": ["string", "null"]
-              },
-              "markdownDescription": "Specify type package names to be included without being referenced in a source file.\n\nSee more: https://www.typescriptlang.org/tsconfig#types"
-            },
-            "traceResolution": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Enable tracing of the name resolution process. Requires TypeScript version 2.0 or later.",
-              "type": ["boolean", "null"],
-              "default": false
-            },
-            "allowJs": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Allow JavaScript files to be a part of your program. Use the `checkJS` option to get errors from these files.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Allow JavaScript files to be a part of your program. Use the `checkJS` option to get errors from these files.\n\nSee more: https://www.typescriptlang.org/tsconfig#allowJs"
-            },
-            "noErrorTruncation": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Disable truncating types in error messages.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Disable truncating types in error messages.\n\nSee more: https://www.typescriptlang.org/tsconfig#noErrorTruncation"
-            },
-            "allowSyntheticDefaultImports": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Allow 'import x from y' when a module doesn't have a default export.",
-              "type": ["boolean", "null"],
-              "markdownDescription": "Allow 'import x from y' when a module doesn't have a default export.\n\nSee more: https://www.typescriptlang.org/tsconfig#allowSyntheticDefaultImports"
-            },
-            "noImplicitUseStrict": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Disable adding 'use strict' directives in emitted JavaScript files.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Disable adding 'use strict' directives in emitted JavaScript files.\n\nSee more: https://www.typescriptlang.org/tsconfig#noImplicitUseStrict"
-            },
-            "listEmittedFiles": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Print the names of emitted files after a compilation.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Print the names of emitted files after a compilation.\n\nSee more: https://www.typescriptlang.org/tsconfig#listEmittedFiles"
-            },
-            "disableSizeLimit": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Remove the 20mb cap on total source code size for JavaScript files in the TypeScript language server.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Remove the 20mb cap on total source code size for JavaScript files in the TypeScript language server.\n\nSee more: https://www.typescriptlang.org/tsconfig#disableSizeLimit"
-            },
-            "lib": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specify a set of bundled library declaration files that describe the target runtime environment.",
-              "type": ["array", "null"],
-              "uniqueItems": true,
-              "items": {
-                "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-                "type": ["string", "null"],
-                "anyOf": [
-                  {
-                    "enum": [
-                      "ES5",
-                      "ES6",
-                      "ES2015",
-                      "ES2015.Collection",
-                      "ES2015.Core",
-                      "ES2015.Generator",
-                      "ES2015.Iterable",
-                      "ES2015.Promise",
-                      "ES2015.Proxy",
-                      "ES2015.Reflect",
-                      "ES2015.Symbol.WellKnown",
-                      "ES2015.Symbol",
-                      "ES2016",
-                      "ES2016.Array.Include",
-                      "ES2017",
-                      "ES2017.Intl",
-                      "ES2017.Object",
-                      "ES2017.SharedMemory",
-                      "ES2017.String",
-                      "ES2017.TypedArrays",
-                      "ES2017.ArrayBuffer",
-                      "ES2018",
-                      "ES2018.AsyncGenerator",
-                      "ES2018.AsyncIterable",
-                      "ES2018.Intl",
-                      "ES2018.Promise",
-                      "ES2018.Regexp",
-                      "ES2019",
-                      "ES2019.Array",
-                      "ES2019.Intl",
-                      "ES2019.Object",
-                      "ES2019.String",
-                      "ES2019.Symbol",
-                      "ES2020",
-                      "ES2020.BigInt",
-                      "ES2020.Promise",
-                      "ES2020.String",
-                      "ES2020.Symbol.WellKnown",
-                      "ESNext",
-                      "ESNext.Array",
-                      "ESNext.AsyncIterable",
-                      "ESNext.BigInt",
-                      "ESNext.Collection",
-                      "ESNext.Intl",
-                      "ESNext.Object",
-                      "ESNext.Promise",
-                      "ESNext.Regexp",
-                      "ESNext.String",
-                      "ESNext.Symbol",
-                      "DOM",
-                      "DOM.AsyncIterable",
-                      "DOM.Iterable",
-                      "ScriptHost",
-                      "WebWorker",
-                      "WebWorker.AsyncIterable",
-                      "WebWorker.ImportScripts",
-                      "Webworker.Iterable",
-                      "ES7",
-                      "ES2021",
-                      "ES2020.SharedMemory",
-                      "ES2020.Intl",
-                      "ES2020.Date",
-                      "ES2020.Number",
-                      "ES2021.Promise",
-                      "ES2021.String",
-                      "ES2021.WeakRef",
-                      "ESNext.WeakRef",
-                      "ES2021.Intl",
-                      "ES2022",
-                      "ES2022.Array",
-                      "ES2022.Error",
-                      "ES2022.Intl",
-                      "ES2022.Object",
-                      "ES2022.String",
-                      "ES2022.SharedMemory",
-                      "ES2022.RegExp",
-                      "ES2023",
-                      "ES2023.Array",
-                      "ES2024",
-                      "ES2024.ArrayBuffer",
-                      "ES2024.Collection",
-                      "ES2024.Object",
-                      "ES2024.Promise",
-                      "ES2024.Regexp",
-                      "ES2024.SharedMemory",
-                      "ES2024.String",
-                      "Decorators",
-                      "Decorators.Legacy",
-                      "ES2017.Date",
-                      "ES2023.Collection",
-                      "ESNext.Decorators",
-                      "ESNext.Disposable"
-                    ]
-                  },
-                  {
-                    "pattern": "^[Ee][Ss]5|[Ee][Ss]6|[Ee][Ss]7$"
-                  },
-                  {
-                    "pattern": "^[Ee][Ss]2015(\\.([Cc][Oo][Ll][Ll][Ee][Cc][Tt][Ii][Oo][Nn]|[Cc][Oo][Rr][Ee]|[Gg][Ee][Nn][Ee][Rr][Aa][Tt][Oo][Rr]|[Ii][Tt][Ee][Rr][Aa][Bb][Ll][Ee]|[Pp][Rr][Oo][Mm][Ii][Ss][Ee]|[Pp][Rr][Oo][Xx][Yy]|[Rr][Ee][Ff][Ll][Ee][Cc][Tt]|[Ss][Yy][Mm][Bb][Oo][Ll]\\.[Ww][Ee][Ll][Ll][Kk][Nn][Oo][Ww][Nn]|[Ss][Yy][Mm][Bb][Oo][Ll]))?$"
-                  },
-                  {
-                    "pattern": "^[Ee][Ss]2016(\\.[Aa][Rr][Rr][Aa][Yy]\\.[Ii][Nn][Cc][Ll][Uu][Dd][Ee])?$"
-                  },
-                  {
-                    "pattern": "^[Ee][Ss]2017(\\.([Ii][Nn][Tt][Ll]|[Oo][Bb][Jj][Ee][Cc][Tt]|[Ss][Hh][Aa][Rr][Ee][Dd][Mm][Ee][Mm][Oo][Rr][Yy]|[Ss][Tt][Rr][Ii][Nn][Gg]|[Tt][Yy][Pp][Ee][Dd][Aa][Rr][Rr][Aa][Yy][Ss]|[Dd][Aa][Tt][Ee]|[Aa][Rr][Rr][Aa][Yy][Bb][Uu][Ff][Ff][Ee][Rr]))?$"
-                  },
-                  {
-                    "pattern": "^[Ee][Ss]2018(\\.([Aa][Ss][Yy][Nn][Cc][Gg][Ee][Nn][Ee][Rr][Aa][Tt][Oo][Rr]|[Aa][Ss][Yy][Nn][Cc][Ii][Tt][Ee][Rr][Aa][Bb][Ll][Ee]|[Ii][Nn][Tt][Ll]|[Pp][Rr][Oo][Mm][Ii][Ss][Ee]|[Rr][Ee][Gg][Ee][Xx][Pp]))?$"
-                  },
-                  {
-                    "pattern": "^[Ee][Ss]2019(\\.([Aa][Rr][Rr][Aa][Yy]|[Ii][Nn][Tt][Ll]|[Oo][Bb][Jj][Ee][Cc][Tt]|[Ss][Tt][Rr][Ii][Nn][Gg]|[Ss][Yy][Mm][Bb][Oo][Ll]))?$"
-                  },
-                  {
-                    "pattern": "^[Ee][Ss]2020(\\.([Bb][Ii][Gg][Ii][Nn][Tt]|[Pp][Rr][Oo][Mm][Ii][Ss][Ee]|[Ss][Tt][Rr][Ii][Nn][Gg]|[Ss][Yy][Mm][Bb][Oo][Ll]\\.[Ww][Ee][Ll][Ll][Kk][Nn][Oo][Ww][Nn]|[Ss][Hh][Aa][Rr][Ee][Dd][Mm][Ee][Mm][Oo][Rr][Yy]|[Ii][Nn][Tt][Ll]|[Dd][Aa][Tt][Ee]|[Nn][Uu][Mm][Bb][Ee][Rr]))?$"
-                  },
-                  {
-                    "pattern": "^[Ee][Ss]2021(\\.([Ii][Nn][Tt][Ll]|[Pp][Rr][Oo][Mm][Ii][Ss][Ee]|[Ss][Tt][Rr][Ii][Nn][Gg]|[Ww][Ee][Aa][Kk][Rr][Ee][Ff]))?$"
-                  },
-                  {
-                    "pattern": "^[Ee][Ss]2022(\\.([Aa][Rr][Rr][Aa][Yy]|[Ee][Rr][Rr][Oo][Rr]|[Ii][Nn][Tt][Ll]|[Oo][Bb][Jj][Ee][Cc][Tt]|[Ss][Tt][Rr][Ii][Nn][Gg]|[Ss][Hh][Aa][Rr][Ee][Dd][Mm][Ee][Mm][Oo][Rr][Yy]|[Rr][Ee][Gg][Ee][Xx][Pp]))?$"
-                  },
-                  {
-                    "pattern": "^[Ee][Ss]2023(\\.([Aa][Rr][Rr][Aa][Yy]|[Cc][Oo][Ll][Ll][Ee][Cc][Tt][Ii][Oo][Nn]))?$"
-                  },
-                  {
-                    "pattern": "^[Ee][Ss]2024(\\.([Aa][Rr][Rr][Aa][Yy][Bb][Uu][Ff][Ff][Ee][Rr]|[Cc][Oo][Ll][Ll][Ee][Cc][Tt][Ii][Oo][Nn]|[Oo][Bb][Jj][Ee][Cc][Tt]|[Pp][Rr][Oo][Mm][Ii][Ss][Ee]|[Rr][Ee][Gg][Ee][Xx][Pp]|[Ss][Hh][Aa][Rr][Ee][Dd][Mm][Ee][Mm][Oo][Rr][Yy]|[Ss][Tt][Rr][Ii][Nn][Gg]))?$"
-                  },
-                  {
-                    "pattern": "^[Ee][Ss][Nn][Ee][Xx][Tt](\\.([Aa][Rr][Rr][Aa][Yy]|[Aa][Ss][Yy][Nn][Cc][Ii][Tt][Ee][Rr][Aa][Bb][Ll][Ee]|[Bb][Ii][Gg][Ii][Nn][Tt]|[Ii][Nn][Tt][Ll]|[Pp][Rr][Oo][Mm][Ii][Ss][Ee]|[Ss][Tt][Rr][Ii][Nn][Gg]|[Ss][Yy][Mm][Bb][Oo][Ll]|[Ww][Ee][Aa][Kk][Rr][Ee][Ff]|[Dd][Ee][Cc][Oo][Rr][Aa][Tt][Oo][Rr][Ss]|[Dd][Ii][Ss][Pp][Oo][Ss][Aa][Bb][Ll][Ee]))?$"
-                  },
-                  {
-                    "pattern": "^[Dd][Oo][Mm](\\.([Aa][Ss][Yy][Nn][Cc])?[Ii][Tt][Ee][Rr][Aa][Bb][Ll][Ee])?$"
-                  },
-                  {
-                    "pattern": "^[Ss][Cc][Rr][Ii][Pp][Tt][Hh][Oo][Ss][Tt]$"
-                  },
-                  {
-                    "pattern": "^[Ww][Ee][Bb][Ww][Oo][Rr][Kk][Ee][Rr](\\.([Ii][Mm][Pp][Oo][Rr][Tt][Ss][Cc][Rr][Ii][Pp][Tt][Ss]|([Aa][Ss][Yy][Nn][Cc])?[Ii][Tt][Ee][Rr][Aa][Bb][Ll][Ee]))?$"
-                  },
-                  {
-                    "pattern": "^[Dd][Ee][Cc][Oo][Rr][Aa][Tt][Oo][Rr][Ss](\\.([Ll][Ee][Gg][Aa][Cc][Yy]))?$"
-                  }
-                ]
-              },
-              "markdownDescription": "Specify a set of bundled library declaration files that describe the target runtime environment.\n\nSee more: https://www.typescriptlang.org/tsconfig#lib"
-            },
-            "moduleDetection": {
-              "description": "Specify how TypeScript determine a file as module.",
-              "enum": ["auto", "legacy", "force"]
-            },
-            "strictNullChecks": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "When type checking, take into account `null` and `undefined`.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "When type checking, take into account `null` and `undefined`.\n\nSee more: https://www.typescriptlang.org/tsconfig#strictNullChecks"
-            },
-            "maxNodeModuleJsDepth": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specify the maximum folder depth used for checking JavaScript files from `node_modules`. Only applicable with `allowJs`.",
-              "type": ["number", "null"],
-              "default": 0,
-              "markdownDescription": "Specify the maximum folder depth used for checking JavaScript files from `node_modules`. Only applicable with `allowJs`.\n\nSee more: https://www.typescriptlang.org/tsconfig#maxNodeModuleJsDepth"
-            },
-            "importHelpers": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Allow importing helper functions from tslib once per project, instead of including them per-file.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Allow importing helper functions from tslib once per project, instead of including them per-file.\n\nSee more: https://www.typescriptlang.org/tsconfig#importHelpers"
-            },
-            "importsNotUsedAsValues": {
-              "description": "Specify emit/checking behavior for imports that are only used for types.",
-              "default": "remove",
-              "enum": ["remove", "preserve", "error"]
-            },
-            "alwaysStrict": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Ensure 'use strict' is always emitted.",
-              "type": ["boolean", "null"],
-              "markdownDescription": "Ensure 'use strict' is always emitted.\n\nSee more: https://www.typescriptlang.org/tsconfig#alwaysStrict"
-            },
-            "strict": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Enable all strict type checking options.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Enable all strict type checking options.\n\nSee more: https://www.typescriptlang.org/tsconfig#strict"
-            },
-            "strictBindCallApply": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Check that the arguments for `bind`, `call`, and `apply` methods match the original function.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Check that the arguments for `bind`, `call`, and `apply` methods match the original function.\n\nSee more: https://www.typescriptlang.org/tsconfig#strictBindCallApply"
-            },
-            "downlevelIteration": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Emit more compliant, but verbose and less performant JavaScript for iteration.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Emit more compliant, but verbose and less performant JavaScript for iteration.\n\nSee more: https://www.typescriptlang.org/tsconfig#downlevelIteration"
-            },
-            "checkJs": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Enable error reporting in type-checked JavaScript files.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Enable error reporting in type-checked JavaScript files.\n\nSee more: https://www.typescriptlang.org/tsconfig#checkJs"
-            },
-            "strictFunctionTypes": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "When assigning functions, check to ensure parameters and the return values are subtype-compatible.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "When assigning functions, check to ensure parameters and the return values are subtype-compatible.\n\nSee more: https://www.typescriptlang.org/tsconfig#strictFunctionTypes"
-            },
-            "strictPropertyInitialization": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Check for class properties that are declared but not set in the constructor.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Check for class properties that are declared but not set in the constructor.\n\nSee more: https://www.typescriptlang.org/tsconfig#strictPropertyInitialization"
-            },
-            "esModuleInterop": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Emit additional JavaScript to ease support for importing CommonJS modules. This enables `allowSyntheticDefaultImports` for type compatibility.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Emit additional JavaScript to ease support for importing CommonJS modules. This enables `allowSyntheticDefaultImports` for type compatibility.\n\nSee more: https://www.typescriptlang.org/tsconfig#esModuleInterop"
-            },
-            "allowUmdGlobalAccess": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Allow accessing UMD globals from modules.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Allow accessing UMD globals from modules.\n\nSee more: https://www.typescriptlang.org/tsconfig#allowUmdGlobalAccess"
-            },
-            "keyofStringsOnly": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Make keyof only return strings instead of string, numbers or symbols. Legacy option.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Make keyof only return strings instead of string, numbers or symbols. Legacy option.\n\nSee more: https://www.typescriptlang.org/tsconfig#keyofStringsOnly"
-            },
-            "useDefineForClassFields": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Emit ECMAScript-standard-compliant class fields.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Emit ECMAScript-standard-compliant class fields.\n\nSee more: https://www.typescriptlang.org/tsconfig#useDefineForClassFields"
-            },
-            "declarationMap": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Create sourcemaps for d.ts files.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Create sourcemaps for d.ts files.\n\nSee more: https://www.typescriptlang.org/tsconfig#declarationMap"
-            },
-            "resolveJsonModule": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Enable importing .json files",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Enable importing .json files\n\nSee more: https://www.typescriptlang.org/tsconfig#resolveJsonModule"
-            },
-            "resolvePackageJsonExports": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Use the package.json 'exports' field when resolving package imports.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Use the package.json 'exports' field when resolving package imports.\n\nSee more: https://www.typescriptlang.org/tsconfig#resolvePackageJsonExports"
-            },
-            "resolvePackageJsonImports": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Use the package.json 'imports' field when resolving imports.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Use the package.json 'imports' field when resolving imports.\n\nSee more: https://www.typescriptlang.org/tsconfig#resolvePackageJsonImports"
-            },
-            "assumeChangesOnlyAffectDirectDependencies": {
-              "description": "Have recompiles in '--incremental' and '--watch' assume that changes within a file will only affect files directly depending on it. Requires TypeScript version 3.8 or later.",
-              "type": ["boolean", "null"]
-            },
-            "extendedDiagnostics": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Output more detailed compiler performance information after building.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Output more detailed compiler performance information after building.\n\nSee more: https://www.typescriptlang.org/tsconfig#extendedDiagnostics"
-            },
-            "listFilesOnly": {
-              "description": "Print names of files that are part of the compilation and then stop processing.",
-              "type": ["boolean", "null"]
-            },
-            "disableSourceOfProjectReferenceRedirect": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Disable preferring source files instead of declaration files when referencing composite projects",
-              "type": ["boolean", "null"],
-              "markdownDescription": "Disable preferring source files instead of declaration files when referencing composite projects\n\nSee more: https://www.typescriptlang.org/tsconfig#disableSourceOfProjectReferenceRedirect"
-            },
-            "disableSolutionSearching": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Opt a project out of multi-project reference checking when editing.",
-              "type": ["boolean", "null"],
-              "markdownDescription": "Opt a project out of multi-project reference checking when editing.\n\nSee more: https://www.typescriptlang.org/tsconfig#disableSolutionSearching"
-            },
-            "verbatimModuleSyntax": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting.",
-              "type": ["boolean", "null"],
-              "markdownDescription": "Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting.\n\nSee more: https://www.typescriptlang.org/tsconfig#verbatimModuleSyntax"
-            },
-            "noCheck": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Disable full type checking (only critical parse and emit errors will be reported)",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Disable full type checking (only critical parse and emit errors will be reported)\n\nSee more: https://www.typescriptlang.org/tsconfig#noCheck"
-            },
-            "isolatedDeclarations": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Require sufficient annotation on exports so other tools can trivially generate declaration files.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Require sufficient annotation on exports so other tools can trivially generate declaration files.\n\nSee more: https://www.typescriptlang.org/tsconfig#isolatedDeclarations"
-            },
-            "noUncheckedSideEffectImports": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Check side effect imports.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Check side effect imports.\n\nSee more: https://www.typescriptlang.org/tsconfig#noUncheckedSideEffectImports"
-            },
-            "strictBuiltinIteratorReturn": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Built-in iterators are instantiated with a 'TReturn' type of 'undefined' instead of 'any'.",
-              "type": ["boolean", "null"],
-              "default": false,
-              "markdownDescription": "Built-in iterators are instantiated with a 'TReturn' type of 'undefined' instead of 'any'.\n\nSee more: https://www.typescriptlang.org/tsconfig#strictBuiltinIteratorReturn"
-            }
-          }
-        }
-      }
-    },
-    "typeAcquisitionDefinition": {
-      "properties": {
-        "typeAcquisition": {
-          "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-          "type": ["object", "null"],
-          "description": "Auto type (.d.ts) acquisition options for this project. Requires TypeScript version 2.1 or later.",
-          "properties": {
-            "enable": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Enable auto type acquisition",
-              "type": ["boolean", "null"],
-              "default": false
-            },
-            "include": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specifies a list of type declarations to be included in auto type acquisition. Ex. [\"jquery\", \"lodash\"]",
-              "type": ["array", "null"],
-              "uniqueItems": true,
-              "items": {
-                "type": ["string", "null"]
-              }
-            },
-            "exclude": {
-              "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-              "description": "Specifies a list of type declarations to be excluded from auto type acquisition. Ex. [\"jquery\", \"lodash\"]",
-              "type": ["array", "null"],
-              "uniqueItems": true,
-              "items": {
-                "type": ["string", "null"]
-              }
-            }
-          }
-        }
-      }
-    },
-    "referencesDefinition": {
-      "properties": {
-        "references": {
-          "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-          "type": ["array", "null"],
-          "uniqueItems": true,
-          "description": "Referenced projects. Requires TypeScript version 3.0 or later.",
-          "items": {
-            "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-            "type": ["object", "null"],
-            "description": "Project reference.",
-            "properties": {
-              "path": {
-                "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
-                "type": ["string", "null"],
-                "description": "Path to referenced tsconfig or to folder containing tsconfig."
-              }
-            }
-          }
-        }
-      }
-    },
-    "tsNodeModuleTypes": {
-      "type": ["object", "null"]
-    },
-    "tsNodeDefinition": {
-      "properties": {
-        "ts-node": {
-          "description": "ts-node options.  See also: https://typestrong.org/ts-node/docs/configuration\n\nts-node offers TypeScript execution and REPL for node.js, with source map support.",
-          "properties": {
-            "compiler": {
-              "default": "typescript",
-              "description": "Specify a custom TypeScript compiler.",
-              "type": ["string", "null"]
-            },
-            "compilerHost": {
-              "default": false,
-              "description": "Use TypeScript's compiler host API instead of the language service API.",
-              "type": ["boolean", "null"]
-            },
-            "compilerOptions": {
-              "additionalProperties": true,
-              "allOf": [
-                {
-                  "$ref": "#/definitions/compilerOptionsDefinition/properties/compilerOptions"
-                }
-              ],
-              "description": "JSON object to merge with TypeScript `compilerOptions`.",
-              "properties": {},
-              "type": ["object", "null"]
-            },
-            "emit": {
-              "default": false,
-              "description": "Emit output files into `.ts-node` directory.",
-              "type": ["boolean", "null"]
-            },
-            "esm": {
-              "description": "Enable native ESM support.\n\nFor details, see https://typestrong.org/ts-node/docs/imports#native-ecmascript-modules",
-              "type": ["boolean", "null"]
-            },
-            "experimentalReplAwait": {
-              "description": "Allows the usage of top level await in REPL.\n\nUses node's implementation which accomplishes this with an AST syntax transformation.\n\nEnabled by default when tsconfig target is es2018 or above. Set to false to disable.\n\n**Note**: setting to `true` when tsconfig target is too low will throw an Error.  Leave as `undefined`\nto get default, automatic behavior.",
-              "type": ["boolean", "null"]
-            },
-            "experimentalResolver": {
-              "description": "Enable experimental features that re-map imports and require calls to support:\n`baseUrl`, `paths`, `rootDirs`, `.js` to `.ts` file extension mappings,\n`outDir` to `rootDir` mappings for composite projects and monorepos.\n\nFor details, see https://github.com/TypeStrong/ts-node/issues/1514",
-              "type": ["boolean", "null"]
-            },
-            "experimentalSpecifierResolution": {
-              "description": "Like node's `--experimental-specifier-resolution`, , but can also be set in your `tsconfig.json` for convenience.\n\nFor details, see https://nodejs.org/dist/latest-v18.x/docs/api/esm.html#customizing-esm-specifier-resolution-algorithm",
-              "enum": ["explicit", "node"],
-              "type": ["string", "null"]
-            },
-            "files": {
-              "default": false,
-              "description": "Load \"files\" and \"include\" from `tsconfig.json` on startup.\n\nDefault is to override `tsconfig.json` \"files\" and \"include\" to only include the entrypoint script.",
-              "type": ["boolean", "null"]
-            },
-            "ignore": {
-              "default": ["(?:^|/)node_modules/"],
-              "description": "Paths which should not be compiled.\n\nEach string in the array is converted to a regular expression via `new RegExp()` and tested against source paths prior to compilation.\n\nSource paths are normalized to posix-style separators, relative to the directory containing `tsconfig.json` or to cwd if no `tsconfig.json` is loaded.\n\nDefault is to ignore all node_modules subdirectories.",
-              "items": {
-                "type": ["string", "null"]
-              },
-              "type": ["array", "null"]
-            },
-            "ignoreDiagnostics": {
-              "description": "Ignore TypeScript warnings by diagnostic code.",
-              "items": {
-                "type": ["string", "number"]
-              },
-              "type": ["array", "null"]
-            },
-            "logError": {
-              "default": false,
-              "description": "Logs TypeScript errors to stderr instead of throwing exceptions.",
-              "type": ["boolean", "null"]
-            },
-            "moduleTypes": {
-              "$ref": "#/definitions/tsNodeModuleTypes",
-              "description": "Override certain paths to be compiled and executed as CommonJS or ECMAScript modules.\nWhen overridden, the tsconfig \"module\" and package.json \"type\" fields are overridden, and\nthe file extension is ignored.\nThis is useful if you cannot use .mts, .cts, .mjs, or .cjs file extensions;\nit achieves the same effect.\n\nEach key is a glob pattern following the same rules as tsconfig's \"include\" array.\nWhen multiple patterns match the same file, the last pattern takes precedence.\n\n`cjs` overrides matches files to compile and execute as CommonJS.\n`esm` overrides matches files to compile and execute as native ECMAScript modules.\n`package` overrides either of the above to default behavior, which obeys package.json \"type\" and\ntsconfig.json \"module\" options."
-            },
-            "preferTsExts": {
-              "default": false,
-              "description": "Re-order file extensions so that TypeScript imports are preferred.\n\nFor example, when both `index.js` and `index.ts` exist, enabling this option causes `require('./index')` to resolve to `index.ts` instead of `index.js`",
-              "type": ["boolean", "null"]
-            },
-            "pretty": {
-              "default": false,
-              "description": "Use pretty diagnostic formatter.",
-              "type": ["boolean", "null"]
-            },
-            "require": {
-              "description": "Modules to require, like node's `--require` flag.\n\nIf specified in `tsconfig.json`, the modules will be resolved relative to the `tsconfig.json` file.\n\nIf specified programmatically, each input string should be pre-resolved to an absolute path for\nbest results.",
-              "items": {
-                "type": ["string", "null"]
-              },
-              "type": ["array", "null"]
-            },
-            "scope": {
-              "default": false,
-              "description": "Scope compiler to files within `scopeDir`.",
-              "type": ["boolean", "null"]
-            },
-            "scopeDir": {
-              "default": "First of: `tsconfig.json` \"rootDir\" if specified, directory containing `tsconfig.json`, or cwd if no `tsconfig.json` is loaded.",
-              "type": ["string", "null"]
-            },
-            "skipIgnore": {
-              "default": false,
-              "description": "Skip ignore check, so that compilation will be attempted for all files with matching extensions.",
-              "type": ["boolean", "null"]
-            },
-            "swc": {
-              "description": "Transpile with swc instead of the TypeScript compiler, and skip typechecking.\n\nEquivalent to setting both `transpileOnly: true` and `transpiler: 'ts-node/transpilers/swc'`\n\nFor complete instructions: https://typestrong.org/ts-node/docs/transpilers",
-              "type": ["boolean", "null"]
-            },
-            "transpileOnly": {
-              "default": false,
-              "description": "Use TypeScript's faster `transpileModule`.",
-              "type": ["boolean", "null"]
-            },
-            "transpiler": {
-              "anyOf": [
-                {
-                  "items": [
-                    {
-                      "type": ["string", "null"]
-                    },
-                    {
-                      "additionalProperties": true,
-                      "properties": {},
-                      "type": ["object", "null"]
-                    }
-                  ],
-                  "maxItems": 2,
-                  "minItems": 2,
-                  "type": ["array", "null"]
-                },
-                {
-                  "type": ["string", "null"]
-                }
-              ],
-              "description": "Specify a custom transpiler for use with transpileOnly"
-            },
-            "typeCheck": {
-              "default": true,
-              "description": "**DEPRECATED** Specify type-check is enabled (e.g. `transpileOnly == false`).",
-              "type": ["boolean", "null"]
-            }
-          },
-          "type": ["object", "null"]
-        }
-      }
-    }
-  },
-  "id": "https://www.schemastore.org/tsconfig",
-  "title": "JSON schema for the TypeScript compiler's configuration file",
-  "type": "object"
-}
diff --git a/crates/keymap_editor/Cargo.toml b/crates/keymap_editor/Cargo.toml
deleted file mode 100644
index 33ba95ddd6..0000000000
--- a/crates/keymap_editor/Cargo.toml
+++ /dev/null
@@ -1,52 +0,0 @@
-[package]
-name = "keymap_editor"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/keymap_editor.rs"
-
-[dependencies]
-anyhow.workspace = true
-collections.workspace = true
-command_palette.workspace = true
-component.workspace = true
-db.workspace = true
-editor.workspace = true
-fs.workspace = true
-fuzzy.workspace = true
-gpui.workspace = true
-itertools.workspace = true
-json_schema_store.workspace = true
-language.workspace = true
-log.workspace = true
-menu.workspace = true
-notifications.workspace = true
-paths.workspace = true
-project.workspace = true
-search.workspace = true
-serde_json.workspace = true
-serde.workspace = true
-settings.workspace = true
-telemetry.workspace = true
-tempfile.workspace = true
-theme.workspace = true
-tree-sitter-json.workspace = true
-tree-sitter-rust.workspace = true
-ui_input.workspace = true
-ui.workspace = true
-util.workspace = true
-workspace.workspace = true
-zed_actions.workspace = true
-
-[dev-dependencies]
-db = {"workspace"= true, "features" = ["test-support"]}
-fs = { workspace = true, features = ["test-support"] }
-gpui = { workspace = true, features = ["test-support"] }
-project = { workspace = true, features = ["test-support"] }
-workspace = { workspace = true, features = ["test-support"] }
diff --git a/crates/keymap_editor/LICENSE-GPL b/crates/keymap_editor/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/keymap_editor/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/keymap_editor/src/keymap_editor.rs b/crates/keymap_editor/src/keymap_editor.rs
deleted file mode 100644
index 113d5026eb..0000000000
--- a/crates/keymap_editor/src/keymap_editor.rs
+++ /dev/null
@@ -1,3637 +0,0 @@
-use std::{
-    cell::RefCell,
-    cmp::{self},
-    ops::{Not as _, Range},
-    rc::Rc,
-    sync::Arc,
-    time::{Duration, Instant},
-};
-
-mod ui_components;
-
-use anyhow::{Context as _, anyhow};
-use collections::{HashMap, HashSet};
-use editor::{CompletionProvider, Editor, EditorEvent, EditorMode, SizingBehavior};
-use fs::Fs;
-use fuzzy::{StringMatch, StringMatchCandidate};
-use gpui::{
-    Action, AppContext as _, AsyncApp, ClickEvent, Context, DismissEvent, Entity, EventEmitter,
-    FocusHandle, Focusable, Global, IsZero,
-    KeyBindingContextPredicate::{And, Descendant, Equal, Identifier, Not, NotEqual, Or},
-    KeyContext, KeybindingKeystroke, MouseButton, PlatformKeyboardMapper, Point, ScrollStrategy,
-    ScrollWheelEvent, Stateful, StyledText, Subscription, Task, TextStyleRefinement, WeakEntity,
-    actions, anchored, deferred, div,
-};
-use language::{Language, LanguageConfig, ToOffset as _};
-use notifications::status_toast::{StatusToast, ToastIcon};
-use project::{CompletionDisplayOptions, Project};
-use settings::{
-    BaseKeymap, KeybindSource, KeymapFile, Settings as _, SettingsAssets, infer_json_indent_size,
-};
-use ui::{
-    ActiveTheme as _, App, Banner, BorrowAppContext, ContextMenu, IconButtonShape, Indicator,
-    Modal, ModalFooter, ModalHeader, ParentElement as _, PopoverMenu, Render, Section,
-    SharedString, Styled as _, Table, TableColumnWidths, TableInteractionState,
-    TableResizeBehavior, Tooltip, Window, prelude::*,
-};
-use ui_input::InputField;
-use util::ResultExt;
-use workspace::{
-    Item, ModalView, SerializableItem, Workspace, notifications::NotifyTaskExt as _,
-    register_serializable_item,
-};
-
-pub use ui_components::*;
-use zed_actions::{ChangeKeybinding, OpenKeymap};
-
-use crate::{
-    persistence::KEYBINDING_EDITORS,
-    ui_components::keystroke_input::{
-        ClearKeystrokes, KeystrokeInput, StartRecording, StopRecording,
-    },
-};
-
-const NO_ACTION_ARGUMENTS_TEXT: SharedString = SharedString::new_static("<no arguments>");
-
-actions!(
-    keymap_editor,
-    [
-        /// Edits the selected key binding.
-        EditBinding,
-        /// Creates a new key binding for the selected action.
-        CreateBinding,
-        /// Deletes the selected key binding.
-        DeleteBinding,
-        /// Copies the action name to clipboard.
-        CopyAction,
-        /// Copies the context predicate to clipboard.
-        CopyContext,
-        /// Toggles Conflict Filtering
-        ToggleConflictFilter,
-        /// Toggle Keystroke search
-        ToggleKeystrokeSearch,
-        /// Toggles exact matching for keystroke search
-        ToggleExactKeystrokeMatching,
-        /// Shows matching keystrokes for the currently selected binding
-        ShowMatchingKeybinds
-    ]
-);
-
-pub fn init(cx: &mut App) {
-    let keymap_event_channel = KeymapEventChannel::new();
-    cx.set_global(keymap_event_channel);
-
-    fn common(filter: Option<String>, cx: &mut App) {
-        workspace::with_active_or_new_workspace(cx, move |workspace, window, cx| {
-            workspace
-                .with_local_workspace(window, cx, move |workspace, window, cx| {
-                    let existing = workspace
-                        .active_pane()
-                        .read(cx)
-                        .items()
-                        .find_map(|item| item.downcast::<KeymapEditor>());
-
-                    let keymap_editor = if let Some(existing) = existing {
-                        workspace.activate_item(&existing, true, true, window, cx);
-                        existing
-                    } else {
-                        let keymap_editor =
-                            cx.new(|cx| KeymapEditor::new(workspace.weak_handle(), window, cx));
-                        workspace.add_item_to_active_pane(
-                            Box::new(keymap_editor.clone()),
-                            None,
-                            true,
-                            window,
-                            cx,
-                        );
-                        keymap_editor
-                    };
-
-                    if let Some(filter) = filter {
-                        keymap_editor.update(cx, |editor, cx| {
-                            editor.filter_editor.update(cx, |editor, cx| {
-                                editor.clear(window, cx);
-                                editor.insert(&filter, window, cx);
-                            });
-                            if !editor.has_binding_for(&filter) {
-                                open_binding_modal_after_loading(cx)
-                            }
-                        })
-                    }
-                })
-                .detach();
-        })
-    }
-
-    cx.on_action(|_: &OpenKeymap, cx| common(None, cx));
-    cx.on_action(|action: &ChangeKeybinding, cx| common(Some(action.action.clone()), cx));
-
-    register_serializable_item::<KeymapEditor>(cx);
-}
-
-fn open_binding_modal_after_loading(cx: &mut Context<KeymapEditor>) {
-    let started_at = Instant::now();
-    let observer = Rc::new(RefCell::new(None));
-    let handle = {
-        let observer = Rc::clone(&observer);
-        cx.observe(&cx.entity(), move |editor, _, cx| {
-            let subscription = observer.borrow_mut().take();
-
-            if started_at.elapsed().as_secs() > 10 {
-                return;
-            }
-            if !editor.matches.is_empty() {
-                editor.selected_index = Some(0);
-                cx.dispatch_action(&CreateBinding);
-                return;
-            }
-
-            *observer.borrow_mut() = subscription;
-        })
-    };
-    *observer.borrow_mut() = Some(handle);
-}
-
-pub struct KeymapEventChannel {}
-
-impl Global for KeymapEventChannel {}
-
-impl KeymapEventChannel {
-    fn new() -> Self {
-        Self {}
-    }
-
-    pub fn trigger_keymap_changed(cx: &mut App) {
-        let Some(_event_channel) = cx.try_global::<Self>() else {
-            // don't panic if no global defined. This usually happens in tests
-            return;
-        };
-        cx.update_global(|_event_channel: &mut Self, _| {
-            /* triggers observers in KeymapEditors */
-        });
-    }
-}
-
-#[derive(Default, PartialEq)]
-enum SearchMode {
-    #[default]
-    Normal,
-    KeyStroke {
-        exact_match: bool,
-    },
-}
-
-impl SearchMode {
-    fn invert(&self) -> Self {
-        match self {
-            SearchMode::Normal => SearchMode::KeyStroke { exact_match: true },
-            SearchMode::KeyStroke { .. } => SearchMode::Normal,
-        }
-    }
-
-    fn exact_match(&self) -> bool {
-        match self {
-            SearchMode::Normal => false,
-            SearchMode::KeyStroke { exact_match } => *exact_match,
-        }
-    }
-}
-
-#[derive(Default, PartialEq, Copy, Clone)]
-enum FilterState {
-    #[default]
-    All,
-    Conflicts,
-}
-
-impl FilterState {
-    fn invert(&self) -> Self {
-        match self {
-            FilterState::All => FilterState::Conflicts,
-            FilterState::Conflicts => FilterState::All,
-        }
-    }
-}
-
-#[derive(Debug, Default, PartialEq, Eq, Clone, Hash)]
-struct ActionMapping {
-    keystrokes: Rc<[KeybindingKeystroke]>,
-    context: Option<SharedString>,
-}
-
-#[derive(Debug)]
-struct KeybindConflict {
-    first_conflict_index: usize,
-    remaining_conflict_amount: usize,
-}
-
-#[derive(Clone, Copy, PartialEq)]
-struct ConflictOrigin {
-    override_source: KeybindSource,
-    overridden_source: Option<KeybindSource>,
-    index: usize,
-}
-
-impl ConflictOrigin {
-    fn new(source: KeybindSource, index: usize) -> Self {
-        Self {
-            override_source: source,
-            index,
-            overridden_source: None,
-        }
-    }
-
-    fn with_overridden_source(self, source: KeybindSource) -> Self {
-        Self {
-            overridden_source: Some(source),
-            ..self
-        }
-    }
-
-    fn get_conflict_with(&self, other: &Self) -> Option<Self> {
-        if self.override_source == KeybindSource::User
-            && other.override_source == KeybindSource::User
-        {
-            Some(
-                Self::new(KeybindSource::User, other.index)
-                    .with_overridden_source(self.override_source),
-            )
-        } else if self.override_source > other.override_source {
-            Some(other.with_overridden_source(self.override_source))
-        } else {
-            None
-        }
-    }
-
-    fn is_user_keybind_conflict(&self) -> bool {
-        self.override_source == KeybindSource::User
-            && self.overridden_source == Some(KeybindSource::User)
-    }
-}
-
-#[derive(Default)]
-struct ConflictState {
-    conflicts: Vec<Option<ConflictOrigin>>,
-    keybind_mapping: ConflictKeybindMapping,
-    has_user_conflicts: bool,
-}
-
-type ConflictKeybindMapping = HashMap<
-    Rc<[KeybindingKeystroke]>,
-    Vec<(
-        Option<gpui::KeyBindingContextPredicate>,
-        Vec<ConflictOrigin>,
-    )>,
->;
-
-impl ConflictState {
-    fn new(key_bindings: &[ProcessedBinding]) -> Self {
-        let mut action_keybind_mapping = ConflictKeybindMapping::default();
-
-        let mut largest_index = 0;
-        for (index, binding) in key_bindings
-            .iter()
-            .enumerate()
-            .flat_map(|(index, binding)| Some(index).zip(binding.keybind_information()))
-        {
-            let mapping = binding.get_action_mapping();
-            let predicate = mapping
-                .context
-                .and_then(|ctx| gpui::KeyBindingContextPredicate::parse(&ctx).ok());
-            let entry = action_keybind_mapping
-                .entry(mapping.keystrokes.clone())
-                .or_default();
-            let origin = ConflictOrigin::new(binding.source, index);
-            if let Some((_, origins)) =
-                entry
-                    .iter_mut()
-                    .find(|(other_predicate, _)| match (&predicate, other_predicate) {
-                        (None, None) => true,
-                        (Some(a), Some(b)) => normalized_ctx_eq(a, b),
-                        _ => false,
-                    })
-            {
-                origins.push(origin);
-            } else {
-                entry.push((predicate, vec![origin]));
-            }
-            largest_index = index;
-        }
-
-        let mut conflicts = vec![None; largest_index + 1];
-        let mut has_user_conflicts = false;
-
-        for entries in action_keybind_mapping.values_mut() {
-            for (_, indices) in entries.iter_mut() {
-                indices.sort_unstable_by_key(|origin| origin.override_source);
-                let Some((fst, snd)) = indices.get(0).zip(indices.get(1)) else {
-                    continue;
-                };
-
-                for origin in indices.iter() {
-                    conflicts[origin.index] =
-                        origin.get_conflict_with(if origin == fst { snd } else { fst })
-                }
-
-                has_user_conflicts |= fst.override_source == KeybindSource::User
-                    && snd.override_source == KeybindSource::User;
-            }
-        }
-
-        Self {
-            conflicts,
-            keybind_mapping: action_keybind_mapping,
-            has_user_conflicts,
-        }
-    }
-
-    fn conflicting_indices_for_mapping(
-        &self,
-        action_mapping: &ActionMapping,
-        keybind_idx: Option<usize>,
-    ) -> Option<KeybindConflict> {
-        let ActionMapping {
-            keystrokes,
-            context,
-        } = action_mapping;
-        let predicate = context
-            .as_deref()
-            .and_then(|ctx| gpui::KeyBindingContextPredicate::parse(&ctx).ok());
-        self.keybind_mapping.get(keystrokes).and_then(|entries| {
-            entries
-                .iter()
-                .find_map(|(other_predicate, indices)| {
-                    match (&predicate, other_predicate) {
-                        (None, None) => true,
-                        (Some(pred), Some(other)) => normalized_ctx_eq(pred, other),
-                        _ => false,
-                    }
-                    .then_some(indices)
-                })
-                .and_then(|indices| {
-                    let mut indices = indices
-                        .iter()
-                        .filter(|&conflict| Some(conflict.index) != keybind_idx);
-                    indices.next().map(|origin| KeybindConflict {
-                        first_conflict_index: origin.index,
-                        remaining_conflict_amount: indices.count(),
-                    })
-                })
-        })
-    }
-
-    fn conflict_for_idx(&self, idx: usize) -> Option<ConflictOrigin> {
-        self.conflicts.get(idx).copied().flatten()
-    }
-
-    fn has_user_conflict(&self, candidate_idx: usize) -> bool {
-        self.conflict_for_idx(candidate_idx)
-            .is_some_and(|conflict| conflict.is_user_keybind_conflict())
-    }
-
-    fn any_user_binding_conflicts(&self) -> bool {
-        self.has_user_conflicts
-    }
-}
-
-struct KeymapEditor {
-    workspace: WeakEntity<Workspace>,
-    focus_handle: FocusHandle,
-    _keymap_subscription: Subscription,
-    keybindings: Vec<ProcessedBinding>,
-    keybinding_conflict_state: ConflictState,
-    filter_state: FilterState,
-    search_mode: SearchMode,
-    search_query_debounce: Option<Task<()>>,
-    // corresponds 1 to 1 with keybindings
-    string_match_candidates: Arc<Vec<StringMatchCandidate>>,
-    matches: Vec<StringMatch>,
-    table_interaction_state: Entity<TableInteractionState>,
-    filter_editor: Entity<Editor>,
-    keystroke_editor: Entity<KeystrokeInput>,
-    selected_index: Option<usize>,
-    context_menu: Option<(Entity<ContextMenu>, Point<Pixels>, Subscription)>,
-    previous_edit: Option<PreviousEdit>,
-    humanized_action_names: HumanizedActionNameCache,
-    current_widths: Entity<TableColumnWidths<6>>,
-    show_hover_menus: bool,
-    /// In order for the JSON LSP to run in the actions arguments editor, we
-    /// require a backing file In order to avoid issues (primarily log spam)
-    /// with drop order between the buffer, file, worktree, etc, we create a
-    /// temporary directory for these backing files in the keymap editor struct
-    /// instead of here. This has the added benefit of only having to create a
-    /// worktree and directory once, although the perf improvement is negligible.
-    action_args_temp_dir_worktree: Option<Entity<project::Worktree>>,
-    action_args_temp_dir: Option<tempfile::TempDir>,
-}
-
-enum PreviousEdit {
-    /// When deleting, we want to maintain the same scroll position
-    ScrollBarOffset(Point<Pixels>),
-    /// When editing or creating, because the new keybinding could be in a different position in the sort order
-    /// we store metadata about the new binding (either the modified version or newly created one)
-    /// and upon reload, we search for this binding in the list of keybindings, and if we find the one that matches
-    /// this metadata, we set the selected index to it and scroll to it,
-    /// and if we don't find it, we scroll to 0 and don't set a selected index
-    Keybinding {
-        action_mapping: ActionMapping,
-        action_name: &'static str,
-        /// The scrollbar position to fallback to if we don't find the keybinding during a refresh
-        /// this can happen if there's a filter applied to the search and the keybinding modification
-        /// filters the binding from the search results
-        fallback: Point<Pixels>,
-    },
-}
-
-impl EventEmitter<()> for KeymapEditor {}
-
-impl Focusable for KeymapEditor {
-    fn focus_handle(&self, cx: &App) -> gpui::FocusHandle {
-        if self.selected_index.is_some() {
-            self.focus_handle.clone()
-        } else {
-            self.filter_editor.focus_handle(cx)
-        }
-    }
-}
-/// Helper function to check if two keystroke sequences match exactly
-fn keystrokes_match_exactly(
-    keystrokes1: &[KeybindingKeystroke],
-    keystrokes2: &[KeybindingKeystroke],
-) -> bool {
-    keystrokes1.len() == keystrokes2.len()
-        && keystrokes1.iter().zip(keystrokes2).all(|(k1, k2)| {
-            k1.inner().key == k2.inner().key && k1.inner().modifiers == k2.inner().modifiers
-        })
-}
-
-impl KeymapEditor {
-    fn new(workspace: WeakEntity<Workspace>, window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let _keymap_subscription =
-            cx.observe_global_in::<KeymapEventChannel>(window, Self::on_keymap_changed);
-        let table_interaction_state = cx.new(|cx| {
-            TableInteractionState::new(cx)
-                .with_custom_scrollbar(ui::Scrollbars::for_settings::<editor::EditorSettings>())
-        });
-
-        let keystroke_editor = cx.new(|cx| {
-            let mut keystroke_editor = KeystrokeInput::new(None, window, cx);
-            keystroke_editor.set_search(true);
-            keystroke_editor
-        });
-
-        let filter_editor = cx.new(|cx| {
-            let mut editor = Editor::single_line(window, cx);
-            editor.set_placeholder_text("Filter action names…", window, cx);
-            editor
-        });
-
-        cx.subscribe(&filter_editor, |this, _, e: &EditorEvent, cx| {
-            if !matches!(e, EditorEvent::BufferEdited) {
-                return;
-            }
-
-            this.on_query_changed(cx);
-        })
-        .detach();
-
-        cx.subscribe(&keystroke_editor, |this, _, _, cx| {
-            if matches!(this.search_mode, SearchMode::Normal) {
-                return;
-            }
-
-            this.on_query_changed(cx);
-        })
-        .detach();
-
-        cx.spawn({
-            let workspace = workspace.clone();
-            async move |this, cx| {
-                let temp_dir = tempfile::tempdir_in(paths::temp_dir())?;
-                let worktree = workspace
-                    .update(cx, |ws, cx| {
-                        ws.project()
-                            .update(cx, |p, cx| p.create_worktree(temp_dir.path(), false, cx))
-                    })?
-                    .await?;
-                this.update(cx, |this, _| {
-                    this.action_args_temp_dir = Some(temp_dir);
-                    this.action_args_temp_dir_worktree = Some(worktree);
-                })
-            }
-        })
-        .detach();
-
-        let mut this = Self {
-            workspace,
-            keybindings: vec![],
-            keybinding_conflict_state: ConflictState::default(),
-            filter_state: FilterState::default(),
-            search_mode: SearchMode::default(),
-            string_match_candidates: Arc::new(vec![]),
-            matches: vec![],
-            focus_handle: cx.focus_handle(),
-            _keymap_subscription,
-            table_interaction_state,
-            filter_editor,
-            keystroke_editor,
-            selected_index: None,
-            context_menu: None,
-            previous_edit: None,
-            search_query_debounce: None,
-            humanized_action_names: HumanizedActionNameCache::new(cx),
-            show_hover_menus: true,
-            action_args_temp_dir: None,
-            action_args_temp_dir_worktree: None,
-            current_widths: cx.new(|cx| TableColumnWidths::new(cx)),
-        };
-
-        this.on_keymap_changed(window, cx);
-
-        this
-    }
-
-    fn current_action_query(&self, cx: &App) -> String {
-        self.filter_editor.read(cx).text(cx)
-    }
-
-    fn current_keystroke_query(&self, cx: &App) -> Vec<KeybindingKeystroke> {
-        match self.search_mode {
-            SearchMode::KeyStroke { .. } => self.keystroke_editor.read(cx).keystrokes().to_vec(),
-            SearchMode::Normal => Default::default(),
-        }
-    }
-
-    fn clear_action_query(&self, window: &mut Window, cx: &mut Context<Self>) {
-        self.filter_editor
-            .update(cx, |editor, cx| editor.clear(window, cx))
-    }
-
-    fn on_query_changed(&mut self, cx: &mut Context<Self>) {
-        let action_query = self.current_action_query(cx);
-        let keystroke_query = self.current_keystroke_query(cx);
-        let exact_match = self.search_mode.exact_match();
-
-        let timer = cx.background_executor().timer(Duration::from_secs(1));
-        self.search_query_debounce = Some(cx.background_spawn({
-            let action_query = action_query.clone();
-            let keystroke_query = keystroke_query.clone();
-            async move {
-                timer.await;
-
-                let keystroke_query = keystroke_query
-                    .into_iter()
-                    .map(|keystroke| keystroke.inner().unparse())
-                    .collect::<Vec<String>>()
-                    .join(" ");
-
-                telemetry::event!(
-                    "Keystroke Search Completed",
-                    action_query = action_query,
-                    keystroke_query = keystroke_query,
-                    keystroke_exact_match = exact_match
-                )
-            }
-        }));
-        cx.spawn(async move |this, cx| {
-            Self::update_matches(this.clone(), action_query, keystroke_query, cx).await?;
-            this.update(cx, |this, cx| {
-                this.scroll_to_item(0, ScrollStrategy::Top, cx)
-            })
-        })
-        .detach();
-    }
-
-    async fn update_matches(
-        this: WeakEntity<Self>,
-        action_query: String,
-        keystroke_query: Vec<KeybindingKeystroke>,
-        cx: &mut AsyncApp,
-    ) -> anyhow::Result<()> {
-        let action_query = command_palette::normalize_action_query(&action_query);
-        let (string_match_candidates, keybind_count) = this.read_with(cx, |this, _| {
-            (this.string_match_candidates.clone(), this.keybindings.len())
-        })?;
-        let executor = cx.background_executor().clone();
-        let mut matches = fuzzy::match_strings(
-            &string_match_candidates,
-            &action_query,
-            true,
-            true,
-            keybind_count,
-            &Default::default(),
-            executor,
-        )
-        .await;
-        this.update(cx, |this, cx| {
-            match this.filter_state {
-                FilterState::Conflicts => {
-                    matches.retain(|candidate| {
-                        this.keybinding_conflict_state
-                            .has_user_conflict(candidate.candidate_id)
-                    });
-                }
-                FilterState::All => {}
-            }
-
-            match this.search_mode {
-                SearchMode::KeyStroke { exact_match } => {
-                    matches.retain(|item| {
-                        this.keybindings[item.candidate_id]
-                            .keystrokes()
-                            .is_some_and(|keystrokes| {
-                                if exact_match {
-                                    keystrokes_match_exactly(&keystroke_query, keystrokes)
-                                } else if keystroke_query.len() > keystrokes.len() {
-                                    false
-                                } else {
-                                    for keystroke_offset in 0..keystrokes.len() {
-                                        let mut found_count = 0;
-                                        let mut query_cursor = 0;
-                                        let mut keystroke_cursor = keystroke_offset;
-                                        while query_cursor < keystroke_query.len()
-                                            && keystroke_cursor < keystrokes.len()
-                                        {
-                                            let query = &keystroke_query[query_cursor];
-                                            let keystroke = &keystrokes[keystroke_cursor];
-                                            let matches = query
-                                                .inner()
-                                                .modifiers
-                                                .is_subset_of(&keystroke.inner().modifiers)
-                                                && ((query.inner().key.is_empty()
-                                                    || query.inner().key == keystroke.inner().key)
-                                                    && query.inner().key_char.as_ref().is_none_or(
-                                                        |q_kc| q_kc == &keystroke.inner().key,
-                                                    ));
-                                            if matches {
-                                                found_count += 1;
-                                                query_cursor += 1;
-                                            }
-                                            keystroke_cursor += 1;
-                                        }
-
-                                        if found_count == keystroke_query.len() {
-                                            return true;
-                                        }
-                                    }
-                                    false
-                                }
-                            })
-                    });
-                }
-                SearchMode::Normal => {}
-            }
-
-            if action_query.is_empty() {
-                matches.sort_by(|item1, item2| {
-                    let binding1 = &this.keybindings[item1.candidate_id];
-                    let binding2 = &this.keybindings[item2.candidate_id];
-
-                    binding1.cmp(binding2)
-                });
-            }
-            this.selected_index.take();
-            this.matches = matches;
-
-            cx.notify();
-        })
-    }
-
-    fn get_conflict(&self, row_index: usize) -> Option<ConflictOrigin> {
-        self.matches.get(row_index).and_then(|candidate| {
-            self.keybinding_conflict_state
-                .conflict_for_idx(candidate.candidate_id)
-        })
-    }
-
-    fn process_bindings(
-        json_language: Arc<Language>,
-        zed_keybind_context_language: Arc<Language>,
-        humanized_action_names: &HumanizedActionNameCache,
-        cx: &mut App,
-    ) -> (Vec<ProcessedBinding>, Vec<StringMatchCandidate>) {
-        let key_bindings_ptr = cx.key_bindings();
-        let lock = key_bindings_ptr.borrow();
-        let key_bindings = lock.bindings();
-        let mut unmapped_action_names = HashSet::from_iter(cx.all_action_names().iter().copied());
-        let action_documentation = cx.action_documentation();
-        let mut generator = KeymapFile::action_schema_generator();
-        let actions_with_schemas = HashSet::from_iter(
-            cx.action_schemas(&mut generator)
-                .into_iter()
-                .filter_map(|(name, schema)| schema.is_some().then_some(name)),
-        );
-
-        let mut processed_bindings = Vec::new();
-        let mut string_match_candidates = Vec::new();
-
-        for key_binding in key_bindings {
-            let source = key_binding
-                .meta()
-                .map(KeybindSource::from_meta)
-                .unwrap_or(KeybindSource::Unknown);
-
-            let keystroke_text = ui::text_for_keybinding_keystrokes(key_binding.keystrokes(), cx);
-            let binding = KeyBinding::new(key_binding, source);
-
-            let context = key_binding
-                .predicate()
-                .map(|predicate| {
-                    KeybindContextString::Local(
-                        predicate.to_string().into(),
-                        zed_keybind_context_language.clone(),
-                    )
-                })
-                .unwrap_or(KeybindContextString::Global);
-
-            let action_name = key_binding.action().name();
-            unmapped_action_names.remove(&action_name);
-
-            let action_arguments = key_binding
-                .action_input()
-                .map(|arguments| SyntaxHighlightedText::new(arguments, json_language.clone()));
-            let action_information = ActionInformation::new(
-                action_name,
-                action_arguments,
-                &actions_with_schemas,
-                action_documentation,
-                humanized_action_names,
-            );
-
-            let index = processed_bindings.len();
-            let string_match_candidate =
-                StringMatchCandidate::new(index, &action_information.humanized_name);
-            processed_bindings.push(ProcessedBinding::new_mapped(
-                keystroke_text,
-                binding,
-                context,
-                source,
-                action_information,
-            ));
-            string_match_candidates.push(string_match_candidate);
-        }
-
-        for action_name in unmapped_action_names.into_iter() {
-            let index = processed_bindings.len();
-            let action_information = ActionInformation::new(
-                action_name,
-                None,
-                &actions_with_schemas,
-                action_documentation,
-                humanized_action_names,
-            );
-            let string_match_candidate =
-                StringMatchCandidate::new(index, &action_information.humanized_name);
-
-            processed_bindings.push(ProcessedBinding::Unmapped(action_information));
-            string_match_candidates.push(string_match_candidate);
-        }
-
-        (processed_bindings, string_match_candidates)
-    }
-
-    fn on_keymap_changed(&mut self, window: &mut Window, cx: &mut Context<KeymapEditor>) {
-        let workspace = self.workspace.clone();
-        cx.spawn_in(window, async move |this, cx| {
-            let json_language = load_json_language(workspace.clone(), cx).await;
-            let zed_keybind_context_language =
-                load_keybind_context_language(workspace.clone(), cx).await;
-
-            let (action_query, keystroke_query) = this.update(cx, |this, cx| {
-                let (key_bindings, string_match_candidates) = Self::process_bindings(
-                    json_language,
-                    zed_keybind_context_language,
-                    &this.humanized_action_names,
-                    cx,
-                );
-
-                this.keybinding_conflict_state = ConflictState::new(&key_bindings);
-
-                this.keybindings = key_bindings;
-                this.string_match_candidates = Arc::new(string_match_candidates);
-                this.matches = this
-                    .string_match_candidates
-                    .iter()
-                    .enumerate()
-                    .map(|(ix, candidate)| StringMatch {
-                        candidate_id: ix,
-                        score: 0.0,
-                        positions: vec![],
-                        string: candidate.string.clone(),
-                    })
-                    .collect();
-                (
-                    this.current_action_query(cx),
-                    this.current_keystroke_query(cx),
-                )
-            })?;
-            // calls cx.notify
-            Self::update_matches(this.clone(), action_query, keystroke_query, cx).await?;
-            this.update_in(cx, |this, window, cx| {
-                if let Some(previous_edit) = this.previous_edit.take() {
-                    match previous_edit {
-                        // should remove scroll from process_query
-                        PreviousEdit::ScrollBarOffset(offset) => {
-                            this.table_interaction_state
-                                .update(cx, |table, _| table.set_scroll_offset(offset))
-                            // set selected index and scroll
-                        }
-                        PreviousEdit::Keybinding {
-                            action_mapping,
-                            action_name,
-                            fallback,
-                        } => {
-                            let scroll_position =
-                                this.matches.iter().enumerate().find_map(|(index, item)| {
-                                    let binding = &this.keybindings[item.candidate_id];
-                                    if binding.get_action_mapping().is_some_and(|binding_mapping| {
-                                        binding_mapping == action_mapping
-                                    }) && binding.action().name == action_name
-                                    {
-                                        Some(index)
-                                    } else {
-                                        None
-                                    }
-                                });
-
-                            if let Some(scroll_position) = scroll_position {
-                                this.select_index(
-                                    scroll_position,
-                                    Some(ScrollStrategy::Top),
-                                    window,
-                                    cx,
-                                );
-                            } else {
-                                this.table_interaction_state
-                                    .update(cx, |table, _| table.set_scroll_offset(fallback));
-                            }
-                            cx.notify();
-                        }
-                    }
-                }
-            })
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn key_context(&self) -> KeyContext {
-        let mut dispatch_context = KeyContext::new_with_defaults();
-        dispatch_context.add("KeymapEditor");
-        dispatch_context.add("menu");
-
-        dispatch_context
-    }
-
-    fn scroll_to_item(&self, index: usize, strategy: ScrollStrategy, cx: &mut App) {
-        let index = usize::min(index, self.matches.len().saturating_sub(1));
-        self.table_interaction_state.update(cx, |this, _cx| {
-            this.scroll_handle.scroll_to_item(index, strategy);
-        });
-    }
-
-    fn focus_search(
-        &mut self,
-        _: &search::FocusSearch,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if !self
-            .filter_editor
-            .focus_handle(cx)
-            .contains_focused(window, cx)
-        {
-            window.focus(&self.filter_editor.focus_handle(cx));
-        } else {
-            self.filter_editor.update(cx, |editor, cx| {
-                editor.select_all(&Default::default(), window, cx);
-            });
-        }
-        self.selected_index.take();
-    }
-
-    fn selected_keybind_index(&self) -> Option<usize> {
-        self.selected_index
-            .and_then(|match_index| self.matches.get(match_index))
-            .map(|r#match| r#match.candidate_id)
-    }
-
-    fn selected_keybind_and_index(&self) -> Option<(&ProcessedBinding, usize)> {
-        self.selected_keybind_index()
-            .map(|keybind_index| (&self.keybindings[keybind_index], keybind_index))
-    }
-
-    fn selected_binding(&self) -> Option<&ProcessedBinding> {
-        self.selected_keybind_index()
-            .and_then(|keybind_index| self.keybindings.get(keybind_index))
-    }
-
-    fn select_index(
-        &mut self,
-        index: usize,
-        scroll: Option<ScrollStrategy>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.selected_index != Some(index) {
-            self.selected_index = Some(index);
-            if let Some(scroll_strategy) = scroll {
-                self.scroll_to_item(index, scroll_strategy, cx);
-            }
-            window.focus(&self.focus_handle);
-            cx.notify();
-        }
-    }
-
-    fn create_context_menu(
-        &mut self,
-        position: Point<Pixels>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.context_menu = self.selected_binding().map(|selected_binding| {
-            let selected_binding_has_no_context = selected_binding
-                .context()
-                .and_then(KeybindContextString::local)
-                .is_none();
-
-            let selected_binding_is_unbound = selected_binding.is_unbound();
-
-            let context_menu = ContextMenu::build(window, cx, |menu, _window, _cx| {
-                menu.context(self.focus_handle.clone())
-                    .when(selected_binding_is_unbound, |this| {
-                        this.action("Create", Box::new(CreateBinding))
-                    })
-                    .action_disabled_when(
-                        selected_binding_is_unbound,
-                        "Edit",
-                        Box::new(EditBinding),
-                    )
-                    .action_disabled_when(
-                        selected_binding_is_unbound,
-                        "Delete",
-                        Box::new(DeleteBinding),
-                    )
-                    .separator()
-                    .action("Copy Action", Box::new(CopyAction))
-                    .action_disabled_when(
-                        selected_binding_has_no_context,
-                        "Copy Context",
-                        Box::new(CopyContext),
-                    )
-                    .separator()
-                    .action_disabled_when(
-                        selected_binding_has_no_context,
-                        "Show Matching Keybindings",
-                        Box::new(ShowMatchingKeybinds),
-                    )
-            });
-
-            let context_menu_handle = context_menu.focus_handle(cx);
-            window.defer(cx, move |window, _cx| window.focus(&context_menu_handle));
-            let subscription = cx.subscribe_in(
-                &context_menu,
-                window,
-                |this, _, _: &DismissEvent, window, cx| {
-                    this.dismiss_context_menu(window, cx);
-                },
-            );
-            (context_menu, position, subscription)
-        });
-
-        cx.notify();
-    }
-
-    fn dismiss_context_menu(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.context_menu.take();
-        window.focus(&self.focus_handle);
-        cx.notify();
-    }
-
-    fn context_menu_deployed(&self) -> bool {
-        self.context_menu.is_some()
-    }
-
-    fn create_row_button(
-        &self,
-        index: usize,
-        conflict: Option<ConflictOrigin>,
-        cx: &mut Context<Self>,
-    ) -> IconButton {
-        if self.filter_state != FilterState::Conflicts
-            && let Some(conflict) = conflict
-        {
-            if conflict.is_user_keybind_conflict() {
-                base_button_style(index, IconName::Warning)
-                    .icon_color(Color::Warning)
-                    .tooltip(|_window, cx| {
-                        Tooltip::with_meta(
-                            "View conflicts",
-                            Some(&ToggleConflictFilter),
-                            "Use alt+click to show all conflicts",
-                            cx,
-                        )
-                    })
-                    .on_click(cx.listener(move |this, click: &ClickEvent, window, cx| {
-                        if click.modifiers().alt {
-                            this.set_filter_state(FilterState::Conflicts, cx);
-                        } else {
-                            this.select_index(index, None, window, cx);
-                            this.open_edit_keybinding_modal(false, window, cx);
-                            cx.stop_propagation();
-                        }
-                    }))
-            } else if self.search_mode.exact_match() {
-                base_button_style(index, IconName::Info)
-                    .tooltip(|_window, cx| {
-                        Tooltip::with_meta(
-                            "Edit this binding",
-                            Some(&ShowMatchingKeybinds),
-                            "This binding is overridden by other bindings.",
-                            cx,
-                        )
-                    })
-                    .on_click(cx.listener(move |this, _: &ClickEvent, window, cx| {
-                        this.select_index(index, None, window, cx);
-                        this.open_edit_keybinding_modal(false, window, cx);
-                        cx.stop_propagation();
-                    }))
-            } else {
-                base_button_style(index, IconName::Info)
-                    .tooltip(|_window, cx|  {
-                        Tooltip::with_meta(
-                            "Show matching keybinds",
-                            Some(&ShowMatchingKeybinds),
-                            "This binding is overridden by other bindings.\nUse alt+click to edit this binding",
-                            cx,
-                        )
-                    })
-                    .on_click(cx.listener(move |this, click: &ClickEvent, window, cx| {
-                        if click.modifiers().alt {
-                            this.select_index(index, None, window, cx);
-                            this.open_edit_keybinding_modal(false, window, cx);
-                            cx.stop_propagation();
-                        } else {
-                            this.show_matching_keystrokes(&Default::default(), window, cx);
-                        }
-                    }))
-            }
-        } else {
-            base_button_style(index, IconName::Pencil)
-                .visible_on_hover(if self.selected_index == Some(index) {
-                    "".into()
-                } else if self.show_hover_menus {
-                    row_group_id(index)
-                } else {
-                    "never-show".into()
-                })
-                .when(
-                    self.show_hover_menus && !self.context_menu_deployed(),
-                    |this| this.tooltip(Tooltip::for_action_title("Edit Keybinding", &EditBinding)),
-                )
-                .on_click(cx.listener(move |this, _, window, cx| {
-                    this.select_index(index, None, window, cx);
-                    this.open_edit_keybinding_modal(false, window, cx);
-                    cx.stop_propagation();
-                }))
-        }
-    }
-
-    fn render_no_matches_hint(&self, _window: &mut Window, _cx: &App) -> AnyElement {
-        let hint = match (self.filter_state, &self.search_mode) {
-            (FilterState::Conflicts, _) => {
-                if self.keybinding_conflict_state.any_user_binding_conflicts() {
-                    "No conflicting keybinds found that match the provided query"
-                } else {
-                    "No conflicting keybinds found"
-                }
-            }
-            (FilterState::All, SearchMode::KeyStroke { .. }) => {
-                "No keybinds found matching the entered keystrokes"
-            }
-            (FilterState::All, SearchMode::Normal) => "No matches found for the provided query",
-        };
-
-        Label::new(hint).color(Color::Muted).into_any_element()
-    }
-
-    fn select_next(&mut self, _: &menu::SelectNext, window: &mut Window, cx: &mut Context<Self>) {
-        self.show_hover_menus = false;
-        if let Some(selected) = self.selected_index {
-            let selected = selected + 1;
-            if selected >= self.matches.len() {
-                self.select_last(&Default::default(), window, cx);
-            } else {
-                self.select_index(selected, Some(ScrollStrategy::Center), window, cx);
-            }
-        } else {
-            self.select_first(&Default::default(), window, cx);
-        }
-    }
-
-    fn select_previous(
-        &mut self,
-        _: &menu::SelectPrevious,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.show_hover_menus = false;
-        if let Some(selected) = self.selected_index {
-            if selected == 0 {
-                return;
-            }
-
-            let selected = selected - 1;
-
-            if selected >= self.matches.len() {
-                self.select_last(&Default::default(), window, cx);
-            } else {
-                self.select_index(selected, Some(ScrollStrategy::Center), window, cx);
-            }
-        } else {
-            self.select_last(&Default::default(), window, cx);
-        }
-    }
-
-    fn select_first(&mut self, _: &menu::SelectFirst, window: &mut Window, cx: &mut Context<Self>) {
-        self.show_hover_menus = false;
-        if self.matches.get(0).is_some() {
-            self.select_index(0, Some(ScrollStrategy::Center), window, cx);
-        }
-    }
-
-    fn select_last(&mut self, _: &menu::SelectLast, window: &mut Window, cx: &mut Context<Self>) {
-        self.show_hover_menus = false;
-        if self.matches.last().is_some() {
-            let index = self.matches.len() - 1;
-            self.select_index(index, Some(ScrollStrategy::Center), window, cx);
-        }
-    }
-
-    fn open_edit_keybinding_modal(
-        &mut self,
-        create: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.show_hover_menus = false;
-        let Some((keybind, keybind_index)) = self.selected_keybind_and_index() else {
-            return;
-        };
-        let keybind = keybind.clone();
-        let keymap_editor = cx.entity();
-
-        let keystroke = keybind.keystroke_text().cloned().unwrap_or_default();
-        let arguments = keybind
-            .action()
-            .arguments
-            .as_ref()
-            .map(|arguments| arguments.text.clone());
-        let context = keybind
-            .context()
-            .map(|context| context.local_str().unwrap_or("global"));
-        let action = keybind.action().name;
-        let source = keybind.keybind_source().map(|source| source.name());
-
-        telemetry::event!(
-            "Edit Keybinding Modal Opened",
-            keystroke = keystroke,
-            action = action,
-            source = source,
-            context = context,
-            arguments = arguments,
-        );
-
-        let temp_dir = self.action_args_temp_dir.as_ref().map(|dir| dir.path());
-
-        self.workspace
-            .update(cx, |workspace, cx| {
-                let fs = workspace.app_state().fs.clone();
-                let workspace_weak = cx.weak_entity();
-                workspace.toggle_modal(window, cx, |window, cx| {
-                    let modal = KeybindingEditorModal::new(
-                        create,
-                        keybind,
-                        keybind_index,
-                        keymap_editor,
-                        temp_dir,
-                        workspace_weak,
-                        fs,
-                        window,
-                        cx,
-                    );
-                    window.focus(&modal.focus_handle(cx));
-                    modal
-                });
-            })
-            .log_err();
-    }
-
-    fn edit_binding(&mut self, _: &EditBinding, window: &mut Window, cx: &mut Context<Self>) {
-        self.open_edit_keybinding_modal(false, window, cx);
-    }
-
-    fn create_binding(&mut self, _: &CreateBinding, window: &mut Window, cx: &mut Context<Self>) {
-        self.open_edit_keybinding_modal(true, window, cx);
-    }
-
-    fn delete_binding(&mut self, _: &DeleteBinding, window: &mut Window, cx: &mut Context<Self>) {
-        let Some(to_remove) = self.selected_binding().cloned() else {
-            return;
-        };
-
-        let std::result::Result::Ok(fs) = self
-            .workspace
-            .read_with(cx, |workspace, _| workspace.app_state().fs.clone())
-        else {
-            return;
-        };
-        self.previous_edit = Some(PreviousEdit::ScrollBarOffset(
-            self.table_interaction_state.read(cx).scroll_offset(),
-        ));
-        let keyboard_mapper = cx.keyboard_mapper().clone();
-        cx.spawn(async move |_, _| {
-            remove_keybinding(to_remove, &fs, keyboard_mapper.as_ref()).await
-        })
-        .detach_and_notify_err(window, cx);
-    }
-
-    fn copy_context_to_clipboard(
-        &mut self,
-        _: &CopyContext,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let context = self
-            .selected_binding()
-            .and_then(|binding| binding.context())
-            .and_then(KeybindContextString::local_str)
-            .map(|context| context.to_string());
-        let Some(context) = context else {
-            return;
-        };
-
-        telemetry::event!("Keybinding Context Copied", context = context);
-        cx.write_to_clipboard(gpui::ClipboardItem::new_string(context));
-    }
-
-    fn copy_action_to_clipboard(
-        &mut self,
-        _: &CopyAction,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let action = self
-            .selected_binding()
-            .map(|binding| binding.action().name.to_string());
-        let Some(action) = action else {
-            return;
-        };
-
-        telemetry::event!("Keybinding Action Copied", action = action);
-        cx.write_to_clipboard(gpui::ClipboardItem::new_string(action));
-    }
-
-    fn toggle_conflict_filter(
-        &mut self,
-        _: &ToggleConflictFilter,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.set_filter_state(self.filter_state.invert(), cx);
-    }
-
-    fn set_filter_state(&mut self, filter_state: FilterState, cx: &mut Context<Self>) {
-        if self.filter_state != filter_state {
-            self.filter_state = filter_state;
-            self.on_query_changed(cx);
-        }
-    }
-
-    fn toggle_keystroke_search(
-        &mut self,
-        _: &ToggleKeystrokeSearch,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.search_mode = self.search_mode.invert();
-        self.on_query_changed(cx);
-
-        match self.search_mode {
-            SearchMode::KeyStroke { .. } => {
-                self.keystroke_editor.update(cx, |editor, cx| {
-                    editor.start_recording(&StartRecording, window, cx);
-                });
-            }
-            SearchMode::Normal => {
-                self.keystroke_editor.update(cx, |editor, cx| {
-                    editor.stop_recording(&StopRecording, window, cx);
-                    editor.clear_keystrokes(&ClearKeystrokes, window, cx);
-                });
-                window.focus(&self.filter_editor.focus_handle(cx));
-            }
-        }
-    }
-
-    fn toggle_exact_keystroke_matching(
-        &mut self,
-        _: &ToggleExactKeystrokeMatching,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let SearchMode::KeyStroke { exact_match } = &mut self.search_mode else {
-            return;
-        };
-
-        *exact_match = !(*exact_match);
-        self.on_query_changed(cx);
-    }
-
-    fn show_matching_keystrokes(
-        &mut self,
-        _: &ShowMatchingKeybinds,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(selected_binding) = self.selected_binding() else {
-            return;
-        };
-
-        let keystrokes = selected_binding
-            .keystrokes()
-            .map(Vec::from)
-            .unwrap_or_default();
-
-        self.filter_state = FilterState::All;
-        self.search_mode = SearchMode::KeyStroke { exact_match: true };
-
-        self.keystroke_editor.update(cx, |editor, cx| {
-            editor.set_keystrokes(keystrokes, cx);
-        });
-    }
-
-    fn has_binding_for(&self, action_name: &str) -> bool {
-        self.keybindings
-            .iter()
-            .filter(|kb| kb.keystrokes().is_some())
-            .any(|kb| kb.action().name == action_name)
-    }
-}
-
-struct HumanizedActionNameCache {
-    cache: HashMap<&'static str, SharedString>,
-}
-
-impl HumanizedActionNameCache {
-    fn new(cx: &App) -> Self {
-        let cache = HashMap::from_iter(cx.all_action_names().iter().map(|&action_name| {
-            (
-                action_name,
-                command_palette::humanize_action_name(action_name).into(),
-            )
-        }));
-        Self { cache }
-    }
-
-    fn get(&self, action_name: &'static str) -> SharedString {
-        match self.cache.get(action_name) {
-            Some(name) => name.clone(),
-            None => action_name.into(),
-        }
-    }
-}
-
-#[derive(Clone)]
-struct KeyBinding {
-    keystrokes: Rc<[KeybindingKeystroke]>,
-    source: KeybindSource,
-}
-
-impl KeyBinding {
-    fn new(binding: &gpui::KeyBinding, source: KeybindSource) -> Self {
-        Self {
-            keystrokes: Rc::from(binding.keystrokes()),
-            source,
-        }
-    }
-}
-
-#[derive(Clone)]
-struct KeybindInformation {
-    keystroke_text: SharedString,
-    binding: KeyBinding,
-    context: KeybindContextString,
-    source: KeybindSource,
-}
-
-impl KeybindInformation {
-    fn get_action_mapping(&self) -> ActionMapping {
-        ActionMapping {
-            keystrokes: self.binding.keystrokes.clone(),
-            context: self.context.local().cloned(),
-        }
-    }
-}
-
-#[derive(Clone)]
-struct ActionInformation {
-    name: &'static str,
-    humanized_name: SharedString,
-    arguments: Option<SyntaxHighlightedText>,
-    documentation: Option<&'static str>,
-    has_schema: bool,
-}
-
-impl ActionInformation {
-    fn new(
-        action_name: &'static str,
-        action_arguments: Option<SyntaxHighlightedText>,
-        actions_with_schemas: &HashSet<&'static str>,
-        action_documentation: &HashMap<&'static str, &'static str>,
-        action_name_cache: &HumanizedActionNameCache,
-    ) -> Self {
-        Self {
-            humanized_name: action_name_cache.get(action_name),
-            has_schema: actions_with_schemas.contains(action_name),
-            arguments: action_arguments,
-            documentation: action_documentation.get(action_name).copied(),
-            name: action_name,
-        }
-    }
-}
-
-#[derive(Clone)]
-enum ProcessedBinding {
-    Mapped(KeybindInformation, ActionInformation),
-    Unmapped(ActionInformation),
-}
-
-impl ProcessedBinding {
-    fn new_mapped(
-        keystroke_text: impl Into<SharedString>,
-        binding: KeyBinding,
-        context: KeybindContextString,
-        source: KeybindSource,
-        action_information: ActionInformation,
-    ) -> Self {
-        Self::Mapped(
-            KeybindInformation {
-                keystroke_text: keystroke_text.into(),
-                binding,
-                context,
-                source,
-            },
-            action_information,
-        )
-    }
-
-    fn is_unbound(&self) -> bool {
-        matches!(self, Self::Unmapped(_))
-    }
-
-    fn get_action_mapping(&self) -> Option<ActionMapping> {
-        self.keybind_information()
-            .map(|keybind| keybind.get_action_mapping())
-    }
-
-    fn keystrokes(&self) -> Option<&[KeybindingKeystroke]> {
-        self.key_binding()
-            .map(|binding| binding.keystrokes.as_ref())
-    }
-
-    fn keybind_information(&self) -> Option<&KeybindInformation> {
-        match self {
-            Self::Mapped(keybind_information, _) => Some(keybind_information),
-            Self::Unmapped(_) => None,
-        }
-    }
-
-    fn keybind_source(&self) -> Option<KeybindSource> {
-        self.keybind_information().map(|keybind| keybind.source)
-    }
-
-    fn context(&self) -> Option<&KeybindContextString> {
-        self.keybind_information().map(|keybind| &keybind.context)
-    }
-
-    fn key_binding(&self) -> Option<&KeyBinding> {
-        self.keybind_information().map(|keybind| &keybind.binding)
-    }
-
-    fn keystroke_text(&self) -> Option<&SharedString> {
-        self.keybind_information()
-            .map(|binding| &binding.keystroke_text)
-    }
-
-    fn action(&self) -> &ActionInformation {
-        match self {
-            Self::Mapped(_, action) | Self::Unmapped(action) => action,
-        }
-    }
-
-    fn cmp(&self, other: &Self) -> cmp::Ordering {
-        match (self, other) {
-            (Self::Mapped(keybind1, action1), Self::Mapped(keybind2, action2)) => {
-                match keybind1.source.cmp(&keybind2.source) {
-                    cmp::Ordering::Equal => action1.humanized_name.cmp(&action2.humanized_name),
-                    ordering => ordering,
-                }
-            }
-            (Self::Mapped(_, _), Self::Unmapped(_)) => cmp::Ordering::Less,
-            (Self::Unmapped(_), Self::Mapped(_, _)) => cmp::Ordering::Greater,
-            (Self::Unmapped(action1), Self::Unmapped(action2)) => {
-                action1.humanized_name.cmp(&action2.humanized_name)
-            }
-        }
-    }
-}
-
-#[derive(Clone, Debug, IntoElement, PartialEq, Eq, Hash)]
-enum KeybindContextString {
-    Global,
-    Local(SharedString, Arc<Language>),
-}
-
-impl KeybindContextString {
-    const GLOBAL: SharedString = SharedString::new_static("<global>");
-
-    pub fn local(&self) -> Option<&SharedString> {
-        match self {
-            KeybindContextString::Global => None,
-            KeybindContextString::Local(name, _) => Some(name),
-        }
-    }
-
-    pub fn local_str(&self) -> Option<&str> {
-        match self {
-            KeybindContextString::Global => None,
-            KeybindContextString::Local(name, _) => Some(name),
-        }
-    }
-}
-
-impl RenderOnce for KeybindContextString {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        match self {
-            KeybindContextString::Global => {
-                muted_styled_text(KeybindContextString::GLOBAL, cx).into_any_element()
-            }
-            KeybindContextString::Local(name, language) => {
-                SyntaxHighlightedText::new(name, language).into_any_element()
-            }
-        }
-    }
-}
-
-fn muted_styled_text(text: SharedString, cx: &App) -> StyledText {
-    let len = text.len();
-    StyledText::new(text).with_highlights([(
-        0..len,
-        gpui::HighlightStyle::color(cx.theme().colors().text_muted),
-    )])
-}
-
-impl Item for KeymapEditor {
-    type Event = ();
-
-    fn tab_content_text(&self, _detail: usize, _cx: &App) -> ui::SharedString {
-        "Keymap Editor".into()
-    }
-}
-
-impl Render for KeymapEditor {
-    fn render(&mut self, _window: &mut Window, cx: &mut ui::Context<Self>) -> impl ui::IntoElement {
-        if let SearchMode::KeyStroke { exact_match } = self.search_mode {
-            let button = IconButton::new("keystrokes-exact-match", IconName::CaseSensitive)
-                .tooltip(move |_window, cx| {
-                    Tooltip::for_action(
-                        "Toggle Exact Match Mode",
-                        &ToggleExactKeystrokeMatching,
-                        cx,
-                    )
-                })
-                .shape(IconButtonShape::Square)
-                .toggle_state(exact_match)
-                .on_click(cx.listener(|_, _, window, cx| {
-                    window.dispatch_action(ToggleExactKeystrokeMatching.boxed_clone(), cx);
-                }));
-
-            self.keystroke_editor.update(cx, |editor, _| {
-                editor.actions_slot = Some(button.into_any_element());
-            });
-        } else {
-            self.keystroke_editor.update(cx, |editor, _| {
-                editor.actions_slot = None;
-            });
-        }
-
-        let row_count = self.matches.len();
-        let focus_handle = &self.focus_handle;
-        let theme = cx.theme();
-
-        v_flex()
-            .id("keymap-editor")
-            .track_focus(focus_handle)
-            .key_context(self.key_context())
-            .on_action(cx.listener(Self::select_next))
-            .on_action(cx.listener(Self::select_previous))
-            .on_action(cx.listener(Self::select_first))
-            .on_action(cx.listener(Self::select_last))
-            .on_action(cx.listener(Self::focus_search))
-            .on_action(cx.listener(Self::edit_binding))
-            .on_action(cx.listener(Self::create_binding))
-            .on_action(cx.listener(Self::delete_binding))
-            .on_action(cx.listener(Self::copy_action_to_clipboard))
-            .on_action(cx.listener(Self::copy_context_to_clipboard))
-            .on_action(cx.listener(Self::toggle_conflict_filter))
-            .on_action(cx.listener(Self::toggle_keystroke_search))
-            .on_action(cx.listener(Self::toggle_exact_keystroke_matching))
-            .on_action(cx.listener(Self::show_matching_keystrokes))
-            .on_mouse_move(cx.listener(|this, _, _window, _cx| {
-                this.show_hover_menus = true;
-            }))
-            .size_full()
-            .p_2()
-            .gap_1()
-            .bg(theme.colors().editor_background)
-            .child(
-                v_flex()
-                    .gap_2()
-                    .child(
-                        h_flex()
-                            .gap_2()
-                            .child(
-                                h_flex()
-                                    .key_context({
-                                        let mut context = KeyContext::new_with_defaults();
-                                        context.add("BufferSearchBar");
-                                        context
-                                    })
-                                    .size_full()
-                                    .h_8()
-                                    .pl_2()
-                                    .pr_1()
-                                    .py_1()
-                                    .border_1()
-                                    .border_color(theme.colors().border)
-                                    .rounded_md()
-                                    .child(self.filter_editor.clone()),
-                            )
-                            .child(
-                                h_flex()
-                                    .gap_1()
-                                    .min_w_64()
-                                    .child(
-                                        IconButton::new(
-                                            "KeymapEditorToggleFiltersIcon",
-                                            IconName::Keyboard,
-                                        )
-                                        .icon_size(IconSize::Small)
-                                        .tooltip({
-                                            let focus_handle = focus_handle.clone();
-
-                                            move |_window, cx| {
-                                                Tooltip::for_action_in(
-                                                    "Search by Keystroke",
-                                                    &ToggleKeystrokeSearch,
-                                                    &focus_handle.clone(),
-                                                    cx,
-                                                )
-                                            }
-                                        })
-                                        .toggle_state(matches!(
-                                            self.search_mode,
-                                            SearchMode::KeyStroke { .. }
-                                        ))
-                                        .on_click(|_, window, cx| {
-                                            window.dispatch_action(
-                                                ToggleKeystrokeSearch.boxed_clone(),
-                                                cx,
-                                            );
-                                        }),
-                                    )
-                                    .child(
-                                        IconButton::new("KeymapEditorConflictIcon", IconName::Warning)
-                                            .icon_size(IconSize::Small)
-                                            .when(
-                                                self.keybinding_conflict_state
-                                                    .any_user_binding_conflicts(),
-                                                |this| {
-                                                    this.indicator(
-                                                        Indicator::dot().color(Color::Warning),
-                                                    )
-                                                },
-                                            )
-                                            .tooltip({
-                                                let filter_state = self.filter_state;
-                                                let focus_handle = focus_handle.clone();
-
-                                                move |_window, cx| {
-                                                    Tooltip::for_action_in(
-                                                        match filter_state {
-                                                            FilterState::All => "Show Conflicts",
-                                                            FilterState::Conflicts => {
-                                                                "Hide Conflicts"
-                                                            }
-                                                        },
-                                                        &ToggleConflictFilter,
-                                                        &focus_handle.clone(),
-                                                        cx,
-                                                    )
-                                                }
-                                            })
-                                            .selected_icon_color(Color::Warning)
-                                            .toggle_state(matches!(
-                                                self.filter_state,
-                                                FilterState::Conflicts
-                                            ))
-                                            .on_click(|_, window, cx| {
-                                                window.dispatch_action(
-                                                    ToggleConflictFilter.boxed_clone(),
-                                                    cx,
-                                                );
-                                            }),
-                                    )
-                                    .child(
-                                        h_flex()
-                                            .w_full()
-                                            .pl_2()
-                                            .gap_1()
-                                            .justify_end()
-                                            .child(
-                                                PopoverMenu::new("open-keymap-menu")
-                                                    .menu(move |window, cx| {
-                                                        Some(ContextMenu::build(window, cx, |menu, _, _| {
-                                                            menu.header("View Default...")
-                                                                .action(
-                                                                    "Zed Key Bindings",
-                                                                    zed_actions::OpenDefaultKeymap
-                                                                        .boxed_clone(),
-                                                                )
-                                                                .action(
-                                                                    "Vim Bindings",
-                                                                    zed_actions::vim::OpenDefaultKeymap.boxed_clone(),
-                                                                )
-                                                        }))
-                                                    })
-                                                    .anchor(gpui::Corner::TopRight)
-                                                    .offset(gpui::Point {
-                                                        x: px(0.0),
-                                                        y: px(2.0),
-                                                    })
-                                                    .trigger_with_tooltip(
-                                                        IconButton::new(
-                                                            "OpenKeymapJsonButton",
-                                                            IconName::Ellipsis,
-                                                        )
-                                                        .icon_size(IconSize::Small),
-                                                        {
-                                                            let focus_handle = focus_handle.clone();
-                                                            move |_window, cx| {
-                                                                Tooltip::for_action_in(
-                                                                    "View Default...",
-                                                                    &zed_actions::OpenKeymapFile,
-                                                                    &focus_handle,
-                                                                    cx,
-                                                                )
-                                                            }
-                                                        },
-                                                    ),
-                                            )
-                                            .child(
-                                                Button::new("edit-in-json", "Edit in keymap.json")
-                                                    .style(ButtonStyle::Outlined)
-                                                    .on_click(|_, window, cx| {
-                                                        window.dispatch_action(
-                                                            zed_actions::OpenKeymapFile.boxed_clone(),
-                                                            cx,
-                                                        );
-                                                    })
-                                            ),
-                                    )
-                            ),
-                    )
-                    .when(
-                        matches!(self.search_mode, SearchMode::KeyStroke { .. }),
-                        |this| {
-                            this.child(
-                                h_flex()
-                                    .gap_2()
-                                    .child(self.keystroke_editor.clone())
-                                    .child(div().min_w_64()), // Spacer div to align with the search input
-                            )
-                        },
-                    ),
-            )
-            .child(
-                Table::new()
-                    .interactable(&self.table_interaction_state)
-                    .striped()
-                    .empty_table_callback({
-                        let this = cx.entity();
-                        move |window, cx| this.read(cx).render_no_matches_hint(window, cx)
-                    })
-                    .column_widths([
-                        DefiniteLength::Absolute(AbsoluteLength::Pixels(px(36.))),
-                        DefiniteLength::Fraction(0.25),
-                        DefiniteLength::Fraction(0.20),
-                        DefiniteLength::Fraction(0.14),
-                        DefiniteLength::Fraction(0.45),
-                        DefiniteLength::Fraction(0.08),
-                    ])
-                    .resizable_columns(
-                        [
-                            TableResizeBehavior::None,
-                            TableResizeBehavior::Resizable,
-                            TableResizeBehavior::Resizable,
-                            TableResizeBehavior::Resizable,
-                            TableResizeBehavior::Resizable,
-                            TableResizeBehavior::Resizable, // this column doesn't matter
-                        ],
-                        &self.current_widths,
-                        cx,
-                    )
-                    .header(["", "Action", "Arguments", "Keystrokes", "Context", "Source"])
-                    .uniform_list(
-                        "keymap-editor-table",
-                        row_count,
-                        cx.processor(move |this, range: Range<usize>, _window, cx| {
-                            let context_menu_deployed = this.context_menu_deployed();
-                            range
-                                .filter_map(|index| {
-                                    let candidate_id = this.matches.get(index)?.candidate_id;
-                                    let binding = &this.keybindings[candidate_id];
-                                    let action_name = binding.action().name;
-                                    let conflict = this.get_conflict(index);
-                                    let is_overridden = conflict.is_some_and(|conflict| {
-                                        !conflict.is_user_keybind_conflict()
-                                    });
-
-                                    let icon = this.create_row_button(index, conflict, cx);
-
-                                    let action = div()
-                                        .id(("keymap action", index))
-                                        .child({
-                                            if action_name != gpui::NoAction.name() {
-                                                binding
-                                                    .action()
-                                                    .humanized_name
-                                                    .clone()
-                                                    .into_any_element()
-                                            } else {
-                                                const NULL: SharedString =
-                                                    SharedString::new_static("<null>");
-                                                muted_styled_text(NULL, cx)
-                                                    .into_any_element()
-                                            }
-                                        })
-                                        .when(
-                                            !context_menu_deployed
-                                                && this.show_hover_menus
-                                                && !is_overridden,
-                                            |this| {
-                                                this.tooltip({
-                                                    let action_name = binding.action().name;
-                                                    let action_docs =
-                                                        binding.action().documentation;
-                                                    move |_, cx| {
-                                                        let action_tooltip =
-                                                            Tooltip::new(action_name);
-                                                        let action_tooltip = match action_docs {
-                                                            Some(docs) => action_tooltip.meta(docs),
-                                                            None => action_tooltip,
-                                                        };
-                                                        cx.new(|_| action_tooltip).into()
-                                                    }
-                                                })
-                                            },
-                                        )
-                                        .into_any_element();
-
-                                    let keystrokes = binding.key_binding().map_or(
-                                        binding
-                                            .keystroke_text()
-                                            .cloned()
-                                            .unwrap_or_default()
-                                            .into_any_element(),
-                                        |binding| ui::KeyBinding::from_keystrokes(binding.keystrokes.clone(), binding.source).into_any_element()
-                                    );
-
-                                    let action_arguments = match binding.action().arguments.clone()
-                                    {
-                                        Some(arguments) => arguments.into_any_element(),
-                                        None => {
-                                            if binding.action().has_schema {
-                                                muted_styled_text(NO_ACTION_ARGUMENTS_TEXT, cx)
-                                                    .into_any_element()
-                                            } else {
-                                                gpui::Empty.into_any_element()
-                                            }
-                                        }
-                                    };
-
-                                    let context = binding.context().cloned().map_or(
-                                        gpui::Empty.into_any_element(),
-                                        |context| {
-                                            let is_local = context.local().is_some();
-
-                                            div()
-                                                .id(("keymap context", index))
-                                                .child(context.clone())
-                                                .when(
-                                                    is_local
-                                                        && !context_menu_deployed
-                                                        && !is_overridden
-                                                        && this.show_hover_menus,
-                                                    |this| {
-                                                        this.tooltip(Tooltip::element({
-                                                            move |_, _| {
-                                                                context.clone().into_any_element()
-                                                            }
-                                                        }))
-                                                    },
-                                                )
-                                                .into_any_element()
-                                        },
-                                    );
-
-                                    let source = binding
-                                        .keybind_source()
-                                        .map(|source| source.name())
-                                        .unwrap_or_default()
-                                        .into_any_element();
-
-                                    Some([
-                                        icon.into_any_element(),
-                                        action,
-                                        action_arguments,
-                                        keystrokes,
-                                        context,
-                                        source,
-                                    ])
-                                })
-                                .collect()
-                        }),
-                    )
-                    .map_row(cx.processor(
-                        |this, (row_index, row): (usize, Stateful<Div>), _window, cx| {
-                        let conflict = this.get_conflict(row_index);
-                            let is_selected = this.selected_index == Some(row_index);
-
-                            let row_id = row_group_id(row_index);
-
-                            div()
-                                .id(("keymap-row-wrapper", row_index))
-                                .child(
-                                    row.id(row_id.clone())
-                                        .on_any_mouse_down(cx.listener(
-                                            move |this,
-                                                  mouse_down_event: &gpui::MouseDownEvent,
-                                                  window,
-                                                  cx| {
-                                                if mouse_down_event.button == MouseButton::Right {
-                                                    this.select_index(
-                                                        row_index, None, window, cx,
-                                                    );
-                                                    this.create_context_menu(
-                                                        mouse_down_event.position,
-                                                        window,
-                                                        cx,
-                                                    );
-                                                }
-                                            },
-                                        ))
-                                        .on_click(cx.listener(
-                                            move |this, event: &ClickEvent, window, cx| {
-                                                this.select_index(row_index, None, window, cx);
-                                                if event.click_count() == 2 {
-                                                    this.open_edit_keybinding_modal(
-                                                        false, window, cx,
-                                                    );
-                                                }
-                                            },
-                                        ))
-                                        .group(row_id)
-                                        .when(
-                                            conflict.is_some_and(|conflict| {
-                                                !conflict.is_user_keybind_conflict()
-                                            }),
-                                            |row| {
-                                                const OVERRIDDEN_OPACITY: f32 = 0.5;
-                                                row.opacity(OVERRIDDEN_OPACITY)
-                                            },
-                                        )
-                                        .when_some(
-                                            conflict.filter(|conflict| {
-                                                !this.context_menu_deployed() &&
-                                                !conflict.is_user_keybind_conflict()
-                                            }),
-                                            |row, conflict| {
-                                                let overriding_binding = this.keybindings.get(conflict.index);
-                                                let context = overriding_binding.and_then(|binding| {
-                                                    match conflict.override_source {
-                                                        KeybindSource::User  => Some("your keymap"),
-                                                        KeybindSource::Vim => Some("the vim keymap"),
-                                                        KeybindSource::Base => Some("your base keymap"),
-                                                        _ => {
-                                                            log::error!("Unexpected override from the {} keymap", conflict.override_source.name());
-                                                            None
-                                                        }
-                                                    }.map(|source| format!("This keybinding is overridden by the '{}' binding from {}.", binding.action().humanized_name, source))
-                                                }).unwrap_or_else(|| "This binding is overridden.".to_string());
-
-                                                row.tooltip(Tooltip::text(context))},
-                                        ),
-                                )
-                                .border_2()
-                                .when(
-                                    conflict.is_some_and(|conflict| {
-                                        conflict.is_user_keybind_conflict()
-                                    }),
-                                    |row| row.bg(cx.theme().status().error_background),
-                                )
-                                .when(is_selected, |row| {
-                                    row.border_color(cx.theme().colors().panel_focused_border)
-                                })
-                                .into_any_element()
-                        }),
-                    ),
-            )
-            .on_scroll_wheel(cx.listener(|this, event: &ScrollWheelEvent, _, cx| {
-                // This ensures that the menu is not dismissed in cases where scroll events
-                // with a delta of zero are emitted
-                if !event.delta.pixel_delta(px(1.)).y.is_zero() {
-                    this.context_menu.take();
-                    cx.notify();
-                }
-            }))
-            .children(self.context_menu.as_ref().map(|(menu, position, _)| {
-                deferred(
-                    anchored()
-                        .position(*position)
-                        .anchor(gpui::Corner::TopLeft)
-                        .child(menu.clone()),
-                )
-                .with_priority(1)
-            }))
-    }
-}
-
-fn row_group_id(row_index: usize) -> SharedString {
-    SharedString::new(format!("keymap-table-row-{}", row_index))
-}
-
-fn base_button_style(row_index: usize, icon: IconName) -> IconButton {
-    IconButton::new(("keymap-icon", row_index), icon)
-        .shape(IconButtonShape::Square)
-        .size(ButtonSize::Compact)
-}
-
-#[derive(Debug, Clone, IntoElement)]
-struct SyntaxHighlightedText {
-    text: SharedString,
-    language: Arc<Language>,
-}
-
-impl SyntaxHighlightedText {
-    pub fn new(text: impl Into<SharedString>, language: Arc<Language>) -> Self {
-        Self {
-            text: text.into(),
-            language,
-        }
-    }
-}
-
-impl RenderOnce for SyntaxHighlightedText {
-    fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let text_style = window.text_style();
-        let syntax_theme = cx.theme().syntax();
-
-        let text = self.text.clone();
-
-        let highlights = self
-            .language
-            .highlight_text(&text.as_ref().into(), 0..text.len());
-        let mut runs = Vec::with_capacity(highlights.len());
-        let mut offset = 0;
-
-        for (highlight_range, highlight_id) in highlights {
-            // Add un-highlighted text before the current highlight
-            if highlight_range.start > offset {
-                runs.push(text_style.to_run(highlight_range.start - offset));
-            }
-
-            let mut run_style = text_style.clone();
-            if let Some(highlight_style) = highlight_id.style(syntax_theme) {
-                run_style = run_style.highlight(highlight_style);
-            }
-            // add the highlighted range
-            runs.push(run_style.to_run(highlight_range.len()));
-            offset = highlight_range.end;
-        }
-
-        // Add any remaining un-highlighted text
-        if offset < text.len() {
-            runs.push(text_style.to_run(text.len() - offset));
-        }
-
-        StyledText::new(text).with_runs(runs)
-    }
-}
-
-#[derive(PartialEq)]
-struct InputError {
-    severity: Severity,
-    content: SharedString,
-}
-
-impl InputError {
-    fn warning(message: impl Into<SharedString>) -> Self {
-        Self {
-            severity: Severity::Warning,
-            content: message.into(),
-        }
-    }
-
-    fn error(message: anyhow::Error) -> Self {
-        Self {
-            severity: Severity::Error,
-            content: message.to_string().into(),
-        }
-    }
-}
-
-struct KeybindingEditorModal {
-    creating: bool,
-    editing_keybind: ProcessedBinding,
-    editing_keybind_idx: usize,
-    keybind_editor: Entity<KeystrokeInput>,
-    context_editor: Entity<InputField>,
-    action_arguments_editor: Option<Entity<ActionArgumentsEditor>>,
-    fs: Arc<dyn Fs>,
-    error: Option<InputError>,
-    keymap_editor: Entity<KeymapEditor>,
-    workspace: WeakEntity<Workspace>,
-    focus_state: KeybindingEditorModalFocusState,
-}
-
-impl ModalView for KeybindingEditorModal {}
-
-impl EventEmitter<DismissEvent> for KeybindingEditorModal {}
-
-impl Focusable for KeybindingEditorModal {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        self.keybind_editor.focus_handle(cx)
-    }
-}
-
-impl KeybindingEditorModal {
-    pub fn new(
-        create: bool,
-        editing_keybind: ProcessedBinding,
-        editing_keybind_idx: usize,
-        keymap_editor: Entity<KeymapEditor>,
-        action_args_temp_dir: Option<&std::path::Path>,
-        workspace: WeakEntity<Workspace>,
-        fs: Arc<dyn Fs>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Self {
-        let keybind_editor = cx
-            .new(|cx| KeystrokeInput::new(editing_keybind.keystrokes().map(Vec::from), window, cx));
-
-        let context_editor: Entity<InputField> = cx.new(|cx| {
-            let input = InputField::new(window, cx, "Keybinding Context")
-                .label("Edit Context")
-                .label_size(LabelSize::Default);
-
-            if let Some(context) = editing_keybind
-                .context()
-                .and_then(KeybindContextString::local)
-            {
-                input.editor().update(cx, |editor, cx| {
-                    editor.set_text(context.clone(), window, cx);
-                });
-            }
-
-            let editor_entity = input.editor().clone();
-            let workspace = workspace.clone();
-            cx.spawn(async move |_input_handle, cx| {
-                let contexts = cx
-                    .background_spawn(async { collect_contexts_from_assets() })
-                    .await;
-
-                let language = load_keybind_context_language(workspace, cx).await;
-                editor_entity
-                    .update(cx, |editor, cx| {
-                        if let Some(buffer) = editor.buffer().read(cx).as_singleton() {
-                            buffer.update(cx, |buffer, cx| {
-                                buffer.set_language(Some(language), cx);
-                            });
-                        }
-                        editor.set_completion_provider(Some(std::rc::Rc::new(
-                            KeyContextCompletionProvider { contexts },
-                        )));
-                    })
-                    .context("Failed to load completions for keybinding context")
-            })
-            .detach_and_log_err(cx);
-
-            input
-        });
-
-        let action_arguments_editor = editing_keybind.action().has_schema.then(|| {
-            let arguments = editing_keybind
-                .action()
-                .arguments
-                .as_ref()
-                .map(|args| args.text.clone());
-            cx.new(|cx| {
-                ActionArgumentsEditor::new(
-                    editing_keybind.action().name,
-                    arguments,
-                    action_args_temp_dir,
-                    workspace.clone(),
-                    window,
-                    cx,
-                )
-            })
-        });
-
-        let focus_state = KeybindingEditorModalFocusState::new(
-            keybind_editor.focus_handle(cx),
-            action_arguments_editor
-                .as_ref()
-                .map(|args_editor| args_editor.focus_handle(cx)),
-            context_editor.focus_handle(cx),
-        );
-
-        Self {
-            creating: create,
-            editing_keybind,
-            editing_keybind_idx,
-            fs,
-            keybind_editor,
-            context_editor,
-            action_arguments_editor,
-            error: None,
-            keymap_editor,
-            workspace,
-            focus_state,
-        }
-    }
-
-    fn set_error(&mut self, error: InputError, cx: &mut Context<Self>) -> bool {
-        if self
-            .error
-            .as_ref()
-            .is_some_and(|old_error| old_error.severity == Severity::Warning && *old_error == error)
-        {
-            false
-        } else {
-            self.error = Some(error);
-            cx.notify();
-            true
-        }
-    }
-
-    fn validate_action_arguments(&self, cx: &App) -> anyhow::Result<Option<String>> {
-        let action_arguments = self
-            .action_arguments_editor
-            .as_ref()
-            .map(|arguments_editor| arguments_editor.read(cx).editor.read(cx).text(cx))
-            .filter(|args| !args.is_empty());
-
-        let value = action_arguments
-            .as_ref()
-            .map(|args| {
-                serde_json::from_str(args).context("Failed to parse action arguments as JSON")
-            })
-            .transpose()?;
-
-        cx.build_action(self.editing_keybind.action().name, value)
-            .context("Failed to validate action arguments")?;
-        Ok(action_arguments)
-    }
-
-    fn validate_keystrokes(&self, cx: &App) -> anyhow::Result<Vec<KeybindingKeystroke>> {
-        let new_keystrokes = self
-            .keybind_editor
-            .read_with(cx, |editor, _| editor.keystrokes().to_vec());
-        anyhow::ensure!(!new_keystrokes.is_empty(), "Keystrokes cannot be empty");
-        Ok(new_keystrokes)
-    }
-
-    fn validate_context(&self, cx: &App) -> anyhow::Result<Option<String>> {
-        let new_context = self
-            .context_editor
-            .read_with(cx, |input, cx| input.editor().read(cx).text(cx));
-        let Some(context) = new_context.is_empty().not().then_some(new_context) else {
-            return Ok(None);
-        };
-        gpui::KeyBindingContextPredicate::parse(&context).context("Failed to parse key context")?;
-
-        Ok(Some(context))
-    }
-
-    fn save_or_display_error(&mut self, cx: &mut Context<Self>) {
-        self.save(cx).map_err(|err| self.set_error(err, cx)).ok();
-    }
-
-    fn save(&mut self, cx: &mut Context<Self>) -> Result<(), InputError> {
-        let existing_keybind = self.editing_keybind.clone();
-        let fs = self.fs.clone();
-
-        let mut new_keystrokes = self.validate_keystrokes(cx).map_err(InputError::error)?;
-        new_keystrokes
-            .iter_mut()
-            .for_each(|ks| ks.remove_key_char());
-
-        let new_context = self.validate_context(cx).map_err(InputError::error)?;
-        let new_action_args = self
-            .validate_action_arguments(cx)
-            .map_err(InputError::error)?;
-
-        let action_mapping = ActionMapping {
-            keystrokes: Rc::from(new_keystrokes.as_slice()),
-            context: new_context.map(SharedString::from),
-        };
-
-        let conflicting_indices = self
-            .keymap_editor
-            .read(cx)
-            .keybinding_conflict_state
-            .conflicting_indices_for_mapping(
-                &action_mapping,
-                self.creating.not().then_some(self.editing_keybind_idx),
-            );
-
-        conflicting_indices.map(|KeybindConflict {
-            first_conflict_index,
-            remaining_conflict_amount,
-        }|
-        {
-            let conflicting_action_name = self
-                .keymap_editor
-                .read(cx)
-                .keybindings
-                .get(first_conflict_index)
-                .map(|keybind| keybind.action().name);
-
-            let warning_message = match conflicting_action_name {
-                Some(name) => {
-                     if remaining_conflict_amount > 0 {
-                        format!(
-                            "Your keybind would conflict with the \"{}\" action and {} other bindings",
-                            name, remaining_conflict_amount
-                        )
-                    } else {
-                        format!("Your keybind would conflict with the \"{}\" action", name)
-                    }
-                }
-                None => {
-                    log::info!(
-                        "Could not find action in keybindings with index {}",
-                        first_conflict_index
-                    );
-                    "Your keybind would conflict with other actions".to_string()
-                }
-            };
-
-            let warning = InputError::warning(warning_message);
-            if self.error.as_ref().is_some_and(|old_error| *old_error == warning) {
-                Ok(())
-           } else {
-                Err(warning)
-            }
-        }).unwrap_or(Ok(()))?;
-
-        let create = self.creating;
-        let keyboard_mapper = cx.keyboard_mapper().clone();
-
-        cx.spawn(async move |this, cx| {
-            let action_name = existing_keybind.action().name;
-            let humanized_action_name = existing_keybind.action().humanized_name.clone();
-
-            match save_keybinding_update(
-                create,
-                existing_keybind,
-                &action_mapping,
-                new_action_args.as_deref(),
-                &fs,
-                keyboard_mapper.as_ref(),
-            )
-            .await
-            {
-                Ok(_) => {
-                    this.update(cx, |this, cx| {
-                        this.keymap_editor.update(cx, |keymap, cx| {
-                            keymap.previous_edit = Some(PreviousEdit::Keybinding {
-                                action_mapping,
-                                action_name,
-                                fallback: keymap.table_interaction_state.read(cx).scroll_offset(),
-                            });
-                            let status_toast = StatusToast::new(
-                                format!("Saved edits to the {} action.", humanized_action_name),
-                                cx,
-                                move |this, _cx| {
-                                    this.icon(ToastIcon::new(IconName::Check).color(Color::Success))
-                                        .dismiss_button(true)
-                                    // .action("Undo", f) todo: wire the undo functionality
-                                },
-                            );
-
-                            this.workspace
-                                .update(cx, |workspace, cx| {
-                                    workspace.toggle_status_toast(status_toast, cx);
-                                })
-                                .log_err();
-                        });
-                        cx.emit(DismissEvent);
-                    })
-                    .ok();
-                }
-                Err(err) => {
-                    this.update(cx, |this, cx| {
-                        this.set_error(InputError::error(err), cx);
-                    })
-                    .log_err();
-                }
-            }
-        })
-        .detach();
-
-        Ok(())
-    }
-
-    fn key_context(&self) -> KeyContext {
-        let mut key_context = KeyContext::new_with_defaults();
-        key_context.add("KeybindEditorModal");
-        key_context
-    }
-
-    fn focus_next(&mut self, _: &menu::SelectNext, window: &mut Window, cx: &mut Context<Self>) {
-        self.focus_state.focus_next(window, cx);
-    }
-
-    fn focus_prev(
-        &mut self,
-        _: &menu::SelectPrevious,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.focus_state.focus_previous(window, cx);
-    }
-
-    fn confirm(&mut self, _: &menu::Confirm, _window: &mut Window, cx: &mut Context<Self>) {
-        self.save_or_display_error(cx);
-    }
-
-    fn cancel(&mut self, _: &menu::Cancel, _: &mut Window, cx: &mut Context<Self>) {
-        cx.emit(DismissEvent);
-    }
-
-    fn get_matching_bindings_count(&self, cx: &Context<Self>) -> usize {
-        let current_keystrokes = self.keybind_editor.read(cx).keystrokes();
-
-        if current_keystrokes.is_empty() {
-            return 0;
-        }
-
-        self.keymap_editor
-            .read(cx)
-            .keybindings
-            .iter()
-            .enumerate()
-            .filter(|(idx, binding)| {
-                // Don't count the binding we're currently editing
-                if !self.creating && *idx == self.editing_keybind_idx {
-                    return false;
-                }
-
-                binding.keystrokes().is_some_and(|keystrokes| {
-                    keystrokes_match_exactly(keystrokes, current_keystrokes)
-                })
-            })
-            .count()
-    }
-
-    fn show_matching_bindings(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let keystrokes = self.keybind_editor.read(cx).keystrokes().to_vec();
-
-        self.keymap_editor.update(cx, |keymap_editor, cx| {
-            keymap_editor.clear_action_query(window, cx)
-        });
-
-        // Dismiss the modal
-        cx.emit(DismissEvent);
-
-        // Update the keymap editor to show matching keystrokes
-        self.keymap_editor.update(cx, |editor, cx| {
-            editor.filter_state = FilterState::All;
-            editor.search_mode = SearchMode::KeyStroke { exact_match: true };
-            editor.keystroke_editor.update(cx, |keystroke_editor, cx| {
-                keystroke_editor.set_keystrokes(keystrokes, cx);
-            });
-        });
-    }
-}
-
-impl Render for KeybindingEditorModal {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let theme = cx.theme().colors();
-        let matching_bindings_count = self.get_matching_bindings_count(cx);
-
-        v_flex()
-            .w(rems(34.))
-            .elevation_3(cx)
-            .key_context(self.key_context())
-            .on_action(cx.listener(Self::focus_next))
-            .on_action(cx.listener(Self::focus_prev))
-            .on_action(cx.listener(Self::confirm))
-            .on_action(cx.listener(Self::cancel))
-            .child(
-                Modal::new("keybinding_editor_modal", None)
-                    .header(
-                        ModalHeader::new().child(
-                            v_flex()
-                                .w_full()
-                                .pb_1p5()
-                                .mb_1()
-                                .gap_0p5()
-                                .border_b_1()
-                                .border_color(theme.border_variant)
-                                .child(Label::new(
-                                    self.editing_keybind.action().humanized_name.clone(),
-                                ))
-                                .when_some(
-                                    self.editing_keybind.action().documentation,
-                                    |this, docs| {
-                                        this.child(
-                                            Label::new(docs)
-                                                .size(LabelSize::Small)
-                                                .color(Color::Muted),
-                                        )
-                                    },
-                                ),
-                        ),
-                    )
-                    .section(
-                        Section::new().child(
-                            v_flex()
-                                .gap_2p5()
-                                .child(
-                                    v_flex()
-                                        .gap_1()
-                                        .child(Label::new("Edit Keystroke"))
-                                        .child(self.keybind_editor.clone())
-                                        .child(h_flex().gap_px().when(
-                                            matching_bindings_count > 0,
-                                            |this| {
-                                                let label = format!(
-                                                    "There {} {} {} with the same keystrokes.",
-                                                    if matching_bindings_count == 1 {
-                                                        "is"
-                                                    } else {
-                                                        "are"
-                                                    },
-                                                    matching_bindings_count,
-                                                    if matching_bindings_count == 1 {
-                                                        "binding"
-                                                    } else {
-                                                        "bindings"
-                                                    }
-                                                );
-
-                                                this.child(
-                                                    Label::new(label)
-                                                        .size(LabelSize::Small)
-                                                        .color(Color::Muted),
-                                                )
-                                                .child(
-                                                    Button::new("show_matching", "View")
-                                                        .label_size(LabelSize::Small)
-                                                        .icon(IconName::ArrowUpRight)
-                                                        .icon_color(Color::Muted)
-                                                        .icon_size(IconSize::Small)
-                                                        .on_click(cx.listener(
-                                                            |this, _, window, cx| {
-                                                                this.show_matching_bindings(
-                                                                    window, cx,
-                                                                );
-                                                            },
-                                                        )),
-                                                )
-                                            },
-                                        )),
-                                )
-                                .when_some(self.action_arguments_editor.clone(), |this, editor| {
-                                    this.child(
-                                        v_flex()
-                                            .gap_1()
-                                            .child(Label::new("Edit Arguments"))
-                                            .child(editor),
-                                    )
-                                })
-                                .child(self.context_editor.clone())
-                                .when_some(self.error.as_ref(), |this, error| {
-                                    this.child(
-                                        Banner::new()
-                                            .severity(error.severity)
-                                            .child(Label::new(error.content.clone())),
-                                    )
-                                }),
-                        ),
-                    )
-                    .footer(
-                        ModalFooter::new().end_slot(
-                            h_flex()
-                                .gap_1()
-                                .child(
-                                    Button::new("cancel", "Cancel")
-                                        .on_click(cx.listener(|_, _, _, cx| cx.emit(DismissEvent))),
-                                )
-                                .child(Button::new("save-btn", "Save").on_click(cx.listener(
-                                    |this, _event, _window, cx| {
-                                        this.save_or_display_error(cx);
-                                    },
-                                ))),
-                        ),
-                    ),
-            )
-    }
-}
-
-struct KeybindingEditorModalFocusState {
-    handles: Vec<FocusHandle>,
-}
-
-impl KeybindingEditorModalFocusState {
-    fn new(
-        keystrokes: FocusHandle,
-        action_input: Option<FocusHandle>,
-        context: FocusHandle,
-    ) -> Self {
-        Self {
-            handles: Vec::from_iter(
-                [Some(keystrokes), action_input, Some(context)]
-                    .into_iter()
-                    .flatten(),
-            ),
-        }
-    }
-
-    fn focused_index(&self, window: &Window, cx: &App) -> Option<i32> {
-        self.handles
-            .iter()
-            .position(|handle| handle.contains_focused(window, cx))
-            .map(|i| i as i32)
-    }
-
-    fn focus_index(&self, mut index: i32, window: &mut Window) {
-        if index < 0 {
-            index = self.handles.len() as i32 - 1;
-        }
-        if index >= self.handles.len() as i32 {
-            index = 0;
-        }
-        window.focus(&self.handles[index as usize]);
-    }
-
-    fn focus_next(&self, window: &mut Window, cx: &App) {
-        let index_to_focus = if let Some(index) = self.focused_index(window, cx) {
-            index + 1
-        } else {
-            0
-        };
-        self.focus_index(index_to_focus, window);
-    }
-
-    fn focus_previous(&self, window: &mut Window, cx: &App) {
-        let index_to_focus = if let Some(index) = self.focused_index(window, cx) {
-            index - 1
-        } else {
-            self.handles.len() as i32 - 1
-        };
-        self.focus_index(index_to_focus, window);
-    }
-}
-
-struct ActionArgumentsEditor {
-    editor: Entity<Editor>,
-    focus_handle: FocusHandle,
-    is_loading: bool,
-    /// See documentation in `KeymapEditor` for why a temp dir is needed.
-    /// This field exists because the keymap editor temp dir creation may fail,
-    /// and rather than implement a complicated retry mechanism, we simply
-    /// fallback to trying to create a temporary directory in this editor on
-    /// demand. Of note is that the TempDir struct will remove the directory
-    /// when dropped.
-    backup_temp_dir: Option<tempfile::TempDir>,
-}
-
-impl Focusable for ActionArgumentsEditor {
-    fn focus_handle(&self, _cx: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl ActionArgumentsEditor {
-    fn new(
-        action_name: &'static str,
-        arguments: Option<SharedString>,
-        temp_dir: Option<&std::path::Path>,
-        workspace: WeakEntity<Workspace>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let focus_handle = cx.focus_handle();
-        cx.on_focus_in(&focus_handle, window, |this, window, cx| {
-            this.editor.focus_handle(cx).focus(window);
-        })
-        .detach();
-        let editor = cx.new(|cx| {
-            let mut editor = Editor::auto_height_unbounded(1, window, cx);
-            Self::set_editor_text(&mut editor, arguments.clone(), window, cx);
-            editor.set_read_only(true);
-            editor
-        });
-
-        let temp_dir = temp_dir.map(|path| path.to_owned());
-        cx.spawn_in(window, async move |this, cx| {
-            let result = async {
-                let (project, fs) = workspace.read_with(cx, |workspace, _cx| {
-                    (
-                        workspace.project().downgrade(),
-                        workspace.app_state().fs.clone(),
-                    )
-                })?;
-
-                let file_name = json_schema_store::normalized_action_file_name(action_name);
-
-                let (buffer, backup_temp_dir) =
-                    Self::create_temp_buffer(temp_dir, file_name.clone(), project.clone(), fs, cx)
-                        .await
-                        .context(concat!(
-                            "Failed to create temporary buffer for action arguments. ",
-                            "Auto-complete will not work"
-                        ))?;
-
-                let editor = cx.new_window_entity(|window, cx| {
-                    let multi_buffer = cx.new(|cx| editor::MultiBuffer::singleton(buffer, cx));
-                    let mut editor = Editor::new(
-                        EditorMode::Full {
-                            scale_ui_elements_with_buffer_font_size: true,
-                            show_active_line_background: false,
-                            sizing_behavior: SizingBehavior::SizeByContent,
-                        },
-                        multi_buffer,
-                        project.upgrade(),
-                        window,
-                        cx,
-                    );
-                    editor.set_searchable(false);
-                    editor.disable_scrollbars_and_minimap(window, cx);
-                    editor.set_show_edit_predictions(Some(false), window, cx);
-                    editor.set_show_gutter(false, cx);
-                    Self::set_editor_text(&mut editor, arguments, window, cx);
-                    editor
-                })?;
-
-                this.update_in(cx, |this, window, cx| {
-                    if this.editor.focus_handle(cx).is_focused(window) {
-                        editor.focus_handle(cx).focus(window);
-                    }
-                    this.editor = editor;
-                    this.backup_temp_dir = backup_temp_dir;
-                    this.is_loading = false;
-                })?;
-
-                anyhow::Ok(())
-            }
-            .await;
-            if result.is_err() {
-                let json_language = load_json_language(workspace.clone(), cx).await;
-                this.update(cx, |this, cx| {
-                    this.editor.update(cx, |editor, cx| {
-                        if let Some(buffer) = editor.buffer().read(cx).as_singleton() {
-                            buffer.update(cx, |buffer, cx| {
-                                buffer.set_language(Some(json_language.clone()), cx)
-                            });
-                        }
-                    })
-                    // .context("Failed to load JSON language for editing keybinding action arguments input")
-                })
-                .ok();
-                this.update(cx, |this, _cx| {
-                    this.is_loading = false;
-                })
-                .ok();
-            }
-            result
-        })
-        .detach_and_log_err(cx);
-        Self {
-            editor,
-            focus_handle,
-            is_loading: true,
-            backup_temp_dir: None,
-        }
-    }
-
-    fn set_editor_text(
-        editor: &mut Editor,
-        arguments: Option<SharedString>,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) {
-        if let Some(arguments) = arguments {
-            editor.set_text(arguments, window, cx);
-        } else {
-            // TODO: default value from schema?
-            editor.set_placeholder_text("Action Arguments", window, cx);
-        }
-    }
-
-    async fn create_temp_buffer(
-        temp_dir: Option<std::path::PathBuf>,
-        file_name: String,
-        project: WeakEntity<Project>,
-        fs: Arc<dyn Fs>,
-        cx: &mut AsyncApp,
-    ) -> anyhow::Result<(Entity<language::Buffer>, Option<tempfile::TempDir>)> {
-        let (temp_file_path, temp_dir) = {
-            let file_name = file_name.clone();
-            async move {
-                let temp_dir_backup = match temp_dir.as_ref() {
-                    Some(_) => None,
-                    None => {
-                        let temp_dir = paths::temp_dir();
-                        let sub_temp_dir = tempfile::Builder::new()
-                            .tempdir_in(temp_dir)
-                            .context("Failed to create temporary directory")?;
-                        Some(sub_temp_dir)
-                    }
-                };
-                let dir_path = temp_dir.as_deref().unwrap_or_else(|| {
-                    temp_dir_backup
-                        .as_ref()
-                        .expect("created backup tempdir")
-                        .path()
-                });
-                let path = dir_path.join(file_name);
-                fs.create_file(
-                    &path,
-                    fs::CreateOptions {
-                        ignore_if_exists: true,
-                        overwrite: true,
-                    },
-                )
-                .await
-                .context("Failed to create temporary file")?;
-                anyhow::Ok((path, temp_dir_backup))
-            }
-        }
-        .await
-        .context("Failed to create backing file")?;
-
-        project
-            .update(cx, |project, cx| {
-                project.open_local_buffer(temp_file_path, cx)
-            })?
-            .await
-            .context("Failed to create buffer")
-            .map(|buffer| (buffer, temp_dir))
-    }
-}
-
-impl Render for ActionArgumentsEditor {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let background_color;
-        let border_color;
-        let text_style = {
-            let colors = cx.theme().colors();
-            let settings = theme::ThemeSettings::get_global(cx);
-            background_color = colors.editor_background;
-            border_color = if self.is_loading {
-                colors.border_disabled
-            } else {
-                colors.border_variant
-            };
-            TextStyleRefinement {
-                font_size: Some(rems(0.875).into()),
-                font_weight: Some(settings.buffer_font.weight),
-                line_height: Some(relative(1.2)),
-                font_style: Some(gpui::FontStyle::Normal),
-                color: self.is_loading.then_some(colors.text_disabled),
-                ..Default::default()
-            }
-        };
-
-        self.editor
-            .update(cx, |editor, _| editor.set_text_style_refinement(text_style));
-
-        v_flex().w_full().child(
-            h_flex()
-                .min_h_8()
-                .min_w_48()
-                .px_2()
-                .py_1p5()
-                .flex_grow()
-                .rounded_lg()
-                .bg(background_color)
-                .border_1()
-                .border_color(border_color)
-                .track_focus(&self.focus_handle)
-                .child(self.editor.clone()),
-        )
-    }
-}
-
-struct KeyContextCompletionProvider {
-    contexts: Vec<SharedString>,
-}
-
-impl CompletionProvider for KeyContextCompletionProvider {
-    fn completions(
-        &self,
-        _excerpt_id: editor::ExcerptId,
-        buffer: &Entity<language::Buffer>,
-        buffer_position: language::Anchor,
-        _trigger: editor::CompletionContext,
-        _window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) -> gpui::Task<anyhow::Result<Vec<project::CompletionResponse>>> {
-        let buffer = buffer.read(cx);
-        let mut count_back = 0;
-        for char in buffer.reversed_chars_at(buffer_position) {
-            if char.is_ascii_alphanumeric() || char == '_' {
-                count_back += 1;
-            } else {
-                break;
-            }
-        }
-        let start_anchor =
-            buffer.anchor_before(buffer_position.to_offset(buffer).saturating_sub(count_back));
-        let replace_range = start_anchor..buffer_position;
-        gpui::Task::ready(Ok(vec![project::CompletionResponse {
-            completions: self
-                .contexts
-                .iter()
-                .map(|context| project::Completion {
-                    replace_range: replace_range.clone(),
-                    label: language::CodeLabel::plain(context.to_string(), None),
-                    new_text: context.to_string(),
-                    documentation: None,
-                    source: project::CompletionSource::Custom,
-                    icon_path: None,
-                    match_start: None,
-                    snippet_deduplication_key: None,
-                    insert_text_mode: None,
-                    confirm: None,
-                })
-                .collect(),
-            display_options: CompletionDisplayOptions::default(),
-            is_incomplete: false,
-        }]))
-    }
-
-    fn is_completion_trigger(
-        &self,
-        _buffer: &Entity<language::Buffer>,
-        _position: language::Anchor,
-        text: &str,
-        _trigger_in_words: bool,
-        _cx: &mut Context<Editor>,
-    ) -> bool {
-        text.chars()
-            .last()
-            .is_some_and(|last_char| last_char.is_ascii_alphanumeric() || last_char == '_')
-    }
-}
-
-async fn load_json_language(workspace: WeakEntity<Workspace>, cx: &mut AsyncApp) -> Arc<Language> {
-    let json_language_task = workspace
-        .read_with(cx, |workspace, cx| {
-            workspace
-                .project()
-                .read(cx)
-                .languages()
-                .language_for_name("JSON")
-        })
-        .context("Failed to load JSON language")
-        .log_err();
-    let json_language = match json_language_task {
-        Some(task) => task.await.context("Failed to load JSON language").log_err(),
-        None => None,
-    };
-    json_language.unwrap_or_else(|| {
-        Arc::new(Language::new(
-            LanguageConfig {
-                name: "JSON".into(),
-                ..Default::default()
-            },
-            Some(tree_sitter_json::LANGUAGE.into()),
-        ))
-    })
-}
-
-async fn load_keybind_context_language(
-    workspace: WeakEntity<Workspace>,
-    cx: &mut AsyncApp,
-) -> Arc<Language> {
-    let language_task = workspace
-        .read_with(cx, |workspace, cx| {
-            workspace
-                .project()
-                .read(cx)
-                .languages()
-                .language_for_name("Zed Keybind Context")
-        })
-        .context("Failed to load Zed Keybind Context language")
-        .log_err();
-    let language = match language_task {
-        Some(task) => task
-            .await
-            .context("Failed to load Zed Keybind Context language")
-            .log_err(),
-        None => None,
-    };
-    language.unwrap_or_else(|| {
-        Arc::new(Language::new(
-            LanguageConfig {
-                name: "Zed Keybind Context".into(),
-                ..Default::default()
-            },
-            Some(tree_sitter_rust::LANGUAGE.into()),
-        ))
-    })
-}
-
-async fn save_keybinding_update(
-    create: bool,
-    existing: ProcessedBinding,
-    action_mapping: &ActionMapping,
-    new_args: Option<&str>,
-    fs: &Arc<dyn Fs>,
-    keyboard_mapper: &dyn PlatformKeyboardMapper,
-) -> anyhow::Result<()> {
-    let keymap_contents = settings::KeymapFile::load_keymap_file(fs)
-        .await
-        .context("Failed to load keymap file")?;
-
-    let tab_size = infer_json_indent_size(&keymap_contents);
-
-    let existing_keystrokes = existing.keystrokes().unwrap_or_default();
-    let existing_context = existing.context().and_then(KeybindContextString::local_str);
-    let existing_args = existing
-        .action()
-        .arguments
-        .as_ref()
-        .map(|args| args.text.as_ref());
-
-    let target = settings::KeybindUpdateTarget {
-        context: existing_context,
-        keystrokes: existing_keystrokes,
-        action_name: existing.action().name,
-        action_arguments: existing_args,
-    };
-
-    let source = settings::KeybindUpdateTarget {
-        context: action_mapping.context.as_ref().map(|a| &***a),
-        keystrokes: &action_mapping.keystrokes,
-        action_name: existing.action().name,
-        action_arguments: new_args,
-    };
-
-    let operation = if !create {
-        settings::KeybindUpdateOperation::Replace {
-            target,
-            target_keybind_source: existing.keybind_source().unwrap_or(KeybindSource::User),
-            source,
-        }
-    } else {
-        settings::KeybindUpdateOperation::Add {
-            source,
-            from: Some(target),
-        }
-    };
-
-    let (new_keybinding, removed_keybinding, source) = operation.generate_telemetry();
-
-    let updated_keymap_contents = settings::KeymapFile::update_keybinding(
-        operation,
-        keymap_contents,
-        tab_size,
-        keyboard_mapper,
-    )
-    .map_err(|err| anyhow::anyhow!("Could not save updated keybinding: {}", err))?;
-    fs.write(
-        paths::keymap_file().as_path(),
-        updated_keymap_contents.as_bytes(),
-    )
-    .await
-    .context("Failed to write keymap file")?;
-
-    telemetry::event!(
-        "Keybinding Updated",
-        new_keybinding = new_keybinding,
-        removed_keybinding = removed_keybinding,
-        source = source
-    );
-    Ok(())
-}
-
-async fn remove_keybinding(
-    existing: ProcessedBinding,
-    fs: &Arc<dyn Fs>,
-    keyboard_mapper: &dyn PlatformKeyboardMapper,
-) -> anyhow::Result<()> {
-    let Some(keystrokes) = existing.keystrokes() else {
-        anyhow::bail!("Cannot remove a keybinding that does not exist");
-    };
-    let keymap_contents = settings::KeymapFile::load_keymap_file(fs)
-        .await
-        .context("Failed to load keymap file")?;
-    let tab_size = infer_json_indent_size(&keymap_contents);
-
-    let operation = settings::KeybindUpdateOperation::Remove {
-        target: settings::KeybindUpdateTarget {
-            context: existing.context().and_then(KeybindContextString::local_str),
-            keystrokes,
-            action_name: existing.action().name,
-            action_arguments: existing
-                .action()
-                .arguments
-                .as_ref()
-                .map(|arguments| arguments.text.as_ref()),
-        },
-        target_keybind_source: existing.keybind_source().unwrap_or(KeybindSource::User),
-    };
-
-    let (new_keybinding, removed_keybinding, source) = operation.generate_telemetry();
-    let updated_keymap_contents = settings::KeymapFile::update_keybinding(
-        operation,
-        keymap_contents,
-        tab_size,
-        keyboard_mapper,
-    )
-    .context("Failed to update keybinding")?;
-    fs.write(
-        paths::keymap_file().as_path(),
-        updated_keymap_contents.as_bytes(),
-    )
-    .await
-    .context("Failed to write keymap file")?;
-
-    telemetry::event!(
-        "Keybinding Removed",
-        new_keybinding = new_keybinding,
-        removed_keybinding = removed_keybinding,
-        source = source
-    );
-    Ok(())
-}
-
-fn collect_contexts_from_assets() -> Vec<SharedString> {
-    let mut keymap_assets = vec![
-        util::asset_str::<SettingsAssets>(settings::DEFAULT_KEYMAP_PATH),
-        util::asset_str::<SettingsAssets>(settings::VIM_KEYMAP_PATH),
-    ];
-    keymap_assets.extend(
-        BaseKeymap::OPTIONS
-            .iter()
-            .filter_map(|(_, base_keymap)| base_keymap.asset_path())
-            .map(util::asset_str::<SettingsAssets>),
-    );
-
-    let mut contexts = HashSet::default();
-
-    for keymap_asset in keymap_assets {
-        let Ok(keymap) = KeymapFile::parse(&keymap_asset) else {
-            continue;
-        };
-
-        for section in keymap.sections() {
-            let context_expr = &section.context;
-            let mut queue = Vec::new();
-            let Ok(root_context) = gpui::KeyBindingContextPredicate::parse(context_expr) else {
-                continue;
-            };
-
-            queue.push(root_context);
-            while let Some(context) = queue.pop() {
-                match context {
-                    Identifier(ident) => {
-                        contexts.insert(ident);
-                    }
-                    Equal(ident_a, ident_b) => {
-                        contexts.insert(ident_a);
-                        contexts.insert(ident_b);
-                    }
-                    NotEqual(ident_a, ident_b) => {
-                        contexts.insert(ident_a);
-                        contexts.insert(ident_b);
-                    }
-                    Descendant(ctx_a, ctx_b) => {
-                        queue.push(*ctx_a);
-                        queue.push(*ctx_b);
-                    }
-                    Not(ctx) => {
-                        queue.push(*ctx);
-                    }
-                    And(ctx_a, ctx_b) => {
-                        queue.push(*ctx_a);
-                        queue.push(*ctx_b);
-                    }
-                    Or(ctx_a, ctx_b) => {
-                        queue.push(*ctx_a);
-                        queue.push(*ctx_b);
-                    }
-                }
-            }
-        }
-    }
-
-    let mut contexts = contexts.into_iter().collect::<Vec<_>>();
-    contexts.sort();
-
-    contexts
-}
-
-fn normalized_ctx_eq(
-    a: &gpui::KeyBindingContextPredicate,
-    b: &gpui::KeyBindingContextPredicate,
-) -> bool {
-    use gpui::KeyBindingContextPredicate::*;
-    return match (a, b) {
-        (Identifier(_), Identifier(_)) => a == b,
-        (Equal(a_left, a_right), Equal(b_left, b_right)) => {
-            (a_left == b_left && a_right == b_right) || (a_left == b_right && a_right == b_left)
-        }
-        (NotEqual(a_left, a_right), NotEqual(b_left, b_right)) => {
-            (a_left == b_left && a_right == b_right) || (a_left == b_right && a_right == b_left)
-        }
-        (Descendant(a_parent, a_child), Descendant(b_parent, b_child)) => {
-            normalized_ctx_eq(a_parent, b_parent) && normalized_ctx_eq(a_child, b_child)
-        }
-        (Not(a_expr), Not(b_expr)) => normalized_ctx_eq(a_expr, b_expr),
-        // Handle double negation: !(!a) == a
-        (Not(a_expr), b) if matches!(a_expr.as_ref(), Not(_)) => {
-            let Not(a_inner) = a_expr.as_ref() else {
-                unreachable!();
-            };
-            normalized_ctx_eq(b, a_inner)
-        }
-        (a, Not(b_expr)) if matches!(b_expr.as_ref(), Not(_)) => {
-            let Not(b_inner) = b_expr.as_ref() else {
-                unreachable!();
-            };
-            normalized_ctx_eq(a, b_inner)
-        }
-        (And(a_left, a_right), And(b_left, b_right))
-            if matches!(a_left.as_ref(), And(_, _))
-                || matches!(a_right.as_ref(), And(_, _))
-                || matches!(b_left.as_ref(), And(_, _))
-                || matches!(b_right.as_ref(), And(_, _)) =>
-        {
-            let mut a_operands = Vec::new();
-            flatten_and(a, &mut a_operands);
-            let mut b_operands = Vec::new();
-            flatten_and(b, &mut b_operands);
-            compare_operand_sets(&a_operands, &b_operands)
-        }
-        (And(a_left, a_right), And(b_left, b_right)) => {
-            (normalized_ctx_eq(a_left, b_left) && normalized_ctx_eq(a_right, b_right))
-                || (normalized_ctx_eq(a_left, b_right) && normalized_ctx_eq(a_right, b_left))
-        }
-        (Or(a_left, a_right), Or(b_left, b_right))
-            if matches!(a_left.as_ref(), Or(_, _))
-                || matches!(a_right.as_ref(), Or(_, _))
-                || matches!(b_left.as_ref(), Or(_, _))
-                || matches!(b_right.as_ref(), Or(_, _)) =>
-        {
-            let mut a_operands = Vec::new();
-            flatten_or(a, &mut a_operands);
-            let mut b_operands = Vec::new();
-            flatten_or(b, &mut b_operands);
-            compare_operand_sets(&a_operands, &b_operands)
-        }
-        (Or(a_left, a_right), Or(b_left, b_right)) => {
-            (normalized_ctx_eq(a_left, b_left) && normalized_ctx_eq(a_right, b_right))
-                || (normalized_ctx_eq(a_left, b_right) && normalized_ctx_eq(a_right, b_left))
-        }
-        _ => false,
-    };
-
-    fn flatten_and<'a>(
-        pred: &'a gpui::KeyBindingContextPredicate,
-        operands: &mut Vec<&'a gpui::KeyBindingContextPredicate>,
-    ) {
-        use gpui::KeyBindingContextPredicate::*;
-        match pred {
-            And(left, right) => {
-                flatten_and(left, operands);
-                flatten_and(right, operands);
-            }
-            _ => operands.push(pred),
-        }
-    }
-
-    fn flatten_or<'a>(
-        pred: &'a gpui::KeyBindingContextPredicate,
-        operands: &mut Vec<&'a gpui::KeyBindingContextPredicate>,
-    ) {
-        use gpui::KeyBindingContextPredicate::*;
-        match pred {
-            Or(left, right) => {
-                flatten_or(left, operands);
-                flatten_or(right, operands);
-            }
-            _ => operands.push(pred),
-        }
-    }
-
-    fn compare_operand_sets(
-        a: &[&gpui::KeyBindingContextPredicate],
-        b: &[&gpui::KeyBindingContextPredicate],
-    ) -> bool {
-        if a.len() != b.len() {
-            return false;
-        }
-
-        // For each operand in a, find a matching operand in b
-        let mut b_matched = vec![false; b.len()];
-        for a_operand in a {
-            let mut found = false;
-            for (b_idx, b_operand) in b.iter().enumerate() {
-                if !b_matched[b_idx] && normalized_ctx_eq(a_operand, b_operand) {
-                    b_matched[b_idx] = true;
-                    found = true;
-                    break;
-                }
-            }
-            if !found {
-                return false;
-            }
-        }
-
-        true
-    }
-}
-
-impl SerializableItem for KeymapEditor {
-    fn serialized_item_kind() -> &'static str {
-        "KeymapEditor"
-    }
-
-    fn cleanup(
-        workspace_id: workspace::WorkspaceId,
-        alive_items: Vec<workspace::ItemId>,
-        _window: &mut Window,
-        cx: &mut App,
-    ) -> gpui::Task<gpui::Result<()>> {
-        workspace::delete_unloaded_items(
-            alive_items,
-            workspace_id,
-            "keybinding_editors",
-            &KEYBINDING_EDITORS,
-            cx,
-        )
-    }
-
-    fn deserialize(
-        _project: Entity<project::Project>,
-        workspace: WeakEntity<Workspace>,
-        workspace_id: workspace::WorkspaceId,
-        item_id: workspace::ItemId,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> gpui::Task<gpui::Result<Entity<Self>>> {
-        window.spawn(cx, async move |cx| {
-            if KEYBINDING_EDITORS
-                .get_keybinding_editor(item_id, workspace_id)?
-                .is_some()
-            {
-                cx.update(|window, cx| cx.new(|cx| KeymapEditor::new(workspace, window, cx)))
-            } else {
-                Err(anyhow!("No keybinding editor to deserialize"))
-            }
-        })
-    }
-
-    fn serialize(
-        &mut self,
-        workspace: &mut Workspace,
-        item_id: workspace::ItemId,
-        _closing: bool,
-        _window: &mut Window,
-        cx: &mut ui::Context<Self>,
-    ) -> Option<gpui::Task<gpui::Result<()>>> {
-        let workspace_id = workspace.database_id()?;
-        Some(cx.background_spawn(async move {
-            KEYBINDING_EDITORS
-                .save_keybinding_editor(item_id, workspace_id)
-                .await
-        }))
-    }
-
-    fn should_serialize(&self, _event: &Self::Event) -> bool {
-        false
-    }
-}
-
-mod persistence {
-    use db::{query, sqlez::domain::Domain, sqlez_macros::sql};
-    use workspace::WorkspaceDb;
-
-    pub struct KeybindingEditorDb(db::sqlez::thread_safe_connection::ThreadSafeConnection);
-
-    impl Domain for KeybindingEditorDb {
-        const NAME: &str = stringify!(KeybindingEditorDb);
-
-        const MIGRATIONS: &[&str] = &[sql!(
-                CREATE TABLE keybinding_editors (
-                    workspace_id INTEGER,
-                    item_id INTEGER UNIQUE,
-
-                    PRIMARY KEY(workspace_id, item_id),
-                    FOREIGN KEY(workspace_id) REFERENCES workspaces(workspace_id)
-                    ON DELETE CASCADE
-                ) STRICT;
-        )];
-    }
-
-    db::static_connection!(KEYBINDING_EDITORS, KeybindingEditorDb, [WorkspaceDb]);
-
-    impl KeybindingEditorDb {
-        query! {
-            pub async fn save_keybinding_editor(
-                item_id: workspace::ItemId,
-                workspace_id: workspace::WorkspaceId
-            ) -> Result<()> {
-                INSERT OR REPLACE INTO keybinding_editors(item_id, workspace_id)
-                VALUES (?, ?)
-            }
-        }
-
-        query! {
-            pub fn get_keybinding_editor(
-                item_id: workspace::ItemId,
-                workspace_id: workspace::WorkspaceId
-            ) -> Result<Option<workspace::ItemId>> {
-                SELECT item_id
-                FROM keybinding_editors
-                WHERE item_id = ? AND workspace_id = ?
-            }
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn normalized_ctx_cmp() {
-        #[track_caller]
-        fn cmp(a: &str, b: &str) -> bool {
-            let a = gpui::KeyBindingContextPredicate::parse(a)
-                .expect("Failed to parse keybinding context a");
-            let b = gpui::KeyBindingContextPredicate::parse(b)
-                .expect("Failed to parse keybinding context b");
-            normalized_ctx_eq(&a, &b)
-        }
-
-        // Basic equality - identical expressions
-        assert!(cmp("a && b", "a && b"));
-        assert!(cmp("a || b", "a || b"));
-        assert!(cmp("a == b", "a == b"));
-        assert!(cmp("a != b", "a != b"));
-        assert!(cmp("a > b", "a > b"));
-        assert!(cmp("!a", "!a"));
-
-        // AND operator - associative/commutative
-        assert!(cmp("a && b", "b && a"));
-        assert!(cmp("a && b && c", "c && b && a"));
-        assert!(cmp("a && b && c", "b && a && c"));
-        assert!(cmp("a && b && c && d", "d && c && b && a"));
-
-        // OR operator - associative/commutative
-        assert!(cmp("a || b", "b || a"));
-        assert!(cmp("a || b || c", "c || b || a"));
-        assert!(cmp("a || b || c", "b || a || c"));
-        assert!(cmp("a || b || c || d", "d || c || b || a"));
-
-        // Equality operator - associative/commutative
-        assert!(cmp("a == b", "b == a"));
-        assert!(cmp("x == y", "y == x"));
-
-        // Inequality operator - associative/commutative
-        assert!(cmp("a != b", "b != a"));
-        assert!(cmp("x != y", "y != x"));
-
-        // Complex nested expressions with associative operators
-        assert!(cmp("(a && b) || c", "c || (a && b)"));
-        assert!(cmp("(a && b) || c", "c || (b && a)"));
-        assert!(cmp("(a || b) && c", "c && (a || b)"));
-        assert!(cmp("(a || b) && c", "c && (b || a)"));
-        assert!(cmp("(a && b) || (c && d)", "(c && d) || (a && b)"));
-        assert!(cmp("(a && b) || (c && d)", "(d && c) || (b && a)"));
-
-        // Multiple levels of nesting
-        assert!(cmp("((a && b) || c) && d", "d && ((a && b) || c)"));
-        assert!(cmp("((a && b) || c) && d", "d && (c || (b && a))"));
-        assert!(cmp("a && (b || (c && d))", "(b || (c && d)) && a"));
-        assert!(cmp("a && (b || (c && d))", "(b || (d && c)) && a"));
-
-        // Negation with associative operators
-        assert!(cmp("!a && b", "b && !a"));
-        assert!(cmp("!a || b", "b || !a"));
-        assert!(cmp("!(a && b) || c", "c || !(a && b)"));
-        assert!(cmp("!(a && b) || c", "c || !(b && a)"));
-
-        // Descendant operator (>) - NOT associative/commutative
-        assert!(cmp("a > b", "a > b"));
-        assert!(!cmp("a > b", "b > a"));
-        assert!(!cmp("a > b > c", "c > b > a"));
-        assert!(!cmp("a > b > c", "a > c > b"));
-
-        // Mixed operators with descendant
-        assert!(cmp("(a > b) && c", "c && (a > b)"));
-        assert!(!cmp("(a > b) && c", "c && (b > a)"));
-        assert!(cmp("(a > b) || (c > d)", "(c > d) || (a > b)"));
-        assert!(!cmp("(a > b) || (c > d)", "(b > a) || (d > c)"));
-
-        // Negative cases - different operators
-        assert!(!cmp("a && b", "a || b"));
-        assert!(!cmp("a == b", "a != b"));
-        assert!(!cmp("a && b", "a > b"));
-        assert!(!cmp("a || b", "a > b"));
-        assert!(!cmp("a == b", "a && b"));
-        assert!(!cmp("a != b", "a || b"));
-
-        // Negative cases - different operands
-        assert!(!cmp("a && b", "a && c"));
-        assert!(!cmp("a && b", "c && d"));
-        assert!(!cmp("a || b", "a || c"));
-        assert!(!cmp("a || b", "c || d"));
-        assert!(!cmp("a == b", "a == c"));
-        assert!(!cmp("a != b", "a != c"));
-        assert!(!cmp("a > b", "a > c"));
-        assert!(!cmp("a > b", "c > b"));
-
-        // Negative cases - with negation
-        assert!(!cmp("!a", "a"));
-        assert!(!cmp("!a && b", "a && b"));
-        assert!(!cmp("!(a && b)", "a && b"));
-        assert!(!cmp("!a || b", "a || b"));
-        assert!(!cmp("!(a || b)", "a || b"));
-
-        // Negative cases - complex expressions
-        assert!(!cmp("(a && b) || c", "(a || b) && c"));
-        assert!(!cmp("a && (b || c)", "a || (b && c)"));
-        assert!(!cmp("(a && b) || (c && d)", "(a || b) && (c || d)"));
-        assert!(!cmp("a > b && c", "a && b > c"));
-
-        // Edge cases - multiple same operands
-        assert!(cmp("a && a", "a && a"));
-        assert!(cmp("a || a", "a || a"));
-        assert!(cmp("a && a && b", "b && a && a"));
-        assert!(cmp("a || a || b", "b || a || a"));
-
-        // Edge cases - deeply nested
-        assert!(cmp(
-            "((a && b) || (c && d)) && ((e || f) && g)",
-            "((e || f) && g) && ((c && d) || (a && b))"
-        ));
-        assert!(cmp(
-            "((a && b) || (c && d)) && ((e || f) && g)",
-            "(g && (f || e)) && ((d && c) || (b && a))"
-        ));
-
-        // Edge cases - repeated patterns
-        assert!(cmp("(a && b) || (a && b)", "(b && a) || (b && a)"));
-        assert!(cmp("(a || b) && (a || b)", "(b || a) && (b || a)"));
-
-        // Negative cases - subtle differences
-        assert!(!cmp("a && b && c", "a && b"));
-        assert!(!cmp("a || b || c", "a || b"));
-        assert!(!cmp("(a && b) || c", "a && (b || c)"));
-
-        // a > b > c is not the same as a > c, should not be equal
-        assert!(!cmp("a > b > c", "a > c"));
-
-        // Double negation with complex expressions
-        assert!(cmp("!(!(a && b))", "a && b"));
-        assert!(cmp("!(!(a || b))", "a || b"));
-        assert!(cmp("!(!(a > b))", "a > b"));
-        assert!(cmp("!(!a) && b", "a && b"));
-        assert!(cmp("!(!a) || b", "a || b"));
-        assert!(cmp("!(!(a && b)) || c", "(a && b) || c"));
-        assert!(cmp("!(!(a && b)) || c", "(b && a) || c"));
-        assert!(cmp("!(!a)", "a"));
-        assert!(cmp("a", "!(!a)"));
-        assert!(cmp("!(!(!a))", "!a"));
-        assert!(cmp("!(!(!(!a)))", "a"));
-    }
-}
diff --git a/crates/keymap_editor/src/ui_components/keystroke_input.rs b/crates/keymap_editor/src/ui_components/keystroke_input.rs
deleted file mode 100644
index 6936de784f..0000000000
--- a/crates/keymap_editor/src/ui_components/keystroke_input.rs
+++ /dev/null
@@ -1,1524 +0,0 @@
-use gpui::{
-    Animation, AnimationExt, Context, EventEmitter, FocusHandle, Focusable, FontWeight, KeyContext,
-    KeybindingKeystroke, Keystroke, Modifiers, ModifiersChangedEvent, Subscription, Task, actions,
-};
-use ui::{
-    ActiveTheme as _, Color, IconButton, IconButtonShape, IconName, IconSize, Label, LabelSize,
-    ParentElement as _, Render, Styled as _, Tooltip, Window, prelude::*,
-};
-
-actions!(
-    keystroke_input,
-    [
-        /// Starts recording keystrokes
-        StartRecording,
-        /// Stops recording keystrokes
-        StopRecording,
-        /// Clears the recorded keystrokes
-        ClearKeystrokes,
-    ]
-);
-
-const KEY_CONTEXT_VALUE: &str = "KeystrokeInput";
-
-const CLOSE_KEYSTROKE_CAPTURE_END_TIMEOUT: std::time::Duration =
-    std::time::Duration::from_millis(300);
-
-enum CloseKeystrokeResult {
-    Partial,
-    Close,
-    None,
-}
-
-impl PartialEq for CloseKeystrokeResult {
-    fn eq(&self, other: &Self) -> bool {
-        matches!(
-            (self, other),
-            (CloseKeystrokeResult::Partial, CloseKeystrokeResult::Partial)
-                | (CloseKeystrokeResult::Close, CloseKeystrokeResult::Close)
-                | (CloseKeystrokeResult::None, CloseKeystrokeResult::None)
-        )
-    }
-}
-
-pub struct KeystrokeInput {
-    keystrokes: Vec<KeybindingKeystroke>,
-    placeholder_keystrokes: Option<Vec<KeybindingKeystroke>>,
-    outer_focus_handle: FocusHandle,
-    inner_focus_handle: FocusHandle,
-    intercept_subscription: Option<Subscription>,
-    _focus_subscriptions: [Subscription; 2],
-    search: bool,
-    /// The sequence of close keystrokes being typed
-    close_keystrokes: Option<Vec<Keystroke>>,
-    close_keystrokes_start: Option<usize>,
-    previous_modifiers: Modifiers,
-    /// In order to support inputting keystrokes that end with a prefix of the
-    /// close keybind keystrokes, we clear the close keystroke capture info
-    /// on a timeout after a close keystroke is pressed
-    ///
-    /// e.g. if close binding is `esc esc esc` and user wants to search for
-    /// `ctrl-g esc`, after entering the `ctrl-g esc`, hitting `esc` twice would
-    /// stop recording because of the sequence of three escapes making it
-    /// impossible to search for anything ending in `esc`
-    clear_close_keystrokes_timer: Option<Task<()>>,
-    #[cfg(test)]
-    recording: bool,
-    pub actions_slot: Option<AnyElement>,
-}
-
-impl KeystrokeInput {
-    const KEYSTROKE_COUNT_MAX: usize = 3;
-
-    pub fn new(
-        placeholder_keystrokes: Option<Vec<KeybindingKeystroke>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let outer_focus_handle = cx.focus_handle();
-        let inner_focus_handle = cx.focus_handle();
-        let _focus_subscriptions = [
-            cx.on_focus_in(&inner_focus_handle, window, Self::on_inner_focus_in),
-            cx.on_focus_out(&inner_focus_handle, window, Self::on_inner_focus_out),
-        ];
-        Self {
-            keystrokes: Vec::new(),
-            placeholder_keystrokes,
-            inner_focus_handle,
-            outer_focus_handle,
-            intercept_subscription: None,
-            _focus_subscriptions,
-            search: false,
-            close_keystrokes: None,
-            close_keystrokes_start: None,
-            previous_modifiers: Modifiers::default(),
-            clear_close_keystrokes_timer: None,
-            #[cfg(test)]
-            recording: false,
-            actions_slot: None,
-        }
-    }
-
-    pub fn set_keystrokes(&mut self, keystrokes: Vec<KeybindingKeystroke>, cx: &mut Context<Self>) {
-        self.keystrokes = keystrokes;
-        self.keystrokes_changed(cx);
-    }
-
-    pub fn set_search(&mut self, search: bool) {
-        self.search = search;
-    }
-
-    pub fn keystrokes(&self) -> &[KeybindingKeystroke] {
-        if let Some(placeholders) = self.placeholder_keystrokes.as_ref()
-            && self.keystrokes.is_empty()
-        {
-            return placeholders;
-        }
-        if !self.search
-            && self
-                .keystrokes
-                .last()
-                .is_some_and(|last| last.key().is_empty())
-        {
-            return &self.keystrokes[..self.keystrokes.len() - 1];
-        }
-        &self.keystrokes
-    }
-
-    fn dummy(modifiers: Modifiers) -> KeybindingKeystroke {
-        KeybindingKeystroke::from_keystroke(Keystroke {
-            modifiers,
-            key: "".to_string(),
-            key_char: None,
-        })
-    }
-
-    fn keystrokes_changed(&self, cx: &mut Context<Self>) {
-        cx.emit(());
-        cx.notify();
-    }
-
-    fn key_context() -> KeyContext {
-        let mut key_context = KeyContext::default();
-        key_context.add(KEY_CONTEXT_VALUE);
-        key_context
-    }
-
-    fn determine_stop_recording_binding(window: &mut Window) -> Option<gpui::KeyBinding> {
-        if cfg!(test) {
-            Some(gpui::KeyBinding::new(
-                "escape escape escape",
-                StopRecording,
-                Some(KEY_CONTEXT_VALUE),
-            ))
-        } else {
-            window.highest_precedence_binding_for_action_in_context(
-                &StopRecording,
-                Self::key_context(),
-            )
-        }
-    }
-
-    fn upsert_close_keystrokes_start(&mut self, start: usize, cx: &mut Context<Self>) {
-        if self.close_keystrokes_start.is_some() {
-            return;
-        }
-        self.close_keystrokes_start = Some(start);
-        self.update_clear_close_keystrokes_timer(cx);
-    }
-
-    fn update_clear_close_keystrokes_timer(&mut self, cx: &mut Context<Self>) {
-        self.clear_close_keystrokes_timer = Some(cx.spawn(async |this, cx| {
-            cx.background_executor()
-                .timer(CLOSE_KEYSTROKE_CAPTURE_END_TIMEOUT)
-                .await;
-            this.update(cx, |this, _cx| {
-                this.end_close_keystrokes_capture();
-            })
-            .ok();
-        }));
-    }
-
-    /// Interrupt the capture of close keystrokes, but do not clear the close keystrokes
-    /// from the input
-    fn end_close_keystrokes_capture(&mut self) -> Option<usize> {
-        self.close_keystrokes.take();
-        self.clear_close_keystrokes_timer.take();
-        self.close_keystrokes_start.take()
-    }
-
-    fn handle_possible_close_keystroke(
-        &mut self,
-        keystroke: &Keystroke,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> CloseKeystrokeResult {
-        let Some(keybind_for_close_action) = Self::determine_stop_recording_binding(window) else {
-            log::trace!("No keybinding to stop recording keystrokes in keystroke input");
-            self.end_close_keystrokes_capture();
-            return CloseKeystrokeResult::None;
-        };
-        let action_keystrokes = keybind_for_close_action.keystrokes();
-
-        if let Some(mut close_keystrokes) = self.close_keystrokes.take() {
-            let mut index = 0;
-
-            while index < action_keystrokes.len() && index < close_keystrokes.len() {
-                if !close_keystrokes[index].should_match(&action_keystrokes[index]) {
-                    break;
-                }
-                index += 1;
-            }
-            if index == close_keystrokes.len() {
-                if index >= action_keystrokes.len() {
-                    self.end_close_keystrokes_capture();
-                    return CloseKeystrokeResult::None;
-                }
-                if keystroke.should_match(&action_keystrokes[index]) {
-                    close_keystrokes.push(keystroke.clone());
-                    if close_keystrokes.len() == action_keystrokes.len() {
-                        return CloseKeystrokeResult::Close;
-                    } else {
-                        self.close_keystrokes = Some(close_keystrokes);
-                        self.update_clear_close_keystrokes_timer(cx);
-                        return CloseKeystrokeResult::Partial;
-                    }
-                } else {
-                    self.end_close_keystrokes_capture();
-                    return CloseKeystrokeResult::None;
-                }
-            }
-        } else if let Some(first_action_keystroke) = action_keystrokes.first()
-            && keystroke.should_match(first_action_keystroke)
-        {
-            self.close_keystrokes = Some(vec![keystroke.clone()]);
-            return CloseKeystrokeResult::Partial;
-        }
-        self.end_close_keystrokes_capture();
-        CloseKeystrokeResult::None
-    }
-
-    fn on_modifiers_changed(
-        &mut self,
-        event: &ModifiersChangedEvent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        cx.stop_propagation();
-        let keystrokes_len = self.keystrokes.len();
-
-        if self.previous_modifiers.modified()
-            && event.modifiers.is_subset_of(&self.previous_modifiers)
-        {
-            self.previous_modifiers &= event.modifiers;
-            return;
-        }
-        self.keystrokes_changed(cx);
-
-        if let Some(last) = self.keystrokes.last_mut()
-            && last.key().is_empty()
-            && keystrokes_len <= Self::KEYSTROKE_COUNT_MAX
-        {
-            if !self.search && !event.modifiers.modified() {
-                self.keystrokes.pop();
-                return;
-            }
-            if self.search {
-                if self.previous_modifiers.modified() {
-                    let modifiers = *last.modifiers() | event.modifiers;
-                    last.set_modifiers(modifiers);
-                } else {
-                    self.keystrokes.push(Self::dummy(event.modifiers));
-                }
-                self.previous_modifiers |= event.modifiers;
-            } else {
-                last.set_modifiers(event.modifiers);
-                return;
-            }
-        } else if keystrokes_len < Self::KEYSTROKE_COUNT_MAX {
-            self.keystrokes.push(Self::dummy(event.modifiers));
-            if self.search {
-                self.previous_modifiers |= event.modifiers;
-            }
-        }
-        if keystrokes_len >= Self::KEYSTROKE_COUNT_MAX {
-            self.clear_keystrokes(&ClearKeystrokes, window, cx);
-        }
-    }
-
-    fn handle_keystroke(
-        &mut self,
-        keystroke: &Keystroke,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        cx.stop_propagation();
-
-        let close_keystroke_result = self.handle_possible_close_keystroke(keystroke, window, cx);
-        if close_keystroke_result == CloseKeystrokeResult::Close {
-            self.stop_recording(&StopRecording, window, cx);
-            return;
-        }
-
-        let keystroke = KeybindingKeystroke::new_with_mapper(
-            keystroke.clone(),
-            false,
-            cx.keyboard_mapper().as_ref(),
-        );
-        if let Some(last) = self.keystrokes.last()
-            && last.key().is_empty()
-            && (!self.search || self.previous_modifiers.modified())
-        {
-            self.keystrokes.pop();
-        }
-
-        if close_keystroke_result == CloseKeystrokeResult::Partial {
-            self.upsert_close_keystrokes_start(self.keystrokes.len(), cx);
-            if self.keystrokes.len() >= Self::KEYSTROKE_COUNT_MAX {
-                return;
-            }
-        }
-
-        if self.keystrokes.len() >= Self::KEYSTROKE_COUNT_MAX {
-            self.clear_keystrokes(&ClearKeystrokes, window, cx);
-            return;
-        }
-
-        self.keystrokes.push(keystroke);
-        self.keystrokes_changed(cx);
-
-        // The reason we use the real modifiers from the window instead of the keystroke's modifiers
-        // is that for keystrokes like `ctrl-$` the modifiers reported by keystroke is `ctrl` which
-        // is wrong, it should be `ctrl-shift`. The window's modifiers are always correct.
-        let real_modifiers = window.modifiers();
-        if self.search {
-            self.previous_modifiers = real_modifiers;
-            return;
-        }
-        if self.keystrokes.len() < Self::KEYSTROKE_COUNT_MAX && real_modifiers.modified() {
-            self.keystrokes.push(Self::dummy(real_modifiers));
-        }
-    }
-
-    fn on_inner_focus_in(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
-        if self.intercept_subscription.is_none() {
-            let listener = cx.listener(|this, event: &gpui::KeystrokeEvent, window, cx| {
-                this.handle_keystroke(&event.keystroke, window, cx);
-            });
-            self.intercept_subscription = Some(cx.intercept_keystrokes(listener))
-        }
-    }
-
-    fn on_inner_focus_out(
-        &mut self,
-        _event: gpui::FocusOutEvent,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.intercept_subscription.take();
-        cx.notify();
-    }
-
-    fn render_keystrokes(&self, is_recording: bool) -> impl Iterator<Item = Div> {
-        let keystrokes = if let Some(placeholders) = self.placeholder_keystrokes.as_ref()
-            && self.keystrokes.is_empty()
-        {
-            if is_recording {
-                &[]
-            } else {
-                placeholders.as_slice()
-            }
-        } else {
-            &self.keystrokes
-        };
-        keystrokes.iter().map(move |keystroke| {
-            h_flex().children(ui::render_keybinding_keystroke(
-                keystroke,
-                Some(Color::Default),
-                Some(rems(0.875).into()),
-                ui::PlatformStyle::platform(),
-                false,
-            ))
-        })
-    }
-
-    pub fn start_recording(
-        &mut self,
-        _: &StartRecording,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        window.focus(&self.inner_focus_handle);
-        self.clear_keystrokes(&ClearKeystrokes, window, cx);
-        self.previous_modifiers = window.modifiers();
-        #[cfg(test)]
-        {
-            self.recording = true;
-        }
-        cx.stop_propagation();
-    }
-
-    pub fn stop_recording(
-        &mut self,
-        _: &StopRecording,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if !self.is_recording(window) {
-            return;
-        }
-        window.focus(&self.outer_focus_handle);
-        if let Some(close_keystrokes_start) = self.close_keystrokes_start.take()
-            && close_keystrokes_start < self.keystrokes.len()
-        {
-            self.keystrokes.drain(close_keystrokes_start..);
-            self.keystrokes_changed(cx);
-        }
-        self.end_close_keystrokes_capture();
-        #[cfg(test)]
-        {
-            self.recording = false;
-        }
-        cx.notify();
-    }
-
-    pub fn clear_keystrokes(
-        &mut self,
-        _: &ClearKeystrokes,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.keystrokes.clear();
-        self.keystrokes_changed(cx);
-        self.end_close_keystrokes_capture();
-    }
-
-    fn is_recording(&self, window: &Window) -> bool {
-        #[cfg(test)]
-        {
-            if true {
-                // in tests, we just need a simple bool that is toggled on start and stop recording
-                return self.recording;
-            }
-        }
-        // however, in the real world, checking if the inner focus handle is focused
-        // is a much more reliable check, as the intercept keystroke handlers are installed
-        // on focus of the inner focus handle, thereby ensuring our recording state does
-        // not get de-synced
-        self.inner_focus_handle.is_focused(window)
-    }
-
-    pub fn actions_slot(mut self, action: impl IntoElement) -> Self {
-        self.actions_slot = Some(action.into_any_element());
-        self
-    }
-}
-
-impl EventEmitter<()> for KeystrokeInput {}
-
-impl Focusable for KeystrokeInput {
-    fn focus_handle(&self, _cx: &gpui::App) -> FocusHandle {
-        self.outer_focus_handle.clone()
-    }
-}
-
-impl Render for KeystrokeInput {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let colors = cx.theme().colors();
-        let is_focused = self.outer_focus_handle.contains_focused(window, cx);
-        let is_recording = self.is_recording(window);
-
-        let width = rems_from_px(64.);
-
-        let recording_bg_color = colors
-            .editor_background
-            .blend(colors.text_accent.opacity(0.1));
-
-        let recording_pulse = |color: Color| {
-            Icon::new(IconName::Circle)
-                .size(IconSize::Small)
-                .color(Color::Error)
-                .with_animation(
-                    "recording-pulse",
-                    Animation::new(std::time::Duration::from_secs(2))
-                        .repeat()
-                        .with_easing(gpui::pulsating_between(0.4, 0.8)),
-                    {
-                        let color = color.color(cx);
-                        move |this, delta| this.color(Color::Custom(color.opacity(delta)))
-                    },
-                )
-        };
-
-        let recording_indicator = h_flex()
-            .h_4()
-            .pr_1()
-            .gap_0p5()
-            .border_1()
-            .border_color(colors.border)
-            .bg(colors
-                .editor_background
-                .blend(colors.text_accent.opacity(0.1)))
-            .rounded_sm()
-            .child(recording_pulse(Color::Error))
-            .child(
-                Label::new("REC")
-                    .size(LabelSize::XSmall)
-                    .weight(FontWeight::SEMIBOLD)
-                    .color(Color::Error),
-            );
-
-        let search_indicator = h_flex()
-            .h_4()
-            .pr_1()
-            .gap_0p5()
-            .border_1()
-            .border_color(colors.border)
-            .bg(colors
-                .editor_background
-                .blend(colors.text_accent.opacity(0.1)))
-            .rounded_sm()
-            .child(recording_pulse(Color::Accent))
-            .child(
-                Label::new("SEARCH")
-                    .size(LabelSize::XSmall)
-                    .weight(FontWeight::SEMIBOLD)
-                    .color(Color::Accent),
-            );
-
-        let record_icon = if self.search {
-            IconName::MagnifyingGlass
-        } else {
-            IconName::PlayFilled
-        };
-
-        h_flex()
-            .id("keystroke-input")
-            .track_focus(&self.outer_focus_handle)
-            .key_context(Self::key_context())
-            .on_action(cx.listener(Self::start_recording))
-            .on_action(cx.listener(Self::clear_keystrokes))
-            .py_2()
-            .px_3()
-            .gap_2()
-            .min_h_10()
-            .w_full()
-            .flex_1()
-            .justify_between()
-            .rounded_md()
-            .overflow_hidden()
-            .map(|this| {
-                if is_recording {
-                    this.bg(recording_bg_color)
-                } else {
-                    this.bg(colors.editor_background)
-                }
-            })
-            .border_1()
-            .map(|this| {
-                if is_focused {
-                    this.border_color(colors.border_focused)
-                } else {
-                    this.border_color(colors.border_variant)
-                }
-            })
-            .child(
-                h_flex()
-                    .w(width)
-                    .gap_0p5()
-                    .justify_start()
-                    .flex_none()
-                    .when(is_recording, |this| {
-                        this.map(|this| {
-                            if self.search {
-                                this.child(search_indicator)
-                            } else {
-                                this.child(recording_indicator)
-                            }
-                        })
-                    }),
-            )
-            .child(
-                h_flex()
-                    .id("keystroke-input-inner")
-                    .track_focus(&self.inner_focus_handle)
-                    .on_modifiers_changed(cx.listener(Self::on_modifiers_changed))
-                    .when(!self.search, |this| {
-                        this.focus(|mut style| {
-                            style.border_color = Some(colors.border_focused);
-                            style
-                        })
-                    })
-                    .size_full()
-                    .min_w_0()
-                    .justify_center()
-                    .flex_wrap()
-                    .gap_1()
-                    .children(self.render_keystrokes(is_recording)),
-            )
-            .child(
-                h_flex()
-                    .w(width)
-                    .gap_0p5()
-                    .justify_end()
-                    .flex_none()
-                    .map(|this| {
-                        if is_recording {
-                            this.child(
-                                IconButton::new("stop-record-btn", IconName::Stop)
-                                    .shape(IconButtonShape::Square)
-                                    .map(|this| {
-                                        this.tooltip(Tooltip::for_action_title(
-                                            if self.search {
-                                                "Stop Searching"
-                                            } else {
-                                                "Stop Recording"
-                                            },
-                                            &StopRecording,
-                                        ))
-                                    })
-                                    .icon_color(Color::Error)
-                                    .on_click(cx.listener(|this, _event, window, cx| {
-                                        this.stop_recording(&StopRecording, window, cx);
-                                    })),
-                            )
-                        } else {
-                            this.child(
-                                IconButton::new("record-btn", record_icon)
-                                    .shape(IconButtonShape::Square)
-                                    .map(|this| {
-                                        this.tooltip(Tooltip::for_action_title(
-                                            if self.search {
-                                                "Start Searching"
-                                            } else {
-                                                "Start Recording"
-                                            },
-                                            &StartRecording,
-                                        ))
-                                    })
-                                    .when(!is_focused, |this| this.icon_color(Color::Muted))
-                                    .on_click(cx.listener(|this, _event, window, cx| {
-                                        this.start_recording(&StartRecording, window, cx);
-                                    })),
-                            )
-                        }
-                    })
-                    .when_some(self.actions_slot.take(), |this, action| this.child(action))
-                    .when(is_recording, |this| {
-                        this.child(
-                            IconButton::new("clear-btn", IconName::Backspace)
-                                .shape(IconButtonShape::Square)
-                                .tooltip(move |_, cx| {
-                                    Tooltip::with_meta(
-                                        "Clear Keystrokes",
-                                        Some(&ClearKeystrokes),
-                                        "Hit it three times to execute",
-                                        cx,
-                                    )
-                                })
-                                .when(!is_focused, |this| this.icon_color(Color::Muted))
-                                .on_click(cx.listener(|this, _event, window, cx| {
-                                    this.clear_keystrokes(&ClearKeystrokes, window, cx);
-                                })),
-                        )
-                    }),
-            )
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use fs::FakeFs;
-    use gpui::{Entity, TestAppContext, VisualTestContext};
-    use itertools::Itertools as _;
-    use project::Project;
-    use settings::SettingsStore;
-    use workspace::Workspace;
-
-    pub struct KeystrokeInputTestHelper {
-        input: Entity<KeystrokeInput>,
-        current_modifiers: Modifiers,
-        cx: VisualTestContext,
-    }
-
-    impl KeystrokeInputTestHelper {
-        /// Creates a new test helper with default settings
-        pub fn new(mut cx: VisualTestContext) -> Self {
-            let input = cx.new_window_entity(|window, cx| KeystrokeInput::new(None, window, cx));
-
-            let mut helper = Self {
-                input,
-                current_modifiers: Modifiers::default(),
-                cx,
-            };
-
-            helper.start_recording();
-            helper
-        }
-
-        /// Sets search mode on the input
-        pub fn with_search_mode(&mut self, search: bool) -> &mut Self {
-            self.input.update(&mut self.cx, |input, _| {
-                input.set_search(search);
-            });
-            self
-        }
-
-        /// Sends a keystroke event based on string description
-        /// Examples: "a", "ctrl-a", "cmd-shift-z", "escape"
-        #[track_caller]
-        pub fn send_keystroke(&mut self, keystroke_input: &str) -> &mut Self {
-            self.expect_is_recording(true);
-            let keystroke_str = if keystroke_input.ends_with('-') {
-                format!("{}_", keystroke_input)
-            } else {
-                keystroke_input.to_string()
-            };
-
-            let mut keystroke = Keystroke::parse(&keystroke_str)
-                .unwrap_or_else(|_| panic!("Invalid keystroke: {}", keystroke_input));
-
-            // Remove the dummy key if we added it for modifier-only keystrokes
-            if keystroke_input.ends_with('-') && keystroke_str.ends_with("_") {
-                keystroke.key = "".to_string();
-            }
-
-            // Combine current modifiers with keystroke modifiers
-            keystroke.modifiers |= self.current_modifiers;
-            let real_modifiers = keystroke.modifiers;
-            keystroke = to_gpui_keystroke(keystroke);
-
-            self.update_input(|input, window, cx| {
-                window.set_modifiers(real_modifiers);
-                input.handle_keystroke(&keystroke, window, cx);
-            });
-
-            // Don't update current_modifiers for keystrokes with actual keys
-            if keystroke.key.is_empty() {
-                self.current_modifiers = keystroke.modifiers;
-            }
-            self
-        }
-
-        /// Sends a modifier change event based on string description
-        /// Examples: "+ctrl", "-ctrl", "+cmd+shift", "-all"
-        #[track_caller]
-        pub fn send_modifiers(&mut self, modifiers: &str) -> &mut Self {
-            self.expect_is_recording(true);
-            let new_modifiers = if modifiers == "-all" {
-                Modifiers::default()
-            } else {
-                self.parse_modifier_change(modifiers)
-            };
-
-            let event = ModifiersChangedEvent {
-                modifiers: new_modifiers,
-                capslock: gpui::Capslock::default(),
-            };
-
-            self.update_input(|input, window, cx| {
-                window.set_modifiers(new_modifiers);
-                input.on_modifiers_changed(&event, window, cx);
-            });
-
-            self.current_modifiers = new_modifiers;
-            self
-        }
-
-        /// Sends multiple events in sequence
-        /// Each event string is either a keystroke or modifier change
-        #[track_caller]
-        pub fn send_events(&mut self, events: &[&str]) -> &mut Self {
-            self.expect_is_recording(true);
-            for event in events {
-                if event.starts_with('+') || event.starts_with('-') {
-                    self.send_modifiers(event);
-                } else {
-                    self.send_keystroke(event);
-                }
-            }
-            self
-        }
-
-        #[track_caller]
-        fn expect_keystrokes_equal(actual: &[Keystroke], expected: &[&str]) {
-            let expected_keystrokes: Result<Vec<Keystroke>, _> = expected
-                .iter()
-                .map(|s| {
-                    let keystroke_str = if s.ends_with('-') {
-                        format!("{}_", s)
-                    } else {
-                        s.to_string()
-                    };
-
-                    let mut keystroke = Keystroke::parse(&keystroke_str)?;
-
-                    // Remove the dummy key if we added it for modifier-only keystrokes
-                    if s.ends_with('-') && keystroke_str.ends_with("_") {
-                        keystroke.key = "".to_string();
-                    }
-
-                    Ok(keystroke)
-                })
-                .collect();
-
-            let expected_keystrokes = expected_keystrokes
-                .unwrap_or_else(|e: anyhow::Error| panic!("Invalid expected keystroke: {}", e));
-
-            assert_eq!(
-                actual.len(),
-                expected_keystrokes.len(),
-                "Keystroke count mismatch. Expected: {:?}, Actual: {:?}",
-                expected_keystrokes
-                    .iter()
-                    .map(|k| k.unparse())
-                    .collect::<Vec<_>>(),
-                actual.iter().map(|k| k.unparse()).collect::<Vec<_>>()
-            );
-
-            for (i, (actual, expected)) in actual.iter().zip(expected_keystrokes.iter()).enumerate()
-            {
-                assert_eq!(
-                    actual.unparse(),
-                    expected.unparse(),
-                    "Keystroke {} mismatch. Expected: '{}', Actual: '{}'",
-                    i,
-                    expected.unparse(),
-                    actual.unparse()
-                );
-            }
-        }
-
-        /// Verifies that the keystrokes match the expected strings
-        #[track_caller]
-        pub fn expect_keystrokes(&mut self, expected: &[&str]) -> &mut Self {
-            let actual: Vec<Keystroke> = self.input.read_with(&self.cx, |input, _| {
-                input
-                    .keystrokes
-                    .iter()
-                    .map(|keystroke| keystroke.inner().clone())
-                    .collect()
-            });
-            Self::expect_keystrokes_equal(&actual, expected);
-            self
-        }
-
-        #[track_caller]
-        pub fn expect_close_keystrokes(&mut self, expected: &[&str]) -> &mut Self {
-            let actual = self
-                .input
-                .read_with(&self.cx, |input, _| input.close_keystrokes.clone())
-                .unwrap_or_default();
-            Self::expect_keystrokes_equal(&actual, expected);
-            self
-        }
-
-        /// Verifies that there are no keystrokes
-        #[track_caller]
-        pub fn expect_empty(&mut self) -> &mut Self {
-            self.expect_keystrokes(&[])
-        }
-
-        /// Starts recording keystrokes
-        #[track_caller]
-        pub fn start_recording(&mut self) -> &mut Self {
-            self.expect_is_recording(false);
-            self.input.update_in(&mut self.cx, |input, window, cx| {
-                input.start_recording(&StartRecording, window, cx);
-            });
-            self
-        }
-
-        /// Stops recording keystrokes
-        pub fn stop_recording(&mut self) -> &mut Self {
-            self.expect_is_recording(true);
-            self.input.update_in(&mut self.cx, |input, window, cx| {
-                input.stop_recording(&StopRecording, window, cx);
-            });
-            self
-        }
-
-        /// Clears all keystrokes
-        #[track_caller]
-        pub fn clear_keystrokes(&mut self) -> &mut Self {
-            let change_tracker = KeystrokeUpdateTracker::new(self.input.clone(), &mut self.cx);
-            self.input.update_in(&mut self.cx, |input, window, cx| {
-                input.clear_keystrokes(&ClearKeystrokes, window, cx);
-            });
-            KeystrokeUpdateTracker::finish(change_tracker, &self.cx);
-            self.current_modifiers = Default::default();
-            self
-        }
-
-        /// Verifies the recording state
-        #[track_caller]
-        pub fn expect_is_recording(&mut self, expected: bool) -> &mut Self {
-            let actual = self
-                .input
-                .update_in(&mut self.cx, |input, window, _| input.is_recording(window));
-            assert_eq!(
-                actual, expected,
-                "Recording state mismatch. Expected: {}, Actual: {}",
-                expected, actual
-            );
-            self
-        }
-
-        pub async fn wait_for_close_keystroke_capture_end(&mut self) -> &mut Self {
-            let task = self.input.update_in(&mut self.cx, |input, _, _| {
-                input.clear_close_keystrokes_timer.take()
-            });
-            let task = task.expect("No close keystroke capture end timer task");
-            self.cx
-                .executor()
-                .advance_clock(CLOSE_KEYSTROKE_CAPTURE_END_TIMEOUT);
-            task.await;
-            self
-        }
-
-        /// Parses modifier change strings like "+ctrl", "-shift", "+cmd+alt"
-        #[track_caller]
-        fn parse_modifier_change(&self, modifiers_str: &str) -> Modifiers {
-            let mut modifiers = self.current_modifiers;
-
-            assert!(!modifiers_str.is_empty(), "Empty modifier string");
-
-            let value;
-            let split_char;
-            let remaining;
-            if let Some(to_add) = modifiers_str.strip_prefix('+') {
-                value = true;
-                split_char = '+';
-                remaining = to_add;
-            } else {
-                let to_remove = modifiers_str
-                    .strip_prefix('-')
-                    .expect("Modifier string must start with '+' or '-'");
-                value = false;
-                split_char = '-';
-                remaining = to_remove;
-            }
-
-            for modifier in remaining.split(split_char) {
-                match modifier {
-                    "ctrl" | "control" => modifiers.control = value,
-                    "alt" | "option" => modifiers.alt = value,
-                    "shift" => modifiers.shift = value,
-                    "cmd" | "command" | "platform" => modifiers.platform = value,
-                    "fn" | "function" => modifiers.function = value,
-                    _ => panic!("Unknown modifier: {}", modifier),
-                }
-            }
-
-            modifiers
-        }
-
-        #[track_caller]
-        fn update_input<R>(
-            &mut self,
-            cb: impl FnOnce(&mut KeystrokeInput, &mut Window, &mut Context<KeystrokeInput>) -> R,
-        ) -> R {
-            let change_tracker = KeystrokeUpdateTracker::new(self.input.clone(), &mut self.cx);
-            let result = self.input.update_in(&mut self.cx, cb);
-            KeystrokeUpdateTracker::finish(change_tracker, &self.cx);
-            result
-        }
-    }
-
-    /// For GPUI, when you press `ctrl-shift-2`, it produces `ctrl-@` without the shift modifier.
-    fn to_gpui_keystroke(mut keystroke: Keystroke) -> Keystroke {
-        if keystroke.modifiers.shift {
-            match keystroke.key.as_str() {
-                "`" => {
-                    keystroke.key = "~".into();
-                    keystroke.modifiers.shift = false;
-                }
-                "1" => {
-                    keystroke.key = "!".into();
-                    keystroke.modifiers.shift = false;
-                }
-                "2" => {
-                    keystroke.key = "@".into();
-                    keystroke.modifiers.shift = false;
-                }
-                "3" => {
-                    keystroke.key = "#".into();
-                    keystroke.modifiers.shift = false;
-                }
-                "4" => {
-                    keystroke.key = "$".into();
-                    keystroke.modifiers.shift = false;
-                }
-                "5" => {
-                    keystroke.key = "%".into();
-                    keystroke.modifiers.shift = false;
-                }
-                "6" => {
-                    keystroke.key = "^".into();
-                    keystroke.modifiers.shift = false;
-                }
-                "7" => {
-                    keystroke.key = "&".into();
-                    keystroke.modifiers.shift = false;
-                }
-                "8" => {
-                    keystroke.key = "*".into();
-                    keystroke.modifiers.shift = false;
-                }
-                "9" => {
-                    keystroke.key = "(".into();
-                    keystroke.modifiers.shift = false;
-                }
-                "0" => {
-                    keystroke.key = ")".into();
-                    keystroke.modifiers.shift = false;
-                }
-                "-" => {
-                    keystroke.key = "_".into();
-                    keystroke.modifiers.shift = false;
-                }
-                "=" => {
-                    keystroke.key = "+".into();
-                    keystroke.modifiers.shift = false;
-                }
-                "[" => {
-                    keystroke.key = "{".into();
-                    keystroke.modifiers.shift = false;
-                }
-                "]" => {
-                    keystroke.key = "}".into();
-                    keystroke.modifiers.shift = false;
-                }
-                "\\" => {
-                    keystroke.key = "|".into();
-                    keystroke.modifiers.shift = false;
-                }
-                ";" => {
-                    keystroke.key = ":".into();
-                    keystroke.modifiers.shift = false;
-                }
-                "'" => {
-                    keystroke.key = "\"".into();
-                    keystroke.modifiers.shift = false;
-                }
-                "," => {
-                    keystroke.key = "<".into();
-                    keystroke.modifiers.shift = false;
-                }
-                "." => {
-                    keystroke.key = ">".into();
-                    keystroke.modifiers.shift = false;
-                }
-                "/" => {
-                    keystroke.key = "?".into();
-                    keystroke.modifiers.shift = false;
-                }
-                _ => {}
-            }
-        }
-        keystroke
-    }
-
-    struct KeystrokeUpdateTracker {
-        initial_keystrokes: Vec<KeybindingKeystroke>,
-        _subscription: Subscription,
-        input: Entity<KeystrokeInput>,
-        received_keystrokes_updated: bool,
-    }
-
-    impl KeystrokeUpdateTracker {
-        fn new(input: Entity<KeystrokeInput>, cx: &mut VisualTestContext) -> Entity<Self> {
-            cx.new(|cx| Self {
-                initial_keystrokes: input.read_with(cx, |input, _| input.keystrokes.clone()),
-                _subscription: cx.subscribe(&input, |this: &mut Self, _, _, _| {
-                    this.received_keystrokes_updated = true;
-                }),
-                input,
-                received_keystrokes_updated: false,
-            })
-        }
-        #[track_caller]
-        fn finish(this: Entity<Self>, cx: &VisualTestContext) {
-            let (received_keystrokes_updated, initial_keystrokes_str, updated_keystrokes_str) =
-                this.read_with(cx, |this, cx| {
-                    let updated_keystrokes = this
-                        .input
-                        .read_with(cx, |input, _| input.keystrokes.clone());
-                    let initial_keystrokes_str = keystrokes_str(&this.initial_keystrokes);
-                    let updated_keystrokes_str = keystrokes_str(&updated_keystrokes);
-                    (
-                        this.received_keystrokes_updated,
-                        initial_keystrokes_str,
-                        updated_keystrokes_str,
-                    )
-                });
-            if received_keystrokes_updated {
-                assert_ne!(
-                    initial_keystrokes_str, updated_keystrokes_str,
-                    "Received keystrokes_updated event, expected different keystrokes"
-                );
-            } else {
-                assert_eq!(
-                    initial_keystrokes_str, updated_keystrokes_str,
-                    "Received no keystrokes_updated event, expected same keystrokes"
-                );
-            }
-
-            fn keystrokes_str(ks: &[KeybindingKeystroke]) -> String {
-                ks.iter().map(|ks| ks.inner().unparse()).join(" ")
-            }
-        }
-    }
-
-    async fn init_test(cx: &mut TestAppContext) -> KeystrokeInputTestHelper {
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-            theme::init(theme::LoadThemes::JustBase, cx);
-        });
-
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, [], cx).await;
-        let workspace =
-            cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let cx = VisualTestContext::from_window(*workspace, cx);
-        KeystrokeInputTestHelper::new(cx)
-    }
-
-    #[gpui::test]
-    async fn test_basic_keystroke_input(cx: &mut TestAppContext) {
-        init_test(cx)
-            .await
-            .send_keystroke("a")
-            .clear_keystrokes()
-            .expect_empty();
-    }
-
-    #[gpui::test]
-    async fn test_modifier_handling(cx: &mut TestAppContext) {
-        init_test(cx)
-            .await
-            .with_search_mode(true)
-            .send_events(&["+ctrl", "a", "-ctrl"])
-            .expect_keystrokes(&["ctrl-a"]);
-    }
-
-    #[gpui::test]
-    async fn test_multiple_modifiers(cx: &mut TestAppContext) {
-        init_test(cx)
-            .await
-            .send_keystroke("cmd-shift-z")
-            .expect_keystrokes(&["cmd-shift-z", "cmd-shift-"]);
-    }
-
-    #[gpui::test]
-    async fn test_search_mode_behavior(cx: &mut TestAppContext) {
-        init_test(cx)
-            .await
-            .with_search_mode(true)
-            .send_events(&["+cmd", "shift-f", "-cmd"])
-            // In search mode, when completing a modifier-only keystroke with a key,
-            // only the original modifiers are preserved, not the keystroke's modifiers
-            //
-            // Update:
-            // This behavior was changed to preserve all modifiers in search mode, this is now reflected in the expected keystrokes.
-            // Specifically, considering the sequence: `+cmd +shift -shift 2`, we expect it to produce the same result as `+cmd +shift 2`
-            // which is `cmd-@`. But in the case of `+cmd +shift -shift 2`, the keystroke we receive is `cmd-2`, which means that
-            // we need to dynamically map the key from `2` to `@` when the shift modifier is not present, which is not possible.
-            // Therefore, we now preserve all modifiers in search mode to ensure consistent behavior.
-            // And also, VSCode seems to preserve all modifiers in search mode as well.
-            .expect_keystrokes(&["cmd-shift-f"]);
-    }
-
-    #[gpui::test]
-    async fn test_keystroke_limit(cx: &mut TestAppContext) {
-        init_test(cx)
-            .await
-            .send_keystroke("a")
-            .send_keystroke("b")
-            .send_keystroke("c")
-            .expect_keystrokes(&["a", "b", "c"]) // At max limit
-            .send_keystroke("d")
-            .expect_empty(); // Should clear when exceeding limit
-    }
-
-    #[gpui::test]
-    async fn test_modifier_release_all(cx: &mut TestAppContext) {
-        init_test(cx)
-            .await
-            .with_search_mode(true)
-            .send_events(&["+ctrl+shift", "a", "-all"])
-            .expect_keystrokes(&["ctrl-shift-a"]);
-    }
-
-    #[gpui::test]
-    async fn test_search_new_modifiers_not_added_until_all_released(cx: &mut TestAppContext) {
-        init_test(cx)
-            .await
-            .with_search_mode(true)
-            .send_events(&["+ctrl+shift", "a", "-ctrl"])
-            .expect_keystrokes(&["ctrl-shift-a"])
-            .send_events(&["+ctrl"])
-            .expect_keystrokes(&["ctrl-shift-a", "ctrl-shift-"]);
-    }
-
-    #[gpui::test]
-    async fn test_previous_modifiers_no_effect_when_not_search(cx: &mut TestAppContext) {
-        init_test(cx)
-            .await
-            .with_search_mode(false)
-            .send_events(&["+ctrl+shift", "a", "-all"])
-            .expect_keystrokes(&["ctrl-shift-a"]);
-    }
-
-    #[gpui::test]
-    async fn test_keystroke_limit_overflow_non_search_mode(cx: &mut TestAppContext) {
-        init_test(cx)
-            .await
-            .with_search_mode(false)
-            .send_events(&["a", "b", "c", "d"]) // 4 keystrokes, exceeds limit of 3
-            .expect_empty(); // Should clear when exceeding limit
-    }
-
-    #[gpui::test]
-    async fn test_complex_modifier_sequences(cx: &mut TestAppContext) {
-        init_test(cx)
-            .await
-            .with_search_mode(true)
-            .send_events(&["+ctrl", "+shift", "+alt", "a", "-ctrl", "-shift", "-alt"])
-            .expect_keystrokes(&["ctrl-shift-alt-a"]);
-    }
-
-    #[gpui::test]
-    async fn test_modifier_only_keystrokes_search_mode(cx: &mut TestAppContext) {
-        init_test(cx)
-            .await
-            .with_search_mode(true)
-            .send_events(&["+ctrl", "+shift", "-ctrl", "-shift"])
-            .expect_keystrokes(&["ctrl-shift-"]); // Modifier-only sequences create modifier-only keystrokes
-    }
-
-    #[gpui::test]
-    async fn test_modifier_only_keystrokes_non_search_mode(cx: &mut TestAppContext) {
-        init_test(cx)
-            .await
-            .with_search_mode(false)
-            .send_events(&["+ctrl", "+shift", "-ctrl", "-shift"])
-            .expect_empty(); // Modifier-only sequences get filtered in non-search mode
-    }
-
-    #[gpui::test]
-    async fn test_rapid_modifier_changes(cx: &mut TestAppContext) {
-        init_test(cx)
-            .await
-            .with_search_mode(true)
-            .send_events(&["+ctrl", "-ctrl", "+shift", "-shift", "+alt", "a", "-alt"])
-            .expect_keystrokes(&["ctrl-", "shift-", "alt-a"]);
-    }
-
-    #[gpui::test]
-    async fn test_clear_keystrokes_search_mode(cx: &mut TestAppContext) {
-        init_test(cx)
-            .await
-            .with_search_mode(true)
-            .send_events(&["+ctrl", "a", "-ctrl", "b"])
-            .expect_keystrokes(&["ctrl-a", "b"])
-            .clear_keystrokes()
-            .expect_empty();
-    }
-
-    #[gpui::test]
-    async fn test_non_search_mode_modifier_key_sequence(cx: &mut TestAppContext) {
-        init_test(cx)
-            .await
-            .with_search_mode(false)
-            .send_events(&["+ctrl", "a"])
-            .expect_keystrokes(&["ctrl-a", "ctrl-"])
-            .send_events(&["-ctrl"])
-            .expect_keystrokes(&["ctrl-a"]); // Non-search mode filters trailing empty keystrokes
-    }
-
-    #[gpui::test]
-    async fn test_all_modifiers_at_once(cx: &mut TestAppContext) {
-        init_test(cx)
-            .await
-            .with_search_mode(true)
-            .send_events(&["+ctrl+shift+alt+cmd", "a", "-all"])
-            .expect_keystrokes(&["ctrl-shift-alt-cmd-a"]);
-    }
-
-    #[gpui::test]
-    async fn test_keystrokes_at_exact_limit(cx: &mut TestAppContext) {
-        init_test(cx)
-            .await
-            .with_search_mode(true)
-            .send_events(&["a", "b", "c"]) // exactly 3 keystrokes (at limit)
-            .expect_keystrokes(&["a", "b", "c"])
-            .send_events(&["d"]) // should clear when exceeding
-            .expect_empty();
-    }
-
-    #[gpui::test]
-    async fn test_function_modifier_key(cx: &mut TestAppContext) {
-        init_test(cx)
-            .await
-            .with_search_mode(true)
-            .send_events(&["+fn", "f1", "-fn"])
-            .expect_keystrokes(&["fn-f1"]);
-    }
-
-    #[gpui::test]
-    async fn test_start_stop_recording(cx: &mut TestAppContext) {
-        init_test(cx)
-            .await
-            .send_events(&["a", "b"])
-            .expect_keystrokes(&["a", "b"]) // start_recording clears existing keystrokes
-            .stop_recording()
-            .expect_is_recording(false)
-            .start_recording()
-            .send_events(&["c"])
-            .expect_keystrokes(&["c"]);
-    }
-
-    #[gpui::test]
-    async fn test_modifier_sequence_with_interruption(cx: &mut TestAppContext) {
-        init_test(cx)
-            .await
-            .with_search_mode(true)
-            .send_events(&["+ctrl", "+shift", "a", "-shift", "b", "-ctrl"])
-            .expect_keystrokes(&["ctrl-shift-a", "ctrl-b"]);
-    }
-
-    #[gpui::test]
-    async fn test_empty_key_sequence_search_mode(cx: &mut TestAppContext) {
-        init_test(cx)
-            .await
-            .with_search_mode(true)
-            .send_events(&[]) // No events at all
-            .expect_empty();
-    }
-
-    #[gpui::test]
-    async fn test_modifier_sequence_completion_search_mode(cx: &mut TestAppContext) {
-        init_test(cx)
-            .await
-            .with_search_mode(true)
-            .send_events(&["+ctrl", "+shift", "-shift", "a", "-ctrl"])
-            .expect_keystrokes(&["ctrl-a"]);
-    }
-
-    #[gpui::test]
-    async fn test_triple_escape_stops_recording_search_mode(cx: &mut TestAppContext) {
-        init_test(cx)
-            .await
-            .with_search_mode(true)
-            .send_events(&["a", "escape", "escape", "escape"])
-            .expect_keystrokes(&["a"]) // Triple escape removes final escape, stops recording
-            .expect_is_recording(false);
-    }
-
-    #[gpui::test]
-    async fn test_triple_escape_stops_recording_non_search_mode(cx: &mut TestAppContext) {
-        init_test(cx)
-            .await
-            .with_search_mode(false)
-            .send_events(&["a", "escape", "escape", "escape"])
-            .expect_keystrokes(&["a"]); // Triple escape stops recording but only removes final escape
-    }
-
-    #[gpui::test]
-    async fn test_triple_escape_at_keystroke_limit(cx: &mut TestAppContext) {
-        init_test(cx)
-            .await
-            .with_search_mode(true)
-            .send_events(&["a", "b", "c", "escape", "escape", "escape"]) // 6 keystrokes total, exceeds limit
-            .expect_keystrokes(&["a", "b", "c"]); // Triple escape stops recording and removes escapes, leaves original keystrokes
-    }
-
-    #[gpui::test]
-    async fn test_interrupted_escape_sequence(cx: &mut TestAppContext) {
-        init_test(cx)
-            .await
-            .with_search_mode(true)
-            .send_events(&["escape", "escape", "a", "escape"]) // Partial escape sequence interrupted by 'a'
-            .expect_keystrokes(&["escape", "escape", "a"]); // Escape sequence interrupted by 'a', no close triggered
-    }
-
-    #[gpui::test]
-    async fn test_interrupted_escape_sequence_within_limit(cx: &mut TestAppContext) {
-        init_test(cx)
-            .await
-            .with_search_mode(true)
-            .send_events(&["escape", "escape", "a"]) // Partial escape sequence interrupted by 'a' (3 keystrokes, at limit)
-            .expect_keystrokes(&["escape", "escape", "a"]); // Should not trigger close, interruption resets escape detection
-    }
-
-    #[gpui::test]
-    async fn test_partial_escape_sequence_no_close(cx: &mut TestAppContext) {
-        init_test(cx)
-            .await
-            .with_search_mode(true)
-            .send_events(&["escape", "escape"]) // Only 2 escapes, not enough to close
-            .expect_keystrokes(&["escape", "escape"])
-            .expect_is_recording(true); // Should remain in keystrokes, no close triggered
-    }
-
-    #[gpui::test]
-    async fn test_recording_state_after_triple_escape(cx: &mut TestAppContext) {
-        init_test(cx)
-            .await
-            .with_search_mode(true)
-            .send_events(&["a", "escape", "escape", "escape"])
-            .expect_keystrokes(&["a"]) // Triple escape stops recording, removes final escape
-            .expect_is_recording(false);
-    }
-
-    #[gpui::test]
-    async fn test_triple_escape_mixed_with_other_keystrokes(cx: &mut TestAppContext) {
-        init_test(cx)
-            .await
-            .with_search_mode(true)
-            .send_events(&["a", "escape", "b", "escape", "escape"]) // Mixed sequence, should not trigger close
-            .expect_keystrokes(&["a", "escape", "b"]); // No complete triple escape sequence, stays at limit
-    }
-
-    #[gpui::test]
-    async fn test_triple_escape_only(cx: &mut TestAppContext) {
-        init_test(cx)
-            .await
-            .with_search_mode(true)
-            .send_events(&["escape", "escape", "escape"]) // Pure triple escape sequence
-            .expect_empty();
-    }
-
-    #[gpui::test]
-    async fn test_end_close_keystroke_capture(cx: &mut TestAppContext) {
-        init_test(cx)
-            .await
-            .send_events(&["+ctrl", "g", "-ctrl", "escape"])
-            .expect_keystrokes(&["ctrl-g", "escape"])
-            .wait_for_close_keystroke_capture_end()
-            .await
-            .send_events(&["escape", "escape"])
-            .expect_keystrokes(&["ctrl-g", "escape", "escape"])
-            .expect_close_keystrokes(&["escape", "escape"])
-            .send_keystroke("escape")
-            .expect_keystrokes(&["ctrl-g", "escape"]);
-    }
-
-    #[gpui::test]
-    async fn test_search_previous_modifiers_are_sticky(cx: &mut TestAppContext) {
-        init_test(cx)
-            .await
-            .with_search_mode(true)
-            .send_events(&["+ctrl+alt", "-ctrl", "j"])
-            .expect_keystrokes(&["alt-j"]);
-    }
-
-    #[gpui::test]
-    async fn test_previous_modifiers_can_be_entered_separately(cx: &mut TestAppContext) {
-        init_test(cx)
-            .await
-            .with_search_mode(true)
-            .send_events(&["+ctrl", "-ctrl"])
-            .expect_keystrokes(&["ctrl-"])
-            .send_events(&["+alt", "-alt"])
-            .expect_keystrokes(&["ctrl-", "alt-"]);
-    }
-
-    #[gpui::test]
-    async fn test_previous_modifiers_reset_on_key(cx: &mut TestAppContext) {
-        init_test(cx)
-            .await
-            .with_search_mode(true)
-            .send_events(&["+ctrl+alt", "-ctrl", "+shift"])
-            .expect_keystrokes(&["ctrl-shift-alt-"])
-            .send_keystroke("j")
-            .expect_keystrokes(&["shift-alt-j"])
-            .send_keystroke("i")
-            .expect_keystrokes(&["shift-alt-j", "shift-alt-i"])
-            .send_events(&["-shift-alt", "+cmd"])
-            .expect_keystrokes(&["shift-alt-j", "shift-alt-i", "cmd-"]);
-    }
-
-    #[gpui::test]
-    async fn test_previous_modifiers_reset_on_release_all(cx: &mut TestAppContext) {
-        init_test(cx)
-            .await
-            .with_search_mode(true)
-            .send_events(&["+ctrl+alt", "-ctrl", "+shift"])
-            .expect_keystrokes(&["ctrl-shift-alt-"])
-            .send_events(&["-all", "j"])
-            .expect_keystrokes(&["ctrl-shift-alt-", "j"]);
-    }
-
-    #[gpui::test]
-    async fn test_search_repeat_modifiers(cx: &mut TestAppContext) {
-        init_test(cx)
-            .await
-            .with_search_mode(true)
-            .send_events(&["+ctrl", "-ctrl", "+alt", "-alt", "+shift", "-shift"])
-            .expect_keystrokes(&["ctrl-", "alt-", "shift-"])
-            .send_events(&["+cmd"])
-            .expect_empty();
-    }
-
-    #[gpui::test]
-    async fn test_not_search_repeat_modifiers(cx: &mut TestAppContext) {
-        init_test(cx)
-            .await
-            .with_search_mode(false)
-            .send_events(&["+ctrl", "-ctrl", "+alt", "-alt", "+shift", "-shift"])
-            .expect_empty();
-    }
-
-    #[gpui::test]
-    async fn test_not_search_shifted_keys(cx: &mut TestAppContext) {
-        init_test(cx)
-            .await
-            .with_search_mode(false)
-            .send_events(&["+ctrl", "+shift", "4", "-all"])
-            .expect_keystrokes(&["ctrl-$"]);
-    }
-}
diff --git a/crates/keymap_editor/src/ui_components/mod.rs b/crates/keymap_editor/src/ui_components/mod.rs
deleted file mode 100644
index c093bab554..0000000000
--- a/crates/keymap_editor/src/ui_components/mod.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub mod keystroke_input;
diff --git a/crates/language/Cargo.toml b/crates/language/Cargo.toml
deleted file mode 100644
index 49ea681290..0000000000
--- a/crates/language/Cargo.toml
+++ /dev/null
@@ -1,98 +0,0 @@
-[package]
-name = "language"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/language.rs"
-doctest = false
-
-[features]
-test-support = [
-    "rand",
-    "collections/test-support",
-    "lsp/test-support",
-    "text/test-support",
-    "tree-sitter-rust",
-    "tree-sitter-python",
-    "tree-sitter-typescript",
-    "tree-sitter-md",
-    "settings/test-support",
-    "util/test-support",
-]
-
-[dependencies]
-anyhow.workspace = true
-async-trait.workspace = true
-clock.workspace = true
-collections.workspace = true
-ec4rs.workspace = true
-fs.workspace = true
-futures.workspace = true
-fuzzy.workspace = true
-globset.workspace = true
-gpui.workspace = true
-http_client.workspace = true
-imara-diff.workspace = true
-itertools.workspace = true
-log.workspace = true
-lsp.workspace = true
-parking_lot.workspace = true
-postage.workspace = true
-rand = { workspace = true, optional = true }
-regex.workspace = true
-rpc.workspace = true
-schemars.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-shellexpand.workspace = true
-smallvec.workspace = true
-smol.workspace = true
-streaming-iterator.workspace = true
-strsim.workspace = true
-sum_tree.workspace = true
-task.workspace = true
-text.workspace = true
-theme.workspace = true
-tree-sitter-md = { workspace = true, optional = true }
-tree-sitter-python = { workspace = true, optional = true }
-tree-sitter-rust = { workspace = true, optional = true }
-tree-sitter-typescript = { workspace = true, optional = true }
-tree-sitter.workspace = true
-unicase = "2.6"
-util.workspace = true
-watch.workspace = true
-zlog.workspace = true
-diffy = "0.4.2"
-
-[dev-dependencies]
-collections = { workspace = true, features = ["test-support"] }
-ctor.workspace = true
-gpui = { workspace = true, features = ["test-support"] }
-indoc.workspace = true
-lsp = { workspace = true, features = ["test-support"] }
-pretty_assertions.workspace = true
-rand.workspace = true
-settings = { workspace = true, features = ["test-support"] }
-text = { workspace = true, features = ["test-support"] }
-http_client = { workspace = true, features = ["test-support"] }
-tree-sitter-elixir.workspace = true
-tree-sitter-embedded-template.workspace = true
-tree-sitter-heex.workspace = true
-tree-sitter-html.workspace = true
-tree-sitter-json.workspace = true
-tree-sitter-md.workspace = true
-tree-sitter-python.workspace = true
-tree-sitter-ruby.workspace = true
-tree-sitter-rust.workspace = true
-tree-sitter-typescript.workspace = true
-toml.workspace = true
-unindent.workspace = true
-util = { workspace = true, features = ["test-support"] }
-zlog.workspace = true
diff --git a/crates/language/LICENSE-GPL b/crates/language/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/language/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/language/build.rs b/crates/language/build.rs
deleted file mode 100644
index 90d5a4cb2d..0000000000
--- a/crates/language/build.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-fn main() {
-    if let Ok(bundled) = std::env::var("ZED_BUNDLE") {
-        println!("cargo:rustc-env=ZED_BUNDLE={}", bundled);
-    }
-}
diff --git a/crates/language/src/buffer.rs b/crates/language/src/buffer.rs
deleted file mode 100644
index 22fcbf5ee8..0000000000
--- a/crates/language/src/buffer.rs
+++ /dev/null
@@ -1,5682 +0,0 @@
-pub mod row_chunk;
-
-use crate::{
-    DebuggerTextObject, LanguageScope, Outline, OutlineConfig, PLAIN_TEXT, RunnableCapture,
-    RunnableTag, TextObject, TreeSitterOptions,
-    diagnostic_set::{DiagnosticEntry, DiagnosticEntryRef, DiagnosticGroup},
-    language_settings::{LanguageSettings, language_settings},
-    outline::OutlineItem,
-    row_chunk::RowChunks,
-    syntax_map::{
-        SyntaxLayer, SyntaxMap, SyntaxMapCapture, SyntaxMapCaptures, SyntaxMapMatch,
-        SyntaxMapMatches, SyntaxSnapshot, ToTreeSitterPoint,
-    },
-    task_context::RunnableRange,
-    text_diff::text_diff,
-    unified_diff,
-};
-pub use crate::{
-    Grammar, Language, LanguageRegistry,
-    diagnostic_set::DiagnosticSet,
-    highlight_map::{HighlightId, HighlightMap},
-    proto,
-};
-use anyhow::{Context as _, Result};
-use clock::Lamport;
-pub use clock::ReplicaId;
-use collections::{HashMap, HashSet};
-use fs::MTime;
-use futures::channel::oneshot;
-use gpui::{
-    App, AppContext as _, Context, Entity, EventEmitter, HighlightStyle, SharedString, StyledText,
-    Task, TaskLabel, TextStyle,
-};
-
-use lsp::{LanguageServerId, NumberOrString};
-use parking_lot::Mutex;
-use serde::{Deserialize, Serialize};
-use serde_json::Value;
-use settings::WorktreeId;
-use smallvec::SmallVec;
-use smol::future::yield_now;
-use std::{
-    any::Any,
-    borrow::Cow,
-    cell::Cell,
-    cmp::{self, Ordering, Reverse},
-    collections::{BTreeMap, BTreeSet},
-    future::Future,
-    iter::{self, Iterator, Peekable},
-    mem,
-    num::NonZeroU32,
-    ops::{Deref, Range},
-    path::PathBuf,
-    rc,
-    sync::{Arc, LazyLock},
-    time::{Duration, Instant},
-    vec,
-};
-use sum_tree::TreeMap;
-use text::operation_queue::OperationQueue;
-use text::*;
-pub use text::{
-    Anchor, Bias, Buffer as TextBuffer, BufferId, BufferSnapshot as TextBufferSnapshot, Edit,
-    LineIndent, OffsetRangeExt, OffsetUtf16, Patch, Point, PointUtf16, Rope, Selection,
-    SelectionGoal, Subscription, TextDimension, TextSummary, ToOffset, ToOffsetUtf16, ToPoint,
-    ToPointUtf16, Transaction, TransactionId, Unclipped,
-};
-use theme::{ActiveTheme as _, SyntaxTheme};
-#[cfg(any(test, feature = "test-support"))]
-use util::RandomCharIter;
-use util::{RangeExt, debug_panic, maybe, paths::PathStyle, rel_path::RelPath};
-
-#[cfg(any(test, feature = "test-support"))]
-pub use {tree_sitter_python, tree_sitter_rust, tree_sitter_typescript};
-
-pub use lsp::DiagnosticSeverity;
-
-/// A label for the background task spawned by the buffer to compute
-/// a diff against the contents of its file.
-pub static BUFFER_DIFF_TASK: LazyLock<TaskLabel> = LazyLock::new(TaskLabel::new);
-
-/// Indicate whether a [`Buffer`] has permissions to edit.
-#[derive(PartialEq, Clone, Copy, Debug)]
-pub enum Capability {
-    /// The buffer is a mutable replica.
-    ReadWrite,
-    /// The buffer is a read-only replica.
-    ReadOnly,
-}
-
-pub type BufferRow = u32;
-
-/// An in-memory representation of a source code file, including its text,
-/// syntax trees, git status, and diagnostics.
-pub struct Buffer {
-    text: TextBuffer,
-    branch_state: Option<BufferBranchState>,
-    /// Filesystem state, `None` when there is no path.
-    file: Option<Arc<dyn File>>,
-    /// The mtime of the file when this buffer was last loaded from
-    /// or saved to disk.
-    saved_mtime: Option<MTime>,
-    /// The version vector when this buffer was last loaded from
-    /// or saved to disk.
-    saved_version: clock::Global,
-    preview_version: clock::Global,
-    transaction_depth: usize,
-    was_dirty_before_starting_transaction: Option<bool>,
-    reload_task: Option<Task<Result<()>>>,
-    language: Option<Arc<Language>>,
-    autoindent_requests: Vec<Arc<AutoindentRequest>>,
-    wait_for_autoindent_txs: Vec<oneshot::Sender<()>>,
-    pending_autoindent: Option<Task<()>>,
-    sync_parse_timeout: Duration,
-    syntax_map: Mutex<SyntaxMap>,
-    reparse: Option<Task<()>>,
-    parse_status: (watch::Sender<ParseStatus>, watch::Receiver<ParseStatus>),
-    non_text_state_update_count: usize,
-    diagnostics: SmallVec<[(LanguageServerId, DiagnosticSet); 2]>,
-    remote_selections: TreeMap<ReplicaId, SelectionSet>,
-    diagnostics_timestamp: clock::Lamport,
-    completion_triggers: BTreeSet<String>,
-    completion_triggers_per_language_server: HashMap<LanguageServerId, BTreeSet<String>>,
-    completion_triggers_timestamp: clock::Lamport,
-    deferred_ops: OperationQueue<Operation>,
-    capability: Capability,
-    has_conflict: bool,
-    /// Memoize calls to has_changes_since(saved_version).
-    /// The contents of a cell are (self.version, has_changes) at the time of a last call.
-    has_unsaved_edits: Cell<(clock::Global, bool)>,
-    change_bits: Vec<rc::Weak<Cell<bool>>>,
-    _subscriptions: Vec<gpui::Subscription>,
-    tree_sitter_data: Arc<TreeSitterData>,
-}
-
-#[derive(Debug)]
-pub struct TreeSitterData {
-    chunks: RowChunks,
-    brackets_by_chunks: Mutex<Vec<Option<Vec<BracketMatch<usize>>>>>,
-}
-
-const MAX_ROWS_IN_A_CHUNK: u32 = 50;
-
-impl TreeSitterData {
-    fn clear(&mut self, snapshot: text::BufferSnapshot) {
-        self.chunks = RowChunks::new(snapshot, MAX_ROWS_IN_A_CHUNK);
-        self.brackets_by_chunks.get_mut().clear();
-        self.brackets_by_chunks
-            .get_mut()
-            .resize(self.chunks.len(), None);
-    }
-
-    fn new(snapshot: text::BufferSnapshot) -> Self {
-        let chunks = RowChunks::new(snapshot, MAX_ROWS_IN_A_CHUNK);
-        Self {
-            brackets_by_chunks: Mutex::new(vec![None; chunks.len()]),
-            chunks,
-        }
-    }
-
-    fn version(&self) -> &clock::Global {
-        self.chunks.version()
-    }
-}
-
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub enum ParseStatus {
-    Idle,
-    Parsing,
-}
-
-struct BufferBranchState {
-    base_buffer: Entity<Buffer>,
-    merged_operations: Vec<Lamport>,
-}
-
-/// An immutable, cheaply cloneable representation of a fixed
-/// state of a buffer.
-pub struct BufferSnapshot {
-    pub text: text::BufferSnapshot,
-    pub syntax: SyntaxSnapshot,
-    file: Option<Arc<dyn File>>,
-    diagnostics: SmallVec<[(LanguageServerId, DiagnosticSet); 2]>,
-    remote_selections: TreeMap<ReplicaId, SelectionSet>,
-    language: Option<Arc<Language>>,
-    non_text_state_update_count: usize,
-    tree_sitter_data: Arc<TreeSitterData>,
-}
-
-/// The kind and amount of indentation in a particular line. For now,
-/// assumes that indentation is all the same character.
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Default)]
-pub struct IndentSize {
-    /// The number of bytes that comprise the indentation.
-    pub len: u32,
-    /// The kind of whitespace used for indentation.
-    pub kind: IndentKind,
-}
-
-/// A whitespace character that's used for indentation.
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Default)]
-pub enum IndentKind {
-    /// An ASCII space character.
-    #[default]
-    Space,
-    /// An ASCII tab character.
-    Tab,
-}
-
-/// The shape of a selection cursor.
-#[derive(Copy, Clone, Debug, Default, PartialEq, Eq)]
-pub enum CursorShape {
-    /// A vertical bar
-    #[default]
-    Bar,
-    /// A block that surrounds the following character
-    Block,
-    /// An underline that runs along the following character
-    Underline,
-    /// A box drawn around the following character
-    Hollow,
-}
-
-impl From<settings::CursorShape> for CursorShape {
-    fn from(shape: settings::CursorShape) -> Self {
-        match shape {
-            settings::CursorShape::Bar => CursorShape::Bar,
-            settings::CursorShape::Block => CursorShape::Block,
-            settings::CursorShape::Underline => CursorShape::Underline,
-            settings::CursorShape::Hollow => CursorShape::Hollow,
-        }
-    }
-}
-
-#[derive(Clone, Debug)]
-struct SelectionSet {
-    line_mode: bool,
-    cursor_shape: CursorShape,
-    selections: Arc<[Selection<Anchor>]>,
-    lamport_timestamp: clock::Lamport,
-}
-
-/// A diagnostic associated with a certain range of a buffer.
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct Diagnostic {
-    /// The name of the service that produced this diagnostic.
-    pub source: Option<String>,
-    /// The ID provided by the dynamic registration that produced this diagnostic.
-    pub registration_id: Option<SharedString>,
-    /// A machine-readable code that identifies this diagnostic.
-    pub code: Option<NumberOrString>,
-    pub code_description: Option<lsp::Uri>,
-    /// Whether this diagnostic is a hint, warning, or error.
-    pub severity: DiagnosticSeverity,
-    /// The human-readable message associated with this diagnostic.
-    pub message: String,
-    /// The human-readable message (in markdown format)
-    pub markdown: Option<String>,
-    /// An id that identifies the group to which this diagnostic belongs.
-    ///
-    /// When a language server produces a diagnostic with
-    /// one or more associated diagnostics, those diagnostics are all
-    /// assigned a single group ID.
-    pub group_id: usize,
-    /// Whether this diagnostic is the primary diagnostic for its group.
-    ///
-    /// In a given group, the primary diagnostic is the top-level diagnostic
-    /// returned by the language server. The non-primary diagnostics are the
-    /// associated diagnostics.
-    pub is_primary: bool,
-    /// Whether this diagnostic is considered to originate from an analysis of
-    /// files on disk, as opposed to any unsaved buffer contents. This is a
-    /// property of a given diagnostic source, and is configured for a given
-    /// language server via the [`LspAdapter::disk_based_diagnostic_sources`](crate::LspAdapter::disk_based_diagnostic_sources) method
-    /// for the language server.
-    pub is_disk_based: bool,
-    /// Whether this diagnostic marks unnecessary code.
-    pub is_unnecessary: bool,
-    /// Quick separation of diagnostics groups based by their source.
-    pub source_kind: DiagnosticSourceKind,
-    /// Data from language server that produced this diagnostic. Passed back to the LS when we request code actions for this diagnostic.
-    pub data: Option<Value>,
-    /// Whether to underline the corresponding text range in the editor.
-    pub underline: bool,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub enum DiagnosticSourceKind {
-    Pulled,
-    Pushed,
-    Other,
-}
-
-/// An operation used to synchronize this buffer with its other replicas.
-#[derive(Clone, Debug, PartialEq)]
-pub enum Operation {
-    /// A text operation.
-    Buffer(text::Operation),
-
-    /// An update to the buffer's diagnostics.
-    UpdateDiagnostics {
-        /// The id of the language server that produced the new diagnostics.
-        server_id: LanguageServerId,
-        /// The diagnostics.
-        diagnostics: Arc<[DiagnosticEntry<Anchor>]>,
-        /// The buffer's lamport timestamp.
-        lamport_timestamp: clock::Lamport,
-    },
-
-    /// An update to the most recent selections in this buffer.
-    UpdateSelections {
-        /// The selections.
-        selections: Arc<[Selection<Anchor>]>,
-        /// The buffer's lamport timestamp.
-        lamport_timestamp: clock::Lamport,
-        /// Whether the selections are in 'line mode'.
-        line_mode: bool,
-        /// The [`CursorShape`] associated with these selections.
-        cursor_shape: CursorShape,
-    },
-
-    /// An update to the characters that should trigger autocompletion
-    /// for this buffer.
-    UpdateCompletionTriggers {
-        /// The characters that trigger autocompletion.
-        triggers: Vec<String>,
-        /// The buffer's lamport timestamp.
-        lamport_timestamp: clock::Lamport,
-        /// The language server ID.
-        server_id: LanguageServerId,
-    },
-
-    /// An update to the line ending type of this buffer.
-    UpdateLineEnding {
-        /// The line ending type.
-        line_ending: LineEnding,
-        /// The buffer's lamport timestamp.
-        lamport_timestamp: clock::Lamport,
-    },
-}
-
-/// An event that occurs in a buffer.
-#[derive(Clone, Debug, PartialEq)]
-pub enum BufferEvent {
-    /// The buffer was changed in a way that must be
-    /// propagated to its other replicas.
-    Operation {
-        operation: Operation,
-        is_local: bool,
-    },
-    /// The buffer was edited.
-    Edited,
-    /// The buffer's `dirty` bit changed.
-    DirtyChanged,
-    /// The buffer was saved.
-    Saved,
-    /// The buffer's file was changed on disk.
-    FileHandleChanged,
-    /// The buffer was reloaded.
-    Reloaded,
-    /// The buffer is in need of a reload
-    ReloadNeeded,
-    /// The buffer's language was changed.
-    /// The boolean indicates whether this buffer did not have a language before, but does now.
-    LanguageChanged(bool),
-    /// The buffer's syntax trees were updated.
-    Reparsed,
-    /// The buffer's diagnostics were updated.
-    DiagnosticsUpdated,
-    /// The buffer gained or lost editing capabilities.
-    CapabilityChanged,
-}
-
-/// The file associated with a buffer.
-pub trait File: Send + Sync + Any {
-    /// Returns the [`LocalFile`] associated with this file, if the
-    /// file is local.
-    fn as_local(&self) -> Option<&dyn LocalFile>;
-
-    /// Returns whether this file is local.
-    fn is_local(&self) -> bool {
-        self.as_local().is_some()
-    }
-
-    /// Returns whether the file is new, exists in storage, or has been deleted. Includes metadata
-    /// only available in some states, such as modification time.
-    fn disk_state(&self) -> DiskState;
-
-    /// Returns the path of this file relative to the worktree's root directory.
-    fn path(&self) -> &Arc<RelPath>;
-
-    /// Returns the path of this file relative to the worktree's parent directory (this means it
-    /// includes the name of the worktree's root folder).
-    fn full_path(&self, cx: &App) -> PathBuf;
-
-    /// Returns the path style of this file.
-    fn path_style(&self, cx: &App) -> PathStyle;
-
-    /// Returns the last component of this handle's absolute path. If this handle refers to the root
-    /// of its worktree, then this method will return the name of the worktree itself.
-    fn file_name<'a>(&'a self, cx: &'a App) -> &'a str;
-
-    /// Returns the id of the worktree to which this file belongs.
-    ///
-    /// This is needed for looking up project-specific settings.
-    fn worktree_id(&self, cx: &App) -> WorktreeId;
-
-    /// Converts this file into a protobuf message.
-    fn to_proto(&self, cx: &App) -> rpc::proto::File;
-
-    /// Return whether Zed considers this to be a private file.
-    fn is_private(&self) -> bool;
-}
-
-/// The file's storage status - whether it's stored (`Present`), and if so when it was last
-/// modified. In the case where the file is not stored, it can be either `New` or `Deleted`. In the
-/// UI these two states are distinguished. For example, the buffer tab does not display a deletion
-/// indicator for new files.
-#[derive(Copy, Clone, Debug, PartialEq)]
-pub enum DiskState {
-    /// File created in Zed that has not been saved.
-    New,
-    /// File present on the filesystem.
-    Present { mtime: MTime },
-    /// Deleted file that was previously present.
-    Deleted,
-}
-
-impl DiskState {
-    /// Returns the file's last known modification time on disk.
-    pub fn mtime(self) -> Option<MTime> {
-        match self {
-            DiskState::New => None,
-            DiskState::Present { mtime } => Some(mtime),
-            DiskState::Deleted => None,
-        }
-    }
-
-    pub fn exists(&self) -> bool {
-        match self {
-            DiskState::New => false,
-            DiskState::Present { .. } => true,
-            DiskState::Deleted => false,
-        }
-    }
-}
-
-/// The file associated with a buffer, in the case where the file is on the local disk.
-pub trait LocalFile: File {
-    /// Returns the absolute path of this file
-    fn abs_path(&self, cx: &App) -> PathBuf;
-
-    /// Loads the file contents from disk and returns them as a UTF-8 encoded string.
-    fn load(&self, cx: &App) -> Task<Result<String>>;
-
-    /// Loads the file's contents from disk.
-    fn load_bytes(&self, cx: &App) -> Task<Result<Vec<u8>>>;
-}
-
-/// The auto-indent behavior associated with an editing operation.
-/// For some editing operations, each affected line of text has its
-/// indentation recomputed. For other operations, the entire block
-/// of edited text is adjusted uniformly.
-#[derive(Clone, Debug)]
-pub enum AutoindentMode {
-    /// Indent each line of inserted text.
-    EachLine,
-    /// Apply the same indentation adjustment to all of the lines
-    /// in a given insertion.
-    Block {
-        /// The original indentation column of the first line of each
-        /// insertion, if it has been copied.
-        ///
-        /// Knowing this makes it possible to preserve the relative indentation
-        /// of every line in the insertion from when it was copied.
-        ///
-        /// If the original indent column is `a`, and the first line of insertion
-        /// is then auto-indented to column `b`, then every other line of
-        /// the insertion will be auto-indented to column `b - a`
-        original_indent_columns: Vec<Option<u32>>,
-    },
-}
-
-#[derive(Clone)]
-struct AutoindentRequest {
-    before_edit: BufferSnapshot,
-    entries: Vec<AutoindentRequestEntry>,
-    is_block_mode: bool,
-    ignore_empty_lines: bool,
-}
-
-#[derive(Debug, Clone)]
-struct AutoindentRequestEntry {
-    /// A range of the buffer whose indentation should be adjusted.
-    range: Range<Anchor>,
-    /// Whether or not these lines should be considered brand new, for the
-    /// purpose of auto-indent. When text is not new, its indentation will
-    /// only be adjusted if the suggested indentation level has *changed*
-    /// since the edit was made.
-    first_line_is_new: bool,
-    indent_size: IndentSize,
-    original_indent_column: Option<u32>,
-}
-
-#[derive(Debug)]
-struct IndentSuggestion {
-    basis_row: u32,
-    delta: Ordering,
-    within_error: bool,
-}
-
-struct BufferChunkHighlights<'a> {
-    captures: SyntaxMapCaptures<'a>,
-    next_capture: Option<SyntaxMapCapture<'a>>,
-    stack: Vec<(usize, HighlightId)>,
-    highlight_maps: Vec<HighlightMap>,
-}
-
-/// An iterator that yields chunks of a buffer's text, along with their
-/// syntax highlights and diagnostic status.
-pub struct BufferChunks<'a> {
-    buffer_snapshot: Option<&'a BufferSnapshot>,
-    range: Range<usize>,
-    chunks: text::Chunks<'a>,
-    diagnostic_endpoints: Option<Peekable<vec::IntoIter<DiagnosticEndpoint>>>,
-    error_depth: usize,
-    warning_depth: usize,
-    information_depth: usize,
-    hint_depth: usize,
-    unnecessary_depth: usize,
-    underline: bool,
-    highlights: Option<BufferChunkHighlights<'a>>,
-}
-
-/// A chunk of a buffer's text, along with its syntax highlight and
-/// diagnostic status.
-#[derive(Clone, Debug, Default)]
-pub struct Chunk<'a> {
-    /// The text of the chunk.
-    pub text: &'a str,
-    /// The syntax highlighting style of the chunk.
-    pub syntax_highlight_id: Option<HighlightId>,
-    /// The highlight style that has been applied to this chunk in
-    /// the editor.
-    pub highlight_style: Option<HighlightStyle>,
-    /// The severity of diagnostic associated with this chunk, if any.
-    pub diagnostic_severity: Option<DiagnosticSeverity>,
-    /// A bitset of which characters are tabs in this string.
-    pub tabs: u128,
-    /// Bitmap of character indices in this chunk
-    pub chars: u128,
-    /// Whether this chunk of text is marked as unnecessary.
-    pub is_unnecessary: bool,
-    /// Whether this chunk of text was originally a tab character.
-    pub is_tab: bool,
-    /// Whether this chunk of text was originally an inlay.
-    pub is_inlay: bool,
-    /// Whether to underline the corresponding text range in the editor.
-    pub underline: bool,
-}
-
-/// A set of edits to a given version of a buffer, computed asynchronously.
-#[derive(Debug)]
-pub struct Diff {
-    pub base_version: clock::Global,
-    pub line_ending: LineEnding,
-    pub edits: Vec<(Range<usize>, Arc<str>)>,
-}
-
-#[derive(Debug, Clone, Copy)]
-pub(crate) struct DiagnosticEndpoint {
-    offset: usize,
-    is_start: bool,
-    underline: bool,
-    severity: DiagnosticSeverity,
-    is_unnecessary: bool,
-}
-
-/// A class of characters, used for characterizing a run of text.
-#[derive(Copy, Clone, Eq, PartialEq, PartialOrd, Ord, Debug)]
-pub enum CharKind {
-    /// Whitespace.
-    Whitespace,
-    /// Punctuation.
-    Punctuation,
-    /// Word.
-    Word,
-}
-
-/// Context for character classification within a specific scope.
-#[derive(Copy, Clone, Eq, PartialEq, Debug)]
-pub enum CharScopeContext {
-    /// Character classification for completion queries.
-    ///
-    /// This context treats certain characters as word constituents that would
-    /// normally be considered punctuation, such as '-' in Tailwind classes
-    /// ("bg-yellow-100") or '.' in import paths ("foo.ts").
-    Completion,
-    /// Character classification for linked edits.
-    ///
-    /// This context handles characters that should be treated as part of
-    /// identifiers during linked editing operations, such as '.' in JSX
-    /// component names like `<Animated.View>`.
-    LinkedEdit,
-}
-
-/// A runnable is a set of data about a region that could be resolved into a task
-pub struct Runnable {
-    pub tags: SmallVec<[RunnableTag; 1]>,
-    pub language: Arc<Language>,
-    pub buffer: BufferId,
-}
-
-#[derive(Default, Clone, Debug)]
-pub struct HighlightedText {
-    pub text: SharedString,
-    pub highlights: Vec<(Range<usize>, HighlightStyle)>,
-}
-
-#[derive(Default, Debug)]
-struct HighlightedTextBuilder {
-    pub text: String,
-    highlights: Vec<(Range<usize>, HighlightStyle)>,
-}
-
-impl HighlightedText {
-    pub fn from_buffer_range<T: ToOffset>(
-        range: Range<T>,
-        snapshot: &text::BufferSnapshot,
-        syntax_snapshot: &SyntaxSnapshot,
-        override_style: Option<HighlightStyle>,
-        syntax_theme: &SyntaxTheme,
-    ) -> Self {
-        let mut highlighted_text = HighlightedTextBuilder::default();
-        highlighted_text.add_text_from_buffer_range(
-            range,
-            snapshot,
-            syntax_snapshot,
-            override_style,
-            syntax_theme,
-        );
-        highlighted_text.build()
-    }
-
-    pub fn to_styled_text(&self, default_style: &TextStyle) -> StyledText {
-        gpui::StyledText::new(self.text.clone())
-            .with_default_highlights(default_style, self.highlights.iter().cloned())
-    }
-
-    /// Returns the first line without leading whitespace unless highlighted
-    /// and a boolean indicating if there are more lines after
-    pub fn first_line_preview(self) -> (Self, bool) {
-        let newline_ix = self.text.find('\n').unwrap_or(self.text.len());
-        let first_line = &self.text[..newline_ix];
-
-        // Trim leading whitespace, unless an edit starts prior to it.
-        let mut preview_start_ix = first_line.len() - first_line.trim_start().len();
-        if let Some((first_highlight_range, _)) = self.highlights.first() {
-            preview_start_ix = preview_start_ix.min(first_highlight_range.start);
-        }
-
-        let preview_text = &first_line[preview_start_ix..];
-        let preview_highlights = self
-            .highlights
-            .into_iter()
-            .skip_while(|(range, _)| range.end <= preview_start_ix)
-            .take_while(|(range, _)| range.start < newline_ix)
-            .filter_map(|(mut range, highlight)| {
-                range.start = range.start.saturating_sub(preview_start_ix);
-                range.end = range.end.min(newline_ix).saturating_sub(preview_start_ix);
-                if range.is_empty() {
-                    None
-                } else {
-                    Some((range, highlight))
-                }
-            });
-
-        let preview = Self {
-            text: SharedString::new(preview_text),
-            highlights: preview_highlights.collect(),
-        };
-
-        (preview, self.text.len() > newline_ix)
-    }
-}
-
-impl HighlightedTextBuilder {
-    pub fn build(self) -> HighlightedText {
-        HighlightedText {
-            text: self.text.into(),
-            highlights: self.highlights,
-        }
-    }
-
-    pub fn add_text_from_buffer_range<T: ToOffset>(
-        &mut self,
-        range: Range<T>,
-        snapshot: &text::BufferSnapshot,
-        syntax_snapshot: &SyntaxSnapshot,
-        override_style: Option<HighlightStyle>,
-        syntax_theme: &SyntaxTheme,
-    ) {
-        let range = range.to_offset(snapshot);
-        for chunk in Self::highlighted_chunks(range, snapshot, syntax_snapshot) {
-            let start = self.text.len();
-            self.text.push_str(chunk.text);
-            let end = self.text.len();
-
-            if let Some(highlight_style) = chunk
-                .syntax_highlight_id
-                .and_then(|id| id.style(syntax_theme))
-            {
-                let highlight_style = override_style.map_or(highlight_style, |override_style| {
-                    highlight_style.highlight(override_style)
-                });
-                self.highlights.push((start..end, highlight_style));
-            } else if let Some(override_style) = override_style {
-                self.highlights.push((start..end, override_style));
-            }
-        }
-    }
-
-    fn highlighted_chunks<'a>(
-        range: Range<usize>,
-        snapshot: &'a text::BufferSnapshot,
-        syntax_snapshot: &'a SyntaxSnapshot,
-    ) -> BufferChunks<'a> {
-        let captures = syntax_snapshot.captures(range.clone(), snapshot, |grammar| {
-            grammar
-                .highlights_config
-                .as_ref()
-                .map(|config| &config.query)
-        });
-
-        let highlight_maps = captures
-            .grammars()
-            .iter()
-            .map(|grammar| grammar.highlight_map())
-            .collect();
-
-        BufferChunks::new(
-            snapshot.as_rope(),
-            range,
-            Some((captures, highlight_maps)),
-            false,
-            None,
-        )
-    }
-}
-
-#[derive(Clone)]
-pub struct EditPreview {
-    old_snapshot: text::BufferSnapshot,
-    applied_edits_snapshot: text::BufferSnapshot,
-    syntax_snapshot: SyntaxSnapshot,
-}
-
-impl EditPreview {
-    pub fn as_unified_diff(&self, edits: &[(Range<Anchor>, impl AsRef<str>)]) -> Option<String> {
-        let (first, _) = edits.first()?;
-        let (last, _) = edits.last()?;
-
-        let start = first.start.to_point(&self.old_snapshot);
-        let old_end = last.end.to_point(&self.old_snapshot);
-        let new_end = last
-            .end
-            .bias_right(&self.old_snapshot)
-            .to_point(&self.applied_edits_snapshot);
-
-        let start = Point::new(start.row.saturating_sub(3), 0);
-        let old_end = Point::new(old_end.row + 4, 0).min(self.old_snapshot.max_point());
-        let new_end = Point::new(new_end.row + 4, 0).min(self.applied_edits_snapshot.max_point());
-
-        Some(unified_diff(
-            &self
-                .old_snapshot
-                .text_for_range(start..old_end)
-                .collect::<String>(),
-            &self
-                .applied_edits_snapshot
-                .text_for_range(start..new_end)
-                .collect::<String>(),
-        ))
-    }
-
-    pub fn highlight_edits(
-        &self,
-        current_snapshot: &BufferSnapshot,
-        edits: &[(Range<Anchor>, impl AsRef<str>)],
-        include_deletions: bool,
-        cx: &App,
-    ) -> HighlightedText {
-        let Some(visible_range_in_preview_snapshot) = self.compute_visible_range(edits) else {
-            return HighlightedText::default();
-        };
-
-        let mut highlighted_text = HighlightedTextBuilder::default();
-
-        let visible_range_in_preview_snapshot =
-            visible_range_in_preview_snapshot.to_offset(&self.applied_edits_snapshot);
-        let mut offset_in_preview_snapshot = visible_range_in_preview_snapshot.start;
-
-        let insertion_highlight_style = HighlightStyle {
-            background_color: Some(cx.theme().status().created_background),
-            ..Default::default()
-        };
-        let deletion_highlight_style = HighlightStyle {
-            background_color: Some(cx.theme().status().deleted_background),
-            ..Default::default()
-        };
-        let syntax_theme = cx.theme().syntax();
-
-        for (range, edit_text) in edits {
-            let edit_new_end_in_preview_snapshot = range
-                .end
-                .bias_right(&self.old_snapshot)
-                .to_offset(&self.applied_edits_snapshot);
-            let edit_start_in_preview_snapshot =
-                edit_new_end_in_preview_snapshot - edit_text.as_ref().len();
-
-            let unchanged_range_in_preview_snapshot =
-                offset_in_preview_snapshot..edit_start_in_preview_snapshot;
-            if !unchanged_range_in_preview_snapshot.is_empty() {
-                highlighted_text.add_text_from_buffer_range(
-                    unchanged_range_in_preview_snapshot,
-                    &self.applied_edits_snapshot,
-                    &self.syntax_snapshot,
-                    None,
-                    syntax_theme,
-                );
-            }
-
-            let range_in_current_snapshot = range.to_offset(current_snapshot);
-            if include_deletions && !range_in_current_snapshot.is_empty() {
-                highlighted_text.add_text_from_buffer_range(
-                    range_in_current_snapshot,
-                    &current_snapshot.text,
-                    &current_snapshot.syntax,
-                    Some(deletion_highlight_style),
-                    syntax_theme,
-                );
-            }
-
-            if !edit_text.as_ref().is_empty() {
-                highlighted_text.add_text_from_buffer_range(
-                    edit_start_in_preview_snapshot..edit_new_end_in_preview_snapshot,
-                    &self.applied_edits_snapshot,
-                    &self.syntax_snapshot,
-                    Some(insertion_highlight_style),
-                    syntax_theme,
-                );
-            }
-
-            offset_in_preview_snapshot = edit_new_end_in_preview_snapshot;
-        }
-
-        highlighted_text.add_text_from_buffer_range(
-            offset_in_preview_snapshot..visible_range_in_preview_snapshot.end,
-            &self.applied_edits_snapshot,
-            &self.syntax_snapshot,
-            None,
-            syntax_theme,
-        );
-
-        highlighted_text.build()
-    }
-
-    pub fn build_result_buffer(&self, cx: &mut App) -> Entity<Buffer> {
-        cx.new(|cx| {
-            let mut buffer = Buffer::local_normalized(
-                self.applied_edits_snapshot.as_rope().clone(),
-                self.applied_edits_snapshot.line_ending(),
-                cx,
-            );
-            buffer.set_language_async(self.syntax_snapshot.root_language(), cx);
-            buffer
-        })
-    }
-
-    pub fn compute_visible_range<T>(&self, edits: &[(Range<Anchor>, T)]) -> Option<Range<Point>> {
-        let (first, _) = edits.first()?;
-        let (last, _) = edits.last()?;
-
-        let start = first
-            .start
-            .bias_left(&self.old_snapshot)
-            .to_point(&self.applied_edits_snapshot);
-        let end = last
-            .end
-            .bias_right(&self.old_snapshot)
-            .to_point(&self.applied_edits_snapshot);
-
-        // Ensure that the first line of the first edit and the last line of the last edit are always fully visible
-        let range = Point::new(start.row, 0)
-            ..Point::new(end.row, self.applied_edits_snapshot.line_len(end.row));
-
-        Some(range)
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct BracketMatch<T> {
-    pub open_range: Range<T>,
-    pub close_range: Range<T>,
-    pub newline_only: bool,
-    pub syntax_layer_depth: usize,
-    pub color_index: Option<usize>,
-}
-
-impl<T> BracketMatch<T> {
-    pub fn bracket_ranges(self) -> (Range<T>, Range<T>) {
-        (self.open_range, self.close_range)
-    }
-}
-
-impl Buffer {
-    /// Create a new buffer with the given base text.
-    pub fn local<T: Into<String>>(base_text: T, cx: &Context<Self>) -> Self {
-        Self::build(
-            TextBuffer::new(
-                ReplicaId::LOCAL,
-                cx.entity_id().as_non_zero_u64().into(),
-                base_text.into(),
-            ),
-            None,
-            Capability::ReadWrite,
-        )
-    }
-
-    /// Create a new buffer with the given base text that has proper line endings and other normalization applied.
-    pub fn local_normalized(
-        base_text_normalized: Rope,
-        line_ending: LineEnding,
-        cx: &Context<Self>,
-    ) -> Self {
-        Self::build(
-            TextBuffer::new_normalized(
-                ReplicaId::LOCAL,
-                cx.entity_id().as_non_zero_u64().into(),
-                line_ending,
-                base_text_normalized,
-            ),
-            None,
-            Capability::ReadWrite,
-        )
-    }
-
-    /// Create a new buffer that is a replica of a remote buffer.
-    pub fn remote(
-        remote_id: BufferId,
-        replica_id: ReplicaId,
-        capability: Capability,
-        base_text: impl Into<String>,
-    ) -> Self {
-        Self::build(
-            TextBuffer::new(replica_id, remote_id, base_text.into()),
-            None,
-            capability,
-        )
-    }
-
-    /// Create a new buffer that is a replica of a remote buffer, populating its
-    /// state from the given protobuf message.
-    pub fn from_proto(
-        replica_id: ReplicaId,
-        capability: Capability,
-        message: proto::BufferState,
-        file: Option<Arc<dyn File>>,
-    ) -> Result<Self> {
-        let buffer_id = BufferId::new(message.id).context("Could not deserialize buffer_id")?;
-        let buffer = TextBuffer::new(replica_id, buffer_id, message.base_text);
-        let mut this = Self::build(buffer, file, capability);
-        this.text.set_line_ending(proto::deserialize_line_ending(
-            rpc::proto::LineEnding::from_i32(message.line_ending).context("missing line_ending")?,
-        ));
-        this.saved_version = proto::deserialize_version(&message.saved_version);
-        this.saved_mtime = message.saved_mtime.map(|time| time.into());
-        Ok(this)
-    }
-
-    /// Serialize the buffer's state to a protobuf message.
-    pub fn to_proto(&self, cx: &App) -> proto::BufferState {
-        proto::BufferState {
-            id: self.remote_id().into(),
-            file: self.file.as_ref().map(|f| f.to_proto(cx)),
-            base_text: self.base_text().to_string(),
-            line_ending: proto::serialize_line_ending(self.line_ending()) as i32,
-            saved_version: proto::serialize_version(&self.saved_version),
-            saved_mtime: self.saved_mtime.map(|time| time.into()),
-        }
-    }
-
-    /// Serialize as protobufs all of the changes to the buffer since the given version.
-    pub fn serialize_ops(
-        &self,
-        since: Option<clock::Global>,
-        cx: &App,
-    ) -> Task<Vec<proto::Operation>> {
-        let mut operations = Vec::new();
-        operations.extend(self.deferred_ops.iter().map(proto::serialize_operation));
-
-        operations.extend(self.remote_selections.iter().map(|(_, set)| {
-            proto::serialize_operation(&Operation::UpdateSelections {
-                selections: set.selections.clone(),
-                lamport_timestamp: set.lamport_timestamp,
-                line_mode: set.line_mode,
-                cursor_shape: set.cursor_shape,
-            })
-        }));
-
-        for (server_id, diagnostics) in &self.diagnostics {
-            operations.push(proto::serialize_operation(&Operation::UpdateDiagnostics {
-                lamport_timestamp: self.diagnostics_timestamp,
-                server_id: *server_id,
-                diagnostics: diagnostics.iter().cloned().collect(),
-            }));
-        }
-
-        for (server_id, completions) in &self.completion_triggers_per_language_server {
-            operations.push(proto::serialize_operation(
-                &Operation::UpdateCompletionTriggers {
-                    triggers: completions.iter().cloned().collect(),
-                    lamport_timestamp: self.completion_triggers_timestamp,
-                    server_id: *server_id,
-                },
-            ));
-        }
-
-        let text_operations = self.text.operations().clone();
-        cx.background_spawn(async move {
-            let since = since.unwrap_or_default();
-            operations.extend(
-                text_operations
-                    .iter()
-                    .filter(|(_, op)| !since.observed(op.timestamp()))
-                    .map(|(_, op)| proto::serialize_operation(&Operation::Buffer(op.clone()))),
-            );
-            operations.sort_unstable_by_key(proto::lamport_timestamp_for_operation);
-            operations
-        })
-    }
-
-    /// Assign a language to the buffer, returning the buffer.
-    pub fn with_language_async(mut self, language: Arc<Language>, cx: &mut Context<Self>) -> Self {
-        self.set_language_async(Some(language), cx);
-        self
-    }
-
-    /// Assign a language to the buffer, blocking for up to 1ms to reparse the buffer, returning the buffer.
-    pub fn with_language(mut self, language: Arc<Language>, cx: &mut Context<Self>) -> Self {
-        self.set_language(Some(language), cx);
-        self
-    }
-
-    /// Returns the [`Capability`] of this buffer.
-    pub fn capability(&self) -> Capability {
-        self.capability
-    }
-
-    /// Whether this buffer can only be read.
-    pub fn read_only(&self) -> bool {
-        self.capability == Capability::ReadOnly
-    }
-
-    /// Builds a [`Buffer`] with the given underlying [`TextBuffer`], diff base, [`File`] and [`Capability`].
-    pub fn build(buffer: TextBuffer, file: Option<Arc<dyn File>>, capability: Capability) -> Self {
-        let saved_mtime = file.as_ref().and_then(|file| file.disk_state().mtime());
-        let snapshot = buffer.snapshot();
-        let syntax_map = Mutex::new(SyntaxMap::new(&snapshot));
-        let tree_sitter_data = TreeSitterData::new(snapshot);
-        Self {
-            saved_mtime,
-            tree_sitter_data: Arc::new(tree_sitter_data),
-            saved_version: buffer.version(),
-            preview_version: buffer.version(),
-            reload_task: None,
-            transaction_depth: 0,
-            was_dirty_before_starting_transaction: None,
-            has_unsaved_edits: Cell::new((buffer.version(), false)),
-            text: buffer,
-            branch_state: None,
-            file,
-            capability,
-            syntax_map,
-            reparse: None,
-            non_text_state_update_count: 0,
-            sync_parse_timeout: Duration::from_millis(1),
-            parse_status: watch::channel(ParseStatus::Idle),
-            autoindent_requests: Default::default(),
-            wait_for_autoindent_txs: Default::default(),
-            pending_autoindent: Default::default(),
-            language: None,
-            remote_selections: Default::default(),
-            diagnostics: Default::default(),
-            diagnostics_timestamp: Lamport::MIN,
-            completion_triggers: Default::default(),
-            completion_triggers_per_language_server: Default::default(),
-            completion_triggers_timestamp: Lamport::MIN,
-            deferred_ops: OperationQueue::new(),
-            has_conflict: false,
-            change_bits: Default::default(),
-            _subscriptions: Vec::new(),
-        }
-    }
-
-    pub fn build_snapshot(
-        text: Rope,
-        language: Option<Arc<Language>>,
-        language_registry: Option<Arc<LanguageRegistry>>,
-        cx: &mut App,
-    ) -> impl Future<Output = BufferSnapshot> + use<> {
-        let entity_id = cx.reserve_entity::<Self>().entity_id();
-        let buffer_id = entity_id.as_non_zero_u64().into();
-        async move {
-            let text =
-                TextBuffer::new_normalized(ReplicaId::LOCAL, buffer_id, Default::default(), text)
-                    .snapshot();
-            let mut syntax = SyntaxMap::new(&text).snapshot();
-            if let Some(language) = language.clone() {
-                let language_registry = language_registry.clone();
-                syntax.reparse(&text, language_registry, language);
-            }
-            let tree_sitter_data = TreeSitterData::new(text.clone());
-            BufferSnapshot {
-                text,
-                syntax,
-                file: None,
-                diagnostics: Default::default(),
-                remote_selections: Default::default(),
-                tree_sitter_data: Arc::new(tree_sitter_data),
-                language,
-                non_text_state_update_count: 0,
-            }
-        }
-    }
-
-    pub fn build_empty_snapshot(cx: &mut App) -> BufferSnapshot {
-        let entity_id = cx.reserve_entity::<Self>().entity_id();
-        let buffer_id = entity_id.as_non_zero_u64().into();
-        let text = TextBuffer::new_normalized(
-            ReplicaId::LOCAL,
-            buffer_id,
-            Default::default(),
-            Rope::new(),
-        )
-        .snapshot();
-        let syntax = SyntaxMap::new(&text).snapshot();
-        let tree_sitter_data = TreeSitterData::new(text.clone());
-        BufferSnapshot {
-            text,
-            syntax,
-            tree_sitter_data: Arc::new(tree_sitter_data),
-            file: None,
-            diagnostics: Default::default(),
-            remote_selections: Default::default(),
-            language: None,
-            non_text_state_update_count: 0,
-        }
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn build_snapshot_sync(
-        text: Rope,
-        language: Option<Arc<Language>>,
-        language_registry: Option<Arc<LanguageRegistry>>,
-        cx: &mut App,
-    ) -> BufferSnapshot {
-        let entity_id = cx.reserve_entity::<Self>().entity_id();
-        let buffer_id = entity_id.as_non_zero_u64().into();
-        let text =
-            TextBuffer::new_normalized(ReplicaId::LOCAL, buffer_id, Default::default(), text)
-                .snapshot();
-        let mut syntax = SyntaxMap::new(&text).snapshot();
-        if let Some(language) = language.clone() {
-            syntax.reparse(&text, language_registry, language);
-        }
-        let tree_sitter_data = TreeSitterData::new(text.clone());
-        BufferSnapshot {
-            text,
-            syntax,
-            tree_sitter_data: Arc::new(tree_sitter_data),
-            file: None,
-            diagnostics: Default::default(),
-            remote_selections: Default::default(),
-            language,
-            non_text_state_update_count: 0,
-        }
-    }
-
-    /// Retrieve a snapshot of the buffer's current state. This is computationally
-    /// cheap, and allows reading from the buffer on a background thread.
-    pub fn snapshot(&self) -> BufferSnapshot {
-        let text = self.text.snapshot();
-        let mut syntax_map = self.syntax_map.lock();
-        syntax_map.interpolate(&text);
-        let syntax = syntax_map.snapshot();
-
-        let tree_sitter_data = if self.text.version() != *self.tree_sitter_data.version() {
-            Arc::new(TreeSitterData::new(text.clone()))
-        } else {
-            self.tree_sitter_data.clone()
-        };
-
-        BufferSnapshot {
-            text,
-            syntax,
-            tree_sitter_data,
-            file: self.file.clone(),
-            remote_selections: self.remote_selections.clone(),
-            diagnostics: self.diagnostics.clone(),
-            language: self.language.clone(),
-            non_text_state_update_count: self.non_text_state_update_count,
-        }
-    }
-
-    pub fn branch(&mut self, cx: &mut Context<Self>) -> Entity<Self> {
-        let this = cx.entity();
-        cx.new(|cx| {
-            let mut branch = Self {
-                branch_state: Some(BufferBranchState {
-                    base_buffer: this.clone(),
-                    merged_operations: Default::default(),
-                }),
-                language: self.language.clone(),
-                has_conflict: self.has_conflict,
-                has_unsaved_edits: Cell::new(self.has_unsaved_edits.get_mut().clone()),
-                _subscriptions: vec![cx.subscribe(&this, Self::on_base_buffer_event)],
-                ..Self::build(self.text.branch(), self.file.clone(), self.capability())
-            };
-            if let Some(language_registry) = self.language_registry() {
-                branch.set_language_registry(language_registry);
-            }
-
-            // Reparse the branch buffer so that we get syntax highlighting immediately.
-            branch.reparse(cx, true);
-
-            branch
-        })
-    }
-
-    pub fn preview_edits(
-        &self,
-        edits: Arc<[(Range<Anchor>, Arc<str>)]>,
-        cx: &App,
-    ) -> Task<EditPreview> {
-        let registry = self.language_registry();
-        let language = self.language().cloned();
-        let old_snapshot = self.text.snapshot();
-        let mut branch_buffer = self.text.branch();
-        let mut syntax_snapshot = self.syntax_map.lock().snapshot();
-        cx.background_spawn(async move {
-            if !edits.is_empty() {
-                if let Some(language) = language.clone() {
-                    syntax_snapshot.reparse(&old_snapshot, registry.clone(), language);
-                }
-
-                branch_buffer.edit(edits.iter().cloned());
-                let snapshot = branch_buffer.snapshot();
-                syntax_snapshot.interpolate(&snapshot);
-
-                if let Some(language) = language {
-                    syntax_snapshot.reparse(&snapshot, registry, language);
-                }
-            }
-            EditPreview {
-                old_snapshot,
-                applied_edits_snapshot: branch_buffer.snapshot(),
-                syntax_snapshot,
-            }
-        })
-    }
-
-    /// Applies all of the changes in this buffer that intersect any of the
-    /// given `ranges` to its base buffer.
-    ///
-    /// If `ranges` is empty, then all changes will be applied. This buffer must
-    /// be a branch buffer to call this method.
-    pub fn merge_into_base(&mut self, ranges: Vec<Range<usize>>, cx: &mut Context<Self>) {
-        let Some(base_buffer) = self.base_buffer() else {
-            debug_panic!("not a branch buffer");
-            return;
-        };
-
-        let mut ranges = if ranges.is_empty() {
-            &[0..usize::MAX]
-        } else {
-            ranges.as_slice()
-        }
-        .iter()
-        .peekable();
-
-        let mut edits = Vec::new();
-        for edit in self.edits_since::<usize>(&base_buffer.read(cx).version()) {
-            let mut is_included = false;
-            while let Some(range) = ranges.peek() {
-                if range.end < edit.new.start {
-                    ranges.next().unwrap();
-                } else {
-                    if range.start <= edit.new.end {
-                        is_included = true;
-                    }
-                    break;
-                }
-            }
-
-            if is_included {
-                edits.push((
-                    edit.old.clone(),
-                    self.text_for_range(edit.new.clone()).collect::<String>(),
-                ));
-            }
-        }
-
-        let operation = base_buffer.update(cx, |base_buffer, cx| {
-            // cx.emit(BufferEvent::DiffBaseChanged);
-            base_buffer.edit(edits, None, cx)
-        });
-
-        if let Some(operation) = operation
-            && let Some(BufferBranchState {
-                merged_operations, ..
-            }) = &mut self.branch_state
-        {
-            merged_operations.push(operation);
-        }
-    }
-
-    fn on_base_buffer_event(
-        &mut self,
-        _: Entity<Buffer>,
-        event: &BufferEvent,
-        cx: &mut Context<Self>,
-    ) {
-        let BufferEvent::Operation { operation, .. } = event else {
-            return;
-        };
-        let Some(BufferBranchState {
-            merged_operations, ..
-        }) = &mut self.branch_state
-        else {
-            return;
-        };
-
-        let mut operation_to_undo = None;
-        if let Operation::Buffer(text::Operation::Edit(operation)) = &operation
-            && let Ok(ix) = merged_operations.binary_search(&operation.timestamp)
-        {
-            merged_operations.remove(ix);
-            operation_to_undo = Some(operation.timestamp);
-        }
-
-        self.apply_ops([operation.clone()], cx);
-
-        if let Some(timestamp) = operation_to_undo {
-            let counts = [(timestamp, u32::MAX)].into_iter().collect();
-            self.undo_operations(counts, cx);
-        }
-    }
-
-    #[cfg(test)]
-    pub(crate) fn as_text_snapshot(&self) -> &text::BufferSnapshot {
-        &self.text
-    }
-
-    /// Retrieve a snapshot of the buffer's raw text, without any
-    /// language-related state like the syntax tree or diagnostics.
-    pub fn text_snapshot(&self) -> text::BufferSnapshot {
-        self.text.snapshot()
-    }
-
-    /// The file associated with the buffer, if any.
-    pub fn file(&self) -> Option<&Arc<dyn File>> {
-        self.file.as_ref()
-    }
-
-    /// The version of the buffer that was last saved or reloaded from disk.
-    pub fn saved_version(&self) -> &clock::Global {
-        &self.saved_version
-    }
-
-    /// The mtime of the buffer's file when the buffer was last saved or reloaded from disk.
-    pub fn saved_mtime(&self) -> Option<MTime> {
-        self.saved_mtime
-    }
-
-    /// Assign a language to the buffer.
-    pub fn set_language_async(&mut self, language: Option<Arc<Language>>, cx: &mut Context<Self>) {
-        self.set_language_(language, cfg!(any(test, feature = "test-support")), cx);
-    }
-
-    /// Assign a language to the buffer, blocking for up to 1ms to reparse the buffer.
-    pub fn set_language(&mut self, language: Option<Arc<Language>>, cx: &mut Context<Self>) {
-        self.set_language_(language, true, cx);
-    }
-
-    fn set_language_(
-        &mut self,
-        language: Option<Arc<Language>>,
-        may_block: bool,
-        cx: &mut Context<Self>,
-    ) {
-        self.non_text_state_update_count += 1;
-        self.syntax_map.lock().clear(&self.text);
-        let old_language = std::mem::replace(&mut self.language, language);
-        self.was_changed();
-        self.reparse(cx, may_block);
-        let has_fresh_language =
-            self.language.is_some() && old_language.is_none_or(|old| old == *PLAIN_TEXT);
-        cx.emit(BufferEvent::LanguageChanged(has_fresh_language));
-    }
-
-    /// Assign a language registry to the buffer. This allows the buffer to retrieve
-    /// other languages if parts of the buffer are written in different languages.
-    pub fn set_language_registry(&self, language_registry: Arc<LanguageRegistry>) {
-        self.syntax_map
-            .lock()
-            .set_language_registry(language_registry);
-    }
-
-    pub fn language_registry(&self) -> Option<Arc<LanguageRegistry>> {
-        self.syntax_map.lock().language_registry()
-    }
-
-    /// Assign the line ending type to the buffer.
-    pub fn set_line_ending(&mut self, line_ending: LineEnding, cx: &mut Context<Self>) {
-        self.text.set_line_ending(line_ending);
-
-        let lamport_timestamp = self.text.lamport_clock.tick();
-        self.send_operation(
-            Operation::UpdateLineEnding {
-                line_ending,
-                lamport_timestamp,
-            },
-            true,
-            cx,
-        );
-    }
-
-    /// Assign the buffer a new [`Capability`].
-    pub fn set_capability(&mut self, capability: Capability, cx: &mut Context<Self>) {
-        if self.capability != capability {
-            self.capability = capability;
-            cx.emit(BufferEvent::CapabilityChanged)
-        }
-    }
-
-    /// This method is called to signal that the buffer has been saved.
-    pub fn did_save(
-        &mut self,
-        version: clock::Global,
-        mtime: Option<MTime>,
-        cx: &mut Context<Self>,
-    ) {
-        self.saved_version = version.clone();
-        self.has_unsaved_edits.set((version, false));
-        self.has_conflict = false;
-        self.saved_mtime = mtime;
-        self.was_changed();
-        cx.emit(BufferEvent::Saved);
-        cx.notify();
-    }
-
-    /// Reloads the contents of the buffer from disk.
-    pub fn reload(&mut self, cx: &Context<Self>) -> oneshot::Receiver<Option<Transaction>> {
-        let (tx, rx) = futures::channel::oneshot::channel();
-        let prev_version = self.text.version();
-        self.reload_task = Some(cx.spawn(async move |this, cx| {
-            let Some((new_mtime, new_text)) = this.update(cx, |this, cx| {
-                let file = this.file.as_ref()?.as_local()?;
-
-                Some((file.disk_state().mtime(), file.load(cx)))
-            })?
-            else {
-                return Ok(());
-            };
-
-            let new_text = new_text.await?;
-            let diff = this
-                .update(cx, |this, cx| this.diff(new_text.clone(), cx))?
-                .await;
-            this.update(cx, |this, cx| {
-                if this.version() == diff.base_version {
-                    this.finalize_last_transaction();
-                    this.apply_diff(diff, cx);
-                    tx.send(this.finalize_last_transaction().cloned()).ok();
-                    this.has_conflict = false;
-                    this.did_reload(this.version(), this.line_ending(), new_mtime, cx);
-                } else {
-                    if !diff.edits.is_empty()
-                        || this
-                            .edits_since::<usize>(&diff.base_version)
-                            .next()
-                            .is_some()
-                    {
-                        this.has_conflict = true;
-                    }
-
-                    this.did_reload(prev_version, this.line_ending(), this.saved_mtime, cx);
-                }
-
-                this.reload_task.take();
-            })
-        }));
-        rx
-    }
-
-    /// This method is called to signal that the buffer has been reloaded.
-    pub fn did_reload(
-        &mut self,
-        version: clock::Global,
-        line_ending: LineEnding,
-        mtime: Option<MTime>,
-        cx: &mut Context<Self>,
-    ) {
-        self.saved_version = version;
-        self.has_unsaved_edits
-            .set((self.saved_version.clone(), false));
-        self.text.set_line_ending(line_ending);
-        self.saved_mtime = mtime;
-        cx.emit(BufferEvent::Reloaded);
-        cx.notify();
-    }
-
-    /// Updates the [`File`] backing this buffer. This should be called when
-    /// the file has changed or has been deleted.
-    pub fn file_updated(&mut self, new_file: Arc<dyn File>, cx: &mut Context<Self>) {
-        let was_dirty = self.is_dirty();
-        let mut file_changed = false;
-
-        if let Some(old_file) = self.file.as_ref() {
-            if new_file.path() != old_file.path() {
-                file_changed = true;
-            }
-
-            let old_state = old_file.disk_state();
-            let new_state = new_file.disk_state();
-            if old_state != new_state {
-                file_changed = true;
-                if !was_dirty && matches!(new_state, DiskState::Present { .. }) {
-                    cx.emit(BufferEvent::ReloadNeeded)
-                }
-            }
-        } else {
-            file_changed = true;
-        };
-
-        self.file = Some(new_file);
-        if file_changed {
-            self.was_changed();
-            self.non_text_state_update_count += 1;
-            if was_dirty != self.is_dirty() {
-                cx.emit(BufferEvent::DirtyChanged);
-            }
-            cx.emit(BufferEvent::FileHandleChanged);
-            cx.notify();
-        }
-    }
-
-    pub fn base_buffer(&self) -> Option<Entity<Self>> {
-        Some(self.branch_state.as_ref()?.base_buffer.clone())
-    }
-
-    /// Returns the primary [`Language`] assigned to this [`Buffer`].
-    pub fn language(&self) -> Option<&Arc<Language>> {
-        self.language.as_ref()
-    }
-
-    /// Returns the [`Language`] at the given location.
-    pub fn language_at<D: ToOffset>(&self, position: D) -> Option<Arc<Language>> {
-        let offset = position.to_offset(self);
-        let mut is_first = true;
-        let start_anchor = self.anchor_before(offset);
-        let end_anchor = self.anchor_after(offset);
-        self.syntax_map
-            .lock()
-            .layers_for_range(offset..offset, &self.text, false)
-            .filter(|layer| {
-                if is_first {
-                    is_first = false;
-                    return true;
-                }
-
-                layer
-                    .included_sub_ranges
-                    .map(|sub_ranges| {
-                        sub_ranges.iter().any(|sub_range| {
-                            let is_before_start = sub_range.end.cmp(&start_anchor, self).is_lt();
-                            let is_after_end = sub_range.start.cmp(&end_anchor, self).is_gt();
-                            !is_before_start && !is_after_end
-                        })
-                    })
-                    .unwrap_or(true)
-            })
-            .last()
-            .map(|info| info.language.clone())
-            .or_else(|| self.language.clone())
-    }
-
-    /// Returns each [`Language`] for the active syntax layers at the given location.
-    pub fn languages_at<D: ToOffset>(&self, position: D) -> Vec<Arc<Language>> {
-        let offset = position.to_offset(self);
-        let mut languages: Vec<Arc<Language>> = self
-            .syntax_map
-            .lock()
-            .layers_for_range(offset..offset, &self.text, false)
-            .map(|info| info.language.clone())
-            .collect();
-
-        if languages.is_empty()
-            && let Some(buffer_language) = self.language()
-        {
-            languages.push(buffer_language.clone());
-        }
-
-        languages
-    }
-
-    /// An integer version number that accounts for all updates besides
-    /// the buffer's text itself (which is versioned via a version vector).
-    pub fn non_text_state_update_count(&self) -> usize {
-        self.non_text_state_update_count
-    }
-
-    /// Whether the buffer is being parsed in the background.
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn is_parsing(&self) -> bool {
-        self.reparse.is_some()
-    }
-
-    /// Indicates whether the buffer contains any regions that may be
-    /// written in a language that hasn't been loaded yet.
-    pub fn contains_unknown_injections(&self) -> bool {
-        self.syntax_map.lock().contains_unknown_injections()
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn set_sync_parse_timeout(&mut self, timeout: Duration) {
-        self.sync_parse_timeout = timeout;
-    }
-
-    fn invalidate_tree_sitter_data(&mut self, snapshot: text::BufferSnapshot) {
-        match Arc::get_mut(&mut self.tree_sitter_data) {
-            Some(tree_sitter_data) => tree_sitter_data.clear(snapshot),
-            None => {
-                let tree_sitter_data = TreeSitterData::new(snapshot);
-                self.tree_sitter_data = Arc::new(tree_sitter_data)
-            }
-        }
-    }
-
-    /// Called after an edit to synchronize the buffer's main parse tree with
-    /// the buffer's new underlying state.
-    ///
-    /// Locks the syntax map and interpolates the edits since the last reparse
-    /// into the foreground syntax tree.
-    ///
-    /// Then takes a stable snapshot of the syntax map before unlocking it.
-    /// The snapshot with the interpolated edits is sent to a background thread,
-    /// where we ask Tree-sitter to perform an incremental parse.
-    ///
-    /// Meanwhile, in the foreground if `may_block` is true, we block the main
-    /// thread for up to 1ms waiting on the parse to complete. As soon as it
-    /// completes, we proceed synchronously, unless a 1ms timeout elapses.
-    ///
-    /// If we time out waiting on the parse, we spawn a second task waiting
-    /// until the parse does complete and return with the interpolated tree still
-    /// in the foreground. When the background parse completes, call back into
-    /// the main thread and assign the foreground parse state.
-    ///
-    /// If the buffer or grammar changed since the start of the background parse,
-    /// initiate an additional reparse recursively. To avoid concurrent parses
-    /// for the same buffer, we only initiate a new parse if we are not already
-    /// parsing in the background.
-    pub fn reparse(&mut self, cx: &mut Context<Self>, may_block: bool) {
-        if self.text.version() != *self.tree_sitter_data.version() {
-            self.invalidate_tree_sitter_data(self.text.snapshot());
-        }
-        if self.reparse.is_some() {
-            return;
-        }
-        let language = if let Some(language) = self.language.clone() {
-            language
-        } else {
-            return;
-        };
-
-        let text = self.text_snapshot();
-        let parsed_version = self.version();
-
-        let mut syntax_map = self.syntax_map.lock();
-        syntax_map.interpolate(&text);
-        let language_registry = syntax_map.language_registry();
-        let mut syntax_snapshot = syntax_map.snapshot();
-        drop(syntax_map);
-
-        let parse_task = cx.background_spawn({
-            let language = language.clone();
-            let language_registry = language_registry.clone();
-            async move {
-                syntax_snapshot.reparse(&text, language_registry, language);
-                syntax_snapshot
-            }
-        });
-
-        self.parse_status.0.send(ParseStatus::Parsing).unwrap();
-        if may_block {
-            match cx
-                .background_executor()
-                .block_with_timeout(self.sync_parse_timeout, parse_task)
-            {
-                Ok(new_syntax_snapshot) => {
-                    self.did_finish_parsing(new_syntax_snapshot, cx);
-                    self.reparse = None;
-                }
-                Err(parse_task) => {
-                    self.reparse = Some(cx.spawn(async move |this, cx| {
-                        let new_syntax_map = cx.background_spawn(parse_task).await;
-                        this.update(cx, move |this, cx| {
-                            let grammar_changed = || {
-                                this.language.as_ref().is_none_or(|current_language| {
-                                    !Arc::ptr_eq(&language, current_language)
-                                })
-                            };
-                            let language_registry_changed = || {
-                                new_syntax_map.contains_unknown_injections()
-                                    && language_registry.is_some_and(|registry| {
-                                        registry.version()
-                                            != new_syntax_map.language_registry_version()
-                                    })
-                            };
-                            let parse_again = this.version.changed_since(&parsed_version)
-                                || language_registry_changed()
-                                || grammar_changed();
-                            this.did_finish_parsing(new_syntax_map, cx);
-                            this.reparse = None;
-                            if parse_again {
-                                this.reparse(cx, false);
-                            }
-                        })
-                        .ok();
-                    }));
-                }
-            }
-        } else {
-            self.reparse = Some(cx.spawn(async move |this, cx| {
-                let new_syntax_map = cx.background_spawn(parse_task).await;
-                this.update(cx, move |this, cx| {
-                    let grammar_changed = || {
-                        this.language.as_ref().is_none_or(|current_language| {
-                            !Arc::ptr_eq(&language, current_language)
-                        })
-                    };
-                    let language_registry_changed = || {
-                        new_syntax_map.contains_unknown_injections()
-                            && language_registry.is_some_and(|registry| {
-                                registry.version() != new_syntax_map.language_registry_version()
-                            })
-                    };
-                    let parse_again = this.version.changed_since(&parsed_version)
-                        || language_registry_changed()
-                        || grammar_changed();
-                    this.did_finish_parsing(new_syntax_map, cx);
-                    this.reparse = None;
-                    if parse_again {
-                        this.reparse(cx, false);
-                    }
-                })
-                .ok();
-            }));
-        }
-    }
-
-    fn did_finish_parsing(&mut self, syntax_snapshot: SyntaxSnapshot, cx: &mut Context<Self>) {
-        self.was_changed();
-        self.non_text_state_update_count += 1;
-        self.syntax_map.lock().did_parse(syntax_snapshot);
-        self.request_autoindent(cx);
-        self.parse_status.0.send(ParseStatus::Idle).unwrap();
-        if self.text.version() != *self.tree_sitter_data.version() {
-            self.invalidate_tree_sitter_data(self.text.snapshot());
-        }
-        cx.emit(BufferEvent::Reparsed);
-        cx.notify();
-    }
-
-    pub fn parse_status(&self) -> watch::Receiver<ParseStatus> {
-        self.parse_status.1.clone()
-    }
-
-    /// Wait until the buffer is no longer parsing
-    pub fn parsing_idle(&self) -> impl Future<Output = ()> + use<> {
-        let mut parse_status = self.parse_status();
-        async move {
-            while *parse_status.borrow() != ParseStatus::Idle {
-                if parse_status.changed().await.is_err() {
-                    break;
-                }
-            }
-        }
-    }
-
-    /// Assign to the buffer a set of diagnostics created by a given language server.
-    pub fn update_diagnostics(
-        &mut self,
-        server_id: LanguageServerId,
-        diagnostics: DiagnosticSet,
-        cx: &mut Context<Self>,
-    ) {
-        let lamport_timestamp = self.text.lamport_clock.tick();
-        let op = Operation::UpdateDiagnostics {
-            server_id,
-            diagnostics: diagnostics.iter().cloned().collect(),
-            lamport_timestamp,
-        };
-
-        self.apply_diagnostic_update(server_id, diagnostics, lamport_timestamp, cx);
-        self.send_operation(op, true, cx);
-    }
-
-    pub fn buffer_diagnostics(
-        &self,
-        for_server: Option<LanguageServerId>,
-    ) -> Vec<&DiagnosticEntry<Anchor>> {
-        match for_server {
-            Some(server_id) => match self.diagnostics.binary_search_by_key(&server_id, |v| v.0) {
-                Ok(idx) => self.diagnostics[idx].1.iter().collect(),
-                Err(_) => Vec::new(),
-            },
-            None => self
-                .diagnostics
-                .iter()
-                .flat_map(|(_, diagnostic_set)| diagnostic_set.iter())
-                .collect(),
-        }
-    }
-
-    fn request_autoindent(&mut self, cx: &mut Context<Self>) {
-        if let Some(indent_sizes) = self.compute_autoindents() {
-            let indent_sizes = cx.background_spawn(indent_sizes);
-            match cx
-                .background_executor()
-                .block_with_timeout(Duration::from_micros(500), indent_sizes)
-            {
-                Ok(indent_sizes) => self.apply_autoindents(indent_sizes, cx),
-                Err(indent_sizes) => {
-                    self.pending_autoindent = Some(cx.spawn(async move |this, cx| {
-                        let indent_sizes = indent_sizes.await;
-                        this.update(cx, |this, cx| {
-                            this.apply_autoindents(indent_sizes, cx);
-                        })
-                        .ok();
-                    }));
-                }
-            }
-        } else {
-            self.autoindent_requests.clear();
-            for tx in self.wait_for_autoindent_txs.drain(..) {
-                tx.send(()).ok();
-            }
-        }
-    }
-
-    fn compute_autoindents(
-        &self,
-    ) -> Option<impl Future<Output = BTreeMap<u32, IndentSize>> + use<>> {
-        let max_rows_between_yields = 100;
-        let snapshot = self.snapshot();
-        if snapshot.syntax.is_empty() || self.autoindent_requests.is_empty() {
-            return None;
-        }
-
-        let autoindent_requests = self.autoindent_requests.clone();
-        Some(async move {
-            let mut indent_sizes = BTreeMap::<u32, (IndentSize, bool)>::new();
-            for request in autoindent_requests {
-                // Resolve each edited range to its row in the current buffer and in the
-                // buffer before this batch of edits.
-                let mut row_ranges = Vec::new();
-                let mut old_to_new_rows = BTreeMap::new();
-                let mut language_indent_sizes_by_new_row = Vec::new();
-                for entry in &request.entries {
-                    let position = entry.range.start;
-                    let new_row = position.to_point(&snapshot).row;
-                    let new_end_row = entry.range.end.to_point(&snapshot).row + 1;
-                    language_indent_sizes_by_new_row.push((new_row, entry.indent_size));
-
-                    if !entry.first_line_is_new {
-                        let old_row = position.to_point(&request.before_edit).row;
-                        old_to_new_rows.insert(old_row, new_row);
-                    }
-                    row_ranges.push((new_row..new_end_row, entry.original_indent_column));
-                }
-
-                // Build a map containing the suggested indentation for each of the edited lines
-                // with respect to the state of the buffer before these edits. This map is keyed
-                // by the rows for these lines in the current state of the buffer.
-                let mut old_suggestions = BTreeMap::<u32, (IndentSize, bool)>::default();
-                let old_edited_ranges =
-                    contiguous_ranges(old_to_new_rows.keys().copied(), max_rows_between_yields);
-                let mut language_indent_sizes = language_indent_sizes_by_new_row.iter().peekable();
-                let mut language_indent_size = IndentSize::default();
-                for old_edited_range in old_edited_ranges {
-                    let suggestions = request
-                        .before_edit
-                        .suggest_autoindents(old_edited_range.clone())
-                        .into_iter()
-                        .flatten();
-                    for (old_row, suggestion) in old_edited_range.zip(suggestions) {
-                        if let Some(suggestion) = suggestion {
-                            let new_row = *old_to_new_rows.get(&old_row).unwrap();
-
-                            // Find the indent size based on the language for this row.
-                            while let Some((row, size)) = language_indent_sizes.peek() {
-                                if *row > new_row {
-                                    break;
-                                }
-                                language_indent_size = *size;
-                                language_indent_sizes.next();
-                            }
-
-                            let suggested_indent = old_to_new_rows
-                                .get(&suggestion.basis_row)
-                                .and_then(|from_row| {
-                                    Some(old_suggestions.get(from_row).copied()?.0)
-                                })
-                                .unwrap_or_else(|| {
-                                    request
-                                        .before_edit
-                                        .indent_size_for_line(suggestion.basis_row)
-                                })
-                                .with_delta(suggestion.delta, language_indent_size);
-                            old_suggestions
-                                .insert(new_row, (suggested_indent, suggestion.within_error));
-                        }
-                    }
-                    yield_now().await;
-                }
-
-                // Compute new suggestions for each line, but only include them in the result
-                // if they differ from the old suggestion for that line.
-                let mut language_indent_sizes = language_indent_sizes_by_new_row.iter().peekable();
-                let mut language_indent_size = IndentSize::default();
-                for (row_range, original_indent_column) in row_ranges {
-                    let new_edited_row_range = if request.is_block_mode {
-                        row_range.start..row_range.start + 1
-                    } else {
-                        row_range.clone()
-                    };
-
-                    let suggestions = snapshot
-                        .suggest_autoindents(new_edited_row_range.clone())
-                        .into_iter()
-                        .flatten();
-                    for (new_row, suggestion) in new_edited_row_range.zip(suggestions) {
-                        if let Some(suggestion) = suggestion {
-                            // Find the indent size based on the language for this row.
-                            while let Some((row, size)) = language_indent_sizes.peek() {
-                                if *row > new_row {
-                                    break;
-                                }
-                                language_indent_size = *size;
-                                language_indent_sizes.next();
-                            }
-
-                            let suggested_indent = indent_sizes
-                                .get(&suggestion.basis_row)
-                                .copied()
-                                .map(|e| e.0)
-                                .unwrap_or_else(|| {
-                                    snapshot.indent_size_for_line(suggestion.basis_row)
-                                })
-                                .with_delta(suggestion.delta, language_indent_size);
-
-                            if old_suggestions.get(&new_row).is_none_or(
-                                |(old_indentation, was_within_error)| {
-                                    suggested_indent != *old_indentation
-                                        && (!suggestion.within_error || *was_within_error)
-                                },
-                            ) {
-                                indent_sizes.insert(
-                                    new_row,
-                                    (suggested_indent, request.ignore_empty_lines),
-                                );
-                            }
-                        }
-                    }
-
-                    if let (true, Some(original_indent_column)) =
-                        (request.is_block_mode, original_indent_column)
-                    {
-                        let new_indent =
-                            if let Some((indent, _)) = indent_sizes.get(&row_range.start) {
-                                *indent
-                            } else {
-                                snapshot.indent_size_for_line(row_range.start)
-                            };
-                        let delta = new_indent.len as i64 - original_indent_column as i64;
-                        if delta != 0 {
-                            for row in row_range.skip(1) {
-                                indent_sizes.entry(row).or_insert_with(|| {
-                                    let mut size = snapshot.indent_size_for_line(row);
-                                    if size.kind == new_indent.kind {
-                                        match delta.cmp(&0) {
-                                            Ordering::Greater => size.len += delta as u32,
-                                            Ordering::Less => {
-                                                size.len = size.len.saturating_sub(-delta as u32)
-                                            }
-                                            Ordering::Equal => {}
-                                        }
-                                    }
-                                    (size, request.ignore_empty_lines)
-                                });
-                            }
-                        }
-                    }
-
-                    yield_now().await;
-                }
-            }
-
-            indent_sizes
-                .into_iter()
-                .filter_map(|(row, (indent, ignore_empty_lines))| {
-                    if ignore_empty_lines && snapshot.line_len(row) == 0 {
-                        None
-                    } else {
-                        Some((row, indent))
-                    }
-                })
-                .collect()
-        })
-    }
-
-    fn apply_autoindents(
-        &mut self,
-        indent_sizes: BTreeMap<u32, IndentSize>,
-        cx: &mut Context<Self>,
-    ) {
-        self.autoindent_requests.clear();
-        for tx in self.wait_for_autoindent_txs.drain(..) {
-            tx.send(()).ok();
-        }
-
-        let edits: Vec<_> = indent_sizes
-            .into_iter()
-            .filter_map(|(row, indent_size)| {
-                let current_size = indent_size_for_line(self, row);
-                Self::edit_for_indent_size_adjustment(row, current_size, indent_size)
-            })
-            .collect();
-
-        let preserve_preview = self.preserve_preview();
-        self.edit(edits, None, cx);
-        if preserve_preview {
-            self.refresh_preview();
-        }
-    }
-
-    /// Create a minimal edit that will cause the given row to be indented
-    /// with the given size. After applying this edit, the length of the line
-    /// will always be at least `new_size.len`.
-    pub fn edit_for_indent_size_adjustment(
-        row: u32,
-        current_size: IndentSize,
-        new_size: IndentSize,
-    ) -> Option<(Range<Point>, String)> {
-        if new_size.kind == current_size.kind {
-            match new_size.len.cmp(&current_size.len) {
-                Ordering::Greater => {
-                    let point = Point::new(row, 0);
-                    Some((
-                        point..point,
-                        iter::repeat(new_size.char())
-                            .take((new_size.len - current_size.len) as usize)
-                            .collect::<String>(),
-                    ))
-                }
-
-                Ordering::Less => Some((
-                    Point::new(row, 0)..Point::new(row, current_size.len - new_size.len),
-                    String::new(),
-                )),
-
-                Ordering::Equal => None,
-            }
-        } else {
-            Some((
-                Point::new(row, 0)..Point::new(row, current_size.len),
-                iter::repeat(new_size.char())
-                    .take(new_size.len as usize)
-                    .collect::<String>(),
-            ))
-        }
-    }
-
-    /// Spawns a background task that asynchronously computes a `Diff` between the buffer's text
-    /// and the given new text.
-    pub fn diff(&self, mut new_text: String, cx: &App) -> Task<Diff> {
-        let old_text = self.as_rope().clone();
-        let base_version = self.version();
-        cx.background_executor()
-            .spawn_labeled(*BUFFER_DIFF_TASK, async move {
-                let old_text = old_text.to_string();
-                let line_ending = LineEnding::detect(&new_text);
-                LineEnding::normalize(&mut new_text);
-                let edits = text_diff(&old_text, &new_text);
-                Diff {
-                    base_version,
-                    line_ending,
-                    edits,
-                }
-            })
-    }
-
-    /// Spawns a background task that searches the buffer for any whitespace
-    /// at the ends of a lines, and returns a `Diff` that removes that whitespace.
-    pub fn remove_trailing_whitespace(&self, cx: &App) -> Task<Diff> {
-        let old_text = self.as_rope().clone();
-        let line_ending = self.line_ending();
-        let base_version = self.version();
-        cx.background_spawn(async move {
-            let ranges = trailing_whitespace_ranges(&old_text);
-            let empty = Arc::<str>::from("");
-            Diff {
-                base_version,
-                line_ending,
-                edits: ranges
-                    .into_iter()
-                    .map(|range| (range, empty.clone()))
-                    .collect(),
-            }
-        })
-    }
-
-    /// Ensures that the buffer ends with a single newline character, and
-    /// no other whitespace. Skips if the buffer is empty.
-    pub fn ensure_final_newline(&mut self, cx: &mut Context<Self>) {
-        let len = self.len();
-        if len == 0 {
-            return;
-        }
-        let mut offset = len;
-        for chunk in self.as_rope().reversed_chunks_in_range(0..len) {
-            let non_whitespace_len = chunk
-                .trim_end_matches(|c: char| c.is_ascii_whitespace())
-                .len();
-            offset -= chunk.len();
-            offset += non_whitespace_len;
-            if non_whitespace_len != 0 {
-                if offset == len - 1 && chunk.get(non_whitespace_len..) == Some("\n") {
-                    return;
-                }
-                break;
-            }
-        }
-        self.edit([(offset..len, "\n")], None, cx);
-    }
-
-    /// Applies a diff to the buffer. If the buffer has changed since the given diff was
-    /// calculated, then adjust the diff to account for those changes, and discard any
-    /// parts of the diff that conflict with those changes.
-    pub fn apply_diff(&mut self, diff: Diff, cx: &mut Context<Self>) -> Option<TransactionId> {
-        let snapshot = self.snapshot();
-        let mut edits_since = snapshot.edits_since::<usize>(&diff.base_version).peekable();
-        let mut delta = 0;
-        let adjusted_edits = diff.edits.into_iter().filter_map(|(range, new_text)| {
-            while let Some(edit_since) = edits_since.peek() {
-                // If the edit occurs after a diff hunk, then it does not
-                // affect that hunk.
-                if edit_since.old.start > range.end {
-                    break;
-                }
-                // If the edit precedes the diff hunk, then adjust the hunk
-                // to reflect the edit.
-                else if edit_since.old.end < range.start {
-                    delta += edit_since.new_len() as i64 - edit_since.old_len() as i64;
-                    edits_since.next();
-                }
-                // If the edit intersects a diff hunk, then discard that hunk.
-                else {
-                    return None;
-                }
-            }
-
-            let start = (range.start as i64 + delta) as usize;
-            let end = (range.end as i64 + delta) as usize;
-            Some((start..end, new_text))
-        });
-
-        self.start_transaction();
-        self.text.set_line_ending(diff.line_ending);
-        self.edit(adjusted_edits, None, cx);
-        self.end_transaction(cx)
-    }
-
-    pub fn has_unsaved_edits(&self) -> bool {
-        let (last_version, has_unsaved_edits) = self.has_unsaved_edits.take();
-
-        if last_version == self.version {
-            self.has_unsaved_edits
-                .set((last_version, has_unsaved_edits));
-            return has_unsaved_edits;
-        }
-
-        let has_edits = self.has_edits_since(&self.saved_version);
-        self.has_unsaved_edits
-            .set((self.version.clone(), has_edits));
-        has_edits
-    }
-
-    /// Checks if the buffer has unsaved changes.
-    pub fn is_dirty(&self) -> bool {
-        if self.capability == Capability::ReadOnly {
-            return false;
-        }
-        if self.has_conflict {
-            return true;
-        }
-        match self.file.as_ref().map(|f| f.disk_state()) {
-            Some(DiskState::New) | Some(DiskState::Deleted) => {
-                !self.is_empty() && self.has_unsaved_edits()
-            }
-            _ => self.has_unsaved_edits(),
-        }
-    }
-
-    /// Marks the buffer as having a conflict regardless of current buffer state.
-    pub fn set_conflict(&mut self) {
-        self.has_conflict = true;
-    }
-
-    /// Checks if the buffer and its file have both changed since the buffer
-    /// was last saved or reloaded.
-    pub fn has_conflict(&self) -> bool {
-        if self.has_conflict {
-            return true;
-        }
-        let Some(file) = self.file.as_ref() else {
-            return false;
-        };
-        match file.disk_state() {
-            DiskState::New => false,
-            DiskState::Present { mtime } => match self.saved_mtime {
-                Some(saved_mtime) => {
-                    mtime.bad_is_greater_than(saved_mtime) && self.has_unsaved_edits()
-                }
-                None => true,
-            },
-            DiskState::Deleted => false,
-        }
-    }
-
-    /// Gets a [`Subscription`] that tracks all of the changes to the buffer's text.
-    pub fn subscribe(&mut self) -> Subscription<usize> {
-        self.text.subscribe()
-    }
-
-    /// Adds a bit to the list of bits that are set when the buffer's text changes.
-    ///
-    /// This allows downstream code to check if the buffer's text has changed without
-    /// waiting for an effect cycle, which would be required if using eents.
-    pub fn record_changes(&mut self, bit: rc::Weak<Cell<bool>>) {
-        if let Err(ix) = self
-            .change_bits
-            .binary_search_by_key(&rc::Weak::as_ptr(&bit), rc::Weak::as_ptr)
-        {
-            self.change_bits.insert(ix, bit);
-        }
-    }
-
-    /// Set the change bit for all "listeners".
-    fn was_changed(&mut self) {
-        self.change_bits.retain(|change_bit| {
-            change_bit
-                .upgrade()
-                .inspect(|bit| {
-                    _ = bit.replace(true);
-                })
-                .is_some()
-        });
-    }
-
-    /// Starts a transaction, if one is not already in-progress. When undoing or
-    /// redoing edits, all of the edits performed within a transaction are undone
-    /// or redone together.
-    pub fn start_transaction(&mut self) -> Option<TransactionId> {
-        self.start_transaction_at(Instant::now())
-    }
-
-    /// Starts a transaction, providing the current time. Subsequent transactions
-    /// that occur within a short period of time will be grouped together. This
-    /// is controlled by the buffer's undo grouping duration.
-    pub fn start_transaction_at(&mut self, now: Instant) -> Option<TransactionId> {
-        self.transaction_depth += 1;
-        if self.was_dirty_before_starting_transaction.is_none() {
-            self.was_dirty_before_starting_transaction = Some(self.is_dirty());
-        }
-        self.text.start_transaction_at(now)
-    }
-
-    /// Terminates the current transaction, if this is the outermost transaction.
-    pub fn end_transaction(&mut self, cx: &mut Context<Self>) -> Option<TransactionId> {
-        self.end_transaction_at(Instant::now(), cx)
-    }
-
-    /// Terminates the current transaction, providing the current time. Subsequent transactions
-    /// that occur within a short period of time will be grouped together. This
-    /// is controlled by the buffer's undo grouping duration.
-    pub fn end_transaction_at(
-        &mut self,
-        now: Instant,
-        cx: &mut Context<Self>,
-    ) -> Option<TransactionId> {
-        assert!(self.transaction_depth > 0);
-        self.transaction_depth -= 1;
-        let was_dirty = if self.transaction_depth == 0 {
-            self.was_dirty_before_starting_transaction.take().unwrap()
-        } else {
-            false
-        };
-        if let Some((transaction_id, start_version)) = self.text.end_transaction_at(now) {
-            self.did_edit(&start_version, was_dirty, cx);
-            Some(transaction_id)
-        } else {
-            None
-        }
-    }
-
-    /// Manually add a transaction to the buffer's undo history.
-    pub fn push_transaction(&mut self, transaction: Transaction, now: Instant) {
-        self.text.push_transaction(transaction, now);
-    }
-
-    /// Differs from `push_transaction` in that it does not clear the redo
-    /// stack. Intended to be used to create a parent transaction to merge
-    /// potential child transactions into.
-    ///
-    /// The caller is responsible for removing it from the undo history using
-    /// `forget_transaction` if no edits are merged into it. Otherwise, if edits
-    /// are merged into this transaction, the caller is responsible for ensuring
-    /// the redo stack is cleared. The easiest way to ensure the redo stack is
-    /// cleared is to create transactions with the usual `start_transaction` and
-    /// `end_transaction` methods and merging the resulting transactions into
-    /// the transaction created by this method
-    pub fn push_empty_transaction(&mut self, now: Instant) -> TransactionId {
-        self.text.push_empty_transaction(now)
-    }
-
-    /// Prevent the last transaction from being grouped with any subsequent transactions,
-    /// even if they occur with the buffer's undo grouping duration.
-    pub fn finalize_last_transaction(&mut self) -> Option<&Transaction> {
-        self.text.finalize_last_transaction()
-    }
-
-    /// Manually group all changes since a given transaction.
-    pub fn group_until_transaction(&mut self, transaction_id: TransactionId) {
-        self.text.group_until_transaction(transaction_id);
-    }
-
-    /// Manually remove a transaction from the buffer's undo history
-    pub fn forget_transaction(&mut self, transaction_id: TransactionId) -> Option<Transaction> {
-        self.text.forget_transaction(transaction_id)
-    }
-
-    /// Retrieve a transaction from the buffer's undo history
-    pub fn get_transaction(&self, transaction_id: TransactionId) -> Option<&Transaction> {
-        self.text.get_transaction(transaction_id)
-    }
-
-    /// Manually merge two transactions in the buffer's undo history.
-    pub fn merge_transactions(&mut self, transaction: TransactionId, destination: TransactionId) {
-        self.text.merge_transactions(transaction, destination);
-    }
-
-    /// Waits for the buffer to receive operations with the given timestamps.
-    pub fn wait_for_edits<It: IntoIterator<Item = clock::Lamport>>(
-        &mut self,
-        edit_ids: It,
-    ) -> impl Future<Output = Result<()>> + use<It> {
-        self.text.wait_for_edits(edit_ids)
-    }
-
-    /// Waits for the buffer to receive the operations necessary for resolving the given anchors.
-    pub fn wait_for_anchors<It: IntoIterator<Item = Anchor>>(
-        &mut self,
-        anchors: It,
-    ) -> impl 'static + Future<Output = Result<()>> + use<It> {
-        self.text.wait_for_anchors(anchors)
-    }
-
-    /// Waits for the buffer to receive operations up to the given version.
-    pub fn wait_for_version(
-        &mut self,
-        version: clock::Global,
-    ) -> impl Future<Output = Result<()>> + use<> {
-        self.text.wait_for_version(version)
-    }
-
-    /// Forces all futures returned by [`Buffer::wait_for_version`], [`Buffer::wait_for_edits`], or
-    /// [`Buffer::wait_for_version`] to resolve with an error.
-    pub fn give_up_waiting(&mut self) {
-        self.text.give_up_waiting();
-    }
-
-    pub fn wait_for_autoindent_applied(&mut self) -> Option<oneshot::Receiver<()>> {
-        let mut rx = None;
-        if !self.autoindent_requests.is_empty() {
-            let channel = oneshot::channel();
-            self.wait_for_autoindent_txs.push(channel.0);
-            rx = Some(channel.1);
-        }
-        rx
-    }
-
-    /// Stores a set of selections that should be broadcasted to all of the buffer's replicas.
-    pub fn set_active_selections(
-        &mut self,
-        selections: Arc<[Selection<Anchor>]>,
-        line_mode: bool,
-        cursor_shape: CursorShape,
-        cx: &mut Context<Self>,
-    ) {
-        let lamport_timestamp = self.text.lamport_clock.tick();
-        self.remote_selections.insert(
-            self.text.replica_id(),
-            SelectionSet {
-                selections: selections.clone(),
-                lamport_timestamp,
-                line_mode,
-                cursor_shape,
-            },
-        );
-        self.send_operation(
-            Operation::UpdateSelections {
-                selections,
-                line_mode,
-                lamport_timestamp,
-                cursor_shape,
-            },
-            true,
-            cx,
-        );
-        self.non_text_state_update_count += 1;
-        cx.notify();
-    }
-
-    /// Clears the selections, so that other replicas of the buffer do not see any selections for
-    /// this replica.
-    pub fn remove_active_selections(&mut self, cx: &mut Context<Self>) {
-        if self
-            .remote_selections
-            .get(&self.text.replica_id())
-            .is_none_or(|set| !set.selections.is_empty())
-        {
-            self.set_active_selections(Arc::default(), false, Default::default(), cx);
-        }
-    }
-
-    pub fn set_agent_selections(
-        &mut self,
-        selections: Arc<[Selection<Anchor>]>,
-        line_mode: bool,
-        cursor_shape: CursorShape,
-        cx: &mut Context<Self>,
-    ) {
-        let lamport_timestamp = self.text.lamport_clock.tick();
-        self.remote_selections.insert(
-            ReplicaId::AGENT,
-            SelectionSet {
-                selections,
-                lamport_timestamp,
-                line_mode,
-                cursor_shape,
-            },
-        );
-        self.non_text_state_update_count += 1;
-        cx.notify();
-    }
-
-    pub fn remove_agent_selections(&mut self, cx: &mut Context<Self>) {
-        self.set_agent_selections(Arc::default(), false, Default::default(), cx);
-    }
-
-    /// Replaces the buffer's entire text.
-    pub fn set_text<T>(&mut self, text: T, cx: &mut Context<Self>) -> Option<clock::Lamport>
-    where
-        T: Into<Arc<str>>,
-    {
-        self.autoindent_requests.clear();
-        self.edit([(0..self.len(), text)], None, cx)
-    }
-
-    /// Appends the given text to the end of the buffer.
-    pub fn append<T>(&mut self, text: T, cx: &mut Context<Self>) -> Option<clock::Lamport>
-    where
-        T: Into<Arc<str>>,
-    {
-        self.edit([(self.len()..self.len(), text)], None, cx)
-    }
-
-    /// Applies the given edits to the buffer. Each edit is specified as a range of text to
-    /// delete, and a string of text to insert at that location.
-    ///
-    /// If an [`AutoindentMode`] is provided, then the buffer will enqueue an auto-indent
-    /// request for the edited ranges, which will be processed when the buffer finishes
-    /// parsing.
-    ///
-    /// Parsing takes place at the end of a transaction, and may compute synchronously
-    /// or asynchronously, depending on the changes.
-    pub fn edit<I, S, T>(
-        &mut self,
-        edits_iter: I,
-        autoindent_mode: Option<AutoindentMode>,
-        cx: &mut Context<Self>,
-    ) -> Option<clock::Lamport>
-    where
-        I: IntoIterator<Item = (Range<S>, T)>,
-        S: ToOffset,
-        T: Into<Arc<str>>,
-    {
-        // Skip invalid edits and coalesce contiguous ones.
-        let mut edits: Vec<(Range<usize>, Arc<str>)> = Vec::new();
-
-        for (range, new_text) in edits_iter {
-            let mut range = range.start.to_offset(self)..range.end.to_offset(self);
-
-            if range.start > range.end {
-                mem::swap(&mut range.start, &mut range.end);
-            }
-            let new_text = new_text.into();
-            if !new_text.is_empty() || !range.is_empty() {
-                if let Some((prev_range, prev_text)) = edits.last_mut()
-                    && prev_range.end >= range.start
-                {
-                    prev_range.end = cmp::max(prev_range.end, range.end);
-                    *prev_text = format!("{prev_text}{new_text}").into();
-                } else {
-                    edits.push((range, new_text));
-                }
-            }
-        }
-        if edits.is_empty() {
-            return None;
-        }
-
-        self.start_transaction();
-        self.pending_autoindent.take();
-        let autoindent_request = autoindent_mode
-            .and_then(|mode| self.language.as_ref().map(|_| (self.snapshot(), mode)));
-
-        let edit_operation = self.text.edit(edits.iter().cloned());
-        let edit_id = edit_operation.timestamp();
-
-        if let Some((before_edit, mode)) = autoindent_request {
-            let mut delta = 0isize;
-            let mut previous_setting = None;
-            let entries: Vec<_> = edits
-                .into_iter()
-                .enumerate()
-                .zip(&edit_operation.as_edit().unwrap().new_text)
-                .filter(|((_, (range, _)), _)| {
-                    let language = before_edit.language_at(range.start);
-                    let language_id = language.map(|l| l.id());
-                    if let Some((cached_language_id, auto_indent)) = previous_setting
-                        && cached_language_id == language_id
-                    {
-                        auto_indent
-                    } else {
-                        // The auto-indent setting is not present in editorconfigs, hence
-                        // we can avoid passing the file here.
-                        let auto_indent =
-                            language_settings(language.map(|l| l.name()), None, cx).auto_indent;
-                        previous_setting = Some((language_id, auto_indent));
-                        auto_indent
-                    }
-                })
-                .map(|((ix, (range, _)), new_text)| {
-                    let new_text_length = new_text.len();
-                    let old_start = range.start.to_point(&before_edit);
-                    let new_start = (delta + range.start as isize) as usize;
-                    let range_len = range.end - range.start;
-                    delta += new_text_length as isize - range_len as isize;
-
-                    // Decide what range of the insertion to auto-indent, and whether
-                    // the first line of the insertion should be considered a newly-inserted line
-                    // or an edit to an existing line.
-                    let mut range_of_insertion_to_indent = 0..new_text_length;
-                    let mut first_line_is_new = true;
-
-                    let old_line_start = before_edit.indent_size_for_line(old_start.row).len;
-                    let old_line_end = before_edit.line_len(old_start.row);
-
-                    if old_start.column > old_line_start {
-                        first_line_is_new = false;
-                    }
-
-                    if !new_text.contains('\n')
-                        && (old_start.column + (range_len as u32) < old_line_end
-                            || old_line_end == old_line_start)
-                    {
-                        first_line_is_new = false;
-                    }
-
-                    // When inserting text starting with a newline, avoid auto-indenting the
-                    // previous line.
-                    if new_text.starts_with('\n') {
-                        range_of_insertion_to_indent.start += 1;
-                        first_line_is_new = true;
-                    }
-
-                    let mut original_indent_column = None;
-                    if let AutoindentMode::Block {
-                        original_indent_columns,
-                    } = &mode
-                    {
-                        original_indent_column = Some(if new_text.starts_with('\n') {
-                            indent_size_for_text(
-                                new_text[range_of_insertion_to_indent.clone()].chars(),
-                            )
-                            .len
-                        } else {
-                            original_indent_columns
-                                .get(ix)
-                                .copied()
-                                .flatten()
-                                .unwrap_or_else(|| {
-                                    indent_size_for_text(
-                                        new_text[range_of_insertion_to_indent.clone()].chars(),
-                                    )
-                                    .len
-                                })
-                        });
-
-                        // Avoid auto-indenting the line after the edit.
-                        if new_text[range_of_insertion_to_indent.clone()].ends_with('\n') {
-                            range_of_insertion_to_indent.end -= 1;
-                        }
-                    }
-
-                    AutoindentRequestEntry {
-                        first_line_is_new,
-                        original_indent_column,
-                        indent_size: before_edit.language_indent_size_at(range.start, cx),
-                        range: self.anchor_before(new_start + range_of_insertion_to_indent.start)
-                            ..self.anchor_after(new_start + range_of_insertion_to_indent.end),
-                    }
-                })
-                .collect();
-
-            if !entries.is_empty() {
-                self.autoindent_requests.push(Arc::new(AutoindentRequest {
-                    before_edit,
-                    entries,
-                    is_block_mode: matches!(mode, AutoindentMode::Block { .. }),
-                    ignore_empty_lines: false,
-                }));
-            }
-        }
-
-        self.end_transaction(cx);
-        self.send_operation(Operation::Buffer(edit_operation), true, cx);
-        Some(edit_id)
-    }
-
-    fn did_edit(&mut self, old_version: &clock::Global, was_dirty: bool, cx: &mut Context<Self>) {
-        self.was_changed();
-
-        if self.edits_since::<usize>(old_version).next().is_none() {
-            return;
-        }
-
-        self.reparse(cx, true);
-        cx.emit(BufferEvent::Edited);
-        if was_dirty != self.is_dirty() {
-            cx.emit(BufferEvent::DirtyChanged);
-        }
-        cx.notify();
-    }
-
-    pub fn autoindent_ranges<I, T>(&mut self, ranges: I, cx: &mut Context<Self>)
-    where
-        I: IntoIterator<Item = Range<T>>,
-        T: ToOffset + Copy,
-    {
-        let before_edit = self.snapshot();
-        let entries = ranges
-            .into_iter()
-            .map(|range| AutoindentRequestEntry {
-                range: before_edit.anchor_before(range.start)..before_edit.anchor_after(range.end),
-                first_line_is_new: true,
-                indent_size: before_edit.language_indent_size_at(range.start, cx),
-                original_indent_column: None,
-            })
-            .collect();
-        self.autoindent_requests.push(Arc::new(AutoindentRequest {
-            before_edit,
-            entries,
-            is_block_mode: false,
-            ignore_empty_lines: true,
-        }));
-        self.request_autoindent(cx);
-    }
-
-    // Inserts newlines at the given position to create an empty line, returning the start of the new line.
-    // You can also request the insertion of empty lines above and below the line starting at the returned point.
-    pub fn insert_empty_line(
-        &mut self,
-        position: impl ToPoint,
-        space_above: bool,
-        space_below: bool,
-        cx: &mut Context<Self>,
-    ) -> Point {
-        let mut position = position.to_point(self);
-
-        self.start_transaction();
-
-        self.edit(
-            [(position..position, "\n")],
-            Some(AutoindentMode::EachLine),
-            cx,
-        );
-
-        if position.column > 0 {
-            position += Point::new(1, 0);
-        }
-
-        if !self.is_line_blank(position.row) {
-            self.edit(
-                [(position..position, "\n")],
-                Some(AutoindentMode::EachLine),
-                cx,
-            );
-        }
-
-        if space_above && position.row > 0 && !self.is_line_blank(position.row - 1) {
-            self.edit(
-                [(position..position, "\n")],
-                Some(AutoindentMode::EachLine),
-                cx,
-            );
-            position.row += 1;
-        }
-
-        if space_below
-            && (position.row == self.max_point().row || !self.is_line_blank(position.row + 1))
-        {
-            self.edit(
-                [(position..position, "\n")],
-                Some(AutoindentMode::EachLine),
-                cx,
-            );
-        }
-
-        self.end_transaction(cx);
-
-        position
-    }
-
-    /// Applies the given remote operations to the buffer.
-    pub fn apply_ops<I: IntoIterator<Item = Operation>>(&mut self, ops: I, cx: &mut Context<Self>) {
-        self.pending_autoindent.take();
-        let was_dirty = self.is_dirty();
-        let old_version = self.version.clone();
-        let mut deferred_ops = Vec::new();
-        let buffer_ops = ops
-            .into_iter()
-            .filter_map(|op| match op {
-                Operation::Buffer(op) => Some(op),
-                _ => {
-                    if self.can_apply_op(&op) {
-                        self.apply_op(op, cx);
-                    } else {
-                        deferred_ops.push(op);
-                    }
-                    None
-                }
-            })
-            .collect::<Vec<_>>();
-        for operation in buffer_ops.iter() {
-            self.send_operation(Operation::Buffer(operation.clone()), false, cx);
-        }
-        self.text.apply_ops(buffer_ops);
-        self.deferred_ops.insert(deferred_ops);
-        self.flush_deferred_ops(cx);
-        self.did_edit(&old_version, was_dirty, cx);
-        // Notify independently of whether the buffer was edited as the operations could include a
-        // selection update.
-        cx.notify();
-    }
-
-    fn flush_deferred_ops(&mut self, cx: &mut Context<Self>) {
-        let mut deferred_ops = Vec::new();
-        for op in self.deferred_ops.drain().iter().cloned() {
-            if self.can_apply_op(&op) {
-                self.apply_op(op, cx);
-            } else {
-                deferred_ops.push(op);
-            }
-        }
-        self.deferred_ops.insert(deferred_ops);
-    }
-
-    pub fn has_deferred_ops(&self) -> bool {
-        !self.deferred_ops.is_empty() || self.text.has_deferred_ops()
-    }
-
-    fn can_apply_op(&self, operation: &Operation) -> bool {
-        match operation {
-            Operation::Buffer(_) => {
-                unreachable!("buffer operations should never be applied at this layer")
-            }
-            Operation::UpdateDiagnostics {
-                diagnostics: diagnostic_set,
-                ..
-            } => diagnostic_set.iter().all(|diagnostic| {
-                self.text.can_resolve(&diagnostic.range.start)
-                    && self.text.can_resolve(&diagnostic.range.end)
-            }),
-            Operation::UpdateSelections { selections, .. } => selections
-                .iter()
-                .all(|s| self.can_resolve(&s.start) && self.can_resolve(&s.end)),
-            Operation::UpdateCompletionTriggers { .. } | Operation::UpdateLineEnding { .. } => true,
-        }
-    }
-
-    fn apply_op(&mut self, operation: Operation, cx: &mut Context<Self>) {
-        match operation {
-            Operation::Buffer(_) => {
-                unreachable!("buffer operations should never be applied at this layer")
-            }
-            Operation::UpdateDiagnostics {
-                server_id,
-                diagnostics: diagnostic_set,
-                lamport_timestamp,
-            } => {
-                let snapshot = self.snapshot();
-                self.apply_diagnostic_update(
-                    server_id,
-                    DiagnosticSet::from_sorted_entries(diagnostic_set.iter().cloned(), &snapshot),
-                    lamport_timestamp,
-                    cx,
-                );
-            }
-            Operation::UpdateSelections {
-                selections,
-                lamport_timestamp,
-                line_mode,
-                cursor_shape,
-            } => {
-                if let Some(set) = self.remote_selections.get(&lamport_timestamp.replica_id)
-                    && set.lamport_timestamp > lamport_timestamp
-                {
-                    return;
-                }
-
-                self.remote_selections.insert(
-                    lamport_timestamp.replica_id,
-                    SelectionSet {
-                        selections,
-                        lamport_timestamp,
-                        line_mode,
-                        cursor_shape,
-                    },
-                );
-                self.text.lamport_clock.observe(lamport_timestamp);
-                self.non_text_state_update_count += 1;
-            }
-            Operation::UpdateCompletionTriggers {
-                triggers,
-                lamport_timestamp,
-                server_id,
-            } => {
-                if triggers.is_empty() {
-                    self.completion_triggers_per_language_server
-                        .remove(&server_id);
-                    self.completion_triggers = self
-                        .completion_triggers_per_language_server
-                        .values()
-                        .flat_map(|triggers| triggers.iter().cloned())
-                        .collect();
-                } else {
-                    self.completion_triggers_per_language_server
-                        .insert(server_id, triggers.iter().cloned().collect());
-                    self.completion_triggers.extend(triggers);
-                }
-                self.text.lamport_clock.observe(lamport_timestamp);
-            }
-            Operation::UpdateLineEnding {
-                line_ending,
-                lamport_timestamp,
-            } => {
-                self.text.set_line_ending(line_ending);
-                self.text.lamport_clock.observe(lamport_timestamp);
-            }
-        }
-    }
-
-    fn apply_diagnostic_update(
-        &mut self,
-        server_id: LanguageServerId,
-        diagnostics: DiagnosticSet,
-        lamport_timestamp: clock::Lamport,
-        cx: &mut Context<Self>,
-    ) {
-        if lamport_timestamp > self.diagnostics_timestamp {
-            let ix = self.diagnostics.binary_search_by_key(&server_id, |e| e.0);
-            if diagnostics.is_empty() {
-                if let Ok(ix) = ix {
-                    self.diagnostics.remove(ix);
-                }
-            } else {
-                match ix {
-                    Err(ix) => self.diagnostics.insert(ix, (server_id, diagnostics)),
-                    Ok(ix) => self.diagnostics[ix].1 = diagnostics,
-                };
-            }
-            self.diagnostics_timestamp = lamport_timestamp;
-            self.non_text_state_update_count += 1;
-            self.text.lamport_clock.observe(lamport_timestamp);
-            cx.notify();
-            cx.emit(BufferEvent::DiagnosticsUpdated);
-        }
-    }
-
-    fn send_operation(&mut self, operation: Operation, is_local: bool, cx: &mut Context<Self>) {
-        self.was_changed();
-        cx.emit(BufferEvent::Operation {
-            operation,
-            is_local,
-        });
-    }
-
-    /// Removes the selections for a given peer.
-    pub fn remove_peer(&mut self, replica_id: ReplicaId, cx: &mut Context<Self>) {
-        self.remote_selections.remove(&replica_id);
-        cx.notify();
-    }
-
-    /// Undoes the most recent transaction.
-    pub fn undo(&mut self, cx: &mut Context<Self>) -> Option<TransactionId> {
-        let was_dirty = self.is_dirty();
-        let old_version = self.version.clone();
-
-        if let Some((transaction_id, operation)) = self.text.undo() {
-            self.send_operation(Operation::Buffer(operation), true, cx);
-            self.did_edit(&old_version, was_dirty, cx);
-            Some(transaction_id)
-        } else {
-            None
-        }
-    }
-
-    /// Manually undoes a specific transaction in the buffer's undo history.
-    pub fn undo_transaction(
-        &mut self,
-        transaction_id: TransactionId,
-        cx: &mut Context<Self>,
-    ) -> bool {
-        let was_dirty = self.is_dirty();
-        let old_version = self.version.clone();
-        if let Some(operation) = self.text.undo_transaction(transaction_id) {
-            self.send_operation(Operation::Buffer(operation), true, cx);
-            self.did_edit(&old_version, was_dirty, cx);
-            true
-        } else {
-            false
-        }
-    }
-
-    /// Manually undoes all changes after a given transaction in the buffer's undo history.
-    pub fn undo_to_transaction(
-        &mut self,
-        transaction_id: TransactionId,
-        cx: &mut Context<Self>,
-    ) -> bool {
-        let was_dirty = self.is_dirty();
-        let old_version = self.version.clone();
-
-        let operations = self.text.undo_to_transaction(transaction_id);
-        let undone = !operations.is_empty();
-        for operation in operations {
-            self.send_operation(Operation::Buffer(operation), true, cx);
-        }
-        if undone {
-            self.did_edit(&old_version, was_dirty, cx)
-        }
-        undone
-    }
-
-    pub fn undo_operations(&mut self, counts: HashMap<Lamport, u32>, cx: &mut Context<Buffer>) {
-        let was_dirty = self.is_dirty();
-        let operation = self.text.undo_operations(counts);
-        let old_version = self.version.clone();
-        self.send_operation(Operation::Buffer(operation), true, cx);
-        self.did_edit(&old_version, was_dirty, cx);
-    }
-
-    /// Manually redoes a specific transaction in the buffer's redo history.
-    pub fn redo(&mut self, cx: &mut Context<Self>) -> Option<TransactionId> {
-        let was_dirty = self.is_dirty();
-        let old_version = self.version.clone();
-
-        if let Some((transaction_id, operation)) = self.text.redo() {
-            self.send_operation(Operation::Buffer(operation), true, cx);
-            self.did_edit(&old_version, was_dirty, cx);
-            Some(transaction_id)
-        } else {
-            None
-        }
-    }
-
-    /// Manually undoes all changes until a given transaction in the buffer's redo history.
-    pub fn redo_to_transaction(
-        &mut self,
-        transaction_id: TransactionId,
-        cx: &mut Context<Self>,
-    ) -> bool {
-        let was_dirty = self.is_dirty();
-        let old_version = self.version.clone();
-
-        let operations = self.text.redo_to_transaction(transaction_id);
-        let redone = !operations.is_empty();
-        for operation in operations {
-            self.send_operation(Operation::Buffer(operation), true, cx);
-        }
-        if redone {
-            self.did_edit(&old_version, was_dirty, cx)
-        }
-        redone
-    }
-
-    /// Override current completion triggers with the user-provided completion triggers.
-    pub fn set_completion_triggers(
-        &mut self,
-        server_id: LanguageServerId,
-        triggers: BTreeSet<String>,
-        cx: &mut Context<Self>,
-    ) {
-        self.completion_triggers_timestamp = self.text.lamport_clock.tick();
-        if triggers.is_empty() {
-            self.completion_triggers_per_language_server
-                .remove(&server_id);
-            self.completion_triggers = self
-                .completion_triggers_per_language_server
-                .values()
-                .flat_map(|triggers| triggers.iter().cloned())
-                .collect();
-        } else {
-            self.completion_triggers_per_language_server
-                .insert(server_id, triggers.clone());
-            self.completion_triggers.extend(triggers.iter().cloned());
-        }
-        self.send_operation(
-            Operation::UpdateCompletionTriggers {
-                triggers: triggers.into_iter().collect(),
-                lamport_timestamp: self.completion_triggers_timestamp,
-                server_id,
-            },
-            true,
-            cx,
-        );
-        cx.notify();
-    }
-
-    /// Returns a list of strings which trigger a completion menu for this language.
-    /// Usually this is driven by LSP server which returns a list of trigger characters for completions.
-    pub fn completion_triggers(&self) -> &BTreeSet<String> {
-        &self.completion_triggers
-    }
-
-    /// Call this directly after performing edits to prevent the preview tab
-    /// from being dismissed by those edits. It causes `should_dismiss_preview`
-    /// to return false until there are additional edits.
-    pub fn refresh_preview(&mut self) {
-        self.preview_version = self.version.clone();
-    }
-
-    /// Whether we should preserve the preview status of a tab containing this buffer.
-    pub fn preserve_preview(&self) -> bool {
-        !self.has_edits_since(&self.preview_version)
-    }
-}
-
-#[doc(hidden)]
-#[cfg(any(test, feature = "test-support"))]
-impl Buffer {
-    pub fn edit_via_marked_text(
-        &mut self,
-        marked_string: &str,
-        autoindent_mode: Option<AutoindentMode>,
-        cx: &mut Context<Self>,
-    ) {
-        let edits = self.edits_for_marked_text(marked_string);
-        self.edit(edits, autoindent_mode, cx);
-    }
-
-    pub fn set_group_interval(&mut self, group_interval: Duration) {
-        self.text.set_group_interval(group_interval);
-    }
-
-    pub fn randomly_edit<T>(&mut self, rng: &mut T, old_range_count: usize, cx: &mut Context<Self>)
-    where
-        T: rand::Rng,
-    {
-        let mut edits: Vec<(Range<usize>, String)> = Vec::new();
-        let mut last_end = None;
-        for _ in 0..old_range_count {
-            if last_end.is_some_and(|last_end| last_end >= self.len()) {
-                break;
-            }
-
-            let new_start = last_end.map_or(0, |last_end| last_end + 1);
-            let mut range = self.random_byte_range(new_start, rng);
-            if rng.random_bool(0.2) {
-                mem::swap(&mut range.start, &mut range.end);
-            }
-            last_end = Some(range.end);
-
-            let new_text_len = rng.random_range(0..10);
-            let mut new_text: String = RandomCharIter::new(&mut *rng).take(new_text_len).collect();
-            new_text = new_text.to_uppercase();
-
-            edits.push((range, new_text));
-        }
-        log::info!("mutating buffer {:?} with {:?}", self.replica_id(), edits);
-        self.edit(edits, None, cx);
-    }
-
-    pub fn randomly_undo_redo(&mut self, rng: &mut impl rand::Rng, cx: &mut Context<Self>) {
-        let was_dirty = self.is_dirty();
-        let old_version = self.version.clone();
-
-        let ops = self.text.randomly_undo_redo(rng);
-        if !ops.is_empty() {
-            for op in ops {
-                self.send_operation(Operation::Buffer(op), true, cx);
-                self.did_edit(&old_version, was_dirty, cx);
-            }
-        }
-    }
-}
-
-impl EventEmitter<BufferEvent> for Buffer {}
-
-impl Deref for Buffer {
-    type Target = TextBuffer;
-
-    fn deref(&self) -> &Self::Target {
-        &self.text
-    }
-}
-
-impl BufferSnapshot {
-    /// Returns [`IndentSize`] for a given line that respects user settings and
-    /// language preferences.
-    pub fn indent_size_for_line(&self, row: u32) -> IndentSize {
-        indent_size_for_line(self, row)
-    }
-
-    /// Returns [`IndentSize`] for a given position that respects user settings
-    /// and language preferences.
-    pub fn language_indent_size_at<T: ToOffset>(&self, position: T, cx: &App) -> IndentSize {
-        let settings = language_settings(
-            self.language_at(position).map(|l| l.name()),
-            self.file(),
-            cx,
-        );
-        if settings.hard_tabs {
-            IndentSize::tab()
-        } else {
-            IndentSize::spaces(settings.tab_size.get())
-        }
-    }
-
-    /// Retrieve the suggested indent size for all of the given rows. The unit of indentation
-    /// is passed in as `single_indent_size`.
-    pub fn suggested_indents(
-        &self,
-        rows: impl Iterator<Item = u32>,
-        single_indent_size: IndentSize,
-    ) -> BTreeMap<u32, IndentSize> {
-        let mut result = BTreeMap::new();
-
-        for row_range in contiguous_ranges(rows, 10) {
-            let suggestions = match self.suggest_autoindents(row_range.clone()) {
-                Some(suggestions) => suggestions,
-                _ => break,
-            };
-
-            for (row, suggestion) in row_range.zip(suggestions) {
-                let indent_size = if let Some(suggestion) = suggestion {
-                    result
-                        .get(&suggestion.basis_row)
-                        .copied()
-                        .unwrap_or_else(|| self.indent_size_for_line(suggestion.basis_row))
-                        .with_delta(suggestion.delta, single_indent_size)
-                } else {
-                    self.indent_size_for_line(row)
-                };
-
-                result.insert(row, indent_size);
-            }
-        }
-
-        result
-    }
-
-    fn suggest_autoindents(
-        &self,
-        row_range: Range<u32>,
-    ) -> Option<impl Iterator<Item = Option<IndentSuggestion>> + '_> {
-        let config = &self.language.as_ref()?.config;
-        let prev_non_blank_row = self.prev_non_blank_row(row_range.start);
-
-        #[derive(Debug, Clone)]
-        struct StartPosition {
-            start: Point,
-            suffix: SharedString,
-        }
-
-        // Find the suggested indentation ranges based on the syntax tree.
-        let start = Point::new(prev_non_blank_row.unwrap_or(row_range.start), 0);
-        let end = Point::new(row_range.end, 0);
-        let range = (start..end).to_offset(&self.text);
-        let mut matches = self.syntax.matches(range.clone(), &self.text, |grammar| {
-            Some(&grammar.indents_config.as_ref()?.query)
-        });
-        let indent_configs = matches
-            .grammars()
-            .iter()
-            .map(|grammar| grammar.indents_config.as_ref().unwrap())
-            .collect::<Vec<_>>();
-
-        let mut indent_ranges = Vec::<Range<Point>>::new();
-        let mut start_positions = Vec::<StartPosition>::new();
-        let mut outdent_positions = Vec::<Point>::new();
-        while let Some(mat) = matches.peek() {
-            let mut start: Option<Point> = None;
-            let mut end: Option<Point> = None;
-
-            let config = indent_configs[mat.grammar_index];
-            for capture in mat.captures {
-                if capture.index == config.indent_capture_ix {
-                    start.get_or_insert(Point::from_ts_point(capture.node.start_position()));
-                    end.get_or_insert(Point::from_ts_point(capture.node.end_position()));
-                } else if Some(capture.index) == config.start_capture_ix {
-                    start = Some(Point::from_ts_point(capture.node.end_position()));
-                } else if Some(capture.index) == config.end_capture_ix {
-                    end = Some(Point::from_ts_point(capture.node.start_position()));
-                } else if Some(capture.index) == config.outdent_capture_ix {
-                    outdent_positions.push(Point::from_ts_point(capture.node.start_position()));
-                } else if let Some(suffix) = config.suffixed_start_captures.get(&capture.index) {
-                    start_positions.push(StartPosition {
-                        start: Point::from_ts_point(capture.node.start_position()),
-                        suffix: suffix.clone(),
-                    });
-                }
-            }
-
-            matches.advance();
-            if let Some((start, end)) = start.zip(end) {
-                if start.row == end.row {
-                    continue;
-                }
-                let range = start..end;
-                match indent_ranges.binary_search_by_key(&range.start, |r| r.start) {
-                    Err(ix) => indent_ranges.insert(ix, range),
-                    Ok(ix) => {
-                        let prev_range = &mut indent_ranges[ix];
-                        prev_range.end = prev_range.end.max(range.end);
-                    }
-                }
-            }
-        }
-
-        let mut error_ranges = Vec::<Range<Point>>::new();
-        let mut matches = self
-            .syntax
-            .matches(range, &self.text, |grammar| grammar.error_query.as_ref());
-        while let Some(mat) = matches.peek() {
-            let node = mat.captures[0].node;
-            let start = Point::from_ts_point(node.start_position());
-            let end = Point::from_ts_point(node.end_position());
-            let range = start..end;
-            let ix = match error_ranges.binary_search_by_key(&range.start, |r| r.start) {
-                Ok(ix) | Err(ix) => ix,
-            };
-            let mut end_ix = ix;
-            while let Some(existing_range) = error_ranges.get(end_ix) {
-                if existing_range.end < end {
-                    end_ix += 1;
-                } else {
-                    break;
-                }
-            }
-            error_ranges.splice(ix..end_ix, [range]);
-            matches.advance();
-        }
-
-        outdent_positions.sort();
-        for outdent_position in outdent_positions {
-            // find the innermost indent range containing this outdent_position
-            // set its end to the outdent position
-            if let Some(range_to_truncate) = indent_ranges
-                .iter_mut()
-                .filter(|indent_range| indent_range.contains(&outdent_position))
-                .next_back()
-            {
-                range_to_truncate.end = outdent_position;
-            }
-        }
-
-        start_positions.sort_by_key(|b| b.start);
-
-        // Find the suggested indentation increases and decreased based on regexes.
-        let mut regex_outdent_map = HashMap::default();
-        let mut last_seen_suffix: HashMap<String, Vec<Point>> = HashMap::default();
-        let mut start_positions_iter = start_positions.iter().peekable();
-
-        let mut indent_change_rows = Vec::<(u32, Ordering)>::new();
-        self.for_each_line(
-            Point::new(prev_non_blank_row.unwrap_or(row_range.start), 0)
-                ..Point::new(row_range.end, 0),
-            |row, line| {
-                if config
-                    .decrease_indent_pattern
-                    .as_ref()
-                    .is_some_and(|regex| regex.is_match(line))
-                {
-                    indent_change_rows.push((row, Ordering::Less));
-                }
-                if config
-                    .increase_indent_pattern
-                    .as_ref()
-                    .is_some_and(|regex| regex.is_match(line))
-                {
-                    indent_change_rows.push((row + 1, Ordering::Greater));
-                }
-                while let Some(pos) = start_positions_iter.peek() {
-                    if pos.start.row < row {
-                        let pos = start_positions_iter.next().unwrap();
-                        last_seen_suffix
-                            .entry(pos.suffix.to_string())
-                            .or_default()
-                            .push(pos.start);
-                    } else {
-                        break;
-                    }
-                }
-                for rule in &config.decrease_indent_patterns {
-                    if rule.pattern.as_ref().is_some_and(|r| r.is_match(line)) {
-                        let row_start_column = self.indent_size_for_line(row).len;
-                        let basis_row = rule
-                            .valid_after
-                            .iter()
-                            .filter_map(|valid_suffix| last_seen_suffix.get(valid_suffix))
-                            .flatten()
-                            .filter(|start_point| start_point.column <= row_start_column)
-                            .max_by_key(|start_point| start_point.row);
-                        if let Some(outdent_to_row) = basis_row {
-                            regex_outdent_map.insert(row, outdent_to_row.row);
-                        }
-                        break;
-                    }
-                }
-            },
-        );
-
-        let mut indent_changes = indent_change_rows.into_iter().peekable();
-        let mut prev_row = if config.auto_indent_using_last_non_empty_line {
-            prev_non_blank_row.unwrap_or(0)
-        } else {
-            row_range.start.saturating_sub(1)
-        };
-
-        let mut prev_row_start = Point::new(prev_row, self.indent_size_for_line(prev_row).len);
-        Some(row_range.map(move |row| {
-            let row_start = Point::new(row, self.indent_size_for_line(row).len);
-
-            let mut indent_from_prev_row = false;
-            let mut outdent_from_prev_row = false;
-            let mut outdent_to_row = u32::MAX;
-            let mut from_regex = false;
-
-            while let Some((indent_row, delta)) = indent_changes.peek() {
-                match indent_row.cmp(&row) {
-                    Ordering::Equal => match delta {
-                        Ordering::Less => {
-                            from_regex = true;
-                            outdent_from_prev_row = true
-                        }
-                        Ordering::Greater => {
-                            indent_from_prev_row = true;
-                            from_regex = true
-                        }
-                        _ => {}
-                    },
-
-                    Ordering::Greater => break,
-                    Ordering::Less => {}
-                }
-
-                indent_changes.next();
-            }
-
-            for range in &indent_ranges {
-                if range.start.row >= row {
-                    break;
-                }
-                if range.start.row == prev_row && range.end > row_start {
-                    indent_from_prev_row = true;
-                }
-                if range.end > prev_row_start && range.end <= row_start {
-                    outdent_to_row = outdent_to_row.min(range.start.row);
-                }
-            }
-
-            if let Some(basis_row) = regex_outdent_map.get(&row) {
-                indent_from_prev_row = false;
-                outdent_to_row = *basis_row;
-                from_regex = true;
-            }
-
-            let within_error = error_ranges
-                .iter()
-                .any(|e| e.start.row < row && e.end > row_start);
-
-            let suggestion = if outdent_to_row == prev_row
-                || (outdent_from_prev_row && indent_from_prev_row)
-            {
-                Some(IndentSuggestion {
-                    basis_row: prev_row,
-                    delta: Ordering::Equal,
-                    within_error: within_error && !from_regex,
-                })
-            } else if indent_from_prev_row {
-                Some(IndentSuggestion {
-                    basis_row: prev_row,
-                    delta: Ordering::Greater,
-                    within_error: within_error && !from_regex,
-                })
-            } else if outdent_to_row < prev_row {
-                Some(IndentSuggestion {
-                    basis_row: outdent_to_row,
-                    delta: Ordering::Equal,
-                    within_error: within_error && !from_regex,
-                })
-            } else if outdent_from_prev_row {
-                Some(IndentSuggestion {
-                    basis_row: prev_row,
-                    delta: Ordering::Less,
-                    within_error: within_error && !from_regex,
-                })
-            } else if config.auto_indent_using_last_non_empty_line || !self.is_line_blank(prev_row)
-            {
-                Some(IndentSuggestion {
-                    basis_row: prev_row,
-                    delta: Ordering::Equal,
-                    within_error: within_error && !from_regex,
-                })
-            } else {
-                None
-            };
-
-            prev_row = row;
-            prev_row_start = row_start;
-            suggestion
-        }))
-    }
-
-    fn prev_non_blank_row(&self, mut row: u32) -> Option<u32> {
-        while row > 0 {
-            row -= 1;
-            if !self.is_line_blank(row) {
-                return Some(row);
-            }
-        }
-        None
-    }
-
-    fn get_highlights(&self, range: Range<usize>) -> (SyntaxMapCaptures<'_>, Vec<HighlightMap>) {
-        let captures = self.syntax.captures(range, &self.text, |grammar| {
-            grammar
-                .highlights_config
-                .as_ref()
-                .map(|config| &config.query)
-        });
-        let highlight_maps = captures
-            .grammars()
-            .iter()
-            .map(|grammar| grammar.highlight_map())
-            .collect();
-        (captures, highlight_maps)
-    }
-
-    /// Iterates over chunks of text in the given range of the buffer. Text is chunked
-    /// in an arbitrary way due to being stored in a [`Rope`](text::Rope). The text is also
-    /// returned in chunks where each chunk has a single syntax highlighting style and
-    /// diagnostic status.
-    pub fn chunks<T: ToOffset>(&self, range: Range<T>, language_aware: bool) -> BufferChunks<'_> {
-        let range = range.start.to_offset(self)..range.end.to_offset(self);
-
-        let mut syntax = None;
-        if language_aware {
-            syntax = Some(self.get_highlights(range.clone()));
-        }
-        // We want to look at diagnostic spans only when iterating over language-annotated chunks.
-        let diagnostics = language_aware;
-        BufferChunks::new(self.text.as_rope(), range, syntax, diagnostics, Some(self))
-    }
-
-    pub fn highlighted_text_for_range<T: ToOffset>(
-        &self,
-        range: Range<T>,
-        override_style: Option<HighlightStyle>,
-        syntax_theme: &SyntaxTheme,
-    ) -> HighlightedText {
-        HighlightedText::from_buffer_range(
-            range,
-            &self.text,
-            &self.syntax,
-            override_style,
-            syntax_theme,
-        )
-    }
-
-    /// Invokes the given callback for each line of text in the given range of the buffer.
-    /// Uses callback to avoid allocating a string for each line.
-    fn for_each_line(&self, range: Range<Point>, mut callback: impl FnMut(u32, &str)) {
-        let mut line = String::new();
-        let mut row = range.start.row;
-        for chunk in self
-            .as_rope()
-            .chunks_in_range(range.to_offset(self))
-            .chain(["\n"])
-        {
-            for (newline_ix, text) in chunk.split('\n').enumerate() {
-                if newline_ix > 0 {
-                    callback(row, &line);
-                    row += 1;
-                    line.clear();
-                }
-                line.push_str(text);
-            }
-        }
-    }
-
-    /// Iterates over every [`SyntaxLayer`] in the buffer.
-    pub fn syntax_layers(&self) -> impl Iterator<Item = SyntaxLayer<'_>> + '_ {
-        self.syntax_layers_for_range(0..self.len(), true)
-    }
-
-    pub fn syntax_layer_at<D: ToOffset>(&self, position: D) -> Option<SyntaxLayer<'_>> {
-        let offset = position.to_offset(self);
-        self.syntax_layers_for_range(offset..offset, false)
-            .filter(|l| {
-                if let Some(ranges) = l.included_sub_ranges {
-                    ranges.iter().any(|range| {
-                        let start = range.start.to_offset(self);
-                        start <= offset && {
-                            let end = range.end.to_offset(self);
-                            offset < end
-                        }
-                    })
-                } else {
-                    l.node().start_byte() <= offset && l.node().end_byte() > offset
-                }
-            })
-            .last()
-    }
-
-    pub fn syntax_layers_for_range<D: ToOffset>(
-        &self,
-        range: Range<D>,
-        include_hidden: bool,
-    ) -> impl Iterator<Item = SyntaxLayer<'_>> + '_ {
-        self.syntax
-            .layers_for_range(range, &self.text, include_hidden)
-    }
-
-    pub fn smallest_syntax_layer_containing<D: ToOffset>(
-        &self,
-        range: Range<D>,
-    ) -> Option<SyntaxLayer<'_>> {
-        let range = range.to_offset(self);
-        self.syntax
-            .layers_for_range(range, &self.text, false)
-            .max_by(|a, b| {
-                if a.depth != b.depth {
-                    a.depth.cmp(&b.depth)
-                } else if a.offset.0 != b.offset.0 {
-                    a.offset.0.cmp(&b.offset.0)
-                } else {
-                    a.node().end_byte().cmp(&b.node().end_byte()).reverse()
-                }
-            })
-    }
-
-    /// Returns the main [`Language`].
-    pub fn language(&self) -> Option<&Arc<Language>> {
-        self.language.as_ref()
-    }
-
-    /// Returns the [`Language`] at the given location.
-    pub fn language_at<D: ToOffset>(&self, position: D) -> Option<&Arc<Language>> {
-        self.syntax_layer_at(position)
-            .map(|info| info.language)
-            .or(self.language.as_ref())
-    }
-
-    /// Returns the settings for the language at the given location.
-    pub fn settings_at<'a, D: ToOffset>(
-        &'a self,
-        position: D,
-        cx: &'a App,
-    ) -> Cow<'a, LanguageSettings> {
-        language_settings(
-            self.language_at(position).map(|l| l.name()),
-            self.file.as_ref(),
-            cx,
-        )
-    }
-
-    pub fn char_classifier_at<T: ToOffset>(&self, point: T) -> CharClassifier {
-        CharClassifier::new(self.language_scope_at(point))
-    }
-
-    /// Returns the [`LanguageScope`] at the given location.
-    pub fn language_scope_at<D: ToOffset>(&self, position: D) -> Option<LanguageScope> {
-        let offset = position.to_offset(self);
-        let mut scope = None;
-        let mut smallest_range_and_depth: Option<(Range<usize>, usize)> = None;
-
-        // Use the layer that has the smallest node intersecting the given point.
-        for layer in self
-            .syntax
-            .layers_for_range(offset..offset, &self.text, false)
-        {
-            let mut cursor = layer.node().walk();
-
-            let mut range = None;
-            loop {
-                let child_range = cursor.node().byte_range();
-                if !child_range.contains(&offset) {
-                    break;
-                }
-
-                range = Some(child_range);
-                if cursor.goto_first_child_for_byte(offset).is_none() {
-                    break;
-                }
-            }
-
-            if let Some(range) = range
-                && smallest_range_and_depth.as_ref().is_none_or(
-                    |(smallest_range, smallest_range_depth)| {
-                        if layer.depth > *smallest_range_depth {
-                            true
-                        } else if layer.depth == *smallest_range_depth {
-                            range.len() < smallest_range.len()
-                        } else {
-                            false
-                        }
-                    },
-                )
-            {
-                smallest_range_and_depth = Some((range, layer.depth));
-                scope = Some(LanguageScope {
-                    language: layer.language.clone(),
-                    override_id: layer.override_id(offset, &self.text),
-                });
-            }
-        }
-
-        scope.or_else(|| {
-            self.language.clone().map(|language| LanguageScope {
-                language,
-                override_id: None,
-            })
-        })
-    }
-
-    /// Returns a tuple of the range and character kind of the word
-    /// surrounding the given position.
-    pub fn surrounding_word<T: ToOffset>(
-        &self,
-        start: T,
-        scope_context: Option<CharScopeContext>,
-    ) -> (Range<usize>, Option<CharKind>) {
-        let mut start = start.to_offset(self);
-        let mut end = start;
-        let mut next_chars = self.chars_at(start).take(128).peekable();
-        let mut prev_chars = self.reversed_chars_at(start).take(128).peekable();
-
-        let classifier = self.char_classifier_at(start).scope_context(scope_context);
-        let word_kind = cmp::max(
-            prev_chars.peek().copied().map(|c| classifier.kind(c)),
-            next_chars.peek().copied().map(|c| classifier.kind(c)),
-        );
-
-        for ch in prev_chars {
-            if Some(classifier.kind(ch)) == word_kind && ch != '\n' {
-                start -= ch.len_utf8();
-            } else {
-                break;
-            }
-        }
-
-        for ch in next_chars {
-            if Some(classifier.kind(ch)) == word_kind && ch != '\n' {
-                end += ch.len_utf8();
-            } else {
-                break;
-            }
-        }
-
-        (start..end, word_kind)
-    }
-
-    /// Moves the TreeCursor to the smallest descendant or ancestor syntax node enclosing the given
-    /// range. When `require_larger` is true, the node found must be larger than the query range.
-    ///
-    /// Returns true if a node was found, and false otherwise. In the `false` case the cursor will
-    /// be moved to the root of the tree.
-    fn goto_node_enclosing_range(
-        cursor: &mut tree_sitter::TreeCursor,
-        query_range: &Range<usize>,
-        require_larger: bool,
-    ) -> bool {
-        let mut ascending = false;
-        loop {
-            let mut range = cursor.node().byte_range();
-            if query_range.is_empty() {
-                // When the query range is empty and the current node starts after it, move to the
-                // previous sibling to find the node the containing node.
-                if range.start > query_range.start {
-                    cursor.goto_previous_sibling();
-                    range = cursor.node().byte_range();
-                }
-            } else {
-                // When the query range is non-empty and the current node ends exactly at the start,
-                // move to the next sibling to find a node that extends beyond the start.
-                if range.end == query_range.start {
-                    cursor.goto_next_sibling();
-                    range = cursor.node().byte_range();
-                }
-            }
-
-            let encloses = range.contains_inclusive(query_range)
-                && (!require_larger || range.len() > query_range.len());
-            if !encloses {
-                ascending = true;
-                if !cursor.goto_parent() {
-                    return false;
-                }
-                continue;
-            } else if ascending {
-                return true;
-            }
-
-            // Descend into the current node.
-            if cursor
-                .goto_first_child_for_byte(query_range.start)
-                .is_none()
-            {
-                return true;
-            }
-        }
-    }
-
-    pub fn syntax_ancestor<'a, T: ToOffset>(
-        &'a self,
-        range: Range<T>,
-    ) -> Option<tree_sitter::Node<'a>> {
-        let range = range.start.to_offset(self)..range.end.to_offset(self);
-        let mut result: Option<tree_sitter::Node<'a>> = None;
-        for layer in self
-            .syntax
-            .layers_for_range(range.clone(), &self.text, true)
-        {
-            let mut cursor = layer.node().walk();
-
-            // Find the node that both contains the range and is larger than it.
-            if !Self::goto_node_enclosing_range(&mut cursor, &range, true) {
-                continue;
-            }
-
-            let left_node = cursor.node();
-            let mut layer_result = left_node;
-
-            // For an empty range, try to find another node immediately to the right of the range.
-            if left_node.end_byte() == range.start {
-                let mut right_node = None;
-                while !cursor.goto_next_sibling() {
-                    if !cursor.goto_parent() {
-                        break;
-                    }
-                }
-
-                while cursor.node().start_byte() == range.start {
-                    right_node = Some(cursor.node());
-                    if !cursor.goto_first_child() {
-                        break;
-                    }
-                }
-
-                // If there is a candidate node on both sides of the (empty) range, then
-                // decide between the two by favoring a named node over an anonymous token.
-                // If both nodes are the same in that regard, favor the right one.
-                if let Some(right_node) = right_node
-                    && (right_node.is_named() || !left_node.is_named())
-                {
-                    layer_result = right_node;
-                }
-            }
-
-            if let Some(previous_result) = &result
-                && previous_result.byte_range().len() < layer_result.byte_range().len()
-            {
-                continue;
-            }
-            result = Some(layer_result);
-        }
-
-        result
-    }
-
-    /// Find the previous sibling syntax node at the given range.
-    ///
-    /// This function locates the syntax node that precedes the node containing
-    /// the given range. It searches hierarchically by:
-    /// 1. Finding the node that contains the given range
-    /// 2. Looking for the previous sibling at the same tree level
-    /// 3. If no sibling is found, moving up to parent levels and searching for siblings
-    ///
-    /// Returns `None` if there is no previous sibling at any ancestor level.
-    pub fn syntax_prev_sibling<'a, T: ToOffset>(
-        &'a self,
-        range: Range<T>,
-    ) -> Option<tree_sitter::Node<'a>> {
-        let range = range.start.to_offset(self)..range.end.to_offset(self);
-        let mut result: Option<tree_sitter::Node<'a>> = None;
-
-        for layer in self
-            .syntax
-            .layers_for_range(range.clone(), &self.text, true)
-        {
-            let mut cursor = layer.node().walk();
-
-            // Find the node that contains the range
-            if !Self::goto_node_enclosing_range(&mut cursor, &range, false) {
-                continue;
-            }
-
-            // Look for the previous sibling, moving up ancestor levels if needed
-            loop {
-                if cursor.goto_previous_sibling() {
-                    let layer_result = cursor.node();
-
-                    if let Some(previous_result) = &result {
-                        if previous_result.byte_range().end < layer_result.byte_range().end {
-                            continue;
-                        }
-                    }
-                    result = Some(layer_result);
-                    break;
-                }
-
-                // No sibling found at this level, try moving up to parent
-                if !cursor.goto_parent() {
-                    break;
-                }
-            }
-        }
-
-        result
-    }
-
-    /// Find the next sibling syntax node at the given range.
-    ///
-    /// This function locates the syntax node that follows the node containing
-    /// the given range. It searches hierarchically by:
-    /// 1. Finding the node that contains the given range
-    /// 2. Looking for the next sibling at the same tree level
-    /// 3. If no sibling is found, moving up to parent levels and searching for siblings
-    ///
-    /// Returns `None` if there is no next sibling at any ancestor level.
-    pub fn syntax_next_sibling<'a, T: ToOffset>(
-        &'a self,
-        range: Range<T>,
-    ) -> Option<tree_sitter::Node<'a>> {
-        let range = range.start.to_offset(self)..range.end.to_offset(self);
-        let mut result: Option<tree_sitter::Node<'a>> = None;
-
-        for layer in self
-            .syntax
-            .layers_for_range(range.clone(), &self.text, true)
-        {
-            let mut cursor = layer.node().walk();
-
-            // Find the node that contains the range
-            if !Self::goto_node_enclosing_range(&mut cursor, &range, false) {
-                continue;
-            }
-
-            // Look for the next sibling, moving up ancestor levels if needed
-            loop {
-                if cursor.goto_next_sibling() {
-                    let layer_result = cursor.node();
-
-                    if let Some(previous_result) = &result {
-                        if previous_result.byte_range().start > layer_result.byte_range().start {
-                            continue;
-                        }
-                    }
-                    result = Some(layer_result);
-                    break;
-                }
-
-                // No sibling found at this level, try moving up to parent
-                if !cursor.goto_parent() {
-                    break;
-                }
-            }
-        }
-
-        result
-    }
-
-    /// Returns the root syntax node within the given row
-    pub fn syntax_root_ancestor(&self, position: Anchor) -> Option<tree_sitter::Node<'_>> {
-        let start_offset = position.to_offset(self);
-
-        let row = self.summary_for_anchor::<text::PointUtf16>(&position).row as usize;
-
-        let layer = self
-            .syntax
-            .layers_for_range(start_offset..start_offset, &self.text, true)
-            .next()?;
-
-        let mut cursor = layer.node().walk();
-
-        // Descend to the first leaf that touches the start of the range.
-        while cursor.goto_first_child_for_byte(start_offset).is_some() {
-            if cursor.node().end_byte() == start_offset {
-                cursor.goto_next_sibling();
-            }
-        }
-
-        // Ascend to the root node within the same row.
-        while cursor.goto_parent() {
-            if cursor.node().start_position().row != row {
-                break;
-            }
-        }
-
-        Some(cursor.node())
-    }
-
-    /// Returns the outline for the buffer.
-    ///
-    /// This method allows passing an optional [`SyntaxTheme`] to
-    /// syntax-highlight the returned symbols.
-    pub fn outline(&self, theme: Option<&SyntaxTheme>) -> Outline<Anchor> {
-        Outline::new(self.outline_items_containing(0..self.len(), true, theme))
-    }
-
-    /// Returns all the symbols that contain the given position.
-    ///
-    /// This method allows passing an optional [`SyntaxTheme`] to
-    /// syntax-highlight the returned symbols.
-    pub fn symbols_containing<T: ToOffset>(
-        &self,
-        position: T,
-        theme: Option<&SyntaxTheme>,
-    ) -> Vec<OutlineItem<Anchor>> {
-        let position = position.to_offset(self);
-        let start = self.clip_offset(position.saturating_sub(1), Bias::Left);
-        let end = self.clip_offset(position + 1, Bias::Right);
-        let mut items = self.outline_items_containing(start..end, false, theme);
-        let mut prev_depth = None;
-        items.retain(|item| {
-            let result = prev_depth.is_none_or(|prev_depth| item.depth > prev_depth);
-            prev_depth = Some(item.depth);
-            result
-        });
-        items
-    }
-
-    pub fn outline_range_containing<T: ToOffset>(&self, range: Range<T>) -> Option<Range<Point>> {
-        let range = range.to_offset(self);
-        let mut matches = self.syntax.matches(range.clone(), &self.text, |grammar| {
-            grammar.outline_config.as_ref().map(|c| &c.query)
-        });
-        let configs = matches
-            .grammars()
-            .iter()
-            .map(|g| g.outline_config.as_ref().unwrap())
-            .collect::<Vec<_>>();
-
-        while let Some(mat) = matches.peek() {
-            let config = &configs[mat.grammar_index];
-            let containing_item_node = maybe!({
-                let item_node = mat.captures.iter().find_map(|cap| {
-                    if cap.index == config.item_capture_ix {
-                        Some(cap.node)
-                    } else {
-                        None
-                    }
-                })?;
-
-                let item_byte_range = item_node.byte_range();
-                if item_byte_range.end < range.start || item_byte_range.start > range.end {
-                    None
-                } else {
-                    Some(item_node)
-                }
-            });
-
-            if let Some(item_node) = containing_item_node {
-                return Some(
-                    Point::from_ts_point(item_node.start_position())
-                        ..Point::from_ts_point(item_node.end_position()),
-                );
-            }
-
-            matches.advance();
-        }
-        None
-    }
-
-    pub fn outline_items_containing<T: ToOffset>(
-        &self,
-        range: Range<T>,
-        include_extra_context: bool,
-        theme: Option<&SyntaxTheme>,
-    ) -> Vec<OutlineItem<Anchor>> {
-        self.outline_items_containing_internal(
-            range,
-            include_extra_context,
-            theme,
-            |this, range| this.anchor_after(range.start)..this.anchor_before(range.end),
-        )
-    }
-
-    pub fn outline_items_as_points_containing<T: ToOffset>(
-        &self,
-        range: Range<T>,
-        include_extra_context: bool,
-        theme: Option<&SyntaxTheme>,
-    ) -> Vec<OutlineItem<Point>> {
-        self.outline_items_containing_internal(range, include_extra_context, theme, |_, range| {
-            range
-        })
-    }
-
-    pub fn outline_items_as_offsets_containing<T: ToOffset>(
-        &self,
-        range: Range<T>,
-        include_extra_context: bool,
-        theme: Option<&SyntaxTheme>,
-    ) -> Vec<OutlineItem<usize>> {
-        self.outline_items_containing_internal(
-            range,
-            include_extra_context,
-            theme,
-            |buffer, range| range.to_offset(buffer),
-        )
-    }
-
-    fn outline_items_containing_internal<T: ToOffset, U>(
-        &self,
-        range: Range<T>,
-        include_extra_context: bool,
-        theme: Option<&SyntaxTheme>,
-        range_callback: fn(&Self, Range<Point>) -> Range<U>,
-    ) -> Vec<OutlineItem<U>> {
-        let range = range.to_offset(self);
-        let mut matches = self.syntax.matches(range.clone(), &self.text, |grammar| {
-            grammar.outline_config.as_ref().map(|c| &c.query)
-        });
-
-        let mut items = Vec::new();
-        let mut annotation_row_ranges: Vec<Range<u32>> = Vec::new();
-        while let Some(mat) = matches.peek() {
-            let config = matches.grammars()[mat.grammar_index]
-                .outline_config
-                .as_ref()
-                .unwrap();
-            if let Some(item) =
-                self.next_outline_item(config, &mat, &range, include_extra_context, theme)
-            {
-                items.push(item);
-            } else if let Some(capture) = mat
-                .captures
-                .iter()
-                .find(|capture| Some(capture.index) == config.annotation_capture_ix)
-            {
-                let capture_range = capture.node.start_position()..capture.node.end_position();
-                let mut capture_row_range =
-                    capture_range.start.row as u32..capture_range.end.row as u32;
-                if capture_range.end.row > capture_range.start.row && capture_range.end.column == 0
-                {
-                    capture_row_range.end -= 1;
-                }
-                if let Some(last_row_range) = annotation_row_ranges.last_mut() {
-                    if last_row_range.end >= capture_row_range.start.saturating_sub(1) {
-                        last_row_range.end = capture_row_range.end;
-                    } else {
-                        annotation_row_ranges.push(capture_row_range);
-                    }
-                } else {
-                    annotation_row_ranges.push(capture_row_range);
-                }
-            }
-            matches.advance();
-        }
-
-        items.sort_by_key(|item| (item.range.start, Reverse(item.range.end)));
-
-        // Assign depths based on containment relationships and convert to anchors.
-        let mut item_ends_stack = Vec::<Point>::new();
-        let mut anchor_items = Vec::new();
-        let mut annotation_row_ranges = annotation_row_ranges.into_iter().peekable();
-        for item in items {
-            while let Some(last_end) = item_ends_stack.last().copied() {
-                if last_end < item.range.end {
-                    item_ends_stack.pop();
-                } else {
-                    break;
-                }
-            }
-
-            let mut annotation_row_range = None;
-            while let Some(next_annotation_row_range) = annotation_row_ranges.peek() {
-                let row_preceding_item = item.range.start.row.saturating_sub(1);
-                if next_annotation_row_range.end < row_preceding_item {
-                    annotation_row_ranges.next();
-                } else {
-                    if next_annotation_row_range.end == row_preceding_item {
-                        annotation_row_range = Some(next_annotation_row_range.clone());
-                        annotation_row_ranges.next();
-                    }
-                    break;
-                }
-            }
-
-            anchor_items.push(OutlineItem {
-                depth: item_ends_stack.len(),
-                range: range_callback(self, item.range.clone()),
-                source_range_for_text: range_callback(self, item.source_range_for_text.clone()),
-                text: item.text,
-                highlight_ranges: item.highlight_ranges,
-                name_ranges: item.name_ranges,
-                body_range: item.body_range.map(|r| range_callback(self, r)),
-                annotation_range: annotation_row_range.map(|annotation_range| {
-                    let point_range = Point::new(annotation_range.start, 0)
-                        ..Point::new(annotation_range.end, self.line_len(annotation_range.end));
-                    range_callback(self, point_range)
-                }),
-            });
-            item_ends_stack.push(item.range.end);
-        }
-
-        anchor_items
-    }
-
-    fn next_outline_item(
-        &self,
-        config: &OutlineConfig,
-        mat: &SyntaxMapMatch,
-        range: &Range<usize>,
-        include_extra_context: bool,
-        theme: Option<&SyntaxTheme>,
-    ) -> Option<OutlineItem<Point>> {
-        let item_node = mat.captures.iter().find_map(|cap| {
-            if cap.index == config.item_capture_ix {
-                Some(cap.node)
-            } else {
-                None
-            }
-        })?;
-
-        let item_byte_range = item_node.byte_range();
-        if item_byte_range.end < range.start || item_byte_range.start > range.end {
-            return None;
-        }
-        let item_point_range = Point::from_ts_point(item_node.start_position())
-            ..Point::from_ts_point(item_node.end_position());
-
-        let mut open_point = None;
-        let mut close_point = None;
-
-        let mut buffer_ranges = Vec::new();
-        let mut add_to_buffer_ranges = |node: tree_sitter::Node, node_is_name| {
-            let mut range = node.start_byte()..node.end_byte();
-            let start = node.start_position();
-            if node.end_position().row > start.row {
-                range.end = range.start + self.line_len(start.row as u32) as usize - start.column;
-            }
-
-            if !range.is_empty() {
-                buffer_ranges.push((range, node_is_name));
-            }
-        };
-
-        for capture in mat.captures {
-            if capture.index == config.name_capture_ix {
-                add_to_buffer_ranges(capture.node, true);
-            } else if Some(capture.index) == config.context_capture_ix
-                || (Some(capture.index) == config.extra_context_capture_ix && include_extra_context)
-            {
-                add_to_buffer_ranges(capture.node, false);
-            } else {
-                if Some(capture.index) == config.open_capture_ix {
-                    open_point = Some(Point::from_ts_point(capture.node.end_position()));
-                } else if Some(capture.index) == config.close_capture_ix {
-                    close_point = Some(Point::from_ts_point(capture.node.start_position()));
-                }
-            }
-        }
-
-        if buffer_ranges.is_empty() {
-            return None;
-        }
-        let source_range_for_text =
-            buffer_ranges.first().unwrap().0.start..buffer_ranges.last().unwrap().0.end;
-
-        let mut text = String::new();
-        let mut highlight_ranges = Vec::new();
-        let mut name_ranges = Vec::new();
-        let mut chunks = self.chunks(source_range_for_text.clone(), true);
-        let mut last_buffer_range_end = 0;
-        for (buffer_range, is_name) in buffer_ranges {
-            let space_added = !text.is_empty() && buffer_range.start > last_buffer_range_end;
-            if space_added {
-                text.push(' ');
-            }
-            let before_append_len = text.len();
-            let mut offset = buffer_range.start;
-            chunks.seek(buffer_range.clone());
-            for mut chunk in chunks.by_ref() {
-                if chunk.text.len() > buffer_range.end - offset {
-                    chunk.text = &chunk.text[0..(buffer_range.end - offset)];
-                    offset = buffer_range.end;
-                } else {
-                    offset += chunk.text.len();
-                }
-                let style = chunk
-                    .syntax_highlight_id
-                    .zip(theme)
-                    .and_then(|(highlight, theme)| highlight.style(theme));
-                if let Some(style) = style {
-                    let start = text.len();
-                    let end = start + chunk.text.len();
-                    highlight_ranges.push((start..end, style));
-                }
-                text.push_str(chunk.text);
-                if offset >= buffer_range.end {
-                    break;
-                }
-            }
-            if is_name {
-                let after_append_len = text.len();
-                let start = if space_added && !name_ranges.is_empty() {
-                    before_append_len - 1
-                } else {
-                    before_append_len
-                };
-                name_ranges.push(start..after_append_len);
-            }
-            last_buffer_range_end = buffer_range.end;
-        }
-
-        Some(OutlineItem {
-            depth: 0, // We'll calculate the depth later
-            range: item_point_range,
-            source_range_for_text: source_range_for_text.to_point(self),
-            text,
-            highlight_ranges,
-            name_ranges,
-            body_range: open_point.zip(close_point).map(|(start, end)| start..end),
-            annotation_range: None,
-        })
-    }
-
-    pub fn function_body_fold_ranges<T: ToOffset>(
-        &self,
-        within: Range<T>,
-    ) -> impl Iterator<Item = Range<usize>> + '_ {
-        self.text_object_ranges(within, TreeSitterOptions::default())
-            .filter_map(|(range, obj)| (obj == TextObject::InsideFunction).then_some(range))
-    }
-
-    /// For each grammar in the language, runs the provided
-    /// [`tree_sitter::Query`] against the given range.
-    pub fn matches(
-        &self,
-        range: Range<usize>,
-        query: fn(&Grammar) -> Option<&tree_sitter::Query>,
-    ) -> SyntaxMapMatches<'_> {
-        self.syntax.matches(range, self, query)
-    }
-
-    /// Finds all [`RowChunks`] applicable to the given range, then returns all bracket pairs that intersect with those chunks.
-    /// Hence, may return more bracket pairs than the range contains.
-    ///
-    /// Will omit known chunks.
-    /// The resulting bracket match collections are not ordered.
-    pub fn fetch_bracket_ranges(
-        &self,
-        range: Range<usize>,
-        known_chunks: Option<&HashSet<Range<BufferRow>>>,
-    ) -> HashMap<Range<BufferRow>, Vec<BracketMatch<usize>>> {
-        let mut all_bracket_matches = HashMap::default();
-
-        for chunk in self
-            .tree_sitter_data
-            .chunks
-            .applicable_chunks(&[self.anchor_before(range.start)..self.anchor_after(range.end)])
-        {
-            if known_chunks.is_some_and(|chunks| chunks.contains(&chunk.row_range())) {
-                continue;
-            }
-            let Some(chunk_range) = self.tree_sitter_data.chunks.chunk_range(chunk) else {
-                continue;
-            };
-            let chunk_range = chunk_range.to_offset(&self);
-
-            if let Some(cached_brackets) =
-                &self.tree_sitter_data.brackets_by_chunks.lock()[chunk.id]
-            {
-                all_bracket_matches.insert(chunk.row_range(), cached_brackets.clone());
-                continue;
-            }
-
-            let mut all_brackets = Vec::new();
-            let mut opens = Vec::new();
-            let mut color_pairs = Vec::new();
-
-            let mut matches = self
-                .syntax
-                .matches(chunk_range.clone(), &self.text, |grammar| {
-                    grammar.brackets_config.as_ref().map(|c| &c.query)
-                });
-            let configs = matches
-                .grammars()
-                .iter()
-                .map(|grammar| grammar.brackets_config.as_ref().unwrap())
-                .collect::<Vec<_>>();
-
-            while let Some(mat) = matches.peek() {
-                let mut open = None;
-                let mut close = None;
-                let syntax_layer_depth = mat.depth;
-                let config = configs[mat.grammar_index];
-                let pattern = &config.patterns[mat.pattern_index];
-                for capture in mat.captures {
-                    if capture.index == config.open_capture_ix {
-                        open = Some(capture.node.byte_range());
-                    } else if capture.index == config.close_capture_ix {
-                        close = Some(capture.node.byte_range());
-                    }
-                }
-
-                matches.advance();
-
-                let Some((open_range, close_range)) = open.zip(close) else {
-                    continue;
-                };
-
-                let bracket_range = open_range.start..=close_range.end;
-                if !bracket_range.overlaps(&chunk_range) {
-                    continue;
-                }
-
-                let index = all_brackets.len();
-                all_brackets.push(BracketMatch {
-                    open_range: open_range.clone(),
-                    close_range: close_range.clone(),
-                    newline_only: pattern.newline_only,
-                    syntax_layer_depth,
-                    color_index: None,
-                });
-
-                // Certain languages have "brackets" that are not brackets, e.g. tags. and such
-                // bracket will match the entire tag with all text inside.
-                // For now, avoid highlighting any pair that has more than single char in each bracket.
-                // We need to  colorize `<Element/>` bracket pairs, so cannot make this check stricter.
-                let should_color =
-                    !pattern.rainbow_exclude && (open_range.len() == 1 || close_range.len() == 1);
-                if should_color {
-                    opens.push(open_range.clone());
-                    color_pairs.push((open_range, close_range, index));
-                }
-            }
-
-            opens.sort_by_key(|r| (r.start, r.end));
-            opens.dedup_by(|a, b| a.start == b.start && a.end == b.end);
-            color_pairs.sort_by_key(|(_, close, _)| close.end);
-
-            let mut open_stack = Vec::new();
-            let mut open_index = 0;
-            for (open, close, index) in color_pairs {
-                while open_index < opens.len() && opens[open_index].start < close.start {
-                    open_stack.push(opens[open_index].clone());
-                    open_index += 1;
-                }
-
-                if open_stack.last() == Some(&open) {
-                    let depth_index = open_stack.len() - 1;
-                    all_brackets[index].color_index = Some(depth_index);
-                    open_stack.pop();
-                }
-            }
-
-            all_brackets.sort_by_key(|bracket_match| {
-                (bracket_match.open_range.start, bracket_match.open_range.end)
-            });
-
-            if let empty_slot @ None =
-                &mut self.tree_sitter_data.brackets_by_chunks.lock()[chunk.id]
-            {
-                *empty_slot = Some(all_brackets.clone());
-            }
-            all_bracket_matches.insert(chunk.row_range(), all_brackets);
-        }
-
-        all_bracket_matches
-    }
-
-    pub fn all_bracket_ranges(
-        &self,
-        range: Range<usize>,
-    ) -> impl Iterator<Item = BracketMatch<usize>> {
-        self.fetch_bracket_ranges(range.clone(), None)
-            .into_values()
-            .flatten()
-            .filter(move |bracket_match| {
-                let bracket_range = bracket_match.open_range.start..bracket_match.close_range.end;
-                bracket_range.overlaps(&range)
-            })
-    }
-
-    /// Returns bracket range pairs overlapping or adjacent to `range`
-    pub fn bracket_ranges<T: ToOffset>(
-        &self,
-        range: Range<T>,
-    ) -> impl Iterator<Item = BracketMatch<usize>> + '_ {
-        // Find bracket pairs that *inclusively* contain the given range.
-        let range = range.start.to_previous_offset(self)..range.end.to_next_offset(self);
-        self.all_bracket_ranges(range)
-            .filter(|pair| !pair.newline_only)
-    }
-
-    pub fn debug_variables_query<T: ToOffset>(
-        &self,
-        range: Range<T>,
-    ) -> impl Iterator<Item = (Range<usize>, DebuggerTextObject)> + '_ {
-        let range = range.start.to_previous_offset(self)..range.end.to_next_offset(self);
-
-        let mut matches = self.syntax.matches_with_options(
-            range.clone(),
-            &self.text,
-            TreeSitterOptions::default(),
-            |grammar| grammar.debug_variables_config.as_ref().map(|c| &c.query),
-        );
-
-        let configs = matches
-            .grammars()
-            .iter()
-            .map(|grammar| grammar.debug_variables_config.as_ref())
-            .collect::<Vec<_>>();
-
-        let mut captures = Vec::<(Range<usize>, DebuggerTextObject)>::new();
-
-        iter::from_fn(move || {
-            loop {
-                while let Some(capture) = captures.pop() {
-                    if capture.0.overlaps(&range) {
-                        return Some(capture);
-                    }
-                }
-
-                let mat = matches.peek()?;
-
-                let Some(config) = configs[mat.grammar_index].as_ref() else {
-                    matches.advance();
-                    continue;
-                };
-
-                for capture in mat.captures {
-                    let Some(ix) = config
-                        .objects_by_capture_ix
-                        .binary_search_by_key(&capture.index, |e| e.0)
-                        .ok()
-                    else {
-                        continue;
-                    };
-                    let text_object = config.objects_by_capture_ix[ix].1;
-                    let byte_range = capture.node.byte_range();
-
-                    let mut found = false;
-                    for (range, existing) in captures.iter_mut() {
-                        if existing == &text_object {
-                            range.start = range.start.min(byte_range.start);
-                            range.end = range.end.max(byte_range.end);
-                            found = true;
-                            break;
-                        }
-                    }
-
-                    if !found {
-                        captures.push((byte_range, text_object));
-                    }
-                }
-
-                matches.advance();
-            }
-        })
-    }
-
-    pub fn text_object_ranges<T: ToOffset>(
-        &self,
-        range: Range<T>,
-        options: TreeSitterOptions,
-    ) -> impl Iterator<Item = (Range<usize>, TextObject)> + '_ {
-        let range =
-            range.start.to_previous_offset(self)..self.len().min(range.end.to_next_offset(self));
-
-        let mut matches =
-            self.syntax
-                .matches_with_options(range.clone(), &self.text, options, |grammar| {
-                    grammar.text_object_config.as_ref().map(|c| &c.query)
-                });
-
-        let configs = matches
-            .grammars()
-            .iter()
-            .map(|grammar| grammar.text_object_config.as_ref())
-            .collect::<Vec<_>>();
-
-        let mut captures = Vec::<(Range<usize>, TextObject)>::new();
-
-        iter::from_fn(move || {
-            loop {
-                while let Some(capture) = captures.pop() {
-                    if capture.0.overlaps(&range) {
-                        return Some(capture);
-                    }
-                }
-
-                let mat = matches.peek()?;
-
-                let Some(config) = configs[mat.grammar_index].as_ref() else {
-                    matches.advance();
-                    continue;
-                };
-
-                for capture in mat.captures {
-                    let Some(ix) = config
-                        .text_objects_by_capture_ix
-                        .binary_search_by_key(&capture.index, |e| e.0)
-                        .ok()
-                    else {
-                        continue;
-                    };
-                    let text_object = config.text_objects_by_capture_ix[ix].1;
-                    let byte_range = capture.node.byte_range();
-
-                    let mut found = false;
-                    for (range, existing) in captures.iter_mut() {
-                        if existing == &text_object {
-                            range.start = range.start.min(byte_range.start);
-                            range.end = range.end.max(byte_range.end);
-                            found = true;
-                            break;
-                        }
-                    }
-
-                    if !found {
-                        captures.push((byte_range, text_object));
-                    }
-                }
-
-                matches.advance();
-            }
-        })
-    }
-
-    /// Returns enclosing bracket ranges containing the given range
-    pub fn enclosing_bracket_ranges<T: ToOffset>(
-        &self,
-        range: Range<T>,
-    ) -> impl Iterator<Item = BracketMatch<usize>> + '_ {
-        let range = range.start.to_offset(self)..range.end.to_offset(self);
-
-        let result: Vec<_> = self.bracket_ranges(range.clone()).collect();
-        let max_depth = result
-            .iter()
-            .map(|mat| mat.syntax_layer_depth)
-            .max()
-            .unwrap_or(0);
-        result.into_iter().filter(move |pair| {
-            pair.open_range.start <= range.start
-                && pair.close_range.end >= range.end
-                && pair.syntax_layer_depth == max_depth
-        })
-    }
-
-    /// Returns the smallest enclosing bracket ranges containing the given range or None if no brackets contain range
-    ///
-    /// Can optionally pass a range_filter to filter the ranges of brackets to consider
-    pub fn innermost_enclosing_bracket_ranges<T: ToOffset>(
-        &self,
-        range: Range<T>,
-        range_filter: Option<&dyn Fn(Range<usize>, Range<usize>) -> bool>,
-    ) -> Option<(Range<usize>, Range<usize>)> {
-        let range = range.start.to_offset(self)..range.end.to_offset(self);
-
-        // Get the ranges of the innermost pair of brackets.
-        let mut result: Option<(Range<usize>, Range<usize>)> = None;
-
-        for pair in self.enclosing_bracket_ranges(range) {
-            if let Some(range_filter) = range_filter
-                && !range_filter(pair.open_range.clone(), pair.close_range.clone())
-            {
-                continue;
-            }
-
-            let len = pair.close_range.end - pair.open_range.start;
-
-            if let Some((existing_open, existing_close)) = &result {
-                let existing_len = existing_close.end - existing_open.start;
-                if len > existing_len {
-                    continue;
-                }
-            }
-
-            result = Some((pair.open_range, pair.close_range));
-        }
-
-        result
-    }
-
-    /// Returns anchor ranges for any matches of the redaction query.
-    /// The buffer can be associated with multiple languages, and the redaction query associated with each
-    /// will be run on the relevant section of the buffer.
-    pub fn redacted_ranges<T: ToOffset>(
-        &self,
-        range: Range<T>,
-    ) -> impl Iterator<Item = Range<usize>> + '_ {
-        let offset_range = range.start.to_offset(self)..range.end.to_offset(self);
-        let mut syntax_matches = self.syntax.matches(offset_range, self, |grammar| {
-            grammar
-                .redactions_config
-                .as_ref()
-                .map(|config| &config.query)
-        });
-
-        let configs = syntax_matches
-            .grammars()
-            .iter()
-            .map(|grammar| grammar.redactions_config.as_ref())
-            .collect::<Vec<_>>();
-
-        iter::from_fn(move || {
-            let redacted_range = syntax_matches
-                .peek()
-                .and_then(|mat| {
-                    configs[mat.grammar_index].and_then(|config| {
-                        mat.captures
-                            .iter()
-                            .find(|capture| capture.index == config.redaction_capture_ix)
-                    })
-                })
-                .map(|mat| mat.node.byte_range());
-            syntax_matches.advance();
-            redacted_range
-        })
-    }
-
-    pub fn injections_intersecting_range<T: ToOffset>(
-        &self,
-        range: Range<T>,
-    ) -> impl Iterator<Item = (Range<usize>, &Arc<Language>)> + '_ {
-        let offset_range = range.start.to_offset(self)..range.end.to_offset(self);
-
-        let mut syntax_matches = self.syntax.matches(offset_range, self, |grammar| {
-            grammar
-                .injection_config
-                .as_ref()
-                .map(|config| &config.query)
-        });
-
-        let configs = syntax_matches
-            .grammars()
-            .iter()
-            .map(|grammar| grammar.injection_config.as_ref())
-            .collect::<Vec<_>>();
-
-        iter::from_fn(move || {
-            let ranges = syntax_matches.peek().and_then(|mat| {
-                let config = &configs[mat.grammar_index]?;
-                let content_capture_range = mat.captures.iter().find_map(|capture| {
-                    if capture.index == config.content_capture_ix {
-                        Some(capture.node.byte_range())
-                    } else {
-                        None
-                    }
-                })?;
-                let language = self.language_at(content_capture_range.start)?;
-                Some((content_capture_range, language))
-            });
-            syntax_matches.advance();
-            ranges
-        })
-    }
-
-    pub fn runnable_ranges(
-        &self,
-        offset_range: Range<usize>,
-    ) -> impl Iterator<Item = RunnableRange> + '_ {
-        let mut syntax_matches = self.syntax.matches(offset_range, self, |grammar| {
-            grammar.runnable_config.as_ref().map(|config| &config.query)
-        });
-
-        let test_configs = syntax_matches
-            .grammars()
-            .iter()
-            .map(|grammar| grammar.runnable_config.as_ref())
-            .collect::<Vec<_>>();
-
-        iter::from_fn(move || {
-            loop {
-                let mat = syntax_matches.peek()?;
-
-                let test_range = test_configs[mat.grammar_index].and_then(|test_configs| {
-                    let mut run_range = None;
-                    let full_range = mat.captures.iter().fold(
-                        Range {
-                            start: usize::MAX,
-                            end: 0,
-                        },
-                        |mut acc, next| {
-                            let byte_range = next.node.byte_range();
-                            if acc.start > byte_range.start {
-                                acc.start = byte_range.start;
-                            }
-                            if acc.end < byte_range.end {
-                                acc.end = byte_range.end;
-                            }
-                            acc
-                        },
-                    );
-                    if full_range.start > full_range.end {
-                        // We did not find a full spanning range of this match.
-                        return None;
-                    }
-                    let extra_captures: SmallVec<[_; 1]> =
-                        SmallVec::from_iter(mat.captures.iter().filter_map(|capture| {
-                            test_configs
-                                .extra_captures
-                                .get(capture.index as usize)
-                                .cloned()
-                                .and_then(|tag_name| match tag_name {
-                                    RunnableCapture::Named(name) => {
-                                        Some((capture.node.byte_range(), name))
-                                    }
-                                    RunnableCapture::Run => {
-                                        let _ = run_range.insert(capture.node.byte_range());
-                                        None
-                                    }
-                                })
-                        }));
-                    let run_range = run_range?;
-                    let tags = test_configs
-                        .query
-                        .property_settings(mat.pattern_index)
-                        .iter()
-                        .filter_map(|property| {
-                            if *property.key == *"tag" {
-                                property
-                                    .value
-                                    .as_ref()
-                                    .map(|value| RunnableTag(value.to_string().into()))
-                            } else {
-                                None
-                            }
-                        })
-                        .collect();
-                    let extra_captures = extra_captures
-                        .into_iter()
-                        .map(|(range, name)| {
-                            (
-                                name.to_string(),
-                                self.text_for_range(range).collect::<String>(),
-                            )
-                        })
-                        .collect();
-                    // All tags should have the same range.
-                    Some(RunnableRange {
-                        run_range,
-                        full_range,
-                        runnable: Runnable {
-                            tags,
-                            language: mat.language,
-                            buffer: self.remote_id(),
-                        },
-                        extra_captures,
-                        buffer_id: self.remote_id(),
-                    })
-                });
-
-                syntax_matches.advance();
-                if test_range.is_some() {
-                    // It's fine for us to short-circuit on .peek()? returning None. We don't want to return None from this iter if we
-                    // had a capture that did not contain a run marker, hence we'll just loop around for the next capture.
-                    return test_range;
-                }
-            }
-        })
-    }
-
-    /// Returns selections for remote peers intersecting the given range.
-    #[allow(clippy::type_complexity)]
-    pub fn selections_in_range(
-        &self,
-        range: Range<Anchor>,
-        include_local: bool,
-    ) -> impl Iterator<
-        Item = (
-            ReplicaId,
-            bool,
-            CursorShape,
-            impl Iterator<Item = &Selection<Anchor>> + '_,
-        ),
-    > + '_ {
-        self.remote_selections
-            .iter()
-            .filter(move |(replica_id, set)| {
-                (include_local || **replica_id != self.text.replica_id())
-                    && !set.selections.is_empty()
-            })
-            .map(move |(replica_id, set)| {
-                let start_ix = match set.selections.binary_search_by(|probe| {
-                    probe.end.cmp(&range.start, self).then(Ordering::Greater)
-                }) {
-                    Ok(ix) | Err(ix) => ix,
-                };
-                let end_ix = match set.selections.binary_search_by(|probe| {
-                    probe.start.cmp(&range.end, self).then(Ordering::Less)
-                }) {
-                    Ok(ix) | Err(ix) => ix,
-                };
-
-                (
-                    *replica_id,
-                    set.line_mode,
-                    set.cursor_shape,
-                    set.selections[start_ix..end_ix].iter(),
-                )
-            })
-    }
-
-    /// Returns if the buffer contains any diagnostics.
-    pub fn has_diagnostics(&self) -> bool {
-        !self.diagnostics.is_empty()
-    }
-
-    /// Returns all the diagnostics intersecting the given range.
-    pub fn diagnostics_in_range<'a, T, O>(
-        &'a self,
-        search_range: Range<T>,
-        reversed: bool,
-    ) -> impl 'a + Iterator<Item = DiagnosticEntryRef<'a, O>>
-    where
-        T: 'a + Clone + ToOffset,
-        O: 'a + FromAnchor,
-    {
-        let mut iterators: Vec<_> = self
-            .diagnostics
-            .iter()
-            .map(|(_, collection)| {
-                collection
-                    .range::<T, text::Anchor>(search_range.clone(), self, true, reversed)
-                    .peekable()
-            })
-            .collect();
-
-        std::iter::from_fn(move || {
-            let (next_ix, _) = iterators
-                .iter_mut()
-                .enumerate()
-                .flat_map(|(ix, iter)| Some((ix, iter.peek()?)))
-                .min_by(|(_, a), (_, b)| {
-                    let cmp = a
-                        .range
-                        .start
-                        .cmp(&b.range.start, self)
-                        // when range is equal, sort by diagnostic severity
-                        .then(a.diagnostic.severity.cmp(&b.diagnostic.severity))
-                        // and stabilize order with group_id
-                        .then(a.diagnostic.group_id.cmp(&b.diagnostic.group_id));
-                    if reversed { cmp.reverse() } else { cmp }
-                })?;
-            iterators[next_ix]
-                .next()
-                .map(
-                    |DiagnosticEntryRef { range, diagnostic }| DiagnosticEntryRef {
-                        diagnostic,
-                        range: FromAnchor::from_anchor(&range.start, self)
-                            ..FromAnchor::from_anchor(&range.end, self),
-                    },
-                )
-        })
-    }
-
-    /// Raw access to the diagnostic sets. Typically `diagnostic_groups` or `diagnostic_group`
-    /// should be used instead.
-    pub fn diagnostic_sets(&self) -> &SmallVec<[(LanguageServerId, DiagnosticSet); 2]> {
-        &self.diagnostics
-    }
-
-    /// Returns all the diagnostic groups associated with the given
-    /// language server ID. If no language server ID is provided,
-    /// all diagnostics groups are returned.
-    pub fn diagnostic_groups(
-        &self,
-        language_server_id: Option<LanguageServerId>,
-    ) -> Vec<(LanguageServerId, DiagnosticGroup<'_, Anchor>)> {
-        let mut groups = Vec::new();
-
-        if let Some(language_server_id) = language_server_id {
-            if let Ok(ix) = self
-                .diagnostics
-                .binary_search_by_key(&language_server_id, |e| e.0)
-            {
-                self.diagnostics[ix]
-                    .1
-                    .groups(language_server_id, &mut groups, self);
-            }
-        } else {
-            for (language_server_id, diagnostics) in self.diagnostics.iter() {
-                diagnostics.groups(*language_server_id, &mut groups, self);
-            }
-        }
-
-        groups.sort_by(|(id_a, group_a), (id_b, group_b)| {
-            let a_start = &group_a.entries[group_a.primary_ix].range.start;
-            let b_start = &group_b.entries[group_b.primary_ix].range.start;
-            a_start.cmp(b_start, self).then_with(|| id_a.cmp(id_b))
-        });
-
-        groups
-    }
-
-    /// Returns an iterator over the diagnostics for the given group.
-    pub fn diagnostic_group<O>(
-        &self,
-        group_id: usize,
-    ) -> impl Iterator<Item = DiagnosticEntryRef<'_, O>> + use<'_, O>
-    where
-        O: FromAnchor + 'static,
-    {
-        self.diagnostics
-            .iter()
-            .flat_map(move |(_, set)| set.group(group_id, self))
-    }
-
-    /// An integer version number that accounts for all updates besides
-    /// the buffer's text itself (which is versioned via a version vector).
-    pub fn non_text_state_update_count(&self) -> usize {
-        self.non_text_state_update_count
-    }
-
-    /// An integer version that changes when the buffer's syntax changes.
-    pub fn syntax_update_count(&self) -> usize {
-        self.syntax.update_count()
-    }
-
-    /// Returns a snapshot of underlying file.
-    pub fn file(&self) -> Option<&Arc<dyn File>> {
-        self.file.as_ref()
-    }
-
-    pub fn resolve_file_path(&self, include_root: bool, cx: &App) -> Option<String> {
-        if let Some(file) = self.file() {
-            if file.path().file_name().is_none() || include_root {
-                Some(file.full_path(cx).to_string_lossy().into_owned())
-            } else {
-                Some(file.path().display(file.path_style(cx)).to_string())
-            }
-        } else {
-            None
-        }
-    }
-
-    pub fn words_in_range(&self, query: WordsQuery) -> BTreeMap<String, Range<Anchor>> {
-        let query_str = query.fuzzy_contents;
-        if query_str.is_some_and(|query| query.is_empty()) {
-            return BTreeMap::default();
-        }
-
-        let classifier = CharClassifier::new(self.language.clone().map(|language| LanguageScope {
-            language,
-            override_id: None,
-        }));
-
-        let mut query_ix = 0;
-        let query_chars = query_str.map(|query| query.chars().collect::<Vec<_>>());
-        let query_len = query_chars.as_ref().map_or(0, |query| query.len());
-
-        let mut words = BTreeMap::default();
-        let mut current_word_start_ix = None;
-        let mut chunk_ix = query.range.start;
-        for chunk in self.chunks(query.range, false) {
-            for (i, c) in chunk.text.char_indices() {
-                let ix = chunk_ix + i;
-                if classifier.is_word(c) {
-                    if current_word_start_ix.is_none() {
-                        current_word_start_ix = Some(ix);
-                    }
-
-                    if let Some(query_chars) = &query_chars
-                        && query_ix < query_len
-                        && c.to_lowercase().eq(query_chars[query_ix].to_lowercase())
-                    {
-                        query_ix += 1;
-                    }
-                    continue;
-                } else if let Some(word_start) = current_word_start_ix.take()
-                    && query_ix == query_len
-                {
-                    let word_range = self.anchor_before(word_start)..self.anchor_after(ix);
-                    let mut word_text = self.text_for_range(word_start..ix).peekable();
-                    let first_char = word_text
-                        .peek()
-                        .and_then(|first_chunk| first_chunk.chars().next());
-                    // Skip empty and "words" starting with digits as a heuristic to reduce useless completions
-                    if !query.skip_digits
-                        || first_char.is_none_or(|first_char| !first_char.is_digit(10))
-                    {
-                        words.insert(word_text.collect(), word_range);
-                    }
-                }
-                query_ix = 0;
-            }
-            chunk_ix += chunk.text.len();
-        }
-
-        words
-    }
-}
-
-pub struct WordsQuery<'a> {
-    /// Only returns words with all chars from the fuzzy string in them.
-    pub fuzzy_contents: Option<&'a str>,
-    /// Skips words that start with a digit.
-    pub skip_digits: bool,
-    /// Buffer offset range, to look for words.
-    pub range: Range<usize>,
-}
-
-fn indent_size_for_line(text: &text::BufferSnapshot, row: u32) -> IndentSize {
-    indent_size_for_text(text.chars_at(Point::new(row, 0)))
-}
-
-fn indent_size_for_text(text: impl Iterator<Item = char>) -> IndentSize {
-    let mut result = IndentSize::spaces(0);
-    for c in text {
-        let kind = match c {
-            ' ' => IndentKind::Space,
-            '\t' => IndentKind::Tab,
-            _ => break,
-        };
-        if result.len == 0 {
-            result.kind = kind;
-        }
-        result.len += 1;
-    }
-    result
-}
-
-impl Clone for BufferSnapshot {
-    fn clone(&self) -> Self {
-        Self {
-            text: self.text.clone(),
-            syntax: self.syntax.clone(),
-            file: self.file.clone(),
-            remote_selections: self.remote_selections.clone(),
-            diagnostics: self.diagnostics.clone(),
-            language: self.language.clone(),
-            tree_sitter_data: self.tree_sitter_data.clone(),
-            non_text_state_update_count: self.non_text_state_update_count,
-        }
-    }
-}
-
-impl Deref for BufferSnapshot {
-    type Target = text::BufferSnapshot;
-
-    fn deref(&self) -> &Self::Target {
-        &self.text
-    }
-}
-
-unsafe impl Send for BufferChunks<'_> {}
-
-impl<'a> BufferChunks<'a> {
-    pub(crate) fn new(
-        text: &'a Rope,
-        range: Range<usize>,
-        syntax: Option<(SyntaxMapCaptures<'a>, Vec<HighlightMap>)>,
-        diagnostics: bool,
-        buffer_snapshot: Option<&'a BufferSnapshot>,
-    ) -> Self {
-        let mut highlights = None;
-        if let Some((captures, highlight_maps)) = syntax {
-            highlights = Some(BufferChunkHighlights {
-                captures,
-                next_capture: None,
-                stack: Default::default(),
-                highlight_maps,
-            })
-        }
-
-        let diagnostic_endpoints = diagnostics.then(|| Vec::new().into_iter().peekable());
-        let chunks = text.chunks_in_range(range.clone());
-
-        let mut this = BufferChunks {
-            range,
-            buffer_snapshot,
-            chunks,
-            diagnostic_endpoints,
-            error_depth: 0,
-            warning_depth: 0,
-            information_depth: 0,
-            hint_depth: 0,
-            unnecessary_depth: 0,
-            underline: true,
-            highlights,
-        };
-        this.initialize_diagnostic_endpoints();
-        this
-    }
-
-    /// Seeks to the given byte offset in the buffer.
-    pub fn seek(&mut self, range: Range<usize>) {
-        let old_range = std::mem::replace(&mut self.range, range.clone());
-        self.chunks.set_range(self.range.clone());
-        if let Some(highlights) = self.highlights.as_mut() {
-            if old_range.start <= self.range.start && old_range.end >= self.range.end {
-                // Reuse existing highlights stack, as the new range is a subrange of the old one.
-                highlights
-                    .stack
-                    .retain(|(end_offset, _)| *end_offset > range.start);
-                if let Some(capture) = &highlights.next_capture
-                    && range.start >= capture.node.start_byte()
-                {
-                    let next_capture_end = capture.node.end_byte();
-                    if range.start < next_capture_end {
-                        highlights.stack.push((
-                            next_capture_end,
-                            highlights.highlight_maps[capture.grammar_index].get(capture.index),
-                        ));
-                    }
-                    highlights.next_capture.take();
-                }
-            } else if let Some(snapshot) = self.buffer_snapshot {
-                let (captures, highlight_maps) = snapshot.get_highlights(self.range.clone());
-                *highlights = BufferChunkHighlights {
-                    captures,
-                    next_capture: None,
-                    stack: Default::default(),
-                    highlight_maps,
-                };
-            } else {
-                // We cannot obtain new highlights for a language-aware buffer iterator, as we don't have a buffer snapshot.
-                // Seeking such BufferChunks is not supported.
-                debug_assert!(
-                    false,
-                    "Attempted to seek on a language-aware buffer iterator without associated buffer snapshot"
-                );
-            }
-
-            highlights.captures.set_byte_range(self.range.clone());
-            self.initialize_diagnostic_endpoints();
-        }
-    }
-
-    fn initialize_diagnostic_endpoints(&mut self) {
-        if let Some(diagnostics) = self.diagnostic_endpoints.as_mut()
-            && let Some(buffer) = self.buffer_snapshot
-        {
-            let mut diagnostic_endpoints = Vec::new();
-            for entry in buffer.diagnostics_in_range::<_, usize>(self.range.clone(), false) {
-                diagnostic_endpoints.push(DiagnosticEndpoint {
-                    offset: entry.range.start,
-                    is_start: true,
-                    severity: entry.diagnostic.severity,
-                    is_unnecessary: entry.diagnostic.is_unnecessary,
-                    underline: entry.diagnostic.underline,
-                });
-                diagnostic_endpoints.push(DiagnosticEndpoint {
-                    offset: entry.range.end,
-                    is_start: false,
-                    severity: entry.diagnostic.severity,
-                    is_unnecessary: entry.diagnostic.is_unnecessary,
-                    underline: entry.diagnostic.underline,
-                });
-            }
-            diagnostic_endpoints
-                .sort_unstable_by_key(|endpoint| (endpoint.offset, !endpoint.is_start));
-            *diagnostics = diagnostic_endpoints.into_iter().peekable();
-            self.hint_depth = 0;
-            self.error_depth = 0;
-            self.warning_depth = 0;
-            self.information_depth = 0;
-        }
-    }
-
-    /// The current byte offset in the buffer.
-    pub fn offset(&self) -> usize {
-        self.range.start
-    }
-
-    pub fn range(&self) -> Range<usize> {
-        self.range.clone()
-    }
-
-    fn update_diagnostic_depths(&mut self, endpoint: DiagnosticEndpoint) {
-        let depth = match endpoint.severity {
-            DiagnosticSeverity::ERROR => &mut self.error_depth,
-            DiagnosticSeverity::WARNING => &mut self.warning_depth,
-            DiagnosticSeverity::INFORMATION => &mut self.information_depth,
-            DiagnosticSeverity::HINT => &mut self.hint_depth,
-            _ => return,
-        };
-        if endpoint.is_start {
-            *depth += 1;
-        } else {
-            *depth -= 1;
-        }
-
-        if endpoint.is_unnecessary {
-            if endpoint.is_start {
-                self.unnecessary_depth += 1;
-            } else {
-                self.unnecessary_depth -= 1;
-            }
-        }
-    }
-
-    fn current_diagnostic_severity(&self) -> Option<DiagnosticSeverity> {
-        if self.error_depth > 0 {
-            Some(DiagnosticSeverity::ERROR)
-        } else if self.warning_depth > 0 {
-            Some(DiagnosticSeverity::WARNING)
-        } else if self.information_depth > 0 {
-            Some(DiagnosticSeverity::INFORMATION)
-        } else if self.hint_depth > 0 {
-            Some(DiagnosticSeverity::HINT)
-        } else {
-            None
-        }
-    }
-
-    fn current_code_is_unnecessary(&self) -> bool {
-        self.unnecessary_depth > 0
-    }
-}
-
-impl<'a> Iterator for BufferChunks<'a> {
-    type Item = Chunk<'a>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        let mut next_capture_start = usize::MAX;
-        let mut next_diagnostic_endpoint = usize::MAX;
-
-        if let Some(highlights) = self.highlights.as_mut() {
-            while let Some((parent_capture_end, _)) = highlights.stack.last() {
-                if *parent_capture_end <= self.range.start {
-                    highlights.stack.pop();
-                } else {
-                    break;
-                }
-            }
-
-            if highlights.next_capture.is_none() {
-                highlights.next_capture = highlights.captures.next();
-            }
-
-            while let Some(capture) = highlights.next_capture.as_ref() {
-                if self.range.start < capture.node.start_byte() {
-                    next_capture_start = capture.node.start_byte();
-                    break;
-                } else {
-                    let highlight_id =
-                        highlights.highlight_maps[capture.grammar_index].get(capture.index);
-                    highlights
-                        .stack
-                        .push((capture.node.end_byte(), highlight_id));
-                    highlights.next_capture = highlights.captures.next();
-                }
-            }
-        }
-
-        let mut diagnostic_endpoints = std::mem::take(&mut self.diagnostic_endpoints);
-        if let Some(diagnostic_endpoints) = diagnostic_endpoints.as_mut() {
-            while let Some(endpoint) = diagnostic_endpoints.peek().copied() {
-                if endpoint.offset <= self.range.start {
-                    self.update_diagnostic_depths(endpoint);
-                    diagnostic_endpoints.next();
-                    self.underline = endpoint.underline;
-                } else {
-                    next_diagnostic_endpoint = endpoint.offset;
-                    break;
-                }
-            }
-        }
-        self.diagnostic_endpoints = diagnostic_endpoints;
-
-        if let Some(ChunkBitmaps {
-            text: chunk,
-            chars: chars_map,
-            tabs,
-        }) = self.chunks.peek_with_bitmaps()
-        {
-            let chunk_start = self.range.start;
-            let mut chunk_end = (self.chunks.offset() + chunk.len())
-                .min(next_capture_start)
-                .min(next_diagnostic_endpoint);
-            let mut highlight_id = None;
-            if let Some(highlights) = self.highlights.as_ref()
-                && let Some((parent_capture_end, parent_highlight_id)) = highlights.stack.last()
-            {
-                chunk_end = chunk_end.min(*parent_capture_end);
-                highlight_id = Some(*parent_highlight_id);
-            }
-            let bit_start = chunk_start - self.chunks.offset();
-            let bit_end = chunk_end - self.chunks.offset();
-
-            let slice = &chunk[bit_start..bit_end];
-
-            let mask = 1u128.unbounded_shl(bit_end as u32).wrapping_sub(1);
-            let tabs = (tabs >> bit_start) & mask;
-            let chars = (chars_map >> bit_start) & mask;
-
-            self.range.start = chunk_end;
-            if self.range.start == self.chunks.offset() + chunk.len() {
-                self.chunks.next().unwrap();
-            }
-
-            Some(Chunk {
-                text: slice,
-                syntax_highlight_id: highlight_id,
-                underline: self.underline,
-                diagnostic_severity: self.current_diagnostic_severity(),
-                is_unnecessary: self.current_code_is_unnecessary(),
-                tabs,
-                chars,
-                ..Chunk::default()
-            })
-        } else {
-            None
-        }
-    }
-}
-
-impl operation_queue::Operation for Operation {
-    fn lamport_timestamp(&self) -> clock::Lamport {
-        match self {
-            Operation::Buffer(_) => {
-                unreachable!("buffer operations should never be deferred at this layer")
-            }
-            Operation::UpdateDiagnostics {
-                lamport_timestamp, ..
-            }
-            | Operation::UpdateSelections {
-                lamport_timestamp, ..
-            }
-            | Operation::UpdateCompletionTriggers {
-                lamport_timestamp, ..
-            }
-            | Operation::UpdateLineEnding {
-                lamport_timestamp, ..
-            } => *lamport_timestamp,
-        }
-    }
-}
-
-impl Default for Diagnostic {
-    fn default() -> Self {
-        Self {
-            source: Default::default(),
-            source_kind: DiagnosticSourceKind::Other,
-            code: None,
-            code_description: None,
-            severity: DiagnosticSeverity::ERROR,
-            message: Default::default(),
-            markdown: None,
-            group_id: 0,
-            is_primary: false,
-            is_disk_based: false,
-            is_unnecessary: false,
-            underline: true,
-            data: None,
-            registration_id: None,
-        }
-    }
-}
-
-impl IndentSize {
-    /// Returns an [`IndentSize`] representing the given spaces.
-    pub fn spaces(len: u32) -> Self {
-        Self {
-            len,
-            kind: IndentKind::Space,
-        }
-    }
-
-    /// Returns an [`IndentSize`] representing a tab.
-    pub fn tab() -> Self {
-        Self {
-            len: 1,
-            kind: IndentKind::Tab,
-        }
-    }
-
-    /// An iterator over the characters represented by this [`IndentSize`].
-    pub fn chars(&self) -> impl Iterator<Item = char> {
-        iter::repeat(self.char()).take(self.len as usize)
-    }
-
-    /// The character representation of this [`IndentSize`].
-    pub fn char(&self) -> char {
-        match self.kind {
-            IndentKind::Space => ' ',
-            IndentKind::Tab => '\t',
-        }
-    }
-
-    /// Consumes the current [`IndentSize`] and returns a new one that has
-    /// been shrunk or enlarged by the given size along the given direction.
-    pub fn with_delta(mut self, direction: Ordering, size: IndentSize) -> Self {
-        match direction {
-            Ordering::Less => {
-                if self.kind == size.kind && self.len >= size.len {
-                    self.len -= size.len;
-                }
-            }
-            Ordering::Equal => {}
-            Ordering::Greater => {
-                if self.len == 0 {
-                    self = size;
-                } else if self.kind == size.kind {
-                    self.len += size.len;
-                }
-            }
-        }
-        self
-    }
-
-    pub fn len_with_expanded_tabs(&self, tab_size: NonZeroU32) -> usize {
-        match self.kind {
-            IndentKind::Space => self.len as usize,
-            IndentKind::Tab => self.len as usize * tab_size.get() as usize,
-        }
-    }
-}
-
-#[cfg(any(test, feature = "test-support"))]
-pub struct TestFile {
-    pub path: Arc<RelPath>,
-    pub root_name: String,
-    pub local_root: Option<PathBuf>,
-}
-
-#[cfg(any(test, feature = "test-support"))]
-impl File for TestFile {
-    fn path(&self) -> &Arc<RelPath> {
-        &self.path
-    }
-
-    fn full_path(&self, _: &gpui::App) -> PathBuf {
-        PathBuf::from(self.root_name.clone()).join(self.path.as_std_path())
-    }
-
-    fn as_local(&self) -> Option<&dyn LocalFile> {
-        if self.local_root.is_some() {
-            Some(self)
-        } else {
-            None
-        }
-    }
-
-    fn disk_state(&self) -> DiskState {
-        unimplemented!()
-    }
-
-    fn file_name<'a>(&'a self, _: &'a gpui::App) -> &'a str {
-        self.path().file_name().unwrap_or(self.root_name.as_ref())
-    }
-
-    fn worktree_id(&self, _: &App) -> WorktreeId {
-        WorktreeId::from_usize(0)
-    }
-
-    fn to_proto(&self, _: &App) -> rpc::proto::File {
-        unimplemented!()
-    }
-
-    fn is_private(&self) -> bool {
-        false
-    }
-
-    fn path_style(&self, _cx: &App) -> PathStyle {
-        PathStyle::local()
-    }
-}
-
-#[cfg(any(test, feature = "test-support"))]
-impl LocalFile for TestFile {
-    fn abs_path(&self, _cx: &App) -> PathBuf {
-        PathBuf::from(self.local_root.as_ref().unwrap())
-            .join(&self.root_name)
-            .join(self.path.as_std_path())
-    }
-
-    fn load(&self, _cx: &App) -> Task<Result<String>> {
-        unimplemented!()
-    }
-
-    fn load_bytes(&self, _cx: &App) -> Task<Result<Vec<u8>>> {
-        unimplemented!()
-    }
-}
-
-pub(crate) fn contiguous_ranges(
-    values: impl Iterator<Item = u32>,
-    max_len: usize,
-) -> impl Iterator<Item = Range<u32>> {
-    let mut values = values;
-    let mut current_range: Option<Range<u32>> = None;
-    std::iter::from_fn(move || {
-        loop {
-            if let Some(value) = values.next() {
-                if let Some(range) = &mut current_range
-                    && value == range.end
-                    && range.len() < max_len
-                {
-                    range.end += 1;
-                    continue;
-                }
-
-                let prev_range = current_range.clone();
-                current_range = Some(value..(value + 1));
-                if prev_range.is_some() {
-                    return prev_range;
-                }
-            } else {
-                return current_range.take();
-            }
-        }
-    })
-}
-
-#[derive(Default, Debug)]
-pub struct CharClassifier {
-    scope: Option<LanguageScope>,
-    scope_context: Option<CharScopeContext>,
-    ignore_punctuation: bool,
-}
-
-impl CharClassifier {
-    pub fn new(scope: Option<LanguageScope>) -> Self {
-        Self {
-            scope,
-            scope_context: None,
-            ignore_punctuation: false,
-        }
-    }
-
-    pub fn scope_context(self, scope_context: Option<CharScopeContext>) -> Self {
-        Self {
-            scope_context,
-            ..self
-        }
-    }
-
-    pub fn ignore_punctuation(self, ignore_punctuation: bool) -> Self {
-        Self {
-            ignore_punctuation,
-            ..self
-        }
-    }
-
-    pub fn is_whitespace(&self, c: char) -> bool {
-        self.kind(c) == CharKind::Whitespace
-    }
-
-    pub fn is_word(&self, c: char) -> bool {
-        self.kind(c) == CharKind::Word
-    }
-
-    pub fn is_punctuation(&self, c: char) -> bool {
-        self.kind(c) == CharKind::Punctuation
-    }
-
-    pub fn kind_with(&self, c: char, ignore_punctuation: bool) -> CharKind {
-        if c.is_alphanumeric() || c == '_' {
-            return CharKind::Word;
-        }
-
-        if let Some(scope) = &self.scope {
-            let characters = match self.scope_context {
-                Some(CharScopeContext::Completion) => scope.completion_query_characters(),
-                Some(CharScopeContext::LinkedEdit) => scope.linked_edit_characters(),
-                None => scope.word_characters(),
-            };
-            if let Some(characters) = characters
-                && characters.contains(&c)
-            {
-                return CharKind::Word;
-            }
-        }
-
-        if c.is_whitespace() {
-            return CharKind::Whitespace;
-        }
-
-        if ignore_punctuation {
-            CharKind::Word
-        } else {
-            CharKind::Punctuation
-        }
-    }
-
-    pub fn kind(&self, c: char) -> CharKind {
-        self.kind_with(c, self.ignore_punctuation)
-    }
-}
-
-/// Find all of the ranges of whitespace that occur at the ends of lines
-/// in the given rope.
-///
-/// This could also be done with a regex search, but this implementation
-/// avoids copying text.
-pub fn trailing_whitespace_ranges(rope: &Rope) -> Vec<Range<usize>> {
-    let mut ranges = Vec::new();
-
-    let mut offset = 0;
-    let mut prev_chunk_trailing_whitespace_range = 0..0;
-    for chunk in rope.chunks() {
-        let mut prev_line_trailing_whitespace_range = 0..0;
-        for (i, line) in chunk.split('\n').enumerate() {
-            let line_end_offset = offset + line.len();
-            let trimmed_line_len = line.trim_end_matches([' ', '\t']).len();
-            let mut trailing_whitespace_range = (offset + trimmed_line_len)..line_end_offset;
-
-            if i == 0 && trimmed_line_len == 0 {
-                trailing_whitespace_range.start = prev_chunk_trailing_whitespace_range.start;
-            }
-            if !prev_line_trailing_whitespace_range.is_empty() {
-                ranges.push(prev_line_trailing_whitespace_range);
-            }
-
-            offset = line_end_offset + 1;
-            prev_line_trailing_whitespace_range = trailing_whitespace_range;
-        }
-
-        offset -= 1;
-        prev_chunk_trailing_whitespace_range = prev_line_trailing_whitespace_range;
-    }
-
-    if !prev_chunk_trailing_whitespace_range.is_empty() {
-        ranges.push(prev_chunk_trailing_whitespace_range);
-    }
-
-    ranges
-}
diff --git a/crates/language/src/buffer/row_chunk.rs b/crates/language/src/buffer/row_chunk.rs
deleted file mode 100644
index e4ef5227e6..0000000000
--- a/crates/language/src/buffer/row_chunk.rs
+++ /dev/null
@@ -1,121 +0,0 @@
-//! A row chunk is an exclusive range of rows, [`BufferRow`] within a buffer of a certain version, [`Global`].
-//! All but the last chunk are of a constant, given size.
-
-use std::{ops::Range, sync::Arc};
-
-use clock::Global;
-use text::{Anchor, OffsetRangeExt as _, Point};
-use util::RangeExt;
-
-use crate::BufferRow;
-
-/// An range of rows, exclusive as [`lsp::Range`] and
-/// <https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#range>
-/// denote.
-///
-/// Represents an area in a text editor, adjacent to other ones.
-/// Together, chunks form entire document at a particular version [`Global`].
-/// Each chunk is queried for inlays as `(start_row, 0)..(end_exclusive, 0)` via
-/// <https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#inlayHintParams>
-#[derive(Clone)]
-pub struct RowChunks {
-    snapshot: text::BufferSnapshot,
-    chunks: Arc<[RowChunk]>,
-}
-
-impl std::fmt::Debug for RowChunks {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("RowChunks")
-            .field("version", self.snapshot.version())
-            .field("chunks", &self.chunks)
-            .finish()
-    }
-}
-
-impl RowChunks {
-    pub fn new(snapshot: text::BufferSnapshot, max_rows_per_chunk: u32) -> Self {
-        let buffer_point_range = (0..snapshot.len()).to_point(&snapshot);
-        let last_row = buffer_point_range.end.row;
-        let chunks = (buffer_point_range.start.row..=last_row)
-            .step_by(max_rows_per_chunk as usize)
-            .enumerate()
-            .map(|(id, chunk_start)| RowChunk {
-                id,
-                start: chunk_start,
-                end_exclusive: (chunk_start + max_rows_per_chunk).min(last_row),
-            })
-            .collect::<Vec<_>>();
-        Self {
-            snapshot,
-            chunks: Arc::from(chunks),
-        }
-    }
-
-    pub fn version(&self) -> &Global {
-        self.snapshot.version()
-    }
-
-    pub fn len(&self) -> usize {
-        self.chunks.len()
-    }
-
-    pub fn applicable_chunks(
-        &self,
-        ranges: &[Range<text::Anchor>],
-    ) -> impl Iterator<Item = RowChunk> {
-        let row_ranges = ranges
-            .iter()
-            .map(|range| range.to_point(&self.snapshot))
-            // Be lenient and yield multiple chunks if they "touch" the exclusive part of the range.
-            // This will result in LSP hints [re-]queried for more ranges, but also more hints already visible when scrolling around.
-            .map(|point_range| point_range.start.row..point_range.end.row + 1)
-            .collect::<Vec<_>>();
-        self.chunks
-            .iter()
-            .filter(move |chunk| -> bool {
-                let chunk_range = chunk.row_range().to_inclusive();
-                row_ranges
-                    .iter()
-                    .any(|row_range| chunk_range.overlaps(&row_range))
-            })
-            .copied()
-    }
-
-    pub fn chunk_range(&self, chunk: RowChunk) -> Option<Range<Anchor>> {
-        if !self.chunks.contains(&chunk) {
-            return None;
-        }
-
-        let start = Point::new(chunk.start, 0);
-        let end = if self.chunks.last() == Some(&chunk) {
-            Point::new(
-                chunk.end_exclusive,
-                self.snapshot.line_len(chunk.end_exclusive),
-            )
-        } else {
-            Point::new(chunk.end_exclusive, 0)
-        };
-        Some(self.snapshot.anchor_before(start)..self.snapshot.anchor_after(end))
-    }
-
-    pub fn previous_chunk(&self, chunk: RowChunk) -> Option<RowChunk> {
-        if chunk.id == 0 {
-            None
-        } else {
-            self.chunks.get(chunk.id - 1).copied()
-        }
-    }
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct RowChunk {
-    pub id: usize,
-    pub start: BufferRow,
-    pub end_exclusive: BufferRow,
-}
-
-impl RowChunk {
-    pub fn row_range(&self) -> Range<BufferRow> {
-        self.start..self.end_exclusive
-    }
-}
diff --git a/crates/language/src/buffer_tests.rs b/crates/language/src/buffer_tests.rs
deleted file mode 100644
index 54e2ef4065..0000000000
--- a/crates/language/src/buffer_tests.rs
+++ /dev/null
@@ -1,3969 +0,0 @@
-use super::*;
-use crate::Buffer;
-use clock::ReplicaId;
-use collections::BTreeMap;
-use futures::FutureExt as _;
-use gpui::{App, AppContext as _, BorrowAppContext, Entity};
-use gpui::{HighlightStyle, TestAppContext};
-use indoc::indoc;
-use pretty_assertions::assert_eq;
-use proto::deserialize_operation;
-use rand::prelude::*;
-use regex::RegexBuilder;
-use settings::SettingsStore;
-use settings::{AllLanguageSettingsContent, LanguageSettingsContent};
-use std::collections::BTreeSet;
-use std::{
-    env,
-    ops::Range,
-    sync::LazyLock,
-    time::{Duration, Instant},
-};
-use syntax_map::TreeSitterOptions;
-use text::network::Network;
-use text::{BufferId, LineEnding};
-use text::{Point, ToPoint};
-use theme::ActiveTheme;
-use unindent::Unindent as _;
-use util::rel_path::rel_path;
-use util::test::marked_text_offsets;
-use util::{RandomCharIter, assert_set_eq, post_inc, test::marked_text_ranges};
-
-pub static TRAILING_WHITESPACE_REGEX: LazyLock<regex::Regex> = LazyLock::new(|| {
-    RegexBuilder::new(r"[ \t]+$")
-        .multi_line(true)
-        .build()
-        .expect("Failed to create TRAILING_WHITESPACE_REGEX")
-});
-
-#[cfg(test)]
-#[ctor::ctor]
-fn init_logger() {
-    zlog::init_test();
-}
-
-#[gpui::test]
-fn test_line_endings(cx: &mut gpui::App) {
-    init_settings(cx, |_| {});
-
-    cx.new(|cx| {
-        let mut buffer = Buffer::local("one\r\ntwo\rthree", cx).with_language(rust_lang(), cx);
-        assert_eq!(buffer.text(), "one\ntwo\nthree");
-        assert_eq!(buffer.line_ending(), LineEnding::Windows);
-
-        buffer.check_invariants();
-        buffer.edit(
-            [(buffer.len()..buffer.len(), "\r\nfour")],
-            Some(AutoindentMode::EachLine),
-            cx,
-        );
-        buffer.edit([(0..0, "zero\r\n")], None, cx);
-        assert_eq!(buffer.text(), "zero\none\ntwo\nthree\nfour");
-        assert_eq!(buffer.line_ending(), LineEnding::Windows);
-        buffer.check_invariants();
-
-        buffer
-    });
-}
-
-#[gpui::test]
-fn test_set_line_ending(cx: &mut TestAppContext) {
-    let base = cx.new(|cx| Buffer::local("one\ntwo\nthree\n", cx));
-    let base_replica = cx.new(|cx| {
-        Buffer::from_proto(
-            ReplicaId::new(1),
-            Capability::ReadWrite,
-            base.read(cx).to_proto(cx),
-            None,
-        )
-        .unwrap()
-    });
-    base.update(cx, |_buffer, cx| {
-        cx.subscribe(&base_replica, |this, _, event, cx| {
-            if let BufferEvent::Operation {
-                operation,
-                is_local: true,
-            } = event
-            {
-                this.apply_ops([operation.clone()], cx);
-            }
-        })
-        .detach();
-    });
-    base_replica.update(cx, |_buffer, cx| {
-        cx.subscribe(&base, |this, _, event, cx| {
-            if let BufferEvent::Operation {
-                operation,
-                is_local: true,
-            } = event
-            {
-                this.apply_ops([operation.clone()], cx);
-            }
-        })
-        .detach();
-    });
-
-    // Base
-    base_replica.read_with(cx, |buffer, _| {
-        assert_eq!(buffer.line_ending(), LineEnding::Unix);
-    });
-    base.update(cx, |buffer, cx| {
-        assert_eq!(buffer.line_ending(), LineEnding::Unix);
-        buffer.set_line_ending(LineEnding::Windows, cx);
-        assert_eq!(buffer.line_ending(), LineEnding::Windows);
-    });
-    base_replica.read_with(cx, |buffer, _| {
-        assert_eq!(buffer.line_ending(), LineEnding::Windows);
-    });
-    base.update(cx, |buffer, cx| {
-        buffer.set_line_ending(LineEnding::Unix, cx);
-        assert_eq!(buffer.line_ending(), LineEnding::Unix);
-    });
-    base_replica.read_with(cx, |buffer, _| {
-        assert_eq!(buffer.line_ending(), LineEnding::Unix);
-    });
-
-    // Replica
-    base.read_with(cx, |buffer, _| {
-        assert_eq!(buffer.line_ending(), LineEnding::Unix);
-    });
-    base_replica.update(cx, |buffer, cx| {
-        assert_eq!(buffer.line_ending(), LineEnding::Unix);
-        buffer.set_line_ending(LineEnding::Windows, cx);
-        assert_eq!(buffer.line_ending(), LineEnding::Windows);
-    });
-    base.read_with(cx, |buffer, _| {
-        assert_eq!(buffer.line_ending(), LineEnding::Windows);
-    });
-    base_replica.update(cx, |buffer, cx| {
-        buffer.set_line_ending(LineEnding::Unix, cx);
-        assert_eq!(buffer.line_ending(), LineEnding::Unix);
-    });
-    base.read_with(cx, |buffer, _| {
-        assert_eq!(buffer.line_ending(), LineEnding::Unix);
-    });
-}
-
-#[gpui::test]
-fn test_select_language(cx: &mut App) {
-    init_settings(cx, |_| {});
-
-    let registry = Arc::new(LanguageRegistry::test(cx.background_executor().clone()));
-    registry.add(Arc::new(Language::new(
-        LanguageConfig {
-            name: LanguageName::new_static("Rust"),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["rs".to_string()],
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-        Some(tree_sitter_rust::LANGUAGE.into()),
-    )));
-    registry.add(Arc::new(Language::new(
-        LanguageConfig {
-            name: "Rust with longer extension".into(),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["longer.rs".to_string()],
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-        Some(tree_sitter_rust::LANGUAGE.into()),
-    )));
-    registry.add(Arc::new(Language::new(
-        LanguageConfig {
-            name: LanguageName::new_static("Make"),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["Makefile".to_string(), "mk".to_string()],
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-        Some(tree_sitter_rust::LANGUAGE.into()),
-    )));
-
-    // matching file extension
-    assert_eq!(
-        registry
-            .language_for_file(&file("src/lib.rs"), None, cx)
-            .map(|l| l.name()),
-        Some("Rust".into())
-    );
-    assert_eq!(
-        registry
-            .language_for_file(&file("src/lib.mk"), None, cx)
-            .map(|l| l.name()),
-        Some("Make".into())
-    );
-
-    // matching longer, compound extension, part of which could also match another lang
-    assert_eq!(
-        registry
-            .language_for_file(&file("src/lib.longer.rs"), None, cx)
-            .map(|l| l.name()),
-        Some("Rust with longer extension".into())
-    );
-
-    // matching filename
-    assert_eq!(
-        registry
-            .language_for_file(&file("src/Makefile"), None, cx)
-            .map(|l| l.name()),
-        Some("Make".into())
-    );
-
-    // matching suffix that is not the full file extension or filename
-    assert_eq!(
-        registry
-            .language_for_file(&file("zed/cars"), None, cx)
-            .map(|l| l.name()),
-        None
-    );
-    assert_eq!(
-        registry
-            .language_for_file(&file("zed/a.cars"), None, cx)
-            .map(|l| l.name()),
-        None
-    );
-    assert_eq!(
-        registry
-            .language_for_file(&file("zed/sumk"), None, cx)
-            .map(|l| l.name()),
-        None
-    );
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_first_line_pattern(cx: &mut TestAppContext) {
-    cx.update(|cx| init_settings(cx, |_| {}));
-
-    let languages = LanguageRegistry::test(cx.executor());
-    let languages = Arc::new(languages);
-
-    languages.register_test_language(LanguageConfig {
-        name: "JavaScript".into(),
-        matcher: LanguageMatcher {
-            path_suffixes: vec!["js".into()],
-            first_line_pattern: Some(Regex::new(r"\bnode\b").unwrap()),
-        },
-        ..Default::default()
-    });
-
-    assert!(
-        cx.read(|cx| languages.language_for_file(&file("the/script"), None, cx))
-            .is_none()
-    );
-    assert!(
-        cx.read(|cx| languages.language_for_file(&file("the/script"), Some(&"nothing".into()), cx))
-            .is_none()
-    );
-
-    assert_eq!(
-        cx.read(|cx| languages.language_for_file(
-            &file("the/script"),
-            Some(&"#!/bin/env node".into()),
-            cx
-        ))
-        .unwrap()
-        .name(),
-        "JavaScript".into()
-    );
-}
-
-#[gpui::test]
-async fn test_language_for_file_with_custom_file_types(cx: &mut TestAppContext) {
-    cx.update(|cx| {
-        init_settings(cx, |settings| {
-            settings.file_types.get_or_insert_default().extend([
-                ("TypeScript".into(), vec!["js".into()].into()),
-                (
-                    "JavaScript".into(),
-                    vec!["*longer.ts".into(), "ecmascript".into()].into(),
-                ),
-                ("C++".into(), vec!["c".into(), "*.dev".into()].into()),
-                (
-                    "Dockerfile".into(),
-                    vec!["Dockerfile".into(), "Dockerfile.*".into()].into(),
-                ),
-            ]);
-        })
-    });
-
-    let languages = Arc::new(LanguageRegistry::test(cx.executor()));
-
-    for config in [
-        LanguageConfig {
-            name: "JavaScript".into(),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["js".to_string()],
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-        LanguageConfig {
-            name: "TypeScript".into(),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["ts".to_string(), "ts.ecmascript".to_string()],
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-        LanguageConfig {
-            name: "C++".into(),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["cpp".to_string()],
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-        LanguageConfig {
-            name: "C".into(),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["c".to_string()],
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-        LanguageConfig {
-            name: "Dockerfile".into(),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["Dockerfile".to_string()],
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-    ] {
-        languages.add(Arc::new(Language::new(config, None)));
-    }
-
-    // matches system-provided lang extension
-    let language = cx
-        .read(|cx| languages.language_for_file(&file("foo.ts"), None, cx))
-        .unwrap();
-    assert_eq!(language.name(), "TypeScript".into());
-    let language = cx
-        .read(|cx| languages.language_for_file(&file("foo.ts.ecmascript"), None, cx))
-        .unwrap();
-    assert_eq!(language.name(), "TypeScript".into());
-    let language = cx
-        .read(|cx| languages.language_for_file(&file("foo.cpp"), None, cx))
-        .unwrap();
-    assert_eq!(language.name(), "C++".into());
-
-    // user configured lang extension, same length as system-provided
-    let language = cx
-        .read(|cx| languages.language_for_file(&file("foo.js"), None, cx))
-        .unwrap();
-    assert_eq!(language.name(), "TypeScript".into());
-    let language = cx
-        .read(|cx| languages.language_for_file(&file("foo.c"), None, cx))
-        .unwrap();
-    assert_eq!(language.name(), "C++".into());
-
-    // user configured lang extension, longer than system-provided
-    let language = cx
-        .read(|cx| languages.language_for_file(&file("foo.longer.ts"), None, cx))
-        .unwrap();
-    assert_eq!(language.name(), "JavaScript".into());
-
-    // user configured lang extension, shorter than system-provided
-    let language = cx
-        .read(|cx| languages.language_for_file(&file("foo.ecmascript"), None, cx))
-        .unwrap();
-    assert_eq!(language.name(), "JavaScript".into());
-
-    // user configured glob matches
-    let language = cx
-        .read(|cx| languages.language_for_file(&file("c-plus-plus.dev"), None, cx))
-        .unwrap();
-    assert_eq!(language.name(), "C++".into());
-    // should match Dockerfile.* => Dockerfile, not *.dev => C++
-    let language = cx
-        .read(|cx| languages.language_for_file(&file("Dockerfile.dev"), None, cx))
-        .unwrap();
-    assert_eq!(language.name(), "Dockerfile".into());
-}
-
-fn file(path: &str) -> Arc<dyn File> {
-    Arc::new(TestFile {
-        path: Arc::from(rel_path(path)),
-        root_name: "zed".into(),
-        local_root: None,
-    })
-}
-
-#[gpui::test]
-fn test_edit_events(cx: &mut gpui::App) {
-    let mut now = Instant::now();
-    let buffer_1_events = Arc::new(Mutex::new(Vec::new()));
-    let buffer_2_events = Arc::new(Mutex::new(Vec::new()));
-
-    let buffer1 = cx.new(|cx| Buffer::local("abcdef", cx));
-    let buffer2 = cx.new(|cx| {
-        Buffer::remote(
-            BufferId::from(cx.entity_id().as_non_zero_u64()),
-            ReplicaId::new(1),
-            Capability::ReadWrite,
-            "abcdef",
-        )
-    });
-    let buffer1_ops = Arc::new(Mutex::new(Vec::new()));
-    buffer1.update(cx, {
-        let buffer1_ops = buffer1_ops.clone();
-        |buffer, cx| {
-            let buffer_1_events = buffer_1_events.clone();
-            cx.subscribe(&buffer1, move |_, _, event, _| match event.clone() {
-                BufferEvent::Operation {
-                    operation,
-                    is_local: true,
-                } => buffer1_ops.lock().push(operation),
-                event => buffer_1_events.lock().push(event),
-            })
-            .detach();
-            let buffer_2_events = buffer_2_events.clone();
-            cx.subscribe(&buffer2, move |_, _, event, _| match event.clone() {
-                BufferEvent::Operation {
-                    is_local: false, ..
-                } => {}
-                event => buffer_2_events.lock().push(event),
-            })
-            .detach();
-
-            // An edit emits an edited event, followed by a dirty changed event,
-            // since the buffer was previously in a clean state.
-            buffer.edit([(2..4, "XYZ")], None, cx);
-
-            // An empty transaction does not emit any events.
-            buffer.start_transaction();
-            buffer.end_transaction(cx);
-
-            // A transaction containing two edits emits one edited event.
-            now += Duration::from_secs(1);
-            buffer.start_transaction_at(now);
-            buffer.edit([(5..5, "u")], None, cx);
-            buffer.edit([(6..6, "w")], None, cx);
-            buffer.end_transaction_at(now, cx);
-
-            // Undoing a transaction emits one edited event.
-            buffer.undo(cx);
-        }
-    });
-
-    // Incorporating a set of remote ops emits a single edited event,
-    // followed by a dirty changed event.
-    buffer2.update(cx, |buffer, cx| {
-        buffer.apply_ops(buffer1_ops.lock().drain(..), cx);
-    });
-    assert_eq!(
-        mem::take(&mut *buffer_1_events.lock()),
-        vec![
-            BufferEvent::Edited,
-            BufferEvent::DirtyChanged,
-            BufferEvent::Edited,
-            BufferEvent::Edited,
-        ]
-    );
-    assert_eq!(
-        mem::take(&mut *buffer_2_events.lock()),
-        vec![BufferEvent::Edited, BufferEvent::DirtyChanged]
-    );
-
-    buffer1.update(cx, |buffer, cx| {
-        // Undoing the first transaction emits edited event, followed by a
-        // dirty changed event, since the buffer is again in a clean state.
-        buffer.undo(cx);
-    });
-    // Incorporating the remote ops again emits a single edited event,
-    // followed by a dirty changed event.
-    buffer2.update(cx, |buffer, cx| {
-        buffer.apply_ops(buffer1_ops.lock().drain(..), cx);
-    });
-    assert_eq!(
-        mem::take(&mut *buffer_1_events.lock()),
-        vec![BufferEvent::Edited, BufferEvent::DirtyChanged,]
-    );
-    assert_eq!(
-        mem::take(&mut *buffer_2_events.lock()),
-        vec![BufferEvent::Edited, BufferEvent::DirtyChanged]
-    );
-}
-
-#[gpui::test]
-async fn test_apply_diff(cx: &mut TestAppContext) {
-    let (text, offsets) = marked_text_offsets(
-        "one two three\nfour fiˇve six\nseven eightˇ nine\nten eleven twelve\n",
-    );
-    let buffer = cx.new(|cx| Buffer::local(text, cx));
-    let anchors = buffer.update(cx, |buffer, _| {
-        offsets
-            .iter()
-            .map(|offset| buffer.anchor_before(offset))
-            .collect::<Vec<_>>()
-    });
-
-    let (text, offsets) = marked_text_offsets(
-        "one two three\n{\nfour FIVEˇ six\n}\nseven AND EIGHTˇ nine\nten eleven twelve\n",
-    );
-
-    let diff = buffer.update(cx, |b, cx| b.diff(text.clone(), cx)).await;
-    buffer.update(cx, |buffer, cx| {
-        buffer.apply_diff(diff, cx).unwrap();
-        assert_eq!(buffer.text(), text);
-        let actual_offsets = anchors
-            .iter()
-            .map(|anchor| anchor.to_offset(buffer))
-            .collect::<Vec<_>>();
-        assert_eq!(actual_offsets, offsets);
-    });
-
-    let (text, offsets) =
-        marked_text_offsets("one two three\n{\nˇ}\nseven AND EIGHTEENˇ nine\nten eleven twelve\n");
-
-    let diff = buffer.update(cx, |b, cx| b.diff(text.clone(), cx)).await;
-    buffer.update(cx, |buffer, cx| {
-        buffer.apply_diff(diff, cx).unwrap();
-        assert_eq!(buffer.text(), text);
-        let actual_offsets = anchors
-            .iter()
-            .map(|anchor| anchor.to_offset(buffer))
-            .collect::<Vec<_>>();
-        assert_eq!(actual_offsets, offsets);
-    });
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_normalize_whitespace(cx: &mut gpui::TestAppContext) {
-    let text = [
-        "zero",     //
-        "one  ",    // 2 trailing spaces
-        "two",      //
-        "three   ", // 3 trailing spaces
-        "four",     //
-        "five    ", // 4 trailing spaces
-    ]
-    .join("\n");
-
-    let buffer = cx.new(|cx| Buffer::local(text, cx));
-
-    // Spawn a task to format the buffer's whitespace.
-    // Pause so that the formatting task starts running.
-    let format = buffer.update(cx, |buffer, cx| buffer.remove_trailing_whitespace(cx));
-    smol::future::yield_now().await;
-
-    // Edit the buffer while the normalization task is running.
-    let version_before_edit = buffer.update(cx, |buffer, _| buffer.version());
-    buffer.update(cx, |buffer, cx| {
-        buffer.edit(
-            [
-                (Point::new(0, 1)..Point::new(0, 1), "EE"),
-                (Point::new(3, 5)..Point::new(3, 5), "EEE"),
-            ],
-            None,
-            cx,
-        );
-    });
-
-    let format_diff = format.await;
-    buffer.update(cx, |buffer, cx| {
-        let version_before_format = format_diff.base_version.clone();
-        buffer.apply_diff(format_diff, cx);
-
-        // The outcome depends on the order of concurrent tasks.
-        //
-        // If the edit occurred while searching for trailing whitespace ranges,
-        // then the trailing whitespace region touched by the edit is left intact.
-        if version_before_format == version_before_edit {
-            assert_eq!(
-                buffer.text(),
-                [
-                    "zEEero",      //
-                    "one",         //
-                    "two",         //
-                    "threeEEE   ", //
-                    "four",        //
-                    "five",        //
-                ]
-                .join("\n")
-            );
-        }
-        // Otherwise, all trailing whitespace is removed.
-        else {
-            assert_eq!(
-                buffer.text(),
-                [
-                    "zEEero",   //
-                    "one",      //
-                    "two",      //
-                    "threeEEE", //
-                    "four",     //
-                    "five",     //
-                ]
-                .join("\n")
-            );
-        }
-    });
-}
-
-#[gpui::test]
-async fn test_reparse(cx: &mut gpui::TestAppContext) {
-    let text = "fn a() {}";
-    let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(rust_lang(), cx));
-
-    // Wait for the initial text to parse
-    cx.executor().run_until_parked();
-    assert!(!buffer.update(cx, |buffer, _| buffer.is_parsing()));
-    assert_eq!(
-        get_tree_sexp(&buffer, cx),
-        concat!(
-            "(source_file (function_item name: (identifier) ",
-            "parameters: (parameters) ",
-            "body: (block)))"
-        )
-    );
-
-    buffer.update(cx, |buffer, _| {
-        buffer.set_sync_parse_timeout(Duration::ZERO)
-    });
-
-    // Perform some edits (add parameter and variable reference)
-    // Parsing doesn't begin until the transaction is complete
-    buffer.update(cx, |buf, cx| {
-        buf.start_transaction();
-
-        let offset = buf.text().find(')').unwrap();
-        buf.edit([(offset..offset, "b: C")], None, cx);
-        assert!(!buf.is_parsing());
-
-        let offset = buf.text().find('}').unwrap();
-        buf.edit([(offset..offset, " d; ")], None, cx);
-        assert!(!buf.is_parsing());
-
-        buf.end_transaction(cx);
-        assert_eq!(buf.text(), "fn a(b: C) { d; }");
-        assert!(buf.is_parsing());
-    });
-    cx.executor().run_until_parked();
-    assert!(!buffer.update(cx, |buffer, _| buffer.is_parsing()));
-    assert_eq!(
-        get_tree_sexp(&buffer, cx),
-        concat!(
-            "(source_file (function_item name: (identifier) ",
-            "parameters: (parameters (parameter pattern: (identifier) type: (type_identifier))) ",
-            "body: (block (expression_statement (identifier)))))"
-        )
-    );
-
-    // Perform a series of edits without waiting for the current parse to complete:
-    // * turn identifier into a field expression
-    // * turn field expression into a method call
-    // * add a turbofish to the method call
-    buffer.update(cx, |buf, cx| {
-        let offset = buf.text().find(';').unwrap();
-        buf.edit([(offset..offset, ".e")], None, cx);
-        assert_eq!(buf.text(), "fn a(b: C) { d.e; }");
-        assert!(buf.is_parsing());
-    });
-    buffer.update(cx, |buf, cx| {
-        let offset = buf.text().find(';').unwrap();
-        buf.edit([(offset..offset, "(f)")], None, cx);
-        assert_eq!(buf.text(), "fn a(b: C) { d.e(f); }");
-        assert!(buf.is_parsing());
-    });
-    buffer.update(cx, |buf, cx| {
-        let offset = buf.text().find("(f)").unwrap();
-        buf.edit([(offset..offset, "::<G>")], None, cx);
-        assert_eq!(buf.text(), "fn a(b: C) { d.e::<G>(f); }");
-        assert!(buf.is_parsing());
-    });
-    cx.executor().run_until_parked();
-    assert_eq!(
-        get_tree_sexp(&buffer, cx),
-        concat!(
-            "(source_file (function_item name: (identifier) ",
-            "parameters: (parameters (parameter pattern: (identifier) type: (type_identifier))) ",
-            "body: (block (expression_statement (call_expression ",
-            "function: (generic_function ",
-            "function: (field_expression value: (identifier) field: (field_identifier)) ",
-            "type_arguments: (type_arguments (type_identifier))) ",
-            "arguments: (arguments (identifier)))))))",
-        )
-    );
-
-    buffer.update(cx, |buf, cx| {
-        buf.undo(cx);
-        buf.undo(cx);
-        buf.undo(cx);
-        buf.undo(cx);
-        assert_eq!(buf.text(), "fn a() {}");
-        assert!(buf.is_parsing());
-    });
-
-    cx.executor().run_until_parked();
-    assert_eq!(
-        get_tree_sexp(&buffer, cx),
-        concat!(
-            "(source_file (function_item name: (identifier) ",
-            "parameters: (parameters) ",
-            "body: (block)))"
-        )
-    );
-
-    buffer.update(cx, |buf, cx| {
-        buf.redo(cx);
-        buf.redo(cx);
-        buf.redo(cx);
-        buf.redo(cx);
-        assert_eq!(buf.text(), "fn a(b: C) { d.e::<G>(f); }");
-        assert!(buf.is_parsing());
-    });
-    cx.executor().run_until_parked();
-    assert_eq!(
-        get_tree_sexp(&buffer, cx),
-        concat!(
-            "(source_file (function_item name: (identifier) ",
-            "parameters: (parameters (parameter pattern: (identifier) type: (type_identifier))) ",
-            "body: (block (expression_statement (call_expression ",
-            "function: (generic_function ",
-            "function: (field_expression value: (identifier) field: (field_identifier)) ",
-            "type_arguments: (type_arguments (type_identifier))) ",
-            "arguments: (arguments (identifier)))))))",
-        )
-    );
-}
-
-#[gpui::test]
-async fn test_resetting_language(cx: &mut gpui::TestAppContext) {
-    let buffer = cx.new(|cx| {
-        let mut buffer = Buffer::local("{}", cx).with_language(rust_lang(), cx);
-        buffer.set_sync_parse_timeout(Duration::ZERO);
-        buffer
-    });
-
-    // Wait for the initial text to parse
-    cx.executor().run_until_parked();
-    assert_eq!(
-        get_tree_sexp(&buffer, cx),
-        "(source_file (expression_statement (block)))"
-    );
-
-    buffer.update(cx, |buffer, cx| {
-        buffer.set_language(Some(Arc::new(json_lang())), cx)
-    });
-    cx.executor().run_until_parked();
-    assert_eq!(get_tree_sexp(&buffer, cx), "(document (object))");
-}
-
-#[gpui::test]
-async fn test_outline(cx: &mut gpui::TestAppContext) {
-    let text = r#"
-        struct Person {
-            name: String,
-            age: usize,
-        }
-
-        mod module {
-            enum LoginState {
-                LoggedOut,
-                LoggingOn,
-                LoggedIn {
-                    person: Person,
-                    time: Instant,
-                }
-            }
-        }
-
-        impl Eq for Person {}
-
-        impl Drop for Person {
-            fn drop(&mut self) {
-                println!("bye");
-            }
-        }
-    "#
-    .unindent();
-
-    let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(rust_lang(), cx));
-    let snapshot = buffer.update(cx, |buffer, _| buffer.snapshot());
-    let outline = snapshot.outline(None);
-
-    assert_eq!(
-        outline
-            .items
-            .iter()
-            .map(|item| (
-                item.text.as_str(),
-                item.depth,
-                item.to_point(&snapshot).body_range(&snapshot)
-                    .map(|range| minimize_space(&snapshot.text_for_range(range).collect::<String>()))
-            ))
-            .collect::<Vec<_>>(),
-        &[
-            ("struct Person", 0, Some("name: String, age: usize,".to_string())),
-            ("name", 1, None),
-            ("age", 1, None),
-            (
-                "mod module",
-                0,
-                Some(
-                    "enum LoginState { LoggedOut, LoggingOn, LoggedIn { person: Person, time: Instant, } }".to_string()
-                )
-            ),
-            (
-                "enum LoginState",
-                1,
-                Some("LoggedOut, LoggingOn, LoggedIn { person: Person, time: Instant, }".to_string())
-            ),
-            ("LoggedOut", 2, None),
-            ("LoggingOn", 2, None),
-            ("LoggedIn", 2, Some("person: Person, time: Instant,".to_string())),
-            ("person", 3, None),
-            ("time", 3, None),
-            ("impl Eq for Person", 0, Some("".to_string())),
-            (
-                "impl Drop for Person",
-                0,
-                Some("fn drop(&mut self) { println!(\"bye\"); }".to_string())
-            ),
-            ("fn drop", 1, Some("println!(\"bye\");".to_string())),
-        ]
-    );
-
-    // Without space, we only match on names
-    assert_eq!(
-        search(&outline, "oon", cx).await,
-        &[
-            ("mod module", vec![]),                    // included as the parent of a match
-            ("enum LoginState", vec![]),               // included as the parent of a match
-            ("LoggingOn", vec![1, 7, 8]),              // matches
-            ("impl Drop for Person", vec![7, 18, 19]), // matches in two disjoint names
-        ]
-    );
-
-    assert_eq!(
-        search(&outline, "dp p", cx).await,
-        &[
-            ("impl Drop for Person", vec![5, 8, 9, 14]),
-            ("fn drop", vec![]),
-        ]
-    );
-    assert_eq!(
-        search(&outline, "dpn", cx).await,
-        &[("impl Drop for Person", vec![5, 14, 19])]
-    );
-    assert_eq!(
-        search(&outline, "impl ", cx).await,
-        &[
-            ("impl Eq for Person", vec![0, 1, 2, 3, 4]),
-            ("impl Drop for Person", vec![0, 1, 2, 3, 4]),
-            ("fn drop", vec![]),
-        ]
-    );
-
-    fn minimize_space(text: &str) -> String {
-        static WHITESPACE: LazyLock<Regex> = LazyLock::new(|| Regex::new("[\\n\\s]+").unwrap());
-        WHITESPACE.replace_all(text, " ").trim().to_string()
-    }
-
-    async fn search<'a>(
-        outline: &'a Outline<Anchor>,
-        query: &'a str,
-        cx: &'a gpui::TestAppContext,
-    ) -> Vec<(&'a str, Vec<usize>)> {
-        let matches = cx
-            .update(|cx| outline.search(query, cx.background_executor().clone()))
-            .await;
-        matches
-            .into_iter()
-            .map(|mat| (outline.items[mat.candidate_id].text.as_str(), mat.positions))
-            .collect::<Vec<_>>()
-    }
-}
-
-#[gpui::test]
-async fn test_outline_nodes_with_newlines(cx: &mut gpui::TestAppContext) {
-    let text = r#"
-        impl A for B<
-            C
-        > {
-        };
-    "#
-    .unindent();
-
-    let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(rust_lang(), cx));
-    let outline = buffer.update(cx, |buffer, _| buffer.snapshot().outline(None));
-
-    assert_eq!(
-        outline
-            .items
-            .iter()
-            .map(|item| (item.text.as_str(), item.depth))
-            .collect::<Vec<_>>(),
-        &[("impl A for B<", 0)]
-    );
-}
-
-#[gpui::test]
-async fn test_outline_with_extra_context(cx: &mut gpui::TestAppContext) {
-    let language = javascript_lang()
-        .with_outline_query(
-            r#"
-            (function_declaration
-                "function" @context
-                name: (_) @name
-                parameters: (formal_parameters
-                    "(" @context.extra
-                    ")" @context.extra)) @item
-            "#,
-        )
-        .unwrap();
-
-    let text = r#"
-        function a() {}
-        function b(c) {}
-    "#
-    .unindent();
-
-    let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(Arc::new(language), cx));
-    let snapshot = buffer.update(cx, |buffer, _| buffer.snapshot());
-
-    // extra context nodes are included in the outline.
-    let outline = snapshot.outline(None);
-    assert_eq!(
-        outline
-            .items
-            .iter()
-            .map(|item| (item.text.as_str(), item.depth))
-            .collect::<Vec<_>>(),
-        &[("function a()", 0), ("function b( )", 0),]
-    );
-
-    // extra context nodes do not appear in breadcrumbs.
-    let symbols = snapshot.symbols_containing(3, None);
-    assert_eq!(
-        symbols
-            .iter()
-            .map(|item| (item.text.as_str(), item.depth))
-            .collect::<Vec<_>>(),
-        &[("function a", 0)]
-    );
-}
-
-#[gpui::test]
-fn test_outline_annotations(cx: &mut App) {
-    // Add this new test case
-    let text = r#"
-        /// This is a doc comment
-        /// that spans multiple lines
-        fn annotated_function() {
-            // This is not an annotation
-        }
-
-        // This is a single-line annotation
-        fn another_function() {}
-
-        fn unannotated_function() {}
-
-        // This comment is not an annotation
-
-        fn function_after_blank_line() {}
-    "#
-    .unindent();
-
-    let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(rust_lang(), cx));
-    let outline = buffer.update(cx, |buffer, _| buffer.snapshot().outline(None));
-
-    assert_eq!(
-        outline
-            .items
-            .into_iter()
-            .map(|item| (
-                item.text,
-                item.depth,
-                item.annotation_range
-                    .map(|range| { buffer.read(cx).text_for_range(range).collect::<String>() })
-            ))
-            .collect::<Vec<_>>(),
-        &[
-            (
-                "fn annotated_function".to_string(),
-                0,
-                Some("/// This is a doc comment\n/// that spans multiple lines".to_string())
-            ),
-            (
-                "fn another_function".to_string(),
-                0,
-                Some("// This is a single-line annotation".to_string())
-            ),
-            ("fn unannotated_function".to_string(), 0, None),
-            ("fn function_after_blank_line".to_string(), 0, None),
-        ]
-    );
-}
-
-#[gpui::test]
-async fn test_symbols_containing(cx: &mut gpui::TestAppContext) {
-    let text = r#"
-        impl Person {
-            fn one() {
-                1
-            }
-
-            fn two() {
-                2
-            }fn three() {
-                3
-            }
-        }
-    "#
-    .unindent();
-
-    let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(rust_lang(), cx));
-    let snapshot = buffer.update(cx, |buffer, _| buffer.snapshot());
-
-    // point is at the start of an item
-    assert_eq!(
-        symbols_containing(Point::new(1, 4), &snapshot),
-        vec![
-            (
-                "impl Person".to_string(),
-                Point::new(0, 0)..Point::new(10, 1)
-            ),
-            ("fn one".to_string(), Point::new(1, 4)..Point::new(3, 5))
-        ]
-    );
-
-    // point is in the middle of an item
-    assert_eq!(
-        symbols_containing(Point::new(2, 8), &snapshot),
-        vec![
-            (
-                "impl Person".to_string(),
-                Point::new(0, 0)..Point::new(10, 1)
-            ),
-            ("fn one".to_string(), Point::new(1, 4)..Point::new(3, 5))
-        ]
-    );
-
-    // point is at the end of an item
-    assert_eq!(
-        symbols_containing(Point::new(3, 5), &snapshot),
-        vec![
-            (
-                "impl Person".to_string(),
-                Point::new(0, 0)..Point::new(10, 1)
-            ),
-            ("fn one".to_string(), Point::new(1, 4)..Point::new(3, 5))
-        ]
-    );
-
-    // point is in between two adjacent items
-    assert_eq!(
-        symbols_containing(Point::new(7, 5), &snapshot),
-        vec![
-            (
-                "impl Person".to_string(),
-                Point::new(0, 0)..Point::new(10, 1)
-            ),
-            ("fn two".to_string(), Point::new(5, 4)..Point::new(7, 5))
-        ]
-    );
-
-    fn symbols_containing(
-        position: Point,
-        snapshot: &BufferSnapshot,
-    ) -> Vec<(String, Range<Point>)> {
-        snapshot
-            .symbols_containing(position, None)
-            .into_iter()
-            .map(|item| {
-                (
-                    item.text,
-                    item.range.start.to_point(snapshot)..item.range.end.to_point(snapshot),
-                )
-            })
-            .collect()
-    }
-
-    let (text, offsets) = marked_text_offsets(
-        &"
-        // ˇ😅 //
-        fn test() {
-        }
-    "
-        .unindent(),
-    );
-    let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(rust_lang(), cx));
-    let snapshot = buffer.update(cx, |buffer, _| buffer.snapshot());
-
-    // note, it would be nice to actually return the method test in this
-    // case, but primarily asserting we don't crash because of the multibyte character.
-    assert_eq!(snapshot.symbols_containing(offsets[0], None), vec![]);
-}
-
-#[gpui::test]
-fn test_text_objects(cx: &mut App) {
-    let (text, ranges) = marked_text_ranges(
-        indoc! {r#"
-            impl Hello {
-                fn say() -> u8 { return /* ˇhi */ 1 }
-            }"#
-        },
-        false,
-    );
-
-    let buffer = cx.new(|cx| Buffer::local(text.clone(), cx).with_language(rust_lang(), cx));
-    let snapshot = buffer.update(cx, |buffer, _| buffer.snapshot());
-
-    let matches = snapshot
-        .text_object_ranges(ranges[0].clone(), TreeSitterOptions::default())
-        .map(|(range, text_object)| (&text[range], text_object))
-        .collect::<Vec<_>>();
-
-    assert_eq!(
-        matches,
-        &[
-            ("/* hi */", TextObject::AroundComment),
-            ("return /* hi */ 1", TextObject::InsideFunction),
-            (
-                "fn say() -> u8 { return /* hi */ 1 }",
-                TextObject::AroundFunction
-            ),
-            (
-                "fn say() -> u8 { return /* hi */ 1 }",
-                TextObject::InsideClass
-            ),
-            (
-                "impl Hello {\n    fn say() -> u8 { return /* hi */ 1 }\n}",
-                TextObject::AroundClass
-            ),
-        ],
-    )
-}
-
-#[gpui::test]
-fn test_enclosing_bracket_ranges(cx: &mut App) {
-    #[track_caller]
-    fn assert(selection_text: &'static str, range_markers: Vec<&'static str>, cx: &mut App) {
-        assert_bracket_pairs(selection_text, range_markers, rust_lang(), cx)
-    }
-
-    assert(
-        indoc! {"
-            mod x {
-                moˇd y {
-
-                }
-            }
-            let foo = 1;"},
-        vec![indoc! {"
-            mod x «{»
-                mod y {
-
-                }
-            «}»
-            let foo = 1;"}],
-        cx,
-    );
-
-    assert(
-        indoc! {"
-            mod x {
-                mod y ˇ{
-
-                }
-            }
-            let foo = 1;"},
-        vec![
-            indoc! {"
-                mod x «{»
-                    mod y {
-
-                    }
-                «}»
-                let foo = 1;"},
-            indoc! {"
-                mod x {
-                    mod y «{»
-
-                    «}»
-                }
-                let foo = 1;"},
-        ],
-        cx,
-    );
-
-    assert(
-        indoc! {"
-            mod x {
-                mod y {
-
-                }ˇ
-            }
-            let foo = 1;"},
-        vec![
-            indoc! {"
-                mod x «{»
-                    mod y {
-
-                    }
-                «}»
-                let foo = 1;"},
-            indoc! {"
-                mod x {
-                    mod y «{»
-
-                    «}»
-                }
-                let foo = 1;"},
-        ],
-        cx,
-    );
-
-    assert(
-        indoc! {"
-            mod x {
-                mod y {
-
-                }
-            ˇ}
-            let foo = 1;"},
-        vec![indoc! {"
-            mod x «{»
-                mod y {
-
-                }
-            «}»
-            let foo = 1;"}],
-        cx,
-    );
-
-    assert(
-        indoc! {"
-            mod x {
-                mod y {
-
-                }
-            }
-            let fˇoo = 1;"},
-        Vec::new(),
-        cx,
-    );
-
-    // Regression test: avoid crash when querying at the end of the buffer.
-    assert(
-        indoc! {"
-            mod x {
-                mod y {
-
-                }
-            }
-            let foo = 1;ˇ"},
-        Vec::new(),
-        cx,
-    );
-}
-
-#[gpui::test]
-fn test_enclosing_bracket_ranges_where_brackets_are_not_outermost_children(cx: &mut App) {
-    let mut assert = |selection_text, bracket_pair_texts| {
-        assert_bracket_pairs(
-            selection_text,
-            bracket_pair_texts,
-            Arc::new(javascript_lang()),
-            cx,
-        )
-    };
-
-    assert(
-        indoc! {"
-        for (const a in b)ˇ {
-            // a comment that's longer than the for-loop header
-        }"},
-        vec![indoc! {"
-        for «(»const a in b«)» {
-            // a comment that's longer than the for-loop header
-        }"}],
-    );
-
-    // Regression test: even though the parent node of the parentheses (the for loop) does
-    // intersect the given range, the parentheses themselves do not contain the range, so
-    // they should not be returned. Only the curly braces contain the range.
-    assert(
-        indoc! {"
-        for (const a in b) {ˇ
-            // a comment that's longer than the for-loop header
-        }"},
-        vec![indoc! {"
-        for (const a in b) «{»
-            // a comment that's longer than the for-loop header
-        «}»"}],
-    );
-}
-
-#[gpui::test]
-fn test_range_for_syntax_ancestor(cx: &mut App) {
-    cx.new(|cx| {
-        let text = "fn a() { b(|c| {}) }";
-        let buffer = Buffer::local(text, cx).with_language(rust_lang(), cx);
-        let snapshot = buffer.snapshot();
-
-        assert_eq!(
-            snapshot
-                .syntax_ancestor(empty_range_at(text, "|"))
-                .unwrap()
-                .byte_range(),
-            range_of(text, "|")
-        );
-        assert_eq!(
-            snapshot
-                .syntax_ancestor(range_of(text, "|"))
-                .unwrap()
-                .byte_range(),
-            range_of(text, "|c|")
-        );
-        assert_eq!(
-            snapshot
-                .syntax_ancestor(range_of(text, "|c|"))
-                .unwrap()
-                .byte_range(),
-            range_of(text, "|c| {}")
-        );
-        assert_eq!(
-            snapshot
-                .syntax_ancestor(range_of(text, "|c| {}"))
-                .unwrap()
-                .byte_range(),
-            range_of(text, "(|c| {})")
-        );
-
-        buffer
-    });
-
-    fn empty_range_at(text: &str, part: &str) -> Range<usize> {
-        let start = text.find(part).unwrap();
-        start..start
-    }
-
-    fn range_of(text: &str, part: &str) -> Range<usize> {
-        let start = text.find(part).unwrap();
-        start..start + part.len()
-    }
-}
-
-#[gpui::test]
-fn test_autoindent_with_soft_tabs(cx: &mut App) {
-    init_settings(cx, |_| {});
-
-    cx.new(|cx| {
-        let text = "fn a() {}";
-        let mut buffer = Buffer::local(text, cx).with_language(rust_lang(), cx);
-
-        buffer.edit([(8..8, "\n\n")], Some(AutoindentMode::EachLine), cx);
-        assert_eq!(buffer.text(), "fn a() {\n    \n}");
-
-        buffer.edit(
-            [(Point::new(1, 4)..Point::new(1, 4), "b()\n")],
-            Some(AutoindentMode::EachLine),
-            cx,
-        );
-        assert_eq!(buffer.text(), "fn a() {\n    b()\n    \n}");
-
-        // Create a field expression on a new line, causing that line
-        // to be indented.
-        buffer.edit(
-            [(Point::new(2, 4)..Point::new(2, 4), ".c")],
-            Some(AutoindentMode::EachLine),
-            cx,
-        );
-        assert_eq!(buffer.text(), "fn a() {\n    b()\n        .c\n}");
-
-        // Remove the dot so that the line is no longer a field expression,
-        // causing the line to be outdented.
-        buffer.edit(
-            [(Point::new(2, 8)..Point::new(2, 9), "")],
-            Some(AutoindentMode::EachLine),
-            cx,
-        );
-        assert_eq!(buffer.text(), "fn a() {\n    b()\n    c\n}");
-
-        buffer
-    });
-}
-
-#[gpui::test]
-fn test_autoindent_with_hard_tabs(cx: &mut App) {
-    init_settings(cx, |settings| {
-        settings.defaults.hard_tabs = Some(true);
-    });
-
-    cx.new(|cx| {
-        let text = "fn a() {}";
-        let mut buffer = Buffer::local(text, cx).with_language(rust_lang(), cx);
-
-        buffer.edit([(8..8, "\n\n")], Some(AutoindentMode::EachLine), cx);
-        assert_eq!(buffer.text(), "fn a() {\n\t\n}");
-
-        buffer.edit(
-            [(Point::new(1, 1)..Point::new(1, 1), "b()\n")],
-            Some(AutoindentMode::EachLine),
-            cx,
-        );
-        assert_eq!(buffer.text(), "fn a() {\n\tb()\n\t\n}");
-
-        // Create a field expression on a new line, causing that line
-        // to be indented.
-        buffer.edit(
-            [(Point::new(2, 1)..Point::new(2, 1), ".c")],
-            Some(AutoindentMode::EachLine),
-            cx,
-        );
-        assert_eq!(buffer.text(), "fn a() {\n\tb()\n\t\t.c\n}");
-
-        // Remove the dot so that the line is no longer a field expression,
-        // causing the line to be outdented.
-        buffer.edit(
-            [(Point::new(2, 2)..Point::new(2, 3), "")],
-            Some(AutoindentMode::EachLine),
-            cx,
-        );
-        assert_eq!(buffer.text(), "fn a() {\n\tb()\n\tc\n}");
-
-        buffer
-    });
-}
-
-#[gpui::test]
-fn test_autoindent_does_not_adjust_lines_with_unchanged_suggestion(cx: &mut App) {
-    init_settings(cx, |_| {});
-
-    cx.new(|cx| {
-        let mut buffer = Buffer::local(
-            "
-            fn a() {
-            c;
-            d;
-            }
-            "
-            .unindent(),
-            cx,
-        )
-        .with_language(rust_lang(), cx);
-
-        // Lines 2 and 3 don't match the indentation suggestion. When editing these lines,
-        // their indentation is not adjusted.
-        buffer.edit_via_marked_text(
-            &"
-            fn a() {
-            c«()»;
-            d«()»;
-            }
-            "
-            .unindent(),
-            Some(AutoindentMode::EachLine),
-            cx,
-        );
-        assert_eq!(
-            buffer.text(),
-            "
-            fn a() {
-            c();
-            d();
-            }
-            "
-            .unindent()
-        );
-
-        // When appending new content after these lines, the indentation is based on the
-        // preceding lines' actual indentation.
-        buffer.edit_via_marked_text(
-            &"
-            fn a() {
-            c«
-            .f
-            .g()»;
-            d«
-            .f
-            .g()»;
-            }
-            "
-            .unindent(),
-            Some(AutoindentMode::EachLine),
-            cx,
-        );
-        assert_eq!(
-            buffer.text(),
-            "
-            fn a() {
-            c
-                .f
-                .g();
-            d
-                .f
-                .g();
-            }
-            "
-            .unindent()
-        );
-
-        // Insert a newline after the open brace. It is auto-indented
-        buffer.edit_via_marked_text(
-            &"
-            fn a() {«
-            »
-            c
-                .f
-                .g();
-            d
-                .f
-                .g();
-            }
-            "
-            .unindent(),
-            Some(AutoindentMode::EachLine),
-            cx,
-        );
-        assert_eq!(
-            buffer.text(),
-            "
-            fn a() {
-                ˇ
-            c
-                .f
-                .g();
-            d
-                .f
-                .g();
-            }
-            "
-            .unindent()
-            .replace("ˇ", "")
-        );
-
-        // Manually outdent the line. It stays outdented.
-        buffer.edit_via_marked_text(
-            &"
-            fn a() {
-            «»
-            c
-                .f
-                .g();
-            d
-                .f
-                .g();
-            }
-            "
-            .unindent(),
-            Some(AutoindentMode::EachLine),
-            cx,
-        );
-        assert_eq!(
-            buffer.text(),
-            "
-            fn a() {
-
-            c
-                .f
-                .g();
-            d
-                .f
-                .g();
-            }
-            "
-            .unindent()
-        );
-
-        buffer
-    });
-
-    cx.new(|cx| {
-        eprintln!("second buffer: {:?}", cx.entity_id());
-
-        let mut buffer = Buffer::local(
-            "
-            fn a() {
-                b();
-                |
-            "
-            .replace('|', "") // marker to preserve trailing whitespace
-            .unindent(),
-            cx,
-        )
-        .with_language(rust_lang(), cx);
-
-        // Insert a closing brace. It is outdented.
-        buffer.edit_via_marked_text(
-            &"
-            fn a() {
-                b();
-                «}»
-            "
-            .unindent(),
-            Some(AutoindentMode::EachLine),
-            cx,
-        );
-        assert_eq!(
-            buffer.text(),
-            "
-            fn a() {
-                b();
-            }
-            "
-            .unindent()
-        );
-
-        // Manually edit the leading whitespace. The edit is preserved.
-        buffer.edit_via_marked_text(
-            &"
-            fn a() {
-                b();
-            «    »}
-            "
-            .unindent(),
-            Some(AutoindentMode::EachLine),
-            cx,
-        );
-        assert_eq!(
-            buffer.text(),
-            "
-            fn a() {
-                b();
-                }
-            "
-            .unindent()
-        );
-        buffer
-    });
-
-    eprintln!("DONE");
-}
-
-#[gpui::test]
-fn test_autoindent_does_not_adjust_lines_within_newly_created_errors(cx: &mut App) {
-    init_settings(cx, |_| {});
-
-    cx.new(|cx| {
-        let mut buffer = Buffer::local(
-            "
-            fn a() {
-                i
-            }
-            "
-            .unindent(),
-            cx,
-        )
-        .with_language(rust_lang(), cx);
-
-        // Regression test: line does not get outdented due to syntax error
-        buffer.edit_via_marked_text(
-            &"
-            fn a() {
-                i«f let Some(x) = y»
-            }
-            "
-            .unindent(),
-            Some(AutoindentMode::EachLine),
-            cx,
-        );
-        assert_eq!(
-            buffer.text(),
-            "
-            fn a() {
-                if let Some(x) = y
-            }
-            "
-            .unindent()
-        );
-
-        buffer.edit_via_marked_text(
-            &"
-            fn a() {
-                if let Some(x) = y« {»
-            }
-            "
-            .unindent(),
-            Some(AutoindentMode::EachLine),
-            cx,
-        );
-        assert_eq!(
-            buffer.text(),
-            "
-            fn a() {
-                if let Some(x) = y {
-            }
-            "
-            .unindent()
-        );
-
-        buffer
-    });
-}
-
-#[gpui::test]
-fn test_autoindent_adjusts_lines_when_only_text_changes(cx: &mut App) {
-    init_settings(cx, |_| {});
-
-    cx.new(|cx| {
-        let mut buffer = Buffer::local(
-            "
-            fn a() {}
-            "
-            .unindent(),
-            cx,
-        )
-        .with_language(rust_lang(), cx);
-
-        buffer.edit_via_marked_text(
-            &"
-            fn a(«
-            b») {}
-            "
-            .unindent(),
-            Some(AutoindentMode::EachLine),
-            cx,
-        );
-        assert_eq!(
-            buffer.text(),
-            "
-            fn a(
-                b) {}
-            "
-            .unindent()
-        );
-
-        // The indentation suggestion changed because `@end` node (a close paren)
-        // is now at the beginning of the line.
-        buffer.edit_via_marked_text(
-            &"
-            fn a(
-                ˇ) {}
-            "
-            .unindent(),
-            Some(AutoindentMode::EachLine),
-            cx,
-        );
-        assert_eq!(
-            buffer.text(),
-            "
-                fn a(
-                ) {}
-            "
-            .unindent()
-        );
-
-        buffer
-    });
-}
-
-#[gpui::test]
-fn test_autoindent_with_edit_at_end_of_buffer(cx: &mut App) {
-    init_settings(cx, |_| {});
-
-    cx.new(|cx| {
-        let text = "a\nb";
-        let mut buffer = Buffer::local(text, cx).with_language(rust_lang(), cx);
-        buffer.edit(
-            [(0..1, "\n"), (2..3, "\n")],
-            Some(AutoindentMode::EachLine),
-            cx,
-        );
-        assert_eq!(buffer.text(), "\n\n\n");
-        buffer
-    });
-}
-
-#[gpui::test]
-fn test_autoindent_multi_line_insertion(cx: &mut App) {
-    init_settings(cx, |_| {});
-
-    cx.new(|cx| {
-        let text = "
-            const a: usize = 1;
-            fn b() {
-                if c {
-                    let d = 2;
-                }
-            }
-        "
-        .unindent();
-
-        let mut buffer = Buffer::local(text, cx).with_language(rust_lang(), cx);
-        buffer.edit(
-            [(Point::new(3, 0)..Point::new(3, 0), "e(\n    f()\n);\n")],
-            Some(AutoindentMode::EachLine),
-            cx,
-        );
-        assert_eq!(
-            buffer.text(),
-            "
-                const a: usize = 1;
-                fn b() {
-                    if c {
-                        e(
-                            f()
-                        );
-                        let d = 2;
-                    }
-                }
-            "
-            .unindent()
-        );
-
-        buffer
-    });
-}
-
-#[gpui::test]
-fn test_autoindent_block_mode(cx: &mut App) {
-    init_settings(cx, |_| {});
-
-    cx.new(|cx| {
-        let text = r#"
-            fn a() {
-                b();
-            }
-        "#
-        .unindent();
-        let mut buffer = Buffer::local(text, cx).with_language(rust_lang(), cx);
-
-        // When this text was copied, both of the quotation marks were at the same
-        // indent level, but the indentation of the first line was not included in
-        // the copied text. This information is retained in the
-        // 'original_indent_columns' vector.
-        let original_indent_columns = vec![Some(4)];
-        let inserted_text = r#"
-            "
-                  c
-                    d
-                      e
-                "
-        "#
-        .unindent();
-
-        // Insert the block at column zero. The entire block is indented
-        // so that the first line matches the previous line's indentation.
-        buffer.edit(
-            [(Point::new(2, 0)..Point::new(2, 0), inserted_text.clone())],
-            Some(AutoindentMode::Block {
-                original_indent_columns: original_indent_columns.clone(),
-            }),
-            cx,
-        );
-        assert_eq!(
-            buffer.text(),
-            r#"
-            fn a() {
-                b();
-                "
-                  c
-                    d
-                      e
-                "
-            }
-            "#
-            .unindent()
-        );
-
-        // Grouping is disabled in tests, so we need 2 undos
-        buffer.undo(cx); // Undo the auto-indent
-        buffer.undo(cx); // Undo the original edit
-
-        // Insert the block at a deeper indent level. The entire block is outdented.
-        buffer.edit([(Point::new(2, 0)..Point::new(2, 0), "        ")], None, cx);
-        buffer.edit(
-            [(Point::new(2, 8)..Point::new(2, 8), inserted_text)],
-            Some(AutoindentMode::Block {
-                original_indent_columns,
-            }),
-            cx,
-        );
-        assert_eq!(
-            buffer.text(),
-            r#"
-            fn a() {
-                b();
-                "
-                  c
-                    d
-                      e
-                "
-            }
-            "#
-            .unindent()
-        );
-
-        buffer
-    });
-}
-
-#[gpui::test]
-fn test_autoindent_block_mode_with_newline(cx: &mut App) {
-    init_settings(cx, |_| {});
-
-    cx.new(|cx| {
-        let text = r#"
-            fn a() {
-                b();
-            }
-        "#
-        .unindent();
-        let mut buffer = Buffer::local(text, cx).with_language(rust_lang(), cx);
-
-        // First line contains just '\n', it's indentation is stored in "original_indent_columns"
-        let original_indent_columns = vec![Some(4)];
-        let inserted_text = r#"
-
-                c();
-                    d();
-                        e();
-        "#
-        .unindent();
-        buffer.edit(
-            [(Point::new(2, 0)..Point::new(2, 0), inserted_text)],
-            Some(AutoindentMode::Block {
-                original_indent_columns,
-            }),
-            cx,
-        );
-
-        // While making edit, we ignore first line as it only contains '\n'
-        // hence second line indent is used to calculate delta
-        assert_eq!(
-            buffer.text(),
-            r#"
-            fn a() {
-                b();
-
-                c();
-                    d();
-                        e();
-            }
-            "#
-            .unindent()
-        );
-
-        buffer
-    });
-}
-
-#[gpui::test]
-fn test_autoindent_block_mode_without_original_indent_columns(cx: &mut App) {
-    init_settings(cx, |_| {});
-
-    cx.new(|cx| {
-        let text = r#"
-            fn a() {
-                if b() {
-
-                }
-            }
-        "#
-        .unindent();
-        let mut buffer = Buffer::local(text, cx).with_language(rust_lang(), cx);
-
-        // The original indent columns are not known, so this text is
-        // auto-indented in a block as if the first line was copied in
-        // its entirety.
-        let original_indent_columns = Vec::new();
-        let inserted_text = "    c\n        .d()\n        .e();";
-
-        // Insert the block at column zero. The entire block is indented
-        // so that the first line matches the previous line's indentation.
-        buffer.edit(
-            [(Point::new(2, 0)..Point::new(2, 0), inserted_text)],
-            Some(AutoindentMode::Block {
-                original_indent_columns,
-            }),
-            cx,
-        );
-        assert_eq!(
-            buffer.text(),
-            r#"
-            fn a() {
-                if b() {
-                    c
-                        .d()
-                        .e();
-                }
-            }
-            "#
-            .unindent()
-        );
-
-        // Grouping is disabled in tests, so we need 2 undos
-        buffer.undo(cx); // Undo the auto-indent
-        buffer.undo(cx); // Undo the original edit
-
-        // Insert the block at a deeper indent level. The entire block is outdented.
-        buffer.edit(
-            [(Point::new(2, 0)..Point::new(2, 0), " ".repeat(12))],
-            None,
-            cx,
-        );
-        buffer.edit(
-            [(Point::new(2, 12)..Point::new(2, 12), inserted_text)],
-            Some(AutoindentMode::Block {
-                original_indent_columns: Vec::new(),
-            }),
-            cx,
-        );
-        assert_eq!(
-            buffer.text(),
-            r#"
-            fn a() {
-                if b() {
-                    c
-                        .d()
-                        .e();
-                }
-            }
-            "#
-            .unindent()
-        );
-
-        buffer
-    });
-}
-
-#[gpui::test]
-fn test_autoindent_block_mode_multiple_adjacent_ranges(cx: &mut App) {
-    init_settings(cx, |_| {});
-
-    cx.new(|cx| {
-        let (text, ranges_to_replace) = marked_text_ranges(
-            &"
-            mod numbers {
-                «fn one() {
-                    1
-                }
-            »
-                «fn two() {
-                    2
-                }
-            »
-                «fn three() {
-                    3
-                }
-            »}
-            "
-            .unindent(),
-            false,
-        );
-
-        let mut buffer = Buffer::local(text, cx).with_language(rust_lang(), cx);
-
-        buffer.edit(
-            [
-                (ranges_to_replace[0].clone(), "fn one() {\n    101\n}\n"),
-                (ranges_to_replace[1].clone(), "fn two() {\n    102\n}\n"),
-                (ranges_to_replace[2].clone(), "fn three() {\n    103\n}\n"),
-            ],
-            Some(AutoindentMode::Block {
-                original_indent_columns: vec![Some(0), Some(0), Some(0)],
-            }),
-            cx,
-        );
-
-        assert_eq!(
-            buffer.text(),
-            "
-            mod numbers {
-                fn one() {
-                    101
-                }
-
-                fn two() {
-                    102
-                }
-
-                fn three() {
-                    103
-                }
-            }
-            "
-            .unindent()
-        );
-
-        buffer
-    });
-}
-
-#[gpui::test]
-fn test_autoindent_language_without_indents_query(cx: &mut App) {
-    init_settings(cx, |_| {});
-
-    cx.new(|cx| {
-        let text = "
-            * one
-                - a
-                - b
-            * two
-        "
-        .unindent();
-
-        let mut buffer = Buffer::local(text, cx).with_language(
-            Arc::new(Language::new(
-                LanguageConfig {
-                    name: "Markdown".into(),
-                    auto_indent_using_last_non_empty_line: false,
-                    ..Default::default()
-                },
-                Some(tree_sitter_json::LANGUAGE.into()),
-            )),
-            cx,
-        );
-        buffer.edit(
-            [(Point::new(3, 0)..Point::new(3, 0), "\n")],
-            Some(AutoindentMode::EachLine),
-            cx,
-        );
-        assert_eq!(
-            buffer.text(),
-            "
-            * one
-                - a
-                - b
-
-            * two
-            "
-            .unindent()
-        );
-        buffer
-    });
-}
-
-#[gpui::test]
-fn test_autoindent_with_injected_languages(cx: &mut App) {
-    init_settings(cx, |settings| {
-        settings.languages.0.extend([
-            (
-                "HTML".into(),
-                LanguageSettingsContent {
-                    tab_size: Some(2.try_into().unwrap()),
-                    ..Default::default()
-                },
-            ),
-            (
-                "JavaScript".into(),
-                LanguageSettingsContent {
-                    tab_size: Some(8.try_into().unwrap()),
-                    ..Default::default()
-                },
-            ),
-        ])
-    });
-
-    let html_language = Arc::new(html_lang());
-
-    let javascript_language = Arc::new(javascript_lang());
-
-    let language_registry = Arc::new(LanguageRegistry::test(cx.background_executor().clone()));
-    language_registry.add(html_language.clone());
-    language_registry.add(javascript_language);
-
-    cx.new(|cx| {
-        let (text, ranges) = marked_text_ranges(
-            &"
-                <div>ˇ
-                </div>
-                <script>
-                    init({ˇ
-                    })
-                </script>
-                <span>ˇ
-                </span>
-            "
-            .unindent(),
-            false,
-        );
-
-        let mut buffer = Buffer::local(text, cx);
-        buffer.set_language_registry(language_registry);
-        buffer.set_language(Some(html_language), cx);
-        buffer.edit(
-            ranges.into_iter().map(|range| (range, "\na")),
-            Some(AutoindentMode::EachLine),
-            cx,
-        );
-        assert_eq!(
-            buffer.text(),
-            "
-                <div>
-                  a
-                </div>
-                <script>
-                    init({
-                            a
-                    })
-                </script>
-                <span>
-                  a
-                </span>
-            "
-            .unindent()
-        );
-        buffer
-    });
-}
-
-#[gpui::test]
-fn test_autoindent_query_with_outdent_captures(cx: &mut App) {
-    init_settings(cx, |settings| {
-        settings.defaults.tab_size = Some(2.try_into().unwrap());
-    });
-
-    cx.new(|cx| {
-        let mut buffer = Buffer::local("", cx).with_language(Arc::new(ruby_lang()), cx);
-
-        let text = r#"
-            class C
-            def a(b, c)
-            puts b
-            puts c
-            rescue
-            puts "errored"
-            exit 1
-            end
-            end
-        "#
-        .unindent();
-
-        buffer.edit([(0..0, text)], Some(AutoindentMode::EachLine), cx);
-
-        assert_eq!(
-            buffer.text(),
-            r#"
-                class C
-                  def a(b, c)
-                    puts b
-                    puts c
-                  rescue
-                    puts "errored"
-                    exit 1
-                  end
-                end
-            "#
-            .unindent()
-        );
-
-        buffer
-    });
-}
-
-#[gpui::test]
-async fn test_async_autoindents_preserve_preview(cx: &mut TestAppContext) {
-    cx.update(|cx| init_settings(cx, |_| {}));
-
-    // First we insert some newlines to request an auto-indent (asynchronously).
-    // Then we request that a preview tab be preserved for the new version, even though it's edited.
-    let buffer = cx.new(|cx| {
-        let text = "fn a() {}";
-        let mut buffer = Buffer::local(text, cx).with_language(rust_lang(), cx);
-
-        // This causes autoindent to be async.
-        buffer.set_sync_parse_timeout(Duration::ZERO);
-
-        buffer.edit([(8..8, "\n\n")], Some(AutoindentMode::EachLine), cx);
-        buffer.refresh_preview();
-
-        // Synchronously, we haven't auto-indented and we're still preserving the preview.
-        assert_eq!(buffer.text(), "fn a() {\n\n}");
-        assert!(buffer.preserve_preview());
-        buffer
-    });
-
-    // Now let the autoindent finish
-    cx.executor().run_until_parked();
-
-    // The auto-indent applied, but didn't dismiss our preview
-    buffer.update(cx, |buffer, cx| {
-        assert_eq!(buffer.text(), "fn a() {\n    \n}");
-        assert!(buffer.preserve_preview());
-
-        // Edit inserting another line. It will autoindent async.
-        // Then refresh the preview version.
-        buffer.edit(
-            [(Point::new(1, 4)..Point::new(1, 4), "\n")],
-            Some(AutoindentMode::EachLine),
-            cx,
-        );
-        buffer.refresh_preview();
-        assert_eq!(buffer.text(), "fn a() {\n    \n\n}");
-        assert!(buffer.preserve_preview());
-
-        // Then perform another edit, this time without refreshing the preview version.
-        buffer.edit([(Point::new(1, 4)..Point::new(1, 4), "x")], None, cx);
-        // This causes the preview to not be preserved.
-        assert!(!buffer.preserve_preview());
-    });
-
-    // Let the async autoindent from the first edit finish.
-    cx.executor().run_until_parked();
-
-    // The autoindent applies, but it shouldn't restore the preview status because we had an edit in the meantime.
-    buffer.update(cx, |buffer, _| {
-        assert_eq!(buffer.text(), "fn a() {\n    x\n    \n}");
-        assert!(!buffer.preserve_preview());
-    });
-}
-
-#[gpui::test]
-fn test_insert_empty_line(cx: &mut App) {
-    init_settings(cx, |_| {});
-
-    // Insert empty line at the beginning, requesting an empty line above
-    cx.new(|cx| {
-        let mut buffer = Buffer::local("abc\ndef\nghi", cx);
-        let point = buffer.insert_empty_line(Point::new(0, 0), true, false, cx);
-        assert_eq!(buffer.text(), "\nabc\ndef\nghi");
-        assert_eq!(point, Point::new(0, 0));
-        buffer
-    });
-
-    // Insert empty line at the beginning, requesting an empty line above and below
-    cx.new(|cx| {
-        let mut buffer = Buffer::local("abc\ndef\nghi", cx);
-        let point = buffer.insert_empty_line(Point::new(0, 0), true, true, cx);
-        assert_eq!(buffer.text(), "\n\nabc\ndef\nghi");
-        assert_eq!(point, Point::new(0, 0));
-        buffer
-    });
-
-    // Insert empty line at the start of a line, requesting empty lines above and below
-    cx.new(|cx| {
-        let mut buffer = Buffer::local("abc\ndef\nghi", cx);
-        let point = buffer.insert_empty_line(Point::new(2, 0), true, true, cx);
-        assert_eq!(buffer.text(), "abc\ndef\n\n\n\nghi");
-        assert_eq!(point, Point::new(3, 0));
-        buffer
-    });
-
-    // Insert empty line in the middle of a line, requesting empty lines above and below
-    cx.new(|cx| {
-        let mut buffer = Buffer::local("abc\ndefghi\njkl", cx);
-        let point = buffer.insert_empty_line(Point::new(1, 3), true, true, cx);
-        assert_eq!(buffer.text(), "abc\ndef\n\n\n\nghi\njkl");
-        assert_eq!(point, Point::new(3, 0));
-        buffer
-    });
-
-    // Insert empty line in the middle of a line, requesting empty line above only
-    cx.new(|cx| {
-        let mut buffer = Buffer::local("abc\ndefghi\njkl", cx);
-        let point = buffer.insert_empty_line(Point::new(1, 3), true, false, cx);
-        assert_eq!(buffer.text(), "abc\ndef\n\n\nghi\njkl");
-        assert_eq!(point, Point::new(3, 0));
-        buffer
-    });
-
-    // Insert empty line in the middle of a line, requesting empty line below only
-    cx.new(|cx| {
-        let mut buffer = Buffer::local("abc\ndefghi\njkl", cx);
-        let point = buffer.insert_empty_line(Point::new(1, 3), false, true, cx);
-        assert_eq!(buffer.text(), "abc\ndef\n\n\nghi\njkl");
-        assert_eq!(point, Point::new(2, 0));
-        buffer
-    });
-
-    // Insert empty line at the end, requesting empty lines above and below
-    cx.new(|cx| {
-        let mut buffer = Buffer::local("abc\ndef\nghi", cx);
-        let point = buffer.insert_empty_line(Point::new(2, 3), true, true, cx);
-        assert_eq!(buffer.text(), "abc\ndef\nghi\n\n\n");
-        assert_eq!(point, Point::new(4, 0));
-        buffer
-    });
-
-    // Insert empty line at the end, requesting empty line above only
-    cx.new(|cx| {
-        let mut buffer = Buffer::local("abc\ndef\nghi", cx);
-        let point = buffer.insert_empty_line(Point::new(2, 3), true, false, cx);
-        assert_eq!(buffer.text(), "abc\ndef\nghi\n\n");
-        assert_eq!(point, Point::new(4, 0));
-        buffer
-    });
-
-    // Insert empty line at the end, requesting empty line below only
-    cx.new(|cx| {
-        let mut buffer = Buffer::local("abc\ndef\nghi", cx);
-        let point = buffer.insert_empty_line(Point::new(2, 3), false, true, cx);
-        assert_eq!(buffer.text(), "abc\ndef\nghi\n\n");
-        assert_eq!(point, Point::new(3, 0));
-        buffer
-    });
-}
-
-#[gpui::test]
-fn test_language_scope_at_with_javascript(cx: &mut App) {
-    init_settings(cx, |_| {});
-
-    cx.new(|cx| {
-        let language = Language::new(
-            LanguageConfig {
-                name: "JavaScript".into(),
-                line_comments: vec!["// ".into()],
-                block_comment: Some(BlockCommentConfig {
-                    start: "/*".into(),
-                    end: "*/".into(),
-                    prefix: "* ".into(),
-                    tab_size: 1,
-                }),
-                brackets: BracketPairConfig {
-                    pairs: vec![
-                        BracketPair {
-                            start: "{".into(),
-                            end: "}".into(),
-                            close: true,
-                            surround: true,
-                            newline: false,
-                        },
-                        BracketPair {
-                            start: "'".into(),
-                            end: "'".into(),
-                            close: true,
-                            surround: true,
-                            newline: false,
-                        },
-                    ],
-                    disabled_scopes_by_bracket_ix: vec![
-                        Vec::new(),                              //
-                        vec!["string".into(), "comment".into()], // single quotes disabled
-                    ],
-                },
-                overrides: [(
-                    "element".into(),
-                    LanguageConfigOverride {
-                        line_comments: Override::Remove { remove: true },
-                        block_comment: Override::Set(BlockCommentConfig {
-                            start: "{/*".into(),
-                            prefix: "".into(),
-                            end: "*/}".into(),
-                            tab_size: 0,
-                        }),
-                        ..Default::default()
-                    },
-                )]
-                .into_iter()
-                .collect(),
-                ..Default::default()
-            },
-            Some(tree_sitter_typescript::LANGUAGE_TSX.into()),
-        )
-        .with_override_query(
-            r#"
-                (jsx_element) @element
-                (string) @string
-                (comment) @comment.inclusive
-                [
-                    (jsx_opening_element)
-                    (jsx_closing_element)
-                    (jsx_expression)
-                ] @default
-            "#,
-        )
-        .unwrap();
-
-        let text = r#"
-            a["b"] = <C d="e">
-                <F></F>
-                { g() }
-            </C>; // a comment
-        "#
-        .unindent();
-
-        let buffer = Buffer::local(&text, cx).with_language(Arc::new(language), cx);
-        let snapshot = buffer.snapshot();
-
-        let config = snapshot.language_scope_at(0).unwrap();
-        assert_eq!(config.line_comment_prefixes(), &[Arc::from("// ")]);
-        assert_eq!(
-            config.block_comment(),
-            Some(&BlockCommentConfig {
-                start: "/*".into(),
-                prefix: "* ".into(),
-                end: "*/".into(),
-                tab_size: 1,
-            })
-        );
-
-        // Both bracket pairs are enabled
-        assert_eq!(
-            config.brackets().map(|e| e.1).collect::<Vec<_>>(),
-            &[true, true]
-        );
-
-        let comment_config = snapshot
-            .language_scope_at(text.find("comment").unwrap() + "comment".len())
-            .unwrap();
-        assert_eq!(
-            comment_config.brackets().map(|e| e.1).collect::<Vec<_>>(),
-            &[true, false]
-        );
-
-        let string_config = snapshot
-            .language_scope_at(text.find("b\"").unwrap())
-            .unwrap();
-        assert_eq!(string_config.line_comment_prefixes(), &[Arc::from("// ")]);
-        assert_eq!(
-            string_config.block_comment(),
-            Some(&BlockCommentConfig {
-                start: "/*".into(),
-                prefix: "* ".into(),
-                end: "*/".into(),
-                tab_size: 1,
-            })
-        );
-        // Second bracket pair is disabled
-        assert_eq!(
-            string_config.brackets().map(|e| e.1).collect::<Vec<_>>(),
-            &[true, false]
-        );
-
-        // In between JSX tags: use the `element` override.
-        let element_config = snapshot
-            .language_scope_at(text.find("<F>").unwrap())
-            .unwrap();
-        // TODO nested blocks after newlines are captured with all whitespaces
-        // https://github.com/tree-sitter/tree-sitter-typescript/issues/306
-        // assert_eq!(element_config.line_comment_prefixes(), &[]);
-        // assert_eq!(
-        //     element_config.block_comment_delimiters(),
-        //     Some((&"{/*".into(), &"*/}".into()))
-        // );
-        assert_eq!(
-            element_config.brackets().map(|e| e.1).collect::<Vec<_>>(),
-            &[true, true]
-        );
-
-        // Within a JSX tag: use the default config.
-        let tag_config = snapshot
-            .language_scope_at(text.find(" d=").unwrap() + 1)
-            .unwrap();
-        assert_eq!(tag_config.line_comment_prefixes(), &[Arc::from("// ")]);
-        assert_eq!(
-            tag_config.block_comment(),
-            Some(&BlockCommentConfig {
-                start: "/*".into(),
-                prefix: "* ".into(),
-                end: "*/".into(),
-                tab_size: 1,
-            })
-        );
-        assert_eq!(
-            tag_config.brackets().map(|e| e.1).collect::<Vec<_>>(),
-            &[true, true]
-        );
-
-        // In a JSX expression: use the default config.
-        let expression_in_element_config = snapshot
-            .language_scope_at(text.find('{').unwrap() + 1)
-            .unwrap();
-        assert_eq!(
-            expression_in_element_config.line_comment_prefixes(),
-            &[Arc::from("// ")]
-        );
-        assert_eq!(
-            expression_in_element_config.block_comment(),
-            Some(&BlockCommentConfig {
-                start: "/*".into(),
-                prefix: "* ".into(),
-                end: "*/".into(),
-                tab_size: 1,
-            })
-        );
-        assert_eq!(
-            expression_in_element_config
-                .brackets()
-                .map(|e| e.1)
-                .collect::<Vec<_>>(),
-            &[true, true]
-        );
-
-        buffer
-    });
-}
-
-#[gpui::test]
-fn test_language_scope_at_with_rust(cx: &mut App) {
-    init_settings(cx, |_| {});
-
-    cx.new(|cx| {
-        let language = Language::new(
-            LanguageConfig {
-                name: "Rust".into(),
-                brackets: BracketPairConfig {
-                    pairs: vec![
-                        BracketPair {
-                            start: "{".into(),
-                            end: "}".into(),
-                            close: true,
-                            surround: true,
-                            newline: false,
-                        },
-                        BracketPair {
-                            start: "'".into(),
-                            end: "'".into(),
-                            close: true,
-                            surround: true,
-                            newline: false,
-                        },
-                    ],
-                    disabled_scopes_by_bracket_ix: vec![
-                        Vec::new(), //
-                        vec!["string".into()],
-                    ],
-                },
-                ..Default::default()
-            },
-            Some(tree_sitter_rust::LANGUAGE.into()),
-        )
-        .with_override_query(
-            r#"
-                (string_literal) @string
-            "#,
-        )
-        .unwrap();
-
-        let text = r#"
-            const S: &'static str = "hello";
-        "#
-        .unindent();
-
-        let buffer = Buffer::local(text.clone(), cx).with_language(Arc::new(language), cx);
-        let snapshot = buffer.snapshot();
-
-        // By default, all brackets are enabled
-        let config = snapshot.language_scope_at(0).unwrap();
-        assert_eq!(
-            config.brackets().map(|e| e.1).collect::<Vec<_>>(),
-            &[true, true]
-        );
-
-        // Within a string, the quotation brackets are disabled.
-        let string_config = snapshot
-            .language_scope_at(text.find("ello").unwrap())
-            .unwrap();
-        assert_eq!(
-            string_config.brackets().map(|e| e.1).collect::<Vec<_>>(),
-            &[true, false]
-        );
-
-        buffer
-    });
-}
-
-#[gpui::test]
-fn test_language_scope_at_with_combined_injections(cx: &mut App) {
-    init_settings(cx, |_| {});
-
-    cx.new(|cx| {
-        let text = r#"
-            <ol>
-            <% people.each do |person| %>
-                <li>
-                    <%= person.name %>
-                </li>
-            <% end %>
-            </ol>
-        "#
-        .unindent();
-
-        let language_registry = Arc::new(LanguageRegistry::test(cx.background_executor().clone()));
-        language_registry.add(Arc::new(ruby_lang()));
-        language_registry.add(Arc::new(html_lang()));
-        language_registry.add(Arc::new(erb_lang()));
-
-        let mut buffer = Buffer::local(text, cx);
-        buffer.set_language_registry(language_registry.clone());
-        buffer.set_language(
-            language_registry
-                .language_for_name("HTML+ERB")
-                .now_or_never()
-                .unwrap()
-                .ok(),
-            cx,
-        );
-
-        let snapshot = buffer.snapshot();
-        let html_config = snapshot.language_scope_at(Point::new(2, 4)).unwrap();
-        assert_eq!(html_config.line_comment_prefixes(), &[]);
-        assert_eq!(
-            html_config.block_comment(),
-            Some(&BlockCommentConfig {
-                start: "<!--".into(),
-                end: "-->".into(),
-                prefix: "".into(),
-                tab_size: 0,
-            })
-        );
-
-        let ruby_config = snapshot.language_scope_at(Point::new(3, 12)).unwrap();
-        assert_eq!(ruby_config.line_comment_prefixes(), &[Arc::from("# ")]);
-        assert_eq!(ruby_config.block_comment(), None);
-
-        buffer
-    });
-}
-
-#[gpui::test]
-fn test_language_at_with_hidden_languages(cx: &mut App) {
-    init_settings(cx, |_| {});
-
-    cx.new(|cx| {
-        let text = r#"
-            this is an *emphasized* word.
-        "#
-        .unindent();
-
-        let language_registry = Arc::new(LanguageRegistry::test(cx.background_executor().clone()));
-        language_registry.add(markdown_lang());
-        language_registry.add(Arc::new(markdown_inline_lang()));
-
-        let mut buffer = Buffer::local(text, cx);
-        buffer.set_language_registry(language_registry.clone());
-        buffer.set_language(
-            language_registry
-                .language_for_name("Markdown")
-                .now_or_never()
-                .unwrap()
-                .ok(),
-            cx,
-        );
-
-        let snapshot = buffer.snapshot();
-
-        for point in [Point::new(0, 4), Point::new(0, 16)] {
-            let config = snapshot.language_scope_at(point).unwrap();
-            assert_eq!(config.language_name(), "Markdown".into());
-
-            let language = snapshot.language_at(point).unwrap();
-            assert_eq!(language.name().as_ref(), "Markdown");
-        }
-
-        buffer
-    });
-}
-
-#[gpui::test]
-fn test_language_at_for_markdown_code_block(cx: &mut App) {
-    init_settings(cx, |_| {});
-
-    cx.new(|cx| {
-        let text = r#"
-            ```rs
-            let a = 2;
-            // let b = 3;
-            ```
-        "#
-        .unindent();
-
-        let language_registry = Arc::new(LanguageRegistry::test(cx.background_executor().clone()));
-        language_registry.add(markdown_lang());
-        language_registry.add(Arc::new(markdown_inline_lang()));
-        language_registry.add(rust_lang());
-
-        let mut buffer = Buffer::local(text, cx);
-        buffer.set_language_registry(language_registry.clone());
-        buffer.set_language(
-            language_registry
-                .language_for_name("Markdown")
-                .now_or_never()
-                .unwrap()
-                .ok(),
-            cx,
-        );
-
-        let snapshot = buffer.snapshot();
-
-        // Test points in the code line
-        for point in [Point::new(1, 4), Point::new(1, 6)] {
-            let config = snapshot.language_scope_at(point).unwrap();
-            assert_eq!(config.language_name(), "Rust".into());
-
-            let language = snapshot.language_at(point).unwrap();
-            assert_eq!(language.name().as_ref(), "Rust");
-        }
-
-        // Test points in the comment line to verify it's still detected as Rust
-        for point in [Point::new(2, 4), Point::new(2, 6)] {
-            let config = snapshot.language_scope_at(point).unwrap();
-            assert_eq!(config.language_name(), "Rust".into());
-
-            let language = snapshot.language_at(point).unwrap();
-            assert_eq!(language.name().as_ref(), "Rust");
-        }
-
-        buffer
-    });
-}
-
-#[gpui::test]
-fn test_syntax_layer_at_for_injected_languages(cx: &mut App) {
-    init_settings(cx, |_| {});
-
-    cx.new(|cx| {
-        let text = r#"
-            ```html+erb
-            <div>Hello</div>
-            <%= link_to "Some", "https://zed.dev" %>
-            ```
-        "#
-        .unindent();
-
-        let language_registry = Arc::new(LanguageRegistry::test(cx.background_executor().clone()));
-        language_registry.add(Arc::new(erb_lang()));
-        language_registry.add(Arc::new(html_lang()));
-        language_registry.add(Arc::new(ruby_lang()));
-
-        let mut buffer = Buffer::local(text, cx);
-        buffer.set_language_registry(language_registry.clone());
-        buffer.set_language(
-            language_registry
-                .language_for_name("HTML+ERB")
-                .now_or_never()
-                .unwrap()
-                .ok(),
-            cx,
-        );
-
-        let snapshot = buffer.snapshot();
-
-        // Test points in the code line
-        let html_point = Point::new(1, 4);
-        let language = snapshot.language_at(html_point).unwrap();
-        assert_eq!(language.name().as_ref(), "HTML");
-
-        let ruby_point = Point::new(2, 6);
-        let language = snapshot.language_at(ruby_point).unwrap();
-        assert_eq!(language.name().as_ref(), "Ruby");
-
-        buffer
-    });
-}
-
-#[gpui::test]
-fn test_serialization(cx: &mut gpui::App) {
-    let mut now = Instant::now();
-
-    let buffer1 = cx.new(|cx| {
-        let mut buffer = Buffer::local("abc", cx);
-        buffer.edit([(3..3, "D")], None, cx);
-
-        now += Duration::from_secs(1);
-        buffer.start_transaction_at(now);
-        buffer.edit([(4..4, "E")], None, cx);
-        buffer.end_transaction_at(now, cx);
-        assert_eq!(buffer.text(), "abcDE");
-
-        buffer.undo(cx);
-        assert_eq!(buffer.text(), "abcD");
-
-        buffer.edit([(4..4, "F")], None, cx);
-        assert_eq!(buffer.text(), "abcDF");
-        buffer
-    });
-    assert_eq!(buffer1.read(cx).text(), "abcDF");
-
-    let state = buffer1.read(cx).to_proto(cx);
-    let ops = cx
-        .background_executor()
-        .block(buffer1.read(cx).serialize_ops(None, cx));
-    let buffer2 = cx.new(|cx| {
-        let mut buffer =
-            Buffer::from_proto(ReplicaId::new(1), Capability::ReadWrite, state, None).unwrap();
-        buffer.apply_ops(
-            ops.into_iter()
-                .map(|op| proto::deserialize_operation(op).unwrap()),
-            cx,
-        );
-        buffer
-    });
-    assert_eq!(buffer2.read(cx).text(), "abcDF");
-}
-
-#[gpui::test]
-fn test_branch_and_merge(cx: &mut TestAppContext) {
-    cx.update(|cx| init_settings(cx, |_| {}));
-
-    let base = cx.new(|cx| Buffer::local("one\ntwo\nthree\n", cx));
-
-    // Create a remote replica of the base buffer.
-    let base_replica = cx.new(|cx| {
-        Buffer::from_proto(
-            ReplicaId::new(1),
-            Capability::ReadWrite,
-            base.read(cx).to_proto(cx),
-            None,
-        )
-        .unwrap()
-    });
-    base.update(cx, |_buffer, cx| {
-        cx.subscribe(&base_replica, |this, _, event, cx| {
-            if let BufferEvent::Operation {
-                operation,
-                is_local: true,
-            } = event
-            {
-                this.apply_ops([operation.clone()], cx);
-            }
-        })
-        .detach();
-    });
-
-    // Create a branch, which initially has the same state as the base buffer.
-    let branch = base.update(cx, |buffer, cx| buffer.branch(cx));
-    branch.read_with(cx, |buffer, _| {
-        assert_eq!(buffer.text(), "one\ntwo\nthree\n");
-    });
-
-    // Edits to the branch are not applied to the base.
-    branch.update(cx, |buffer, cx| {
-        buffer.edit(
-            [
-                (Point::new(1, 0)..Point::new(1, 0), "1.5\n"),
-                (Point::new(2, 0)..Point::new(2, 5), "THREE"),
-            ],
-            None,
-            cx,
-        )
-    });
-    branch.read_with(cx, |buffer, cx| {
-        assert_eq!(base.read(cx).text(), "one\ntwo\nthree\n");
-        assert_eq!(buffer.text(), "one\n1.5\ntwo\nTHREE\n");
-    });
-
-    // Convert from branch buffer ranges to the corresponding ranges in the
-    // base buffer.
-    branch.read_with(cx, |buffer, cx| {
-        assert_eq!(
-            buffer.range_to_version(4..7, &base.read(cx).version()),
-            4..4
-        );
-        assert_eq!(
-            buffer.range_to_version(2..9, &base.read(cx).version()),
-            2..5
-        );
-    });
-
-    // Edits to the base are applied to the branch.
-    base.update(cx, |buffer, cx| {
-        buffer.edit([(Point::new(0, 0)..Point::new(0, 0), "ZERO\n")], None, cx)
-    });
-    branch.read_with(cx, |buffer, cx| {
-        assert_eq!(base.read(cx).text(), "ZERO\none\ntwo\nthree\n");
-        assert_eq!(buffer.text(), "ZERO\none\n1.5\ntwo\nTHREE\n");
-    });
-
-    // Edits to any replica of the base are applied to the branch.
-    base_replica.update(cx, |buffer, cx| {
-        buffer.edit([(Point::new(2, 0)..Point::new(2, 0), "2.5\n")], None, cx)
-    });
-    branch.read_with(cx, |buffer, cx| {
-        assert_eq!(base.read(cx).text(), "ZERO\none\ntwo\n2.5\nthree\n");
-        assert_eq!(buffer.text(), "ZERO\none\n1.5\ntwo\n2.5\nTHREE\n");
-    });
-
-    // Merging the branch applies all of its changes to the base.
-    branch.update(cx, |buffer, cx| {
-        buffer.merge_into_base(Vec::new(), cx);
-    });
-
-    branch.update(cx, |buffer, cx| {
-        assert_eq!(base.read(cx).text(), "ZERO\none\n1.5\ntwo\n2.5\nTHREE\n");
-        assert_eq!(buffer.text(), "ZERO\none\n1.5\ntwo\n2.5\nTHREE\n");
-    });
-}
-
-#[gpui::test]
-fn test_merge_into_base(cx: &mut TestAppContext) {
-    cx.update(|cx| init_settings(cx, |_| {}));
-
-    let base = cx.new(|cx| Buffer::local("abcdefghijk", cx));
-    let branch = base.update(cx, |buffer, cx| buffer.branch(cx));
-
-    // Make 3 edits, merge one into the base.
-    branch.update(cx, |branch, cx| {
-        branch.edit([(0..3, "ABC"), (7..9, "HI"), (11..11, "LMN")], None, cx);
-        branch.merge_into_base(vec![5..8], cx);
-    });
-
-    branch.read_with(cx, |branch, _| assert_eq!(branch.text(), "ABCdefgHIjkLMN"));
-    base.read_with(cx, |base, _| assert_eq!(base.text(), "abcdefgHIjk"));
-
-    // Undo the one already-merged edit. Merge that into the base.
-    branch.update(cx, |branch, cx| {
-        branch.edit([(7..9, "hi")], None, cx);
-        branch.merge_into_base(vec![5..8], cx);
-    });
-    base.read_with(cx, |base, _| assert_eq!(base.text(), "abcdefghijk"));
-
-    // Merge an insertion into the base.
-    branch.update(cx, |branch, cx| {
-        branch.merge_into_base(vec![11..11], cx);
-    });
-
-    branch.read_with(cx, |branch, _| assert_eq!(branch.text(), "ABCdefghijkLMN"));
-    base.read_with(cx, |base, _| assert_eq!(base.text(), "abcdefghijkLMN"));
-
-    // Deleted the inserted text and merge that into the base.
-    branch.update(cx, |branch, cx| {
-        branch.edit([(11..14, "")], None, cx);
-        branch.merge_into_base(vec![10..11], cx);
-    });
-
-    base.read_with(cx, |base, _| assert_eq!(base.text(), "abcdefghijk"));
-}
-
-#[gpui::test]
-fn test_undo_after_merge_into_base(cx: &mut TestAppContext) {
-    cx.update(|cx| init_settings(cx, |_| {}));
-
-    let base = cx.new(|cx| Buffer::local("abcdefghijk", cx));
-    let branch = base.update(cx, |buffer, cx| buffer.branch(cx));
-
-    // Make 2 edits, merge one into the base.
-    branch.update(cx, |branch, cx| {
-        branch.edit([(0..3, "ABC"), (7..9, "HI")], None, cx);
-        branch.merge_into_base(vec![7..7], cx);
-    });
-    base.read_with(cx, |base, _| assert_eq!(base.text(), "abcdefgHIjk"));
-    branch.read_with(cx, |branch, _| assert_eq!(branch.text(), "ABCdefgHIjk"));
-
-    // Undo the merge in the base buffer.
-    base.update(cx, |base, cx| {
-        base.undo(cx);
-    });
-    base.read_with(cx, |base, _| assert_eq!(base.text(), "abcdefghijk"));
-    branch.read_with(cx, |branch, _| assert_eq!(branch.text(), "ABCdefgHIjk"));
-
-    // Merge that operation into the base again.
-    branch.update(cx, |branch, cx| {
-        branch.merge_into_base(vec![7..7], cx);
-    });
-    base.read_with(cx, |base, _| assert_eq!(base.text(), "abcdefgHIjk"));
-    branch.read_with(cx, |branch, _| assert_eq!(branch.text(), "ABCdefgHIjk"));
-}
-
-#[gpui::test]
-async fn test_preview_edits(cx: &mut TestAppContext) {
-    cx.update(|cx| {
-        init_settings(cx, |_| {});
-        theme::init(theme::LoadThemes::JustBase, cx);
-    });
-
-    let insertion_style = HighlightStyle {
-        background_color: Some(cx.read(|cx| cx.theme().status().created_background)),
-        ..Default::default()
-    };
-    let deletion_style = HighlightStyle {
-        background_color: Some(cx.read(|cx| cx.theme().status().deleted_background)),
-        ..Default::default()
-    };
-
-    // no edits
-    assert_preview_edits(
-        indoc! {"
-        fn test_empty() -> bool {
-            false
-        }"
-        },
-        vec![],
-        true,
-        cx,
-        |hl| {
-            assert!(hl.text.is_empty());
-            assert!(hl.highlights.is_empty());
-        },
-    )
-    .await;
-
-    // only insertions
-    assert_preview_edits(
-        indoc! {"
-        fn calculate_area(: f64) -> f64 {
-            std::f64::consts::PI * .powi(2)
-        }"
-        },
-        vec![
-            (Point::new(0, 18)..Point::new(0, 18), "radius"),
-            (Point::new(1, 27)..Point::new(1, 27), "radius"),
-        ],
-        true,
-        cx,
-        |hl| {
-            assert_eq!(
-                hl.text,
-                indoc! {"
-                fn calculate_area(radius: f64) -> f64 {
-                    std::f64::consts::PI * radius.powi(2)"
-                }
-            );
-
-            assert_eq!(hl.highlights.len(), 2);
-            assert_eq!(hl.highlights[0], ((18..24), insertion_style));
-            assert_eq!(hl.highlights[1], ((67..73), insertion_style));
-        },
-    )
-    .await;
-
-    // insertions & deletions
-    assert_preview_edits(
-        indoc! {"
-        struct Person {
-            first_name: String,
-        }
-
-        impl Person {
-            fn first_name(&self) -> &String {
-                &self.first_name
-            }
-        }"
-        },
-        vec![
-            (Point::new(1, 4)..Point::new(1, 9), "last"),
-            (Point::new(5, 7)..Point::new(5, 12), "last"),
-            (Point::new(6, 14)..Point::new(6, 19), "last"),
-        ],
-        true,
-        cx,
-        |hl| {
-            assert_eq!(
-                hl.text,
-                indoc! {"
-                        firstlast_name: String,
-                    }
-
-                    impl Person {
-                        fn firstlast_name(&self) -> &String {
-                            &self.firstlast_name"
-                }
-            );
-
-            assert_eq!(hl.highlights.len(), 6);
-            assert_eq!(hl.highlights[0], ((4..9), deletion_style));
-            assert_eq!(hl.highlights[1], ((9..13), insertion_style));
-            assert_eq!(hl.highlights[2], ((52..57), deletion_style));
-            assert_eq!(hl.highlights[3], ((57..61), insertion_style));
-            assert_eq!(hl.highlights[4], ((101..106), deletion_style));
-            assert_eq!(hl.highlights[5], ((106..110), insertion_style));
-        },
-    )
-    .await;
-
-    async fn assert_preview_edits(
-        text: &str,
-        edits: Vec<(Range<Point>, &str)>,
-        include_deletions: bool,
-        cx: &mut TestAppContext,
-        assert_fn: impl Fn(HighlightedText),
-    ) {
-        let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(rust_lang(), cx));
-        let edits = buffer.read_with(cx, |buffer, _| {
-            edits
-                .into_iter()
-                .map(|(range, text)| {
-                    (
-                        buffer.anchor_before(range.start)..buffer.anchor_after(range.end),
-                        text.into(),
-                    )
-                })
-                .collect::<Arc<[_]>>()
-        });
-        let edit_preview = buffer
-            .read_with(cx, |buffer, cx| buffer.preview_edits(edits.clone(), cx))
-            .await;
-        let highlighted_edits = cx.read(|cx| {
-            edit_preview.highlight_edits(&buffer.read(cx).snapshot(), &edits, include_deletions, cx)
-        });
-        assert_fn(highlighted_edits);
-    }
-}
-
-#[gpui::test(iterations = 100)]
-fn test_random_collaboration(cx: &mut App, mut rng: StdRng) {
-    let min_peers = env::var("MIN_PEERS")
-        .map(|i| i.parse().expect("invalid `MIN_PEERS` variable"))
-        .unwrap_or(1);
-    let max_peers = env::var("MAX_PEERS")
-        .map(|i| i.parse().expect("invalid `MAX_PEERS` variable"))
-        .unwrap_or(5);
-    let operations = env::var("OPERATIONS")
-        .map(|i| i.parse().expect("invalid `OPERATIONS` variable"))
-        .unwrap_or(10);
-
-    let base_text_len = rng.random_range(0..10);
-    let base_text = RandomCharIter::new(&mut rng)
-        .take(base_text_len)
-        .collect::<String>();
-    let mut replica_ids = Vec::new();
-    let mut buffers = Vec::new();
-    let network = Arc::new(Mutex::new(Network::new(rng.clone())));
-    let base_buffer = cx.new(|cx| Buffer::local(base_text.as_str(), cx));
-
-    for i in 0..rng.random_range(min_peers..=max_peers) {
-        let buffer = cx.new(|cx| {
-            let state = base_buffer.read(cx).to_proto(cx);
-            let ops = cx
-                .background_executor()
-                .block(base_buffer.read(cx).serialize_ops(None, cx));
-            let mut buffer =
-                Buffer::from_proto(ReplicaId::new(i as u16), Capability::ReadWrite, state, None)
-                    .unwrap();
-            buffer.apply_ops(
-                ops.into_iter()
-                    .map(|op| proto::deserialize_operation(op).unwrap()),
-                cx,
-            );
-            buffer.set_group_interval(Duration::from_millis(rng.random_range(0..=200)));
-            let network = network.clone();
-            cx.subscribe(&cx.entity(), move |buffer, _, event, _| {
-                if let BufferEvent::Operation {
-                    operation,
-                    is_local: true,
-                } = event
-                {
-                    network.lock().broadcast(
-                        buffer.replica_id(),
-                        vec![proto::serialize_operation(operation)],
-                    );
-                }
-            })
-            .detach();
-            buffer
-        });
-
-        buffers.push(buffer);
-        replica_ids.push(ReplicaId::new(i as u16));
-        network.lock().add_peer(ReplicaId::new(i as u16));
-        log::info!("Adding initial peer with replica id {:?}", replica_ids[i]);
-    }
-
-    log::info!("initial text: {:?}", base_text);
-
-    let mut now = Instant::now();
-    let mut mutation_count = operations;
-    let mut next_diagnostic_id = 0;
-    let mut active_selections = BTreeMap::default();
-    loop {
-        let replica_index = rng.random_range(0..replica_ids.len());
-        let replica_id = replica_ids[replica_index];
-        let buffer = &mut buffers[replica_index];
-        let mut new_buffer = None;
-        match rng.random_range(0..100) {
-            0..=29 if mutation_count != 0 => {
-                buffer.update(cx, |buffer, cx| {
-                    buffer.start_transaction_at(now);
-                    buffer.randomly_edit(&mut rng, 5, cx);
-                    buffer.end_transaction_at(now, cx);
-                    log::info!("buffer {:?} text: {:?}", buffer.replica_id(), buffer.text());
-                });
-                mutation_count -= 1;
-            }
-            30..=39 if mutation_count != 0 => {
-                buffer.update(cx, |buffer, cx| {
-                    if rng.random_bool(0.2) {
-                        log::info!("peer {:?} clearing active selections", replica_id);
-                        active_selections.remove(&replica_id);
-                        buffer.remove_active_selections(cx);
-                    } else {
-                        let mut selections = Vec::new();
-                        for id in 0..rng.random_range(1..=5) {
-                            let range = buffer.random_byte_range(0, &mut rng);
-                            selections.push(Selection {
-                                id,
-                                start: buffer.anchor_before(range.start),
-                                end: buffer.anchor_before(range.end),
-                                reversed: false,
-                                goal: SelectionGoal::None,
-                            });
-                        }
-                        let selections: Arc<[Selection<Anchor>]> = selections.into();
-                        log::info!(
-                            "peer {:?} setting active selections: {:?}",
-                            replica_id,
-                            selections
-                        );
-                        active_selections.insert(replica_id, selections.clone());
-                        buffer.set_active_selections(selections, false, Default::default(), cx);
-                    }
-                });
-                mutation_count -= 1;
-            }
-            40..=49 if mutation_count != 0 && replica_id == ReplicaId::REMOTE_SERVER => {
-                let entry_count = rng.random_range(1..=5);
-                buffer.update(cx, |buffer, cx| {
-                    let diagnostics = DiagnosticSet::new(
-                        (0..entry_count).map(|_| {
-                            let range = buffer.random_byte_range(0, &mut rng);
-                            let range = range.to_point_utf16(buffer);
-                            let range = range.start..range.end;
-                            DiagnosticEntry {
-                                range,
-                                diagnostic: Diagnostic {
-                                    message: post_inc(&mut next_diagnostic_id).to_string(),
-                                    ..Default::default()
-                                },
-                            }
-                        }),
-                        buffer,
-                    );
-                    log::info!(
-                        "peer {:?} setting diagnostics: {:?}",
-                        replica_id,
-                        diagnostics
-                    );
-                    buffer.update_diagnostics(LanguageServerId(0), diagnostics, cx);
-                });
-                mutation_count -= 1;
-            }
-            50..=59 if replica_ids.len() < max_peers => {
-                let old_buffer_state = buffer.read(cx).to_proto(cx);
-                let old_buffer_ops = cx
-                    .background_executor()
-                    .block(buffer.read(cx).serialize_ops(None, cx));
-                let new_replica_id = (0..=replica_ids.len() as u16)
-                    .map(ReplicaId::new)
-                    .filter(|replica_id| *replica_id != buffer.read(cx).replica_id())
-                    .choose(&mut rng)
-                    .unwrap();
-                log::info!(
-                    "Adding new replica {:?} (replicating from {:?})",
-                    new_replica_id,
-                    replica_id
-                );
-                new_buffer = Some(cx.new(|cx| {
-                    let mut new_buffer = Buffer::from_proto(
-                        new_replica_id,
-                        Capability::ReadWrite,
-                        old_buffer_state,
-                        None,
-                    )
-                    .unwrap();
-                    new_buffer.apply_ops(
-                        old_buffer_ops
-                            .into_iter()
-                            .map(|op| deserialize_operation(op).unwrap()),
-                        cx,
-                    );
-                    log::info!(
-                        "New replica {:?} text: {:?}",
-                        new_buffer.replica_id(),
-                        new_buffer.text()
-                    );
-                    new_buffer.set_group_interval(Duration::from_millis(rng.random_range(0..=200)));
-                    let network = network.clone();
-                    cx.subscribe(&cx.entity(), move |buffer, _, event, _| {
-                        if let BufferEvent::Operation {
-                            operation,
-                            is_local: true,
-                        } = event
-                        {
-                            network.lock().broadcast(
-                                buffer.replica_id(),
-                                vec![proto::serialize_operation(operation)],
-                            );
-                        }
-                    })
-                    .detach();
-                    new_buffer
-                }));
-                network.lock().replicate(replica_id, new_replica_id);
-
-                if new_replica_id.as_u16() as usize == replica_ids.len() {
-                    replica_ids.push(new_replica_id);
-                } else {
-                    let new_buffer = new_buffer.take().unwrap();
-                    while network.lock().has_unreceived(new_replica_id) {
-                        let ops = network
-                            .lock()
-                            .receive(new_replica_id)
-                            .into_iter()
-                            .map(|op| proto::deserialize_operation(op).unwrap());
-                        if ops.len() > 0 {
-                            log::info!(
-                                "peer {:?} (version: {:?}) applying {} ops from the network. {:?}",
-                                new_replica_id,
-                                buffer.read(cx).version(),
-                                ops.len(),
-                                ops
-                            );
-                            new_buffer.update(cx, |new_buffer, cx| {
-                                new_buffer.apply_ops(ops, cx);
-                            });
-                        }
-                    }
-                    buffers[new_replica_id.as_u16() as usize] = new_buffer;
-                }
-            }
-            60..=69 if mutation_count != 0 => {
-                buffer.update(cx, |buffer, cx| {
-                    buffer.randomly_undo_redo(&mut rng, cx);
-                    log::info!("buffer {:?} text: {:?}", buffer.replica_id(), buffer.text());
-                });
-                mutation_count -= 1;
-            }
-            _ if network.lock().has_unreceived(replica_id) => {
-                let ops = network
-                    .lock()
-                    .receive(replica_id)
-                    .into_iter()
-                    .map(|op| proto::deserialize_operation(op).unwrap());
-                if ops.len() > 0 {
-                    log::info!(
-                        "peer {:?} (version: {:?}) applying {} ops from the network. {:?}",
-                        replica_id,
-                        buffer.read(cx).version(),
-                        ops.len(),
-                        ops
-                    );
-                    buffer.update(cx, |buffer, cx| buffer.apply_ops(ops, cx));
-                }
-            }
-            _ => {}
-        }
-
-        now += Duration::from_millis(rng.random_range(0..=200));
-        buffers.extend(new_buffer);
-
-        for buffer in &buffers {
-            buffer.read(cx).check_invariants();
-        }
-
-        if mutation_count == 0 && network.lock().is_idle() {
-            break;
-        }
-    }
-
-    let first_buffer = buffers[0].read(cx).snapshot();
-    for buffer in &buffers[1..] {
-        let buffer = buffer.read(cx).snapshot();
-        assert_eq!(
-            buffer.version(),
-            first_buffer.version(),
-            "Replica {:?} version != Replica 0 version",
-            buffer.replica_id()
-        );
-        assert_eq!(
-            buffer.text(),
-            first_buffer.text(),
-            "Replica {:?} text != Replica 0 text",
-            buffer.replica_id()
-        );
-        assert_eq!(
-            buffer
-                .diagnostics_in_range::<_, usize>(0..buffer.len(), false)
-                .collect::<Vec<_>>(),
-            first_buffer
-                .diagnostics_in_range::<_, usize>(0..first_buffer.len(), false)
-                .collect::<Vec<_>>(),
-            "Replica {:?} diagnostics != Replica 0 diagnostics",
-            buffer.replica_id()
-        );
-    }
-
-    for buffer in &buffers {
-        let buffer = buffer.read(cx).snapshot();
-        let actual_remote_selections = buffer
-            .selections_in_range(Anchor::min_max_range_for_buffer(buffer.remote_id()), false)
-            .map(|(replica_id, _, _, selections)| (replica_id, selections.collect::<Vec<_>>()))
-            .collect::<Vec<_>>();
-        let expected_remote_selections = active_selections
-            .iter()
-            .filter(|(replica_id, _)| **replica_id != buffer.replica_id())
-            .map(|(replica_id, selections)| (*replica_id, selections.iter().collect::<Vec<_>>()))
-            .collect::<Vec<_>>();
-        assert_eq!(
-            actual_remote_selections,
-            expected_remote_selections,
-            "Replica {:?} remote selections != expected selections",
-            buffer.replica_id()
-        );
-    }
-}
-
-#[test]
-fn test_contiguous_ranges() {
-    assert_eq!(
-        contiguous_ranges([1, 2, 3, 5, 6, 9, 10, 11, 12].into_iter(), 100).collect::<Vec<_>>(),
-        &[1..4, 5..7, 9..13]
-    );
-
-    // Respects the `max_len` parameter
-    assert_eq!(
-        contiguous_ranges(
-            [2, 3, 4, 5, 6, 7, 8, 9, 23, 24, 25, 26, 30, 31].into_iter(),
-            3
-        )
-        .collect::<Vec<_>>(),
-        &[2..5, 5..8, 8..10, 23..26, 26..27, 30..32],
-    );
-}
-
-#[gpui::test]
-fn test_insertion_after_deletion(cx: &mut gpui::App) {
-    let buffer = cx.new(|cx| Buffer::local("struct Foo {\n    \n}", cx));
-    buffer.update(cx, |buffer, cx| {
-        let mut anchor = buffer.anchor_after(17);
-        buffer.edit([(12..18, "")], None, cx);
-        let snapshot = buffer.snapshot();
-        assert_eq!(snapshot.text(), "struct Foo {}");
-        if !anchor.is_valid(&snapshot) {
-            anchor = snapshot.anchor_after(snapshot.offset_for_anchor(&anchor));
-        }
-        buffer.edit([(anchor..anchor, "\n")], None, cx);
-        buffer.edit([(anchor..anchor, "field1:")], None, cx);
-        buffer.edit([(anchor..anchor, " i32,")], None, cx);
-        let snapshot = buffer.snapshot();
-        assert_eq!(snapshot.text(), "struct Foo {\nfield1: i32,}");
-    })
-}
-
-#[gpui::test(iterations = 500)]
-fn test_trailing_whitespace_ranges(mut rng: StdRng) {
-    // Generate a random multi-line string containing
-    // some lines with trailing whitespace.
-    let mut text = String::new();
-    for _ in 0..rng.random_range(0..16) {
-        for _ in 0..rng.random_range(0..36) {
-            text.push(match rng.random_range(0..10) {
-                0..=1 => ' ',
-                3 => '\t',
-                _ => rng.random_range('a'..='z'),
-            });
-        }
-        text.push('\n');
-    }
-
-    match rng.random_range(0..10) {
-        // sometimes remove the last newline
-        0..=1 => drop(text.pop()), //
-
-        // sometimes add extra newlines
-        2..=3 => text.push_str(&"\n".repeat(rng.random_range(1..5))),
-        _ => {}
-    }
-
-    let rope = Rope::from(text.as_str());
-    let actual_ranges = trailing_whitespace_ranges(&rope);
-    let expected_ranges = TRAILING_WHITESPACE_REGEX
-        .find_iter(&text)
-        .map(|m| m.range())
-        .collect::<Vec<_>>();
-    assert_eq!(
-        actual_ranges,
-        expected_ranges,
-        "wrong ranges for text lines:\n{:?}",
-        text.split('\n').collect::<Vec<_>>()
-    );
-}
-
-#[gpui::test]
-fn test_words_in_range(cx: &mut gpui::App) {
-    init_settings(cx, |_| {});
-
-    // The first line are words excluded from the results with heuristics, we do not expect them in the test assertions.
-    let contents = r#"
-0_isize 123 3.4 4  
-let word=öäpple.bar你 Öäpple word2-öÄpPlE-Pizza-word ÖÄPPLE word
-    "#;
-
-    let buffer = cx.new(|cx| {
-        let buffer = Buffer::local(contents, cx).with_language(rust_lang(), cx);
-        assert_eq!(buffer.text(), contents);
-        buffer.check_invariants();
-        buffer
-    });
-
-    buffer.update(cx, |buffer, _| {
-        let snapshot = buffer.snapshot();
-        assert_eq!(
-            BTreeSet::from_iter(["Pizza".to_string()]),
-            snapshot
-                .words_in_range(WordsQuery {
-                    fuzzy_contents: Some("piz"),
-                    skip_digits: true,
-                    range: 0..snapshot.len(),
-                })
-                .into_keys()
-                .collect::<BTreeSet<_>>()
-        );
-        assert_eq!(
-            BTreeSet::from_iter([
-                "öäpple".to_string(),
-                "Öäpple".to_string(),
-                "öÄpPlE".to_string(),
-                "ÖÄPPLE".to_string(),
-            ]),
-            snapshot
-                .words_in_range(WordsQuery {
-                    fuzzy_contents: Some("öp"),
-                    skip_digits: true,
-                    range: 0..snapshot.len(),
-                })
-                .into_keys()
-                .collect::<BTreeSet<_>>()
-        );
-        assert_eq!(
-            BTreeSet::from_iter([
-                "öÄpPlE".to_string(),
-                "Öäpple".to_string(),
-                "ÖÄPPLE".to_string(),
-                "öäpple".to_string(),
-            ]),
-            snapshot
-                .words_in_range(WordsQuery {
-                    fuzzy_contents: Some("öÄ"),
-                    skip_digits: true,
-                    range: 0..snapshot.len(),
-                })
-                .into_keys()
-                .collect::<BTreeSet<_>>()
-        );
-        assert_eq!(
-            BTreeSet::default(),
-            snapshot
-                .words_in_range(WordsQuery {
-                    fuzzy_contents: Some("öÄ好"),
-                    skip_digits: true,
-                    range: 0..snapshot.len(),
-                })
-                .into_keys()
-                .collect::<BTreeSet<_>>()
-        );
-        assert_eq!(
-            BTreeSet::from_iter(["bar你".to_string(),]),
-            snapshot
-                .words_in_range(WordsQuery {
-                    fuzzy_contents: Some("你"),
-                    skip_digits: true,
-                    range: 0..snapshot.len(),
-                })
-                .into_keys()
-                .collect::<BTreeSet<_>>()
-        );
-        assert_eq!(
-            BTreeSet::default(),
-            snapshot
-                .words_in_range(WordsQuery {
-                    fuzzy_contents: Some(""),
-                    skip_digits: true,
-                    range: 0..snapshot.len(),
-                },)
-                .into_keys()
-                .collect::<BTreeSet<_>>()
-        );
-        assert_eq!(
-            BTreeSet::from_iter([
-                "bar你".to_string(),
-                "öÄpPlE".to_string(),
-                "Öäpple".to_string(),
-                "ÖÄPPLE".to_string(),
-                "öäpple".to_string(),
-                "let".to_string(),
-                "Pizza".to_string(),
-                "word".to_string(),
-                "word2".to_string(),
-            ]),
-            snapshot
-                .words_in_range(WordsQuery {
-                    fuzzy_contents: None,
-                    skip_digits: true,
-                    range: 0..snapshot.len(),
-                })
-                .into_keys()
-                .collect::<BTreeSet<_>>()
-        );
-        assert_eq!(
-            BTreeSet::from_iter([
-                "0_isize".to_string(),
-                "123".to_string(),
-                "3".to_string(),
-                "4".to_string(),
-                "bar你".to_string(),
-                "öÄpPlE".to_string(),
-                "Öäpple".to_string(),
-                "ÖÄPPLE".to_string(),
-                "öäpple".to_string(),
-                "let".to_string(),
-                "Pizza".to_string(),
-                "word".to_string(),
-                "word2".to_string(),
-            ]),
-            snapshot
-                .words_in_range(WordsQuery {
-                    fuzzy_contents: None,
-                    skip_digits: false,
-                    range: 0..snapshot.len(),
-                })
-                .into_keys()
-                .collect::<BTreeSet<_>>()
-        );
-    });
-}
-
-fn ruby_lang() -> Language {
-    Language::new(
-        LanguageConfig {
-            name: "Ruby".into(),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["rb".to_string()],
-                ..Default::default()
-            },
-            line_comments: vec!["# ".into()],
-            ..Default::default()
-        },
-        Some(tree_sitter_ruby::LANGUAGE.into()),
-    )
-    .with_indents_query(
-        r#"
-            (class "end" @end) @indent
-            (method "end" @end) @indent
-            (rescue) @outdent
-            (then) @indent
-        "#,
-    )
-    .unwrap()
-}
-
-fn html_lang() -> Language {
-    Language::new(
-        LanguageConfig {
-            name: LanguageName::new_static("HTML"),
-            block_comment: Some(BlockCommentConfig {
-                start: "<!--".into(),
-                prefix: "".into(),
-                end: "-->".into(),
-                tab_size: 0,
-            }),
-            ..Default::default()
-        },
-        Some(tree_sitter_html::LANGUAGE.into()),
-    )
-    .with_indents_query(
-        "
-        (element
-          (start_tag) @start
-          (end_tag)? @end) @indent
-        ",
-    )
-    .unwrap()
-    .with_injection_query(
-        r#"
-        (script_element
-            (raw_text) @injection.content
-            (#set! injection.language "javascript"))
-        "#,
-    )
-    .unwrap()
-}
-
-fn erb_lang() -> Language {
-    Language::new(
-        LanguageConfig {
-            name: "HTML+ERB".into(),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["erb".to_string()],
-                ..Default::default()
-            },
-            block_comment: Some(BlockCommentConfig {
-                start: "<%#".into(),
-                prefix: "".into(),
-                end: "%>".into(),
-                tab_size: 0,
-            }),
-            ..Default::default()
-        },
-        Some(tree_sitter_embedded_template::LANGUAGE.into()),
-    )
-    .with_injection_query(
-        r#"
-            (
-                (code) @content
-                (#set! "language" "ruby")
-                (#set! "combined")
-            )
-
-            (
-                (content) @content
-                (#set! "language" "html")
-                (#set! "combined")
-            )
-        "#,
-    )
-    .unwrap()
-}
-
-fn json_lang() -> Language {
-    Language::new(
-        LanguageConfig {
-            name: "Json".into(),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["js".to_string()],
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-        Some(tree_sitter_json::LANGUAGE.into()),
-    )
-}
-
-fn javascript_lang() -> Language {
-    Language::new(
-        LanguageConfig {
-            name: "JavaScript".into(),
-            ..Default::default()
-        },
-        Some(tree_sitter_typescript::LANGUAGE_TSX.into()),
-    )
-    .with_brackets_query(
-        r#"
-        ("{" @open "}" @close)
-        ("(" @open ")" @close)
-        "#,
-    )
-    .unwrap()
-    .with_indents_query(
-        r#"
-        (object "}" @end) @indent
-        "#,
-    )
-    .unwrap()
-}
-
-pub fn markdown_inline_lang() -> Language {
-    Language::new(
-        LanguageConfig {
-            name: "Markdown-Inline".into(),
-            hidden: true,
-            ..LanguageConfig::default()
-        },
-        Some(tree_sitter_md::INLINE_LANGUAGE.into()),
-    )
-    .with_highlights_query("(emphasis) @emphasis")
-    .unwrap()
-}
-
-fn get_tree_sexp(buffer: &Entity<Buffer>, cx: &mut gpui::TestAppContext) -> String {
-    buffer.update(cx, |buffer, _| {
-        let snapshot = buffer.snapshot();
-        let layers = snapshot.syntax.layers(buffer.as_text_snapshot());
-        layers[0].node().to_sexp()
-    })
-}
-
-// Assert that the enclosing bracket ranges around the selection match the pairs indicated by the marked text in `range_markers`
-#[track_caller]
-fn assert_bracket_pairs(
-    selection_text: &'static str,
-    bracket_pair_texts: Vec<&'static str>,
-    language: Arc<Language>,
-    cx: &mut App,
-) {
-    let (expected_text, selection_ranges) = marked_text_ranges(selection_text, false);
-    let buffer = cx.new(|cx| Buffer::local(expected_text.clone(), cx).with_language(language, cx));
-    let buffer = buffer.update(cx, |buffer, _cx| buffer.snapshot());
-
-    let selection_range = selection_ranges[0].clone();
-
-    let bracket_pairs = bracket_pair_texts
-        .into_iter()
-        .map(|pair_text| {
-            let (bracket_text, ranges) = marked_text_ranges(pair_text, false);
-            assert_eq!(bracket_text, expected_text);
-            (ranges[0].clone(), ranges[1].clone())
-        })
-        .collect::<Vec<_>>();
-
-    assert_set_eq!(
-        buffer
-            .bracket_ranges(selection_range)
-            .map(|pair| (pair.open_range, pair.close_range))
-            .collect::<Vec<_>>(),
-        bracket_pairs
-    );
-}
-
-fn init_settings(cx: &mut App, f: fn(&mut AllLanguageSettingsContent)) {
-    let settings_store = SettingsStore::test(cx);
-    cx.set_global(settings_store);
-    cx.update_global::<SettingsStore, _>(|settings, cx| {
-        settings.update_user_settings(cx, |content| f(&mut content.project.all_languages));
-    });
-}
-
-#[gpui::test(iterations = 100)]
-fn test_random_chunk_bitmaps(cx: &mut App, mut rng: StdRng) {
-    use util::RandomCharIter;
-
-    // Generate random text
-    let len = rng.random_range(0..10000);
-    let text = RandomCharIter::new(&mut rng).take(len).collect::<String>();
-
-    let buffer = cx.new(|cx| Buffer::local(text, cx));
-    let snapshot = buffer.read(cx).snapshot();
-
-    // Get all chunks and verify their bitmaps
-    let chunks = snapshot.chunks(0..snapshot.len(), false);
-
-    for chunk in chunks {
-        let chunk_text = chunk.text;
-        let chars_bitmap = chunk.chars;
-        let tabs_bitmap = chunk.tabs;
-
-        // Check empty chunks have empty bitmaps
-        if chunk_text.is_empty() {
-            assert_eq!(
-                chars_bitmap, 0,
-                "Empty chunk should have empty chars bitmap"
-            );
-            assert_eq!(tabs_bitmap, 0, "Empty chunk should have empty tabs bitmap");
-            continue;
-        }
-
-        // Verify that chunk text doesn't exceed 128 bytes
-        assert!(
-            chunk_text.len() <= 128,
-            "Chunk text length {} exceeds 128 bytes",
-            chunk_text.len()
-        );
-
-        // Verify chars bitmap
-        let char_indices = chunk_text
-            .char_indices()
-            .map(|(i, _)| i)
-            .collect::<Vec<_>>();
-
-        for byte_idx in 0..chunk_text.len() {
-            let should_have_bit = char_indices.contains(&byte_idx);
-            let has_bit = chars_bitmap & (1 << byte_idx) != 0;
-
-            if has_bit != should_have_bit {
-                eprintln!("Chunk text bytes: {:?}", chunk_text.as_bytes());
-                eprintln!("Char indices: {:?}", char_indices);
-                eprintln!("Chars bitmap: {:#b}", chars_bitmap);
-            }
-
-            assert_eq!(
-                has_bit, should_have_bit,
-                "Chars bitmap mismatch at byte index {} in chunk {:?}. Expected bit: {}, Got bit: {}",
-                byte_idx, chunk_text, should_have_bit, has_bit
-            );
-        }
-
-        // Verify tabs bitmap
-        for (byte_idx, byte) in chunk_text.bytes().enumerate() {
-            let is_tab = byte == b'\t';
-            let has_bit = tabs_bitmap & (1 << byte_idx) != 0;
-
-            if has_bit != is_tab {
-                eprintln!("Chunk text bytes: {:?}", chunk_text.as_bytes());
-                eprintln!("Tabs bitmap: {:#b}", tabs_bitmap);
-                assert_eq!(
-                    has_bit, is_tab,
-                    "Tabs bitmap mismatch at byte index {} in chunk {:?}. Byte: {:?}, Expected bit: {}, Got bit: {}",
-                    byte_idx, chunk_text, byte as char, is_tab, has_bit
-                );
-            }
-        }
-    }
-}
diff --git a/crates/language/src/diagnostic_set.rs b/crates/language/src/diagnostic_set.rs
deleted file mode 100644
index fa3263df48..0000000000
--- a/crates/language/src/diagnostic_set.rs
+++ /dev/null
@@ -1,359 +0,0 @@
-use crate::{Diagnostic, range_to_lsp};
-use anyhow::Result;
-use collections::HashMap;
-use lsp::LanguageServerId;
-use serde::Serialize;
-use std::{
-    cmp::{Ordering, Reverse},
-    iter,
-    ops::Range,
-};
-use sum_tree::{self, Bias, SumTree};
-use text::{Anchor, FromAnchor, PointUtf16, ToOffset};
-
-/// A set of diagnostics associated with a given buffer, provided
-/// by a single language server.
-///
-/// The diagnostics are stored in a [`SumTree`], which allows this struct
-/// to be cheaply copied, and allows for efficient retrieval of the
-/// diagnostics that intersect a given range of the buffer.
-#[derive(Clone, Debug)]
-pub struct DiagnosticSet {
-    diagnostics: SumTree<DiagnosticEntry<Anchor>>,
-}
-
-/// A single diagnostic in a set. Generic over its range type, because
-/// the diagnostics are stored internally as [`Anchor`]s, but can be
-/// resolved to different coordinates types like [`usize`] byte offsets or
-/// [`Point`](gpui::Point)s.
-#[derive(Clone, Debug, PartialEq, Eq, Serialize)]
-pub struct DiagnosticEntry<T> {
-    /// The range of the buffer where the diagnostic applies.
-    pub range: Range<T>,
-    /// The information about the diagnostic.
-    pub diagnostic: Diagnostic,
-}
-
-/// A single diagnostic in a set. Generic over its range type, because
-/// the diagnostics are stored internally as [`Anchor`]s, but can be
-/// resolved to different coordinates types like [`usize`] byte offsets or
-/// [`Point`](gpui::Point)s.
-#[derive(Clone, Debug, PartialEq, Eq, Serialize)]
-pub struct DiagnosticEntryRef<'a, T> {
-    /// The range of the buffer where the diagnostic applies.
-    pub range: Range<T>,
-    /// The information about the diagnostic.
-    pub diagnostic: &'a Diagnostic,
-}
-
-impl<T: PartialEq> PartialEq<DiagnosticEntry<T>> for DiagnosticEntryRef<'_, T> {
-    fn eq(&self, other: &DiagnosticEntry<T>) -> bool {
-        self.range == other.range && *self.diagnostic == other.diagnostic
-    }
-}
-
-impl<T: PartialEq> PartialEq<DiagnosticEntryRef<'_, T>> for DiagnosticEntry<T> {
-    fn eq(&self, other: &DiagnosticEntryRef<'_, T>) -> bool {
-        self.range == other.range && self.diagnostic == *other.diagnostic
-    }
-}
-
-impl<T: Clone> DiagnosticEntryRef<'_, T> {
-    pub fn to_owned(&self) -> DiagnosticEntry<T> {
-        DiagnosticEntry {
-            range: self.range.clone(),
-            diagnostic: self.diagnostic.clone(),
-        }
-    }
-}
-
-impl<'a> DiagnosticEntryRef<'a, Anchor> {
-    /// Converts the [DiagnosticEntry] to a different buffer coordinate type.
-    pub fn resolve<O: FromAnchor>(
-        &self,
-        buffer: &text::BufferSnapshot,
-    ) -> DiagnosticEntryRef<'a, O> {
-        DiagnosticEntryRef {
-            range: O::from_anchor(&self.range.start, buffer)
-                ..O::from_anchor(&self.range.end, buffer),
-            diagnostic: &self.diagnostic,
-        }
-    }
-}
-
-/// A group of related diagnostics, ordered by their start position
-/// in the buffer.
-#[derive(Debug, Serialize)]
-pub struct DiagnosticGroup<'a, T> {
-    /// The diagnostics.
-    pub entries: Vec<DiagnosticEntryRef<'a, T>>,
-    /// The index into `entries` where the primary diagnostic is stored.
-    pub primary_ix: usize,
-}
-
-impl<'a> DiagnosticGroup<'a, Anchor> {
-    /// Converts the entries in this [`DiagnosticGroup`] to a different buffer coordinate type.
-    pub fn resolve<O: FromAnchor>(&self, buffer: &text::BufferSnapshot) -> DiagnosticGroup<'a, O> {
-        DiagnosticGroup {
-            entries: self
-                .entries
-                .iter()
-                .map(|entry| entry.resolve(buffer))
-                .collect(),
-            primary_ix: self.primary_ix,
-        }
-    }
-}
-
-#[derive(Clone, Debug)]
-pub struct Summary {
-    start: Anchor,
-    end: Anchor,
-    min_start: Anchor,
-    max_end: Anchor,
-    count: usize,
-}
-
-impl DiagnosticEntry<PointUtf16> {
-    /// Returns a raw LSP diagnostic used to provide diagnostic context to LSP
-    /// codeAction request
-    pub fn to_lsp_diagnostic_stub(&self) -> Result<lsp::Diagnostic> {
-        let range = range_to_lsp(self.range.clone())?;
-
-        Ok(lsp::Diagnostic {
-            range,
-            code: self.diagnostic.code.clone(),
-            severity: Some(self.diagnostic.severity),
-            source: self.diagnostic.source.clone(),
-            message: self.diagnostic.message.clone(),
-            data: self.diagnostic.data.clone(),
-            ..Default::default()
-        })
-    }
-}
-impl DiagnosticEntryRef<'_, PointUtf16> {
-    /// Returns a raw LSP diagnostic used to provide diagnostic context to LSP
-    /// codeAction request
-    pub fn to_lsp_diagnostic_stub(&self) -> Result<lsp::Diagnostic> {
-        let range = range_to_lsp(self.range.clone())?;
-
-        Ok(lsp::Diagnostic {
-            range,
-            code: self.diagnostic.code.clone(),
-            severity: Some(self.diagnostic.severity),
-            source: self.diagnostic.source.clone(),
-            message: self.diagnostic.message.clone(),
-            data: self.diagnostic.data.clone(),
-            ..Default::default()
-        })
-    }
-}
-
-impl DiagnosticSet {
-    /// Constructs a [DiagnosticSet] from a sequence of entries, ordered by
-    /// their position in the buffer.
-    pub fn from_sorted_entries<I>(iter: I, buffer: &text::BufferSnapshot) -> Self
-    where
-        I: IntoIterator<Item = DiagnosticEntry<Anchor>>,
-    {
-        Self {
-            diagnostics: SumTree::from_iter(iter, buffer),
-        }
-    }
-
-    /// Constructs a [DiagnosticSet] from a sequence of entries in an arbitrary order.
-    pub fn new<I>(iter: I, buffer: &text::BufferSnapshot) -> Self
-    where
-        I: IntoIterator<Item = DiagnosticEntry<PointUtf16>>,
-    {
-        let mut entries = iter.into_iter().collect::<Vec<_>>();
-        entries.sort_unstable_by_key(|entry| (entry.range.start, Reverse(entry.range.end)));
-        Self {
-            diagnostics: SumTree::from_iter(
-                entries.into_iter().map(|entry| DiagnosticEntry {
-                    range: buffer.anchor_before(entry.range.start)
-                        ..buffer.anchor_before(entry.range.end),
-                    diagnostic: entry.diagnostic,
-                }),
-                buffer,
-            ),
-        }
-    }
-
-    /// Returns the number of diagnostics in the set.
-    pub fn len(&self) -> usize {
-        self.diagnostics.summary().count
-    }
-    /// Returns true when there are no diagnostics in this diagnostic set
-    pub fn is_empty(&self) -> bool {
-        self.len() == 0
-    }
-
-    /// Returns an iterator over the diagnostic entries in the set.
-    pub fn iter(&self) -> impl Iterator<Item = &DiagnosticEntry<Anchor>> {
-        self.diagnostics.iter()
-    }
-
-    /// Returns an iterator over the diagnostic entries that intersect the
-    /// given range of the buffer.
-    pub fn range<'a, T, O>(
-        &'a self,
-        range: Range<T>,
-        buffer: &'a text::BufferSnapshot,
-        inclusive: bool,
-        reversed: bool,
-    ) -> impl 'a + Iterator<Item = DiagnosticEntryRef<'a, O>>
-    where
-        T: 'a + ToOffset,
-        O: FromAnchor,
-    {
-        let end_bias = if inclusive { Bias::Right } else { Bias::Left };
-        let range = buffer.anchor_before(range.start)..buffer.anchor_at(range.end, end_bias);
-        let mut cursor = self.diagnostics.filter::<_, ()>(buffer, {
-            move |summary: &Summary| {
-                let start_cmp = range.start.cmp(&summary.max_end, buffer);
-                let end_cmp = range.end.cmp(&summary.min_start, buffer);
-                if inclusive {
-                    start_cmp <= Ordering::Equal && end_cmp >= Ordering::Equal
-                } else {
-                    start_cmp == Ordering::Less && end_cmp == Ordering::Greater
-                }
-            }
-        });
-
-        if reversed {
-            cursor.prev();
-        } else {
-            cursor.next();
-        }
-        iter::from_fn({
-            move || {
-                if let Some(diagnostic) = cursor.item() {
-                    if reversed {
-                        cursor.prev();
-                    } else {
-                        cursor.next();
-                    }
-                    Some(diagnostic.resolve(buffer))
-                } else {
-                    None
-                }
-            }
-        })
-    }
-
-    /// Adds all of this set's diagnostic groups to the given output vector.
-    pub fn groups<'a>(
-        &'a self,
-        language_server_id: LanguageServerId,
-        output: &mut Vec<(LanguageServerId, DiagnosticGroup<'a, Anchor>)>,
-        buffer: &text::BufferSnapshot,
-    ) {
-        let mut groups = HashMap::default();
-        for entry in self.diagnostics.iter() {
-            groups
-                .entry(entry.diagnostic.group_id)
-                .or_insert(Vec::new())
-                .push(DiagnosticEntryRef {
-                    range: entry.range.clone(),
-                    diagnostic: &entry.diagnostic,
-                });
-        }
-
-        let start_ix = output.len();
-        output.extend(groups.into_values().filter_map(|mut entries| {
-            entries.sort_unstable_by(|a, b| a.range.start.cmp(&b.range.start, buffer));
-            entries
-                .iter()
-                .position(|entry| entry.diagnostic.is_primary)
-                .map(|primary_ix| {
-                    (
-                        language_server_id,
-                        DiagnosticGroup {
-                            entries,
-                            primary_ix,
-                        },
-                    )
-                })
-        }));
-        output[start_ix..].sort_unstable_by(|(id_a, group_a), (id_b, group_b)| {
-            group_a.entries[group_a.primary_ix]
-                .range
-                .start
-                .cmp(&group_b.entries[group_b.primary_ix].range.start, buffer)
-                .then_with(|| id_a.cmp(id_b))
-        });
-    }
-
-    /// Returns all of the diagnostics in a particular diagnostic group,
-    /// in order of their position in the buffer.
-    pub fn group<'a, O: FromAnchor>(
-        &'a self,
-        group_id: usize,
-        buffer: &'a text::BufferSnapshot,
-    ) -> impl 'a + Iterator<Item = DiagnosticEntryRef<'a, O>> {
-        self.iter()
-            .filter(move |entry| entry.diagnostic.group_id == group_id)
-            .map(|entry| entry.resolve(buffer))
-    }
-}
-
-impl sum_tree::Item for DiagnosticEntry<Anchor> {
-    type Summary = Summary;
-
-    fn summary(&self, _cx: &text::BufferSnapshot) -> Self::Summary {
-        Summary {
-            start: self.range.start,
-            end: self.range.end,
-            min_start: self.range.start,
-            max_end: self.range.end,
-            count: 1,
-        }
-    }
-}
-
-impl DiagnosticEntry<Anchor> {
-    /// Converts the [DiagnosticEntry] to a different buffer coordinate type.
-    pub fn resolve<'a, O: FromAnchor>(
-        &'a self,
-        buffer: &text::BufferSnapshot,
-    ) -> DiagnosticEntryRef<'a, O> {
-        DiagnosticEntryRef {
-            range: O::from_anchor(&self.range.start, buffer)
-                ..O::from_anchor(&self.range.end, buffer),
-            diagnostic: &self.diagnostic,
-        }
-    }
-}
-
-impl Default for Summary {
-    fn default() -> Self {
-        Self {
-            start: Anchor::MIN,
-            end: Anchor::MAX,
-            min_start: Anchor::MAX,
-            max_end: Anchor::MIN,
-            count: 0,
-        }
-    }
-}
-
-impl sum_tree::Summary for Summary {
-    type Context<'a> = &'a text::BufferSnapshot;
-
-    fn zero(_cx: Self::Context<'_>) -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, other: &Self, buffer: Self::Context<'_>) {
-        if other.min_start.cmp(&self.min_start, buffer).is_lt() {
-            self.min_start = other.min_start;
-        }
-        if other.max_end.cmp(&self.max_end, buffer).is_gt() {
-            self.max_end = other.max_end;
-        }
-        self.start = other.start;
-        self.end = other.end;
-        self.count += other.count;
-    }
-}
diff --git a/crates/language/src/highlight_map.rs b/crates/language/src/highlight_map.rs
deleted file mode 100644
index ed9eb5d11d..0000000000
--- a/crates/language/src/highlight_map.rs
+++ /dev/null
@@ -1,114 +0,0 @@
-use gpui::HighlightStyle;
-use std::sync::Arc;
-use theme::SyntaxTheme;
-
-#[derive(Clone, Debug)]
-pub struct HighlightMap(Arc<[HighlightId]>);
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct HighlightId(pub u32);
-
-const DEFAULT_SYNTAX_HIGHLIGHT_ID: HighlightId = HighlightId(u32::MAX);
-
-impl HighlightMap {
-    pub(crate) fn new(capture_names: &[&str], theme: &SyntaxTheme) -> Self {
-        // For each capture name in the highlight query, find the longest
-        // key in the theme's syntax styles that matches all of the
-        // dot-separated components of the capture name.
-        HighlightMap(
-            capture_names
-                .iter()
-                .map(|capture_name| {
-                    theme
-                        .highlights
-                        .iter()
-                        .enumerate()
-                        .filter_map(|(i, (key, _))| {
-                            let mut len = 0;
-                            let capture_parts = capture_name.split('.');
-                            for key_part in key.split('.') {
-                                if capture_parts.clone().any(|part| part == key_part) {
-                                    len += 1;
-                                } else {
-                                    return None;
-                                }
-                            }
-                            Some((i, len))
-                        })
-                        .max_by_key(|(_, len)| *len)
-                        .map_or(DEFAULT_SYNTAX_HIGHLIGHT_ID, |(i, _)| HighlightId(i as u32))
-                })
-                .collect(),
-        )
-    }
-
-    pub fn get(&self, capture_id: u32) -> HighlightId {
-        self.0
-            .get(capture_id as usize)
-            .copied()
-            .unwrap_or(DEFAULT_SYNTAX_HIGHLIGHT_ID)
-    }
-}
-
-impl HighlightId {
-    pub const TABSTOP_INSERT_ID: HighlightId = HighlightId(u32::MAX - 1);
-    pub const TABSTOP_REPLACE_ID: HighlightId = HighlightId(u32::MAX - 2);
-
-    pub(crate) fn is_default(&self) -> bool {
-        *self == DEFAULT_SYNTAX_HIGHLIGHT_ID
-    }
-
-    pub fn style(&self, theme: &SyntaxTheme) -> Option<HighlightStyle> {
-        theme.highlights.get(self.0 as usize).map(|entry| entry.1)
-    }
-
-    pub fn name<'a>(&self, theme: &'a SyntaxTheme) -> Option<&'a str> {
-        theme.highlights.get(self.0 as usize).map(|e| e.0.as_str())
-    }
-}
-
-impl Default for HighlightMap {
-    fn default() -> Self {
-        Self(Arc::new([]))
-    }
-}
-
-impl Default for HighlightId {
-    fn default() -> Self {
-        DEFAULT_SYNTAX_HIGHLIGHT_ID
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use gpui::rgba;
-
-    #[test]
-    fn test_highlight_map() {
-        let theme = SyntaxTheme {
-            highlights: [
-                ("function", rgba(0x100000ff)),
-                ("function.method", rgba(0x200000ff)),
-                ("function.async", rgba(0x300000ff)),
-                ("variable.builtin.self.rust", rgba(0x400000ff)),
-                ("variable.builtin", rgba(0x500000ff)),
-                ("variable", rgba(0x600000ff)),
-            ]
-            .iter()
-            .map(|(name, color)| (name.to_string(), (*color).into()))
-            .collect(),
-        };
-
-        let capture_names = &[
-            "function.special",
-            "function.async.rust",
-            "variable.builtin.self",
-        ];
-
-        let map = HighlightMap::new(capture_names, &theme);
-        assert_eq!(map.get(0).name(&theme), Some("function"));
-        assert_eq!(map.get(1).name(&theme), Some("function.async"));
-        assert_eq!(map.get(2).name(&theme), Some("variable.builtin"));
-    }
-}
diff --git a/crates/language/src/language.rs b/crates/language/src/language.rs
deleted file mode 100644
index a17c93f11a..0000000000
--- a/crates/language/src/language.rs
+++ /dev/null
@@ -1,3012 +0,0 @@
-//! The `language` crate provides a large chunk of Zed's language-related
-//! features (the other big contributors being project and lsp crates that revolve around LSP features).
-//! Namely, this crate:
-//! - Provides [`Language`], [`Grammar`] and [`LanguageRegistry`] types that
-//!   use Tree-sitter to provide syntax highlighting to the editor; note though that `language` doesn't perform the highlighting by itself. It only maps ranges in a buffer to colors. Treesitter is also used for buffer outlines (lists of symbols in a buffer)
-//! - Exposes [`LanguageConfig`] that describes how constructs (like brackets or line comments) should be handled by the editor for a source file of a particular language.
-//!
-//! Notably we do *not* assign a single language to a single file; in real world a single file can consist of multiple programming languages - HTML is a good example of that - and `language` crate tends to reflect that status quo in its API.
-mod buffer;
-mod diagnostic_set;
-mod highlight_map;
-mod language_registry;
-pub mod language_settings;
-mod manifest;
-mod outline;
-pub mod proto;
-mod syntax_map;
-mod task_context;
-mod text_diff;
-mod toolchain;
-
-#[cfg(test)]
-pub mod buffer_tests;
-
-use crate::language_settings::SoftWrap;
-pub use crate::language_settings::{EditPredictionsMode, IndentGuideSettings};
-use anyhow::{Context as _, Result};
-use async_trait::async_trait;
-use collections::{HashMap, HashSet, IndexSet};
-use futures::Future;
-use futures::future::LocalBoxFuture;
-use futures::lock::OwnedMutexGuard;
-use gpui::{App, AsyncApp, Entity, SharedString};
-pub use highlight_map::HighlightMap;
-use http_client::HttpClient;
-pub use language_registry::{
-    LanguageName, LanguageServerStatusUpdate, LoadedLanguage, ServerHealth,
-};
-use lsp::{
-    CodeActionKind, InitializeParams, LanguageServerBinary, LanguageServerBinaryOptions, Uri,
-};
-pub use manifest::{ManifestDelegate, ManifestName, ManifestProvider, ManifestQuery};
-use parking_lot::Mutex;
-use regex::Regex;
-use schemars::{JsonSchema, SchemaGenerator, json_schema};
-use serde::{Deserialize, Deserializer, Serialize, Serializer, de};
-use serde_json::Value;
-use settings::WorktreeId;
-use smol::future::FutureExt as _;
-use std::num::NonZeroU32;
-use std::{
-    ffi::OsStr,
-    fmt::Debug,
-    hash::Hash,
-    mem,
-    ops::{DerefMut, Range},
-    path::{Path, PathBuf},
-    str,
-    sync::{
-        Arc, LazyLock,
-        atomic::{AtomicUsize, Ordering::SeqCst},
-    },
-};
-use syntax_map::{QueryCursorHandle, SyntaxSnapshot};
-use task::RunnableTag;
-pub use task_context::{ContextLocation, ContextProvider, RunnableRange};
-pub use text_diff::{
-    DiffOptions, apply_diff_patch, line_diff, text_diff, text_diff_with_options, unified_diff,
-    word_diff_ranges,
-};
-use theme::SyntaxTheme;
-pub use toolchain::{
-    LanguageToolchainStore, LocalLanguageToolchainStore, Toolchain, ToolchainList, ToolchainLister,
-    ToolchainMetadata, ToolchainScope,
-};
-use tree_sitter::{self, Query, QueryCursor, WasmStore, wasmtime};
-use util::rel_path::RelPath;
-use util::serde::default_true;
-
-pub use buffer::Operation;
-pub use buffer::*;
-pub use diagnostic_set::{DiagnosticEntry, DiagnosticEntryRef, DiagnosticGroup};
-pub use language_registry::{
-    AvailableLanguage, BinaryStatus, LanguageNotFound, LanguageQueries, LanguageRegistry,
-    QUERY_FILENAME_PREFIXES,
-};
-pub use lsp::{LanguageServerId, LanguageServerName};
-pub use outline::*;
-pub use syntax_map::{
-    OwnedSyntaxLayer, SyntaxLayer, SyntaxMapMatches, ToTreeSitterPoint, TreeSitterOptions,
-};
-pub use text::{AnchorRangeExt, LineEnding};
-pub use tree_sitter::{Node, Parser, Tree, TreeCursor};
-
-static QUERY_CURSORS: Mutex<Vec<QueryCursor>> = Mutex::new(vec![]);
-static PARSERS: Mutex<Vec<Parser>> = Mutex::new(vec![]);
-
-pub fn with_parser<F, R>(func: F) -> R
-where
-    F: FnOnce(&mut Parser) -> R,
-{
-    let mut parser = PARSERS.lock().pop().unwrap_or_else(|| {
-        let mut parser = Parser::new();
-        parser
-            .set_wasm_store(WasmStore::new(&WASM_ENGINE).unwrap())
-            .unwrap();
-        parser
-    });
-    parser.set_included_ranges(&[]).unwrap();
-    let result = func(&mut parser);
-    PARSERS.lock().push(parser);
-    result
-}
-
-pub fn with_query_cursor<F, R>(func: F) -> R
-where
-    F: FnOnce(&mut QueryCursor) -> R,
-{
-    let mut cursor = QueryCursorHandle::new();
-    func(cursor.deref_mut())
-}
-
-static NEXT_LANGUAGE_ID: AtomicUsize = AtomicUsize::new(0);
-static NEXT_GRAMMAR_ID: AtomicUsize = AtomicUsize::new(0);
-static WASM_ENGINE: LazyLock<wasmtime::Engine> = LazyLock::new(|| {
-    wasmtime::Engine::new(&wasmtime::Config::new()).expect("Failed to create Wasmtime engine")
-});
-
-/// A shared grammar for plain text, exposed for reuse by downstream crates.
-pub static PLAIN_TEXT: LazyLock<Arc<Language>> = LazyLock::new(|| {
-    Arc::new(Language::new(
-        LanguageConfig {
-            name: "Plain Text".into(),
-            soft_wrap: Some(SoftWrap::EditorWidth),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["txt".to_owned()],
-                first_line_pattern: None,
-            },
-            brackets: BracketPairConfig {
-                pairs: vec![
-                    BracketPair {
-                        start: "(".to_string(),
-                        end: ")".to_string(),
-                        close: true,
-                        surround: true,
-                        newline: false,
-                    },
-                    BracketPair {
-                        start: "[".to_string(),
-                        end: "]".to_string(),
-                        close: true,
-                        surround: true,
-                        newline: false,
-                    },
-                    BracketPair {
-                        start: "{".to_string(),
-                        end: "}".to_string(),
-                        close: true,
-                        surround: true,
-                        newline: false,
-                    },
-                    BracketPair {
-                        start: "\"".to_string(),
-                        end: "\"".to_string(),
-                        close: true,
-                        surround: true,
-                        newline: false,
-                    },
-                    BracketPair {
-                        start: "'".to_string(),
-                        end: "'".to_string(),
-                        close: true,
-                        surround: true,
-                        newline: false,
-                    },
-                ],
-                disabled_scopes_by_bracket_ix: Default::default(),
-            },
-            ..Default::default()
-        },
-        None,
-    ))
-});
-
-/// Types that represent a position in a buffer, and can be converted into
-/// an LSP position, to send to a language server.
-pub trait ToLspPosition {
-    /// Converts the value into an LSP position.
-    fn to_lsp_position(self) -> lsp::Position;
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Location {
-    pub buffer: Entity<Buffer>,
-    pub range: Range<Anchor>,
-}
-
-type ServerBinaryCache = futures::lock::Mutex<Option<(bool, LanguageServerBinary)>>;
-type DownloadableLanguageServerBinary = LocalBoxFuture<'static, Result<LanguageServerBinary>>;
-pub type LanguageServerBinaryLocations = LocalBoxFuture<
-    'static,
-    (
-        Result<LanguageServerBinary>,
-        Option<DownloadableLanguageServerBinary>,
-    ),
->;
-/// Represents a Language Server, with certain cached sync properties.
-/// Uses [`LspAdapter`] under the hood, but calls all 'static' methods
-/// once at startup, and caches the results.
-pub struct CachedLspAdapter {
-    pub name: LanguageServerName,
-    pub disk_based_diagnostic_sources: Vec<String>,
-    pub disk_based_diagnostics_progress_token: Option<String>,
-    language_ids: HashMap<LanguageName, String>,
-    pub adapter: Arc<dyn LspAdapter>,
-    cached_binary: Arc<ServerBinaryCache>,
-}
-
-impl Debug for CachedLspAdapter {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("CachedLspAdapter")
-            .field("name", &self.name)
-            .field(
-                "disk_based_diagnostic_sources",
-                &self.disk_based_diagnostic_sources,
-            )
-            .field(
-                "disk_based_diagnostics_progress_token",
-                &self.disk_based_diagnostics_progress_token,
-            )
-            .field("language_ids", &self.language_ids)
-            .finish_non_exhaustive()
-    }
-}
-
-impl CachedLspAdapter {
-    pub fn new(adapter: Arc<dyn LspAdapter>) -> Arc<Self> {
-        let name = adapter.name();
-        let disk_based_diagnostic_sources = adapter.disk_based_diagnostic_sources();
-        let disk_based_diagnostics_progress_token = adapter.disk_based_diagnostics_progress_token();
-        let language_ids = adapter.language_ids();
-
-        Arc::new(CachedLspAdapter {
-            name,
-            disk_based_diagnostic_sources,
-            disk_based_diagnostics_progress_token,
-            language_ids,
-            adapter,
-            cached_binary: Default::default(),
-        })
-    }
-
-    pub fn name(&self) -> LanguageServerName {
-        self.adapter.name()
-    }
-
-    pub async fn get_language_server_command(
-        self: Arc<Self>,
-        delegate: Arc<dyn LspAdapterDelegate>,
-        toolchains: Option<Toolchain>,
-        binary_options: LanguageServerBinaryOptions,
-        cx: &mut AsyncApp,
-    ) -> LanguageServerBinaryLocations {
-        let cached_binary = self.cached_binary.clone().lock_owned().await;
-        self.adapter.clone().get_language_server_command(
-            delegate,
-            toolchains,
-            binary_options,
-            cached_binary,
-            cx.clone(),
-        )
-    }
-
-    pub fn code_action_kinds(&self) -> Option<Vec<CodeActionKind>> {
-        self.adapter.code_action_kinds()
-    }
-
-    pub fn process_diagnostics(
-        &self,
-        params: &mut lsp::PublishDiagnosticsParams,
-        server_id: LanguageServerId,
-        existing_diagnostics: Option<&'_ Buffer>,
-    ) {
-        self.adapter
-            .process_diagnostics(params, server_id, existing_diagnostics)
-    }
-
-    pub fn retain_old_diagnostic(&self, previous_diagnostic: &Diagnostic, cx: &App) -> bool {
-        self.adapter.retain_old_diagnostic(previous_diagnostic, cx)
-    }
-
-    pub fn underline_diagnostic(&self, diagnostic: &lsp::Diagnostic) -> bool {
-        self.adapter.underline_diagnostic(diagnostic)
-    }
-
-    pub fn diagnostic_message_to_markdown(&self, message: &str) -> Option<String> {
-        self.adapter.diagnostic_message_to_markdown(message)
-    }
-
-    pub async fn process_completions(&self, completion_items: &mut [lsp::CompletionItem]) {
-        self.adapter.process_completions(completion_items).await
-    }
-
-    pub async fn labels_for_completions(
-        &self,
-        completion_items: &[lsp::CompletionItem],
-        language: &Arc<Language>,
-    ) -> Result<Vec<Option<CodeLabel>>> {
-        self.adapter
-            .clone()
-            .labels_for_completions(completion_items, language)
-            .await
-    }
-
-    pub async fn labels_for_symbols(
-        &self,
-        symbols: &[(String, lsp::SymbolKind)],
-        language: &Arc<Language>,
-    ) -> Result<Vec<Option<CodeLabel>>> {
-        self.adapter
-            .clone()
-            .labels_for_symbols(symbols, language)
-            .await
-    }
-
-    pub fn language_id(&self, language_name: &LanguageName) -> String {
-        self.language_ids
-            .get(language_name)
-            .cloned()
-            .unwrap_or_else(|| language_name.lsp_id())
-    }
-}
-
-/// [`LspAdapterDelegate`] allows [`LspAdapter]` implementations to interface with the application
-// e.g. to display a notification or fetch data from the web.
-#[async_trait]
-pub trait LspAdapterDelegate: Send + Sync {
-    fn show_notification(&self, message: &str, cx: &mut App);
-    fn http_client(&self) -> Arc<dyn HttpClient>;
-    fn worktree_id(&self) -> WorktreeId;
-    fn worktree_root_path(&self) -> &Path;
-    fn resolve_executable_path(&self, path: PathBuf) -> PathBuf;
-    fn update_status(&self, language: LanguageServerName, status: BinaryStatus);
-    fn registered_lsp_adapters(&self) -> Vec<Arc<dyn LspAdapter>>;
-    async fn language_server_download_dir(&self, name: &LanguageServerName) -> Option<Arc<Path>>;
-
-    async fn npm_package_installed_version(
-        &self,
-        package_name: &str,
-    ) -> Result<Option<(PathBuf, String)>>;
-    async fn which(&self, command: &OsStr) -> Option<PathBuf>;
-    async fn shell_env(&self) -> HashMap<String, String>;
-    async fn read_text_file(&self, path: &RelPath) -> Result<String>;
-    async fn try_exec(&self, binary: LanguageServerBinary) -> Result<()>;
-}
-
-#[async_trait(?Send)]
-pub trait LspAdapter: 'static + Send + Sync + DynLspInstaller {
-    fn name(&self) -> LanguageServerName;
-
-    fn process_diagnostics(
-        &self,
-        _: &mut lsp::PublishDiagnosticsParams,
-        _: LanguageServerId,
-        _: Option<&'_ Buffer>,
-    ) {
-    }
-
-    /// When processing new `lsp::PublishDiagnosticsParams` diagnostics, whether to retain previous one(s) or not.
-    fn retain_old_diagnostic(&self, _previous_diagnostic: &Diagnostic, _cx: &App) -> bool {
-        false
-    }
-
-    /// Whether to underline a given diagnostic or not, when rendering in the editor.
-    ///
-    /// https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#diagnosticTag
-    /// states that
-    /// > Clients are allowed to render diagnostics with this tag faded out instead of having an error squiggle.
-    /// for the unnecessary diagnostics, so do not underline them.
-    fn underline_diagnostic(&self, _diagnostic: &lsp::Diagnostic) -> bool {
-        true
-    }
-
-    /// Post-processes completions provided by the language server.
-    async fn process_completions(&self, _: &mut [lsp::CompletionItem]) {}
-
-    fn diagnostic_message_to_markdown(&self, _message: &str) -> Option<String> {
-        None
-    }
-
-    async fn labels_for_completions(
-        self: Arc<Self>,
-        completions: &[lsp::CompletionItem],
-        language: &Arc<Language>,
-    ) -> Result<Vec<Option<CodeLabel>>> {
-        let mut labels = Vec::new();
-        for (ix, completion) in completions.iter().enumerate() {
-            let label = self.label_for_completion(completion, language).await;
-            if let Some(label) = label {
-                labels.resize(ix + 1, None);
-                *labels.last_mut().unwrap() = Some(label);
-            }
-        }
-        Ok(labels)
-    }
-
-    async fn label_for_completion(
-        &self,
-        _: &lsp::CompletionItem,
-        _: &Arc<Language>,
-    ) -> Option<CodeLabel> {
-        None
-    }
-
-    async fn labels_for_symbols(
-        self: Arc<Self>,
-        symbols: &[(String, lsp::SymbolKind)],
-        language: &Arc<Language>,
-    ) -> Result<Vec<Option<CodeLabel>>> {
-        let mut labels = Vec::new();
-        for (ix, (name, kind)) in symbols.iter().enumerate() {
-            let label = self.label_for_symbol(name, *kind, language).await;
-            if let Some(label) = label {
-                labels.resize(ix + 1, None);
-                *labels.last_mut().unwrap() = Some(label);
-            }
-        }
-        Ok(labels)
-    }
-
-    async fn label_for_symbol(
-        &self,
-        _: &str,
-        _: lsp::SymbolKind,
-        _: &Arc<Language>,
-    ) -> Option<CodeLabel> {
-        None
-    }
-
-    /// Returns initialization options that are going to be sent to a LSP server as a part of [`lsp::InitializeParams`]
-    async fn initialization_options(
-        self: Arc<Self>,
-        _: &Arc<dyn LspAdapterDelegate>,
-    ) -> Result<Option<Value>> {
-        Ok(None)
-    }
-
-    async fn workspace_configuration(
-        self: Arc<Self>,
-        _: &Arc<dyn LspAdapterDelegate>,
-        _: Option<Toolchain>,
-        _: Option<Uri>,
-        _cx: &mut AsyncApp,
-    ) -> Result<Value> {
-        Ok(serde_json::json!({}))
-    }
-
-    async fn additional_initialization_options(
-        self: Arc<Self>,
-        _target_language_server_id: LanguageServerName,
-        _: &Arc<dyn LspAdapterDelegate>,
-    ) -> Result<Option<Value>> {
-        Ok(None)
-    }
-
-    async fn additional_workspace_configuration(
-        self: Arc<Self>,
-        _target_language_server_id: LanguageServerName,
-        _: &Arc<dyn LspAdapterDelegate>,
-        _cx: &mut AsyncApp,
-    ) -> Result<Option<Value>> {
-        Ok(None)
-    }
-
-    /// Returns a list of code actions supported by a given LspAdapter
-    fn code_action_kinds(&self) -> Option<Vec<CodeActionKind>> {
-        None
-    }
-
-    fn disk_based_diagnostic_sources(&self) -> Vec<String> {
-        Default::default()
-    }
-
-    fn disk_based_diagnostics_progress_token(&self) -> Option<String> {
-        None
-    }
-
-    fn language_ids(&self) -> HashMap<LanguageName, String> {
-        HashMap::default()
-    }
-
-    /// Support custom initialize params.
-    fn prepare_initialize_params(
-        &self,
-        original: InitializeParams,
-        _: &App,
-    ) -> Result<InitializeParams> {
-        Ok(original)
-    }
-
-    /// Method only implemented by the default JSON language server adapter.
-    /// Used to provide dynamic reloading of the JSON schemas used to
-    /// provide autocompletion and diagnostics in Zed setting and keybind
-    /// files
-    fn is_primary_zed_json_schema_adapter(&self) -> bool {
-        false
-    }
-
-    /// True for the extension adapter and false otherwise.
-    fn is_extension(&self) -> bool {
-        false
-    }
-}
-
-pub trait LspInstaller {
-    type BinaryVersion;
-    fn check_if_user_installed(
-        &self,
-        _: &dyn LspAdapterDelegate,
-        _: Option<Toolchain>,
-        _: &AsyncApp,
-    ) -> impl Future<Output = Option<LanguageServerBinary>> {
-        async { None }
-    }
-
-    fn fetch_latest_server_version(
-        &self,
-        delegate: &dyn LspAdapterDelegate,
-        pre_release: bool,
-        cx: &mut AsyncApp,
-    ) -> impl Future<Output = Result<Self::BinaryVersion>>;
-
-    fn check_if_version_installed(
-        &self,
-        _version: &Self::BinaryVersion,
-        _container_dir: &PathBuf,
-        _delegate: &dyn LspAdapterDelegate,
-    ) -> impl Send + Future<Output = Option<LanguageServerBinary>> {
-        async { None }
-    }
-
-    fn fetch_server_binary(
-        &self,
-        latest_version: Self::BinaryVersion,
-        container_dir: PathBuf,
-        delegate: &dyn LspAdapterDelegate,
-    ) -> impl Send + Future<Output = Result<LanguageServerBinary>>;
-
-    fn cached_server_binary(
-        &self,
-        container_dir: PathBuf,
-        delegate: &dyn LspAdapterDelegate,
-    ) -> impl Future<Output = Option<LanguageServerBinary>>;
-}
-
-#[async_trait(?Send)]
-pub trait DynLspInstaller {
-    async fn try_fetch_server_binary(
-        &self,
-        delegate: &Arc<dyn LspAdapterDelegate>,
-        container_dir: PathBuf,
-        pre_release: bool,
-        cx: &mut AsyncApp,
-    ) -> Result<LanguageServerBinary>;
-    fn get_language_server_command(
-        self: Arc<Self>,
-        delegate: Arc<dyn LspAdapterDelegate>,
-        toolchains: Option<Toolchain>,
-        binary_options: LanguageServerBinaryOptions,
-        cached_binary: OwnedMutexGuard<Option<(bool, LanguageServerBinary)>>,
-        cx: AsyncApp,
-    ) -> LanguageServerBinaryLocations;
-}
-
-#[async_trait(?Send)]
-impl<LI, BinaryVersion> DynLspInstaller for LI
-where
-    BinaryVersion: Send + Sync,
-    LI: LspInstaller<BinaryVersion = BinaryVersion> + LspAdapter,
-{
-    async fn try_fetch_server_binary(
-        &self,
-        delegate: &Arc<dyn LspAdapterDelegate>,
-        container_dir: PathBuf,
-        pre_release: bool,
-        cx: &mut AsyncApp,
-    ) -> Result<LanguageServerBinary> {
-        let name = self.name();
-
-        log::debug!("fetching latest version of language server {:?}", name.0);
-        delegate.update_status(name.clone(), BinaryStatus::CheckingForUpdate);
-
-        let latest_version = self
-            .fetch_latest_server_version(delegate.as_ref(), pre_release, cx)
-            .await?;
-
-        if let Some(binary) = cx
-            .background_executor()
-            .await_on_background(self.check_if_version_installed(
-                &latest_version,
-                &container_dir,
-                delegate.as_ref(),
-            ))
-            .await
-        {
-            log::debug!("language server {:?} is already installed", name.0);
-            delegate.update_status(name.clone(), BinaryStatus::None);
-            Ok(binary)
-        } else {
-            log::debug!("downloading language server {:?}", name.0);
-            delegate.update_status(name.clone(), BinaryStatus::Downloading);
-            let binary = cx
-                .background_executor()
-                .await_on_background(self.fetch_server_binary(
-                    latest_version,
-                    container_dir,
-                    delegate.as_ref(),
-                ))
-                .await;
-
-            delegate.update_status(name.clone(), BinaryStatus::None);
-            binary
-        }
-    }
-    fn get_language_server_command(
-        self: Arc<Self>,
-        delegate: Arc<dyn LspAdapterDelegate>,
-        toolchain: Option<Toolchain>,
-        binary_options: LanguageServerBinaryOptions,
-        mut cached_binary: OwnedMutexGuard<Option<(bool, LanguageServerBinary)>>,
-        mut cx: AsyncApp,
-    ) -> LanguageServerBinaryLocations {
-        async move {
-            let cached_binary_deref = cached_binary.deref_mut();
-            // First we check whether the adapter can give us a user-installed binary.
-            // If so, we do *not* want to cache that, because each worktree might give us a different
-            // binary:
-            //
-            //      worktree 1: user-installed at `.bin/gopls`
-            //      worktree 2: user-installed at `~/bin/gopls`
-            //      worktree 3: no gopls found in PATH -> fallback to Zed installation
-            //
-            // We only want to cache when we fall back to the global one,
-            // because we don't want to download and overwrite our global one
-            // for each worktree we might have open.
-            if binary_options.allow_path_lookup
-                && let Some(binary) = self
-                    .check_if_user_installed(delegate.as_ref(), toolchain, &mut cx)
-                    .await
-            {
-                log::info!(
-                    "found user-installed language server for {}. path: {:?}, arguments: {:?}",
-                    self.name().0,
-                    binary.path,
-                    binary.arguments
-                );
-                return (Ok(binary), None);
-            }
-
-            if !binary_options.allow_binary_download {
-                return (
-                    Err(anyhow::anyhow!("downloading language servers disabled")),
-                    None,
-                );
-            }
-
-            if let Some((pre_release, cached_binary)) = cached_binary_deref
-                && *pre_release == binary_options.pre_release
-            {
-                return (Ok(cached_binary.clone()), None);
-            }
-
-            let Some(container_dir) = delegate.language_server_download_dir(&self.name()).await
-            else {
-                return (
-                    Err(anyhow::anyhow!("no language server download dir defined")),
-                    None,
-                );
-            };
-
-            let last_downloaded_binary = self
-                .cached_server_binary(container_dir.to_path_buf(), delegate.as_ref())
-                .await
-                .context(
-                    "did not find existing language server binary, falling back to downloading",
-                );
-            let download_binary = async move {
-                let mut binary = self
-                    .try_fetch_server_binary(
-                        &delegate,
-                        container_dir.to_path_buf(),
-                        binary_options.pre_release,
-                        &mut cx,
-                    )
-                    .await;
-
-                if let Err(error) = binary.as_ref() {
-                    if let Some(prev_downloaded_binary) = self
-                        .cached_server_binary(container_dir.to_path_buf(), delegate.as_ref())
-                        .await
-                    {
-                        log::info!(
-                            "failed to fetch newest version of language server {:?}. \
-                            error: {:?}, falling back to using {:?}",
-                            self.name(),
-                            error,
-                            prev_downloaded_binary.path
-                        );
-                        binary = Ok(prev_downloaded_binary);
-                    } else {
-                        delegate.update_status(
-                            self.name(),
-                            BinaryStatus::Failed {
-                                error: format!("{error:?}"),
-                            },
-                        );
-                    }
-                }
-
-                if let Ok(binary) = &binary {
-                    *cached_binary = Some((binary_options.pre_release, binary.clone()));
-                }
-
-                binary
-            }
-            .boxed_local();
-            (last_downloaded_binary, Some(download_binary))
-        }
-        .boxed_local()
-    }
-}
-
-#[derive(Clone, Debug, Default, PartialEq, Eq)]
-pub struct CodeLabel {
-    /// The text to display.
-    pub text: String,
-    /// Syntax highlighting runs.
-    pub runs: Vec<(Range<usize>, HighlightId)>,
-    /// The portion of the text that should be used in fuzzy filtering.
-    pub filter_range: Range<usize>,
-}
-
-#[derive(Clone, Debug, Default, PartialEq, Eq)]
-pub struct CodeLabelBuilder {
-    /// The text to display.
-    text: String,
-    /// Syntax highlighting runs.
-    runs: Vec<(Range<usize>, HighlightId)>,
-    /// The portion of the text that should be used in fuzzy filtering.
-    filter_range: Range<usize>,
-}
-
-#[derive(Clone, Deserialize, JsonSchema, Debug)]
-pub struct LanguageConfig {
-    /// Human-readable name of the language.
-    pub name: LanguageName,
-    /// The name of this language for a Markdown code fence block
-    pub code_fence_block_name: Option<Arc<str>>,
-    // The name of the grammar in a WASM bundle (experimental).
-    pub grammar: Option<Arc<str>>,
-    /// The criteria for matching this language to a given file.
-    #[serde(flatten)]
-    pub matcher: LanguageMatcher,
-    /// List of bracket types in a language.
-    #[serde(default)]
-    pub brackets: BracketPairConfig,
-    /// If set to true, auto indentation uses last non empty line to determine
-    /// the indentation level for a new line.
-    #[serde(default = "auto_indent_using_last_non_empty_line_default")]
-    pub auto_indent_using_last_non_empty_line: bool,
-    // Whether indentation of pasted content should be adjusted based on the context.
-    #[serde(default)]
-    pub auto_indent_on_paste: Option<bool>,
-    /// A regex that is used to determine whether the indentation level should be
-    /// increased in the following line.
-    #[serde(default, deserialize_with = "deserialize_regex")]
-    #[schemars(schema_with = "regex_json_schema")]
-    pub increase_indent_pattern: Option<Regex>,
-    /// A regex that is used to determine whether the indentation level should be
-    /// decreased in the following line.
-    #[serde(default, deserialize_with = "deserialize_regex")]
-    #[schemars(schema_with = "regex_json_schema")]
-    pub decrease_indent_pattern: Option<Regex>,
-    /// A list of rules for decreasing indentation. Each rule pairs a regex with a set of valid
-    /// "block-starting" tokens. When a line matches a pattern, its indentation is aligned with
-    /// the most recent line that began with a corresponding token. This enables context-aware
-    /// outdenting, like aligning an `else` with its `if`.
-    #[serde(default)]
-    pub decrease_indent_patterns: Vec<DecreaseIndentConfig>,
-    /// A list of characters that trigger the automatic insertion of a closing
-    /// bracket when they immediately precede the point where an opening
-    /// bracket is inserted.
-    #[serde(default)]
-    pub autoclose_before: String,
-    /// A placeholder used internally by Semantic Index.
-    #[serde(default)]
-    pub collapsed_placeholder: String,
-    /// A line comment string that is inserted in e.g. `toggle comments` action.
-    /// A language can have multiple flavours of line comments. All of the provided line comments are
-    /// used for comment continuations on the next line, but only the first one is used for Editor::ToggleComments.
-    #[serde(default)]
-    pub line_comments: Vec<Arc<str>>,
-    /// Delimiters and configuration for recognizing and formatting block comments.
-    #[serde(default)]
-    pub block_comment: Option<BlockCommentConfig>,
-    /// Delimiters and configuration for recognizing and formatting documentation comments.
-    #[serde(default, alias = "documentation")]
-    pub documentation_comment: Option<BlockCommentConfig>,
-    /// A list of additional regex patterns that should be treated as prefixes
-    /// for creating boundaries during rewrapping, ensuring content from one
-    /// prefixed section doesn't merge with another (e.g., markdown list items).
-    /// By default, Zed treats as paragraph and comment prefixes as boundaries.
-    #[serde(default, deserialize_with = "deserialize_regex_vec")]
-    #[schemars(schema_with = "regex_vec_json_schema")]
-    pub rewrap_prefixes: Vec<Regex>,
-    /// A list of language servers that are allowed to run on subranges of a given language.
-    #[serde(default)]
-    pub scope_opt_in_language_servers: Vec<LanguageServerName>,
-    #[serde(default)]
-    pub overrides: HashMap<String, LanguageConfigOverride>,
-    /// A list of characters that Zed should treat as word characters for the
-    /// purpose of features that operate on word boundaries, like 'move to next word end'
-    /// or a whole-word search in buffer search.
-    #[serde(default)]
-    pub word_characters: HashSet<char>,
-    /// Whether to indent lines using tab characters, as opposed to multiple
-    /// spaces.
-    #[serde(default)]
-    pub hard_tabs: Option<bool>,
-    /// How many columns a tab should occupy.
-    #[serde(default)]
-    #[schemars(range(min = 1, max = 128))]
-    pub tab_size: Option<NonZeroU32>,
-    /// How to soft-wrap long lines of text.
-    #[serde(default)]
-    pub soft_wrap: Option<SoftWrap>,
-    /// When set, selections can be wrapped using prefix/suffix pairs on both sides.
-    #[serde(default)]
-    pub wrap_characters: Option<WrapCharactersConfig>,
-    /// The name of a Prettier parser that will be used for this language when no file path is available.
-    /// If there's a parser name in the language settings, that will be used instead.
-    #[serde(default)]
-    pub prettier_parser_name: Option<String>,
-    /// If true, this language is only for syntax highlighting via an injection into other
-    /// languages, but should not appear to the user as a distinct language.
-    #[serde(default)]
-    pub hidden: bool,
-    /// If configured, this language contains JSX style tags, and should support auto-closing of those tags.
-    #[serde(default)]
-    pub jsx_tag_auto_close: Option<JsxTagAutoCloseConfig>,
-    /// A list of characters that Zed should treat as word characters for completion queries.
-    #[serde(default)]
-    pub completion_query_characters: HashSet<char>,
-    /// A list of characters that Zed should treat as word characters for linked edit operations.
-    #[serde(default)]
-    pub linked_edit_characters: HashSet<char>,
-    /// A list of preferred debuggers for this language.
-    #[serde(default)]
-    pub debuggers: IndexSet<SharedString>,
-    /// A list of import namespace segments that aren't expected to appear in file paths. For
-    /// example, "super" and "crate" in Rust.
-    #[serde(default)]
-    pub ignored_import_segments: HashSet<Arc<str>>,
-    /// Regular expression that matches substrings to omit from import paths, to make the paths more
-    /// similar to how they are specified when imported. For example, "/mod\.rs$" or "/__init__\.py$".
-    #[serde(default, deserialize_with = "deserialize_regex")]
-    #[schemars(schema_with = "regex_json_schema")]
-    pub import_path_strip_regex: Option<Regex>,
-}
-
-#[derive(Clone, Debug, Deserialize, Default, JsonSchema)]
-pub struct DecreaseIndentConfig {
-    #[serde(default, deserialize_with = "deserialize_regex")]
-    #[schemars(schema_with = "regex_json_schema")]
-    pub pattern: Option<Regex>,
-    #[serde(default)]
-    pub valid_after: Vec<String>,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize, Default, JsonSchema)]
-pub struct LanguageMatcher {
-    /// Given a list of `LanguageConfig`'s, the language of a file can be determined based on the path extension matching any of the `path_suffixes`.
-    #[serde(default)]
-    pub path_suffixes: Vec<String>,
-    /// A regex pattern that determines whether the language should be assigned to a file or not.
-    #[serde(
-        default,
-        serialize_with = "serialize_regex",
-        deserialize_with = "deserialize_regex"
-    )]
-    #[schemars(schema_with = "regex_json_schema")]
-    pub first_line_pattern: Option<Regex>,
-}
-
-/// The configuration for JSX tag auto-closing.
-#[derive(Clone, Deserialize, JsonSchema, Debug)]
-pub struct JsxTagAutoCloseConfig {
-    /// The name of the node for a opening tag
-    pub open_tag_node_name: String,
-    /// The name of the node for an closing tag
-    pub close_tag_node_name: String,
-    /// The name of the node for a complete element with children for open and close tags
-    pub jsx_element_node_name: String,
-    /// The name of the node found within both opening and closing
-    /// tags that describes the tag name
-    pub tag_name_node_name: String,
-    /// Alternate Node names for tag names.
-    /// Specifically needed as TSX represents the name in `<Foo.Bar>`
-    /// as `member_expression` rather than `identifier` as usual
-    #[serde(default)]
-    pub tag_name_node_name_alternates: Vec<String>,
-    /// Some grammars are smart enough to detect a closing tag
-    /// that is not valid i.e. doesn't match it's corresponding
-    /// opening tag or does not have a corresponding opening tag
-    /// This should be set to the name of the node for invalid
-    /// closing tags if the grammar contains such a node, otherwise
-    /// detecting already closed tags will not work properly
-    #[serde(default)]
-    pub erroneous_close_tag_node_name: Option<String>,
-    /// See above for erroneous_close_tag_node_name for details
-    /// This should be set if the node used for the tag name
-    /// within erroneous closing tags is different from the
-    /// normal tag name node name
-    #[serde(default)]
-    pub erroneous_close_tag_name_node_name: Option<String>,
-}
-
-/// The configuration for block comments for this language.
-#[derive(Clone, Debug, JsonSchema, PartialEq)]
-pub struct BlockCommentConfig {
-    /// A start tag of block comment.
-    pub start: Arc<str>,
-    /// A end tag of block comment.
-    pub end: Arc<str>,
-    /// A character to add as a prefix when a new line is added to a block comment.
-    pub prefix: Arc<str>,
-    /// A indent to add for prefix and end line upon new line.
-    #[schemars(range(min = 1, max = 128))]
-    pub tab_size: u32,
-}
-
-impl<'de> Deserialize<'de> for BlockCommentConfig {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        #[derive(Deserialize)]
-        #[serde(untagged)]
-        enum BlockCommentConfigHelper {
-            New {
-                start: Arc<str>,
-                end: Arc<str>,
-                prefix: Arc<str>,
-                tab_size: u32,
-            },
-            Old([Arc<str>; 2]),
-        }
-
-        match BlockCommentConfigHelper::deserialize(deserializer)? {
-            BlockCommentConfigHelper::New {
-                start,
-                end,
-                prefix,
-                tab_size,
-            } => Ok(BlockCommentConfig {
-                start,
-                end,
-                prefix,
-                tab_size,
-            }),
-            BlockCommentConfigHelper::Old([start, end]) => Ok(BlockCommentConfig {
-                start,
-                end,
-                prefix: "".into(),
-                tab_size: 0,
-            }),
-        }
-    }
-}
-
-/// Represents a language for the given range. Some languages (e.g. HTML)
-/// interleave several languages together, thus a single buffer might actually contain
-/// several nested scopes.
-#[derive(Clone, Debug)]
-pub struct LanguageScope {
-    language: Arc<Language>,
-    override_id: Option<u32>,
-}
-
-#[derive(Clone, Deserialize, Default, Debug, JsonSchema)]
-pub struct LanguageConfigOverride {
-    #[serde(default)]
-    pub line_comments: Override<Vec<Arc<str>>>,
-    #[serde(default)]
-    pub block_comment: Override<BlockCommentConfig>,
-    #[serde(skip)]
-    pub disabled_bracket_ixs: Vec<u16>,
-    #[serde(default)]
-    pub word_characters: Override<HashSet<char>>,
-    #[serde(default)]
-    pub completion_query_characters: Override<HashSet<char>>,
-    #[serde(default)]
-    pub linked_edit_characters: Override<HashSet<char>>,
-    #[serde(default)]
-    pub opt_into_language_servers: Vec<LanguageServerName>,
-    #[serde(default)]
-    pub prefer_label_for_snippet: Option<bool>,
-}
-
-#[derive(Clone, Deserialize, Debug, Serialize, JsonSchema)]
-#[serde(untagged)]
-pub enum Override<T> {
-    Remove { remove: bool },
-    Set(T),
-}
-
-impl<T> Default for Override<T> {
-    fn default() -> Self {
-        Override::Remove { remove: false }
-    }
-}
-
-impl<T> Override<T> {
-    fn as_option<'a>(this: Option<&'a Self>, original: Option<&'a T>) -> Option<&'a T> {
-        match this {
-            Some(Self::Set(value)) => Some(value),
-            Some(Self::Remove { remove: true }) => None,
-            Some(Self::Remove { remove: false }) | None => original,
-        }
-    }
-}
-
-impl Default for LanguageConfig {
-    fn default() -> Self {
-        Self {
-            name: LanguageName::new_static(""),
-            code_fence_block_name: None,
-            grammar: None,
-            matcher: LanguageMatcher::default(),
-            brackets: Default::default(),
-            auto_indent_using_last_non_empty_line: auto_indent_using_last_non_empty_line_default(),
-            auto_indent_on_paste: None,
-            increase_indent_pattern: Default::default(),
-            decrease_indent_pattern: Default::default(),
-            decrease_indent_patterns: Default::default(),
-            autoclose_before: Default::default(),
-            line_comments: Default::default(),
-            block_comment: Default::default(),
-            documentation_comment: Default::default(),
-            rewrap_prefixes: Default::default(),
-            scope_opt_in_language_servers: Default::default(),
-            overrides: Default::default(),
-            word_characters: Default::default(),
-            collapsed_placeholder: Default::default(),
-            hard_tabs: None,
-            tab_size: None,
-            soft_wrap: None,
-            wrap_characters: None,
-            prettier_parser_name: None,
-            hidden: false,
-            jsx_tag_auto_close: None,
-            completion_query_characters: Default::default(),
-            linked_edit_characters: Default::default(),
-            debuggers: Default::default(),
-            ignored_import_segments: Default::default(),
-            import_path_strip_regex: None,
-        }
-    }
-}
-
-#[derive(Clone, Debug, Deserialize, JsonSchema)]
-pub struct WrapCharactersConfig {
-    /// Opening token split into a prefix and suffix. The first caret goes
-    /// after the prefix (i.e., between prefix and suffix).
-    pub start_prefix: String,
-    pub start_suffix: String,
-    /// Closing token split into a prefix and suffix. The second caret goes
-    /// after the prefix (i.e., between prefix and suffix).
-    pub end_prefix: String,
-    pub end_suffix: String,
-}
-
-fn auto_indent_using_last_non_empty_line_default() -> bool {
-    true
-}
-
-fn deserialize_regex<'de, D: Deserializer<'de>>(d: D) -> Result<Option<Regex>, D::Error> {
-    let source = Option::<String>::deserialize(d)?;
-    if let Some(source) = source {
-        Ok(Some(regex::Regex::new(&source).map_err(de::Error::custom)?))
-    } else {
-        Ok(None)
-    }
-}
-
-fn regex_json_schema(_: &mut schemars::SchemaGenerator) -> schemars::Schema {
-    json_schema!({
-        "type": "string"
-    })
-}
-
-fn serialize_regex<S>(regex: &Option<Regex>, serializer: S) -> Result<S::Ok, S::Error>
-where
-    S: Serializer,
-{
-    match regex {
-        Some(regex) => serializer.serialize_str(regex.as_str()),
-        None => serializer.serialize_none(),
-    }
-}
-
-fn deserialize_regex_vec<'de, D: Deserializer<'de>>(d: D) -> Result<Vec<Regex>, D::Error> {
-    let sources = Vec::<String>::deserialize(d)?;
-    sources
-        .into_iter()
-        .map(|source| regex::Regex::new(&source))
-        .collect::<Result<_, _>>()
-        .map_err(de::Error::custom)
-}
-
-fn regex_vec_json_schema(_: &mut SchemaGenerator) -> schemars::Schema {
-    json_schema!({
-        "type": "array",
-        "items": { "type": "string" }
-    })
-}
-
-#[doc(hidden)]
-#[cfg(any(test, feature = "test-support"))]
-pub struct FakeLspAdapter {
-    pub name: &'static str,
-    pub initialization_options: Option<Value>,
-    pub prettier_plugins: Vec<&'static str>,
-    pub disk_based_diagnostics_progress_token: Option<String>,
-    pub disk_based_diagnostics_sources: Vec<String>,
-    pub language_server_binary: LanguageServerBinary,
-
-    pub capabilities: lsp::ServerCapabilities,
-    pub initializer: Option<Box<dyn 'static + Send + Sync + Fn(&mut lsp::FakeLanguageServer)>>,
-    pub label_for_completion: Option<
-        Box<
-            dyn 'static
-                + Send
-                + Sync
-                + Fn(&lsp::CompletionItem, &Arc<Language>) -> Option<CodeLabel>,
-        >,
-    >,
-}
-
-/// Configuration of handling bracket pairs for a given language.
-///
-/// This struct includes settings for defining which pairs of characters are considered brackets and
-/// also specifies any language-specific scopes where these pairs should be ignored for bracket matching purposes.
-#[derive(Clone, Debug, Default, JsonSchema)]
-#[schemars(with = "Vec::<BracketPairContent>")]
-pub struct BracketPairConfig {
-    /// A list of character pairs that should be treated as brackets in the context of a given language.
-    pub pairs: Vec<BracketPair>,
-    /// A list of tree-sitter scopes for which a given bracket should not be active.
-    /// N-th entry in `[Self::disabled_scopes_by_bracket_ix]` contains a list of disabled scopes for an n-th entry in `[Self::pairs]`
-    pub disabled_scopes_by_bracket_ix: Vec<Vec<String>>,
-}
-
-impl BracketPairConfig {
-    pub fn is_closing_brace(&self, c: char) -> bool {
-        self.pairs.iter().any(|pair| pair.end.starts_with(c))
-    }
-}
-
-#[derive(Deserialize, JsonSchema)]
-pub struct BracketPairContent {
-    #[serde(flatten)]
-    pub bracket_pair: BracketPair,
-    #[serde(default)]
-    pub not_in: Vec<String>,
-}
-
-impl<'de> Deserialize<'de> for BracketPairConfig {
-    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        let result = Vec::<BracketPairContent>::deserialize(deserializer)?;
-        let (brackets, disabled_scopes_by_bracket_ix) = result
-            .into_iter()
-            .map(|entry| (entry.bracket_pair, entry.not_in))
-            .unzip();
-
-        Ok(BracketPairConfig {
-            pairs: brackets,
-            disabled_scopes_by_bracket_ix,
-        })
-    }
-}
-
-/// Describes a single bracket pair and how an editor should react to e.g. inserting
-/// an opening bracket or to a newline character insertion in between `start` and `end` characters.
-#[derive(Clone, Debug, Default, Deserialize, PartialEq, JsonSchema)]
-pub struct BracketPair {
-    /// Starting substring for a bracket.
-    pub start: String,
-    /// Ending substring for a bracket.
-    pub end: String,
-    /// True if `end` should be automatically inserted right after `start` characters.
-    pub close: bool,
-    /// True if selected text should be surrounded by `start` and `end` characters.
-    #[serde(default = "default_true")]
-    pub surround: bool,
-    /// True if an extra newline should be inserted while the cursor is in the middle
-    /// of that bracket pair.
-    pub newline: bool,
-}
-
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
-pub struct LanguageId(usize);
-
-impl LanguageId {
-    pub(crate) fn new() -> Self {
-        Self(NEXT_LANGUAGE_ID.fetch_add(1, SeqCst))
-    }
-}
-
-pub struct Language {
-    pub(crate) id: LanguageId,
-    pub(crate) config: LanguageConfig,
-    pub(crate) grammar: Option<Arc<Grammar>>,
-    pub(crate) context_provider: Option<Arc<dyn ContextProvider>>,
-    pub(crate) toolchain: Option<Arc<dyn ToolchainLister>>,
-    pub(crate) manifest_name: Option<ManifestName>,
-}
-
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
-pub struct GrammarId(pub usize);
-
-impl GrammarId {
-    pub(crate) fn new() -> Self {
-        Self(NEXT_GRAMMAR_ID.fetch_add(1, SeqCst))
-    }
-}
-
-pub struct Grammar {
-    id: GrammarId,
-    pub ts_language: tree_sitter::Language,
-    pub(crate) error_query: Option<Query>,
-    pub highlights_config: Option<HighlightsConfig>,
-    pub(crate) brackets_config: Option<BracketsConfig>,
-    pub(crate) redactions_config: Option<RedactionConfig>,
-    pub(crate) runnable_config: Option<RunnableConfig>,
-    pub(crate) indents_config: Option<IndentConfig>,
-    pub outline_config: Option<OutlineConfig>,
-    pub text_object_config: Option<TextObjectConfig>,
-    pub embedding_config: Option<EmbeddingConfig>,
-    pub(crate) injection_config: Option<InjectionConfig>,
-    pub(crate) override_config: Option<OverrideConfig>,
-    pub(crate) debug_variables_config: Option<DebugVariablesConfig>,
-    pub(crate) imports_config: Option<ImportsConfig>,
-    pub(crate) highlight_map: Mutex<HighlightMap>,
-}
-
-pub struct HighlightsConfig {
-    pub query: Query,
-    pub identifier_capture_indices: Vec<u32>,
-}
-
-struct IndentConfig {
-    query: Query,
-    indent_capture_ix: u32,
-    start_capture_ix: Option<u32>,
-    end_capture_ix: Option<u32>,
-    outdent_capture_ix: Option<u32>,
-    suffixed_start_captures: HashMap<u32, SharedString>,
-}
-
-pub struct OutlineConfig {
-    pub query: Query,
-    pub item_capture_ix: u32,
-    pub name_capture_ix: u32,
-    pub context_capture_ix: Option<u32>,
-    pub extra_context_capture_ix: Option<u32>,
-    pub open_capture_ix: Option<u32>,
-    pub close_capture_ix: Option<u32>,
-    pub annotation_capture_ix: Option<u32>,
-}
-
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub enum DebuggerTextObject {
-    Variable,
-    Scope,
-}
-
-impl DebuggerTextObject {
-    pub fn from_capture_name(name: &str) -> Option<DebuggerTextObject> {
-        match name {
-            "debug-variable" => Some(DebuggerTextObject::Variable),
-            "debug-scope" => Some(DebuggerTextObject::Scope),
-            _ => None,
-        }
-    }
-}
-
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub enum TextObject {
-    InsideFunction,
-    AroundFunction,
-    InsideClass,
-    AroundClass,
-    InsideComment,
-    AroundComment,
-}
-
-impl TextObject {
-    pub fn from_capture_name(name: &str) -> Option<TextObject> {
-        match name {
-            "function.inside" => Some(TextObject::InsideFunction),
-            "function.around" => Some(TextObject::AroundFunction),
-            "class.inside" => Some(TextObject::InsideClass),
-            "class.around" => Some(TextObject::AroundClass),
-            "comment.inside" => Some(TextObject::InsideComment),
-            "comment.around" => Some(TextObject::AroundComment),
-            _ => None,
-        }
-    }
-
-    pub fn around(&self) -> Option<Self> {
-        match self {
-            TextObject::InsideFunction => Some(TextObject::AroundFunction),
-            TextObject::InsideClass => Some(TextObject::AroundClass),
-            TextObject::InsideComment => Some(TextObject::AroundComment),
-            _ => None,
-        }
-    }
-}
-
-pub struct TextObjectConfig {
-    pub query: Query,
-    pub text_objects_by_capture_ix: Vec<(u32, TextObject)>,
-}
-
-#[derive(Debug)]
-pub struct EmbeddingConfig {
-    pub query: Query,
-    pub item_capture_ix: u32,
-    pub name_capture_ix: Option<u32>,
-    pub context_capture_ix: Option<u32>,
-    pub collapse_capture_ix: Option<u32>,
-    pub keep_capture_ix: Option<u32>,
-}
-
-struct InjectionConfig {
-    query: Query,
-    content_capture_ix: u32,
-    language_capture_ix: Option<u32>,
-    patterns: Vec<InjectionPatternConfig>,
-}
-
-struct RedactionConfig {
-    pub query: Query,
-    pub redaction_capture_ix: u32,
-}
-
-#[derive(Clone, Debug, PartialEq)]
-enum RunnableCapture {
-    Named(SharedString),
-    Run,
-}
-
-struct RunnableConfig {
-    pub query: Query,
-    /// A mapping from capture indice to capture kind
-    pub extra_captures: Vec<RunnableCapture>,
-}
-
-struct OverrideConfig {
-    query: Query,
-    values: HashMap<u32, OverrideEntry>,
-}
-
-#[derive(Debug)]
-struct OverrideEntry {
-    name: String,
-    range_is_inclusive: bool,
-    value: LanguageConfigOverride,
-}
-
-#[derive(Default, Clone)]
-struct InjectionPatternConfig {
-    language: Option<Box<str>>,
-    combined: bool,
-}
-
-#[derive(Debug)]
-struct BracketsConfig {
-    query: Query,
-    open_capture_ix: u32,
-    close_capture_ix: u32,
-    patterns: Vec<BracketsPatternConfig>,
-}
-
-#[derive(Clone, Debug, Default)]
-struct BracketsPatternConfig {
-    newline_only: bool,
-    rainbow_exclude: bool,
-}
-
-pub struct DebugVariablesConfig {
-    pub query: Query,
-    pub objects_by_capture_ix: Vec<(u32, DebuggerTextObject)>,
-}
-
-pub struct ImportsConfig {
-    pub query: Query,
-    pub import_ix: u32,
-    pub name_ix: Option<u32>,
-    pub namespace_ix: Option<u32>,
-    pub source_ix: Option<u32>,
-    pub list_ix: Option<u32>,
-    pub wildcard_ix: Option<u32>,
-    pub alias_ix: Option<u32>,
-}
-
-impl Language {
-    pub fn new(config: LanguageConfig, ts_language: Option<tree_sitter::Language>) -> Self {
-        Self::new_with_id(LanguageId::new(), config, ts_language)
-    }
-
-    pub fn id(&self) -> LanguageId {
-        self.id
-    }
-
-    fn new_with_id(
-        id: LanguageId,
-        config: LanguageConfig,
-        ts_language: Option<tree_sitter::Language>,
-    ) -> Self {
-        Self {
-            id,
-            config,
-            grammar: ts_language.map(|ts_language| {
-                Arc::new(Grammar {
-                    id: GrammarId::new(),
-                    highlights_config: None,
-                    brackets_config: None,
-                    outline_config: None,
-                    text_object_config: None,
-                    embedding_config: None,
-                    indents_config: None,
-                    injection_config: None,
-                    override_config: None,
-                    redactions_config: None,
-                    runnable_config: None,
-                    error_query: Query::new(&ts_language, "(ERROR) @error").ok(),
-                    debug_variables_config: None,
-                    imports_config: None,
-                    ts_language,
-                    highlight_map: Default::default(),
-                })
-            }),
-            context_provider: None,
-            toolchain: None,
-            manifest_name: None,
-        }
-    }
-
-    pub fn with_context_provider(mut self, provider: Option<Arc<dyn ContextProvider>>) -> Self {
-        self.context_provider = provider;
-        self
-    }
-
-    pub fn with_toolchain_lister(mut self, provider: Option<Arc<dyn ToolchainLister>>) -> Self {
-        self.toolchain = provider;
-        self
-    }
-
-    pub fn with_manifest(mut self, name: Option<ManifestName>) -> Self {
-        self.manifest_name = name;
-        self
-    }
-
-    pub fn with_queries(mut self, queries: LanguageQueries) -> Result<Self> {
-        if let Some(query) = queries.highlights {
-            self = self
-                .with_highlights_query(query.as_ref())
-                .context("Error loading highlights query")?;
-        }
-        if let Some(query) = queries.brackets {
-            self = self
-                .with_brackets_query(query.as_ref())
-                .context("Error loading brackets query")?;
-        }
-        if let Some(query) = queries.indents {
-            self = self
-                .with_indents_query(query.as_ref())
-                .context("Error loading indents query")?;
-        }
-        if let Some(query) = queries.outline {
-            self = self
-                .with_outline_query(query.as_ref())
-                .context("Error loading outline query")?;
-        }
-        if let Some(query) = queries.embedding {
-            self = self
-                .with_embedding_query(query.as_ref())
-                .context("Error loading embedding query")?;
-        }
-        if let Some(query) = queries.injections {
-            self = self
-                .with_injection_query(query.as_ref())
-                .context("Error loading injection query")?;
-        }
-        if let Some(query) = queries.overrides {
-            self = self
-                .with_override_query(query.as_ref())
-                .context("Error loading override query")?;
-        }
-        if let Some(query) = queries.redactions {
-            self = self
-                .with_redaction_query(query.as_ref())
-                .context("Error loading redaction query")?;
-        }
-        if let Some(query) = queries.runnables {
-            self = self
-                .with_runnable_query(query.as_ref())
-                .context("Error loading runnables query")?;
-        }
-        if let Some(query) = queries.text_objects {
-            self = self
-                .with_text_object_query(query.as_ref())
-                .context("Error loading textobject query")?;
-        }
-        if let Some(query) = queries.debugger {
-            self = self
-                .with_debug_variables_query(query.as_ref())
-                .context("Error loading debug variables query")?;
-        }
-        if let Some(query) = queries.imports {
-            self = self
-                .with_imports_query(query.as_ref())
-                .context("Error loading imports query")?;
-        }
-        Ok(self)
-    }
-
-    pub fn with_highlights_query(mut self, source: &str) -> Result<Self> {
-        let grammar = self.grammar_mut()?;
-        let query = Query::new(&grammar.ts_language, source)?;
-
-        let mut identifier_capture_indices = Vec::new();
-        for name in [
-            "variable",
-            "constant",
-            "constructor",
-            "function",
-            "function.method",
-            "function.method.call",
-            "function.special",
-            "property",
-            "type",
-            "type.interface",
-        ] {
-            identifier_capture_indices.extend(query.capture_index_for_name(name));
-        }
-
-        grammar.highlights_config = Some(HighlightsConfig {
-            query,
-            identifier_capture_indices,
-        });
-
-        Ok(self)
-    }
-
-    pub fn with_runnable_query(mut self, source: &str) -> Result<Self> {
-        let grammar = self.grammar_mut()?;
-
-        let query = Query::new(&grammar.ts_language, source)?;
-        let extra_captures: Vec<_> = query
-            .capture_names()
-            .iter()
-            .map(|&name| match name {
-                "run" => RunnableCapture::Run,
-                name => RunnableCapture::Named(name.to_string().into()),
-            })
-            .collect();
-
-        grammar.runnable_config = Some(RunnableConfig {
-            extra_captures,
-            query,
-        });
-
-        Ok(self)
-    }
-
-    pub fn with_outline_query(mut self, source: &str) -> Result<Self> {
-        let query = Query::new(&self.expect_grammar()?.ts_language, source)?;
-        let mut item_capture_ix = 0;
-        let mut name_capture_ix = 0;
-        let mut context_capture_ix = None;
-        let mut extra_context_capture_ix = None;
-        let mut open_capture_ix = None;
-        let mut close_capture_ix = None;
-        let mut annotation_capture_ix = None;
-        if populate_capture_indices(
-            &query,
-            &self.config.name,
-            "outline",
-            &[],
-            &mut [
-                Capture::Required("item", &mut item_capture_ix),
-                Capture::Required("name", &mut name_capture_ix),
-                Capture::Optional("context", &mut context_capture_ix),
-                Capture::Optional("context.extra", &mut extra_context_capture_ix),
-                Capture::Optional("open", &mut open_capture_ix),
-                Capture::Optional("close", &mut close_capture_ix),
-                Capture::Optional("annotation", &mut annotation_capture_ix),
-            ],
-        ) {
-            self.grammar_mut()?.outline_config = Some(OutlineConfig {
-                query,
-                item_capture_ix,
-                name_capture_ix,
-                context_capture_ix,
-                extra_context_capture_ix,
-                open_capture_ix,
-                close_capture_ix,
-                annotation_capture_ix,
-            });
-        }
-        Ok(self)
-    }
-
-    pub fn with_text_object_query(mut self, source: &str) -> Result<Self> {
-        let query = Query::new(&self.expect_grammar()?.ts_language, source)?;
-
-        let mut text_objects_by_capture_ix = Vec::new();
-        for (ix, name) in query.capture_names().iter().enumerate() {
-            if let Some(text_object) = TextObject::from_capture_name(name) {
-                text_objects_by_capture_ix.push((ix as u32, text_object));
-            } else {
-                log::warn!(
-                    "unrecognized capture name '{}' in {} textobjects TreeSitter query",
-                    name,
-                    self.config.name,
-                );
-            }
-        }
-
-        self.grammar_mut()?.text_object_config = Some(TextObjectConfig {
-            query,
-            text_objects_by_capture_ix,
-        });
-        Ok(self)
-    }
-
-    pub fn with_embedding_query(mut self, source: &str) -> Result<Self> {
-        let query = Query::new(&self.expect_grammar()?.ts_language, source)?;
-        let mut item_capture_ix = 0;
-        let mut name_capture_ix = None;
-        let mut context_capture_ix = None;
-        let mut collapse_capture_ix = None;
-        let mut keep_capture_ix = None;
-        if populate_capture_indices(
-            &query,
-            &self.config.name,
-            "embedding",
-            &[],
-            &mut [
-                Capture::Required("item", &mut item_capture_ix),
-                Capture::Optional("name", &mut name_capture_ix),
-                Capture::Optional("context", &mut context_capture_ix),
-                Capture::Optional("keep", &mut keep_capture_ix),
-                Capture::Optional("collapse", &mut collapse_capture_ix),
-            ],
-        ) {
-            self.grammar_mut()?.embedding_config = Some(EmbeddingConfig {
-                query,
-                item_capture_ix,
-                name_capture_ix,
-                context_capture_ix,
-                collapse_capture_ix,
-                keep_capture_ix,
-            });
-        }
-        Ok(self)
-    }
-
-    pub fn with_debug_variables_query(mut self, source: &str) -> Result<Self> {
-        let query = Query::new(&self.expect_grammar()?.ts_language, source)?;
-
-        let mut objects_by_capture_ix = Vec::new();
-        for (ix, name) in query.capture_names().iter().enumerate() {
-            if let Some(text_object) = DebuggerTextObject::from_capture_name(name) {
-                objects_by_capture_ix.push((ix as u32, text_object));
-            } else {
-                log::warn!(
-                    "unrecognized capture name '{}' in {} debugger TreeSitter query",
-                    name,
-                    self.config.name,
-                );
-            }
-        }
-
-        self.grammar_mut()?.debug_variables_config = Some(DebugVariablesConfig {
-            query,
-            objects_by_capture_ix,
-        });
-        Ok(self)
-    }
-
-    pub fn with_imports_query(mut self, source: &str) -> Result<Self> {
-        let query = Query::new(&self.expect_grammar()?.ts_language, source)?;
-
-        let mut import_ix = 0;
-        let mut name_ix = None;
-        let mut namespace_ix = None;
-        let mut source_ix = None;
-        let mut list_ix = None;
-        let mut wildcard_ix = None;
-        let mut alias_ix = None;
-        if populate_capture_indices(
-            &query,
-            &self.config.name,
-            "imports",
-            &[],
-            &mut [
-                Capture::Required("import", &mut import_ix),
-                Capture::Optional("name", &mut name_ix),
-                Capture::Optional("namespace", &mut namespace_ix),
-                Capture::Optional("source", &mut source_ix),
-                Capture::Optional("list", &mut list_ix),
-                Capture::Optional("wildcard", &mut wildcard_ix),
-                Capture::Optional("alias", &mut alias_ix),
-            ],
-        ) {
-            self.grammar_mut()?.imports_config = Some(ImportsConfig {
-                query,
-                import_ix,
-                name_ix,
-                namespace_ix,
-                source_ix,
-                list_ix,
-                wildcard_ix,
-                alias_ix,
-            });
-        }
-        return Ok(self);
-    }
-
-    pub fn with_brackets_query(mut self, source: &str) -> Result<Self> {
-        let query = Query::new(&self.expect_grammar()?.ts_language, source)?;
-        let mut open_capture_ix = 0;
-        let mut close_capture_ix = 0;
-        if populate_capture_indices(
-            &query,
-            &self.config.name,
-            "brackets",
-            &[],
-            &mut [
-                Capture::Required("open", &mut open_capture_ix),
-                Capture::Required("close", &mut close_capture_ix),
-            ],
-        ) {
-            let patterns = (0..query.pattern_count())
-                .map(|ix| {
-                    let mut config = BracketsPatternConfig::default();
-                    for setting in query.property_settings(ix) {
-                        let setting_key = setting.key.as_ref();
-                        if setting_key == "newline.only" {
-                            config.newline_only = true
-                        }
-                        if setting_key == "rainbow.exclude" {
-                            config.rainbow_exclude = true
-                        }
-                    }
-                    config
-                })
-                .collect();
-            self.grammar_mut()?.brackets_config = Some(BracketsConfig {
-                query,
-                open_capture_ix,
-                close_capture_ix,
-                patterns,
-            });
-        }
-        Ok(self)
-    }
-
-    pub fn with_indents_query(mut self, source: &str) -> Result<Self> {
-        let query = Query::new(&self.expect_grammar()?.ts_language, source)?;
-        let mut indent_capture_ix = 0;
-        let mut start_capture_ix = None;
-        let mut end_capture_ix = None;
-        let mut outdent_capture_ix = None;
-        if populate_capture_indices(
-            &query,
-            &self.config.name,
-            "indents",
-            &["start."],
-            &mut [
-                Capture::Required("indent", &mut indent_capture_ix),
-                Capture::Optional("start", &mut start_capture_ix),
-                Capture::Optional("end", &mut end_capture_ix),
-                Capture::Optional("outdent", &mut outdent_capture_ix),
-            ],
-        ) {
-            let mut suffixed_start_captures = HashMap::default();
-            for (ix, name) in query.capture_names().iter().enumerate() {
-                if let Some(suffix) = name.strip_prefix("start.") {
-                    suffixed_start_captures.insert(ix as u32, suffix.to_owned().into());
-                }
-            }
-
-            self.grammar_mut()?.indents_config = Some(IndentConfig {
-                query,
-                indent_capture_ix,
-                start_capture_ix,
-                end_capture_ix,
-                outdent_capture_ix,
-                suffixed_start_captures,
-            });
-        }
-        Ok(self)
-    }
-
-    pub fn with_injection_query(mut self, source: &str) -> Result<Self> {
-        let query = Query::new(&self.expect_grammar()?.ts_language, source)?;
-        let mut language_capture_ix = None;
-        let mut injection_language_capture_ix = None;
-        let mut content_capture_ix = None;
-        let mut injection_content_capture_ix = None;
-        if populate_capture_indices(
-            &query,
-            &self.config.name,
-            "injections",
-            &[],
-            &mut [
-                Capture::Optional("language", &mut language_capture_ix),
-                Capture::Optional("injection.language", &mut injection_language_capture_ix),
-                Capture::Optional("content", &mut content_capture_ix),
-                Capture::Optional("injection.content", &mut injection_content_capture_ix),
-            ],
-        ) {
-            language_capture_ix = match (language_capture_ix, injection_language_capture_ix) {
-                (None, Some(ix)) => Some(ix),
-                (Some(_), Some(_)) => {
-                    anyhow::bail!("both language and injection.language captures are present");
-                }
-                _ => language_capture_ix,
-            };
-            content_capture_ix = match (content_capture_ix, injection_content_capture_ix) {
-                (None, Some(ix)) => Some(ix),
-                (Some(_), Some(_)) => {
-                    anyhow::bail!("both content and injection.content captures are present")
-                }
-                _ => content_capture_ix,
-            };
-            let patterns = (0..query.pattern_count())
-                .map(|ix| {
-                    let mut config = InjectionPatternConfig::default();
-                    for setting in query.property_settings(ix) {
-                        match setting.key.as_ref() {
-                            "language" | "injection.language" => {
-                                config.language.clone_from(&setting.value);
-                            }
-                            "combined" | "injection.combined" => {
-                                config.combined = true;
-                            }
-                            _ => {}
-                        }
-                    }
-                    config
-                })
-                .collect();
-            if let Some(content_capture_ix) = content_capture_ix {
-                self.grammar_mut()?.injection_config = Some(InjectionConfig {
-                    query,
-                    language_capture_ix,
-                    content_capture_ix,
-                    patterns,
-                });
-            } else {
-                log::error!(
-                    "missing required capture in injections {} TreeSitter query: \
-                    content or injection.content",
-                    &self.config.name,
-                );
-            }
-        }
-        Ok(self)
-    }
-
-    pub fn with_override_query(mut self, source: &str) -> anyhow::Result<Self> {
-        let query = Query::new(&self.expect_grammar()?.ts_language, source)?;
-
-        let mut override_configs_by_id = HashMap::default();
-        for (ix, mut name) in query.capture_names().iter().copied().enumerate() {
-            let mut range_is_inclusive = false;
-            if name.starts_with('_') {
-                continue;
-            }
-            if let Some(prefix) = name.strip_suffix(".inclusive") {
-                name = prefix;
-                range_is_inclusive = true;
-            }
-
-            let value = self.config.overrides.get(name).cloned().unwrap_or_default();
-            for server_name in &value.opt_into_language_servers {
-                if !self
-                    .config
-                    .scope_opt_in_language_servers
-                    .contains(server_name)
-                {
-                    util::debug_panic!(
-                        "Server {server_name:?} has been opted-in by scope {name:?} but has not been marked as an opt-in server"
-                    );
-                }
-            }
-
-            override_configs_by_id.insert(
-                ix as u32,
-                OverrideEntry {
-                    name: name.to_string(),
-                    range_is_inclusive,
-                    value,
-                },
-            );
-        }
-
-        let referenced_override_names = self.config.overrides.keys().chain(
-            self.config
-                .brackets
-                .disabled_scopes_by_bracket_ix
-                .iter()
-                .flatten(),
-        );
-
-        for referenced_name in referenced_override_names {
-            if !override_configs_by_id
-                .values()
-                .any(|entry| entry.name == *referenced_name)
-            {
-                anyhow::bail!(
-                    "language {:?} has overrides in config not in query: {referenced_name:?}",
-                    self.config.name
-                );
-            }
-        }
-
-        for entry in override_configs_by_id.values_mut() {
-            entry.value.disabled_bracket_ixs = self
-                .config
-                .brackets
-                .disabled_scopes_by_bracket_ix
-                .iter()
-                .enumerate()
-                .filter_map(|(ix, disabled_scope_names)| {
-                    if disabled_scope_names.contains(&entry.name) {
-                        Some(ix as u16)
-                    } else {
-                        None
-                    }
-                })
-                .collect();
-        }
-
-        self.config.brackets.disabled_scopes_by_bracket_ix.clear();
-
-        let grammar = self.grammar_mut()?;
-        grammar.override_config = Some(OverrideConfig {
-            query,
-            values: override_configs_by_id,
-        });
-        Ok(self)
-    }
-
-    pub fn with_redaction_query(mut self, source: &str) -> anyhow::Result<Self> {
-        let query = Query::new(&self.expect_grammar()?.ts_language, source)?;
-        let mut redaction_capture_ix = 0;
-        if populate_capture_indices(
-            &query,
-            &self.config.name,
-            "redactions",
-            &[],
-            &mut [Capture::Required("redact", &mut redaction_capture_ix)],
-        ) {
-            self.grammar_mut()?.redactions_config = Some(RedactionConfig {
-                query,
-                redaction_capture_ix,
-            });
-        }
-        Ok(self)
-    }
-
-    fn expect_grammar(&self) -> Result<&Grammar> {
-        self.grammar
-            .as_ref()
-            .map(|grammar| grammar.as_ref())
-            .context("no grammar for language")
-    }
-
-    fn grammar_mut(&mut self) -> Result<&mut Grammar> {
-        Arc::get_mut(self.grammar.as_mut().context("no grammar for language")?)
-            .context("cannot mutate grammar")
-    }
-
-    pub fn name(&self) -> LanguageName {
-        self.config.name.clone()
-    }
-    pub fn manifest(&self) -> Option<&ManifestName> {
-        self.manifest_name.as_ref()
-    }
-
-    pub fn code_fence_block_name(&self) -> Arc<str> {
-        self.config
-            .code_fence_block_name
-            .clone()
-            .unwrap_or_else(|| self.config.name.as_ref().to_lowercase().into())
-    }
-
-    pub fn context_provider(&self) -> Option<Arc<dyn ContextProvider>> {
-        self.context_provider.clone()
-    }
-
-    pub fn toolchain_lister(&self) -> Option<Arc<dyn ToolchainLister>> {
-        self.toolchain.clone()
-    }
-
-    pub fn highlight_text<'a>(
-        self: &'a Arc<Self>,
-        text: &'a Rope,
-        range: Range<usize>,
-    ) -> Vec<(Range<usize>, HighlightId)> {
-        let mut result = Vec::new();
-        if let Some(grammar) = &self.grammar {
-            let tree = grammar.parse_text(text, None);
-            let captures =
-                SyntaxSnapshot::single_tree_captures(range.clone(), text, &tree, self, |grammar| {
-                    grammar
-                        .highlights_config
-                        .as_ref()
-                        .map(|config| &config.query)
-                });
-            let highlight_maps = vec![grammar.highlight_map()];
-            let mut offset = 0;
-            for chunk in
-                BufferChunks::new(text, range, Some((captures, highlight_maps)), false, None)
-            {
-                let end_offset = offset + chunk.text.len();
-                if let Some(highlight_id) = chunk.syntax_highlight_id
-                    && !highlight_id.is_default()
-                {
-                    result.push((offset..end_offset, highlight_id));
-                }
-                offset = end_offset;
-            }
-        }
-        result
-    }
-
-    pub fn path_suffixes(&self) -> &[String] {
-        &self.config.matcher.path_suffixes
-    }
-
-    pub fn should_autoclose_before(&self, c: char) -> bool {
-        c.is_whitespace() || self.config.autoclose_before.contains(c)
-    }
-
-    pub fn set_theme(&self, theme: &SyntaxTheme) {
-        if let Some(grammar) = self.grammar.as_ref()
-            && let Some(highlights_config) = &grammar.highlights_config
-        {
-            *grammar.highlight_map.lock() =
-                HighlightMap::new(highlights_config.query.capture_names(), theme);
-        }
-    }
-
-    pub fn grammar(&self) -> Option<&Arc<Grammar>> {
-        self.grammar.as_ref()
-    }
-
-    pub fn default_scope(self: &Arc<Self>) -> LanguageScope {
-        LanguageScope {
-            language: self.clone(),
-            override_id: None,
-        }
-    }
-
-    pub fn lsp_id(&self) -> String {
-        self.config.name.lsp_id()
-    }
-
-    pub fn prettier_parser_name(&self) -> Option<&str> {
-        self.config.prettier_parser_name.as_deref()
-    }
-
-    pub fn config(&self) -> &LanguageConfig {
-        &self.config
-    }
-}
-
-impl LanguageScope {
-    pub fn path_suffixes(&self) -> &[String] {
-        self.language.path_suffixes()
-    }
-
-    pub fn language_name(&self) -> LanguageName {
-        self.language.config.name.clone()
-    }
-
-    pub fn collapsed_placeholder(&self) -> &str {
-        self.language.config.collapsed_placeholder.as_ref()
-    }
-
-    /// Returns line prefix that is inserted in e.g. line continuations or
-    /// in `toggle comments` action.
-    pub fn line_comment_prefixes(&self) -> &[Arc<str>] {
-        Override::as_option(
-            self.config_override().map(|o| &o.line_comments),
-            Some(&self.language.config.line_comments),
-        )
-        .map_or([].as_slice(), |e| e.as_slice())
-    }
-
-    /// Config for block comments for this language.
-    pub fn block_comment(&self) -> Option<&BlockCommentConfig> {
-        Override::as_option(
-            self.config_override().map(|o| &o.block_comment),
-            self.language.config.block_comment.as_ref(),
-        )
-    }
-
-    /// Config for documentation-style block comments for this language.
-    pub fn documentation_comment(&self) -> Option<&BlockCommentConfig> {
-        self.language.config.documentation_comment.as_ref()
-    }
-
-    /// Returns additional regex patterns that act as prefix markers for creating
-    /// boundaries during rewrapping.
-    ///
-    /// By default, Zed treats as paragraph and comment prefixes as boundaries.
-    pub fn rewrap_prefixes(&self) -> &[Regex] {
-        &self.language.config.rewrap_prefixes
-    }
-
-    /// Returns a list of language-specific word characters.
-    ///
-    /// By default, Zed treats alphanumeric characters (and '_') as word characters for
-    /// the purpose of actions like 'move to next word end` or whole-word search.
-    /// It additionally accounts for language's additional word characters.
-    pub fn word_characters(&self) -> Option<&HashSet<char>> {
-        Override::as_option(
-            self.config_override().map(|o| &o.word_characters),
-            Some(&self.language.config.word_characters),
-        )
-    }
-
-    /// Returns a list of language-specific characters that are considered part of
-    /// a completion query.
-    pub fn completion_query_characters(&self) -> Option<&HashSet<char>> {
-        Override::as_option(
-            self.config_override()
-                .map(|o| &o.completion_query_characters),
-            Some(&self.language.config.completion_query_characters),
-        )
-    }
-
-    /// Returns a list of language-specific characters that are considered part of
-    /// identifiers during linked editing operations.
-    pub fn linked_edit_characters(&self) -> Option<&HashSet<char>> {
-        Override::as_option(
-            self.config_override().map(|o| &o.linked_edit_characters),
-            Some(&self.language.config.linked_edit_characters),
-        )
-    }
-
-    /// Returns whether to prefer snippet `label` over `new_text` to replace text when
-    /// completion is accepted.
-    ///
-    /// In cases like when cursor is in string or renaming existing function,
-    /// you don't want to expand function signature instead just want function name
-    /// to replace existing one.
-    pub fn prefers_label_for_snippet_in_completion(&self) -> bool {
-        self.config_override()
-            .and_then(|o| o.prefer_label_for_snippet)
-            .unwrap_or(false)
-    }
-
-    /// Returns a list of bracket pairs for a given language with an additional
-    /// piece of information about whether the particular bracket pair is currently active for a given language.
-    pub fn brackets(&self) -> impl Iterator<Item = (&BracketPair, bool)> {
-        let mut disabled_ids = self
-            .config_override()
-            .map_or(&[] as _, |o| o.disabled_bracket_ixs.as_slice());
-        self.language
-            .config
-            .brackets
-            .pairs
-            .iter()
-            .enumerate()
-            .map(move |(ix, bracket)| {
-                let mut is_enabled = true;
-                if let Some(next_disabled_ix) = disabled_ids.first()
-                    && ix == *next_disabled_ix as usize
-                {
-                    disabled_ids = &disabled_ids[1..];
-                    is_enabled = false;
-                }
-                (bracket, is_enabled)
-            })
-    }
-
-    pub fn should_autoclose_before(&self, c: char) -> bool {
-        c.is_whitespace() || self.language.config.autoclose_before.contains(c)
-    }
-
-    pub fn language_allowed(&self, name: &LanguageServerName) -> bool {
-        let config = &self.language.config;
-        let opt_in_servers = &config.scope_opt_in_language_servers;
-        if opt_in_servers.contains(name) {
-            if let Some(over) = self.config_override() {
-                over.opt_into_language_servers.contains(name)
-            } else {
-                false
-            }
-        } else {
-            true
-        }
-    }
-
-    pub fn override_name(&self) -> Option<&str> {
-        let id = self.override_id?;
-        let grammar = self.language.grammar.as_ref()?;
-        let override_config = grammar.override_config.as_ref()?;
-        override_config.values.get(&id).map(|e| e.name.as_str())
-    }
-
-    fn config_override(&self) -> Option<&LanguageConfigOverride> {
-        let id = self.override_id?;
-        let grammar = self.language.grammar.as_ref()?;
-        let override_config = grammar.override_config.as_ref()?;
-        override_config.values.get(&id).map(|e| &e.value)
-    }
-}
-
-impl Hash for Language {
-    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-        self.id.hash(state)
-    }
-}
-
-impl PartialEq for Language {
-    fn eq(&self, other: &Self) -> bool {
-        self.id.eq(&other.id)
-    }
-}
-
-impl Eq for Language {}
-
-impl Debug for Language {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("Language")
-            .field("name", &self.config.name)
-            .finish()
-    }
-}
-
-impl Grammar {
-    pub fn id(&self) -> GrammarId {
-        self.id
-    }
-
-    fn parse_text(&self, text: &Rope, old_tree: Option<Tree>) -> Tree {
-        with_parser(|parser| {
-            parser
-                .set_language(&self.ts_language)
-                .expect("incompatible grammar");
-            let mut chunks = text.chunks_in_range(0..text.len());
-            parser
-                .parse_with_options(
-                    &mut move |offset, _| {
-                        chunks.seek(offset);
-                        chunks.next().unwrap_or("").as_bytes()
-                    },
-                    old_tree.as_ref(),
-                    None,
-                )
-                .unwrap()
-        })
-    }
-
-    pub fn highlight_map(&self) -> HighlightMap {
-        self.highlight_map.lock().clone()
-    }
-
-    pub fn highlight_id_for_name(&self, name: &str) -> Option<HighlightId> {
-        let capture_id = self
-            .highlights_config
-            .as_ref()?
-            .query
-            .capture_index_for_name(name)?;
-        Some(self.highlight_map.lock().get(capture_id))
-    }
-
-    pub fn debug_variables_config(&self) -> Option<&DebugVariablesConfig> {
-        self.debug_variables_config.as_ref()
-    }
-
-    pub fn imports_config(&self) -> Option<&ImportsConfig> {
-        self.imports_config.as_ref()
-    }
-}
-
-impl CodeLabelBuilder {
-    pub fn respan_filter_range(&mut self, filter_text: Option<&str>) {
-        self.filter_range = filter_text
-            .and_then(|filter| self.text.find(filter).map(|ix| ix..ix + filter.len()))
-            .unwrap_or(0..self.text.len());
-    }
-
-    pub fn push_str(&mut self, text: &str, highlight: Option<HighlightId>) {
-        let start_ix = self.text.len();
-        self.text.push_str(text);
-        if let Some(highlight) = highlight {
-            let end_ix = self.text.len();
-            self.runs.push((start_ix..end_ix, highlight));
-        }
-    }
-
-    pub fn build(mut self) -> CodeLabel {
-        if self.filter_range.end == 0 {
-            self.respan_filter_range(None);
-        }
-        CodeLabel {
-            text: self.text,
-            runs: self.runs,
-            filter_range: self.filter_range,
-        }
-    }
-}
-
-impl CodeLabel {
-    pub fn fallback_for_completion(
-        item: &lsp::CompletionItem,
-        language: Option<&Language>,
-    ) -> Self {
-        let highlight_id = item.kind.and_then(|kind| {
-            let grammar = language?.grammar()?;
-            use lsp::CompletionItemKind as Kind;
-            match kind {
-                Kind::CLASS => grammar.highlight_id_for_name("type"),
-                Kind::CONSTANT => grammar.highlight_id_for_name("constant"),
-                Kind::CONSTRUCTOR => grammar.highlight_id_for_name("constructor"),
-                Kind::ENUM => grammar
-                    .highlight_id_for_name("enum")
-                    .or_else(|| grammar.highlight_id_for_name("type")),
-                Kind::ENUM_MEMBER => grammar
-                    .highlight_id_for_name("variant")
-                    .or_else(|| grammar.highlight_id_for_name("property")),
-                Kind::FIELD => grammar.highlight_id_for_name("property"),
-                Kind::FUNCTION => grammar.highlight_id_for_name("function"),
-                Kind::INTERFACE => grammar.highlight_id_for_name("type"),
-                Kind::METHOD => grammar
-                    .highlight_id_for_name("function.method")
-                    .or_else(|| grammar.highlight_id_for_name("function")),
-                Kind::OPERATOR => grammar.highlight_id_for_name("operator"),
-                Kind::PROPERTY => grammar.highlight_id_for_name("property"),
-                Kind::STRUCT => grammar.highlight_id_for_name("type"),
-                Kind::VARIABLE => grammar.highlight_id_for_name("variable"),
-                Kind::KEYWORD => grammar.highlight_id_for_name("keyword"),
-                _ => None,
-            }
-        });
-
-        let label = &item.label;
-        let label_length = label.len();
-        let runs = highlight_id
-            .map(|highlight_id| vec![(0..label_length, highlight_id)])
-            .unwrap_or_default();
-        let text = if let Some(detail) = item.detail.as_deref().filter(|detail| detail != label) {
-            format!("{label} {detail}")
-        } else if let Some(description) = item
-            .label_details
-            .as_ref()
-            .and_then(|label_details| label_details.description.as_deref())
-            .filter(|description| description != label)
-        {
-            format!("{label} {description}")
-        } else {
-            label.clone()
-        };
-        let filter_range = item
-            .filter_text
-            .as_deref()
-            .and_then(|filter| text.find(filter).map(|ix| ix..ix + filter.len()))
-            .unwrap_or(0..label_length);
-        Self {
-            text,
-            runs,
-            filter_range,
-        }
-    }
-
-    pub fn plain(text: String, filter_text: Option<&str>) -> Self {
-        Self::filtered(text.clone(), text.len(), filter_text, Vec::new())
-    }
-
-    pub fn filtered(
-        text: String,
-        label_len: usize,
-        filter_text: Option<&str>,
-        runs: Vec<(Range<usize>, HighlightId)>,
-    ) -> Self {
-        assert!(label_len <= text.len());
-        let filter_range = filter_text
-            .and_then(|filter| text.find(filter).map(|ix| ix..ix + filter.len()))
-            .unwrap_or(0..label_len);
-        Self::new(text, filter_range, runs)
-    }
-
-    pub fn new(
-        text: String,
-        filter_range: Range<usize>,
-        runs: Vec<(Range<usize>, HighlightId)>,
-    ) -> Self {
-        assert!(
-            text.get(filter_range.clone()).is_some(),
-            "invalid filter range"
-        );
-        runs.iter().for_each(|(range, _)| {
-            assert!(text.get(range.clone()).is_some(), "invalid run range");
-        });
-        Self {
-            runs,
-            filter_range,
-            text,
-        }
-    }
-
-    pub fn text(&self) -> &str {
-        self.text.as_str()
-    }
-
-    pub fn filter_text(&self) -> &str {
-        &self.text[self.filter_range.clone()]
-    }
-}
-
-impl From<String> for CodeLabel {
-    fn from(value: String) -> Self {
-        Self::plain(value, None)
-    }
-}
-
-impl From<&str> for CodeLabel {
-    fn from(value: &str) -> Self {
-        Self::plain(value.to_string(), None)
-    }
-}
-
-impl Ord for LanguageMatcher {
-    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
-        self.path_suffixes.cmp(&other.path_suffixes).then_with(|| {
-            self.first_line_pattern
-                .as_ref()
-                .map(Regex::as_str)
-                .cmp(&other.first_line_pattern.as_ref().map(Regex::as_str))
-        })
-    }
-}
-
-impl PartialOrd for LanguageMatcher {
-    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-impl Eq for LanguageMatcher {}
-
-impl PartialEq for LanguageMatcher {
-    fn eq(&self, other: &Self) -> bool {
-        self.path_suffixes == other.path_suffixes
-            && self.first_line_pattern.as_ref().map(Regex::as_str)
-                == other.first_line_pattern.as_ref().map(Regex::as_str)
-    }
-}
-
-#[cfg(any(test, feature = "test-support"))]
-impl Default for FakeLspAdapter {
-    fn default() -> Self {
-        Self {
-            name: "the-fake-language-server",
-            capabilities: lsp::LanguageServer::full_capabilities(),
-            initializer: None,
-            disk_based_diagnostics_progress_token: None,
-            initialization_options: None,
-            disk_based_diagnostics_sources: Vec::new(),
-            prettier_plugins: Vec::new(),
-            language_server_binary: LanguageServerBinary {
-                path: "/the/fake/lsp/path".into(),
-                arguments: vec![],
-                env: Default::default(),
-            },
-            label_for_completion: None,
-        }
-    }
-}
-
-#[cfg(any(test, feature = "test-support"))]
-impl LspInstaller for FakeLspAdapter {
-    type BinaryVersion = ();
-
-    async fn fetch_latest_server_version(
-        &self,
-        _: &dyn LspAdapterDelegate,
-        _: bool,
-        _: &mut AsyncApp,
-    ) -> Result<Self::BinaryVersion> {
-        unreachable!()
-    }
-
-    async fn check_if_user_installed(
-        &self,
-        _: &dyn LspAdapterDelegate,
-        _: Option<Toolchain>,
-        _: &AsyncApp,
-    ) -> Option<LanguageServerBinary> {
-        Some(self.language_server_binary.clone())
-    }
-
-    async fn fetch_server_binary(
-        &self,
-        _: (),
-        _: PathBuf,
-        _: &dyn LspAdapterDelegate,
-    ) -> Result<LanguageServerBinary> {
-        unreachable!();
-    }
-
-    async fn cached_server_binary(
-        &self,
-        _: PathBuf,
-        _: &dyn LspAdapterDelegate,
-    ) -> Option<LanguageServerBinary> {
-        unreachable!();
-    }
-}
-
-#[cfg(any(test, feature = "test-support"))]
-#[async_trait(?Send)]
-impl LspAdapter for FakeLspAdapter {
-    fn name(&self) -> LanguageServerName {
-        LanguageServerName(self.name.into())
-    }
-
-    fn disk_based_diagnostic_sources(&self) -> Vec<String> {
-        self.disk_based_diagnostics_sources.clone()
-    }
-
-    fn disk_based_diagnostics_progress_token(&self) -> Option<String> {
-        self.disk_based_diagnostics_progress_token.clone()
-    }
-
-    async fn initialization_options(
-        self: Arc<Self>,
-        _: &Arc<dyn LspAdapterDelegate>,
-    ) -> Result<Option<Value>> {
-        Ok(self.initialization_options.clone())
-    }
-
-    async fn label_for_completion(
-        &self,
-        item: &lsp::CompletionItem,
-        language: &Arc<Language>,
-    ) -> Option<CodeLabel> {
-        let label_for_completion = self.label_for_completion.as_ref()?;
-        label_for_completion(item, language)
-    }
-
-    fn is_extension(&self) -> bool {
-        false
-    }
-}
-
-enum Capture<'a> {
-    Required(&'static str, &'a mut u32),
-    Optional(&'static str, &'a mut Option<u32>),
-}
-
-fn populate_capture_indices(
-    query: &Query,
-    language_name: &LanguageName,
-    query_type: &str,
-    expected_prefixes: &[&str],
-    captures: &mut [Capture<'_>],
-) -> bool {
-    let mut found_required_indices = Vec::new();
-    'outer: for (ix, name) in query.capture_names().iter().enumerate() {
-        for (required_ix, capture) in captures.iter_mut().enumerate() {
-            match capture {
-                Capture::Required(capture_name, index) if capture_name == name => {
-                    **index = ix as u32;
-                    found_required_indices.push(required_ix);
-                    continue 'outer;
-                }
-                Capture::Optional(capture_name, index) if capture_name == name => {
-                    **index = Some(ix as u32);
-                    continue 'outer;
-                }
-                _ => {}
-            }
-        }
-        if !name.starts_with("_")
-            && !expected_prefixes
-                .iter()
-                .any(|&prefix| name.starts_with(prefix))
-        {
-            log::warn!(
-                "unrecognized capture name '{}' in {} {} TreeSitter query \
-                (suppress this warning by prefixing with '_')",
-                name,
-                language_name,
-                query_type
-            );
-        }
-    }
-    let mut missing_required_captures = Vec::new();
-    for (capture_ix, capture) in captures.iter().enumerate() {
-        if let Capture::Required(capture_name, _) = capture
-            && !found_required_indices.contains(&capture_ix)
-        {
-            missing_required_captures.push(*capture_name);
-        }
-    }
-    let success = missing_required_captures.is_empty();
-    if !success {
-        log::error!(
-            "missing required capture(s) in {} {} TreeSitter query: {}",
-            language_name,
-            query_type,
-            missing_required_captures.join(", ")
-        );
-    }
-    success
-}
-
-pub fn point_to_lsp(point: PointUtf16) -> lsp::Position {
-    lsp::Position::new(point.row, point.column)
-}
-
-pub fn point_from_lsp(point: lsp::Position) -> Unclipped<PointUtf16> {
-    Unclipped(PointUtf16::new(point.line, point.character))
-}
-
-pub fn range_to_lsp(range: Range<PointUtf16>) -> Result<lsp::Range> {
-    anyhow::ensure!(
-        range.start <= range.end,
-        "Inverted range provided to an LSP request: {:?}-{:?}",
-        range.start,
-        range.end
-    );
-    Ok(lsp::Range {
-        start: point_to_lsp(range.start),
-        end: point_to_lsp(range.end),
-    })
-}
-
-pub fn range_from_lsp(range: lsp::Range) -> Range<Unclipped<PointUtf16>> {
-    let mut start = point_from_lsp(range.start);
-    let mut end = point_from_lsp(range.end);
-    if start > end {
-        // We debug instead of warn so that this is not logged by default unless explicitly requested.
-        // Using warn would write to the log file, and since we receive an enormous amount of
-        // range_from_lsp calls (especially during completions), that can hang the main thread.
-        //
-        // See issue #36223.
-        zlog::debug!("range_from_lsp called with inverted range {start:?}-{end:?}");
-        mem::swap(&mut start, &mut end);
-    }
-    start..end
-}
-
-#[doc(hidden)]
-#[cfg(any(test, feature = "test-support"))]
-pub fn rust_lang() -> Arc<Language> {
-    use std::borrow::Cow;
-
-    let language = Language::new(
-        LanguageConfig {
-            name: "Rust".into(),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["rs".to_string()],
-                ..Default::default()
-            },
-            line_comments: vec!["// ".into(), "/// ".into(), "//! ".into()],
-            ..Default::default()
-        },
-        Some(tree_sitter_rust::LANGUAGE.into()),
-    )
-    .with_queries(LanguageQueries {
-        outline: Some(Cow::from(include_str!(
-            "../../languages/src/rust/outline.scm"
-        ))),
-        indents: Some(Cow::from(include_str!(
-            "../../languages/src/rust/indents.scm"
-        ))),
-        brackets: Some(Cow::from(include_str!(
-            "../../languages/src/rust/brackets.scm"
-        ))),
-        text_objects: Some(Cow::from(include_str!(
-            "../../languages/src/rust/textobjects.scm"
-        ))),
-        highlights: Some(Cow::from(include_str!(
-            "../../languages/src/rust/highlights.scm"
-        ))),
-        embedding: Some(Cow::from(include_str!(
-            "../../languages/src/rust/embedding.scm"
-        ))),
-        injections: Some(Cow::from(include_str!(
-            "../../languages/src/rust/injections.scm"
-        ))),
-        overrides: Some(Cow::from(include_str!(
-            "../../languages/src/rust/overrides.scm"
-        ))),
-        redactions: None,
-        runnables: Some(Cow::from(include_str!(
-            "../../languages/src/rust/runnables.scm"
-        ))),
-        debugger: Some(Cow::from(include_str!(
-            "../../languages/src/rust/debugger.scm"
-        ))),
-        imports: Some(Cow::from(include_str!(
-            "../../languages/src/rust/imports.scm"
-        ))),
-    })
-    .expect("Could not parse queries");
-    Arc::new(language)
-}
-
-#[doc(hidden)]
-#[cfg(any(test, feature = "test-support"))]
-pub fn markdown_lang() -> Arc<Language> {
-    use std::borrow::Cow;
-
-    let language = Language::new(
-        LanguageConfig {
-            name: "Markdown".into(),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["md".into()],
-                ..Default::default()
-            },
-            ..LanguageConfig::default()
-        },
-        Some(tree_sitter_md::LANGUAGE.into()),
-    )
-    .with_queries(LanguageQueries {
-        brackets: Some(Cow::from(include_str!(
-            "../../languages/src/markdown/brackets.scm"
-        ))),
-        injections: Some(Cow::from(include_str!(
-            "../../languages/src/markdown/injections.scm"
-        ))),
-        highlights: Some(Cow::from(include_str!(
-            "../../languages/src/markdown/highlights.scm"
-        ))),
-        indents: Some(Cow::from(include_str!(
-            "../../languages/src/markdown/indents.scm"
-        ))),
-        outline: Some(Cow::from(include_str!(
-            "../../languages/src/markdown/outline.scm"
-        ))),
-        ..LanguageQueries::default()
-    })
-    .expect("Could not parse markdown queries");
-    Arc::new(language)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use gpui::TestAppContext;
-    use pretty_assertions::assert_matches;
-
-    #[gpui::test(iterations = 10)]
-    async fn test_language_loading(cx: &mut TestAppContext) {
-        let languages = LanguageRegistry::test(cx.executor());
-        let languages = Arc::new(languages);
-        languages.register_native_grammars([
-            ("json", tree_sitter_json::LANGUAGE),
-            ("rust", tree_sitter_rust::LANGUAGE),
-        ]);
-        languages.register_test_language(LanguageConfig {
-            name: "JSON".into(),
-            grammar: Some("json".into()),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["json".into()],
-                ..Default::default()
-            },
-            ..Default::default()
-        });
-        languages.register_test_language(LanguageConfig {
-            name: "Rust".into(),
-            grammar: Some("rust".into()),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["rs".into()],
-                ..Default::default()
-            },
-            ..Default::default()
-        });
-        assert_eq!(
-            languages.language_names(),
-            &[
-                LanguageName::new_static("JSON"),
-                LanguageName::new_static("Plain Text"),
-                LanguageName::new_static("Rust"),
-            ]
-        );
-
-        let rust1 = languages.language_for_name("Rust");
-        let rust2 = languages.language_for_name("Rust");
-
-        // Ensure language is still listed even if it's being loaded.
-        assert_eq!(
-            languages.language_names(),
-            &[
-                LanguageName::new_static("JSON"),
-                LanguageName::new_static("Plain Text"),
-                LanguageName::new_static("Rust"),
-            ]
-        );
-
-        let (rust1, rust2) = futures::join!(rust1, rust2);
-        assert!(Arc::ptr_eq(&rust1.unwrap(), &rust2.unwrap()));
-
-        // Ensure language is still listed even after loading it.
-        assert_eq!(
-            languages.language_names(),
-            &[
-                LanguageName::new_static("JSON"),
-                LanguageName::new_static("Plain Text"),
-                LanguageName::new_static("Rust"),
-            ]
-        );
-
-        // Loading an unknown language returns an error.
-        assert!(languages.language_for_name("Unknown").await.is_err());
-    }
-
-    #[gpui::test]
-    async fn test_completion_label_omits_duplicate_data() {
-        let regular_completion_item_1 = lsp::CompletionItem {
-            label: "regular1".to_string(),
-            detail: Some("detail1".to_string()),
-            label_details: Some(lsp::CompletionItemLabelDetails {
-                detail: None,
-                description: Some("description 1".to_string()),
-            }),
-            ..lsp::CompletionItem::default()
-        };
-
-        let regular_completion_item_2 = lsp::CompletionItem {
-            label: "regular2".to_string(),
-            label_details: Some(lsp::CompletionItemLabelDetails {
-                detail: None,
-                description: Some("description 2".to_string()),
-            }),
-            ..lsp::CompletionItem::default()
-        };
-
-        let completion_item_with_duplicate_detail_and_proper_description = lsp::CompletionItem {
-            detail: Some(regular_completion_item_1.label.clone()),
-            ..regular_completion_item_1.clone()
-        };
-
-        let completion_item_with_duplicate_detail = lsp::CompletionItem {
-            detail: Some(regular_completion_item_1.label.clone()),
-            label_details: None,
-            ..regular_completion_item_1.clone()
-        };
-
-        let completion_item_with_duplicate_description = lsp::CompletionItem {
-            label_details: Some(lsp::CompletionItemLabelDetails {
-                detail: None,
-                description: Some(regular_completion_item_2.label.clone()),
-            }),
-            ..regular_completion_item_2.clone()
-        };
-
-        assert_eq!(
-            CodeLabel::fallback_for_completion(&regular_completion_item_1, None).text,
-            format!(
-                "{} {}",
-                regular_completion_item_1.label,
-                regular_completion_item_1.detail.unwrap()
-            ),
-            "LSP completion items with both detail and label_details.description should prefer detail"
-        );
-        assert_eq!(
-            CodeLabel::fallback_for_completion(&regular_completion_item_2, None).text,
-            format!(
-                "{} {}",
-                regular_completion_item_2.label,
-                regular_completion_item_2
-                    .label_details
-                    .as_ref()
-                    .unwrap()
-                    .description
-                    .as_ref()
-                    .unwrap()
-            ),
-            "LSP completion items without detail but with label_details.description should use that"
-        );
-        assert_eq!(
-            CodeLabel::fallback_for_completion(
-                &completion_item_with_duplicate_detail_and_proper_description,
-                None
-            )
-            .text,
-            format!(
-                "{} {}",
-                regular_completion_item_1.label,
-                regular_completion_item_1
-                    .label_details
-                    .as_ref()
-                    .unwrap()
-                    .description
-                    .as_ref()
-                    .unwrap()
-            ),
-            "LSP completion items with both detail and label_details.description should prefer description only if the detail duplicates the completion label"
-        );
-        assert_eq!(
-            CodeLabel::fallback_for_completion(&completion_item_with_duplicate_detail, None).text,
-            regular_completion_item_1.label,
-            "LSP completion items with duplicate label and detail, should omit the detail"
-        );
-        assert_eq!(
-            CodeLabel::fallback_for_completion(&completion_item_with_duplicate_description, None)
-                .text,
-            regular_completion_item_2.label,
-            "LSP completion items with duplicate label and detail, should omit the detail"
-        );
-    }
-
-    #[test]
-    fn test_deserializing_comments_backwards_compat() {
-        // current version of `block_comment` and `documentation_comment` work
-        {
-            let config: LanguageConfig = ::toml::from_str(
-                r#"
-                name = "Foo"
-                block_comment = { start = "a", end = "b", prefix = "c", tab_size = 1 }
-                documentation_comment = { start = "d", end = "e", prefix = "f", tab_size = 2 }
-                "#,
-            )
-            .unwrap();
-            assert_matches!(config.block_comment, Some(BlockCommentConfig { .. }));
-            assert_matches!(
-                config.documentation_comment,
-                Some(BlockCommentConfig { .. })
-            );
-
-            let block_config = config.block_comment.unwrap();
-            assert_eq!(block_config.start.as_ref(), "a");
-            assert_eq!(block_config.end.as_ref(), "b");
-            assert_eq!(block_config.prefix.as_ref(), "c");
-            assert_eq!(block_config.tab_size, 1);
-
-            let doc_config = config.documentation_comment.unwrap();
-            assert_eq!(doc_config.start.as_ref(), "d");
-            assert_eq!(doc_config.end.as_ref(), "e");
-            assert_eq!(doc_config.prefix.as_ref(), "f");
-            assert_eq!(doc_config.tab_size, 2);
-        }
-
-        // former `documentation` setting is read into `documentation_comment`
-        {
-            let config: LanguageConfig = ::toml::from_str(
-                r#"
-                name = "Foo"
-                documentation = { start = "a", end = "b", prefix = "c", tab_size = 1}
-                "#,
-            )
-            .unwrap();
-            assert_matches!(
-                config.documentation_comment,
-                Some(BlockCommentConfig { .. })
-            );
-
-            let config = config.documentation_comment.unwrap();
-            assert_eq!(config.start.as_ref(), "a");
-            assert_eq!(config.end.as_ref(), "b");
-            assert_eq!(config.prefix.as_ref(), "c");
-            assert_eq!(config.tab_size, 1);
-        }
-
-        // old block_comment format is read into BlockCommentConfig
-        {
-            let config: LanguageConfig = ::toml::from_str(
-                r#"
-                name = "Foo"
-                block_comment = ["a", "b"]
-                "#,
-            )
-            .unwrap();
-            assert_matches!(config.block_comment, Some(BlockCommentConfig { .. }));
-
-            let config = config.block_comment.unwrap();
-            assert_eq!(config.start.as_ref(), "a");
-            assert_eq!(config.end.as_ref(), "b");
-            assert_eq!(config.prefix.as_ref(), "");
-            assert_eq!(config.tab_size, 0);
-        }
-    }
-}
diff --git a/crates/language/src/language_registry.rs b/crates/language/src/language_registry.rs
deleted file mode 100644
index 6d91f5233e..0000000000
--- a/crates/language/src/language_registry.rs
+++ /dev/null
@@ -1,1290 +0,0 @@
-use crate::{
-    CachedLspAdapter, File, Language, LanguageConfig, LanguageId, LanguageMatcher,
-    LanguageServerName, LspAdapter, ManifestName, PLAIN_TEXT, ToolchainLister,
-    language_settings::all_language_settings, task_context::ContextProvider, with_parser,
-};
-use anyhow::{Context as _, Result, anyhow};
-use collections::{FxHashMap, HashMap, HashSet, hash_map};
-use settings::{AllLanguageSettingsContent, LanguageSettingsContent};
-
-use futures::{
-    Future,
-    channel::{mpsc, oneshot},
-};
-use globset::GlobSet;
-use gpui::{App, BackgroundExecutor, SharedString};
-use lsp::LanguageServerId;
-use parking_lot::{Mutex, RwLock};
-use postage::watch;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use smallvec::SmallVec;
-use std::{
-    borrow::{Borrow, Cow},
-    cell::LazyCell,
-    ffi::OsStr,
-    ops::Not,
-    path::{Path, PathBuf},
-    sync::Arc,
-};
-use sum_tree::Bias;
-use text::{Point, Rope};
-use theme::Theme;
-use unicase::UniCase;
-use util::{ResultExt, maybe, post_inc};
-
-#[derive(
-    Debug, Clone, Hash, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize, JsonSchema,
-)]
-pub struct LanguageName(pub SharedString);
-
-impl LanguageName {
-    pub fn new(s: &str) -> Self {
-        Self(SharedString::new(s))
-    }
-
-    pub fn new_static(s: &'static str) -> Self {
-        Self(SharedString::new_static(s))
-    }
-
-    pub fn from_proto(s: String) -> Self {
-        Self(SharedString::from(s))
-    }
-
-    pub fn to_proto(&self) -> String {
-        self.0.to_string()
-    }
-
-    pub fn lsp_id(&self) -> String {
-        match self.0.as_ref() {
-            "Plain Text" => "plaintext".to_string(),
-            language_name => language_name.to_lowercase(),
-        }
-    }
-}
-
-impl From<LanguageName> for SharedString {
-    fn from(value: LanguageName) -> Self {
-        value.0
-    }
-}
-
-impl From<SharedString> for LanguageName {
-    fn from(value: SharedString) -> Self {
-        LanguageName(value)
-    }
-}
-
-impl AsRef<str> for LanguageName {
-    fn as_ref(&self) -> &str {
-        self.0.as_ref()
-    }
-}
-
-impl Borrow<str> for LanguageName {
-    fn borrow(&self) -> &str {
-        self.0.as_ref()
-    }
-}
-
-impl std::fmt::Display for LanguageName {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
-impl From<&'static str> for LanguageName {
-    fn from(str: &'static str) -> Self {
-        Self(SharedString::new_static(str))
-    }
-}
-
-impl From<LanguageName> for String {
-    fn from(value: LanguageName) -> Self {
-        let value: &str = &value.0;
-        Self::from(value)
-    }
-}
-
-pub struct LanguageRegistry {
-    state: RwLock<LanguageRegistryState>,
-    language_server_download_dir: Option<Arc<Path>>,
-    executor: BackgroundExecutor,
-    lsp_binary_status_tx: ServerStatusSender,
-}
-
-struct LanguageRegistryState {
-    next_language_server_id: usize,
-    languages: Vec<Arc<Language>>,
-    language_settings: AllLanguageSettingsContent,
-    available_languages: Vec<AvailableLanguage>,
-    grammars: HashMap<Arc<str>, AvailableGrammar>,
-    lsp_adapters: HashMap<LanguageName, Vec<Arc<CachedLspAdapter>>>,
-    all_lsp_adapters: HashMap<LanguageServerName, Arc<CachedLspAdapter>>,
-    available_lsp_adapters:
-        HashMap<LanguageServerName, Arc<dyn Fn() -> Arc<CachedLspAdapter> + 'static + Send + Sync>>,
-    loading_languages: HashMap<LanguageId, Vec<oneshot::Sender<Result<Arc<Language>>>>>,
-    subscription: (watch::Sender<()>, watch::Receiver<()>),
-    theme: Option<Arc<Theme>>,
-    version: usize,
-    reload_count: usize,
-
-    #[cfg(any(test, feature = "test-support"))]
-    fake_server_entries: HashMap<LanguageServerName, FakeLanguageServerEntry>,
-}
-
-#[cfg(any(test, feature = "test-support"))]
-pub struct FakeLanguageServerEntry {
-    pub capabilities: lsp::ServerCapabilities,
-    pub initializer: Option<Box<dyn 'static + Send + Sync + Fn(&mut lsp::FakeLanguageServer)>>,
-    pub tx: futures::channel::mpsc::UnboundedSender<lsp::FakeLanguageServer>,
-    pub _server: Option<lsp::FakeLanguageServer>,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum LanguageServerStatusUpdate {
-    Binary(BinaryStatus),
-    Health(ServerHealth, Option<SharedString>),
-}
-
-#[derive(Debug, PartialEq, Eq, Deserialize, Serialize, Clone, Copy)]
-#[serde(rename_all = "camelCase")]
-pub enum ServerHealth {
-    Ok,
-    Warning,
-    Error,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum BinaryStatus {
-    None,
-    CheckingForUpdate,
-    Downloading,
-    Starting,
-    Stopping,
-    Stopped,
-    Failed { error: String },
-}
-
-#[derive(Clone)]
-pub struct AvailableLanguage {
-    id: LanguageId,
-    name: LanguageName,
-    grammar: Option<Arc<str>>,
-    matcher: LanguageMatcher,
-    hidden: bool,
-    load: Arc<dyn Fn() -> Result<LoadedLanguage> + 'static + Send + Sync>,
-    loaded: bool,
-    manifest_name: Option<ManifestName>,
-}
-
-impl AvailableLanguage {
-    pub fn name(&self) -> LanguageName {
-        self.name.clone()
-    }
-
-    pub fn matcher(&self) -> &LanguageMatcher {
-        &self.matcher
-    }
-
-    pub fn hidden(&self) -> bool {
-        self.hidden
-    }
-}
-
-#[derive(Copy, Clone, Default)]
-enum LanguageMatchPrecedence {
-    #[default]
-    Undetermined,
-    PathOrContent(usize),
-    UserConfigured(usize),
-}
-
-enum AvailableGrammar {
-    Native(tree_sitter::Language),
-    Loaded(#[allow(unused)] PathBuf, tree_sitter::Language),
-    Loading(
-        #[allow(unused)] PathBuf,
-        Vec<oneshot::Sender<Result<tree_sitter::Language, Arc<anyhow::Error>>>>,
-    ),
-    Unloaded(PathBuf),
-    LoadFailed(Arc<anyhow::Error>),
-}
-
-#[derive(Debug)]
-pub struct LanguageNotFound;
-
-impl std::fmt::Display for LanguageNotFound {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "language not found")
-    }
-}
-
-pub const QUERY_FILENAME_PREFIXES: &[(
-    &str,
-    fn(&mut LanguageQueries) -> &mut Option<Cow<'static, str>>,
-)] = &[
-    ("highlights", |q| &mut q.highlights),
-    ("brackets", |q| &mut q.brackets),
-    ("outline", |q| &mut q.outline),
-    ("indents", |q| &mut q.indents),
-    ("embedding", |q| &mut q.embedding),
-    ("injections", |q| &mut q.injections),
-    ("overrides", |q| &mut q.overrides),
-    ("redactions", |q| &mut q.redactions),
-    ("runnables", |q| &mut q.runnables),
-    ("debugger", |q| &mut q.debugger),
-    ("textobjects", |q| &mut q.text_objects),
-    ("imports", |q| &mut q.imports),
-];
-
-/// Tree-sitter language queries for a given language.
-#[derive(Debug, Default)]
-pub struct LanguageQueries {
-    pub highlights: Option<Cow<'static, str>>,
-    pub brackets: Option<Cow<'static, str>>,
-    pub indents: Option<Cow<'static, str>>,
-    pub outline: Option<Cow<'static, str>>,
-    pub embedding: Option<Cow<'static, str>>,
-    pub injections: Option<Cow<'static, str>>,
-    pub overrides: Option<Cow<'static, str>>,
-    pub redactions: Option<Cow<'static, str>>,
-    pub runnables: Option<Cow<'static, str>>,
-    pub text_objects: Option<Cow<'static, str>>,
-    pub debugger: Option<Cow<'static, str>>,
-    pub imports: Option<Cow<'static, str>>,
-}
-
-#[derive(Clone, Default)]
-struct ServerStatusSender {
-    txs: Arc<Mutex<Vec<mpsc::UnboundedSender<(LanguageServerName, BinaryStatus)>>>>,
-}
-
-pub struct LoadedLanguage {
-    pub config: LanguageConfig,
-    pub queries: LanguageQueries,
-    pub context_provider: Option<Arc<dyn ContextProvider>>,
-    pub toolchain_provider: Option<Arc<dyn ToolchainLister>>,
-    pub manifest_name: Option<ManifestName>,
-}
-
-impl LanguageRegistry {
-    pub fn new(executor: BackgroundExecutor) -> Self {
-        let this = Self {
-            state: RwLock::new(LanguageRegistryState {
-                next_language_server_id: 0,
-                languages: Vec::new(),
-                available_languages: Vec::new(),
-                grammars: Default::default(),
-                language_settings: Default::default(),
-                loading_languages: Default::default(),
-                lsp_adapters: Default::default(),
-                all_lsp_adapters: Default::default(),
-                available_lsp_adapters: HashMap::default(),
-                subscription: watch::channel(),
-                theme: Default::default(),
-                version: 0,
-                reload_count: 0,
-
-                #[cfg(any(test, feature = "test-support"))]
-                fake_server_entries: Default::default(),
-            }),
-            language_server_download_dir: None,
-            lsp_binary_status_tx: Default::default(),
-            executor,
-        };
-        this.add(PLAIN_TEXT.clone());
-        this
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn test(executor: BackgroundExecutor) -> Self {
-        let mut this = Self::new(executor);
-        this.language_server_download_dir = Some(Path::new("/the-download-dir").into());
-        this
-    }
-
-    /// Clears out all of the loaded languages and reload them from scratch.
-    pub fn reload(&self) {
-        self.state.write().reload();
-    }
-
-    /// Reorders the list of language servers for the given language.
-    ///
-    /// Uses the provided list of ordered [`CachedLspAdapters`] as the desired order.
-    ///
-    /// Any existing language servers not present in `ordered_lsp_adapters` will be
-    /// appended to the end.
-    pub fn reorder_language_servers(
-        &self,
-        language: &LanguageName,
-        ordered_lsp_adapters: Vec<Arc<CachedLspAdapter>>,
-    ) {
-        self.state
-            .write()
-            .reorder_language_servers(language, ordered_lsp_adapters);
-    }
-
-    /// Removes the specified languages and grammars from the registry.
-    pub fn remove_languages(
-        &self,
-        languages_to_remove: &[LanguageName],
-        grammars_to_remove: &[Arc<str>],
-    ) {
-        self.state
-            .write()
-            .remove_languages(languages_to_remove, grammars_to_remove)
-    }
-
-    pub fn remove_lsp_adapter(&self, language_name: &LanguageName, name: &LanguageServerName) {
-        let mut state = self.state.write();
-        if let Some(adapters) = state.lsp_adapters.get_mut(language_name) {
-            adapters.retain(|adapter| &adapter.name != name)
-        }
-        state.all_lsp_adapters.remove(name);
-        state.available_lsp_adapters.remove(name);
-
-        state.version += 1;
-        state.reload_count += 1;
-        *state.subscription.0.borrow_mut() = ();
-    }
-
-    #[cfg(any(feature = "test-support", test))]
-    pub fn register_test_language(&self, config: LanguageConfig) {
-        self.register_language(
-            config.name.clone(),
-            config.grammar.clone(),
-            config.matcher.clone(),
-            config.hidden,
-            None,
-            Arc::new(move || {
-                Ok(LoadedLanguage {
-                    config: config.clone(),
-                    queries: Default::default(),
-                    toolchain_provider: None,
-                    context_provider: None,
-                    manifest_name: None,
-                })
-            }),
-        )
-    }
-
-    /// Registers an available language server adapter.
-    ///
-    /// The language server is registered under the language server name, but
-    /// not bound to a particular language.
-    ///
-    /// When a language wants to load this particular language server, it will
-    /// invoke the `load` function.
-    pub fn register_available_lsp_adapter(
-        &self,
-        name: LanguageServerName,
-        adapter: Arc<dyn LspAdapter>,
-    ) {
-        let mut state = self.state.write();
-
-        if adapter.is_extension()
-            && let Some(existing_adapter) = state.all_lsp_adapters.get(&name)
-            && !existing_adapter.adapter.is_extension()
-        {
-            log::warn!(
-                "not registering extension-provided language server {name:?}, since a builtin language server exists with that name",
-            );
-            return;
-        }
-
-        state.available_lsp_adapters.insert(
-            name,
-            Arc::new(move || CachedLspAdapter::new(adapter.clone())),
-        );
-    }
-
-    /// Loads the language server adapter for the language server with the given name.
-    pub fn load_available_lsp_adapter(
-        &self,
-        name: &LanguageServerName,
-    ) -> Option<Arc<CachedLspAdapter>> {
-        let state = self.state.read();
-        let load_lsp_adapter = state.available_lsp_adapters.get(name)?;
-
-        Some(load_lsp_adapter())
-    }
-
-    pub fn register_lsp_adapter(&self, language_name: LanguageName, adapter: Arc<dyn LspAdapter>) {
-        let mut state = self.state.write();
-
-        if adapter.is_extension()
-            && let Some(existing_adapter) = state.all_lsp_adapters.get(&adapter.name())
-            && !existing_adapter.adapter.is_extension()
-        {
-            log::warn!(
-                "not registering extension-provided language server {:?} for language {language_name:?}, since a builtin language server exists with that name",
-                adapter.name(),
-            );
-            return;
-        }
-
-        let cached = CachedLspAdapter::new(adapter);
-        state
-            .lsp_adapters
-            .entry(language_name)
-            .or_default()
-            .push(cached.clone());
-        state
-            .all_lsp_adapters
-            .insert(cached.name.clone(), cached.clone());
-    }
-
-    /// Register a fake language server and adapter
-    /// The returned channel receives a new instance of the language server every time it is started
-    #[cfg(any(feature = "test-support", test))]
-    pub fn register_fake_lsp(
-        &self,
-        language_name: impl Into<LanguageName>,
-        mut adapter: crate::FakeLspAdapter,
-    ) -> futures::channel::mpsc::UnboundedReceiver<lsp::FakeLanguageServer> {
-        let adapter_name = LanguageServerName(adapter.name.into());
-        let capabilities = adapter.capabilities.clone();
-        let initializer = adapter.initializer.take();
-        self.register_fake_lsp_adapter(language_name, adapter);
-        self.register_fake_lsp_server(adapter_name, capabilities, initializer)
-    }
-
-    /// Register a fake lsp adapter (without the language server)
-    #[cfg(any(feature = "test-support", test))]
-    pub fn register_fake_lsp_adapter(
-        &self,
-        language_name: impl Into<LanguageName>,
-        adapter: crate::FakeLspAdapter,
-    ) {
-        let language_name = language_name.into();
-        let mut state = self.state.write();
-        let cached_adapter = CachedLspAdapter::new(Arc::new(adapter));
-        state
-            .lsp_adapters
-            .entry(language_name)
-            .or_default()
-            .push(cached_adapter.clone());
-        state
-            .all_lsp_adapters
-            .insert(cached_adapter.name(), cached_adapter);
-    }
-
-    /// Register a fake language server (without the adapter)
-    /// The returned channel receives a new instance of the language server every time it is started
-    #[cfg(any(feature = "test-support", test))]
-    pub fn register_fake_lsp_server(
-        &self,
-        lsp_name: LanguageServerName,
-        capabilities: lsp::ServerCapabilities,
-        initializer: Option<Box<dyn Fn(&mut lsp::FakeLanguageServer) + Send + Sync>>,
-    ) -> futures::channel::mpsc::UnboundedReceiver<lsp::FakeLanguageServer> {
-        let (servers_tx, servers_rx) = futures::channel::mpsc::unbounded();
-        self.state.write().fake_server_entries.insert(
-            lsp_name,
-            FakeLanguageServerEntry {
-                tx: servers_tx,
-                capabilities,
-                initializer,
-                _server: None,
-            },
-        );
-        servers_rx
-    }
-
-    /// Adds a language to the registry, which can be loaded if needed.
-    pub fn register_language(
-        &self,
-        name: LanguageName,
-        grammar_name: Option<Arc<str>>,
-        matcher: LanguageMatcher,
-        hidden: bool,
-        manifest_name: Option<ManifestName>,
-        load: Arc<dyn Fn() -> Result<LoadedLanguage> + 'static + Send + Sync>,
-    ) {
-        let state = &mut *self.state.write();
-
-        for existing_language in &mut state.available_languages {
-            if existing_language.name == name {
-                existing_language.grammar = grammar_name;
-                existing_language.matcher = matcher;
-                existing_language.load = load;
-                existing_language.manifest_name = manifest_name;
-                return;
-            }
-        }
-
-        state.available_languages.push(AvailableLanguage {
-            id: LanguageId::new(),
-            name,
-            grammar: grammar_name,
-            matcher,
-            load,
-            hidden,
-            loaded: false,
-            manifest_name,
-        });
-        state.version += 1;
-        state.reload_count += 1;
-        *state.subscription.0.borrow_mut() = ();
-    }
-
-    /// Adds grammars to the registry. Language configurations reference a grammar by name. The
-    /// grammar controls how the source code is parsed.
-    pub fn register_native_grammars(
-        &self,
-        grammars: impl IntoIterator<Item = (impl Into<Arc<str>>, impl Into<tree_sitter::Language>)>,
-    ) {
-        self.state.write().grammars.extend(
-            grammars
-                .into_iter()
-                .map(|(name, grammar)| (name.into(), AvailableGrammar::Native(grammar.into()))),
-        );
-    }
-
-    /// Adds paths to WASM grammar files, which can be loaded if needed.
-    pub fn register_wasm_grammars(
-        &self,
-        grammars: impl IntoIterator<Item = (impl Into<Arc<str>>, PathBuf)>,
-    ) {
-        let mut state = self.state.write();
-        state.grammars.extend(
-            grammars
-                .into_iter()
-                .map(|(name, path)| (name.into(), AvailableGrammar::Unloaded(path))),
-        );
-        state.version += 1;
-        state.reload_count += 1;
-        *state.subscription.0.borrow_mut() = ();
-    }
-
-    pub fn language_settings(&self) -> AllLanguageSettingsContent {
-        self.state.read().language_settings.clone()
-    }
-
-    pub fn language_names(&self) -> Vec<LanguageName> {
-        let state = self.state.read();
-        let mut result = state
-            .available_languages
-            .iter()
-            .filter_map(|l| l.loaded.not().then_some(l.name.clone()))
-            .chain(state.languages.iter().map(|l| l.config.name.clone()))
-            .collect::<Vec<_>>();
-        result.sort_unstable_by_key(|language_name| language_name.as_ref().to_lowercase());
-        result
-    }
-
-    pub fn grammar_names(&self) -> Vec<Arc<str>> {
-        let state = self.state.read();
-        let mut result = state.grammars.keys().cloned().collect::<Vec<_>>();
-        result.sort_unstable_by_key(|grammar_name| grammar_name.to_lowercase());
-        result
-    }
-
-    /// Add a pre-loaded language to the registry.
-    pub fn add(&self, language: Arc<Language>) {
-        let mut state = self.state.write();
-        state.available_languages.push(AvailableLanguage {
-            id: language.id,
-            name: language.name(),
-            grammar: language.config.grammar.clone(),
-            matcher: language.config.matcher.clone(),
-            hidden: language.config.hidden,
-            manifest_name: None,
-            load: Arc::new(|| Err(anyhow!("already loaded"))),
-            loaded: true,
-        });
-        state.add(language);
-    }
-
-    pub fn subscribe(&self) -> watch::Receiver<()> {
-        self.state.read().subscription.1.clone()
-    }
-
-    /// Returns the number of times that the registry has been changed,
-    /// by adding languages or reloading.
-    pub fn version(&self) -> usize {
-        self.state.read().version
-    }
-
-    /// Returns the number of times that the registry has been reloaded.
-    pub fn reload_count(&self) -> usize {
-        self.state.read().reload_count
-    }
-
-    pub fn set_theme(&self, theme: Arc<Theme>) {
-        let mut state = self.state.write();
-        state.theme = Some(theme.clone());
-        for language in &state.languages {
-            language.set_theme(theme.syntax());
-        }
-    }
-
-    pub fn set_language_server_download_dir(&mut self, path: impl Into<Arc<Path>>) {
-        self.language_server_download_dir = Some(path.into());
-    }
-
-    pub fn language_for_name(
-        self: &Arc<Self>,
-        name: &str,
-    ) -> impl Future<Output = Result<Arc<Language>>> + use<> {
-        let name = UniCase::new(name);
-        let rx = self.get_or_load_language(|language_name, _, current_best_match| {
-            match current_best_match {
-                LanguageMatchPrecedence::Undetermined if UniCase::new(&language_name.0) == name => {
-                    Some(LanguageMatchPrecedence::PathOrContent(name.len()))
-                }
-                LanguageMatchPrecedence::Undetermined
-                | LanguageMatchPrecedence::UserConfigured(_)
-                | LanguageMatchPrecedence::PathOrContent(_) => None,
-            }
-        });
-        async move { rx.await? }
-    }
-
-    pub async fn language_for_id(self: &Arc<Self>, id: LanguageId) -> Result<Arc<Language>> {
-        let available_language = {
-            let state = self.state.read();
-
-            let Some(available_language) = state
-                .available_languages
-                .iter()
-                .find(|lang| lang.id == id)
-                .cloned()
-            else {
-                anyhow::bail!(LanguageNotFound);
-            };
-            available_language
-        };
-
-        self.load_language(&available_language).await?
-    }
-
-    pub fn language_name_for_extension(self: &Arc<Self>, extension: &str) -> Option<LanguageName> {
-        self.state.try_read().and_then(|state| {
-            state
-                .available_languages
-                .iter()
-                .find(|language| {
-                    language
-                        .matcher()
-                        .path_suffixes
-                        .iter()
-                        .any(|suffix| *suffix == extension)
-                })
-                .map(|language| language.name.clone())
-        })
-    }
-
-    pub fn language_for_name_or_extension(
-        self: &Arc<Self>,
-        string: &str,
-    ) -> impl Future<Output = Result<Arc<Language>>> {
-        let string = UniCase::new(string);
-        let rx = self.get_or_load_language(|name, config, current_best_match| {
-            let name_matches = || {
-                UniCase::new(&name.0) == string
-                    || config
-                        .path_suffixes
-                        .iter()
-                        .any(|suffix| UniCase::new(suffix) == string)
-            };
-
-            match current_best_match {
-                LanguageMatchPrecedence::Undetermined => {
-                    name_matches().then_some(LanguageMatchPrecedence::PathOrContent(string.len()))
-                }
-                LanguageMatchPrecedence::PathOrContent(len) => (string.len() > len
-                    && name_matches())
-                .then_some(LanguageMatchPrecedence::PathOrContent(string.len())),
-                LanguageMatchPrecedence::UserConfigured(_) => None,
-            }
-        });
-        async move { rx.await? }
-    }
-
-    pub fn available_language_for_name(self: &Arc<Self>, name: &str) -> Option<AvailableLanguage> {
-        let state = self.state.read();
-        state
-            .available_languages
-            .iter()
-            .find(|l| l.name.0.as_ref() == name)
-            .cloned()
-    }
-
-    pub fn language_for_file(
-        self: &Arc<Self>,
-        file: &Arc<dyn File>,
-        content: Option<&Rope>,
-        cx: &App,
-    ) -> Option<AvailableLanguage> {
-        let user_file_types = all_language_settings(Some(file), cx);
-
-        self.language_for_file_internal(
-            &file.full_path(cx),
-            content,
-            Some(&user_file_types.file_types),
-        )
-    }
-
-    pub fn language_for_file_path(self: &Arc<Self>, path: &Path) -> Option<AvailableLanguage> {
-        self.language_for_file_internal(path, None, None)
-    }
-
-    pub fn load_language_for_file_path<'a>(
-        self: &Arc<Self>,
-        path: &'a Path,
-    ) -> impl Future<Output = Result<Arc<Language>>> + 'a {
-        let language = self.language_for_file_path(path);
-
-        let this = self.clone();
-        async move {
-            if let Some(language) = language {
-                this.load_language(&language).await?
-            } else {
-                Err(anyhow!(LanguageNotFound))
-            }
-        }
-    }
-
-    fn language_for_file_internal(
-        self: &Arc<Self>,
-        path: &Path,
-        content: Option<&Rope>,
-        user_file_types: Option<&FxHashMap<Arc<str>, (GlobSet, Vec<String>)>>,
-    ) -> Option<AvailableLanguage> {
-        let filename = path.file_name().and_then(|filename| filename.to_str());
-        // `Path.extension()` returns None for files with a leading '.'
-        // and no other extension which is not the desired behavior here,
-        // as we want `.zshrc` to result in extension being `Some("zshrc")`
-        let extension = filename.and_then(|filename| filename.split('.').next_back());
-        let path_suffixes = [extension, filename, path.to_str()]
-            .iter()
-            .filter_map(|suffix| suffix.map(|suffix| (suffix, globset::Candidate::new(suffix))))
-            .collect::<SmallVec<[_; 3]>>();
-        let content = LazyCell::new(|| {
-            content.map(|content| {
-                let end = content.clip_point(Point::new(0, 256), Bias::Left);
-                let end = content.point_to_offset(end);
-                content.chunks_in_range(0..end).collect::<String>()
-            })
-        });
-        self.find_matching_language(move |language_name, config, current_best_match| {
-            let path_matches_default_suffix = || {
-                let len =
-                    config
-                        .path_suffixes
-                        .iter()
-                        .fold(0, |acc: usize, path_suffix: &String| {
-                            let ext = ".".to_string() + path_suffix;
-
-                            let matched_suffix_len = path_suffixes
-                                .iter()
-                                .find(|(suffix, _)| suffix.ends_with(&ext) || suffix == path_suffix)
-                                .map(|(suffix, _)| suffix.len());
-
-                            match matched_suffix_len {
-                                Some(len) => acc.max(len),
-                                None => acc,
-                            }
-                        });
-                (len > 0).then_some(len)
-            };
-
-            let path_matches_custom_suffix = || {
-                user_file_types
-                    .and_then(|types| types.get(language_name.as_ref()))
-                    .map_or(None, |(custom_suffixes, _)| {
-                        path_suffixes
-                            .iter()
-                            .find(|(_, candidate)| custom_suffixes.is_match_candidate(candidate))
-                            .map(|(suffix, _)| suffix.len())
-                    })
-            };
-
-            let content_matches = || {
-                config.first_line_pattern.as_ref().is_some_and(|pattern| {
-                    content
-                        .as_ref()
-                        .is_some_and(|content| pattern.is_match(content))
-                })
-            };
-
-            // Only return a match for the given file if we have a better match than
-            // the current one.
-            match current_best_match {
-                LanguageMatchPrecedence::PathOrContent(current_len) => {
-                    if let Some(len) = path_matches_custom_suffix() {
-                        // >= because user config should win tie with system ext len
-                        (len >= current_len).then_some(LanguageMatchPrecedence::UserConfigured(len))
-                    } else if let Some(len) = path_matches_default_suffix() {
-                        // >= because user config should win tie with system ext len
-                        (len >= current_len).then_some(LanguageMatchPrecedence::PathOrContent(len))
-                    } else {
-                        None
-                    }
-                }
-                LanguageMatchPrecedence::Undetermined => {
-                    if let Some(len) = path_matches_custom_suffix() {
-                        Some(LanguageMatchPrecedence::UserConfigured(len))
-                    } else if let Some(len) = path_matches_default_suffix() {
-                        Some(LanguageMatchPrecedence::PathOrContent(len))
-                    } else if content_matches() {
-                        Some(LanguageMatchPrecedence::PathOrContent(1))
-                    } else {
-                        None
-                    }
-                }
-                LanguageMatchPrecedence::UserConfigured(_) => None,
-            }
-        })
-    }
-
-    fn find_matching_language(
-        self: &Arc<Self>,
-        callback: impl Fn(
-            &LanguageName,
-            &LanguageMatcher,
-            LanguageMatchPrecedence,
-        ) -> Option<LanguageMatchPrecedence>,
-    ) -> Option<AvailableLanguage> {
-        let state = self.state.read();
-        let available_language = state
-            .available_languages
-            .iter()
-            .rev()
-            .fold(None, |best_language_match, language| {
-                let current_match_type = best_language_match
-                    .as_ref()
-                    .map_or(LanguageMatchPrecedence::default(), |(_, score)| *score);
-                let language_score =
-                    callback(&language.name, &language.matcher, current_match_type);
-
-                match (language_score, current_match_type) {
-                    // no current best, so our candidate is better
-                    (
-                        Some(
-                            LanguageMatchPrecedence::PathOrContent(_)
-                            | LanguageMatchPrecedence::UserConfigured(_),
-                        ),
-                        LanguageMatchPrecedence::Undetermined,
-                    ) => language_score.map(|new_score| (language.clone(), new_score)),
-
-                    // our candidate is better only if the name is longer
-                    (
-                        Some(LanguageMatchPrecedence::PathOrContent(new_len)),
-                        LanguageMatchPrecedence::PathOrContent(current_len),
-                    )
-                    | (
-                        Some(LanguageMatchPrecedence::UserConfigured(new_len)),
-                        LanguageMatchPrecedence::UserConfigured(current_len),
-                    )
-                    | (
-                        Some(LanguageMatchPrecedence::PathOrContent(new_len)),
-                        LanguageMatchPrecedence::UserConfigured(current_len),
-                    ) => {
-                        if new_len > current_len {
-                            language_score.map(|new_score| (language.clone(), new_score))
-                        } else {
-                            best_language_match
-                        }
-                    }
-
-                    // our candidate is better if the name is longer or equal to
-                    (
-                        Some(LanguageMatchPrecedence::UserConfigured(new_len)),
-                        LanguageMatchPrecedence::PathOrContent(current_len),
-                    ) => {
-                        if new_len >= current_len {
-                            language_score.map(|new_score| (language.clone(), new_score))
-                        } else {
-                            best_language_match
-                        }
-                    }
-
-                    // no candidate, use current best
-                    (None, _) | (Some(LanguageMatchPrecedence::Undetermined), _) => {
-                        best_language_match
-                    }
-                }
-            })
-            .map(|(available_language, _)| available_language);
-        drop(state);
-        available_language
-    }
-
-    pub fn load_language(
-        self: &Arc<Self>,
-        language: &AvailableLanguage,
-    ) -> oneshot::Receiver<Result<Arc<Language>>> {
-        let (tx, rx) = oneshot::channel();
-
-        let mut state = self.state.write();
-
-        // If the language is already loaded, resolve with it immediately.
-        for loaded_language in state.languages.iter() {
-            if loaded_language.id == language.id {
-                tx.send(Ok(loaded_language.clone())).unwrap();
-                return rx;
-            }
-        }
-
-        match state.loading_languages.entry(language.id) {
-            // If the language is already being loaded, then add this
-            // channel to a list that will be sent to when the load completes.
-            hash_map::Entry::Occupied(mut entry) => entry.get_mut().push(tx),
-
-            // Otherwise, start loading the language.
-            hash_map::Entry::Vacant(entry) => {
-                let this = self.clone();
-
-                let id = language.id;
-                let name = language.name.clone();
-                let language_load = language.load.clone();
-
-                self.executor
-                    .spawn(async move {
-                        let language = async {
-                            let loaded_language = (language_load)()?;
-                            if let Some(grammar) = loaded_language.config.grammar.clone() {
-                                let grammar = Some(this.get_or_load_grammar(grammar).await?);
-
-                                Language::new_with_id(id, loaded_language.config, grammar)
-                                    .with_context_provider(loaded_language.context_provider)
-                                    .with_toolchain_lister(loaded_language.toolchain_provider)
-                                    .with_manifest(loaded_language.manifest_name)
-                                    .with_queries(loaded_language.queries)
-                            } else {
-                                Ok(Language::new_with_id(id, loaded_language.config, None)
-                                    .with_context_provider(loaded_language.context_provider)
-                                    .with_manifest(loaded_language.manifest_name)
-                                    .with_toolchain_lister(loaded_language.toolchain_provider))
-                            }
-                        }
-                        .await;
-
-                        match language {
-                            Ok(language) => {
-                                let language = Arc::new(language);
-                                let mut state = this.state.write();
-
-                                state.add(language.clone());
-                                state.mark_language_loaded(id);
-                                if let Some(mut txs) = state.loading_languages.remove(&id) {
-                                    for tx in txs.drain(..) {
-                                        let _ = tx.send(Ok(language.clone()));
-                                    }
-                                }
-                            }
-                            Err(e) => {
-                                log::error!("failed to load language {name}:\n{e:?}");
-                                let mut state = this.state.write();
-                                state.mark_language_loaded(id);
-                                if let Some(mut txs) = state.loading_languages.remove(&id) {
-                                    for tx in txs.drain(..) {
-                                        let _ = tx.send(Err(anyhow!(
-                                            "failed to load language {name}: {e}",
-                                        )));
-                                    }
-                                }
-                            }
-                        };
-                    })
-                    .detach();
-
-                entry.insert(vec![tx]);
-            }
-        }
-
-        drop(state);
-        rx
-    }
-
-    fn get_or_load_language(
-        self: &Arc<Self>,
-        callback: impl Fn(
-            &LanguageName,
-            &LanguageMatcher,
-            LanguageMatchPrecedence,
-        ) -> Option<LanguageMatchPrecedence>,
-    ) -> oneshot::Receiver<Result<Arc<Language>>> {
-        let Some(language) = self.find_matching_language(callback) else {
-            let (tx, rx) = oneshot::channel();
-            let _ = tx.send(Err(anyhow!(LanguageNotFound)));
-            return rx;
-        };
-
-        self.load_language(&language)
-    }
-
-    fn get_or_load_grammar(
-        self: &Arc<Self>,
-        name: Arc<str>,
-    ) -> impl Future<Output = Result<tree_sitter::Language>> {
-        let (tx, rx) = oneshot::channel();
-        let mut state = self.state.write();
-
-        if let Some(grammar) = state.grammars.get_mut(name.as_ref()) {
-            match grammar {
-                AvailableGrammar::LoadFailed(error) => {
-                    tx.send(Err(error.clone())).ok();
-                }
-                AvailableGrammar::Native(grammar) | AvailableGrammar::Loaded(_, grammar) => {
-                    tx.send(Ok(grammar.clone())).ok();
-                }
-                AvailableGrammar::Loading(_, txs) => {
-                    txs.push(tx);
-                }
-                AvailableGrammar::Unloaded(wasm_path) => {
-                    log::trace!("start loading grammar {name:?}");
-                    let this = self.clone();
-                    let wasm_path = wasm_path.clone();
-                    *grammar = AvailableGrammar::Loading(wasm_path.clone(), vec![tx]);
-                    self.executor
-                        .spawn(async move {
-                            let grammar_result = maybe!({
-                                let wasm_bytes = std::fs::read(&wasm_path)?;
-                                let grammar_name = wasm_path
-                                    .file_stem()
-                                    .and_then(OsStr::to_str)
-                                    .context("invalid grammar filename")?;
-                                anyhow::Ok(with_parser(|parser| {
-                                    let mut store = parser.take_wasm_store().unwrap();
-                                    let grammar = store.load_language(grammar_name, &wasm_bytes);
-                                    parser.set_wasm_store(store).unwrap();
-                                    grammar
-                                })?)
-                            })
-                            .map_err(Arc::new);
-
-                            let value = match &grammar_result {
-                                Ok(grammar) => AvailableGrammar::Loaded(wasm_path, grammar.clone()),
-                                Err(error) => AvailableGrammar::LoadFailed(error.clone()),
-                            };
-
-                            log::trace!("finish loading grammar {name:?}");
-                            let old_value = this.state.write().grammars.insert(name, value);
-                            if let Some(AvailableGrammar::Loading(_, txs)) = old_value {
-                                for tx in txs {
-                                    tx.send(grammar_result.clone()).ok();
-                                }
-                            }
-                        })
-                        .detach();
-                }
-            }
-        } else {
-            tx.send(Err(Arc::new(anyhow!("no such grammar {name}"))))
-                .ok();
-        }
-
-        async move { rx.await?.map_err(|e| anyhow!(e)) }
-    }
-
-    pub fn to_vec(&self) -> Vec<Arc<Language>> {
-        self.state.read().languages.to_vec()
-    }
-
-    pub fn lsp_adapters(&self, language_name: &LanguageName) -> Vec<Arc<CachedLspAdapter>> {
-        self.state
-            .read()
-            .lsp_adapters
-            .get(language_name)
-            .cloned()
-            .unwrap_or_default()
-    }
-
-    pub fn all_lsp_adapters(&self) -> Vec<Arc<CachedLspAdapter>> {
-        self.state
-            .read()
-            .all_lsp_adapters
-            .values()
-            .cloned()
-            .collect()
-    }
-
-    pub fn adapter_for_name(&self, name: &LanguageServerName) -> Option<Arc<CachedLspAdapter>> {
-        self.state.read().all_lsp_adapters.get(name).cloned()
-    }
-
-    pub fn update_lsp_binary_status(&self, server_name: LanguageServerName, status: BinaryStatus) {
-        self.lsp_binary_status_tx.send(server_name, status);
-    }
-
-    pub fn next_language_server_id(&self) -> LanguageServerId {
-        self.state.write().next_language_server_id()
-    }
-
-    pub fn language_server_download_dir(&self, name: &LanguageServerName) -> Option<Arc<Path>> {
-        self.language_server_download_dir
-            .as_ref()
-            .map(|dir| Arc::from(dir.join(name.0.as_ref())))
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn create_fake_language_server(
-        &self,
-        server_id: LanguageServerId,
-        name: &LanguageServerName,
-        binary: lsp::LanguageServerBinary,
-        cx: &mut gpui::AsyncApp,
-    ) -> Option<lsp::LanguageServer> {
-        use gpui::AppContext as _;
-
-        let mut state = self.state.write();
-        let fake_entry = state.fake_server_entries.get_mut(name)?;
-        let (server, mut fake_server) = lsp::FakeLanguageServer::new(
-            server_id,
-            binary,
-            name.0.to_string(),
-            fake_entry.capabilities.clone(),
-            cx,
-        );
-        fake_entry._server = Some(fake_server.clone());
-
-        if let Some(initializer) = &fake_entry.initializer {
-            initializer(&mut fake_server);
-        }
-
-        let tx = fake_entry.tx.clone();
-        cx.background_spawn(async move {
-            if fake_server
-                .try_receive_notification::<lsp::notification::Initialized>()
-                .await
-                .is_some()
-            {
-                tx.unbounded_send(fake_server.clone()).ok();
-            }
-        })
-        .detach();
-
-        Some(server)
-    }
-
-    pub fn language_server_binary_statuses(
-        &self,
-    ) -> mpsc::UnboundedReceiver<(LanguageServerName, BinaryStatus)> {
-        self.lsp_binary_status_tx.subscribe()
-    }
-
-    pub async fn delete_server_container(&self, name: LanguageServerName) {
-        log::info!("deleting server container");
-        let Some(dir) = self.language_server_download_dir(&name) else {
-            return;
-        };
-
-        smol::fs::remove_dir_all(dir)
-            .await
-            .context("server container removal")
-            .log_err();
-    }
-}
-
-impl LanguageRegistryState {
-    fn next_language_server_id(&mut self) -> LanguageServerId {
-        LanguageServerId(post_inc(&mut self.next_language_server_id))
-    }
-
-    fn add(&mut self, language: Arc<Language>) {
-        if let Some(theme) = self.theme.as_ref() {
-            language.set_theme(theme.syntax());
-        }
-        self.language_settings.languages.0.insert(
-            language.name().0,
-            LanguageSettingsContent {
-                tab_size: language.config.tab_size,
-                hard_tabs: language.config.hard_tabs,
-                soft_wrap: language.config.soft_wrap,
-                auto_indent_on_paste: language.config.auto_indent_on_paste,
-                ..Default::default()
-            },
-        );
-        self.languages.push(language);
-        self.version += 1;
-        *self.subscription.0.borrow_mut() = ();
-    }
-
-    fn reload(&mut self) {
-        self.languages.clear();
-        self.version += 1;
-        self.reload_count += 1;
-        for language in &mut self.available_languages {
-            language.loaded = false;
-        }
-        *self.subscription.0.borrow_mut() = ();
-    }
-
-    /// Reorders the list of language servers for the given language.
-    ///
-    /// Uses the provided list of ordered [`CachedLspAdapters`] as the desired order.
-    ///
-    /// Any existing language servers not present in `ordered_lsp_adapters` will be
-    /// appended to the end.
-    fn reorder_language_servers(
-        &mut self,
-        language_name: &LanguageName,
-        ordered_lsp_adapters: Vec<Arc<CachedLspAdapter>>,
-    ) {
-        let Some(lsp_adapters) = self.lsp_adapters.get_mut(language_name) else {
-            return;
-        };
-
-        let ordered_lsp_adapter_ids = ordered_lsp_adapters
-            .iter()
-            .map(|lsp_adapter| lsp_adapter.name.clone())
-            .collect::<HashSet<_>>();
-
-        let mut new_lsp_adapters = ordered_lsp_adapters;
-        for adapter in lsp_adapters.iter() {
-            if !ordered_lsp_adapter_ids.contains(&adapter.name) {
-                new_lsp_adapters.push(adapter.clone());
-            }
-        }
-
-        *lsp_adapters = new_lsp_adapters;
-    }
-
-    fn remove_languages(
-        &mut self,
-        languages_to_remove: &[LanguageName],
-        grammars_to_remove: &[Arc<str>],
-    ) {
-        if languages_to_remove.is_empty() && grammars_to_remove.is_empty() {
-            return;
-        }
-
-        self.languages
-            .retain(|language| !languages_to_remove.contains(&language.name()));
-        self.available_languages
-            .retain(|language| !languages_to_remove.contains(&language.name));
-        self.grammars
-            .retain(|name, _| !grammars_to_remove.contains(name));
-        self.version += 1;
-        self.reload_count += 1;
-        *self.subscription.0.borrow_mut() = ();
-    }
-
-    /// Mark the given language as having been loaded, so that the
-    /// language registry won't try to load it again.
-    fn mark_language_loaded(&mut self, id: LanguageId) {
-        for language in &mut self.available_languages {
-            if language.id == id {
-                language.loaded = true;
-                break;
-            }
-        }
-    }
-}
-
-impl ServerStatusSender {
-    fn subscribe(&self) -> mpsc::UnboundedReceiver<(LanguageServerName, BinaryStatus)> {
-        let (tx, rx) = mpsc::unbounded();
-        self.txs.lock().push(tx);
-        rx
-    }
-
-    fn send(&self, name: LanguageServerName, status: BinaryStatus) {
-        let mut txs = self.txs.lock();
-        txs.retain(|tx| tx.unbounded_send((name.clone(), status.clone())).is_ok());
-    }
-}
diff --git a/crates/language/src/language_settings.rs b/crates/language/src/language_settings.rs
deleted file mode 100644
index fccaa545b7..0000000000
--- a/crates/language/src/language_settings.rs
+++ /dev/null
@@ -1,933 +0,0 @@
-//! Provides `language`-related settings.
-
-use crate::{File, Language, LanguageName, LanguageServerName};
-use collections::{FxHashMap, HashMap, HashSet};
-use ec4rs::{
-    Properties as EditorconfigProperties,
-    property::{FinalNewline, IndentSize, IndentStyle, MaxLineLen, TabWidth, TrimTrailingWs},
-};
-use globset::{Glob, GlobMatcher, GlobSet, GlobSetBuilder};
-use gpui::{App, Modifiers, SharedString};
-use itertools::{Either, Itertools};
-
-pub use settings::{
-    CompletionSettingsContent, EditPredictionProvider, EditPredictionsMode, FormatOnSave,
-    Formatter, FormatterList, InlayHintKind, LanguageSettingsContent, LspInsertMode,
-    RewrapBehavior, ShowWhitespaceSetting, SoftWrap, WordsCompletionMode,
-};
-use settings::{RegisterSetting, Settings, SettingsLocation, SettingsStore};
-use shellexpand;
-use std::{borrow::Cow, num::NonZeroU32, path::Path, sync::Arc};
-
-/// Returns the settings for the specified language from the provided file.
-pub fn language_settings<'a>(
-    language: Option<LanguageName>,
-    file: Option<&'a Arc<dyn File>>,
-    cx: &'a App,
-) -> Cow<'a, LanguageSettings> {
-    let location = file.map(|f| SettingsLocation {
-        worktree_id: f.worktree_id(cx),
-        path: f.path().as_ref(),
-    });
-    AllLanguageSettings::get(location, cx).language(location, language.as_ref(), cx)
-}
-
-/// Returns the settings for all languages from the provided file.
-pub fn all_language_settings<'a>(
-    file: Option<&'a Arc<dyn File>>,
-    cx: &'a App,
-) -> &'a AllLanguageSettings {
-    let location = file.map(|f| SettingsLocation {
-        worktree_id: f.worktree_id(cx),
-        path: f.path().as_ref(),
-    });
-    AllLanguageSettings::get(location, cx)
-}
-
-/// The settings for all languages.
-#[derive(Debug, Clone, RegisterSetting)]
-pub struct AllLanguageSettings {
-    /// The edit prediction settings.
-    pub edit_predictions: EditPredictionSettings,
-    pub defaults: LanguageSettings,
-    languages: HashMap<LanguageName, LanguageSettings>,
-    pub file_types: FxHashMap<Arc<str>, (GlobSet, Vec<String>)>,
-}
-
-#[derive(Debug, Clone, PartialEq)]
-pub struct WhitespaceMap {
-    pub space: SharedString,
-    pub tab: SharedString,
-}
-
-/// The settings for a particular language.
-#[derive(Debug, Clone, PartialEq)]
-pub struct LanguageSettings {
-    /// How many columns a tab should occupy.
-    pub tab_size: NonZeroU32,
-    /// Whether to indent lines using tab characters, as opposed to multiple
-    /// spaces.
-    pub hard_tabs: bool,
-    /// How to soft-wrap long lines of text.
-    pub soft_wrap: settings::SoftWrap,
-    /// The column at which to soft-wrap lines, for buffers where soft-wrap
-    /// is enabled.
-    pub preferred_line_length: u32,
-    /// Whether to show wrap guides (vertical rulers) in the editor.
-    /// Setting this to true will show a guide at the 'preferred_line_length' value
-    /// if softwrap is set to 'preferred_line_length', and will show any
-    /// additional guides as specified by the 'wrap_guides' setting.
-    pub show_wrap_guides: bool,
-    /// Character counts at which to show wrap guides (vertical rulers) in the editor.
-    pub wrap_guides: Vec<usize>,
-    /// Indent guide related settings.
-    pub indent_guides: IndentGuideSettings,
-    /// Whether or not to perform a buffer format before saving.
-    pub format_on_save: FormatOnSave,
-    /// Whether or not to remove any trailing whitespace from lines of a buffer
-    /// before saving it.
-    pub remove_trailing_whitespace_on_save: bool,
-    /// Whether or not to ensure there's a single newline at the end of a buffer
-    /// when saving it.
-    pub ensure_final_newline_on_save: bool,
-    /// How to perform a buffer format.
-    pub formatter: settings::FormatterList,
-    /// Zed's Prettier integration settings.
-    pub prettier: PrettierSettings,
-    /// Whether to automatically close JSX tags.
-    pub jsx_tag_auto_close: bool,
-    /// Whether to use language servers to provide code intelligence.
-    pub enable_language_server: bool,
-    /// The list of language servers to use (or disable) for this language.
-    ///
-    /// This array should consist of language server IDs, as well as the following
-    /// special tokens:
-    /// - `"!<language_server_id>"` - A language server ID prefixed with a `!` will be disabled.
-    /// - `"..."` - A placeholder to refer to the **rest** of the registered language servers for this language.
-    pub language_servers: Vec<String>,
-    /// Controls where the `editor::Rewrap` action is allowed for this language.
-    ///
-    /// Note: This setting has no effect in Vim mode, as rewrap is already
-    /// allowed everywhere.
-    pub allow_rewrap: RewrapBehavior,
-    /// Controls whether edit predictions are shown immediately (true)
-    /// or manually by triggering `editor::ShowEditPrediction` (false).
-    pub show_edit_predictions: bool,
-    /// Controls whether edit predictions are shown in the given language
-    /// scopes.
-    pub edit_predictions_disabled_in: Vec<String>,
-    /// Whether to show tabs and spaces in the editor.
-    pub show_whitespaces: settings::ShowWhitespaceSetting,
-    /// Visible characters used to render whitespace when show_whitespaces is enabled.
-    pub whitespace_map: WhitespaceMap,
-    /// Whether to start a new line with a comment when a previous line is a comment as well.
-    pub extend_comment_on_newline: bool,
-    /// Inlay hint related settings.
-    pub inlay_hints: InlayHintSettings,
-    /// Whether to automatically close brackets.
-    pub use_autoclose: bool,
-    /// Whether to automatically surround text with brackets.
-    pub use_auto_surround: bool,
-    /// Whether to use additional LSP queries to format (and amend) the code after
-    /// every "trigger" symbol input, defined by LSP server capabilities.
-    pub use_on_type_format: bool,
-    /// Whether indentation should be adjusted based on the context whilst typing.
-    pub auto_indent: bool,
-    /// Whether indentation of pasted content should be adjusted based on the context.
-    pub auto_indent_on_paste: bool,
-    /// Controls how the editor handles the autoclosed characters.
-    pub always_treat_brackets_as_autoclosed: bool,
-    /// Which code actions to run on save
-    pub code_actions_on_format: HashMap<String, bool>,
-    /// Whether to perform linked edits
-    pub linked_edits: bool,
-    /// Task configuration for this language.
-    pub tasks: LanguageTaskSettings,
-    /// Whether to pop the completions menu while typing in an editor without
-    /// explicitly requesting it.
-    pub show_completions_on_input: bool,
-    /// Whether to display inline and alongside documentation for items in the
-    /// completions menu.
-    pub show_completion_documentation: bool,
-    /// Completion settings for this language.
-    pub completions: CompletionSettings,
-    /// Preferred debuggers for this language.
-    pub debuggers: Vec<String>,
-    /// Whether to enable word diff highlighting in the editor.
-    ///
-    /// When enabled, changed words within modified lines are highlighted
-    /// to show exactly what changed.
-    ///
-    /// Default: `true`
-    pub word_diff_enabled: bool,
-    /// Whether to use tree-sitter bracket queries to detect and colorize the brackets in the editor.
-    pub colorize_brackets: bool,
-}
-
-#[derive(Debug, Clone, PartialEq)]
-pub struct CompletionSettings {
-    /// Controls how words are completed.
-    /// For large documents, not all words may be fetched for completion.
-    ///
-    /// Default: `fallback`
-    pub words: WordsCompletionMode,
-    /// How many characters has to be in the completions query to automatically show the words-based completions.
-    /// Before that value, it's still possible to trigger the words-based completion manually with the corresponding editor command.
-    ///
-    /// Default: 3
-    pub words_min_length: usize,
-    /// Whether to fetch LSP completions or not.
-    ///
-    /// Default: true
-    pub lsp: bool,
-    /// When fetching LSP completions, determines how long to wait for a response of a particular server.
-    /// When set to 0, waits indefinitely.
-    ///
-    /// Default: 0
-    pub lsp_fetch_timeout_ms: u64,
-    /// Controls how LSP completions are inserted.
-    ///
-    /// Default: "replace_suffix"
-    pub lsp_insert_mode: LspInsertMode,
-}
-
-/// The settings for indent guides.
-#[derive(Debug, Clone, PartialEq)]
-pub struct IndentGuideSettings {
-    /// Whether to display indent guides in the editor.
-    ///
-    /// Default: true
-    pub enabled: bool,
-    /// The width of the indent guides in pixels, between 1 and 10.
-    ///
-    /// Default: 1
-    pub line_width: u32,
-    /// The width of the active indent guide in pixels, between 1 and 10.
-    ///
-    /// Default: 1
-    pub active_line_width: u32,
-    /// Determines how indent guides are colored.
-    ///
-    /// Default: Fixed
-    pub coloring: settings::IndentGuideColoring,
-    /// Determines how indent guide backgrounds are colored.
-    ///
-    /// Default: Disabled
-    pub background_coloring: settings::IndentGuideBackgroundColoring,
-}
-
-#[derive(Debug, Clone, PartialEq)]
-pub struct LanguageTaskSettings {
-    /// Extra task variables to set for a particular language.
-    pub variables: HashMap<String, String>,
-    pub enabled: bool,
-    /// Use LSP tasks over Zed language extension ones.
-    /// If no LSP tasks are returned due to error/timeout or regular execution,
-    /// Zed language extension tasks will be used instead.
-    ///
-    /// Other Zed tasks will still be shown:
-    /// * Zed task from either of the task config file
-    /// * Zed task from history (e.g. one-off task was spawned before)
-    pub prefer_lsp: bool,
-}
-
-/// Allows to enable/disable formatting with Prettier
-/// and configure default Prettier, used when no project-level Prettier installation is found.
-/// Prettier formatting is disabled by default.
-#[derive(Debug, Clone, PartialEq)]
-pub struct PrettierSettings {
-    /// Enables or disables formatting with Prettier for a given language.
-    pub allowed: bool,
-
-    /// Forces Prettier integration to use a specific parser name when formatting files with the language.
-    pub parser: Option<String>,
-
-    /// Forces Prettier integration to use specific plugins when formatting files with the language.
-    /// The default Prettier will be installed with these plugins.
-    pub plugins: HashSet<String>,
-
-    /// Default Prettier options, in the format as in package.json section for Prettier.
-    /// If project installs Prettier via its package.json, these options will be ignored.
-    pub options: HashMap<String, serde_json::Value>,
-}
-
-impl LanguageSettings {
-    /// A token representing the rest of the available language servers.
-    const REST_OF_LANGUAGE_SERVERS: &'static str = "...";
-
-    /// Returns the customized list of language servers from the list of
-    /// available language servers.
-    pub fn customized_language_servers(
-        &self,
-        available_language_servers: &[LanguageServerName],
-    ) -> Vec<LanguageServerName> {
-        Self::resolve_language_servers(&self.language_servers, available_language_servers)
-    }
-
-    pub(crate) fn resolve_language_servers(
-        configured_language_servers: &[String],
-        available_language_servers: &[LanguageServerName],
-    ) -> Vec<LanguageServerName> {
-        let (disabled_language_servers, enabled_language_servers): (
-            Vec<LanguageServerName>,
-            Vec<LanguageServerName>,
-        ) = configured_language_servers.iter().partition_map(
-            |language_server| match language_server.strip_prefix('!') {
-                Some(disabled) => Either::Left(LanguageServerName(disabled.to_string().into())),
-                None => Either::Right(LanguageServerName(language_server.clone().into())),
-            },
-        );
-
-        let rest = available_language_servers
-            .iter()
-            .filter(|&available_language_server| {
-                !disabled_language_servers.contains(available_language_server)
-                    && !enabled_language_servers.contains(available_language_server)
-            })
-            .cloned()
-            .collect::<Vec<_>>();
-
-        enabled_language_servers
-            .into_iter()
-            .flat_map(|language_server| {
-                if language_server.0.as_ref() == Self::REST_OF_LANGUAGE_SERVERS {
-                    rest.clone()
-                } else {
-                    vec![language_server]
-                }
-            })
-            .collect::<Vec<_>>()
-    }
-}
-
-// The settings for inlay hints.
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub struct InlayHintSettings {
-    /// Global switch to toggle hints on and off.
-    ///
-    /// Default: false
-    pub enabled: bool,
-    /// Global switch to toggle inline values on and off when debugging.
-    ///
-    /// Default: true
-    pub show_value_hints: bool,
-    /// Whether type hints should be shown.
-    ///
-    /// Default: true
-    pub show_type_hints: bool,
-    /// Whether parameter hints should be shown.
-    ///
-    /// Default: true
-    pub show_parameter_hints: bool,
-    /// Whether other hints should be shown.
-    ///
-    /// Default: true
-    pub show_other_hints: bool,
-    /// Whether to show a background for inlay hints.
-    ///
-    /// If set to `true`, the background will use the `hint.background` color
-    /// from the current theme.
-    ///
-    /// Default: false
-    pub show_background: bool,
-    /// Whether or not to debounce inlay hints updates after buffer edits.
-    ///
-    /// Set to 0 to disable debouncing.
-    ///
-    /// Default: 700
-    pub edit_debounce_ms: u64,
-    /// Whether or not to debounce inlay hints updates after buffer scrolls.
-    ///
-    /// Set to 0 to disable debouncing.
-    ///
-    /// Default: 50
-    pub scroll_debounce_ms: u64,
-    /// Toggles inlay hints (hides or shows) when the user presses the modifiers specified.
-    /// If only a subset of the modifiers specified is pressed, hints are not toggled.
-    /// If no modifiers are specified, this is equivalent to `None`.
-    ///
-    /// Default: None
-    pub toggle_on_modifiers_press: Option<Modifiers>,
-}
-
-impl InlayHintSettings {
-    /// Returns the kinds of inlay hints that are enabled based on the settings.
-    pub fn enabled_inlay_hint_kinds(&self) -> HashSet<Option<InlayHintKind>> {
-        let mut kinds = HashSet::default();
-        if self.show_type_hints {
-            kinds.insert(Some(InlayHintKind::Type));
-        }
-        if self.show_parameter_hints {
-            kinds.insert(Some(InlayHintKind::Parameter));
-        }
-        if self.show_other_hints {
-            kinds.insert(None);
-        }
-        kinds
-    }
-}
-
-/// The settings for edit predictions, such as [GitHub Copilot](https://github.com/features/copilot)
-/// or [Supermaven](https://supermaven.com).
-#[derive(Clone, Debug, Default)]
-pub struct EditPredictionSettings {
-    /// The provider that supplies edit predictions.
-    pub provider: settings::EditPredictionProvider,
-    /// Whether to use the experimental edit prediction context retrieval system.
-    pub use_context: bool,
-    /// A list of globs representing files that edit predictions should be disabled for.
-    /// This list adds to a pre-existing, sensible default set of globs.
-    /// Any additional ones you add are combined with them.
-    pub disabled_globs: Vec<DisabledGlob>,
-    /// Configures how edit predictions are displayed in the buffer.
-    pub mode: settings::EditPredictionsMode,
-    /// Settings specific to GitHub Copilot.
-    pub copilot: CopilotSettings,
-    /// Settings specific to Codestral.
-    pub codestral: CodestralSettings,
-    /// Whether edit predictions are enabled in the assistant panel.
-    /// This setting has no effect if globally disabled.
-    pub enabled_in_text_threads: bool,
-}
-
-impl EditPredictionSettings {
-    /// Returns whether edit predictions are enabled for the given path.
-    pub fn enabled_for_file(&self, file: &Arc<dyn File>, cx: &App) -> bool {
-        !self.disabled_globs.iter().any(|glob| {
-            if glob.is_absolute {
-                file.as_local()
-                    .is_some_and(|local| glob.matcher.is_match(local.abs_path(cx)))
-            } else {
-                glob.matcher.is_match(file.path().as_std_path())
-            }
-        })
-    }
-}
-
-#[derive(Clone, Debug)]
-pub struct DisabledGlob {
-    matcher: GlobMatcher,
-    is_absolute: bool,
-}
-
-#[derive(Clone, Debug, Default)]
-pub struct CopilotSettings {
-    /// HTTP/HTTPS proxy to use for Copilot.
-    pub proxy: Option<String>,
-    /// Disable certificate verification for proxy (not recommended).
-    pub proxy_no_verify: Option<bool>,
-    /// Enterprise URI for Copilot.
-    pub enterprise_uri: Option<String>,
-}
-
-#[derive(Clone, Debug, Default)]
-pub struct CodestralSettings {
-    /// Model to use for completions.
-    pub model: Option<String>,
-    /// Maximum tokens to generate.
-    pub max_tokens: Option<u32>,
-    /// Custom API URL to use for Codestral.
-    pub api_url: Option<String>,
-}
-
-impl AllLanguageSettings {
-    /// Returns the [`LanguageSettings`] for the language with the specified name.
-    pub fn language<'a>(
-        &'a self,
-        location: Option<SettingsLocation<'a>>,
-        language_name: Option<&LanguageName>,
-        cx: &'a App,
-    ) -> Cow<'a, LanguageSettings> {
-        let settings = language_name
-            .and_then(|name| self.languages.get(name))
-            .unwrap_or(&self.defaults);
-
-        let editorconfig_properties = location.and_then(|location| {
-            cx.global::<SettingsStore>()
-                .editorconfig_properties(location.worktree_id, location.path)
-        });
-        if let Some(editorconfig_properties) = editorconfig_properties {
-            let mut settings = settings.clone();
-            merge_with_editorconfig(&mut settings, &editorconfig_properties);
-            Cow::Owned(settings)
-        } else {
-            Cow::Borrowed(settings)
-        }
-    }
-
-    /// Returns whether edit predictions are enabled for the given path.
-    pub fn edit_predictions_enabled_for_file(&self, file: &Arc<dyn File>, cx: &App) -> bool {
-        self.edit_predictions.enabled_for_file(file, cx)
-    }
-
-    /// Returns whether edit predictions are enabled for the given language and path.
-    pub fn show_edit_predictions(&self, language: Option<&Arc<Language>>, cx: &App) -> bool {
-        self.language(None, language.map(|l| l.name()).as_ref(), cx)
-            .show_edit_predictions
-    }
-
-    /// Returns the edit predictions preview mode for the given language and path.
-    pub fn edit_predictions_mode(&self) -> EditPredictionsMode {
-        self.edit_predictions.mode
-    }
-}
-
-fn merge_with_editorconfig(settings: &mut LanguageSettings, cfg: &EditorconfigProperties) {
-    let preferred_line_length = cfg.get::<MaxLineLen>().ok().and_then(|v| match v {
-        MaxLineLen::Value(u) => Some(u as u32),
-        MaxLineLen::Off => None,
-    });
-    let tab_size = cfg.get::<IndentSize>().ok().and_then(|v| match v {
-        IndentSize::Value(u) => NonZeroU32::new(u as u32),
-        IndentSize::UseTabWidth => cfg.get::<TabWidth>().ok().and_then(|w| match w {
-            TabWidth::Value(u) => NonZeroU32::new(u as u32),
-        }),
-    });
-    let hard_tabs = cfg
-        .get::<IndentStyle>()
-        .map(|v| v.eq(&IndentStyle::Tabs))
-        .ok();
-    let ensure_final_newline_on_save = cfg
-        .get::<FinalNewline>()
-        .map(|v| match v {
-            FinalNewline::Value(b) => b,
-        })
-        .ok();
-    let remove_trailing_whitespace_on_save = cfg
-        .get::<TrimTrailingWs>()
-        .map(|v| match v {
-            TrimTrailingWs::Value(b) => b,
-        })
-        .ok();
-    fn merge<T>(target: &mut T, value: Option<T>) {
-        if let Some(value) = value {
-            *target = value;
-        }
-    }
-    merge(&mut settings.preferred_line_length, preferred_line_length);
-    merge(&mut settings.tab_size, tab_size);
-    merge(&mut settings.hard_tabs, hard_tabs);
-    merge(
-        &mut settings.remove_trailing_whitespace_on_save,
-        remove_trailing_whitespace_on_save,
-    );
-    merge(
-        &mut settings.ensure_final_newline_on_save,
-        ensure_final_newline_on_save,
-    );
-}
-
-impl settings::Settings for AllLanguageSettings {
-    fn from_settings(content: &settings::SettingsContent) -> Self {
-        let all_languages = &content.project.all_languages;
-
-        fn load_from_content(settings: LanguageSettingsContent) -> LanguageSettings {
-            let inlay_hints = settings.inlay_hints.unwrap();
-            let completions = settings.completions.unwrap();
-            let prettier = settings.prettier.unwrap();
-            let indent_guides = settings.indent_guides.unwrap();
-            let tasks = settings.tasks.unwrap();
-            let whitespace_map = settings.whitespace_map.unwrap();
-
-            LanguageSettings {
-                tab_size: settings.tab_size.unwrap(),
-                hard_tabs: settings.hard_tabs.unwrap(),
-                soft_wrap: settings.soft_wrap.unwrap(),
-                preferred_line_length: settings.preferred_line_length.unwrap(),
-                show_wrap_guides: settings.show_wrap_guides.unwrap(),
-                wrap_guides: settings.wrap_guides.unwrap(),
-                indent_guides: IndentGuideSettings {
-                    enabled: indent_guides.enabled.unwrap(),
-                    line_width: indent_guides.line_width.unwrap(),
-                    active_line_width: indent_guides.active_line_width.unwrap(),
-                    coloring: indent_guides.coloring.unwrap(),
-                    background_coloring: indent_guides.background_coloring.unwrap(),
-                },
-                format_on_save: settings.format_on_save.unwrap(),
-                remove_trailing_whitespace_on_save: settings
-                    .remove_trailing_whitespace_on_save
-                    .unwrap(),
-                ensure_final_newline_on_save: settings.ensure_final_newline_on_save.unwrap(),
-                formatter: settings.formatter.unwrap(),
-                prettier: PrettierSettings {
-                    allowed: prettier.allowed.unwrap(),
-                    parser: prettier.parser.filter(|parser| !parser.is_empty()),
-                    plugins: prettier.plugins.unwrap_or_default(),
-                    options: prettier.options.unwrap_or_default(),
-                },
-                jsx_tag_auto_close: settings.jsx_tag_auto_close.unwrap().enabled.unwrap(),
-                enable_language_server: settings.enable_language_server.unwrap(),
-                language_servers: settings.language_servers.unwrap(),
-                allow_rewrap: settings.allow_rewrap.unwrap(),
-                show_edit_predictions: settings.show_edit_predictions.unwrap(),
-                edit_predictions_disabled_in: settings.edit_predictions_disabled_in.unwrap(),
-                show_whitespaces: settings.show_whitespaces.unwrap(),
-                whitespace_map: WhitespaceMap {
-                    space: SharedString::new(whitespace_map.space.unwrap().to_string()),
-                    tab: SharedString::new(whitespace_map.tab.unwrap().to_string()),
-                },
-                extend_comment_on_newline: settings.extend_comment_on_newline.unwrap(),
-                inlay_hints: InlayHintSettings {
-                    enabled: inlay_hints.enabled.unwrap(),
-                    show_value_hints: inlay_hints.show_value_hints.unwrap(),
-                    show_type_hints: inlay_hints.show_type_hints.unwrap(),
-                    show_parameter_hints: inlay_hints.show_parameter_hints.unwrap(),
-                    show_other_hints: inlay_hints.show_other_hints.unwrap(),
-                    show_background: inlay_hints.show_background.unwrap(),
-                    edit_debounce_ms: inlay_hints.edit_debounce_ms.unwrap(),
-                    scroll_debounce_ms: inlay_hints.scroll_debounce_ms.unwrap(),
-                    toggle_on_modifiers_press: inlay_hints.toggle_on_modifiers_press,
-                },
-                use_autoclose: settings.use_autoclose.unwrap(),
-                use_auto_surround: settings.use_auto_surround.unwrap(),
-                use_on_type_format: settings.use_on_type_format.unwrap(),
-                auto_indent: settings.auto_indent.unwrap(),
-                auto_indent_on_paste: settings.auto_indent_on_paste.unwrap(),
-                always_treat_brackets_as_autoclosed: settings
-                    .always_treat_brackets_as_autoclosed
-                    .unwrap(),
-                code_actions_on_format: settings.code_actions_on_format.unwrap(),
-                linked_edits: settings.linked_edits.unwrap(),
-                tasks: LanguageTaskSettings {
-                    variables: tasks.variables.unwrap_or_default(),
-                    enabled: tasks.enabled.unwrap(),
-                    prefer_lsp: tasks.prefer_lsp.unwrap(),
-                },
-                show_completions_on_input: settings.show_completions_on_input.unwrap(),
-                show_completion_documentation: settings.show_completion_documentation.unwrap(),
-                colorize_brackets: settings.colorize_brackets.unwrap(),
-                completions: CompletionSettings {
-                    words: completions.words.unwrap(),
-                    words_min_length: completions.words_min_length.unwrap() as usize,
-                    lsp: completions.lsp.unwrap(),
-                    lsp_fetch_timeout_ms: completions.lsp_fetch_timeout_ms.unwrap(),
-                    lsp_insert_mode: completions.lsp_insert_mode.unwrap(),
-                },
-                debuggers: settings.debuggers.unwrap(),
-                word_diff_enabled: settings.word_diff_enabled.unwrap(),
-            }
-        }
-
-        let default_language_settings = load_from_content(all_languages.defaults.clone());
-
-        let mut languages = HashMap::default();
-        for (language_name, settings) in &all_languages.languages.0 {
-            let mut language_settings = all_languages.defaults.clone();
-            settings::merge_from::MergeFrom::merge_from(&mut language_settings, settings);
-            languages.insert(
-                LanguageName(language_name.clone()),
-                load_from_content(language_settings),
-            );
-        }
-
-        let edit_prediction_provider = all_languages
-            .features
-            .as_ref()
-            .and_then(|f| f.edit_prediction_provider);
-        let use_edit_prediction_context = all_languages
-            .features
-            .as_ref()
-            .and_then(|f| f.experimental_edit_prediction_context_retrieval)
-            .unwrap_or_default();
-
-        let edit_predictions = all_languages.edit_predictions.clone().unwrap();
-        let edit_predictions_mode = edit_predictions.mode.unwrap();
-
-        let disabled_globs: HashSet<&String> = edit_predictions
-            .disabled_globs
-            .as_ref()
-            .unwrap()
-            .iter()
-            .collect();
-
-        let copilot = edit_predictions.copilot.unwrap();
-        let copilot_settings = CopilotSettings {
-            proxy: copilot.proxy,
-            proxy_no_verify: copilot.proxy_no_verify,
-            enterprise_uri: copilot.enterprise_uri,
-        };
-
-        let codestral = edit_predictions.codestral.unwrap();
-        let codestral_settings = CodestralSettings {
-            model: codestral.model,
-            max_tokens: codestral.max_tokens,
-            api_url: codestral.api_url,
-        };
-
-        let enabled_in_text_threads = edit_predictions.enabled_in_text_threads.unwrap();
-
-        let mut file_types: FxHashMap<Arc<str>, (GlobSet, Vec<String>)> = FxHashMap::default();
-
-        for (language, patterns) in all_languages.file_types.iter().flatten() {
-            let mut builder = GlobSetBuilder::new();
-
-            for pattern in &patterns.0 {
-                builder.add(Glob::new(pattern).unwrap());
-            }
-
-            file_types.insert(
-                language.clone(),
-                (builder.build().unwrap(), patterns.0.clone()),
-            );
-        }
-
-        Self {
-            edit_predictions: EditPredictionSettings {
-                provider: if let Some(provider) = edit_prediction_provider {
-                    provider
-                } else {
-                    EditPredictionProvider::None
-                },
-                use_context: use_edit_prediction_context,
-                disabled_globs: disabled_globs
-                    .iter()
-                    .filter_map(|g| {
-                        let expanded_g = shellexpand::tilde(g).into_owned();
-                        Some(DisabledGlob {
-                            matcher: globset::Glob::new(&expanded_g).ok()?.compile_matcher(),
-                            is_absolute: Path::new(&expanded_g).is_absolute(),
-                        })
-                    })
-                    .collect(),
-                mode: edit_predictions_mode,
-                copilot: copilot_settings,
-                codestral: codestral_settings,
-                enabled_in_text_threads,
-            },
-            defaults: default_language_settings,
-            languages,
-            file_types,
-        }
-    }
-}
-
-#[derive(Default, Debug, Clone, PartialEq, Eq)]
-pub struct JsxTagAutoCloseSettings {
-    /// Enables or disables auto-closing of JSX tags.
-    pub enabled: bool,
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use gpui::TestAppContext;
-    use util::rel_path::rel_path;
-
-    #[gpui::test]
-    fn test_edit_predictions_enabled_for_file(cx: &mut TestAppContext) {
-        use crate::TestFile;
-        use std::path::PathBuf;
-
-        let cx = cx.app.borrow_mut();
-
-        let build_settings = |globs: &[&str]| -> EditPredictionSettings {
-            EditPredictionSettings {
-                disabled_globs: globs
-                    .iter()
-                    .map(|glob_str| {
-                        #[cfg(windows)]
-                        let glob_str = {
-                            let mut g = String::new();
-
-                            if glob_str.starts_with('/') {
-                                g.push_str("C:");
-                            }
-
-                            g.push_str(&glob_str.replace('/', "\\"));
-                            g
-                        };
-                        #[cfg(windows)]
-                        let glob_str = glob_str.as_str();
-                        let expanded_glob_str = shellexpand::tilde(glob_str).into_owned();
-                        DisabledGlob {
-                            matcher: globset::Glob::new(&expanded_glob_str)
-                                .unwrap()
-                                .compile_matcher(),
-                            is_absolute: Path::new(&expanded_glob_str).is_absolute(),
-                        }
-                    })
-                    .collect(),
-                ..Default::default()
-            }
-        };
-
-        const WORKTREE_NAME: &str = "project";
-        let make_test_file = |segments: &[&str]| -> Arc<dyn File> {
-            let path = segments.join("/");
-            let path = rel_path(&path);
-
-            Arc::new(TestFile {
-                path: path.into(),
-                root_name: WORKTREE_NAME.to_string(),
-                local_root: Some(PathBuf::from(if cfg!(windows) {
-                    "C:\\absolute\\"
-                } else {
-                    "/absolute/"
-                })),
-            })
-        };
-
-        let test_file = make_test_file(&["src", "test", "file.rs"]);
-
-        // Test relative globs
-        let settings = build_settings(&["*.rs"]);
-        assert!(!settings.enabled_for_file(&test_file, &cx));
-        let settings = build_settings(&["*.txt"]);
-        assert!(settings.enabled_for_file(&test_file, &cx));
-
-        // Test absolute globs
-        let settings = build_settings(&["/absolute/**/*.rs"]);
-        assert!(!settings.enabled_for_file(&test_file, &cx));
-        let settings = build_settings(&["/other/**/*.rs"]);
-        assert!(settings.enabled_for_file(&test_file, &cx));
-
-        // Test exact path match relative
-        let settings = build_settings(&["src/test/file.rs"]);
-        assert!(!settings.enabled_for_file(&test_file, &cx));
-        let settings = build_settings(&["src/test/otherfile.rs"]);
-        assert!(settings.enabled_for_file(&test_file, &cx));
-
-        // Test exact path match absolute
-        let settings = build_settings(&[&format!("/absolute/{}/src/test/file.rs", WORKTREE_NAME)]);
-        assert!(!settings.enabled_for_file(&test_file, &cx));
-        let settings = build_settings(&["/other/test/otherfile.rs"]);
-        assert!(settings.enabled_for_file(&test_file, &cx));
-
-        // Test * glob
-        let settings = build_settings(&["*"]);
-        assert!(!settings.enabled_for_file(&test_file, &cx));
-        let settings = build_settings(&["*.txt"]);
-        assert!(settings.enabled_for_file(&test_file, &cx));
-
-        // Test **/* glob
-        let settings = build_settings(&["**/*"]);
-        assert!(!settings.enabled_for_file(&test_file, &cx));
-        let settings = build_settings(&["other/**/*"]);
-        assert!(settings.enabled_for_file(&test_file, &cx));
-
-        // Test directory/** glob
-        let settings = build_settings(&["src/**"]);
-        assert!(!settings.enabled_for_file(&test_file, &cx));
-
-        let test_file_root: Arc<dyn File> = Arc::new(TestFile {
-            path: rel_path("file.rs").into(),
-            root_name: WORKTREE_NAME.to_string(),
-            local_root: Some(PathBuf::from("/absolute/")),
-        });
-        assert!(settings.enabled_for_file(&test_file_root, &cx));
-
-        let settings = build_settings(&["other/**"]);
-        assert!(settings.enabled_for_file(&test_file, &cx));
-
-        // Test **/directory/* glob
-        let settings = build_settings(&["**/test/*"]);
-        assert!(!settings.enabled_for_file(&test_file, &cx));
-        let settings = build_settings(&["**/other/*"]);
-        assert!(settings.enabled_for_file(&test_file, &cx));
-
-        // Test multiple globs
-        let settings = build_settings(&["*.rs", "*.txt", "src/**"]);
-        assert!(!settings.enabled_for_file(&test_file, &cx));
-        let settings = build_settings(&["*.txt", "*.md", "other/**"]);
-        assert!(settings.enabled_for_file(&test_file, &cx));
-
-        // Test dot files
-        let dot_file = make_test_file(&[".config", "settings.json"]);
-        let settings = build_settings(&[".*/**"]);
-        assert!(!settings.enabled_for_file(&dot_file, &cx));
-
-        let dot_env_file = make_test_file(&[".env"]);
-        let settings = build_settings(&[".env"]);
-        assert!(!settings.enabled_for_file(&dot_env_file, &cx));
-
-        // Test tilde expansion
-        let home = shellexpand::tilde("~").into_owned();
-        let home_file = Arc::new(TestFile {
-            path: rel_path("test.rs").into(),
-            root_name: "the-dir".to_string(),
-            local_root: Some(PathBuf::from(home)),
-        }) as Arc<dyn File>;
-        let settings = build_settings(&["~/the-dir/test.rs"]);
-        assert!(!settings.enabled_for_file(&home_file, &cx));
-    }
-
-    #[test]
-    fn test_resolve_language_servers() {
-        fn language_server_names(names: &[&str]) -> Vec<LanguageServerName> {
-            names
-                .iter()
-                .copied()
-                .map(|name| LanguageServerName(name.to_string().into()))
-                .collect::<Vec<_>>()
-        }
-
-        let available_language_servers = language_server_names(&[
-            "typescript-language-server",
-            "biome",
-            "deno",
-            "eslint",
-            "tailwind",
-        ]);
-
-        // A value of just `["..."]` is the same as taking all of the available language servers.
-        assert_eq!(
-            LanguageSettings::resolve_language_servers(
-                &[LanguageSettings::REST_OF_LANGUAGE_SERVERS.into()],
-                &available_language_servers,
-            ),
-            available_language_servers
-        );
-
-        // Referencing one of the available language servers will change its order.
-        assert_eq!(
-            LanguageSettings::resolve_language_servers(
-                &[
-                    "biome".into(),
-                    LanguageSettings::REST_OF_LANGUAGE_SERVERS.into(),
-                    "deno".into()
-                ],
-                &available_language_servers
-            ),
-            language_server_names(&[
-                "biome",
-                "typescript-language-server",
-                "eslint",
-                "tailwind",
-                "deno",
-            ])
-        );
-
-        // Negating an available language server removes it from the list.
-        assert_eq!(
-            LanguageSettings::resolve_language_servers(
-                &[
-                    "deno".into(),
-                    "!typescript-language-server".into(),
-                    "!biome".into(),
-                    LanguageSettings::REST_OF_LANGUAGE_SERVERS.into()
-                ],
-                &available_language_servers
-            ),
-            language_server_names(&["deno", "eslint", "tailwind"])
-        );
-
-        // Adding a language server not in the list of available language servers adds it to the list.
-        assert_eq!(
-            LanguageSettings::resolve_language_servers(
-                &[
-                    "my-cool-language-server".into(),
-                    LanguageSettings::REST_OF_LANGUAGE_SERVERS.into()
-                ],
-                &available_language_servers
-            ),
-            language_server_names(&[
-                "my-cool-language-server",
-                "typescript-language-server",
-                "biome",
-                "deno",
-                "eslint",
-                "tailwind",
-            ])
-        );
-    }
-}
diff --git a/crates/language/src/manifest.rs b/crates/language/src/manifest.rs
deleted file mode 100644
index 82ed164a03..0000000000
--- a/crates/language/src/manifest.rs
+++ /dev/null
@@ -1,59 +0,0 @@
-use std::{borrow::Borrow, sync::Arc};
-
-use gpui::SharedString;
-use settings::WorktreeId;
-use util::rel_path::RelPath;
-
-#[derive(Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]
-pub struct ManifestName(SharedString);
-
-impl Borrow<SharedString> for ManifestName {
-    fn borrow(&self) -> &SharedString {
-        &self.0
-    }
-}
-
-impl Borrow<str> for ManifestName {
-    fn borrow(&self) -> &str {
-        &self.0
-    }
-}
-
-impl From<SharedString> for ManifestName {
-    fn from(value: SharedString) -> Self {
-        Self(value)
-    }
-}
-
-impl From<ManifestName> for SharedString {
-    fn from(value: ManifestName) -> Self {
-        value.0
-    }
-}
-
-impl AsRef<SharedString> for ManifestName {
-    fn as_ref(&self) -> &SharedString {
-        &self.0
-    }
-}
-
-/// Represents a manifest query; given a path to a file, [ManifestSearcher] is tasked with finding a path to the directory containing the manifest for that file.
-///
-/// Since parts of the path might have already been explored, there's an additional `depth` parameter that indicates to what ancestry level a given path should be explored.
-/// For example, given a path like `foo/bar/baz`, a depth of 2 would explore `foo/bar/baz` and `foo/bar`, but not `foo`.
-pub struct ManifestQuery {
-    /// Path to the file, relative to worktree root.
-    pub path: Arc<RelPath>,
-    pub depth: usize,
-    pub delegate: Arc<dyn ManifestDelegate>,
-}
-
-pub trait ManifestProvider {
-    fn name(&self) -> ManifestName;
-    fn search(&self, query: ManifestQuery) -> Option<Arc<RelPath>>;
-}
-
-pub trait ManifestDelegate: Send + Sync {
-    fn worktree_id(&self) -> WorktreeId;
-    fn exists(&self, path: &RelPath, is_dir: Option<bool>) -> bool;
-}
diff --git a/crates/language/src/outline.rs b/crates/language/src/outline.rs
deleted file mode 100644
index 875042bfc8..0000000000
--- a/crates/language/src/outline.rs
+++ /dev/null
@@ -1,327 +0,0 @@
-use crate::{BufferSnapshot, Point, ToPoint, ToTreeSitterPoint};
-use fuzzy::{StringMatch, StringMatchCandidate};
-use gpui::{BackgroundExecutor, HighlightStyle};
-use std::ops::Range;
-
-/// An outline of all the symbols contained in a buffer.
-#[derive(Debug)]
-pub struct Outline<T> {
-    pub items: Vec<OutlineItem<T>>,
-    candidates: Vec<StringMatchCandidate>,
-    pub path_candidates: Vec<StringMatchCandidate>,
-    path_candidate_prefixes: Vec<usize>,
-}
-
-#[derive(Clone, Debug, Default, PartialEq, Eq, Hash)]
-pub struct OutlineItem<T> {
-    pub depth: usize,
-    pub range: Range<T>,
-    pub source_range_for_text: Range<T>,
-    pub text: String,
-    pub highlight_ranges: Vec<(Range<usize>, HighlightStyle)>,
-    pub name_ranges: Vec<Range<usize>>,
-    pub body_range: Option<Range<T>>,
-    pub annotation_range: Option<Range<T>>,
-}
-
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub struct SymbolPath(pub String);
-
-impl<T: ToPoint> OutlineItem<T> {
-    /// Converts to an equivalent outline item, but with parameterized over Points.
-    pub fn to_point(&self, buffer: &BufferSnapshot) -> OutlineItem<Point> {
-        OutlineItem {
-            depth: self.depth,
-            range: self.range.start.to_point(buffer)..self.range.end.to_point(buffer),
-            source_range_for_text: self.source_range_for_text.start.to_point(buffer)
-                ..self.source_range_for_text.end.to_point(buffer),
-            text: self.text.clone(),
-            highlight_ranges: self.highlight_ranges.clone(),
-            name_ranges: self.name_ranges.clone(),
-            body_range: self
-                .body_range
-                .as_ref()
-                .map(|r| r.start.to_point(buffer)..r.end.to_point(buffer)),
-            annotation_range: self
-                .annotation_range
-                .as_ref()
-                .map(|r| r.start.to_point(buffer)..r.end.to_point(buffer)),
-        }
-    }
-
-    pub fn body_range(&self, buffer: &BufferSnapshot) -> Option<Range<Point>> {
-        if let Some(range) = self.body_range.as_ref() {
-            return Some(range.start.to_point(buffer)..range.end.to_point(buffer));
-        }
-
-        let range = self.range.start.to_point(buffer)..self.range.end.to_point(buffer);
-        let start_indent = buffer.indent_size_for_line(range.start.row);
-        let node = buffer.syntax_ancestor(range.clone())?;
-
-        let mut cursor = node.walk();
-        loop {
-            let node = cursor.node();
-            if node.start_position() >= range.start.to_ts_point()
-                && node.end_position() <= range.end.to_ts_point()
-            {
-                break;
-            }
-            cursor.goto_first_child_for_point(range.start.to_ts_point());
-        }
-
-        if !cursor.goto_last_child() {
-            return None;
-        }
-        let body_node = loop {
-            let node = cursor.node();
-            if node.child_count() > 0 {
-                break node;
-            }
-            if !cursor.goto_previous_sibling() {
-                return None;
-            }
-        };
-
-        let mut start_row = body_node.start_position().row as u32;
-        let mut end_row = body_node.end_position().row as u32;
-
-        while start_row < end_row && buffer.indent_size_for_line(start_row) == start_indent {
-            start_row += 1;
-        }
-        while start_row < end_row && buffer.indent_size_for_line(end_row - 1) == start_indent {
-            end_row -= 1;
-        }
-        if start_row < end_row {
-            return Some(Point::new(start_row, 0)..Point::new(end_row, 0));
-        }
-        None
-    }
-}
-
-impl<T> Outline<T> {
-    pub fn new(items: Vec<OutlineItem<T>>) -> Self {
-        let mut candidates = Vec::new();
-        let mut path_candidates = Vec::new();
-        let mut path_candidate_prefixes = Vec::new();
-        let mut path_text = String::new();
-        let mut path_stack = Vec::new();
-
-        for (id, item) in items.iter().enumerate() {
-            if item.depth < path_stack.len() {
-                path_stack.truncate(item.depth);
-                path_text.truncate(path_stack.last().copied().unwrap_or(0));
-            }
-            if !path_text.is_empty() {
-                path_text.push(' ');
-            }
-            path_candidate_prefixes.push(path_text.len());
-            path_text.push_str(&item.text);
-            path_stack.push(path_text.len());
-
-            let candidate_text = item
-                .name_ranges
-                .iter()
-                .map(|range| &item.text[range.start..range.end])
-                .collect::<String>();
-
-            path_candidates.push(StringMatchCandidate::new(id, &path_text));
-            candidates.push(StringMatchCandidate::new(id, &candidate_text));
-        }
-
-        Self {
-            candidates,
-            path_candidates,
-            path_candidate_prefixes,
-            items,
-        }
-    }
-
-    /// Find the most similar symbol to the provided query using normalized Levenshtein distance.
-    pub fn find_most_similar(&self, query: &str) -> Option<(SymbolPath, &OutlineItem<T>)> {
-        const SIMILARITY_THRESHOLD: f64 = 0.6;
-
-        let (position, similarity) = self
-            .path_candidates
-            .iter()
-            .enumerate()
-            .map(|(index, candidate)| {
-                let similarity = strsim::normalized_levenshtein(&candidate.string, query);
-                (index, similarity)
-            })
-            .max_by(|(_, a), (_, b)| a.partial_cmp(b).unwrap())?;
-
-        if similarity >= SIMILARITY_THRESHOLD {
-            self.path_candidates
-                .get(position)
-                .map(|candidate| SymbolPath(candidate.string.clone()))
-                .zip(self.items.get(position))
-        } else {
-            None
-        }
-    }
-
-    /// Find all outline symbols according to a longest subsequence match with the query, ordered descending by match score.
-    pub async fn search(&self, query: &str, executor: BackgroundExecutor) -> Vec<StringMatch> {
-        let query = query.trim_start();
-        let is_path_query = query.contains(' ');
-        let smart_case = query.chars().any(|c| c.is_uppercase());
-        let mut matches = fuzzy::match_strings(
-            if is_path_query {
-                &self.path_candidates
-            } else {
-                &self.candidates
-            },
-            query,
-            smart_case,
-            true,
-            100,
-            &Default::default(),
-            executor.clone(),
-        )
-        .await;
-        matches.sort_unstable_by_key(|m| m.candidate_id);
-
-        let mut tree_matches = Vec::new();
-
-        let mut prev_item_ix = 0;
-        for mut string_match in matches {
-            let outline_match = &self.items[string_match.candidate_id];
-            string_match.string.clone_from(&outline_match.text);
-
-            if is_path_query {
-                let prefix_len = self.path_candidate_prefixes[string_match.candidate_id];
-                string_match
-                    .positions
-                    .retain(|position| *position >= prefix_len);
-                for position in &mut string_match.positions {
-                    *position -= prefix_len;
-                }
-            } else {
-                let mut name_ranges = outline_match.name_ranges.iter();
-                let Some(mut name_range) = name_ranges.next() else {
-                    continue;
-                };
-                let mut preceding_ranges_len = 0;
-                for position in &mut string_match.positions {
-                    while *position >= preceding_ranges_len + name_range.len() {
-                        preceding_ranges_len += name_range.len();
-                        name_range = name_ranges.next().unwrap();
-                    }
-                    *position = name_range.start + (*position - preceding_ranges_len);
-                }
-            }
-
-            let insertion_ix = tree_matches.len();
-            let mut cur_depth = outline_match.depth;
-            for (ix, item) in self.items[prev_item_ix..string_match.candidate_id]
-                .iter()
-                .enumerate()
-                .rev()
-            {
-                if cur_depth == 0 {
-                    break;
-                }
-
-                let candidate_index = ix + prev_item_ix;
-                if item.depth == cur_depth - 1 {
-                    tree_matches.insert(
-                        insertion_ix,
-                        StringMatch {
-                            candidate_id: candidate_index,
-                            score: Default::default(),
-                            positions: Default::default(),
-                            string: Default::default(),
-                        },
-                    );
-                    cur_depth -= 1;
-                }
-            }
-
-            prev_item_ix = string_match.candidate_id + 1;
-            tree_matches.push(string_match);
-        }
-
-        tree_matches
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use gpui::TestAppContext;
-
-    #[gpui::test]
-    async fn test_entries_with_no_names(cx: &mut TestAppContext) {
-        let outline = Outline::new(vec![
-            OutlineItem {
-                depth: 0,
-                range: Point::new(0, 0)..Point::new(5, 0),
-                source_range_for_text: Point::new(0, 0)..Point::new(0, 9),
-                text: "class Foo".to_string(),
-                highlight_ranges: vec![],
-                name_ranges: vec![6..9],
-                body_range: None,
-                annotation_range: None,
-            },
-            OutlineItem {
-                depth: 0,
-                range: Point::new(2, 0)..Point::new(2, 7),
-                source_range_for_text: Point::new(0, 0)..Point::new(0, 7),
-                text: "private".to_string(),
-                highlight_ranges: vec![],
-                name_ranges: vec![],
-                body_range: None,
-                annotation_range: None,
-            },
-        ]);
-        assert_eq!(
-            outline
-                .search(" ", cx.executor())
-                .await
-                .into_iter()
-                .map(|mat| mat.string)
-                .collect::<Vec<String>>(),
-            vec!["class Foo".to_string()]
-        );
-    }
-
-    #[test]
-    fn test_find_most_similar_with_low_similarity() {
-        let outline = Outline::new(vec![
-            OutlineItem {
-                depth: 0,
-                range: Point::new(0, 0)..Point::new(5, 0),
-                source_range_for_text: Point::new(0, 0)..Point::new(0, 10),
-                text: "fn process".to_string(),
-                highlight_ranges: vec![],
-                name_ranges: vec![3..10],
-                body_range: None,
-                annotation_range: None,
-            },
-            OutlineItem {
-                depth: 0,
-                range: Point::new(7, 0)..Point::new(12, 0),
-                source_range_for_text: Point::new(0, 0)..Point::new(0, 20),
-                text: "struct DataProcessor".to_string(),
-                highlight_ranges: vec![],
-                name_ranges: vec![7..20],
-                body_range: None,
-                annotation_range: None,
-            },
-        ]);
-        assert_eq!(
-            outline.find_most_similar("pub fn process"),
-            Some((SymbolPath("fn process".into()), &outline.items[0]))
-        );
-        assert_eq!(
-            outline.find_most_similar("async fn process"),
-            Some((SymbolPath("fn process".into()), &outline.items[0])),
-        );
-        assert_eq!(
-            outline.find_most_similar("struct Processor"),
-            Some((SymbolPath("struct DataProcessor".into()), &outline.items[1]))
-        );
-        assert_eq!(outline.find_most_similar("struct User"), None);
-        assert_eq!(outline.find_most_similar("struct"), None);
-    }
-}
diff --git a/crates/language/src/proto.rs b/crates/language/src/proto.rs
deleted file mode 100644
index 242cce1c64..0000000000
--- a/crates/language/src/proto.rs
+++ /dev/null
@@ -1,646 +0,0 @@
-//! Handles conversions of `language` items to and from the [`rpc`] protocol.
-
-use crate::{CursorShape, Diagnostic, DiagnosticSourceKind, diagnostic_set::DiagnosticEntry};
-use anyhow::{Context as _, Result};
-use clock::ReplicaId;
-use gpui::SharedString;
-use lsp::{DiagnosticSeverity, LanguageServerId};
-use rpc::proto;
-use serde_json::Value;
-use std::{ops::Range, str::FromStr, sync::Arc};
-use text::*;
-
-pub use proto::{BufferState, File, Operation};
-
-use super::{point_from_lsp, point_to_lsp};
-
-/// Deserializes a `[text::LineEnding]` from the RPC representation.
-pub fn deserialize_line_ending(message: proto::LineEnding) -> text::LineEnding {
-    match message {
-        proto::LineEnding::Unix => text::LineEnding::Unix,
-        proto::LineEnding::Windows => text::LineEnding::Windows,
-    }
-}
-
-/// Serializes a [`text::LineEnding`] to be sent over RPC.
-pub fn serialize_line_ending(message: text::LineEnding) -> proto::LineEnding {
-    match message {
-        text::LineEnding::Unix => proto::LineEnding::Unix,
-        text::LineEnding::Windows => proto::LineEnding::Windows,
-    }
-}
-
-/// Serializes a [`crate::Operation`] to be sent over RPC.
-pub fn serialize_operation(operation: &crate::Operation) -> proto::Operation {
-    proto::Operation {
-        variant: Some(match operation {
-            crate::Operation::Buffer(text::Operation::Edit(edit)) => {
-                proto::operation::Variant::Edit(serialize_edit_operation(edit))
-            }
-
-            crate::Operation::Buffer(text::Operation::Undo(undo)) => {
-                proto::operation::Variant::Undo(proto::operation::Undo {
-                    replica_id: undo.timestamp.replica_id.as_u16() as u32,
-                    lamport_timestamp: undo.timestamp.value,
-                    version: serialize_version(&undo.version),
-                    counts: undo
-                        .counts
-                        .iter()
-                        .map(|(edit_id, count)| proto::UndoCount {
-                            replica_id: edit_id.replica_id.as_u16() as u32,
-                            lamport_timestamp: edit_id.value,
-                            count: *count,
-                        })
-                        .collect(),
-                })
-            }
-
-            crate::Operation::UpdateSelections {
-                selections,
-                line_mode,
-                lamport_timestamp,
-                cursor_shape,
-            } => proto::operation::Variant::UpdateSelections(proto::operation::UpdateSelections {
-                replica_id: lamport_timestamp.replica_id.as_u16() as u32,
-                lamport_timestamp: lamport_timestamp.value,
-                selections: serialize_selections(selections),
-                line_mode: *line_mode,
-                cursor_shape: serialize_cursor_shape(cursor_shape) as i32,
-            }),
-
-            crate::Operation::UpdateDiagnostics {
-                lamport_timestamp,
-                server_id,
-                diagnostics,
-            } => proto::operation::Variant::UpdateDiagnostics(proto::UpdateDiagnostics {
-                replica_id: lamport_timestamp.replica_id.as_u16() as u32,
-                lamport_timestamp: lamport_timestamp.value,
-                server_id: server_id.0 as u64,
-                diagnostics: serialize_diagnostics(diagnostics.iter()),
-            }),
-
-            crate::Operation::UpdateCompletionTriggers {
-                triggers,
-                lamport_timestamp,
-                server_id,
-            } => proto::operation::Variant::UpdateCompletionTriggers(
-                proto::operation::UpdateCompletionTriggers {
-                    replica_id: lamport_timestamp.replica_id.as_u16() as u32,
-                    lamport_timestamp: lamport_timestamp.value,
-                    triggers: triggers.clone(),
-                    language_server_id: server_id.to_proto(),
-                },
-            ),
-
-            crate::Operation::UpdateLineEnding {
-                line_ending,
-                lamport_timestamp,
-            } => proto::operation::Variant::UpdateLineEnding(proto::operation::UpdateLineEnding {
-                replica_id: lamport_timestamp.replica_id.as_u16() as u32,
-                lamport_timestamp: lamport_timestamp.value,
-                line_ending: serialize_line_ending(*line_ending) as i32,
-            }),
-        }),
-    }
-}
-
-/// Serializes an [`EditOperation`] to be sent over RPC.
-pub fn serialize_edit_operation(operation: &EditOperation) -> proto::operation::Edit {
-    proto::operation::Edit {
-        replica_id: operation.timestamp.replica_id.as_u16() as u32,
-        lamport_timestamp: operation.timestamp.value,
-        version: serialize_version(&operation.version),
-        ranges: operation.ranges.iter().map(serialize_range).collect(),
-        new_text: operation
-            .new_text
-            .iter()
-            .map(|text| text.to_string())
-            .collect(),
-    }
-}
-
-/// Serializes an entry in the undo map to be sent over RPC.
-pub fn serialize_undo_map_entry(
-    (edit_id, counts): (&clock::Lamport, &[(clock::Lamport, u32)]),
-) -> proto::UndoMapEntry {
-    proto::UndoMapEntry {
-        replica_id: edit_id.replica_id.as_u16() as u32,
-        local_timestamp: edit_id.value,
-        counts: counts
-            .iter()
-            .map(|(undo_id, count)| proto::UndoCount {
-                replica_id: undo_id.replica_id.as_u16() as u32,
-                lamport_timestamp: undo_id.value,
-                count: *count,
-            })
-            .collect(),
-    }
-}
-
-/// Splits the given list of operations into chunks.
-pub fn split_operations(
-    mut operations: Vec<proto::Operation>,
-) -> impl Iterator<Item = Vec<proto::Operation>> {
-    #[cfg(any(test, feature = "test-support"))]
-    const CHUNK_SIZE: usize = 5;
-
-    #[cfg(not(any(test, feature = "test-support")))]
-    const CHUNK_SIZE: usize = 100;
-
-    let mut done = false;
-    std::iter::from_fn(move || {
-        if done {
-            return None;
-        }
-
-        let operations = operations
-            .drain(..std::cmp::min(CHUNK_SIZE, operations.len()))
-            .collect::<Vec<_>>();
-        if operations.is_empty() {
-            done = true;
-        }
-        Some(operations)
-    })
-}
-
-/// Serializes selections to be sent over RPC.
-pub fn serialize_selections(selections: &Arc<[Selection<Anchor>]>) -> Vec<proto::Selection> {
-    selections.iter().map(serialize_selection).collect()
-}
-
-/// Serializes a [`Selection`] to be sent over RPC.
-pub fn serialize_selection(selection: &Selection<Anchor>) -> proto::Selection {
-    proto::Selection {
-        id: selection.id as u64,
-        start: Some(proto::EditorAnchor {
-            anchor: Some(serialize_anchor(&selection.start)),
-            excerpt_id: 0,
-        }),
-        end: Some(proto::EditorAnchor {
-            anchor: Some(serialize_anchor(&selection.end)),
-            excerpt_id: 0,
-        }),
-        reversed: selection.reversed,
-    }
-}
-
-/// Serializes a [`CursorShape`] to be sent over RPC.
-pub fn serialize_cursor_shape(cursor_shape: &CursorShape) -> proto::CursorShape {
-    match cursor_shape {
-        CursorShape::Bar => proto::CursorShape::CursorBar,
-        CursorShape::Block => proto::CursorShape::CursorBlock,
-        CursorShape::Underline => proto::CursorShape::CursorUnderscore,
-        CursorShape::Hollow => proto::CursorShape::CursorHollow,
-    }
-}
-
-/// Deserializes a [`CursorShape`] from the RPC representation.
-pub fn deserialize_cursor_shape(cursor_shape: proto::CursorShape) -> CursorShape {
-    match cursor_shape {
-        proto::CursorShape::CursorBar => CursorShape::Bar,
-        proto::CursorShape::CursorBlock => CursorShape::Block,
-        proto::CursorShape::CursorUnderscore => CursorShape::Underline,
-        proto::CursorShape::CursorHollow => CursorShape::Hollow,
-    }
-}
-
-/// Serializes a list of diagnostics to be sent over RPC.
-pub fn serialize_diagnostics<'a>(
-    diagnostics: impl IntoIterator<Item = &'a DiagnosticEntry<Anchor>>,
-) -> Vec<proto::Diagnostic> {
-    diagnostics
-        .into_iter()
-        .map(|entry| proto::Diagnostic {
-            source: entry.diagnostic.source.clone(),
-            source_kind: match entry.diagnostic.source_kind {
-                DiagnosticSourceKind::Pulled => proto::diagnostic::SourceKind::Pulled,
-                DiagnosticSourceKind::Pushed => proto::diagnostic::SourceKind::Pushed,
-                DiagnosticSourceKind::Other => proto::diagnostic::SourceKind::Other,
-            } as i32,
-            start: Some(serialize_anchor(&entry.range.start)),
-            end: Some(serialize_anchor(&entry.range.end)),
-            message: entry.diagnostic.message.clone(),
-            markdown: entry.diagnostic.markdown.clone(),
-            severity: match entry.diagnostic.severity {
-                DiagnosticSeverity::ERROR => proto::diagnostic::Severity::Error,
-                DiagnosticSeverity::WARNING => proto::diagnostic::Severity::Warning,
-                DiagnosticSeverity::INFORMATION => proto::diagnostic::Severity::Information,
-                DiagnosticSeverity::HINT => proto::diagnostic::Severity::Hint,
-                _ => proto::diagnostic::Severity::None,
-            } as i32,
-            group_id: entry.diagnostic.group_id as u64,
-            is_primary: entry.diagnostic.is_primary,
-            underline: entry.diagnostic.underline,
-            code: entry.diagnostic.code.as_ref().map(|s| s.to_string()),
-            code_description: entry
-                .diagnostic
-                .code_description
-                .as_ref()
-                .map(|s| s.to_string()),
-            is_disk_based: entry.diagnostic.is_disk_based,
-            is_unnecessary: entry.diagnostic.is_unnecessary,
-            data: entry.diagnostic.data.as_ref().map(|data| data.to_string()),
-            registration_id: entry
-                .diagnostic
-                .registration_id
-                .as_ref()
-                .map(ToString::to_string),
-        })
-        .collect()
-}
-
-/// Serializes an [`Anchor`] to be sent over RPC.
-pub fn serialize_anchor(anchor: &Anchor) -> proto::Anchor {
-    proto::Anchor {
-        replica_id: anchor.timestamp.replica_id.as_u16() as u32,
-        timestamp: anchor.timestamp.value,
-        offset: anchor.offset as u64,
-        bias: match anchor.bias {
-            Bias::Left => proto::Bias::Left as i32,
-            Bias::Right => proto::Bias::Right as i32,
-        },
-        buffer_id: anchor.buffer_id.map(Into::into),
-    }
-}
-
-pub fn serialize_anchor_range(range: Range<Anchor>) -> proto::AnchorRange {
-    proto::AnchorRange {
-        start: Some(serialize_anchor(&range.start)),
-        end: Some(serialize_anchor(&range.end)),
-    }
-}
-
-/// Deserializes an [`Range<Anchor>`] from the RPC representation.
-pub fn deserialize_anchor_range(range: proto::AnchorRange) -> Result<Range<Anchor>> {
-    Ok(
-        deserialize_anchor(range.start.context("invalid anchor")?).context("invalid anchor")?
-            ..deserialize_anchor(range.end.context("invalid anchor")?).context("invalid anchor")?,
-    )
-}
-
-// This behavior is currently copied in the collab database, for snapshotting channel notes
-/// Deserializes an [`crate::Operation`] from the RPC representation.
-pub fn deserialize_operation(message: proto::Operation) -> Result<crate::Operation> {
-    Ok(
-        match message.variant.context("missing operation variant")? {
-            proto::operation::Variant::Edit(edit) => {
-                crate::Operation::Buffer(text::Operation::Edit(deserialize_edit_operation(edit)))
-            }
-            proto::operation::Variant::Undo(undo) => {
-                crate::Operation::Buffer(text::Operation::Undo(UndoOperation {
-                    timestamp: clock::Lamport {
-                        replica_id: ReplicaId::new(undo.replica_id as u16),
-                        value: undo.lamport_timestamp,
-                    },
-                    version: deserialize_version(&undo.version),
-                    counts: undo
-                        .counts
-                        .into_iter()
-                        .map(|c| {
-                            (
-                                clock::Lamport {
-                                    replica_id: ReplicaId::new(c.replica_id as u16),
-                                    value: c.lamport_timestamp,
-                                },
-                                c.count,
-                            )
-                        })
-                        .collect(),
-                }))
-            }
-            proto::operation::Variant::UpdateSelections(message) => {
-                let selections = message
-                    .selections
-                    .into_iter()
-                    .filter_map(|selection| {
-                        Some(Selection {
-                            id: selection.id as usize,
-                            start: deserialize_anchor(selection.start?.anchor?)?,
-                            end: deserialize_anchor(selection.end?.anchor?)?,
-                            reversed: selection.reversed,
-                            goal: SelectionGoal::None,
-                        })
-                    })
-                    .collect::<Vec<_>>();
-
-                crate::Operation::UpdateSelections {
-                    lamport_timestamp: clock::Lamport {
-                        replica_id: ReplicaId::new(message.replica_id as u16),
-                        value: message.lamport_timestamp,
-                    },
-                    selections: Arc::from(selections),
-                    line_mode: message.line_mode,
-                    cursor_shape: deserialize_cursor_shape(
-                        proto::CursorShape::from_i32(message.cursor_shape)
-                            .context("Missing cursor shape")?,
-                    ),
-                }
-            }
-            proto::operation::Variant::UpdateDiagnostics(message) => {
-                crate::Operation::UpdateDiagnostics {
-                    lamport_timestamp: clock::Lamport {
-                        replica_id: ReplicaId::new(message.replica_id as u16),
-                        value: message.lamport_timestamp,
-                    },
-                    server_id: LanguageServerId(message.server_id as usize),
-                    diagnostics: deserialize_diagnostics(message.diagnostics),
-                }
-            }
-            proto::operation::Variant::UpdateCompletionTriggers(message) => {
-                crate::Operation::UpdateCompletionTriggers {
-                    triggers: message.triggers,
-                    lamport_timestamp: clock::Lamport {
-                        replica_id: ReplicaId::new(message.replica_id as u16),
-                        value: message.lamport_timestamp,
-                    },
-                    server_id: LanguageServerId::from_proto(message.language_server_id),
-                }
-            }
-            proto::operation::Variant::UpdateLineEnding(message) => {
-                crate::Operation::UpdateLineEnding {
-                    lamport_timestamp: clock::Lamport {
-                        replica_id: ReplicaId::new(message.replica_id as u16),
-                        value: message.lamport_timestamp,
-                    },
-                    line_ending: deserialize_line_ending(
-                        proto::LineEnding::from_i32(message.line_ending)
-                            .context("missing line_ending")?,
-                    ),
-                }
-            }
-        },
-    )
-}
-
-/// Deserializes an [`EditOperation`] from the RPC representation.
-pub fn deserialize_edit_operation(edit: proto::operation::Edit) -> EditOperation {
-    EditOperation {
-        timestamp: clock::Lamport {
-            replica_id: ReplicaId::new(edit.replica_id as u16),
-            value: edit.lamport_timestamp,
-        },
-        version: deserialize_version(&edit.version),
-        ranges: edit.ranges.into_iter().map(deserialize_range).collect(),
-        new_text: edit.new_text.into_iter().map(Arc::from).collect(),
-    }
-}
-
-/// Deserializes an entry in the undo map from the RPC representation.
-pub fn deserialize_undo_map_entry(
-    entry: proto::UndoMapEntry,
-) -> (clock::Lamport, Vec<(clock::Lamport, u32)>) {
-    (
-        clock::Lamport {
-            replica_id: ReplicaId::new(entry.replica_id as u16),
-            value: entry.local_timestamp,
-        },
-        entry
-            .counts
-            .into_iter()
-            .map(|undo_count| {
-                (
-                    clock::Lamport {
-                        replica_id: ReplicaId::new(undo_count.replica_id as u16),
-                        value: undo_count.lamport_timestamp,
-                    },
-                    undo_count.count,
-                )
-            })
-            .collect(),
-    )
-}
-
-/// Deserializes selections from the RPC representation.
-pub fn deserialize_selections(selections: Vec<proto::Selection>) -> Arc<[Selection<Anchor>]> {
-    selections
-        .into_iter()
-        .filter_map(deserialize_selection)
-        .collect()
-}
-
-/// Deserializes a [`Selection`] from the RPC representation.
-pub fn deserialize_selection(selection: proto::Selection) -> Option<Selection<Anchor>> {
-    Some(Selection {
-        id: selection.id as usize,
-        start: deserialize_anchor(selection.start?.anchor?)?,
-        end: deserialize_anchor(selection.end?.anchor?)?,
-        reversed: selection.reversed,
-        goal: SelectionGoal::None,
-    })
-}
-
-/// Deserializes a list of diagnostics from the RPC representation.
-pub fn deserialize_diagnostics(
-    diagnostics: Vec<proto::Diagnostic>,
-) -> Arc<[DiagnosticEntry<Anchor>]> {
-    diagnostics
-        .into_iter()
-        .filter_map(|diagnostic| {
-            let data = if let Some(data) = diagnostic.data {
-                Some(Value::from_str(&data).ok()?)
-            } else {
-                None
-            };
-            Some(DiagnosticEntry {
-                range: deserialize_anchor(diagnostic.start?)?..deserialize_anchor(diagnostic.end?)?,
-                diagnostic: Diagnostic {
-                    source: diagnostic.source,
-                    severity: match proto::diagnostic::Severity::from_i32(diagnostic.severity)? {
-                        proto::diagnostic::Severity::Error => DiagnosticSeverity::ERROR,
-                        proto::diagnostic::Severity::Warning => DiagnosticSeverity::WARNING,
-                        proto::diagnostic::Severity::Information => DiagnosticSeverity::INFORMATION,
-                        proto::diagnostic::Severity::Hint => DiagnosticSeverity::HINT,
-                        proto::diagnostic::Severity::None => return None,
-                    },
-                    message: diagnostic.message,
-                    markdown: diagnostic.markdown,
-                    group_id: diagnostic.group_id as usize,
-                    code: diagnostic.code.map(lsp::NumberOrString::from_string),
-                    code_description: diagnostic
-                        .code_description
-                        .and_then(|s| lsp::Uri::from_str(&s).ok()),
-                    is_primary: diagnostic.is_primary,
-                    is_disk_based: diagnostic.is_disk_based,
-                    is_unnecessary: diagnostic.is_unnecessary,
-                    underline: diagnostic.underline,
-                    registration_id: diagnostic.registration_id.map(SharedString::from),
-                    source_kind: match proto::diagnostic::SourceKind::from_i32(
-                        diagnostic.source_kind,
-                    )? {
-                        proto::diagnostic::SourceKind::Pulled => DiagnosticSourceKind::Pulled,
-                        proto::diagnostic::SourceKind::Pushed => DiagnosticSourceKind::Pushed,
-                        proto::diagnostic::SourceKind::Other => DiagnosticSourceKind::Other,
-                    },
-                    data,
-                },
-            })
-        })
-        .collect()
-}
-
-/// Deserializes an [`Anchor`] from the RPC representation.
-pub fn deserialize_anchor(anchor: proto::Anchor) -> Option<Anchor> {
-    let buffer_id = if let Some(id) = anchor.buffer_id {
-        Some(BufferId::new(id).ok()?)
-    } else {
-        None
-    };
-    Some(Anchor {
-        timestamp: clock::Lamport {
-            replica_id: ReplicaId::new(anchor.replica_id as u16),
-            value: anchor.timestamp,
-        },
-        offset: anchor.offset as usize,
-        bias: match proto::Bias::from_i32(anchor.bias)? {
-            proto::Bias::Left => Bias::Left,
-            proto::Bias::Right => Bias::Right,
-        },
-        buffer_id,
-    })
-}
-
-/// Returns a `[clock::Lamport`] timestamp for the given [`proto::Operation`].
-pub fn lamport_timestamp_for_operation(operation: &proto::Operation) -> Option<clock::Lamport> {
-    let replica_id;
-    let value;
-    match operation.variant.as_ref()? {
-        proto::operation::Variant::Edit(op) => {
-            replica_id = op.replica_id;
-            value = op.lamport_timestamp;
-        }
-        proto::operation::Variant::Undo(op) => {
-            replica_id = op.replica_id;
-            value = op.lamport_timestamp;
-        }
-        proto::operation::Variant::UpdateDiagnostics(op) => {
-            replica_id = op.replica_id;
-            value = op.lamport_timestamp;
-        }
-        proto::operation::Variant::UpdateSelections(op) => {
-            replica_id = op.replica_id;
-            value = op.lamport_timestamp;
-        }
-        proto::operation::Variant::UpdateCompletionTriggers(op) => {
-            replica_id = op.replica_id;
-            value = op.lamport_timestamp;
-        }
-        proto::operation::Variant::UpdateLineEnding(op) => {
-            replica_id = op.replica_id;
-            value = op.lamport_timestamp;
-        }
-    }
-
-    Some(clock::Lamport {
-        replica_id: ReplicaId::new(replica_id as u16),
-        value,
-    })
-}
-
-/// Serializes a [`Transaction`] to be sent over RPC.
-pub fn serialize_transaction(transaction: &Transaction) -> proto::Transaction {
-    proto::Transaction {
-        id: Some(serialize_timestamp(transaction.id)),
-        edit_ids: transaction
-            .edit_ids
-            .iter()
-            .copied()
-            .map(serialize_timestamp)
-            .collect(),
-        start: serialize_version(&transaction.start),
-    }
-}
-
-/// Deserializes a [`Transaction`] from the RPC representation.
-pub fn deserialize_transaction(transaction: proto::Transaction) -> Result<Transaction> {
-    Ok(Transaction {
-        id: deserialize_timestamp(transaction.id.context("missing transaction id")?),
-        edit_ids: transaction
-            .edit_ids
-            .into_iter()
-            .map(deserialize_timestamp)
-            .collect(),
-        start: deserialize_version(&transaction.start),
-    })
-}
-
-/// Serializes a [`clock::Lamport`] timestamp to be sent over RPC.
-pub fn serialize_timestamp(timestamp: clock::Lamport) -> proto::LamportTimestamp {
-    proto::LamportTimestamp {
-        replica_id: timestamp.replica_id.as_u16() as u32,
-        value: timestamp.value,
-    }
-}
-
-/// Deserializes a [`clock::Lamport`] timestamp from the RPC representation.
-pub fn deserialize_timestamp(timestamp: proto::LamportTimestamp) -> clock::Lamport {
-    clock::Lamport {
-        replica_id: ReplicaId::new(timestamp.replica_id as u16),
-        value: timestamp.value,
-    }
-}
-
-/// Serializes a range of [`FullOffset`]s to be sent over RPC.
-pub fn serialize_range(range: &Range<FullOffset>) -> proto::Range {
-    proto::Range {
-        start: range.start.0 as u64,
-        end: range.end.0 as u64,
-    }
-}
-
-/// Deserializes a range of [`FullOffset`]s from the RPC representation.
-pub fn deserialize_range(range: proto::Range) -> Range<FullOffset> {
-    FullOffset(range.start as usize)..FullOffset(range.end as usize)
-}
-
-/// Deserializes a clock version from the RPC representation.
-pub fn deserialize_version(message: &[proto::VectorClockEntry]) -> clock::Global {
-    let mut version = clock::Global::new();
-    for entry in message {
-        version.observe(clock::Lamport {
-            replica_id: ReplicaId::new(entry.replica_id as u16),
-            value: entry.timestamp,
-        });
-    }
-    version
-}
-
-/// Serializes a clock version to be sent over RPC.
-pub fn serialize_version(version: &clock::Global) -> Vec<proto::VectorClockEntry> {
-    version
-        .iter()
-        .map(|entry| proto::VectorClockEntry {
-            replica_id: entry.replica_id.as_u16() as u32,
-            timestamp: entry.value,
-        })
-        .collect()
-}
-
-pub fn serialize_lsp_edit(edit: lsp::TextEdit) -> proto::TextEdit {
-    let start = point_from_lsp(edit.range.start).0;
-    let end = point_from_lsp(edit.range.end).0;
-    proto::TextEdit {
-        new_text: edit.new_text,
-        lsp_range_start: Some(proto::PointUtf16 {
-            row: start.row,
-            column: start.column,
-        }),
-        lsp_range_end: Some(proto::PointUtf16 {
-            row: end.row,
-            column: end.column,
-        }),
-    }
-}
-
-pub fn deserialize_lsp_edit(edit: proto::TextEdit) -> Option<lsp::TextEdit> {
-    let start = edit.lsp_range_start?;
-    let start = PointUtf16::new(start.row, start.column);
-    let end = edit.lsp_range_end?;
-    let end = PointUtf16::new(end.row, end.column);
-    Some(lsp::TextEdit {
-        range: lsp::Range {
-            start: point_to_lsp(start),
-            end: point_to_lsp(end),
-        },
-        new_text: edit.new_text,
-    })
-}
diff --git a/crates/language/src/syntax_map.rs b/crates/language/src/syntax_map.rs
deleted file mode 100644
index 17285ca315..0000000000
--- a/crates/language/src/syntax_map.rs
+++ /dev/null
@@ -1,2002 +0,0 @@
-#[cfg(test)]
-mod syntax_map_tests;
-
-use crate::{
-    Grammar, InjectionConfig, Language, LanguageId, LanguageRegistry, QUERY_CURSORS, with_parser,
-};
-use anyhow::Context as _;
-use collections::HashMap;
-use futures::FutureExt;
-use gpui::SharedString;
-use std::{
-    borrow::Cow,
-    cmp::{self, Ordering, Reverse},
-    collections::BinaryHeap,
-    fmt, iter,
-    ops::{Deref, DerefMut, Range},
-    sync::Arc,
-};
-use streaming_iterator::StreamingIterator;
-use sum_tree::{Bias, Dimensions, SeekTarget, SumTree};
-use text::{Anchor, BufferSnapshot, OffsetRangeExt, Point, Rope, ToOffset, ToPoint};
-use tree_sitter::{Node, Query, QueryCapture, QueryCaptures, QueryCursor, QueryMatches, Tree};
-
-pub struct SyntaxMap {
-    snapshot: SyntaxSnapshot,
-    language_registry: Option<Arc<LanguageRegistry>>,
-}
-
-#[derive(Clone)]
-pub struct SyntaxSnapshot {
-    layers: SumTree<SyntaxLayerEntry>,
-    parsed_version: clock::Global,
-    interpolated_version: clock::Global,
-    language_registry_version: usize,
-    update_count: usize,
-}
-
-#[derive(Default)]
-pub struct SyntaxMapCaptures<'a> {
-    layers: Vec<SyntaxMapCapturesLayer<'a>>,
-    active_layer_count: usize,
-    grammars: Vec<&'a Grammar>,
-}
-
-#[derive(Default)]
-pub struct SyntaxMapMatches<'a> {
-    layers: Vec<SyntaxMapMatchesLayer<'a>>,
-    active_layer_count: usize,
-    grammars: Vec<&'a Grammar>,
-}
-
-#[derive(Debug)]
-pub struct SyntaxMapCapture<'a> {
-    pub node: Node<'a>,
-    pub index: u32,
-    pub grammar_index: usize,
-}
-
-#[derive(Debug)]
-pub struct SyntaxMapMatch<'a> {
-    pub language: Arc<Language>,
-    pub depth: usize,
-    pub pattern_index: usize,
-    pub captures: &'a [QueryCapture<'a>],
-    pub grammar_index: usize,
-}
-
-struct SyntaxMapCapturesLayer<'a> {
-    depth: usize,
-    captures: QueryCaptures<'a, 'a, TextProvider<'a>, &'a [u8]>,
-    next_capture: Option<QueryCapture<'a>>,
-    grammar_index: usize,
-    _query_cursor: QueryCursorHandle,
-}
-
-struct SyntaxMapMatchesLayer<'a> {
-    language: Arc<Language>,
-    depth: usize,
-    next_pattern_index: usize,
-    next_captures: Vec<QueryCapture<'a>>,
-    has_next: bool,
-    matches: QueryMatches<'a, 'a, TextProvider<'a>, &'a [u8]>,
-    grammar_index: usize,
-    _query_cursor: QueryCursorHandle,
-}
-
-#[derive(Clone)]
-struct SyntaxLayerEntry {
-    depth: usize,
-    range: Range<Anchor>,
-    content: SyntaxLayerContent,
-}
-
-#[derive(Clone)]
-enum SyntaxLayerContent {
-    Parsed {
-        tree: tree_sitter::Tree,
-        language: Arc<Language>,
-        included_sub_ranges: Option<Vec<Range<Anchor>>>,
-    },
-    Pending {
-        language_name: Arc<str>,
-    },
-}
-
-impl SyntaxLayerContent {
-    fn language_id(&self) -> Option<LanguageId> {
-        match self {
-            SyntaxLayerContent::Parsed { language, .. } => Some(language.id),
-            SyntaxLayerContent::Pending { .. } => None,
-        }
-    }
-
-    fn tree(&self) -> Option<&Tree> {
-        match self {
-            SyntaxLayerContent::Parsed { tree, .. } => Some(tree),
-            SyntaxLayerContent::Pending { .. } => None,
-        }
-    }
-}
-
-/// A layer of syntax highlighting, corresponding to a single syntax
-/// tree in a particular language.
-#[derive(Debug)]
-pub struct SyntaxLayer<'a> {
-    /// The language for this layer.
-    pub language: &'a Arc<Language>,
-    pub included_sub_ranges: Option<&'a [Range<Anchor>]>,
-    pub(crate) depth: usize,
-    tree: &'a Tree,
-    pub(crate) offset: (usize, tree_sitter::Point),
-}
-
-/// A layer of syntax highlighting. Like [SyntaxLayer], but holding
-/// owned data instead of references.
-#[derive(Clone)]
-pub struct OwnedSyntaxLayer {
-    /// The language for this layer.
-    pub language: Arc<Language>,
-    tree: tree_sitter::Tree,
-    pub offset: (usize, tree_sitter::Point),
-}
-
-#[derive(Debug, Clone)]
-struct SyntaxLayerSummary {
-    min_depth: usize,
-    max_depth: usize,
-    range: Range<Anchor>,
-    last_layer_range: Range<Anchor>,
-    last_layer_language: Option<LanguageId>,
-    contains_unknown_injections: bool,
-}
-
-#[derive(Clone, Debug)]
-struct SyntaxLayerPosition {
-    depth: usize,
-    range: Range<Anchor>,
-    language: Option<LanguageId>,
-}
-
-#[derive(Clone, Debug)]
-struct ChangeStartPosition {
-    depth: usize,
-    position: Anchor,
-}
-
-#[derive(Clone, Debug)]
-struct SyntaxLayerPositionBeforeChange {
-    position: SyntaxLayerPosition,
-    change: ChangeStartPosition,
-}
-
-struct ParseStep {
-    depth: usize,
-    language: ParseStepLanguage,
-    range: Range<Anchor>,
-    included_ranges: Vec<tree_sitter::Range>,
-    mode: ParseMode,
-}
-
-#[derive(Debug)]
-enum ParseStepLanguage {
-    Loaded { language: Arc<Language> },
-    Pending { name: Arc<str> },
-}
-
-impl ParseStepLanguage {
-    fn name(&self) -> SharedString {
-        match self {
-            ParseStepLanguage::Loaded { language } => language.name().0,
-            ParseStepLanguage::Pending { name } => name.into(),
-        }
-    }
-
-    fn id(&self) -> Option<LanguageId> {
-        match self {
-            ParseStepLanguage::Loaded { language } => Some(language.id),
-            ParseStepLanguage::Pending { .. } => None,
-        }
-    }
-}
-
-enum ParseMode {
-    Single,
-    Combined {
-        parent_layer_range: Range<usize>,
-        parent_layer_changed_ranges: Vec<Range<usize>>,
-    },
-}
-
-#[derive(Debug, PartialEq, Eq)]
-struct ChangedRegion {
-    depth: usize,
-    range: Range<Anchor>,
-}
-
-#[derive(Default)]
-struct ChangeRegionSet(Vec<ChangedRegion>);
-
-struct TextProvider<'a>(&'a Rope);
-
-struct ByteChunks<'a>(text::Chunks<'a>);
-
-pub(crate) struct QueryCursorHandle(Option<QueryCursor>);
-
-impl SyntaxMap {
-    pub fn new(text: &BufferSnapshot) -> Self {
-        Self {
-            snapshot: SyntaxSnapshot::new(text),
-            language_registry: None,
-        }
-    }
-
-    pub fn set_language_registry(&mut self, registry: Arc<LanguageRegistry>) {
-        self.language_registry = Some(registry);
-    }
-
-    pub fn snapshot(&self) -> SyntaxSnapshot {
-        self.snapshot.clone()
-    }
-
-    pub fn language_registry(&self) -> Option<Arc<LanguageRegistry>> {
-        self.language_registry.clone()
-    }
-
-    pub fn interpolate(&mut self, text: &BufferSnapshot) {
-        self.snapshot.interpolate(text);
-    }
-
-    #[cfg(test)]
-    pub fn reparse(&mut self, language: Arc<Language>, text: &BufferSnapshot) {
-        self.snapshot
-            .reparse(text, self.language_registry.clone(), language);
-    }
-
-    pub fn did_parse(&mut self, snapshot: SyntaxSnapshot) {
-        self.snapshot = snapshot;
-    }
-
-    pub fn clear(&mut self, text: &BufferSnapshot) {
-        let update_count = self.snapshot.update_count + 1;
-        self.snapshot = SyntaxSnapshot::new(text);
-        self.snapshot.update_count = update_count;
-    }
-}
-
-impl SyntaxSnapshot {
-    fn new(text: &BufferSnapshot) -> Self {
-        Self {
-            layers: SumTree::new(text),
-            parsed_version: clock::Global::default(),
-            interpolated_version: clock::Global::default(),
-            language_registry_version: 0,
-            update_count: 0,
-        }
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.layers.is_empty()
-    }
-
-    pub fn root_language(&self) -> Option<Arc<Language>> {
-        match &self.layers.first()?.content {
-            SyntaxLayerContent::Parsed { language, .. } => Some(language.clone()),
-            SyntaxLayerContent::Pending { .. } => None,
-        }
-    }
-
-    pub fn update_count(&self) -> usize {
-        self.update_count
-    }
-
-    pub fn interpolate(&mut self, text: &BufferSnapshot) {
-        let edits = text
-            .anchored_edits_since::<Dimensions<usize, Point>>(&self.interpolated_version)
-            .collect::<Vec<_>>();
-        self.interpolated_version = text.version().clone();
-
-        if edits.is_empty() {
-            return;
-        }
-
-        let mut layers = SumTree::new(text);
-        let mut first_edit_ix_for_depth = 0;
-        let mut prev_depth = 0;
-        let mut cursor = self.layers.cursor::<SyntaxLayerSummary>(text);
-        cursor.next();
-
-        'outer: loop {
-            let depth = cursor.end().max_depth;
-            if depth > prev_depth {
-                first_edit_ix_for_depth = 0;
-                prev_depth = depth;
-            }
-
-            // Preserve any layers at this depth that precede the first edit.
-            if let Some((_, edit_range)) = edits.get(first_edit_ix_for_depth) {
-                let target = ChangeStartPosition {
-                    depth,
-                    position: edit_range.start,
-                };
-                if target.cmp(cursor.start(), text).is_gt() {
-                    let slice = cursor.slice(&target, Bias::Left);
-                    layers.append(slice, text);
-                }
-            }
-            // If this layer follows all of the edits, then preserve it and any
-            // subsequent layers at this same depth.
-            else if cursor.item().is_some() {
-                let slice = cursor.slice(
-                    &SyntaxLayerPosition {
-                        depth: depth + 1,
-                        range: Anchor::min_max_range_for_buffer(text.remote_id()),
-                        language: None,
-                    },
-                    Bias::Left,
-                );
-                layers.append(slice, text);
-                continue;
-            };
-
-            let Some(layer) = cursor.item() else { break };
-            let Dimensions(start_byte, start_point, _) =
-                layer.range.start.summary::<Dimensions<usize, Point>>(text);
-
-            // Ignore edits that end before the start of this layer, and don't consider them
-            // for any subsequent layers at this same depth.
-            loop {
-                let Some((_, edit_range)) = edits.get(first_edit_ix_for_depth) else {
-                    continue 'outer;
-                };
-                if edit_range.end.cmp(&layer.range.start, text).is_le() {
-                    first_edit_ix_for_depth += 1;
-                } else {
-                    break;
-                }
-            }
-
-            let mut layer = layer.clone();
-            if let SyntaxLayerContent::Parsed { tree, .. } = &mut layer.content {
-                for (edit, edit_range) in &edits[first_edit_ix_for_depth..] {
-                    // Ignore any edits that follow this layer.
-                    if edit_range.start.cmp(&layer.range.end, text).is_ge() {
-                        break;
-                    }
-
-                    // Apply any edits that intersect this layer to the layer's syntax tree.
-                    let tree_edit = if edit_range.start.cmp(&layer.range.start, text).is_ge() {
-                        tree_sitter::InputEdit {
-                            start_byte: edit.new.start.0 - start_byte,
-                            old_end_byte: edit.new.start.0 - start_byte
-                                + (edit.old.end.0 - edit.old.start.0),
-                            new_end_byte: edit.new.end.0 - start_byte,
-                            start_position: (edit.new.start.1 - start_point).to_ts_point(),
-                            old_end_position: (edit.new.start.1 - start_point
-                                + (edit.old.end.1 - edit.old.start.1))
-                                .to_ts_point(),
-                            new_end_position: (edit.new.end.1 - start_point).to_ts_point(),
-                        }
-                    } else {
-                        let node = tree.root_node();
-                        tree_sitter::InputEdit {
-                            start_byte: 0,
-                            old_end_byte: node.end_byte(),
-                            new_end_byte: 0,
-                            start_position: Default::default(),
-                            old_end_position: node.end_position(),
-                            new_end_position: Default::default(),
-                        }
-                    };
-
-                    tree.edit(&tree_edit);
-                }
-
-                debug_assert!(
-                    tree.root_node().end_byte() <= text.len(),
-                    "tree's size {}, is larger than text size {}",
-                    tree.root_node().end_byte(),
-                    text.len(),
-                );
-            }
-
-            layers.push(layer, text);
-            cursor.next();
-        }
-
-        layers.append(cursor.suffix(), text);
-        drop(cursor);
-        self.layers = layers;
-    }
-
-    pub fn reparse(
-        &mut self,
-        text: &BufferSnapshot,
-        registry: Option<Arc<LanguageRegistry>>,
-        root_language: Arc<Language>,
-    ) {
-        let edit_ranges = text
-            .edits_since::<usize>(&self.parsed_version)
-            .map(|edit| edit.new)
-            .collect::<Vec<_>>();
-        self.reparse_with_ranges(text, root_language.clone(), edit_ranges, registry.as_ref());
-
-        if let Some(registry) = registry
-            && registry.version() != self.language_registry_version
-        {
-            let mut resolved_injection_ranges = Vec::new();
-            let mut cursor = self
-                .layers
-                .filter::<_, ()>(text, |summary| summary.contains_unknown_injections);
-            cursor.next();
-            while let Some(layer) = cursor.item() {
-                let SyntaxLayerContent::Pending { language_name } = &layer.content else {
-                    unreachable!()
-                };
-                if registry
-                    .language_for_name_or_extension(language_name)
-                    .now_or_never()
-                    .and_then(|language| language.ok())
-                    .is_some()
-                {
-                    let range = layer.range.to_offset(text);
-                    log::trace!("reparse range {range:?} for language {language_name:?}");
-                    resolved_injection_ranges.push(range);
-                }
-
-                cursor.next();
-            }
-            drop(cursor);
-
-            if !resolved_injection_ranges.is_empty() {
-                self.reparse_with_ranges(
-                    text,
-                    root_language,
-                    resolved_injection_ranges,
-                    Some(&registry),
-                );
-            }
-            self.language_registry_version = registry.version();
-        }
-
-        self.update_count += 1;
-    }
-
-    fn reparse_with_ranges(
-        &mut self,
-        text: &BufferSnapshot,
-        root_language: Arc<Language>,
-        invalidated_ranges: Vec<Range<usize>>,
-        registry: Option<&Arc<LanguageRegistry>>,
-    ) {
-        log::trace!(
-            "reparse. invalidated ranges:{:?}",
-            LogOffsetRanges(&invalidated_ranges, text),
-        );
-
-        let max_depth = self.layers.summary().max_depth;
-        let mut cursor = self.layers.cursor::<SyntaxLayerSummary>(text);
-        cursor.next();
-        let mut layers = SumTree::new(text);
-
-        let mut changed_regions = ChangeRegionSet::default();
-        let mut queue = BinaryHeap::new();
-        let mut combined_injection_ranges = HashMap::default();
-        queue.push(ParseStep {
-            depth: 0,
-            language: ParseStepLanguage::Loaded {
-                language: root_language,
-            },
-            included_ranges: vec![tree_sitter::Range {
-                start_byte: 0,
-                end_byte: text.len(),
-                start_point: Point::zero().to_ts_point(),
-                end_point: text.max_point().to_ts_point(),
-            }],
-            range: Anchor::min_max_range_for_buffer(text.remote_id()),
-            mode: ParseMode::Single,
-        });
-
-        loop {
-            let step = queue.pop();
-            let position = if let Some(step) = &step {
-                log::trace!(
-                    "parse step depth:{}, range:{:?}, language:{} ({:?})",
-                    step.depth,
-                    LogAnchorRange(&step.range, text),
-                    step.language.name(),
-                    step.language.id(),
-                );
-                SyntaxLayerPosition {
-                    depth: step.depth,
-                    range: step.range.clone(),
-                    language: step.language.id(),
-                }
-            } else {
-                SyntaxLayerPosition {
-                    depth: max_depth + 1,
-                    range: Anchor::min_max_range_for_buffer(text.remote_id()),
-                    language: None,
-                }
-            };
-
-            let mut done = cursor.item().is_none();
-            while !done && position.cmp(&cursor.end(), text).is_gt() {
-                done = true;
-
-                let bounded_position = SyntaxLayerPositionBeforeChange {
-                    position: position.clone(),
-                    change: changed_regions.start_position(),
-                };
-                if bounded_position.cmp(cursor.start(), text).is_gt() {
-                    let slice = cursor.slice(&bounded_position, Bias::Left);
-                    if !slice.is_empty() {
-                        layers.append(slice, text);
-                        if changed_regions.prune(cursor.end(), text) {
-                            done = false;
-                        }
-                    }
-                }
-
-                while position.cmp(&cursor.end(), text).is_gt() {
-                    let Some(layer) = cursor.item() else { break };
-
-                    if changed_regions.intersects(layer, text) {
-                        if let SyntaxLayerContent::Parsed { language, .. } = &layer.content {
-                            log::trace!(
-                                "discard layer. language:{}, range:{:?}. changed_regions:{:?}",
-                                language.name(),
-                                LogAnchorRange(&layer.range, text),
-                                LogChangedRegions(&changed_regions, text),
-                            );
-                        }
-
-                        changed_regions.insert(
-                            ChangedRegion {
-                                depth: layer.depth + 1,
-                                range: layer.range.clone(),
-                            },
-                            text,
-                        );
-                    } else {
-                        layers.push(layer.clone(), text);
-                    }
-
-                    cursor.next();
-                    if changed_regions.prune(cursor.end(), text) {
-                        done = false;
-                    }
-                }
-            }
-
-            let Some(step) = step else { break };
-            let Dimensions(step_start_byte, step_start_point, _) =
-                step.range.start.summary::<Dimensions<usize, Point>>(text);
-            let step_end_byte = step.range.end.to_offset(text);
-
-            let mut old_layer = cursor.item();
-            if let Some(layer) = old_layer {
-                if layer.range.to_offset(text) == (step_start_byte..step_end_byte)
-                    && layer.content.language_id() == step.language.id()
-                {
-                    cursor.next();
-                } else {
-                    old_layer = None;
-                }
-            }
-
-            let content = match step.language {
-                ParseStepLanguage::Loaded { language } => {
-                    let Some(grammar) = language.grammar() else {
-                        continue;
-                    };
-                    let tree;
-                    let changed_ranges;
-
-                    let mut included_ranges = step.included_ranges;
-                    let is_combined = matches!(step.mode, ParseMode::Combined { .. });
-
-                    for range in &mut included_ranges {
-                        range.start_byte -= step_start_byte;
-                        range.end_byte -= step_start_byte;
-                        range.start_point = (Point::from_ts_point(range.start_point)
-                            - step_start_point)
-                            .to_ts_point();
-                        range.end_point = (Point::from_ts_point(range.end_point)
-                            - step_start_point)
-                            .to_ts_point();
-                    }
-
-                    if let Some((SyntaxLayerContent::Parsed { tree: old_tree, .. }, layer_range)) =
-                        old_layer.map(|layer| (&layer.content, layer.range.clone()))
-                    {
-                        log::trace!(
-                            "existing layer. language:{}, range:{:?}, included_ranges:{:?}",
-                            language.name(),
-                            LogAnchorRange(&layer_range, text),
-                            LogIncludedRanges(&old_tree.included_ranges())
-                        );
-
-                        if let ParseMode::Combined {
-                            mut parent_layer_changed_ranges,
-                            ..
-                        } = step.mode
-                        {
-                            for range in &mut parent_layer_changed_ranges {
-                                range.start = range.start.saturating_sub(step_start_byte);
-                                range.end = range.end.saturating_sub(step_start_byte);
-                            }
-
-                            let changed_indices;
-                            (included_ranges, changed_indices) = splice_included_ranges(
-                                old_tree.included_ranges(),
-                                &parent_layer_changed_ranges,
-                                &included_ranges,
-                            );
-                            insert_newlines_between_ranges(
-                                changed_indices,
-                                &mut included_ranges,
-                                text,
-                                step_start_byte,
-                                step_start_point,
-                            );
-                        }
-
-                        if included_ranges.is_empty() {
-                            included_ranges.push(tree_sitter::Range {
-                                start_byte: 0,
-                                end_byte: 0,
-                                start_point: Default::default(),
-                                end_point: Default::default(),
-                            });
-                        }
-
-                        log::trace!(
-                            "update layer. language:{}, range:{:?}, included_ranges:{:?}",
-                            language.name(),
-                            LogAnchorRange(&step.range, text),
-                            LogIncludedRanges(&included_ranges),
-                        );
-
-                        let result = parse_text(
-                            grammar,
-                            text.as_rope(),
-                            step_start_byte,
-                            &included_ranges,
-                            Some(old_tree.clone()),
-                        );
-                        match result {
-                            Ok(t) => tree = t,
-                            Err(e) => {
-                                log::error!("error parsing text: {:?}", e);
-                                continue;
-                            }
-                        };
-
-                        changed_ranges = join_ranges(
-                            invalidated_ranges
-                                .iter()
-                                .filter(|&range| {
-                                    range.start <= step_end_byte && range.end >= step_start_byte
-                                })
-                                .cloned(),
-                            old_tree.changed_ranges(&tree).map(|r| {
-                                step_start_byte + r.start_byte..step_start_byte + r.end_byte
-                            }),
-                        );
-                    } else {
-                        if matches!(step.mode, ParseMode::Combined { .. }) {
-                            insert_newlines_between_ranges(
-                                0..included_ranges.len(),
-                                &mut included_ranges,
-                                text,
-                                step_start_byte,
-                                step_start_point,
-                            );
-                        }
-
-                        if included_ranges.is_empty() {
-                            included_ranges.push(tree_sitter::Range {
-                                start_byte: 0,
-                                end_byte: 0,
-                                start_point: Default::default(),
-                                end_point: Default::default(),
-                            });
-                        }
-
-                        log::trace!(
-                            "create layer. language:{}, range:{:?}, included_ranges:{:?}",
-                            language.name(),
-                            LogAnchorRange(&step.range, text),
-                            LogIncludedRanges(&included_ranges),
-                        );
-
-                        let result = parse_text(
-                            grammar,
-                            text.as_rope(),
-                            step_start_byte,
-                            &included_ranges,
-                            None,
-                        );
-                        match result {
-                            Ok(t) => tree = t,
-                            Err(e) => {
-                                log::error!("error parsing text: {:?}", e);
-                                continue;
-                            }
-                        };
-                        changed_ranges = vec![step_start_byte..step_end_byte];
-                    }
-
-                    if let (Some((config, registry)), false) = (
-                        grammar.injection_config.as_ref().zip(registry.as_ref()),
-                        changed_ranges.is_empty(),
-                    ) {
-                        for range in &changed_ranges {
-                            changed_regions.insert(
-                                ChangedRegion {
-                                    depth: step.depth + 1,
-                                    range: text.anchor_before(range.start)
-                                        ..text.anchor_after(range.end),
-                                },
-                                text,
-                            );
-                        }
-                        get_injections(
-                            config,
-                            text,
-                            step.range.clone(),
-                            tree.root_node_with_offset(
-                                step_start_byte,
-                                step_start_point.to_ts_point(),
-                            ),
-                            registry,
-                            step.depth + 1,
-                            &changed_ranges,
-                            &mut combined_injection_ranges,
-                            &mut queue,
-                        );
-                    }
-
-                    let included_sub_ranges: Option<Vec<Range<Anchor>>> = if is_combined {
-                        Some(
-                            included_ranges
-                                .into_iter()
-                                .filter(|r| r.start_byte < r.end_byte)
-                                .map(|r| {
-                                    text.anchor_before(r.start_byte + step_start_byte)
-                                        ..text.anchor_after(r.end_byte + step_start_byte)
-                                })
-                                .collect(),
-                        )
-                    } else {
-                        None
-                    };
-                    SyntaxLayerContent::Parsed {
-                        tree,
-                        language,
-                        included_sub_ranges,
-                    }
-                }
-                ParseStepLanguage::Pending { name } => SyntaxLayerContent::Pending {
-                    language_name: name,
-                },
-            };
-
-            layers.push(
-                SyntaxLayerEntry {
-                    depth: step.depth,
-                    range: step.range,
-                    content,
-                },
-                text,
-            );
-        }
-
-        drop(cursor);
-        self.layers = layers;
-        self.interpolated_version = text.version.clone();
-        self.parsed_version = text.version.clone();
-        #[cfg(debug_assertions)]
-        self.check_invariants(text);
-    }
-
-    #[cfg(debug_assertions)]
-    fn check_invariants(&self, text: &BufferSnapshot) {
-        let mut max_depth = 0;
-        let mut prev_layer: Option<(Range<Anchor>, Option<LanguageId>)> = None;
-        for layer in self.layers.iter() {
-            match Ord::cmp(&layer.depth, &max_depth) {
-                Ordering::Less => {
-                    panic!("layers out of order")
-                }
-                Ordering::Equal => {
-                    if let Some((prev_range, prev_language_id)) = prev_layer {
-                        match layer.range.start.cmp(&prev_range.start, text) {
-                            Ordering::Less => panic!("layers out of order"),
-                            Ordering::Equal => match layer.range.end.cmp(&prev_range.end, text) {
-                                Ordering::Less => panic!("layers out of order"),
-                                Ordering::Equal => {
-                                    if layer.content.language_id() < prev_language_id {
-                                        panic!("layers out of order")
-                                    }
-                                }
-                                Ordering::Greater => {}
-                            },
-                            Ordering::Greater => {}
-                        }
-                    }
-                    prev_layer = Some((layer.range.clone(), layer.content.language_id()));
-                }
-                Ordering::Greater => {
-                    prev_layer = None;
-                }
-            }
-
-            max_depth = layer.depth;
-        }
-    }
-
-    pub fn single_tree_captures<'a>(
-        range: Range<usize>,
-        text: &'a Rope,
-        tree: &'a Tree,
-        language: &'a Arc<Language>,
-        query: fn(&Grammar) -> Option<&Query>,
-    ) -> SyntaxMapCaptures<'a> {
-        SyntaxMapCaptures::new(
-            range,
-            text,
-            [SyntaxLayer {
-                language,
-                tree,
-                included_sub_ranges: None,
-                depth: 0,
-                offset: (0, tree_sitter::Point::new(0, 0)),
-            }]
-            .into_iter(),
-            query,
-        )
-    }
-
-    pub fn captures<'a>(
-        &'a self,
-        range: Range<usize>,
-        buffer: &'a BufferSnapshot,
-        query: fn(&Grammar) -> Option<&Query>,
-    ) -> SyntaxMapCaptures<'a> {
-        SyntaxMapCaptures::new(
-            range.clone(),
-            buffer.as_rope(),
-            self.layers_for_range(range, buffer, true),
-            query,
-        )
-    }
-
-    pub fn matches<'a>(
-        &'a self,
-        range: Range<usize>,
-        buffer: &'a BufferSnapshot,
-        query: fn(&Grammar) -> Option<&Query>,
-    ) -> SyntaxMapMatches<'a> {
-        SyntaxMapMatches::new(
-            range.clone(),
-            buffer.as_rope(),
-            self.layers_for_range(range, buffer, true),
-            query,
-            TreeSitterOptions::default(),
-        )
-    }
-
-    pub fn matches_with_options<'a>(
-        &'a self,
-        range: Range<usize>,
-        buffer: &'a BufferSnapshot,
-        options: TreeSitterOptions,
-        query: fn(&Grammar) -> Option<&Query>,
-    ) -> SyntaxMapMatches<'a> {
-        SyntaxMapMatches::new(
-            range.clone(),
-            buffer.as_rope(),
-            self.layers_for_range(range, buffer, true),
-            query,
-            options,
-        )
-    }
-
-    #[cfg(test)]
-    pub fn layers<'a>(&'a self, buffer: &'a BufferSnapshot) -> Vec<SyntaxLayer<'a>> {
-        self.layers_for_range(0..buffer.len(), buffer, true)
-            .collect()
-    }
-
-    pub fn layers_for_range<'a, T: ToOffset>(
-        &'a self,
-        range: Range<T>,
-        buffer: &'a BufferSnapshot,
-        include_hidden: bool,
-    ) -> impl 'a + Iterator<Item = SyntaxLayer<'a>> {
-        let start_offset = range.start.to_offset(buffer);
-        let end_offset = range.end.to_offset(buffer);
-        let start = buffer.anchor_before(start_offset);
-        let end = buffer.anchor_after(end_offset);
-
-        let mut cursor = self.layers.filter::<_, ()>(buffer, move |summary| {
-            if summary.max_depth > summary.min_depth {
-                true
-            } else {
-                let is_before_start = summary.range.end.cmp(&start, buffer).is_lt();
-                let is_after_end = summary.range.start.cmp(&end, buffer).is_gt();
-                !is_before_start && !is_after_end
-            }
-        });
-
-        cursor.next();
-        iter::from_fn(move || {
-            while let Some(layer) = cursor.item() {
-                let mut info = None;
-                if let SyntaxLayerContent::Parsed {
-                    tree,
-                    language,
-                    included_sub_ranges,
-                } = &layer.content
-                {
-                    let layer_start_offset = layer.range.start.to_offset(buffer);
-                    let layer_start_point = layer.range.start.to_point(buffer).to_ts_point();
-                    if include_hidden || !language.config.hidden {
-                        info = Some(SyntaxLayer {
-                            tree,
-                            language,
-                            included_sub_ranges: included_sub_ranges.as_deref(),
-                            depth: layer.depth,
-                            offset: (layer_start_offset, layer_start_point),
-                        });
-                    }
-                }
-                cursor.next();
-                if info.is_some() {
-                    return info;
-                }
-            }
-            None
-        })
-    }
-
-    pub fn contains_unknown_injections(&self) -> bool {
-        self.layers.summary().contains_unknown_injections
-    }
-
-    pub fn language_registry_version(&self) -> usize {
-        self.language_registry_version
-    }
-}
-
-impl<'a> SyntaxMapCaptures<'a> {
-    fn new(
-        range: Range<usize>,
-        text: &'a Rope,
-        layers: impl Iterator<Item = SyntaxLayer<'a>>,
-        query: fn(&Grammar) -> Option<&Query>,
-    ) -> Self {
-        let mut result = Self {
-            layers: Vec::new(),
-            grammars: Vec::new(),
-            active_layer_count: 0,
-        };
-        for layer in layers {
-            let grammar = match &layer.language.grammar {
-                Some(grammar) => grammar,
-                None => continue,
-            };
-            let query = match query(grammar) {
-                Some(query) => query,
-                None => continue,
-            };
-
-            let mut query_cursor = QueryCursorHandle::new();
-
-            // TODO - add a Tree-sitter API to remove the need for this.
-            let cursor = unsafe {
-                std::mem::transmute::<&mut tree_sitter::QueryCursor, &'static mut QueryCursor>(
-                    query_cursor.deref_mut(),
-                )
-            };
-
-            cursor.set_byte_range(range.clone());
-            let captures = cursor.captures(query, layer.node(), TextProvider(text));
-            let grammar_index = result
-                .grammars
-                .iter()
-                .position(|g| g.id == grammar.id())
-                .unwrap_or_else(|| {
-                    result.grammars.push(grammar);
-                    result.grammars.len() - 1
-                });
-            let mut layer = SyntaxMapCapturesLayer {
-                depth: layer.depth,
-                grammar_index,
-                next_capture: None,
-                captures,
-                _query_cursor: query_cursor,
-            };
-
-            layer.advance();
-            if layer.next_capture.is_some() {
-                let key = layer.sort_key();
-                let ix = match result.layers[..result.active_layer_count]
-                    .binary_search_by_key(&key, |layer| layer.sort_key())
-                {
-                    Ok(ix) | Err(ix) => ix,
-                };
-                result.layers.insert(ix, layer);
-                result.active_layer_count += 1;
-            } else {
-                result.layers.push(layer);
-            }
-        }
-
-        result
-    }
-
-    pub fn grammars(&self) -> &[&'a Grammar] {
-        &self.grammars
-    }
-
-    pub fn peek(&self) -> Option<SyntaxMapCapture<'a>> {
-        let layer = self.layers[..self.active_layer_count].first()?;
-        let capture = layer.next_capture?;
-        Some(SyntaxMapCapture {
-            grammar_index: layer.grammar_index,
-            index: capture.index,
-            node: capture.node,
-        })
-    }
-
-    pub fn advance(&mut self) -> bool {
-        let layer = if let Some(layer) = self.layers[..self.active_layer_count].first_mut() {
-            layer
-        } else {
-            return false;
-        };
-
-        layer.advance();
-        if layer.next_capture.is_some() {
-            let key = layer.sort_key();
-            let i = 1 + self.layers[1..self.active_layer_count]
-                .iter()
-                .position(|later_layer| key < later_layer.sort_key())
-                .unwrap_or(self.active_layer_count - 1);
-            self.layers[0..i].rotate_left(1);
-        } else {
-            self.layers[0..self.active_layer_count].rotate_left(1);
-            self.active_layer_count -= 1;
-        }
-
-        true
-    }
-
-    pub fn set_byte_range(&mut self, range: Range<usize>) {
-        for layer in &mut self.layers {
-            layer.captures.set_byte_range(range.clone());
-            if let Some(capture) = &layer.next_capture
-                && capture.node.end_byte() > range.start
-            {
-                continue;
-            }
-            layer.advance();
-        }
-        self.layers.sort_unstable_by_key(|layer| layer.sort_key());
-        self.active_layer_count = self
-            .layers
-            .iter()
-            .position(|layer| layer.next_capture.is_none())
-            .unwrap_or(self.layers.len());
-    }
-}
-
-#[derive(Default)]
-pub struct TreeSitterOptions {
-    max_start_depth: Option<u32>,
-}
-impl TreeSitterOptions {
-    pub fn max_start_depth(max_start_depth: u32) -> Self {
-        Self {
-            max_start_depth: Some(max_start_depth),
-        }
-    }
-}
-
-impl<'a> SyntaxMapMatches<'a> {
-    fn new(
-        range: Range<usize>,
-        text: &'a Rope,
-        layers: impl Iterator<Item = SyntaxLayer<'a>>,
-        query: fn(&Grammar) -> Option<&Query>,
-        options: TreeSitterOptions,
-    ) -> Self {
-        let mut result = Self::default();
-        for layer in layers {
-            let grammar = match &layer.language.grammar {
-                Some(grammar) => grammar,
-                None => continue,
-            };
-            let query = match query(grammar) {
-                Some(query) => query,
-                None => continue,
-            };
-
-            let mut query_cursor = QueryCursorHandle::new();
-
-            // TODO - add a Tree-sitter API to remove the need for this.
-            let cursor = unsafe {
-                std::mem::transmute::<&mut tree_sitter::QueryCursor, &'static mut QueryCursor>(
-                    query_cursor.deref_mut(),
-                )
-            };
-            cursor.set_max_start_depth(options.max_start_depth);
-
-            cursor.set_byte_range(range.clone());
-            let matches = cursor.matches(query, layer.node(), TextProvider(text));
-            let grammar_index = result
-                .grammars
-                .iter()
-                .position(|g| g.id == grammar.id())
-                .unwrap_or_else(|| {
-                    result.grammars.push(grammar);
-                    result.grammars.len() - 1
-                });
-            let mut layer = SyntaxMapMatchesLayer {
-                language: layer.language.clone(),
-                depth: layer.depth,
-                grammar_index,
-                matches,
-                next_pattern_index: 0,
-                next_captures: Vec::new(),
-                has_next: false,
-                _query_cursor: query_cursor,
-            };
-
-            layer.advance();
-            if layer.has_next {
-                let key = layer.sort_key();
-                let ix = match result.layers[..result.active_layer_count]
-                    .binary_search_by_key(&key, |layer| layer.sort_key())
-                {
-                    Ok(ix) | Err(ix) => ix,
-                };
-                result.layers.insert(ix, layer);
-                result.active_layer_count += 1;
-            } else {
-                result.layers.push(layer);
-            }
-        }
-        result
-    }
-
-    pub fn grammars(&self) -> &[&'a Grammar] {
-        &self.grammars
-    }
-
-    pub fn peek(&self) -> Option<SyntaxMapMatch<'_>> {
-        let layer = self.layers.first()?;
-
-        if !layer.has_next {
-            return None;
-        }
-
-        Some(SyntaxMapMatch {
-            language: layer.language.clone(),
-            depth: layer.depth,
-            grammar_index: layer.grammar_index,
-            pattern_index: layer.next_pattern_index,
-            captures: &layer.next_captures,
-        })
-    }
-
-    pub fn advance(&mut self) -> bool {
-        let layer = if let Some(layer) = self.layers.first_mut() {
-            layer
-        } else {
-            return false;
-        };
-
-        layer.advance();
-        if layer.has_next {
-            let key = layer.sort_key();
-            let i = 1 + self.layers[1..self.active_layer_count]
-                .iter()
-                .position(|later_layer| key < later_layer.sort_key())
-                .unwrap_or(self.active_layer_count - 1);
-            self.layers[0..i].rotate_left(1);
-        } else if self.active_layer_count != 0 {
-            self.layers[0..self.active_layer_count].rotate_left(1);
-            self.active_layer_count -= 1;
-        }
-
-        true
-    }
-
-    // pub fn set_byte_range(&mut self, range: Range<usize>) {
-    //     for layer in &mut self.layers {
-    //         layer.matches.set_byte_range(range.clone());
-    //         layer.advance();
-    //     }
-    //     self.layers.sort_unstable_by_key(|layer| layer.sort_key());
-    //     self.active_layer_count = self
-    //         .layers
-    //         .iter()
-    //         .position(|layer| !layer.has_next)
-    //         .unwrap_or(self.layers.len());
-    // }
-}
-
-impl SyntaxMapCapturesLayer<'_> {
-    fn advance(&mut self) {
-        self.next_capture = self.captures.next().map(|(mat, ix)| mat.captures[*ix]);
-    }
-
-    fn sort_key(&self) -> (usize, Reverse<usize>, usize) {
-        if let Some(capture) = &self.next_capture {
-            let range = capture.node.byte_range();
-            (range.start, Reverse(range.end), self.depth)
-        } else {
-            (usize::MAX, Reverse(0), usize::MAX)
-        }
-    }
-}
-
-impl SyntaxMapMatchesLayer<'_> {
-    fn advance(&mut self) {
-        if let Some(mat) = self.matches.next() {
-            self.next_captures.clear();
-            self.next_captures.extend_from_slice(mat.captures);
-            self.next_pattern_index = mat.pattern_index;
-            self.has_next = true;
-        } else {
-            self.has_next = false;
-        }
-    }
-
-    fn sort_key(&self) -> (usize, Reverse<usize>, usize) {
-        if self.has_next {
-            let captures = &self.next_captures;
-            if let Some((first, last)) = captures.first().zip(captures.last()) {
-                return (
-                    first.node.start_byte(),
-                    Reverse(last.node.end_byte()),
-                    self.depth,
-                );
-            }
-        }
-        (usize::MAX, Reverse(0), usize::MAX)
-    }
-}
-
-impl<'a> Iterator for SyntaxMapCaptures<'a> {
-    type Item = SyntaxMapCapture<'a>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        let result = self.peek();
-        self.advance();
-        result
-    }
-}
-
-fn join_ranges(
-    a: impl Iterator<Item = Range<usize>>,
-    b: impl Iterator<Item = Range<usize>>,
-) -> Vec<Range<usize>> {
-    let mut result = Vec::<Range<usize>>::new();
-    let mut a = a.peekable();
-    let mut b = b.peekable();
-    loop {
-        let range = match (a.peek(), b.peek()) {
-            (Some(range_a), Some(range_b)) => {
-                if range_a.start < range_b.start {
-                    a.next().unwrap()
-                } else {
-                    b.next().unwrap()
-                }
-            }
-            (None, Some(_)) => b.next().unwrap(),
-            (Some(_), None) => a.next().unwrap(),
-            (None, None) => break,
-        };
-
-        if let Some(last) = result.last_mut()
-            && range.start <= last.end
-        {
-            last.end = last.end.max(range.end);
-            continue;
-        }
-        result.push(range);
-    }
-    result
-}
-
-fn parse_text(
-    grammar: &Grammar,
-    text: &Rope,
-    start_byte: usize,
-    ranges: &[tree_sitter::Range],
-    old_tree: Option<Tree>,
-) -> anyhow::Result<Tree> {
-    with_parser(|parser| {
-        let mut chunks = text.chunks_in_range(start_byte..text.len());
-        parser.set_included_ranges(ranges)?;
-        parser.set_language(&grammar.ts_language)?;
-        parser
-            .parse_with_options(
-                &mut move |offset, _| {
-                    chunks.seek(start_byte + offset);
-                    chunks.next().unwrap_or("").as_bytes()
-                },
-                old_tree.as_ref(),
-                None,
-            )
-            .context("failed to parse")
-    })
-}
-
-fn get_injections(
-    config: &InjectionConfig,
-    text: &BufferSnapshot,
-    outer_range: Range<Anchor>,
-    node: Node,
-    language_registry: &Arc<LanguageRegistry>,
-    depth: usize,
-    changed_ranges: &[Range<usize>],
-    combined_injection_ranges: &mut HashMap<LanguageId, (Arc<Language>, Vec<tree_sitter::Range>)>,
-    queue: &mut BinaryHeap<ParseStep>,
-) {
-    let mut query_cursor = QueryCursorHandle::new();
-    let mut prev_match = None;
-
-    // Ensure that a `ParseStep` is created for every combined injection language, even
-    // if there currently no matches for that injection.
-    combined_injection_ranges.clear();
-    for pattern in &config.patterns {
-        if let (Some(language_name), true) = (pattern.language.as_ref(), pattern.combined)
-            && let Some(language) = language_registry
-                .language_for_name_or_extension(language_name)
-                .now_or_never()
-                .and_then(|language| language.ok())
-        {
-            combined_injection_ranges.insert(language.id, (language, Vec::new()));
-        }
-    }
-
-    for query_range in changed_ranges {
-        query_cursor.set_byte_range(query_range.start.saturating_sub(1)..query_range.end + 1);
-        let mut matches = query_cursor.matches(&config.query, node, TextProvider(text.as_rope()));
-        while let Some(mat) = matches.next() {
-            let content_ranges = mat
-                .nodes_for_capture_index(config.content_capture_ix)
-                .map(|node| node.range())
-                .collect::<Vec<_>>();
-            if content_ranges.is_empty() {
-                continue;
-            }
-
-            let content_range =
-                content_ranges.first().unwrap().start_byte..content_ranges.last().unwrap().end_byte;
-
-            // Avoid duplicate matches if two changed ranges intersect the same injection.
-            if let Some((prev_pattern_ix, prev_range)) = &prev_match
-                && mat.pattern_index == *prev_pattern_ix
-                && content_range == *prev_range
-            {
-                continue;
-            }
-
-            prev_match = Some((mat.pattern_index, content_range.clone()));
-            let combined = config.patterns[mat.pattern_index].combined;
-
-            let mut step_range = content_range.clone();
-            let language_name =
-                if let Some(name) = config.patterns[mat.pattern_index].language.as_ref() {
-                    Some(Cow::Borrowed(name.as_ref()))
-                } else if let Some(language_node) = config
-                    .language_capture_ix
-                    .and_then(|ix| mat.nodes_for_capture_index(ix).next())
-                {
-                    step_range.start = cmp::min(content_range.start, language_node.start_byte());
-                    step_range.end = cmp::max(content_range.end, language_node.end_byte());
-                    let language_name: String =
-                        text.text_for_range(language_node.byte_range()).collect();
-
-                    // Enable paths ending in a language extension to represent a language name: e.g. "foo/bar/baz.rs"
-                    if let Some(last_dot_pos) = language_name.rfind('.') {
-                        Some(Cow::Owned(language_name[last_dot_pos + 1..].to_string()))
-                    } else {
-                        Some(Cow::Owned(language_name))
-                    }
-                } else {
-                    None
-                };
-
-            if let Some(language_name) = language_name {
-                let language = language_registry
-                    .language_for_name_or_extension(&language_name)
-                    .now_or_never()
-                    .and_then(|language| language.ok());
-                let range = text.anchor_before(step_range.start)..text.anchor_after(step_range.end);
-                if let Some(language) = language {
-                    if combined {
-                        combined_injection_ranges
-                            .entry(language.id)
-                            .or_insert_with(|| (language.clone(), vec![]))
-                            .1
-                            .extend(content_ranges);
-                    } else {
-                        queue.push(ParseStep {
-                            depth,
-                            language: ParseStepLanguage::Loaded { language },
-                            included_ranges: content_ranges,
-                            range,
-                            mode: ParseMode::Single,
-                        });
-                    }
-                } else {
-                    queue.push(ParseStep {
-                        depth,
-                        language: ParseStepLanguage::Pending {
-                            name: language_name.into(),
-                        },
-                        included_ranges: content_ranges,
-                        range,
-                        mode: ParseMode::Single,
-                    });
-                }
-            }
-        }
-    }
-
-    for (_, (language, mut included_ranges)) in combined_injection_ranges.drain() {
-        included_ranges.sort_unstable_by(|a, b| {
-            Ord::cmp(&a.start_byte, &b.start_byte).then_with(|| Ord::cmp(&a.end_byte, &b.end_byte))
-        });
-        queue.push(ParseStep {
-            depth,
-            language: ParseStepLanguage::Loaded { language },
-            range: outer_range.clone(),
-            included_ranges,
-            mode: ParseMode::Combined {
-                parent_layer_range: node.start_byte()..node.end_byte(),
-                parent_layer_changed_ranges: changed_ranges.to_vec(),
-            },
-        })
-    }
-}
-
-/// Updates the given list of included `ranges`, removing any ranges that intersect
-/// `removed_ranges`, and inserting the given `new_ranges`.
-///
-/// Returns a new vector of ranges, and the range of the vector that was changed,
-/// from the previous `ranges` vector.
-pub(crate) fn splice_included_ranges(
-    mut ranges: Vec<tree_sitter::Range>,
-    removed_ranges: &[Range<usize>],
-    new_ranges: &[tree_sitter::Range],
-) -> (Vec<tree_sitter::Range>, Range<usize>) {
-    let mut removed_ranges = removed_ranges.iter().cloned().peekable();
-    let mut new_ranges = new_ranges.iter().cloned().peekable();
-    let mut ranges_ix = 0;
-    let mut changed_portion: Option<Range<usize>> = None;
-    loop {
-        let next_new_range = new_ranges.peek();
-        let next_removed_range = removed_ranges.peek();
-
-        let (remove, insert) = match (next_removed_range, next_new_range) {
-            (None, None) => break,
-            (Some(_), None) => (removed_ranges.next().unwrap(), None),
-            (Some(next_removed_range), Some(next_new_range)) => {
-                if next_removed_range.end < next_new_range.start_byte {
-                    (removed_ranges.next().unwrap(), None)
-                } else {
-                    let mut start = next_new_range.start_byte;
-                    let mut end = next_new_range.end_byte;
-
-                    while let Some(next_removed_range) = removed_ranges.peek() {
-                        if next_removed_range.start > next_new_range.end_byte {
-                            break;
-                        }
-                        let next_removed_range = removed_ranges.next().unwrap();
-                        start = cmp::min(start, next_removed_range.start);
-                        end = cmp::max(end, next_removed_range.end);
-                    }
-
-                    (start..end, Some(new_ranges.next().unwrap()))
-                }
-            }
-            (None, Some(next_new_range)) => (
-                next_new_range.start_byte..next_new_range.end_byte,
-                Some(new_ranges.next().unwrap()),
-            ),
-        };
-
-        let mut start_ix = ranges_ix
-            + match ranges[ranges_ix..].binary_search_by_key(&remove.start, |r| r.end_byte) {
-                Ok(ix) => ix,
-                Err(ix) => ix,
-            };
-        let mut end_ix = ranges_ix
-            + match ranges[ranges_ix..].binary_search_by_key(&remove.end, |r| r.start_byte) {
-                Ok(ix) => ix + 1,
-                Err(ix) => ix,
-            };
-
-        // If there are empty ranges, then there may be multiple ranges with the same
-        // start or end. Expand the splice to include any adjacent ranges that touch
-        // the changed range.
-        while start_ix > 0 {
-            if ranges[start_ix - 1].end_byte == remove.start {
-                start_ix -= 1;
-            } else {
-                break;
-            }
-        }
-        while let Some(range) = ranges.get(end_ix) {
-            if range.start_byte == remove.end {
-                end_ix += 1;
-            } else {
-                break;
-            }
-        }
-        let changed_start = changed_portion
-            .as_ref()
-            .map_or(usize::MAX, |range| range.start)
-            .min(start_ix);
-        let changed_end =
-            changed_portion
-                .as_ref()
-                .map_or(0, |range| range.end)
-                .max(if insert.is_some() {
-                    start_ix + 1
-                } else {
-                    start_ix
-                });
-        changed_portion = Some(changed_start..changed_end);
-
-        ranges.splice(start_ix..end_ix, insert);
-        ranges_ix = start_ix;
-    }
-
-    (ranges, changed_portion.unwrap_or(0..0))
-}
-
-/// Ensure there are newline ranges in between content range that appear on
-/// different lines. For performance, only iterate through the given range of
-/// indices. All of the ranges in the array are relative to a given start byte
-/// and point.
-fn insert_newlines_between_ranges(
-    indices: Range<usize>,
-    ranges: &mut Vec<tree_sitter::Range>,
-    text: &text::BufferSnapshot,
-    start_byte: usize,
-    start_point: Point,
-) {
-    let mut ix = indices.end + 1;
-    while ix > indices.start {
-        ix -= 1;
-        if 0 == ix || ix == ranges.len() {
-            continue;
-        }
-
-        let range_b = ranges[ix];
-        let range_a = &mut ranges[ix - 1];
-        if range_a.end_point.column == 0 {
-            continue;
-        }
-
-        if range_a.end_point.row < range_b.start_point.row {
-            let end_point = start_point + Point::from_ts_point(range_a.end_point);
-            let line_end = Point::new(end_point.row, text.line_len(end_point.row));
-            if end_point.column >= line_end.column {
-                range_a.end_byte += 1;
-                range_a.end_point.row += 1;
-                range_a.end_point.column = 0;
-            } else {
-                let newline_offset = text.point_to_offset(line_end);
-                ranges.insert(
-                    ix,
-                    tree_sitter::Range {
-                        start_byte: newline_offset - start_byte,
-                        end_byte: newline_offset - start_byte + 1,
-                        start_point: (line_end - start_point).to_ts_point(),
-                        end_point: ((line_end - start_point) + Point::new(1, 0)).to_ts_point(),
-                    },
-                )
-            }
-        }
-    }
-}
-
-impl OwnedSyntaxLayer {
-    /// Returns the root syntax node for this layer.
-    pub fn node(&self) -> Node<'_> {
-        self.tree
-            .root_node_with_offset(self.offset.0, self.offset.1)
-    }
-}
-
-impl<'a> SyntaxLayer<'a> {
-    /// Returns an owned version of this layer.
-    pub fn to_owned(&self) -> OwnedSyntaxLayer {
-        OwnedSyntaxLayer {
-            tree: self.tree.clone(),
-            offset: self.offset,
-            language: self.language.clone(),
-        }
-    }
-
-    /// Returns the root node for this layer.
-    pub fn node(&self) -> Node<'a> {
-        self.tree
-            .root_node_with_offset(self.offset.0, self.offset.1)
-    }
-
-    pub(crate) fn override_id(&self, offset: usize, text: &text::BufferSnapshot) -> Option<u32> {
-        let text = TextProvider(text.as_rope());
-        let config = self.language.grammar.as_ref()?.override_config.as_ref()?;
-
-        let mut query_cursor = QueryCursorHandle::new();
-        query_cursor.set_byte_range(offset.saturating_sub(1)..offset.saturating_add(1));
-
-        let mut smallest_match: Option<(u32, Range<usize>)> = None;
-        let mut matches = query_cursor.matches(&config.query, self.node(), text);
-        while let Some(mat) = matches.next() {
-            for capture in mat.captures {
-                let Some(override_entry) = config.values.get(&capture.index) else {
-                    continue;
-                };
-
-                let range = capture.node.byte_range();
-                if override_entry.range_is_inclusive {
-                    if offset < range.start || offset > range.end {
-                        continue;
-                    }
-                } else if offset <= range.start || offset >= range.end {
-                    continue;
-                }
-
-                if let Some((_, smallest_range)) = &smallest_match {
-                    if range.len() < smallest_range.len() {
-                        smallest_match = Some((capture.index, range))
-                    }
-                    continue;
-                }
-
-                smallest_match = Some((capture.index, range));
-            }
-        }
-
-        smallest_match.map(|(index, _)| index)
-    }
-}
-
-impl std::ops::Deref for SyntaxMap {
-    type Target = SyntaxSnapshot;
-
-    fn deref(&self) -> &Self::Target {
-        &self.snapshot
-    }
-}
-
-impl PartialEq for ParseStep {
-    fn eq(&self, _: &Self) -> bool {
-        false
-    }
-}
-
-impl Eq for ParseStep {}
-
-impl PartialOrd for ParseStep {
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-impl Ord for ParseStep {
-    fn cmp(&self, other: &Self) -> Ordering {
-        let range_a = self.range();
-        let range_b = other.range();
-        Ord::cmp(&other.depth, &self.depth)
-            .then_with(|| Ord::cmp(&range_b.start, &range_a.start))
-            .then_with(|| Ord::cmp(&range_a.end, &range_b.end))
-            .then_with(|| other.language.id().cmp(&self.language.id()))
-    }
-}
-
-impl ParseStep {
-    fn range(&self) -> Range<usize> {
-        if let ParseMode::Combined {
-            parent_layer_range, ..
-        } = &self.mode
-        {
-            parent_layer_range.clone()
-        } else {
-            let start = self.included_ranges.first().map_or(0, |r| r.start_byte);
-            let end = self.included_ranges.last().map_or(0, |r| r.end_byte);
-            start..end
-        }
-    }
-}
-
-impl ChangedRegion {
-    fn cmp(&self, other: &Self, buffer: &BufferSnapshot) -> Ordering {
-        let range_a = &self.range;
-        let range_b = &other.range;
-        Ord::cmp(&self.depth, &other.depth)
-            .then_with(|| range_a.start.cmp(&range_b.start, buffer))
-            .then_with(|| range_b.end.cmp(&range_a.end, buffer))
-    }
-}
-
-impl ChangeRegionSet {
-    fn start_position(&self) -> ChangeStartPosition {
-        self.0.first().map_or(
-            ChangeStartPosition {
-                depth: usize::MAX,
-                position: Anchor::MAX,
-            },
-            |region| ChangeStartPosition {
-                depth: region.depth,
-                position: region.range.start,
-            },
-        )
-    }
-
-    fn intersects(&self, layer: &SyntaxLayerEntry, text: &BufferSnapshot) -> bool {
-        for region in &self.0 {
-            if region.depth < layer.depth {
-                continue;
-            }
-            if region.depth > layer.depth {
-                break;
-            }
-            if region.range.end.cmp(&layer.range.start, text).is_le() {
-                continue;
-            }
-            if region.range.start.cmp(&layer.range.end, text).is_ge() {
-                break;
-            }
-            return true;
-        }
-        false
-    }
-
-    fn insert(&mut self, region: ChangedRegion, text: &BufferSnapshot) {
-        if let Err(ix) = self.0.binary_search_by(|probe| probe.cmp(&region, text)) {
-            self.0.insert(ix, region);
-        }
-    }
-
-    fn prune(&mut self, summary: SyntaxLayerSummary, text: &BufferSnapshot) -> bool {
-        let prev_len = self.0.len();
-        self.0.retain(|region| {
-            region.depth > summary.max_depth
-                || (region.depth == summary.max_depth
-                    && region
-                        .range
-                        .end
-                        .cmp(&summary.last_layer_range.start, text)
-                        .is_gt())
-        });
-        self.0.len() < prev_len
-    }
-}
-
-impl Default for SyntaxLayerSummary {
-    fn default() -> Self {
-        Self {
-            max_depth: 0,
-            min_depth: 0,
-            range: Anchor::MAX..Anchor::MIN,
-            last_layer_range: Anchor::MIN..Anchor::MAX,
-            last_layer_language: None,
-            contains_unknown_injections: false,
-        }
-    }
-}
-
-impl sum_tree::Summary for SyntaxLayerSummary {
-    type Context<'a> = &'a BufferSnapshot;
-
-    fn zero(_cx: &BufferSnapshot) -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, other: &Self, buffer: Self::Context<'_>) {
-        if other.max_depth > self.max_depth {
-            self.max_depth = other.max_depth;
-            self.range = other.range.clone();
-        } else {
-            if self.range == (Anchor::MAX..Anchor::MAX) {
-                self.range.start = other.range.start;
-            }
-            if other.range.end.cmp(&self.range.end, buffer).is_gt() {
-                self.range.end = other.range.end;
-            }
-        }
-        self.last_layer_range = other.last_layer_range.clone();
-        self.last_layer_language = other.last_layer_language;
-        self.contains_unknown_injections |= other.contains_unknown_injections;
-    }
-}
-
-impl SeekTarget<'_, SyntaxLayerSummary, SyntaxLayerSummary> for SyntaxLayerPosition {
-    fn cmp(&self, cursor_location: &SyntaxLayerSummary, buffer: &BufferSnapshot) -> Ordering {
-        Ord::cmp(&self.depth, &cursor_location.max_depth)
-            .then_with(|| {
-                self.range
-                    .start
-                    .cmp(&cursor_location.last_layer_range.start, buffer)
-            })
-            .then_with(|| {
-                cursor_location
-                    .last_layer_range
-                    .end
-                    .cmp(&self.range.end, buffer)
-            })
-            .then_with(|| self.language.cmp(&cursor_location.last_layer_language))
-    }
-}
-
-impl SeekTarget<'_, SyntaxLayerSummary, SyntaxLayerSummary> for ChangeStartPosition {
-    fn cmp(&self, cursor_location: &SyntaxLayerSummary, text: &BufferSnapshot) -> Ordering {
-        Ord::cmp(&self.depth, &cursor_location.max_depth)
-            .then_with(|| self.position.cmp(&cursor_location.range.end, text))
-    }
-}
-
-impl SeekTarget<'_, SyntaxLayerSummary, SyntaxLayerSummary> for SyntaxLayerPositionBeforeChange {
-    fn cmp(&self, cursor_location: &SyntaxLayerSummary, buffer: &BufferSnapshot) -> Ordering {
-        if self.change.cmp(cursor_location, buffer).is_le() {
-            Ordering::Less
-        } else {
-            self.position.cmp(cursor_location, buffer)
-        }
-    }
-}
-
-impl sum_tree::Item for SyntaxLayerEntry {
-    type Summary = SyntaxLayerSummary;
-
-    fn summary(&self, _cx: &BufferSnapshot) -> Self::Summary {
-        SyntaxLayerSummary {
-            min_depth: self.depth,
-            max_depth: self.depth,
-            range: self.range.clone(),
-            last_layer_range: self.range.clone(),
-            last_layer_language: self.content.language_id(),
-            contains_unknown_injections: matches!(self.content, SyntaxLayerContent::Pending { .. }),
-        }
-    }
-}
-
-impl std::fmt::Debug for SyntaxLayerEntry {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("SyntaxLayer")
-            .field("depth", &self.depth)
-            .field("range", &self.range)
-            .field("tree", &self.content.tree())
-            .finish()
-    }
-}
-
-impl<'a> tree_sitter::TextProvider<&'a [u8]> for TextProvider<'a> {
-    type I = ByteChunks<'a>;
-
-    fn text(&mut self, node: tree_sitter::Node) -> Self::I {
-        ByteChunks(self.0.chunks_in_range(node.byte_range()))
-    }
-}
-
-impl<'a> Iterator for ByteChunks<'a> {
-    type Item = &'a [u8];
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.0.next().map(str::as_bytes)
-    }
-}
-
-impl QueryCursorHandle {
-    pub fn new() -> Self {
-        let mut cursor = QUERY_CURSORS.lock().pop().unwrap_or_default();
-        cursor.set_match_limit(64);
-        QueryCursorHandle(Some(cursor))
-    }
-}
-
-impl Deref for QueryCursorHandle {
-    type Target = QueryCursor;
-
-    fn deref(&self) -> &Self::Target {
-        self.0.as_ref().unwrap()
-    }
-}
-
-impl DerefMut for QueryCursorHandle {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        self.0.as_mut().unwrap()
-    }
-}
-
-impl Drop for QueryCursorHandle {
-    fn drop(&mut self) {
-        let mut cursor = self.0.take().unwrap();
-        cursor.set_byte_range(0..usize::MAX);
-        cursor.set_point_range(Point::zero().to_ts_point()..Point::MAX.to_ts_point());
-        QUERY_CURSORS.lock().push(cursor)
-    }
-}
-
-pub trait ToTreeSitterPoint {
-    fn to_ts_point(self) -> tree_sitter::Point;
-    fn from_ts_point(point: tree_sitter::Point) -> Self;
-}
-
-impl ToTreeSitterPoint for Point {
-    fn to_ts_point(self) -> tree_sitter::Point {
-        tree_sitter::Point::new(self.row as usize, self.column as usize)
-    }
-
-    fn from_ts_point(point: tree_sitter::Point) -> Self {
-        Point::new(point.row as u32, point.column as u32)
-    }
-}
-
-struct LogIncludedRanges<'a>(&'a [tree_sitter::Range]);
-struct LogPoint(Point);
-struct LogAnchorRange<'a>(&'a Range<Anchor>, &'a text::BufferSnapshot);
-struct LogOffsetRanges<'a>(&'a [Range<usize>], &'a text::BufferSnapshot);
-struct LogChangedRegions<'a>(&'a ChangeRegionSet, &'a text::BufferSnapshot);
-
-impl fmt::Debug for LogIncludedRanges<'_> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_list()
-            .entries(self.0.iter().map(|range| {
-                let start = range.start_point;
-                let end = range.end_point;
-                (start.row, start.column)..(end.row, end.column)
-            }))
-            .finish()
-    }
-}
-
-impl fmt::Debug for LogAnchorRange<'_> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        let range = self.0.to_point(self.1);
-        (LogPoint(range.start)..LogPoint(range.end)).fmt(f)
-    }
-}
-
-impl fmt::Debug for LogOffsetRanges<'_> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_list()
-            .entries(self.0.iter().map(|range| {
-                LogPoint(range.start.to_point(self.1))..LogPoint(range.end.to_point(self.1))
-            }))
-            .finish()
-    }
-}
-
-impl fmt::Debug for LogChangedRegions<'_> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_list()
-            .entries(
-                self.0
-                    .0
-                    .iter()
-                    .map(|region| LogAnchorRange(&region.range, self.1)),
-            )
-            .finish()
-    }
-}
-
-impl fmt::Debug for LogPoint {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        (self.0.row, self.0.column).fmt(f)
-    }
-}
diff --git a/crates/language/src/syntax_map/syntax_map_tests.rs b/crates/language/src/syntax_map/syntax_map_tests.rs
deleted file mode 100644
index 1eb6377276..0000000000
--- a/crates/language/src/syntax_map/syntax_map_tests.rs
+++ /dev/null
@@ -1,1416 +0,0 @@
-use super::*;
-use crate::{
-    LanguageConfig, LanguageMatcher, buffer_tests::markdown_inline_lang, markdown_lang, rust_lang,
-};
-use gpui::App;
-use pretty_assertions::assert_eq;
-use rand::rngs::StdRng;
-use std::{env, ops::Range, sync::Arc};
-use text::{Buffer, BufferId, ReplicaId};
-use tree_sitter::Node;
-use unindent::Unindent as _;
-use util::test::marked_text_ranges;
-
-#[test]
-fn test_splice_included_ranges() {
-    let ranges = vec![ts_range(20..30), ts_range(50..60), ts_range(80..90)];
-
-    let (new_ranges, change) = splice_included_ranges(
-        ranges.clone(),
-        &[54..56, 58..68],
-        &[ts_range(50..54), ts_range(59..67)],
-    );
-    assert_eq!(
-        new_ranges,
-        &[
-            ts_range(20..30),
-            ts_range(50..54),
-            ts_range(59..67),
-            ts_range(80..90),
-        ]
-    );
-    assert_eq!(change, 1..3);
-
-    let (new_ranges, change) = splice_included_ranges(ranges.clone(), &[70..71, 91..100], &[]);
-    assert_eq!(
-        new_ranges,
-        &[ts_range(20..30), ts_range(50..60), ts_range(80..90)]
-    );
-    assert_eq!(change, 2..3);
-
-    let (new_ranges, change) =
-        splice_included_ranges(ranges.clone(), &[], &[ts_range(0..2), ts_range(70..75)]);
-    assert_eq!(
-        new_ranges,
-        &[
-            ts_range(0..2),
-            ts_range(20..30),
-            ts_range(50..60),
-            ts_range(70..75),
-            ts_range(80..90)
-        ]
-    );
-    assert_eq!(change, 0..4);
-
-    let (new_ranges, change) =
-        splice_included_ranges(ranges.clone(), &[30..50], &[ts_range(25..55)]);
-    assert_eq!(new_ranges, &[ts_range(25..55), ts_range(80..90)]);
-    assert_eq!(change, 0..1);
-
-    // does not create overlapping ranges
-    let (new_ranges, change) = splice_included_ranges(ranges, &[0..18], &[ts_range(20..32)]);
-    assert_eq!(
-        new_ranges,
-        &[ts_range(20..32), ts_range(50..60), ts_range(80..90)]
-    );
-    assert_eq!(change, 0..1);
-
-    fn ts_range(range: Range<usize>) -> tree_sitter::Range {
-        tree_sitter::Range {
-            start_byte: range.start,
-            start_point: tree_sitter::Point {
-                row: 0,
-                column: range.start,
-            },
-            end_byte: range.end,
-            end_point: tree_sitter::Point {
-                row: 0,
-                column: range.end,
-            },
-        }
-    }
-}
-
-#[gpui::test]
-fn test_syntax_map_layers_for_range(cx: &mut App) {
-    let registry = Arc::new(LanguageRegistry::test(cx.background_executor().clone()));
-    let language = rust_lang();
-    registry.add(language.clone());
-
-    let mut buffer = Buffer::new(
-        ReplicaId::LOCAL,
-        BufferId::new(1).unwrap(),
-        r#"
-            fn a() {
-                assert_eq!(
-                    b(vec![C {}]),
-                    vec![d.e],
-                );
-                println!("{}", f(|_| true));
-            }
-        "#
-        .unindent(),
-    );
-
-    let mut syntax_map = SyntaxMap::new(&buffer);
-    syntax_map.set_language_registry(registry);
-    syntax_map.reparse(language.clone(), &buffer);
-
-    assert_layers_for_range(
-        &syntax_map,
-        &buffer,
-        Point::new(2, 0)..Point::new(2, 0),
-        &[
-            "...(function_item ... (block (expression_statement (macro_invocation...",
-            "...(tuple_expression (call_expression ... arguments: (arguments (macro_invocation...",
-        ],
-    );
-    assert_layers_for_range(
-        &syntax_map,
-        &buffer,
-        Point::new(2, 14)..Point::new(2, 16),
-        &[
-            "...(function_item ...",
-            "...(tuple_expression (call_expression ... arguments: (arguments (macro_invocation...",
-            "...(array_expression (struct_expression ...",
-        ],
-    );
-    assert_layers_for_range(
-        &syntax_map,
-        &buffer,
-        Point::new(3, 14)..Point::new(3, 16),
-        &[
-            "...(function_item ...",
-            "...(tuple_expression (call_expression ... arguments: (arguments (macro_invocation...",
-            "...(array_expression (field_expression ...",
-        ],
-    );
-    assert_layers_for_range(
-        &syntax_map,
-        &buffer,
-        Point::new(5, 12)..Point::new(5, 16),
-        &[
-            "...(function_item ...",
-            "...(call_expression ... (arguments (closure_expression ...",
-        ],
-    );
-
-    // Replace a vec! macro invocation with a plain slice, removing a syntactic layer.
-    let macro_name_range = range_for_text(&buffer, "vec!");
-    buffer.edit([(macro_name_range, "&")]);
-    syntax_map.interpolate(&buffer);
-    syntax_map.reparse(language.clone(), &buffer);
-
-    assert_layers_for_range(
-        &syntax_map,
-        &buffer,
-        Point::new(2, 14)..Point::new(2, 16),
-        &[
-            "...(function_item ...",
-            "...(tuple_expression (call_expression ... arguments: (arguments (reference_expression value: (array_expression...",
-        ],
-    );
-
-    // Put the vec! macro back, adding back the syntactic layer.
-    buffer.undo();
-    syntax_map.interpolate(&buffer);
-    syntax_map.reparse(language, &buffer);
-
-    assert_layers_for_range(
-        &syntax_map,
-        &buffer,
-        Point::new(2, 14)..Point::new(2, 16),
-        &[
-            "...(function_item ...",
-            "...(tuple_expression (call_expression ... arguments: (arguments (macro_invocation...",
-            "...(array_expression (struct_expression ...",
-        ],
-    );
-}
-
-#[gpui::test]
-fn test_dynamic_language_injection(cx: &mut App) {
-    let registry = Arc::new(LanguageRegistry::test(cx.background_executor().clone()));
-    let markdown = markdown_lang();
-    let markdown_inline = Arc::new(markdown_inline_lang());
-    registry.add(markdown.clone());
-    registry.add(markdown_inline.clone());
-    registry.add(rust_lang());
-    registry.add(Arc::new(ruby_lang()));
-
-    let mut buffer = Buffer::new(
-        ReplicaId::LOCAL,
-        BufferId::new(1).unwrap(),
-        r#"
-            This is a code block:
-
-            ```rs
-            fn foo() {}
-            ```
-        "#
-        .unindent(),
-    );
-
-    let mut syntax_map = SyntaxMap::new(&buffer);
-    syntax_map.set_language_registry(registry.clone());
-    syntax_map.reparse(markdown.clone(), &buffer);
-    syntax_map.reparse(markdown_inline.clone(), &buffer);
-    assert_layers_for_range(
-        &syntax_map,
-        &buffer,
-        Point::new(3, 0)..Point::new(3, 0),
-        &[
-            "(document (section (paragraph (inline)) (fenced_code_block (fenced_code_block_delimiter) (info_string (language)) (block_continuation) (code_fence_content (block_continuation)) (fenced_code_block_delimiter))))",
-            "(inline (code_span (code_span_delimiter) (code_span_delimiter)))",
-            "...(function_item name: (identifier) parameters: (parameters) body: (block)...",
-        ],
-    );
-
-    // Replace `rs` with a path to ending in `.rb` in code block.
-    let macro_name_range = range_for_text(&buffer, "rs");
-    buffer.edit([(macro_name_range, "foo/bar/baz.rb")]);
-    syntax_map.interpolate(&buffer);
-    syntax_map.reparse(markdown.clone(), &buffer);
-    syntax_map.reparse(markdown_inline.clone(), &buffer);
-    assert_layers_for_range(
-        &syntax_map,
-        &buffer,
-        Point::new(3, 0)..Point::new(3, 0),
-        &[
-            "(document (section (paragraph (inline)) (fenced_code_block (fenced_code_block_delimiter) (info_string (language)) (block_continuation) (code_fence_content (block_continuation)) (fenced_code_block_delimiter))))",
-            "(inline (code_span (code_span_delimiter) (code_span_delimiter)))",
-            "...(call method: (identifier) arguments: (argument_list (call method: (identifier) arguments: (argument_list) block: (block)...",
-        ],
-    );
-
-    // Replace Ruby with a language that hasn't been loaded yet.
-    let macro_name_range = range_for_text(&buffer, "foo/bar/baz.rb");
-    buffer.edit([(macro_name_range, "html")]);
-    syntax_map.interpolate(&buffer);
-    syntax_map.reparse(markdown.clone(), &buffer);
-    syntax_map.reparse(markdown_inline.clone(), &buffer);
-    assert_layers_for_range(
-        &syntax_map,
-        &buffer,
-        Point::new(3, 0)..Point::new(3, 0),
-        &[
-            "(document (section (paragraph (inline)) (fenced_code_block (fenced_code_block_delimiter) (info_string (language)) (block_continuation) (code_fence_content (block_continuation)) (fenced_code_block_delimiter))))",
-            "(inline (code_span (code_span_delimiter) (code_span_delimiter)))",
-        ],
-    );
-    assert!(syntax_map.contains_unknown_injections());
-
-    registry.add(Arc::new(html_lang()));
-    syntax_map.reparse(markdown, &buffer);
-    syntax_map.reparse(markdown_inline, &buffer);
-    assert_layers_for_range(
-        &syntax_map,
-        &buffer,
-        Point::new(3, 0)..Point::new(3, 0),
-        &[
-            "(document (section (paragraph (inline)) (fenced_code_block (fenced_code_block_delimiter) (info_string (language)) (block_continuation) (code_fence_content (block_continuation)) (fenced_code_block_delimiter))))",
-            "(inline (code_span (code_span_delimiter) (code_span_delimiter)))",
-            "(document (text))",
-        ],
-    );
-    assert!(!syntax_map.contains_unknown_injections());
-}
-
-#[gpui::test]
-fn test_typing_multiple_new_injections(cx: &mut App) {
-    let (buffer, syntax_map) = test_edit_sequence(
-        "Rust",
-        &[
-            "fn a() { test_macro }",
-            "fn a() { test_macro«!» }",
-            "fn a() { test_macro!«()» }",
-            "fn a() { test_macro!(«b») }",
-            "fn a() { test_macro!(b«.») }",
-            "fn a() { test_macro!(b.«c») }",
-            "fn a() { test_macro!(b.c«()») }",
-            "fn a() { test_macro!(b.c(«vec»)) }",
-            "fn a() { test_macro!(b.c(vec«!»)) }",
-            "fn a() { test_macro!(b.c(vec!«[]»)) }",
-            "fn a() { test_macro!(b.c(vec![«d»])) }",
-            "fn a() { test_macro!(b.c(vec![d«.»])) }",
-            "fn a() { test_macro!(b.c(vec![d.«e»])) }",
-        ],
-        cx,
-    );
-
-    assert_capture_ranges(
-        &syntax_map,
-        &buffer,
-        &["property"],
-        "fn a() { test_macro!(b.«c»(vec![d.«e»])) }",
-    );
-}
-
-#[gpui::test]
-fn test_pasting_new_injection_line_between_others(cx: &mut App) {
-    let (buffer, syntax_map) = test_edit_sequence(
-        "Rust",
-        &[
-            "
-                fn a() {
-                    b!(B {});
-                    c!(C {});
-                    d!(D {});
-                    e!(E {});
-                    f!(F {});
-                    g!(G {});
-                }
-            ",
-            "
-                fn a() {
-                    b!(B {});
-                    c!(C {});
-                    d!(D {});
-                «    h!(H {});
-                »    e!(E {});
-                    f!(F {});
-                    g!(G {});
-                }
-            ",
-        ],
-        cx,
-    );
-
-    assert_capture_ranges(
-        &syntax_map,
-        &buffer,
-        &["type"],
-        "
-        fn a() {
-            b!(«B» {});
-            c!(«C» {});
-            d!(«D» {});
-            h!(«H» {});
-            e!(«E» {});
-            f!(«F» {});
-            g!(«G» {});
-        }
-        ",
-    );
-}
-
-#[gpui::test]
-fn test_joining_injections_with_child_injections(cx: &mut App) {
-    let (buffer, syntax_map) = test_edit_sequence(
-        "Rust",
-        &[
-            "
-                fn a() {
-                    b!(
-                        c![one.two.three],
-                        d![four.five.six],
-                    );
-                    e!(
-                        f![seven.eight],
-                    );
-                }
-            ",
-            "
-                fn a() {
-                    b!(
-                        c![one.two.three],
-                        d![four.five.six],
-                    ˇ    f![seven.eight],
-                    );
-                }
-            ",
-        ],
-        cx,
-    );
-
-    assert_capture_ranges(
-        &syntax_map,
-        &buffer,
-        &["property"],
-        "
-        fn a() {
-            b!(
-                c![one.«two».«three»],
-                d![four.«five».«six»],
-                f![seven.«eight»],
-            );
-        }
-        ",
-    );
-}
-
-#[gpui::test]
-fn test_editing_edges_of_injection(cx: &mut App) {
-    test_edit_sequence(
-        "Rust",
-        &[
-            "
-                fn a() {
-                    b!(c!())
-                }
-            ",
-            "
-                fn a() {
-                    «d»!(c!())
-                }
-            ",
-            "
-                fn a() {
-                    «e»d!(c!())
-                }
-            ",
-            "
-                fn a() {
-                    ed!«[»c!()«]»
-                }
-            ",
-        ],
-        cx,
-    );
-}
-
-#[gpui::test]
-fn test_edits_preceding_and_intersecting_injection(cx: &mut App) {
-    test_edit_sequence(
-        "Rust",
-        &[
-            //
-            "const aaaaaaaaaaaa: B = c!(d(e.f));",
-            "const aˇa: B = c!(d(eˇ));",
-        ],
-        cx,
-    );
-}
-
-#[gpui::test]
-fn test_non_local_changes_create_injections(cx: &mut App) {
-    test_edit_sequence(
-        "Rust",
-        &[
-            "
-                // a! {
-                    static B: C = d;
-                // }
-            ",
-            "
-                ˇa! {
-                    static B: C = d;
-                ˇ}
-            ",
-        ],
-        cx,
-    );
-}
-
-#[gpui::test]
-fn test_creating_many_injections_in_one_edit(cx: &mut App) {
-    test_edit_sequence(
-        "Rust",
-        &[
-            "
-                fn a() {
-                    one(Two::three(3));
-                    four(Five::six(6));
-                    seven(Eight::nine(9));
-                }
-            ",
-            "
-                fn a() {
-                    one«!»(Two::three(3));
-                    four«!»(Five::six(6));
-                    seven«!»(Eight::nine(9));
-                }
-            ",
-            "
-                fn a() {
-                    one!(Two::three«!»(3));
-                    four!(Five::six«!»(6));
-                    seven!(Eight::nine«!»(9));
-                }
-            ",
-        ],
-        cx,
-    );
-}
-
-#[gpui::test]
-fn test_editing_across_injection_boundary(cx: &mut App) {
-    test_edit_sequence(
-        "Rust",
-        &[
-            "
-                fn one() {
-                    two();
-                    three!(
-                        three.four,
-                        five.six,
-                    );
-                }
-            ",
-            "
-                fn one() {
-                    two();
-                    th«irty_five![»
-                        three.four,
-                        five.six,
-                    «   seven.eight,
-                    ];»
-                }
-            ",
-        ],
-        cx,
-    );
-}
-
-#[gpui::test]
-fn test_removing_injection_by_replacing_across_boundary(cx: &mut App) {
-    test_edit_sequence(
-        "Rust",
-        &[
-            "
-                fn one() {
-                    two!(
-                        three.four,
-                    );
-                }
-            ",
-            "
-                fn one() {
-                    t«en
-                        .eleven(
-                        twelve,
-                    »
-                        three.four,
-                    );
-                }
-            ",
-        ],
-        cx,
-    );
-}
-
-#[gpui::test]
-fn test_combined_injections_simple(cx: &mut App) {
-    let (buffer, syntax_map) = test_edit_sequence(
-        "ERB",
-        &[
-            "
-                <body>
-                    <% if @one %>
-                        <div class=one>
-                    <% else %>
-                        <div class=two>
-                    <% end %>
-                    </div>
-                </body>
-            ",
-            "
-                <body>
-                    <% if @one %>
-                        <div class=one>
-                    ˇ else ˇ
-                        <div class=two>
-                    <% end %>
-                    </div>
-                </body>
-            ",
-            "
-                <body>
-                    <% if @one «;» end %>
-                    </div>
-                </body>
-            ",
-        ],
-        cx,
-    );
-
-    assert_capture_ranges(
-        &syntax_map,
-        &buffer,
-        &["tag", "ivar"],
-        "
-            <«body»>
-                <% if «@one» ; end %>
-                </«div»>
-            </«body»>
-        ",
-    );
-}
-
-#[gpui::test]
-fn test_combined_injections_empty_ranges(cx: &mut App) {
-    test_edit_sequence(
-        "ERB",
-        &[
-            "
-                <% if @one %>
-                <% else %>
-                <% end %>
-            ",
-            "
-                <% if @one %>
-                ˇ<% end %>
-            ",
-        ],
-        cx,
-    );
-}
-
-#[gpui::test]
-fn test_combined_injections_edit_edges_of_ranges(cx: &mut App) {
-    let (buffer, syntax_map) = test_edit_sequence(
-        "ERB",
-        &[
-            "
-                <%= one @two %>
-                <%= three @four %>
-            ",
-            "
-                <%= one @two %ˇ
-                <%= three @four %>
-            ",
-            "
-                <%= one @two %«>»
-                <%= three @four %>
-            ",
-        ],
-        cx,
-    );
-
-    assert_capture_ranges(
-        &syntax_map,
-        &buffer,
-        &["tag", "ivar"],
-        "
-            <%= one «@two» %>
-            <%= three «@four» %>
-        ",
-    );
-}
-
-#[gpui::test]
-fn test_combined_injections_splitting_some_injections(cx: &mut App) {
-    let (_buffer, _syntax_map) = test_edit_sequence(
-        "ERB",
-        &[
-            r#"
-                <%A if b(:c) %>
-                d
-                <% end %>
-                eee
-                <% f %>
-            "#,
-            r#"
-                <%« AAAAAAA %>
-                hhhhhhh
-                <%=» if b(:c) %>
-                d
-                <% end %>
-                eee
-                <% f %>
-            "#,
-        ],
-        cx,
-    );
-}
-
-#[gpui::test]
-fn test_combined_injections_editing_after_last_injection(cx: &mut App) {
-    test_edit_sequence(
-        "ERB",
-        &[
-            r#"
-                <% foo %>
-                <div></div>
-                <% bar %>
-            "#,
-            r#"
-                <% foo %>
-                <div></div>
-                <% bar %>«
-                more text»
-            "#,
-        ],
-        cx,
-    );
-}
-
-#[gpui::test]
-fn test_combined_injections_inside_injections(cx: &mut App) {
-    let (buffer, syntax_map) = test_edit_sequence(
-        "Markdown",
-        &[
-            r#"
-                here is
-                some
-                ERB code:
-
-                ```erb
-                <ul>
-                <% people.each do |person| %>
-                    <li><%= person.name %></li>
-                    <li><%= person.age %></li>
-                <% end %>
-                </ul>
-                ```
-            "#,
-            r#"
-                here is
-                some
-                ERB code:
-
-                ```erb
-                <ul>
-                <% people«2».each do |person| %>
-                    <li><%= person.name %></li>
-                    <li><%= person.age %></li>
-                <% end %>
-                </ul>
-                ```
-            "#,
-            // Inserting a comment character inside one code directive
-            // does not cause the other code directive to become a comment,
-            // because newlines are included in between each injection range.
-            r#"
-                here is
-                some
-                ERB code:
-
-                ```erb
-                <ul>
-                <% people2.each do |person| %>
-                    <li><%= «# »person.name %></li>
-                    <li><%= person.age %></li>
-                <% end %>
-                </ul>
-                ```
-            "#,
-        ],
-        cx,
-    );
-
-    // Check that the code directive below the ruby comment is
-    // not parsed as a comment.
-    assert_capture_ranges(
-        &syntax_map,
-        &buffer,
-        &["method"],
-        "
-            here is
-            some
-            ERB code:
-
-            ```erb
-            <ul>
-            <% people2.«each» do |person| %>
-                <li><%= # person.name %></li>
-                <li><%= person.«age» %></li>
-            <% end %>
-            </ul>
-            ```
-        ",
-    );
-}
-
-#[gpui::test]
-fn test_empty_combined_injections_inside_injections(cx: &mut App) {
-    let (buffer, syntax_map) = test_edit_sequence(
-        "Markdown",
-        &[r#"
-            ```erb
-            hello
-            ```
-
-            goodbye
-        "#],
-        cx,
-    );
-
-    assert_layers_for_range(
-        &syntax_map,
-        &buffer,
-        Point::new(0, 0)..Point::new(5, 0),
-        &[
-            // Markdown document
-            "(document (section (fenced_code_block (fenced_code_block_delimiter) (info_string (language)) (block_continuation) (code_fence_content (block_continuation)) (fenced_code_block_delimiter)) (paragraph (inline))))",
-            // ERB template in the code block
-            "(template...",
-            // Markdown inline content
-            "(inline)",
-            // The ruby syntax tree should be empty, since there are
-            // no interpolations in the ERB template.
-            "(program)",
-            // HTML within the ERB
-            "(document (text))",
-        ],
-    );
-}
-
-#[gpui::test]
-fn test_syntax_map_languages_loading_with_erb(cx: &mut App) {
-    let text = r#"
-        <body>
-            <% if @one %>
-                <div class=one>
-            <% else %>
-                <div class=two>
-            <% end %>
-            </div>
-        </body>
-    "#
-    .unindent();
-
-    let registry = Arc::new(LanguageRegistry::test(cx.background_executor().clone()));
-    let mut buffer = Buffer::new(ReplicaId::LOCAL, BufferId::new(1).unwrap(), text);
-
-    let mut syntax_map = SyntaxMap::new(&buffer);
-    syntax_map.set_language_registry(registry.clone());
-
-    let language = Arc::new(erb_lang());
-
-    log::info!("parsing");
-    registry.add(language.clone());
-    syntax_map.reparse(language.clone(), &buffer);
-
-    log::info!("loading html");
-    registry.add(Arc::new(html_lang()));
-    syntax_map.reparse(language.clone(), &buffer);
-
-    log::info!("loading ruby");
-    registry.add(Arc::new(ruby_lang()));
-    syntax_map.reparse(language.clone(), &buffer);
-
-    assert_capture_ranges(
-        &syntax_map,
-        &buffer,
-        &["tag", "ivar"],
-        "
-            <«body»>
-                <% if «@one» %>
-                    <«div» class=one>
-                <% else %>
-                    <«div» class=two>
-                <% end %>
-                </«div»>
-            </«body»>
-        ",
-    );
-
-    let text = r#"
-        <body>
-            <% if @one«_hundred» %>
-                <div class=one>
-            <% else %>
-                <div class=two>
-            <% end %>
-            </div>
-        </body>
-    "#
-    .unindent();
-
-    log::info!("editing");
-    buffer.edit_via_marked_text(&text);
-    syntax_map.interpolate(&buffer);
-    syntax_map.reparse(language, &buffer);
-
-    assert_capture_ranges(
-        &syntax_map,
-        &buffer,
-        &["tag", "ivar"],
-        "
-            <«body»>
-                <% if «@one_hundred» %>
-                    <«div» class=one>
-                <% else %>
-                    <«div» class=two>
-                <% end %>
-                </«div»>
-            </«body»>
-        ",
-    );
-}
-
-#[gpui::test(iterations = 50)]
-fn test_random_syntax_map_edits_rust_macros(rng: StdRng, cx: &mut App) {
-    let text = r#"
-        fn test_something() {
-            let vec = vec![5, 1, 3, 8];
-            assert_eq!(
-                vec
-                    .into_iter()
-                    .map(|i| i * 2)
-                    .collect::<Vec<usize>>(),
-                vec![
-                    5 * 2, 1 * 2, 3 * 2, 8 * 2
-                ],
-            );
-        }
-    "#
-    .unindent()
-    .repeat(2);
-
-    let registry = Arc::new(LanguageRegistry::test(cx.background_executor().clone()));
-    let language = rust_lang();
-    registry.add(language.clone());
-
-    test_random_edits(text, registry, language, rng);
-}
-
-#[gpui::test(iterations = 50)]
-fn test_random_syntax_map_edits_with_erb(rng: StdRng, cx: &mut App) {
-    let text = r#"
-        <div id="main">
-        <% if one?(:two) %>
-            <p class="three" four>
-            <%= yield :five %>
-            </p>
-        <% elsif Six.seven(8) %>
-            <p id="three" four>
-            <%= yield :five %>
-            </p>
-        <% else %>
-            <span>Ok</span>
-        <% end %>
-        </div>
-    "#
-    .unindent()
-    .repeat(5);
-
-    let registry = Arc::new(LanguageRegistry::test(cx.background_executor().clone()));
-    let language = Arc::new(erb_lang());
-    registry.add(language.clone());
-    registry.add(Arc::new(ruby_lang()));
-    registry.add(Arc::new(html_lang()));
-
-    test_random_edits(text, registry, language, rng);
-}
-
-#[gpui::test(iterations = 50)]
-fn test_random_syntax_map_edits_with_heex(rng: StdRng, cx: &mut App) {
-    let text = r#"
-        defmodule TheModule do
-            def the_method(assigns) do
-                ~H"""
-                <%= if @empty do %>
-                    <div class="h-4"></div>
-                <% else %>
-                    <div class="max-w-2xl w-full animate-pulse">
-                    <div class="flex-1 space-y-4">
-                        <div class={[@bg_class, "h-4 rounded-lg w-3/4"]}></div>
-                        <div class={[@bg_class, "h-4 rounded-lg"]}></div>
-                        <div class={[@bg_class, "h-4 rounded-lg w-5/6"]}></div>
-                    </div>
-                    </div>
-                <% end %>
-                """
-            end
-        end
-    "#
-    .unindent()
-    .repeat(3);
-
-    let registry = Arc::new(LanguageRegistry::test(cx.background_executor().clone()));
-    let language = Arc::new(elixir_lang());
-    registry.add(language.clone());
-    registry.add(Arc::new(heex_lang()));
-    registry.add(Arc::new(html_lang()));
-
-    test_random_edits(text, registry, language, rng);
-}
-
-fn test_random_edits(
-    text: String,
-    registry: Arc<LanguageRegistry>,
-    language: Arc<Language>,
-    mut rng: StdRng,
-) {
-    let operations = env::var("OPERATIONS")
-        .map(|i| i.parse().expect("invalid `OPERATIONS` variable"))
-        .unwrap_or(10);
-
-    let mut buffer = Buffer::new(ReplicaId::LOCAL, BufferId::new(1).unwrap(), text);
-
-    let mut syntax_map = SyntaxMap::new(&buffer);
-    syntax_map.set_language_registry(registry.clone());
-    syntax_map.reparse(language.clone(), &buffer);
-
-    let mut reference_syntax_map = SyntaxMap::new(&buffer);
-    reference_syntax_map.set_language_registry(registry);
-
-    log::info!("initial text:\n{}", buffer.text());
-
-    for _ in 0..operations {
-        let prev_buffer = buffer.snapshot();
-        let prev_syntax_map = syntax_map.snapshot();
-
-        buffer.randomly_edit(&mut rng, 3);
-        log::info!("text:\n{}", buffer.text());
-
-        syntax_map.interpolate(&buffer);
-        check_interpolation(&prev_syntax_map, &syntax_map, &prev_buffer, &buffer);
-
-        syntax_map.reparse(language.clone(), &buffer);
-
-        reference_syntax_map.clear(&buffer);
-        reference_syntax_map.reparse(language.clone(), &buffer);
-    }
-
-    for i in 0..operations {
-        let i = operations - i - 1;
-        buffer.undo();
-        log::info!("undoing operation {}", i);
-        log::info!("text:\n{}", buffer.text());
-
-        syntax_map.interpolate(&buffer);
-        syntax_map.reparse(language.clone(), &buffer);
-
-        reference_syntax_map.clear(&buffer);
-        reference_syntax_map.reparse(language.clone(), &buffer);
-        assert_eq!(
-            syntax_map.layers(&buffer).len(),
-            reference_syntax_map.layers(&buffer).len(),
-            "wrong number of layers after undoing edit {i}"
-        );
-    }
-
-    let layers = syntax_map.layers(&buffer);
-    let reference_layers = reference_syntax_map.layers(&buffer);
-    for (edited_layer, reference_layer) in layers.into_iter().zip(reference_layers.into_iter()) {
-        assert_eq!(
-            edited_layer.node().to_sexp(),
-            reference_layer.node().to_sexp()
-        );
-        assert_eq!(edited_layer.node().range(), reference_layer.node().range());
-    }
-}
-
-fn check_interpolation(
-    old_syntax_map: &SyntaxSnapshot,
-    new_syntax_map: &SyntaxSnapshot,
-    old_buffer: &BufferSnapshot,
-    new_buffer: &BufferSnapshot,
-) {
-    let edits = new_buffer
-        .edits_since::<usize>(old_buffer.version())
-        .collect::<Vec<_>>();
-
-    for (old_layer, new_layer) in old_syntax_map
-        .layers
-        .iter()
-        .zip(new_syntax_map.layers.iter())
-    {
-        assert_eq!(old_layer.range, new_layer.range);
-        let Some(old_tree) = old_layer.content.tree() else {
-            continue;
-        };
-        let Some(new_tree) = new_layer.content.tree() else {
-            continue;
-        };
-        let old_start_byte = old_layer.range.start.to_offset(old_buffer);
-        let new_start_byte = new_layer.range.start.to_offset(new_buffer);
-        let old_start_point = old_layer.range.start.to_point(old_buffer).to_ts_point();
-        let new_start_point = new_layer.range.start.to_point(new_buffer).to_ts_point();
-        let old_node = old_tree.root_node_with_offset(old_start_byte, old_start_point);
-        let new_node = new_tree.root_node_with_offset(new_start_byte, new_start_point);
-        check_node_edits(
-            old_layer.depth,
-            &old_layer.range,
-            old_node,
-            new_node,
-            old_buffer,
-            new_buffer,
-            &edits,
-        );
-    }
-
-    fn check_node_edits(
-        depth: usize,
-        range: &Range<Anchor>,
-        old_node: Node,
-        new_node: Node,
-        old_buffer: &BufferSnapshot,
-        new_buffer: &BufferSnapshot,
-        edits: &[text::Edit<usize>],
-    ) {
-        assert_eq!(old_node.kind(), new_node.kind());
-
-        let old_range = old_node.byte_range();
-        let new_range = new_node.byte_range();
-
-        let is_edited = edits
-            .iter()
-            .any(|edit| edit.new.start < new_range.end && edit.new.end > new_range.start);
-        if is_edited {
-            assert!(
-                new_node.has_changes(),
-                concat!(
-                    "failed to mark node as edited.\n",
-                    "layer depth: {}, old layer range: {:?}, new layer range: {:?},\n",
-                    "node kind: {}, old node range: {:?}, new node range: {:?}",
-                ),
-                depth,
-                range.to_offset(old_buffer),
-                range.to_offset(new_buffer),
-                new_node.kind(),
-                old_range,
-                new_range,
-            );
-        }
-
-        if !new_node.has_changes() {
-            assert_eq!(
-                old_buffer
-                    .text_for_range(old_range.clone())
-                    .collect::<String>(),
-                new_buffer
-                    .text_for_range(new_range.clone())
-                    .collect::<String>(),
-                concat!(
-                    "mismatched text for node\n",
-                    "layer depth: {}, old layer range: {:?}, new layer range: {:?},\n",
-                    "node kind: {}, old node range:{:?}, new node range:{:?}",
-                ),
-                depth,
-                range.to_offset(old_buffer),
-                range.to_offset(new_buffer),
-                new_node.kind(),
-                old_range,
-                new_range,
-            );
-        }
-
-        for i in 0..new_node.child_count() {
-            check_node_edits(
-                depth,
-                range,
-                old_node.child(i).unwrap(),
-                new_node.child(i).unwrap(),
-                old_buffer,
-                new_buffer,
-                edits,
-            )
-        }
-    }
-}
-
-fn test_edit_sequence(language_name: &str, steps: &[&str], cx: &mut App) -> (Buffer, SyntaxMap) {
-    let registry = Arc::new(LanguageRegistry::test(cx.background_executor().clone()));
-    registry.add(Arc::new(elixir_lang()));
-    registry.add(Arc::new(heex_lang()));
-    registry.add(rust_lang());
-    registry.add(Arc::new(ruby_lang()));
-    registry.add(Arc::new(html_lang()));
-    registry.add(Arc::new(erb_lang()));
-    registry.add(markdown_lang());
-    registry.add(Arc::new(markdown_inline_lang()));
-
-    let language = registry
-        .language_for_name(language_name)
-        .now_or_never()
-        .unwrap()
-        .unwrap();
-    let mut buffer = Buffer::new(ReplicaId::LOCAL, BufferId::new(1).unwrap(), "");
-
-    let mut mutated_syntax_map = SyntaxMap::new(&buffer);
-    mutated_syntax_map.set_language_registry(registry.clone());
-    mutated_syntax_map.reparse(language.clone(), &buffer);
-
-    for (i, marked_string) in steps.iter().enumerate() {
-        let marked_string = marked_string.unindent();
-        log::info!("incremental parse {i}: {marked_string:?}");
-        buffer.edit_via_marked_text(&marked_string);
-
-        // Reparse the syntax map
-        mutated_syntax_map.interpolate(&buffer);
-        mutated_syntax_map.reparse(language.clone(), &buffer);
-
-        // Create a second syntax map from scratch
-        log::info!("fresh parse {i}: {marked_string:?}");
-        let mut reference_syntax_map = SyntaxMap::new(&buffer);
-        reference_syntax_map.set_language_registry(registry.clone());
-        reference_syntax_map.reparse(language.clone(), &buffer);
-
-        // Compare the mutated syntax map to the new syntax map
-        let mutated_layers = mutated_syntax_map.layers(&buffer);
-        let reference_layers = reference_syntax_map.layers(&buffer);
-        assert_eq!(
-            mutated_layers.len(),
-            reference_layers.len(),
-            "wrong number of layers at step {i}"
-        );
-        for (edited_layer, reference_layer) in
-            mutated_layers.into_iter().zip(reference_layers.into_iter())
-        {
-            assert_eq!(
-                edited_layer.node().to_sexp(),
-                reference_layer.node().to_sexp(),
-                "different layer at step {i}"
-            );
-            assert_eq!(
-                edited_layer.node().range(),
-                reference_layer.node().range(),
-                "different layer at step {i}"
-            );
-        }
-    }
-
-    (buffer, mutated_syntax_map)
-}
-
-fn html_lang() -> Language {
-    Language::new(
-        LanguageConfig {
-            name: "HTML".into(),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["html".to_string()],
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-        Some(tree_sitter_html::LANGUAGE.into()),
-    )
-    .with_highlights_query(
-        r#"
-            (tag_name) @tag
-            (erroneous_end_tag_name) @tag
-            (attribute_name) @property
-        "#,
-    )
-    .unwrap()
-}
-
-fn ruby_lang() -> Language {
-    Language::new(
-        LanguageConfig {
-            name: "Ruby".into(),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["rb".to_string()],
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-        Some(tree_sitter_ruby::LANGUAGE.into()),
-    )
-    .with_highlights_query(
-        r#"
-            ["if" "do" "else" "end"] @keyword
-            (instance_variable) @ivar
-            (call method: (identifier) @method)
-        "#,
-    )
-    .unwrap()
-}
-
-fn erb_lang() -> Language {
-    Language::new(
-        LanguageConfig {
-            name: "ERB".into(),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["erb".to_string()],
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-        Some(tree_sitter_embedded_template::LANGUAGE.into()),
-    )
-    .with_highlights_query(
-        r#"
-            ["<%" "%>"] @keyword
-        "#,
-    )
-    .unwrap()
-    .with_injection_query(
-        r#"
-            (
-                (code) @injection.content
-                (#set! injection.language "ruby")
-                (#set! injection.combined)
-            )
-
-            (
-                (content) @injection.content
-                (#set! injection.language "html")
-                (#set! injection.combined)
-            )
-        "#,
-    )
-    .unwrap()
-}
-
-fn elixir_lang() -> Language {
-    Language::new(
-        LanguageConfig {
-            name: "Elixir".into(),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["ex".into()],
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-        Some(tree_sitter_elixir::LANGUAGE.into()),
-    )
-    .with_highlights_query(
-        r#"
-
-        "#,
-    )
-    .unwrap()
-}
-
-fn heex_lang() -> Language {
-    Language::new(
-        LanguageConfig {
-            name: "HEEx".into(),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["heex".into()],
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-        Some(tree_sitter_heex::LANGUAGE.into()),
-    )
-    .with_injection_query(
-        r#"
-        (
-          (directive
-            [
-              (partial_expression_value)
-              (expression_value)
-              (ending_expression_value)
-            ] @injection.content)
-          (#set! injection.language "elixir")
-          (#set! injection.combined)
-        )
-
-        ((expression (expression_value) @injection.content)
-         (#set! injection.language "elixir"))
-        "#,
-    )
-    .unwrap()
-}
-
-fn range_for_text(buffer: &Buffer, text: &str) -> Range<usize> {
-    let start = buffer.as_rope().to_string().find(text).unwrap();
-    start..start + text.len()
-}
-
-#[track_caller]
-fn assert_layers_for_range(
-    syntax_map: &SyntaxMap,
-    buffer: &BufferSnapshot,
-    range: Range<Point>,
-    expected_layers: &[&str],
-) {
-    let layers = syntax_map
-        .layers_for_range(range, buffer, true)
-        .collect::<Vec<_>>();
-    assert_eq!(
-        layers.len(),
-        expected_layers.len(),
-        "wrong number of layers"
-    );
-    for (i, (layer, expected_s_exp)) in layers.iter().zip(expected_layers.iter()).enumerate() {
-        let actual_s_exp = layer.node().to_sexp();
-        assert!(
-            string_contains_sequence(
-                &actual_s_exp,
-                &expected_s_exp.split("...").collect::<Vec<_>>()
-            ),
-            "layer {i}:\n\nexpected: {expected_s_exp}\nactual:   {actual_s_exp}",
-        );
-    }
-}
-
-#[track_caller]
-fn assert_capture_ranges(
-    syntax_map: &SyntaxMap,
-    buffer: &BufferSnapshot,
-    highlight_query_capture_names: &[&str],
-    marked_string: &str,
-) {
-    let mut actual_ranges = Vec::<Range<usize>>::new();
-    let captures = syntax_map.captures(0..buffer.len(), buffer, |grammar| {
-        grammar
-            .highlights_config
-            .as_ref()
-            .map(|config| &config.query)
-    });
-    let queries = captures
-        .grammars()
-        .iter()
-        .map(|grammar| &grammar.highlights_config.as_ref().unwrap().query)
-        .collect::<Vec<_>>();
-    for capture in captures {
-        let name = &queries[capture.grammar_index].capture_names()[capture.index as usize];
-        if highlight_query_capture_names.contains(name) {
-            actual_ranges.push(capture.node.byte_range());
-        }
-    }
-    actual_ranges.dedup();
-
-    let (text, expected_ranges) = marked_text_ranges(&marked_string.unindent(), false);
-    assert_eq!(text, buffer.text());
-    assert_eq!(actual_ranges, expected_ranges);
-}
-
-pub fn string_contains_sequence(text: &str, parts: &[&str]) -> bool {
-    let mut last_part_end = 0;
-    for part in parts {
-        if let Some(start_ix) = text[last_part_end..].find(part) {
-            last_part_end = start_ix + part.len();
-        } else {
-            return false;
-        }
-    }
-    true
-}
diff --git a/crates/language/src/task_context.rs b/crates/language/src/task_context.rs
deleted file mode 100644
index b8cc6d13ff..0000000000
--- a/crates/language/src/task_context.rs
+++ /dev/null
@@ -1,55 +0,0 @@
-use std::{ops::Range, path::PathBuf, sync::Arc};
-
-use crate::{File, LanguageToolchainStore, Location, Runnable};
-
-use anyhow::Result;
-use collections::HashMap;
-use fs::Fs;
-use gpui::{App, Task};
-use lsp::LanguageServerName;
-use task::{TaskTemplates, TaskVariables};
-use text::BufferId;
-
-pub struct RunnableRange {
-    pub buffer_id: BufferId,
-    pub run_range: Range<usize>,
-    pub full_range: Range<usize>,
-    pub runnable: Runnable,
-    pub extra_captures: HashMap<String, String>,
-}
-
-/// Language Contexts are used by Zed tasks to extract information about the source file where the tasks are supposed to be scheduled from.
-/// Multiple context providers may be used together: by default, Zed provides a base [`BasicContextProvider`] context that fills all non-custom [`VariableName`] variants.
-///
-/// The context will be used to fill data for the tasks, and filter out the ones that do not have the variables required.
-pub trait ContextProvider: Send + Sync {
-    /// Builds a specific context to be placed on top of the basic one (replacing all conflicting entries) and to be used for task resolving later.
-    fn build_context(
-        &self,
-        _variables: &TaskVariables,
-        _location: ContextLocation<'_>,
-        _project_env: Option<HashMap<String, String>>,
-        _toolchains: Arc<dyn LanguageToolchainStore>,
-        _cx: &mut App,
-    ) -> Task<Result<TaskVariables>> {
-        let _ = _location;
-        Task::ready(Ok(TaskVariables::default()))
-    }
-
-    /// Provides all tasks, associated with the current language.
-    fn associated_tasks(&self, _: Option<Arc<dyn File>>, _: &App) -> Task<Option<TaskTemplates>> {
-        Task::ready(None)
-    }
-
-    /// A language server name, that can return tasks using LSP (ext) for this language.
-    fn lsp_task_source(&self) -> Option<LanguageServerName> {
-        None
-    }
-}
-
-/// Metadata about the place in the project we gather the context for.
-pub struct ContextLocation<'a> {
-    pub fs: Option<Arc<dyn Fs>>,
-    pub worktree_root: Option<PathBuf>,
-    pub file_location: &'a Location,
-}
diff --git a/crates/language/src/text_diff.rs b/crates/language/src/text_diff.rs
deleted file mode 100644
index 1fb94b9f5e..0000000000
--- a/crates/language/src/text_diff.rs
+++ /dev/null
@@ -1,375 +0,0 @@
-use crate::{CharClassifier, CharKind, CharScopeContext, LanguageScope};
-use anyhow::{Context, anyhow};
-use imara_diff::{
-    Algorithm, UnifiedDiffBuilder, diff,
-    intern::{InternedInput, Token},
-    sources::lines_with_terminator,
-};
-use std::{iter, ops::Range, sync::Arc};
-
-const MAX_WORD_DIFF_LEN: usize = 512;
-const MAX_WORD_DIFF_LINE_COUNT: usize = 8;
-
-/// Computes a diff between two strings, returning a unified diff string.
-pub fn unified_diff(old_text: &str, new_text: &str) -> String {
-    let input = InternedInput::new(old_text, new_text);
-    diff(
-        Algorithm::Histogram,
-        &input,
-        UnifiedDiffBuilder::new(&input),
-    )
-}
-
-/// Computes a diff between two strings, returning a vector of old and new row
-/// ranges.
-pub fn line_diff(old_text: &str, new_text: &str) -> Vec<(Range<u32>, Range<u32>)> {
-    let mut edits = Vec::new();
-    let input = InternedInput::new(
-        lines_with_terminator(old_text),
-        lines_with_terminator(new_text),
-    );
-    diff_internal(&input, |_, _, old_rows, new_rows| {
-        edits.push((old_rows, new_rows));
-    });
-    edits
-}
-
-/// Computes a diff between two strings, returning a vector of edits.
-///
-/// The edits are represented as tuples of byte ranges and replacement strings.
-///
-/// Internally, this function first performs a line-based diff, and then performs a second
-/// word-based diff within hunks that replace small numbers of lines.
-pub fn text_diff(old_text: &str, new_text: &str) -> Vec<(Range<usize>, Arc<str>)> {
-    text_diff_with_options(old_text, new_text, DiffOptions::default())
-}
-
-/// Computes word-level diff ranges between two strings.
-///
-/// Returns a tuple of (old_ranges, new_ranges) where each vector contains
-/// the byte ranges of changed words in the respective text.
-/// Whitespace-only changes are excluded from the results.
-pub fn word_diff_ranges(
-    old_text: &str,
-    new_text: &str,
-    options: DiffOptions,
-) -> (Vec<Range<usize>>, Vec<Range<usize>>) {
-    let mut input: InternedInput<&str> = InternedInput::default();
-    input.update_before(tokenize(old_text, options.language_scope.clone()));
-    input.update_after(tokenize(new_text, options.language_scope));
-
-    let mut old_ranges: Vec<Range<usize>> = Vec::new();
-    let mut new_ranges: Vec<Range<usize>> = Vec::new();
-
-    diff_internal(&input, |old_byte_range, new_byte_range, _, _| {
-        for range in split_on_whitespace(old_text, &old_byte_range) {
-            if let Some(last) = old_ranges.last_mut()
-                && last.end >= range.start
-            {
-                last.end = range.end;
-            } else {
-                old_ranges.push(range);
-            }
-        }
-
-        for range in split_on_whitespace(new_text, &new_byte_range) {
-            if let Some(last) = new_ranges.last_mut()
-                && last.end >= range.start
-            {
-                last.end = range.end;
-            } else {
-                new_ranges.push(range);
-            }
-        }
-    });
-
-    (old_ranges, new_ranges)
-}
-
-fn split_on_whitespace(text: &str, range: &Range<usize>) -> Vec<Range<usize>> {
-    if range.is_empty() {
-        return Vec::new();
-    }
-
-    let slice = &text[range.clone()];
-    let mut ranges = Vec::new();
-    let mut offset = 0;
-
-    for line in slice.lines() {
-        let line_start = offset;
-        let line_end = line_start + line.len();
-        offset = line_end + 1;
-        let trimmed = line.trim();
-
-        if !trimmed.is_empty() {
-            let leading = line.len() - line.trim_start().len();
-            let trailing = line.len() - line.trim_end().len();
-            let trimmed_start = range.start + line_start + leading;
-            let trimmed_end = range.start + line_end - trailing;
-
-            let original_line_start = text[..range.start + line_start]
-                .rfind('\n')
-                .map(|i| i + 1)
-                .unwrap_or(0);
-            let original_line_end = text[range.start + line_start..]
-                .find('\n')
-                .map(|i| range.start + line_start + i)
-                .unwrap_or(text.len());
-            let original_line = &text[original_line_start..original_line_end];
-            let original_trimmed_start =
-                original_line_start + (original_line.len() - original_line.trim_start().len());
-            let original_trimmed_end =
-                original_line_end - (original_line.len() - original_line.trim_end().len());
-
-            if trimmed_start > original_trimmed_start || trimmed_end < original_trimmed_end {
-                ranges.push(trimmed_start..trimmed_end);
-            }
-        }
-    }
-
-    ranges
-}
-
-pub struct DiffOptions {
-    pub language_scope: Option<LanguageScope>,
-    pub max_word_diff_len: usize,
-    pub max_word_diff_line_count: usize,
-}
-
-impl Default for DiffOptions {
-    fn default() -> Self {
-        Self {
-            language_scope: Default::default(),
-            max_word_diff_len: MAX_WORD_DIFF_LEN,
-            max_word_diff_line_count: MAX_WORD_DIFF_LINE_COUNT,
-        }
-    }
-}
-
-/// Computes a diff between two strings, using a specific language scope's
-/// word characters for word-level diffing.
-pub fn text_diff_with_options(
-    old_text: &str,
-    new_text: &str,
-    options: DiffOptions,
-) -> Vec<(Range<usize>, Arc<str>)> {
-    let empty: Arc<str> = Arc::default();
-    let mut edits = Vec::new();
-    let mut hunk_input = InternedInput::default();
-    let input = InternedInput::new(
-        lines_with_terminator(old_text),
-        lines_with_terminator(new_text),
-    );
-    diff_internal(
-        &input,
-        |old_byte_range, new_byte_range, old_rows, new_rows| {
-            if should_perform_word_diff_within_hunk(
-                &old_rows,
-                &old_byte_range,
-                &new_rows,
-                &new_byte_range,
-                &options,
-            ) {
-                let old_offset = old_byte_range.start;
-                let new_offset = new_byte_range.start;
-                hunk_input.clear();
-                hunk_input.update_before(tokenize(
-                    &old_text[old_byte_range],
-                    options.language_scope.clone(),
-                ));
-                hunk_input.update_after(tokenize(
-                    &new_text[new_byte_range],
-                    options.language_scope.clone(),
-                ));
-                diff_internal(&hunk_input, |old_byte_range, new_byte_range, _, _| {
-                    let old_byte_range =
-                        old_offset + old_byte_range.start..old_offset + old_byte_range.end;
-                    let new_byte_range =
-                        new_offset + new_byte_range.start..new_offset + new_byte_range.end;
-                    let replacement_text = if new_byte_range.is_empty() {
-                        empty.clone()
-                    } else {
-                        new_text[new_byte_range].into()
-                    };
-                    edits.push((old_byte_range, replacement_text));
-                });
-            } else {
-                let replacement_text = if new_byte_range.is_empty() {
-                    empty.clone()
-                } else {
-                    new_text[new_byte_range].into()
-                };
-                edits.push((old_byte_range, replacement_text));
-            }
-        },
-    );
-    edits
-}
-
-pub fn apply_diff_patch(base_text: &str, patch: &str) -> Result<String, anyhow::Error> {
-    let patch = diffy::Patch::from_str(patch).context("Failed to parse patch")?;
-    let result = diffy::apply(base_text, &patch);
-    result.map_err(|err| anyhow!(err))
-}
-
-fn should_perform_word_diff_within_hunk(
-    old_row_range: &Range<u32>,
-    old_byte_range: &Range<usize>,
-    new_row_range: &Range<u32>,
-    new_byte_range: &Range<usize>,
-    options: &DiffOptions,
-) -> bool {
-    !old_byte_range.is_empty()
-        && !new_byte_range.is_empty()
-        && old_byte_range.len() <= options.max_word_diff_len
-        && new_byte_range.len() <= options.max_word_diff_len
-        && old_row_range.len() <= options.max_word_diff_line_count
-        && new_row_range.len() <= options.max_word_diff_line_count
-}
-
-fn diff_internal(
-    input: &InternedInput<&str>,
-    mut on_change: impl FnMut(Range<usize>, Range<usize>, Range<u32>, Range<u32>),
-) {
-    let mut old_offset = 0;
-    let mut new_offset = 0;
-    let mut old_token_ix = 0;
-    let mut new_token_ix = 0;
-    diff(
-        Algorithm::Histogram,
-        input,
-        |old_tokens: Range<u32>, new_tokens: Range<u32>| {
-            old_offset += token_len(
-                input,
-                &input.before[old_token_ix as usize..old_tokens.start as usize],
-            );
-            new_offset += token_len(
-                input,
-                &input.after[new_token_ix as usize..new_tokens.start as usize],
-            );
-            let old_len = token_len(
-                input,
-                &input.before[old_tokens.start as usize..old_tokens.end as usize],
-            );
-            let new_len = token_len(
-                input,
-                &input.after[new_tokens.start as usize..new_tokens.end as usize],
-            );
-            let old_byte_range = old_offset..old_offset + old_len;
-            let new_byte_range = new_offset..new_offset + new_len;
-            old_token_ix = old_tokens.end;
-            new_token_ix = new_tokens.end;
-            old_offset = old_byte_range.end;
-            new_offset = new_byte_range.end;
-            on_change(old_byte_range, new_byte_range, old_tokens, new_tokens);
-        },
-    );
-}
-
-fn tokenize(text: &str, language_scope: Option<LanguageScope>) -> impl Iterator<Item = &str> {
-    let classifier =
-        CharClassifier::new(language_scope).scope_context(Some(CharScopeContext::Completion));
-    let mut chars = text.char_indices();
-    let mut prev = None;
-    let mut start_ix = 0;
-    iter::from_fn(move || {
-        for (ix, c) in chars.by_ref() {
-            let mut token = None;
-            let kind = classifier.kind(c);
-            if let Some((prev_char, prev_kind)) = prev
-                && (kind != prev_kind || (kind == CharKind::Punctuation && c != prev_char))
-            {
-                token = Some(&text[start_ix..ix]);
-                start_ix = ix;
-            }
-            prev = Some((c, kind));
-            if token.is_some() {
-                return token;
-            }
-        }
-        if start_ix < text.len() {
-            let token = &text[start_ix..];
-            start_ix = text.len();
-            return Some(token);
-        }
-        None
-    })
-}
-
-fn token_len(input: &InternedInput<&str>, tokens: &[Token]) -> usize {
-    tokens
-        .iter()
-        .map(|token| input.interner[*token].len())
-        .sum()
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_tokenize() {
-        let text = "";
-        assert_eq!(tokenize(text, None).collect::<Vec<_>>(), Vec::<&str>::new());
-
-        let text = " ";
-        assert_eq!(tokenize(text, None).collect::<Vec<_>>(), vec![" "]);
-
-        let text = "one";
-        assert_eq!(tokenize(text, None).collect::<Vec<_>>(), vec!["one"]);
-
-        let text = "one\n";
-        assert_eq!(tokenize(text, None).collect::<Vec<_>>(), vec!["one", "\n"]);
-
-        let text = "one.two(three)";
-        assert_eq!(
-            tokenize(text, None).collect::<Vec<_>>(),
-            vec!["one", ".", "two", "(", "three", ")"]
-        );
-
-        let text = "one two three()";
-        assert_eq!(
-            tokenize(text, None).collect::<Vec<_>>(),
-            vec!["one", " ", "two", " ", "three", "(", ")"]
-        );
-
-        let text = "   one\n two three";
-        assert_eq!(
-            tokenize(text, None).collect::<Vec<_>>(),
-            vec!["   ", "one", "\n ", "two", " ", "three"]
-        );
-    }
-
-    #[test]
-    fn test_text_diff() {
-        let old_text = "one two three";
-        let new_text = "one TWO three";
-        assert_eq!(text_diff(old_text, new_text), [(4..7, "TWO".into()),]);
-
-        let old_text = "one\ntwo\nthree\n";
-        let new_text = "one\ntwo\nAND\nTHEN\nthree\n";
-        assert_eq!(
-            text_diff(old_text, new_text),
-            [(8..8, "AND\nTHEN\n".into()),]
-        );
-
-        let old_text = "one two\nthree four five\nsix seven eight nine\nten\n";
-        let new_text = "one two\nthree FOUR five\nsix SEVEN eight nine\nten\nELEVEN\n";
-        assert_eq!(
-            text_diff(old_text, new_text),
-            [
-                (14..18, "FOUR".into()),
-                (28..33, "SEVEN".into()),
-                (49..49, "ELEVEN\n".into())
-            ]
-        );
-    }
-
-    #[test]
-    fn test_apply_diff_patch() {
-        let old_text = "one two\nthree four five\nsix seven eight nine\nten\n";
-        let new_text = "one two\nthree FOUR five\nsix SEVEN eight nine\nten\nELEVEN\n";
-        let patch = unified_diff(old_text, new_text);
-        assert_eq!(apply_diff_patch(old_text, &patch).unwrap(), new_text);
-    }
-}
diff --git a/crates/language/src/toolchain.rs b/crates/language/src/toolchain.rs
deleted file mode 100644
index 5717ffb514..0000000000
--- a/crates/language/src/toolchain.rs
+++ /dev/null
@@ -1,189 +0,0 @@
-//! Provides support for language toolchains.
-//!
-//! A language can have associated toolchains,
-//! which is a set of tools used to interact with the projects written in said language.
-//! For example, a Python project can have an associated virtual environment; a Rust project can have a toolchain override.
-
-use std::{path::PathBuf, sync::Arc};
-
-use async_trait::async_trait;
-use collections::HashMap;
-use fs::Fs;
-use gpui::{App, AsyncApp, SharedString};
-use settings::WorktreeId;
-use task::ShellKind;
-use util::rel_path::RelPath;
-
-use crate::{LanguageName, ManifestName};
-
-/// Represents a single toolchain.
-#[derive(Clone, Eq, Debug)]
-pub struct Toolchain {
-    /// User-facing label
-    pub name: SharedString,
-    /// Absolute path
-    pub path: SharedString,
-    pub language_name: LanguageName,
-    /// Full toolchain data (including language-specific details)
-    pub as_json: serde_json::Value,
-}
-
-/// Declares a scope of a toolchain added by user.
-///
-/// When the user adds a toolchain, we give them an option to see that toolchain in:
-/// - All of their projects
-/// - A project they're currently in.
-/// - Only in the subproject they're currently in.
-#[derive(Clone, Debug, Eq, PartialEq, Ord, PartialOrd)]
-pub enum ToolchainScope {
-    Subproject(WorktreeId, Arc<RelPath>),
-    Project,
-    /// Available in all projects on this box. It wouldn't make sense to show suggestions across machines.
-    Global,
-}
-
-impl ToolchainScope {
-    pub fn label(&self) -> &'static str {
-        match self {
-            ToolchainScope::Subproject(_, _) => "Subproject",
-            ToolchainScope::Project => "Project",
-            ToolchainScope::Global => "Global",
-        }
-    }
-
-    pub fn description(&self) -> &'static str {
-        match self {
-            ToolchainScope::Subproject(_, _) => {
-                "Available only in the subproject you're currently in."
-            }
-            ToolchainScope::Project => "Available in all locations in your current project.",
-            ToolchainScope::Global => "Available in all of your projects on this machine.",
-        }
-    }
-}
-
-impl std::hash::Hash for Toolchain {
-    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-        let Self {
-            name,
-            path,
-            language_name,
-            as_json: _,
-        } = self;
-        name.hash(state);
-        path.hash(state);
-        language_name.hash(state);
-    }
-}
-
-impl PartialEq for Toolchain {
-    fn eq(&self, other: &Self) -> bool {
-        let Self {
-            name,
-            path,
-            language_name,
-            as_json: _,
-        } = self;
-        // Do not use as_json for comparisons; it shouldn't impact equality, as it's not user-surfaced.
-        // Thus, there could be multiple entries that look the same in the UI.
-        (name, path, language_name).eq(&(&other.name, &other.path, &other.language_name))
-    }
-}
-
-#[async_trait]
-pub trait ToolchainLister: Send + Sync + 'static {
-    /// List all available toolchains for a given path.
-    async fn list(
-        &self,
-        worktree_root: PathBuf,
-        subroot_relative_path: Arc<RelPath>,
-        project_env: Option<HashMap<String, String>>,
-        fs: &dyn Fs,
-    ) -> ToolchainList;
-
-    /// Given a user-created toolchain, resolve lister-specific details.
-    /// Put another way: fill in the details of the toolchain so the user does not have to.
-    async fn resolve(
-        &self,
-        path: PathBuf,
-        project_env: Option<HashMap<String, String>>,
-        fs: &dyn Fs,
-    ) -> anyhow::Result<Toolchain>;
-
-    fn activation_script(&self, toolchain: &Toolchain, shell: ShellKind, cx: &App) -> Vec<String>;
-
-    /// Returns various "static" bits of information about this toolchain lister. This function should be pure.
-    fn meta(&self) -> ToolchainMetadata;
-}
-
-#[derive(Clone, PartialEq, Eq, Hash)]
-pub struct ToolchainMetadata {
-    /// Returns a term which we should use in UI to refer to toolchains produced by a given `[ToolchainLister]`.
-    pub term: SharedString,
-    /// A user-facing placeholder describing the semantic meaning of a path to a new toolchain.
-    pub new_toolchain_placeholder: SharedString,
-    /// The name of the manifest file for this toolchain.
-    pub manifest_name: ManifestName,
-}
-
-#[async_trait(?Send)]
-pub trait LanguageToolchainStore: Send + Sync + 'static {
-    async fn active_toolchain(
-        self: Arc<Self>,
-        worktree_id: WorktreeId,
-        relative_path: Arc<RelPath>,
-        language_name: LanguageName,
-        cx: &mut AsyncApp,
-    ) -> Option<Toolchain>;
-}
-
-pub trait LocalLanguageToolchainStore: Send + Sync + 'static {
-    fn active_toolchain(
-        self: Arc<Self>,
-        worktree_id: WorktreeId,
-        relative_path: &Arc<RelPath>,
-        language_name: LanguageName,
-        cx: &mut AsyncApp,
-    ) -> Option<Toolchain>;
-}
-
-#[async_trait(?Send)]
-impl<T: LocalLanguageToolchainStore> LanguageToolchainStore for T {
-    async fn active_toolchain(
-        self: Arc<Self>,
-        worktree_id: WorktreeId,
-        relative_path: Arc<RelPath>,
-        language_name: LanguageName,
-        cx: &mut AsyncApp,
-    ) -> Option<Toolchain> {
-        self.active_toolchain(worktree_id, &relative_path, language_name, cx)
-    }
-}
-
-type DefaultIndex = usize;
-#[derive(Default, Clone, Debug)]
-pub struct ToolchainList {
-    pub toolchains: Vec<Toolchain>,
-    pub default: Option<DefaultIndex>,
-    pub groups: Box<[(usize, SharedString)]>,
-}
-
-impl ToolchainList {
-    pub fn toolchains(&self) -> &[Toolchain] {
-        &self.toolchains
-    }
-    pub fn default_toolchain(&self) -> Option<Toolchain> {
-        self.default.and_then(|ix| self.toolchains.get(ix)).cloned()
-    }
-    pub fn group_for_index(&self, index: usize) -> Option<(usize, SharedString)> {
-        if index >= self.toolchains.len() {
-            return None;
-        }
-        let first_equal_or_greater = self
-            .groups
-            .partition_point(|(group_lower_bound, _)| group_lower_bound <= &index);
-        self.groups
-            .get(first_equal_or_greater.checked_sub(1)?)
-            .cloned()
-    }
-}
diff --git a/crates/language_extension/Cargo.toml b/crates/language_extension/Cargo.toml
deleted file mode 100644
index de5af2246c..0000000000
--- a/crates/language_extension/Cargo.toml
+++ /dev/null
@@ -1,28 +0,0 @@
-[package]
-name = "language_extension"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/language_extension.rs"
-
-[dependencies]
-anyhow.workspace = true
-async-trait.workspace = true
-collections.workspace = true
-extension.workspace = true
-futures.workspace = true
-fs.workspace = true
-gpui.workspace = true
-language.workspace = true
-log.workspace = true
-lsp.workspace = true
-project.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-util.workspace = true
diff --git a/crates/language_extension/LICENSE-GPL b/crates/language_extension/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/language_extension/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/language_extension/src/extension_lsp_adapter.rs b/crates/language_extension/src/extension_lsp_adapter.rs
deleted file mode 100644
index 269aac1f2a..0000000000
--- a/crates/language_extension/src/extension_lsp_adapter.rs
+++ /dev/null
@@ -1,716 +0,0 @@
-use std::ops::Range;
-use std::path::{Path, PathBuf};
-use std::sync::Arc;
-
-use anyhow::{Context as _, Result};
-use async_trait::async_trait;
-use collections::{HashMap, HashSet};
-use extension::{Extension, ExtensionLanguageServerProxy, WorktreeDelegate};
-use futures::{FutureExt, future::join_all, lock::OwnedMutexGuard};
-use gpui::{App, AppContext, AsyncApp, Task};
-use language::{
-    BinaryStatus, CodeLabel, DynLspInstaller, HighlightId, Language, LanguageName,
-    LanguageServerBinaryLocations, LspAdapter, LspAdapterDelegate, Toolchain,
-};
-use lsp::{
-    CodeActionKind, LanguageServerBinary, LanguageServerBinaryOptions, LanguageServerName,
-    LanguageServerSelector, Uri,
-};
-use serde::Serialize;
-use serde_json::Value;
-use util::{ResultExt, fs::make_file_executable, maybe, rel_path::RelPath};
-
-use crate::{LanguageServerRegistryProxy, LspAccess};
-
-/// An adapter that allows an [`LspAdapterDelegate`] to be used as a [`WorktreeDelegate`].
-struct WorktreeDelegateAdapter(pub Arc<dyn LspAdapterDelegate>);
-
-#[async_trait]
-impl WorktreeDelegate for WorktreeDelegateAdapter {
-    fn id(&self) -> u64 {
-        self.0.worktree_id().to_proto()
-    }
-
-    fn root_path(&self) -> String {
-        self.0.worktree_root_path().to_string_lossy().into_owned()
-    }
-
-    async fn read_text_file(&self, path: &RelPath) -> Result<String> {
-        self.0.read_text_file(path).await
-    }
-
-    async fn which(&self, binary_name: String) -> Option<String> {
-        self.0
-            .which(binary_name.as_ref())
-            .await
-            .map(|path| path.to_string_lossy().into_owned())
-    }
-
-    async fn shell_env(&self) -> Vec<(String, String)> {
-        self.0.shell_env().await.into_iter().collect()
-    }
-}
-
-impl ExtensionLanguageServerProxy for LanguageServerRegistryProxy {
-    fn register_language_server(
-        &self,
-        extension: Arc<dyn Extension>,
-        language_server_id: LanguageServerName,
-        language: LanguageName,
-    ) {
-        self.language_registry.register_lsp_adapter(
-            language.clone(),
-            Arc::new(ExtensionLspAdapter::new(
-                extension,
-                language_server_id,
-                language,
-            )),
-        );
-    }
-
-    fn remove_language_server(
-        &self,
-        language: &LanguageName,
-        language_server_name: &LanguageServerName,
-        cx: &mut App,
-    ) -> Task<Result<()>> {
-        self.language_registry
-            .remove_lsp_adapter(language, language_server_name);
-
-        let mut tasks = Vec::new();
-        match &self.lsp_access {
-            LspAccess::ViaLspStore(lsp_store) => lsp_store.update(cx, |lsp_store, cx| {
-                let stop_task = lsp_store.stop_language_servers_for_buffers(
-                    Vec::new(),
-                    HashSet::from_iter([LanguageServerSelector::Name(
-                        language_server_name.clone(),
-                    )]),
-                    cx,
-                );
-                tasks.push(stop_task);
-            }),
-            LspAccess::ViaWorkspaces(lsp_store_provider) => {
-                if let Ok(lsp_stores) = lsp_store_provider(cx) {
-                    for lsp_store in lsp_stores {
-                        lsp_store.update(cx, |lsp_store, cx| {
-                            let stop_task = lsp_store.stop_language_servers_for_buffers(
-                                Vec::new(),
-                                HashSet::from_iter([LanguageServerSelector::Name(
-                                    language_server_name.clone(),
-                                )]),
-                                cx,
-                            );
-                            tasks.push(stop_task);
-                        });
-                    }
-                }
-            }
-            LspAccess::Noop => {}
-        }
-
-        cx.background_spawn(async move {
-            let results = join_all(tasks).await;
-            for result in results {
-                result?;
-            }
-            Ok(())
-        })
-    }
-
-    fn update_language_server_status(
-        &self,
-        language_server_id: LanguageServerName,
-        status: BinaryStatus,
-    ) {
-        log::debug!(
-            "updating binary status for {} to {:?}",
-            language_server_id,
-            status
-        );
-        self.language_registry
-            .update_lsp_binary_status(language_server_id, status);
-    }
-}
-
-struct ExtensionLspAdapter {
-    extension: Arc<dyn Extension>,
-    language_server_id: LanguageServerName,
-    language_name: LanguageName,
-}
-
-impl ExtensionLspAdapter {
-    fn new(
-        extension: Arc<dyn Extension>,
-        language_server_id: LanguageServerName,
-        language_name: LanguageName,
-    ) -> Self {
-        Self {
-            extension,
-            language_server_id,
-            language_name,
-        }
-    }
-}
-
-#[async_trait(?Send)]
-impl DynLspInstaller for ExtensionLspAdapter {
-    fn get_language_server_command(
-        self: Arc<Self>,
-        delegate: Arc<dyn LspAdapterDelegate>,
-        _: Option<Toolchain>,
-        _: LanguageServerBinaryOptions,
-        _: OwnedMutexGuard<Option<(bool, LanguageServerBinary)>>,
-        _: AsyncApp,
-    ) -> LanguageServerBinaryLocations {
-        async move {
-            let ret = maybe!(async move {
-                let delegate = Arc::new(WorktreeDelegateAdapter(delegate.clone())) as _;
-                let command = self
-                    .extension
-                    .language_server_command(
-                        self.language_server_id.clone(),
-                        self.language_name.clone(),
-                        delegate,
-                    )
-                    .await?;
-
-                // on windows, extensions might produce weird paths
-                // that start with a leading slash due to WASI
-                // requiring that for PWD and friends so account for
-                // that here and try to transform those paths back
-                // to windows paths
-                //
-                // if we don't do this, std will interpret the path as relative,
-                // which changes join behavior
-                let command_path: &Path = if cfg!(windows)
-                    && let Some(command) = command.command.to_str()
-                {
-                    let mut chars = command.chars();
-                    if chars.next().is_some_and(|c| c == '/')
-                        && chars.next().is_some_and(|c| c.is_ascii_alphabetic())
-                        && chars.next().is_some_and(|c| c == ':')
-                        && chars.next().is_some_and(|c| c == '\\' || c == '/')
-                    {
-                        // looks like a windows path with a leading slash, so strip it
-                        command.strip_prefix('/').unwrap().as_ref()
-                    } else {
-                        command.as_ref()
-                    }
-                } else {
-                    command.command.as_ref()
-                };
-                let path = self.extension.path_from_extension(command_path);
-
-                // TODO: This should now be done via the `zed::make_file_executable` function in
-                // Zed extension API, but we're leaving these existing usages in place temporarily
-                // to avoid any compatibility issues between Zed and the extension versions.
-                //
-                // We can remove once the following extension versions no longer see any use:
-                // - toml@0.0.2
-                // - zig@0.0.1
-                if ["toml", "zig"].contains(&self.extension.manifest().id.as_ref())
-                    && path.starts_with(&self.extension.work_dir())
-                {
-                    make_file_executable(&path)
-                        .await
-                        .context("failed to set file permissions")?;
-                }
-
-                Ok(LanguageServerBinary {
-                    path,
-                    arguments: command
-                        .args
-                        .into_iter()
-                        .map(|arg| {
-                            // on windows, extensions might produce weird paths
-                            // that start with a leading slash due to WASI
-                            // requiring that for PWD and friends so account for
-                            // that here and try to transform those paths back
-                            // to windows paths
-                            if cfg!(windows) {
-                                let mut chars = arg.chars();
-                                if chars.next().is_some_and(|c| c == '/')
-                                    && chars.next().is_some_and(|c| c.is_ascii_alphabetic())
-                                    && chars.next().is_some_and(|c| c == ':')
-                                    && chars.next().is_some_and(|c| c == '\\' || c == '/')
-                                {
-                                    // looks like a windows path with a leading slash, so strip it
-                                    arg.strip_prefix('/').unwrap().into()
-                                } else {
-                                    arg.into()
-                                }
-                            } else {
-                                arg.into()
-                            }
-                        })
-                        .collect(),
-                    env: Some(command.env.into_iter().collect()),
-                })
-            })
-            .await;
-            (ret, None)
-        }
-        .boxed_local()
-    }
-
-    async fn try_fetch_server_binary(
-        &self,
-        _: &Arc<dyn LspAdapterDelegate>,
-        _: PathBuf,
-        _: bool,
-        _: &mut AsyncApp,
-    ) -> Result<LanguageServerBinary> {
-        unreachable!("get_language_server_command is overridden")
-    }
-}
-
-#[async_trait(?Send)]
-impl LspAdapter for ExtensionLspAdapter {
-    fn name(&self) -> LanguageServerName {
-        self.language_server_id.clone()
-    }
-
-    fn code_action_kinds(&self) -> Option<Vec<CodeActionKind>> {
-        let code_action_kinds = self
-            .extension
-            .manifest()
-            .language_servers
-            .get(&self.language_server_id)
-            .and_then(|server| server.code_action_kinds.clone());
-
-        code_action_kinds.or(Some(vec![
-            CodeActionKind::EMPTY,
-            CodeActionKind::QUICKFIX,
-            CodeActionKind::REFACTOR,
-            CodeActionKind::REFACTOR_EXTRACT,
-            CodeActionKind::SOURCE,
-        ]))
-    }
-
-    fn language_ids(&self) -> HashMap<LanguageName, String> {
-        // TODO: The language IDs can be provided via the language server options
-        // in `extension.toml now but we're leaving these existing usages in place temporarily
-        // to avoid any compatibility issues between Zed and the extension versions.
-        //
-        // We can remove once the following extension versions no longer see any use:
-        // - php@0.0.1
-        if self.extension.manifest().id.as_ref() == "php" {
-            return HashMap::from_iter([(LanguageName::new_static("PHP"), "php".into())]);
-        }
-
-        self.extension
-            .manifest()
-            .language_servers
-            .get(&self.language_server_id)
-            .map(|server| server.language_ids.clone())
-            .unwrap_or_default()
-    }
-
-    async fn initialization_options(
-        self: Arc<Self>,
-        delegate: &Arc<dyn LspAdapterDelegate>,
-    ) -> Result<Option<serde_json::Value>> {
-        let delegate = Arc::new(WorktreeDelegateAdapter(delegate.clone())) as _;
-        let json_options = self
-            .extension
-            .language_server_initialization_options(
-                self.language_server_id.clone(),
-                self.language_name.clone(),
-                delegate,
-            )
-            .await?;
-        Ok(if let Some(json_options) = json_options {
-            serde_json::from_str(&json_options).with_context(|| {
-                format!("failed to parse initialization_options from extension: {json_options}")
-            })?
-        } else {
-            None
-        })
-    }
-
-    async fn workspace_configuration(
-        self: Arc<Self>,
-        delegate: &Arc<dyn LspAdapterDelegate>,
-        _: Option<Toolchain>,
-        _: Option<Uri>,
-        _cx: &mut AsyncApp,
-    ) -> Result<Value> {
-        let delegate = Arc::new(WorktreeDelegateAdapter(delegate.clone())) as _;
-        let json_options: Option<String> = self
-            .extension
-            .language_server_workspace_configuration(self.language_server_id.clone(), delegate)
-            .await?;
-        Ok(if let Some(json_options) = json_options {
-            serde_json::from_str(&json_options).with_context(|| {
-                format!("failed to parse workspace_configuration from extension: {json_options}")
-            })?
-        } else {
-            serde_json::json!({})
-        })
-    }
-
-    async fn additional_initialization_options(
-        self: Arc<Self>,
-        target_language_server_id: LanguageServerName,
-        delegate: &Arc<dyn LspAdapterDelegate>,
-    ) -> Result<Option<serde_json::Value>> {
-        let delegate = Arc::new(WorktreeDelegateAdapter(delegate.clone())) as _;
-        let json_options: Option<String> = self
-            .extension
-            .language_server_additional_initialization_options(
-                self.language_server_id.clone(),
-                target_language_server_id.clone(),
-                delegate,
-            )
-            .await?;
-        Ok(if let Some(json_options) = json_options {
-            serde_json::from_str(&json_options).with_context(|| {
-                format!(
-                    "failed to parse additional_initialization_options from extension: {json_options}"
-                )
-            })?
-        } else {
-            None
-        })
-    }
-
-    async fn additional_workspace_configuration(
-        self: Arc<Self>,
-        target_language_server_id: LanguageServerName,
-
-        delegate: &Arc<dyn LspAdapterDelegate>,
-
-        _cx: &mut AsyncApp,
-    ) -> Result<Option<serde_json::Value>> {
-        let delegate = Arc::new(WorktreeDelegateAdapter(delegate.clone())) as _;
-        let json_options: Option<String> = self
-            .extension
-            .language_server_additional_workspace_configuration(
-                self.language_server_id.clone(),
-                target_language_server_id.clone(),
-                delegate,
-            )
-            .await?;
-        Ok(if let Some(json_options) = json_options {
-            serde_json::from_str(&json_options).with_context(|| {
-                format!("failed to parse additional_workspace_configuration from extension: {json_options}")
-            })?
-        } else {
-            None
-        })
-    }
-
-    async fn labels_for_completions(
-        self: Arc<Self>,
-        completions: &[lsp::CompletionItem],
-        language: &Arc<Language>,
-    ) -> Result<Vec<Option<CodeLabel>>> {
-        let completions = completions
-            .iter()
-            .cloned()
-            .map(lsp_completion_to_extension)
-            .collect::<Vec<_>>();
-
-        let labels = self
-            .extension
-            .labels_for_completions(self.language_server_id.clone(), completions)
-            .await?;
-
-        Ok(labels_from_extension(labels, language))
-    }
-
-    async fn labels_for_symbols(
-        self: Arc<Self>,
-        symbols: &[(String, lsp::SymbolKind)],
-        language: &Arc<Language>,
-    ) -> Result<Vec<Option<CodeLabel>>> {
-        let symbols = symbols
-            .iter()
-            .cloned()
-            .map(|(name, kind)| extension::Symbol {
-                name,
-                kind: lsp_symbol_kind_to_extension(kind),
-            })
-            .collect::<Vec<_>>();
-
-        let labels = self
-            .extension
-            .labels_for_symbols(self.language_server_id.clone(), symbols)
-            .await?;
-
-        Ok(labels_from_extension(labels, language))
-    }
-
-    fn is_extension(&self) -> bool {
-        true
-    }
-}
-
-fn labels_from_extension(
-    labels: Vec<Option<extension::CodeLabel>>,
-    language: &Arc<Language>,
-) -> Vec<Option<CodeLabel>> {
-    labels
-        .into_iter()
-        .map(|label| {
-            let label = label?;
-            let runs = if label.code.is_empty() {
-                Vec::new()
-            } else {
-                language.highlight_text(&label.code.as_str().into(), 0..label.code.len())
-            };
-            build_code_label(&label, &runs, language)
-        })
-        .collect()
-}
-
-fn build_code_label(
-    label: &extension::CodeLabel,
-    parsed_runs: &[(Range<usize>, HighlightId)],
-    language: &Arc<Language>,
-) -> Option<CodeLabel> {
-    let mut text = String::new();
-    let mut runs = vec![];
-
-    for span in &label.spans {
-        match span {
-            extension::CodeLabelSpan::CodeRange(range) => {
-                let code_span = &label.code.get(range.clone())?;
-                let mut input_ix = range.start;
-                let mut output_ix = text.len();
-                for (run_range, id) in parsed_runs {
-                    if run_range.start >= range.end {
-                        break;
-                    }
-                    if run_range.end <= input_ix {
-                        continue;
-                    }
-
-                    if run_range.start > input_ix {
-                        let len = run_range.start - input_ix;
-                        output_ix += len;
-                        input_ix += len;
-                    }
-
-                    let len = range.end.min(run_range.end) - input_ix;
-                    runs.push((output_ix..output_ix + len, *id));
-                    output_ix += len;
-                    input_ix += len;
-                }
-
-                text.push_str(code_span);
-            }
-            extension::CodeLabelSpan::Literal(span) => {
-                let highlight_id = language
-                    .grammar()
-                    .zip(span.highlight_name.as_ref())
-                    .and_then(|(grammar, highlight_name)| {
-                        grammar.highlight_id_for_name(highlight_name)
-                    })
-                    .unwrap_or_default();
-                let ix = text.len();
-                runs.push((ix..ix + span.text.len(), highlight_id));
-                text.push_str(&span.text);
-            }
-        }
-    }
-
-    let filter_range = label.filter_range.clone();
-    text.get(filter_range.clone())?;
-    Some(CodeLabel::new(text, filter_range, runs))
-}
-
-fn lsp_completion_to_extension(value: lsp::CompletionItem) -> extension::Completion {
-    extension::Completion {
-        label: value.label,
-        label_details: value
-            .label_details
-            .map(lsp_completion_item_label_details_to_extension),
-        detail: value.detail,
-        kind: value.kind.map(lsp_completion_item_kind_to_extension),
-        insert_text_format: value
-            .insert_text_format
-            .map(lsp_insert_text_format_to_extension),
-    }
-}
-
-fn lsp_completion_item_label_details_to_extension(
-    value: lsp::CompletionItemLabelDetails,
-) -> extension::CompletionLabelDetails {
-    extension::CompletionLabelDetails {
-        detail: value.detail,
-        description: value.description,
-    }
-}
-
-fn lsp_completion_item_kind_to_extension(
-    value: lsp::CompletionItemKind,
-) -> extension::CompletionKind {
-    match value {
-        lsp::CompletionItemKind::TEXT => extension::CompletionKind::Text,
-        lsp::CompletionItemKind::METHOD => extension::CompletionKind::Method,
-        lsp::CompletionItemKind::FUNCTION => extension::CompletionKind::Function,
-        lsp::CompletionItemKind::CONSTRUCTOR => extension::CompletionKind::Constructor,
-        lsp::CompletionItemKind::FIELD => extension::CompletionKind::Field,
-        lsp::CompletionItemKind::VARIABLE => extension::CompletionKind::Variable,
-        lsp::CompletionItemKind::CLASS => extension::CompletionKind::Class,
-        lsp::CompletionItemKind::INTERFACE => extension::CompletionKind::Interface,
-        lsp::CompletionItemKind::MODULE => extension::CompletionKind::Module,
-        lsp::CompletionItemKind::PROPERTY => extension::CompletionKind::Property,
-        lsp::CompletionItemKind::UNIT => extension::CompletionKind::Unit,
-        lsp::CompletionItemKind::VALUE => extension::CompletionKind::Value,
-        lsp::CompletionItemKind::ENUM => extension::CompletionKind::Enum,
-        lsp::CompletionItemKind::KEYWORD => extension::CompletionKind::Keyword,
-        lsp::CompletionItemKind::SNIPPET => extension::CompletionKind::Snippet,
-        lsp::CompletionItemKind::COLOR => extension::CompletionKind::Color,
-        lsp::CompletionItemKind::FILE => extension::CompletionKind::File,
-        lsp::CompletionItemKind::REFERENCE => extension::CompletionKind::Reference,
-        lsp::CompletionItemKind::FOLDER => extension::CompletionKind::Folder,
-        lsp::CompletionItemKind::ENUM_MEMBER => extension::CompletionKind::EnumMember,
-        lsp::CompletionItemKind::CONSTANT => extension::CompletionKind::Constant,
-        lsp::CompletionItemKind::STRUCT => extension::CompletionKind::Struct,
-        lsp::CompletionItemKind::EVENT => extension::CompletionKind::Event,
-        lsp::CompletionItemKind::OPERATOR => extension::CompletionKind::Operator,
-        lsp::CompletionItemKind::TYPE_PARAMETER => extension::CompletionKind::TypeParameter,
-        _ => extension::CompletionKind::Other(extract_int(value)),
-    }
-}
-
-fn lsp_insert_text_format_to_extension(
-    value: lsp::InsertTextFormat,
-) -> extension::InsertTextFormat {
-    match value {
-        lsp::InsertTextFormat::PLAIN_TEXT => extension::InsertTextFormat::PlainText,
-        lsp::InsertTextFormat::SNIPPET => extension::InsertTextFormat::Snippet,
-        _ => extension::InsertTextFormat::Other(extract_int(value)),
-    }
-}
-
-fn lsp_symbol_kind_to_extension(value: lsp::SymbolKind) -> extension::SymbolKind {
-    match value {
-        lsp::SymbolKind::FILE => extension::SymbolKind::File,
-        lsp::SymbolKind::MODULE => extension::SymbolKind::Module,
-        lsp::SymbolKind::NAMESPACE => extension::SymbolKind::Namespace,
-        lsp::SymbolKind::PACKAGE => extension::SymbolKind::Package,
-        lsp::SymbolKind::CLASS => extension::SymbolKind::Class,
-        lsp::SymbolKind::METHOD => extension::SymbolKind::Method,
-        lsp::SymbolKind::PROPERTY => extension::SymbolKind::Property,
-        lsp::SymbolKind::FIELD => extension::SymbolKind::Field,
-        lsp::SymbolKind::CONSTRUCTOR => extension::SymbolKind::Constructor,
-        lsp::SymbolKind::ENUM => extension::SymbolKind::Enum,
-        lsp::SymbolKind::INTERFACE => extension::SymbolKind::Interface,
-        lsp::SymbolKind::FUNCTION => extension::SymbolKind::Function,
-        lsp::SymbolKind::VARIABLE => extension::SymbolKind::Variable,
-        lsp::SymbolKind::CONSTANT => extension::SymbolKind::Constant,
-        lsp::SymbolKind::STRING => extension::SymbolKind::String,
-        lsp::SymbolKind::NUMBER => extension::SymbolKind::Number,
-        lsp::SymbolKind::BOOLEAN => extension::SymbolKind::Boolean,
-        lsp::SymbolKind::ARRAY => extension::SymbolKind::Array,
-        lsp::SymbolKind::OBJECT => extension::SymbolKind::Object,
-        lsp::SymbolKind::KEY => extension::SymbolKind::Key,
-        lsp::SymbolKind::NULL => extension::SymbolKind::Null,
-        lsp::SymbolKind::ENUM_MEMBER => extension::SymbolKind::EnumMember,
-        lsp::SymbolKind::STRUCT => extension::SymbolKind::Struct,
-        lsp::SymbolKind::EVENT => extension::SymbolKind::Event,
-        lsp::SymbolKind::OPERATOR => extension::SymbolKind::Operator,
-        lsp::SymbolKind::TYPE_PARAMETER => extension::SymbolKind::TypeParameter,
-        _ => extension::SymbolKind::Other(extract_int(value)),
-    }
-}
-
-fn extract_int<T: Serialize>(value: T) -> i32 {
-    maybe!({
-        let kind = serde_json::to_value(&value)?;
-        serde_json::from_value(kind)
-    })
-    .log_err()
-    .unwrap_or(-1)
-}
-
-#[test]
-fn test_build_code_label() {
-    use util::test::marked_text_ranges;
-
-    let (code, code_ranges) = marked_text_ranges(
-        "«const» «a»: «fn»(«Bcd»(«Efgh»)) -> «Ijklm» = pqrs.tuv",
-        false,
-    );
-    let code_runs = code_ranges
-        .into_iter()
-        .map(|range| (range, HighlightId(0)))
-        .collect::<Vec<_>>();
-
-    let label = build_code_label(
-        &extension::CodeLabel {
-            spans: vec![
-                extension::CodeLabelSpan::CodeRange(code.find("pqrs").unwrap()..code.len()),
-                extension::CodeLabelSpan::CodeRange(
-                    code.find(": fn").unwrap()..code.find(" = ").unwrap(),
-                ),
-            ],
-            filter_range: 0.."pqrs.tuv".len(),
-            code,
-        },
-        &code_runs,
-        &language::PLAIN_TEXT,
-    )
-    .unwrap();
-
-    let (label_text, label_ranges) =
-        marked_text_ranges("pqrs.tuv: «fn»(«Bcd»(«Efgh»)) -> «Ijklm»", false);
-    let label_runs = label_ranges
-        .into_iter()
-        .map(|range| (range, HighlightId(0)))
-        .collect::<Vec<_>>();
-
-    assert_eq!(
-        label,
-        CodeLabel::new(label_text, label.filter_range.clone(), label_runs)
-    )
-}
-
-#[test]
-fn test_build_code_label_with_invalid_ranges() {
-    use util::test::marked_text_ranges;
-
-    let (code, code_ranges) = marked_text_ranges("const «a»: «B» = '🏀'", false);
-    let code_runs = code_ranges
-        .into_iter()
-        .map(|range| (range, HighlightId(0)))
-        .collect::<Vec<_>>();
-
-    // A span uses a code range that is invalid because it starts inside of
-    // a multi-byte character.
-    let label = build_code_label(
-        &extension::CodeLabel {
-            spans: vec![
-                extension::CodeLabelSpan::CodeRange(
-                    code.find('B').unwrap()..code.find(" = ").unwrap(),
-                ),
-                extension::CodeLabelSpan::CodeRange((code.find('🏀').unwrap() + 1)..code.len()),
-            ],
-            filter_range: 0.."B".len(),
-            code,
-        },
-        &code_runs,
-        &language::PLAIN_TEXT,
-    );
-    assert!(label.is_none());
-
-    // Filter range extends beyond actual text
-    let label = build_code_label(
-        &extension::CodeLabel {
-            spans: vec![extension::CodeLabelSpan::Literal(
-                extension::CodeLabelSpanLiteral {
-                    text: "abc".into(),
-                    highlight_name: Some("type".into()),
-                },
-            )],
-            filter_range: 0..5,
-            code: String::new(),
-        },
-        &code_runs,
-        &language::PLAIN_TEXT,
-    );
-    assert!(label.is_none());
-}
diff --git a/crates/language_extension/src/language_extension.rs b/crates/language_extension/src/language_extension.rs
deleted file mode 100644
index 510f870ce8..0000000000
--- a/crates/language_extension/src/language_extension.rs
+++ /dev/null
@@ -1,66 +0,0 @@
-mod extension_lsp_adapter;
-
-use std::path::PathBuf;
-use std::sync::Arc;
-
-use anyhow::Result;
-use extension::{ExtensionGrammarProxy, ExtensionHostProxy, ExtensionLanguageProxy};
-use gpui::{App, Entity};
-use language::{LanguageMatcher, LanguageName, LanguageRegistry, LoadedLanguage};
-use project::LspStore;
-
-#[derive(Clone)]
-pub enum LspAccess {
-    ViaLspStore(Entity<LspStore>),
-    ViaWorkspaces(Arc<dyn Fn(&mut App) -> Result<Vec<Entity<LspStore>>> + Send + Sync + 'static>),
-    Noop,
-}
-
-pub fn init(
-    lsp_access: LspAccess,
-    extension_host_proxy: Arc<ExtensionHostProxy>,
-    language_registry: Arc<LanguageRegistry>,
-) {
-    let language_server_registry_proxy = LanguageServerRegistryProxy {
-        language_registry,
-        lsp_access,
-    };
-    extension_host_proxy.register_grammar_proxy(language_server_registry_proxy.clone());
-    extension_host_proxy.register_language_proxy(language_server_registry_proxy.clone());
-    extension_host_proxy.register_language_server_proxy(language_server_registry_proxy);
-}
-
-#[derive(Clone)]
-struct LanguageServerRegistryProxy {
-    language_registry: Arc<LanguageRegistry>,
-    lsp_access: LspAccess,
-}
-
-impl ExtensionGrammarProxy for LanguageServerRegistryProxy {
-    fn register_grammars(&self, grammars: Vec<(Arc<str>, PathBuf)>) {
-        self.language_registry.register_wasm_grammars(grammars)
-    }
-}
-
-impl ExtensionLanguageProxy for LanguageServerRegistryProxy {
-    fn register_language(
-        &self,
-        language: LanguageName,
-        grammar: Option<Arc<str>>,
-        matcher: LanguageMatcher,
-        hidden: bool,
-        load: Arc<dyn Fn() -> Result<LoadedLanguage> + Send + Sync + 'static>,
-    ) {
-        self.language_registry
-            .register_language(language, grammar, matcher, hidden, None, load);
-    }
-
-    fn remove_languages(
-        &self,
-        languages_to_remove: &[LanguageName],
-        grammars_to_remove: &[Arc<str>],
-    ) {
-        self.language_registry
-            .remove_languages(languages_to_remove, grammars_to_remove);
-    }
-}
diff --git a/crates/language_model/Cargo.toml b/crates/language_model/Cargo.toml
deleted file mode 100644
index 7c6470f4fa..0000000000
--- a/crates/language_model/Cargo.toml
+++ /dev/null
@@ -1,46 +0,0 @@
-[package]
-name = "language_model"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/language_model.rs"
-doctest = false
-
-[features]
-test-support = []
-
-[dependencies]
-anthropic = { workspace = true, features = ["schemars"] }
-anyhow.workspace = true
-base64.workspace = true
-client.workspace = true
-cloud_api_types.workspace = true
-cloud_llm_client.workspace = true
-collections.workspace = true
-futures.workspace = true
-gpui.workspace = true
-http_client.workspace = true
-icons.workspace = true
-image.workspace = true
-log.workspace = true
-open_ai = { workspace = true, features = ["schemars"] }
-open_router.workspace = true
-parking_lot.workspace = true
-proto.workspace = true
-schemars.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-smol.workspace = true
-telemetry_events.workspace = true
-thiserror.workspace = true
-util.workspace = true
-
-[dev-dependencies]
-gpui = { workspace = true, features = ["test-support"] }
diff --git a/crates/language_model/LICENSE-GPL b/crates/language_model/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/language_model/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/language_model/src/fake_provider.rs b/crates/language_model/src/fake_provider.rs
deleted file mode 100644
index b06a475f93..0000000000
--- a/crates/language_model/src/fake_provider.rs
+++ /dev/null
@@ -1,285 +0,0 @@
-use crate::{
-    AuthenticateError, ConfigurationViewTargetAgent, LanguageModel, LanguageModelCompletionError,
-    LanguageModelCompletionEvent, LanguageModelId, LanguageModelName, LanguageModelProvider,
-    LanguageModelProviderId, LanguageModelProviderName, LanguageModelProviderState,
-    LanguageModelRequest, LanguageModelToolChoice,
-};
-use anyhow::anyhow;
-use futures::{FutureExt, channel::mpsc, future::BoxFuture, stream::BoxStream};
-use gpui::{AnyView, App, AsyncApp, Entity, Task, Window};
-use http_client::Result;
-use parking_lot::Mutex;
-use smol::stream::StreamExt;
-use std::sync::{
-    Arc,
-    atomic::{AtomicBool, Ordering::SeqCst},
-};
-
-#[derive(Clone)]
-pub struct FakeLanguageModelProvider {
-    id: LanguageModelProviderId,
-    name: LanguageModelProviderName,
-}
-
-impl Default for FakeLanguageModelProvider {
-    fn default() -> Self {
-        Self {
-            id: LanguageModelProviderId::from("fake".to_string()),
-            name: LanguageModelProviderName::from("Fake".to_string()),
-        }
-    }
-}
-
-impl LanguageModelProviderState for FakeLanguageModelProvider {
-    type ObservableEntity = ();
-
-    fn observable_entity(&self) -> Option<Entity<Self::ObservableEntity>> {
-        None
-    }
-}
-
-impl LanguageModelProvider for FakeLanguageModelProvider {
-    fn id(&self) -> LanguageModelProviderId {
-        self.id.clone()
-    }
-
-    fn name(&self) -> LanguageModelProviderName {
-        self.name.clone()
-    }
-
-    fn default_model(&self, _cx: &App) -> Option<Arc<dyn LanguageModel>> {
-        Some(Arc::new(FakeLanguageModel::default()))
-    }
-
-    fn default_fast_model(&self, _cx: &App) -> Option<Arc<dyn LanguageModel>> {
-        Some(Arc::new(FakeLanguageModel::default()))
-    }
-
-    fn provided_models(&self, _: &App) -> Vec<Arc<dyn LanguageModel>> {
-        vec![Arc::new(FakeLanguageModel::default())]
-    }
-
-    fn is_authenticated(&self, _: &App) -> bool {
-        true
-    }
-
-    fn authenticate(&self, _: &mut App) -> Task<Result<(), AuthenticateError>> {
-        Task::ready(Ok(()))
-    }
-
-    fn configuration_view(
-        &self,
-        _target_agent: ConfigurationViewTargetAgent,
-        _window: &mut Window,
-        _: &mut App,
-    ) -> AnyView {
-        unimplemented!()
-    }
-
-    fn reset_credentials(&self, _: &mut App) -> Task<Result<()>> {
-        Task::ready(Ok(()))
-    }
-}
-
-impl FakeLanguageModelProvider {
-    pub fn new(id: LanguageModelProviderId, name: LanguageModelProviderName) -> Self {
-        Self { id, name }
-    }
-
-    pub fn test_model(&self) -> FakeLanguageModel {
-        FakeLanguageModel::default()
-    }
-}
-
-#[derive(Debug, PartialEq)]
-pub struct ToolUseRequest {
-    pub request: LanguageModelRequest,
-    pub name: String,
-    pub description: String,
-    pub schema: serde_json::Value,
-}
-
-pub struct FakeLanguageModel {
-    provider_id: LanguageModelProviderId,
-    provider_name: LanguageModelProviderName,
-    current_completion_txs: Mutex<
-        Vec<(
-            LanguageModelRequest,
-            mpsc::UnboundedSender<
-                Result<LanguageModelCompletionEvent, LanguageModelCompletionError>,
-            >,
-        )>,
-    >,
-    forbid_requests: AtomicBool,
-}
-
-impl Default for FakeLanguageModel {
-    fn default() -> Self {
-        Self {
-            provider_id: LanguageModelProviderId::from("fake".to_string()),
-            provider_name: LanguageModelProviderName::from("Fake".to_string()),
-            current_completion_txs: Mutex::new(Vec::new()),
-            forbid_requests: AtomicBool::new(false),
-        }
-    }
-}
-
-impl FakeLanguageModel {
-    pub fn allow_requests(&self) {
-        self.forbid_requests.store(false, SeqCst);
-    }
-
-    pub fn forbid_requests(&self) {
-        self.forbid_requests.store(true, SeqCst);
-    }
-
-    pub fn pending_completions(&self) -> Vec<LanguageModelRequest> {
-        self.current_completion_txs
-            .lock()
-            .iter()
-            .map(|(request, _)| request.clone())
-            .collect()
-    }
-
-    pub fn completion_count(&self) -> usize {
-        self.current_completion_txs.lock().len()
-    }
-
-    pub fn send_completion_stream_text_chunk(
-        &self,
-        request: &LanguageModelRequest,
-        chunk: impl Into<String>,
-    ) {
-        self.send_completion_stream_event(
-            request,
-            LanguageModelCompletionEvent::Text(chunk.into()),
-        );
-    }
-
-    pub fn send_completion_stream_event(
-        &self,
-        request: &LanguageModelRequest,
-        event: impl Into<LanguageModelCompletionEvent>,
-    ) {
-        let current_completion_txs = self.current_completion_txs.lock();
-        let tx = current_completion_txs
-            .iter()
-            .find(|(req, _)| req == request)
-            .map(|(_, tx)| tx)
-            .unwrap();
-        tx.unbounded_send(Ok(event.into())).unwrap();
-    }
-
-    pub fn send_completion_stream_error(
-        &self,
-        request: &LanguageModelRequest,
-        error: impl Into<LanguageModelCompletionError>,
-    ) {
-        let current_completion_txs = self.current_completion_txs.lock();
-        let tx = current_completion_txs
-            .iter()
-            .find(|(req, _)| req == request)
-            .map(|(_, tx)| tx)
-            .unwrap();
-        tx.unbounded_send(Err(error.into())).unwrap();
-    }
-
-    pub fn end_completion_stream(&self, request: &LanguageModelRequest) {
-        self.current_completion_txs
-            .lock()
-            .retain(|(req, _)| req != request);
-    }
-
-    pub fn send_last_completion_stream_text_chunk(&self, chunk: impl Into<String>) {
-        self.send_completion_stream_text_chunk(self.pending_completions().last().unwrap(), chunk);
-    }
-
-    pub fn send_last_completion_stream_event(
-        &self,
-        event: impl Into<LanguageModelCompletionEvent>,
-    ) {
-        self.send_completion_stream_event(self.pending_completions().last().unwrap(), event);
-    }
-
-    pub fn send_last_completion_stream_error(
-        &self,
-        error: impl Into<LanguageModelCompletionError>,
-    ) {
-        self.send_completion_stream_error(self.pending_completions().last().unwrap(), error);
-    }
-
-    pub fn end_last_completion_stream(&self) {
-        self.end_completion_stream(self.pending_completions().last().unwrap());
-    }
-}
-
-impl LanguageModel for FakeLanguageModel {
-    fn id(&self) -> LanguageModelId {
-        LanguageModelId::from("fake".to_string())
-    }
-
-    fn name(&self) -> LanguageModelName {
-        LanguageModelName::from("Fake".to_string())
-    }
-
-    fn provider_id(&self) -> LanguageModelProviderId {
-        self.provider_id.clone()
-    }
-
-    fn provider_name(&self) -> LanguageModelProviderName {
-        self.provider_name.clone()
-    }
-
-    fn supports_tools(&self) -> bool {
-        false
-    }
-
-    fn supports_tool_choice(&self, _choice: LanguageModelToolChoice) -> bool {
-        false
-    }
-
-    fn supports_images(&self) -> bool {
-        false
-    }
-
-    fn telemetry_id(&self) -> String {
-        "fake".to_string()
-    }
-
-    fn max_token_count(&self) -> u64 {
-        1000000
-    }
-
-    fn count_tokens(&self, _: LanguageModelRequest, _: &App) -> BoxFuture<'static, Result<u64>> {
-        futures::future::ready(Ok(0)).boxed()
-    }
-
-    fn stream_completion(
-        &self,
-        request: LanguageModelRequest,
-        _: &AsyncApp,
-    ) -> BoxFuture<
-        'static,
-        Result<
-            BoxStream<'static, Result<LanguageModelCompletionEvent, LanguageModelCompletionError>>,
-            LanguageModelCompletionError,
-        >,
-    > {
-        if self.forbid_requests.load(SeqCst) {
-            async move {
-                Err(LanguageModelCompletionError::Other(anyhow!(
-                    "requests are forbidden"
-                )))
-            }
-            .boxed()
-        } else {
-            let (tx, rx) = mpsc::unbounded();
-            self.current_completion_txs.lock().push((request, tx));
-            async move { Ok(rx.boxed()) }.boxed()
-        }
-    }
-
-    fn as_fake(&self) -> &Self {
-        self
-    }
-}
diff --git a/crates/language_model/src/language_model.rs b/crates/language_model/src/language_model.rs
deleted file mode 100644
index cb03b84cbf..0000000000
--- a/crates/language_model/src/language_model.rs
+++ /dev/null
@@ -1,1086 +0,0 @@
-mod model;
-mod rate_limiter;
-mod registry;
-mod request;
-mod role;
-mod telemetry;
-pub mod tool_schema;
-
-#[cfg(any(test, feature = "test-support"))]
-pub mod fake_provider;
-
-use anthropic::{AnthropicError, parse_prompt_too_long};
-use anyhow::{Result, anyhow};
-use client::Client;
-use cloud_llm_client::{CompletionMode, CompletionRequestStatus, UsageLimit};
-use futures::FutureExt;
-use futures::{StreamExt, future::BoxFuture, stream::BoxStream};
-use gpui::{AnyView, App, AsyncApp, SharedString, Task, Window};
-use http_client::{StatusCode, http};
-use icons::IconName;
-use open_router::OpenRouterError;
-use parking_lot::Mutex;
-use serde::{Deserialize, Serialize};
-pub use settings::LanguageModelCacheConfiguration;
-use std::ops::{Add, Sub};
-use std::str::FromStr;
-use std::sync::Arc;
-use std::time::Duration;
-use std::{fmt, io};
-use thiserror::Error;
-use util::serde::is_default;
-
-pub use crate::model::*;
-pub use crate::rate_limiter::*;
-pub use crate::registry::*;
-pub use crate::request::*;
-pub use crate::role::*;
-pub use crate::telemetry::*;
-pub use crate::tool_schema::LanguageModelToolSchemaFormat;
-
-pub const ANTHROPIC_PROVIDER_ID: LanguageModelProviderId =
-    LanguageModelProviderId::new("anthropic");
-pub const ANTHROPIC_PROVIDER_NAME: LanguageModelProviderName =
-    LanguageModelProviderName::new("Anthropic");
-
-pub const GOOGLE_PROVIDER_ID: LanguageModelProviderId = LanguageModelProviderId::new("google");
-pub const GOOGLE_PROVIDER_NAME: LanguageModelProviderName =
-    LanguageModelProviderName::new("Google AI");
-
-pub const OPEN_AI_PROVIDER_ID: LanguageModelProviderId = LanguageModelProviderId::new("openai");
-pub const OPEN_AI_PROVIDER_NAME: LanguageModelProviderName =
-    LanguageModelProviderName::new("OpenAI");
-
-pub const X_AI_PROVIDER_ID: LanguageModelProviderId = LanguageModelProviderId::new("x_ai");
-pub const X_AI_PROVIDER_NAME: LanguageModelProviderName = LanguageModelProviderName::new("xAI");
-
-pub const ZED_CLOUD_PROVIDER_ID: LanguageModelProviderId = LanguageModelProviderId::new("zed.dev");
-pub const ZED_CLOUD_PROVIDER_NAME: LanguageModelProviderName =
-    LanguageModelProviderName::new("Zed");
-
-pub fn init(client: Arc<Client>, cx: &mut App) {
-    init_settings(cx);
-    RefreshLlmTokenListener::register(client, cx);
-}
-
-pub fn init_settings(cx: &mut App) {
-    registry::init(cx);
-}
-
-/// A completion event from a language model.
-#[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]
-pub enum LanguageModelCompletionEvent {
-    Queued {
-        position: usize,
-    },
-    Started,
-    UsageUpdated {
-        amount: usize,
-        limit: UsageLimit,
-    },
-    ToolUseLimitReached,
-    Stop(StopReason),
-    Text(String),
-    Thinking {
-        text: String,
-        signature: Option<String>,
-    },
-    RedactedThinking {
-        data: String,
-    },
-    ToolUse(LanguageModelToolUse),
-    ToolUseJsonParseError {
-        id: LanguageModelToolUseId,
-        tool_name: Arc<str>,
-        raw_input: Arc<str>,
-        json_parse_error: String,
-    },
-    StartMessage {
-        message_id: String,
-    },
-    ReasoningDetails(serde_json::Value),
-    UsageUpdate(TokenUsage),
-}
-
-impl LanguageModelCompletionEvent {
-    pub fn from_completion_request_status(
-        status: CompletionRequestStatus,
-        upstream_provider: LanguageModelProviderName,
-    ) -> Result<Self, LanguageModelCompletionError> {
-        match status {
-            CompletionRequestStatus::Queued { position } => {
-                Ok(LanguageModelCompletionEvent::Queued { position })
-            }
-            CompletionRequestStatus::Started => Ok(LanguageModelCompletionEvent::Started),
-            CompletionRequestStatus::UsageUpdated { amount, limit } => {
-                Ok(LanguageModelCompletionEvent::UsageUpdated { amount, limit })
-            }
-            CompletionRequestStatus::ToolUseLimitReached => {
-                Ok(LanguageModelCompletionEvent::ToolUseLimitReached)
-            }
-            CompletionRequestStatus::Failed {
-                code,
-                message,
-                request_id: _,
-                retry_after,
-            } => Err(LanguageModelCompletionError::from_cloud_failure(
-                upstream_provider,
-                code,
-                message,
-                retry_after.map(Duration::from_secs_f64),
-            )),
-        }
-    }
-}
-
-#[derive(Error, Debug)]
-pub enum LanguageModelCompletionError {
-    #[error("prompt too large for context window")]
-    PromptTooLarge { tokens: Option<u64> },
-    #[error("missing {provider} API key")]
-    NoApiKey { provider: LanguageModelProviderName },
-    #[error("{provider}'s API rate limit exceeded")]
-    RateLimitExceeded {
-        provider: LanguageModelProviderName,
-        retry_after: Option<Duration>,
-    },
-    #[error("{provider}'s API servers are overloaded right now")]
-    ServerOverloaded {
-        provider: LanguageModelProviderName,
-        retry_after: Option<Duration>,
-    },
-    #[error("{provider}'s API server reported an internal server error: {message}")]
-    ApiInternalServerError {
-        provider: LanguageModelProviderName,
-        message: String,
-    },
-    #[error("{message}")]
-    UpstreamProviderError {
-        message: String,
-        status: StatusCode,
-        retry_after: Option<Duration>,
-    },
-    #[error("HTTP response error from {provider}'s API: status {status_code} - {message:?}")]
-    HttpResponseError {
-        provider: LanguageModelProviderName,
-        status_code: StatusCode,
-        message: String,
-    },
-
-    // Client errors
-    #[error("invalid request format to {provider}'s API: {message}")]
-    BadRequestFormat {
-        provider: LanguageModelProviderName,
-        message: String,
-    },
-    #[error("authentication error with {provider}'s API: {message}")]
-    AuthenticationError {
-        provider: LanguageModelProviderName,
-        message: String,
-    },
-    #[error("Permission error with {provider}'s API: {message}")]
-    PermissionError {
-        provider: LanguageModelProviderName,
-        message: String,
-    },
-    #[error("language model provider API endpoint not found")]
-    ApiEndpointNotFound { provider: LanguageModelProviderName },
-    #[error("I/O error reading response from {provider}'s API")]
-    ApiReadResponseError {
-        provider: LanguageModelProviderName,
-        #[source]
-        error: io::Error,
-    },
-    #[error("error serializing request to {provider} API")]
-    SerializeRequest {
-        provider: LanguageModelProviderName,
-        #[source]
-        error: serde_json::Error,
-    },
-    #[error("error building request body to {provider} API")]
-    BuildRequestBody {
-        provider: LanguageModelProviderName,
-        #[source]
-        error: http::Error,
-    },
-    #[error("error sending HTTP request to {provider} API")]
-    HttpSend {
-        provider: LanguageModelProviderName,
-        #[source]
-        error: anyhow::Error,
-    },
-    #[error("error deserializing {provider} API response")]
-    DeserializeResponse {
-        provider: LanguageModelProviderName,
-        #[source]
-        error: serde_json::Error,
-    },
-
-    // TODO: Ideally this would be removed in favor of having a comprehensive list of errors.
-    #[error(transparent)]
-    Other(#[from] anyhow::Error),
-}
-
-impl LanguageModelCompletionError {
-    fn parse_upstream_error_json(message: &str) -> Option<(StatusCode, String)> {
-        let error_json = serde_json::from_str::<serde_json::Value>(message).ok()?;
-        let upstream_status = error_json
-            .get("upstream_status")
-            .and_then(|v| v.as_u64())
-            .and_then(|status| u16::try_from(status).ok())
-            .and_then(|status| StatusCode::from_u16(status).ok())?;
-        let inner_message = error_json
-            .get("message")
-            .and_then(|v| v.as_str())
-            .unwrap_or(message)
-            .to_string();
-        Some((upstream_status, inner_message))
-    }
-
-    pub fn from_cloud_failure(
-        upstream_provider: LanguageModelProviderName,
-        code: String,
-        message: String,
-        retry_after: Option<Duration>,
-    ) -> Self {
-        if let Some(tokens) = parse_prompt_too_long(&message) {
-            // TODO: currently Anthropic PAYLOAD_TOO_LARGE response may cause INTERNAL_SERVER_ERROR
-            // to be reported. This is a temporary workaround to handle this in the case where the
-            // token limit has been exceeded.
-            Self::PromptTooLarge {
-                tokens: Some(tokens),
-            }
-        } else if code == "upstream_http_error" {
-            if let Some((upstream_status, inner_message)) =
-                Self::parse_upstream_error_json(&message)
-            {
-                return Self::from_http_status(
-                    upstream_provider,
-                    upstream_status,
-                    inner_message,
-                    retry_after,
-                );
-            }
-            anyhow!("completion request failed, code: {code}, message: {message}").into()
-        } else if let Some(status_code) = code
-            .strip_prefix("upstream_http_")
-            .and_then(|code| StatusCode::from_str(code).ok())
-        {
-            Self::from_http_status(upstream_provider, status_code, message, retry_after)
-        } else if let Some(status_code) = code
-            .strip_prefix("http_")
-            .and_then(|code| StatusCode::from_str(code).ok())
-        {
-            Self::from_http_status(ZED_CLOUD_PROVIDER_NAME, status_code, message, retry_after)
-        } else {
-            anyhow!("completion request failed, code: {code}, message: {message}").into()
-        }
-    }
-
-    pub fn from_http_status(
-        provider: LanguageModelProviderName,
-        status_code: StatusCode,
-        message: String,
-        retry_after: Option<Duration>,
-    ) -> Self {
-        match status_code {
-            StatusCode::BAD_REQUEST => Self::BadRequestFormat { provider, message },
-            StatusCode::UNAUTHORIZED => Self::AuthenticationError { provider, message },
-            StatusCode::FORBIDDEN => Self::PermissionError { provider, message },
-            StatusCode::NOT_FOUND => Self::ApiEndpointNotFound { provider },
-            StatusCode::PAYLOAD_TOO_LARGE => Self::PromptTooLarge {
-                tokens: parse_prompt_too_long(&message),
-            },
-            StatusCode::TOO_MANY_REQUESTS => Self::RateLimitExceeded {
-                provider,
-                retry_after,
-            },
-            StatusCode::INTERNAL_SERVER_ERROR => Self::ApiInternalServerError { provider, message },
-            StatusCode::SERVICE_UNAVAILABLE => Self::ServerOverloaded {
-                provider,
-                retry_after,
-            },
-            _ if status_code.as_u16() == 529 => Self::ServerOverloaded {
-                provider,
-                retry_after,
-            },
-            _ => Self::HttpResponseError {
-                provider,
-                status_code,
-                message,
-            },
-        }
-    }
-}
-
-impl From<AnthropicError> for LanguageModelCompletionError {
-    fn from(error: AnthropicError) -> Self {
-        let provider = ANTHROPIC_PROVIDER_NAME;
-        match error {
-            AnthropicError::SerializeRequest(error) => Self::SerializeRequest { provider, error },
-            AnthropicError::BuildRequestBody(error) => Self::BuildRequestBody { provider, error },
-            AnthropicError::HttpSend(error) => Self::HttpSend { provider, error },
-            AnthropicError::DeserializeResponse(error) => {
-                Self::DeserializeResponse { provider, error }
-            }
-            AnthropicError::ReadResponse(error) => Self::ApiReadResponseError { provider, error },
-            AnthropicError::HttpResponseError {
-                status_code,
-                message,
-            } => Self::HttpResponseError {
-                provider,
-                status_code,
-                message,
-            },
-            AnthropicError::RateLimit { retry_after } => Self::RateLimitExceeded {
-                provider,
-                retry_after: Some(retry_after),
-            },
-            AnthropicError::ServerOverloaded { retry_after } => Self::ServerOverloaded {
-                provider,
-                retry_after,
-            },
-            AnthropicError::ApiError(api_error) => api_error.into(),
-        }
-    }
-}
-
-impl From<anthropic::ApiError> for LanguageModelCompletionError {
-    fn from(error: anthropic::ApiError) -> Self {
-        use anthropic::ApiErrorCode::*;
-        let provider = ANTHROPIC_PROVIDER_NAME;
-        match error.code() {
-            Some(code) => match code {
-                InvalidRequestError => Self::BadRequestFormat {
-                    provider,
-                    message: error.message,
-                },
-                AuthenticationError => Self::AuthenticationError {
-                    provider,
-                    message: error.message,
-                },
-                PermissionError => Self::PermissionError {
-                    provider,
-                    message: error.message,
-                },
-                NotFoundError => Self::ApiEndpointNotFound { provider },
-                RequestTooLarge => Self::PromptTooLarge {
-                    tokens: parse_prompt_too_long(&error.message),
-                },
-                RateLimitError => Self::RateLimitExceeded {
-                    provider,
-                    retry_after: None,
-                },
-                ApiError => Self::ApiInternalServerError {
-                    provider,
-                    message: error.message,
-                },
-                OverloadedError => Self::ServerOverloaded {
-                    provider,
-                    retry_after: None,
-                },
-            },
-            None => Self::Other(error.into()),
-        }
-    }
-}
-
-impl From<open_ai::RequestError> for LanguageModelCompletionError {
-    fn from(error: open_ai::RequestError) -> Self {
-        match error {
-            open_ai::RequestError::HttpResponseError {
-                provider,
-                status_code,
-                body,
-                headers,
-            } => {
-                let retry_after = headers
-                    .get(http::header::RETRY_AFTER)
-                    .and_then(|val| val.to_str().ok()?.parse::<u64>().ok())
-                    .map(Duration::from_secs);
-
-                Self::from_http_status(provider.into(), status_code, body, retry_after)
-            }
-            open_ai::RequestError::Other(e) => Self::Other(e),
-        }
-    }
-}
-
-impl From<OpenRouterError> for LanguageModelCompletionError {
-    fn from(error: OpenRouterError) -> Self {
-        let provider = LanguageModelProviderName::new("OpenRouter");
-        match error {
-            OpenRouterError::SerializeRequest(error) => Self::SerializeRequest { provider, error },
-            OpenRouterError::BuildRequestBody(error) => Self::BuildRequestBody { provider, error },
-            OpenRouterError::HttpSend(error) => Self::HttpSend { provider, error },
-            OpenRouterError::DeserializeResponse(error) => {
-                Self::DeserializeResponse { provider, error }
-            }
-            OpenRouterError::ReadResponse(error) => Self::ApiReadResponseError { provider, error },
-            OpenRouterError::RateLimit { retry_after } => Self::RateLimitExceeded {
-                provider,
-                retry_after: Some(retry_after),
-            },
-            OpenRouterError::ServerOverloaded { retry_after } => Self::ServerOverloaded {
-                provider,
-                retry_after,
-            },
-            OpenRouterError::ApiError(api_error) => api_error.into(),
-        }
-    }
-}
-
-impl From<open_router::ApiError> for LanguageModelCompletionError {
-    fn from(error: open_router::ApiError) -> Self {
-        use open_router::ApiErrorCode::*;
-        let provider = LanguageModelProviderName::new("OpenRouter");
-        match error.code {
-            InvalidRequestError => Self::BadRequestFormat {
-                provider,
-                message: error.message,
-            },
-            AuthenticationError => Self::AuthenticationError {
-                provider,
-                message: error.message,
-            },
-            PaymentRequiredError => Self::AuthenticationError {
-                provider,
-                message: format!("Payment required: {}", error.message),
-            },
-            PermissionError => Self::PermissionError {
-                provider,
-                message: error.message,
-            },
-            RequestTimedOut => Self::HttpResponseError {
-                provider,
-                status_code: StatusCode::REQUEST_TIMEOUT,
-                message: error.message,
-            },
-            RateLimitError => Self::RateLimitExceeded {
-                provider,
-                retry_after: None,
-            },
-            ApiError => Self::ApiInternalServerError {
-                provider,
-                message: error.message,
-            },
-            OverloadedError => Self::ServerOverloaded {
-                provider,
-                retry_after: None,
-            },
-        }
-    }
-}
-
-#[derive(Debug, PartialEq, Clone, Copy, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum StopReason {
-    EndTurn,
-    MaxTokens,
-    ToolUse,
-    Refusal,
-}
-
-#[derive(Debug, PartialEq, Clone, Copy, Serialize, Deserialize, Default)]
-pub struct TokenUsage {
-    #[serde(default, skip_serializing_if = "is_default")]
-    pub input_tokens: u64,
-    #[serde(default, skip_serializing_if = "is_default")]
-    pub output_tokens: u64,
-    #[serde(default, skip_serializing_if = "is_default")]
-    pub cache_creation_input_tokens: u64,
-    #[serde(default, skip_serializing_if = "is_default")]
-    pub cache_read_input_tokens: u64,
-}
-
-impl TokenUsage {
-    pub fn total_tokens(&self) -> u64 {
-        self.input_tokens
-            + self.output_tokens
-            + self.cache_read_input_tokens
-            + self.cache_creation_input_tokens
-    }
-}
-
-impl Add<TokenUsage> for TokenUsage {
-    type Output = Self;
-
-    fn add(self, other: Self) -> Self {
-        Self {
-            input_tokens: self.input_tokens + other.input_tokens,
-            output_tokens: self.output_tokens + other.output_tokens,
-            cache_creation_input_tokens: self.cache_creation_input_tokens
-                + other.cache_creation_input_tokens,
-            cache_read_input_tokens: self.cache_read_input_tokens + other.cache_read_input_tokens,
-        }
-    }
-}
-
-impl Sub<TokenUsage> for TokenUsage {
-    type Output = Self;
-
-    fn sub(self, other: Self) -> Self {
-        Self {
-            input_tokens: self.input_tokens - other.input_tokens,
-            output_tokens: self.output_tokens - other.output_tokens,
-            cache_creation_input_tokens: self.cache_creation_input_tokens
-                - other.cache_creation_input_tokens,
-            cache_read_input_tokens: self.cache_read_input_tokens - other.cache_read_input_tokens,
-        }
-    }
-}
-
-#[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize, Deserialize)]
-pub struct LanguageModelToolUseId(Arc<str>);
-
-impl fmt::Display for LanguageModelToolUseId {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
-impl<T> From<T> for LanguageModelToolUseId
-where
-    T: Into<Arc<str>>,
-{
-    fn from(value: T) -> Self {
-        Self(value.into())
-    }
-}
-
-#[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize, Deserialize)]
-pub struct LanguageModelToolUse {
-    pub id: LanguageModelToolUseId,
-    pub name: Arc<str>,
-    pub raw_input: String,
-    pub input: serde_json::Value,
-    pub is_input_complete: bool,
-    /// Thought signature the model sent us. Some models require that this
-    /// signature be preserved and sent back in conversation history for validation.
-    pub thought_signature: Option<String>,
-}
-
-pub struct LanguageModelTextStream {
-    pub message_id: Option<String>,
-    pub stream: BoxStream<'static, Result<String, LanguageModelCompletionError>>,
-    // Has complete token usage after the stream has finished
-    pub last_token_usage: Arc<Mutex<TokenUsage>>,
-}
-
-impl Default for LanguageModelTextStream {
-    fn default() -> Self {
-        Self {
-            message_id: None,
-            stream: Box::pin(futures::stream::empty()),
-            last_token_usage: Arc::new(Mutex::new(TokenUsage::default())),
-        }
-    }
-}
-
-pub trait LanguageModel: Send + Sync {
-    fn id(&self) -> LanguageModelId;
-    fn name(&self) -> LanguageModelName;
-    fn provider_id(&self) -> LanguageModelProviderId;
-    fn provider_name(&self) -> LanguageModelProviderName;
-    fn upstream_provider_id(&self) -> LanguageModelProviderId {
-        self.provider_id()
-    }
-    fn upstream_provider_name(&self) -> LanguageModelProviderName {
-        self.provider_name()
-    }
-
-    fn telemetry_id(&self) -> String;
-
-    fn api_key(&self, _cx: &App) -> Option<String> {
-        None
-    }
-
-    /// Whether this model supports images
-    fn supports_images(&self) -> bool;
-
-    /// Whether this model supports tools.
-    fn supports_tools(&self) -> bool;
-
-    /// Whether this model supports choosing which tool to use.
-    fn supports_tool_choice(&self, choice: LanguageModelToolChoice) -> bool;
-
-    /// Returns whether this model supports "burn mode";
-    fn supports_burn_mode(&self) -> bool {
-        false
-    }
-
-    fn tool_input_format(&self) -> LanguageModelToolSchemaFormat {
-        LanguageModelToolSchemaFormat::JsonSchema
-    }
-
-    fn max_token_count(&self) -> u64;
-    /// Returns the maximum token count for this model in burn mode (If `supports_burn_mode` is `false` this returns `None`)
-    fn max_token_count_in_burn_mode(&self) -> Option<u64> {
-        None
-    }
-    fn max_output_tokens(&self) -> Option<u64> {
-        None
-    }
-
-    fn count_tokens(
-        &self,
-        request: LanguageModelRequest,
-        cx: &App,
-    ) -> BoxFuture<'static, Result<u64>>;
-
-    fn stream_completion(
-        &self,
-        request: LanguageModelRequest,
-        cx: &AsyncApp,
-    ) -> BoxFuture<
-        'static,
-        Result<
-            BoxStream<'static, Result<LanguageModelCompletionEvent, LanguageModelCompletionError>>,
-            LanguageModelCompletionError,
-        >,
-    >;
-
-    fn stream_completion_text(
-        &self,
-        request: LanguageModelRequest,
-        cx: &AsyncApp,
-    ) -> BoxFuture<'static, Result<LanguageModelTextStream, LanguageModelCompletionError>> {
-        let future = self.stream_completion(request, cx);
-
-        async move {
-            let events = future.await?;
-            let mut events = events.fuse();
-            let mut message_id = None;
-            let mut first_item_text = None;
-            let last_token_usage = Arc::new(Mutex::new(TokenUsage::default()));
-
-            if let Some(first_event) = events.next().await {
-                match first_event {
-                    Ok(LanguageModelCompletionEvent::StartMessage { message_id: id }) => {
-                        message_id = Some(id);
-                    }
-                    Ok(LanguageModelCompletionEvent::Text(text)) => {
-                        first_item_text = Some(text);
-                    }
-                    _ => (),
-                }
-            }
-
-            let stream = futures::stream::iter(first_item_text.map(Ok))
-                .chain(events.filter_map({
-                    let last_token_usage = last_token_usage.clone();
-                    move |result| {
-                        let last_token_usage = last_token_usage.clone();
-                        async move {
-                            match result {
-                                Ok(LanguageModelCompletionEvent::Queued { .. }) => None,
-                                Ok(LanguageModelCompletionEvent::Started) => None,
-                                Ok(LanguageModelCompletionEvent::UsageUpdated { .. }) => None,
-                                Ok(LanguageModelCompletionEvent::ToolUseLimitReached) => None,
-                                Ok(LanguageModelCompletionEvent::StartMessage { .. }) => None,
-                                Ok(LanguageModelCompletionEvent::Text(text)) => Some(Ok(text)),
-                                Ok(LanguageModelCompletionEvent::Thinking { .. }) => None,
-                                Ok(LanguageModelCompletionEvent::RedactedThinking { .. }) => None,
-                                Ok(LanguageModelCompletionEvent::ReasoningDetails(_)) => None,
-                                Ok(LanguageModelCompletionEvent::Stop(_)) => None,
-                                Ok(LanguageModelCompletionEvent::ToolUse(_)) => None,
-                                Ok(LanguageModelCompletionEvent::ToolUseJsonParseError {
-                                    ..
-                                }) => None,
-                                Ok(LanguageModelCompletionEvent::UsageUpdate(token_usage)) => {
-                                    *last_token_usage.lock() = token_usage;
-                                    None
-                                }
-                                Err(err) => Some(Err(err)),
-                            }
-                        }
-                    }
-                }))
-                .boxed();
-
-            Ok(LanguageModelTextStream {
-                message_id,
-                stream,
-                last_token_usage,
-            })
-        }
-        .boxed()
-    }
-
-    fn stream_completion_tool(
-        &self,
-        request: LanguageModelRequest,
-        cx: &AsyncApp,
-    ) -> BoxFuture<'static, Result<LanguageModelToolUse, LanguageModelCompletionError>> {
-        let future = self.stream_completion(request, cx);
-
-        async move {
-            let events = future.await?;
-            let mut events = events.fuse();
-
-            // Iterate through events until we find a complete ToolUse
-            while let Some(event) = events.next().await {
-                match event {
-                    Ok(LanguageModelCompletionEvent::ToolUse(tool_use))
-                        if tool_use.is_input_complete =>
-                    {
-                        return Ok(tool_use);
-                    }
-                    Err(err) => {
-                        return Err(err);
-                    }
-                    _ => {}
-                }
-            }
-
-            // Stream ended without a complete tool use
-            Err(LanguageModelCompletionError::Other(anyhow::anyhow!(
-                "Stream ended without receiving a complete tool use"
-            )))
-        }
-        .boxed()
-    }
-
-    fn cache_configuration(&self) -> Option<LanguageModelCacheConfiguration> {
-        None
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    fn as_fake(&self) -> &fake_provider::FakeLanguageModel {
-        unimplemented!()
-    }
-}
-
-pub trait LanguageModelExt: LanguageModel {
-    fn max_token_count_for_mode(&self, mode: CompletionMode) -> u64 {
-        match mode {
-            CompletionMode::Normal => self.max_token_count(),
-            CompletionMode::Max => self
-                .max_token_count_in_burn_mode()
-                .unwrap_or_else(|| self.max_token_count()),
-        }
-    }
-}
-impl LanguageModelExt for dyn LanguageModel {}
-
-/// An error that occurred when trying to authenticate the language model provider.
-#[derive(Debug, Error)]
-pub enum AuthenticateError {
-    #[error("connection refused")]
-    ConnectionRefused,
-    #[error("credentials not found")]
-    CredentialsNotFound,
-    #[error(transparent)]
-    Other(#[from] anyhow::Error),
-}
-
-pub trait LanguageModelProvider: 'static {
-    fn id(&self) -> LanguageModelProviderId;
-    fn name(&self) -> LanguageModelProviderName;
-    fn icon(&self) -> IconName {
-        IconName::ZedAssistant
-    }
-    fn default_model(&self, cx: &App) -> Option<Arc<dyn LanguageModel>>;
-    fn default_fast_model(&self, cx: &App) -> Option<Arc<dyn LanguageModel>>;
-    fn provided_models(&self, cx: &App) -> Vec<Arc<dyn LanguageModel>>;
-    fn recommended_models(&self, _cx: &App) -> Vec<Arc<dyn LanguageModel>> {
-        Vec::new()
-    }
-    fn is_authenticated(&self, cx: &App) -> bool;
-    fn authenticate(&self, cx: &mut App) -> Task<Result<(), AuthenticateError>>;
-    fn configuration_view(
-        &self,
-        target_agent: ConfigurationViewTargetAgent,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> AnyView;
-    fn reset_credentials(&self, cx: &mut App) -> Task<Result<()>>;
-}
-
-#[derive(Default, Clone)]
-pub enum ConfigurationViewTargetAgent {
-    #[default]
-    ZedAgent,
-    Other(SharedString),
-}
-
-#[derive(PartialEq, Eq)]
-pub enum LanguageModelProviderTosView {
-    /// When there are some past interactions in the Agent Panel.
-    ThreadEmptyState,
-    /// When there are no past interactions in the Agent Panel.
-    ThreadFreshStart,
-    TextThreadPopup,
-    Configuration,
-}
-
-pub trait LanguageModelProviderState: 'static {
-    type ObservableEntity;
-
-    fn observable_entity(&self) -> Option<gpui::Entity<Self::ObservableEntity>>;
-
-    fn subscribe<T: 'static>(
-        &self,
-        cx: &mut gpui::Context<T>,
-        callback: impl Fn(&mut T, &mut gpui::Context<T>) + 'static,
-    ) -> Option<gpui::Subscription> {
-        let entity = self.observable_entity()?;
-        Some(cx.observe(&entity, move |this, _, cx| {
-            callback(this, cx);
-        }))
-    }
-}
-
-#[derive(Clone, Eq, PartialEq, Hash, Debug, Ord, PartialOrd, Serialize, Deserialize)]
-pub struct LanguageModelId(pub SharedString);
-
-#[derive(Clone, Eq, PartialEq, Hash, Debug, Ord, PartialOrd)]
-pub struct LanguageModelName(pub SharedString);
-
-#[derive(Clone, Eq, PartialEq, Hash, Debug, Ord, PartialOrd)]
-pub struct LanguageModelProviderId(pub SharedString);
-
-#[derive(Clone, Eq, PartialEq, Hash, Debug, Ord, PartialOrd)]
-pub struct LanguageModelProviderName(pub SharedString);
-
-impl LanguageModelProviderId {
-    pub const fn new(id: &'static str) -> Self {
-        Self(SharedString::new_static(id))
-    }
-}
-
-impl LanguageModelProviderName {
-    pub const fn new(id: &'static str) -> Self {
-        Self(SharedString::new_static(id))
-    }
-}
-
-impl fmt::Display for LanguageModelProviderId {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
-impl fmt::Display for LanguageModelProviderName {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
-impl From<String> for LanguageModelId {
-    fn from(value: String) -> Self {
-        Self(SharedString::from(value))
-    }
-}
-
-impl From<String> for LanguageModelName {
-    fn from(value: String) -> Self {
-        Self(SharedString::from(value))
-    }
-}
-
-impl From<String> for LanguageModelProviderId {
-    fn from(value: String) -> Self {
-        Self(SharedString::from(value))
-    }
-}
-
-impl From<String> for LanguageModelProviderName {
-    fn from(value: String) -> Self {
-        Self(SharedString::from(value))
-    }
-}
-
-impl From<Arc<str>> for LanguageModelProviderId {
-    fn from(value: Arc<str>) -> Self {
-        Self(SharedString::from(value))
-    }
-}
-
-impl From<Arc<str>> for LanguageModelProviderName {
-    fn from(value: Arc<str>) -> Self {
-        Self(SharedString::from(value))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_from_cloud_failure_with_upstream_http_error() {
-        let error = LanguageModelCompletionError::from_cloud_failure(
-            String::from("anthropic").into(),
-            "upstream_http_error".to_string(),
-            r#"{"code":"upstream_http_error","message":"Received an error from the Anthropic API: upstream connect error or disconnect/reset before headers. reset reason: connection timeout","upstream_status":503}"#.to_string(),
-            None,
-        );
-
-        match error {
-            LanguageModelCompletionError::ServerOverloaded { provider, .. } => {
-                assert_eq!(provider.0, "anthropic");
-            }
-            _ => panic!(
-                "Expected ServerOverloaded error for 503 status, got: {:?}",
-                error
-            ),
-        }
-
-        let error = LanguageModelCompletionError::from_cloud_failure(
-            String::from("anthropic").into(),
-            "upstream_http_error".to_string(),
-            r#"{"code":"upstream_http_error","message":"Internal server error","upstream_status":500}"#.to_string(),
-            None,
-        );
-
-        match error {
-            LanguageModelCompletionError::ApiInternalServerError { provider, message } => {
-                assert_eq!(provider.0, "anthropic");
-                assert_eq!(message, "Internal server error");
-            }
-            _ => panic!(
-                "Expected ApiInternalServerError for 500 status, got: {:?}",
-                error
-            ),
-        }
-    }
-
-    #[test]
-    fn test_from_cloud_failure_with_standard_format() {
-        let error = LanguageModelCompletionError::from_cloud_failure(
-            String::from("anthropic").into(),
-            "upstream_http_503".to_string(),
-            "Service unavailable".to_string(),
-            None,
-        );
-
-        match error {
-            LanguageModelCompletionError::ServerOverloaded { provider, .. } => {
-                assert_eq!(provider.0, "anthropic");
-            }
-            _ => panic!("Expected ServerOverloaded error for upstream_http_503"),
-        }
-    }
-
-    #[test]
-    fn test_upstream_http_error_connection_timeout() {
-        let error = LanguageModelCompletionError::from_cloud_failure(
-            String::from("anthropic").into(),
-            "upstream_http_error".to_string(),
-            r#"{"code":"upstream_http_error","message":"Received an error from the Anthropic API: upstream connect error or disconnect/reset before headers. reset reason: connection timeout","upstream_status":503}"#.to_string(),
-            None,
-        );
-
-        match error {
-            LanguageModelCompletionError::ServerOverloaded { provider, .. } => {
-                assert_eq!(provider.0, "anthropic");
-            }
-            _ => panic!(
-                "Expected ServerOverloaded error for connection timeout with 503 status, got: {:?}",
-                error
-            ),
-        }
-
-        let error = LanguageModelCompletionError::from_cloud_failure(
-            String::from("anthropic").into(),
-            "upstream_http_error".to_string(),
-            r#"{"code":"upstream_http_error","message":"Received an error from the Anthropic API: upstream connect error or disconnect/reset before headers. reset reason: connection timeout","upstream_status":500}"#.to_string(),
-            None,
-        );
-
-        match error {
-            LanguageModelCompletionError::ApiInternalServerError { provider, message } => {
-                assert_eq!(provider.0, "anthropic");
-                assert_eq!(
-                    message,
-                    "Received an error from the Anthropic API: upstream connect error or disconnect/reset before headers. reset reason: connection timeout"
-                );
-            }
-            _ => panic!(
-                "Expected ApiInternalServerError for connection timeout with 500 status, got: {:?}",
-                error
-            ),
-        }
-    }
-
-    #[test]
-    fn test_language_model_tool_use_serializes_with_signature() {
-        use serde_json::json;
-
-        let tool_use = LanguageModelToolUse {
-            id: LanguageModelToolUseId::from("test_id"),
-            name: "test_tool".into(),
-            raw_input: json!({"arg": "value"}).to_string(),
-            input: json!({"arg": "value"}),
-            is_input_complete: true,
-            thought_signature: Some("test_signature".to_string()),
-        };
-
-        let serialized = serde_json::to_value(&tool_use).unwrap();
-
-        assert_eq!(serialized["id"], "test_id");
-        assert_eq!(serialized["name"], "test_tool");
-        assert_eq!(serialized["thought_signature"], "test_signature");
-    }
-
-    #[test]
-    fn test_language_model_tool_use_deserializes_with_missing_signature() {
-        use serde_json::json;
-
-        let json = json!({
-            "id": "test_id",
-            "name": "test_tool",
-            "raw_input": "{\"arg\":\"value\"}",
-            "input": {"arg": "value"},
-            "is_input_complete": true
-        });
-
-        let tool_use: LanguageModelToolUse = serde_json::from_value(json).unwrap();
-
-        assert_eq!(tool_use.id, LanguageModelToolUseId::from("test_id"));
-        assert_eq!(tool_use.name.as_ref(), "test_tool");
-        assert_eq!(tool_use.thought_signature, None);
-    }
-
-    #[test]
-    fn test_language_model_tool_use_round_trip_with_signature() {
-        use serde_json::json;
-
-        let original = LanguageModelToolUse {
-            id: LanguageModelToolUseId::from("round_trip_id"),
-            name: "round_trip_tool".into(),
-            raw_input: json!({"key": "value"}).to_string(),
-            input: json!({"key": "value"}),
-            is_input_complete: true,
-            thought_signature: Some("round_trip_sig".to_string()),
-        };
-
-        let serialized = serde_json::to_value(&original).unwrap();
-        let deserialized: LanguageModelToolUse = serde_json::from_value(serialized).unwrap();
-
-        assert_eq!(deserialized.id, original.id);
-        assert_eq!(deserialized.name, original.name);
-        assert_eq!(deserialized.thought_signature, original.thought_signature);
-    }
-
-    #[test]
-    fn test_language_model_tool_use_round_trip_without_signature() {
-        use serde_json::json;
-
-        let original = LanguageModelToolUse {
-            id: LanguageModelToolUseId::from("no_sig_id"),
-            name: "no_sig_tool".into(),
-            raw_input: json!({"arg": "value"}).to_string(),
-            input: json!({"arg": "value"}),
-            is_input_complete: true,
-            thought_signature: None,
-        };
-
-        let serialized = serde_json::to_value(&original).unwrap();
-        let deserialized: LanguageModelToolUse = serde_json::from_value(serialized).unwrap();
-
-        assert_eq!(deserialized.id, original.id);
-        assert_eq!(deserialized.name, original.name);
-        assert_eq!(deserialized.thought_signature, None);
-    }
-}
diff --git a/crates/language_model/src/model/cloud_model.rs b/crates/language_model/src/model/cloud_model.rs
deleted file mode 100644
index e25ed0de50..0000000000
--- a/crates/language_model/src/model/cloud_model.rs
+++ /dev/null
@@ -1,130 +0,0 @@
-use std::fmt;
-use std::sync::Arc;
-
-use anyhow::Result;
-use client::Client;
-use cloud_api_types::websocket_protocol::MessageToClient;
-use cloud_llm_client::{Plan, PlanV1};
-use gpui::{App, AppContext as _, Context, Entity, EventEmitter, Global, ReadGlobal as _};
-use smol::lock::{RwLock, RwLockUpgradableReadGuard, RwLockWriteGuard};
-use thiserror::Error;
-
-#[derive(Error, Debug)]
-pub struct PaymentRequiredError;
-
-impl fmt::Display for PaymentRequiredError {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(
-            f,
-            "Payment required to use this language model. Please upgrade your account."
-        )
-    }
-}
-
-#[derive(Error, Debug)]
-pub struct ModelRequestLimitReachedError {
-    pub plan: Plan,
-}
-
-impl fmt::Display for ModelRequestLimitReachedError {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        let message = match self.plan {
-            Plan::V1(PlanV1::ZedFree) => {
-                "Model request limit reached. Upgrade to Zed Pro for more requests."
-            }
-            Plan::V1(PlanV1::ZedPro) => {
-                "Model request limit reached. Upgrade to usage-based billing for more requests."
-            }
-            Plan::V1(PlanV1::ZedProTrial) => {
-                "Model request limit reached. Upgrade to Zed Pro for more requests."
-            }
-            Plan::V2(_) => "Model request limit reached.",
-        };
-
-        write!(f, "{message}")
-    }
-}
-
-#[derive(Error, Debug)]
-pub struct ToolUseLimitReachedError;
-
-impl fmt::Display for ToolUseLimitReachedError {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(
-            f,
-            "Consecutive tool use limit reached. Enable Burn Mode for unlimited tool use."
-        )
-    }
-}
-
-#[derive(Clone, Default)]
-pub struct LlmApiToken(Arc<RwLock<Option<String>>>);
-
-impl LlmApiToken {
-    pub async fn acquire(&self, client: &Arc<Client>) -> Result<String> {
-        let lock = self.0.upgradable_read().await;
-        if let Some(token) = lock.as_ref() {
-            Ok(token.to_string())
-        } else {
-            Self::fetch(RwLockUpgradableReadGuard::upgrade(lock).await, client).await
-        }
-    }
-
-    pub async fn refresh(&self, client: &Arc<Client>) -> Result<String> {
-        Self::fetch(self.0.write().await, client).await
-    }
-
-    async fn fetch(
-        mut lock: RwLockWriteGuard<'_, Option<String>>,
-        client: &Arc<Client>,
-    ) -> Result<String> {
-        let system_id = client
-            .telemetry()
-            .system_id()
-            .map(|system_id| system_id.to_string());
-
-        let response = client.cloud_client().create_llm_token(system_id).await?;
-        *lock = Some(response.token.0.clone());
-        Ok(response.token.0)
-    }
-}
-
-struct GlobalRefreshLlmTokenListener(Entity<RefreshLlmTokenListener>);
-
-impl Global for GlobalRefreshLlmTokenListener {}
-
-pub struct RefreshLlmTokenEvent;
-
-pub struct RefreshLlmTokenListener;
-
-impl EventEmitter<RefreshLlmTokenEvent> for RefreshLlmTokenListener {}
-
-impl RefreshLlmTokenListener {
-    pub fn register(client: Arc<Client>, cx: &mut App) {
-        let listener = cx.new(|cx| RefreshLlmTokenListener::new(client, cx));
-        cx.set_global(GlobalRefreshLlmTokenListener(listener));
-    }
-
-    pub fn global(cx: &App) -> Entity<Self> {
-        GlobalRefreshLlmTokenListener::global(cx).0.clone()
-    }
-
-    fn new(client: Arc<Client>, cx: &mut Context<Self>) -> Self {
-        client.add_message_to_client_handler({
-            let this = cx.entity();
-            move |message, cx| {
-                Self::handle_refresh_llm_token(this.clone(), message, cx);
-            }
-        });
-
-        Self
-    }
-
-    fn handle_refresh_llm_token(this: Entity<Self>, message: &MessageToClient, cx: &mut App) {
-        match message {
-            MessageToClient::UserUpdated => {
-                this.update(cx, |_this, cx| cx.emit(RefreshLlmTokenEvent));
-            }
-        }
-    }
-}
diff --git a/crates/language_model/src/model/mod.rs b/crates/language_model/src/model/mod.rs
deleted file mode 100644
index db4c55daa7..0000000000
--- a/crates/language_model/src/model/mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-pub mod cloud_model;
-
-pub use cloud_model::*;
diff --git a/crates/language_model/src/rate_limiter.rs b/crates/language_model/src/rate_limiter.rs
deleted file mode 100644
index 790be05ac0..0000000000
--- a/crates/language_model/src/rate_limiter.rs
+++ /dev/null
@@ -1,77 +0,0 @@
-use futures::Stream;
-use smol::lock::{Semaphore, SemaphoreGuardArc};
-use std::{
-    future::Future,
-    pin::Pin,
-    sync::Arc,
-    task::{Context, Poll},
-};
-
-use crate::LanguageModelCompletionError;
-
-#[derive(Clone)]
-pub struct RateLimiter {
-    semaphore: Arc<Semaphore>,
-}
-
-pub struct RateLimitGuard<T> {
-    inner: T,
-    _guard: SemaphoreGuardArc,
-}
-
-impl<T> Stream for RateLimitGuard<T>
-where
-    T: Stream,
-{
-    type Item = T::Item;
-
-    fn poll_next(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Option<Self::Item>> {
-        unsafe { Pin::map_unchecked_mut(self, |this| &mut this.inner).poll_next(cx) }
-    }
-}
-
-impl RateLimiter {
-    pub fn new(limit: usize) -> Self {
-        Self {
-            semaphore: Arc::new(Semaphore::new(limit)),
-        }
-    }
-
-    pub fn run<'a, Fut, T>(
-        &self,
-        future: Fut,
-    ) -> impl 'a + Future<Output = Result<T, LanguageModelCompletionError>>
-    where
-        Fut: 'a + Future<Output = Result<T, LanguageModelCompletionError>>,
-    {
-        let guard = self.semaphore.acquire_arc();
-        async move {
-            let guard = guard.await;
-            let result = future.await?;
-            drop(guard);
-            Ok(result)
-        }
-    }
-
-    pub fn stream<'a, Fut, T>(
-        &self,
-        future: Fut,
-    ) -> impl 'a
-    + Future<
-        Output = Result<impl Stream<Item = T::Item> + use<Fut, T>, LanguageModelCompletionError>,
-    >
-    where
-        Fut: 'a + Future<Output = Result<T, LanguageModelCompletionError>>,
-        T: Stream,
-    {
-        let guard = self.semaphore.acquire_arc();
-        async move {
-            let guard = guard.await;
-            let inner = future.await?;
-            Ok(RateLimitGuard {
-                inner,
-                _guard: guard,
-            })
-        }
-    }
-}
diff --git a/crates/language_model/src/registry.rs b/crates/language_model/src/registry.rs
deleted file mode 100644
index 27b8309810..0000000000
--- a/crates/language_model/src/registry.rs
+++ /dev/null
@@ -1,419 +0,0 @@
-use crate::{
-    LanguageModel, LanguageModelId, LanguageModelProvider, LanguageModelProviderId,
-    LanguageModelProviderState,
-};
-use collections::BTreeMap;
-use gpui::{App, Context, Entity, EventEmitter, Global, prelude::*};
-use std::{str::FromStr, sync::Arc};
-use thiserror::Error;
-use util::maybe;
-
-pub fn init(cx: &mut App) {
-    let registry = cx.new(|_cx| LanguageModelRegistry::default());
-    cx.set_global(GlobalLanguageModelRegistry(registry));
-}
-
-struct GlobalLanguageModelRegistry(Entity<LanguageModelRegistry>);
-
-impl Global for GlobalLanguageModelRegistry {}
-
-#[derive(Error)]
-pub enum ConfigurationError {
-    #[error("Configure at least one LLM provider to start using the panel.")]
-    NoProvider,
-    #[error("LLM provider is not configured or does not support the configured model.")]
-    ModelNotFound,
-    #[error("{} LLM provider is not configured.", .0.name().0)]
-    ProviderNotAuthenticated(Arc<dyn LanguageModelProvider>),
-}
-
-impl std::fmt::Debug for ConfigurationError {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Self::NoProvider => write!(f, "NoProvider"),
-            Self::ModelNotFound => write!(f, "ModelNotFound"),
-            Self::ProviderNotAuthenticated(provider) => {
-                write!(f, "ProviderNotAuthenticated({})", provider.id())
-            }
-        }
-    }
-}
-
-#[derive(Default)]
-pub struct LanguageModelRegistry {
-    default_model: Option<ConfiguredModel>,
-    default_fast_model: Option<ConfiguredModel>,
-    inline_assistant_model: Option<ConfiguredModel>,
-    commit_message_model: Option<ConfiguredModel>,
-    thread_summary_model: Option<ConfiguredModel>,
-    providers: BTreeMap<LanguageModelProviderId, Arc<dyn LanguageModelProvider>>,
-    inline_alternatives: Vec<Arc<dyn LanguageModel>>,
-}
-
-#[derive(Debug)]
-pub struct SelectedModel {
-    pub provider: LanguageModelProviderId,
-    pub model: LanguageModelId,
-}
-
-impl FromStr for SelectedModel {
-    type Err = String;
-
-    /// Parse string identifiers like `provider_id/model_id` into a `SelectedModel`
-    fn from_str(id: &str) -> Result<SelectedModel, Self::Err> {
-        let parts: Vec<&str> = id.split('/').collect();
-        let [provider_id, model_id] = parts.as_slice() else {
-            return Err(format!(
-                "Invalid model identifier format: `{}`. Expected `provider_id/model_id`",
-                id
-            ));
-        };
-
-        if provider_id.is_empty() || model_id.is_empty() {
-            return Err(format!("Provider and model ids can't be empty: `{}`", id));
-        }
-
-        Ok(SelectedModel {
-            provider: LanguageModelProviderId(provider_id.to_string().into()),
-            model: LanguageModelId(model_id.to_string().into()),
-        })
-    }
-}
-
-#[derive(Clone)]
-pub struct ConfiguredModel {
-    pub provider: Arc<dyn LanguageModelProvider>,
-    pub model: Arc<dyn LanguageModel>,
-}
-
-impl ConfiguredModel {
-    pub fn is_same_as(&self, other: &ConfiguredModel) -> bool {
-        self.model.id() == other.model.id() && self.provider.id() == other.provider.id()
-    }
-
-    pub fn is_provided_by_zed(&self) -> bool {
-        self.provider.id() == crate::ZED_CLOUD_PROVIDER_ID
-    }
-}
-
-pub enum Event {
-    DefaultModelChanged,
-    InlineAssistantModelChanged,
-    CommitMessageModelChanged,
-    ThreadSummaryModelChanged,
-    ProviderStateChanged(LanguageModelProviderId),
-    AddedProvider(LanguageModelProviderId),
-    RemovedProvider(LanguageModelProviderId),
-}
-
-impl EventEmitter<Event> for LanguageModelRegistry {}
-
-impl LanguageModelRegistry {
-    pub fn global(cx: &App) -> Entity<Self> {
-        cx.global::<GlobalLanguageModelRegistry>().0.clone()
-    }
-
-    pub fn read_global(cx: &App) -> &Self {
-        cx.global::<GlobalLanguageModelRegistry>().0.read(cx)
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn test(cx: &mut App) -> Arc<crate::fake_provider::FakeLanguageModelProvider> {
-        let fake_provider = Arc::new(crate::fake_provider::FakeLanguageModelProvider::default());
-        let registry = cx.new(|cx| {
-            let mut registry = Self::default();
-            registry.register_provider(fake_provider.clone(), cx);
-            let model = fake_provider.provided_models(cx)[0].clone();
-            let configured_model = ConfiguredModel {
-                provider: fake_provider.clone(),
-                model,
-            };
-            registry.set_default_model(Some(configured_model), cx);
-            registry
-        });
-        cx.set_global(GlobalLanguageModelRegistry(registry));
-        fake_provider
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn fake_model(&self) -> Arc<dyn LanguageModel> {
-        self.default_model.as_ref().unwrap().model.clone()
-    }
-
-    pub fn register_provider<T: LanguageModelProvider + LanguageModelProviderState>(
-        &mut self,
-        provider: Arc<T>,
-        cx: &mut Context<Self>,
-    ) {
-        let id = provider.id();
-
-        let subscription = provider.subscribe(cx, {
-            let id = id.clone();
-            move |_, cx| {
-                cx.emit(Event::ProviderStateChanged(id.clone()));
-            }
-        });
-        if let Some(subscription) = subscription {
-            subscription.detach();
-        }
-
-        self.providers.insert(id.clone(), provider);
-        cx.emit(Event::AddedProvider(id));
-    }
-
-    pub fn unregister_provider(&mut self, id: LanguageModelProviderId, cx: &mut Context<Self>) {
-        if self.providers.remove(&id).is_some() {
-            cx.emit(Event::RemovedProvider(id));
-        }
-    }
-
-    pub fn providers(&self) -> Vec<Arc<dyn LanguageModelProvider>> {
-        let zed_provider_id = LanguageModelProviderId("zed.dev".into());
-        let mut providers = Vec::with_capacity(self.providers.len());
-        if let Some(provider) = self.providers.get(&zed_provider_id) {
-            providers.push(provider.clone());
-        }
-        providers.extend(self.providers.values().filter_map(|p| {
-            if p.id() != zed_provider_id {
-                Some(p.clone())
-            } else {
-                None
-            }
-        }));
-        providers
-    }
-
-    pub fn configuration_error(
-        &self,
-        model: Option<ConfiguredModel>,
-        cx: &App,
-    ) -> Option<ConfigurationError> {
-        let Some(model) = model else {
-            if !self.has_authenticated_provider(cx) {
-                return Some(ConfigurationError::NoProvider);
-            }
-            return Some(ConfigurationError::ModelNotFound);
-        };
-
-        if !model.provider.is_authenticated(cx) {
-            return Some(ConfigurationError::ProviderNotAuthenticated(model.provider));
-        }
-
-        None
-    }
-
-    /// Returns `true` if at least one provider that is authenticated.
-    pub fn has_authenticated_provider(&self, cx: &App) -> bool {
-        self.providers.values().any(|p| p.is_authenticated(cx))
-    }
-
-    pub fn available_models<'a>(
-        &'a self,
-        cx: &'a App,
-    ) -> impl Iterator<Item = Arc<dyn LanguageModel>> + 'a {
-        self.providers
-            .values()
-            .filter(|provider| provider.is_authenticated(cx))
-            .flat_map(|provider| provider.provided_models(cx))
-    }
-
-    pub fn provider(&self, id: &LanguageModelProviderId) -> Option<Arc<dyn LanguageModelProvider>> {
-        self.providers.get(id).cloned()
-    }
-
-    pub fn select_default_model(&mut self, model: Option<&SelectedModel>, cx: &mut Context<Self>) {
-        let configured_model = model.and_then(|model| self.select_model(model, cx));
-        self.set_default_model(configured_model, cx);
-    }
-
-    pub fn select_inline_assistant_model(
-        &mut self,
-        model: Option<&SelectedModel>,
-        cx: &mut Context<Self>,
-    ) {
-        let configured_model = model.and_then(|model| self.select_model(model, cx));
-        self.set_inline_assistant_model(configured_model, cx);
-    }
-
-    pub fn select_commit_message_model(
-        &mut self,
-        model: Option<&SelectedModel>,
-        cx: &mut Context<Self>,
-    ) {
-        let configured_model = model.and_then(|model| self.select_model(model, cx));
-        self.set_commit_message_model(configured_model, cx);
-    }
-
-    pub fn select_thread_summary_model(
-        &mut self,
-        model: Option<&SelectedModel>,
-        cx: &mut Context<Self>,
-    ) {
-        let configured_model = model.and_then(|model| self.select_model(model, cx));
-        self.set_thread_summary_model(configured_model, cx);
-    }
-
-    /// Selects and sets the inline alternatives for language models based on
-    /// provider name and id.
-    pub fn select_inline_alternative_models(
-        &mut self,
-        alternatives: impl IntoIterator<Item = SelectedModel>,
-        cx: &mut Context<Self>,
-    ) {
-        self.inline_alternatives = alternatives
-            .into_iter()
-            .flat_map(|alternative| {
-                self.select_model(&alternative, cx)
-                    .map(|configured_model| configured_model.model)
-            })
-            .collect::<Vec<_>>();
-    }
-
-    pub fn select_model(
-        &mut self,
-        selected_model: &SelectedModel,
-        cx: &mut Context<Self>,
-    ) -> Option<ConfiguredModel> {
-        let provider = self.provider(&selected_model.provider)?;
-        let model = provider
-            .provided_models(cx)
-            .iter()
-            .find(|model| model.id() == selected_model.model)?
-            .clone();
-        Some(ConfiguredModel { provider, model })
-    }
-
-    pub fn set_default_model(&mut self, model: Option<ConfiguredModel>, cx: &mut Context<Self>) {
-        match (self.default_model.as_ref(), model.as_ref()) {
-            (Some(old), Some(new)) if old.is_same_as(new) => {}
-            (None, None) => {}
-            _ => cx.emit(Event::DefaultModelChanged),
-        }
-        self.default_fast_model = maybe!({
-            let provider = &model.as_ref()?.provider;
-            let fast_model = provider.default_fast_model(cx)?;
-            Some(ConfiguredModel {
-                provider: provider.clone(),
-                model: fast_model,
-            })
-        });
-        self.default_model = model;
-    }
-
-    pub fn set_inline_assistant_model(
-        &mut self,
-        model: Option<ConfiguredModel>,
-        cx: &mut Context<Self>,
-    ) {
-        match (self.inline_assistant_model.as_ref(), model.as_ref()) {
-            (Some(old), Some(new)) if old.is_same_as(new) => {}
-            (None, None) => {}
-            _ => cx.emit(Event::InlineAssistantModelChanged),
-        }
-        self.inline_assistant_model = model;
-    }
-
-    pub fn set_commit_message_model(
-        &mut self,
-        model: Option<ConfiguredModel>,
-        cx: &mut Context<Self>,
-    ) {
-        match (self.commit_message_model.as_ref(), model.as_ref()) {
-            (Some(old), Some(new)) if old.is_same_as(new) => {}
-            (None, None) => {}
-            _ => cx.emit(Event::CommitMessageModelChanged),
-        }
-        self.commit_message_model = model;
-    }
-
-    pub fn set_thread_summary_model(
-        &mut self,
-        model: Option<ConfiguredModel>,
-        cx: &mut Context<Self>,
-    ) {
-        match (self.thread_summary_model.as_ref(), model.as_ref()) {
-            (Some(old), Some(new)) if old.is_same_as(new) => {}
-            (None, None) => {}
-            _ => cx.emit(Event::ThreadSummaryModelChanged),
-        }
-        self.thread_summary_model = model;
-    }
-
-    pub fn default_model(&self) -> Option<ConfiguredModel> {
-        #[cfg(debug_assertions)]
-        if std::env::var("ZED_SIMULATE_NO_LLM_PROVIDER").is_ok() {
-            return None;
-        }
-
-        self.default_model.clone()
-    }
-
-    pub fn inline_assistant_model(&self) -> Option<ConfiguredModel> {
-        #[cfg(debug_assertions)]
-        if std::env::var("ZED_SIMULATE_NO_LLM_PROVIDER").is_ok() {
-            return None;
-        }
-
-        self.inline_assistant_model
-            .clone()
-            .or_else(|| self.default_model.clone())
-    }
-
-    pub fn commit_message_model(&self) -> Option<ConfiguredModel> {
-        #[cfg(debug_assertions)]
-        if std::env::var("ZED_SIMULATE_NO_LLM_PROVIDER").is_ok() {
-            return None;
-        }
-
-        self.commit_message_model
-            .clone()
-            .or_else(|| self.default_fast_model.clone())
-            .or_else(|| self.default_model.clone())
-    }
-
-    pub fn thread_summary_model(&self) -> Option<ConfiguredModel> {
-        #[cfg(debug_assertions)]
-        if std::env::var("ZED_SIMULATE_NO_LLM_PROVIDER").is_ok() {
-            return None;
-        }
-
-        self.thread_summary_model
-            .clone()
-            .or_else(|| self.default_fast_model.clone())
-            .or_else(|| self.default_model.clone())
-    }
-
-    /// The models to use for inline assists. Returns the union of the active
-    /// model and all inline alternatives. When there are multiple models, the
-    /// user will be able to cycle through results.
-    pub fn inline_alternative_models(&self) -> &[Arc<dyn LanguageModel>] {
-        &self.inline_alternatives
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::fake_provider::FakeLanguageModelProvider;
-
-    #[gpui::test]
-    fn test_register_providers(cx: &mut App) {
-        let registry = cx.new(|_| LanguageModelRegistry::default());
-
-        let provider = Arc::new(FakeLanguageModelProvider::default());
-        registry.update(cx, |registry, cx| {
-            registry.register_provider(provider.clone(), cx);
-        });
-
-        let providers = registry.read(cx).providers();
-        assert_eq!(providers.len(), 1);
-        assert_eq!(providers[0].id(), provider.id());
-
-        registry.update(cx, |registry, cx| {
-            registry.unregister_provider(provider.id(), cx);
-        });
-
-        let providers = registry.read(cx).providers();
-        assert!(providers.is_empty());
-    }
-}
diff --git a/crates/language_model/src/request.rs b/crates/language_model/src/request.rs
deleted file mode 100644
index d97d87bdc9..0000000000
--- a/crates/language_model/src/request.rs
+++ /dev/null
@@ -1,576 +0,0 @@
-use std::io::{Cursor, Write};
-use std::sync::Arc;
-
-use anyhow::Result;
-use base64::write::EncoderWriter;
-use cloud_llm_client::{CompletionIntent, CompletionMode};
-use gpui::{
-    App, AppContext as _, DevicePixels, Image, ImageFormat, ObjectFit, SharedString, Size, Task,
-    point, px, size,
-};
-use image::codecs::png::PngEncoder;
-use serde::{Deserialize, Serialize};
-use util::ResultExt;
-
-use crate::role::Role;
-use crate::{LanguageModelToolUse, LanguageModelToolUseId};
-
-#[derive(Clone, PartialEq, Eq, Serialize, Deserialize, Hash)]
-pub struct LanguageModelImage {
-    /// A base64-encoded PNG image.
-    pub source: SharedString,
-    pub size: Size<DevicePixels>,
-}
-
-impl LanguageModelImage {
-    pub fn len(&self) -> usize {
-        self.source.len()
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.source.is_empty()
-    }
-
-    // Parse Self from a JSON object with case-insensitive field names
-    pub fn from_json(obj: &serde_json::Map<String, serde_json::Value>) -> Option<Self> {
-        let mut source = None;
-        let mut size_obj = None;
-
-        // Find source and size fields (case-insensitive)
-        for (k, v) in obj.iter() {
-            match k.to_lowercase().as_str() {
-                "source" => source = v.as_str(),
-                "size" => size_obj = v.as_object(),
-                _ => {}
-            }
-        }
-
-        let source = source?;
-        let size_obj = size_obj?;
-
-        let mut width = None;
-        let mut height = None;
-
-        // Find width and height in size object (case-insensitive)
-        for (k, v) in size_obj.iter() {
-            match k.to_lowercase().as_str() {
-                "width" => width = v.as_i64().map(|w| w as i32),
-                "height" => height = v.as_i64().map(|h| h as i32),
-                _ => {}
-            }
-        }
-
-        Some(Self {
-            size: size(DevicePixels(width?), DevicePixels(height?)),
-            source: SharedString::from(source.to_string()),
-        })
-    }
-}
-
-impl std::fmt::Debug for LanguageModelImage {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("LanguageModelImage")
-            .field("source", &format!("<{} bytes>", self.source.len()))
-            .field("size", &self.size)
-            .finish()
-    }
-}
-
-/// Anthropic wants uploaded images to be smaller than this in both dimensions.
-const ANTHROPIC_SIZE_LIMIT: f32 = 1568.;
-
-impl LanguageModelImage {
-    pub fn empty() -> Self {
-        Self {
-            source: "".into(),
-            size: size(DevicePixels(0), DevicePixels(0)),
-        }
-    }
-
-    pub fn from_image(data: Arc<Image>, cx: &mut App) -> Task<Option<Self>> {
-        cx.background_spawn(async move {
-            let image_bytes = Cursor::new(data.bytes());
-            let dynamic_image = match data.format() {
-                ImageFormat::Png => image::codecs::png::PngDecoder::new(image_bytes)
-                    .and_then(image::DynamicImage::from_decoder),
-                ImageFormat::Jpeg => image::codecs::jpeg::JpegDecoder::new(image_bytes)
-                    .and_then(image::DynamicImage::from_decoder),
-                ImageFormat::Webp => image::codecs::webp::WebPDecoder::new(image_bytes)
-                    .and_then(image::DynamicImage::from_decoder),
-                ImageFormat::Gif => image::codecs::gif::GifDecoder::new(image_bytes)
-                    .and_then(image::DynamicImage::from_decoder),
-                ImageFormat::Bmp => image::codecs::bmp::BmpDecoder::new(image_bytes)
-                    .and_then(image::DynamicImage::from_decoder),
-                ImageFormat::Tiff => image::codecs::tiff::TiffDecoder::new(image_bytes)
-                    .and_then(image::DynamicImage::from_decoder),
-                _ => return None,
-            }
-            .log_err()?;
-
-            let width = dynamic_image.width();
-            let height = dynamic_image.height();
-            let image_size = size(DevicePixels(width as i32), DevicePixels(height as i32));
-
-            let base64_image = {
-                if image_size.width.0 > ANTHROPIC_SIZE_LIMIT as i32
-                    || image_size.height.0 > ANTHROPIC_SIZE_LIMIT as i32
-                {
-                    let new_bounds = ObjectFit::ScaleDown.get_bounds(
-                        gpui::Bounds {
-                            origin: point(px(0.0), px(0.0)),
-                            size: size(px(ANTHROPIC_SIZE_LIMIT), px(ANTHROPIC_SIZE_LIMIT)),
-                        },
-                        image_size,
-                    );
-                    let resized_image = dynamic_image.resize(
-                        new_bounds.size.width.into(),
-                        new_bounds.size.height.into(),
-                        image::imageops::FilterType::Triangle,
-                    );
-
-                    encode_as_base64(data, resized_image)
-                } else {
-                    encode_as_base64(data, dynamic_image)
-                }
-            }
-            .log_err()?;
-
-            // SAFETY: The base64 encoder should not produce non-UTF8.
-            let source = unsafe { String::from_utf8_unchecked(base64_image) };
-
-            Some(LanguageModelImage {
-                size: image_size,
-                source: source.into(),
-            })
-        })
-    }
-
-    pub fn estimate_tokens(&self) -> usize {
-        let width = self.size.width.0.unsigned_abs() as usize;
-        let height = self.size.height.0.unsigned_abs() as usize;
-
-        // From: https://docs.anthropic.com/en/docs/build-with-claude/vision#calculate-image-costs
-        // Note that are a lot of conditions on Anthropic's API, and OpenAI doesn't use this,
-        // so this method is more of a rough guess.
-        (width * height) / 750
-    }
-
-    pub fn to_base64_url(&self) -> String {
-        format!("data:image/png;base64,{}", self.source)
-    }
-}
-
-fn encode_as_base64(data: Arc<Image>, image: image::DynamicImage) -> Result<Vec<u8>> {
-    let mut base64_image = Vec::new();
-    {
-        let mut base64_encoder = EncoderWriter::new(
-            Cursor::new(&mut base64_image),
-            &base64::engine::general_purpose::STANDARD,
-        );
-        if data.format() == ImageFormat::Png {
-            base64_encoder.write_all(data.bytes())?;
-        } else {
-            let mut png = Vec::new();
-            image.write_with_encoder(PngEncoder::new(&mut png))?;
-
-            base64_encoder.write_all(png.as_slice())?;
-        }
-    }
-    Ok(base64_image)
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq, Hash)]
-pub struct LanguageModelToolResult {
-    pub tool_use_id: LanguageModelToolUseId,
-    pub tool_name: Arc<str>,
-    pub is_error: bool,
-    pub content: LanguageModelToolResultContent,
-    pub output: Option<serde_json::Value>,
-}
-
-#[derive(Debug, Clone, Serialize, Eq, PartialEq, Hash)]
-pub enum LanguageModelToolResultContent {
-    Text(Arc<str>),
-    Image(LanguageModelImage),
-}
-
-impl<'de> Deserialize<'de> for LanguageModelToolResultContent {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        use serde::de::Error;
-
-        let value = serde_json::Value::deserialize(deserializer)?;
-
-        // Models can provide these responses in several styles. Try each in order.
-
-        // 1. Try as plain string
-        if let Ok(text) = serde_json::from_value::<String>(value.clone()) {
-            return Ok(Self::Text(Arc::from(text)));
-        }
-
-        // 2. Try as object
-        if let Some(obj) = value.as_object() {
-            // get a JSON field case-insensitively
-            fn get_field<'a>(
-                obj: &'a serde_json::Map<String, serde_json::Value>,
-                field: &str,
-            ) -> Option<&'a serde_json::Value> {
-                obj.iter()
-                    .find(|(k, _)| k.to_lowercase() == field.to_lowercase())
-                    .map(|(_, v)| v)
-            }
-
-            // Accept wrapped text format: { "type": "text", "text": "..." }
-            if let (Some(type_value), Some(text_value)) =
-                (get_field(obj, "type"), get_field(obj, "text"))
-                && let Some(type_str) = type_value.as_str()
-                && type_str.to_lowercase() == "text"
-                && let Some(text) = text_value.as_str()
-            {
-                return Ok(Self::Text(Arc::from(text)));
-            }
-
-            // Check for wrapped Text variant: { "text": "..." }
-            if let Some((_key, value)) = obj.iter().find(|(k, _)| k.to_lowercase() == "text")
-                && obj.len() == 1
-            {
-                // Only one field, and it's "text" (case-insensitive)
-                if let Some(text) = value.as_str() {
-                    return Ok(Self::Text(Arc::from(text)));
-                }
-            }
-
-            // Check for wrapped Image variant: { "image": { "source": "...", "size": ... } }
-            if let Some((_key, value)) = obj.iter().find(|(k, _)| k.to_lowercase() == "image")
-                && obj.len() == 1
-            {
-                // Only one field, and it's "image" (case-insensitive)
-                // Try to parse the nested image object
-                if let Some(image_obj) = value.as_object()
-                    && let Some(image) = LanguageModelImage::from_json(image_obj)
-                {
-                    return Ok(Self::Image(image));
-                }
-            }
-
-            // Try as direct Image (object with "source" and "size" fields)
-            if let Some(image) = LanguageModelImage::from_json(obj) {
-                return Ok(Self::Image(image));
-            }
-        }
-
-        // If none of the variants match, return an error with the problematic JSON
-        Err(D::Error::custom(format!(
-            "data did not match any variant of LanguageModelToolResultContent. Expected either a string, \
-             an object with 'type': 'text', a wrapped variant like {{\"Text\": \"...\"}}, or an image object. Got: {}",
-            serde_json::to_string_pretty(&value).unwrap_or_else(|_| value.to_string())
-        )))
-    }
-}
-
-impl LanguageModelToolResultContent {
-    pub fn to_str(&self) -> Option<&str> {
-        match self {
-            Self::Text(text) => Some(text),
-            Self::Image(_) => None,
-        }
-    }
-
-    pub fn is_empty(&self) -> bool {
-        match self {
-            Self::Text(text) => text.chars().all(|c| c.is_whitespace()),
-            Self::Image(_) => false,
-        }
-    }
-}
-
-impl From<&str> for LanguageModelToolResultContent {
-    fn from(value: &str) -> Self {
-        Self::Text(Arc::from(value))
-    }
-}
-
-impl From<String> for LanguageModelToolResultContent {
-    fn from(value: String) -> Self {
-        Self::Text(Arc::from(value))
-    }
-}
-
-impl From<LanguageModelImage> for LanguageModelToolResultContent {
-    fn from(image: LanguageModelImage) -> Self {
-        Self::Image(image)
-    }
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq, Hash)]
-pub enum MessageContent {
-    Text(String),
-    Thinking {
-        text: String,
-        signature: Option<String>,
-    },
-    RedactedThinking(String),
-    Image(LanguageModelImage),
-    ToolUse(LanguageModelToolUse),
-    ToolResult(LanguageModelToolResult),
-}
-
-impl MessageContent {
-    pub fn to_str(&self) -> Option<&str> {
-        match self {
-            MessageContent::Text(text) => Some(text.as_str()),
-            MessageContent::Thinking { text, .. } => Some(text.as_str()),
-            MessageContent::RedactedThinking(_) => None,
-            MessageContent::ToolResult(tool_result) => tool_result.content.to_str(),
-            MessageContent::ToolUse(_) | MessageContent::Image(_) => None,
-        }
-    }
-
-    pub fn is_empty(&self) -> bool {
-        match self {
-            MessageContent::Text(text) => text.chars().all(|c| c.is_whitespace()),
-            MessageContent::Thinking { text, .. } => text.chars().all(|c| c.is_whitespace()),
-            MessageContent::ToolResult(tool_result) => tool_result.content.is_empty(),
-            MessageContent::RedactedThinking(_)
-            | MessageContent::ToolUse(_)
-            | MessageContent::Image(_) => false,
-        }
-    }
-}
-
-impl From<String> for MessageContent {
-    fn from(value: String) -> Self {
-        MessageContent::Text(value)
-    }
-}
-
-impl From<&str> for MessageContent {
-    fn from(value: &str) -> Self {
-        MessageContent::Text(value.to_string())
-    }
-}
-
-#[derive(Clone, Serialize, Deserialize, Debug, PartialEq, Hash)]
-pub struct LanguageModelRequestMessage {
-    pub role: Role,
-    pub content: Vec<MessageContent>,
-    pub cache: bool,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub reasoning_details: Option<serde_json::Value>,
-}
-
-impl LanguageModelRequestMessage {
-    pub fn string_contents(&self) -> String {
-        let mut buffer = String::new();
-        for string in self.content.iter().filter_map(|content| content.to_str()) {
-            buffer.push_str(string);
-        }
-
-        buffer
-    }
-
-    pub fn contents_empty(&self) -> bool {
-        self.content.iter().all(|content| content.is_empty())
-    }
-}
-
-#[derive(Debug, PartialEq, Hash, Clone, Serialize, Deserialize)]
-pub struct LanguageModelRequestTool {
-    pub name: String,
-    pub description: String,
-    pub input_schema: serde_json::Value,
-}
-
-#[derive(Debug, PartialEq, Hash, Clone, Serialize, Deserialize)]
-pub enum LanguageModelToolChoice {
-    Auto,
-    Any,
-    None,
-}
-
-#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq)]
-pub struct LanguageModelRequest {
-    pub thread_id: Option<String>,
-    pub prompt_id: Option<String>,
-    pub intent: Option<CompletionIntent>,
-    pub mode: Option<CompletionMode>,
-    pub messages: Vec<LanguageModelRequestMessage>,
-    pub tools: Vec<LanguageModelRequestTool>,
-    pub tool_choice: Option<LanguageModelToolChoice>,
-    pub stop: Vec<String>,
-    pub temperature: Option<f32>,
-    pub thinking_allowed: bool,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-pub struct LanguageModelResponseMessage {
-    pub role: Option<Role>,
-    pub content: Option<String>,
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_language_model_tool_result_content_deserialization() {
-        let json = r#""This is plain text""#;
-        let result: LanguageModelToolResultContent = serde_json::from_str(json).unwrap();
-        assert_eq!(
-            result,
-            LanguageModelToolResultContent::Text("This is plain text".into())
-        );
-
-        let json = r#"{"type": "text", "text": "This is wrapped text"}"#;
-        let result: LanguageModelToolResultContent = serde_json::from_str(json).unwrap();
-        assert_eq!(
-            result,
-            LanguageModelToolResultContent::Text("This is wrapped text".into())
-        );
-
-        let json = r#"{"Type": "TEXT", "TEXT": "Case insensitive"}"#;
-        let result: LanguageModelToolResultContent = serde_json::from_str(json).unwrap();
-        assert_eq!(
-            result,
-            LanguageModelToolResultContent::Text("Case insensitive".into())
-        );
-
-        let json = r#"{"Text": "Wrapped variant"}"#;
-        let result: LanguageModelToolResultContent = serde_json::from_str(json).unwrap();
-        assert_eq!(
-            result,
-            LanguageModelToolResultContent::Text("Wrapped variant".into())
-        );
-
-        let json = r#"{"text": "Lowercase wrapped"}"#;
-        let result: LanguageModelToolResultContent = serde_json::from_str(json).unwrap();
-        assert_eq!(
-            result,
-            LanguageModelToolResultContent::Text("Lowercase wrapped".into())
-        );
-
-        // Test image deserialization
-        let json = r#"{
-            "source": "base64encodedimagedata",
-            "size": {
-                "width": 100,
-                "height": 200
-            }
-        }"#;
-        let result: LanguageModelToolResultContent = serde_json::from_str(json).unwrap();
-        match result {
-            LanguageModelToolResultContent::Image(image) => {
-                assert_eq!(image.source.as_ref(), "base64encodedimagedata");
-                assert_eq!(image.size.width.0, 100);
-                assert_eq!(image.size.height.0, 200);
-            }
-            _ => panic!("Expected Image variant"),
-        }
-
-        // Test wrapped Image variant
-        let json = r#"{
-            "Image": {
-                "source": "wrappedimagedata",
-                "size": {
-                    "width": 50,
-                    "height": 75
-                }
-            }
-        }"#;
-        let result: LanguageModelToolResultContent = serde_json::from_str(json).unwrap();
-        match result {
-            LanguageModelToolResultContent::Image(image) => {
-                assert_eq!(image.source.as_ref(), "wrappedimagedata");
-                assert_eq!(image.size.width.0, 50);
-                assert_eq!(image.size.height.0, 75);
-            }
-            _ => panic!("Expected Image variant"),
-        }
-
-        // Test wrapped Image variant with case insensitive
-        let json = r#"{
-            "image": {
-                "Source": "caseinsensitive",
-                "SIZE": {
-                    "width": 30,
-                    "height": 40
-                }
-            }
-        }"#;
-        let result: LanguageModelToolResultContent = serde_json::from_str(json).unwrap();
-        match result {
-            LanguageModelToolResultContent::Image(image) => {
-                assert_eq!(image.source.as_ref(), "caseinsensitive");
-                assert_eq!(image.size.width.0, 30);
-                assert_eq!(image.size.height.0, 40);
-            }
-            _ => panic!("Expected Image variant"),
-        }
-
-        // Test that wrapped text with wrong type fails
-        let json = r#"{"type": "blahblah", "text": "This should fail"}"#;
-        let result: Result<LanguageModelToolResultContent, _> = serde_json::from_str(json);
-        assert!(result.is_err());
-
-        // Test that malformed JSON fails
-        let json = r#"{"invalid": "structure"}"#;
-        let result: Result<LanguageModelToolResultContent, _> = serde_json::from_str(json);
-        assert!(result.is_err());
-
-        // Test edge cases
-        let json = r#""""#; // Empty string
-        let result: LanguageModelToolResultContent = serde_json::from_str(json).unwrap();
-        assert_eq!(result, LanguageModelToolResultContent::Text("".into()));
-
-        // Test with extra fields in wrapped text (should be ignored)
-        let json = r#"{"type": "text", "text": "Hello", "extra": "field"}"#;
-        let result: LanguageModelToolResultContent = serde_json::from_str(json).unwrap();
-        assert_eq!(result, LanguageModelToolResultContent::Text("Hello".into()));
-
-        // Test direct image with case-insensitive fields
-        let json = r#"{
-            "SOURCE": "directimage",
-            "Size": {
-                "width": 200,
-                "height": 300
-            }
-        }"#;
-        let result: LanguageModelToolResultContent = serde_json::from_str(json).unwrap();
-        match result {
-            LanguageModelToolResultContent::Image(image) => {
-                assert_eq!(image.source.as_ref(), "directimage");
-                assert_eq!(image.size.width.0, 200);
-                assert_eq!(image.size.height.0, 300);
-            }
-            _ => panic!("Expected Image variant"),
-        }
-
-        // Test that multiple fields prevent wrapped variant interpretation
-        let json = r#"{"Text": "not wrapped", "extra": "field"}"#;
-        let result: Result<LanguageModelToolResultContent, _> = serde_json::from_str(json);
-        assert!(result.is_err());
-
-        // Test wrapped text with uppercase TEXT variant
-        let json = r#"{"TEXT": "Uppercase variant"}"#;
-        let result: LanguageModelToolResultContent = serde_json::from_str(json).unwrap();
-        assert_eq!(
-            result,
-            LanguageModelToolResultContent::Text("Uppercase variant".into())
-        );
-
-        // Test that numbers and other JSON values fail gracefully
-        let json = r#"123"#;
-        let result: Result<LanguageModelToolResultContent, _> = serde_json::from_str(json);
-        assert!(result.is_err());
-
-        let json = r#"null"#;
-        let result: Result<LanguageModelToolResultContent, _> = serde_json::from_str(json);
-        assert!(result.is_err());
-
-        let json = r#"[1, 2, 3]"#;
-        let result: Result<LanguageModelToolResultContent, _> = serde_json::from_str(json);
-        assert!(result.is_err());
-    }
-}
diff --git a/crates/language_model/src/role.rs b/crates/language_model/src/role.rs
deleted file mode 100644
index 4b47ef36dd..0000000000
--- a/crates/language_model/src/role.rs
+++ /dev/null
@@ -1,47 +0,0 @@
-use serde::{Deserialize, Serialize};
-use std::fmt::{self, Display};
-
-#[derive(Clone, Copy, Serialize, Deserialize, Debug, Eq, PartialEq, Hash)]
-#[serde(rename_all = "lowercase")]
-pub enum Role {
-    User,
-    Assistant,
-    System,
-}
-
-impl Role {
-    pub fn from_proto(role: i32) -> Role {
-        match proto::LanguageModelRole::from_i32(role) {
-            Some(proto::LanguageModelRole::LanguageModelUser) => Role::User,
-            Some(proto::LanguageModelRole::LanguageModelAssistant) => Role::Assistant,
-            Some(proto::LanguageModelRole::LanguageModelSystem) => Role::System,
-            None => Role::User,
-        }
-    }
-
-    pub fn to_proto(self) -> proto::LanguageModelRole {
-        match self {
-            Role::User => proto::LanguageModelRole::LanguageModelUser,
-            Role::Assistant => proto::LanguageModelRole::LanguageModelAssistant,
-            Role::System => proto::LanguageModelRole::LanguageModelSystem,
-        }
-    }
-
-    pub fn cycle(self) -> Role {
-        match self {
-            Role::User => Role::Assistant,
-            Role::Assistant => Role::System,
-            Role::System => Role::User,
-        }
-    }
-}
-
-impl Display for Role {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Role::User => write!(f, "user"),
-            Role::Assistant => write!(f, "assistant"),
-            Role::System => write!(f, "system"),
-        }
-    }
-}
diff --git a/crates/language_model/src/telemetry.rs b/crates/language_model/src/telemetry.rs
deleted file mode 100644
index ccdcb0ad0c..0000000000
--- a/crates/language_model/src/telemetry.rs
+++ /dev/null
@@ -1,84 +0,0 @@
-use crate::ANTHROPIC_PROVIDER_ID;
-use anthropic::ANTHROPIC_API_URL;
-use anyhow::{Context as _, anyhow};
-use client::telemetry::Telemetry;
-use gpui::BackgroundExecutor;
-use http_client::{AsyncBody, HttpClient, Method, Request as HttpRequest};
-use std::env;
-use std::sync::Arc;
-use telemetry_events::{AssistantEventData, AssistantKind, AssistantPhase};
-use util::ResultExt;
-
-pub fn report_assistant_event(
-    event: AssistantEventData,
-    telemetry: Option<Arc<Telemetry>>,
-    client: Arc<dyn HttpClient>,
-    model_api_key: Option<String>,
-    executor: &BackgroundExecutor,
-) {
-    if let Some(telemetry) = telemetry.as_ref() {
-        telemetry.report_assistant_event(event.clone());
-        if telemetry.metrics_enabled() && event.model_provider == ANTHROPIC_PROVIDER_ID.0 {
-            if let Some(api_key) = model_api_key {
-                executor
-                    .spawn(async move {
-                        report_anthropic_event(event, client, api_key)
-                            .await
-                            .log_err();
-                    })
-                    .detach();
-            } else {
-                log::error!("Cannot send Anthropic telemetry because API key is missing");
-            }
-        }
-    }
-}
-
-async fn report_anthropic_event(
-    event: AssistantEventData,
-    client: Arc<dyn HttpClient>,
-    api_key: String,
-) -> anyhow::Result<()> {
-    let uri = format!("{ANTHROPIC_API_URL}/v1/log/zed");
-    let request_builder = HttpRequest::builder()
-        .method(Method::POST)
-        .uri(uri)
-        .header("X-Api-Key", api_key)
-        .header("Content-Type", "application/json");
-    let serialized_event: serde_json::Value = serde_json::json!({
-        "completion_type": match event.kind {
-            AssistantKind::Inline => "natural_language_completion_in_editor",
-            AssistantKind::InlineTerminal => "natural_language_completion_in_terminal",
-            AssistantKind::Panel => "conversation_message",
-        },
-        "event": match event.phase {
-            AssistantPhase::Response => "response",
-            AssistantPhase::Invoked => "invoke",
-            AssistantPhase::Accepted => "accept",
-            AssistantPhase::Rejected => "reject",
-        },
-        "metadata": {
-            "language_name": event.language_name,
-            "message_id": event.message_id,
-            "platform": env::consts::OS,
-        }
-    });
-
-    let request = request_builder
-        .body(AsyncBody::from(serialized_event.to_string()))
-        .context("Failed to construct Anthropic telemetry HTTP request body")?;
-
-    let response = client
-        .send(request)
-        .await
-        .context("Failed to send telemetry HTTP request to Anthropic")?;
-
-    if response.status().is_success() {
-        Ok(())
-    } else {
-        Err(anyhow!(
-            "Anthropic telemetry logging failed with HTTP status: {}",
-            response.status()
-        ))
-    }
-}
diff --git a/crates/language_model/src/tool_schema.rs b/crates/language_model/src/tool_schema.rs
deleted file mode 100644
index f9402c28dc..0000000000
--- a/crates/language_model/src/tool_schema.rs
+++ /dev/null
@@ -1,384 +0,0 @@
-use anyhow::Result;
-use schemars::{
-    JsonSchema, Schema,
-    generate::SchemaSettings,
-    transform::{Transform, transform_subschemas},
-};
-use serde_json::Value;
-
-/// Indicates the format used to define the input schema for a language model tool.
-#[derive(Debug, PartialEq, Eq, Clone, Copy, Hash)]
-pub enum LanguageModelToolSchemaFormat {
-    /// A JSON schema, see https://json-schema.org
-    JsonSchema,
-    /// A subset of an OpenAPI 3.0 schema object supported by Google AI, see https://ai.google.dev/api/caching#Schema
-    JsonSchemaSubset,
-}
-
-pub fn root_schema_for<T: JsonSchema>(format: LanguageModelToolSchemaFormat) -> Schema {
-    let mut generator = match format {
-        LanguageModelToolSchemaFormat::JsonSchema => SchemaSettings::draft07().into_generator(),
-        LanguageModelToolSchemaFormat::JsonSchemaSubset => SchemaSettings::openapi3()
-            .with(|settings| {
-                settings.meta_schema = None;
-                settings.inline_subschemas = true;
-            })
-            .with_transform(ToJsonSchemaSubsetTransform)
-            .into_generator(),
-    };
-    generator.root_schema_for::<T>()
-}
-
-#[derive(Debug, Clone)]
-struct ToJsonSchemaSubsetTransform;
-
-impl Transform for ToJsonSchemaSubsetTransform {
-    fn transform(&mut self, schema: &mut Schema) {
-        // Ensure that the type field is not an array, this happens when we use
-        // Option<T>, the type will be [T, "null"].
-        if let Some(type_field) = schema.get_mut("type")
-            && let Some(types) = type_field.as_array()
-            && let Some(first_type) = types.first()
-        {
-            *type_field = first_type.clone();
-        }
-
-        // oneOf is not supported, use anyOf instead
-        if let Some(one_of) = schema.remove("oneOf") {
-            schema.insert("anyOf".to_string(), one_of);
-        }
-
-        transform_subschemas(self, schema);
-    }
-}
-
-/// Tries to adapt a JSON schema representation to be compatible with the specified format.
-///
-/// If the json cannot be made compatible with the specified format, an error is returned.
-pub fn adapt_schema_to_format(
-    json: &mut Value,
-    format: LanguageModelToolSchemaFormat,
-) -> Result<()> {
-    if let Value::Object(obj) = json {
-        obj.remove("$schema");
-        obj.remove("title");
-    }
-
-    match format {
-        LanguageModelToolSchemaFormat::JsonSchema => preprocess_json_schema(json),
-        LanguageModelToolSchemaFormat::JsonSchemaSubset => adapt_to_json_schema_subset(json),
-    }
-}
-
-fn preprocess_json_schema(json: &mut Value) -> Result<()> {
-    // `additionalProperties` defaults to `false` unless explicitly specified.
-    // This prevents models from hallucinating tool parameters.
-    if let Value::Object(obj) = json
-        && matches!(obj.get("type"), Some(Value::String(s)) if s == "object")
-    {
-        if !obj.contains_key("additionalProperties") {
-            obj.insert("additionalProperties".to_string(), Value::Bool(false));
-        }
-
-        // OpenAI API requires non-missing `properties`
-        if !obj.contains_key("properties") {
-            obj.insert("properties".to_string(), Value::Object(Default::default()));
-        }
-    }
-    Ok(())
-}
-
-/// Tries to adapt the json schema so that it is compatible with https://ai.google.dev/api/caching#Schema
-fn adapt_to_json_schema_subset(json: &mut Value) -> Result<()> {
-    if let Value::Object(obj) = json {
-        const UNSUPPORTED_KEYS: [&str; 4] = ["if", "then", "else", "$ref"];
-
-        for key in UNSUPPORTED_KEYS {
-            anyhow::ensure!(
-                !obj.contains_key(key),
-                "Schema cannot be made compatible because it contains \"{key}\""
-            );
-        }
-
-        const KEYS_TO_REMOVE: [(&str, fn(&Value) -> bool); 5] = [
-            ("format", |value| value.is_string()),
-            ("additionalProperties", |value| value.is_boolean()),
-            ("exclusiveMinimum", |value| value.is_number()),
-            ("exclusiveMaximum", |value| value.is_number()),
-            ("optional", |value| value.is_boolean()),
-        ];
-        for (key, predicate) in KEYS_TO_REMOVE {
-            if let Some(value) = obj.get(key)
-                && predicate(value)
-            {
-                obj.remove(key);
-            }
-        }
-
-        // If a type is not specified for an input parameter, add a default type
-        if matches!(obj.get("description"), Some(Value::String(_)))
-            && !obj.contains_key("type")
-            && !(obj.contains_key("anyOf")
-                || obj.contains_key("oneOf")
-                || obj.contains_key("allOf"))
-        {
-            obj.insert("type".to_string(), Value::String("string".to_string()));
-        }
-
-        // Handle oneOf -> anyOf conversion
-        if let Some(subschemas) = obj.get_mut("oneOf")
-            && subschemas.is_array()
-        {
-            let subschemas_clone = subschemas.clone();
-            obj.remove("oneOf");
-            obj.insert("anyOf".to_string(), subschemas_clone);
-        }
-
-        // Recursively process all nested objects and arrays
-        for (_, value) in obj.iter_mut() {
-            if let Value::Object(_) | Value::Array(_) = value {
-                adapt_to_json_schema_subset(value)?;
-            }
-        }
-    } else if let Value::Array(arr) = json {
-        for item in arr.iter_mut() {
-            adapt_to_json_schema_subset(item)?;
-        }
-    }
-    Ok(())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use serde_json::json;
-
-    #[test]
-    fn test_transform_adds_type_when_missing() {
-        let mut json = json!({
-            "description": "A test field without type"
-        });
-
-        adapt_to_json_schema_subset(&mut json).unwrap();
-
-        assert_eq!(
-            json,
-            json!({
-                "description": "A test field without type",
-                "type": "string"
-            })
-        );
-
-        // Ensure that we do not add a type if it is an object
-        let mut json = json!({
-            "description": {
-                "value": "abc",
-                "type": "string"
-            }
-        });
-
-        adapt_to_json_schema_subset(&mut json).unwrap();
-
-        assert_eq!(
-            json,
-            json!({
-                "description": {
-                    "value": "abc",
-                    "type": "string"
-                }
-            })
-        );
-    }
-
-    #[test]
-    fn test_transform_removes_unsupported_keys() {
-        let mut json = json!({
-            "description": "A test field",
-            "type": "integer",
-            "format": "uint32",
-            "exclusiveMinimum": 0,
-            "exclusiveMaximum": 100,
-            "additionalProperties": false,
-            "optional": true
-        });
-
-        adapt_to_json_schema_subset(&mut json).unwrap();
-
-        assert_eq!(
-            json,
-            json!({
-                "description": "A test field",
-                "type": "integer"
-            })
-        );
-
-        // Ensure that we do not remove keys that are actually supported (e.g. "format" can just be used as another property)
-        let mut json = json!({
-            "description": "A test field",
-            "type": "integer",
-            "format": {},
-        });
-
-        adapt_to_json_schema_subset(&mut json).unwrap();
-
-        assert_eq!(
-            json,
-            json!({
-                "description": "A test field",
-                "type": "integer",
-                "format": {},
-            })
-        );
-    }
-
-    #[test]
-    fn test_transform_one_of_to_any_of() {
-        let mut json = json!({
-            "description": "A test field",
-            "oneOf": [
-                { "type": "string" },
-                { "type": "integer" }
-            ]
-        });
-
-        adapt_to_json_schema_subset(&mut json).unwrap();
-
-        assert_eq!(
-            json,
-            json!({
-                "description": "A test field",
-                "anyOf": [
-                    { "type": "string" },
-                    { "type": "integer" }
-                ]
-            })
-        );
-    }
-
-    #[test]
-    fn test_transform_nested_objects() {
-        let mut json = json!({
-            "type": "object",
-            "properties": {
-                "nested": {
-                    "oneOf": [
-                        { "type": "string" },
-                        { "type": "null" }
-                    ],
-                    "format": "email"
-                }
-            }
-        });
-
-        adapt_to_json_schema_subset(&mut json).unwrap();
-
-        assert_eq!(
-            json,
-            json!({
-                "type": "object",
-                "properties": {
-                    "nested": {
-                        "anyOf": [
-                            { "type": "string" },
-                            { "type": "null" }
-                        ]
-                    }
-                }
-            })
-        );
-    }
-
-    #[test]
-    fn test_transform_fails_if_unsupported_keys_exist() {
-        let mut json = json!({
-            "type": "object",
-            "properties": {
-                "$ref": "#/definitions/User",
-            }
-        });
-
-        assert!(adapt_to_json_schema_subset(&mut json).is_err());
-
-        let mut json = json!({
-            "type": "object",
-            "properties": {
-                "if": "...",
-            }
-        });
-
-        assert!(adapt_to_json_schema_subset(&mut json).is_err());
-
-        let mut json = json!({
-            "type": "object",
-            "properties": {
-                "then": "...",
-            }
-        });
-
-        assert!(adapt_to_json_schema_subset(&mut json).is_err());
-
-        let mut json = json!({
-            "type": "object",
-            "properties": {
-                "else": "...",
-            }
-        });
-
-        assert!(adapt_to_json_schema_subset(&mut json).is_err());
-    }
-
-    #[test]
-    fn test_preprocess_json_schema_adds_additional_properties() {
-        let mut json = json!({
-            "type": "object",
-            "properties": {
-                "name": {
-                    "type": "string"
-                }
-            }
-        });
-
-        preprocess_json_schema(&mut json).unwrap();
-
-        assert_eq!(
-            json,
-            json!({
-                "type": "object",
-                "properties": {
-                    "name": {
-                        "type": "string"
-                    }
-                },
-                "additionalProperties": false
-            })
-        );
-    }
-
-    #[test]
-    fn test_preprocess_json_schema_preserves_additional_properties() {
-        let mut json = json!({
-            "type": "object",
-            "properties": {
-                "name": {
-                    "type": "string"
-                }
-            },
-            "additionalProperties": true
-        });
-
-        preprocess_json_schema(&mut json).unwrap();
-
-        assert_eq!(
-            json,
-            json!({
-                "type": "object",
-                "properties": {
-                    "name": {
-                        "type": "string"
-                    }
-                },
-                "additionalProperties": true
-            })
-        );
-    }
-}
diff --git a/crates/language_models/Cargo.toml b/crates/language_models/Cargo.toml
deleted file mode 100644
index 6c5704312d..0000000000
--- a/crates/language_models/Cargo.toml
+++ /dev/null
@@ -1,68 +0,0 @@
-[package]
-name = "language_models"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/language_models.rs"
-
-[dependencies]
-ai_onboarding.workspace = true
-anthropic = { workspace = true, features = ["schemars"] }
-anyhow.workspace = true
-aws-config = { workspace = true, features = ["behavior-version-latest"] }
-aws-credential-types = { workspace = true, features = ["hardcoded-credentials"] }
-aws_http_client.workspace = true
-bedrock.workspace = true
-chrono.workspace = true
-client.workspace = true
-cloud_llm_client.workspace = true
-collections.workspace = true
-component.workspace = true
-convert_case.workspace = true
-copilot.workspace = true
-credentials_provider.workspace = true
-deepseek = { workspace = true, features = ["schemars"] }
-fs.workspace = true
-futures.workspace = true
-google_ai = { workspace = true, features = ["schemars"] }
-gpui.workspace = true
-gpui_tokio.workspace = true
-http_client.workspace = true
-language.workspace = true
-language_model.workspace = true
-lmstudio = { workspace = true, features = ["schemars"] }
-log.workspace = true
-menu.workspace = true
-mistral = { workspace = true, features = ["schemars"] }
-ollama = { workspace = true, features = ["schemars"] }
-open_ai = { workspace = true, features = ["schemars"] }
-open_router = { workspace = true, features = ["schemars"] }
-partial-json-fixer.workspace = true
-release_channel.workspace = true
-schemars.workspace = true
-semver.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-smol.workspace = true
-strum.workspace = true
-thiserror.workspace = true
-tiktoken-rs.workspace = true
-tokio = { workspace = true, features = ["rt", "rt-multi-thread"] }
-ui.workspace = true
-ui_input.workspace = true
-util.workspace = true
-vercel = { workspace = true, features = ["schemars"] }
-x_ai = { workspace = true, features = ["schemars"] }
-zed_env_vars.workspace = true
-
-[dev-dependencies]
-editor = { workspace = true, features = ["test-support"] }
-language_model = { workspace = true, features = ["test-support"] }
-project = { workspace = true, features = ["test-support"] }
diff --git a/crates/language_models/LICENSE-GPL b/crates/language_models/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/language_models/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/language_models/src/api_key.rs b/crates/language_models/src/api_key.rs
deleted file mode 100644
index 122234b6ce..0000000000
--- a/crates/language_models/src/api_key.rs
+++ /dev/null
@@ -1,295 +0,0 @@
-use anyhow::{Result, anyhow};
-use credentials_provider::CredentialsProvider;
-use futures::{FutureExt, future};
-use gpui::{AsyncApp, Context, SharedString, Task};
-use language_model::AuthenticateError;
-use std::{
-    fmt::{Display, Formatter},
-    sync::Arc,
-};
-use util::ResultExt as _;
-use zed_env_vars::EnvVar;
-
-/// Manages a single API key for a language model provider. API keys either come from environment
-/// variables or the system keychain.
-///
-/// Keys from the system keychain are associated with a provider URL, and this ensures that they are
-/// only used with that URL.
-pub struct ApiKeyState {
-    url: SharedString,
-    load_status: LoadStatus,
-    load_task: Option<future::Shared<Task<()>>>,
-}
-
-#[derive(Debug, Clone)]
-pub enum LoadStatus {
-    NotPresent,
-    Error(String),
-    Loaded(ApiKey),
-}
-
-#[derive(Debug, Clone)]
-pub struct ApiKey {
-    source: ApiKeySource,
-    key: Arc<str>,
-}
-
-impl ApiKeyState {
-    pub fn new(url: SharedString) -> Self {
-        Self {
-            url,
-            load_status: LoadStatus::NotPresent,
-            load_task: None,
-        }
-    }
-
-    pub fn has_key(&self) -> bool {
-        matches!(self.load_status, LoadStatus::Loaded { .. })
-    }
-
-    pub fn is_from_env_var(&self) -> bool {
-        match &self.load_status {
-            LoadStatus::Loaded(ApiKey {
-                source: ApiKeySource::EnvVar { .. },
-                ..
-            }) => true,
-            _ => false,
-        }
-    }
-
-    /// Get the stored API key, verifying that it is associated with the URL. Returns `None` if
-    /// there is no key or for URL mismatches, and the mismatch case is logged.
-    ///
-    /// To avoid URL mismatches, expects that `load_if_needed` or `handle_url_change` has been
-    /// called with this URL.
-    pub fn key(&self, url: &str) -> Option<Arc<str>> {
-        let api_key = match &self.load_status {
-            LoadStatus::Loaded(api_key) => api_key,
-            _ => return None,
-        };
-        if url == self.url.as_str() {
-            Some(api_key.key.clone())
-        } else if let ApiKeySource::EnvVar(var_name) = &api_key.source {
-            log::warn!(
-                "{} is now being used with URL {}, when initially it was used with URL {}",
-                var_name,
-                url,
-                self.url
-            );
-            Some(api_key.key.clone())
-        } else {
-            // bug case because load_if_needed should be called whenever the url may have changed
-            log::error!(
-                "bug: Attempted to use API key associated with URL {} instead with URL {}",
-                self.url,
-                url
-            );
-            None
-        }
-    }
-
-    /// Set or delete the API key in the system keychain.
-    pub fn store<Ent: 'static>(
-        &mut self,
-        url: SharedString,
-        key: Option<String>,
-        get_this: impl Fn(&mut Ent) -> &mut Self + 'static,
-        cx: &Context<Ent>,
-    ) -> Task<Result<()>> {
-        if self.is_from_env_var() {
-            return Task::ready(Err(anyhow!(
-                "bug: attempted to store API key in system keychain when API key is from env var",
-            )));
-        }
-        let credentials_provider = <dyn CredentialsProvider>::global(cx);
-        cx.spawn(async move |ent, cx| {
-            if let Some(key) = &key {
-                credentials_provider
-                    .write_credentials(&url, "Bearer", key.as_bytes(), cx)
-                    .await
-                    .log_err();
-            } else {
-                credentials_provider
-                    .delete_credentials(&url, cx)
-                    .await
-                    .log_err();
-            }
-            ent.update(cx, |ent, cx| {
-                let this = get_this(ent);
-                this.url = url;
-                this.load_status = match &key {
-                    Some(key) => LoadStatus::Loaded(ApiKey {
-                        source: ApiKeySource::SystemKeychain,
-                        key: key.as_str().into(),
-                    }),
-                    None => LoadStatus::NotPresent,
-                };
-                cx.notify();
-            })
-        })
-    }
-
-    /// Reloads the API key if the current API key is associated with a different URL.
-    ///
-    /// Note that it is not efficient to use this or `load_if_needed` with multiple URLs
-    /// interchangeably - URL change should correspond to some user initiated change.
-    pub fn handle_url_change<Ent: 'static>(
-        &mut self,
-        url: SharedString,
-        env_var: &EnvVar,
-        get_this: impl Fn(&mut Ent) -> &mut Self + Clone + 'static,
-        cx: &mut Context<Ent>,
-    ) {
-        if url != self.url {
-            if !self.is_from_env_var() {
-                // loading will continue even though this result task is dropped
-                let _task = self.load_if_needed(url, env_var, get_this, cx);
-            }
-        }
-    }
-
-    /// If needed, loads the API key associated with the given URL from the system keychain. When a
-    /// non-empty environment variable is provided, it will be used instead. If called when an API
-    /// key was already loaded for a different URL, that key will be cleared before loading.
-    ///
-    /// Dropping the returned Task does not cancel key loading.
-    pub fn load_if_needed<Ent: 'static>(
-        &mut self,
-        url: SharedString,
-        env_var: &EnvVar,
-        get_this: impl Fn(&mut Ent) -> &mut Self + Clone + 'static,
-        cx: &mut Context<Ent>,
-    ) -> Task<Result<(), AuthenticateError>> {
-        if let LoadStatus::Loaded { .. } = &self.load_status
-            && self.url == url
-        {
-            return Task::ready(Ok(()));
-        }
-
-        if let Some(key) = &env_var.value
-            && !key.is_empty()
-        {
-            let api_key = ApiKey::from_env(env_var.name.clone(), key);
-            self.url = url;
-            self.load_status = LoadStatus::Loaded(api_key);
-            self.load_task = None;
-            cx.notify();
-            return Task::ready(Ok(()));
-        }
-
-        let task = if let Some(load_task) = &self.load_task {
-            load_task.clone()
-        } else {
-            let load_task = Self::load(url.clone(), get_this.clone(), cx).shared();
-            self.url = url;
-            self.load_status = LoadStatus::NotPresent;
-            self.load_task = Some(load_task.clone());
-            cx.notify();
-            load_task
-        };
-
-        cx.spawn(async move |ent, cx| {
-            task.await;
-            ent.update(cx, |ent, _cx| {
-                get_this(ent).load_status.clone().into_authenticate_result()
-            })
-            .ok();
-            Ok(())
-        })
-    }
-
-    fn load<Ent: 'static>(
-        url: SharedString,
-        get_this: impl Fn(&mut Ent) -> &mut Self + 'static,
-        cx: &Context<Ent>,
-    ) -> Task<()> {
-        let credentials_provider = <dyn CredentialsProvider>::global(cx);
-        cx.spawn({
-            async move |ent, cx| {
-                let load_status =
-                    ApiKey::load_from_system_keychain_impl(&url, credentials_provider.as_ref(), cx)
-                        .await;
-                ent.update(cx, |ent, cx| {
-                    let this = get_this(ent);
-                    this.url = url;
-                    this.load_status = load_status;
-                    this.load_task = None;
-                    cx.notify();
-                })
-                .ok();
-            }
-        })
-    }
-}
-
-impl ApiKey {
-    pub fn key(&self) -> &str {
-        &self.key
-    }
-
-    pub fn from_env(env_var_name: SharedString, key: &str) -> Self {
-        Self {
-            source: ApiKeySource::EnvVar(env_var_name),
-            key: key.into(),
-        }
-    }
-
-    pub async fn load_from_system_keychain(
-        url: &str,
-        credentials_provider: &dyn CredentialsProvider,
-        cx: &AsyncApp,
-    ) -> Result<Self, AuthenticateError> {
-        Self::load_from_system_keychain_impl(url, credentials_provider, cx)
-            .await
-            .into_authenticate_result()
-    }
-
-    async fn load_from_system_keychain_impl(
-        url: &str,
-        credentials_provider: &dyn CredentialsProvider,
-        cx: &AsyncApp,
-    ) -> LoadStatus {
-        if url.is_empty() {
-            return LoadStatus::NotPresent;
-        }
-        let read_result = credentials_provider.read_credentials(&url, cx).await;
-        let api_key = match read_result {
-            Ok(Some((_, api_key))) => api_key,
-            Ok(None) => return LoadStatus::NotPresent,
-            Err(err) => return LoadStatus::Error(err.to_string()),
-        };
-        let key = match str::from_utf8(&api_key) {
-            Ok(key) => key,
-            Err(_) => return LoadStatus::Error(format!("API key for URL {url} is not utf8")),
-        };
-        LoadStatus::Loaded(Self {
-            source: ApiKeySource::SystemKeychain,
-            key: key.into(),
-        })
-    }
-}
-
-impl LoadStatus {
-    fn into_authenticate_result(self) -> Result<ApiKey, AuthenticateError> {
-        match self {
-            LoadStatus::Loaded(api_key) => Ok(api_key),
-            LoadStatus::NotPresent => Err(AuthenticateError::CredentialsNotFound),
-            LoadStatus::Error(err) => Err(AuthenticateError::Other(anyhow!(err))),
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-enum ApiKeySource {
-    EnvVar(SharedString),
-    SystemKeychain,
-}
-
-impl Display for ApiKeySource {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        match self {
-            ApiKeySource::EnvVar(var) => write!(f, "environment variable {}", var),
-            ApiKeySource::SystemKeychain => write!(f, "system keychain"),
-        }
-    }
-}
diff --git a/crates/language_models/src/language_models.rs b/crates/language_models/src/language_models.rs
deleted file mode 100644
index d771dba373..0000000000
--- a/crates/language_models/src/language_models.rs
+++ /dev/null
@@ -1,165 +0,0 @@
-use std::sync::Arc;
-
-use ::settings::{Settings, SettingsStore};
-use client::{Client, UserStore};
-use collections::HashSet;
-use gpui::{App, Context, Entity};
-use language_model::{LanguageModelProviderId, LanguageModelRegistry};
-use provider::deepseek::DeepSeekLanguageModelProvider;
-
-mod api_key;
-pub mod provider;
-mod settings;
-pub mod ui;
-
-use crate::provider::anthropic::AnthropicLanguageModelProvider;
-use crate::provider::bedrock::BedrockLanguageModelProvider;
-use crate::provider::cloud::CloudLanguageModelProvider;
-use crate::provider::copilot_chat::CopilotChatLanguageModelProvider;
-use crate::provider::google::GoogleLanguageModelProvider;
-use crate::provider::lmstudio::LmStudioLanguageModelProvider;
-pub use crate::provider::mistral::MistralLanguageModelProvider;
-use crate::provider::ollama::OllamaLanguageModelProvider;
-use crate::provider::open_ai::OpenAiLanguageModelProvider;
-use crate::provider::open_ai_compatible::OpenAiCompatibleLanguageModelProvider;
-use crate::provider::open_router::OpenRouterLanguageModelProvider;
-use crate::provider::vercel::VercelLanguageModelProvider;
-use crate::provider::x_ai::XAiLanguageModelProvider;
-pub use crate::settings::*;
-
-pub fn init(user_store: Entity<UserStore>, client: Arc<Client>, cx: &mut App) {
-    let registry = LanguageModelRegistry::global(cx);
-    registry.update(cx, |registry, cx| {
-        register_language_model_providers(registry, user_store, client.clone(), cx);
-    });
-
-    let mut openai_compatible_providers = AllLanguageModelSettings::get_global(cx)
-        .openai_compatible
-        .keys()
-        .cloned()
-        .collect::<HashSet<_>>();
-
-    registry.update(cx, |registry, cx| {
-        register_openai_compatible_providers(
-            registry,
-            &HashSet::default(),
-            &openai_compatible_providers,
-            client.clone(),
-            cx,
-        );
-    });
-    cx.observe_global::<SettingsStore>(move |cx| {
-        let openai_compatible_providers_new = AllLanguageModelSettings::get_global(cx)
-            .openai_compatible
-            .keys()
-            .cloned()
-            .collect::<HashSet<_>>();
-        if openai_compatible_providers_new != openai_compatible_providers {
-            registry.update(cx, |registry, cx| {
-                register_openai_compatible_providers(
-                    registry,
-                    &openai_compatible_providers,
-                    &openai_compatible_providers_new,
-                    client.clone(),
-                    cx,
-                );
-            });
-            openai_compatible_providers = openai_compatible_providers_new;
-        }
-    })
-    .detach();
-}
-
-fn register_openai_compatible_providers(
-    registry: &mut LanguageModelRegistry,
-    old: &HashSet<Arc<str>>,
-    new: &HashSet<Arc<str>>,
-    client: Arc<Client>,
-    cx: &mut Context<LanguageModelRegistry>,
-) {
-    for provider_id in old {
-        if !new.contains(provider_id) {
-            registry.unregister_provider(LanguageModelProviderId::from(provider_id.clone()), cx);
-        }
-    }
-
-    for provider_id in new {
-        if !old.contains(provider_id) {
-            registry.register_provider(
-                Arc::new(OpenAiCompatibleLanguageModelProvider::new(
-                    provider_id.clone(),
-                    client.http_client(),
-                    cx,
-                )),
-                cx,
-            );
-        }
-    }
-}
-
-fn register_language_model_providers(
-    registry: &mut LanguageModelRegistry,
-    user_store: Entity<UserStore>,
-    client: Arc<Client>,
-    cx: &mut Context<LanguageModelRegistry>,
-) {
-    registry.register_provider(
-        Arc::new(CloudLanguageModelProvider::new(
-            user_store,
-            client.clone(),
-            cx,
-        )),
-        cx,
-    );
-    registry.register_provider(
-        Arc::new(AnthropicLanguageModelProvider::new(
-            client.http_client(),
-            cx,
-        )),
-        cx,
-    );
-    registry.register_provider(
-        Arc::new(OpenAiLanguageModelProvider::new(client.http_client(), cx)),
-        cx,
-    );
-    registry.register_provider(
-        Arc::new(OllamaLanguageModelProvider::new(client.http_client(), cx)),
-        cx,
-    );
-    registry.register_provider(
-        Arc::new(LmStudioLanguageModelProvider::new(client.http_client(), cx)),
-        cx,
-    );
-    registry.register_provider(
-        Arc::new(DeepSeekLanguageModelProvider::new(client.http_client(), cx)),
-        cx,
-    );
-    registry.register_provider(
-        Arc::new(GoogleLanguageModelProvider::new(client.http_client(), cx)),
-        cx,
-    );
-    registry.register_provider(
-        MistralLanguageModelProvider::global(client.http_client(), cx),
-        cx,
-    );
-    registry.register_provider(
-        Arc::new(BedrockLanguageModelProvider::new(client.http_client(), cx)),
-        cx,
-    );
-    registry.register_provider(
-        Arc::new(OpenRouterLanguageModelProvider::new(
-            client.http_client(),
-            cx,
-        )),
-        cx,
-    );
-    registry.register_provider(
-        Arc::new(VercelLanguageModelProvider::new(client.http_client(), cx)),
-        cx,
-    );
-    registry.register_provider(
-        Arc::new(XAiLanguageModelProvider::new(client.http_client(), cx)),
-        cx,
-    );
-    registry.register_provider(Arc::new(CopilotChatLanguageModelProvider::new(cx)), cx);
-}
diff --git a/crates/language_models/src/provider.rs b/crates/language_models/src/provider.rs
deleted file mode 100644
index d780195c66..0000000000
--- a/crates/language_models/src/provider.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-pub mod anthropic;
-pub mod bedrock;
-pub mod cloud;
-pub mod copilot_chat;
-pub mod deepseek;
-pub mod google;
-pub mod lmstudio;
-pub mod mistral;
-pub mod ollama;
-pub mod open_ai;
-pub mod open_ai_compatible;
-pub mod open_router;
-pub mod vercel;
-pub mod x_ai;
diff --git a/crates/language_models/src/provider/anthropic.rs b/crates/language_models/src/provider/anthropic.rs
deleted file mode 100644
index 1affe38a08..0000000000
--- a/crates/language_models/src/provider/anthropic.rs
+++ /dev/null
@@ -1,1045 +0,0 @@
-use anthropic::{
-    ANTHROPIC_API_URL, AnthropicError, AnthropicModelMode, ContentDelta, Event, ResponseContent,
-    ToolResultContent, ToolResultPart, Usage,
-};
-use anyhow::{Result, anyhow};
-use collections::{BTreeMap, HashMap};
-use futures::{FutureExt, Stream, StreamExt, future, future::BoxFuture, stream::BoxStream};
-use gpui::{AnyView, App, AsyncApp, Context, Entity, Task};
-use http_client::HttpClient;
-use language_model::{
-    AuthenticateError, ConfigurationViewTargetAgent, LanguageModel,
-    LanguageModelCacheConfiguration, LanguageModelCompletionError, LanguageModelId,
-    LanguageModelName, LanguageModelProvider, LanguageModelProviderId, LanguageModelProviderName,
-    LanguageModelProviderState, LanguageModelRequest, LanguageModelToolChoice,
-    LanguageModelToolResultContent, MessageContent, RateLimiter, Role,
-};
-use language_model::{LanguageModelCompletionEvent, LanguageModelToolUse, StopReason};
-use settings::{Settings, SettingsStore};
-use std::pin::Pin;
-use std::str::FromStr;
-use std::sync::{Arc, LazyLock};
-use strum::IntoEnumIterator;
-use ui::{List, prelude::*};
-use ui_input::InputField;
-use util::ResultExt;
-use zed_env_vars::{EnvVar, env_var};
-
-use crate::api_key::ApiKeyState;
-use crate::ui::{ConfiguredApiCard, InstructionListItem};
-
-pub use settings::AnthropicAvailableModel as AvailableModel;
-
-const PROVIDER_ID: LanguageModelProviderId = language_model::ANTHROPIC_PROVIDER_ID;
-const PROVIDER_NAME: LanguageModelProviderName = language_model::ANTHROPIC_PROVIDER_NAME;
-
-#[derive(Default, Clone, Debug, PartialEq)]
-pub struct AnthropicSettings {
-    pub api_url: String,
-    /// Extend Zed's list of Anthropic models.
-    pub available_models: Vec<AvailableModel>,
-}
-
-pub struct AnthropicLanguageModelProvider {
-    http_client: Arc<dyn HttpClient>,
-    state: Entity<State>,
-}
-
-const API_KEY_ENV_VAR_NAME: &str = "ANTHROPIC_API_KEY";
-static API_KEY_ENV_VAR: LazyLock<EnvVar> = env_var!(API_KEY_ENV_VAR_NAME);
-
-pub struct State {
-    api_key_state: ApiKeyState,
-}
-
-impl State {
-    fn is_authenticated(&self) -> bool {
-        self.api_key_state.has_key()
-    }
-
-    fn set_api_key(&mut self, api_key: Option<String>, cx: &mut Context<Self>) -> Task<Result<()>> {
-        let api_url = AnthropicLanguageModelProvider::api_url(cx);
-        self.api_key_state
-            .store(api_url, api_key, |this| &mut this.api_key_state, cx)
-    }
-
-    fn authenticate(&mut self, cx: &mut Context<Self>) -> Task<Result<(), AuthenticateError>> {
-        let api_url = AnthropicLanguageModelProvider::api_url(cx);
-        self.api_key_state.load_if_needed(
-            api_url,
-            &API_KEY_ENV_VAR,
-            |this| &mut this.api_key_state,
-            cx,
-        )
-    }
-}
-
-impl AnthropicLanguageModelProvider {
-    pub fn new(http_client: Arc<dyn HttpClient>, cx: &mut App) -> Self {
-        let state = cx.new(|cx| {
-            cx.observe_global::<SettingsStore>(|this: &mut State, cx| {
-                let api_url = Self::api_url(cx);
-                this.api_key_state.handle_url_change(
-                    api_url,
-                    &API_KEY_ENV_VAR,
-                    |this| &mut this.api_key_state,
-                    cx,
-                );
-                cx.notify();
-            })
-            .detach();
-            State {
-                api_key_state: ApiKeyState::new(Self::api_url(cx)),
-            }
-        });
-
-        Self { http_client, state }
-    }
-
-    fn create_language_model(&self, model: anthropic::Model) -> Arc<dyn LanguageModel> {
-        Arc::new(AnthropicModel {
-            id: LanguageModelId::from(model.id().to_string()),
-            model,
-            state: self.state.clone(),
-            http_client: self.http_client.clone(),
-            request_limiter: RateLimiter::new(4),
-        })
-    }
-
-    fn settings(cx: &App) -> &AnthropicSettings {
-        &crate::AllLanguageModelSettings::get_global(cx).anthropic
-    }
-
-    fn api_url(cx: &App) -> SharedString {
-        let api_url = &Self::settings(cx).api_url;
-        if api_url.is_empty() {
-            ANTHROPIC_API_URL.into()
-        } else {
-            SharedString::new(api_url.as_str())
-        }
-    }
-}
-
-impl LanguageModelProviderState for AnthropicLanguageModelProvider {
-    type ObservableEntity = State;
-
-    fn observable_entity(&self) -> Option<Entity<Self::ObservableEntity>> {
-        Some(self.state.clone())
-    }
-}
-
-impl LanguageModelProvider for AnthropicLanguageModelProvider {
-    fn id(&self) -> LanguageModelProviderId {
-        PROVIDER_ID
-    }
-
-    fn name(&self) -> LanguageModelProviderName {
-        PROVIDER_NAME
-    }
-
-    fn icon(&self) -> IconName {
-        IconName::AiAnthropic
-    }
-
-    fn default_model(&self, _cx: &App) -> Option<Arc<dyn LanguageModel>> {
-        Some(self.create_language_model(anthropic::Model::default()))
-    }
-
-    fn default_fast_model(&self, _cx: &App) -> Option<Arc<dyn LanguageModel>> {
-        Some(self.create_language_model(anthropic::Model::default_fast()))
-    }
-
-    fn recommended_models(&self, _cx: &App) -> Vec<Arc<dyn LanguageModel>> {
-        [
-            anthropic::Model::ClaudeSonnet4_5,
-            anthropic::Model::ClaudeSonnet4_5Thinking,
-        ]
-        .into_iter()
-        .map(|model| self.create_language_model(model))
-        .collect()
-    }
-
-    fn provided_models(&self, cx: &App) -> Vec<Arc<dyn LanguageModel>> {
-        let mut models = BTreeMap::default();
-
-        // Add base models from anthropic::Model::iter()
-        for model in anthropic::Model::iter() {
-            if !matches!(model, anthropic::Model::Custom { .. }) {
-                models.insert(model.id().to_string(), model);
-            }
-        }
-
-        // Override with available models from settings
-        for model in &AnthropicLanguageModelProvider::settings(cx).available_models {
-            models.insert(
-                model.name.clone(),
-                anthropic::Model::Custom {
-                    name: model.name.clone(),
-                    display_name: model.display_name.clone(),
-                    max_tokens: model.max_tokens,
-                    tool_override: model.tool_override.clone(),
-                    cache_configuration: model.cache_configuration.as_ref().map(|config| {
-                        anthropic::AnthropicModelCacheConfiguration {
-                            max_cache_anchors: config.max_cache_anchors,
-                            should_speculate: config.should_speculate,
-                            min_total_token: config.min_total_token,
-                        }
-                    }),
-                    max_output_tokens: model.max_output_tokens,
-                    default_temperature: model.default_temperature,
-                    extra_beta_headers: model.extra_beta_headers.clone(),
-                    mode: model.mode.unwrap_or_default().into(),
-                },
-            );
-        }
-
-        models
-            .into_values()
-            .map(|model| self.create_language_model(model))
-            .collect()
-    }
-
-    fn is_authenticated(&self, cx: &App) -> bool {
-        self.state.read(cx).is_authenticated()
-    }
-
-    fn authenticate(&self, cx: &mut App) -> Task<Result<(), AuthenticateError>> {
-        self.state.update(cx, |state, cx| state.authenticate(cx))
-    }
-
-    fn configuration_view(
-        &self,
-        target_agent: ConfigurationViewTargetAgent,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> AnyView {
-        cx.new(|cx| ConfigurationView::new(self.state.clone(), target_agent, window, cx))
-            .into()
-    }
-
-    fn reset_credentials(&self, cx: &mut App) -> Task<Result<()>> {
-        self.state
-            .update(cx, |state, cx| state.set_api_key(None, cx))
-    }
-}
-
-pub struct AnthropicModel {
-    id: LanguageModelId,
-    model: anthropic::Model,
-    state: Entity<State>,
-    http_client: Arc<dyn HttpClient>,
-    request_limiter: RateLimiter,
-}
-
-pub fn count_anthropic_tokens(
-    request: LanguageModelRequest,
-    cx: &App,
-) -> BoxFuture<'static, Result<u64>> {
-    cx.background_spawn(async move {
-        let messages = request.messages;
-        let mut tokens_from_images = 0;
-        let mut string_messages = Vec::with_capacity(messages.len());
-
-        for message in messages {
-            use language_model::MessageContent;
-
-            let mut string_contents = String::new();
-
-            for content in message.content {
-                match content {
-                    MessageContent::Text(text) => {
-                        string_contents.push_str(&text);
-                    }
-                    MessageContent::Thinking { .. } => {
-                        // Thinking blocks are not included in the input token count.
-                    }
-                    MessageContent::RedactedThinking(_) => {
-                        // Thinking blocks are not included in the input token count.
-                    }
-                    MessageContent::Image(image) => {
-                        tokens_from_images += image.estimate_tokens();
-                    }
-                    MessageContent::ToolUse(_tool_use) => {
-                        // TODO: Estimate token usage from tool uses.
-                    }
-                    MessageContent::ToolResult(tool_result) => match &tool_result.content {
-                        LanguageModelToolResultContent::Text(text) => {
-                            string_contents.push_str(text);
-                        }
-                        LanguageModelToolResultContent::Image(image) => {
-                            tokens_from_images += image.estimate_tokens();
-                        }
-                    },
-                }
-            }
-
-            if !string_contents.is_empty() {
-                string_messages.push(tiktoken_rs::ChatCompletionRequestMessage {
-                    role: match message.role {
-                        Role::User => "user".into(),
-                        Role::Assistant => "assistant".into(),
-                        Role::System => "system".into(),
-                    },
-                    content: Some(string_contents),
-                    name: None,
-                    function_call: None,
-                });
-            }
-        }
-
-        // Tiktoken doesn't yet support these models, so we manually use the
-        // same tokenizer as GPT-4.
-        tiktoken_rs::num_tokens_from_messages("gpt-4", &string_messages)
-            .map(|tokens| (tokens + tokens_from_images) as u64)
-    })
-    .boxed()
-}
-
-impl AnthropicModel {
-    fn stream_completion(
-        &self,
-        request: anthropic::Request,
-        cx: &AsyncApp,
-    ) -> BoxFuture<
-        'static,
-        Result<
-            BoxStream<'static, Result<anthropic::Event, AnthropicError>>,
-            LanguageModelCompletionError,
-        >,
-    > {
-        let http_client = self.http_client.clone();
-
-        let Ok((api_key, api_url)) = self.state.read_with(cx, |state, cx| {
-            let api_url = AnthropicLanguageModelProvider::api_url(cx);
-            (state.api_key_state.key(&api_url), api_url)
-        }) else {
-            return future::ready(Err(anyhow!("App state dropped").into())).boxed();
-        };
-
-        let beta_headers = self.model.beta_headers();
-
-        async move {
-            let Some(api_key) = api_key else {
-                return Err(LanguageModelCompletionError::NoApiKey {
-                    provider: PROVIDER_NAME,
-                });
-            };
-            let request = anthropic::stream_completion(
-                http_client.as_ref(),
-                &api_url,
-                &api_key,
-                request,
-                beta_headers,
-            );
-            request.await.map_err(Into::into)
-        }
-        .boxed()
-    }
-}
-
-impl LanguageModel for AnthropicModel {
-    fn id(&self) -> LanguageModelId {
-        self.id.clone()
-    }
-
-    fn name(&self) -> LanguageModelName {
-        LanguageModelName::from(self.model.display_name().to_string())
-    }
-
-    fn provider_id(&self) -> LanguageModelProviderId {
-        PROVIDER_ID
-    }
-
-    fn provider_name(&self) -> LanguageModelProviderName {
-        PROVIDER_NAME
-    }
-
-    fn supports_tools(&self) -> bool {
-        true
-    }
-
-    fn supports_images(&self) -> bool {
-        true
-    }
-
-    fn supports_tool_choice(&self, choice: LanguageModelToolChoice) -> bool {
-        match choice {
-            LanguageModelToolChoice::Auto
-            | LanguageModelToolChoice::Any
-            | LanguageModelToolChoice::None => true,
-        }
-    }
-
-    fn telemetry_id(&self) -> String {
-        format!("anthropic/{}", self.model.id())
-    }
-
-    fn api_key(&self, cx: &App) -> Option<String> {
-        self.state.read_with(cx, |state, cx| {
-            let api_url = AnthropicLanguageModelProvider::api_url(cx);
-            state.api_key_state.key(&api_url).map(|key| key.to_string())
-        })
-    }
-
-    fn max_token_count(&self) -> u64 {
-        self.model.max_token_count()
-    }
-
-    fn max_output_tokens(&self) -> Option<u64> {
-        Some(self.model.max_output_tokens())
-    }
-
-    fn count_tokens(
-        &self,
-        request: LanguageModelRequest,
-        cx: &App,
-    ) -> BoxFuture<'static, Result<u64>> {
-        count_anthropic_tokens(request, cx)
-    }
-
-    fn stream_completion(
-        &self,
-        request: LanguageModelRequest,
-        cx: &AsyncApp,
-    ) -> BoxFuture<
-        'static,
-        Result<
-            BoxStream<'static, Result<LanguageModelCompletionEvent, LanguageModelCompletionError>>,
-            LanguageModelCompletionError,
-        >,
-    > {
-        let request = into_anthropic(
-            request,
-            self.model.request_id().into(),
-            self.model.default_temperature(),
-            self.model.max_output_tokens(),
-            self.model.mode(),
-        );
-        let request = self.stream_completion(request, cx);
-        let future = self.request_limiter.stream(async move {
-            let response = request.await?;
-            Ok(AnthropicEventMapper::new().map_stream(response))
-        });
-        async move { Ok(future.await?.boxed()) }.boxed()
-    }
-
-    fn cache_configuration(&self) -> Option<LanguageModelCacheConfiguration> {
-        self.model
-            .cache_configuration()
-            .map(|config| LanguageModelCacheConfiguration {
-                max_cache_anchors: config.max_cache_anchors,
-                should_speculate: config.should_speculate,
-                min_total_token: config.min_total_token,
-            })
-    }
-}
-
-pub fn into_anthropic(
-    request: LanguageModelRequest,
-    model: String,
-    default_temperature: f32,
-    max_output_tokens: u64,
-    mode: AnthropicModelMode,
-) -> anthropic::Request {
-    let mut new_messages: Vec<anthropic::Message> = Vec::new();
-    let mut system_message = String::new();
-
-    for message in request.messages {
-        if message.contents_empty() {
-            continue;
-        }
-
-        match message.role {
-            Role::User | Role::Assistant => {
-                let mut anthropic_message_content: Vec<anthropic::RequestContent> = message
-                    .content
-                    .into_iter()
-                    .filter_map(|content| match content {
-                        MessageContent::Text(text) => {
-                            let text = if text.chars().last().is_some_and(|c| c.is_whitespace()) {
-                                text.trim_end().to_string()
-                            } else {
-                                text
-                            };
-                            if !text.is_empty() {
-                                Some(anthropic::RequestContent::Text {
-                                    text,
-                                    cache_control: None,
-                                })
-                            } else {
-                                None
-                            }
-                        }
-                        MessageContent::Thinking {
-                            text: thinking,
-                            signature,
-                        } => {
-                            if !thinking.is_empty() {
-                                Some(anthropic::RequestContent::Thinking {
-                                    thinking,
-                                    signature: signature.unwrap_or_default(),
-                                    cache_control: None,
-                                })
-                            } else {
-                                None
-                            }
-                        }
-                        MessageContent::RedactedThinking(data) => {
-                            if !data.is_empty() {
-                                Some(anthropic::RequestContent::RedactedThinking { data })
-                            } else {
-                                None
-                            }
-                        }
-                        MessageContent::Image(image) => Some(anthropic::RequestContent::Image {
-                            source: anthropic::ImageSource {
-                                source_type: "base64".to_string(),
-                                media_type: "image/png".to_string(),
-                                data: image.source.to_string(),
-                            },
-                            cache_control: None,
-                        }),
-                        MessageContent::ToolUse(tool_use) => {
-                            Some(anthropic::RequestContent::ToolUse {
-                                id: tool_use.id.to_string(),
-                                name: tool_use.name.to_string(),
-                                input: tool_use.input,
-                                cache_control: None,
-                            })
-                        }
-                        MessageContent::ToolResult(tool_result) => {
-                            Some(anthropic::RequestContent::ToolResult {
-                                tool_use_id: tool_result.tool_use_id.to_string(),
-                                is_error: tool_result.is_error,
-                                content: match tool_result.content {
-                                    LanguageModelToolResultContent::Text(text) => {
-                                        ToolResultContent::Plain(text.to_string())
-                                    }
-                                    LanguageModelToolResultContent::Image(image) => {
-                                        ToolResultContent::Multipart(vec![ToolResultPart::Image {
-                                            source: anthropic::ImageSource {
-                                                source_type: "base64".to_string(),
-                                                media_type: "image/png".to_string(),
-                                                data: image.source.to_string(),
-                                            },
-                                        }])
-                                    }
-                                },
-                                cache_control: None,
-                            })
-                        }
-                    })
-                    .collect();
-                let anthropic_role = match message.role {
-                    Role::User => anthropic::Role::User,
-                    Role::Assistant => anthropic::Role::Assistant,
-                    Role::System => unreachable!("System role should never occur here"),
-                };
-                if let Some(last_message) = new_messages.last_mut()
-                    && last_message.role == anthropic_role
-                {
-                    last_message.content.extend(anthropic_message_content);
-                    continue;
-                }
-
-                // Mark the last segment of the message as cached
-                if message.cache {
-                    let cache_control_value = Some(anthropic::CacheControl {
-                        cache_type: anthropic::CacheControlType::Ephemeral,
-                    });
-                    for message_content in anthropic_message_content.iter_mut().rev() {
-                        match message_content {
-                            anthropic::RequestContent::RedactedThinking { .. } => {
-                                // Caching is not possible, fallback to next message
-                            }
-                            anthropic::RequestContent::Text { cache_control, .. }
-                            | anthropic::RequestContent::Thinking { cache_control, .. }
-                            | anthropic::RequestContent::Image { cache_control, .. }
-                            | anthropic::RequestContent::ToolUse { cache_control, .. }
-                            | anthropic::RequestContent::ToolResult { cache_control, .. } => {
-                                *cache_control = cache_control_value;
-                                break;
-                            }
-                        }
-                    }
-                }
-
-                new_messages.push(anthropic::Message {
-                    role: anthropic_role,
-                    content: anthropic_message_content,
-                });
-            }
-            Role::System => {
-                if !system_message.is_empty() {
-                    system_message.push_str("\n\n");
-                }
-                system_message.push_str(&message.string_contents());
-            }
-        }
-    }
-
-    anthropic::Request {
-        model,
-        messages: new_messages,
-        max_tokens: max_output_tokens,
-        system: if system_message.is_empty() {
-            None
-        } else {
-            Some(anthropic::StringOrContents::String(system_message))
-        },
-        thinking: if request.thinking_allowed
-            && let AnthropicModelMode::Thinking { budget_tokens } = mode
-        {
-            Some(anthropic::Thinking::Enabled { budget_tokens })
-        } else {
-            None
-        },
-        tools: request
-            .tools
-            .into_iter()
-            .map(|tool| anthropic::Tool {
-                name: tool.name,
-                description: tool.description,
-                input_schema: tool.input_schema,
-            })
-            .collect(),
-        tool_choice: request.tool_choice.map(|choice| match choice {
-            LanguageModelToolChoice::Auto => anthropic::ToolChoice::Auto,
-            LanguageModelToolChoice::Any => anthropic::ToolChoice::Any,
-            LanguageModelToolChoice::None => anthropic::ToolChoice::None,
-        }),
-        metadata: None,
-        stop_sequences: Vec::new(),
-        temperature: request.temperature.or(Some(default_temperature)),
-        top_k: None,
-        top_p: None,
-    }
-}
-
-pub struct AnthropicEventMapper {
-    tool_uses_by_index: HashMap<usize, RawToolUse>,
-    usage: Usage,
-    stop_reason: StopReason,
-}
-
-impl AnthropicEventMapper {
-    pub fn new() -> Self {
-        Self {
-            tool_uses_by_index: HashMap::default(),
-            usage: Usage::default(),
-            stop_reason: StopReason::EndTurn,
-        }
-    }
-
-    pub fn map_stream(
-        mut self,
-        events: Pin<Box<dyn Send + Stream<Item = Result<Event, AnthropicError>>>>,
-    ) -> impl Stream<Item = Result<LanguageModelCompletionEvent, LanguageModelCompletionError>>
-    {
-        events.flat_map(move |event| {
-            futures::stream::iter(match event {
-                Ok(event) => self.map_event(event),
-                Err(error) => vec![Err(error.into())],
-            })
-        })
-    }
-
-    pub fn map_event(
-        &mut self,
-        event: Event,
-    ) -> Vec<Result<LanguageModelCompletionEvent, LanguageModelCompletionError>> {
-        match event {
-            Event::ContentBlockStart {
-                index,
-                content_block,
-            } => match content_block {
-                ResponseContent::Text { text } => {
-                    vec![Ok(LanguageModelCompletionEvent::Text(text))]
-                }
-                ResponseContent::Thinking { thinking } => {
-                    vec![Ok(LanguageModelCompletionEvent::Thinking {
-                        text: thinking,
-                        signature: None,
-                    })]
-                }
-                ResponseContent::RedactedThinking { data } => {
-                    vec![Ok(LanguageModelCompletionEvent::RedactedThinking { data })]
-                }
-                ResponseContent::ToolUse { id, name, .. } => {
-                    self.tool_uses_by_index.insert(
-                        index,
-                        RawToolUse {
-                            id,
-                            name,
-                            input_json: String::new(),
-                        },
-                    );
-                    Vec::new()
-                }
-            },
-            Event::ContentBlockDelta { index, delta } => match delta {
-                ContentDelta::TextDelta { text } => {
-                    vec![Ok(LanguageModelCompletionEvent::Text(text))]
-                }
-                ContentDelta::ThinkingDelta { thinking } => {
-                    vec![Ok(LanguageModelCompletionEvent::Thinking {
-                        text: thinking,
-                        signature: None,
-                    })]
-                }
-                ContentDelta::SignatureDelta { signature } => {
-                    vec![Ok(LanguageModelCompletionEvent::Thinking {
-                        text: "".to_string(),
-                        signature: Some(signature),
-                    })]
-                }
-                ContentDelta::InputJsonDelta { partial_json } => {
-                    if let Some(tool_use) = self.tool_uses_by_index.get_mut(&index) {
-                        tool_use.input_json.push_str(&partial_json);
-
-                        // Try to convert invalid (incomplete) JSON into
-                        // valid JSON that serde can accept, e.g. by closing
-                        // unclosed delimiters. This way, we can update the
-                        // UI with whatever has been streamed back so far.
-                        if let Ok(input) = serde_json::Value::from_str(
-                            &partial_json_fixer::fix_json(&tool_use.input_json),
-                        ) {
-                            return vec![Ok(LanguageModelCompletionEvent::ToolUse(
-                                LanguageModelToolUse {
-                                    id: tool_use.id.clone().into(),
-                                    name: tool_use.name.clone().into(),
-                                    is_input_complete: false,
-                                    raw_input: tool_use.input_json.clone(),
-                                    input,
-                                    thought_signature: None,
-                                },
-                            ))];
-                        }
-                    }
-                    vec![]
-                }
-            },
-            Event::ContentBlockStop { index } => {
-                if let Some(tool_use) = self.tool_uses_by_index.remove(&index) {
-                    let input_json = tool_use.input_json.trim();
-                    let input_value = if input_json.is_empty() {
-                        Ok(serde_json::Value::Object(serde_json::Map::default()))
-                    } else {
-                        serde_json::Value::from_str(input_json)
-                    };
-                    let event_result = match input_value {
-                        Ok(input) => Ok(LanguageModelCompletionEvent::ToolUse(
-                            LanguageModelToolUse {
-                                id: tool_use.id.into(),
-                                name: tool_use.name.into(),
-                                is_input_complete: true,
-                                input,
-                                raw_input: tool_use.input_json.clone(),
-                                thought_signature: None,
-                            },
-                        )),
-                        Err(json_parse_err) => {
-                            Ok(LanguageModelCompletionEvent::ToolUseJsonParseError {
-                                id: tool_use.id.into(),
-                                tool_name: tool_use.name.into(),
-                                raw_input: input_json.into(),
-                                json_parse_error: json_parse_err.to_string(),
-                            })
-                        }
-                    };
-
-                    vec![event_result]
-                } else {
-                    Vec::new()
-                }
-            }
-            Event::MessageStart { message } => {
-                update_usage(&mut self.usage, &message.usage);
-                vec![
-                    Ok(LanguageModelCompletionEvent::UsageUpdate(convert_usage(
-                        &self.usage,
-                    ))),
-                    Ok(LanguageModelCompletionEvent::StartMessage {
-                        message_id: message.id,
-                    }),
-                ]
-            }
-            Event::MessageDelta { delta, usage } => {
-                update_usage(&mut self.usage, &usage);
-                if let Some(stop_reason) = delta.stop_reason.as_deref() {
-                    self.stop_reason = match stop_reason {
-                        "end_turn" => StopReason::EndTurn,
-                        "max_tokens" => StopReason::MaxTokens,
-                        "tool_use" => StopReason::ToolUse,
-                        "refusal" => StopReason::Refusal,
-                        _ => {
-                            log::error!("Unexpected anthropic stop_reason: {stop_reason}");
-                            StopReason::EndTurn
-                        }
-                    };
-                }
-                vec![Ok(LanguageModelCompletionEvent::UsageUpdate(
-                    convert_usage(&self.usage),
-                ))]
-            }
-            Event::MessageStop => {
-                vec![Ok(LanguageModelCompletionEvent::Stop(self.stop_reason))]
-            }
-            Event::Error { error } => {
-                vec![Err(error.into())]
-            }
-            _ => Vec::new(),
-        }
-    }
-}
-
-struct RawToolUse {
-    id: String,
-    name: String,
-    input_json: String,
-}
-
-/// Updates usage data by preferring counts from `new`.
-fn update_usage(usage: &mut Usage, new: &Usage) {
-    if let Some(input_tokens) = new.input_tokens {
-        usage.input_tokens = Some(input_tokens);
-    }
-    if let Some(output_tokens) = new.output_tokens {
-        usage.output_tokens = Some(output_tokens);
-    }
-    if let Some(cache_creation_input_tokens) = new.cache_creation_input_tokens {
-        usage.cache_creation_input_tokens = Some(cache_creation_input_tokens);
-    }
-    if let Some(cache_read_input_tokens) = new.cache_read_input_tokens {
-        usage.cache_read_input_tokens = Some(cache_read_input_tokens);
-    }
-}
-
-fn convert_usage(usage: &Usage) -> language_model::TokenUsage {
-    language_model::TokenUsage {
-        input_tokens: usage.input_tokens.unwrap_or(0),
-        output_tokens: usage.output_tokens.unwrap_or(0),
-        cache_creation_input_tokens: usage.cache_creation_input_tokens.unwrap_or(0),
-        cache_read_input_tokens: usage.cache_read_input_tokens.unwrap_or(0),
-    }
-}
-
-struct ConfigurationView {
-    api_key_editor: Entity<InputField>,
-    state: Entity<State>,
-    load_credentials_task: Option<Task<()>>,
-    target_agent: ConfigurationViewTargetAgent,
-}
-
-impl ConfigurationView {
-    const PLACEHOLDER_TEXT: &'static str = "sk-ant-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
-
-    fn new(
-        state: Entity<State>,
-        target_agent: ConfigurationViewTargetAgent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        cx.observe(&state, |_, _, cx| {
-            cx.notify();
-        })
-        .detach();
-
-        let load_credentials_task = Some(cx.spawn({
-            let state = state.clone();
-            async move |this, cx| {
-                if let Some(task) = state
-                    .update(cx, |state, cx| state.authenticate(cx))
-                    .log_err()
-                {
-                    // We don't log an error, because "not signed in" is also an error.
-                    let _ = task.await;
-                }
-                this.update(cx, |this, cx| {
-                    this.load_credentials_task = None;
-                    cx.notify();
-                })
-                .log_err();
-            }
-        }));
-
-        Self {
-            api_key_editor: cx.new(|cx| InputField::new(window, cx, Self::PLACEHOLDER_TEXT)),
-            state,
-            load_credentials_task,
-            target_agent,
-        }
-    }
-
-    fn save_api_key(&mut self, _: &menu::Confirm, window: &mut Window, cx: &mut Context<Self>) {
-        let api_key = self.api_key_editor.read(cx).text(cx);
-        if api_key.is_empty() {
-            return;
-        }
-
-        // url changes can cause the editor to be displayed again
-        self.api_key_editor
-            .update(cx, |editor, cx| editor.set_text("", window, cx));
-
-        let state = self.state.clone();
-        cx.spawn_in(window, async move |_, cx| {
-            state
-                .update(cx, |state, cx| state.set_api_key(Some(api_key), cx))?
-                .await
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn reset_api_key(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.api_key_editor
-            .update(cx, |editor, cx| editor.set_text("", window, cx));
-
-        let state = self.state.clone();
-        cx.spawn_in(window, async move |_, cx| {
-            state
-                .update(cx, |state, cx| state.set_api_key(None, cx))?
-                .await
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn should_render_editor(&self, cx: &mut Context<Self>) -> bool {
-        !self.state.read(cx).is_authenticated()
-    }
-}
-
-impl Render for ConfigurationView {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let env_var_set = self.state.read(cx).api_key_state.is_from_env_var();
-        let configured_card_label = if env_var_set {
-            format!("API key set in {API_KEY_ENV_VAR_NAME} environment variable")
-        } else {
-            let api_url = AnthropicLanguageModelProvider::api_url(cx);
-            if api_url == ANTHROPIC_API_URL {
-                "API key configured".to_string()
-            } else {
-                format!("API key configured for {}", api_url)
-            }
-        };
-
-        if self.load_credentials_task.is_some() {
-            div()
-                .child(Label::new("Loading credentials..."))
-                .into_any_element()
-        } else if self.should_render_editor(cx) {
-            v_flex()
-                .size_full()
-                .on_action(cx.listener(Self::save_api_key))
-                .child(Label::new(format!("To use {}, you need to add an API key. Follow these steps:", match &self.target_agent {
-                    ConfigurationViewTargetAgent::ZedAgent => "Zed's agent with Anthropic".into(),
-                    ConfigurationViewTargetAgent::Other(agent) => agent.clone(),
-                })))
-                .child(
-                    List::new()
-                        .child(
-                            InstructionListItem::new(
-                                "Create one by visiting",
-                                Some("Anthropic's settings"),
-                                Some("https://console.anthropic.com/settings/keys")
-                            )
-                        )
-                        .child(
-                            InstructionListItem::text_only("Paste your API key below and hit enter to start using the agent")
-                        )
-                )
-                .child(self.api_key_editor.clone())
-                .child(
-                    Label::new(
-                        format!("You can also assign the {API_KEY_ENV_VAR_NAME} environment variable and restart Zed."),
-                    )
-                    .size(LabelSize::Small)
-                    .color(Color::Muted),
-                )
-                .into_any_element()
-        } else {
-            ConfiguredApiCard::new(configured_card_label)
-                .disabled(env_var_set)
-                .on_click(cx.listener(|this, _, window, cx| this.reset_api_key(window, cx)))
-                .when(env_var_set, |this| {
-                    this.tooltip_label(format!(
-                    "To reset your API key, unset the {API_KEY_ENV_VAR_NAME} environment variable."
-                ))
-                })
-                .into_any_element()
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use anthropic::AnthropicModelMode;
-    use language_model::{LanguageModelRequestMessage, MessageContent};
-
-    #[test]
-    fn test_cache_control_only_on_last_segment() {
-        let request = LanguageModelRequest {
-            messages: vec![LanguageModelRequestMessage {
-                role: Role::User,
-                content: vec![
-                    MessageContent::Text("Some prompt".to_string()),
-                    MessageContent::Image(language_model::LanguageModelImage::empty()),
-                    MessageContent::Image(language_model::LanguageModelImage::empty()),
-                    MessageContent::Image(language_model::LanguageModelImage::empty()),
-                    MessageContent::Image(language_model::LanguageModelImage::empty()),
-                ],
-                cache: true,
-                reasoning_details: None,
-            }],
-            thread_id: None,
-            prompt_id: None,
-            intent: None,
-            mode: None,
-            stop: vec![],
-            temperature: None,
-            tools: vec![],
-            tool_choice: None,
-            thinking_allowed: true,
-        };
-
-        let anthropic_request = into_anthropic(
-            request,
-            "claude-3-5-sonnet".to_string(),
-            0.7,
-            4096,
-            AnthropicModelMode::Default,
-        );
-
-        assert_eq!(anthropic_request.messages.len(), 1);
-
-        let message = &anthropic_request.messages[0];
-        assert_eq!(message.content.len(), 5);
-
-        assert!(matches!(
-            message.content[0],
-            anthropic::RequestContent::Text {
-                cache_control: None,
-                ..
-            }
-        ));
-        for i in 1..3 {
-            assert!(matches!(
-                message.content[i],
-                anthropic::RequestContent::Image {
-                    cache_control: None,
-                    ..
-                }
-            ));
-        }
-
-        assert!(matches!(
-            message.content[4],
-            anthropic::RequestContent::Image {
-                cache_control: Some(anthropic::CacheControl {
-                    cache_type: anthropic::CacheControlType::Ephemeral,
-                }),
-                ..
-            }
-        ));
-    }
-}
diff --git a/crates/language_models/src/provider/bedrock.rs b/crates/language_models/src/provider/bedrock.rs
deleted file mode 100644
index e478c193a2..0000000000
--- a/crates/language_models/src/provider/bedrock.rs
+++ /dev/null
@@ -1,1327 +0,0 @@
-use std::pin::Pin;
-use std::str::FromStr;
-use std::sync::Arc;
-
-use crate::ui::{ConfiguredApiCard, InstructionListItem};
-use anyhow::{Context as _, Result, anyhow};
-use aws_config::stalled_stream_protection::StalledStreamProtectionConfig;
-use aws_config::{BehaviorVersion, Region};
-use aws_credential_types::Credentials;
-use aws_http_client::AwsHttpClient;
-use bedrock::bedrock_client::Client as BedrockClient;
-use bedrock::bedrock_client::config::timeout::TimeoutConfig;
-use bedrock::bedrock_client::types::{
-    CachePointBlock, CachePointType, ContentBlockDelta, ContentBlockStart, ConverseStreamOutput,
-    ReasoningContentBlockDelta, StopReason,
-};
-use bedrock::{
-    BedrockAnyToolChoice, BedrockAutoToolChoice, BedrockBlob, BedrockError, BedrockInnerContent,
-    BedrockMessage, BedrockModelMode, BedrockStreamingResponse, BedrockThinkingBlock,
-    BedrockThinkingTextBlock, BedrockTool, BedrockToolChoice, BedrockToolConfig,
-    BedrockToolInputSchema, BedrockToolResultBlock, BedrockToolResultContentBlock,
-    BedrockToolResultStatus, BedrockToolSpec, BedrockToolUseBlock, Model, value_to_aws_document,
-};
-use collections::{BTreeMap, HashMap};
-use credentials_provider::CredentialsProvider;
-use futures::{FutureExt, Stream, StreamExt, future::BoxFuture, stream::BoxStream};
-use gpui::{
-    AnyView, App, AsyncApp, Context, Entity, FocusHandle, FontWeight, Subscription, Task, Window,
-    actions,
-};
-use gpui_tokio::Tokio;
-use http_client::HttpClient;
-use language_model::{
-    AuthenticateError, LanguageModel, LanguageModelCacheConfiguration,
-    LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelId, LanguageModelName,
-    LanguageModelProvider, LanguageModelProviderId, LanguageModelProviderName,
-    LanguageModelProviderState, LanguageModelRequest, LanguageModelToolChoice,
-    LanguageModelToolResultContent, LanguageModelToolUse, MessageContent, RateLimiter, Role,
-    TokenUsage,
-};
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use serde_json::Value;
-use settings::{BedrockAvailableModel as AvailableModel, Settings, SettingsStore};
-use smol::lock::OnceCell;
-use strum::{EnumIter, IntoEnumIterator, IntoStaticStr};
-use ui::{List, prelude::*};
-use ui_input::InputField;
-use util::ResultExt;
-
-use crate::AllLanguageModelSettings;
-
-actions!(bedrock, [Tab, TabPrev]);
-
-const PROVIDER_ID: LanguageModelProviderId = LanguageModelProviderId::new("amazon-bedrock");
-const PROVIDER_NAME: LanguageModelProviderName = LanguageModelProviderName::new("Amazon Bedrock");
-
-#[derive(Default, Clone, Deserialize, Serialize, PartialEq, Debug)]
-pub struct BedrockCredentials {
-    pub access_key_id: String,
-    pub secret_access_key: String,
-    pub session_token: Option<String>,
-    pub region: String,
-}
-
-#[derive(Default, Clone, Debug, PartialEq)]
-pub struct AmazonBedrockSettings {
-    pub available_models: Vec<AvailableModel>,
-    pub region: Option<String>,
-    pub endpoint: Option<String>,
-    pub profile_name: Option<String>,
-    pub role_arn: Option<String>,
-    pub authentication_method: Option<BedrockAuthMethod>,
-    pub allow_global: Option<bool>,
-}
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, EnumIter, IntoStaticStr, JsonSchema)]
-pub enum BedrockAuthMethod {
-    #[serde(rename = "named_profile")]
-    NamedProfile,
-    #[serde(rename = "sso")]
-    SingleSignOn,
-    /// IMDSv2, PodIdentity, env vars, etc.
-    #[serde(rename = "default")]
-    Automatic,
-}
-
-impl From<settings::BedrockAuthMethodContent> for BedrockAuthMethod {
-    fn from(value: settings::BedrockAuthMethodContent) -> Self {
-        match value {
-            settings::BedrockAuthMethodContent::SingleSignOn => BedrockAuthMethod::SingleSignOn,
-            settings::BedrockAuthMethodContent::Automatic => BedrockAuthMethod::Automatic,
-            settings::BedrockAuthMethodContent::NamedProfile => BedrockAuthMethod::NamedProfile,
-        }
-    }
-}
-
-#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize, JsonSchema)]
-#[serde(tag = "type", rename_all = "lowercase")]
-pub enum ModelMode {
-    #[default]
-    Default,
-    Thinking {
-        /// The maximum number of tokens to use for reasoning. Must be lower than the model's `max_output_tokens`.
-        budget_tokens: Option<u64>,
-    },
-}
-
-impl From<ModelMode> for BedrockModelMode {
-    fn from(value: ModelMode) -> Self {
-        match value {
-            ModelMode::Default => BedrockModelMode::Default,
-            ModelMode::Thinking { budget_tokens } => BedrockModelMode::Thinking { budget_tokens },
-        }
-    }
-}
-
-impl From<BedrockModelMode> for ModelMode {
-    fn from(value: BedrockModelMode) -> Self {
-        match value {
-            BedrockModelMode::Default => ModelMode::Default,
-            BedrockModelMode::Thinking { budget_tokens } => ModelMode::Thinking { budget_tokens },
-        }
-    }
-}
-
-/// The URL of the base AWS service.
-///
-/// Right now we're just using this as the key to store the AWS credentials
-/// under in the keychain.
-const AMAZON_AWS_URL: &str = "https://amazonaws.com";
-
-// These environment variables all use a `ZED_` prefix because we don't want to overwrite the user's AWS credentials.
-const ZED_BEDROCK_ACCESS_KEY_ID_VAR: &str = "ZED_ACCESS_KEY_ID";
-const ZED_BEDROCK_SECRET_ACCESS_KEY_VAR: &str = "ZED_SECRET_ACCESS_KEY";
-const ZED_BEDROCK_SESSION_TOKEN_VAR: &str = "ZED_SESSION_TOKEN";
-const ZED_AWS_PROFILE_VAR: &str = "ZED_AWS_PROFILE";
-const ZED_BEDROCK_REGION_VAR: &str = "ZED_AWS_REGION";
-const ZED_AWS_CREDENTIALS_VAR: &str = "ZED_AWS_CREDENTIALS";
-const ZED_AWS_ENDPOINT_VAR: &str = "ZED_AWS_ENDPOINT";
-
-pub struct State {
-    credentials: Option<BedrockCredentials>,
-    settings: Option<AmazonBedrockSettings>,
-    credentials_from_env: bool,
-    _subscription: Subscription,
-}
-
-impl State {
-    fn reset_credentials(&self, cx: &mut Context<Self>) -> Task<Result<()>> {
-        let credentials_provider = <dyn CredentialsProvider>::global(cx);
-        cx.spawn(async move |this, cx| {
-            credentials_provider
-                .delete_credentials(AMAZON_AWS_URL, cx)
-                .await
-                .log_err();
-            this.update(cx, |this, cx| {
-                this.credentials = None;
-                this.credentials_from_env = false;
-                this.settings = None;
-                cx.notify();
-            })
-        })
-    }
-
-    fn set_credentials(
-        &mut self,
-        credentials: BedrockCredentials,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let credentials_provider = <dyn CredentialsProvider>::global(cx);
-        cx.spawn(async move |this, cx| {
-            credentials_provider
-                .write_credentials(
-                    AMAZON_AWS_URL,
-                    "Bearer",
-                    &serde_json::to_vec(&credentials)?,
-                    cx,
-                )
-                .await?;
-            this.update(cx, |this, cx| {
-                this.credentials = Some(credentials);
-                cx.notify();
-            })
-        })
-    }
-
-    fn is_authenticated(&self) -> bool {
-        let derived = self
-            .settings
-            .as_ref()
-            .and_then(|s| s.authentication_method.as_ref());
-        let creds = self.credentials.as_ref();
-
-        derived.is_some() || creds.is_some()
-    }
-
-    fn authenticate(&self, cx: &mut Context<Self>) -> Task<Result<(), AuthenticateError>> {
-        if self.is_authenticated() {
-            return Task::ready(Ok(()));
-        }
-
-        let credentials_provider = <dyn CredentialsProvider>::global(cx);
-        cx.spawn(async move |this, cx| {
-            let (credentials, from_env) =
-                if let Ok(credentials) = std::env::var(ZED_AWS_CREDENTIALS_VAR) {
-                    (credentials, true)
-                } else {
-                    let (_, credentials) = credentials_provider
-                        .read_credentials(AMAZON_AWS_URL, cx)
-                        .await?
-                        .ok_or_else(|| AuthenticateError::CredentialsNotFound)?;
-                    (
-                        String::from_utf8(credentials)
-                            .context("invalid {PROVIDER_NAME} credentials")?,
-                        false,
-                    )
-                };
-
-            let credentials: BedrockCredentials =
-                serde_json::from_str(&credentials).context("failed to parse credentials")?;
-
-            this.update(cx, |this, cx| {
-                this.credentials = Some(credentials);
-                this.credentials_from_env = from_env;
-                cx.notify();
-            })?;
-
-            Ok(())
-        })
-    }
-
-    fn get_region(&self) -> String {
-        // Get region - from credentials or directly from settings
-        let credentials_region = self.credentials.as_ref().map(|s| s.region.clone());
-        let settings_region = self.settings.as_ref().and_then(|s| s.region.clone());
-
-        // Use credentials region if available, otherwise use settings region, finally fall back to default
-        credentials_region
-            .or(settings_region)
-            .unwrap_or(String::from("us-east-1"))
-    }
-
-    fn get_allow_global(&self) -> bool {
-        self.settings
-            .as_ref()
-            .and_then(|s| s.allow_global)
-            .unwrap_or(false)
-    }
-}
-
-pub struct BedrockLanguageModelProvider {
-    http_client: AwsHttpClient,
-    handle: tokio::runtime::Handle,
-    state: Entity<State>,
-}
-
-impl BedrockLanguageModelProvider {
-    pub fn new(http_client: Arc<dyn HttpClient>, cx: &mut App) -> Self {
-        let state = cx.new(|cx| State {
-            credentials: None,
-            settings: Some(AllLanguageModelSettings::get_global(cx).bedrock.clone()),
-            credentials_from_env: false,
-            _subscription: cx.observe_global::<SettingsStore>(|_, cx| {
-                cx.notify();
-            }),
-        });
-
-        Self {
-            http_client: AwsHttpClient::new(http_client.clone()),
-            handle: Tokio::handle(cx),
-            state,
-        }
-    }
-
-    fn create_language_model(&self, model: bedrock::Model) -> Arc<dyn LanguageModel> {
-        Arc::new(BedrockModel {
-            id: LanguageModelId::from(model.id().to_string()),
-            model,
-            http_client: self.http_client.clone(),
-            handle: self.handle.clone(),
-            state: self.state.clone(),
-            client: OnceCell::new(),
-            request_limiter: RateLimiter::new(4),
-        })
-    }
-}
-
-impl LanguageModelProvider for BedrockLanguageModelProvider {
-    fn id(&self) -> LanguageModelProviderId {
-        PROVIDER_ID
-    }
-
-    fn name(&self) -> LanguageModelProviderName {
-        PROVIDER_NAME
-    }
-
-    fn icon(&self) -> IconName {
-        IconName::AiBedrock
-    }
-
-    fn default_model(&self, _cx: &App) -> Option<Arc<dyn LanguageModel>> {
-        Some(self.create_language_model(bedrock::Model::default()))
-    }
-
-    fn default_fast_model(&self, cx: &App) -> Option<Arc<dyn LanguageModel>> {
-        let region = self.state.read(cx).get_region();
-        Some(self.create_language_model(bedrock::Model::default_fast(region.as_str())))
-    }
-
-    fn provided_models(&self, cx: &App) -> Vec<Arc<dyn LanguageModel>> {
-        let mut models = BTreeMap::default();
-
-        for model in bedrock::Model::iter() {
-            if !matches!(model, bedrock::Model::Custom { .. }) {
-                // TODO: Sonnet 3.7 vs. 3.7 Thinking bug is here.
-                models.insert(model.id().to_string(), model);
-            }
-        }
-
-        // Override with available models from settings
-        for model in AllLanguageModelSettings::get_global(cx)
-            .bedrock
-            .available_models
-            .iter()
-        {
-            models.insert(
-                model.name.clone(),
-                bedrock::Model::Custom {
-                    name: model.name.clone(),
-                    display_name: model.display_name.clone(),
-                    max_tokens: model.max_tokens,
-                    max_output_tokens: model.max_output_tokens,
-                    default_temperature: model.default_temperature,
-                    cache_configuration: model.cache_configuration.as_ref().map(|config| {
-                        bedrock::BedrockModelCacheConfiguration {
-                            max_cache_anchors: config.max_cache_anchors,
-                            min_total_token: config.min_total_token,
-                        }
-                    }),
-                },
-            );
-        }
-
-        models
-            .into_values()
-            .map(|model| self.create_language_model(model))
-            .collect()
-    }
-
-    fn is_authenticated(&self, cx: &App) -> bool {
-        self.state.read(cx).is_authenticated()
-    }
-
-    fn authenticate(&self, cx: &mut App) -> Task<Result<(), AuthenticateError>> {
-        self.state.update(cx, |state, cx| state.authenticate(cx))
-    }
-
-    fn configuration_view(
-        &self,
-        _target_agent: language_model::ConfigurationViewTargetAgent,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> AnyView {
-        cx.new(|cx| ConfigurationView::new(self.state.clone(), window, cx))
-            .into()
-    }
-
-    fn reset_credentials(&self, cx: &mut App) -> Task<Result<()>> {
-        self.state
-            .update(cx, |state, cx| state.reset_credentials(cx))
-    }
-}
-
-impl LanguageModelProviderState for BedrockLanguageModelProvider {
-    type ObservableEntity = State;
-
-    fn observable_entity(&self) -> Option<Entity<Self::ObservableEntity>> {
-        Some(self.state.clone())
-    }
-}
-
-struct BedrockModel {
-    id: LanguageModelId,
-    model: Model,
-    http_client: AwsHttpClient,
-    handle: tokio::runtime::Handle,
-    client: OnceCell<BedrockClient>,
-    state: Entity<State>,
-    request_limiter: RateLimiter,
-}
-
-impl BedrockModel {
-    fn get_or_init_client(&self, cx: &AsyncApp) -> anyhow::Result<&BedrockClient> {
-        self.client
-            .get_or_try_init_blocking(|| {
-                let (auth_method, credentials, endpoint, region, settings) =
-                    cx.read_entity(&self.state, |state, _cx| {
-                        let auth_method = state
-                            .settings
-                            .as_ref()
-                            .and_then(|s| s.authentication_method.clone());
-
-                        let endpoint = state.settings.as_ref().and_then(|s| s.endpoint.clone());
-
-                        let region = state.get_region();
-
-                        (
-                            auth_method,
-                            state.credentials.clone(),
-                            endpoint,
-                            region,
-                            state.settings.clone(),
-                        )
-                    })?;
-
-                let mut config_builder = aws_config::defaults(BehaviorVersion::latest())
-                    .stalled_stream_protection(StalledStreamProtectionConfig::disabled())
-                    .http_client(self.http_client.clone())
-                    .region(Region::new(region))
-                    .timeout_config(TimeoutConfig::disabled());
-
-                if let Some(endpoint_url) = endpoint
-                    && !endpoint_url.is_empty()
-                {
-                    config_builder = config_builder.endpoint_url(endpoint_url);
-                }
-
-                match auth_method {
-                    None => {
-                        if let Some(creds) = credentials {
-                            let aws_creds = Credentials::new(
-                                creds.access_key_id,
-                                creds.secret_access_key,
-                                creds.session_token,
-                                None,
-                                "zed-bedrock-provider",
-                            );
-                            config_builder = config_builder.credentials_provider(aws_creds);
-                        }
-                    }
-                    Some(BedrockAuthMethod::NamedProfile)
-                    | Some(BedrockAuthMethod::SingleSignOn) => {
-                        // Currently NamedProfile and SSO behave the same way but only the instructions change
-                        // Until we support BearerAuth through SSO, this will not change.
-                        let profile_name = settings
-                            .and_then(|s| s.profile_name)
-                            .unwrap_or_else(|| "default".to_string());
-
-                        if !profile_name.is_empty() {
-                            config_builder = config_builder.profile_name(profile_name);
-                        }
-                    }
-                    Some(BedrockAuthMethod::Automatic) => {
-                        // Use default credential provider chain
-                    }
-                }
-
-                let config = self.handle.block_on(config_builder.load());
-                anyhow::Ok(BedrockClient::new(&config))
-            })
-            .context("initializing Bedrock client")?;
-
-        self.client.get().context("Bedrock client not initialized")
-    }
-
-    fn stream_completion(
-        &self,
-        request: bedrock::Request,
-        cx: &AsyncApp,
-    ) -> BoxFuture<
-        'static,
-        Result<BoxStream<'static, Result<BedrockStreamingResponse, BedrockError>>>,
-    > {
-        let Ok(runtime_client) = self
-            .get_or_init_client(cx)
-            .cloned()
-            .context("Bedrock client not initialized")
-        else {
-            return futures::future::ready(Err(anyhow!("App state dropped"))).boxed();
-        };
-
-        match Tokio::spawn(cx, bedrock::stream_completion(runtime_client, request)) {
-            Ok(res) => async { res.await.map_err(|err| anyhow!(err))? }.boxed(),
-            Err(err) => futures::future::ready(Err(anyhow!(err))).boxed(),
-        }
-    }
-}
-
-impl LanguageModel for BedrockModel {
-    fn id(&self) -> LanguageModelId {
-        self.id.clone()
-    }
-
-    fn name(&self) -> LanguageModelName {
-        LanguageModelName::from(self.model.display_name().to_string())
-    }
-
-    fn provider_id(&self) -> LanguageModelProviderId {
-        PROVIDER_ID
-    }
-
-    fn provider_name(&self) -> LanguageModelProviderName {
-        PROVIDER_NAME
-    }
-
-    fn supports_tools(&self) -> bool {
-        self.model.supports_tool_use()
-    }
-
-    fn supports_images(&self) -> bool {
-        false
-    }
-
-    fn supports_tool_choice(&self, choice: LanguageModelToolChoice) -> bool {
-        match choice {
-            LanguageModelToolChoice::Auto | LanguageModelToolChoice::Any => {
-                self.model.supports_tool_use()
-            }
-            // Add support for None - we'll filter tool calls at response
-            LanguageModelToolChoice::None => self.model.supports_tool_use(),
-        }
-    }
-
-    fn telemetry_id(&self) -> String {
-        format!("bedrock/{}", self.model.id())
-    }
-
-    fn max_token_count(&self) -> u64 {
-        self.model.max_token_count()
-    }
-
-    fn max_output_tokens(&self) -> Option<u64> {
-        Some(self.model.max_output_tokens())
-    }
-
-    fn count_tokens(
-        &self,
-        request: LanguageModelRequest,
-        cx: &App,
-    ) -> BoxFuture<'static, Result<u64>> {
-        get_bedrock_tokens(request, cx)
-    }
-
-    fn stream_completion(
-        &self,
-        request: LanguageModelRequest,
-        cx: &AsyncApp,
-    ) -> BoxFuture<
-        'static,
-        Result<
-            BoxStream<'static, Result<LanguageModelCompletionEvent, LanguageModelCompletionError>>,
-            LanguageModelCompletionError,
-        >,
-    > {
-        let Ok((region, allow_global)) = cx.read_entity(&self.state, |state, _cx| {
-            (state.get_region(), state.get_allow_global())
-        }) else {
-            return async move { Err(anyhow::anyhow!("App State Dropped").into()) }.boxed();
-        };
-
-        let model_id = match self.model.cross_region_inference_id(&region, allow_global) {
-            Ok(s) => s,
-            Err(e) => {
-                return async move { Err(e.into()) }.boxed();
-            }
-        };
-
-        let deny_tool_calls = request.tool_choice == Some(LanguageModelToolChoice::None);
-
-        let request = match into_bedrock(
-            request,
-            model_id,
-            self.model.default_temperature(),
-            self.model.max_output_tokens(),
-            self.model.mode(),
-            self.model.supports_caching(),
-        ) {
-            Ok(request) => request,
-            Err(err) => return futures::future::ready(Err(err.into())).boxed(),
-        };
-
-        let request = self.stream_completion(request, cx);
-        let future = self.request_limiter.stream(async move {
-            let response = request.await.map_err(|err| anyhow!(err))?;
-            let events = map_to_language_model_completion_events(response);
-
-            if deny_tool_calls {
-                Ok(deny_tool_use_events(events).boxed())
-            } else {
-                Ok(events.boxed())
-            }
-        });
-
-        async move { Ok(future.await?.boxed()) }.boxed()
-    }
-
-    fn cache_configuration(&self) -> Option<LanguageModelCacheConfiguration> {
-        self.model
-            .cache_configuration()
-            .map(|config| LanguageModelCacheConfiguration {
-                max_cache_anchors: config.max_cache_anchors,
-                should_speculate: false,
-                min_total_token: config.min_total_token,
-            })
-    }
-}
-
-fn deny_tool_use_events(
-    events: impl Stream<Item = Result<LanguageModelCompletionEvent, LanguageModelCompletionError>>,
-) -> impl Stream<Item = Result<LanguageModelCompletionEvent, LanguageModelCompletionError>> {
-    events.map(|event| {
-        match event {
-            Ok(LanguageModelCompletionEvent::ToolUse(tool_use)) => {
-                // Convert tool use to an error message if model decided to call it
-                Ok(LanguageModelCompletionEvent::Text(format!(
-                    "\n\n[Error: Tool calls are disabled in this context. Attempted to call '{}']",
-                    tool_use.name
-                )))
-            }
-            other => other,
-        }
-    })
-}
-
-pub fn into_bedrock(
-    request: LanguageModelRequest,
-    model: String,
-    default_temperature: f32,
-    max_output_tokens: u64,
-    mode: BedrockModelMode,
-    supports_caching: bool,
-) -> Result<bedrock::Request> {
-    let mut new_messages: Vec<BedrockMessage> = Vec::new();
-    let mut system_message = String::new();
-
-    for message in request.messages {
-        if message.contents_empty() {
-            continue;
-        }
-
-        match message.role {
-            Role::User | Role::Assistant => {
-                let mut bedrock_message_content: Vec<BedrockInnerContent> = message
-                    .content
-                    .into_iter()
-                    .filter_map(|content| match content {
-                        MessageContent::Text(text) => {
-                            if !text.is_empty() {
-                                Some(BedrockInnerContent::Text(text))
-                            } else {
-                                None
-                            }
-                        }
-                        MessageContent::Thinking { text, signature } => {
-                            if model.contains(Model::DeepSeekR1.request_id()) {
-                                // DeepSeekR1 doesn't support thinking blocks
-                                // And the AWS API demands that you strip them
-                                return None;
-                            }
-                            let thinking = BedrockThinkingTextBlock::builder()
-                                .text(text)
-                                .set_signature(signature)
-                                .build()
-                                .context("failed to build reasoning block")
-                                .log_err()?;
-
-                            Some(BedrockInnerContent::ReasoningContent(
-                                BedrockThinkingBlock::ReasoningText(thinking),
-                            ))
-                        }
-                        MessageContent::RedactedThinking(blob) => {
-                            if model.contains(Model::DeepSeekR1.request_id()) {
-                                // DeepSeekR1 doesn't support thinking blocks
-                                // And the AWS API demands that you strip them
-                                return None;
-                            }
-                            let redacted =
-                                BedrockThinkingBlock::RedactedContent(BedrockBlob::new(blob));
-
-                            Some(BedrockInnerContent::ReasoningContent(redacted))
-                        }
-                        MessageContent::ToolUse(tool_use) => {
-                            let input = if tool_use.input.is_null() {
-                                // Bedrock API requires valid JsonValue, not null, for tool use input
-                                value_to_aws_document(&serde_json::json!({}))
-                            } else {
-                                value_to_aws_document(&tool_use.input)
-                            };
-                            BedrockToolUseBlock::builder()
-                                .name(tool_use.name.to_string())
-                                .tool_use_id(tool_use.id.to_string())
-                                .input(input)
-                                .build()
-                                .context("failed to build Bedrock tool use block")
-                                .log_err()
-                                .map(BedrockInnerContent::ToolUse)
-                        },
-                        MessageContent::ToolResult(tool_result) => {
-                            BedrockToolResultBlock::builder()
-                                .tool_use_id(tool_result.tool_use_id.to_string())
-                                .content(match tool_result.content {
-                                    LanguageModelToolResultContent::Text(text) => {
-                                        BedrockToolResultContentBlock::Text(text.to_string())
-                                    }
-                                    LanguageModelToolResultContent::Image(_) => {
-                                        BedrockToolResultContentBlock::Text(
-                                            // TODO: Bedrock image support
-                                            "[Tool responded with an image, but Zed doesn't support these in Bedrock models yet]".to_string()
-                                        )
-                                    }
-                                })
-                                .status({
-                                    if tool_result.is_error {
-                                        BedrockToolResultStatus::Error
-                                    } else {
-                                        BedrockToolResultStatus::Success
-                                    }
-                                })
-                                .build()
-                                .context("failed to build Bedrock tool result block")
-                                .log_err()
-                                .map(BedrockInnerContent::ToolResult)
-                        }
-                        _ => None,
-                    })
-                    .collect();
-                if message.cache && supports_caching {
-                    bedrock_message_content.push(BedrockInnerContent::CachePoint(
-                        CachePointBlock::builder()
-                            .r#type(CachePointType::Default)
-                            .build()
-                            .context("failed to build cache point block")?,
-                    ));
-                }
-                let bedrock_role = match message.role {
-                    Role::User => bedrock::BedrockRole::User,
-                    Role::Assistant => bedrock::BedrockRole::Assistant,
-                    Role::System => unreachable!("System role should never occur here"),
-                };
-                if let Some(last_message) = new_messages.last_mut()
-                    && last_message.role == bedrock_role
-                {
-                    last_message.content.extend(bedrock_message_content);
-                    continue;
-                }
-                new_messages.push(
-                    BedrockMessage::builder()
-                        .role(bedrock_role)
-                        .set_content(Some(bedrock_message_content))
-                        .build()
-                        .context("failed to build Bedrock message")?,
-                );
-            }
-            Role::System => {
-                if !system_message.is_empty() {
-                    system_message.push_str("\n\n");
-                }
-                system_message.push_str(&message.string_contents());
-            }
-        }
-    }
-
-    let mut tool_spec: Vec<BedrockTool> = request
-        .tools
-        .iter()
-        .filter_map(|tool| {
-            Some(BedrockTool::ToolSpec(
-                BedrockToolSpec::builder()
-                    .name(tool.name.clone())
-                    .description(tool.description.clone())
-                    .input_schema(BedrockToolInputSchema::Json(value_to_aws_document(
-                        &tool.input_schema,
-                    )))
-                    .build()
-                    .log_err()?,
-            ))
-        })
-        .collect();
-
-    if !tool_spec.is_empty() && supports_caching {
-        tool_spec.push(BedrockTool::CachePoint(
-            CachePointBlock::builder()
-                .r#type(CachePointType::Default)
-                .build()
-                .context("failed to build cache point block")?,
-        ));
-    }
-
-    let tool_choice = match request.tool_choice {
-        Some(LanguageModelToolChoice::Auto) | None => {
-            BedrockToolChoice::Auto(BedrockAutoToolChoice::builder().build())
-        }
-        Some(LanguageModelToolChoice::Any) => {
-            BedrockToolChoice::Any(BedrockAnyToolChoice::builder().build())
-        }
-        Some(LanguageModelToolChoice::None) => {
-            // For None, we still use Auto but will filter out tool calls in the response
-            BedrockToolChoice::Auto(BedrockAutoToolChoice::builder().build())
-        }
-    };
-    let tool_config: BedrockToolConfig = BedrockToolConfig::builder()
-        .set_tools(Some(tool_spec))
-        .tool_choice(tool_choice)
-        .build()?;
-
-    Ok(bedrock::Request {
-        model,
-        messages: new_messages,
-        max_tokens: max_output_tokens,
-        system: Some(system_message),
-        tools: Some(tool_config),
-        thinking: if request.thinking_allowed
-            && let BedrockModelMode::Thinking { budget_tokens } = mode
-        {
-            Some(bedrock::Thinking::Enabled { budget_tokens })
-        } else {
-            None
-        },
-        metadata: None,
-        stop_sequences: Vec::new(),
-        temperature: request.temperature.or(Some(default_temperature)),
-        top_k: None,
-        top_p: None,
-    })
-}
-
-// TODO: just call the ConverseOutput.usage() method:
-// https://docs.rs/aws-sdk-bedrockruntime/latest/aws_sdk_bedrockruntime/operation/converse/struct.ConverseOutput.html#method.output
-pub fn get_bedrock_tokens(
-    request: LanguageModelRequest,
-    cx: &App,
-) -> BoxFuture<'static, Result<u64>> {
-    cx.background_executor()
-        .spawn(async move {
-            let messages = request.messages;
-            let mut tokens_from_images = 0;
-            let mut string_messages = Vec::with_capacity(messages.len());
-
-            for message in messages {
-                use language_model::MessageContent;
-
-                let mut string_contents = String::new();
-
-                for content in message.content {
-                    match content {
-                        MessageContent::Text(text) | MessageContent::Thinking { text, .. } => {
-                            string_contents.push_str(&text);
-                        }
-                        MessageContent::RedactedThinking(_) => {}
-                        MessageContent::Image(image) => {
-                            tokens_from_images += image.estimate_tokens();
-                        }
-                        MessageContent::ToolUse(_tool_use) => {
-                            // TODO: Estimate token usage from tool uses.
-                        }
-                        MessageContent::ToolResult(tool_result) => match tool_result.content {
-                            LanguageModelToolResultContent::Text(text) => {
-                                string_contents.push_str(&text);
-                            }
-                            LanguageModelToolResultContent::Image(image) => {
-                                tokens_from_images += image.estimate_tokens();
-                            }
-                        },
-                    }
-                }
-
-                if !string_contents.is_empty() {
-                    string_messages.push(tiktoken_rs::ChatCompletionRequestMessage {
-                        role: match message.role {
-                            Role::User => "user".into(),
-                            Role::Assistant => "assistant".into(),
-                            Role::System => "system".into(),
-                        },
-                        content: Some(string_contents),
-                        name: None,
-                        function_call: None,
-                    });
-                }
-            }
-
-            // Tiktoken doesn't yet support these models, so we manually use the
-            // same tokenizer as GPT-4.
-            tiktoken_rs::num_tokens_from_messages("gpt-4", &string_messages)
-                .map(|tokens| (tokens + tokens_from_images) as u64)
-        })
-        .boxed()
-}
-
-pub fn map_to_language_model_completion_events(
-    events: Pin<Box<dyn Send + Stream<Item = Result<BedrockStreamingResponse, BedrockError>>>>,
-) -> impl Stream<Item = Result<LanguageModelCompletionEvent, LanguageModelCompletionError>> {
-    struct RawToolUse {
-        id: String,
-        name: String,
-        input_json: String,
-    }
-
-    struct State {
-        events: Pin<Box<dyn Send + Stream<Item = Result<BedrockStreamingResponse, BedrockError>>>>,
-        tool_uses_by_index: HashMap<i32, RawToolUse>,
-    }
-
-    let initial_state = State {
-        events,
-        tool_uses_by_index: HashMap::default(),
-    };
-
-    futures::stream::unfold(initial_state, |mut state| async move {
-        match state.events.next().await {
-            Some(event_result) => match event_result {
-                Ok(event) => {
-                    let result = match event {
-                        ConverseStreamOutput::ContentBlockDelta(cb_delta) => match cb_delta.delta {
-                            Some(ContentBlockDelta::Text(text)) => {
-                                Some(Ok(LanguageModelCompletionEvent::Text(text)))
-                            }
-                            Some(ContentBlockDelta::ToolUse(tool_output)) => {
-                                if let Some(tool_use) = state
-                                    .tool_uses_by_index
-                                    .get_mut(&cb_delta.content_block_index)
-                                {
-                                    tool_use.input_json.push_str(tool_output.input());
-                                }
-                                None
-                            }
-                            Some(ContentBlockDelta::ReasoningContent(thinking)) => match thinking {
-                                ReasoningContentBlockDelta::Text(thoughts) => {
-                                    Some(Ok(LanguageModelCompletionEvent::Thinking {
-                                        text: thoughts,
-                                        signature: None,
-                                    }))
-                                }
-                                ReasoningContentBlockDelta::Signature(sig) => {
-                                    Some(Ok(LanguageModelCompletionEvent::Thinking {
-                                        text: "".into(),
-                                        signature: Some(sig),
-                                    }))
-                                }
-                                ReasoningContentBlockDelta::RedactedContent(redacted) => {
-                                    let content = String::from_utf8(redacted.into_inner())
-                                        .unwrap_or("REDACTED".to_string());
-                                    Some(Ok(LanguageModelCompletionEvent::Thinking {
-                                        text: content,
-                                        signature: None,
-                                    }))
-                                }
-                                _ => None,
-                            },
-                            _ => None,
-                        },
-                        ConverseStreamOutput::ContentBlockStart(cb_start) => {
-                            if let Some(ContentBlockStart::ToolUse(tool_start)) = cb_start.start {
-                                state.tool_uses_by_index.insert(
-                                    cb_start.content_block_index,
-                                    RawToolUse {
-                                        id: tool_start.tool_use_id,
-                                        name: tool_start.name,
-                                        input_json: String::new(),
-                                    },
-                                );
-                            }
-                            None
-                        }
-                        ConverseStreamOutput::ContentBlockStop(cb_stop) => state
-                            .tool_uses_by_index
-                            .remove(&cb_stop.content_block_index)
-                            .map(|tool_use| {
-                                let input = if tool_use.input_json.is_empty() {
-                                    Value::Null
-                                } else {
-                                    serde_json::Value::from_str(&tool_use.input_json)
-                                        .unwrap_or(Value::Null)
-                                };
-
-                                Ok(LanguageModelCompletionEvent::ToolUse(
-                                    LanguageModelToolUse {
-                                        id: tool_use.id.into(),
-                                        name: tool_use.name.into(),
-                                        is_input_complete: true,
-                                        raw_input: tool_use.input_json,
-                                        input,
-                                        thought_signature: None,
-                                    },
-                                ))
-                            }),
-                        ConverseStreamOutput::Metadata(cb_meta) => cb_meta.usage.map(|metadata| {
-                            Ok(LanguageModelCompletionEvent::UsageUpdate(TokenUsage {
-                                input_tokens: metadata.input_tokens as u64,
-                                output_tokens: metadata.output_tokens as u64,
-                                cache_creation_input_tokens: metadata
-                                    .cache_write_input_tokens
-                                    .unwrap_or_default()
-                                    as u64,
-                                cache_read_input_tokens: metadata
-                                    .cache_read_input_tokens
-                                    .unwrap_or_default()
-                                    as u64,
-                            }))
-                        }),
-                        ConverseStreamOutput::MessageStop(message_stop) => {
-                            let stop_reason = match message_stop.stop_reason {
-                                StopReason::ToolUse => language_model::StopReason::ToolUse,
-                                _ => language_model::StopReason::EndTurn,
-                            };
-                            Some(Ok(LanguageModelCompletionEvent::Stop(stop_reason)))
-                        }
-                        _ => None,
-                    };
-
-                    Some((result, state))
-                }
-                Err(err) => Some((
-                    Some(Err(LanguageModelCompletionError::Other(anyhow!(err)))),
-                    state,
-                )),
-            },
-            None => None,
-        }
-    })
-    .filter_map(|result| async move { result })
-}
-
-struct ConfigurationView {
-    access_key_id_editor: Entity<InputField>,
-    secret_access_key_editor: Entity<InputField>,
-    session_token_editor: Entity<InputField>,
-    region_editor: Entity<InputField>,
-    state: Entity<State>,
-    load_credentials_task: Option<Task<()>>,
-    focus_handle: FocusHandle,
-}
-
-impl ConfigurationView {
-    const PLACEHOLDER_ACCESS_KEY_ID_TEXT: &'static str = "XXXXXXXXXXXXXXXX";
-    const PLACEHOLDER_SECRET_ACCESS_KEY_TEXT: &'static str =
-        "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX";
-    const PLACEHOLDER_SESSION_TOKEN_TEXT: &'static str = "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX";
-    const PLACEHOLDER_REGION: &'static str = "us-east-1";
-
-    fn new(state: Entity<State>, window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let focus_handle = cx.focus_handle();
-
-        cx.observe(&state, |_, _, cx| {
-            cx.notify();
-        })
-        .detach();
-
-        let access_key_id_editor = cx.new(|cx| {
-            InputField::new(window, cx, Self::PLACEHOLDER_ACCESS_KEY_ID_TEXT)
-                .label("Access Key ID")
-                .tab_index(0)
-                .tab_stop(true)
-        });
-
-        let secret_access_key_editor = cx.new(|cx| {
-            InputField::new(window, cx, Self::PLACEHOLDER_SECRET_ACCESS_KEY_TEXT)
-                .label("Secret Access Key")
-                .tab_index(1)
-                .tab_stop(true)
-        });
-
-        let session_token_editor = cx.new(|cx| {
-            InputField::new(window, cx, Self::PLACEHOLDER_SESSION_TOKEN_TEXT)
-                .label("Session Token (Optional)")
-                .tab_index(2)
-                .tab_stop(true)
-        });
-
-        let region_editor = cx.new(|cx| {
-            InputField::new(window, cx, Self::PLACEHOLDER_REGION)
-                .label("Region")
-                .tab_index(3)
-                .tab_stop(true)
-        });
-
-        let load_credentials_task = Some(cx.spawn({
-            let state = state.clone();
-            async move |this, cx| {
-                if let Some(task) = state
-                    .update(cx, |state, cx| state.authenticate(cx))
-                    .log_err()
-                {
-                    // We don't log an error, because "not signed in" is also an error.
-                    let _ = task.await;
-                }
-                this.update(cx, |this, cx| {
-                    this.load_credentials_task = None;
-                    cx.notify();
-                })
-                .log_err();
-            }
-        }));
-
-        Self {
-            access_key_id_editor,
-            secret_access_key_editor,
-            session_token_editor,
-            region_editor,
-            state,
-            load_credentials_task,
-            focus_handle,
-        }
-    }
-
-    fn save_credentials(
-        &mut self,
-        _: &menu::Confirm,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let access_key_id = self
-            .access_key_id_editor
-            .read(cx)
-            .text(cx)
-            .trim()
-            .to_string();
-        let secret_access_key = self
-            .secret_access_key_editor
-            .read(cx)
-            .text(cx)
-            .trim()
-            .to_string();
-        let session_token = self
-            .session_token_editor
-            .read(cx)
-            .text(cx)
-            .trim()
-            .to_string();
-        let session_token = if session_token.is_empty() {
-            None
-        } else {
-            Some(session_token)
-        };
-        let region = self.region_editor.read(cx).text(cx).trim().to_string();
-        let region = if region.is_empty() {
-            "us-east-1".to_string()
-        } else {
-            region
-        };
-
-        let state = self.state.clone();
-        cx.spawn(async move |_, cx| {
-            state
-                .update(cx, |state, cx| {
-                    let credentials: BedrockCredentials = BedrockCredentials {
-                        region: region.clone(),
-                        access_key_id: access_key_id.clone(),
-                        secret_access_key: secret_access_key.clone(),
-                        session_token: session_token.clone(),
-                    };
-
-                    state.set_credentials(credentials, cx)
-                })?
-                .await
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn reset_credentials(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.access_key_id_editor
-            .update(cx, |editor, cx| editor.set_text("", window, cx));
-        self.secret_access_key_editor
-            .update(cx, |editor, cx| editor.set_text("", window, cx));
-        self.session_token_editor
-            .update(cx, |editor, cx| editor.set_text("", window, cx));
-        self.region_editor
-            .update(cx, |editor, cx| editor.set_text("", window, cx));
-
-        let state = self.state.clone();
-        cx.spawn(async move |_, cx| {
-            state
-                .update(cx, |state, cx| state.reset_credentials(cx))?
-                .await
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn should_render_editor(&self, cx: &Context<Self>) -> bool {
-        self.state.read(cx).is_authenticated()
-    }
-
-    fn on_tab(&mut self, _: &menu::SelectNext, window: &mut Window, _: &mut Context<Self>) {
-        window.focus_next();
-    }
-
-    fn on_tab_prev(
-        &mut self,
-        _: &menu::SelectPrevious,
-        window: &mut Window,
-        _: &mut Context<Self>,
-    ) {
-        window.focus_prev();
-    }
-}
-
-impl Render for ConfigurationView {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let env_var_set = self.state.read(cx).credentials_from_env;
-        let bedrock_settings = self.state.read(cx).settings.as_ref();
-        let bedrock_method = bedrock_settings
-            .as_ref()
-            .and_then(|s| s.authentication_method.clone());
-
-        if self.load_credentials_task.is_some() {
-            return div().child(Label::new("Loading credentials...")).into_any();
-        }
-
-        let configured_label = if env_var_set {
-            format!(
-                "Access Key ID is set in {ZED_BEDROCK_ACCESS_KEY_ID_VAR}, Secret Key is set in {ZED_BEDROCK_SECRET_ACCESS_KEY_VAR}, Region is set in {ZED_BEDROCK_REGION_VAR} environment variables."
-            )
-        } else {
-            match bedrock_method {
-                Some(BedrockAuthMethod::Automatic) => "You are using automatic credentials.".into(),
-                Some(BedrockAuthMethod::NamedProfile) => "You are using named profile.".into(),
-                Some(BedrockAuthMethod::SingleSignOn) => {
-                    "You are using a single sign on profile.".into()
-                }
-                None => "You are using static credentials.".into(),
-            }
-        };
-
-        let tooltip_label = if env_var_set {
-            Some(format!(
-                "To reset your credentials, unset the {ZED_BEDROCK_ACCESS_KEY_ID_VAR}, {ZED_BEDROCK_SECRET_ACCESS_KEY_VAR}, and {ZED_BEDROCK_REGION_VAR} environment variables."
-            ))
-        } else if bedrock_method.is_some() {
-            Some("You cannot reset credentials as they're being derived, check Zed settings to understand how.".to_string())
-        } else {
-            None
-        };
-
-        if self.should_render_editor(cx) {
-            return ConfiguredApiCard::new(configured_label)
-                .disabled(env_var_set || bedrock_method.is_some())
-                .on_click(cx.listener(|this, _, window, cx| this.reset_credentials(window, cx)))
-                .when_some(tooltip_label, |this, label| this.tooltip_label(label))
-                .into_any_element();
-        }
-
-        v_flex()
-            .size_full()
-            .track_focus(&self.focus_handle)
-            .on_action(cx.listener(Self::on_tab))
-            .on_action(cx.listener(Self::on_tab_prev))
-            .on_action(cx.listener(ConfigurationView::save_credentials))
-            .child(Label::new("To use Zed's agent with Bedrock, you can set a custom authentication strategy through the settings.json, or use static credentials."))
-            .child(Label::new("But, to access models on AWS, you need to:").mt_1())
-            .child(
-                List::new()
-                    .child(
-                        InstructionListItem::new(
-                            "Grant permissions to the strategy you'll use according to the:",
-                            Some("Prerequisites"),
-                            Some("https://docs.aws.amazon.com/bedrock/latest/userguide/inference-prereq.html"),
-                        )
-                    )
-                    .child(
-                        InstructionListItem::new(
-                            "Select the models you would like access to:",
-                            Some("Bedrock Model Catalog"),
-                            Some("https://us-east-1.console.aws.amazon.com/bedrock/home?region=us-east-1#/modelaccess"),
-                        )
-                    )
-            )
-            .child(self.render_static_credentials_ui())
-            .child(
-                Label::new(
-                    format!("You can also assign the {ZED_BEDROCK_ACCESS_KEY_ID_VAR}, {ZED_BEDROCK_SECRET_ACCESS_KEY_VAR} AND {ZED_BEDROCK_REGION_VAR} environment variables and restart Zed."),
-                )
-                    .size(LabelSize::Small)
-                    .color(Color::Muted)
-                    .my_1(),
-            )
-            .child(
-                Label::new(
-                    format!("Optionally, if your environment uses AWS CLI profiles, you can set {ZED_AWS_PROFILE_VAR}; if it requires a custom endpoint, you can set {ZED_AWS_ENDPOINT_VAR}; and if it requires a Session Token, you can set {ZED_BEDROCK_SESSION_TOKEN_VAR}."),
-                )
-                    .size(LabelSize::Small)
-                    .color(Color::Muted),
-            )
-            .into_any()
-    }
-}
-
-impl ConfigurationView {
-    fn render_static_credentials_ui(&self) -> impl IntoElement {
-        v_flex()
-            .my_2()
-            .tab_group()
-            .gap_1p5()
-            .child(
-                Label::new("Static Keys")
-                    .size(LabelSize::Default)
-                    .weight(FontWeight::BOLD),
-            )
-            .child(
-                Label::new(
-                    "This method uses your AWS access key ID and secret access key directly.",
-                )
-            )
-            .child(
-                List::new()
-                    .child(InstructionListItem::new(
-                        "Create an IAM user in the AWS console with programmatic access",
-                        Some("IAM Console"),
-                        Some("https://us-east-1.console.aws.amazon.com/iam/home?region=us-east-1#/users"),
-                    ))
-                    .child(InstructionListItem::new(
-                        "Attach the necessary Bedrock permissions to this ",
-                        Some("user"),
-                        Some("https://docs.aws.amazon.com/bedrock/latest/userguide/inference-prereq.html"),
-                    ))
-                    .child(InstructionListItem::text_only(
-                        "Copy the access key ID and secret access key when provided",
-                    ))
-                    .child(InstructionListItem::text_only(
-                        "Enter these credentials below",
-                    )),
-            )
-            .child(self.access_key_id_editor.clone())
-            .child(self.secret_access_key_editor.clone())
-            .child(self.session_token_editor.clone())
-            .child(self.region_editor.clone())
-    }
-}
diff --git a/crates/language_models/src/provider/cloud.rs b/crates/language_models/src/provider/cloud.rs
deleted file mode 100644
index a19a427dba..0000000000
--- a/crates/language_models/src/provider/cloud.rs
+++ /dev/null
@@ -1,1396 +0,0 @@
-use ai_onboarding::YoungAccountBanner;
-use anthropic::AnthropicModelMode;
-use anyhow::{Context as _, Result, anyhow};
-use chrono::{DateTime, Utc};
-use client::{Client, ModelRequestUsage, UserStore, zed_urls};
-use cloud_llm_client::{
-    CLIENT_SUPPORTS_STATUS_MESSAGES_HEADER_NAME, CLIENT_SUPPORTS_X_AI_HEADER_NAME,
-    CURRENT_PLAN_HEADER_NAME, CompletionBody, CompletionEvent, CompletionRequestStatus,
-    CountTokensBody, CountTokensResponse, EXPIRED_LLM_TOKEN_HEADER_NAME, ListModelsResponse,
-    MODEL_REQUESTS_RESOURCE_HEADER_VALUE, Plan, PlanV1, PlanV2,
-    SERVER_SUPPORTS_STATUS_MESSAGES_HEADER_NAME, SUBSCRIPTION_LIMIT_RESOURCE_HEADER_NAME,
-    TOOL_USE_LIMIT_REACHED_HEADER_NAME, ZED_VERSION_HEADER_NAME,
-};
-use futures::{
-    AsyncBufReadExt, FutureExt, Stream, StreamExt, future::BoxFuture, stream::BoxStream,
-};
-use google_ai::GoogleModelMode;
-use gpui::{AnyElement, AnyView, App, AsyncApp, Context, Entity, Subscription, Task};
-use http_client::http::{HeaderMap, HeaderValue};
-use http_client::{AsyncBody, HttpClient, HttpRequestExt, Method, Response, StatusCode};
-use language_model::{
-    AuthenticateError, LanguageModel, LanguageModelCacheConfiguration,
-    LanguageModelCompletionError, LanguageModelCompletionEvent, LanguageModelId, LanguageModelName,
-    LanguageModelProvider, LanguageModelProviderId, LanguageModelProviderName,
-    LanguageModelProviderState, LanguageModelRequest, LanguageModelToolChoice,
-    LanguageModelToolSchemaFormat, LlmApiToken, ModelRequestLimitReachedError,
-    PaymentRequiredError, RateLimiter, RefreshLlmTokenListener,
-};
-use release_channel::AppVersion;
-use schemars::JsonSchema;
-use semver::Version;
-use serde::{Deserialize, Serialize, de::DeserializeOwned};
-use settings::SettingsStore;
-pub use settings::ZedDotDevAvailableModel as AvailableModel;
-pub use settings::ZedDotDevAvailableProvider as AvailableProvider;
-use smol::io::{AsyncReadExt, BufReader};
-use std::pin::Pin;
-use std::str::FromStr as _;
-use std::sync::Arc;
-use std::time::Duration;
-use thiserror::Error;
-use ui::{TintColor, prelude::*};
-use util::{ResultExt as _, maybe};
-
-use crate::provider::anthropic::{AnthropicEventMapper, count_anthropic_tokens, into_anthropic};
-use crate::provider::google::{GoogleEventMapper, into_google};
-use crate::provider::open_ai::{OpenAiEventMapper, count_open_ai_tokens, into_open_ai};
-use crate::provider::x_ai::count_xai_tokens;
-
-const PROVIDER_ID: LanguageModelProviderId = language_model::ZED_CLOUD_PROVIDER_ID;
-const PROVIDER_NAME: LanguageModelProviderName = language_model::ZED_CLOUD_PROVIDER_NAME;
-
-#[derive(Default, Clone, Debug, PartialEq)]
-pub struct ZedDotDevSettings {
-    pub available_models: Vec<AvailableModel>,
-}
-#[derive(Default, Clone, Debug, PartialEq, Serialize, Deserialize, JsonSchema)]
-#[serde(tag = "type", rename_all = "lowercase")]
-pub enum ModelMode {
-    #[default]
-    Default,
-    Thinking {
-        /// The maximum number of tokens to use for reasoning. Must be lower than the model's `max_output_tokens`.
-        budget_tokens: Option<u32>,
-    },
-}
-
-impl From<ModelMode> for AnthropicModelMode {
-    fn from(value: ModelMode) -> Self {
-        match value {
-            ModelMode::Default => AnthropicModelMode::Default,
-            ModelMode::Thinking { budget_tokens } => AnthropicModelMode::Thinking { budget_tokens },
-        }
-    }
-}
-
-pub struct CloudLanguageModelProvider {
-    client: Arc<Client>,
-    state: Entity<State>,
-    _maintain_client_status: Task<()>,
-}
-
-pub struct State {
-    client: Arc<Client>,
-    llm_api_token: LlmApiToken,
-    user_store: Entity<UserStore>,
-    status: client::Status,
-    models: Vec<Arc<cloud_llm_client::LanguageModel>>,
-    default_model: Option<Arc<cloud_llm_client::LanguageModel>>,
-    default_fast_model: Option<Arc<cloud_llm_client::LanguageModel>>,
-    recommended_models: Vec<Arc<cloud_llm_client::LanguageModel>>,
-    _fetch_models_task: Task<()>,
-    _settings_subscription: Subscription,
-    _llm_token_subscription: Subscription,
-}
-
-impl State {
-    fn new(
-        client: Arc<Client>,
-        user_store: Entity<UserStore>,
-        status: client::Status,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let refresh_llm_token_listener = RefreshLlmTokenListener::global(cx);
-        let mut current_user = user_store.read(cx).watch_current_user();
-        Self {
-            client: client.clone(),
-            llm_api_token: LlmApiToken::default(),
-            user_store,
-            status,
-            models: Vec::new(),
-            default_model: None,
-            default_fast_model: None,
-            recommended_models: Vec::new(),
-            _fetch_models_task: cx.spawn(async move |this, cx| {
-                maybe!(async move {
-                    let (client, llm_api_token) = this
-                        .read_with(cx, |this, _cx| (client.clone(), this.llm_api_token.clone()))?;
-
-                    while current_user.borrow().is_none() {
-                        current_user.next().await;
-                    }
-
-                    let response =
-                        Self::fetch_models(client.clone(), llm_api_token.clone()).await?;
-                    this.update(cx, |this, cx| this.update_models(response, cx))?;
-                    anyhow::Ok(())
-                })
-                .await
-                .context("failed to fetch Zed models")
-                .log_err();
-            }),
-            _settings_subscription: cx.observe_global::<SettingsStore>(|_, cx| {
-                cx.notify();
-            }),
-            _llm_token_subscription: cx.subscribe(
-                &refresh_llm_token_listener,
-                move |this, _listener, _event, cx| {
-                    let client = this.client.clone();
-                    let llm_api_token = this.llm_api_token.clone();
-                    cx.spawn(async move |this, cx| {
-                        llm_api_token.refresh(&client).await?;
-                        let response = Self::fetch_models(client, llm_api_token).await?;
-                        this.update(cx, |this, cx| {
-                            this.update_models(response, cx);
-                        })
-                    })
-                    .detach_and_log_err(cx);
-                },
-            ),
-        }
-    }
-
-    fn is_signed_out(&self, cx: &App) -> bool {
-        self.user_store.read(cx).current_user().is_none()
-    }
-
-    fn authenticate(&self, cx: &mut Context<Self>) -> Task<Result<()>> {
-        let client = self.client.clone();
-        cx.spawn(async move |state, cx| {
-            client.sign_in_with_optional_connect(true, cx).await?;
-            state.update(cx, |_, cx| cx.notify())
-        })
-    }
-    fn update_models(&mut self, response: ListModelsResponse, cx: &mut Context<Self>) {
-        let mut models = Vec::new();
-
-        for model in response.models {
-            models.push(Arc::new(model.clone()));
-
-            // Right now we represent thinking variants of models as separate models on the client,
-            // so we need to insert variants for any model that supports thinking.
-            if model.supports_thinking {
-                models.push(Arc::new(cloud_llm_client::LanguageModel {
-                    id: cloud_llm_client::LanguageModelId(format!("{}-thinking", model.id).into()),
-                    display_name: format!("{} Thinking", model.display_name),
-                    ..model
-                }));
-            }
-        }
-
-        self.default_model = models
-            .iter()
-            .find(|model| {
-                response
-                    .default_model
-                    .as_ref()
-                    .is_some_and(|default_model_id| &model.id == default_model_id)
-            })
-            .cloned();
-        self.default_fast_model = models
-            .iter()
-            .find(|model| {
-                response
-                    .default_fast_model
-                    .as_ref()
-                    .is_some_and(|default_fast_model_id| &model.id == default_fast_model_id)
-            })
-            .cloned();
-        self.recommended_models = response
-            .recommended_models
-            .iter()
-            .filter_map(|id| models.iter().find(|model| &model.id == id))
-            .cloned()
-            .collect();
-        self.models = models;
-        cx.notify();
-    }
-
-    async fn fetch_models(
-        client: Arc<Client>,
-        llm_api_token: LlmApiToken,
-    ) -> Result<ListModelsResponse> {
-        let http_client = &client.http_client();
-        let token = llm_api_token.acquire(&client).await?;
-
-        let request = http_client::Request::builder()
-            .method(Method::GET)
-            .header(CLIENT_SUPPORTS_X_AI_HEADER_NAME, "true")
-            .uri(http_client.build_zed_llm_url("/models", &[])?.as_ref())
-            .header("Authorization", format!("Bearer {token}"))
-            .body(AsyncBody::empty())?;
-        let mut response = http_client
-            .send(request)
-            .await
-            .context("failed to send list models request")?;
-
-        if response.status().is_success() {
-            let mut body = String::new();
-            response.body_mut().read_to_string(&mut body).await?;
-            Ok(serde_json::from_str(&body)?)
-        } else {
-            let mut body = String::new();
-            response.body_mut().read_to_string(&mut body).await?;
-            anyhow::bail!(
-                "error listing models.\nStatus: {:?}\nBody: {body}",
-                response.status(),
-            );
-        }
-    }
-}
-
-impl CloudLanguageModelProvider {
-    pub fn new(user_store: Entity<UserStore>, client: Arc<Client>, cx: &mut App) -> Self {
-        let mut status_rx = client.status();
-        let status = *status_rx.borrow();
-
-        let state = cx.new(|cx| State::new(client.clone(), user_store.clone(), status, cx));
-
-        let state_ref = state.downgrade();
-        let maintain_client_status = cx.spawn(async move |cx| {
-            while let Some(status) = status_rx.next().await {
-                if let Some(this) = state_ref.upgrade() {
-                    _ = this.update(cx, |this, cx| {
-                        if this.status != status {
-                            this.status = status;
-                            cx.notify();
-                        }
-                    });
-                } else {
-                    break;
-                }
-            }
-        });
-
-        Self {
-            client,
-            state,
-            _maintain_client_status: maintain_client_status,
-        }
-    }
-
-    fn create_language_model(
-        &self,
-        model: Arc<cloud_llm_client::LanguageModel>,
-        llm_api_token: LlmApiToken,
-    ) -> Arc<dyn LanguageModel> {
-        Arc::new(CloudLanguageModel {
-            id: LanguageModelId(SharedString::from(model.id.0.clone())),
-            model,
-            llm_api_token,
-            client: self.client.clone(),
-            request_limiter: RateLimiter::new(4),
-        })
-    }
-}
-
-impl LanguageModelProviderState for CloudLanguageModelProvider {
-    type ObservableEntity = State;
-
-    fn observable_entity(&self) -> Option<Entity<Self::ObservableEntity>> {
-        Some(self.state.clone())
-    }
-}
-
-impl LanguageModelProvider for CloudLanguageModelProvider {
-    fn id(&self) -> LanguageModelProviderId {
-        PROVIDER_ID
-    }
-
-    fn name(&self) -> LanguageModelProviderName {
-        PROVIDER_NAME
-    }
-
-    fn icon(&self) -> IconName {
-        IconName::AiZed
-    }
-
-    fn default_model(&self, cx: &App) -> Option<Arc<dyn LanguageModel>> {
-        let default_model = self.state.read(cx).default_model.clone()?;
-        let llm_api_token = self.state.read(cx).llm_api_token.clone();
-        Some(self.create_language_model(default_model, llm_api_token))
-    }
-
-    fn default_fast_model(&self, cx: &App) -> Option<Arc<dyn LanguageModel>> {
-        let default_fast_model = self.state.read(cx).default_fast_model.clone()?;
-        let llm_api_token = self.state.read(cx).llm_api_token.clone();
-        Some(self.create_language_model(default_fast_model, llm_api_token))
-    }
-
-    fn recommended_models(&self, cx: &App) -> Vec<Arc<dyn LanguageModel>> {
-        let llm_api_token = self.state.read(cx).llm_api_token.clone();
-        self.state
-            .read(cx)
-            .recommended_models
-            .iter()
-            .cloned()
-            .map(|model| self.create_language_model(model, llm_api_token.clone()))
-            .collect()
-    }
-
-    fn provided_models(&self, cx: &App) -> Vec<Arc<dyn LanguageModel>> {
-        let llm_api_token = self.state.read(cx).llm_api_token.clone();
-        self.state
-            .read(cx)
-            .models
-            .iter()
-            .cloned()
-            .map(|model| self.create_language_model(model, llm_api_token.clone()))
-            .collect()
-    }
-
-    fn is_authenticated(&self, cx: &App) -> bool {
-        let state = self.state.read(cx);
-        !state.is_signed_out(cx)
-    }
-
-    fn authenticate(&self, _cx: &mut App) -> Task<Result<(), AuthenticateError>> {
-        Task::ready(Ok(()))
-    }
-
-    fn configuration_view(
-        &self,
-        _target_agent: language_model::ConfigurationViewTargetAgent,
-        _: &mut Window,
-        cx: &mut App,
-    ) -> AnyView {
-        cx.new(|_| ConfigurationView::new(self.state.clone()))
-            .into()
-    }
-
-    fn reset_credentials(&self, _cx: &mut App) -> Task<Result<()>> {
-        Task::ready(Ok(()))
-    }
-}
-
-pub struct CloudLanguageModel {
-    id: LanguageModelId,
-    model: Arc<cloud_llm_client::LanguageModel>,
-    llm_api_token: LlmApiToken,
-    client: Arc<Client>,
-    request_limiter: RateLimiter,
-}
-
-struct PerformLlmCompletionResponse {
-    response: Response<AsyncBody>,
-    usage: Option<ModelRequestUsage>,
-    tool_use_limit_reached: bool,
-    includes_status_messages: bool,
-}
-
-impl CloudLanguageModel {
-    async fn perform_llm_completion(
-        client: Arc<Client>,
-        llm_api_token: LlmApiToken,
-        app_version: Option<Version>,
-        body: CompletionBody,
-    ) -> Result<PerformLlmCompletionResponse> {
-        let http_client = &client.http_client();
-
-        let mut token = llm_api_token.acquire(&client).await?;
-        let mut refreshed_token = false;
-
-        loop {
-            let request = http_client::Request::builder()
-                .method(Method::POST)
-                .uri(http_client.build_zed_llm_url("/completions", &[])?.as_ref())
-                .when_some(app_version.as_ref(), |builder, app_version| {
-                    builder.header(ZED_VERSION_HEADER_NAME, app_version.to_string())
-                })
-                .header("Content-Type", "application/json")
-                .header("Authorization", format!("Bearer {token}"))
-                .header(CLIENT_SUPPORTS_STATUS_MESSAGES_HEADER_NAME, "true")
-                .body(serde_json::to_string(&body)?.into())?;
-
-            let mut response = http_client.send(request).await?;
-            let status = response.status();
-            if status.is_success() {
-                let includes_status_messages = response
-                    .headers()
-                    .get(SERVER_SUPPORTS_STATUS_MESSAGES_HEADER_NAME)
-                    .is_some();
-
-                let tool_use_limit_reached = response
-                    .headers()
-                    .get(TOOL_USE_LIMIT_REACHED_HEADER_NAME)
-                    .is_some();
-
-                let usage = if includes_status_messages {
-                    None
-                } else {
-                    ModelRequestUsage::from_headers(response.headers()).ok()
-                };
-
-                return Ok(PerformLlmCompletionResponse {
-                    response,
-                    usage,
-                    includes_status_messages,
-                    tool_use_limit_reached,
-                });
-            }
-
-            if !refreshed_token
-                && response
-                    .headers()
-                    .get(EXPIRED_LLM_TOKEN_HEADER_NAME)
-                    .is_some()
-            {
-                token = llm_api_token.refresh(&client).await?;
-                refreshed_token = true;
-                continue;
-            }
-
-            if status == StatusCode::FORBIDDEN
-                && response
-                    .headers()
-                    .get(SUBSCRIPTION_LIMIT_RESOURCE_HEADER_NAME)
-                    .is_some()
-            {
-                if let Some(MODEL_REQUESTS_RESOURCE_HEADER_VALUE) = response
-                    .headers()
-                    .get(SUBSCRIPTION_LIMIT_RESOURCE_HEADER_NAME)
-                    .and_then(|resource| resource.to_str().ok())
-                    && let Some(plan) = response
-                        .headers()
-                        .get(CURRENT_PLAN_HEADER_NAME)
-                        .and_then(|plan| plan.to_str().ok())
-                        .and_then(|plan| cloud_llm_client::PlanV1::from_str(plan).ok())
-                        .map(Plan::V1)
-                {
-                    return Err(anyhow!(ModelRequestLimitReachedError { plan }));
-                }
-            } else if status == StatusCode::PAYMENT_REQUIRED {
-                return Err(anyhow!(PaymentRequiredError));
-            }
-
-            let mut body = String::new();
-            let headers = response.headers().clone();
-            response.body_mut().read_to_string(&mut body).await?;
-            return Err(anyhow!(ApiError {
-                status,
-                body,
-                headers
-            }));
-        }
-    }
-}
-
-#[derive(Debug, Error)]
-#[error("cloud language model request failed with status {status}: {body}")]
-struct ApiError {
-    status: StatusCode,
-    body: String,
-    headers: HeaderMap<HeaderValue>,
-}
-
-/// Represents error responses from Zed's cloud API.
-///
-/// Example JSON for an upstream HTTP error:
-/// ```json
-/// {
-///   "code": "upstream_http_error",
-///   "message": "Received an error from the Anthropic API: upstream connect error or disconnect/reset before headers, reset reason: connection timeout",
-///   "upstream_status": 503
-/// }
-/// ```
-#[derive(Debug, serde::Deserialize)]
-struct CloudApiError {
-    code: String,
-    message: String,
-    #[serde(default)]
-    #[serde(deserialize_with = "deserialize_optional_status_code")]
-    upstream_status: Option<StatusCode>,
-    #[serde(default)]
-    retry_after: Option<f64>,
-}
-
-fn deserialize_optional_status_code<'de, D>(deserializer: D) -> Result<Option<StatusCode>, D::Error>
-where
-    D: serde::Deserializer<'de>,
-{
-    let opt: Option<u16> = Option::deserialize(deserializer)?;
-    Ok(opt.and_then(|code| StatusCode::from_u16(code).ok()))
-}
-
-impl From<ApiError> for LanguageModelCompletionError {
-    fn from(error: ApiError) -> Self {
-        if let Ok(cloud_error) = serde_json::from_str::<CloudApiError>(&error.body) {
-            if cloud_error.code.starts_with("upstream_http_") {
-                let status = if let Some(status) = cloud_error.upstream_status {
-                    status
-                } else if cloud_error.code.ends_with("_error") {
-                    error.status
-                } else {
-                    // If there's a status code in the code string (e.g. "upstream_http_429")
-                    // then use that; otherwise, see if the JSON contains a status code.
-                    cloud_error
-                        .code
-                        .strip_prefix("upstream_http_")
-                        .and_then(|code_str| code_str.parse::<u16>().ok())
-                        .and_then(|code| StatusCode::from_u16(code).ok())
-                        .unwrap_or(error.status)
-                };
-
-                return LanguageModelCompletionError::UpstreamProviderError {
-                    message: cloud_error.message,
-                    status,
-                    retry_after: cloud_error.retry_after.map(Duration::from_secs_f64),
-                };
-            }
-
-            return LanguageModelCompletionError::from_http_status(
-                PROVIDER_NAME,
-                error.status,
-                cloud_error.message,
-                None,
-            );
-        }
-
-        let retry_after = None;
-        LanguageModelCompletionError::from_http_status(
-            PROVIDER_NAME,
-            error.status,
-            error.body,
-            retry_after,
-        )
-    }
-}
-
-impl LanguageModel for CloudLanguageModel {
-    fn id(&self) -> LanguageModelId {
-        self.id.clone()
-    }
-
-    fn name(&self) -> LanguageModelName {
-        LanguageModelName::from(self.model.display_name.clone())
-    }
-
-    fn provider_id(&self) -> LanguageModelProviderId {
-        PROVIDER_ID
-    }
-
-    fn provider_name(&self) -> LanguageModelProviderName {
-        PROVIDER_NAME
-    }
-
-    fn upstream_provider_id(&self) -> LanguageModelProviderId {
-        use cloud_llm_client::LanguageModelProvider::*;
-        match self.model.provider {
-            Anthropic => language_model::ANTHROPIC_PROVIDER_ID,
-            OpenAi => language_model::OPEN_AI_PROVIDER_ID,
-            Google => language_model::GOOGLE_PROVIDER_ID,
-            XAi => language_model::X_AI_PROVIDER_ID,
-        }
-    }
-
-    fn upstream_provider_name(&self) -> LanguageModelProviderName {
-        use cloud_llm_client::LanguageModelProvider::*;
-        match self.model.provider {
-            Anthropic => language_model::ANTHROPIC_PROVIDER_NAME,
-            OpenAi => language_model::OPEN_AI_PROVIDER_NAME,
-            Google => language_model::GOOGLE_PROVIDER_NAME,
-            XAi => language_model::X_AI_PROVIDER_NAME,
-        }
-    }
-
-    fn supports_tools(&self) -> bool {
-        self.model.supports_tools
-    }
-
-    fn supports_images(&self) -> bool {
-        self.model.supports_images
-    }
-
-    fn supports_tool_choice(&self, choice: LanguageModelToolChoice) -> bool {
-        match choice {
-            LanguageModelToolChoice::Auto
-            | LanguageModelToolChoice::Any
-            | LanguageModelToolChoice::None => true,
-        }
-    }
-
-    fn supports_burn_mode(&self) -> bool {
-        self.model.supports_max_mode
-    }
-
-    fn telemetry_id(&self) -> String {
-        format!("zed.dev/{}", self.model.id)
-    }
-
-    fn tool_input_format(&self) -> LanguageModelToolSchemaFormat {
-        match self.model.provider {
-            cloud_llm_client::LanguageModelProvider::Anthropic
-            | cloud_llm_client::LanguageModelProvider::OpenAi
-            | cloud_llm_client::LanguageModelProvider::XAi => {
-                LanguageModelToolSchemaFormat::JsonSchema
-            }
-            cloud_llm_client::LanguageModelProvider::Google => {
-                LanguageModelToolSchemaFormat::JsonSchemaSubset
-            }
-        }
-    }
-
-    fn max_token_count(&self) -> u64 {
-        self.model.max_token_count as u64
-    }
-
-    fn max_token_count_in_burn_mode(&self) -> Option<u64> {
-        self.model
-            .max_token_count_in_max_mode
-            .filter(|_| self.model.supports_max_mode)
-            .map(|max_token_count| max_token_count as u64)
-    }
-
-    fn cache_configuration(&self) -> Option<LanguageModelCacheConfiguration> {
-        match &self.model.provider {
-            cloud_llm_client::LanguageModelProvider::Anthropic => {
-                Some(LanguageModelCacheConfiguration {
-                    min_total_token: 2_048,
-                    should_speculate: true,
-                    max_cache_anchors: 4,
-                })
-            }
-            cloud_llm_client::LanguageModelProvider::OpenAi
-            | cloud_llm_client::LanguageModelProvider::XAi
-            | cloud_llm_client::LanguageModelProvider::Google => None,
-        }
-    }
-
-    fn count_tokens(
-        &self,
-        request: LanguageModelRequest,
-        cx: &App,
-    ) -> BoxFuture<'static, Result<u64>> {
-        match self.model.provider {
-            cloud_llm_client::LanguageModelProvider::Anthropic => {
-                count_anthropic_tokens(request, cx)
-            }
-            cloud_llm_client::LanguageModelProvider::OpenAi => {
-                let model = match open_ai::Model::from_id(&self.model.id.0) {
-                    Ok(model) => model,
-                    Err(err) => return async move { Err(anyhow!(err)) }.boxed(),
-                };
-                count_open_ai_tokens(request, model, cx)
-            }
-            cloud_llm_client::LanguageModelProvider::XAi => {
-                let model = match x_ai::Model::from_id(&self.model.id.0) {
-                    Ok(model) => model,
-                    Err(err) => return async move { Err(anyhow!(err)) }.boxed(),
-                };
-                count_xai_tokens(request, model, cx)
-            }
-            cloud_llm_client::LanguageModelProvider::Google => {
-                let client = self.client.clone();
-                let llm_api_token = self.llm_api_token.clone();
-                let model_id = self.model.id.to_string();
-                let generate_content_request =
-                    into_google(request, model_id.clone(), GoogleModelMode::Default);
-                async move {
-                    let http_client = &client.http_client();
-                    let token = llm_api_token.acquire(&client).await?;
-
-                    let request_body = CountTokensBody {
-                        provider: cloud_llm_client::LanguageModelProvider::Google,
-                        model: model_id,
-                        provider_request: serde_json::to_value(&google_ai::CountTokensRequest {
-                            generate_content_request,
-                        })?,
-                    };
-                    let request = http_client::Request::builder()
-                        .method(Method::POST)
-                        .uri(
-                            http_client
-                                .build_zed_llm_url("/count_tokens", &[])?
-                                .as_ref(),
-                        )
-                        .header("Content-Type", "application/json")
-                        .header("Authorization", format!("Bearer {token}"))
-                        .body(serde_json::to_string(&request_body)?.into())?;
-                    let mut response = http_client.send(request).await?;
-                    let status = response.status();
-                    let headers = response.headers().clone();
-                    let mut response_body = String::new();
-                    response
-                        .body_mut()
-                        .read_to_string(&mut response_body)
-                        .await?;
-
-                    if status.is_success() {
-                        let response_body: CountTokensResponse =
-                            serde_json::from_str(&response_body)?;
-
-                        Ok(response_body.tokens as u64)
-                    } else {
-                        Err(anyhow!(ApiError {
-                            status,
-                            body: response_body,
-                            headers
-                        }))
-                    }
-                }
-                .boxed()
-            }
-        }
-    }
-
-    fn stream_completion(
-        &self,
-        request: LanguageModelRequest,
-        cx: &AsyncApp,
-    ) -> BoxFuture<
-        'static,
-        Result<
-            BoxStream<'static, Result<LanguageModelCompletionEvent, LanguageModelCompletionError>>,
-            LanguageModelCompletionError,
-        >,
-    > {
-        let thread_id = request.thread_id.clone();
-        let prompt_id = request.prompt_id.clone();
-        let intent = request.intent;
-        let mode = request.mode;
-        let app_version = cx.update(|cx| AppVersion::global(cx)).ok();
-        let thinking_allowed = request.thinking_allowed;
-        let provider_name = provider_name(&self.model.provider);
-        match self.model.provider {
-            cloud_llm_client::LanguageModelProvider::Anthropic => {
-                let request = into_anthropic(
-                    request,
-                    self.model.id.to_string(),
-                    1.0,
-                    self.model.max_output_tokens as u64,
-                    if thinking_allowed && self.model.id.0.ends_with("-thinking") {
-                        AnthropicModelMode::Thinking {
-                            budget_tokens: Some(4_096),
-                        }
-                    } else {
-                        AnthropicModelMode::Default
-                    },
-                );
-                let client = self.client.clone();
-                let llm_api_token = self.llm_api_token.clone();
-                let future = self.request_limiter.stream(async move {
-                    let PerformLlmCompletionResponse {
-                        response,
-                        usage,
-                        includes_status_messages,
-                        tool_use_limit_reached,
-                    } = Self::perform_llm_completion(
-                        client.clone(),
-                        llm_api_token,
-                        app_version,
-                        CompletionBody {
-                            thread_id,
-                            prompt_id,
-                            intent,
-                            mode,
-                            provider: cloud_llm_client::LanguageModelProvider::Anthropic,
-                            model: request.model.clone(),
-                            provider_request: serde_json::to_value(&request)
-                                .map_err(|e| anyhow!(e))?,
-                        },
-                    )
-                    .await
-                    .map_err(|err| match err.downcast::<ApiError>() {
-                        Ok(api_err) => anyhow!(LanguageModelCompletionError::from(api_err)),
-                        Err(err) => anyhow!(err),
-                    })?;
-
-                    let mut mapper = AnthropicEventMapper::new();
-                    Ok(map_cloud_completion_events(
-                        Box::pin(
-                            response_lines(response, includes_status_messages)
-                                .chain(usage_updated_event(usage))
-                                .chain(tool_use_limit_reached_event(tool_use_limit_reached)), // .map(|_| {}),
-                        ),
-                        &provider_name,
-                        move |event| mapper.map_event(event),
-                    ))
-                });
-                async move { Ok(future.await?.boxed()) }.boxed()
-            }
-            cloud_llm_client::LanguageModelProvider::OpenAi => {
-                let client = self.client.clone();
-                let request = into_open_ai(
-                    request,
-                    &self.model.id.0,
-                    self.model.supports_parallel_tool_calls,
-                    true,
-                    None,
-                    None,
-                );
-                let llm_api_token = self.llm_api_token.clone();
-                let future = self.request_limiter.stream(async move {
-                    let PerformLlmCompletionResponse {
-                        response,
-                        usage,
-                        includes_status_messages,
-                        tool_use_limit_reached,
-                    } = Self::perform_llm_completion(
-                        client.clone(),
-                        llm_api_token,
-                        app_version,
-                        CompletionBody {
-                            thread_id,
-                            prompt_id,
-                            intent,
-                            mode,
-                            provider: cloud_llm_client::LanguageModelProvider::OpenAi,
-                            model: request.model.clone(),
-                            provider_request: serde_json::to_value(&request)
-                                .map_err(|e| anyhow!(e))?,
-                        },
-                    )
-                    .await?;
-
-                    let mut mapper = OpenAiEventMapper::new();
-                    Ok(map_cloud_completion_events(
-                        Box::pin(
-                            response_lines(response, includes_status_messages)
-                                .chain(usage_updated_event(usage))
-                                .chain(tool_use_limit_reached_event(tool_use_limit_reached)),
-                        ),
-                        &provider_name,
-                        move |event| mapper.map_event(event),
-                    ))
-                });
-                async move { Ok(future.await?.boxed()) }.boxed()
-            }
-            cloud_llm_client::LanguageModelProvider::XAi => {
-                let client = self.client.clone();
-                let request = into_open_ai(
-                    request,
-                    &self.model.id.0,
-                    self.model.supports_parallel_tool_calls,
-                    false,
-                    None,
-                    None,
-                );
-                let llm_api_token = self.llm_api_token.clone();
-                let future = self.request_limiter.stream(async move {
-                    let PerformLlmCompletionResponse {
-                        response,
-                        usage,
-                        includes_status_messages,
-                        tool_use_limit_reached,
-                    } = Self::perform_llm_completion(
-                        client.clone(),
-                        llm_api_token,
-                        app_version,
-                        CompletionBody {
-                            thread_id,
-                            prompt_id,
-                            intent,
-                            mode,
-                            provider: cloud_llm_client::LanguageModelProvider::XAi,
-                            model: request.model.clone(),
-                            provider_request: serde_json::to_value(&request)
-                                .map_err(|e| anyhow!(e))?,
-                        },
-                    )
-                    .await?;
-
-                    let mut mapper = OpenAiEventMapper::new();
-                    Ok(map_cloud_completion_events(
-                        Box::pin(
-                            response_lines(response, includes_status_messages)
-                                .chain(usage_updated_event(usage))
-                                .chain(tool_use_limit_reached_event(tool_use_limit_reached)),
-                        ),
-                        &provider_name,
-                        move |event| mapper.map_event(event),
-                    ))
-                });
-                async move { Ok(future.await?.boxed()) }.boxed()
-            }
-            cloud_llm_client::LanguageModelProvider::Google => {
-                let client = self.client.clone();
-                let request =
-                    into_google(request, self.model.id.to_string(), GoogleModelMode::Default);
-                let llm_api_token = self.llm_api_token.clone();
-                let future = self.request_limiter.stream(async move {
-                    let PerformLlmCompletionResponse {
-                        response,
-                        usage,
-                        includes_status_messages,
-                        tool_use_limit_reached,
-                    } = Self::perform_llm_completion(
-                        client.clone(),
-                        llm_api_token,
-                        app_version,
-                        CompletionBody {
-                            thread_id,
-                            prompt_id,
-                            intent,
-                            mode,
-                            provider: cloud_llm_client::LanguageModelProvider::Google,
-                            model: request.model.model_id.clone(),
-                            provider_request: serde_json::to_value(&request)
-                                .map_err(|e| anyhow!(e))?,
-                        },
-                    )
-                    .await?;
-
-                    let mut mapper = GoogleEventMapper::new();
-                    Ok(map_cloud_completion_events(
-                        Box::pin(
-                            response_lines(response, includes_status_messages)
-                                .chain(usage_updated_event(usage))
-                                .chain(tool_use_limit_reached_event(tool_use_limit_reached)),
-                        ),
-                        &provider_name,
-                        move |event| mapper.map_event(event),
-                    ))
-                });
-                async move { Ok(future.await?.boxed()) }.boxed()
-            }
-        }
-    }
-}
-
-fn map_cloud_completion_events<T, F>(
-    stream: Pin<Box<dyn Stream<Item = Result<CompletionEvent<T>>> + Send>>,
-    provider: &LanguageModelProviderName,
-    mut map_callback: F,
-) -> BoxStream<'static, Result<LanguageModelCompletionEvent, LanguageModelCompletionError>>
-where
-    T: DeserializeOwned + 'static,
-    F: FnMut(T) -> Vec<Result<LanguageModelCompletionEvent, LanguageModelCompletionError>>
-        + Send
-        + 'static,
-{
-    let provider = provider.clone();
-    stream
-        .flat_map(move |event| {
-            futures::stream::iter(match event {
-                Err(error) => {
-                    vec![Err(LanguageModelCompletionError::from(error))]
-                }
-                Ok(CompletionEvent::Status(event)) => {
-                    vec![
-                        LanguageModelCompletionEvent::from_completion_request_status(
-                            event,
-                            provider.clone(),
-                        ),
-                    ]
-                }
-                Ok(CompletionEvent::Event(event)) => map_callback(event),
-            })
-        })
-        .boxed()
-}
-
-fn provider_name(provider: &cloud_llm_client::LanguageModelProvider) -> LanguageModelProviderName {
-    match provider {
-        cloud_llm_client::LanguageModelProvider::Anthropic => {
-            language_model::ANTHROPIC_PROVIDER_NAME
-        }
-        cloud_llm_client::LanguageModelProvider::OpenAi => language_model::OPEN_AI_PROVIDER_NAME,
-        cloud_llm_client::LanguageModelProvider::Google => language_model::GOOGLE_PROVIDER_NAME,
-        cloud_llm_client::LanguageModelProvider::XAi => language_model::X_AI_PROVIDER_NAME,
-    }
-}
-
-fn usage_updated_event<T>(
-    usage: Option<ModelRequestUsage>,
-) -> impl Stream<Item = Result<CompletionEvent<T>>> {
-    futures::stream::iter(usage.map(|usage| {
-        Ok(CompletionEvent::Status(
-            CompletionRequestStatus::UsageUpdated {
-                amount: usage.amount as usize,
-                limit: usage.limit,
-            },
-        ))
-    }))
-}
-
-fn tool_use_limit_reached_event<T>(
-    tool_use_limit_reached: bool,
-) -> impl Stream<Item = Result<CompletionEvent<T>>> {
-    futures::stream::iter(tool_use_limit_reached.then(|| {
-        Ok(CompletionEvent::Status(
-            CompletionRequestStatus::ToolUseLimitReached,
-        ))
-    }))
-}
-
-fn response_lines<T: DeserializeOwned>(
-    response: Response<AsyncBody>,
-    includes_status_messages: bool,
-) -> impl Stream<Item = Result<CompletionEvent<T>>> {
-    futures::stream::try_unfold(
-        (String::new(), BufReader::new(response.into_body())),
-        move |(mut line, mut body)| async move {
-            match body.read_line(&mut line).await {
-                Ok(0) => Ok(None),
-                Ok(_) => {
-                    let event = if includes_status_messages {
-                        serde_json::from_str::<CompletionEvent<T>>(&line)?
-                    } else {
-                        CompletionEvent::Event(serde_json::from_str::<T>(&line)?)
-                    };
-
-                    line.clear();
-                    Ok(Some((event, (line, body))))
-                }
-                Err(e) => Err(e.into()),
-            }
-        },
-    )
-}
-
-#[derive(IntoElement, RegisterComponent)]
-struct ZedAiConfiguration {
-    is_connected: bool,
-    plan: Option<Plan>,
-    subscription_period: Option<(DateTime<Utc>, DateTime<Utc>)>,
-    eligible_for_trial: bool,
-    account_too_young: bool,
-    sign_in_callback: Arc<dyn Fn(&mut Window, &mut App) + Send + Sync>,
-}
-
-impl RenderOnce for ZedAiConfiguration {
-    fn render(self, _window: &mut Window, _cx: &mut App) -> impl IntoElement {
-        let is_pro = self.plan.is_some_and(|plan| {
-            matches!(plan, Plan::V1(PlanV1::ZedPro) | Plan::V2(PlanV2::ZedPro))
-        });
-        let subscription_text = match (self.plan, self.subscription_period) {
-            (Some(Plan::V1(PlanV1::ZedPro) | Plan::V2(PlanV2::ZedPro)), Some(_)) => {
-                "You have access to Zed's hosted models through your Pro subscription."
-            }
-            (Some(Plan::V1(PlanV1::ZedProTrial) | Plan::V2(PlanV2::ZedProTrial)), Some(_)) => {
-                "You have access to Zed's hosted models through your Pro trial."
-            }
-            (Some(Plan::V1(PlanV1::ZedFree)), Some(_)) => {
-                "You have basic access to Zed's hosted models through the Free plan."
-            }
-            (Some(Plan::V2(PlanV2::ZedFree)), Some(_)) => {
-                if self.eligible_for_trial {
-                    "Subscribe for access to Zed's hosted models. Start with a 14 day free trial."
-                } else {
-                    "Subscribe for access to Zed's hosted models."
-                }
-            }
-            _ => {
-                if self.eligible_for_trial {
-                    "Subscribe for access to Zed's hosted models. Start with a 14 day free trial."
-                } else {
-                    "Subscribe for access to Zed's hosted models."
-                }
-            }
-        };
-
-        let manage_subscription_buttons = if is_pro {
-            Button::new("manage_settings", "Manage Subscription")
-                .full_width()
-                .style(ButtonStyle::Tinted(TintColor::Accent))
-                .on_click(|_, _, cx| cx.open_url(&zed_urls::account_url(cx)))
-                .into_any_element()
-        } else if self.plan.is_none() || self.eligible_for_trial {
-            Button::new("start_trial", "Start 14-day Free Pro Trial")
-                .full_width()
-                .style(ui::ButtonStyle::Tinted(ui::TintColor::Accent))
-                .on_click(|_, _, cx| cx.open_url(&zed_urls::start_trial_url(cx)))
-                .into_any_element()
-        } else {
-            Button::new("upgrade", "Upgrade to Pro")
-                .full_width()
-                .style(ui::ButtonStyle::Tinted(ui::TintColor::Accent))
-                .on_click(|_, _, cx| cx.open_url(&zed_urls::upgrade_to_zed_pro_url(cx)))
-                .into_any_element()
-        };
-
-        if !self.is_connected {
-            return v_flex()
-                .gap_2()
-                .child(Label::new("Sign in to have access to Zed's complete agentic experience with hosted models."))
-                .child(
-                    Button::new("sign_in", "Sign In to use Zed AI")
-                        .icon_color(Color::Muted)
-                        .icon(IconName::Github)
-                        .icon_size(IconSize::Small)
-                        .icon_position(IconPosition::Start)
-                        .full_width()
-                        .on_click({
-                            let callback = self.sign_in_callback.clone();
-                            move |_, window, cx| (callback)(window, cx)
-                        }),
-                );
-        }
-
-        v_flex().gap_2().w_full().map(|this| {
-            if self.account_too_young {
-                this.child(YoungAccountBanner).child(
-                    Button::new("upgrade", "Upgrade to Pro")
-                        .style(ui::ButtonStyle::Tinted(ui::TintColor::Accent))
-                        .full_width()
-                        .on_click(|_, _, cx| cx.open_url(&zed_urls::upgrade_to_zed_pro_url(cx))),
-                )
-            } else {
-                this.text_sm()
-                    .child(subscription_text)
-                    .child(manage_subscription_buttons)
-            }
-        })
-    }
-}
-
-struct ConfigurationView {
-    state: Entity<State>,
-    sign_in_callback: Arc<dyn Fn(&mut Window, &mut App) + Send + Sync>,
-}
-
-impl ConfigurationView {
-    fn new(state: Entity<State>) -> Self {
-        let sign_in_callback = Arc::new({
-            let state = state.clone();
-            move |_window: &mut Window, cx: &mut App| {
-                state.update(cx, |state, cx| {
-                    state.authenticate(cx).detach_and_log_err(cx);
-                });
-            }
-        });
-
-        Self {
-            state,
-            sign_in_callback,
-        }
-    }
-}
-
-impl Render for ConfigurationView {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let state = self.state.read(cx);
-        let user_store = state.user_store.read(cx);
-
-        ZedAiConfiguration {
-            is_connected: !state.is_signed_out(cx),
-            plan: user_store.plan(),
-            subscription_period: user_store.subscription_period(),
-            eligible_for_trial: user_store.trial_started_at().is_none(),
-            account_too_young: user_store.account_too_young(),
-            sign_in_callback: self.sign_in_callback.clone(),
-        }
-    }
-}
-
-impl Component for ZedAiConfiguration {
-    fn name() -> &'static str {
-        "AI Configuration Content"
-    }
-
-    fn sort_name() -> &'static str {
-        "AI Configuration Content"
-    }
-
-    fn scope() -> ComponentScope {
-        ComponentScope::Onboarding
-    }
-
-    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
-        fn configuration(
-            is_connected: bool,
-            plan: Option<Plan>,
-            eligible_for_trial: bool,
-            account_too_young: bool,
-        ) -> AnyElement {
-            ZedAiConfiguration {
-                is_connected,
-                plan,
-                subscription_period: plan
-                    .is_some()
-                    .then(|| (Utc::now(), Utc::now() + chrono::Duration::days(7))),
-                eligible_for_trial,
-                account_too_young,
-                sign_in_callback: Arc::new(|_, _| {}),
-            }
-            .into_any_element()
-        }
-
-        Some(
-            v_flex()
-                .p_4()
-                .gap_4()
-                .children(vec![
-                    single_example("Not connected", configuration(false, None, false, false)),
-                    single_example(
-                        "Accept Terms of Service",
-                        configuration(true, None, true, false),
-                    ),
-                    single_example(
-                        "No Plan - Not eligible for trial",
-                        configuration(true, None, false, false),
-                    ),
-                    single_example(
-                        "No Plan - Eligible for trial",
-                        configuration(true, None, true, false),
-                    ),
-                    single_example(
-                        "Free Plan",
-                        configuration(true, Some(Plan::V1(PlanV1::ZedFree)), true, false),
-                    ),
-                    single_example(
-                        "Zed Pro Trial Plan",
-                        configuration(true, Some(Plan::V1(PlanV1::ZedProTrial)), true, false),
-                    ),
-                    single_example(
-                        "Zed Pro Plan",
-                        configuration(true, Some(Plan::V1(PlanV1::ZedPro)), true, false),
-                    ),
-                ])
-                .into_any_element(),
-        )
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use http_client::http::{HeaderMap, StatusCode};
-    use language_model::LanguageModelCompletionError;
-
-    #[test]
-    fn test_api_error_conversion_with_upstream_http_error() {
-        // upstream_http_error with 503 status should become ServerOverloaded
-        let error_body = r#"{"code":"upstream_http_error","message":"Received an error from the Anthropic API: upstream connect error or disconnect/reset before headers, reset reason: connection timeout","upstream_status":503}"#;
-
-        let api_error = ApiError {
-            status: StatusCode::INTERNAL_SERVER_ERROR,
-            body: error_body.to_string(),
-            headers: HeaderMap::new(),
-        };
-
-        let completion_error: LanguageModelCompletionError = api_error.into();
-
-        match completion_error {
-            LanguageModelCompletionError::UpstreamProviderError { message, .. } => {
-                assert_eq!(
-                    message,
-                    "Received an error from the Anthropic API: upstream connect error or disconnect/reset before headers, reset reason: connection timeout"
-                );
-            }
-            _ => panic!(
-                "Expected UpstreamProviderError for upstream 503, got: {:?}",
-                completion_error
-            ),
-        }
-
-        // upstream_http_error with 500 status should become ApiInternalServerError
-        let error_body = r#"{"code":"upstream_http_error","message":"Received an error from the OpenAI API: internal server error","upstream_status":500}"#;
-
-        let api_error = ApiError {
-            status: StatusCode::INTERNAL_SERVER_ERROR,
-            body: error_body.to_string(),
-            headers: HeaderMap::new(),
-        };
-
-        let completion_error: LanguageModelCompletionError = api_error.into();
-
-        match completion_error {
-            LanguageModelCompletionError::UpstreamProviderError { message, .. } => {
-                assert_eq!(
-                    message,
-                    "Received an error from the OpenAI API: internal server error"
-                );
-            }
-            _ => panic!(
-                "Expected UpstreamProviderError for upstream 500, got: {:?}",
-                completion_error
-            ),
-        }
-
-        // upstream_http_error with 429 status should become RateLimitExceeded
-        let error_body = r#"{"code":"upstream_http_error","message":"Received an error from the Google API: rate limit exceeded","upstream_status":429}"#;
-
-        let api_error = ApiError {
-            status: StatusCode::INTERNAL_SERVER_ERROR,
-            body: error_body.to_string(),
-            headers: HeaderMap::new(),
-        };
-
-        let completion_error: LanguageModelCompletionError = api_error.into();
-
-        match completion_error {
-            LanguageModelCompletionError::UpstreamProviderError { message, .. } => {
-                assert_eq!(
-                    message,
-                    "Received an error from the Google API: rate limit exceeded"
-                );
-            }
-            _ => panic!(
-                "Expected UpstreamProviderError for upstream 429, got: {:?}",
-                completion_error
-            ),
-        }
-
-        // Regular 500 error without upstream_http_error should remain ApiInternalServerError for Zed
-        let error_body = "Regular internal server error";
-
-        let api_error = ApiError {
-            status: StatusCode::INTERNAL_SERVER_ERROR,
-            body: error_body.to_string(),
-            headers: HeaderMap::new(),
-        };
-
-        let completion_error: LanguageModelCompletionError = api_error.into();
-
-        match completion_error {
-            LanguageModelCompletionError::ApiInternalServerError { provider, message } => {
-                assert_eq!(provider, PROVIDER_NAME);
-                assert_eq!(message, "Regular internal server error");
-            }
-            _ => panic!(
-                "Expected ApiInternalServerError for regular 500, got: {:?}",
-                completion_error
-            ),
-        }
-
-        // upstream_http_429 format should be converted to UpstreamProviderError
-        let error_body = r#"{"code":"upstream_http_429","message":"Upstream Anthropic rate limit exceeded.","retry_after":30.5}"#;
-
-        let api_error = ApiError {
-            status: StatusCode::INTERNAL_SERVER_ERROR,
-            body: error_body.to_string(),
-            headers: HeaderMap::new(),
-        };
-
-        let completion_error: LanguageModelCompletionError = api_error.into();
-
-        match completion_error {
-            LanguageModelCompletionError::UpstreamProviderError {
-                message,
-                status,
-                retry_after,
-            } => {
-                assert_eq!(message, "Upstream Anthropic rate limit exceeded.");
-                assert_eq!(status, StatusCode::TOO_MANY_REQUESTS);
-                assert_eq!(retry_after, Some(Duration::from_secs_f64(30.5)));
-            }
-            _ => panic!(
-                "Expected UpstreamProviderError for upstream_http_429, got: {:?}",
-                completion_error
-            ),
-        }
-
-        // Invalid JSON in error body should fall back to regular error handling
-        let error_body = "Not JSON at all";
-
-        let api_error = ApiError {
-            status: StatusCode::INTERNAL_SERVER_ERROR,
-            body: error_body.to_string(),
-            headers: HeaderMap::new(),
-        };
-
-        let completion_error: LanguageModelCompletionError = api_error.into();
-
-        match completion_error {
-            LanguageModelCompletionError::ApiInternalServerError { provider, .. } => {
-                assert_eq!(provider, PROVIDER_NAME);
-            }
-            _ => panic!(
-                "Expected ApiInternalServerError for invalid JSON, got: {:?}",
-                completion_error
-            ),
-        }
-    }
-}
diff --git a/crates/language_models/src/provider/copilot_chat.rs b/crates/language_models/src/provider/copilot_chat.rs
deleted file mode 100644
index 92ac342a39..0000000000
--- a/crates/language_models/src/provider/copilot_chat.rs
+++ /dev/null
@@ -1,1565 +0,0 @@
-use std::pin::Pin;
-use std::str::FromStr as _;
-use std::sync::Arc;
-
-use anyhow::{Result, anyhow};
-use cloud_llm_client::CompletionIntent;
-use collections::HashMap;
-use copilot::copilot_chat::{
-    ChatMessage, ChatMessageContent, ChatMessagePart, CopilotChat, ImageUrl,
-    Model as CopilotChatModel, ModelVendor, Request as CopilotChatRequest, ResponseEvent, Tool,
-    ToolCall,
-};
-use copilot::{Copilot, Status};
-use futures::future::BoxFuture;
-use futures::stream::BoxStream;
-use futures::{FutureExt, Stream, StreamExt};
-use gpui::{Action, AnyView, App, AsyncApp, Entity, Render, Subscription, Task, svg};
-use http_client::StatusCode;
-use language::language_settings::all_language_settings;
-use language_model::{
-    AuthenticateError, LanguageModel, LanguageModelCompletionError, LanguageModelCompletionEvent,
-    LanguageModelId, LanguageModelName, LanguageModelProvider, LanguageModelProviderId,
-    LanguageModelProviderName, LanguageModelProviderState, LanguageModelRequest,
-    LanguageModelRequestMessage, LanguageModelToolChoice, LanguageModelToolResultContent,
-    LanguageModelToolSchemaFormat, LanguageModelToolUse, MessageContent, RateLimiter, Role,
-    StopReason, TokenUsage,
-};
-use settings::SettingsStore;
-use ui::{CommonAnimationExt, prelude::*};
-use util::debug_panic;
-
-use crate::ui::ConfiguredApiCard;
-
-const PROVIDER_ID: LanguageModelProviderId = LanguageModelProviderId::new("copilot_chat");
-const PROVIDER_NAME: LanguageModelProviderName =
-    LanguageModelProviderName::new("GitHub Copilot Chat");
-
-pub struct CopilotChatLanguageModelProvider {
-    state: Entity<State>,
-}
-
-pub struct State {
-    _copilot_chat_subscription: Option<Subscription>,
-    _settings_subscription: Subscription,
-}
-
-impl State {
-    fn is_authenticated(&self, cx: &App) -> bool {
-        CopilotChat::global(cx)
-            .map(|m| m.read(cx).is_authenticated())
-            .unwrap_or(false)
-    }
-}
-
-impl CopilotChatLanguageModelProvider {
-    pub fn new(cx: &mut App) -> Self {
-        let state = cx.new(|cx| {
-            let copilot_chat_subscription = CopilotChat::global(cx)
-                .map(|copilot_chat| cx.observe(&copilot_chat, |_, _, cx| cx.notify()));
-            State {
-                _copilot_chat_subscription: copilot_chat_subscription,
-                _settings_subscription: cx.observe_global::<SettingsStore>(|_, cx| {
-                    if let Some(copilot_chat) = CopilotChat::global(cx) {
-                        let language_settings = all_language_settings(None, cx);
-                        let configuration = copilot::copilot_chat::CopilotChatConfiguration {
-                            enterprise_uri: language_settings
-                                .edit_predictions
-                                .copilot
-                                .enterprise_uri
-                                .clone(),
-                        };
-                        copilot_chat.update(cx, |chat, cx| {
-                            chat.set_configuration(configuration, cx);
-                        });
-                    }
-                    cx.notify();
-                }),
-            }
-        });
-
-        Self { state }
-    }
-
-    fn create_language_model(&self, model: CopilotChatModel) -> Arc<dyn LanguageModel> {
-        Arc::new(CopilotChatLanguageModel {
-            model,
-            request_limiter: RateLimiter::new(4),
-        })
-    }
-}
-
-impl LanguageModelProviderState for CopilotChatLanguageModelProvider {
-    type ObservableEntity = State;
-
-    fn observable_entity(&self) -> Option<Entity<Self::ObservableEntity>> {
-        Some(self.state.clone())
-    }
-}
-
-impl LanguageModelProvider for CopilotChatLanguageModelProvider {
-    fn id(&self) -> LanguageModelProviderId {
-        PROVIDER_ID
-    }
-
-    fn name(&self) -> LanguageModelProviderName {
-        PROVIDER_NAME
-    }
-
-    fn icon(&self) -> IconName {
-        IconName::Copilot
-    }
-
-    fn default_model(&self, cx: &App) -> Option<Arc<dyn LanguageModel>> {
-        let models = CopilotChat::global(cx).and_then(|m| m.read(cx).models())?;
-        models
-            .first()
-            .map(|model| self.create_language_model(model.clone()))
-    }
-
-    fn default_fast_model(&self, cx: &App) -> Option<Arc<dyn LanguageModel>> {
-        // The default model should be Copilot Chat's 'base model', which is likely a relatively fast
-        // model (e.g. 4o) and a sensible choice when considering premium requests
-        self.default_model(cx)
-    }
-
-    fn provided_models(&self, cx: &App) -> Vec<Arc<dyn LanguageModel>> {
-        let Some(models) = CopilotChat::global(cx).and_then(|m| m.read(cx).models()) else {
-            return Vec::new();
-        };
-        models
-            .iter()
-            .map(|model| self.create_language_model(model.clone()))
-            .collect()
-    }
-
-    fn is_authenticated(&self, cx: &App) -> bool {
-        self.state.read(cx).is_authenticated(cx)
-    }
-
-    fn authenticate(&self, cx: &mut App) -> Task<Result<(), AuthenticateError>> {
-        if self.is_authenticated(cx) {
-            return Task::ready(Ok(()));
-        };
-
-        let Some(copilot) = Copilot::global(cx) else {
-            return Task::ready(Err(anyhow!(concat!(
-                "Copilot must be enabled for Copilot Chat to work. ",
-                "Please enable Copilot and try again."
-            ))
-            .into()));
-        };
-
-        let err = match copilot.read(cx).status() {
-            Status::Authorized => return Task::ready(Ok(())),
-            Status::Disabled => anyhow!(
-                "Copilot must be enabled for Copilot Chat to work. Please enable Copilot and try again."
-            ),
-            Status::Error(err) => anyhow!(format!(
-                "Received the following error while signing into Copilot: {err}"
-            )),
-            Status::Starting { task: _ } => anyhow!(
-                "Copilot is still starting, please wait for Copilot to start then try again"
-            ),
-            Status::Unauthorized => anyhow!(
-                "Unable to authorize with Copilot. Please make sure that you have an active Copilot and Copilot Chat subscription."
-            ),
-            Status::SignedOut { .. } => {
-                anyhow!("You have signed out of Copilot. Please sign in to Copilot and try again.")
-            }
-            Status::SigningIn { prompt: _ } => anyhow!("Still signing into Copilot..."),
-        };
-
-        Task::ready(Err(err.into()))
-    }
-
-    fn configuration_view(
-        &self,
-        _target_agent: language_model::ConfigurationViewTargetAgent,
-        _: &mut Window,
-        cx: &mut App,
-    ) -> AnyView {
-        let state = self.state.clone();
-        cx.new(|cx| ConfigurationView::new(state, cx)).into()
-    }
-
-    fn reset_credentials(&self, _cx: &mut App) -> Task<Result<()>> {
-        Task::ready(Err(anyhow!(
-            "Signing out of GitHub Copilot Chat is currently not supported."
-        )))
-    }
-}
-
-fn collect_tiktoken_messages(
-    request: LanguageModelRequest,
-) -> Vec<tiktoken_rs::ChatCompletionRequestMessage> {
-    request
-        .messages
-        .into_iter()
-        .map(|message| tiktoken_rs::ChatCompletionRequestMessage {
-            role: match message.role {
-                Role::User => "user".into(),
-                Role::Assistant => "assistant".into(),
-                Role::System => "system".into(),
-            },
-            content: Some(message.string_contents()),
-            name: None,
-            function_call: None,
-        })
-        .collect::<Vec<_>>()
-}
-
-pub struct CopilotChatLanguageModel {
-    model: CopilotChatModel,
-    request_limiter: RateLimiter,
-}
-
-impl LanguageModel for CopilotChatLanguageModel {
-    fn id(&self) -> LanguageModelId {
-        LanguageModelId::from(self.model.id().to_string())
-    }
-
-    fn name(&self) -> LanguageModelName {
-        LanguageModelName::from(self.model.display_name().to_string())
-    }
-
-    fn provider_id(&self) -> LanguageModelProviderId {
-        PROVIDER_ID
-    }
-
-    fn provider_name(&self) -> LanguageModelProviderName {
-        PROVIDER_NAME
-    }
-
-    fn supports_tools(&self) -> bool {
-        self.model.supports_tools()
-    }
-
-    fn supports_images(&self) -> bool {
-        self.model.supports_vision()
-    }
-
-    fn tool_input_format(&self) -> LanguageModelToolSchemaFormat {
-        match self.model.vendor() {
-            ModelVendor::OpenAI | ModelVendor::Anthropic => {
-                LanguageModelToolSchemaFormat::JsonSchema
-            }
-            ModelVendor::Google | ModelVendor::XAI | ModelVendor::Unknown => {
-                LanguageModelToolSchemaFormat::JsonSchemaSubset
-            }
-        }
-    }
-
-    fn supports_tool_choice(&self, choice: LanguageModelToolChoice) -> bool {
-        match choice {
-            LanguageModelToolChoice::Auto
-            | LanguageModelToolChoice::Any
-            | LanguageModelToolChoice::None => self.supports_tools(),
-        }
-    }
-
-    fn telemetry_id(&self) -> String {
-        format!("copilot_chat/{}", self.model.id())
-    }
-
-    fn max_token_count(&self) -> u64 {
-        self.model.max_token_count()
-    }
-
-    fn count_tokens(
-        &self,
-        request: LanguageModelRequest,
-        cx: &App,
-    ) -> BoxFuture<'static, Result<u64>> {
-        let model = self.model.clone();
-        cx.background_spawn(async move {
-            let messages = collect_tiktoken_messages(request);
-            // Copilot uses OpenAI tiktoken tokenizer for all it's model irrespective of the underlying provider(vendor).
-            let tokenizer_model = match model.tokenizer() {
-                Some("o200k_base") => "gpt-4o",
-                Some("cl100k_base") => "gpt-4",
-                _ => "gpt-4o",
-            };
-
-            tiktoken_rs::num_tokens_from_messages(tokenizer_model, &messages)
-                .map(|tokens| tokens as u64)
-        })
-        .boxed()
-    }
-
-    fn stream_completion(
-        &self,
-        request: LanguageModelRequest,
-        cx: &AsyncApp,
-    ) -> BoxFuture<
-        'static,
-        Result<
-            BoxStream<'static, Result<LanguageModelCompletionEvent, LanguageModelCompletionError>>,
-            LanguageModelCompletionError,
-        >,
-    > {
-        let is_user_initiated = request.intent.is_none_or(|intent| match intent {
-            CompletionIntent::UserPrompt
-            | CompletionIntent::ThreadContextSummarization
-            | CompletionIntent::InlineAssist
-            | CompletionIntent::TerminalInlineAssist
-            | CompletionIntent::GenerateGitCommitMessage => true,
-
-            CompletionIntent::ToolResults
-            | CompletionIntent::ThreadSummarization
-            | CompletionIntent::CreateFile
-            | CompletionIntent::EditFile => false,
-        });
-
-        if self.model.supports_response() {
-            let responses_request = into_copilot_responses(&self.model, request);
-            let request_limiter = self.request_limiter.clone();
-            let future = cx.spawn(async move |cx| {
-                let request =
-                    CopilotChat::stream_response(responses_request, is_user_initiated, cx.clone());
-                request_limiter
-                    .stream(async move {
-                        let stream = request.await?;
-                        let mapper = CopilotResponsesEventMapper::new();
-                        Ok(mapper.map_stream(stream).boxed())
-                    })
-                    .await
-            });
-            return async move { Ok(future.await?.boxed()) }.boxed();
-        }
-
-        let copilot_request = match into_copilot_chat(&self.model, request) {
-            Ok(request) => request,
-            Err(err) => return futures::future::ready(Err(err.into())).boxed(),
-        };
-        let is_streaming = copilot_request.stream;
-
-        let request_limiter = self.request_limiter.clone();
-        let future = cx.spawn(async move |cx| {
-            let request =
-                CopilotChat::stream_completion(copilot_request, is_user_initiated, cx.clone());
-            request_limiter
-                .stream(async move {
-                    let response = request.await?;
-                    Ok(map_to_language_model_completion_events(
-                        response,
-                        is_streaming,
-                    ))
-                })
-                .await
-        });
-        async move { Ok(future.await?.boxed()) }.boxed()
-    }
-}
-
-pub fn map_to_language_model_completion_events(
-    events: Pin<Box<dyn Send + Stream<Item = Result<ResponseEvent>>>>,
-    is_streaming: bool,
-) -> impl Stream<Item = Result<LanguageModelCompletionEvent, LanguageModelCompletionError>> {
-    #[derive(Default)]
-    struct RawToolCall {
-        id: String,
-        name: String,
-        arguments: String,
-        thought_signature: Option<String>,
-    }
-
-    struct State {
-        events: Pin<Box<dyn Send + Stream<Item = Result<ResponseEvent>>>>,
-        tool_calls_by_index: HashMap<usize, RawToolCall>,
-        reasoning_opaque: Option<String>,
-        reasoning_text: Option<String>,
-    }
-
-    futures::stream::unfold(
-        State {
-            events,
-            tool_calls_by_index: HashMap::default(),
-            reasoning_opaque: None,
-            reasoning_text: None,
-        },
-        move |mut state| async move {
-            if let Some(event) = state.events.next().await {
-                match event {
-                    Ok(event) => {
-                        let Some(choice) = event.choices.first() else {
-                            return Some((
-                                vec![Err(anyhow!("Response contained no choices").into())],
-                                state,
-                            ));
-                        };
-
-                        let delta = if is_streaming {
-                            choice.delta.as_ref()
-                        } else {
-                            choice.message.as_ref()
-                        };
-
-                        let Some(delta) = delta else {
-                            return Some((
-                                vec![Err(anyhow!("Response contained no delta").into())],
-                                state,
-                            ));
-                        };
-
-                        let mut events = Vec::new();
-                        if let Some(content) = delta.content.clone() {
-                            events.push(Ok(LanguageModelCompletionEvent::Text(content)));
-                        }
-
-                        // Capture reasoning data from the delta (e.g. for Gemini 3)
-                        if let Some(opaque) = delta.reasoning_opaque.clone() {
-                            state.reasoning_opaque = Some(opaque);
-                        }
-                        if let Some(text) = delta.reasoning_text.clone() {
-                            state.reasoning_text = Some(text);
-                        }
-
-                        for (index, tool_call) in delta.tool_calls.iter().enumerate() {
-                            let tool_index = tool_call.index.unwrap_or(index);
-                            let entry = state.tool_calls_by_index.entry(tool_index).or_default();
-
-                            if let Some(tool_id) = tool_call.id.clone() {
-                                entry.id = tool_id;
-                            }
-
-                            if let Some(function) = tool_call.function.as_ref() {
-                                if let Some(name) = function.name.clone() {
-                                    entry.name = name;
-                                }
-
-                                if let Some(arguments) = function.arguments.clone() {
-                                    entry.arguments.push_str(&arguments);
-                                }
-
-                                if let Some(thought_signature) = function.thought_signature.clone()
-                                {
-                                    entry.thought_signature = Some(thought_signature);
-                                }
-                            }
-                        }
-
-                        if let Some(usage) = event.usage {
-                            events.push(Ok(LanguageModelCompletionEvent::UsageUpdate(
-                                TokenUsage {
-                                    input_tokens: usage.prompt_tokens,
-                                    output_tokens: usage.completion_tokens,
-                                    cache_creation_input_tokens: 0,
-                                    cache_read_input_tokens: 0,
-                                },
-                            )));
-                        }
-
-                        match choice.finish_reason.as_deref() {
-                            Some("stop") => {
-                                events.push(Ok(LanguageModelCompletionEvent::Stop(
-                                    StopReason::EndTurn,
-                                )));
-                            }
-                            Some("tool_calls") => {
-                                // Gemini 3 models send reasoning_opaque/reasoning_text that must
-                                // be preserved and sent back in subsequent requests. Emit as
-                                // ReasoningDetails so the agent stores it in the message.
-                                if state.reasoning_opaque.is_some()
-                                    || state.reasoning_text.is_some()
-                                {
-                                    let mut details = serde_json::Map::new();
-                                    if let Some(opaque) = state.reasoning_opaque.take() {
-                                        details.insert(
-                                            "reasoning_opaque".to_string(),
-                                            serde_json::Value::String(opaque),
-                                        );
-                                    }
-                                    if let Some(text) = state.reasoning_text.take() {
-                                        details.insert(
-                                            "reasoning_text".to_string(),
-                                            serde_json::Value::String(text),
-                                        );
-                                    }
-                                    events.push(Ok(
-                                        LanguageModelCompletionEvent::ReasoningDetails(
-                                            serde_json::Value::Object(details),
-                                        ),
-                                    ));
-                                }
-
-                                events.extend(state.tool_calls_by_index.drain().map(
-                                    |(_, tool_call)| {
-                                        // The model can output an empty string
-                                        // to indicate the absence of arguments.
-                                        // When that happens, create an empty
-                                        // object instead.
-                                        let arguments = if tool_call.arguments.is_empty() {
-                                            Ok(serde_json::Value::Object(Default::default()))
-                                        } else {
-                                            serde_json::Value::from_str(&tool_call.arguments)
-                                        };
-                                        match arguments {
-                                        Ok(input) => Ok(LanguageModelCompletionEvent::ToolUse(
-                                            LanguageModelToolUse {
-                                                id: tool_call.id.into(),
-                                                name: tool_call.name.as_str().into(),
-                                                is_input_complete: true,
-                                                input,
-                                                raw_input: tool_call.arguments,
-                                                thought_signature: tool_call.thought_signature,
-                                            },
-                                        )),
-                                        Err(error) => Ok(
-                                            LanguageModelCompletionEvent::ToolUseJsonParseError {
-                                                id: tool_call.id.into(),
-                                                tool_name: tool_call.name.as_str().into(),
-                                                raw_input: tool_call.arguments.into(),
-                                                json_parse_error: error.to_string(),
-                                            },
-                                        ),
-                                    }
-                                    },
-                                ));
-
-                                events.push(Ok(LanguageModelCompletionEvent::Stop(
-                                    StopReason::ToolUse,
-                                )));
-                            }
-                            Some(stop_reason) => {
-                                log::error!("Unexpected Copilot Chat stop_reason: {stop_reason:?}");
-                                events.push(Ok(LanguageModelCompletionEvent::Stop(
-                                    StopReason::EndTurn,
-                                )));
-                            }
-                            None => {}
-                        }
-
-                        return Some((events, state));
-                    }
-                    Err(err) => return Some((vec![Err(anyhow!(err).into())], state)),
-                }
-            }
-
-            None
-        },
-    )
-    .flat_map(futures::stream::iter)
-}
-
-pub struct CopilotResponsesEventMapper {
-    pending_stop_reason: Option<StopReason>,
-}
-
-impl CopilotResponsesEventMapper {
-    pub fn new() -> Self {
-        Self {
-            pending_stop_reason: None,
-        }
-    }
-
-    pub fn map_stream(
-        mut self,
-        events: Pin<Box<dyn Send + Stream<Item = Result<copilot::copilot_responses::StreamEvent>>>>,
-    ) -> impl Stream<Item = Result<LanguageModelCompletionEvent, LanguageModelCompletionError>>
-    {
-        events.flat_map(move |event| {
-            futures::stream::iter(match event {
-                Ok(event) => self.map_event(event),
-                Err(error) => vec![Err(LanguageModelCompletionError::from(anyhow!(error)))],
-            })
-        })
-    }
-
-    fn map_event(
-        &mut self,
-        event: copilot::copilot_responses::StreamEvent,
-    ) -> Vec<Result<LanguageModelCompletionEvent, LanguageModelCompletionError>> {
-        match event {
-            copilot::copilot_responses::StreamEvent::OutputItemAdded { item, .. } => match item {
-                copilot::copilot_responses::ResponseOutputItem::Message { id, .. } => {
-                    vec![Ok(LanguageModelCompletionEvent::StartMessage {
-                        message_id: id,
-                    })]
-                }
-                _ => Vec::new(),
-            },
-
-            copilot::copilot_responses::StreamEvent::OutputTextDelta { delta, .. } => {
-                if delta.is_empty() {
-                    Vec::new()
-                } else {
-                    vec![Ok(LanguageModelCompletionEvent::Text(delta))]
-                }
-            }
-
-            copilot::copilot_responses::StreamEvent::OutputItemDone { item, .. } => match item {
-                copilot::copilot_responses::ResponseOutputItem::Message { .. } => Vec::new(),
-                copilot::copilot_responses::ResponseOutputItem::FunctionCall {
-                    call_id,
-                    name,
-                    arguments,
-                    thought_signature,
-                    ..
-                } => {
-                    let mut events = Vec::new();
-                    match serde_json::from_str::<serde_json::Value>(&arguments) {
-                        Ok(input) => events.push(Ok(LanguageModelCompletionEvent::ToolUse(
-                            LanguageModelToolUse {
-                                id: call_id.into(),
-                                name: name.as_str().into(),
-                                is_input_complete: true,
-                                input,
-                                raw_input: arguments.clone(),
-                                thought_signature,
-                            },
-                        ))),
-                        Err(error) => {
-                            events.push(Ok(LanguageModelCompletionEvent::ToolUseJsonParseError {
-                                id: call_id.into(),
-                                tool_name: name.as_str().into(),
-                                raw_input: arguments.clone().into(),
-                                json_parse_error: error.to_string(),
-                            }))
-                        }
-                    }
-                    // Record that we already emitted a tool-use stop so we can avoid duplicating
-                    // a Stop event on Completed.
-                    self.pending_stop_reason = Some(StopReason::ToolUse);
-                    events.push(Ok(LanguageModelCompletionEvent::Stop(StopReason::ToolUse)));
-                    events
-                }
-                copilot::copilot_responses::ResponseOutputItem::Reasoning {
-                    summary,
-                    encrypted_content,
-                    ..
-                } => {
-                    let mut events = Vec::new();
-
-                    if let Some(blocks) = summary {
-                        let mut text = String::new();
-                        for block in blocks {
-                            text.push_str(&block.text);
-                        }
-                        if !text.is_empty() {
-                            events.push(Ok(LanguageModelCompletionEvent::Thinking {
-                                text,
-                                signature: None,
-                            }));
-                        }
-                    }
-
-                    if let Some(data) = encrypted_content {
-                        events.push(Ok(LanguageModelCompletionEvent::RedactedThinking { data }));
-                    }
-
-                    events
-                }
-            },
-
-            copilot::copilot_responses::StreamEvent::Completed { response } => {
-                let mut events = Vec::new();
-                if let Some(usage) = response.usage {
-                    events.push(Ok(LanguageModelCompletionEvent::UsageUpdate(TokenUsage {
-                        input_tokens: usage.input_tokens.unwrap_or(0),
-                        output_tokens: usage.output_tokens.unwrap_or(0),
-                        cache_creation_input_tokens: 0,
-                        cache_read_input_tokens: 0,
-                    })));
-                }
-                if self.pending_stop_reason.take() != Some(StopReason::ToolUse) {
-                    events.push(Ok(LanguageModelCompletionEvent::Stop(StopReason::EndTurn)));
-                }
-                events
-            }
-
-            copilot::copilot_responses::StreamEvent::Incomplete { response } => {
-                let reason = response
-                    .incomplete_details
-                    .as_ref()
-                    .and_then(|details| details.reason.as_ref());
-                let stop_reason = match reason {
-                    Some(copilot::copilot_responses::IncompleteReason::MaxOutputTokens) => {
-                        StopReason::MaxTokens
-                    }
-                    Some(copilot::copilot_responses::IncompleteReason::ContentFilter) => {
-                        StopReason::Refusal
-                    }
-                    _ => self
-                        .pending_stop_reason
-                        .take()
-                        .unwrap_or(StopReason::EndTurn),
-                };
-
-                let mut events = Vec::new();
-                if let Some(usage) = response.usage {
-                    events.push(Ok(LanguageModelCompletionEvent::UsageUpdate(TokenUsage {
-                        input_tokens: usage.input_tokens.unwrap_or(0),
-                        output_tokens: usage.output_tokens.unwrap_or(0),
-                        cache_creation_input_tokens: 0,
-                        cache_read_input_tokens: 0,
-                    })));
-                }
-                events.push(Ok(LanguageModelCompletionEvent::Stop(stop_reason)));
-                events
-            }
-
-            copilot::copilot_responses::StreamEvent::Failed { response } => {
-                let provider = PROVIDER_NAME;
-                let (status_code, message) = match response.error {
-                    Some(error) => {
-                        let status_code = StatusCode::from_str(&error.code)
-                            .unwrap_or(StatusCode::INTERNAL_SERVER_ERROR);
-                        (status_code, error.message)
-                    }
-                    None => (
-                        StatusCode::INTERNAL_SERVER_ERROR,
-                        "response.failed".to_string(),
-                    ),
-                };
-                vec![Err(LanguageModelCompletionError::HttpResponseError {
-                    provider,
-                    status_code,
-                    message,
-                })]
-            }
-
-            copilot::copilot_responses::StreamEvent::GenericError { error } => vec![Err(
-                LanguageModelCompletionError::Other(anyhow!(format!("{error:?}"))),
-            )],
-
-            copilot::copilot_responses::StreamEvent::Created { .. }
-            | copilot::copilot_responses::StreamEvent::Unknown => Vec::new(),
-        }
-    }
-}
-
-fn into_copilot_chat(
-    model: &copilot::copilot_chat::Model,
-    request: LanguageModelRequest,
-) -> Result<CopilotChatRequest> {
-    let mut request_messages: Vec<LanguageModelRequestMessage> = Vec::new();
-    for message in request.messages {
-        if let Some(last_message) = request_messages.last_mut() {
-            if last_message.role == message.role {
-                last_message.content.extend(message.content);
-            } else {
-                request_messages.push(message);
-            }
-        } else {
-            request_messages.push(message);
-        }
-    }
-
-    let mut messages: Vec<ChatMessage> = Vec::new();
-    for message in request_messages {
-        match message.role {
-            Role::User => {
-                for content in &message.content {
-                    if let MessageContent::ToolResult(tool_result) = content {
-                        let content = match &tool_result.content {
-                            LanguageModelToolResultContent::Text(text) => text.to_string().into(),
-                            LanguageModelToolResultContent::Image(image) => {
-                                if model.supports_vision() {
-                                    ChatMessageContent::Multipart(vec![ChatMessagePart::Image {
-                                        image_url: ImageUrl {
-                                            url: image.to_base64_url(),
-                                        },
-                                    }])
-                                } else {
-                                    debug_panic!(
-                                        "This should be caught at {} level",
-                                        tool_result.tool_name
-                                    );
-                                    "[Tool responded with an image, but this model does not support vision]".to_string().into()
-                                }
-                            }
-                        };
-
-                        messages.push(ChatMessage::Tool {
-                            tool_call_id: tool_result.tool_use_id.to_string(),
-                            content,
-                        });
-                    }
-                }
-
-                let mut content_parts = Vec::new();
-                for content in &message.content {
-                    match content {
-                        MessageContent::Text(text) | MessageContent::Thinking { text, .. }
-                            if !text.is_empty() =>
-                        {
-                            if let Some(ChatMessagePart::Text { text: text_content }) =
-                                content_parts.last_mut()
-                            {
-                                text_content.push_str(text);
-                            } else {
-                                content_parts.push(ChatMessagePart::Text {
-                                    text: text.to_string(),
-                                });
-                            }
-                        }
-                        MessageContent::Image(image) if model.supports_vision() => {
-                            content_parts.push(ChatMessagePart::Image {
-                                image_url: ImageUrl {
-                                    url: image.to_base64_url(),
-                                },
-                            });
-                        }
-                        _ => {}
-                    }
-                }
-
-                if !content_parts.is_empty() {
-                    messages.push(ChatMessage::User {
-                        content: content_parts.into(),
-                    });
-                }
-            }
-            Role::Assistant => {
-                let mut tool_calls = Vec::new();
-                for content in &message.content {
-                    if let MessageContent::ToolUse(tool_use) = content {
-                        tool_calls.push(ToolCall {
-                            id: tool_use.id.to_string(),
-                            content: copilot::copilot_chat::ToolCallContent::Function {
-                                function: copilot::copilot_chat::FunctionContent {
-                                    name: tool_use.name.to_string(),
-                                    arguments: serde_json::to_string(&tool_use.input)?,
-                                    thought_signature: tool_use.thought_signature.clone(),
-                                },
-                            },
-                        });
-                    }
-                }
-
-                let text_content = {
-                    let mut buffer = String::new();
-                    for string in message.content.iter().filter_map(|content| match content {
-                        MessageContent::Text(text) | MessageContent::Thinking { text, .. } => {
-                            Some(text.as_str())
-                        }
-                        MessageContent::ToolUse(_)
-                        | MessageContent::RedactedThinking(_)
-                        | MessageContent::ToolResult(_)
-                        | MessageContent::Image(_) => None,
-                    }) {
-                        buffer.push_str(string);
-                    }
-
-                    buffer
-                };
-
-                // Extract reasoning_opaque and reasoning_text from reasoning_details
-                let (reasoning_opaque, reasoning_text) =
-                    if let Some(details) = &message.reasoning_details {
-                        let opaque = details
-                            .get("reasoning_opaque")
-                            .and_then(|v| v.as_str())
-                            .map(|s| s.to_string());
-                        let text = details
-                            .get("reasoning_text")
-                            .and_then(|v| v.as_str())
-                            .map(|s| s.to_string());
-                        (opaque, text)
-                    } else {
-                        (None, None)
-                    };
-
-                messages.push(ChatMessage::Assistant {
-                    content: if text_content.is_empty() {
-                        ChatMessageContent::empty()
-                    } else {
-                        text_content.into()
-                    },
-                    tool_calls,
-                    reasoning_opaque,
-                    reasoning_text,
-                });
-            }
-            Role::System => messages.push(ChatMessage::System {
-                content: message.string_contents(),
-            }),
-        }
-    }
-
-    let tools = request
-        .tools
-        .iter()
-        .map(|tool| Tool::Function {
-            function: copilot::copilot_chat::Function {
-                name: tool.name.clone(),
-                description: tool.description.clone(),
-                parameters: tool.input_schema.clone(),
-            },
-        })
-        .collect::<Vec<_>>();
-
-    Ok(CopilotChatRequest {
-        intent: true,
-        n: 1,
-        stream: model.uses_streaming(),
-        temperature: 0.1,
-        model: model.id().to_string(),
-        messages,
-        tools,
-        tool_choice: request.tool_choice.map(|choice| match choice {
-            LanguageModelToolChoice::Auto => copilot::copilot_chat::ToolChoice::Auto,
-            LanguageModelToolChoice::Any => copilot::copilot_chat::ToolChoice::Any,
-            LanguageModelToolChoice::None => copilot::copilot_chat::ToolChoice::None,
-        }),
-    })
-}
-
-fn into_copilot_responses(
-    model: &copilot::copilot_chat::Model,
-    request: LanguageModelRequest,
-) -> copilot::copilot_responses::Request {
-    use copilot::copilot_responses as responses;
-
-    let LanguageModelRequest {
-        thread_id: _,
-        prompt_id: _,
-        intent: _,
-        mode: _,
-        messages,
-        tools,
-        tool_choice,
-        stop: _,
-        temperature,
-        thinking_allowed: _,
-    } = request;
-
-    let mut input_items: Vec<responses::ResponseInputItem> = Vec::new();
-
-    for message in messages {
-        match message.role {
-            Role::User => {
-                for content in &message.content {
-                    if let MessageContent::ToolResult(tool_result) = content {
-                        let output = if let Some(out) = &tool_result.output {
-                            match out {
-                                serde_json::Value::String(s) => {
-                                    responses::ResponseFunctionOutput::Text(s.clone())
-                                }
-                                serde_json::Value::Null => {
-                                    responses::ResponseFunctionOutput::Text(String::new())
-                                }
-                                other => responses::ResponseFunctionOutput::Text(other.to_string()),
-                            }
-                        } else {
-                            match &tool_result.content {
-                                LanguageModelToolResultContent::Text(text) => {
-                                    responses::ResponseFunctionOutput::Text(text.to_string())
-                                }
-                                LanguageModelToolResultContent::Image(image) => {
-                                    if model.supports_vision() {
-                                        responses::ResponseFunctionOutput::Content(vec![
-                                            responses::ResponseInputContent::InputImage {
-                                                image_url: Some(image.to_base64_url()),
-                                                detail: Default::default(),
-                                            },
-                                        ])
-                                    } else {
-                                        debug_panic!(
-                                            "This should be caught at {} level",
-                                            tool_result.tool_name
-                                        );
-                                        responses::ResponseFunctionOutput::Text(
-                                            "[Tool responded with an image, but this model does not support vision]".into(),
-                                        )
-                                    }
-                                }
-                            }
-                        };
-
-                        input_items.push(responses::ResponseInputItem::FunctionCallOutput {
-                            call_id: tool_result.tool_use_id.to_string(),
-                            output,
-                            status: None,
-                        });
-                    }
-                }
-
-                let mut parts: Vec<responses::ResponseInputContent> = Vec::new();
-                for content in &message.content {
-                    match content {
-                        MessageContent::Text(text) => {
-                            parts.push(responses::ResponseInputContent::InputText {
-                                text: text.clone(),
-                            });
-                        }
-
-                        MessageContent::Image(image) => {
-                            if model.supports_vision() {
-                                parts.push(responses::ResponseInputContent::InputImage {
-                                    image_url: Some(image.to_base64_url()),
-                                    detail: Default::default(),
-                                });
-                            }
-                        }
-                        _ => {}
-                    }
-                }
-
-                if !parts.is_empty() {
-                    input_items.push(responses::ResponseInputItem::Message {
-                        role: "user".into(),
-                        content: Some(parts),
-                        status: None,
-                    });
-                }
-            }
-
-            Role::Assistant => {
-                for content in &message.content {
-                    if let MessageContent::ToolUse(tool_use) = content {
-                        input_items.push(responses::ResponseInputItem::FunctionCall {
-                            call_id: tool_use.id.to_string(),
-                            name: tool_use.name.to_string(),
-                            arguments: tool_use.raw_input.clone(),
-                            status: None,
-                            thought_signature: tool_use.thought_signature.clone(),
-                        });
-                    }
-                }
-
-                for content in &message.content {
-                    if let MessageContent::RedactedThinking(data) = content {
-                        input_items.push(responses::ResponseInputItem::Reasoning {
-                            id: None,
-                            summary: Vec::new(),
-                            encrypted_content: data.clone(),
-                        });
-                    }
-                }
-
-                let mut parts: Vec<responses::ResponseInputContent> = Vec::new();
-                for content in &message.content {
-                    match content {
-                        MessageContent::Text(text) => {
-                            parts.push(responses::ResponseInputContent::OutputText {
-                                text: text.clone(),
-                            });
-                        }
-                        MessageContent::Image(_) => {
-                            parts.push(responses::ResponseInputContent::OutputText {
-                                text: "[image omitted]".to_string(),
-                            });
-                        }
-                        _ => {}
-                    }
-                }
-
-                if !parts.is_empty() {
-                    input_items.push(responses::ResponseInputItem::Message {
-                        role: "assistant".into(),
-                        content: Some(parts),
-                        status: Some("completed".into()),
-                    });
-                }
-            }
-
-            Role::System => {
-                let mut parts: Vec<responses::ResponseInputContent> = Vec::new();
-                for content in &message.content {
-                    if let MessageContent::Text(text) = content {
-                        parts.push(responses::ResponseInputContent::InputText {
-                            text: text.clone(),
-                        });
-                    }
-                }
-
-                if !parts.is_empty() {
-                    input_items.push(responses::ResponseInputItem::Message {
-                        role: "system".into(),
-                        content: Some(parts),
-                        status: None,
-                    });
-                }
-            }
-        }
-    }
-
-    let converted_tools: Vec<responses::ToolDefinition> = tools
-        .into_iter()
-        .map(|tool| responses::ToolDefinition::Function {
-            name: tool.name,
-            description: Some(tool.description),
-            parameters: Some(tool.input_schema),
-            strict: None,
-        })
-        .collect();
-
-    let mapped_tool_choice = tool_choice.map(|choice| match choice {
-        LanguageModelToolChoice::Auto => responses::ToolChoice::Auto,
-        LanguageModelToolChoice::Any => responses::ToolChoice::Any,
-        LanguageModelToolChoice::None => responses::ToolChoice::None,
-    });
-
-    responses::Request {
-        model: model.id().to_string(),
-        input: input_items,
-        stream: model.uses_streaming(),
-        temperature,
-        tools: converted_tools,
-        tool_choice: mapped_tool_choice,
-        reasoning: None, // We would need to add support for setting from user settings.
-        include: Some(vec![
-            copilot::copilot_responses::ResponseIncludable::ReasoningEncryptedContent,
-        ]),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use copilot::copilot_responses as responses;
-    use futures::StreamExt;
-
-    fn map_events(events: Vec<responses::StreamEvent>) -> Vec<LanguageModelCompletionEvent> {
-        futures::executor::block_on(async {
-            CopilotResponsesEventMapper::new()
-                .map_stream(Box::pin(futures::stream::iter(events.into_iter().map(Ok))))
-                .collect::<Vec<_>>()
-                .await
-                .into_iter()
-                .map(Result::unwrap)
-                .collect()
-        })
-    }
-
-    #[test]
-    fn responses_stream_maps_text_and_usage() {
-        let events = vec![
-            responses::StreamEvent::OutputItemAdded {
-                output_index: 0,
-                sequence_number: None,
-                item: responses::ResponseOutputItem::Message {
-                    id: "msg_1".into(),
-                    role: "assistant".into(),
-                    content: Some(Vec::new()),
-                },
-            },
-            responses::StreamEvent::OutputTextDelta {
-                item_id: "msg_1".into(),
-                output_index: 0,
-                delta: "Hello".into(),
-            },
-            responses::StreamEvent::Completed {
-                response: responses::Response {
-                    usage: Some(responses::ResponseUsage {
-                        input_tokens: Some(5),
-                        output_tokens: Some(3),
-                        total_tokens: Some(8),
-                    }),
-                    ..Default::default()
-                },
-            },
-        ];
-
-        let mapped = map_events(events);
-        assert!(matches!(
-            mapped[0],
-            LanguageModelCompletionEvent::StartMessage { ref message_id } if message_id == "msg_1"
-        ));
-        assert!(matches!(
-            mapped[1],
-            LanguageModelCompletionEvent::Text(ref text) if text == "Hello"
-        ));
-        assert!(matches!(
-            mapped[2],
-            LanguageModelCompletionEvent::UsageUpdate(TokenUsage {
-                input_tokens: 5,
-                output_tokens: 3,
-                ..
-            })
-        ));
-        assert!(matches!(
-            mapped[3],
-            LanguageModelCompletionEvent::Stop(StopReason::EndTurn)
-        ));
-    }
-
-    #[test]
-    fn responses_stream_maps_tool_calls() {
-        let events = vec![responses::StreamEvent::OutputItemDone {
-            output_index: 0,
-            sequence_number: None,
-            item: responses::ResponseOutputItem::FunctionCall {
-                id: Some("fn_1".into()),
-                call_id: "call_1".into(),
-                name: "do_it".into(),
-                arguments: "{\"x\":1}".into(),
-                status: None,
-                thought_signature: None,
-            },
-        }];
-
-        let mapped = map_events(events);
-        assert!(matches!(
-            mapped[0],
-            LanguageModelCompletionEvent::ToolUse(ref use_) if use_.id.to_string() == "call_1" && use_.name.as_ref() == "do_it"
-        ));
-        assert!(matches!(
-            mapped[1],
-            LanguageModelCompletionEvent::Stop(StopReason::ToolUse)
-        ));
-    }
-
-    #[test]
-    fn responses_stream_handles_json_parse_error() {
-        let events = vec![responses::StreamEvent::OutputItemDone {
-            output_index: 0,
-            sequence_number: None,
-            item: responses::ResponseOutputItem::FunctionCall {
-                id: Some("fn_1".into()),
-                call_id: "call_1".into(),
-                name: "do_it".into(),
-                arguments: "{not json}".into(),
-                status: None,
-                thought_signature: None,
-            },
-        }];
-
-        let mapped = map_events(events);
-        assert!(matches!(
-            mapped[0],
-            LanguageModelCompletionEvent::ToolUseJsonParseError { ref id, ref tool_name, .. }
-                if id.to_string() == "call_1" && tool_name.as_ref() == "do_it"
-        ));
-        assert!(matches!(
-            mapped[1],
-            LanguageModelCompletionEvent::Stop(StopReason::ToolUse)
-        ));
-    }
-
-    #[test]
-    fn responses_stream_maps_reasoning_summary_and_encrypted_content() {
-        let events = vec![responses::StreamEvent::OutputItemDone {
-            output_index: 0,
-            sequence_number: None,
-            item: responses::ResponseOutputItem::Reasoning {
-                id: "r1".into(),
-                summary: Some(vec![responses::ResponseReasoningItem {
-                    kind: "summary_text".into(),
-                    text: "Chain".into(),
-                }]),
-                encrypted_content: Some("ENC".into()),
-            },
-        }];
-
-        let mapped = map_events(events);
-        assert!(matches!(
-            mapped[0],
-            LanguageModelCompletionEvent::Thinking { ref text, signature: None } if text == "Chain"
-        ));
-        assert!(matches!(
-            mapped[1],
-            LanguageModelCompletionEvent::RedactedThinking { ref data } if data == "ENC"
-        ));
-    }
-
-    #[test]
-    fn responses_stream_handles_incomplete_max_tokens() {
-        let events = vec![responses::StreamEvent::Incomplete {
-            response: responses::Response {
-                usage: Some(responses::ResponseUsage {
-                    input_tokens: Some(10),
-                    output_tokens: Some(0),
-                    total_tokens: Some(10),
-                }),
-                incomplete_details: Some(responses::IncompleteDetails {
-                    reason: Some(responses::IncompleteReason::MaxOutputTokens),
-                }),
-                ..Default::default()
-            },
-        }];
-
-        let mapped = map_events(events);
-        assert!(matches!(
-            mapped[0],
-            LanguageModelCompletionEvent::UsageUpdate(TokenUsage {
-                input_tokens: 10,
-                output_tokens: 0,
-                ..
-            })
-        ));
-        assert!(matches!(
-            mapped[1],
-            LanguageModelCompletionEvent::Stop(StopReason::MaxTokens)
-        ));
-    }
-
-    #[test]
-    fn responses_stream_handles_incomplete_content_filter() {
-        let events = vec![responses::StreamEvent::Incomplete {
-            response: responses::Response {
-                usage: None,
-                incomplete_details: Some(responses::IncompleteDetails {
-                    reason: Some(responses::IncompleteReason::ContentFilter),
-                }),
-                ..Default::default()
-            },
-        }];
-
-        let mapped = map_events(events);
-        assert!(matches!(
-            mapped.last().unwrap(),
-            LanguageModelCompletionEvent::Stop(StopReason::Refusal)
-        ));
-    }
-
-    #[test]
-    fn responses_stream_completed_no_duplicate_after_tool_use() {
-        let events = vec![
-            responses::StreamEvent::OutputItemDone {
-                output_index: 0,
-                sequence_number: None,
-                item: responses::ResponseOutputItem::FunctionCall {
-                    id: Some("fn_1".into()),
-                    call_id: "call_1".into(),
-                    name: "do_it".into(),
-                    arguments: "{}".into(),
-                    status: None,
-                    thought_signature: None,
-                },
-            },
-            responses::StreamEvent::Completed {
-                response: responses::Response::default(),
-            },
-        ];
-
-        let mapped = map_events(events);
-
-        let mut stop_count = 0usize;
-        let mut saw_tool_use_stop = false;
-        for event in mapped {
-            if let LanguageModelCompletionEvent::Stop(reason) = event {
-                stop_count += 1;
-                if matches!(reason, StopReason::ToolUse) {
-                    saw_tool_use_stop = true;
-                }
-            }
-        }
-        assert_eq!(stop_count, 1, "should emit exactly one Stop event");
-        assert!(saw_tool_use_stop, "Stop reason should be ToolUse");
-    }
-
-    #[test]
-    fn responses_stream_failed_maps_http_response_error() {
-        let events = vec![responses::StreamEvent::Failed {
-            response: responses::Response {
-                error: Some(responses::ResponseError {
-                    code: "429".into(),
-                    message: "too many requests".into(),
-                }),
-                ..Default::default()
-            },
-        }];
-
-        let mapped_results = futures::executor::block_on(async {
-            CopilotResponsesEventMapper::new()
-                .map_stream(Box::pin(futures::stream::iter(events.into_iter().map(Ok))))
-                .collect::<Vec<_>>()
-                .await
-        });
-
-        assert_eq!(mapped_results.len(), 1);
-        match &mapped_results[0] {
-            Err(LanguageModelCompletionError::HttpResponseError {
-                status_code,
-                message,
-                ..
-            }) => {
-                assert_eq!(*status_code, http_client::StatusCode::TOO_MANY_REQUESTS);
-                assert_eq!(message, "too many requests");
-            }
-            other => panic!("expected HttpResponseError, got {:?}", other),
-        }
-    }
-
-    #[test]
-    fn chat_completions_stream_maps_reasoning_data() {
-        use copilot::copilot_chat::ResponseEvent;
-
-        let events = vec![
-            ResponseEvent {
-                choices: vec![copilot::copilot_chat::ResponseChoice {
-                    index: Some(0),
-                    finish_reason: None,
-                    delta: Some(copilot::copilot_chat::ResponseDelta {
-                        content: None,
-                        role: Some(copilot::copilot_chat::Role::Assistant),
-                        tool_calls: vec![copilot::copilot_chat::ToolCallChunk {
-                            index: Some(0),
-                            id: Some("call_abc123".to_string()),
-                            function: Some(copilot::copilot_chat::FunctionChunk {
-                                name: Some("list_directory".to_string()),
-                                arguments: Some("{\"path\":\"test\"}".to_string()),
-                                thought_signature: None,
-                            }),
-                        }],
-                        reasoning_opaque: Some("encrypted_reasoning_token_xyz".to_string()),
-                        reasoning_text: Some("Let me check the directory".to_string()),
-                    }),
-                    message: None,
-                }],
-                id: "chatcmpl-123".to_string(),
-                usage: None,
-            },
-            ResponseEvent {
-                choices: vec![copilot::copilot_chat::ResponseChoice {
-                    index: Some(0),
-                    finish_reason: Some("tool_calls".to_string()),
-                    delta: Some(copilot::copilot_chat::ResponseDelta {
-                        content: None,
-                        role: None,
-                        tool_calls: vec![],
-                        reasoning_opaque: None,
-                        reasoning_text: None,
-                    }),
-                    message: None,
-                }],
-                id: "chatcmpl-123".to_string(),
-                usage: None,
-            },
-        ];
-
-        let mapped = futures::executor::block_on(async {
-            map_to_language_model_completion_events(
-                Box::pin(futures::stream::iter(events.into_iter().map(Ok))),
-                true,
-            )
-            .collect::<Vec<_>>()
-            .await
-        });
-
-        let mut has_reasoning_details = false;
-        let mut has_tool_use = false;
-        let mut reasoning_opaque_value: Option<String> = None;
-        let mut reasoning_text_value: Option<String> = None;
-
-        for event_result in mapped {
-            match event_result {
-                Ok(LanguageModelCompletionEvent::ReasoningDetails(details)) => {
-                    has_reasoning_details = true;
-                    reasoning_opaque_value = details
-                        .get("reasoning_opaque")
-                        .and_then(|v| v.as_str())
-                        .map(|s| s.to_string());
-                    reasoning_text_value = details
-                        .get("reasoning_text")
-                        .and_then(|v| v.as_str())
-                        .map(|s| s.to_string());
-                }
-                Ok(LanguageModelCompletionEvent::ToolUse(tool_use)) => {
-                    has_tool_use = true;
-                    assert_eq!(tool_use.id.to_string(), "call_abc123");
-                    assert_eq!(tool_use.name.as_ref(), "list_directory");
-                }
-                _ => {}
-            }
-        }
-
-        assert!(
-            has_reasoning_details,
-            "Should emit ReasoningDetails event for Gemini 3 reasoning"
-        );
-        assert!(has_tool_use, "Should emit ToolUse event");
-        assert_eq!(
-            reasoning_opaque_value,
-            Some("encrypted_reasoning_token_xyz".to_string()),
-            "Should capture reasoning_opaque"
-        );
-        assert_eq!(
-            reasoning_text_value,
-            Some("Let me check the directory".to_string()),
-            "Should capture reasoning_text"
-        );
-    }
-}
-struct ConfigurationView {
-    copilot_status: Option<copilot::Status>,
-    state: Entity<State>,
-    _subscription: Option<Subscription>,
-}
-
-impl ConfigurationView {
-    pub fn new(state: Entity<State>, cx: &mut Context<Self>) -> Self {
-        let copilot = Copilot::global(cx);
-
-        Self {
-            copilot_status: copilot.as_ref().map(|copilot| copilot.read(cx).status()),
-            state,
-            _subscription: copilot.as_ref().map(|copilot| {
-                cx.observe(copilot, |this, model, cx| {
-                    this.copilot_status = Some(model.read(cx).status());
-                    cx.notify();
-                })
-            }),
-        }
-    }
-}
-
-impl Render for ConfigurationView {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        if self.state.read(cx).is_authenticated(cx) {
-            ConfiguredApiCard::new("Authorized")
-                .button_label("Sign Out")
-                .on_click(|_, window, cx| {
-                    window.dispatch_action(copilot::SignOut.boxed_clone(), cx);
-                })
-                .into_any_element()
-        } else {
-            let loading_icon = Icon::new(IconName::ArrowCircle).with_rotate_animation(4);
-
-            const ERROR_LABEL: &str = "Copilot Chat requires an active GitHub Copilot subscription. Please ensure Copilot is configured and try again, or use a different Assistant provider.";
-
-            match &self.copilot_status {
-                Some(status) => match status {
-                    Status::Starting { task: _ } => h_flex()
-                        .gap_2()
-                        .child(loading_icon)
-                        .child(Label::new("Starting Copilot…"))
-                        .into_any_element(),
-                    Status::SigningIn { prompt: _ }
-                    | Status::SignedOut {
-                        awaiting_signing_in: true,
-                    } => h_flex()
-                        .gap_2()
-                        .child(loading_icon)
-                        .child(Label::new("Signing into Copilot…"))
-                        .into_any_element(),
-                    Status::Error(_) => {
-                        const LABEL: &str = "Copilot had issues starting. Please try restarting it. If the issue persists, try reinstalling Copilot.";
-                        v_flex()
-                            .gap_6()
-                            .child(Label::new(LABEL))
-                            .child(svg().size_8().path(IconName::CopilotError.path()))
-                            .into_any_element()
-                    }
-                    _ => {
-                        const LABEL: &str = "To use Zed's agent with GitHub Copilot, you need to be logged in to GitHub. Note that your GitHub account must have an active Copilot Chat subscription.";
-
-                        v_flex()
-                            .gap_2()
-                            .child(Label::new(LABEL))
-                            .child(
-                                Button::new("sign_in", "Sign in to use GitHub Copilot")
-                                    .full_width()
-                                    .style(ButtonStyle::Outlined)
-                                    .icon_color(Color::Muted)
-                                    .icon(IconName::Github)
-                                    .icon_position(IconPosition::Start)
-                                    .icon_size(IconSize::Small)
-                                    .on_click(|_, window, cx| {
-                                        copilot::initiate_sign_in(window, cx)
-                                    }),
-                            )
-                            .into_any_element()
-                    }
-                },
-                None => v_flex()
-                    .gap_6()
-                    .child(Label::new(ERROR_LABEL))
-                    .into_any_element(),
-            }
-        }
-    }
-}
diff --git a/crates/language_models/src/provider/deepseek.rs b/crates/language_models/src/provider/deepseek.rs
deleted file mode 100644
index 91b83bb9f1..0000000000
--- a/crates/language_models/src/provider/deepseek.rs
+++ /dev/null
@@ -1,660 +0,0 @@
-use anyhow::{Result, anyhow};
-use collections::{BTreeMap, HashMap};
-use deepseek::DEEPSEEK_API_URL;
-
-use futures::Stream;
-use futures::{FutureExt, StreamExt, future, future::BoxFuture, stream::BoxStream};
-use gpui::{AnyView, App, AsyncApp, Context, Entity, SharedString, Task, Window};
-use http_client::HttpClient;
-use language_model::{
-    AuthenticateError, LanguageModel, LanguageModelCompletionError, LanguageModelCompletionEvent,
-    LanguageModelId, LanguageModelName, LanguageModelProvider, LanguageModelProviderId,
-    LanguageModelProviderName, LanguageModelProviderState, LanguageModelRequest,
-    LanguageModelToolChoice, LanguageModelToolResultContent, LanguageModelToolUse, MessageContent,
-    RateLimiter, Role, StopReason, TokenUsage,
-};
-pub use settings::DeepseekAvailableModel as AvailableModel;
-use settings::{Settings, SettingsStore};
-use std::pin::Pin;
-use std::str::FromStr;
-use std::sync::{Arc, LazyLock};
-
-use ui::{List, prelude::*};
-use ui_input::InputField;
-use util::ResultExt;
-use zed_env_vars::{EnvVar, env_var};
-
-use crate::ui::ConfiguredApiCard;
-use crate::{api_key::ApiKeyState, ui::InstructionListItem};
-
-const PROVIDER_ID: LanguageModelProviderId = LanguageModelProviderId::new("deepseek");
-const PROVIDER_NAME: LanguageModelProviderName = LanguageModelProviderName::new("DeepSeek");
-
-const API_KEY_ENV_VAR_NAME: &str = "DEEPSEEK_API_KEY";
-static API_KEY_ENV_VAR: LazyLock<EnvVar> = env_var!(API_KEY_ENV_VAR_NAME);
-
-#[derive(Default)]
-struct RawToolCall {
-    id: String,
-    name: String,
-    arguments: String,
-}
-
-#[derive(Default, Clone, Debug, PartialEq)]
-pub struct DeepSeekSettings {
-    pub api_url: String,
-    pub available_models: Vec<AvailableModel>,
-}
-pub struct DeepSeekLanguageModelProvider {
-    http_client: Arc<dyn HttpClient>,
-    state: Entity<State>,
-}
-
-pub struct State {
-    api_key_state: ApiKeyState,
-}
-
-impl State {
-    fn is_authenticated(&self) -> bool {
-        self.api_key_state.has_key()
-    }
-
-    fn set_api_key(&mut self, api_key: Option<String>, cx: &mut Context<Self>) -> Task<Result<()>> {
-        let api_url = DeepSeekLanguageModelProvider::api_url(cx);
-        self.api_key_state
-            .store(api_url, api_key, |this| &mut this.api_key_state, cx)
-    }
-
-    fn authenticate(&mut self, cx: &mut Context<Self>) -> Task<Result<(), AuthenticateError>> {
-        let api_url = DeepSeekLanguageModelProvider::api_url(cx);
-        self.api_key_state.load_if_needed(
-            api_url,
-            &API_KEY_ENV_VAR,
-            |this| &mut this.api_key_state,
-            cx,
-        )
-    }
-}
-
-impl DeepSeekLanguageModelProvider {
-    pub fn new(http_client: Arc<dyn HttpClient>, cx: &mut App) -> Self {
-        let state = cx.new(|cx| {
-            cx.observe_global::<SettingsStore>(|this: &mut State, cx| {
-                let api_url = Self::api_url(cx);
-                this.api_key_state.handle_url_change(
-                    api_url,
-                    &API_KEY_ENV_VAR,
-                    |this| &mut this.api_key_state,
-                    cx,
-                );
-                cx.notify();
-            })
-            .detach();
-            State {
-                api_key_state: ApiKeyState::new(Self::api_url(cx)),
-            }
-        });
-
-        Self { http_client, state }
-    }
-
-    fn create_language_model(&self, model: deepseek::Model) -> Arc<dyn LanguageModel> {
-        Arc::new(DeepSeekLanguageModel {
-            id: LanguageModelId::from(model.id().to_string()),
-            model,
-            state: self.state.clone(),
-            http_client: self.http_client.clone(),
-            request_limiter: RateLimiter::new(4),
-        })
-    }
-
-    fn settings(cx: &App) -> &DeepSeekSettings {
-        &crate::AllLanguageModelSettings::get_global(cx).deepseek
-    }
-
-    fn api_url(cx: &App) -> SharedString {
-        let api_url = &Self::settings(cx).api_url;
-        if api_url.is_empty() {
-            DEEPSEEK_API_URL.into()
-        } else {
-            SharedString::new(api_url.as_str())
-        }
-    }
-}
-
-impl LanguageModelProviderState for DeepSeekLanguageModelProvider {
-    type ObservableEntity = State;
-
-    fn observable_entity(&self) -> Option<Entity<Self::ObservableEntity>> {
-        Some(self.state.clone())
-    }
-}
-
-impl LanguageModelProvider for DeepSeekLanguageModelProvider {
-    fn id(&self) -> LanguageModelProviderId {
-        PROVIDER_ID
-    }
-
-    fn name(&self) -> LanguageModelProviderName {
-        PROVIDER_NAME
-    }
-
-    fn icon(&self) -> IconName {
-        IconName::AiDeepSeek
-    }
-
-    fn default_model(&self, _cx: &App) -> Option<Arc<dyn LanguageModel>> {
-        Some(self.create_language_model(deepseek::Model::default()))
-    }
-
-    fn default_fast_model(&self, _cx: &App) -> Option<Arc<dyn LanguageModel>> {
-        Some(self.create_language_model(deepseek::Model::default_fast()))
-    }
-
-    fn provided_models(&self, cx: &App) -> Vec<Arc<dyn LanguageModel>> {
-        let mut models = BTreeMap::default();
-
-        models.insert("deepseek-chat", deepseek::Model::Chat);
-        models.insert("deepseek-reasoner", deepseek::Model::Reasoner);
-
-        for available_model in &Self::settings(cx).available_models {
-            models.insert(
-                &available_model.name,
-                deepseek::Model::Custom {
-                    name: available_model.name.clone(),
-                    display_name: available_model.display_name.clone(),
-                    max_tokens: available_model.max_tokens,
-                    max_output_tokens: available_model.max_output_tokens,
-                },
-            );
-        }
-
-        models
-            .into_values()
-            .map(|model| self.create_language_model(model))
-            .collect()
-    }
-
-    fn is_authenticated(&self, cx: &App) -> bool {
-        self.state.read(cx).is_authenticated()
-    }
-
-    fn authenticate(&self, cx: &mut App) -> Task<Result<(), AuthenticateError>> {
-        self.state.update(cx, |state, cx| state.authenticate(cx))
-    }
-
-    fn configuration_view(
-        &self,
-        _target_agent: language_model::ConfigurationViewTargetAgent,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> AnyView {
-        cx.new(|cx| ConfigurationView::new(self.state.clone(), window, cx))
-            .into()
-    }
-
-    fn reset_credentials(&self, cx: &mut App) -> Task<Result<()>> {
-        self.state
-            .update(cx, |state, cx| state.set_api_key(None, cx))
-    }
-}
-
-pub struct DeepSeekLanguageModel {
-    id: LanguageModelId,
-    model: deepseek::Model,
-    state: Entity<State>,
-    http_client: Arc<dyn HttpClient>,
-    request_limiter: RateLimiter,
-}
-
-impl DeepSeekLanguageModel {
-    fn stream_completion(
-        &self,
-        request: deepseek::Request,
-        cx: &AsyncApp,
-    ) -> BoxFuture<'static, Result<BoxStream<'static, Result<deepseek::StreamResponse>>>> {
-        let http_client = self.http_client.clone();
-
-        let Ok((api_key, api_url)) = self.state.read_with(cx, |state, cx| {
-            let api_url = DeepSeekLanguageModelProvider::api_url(cx);
-            (state.api_key_state.key(&api_url), api_url)
-        }) else {
-            return future::ready(Err(anyhow!("App state dropped"))).boxed();
-        };
-
-        let future = self.request_limiter.stream(async move {
-            let Some(api_key) = api_key else {
-                return Err(LanguageModelCompletionError::NoApiKey {
-                    provider: PROVIDER_NAME,
-                });
-            };
-            let request =
-                deepseek::stream_completion(http_client.as_ref(), &api_url, &api_key, request);
-            let response = request.await?;
-            Ok(response)
-        });
-
-        async move { Ok(future.await?.boxed()) }.boxed()
-    }
-}
-
-impl LanguageModel for DeepSeekLanguageModel {
-    fn id(&self) -> LanguageModelId {
-        self.id.clone()
-    }
-
-    fn name(&self) -> LanguageModelName {
-        LanguageModelName::from(self.model.display_name().to_string())
-    }
-
-    fn provider_id(&self) -> LanguageModelProviderId {
-        PROVIDER_ID
-    }
-
-    fn provider_name(&self) -> LanguageModelProviderName {
-        PROVIDER_NAME
-    }
-
-    fn supports_tools(&self) -> bool {
-        true
-    }
-
-    fn supports_tool_choice(&self, _choice: LanguageModelToolChoice) -> bool {
-        true
-    }
-
-    fn supports_images(&self) -> bool {
-        false
-    }
-
-    fn telemetry_id(&self) -> String {
-        format!("deepseek/{}", self.model.id())
-    }
-
-    fn max_token_count(&self) -> u64 {
-        self.model.max_token_count()
-    }
-
-    fn max_output_tokens(&self) -> Option<u64> {
-        self.model.max_output_tokens()
-    }
-
-    fn count_tokens(
-        &self,
-        request: LanguageModelRequest,
-        cx: &App,
-    ) -> BoxFuture<'static, Result<u64>> {
-        cx.background_spawn(async move {
-            let messages = request
-                .messages
-                .into_iter()
-                .map(|message| tiktoken_rs::ChatCompletionRequestMessage {
-                    role: match message.role {
-                        Role::User => "user".into(),
-                        Role::Assistant => "assistant".into(),
-                        Role::System => "system".into(),
-                    },
-                    content: Some(message.string_contents()),
-                    name: None,
-                    function_call: None,
-                })
-                .collect::<Vec<_>>();
-
-            tiktoken_rs::num_tokens_from_messages("gpt-4", &messages).map(|tokens| tokens as u64)
-        })
-        .boxed()
-    }
-
-    fn stream_completion(
-        &self,
-        request: LanguageModelRequest,
-        cx: &AsyncApp,
-    ) -> BoxFuture<
-        'static,
-        Result<
-            BoxStream<'static, Result<LanguageModelCompletionEvent, LanguageModelCompletionError>>,
-            LanguageModelCompletionError,
-        >,
-    > {
-        let request = into_deepseek(request, &self.model, self.max_output_tokens());
-        let stream = self.stream_completion(request, cx);
-
-        async move {
-            let mapper = DeepSeekEventMapper::new();
-            Ok(mapper.map_stream(stream.await?).boxed())
-        }
-        .boxed()
-    }
-}
-
-pub fn into_deepseek(
-    request: LanguageModelRequest,
-    model: &deepseek::Model,
-    max_output_tokens: Option<u64>,
-) -> deepseek::Request {
-    let is_reasoner = model == &deepseek::Model::Reasoner;
-
-    let mut messages = Vec::new();
-    let mut current_reasoning: Option<String> = None;
-
-    for message in request.messages {
-        for content in message.content {
-            match content {
-                MessageContent::Text(text) => messages.push(match message.role {
-                    Role::User => deepseek::RequestMessage::User { content: text },
-                    Role::Assistant => deepseek::RequestMessage::Assistant {
-                        content: Some(text),
-                        tool_calls: Vec::new(),
-                        reasoning_content: current_reasoning.take(),
-                    },
-                    Role::System => deepseek::RequestMessage::System { content: text },
-                }),
-                MessageContent::Thinking { text, .. } => {
-                    // Accumulate reasoning content for next assistant message
-                    current_reasoning.get_or_insert_default().push_str(&text);
-                }
-                MessageContent::RedactedThinking(_) => {}
-                MessageContent::Image(_) => {}
-                MessageContent::ToolUse(tool_use) => {
-                    let tool_call = deepseek::ToolCall {
-                        id: tool_use.id.to_string(),
-                        content: deepseek::ToolCallContent::Function {
-                            function: deepseek::FunctionContent {
-                                name: tool_use.name.to_string(),
-                                arguments: serde_json::to_string(&tool_use.input)
-                                    .unwrap_or_default(),
-                            },
-                        },
-                    };
-
-                    if let Some(deepseek::RequestMessage::Assistant { tool_calls, .. }) =
-                        messages.last_mut()
-                    {
-                        tool_calls.push(tool_call);
-                    } else {
-                        messages.push(deepseek::RequestMessage::Assistant {
-                            content: None,
-                            tool_calls: vec![tool_call],
-                            reasoning_content: current_reasoning.take(),
-                        });
-                    }
-                }
-                MessageContent::ToolResult(tool_result) => {
-                    match &tool_result.content {
-                        LanguageModelToolResultContent::Text(text) => {
-                            messages.push(deepseek::RequestMessage::Tool {
-                                content: text.to_string(),
-                                tool_call_id: tool_result.tool_use_id.to_string(),
-                            });
-                        }
-                        LanguageModelToolResultContent::Image(_) => {}
-                    };
-                }
-            }
-        }
-    }
-
-    deepseek::Request {
-        model: model.id().to_string(),
-        messages,
-        stream: true,
-        max_tokens: max_output_tokens,
-        temperature: if is_reasoner {
-            None
-        } else {
-            request.temperature
-        },
-        response_format: None,
-        tools: request
-            .tools
-            .into_iter()
-            .map(|tool| deepseek::ToolDefinition::Function {
-                function: deepseek::FunctionDefinition {
-                    name: tool.name,
-                    description: Some(tool.description),
-                    parameters: Some(tool.input_schema),
-                },
-            })
-            .collect(),
-    }
-}
-
-pub struct DeepSeekEventMapper {
-    tool_calls_by_index: HashMap<usize, RawToolCall>,
-}
-
-impl DeepSeekEventMapper {
-    pub fn new() -> Self {
-        Self {
-            tool_calls_by_index: HashMap::default(),
-        }
-    }
-
-    pub fn map_stream(
-        mut self,
-        events: Pin<Box<dyn Send + Stream<Item = Result<deepseek::StreamResponse>>>>,
-    ) -> impl Stream<Item = Result<LanguageModelCompletionEvent, LanguageModelCompletionError>>
-    {
-        events.flat_map(move |event| {
-            futures::stream::iter(match event {
-                Ok(event) => self.map_event(event),
-                Err(error) => vec![Err(LanguageModelCompletionError::from(error))],
-            })
-        })
-    }
-
-    pub fn map_event(
-        &mut self,
-        event: deepseek::StreamResponse,
-    ) -> Vec<Result<LanguageModelCompletionEvent, LanguageModelCompletionError>> {
-        let Some(choice) = event.choices.first() else {
-            return vec![Err(LanguageModelCompletionError::from(anyhow!(
-                "Response contained no choices"
-            )))];
-        };
-
-        let mut events = Vec::new();
-        if let Some(content) = choice.delta.content.clone() {
-            events.push(Ok(LanguageModelCompletionEvent::Text(content)));
-        }
-
-        if let Some(reasoning_content) = choice.delta.reasoning_content.clone() {
-            events.push(Ok(LanguageModelCompletionEvent::Thinking {
-                text: reasoning_content,
-                signature: None,
-            }));
-        }
-
-        if let Some(tool_calls) = choice.delta.tool_calls.as_ref() {
-            for tool_call in tool_calls {
-                let entry = self.tool_calls_by_index.entry(tool_call.index).or_default();
-
-                if let Some(tool_id) = tool_call.id.clone() {
-                    entry.id = tool_id;
-                }
-
-                if let Some(function) = tool_call.function.as_ref() {
-                    if let Some(name) = function.name.clone() {
-                        entry.name = name;
-                    }
-
-                    if let Some(arguments) = function.arguments.clone() {
-                        entry.arguments.push_str(&arguments);
-                    }
-                }
-            }
-        }
-
-        if let Some(usage) = event.usage {
-            events.push(Ok(LanguageModelCompletionEvent::UsageUpdate(TokenUsage {
-                input_tokens: usage.prompt_tokens,
-                output_tokens: usage.completion_tokens,
-                cache_creation_input_tokens: 0,
-                cache_read_input_tokens: 0,
-            })));
-        }
-
-        match choice.finish_reason.as_deref() {
-            Some("stop") => {
-                events.push(Ok(LanguageModelCompletionEvent::Stop(StopReason::EndTurn)));
-            }
-            Some("tool_calls") => {
-                events.extend(self.tool_calls_by_index.drain().map(|(_, tool_call)| {
-                    match serde_json::Value::from_str(&tool_call.arguments) {
-                        Ok(input) => Ok(LanguageModelCompletionEvent::ToolUse(
-                            LanguageModelToolUse {
-                                id: tool_call.id.clone().into(),
-                                name: tool_call.name.as_str().into(),
-                                is_input_complete: true,
-                                input,
-                                raw_input: tool_call.arguments.clone(),
-                                thought_signature: None,
-                            },
-                        )),
-                        Err(error) => Ok(LanguageModelCompletionEvent::ToolUseJsonParseError {
-                            id: tool_call.id.clone().into(),
-                            tool_name: tool_call.name.as_str().into(),
-                            raw_input: tool_call.arguments.into(),
-                            json_parse_error: error.to_string(),
-                        }),
-                    }
-                }));
-
-                events.push(Ok(LanguageModelCompletionEvent::Stop(StopReason::ToolUse)));
-            }
-            Some(stop_reason) => {
-                log::error!("Unexpected DeepSeek stop_reason: {stop_reason:?}",);
-                events.push(Ok(LanguageModelCompletionEvent::Stop(StopReason::EndTurn)));
-            }
-            None => {}
-        }
-
-        events
-    }
-}
-
-struct ConfigurationView {
-    api_key_editor: Entity<InputField>,
-    state: Entity<State>,
-    load_credentials_task: Option<Task<()>>,
-}
-
-impl ConfigurationView {
-    fn new(state: Entity<State>, window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let api_key_editor =
-            cx.new(|cx| InputField::new(window, cx, "sk-00000000000000000000000000000000"));
-
-        cx.observe(&state, |_, _, cx| {
-            cx.notify();
-        })
-        .detach();
-
-        let load_credentials_task = Some(cx.spawn({
-            let state = state.clone();
-            async move |this, cx| {
-                if let Some(task) = state
-                    .update(cx, |state, cx| state.authenticate(cx))
-                    .log_err()
-                {
-                    let _ = task.await;
-                }
-
-                this.update(cx, |this, cx| {
-                    this.load_credentials_task = None;
-                    cx.notify();
-                })
-                .log_err();
-            }
-        }));
-
-        Self {
-            api_key_editor,
-            state,
-            load_credentials_task,
-        }
-    }
-
-    fn save_api_key(&mut self, _: &menu::Confirm, _window: &mut Window, cx: &mut Context<Self>) {
-        let api_key = self.api_key_editor.read(cx).text(cx).trim().to_string();
-        if api_key.is_empty() {
-            return;
-        }
-
-        let state = self.state.clone();
-        cx.spawn(async move |_, cx| {
-            state
-                .update(cx, |state, cx| state.set_api_key(Some(api_key), cx))?
-                .await
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn reset_api_key(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.api_key_editor
-            .update(cx, |editor, cx| editor.set_text("", window, cx));
-
-        let state = self.state.clone();
-        cx.spawn(async move |_, cx| {
-            state
-                .update(cx, |state, cx| state.set_api_key(None, cx))?
-                .await
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn should_render_editor(&self, cx: &mut Context<Self>) -> bool {
-        !self.state.read(cx).is_authenticated()
-    }
-}
-
-impl Render for ConfigurationView {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let env_var_set = self.state.read(cx).api_key_state.is_from_env_var();
-        let configured_card_label = if env_var_set {
-            format!("API key set in {API_KEY_ENV_VAR_NAME} environment variable")
-        } else {
-            let api_url = DeepSeekLanguageModelProvider::api_url(cx);
-            if api_url == DEEPSEEK_API_URL {
-                "API key configured".to_string()
-            } else {
-                format!("API key configured for {}", api_url)
-            }
-        };
-
-        if self.load_credentials_task.is_some() {
-            div()
-                .child(Label::new("Loading credentials..."))
-                .into_any_element()
-        } else if self.should_render_editor(cx) {
-            v_flex()
-                .size_full()
-                .on_action(cx.listener(Self::save_api_key))
-                .child(Label::new("To use DeepSeek in Zed, you need an API key:"))
-                .child(
-                    List::new()
-                        .child(InstructionListItem::new(
-                            "Get your API key from the",
-                            Some("DeepSeek console"),
-                            Some("https://platform.deepseek.com/api_keys"),
-                        ))
-                        .child(InstructionListItem::text_only(
-                            "Paste your API key below and hit enter to start using the assistant",
-                        )),
-                )
-                .child(self.api_key_editor.clone())
-                .child(
-                    Label::new(format!(
-                        "Or set the {API_KEY_ENV_VAR_NAME} environment variable."
-                    ))
-                    .size(LabelSize::Small)
-                    .color(Color::Muted),
-                )
-                .into_any_element()
-        } else {
-            ConfiguredApiCard::new(configured_card_label)
-                .disabled(env_var_set)
-                .on_click(cx.listener(|this, _, window, cx| this.reset_api_key(window, cx)))
-                .into_any_element()
-        }
-    }
-}
diff --git a/crates/language_models/src/provider/google.rs b/crates/language_models/src/provider/google.rs
deleted file mode 100644
index c5a5affcd3..0000000000
--- a/crates/language_models/src/provider/google.rs
+++ /dev/null
@@ -1,1328 +0,0 @@
-use anyhow::{Context as _, Result, anyhow};
-use collections::BTreeMap;
-use credentials_provider::CredentialsProvider;
-use futures::{FutureExt, Stream, StreamExt, future, future::BoxFuture};
-use google_ai::{
-    FunctionDeclaration, GenerateContentResponse, GoogleModelMode, Part, SystemInstruction,
-    ThinkingConfig, UsageMetadata,
-};
-use gpui::{AnyView, App, AsyncApp, Context, Entity, SharedString, Task, Window};
-use http_client::HttpClient;
-use language_model::{
-    AuthenticateError, ConfigurationViewTargetAgent, LanguageModelCompletionError,
-    LanguageModelCompletionEvent, LanguageModelToolChoice, LanguageModelToolSchemaFormat,
-    LanguageModelToolUse, LanguageModelToolUseId, MessageContent, StopReason,
-};
-use language_model::{
-    LanguageModel, LanguageModelId, LanguageModelName, LanguageModelProvider,
-    LanguageModelProviderId, LanguageModelProviderName, LanguageModelProviderState,
-    LanguageModelRequest, RateLimiter, Role,
-};
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-pub use settings::GoogleAvailableModel as AvailableModel;
-use settings::{Settings, SettingsStore};
-use std::pin::Pin;
-use std::sync::{
-    Arc, LazyLock,
-    atomic::{self, AtomicU64},
-};
-use strum::IntoEnumIterator;
-use ui::{List, prelude::*};
-use ui_input::InputField;
-use util::ResultExt;
-use zed_env_vars::EnvVar;
-
-use crate::api_key::ApiKey;
-use crate::api_key::ApiKeyState;
-use crate::ui::{ConfiguredApiCard, InstructionListItem};
-
-const PROVIDER_ID: LanguageModelProviderId = language_model::GOOGLE_PROVIDER_ID;
-const PROVIDER_NAME: LanguageModelProviderName = language_model::GOOGLE_PROVIDER_NAME;
-
-#[derive(Default, Clone, Debug, PartialEq)]
-pub struct GoogleSettings {
-    pub api_url: String,
-    pub available_models: Vec<AvailableModel>,
-}
-
-#[derive(Clone, Copy, Debug, Default, PartialEq, Serialize, Deserialize, JsonSchema)]
-#[serde(tag = "type", rename_all = "lowercase")]
-pub enum ModelMode {
-    #[default]
-    Default,
-    Thinking {
-        /// The maximum number of tokens to use for reasoning. Must be lower than the model's `max_output_tokens`.
-        budget_tokens: Option<u32>,
-    },
-}
-
-pub struct GoogleLanguageModelProvider {
-    http_client: Arc<dyn HttpClient>,
-    state: Entity<State>,
-}
-
-pub struct State {
-    api_key_state: ApiKeyState,
-}
-
-const GEMINI_API_KEY_VAR_NAME: &str = "GEMINI_API_KEY";
-const GOOGLE_AI_API_KEY_VAR_NAME: &str = "GOOGLE_AI_API_KEY";
-
-static API_KEY_ENV_VAR: LazyLock<EnvVar> = LazyLock::new(|| {
-    // Try GEMINI_API_KEY first as primary, fallback to GOOGLE_AI_API_KEY
-    EnvVar::new(GEMINI_API_KEY_VAR_NAME.into()).or(EnvVar::new(GOOGLE_AI_API_KEY_VAR_NAME.into()))
-});
-
-impl State {
-    fn is_authenticated(&self) -> bool {
-        self.api_key_state.has_key()
-    }
-
-    fn set_api_key(&mut self, api_key: Option<String>, cx: &mut Context<Self>) -> Task<Result<()>> {
-        let api_url = GoogleLanguageModelProvider::api_url(cx);
-        self.api_key_state
-            .store(api_url, api_key, |this| &mut this.api_key_state, cx)
-    }
-
-    fn authenticate(&mut self, cx: &mut Context<Self>) -> Task<Result<(), AuthenticateError>> {
-        let api_url = GoogleLanguageModelProvider::api_url(cx);
-        self.api_key_state.load_if_needed(
-            api_url,
-            &API_KEY_ENV_VAR,
-            |this| &mut this.api_key_state,
-            cx,
-        )
-    }
-}
-
-impl GoogleLanguageModelProvider {
-    pub fn new(http_client: Arc<dyn HttpClient>, cx: &mut App) -> Self {
-        let state = cx.new(|cx| {
-            cx.observe_global::<SettingsStore>(|this: &mut State, cx| {
-                let api_url = Self::api_url(cx);
-                this.api_key_state.handle_url_change(
-                    api_url,
-                    &API_KEY_ENV_VAR,
-                    |this| &mut this.api_key_state,
-                    cx,
-                );
-                cx.notify();
-            })
-            .detach();
-            State {
-                api_key_state: ApiKeyState::new(Self::api_url(cx)),
-            }
-        });
-
-        Self { http_client, state }
-    }
-
-    fn create_language_model(&self, model: google_ai::Model) -> Arc<dyn LanguageModel> {
-        Arc::new(GoogleLanguageModel {
-            id: LanguageModelId::from(model.id().to_string()),
-            model,
-            state: self.state.clone(),
-            http_client: self.http_client.clone(),
-            request_limiter: RateLimiter::new(4),
-        })
-    }
-
-    pub fn api_key_for_gemini_cli(cx: &mut App) -> Task<Result<String>> {
-        if let Some(key) = API_KEY_ENV_VAR.value.clone() {
-            return Task::ready(Ok(key));
-        }
-        let credentials_provider = <dyn CredentialsProvider>::global(cx);
-        let api_url = Self::api_url(cx).to_string();
-        cx.spawn(async move |cx| {
-            Ok(
-                ApiKey::load_from_system_keychain(&api_url, credentials_provider.as_ref(), cx)
-                    .await?
-                    .key()
-                    .to_string(),
-            )
-        })
-    }
-
-    fn settings(cx: &App) -> &GoogleSettings {
-        &crate::AllLanguageModelSettings::get_global(cx).google
-    }
-
-    fn api_url(cx: &App) -> SharedString {
-        let api_url = &Self::settings(cx).api_url;
-        if api_url.is_empty() {
-            google_ai::API_URL.into()
-        } else {
-            SharedString::new(api_url.as_str())
-        }
-    }
-}
-
-impl LanguageModelProviderState for GoogleLanguageModelProvider {
-    type ObservableEntity = State;
-
-    fn observable_entity(&self) -> Option<Entity<Self::ObservableEntity>> {
-        Some(self.state.clone())
-    }
-}
-
-impl LanguageModelProvider for GoogleLanguageModelProvider {
-    fn id(&self) -> LanguageModelProviderId {
-        PROVIDER_ID
-    }
-
-    fn name(&self) -> LanguageModelProviderName {
-        PROVIDER_NAME
-    }
-
-    fn icon(&self) -> IconName {
-        IconName::AiGoogle
-    }
-
-    fn default_model(&self, _cx: &App) -> Option<Arc<dyn LanguageModel>> {
-        Some(self.create_language_model(google_ai::Model::default()))
-    }
-
-    fn default_fast_model(&self, _cx: &App) -> Option<Arc<dyn LanguageModel>> {
-        Some(self.create_language_model(google_ai::Model::default_fast()))
-    }
-
-    fn provided_models(&self, cx: &App) -> Vec<Arc<dyn LanguageModel>> {
-        let mut models = BTreeMap::default();
-
-        // Add base models from google_ai::Model::iter()
-        for model in google_ai::Model::iter() {
-            if !matches!(model, google_ai::Model::Custom { .. }) {
-                models.insert(model.id().to_string(), model);
-            }
-        }
-
-        // Override with available models from settings
-        for model in &GoogleLanguageModelProvider::settings(cx).available_models {
-            models.insert(
-                model.name.clone(),
-                google_ai::Model::Custom {
-                    name: model.name.clone(),
-                    display_name: model.display_name.clone(),
-                    max_tokens: model.max_tokens,
-                    mode: model.mode.unwrap_or_default(),
-                },
-            );
-        }
-
-        models
-            .into_values()
-            .map(|model| {
-                Arc::new(GoogleLanguageModel {
-                    id: LanguageModelId::from(model.id().to_string()),
-                    model,
-                    state: self.state.clone(),
-                    http_client: self.http_client.clone(),
-                    request_limiter: RateLimiter::new(4),
-                }) as Arc<dyn LanguageModel>
-            })
-            .collect()
-    }
-
-    fn is_authenticated(&self, cx: &App) -> bool {
-        self.state.read(cx).is_authenticated()
-    }
-
-    fn authenticate(&self, cx: &mut App) -> Task<Result<(), AuthenticateError>> {
-        self.state.update(cx, |state, cx| state.authenticate(cx))
-    }
-
-    fn configuration_view(
-        &self,
-        target_agent: language_model::ConfigurationViewTargetAgent,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> AnyView {
-        cx.new(|cx| ConfigurationView::new(self.state.clone(), target_agent, window, cx))
-            .into()
-    }
-
-    fn reset_credentials(&self, cx: &mut App) -> Task<Result<()>> {
-        self.state
-            .update(cx, |state, cx| state.set_api_key(None, cx))
-    }
-}
-
-pub struct GoogleLanguageModel {
-    id: LanguageModelId,
-    model: google_ai::Model,
-    state: Entity<State>,
-    http_client: Arc<dyn HttpClient>,
-    request_limiter: RateLimiter,
-}
-
-impl GoogleLanguageModel {
-    fn stream_completion(
-        &self,
-        request: google_ai::GenerateContentRequest,
-        cx: &AsyncApp,
-    ) -> BoxFuture<
-        'static,
-        Result<futures::stream::BoxStream<'static, Result<GenerateContentResponse>>>,
-    > {
-        let http_client = self.http_client.clone();
-
-        let Ok((api_key, api_url)) = self.state.read_with(cx, |state, cx| {
-            let api_url = GoogleLanguageModelProvider::api_url(cx);
-            (state.api_key_state.key(&api_url), api_url)
-        }) else {
-            return future::ready(Err(anyhow!("App state dropped"))).boxed();
-        };
-
-        async move {
-            let api_key = api_key.context("Missing Google API key")?;
-            let request = google_ai::stream_generate_content(
-                http_client.as_ref(),
-                &api_url,
-                &api_key,
-                request,
-            );
-            request.await.context("failed to stream completion")
-        }
-        .boxed()
-    }
-}
-
-impl LanguageModel for GoogleLanguageModel {
-    fn id(&self) -> LanguageModelId {
-        self.id.clone()
-    }
-
-    fn name(&self) -> LanguageModelName {
-        LanguageModelName::from(self.model.display_name().to_string())
-    }
-
-    fn provider_id(&self) -> LanguageModelProviderId {
-        PROVIDER_ID
-    }
-
-    fn provider_name(&self) -> LanguageModelProviderName {
-        PROVIDER_NAME
-    }
-
-    fn supports_tools(&self) -> bool {
-        self.model.supports_tools()
-    }
-
-    fn supports_images(&self) -> bool {
-        self.model.supports_images()
-    }
-
-    fn supports_tool_choice(&self, choice: LanguageModelToolChoice) -> bool {
-        match choice {
-            LanguageModelToolChoice::Auto
-            | LanguageModelToolChoice::Any
-            | LanguageModelToolChoice::None => true,
-        }
-    }
-
-    fn tool_input_format(&self) -> LanguageModelToolSchemaFormat {
-        LanguageModelToolSchemaFormat::JsonSchemaSubset
-    }
-
-    fn telemetry_id(&self) -> String {
-        format!("google/{}", self.model.request_id())
-    }
-
-    fn max_token_count(&self) -> u64 {
-        self.model.max_token_count()
-    }
-
-    fn max_output_tokens(&self) -> Option<u64> {
-        self.model.max_output_tokens()
-    }
-
-    fn count_tokens(
-        &self,
-        request: LanguageModelRequest,
-        cx: &App,
-    ) -> BoxFuture<'static, Result<u64>> {
-        let model_id = self.model.request_id().to_string();
-        let request = into_google(request, model_id, self.model.mode());
-        let http_client = self.http_client.clone();
-        let api_url = GoogleLanguageModelProvider::api_url(cx);
-        let api_key = self.state.read(cx).api_key_state.key(&api_url);
-
-        async move {
-            let Some(api_key) = api_key else {
-                return Err(LanguageModelCompletionError::NoApiKey {
-                    provider: PROVIDER_NAME,
-                }
-                .into());
-            };
-            let response = google_ai::count_tokens(
-                http_client.as_ref(),
-                &api_url,
-                &api_key,
-                google_ai::CountTokensRequest {
-                    generate_content_request: request,
-                },
-            )
-            .await?;
-            Ok(response.total_tokens)
-        }
-        .boxed()
-    }
-
-    fn stream_completion(
-        &self,
-        request: LanguageModelRequest,
-        cx: &AsyncApp,
-    ) -> BoxFuture<
-        'static,
-        Result<
-            futures::stream::BoxStream<
-                'static,
-                Result<LanguageModelCompletionEvent, LanguageModelCompletionError>,
-            >,
-            LanguageModelCompletionError,
-        >,
-    > {
-        let request = into_google(
-            request,
-            self.model.request_id().to_string(),
-            self.model.mode(),
-        );
-        let request = self.stream_completion(request, cx);
-        let future = self.request_limiter.stream(async move {
-            let response = request.await.map_err(LanguageModelCompletionError::from)?;
-            Ok(GoogleEventMapper::new().map_stream(response))
-        });
-        async move { Ok(future.await?.boxed()) }.boxed()
-    }
-}
-
-pub fn into_google(
-    mut request: LanguageModelRequest,
-    model_id: String,
-    mode: GoogleModelMode,
-) -> google_ai::GenerateContentRequest {
-    fn map_content(content: Vec<MessageContent>) -> Vec<Part> {
-        content
-            .into_iter()
-            .flat_map(|content| match content {
-                language_model::MessageContent::Text(text) => {
-                    if !text.is_empty() {
-                        vec![Part::TextPart(google_ai::TextPart { text })]
-                    } else {
-                        vec![]
-                    }
-                }
-                language_model::MessageContent::Thinking {
-                    text: _,
-                    signature: Some(signature),
-                } => {
-                    if !signature.is_empty() {
-                        vec![Part::ThoughtPart(google_ai::ThoughtPart {
-                            thought: true,
-                            thought_signature: signature,
-                        })]
-                    } else {
-                        vec![]
-                    }
-                }
-                language_model::MessageContent::Thinking { .. } => {
-                    vec![]
-                }
-                language_model::MessageContent::RedactedThinking(_) => vec![],
-                language_model::MessageContent::Image(image) => {
-                    vec![Part::InlineDataPart(google_ai::InlineDataPart {
-                        inline_data: google_ai::GenerativeContentBlob {
-                            mime_type: "image/png".to_string(),
-                            data: image.source.to_string(),
-                        },
-                    })]
-                }
-                language_model::MessageContent::ToolUse(tool_use) => {
-                    // Normalize empty string signatures to None
-                    let thought_signature = tool_use.thought_signature.filter(|s| !s.is_empty());
-
-                    vec![Part::FunctionCallPart(google_ai::FunctionCallPart {
-                        function_call: google_ai::FunctionCall {
-                            name: tool_use.name.to_string(),
-                            args: tool_use.input,
-                        },
-                        thought_signature,
-                    })]
-                }
-                language_model::MessageContent::ToolResult(tool_result) => {
-                    match tool_result.content {
-                        language_model::LanguageModelToolResultContent::Text(text) => {
-                            vec![Part::FunctionResponsePart(
-                                google_ai::FunctionResponsePart {
-                                    function_response: google_ai::FunctionResponse {
-                                        name: tool_result.tool_name.to_string(),
-                                        // The API expects a valid JSON object
-                                        response: serde_json::json!({
-                                            "output": text
-                                        }),
-                                    },
-                                },
-                            )]
-                        }
-                        language_model::LanguageModelToolResultContent::Image(image) => {
-                            vec![
-                                Part::FunctionResponsePart(google_ai::FunctionResponsePart {
-                                    function_response: google_ai::FunctionResponse {
-                                        name: tool_result.tool_name.to_string(),
-                                        // The API expects a valid JSON object
-                                        response: serde_json::json!({
-                                            "output": "Tool responded with an image"
-                                        }),
-                                    },
-                                }),
-                                Part::InlineDataPart(google_ai::InlineDataPart {
-                                    inline_data: google_ai::GenerativeContentBlob {
-                                        mime_type: "image/png".to_string(),
-                                        data: image.source.to_string(),
-                                    },
-                                }),
-                            ]
-                        }
-                    }
-                }
-            })
-            .collect()
-    }
-
-    let system_instructions = if request
-        .messages
-        .first()
-        .is_some_and(|msg| matches!(msg.role, Role::System))
-    {
-        let message = request.messages.remove(0);
-        Some(SystemInstruction {
-            parts: map_content(message.content),
-        })
-    } else {
-        None
-    };
-
-    google_ai::GenerateContentRequest {
-        model: google_ai::ModelName { model_id },
-        system_instruction: system_instructions,
-        contents: request
-            .messages
-            .into_iter()
-            .filter_map(|message| {
-                let parts = map_content(message.content);
-                if parts.is_empty() {
-                    None
-                } else {
-                    Some(google_ai::Content {
-                        parts,
-                        role: match message.role {
-                            Role::User => google_ai::Role::User,
-                            Role::Assistant => google_ai::Role::Model,
-                            Role::System => google_ai::Role::User, // Google AI doesn't have a system role
-                        },
-                    })
-                }
-            })
-            .collect(),
-        generation_config: Some(google_ai::GenerationConfig {
-            candidate_count: Some(1),
-            stop_sequences: Some(request.stop),
-            max_output_tokens: None,
-            temperature: request.temperature.map(|t| t as f64).or(Some(1.0)),
-            thinking_config: match (request.thinking_allowed, mode) {
-                (true, GoogleModelMode::Thinking { budget_tokens }) => {
-                    budget_tokens.map(|thinking_budget| ThinkingConfig { thinking_budget })
-                }
-                _ => None,
-            },
-            top_p: None,
-            top_k: None,
-        }),
-        safety_settings: None,
-        tools: (!request.tools.is_empty()).then(|| {
-            vec![google_ai::Tool {
-                function_declarations: request
-                    .tools
-                    .into_iter()
-                    .map(|tool| FunctionDeclaration {
-                        name: tool.name,
-                        description: tool.description,
-                        parameters: tool.input_schema,
-                    })
-                    .collect(),
-            }]
-        }),
-        tool_config: request.tool_choice.map(|choice| google_ai::ToolConfig {
-            function_calling_config: google_ai::FunctionCallingConfig {
-                mode: match choice {
-                    LanguageModelToolChoice::Auto => google_ai::FunctionCallingMode::Auto,
-                    LanguageModelToolChoice::Any => google_ai::FunctionCallingMode::Any,
-                    LanguageModelToolChoice::None => google_ai::FunctionCallingMode::None,
-                },
-                allowed_function_names: None,
-            },
-        }),
-    }
-}
-
-pub struct GoogleEventMapper {
-    usage: UsageMetadata,
-    stop_reason: StopReason,
-}
-
-impl GoogleEventMapper {
-    pub fn new() -> Self {
-        Self {
-            usage: UsageMetadata::default(),
-            stop_reason: StopReason::EndTurn,
-        }
-    }
-
-    pub fn map_stream(
-        mut self,
-        events: Pin<Box<dyn Send + Stream<Item = Result<GenerateContentResponse>>>>,
-    ) -> impl Stream<Item = Result<LanguageModelCompletionEvent, LanguageModelCompletionError>>
-    {
-        events
-            .map(Some)
-            .chain(futures::stream::once(async { None }))
-            .flat_map(move |event| {
-                futures::stream::iter(match event {
-                    Some(Ok(event)) => self.map_event(event),
-                    Some(Err(error)) => {
-                        vec![Err(LanguageModelCompletionError::from(error))]
-                    }
-                    None => vec![Ok(LanguageModelCompletionEvent::Stop(self.stop_reason))],
-                })
-            })
-    }
-
-    pub fn map_event(
-        &mut self,
-        event: GenerateContentResponse,
-    ) -> Vec<Result<LanguageModelCompletionEvent, LanguageModelCompletionError>> {
-        static TOOL_CALL_COUNTER: AtomicU64 = AtomicU64::new(0);
-
-        let mut events: Vec<_> = Vec::new();
-        let mut wants_to_use_tool = false;
-        if let Some(usage_metadata) = event.usage_metadata {
-            update_usage(&mut self.usage, &usage_metadata);
-            events.push(Ok(LanguageModelCompletionEvent::UsageUpdate(
-                convert_usage(&self.usage),
-            )))
-        }
-
-        if let Some(prompt_feedback) = event.prompt_feedback
-            && let Some(block_reason) = prompt_feedback.block_reason.as_deref()
-        {
-            self.stop_reason = match block_reason {
-                "SAFETY" | "OTHER" | "BLOCKLIST" | "PROHIBITED_CONTENT" | "IMAGE_SAFETY" => {
-                    StopReason::Refusal
-                }
-                _ => {
-                    log::error!("Unexpected Google block_reason: {block_reason}");
-                    StopReason::Refusal
-                }
-            };
-            events.push(Ok(LanguageModelCompletionEvent::Stop(self.stop_reason)));
-
-            return events;
-        }
-
-        if let Some(candidates) = event.candidates {
-            for candidate in candidates {
-                if let Some(finish_reason) = candidate.finish_reason.as_deref() {
-                    self.stop_reason = match finish_reason {
-                        "STOP" => StopReason::EndTurn,
-                        "MAX_TOKENS" => StopReason::MaxTokens,
-                        _ => {
-                            log::error!("Unexpected google finish_reason: {finish_reason}");
-                            StopReason::EndTurn
-                        }
-                    };
-                }
-                candidate
-                    .content
-                    .parts
-                    .into_iter()
-                    .for_each(|part| match part {
-                        Part::TextPart(text_part) => {
-                            events.push(Ok(LanguageModelCompletionEvent::Text(text_part.text)))
-                        }
-                        Part::InlineDataPart(_) => {}
-                        Part::FunctionCallPart(function_call_part) => {
-                            wants_to_use_tool = true;
-                            let name: Arc<str> = function_call_part.function_call.name.into();
-                            let next_tool_id =
-                                TOOL_CALL_COUNTER.fetch_add(1, atomic::Ordering::SeqCst);
-                            let id: LanguageModelToolUseId =
-                                format!("{}-{}", name, next_tool_id).into();
-
-                            // Normalize empty string signatures to None
-                            let thought_signature = function_call_part
-                                .thought_signature
-                                .filter(|s| !s.is_empty());
-
-                            events.push(Ok(LanguageModelCompletionEvent::ToolUse(
-                                LanguageModelToolUse {
-                                    id,
-                                    name,
-                                    is_input_complete: true,
-                                    raw_input: function_call_part.function_call.args.to_string(),
-                                    input: function_call_part.function_call.args,
-                                    thought_signature,
-                                },
-                            )));
-                        }
-                        Part::FunctionResponsePart(_) => {}
-                        Part::ThoughtPart(part) => {
-                            events.push(Ok(LanguageModelCompletionEvent::Thinking {
-                                text: "(Encrypted thought)".to_string(), // TODO: Can we populate this from thought summaries?
-                                signature: Some(part.thought_signature),
-                            }));
-                        }
-                    });
-            }
-        }
-
-        // Even when Gemini wants to use a Tool, the API
-        // responds with `finish_reason: STOP`
-        if wants_to_use_tool {
-            self.stop_reason = StopReason::ToolUse;
-            events.push(Ok(LanguageModelCompletionEvent::Stop(StopReason::ToolUse)));
-        }
-        events
-    }
-}
-
-pub fn count_google_tokens(
-    request: LanguageModelRequest,
-    cx: &App,
-) -> BoxFuture<'static, Result<u64>> {
-    // We couldn't use the GoogleLanguageModelProvider to count tokens because the github copilot doesn't have the access to google_ai directly.
-    // So we have to use tokenizer from tiktoken_rs to count tokens.
-    cx.background_spawn(async move {
-        let messages = request
-            .messages
-            .into_iter()
-            .map(|message| tiktoken_rs::ChatCompletionRequestMessage {
-                role: match message.role {
-                    Role::User => "user".into(),
-                    Role::Assistant => "assistant".into(),
-                    Role::System => "system".into(),
-                },
-                content: Some(message.string_contents()),
-                name: None,
-                function_call: None,
-            })
-            .collect::<Vec<_>>();
-
-        // Tiktoken doesn't yet support these models, so we manually use the
-        // same tokenizer as GPT-4.
-        tiktoken_rs::num_tokens_from_messages("gpt-4", &messages).map(|tokens| tokens as u64)
-    })
-    .boxed()
-}
-
-fn update_usage(usage: &mut UsageMetadata, new: &UsageMetadata) {
-    if let Some(prompt_token_count) = new.prompt_token_count {
-        usage.prompt_token_count = Some(prompt_token_count);
-    }
-    if let Some(cached_content_token_count) = new.cached_content_token_count {
-        usage.cached_content_token_count = Some(cached_content_token_count);
-    }
-    if let Some(candidates_token_count) = new.candidates_token_count {
-        usage.candidates_token_count = Some(candidates_token_count);
-    }
-    if let Some(tool_use_prompt_token_count) = new.tool_use_prompt_token_count {
-        usage.tool_use_prompt_token_count = Some(tool_use_prompt_token_count);
-    }
-    if let Some(thoughts_token_count) = new.thoughts_token_count {
-        usage.thoughts_token_count = Some(thoughts_token_count);
-    }
-    if let Some(total_token_count) = new.total_token_count {
-        usage.total_token_count = Some(total_token_count);
-    }
-}
-
-fn convert_usage(usage: &UsageMetadata) -> language_model::TokenUsage {
-    let prompt_tokens = usage.prompt_token_count.unwrap_or(0);
-    let cached_tokens = usage.cached_content_token_count.unwrap_or(0);
-    let input_tokens = prompt_tokens - cached_tokens;
-    let output_tokens = usage.candidates_token_count.unwrap_or(0);
-
-    language_model::TokenUsage {
-        input_tokens,
-        output_tokens,
-        cache_read_input_tokens: cached_tokens,
-        cache_creation_input_tokens: 0,
-    }
-}
-
-struct ConfigurationView {
-    api_key_editor: Entity<InputField>,
-    state: Entity<State>,
-    target_agent: language_model::ConfigurationViewTargetAgent,
-    load_credentials_task: Option<Task<()>>,
-}
-
-impl ConfigurationView {
-    fn new(
-        state: Entity<State>,
-        target_agent: language_model::ConfigurationViewTargetAgent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        cx.observe(&state, |_, _, cx| {
-            cx.notify();
-        })
-        .detach();
-
-        let load_credentials_task = Some(cx.spawn_in(window, {
-            let state = state.clone();
-            async move |this, cx| {
-                if let Some(task) = state
-                    .update(cx, |state, cx| state.authenticate(cx))
-                    .log_err()
-                {
-                    // We don't log an error, because "not signed in" is also an error.
-                    let _ = task.await;
-                }
-                this.update(cx, |this, cx| {
-                    this.load_credentials_task = None;
-                    cx.notify();
-                })
-                .log_err();
-            }
-        }));
-
-        Self {
-            api_key_editor: cx.new(|cx| InputField::new(window, cx, "AIzaSy...")),
-            target_agent,
-            state,
-            load_credentials_task,
-        }
-    }
-
-    fn save_api_key(&mut self, _: &menu::Confirm, window: &mut Window, cx: &mut Context<Self>) {
-        let api_key = self.api_key_editor.read(cx).text(cx).trim().to_string();
-        if api_key.is_empty() {
-            return;
-        }
-
-        // url changes can cause the editor to be displayed again
-        self.api_key_editor
-            .update(cx, |editor, cx| editor.set_text("", window, cx));
-
-        let state = self.state.clone();
-        cx.spawn_in(window, async move |_, cx| {
-            state
-                .update(cx, |state, cx| state.set_api_key(Some(api_key), cx))?
-                .await
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn reset_api_key(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.api_key_editor
-            .update(cx, |editor, cx| editor.set_text("", window, cx));
-
-        let state = self.state.clone();
-        cx.spawn_in(window, async move |_, cx| {
-            state
-                .update(cx, |state, cx| state.set_api_key(None, cx))?
-                .await
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn should_render_editor(&self, cx: &mut Context<Self>) -> bool {
-        !self.state.read(cx).is_authenticated()
-    }
-}
-
-impl Render for ConfigurationView {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let env_var_set = self.state.read(cx).api_key_state.is_from_env_var();
-        let configured_card_label = if env_var_set {
-            format!(
-                "API key set in {} environment variable",
-                API_KEY_ENV_VAR.name
-            )
-        } else {
-            let api_url = GoogleLanguageModelProvider::api_url(cx);
-            if api_url == google_ai::API_URL {
-                "API key configured".to_string()
-            } else {
-                format!("API key configured for {}", api_url)
-            }
-        };
-
-        if self.load_credentials_task.is_some() {
-            div()
-                .child(Label::new("Loading credentials..."))
-                .into_any_element()
-        } else if self.should_render_editor(cx) {
-            v_flex()
-                .size_full()
-                .on_action(cx.listener(Self::save_api_key))
-                .child(Label::new(format!("To use {}, you need to add an API key. Follow these steps:", match &self.target_agent {
-                    ConfigurationViewTargetAgent::ZedAgent => "Zed's agent with Google AI".into(),
-                    ConfigurationViewTargetAgent::Other(agent) => agent.clone(),
-                })))
-                .child(
-                    List::new()
-                        .child(InstructionListItem::new(
-                            "Create one by visiting",
-                            Some("Google AI's console"),
-                            Some("https://aistudio.google.com/app/apikey"),
-                        ))
-                        .child(InstructionListItem::text_only(
-                            "Paste your API key below and hit enter to start using the assistant",
-                        )),
-                )
-                .child(self.api_key_editor.clone())
-                .child(
-                    Label::new(
-                        format!("You can also assign the {GEMINI_API_KEY_VAR_NAME} environment variable and restart Zed."),
-                    )
-                    .size(LabelSize::Small).color(Color::Muted),
-                )
-                .into_any_element()
-        } else {
-            ConfiguredApiCard::new(configured_card_label)
-                .disabled(env_var_set)
-                .on_click(cx.listener(|this, _, window, cx| this.reset_api_key(window, cx)))
-                .when(env_var_set, |this| {
-                    this.tooltip_label(format!("To reset your API key, make sure {GEMINI_API_KEY_VAR_NAME} and {GOOGLE_AI_API_KEY_VAR_NAME} environment variables are unset."))
-                })
-                .into_any_element()
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use google_ai::{
-        Content, FunctionCall, FunctionCallPart, GenerateContentCandidate, GenerateContentResponse,
-        Part, Role as GoogleRole, TextPart,
-    };
-    use language_model::{LanguageModelToolUseId, MessageContent, Role};
-    use serde_json::json;
-
-    #[test]
-    fn test_function_call_with_signature_creates_tool_use_with_signature() {
-        let mut mapper = GoogleEventMapper::new();
-
-        let response = GenerateContentResponse {
-            candidates: Some(vec![GenerateContentCandidate {
-                index: Some(0),
-                content: Content {
-                    parts: vec![Part::FunctionCallPart(FunctionCallPart {
-                        function_call: FunctionCall {
-                            name: "test_function".to_string(),
-                            args: json!({"arg": "value"}),
-                        },
-                        thought_signature: Some("test_signature_123".to_string()),
-                    })],
-                    role: GoogleRole::Model,
-                },
-                finish_reason: None,
-                finish_message: None,
-                safety_ratings: None,
-                citation_metadata: None,
-            }]),
-            prompt_feedback: None,
-            usage_metadata: None,
-        };
-
-        let events = mapper.map_event(response);
-
-        assert_eq!(events.len(), 2); // ToolUse event + Stop event
-
-        if let Ok(LanguageModelCompletionEvent::ToolUse(tool_use)) = &events[0] {
-            assert_eq!(tool_use.name.as_ref(), "test_function");
-            assert_eq!(
-                tool_use.thought_signature.as_deref(),
-                Some("test_signature_123")
-            );
-        } else {
-            panic!("Expected ToolUse event");
-        }
-    }
-
-    #[test]
-    fn test_function_call_without_signature_has_none() {
-        let mut mapper = GoogleEventMapper::new();
-
-        let response = GenerateContentResponse {
-            candidates: Some(vec![GenerateContentCandidate {
-                index: Some(0),
-                content: Content {
-                    parts: vec![Part::FunctionCallPart(FunctionCallPart {
-                        function_call: FunctionCall {
-                            name: "test_function".to_string(),
-                            args: json!({"arg": "value"}),
-                        },
-                        thought_signature: None,
-                    })],
-                    role: GoogleRole::Model,
-                },
-                finish_reason: None,
-                finish_message: None,
-                safety_ratings: None,
-                citation_metadata: None,
-            }]),
-            prompt_feedback: None,
-            usage_metadata: None,
-        };
-
-        let events = mapper.map_event(response);
-
-        if let Ok(LanguageModelCompletionEvent::ToolUse(tool_use)) = &events[0] {
-            assert_eq!(tool_use.thought_signature, None);
-        } else {
-            panic!("Expected ToolUse event");
-        }
-    }
-
-    #[test]
-    fn test_empty_string_signature_normalized_to_none() {
-        let mut mapper = GoogleEventMapper::new();
-
-        let response = GenerateContentResponse {
-            candidates: Some(vec![GenerateContentCandidate {
-                index: Some(0),
-                content: Content {
-                    parts: vec![Part::FunctionCallPart(FunctionCallPart {
-                        function_call: FunctionCall {
-                            name: "test_function".to_string(),
-                            args: json!({"arg": "value"}),
-                        },
-                        thought_signature: Some("".to_string()),
-                    })],
-                    role: GoogleRole::Model,
-                },
-                finish_reason: None,
-                finish_message: None,
-                safety_ratings: None,
-                citation_metadata: None,
-            }]),
-            prompt_feedback: None,
-            usage_metadata: None,
-        };
-
-        let events = mapper.map_event(response);
-
-        if let Ok(LanguageModelCompletionEvent::ToolUse(tool_use)) = &events[0] {
-            assert_eq!(tool_use.thought_signature, None);
-        } else {
-            panic!("Expected ToolUse event");
-        }
-    }
-
-    #[test]
-    fn test_parallel_function_calls_preserve_signatures() {
-        let mut mapper = GoogleEventMapper::new();
-
-        let response = GenerateContentResponse {
-            candidates: Some(vec![GenerateContentCandidate {
-                index: Some(0),
-                content: Content {
-                    parts: vec![
-                        Part::FunctionCallPart(FunctionCallPart {
-                            function_call: FunctionCall {
-                                name: "function_1".to_string(),
-                                args: json!({"arg": "value1"}),
-                            },
-                            thought_signature: Some("signature_1".to_string()),
-                        }),
-                        Part::FunctionCallPart(FunctionCallPart {
-                            function_call: FunctionCall {
-                                name: "function_2".to_string(),
-                                args: json!({"arg": "value2"}),
-                            },
-                            thought_signature: None,
-                        }),
-                    ],
-                    role: GoogleRole::Model,
-                },
-                finish_reason: None,
-                finish_message: None,
-                safety_ratings: None,
-                citation_metadata: None,
-            }]),
-            prompt_feedback: None,
-            usage_metadata: None,
-        };
-
-        let events = mapper.map_event(response);
-
-        assert_eq!(events.len(), 3); // 2 ToolUse events + Stop event
-
-        if let Ok(LanguageModelCompletionEvent::ToolUse(tool_use)) = &events[0] {
-            assert_eq!(tool_use.name.as_ref(), "function_1");
-            assert_eq!(tool_use.thought_signature.as_deref(), Some("signature_1"));
-        } else {
-            panic!("Expected ToolUse event for function_1");
-        }
-
-        if let Ok(LanguageModelCompletionEvent::ToolUse(tool_use)) = &events[1] {
-            assert_eq!(tool_use.name.as_ref(), "function_2");
-            assert_eq!(tool_use.thought_signature, None);
-        } else {
-            panic!("Expected ToolUse event for function_2");
-        }
-    }
-
-    #[test]
-    fn test_tool_use_with_signature_converts_to_function_call_part() {
-        let tool_use = language_model::LanguageModelToolUse {
-            id: LanguageModelToolUseId::from("test_id"),
-            name: "test_function".into(),
-            raw_input: json!({"arg": "value"}).to_string(),
-            input: json!({"arg": "value"}),
-            is_input_complete: true,
-            thought_signature: Some("test_signature_456".to_string()),
-        };
-
-        let request = super::into_google(
-            LanguageModelRequest {
-                messages: vec![language_model::LanguageModelRequestMessage {
-                    role: Role::Assistant,
-                    content: vec![MessageContent::ToolUse(tool_use)],
-                    cache: false,
-                    reasoning_details: None,
-                }],
-                ..Default::default()
-            },
-            "gemini-2.5-flash".to_string(),
-            GoogleModelMode::Default,
-        );
-
-        assert_eq!(request.contents[0].parts.len(), 1);
-        if let Part::FunctionCallPart(fc_part) = &request.contents[0].parts[0] {
-            assert_eq!(fc_part.function_call.name, "test_function");
-            assert_eq!(
-                fc_part.thought_signature.as_deref(),
-                Some("test_signature_456")
-            );
-        } else {
-            panic!("Expected FunctionCallPart");
-        }
-    }
-
-    #[test]
-    fn test_tool_use_without_signature_omits_field() {
-        let tool_use = language_model::LanguageModelToolUse {
-            id: LanguageModelToolUseId::from("test_id"),
-            name: "test_function".into(),
-            raw_input: json!({"arg": "value"}).to_string(),
-            input: json!({"arg": "value"}),
-            is_input_complete: true,
-            thought_signature: None,
-        };
-
-        let request = super::into_google(
-            LanguageModelRequest {
-                messages: vec![language_model::LanguageModelRequestMessage {
-                    role: Role::Assistant,
-                    content: vec![MessageContent::ToolUse(tool_use)],
-                    cache: false,
-                    reasoning_details: None,
-                }],
-                ..Default::default()
-            },
-            "gemini-2.5-flash".to_string(),
-            GoogleModelMode::Default,
-        );
-
-        assert_eq!(request.contents[0].parts.len(), 1);
-        if let Part::FunctionCallPart(fc_part) = &request.contents[0].parts[0] {
-            assert_eq!(fc_part.thought_signature, None);
-        } else {
-            panic!("Expected FunctionCallPart");
-        }
-    }
-
-    #[test]
-    fn test_empty_signature_in_tool_use_normalized_to_none() {
-        let tool_use = language_model::LanguageModelToolUse {
-            id: LanguageModelToolUseId::from("test_id"),
-            name: "test_function".into(),
-            raw_input: json!({"arg": "value"}).to_string(),
-            input: json!({"arg": "value"}),
-            is_input_complete: true,
-            thought_signature: Some("".to_string()),
-        };
-
-        let request = super::into_google(
-            LanguageModelRequest {
-                messages: vec![language_model::LanguageModelRequestMessage {
-                    role: Role::Assistant,
-                    content: vec![MessageContent::ToolUse(tool_use)],
-                    cache: false,
-                    reasoning_details: None,
-                }],
-                ..Default::default()
-            },
-            "gemini-2.5-flash".to_string(),
-            GoogleModelMode::Default,
-        );
-
-        if let Part::FunctionCallPart(fc_part) = &request.contents[0].parts[0] {
-            assert_eq!(fc_part.thought_signature, None);
-        } else {
-            panic!("Expected FunctionCallPart");
-        }
-    }
-
-    #[test]
-    fn test_round_trip_preserves_signature() {
-        let mut mapper = GoogleEventMapper::new();
-
-        // Simulate receiving a response from Google with a signature
-        let response = GenerateContentResponse {
-            candidates: Some(vec![GenerateContentCandidate {
-                index: Some(0),
-                content: Content {
-                    parts: vec![Part::FunctionCallPart(FunctionCallPart {
-                        function_call: FunctionCall {
-                            name: "test_function".to_string(),
-                            args: json!({"arg": "value"}),
-                        },
-                        thought_signature: Some("round_trip_sig".to_string()),
-                    })],
-                    role: GoogleRole::Model,
-                },
-                finish_reason: None,
-                finish_message: None,
-                safety_ratings: None,
-                citation_metadata: None,
-            }]),
-            prompt_feedback: None,
-            usage_metadata: None,
-        };
-
-        let events = mapper.map_event(response);
-
-        let tool_use = if let Ok(LanguageModelCompletionEvent::ToolUse(tool_use)) = &events[0] {
-            tool_use.clone()
-        } else {
-            panic!("Expected ToolUse event");
-        };
-
-        // Convert back to Google format
-        let request = super::into_google(
-            LanguageModelRequest {
-                messages: vec![language_model::LanguageModelRequestMessage {
-                    role: Role::Assistant,
-                    content: vec![MessageContent::ToolUse(tool_use)],
-                    cache: false,
-                    reasoning_details: None,
-                }],
-                ..Default::default()
-            },
-            "gemini-2.5-flash".to_string(),
-            GoogleModelMode::Default,
-        );
-
-        // Verify signature is preserved
-        if let Part::FunctionCallPart(fc_part) = &request.contents[0].parts[0] {
-            assert_eq!(fc_part.thought_signature.as_deref(), Some("round_trip_sig"));
-        } else {
-            panic!("Expected FunctionCallPart");
-        }
-    }
-
-    #[test]
-    fn test_mixed_text_and_function_call_with_signature() {
-        let mut mapper = GoogleEventMapper::new();
-
-        let response = GenerateContentResponse {
-            candidates: Some(vec![GenerateContentCandidate {
-                index: Some(0),
-                content: Content {
-                    parts: vec![
-                        Part::TextPart(TextPart {
-                            text: "I'll help with that.".to_string(),
-                        }),
-                        Part::FunctionCallPart(FunctionCallPart {
-                            function_call: FunctionCall {
-                                name: "helper_function".to_string(),
-                                args: json!({"query": "help"}),
-                            },
-                            thought_signature: Some("mixed_sig".to_string()),
-                        }),
-                    ],
-                    role: GoogleRole::Model,
-                },
-                finish_reason: None,
-                finish_message: None,
-                safety_ratings: None,
-                citation_metadata: None,
-            }]),
-            prompt_feedback: None,
-            usage_metadata: None,
-        };
-
-        let events = mapper.map_event(response);
-
-        assert_eq!(events.len(), 3); // Text event + ToolUse event + Stop event
-
-        if let Ok(LanguageModelCompletionEvent::Text(text)) = &events[0] {
-            assert_eq!(text, "I'll help with that.");
-        } else {
-            panic!("Expected Text event");
-        }
-
-        if let Ok(LanguageModelCompletionEvent::ToolUse(tool_use)) = &events[1] {
-            assert_eq!(tool_use.name.as_ref(), "helper_function");
-            assert_eq!(tool_use.thought_signature.as_deref(), Some("mixed_sig"));
-        } else {
-            panic!("Expected ToolUse event");
-        }
-    }
-
-    #[test]
-    fn test_special_characters_in_signature_preserved() {
-        let mut mapper = GoogleEventMapper::new();
-
-        let signature_with_special_chars = "sig<>\"'&%$#@!{}[]".to_string();
-
-        let response = GenerateContentResponse {
-            candidates: Some(vec![GenerateContentCandidate {
-                index: Some(0),
-                content: Content {
-                    parts: vec![Part::FunctionCallPart(FunctionCallPart {
-                        function_call: FunctionCall {
-                            name: "test_function".to_string(),
-                            args: json!({"arg": "value"}),
-                        },
-                        thought_signature: Some(signature_with_special_chars.clone()),
-                    })],
-                    role: GoogleRole::Model,
-                },
-                finish_reason: None,
-                finish_message: None,
-                safety_ratings: None,
-                citation_metadata: None,
-            }]),
-            prompt_feedback: None,
-            usage_metadata: None,
-        };
-
-        let events = mapper.map_event(response);
-
-        if let Ok(LanguageModelCompletionEvent::ToolUse(tool_use)) = &events[0] {
-            assert_eq!(
-                tool_use.thought_signature.as_deref(),
-                Some(signature_with_special_chars.as_str())
-            );
-        } else {
-            panic!("Expected ToolUse event");
-        }
-    }
-}
diff --git a/crates/language_models/src/provider/lmstudio.rs b/crates/language_models/src/provider/lmstudio.rs
deleted file mode 100644
index a16bd351a9..0000000000
--- a/crates/language_models/src/provider/lmstudio.rs
+++ /dev/null
@@ -1,777 +0,0 @@
-use anyhow::{Result, anyhow};
-use collections::HashMap;
-use futures::Stream;
-use futures::{FutureExt, StreamExt, future::BoxFuture, stream::BoxStream};
-use gpui::{AnyView, App, AsyncApp, Context, Entity, Subscription, Task};
-use http_client::HttpClient;
-use language_model::{
-    AuthenticateError, LanguageModelCompletionError, LanguageModelCompletionEvent,
-    LanguageModelToolChoice, LanguageModelToolResultContent, LanguageModelToolUse, MessageContent,
-    StopReason, TokenUsage,
-};
-use language_model::{
-    LanguageModel, LanguageModelId, LanguageModelName, LanguageModelProvider,
-    LanguageModelProviderId, LanguageModelProviderName, LanguageModelProviderState,
-    LanguageModelRequest, RateLimiter, Role,
-};
-use lmstudio::{ModelType, get_models};
-pub use settings::LmStudioAvailableModel as AvailableModel;
-use settings::{Settings, SettingsStore};
-use std::pin::Pin;
-use std::str::FromStr;
-use std::{collections::BTreeMap, sync::Arc};
-use ui::{ButtonLike, Indicator, List, prelude::*};
-use util::ResultExt;
-
-use crate::AllLanguageModelSettings;
-use crate::ui::InstructionListItem;
-
-const LMSTUDIO_DOWNLOAD_URL: &str = "https://lmstudio.ai/download";
-const LMSTUDIO_CATALOG_URL: &str = "https://lmstudio.ai/models";
-const LMSTUDIO_SITE: &str = "https://lmstudio.ai/";
-
-const PROVIDER_ID: LanguageModelProviderId = LanguageModelProviderId::new("lmstudio");
-const PROVIDER_NAME: LanguageModelProviderName = LanguageModelProviderName::new("LM Studio");
-
-#[derive(Default, Debug, Clone, PartialEq)]
-pub struct LmStudioSettings {
-    pub api_url: String,
-    pub available_models: Vec<AvailableModel>,
-}
-
-pub struct LmStudioLanguageModelProvider {
-    http_client: Arc<dyn HttpClient>,
-    state: Entity<State>,
-}
-
-pub struct State {
-    http_client: Arc<dyn HttpClient>,
-    available_models: Vec<lmstudio::Model>,
-    fetch_model_task: Option<Task<Result<()>>>,
-    _subscription: Subscription,
-}
-
-impl State {
-    fn is_authenticated(&self) -> bool {
-        !self.available_models.is_empty()
-    }
-
-    fn fetch_models(&mut self, cx: &mut Context<Self>) -> Task<Result<()>> {
-        let settings = &AllLanguageModelSettings::get_global(cx).lmstudio;
-        let http_client = self.http_client.clone();
-        let api_url = settings.api_url.clone();
-
-        // As a proxy for the server being "authenticated", we'll check if its up by fetching the models
-        cx.spawn(async move |this, cx| {
-            let models = get_models(http_client.as_ref(), &api_url, None).await?;
-
-            let mut models: Vec<lmstudio::Model> = models
-                .into_iter()
-                .filter(|model| model.r#type != ModelType::Embeddings)
-                .map(|model| {
-                    lmstudio::Model::new(
-                        &model.id,
-                        None,
-                        model
-                            .loaded_context_length
-                            .or_else(|| model.max_context_length),
-                        model.capabilities.supports_tool_calls(),
-                        model.capabilities.supports_images() || model.r#type == ModelType::Vlm,
-                    )
-                })
-                .collect();
-
-            models.sort_by(|a, b| a.name.cmp(&b.name));
-
-            this.update(cx, |this, cx| {
-                this.available_models = models;
-                cx.notify();
-            })
-        })
-    }
-
-    fn restart_fetch_models_task(&mut self, cx: &mut Context<Self>) {
-        let task = self.fetch_models(cx);
-        self.fetch_model_task.replace(task);
-    }
-
-    fn authenticate(&mut self, cx: &mut Context<Self>) -> Task<Result<(), AuthenticateError>> {
-        if self.is_authenticated() {
-            return Task::ready(Ok(()));
-        }
-
-        let fetch_models_task = self.fetch_models(cx);
-        cx.spawn(async move |_this, _cx| {
-            match fetch_models_task.await {
-                Ok(()) => Ok(()),
-                Err(err) => {
-                    // If any cause in the error chain is an std::io::Error with
-                    // ErrorKind::ConnectionRefused, treat this as "credentials not found"
-                    // (i.e. LM Studio not running).
-                    let mut connection_refused = false;
-                    for cause in err.chain() {
-                        if let Some(io_err) = cause.downcast_ref::<std::io::Error>() {
-                            if io_err.kind() == std::io::ErrorKind::ConnectionRefused {
-                                connection_refused = true;
-                                break;
-                            }
-                        }
-                    }
-                    if connection_refused {
-                        Err(AuthenticateError::ConnectionRefused)
-                    } else {
-                        Err(AuthenticateError::Other(err))
-                    }
-                }
-            }
-        })
-    }
-}
-
-impl LmStudioLanguageModelProvider {
-    pub fn new(http_client: Arc<dyn HttpClient>, cx: &mut App) -> Self {
-        let this = Self {
-            http_client: http_client.clone(),
-            state: cx.new(|cx| {
-                let subscription = cx.observe_global::<SettingsStore>({
-                    let mut settings = AllLanguageModelSettings::get_global(cx).lmstudio.clone();
-                    move |this: &mut State, cx| {
-                        let new_settings = &AllLanguageModelSettings::get_global(cx).lmstudio;
-                        if &settings != new_settings {
-                            settings = new_settings.clone();
-                            this.restart_fetch_models_task(cx);
-                            cx.notify();
-                        }
-                    }
-                });
-
-                State {
-                    http_client,
-                    available_models: Default::default(),
-                    fetch_model_task: None,
-                    _subscription: subscription,
-                }
-            }),
-        };
-        this.state
-            .update(cx, |state, cx| state.restart_fetch_models_task(cx));
-        this
-    }
-}
-
-impl LanguageModelProviderState for LmStudioLanguageModelProvider {
-    type ObservableEntity = State;
-
-    fn observable_entity(&self) -> Option<Entity<Self::ObservableEntity>> {
-        Some(self.state.clone())
-    }
-}
-
-impl LanguageModelProvider for LmStudioLanguageModelProvider {
-    fn id(&self) -> LanguageModelProviderId {
-        PROVIDER_ID
-    }
-
-    fn name(&self) -> LanguageModelProviderName {
-        PROVIDER_NAME
-    }
-
-    fn icon(&self) -> IconName {
-        IconName::AiLmStudio
-    }
-
-    fn default_model(&self, _: &App) -> Option<Arc<dyn LanguageModel>> {
-        // We shouldn't try to select default model, because it might lead to a load call for an unloaded model.
-        // In a constrained environment where user might not have enough resources it'll be a bad UX to select something
-        // to load by default.
-        None
-    }
-
-    fn default_fast_model(&self, _: &App) -> Option<Arc<dyn LanguageModel>> {
-        // See explanation for default_model.
-        None
-    }
-
-    fn provided_models(&self, cx: &App) -> Vec<Arc<dyn LanguageModel>> {
-        let mut models: BTreeMap<String, lmstudio::Model> = BTreeMap::default();
-
-        // Add models from the LM Studio API
-        for model in self.state.read(cx).available_models.iter() {
-            models.insert(model.name.clone(), model.clone());
-        }
-
-        // Override with available models from settings
-        for model in AllLanguageModelSettings::get_global(cx)
-            .lmstudio
-            .available_models
-            .iter()
-        {
-            models.insert(
-                model.name.clone(),
-                lmstudio::Model {
-                    name: model.name.clone(),
-                    display_name: model.display_name.clone(),
-                    max_tokens: model.max_tokens,
-                    supports_tool_calls: model.supports_tool_calls,
-                    supports_images: model.supports_images,
-                },
-            );
-        }
-
-        models
-            .into_values()
-            .map(|model| {
-                Arc::new(LmStudioLanguageModel {
-                    id: LanguageModelId::from(model.name.clone()),
-                    model,
-                    http_client: self.http_client.clone(),
-                    request_limiter: RateLimiter::new(4),
-                }) as Arc<dyn LanguageModel>
-            })
-            .collect()
-    }
-
-    fn is_authenticated(&self, cx: &App) -> bool {
-        self.state.read(cx).is_authenticated()
-    }
-
-    fn authenticate(&self, cx: &mut App) -> Task<Result<(), AuthenticateError>> {
-        self.state.update(cx, |state, cx| state.authenticate(cx))
-    }
-
-    fn configuration_view(
-        &self,
-        _target_agent: language_model::ConfigurationViewTargetAgent,
-        _window: &mut Window,
-        cx: &mut App,
-    ) -> AnyView {
-        let state = self.state.clone();
-        cx.new(|cx| ConfigurationView::new(state, cx)).into()
-    }
-
-    fn reset_credentials(&self, cx: &mut App) -> Task<Result<()>> {
-        self.state.update(cx, |state, cx| state.fetch_models(cx))
-    }
-}
-
-pub struct LmStudioLanguageModel {
-    id: LanguageModelId,
-    model: lmstudio::Model,
-    http_client: Arc<dyn HttpClient>,
-    request_limiter: RateLimiter,
-}
-
-impl LmStudioLanguageModel {
-    fn to_lmstudio_request(
-        &self,
-        request: LanguageModelRequest,
-    ) -> lmstudio::ChatCompletionRequest {
-        let mut messages = Vec::new();
-
-        for message in request.messages {
-            for content in message.content {
-                match content {
-                    MessageContent::Text(text) => add_message_content_part(
-                        lmstudio::MessagePart::Text { text },
-                        message.role,
-                        &mut messages,
-                    ),
-                    MessageContent::Thinking { .. } => {}
-                    MessageContent::RedactedThinking(_) => {}
-                    MessageContent::Image(image) => {
-                        add_message_content_part(
-                            lmstudio::MessagePart::Image {
-                                image_url: lmstudio::ImageUrl {
-                                    url: image.to_base64_url(),
-                                    detail: None,
-                                },
-                            },
-                            message.role,
-                            &mut messages,
-                        );
-                    }
-                    MessageContent::ToolUse(tool_use) => {
-                        let tool_call = lmstudio::ToolCall {
-                            id: tool_use.id.to_string(),
-                            content: lmstudio::ToolCallContent::Function {
-                                function: lmstudio::FunctionContent {
-                                    name: tool_use.name.to_string(),
-                                    arguments: serde_json::to_string(&tool_use.input)
-                                        .unwrap_or_default(),
-                                },
-                            },
-                        };
-
-                        if let Some(lmstudio::ChatMessage::Assistant { tool_calls, .. }) =
-                            messages.last_mut()
-                        {
-                            tool_calls.push(tool_call);
-                        } else {
-                            messages.push(lmstudio::ChatMessage::Assistant {
-                                content: None,
-                                tool_calls: vec![tool_call],
-                            });
-                        }
-                    }
-                    MessageContent::ToolResult(tool_result) => {
-                        let content = match &tool_result.content {
-                            LanguageModelToolResultContent::Text(text) => {
-                                vec![lmstudio::MessagePart::Text {
-                                    text: text.to_string(),
-                                }]
-                            }
-                            LanguageModelToolResultContent::Image(image) => {
-                                vec![lmstudio::MessagePart::Image {
-                                    image_url: lmstudio::ImageUrl {
-                                        url: image.to_base64_url(),
-                                        detail: None,
-                                    },
-                                }]
-                            }
-                        };
-
-                        messages.push(lmstudio::ChatMessage::Tool {
-                            content: content.into(),
-                            tool_call_id: tool_result.tool_use_id.to_string(),
-                        });
-                    }
-                }
-            }
-        }
-
-        lmstudio::ChatCompletionRequest {
-            model: self.model.name.clone(),
-            messages,
-            stream: true,
-            max_tokens: Some(-1),
-            stop: Some(request.stop),
-            // In LM Studio you can configure specific settings you'd like to use for your model.
-            // For example Qwen3 is recommended to be used with 0.7 temperature.
-            // It would be a bad UX to silently override these settings from Zed, so we pass no temperature as a default.
-            temperature: request.temperature.or(None),
-            tools: request
-                .tools
-                .into_iter()
-                .map(|tool| lmstudio::ToolDefinition::Function {
-                    function: lmstudio::FunctionDefinition {
-                        name: tool.name,
-                        description: Some(tool.description),
-                        parameters: Some(tool.input_schema),
-                    },
-                })
-                .collect(),
-            tool_choice: request.tool_choice.map(|choice| match choice {
-                LanguageModelToolChoice::Auto => lmstudio::ToolChoice::Auto,
-                LanguageModelToolChoice::Any => lmstudio::ToolChoice::Required,
-                LanguageModelToolChoice::None => lmstudio::ToolChoice::None,
-            }),
-        }
-    }
-
-    fn stream_completion(
-        &self,
-        request: lmstudio::ChatCompletionRequest,
-        cx: &AsyncApp,
-    ) -> BoxFuture<
-        'static,
-        Result<futures::stream::BoxStream<'static, Result<lmstudio::ResponseStreamEvent>>>,
-    > {
-        let http_client = self.http_client.clone();
-        let Ok(api_url) = cx.update(|cx| {
-            let settings = &AllLanguageModelSettings::get_global(cx).lmstudio;
-            settings.api_url.clone()
-        }) else {
-            return futures::future::ready(Err(anyhow!("App state dropped"))).boxed();
-        };
-
-        let future = self.request_limiter.stream(async move {
-            let request = lmstudio::stream_chat_completion(http_client.as_ref(), &api_url, request);
-            let response = request.await?;
-            Ok(response)
-        });
-
-        async move { Ok(future.await?.boxed()) }.boxed()
-    }
-}
-
-impl LanguageModel for LmStudioLanguageModel {
-    fn id(&self) -> LanguageModelId {
-        self.id.clone()
-    }
-
-    fn name(&self) -> LanguageModelName {
-        LanguageModelName::from(self.model.display_name().to_string())
-    }
-
-    fn provider_id(&self) -> LanguageModelProviderId {
-        PROVIDER_ID
-    }
-
-    fn provider_name(&self) -> LanguageModelProviderName {
-        PROVIDER_NAME
-    }
-
-    fn supports_tools(&self) -> bool {
-        self.model.supports_tool_calls()
-    }
-
-    fn supports_tool_choice(&self, choice: LanguageModelToolChoice) -> bool {
-        self.supports_tools()
-            && match choice {
-                LanguageModelToolChoice::Auto => true,
-                LanguageModelToolChoice::Any => true,
-                LanguageModelToolChoice::None => true,
-            }
-    }
-
-    fn supports_images(&self) -> bool {
-        self.model.supports_images
-    }
-
-    fn telemetry_id(&self) -> String {
-        format!("lmstudio/{}", self.model.id())
-    }
-
-    fn max_token_count(&self) -> u64 {
-        self.model.max_token_count()
-    }
-
-    fn count_tokens(
-        &self,
-        request: LanguageModelRequest,
-        _cx: &App,
-    ) -> BoxFuture<'static, Result<u64>> {
-        // Endpoint for this is coming soon. In the meantime, hacky estimation
-        let token_count = request
-            .messages
-            .iter()
-            .map(|msg| msg.string_contents().split_whitespace().count())
-            .sum::<usize>();
-
-        let estimated_tokens = (token_count as f64 * 0.75) as u64;
-        async move { Ok(estimated_tokens) }.boxed()
-    }
-
-    fn stream_completion(
-        &self,
-        request: LanguageModelRequest,
-        cx: &AsyncApp,
-    ) -> BoxFuture<
-        'static,
-        Result<
-            BoxStream<'static, Result<LanguageModelCompletionEvent, LanguageModelCompletionError>>,
-            LanguageModelCompletionError,
-        >,
-    > {
-        let request = self.to_lmstudio_request(request);
-        let completions = self.stream_completion(request, cx);
-        async move {
-            let mapper = LmStudioEventMapper::new();
-            Ok(mapper.map_stream(completions.await?).boxed())
-        }
-        .boxed()
-    }
-}
-
-struct LmStudioEventMapper {
-    tool_calls_by_index: HashMap<usize, RawToolCall>,
-}
-
-impl LmStudioEventMapper {
-    fn new() -> Self {
-        Self {
-            tool_calls_by_index: HashMap::default(),
-        }
-    }
-
-    pub fn map_stream(
-        mut self,
-        events: Pin<Box<dyn Send + Stream<Item = Result<lmstudio::ResponseStreamEvent>>>>,
-    ) -> impl Stream<Item = Result<LanguageModelCompletionEvent, LanguageModelCompletionError>>
-    {
-        events.flat_map(move |event| {
-            futures::stream::iter(match event {
-                Ok(event) => self.map_event(event),
-                Err(error) => vec![Err(LanguageModelCompletionError::from(error))],
-            })
-        })
-    }
-
-    pub fn map_event(
-        &mut self,
-        event: lmstudio::ResponseStreamEvent,
-    ) -> Vec<Result<LanguageModelCompletionEvent, LanguageModelCompletionError>> {
-        let Some(choice) = event.choices.into_iter().next() else {
-            return vec![Err(LanguageModelCompletionError::from(anyhow!(
-                "Response contained no choices"
-            )))];
-        };
-
-        let mut events = Vec::new();
-        if let Some(content) = choice.delta.content {
-            events.push(Ok(LanguageModelCompletionEvent::Text(content)));
-        }
-
-        if let Some(reasoning_content) = choice.delta.reasoning_content {
-            events.push(Ok(LanguageModelCompletionEvent::Thinking {
-                text: reasoning_content,
-                signature: None,
-            }));
-        }
-
-        if let Some(tool_calls) = choice.delta.tool_calls {
-            for tool_call in tool_calls {
-                let entry = self.tool_calls_by_index.entry(tool_call.index).or_default();
-
-                if let Some(tool_id) = tool_call.id {
-                    entry.id = tool_id;
-                }
-
-                if let Some(function) = tool_call.function {
-                    if let Some(name) = function.name {
-                        // At the time of writing this code LM Studio (0.3.15) is incompatible with the OpenAI API:
-                        // 1. It sends function name in the first chunk
-                        // 2. It sends empty string in the function name field in all subsequent chunks for arguments
-                        // According to https://platform.openai.com/docs/guides/function-calling?api-mode=responses#streaming
-                        // function name field should be sent only inside the first chunk.
-                        if !name.is_empty() {
-                            entry.name = name;
-                        }
-                    }
-
-                    if let Some(arguments) = function.arguments {
-                        entry.arguments.push_str(&arguments);
-                    }
-                }
-            }
-        }
-
-        if let Some(usage) = event.usage {
-            events.push(Ok(LanguageModelCompletionEvent::UsageUpdate(TokenUsage {
-                input_tokens: usage.prompt_tokens,
-                output_tokens: usage.completion_tokens,
-                cache_creation_input_tokens: 0,
-                cache_read_input_tokens: 0,
-            })));
-        }
-
-        match choice.finish_reason.as_deref() {
-            Some("stop") => {
-                events.push(Ok(LanguageModelCompletionEvent::Stop(StopReason::EndTurn)));
-            }
-            Some("tool_calls") => {
-                events.extend(self.tool_calls_by_index.drain().map(|(_, tool_call)| {
-                    match serde_json::Value::from_str(&tool_call.arguments) {
-                        Ok(input) => Ok(LanguageModelCompletionEvent::ToolUse(
-                            LanguageModelToolUse {
-                                id: tool_call.id.into(),
-                                name: tool_call.name.into(),
-                                is_input_complete: true,
-                                input,
-                                raw_input: tool_call.arguments,
-                                thought_signature: None,
-                            },
-                        )),
-                        Err(error) => Ok(LanguageModelCompletionEvent::ToolUseJsonParseError {
-                            id: tool_call.id.into(),
-                            tool_name: tool_call.name.into(),
-                            raw_input: tool_call.arguments.into(),
-                            json_parse_error: error.to_string(),
-                        }),
-                    }
-                }));
-
-                events.push(Ok(LanguageModelCompletionEvent::Stop(StopReason::ToolUse)));
-            }
-            Some(stop_reason) => {
-                log::error!("Unexpected LMStudio stop_reason: {stop_reason:?}",);
-                events.push(Ok(LanguageModelCompletionEvent::Stop(StopReason::EndTurn)));
-            }
-            None => {}
-        }
-
-        events
-    }
-}
-
-#[derive(Default)]
-struct RawToolCall {
-    id: String,
-    name: String,
-    arguments: String,
-}
-
-fn add_message_content_part(
-    new_part: lmstudio::MessagePart,
-    role: Role,
-    messages: &mut Vec<lmstudio::ChatMessage>,
-) {
-    match (role, messages.last_mut()) {
-        (Role::User, Some(lmstudio::ChatMessage::User { content }))
-        | (
-            Role::Assistant,
-            Some(lmstudio::ChatMessage::Assistant {
-                content: Some(content),
-                ..
-            }),
-        )
-        | (Role::System, Some(lmstudio::ChatMessage::System { content })) => {
-            content.push_part(new_part);
-        }
-        _ => {
-            messages.push(match role {
-                Role::User => lmstudio::ChatMessage::User {
-                    content: lmstudio::MessageContent::from(vec![new_part]),
-                },
-                Role::Assistant => lmstudio::ChatMessage::Assistant {
-                    content: Some(lmstudio::MessageContent::from(vec![new_part])),
-                    tool_calls: Vec::new(),
-                },
-                Role::System => lmstudio::ChatMessage::System {
-                    content: lmstudio::MessageContent::from(vec![new_part]),
-                },
-            });
-        }
-    }
-}
-
-struct ConfigurationView {
-    state: Entity<State>,
-    loading_models_task: Option<Task<()>>,
-}
-
-impl ConfigurationView {
-    pub fn new(state: Entity<State>, cx: &mut Context<Self>) -> Self {
-        let loading_models_task = Some(cx.spawn({
-            let state = state.clone();
-            async move |this, cx| {
-                if let Some(task) = state
-                    .update(cx, |state, cx| state.authenticate(cx))
-                    .log_err()
-                {
-                    task.await.log_err();
-                }
-                this.update(cx, |this, cx| {
-                    this.loading_models_task = None;
-                    cx.notify();
-                })
-                .log_err();
-            }
-        }));
-
-        Self {
-            state,
-            loading_models_task,
-        }
-    }
-
-    fn retry_connection(&self, cx: &mut App) {
-        self.state
-            .update(cx, |state, cx| state.fetch_models(cx))
-            .detach_and_log_err(cx);
-    }
-}
-
-impl Render for ConfigurationView {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let is_authenticated = self.state.read(cx).is_authenticated();
-
-        let lmstudio_intro = "Run local LLMs like Llama, Phi, and Qwen.";
-
-        if self.loading_models_task.is_some() {
-            div().child(Label::new("Loading models...")).into_any()
-        } else {
-            v_flex()
-                .gap_2()
-                .child(
-                    v_flex().gap_1().child(Label::new(lmstudio_intro)).child(
-                        List::new()
-                            .child(InstructionListItem::text_only(
-                                "LM Studio needs to be running with at least one model downloaded.",
-                            ))
-                            .child(InstructionListItem::text_only(
-                                "To get your first model, try running `lms get qwen2.5-coder-7b`",
-                            )),
-                    ),
-                )
-                .child(
-                    h_flex()
-                        .w_full()
-                        .justify_between()
-                        .gap_2()
-                        .child(
-                            h_flex()
-                                .w_full()
-                                .gap_2()
-                                .map(|this| {
-                                    if is_authenticated {
-                                        this.child(
-                                            Button::new("lmstudio-site", "LM Studio")
-                                                .style(ButtonStyle::Subtle)
-                                                .icon(IconName::ArrowUpRight)
-                                                .icon_size(IconSize::Small)
-                                                .icon_color(Color::Muted)
-                                                .on_click(move |_, _window, cx| {
-                                                    cx.open_url(LMSTUDIO_SITE)
-                                                })
-                                                .into_any_element(),
-                                        )
-                                    } else {
-                                        this.child(
-                                            Button::new(
-                                                "download_lmstudio_button",
-                                                "Download LM Studio",
-                                            )
-                                            .style(ButtonStyle::Subtle)
-                                            .icon(IconName::ArrowUpRight)
-                                            .icon_size(IconSize::Small)
-                                            .icon_color(Color::Muted)
-                                            .on_click(move |_, _window, cx| {
-                                                cx.open_url(LMSTUDIO_DOWNLOAD_URL)
-                                            })
-                                            .into_any_element(),
-                                        )
-                                    }
-                                })
-                                .child(
-                                    Button::new("view-models", "Model Catalog")
-                                        .style(ButtonStyle::Subtle)
-                                        .icon(IconName::ArrowUpRight)
-                                        .icon_size(IconSize::Small)
-                                        .icon_color(Color::Muted)
-                                        .on_click(move |_, _window, cx| {
-                                            cx.open_url(LMSTUDIO_CATALOG_URL)
-                                        }),
-                                ),
-                        )
-                        .map(|this| {
-                            if is_authenticated {
-                                this.child(
-                                    ButtonLike::new("connected")
-                                        .disabled(true)
-                                        .cursor_style(gpui::CursorStyle::Arrow)
-                                        .child(
-                                            h_flex()
-                                                .gap_2()
-                                                .child(Indicator::dot().color(Color::Success))
-                                                .child(Label::new("Connected"))
-                                                .into_any_element(),
-                                        ),
-                                )
-                            } else {
-                                this.child(
-                                    Button::new("retry_lmstudio_models", "Connect")
-                                        .icon_position(IconPosition::Start)
-                                        .icon_size(IconSize::XSmall)
-                                        .icon(IconName::PlayFilled)
-                                        .on_click(cx.listener(move |this, _, _window, cx| {
-                                            this.retry_connection(cx)
-                                        })),
-                                )
-                            }
-                        }),
-                )
-                .into_any()
-        }
-    }
-}
diff --git a/crates/language_models/src/provider/mistral.rs b/crates/language_models/src/provider/mistral.rs
deleted file mode 100644
index 8372a8c95e..0000000000
--- a/crates/language_models/src/provider/mistral.rs
+++ /dev/null
@@ -1,1107 +0,0 @@
-use anyhow::{Result, anyhow};
-use collections::BTreeMap;
-use fs::Fs;
-use futures::{FutureExt, Stream, StreamExt, future, future::BoxFuture, stream::BoxStream};
-use gpui::{AnyView, App, AsyncApp, Context, Entity, Global, SharedString, Task, Window};
-use http_client::HttpClient;
-use language_model::{
-    AuthenticateError, LanguageModel, LanguageModelCompletionError, LanguageModelCompletionEvent,
-    LanguageModelId, LanguageModelName, LanguageModelProvider, LanguageModelProviderId,
-    LanguageModelProviderName, LanguageModelProviderState, LanguageModelRequest,
-    LanguageModelToolChoice, LanguageModelToolResultContent, LanguageModelToolUse, MessageContent,
-    RateLimiter, Role, StopReason, TokenUsage,
-};
-use mistral::{CODESTRAL_API_URL, MISTRAL_API_URL, StreamResponse};
-pub use settings::MistralAvailableModel as AvailableModel;
-use settings::{EditPredictionProvider, Settings, SettingsStore, update_settings_file};
-use std::collections::HashMap;
-use std::pin::Pin;
-use std::str::FromStr;
-use std::sync::{Arc, LazyLock};
-use strum::IntoEnumIterator;
-use ui::{List, prelude::*};
-use ui_input::InputField;
-use util::ResultExt;
-use zed_env_vars::{EnvVar, env_var};
-
-use crate::ui::ConfiguredApiCard;
-use crate::{api_key::ApiKeyState, ui::InstructionListItem};
-
-const PROVIDER_ID: LanguageModelProviderId = LanguageModelProviderId::new("mistral");
-const PROVIDER_NAME: LanguageModelProviderName = LanguageModelProviderName::new("Mistral");
-
-const API_KEY_ENV_VAR_NAME: &str = "MISTRAL_API_KEY";
-static API_KEY_ENV_VAR: LazyLock<EnvVar> = env_var!(API_KEY_ENV_VAR_NAME);
-
-const CODESTRAL_API_KEY_ENV_VAR_NAME: &str = "CODESTRAL_API_KEY";
-static CODESTRAL_API_KEY_ENV_VAR: LazyLock<EnvVar> = env_var!(CODESTRAL_API_KEY_ENV_VAR_NAME);
-
-#[derive(Default, Clone, Debug, PartialEq)]
-pub struct MistralSettings {
-    pub api_url: String,
-    pub available_models: Vec<AvailableModel>,
-}
-
-pub struct MistralLanguageModelProvider {
-    http_client: Arc<dyn HttpClient>,
-    state: Entity<State>,
-}
-
-pub struct State {
-    api_key_state: ApiKeyState,
-    codestral_api_key_state: ApiKeyState,
-}
-
-impl State {
-    fn is_authenticated(&self) -> bool {
-        self.api_key_state.has_key()
-    }
-
-    fn set_api_key(&mut self, api_key: Option<String>, cx: &mut Context<Self>) -> Task<Result<()>> {
-        let api_url = MistralLanguageModelProvider::api_url(cx);
-        self.api_key_state
-            .store(api_url, api_key, |this| &mut this.api_key_state, cx)
-    }
-
-    fn set_codestral_api_key(
-        &mut self,
-        api_key: Option<String>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        self.codestral_api_key_state.store(
-            CODESTRAL_API_URL.into(),
-            api_key,
-            |this| &mut this.codestral_api_key_state,
-            cx,
-        )
-    }
-
-    fn authenticate(&mut self, cx: &mut Context<Self>) -> Task<Result<(), AuthenticateError>> {
-        let api_url = MistralLanguageModelProvider::api_url(cx);
-        self.api_key_state.load_if_needed(
-            api_url,
-            &API_KEY_ENV_VAR,
-            |this| &mut this.api_key_state,
-            cx,
-        )
-    }
-
-    fn authenticate_codestral(
-        &mut self,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<(), AuthenticateError>> {
-        self.codestral_api_key_state.load_if_needed(
-            CODESTRAL_API_URL.into(),
-            &CODESTRAL_API_KEY_ENV_VAR,
-            |this| &mut this.codestral_api_key_state,
-            cx,
-        )
-    }
-}
-
-struct GlobalMistralLanguageModelProvider(Arc<MistralLanguageModelProvider>);
-
-impl Global for GlobalMistralLanguageModelProvider {}
-
-impl MistralLanguageModelProvider {
-    pub fn try_global(cx: &App) -> Option<&Arc<MistralLanguageModelProvider>> {
-        cx.try_global::<GlobalMistralLanguageModelProvider>()
-            .map(|this| &this.0)
-    }
-
-    pub fn global(http_client: Arc<dyn HttpClient>, cx: &mut App) -> Arc<Self> {
-        if let Some(this) = cx.try_global::<GlobalMistralLanguageModelProvider>() {
-            return this.0.clone();
-        }
-        let state = cx.new(|cx| {
-            cx.observe_global::<SettingsStore>(|this: &mut State, cx| {
-                let api_url = Self::api_url(cx);
-                this.api_key_state.handle_url_change(
-                    api_url,
-                    &API_KEY_ENV_VAR,
-                    |this| &mut this.api_key_state,
-                    cx,
-                );
-                cx.notify();
-            })
-            .detach();
-            State {
-                api_key_state: ApiKeyState::new(Self::api_url(cx)),
-                codestral_api_key_state: ApiKeyState::new(CODESTRAL_API_URL.into()),
-            }
-        });
-
-        let this = Arc::new(Self { http_client, state });
-        cx.set_global(GlobalMistralLanguageModelProvider(this));
-        cx.global::<GlobalMistralLanguageModelProvider>().0.clone()
-    }
-
-    pub fn load_codestral_api_key(&self, cx: &mut App) -> Task<Result<(), AuthenticateError>> {
-        self.state
-            .update(cx, |state, cx| state.authenticate_codestral(cx))
-    }
-
-    pub fn codestral_api_key(&self, url: &str, cx: &App) -> Option<Arc<str>> {
-        self.state.read(cx).codestral_api_key_state.key(url)
-    }
-
-    fn create_language_model(&self, model: mistral::Model) -> Arc<dyn LanguageModel> {
-        Arc::new(MistralLanguageModel {
-            id: LanguageModelId::from(model.id().to_string()),
-            model,
-            state: self.state.clone(),
-            http_client: self.http_client.clone(),
-            request_limiter: RateLimiter::new(4),
-        })
-    }
-
-    fn settings(cx: &App) -> &MistralSettings {
-        &crate::AllLanguageModelSettings::get_global(cx).mistral
-    }
-
-    fn api_url(cx: &App) -> SharedString {
-        let api_url = &Self::settings(cx).api_url;
-        if api_url.is_empty() {
-            mistral::MISTRAL_API_URL.into()
-        } else {
-            SharedString::new(api_url.as_str())
-        }
-    }
-}
-
-impl LanguageModelProviderState for MistralLanguageModelProvider {
-    type ObservableEntity = State;
-
-    fn observable_entity(&self) -> Option<Entity<Self::ObservableEntity>> {
-        Some(self.state.clone())
-    }
-}
-
-impl LanguageModelProvider for MistralLanguageModelProvider {
-    fn id(&self) -> LanguageModelProviderId {
-        PROVIDER_ID
-    }
-
-    fn name(&self) -> LanguageModelProviderName {
-        PROVIDER_NAME
-    }
-
-    fn icon(&self) -> IconName {
-        IconName::AiMistral
-    }
-
-    fn default_model(&self, _cx: &App) -> Option<Arc<dyn LanguageModel>> {
-        Some(self.create_language_model(mistral::Model::default()))
-    }
-
-    fn default_fast_model(&self, _cx: &App) -> Option<Arc<dyn LanguageModel>> {
-        Some(self.create_language_model(mistral::Model::default_fast()))
-    }
-
-    fn provided_models(&self, cx: &App) -> Vec<Arc<dyn LanguageModel>> {
-        let mut models = BTreeMap::default();
-
-        // Add base models from mistral::Model::iter()
-        for model in mistral::Model::iter() {
-            if !matches!(model, mistral::Model::Custom { .. }) {
-                models.insert(model.id().to_string(), model);
-            }
-        }
-
-        // Override with available models from settings
-        for model in &Self::settings(cx).available_models {
-            models.insert(
-                model.name.clone(),
-                mistral::Model::Custom {
-                    name: model.name.clone(),
-                    display_name: model.display_name.clone(),
-                    max_tokens: model.max_tokens,
-                    max_output_tokens: model.max_output_tokens,
-                    max_completion_tokens: model.max_completion_tokens,
-                    supports_tools: model.supports_tools,
-                    supports_images: model.supports_images,
-                    supports_thinking: model.supports_thinking,
-                },
-            );
-        }
-
-        models
-            .into_values()
-            .map(|model| {
-                Arc::new(MistralLanguageModel {
-                    id: LanguageModelId::from(model.id().to_string()),
-                    model,
-                    state: self.state.clone(),
-                    http_client: self.http_client.clone(),
-                    request_limiter: RateLimiter::new(4),
-                }) as Arc<dyn LanguageModel>
-            })
-            .collect()
-    }
-
-    fn is_authenticated(&self, cx: &App) -> bool {
-        self.state.read(cx).is_authenticated()
-    }
-
-    fn authenticate(&self, cx: &mut App) -> Task<Result<(), AuthenticateError>> {
-        self.state.update(cx, |state, cx| state.authenticate(cx))
-    }
-
-    fn configuration_view(
-        &self,
-        _target_agent: language_model::ConfigurationViewTargetAgent,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> AnyView {
-        cx.new(|cx| ConfigurationView::new(self.state.clone(), window, cx))
-            .into()
-    }
-
-    fn reset_credentials(&self, cx: &mut App) -> Task<Result<()>> {
-        self.state
-            .update(cx, |state, cx| state.set_api_key(None, cx))
-    }
-}
-
-pub struct MistralLanguageModel {
-    id: LanguageModelId,
-    model: mistral::Model,
-    state: Entity<State>,
-    http_client: Arc<dyn HttpClient>,
-    request_limiter: RateLimiter,
-}
-
-impl MistralLanguageModel {
-    fn stream_completion(
-        &self,
-        request: mistral::Request,
-        cx: &AsyncApp,
-    ) -> BoxFuture<
-        'static,
-        Result<futures::stream::BoxStream<'static, Result<mistral::StreamResponse>>>,
-    > {
-        let http_client = self.http_client.clone();
-
-        let Ok((api_key, api_url)) = self.state.read_with(cx, |state, cx| {
-            let api_url = MistralLanguageModelProvider::api_url(cx);
-            (state.api_key_state.key(&api_url), api_url)
-        }) else {
-            return future::ready(Err(anyhow!("App state dropped"))).boxed();
-        };
-
-        let future = self.request_limiter.stream(async move {
-            let Some(api_key) = api_key else {
-                return Err(LanguageModelCompletionError::NoApiKey {
-                    provider: PROVIDER_NAME,
-                });
-            };
-            let request =
-                mistral::stream_completion(http_client.as_ref(), &api_url, &api_key, request);
-            let response = request.await?;
-            Ok(response)
-        });
-
-        async move { Ok(future.await?.boxed()) }.boxed()
-    }
-}
-
-impl LanguageModel for MistralLanguageModel {
-    fn id(&self) -> LanguageModelId {
-        self.id.clone()
-    }
-
-    fn name(&self) -> LanguageModelName {
-        LanguageModelName::from(self.model.display_name().to_string())
-    }
-
-    fn provider_id(&self) -> LanguageModelProviderId {
-        PROVIDER_ID
-    }
-
-    fn provider_name(&self) -> LanguageModelProviderName {
-        PROVIDER_NAME
-    }
-
-    fn supports_tools(&self) -> bool {
-        self.model.supports_tools()
-    }
-
-    fn supports_tool_choice(&self, _choice: LanguageModelToolChoice) -> bool {
-        self.model.supports_tools()
-    }
-
-    fn supports_images(&self) -> bool {
-        self.model.supports_images()
-    }
-
-    fn telemetry_id(&self) -> String {
-        format!("mistral/{}", self.model.id())
-    }
-
-    fn max_token_count(&self) -> u64 {
-        self.model.max_token_count()
-    }
-
-    fn max_output_tokens(&self) -> Option<u64> {
-        self.model.max_output_tokens()
-    }
-
-    fn count_tokens(
-        &self,
-        request: LanguageModelRequest,
-        cx: &App,
-    ) -> BoxFuture<'static, Result<u64>> {
-        cx.background_spawn(async move {
-            let messages = request
-                .messages
-                .into_iter()
-                .map(|message| tiktoken_rs::ChatCompletionRequestMessage {
-                    role: match message.role {
-                        Role::User => "user".into(),
-                        Role::Assistant => "assistant".into(),
-                        Role::System => "system".into(),
-                    },
-                    content: Some(message.string_contents()),
-                    name: None,
-                    function_call: None,
-                })
-                .collect::<Vec<_>>();
-
-            tiktoken_rs::num_tokens_from_messages("gpt-4", &messages).map(|tokens| tokens as u64)
-        })
-        .boxed()
-    }
-
-    fn stream_completion(
-        &self,
-        request: LanguageModelRequest,
-        cx: &AsyncApp,
-    ) -> BoxFuture<
-        'static,
-        Result<
-            BoxStream<'static, Result<LanguageModelCompletionEvent, LanguageModelCompletionError>>,
-            LanguageModelCompletionError,
-        >,
-    > {
-        let request = into_mistral(request, self.model.clone(), self.max_output_tokens());
-        let stream = self.stream_completion(request, cx);
-
-        async move {
-            let stream = stream.await?;
-            let mapper = MistralEventMapper::new();
-            Ok(mapper.map_stream(stream).boxed())
-        }
-        .boxed()
-    }
-}
-
-pub fn into_mistral(
-    request: LanguageModelRequest,
-    model: mistral::Model,
-    max_output_tokens: Option<u64>,
-) -> mistral::Request {
-    let stream = true;
-
-    let mut messages = Vec::new();
-    for message in &request.messages {
-        match message.role {
-            Role::User => {
-                let mut message_content = mistral::MessageContent::empty();
-                for content in &message.content {
-                    match content {
-                        MessageContent::Text(text) => {
-                            message_content
-                                .push_part(mistral::MessagePart::Text { text: text.clone() });
-                        }
-                        MessageContent::Image(image_content) => {
-                            if model.supports_images() {
-                                message_content.push_part(mistral::MessagePart::ImageUrl {
-                                    image_url: image_content.to_base64_url(),
-                                });
-                            }
-                        }
-                        MessageContent::Thinking { text, .. } => {
-                            if model.supports_thinking() {
-                                message_content.push_part(mistral::MessagePart::Thinking {
-                                    thinking: vec![mistral::ThinkingPart::Text {
-                                        text: text.clone(),
-                                    }],
-                                });
-                            }
-                        }
-                        MessageContent::RedactedThinking(_) => {}
-                        MessageContent::ToolUse(_) => {
-                            // Tool use is not supported in User messages for Mistral
-                        }
-                        MessageContent::ToolResult(tool_result) => {
-                            let tool_content = match &tool_result.content {
-                                LanguageModelToolResultContent::Text(text) => text.to_string(),
-                                LanguageModelToolResultContent::Image(_) => {
-                                    "[Tool responded with an image, but Zed doesn't support these in Mistral models yet]".to_string()
-                                }
-                            };
-                            messages.push(mistral::RequestMessage::Tool {
-                                content: tool_content,
-                                tool_call_id: tool_result.tool_use_id.to_string(),
-                            });
-                        }
-                    }
-                }
-                if !matches!(message_content, mistral::MessageContent::Plain { ref content } if content.is_empty())
-                {
-                    messages.push(mistral::RequestMessage::User {
-                        content: message_content,
-                    });
-                }
-            }
-            Role::Assistant => {
-                for content in &message.content {
-                    match content {
-                        MessageContent::Text(text) => {
-                            messages.push(mistral::RequestMessage::Assistant {
-                                content: Some(mistral::MessageContent::Plain {
-                                    content: text.clone(),
-                                }),
-                                tool_calls: Vec::new(),
-                            });
-                        }
-                        MessageContent::Thinking { text, .. } => {
-                            if model.supports_thinking() {
-                                messages.push(mistral::RequestMessage::Assistant {
-                                    content: Some(mistral::MessageContent::Multipart {
-                                        content: vec![mistral::MessagePart::Thinking {
-                                            thinking: vec![mistral::ThinkingPart::Text {
-                                                text: text.clone(),
-                                            }],
-                                        }],
-                                    }),
-                                    tool_calls: Vec::new(),
-                                });
-                            }
-                        }
-                        MessageContent::RedactedThinking(_) => {}
-                        MessageContent::Image(_) => {}
-                        MessageContent::ToolUse(tool_use) => {
-                            let tool_call = mistral::ToolCall {
-                                id: tool_use.id.to_string(),
-                                content: mistral::ToolCallContent::Function {
-                                    function: mistral::FunctionContent {
-                                        name: tool_use.name.to_string(),
-                                        arguments: serde_json::to_string(&tool_use.input)
-                                            .unwrap_or_default(),
-                                    },
-                                },
-                            };
-
-                            if let Some(mistral::RequestMessage::Assistant { tool_calls, .. }) =
-                                messages.last_mut()
-                            {
-                                tool_calls.push(tool_call);
-                            } else {
-                                messages.push(mistral::RequestMessage::Assistant {
-                                    content: None,
-                                    tool_calls: vec![tool_call],
-                                });
-                            }
-                        }
-                        MessageContent::ToolResult(_) => {
-                            // Tool results are not supported in Assistant messages
-                        }
-                    }
-                }
-            }
-            Role::System => {
-                for content in &message.content {
-                    match content {
-                        MessageContent::Text(text) => {
-                            messages.push(mistral::RequestMessage::System {
-                                content: mistral::MessageContent::Plain {
-                                    content: text.clone(),
-                                },
-                            });
-                        }
-                        MessageContent::Thinking { text, .. } => {
-                            if model.supports_thinking() {
-                                messages.push(mistral::RequestMessage::System {
-                                    content: mistral::MessageContent::Multipart {
-                                        content: vec![mistral::MessagePart::Thinking {
-                                            thinking: vec![mistral::ThinkingPart::Text {
-                                                text: text.clone(),
-                                            }],
-                                        }],
-                                    },
-                                });
-                            }
-                        }
-                        MessageContent::RedactedThinking(_) => {}
-                        MessageContent::Image(_)
-                        | MessageContent::ToolUse(_)
-                        | MessageContent::ToolResult(_) => {
-                            // Images and tools are not supported in System messages
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    mistral::Request {
-        model: model.id().to_string(),
-        messages,
-        stream,
-        max_tokens: max_output_tokens,
-        temperature: request.temperature,
-        response_format: None,
-        tool_choice: match request.tool_choice {
-            Some(LanguageModelToolChoice::Auto) if !request.tools.is_empty() => {
-                Some(mistral::ToolChoice::Auto)
-            }
-            Some(LanguageModelToolChoice::Any) if !request.tools.is_empty() => {
-                Some(mistral::ToolChoice::Any)
-            }
-            Some(LanguageModelToolChoice::None) => Some(mistral::ToolChoice::None),
-            _ if !request.tools.is_empty() => Some(mistral::ToolChoice::Auto),
-            _ => None,
-        },
-        parallel_tool_calls: if !request.tools.is_empty() {
-            Some(false)
-        } else {
-            None
-        },
-        tools: request
-            .tools
-            .into_iter()
-            .map(|tool| mistral::ToolDefinition::Function {
-                function: mistral::FunctionDefinition {
-                    name: tool.name,
-                    description: Some(tool.description),
-                    parameters: Some(tool.input_schema),
-                },
-            })
-            .collect(),
-    }
-}
-
-pub struct MistralEventMapper {
-    tool_calls_by_index: HashMap<usize, RawToolCall>,
-}
-
-impl MistralEventMapper {
-    pub fn new() -> Self {
-        Self {
-            tool_calls_by_index: HashMap::default(),
-        }
-    }
-
-    pub fn map_stream(
-        mut self,
-        events: Pin<Box<dyn Send + Stream<Item = Result<StreamResponse>>>>,
-    ) -> impl Stream<Item = Result<LanguageModelCompletionEvent, LanguageModelCompletionError>>
-    {
-        events.flat_map(move |event| {
-            futures::stream::iter(match event {
-                Ok(event) => self.map_event(event),
-                Err(error) => vec![Err(LanguageModelCompletionError::from(error))],
-            })
-        })
-    }
-
-    pub fn map_event(
-        &mut self,
-        event: mistral::StreamResponse,
-    ) -> Vec<Result<LanguageModelCompletionEvent, LanguageModelCompletionError>> {
-        let Some(choice) = event.choices.first() else {
-            return vec![Err(LanguageModelCompletionError::from(anyhow!(
-                "Response contained no choices"
-            )))];
-        };
-
-        let mut events = Vec::new();
-        if let Some(content) = choice.delta.content.as_ref() {
-            match content {
-                mistral::MessageContentDelta::Text(text) => {
-                    events.push(Ok(LanguageModelCompletionEvent::Text(text.clone())));
-                }
-                mistral::MessageContentDelta::Parts(parts) => {
-                    for part in parts {
-                        match part {
-                            mistral::MessagePart::Text { text } => {
-                                events.push(Ok(LanguageModelCompletionEvent::Text(text.clone())));
-                            }
-                            mistral::MessagePart::Thinking { thinking } => {
-                                for tp in thinking.iter().cloned() {
-                                    match tp {
-                                        mistral::ThinkingPart::Text { text } => {
-                                            events.push(Ok(
-                                                LanguageModelCompletionEvent::Thinking {
-                                                    text,
-                                                    signature: None,
-                                                },
-                                            ));
-                                        }
-                                    }
-                                }
-                            }
-                            mistral::MessagePart::ImageUrl { .. } => {
-                                // We currently don't emit a separate event for images in responses.
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        if let Some(tool_calls) = choice.delta.tool_calls.as_ref() {
-            for tool_call in tool_calls {
-                let entry = self.tool_calls_by_index.entry(tool_call.index).or_default();
-
-                if let Some(tool_id) = tool_call.id.clone() {
-                    entry.id = tool_id;
-                }
-
-                if let Some(function) = tool_call.function.as_ref() {
-                    if let Some(name) = function.name.clone() {
-                        entry.name = name;
-                    }
-
-                    if let Some(arguments) = function.arguments.clone() {
-                        entry.arguments.push_str(&arguments);
-                    }
-                }
-            }
-        }
-
-        if let Some(usage) = event.usage {
-            events.push(Ok(LanguageModelCompletionEvent::UsageUpdate(TokenUsage {
-                input_tokens: usage.prompt_tokens,
-                output_tokens: usage.completion_tokens,
-                cache_creation_input_tokens: 0,
-                cache_read_input_tokens: 0,
-            })));
-        }
-
-        if let Some(finish_reason) = choice.finish_reason.as_deref() {
-            match finish_reason {
-                "stop" => {
-                    events.push(Ok(LanguageModelCompletionEvent::Stop(StopReason::EndTurn)));
-                }
-                "tool_calls" => {
-                    events.extend(self.process_tool_calls());
-                    events.push(Ok(LanguageModelCompletionEvent::Stop(StopReason::ToolUse)));
-                }
-                unexpected => {
-                    log::error!("Unexpected Mistral stop_reason: {unexpected:?}");
-                    events.push(Ok(LanguageModelCompletionEvent::Stop(StopReason::EndTurn)));
-                }
-            }
-        }
-
-        events
-    }
-
-    fn process_tool_calls(
-        &mut self,
-    ) -> Vec<Result<LanguageModelCompletionEvent, LanguageModelCompletionError>> {
-        let mut results = Vec::new();
-
-        for (_, tool_call) in self.tool_calls_by_index.drain() {
-            if tool_call.id.is_empty() || tool_call.name.is_empty() {
-                results.push(Err(LanguageModelCompletionError::from(anyhow!(
-                    "Received incomplete tool call: missing id or name"
-                ))));
-                continue;
-            }
-
-            match serde_json::Value::from_str(&tool_call.arguments) {
-                Ok(input) => results.push(Ok(LanguageModelCompletionEvent::ToolUse(
-                    LanguageModelToolUse {
-                        id: tool_call.id.into(),
-                        name: tool_call.name.into(),
-                        is_input_complete: true,
-                        input,
-                        raw_input: tool_call.arguments,
-                        thought_signature: None,
-                    },
-                ))),
-                Err(error) => {
-                    results.push(Ok(LanguageModelCompletionEvent::ToolUseJsonParseError {
-                        id: tool_call.id.into(),
-                        tool_name: tool_call.name.into(),
-                        raw_input: tool_call.arguments.into(),
-                        json_parse_error: error.to_string(),
-                    }))
-                }
-            }
-        }
-
-        results
-    }
-}
-
-#[derive(Default)]
-struct RawToolCall {
-    id: String,
-    name: String,
-    arguments: String,
-}
-
-struct ConfigurationView {
-    api_key_editor: Entity<InputField>,
-    codestral_api_key_editor: Entity<InputField>,
-    state: Entity<State>,
-    load_credentials_task: Option<Task<()>>,
-}
-
-impl ConfigurationView {
-    fn new(state: Entity<State>, window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let api_key_editor =
-            cx.new(|cx| InputField::new(window, cx, "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"));
-        let codestral_api_key_editor =
-            cx.new(|cx| InputField::new(window, cx, "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"));
-
-        cx.observe(&state, |_, _, cx| {
-            cx.notify();
-        })
-        .detach();
-
-        let load_credentials_task = Some(cx.spawn_in(window, {
-            let state = state.clone();
-            async move |this, cx| {
-                if let Some(task) = state
-                    .update(cx, |state, cx| state.authenticate(cx))
-                    .log_err()
-                {
-                    // We don't log an error, because "not signed in" is also an error.
-                    let _ = task.await;
-                }
-                if let Some(task) = state
-                    .update(cx, |state, cx| state.authenticate_codestral(cx))
-                    .log_err()
-                {
-                    let _ = task.await;
-                }
-
-                this.update(cx, |this, cx| {
-                    this.load_credentials_task = None;
-                    cx.notify();
-                })
-                .log_err();
-            }
-        }));
-
-        Self {
-            api_key_editor,
-            codestral_api_key_editor,
-            state,
-            load_credentials_task,
-        }
-    }
-
-    fn save_api_key(&mut self, _: &menu::Confirm, window: &mut Window, cx: &mut Context<Self>) {
-        let api_key = self.api_key_editor.read(cx).text(cx).trim().to_string();
-        if api_key.is_empty() {
-            return;
-        }
-
-        // url changes can cause the editor to be displayed again
-        self.api_key_editor
-            .update(cx, |editor, cx| editor.set_text("", window, cx));
-
-        let state = self.state.clone();
-        cx.spawn_in(window, async move |_, cx| {
-            state
-                .update(cx, |state, cx| state.set_api_key(Some(api_key), cx))?
-                .await
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn reset_api_key(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.api_key_editor
-            .update(cx, |editor, cx| editor.set_text("", window, cx));
-
-        let state = self.state.clone();
-        cx.spawn_in(window, async move |_, cx| {
-            state
-                .update(cx, |state, cx| state.set_api_key(None, cx))?
-                .await
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn save_codestral_api_key(
-        &mut self,
-        _: &menu::Confirm,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let api_key = self
-            .codestral_api_key_editor
-            .read(cx)
-            .text(cx)
-            .trim()
-            .to_string();
-        if api_key.is_empty() {
-            return;
-        }
-
-        // url changes can cause the editor to be displayed again
-        self.codestral_api_key_editor
-            .update(cx, |editor, cx| editor.set_text("", window, cx));
-
-        let state = self.state.clone();
-        cx.spawn_in(window, async move |_, cx| {
-            state
-                .update(cx, |state, cx| {
-                    state.set_codestral_api_key(Some(api_key), cx)
-                })?
-                .await?;
-            cx.update(|_window, cx| {
-                set_edit_prediction_provider(EditPredictionProvider::Codestral, cx)
-            })
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn reset_codestral_api_key(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.codestral_api_key_editor
-            .update(cx, |editor, cx| editor.set_text("", window, cx));
-
-        let state = self.state.clone();
-        cx.spawn_in(window, async move |_, cx| {
-            state
-                .update(cx, |state, cx| state.set_codestral_api_key(None, cx))?
-                .await?;
-            cx.update(|_window, cx| set_edit_prediction_provider(EditPredictionProvider::Zed, cx))
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn should_render_api_key_editor(&self, cx: &mut Context<Self>) -> bool {
-        !self.state.read(cx).is_authenticated()
-    }
-
-    fn render_codestral_api_key_editor(&mut self, cx: &mut Context<Self>) -> AnyElement {
-        let key_state = &self.state.read(cx).codestral_api_key_state;
-        let should_show_editor = !key_state.has_key();
-        let env_var_set = key_state.is_from_env_var();
-        let configured_card_label = if env_var_set {
-            format!("API key set in {CODESTRAL_API_KEY_ENV_VAR_NAME} environment variable")
-        } else {
-            "Codestral API key configured".to_string()
-        };
-
-        if should_show_editor {
-            v_flex()
-                .id("codestral")
-                .size_full()
-                .mt_2()
-                .on_action(cx.listener(Self::save_codestral_api_key))
-                .child(Label::new(
-                    "To use Codestral as an edit prediction provider, \
-                    you need to add a Codestral-specific API key. Follow these steps:",
-                ))
-                .child(
-                    List::new()
-                        .child(InstructionListItem::new(
-                            "Create one by visiting",
-                            Some("the Codestral section of Mistral's console"),
-                            Some("https://console.mistral.ai/codestral"),
-                        ))
-                        .child(InstructionListItem::text_only("Paste your API key below and hit enter")),
-                )
-                .child(self.codestral_api_key_editor.clone())
-                .child(
-                    Label::new(
-                        format!("You can also assign the {CODESTRAL_API_KEY_ENV_VAR_NAME} environment variable and restart Zed."),
-                    )
-                    .size(LabelSize::Small).color(Color::Muted),
-                ).into_any()
-        } else {
-            ConfiguredApiCard::new(configured_card_label)
-                .disabled(env_var_set)
-                .on_click(cx.listener(|this, _, window, cx| this.reset_api_key(window, cx)))
-                .when(env_var_set, |this| {
-                    this.tooltip_label(format!(
-                        "To reset your API key, \
-                            unset the {CODESTRAL_API_KEY_ENV_VAR_NAME} environment variable."
-                    ))
-                })
-                .on_click(
-                    cx.listener(|this, _, window, cx| this.reset_codestral_api_key(window, cx)),
-                )
-                .into_any_element()
-        }
-    }
-}
-
-impl Render for ConfigurationView {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let env_var_set = self.state.read(cx).api_key_state.is_from_env_var();
-        let configured_card_label = if env_var_set {
-            format!("API key set in {API_KEY_ENV_VAR_NAME} environment variable")
-        } else {
-            let api_url = MistralLanguageModelProvider::api_url(cx);
-            if api_url == MISTRAL_API_URL {
-                "API key configured".to_string()
-            } else {
-                format!("API key configured for {}", api_url)
-            }
-        };
-
-        if self.load_credentials_task.is_some() {
-            div().child(Label::new("Loading credentials...")).into_any()
-        } else if self.should_render_api_key_editor(cx) {
-            v_flex()
-                .size_full()
-                .on_action(cx.listener(Self::save_api_key))
-                .child(Label::new("To use Zed's agent with Mistral, you need to add an API key. Follow these steps:"))
-                .child(
-                    List::new()
-                        .child(InstructionListItem::new(
-                            "Create one by visiting",
-                            Some("Mistral's console"),
-                            Some("https://console.mistral.ai/api-keys"),
-                        ))
-                        .child(InstructionListItem::text_only(
-                            "Ensure your Mistral account has credits",
-                        ))
-                        .child(InstructionListItem::text_only(
-                            "Paste your API key below and hit enter to start using the assistant",
-                        )),
-                )
-                .child(self.api_key_editor.clone())
-                .child(
-                    Label::new(
-                        format!("You can also assign the {API_KEY_ENV_VAR_NAME} environment variable and restart Zed."),
-                    )
-                    .size(LabelSize::Small).color(Color::Muted),
-                )
-                .child(self.render_codestral_api_key_editor(cx))
-                .into_any()
-        } else {
-            v_flex()
-                .size_full()
-                .gap_1()
-                .child(
-                    ConfiguredApiCard::new(configured_card_label)
-                        .disabled(env_var_set)
-                        .on_click(cx.listener(|this, _, window, cx| this.reset_api_key(window, cx)))
-                        .when(env_var_set, |this| {
-                            this.tooltip_label(format!(
-                                "To reset your API key, \
-                                unset the {API_KEY_ENV_VAR_NAME} environment variable."
-                            ))
-                        }),
-                )
-                .child(self.render_codestral_api_key_editor(cx))
-                .into_any()
-        }
-    }
-}
-
-fn set_edit_prediction_provider(provider: EditPredictionProvider, cx: &mut App) {
-    let fs = <dyn Fs>::global(cx);
-    update_settings_file(fs, cx, move |settings, _| {
-        settings
-            .project
-            .all_languages
-            .features
-            .get_or_insert_default()
-            .edit_prediction_provider = Some(provider);
-    });
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use language_model::{LanguageModelImage, LanguageModelRequestMessage, MessageContent};
-
-    #[test]
-    fn test_into_mistral_basic_conversion() {
-        let request = LanguageModelRequest {
-            messages: vec![
-                LanguageModelRequestMessage {
-                    role: Role::System,
-                    content: vec![MessageContent::Text("System prompt".into())],
-                    cache: false,
-                    reasoning_details: None,
-                },
-                LanguageModelRequestMessage {
-                    role: Role::User,
-                    content: vec![MessageContent::Text("Hello".into())],
-                    cache: false,
-                    reasoning_details: None,
-                },
-            ],
-            temperature: Some(0.5),
-            tools: vec![],
-            tool_choice: None,
-            thread_id: None,
-            prompt_id: None,
-            intent: None,
-            mode: None,
-            stop: vec![],
-            thinking_allowed: true,
-        };
-
-        let mistral_request = into_mistral(request, mistral::Model::MistralSmallLatest, None);
-
-        assert_eq!(mistral_request.model, "mistral-small-latest");
-        assert_eq!(mistral_request.temperature, Some(0.5));
-        assert_eq!(mistral_request.messages.len(), 2);
-        assert!(mistral_request.stream);
-    }
-
-    #[test]
-    fn test_into_mistral_with_image() {
-        let request = LanguageModelRequest {
-            messages: vec![LanguageModelRequestMessage {
-                role: Role::User,
-                content: vec![
-                    MessageContent::Text("What's in this image?".into()),
-                    MessageContent::Image(LanguageModelImage {
-                        source: "base64data".into(),
-                        size: Default::default(),
-                    }),
-                ],
-                cache: false,
-                reasoning_details: None,
-            }],
-            tools: vec![],
-            tool_choice: None,
-            temperature: None,
-            thread_id: None,
-            prompt_id: None,
-            intent: None,
-            mode: None,
-            stop: vec![],
-            thinking_allowed: true,
-        };
-
-        let mistral_request = into_mistral(request, mistral::Model::Pixtral12BLatest, None);
-
-        assert_eq!(mistral_request.messages.len(), 1);
-        assert!(matches!(
-            &mistral_request.messages[0],
-            mistral::RequestMessage::User {
-                content: mistral::MessageContent::Multipart { .. }
-            }
-        ));
-
-        if let mistral::RequestMessage::User {
-            content: mistral::MessageContent::Multipart { content },
-        } = &mistral_request.messages[0]
-        {
-            assert_eq!(content.len(), 2);
-            assert!(matches!(
-                &content[0],
-                mistral::MessagePart::Text { text } if text == "What's in this image?"
-            ));
-            assert!(matches!(
-                &content[1],
-                mistral::MessagePart::ImageUrl { image_url } if image_url.starts_with("data:image/png;base64,")
-            ));
-        }
-    }
-}
diff --git a/crates/language_models/src/provider/ollama.rs b/crates/language_models/src/provider/ollama.rs
deleted file mode 100644
index 8345db3cce..0000000000
--- a/crates/language_models/src/provider/ollama.rs
+++ /dev/null
@@ -1,929 +0,0 @@
-use anyhow::{Result, anyhow};
-use fs::Fs;
-use futures::{FutureExt, StreamExt, future::BoxFuture, stream::BoxStream};
-use futures::{Stream, TryFutureExt, stream};
-use gpui::{AnyView, App, AsyncApp, Context, CursorStyle, Entity, Task};
-use http_client::HttpClient;
-use language_model::{
-    AuthenticateError, LanguageModel, LanguageModelCompletionError, LanguageModelCompletionEvent,
-    LanguageModelId, LanguageModelName, LanguageModelProvider, LanguageModelProviderId,
-    LanguageModelProviderName, LanguageModelProviderState, LanguageModelRequest,
-    LanguageModelRequestTool, LanguageModelToolChoice, LanguageModelToolUse,
-    LanguageModelToolUseId, MessageContent, RateLimiter, Role, StopReason, TokenUsage,
-};
-use menu;
-use ollama::{
-    ChatMessage, ChatOptions, ChatRequest, ChatResponseDelta, OLLAMA_API_URL, OllamaFunctionCall,
-    OllamaFunctionTool, OllamaToolCall, get_models, show_model, stream_chat_completion,
-};
-pub use settings::OllamaAvailableModel as AvailableModel;
-use settings::{Settings, SettingsStore, update_settings_file};
-use std::pin::Pin;
-use std::sync::LazyLock;
-use std::sync::atomic::{AtomicU64, Ordering};
-use std::{collections::HashMap, sync::Arc};
-use ui::{ButtonLike, ElevationIndex, List, Tooltip, prelude::*};
-use ui_input::InputField;
-use zed_env_vars::{EnvVar, env_var};
-
-use crate::AllLanguageModelSettings;
-use crate::api_key::ApiKeyState;
-use crate::ui::{ConfiguredApiCard, InstructionListItem};
-
-const OLLAMA_DOWNLOAD_URL: &str = "https://ollama.com/download";
-const OLLAMA_LIBRARY_URL: &str = "https://ollama.com/library";
-const OLLAMA_SITE: &str = "https://ollama.com/";
-
-const PROVIDER_ID: LanguageModelProviderId = LanguageModelProviderId::new("ollama");
-const PROVIDER_NAME: LanguageModelProviderName = LanguageModelProviderName::new("Ollama");
-
-const API_KEY_ENV_VAR_NAME: &str = "OLLAMA_API_KEY";
-static API_KEY_ENV_VAR: LazyLock<EnvVar> = env_var!(API_KEY_ENV_VAR_NAME);
-
-#[derive(Default, Debug, Clone, PartialEq)]
-pub struct OllamaSettings {
-    pub api_url: String,
-    pub available_models: Vec<AvailableModel>,
-}
-
-pub struct OllamaLanguageModelProvider {
-    http_client: Arc<dyn HttpClient>,
-    state: Entity<State>,
-}
-
-pub struct State {
-    api_key_state: ApiKeyState,
-    http_client: Arc<dyn HttpClient>,
-    fetched_models: Vec<ollama::Model>,
-    fetch_model_task: Option<Task<Result<()>>>,
-}
-
-impl State {
-    fn is_authenticated(&self) -> bool {
-        !self.fetched_models.is_empty()
-    }
-
-    fn set_api_key(&mut self, api_key: Option<String>, cx: &mut Context<Self>) -> Task<Result<()>> {
-        let api_url = OllamaLanguageModelProvider::api_url(cx);
-        let task = self
-            .api_key_state
-            .store(api_url, api_key, |this| &mut this.api_key_state, cx);
-
-        self.fetched_models.clear();
-        cx.spawn(async move |this, cx| {
-            let result = task.await;
-            this.update(cx, |this, cx| this.restart_fetch_models_task(cx))
-                .ok();
-            result
-        })
-    }
-
-    fn authenticate(&mut self, cx: &mut Context<Self>) -> Task<Result<(), AuthenticateError>> {
-        let api_url = OllamaLanguageModelProvider::api_url(cx);
-        let task = self.api_key_state.load_if_needed(
-            api_url,
-            &API_KEY_ENV_VAR,
-            |this| &mut this.api_key_state,
-            cx,
-        );
-
-        // Always try to fetch models - if no API key is needed (local Ollama), it will work
-        // If API key is needed and provided, it will work
-        // If API key is needed and not provided, it will fail gracefully
-        cx.spawn(async move |this, cx| {
-            let result = task.await;
-            this.update(cx, |this, cx| this.restart_fetch_models_task(cx))
-                .ok();
-            result
-        })
-    }
-
-    fn fetch_models(&mut self, cx: &mut Context<Self>) -> Task<Result<()>> {
-        let http_client = Arc::clone(&self.http_client);
-        let api_url = OllamaLanguageModelProvider::api_url(cx);
-        let api_key = self.api_key_state.key(&api_url);
-
-        // As a proxy for the server being "authenticated", we'll check if its up by fetching the models
-        cx.spawn(async move |this, cx| {
-            let models = get_models(http_client.as_ref(), &api_url, api_key.as_deref()).await?;
-
-            let tasks = models
-                .into_iter()
-                // Since there is no metadata from the Ollama API
-                // indicating which models are embedding models,
-                // simply filter out models with "-embed" in their name
-                .filter(|model| !model.name.contains("-embed"))
-                .map(|model| {
-                    let http_client = Arc::clone(&http_client);
-                    let api_url = api_url.clone();
-                    let api_key = api_key.clone();
-                    async move {
-                        let name = model.name.as_str();
-                        let model =
-                            show_model(http_client.as_ref(), &api_url, api_key.as_deref(), name)
-                                .await?;
-                        let ollama_model = ollama::Model::new(
-                            name,
-                            None,
-                            model.context_length,
-                            Some(model.supports_tools()),
-                            Some(model.supports_vision()),
-                            Some(model.supports_thinking()),
-                        );
-                        Ok(ollama_model)
-                    }
-                });
-
-            // Rate-limit capability fetches
-            // since there is an arbitrary number of models available
-            let mut ollama_models: Vec<_> = futures::stream::iter(tasks)
-                .buffer_unordered(5)
-                .collect::<Vec<Result<_>>>()
-                .await
-                .into_iter()
-                .collect::<Result<Vec<_>>>()?;
-
-            ollama_models.sort_by(|a, b| a.name.cmp(&b.name));
-
-            this.update(cx, |this, cx| {
-                this.fetched_models = ollama_models;
-                cx.notify();
-            })
-        })
-    }
-
-    fn restart_fetch_models_task(&mut self, cx: &mut Context<Self>) {
-        let task = self.fetch_models(cx);
-        self.fetch_model_task.replace(task);
-    }
-}
-
-impl OllamaLanguageModelProvider {
-    pub fn new(http_client: Arc<dyn HttpClient>, cx: &mut App) -> Self {
-        let this = Self {
-            http_client: http_client.clone(),
-            state: cx.new(|cx| {
-                cx.observe_global::<SettingsStore>({
-                    let mut last_settings = OllamaLanguageModelProvider::settings(cx).clone();
-                    move |this: &mut State, cx| {
-                        let current_settings = OllamaLanguageModelProvider::settings(cx);
-                        let settings_changed = current_settings != &last_settings;
-                        if settings_changed {
-                            let url_changed = last_settings.api_url != current_settings.api_url;
-                            last_settings = current_settings.clone();
-                            if url_changed {
-                                this.fetched_models.clear();
-                                this.authenticate(cx).detach();
-                            }
-                            cx.notify();
-                        }
-                    }
-                })
-                .detach();
-
-                State {
-                    http_client,
-                    fetched_models: Default::default(),
-                    fetch_model_task: None,
-                    api_key_state: ApiKeyState::new(Self::api_url(cx)),
-                }
-            }),
-        };
-        this
-    }
-
-    fn settings(cx: &App) -> &OllamaSettings {
-        &AllLanguageModelSettings::get_global(cx).ollama
-    }
-
-    fn api_url(cx: &App) -> SharedString {
-        let api_url = &Self::settings(cx).api_url;
-        if api_url.is_empty() {
-            OLLAMA_API_URL.into()
-        } else {
-            SharedString::new(api_url.as_str())
-        }
-    }
-}
-
-impl LanguageModelProviderState for OllamaLanguageModelProvider {
-    type ObservableEntity = State;
-
-    fn observable_entity(&self) -> Option<Entity<Self::ObservableEntity>> {
-        Some(self.state.clone())
-    }
-}
-
-impl LanguageModelProvider for OllamaLanguageModelProvider {
-    fn id(&self) -> LanguageModelProviderId {
-        PROVIDER_ID
-    }
-
-    fn name(&self) -> LanguageModelProviderName {
-        PROVIDER_NAME
-    }
-
-    fn icon(&self) -> IconName {
-        IconName::AiOllama
-    }
-
-    fn default_model(&self, _: &App) -> Option<Arc<dyn LanguageModel>> {
-        // We shouldn't try to select default model, because it might lead to a load call for an unloaded model.
-        // In a constrained environment where user might not have enough resources it'll be a bad UX to select something
-        // to load by default.
-        None
-    }
-
-    fn default_fast_model(&self, _: &App) -> Option<Arc<dyn LanguageModel>> {
-        // See explanation for default_model.
-        None
-    }
-
-    fn provided_models(&self, cx: &App) -> Vec<Arc<dyn LanguageModel>> {
-        let mut models: HashMap<String, ollama::Model> = HashMap::new();
-
-        // Add models from the Ollama API
-        for model in self.state.read(cx).fetched_models.iter() {
-            models.insert(model.name.clone(), model.clone());
-        }
-
-        // Override with available models from settings
-        for setting_model in &OllamaLanguageModelProvider::settings(cx).available_models {
-            let setting_base = setting_model.name.split(':').next().unwrap();
-            if let Some(model) = models
-                .values_mut()
-                .find(|m| m.name.split(':').next().unwrap() == setting_base)
-            {
-                model.max_tokens = setting_model.max_tokens;
-                model.display_name = setting_model.display_name.clone();
-                model.keep_alive = setting_model.keep_alive.clone();
-                model.supports_tools = setting_model.supports_tools;
-                model.supports_vision = setting_model.supports_images;
-                model.supports_thinking = setting_model.supports_thinking;
-            } else {
-                models.insert(
-                    setting_model.name.clone(),
-                    ollama::Model {
-                        name: setting_model.name.clone(),
-                        display_name: setting_model.display_name.clone(),
-                        max_tokens: setting_model.max_tokens,
-                        keep_alive: setting_model.keep_alive.clone(),
-                        supports_tools: setting_model.supports_tools,
-                        supports_vision: setting_model.supports_images,
-                        supports_thinking: setting_model.supports_thinking,
-                    },
-                );
-            }
-        }
-
-        let mut models = models
-            .into_values()
-            .map(|model| {
-                Arc::new(OllamaLanguageModel {
-                    id: LanguageModelId::from(model.name.clone()),
-                    model,
-                    http_client: self.http_client.clone(),
-                    request_limiter: RateLimiter::new(4),
-                    state: self.state.clone(),
-                }) as Arc<dyn LanguageModel>
-            })
-            .collect::<Vec<_>>();
-        models.sort_by_key(|model| model.name());
-        models
-    }
-
-    fn is_authenticated(&self, cx: &App) -> bool {
-        self.state.read(cx).is_authenticated()
-    }
-
-    fn authenticate(&self, cx: &mut App) -> Task<Result<(), AuthenticateError>> {
-        self.state.update(cx, |state, cx| state.authenticate(cx))
-    }
-
-    fn configuration_view(
-        &self,
-        _target_agent: language_model::ConfigurationViewTargetAgent,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> AnyView {
-        let state = self.state.clone();
-        cx.new(|cx| ConfigurationView::new(state, window, cx))
-            .into()
-    }
-
-    fn reset_credentials(&self, cx: &mut App) -> Task<Result<()>> {
-        self.state
-            .update(cx, |state, cx| state.set_api_key(None, cx))
-    }
-}
-
-pub struct OllamaLanguageModel {
-    id: LanguageModelId,
-    model: ollama::Model,
-    http_client: Arc<dyn HttpClient>,
-    request_limiter: RateLimiter,
-    state: Entity<State>,
-}
-
-impl OllamaLanguageModel {
-    fn to_ollama_request(&self, request: LanguageModelRequest) -> ChatRequest {
-        let supports_vision = self.model.supports_vision.unwrap_or(false);
-
-        let mut messages = Vec::with_capacity(request.messages.len());
-
-        for mut msg in request.messages.into_iter() {
-            let images = if supports_vision {
-                msg.content
-                    .iter()
-                    .filter_map(|content| match content {
-                        MessageContent::Image(image) => Some(image.source.to_string()),
-                        _ => None,
-                    })
-                    .collect::<Vec<String>>()
-            } else {
-                vec![]
-            };
-
-            match msg.role {
-                Role::User => {
-                    for tool_result in msg
-                        .content
-                        .extract_if(.., |x| matches!(x, MessageContent::ToolResult(..)))
-                    {
-                        match tool_result {
-                            MessageContent::ToolResult(tool_result) => {
-                                messages.push(ChatMessage::Tool {
-                                    tool_name: tool_result.tool_name.to_string(),
-                                    content: tool_result.content.to_str().unwrap_or("").to_string(),
-                                })
-                            }
-                            _ => unreachable!("Only tool result should be extracted"),
-                        }
-                    }
-                    if !msg.content.is_empty() {
-                        messages.push(ChatMessage::User {
-                            content: msg.string_contents(),
-                            images: if images.is_empty() {
-                                None
-                            } else {
-                                Some(images)
-                            },
-                        })
-                    }
-                }
-                Role::Assistant => {
-                    let content = msg.string_contents();
-                    let mut thinking = None;
-                    let mut tool_calls = Vec::new();
-                    for content in msg.content.into_iter() {
-                        match content {
-                            MessageContent::Thinking { text, .. } if !text.is_empty() => {
-                                thinking = Some(text)
-                            }
-                            MessageContent::ToolUse(tool_use) => {
-                                tool_calls.push(OllamaToolCall {
-                                    id: Some(tool_use.id.to_string()),
-                                    function: OllamaFunctionCall {
-                                        name: tool_use.name.to_string(),
-                                        arguments: tool_use.input,
-                                    },
-                                });
-                            }
-                            _ => (),
-                        }
-                    }
-                    messages.push(ChatMessage::Assistant {
-                        content,
-                        tool_calls: Some(tool_calls),
-                        images: if images.is_empty() {
-                            None
-                        } else {
-                            Some(images)
-                        },
-                        thinking,
-                    })
-                }
-                Role::System => messages.push(ChatMessage::System {
-                    content: msg.string_contents(),
-                }),
-            }
-        }
-        ChatRequest {
-            model: self.model.name.clone(),
-            messages,
-            keep_alive: self.model.keep_alive.clone().unwrap_or_default(),
-            stream: true,
-            options: Some(ChatOptions {
-                num_ctx: Some(self.model.max_tokens),
-                stop: Some(request.stop),
-                temperature: request.temperature.or(Some(1.0)),
-                ..Default::default()
-            }),
-            think: self
-                .model
-                .supports_thinking
-                .map(|supports_thinking| supports_thinking && request.thinking_allowed),
-            tools: if self.model.supports_tools.unwrap_or(false) {
-                request.tools.into_iter().map(tool_into_ollama).collect()
-            } else {
-                vec![]
-            },
-        }
-    }
-}
-
-impl LanguageModel for OllamaLanguageModel {
-    fn id(&self) -> LanguageModelId {
-        self.id.clone()
-    }
-
-    fn name(&self) -> LanguageModelName {
-        LanguageModelName::from(self.model.display_name().to_string())
-    }
-
-    fn provider_id(&self) -> LanguageModelProviderId {
-        PROVIDER_ID
-    }
-
-    fn provider_name(&self) -> LanguageModelProviderName {
-        PROVIDER_NAME
-    }
-
-    fn supports_tools(&self) -> bool {
-        self.model.supports_tools.unwrap_or(false)
-    }
-
-    fn supports_images(&self) -> bool {
-        self.model.supports_vision.unwrap_or(false)
-    }
-
-    fn supports_tool_choice(&self, choice: LanguageModelToolChoice) -> bool {
-        match choice {
-            LanguageModelToolChoice::Auto => false,
-            LanguageModelToolChoice::Any => false,
-            LanguageModelToolChoice::None => false,
-        }
-    }
-
-    fn telemetry_id(&self) -> String {
-        format!("ollama/{}", self.model.id())
-    }
-
-    fn max_token_count(&self) -> u64 {
-        self.model.max_token_count()
-    }
-
-    fn count_tokens(
-        &self,
-        request: LanguageModelRequest,
-        _cx: &App,
-    ) -> BoxFuture<'static, Result<u64>> {
-        // There is no endpoint for this _yet_ in Ollama
-        // see: https://github.com/ollama/ollama/issues/1716 and https://github.com/ollama/ollama/issues/3582
-        let token_count = request
-            .messages
-            .iter()
-            .map(|msg| msg.string_contents().chars().count())
-            .sum::<usize>()
-            / 4;
-
-        async move { Ok(token_count as u64) }.boxed()
-    }
-
-    fn stream_completion(
-        &self,
-        request: LanguageModelRequest,
-        cx: &AsyncApp,
-    ) -> BoxFuture<
-        'static,
-        Result<
-            BoxStream<'static, Result<LanguageModelCompletionEvent, LanguageModelCompletionError>>,
-            LanguageModelCompletionError,
-        >,
-    > {
-        let request = self.to_ollama_request(request);
-
-        let http_client = self.http_client.clone();
-        let Ok((api_key, api_url)) = self.state.read_with(cx, |state, cx| {
-            let api_url = OllamaLanguageModelProvider::api_url(cx);
-            (state.api_key_state.key(&api_url), api_url)
-        }) else {
-            return futures::future::ready(Err(anyhow!("App state dropped").into())).boxed();
-        };
-
-        let future = self.request_limiter.stream(async move {
-            let stream =
-                stream_chat_completion(http_client.as_ref(), &api_url, api_key.as_deref(), request)
-                    .await?;
-            let stream = map_to_language_model_completion_events(stream);
-            Ok(stream)
-        });
-
-        future.map_ok(|f| f.boxed()).boxed()
-    }
-}
-
-fn map_to_language_model_completion_events(
-    stream: Pin<Box<dyn Stream<Item = anyhow::Result<ChatResponseDelta>> + Send>>,
-) -> impl Stream<Item = Result<LanguageModelCompletionEvent, LanguageModelCompletionError>> {
-    // Used for creating unique tool use ids
-    static TOOL_CALL_COUNTER: AtomicU64 = AtomicU64::new(0);
-
-    struct State {
-        stream: Pin<Box<dyn Stream<Item = anyhow::Result<ChatResponseDelta>> + Send>>,
-        used_tools: bool,
-    }
-
-    // We need to create a ToolUse and Stop event from a single
-    // response from the original stream
-    let stream = stream::unfold(
-        State {
-            stream,
-            used_tools: false,
-        },
-        async move |mut state| {
-            let response = state.stream.next().await?;
-
-            let delta = match response {
-                Ok(delta) => delta,
-                Err(e) => {
-                    let event = Err(LanguageModelCompletionError::from(anyhow!(e)));
-                    return Some((vec![event], state));
-                }
-            };
-
-            let mut events = Vec::new();
-
-            match delta.message {
-                ChatMessage::User { content, images: _ } => {
-                    events.push(Ok(LanguageModelCompletionEvent::Text(content)));
-                }
-                ChatMessage::System { content } => {
-                    events.push(Ok(LanguageModelCompletionEvent::Text(content)));
-                }
-                ChatMessage::Tool { content, .. } => {
-                    events.push(Ok(LanguageModelCompletionEvent::Text(content)));
-                }
-                ChatMessage::Assistant {
-                    content,
-                    tool_calls,
-                    images: _,
-                    thinking,
-                } => {
-                    if let Some(text) = thinking {
-                        events.push(Ok(LanguageModelCompletionEvent::Thinking {
-                            text,
-                            signature: None,
-                        }));
-                    }
-
-                    if let Some(tool_call) = tool_calls.and_then(|v| v.into_iter().next()) {
-                        let OllamaToolCall { id, function } = tool_call;
-                        let id = id.unwrap_or_else(|| {
-                            format!(
-                                "{}-{}",
-                                &function.name,
-                                TOOL_CALL_COUNTER.fetch_add(1, Ordering::Relaxed)
-                            )
-                        });
-                        let event = LanguageModelCompletionEvent::ToolUse(LanguageModelToolUse {
-                            id: LanguageModelToolUseId::from(id),
-                            name: Arc::from(function.name),
-                            raw_input: function.arguments.to_string(),
-                            input: function.arguments,
-                            is_input_complete: true,
-                            thought_signature: None,
-                        });
-                        events.push(Ok(event));
-                        state.used_tools = true;
-                    } else if !content.is_empty() {
-                        events.push(Ok(LanguageModelCompletionEvent::Text(content)));
-                    }
-                }
-            };
-
-            if delta.done {
-                events.push(Ok(LanguageModelCompletionEvent::UsageUpdate(TokenUsage {
-                    input_tokens: delta.prompt_eval_count.unwrap_or(0),
-                    output_tokens: delta.eval_count.unwrap_or(0),
-                    cache_creation_input_tokens: 0,
-                    cache_read_input_tokens: 0,
-                })));
-                if state.used_tools {
-                    state.used_tools = false;
-                    events.push(Ok(LanguageModelCompletionEvent::Stop(StopReason::ToolUse)));
-                } else {
-                    events.push(Ok(LanguageModelCompletionEvent::Stop(StopReason::EndTurn)));
-                }
-            }
-
-            Some((events, state))
-        },
-    );
-
-    stream.flat_map(futures::stream::iter)
-}
-
-struct ConfigurationView {
-    api_key_editor: Entity<InputField>,
-    api_url_editor: Entity<InputField>,
-    state: Entity<State>,
-}
-
-impl ConfigurationView {
-    pub fn new(state: Entity<State>, window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let api_key_editor = cx.new(|cx| InputField::new(window, cx, "63e02e...").label("API key"));
-
-        let api_url_editor = cx.new(|cx| {
-            let input = InputField::new(window, cx, OLLAMA_API_URL).label("API URL");
-            input.set_text(OllamaLanguageModelProvider::api_url(cx), window, cx);
-            input
-        });
-
-        cx.observe(&state, |_, _, cx| {
-            cx.notify();
-        })
-        .detach();
-
-        Self {
-            api_key_editor,
-            api_url_editor,
-            state,
-        }
-    }
-
-    fn retry_connection(&self, cx: &mut App) {
-        self.state
-            .update(cx, |state, cx| state.restart_fetch_models_task(cx));
-    }
-
-    fn save_api_key(&mut self, _: &menu::Confirm, window: &mut Window, cx: &mut Context<Self>) {
-        let api_key = self.api_key_editor.read(cx).text(cx).trim().to_string();
-        if api_key.is_empty() {
-            return;
-        }
-
-        // url changes can cause the editor to be displayed again
-        self.api_key_editor
-            .update(cx, |input, cx| input.set_text("", window, cx));
-
-        let state = self.state.clone();
-        cx.spawn_in(window, async move |_, cx| {
-            state
-                .update(cx, |state, cx| state.set_api_key(Some(api_key), cx))?
-                .await
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn reset_api_key(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.api_key_editor
-            .update(cx, |input, cx| input.set_text("", window, cx));
-
-        let state = self.state.clone();
-        cx.spawn_in(window, async move |_, cx| {
-            state
-                .update(cx, |state, cx| state.set_api_key(None, cx))?
-                .await
-        })
-        .detach_and_log_err(cx);
-
-        cx.notify();
-    }
-
-    fn save_api_url(&mut self, cx: &mut Context<Self>) {
-        let api_url = self.api_url_editor.read(cx).text(cx).trim().to_string();
-        let current_url = OllamaLanguageModelProvider::api_url(cx);
-        if !api_url.is_empty() && &api_url != &current_url {
-            let fs = <dyn Fs>::global(cx);
-            update_settings_file(fs, cx, move |settings, _| {
-                settings
-                    .language_models
-                    .get_or_insert_default()
-                    .ollama
-                    .get_or_insert_default()
-                    .api_url = Some(api_url);
-            });
-        }
-    }
-
-    fn reset_api_url(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.api_url_editor
-            .update(cx, |input, cx| input.set_text("", window, cx));
-        let fs = <dyn Fs>::global(cx);
-        update_settings_file(fs, cx, |settings, _cx| {
-            if let Some(settings) = settings
-                .language_models
-                .as_mut()
-                .and_then(|models| models.ollama.as_mut())
-            {
-                settings.api_url = Some(OLLAMA_API_URL.into());
-            }
-        });
-        cx.notify();
-    }
-
-    fn render_instructions() -> Div {
-        v_flex()
-            .gap_2()
-            .child(Label::new(
-                "Run LLMs locally on your machine with Ollama, or connect to an Ollama server. \
-                Can provide access to Llama, Mistral, Gemma, and hundreds of other models.",
-            ))
-            .child(Label::new("To use local Ollama:"))
-            .child(
-                List::new()
-                    .child(InstructionListItem::new(
-                        "Download and install Ollama from",
-                        Some("ollama.com"),
-                        Some("https://ollama.com/download"),
-                    ))
-                    .child(InstructionListItem::text_only(
-                        "Start Ollama and download a model: `ollama run gpt-oss:20b`",
-                    ))
-                    .child(InstructionListItem::text_only(
-                        "Click 'Connect' below to start using Ollama in Zed",
-                    )),
-            )
-            .child(Label::new(
-                "Alternatively, you can connect to an Ollama server by specifying its \
-                URL and API key (may not be required):",
-            ))
-    }
-
-    fn render_api_key_editor(&self, cx: &Context<Self>) -> impl IntoElement {
-        let state = self.state.read(cx);
-        let env_var_set = state.api_key_state.is_from_env_var();
-        let configured_card_label = if env_var_set {
-            format!("API key set in {API_KEY_ENV_VAR_NAME} environment variable.")
-        } else {
-            "API key configured".to_string()
-        };
-
-        if !state.api_key_state.has_key() {
-            v_flex()
-              .on_action(cx.listener(Self::save_api_key))
-              .child(self.api_key_editor.clone())
-              .child(
-                  Label::new(
-                      format!("You can also assign the {API_KEY_ENV_VAR_NAME} environment variable and restart Zed.")
-                  )
-                  .size(LabelSize::Small)
-                  .color(Color::Muted),
-              )
-              .into_any_element()
-        } else {
-            ConfiguredApiCard::new(configured_card_label)
-                .disabled(env_var_set)
-                .on_click(cx.listener(|this, _, window, cx| this.reset_api_key(window, cx)))
-                .when(env_var_set, |this| {
-                    this.tooltip_label(format!("To reset your API key, unset the {API_KEY_ENV_VAR_NAME} environment variable."))
-                })
-                .into_any_element()
-        }
-    }
-
-    fn render_api_url_editor(&self, cx: &Context<Self>) -> Div {
-        let api_url = OllamaLanguageModelProvider::api_url(cx);
-        let custom_api_url_set = api_url != OLLAMA_API_URL;
-
-        if custom_api_url_set {
-            h_flex()
-                .p_3()
-                .justify_between()
-                .rounded_md()
-                .border_1()
-                .border_color(cx.theme().colors().border)
-                .bg(cx.theme().colors().elevated_surface_background)
-                .child(
-                    h_flex()
-                        .gap_2()
-                        .child(Icon::new(IconName::Check).color(Color::Success))
-                        .child(v_flex().gap_1().child(Label::new(api_url))),
-                )
-                .child(
-                    Button::new("reset-api-url", "Reset API URL")
-                        .label_size(LabelSize::Small)
-                        .icon(IconName::Undo)
-                        .icon_size(IconSize::Small)
-                        .icon_position(IconPosition::Start)
-                        .layer(ElevationIndex::ModalSurface)
-                        .on_click(
-                            cx.listener(|this, _, window, cx| this.reset_api_url(window, cx)),
-                        ),
-                )
-        } else {
-            v_flex()
-                .on_action(cx.listener(|this, _: &menu::Confirm, _window, cx| {
-                    this.save_api_url(cx);
-                    cx.notify();
-                }))
-                .gap_2()
-                .child(self.api_url_editor.clone())
-        }
-    }
-}
-
-impl Render for ConfigurationView {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let is_authenticated = self.state.read(cx).is_authenticated();
-
-        v_flex()
-            .gap_2()
-            .child(Self::render_instructions())
-            .child(self.render_api_url_editor(cx))
-            .child(self.render_api_key_editor(cx))
-            .child(
-                h_flex()
-                    .w_full()
-                    .justify_between()
-                    .gap_2()
-                    .child(
-                        h_flex()
-                            .w_full()
-                            .gap_2()
-                            .map(|this| {
-                                if is_authenticated {
-                                    this.child(
-                                        Button::new("ollama-site", "Ollama")
-                                            .style(ButtonStyle::Subtle)
-                                            .icon(IconName::ArrowUpRight)
-                                            .icon_size(IconSize::XSmall)
-                                            .icon_color(Color::Muted)
-                                            .on_click(move |_, _, cx| cx.open_url(OLLAMA_SITE))
-                                            .into_any_element(),
-                                    )
-                                } else {
-                                    this.child(
-                                        Button::new("download_ollama_button", "Download Ollama")
-                                            .style(ButtonStyle::Subtle)
-                                            .icon(IconName::ArrowUpRight)
-                                            .icon_size(IconSize::XSmall)
-                                            .icon_color(Color::Muted)
-                                            .on_click(move |_, _, cx| {
-                                                cx.open_url(OLLAMA_DOWNLOAD_URL)
-                                            })
-                                            .into_any_element(),
-                                    )
-                                }
-                            })
-                            .child(
-                                Button::new("view-models", "View All Models")
-                                    .style(ButtonStyle::Subtle)
-                                    .icon(IconName::ArrowUpRight)
-                                    .icon_size(IconSize::XSmall)
-                                    .icon_color(Color::Muted)
-                                    .on_click(move |_, _, cx| cx.open_url(OLLAMA_LIBRARY_URL)),
-                            ),
-                    )
-                    .map(|this| {
-                        if is_authenticated {
-                            this.child(
-                                ButtonLike::new("connected")
-                                    .disabled(true)
-                                    .cursor_style(CursorStyle::Arrow)
-                                    .child(
-                                        h_flex()
-                                            .gap_2()
-                                            .child(Icon::new(IconName::Check).color(Color::Success))
-                                            .child(Label::new("Connected"))
-                                            .into_any_element(),
-                                    )
-                                    .child(
-                                        IconButton::new("refresh-models", IconName::RotateCcw)
-                                            .tooltip(Tooltip::text("Refresh Models"))
-                                            .on_click(cx.listener(|this, _, _, cx| {
-                                                this.state.update(cx, |state, _| {
-                                                    state.fetched_models.clear();
-                                                });
-                                                this.retry_connection(cx);
-                                            })),
-                                    ),
-                            )
-                        } else {
-                            this.child(
-                                Button::new("retry_ollama_models", "Connect")
-                                    .icon_position(IconPosition::Start)
-                                    .icon_size(IconSize::XSmall)
-                                    .icon(IconName::PlayOutlined)
-                                    .on_click(
-                                        cx.listener(move |this, _, _, cx| {
-                                            this.retry_connection(cx)
-                                        }),
-                                    ),
-                            )
-                        }
-                    }),
-            )
-    }
-}
-
-fn tool_into_ollama(tool: LanguageModelRequestTool) -> ollama::OllamaTool {
-    ollama::OllamaTool::Function {
-        function: OllamaFunctionTool {
-            name: tool.name,
-            description: Some(tool.description),
-            parameters: Some(tool.input_schema),
-        },
-    }
-}
diff --git a/crates/language_models/src/provider/open_ai.rs b/crates/language_models/src/provider/open_ai.rs
deleted file mode 100644
index 403b025f51..0000000000
--- a/crates/language_models/src/provider/open_ai.rs
+++ /dev/null
@@ -1,911 +0,0 @@
-use anyhow::{Result, anyhow};
-use collections::{BTreeMap, HashMap};
-use futures::Stream;
-use futures::{FutureExt, StreamExt, future, future::BoxFuture};
-use gpui::{AnyView, App, AsyncApp, Context, Entity, SharedString, Task, Window};
-use http_client::HttpClient;
-use language_model::{
-    AuthenticateError, LanguageModel, LanguageModelCompletionError, LanguageModelCompletionEvent,
-    LanguageModelId, LanguageModelName, LanguageModelProvider, LanguageModelProviderId,
-    LanguageModelProviderName, LanguageModelProviderState, LanguageModelRequest,
-    LanguageModelToolChoice, LanguageModelToolResultContent, LanguageModelToolUse, MessageContent,
-    RateLimiter, Role, StopReason, TokenUsage,
-};
-use menu;
-use open_ai::{
-    ImageUrl, Model, OPEN_AI_API_URL, ReasoningEffort, ResponseStreamEvent, stream_completion,
-};
-use settings::{OpenAiAvailableModel as AvailableModel, Settings, SettingsStore};
-use std::pin::Pin;
-use std::str::FromStr as _;
-use std::sync::{Arc, LazyLock};
-use strum::IntoEnumIterator;
-use ui::{List, prelude::*};
-use ui_input::InputField;
-use util::ResultExt;
-use zed_env_vars::{EnvVar, env_var};
-
-use crate::ui::ConfiguredApiCard;
-use crate::{api_key::ApiKeyState, ui::InstructionListItem};
-
-const PROVIDER_ID: LanguageModelProviderId = language_model::OPEN_AI_PROVIDER_ID;
-const PROVIDER_NAME: LanguageModelProviderName = language_model::OPEN_AI_PROVIDER_NAME;
-
-const API_KEY_ENV_VAR_NAME: &str = "OPENAI_API_KEY";
-static API_KEY_ENV_VAR: LazyLock<EnvVar> = env_var!(API_KEY_ENV_VAR_NAME);
-
-#[derive(Default, Clone, Debug, PartialEq)]
-pub struct OpenAiSettings {
-    pub api_url: String,
-    pub available_models: Vec<AvailableModel>,
-}
-
-pub struct OpenAiLanguageModelProvider {
-    http_client: Arc<dyn HttpClient>,
-    state: Entity<State>,
-}
-
-pub struct State {
-    api_key_state: ApiKeyState,
-}
-
-impl State {
-    fn is_authenticated(&self) -> bool {
-        self.api_key_state.has_key()
-    }
-
-    fn set_api_key(&mut self, api_key: Option<String>, cx: &mut Context<Self>) -> Task<Result<()>> {
-        let api_url = OpenAiLanguageModelProvider::api_url(cx);
-        self.api_key_state
-            .store(api_url, api_key, |this| &mut this.api_key_state, cx)
-    }
-
-    fn authenticate(&mut self, cx: &mut Context<Self>) -> Task<Result<(), AuthenticateError>> {
-        let api_url = OpenAiLanguageModelProvider::api_url(cx);
-        self.api_key_state.load_if_needed(
-            api_url,
-            &API_KEY_ENV_VAR,
-            |this| &mut this.api_key_state,
-            cx,
-        )
-    }
-}
-
-impl OpenAiLanguageModelProvider {
-    pub fn new(http_client: Arc<dyn HttpClient>, cx: &mut App) -> Self {
-        let state = cx.new(|cx| {
-            cx.observe_global::<SettingsStore>(|this: &mut State, cx| {
-                let api_url = Self::api_url(cx);
-                this.api_key_state.handle_url_change(
-                    api_url,
-                    &API_KEY_ENV_VAR,
-                    |this| &mut this.api_key_state,
-                    cx,
-                );
-                cx.notify();
-            })
-            .detach();
-            State {
-                api_key_state: ApiKeyState::new(Self::api_url(cx)),
-            }
-        });
-
-        Self { http_client, state }
-    }
-
-    fn create_language_model(&self, model: open_ai::Model) -> Arc<dyn LanguageModel> {
-        Arc::new(OpenAiLanguageModel {
-            id: LanguageModelId::from(model.id().to_string()),
-            model,
-            state: self.state.clone(),
-            http_client: self.http_client.clone(),
-            request_limiter: RateLimiter::new(4),
-        })
-    }
-
-    fn settings(cx: &App) -> &OpenAiSettings {
-        &crate::AllLanguageModelSettings::get_global(cx).openai
-    }
-
-    fn api_url(cx: &App) -> SharedString {
-        let api_url = &Self::settings(cx).api_url;
-        if api_url.is_empty() {
-            open_ai::OPEN_AI_API_URL.into()
-        } else {
-            SharedString::new(api_url.as_str())
-        }
-    }
-}
-
-impl LanguageModelProviderState for OpenAiLanguageModelProvider {
-    type ObservableEntity = State;
-
-    fn observable_entity(&self) -> Option<Entity<Self::ObservableEntity>> {
-        Some(self.state.clone())
-    }
-}
-
-impl LanguageModelProvider for OpenAiLanguageModelProvider {
-    fn id(&self) -> LanguageModelProviderId {
-        PROVIDER_ID
-    }
-
-    fn name(&self) -> LanguageModelProviderName {
-        PROVIDER_NAME
-    }
-
-    fn icon(&self) -> IconName {
-        IconName::AiOpenAi
-    }
-
-    fn default_model(&self, _cx: &App) -> Option<Arc<dyn LanguageModel>> {
-        Some(self.create_language_model(open_ai::Model::default()))
-    }
-
-    fn default_fast_model(&self, _cx: &App) -> Option<Arc<dyn LanguageModel>> {
-        Some(self.create_language_model(open_ai::Model::default_fast()))
-    }
-
-    fn provided_models(&self, cx: &App) -> Vec<Arc<dyn LanguageModel>> {
-        let mut models = BTreeMap::default();
-
-        // Add base models from open_ai::Model::iter()
-        for model in open_ai::Model::iter() {
-            if !matches!(model, open_ai::Model::Custom { .. }) {
-                models.insert(model.id().to_string(), model);
-            }
-        }
-
-        // Override with available models from settings
-        for model in &OpenAiLanguageModelProvider::settings(cx).available_models {
-            models.insert(
-                model.name.clone(),
-                open_ai::Model::Custom {
-                    name: model.name.clone(),
-                    display_name: model.display_name.clone(),
-                    max_tokens: model.max_tokens,
-                    max_output_tokens: model.max_output_tokens,
-                    max_completion_tokens: model.max_completion_tokens,
-                    reasoning_effort: model.reasoning_effort.clone(),
-                },
-            );
-        }
-
-        models
-            .into_values()
-            .map(|model| self.create_language_model(model))
-            .collect()
-    }
-
-    fn is_authenticated(&self, cx: &App) -> bool {
-        self.state.read(cx).is_authenticated()
-    }
-
-    fn authenticate(&self, cx: &mut App) -> Task<Result<(), AuthenticateError>> {
-        self.state.update(cx, |state, cx| state.authenticate(cx))
-    }
-
-    fn configuration_view(
-        &self,
-        _target_agent: language_model::ConfigurationViewTargetAgent,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> AnyView {
-        cx.new(|cx| ConfigurationView::new(self.state.clone(), window, cx))
-            .into()
-    }
-
-    fn reset_credentials(&self, cx: &mut App) -> Task<Result<()>> {
-        self.state
-            .update(cx, |state, cx| state.set_api_key(None, cx))
-    }
-}
-
-pub struct OpenAiLanguageModel {
-    id: LanguageModelId,
-    model: open_ai::Model,
-    state: Entity<State>,
-    http_client: Arc<dyn HttpClient>,
-    request_limiter: RateLimiter,
-}
-
-impl OpenAiLanguageModel {
-    fn stream_completion(
-        &self,
-        request: open_ai::Request,
-        cx: &AsyncApp,
-    ) -> BoxFuture<'static, Result<futures::stream::BoxStream<'static, Result<ResponseStreamEvent>>>>
-    {
-        let http_client = self.http_client.clone();
-
-        let Ok((api_key, api_url)) = self.state.read_with(cx, |state, cx| {
-            let api_url = OpenAiLanguageModelProvider::api_url(cx);
-            (state.api_key_state.key(&api_url), api_url)
-        }) else {
-            return future::ready(Err(anyhow!("App state dropped"))).boxed();
-        };
-
-        let future = self.request_limiter.stream(async move {
-            let provider = PROVIDER_NAME;
-            let Some(api_key) = api_key else {
-                return Err(LanguageModelCompletionError::NoApiKey { provider });
-            };
-            let request = stream_completion(
-                http_client.as_ref(),
-                provider.0.as_str(),
-                &api_url,
-                &api_key,
-                request,
-            );
-            let response = request.await?;
-            Ok(response)
-        });
-
-        async move { Ok(future.await?.boxed()) }.boxed()
-    }
-}
-
-impl LanguageModel for OpenAiLanguageModel {
-    fn id(&self) -> LanguageModelId {
-        self.id.clone()
-    }
-
-    fn name(&self) -> LanguageModelName {
-        LanguageModelName::from(self.model.display_name().to_string())
-    }
-
-    fn provider_id(&self) -> LanguageModelProviderId {
-        PROVIDER_ID
-    }
-
-    fn provider_name(&self) -> LanguageModelProviderName {
-        PROVIDER_NAME
-    }
-
-    fn supports_tools(&self) -> bool {
-        true
-    }
-
-    fn supports_images(&self) -> bool {
-        use open_ai::Model;
-        match &self.model {
-            Model::FourOmni
-            | Model::FourOmniMini
-            | Model::FourPointOne
-            | Model::FourPointOneMini
-            | Model::FourPointOneNano
-            | Model::Five
-            | Model::FiveMini
-            | Model::FiveNano
-            | Model::FivePointOne
-            | Model::FivePointTwo
-            | Model::O1
-            | Model::O3
-            | Model::O4Mini => true,
-            Model::ThreePointFiveTurbo
-            | Model::Four
-            | Model::FourTurbo
-            | Model::O3Mini
-            | Model::Custom { .. } => false,
-        }
-    }
-
-    fn supports_tool_choice(&self, choice: LanguageModelToolChoice) -> bool {
-        match choice {
-            LanguageModelToolChoice::Auto => true,
-            LanguageModelToolChoice::Any => true,
-            LanguageModelToolChoice::None => true,
-        }
-    }
-
-    fn telemetry_id(&self) -> String {
-        format!("openai/{}", self.model.id())
-    }
-
-    fn max_token_count(&self) -> u64 {
-        self.model.max_token_count()
-    }
-
-    fn max_output_tokens(&self) -> Option<u64> {
-        self.model.max_output_tokens()
-    }
-
-    fn count_tokens(
-        &self,
-        request: LanguageModelRequest,
-        cx: &App,
-    ) -> BoxFuture<'static, Result<u64>> {
-        count_open_ai_tokens(request, self.model.clone(), cx)
-    }
-
-    fn stream_completion(
-        &self,
-        request: LanguageModelRequest,
-        cx: &AsyncApp,
-    ) -> BoxFuture<
-        'static,
-        Result<
-            futures::stream::BoxStream<
-                'static,
-                Result<LanguageModelCompletionEvent, LanguageModelCompletionError>,
-            >,
-            LanguageModelCompletionError,
-        >,
-    > {
-        let request = into_open_ai(
-            request,
-            self.model.id(),
-            self.model.supports_parallel_tool_calls(),
-            self.model.supports_prompt_cache_key(),
-            self.max_output_tokens(),
-            self.model.reasoning_effort(),
-        );
-        let completions = self.stream_completion(request, cx);
-        async move {
-            let mapper = OpenAiEventMapper::new();
-            Ok(mapper.map_stream(completions.await?).boxed())
-        }
-        .boxed()
-    }
-}
-
-pub fn into_open_ai(
-    request: LanguageModelRequest,
-    model_id: &str,
-    supports_parallel_tool_calls: bool,
-    supports_prompt_cache_key: bool,
-    max_output_tokens: Option<u64>,
-    reasoning_effort: Option<ReasoningEffort>,
-) -> open_ai::Request {
-    let stream = !model_id.starts_with("o1-");
-
-    let mut messages = Vec::new();
-    for message in request.messages {
-        for content in message.content {
-            match content {
-                MessageContent::Text(text) | MessageContent::Thinking { text, .. } => {
-                    if !text.trim().is_empty() {
-                        add_message_content_part(
-                            open_ai::MessagePart::Text { text },
-                            message.role,
-                            &mut messages,
-                        );
-                    }
-                }
-                MessageContent::RedactedThinking(_) => {}
-                MessageContent::Image(image) => {
-                    add_message_content_part(
-                        open_ai::MessagePart::Image {
-                            image_url: ImageUrl {
-                                url: image.to_base64_url(),
-                                detail: None,
-                            },
-                        },
-                        message.role,
-                        &mut messages,
-                    );
-                }
-                MessageContent::ToolUse(tool_use) => {
-                    let tool_call = open_ai::ToolCall {
-                        id: tool_use.id.to_string(),
-                        content: open_ai::ToolCallContent::Function {
-                            function: open_ai::FunctionContent {
-                                name: tool_use.name.to_string(),
-                                arguments: serde_json::to_string(&tool_use.input)
-                                    .unwrap_or_default(),
-                            },
-                        },
-                    };
-
-                    if let Some(open_ai::RequestMessage::Assistant { tool_calls, .. }) =
-                        messages.last_mut()
-                    {
-                        tool_calls.push(tool_call);
-                    } else {
-                        messages.push(open_ai::RequestMessage::Assistant {
-                            content: None,
-                            tool_calls: vec![tool_call],
-                        });
-                    }
-                }
-                MessageContent::ToolResult(tool_result) => {
-                    let content = match &tool_result.content {
-                        LanguageModelToolResultContent::Text(text) => {
-                            vec![open_ai::MessagePart::Text {
-                                text: text.to_string(),
-                            }]
-                        }
-                        LanguageModelToolResultContent::Image(image) => {
-                            vec![open_ai::MessagePart::Image {
-                                image_url: ImageUrl {
-                                    url: image.to_base64_url(),
-                                    detail: None,
-                                },
-                            }]
-                        }
-                    };
-
-                    messages.push(open_ai::RequestMessage::Tool {
-                        content: content.into(),
-                        tool_call_id: tool_result.tool_use_id.to_string(),
-                    });
-                }
-            }
-        }
-    }
-
-    open_ai::Request {
-        model: model_id.into(),
-        messages,
-        stream,
-        stop: request.stop,
-        temperature: request.temperature.or(Some(1.0)),
-        max_completion_tokens: max_output_tokens,
-        parallel_tool_calls: if supports_parallel_tool_calls && !request.tools.is_empty() {
-            // Disable parallel tool calls, as the Agent currently expects a maximum of one per turn.
-            Some(false)
-        } else {
-            None
-        },
-        prompt_cache_key: if supports_prompt_cache_key {
-            request.thread_id
-        } else {
-            None
-        },
-        tools: request
-            .tools
-            .into_iter()
-            .map(|tool| open_ai::ToolDefinition::Function {
-                function: open_ai::FunctionDefinition {
-                    name: tool.name,
-                    description: Some(tool.description),
-                    parameters: Some(tool.input_schema),
-                },
-            })
-            .collect(),
-        tool_choice: request.tool_choice.map(|choice| match choice {
-            LanguageModelToolChoice::Auto => open_ai::ToolChoice::Auto,
-            LanguageModelToolChoice::Any => open_ai::ToolChoice::Required,
-            LanguageModelToolChoice::None => open_ai::ToolChoice::None,
-        }),
-        reasoning_effort,
-    }
-}
-
-fn add_message_content_part(
-    new_part: open_ai::MessagePart,
-    role: Role,
-    messages: &mut Vec<open_ai::RequestMessage>,
-) {
-    match (role, messages.last_mut()) {
-        (Role::User, Some(open_ai::RequestMessage::User { content }))
-        | (
-            Role::Assistant,
-            Some(open_ai::RequestMessage::Assistant {
-                content: Some(content),
-                ..
-            }),
-        )
-        | (Role::System, Some(open_ai::RequestMessage::System { content, .. })) => {
-            content.push_part(new_part);
-        }
-        _ => {
-            messages.push(match role {
-                Role::User => open_ai::RequestMessage::User {
-                    content: open_ai::MessageContent::from(vec![new_part]),
-                },
-                Role::Assistant => open_ai::RequestMessage::Assistant {
-                    content: Some(open_ai::MessageContent::from(vec![new_part])),
-                    tool_calls: Vec::new(),
-                },
-                Role::System => open_ai::RequestMessage::System {
-                    content: open_ai::MessageContent::from(vec![new_part]),
-                },
-            });
-        }
-    }
-}
-
-pub struct OpenAiEventMapper {
-    tool_calls_by_index: HashMap<usize, RawToolCall>,
-}
-
-impl OpenAiEventMapper {
-    pub fn new() -> Self {
-        Self {
-            tool_calls_by_index: HashMap::default(),
-        }
-    }
-
-    pub fn map_stream(
-        mut self,
-        events: Pin<Box<dyn Send + Stream<Item = Result<ResponseStreamEvent>>>>,
-    ) -> impl Stream<Item = Result<LanguageModelCompletionEvent, LanguageModelCompletionError>>
-    {
-        events.flat_map(move |event| {
-            futures::stream::iter(match event {
-                Ok(event) => self.map_event(event),
-                Err(error) => vec![Err(LanguageModelCompletionError::from(anyhow!(error)))],
-            })
-        })
-    }
-
-    pub fn map_event(
-        &mut self,
-        event: ResponseStreamEvent,
-    ) -> Vec<Result<LanguageModelCompletionEvent, LanguageModelCompletionError>> {
-        let mut events = Vec::new();
-        if let Some(usage) = event.usage {
-            events.push(Ok(LanguageModelCompletionEvent::UsageUpdate(TokenUsage {
-                input_tokens: usage.prompt_tokens,
-                output_tokens: usage.completion_tokens,
-                cache_creation_input_tokens: 0,
-                cache_read_input_tokens: 0,
-            })));
-        }
-
-        let Some(choice) = event.choices.first() else {
-            return events;
-        };
-
-        if let Some(delta) = choice.delta.as_ref() {
-            if let Some(content) = delta.content.clone() {
-                events.push(Ok(LanguageModelCompletionEvent::Text(content)));
-            }
-
-            if let Some(tool_calls) = delta.tool_calls.as_ref() {
-                for tool_call in tool_calls {
-                    let entry = self.tool_calls_by_index.entry(tool_call.index).or_default();
-
-                    if let Some(tool_id) = tool_call.id.clone() {
-                        entry.id = tool_id;
-                    }
-
-                    if let Some(function) = tool_call.function.as_ref() {
-                        if let Some(name) = function.name.clone() {
-                            entry.name = name;
-                        }
-
-                        if let Some(arguments) = function.arguments.clone() {
-                            entry.arguments.push_str(&arguments);
-                        }
-                    }
-                }
-            }
-        }
-
-        match choice.finish_reason.as_deref() {
-            Some("stop") => {
-                events.push(Ok(LanguageModelCompletionEvent::Stop(StopReason::EndTurn)));
-            }
-            Some("tool_calls") => {
-                events.extend(self.tool_calls_by_index.drain().map(|(_, tool_call)| {
-                    match serde_json::Value::from_str(&tool_call.arguments) {
-                        Ok(input) => Ok(LanguageModelCompletionEvent::ToolUse(
-                            LanguageModelToolUse {
-                                id: tool_call.id.clone().into(),
-                                name: tool_call.name.as_str().into(),
-                                is_input_complete: true,
-                                input,
-                                raw_input: tool_call.arguments.clone(),
-                                thought_signature: None,
-                            },
-                        )),
-                        Err(error) => Ok(LanguageModelCompletionEvent::ToolUseJsonParseError {
-                            id: tool_call.id.into(),
-                            tool_name: tool_call.name.into(),
-                            raw_input: tool_call.arguments.clone().into(),
-                            json_parse_error: error.to_string(),
-                        }),
-                    }
-                }));
-
-                events.push(Ok(LanguageModelCompletionEvent::Stop(StopReason::ToolUse)));
-            }
-            Some(stop_reason) => {
-                log::error!("Unexpected OpenAI stop_reason: {stop_reason:?}",);
-                events.push(Ok(LanguageModelCompletionEvent::Stop(StopReason::EndTurn)));
-            }
-            None => {}
-        }
-
-        events
-    }
-}
-
-#[derive(Default)]
-struct RawToolCall {
-    id: String,
-    name: String,
-    arguments: String,
-}
-
-pub(crate) fn collect_tiktoken_messages(
-    request: LanguageModelRequest,
-) -> Vec<tiktoken_rs::ChatCompletionRequestMessage> {
-    request
-        .messages
-        .into_iter()
-        .map(|message| tiktoken_rs::ChatCompletionRequestMessage {
-            role: match message.role {
-                Role::User => "user".into(),
-                Role::Assistant => "assistant".into(),
-                Role::System => "system".into(),
-            },
-            content: Some(message.string_contents()),
-            name: None,
-            function_call: None,
-        })
-        .collect::<Vec<_>>()
-}
-
-pub fn count_open_ai_tokens(
-    request: LanguageModelRequest,
-    model: Model,
-    cx: &App,
-) -> BoxFuture<'static, Result<u64>> {
-    cx.background_spawn(async move {
-        let messages = collect_tiktoken_messages(request);
-        match model {
-            Model::Custom { max_tokens, .. } => {
-                let model = if max_tokens >= 100_000 {
-                    // If the max tokens is 100k or more, it is likely the o200k_base tokenizer from gpt4o
-                    "gpt-4o"
-                } else {
-                    // Otherwise fallback to gpt-4, since only cl100k_base and o200k_base are
-                    // supported with this tiktoken method
-                    "gpt-4"
-                };
-                tiktoken_rs::num_tokens_from_messages(model, &messages)
-            }
-            // Currently supported by tiktoken_rs
-            // Sometimes tiktoken-rs is behind on model support. If that is the case, make a new branch
-            // arm with an override. We enumerate all supported models here so that we can check if new
-            // models are supported yet or not.
-            Model::ThreePointFiveTurbo
-            | Model::Four
-            | Model::FourTurbo
-            | Model::FourOmni
-            | Model::FourOmniMini
-            | Model::FourPointOne
-            | Model::FourPointOneMini
-            | Model::FourPointOneNano
-            | Model::O1
-            | Model::O3
-            | Model::O3Mini
-            | Model::O4Mini
-            | Model::Five
-            | Model::FiveMini
-            | Model::FiveNano => tiktoken_rs::num_tokens_from_messages(model.id(), &messages),
-            // GPT-5.1 and 5.2 don't have dedicated tiktoken support; use gpt-5 tokenizer
-            Model::FivePointOne | Model::FivePointTwo => {
-                tiktoken_rs::num_tokens_from_messages("gpt-5", &messages)
-            }
-        }
-        .map(|tokens| tokens as u64)
-    })
-    .boxed()
-}
-
-struct ConfigurationView {
-    api_key_editor: Entity<InputField>,
-    state: Entity<State>,
-    load_credentials_task: Option<Task<()>>,
-}
-
-impl ConfigurationView {
-    fn new(state: Entity<State>, window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let api_key_editor = cx.new(|cx| {
-            InputField::new(
-                window,
-                cx,
-                "sk-000000000000000000000000000000000000000000000000",
-            )
-        });
-
-        cx.observe(&state, |_, _, cx| {
-            cx.notify();
-        })
-        .detach();
-
-        let load_credentials_task = Some(cx.spawn_in(window, {
-            let state = state.clone();
-            async move |this, cx| {
-                if let Some(task) = state
-                    .update(cx, |state, cx| state.authenticate(cx))
-                    .log_err()
-                {
-                    // We don't log an error, because "not signed in" is also an error.
-                    let _ = task.await;
-                }
-                this.update(cx, |this, cx| {
-                    this.load_credentials_task = None;
-                    cx.notify();
-                })
-                .log_err();
-            }
-        }));
-
-        Self {
-            api_key_editor,
-            state,
-            load_credentials_task,
-        }
-    }
-
-    fn save_api_key(&mut self, _: &menu::Confirm, window: &mut Window, cx: &mut Context<Self>) {
-        let api_key = self.api_key_editor.read(cx).text(cx).trim().to_string();
-        if api_key.is_empty() {
-            return;
-        }
-
-        // url changes can cause the editor to be displayed again
-        self.api_key_editor
-            .update(cx, |editor, cx| editor.set_text("", window, cx));
-
-        let state = self.state.clone();
-        cx.spawn_in(window, async move |_, cx| {
-            state
-                .update(cx, |state, cx| state.set_api_key(Some(api_key), cx))?
-                .await
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn reset_api_key(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.api_key_editor
-            .update(cx, |input, cx| input.set_text("", window, cx));
-
-        let state = self.state.clone();
-        cx.spawn_in(window, async move |_, cx| {
-            state
-                .update(cx, |state, cx| state.set_api_key(None, cx))?
-                .await
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn should_render_editor(&self, cx: &mut Context<Self>) -> bool {
-        !self.state.read(cx).is_authenticated()
-    }
-}
-
-impl Render for ConfigurationView {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let env_var_set = self.state.read(cx).api_key_state.is_from_env_var();
-        let configured_card_label = if env_var_set {
-            format!("API key set in {API_KEY_ENV_VAR_NAME} environment variable")
-        } else {
-            let api_url = OpenAiLanguageModelProvider::api_url(cx);
-            if api_url == OPEN_AI_API_URL {
-                "API key configured".to_string()
-            } else {
-                format!("API key configured for {}", api_url)
-            }
-        };
-
-        let api_key_section = if self.should_render_editor(cx) {
-            v_flex()
-                .on_action(cx.listener(Self::save_api_key))
-                .child(Label::new("To use Zed's agent with OpenAI, you need to add an API key. Follow these steps:"))
-                .child(
-                    List::new()
-                        .child(InstructionListItem::new(
-                            "Create one by visiting",
-                            Some("OpenAI's console"),
-                            Some("https://platform.openai.com/api-keys"),
-                        ))
-                        .child(InstructionListItem::text_only(
-                            "Ensure your OpenAI account has credits",
-                        ))
-                        .child(InstructionListItem::text_only(
-                            "Paste your API key below and hit enter to start using the assistant",
-                        )),
-                )
-                .child(self.api_key_editor.clone())
-                .child(
-                    Label::new(format!(
-                        "You can also assign the {API_KEY_ENV_VAR_NAME} environment variable and restart Zed."
-                    ))
-                    .size(LabelSize::Small)
-                    .color(Color::Muted),
-                )
-                .child(
-                    Label::new(
-                        "Note that having a subscription for another service like GitHub Copilot won't work.",
-                    )
-                    .size(LabelSize::Small).color(Color::Muted),
-                )
-                .into_any_element()
-        } else {
-            ConfiguredApiCard::new(configured_card_label)
-                .disabled(env_var_set)
-                .on_click(cx.listener(|this, _, window, cx| this.reset_api_key(window, cx)))
-                .when(env_var_set, |this| {
-                    this.tooltip_label(format!("To reset your API key, unset the {API_KEY_ENV_VAR_NAME} environment variable."))
-                })
-                .into_any_element()
-        };
-
-        let compatible_api_section = h_flex()
-            .mt_1p5()
-            .gap_0p5()
-            .flex_wrap()
-            .when(self.should_render_editor(cx), |this| {
-                this.pt_1p5()
-                    .border_t_1()
-                    .border_color(cx.theme().colors().border_variant)
-            })
-            .child(
-                h_flex()
-                    .gap_2()
-                    .child(
-                        Icon::new(IconName::Info)
-                            .size(IconSize::XSmall)
-                            .color(Color::Muted),
-                    )
-                    .child(Label::new("Zed also supports OpenAI-compatible models.")),
-            )
-            .child(
-                Button::new("docs", "Learn More")
-                    .icon(IconName::ArrowUpRight)
-                    .icon_size(IconSize::Small)
-                    .icon_color(Color::Muted)
-                    .on_click(move |_, _window, cx| {
-                        cx.open_url("https://zed.dev/docs/ai/llm-providers#openai-api-compatible")
-                    }),
-            );
-
-        if self.load_credentials_task.is_some() {
-            div().child(Label::new("Loading credentials…")).into_any()
-        } else {
-            v_flex()
-                .size_full()
-                .child(api_key_section)
-                .child(compatible_api_section)
-                .into_any()
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use gpui::TestAppContext;
-    use language_model::LanguageModelRequestMessage;
-
-    use super::*;
-
-    #[gpui::test]
-    fn tiktoken_rs_support(cx: &TestAppContext) {
-        let request = LanguageModelRequest {
-            thread_id: None,
-            prompt_id: None,
-            intent: None,
-            mode: None,
-            messages: vec![LanguageModelRequestMessage {
-                role: Role::User,
-                content: vec![MessageContent::Text("message".into())],
-                cache: false,
-                reasoning_details: None,
-            }],
-            tools: vec![],
-            tool_choice: None,
-            stop: vec![],
-            temperature: None,
-            thinking_allowed: true,
-        };
-
-        // Validate that all models are supported by tiktoken-rs
-        for model in Model::iter() {
-            let count = cx
-                .executor()
-                .block(count_open_ai_tokens(
-                    request.clone(),
-                    model,
-                    &cx.app.borrow(),
-                ))
-                .unwrap();
-            assert!(count > 0);
-        }
-    }
-}
diff --git a/crates/language_models/src/provider/open_ai_compatible.rs b/crates/language_models/src/provider/open_ai_compatible.rs
deleted file mode 100644
index a30c8bfa5d..0000000000
--- a/crates/language_models/src/provider/open_ai_compatible.rs
+++ /dev/null
@@ -1,512 +0,0 @@
-use anyhow::{Result, anyhow};
-use convert_case::{Case, Casing};
-use futures::{FutureExt, StreamExt, future, future::BoxFuture};
-use gpui::{AnyView, App, AsyncApp, Context, Entity, SharedString, Task, Window};
-use http_client::HttpClient;
-use language_model::{
-    AuthenticateError, LanguageModel, LanguageModelCompletionError, LanguageModelCompletionEvent,
-    LanguageModelId, LanguageModelName, LanguageModelProvider, LanguageModelProviderId,
-    LanguageModelProviderName, LanguageModelProviderState, LanguageModelRequest,
-    LanguageModelToolChoice, LanguageModelToolSchemaFormat, RateLimiter,
-};
-use menu;
-use open_ai::{ResponseStreamEvent, stream_completion};
-use settings::{Settings, SettingsStore};
-use std::sync::Arc;
-use ui::{ElevationIndex, Tooltip, prelude::*};
-use ui_input::InputField;
-use util::ResultExt;
-use zed_env_vars::EnvVar;
-
-use crate::api_key::ApiKeyState;
-use crate::provider::open_ai::{OpenAiEventMapper, into_open_ai};
-pub use settings::OpenAiCompatibleAvailableModel as AvailableModel;
-pub use settings::OpenAiCompatibleModelCapabilities as ModelCapabilities;
-
-#[derive(Default, Clone, Debug, PartialEq)]
-pub struct OpenAiCompatibleSettings {
-    pub api_url: String,
-    pub available_models: Vec<AvailableModel>,
-}
-
-pub struct OpenAiCompatibleLanguageModelProvider {
-    id: LanguageModelProviderId,
-    name: LanguageModelProviderName,
-    http_client: Arc<dyn HttpClient>,
-    state: Entity<State>,
-}
-
-pub struct State {
-    id: Arc<str>,
-    api_key_env_var: EnvVar,
-    api_key_state: ApiKeyState,
-    settings: OpenAiCompatibleSettings,
-}
-
-impl State {
-    fn is_authenticated(&self) -> bool {
-        self.api_key_state.has_key()
-    }
-
-    fn set_api_key(&mut self, api_key: Option<String>, cx: &mut Context<Self>) -> Task<Result<()>> {
-        let api_url = SharedString::new(self.settings.api_url.as_str());
-        self.api_key_state
-            .store(api_url, api_key, |this| &mut this.api_key_state, cx)
-    }
-
-    fn authenticate(&mut self, cx: &mut Context<Self>) -> Task<Result<(), AuthenticateError>> {
-        let api_url = SharedString::new(self.settings.api_url.clone());
-        self.api_key_state.load_if_needed(
-            api_url,
-            &self.api_key_env_var,
-            |this| &mut this.api_key_state,
-            cx,
-        )
-    }
-}
-
-impl OpenAiCompatibleLanguageModelProvider {
-    pub fn new(id: Arc<str>, http_client: Arc<dyn HttpClient>, cx: &mut App) -> Self {
-        fn resolve_settings<'a>(id: &'a str, cx: &'a App) -> Option<&'a OpenAiCompatibleSettings> {
-            crate::AllLanguageModelSettings::get_global(cx)
-                .openai_compatible
-                .get(id)
-        }
-
-        let api_key_env_var_name = format!("{}_API_KEY", id).to_case(Case::UpperSnake).into();
-        let state = cx.new(|cx| {
-            cx.observe_global::<SettingsStore>(|this: &mut State, cx| {
-                let Some(settings) = resolve_settings(&this.id, cx).cloned() else {
-                    return;
-                };
-                if &this.settings != &settings {
-                    let api_url = SharedString::new(settings.api_url.as_str());
-                    this.api_key_state.handle_url_change(
-                        api_url,
-                        &this.api_key_env_var,
-                        |this| &mut this.api_key_state,
-                        cx,
-                    );
-                    this.settings = settings;
-                    cx.notify();
-                }
-            })
-            .detach();
-            let settings = resolve_settings(&id, cx).cloned().unwrap_or_default();
-            State {
-                id: id.clone(),
-                api_key_env_var: EnvVar::new(api_key_env_var_name),
-                api_key_state: ApiKeyState::new(SharedString::new(settings.api_url.as_str())),
-                settings,
-            }
-        });
-
-        Self {
-            id: id.clone().into(),
-            name: id.into(),
-            http_client,
-            state,
-        }
-    }
-
-    fn create_language_model(&self, model: AvailableModel) -> Arc<dyn LanguageModel> {
-        Arc::new(OpenAiCompatibleLanguageModel {
-            id: LanguageModelId::from(model.name.clone()),
-            provider_id: self.id.clone(),
-            provider_name: self.name.clone(),
-            model,
-            state: self.state.clone(),
-            http_client: self.http_client.clone(),
-            request_limiter: RateLimiter::new(4),
-        })
-    }
-}
-
-impl LanguageModelProviderState for OpenAiCompatibleLanguageModelProvider {
-    type ObservableEntity = State;
-
-    fn observable_entity(&self) -> Option<Entity<Self::ObservableEntity>> {
-        Some(self.state.clone())
-    }
-}
-
-impl LanguageModelProvider for OpenAiCompatibleLanguageModelProvider {
-    fn id(&self) -> LanguageModelProviderId {
-        self.id.clone()
-    }
-
-    fn name(&self) -> LanguageModelProviderName {
-        self.name.clone()
-    }
-
-    fn icon(&self) -> IconName {
-        IconName::AiOpenAiCompat
-    }
-
-    fn default_model(&self, cx: &App) -> Option<Arc<dyn LanguageModel>> {
-        self.state
-            .read(cx)
-            .settings
-            .available_models
-            .first()
-            .map(|model| self.create_language_model(model.clone()))
-    }
-
-    fn default_fast_model(&self, _cx: &App) -> Option<Arc<dyn LanguageModel>> {
-        None
-    }
-
-    fn provided_models(&self, cx: &App) -> Vec<Arc<dyn LanguageModel>> {
-        self.state
-            .read(cx)
-            .settings
-            .available_models
-            .iter()
-            .map(|model| self.create_language_model(model.clone()))
-            .collect()
-    }
-
-    fn is_authenticated(&self, cx: &App) -> bool {
-        self.state.read(cx).is_authenticated()
-    }
-
-    fn authenticate(&self, cx: &mut App) -> Task<Result<(), AuthenticateError>> {
-        self.state.update(cx, |state, cx| state.authenticate(cx))
-    }
-
-    fn configuration_view(
-        &self,
-        _target_agent: language_model::ConfigurationViewTargetAgent,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> AnyView {
-        cx.new(|cx| ConfigurationView::new(self.state.clone(), window, cx))
-            .into()
-    }
-
-    fn reset_credentials(&self, cx: &mut App) -> Task<Result<()>> {
-        self.state
-            .update(cx, |state, cx| state.set_api_key(None, cx))
-    }
-}
-
-pub struct OpenAiCompatibleLanguageModel {
-    id: LanguageModelId,
-    provider_id: LanguageModelProviderId,
-    provider_name: LanguageModelProviderName,
-    model: AvailableModel,
-    state: Entity<State>,
-    http_client: Arc<dyn HttpClient>,
-    request_limiter: RateLimiter,
-}
-
-impl OpenAiCompatibleLanguageModel {
-    fn stream_completion(
-        &self,
-        request: open_ai::Request,
-        cx: &AsyncApp,
-    ) -> BoxFuture<
-        'static,
-        Result<
-            futures::stream::BoxStream<'static, Result<ResponseStreamEvent>>,
-            LanguageModelCompletionError,
-        >,
-    > {
-        let http_client = self.http_client.clone();
-
-        let Ok((api_key, api_url)) = self.state.read_with(cx, |state, _cx| {
-            let api_url = &state.settings.api_url;
-            (
-                state.api_key_state.key(api_url),
-                state.settings.api_url.clone(),
-            )
-        }) else {
-            return future::ready(Err(anyhow!("App state dropped").into())).boxed();
-        };
-
-        let provider = self.provider_name.clone();
-        let future = self.request_limiter.stream(async move {
-            let Some(api_key) = api_key else {
-                return Err(LanguageModelCompletionError::NoApiKey { provider });
-            };
-            let request = stream_completion(
-                http_client.as_ref(),
-                provider.0.as_str(),
-                &api_url,
-                &api_key,
-                request,
-            );
-            let response = request.await?;
-            Ok(response)
-        });
-
-        async move { Ok(future.await?.boxed()) }.boxed()
-    }
-}
-
-impl LanguageModel for OpenAiCompatibleLanguageModel {
-    fn id(&self) -> LanguageModelId {
-        self.id.clone()
-    }
-
-    fn name(&self) -> LanguageModelName {
-        LanguageModelName::from(
-            self.model
-                .display_name
-                .clone()
-                .unwrap_or_else(|| self.model.name.clone()),
-        )
-    }
-
-    fn provider_id(&self) -> LanguageModelProviderId {
-        self.provider_id.clone()
-    }
-
-    fn provider_name(&self) -> LanguageModelProviderName {
-        self.provider_name.clone()
-    }
-
-    fn supports_tools(&self) -> bool {
-        self.model.capabilities.tools
-    }
-
-    fn tool_input_format(&self) -> LanguageModelToolSchemaFormat {
-        LanguageModelToolSchemaFormat::JsonSchemaSubset
-    }
-
-    fn supports_images(&self) -> bool {
-        self.model.capabilities.images
-    }
-
-    fn supports_tool_choice(&self, choice: LanguageModelToolChoice) -> bool {
-        match choice {
-            LanguageModelToolChoice::Auto => self.model.capabilities.tools,
-            LanguageModelToolChoice::Any => self.model.capabilities.tools,
-            LanguageModelToolChoice::None => true,
-        }
-    }
-
-    fn telemetry_id(&self) -> String {
-        format!("openai/{}", self.model.name)
-    }
-
-    fn max_token_count(&self) -> u64 {
-        self.model.max_tokens
-    }
-
-    fn max_output_tokens(&self) -> Option<u64> {
-        self.model.max_output_tokens
-    }
-
-    fn count_tokens(
-        &self,
-        request: LanguageModelRequest,
-        cx: &App,
-    ) -> BoxFuture<'static, Result<u64>> {
-        let max_token_count = self.max_token_count();
-        cx.background_spawn(async move {
-            let messages = super::open_ai::collect_tiktoken_messages(request);
-            let model = if max_token_count >= 100_000 {
-                // If the max tokens is 100k or more, it is likely the o200k_base tokenizer from gpt4o
-                "gpt-4o"
-            } else {
-                // Otherwise fallback to gpt-4, since only cl100k_base and o200k_base are
-                // supported with this tiktoken method
-                "gpt-4"
-            };
-            tiktoken_rs::num_tokens_from_messages(model, &messages).map(|tokens| tokens as u64)
-        })
-        .boxed()
-    }
-
-    fn stream_completion(
-        &self,
-        request: LanguageModelRequest,
-        cx: &AsyncApp,
-    ) -> BoxFuture<
-        'static,
-        Result<
-            futures::stream::BoxStream<
-                'static,
-                Result<LanguageModelCompletionEvent, LanguageModelCompletionError>,
-            >,
-            LanguageModelCompletionError,
-        >,
-    > {
-        let request = into_open_ai(
-            request,
-            &self.model.name,
-            self.model.capabilities.parallel_tool_calls,
-            self.model.capabilities.prompt_cache_key,
-            self.max_output_tokens(),
-            None,
-        );
-        let completions = self.stream_completion(request, cx);
-        async move {
-            let mapper = OpenAiEventMapper::new();
-            Ok(mapper.map_stream(completions.await?).boxed())
-        }
-        .boxed()
-    }
-}
-
-struct ConfigurationView {
-    api_key_editor: Entity<InputField>,
-    state: Entity<State>,
-    load_credentials_task: Option<Task<()>>,
-}
-
-impl ConfigurationView {
-    fn new(state: Entity<State>, window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let api_key_editor = cx.new(|cx| {
-            InputField::new(
-                window,
-                cx,
-                "000000000000000000000000000000000000000000000000000",
-            )
-        });
-
-        cx.observe(&state, |_, _, cx| {
-            cx.notify();
-        })
-        .detach();
-
-        let load_credentials_task = Some(cx.spawn_in(window, {
-            let state = state.clone();
-            async move |this, cx| {
-                if let Some(task) = state
-                    .update(cx, |state, cx| state.authenticate(cx))
-                    .log_err()
-                {
-                    // We don't log an error, because "not signed in" is also an error.
-                    let _ = task.await;
-                }
-                this.update(cx, |this, cx| {
-                    this.load_credentials_task = None;
-                    cx.notify();
-                })
-                .log_err();
-            }
-        }));
-
-        Self {
-            api_key_editor,
-            state,
-            load_credentials_task,
-        }
-    }
-
-    fn save_api_key(&mut self, _: &menu::Confirm, window: &mut Window, cx: &mut Context<Self>) {
-        let api_key = self.api_key_editor.read(cx).text(cx).trim().to_string();
-        if api_key.is_empty() {
-            return;
-        }
-
-        // url changes can cause the editor to be displayed again
-        self.api_key_editor
-            .update(cx, |input, cx| input.set_text("", window, cx));
-
-        let state = self.state.clone();
-        cx.spawn_in(window, async move |_, cx| {
-            state
-                .update(cx, |state, cx| state.set_api_key(Some(api_key), cx))?
-                .await
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn reset_api_key(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.api_key_editor
-            .update(cx, |input, cx| input.set_text("", window, cx));
-
-        let state = self.state.clone();
-        cx.spawn_in(window, async move |_, cx| {
-            state
-                .update(cx, |state, cx| state.set_api_key(None, cx))?
-                .await
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn should_render_editor(&self, cx: &Context<Self>) -> bool {
-        !self.state.read(cx).is_authenticated()
-    }
-}
-
-impl Render for ConfigurationView {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let state = self.state.read(cx);
-        let env_var_set = state.api_key_state.is_from_env_var();
-        let env_var_name = &state.api_key_env_var.name;
-
-        let api_key_section = if self.should_render_editor(cx) {
-            v_flex()
-                .on_action(cx.listener(Self::save_api_key))
-                .child(Label::new("To use Zed's agent with an OpenAI-compatible provider, you need to add an API key."))
-                .child(
-                    div()
-                        .pt(DynamicSpacing::Base04.rems(cx))
-                        .child(self.api_key_editor.clone())
-                )
-                .child(
-                    Label::new(
-                        format!("You can also assign the {env_var_name} environment variable and restart Zed."),
-                    )
-                    .size(LabelSize::Small).color(Color::Muted),
-                )
-                .into_any()
-        } else {
-            h_flex()
-                .mt_1()
-                .p_1()
-                .justify_between()
-                .rounded_md()
-                .border_1()
-                .border_color(cx.theme().colors().border)
-                .bg(cx.theme().colors().background)
-                .child(
-                    h_flex()
-                        .flex_1()
-                        .min_w_0()
-                        .gap_1()
-                        .child(Icon::new(IconName::Check).color(Color::Success))
-                        .child(
-                            div()
-                                .w_full()
-                                .overflow_x_hidden()
-                                .text_ellipsis()
-                                .child(Label::new(
-                                    if env_var_set {
-                                        format!("API key set in {env_var_name} environment variable")
-                                    } else {
-                                        format!("API key configured for {}", &state.settings.api_url)
-                                    }
-                                ))
-                        ),
-                )
-                .child(
-                    h_flex()
-                        .flex_shrink_0()
-                        .child(
-                            Button::new("reset-api-key", "Reset API Key")
-                                .label_size(LabelSize::Small)
-                                .icon(IconName::Undo)
-                                .icon_size(IconSize::Small)
-                                .icon_position(IconPosition::Start)
-                                .layer(ElevationIndex::ModalSurface)
-                                .when(env_var_set, |this| {
-                                    this.tooltip(Tooltip::text(format!("To reset your API key, unset the {env_var_name} environment variable.")))
-                                })
-                                .on_click(cx.listener(|this, _, window, cx| this.reset_api_key(window, cx))),
-                        ),
-                )
-                .into_any()
-        };
-
-        if self.load_credentials_task.is_some() {
-            div().child(Label::new("Loading credentials…")).into_any()
-        } else {
-            v_flex().size_full().child(api_key_section).into_any()
-        }
-    }
-}
diff --git a/crates/language_models/src/provider/open_router.rs b/crates/language_models/src/provider/open_router.rs
deleted file mode 100644
index 7b10ebf963..0000000000
--- a/crates/language_models/src/provider/open_router.rs
+++ /dev/null
@@ -1,1095 +0,0 @@
-use anyhow::{Result, anyhow};
-use collections::HashMap;
-use futures::{FutureExt, Stream, StreamExt, future, future::BoxFuture};
-use gpui::{AnyView, App, AsyncApp, Context, Entity, SharedString, Task};
-use http_client::HttpClient;
-use language_model::{
-    AuthenticateError, LanguageModel, LanguageModelCompletionError, LanguageModelCompletionEvent,
-    LanguageModelId, LanguageModelName, LanguageModelProvider, LanguageModelProviderId,
-    LanguageModelProviderName, LanguageModelProviderState, LanguageModelRequest,
-    LanguageModelToolChoice, LanguageModelToolResultContent, LanguageModelToolSchemaFormat,
-    LanguageModelToolUse, MessageContent, RateLimiter, Role, StopReason, TokenUsage,
-};
-use open_router::{
-    Model, ModelMode as OpenRouterModelMode, OPEN_ROUTER_API_URL, ResponseStreamEvent, list_models,
-};
-use settings::{OpenRouterAvailableModel as AvailableModel, Settings, SettingsStore};
-use std::pin::Pin;
-use std::str::FromStr as _;
-use std::sync::{Arc, LazyLock};
-use ui::{List, prelude::*};
-use ui_input::InputField;
-use util::ResultExt;
-use zed_env_vars::{EnvVar, env_var};
-
-use crate::ui::ConfiguredApiCard;
-use crate::{api_key::ApiKeyState, ui::InstructionListItem};
-
-const PROVIDER_ID: LanguageModelProviderId = LanguageModelProviderId::new("openrouter");
-const PROVIDER_NAME: LanguageModelProviderName = LanguageModelProviderName::new("OpenRouter");
-
-const API_KEY_ENV_VAR_NAME: &str = "OPENROUTER_API_KEY";
-static API_KEY_ENV_VAR: LazyLock<EnvVar> = env_var!(API_KEY_ENV_VAR_NAME);
-
-#[derive(Default, Clone, Debug, PartialEq)]
-pub struct OpenRouterSettings {
-    pub api_url: String,
-    pub available_models: Vec<AvailableModel>,
-}
-
-pub struct OpenRouterLanguageModelProvider {
-    http_client: Arc<dyn HttpClient>,
-    state: Entity<State>,
-}
-
-pub struct State {
-    api_key_state: ApiKeyState,
-    http_client: Arc<dyn HttpClient>,
-    available_models: Vec<open_router::Model>,
-    fetch_models_task: Option<Task<Result<(), LanguageModelCompletionError>>>,
-}
-
-impl State {
-    fn is_authenticated(&self) -> bool {
-        self.api_key_state.has_key()
-    }
-
-    fn set_api_key(&mut self, api_key: Option<String>, cx: &mut Context<Self>) -> Task<Result<()>> {
-        let api_url = OpenRouterLanguageModelProvider::api_url(cx);
-        self.api_key_state
-            .store(api_url, api_key, |this| &mut this.api_key_state, cx)
-    }
-
-    fn authenticate(&mut self, cx: &mut Context<Self>) -> Task<Result<(), AuthenticateError>> {
-        let api_url = OpenRouterLanguageModelProvider::api_url(cx);
-        let task = self.api_key_state.load_if_needed(
-            api_url,
-            &API_KEY_ENV_VAR,
-            |this| &mut this.api_key_state,
-            cx,
-        );
-
-        cx.spawn(async move |this, cx| {
-            let result = task.await;
-            this.update(cx, |this, cx| this.restart_fetch_models_task(cx))
-                .ok();
-            result
-        })
-    }
-
-    fn fetch_models(
-        &mut self,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<(), LanguageModelCompletionError>> {
-        let http_client = self.http_client.clone();
-        let api_url = OpenRouterLanguageModelProvider::api_url(cx);
-        let Some(api_key) = self.api_key_state.key(&api_url) else {
-            return Task::ready(Err(LanguageModelCompletionError::NoApiKey {
-                provider: PROVIDER_NAME,
-            }));
-        };
-        cx.spawn(async move |this, cx| {
-            let models = list_models(http_client.as_ref(), &api_url, &api_key)
-                .await
-                .map_err(|e| {
-                    LanguageModelCompletionError::Other(anyhow::anyhow!(
-                        "OpenRouter error: {:?}",
-                        e
-                    ))
-                })?;
-
-            this.update(cx, |this, cx| {
-                this.available_models = models;
-                cx.notify();
-            })
-            .map_err(|e| LanguageModelCompletionError::Other(e))?;
-
-            Ok(())
-        })
-    }
-
-    fn restart_fetch_models_task(&mut self, cx: &mut Context<Self>) {
-        if self.is_authenticated() {
-            let task = self.fetch_models(cx);
-            self.fetch_models_task.replace(task);
-        } else {
-            self.available_models = Vec::new();
-        }
-    }
-}
-
-impl OpenRouterLanguageModelProvider {
-    pub fn new(http_client: Arc<dyn HttpClient>, cx: &mut App) -> Self {
-        let state = cx.new(|cx| {
-            cx.observe_global::<SettingsStore>({
-                let mut last_settings = OpenRouterLanguageModelProvider::settings(cx).clone();
-                move |this: &mut State, cx| {
-                    let current_settings = OpenRouterLanguageModelProvider::settings(cx);
-                    let settings_changed = current_settings != &last_settings;
-                    if settings_changed {
-                        last_settings = current_settings.clone();
-                        this.authenticate(cx).detach();
-                        cx.notify();
-                    }
-                }
-            })
-            .detach();
-            State {
-                api_key_state: ApiKeyState::new(Self::api_url(cx)),
-                http_client: http_client.clone(),
-                available_models: Vec::new(),
-                fetch_models_task: None,
-            }
-        });
-
-        Self { http_client, state }
-    }
-
-    fn settings(cx: &App) -> &OpenRouterSettings {
-        &crate::AllLanguageModelSettings::get_global(cx).open_router
-    }
-
-    fn api_url(cx: &App) -> SharedString {
-        let api_url = &Self::settings(cx).api_url;
-        if api_url.is_empty() {
-            OPEN_ROUTER_API_URL.into()
-        } else {
-            SharedString::new(api_url.as_str())
-        }
-    }
-
-    fn create_language_model(&self, model: open_router::Model) -> Arc<dyn LanguageModel> {
-        Arc::new(OpenRouterLanguageModel {
-            id: LanguageModelId::from(model.id().to_string()),
-            model,
-            state: self.state.clone(),
-            http_client: self.http_client.clone(),
-            request_limiter: RateLimiter::new(4),
-        })
-    }
-}
-
-impl LanguageModelProviderState for OpenRouterLanguageModelProvider {
-    type ObservableEntity = State;
-
-    fn observable_entity(&self) -> Option<Entity<Self::ObservableEntity>> {
-        Some(self.state.clone())
-    }
-}
-
-impl LanguageModelProvider for OpenRouterLanguageModelProvider {
-    fn id(&self) -> LanguageModelProviderId {
-        PROVIDER_ID
-    }
-
-    fn name(&self) -> LanguageModelProviderName {
-        PROVIDER_NAME
-    }
-
-    fn icon(&self) -> IconName {
-        IconName::AiOpenRouter
-    }
-
-    fn default_model(&self, _cx: &App) -> Option<Arc<dyn LanguageModel>> {
-        Some(self.create_language_model(open_router::Model::default()))
-    }
-
-    fn default_fast_model(&self, _cx: &App) -> Option<Arc<dyn LanguageModel>> {
-        Some(self.create_language_model(open_router::Model::default_fast()))
-    }
-
-    fn provided_models(&self, cx: &App) -> Vec<Arc<dyn LanguageModel>> {
-        let mut models_from_api = self.state.read(cx).available_models.clone();
-        let mut settings_models = Vec::new();
-
-        for model in &Self::settings(cx).available_models {
-            settings_models.push(open_router::Model {
-                name: model.name.clone(),
-                display_name: model.display_name.clone(),
-                max_tokens: model.max_tokens,
-                supports_tools: model.supports_tools,
-                supports_images: model.supports_images,
-                mode: model.mode.unwrap_or_default(),
-                provider: model.provider.clone(),
-            });
-        }
-
-        for settings_model in &settings_models {
-            if let Some(pos) = models_from_api
-                .iter()
-                .position(|m| m.name == settings_model.name)
-            {
-                models_from_api[pos] = settings_model.clone();
-            } else {
-                models_from_api.push(settings_model.clone());
-            }
-        }
-
-        models_from_api
-            .into_iter()
-            .map(|model| self.create_language_model(model))
-            .collect()
-    }
-
-    fn is_authenticated(&self, cx: &App) -> bool {
-        self.state.read(cx).is_authenticated()
-    }
-
-    fn authenticate(&self, cx: &mut App) -> Task<Result<(), AuthenticateError>> {
-        self.state.update(cx, |state, cx| state.authenticate(cx))
-    }
-
-    fn configuration_view(
-        &self,
-        _target_agent: language_model::ConfigurationViewTargetAgent,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> AnyView {
-        cx.new(|cx| ConfigurationView::new(self.state.clone(), window, cx))
-            .into()
-    }
-
-    fn reset_credentials(&self, cx: &mut App) -> Task<Result<()>> {
-        self.state
-            .update(cx, |state, cx| state.set_api_key(None, cx))
-    }
-}
-
-pub struct OpenRouterLanguageModel {
-    id: LanguageModelId,
-    model: open_router::Model,
-    state: Entity<State>,
-    http_client: Arc<dyn HttpClient>,
-    request_limiter: RateLimiter,
-}
-
-impl OpenRouterLanguageModel {
-    fn stream_completion(
-        &self,
-        request: open_router::Request,
-        cx: &AsyncApp,
-    ) -> BoxFuture<
-        'static,
-        Result<
-            futures::stream::BoxStream<
-                'static,
-                Result<ResponseStreamEvent, open_router::OpenRouterError>,
-            >,
-            LanguageModelCompletionError,
-        >,
-    > {
-        let http_client = self.http_client.clone();
-        let Ok((api_key, api_url)) = self.state.read_with(cx, |state, cx| {
-            let api_url = OpenRouterLanguageModelProvider::api_url(cx);
-            (state.api_key_state.key(&api_url), api_url)
-        }) else {
-            return future::ready(Err(anyhow!("App state dropped").into())).boxed();
-        };
-
-        async move {
-            let Some(api_key) = api_key else {
-                return Err(LanguageModelCompletionError::NoApiKey {
-                    provider: PROVIDER_NAME,
-                });
-            };
-            let request =
-                open_router::stream_completion(http_client.as_ref(), &api_url, &api_key, request);
-            request.await.map_err(Into::into)
-        }
-        .boxed()
-    }
-}
-
-impl LanguageModel for OpenRouterLanguageModel {
-    fn id(&self) -> LanguageModelId {
-        self.id.clone()
-    }
-
-    fn name(&self) -> LanguageModelName {
-        LanguageModelName::from(self.model.display_name().to_string())
-    }
-
-    fn provider_id(&self) -> LanguageModelProviderId {
-        PROVIDER_ID
-    }
-
-    fn provider_name(&self) -> LanguageModelProviderName {
-        PROVIDER_NAME
-    }
-
-    fn supports_tools(&self) -> bool {
-        self.model.supports_tool_calls()
-    }
-
-    fn tool_input_format(&self) -> LanguageModelToolSchemaFormat {
-        let model_id = self.model.id().trim().to_lowercase();
-        if model_id.contains("gemini") || model_id.contains("grok") {
-            LanguageModelToolSchemaFormat::JsonSchemaSubset
-        } else {
-            LanguageModelToolSchemaFormat::JsonSchema
-        }
-    }
-
-    fn telemetry_id(&self) -> String {
-        format!("openrouter/{}", self.model.id())
-    }
-
-    fn max_token_count(&self) -> u64 {
-        self.model.max_token_count()
-    }
-
-    fn max_output_tokens(&self) -> Option<u64> {
-        self.model.max_output_tokens()
-    }
-
-    fn supports_tool_choice(&self, choice: LanguageModelToolChoice) -> bool {
-        match choice {
-            LanguageModelToolChoice::Auto => true,
-            LanguageModelToolChoice::Any => true,
-            LanguageModelToolChoice::None => true,
-        }
-    }
-
-    fn supports_images(&self) -> bool {
-        self.model.supports_images.unwrap_or(false)
-    }
-
-    fn count_tokens(
-        &self,
-        request: LanguageModelRequest,
-        cx: &App,
-    ) -> BoxFuture<'static, Result<u64>> {
-        count_open_router_tokens(request, self.model.clone(), cx)
-    }
-
-    fn stream_completion(
-        &self,
-        request: LanguageModelRequest,
-        cx: &AsyncApp,
-    ) -> BoxFuture<
-        'static,
-        Result<
-            futures::stream::BoxStream<
-                'static,
-                Result<LanguageModelCompletionEvent, LanguageModelCompletionError>,
-            >,
-            LanguageModelCompletionError,
-        >,
-    > {
-        let request = into_open_router(request, &self.model, self.max_output_tokens());
-        let request = self.stream_completion(request, cx);
-        let future = self.request_limiter.stream(async move {
-            let response = request.await?;
-            Ok(OpenRouterEventMapper::new().map_stream(response))
-        });
-        async move { Ok(future.await?.boxed()) }.boxed()
-    }
-}
-
-pub fn into_open_router(
-    request: LanguageModelRequest,
-    model: &Model,
-    max_output_tokens: Option<u64>,
-) -> open_router::Request {
-    let mut messages = Vec::new();
-    for message in request.messages {
-        let reasoning_details = message.reasoning_details.clone();
-        for content in message.content {
-            match content {
-                MessageContent::Text(text) => add_message_content_part(
-                    open_router::MessagePart::Text { text },
-                    message.role,
-                    &mut messages,
-                ),
-                MessageContent::Thinking { .. } => {}
-                MessageContent::RedactedThinking(_) => {}
-                MessageContent::Image(image) => {
-                    add_message_content_part(
-                        open_router::MessagePart::Image {
-                            image_url: image.to_base64_url(),
-                        },
-                        message.role,
-                        &mut messages,
-                    );
-                }
-                MessageContent::ToolUse(tool_use) => {
-                    let tool_call = open_router::ToolCall {
-                        id: tool_use.id.to_string(),
-                        content: open_router::ToolCallContent::Function {
-                            function: open_router::FunctionContent {
-                                name: tool_use.name.to_string(),
-                                arguments: serde_json::to_string(&tool_use.input)
-                                    .unwrap_or_default(),
-                                thought_signature: tool_use.thought_signature.clone(),
-                            },
-                        },
-                    };
-
-                    if let Some(open_router::RequestMessage::Assistant {
-                        tool_calls,
-                        reasoning_details: existing_reasoning,
-                        ..
-                    }) = messages.last_mut()
-                    {
-                        tool_calls.push(tool_call);
-                        if existing_reasoning.is_none() && reasoning_details.is_some() {
-                            *existing_reasoning = reasoning_details.clone();
-                        }
-                    } else {
-                        messages.push(open_router::RequestMessage::Assistant {
-                            content: None,
-                            tool_calls: vec![tool_call],
-                            reasoning_details: reasoning_details.clone(),
-                        });
-                    }
-                }
-                MessageContent::ToolResult(tool_result) => {
-                    let content = match &tool_result.content {
-                        LanguageModelToolResultContent::Text(text) => {
-                            vec![open_router::MessagePart::Text {
-                                text: text.to_string(),
-                            }]
-                        }
-                        LanguageModelToolResultContent::Image(image) => {
-                            vec![open_router::MessagePart::Image {
-                                image_url: image.to_base64_url(),
-                            }]
-                        }
-                    };
-
-                    messages.push(open_router::RequestMessage::Tool {
-                        content: content.into(),
-                        tool_call_id: tool_result.tool_use_id.to_string(),
-                    });
-                }
-            }
-        }
-    }
-
-    open_router::Request {
-        model: model.id().into(),
-        messages,
-        stream: true,
-        stop: request.stop,
-        temperature: request.temperature.unwrap_or(0.4),
-        max_tokens: max_output_tokens,
-        parallel_tool_calls: if model.supports_parallel_tool_calls() && !request.tools.is_empty() {
-            Some(false)
-        } else {
-            None
-        },
-        usage: open_router::RequestUsage { include: true },
-        reasoning: if request.thinking_allowed
-            && let OpenRouterModelMode::Thinking { budget_tokens } = model.mode
-        {
-            Some(open_router::Reasoning {
-                effort: None,
-                max_tokens: budget_tokens,
-                exclude: Some(false),
-                enabled: Some(true),
-            })
-        } else {
-            None
-        },
-        tools: request
-            .tools
-            .into_iter()
-            .map(|tool| open_router::ToolDefinition::Function {
-                function: open_router::FunctionDefinition {
-                    name: tool.name,
-                    description: Some(tool.description),
-                    parameters: Some(tool.input_schema),
-                },
-            })
-            .collect(),
-        tool_choice: request.tool_choice.map(|choice| match choice {
-            LanguageModelToolChoice::Auto => open_router::ToolChoice::Auto,
-            LanguageModelToolChoice::Any => open_router::ToolChoice::Required,
-            LanguageModelToolChoice::None => open_router::ToolChoice::None,
-        }),
-        provider: model.provider.clone(),
-    }
-}
-
-fn add_message_content_part(
-    new_part: open_router::MessagePart,
-    role: Role,
-    messages: &mut Vec<open_router::RequestMessage>,
-) {
-    match (role, messages.last_mut()) {
-        (Role::User, Some(open_router::RequestMessage::User { content }))
-        | (Role::System, Some(open_router::RequestMessage::System { content })) => {
-            content.push_part(new_part);
-        }
-        (
-            Role::Assistant,
-            Some(open_router::RequestMessage::Assistant {
-                content: Some(content),
-                ..
-            }),
-        ) => {
-            content.push_part(new_part);
-        }
-        _ => {
-            messages.push(match role {
-                Role::User => open_router::RequestMessage::User {
-                    content: open_router::MessageContent::from(vec![new_part]),
-                },
-                Role::Assistant => open_router::RequestMessage::Assistant {
-                    content: Some(open_router::MessageContent::from(vec![new_part])),
-                    tool_calls: Vec::new(),
-                    reasoning_details: None,
-                },
-                Role::System => open_router::RequestMessage::System {
-                    content: open_router::MessageContent::from(vec![new_part]),
-                },
-            });
-        }
-    }
-}
-
-pub struct OpenRouterEventMapper {
-    tool_calls_by_index: HashMap<usize, RawToolCall>,
-    reasoning_details: Option<serde_json::Value>,
-}
-
-impl OpenRouterEventMapper {
-    pub fn new() -> Self {
-        Self {
-            tool_calls_by_index: HashMap::default(),
-            reasoning_details: None,
-        }
-    }
-
-    pub fn map_stream(
-        mut self,
-        events: Pin<
-            Box<
-                dyn Send + Stream<Item = Result<ResponseStreamEvent, open_router::OpenRouterError>>,
-            >,
-        >,
-    ) -> impl Stream<Item = Result<LanguageModelCompletionEvent, LanguageModelCompletionError>>
-    {
-        events.flat_map(move |event| {
-            futures::stream::iter(match event {
-                Ok(event) => self.map_event(event),
-                Err(error) => vec![Err(error.into())],
-            })
-        })
-    }
-
-    pub fn map_event(
-        &mut self,
-        event: ResponseStreamEvent,
-    ) -> Vec<Result<LanguageModelCompletionEvent, LanguageModelCompletionError>> {
-        let Some(choice) = event.choices.first() else {
-            return vec![Err(LanguageModelCompletionError::from(anyhow!(
-                "Response contained no choices"
-            )))];
-        };
-
-        let mut events = Vec::new();
-
-        if let Some(details) = choice.delta.reasoning_details.clone() {
-            // Emit reasoning_details immediately
-            events.push(Ok(LanguageModelCompletionEvent::ReasoningDetails(
-                details.clone(),
-            )));
-            self.reasoning_details = Some(details);
-        }
-
-        if let Some(reasoning) = choice.delta.reasoning.clone() {
-            events.push(Ok(LanguageModelCompletionEvent::Thinking {
-                text: reasoning,
-                signature: None,
-            }));
-        }
-
-        if let Some(content) = choice.delta.content.clone() {
-            // OpenRouter send empty content string with the reasoning content
-            // This is a workaround for the OpenRouter API bug
-            if !content.is_empty() {
-                events.push(Ok(LanguageModelCompletionEvent::Text(content)));
-            }
-        }
-
-        if let Some(tool_calls) = choice.delta.tool_calls.as_ref() {
-            for tool_call in tool_calls {
-                let entry = self.tool_calls_by_index.entry(tool_call.index).or_default();
-
-                if let Some(tool_id) = tool_call.id.clone() {
-                    entry.id = tool_id;
-                }
-
-                if let Some(function) = tool_call.function.as_ref() {
-                    if let Some(name) = function.name.clone() {
-                        entry.name = name;
-                    }
-
-                    if let Some(arguments) = function.arguments.clone() {
-                        entry.arguments.push_str(&arguments);
-                    }
-
-                    if let Some(signature) = function.thought_signature.clone() {
-                        entry.thought_signature = Some(signature);
-                    }
-                }
-            }
-        }
-
-        if let Some(usage) = event.usage {
-            events.push(Ok(LanguageModelCompletionEvent::UsageUpdate(TokenUsage {
-                input_tokens: usage.prompt_tokens,
-                output_tokens: usage.completion_tokens,
-                cache_creation_input_tokens: 0,
-                cache_read_input_tokens: 0,
-            })));
-        }
-
-        match choice.finish_reason.as_deref() {
-            Some("stop") => {
-                // Don't emit reasoning_details here - already emitted immediately when captured
-                events.push(Ok(LanguageModelCompletionEvent::Stop(StopReason::EndTurn)));
-            }
-            Some("tool_calls") => {
-                events.extend(self.tool_calls_by_index.drain().map(|(_, tool_call)| {
-                    match serde_json::Value::from_str(&tool_call.arguments) {
-                        Ok(input) => Ok(LanguageModelCompletionEvent::ToolUse(
-                            LanguageModelToolUse {
-                                id: tool_call.id.clone().into(),
-                                name: tool_call.name.as_str().into(),
-                                is_input_complete: true,
-                                input,
-                                raw_input: tool_call.arguments.clone(),
-                                thought_signature: tool_call.thought_signature.clone(),
-                            },
-                        )),
-                        Err(error) => Ok(LanguageModelCompletionEvent::ToolUseJsonParseError {
-                            id: tool_call.id.clone().into(),
-                            tool_name: tool_call.name.as_str().into(),
-                            raw_input: tool_call.arguments.clone().into(),
-                            json_parse_error: error.to_string(),
-                        }),
-                    }
-                }));
-
-                // Don't emit reasoning_details here - already emitted immediately when captured
-                events.push(Ok(LanguageModelCompletionEvent::Stop(StopReason::ToolUse)));
-            }
-            Some(stop_reason) => {
-                log::error!("Unexpected OpenRouter stop_reason: {stop_reason:?}",);
-                // Don't emit reasoning_details here - already emitted immediately when captured
-                events.push(Ok(LanguageModelCompletionEvent::Stop(StopReason::EndTurn)));
-            }
-            None => {}
-        }
-
-        events
-    }
-}
-
-#[derive(Default)]
-struct RawToolCall {
-    id: String,
-    name: String,
-    arguments: String,
-    thought_signature: Option<String>,
-}
-
-pub fn count_open_router_tokens(
-    request: LanguageModelRequest,
-    _model: open_router::Model,
-    cx: &App,
-) -> BoxFuture<'static, Result<u64>> {
-    cx.background_spawn(async move {
-        let messages = request
-            .messages
-            .into_iter()
-            .map(|message| tiktoken_rs::ChatCompletionRequestMessage {
-                role: match message.role {
-                    Role::User => "user".into(),
-                    Role::Assistant => "assistant".into(),
-                    Role::System => "system".into(),
-                },
-                content: Some(message.string_contents()),
-                name: None,
-                function_call: None,
-            })
-            .collect::<Vec<_>>();
-
-        tiktoken_rs::num_tokens_from_messages("gpt-4o", &messages).map(|tokens| tokens as u64)
-    })
-    .boxed()
-}
-
-struct ConfigurationView {
-    api_key_editor: Entity<InputField>,
-    state: Entity<State>,
-    load_credentials_task: Option<Task<()>>,
-}
-
-impl ConfigurationView {
-    fn new(state: Entity<State>, window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let api_key_editor = cx.new(|cx| {
-            InputField::new(
-                window,
-                cx,
-                "sk_or_000000000000000000000000000000000000000000000000",
-            )
-        });
-
-        cx.observe(&state, |_, _, cx| {
-            cx.notify();
-        })
-        .detach();
-
-        let load_credentials_task = Some(cx.spawn_in(window, {
-            let state = state.clone();
-            async move |this, cx| {
-                if let Some(task) = state
-                    .update(cx, |state, cx| state.authenticate(cx))
-                    .log_err()
-                {
-                    let _ = task.await;
-                }
-
-                this.update(cx, |this, cx| {
-                    this.load_credentials_task = None;
-                    cx.notify();
-                })
-                .log_err();
-            }
-        }));
-
-        Self {
-            api_key_editor,
-            state,
-            load_credentials_task,
-        }
-    }
-
-    fn save_api_key(&mut self, _: &menu::Confirm, window: &mut Window, cx: &mut Context<Self>) {
-        let api_key = self.api_key_editor.read(cx).text(cx).trim().to_string();
-        if api_key.is_empty() {
-            return;
-        }
-
-        // url changes can cause the editor to be displayed again
-        self.api_key_editor
-            .update(cx, |editor, cx| editor.set_text("", window, cx));
-
-        let state = self.state.clone();
-        cx.spawn_in(window, async move |_, cx| {
-            state
-                .update(cx, |state, cx| state.set_api_key(Some(api_key), cx))?
-                .await
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn reset_api_key(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.api_key_editor
-            .update(cx, |editor, cx| editor.set_text("", window, cx));
-
-        let state = self.state.clone();
-        cx.spawn_in(window, async move |_, cx| {
-            state
-                .update(cx, |state, cx| state.set_api_key(None, cx))?
-                .await
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn should_render_editor(&self, cx: &mut Context<Self>) -> bool {
-        !self.state.read(cx).is_authenticated()
-    }
-}
-
-impl Render for ConfigurationView {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let env_var_set = self.state.read(cx).api_key_state.is_from_env_var();
-        let configured_card_label = if env_var_set {
-            format!("API key set in {API_KEY_ENV_VAR_NAME} environment variable")
-        } else {
-            let api_url = OpenRouterLanguageModelProvider::api_url(cx);
-            if api_url == OPEN_ROUTER_API_URL {
-                "API key configured".to_string()
-            } else {
-                format!("API key configured for {}", api_url)
-            }
-        };
-
-        if self.load_credentials_task.is_some() {
-            div()
-                .child(Label::new("Loading credentials..."))
-                .into_any_element()
-        } else if self.should_render_editor(cx) {
-            v_flex()
-                .size_full()
-                .on_action(cx.listener(Self::save_api_key))
-                .child(Label::new("To use Zed's agent with OpenRouter, you need to add an API key. Follow these steps:"))
-                .child(
-                    List::new()
-                        .child(InstructionListItem::new(
-                            "Create an API key by visiting",
-                            Some("OpenRouter's console"),
-                            Some("https://openrouter.ai/keys"),
-                        ))
-                        .child(InstructionListItem::text_only(
-                            "Ensure your OpenRouter account has credits",
-                        ))
-                        .child(InstructionListItem::text_only(
-                            "Paste your API key below and hit enter to start using the assistant",
-                        )),
-                )
-                .child(self.api_key_editor.clone())
-                .child(
-                    Label::new(
-                        format!("You can also assign the {API_KEY_ENV_VAR_NAME} environment variable and restart Zed."),
-                    )
-                    .size(LabelSize::Small).color(Color::Muted),
-                )
-                .into_any_element()
-        } else {
-            ConfiguredApiCard::new(configured_card_label)
-                .disabled(env_var_set)
-                .on_click(cx.listener(|this, _, window, cx| this.reset_api_key(window, cx)))
-                .when(env_var_set, |this| {
-                    this.tooltip_label(format!("To reset your API key, unset the {API_KEY_ENV_VAR_NAME} environment variable."))
-                })
-                .into_any_element()
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    use open_router::{ChoiceDelta, FunctionChunk, ResponseMessageDelta, ToolCallChunk};
-
-    #[gpui::test]
-    async fn test_reasoning_details_preservation_with_tool_calls() {
-        // This test verifies that reasoning_details are properly captured and preserved
-        // when a model uses tool calling with reasoning/thinking tokens.
-        //
-        // The key regression this prevents:
-        // - OpenRouter sends multiple reasoning_details updates during streaming
-        // - First with actual content (encrypted reasoning data)
-        // - Then with empty array on completion
-        // - We must NOT overwrite the real data with the empty array
-
-        let mut mapper = OpenRouterEventMapper::new();
-
-        // Simulate the streaming events as they come from OpenRouter/Gemini
-        let events = vec![
-            // Event 1: Initial reasoning details with text
-            ResponseStreamEvent {
-                id: Some("response_123".into()),
-                created: 1234567890,
-                model: "google/gemini-3-pro-preview".into(),
-                choices: vec![ChoiceDelta {
-                    index: 0,
-                    delta: ResponseMessageDelta {
-                        role: None,
-                        content: None,
-                        reasoning: None,
-                        tool_calls: None,
-                        reasoning_details: Some(serde_json::json!([
-                            {
-                                "type": "reasoning.text",
-                                "text": "Let me analyze this request...",
-                                "format": "google-gemini-v1",
-                                "index": 0
-                            }
-                        ])),
-                    },
-                    finish_reason: None,
-                }],
-                usage: None,
-            },
-            // Event 2: More reasoning details
-            ResponseStreamEvent {
-                id: Some("response_123".into()),
-                created: 1234567890,
-                model: "google/gemini-3-pro-preview".into(),
-                choices: vec![ChoiceDelta {
-                    index: 0,
-                    delta: ResponseMessageDelta {
-                        role: None,
-                        content: None,
-                        reasoning: None,
-                        tool_calls: None,
-                        reasoning_details: Some(serde_json::json!([
-                            {
-                                "type": "reasoning.encrypted",
-                                "data": "EtgDCtUDAdHtim9OF5jm4aeZSBAtl/randomized123",
-                                "format": "google-gemini-v1",
-                                "index": 0,
-                                "id": "tool_call_abc123"
-                            }
-                        ])),
-                    },
-                    finish_reason: None,
-                }],
-                usage: None,
-            },
-            // Event 3: Tool call starts
-            ResponseStreamEvent {
-                id: Some("response_123".into()),
-                created: 1234567890,
-                model: "google/gemini-3-pro-preview".into(),
-                choices: vec![ChoiceDelta {
-                    index: 0,
-                    delta: ResponseMessageDelta {
-                        role: None,
-                        content: None,
-                        reasoning: None,
-                        tool_calls: Some(vec![ToolCallChunk {
-                            index: 0,
-                            id: Some("tool_call_abc123".into()),
-                            function: Some(FunctionChunk {
-                                name: Some("list_directory".into()),
-                                arguments: Some("{\"path\":\"test\"}".into()),
-                                thought_signature: Some("sha256:test_signature_xyz789".into()),
-                            }),
-                        }]),
-                        reasoning_details: None,
-                    },
-                    finish_reason: None,
-                }],
-                usage: None,
-            },
-            // Event 4: Empty reasoning_details on tool_calls finish
-            // This is the critical event - we must not overwrite with this empty array!
-            ResponseStreamEvent {
-                id: Some("response_123".into()),
-                created: 1234567890,
-                model: "google/gemini-3-pro-preview".into(),
-                choices: vec![ChoiceDelta {
-                    index: 0,
-                    delta: ResponseMessageDelta {
-                        role: None,
-                        content: None,
-                        reasoning: None,
-                        tool_calls: None,
-                        reasoning_details: Some(serde_json::json!([])),
-                    },
-                    finish_reason: Some("tool_calls".into()),
-                }],
-                usage: None,
-            },
-        ];
-
-        // Process all events
-        let mut collected_events = Vec::new();
-        for event in events {
-            let mapped = mapper.map_event(event);
-            collected_events.extend(mapped);
-        }
-
-        // Verify we got the expected events
-        let mut has_tool_use = false;
-        let mut reasoning_details_events = Vec::new();
-        let mut thought_signature_value = None;
-
-        for event_result in collected_events {
-            match event_result {
-                Ok(LanguageModelCompletionEvent::ToolUse(tool_use)) => {
-                    has_tool_use = true;
-                    assert_eq!(tool_use.id.to_string(), "tool_call_abc123");
-                    assert_eq!(tool_use.name.as_ref(), "list_directory");
-                    thought_signature_value = tool_use.thought_signature.clone();
-                }
-                Ok(LanguageModelCompletionEvent::ReasoningDetails(details)) => {
-                    reasoning_details_events.push(details);
-                }
-                _ => {}
-            }
-        }
-
-        // Assertions
-        assert!(has_tool_use, "Should have emitted ToolUse event");
-        assert!(
-            !reasoning_details_events.is_empty(),
-            "Should have emitted ReasoningDetails events"
-        );
-
-        // We should have received multiple reasoning_details events (text, encrypted, empty)
-        // The agent layer is responsible for keeping only the first non-empty one
-        assert!(
-            reasoning_details_events.len() >= 2,
-            "Should have multiple reasoning_details events from streaming"
-        );
-
-        // Verify at least one contains the encrypted data
-        let has_encrypted = reasoning_details_events.iter().any(|details| {
-            if let serde_json::Value::Array(arr) = details {
-                arr.iter().any(|item| {
-                    item["type"] == "reasoning.encrypted"
-                        && item["data"]
-                            .as_str()
-                            .map_or(false, |s| s.contains("EtgDCtUDAdHtim9OF5jm4aeZSBAtl"))
-                })
-            } else {
-                false
-            }
-        });
-        assert!(
-            has_encrypted,
-            "Should have at least one reasoning_details with encrypted data"
-        );
-
-        // Verify thought_signature was captured
-        assert!(
-            thought_signature_value.is_some(),
-            "Tool use should have thought_signature"
-        );
-        assert_eq!(
-            thought_signature_value.unwrap(),
-            "sha256:test_signature_xyz789"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_agent_prevents_empty_reasoning_details_overwrite() {
-        // This test verifies that the agent layer prevents empty reasoning_details
-        // from overwriting non-empty ones, even though the mapper emits all events.
-
-        // Simulate what the agent does when it receives multiple ReasoningDetails events
-        let mut agent_reasoning_details: Option<serde_json::Value> = None;
-
-        let events = vec![
-            // First event: non-empty reasoning_details
-            serde_json::json!([
-                {
-                    "type": "reasoning.encrypted",
-                    "data": "real_data_here",
-                    "format": "google-gemini-v1"
-                }
-            ]),
-            // Second event: empty array (should not overwrite)
-            serde_json::json!([]),
-        ];
-
-        for details in events {
-            // This mimics the agent's logic: only store if we don't already have it
-            if agent_reasoning_details.is_none() {
-                agent_reasoning_details = Some(details);
-            }
-        }
-
-        // Verify the agent kept the first non-empty reasoning_details
-        assert!(agent_reasoning_details.is_some());
-        let final_details = agent_reasoning_details.unwrap();
-        if let serde_json::Value::Array(arr) = &final_details {
-            assert!(
-                !arr.is_empty(),
-                "Agent should have kept the non-empty reasoning_details"
-            );
-            assert_eq!(arr[0]["data"], "real_data_here");
-        } else {
-            panic!("Expected array");
-        }
-    }
-}
diff --git a/crates/language_models/src/provider/vercel.rs b/crates/language_models/src/provider/vercel.rs
deleted file mode 100644
index 061dc17999..0000000000
--- a/crates/language_models/src/provider/vercel.rs
+++ /dev/null
@@ -1,514 +0,0 @@
-use anyhow::{Result, anyhow};
-use collections::BTreeMap;
-use futures::{FutureExt, StreamExt, future, future::BoxFuture};
-use gpui::{AnyView, App, AsyncApp, Context, Entity, SharedString, Task, Window};
-use http_client::HttpClient;
-use language_model::{
-    AuthenticateError, LanguageModel, LanguageModelCompletionError, LanguageModelCompletionEvent,
-    LanguageModelId, LanguageModelName, LanguageModelProvider, LanguageModelProviderId,
-    LanguageModelProviderName, LanguageModelProviderState, LanguageModelRequest,
-    LanguageModelToolChoice, RateLimiter, Role,
-};
-use open_ai::ResponseStreamEvent;
-pub use settings::VercelAvailableModel as AvailableModel;
-use settings::{Settings, SettingsStore};
-use std::sync::{Arc, LazyLock};
-use strum::IntoEnumIterator;
-use ui::{List, prelude::*};
-use ui_input::InputField;
-use util::ResultExt;
-use vercel::{Model, VERCEL_API_URL};
-use zed_env_vars::{EnvVar, env_var};
-
-use crate::{
-    api_key::ApiKeyState,
-    ui::{ConfiguredApiCard, InstructionListItem},
-};
-
-const PROVIDER_ID: LanguageModelProviderId = LanguageModelProviderId::new("vercel");
-const PROVIDER_NAME: LanguageModelProviderName = LanguageModelProviderName::new("Vercel");
-
-const API_KEY_ENV_VAR_NAME: &str = "VERCEL_API_KEY";
-static API_KEY_ENV_VAR: LazyLock<EnvVar> = env_var!(API_KEY_ENV_VAR_NAME);
-
-#[derive(Clone, Debug, PartialEq)]
-pub struct VercelSettings {
-    pub api_url: String,
-    pub available_models: Vec<AvailableModel>,
-}
-
-pub struct VercelLanguageModelProvider {
-    http_client: Arc<dyn HttpClient>,
-    state: Entity<State>,
-}
-
-pub struct State {
-    api_key_state: ApiKeyState,
-}
-
-impl State {
-    fn is_authenticated(&self) -> bool {
-        self.api_key_state.has_key()
-    }
-
-    fn set_api_key(&mut self, api_key: Option<String>, cx: &mut Context<Self>) -> Task<Result<()>> {
-        let api_url = VercelLanguageModelProvider::api_url(cx);
-        self.api_key_state
-            .store(api_url, api_key, |this| &mut this.api_key_state, cx)
-    }
-
-    fn authenticate(&mut self, cx: &mut Context<Self>) -> Task<Result<(), AuthenticateError>> {
-        let api_url = VercelLanguageModelProvider::api_url(cx);
-        self.api_key_state.load_if_needed(
-            api_url,
-            &API_KEY_ENV_VAR,
-            |this| &mut this.api_key_state,
-            cx,
-        )
-    }
-}
-
-impl VercelLanguageModelProvider {
-    pub fn new(http_client: Arc<dyn HttpClient>, cx: &mut App) -> Self {
-        let state = cx.new(|cx| {
-            cx.observe_global::<SettingsStore>(|this: &mut State, cx| {
-                let api_url = Self::api_url(cx);
-                this.api_key_state.handle_url_change(
-                    api_url,
-                    &API_KEY_ENV_VAR,
-                    |this| &mut this.api_key_state,
-                    cx,
-                );
-                cx.notify();
-            })
-            .detach();
-            State {
-                api_key_state: ApiKeyState::new(Self::api_url(cx)),
-            }
-        });
-
-        Self { http_client, state }
-    }
-
-    fn create_language_model(&self, model: vercel::Model) -> Arc<dyn LanguageModel> {
-        Arc::new(VercelLanguageModel {
-            id: LanguageModelId::from(model.id().to_string()),
-            model,
-            state: self.state.clone(),
-            http_client: self.http_client.clone(),
-            request_limiter: RateLimiter::new(4),
-        })
-    }
-
-    fn settings(cx: &App) -> &VercelSettings {
-        &crate::AllLanguageModelSettings::get_global(cx).vercel
-    }
-
-    fn api_url(cx: &App) -> SharedString {
-        let api_url = &Self::settings(cx).api_url;
-        if api_url.is_empty() {
-            VERCEL_API_URL.into()
-        } else {
-            SharedString::new(api_url.as_str())
-        }
-    }
-}
-
-impl LanguageModelProviderState for VercelLanguageModelProvider {
-    type ObservableEntity = State;
-
-    fn observable_entity(&self) -> Option<Entity<Self::ObservableEntity>> {
-        Some(self.state.clone())
-    }
-}
-
-impl LanguageModelProvider for VercelLanguageModelProvider {
-    fn id(&self) -> LanguageModelProviderId {
-        PROVIDER_ID
-    }
-
-    fn name(&self) -> LanguageModelProviderName {
-        PROVIDER_NAME
-    }
-
-    fn icon(&self) -> IconName {
-        IconName::AiVZero
-    }
-
-    fn default_model(&self, _cx: &App) -> Option<Arc<dyn LanguageModel>> {
-        Some(self.create_language_model(vercel::Model::default()))
-    }
-
-    fn default_fast_model(&self, _cx: &App) -> Option<Arc<dyn LanguageModel>> {
-        Some(self.create_language_model(vercel::Model::default_fast()))
-    }
-
-    fn provided_models(&self, cx: &App) -> Vec<Arc<dyn LanguageModel>> {
-        let mut models = BTreeMap::default();
-
-        for model in vercel::Model::iter() {
-            if !matches!(model, vercel::Model::Custom { .. }) {
-                models.insert(model.id().to_string(), model);
-            }
-        }
-
-        for model in &Self::settings(cx).available_models {
-            models.insert(
-                model.name.clone(),
-                vercel::Model::Custom {
-                    name: model.name.clone(),
-                    display_name: model.display_name.clone(),
-                    max_tokens: model.max_tokens,
-                    max_output_tokens: model.max_output_tokens,
-                    max_completion_tokens: model.max_completion_tokens,
-                },
-            );
-        }
-
-        models
-            .into_values()
-            .map(|model| self.create_language_model(model))
-            .collect()
-    }
-
-    fn is_authenticated(&self, cx: &App) -> bool {
-        self.state.read(cx).is_authenticated()
-    }
-
-    fn authenticate(&self, cx: &mut App) -> Task<Result<(), AuthenticateError>> {
-        self.state.update(cx, |state, cx| state.authenticate(cx))
-    }
-
-    fn configuration_view(
-        &self,
-        _target_agent: language_model::ConfigurationViewTargetAgent,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> AnyView {
-        cx.new(|cx| ConfigurationView::new(self.state.clone(), window, cx))
-            .into()
-    }
-
-    fn reset_credentials(&self, cx: &mut App) -> Task<Result<()>> {
-        self.state
-            .update(cx, |state, cx| state.set_api_key(None, cx))
-    }
-}
-
-pub struct VercelLanguageModel {
-    id: LanguageModelId,
-    model: vercel::Model,
-    state: Entity<State>,
-    http_client: Arc<dyn HttpClient>,
-    request_limiter: RateLimiter,
-}
-
-impl VercelLanguageModel {
-    fn stream_completion(
-        &self,
-        request: open_ai::Request,
-        cx: &AsyncApp,
-    ) -> BoxFuture<'static, Result<futures::stream::BoxStream<'static, Result<ResponseStreamEvent>>>>
-    {
-        let http_client = self.http_client.clone();
-
-        let Ok((api_key, api_url)) = self.state.read_with(cx, |state, cx| {
-            let api_url = VercelLanguageModelProvider::api_url(cx);
-            (state.api_key_state.key(&api_url), api_url)
-        }) else {
-            return future::ready(Err(anyhow!("App state dropped"))).boxed();
-        };
-
-        let future = self.request_limiter.stream(async move {
-            let provider = PROVIDER_NAME;
-            let Some(api_key) = api_key else {
-                return Err(LanguageModelCompletionError::NoApiKey { provider });
-            };
-            let request = open_ai::stream_completion(
-                http_client.as_ref(),
-                provider.0.as_str(),
-                &api_url,
-                &api_key,
-                request,
-            );
-            let response = request.await?;
-            Ok(response)
-        });
-
-        async move { Ok(future.await?.boxed()) }.boxed()
-    }
-}
-
-impl LanguageModel for VercelLanguageModel {
-    fn id(&self) -> LanguageModelId {
-        self.id.clone()
-    }
-
-    fn name(&self) -> LanguageModelName {
-        LanguageModelName::from(self.model.display_name().to_string())
-    }
-
-    fn provider_id(&self) -> LanguageModelProviderId {
-        PROVIDER_ID
-    }
-
-    fn provider_name(&self) -> LanguageModelProviderName {
-        PROVIDER_NAME
-    }
-
-    fn supports_tools(&self) -> bool {
-        true
-    }
-
-    fn supports_images(&self) -> bool {
-        true
-    }
-
-    fn supports_tool_choice(&self, choice: LanguageModelToolChoice) -> bool {
-        match choice {
-            LanguageModelToolChoice::Auto
-            | LanguageModelToolChoice::Any
-            | LanguageModelToolChoice::None => true,
-        }
-    }
-
-    fn telemetry_id(&self) -> String {
-        format!("vercel/{}", self.model.id())
-    }
-
-    fn max_token_count(&self) -> u64 {
-        self.model.max_token_count()
-    }
-
-    fn max_output_tokens(&self) -> Option<u64> {
-        self.model.max_output_tokens()
-    }
-
-    fn count_tokens(
-        &self,
-        request: LanguageModelRequest,
-        cx: &App,
-    ) -> BoxFuture<'static, Result<u64>> {
-        count_vercel_tokens(request, self.model.clone(), cx)
-    }
-
-    fn stream_completion(
-        &self,
-        request: LanguageModelRequest,
-        cx: &AsyncApp,
-    ) -> BoxFuture<
-        'static,
-        Result<
-            futures::stream::BoxStream<
-                'static,
-                Result<LanguageModelCompletionEvent, LanguageModelCompletionError>,
-            >,
-            LanguageModelCompletionError,
-        >,
-    > {
-        let request = crate::provider::open_ai::into_open_ai(
-            request,
-            self.model.id(),
-            self.model.supports_parallel_tool_calls(),
-            self.model.supports_prompt_cache_key(),
-            self.max_output_tokens(),
-            None,
-        );
-        let completions = self.stream_completion(request, cx);
-        async move {
-            let mapper = crate::provider::open_ai::OpenAiEventMapper::new();
-            Ok(mapper.map_stream(completions.await?).boxed())
-        }
-        .boxed()
-    }
-}
-
-pub fn count_vercel_tokens(
-    request: LanguageModelRequest,
-    model: Model,
-    cx: &App,
-) -> BoxFuture<'static, Result<u64>> {
-    cx.background_spawn(async move {
-        let messages = request
-            .messages
-            .into_iter()
-            .map(|message| tiktoken_rs::ChatCompletionRequestMessage {
-                role: match message.role {
-                    Role::User => "user".into(),
-                    Role::Assistant => "assistant".into(),
-                    Role::System => "system".into(),
-                },
-                content: Some(message.string_contents()),
-                name: None,
-                function_call: None,
-            })
-            .collect::<Vec<_>>();
-
-        match model {
-            Model::Custom { max_tokens, .. } => {
-                let model = if max_tokens >= 100_000 {
-                    // If the max tokens is 100k or more, it is likely the o200k_base tokenizer from gpt4o
-                    "gpt-4o"
-                } else {
-                    // Otherwise fallback to gpt-4, since only cl100k_base and o200k_base are
-                    // supported with this tiktoken method
-                    "gpt-4"
-                };
-                tiktoken_rs::num_tokens_from_messages(model, &messages)
-            }
-            // Map Vercel models to appropriate OpenAI models for token counting
-            // since Vercel uses OpenAI-compatible API
-            Model::VZeroOnePointFiveMedium => {
-                // Vercel v0 is similar to GPT-4o, so use gpt-4o for token counting
-                tiktoken_rs::num_tokens_from_messages("gpt-4o", &messages)
-            }
-        }
-        .map(|tokens| tokens as u64)
-    })
-    .boxed()
-}
-
-struct ConfigurationView {
-    api_key_editor: Entity<InputField>,
-    state: Entity<State>,
-    load_credentials_task: Option<Task<()>>,
-}
-
-impl ConfigurationView {
-    fn new(state: Entity<State>, window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let api_key_editor = cx.new(|cx| {
-            InputField::new(
-                window,
-                cx,
-                "v1:0000000000000000000000000000000000000000000000000",
-            )
-            .label("API key")
-        });
-
-        cx.observe(&state, |_, _, cx| {
-            cx.notify();
-        })
-        .detach();
-
-        let load_credentials_task = Some(cx.spawn_in(window, {
-            let state = state.clone();
-            async move |this, cx| {
-                if let Some(task) = state
-                    .update(cx, |state, cx| state.authenticate(cx))
-                    .log_err()
-                {
-                    // We don't log an error, because "not signed in" is also an error.
-                    let _ = task.await;
-                }
-                this.update(cx, |this, cx| {
-                    this.load_credentials_task = None;
-                    cx.notify();
-                })
-                .log_err();
-            }
-        }));
-
-        Self {
-            api_key_editor,
-            state,
-            load_credentials_task,
-        }
-    }
-
-    fn save_api_key(&mut self, _: &menu::Confirm, window: &mut Window, cx: &mut Context<Self>) {
-        let api_key = self.api_key_editor.read(cx).text(cx).trim().to_string();
-        if api_key.is_empty() {
-            return;
-        }
-
-        // url changes can cause the editor to be displayed again
-        self.api_key_editor
-            .update(cx, |editor, cx| editor.set_text("", window, cx));
-
-        let state = self.state.clone();
-        cx.spawn_in(window, async move |_, cx| {
-            state
-                .update(cx, |state, cx| state.set_api_key(Some(api_key), cx))?
-                .await
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn reset_api_key(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.api_key_editor
-            .update(cx, |input, cx| input.set_text("", window, cx));
-
-        let state = self.state.clone();
-        cx.spawn_in(window, async move |_, cx| {
-            state
-                .update(cx, |state, cx| state.set_api_key(None, cx))?
-                .await
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn should_render_editor(&self, cx: &mut Context<Self>) -> bool {
-        !self.state.read(cx).is_authenticated()
-    }
-}
-
-impl Render for ConfigurationView {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let env_var_set = self.state.read(cx).api_key_state.is_from_env_var();
-        let configured_card_label = if env_var_set {
-            format!("API key set in {API_KEY_ENV_VAR_NAME} environment variable")
-        } else {
-            let api_url = VercelLanguageModelProvider::api_url(cx);
-            if api_url == VERCEL_API_URL {
-                "API key configured".to_string()
-            } else {
-                format!("API key configured for {}", api_url)
-            }
-        };
-
-        let api_key_section = if self.should_render_editor(cx) {
-            v_flex()
-                .on_action(cx.listener(Self::save_api_key))
-                .child(Label::new("To use Zed's agent with Vercel v0, you need to add an API key. Follow these steps:"))
-                .child(
-                    List::new()
-                        .child(InstructionListItem::new(
-                            "Create one by visiting",
-                            Some("Vercel v0's console"),
-                            Some("https://v0.dev/chat/settings/keys"),
-                        ))
-                        .child(InstructionListItem::text_only(
-                            "Paste your API key below and hit enter to start using the agent",
-                        )),
-                )
-                .child(self.api_key_editor.clone())
-                .child(
-                    Label::new(format!(
-                        "You can also assign the {API_KEY_ENV_VAR_NAME} environment variable and restart Zed."
-                    ))
-                    .size(LabelSize::Small)
-                    .color(Color::Muted),
-                )
-                .child(
-                    Label::new("Note that Vercel v0 is a custom OpenAI-compatible provider.")
-                        .size(LabelSize::Small)
-                        .color(Color::Muted),
-                )
-                .into_any_element()
-        } else {
-            ConfiguredApiCard::new(configured_card_label)
-                .disabled(env_var_set)
-                .when(env_var_set, |this| {
-                    this.tooltip_label(format!("To reset your API key, unset the {API_KEY_ENV_VAR_NAME} environment variable."))
-                })
-                .on_click(cx.listener(|this, _, window, cx| this.reset_api_key(window, cx)))
-                .into_any_element()
-        };
-
-        if self.load_credentials_task.is_some() {
-            div().child(Label::new("Loading credentials…")).into_any()
-        } else {
-            v_flex().size_full().child(api_key_section).into_any()
-        }
-    }
-}
diff --git a/crates/language_models/src/provider/x_ai.rs b/crates/language_models/src/provider/x_ai.rs
deleted file mode 100644
index cc54dfa0dd..0000000000
--- a/crates/language_models/src/provider/x_ai.rs
+++ /dev/null
@@ -1,516 +0,0 @@
-use anyhow::{Result, anyhow};
-use collections::BTreeMap;
-use futures::{FutureExt, StreamExt, future, future::BoxFuture};
-use gpui::{AnyView, App, AsyncApp, Context, Entity, Task, Window};
-use http_client::HttpClient;
-use language_model::{
-    AuthenticateError, LanguageModel, LanguageModelCompletionError, LanguageModelCompletionEvent,
-    LanguageModelId, LanguageModelName, LanguageModelProvider, LanguageModelProviderId,
-    LanguageModelProviderName, LanguageModelProviderState, LanguageModelRequest,
-    LanguageModelToolChoice, LanguageModelToolSchemaFormat, RateLimiter, Role,
-};
-use open_ai::ResponseStreamEvent;
-pub use settings::XaiAvailableModel as AvailableModel;
-use settings::{Settings, SettingsStore};
-use std::sync::{Arc, LazyLock};
-use strum::IntoEnumIterator;
-use ui::{List, prelude::*};
-use ui_input::InputField;
-use util::ResultExt;
-use x_ai::{Model, XAI_API_URL};
-use zed_env_vars::{EnvVar, env_var};
-
-use crate::{
-    api_key::ApiKeyState,
-    ui::{ConfiguredApiCard, InstructionListItem},
-};
-
-const PROVIDER_ID: LanguageModelProviderId = LanguageModelProviderId::new("x_ai");
-const PROVIDER_NAME: LanguageModelProviderName = LanguageModelProviderName::new("xAI");
-
-const API_KEY_ENV_VAR_NAME: &str = "XAI_API_KEY";
-static API_KEY_ENV_VAR: LazyLock<EnvVar> = env_var!(API_KEY_ENV_VAR_NAME);
-
-#[derive(Default, Clone, Debug, PartialEq)]
-pub struct XAiSettings {
-    pub api_url: String,
-    pub available_models: Vec<AvailableModel>,
-}
-
-pub struct XAiLanguageModelProvider {
-    http_client: Arc<dyn HttpClient>,
-    state: Entity<State>,
-}
-
-pub struct State {
-    api_key_state: ApiKeyState,
-}
-
-impl State {
-    fn is_authenticated(&self) -> bool {
-        self.api_key_state.has_key()
-    }
-
-    fn set_api_key(&mut self, api_key: Option<String>, cx: &mut Context<Self>) -> Task<Result<()>> {
-        let api_url = XAiLanguageModelProvider::api_url(cx);
-        self.api_key_state
-            .store(api_url, api_key, |this| &mut this.api_key_state, cx)
-    }
-
-    fn authenticate(&mut self, cx: &mut Context<Self>) -> Task<Result<(), AuthenticateError>> {
-        let api_url = XAiLanguageModelProvider::api_url(cx);
-        self.api_key_state.load_if_needed(
-            api_url,
-            &API_KEY_ENV_VAR,
-            |this| &mut this.api_key_state,
-            cx,
-        )
-    }
-}
-
-impl XAiLanguageModelProvider {
-    pub fn new(http_client: Arc<dyn HttpClient>, cx: &mut App) -> Self {
-        let state = cx.new(|cx| {
-            cx.observe_global::<SettingsStore>(|this: &mut State, cx| {
-                let api_url = Self::api_url(cx);
-                this.api_key_state.handle_url_change(
-                    api_url,
-                    &API_KEY_ENV_VAR,
-                    |this| &mut this.api_key_state,
-                    cx,
-                );
-                cx.notify();
-            })
-            .detach();
-            State {
-                api_key_state: ApiKeyState::new(Self::api_url(cx)),
-            }
-        });
-
-        Self { http_client, state }
-    }
-
-    fn create_language_model(&self, model: x_ai::Model) -> Arc<dyn LanguageModel> {
-        Arc::new(XAiLanguageModel {
-            id: LanguageModelId::from(model.id().to_string()),
-            model,
-            state: self.state.clone(),
-            http_client: self.http_client.clone(),
-            request_limiter: RateLimiter::new(4),
-        })
-    }
-
-    fn settings(cx: &App) -> &XAiSettings {
-        &crate::AllLanguageModelSettings::get_global(cx).x_ai
-    }
-
-    fn api_url(cx: &App) -> SharedString {
-        let api_url = &Self::settings(cx).api_url;
-        if api_url.is_empty() {
-            XAI_API_URL.into()
-        } else {
-            SharedString::new(api_url.as_str())
-        }
-    }
-}
-
-impl LanguageModelProviderState for XAiLanguageModelProvider {
-    type ObservableEntity = State;
-
-    fn observable_entity(&self) -> Option<Entity<Self::ObservableEntity>> {
-        Some(self.state.clone())
-    }
-}
-
-impl LanguageModelProvider for XAiLanguageModelProvider {
-    fn id(&self) -> LanguageModelProviderId {
-        PROVIDER_ID
-    }
-
-    fn name(&self) -> LanguageModelProviderName {
-        PROVIDER_NAME
-    }
-
-    fn icon(&self) -> IconName {
-        IconName::AiXAi
-    }
-
-    fn default_model(&self, _cx: &App) -> Option<Arc<dyn LanguageModel>> {
-        Some(self.create_language_model(x_ai::Model::default()))
-    }
-
-    fn default_fast_model(&self, _cx: &App) -> Option<Arc<dyn LanguageModel>> {
-        Some(self.create_language_model(x_ai::Model::default_fast()))
-    }
-
-    fn provided_models(&self, cx: &App) -> Vec<Arc<dyn LanguageModel>> {
-        let mut models = BTreeMap::default();
-
-        for model in x_ai::Model::iter() {
-            if !matches!(model, x_ai::Model::Custom { .. }) {
-                models.insert(model.id().to_string(), model);
-            }
-        }
-
-        for model in &Self::settings(cx).available_models {
-            models.insert(
-                model.name.clone(),
-                x_ai::Model::Custom {
-                    name: model.name.clone(),
-                    display_name: model.display_name.clone(),
-                    max_tokens: model.max_tokens,
-                    max_output_tokens: model.max_output_tokens,
-                    max_completion_tokens: model.max_completion_tokens,
-                    supports_images: model.supports_images,
-                    supports_tools: model.supports_tools,
-                    parallel_tool_calls: model.parallel_tool_calls,
-                },
-            );
-        }
-
-        models
-            .into_values()
-            .map(|model| self.create_language_model(model))
-            .collect()
-    }
-
-    fn is_authenticated(&self, cx: &App) -> bool {
-        self.state.read(cx).is_authenticated()
-    }
-
-    fn authenticate(&self, cx: &mut App) -> Task<Result<(), AuthenticateError>> {
-        self.state.update(cx, |state, cx| state.authenticate(cx))
-    }
-
-    fn configuration_view(
-        &self,
-        _target_agent: language_model::ConfigurationViewTargetAgent,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> AnyView {
-        cx.new(|cx| ConfigurationView::new(self.state.clone(), window, cx))
-            .into()
-    }
-
-    fn reset_credentials(&self, cx: &mut App) -> Task<Result<()>> {
-        self.state
-            .update(cx, |state, cx| state.set_api_key(None, cx))
-    }
-}
-
-pub struct XAiLanguageModel {
-    id: LanguageModelId,
-    model: x_ai::Model,
-    state: Entity<State>,
-    http_client: Arc<dyn HttpClient>,
-    request_limiter: RateLimiter,
-}
-
-impl XAiLanguageModel {
-    fn stream_completion(
-        &self,
-        request: open_ai::Request,
-        cx: &AsyncApp,
-    ) -> BoxFuture<
-        'static,
-        Result<
-            futures::stream::BoxStream<'static, Result<ResponseStreamEvent>>,
-            LanguageModelCompletionError,
-        >,
-    > {
-        let http_client = self.http_client.clone();
-
-        let Ok((api_key, api_url)) = self.state.read_with(cx, |state, cx| {
-            let api_url = XAiLanguageModelProvider::api_url(cx);
-            (state.api_key_state.key(&api_url), api_url)
-        }) else {
-            return future::ready(Err(anyhow!("App state dropped").into())).boxed();
-        };
-
-        let future = self.request_limiter.stream(async move {
-            let provider = PROVIDER_NAME;
-            let Some(api_key) = api_key else {
-                return Err(LanguageModelCompletionError::NoApiKey { provider });
-            };
-            let request = open_ai::stream_completion(
-                http_client.as_ref(),
-                provider.0.as_str(),
-                &api_url,
-                &api_key,
-                request,
-            );
-            let response = request.await?;
-            Ok(response)
-        });
-
-        async move { Ok(future.await?.boxed()) }.boxed()
-    }
-}
-
-impl LanguageModel for XAiLanguageModel {
-    fn id(&self) -> LanguageModelId {
-        self.id.clone()
-    }
-
-    fn name(&self) -> LanguageModelName {
-        LanguageModelName::from(self.model.display_name().to_string())
-    }
-
-    fn provider_id(&self) -> LanguageModelProviderId {
-        PROVIDER_ID
-    }
-
-    fn provider_name(&self) -> LanguageModelProviderName {
-        PROVIDER_NAME
-    }
-
-    fn supports_tools(&self) -> bool {
-        self.model.supports_tool()
-    }
-
-    fn supports_images(&self) -> bool {
-        self.model.supports_images()
-    }
-
-    fn supports_tool_choice(&self, choice: LanguageModelToolChoice) -> bool {
-        match choice {
-            LanguageModelToolChoice::Auto
-            | LanguageModelToolChoice::Any
-            | LanguageModelToolChoice::None => true,
-        }
-    }
-    fn tool_input_format(&self) -> LanguageModelToolSchemaFormat {
-        let model_id = self.model.id().trim().to_lowercase();
-        if model_id.eq(x_ai::Model::Grok4.id()) || model_id.eq(x_ai::Model::GrokCodeFast1.id()) {
-            LanguageModelToolSchemaFormat::JsonSchemaSubset
-        } else {
-            LanguageModelToolSchemaFormat::JsonSchema
-        }
-    }
-
-    fn telemetry_id(&self) -> String {
-        format!("x_ai/{}", self.model.id())
-    }
-
-    fn max_token_count(&self) -> u64 {
-        self.model.max_token_count()
-    }
-
-    fn max_output_tokens(&self) -> Option<u64> {
-        self.model.max_output_tokens()
-    }
-
-    fn count_tokens(
-        &self,
-        request: LanguageModelRequest,
-        cx: &App,
-    ) -> BoxFuture<'static, Result<u64>> {
-        count_xai_tokens(request, self.model.clone(), cx)
-    }
-
-    fn stream_completion(
-        &self,
-        request: LanguageModelRequest,
-        cx: &AsyncApp,
-    ) -> BoxFuture<
-        'static,
-        Result<
-            futures::stream::BoxStream<
-                'static,
-                Result<LanguageModelCompletionEvent, LanguageModelCompletionError>,
-            >,
-            LanguageModelCompletionError,
-        >,
-    > {
-        let request = crate::provider::open_ai::into_open_ai(
-            request,
-            self.model.id(),
-            self.model.supports_parallel_tool_calls(),
-            self.model.supports_prompt_cache_key(),
-            self.max_output_tokens(),
-            None,
-        );
-        let completions = self.stream_completion(request, cx);
-        async move {
-            let mapper = crate::provider::open_ai::OpenAiEventMapper::new();
-            Ok(mapper.map_stream(completions.await?).boxed())
-        }
-        .boxed()
-    }
-}
-
-pub fn count_xai_tokens(
-    request: LanguageModelRequest,
-    model: Model,
-    cx: &App,
-) -> BoxFuture<'static, Result<u64>> {
-    cx.background_spawn(async move {
-        let messages = request
-            .messages
-            .into_iter()
-            .map(|message| tiktoken_rs::ChatCompletionRequestMessage {
-                role: match message.role {
-                    Role::User => "user".into(),
-                    Role::Assistant => "assistant".into(),
-                    Role::System => "system".into(),
-                },
-                content: Some(message.string_contents()),
-                name: None,
-                function_call: None,
-            })
-            .collect::<Vec<_>>();
-
-        let model_name = if model.max_token_count() >= 100_000 {
-            "gpt-4o"
-        } else {
-            "gpt-4"
-        };
-        tiktoken_rs::num_tokens_from_messages(model_name, &messages).map(|tokens| tokens as u64)
-    })
-    .boxed()
-}
-
-struct ConfigurationView {
-    api_key_editor: Entity<InputField>,
-    state: Entity<State>,
-    load_credentials_task: Option<Task<()>>,
-}
-
-impl ConfigurationView {
-    fn new(state: Entity<State>, window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let api_key_editor = cx.new(|cx| {
-            InputField::new(
-                window,
-                cx,
-                "xai-0000000000000000000000000000000000000000000000000",
-            )
-            .label("API key")
-        });
-
-        cx.observe(&state, |_, _, cx| {
-            cx.notify();
-        })
-        .detach();
-
-        let load_credentials_task = Some(cx.spawn_in(window, {
-            let state = state.clone();
-            async move |this, cx| {
-                if let Some(task) = state
-                    .update(cx, |state, cx| state.authenticate(cx))
-                    .log_err()
-                {
-                    // We don't log an error, because "not signed in" is also an error.
-                    let _ = task.await;
-                }
-                this.update(cx, |this, cx| {
-                    this.load_credentials_task = None;
-                    cx.notify();
-                })
-                .log_err();
-            }
-        }));
-
-        Self {
-            api_key_editor,
-            state,
-            load_credentials_task,
-        }
-    }
-
-    fn save_api_key(&mut self, _: &menu::Confirm, window: &mut Window, cx: &mut Context<Self>) {
-        let api_key = self.api_key_editor.read(cx).text(cx).trim().to_string();
-        if api_key.is_empty() {
-            return;
-        }
-
-        // url changes can cause the editor to be displayed again
-        self.api_key_editor
-            .update(cx, |editor, cx| editor.set_text("", window, cx));
-
-        let state = self.state.clone();
-        cx.spawn_in(window, async move |_, cx| {
-            state
-                .update(cx, |state, cx| state.set_api_key(Some(api_key), cx))?
-                .await
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn reset_api_key(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.api_key_editor
-            .update(cx, |input, cx| input.set_text("", window, cx));
-
-        let state = self.state.clone();
-        cx.spawn_in(window, async move |_, cx| {
-            state
-                .update(cx, |state, cx| state.set_api_key(None, cx))?
-                .await
-        })
-        .detach_and_log_err(cx);
-    }
-
-    fn should_render_editor(&self, cx: &mut Context<Self>) -> bool {
-        !self.state.read(cx).is_authenticated()
-    }
-}
-
-impl Render for ConfigurationView {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let env_var_set = self.state.read(cx).api_key_state.is_from_env_var();
-        let configured_card_label = if env_var_set {
-            format!("API key set in {API_KEY_ENV_VAR_NAME} environment variable")
-        } else {
-            let api_url = XAiLanguageModelProvider::api_url(cx);
-            if api_url == XAI_API_URL {
-                "API key configured".to_string()
-            } else {
-                format!("API key configured for {}", api_url)
-            }
-        };
-
-        let api_key_section = if self.should_render_editor(cx) {
-            v_flex()
-                .on_action(cx.listener(Self::save_api_key))
-                .child(Label::new("To use Zed's agent with xAI, you need to add an API key. Follow these steps:"))
-                .child(
-                    List::new()
-                        .child(InstructionListItem::new(
-                            "Create one by visiting",
-                            Some("xAI console"),
-                            Some("https://console.x.ai/team/default/api-keys"),
-                        ))
-                        .child(InstructionListItem::text_only(
-                            "Paste your API key below and hit enter to start using the agent",
-                        )),
-                )
-                .child(self.api_key_editor.clone())
-                .child(
-                    Label::new(format!(
-                        "You can also assign the {API_KEY_ENV_VAR_NAME} environment variable and restart Zed."
-                    ))
-                    .size(LabelSize::Small)
-                    .color(Color::Muted),
-                )
-                .child(
-                    Label::new("Note that xAI is a custom OpenAI-compatible provider.")
-                        .size(LabelSize::Small)
-                        .color(Color::Muted),
-                )
-                .into_any_element()
-        } else {
-            ConfiguredApiCard::new(configured_card_label)
-                .disabled(env_var_set)
-                .when(env_var_set, |this| {
-                    this.tooltip_label(format!("To reset your API key, unset the {API_KEY_ENV_VAR_NAME} environment variable."))
-                })
-                .on_click(cx.listener(|this, _, window, cx| this.reset_api_key(window, cx)))
-                .into_any_element()
-        };
-
-        if self.load_credentials_task.is_some() {
-            div().child(Label::new("Loading credentials…")).into_any()
-        } else {
-            v_flex().size_full().child(api_key_section).into_any()
-        }
-    }
-}
diff --git a/crates/language_models/src/settings.rs b/crates/language_models/src/settings.rs
deleted file mode 100644
index 43a8e7334a..0000000000
--- a/crates/language_models/src/settings.rs
+++ /dev/null
@@ -1,116 +0,0 @@
-use std::sync::Arc;
-
-use collections::HashMap;
-use settings::RegisterSetting;
-
-use crate::provider::{
-    anthropic::AnthropicSettings, bedrock::AmazonBedrockSettings, cloud::ZedDotDevSettings,
-    deepseek::DeepSeekSettings, google::GoogleSettings, lmstudio::LmStudioSettings,
-    mistral::MistralSettings, ollama::OllamaSettings, open_ai::OpenAiSettings,
-    open_ai_compatible::OpenAiCompatibleSettings, open_router::OpenRouterSettings,
-    vercel::VercelSettings, x_ai::XAiSettings,
-};
-
-#[derive(Debug, RegisterSetting)]
-pub struct AllLanguageModelSettings {
-    pub anthropic: AnthropicSettings,
-    pub bedrock: AmazonBedrockSettings,
-    pub deepseek: DeepSeekSettings,
-    pub google: GoogleSettings,
-    pub lmstudio: LmStudioSettings,
-    pub mistral: MistralSettings,
-    pub ollama: OllamaSettings,
-    pub open_router: OpenRouterSettings,
-    pub openai: OpenAiSettings,
-    pub openai_compatible: HashMap<Arc<str>, OpenAiCompatibleSettings>,
-    pub vercel: VercelSettings,
-    pub x_ai: XAiSettings,
-    pub zed_dot_dev: ZedDotDevSettings,
-}
-
-impl settings::Settings for AllLanguageModelSettings {
-    const PRESERVED_KEYS: Option<&'static [&'static str]> = Some(&["version"]);
-
-    fn from_settings(content: &settings::SettingsContent) -> Self {
-        let language_models = content.language_models.clone().unwrap();
-        let anthropic = language_models.anthropic.unwrap();
-        let bedrock = language_models.bedrock.unwrap();
-        let deepseek = language_models.deepseek.unwrap();
-        let google = language_models.google.unwrap();
-        let lmstudio = language_models.lmstudio.unwrap();
-        let mistral = language_models.mistral.unwrap();
-        let ollama = language_models.ollama.unwrap();
-        let open_router = language_models.open_router.unwrap();
-        let openai = language_models.openai.unwrap();
-        let openai_compatible = language_models.openai_compatible.unwrap();
-        let vercel = language_models.vercel.unwrap();
-        let x_ai = language_models.x_ai.unwrap();
-        let zed_dot_dev = language_models.zed_dot_dev.unwrap();
-        Self {
-            anthropic: AnthropicSettings {
-                api_url: anthropic.api_url.unwrap(),
-                available_models: anthropic.available_models.unwrap_or_default(),
-            },
-            bedrock: AmazonBedrockSettings {
-                available_models: bedrock.available_models.unwrap_or_default(),
-                region: bedrock.region,
-                endpoint: bedrock.endpoint_url, // todo(should be api_url)
-                profile_name: bedrock.profile,
-                role_arn: None, // todo(was never a setting for this...)
-                authentication_method: bedrock.authentication_method.map(Into::into),
-                allow_global: bedrock.allow_global,
-            },
-            deepseek: DeepSeekSettings {
-                api_url: deepseek.api_url.unwrap(),
-                available_models: deepseek.available_models.unwrap_or_default(),
-            },
-            google: GoogleSettings {
-                api_url: google.api_url.unwrap(),
-                available_models: google.available_models.unwrap_or_default(),
-            },
-            lmstudio: LmStudioSettings {
-                api_url: lmstudio.api_url.unwrap(),
-                available_models: lmstudio.available_models.unwrap_or_default(),
-            },
-            mistral: MistralSettings {
-                api_url: mistral.api_url.unwrap(),
-                available_models: mistral.available_models.unwrap_or_default(),
-            },
-            ollama: OllamaSettings {
-                api_url: ollama.api_url.unwrap(),
-                available_models: ollama.available_models.unwrap_or_default(),
-            },
-            open_router: OpenRouterSettings {
-                api_url: open_router.api_url.unwrap(),
-                available_models: open_router.available_models.unwrap_or_default(),
-            },
-            openai: OpenAiSettings {
-                api_url: openai.api_url.unwrap(),
-                available_models: openai.available_models.unwrap_or_default(),
-            },
-            openai_compatible: openai_compatible
-                .into_iter()
-                .map(|(key, value)| {
-                    (
-                        key,
-                        OpenAiCompatibleSettings {
-                            api_url: value.api_url,
-                            available_models: value.available_models,
-                        },
-                    )
-                })
-                .collect(),
-            vercel: VercelSettings {
-                api_url: vercel.api_url.unwrap(),
-                available_models: vercel.available_models.unwrap_or_default(),
-            },
-            x_ai: XAiSettings {
-                api_url: x_ai.api_url.unwrap(),
-                available_models: x_ai.available_models.unwrap_or_default(),
-            },
-            zed_dot_dev: ZedDotDevSettings {
-                available_models: zed_dot_dev.available_models.unwrap_or_default(),
-            },
-        }
-    }
-}
diff --git a/crates/language_models/src/ui.rs b/crates/language_models/src/ui.rs
deleted file mode 100644
index 1d7796ecc2..0000000000
--- a/crates/language_models/src/ui.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-pub mod configured_api_card;
-pub mod instruction_list_item;
-pub use configured_api_card::ConfiguredApiCard;
-pub use instruction_list_item::InstructionListItem;
diff --git a/crates/language_models/src/ui/configured_api_card.rs b/crates/language_models/src/ui/configured_api_card.rs
deleted file mode 100644
index 063ac1717f..0000000000
--- a/crates/language_models/src/ui/configured_api_card.rs
+++ /dev/null
@@ -1,86 +0,0 @@
-use gpui::{ClickEvent, IntoElement, ParentElement, SharedString};
-use ui::{Tooltip, prelude::*};
-
-#[derive(IntoElement)]
-pub struct ConfiguredApiCard {
-    label: SharedString,
-    button_label: Option<SharedString>,
-    tooltip_label: Option<SharedString>,
-    disabled: bool,
-    on_click: Option<Box<dyn Fn(&ClickEvent, &mut Window, &mut App) + 'static>>,
-}
-
-impl ConfiguredApiCard {
-    pub fn new(label: impl Into<SharedString>) -> Self {
-        Self {
-            label: label.into(),
-            button_label: None,
-            tooltip_label: None,
-            disabled: false,
-            on_click: None,
-        }
-    }
-
-    pub fn on_click(
-        mut self,
-        handler: impl Fn(&ClickEvent, &mut Window, &mut App) + 'static,
-    ) -> Self {
-        self.on_click = Some(Box::new(handler));
-        self
-    }
-
-    pub fn button_label(mut self, button_label: impl Into<SharedString>) -> Self {
-        self.button_label = Some(button_label.into());
-        self
-    }
-
-    pub fn tooltip_label(mut self, tooltip_label: impl Into<SharedString>) -> Self {
-        self.tooltip_label = Some(tooltip_label.into());
-        self
-    }
-
-    pub fn disabled(mut self, disabled: bool) -> Self {
-        self.disabled = disabled;
-        self
-    }
-}
-
-impl RenderOnce for ConfiguredApiCard {
-    fn render(self, _: &mut Window, cx: &mut App) -> impl IntoElement {
-        let button_label = self.button_label.unwrap_or("Reset Key".into());
-        let button_id = SharedString::new(format!("id-{}", button_label));
-
-        h_flex()
-            .mt_0p5()
-            .p_1()
-            .justify_between()
-            .rounded_md()
-            .border_1()
-            .border_color(cx.theme().colors().border)
-            .bg(cx.theme().colors().background)
-            .child(
-                h_flex()
-                    .flex_1()
-                    .min_w_0()
-                    .gap_1()
-                    .child(Icon::new(IconName::Check).color(Color::Success))
-                    .child(Label::new(self.label).truncate()),
-            )
-            .child(
-                Button::new(button_id, button_label)
-                    .label_size(LabelSize::Small)
-                    .icon(IconName::Undo)
-                    .icon_size(IconSize::Small)
-                    .icon_color(Color::Muted)
-                    .icon_position(IconPosition::Start)
-                    .disabled(self.disabled)
-                    .when_some(self.tooltip_label, |this, label| {
-                        this.tooltip(Tooltip::text(label))
-                    })
-                    .when_some(
-                        self.on_click.filter(|_| !self.disabled),
-                        |this, on_click| this.on_click(on_click),
-                    ),
-            )
-    }
-}
diff --git a/crates/language_models/src/ui/instruction_list_item.rs b/crates/language_models/src/ui/instruction_list_item.rs
deleted file mode 100644
index bdb5fbe242..0000000000
--- a/crates/language_models/src/ui/instruction_list_item.rs
+++ /dev/null
@@ -1,69 +0,0 @@
-use gpui::{AnyElement, IntoElement, ParentElement, SharedString};
-use ui::{ListItem, prelude::*};
-
-/// A reusable list item component for adding LLM provider configuration instructions
-pub struct InstructionListItem {
-    label: SharedString,
-    button_label: Option<SharedString>,
-    button_link: Option<String>,
-}
-
-impl InstructionListItem {
-    pub fn new(
-        label: impl Into<SharedString>,
-        button_label: Option<impl Into<SharedString>>,
-        button_link: Option<impl Into<String>>,
-    ) -> Self {
-        Self {
-            label: label.into(),
-            button_label: button_label.map(|l| l.into()),
-            button_link: button_link.map(|l| l.into()),
-        }
-    }
-
-    pub fn text_only(label: impl Into<SharedString>) -> Self {
-        Self {
-            label: label.into(),
-            button_label: None,
-            button_link: None,
-        }
-    }
-}
-
-impl IntoElement for InstructionListItem {
-    type Element = AnyElement;
-
-    fn into_element(self) -> Self::Element {
-        let item_content = if let (Some(button_label), Some(button_link)) =
-            (self.button_label, self.button_link)
-        {
-            let link = button_link;
-            let unique_id = SharedString::from(format!("{}-button", self.label));
-
-            h_flex()
-                .flex_wrap()
-                .child(Label::new(self.label))
-                .child(
-                    Button::new(unique_id, button_label)
-                        .style(ButtonStyle::Subtle)
-                        .icon(IconName::ArrowUpRight)
-                        .icon_size(IconSize::Small)
-                        .icon_color(Color::Muted)
-                        .on_click(move |_, _window, cx| cx.open_url(&link)),
-                )
-                .into_any_element()
-        } else {
-            Label::new(self.label).into_any_element()
-        };
-
-        ListItem::new("list-item")
-            .selectable(false)
-            .start_slot(
-                Icon::new(IconName::Dash)
-                    .size(IconSize::XSmall)
-                    .color(Color::Hidden),
-            )
-            .child(div().w_full().child(item_content))
-            .into_any_element()
-    }
-}
diff --git a/crates/language_onboarding/Cargo.toml b/crates/language_onboarding/Cargo.toml
deleted file mode 100644
index 38cf8a604a..0000000000
--- a/crates/language_onboarding/Cargo.toml
+++ /dev/null
@@ -1,29 +0,0 @@
-[package]
-name = "language_onboarding"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/python.rs"
-
-[features]
-default = []
-
-[dependencies]
-db.workspace = true
-editor.workspace = true
-gpui.workspace = true
-project.workspace = true
-ui.workspace = true
-workspace.workspace = true
-
-# Uncomment other workspace dependencies as needed
-# assistant.workspace = true
-# client.workspace = true
-# project.workspace = true
-# settings.workspace = true
diff --git a/crates/language_onboarding/LICENSE-GPL b/crates/language_onboarding/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/language_onboarding/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/language_onboarding/src/python.rs b/crates/language_onboarding/src/python.rs
deleted file mode 100644
index e715cb7c80..0000000000
--- a/crates/language_onboarding/src/python.rs
+++ /dev/null
@@ -1,102 +0,0 @@
-use db::kvp::Dismissable;
-use editor::Editor;
-use gpui::{Context, EventEmitter, Subscription};
-use ui::{Banner, FluentBuilder as _, prelude::*};
-use workspace::{ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView, Workspace};
-
-pub struct BasedPyrightBanner {
-    dismissed: bool,
-    have_basedpyright: bool,
-    _subscriptions: [Subscription; 1],
-}
-
-impl Dismissable for BasedPyrightBanner {
-    const KEY: &str = "basedpyright-banner";
-}
-
-impl BasedPyrightBanner {
-    pub fn new(workspace: &Workspace, cx: &mut Context<Self>) -> Self {
-        let subscription = cx.subscribe(workspace.project(), |this, _, event, _| {
-            if let project::Event::LanguageServerAdded(_, name, _) = event
-                && name == "basedpyright"
-            {
-                this.have_basedpyright = true;
-            }
-        });
-        let dismissed = Self::dismissed();
-        Self {
-            dismissed,
-            have_basedpyright: false,
-            _subscriptions: [subscription],
-        }
-    }
-
-    fn onboarding_banner_enabled(&self) -> bool {
-        !self.dismissed && self.have_basedpyright
-    }
-}
-
-impl EventEmitter<ToolbarItemEvent> for BasedPyrightBanner {}
-
-impl Render for BasedPyrightBanner {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        div()
-            .id("basedpyright-banner")
-            .when(self.onboarding_banner_enabled(), |el| {
-                el.child(
-                    Banner::new()
-                        .child(
-                            v_flex()
-                                .gap_0p5()
-                                .child(Label::new("Basedpyright is now the only default language server for Python").mt_0p5())
-                                .child(Label::new("We have disabled PyRight and pylsp by default. They can be re-enabled in your settings.").size(LabelSize::Small).color(Color::Muted))
-                        )
-                        .action_slot(
-                            h_flex()
-                                .gap_0p5()
-                                .child(
-                                    Button::new("learn-more", "Learn More")
-                                        .icon(IconName::ArrowUpRight)
-                                        .label_size(LabelSize::Small)
-                                        .icon_size(IconSize::XSmall)
-                                        .icon_color(Color::Muted)
-                                        .on_click(|_, _, cx| {
-                                            cx.open_url("https://zed.dev/docs/languages/python")
-                                        }),
-                                )
-                                .child(IconButton::new("dismiss", IconName::Close).icon_size(IconSize::Small).on_click(
-                                    cx.listener(|this, _, _, cx| {
-                                        this.dismissed = true;
-                                        Self::set_dismissed(true, cx);
-                                        cx.notify();
-                                    }),
-                                ))
-                        )
-                        .into_any_element(),
-                )
-            })
-    }
-}
-
-impl ToolbarItemView for BasedPyrightBanner {
-    fn set_active_pane_item(
-        &mut self,
-        active_pane_item: Option<&dyn workspace::ItemHandle>,
-        _window: &mut ui::Window,
-        cx: &mut Context<Self>,
-    ) -> ToolbarItemLocation {
-        if !self.onboarding_banner_enabled() {
-            return ToolbarItemLocation::Hidden;
-        }
-        if let Some(item) = active_pane_item
-            && let Some(editor) = item.act_as::<Editor>(cx)
-            && let Some(path) = editor.update(cx, |editor, cx| editor.target_file_abs_path(cx))
-            && let Some(file_name) = path.file_name()
-            && file_name.as_encoded_bytes().ends_with(".py".as_bytes())
-        {
-            return ToolbarItemLocation::Secondary;
-        }
-
-        ToolbarItemLocation::Hidden
-    }
-}
diff --git a/crates/language_selector/Cargo.toml b/crates/language_selector/Cargo.toml
deleted file mode 100644
index 47ad9b9f88..0000000000
--- a/crates/language_selector/Cargo.toml
+++ /dev/null
@@ -1,31 +0,0 @@
-[package]
-name = "language_selector"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/language_selector.rs"
-doctest = false
-
-[dependencies]
-anyhow.workspace = true
-editor.workspace = true
-file_finder.workspace = true
-file_icons.workspace = true
-fuzzy.workspace = true
-gpui.workspace = true
-language.workspace = true
-picker.workspace = true
-project.workspace = true
-settings.workspace = true
-ui.workspace = true
-util.workspace = true
-workspace.workspace = true
-
-[dev-dependencies]
-editor = { workspace = true, features = ["test-support"] }
diff --git a/crates/language_selector/LICENSE-GPL b/crates/language_selector/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/language_selector/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/language_selector/src/active_buffer_language.rs b/crates/language_selector/src/active_buffer_language.rs
deleted file mode 100644
index c75c3954cc..0000000000
--- a/crates/language_selector/src/active_buffer_language.rs
+++ /dev/null
@@ -1,89 +0,0 @@
-use editor::Editor;
-use gpui::{
-    Context, Entity, IntoElement, ParentElement, Render, Styled, Subscription, WeakEntity, Window,
-    div,
-};
-use language::LanguageName;
-use settings::Settings as _;
-use ui::{Button, ButtonCommon, Clickable, FluentBuilder, LabelSize, Tooltip};
-use workspace::{StatusBarSettings, StatusItemView, Workspace, item::ItemHandle};
-
-use crate::{LanguageSelector, Toggle};
-
-pub struct ActiveBufferLanguage {
-    active_language: Option<Option<LanguageName>>,
-    workspace: WeakEntity<Workspace>,
-    _observe_active_editor: Option<Subscription>,
-}
-
-impl ActiveBufferLanguage {
-    pub fn new(workspace: &Workspace) -> Self {
-        Self {
-            active_language: None,
-            workspace: workspace.weak_handle(),
-            _observe_active_editor: None,
-        }
-    }
-
-    fn update_language(&mut self, editor: Entity<Editor>, _: &mut Window, cx: &mut Context<Self>) {
-        self.active_language = Some(None);
-
-        let editor = editor.read(cx);
-        if let Some((_, buffer, _)) = editor.active_excerpt(cx)
-            && let Some(language) = buffer.read(cx).language()
-        {
-            self.active_language = Some(Some(language.name()));
-        }
-
-        cx.notify();
-    }
-}
-
-impl Render for ActiveBufferLanguage {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        if !StatusBarSettings::get_global(cx).active_language_button {
-            return div().hidden();
-        }
-
-        div().when_some(self.active_language.as_ref(), |el, active_language| {
-            let active_language_text = if let Some(active_language_text) = active_language {
-                active_language_text.to_string()
-            } else {
-                "Unknown".to_string()
-            };
-
-            el.child(
-                Button::new("change-language", active_language_text)
-                    .label_size(LabelSize::Small)
-                    .on_click(cx.listener(|this, _, window, cx| {
-                        if let Some(workspace) = this.workspace.upgrade() {
-                            workspace.update(cx, |workspace, cx| {
-                                LanguageSelector::toggle(workspace, window, cx)
-                            });
-                        }
-                    }))
-                    .tooltip(|_window, cx| Tooltip::for_action("Select Language", &Toggle, cx)),
-            )
-        })
-    }
-}
-
-impl StatusItemView for ActiveBufferLanguage {
-    fn set_active_pane_item(
-        &mut self,
-        active_pane_item: Option<&dyn ItemHandle>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(editor) = active_pane_item.and_then(|item| item.downcast::<Editor>()) {
-            self._observe_active_editor =
-                Some(cx.observe_in(&editor, window, Self::update_language));
-            self.update_language(editor, window, cx);
-        } else {
-            self.active_language = None;
-            self._observe_active_editor = None;
-        }
-
-        cx.notify();
-    }
-}
diff --git a/crates/language_selector/src/language_selector.rs b/crates/language_selector/src/language_selector.rs
deleted file mode 100644
index 991cce50ba..0000000000
--- a/crates/language_selector/src/language_selector.rs
+++ /dev/null
@@ -1,297 +0,0 @@
-mod active_buffer_language;
-
-pub use active_buffer_language::ActiveBufferLanguage;
-use anyhow::Context as _;
-use editor::Editor;
-use file_finder::file_finder_settings::FileFinderSettings;
-use file_icons::FileIcons;
-use fuzzy::{StringMatch, StringMatchCandidate, match_strings};
-use gpui::{
-    App, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, ParentElement,
-    Render, Styled, WeakEntity, Window, actions,
-};
-use language::{Buffer, LanguageMatcher, LanguageName, LanguageRegistry};
-use picker::{Picker, PickerDelegate};
-use project::Project;
-use settings::Settings;
-use std::{ops::Not as _, path::Path, sync::Arc};
-use ui::{HighlightedLabel, ListItem, ListItemSpacing, prelude::*};
-use util::ResultExt;
-use workspace::{ModalView, Workspace};
-
-actions!(
-    language_selector,
-    [
-        /// Toggles the language selector modal.
-        Toggle
-    ]
-);
-
-pub fn init(cx: &mut App) {
-    cx.observe_new(LanguageSelector::register).detach();
-}
-
-pub struct LanguageSelector {
-    picker: Entity<Picker<LanguageSelectorDelegate>>,
-}
-
-impl LanguageSelector {
-    fn register(
-        workspace: &mut Workspace,
-        _window: Option<&mut Window>,
-        _: &mut Context<Workspace>,
-    ) {
-        workspace.register_action(move |workspace, _: &Toggle, window, cx| {
-            Self::toggle(workspace, window, cx);
-        });
-    }
-
-    fn toggle(
-        workspace: &mut Workspace,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) -> Option<()> {
-        let registry = workspace.app_state().languages.clone();
-        let (_, buffer, _) = workspace
-            .active_item(cx)?
-            .act_as::<Editor>(cx)?
-            .read(cx)
-            .active_excerpt(cx)?;
-        let project = workspace.project().clone();
-
-        workspace.toggle_modal(window, cx, move |window, cx| {
-            LanguageSelector::new(buffer, project, registry, window, cx)
-        });
-        Some(())
-    }
-
-    fn new(
-        buffer: Entity<Buffer>,
-        project: Entity<Project>,
-        language_registry: Arc<LanguageRegistry>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let delegate = LanguageSelectorDelegate::new(
-            cx.entity().downgrade(),
-            buffer,
-            project,
-            language_registry,
-        );
-
-        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx));
-        Self { picker }
-    }
-}
-
-impl Render for LanguageSelector {
-    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .key_context("LanguageSelector")
-            .w(rems(34.))
-            .child(self.picker.clone())
-    }
-}
-
-impl Focusable for LanguageSelector {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        self.picker.focus_handle(cx)
-    }
-}
-
-impl EventEmitter<DismissEvent> for LanguageSelector {}
-impl ModalView for LanguageSelector {}
-
-pub struct LanguageSelectorDelegate {
-    language_selector: WeakEntity<LanguageSelector>,
-    buffer: Entity<Buffer>,
-    project: Entity<Project>,
-    language_registry: Arc<LanguageRegistry>,
-    candidates: Vec<StringMatchCandidate>,
-    matches: Vec<StringMatch>,
-    selected_index: usize,
-}
-
-impl LanguageSelectorDelegate {
-    fn new(
-        language_selector: WeakEntity<LanguageSelector>,
-        buffer: Entity<Buffer>,
-        project: Entity<Project>,
-        language_registry: Arc<LanguageRegistry>,
-    ) -> Self {
-        let candidates = language_registry
-            .language_names()
-            .into_iter()
-            .filter_map(|name| {
-                language_registry
-                    .available_language_for_name(name.as_ref())?
-                    .hidden()
-                    .not()
-                    .then_some(name)
-            })
-            .enumerate()
-            .map(|(candidate_id, name)| StringMatchCandidate::new(candidate_id, name.as_ref()))
-            .collect::<Vec<_>>();
-
-        Self {
-            language_selector,
-            buffer,
-            project,
-            language_registry,
-            candidates,
-            matches: vec![],
-            selected_index: 0,
-        }
-    }
-
-    fn language_data_for_match(&self, mat: &StringMatch, cx: &App) -> (String, Option<Icon>) {
-        let mut label = mat.string.clone();
-        let buffer_language = self.buffer.read(cx).language();
-        let need_icon = FileFinderSettings::get_global(cx).file_icons;
-
-        if let Some(buffer_language) = buffer_language
-            .filter(|buffer_language| buffer_language.name().as_ref() == mat.string.as_str())
-        {
-            label.push_str(" (current)");
-            let icon = need_icon
-                .then(|| self.language_icon(&buffer_language.config().matcher, cx))
-                .flatten();
-            (label, icon)
-        } else {
-            let icon = need_icon
-                .then(|| {
-                    let language_name = LanguageName::new(mat.string.as_str());
-                    self.language_registry
-                        .available_language_for_name(language_name.as_ref())
-                        .and_then(|available_language| {
-                            self.language_icon(available_language.matcher(), cx)
-                        })
-                })
-                .flatten();
-            (label, icon)
-        }
-    }
-
-    fn language_icon(&self, matcher: &LanguageMatcher, cx: &App) -> Option<Icon> {
-        matcher
-            .path_suffixes
-            .iter()
-            .find_map(|extension| FileIcons::get_icon(Path::new(extension), cx))
-            .map(Icon::from_path)
-            .map(|icon| icon.color(Color::Muted))
-    }
-}
-
-impl PickerDelegate for LanguageSelectorDelegate {
-    type ListItem = ListItem;
-
-    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
-        "Select a language…".into()
-    }
-
-    fn match_count(&self) -> usize {
-        self.matches.len()
-    }
-
-    fn confirm(&mut self, _: bool, window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        if let Some(mat) = self.matches.get(self.selected_index) {
-            let language_name = &self.candidates[mat.candidate_id].string;
-            let language = self.language_registry.language_for_name(language_name);
-            let project = self.project.downgrade();
-            let buffer = self.buffer.downgrade();
-            cx.spawn_in(window, async move |_, cx| {
-                let language = language.await?;
-                let project = project.upgrade().context("project was dropped")?;
-                let buffer = buffer.upgrade().context("buffer was dropped")?;
-                project.update(cx, |project, cx| {
-                    project.set_language_for_buffer(&buffer, language, cx);
-                })
-            })
-            .detach_and_log_err(cx);
-        }
-        self.dismissed(window, cx);
-    }
-
-    fn dismissed(&mut self, _: &mut Window, cx: &mut Context<Picker<Self>>) {
-        self.language_selector
-            .update(cx, |_, cx| cx.emit(DismissEvent))
-            .log_err();
-    }
-
-    fn selected_index(&self) -> usize {
-        self.selected_index
-    }
-
-    fn set_selected_index(
-        &mut self,
-        ix: usize,
-        _window: &mut Window,
-        _: &mut Context<Picker<Self>>,
-    ) {
-        self.selected_index = ix;
-    }
-
-    fn update_matches(
-        &mut self,
-        query: String,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> gpui::Task<()> {
-        let background = cx.background_executor().clone();
-        let candidates = self.candidates.clone();
-        cx.spawn_in(window, async move |this, cx| {
-            let matches = if query.is_empty() {
-                candidates
-                    .into_iter()
-                    .enumerate()
-                    .map(|(index, candidate)| StringMatch {
-                        candidate_id: index,
-                        string: candidate.string,
-                        positions: Vec::new(),
-                        score: 0.0,
-                    })
-                    .collect()
-            } else {
-                match_strings(
-                    &candidates,
-                    &query,
-                    false,
-                    true,
-                    100,
-                    &Default::default(),
-                    background,
-                )
-                .await
-            };
-
-            this.update(cx, |this, cx| {
-                let delegate = &mut this.delegate;
-                delegate.matches = matches;
-                delegate.selected_index = delegate
-                    .selected_index
-                    .min(delegate.matches.len().saturating_sub(1));
-                cx.notify();
-            })
-            .log_err();
-        })
-    }
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        _: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<Self::ListItem> {
-        let mat = &self.matches.get(ix)?;
-        let (label, language_icon) = self.language_data_for_match(mat, cx);
-        Some(
-            ListItem::new(ix)
-                .inset(true)
-                .spacing(ListItemSpacing::Sparse)
-                .toggle_state(selected)
-                .start_slot::<Icon>(language_icon)
-                .child(HighlightedLabel::new(label, mat.positions.clone())),
-        )
-    }
-}
diff --git a/crates/language_tools/Cargo.toml b/crates/language_tools/Cargo.toml
deleted file mode 100644
index 6181975a9b..0000000000
--- a/crates/language_tools/Cargo.toml
+++ /dev/null
@@ -1,44 +0,0 @@
-[package]
-name = "language_tools"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/language_tools.rs"
-doctest = false
-
-[dependencies]
-anyhow.workspace = true
-client.workspace = true
-collections.workspace = true
-command_palette_hooks.workspace = true
-copilot.workspace = true
-editor.workspace = true
-futures.workspace = true
-gpui.workspace = true
-itertools.workspace = true
-language.workspace = true
-lsp.workspace = true
-project.workspace = true
-proto.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-theme.workspace = true
-tree-sitter.workspace = true
-ui.workspace = true
-util.workspace = true
-workspace.workspace = true
-zed_actions.workspace = true
-
-[dev-dependencies]
-editor = { workspace = true, features = ["test-support"] }
-release_channel.workspace = true
-gpui = { workspace = true, features = ["test-support"] }
-semver.workspace = true
-util = { workspace = true, features = ["test-support"] }
-zlog.workspace = true
diff --git a/crates/language_tools/LICENSE-GPL b/crates/language_tools/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/language_tools/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/language_tools/src/key_context_view.rs b/crates/language_tools/src/key_context_view.rs
deleted file mode 100644
index cc34838010..0000000000
--- a/crates/language_tools/src/key_context_view.rs
+++ /dev/null
@@ -1,298 +0,0 @@
-use gpui::{
-    Action, App, AppContext as _, Entity, EventEmitter, FocusHandle, Focusable,
-    KeyBindingContextPredicate, KeyContext, Keystroke, MouseButton, Render, Subscription, Task,
-    actions,
-};
-use itertools::Itertools;
-use serde_json::json;
-use ui::{Button, ButtonStyle};
-use ui::{
-    ButtonCommon, Clickable, Context, FluentBuilder, InteractiveElement, Label, LabelCommon,
-    LabelSize, ParentElement, SharedString, StatefulInteractiveElement, Styled, Window, div,
-    h_flex, px, v_flex,
-};
-use workspace::{Item, SplitDirection, Workspace};
-
-actions!(
-    dev,
-    [
-        /// Opens the key context view for debugging keybindings.
-        OpenKeyContextView
-    ]
-);
-
-pub fn init(cx: &mut App) {
-    cx.observe_new(|workspace: &mut Workspace, _, _| {
-        workspace.register_action(|workspace, _: &OpenKeyContextView, window, cx| {
-            let key_context_view = cx.new(|cx| KeyContextView::new(window, cx));
-            workspace.split_item(
-                SplitDirection::Right,
-                Box::new(key_context_view),
-                window,
-                cx,
-            )
-        });
-    })
-    .detach();
-}
-
-struct KeyContextView {
-    pending_keystrokes: Option<Vec<Keystroke>>,
-    last_keystrokes: Option<SharedString>,
-    last_possibilities: Vec<(SharedString, SharedString, Option<bool>)>,
-    context_stack: Vec<KeyContext>,
-    focus_handle: FocusHandle,
-    _subscriptions: [Subscription; 2],
-}
-
-impl KeyContextView {
-    pub fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let sub1 = cx.observe_keystrokes(|this, e, _, cx| {
-            let mut pending = this.pending_keystrokes.take().unwrap_or_default();
-            pending.push(e.keystroke.clone());
-            let mut possibilities = cx.all_bindings_for_input(&pending);
-            possibilities.reverse();
-            this.last_keystrokes = Some(
-                json!(pending.iter().map(|p| p.unparse()).join(" "))
-                    .to_string()
-                    .into(),
-            );
-            this.context_stack = e.context_stack.clone();
-            this.last_possibilities = possibilities
-                .into_iter()
-                .map(|binding| {
-                    let match_state = if let Some(predicate) = binding.predicate() {
-                        if this.matches(&predicate) {
-                            if this.action_matches(&e.action, binding.action()) {
-                                Some(true)
-                            } else {
-                                Some(false)
-                            }
-                        } else {
-                            None
-                        }
-                    } else if this.action_matches(&e.action, binding.action()) {
-                        Some(true)
-                    } else {
-                        Some(false)
-                    };
-                    let predicate = if let Some(predicate) = binding.predicate() {
-                        format!("{}", predicate)
-                    } else {
-                        "".to_string()
-                    };
-                    let mut name = binding.action().name();
-                    if name == "zed::NoAction" {
-                        name = "(null)"
-                    }
-
-                    (
-                        name.to_owned().into(),
-                        json!(predicate).to_string().into(),
-                        match_state,
-                    )
-                })
-                .collect();
-            cx.notify();
-        });
-        let sub2 = cx.observe_pending_input(window, |this, window, cx| {
-            this.pending_keystrokes = window.pending_input_keystrokes().map(|k| k.to_vec());
-            if this.pending_keystrokes.is_some() {
-                this.last_keystrokes.take();
-            }
-            cx.notify();
-        });
-
-        Self {
-            context_stack: Vec::new(),
-            pending_keystrokes: None,
-            last_keystrokes: None,
-            last_possibilities: Vec::new(),
-            focus_handle: cx.focus_handle(),
-            _subscriptions: [sub1, sub2],
-        }
-    }
-}
-
-impl EventEmitter<()> for KeyContextView {}
-
-impl Focusable for KeyContextView {
-    fn focus_handle(&self, _: &App) -> gpui::FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-impl KeyContextView {
-    fn set_context_stack(&mut self, stack: Vec<KeyContext>, cx: &mut Context<Self>) {
-        self.context_stack = stack;
-        cx.notify()
-    }
-
-    fn matches(&self, predicate: &KeyBindingContextPredicate) -> bool {
-        predicate.depth_of(&self.context_stack).is_some()
-    }
-
-    fn action_matches(&self, a: &Option<Box<dyn Action>>, b: &dyn Action) -> bool {
-        if let Some(last_action) = a {
-            last_action.partial_eq(b)
-        } else {
-            b.name() == "zed::NoAction"
-        }
-    }
-}
-
-impl Item for KeyContextView {
-    type Event = ();
-
-    fn to_item_events(_: &Self::Event, _: impl FnMut(workspace::item::ItemEvent)) {}
-
-    fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString {
-        "Keyboard Context".into()
-    }
-
-    fn telemetry_event_text(&self) -> Option<&'static str> {
-        None
-    }
-
-    fn can_split(&self) -> bool {
-        true
-    }
-
-    fn clone_on_split(
-        &self,
-        _workspace_id: Option<workspace::WorkspaceId>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Option<Entity<Self>>>
-    where
-        Self: Sized,
-    {
-        Task::ready(Some(cx.new(|cx| KeyContextView::new(window, cx))))
-    }
-}
-
-impl Render for KeyContextView {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl ui::IntoElement {
-        use itertools::Itertools;
-
-        let key_equivalents = cx.keyboard_mapper().get_key_equivalents();
-        v_flex()
-            .id("key-context-view")
-            .overflow_scroll()
-            .size_full()
-            .max_h_full()
-            .pt_4()
-            .pl_4()
-            .track_focus(&self.focus_handle)
-            .key_context("KeyContextView")
-            .on_mouse_up_out(
-                MouseButton::Left,
-                cx.listener(|this, _, window, cx| {
-                    this.last_keystrokes.take();
-                    this.set_context_stack(window.context_stack(), cx);
-                }),
-            )
-            .on_mouse_up_out(
-                MouseButton::Right,
-                cx.listener(|_, _, window, cx| {
-                    cx.defer_in(window, |this, window, cx| {
-                        this.last_keystrokes.take();
-                        this.set_context_stack(window.context_stack(), cx);
-                    });
-                }),
-            )
-            .child(Label::new("Keyboard Context").size(LabelSize::Large))
-            .child(Label::new("This view lets you determine the current context stack for creating custom key bindings in Zed. When a keyboard shortcut is triggered, it also shows all the possible contexts it could have triggered in, and which one matched."))
-            .child(
-                h_flex()
-                    .mt_4()
-                    .gap_4()
-                    .child(
-                        Button::new("open_documentation", "Open Documentation")
-                            .style(ButtonStyle::Filled)
-                            .on_click(|_, _, cx| cx.open_url("https://zed.dev/docs/key-bindings")),
-                    )
-                    .child(
-                        Button::new("view_default_keymap", "View Default Keymap")
-                            .style(ButtonStyle::Filled)
-                            .key_binding(ui::KeyBinding::for_action(
-                                &zed_actions::OpenDefaultKeymap,
-                                cx
-                            ))
-                            .on_click(|_, window, cx| {
-                                window.dispatch_action(zed_actions::OpenDefaultKeymap.boxed_clone(), cx);
-                            }),
-                    )
-                    .child(
-                        Button::new("edit_your_keymap", "Edit Keymap File")
-                            .style(ButtonStyle::Filled)
-                            .key_binding(ui::KeyBinding::for_action(&zed_actions::OpenKeymapFile, cx))
-                            .on_click(|_, window, cx| {
-                                window.dispatch_action(zed_actions::OpenKeymapFile.boxed_clone(), cx);
-                            }),
-                    ),
-            )
-            .child(
-                Label::new("Current Context Stack")
-                    .size(LabelSize::Large)
-                    .mt_8(),
-            )
-            .children({
-                self.context_stack.iter().enumerate().map(|(i, context)| {
-                    let primary = context.primary().map(|e| e.key.clone()).unwrap_or_default();
-                    let secondary = context
-                        .secondary()
-                        .map(|e| {
-                            if let Some(value) = e.value.as_ref() {
-                                format!("{}={}", e.key, value)
-                            } else {
-                                e.key.to_string()
-                            }
-                        })
-                        .join(" ");
-                    Label::new(format!("{} {}", primary, secondary)).ml(px(12. * (i + 1) as f32))
-                })
-            })
-            .child(Label::new("Last Keystroke").mt_4().size(LabelSize::Large))
-            .when_some(self.pending_keystrokes.as_ref(), |el, keystrokes| {
-                el.child(
-                    Label::new(format!(
-                        "Waiting for more input: {}",
-                        keystrokes.iter().map(|k| k.unparse()).join(" ")
-                    ))
-                    .ml(px(12.)),
-                )
-            })
-            .when_some(self.last_keystrokes.as_ref(), |el, keystrokes| {
-                el.child(Label::new(format!("Typed: {}", keystrokes)).ml_4())
-                    .children(
-                        self.last_possibilities
-                            .iter()
-                            .map(|(name, predicate, state)| {
-                                let (text, color) = match state {
-                                    Some(true) => ("(match)", ui::Color::Success),
-                                    Some(false) => ("(low precedence)", ui::Color::Hint),
-                                    None => ("(no match)", ui::Color::Error),
-                                };
-                                h_flex()
-                                    .gap_2()
-                                    .ml_8()
-                                    .child(div().min_w(px(200.)).child(Label::new(name.clone())))
-                                    .child(Label::new(predicate.clone()))
-                                    .child(Label::new(text).color(color))
-                            }),
-                    )
-            })
-            .when_some(key_equivalents, |el, key_equivalents| {
-                el.child(Label::new("Key Equivalents").mt_4().size(LabelSize::Large))
-                    .child(Label::new("Shortcuts defined using some characters have been remapped so that shortcuts can be typed without holding option."))
-                    .children(
-                        key_equivalents
-                            .iter()
-                            .sorted()
-                            .map(|(key, equivalent)| {
-                                Label::new(format!("cmd-{} => cmd-{}", key, equivalent)).ml_8()
-                            }),
-                    )
-            })
-    }
-}
diff --git a/crates/language_tools/src/language_tools.rs b/crates/language_tools/src/language_tools.rs
deleted file mode 100644
index aa16728064..0000000000
--- a/crates/language_tools/src/language_tools.rs
+++ /dev/null
@@ -1,54 +0,0 @@
-mod key_context_view;
-pub mod lsp_button;
-pub mod lsp_log_view;
-mod syntax_tree_view;
-
-#[cfg(test)]
-mod lsp_log_view_tests;
-
-use gpui::{App, AppContext, Entity};
-
-pub use lsp_log_view::LspLogView;
-pub use syntax_tree_view::{SyntaxTreeToolbarItemView, SyntaxTreeView};
-use ui::{Context, Window};
-use workspace::{Item, ItemHandle, SplitDirection, Workspace};
-
-pub fn init(cx: &mut App) {
-    lsp_log_view::init(false, cx);
-    syntax_tree_view::init(cx);
-    key_context_view::init(cx);
-}
-
-fn get_or_create_tool<T>(
-    workspace: &mut Workspace,
-    destination: SplitDirection,
-    window: &mut Window,
-    cx: &mut Context<Workspace>,
-    new_tool: impl FnOnce(&mut Window, &mut Context<T>) -> T,
-) -> Entity<T>
-where
-    T: Item,
-{
-    if let Some(item) = workspace.item_of_type::<T>(cx) {
-        return item;
-    }
-
-    let new_tool = cx.new(|cx| new_tool(window, cx));
-    match workspace.find_pane_in_direction(destination, cx) {
-        Some(right_pane) => {
-            workspace.add_item(
-                right_pane,
-                new_tool.boxed_clone(),
-                None,
-                true,
-                true,
-                window,
-                cx,
-            );
-        }
-        None => {
-            workspace.split_item(destination, new_tool.boxed_clone(), window, cx);
-        }
-    }
-    new_tool
-}
diff --git a/crates/language_tools/src/lsp_button.rs b/crates/language_tools/src/lsp_button.rs
deleted file mode 100644
index 335381c6f7..0000000000
--- a/crates/language_tools/src/lsp_button.rs
+++ /dev/null
@@ -1,1048 +0,0 @@
-use std::{
-    collections::{BTreeMap, HashMap},
-    path::{Path, PathBuf},
-    rc::Rc,
-    time::Duration,
-};
-
-use client::proto;
-use collections::HashSet;
-use editor::{Editor, EditorEvent};
-use gpui::{Corner, Entity, Subscription, Task, WeakEntity, actions};
-use language::{BinaryStatus, BufferId, ServerHealth};
-use lsp::{LanguageServerId, LanguageServerName, LanguageServerSelector};
-use project::{
-    LspStore, LspStoreEvent, Worktree, lsp_store::log_store::GlobalLogStore,
-    project_settings::ProjectSettings,
-};
-use settings::{Settings as _, SettingsStore};
-use ui::{
-    Context, ContextMenu, ContextMenuEntry, ContextMenuItem, DocumentationAside, DocumentationEdge,
-    DocumentationSide, Indicator, PopoverMenu, PopoverMenuHandle, Tooltip, Window, prelude::*,
-};
-
-use util::{ResultExt, rel_path::RelPath};
-use workspace::{StatusItemView, Workspace};
-
-use crate::lsp_log_view;
-
-actions!(
-    lsp_tool,
-    [
-        /// Toggles the language server tool menu.
-        ToggleMenu
-    ]
-);
-
-pub struct LspButton {
-    server_state: Entity<LanguageServerState>,
-    popover_menu_handle: PopoverMenuHandle<ContextMenu>,
-    lsp_menu: Option<Entity<ContextMenu>>,
-    lsp_menu_refresh: Task<()>,
-    _subscriptions: Vec<Subscription>,
-}
-
-#[derive(Debug)]
-struct LanguageServerState {
-    items: Vec<LspMenuItem>,
-    workspace: WeakEntity<Workspace>,
-    lsp_store: WeakEntity<LspStore>,
-    active_editor: Option<ActiveEditor>,
-    language_servers: LanguageServers,
-}
-
-struct ActiveEditor {
-    editor: WeakEntity<Editor>,
-    _editor_subscription: Subscription,
-    editor_buffers: HashSet<BufferId>,
-}
-
-impl std::fmt::Debug for ActiveEditor {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("ActiveEditor")
-            .field("editor", &self.editor)
-            .field("editor_buffers", &self.editor_buffers)
-            .finish_non_exhaustive()
-    }
-}
-
-#[derive(Debug, Default, Clone)]
-struct LanguageServers {
-    health_statuses: HashMap<LanguageServerId, LanguageServerHealthStatus>,
-    binary_statuses: HashMap<LanguageServerName, LanguageServerBinaryStatus>,
-    servers_per_buffer_abs_path: HashMap<PathBuf, ServersForPath>,
-}
-
-#[derive(Debug, Clone)]
-struct ServersForPath {
-    servers: HashMap<LanguageServerId, Option<LanguageServerName>>,
-    worktree: Option<WeakEntity<Worktree>>,
-}
-
-#[derive(Debug, Clone)]
-struct LanguageServerHealthStatus {
-    name: LanguageServerName,
-    health: Option<(Option<SharedString>, ServerHealth)>,
-}
-
-#[derive(Debug, Clone)]
-struct LanguageServerBinaryStatus {
-    status: BinaryStatus,
-    message: Option<SharedString>,
-}
-
-#[derive(Debug)]
-struct ServerInfo {
-    name: LanguageServerName,
-    id: LanguageServerId,
-    health: Option<ServerHealth>,
-    binary_status: Option<LanguageServerBinaryStatus>,
-    message: Option<SharedString>,
-}
-
-impl ServerInfo {
-    fn server_selector(&self) -> LanguageServerSelector {
-        LanguageServerSelector::Id(self.id)
-    }
-}
-
-impl LanguageServerHealthStatus {
-    fn health(&self) -> Option<ServerHealth> {
-        self.health.as_ref().map(|(_, health)| *health)
-    }
-
-    fn message(&self) -> Option<SharedString> {
-        self.health
-            .as_ref()
-            .and_then(|(message, _)| message.clone())
-    }
-}
-
-impl LanguageServerState {
-    fn fill_menu(&self, mut menu: ContextMenu, cx: &mut Context<Self>) -> ContextMenu {
-        let lsp_logs = cx
-            .try_global::<GlobalLogStore>()
-            .map(|lsp_logs| lsp_logs.0.clone());
-        let Some(lsp_logs) = lsp_logs else {
-            return menu;
-        };
-
-        let mut first_button_encountered = false;
-        for item in &self.items {
-            if let LspMenuItem::ToggleServersButton { restart } = item {
-                let label = if *restart {
-                    "Restart All Servers"
-                } else {
-                    "Stop All Servers"
-                };
-                let restart = *restart;
-                let button = ContextMenuEntry::new(label).handler({
-                    let state = cx.entity();
-                    move |_, cx| {
-                        let lsp_store = state.read(cx).lsp_store.clone();
-                        lsp_store
-                            .update(cx, |lsp_store, cx| {
-                                if restart {
-                                    let Some(workspace) = state.read(cx).workspace.upgrade() else {
-                                        return;
-                                    };
-                                    let project = workspace.read(cx).project().clone();
-                                    let path_style = project.read(cx).path_style(cx);
-                                    let buffer_store = project.read(cx).buffer_store().clone();
-                                    let buffers = state
-                                        .read(cx)
-                                        .language_servers
-                                        .servers_per_buffer_abs_path
-                                        .iter()
-                                        .filter_map(|(abs_path, servers)| {
-                                            let worktree =
-                                                servers.worktree.as_ref()?.upgrade()?.read(cx);
-                                            let relative_path =
-                                                abs_path.strip_prefix(&worktree.abs_path()).ok()?;
-                                            let relative_path =
-                                                RelPath::new(relative_path, path_style)
-                                                    .log_err()?;
-                                            let entry = worktree.entry_for_path(&relative_path)?;
-                                            let project_path =
-                                                project.read(cx).path_for_entry(entry.id, cx)?;
-                                            buffer_store.read(cx).get_by_path(&project_path)
-                                        })
-                                        .collect();
-                                    let selectors = state
-                                        .read(cx)
-                                        .items
-                                        .iter()
-                                        // Do not try to use IDs as we have stopped all servers already, when allowing to restart them all
-                                        .flat_map(|item| match item {
-                                            LspMenuItem::Header { .. } => None,
-                                            LspMenuItem::ToggleServersButton { .. } => None,
-                                            LspMenuItem::WithHealthCheck { health, .. } => Some(
-                                                LanguageServerSelector::Name(health.name.clone()),
-                                            ),
-                                            LspMenuItem::WithBinaryStatus {
-                                                server_name, ..
-                                            } => Some(LanguageServerSelector::Name(
-                                                server_name.clone(),
-                                            )),
-                                        })
-                                        .collect();
-                                    lsp_store.restart_language_servers_for_buffers(
-                                        buffers, selectors, cx,
-                                    );
-                                } else {
-                                    lsp_store.stop_all_language_servers(cx);
-                                }
-                            })
-                            .ok();
-                    }
-                });
-                if !first_button_encountered {
-                    menu = menu.separator();
-                    first_button_encountered = true;
-                }
-                menu = menu.item(button);
-                continue;
-            } else if let LspMenuItem::Header { header, separator } = item {
-                menu = menu
-                    .when(*separator, |menu| menu.separator())
-                    .when_some(header.as_ref(), |menu, header| menu.header(header));
-                continue;
-            }
-
-            let Some(server_info) = item.server_info() else {
-                continue;
-            };
-            let server_selector = server_info.server_selector();
-            let is_remote = self
-                .lsp_store
-                .update(cx, |lsp_store, _| lsp_store.as_remote().is_some())
-                .unwrap_or(false);
-            let has_logs = is_remote || lsp_logs.read(cx).has_server_logs(&server_selector);
-
-            let status_color = server_info
-                .binary_status
-                .as_ref()
-                .and_then(|binary_status| match binary_status.status {
-                    BinaryStatus::None => None,
-                    BinaryStatus::CheckingForUpdate
-                    | BinaryStatus::Downloading
-                    | BinaryStatus::Starting => Some(Color::Modified),
-                    BinaryStatus::Stopping => Some(Color::Disabled),
-                    BinaryStatus::Stopped => Some(Color::Disabled),
-                    BinaryStatus::Failed { .. } => Some(Color::Error),
-                })
-                .or_else(|| {
-                    Some(match server_info.health? {
-                        ServerHealth::Ok => Color::Success,
-                        ServerHealth::Warning => Color::Warning,
-                        ServerHealth::Error => Color::Error,
-                    })
-                })
-                .unwrap_or(Color::Success);
-
-            let message = server_info
-                .message
-                .as_ref()
-                .or_else(|| server_info.binary_status.as_ref()?.message.as_ref())
-                .cloned();
-            let hover_label = if message.is_some() {
-                Some("View Message")
-            } else if has_logs {
-                Some("View Logs")
-            } else {
-                None
-            };
-
-            let server_name = server_info.name.clone();
-            menu = menu.item(ContextMenuItem::custom_entry(
-                move |_, _| {
-                    h_flex()
-                        .group("menu_item")
-                        .w_full()
-                        .gap_2()
-                        .justify_between()
-                        .child(
-                            h_flex()
-                                .gap_2()
-                                .child(Indicator::dot().color(status_color))
-                                .child(Label::new(server_name.0.clone())),
-                        )
-                        .when_some(hover_label, |div, hover_label| {
-                            div.child(
-                                h_flex()
-                                    .visible_on_hover("menu_item")
-                                    .child(
-                                        Label::new(hover_label)
-                                            .size(LabelSize::Small)
-                                            .color(Color::Muted),
-                                    )
-                                    .child(
-                                        Icon::new(IconName::ChevronRight)
-                                            .size(IconSize::Small)
-                                            .color(Color::Muted),
-                                    ),
-                            )
-                        })
-                        .into_any_element()
-                },
-                {
-                    let lsp_logs = lsp_logs.clone();
-                    let message = message.clone();
-                    let server_selector = server_selector.clone();
-                    let server_name = server_info.name.clone();
-                    let workspace = self.workspace.clone();
-                    move |window, cx| {
-                        if let Some(message) = &message {
-                            let Some(create_buffer) = workspace
-                                .update(cx, |workspace, cx| {
-                                    workspace
-                                        .project()
-                                        .update(cx, |project, cx| project.create_buffer(false, cx))
-                                })
-                                .ok()
-                            else {
-                                return;
-                            };
-
-                            let window = window.window_handle();
-                            let workspace = workspace.clone();
-                            let message = message.clone();
-                            let server_name = server_name.clone();
-                            cx.spawn(async move |cx| {
-                                let buffer = create_buffer.await?;
-                                buffer.update(cx, |buffer, cx| {
-                                    buffer.edit(
-                                        [(
-                                            0..0,
-                                            format!("Language server {server_name}:\n\n{message}"),
-                                        )],
-                                        None,
-                                        cx,
-                                    );
-                                    buffer.set_capability(language::Capability::ReadOnly, cx);
-                                })?;
-
-                                workspace.update(cx, |workspace, cx| {
-                                    window.update(cx, |_, window, cx| {
-                                        workspace.add_item_to_active_pane(
-                                            Box::new(cx.new(|cx| {
-                                                let mut editor =
-                                                    Editor::for_buffer(buffer, None, window, cx);
-                                                editor.set_read_only(true);
-                                                editor
-                                            })),
-                                            None,
-                                            true,
-                                            window,
-                                            cx,
-                                        );
-                                    })
-                                })??;
-
-                                anyhow::Ok(())
-                            })
-                            .detach();
-                        } else if has_logs {
-                            lsp_log_view::open_server_trace(
-                                &lsp_logs,
-                                workspace.clone(),
-                                server_selector.clone(),
-                                window,
-                                cx,
-                            );
-                        } else {
-                            cx.propagate();
-                        }
-                    }
-                },
-                message.map(|server_message| {
-                    DocumentationAside::new(
-                        DocumentationSide::Right,
-                        DocumentationEdge::Bottom,
-                        Rc::new(move |_| Label::new(server_message.clone()).into_any_element()),
-                    )
-                }),
-            ));
-        }
-        menu
-    }
-}
-
-impl LanguageServers {
-    fn update_binary_status(
-        &mut self,
-        binary_status: BinaryStatus,
-        message: Option<&str>,
-        name: LanguageServerName,
-    ) {
-        let binary_status_message = message.map(SharedString::new);
-        if matches!(
-            binary_status,
-            BinaryStatus::Stopped | BinaryStatus::Failed { .. }
-        ) {
-            self.health_statuses.retain(|_, server| server.name != name);
-        }
-        self.binary_statuses.insert(
-            name,
-            LanguageServerBinaryStatus {
-                status: binary_status,
-                message: binary_status_message,
-            },
-        );
-    }
-
-    fn update_server_health(
-        &mut self,
-        id: LanguageServerId,
-        health: ServerHealth,
-        message: Option<&str>,
-        name: Option<LanguageServerName>,
-    ) {
-        if let Some(state) = self.health_statuses.get_mut(&id) {
-            state.health = Some((message.map(SharedString::new), health));
-            if let Some(name) = name {
-                state.name = name;
-            }
-        } else if let Some(name) = name {
-            self.health_statuses.insert(
-                id,
-                LanguageServerHealthStatus {
-                    health: Some((message.map(SharedString::new), health)),
-                    name,
-                },
-            );
-        }
-    }
-
-    fn is_empty(&self) -> bool {
-        self.binary_statuses.is_empty() && self.health_statuses.is_empty()
-    }
-}
-
-#[derive(Debug)]
-enum ServerData<'a> {
-    WithHealthCheck {
-        server_id: LanguageServerId,
-        health: &'a LanguageServerHealthStatus,
-        binary_status: Option<&'a LanguageServerBinaryStatus>,
-    },
-    WithBinaryStatus {
-        server_id: LanguageServerId,
-        server_name: &'a LanguageServerName,
-        binary_status: &'a LanguageServerBinaryStatus,
-    },
-}
-
-#[derive(Debug)]
-enum LspMenuItem {
-    WithHealthCheck {
-        server_id: LanguageServerId,
-        health: LanguageServerHealthStatus,
-        binary_status: Option<LanguageServerBinaryStatus>,
-    },
-    WithBinaryStatus {
-        server_id: LanguageServerId,
-        server_name: LanguageServerName,
-        binary_status: LanguageServerBinaryStatus,
-    },
-    ToggleServersButton {
-        restart: bool,
-    },
-    Header {
-        header: Option<SharedString>,
-        separator: bool,
-    },
-}
-
-impl LspMenuItem {
-    fn server_info(&self) -> Option<ServerInfo> {
-        match self {
-            Self::Header { .. } => None,
-            Self::ToggleServersButton { .. } => None,
-            Self::WithHealthCheck {
-                server_id,
-                health,
-                binary_status,
-                ..
-            } => Some(ServerInfo {
-                name: health.name.clone(),
-                id: *server_id,
-                health: health.health(),
-                binary_status: binary_status.clone(),
-                message: health.message(),
-            }),
-            Self::WithBinaryStatus {
-                server_id,
-                server_name,
-                binary_status,
-                ..
-            } => Some(ServerInfo {
-                name: server_name.clone(),
-                id: *server_id,
-                health: None,
-                binary_status: Some(binary_status.clone()),
-                message: binary_status.message.clone(),
-            }),
-        }
-    }
-}
-
-impl ServerData<'_> {
-    fn into_lsp_item(self) -> LspMenuItem {
-        match self {
-            Self::WithHealthCheck {
-                server_id,
-                health,
-                binary_status,
-                ..
-            } => LspMenuItem::WithHealthCheck {
-                server_id,
-                health: health.clone(),
-                binary_status: binary_status.cloned(),
-            },
-            Self::WithBinaryStatus {
-                server_id,
-                server_name,
-                binary_status,
-                ..
-            } => LspMenuItem::WithBinaryStatus {
-                server_id,
-                server_name: server_name.clone(),
-                binary_status: binary_status.clone(),
-            },
-        }
-    }
-}
-
-impl LspButton {
-    pub fn new(
-        workspace: &Workspace,
-        popover_menu_handle: PopoverMenuHandle<ContextMenu>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let settings_subscription =
-            cx.observe_global_in::<SettingsStore>(window, move |lsp_button, window, cx| {
-                if ProjectSettings::get_global(cx).global_lsp_settings.button {
-                    if lsp_button.lsp_menu.is_none() {
-                        lsp_button.refresh_lsp_menu(true, window, cx);
-                    }
-                } else if lsp_button.lsp_menu.take().is_some() {
-                    cx.notify();
-                }
-            });
-
-        let lsp_store = workspace.project().read(cx).lsp_store();
-        let mut language_servers = LanguageServers::default();
-        for (_, status) in lsp_store.read(cx).language_server_statuses() {
-            language_servers.binary_statuses.insert(
-                status.name.clone(),
-                LanguageServerBinaryStatus {
-                    status: BinaryStatus::None,
-                    message: None,
-                },
-            );
-        }
-
-        let lsp_store_subscription =
-            cx.subscribe_in(&lsp_store, window, |lsp_button, _, e, window, cx| {
-                lsp_button.on_lsp_store_event(e, window, cx)
-            });
-
-        let server_state = cx.new(|_| LanguageServerState {
-            workspace: workspace.weak_handle(),
-            items: Vec::new(),
-            lsp_store: lsp_store.downgrade(),
-            active_editor: None,
-            language_servers,
-        });
-
-        let mut lsp_button = Self {
-            server_state,
-            popover_menu_handle,
-            lsp_menu: None,
-            lsp_menu_refresh: Task::ready(()),
-            _subscriptions: vec![settings_subscription, lsp_store_subscription],
-        };
-        if !lsp_button
-            .server_state
-            .read(cx)
-            .language_servers
-            .binary_statuses
-            .is_empty()
-        {
-            lsp_button.refresh_lsp_menu(true, window, cx);
-        }
-
-        lsp_button
-    }
-
-    fn on_lsp_store_event(
-        &mut self,
-        e: &LspStoreEvent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.lsp_menu.is_none() {
-            return;
-        };
-        let mut updated = false;
-
-        // TODO `LspStore` is global and reports status from all language servers, even from the other windows.
-        // Also, we do not get "LSP removed" events so LSPs are never removed.
-        match e {
-            LspStoreEvent::LanguageServerUpdate {
-                language_server_id,
-                name,
-                message: proto::update_language_server::Variant::StatusUpdate(status_update),
-            } => match &status_update.status {
-                Some(proto::status_update::Status::Binary(binary_status)) => {
-                    let Some(name) = name.as_ref() else {
-                        return;
-                    };
-                    if let Some(binary_status) = proto::ServerBinaryStatus::from_i32(*binary_status)
-                    {
-                        let binary_status = match binary_status {
-                            proto::ServerBinaryStatus::None => BinaryStatus::None,
-                            proto::ServerBinaryStatus::CheckingForUpdate => {
-                                BinaryStatus::CheckingForUpdate
-                            }
-                            proto::ServerBinaryStatus::Downloading => BinaryStatus::Downloading,
-                            proto::ServerBinaryStatus::Starting => BinaryStatus::Starting,
-                            proto::ServerBinaryStatus::Stopping => BinaryStatus::Stopping,
-                            proto::ServerBinaryStatus::Stopped => BinaryStatus::Stopped,
-                            proto::ServerBinaryStatus::Failed => {
-                                let Some(error) = status_update.message.clone() else {
-                                    return;
-                                };
-                                BinaryStatus::Failed { error }
-                            }
-                        };
-                        self.server_state.update(cx, |state, _| {
-                            state.language_servers.update_binary_status(
-                                binary_status,
-                                status_update.message.as_deref(),
-                                name.clone(),
-                            );
-                        });
-                        updated = true;
-                    };
-                }
-                Some(proto::status_update::Status::Health(health_status)) => {
-                    if let Some(health) = proto::ServerHealth::from_i32(*health_status) {
-                        let health = match health {
-                            proto::ServerHealth::Ok => ServerHealth::Ok,
-                            proto::ServerHealth::Warning => ServerHealth::Warning,
-                            proto::ServerHealth::Error => ServerHealth::Error,
-                        };
-                        self.server_state.update(cx, |state, _| {
-                            state.language_servers.update_server_health(
-                                *language_server_id,
-                                health,
-                                status_update.message.as_deref(),
-                                name.clone(),
-                            );
-                        });
-                        updated = true;
-                    }
-                }
-                None => {}
-            },
-            LspStoreEvent::LanguageServerUpdate {
-                language_server_id,
-                name,
-                message: proto::update_language_server::Variant::RegisteredForBuffer(update),
-                ..
-            } => {
-                self.server_state.update(cx, |state, cx| {
-                    let Ok(worktree) = state.workspace.update(cx, |workspace, cx| {
-                        workspace
-                            .project()
-                            .read(cx)
-                            .find_worktree(Path::new(&update.buffer_abs_path), cx)
-                            .map(|(worktree, _)| worktree.downgrade())
-                    }) else {
-                        return;
-                    };
-                    let entry = state
-                        .language_servers
-                        .servers_per_buffer_abs_path
-                        .entry(PathBuf::from(&update.buffer_abs_path))
-                        .or_insert_with(|| ServersForPath {
-                            servers: HashMap::default(),
-                            worktree: worktree.clone(),
-                        });
-                    entry.servers.insert(*language_server_id, name.clone());
-                    if worktree.is_some() {
-                        entry.worktree = worktree;
-                    }
-                });
-                updated = true;
-            }
-            _ => {}
-        };
-
-        if updated {
-            self.refresh_lsp_menu(false, window, cx);
-        }
-    }
-
-    fn regenerate_items(&mut self, cx: &mut App) {
-        self.server_state.update(cx, |state, cx| {
-            let active_worktrees = state
-                .active_editor
-                .as_ref()
-                .into_iter()
-                .flat_map(|active_editor| {
-                    active_editor
-                        .editor
-                        .upgrade()
-                        .into_iter()
-                        .flat_map(|active_editor| {
-                            active_editor
-                                .read(cx)
-                                .buffer()
-                                .read(cx)
-                                .all_buffers()
-                                .into_iter()
-                                .filter_map(|buffer| {
-                                    project::File::from_dyn(buffer.read(cx).file())
-                                })
-                                .map(|buffer_file| buffer_file.worktree.clone())
-                        })
-                })
-                .collect::<HashSet<_>>();
-
-            let mut server_ids_to_worktrees =
-                HashMap::<LanguageServerId, Entity<Worktree>>::default();
-            let mut server_names_to_worktrees = HashMap::<
-                LanguageServerName,
-                HashSet<(Entity<Worktree>, LanguageServerId)>,
-            >::default();
-            for servers_for_path in state.language_servers.servers_per_buffer_abs_path.values() {
-                if let Some(worktree) = servers_for_path
-                    .worktree
-                    .as_ref()
-                    .and_then(|worktree| worktree.upgrade())
-                {
-                    for (server_id, server_name) in &servers_for_path.servers {
-                        server_ids_to_worktrees.insert(*server_id, worktree.clone());
-                        if let Some(server_name) = server_name {
-                            server_names_to_worktrees
-                                .entry(server_name.clone())
-                                .or_default()
-                                .insert((worktree.clone(), *server_id));
-                        }
-                    }
-                }
-            }
-            state
-                .lsp_store
-                .update(cx, |lsp_store, cx| {
-                    for (server_id, status) in lsp_store.language_server_statuses() {
-                        if let Some(worktree) = status.worktree.and_then(|worktree_id| {
-                            lsp_store
-                                .worktree_store()
-                                .read(cx)
-                                .worktree_for_id(worktree_id, cx)
-                        }) {
-                            server_ids_to_worktrees.insert(server_id, worktree.clone());
-                            server_names_to_worktrees
-                                .entry(status.name.clone())
-                                .or_default()
-                                .insert((worktree, server_id));
-                        }
-                    }
-                })
-                .ok();
-
-            let mut servers_per_worktree = BTreeMap::<SharedString, Vec<ServerData>>::new();
-            let mut servers_with_health_checks = HashSet::default();
-
-            for (server_id, health) in &state.language_servers.health_statuses {
-                let worktree = server_ids_to_worktrees.get(server_id).or_else(|| {
-                    let worktrees = server_names_to_worktrees.get(&health.name)?;
-                    worktrees
-                        .iter()
-                        .find(|(worktree, _)| active_worktrees.contains(worktree))
-                        .or_else(|| worktrees.iter().next())
-                        .map(|(worktree, _)| worktree)
-                });
-                servers_with_health_checks.insert(&health.name);
-                let worktree_name =
-                    worktree.map(|worktree| SharedString::new(worktree.read(cx).root_name_str()));
-
-                let binary_status = state.language_servers.binary_statuses.get(&health.name);
-                let server_data = ServerData::WithHealthCheck {
-                    server_id: *server_id,
-                    health,
-                    binary_status,
-                };
-                if let Some(worktree_name) = worktree_name {
-                    servers_per_worktree
-                        .entry(worktree_name.clone())
-                        .or_default()
-                        .push(server_data);
-                }
-            }
-
-            let mut can_stop_all = !state.language_servers.health_statuses.is_empty();
-            let mut can_restart_all = state.language_servers.health_statuses.is_empty();
-            for (server_name, binary_status) in state
-                .language_servers
-                .binary_statuses
-                .iter()
-                .filter(|(name, _)| !servers_with_health_checks.contains(name))
-            {
-                match binary_status.status {
-                    BinaryStatus::None => {
-                        can_restart_all = false;
-                        can_stop_all |= true;
-                    }
-                    BinaryStatus::CheckingForUpdate => {
-                        can_restart_all = false;
-                        can_stop_all = false;
-                    }
-                    BinaryStatus::Downloading => {
-                        can_restart_all = false;
-                        can_stop_all = false;
-                    }
-                    BinaryStatus::Starting => {
-                        can_restart_all = false;
-                        can_stop_all = false;
-                    }
-                    BinaryStatus::Stopping => {
-                        can_restart_all = false;
-                        can_stop_all = false;
-                    }
-                    BinaryStatus::Stopped => {}
-                    BinaryStatus::Failed { .. } => {}
-                }
-
-                if let Some(worktrees_for_name) = server_names_to_worktrees.get(server_name)
-                    && let Some((worktree, server_id)) = worktrees_for_name
-                        .iter()
-                        .find(|(worktree, _)| active_worktrees.contains(worktree))
-                        .or_else(|| worktrees_for_name.iter().next())
-                {
-                    let worktree_name = SharedString::new(worktree.read(cx).root_name_str());
-                    servers_per_worktree
-                        .entry(worktree_name.clone())
-                        .or_default()
-                        .push(ServerData::WithBinaryStatus {
-                            server_name,
-                            binary_status,
-                            server_id: *server_id,
-                        });
-                }
-            }
-
-            let mut new_lsp_items = Vec::with_capacity(servers_per_worktree.len() + 1);
-            for (worktree_name, worktree_servers) in servers_per_worktree {
-                if worktree_servers.is_empty() {
-                    continue;
-                }
-                new_lsp_items.push(LspMenuItem::Header {
-                    header: Some(worktree_name),
-                    separator: false,
-                });
-                new_lsp_items.extend(worktree_servers.into_iter().map(ServerData::into_lsp_item));
-            }
-            if !new_lsp_items.is_empty() {
-                if can_stop_all {
-                    new_lsp_items.push(LspMenuItem::ToggleServersButton { restart: true });
-                    new_lsp_items.push(LspMenuItem::ToggleServersButton { restart: false });
-                } else if can_restart_all {
-                    new_lsp_items.push(LspMenuItem::ToggleServersButton { restart: true });
-                }
-            }
-
-            state.items = new_lsp_items;
-        });
-    }
-
-    fn refresh_lsp_menu(
-        &mut self,
-        create_if_empty: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if create_if_empty || self.lsp_menu.is_some() {
-            let state = self.server_state.clone();
-            self.lsp_menu_refresh = cx.spawn_in(window, async move |lsp_button, cx| {
-                cx.background_executor()
-                    .timer(Duration::from_millis(30))
-                    .await;
-                lsp_button
-                    .update_in(cx, |lsp_button, window, cx| {
-                        lsp_button.regenerate_items(cx);
-                        let menu = ContextMenu::build(window, cx, |menu, _, cx| {
-                            state.update(cx, |state, cx| state.fill_menu(menu, cx))
-                        });
-                        lsp_button.lsp_menu = Some(menu.clone());
-                        lsp_button.popover_menu_handle.refresh_menu(
-                            window,
-                            cx,
-                            Rc::new(move |_, _| Some(menu.clone())),
-                        );
-                        cx.notify();
-                    })
-                    .ok();
-            });
-        }
-    }
-}
-
-impl StatusItemView for LspButton {
-    fn set_active_pane_item(
-        &mut self,
-        active_pane_item: Option<&dyn workspace::ItemHandle>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if ProjectSettings::get_global(cx).global_lsp_settings.button {
-            if let Some(editor) = active_pane_item.and_then(|item| item.downcast::<Editor>()) {
-                if Some(&editor)
-                    != self
-                        .server_state
-                        .read(cx)
-                        .active_editor
-                        .as_ref()
-                        .and_then(|active_editor| active_editor.editor.upgrade())
-                        .as_ref()
-                {
-                    let editor_buffers =
-                        HashSet::from_iter(editor.read(cx).buffer().read(cx).excerpt_buffer_ids());
-                    let _editor_subscription = cx.subscribe_in(
-                        &editor,
-                        window,
-                        |lsp_button, _, e: &EditorEvent, window, cx| match e {
-                            EditorEvent::ExcerptsAdded { buffer, .. } => {
-                                let updated = lsp_button.server_state.update(cx, |state, cx| {
-                                    if let Some(active_editor) = state.active_editor.as_mut() {
-                                        let buffer_id = buffer.read(cx).remote_id();
-                                        active_editor.editor_buffers.insert(buffer_id)
-                                    } else {
-                                        false
-                                    }
-                                });
-                                if updated {
-                                    lsp_button.refresh_lsp_menu(false, window, cx);
-                                }
-                            }
-                            EditorEvent::ExcerptsRemoved {
-                                removed_buffer_ids, ..
-                            } => {
-                                let removed = lsp_button.server_state.update(cx, |state, _| {
-                                    let mut removed = false;
-                                    if let Some(active_editor) = state.active_editor.as_mut() {
-                                        for id in removed_buffer_ids {
-                                            active_editor.editor_buffers.retain(|buffer_id| {
-                                                let retain = buffer_id != id;
-                                                removed |= !retain;
-                                                retain
-                                            });
-                                        }
-                                    }
-                                    removed
-                                });
-                                if removed {
-                                    lsp_button.refresh_lsp_menu(false, window, cx);
-                                }
-                            }
-                            _ => {}
-                        },
-                    );
-                    self.server_state.update(cx, |state, _| {
-                        state.active_editor = Some(ActiveEditor {
-                            editor: editor.downgrade(),
-                            _editor_subscription,
-                            editor_buffers,
-                        });
-                    });
-                    self.refresh_lsp_menu(true, window, cx);
-                }
-            } else if self.server_state.read(cx).active_editor.is_some() {
-                self.server_state.update(cx, |state, _| {
-                    state.active_editor = None;
-                });
-                self.refresh_lsp_menu(false, window, cx);
-            }
-        } else if self.server_state.read(cx).active_editor.is_some() {
-            self.server_state.update(cx, |state, _| {
-                state.active_editor = None;
-            });
-            self.refresh_lsp_menu(false, window, cx);
-        }
-    }
-}
-
-impl Render for LspButton {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl ui::IntoElement {
-        if self.server_state.read(cx).language_servers.is_empty() || self.lsp_menu.is_none() {
-            return div().hidden();
-        }
-
-        let mut has_errors = false;
-        let mut has_warnings = false;
-        let mut has_other_notifications = false;
-        let state = self.server_state.read(cx);
-        for binary_status in state.language_servers.binary_statuses.values() {
-            has_errors |= matches!(binary_status.status, BinaryStatus::Failed { .. });
-            has_other_notifications |= binary_status.message.is_some();
-        }
-
-        for server in state.language_servers.health_statuses.values() {
-            if let Some((message, health)) = &server.health {
-                has_other_notifications |= message.is_some();
-                match health {
-                    ServerHealth::Ok => {}
-                    ServerHealth::Warning => has_warnings = true,
-                    ServerHealth::Error => has_errors = true,
-                }
-            }
-        }
-
-        let (indicator, description) = if has_errors {
-            (
-                Some(Indicator::dot().color(Color::Error)),
-                "Server with errors",
-            )
-        } else if has_warnings {
-            (
-                Some(Indicator::dot().color(Color::Warning)),
-                "Server with warnings",
-            )
-        } else if has_other_notifications {
-            (
-                Some(Indicator::dot().color(Color::Modified)),
-                "Server with notifications",
-            )
-        } else {
-            (None, "All Servers Operational")
-        };
-
-        let lsp_button = cx.weak_entity();
-
-        div().child(
-            PopoverMenu::new("lsp-tool")
-                .menu(move |_, cx| {
-                    lsp_button
-                        .read_with(cx, |lsp_button, _| lsp_button.lsp_menu.clone())
-                        .ok()
-                        .flatten()
-                })
-                .anchor(Corner::BottomLeft)
-                .with_handle(self.popover_menu_handle.clone())
-                .trigger_with_tooltip(
-                    IconButton::new("zed-lsp-tool-button", IconName::BoltOutlined)
-                        .when_some(indicator, IconButton::indicator)
-                        .icon_size(IconSize::Small)
-                        .indicator_border_color(Some(cx.theme().colors().status_bar_background)),
-                    move |_window, cx| {
-                        Tooltip::with_meta("Language Servers", Some(&ToggleMenu), description, cx)
-                    },
-                ),
-        )
-    }
-}
diff --git a/crates/language_tools/src/lsp_log_view.rs b/crates/language_tools/src/lsp_log_view.rs
deleted file mode 100644
index 314dcc0b9b..0000000000
--- a/crates/language_tools/src/lsp_log_view.rs
+++ /dev/null
@@ -1,1350 +0,0 @@
-use collections::VecDeque;
-use copilot::Copilot;
-use editor::{Editor, EditorEvent, MultiBufferOffset, actions::MoveToEnd, scroll::Autoscroll};
-use gpui::{
-    App, Context, Corner, Entity, EventEmitter, FocusHandle, Focusable, IntoElement, ParentElement,
-    Render, Styled, Subscription, Task, WeakEntity, Window, actions, div,
-};
-use itertools::Itertools as _;
-use language::{LanguageServerId, language_settings::SoftWrap};
-use lsp::{
-    LanguageServer, LanguageServerName, LanguageServerSelector, MessageType, SetTraceParams,
-    TraceValue, notification::SetTrace,
-};
-use project::{
-    LanguageServerStatus, Project,
-    lsp_store::log_store::{self, Event, LanguageServerKind, LogKind, LogStore, Message},
-    search::SearchQuery,
-};
-use proto::toggle_lsp_logs::LogType;
-use std::{any::TypeId, borrow::Cow, sync::Arc};
-use ui::{Button, Checkbox, ContextMenu, Label, PopoverMenu, ToggleState, prelude::*};
-use util::ResultExt as _;
-use workspace::{
-    SplitDirection, ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView, Workspace, WorkspaceId,
-    item::{Item, ItemHandle},
-    searchable::{Direction, SearchEvent, SearchableItem, SearchableItemHandle},
-};
-
-use crate::get_or_create_tool;
-
-pub fn open_server_trace(
-    log_store: &Entity<LogStore>,
-    workspace: WeakEntity<Workspace>,
-    server: LanguageServerSelector,
-    window: &mut Window,
-    cx: &mut App,
-) {
-    log_store.update(cx, |_, cx| {
-        cx.spawn_in(window, async move |log_store, cx| {
-            let Some(log_store) = log_store.upgrade() else {
-                return;
-            };
-            workspace
-                .update_in(cx, |workspace, window, cx| {
-                    let project = workspace.project().clone();
-                    let tool_log_store = log_store.clone();
-                    let log_view = get_or_create_tool(
-                        workspace,
-                        SplitDirection::Right,
-                        window,
-                        cx,
-                        move |window, cx| LspLogView::new(project, tool_log_store, window, cx),
-                    );
-                    log_view.update(cx, |log_view, cx| {
-                        let server_id = match server {
-                            LanguageServerSelector::Id(id) => Some(id),
-                            LanguageServerSelector::Name(name) => {
-                                log_store.read(cx).language_servers.iter().find_map(
-                                    |(id, state)| {
-                                        if state.name.as_ref() == Some(&name) {
-                                            Some(*id)
-                                        } else {
-                                            None
-                                        }
-                                    },
-                                )
-                            }
-                        };
-                        if let Some(server_id) = server_id {
-                            log_view.show_rpc_trace_for_server(server_id, window, cx);
-                        }
-                    });
-                })
-                .ok();
-        })
-        .detach();
-    })
-}
-
-pub struct LspLogView {
-    pub(crate) editor: Entity<Editor>,
-    editor_subscriptions: Vec<Subscription>,
-    log_store: Entity<LogStore>,
-    current_server_id: Option<LanguageServerId>,
-    active_entry_kind: LogKind,
-    project: Entity<Project>,
-    focus_handle: FocusHandle,
-    _log_store_subscriptions: Vec<Subscription>,
-}
-
-pub struct LspLogToolbarItemView {
-    log_view: Option<Entity<LspLogView>>,
-    _log_view_subscription: Option<Subscription>,
-}
-
-#[derive(Clone, Debug, PartialEq)]
-pub(crate) struct LogMenuItem {
-    pub server_id: LanguageServerId,
-    pub server_name: LanguageServerName,
-    pub worktree_root_name: String,
-    pub rpc_trace_enabled: bool,
-    pub selected_entry: LogKind,
-    pub trace_level: lsp::TraceValue,
-    pub server_kind: LanguageServerKind,
-}
-
-actions!(
-    dev,
-    [
-        /// Opens the language server protocol logs viewer.
-        OpenLanguageServerLogs
-    ]
-);
-
-pub fn init(on_headless_host: bool, cx: &mut App) {
-    let log_store = log_store::init(on_headless_host, cx);
-
-    log_store.update(cx, |_, cx| {
-        Copilot::global(cx).map(|copilot| {
-            let copilot = &copilot;
-            cx.subscribe(copilot, |log_store, copilot, edit_prediction_event, cx| {
-                if let copilot::Event::CopilotLanguageServerStarted = edit_prediction_event
-                    && let Some(server) = copilot.read(cx).language_server()
-                {
-                    let server_id = server.server_id();
-                    let weak_lsp_store = cx.weak_entity();
-                    log_store.copilot_log_subscription =
-                        Some(server.on_notification::<copilot::request::LogMessage, _>(
-                            move |params, cx| {
-                                weak_lsp_store
-                                    .update(cx, |lsp_store, cx| {
-                                        lsp_store.add_language_server_log(
-                                            server_id,
-                                            MessageType::LOG,
-                                            &params.message,
-                                            cx,
-                                        );
-                                    })
-                                    .ok();
-                            },
-                        ));
-
-                    let name = LanguageServerName::new_static("copilot");
-                    log_store.add_language_server(
-                        LanguageServerKind::Global,
-                        server.server_id(),
-                        Some(name),
-                        None,
-                        Some(server.clone()),
-                        cx,
-                    );
-                }
-            })
-            .detach();
-        })
-    });
-
-    cx.observe_new(move |workspace: &mut Workspace, _, cx| {
-        log_store.update(cx, |store, cx| {
-            store.add_project(workspace.project(), cx);
-        });
-
-        let log_store = log_store.clone();
-        workspace.register_action(move |workspace, _: &OpenLanguageServerLogs, window, cx| {
-            let log_store = log_store.clone();
-            let project = workspace.project().clone();
-            get_or_create_tool(
-                workspace,
-                SplitDirection::Right,
-                window,
-                cx,
-                move |window, cx| LspLogView::new(project, log_store, window, cx),
-            );
-        });
-    })
-    .detach();
-}
-
-impl LspLogView {
-    pub fn new(
-        project: Entity<Project>,
-        log_store: Entity<LogStore>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let server_id = log_store
-            .read(cx)
-            .language_servers
-            .iter()
-            .find(|(_, server)| server.kind.project() == Some(&project.downgrade()))
-            .map(|(id, _)| *id);
-
-        let weak_project = project.downgrade();
-        let model_changes_subscription =
-            cx.observe_in(&log_store, window, move |this, store, window, cx| {
-                let first_server_id_for_project =
-                    store.read(cx).server_ids_for_project(&weak_project).next();
-                if let Some(current_lsp) = this.current_server_id {
-                    if !store.read(cx).language_servers.contains_key(&current_lsp)
-                        && let Some(server_id) = first_server_id_for_project
-                    {
-                        match this.active_entry_kind {
-                            LogKind::Rpc => this.show_rpc_trace_for_server(server_id, window, cx),
-                            LogKind::Trace => this.show_trace_for_server(server_id, window, cx),
-                            LogKind::Logs => this.show_logs_for_server(server_id, window, cx),
-                            LogKind::ServerInfo => this.show_server_info(server_id, window, cx),
-                        }
-                    }
-                } else if let Some(server_id) = first_server_id_for_project {
-                    match this.active_entry_kind {
-                        LogKind::Rpc => this.show_rpc_trace_for_server(server_id, window, cx),
-                        LogKind::Trace => this.show_trace_for_server(server_id, window, cx),
-                        LogKind::Logs => this.show_logs_for_server(server_id, window, cx),
-                        LogKind::ServerInfo => this.show_server_info(server_id, window, cx),
-                    }
-                }
-
-                cx.notify();
-            });
-
-        let events_subscriptions = cx.subscribe_in(
-            &log_store,
-            window,
-            move |log_view, _, e, window, cx| match e {
-                Event::NewServerLogEntry { id, kind, text } => {
-                    if log_view.current_server_id == Some(*id)
-                        && LogKind::from_server_log_type(kind) == log_view.active_entry_kind
-                    {
-                        log_view.editor.update(cx, |editor, cx| {
-                            editor.set_read_only(false);
-                            let last_offset = editor.buffer().read(cx).len(cx);
-                            let newest_cursor_is_at_end = editor
-                                .selections
-                                .newest::<MultiBufferOffset>(&editor.display_snapshot(cx))
-                                .start
-                                >= last_offset;
-                            editor.edit(
-                                vec![
-                                    (last_offset..last_offset, text.as_str()),
-                                    (last_offset..last_offset, "\n"),
-                                ],
-                                cx,
-                            );
-                            if text.len() > 1024 {
-                                let b = editor.buffer().read(cx).as_singleton().unwrap().read(cx);
-                                let fold_offset =
-                                    b.as_rope().ceil_char_boundary(last_offset.0 + 1024);
-                                editor.fold_ranges(
-                                    vec![
-                                        MultiBufferOffset(fold_offset)
-                                            ..MultiBufferOffset(b.as_rope().len()),
-                                    ],
-                                    false,
-                                    window,
-                                    cx,
-                                );
-                            }
-
-                            if newest_cursor_is_at_end {
-                                editor.request_autoscroll(Autoscroll::bottom(), cx);
-                            }
-                            editor.set_read_only(true);
-                        });
-                    }
-                }
-            },
-        );
-        let (editor, editor_subscriptions) = Self::editor_for_logs(String::new(), window, cx);
-
-        let focus_handle = cx.focus_handle();
-        let focus_subscription = cx.on_focus(&focus_handle, window, |log_view, window, cx| {
-            window.focus(&log_view.editor.focus_handle(cx));
-        });
-
-        cx.on_release(|log_view, cx| {
-            log_view.log_store.update(cx, |log_store, cx| {
-                for (server_id, state) in &log_store.language_servers {
-                    if let Some(log_kind) = state.toggled_log_kind {
-                        if let Some(log_type) = log_type(log_kind) {
-                            send_toggle_log_message(state, *server_id, false, log_type, cx);
-                        }
-                    }
-                }
-            });
-        })
-        .detach();
-
-        let mut lsp_log_view = Self {
-            focus_handle,
-            editor,
-            editor_subscriptions,
-            project,
-            log_store,
-            current_server_id: None,
-            active_entry_kind: LogKind::Logs,
-            _log_store_subscriptions: vec![
-                model_changes_subscription,
-                events_subscriptions,
-                focus_subscription,
-            ],
-        };
-        if let Some(server_id) = server_id {
-            lsp_log_view.show_logs_for_server(server_id, window, cx);
-        }
-        lsp_log_view
-    }
-
-    fn editor_for_logs(
-        log_contents: String,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> (Entity<Editor>, Vec<Subscription>) {
-        let editor = initialize_new_editor(log_contents, true, window, cx);
-        let editor_subscription = cx.subscribe(
-            &editor,
-            |_, _, event: &EditorEvent, cx: &mut Context<LspLogView>| cx.emit(event.clone()),
-        );
-        let search_subscription = cx.subscribe(
-            &editor,
-            |_, _, event: &SearchEvent, cx: &mut Context<LspLogView>| cx.emit(event.clone()),
-        );
-        (editor, vec![editor_subscription, search_subscription])
-    }
-
-    fn editor_for_server_info(
-        info: ServerInfo,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> (Entity<Editor>, Vec<Subscription>) {
-        let server_info = format!(
-            "* Server: {NAME} (id {ID})
-
-* Binary: {BINARY}
-
-* Registered workspace folders:
-{WORKSPACE_FOLDERS}
-
-* Capabilities: {CAPABILITIES}
-
-* Configuration: {CONFIGURATION}",
-            NAME = info.status.name,
-            ID = info.id,
-            BINARY = info
-                .status
-                .binary
-                .as_ref()
-                .map_or_else(|| "Unknown".to_string(), |binary| format!("{:#?}", binary)),
-            WORKSPACE_FOLDERS = info
-                .status
-                .workspace_folders
-                .iter()
-                .filter_map(|uri| uri.to_file_path().ok())
-                .map(|path| path.to_string_lossy().into_owned())
-                .join(", "),
-            CAPABILITIES = serde_json::to_string_pretty(&info.capabilities)
-                .unwrap_or_else(|e| format!("Failed to serialize capabilities: {e}")),
-            CONFIGURATION = info
-                .status
-                .configuration
-                .map(|configuration| serde_json::to_string_pretty(&configuration))
-                .transpose()
-                .unwrap_or_else(|e| Some(format!("Failed to serialize configuration: {e}")))
-                .unwrap_or_else(|| "Unknown".to_string()),
-        );
-        let editor = initialize_new_editor(server_info, false, window, cx);
-        let editor_subscription = cx.subscribe(
-            &editor,
-            |_, _, event: &EditorEvent, cx: &mut Context<LspLogView>| cx.emit(event.clone()),
-        );
-        let search_subscription = cx.subscribe(
-            &editor,
-            |_, _, event: &SearchEvent, cx: &mut Context<LspLogView>| cx.emit(event.clone()),
-        );
-        (editor, vec![editor_subscription, search_subscription])
-    }
-
-    pub(crate) fn menu_items<'a>(&'a self, cx: &'a App) -> Option<Vec<LogMenuItem>> {
-        let log_store = self.log_store.read(cx);
-
-        let unknown_server = LanguageServerName::new_static("unknown server");
-
-        let mut rows = log_store
-            .language_servers
-            .iter()
-            .map(|(server_id, state)| match &state.kind {
-                LanguageServerKind::Local { .. }
-                | LanguageServerKind::Remote { .. }
-                | LanguageServerKind::LocalSsh { .. } => {
-                    let worktree_root_name = state
-                        .worktree_id
-                        .and_then(|id| self.project.read(cx).worktree_for_id(id, cx))
-                        .map(|worktree| worktree.read(cx).root_name_str().to_string())
-                        .unwrap_or_else(|| "Unknown worktree".to_string());
-
-                    LogMenuItem {
-                        server_id: *server_id,
-                        server_name: state.name.clone().unwrap_or(unknown_server.clone()),
-                        server_kind: state.kind.clone(),
-                        worktree_root_name,
-                        rpc_trace_enabled: state.rpc_state.is_some(),
-                        selected_entry: self.active_entry_kind,
-                        trace_level: lsp::TraceValue::Off,
-                    }
-                }
-
-                LanguageServerKind::Global => LogMenuItem {
-                    server_id: *server_id,
-                    server_name: state.name.clone().unwrap_or(unknown_server.clone()),
-                    server_kind: state.kind.clone(),
-                    worktree_root_name: "supplementary".to_string(),
-                    rpc_trace_enabled: state.rpc_state.is_some(),
-                    selected_entry: self.active_entry_kind,
-                    trace_level: lsp::TraceValue::Off,
-                },
-            })
-            .chain(
-                self.project
-                    .read(cx)
-                    .supplementary_language_servers(cx)
-                    .filter_map(|(server_id, name)| {
-                        let state = log_store.language_servers.get(&server_id)?;
-                        Some(LogMenuItem {
-                            server_id,
-                            server_name: name,
-                            server_kind: state.kind.clone(),
-                            worktree_root_name: "supplementary".to_string(),
-                            rpc_trace_enabled: state.rpc_state.is_some(),
-                            selected_entry: self.active_entry_kind,
-                            trace_level: lsp::TraceValue::Off,
-                        })
-                    }),
-            )
-            .collect::<Vec<_>>();
-        rows.sort_by_key(|row| row.server_id);
-        rows.dedup_by_key(|row| row.server_id);
-        Some(rows)
-    }
-
-    fn show_logs_for_server(
-        &mut self,
-        server_id: LanguageServerId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let typ = self
-            .log_store
-            .read(cx)
-            .language_servers
-            .get(&server_id)
-            .map(|v| v.log_level)
-            .unwrap_or(MessageType::LOG);
-        let log_contents = self
-            .log_store
-            .read(cx)
-            .server_logs(server_id)
-            .map(|v| log_contents(v, typ));
-        if let Some(log_contents) = log_contents {
-            self.current_server_id = Some(server_id);
-            self.active_entry_kind = LogKind::Logs;
-            let (editor, editor_subscriptions) = Self::editor_for_logs(log_contents, window, cx);
-            self.editor = editor;
-            self.editor_subscriptions = editor_subscriptions;
-            cx.notify();
-        }
-        self.editor.read(cx).focus_handle(cx).focus(window);
-        self.log_store.update(cx, |log_store, cx| {
-            let state = log_store.get_language_server_state(server_id)?;
-            state.toggled_log_kind = Some(LogKind::Logs);
-            send_toggle_log_message(state, server_id, true, LogType::Log, cx);
-            Some(())
-        });
-    }
-
-    fn update_log_level(
-        &self,
-        server_id: LanguageServerId,
-        level: MessageType,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let log_contents = self.log_store.update(cx, |this, _| {
-            if let Some(state) = this.get_language_server_state(server_id) {
-                state.log_level = level;
-            }
-
-            this.server_logs(server_id).map(|v| log_contents(v, level))
-        });
-
-        if let Some(log_contents) = log_contents {
-            self.editor.update(cx, |editor, cx| {
-                editor.set_text(log_contents, window, cx);
-                editor.move_to_end(&MoveToEnd, window, cx);
-            });
-            cx.notify();
-        }
-
-        self.editor.read(cx).focus_handle(cx).focus(window);
-    }
-
-    fn show_trace_for_server(
-        &mut self,
-        server_id: LanguageServerId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let trace_level = self
-            .log_store
-            .update(cx, |log_store, _| {
-                Some(log_store.get_language_server_state(server_id)?.trace_level)
-            })
-            .unwrap_or(TraceValue::Messages);
-        let log_contents = self
-            .log_store
-            .read(cx)
-            .server_trace(server_id)
-            .map(|v| log_contents(v, trace_level));
-        if let Some(log_contents) = log_contents {
-            self.current_server_id = Some(server_id);
-            self.active_entry_kind = LogKind::Trace;
-            let (editor, editor_subscriptions) = Self::editor_for_logs(log_contents, window, cx);
-            self.editor = editor;
-            self.editor_subscriptions = editor_subscriptions;
-            self.log_store.update(cx, |log_store, cx| {
-                let state = log_store.get_language_server_state(server_id)?;
-                state.toggled_log_kind = Some(LogKind::Trace);
-                send_toggle_log_message(state, server_id, true, LogType::Trace, cx);
-                Some(())
-            });
-            cx.notify();
-        }
-        self.editor.read(cx).focus_handle(cx).focus(window);
-    }
-
-    fn show_rpc_trace_for_server(
-        &mut self,
-        server_id: LanguageServerId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.toggle_rpc_trace_for_server(server_id, true, window, cx);
-        let rpc_log = self.log_store.update(cx, |log_store, _| {
-            log_store
-                .enable_rpc_trace_for_language_server(server_id)
-                .map(|state| log_contents(&state.rpc_messages, ()))
-        });
-        if let Some(rpc_log) = rpc_log {
-            self.current_server_id = Some(server_id);
-            self.active_entry_kind = LogKind::Rpc;
-            let (editor, editor_subscriptions) = Self::editor_for_logs(rpc_log, window, cx);
-            let language = self.project.read(cx).languages().language_for_name("JSON");
-            editor
-                .read(cx)
-                .buffer()
-                .read(cx)
-                .as_singleton()
-                .expect("log buffer should be a singleton")
-                .update(cx, |_, cx| {
-                    cx.spawn({
-                        let buffer = cx.entity();
-                        async move |_, cx| {
-                            let language = language.await.ok();
-                            buffer.update(cx, |buffer, cx| {
-                                buffer.set_language(language, cx);
-                            })
-                        }
-                    })
-                    .detach_and_log_err(cx);
-                });
-
-            self.editor = editor;
-            self.editor_subscriptions = editor_subscriptions;
-            cx.notify();
-        }
-
-        self.editor.read(cx).focus_handle(cx).focus(window);
-    }
-
-    fn toggle_rpc_trace_for_server(
-        &mut self,
-        server_id: LanguageServerId,
-        enabled: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.log_store.update(cx, |log_store, cx| {
-            if enabled {
-                log_store.enable_rpc_trace_for_language_server(server_id);
-            } else {
-                log_store.disable_rpc_trace_for_language_server(server_id);
-            }
-
-            if let Some(server_state) = log_store.language_servers.get(&server_id) {
-                send_toggle_log_message(server_state, server_id, enabled, LogType::Rpc, cx);
-            };
-        });
-        if !enabled && Some(server_id) == self.current_server_id {
-            self.show_logs_for_server(server_id, window, cx);
-            cx.notify();
-        }
-    }
-
-    fn update_trace_level(
-        &self,
-        server_id: LanguageServerId,
-        level: TraceValue,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(server) = self
-            .project
-            .read(cx)
-            .lsp_store()
-            .read(cx)
-            .language_server_for_id(server_id)
-        {
-            self.log_store.update(cx, |this, _| {
-                if let Some(state) = this.get_language_server_state(server_id) {
-                    state.trace_level = level;
-                }
-            });
-
-            server
-                .notify::<SetTrace>(SetTraceParams { value: level })
-                .ok();
-        }
-    }
-
-    fn show_server_info(
-        &mut self,
-        server_id: LanguageServerId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(server_info) = self
-            .project
-            .read(cx)
-            .lsp_store()
-            .update(cx, |lsp_store, _| {
-                lsp_store
-                    .language_server_for_id(server_id)
-                    .as_ref()
-                    .map(|language_server| ServerInfo::new(language_server))
-                    .or_else(move || {
-                        let capabilities =
-                            lsp_store.lsp_server_capabilities.get(&server_id)?.clone();
-                        let status = lsp_store.language_server_statuses.get(&server_id)?.clone();
-
-                        Some(ServerInfo {
-                            id: server_id,
-                            capabilities,
-                            status,
-                        })
-                    })
-            })
-        else {
-            return;
-        };
-        self.current_server_id = Some(server_id);
-        self.active_entry_kind = LogKind::ServerInfo;
-        let (editor, editor_subscriptions) = Self::editor_for_server_info(server_info, window, cx);
-        self.editor = editor;
-        self.editor_subscriptions = editor_subscriptions;
-        cx.notify();
-        self.editor.read(cx).focus_handle(cx).focus(window);
-        self.log_store.update(cx, |log_store, cx| {
-            let state = log_store.get_language_server_state(server_id)?;
-            if let Some(log_kind) = state.toggled_log_kind.take() {
-                if let Some(log_type) = log_type(log_kind) {
-                    send_toggle_log_message(state, server_id, false, log_type, cx);
-                }
-            };
-            Some(())
-        });
-    }
-}
-
-fn log_type(log_kind: LogKind) -> Option<LogType> {
-    match log_kind {
-        LogKind::Rpc => Some(LogType::Rpc),
-        LogKind::Trace => Some(LogType::Trace),
-        LogKind::Logs => Some(LogType::Log),
-        LogKind::ServerInfo => None,
-    }
-}
-
-fn send_toggle_log_message(
-    server_state: &log_store::LanguageServerState,
-    server_id: LanguageServerId,
-    enabled: bool,
-    log_type: LogType,
-    cx: &mut App,
-) {
-    if let LanguageServerKind::Remote { project } = &server_state.kind {
-        project
-            .update(cx, |project, cx| {
-                if let Some((client, project_id)) = project.lsp_store().read(cx).upstream_client() {
-                    client
-                        .send(proto::ToggleLspLogs {
-                            project_id,
-                            log_type: log_type as i32,
-                            server_id: server_id.to_proto(),
-                            enabled,
-                        })
-                        .log_err();
-                }
-            })
-            .ok();
-    }
-}
-
-fn log_contents<T: Message>(lines: &VecDeque<T>, level: <T as Message>::Level) -> String {
-    lines
-        .iter()
-        .filter(|message| message.should_include(level))
-        .flat_map(|message| [message.as_ref(), "\n"])
-        .collect()
-}
-
-impl Render for LspLogView {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        self.editor.update(cx, |editor, cx| {
-            editor.render(window, cx).into_any_element()
-        })
-    }
-}
-
-impl Focusable for LspLogView {
-    fn focus_handle(&self, _: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl Item for LspLogView {
-    type Event = EditorEvent;
-
-    fn to_item_events(event: &Self::Event, f: impl FnMut(workspace::item::ItemEvent)) {
-        Editor::to_item_events(event, f)
-    }
-
-    fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString {
-        "LSP Logs".into()
-    }
-
-    fn telemetry_event_text(&self) -> Option<&'static str> {
-        None
-    }
-
-    fn as_searchable(
-        &self,
-        handle: &Entity<Self>,
-        _: &App,
-    ) -> Option<Box<dyn SearchableItemHandle>> {
-        Some(Box::new(handle.clone()))
-    }
-
-    fn act_as_type<'a>(
-        &'a self,
-        type_id: TypeId,
-        self_handle: &'a Entity<Self>,
-        _: &'a App,
-    ) -> Option<gpui::AnyEntity> {
-        if type_id == TypeId::of::<Self>() {
-            Some(self_handle.clone().into())
-        } else if type_id == TypeId::of::<Editor>() {
-            Some(self.editor.clone().into())
-        } else {
-            None
-        }
-    }
-
-    fn can_split(&self) -> bool {
-        true
-    }
-
-    fn clone_on_split(
-        &self,
-        _workspace_id: Option<WorkspaceId>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Option<Entity<Self>>>
-    where
-        Self: Sized,
-    {
-        Task::ready(Some(cx.new(|cx| {
-            let mut new_view = Self::new(self.project.clone(), self.log_store.clone(), window, cx);
-            if let Some(server_id) = self.current_server_id {
-                match self.active_entry_kind {
-                    LogKind::Rpc => new_view.show_rpc_trace_for_server(server_id, window, cx),
-                    LogKind::Trace => new_view.show_trace_for_server(server_id, window, cx),
-                    LogKind::Logs => new_view.show_logs_for_server(server_id, window, cx),
-                    LogKind::ServerInfo => new_view.show_server_info(server_id, window, cx),
-                }
-            }
-            new_view
-        })))
-    }
-}
-
-impl SearchableItem for LspLogView {
-    type Match = <Editor as SearchableItem>::Match;
-
-    fn clear_matches(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.editor.update(cx, |e, cx| e.clear_matches(window, cx))
-    }
-
-    fn update_matches(
-        &mut self,
-        matches: &[Self::Match],
-        active_match_index: Option<usize>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.editor.update(cx, |e, cx| {
-            e.update_matches(matches, active_match_index, window, cx)
-        })
-    }
-
-    fn query_suggestion(&mut self, window: &mut Window, cx: &mut Context<Self>) -> String {
-        self.editor
-            .update(cx, |e, cx| e.query_suggestion(window, cx))
-    }
-
-    fn activate_match(
-        &mut self,
-        index: usize,
-        matches: &[Self::Match],
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.editor
-            .update(cx, |e, cx| e.activate_match(index, matches, window, cx))
-    }
-
-    fn select_matches(
-        &mut self,
-        matches: &[Self::Match],
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.editor
-            .update(cx, |e, cx| e.select_matches(matches, window, cx))
-    }
-
-    fn find_matches(
-        &mut self,
-        query: Arc<project::search::SearchQuery>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> gpui::Task<Vec<Self::Match>> {
-        self.editor
-            .update(cx, |e, cx| e.find_matches(query, window, cx))
-    }
-
-    fn replace(
-        &mut self,
-        _: &Self::Match,
-        _: &SearchQuery,
-        _window: &mut Window,
-        _: &mut Context<Self>,
-    ) {
-        // Since LSP Log is read-only, it doesn't make sense to support replace operation.
-    }
-    fn supported_options(&self) -> workspace::searchable::SearchOptions {
-        workspace::searchable::SearchOptions {
-            case: true,
-            word: true,
-            regex: true,
-            find_in_results: false,
-            // LSP log is read-only.
-            replacement: false,
-            selection: false,
-        }
-    }
-    fn active_match_index(
-        &mut self,
-        direction: Direction,
-        matches: &[Self::Match],
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<usize> {
-        self.editor.update(cx, |e, cx| {
-            e.active_match_index(direction, matches, window, cx)
-        })
-    }
-}
-
-impl EventEmitter<ToolbarItemEvent> for LspLogToolbarItemView {}
-
-impl ToolbarItemView for LspLogToolbarItemView {
-    fn set_active_pane_item(
-        &mut self,
-        active_pane_item: Option<&dyn ItemHandle>,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> workspace::ToolbarItemLocation {
-        if let Some(item) = active_pane_item
-            && let Some(log_view) = item.downcast::<LspLogView>()
-        {
-            self.log_view = Some(log_view.clone());
-            self._log_view_subscription = Some(cx.observe(&log_view, |_, _, cx| {
-                cx.notify();
-            }));
-            return ToolbarItemLocation::PrimaryLeft;
-        }
-        self.log_view = None;
-        self._log_view_subscription = None;
-        ToolbarItemLocation::Hidden
-    }
-}
-
-impl Render for LspLogToolbarItemView {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let Some(log_view) = self.log_view.clone() else {
-            return div();
-        };
-
-        let (menu_rows, current_server_id) = log_view.update(cx, |log_view, cx| {
-            let menu_rows = log_view.menu_items(cx).unwrap_or_default();
-            let current_server_id = log_view.current_server_id;
-            (menu_rows, current_server_id)
-        });
-
-        let current_server = current_server_id.and_then(|current_server_id| {
-            if let Ok(ix) = menu_rows.binary_search_by_key(&current_server_id, |e| e.server_id) {
-                Some(menu_rows[ix].clone())
-            } else {
-                None
-            }
-        });
-
-        let available_language_servers: Vec<_> = menu_rows
-            .into_iter()
-            .map(|row| {
-                (
-                    row.server_id,
-                    row.server_name,
-                    row.worktree_root_name,
-                    row.selected_entry,
-                )
-            })
-            .collect();
-
-        let log_toolbar_view = cx.weak_entity();
-
-        let lsp_menu = PopoverMenu::new("LspLogView")
-            .anchor(Corner::TopLeft)
-            .trigger(
-                Button::new(
-                    "language_server_menu_header",
-                    current_server
-                        .as_ref()
-                        .map(|row| {
-                            Cow::Owned(format!(
-                                "{} ({})",
-                                row.server_name.0, row.worktree_root_name,
-                            ))
-                        })
-                        .unwrap_or_else(|| "No server selected".into()),
-                )
-                .icon(IconName::ChevronDown)
-                .icon_size(IconSize::Small)
-                .icon_color(Color::Muted),
-            )
-            .menu({
-                let log_view = log_view.clone();
-                move |window, cx| {
-                    let log_view = log_view.clone();
-                    ContextMenu::build(window, cx, |mut menu, window, _| {
-                        for (server_id, name, worktree_root, active_entry_kind) in
-                            available_language_servers.iter()
-                        {
-                            let label = format!("{name} ({worktree_root})");
-                            let server_id = *server_id;
-                            let active_entry_kind = *active_entry_kind;
-                            menu = menu.entry(
-                                label,
-                                None,
-                                window.handler_for(&log_view, move |view, window, cx| {
-                                    view.current_server_id = Some(server_id);
-                                    view.active_entry_kind = active_entry_kind;
-                                    match view.active_entry_kind {
-                                        LogKind::Rpc => {
-                                            view.toggle_rpc_trace_for_server(
-                                                server_id, true, window, cx,
-                                            );
-                                            view.show_rpc_trace_for_server(server_id, window, cx);
-                                        }
-                                        LogKind::Trace => {
-                                            view.show_trace_for_server(server_id, window, cx)
-                                        }
-                                        LogKind::Logs => {
-                                            view.show_logs_for_server(server_id, window, cx)
-                                        }
-                                        LogKind::ServerInfo => {
-                                            view.show_server_info(server_id, window, cx)
-                                        }
-                                    }
-                                    cx.notify();
-                                }),
-                            );
-                        }
-                        menu
-                    })
-                    .into()
-                }
-            });
-
-        let view_selector = current_server.map(|server| {
-            let server_id = server.server_id;
-            let rpc_trace_enabled = server.rpc_trace_enabled;
-            let log_view = log_view.clone();
-            let label = match server.selected_entry {
-                LogKind::Rpc => RPC_MESSAGES,
-                LogKind::Trace => SERVER_TRACE,
-                LogKind::Logs => SERVER_LOGS,
-                LogKind::ServerInfo => SERVER_INFO,
-            };
-            PopoverMenu::new("LspViewSelector")
-                .anchor(Corner::TopLeft)
-                .trigger(
-                    Button::new("language_server_menu_header", label)
-                        .icon(IconName::ChevronDown)
-                        .icon_size(IconSize::Small)
-                        .icon_color(Color::Muted),
-                )
-                .menu(move |window, cx| {
-                    let log_toolbar_view = log_toolbar_view.upgrade()?;
-                    let log_view = log_view.clone();
-                    Some(ContextMenu::build(window, cx, move |this, window, _| {
-                        this.entry(
-                            SERVER_LOGS,
-                            None,
-                            window.handler_for(&log_view, move |view, window, cx| {
-                                view.show_logs_for_server(server_id, window, cx);
-                            }),
-                        )
-                        .entry(
-                            SERVER_TRACE,
-                            None,
-                            window.handler_for(&log_view, move |view, window, cx| {
-                                view.show_trace_for_server(server_id, window, cx);
-                            }),
-                        )
-                        .custom_entry(
-                            {
-                                let log_toolbar_view = log_toolbar_view.clone();
-                                move |window, _| {
-                                    h_flex()
-                                        .w_full()
-                                        .justify_between()
-                                        .child(Label::new(RPC_MESSAGES))
-                                        .child(
-                                            div().child(
-                                                Checkbox::new(
-                                                    "LspLogEnableRpcTrace",
-                                                    if rpc_trace_enabled {
-                                                        ToggleState::Selected
-                                                    } else {
-                                                        ToggleState::Unselected
-                                                    },
-                                                )
-                                                .on_click(window.listener_for(
-                                                    &log_toolbar_view,
-                                                    move |view, selection, window, cx| {
-                                                        let enabled = matches!(
-                                                            selection,
-                                                            ToggleState::Selected
-                                                        );
-                                                        view.toggle_rpc_logging_for_server(
-                                                            server_id, enabled, window, cx,
-                                                        );
-                                                        cx.stop_propagation();
-                                                    },
-                                                )),
-                                            ),
-                                        )
-                                        .into_any_element()
-                                }
-                            },
-                            window.handler_for(&log_view, move |view, window, cx| {
-                                view.show_rpc_trace_for_server(server_id, window, cx);
-                            }),
-                        )
-                        .entry(
-                            SERVER_INFO,
-                            None,
-                            window.handler_for(&log_view, move |view, window, cx| {
-                                view.show_server_info(server_id, window, cx);
-                            }),
-                        )
-                    }))
-                })
-        });
-
-        h_flex()
-            .size_full()
-            .gap_1()
-            .justify_between()
-            .child(
-                h_flex()
-                    .gap_0p5()
-                    .child(lsp_menu)
-                    .children(view_selector)
-                    .child(
-                        log_view.update(cx, |this, _cx| match this.active_entry_kind {
-                            LogKind::Trace => {
-                                let log_view = log_view.clone();
-                                div().child(
-                                    PopoverMenu::new("lsp-trace-level-menu")
-                                        .anchor(Corner::TopLeft)
-                                        .trigger(
-                                            Button::new(
-                                                "language_server_trace_level_selector",
-                                                "Trace level",
-                                            )
-                                            .icon(IconName::ChevronDown)
-                                            .icon_size(IconSize::Small)
-                                            .icon_color(Color::Muted),
-                                        )
-                                        .menu({
-                                            let log_view = log_view;
-
-                                            move |window, cx| {
-                                                let id = log_view.read(cx).current_server_id?;
-
-                                                let trace_level =
-                                                    log_view.update(cx, |this, cx| {
-                                                        this.log_store.update(cx, |this, _| {
-                                                            Some(
-                                                                this.get_language_server_state(id)?
-                                                                    .trace_level,
-                                                            )
-                                                        })
-                                                    })?;
-
-                                                ContextMenu::build(
-                                                    window,
-                                                    cx,
-                                                    |mut menu, window, cx| {
-                                                        let log_view = log_view.clone();
-
-                                                        for (option, label) in [
-                                                            (TraceValue::Off, "Off"),
-                                                            (TraceValue::Messages, "Messages"),
-                                                            (TraceValue::Verbose, "Verbose"),
-                                                        ] {
-                                                            menu = menu.entry(label, None, {
-                                                                let log_view = log_view.clone();
-                                                                move |_, cx| {
-                                                                    log_view.update(cx, |this, cx| {
-                                                                    if let Some(id) =
-                                                                        this.current_server_id
-                                                                    {
-                                                                        this.update_trace_level(
-                                                                            id, option, cx,
-                                                                        );
-                                                                    }
-                                                                });
-                                                                }
-                                                            });
-                                                            if option == trace_level {
-                                                                menu.select_last(window, cx);
-                                                            }
-                                                        }
-
-                                                        menu
-                                                    },
-                                                )
-                                                .into()
-                                            }
-                                        }),
-                                )
-                            }
-                            LogKind::Logs => {
-                                let log_view = log_view.clone();
-                                div().child(
-                                    PopoverMenu::new("lsp-log-level-menu")
-                                        .anchor(Corner::TopLeft)
-                                        .trigger(
-                                            Button::new(
-                                                "language_server_log_level_selector",
-                                                "Log level",
-                                            )
-                                            .icon(IconName::ChevronDown)
-                                            .icon_size(IconSize::Small)
-                                            .icon_color(Color::Muted),
-                                        )
-                                        .menu({
-                                            let log_view = log_view;
-
-                                            move |window, cx| {
-                                                let id = log_view.read(cx).current_server_id?;
-
-                                                let log_level =
-                                                    log_view.update(cx, |this, cx| {
-                                                        this.log_store.update(cx, |this, _| {
-                                                            Some(
-                                                                this.get_language_server_state(id)?
-                                                                    .log_level,
-                                                            )
-                                                        })
-                                                    })?;
-
-                                                ContextMenu::build(
-                                                    window,
-                                                    cx,
-                                                    |mut menu, window, cx| {
-                                                        let log_view = log_view.clone();
-
-                                                        for (option, label) in [
-                                                            (MessageType::LOG, "Log"),
-                                                            (MessageType::INFO, "Info"),
-                                                            (MessageType::WARNING, "Warning"),
-                                                            (MessageType::ERROR, "Error"),
-                                                        ] {
-                                                            menu = menu.entry(label, None, {
-                                                                let log_view = log_view.clone();
-                                                                move |window, cx| {
-                                                                    log_view.update(cx, |this, cx| {
-                                                                    if let Some(id) =
-                                                                        this.current_server_id
-                                                                    {
-                                                                        this.update_log_level(
-                                                                            id, option, window, cx,
-                                                                        );
-                                                                    }
-                                                                });
-                                                                }
-                                                            });
-                                                            if option == log_level {
-                                                                menu.select_last(window, cx);
-                                                            }
-                                                        }
-
-                                                        menu
-                                                    },
-                                                )
-                                                .into()
-                                            }
-                                        }),
-                                )
-                            }
-                            _ => div(),
-                        }),
-                    ),
-            )
-            .child(
-                Button::new("clear_log_button", "Clear").on_click(cx.listener(
-                    |this, _, window, cx| {
-                        if let Some(log_view) = this.log_view.as_ref() {
-                            log_view.update(cx, |log_view, cx| {
-                                log_view.editor.update(cx, |editor, cx| {
-                                    editor.set_read_only(false);
-                                    editor.clear(window, cx);
-                                    editor.set_read_only(true);
-                                });
-                            })
-                        }
-                    },
-                )),
-            )
-    }
-}
-
-fn initialize_new_editor(
-    content: String,
-    move_to_end: bool,
-    window: &mut Window,
-    cx: &mut App,
-) -> Entity<Editor> {
-    cx.new(|cx| {
-        let mut editor = Editor::multi_line(window, cx);
-        editor.hide_minimap_by_default(window, cx);
-        editor.set_text(content, window, cx);
-        editor.set_show_git_diff_gutter(false, cx);
-        editor.set_show_runnables(false, cx);
-        editor.set_show_breakpoints(false, cx);
-        editor.set_read_only(true);
-        editor.set_show_edit_predictions(Some(false), window, cx);
-        editor.set_soft_wrap_mode(SoftWrap::EditorWidth, cx);
-        if move_to_end {
-            editor.move_to_end(&MoveToEnd, window, cx);
-        }
-        editor
-    })
-}
-
-const RPC_MESSAGES: &str = "RPC Messages";
-const SERVER_LOGS: &str = "Server Logs";
-const SERVER_TRACE: &str = "Server Trace";
-const SERVER_INFO: &str = "Server Info";
-
-impl LspLogToolbarItemView {
-    pub fn new() -> Self {
-        Self {
-            log_view: None,
-            _log_view_subscription: None,
-        }
-    }
-
-    fn toggle_rpc_logging_for_server(
-        &mut self,
-        id: LanguageServerId,
-        enabled: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(log_view) = &self.log_view {
-            log_view.update(cx, |log_view, cx| {
-                log_view.toggle_rpc_trace_for_server(id, enabled, window, cx);
-                if !enabled && Some(id) == log_view.current_server_id {
-                    log_view.show_logs_for_server(id, window, cx);
-                    cx.notify();
-                } else if enabled {
-                    log_view.show_rpc_trace_for_server(id, window, cx);
-                    cx.notify();
-                }
-                window.focus(&log_view.focus_handle);
-            });
-        }
-        cx.notify();
-    }
-}
-
-struct ServerInfo {
-    id: LanguageServerId,
-    capabilities: lsp::ServerCapabilities,
-    status: LanguageServerStatus,
-}
-
-impl ServerInfo {
-    fn new(server: &LanguageServer) -> Self {
-        Self {
-            id: server.server_id(),
-            capabilities: server.capabilities(),
-            status: LanguageServerStatus {
-                name: server.name(),
-                pending_work: Default::default(),
-                has_pending_diagnostic_updates: false,
-                progress_tokens: Default::default(),
-                worktree: None,
-                binary: Some(server.binary().clone()),
-                configuration: Some(server.configuration().clone()),
-                workspace_folders: server.workspace_folders(),
-            },
-        }
-    }
-}
-
-impl EventEmitter<EditorEvent> for LspLogView {}
-impl EventEmitter<SearchEvent> for LspLogView {}
diff --git a/crates/language_tools/src/lsp_log_view_tests.rs b/crates/language_tools/src/lsp_log_view_tests.rs
deleted file mode 100644
index 0b4516f5d0..0000000000
--- a/crates/language_tools/src/lsp_log_view_tests.rs
+++ /dev/null
@@ -1,115 +0,0 @@
-use std::sync::Arc;
-
-use crate::lsp_log_view::LogMenuItem;
-
-use super::*;
-use futures::StreamExt;
-use gpui::{AppContext as _, TestAppContext, VisualTestContext};
-use language::{FakeLspAdapter, Language, LanguageConfig, LanguageMatcher, tree_sitter_rust};
-use lsp::LanguageServerName;
-use project::{
-    FakeFs, Project,
-    lsp_store::log_store::{LanguageServerKind, LogKind, LogStore},
-};
-use serde_json::json;
-use settings::SettingsStore;
-use util::path;
-
-#[gpui::test]
-async fn test_lsp_log_view(cx: &mut TestAppContext) {
-    zlog::init_test();
-
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.background_executor.clone());
-    fs.insert_tree(
-        path!("/the-root"),
-        json!({
-            "test.rs": "",
-            "package.json": "",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), [path!("/the-root").as_ref()], cx).await;
-
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-    language_registry.add(Arc::new(Language::new(
-        LanguageConfig {
-            name: "Rust".into(),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["rs".to_string()],
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-        Some(tree_sitter_rust::LANGUAGE.into()),
-    )));
-    let mut fake_rust_servers = language_registry.register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            name: "the-rust-language-server",
-            ..Default::default()
-        },
-    );
-
-    let log_store = cx.new(|cx| LogStore::new(false, cx));
-    log_store.update(cx, |store, cx| store.add_project(&project, cx));
-
-    let _rust_buffer = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer_with_lsp(path!("/the-root/test.rs"), cx)
-        })
-        .await
-        .unwrap();
-
-    let mut language_server = fake_rust_servers.next().await.unwrap();
-    language_server
-        .receive_notification::<lsp::notification::DidOpenTextDocument>()
-        .await;
-
-    let window =
-        cx.add_window(|window, cx| LspLogView::new(project.clone(), log_store.clone(), window, cx));
-    let log_view = window.root(cx).unwrap();
-    let mut cx = VisualTestContext::from_window(*window, cx);
-
-    language_server.notify::<lsp::notification::LogMessage>(lsp::LogMessageParams {
-        message: "hello from the server".into(),
-        typ: lsp::MessageType::INFO,
-    });
-    cx.executor().run_until_parked();
-
-    log_view.update(&mut cx, |view, cx| {
-        assert_eq!(
-            view.menu_items(cx).unwrap(),
-            &[LogMenuItem {
-                server_id: language_server.server.server_id(),
-                server_name: LanguageServerName("the-rust-language-server".into()),
-                worktree_root_name: project
-                    .read(cx)
-                    .worktrees(cx)
-                    .next()
-                    .unwrap()
-                    .read(cx)
-                    .root_name_str()
-                    .to_string(),
-                rpc_trace_enabled: false,
-                selected_entry: LogKind::Logs,
-                trace_level: lsp::TraceValue::Off,
-                server_kind: LanguageServerKind::Local {
-                    project: project.downgrade()
-                }
-            }]
-        );
-        assert_eq!(view.editor.read(cx).text(cx), "hello from the server\n");
-    });
-}
-
-fn init_test(cx: &mut gpui::TestAppContext) {
-    cx.update(|cx| {
-        let settings_store = SettingsStore::test(cx);
-        cx.set_global(settings_store);
-        theme::init(theme::LoadThemes::JustBase, cx);
-        release_channel::init(semver::Version::new(0, 0, 0), cx);
-    });
-}
diff --git a/crates/language_tools/src/syntax_tree_view.rs b/crates/language_tools/src/syntax_tree_view.rs
deleted file mode 100644
index 0fbcdcca5e..0000000000
--- a/crates/language_tools/src/syntax_tree_view.rs
+++ /dev/null
@@ -1,735 +0,0 @@
-use command_palette_hooks::CommandPaletteFilter;
-use editor::{Anchor, Editor, ExcerptId, MultiBufferOffset, SelectionEffects, scroll::Autoscroll};
-use gpui::{
-    App, AppContext as _, Context, Div, Entity, EntityId, EventEmitter, FocusHandle, Focusable,
-    Hsla, InteractiveElement, IntoElement, MouseButton, MouseDownEvent, MouseMoveEvent,
-    ParentElement, Render, ScrollStrategy, SharedString, Styled, Task, UniformListScrollHandle,
-    WeakEntity, Window, actions, div, rems, uniform_list,
-};
-use language::{Buffer, OwnedSyntaxLayer};
-use std::{any::TypeId, mem, ops::Range};
-use theme::ActiveTheme;
-use tree_sitter::{Node, TreeCursor};
-use ui::{
-    ButtonCommon, ButtonLike, Clickable, Color, ContextMenu, FluentBuilder as _, IconButton,
-    IconName, Label, LabelCommon, LabelSize, PopoverMenu, StyledExt, Tooltip, WithScrollbar,
-    h_flex, v_flex,
-};
-use workspace::{
-    Event as WorkspaceEvent, SplitDirection, ToolbarItemEvent, ToolbarItemLocation,
-    ToolbarItemView, Workspace,
-    item::{Item, ItemHandle},
-};
-
-actions!(
-    dev,
-    [
-        /// Opens the syntax tree view for the current file.
-        OpenSyntaxTreeView,
-    ]
-);
-
-actions!(
-    syntax_tree_view,
-    [
-        /// Update the syntax tree view to show the last focused file.
-        UseActiveEditor
-    ]
-);
-
-pub fn init(cx: &mut App) {
-    let syntax_tree_actions = [TypeId::of::<UseActiveEditor>()];
-
-    CommandPaletteFilter::update_global(cx, |this, _| {
-        this.hide_action_types(&syntax_tree_actions);
-    });
-
-    cx.observe_new(move |workspace: &mut Workspace, _, _| {
-        workspace.register_action(move |workspace, _: &OpenSyntaxTreeView, window, cx| {
-            CommandPaletteFilter::update_global(cx, |this, _| {
-                this.show_action_types(&syntax_tree_actions);
-            });
-
-            let active_item = workspace.active_item(cx);
-            let workspace_handle = workspace.weak_handle();
-            let syntax_tree_view = cx.new(|cx| {
-                cx.on_release(move |view: &mut SyntaxTreeView, cx| {
-                    if view
-                        .workspace_handle
-                        .read_with(cx, |workspace, cx| {
-                            workspace.item_of_type::<SyntaxTreeView>(cx).is_none()
-                        })
-                        .unwrap_or_default()
-                    {
-                        CommandPaletteFilter::update_global(cx, |this, _| {
-                            this.hide_action_types(&syntax_tree_actions);
-                        });
-                    }
-                })
-                .detach();
-
-                SyntaxTreeView::new(workspace_handle, active_item, window, cx)
-            });
-            workspace.split_item(
-                SplitDirection::Right,
-                Box::new(syntax_tree_view),
-                window,
-                cx,
-            )
-        });
-        workspace.register_action(|workspace, _: &UseActiveEditor, window, cx| {
-            if let Some(tree_view) = workspace.item_of_type::<SyntaxTreeView>(cx) {
-                tree_view.update(cx, |view, cx| {
-                    view.update_active_editor(&Default::default(), window, cx)
-                })
-            }
-        });
-    })
-    .detach();
-}
-
-pub struct SyntaxTreeView {
-    workspace_handle: WeakEntity<Workspace>,
-    editor: Option<EditorState>,
-    list_scroll_handle: UniformListScrollHandle,
-    /// The last active editor in the workspace. Note that this is specifically not the
-    /// currently shown editor.
-    last_active_editor: Option<Entity<Editor>>,
-    selected_descendant_ix: Option<usize>,
-    hovered_descendant_ix: Option<usize>,
-    focus_handle: FocusHandle,
-}
-
-pub struct SyntaxTreeToolbarItemView {
-    tree_view: Option<Entity<SyntaxTreeView>>,
-    subscription: Option<gpui::Subscription>,
-}
-
-struct EditorState {
-    editor: Entity<Editor>,
-    active_buffer: Option<BufferState>,
-    _subscription: gpui::Subscription,
-}
-
-impl EditorState {
-    fn has_language(&self) -> bool {
-        self.active_buffer
-            .as_ref()
-            .is_some_and(|buffer| buffer.active_layer.is_some())
-    }
-}
-
-#[derive(Clone)]
-struct BufferState {
-    buffer: Entity<Buffer>,
-    excerpt_id: ExcerptId,
-    active_layer: Option<OwnedSyntaxLayer>,
-}
-
-impl SyntaxTreeView {
-    pub fn new(
-        workspace_handle: WeakEntity<Workspace>,
-        active_item: Option<Box<dyn ItemHandle>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let mut this = Self {
-            workspace_handle: workspace_handle.clone(),
-            list_scroll_handle: UniformListScrollHandle::new(),
-            editor: None,
-            last_active_editor: None,
-            hovered_descendant_ix: None,
-            selected_descendant_ix: None,
-            focus_handle: cx.focus_handle(),
-        };
-
-        this.handle_item_updated(active_item, window, cx);
-
-        cx.subscribe_in(
-            &workspace_handle.upgrade().unwrap(),
-            window,
-            move |this, workspace, event, window, cx| match event {
-                WorkspaceEvent::ItemAdded { .. } | WorkspaceEvent::ActiveItemChanged => {
-                    this.handle_item_updated(workspace.read(cx).active_item(cx), window, cx)
-                }
-                WorkspaceEvent::ItemRemoved { item_id } => {
-                    this.handle_item_removed(item_id, window, cx);
-                }
-                _ => {}
-            },
-        )
-        .detach();
-
-        this
-    }
-
-    fn handle_item_updated(
-        &mut self,
-        active_item: Option<Box<dyn ItemHandle>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(editor) = active_item
-            .filter(|item| item.item_id() != cx.entity_id())
-            .and_then(|item| item.act_as::<Editor>(cx))
-        else {
-            return;
-        };
-
-        if let Some(editor_state) = self.editor.as_ref().filter(|state| state.has_language()) {
-            self.last_active_editor = (editor_state.editor != editor).then_some(editor);
-        } else {
-            self.set_editor(editor, window, cx);
-        }
-    }
-
-    fn handle_item_removed(
-        &mut self,
-        item_id: &EntityId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self
-            .editor
-            .as_ref()
-            .is_some_and(|state| state.editor.entity_id() == *item_id)
-        {
-            self.editor = None;
-            // Try activating the last active editor if there is one
-            self.update_active_editor(&Default::default(), window, cx);
-            cx.notify();
-        }
-    }
-
-    fn update_active_editor(
-        &mut self,
-        _: &UseActiveEditor,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(editor) = self.last_active_editor.take() else {
-            return;
-        };
-        self.set_editor(editor, window, cx);
-    }
-
-    fn set_editor(&mut self, editor: Entity<Editor>, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(state) = &self.editor {
-            if state.editor == editor {
-                return;
-            }
-            editor.update(cx, |editor, cx| {
-                editor.clear_background_highlights::<Self>(cx)
-            });
-        }
-
-        let subscription = cx.subscribe_in(&editor, window, |this, _, event, window, cx| {
-            let did_reparse = match event {
-                editor::EditorEvent::Reparsed(_) => true,
-                editor::EditorEvent::SelectionsChanged { .. } => false,
-                _ => return,
-            };
-            this.editor_updated(did_reparse, window, cx);
-        });
-
-        self.editor = Some(EditorState {
-            editor,
-            _subscription: subscription,
-            active_buffer: None,
-        });
-        self.editor_updated(true, window, cx);
-    }
-
-    fn editor_updated(
-        &mut self,
-        did_reparse: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<()> {
-        // Find which excerpt the cursor is in, and the position within that excerpted buffer.
-        let editor_state = self.editor.as_mut()?;
-        let snapshot = editor_state
-            .editor
-            .update(cx, |editor, cx| editor.snapshot(window, cx));
-        let (buffer, range, excerpt_id) = editor_state.editor.update(cx, |editor, cx| {
-            let selection_range = editor
-                .selections
-                .last::<MultiBufferOffset>(&editor.display_snapshot(cx))
-                .range();
-            let multi_buffer = editor.buffer().read(cx);
-            let (buffer, range, excerpt_id) = snapshot
-                .buffer_snapshot()
-                .range_to_buffer_ranges(selection_range)
-                .pop()?;
-            let buffer = multi_buffer.buffer(buffer.remote_id()).unwrap();
-            Some((buffer, range, excerpt_id))
-        })?;
-
-        // If the cursor has moved into a different excerpt, retrieve a new syntax layer
-        // from that buffer.
-        let buffer_state = editor_state
-            .active_buffer
-            .get_or_insert_with(|| BufferState {
-                buffer: buffer.clone(),
-                excerpt_id,
-                active_layer: None,
-            });
-        let mut prev_layer = None;
-        if did_reparse {
-            prev_layer = buffer_state.active_layer.take();
-        }
-        if buffer_state.buffer != buffer || buffer_state.excerpt_id != excerpt_id {
-            buffer_state.buffer = buffer.clone();
-            buffer_state.excerpt_id = excerpt_id;
-            buffer_state.active_layer = None;
-        }
-
-        let layer = match &mut buffer_state.active_layer {
-            Some(layer) => layer,
-            None => {
-                let snapshot = buffer.read(cx).snapshot();
-                let layer = if let Some(prev_layer) = prev_layer {
-                    let prev_range = prev_layer.node().byte_range();
-                    snapshot
-                        .syntax_layers()
-                        .filter(|layer| layer.language == &prev_layer.language)
-                        .min_by_key(|layer| {
-                            let range = layer.node().byte_range();
-                            ((range.start as i64) - (prev_range.start as i64)).abs()
-                                + ((range.end as i64) - (prev_range.end as i64)).abs()
-                        })?
-                } else {
-                    snapshot.syntax_layers().next()?
-                };
-                buffer_state.active_layer.insert(layer.to_owned())
-            }
-        };
-
-        // Within the active layer, find the syntax node under the cursor,
-        // and scroll to it.
-        let mut cursor = layer.node().walk();
-        while cursor.goto_first_child_for_byte(range.start.0).is_some() {
-            if !range.is_empty() && cursor.node().end_byte() == range.start.0 {
-                cursor.goto_next_sibling();
-            }
-        }
-
-        // Ascend to the smallest ancestor that contains the range.
-        loop {
-            let node_range = cursor.node().byte_range();
-            if node_range.start <= range.start.0 && node_range.end >= range.end.0 {
-                break;
-            }
-            if !cursor.goto_parent() {
-                break;
-            }
-        }
-
-        let descendant_ix = cursor.descendant_index();
-        self.selected_descendant_ix = Some(descendant_ix);
-        self.list_scroll_handle
-            .scroll_to_item(descendant_ix, ScrollStrategy::Center);
-
-        cx.notify();
-        Some(())
-    }
-
-    fn update_editor_with_range_for_descendant_ix(
-        &self,
-        descendant_ix: usize,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-        mut f: impl FnMut(&mut Editor, Range<Anchor>, &mut Window, &mut Context<Editor>),
-    ) -> Option<()> {
-        let editor_state = self.editor.as_ref()?;
-        let buffer_state = editor_state.active_buffer.as_ref()?;
-        let layer = buffer_state.active_layer.as_ref()?;
-
-        // Find the node.
-        let mut cursor = layer.node().walk();
-        cursor.goto_descendant(descendant_ix);
-        let node = cursor.node();
-        let range = node.byte_range();
-
-        // Build a text anchor range.
-        let buffer = buffer_state.buffer.read(cx);
-        let range = buffer.anchor_before(range.start)..buffer.anchor_after(range.end);
-
-        // Build a multibuffer anchor range.
-        let multibuffer = editor_state.editor.read(cx).buffer();
-        let multibuffer = multibuffer.read(cx).snapshot(cx);
-        let excerpt_id = buffer_state.excerpt_id;
-        let range = multibuffer.anchor_range_in_excerpt(excerpt_id, range)?;
-
-        // Update the editor with the anchor range.
-        editor_state.editor.update(cx, |editor, cx| {
-            f(editor, range, window, cx);
-        });
-        Some(())
-    }
-
-    fn render_node(cursor: &TreeCursor, depth: u32, selected: bool, cx: &App) -> Div {
-        let colors = cx.theme().colors();
-        let mut row = h_flex();
-        if let Some(field_name) = cursor.field_name() {
-            row = row.children([Label::new(field_name).color(Color::Info), Label::new(": ")]);
-        }
-
-        let node = cursor.node();
-        row.child(if node.is_named() {
-            Label::new(node.kind()).color(Color::Default)
-        } else {
-            Label::new(format!("\"{}\"", node.kind())).color(Color::Created)
-        })
-        .child(
-            div()
-                .child(Label::new(format_node_range(node)).color(Color::Muted))
-                .pl_1(),
-        )
-        .text_bg(if selected {
-            colors.element_selected
-        } else {
-            Hsla::default()
-        })
-        .pl(rems(depth as f32))
-        .hover(|style| style.bg(colors.element_hover))
-    }
-
-    fn compute_items(
-        &mut self,
-        layer: &OwnedSyntaxLayer,
-        range: Range<usize>,
-        cx: &Context<Self>,
-    ) -> Vec<Div> {
-        let mut items = Vec::new();
-        let mut cursor = layer.node().walk();
-        let mut descendant_ix = range.start;
-        cursor.goto_descendant(descendant_ix);
-        let mut depth = cursor.depth();
-        let mut visited_children = false;
-        while descendant_ix < range.end {
-            if visited_children {
-                if cursor.goto_next_sibling() {
-                    visited_children = false;
-                } else if cursor.goto_parent() {
-                    depth -= 1;
-                } else {
-                    break;
-                }
-            } else {
-                items.push(
-                    Self::render_node(
-                        &cursor,
-                        depth,
-                        Some(descendant_ix) == self.selected_descendant_ix,
-                        cx,
-                    )
-                    .on_mouse_down(
-                        MouseButton::Left,
-                        cx.listener(move |tree_view, _: &MouseDownEvent, window, cx| {
-                            tree_view.update_editor_with_range_for_descendant_ix(
-                                descendant_ix,
-                                window,
-                                cx,
-                                |editor, mut range, window, cx| {
-                                    // Put the cursor at the beginning of the node.
-                                    mem::swap(&mut range.start, &mut range.end);
-
-                                    editor.change_selections(
-                                        SelectionEffects::scroll(Autoscroll::newest()),
-                                        window,
-                                        cx,
-                                        |selections| {
-                                            selections.select_ranges(vec![range]);
-                                        },
-                                    );
-                                },
-                            );
-                        }),
-                    )
-                    .on_mouse_move(cx.listener(
-                        move |tree_view, _: &MouseMoveEvent, window, cx| {
-                            if tree_view.hovered_descendant_ix != Some(descendant_ix) {
-                                tree_view.hovered_descendant_ix = Some(descendant_ix);
-                                tree_view.update_editor_with_range_for_descendant_ix(
-                                    descendant_ix,
-                                    window,
-                                    cx,
-                                    |editor, range, _, cx| {
-                                        editor.clear_background_highlights::<Self>(cx);
-                                        editor.highlight_background::<Self>(
-                                            &[range],
-                                            |_, theme| {
-                                                theme
-                                                    .colors()
-                                                    .editor_document_highlight_write_background
-                                            },
-                                            cx,
-                                        );
-                                    },
-                                );
-                                cx.notify();
-                            }
-                        },
-                    )),
-                );
-                descendant_ix += 1;
-                if cursor.goto_first_child() {
-                    depth += 1;
-                } else {
-                    visited_children = true;
-                }
-            }
-        }
-        items
-    }
-}
-
-impl Render for SyntaxTreeView {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        div()
-            .flex_1()
-            .bg(cx.theme().colors().editor_background)
-            .map(|this| {
-                let editor_state = self.editor.as_ref();
-
-                if let Some(layer) = editor_state
-                    .and_then(|editor| editor.active_buffer.as_ref())
-                    .and_then(|buffer| buffer.active_layer.as_ref())
-                {
-                    let layer = layer.clone();
-                    this.child(
-                        uniform_list(
-                            "SyntaxTreeView",
-                            layer.node().descendant_count(),
-                            cx.processor(move |this, range: Range<usize>, _, cx| {
-                                this.compute_items(&layer, range, cx)
-                            }),
-                        )
-                        .size_full()
-                        .track_scroll(&self.list_scroll_handle)
-                        .text_bg(cx.theme().colors().background)
-                        .into_any_element(),
-                    )
-                    .vertical_scrollbar_for(&self.list_scroll_handle, window, cx)
-                    .into_any_element()
-                } else {
-                    let inner_content = v_flex()
-                        .items_center()
-                        .text_center()
-                        .gap_2()
-                        .max_w_3_5()
-                        .map(|this| {
-                            if editor_state.is_some_and(|state| !state.has_language()) {
-                                this.child(Label::new("Current editor has no associated language"))
-                                    .child(
-                                        Label::new(concat!(
-                                            "Try assigning a language or",
-                                            "switching to a different buffer"
-                                        ))
-                                        .size(LabelSize::Small),
-                                    )
-                            } else {
-                                this.child(Label::new("Not attached to an editor")).child(
-                                    Label::new("Focus an editor to show a new tree view")
-                                        .size(LabelSize::Small),
-                                )
-                            }
-                        });
-
-                    this.h_flex()
-                        .size_full()
-                        .justify_center()
-                        .child(inner_content)
-                        .into_any_element()
-                }
-            })
-    }
-}
-
-impl EventEmitter<()> for SyntaxTreeView {}
-
-impl Focusable for SyntaxTreeView {
-    fn focus_handle(&self, _: &App) -> gpui::FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl Item for SyntaxTreeView {
-    type Event = ();
-
-    fn to_item_events(_: &Self::Event, _: impl FnMut(workspace::item::ItemEvent)) {}
-
-    fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString {
-        "Syntax Tree".into()
-    }
-
-    fn telemetry_event_text(&self) -> Option<&'static str> {
-        None
-    }
-
-    fn can_split(&self) -> bool {
-        true
-    }
-
-    fn clone_on_split(
-        &self,
-        _: Option<workspace::WorkspaceId>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Option<Entity<Self>>>
-    where
-        Self: Sized,
-    {
-        Task::ready(Some(cx.new(|cx| {
-            let mut clone = Self::new(self.workspace_handle.clone(), None, window, cx);
-            if let Some(editor) = &self.editor {
-                clone.set_editor(editor.editor.clone(), window, cx)
-            }
-            clone
-        })))
-    }
-}
-
-impl Default for SyntaxTreeToolbarItemView {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl SyntaxTreeToolbarItemView {
-    pub fn new() -> Self {
-        Self {
-            tree_view: None,
-            subscription: None,
-        }
-    }
-
-    fn render_menu(&mut self, cx: &mut Context<Self>) -> Option<PopoverMenu<ContextMenu>> {
-        let tree_view = self.tree_view.as_ref()?;
-        let tree_view = tree_view.read(cx);
-
-        let editor_state = tree_view.editor.as_ref()?;
-        let buffer_state = editor_state.active_buffer.as_ref()?;
-        let active_layer = buffer_state.active_layer.clone()?;
-        let active_buffer = buffer_state.buffer.read(cx).snapshot();
-
-        let view = cx.weak_entity();
-        Some(
-            PopoverMenu::new("Syntax Tree")
-                .trigger(Self::render_header(&active_layer))
-                .menu(move |window, cx| {
-                    ContextMenu::build(window, cx, |mut menu, _, _| {
-                        for (layer_ix, layer) in active_buffer.syntax_layers().enumerate() {
-                            let view = view.clone();
-                            menu = menu.entry(
-                                format!(
-                                    "{} {}",
-                                    layer.language.name(),
-                                    format_node_range(layer.node())
-                                ),
-                                None,
-                                move |window, cx| {
-                                    view.update(cx, |view, cx| {
-                                        view.select_layer(layer_ix, window, cx);
-                                    })
-                                    .ok();
-                                },
-                            );
-                        }
-                        menu
-                    })
-                    .into()
-                }),
-        )
-    }
-
-    fn select_layer(
-        &mut self,
-        layer_ix: usize,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<()> {
-        let tree_view = self.tree_view.as_ref()?;
-        tree_view.update(cx, |view, cx| {
-            let editor_state = view.editor.as_mut()?;
-            let buffer_state = editor_state.active_buffer.as_mut()?;
-            let snapshot = buffer_state.buffer.read(cx).snapshot();
-            let layer = snapshot.syntax_layers().nth(layer_ix)?;
-            buffer_state.active_layer = Some(layer.to_owned());
-            view.selected_descendant_ix = None;
-            cx.notify();
-            view.focus_handle.focus(window);
-            Some(())
-        })
-    }
-
-    fn render_header(active_layer: &OwnedSyntaxLayer) -> ButtonLike {
-        ButtonLike::new("syntax tree header")
-            .child(Label::new(active_layer.language.name()))
-            .child(Label::new(format_node_range(active_layer.node())))
-    }
-
-    fn render_update_button(&mut self, cx: &mut Context<Self>) -> Option<IconButton> {
-        self.tree_view.as_ref().and_then(|view| {
-            view.update(cx, |view, cx| {
-                view.last_active_editor.as_ref().map(|editor| {
-                    IconButton::new("syntax-view-update", IconName::RotateCw)
-                        .tooltip({
-                            let active_tab_name = editor.read_with(cx, |editor, cx| {
-                                editor.tab_content_text(Default::default(), cx)
-                            });
-
-                            Tooltip::text(format!("Update view to '{active_tab_name}'"))
-                        })
-                        .on_click(cx.listener(|this, _, window, cx| {
-                            this.update_active_editor(&Default::default(), window, cx);
-                        }))
-                })
-            })
-        })
-    }
-}
-
-fn format_node_range(node: Node) -> String {
-    let start = node.start_position();
-    let end = node.end_position();
-    format!(
-        "[{}:{} - {}:{}]",
-        start.row + 1,
-        start.column + 1,
-        end.row + 1,
-        end.column + 1,
-    )
-}
-
-impl Render for SyntaxTreeToolbarItemView {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        h_flex()
-            .gap_1()
-            .children(self.render_menu(cx))
-            .children(self.render_update_button(cx))
-    }
-}
-
-impl EventEmitter<ToolbarItemEvent> for SyntaxTreeToolbarItemView {}
-
-impl ToolbarItemView for SyntaxTreeToolbarItemView {
-    fn set_active_pane_item(
-        &mut self,
-        active_pane_item: Option<&dyn ItemHandle>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> ToolbarItemLocation {
-        if let Some(item) = active_pane_item
-            && let Some(view) = item.downcast::<SyntaxTreeView>()
-        {
-            self.tree_view = Some(view.clone());
-            self.subscription = Some(cx.observe_in(&view, window, |_, _, _, cx| cx.notify()));
-            return ToolbarItemLocation::PrimaryLeft;
-        }
-        self.tree_view = None;
-        self.subscription = None;
-        ToolbarItemLocation::Hidden
-    }
-}
diff --git a/crates/languages/Cargo.toml b/crates/languages/Cargo.toml
deleted file mode 100644
index c0aa9c39aa..0000000000
--- a/crates/languages/Cargo.toml
+++ /dev/null
@@ -1,111 +0,0 @@
-[package]
-name = "languages"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[features]
-test-support = [
-    "load-grammars"
-]
-load-grammars = [
-    "tree-sitter",
-    "tree-sitter-bash",
-    "tree-sitter-c",
-    "tree-sitter-cpp",
-    "tree-sitter-css",
-    "tree-sitter-diff",
-    "tree-sitter-gitcommit",
-    "tree-sitter-go",
-    "tree-sitter-go-mod",
-    "tree-sitter-gowork",
-    "tree-sitter-jsdoc",
-    "tree-sitter-json",
-    "tree-sitter-md",
-    "tree-sitter-python",
-    "tree-sitter-regex",
-    "tree-sitter-rust",
-    "tree-sitter-typescript",
-    "tree-sitter-yaml",
-]
-
-[dependencies]
-anyhow.workspace = true
-async-compression.workspace = true
-async-fs.workspace = true
-async-tar.workspace = true
-async-trait.workspace = true
-chrono.workspace = true
-collections.workspace = true
-futures.workspace = true
-globset.workspace = true
-gpui.workspace = true
-http_client.workspace = true
-itertools.workspace = true
-json_schema_store.workspace = true
-language.workspace = true
-log.workspace = true
-lsp.workspace = true
-node_runtime.workspace = true
-parking_lot.workspace = true
-pet-conda.workspace = true
-pet-core.workspace = true
-pet-fs.workspace = true
-pet-poetry.workspace = true
-pet-reporter.workspace = true
-pet-virtualenv.workspace = true
-pet.workspace = true
-project.workspace = true
-regex.workspace = true
-rope.workspace = true
-rust-embed.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-serde_json_lenient.workspace = true
-settings.workspace = true
-smallvec.workspace = true
-smol.workspace = true
-snippet.workspace = true
-task.workspace = true
-terminal.workspace = true
-theme.workspace = true
-toml.workspace = true
-tree-sitter = { workspace = true, optional = true }
-tree-sitter-bash = { workspace = true, optional = true }
-tree-sitter-c = { workspace = true, optional = true }
-tree-sitter-cpp = { workspace = true, optional = true }
-tree-sitter-css = { workspace = true, optional = true }
-tree-sitter-diff = { workspace = true, optional = true }
-tree-sitter-gitcommit = { workspace = true, optional = true }
-tree-sitter-go = { workspace = true, optional = true }
-tree-sitter-go-mod = { workspace = true, optional = true }
-tree-sitter-gowork = { workspace = true, optional = true }
-tree-sitter-jsdoc = { workspace = true, optional = true }
-tree-sitter-json = { workspace = true, optional = true }
-tree-sitter-md = { workspace = true, optional = true }
-tree-sitter-python = { workspace = true, optional = true }
-tree-sitter-regex = { workspace = true, optional = true }
-tree-sitter-rust = { workspace = true, optional = true }
-tree-sitter-typescript = { workspace = true, optional = true }
-tree-sitter-yaml = { workspace = true, optional = true }
-url.workspace = true
-util.workspace = true
-
-[dev-dependencies]
-pretty_assertions.workspace = true
-text.workspace = true
-theme = { workspace = true, features = ["test-support"] }
-tree-sitter-bash.workspace = true
-tree-sitter-c.workspace = true
-tree-sitter-cpp.workspace = true
-tree-sitter-css.workspace = true
-tree-sitter-go.workspace = true
-tree-sitter-python.workspace = true
-tree-sitter-typescript.workspace = true
-tree-sitter.workspace = true
-unindent.workspace = true
-workspace = { workspace = true, features = ["test-support"] }
diff --git a/crates/languages/LICENSE-GPL b/crates/languages/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/languages/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/languages/src/bash.rs b/crates/languages/src/bash.rs
deleted file mode 100644
index 9720007d09..0000000000
--- a/crates/languages/src/bash.rs
+++ /dev/null
@@ -1,164 +0,0 @@
-use project::ContextProviderWithTasks;
-use task::{TaskTemplate, TaskTemplates, VariableName};
-
-pub(super) fn bash_task_context() -> ContextProviderWithTasks {
-    ContextProviderWithTasks::new(TaskTemplates(vec![
-        TaskTemplate {
-            label: "execute selection".to_owned(),
-            command: VariableName::SelectedText.template_value(),
-            ..TaskTemplate::default()
-        },
-        TaskTemplate {
-            label: format!("run '{}'", VariableName::File.template_value()),
-            command: VariableName::File.template_value(),
-            ..TaskTemplate::default()
-        },
-    ]))
-}
-
-#[cfg(test)]
-mod tests {
-    use gpui::{AppContext as _, BorrowAppContext, Context, TestAppContext};
-    use language::{AutoindentMode, Buffer};
-    use settings::SettingsStore;
-    use std::num::NonZeroU32;
-    use unindent::Unindent;
-    use util::test::marked_text_offsets;
-
-    #[gpui::test]
-    async fn test_bash_autoindent(cx: &mut TestAppContext) {
-        cx.executor().set_block_on_ticks(usize::MAX..=usize::MAX);
-        let language = crate::language("bash", tree_sitter_bash::LANGUAGE.into());
-        cx.update(|cx| {
-            let test_settings = SettingsStore::test(cx);
-            cx.set_global(test_settings);
-            cx.update_global::<SettingsStore, _>(|store, cx| {
-                store.update_user_settings(cx, |s| {
-                    s.project.all_languages.defaults.tab_size = NonZeroU32::new(2)
-                });
-            });
-        });
-
-        cx.new(|cx| {
-            let mut buffer = Buffer::local("", cx).with_language(language, cx);
-
-            let expect_indents_to =
-                |buffer: &mut Buffer, cx: &mut Context<Buffer>, input: &str, expected: &str| {
-                    buffer.edit(
-                        [(0..buffer.len(), input)],
-                        Some(AutoindentMode::EachLine),
-                        cx,
-                    );
-                    assert_eq!(buffer.text(), expected);
-                };
-
-            // Do not indent after shebang
-            expect_indents_to(
-                &mut buffer,
-                cx,
-                "#!/usr/bin/env bash\n#",
-                "#!/usr/bin/env bash\n#",
-            );
-
-            // indent function correctly
-            expect_indents_to(
-                &mut buffer,
-                cx,
-                "function name() {\necho \"Hello, World!\"\n}",
-                "function name() {\n  echo \"Hello, World!\"\n}",
-            );
-
-            // indent if-else correctly
-            expect_indents_to(
-                &mut buffer,
-                cx,
-                "if true;then\nfoo\nelse\nbar\nfi",
-                "if true;then\n  foo\nelse\n  bar\nfi",
-            );
-
-            // indent if-elif-else correctly
-            expect_indents_to(
-                &mut buffer,
-                cx,
-                "if true;then\nfoo\nelif true;then\nbar\nelse\nbar\nfi",
-                "if true;then\n  foo\nelif true;then\n  bar\nelse\n  bar\nfi",
-            );
-
-            // indent case-when-else correctly
-            expect_indents_to(
-                &mut buffer,
-                cx,
-                "case $1 in\nfoo) echo \"Hello, World!\";;\n*) echo \"Unknown argument\";;\nesac",
-                "case $1 in\n  foo) echo \"Hello, World!\";;\n  *) echo \"Unknown argument\";;\nesac",
-            );
-
-            // indent for-loop correctly
-            expect_indents_to(
-                &mut buffer,
-                cx,
-                "for i in {1..10};do\nfoo\ndone",
-                "for i in {1..10};do\n  foo\ndone",
-            );
-
-            // indent while-loop correctly
-            expect_indents_to(
-                &mut buffer,
-                cx,
-                "while true; do\nfoo\ndone",
-                "while true; do\n  foo\ndone",
-            );
-
-            // indent array correctly
-            expect_indents_to(
-                &mut buffer,
-                cx,
-                "array=(\n1\n2\n3\n)",
-                "array=(\n  1\n  2\n  3\n)",
-            );
-
-            // indents non-"function" function correctly
-            expect_indents_to(
-                &mut buffer,
-                cx,
-                "foo() {\necho \"Hello, World!\"\n}",
-                "foo() {\n  echo \"Hello, World!\"\n}",
-            );
-
-            let (input, offsets) = marked_text_offsets(
-                &r#"
-                if foo; then
-                  1ˇ
-                else
-                  3
-                fi
-                "#
-                .unindent(),
-            );
-
-            buffer.edit([(0..buffer.len(), input)], None, cx);
-            buffer.edit(
-                [(offsets[0]..offsets[0], "\n")],
-                Some(AutoindentMode::EachLine),
-                cx,
-            );
-            buffer.edit(
-                [(offsets[0] + 3..offsets[0] + 3, "elif")],
-                Some(AutoindentMode::EachLine),
-                cx,
-            );
-            let expected = r#"
-                if foo; then
-                  1
-                elif
-                else
-                  3
-                fi
-                "#
-            .unindent();
-
-            pretty_assertions::assert_eq!(buffer.text(), expected);
-
-            buffer
-        });
-    }
-}
diff --git a/crates/languages/src/bash/brackets.scm b/crates/languages/src/bash/brackets.scm
deleted file mode 100644
index 88a2a1b67f..0000000000
--- a/crates/languages/src/bash/brackets.scm
+++ /dev/null
@@ -1,12 +0,0 @@
-("(" @open ")" @close)
-("[" @open "]" @close)
-("{" @open "}" @close)
-(("\"" @open "\"" @close) (#set! rainbow.exclude))
-(("`" @open "`" @close) (#set! rainbow.exclude))
-(("do" @open "done" @close) (#set! newline.only) (#set! rainbow.exclude))
-((case_statement ("in" @open "esac" @close)) (#set! newline.only) (#set! rainbow.exclude))
-((if_statement (elif_clause ("then" @open)) (else_clause ("else" @close))) (#set! newline.only) (#set! rainbow.exclude))
-((if_statement (else_clause ("else" @open)) "fi" @close) (#set! newline.only) (#set! rainbow.exclude))
-((if_statement ("then" @open) (elif_clause ("elif" @close))) (#set! newline.only) (#set! rainbow.exclude))
-((if_statement ("then" @open) (else_clause ("else" @close))) (#set! newline.only) (#set! rainbow.exclude))
-((if_statement ("then" @open "fi" @close)) (#set! newline.only) (#set! rainbow.exclude))
diff --git a/crates/languages/src/bash/config.toml b/crates/languages/src/bash/config.toml
deleted file mode 100644
index 8ff4802aee..0000000000
--- a/crates/languages/src/bash/config.toml
+++ /dev/null
@@ -1,37 +0,0 @@
-name = "Shell Script"
-code_fence_block_name = "bash"
-grammar = "bash"
-path_suffixes = ["sh", "bash", "bashrc", "bash_profile", "bash_aliases", "bash_logout", "bats", "profile", "zsh", "zshrc", "zshenv", "zsh_profile", "zsh_aliases", "zsh_histfile", "zlogin", "zprofile", ".env", "PKGBUILD", "APKBUILD"]
-line_comments = ["# "]
-first_line_pattern = '^#!.*\b(?:ash|bash|bats|dash|sh|zsh)\b'
-autoclose_before = "}])"
-brackets = [
-    { start = "[", end = "]", close = true, newline = false },
-    { start = "(", end = ")", close = true, newline = true },
-    { start = "{", end = "}", close = true, newline = true },
-    { start = "\"", end = "\"", close = true, newline = false, not_in = ["comment", "string"] },
-    { start = "'", end = "'", close = true, newline = false, not_in = ["string", "comment"] },
-    { start = "do", end = "done", close = false, newline = true, not_in = ["comment", "string"] },
-    { start = "then", end = "fi", close = false, newline = true, not_in = ["comment", "string"] },
-    { start = "then", end = "else", close = false, newline = true, not_in = ["comment", "string"] },
-    { start = "then", end = "elif", close = false, newline = true, not_in = ["comment", "string"] },
-    { start = "in", end = "esac", close = false, newline = true, not_in = ["comment", "string"] },
-]
-
-auto_indent_using_last_non_empty_line = false
-increase_indent_pattern = "^\\s*(\\b(else|elif)\\b|([^#]+\\b(do|then|in)\\b)|([\\w\\*]+\\)))\\s*$"
-decrease_indent_patterns = [
-  { pattern = "^\\s*elif\\b.*",    valid_after = ["if", "elif"] },
-  { pattern = "^\\s*else\\b.*",    valid_after = ["if", "elif", "for", "while"] },
-  { pattern = "^\\s*fi\\b.*",      valid_after = ["if", "elif", "else"] },
-  { pattern = "^\\s*done\\b.*",    valid_after = ["for", "while"] },
-  { pattern = "^\\s*esac\\b.*",    valid_after = ["case"] },
-  { pattern = "^\\s*[\\w\\*]+\\)\\s*$", valid_after = ["case_item"] },
-]
-
-# We can't use decrease_indent_patterns simply for elif, because
-# there is bug in tree sitter which throws ERROR on if match.
-#
-# This is workaround. That means, elif will outdents with despite
-# of wrong context. Like using elif after else.
-decrease_indent_pattern = "(^|\\s+|;)(elif)\\b.*$"
diff --git a/crates/languages/src/bash/highlights.scm b/crates/languages/src/bash/highlights.scm
deleted file mode 100644
index 7da0de793a..0000000000
--- a/crates/languages/src/bash/highlights.scm
+++ /dev/null
@@ -1,103 +0,0 @@
-[
-  (string)
-  (raw_string)
-  (heredoc_body)
-  (heredoc_start)
-  (heredoc_end)
-  (ansi_c_string)
-  (word)
-] @string
-
-(variable_name) @variable
-
-[
-  "case"
-  "do"
-  "done"
-  "elif"
-  "else"
-  "esac"
-  "export"
-  "fi"
-  "for"
-  "function"
-  "if"
-  "in"
-  "select"
-  "then"
-  "unset"
-  "until"
-  "while"
-  "local"
-  "declare"
-] @keyword
-
-(comment) @comment
-
-(function_definition name: (word) @function)
-(command_name (word) @function)
-
-[
-  (file_descriptor)
-  (number)
-] @number
-
-(regex) @string.regex
-
-[
-  (command_substitution)
-  (process_substitution)
-  (expansion)
-] @embedded
-
-
-[
-  "$"
-  "&&"
-  ">"
-  "<<"
-  ">>"
-  ">&"
-  ">&-"
-  "<"
-  "|"
-  ":"
-  "//"
-  "/"
-  "%"
-  "%%"
-  "#"
-  "##"
-  "="
-  "=="
-] @operator
-
-(test_operator) @keyword.operator
-
-[
-  ";"
-] @punctuation.delimiter
-
-[
-  "("
-  ")"
-  "{"
-  "}"
-  "["
-  "]"
-] @punctuation.bracket
-
-(simple_expansion
-  "$" @punctuation.special)
-(expansion
-  "${" @punctuation.special
-  "}" @punctuation.special) @embedded
-
-(command_substitution
-  "$(" @punctuation.special
-  ")" @punctuation.special)
-
-(
-  (command (_) @constant)
-  (#match? @constant "^-")
-)
diff --git a/crates/languages/src/bash/indents.scm b/crates/languages/src/bash/indents.scm
deleted file mode 100644
index 468fc595e5..0000000000
--- a/crates/languages/src/bash/indents.scm
+++ /dev/null
@@ -1,12 +0,0 @@
-(_ "[" "]" @end) @indent
-(_ "{" "}" @end) @indent
-(_ "(" ")" @end) @indent
-
-(function_definition) @start.function
-(if_statement) @start.if
-(elif_clause) @start.elif
-(else_clause) @start.else
-(for_statement) @start.for
-(while_statement) @start.while
-(case_statement) @start.case
-(case_item) @start.case_item
diff --git a/crates/languages/src/bash/injections.scm b/crates/languages/src/bash/injections.scm
deleted file mode 100644
index 9117c713b9..0000000000
--- a/crates/languages/src/bash/injections.scm
+++ /dev/null
@@ -1,3 +0,0 @@
-((comment) @injection.content
- (#set! injection.language "comment")
-)
diff --git a/crates/languages/src/bash/overrides.scm b/crates/languages/src/bash/overrides.scm
deleted file mode 100644
index 81fec9a5f5..0000000000
--- a/crates/languages/src/bash/overrides.scm
+++ /dev/null
@@ -1,2 +0,0 @@
-(comment) @comment.inclusive
-(string) @string
diff --git a/crates/languages/src/bash/redactions.scm b/crates/languages/src/bash/redactions.scm
deleted file mode 100644
index 000cb042a5..0000000000
--- a/crates/languages/src/bash/redactions.scm
+++ /dev/null
@@ -1,2 +0,0 @@
-(variable_assignment
-    value: (_) @redact)
diff --git a/crates/languages/src/bash/textobjects.scm b/crates/languages/src/bash/textobjects.scm
deleted file mode 100644
index cca2f7d9e9..0000000000
--- a/crates/languages/src/bash/textobjects.scm
+++ /dev/null
@@ -1,7 +0,0 @@
-(function_definition
-  body: (_
-    "{"
-    (_)* @function.inside
-    "}" )) @function.around
-
-(comment) @comment.around
diff --git a/crates/languages/src/c.rs b/crates/languages/src/c.rs
deleted file mode 100644
index 8fe2bae693..0000000000
--- a/crates/languages/src/c.rs
+++ /dev/null
@@ -1,643 +0,0 @@
-use anyhow::{Context as _, Result, bail};
-use async_trait::async_trait;
-use futures::StreamExt;
-use gpui::{App, AsyncApp};
-use http_client::github::{AssetKind, GitHubLspBinaryVersion, latest_github_release};
-use http_client::github_download::{GithubBinaryMetadata, download_server_binary};
-pub use language::*;
-use lsp::{InitializeParams, LanguageServerBinary, LanguageServerName};
-use project::lsp_store::clangd_ext;
-use serde_json::json;
-use smol::fs;
-use std::{env::consts, path::PathBuf, sync::Arc};
-use util::{ResultExt, fs::remove_matching, maybe, merge_json_value_into};
-
-pub struct CLspAdapter;
-
-impl CLspAdapter {
-    const SERVER_NAME: LanguageServerName = LanguageServerName::new_static("clangd");
-}
-
-impl LspInstaller for CLspAdapter {
-    type BinaryVersion = GitHubLspBinaryVersion;
-
-    async fn fetch_latest_server_version(
-        &self,
-        delegate: &dyn LspAdapterDelegate,
-        pre_release: bool,
-        _: &mut AsyncApp,
-    ) -> Result<GitHubLspBinaryVersion> {
-        let release =
-            latest_github_release("clangd/clangd", true, pre_release, delegate.http_client())
-                .await?;
-        let os_suffix = match consts::OS {
-            "macos" => "mac",
-            "linux" => "linux",
-            "windows" => "windows",
-            other => bail!("Running on unsupported os: {other}"),
-        };
-        let asset_name = format!("clangd-{}-{}.zip", os_suffix, release.tag_name);
-        let asset = release
-            .assets
-            .iter()
-            .find(|asset| asset.name == asset_name)
-            .with_context(|| format!("no asset found matching {asset_name:?}"))?;
-        let version = GitHubLspBinaryVersion {
-            name: release.tag_name,
-            url: asset.browser_download_url.clone(),
-            digest: asset.digest.clone(),
-        };
-        Ok(version)
-    }
-
-    async fn check_if_user_installed(
-        &self,
-        delegate: &dyn LspAdapterDelegate,
-        _: Option<Toolchain>,
-        _: &AsyncApp,
-    ) -> Option<LanguageServerBinary> {
-        let path = delegate.which(Self::SERVER_NAME.as_ref()).await?;
-        Some(LanguageServerBinary {
-            path,
-            arguments: Vec::new(),
-            env: None,
-        })
-    }
-
-    async fn fetch_server_binary(
-        &self,
-        version: GitHubLspBinaryVersion,
-        container_dir: PathBuf,
-        delegate: &dyn LspAdapterDelegate,
-    ) -> Result<LanguageServerBinary> {
-        let GitHubLspBinaryVersion {
-            name,
-            url,
-            digest: expected_digest,
-        } = version;
-        let version_dir = container_dir.join(format!("clangd_{name}"));
-        let binary_path = version_dir.join("bin/clangd");
-
-        let binary = LanguageServerBinary {
-            path: binary_path.clone(),
-            env: None,
-            arguments: Default::default(),
-        };
-
-        let metadata_path = version_dir.join("metadata");
-        let metadata = GithubBinaryMetadata::read_from_file(&metadata_path)
-            .await
-            .ok();
-        if let Some(metadata) = metadata {
-            let validity_check = async || {
-                delegate
-                    .try_exec(LanguageServerBinary {
-                        path: binary_path.clone(),
-                        arguments: vec!["--version".into()],
-                        env: None,
-                    })
-                    .await
-                    .inspect_err(|err| {
-                        log::warn!("Unable to run {binary_path:?} asset, redownloading: {err:#}",)
-                    })
-            };
-            if let (Some(actual_digest), Some(expected_digest)) =
-                (&metadata.digest, &expected_digest)
-            {
-                if actual_digest == expected_digest {
-                    if validity_check().await.is_ok() {
-                        return Ok(binary);
-                    }
-                } else {
-                    log::info!(
-                        "SHA-256 mismatch for {binary_path:?} asset, downloading new asset. Expected: {expected_digest}, Got: {actual_digest}"
-                    );
-                }
-            } else if validity_check().await.is_ok() {
-                return Ok(binary);
-            }
-        }
-        download_server_binary(
-            &*delegate.http_client(),
-            &url,
-            expected_digest.as_deref(),
-            &container_dir,
-            AssetKind::Zip,
-        )
-        .await?;
-        remove_matching(&container_dir, |entry| entry != version_dir).await;
-        GithubBinaryMetadata::write_to_file(
-            &GithubBinaryMetadata {
-                metadata_version: 1,
-                digest: expected_digest,
-            },
-            &metadata_path,
-        )
-        .await?;
-
-        Ok(binary)
-    }
-
-    async fn cached_server_binary(
-        &self,
-        container_dir: PathBuf,
-        _: &dyn LspAdapterDelegate,
-    ) -> Option<LanguageServerBinary> {
-        get_cached_server_binary(container_dir).await
-    }
-}
-
-#[async_trait(?Send)]
-impl super::LspAdapter for CLspAdapter {
-    fn name(&self) -> LanguageServerName {
-        Self::SERVER_NAME
-    }
-
-    async fn label_for_completion(
-        &self,
-        completion: &lsp::CompletionItem,
-        language: &Arc<Language>,
-    ) -> Option<CodeLabel> {
-        let label_detail = match &completion.label_details {
-            Some(label_detail) => match &label_detail.detail {
-                Some(detail) => detail.trim(),
-                None => "",
-            },
-            None => "",
-        };
-
-        let mut label = completion
-            .label
-            .strip_prefix('•')
-            .unwrap_or(&completion.label)
-            .trim()
-            .to_owned();
-
-        if !label_detail.is_empty() {
-            let should_add_space = match completion.kind {
-                Some(lsp::CompletionItemKind::FUNCTION | lsp::CompletionItemKind::METHOD) => false,
-                _ => true,
-            };
-
-            if should_add_space && !label.ends_with(' ') && !label_detail.starts_with(' ') {
-                label.push(' ');
-            }
-            label.push_str(label_detail);
-        }
-
-        match completion.kind {
-            Some(lsp::CompletionItemKind::FIELD) if completion.detail.is_some() => {
-                let detail = completion.detail.as_ref().unwrap();
-                let text = format!("{} {}", detail, label);
-                let source = Rope::from(format!("struct S {{ {} }}", text).as_str());
-                let runs = language.highlight_text(&source, 11..11 + text.len());
-                let filter_range = completion
-                    .filter_text
-                    .as_deref()
-                    .and_then(|filter_text| {
-                        text.find(filter_text)
-                            .map(|start| start..start + filter_text.len())
-                    })
-                    .unwrap_or(detail.len() + 1..text.len());
-                return Some(CodeLabel::new(text, filter_range, runs));
-            }
-            Some(lsp::CompletionItemKind::CONSTANT | lsp::CompletionItemKind::VARIABLE)
-                if completion.detail.is_some() =>
-            {
-                let detail = completion.detail.as_ref().unwrap();
-                let text = format!("{} {}", detail, label);
-                let runs = language.highlight_text(&Rope::from(text.as_str()), 0..text.len());
-                let filter_range = completion
-                    .filter_text
-                    .as_deref()
-                    .and_then(|filter_text| {
-                        text.find(filter_text)
-                            .map(|start| start..start + filter_text.len())
-                    })
-                    .unwrap_or(detail.len() + 1..text.len());
-                return Some(CodeLabel::new(text, filter_range, runs));
-            }
-            Some(lsp::CompletionItemKind::FUNCTION | lsp::CompletionItemKind::METHOD)
-                if completion.detail.is_some() =>
-            {
-                let detail = completion.detail.as_ref().unwrap();
-                let text = format!("{} {}", detail, label);
-                let runs = language.highlight_text(&Rope::from(text.as_str()), 0..text.len());
-                let filter_range = completion
-                    .filter_text
-                    .as_deref()
-                    .and_then(|filter_text| {
-                        text.find(filter_text)
-                            .map(|start| start..start + filter_text.len())
-                    })
-                    .unwrap_or_else(|| {
-                        let filter_start = detail.len() + 1;
-                        let filter_end = text
-                            .rfind('(')
-                            .filter(|end| *end > filter_start)
-                            .unwrap_or(text.len());
-                        filter_start..filter_end
-                    });
-
-                return Some(CodeLabel::new(text, filter_range, runs));
-            }
-            Some(kind) => {
-                let highlight_name = match kind {
-                    lsp::CompletionItemKind::STRUCT
-                    | lsp::CompletionItemKind::INTERFACE
-                    | lsp::CompletionItemKind::CLASS
-                    | lsp::CompletionItemKind::ENUM => Some("type"),
-                    lsp::CompletionItemKind::ENUM_MEMBER => Some("variant"),
-                    lsp::CompletionItemKind::KEYWORD => Some("keyword"),
-                    lsp::CompletionItemKind::VALUE | lsp::CompletionItemKind::CONSTANT => {
-                        Some("constant")
-                    }
-                    _ => None,
-                };
-                if let Some(highlight_id) = language
-                    .grammar()
-                    .and_then(|g| g.highlight_id_for_name(highlight_name?))
-                {
-                    let mut label = CodeLabel::plain(label, completion.filter_text.as_deref());
-                    label.runs.push((
-                        0..label.text.rfind('(').unwrap_or(label.text.len()),
-                        highlight_id,
-                    ));
-                    return Some(label);
-                }
-            }
-            _ => {}
-        }
-        Some(CodeLabel::plain(label, completion.filter_text.as_deref()))
-    }
-
-    async fn label_for_symbol(
-        &self,
-        name: &str,
-        kind: lsp::SymbolKind,
-        language: &Arc<Language>,
-    ) -> Option<CodeLabel> {
-        let (text, filter_range, display_range) = match kind {
-            lsp::SymbolKind::METHOD | lsp::SymbolKind::FUNCTION => {
-                let text = format!("void {} () {{}}", name);
-                let filter_range = 0..name.len();
-                let display_range = 5..5 + name.len();
-                (text, filter_range, display_range)
-            }
-            lsp::SymbolKind::STRUCT => {
-                let text = format!("struct {} {{}}", name);
-                let filter_range = 7..7 + name.len();
-                let display_range = 0..filter_range.end;
-                (text, filter_range, display_range)
-            }
-            lsp::SymbolKind::ENUM => {
-                let text = format!("enum {} {{}}", name);
-                let filter_range = 5..5 + name.len();
-                let display_range = 0..filter_range.end;
-                (text, filter_range, display_range)
-            }
-            lsp::SymbolKind::INTERFACE | lsp::SymbolKind::CLASS => {
-                let text = format!("class {} {{}}", name);
-                let filter_range = 6..6 + name.len();
-                let display_range = 0..filter_range.end;
-                (text, filter_range, display_range)
-            }
-            lsp::SymbolKind::CONSTANT => {
-                let text = format!("const int {} = 0;", name);
-                let filter_range = 10..10 + name.len();
-                let display_range = 0..filter_range.end;
-                (text, filter_range, display_range)
-            }
-            lsp::SymbolKind::MODULE => {
-                let text = format!("namespace {} {{}}", name);
-                let filter_range = 10..10 + name.len();
-                let display_range = 0..filter_range.end;
-                (text, filter_range, display_range)
-            }
-            lsp::SymbolKind::TYPE_PARAMETER => {
-                let text = format!("typename {} {{}};", name);
-                let filter_range = 9..9 + name.len();
-                let display_range = 0..filter_range.end;
-                (text, filter_range, display_range)
-            }
-            _ => return None,
-        };
-
-        Some(CodeLabel::new(
-            text[display_range.clone()].to_string(),
-            filter_range,
-            language.highlight_text(&text.as_str().into(), display_range),
-        ))
-    }
-
-    fn prepare_initialize_params(
-        &self,
-        mut original: InitializeParams,
-        _: &App,
-    ) -> Result<InitializeParams> {
-        let experimental = json!({
-            "textDocument": {
-                "completion" : {
-                    // enable clangd's dot-to-arrow feature.
-                    "editsNearCursor": true
-                },
-                "inactiveRegionsCapabilities": {
-                    "inactiveRegions": true,
-                }
-            }
-        });
-        if let Some(ref mut original_experimental) = original.capabilities.experimental {
-            merge_json_value_into(experimental, original_experimental);
-        } else {
-            original.capabilities.experimental = Some(experimental);
-        }
-        Ok(original)
-    }
-
-    fn retain_old_diagnostic(&self, previous_diagnostic: &Diagnostic, _: &App) -> bool {
-        clangd_ext::is_inactive_region(previous_diagnostic)
-    }
-
-    fn underline_diagnostic(&self, diagnostic: &lsp::Diagnostic) -> bool {
-        !clangd_ext::is_lsp_inactive_region(diagnostic)
-    }
-}
-
-async fn get_cached_server_binary(container_dir: PathBuf) -> Option<LanguageServerBinary> {
-    maybe!(async {
-        let mut last_clangd_dir = None;
-        let mut entries = fs::read_dir(&container_dir).await?;
-        while let Some(entry) = entries.next().await {
-            let entry = entry?;
-            if entry.file_type().await?.is_dir() {
-                last_clangd_dir = Some(entry.path());
-            }
-        }
-        let clangd_dir = last_clangd_dir.context("no cached binary")?;
-        let clangd_bin = clangd_dir.join("bin/clangd");
-        anyhow::ensure!(
-            clangd_bin.exists(),
-            "missing clangd binary in directory {clangd_dir:?}"
-        );
-        Ok(LanguageServerBinary {
-            path: clangd_bin,
-            env: None,
-            arguments: Vec::new(),
-        })
-    })
-    .await
-    .log_err()
-}
-
-#[cfg(test)]
-mod tests {
-    use gpui::{AppContext as _, BorrowAppContext, TestAppContext};
-    use language::{AutoindentMode, Buffer};
-    use settings::SettingsStore;
-    use std::num::NonZeroU32;
-    use unindent::Unindent;
-
-    #[gpui::test]
-    async fn test_c_autoindent_basic(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let test_settings = SettingsStore::test(cx);
-            cx.set_global(test_settings);
-            cx.update_global::<SettingsStore, _>(|store, cx| {
-                store.update_user_settings(cx, |s| {
-                    s.project.all_languages.defaults.tab_size = NonZeroU32::new(2);
-                });
-            });
-        });
-        let language = crate::language("c", tree_sitter_c::LANGUAGE.into());
-
-        cx.new(|cx| {
-            let mut buffer = Buffer::local("", cx).with_language(language, cx);
-
-            buffer.edit([(0..0, "int main() {}")], None, cx);
-
-            let ix = buffer.len() - 1;
-            buffer.edit([(ix..ix, "\n\n")], Some(AutoindentMode::EachLine), cx);
-            assert_eq!(
-                buffer.text(),
-                "int main() {\n  \n}",
-                "content inside braces should be indented"
-            );
-
-            buffer
-        });
-    }
-
-    #[gpui::test]
-    async fn test_c_autoindent_if_else(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let test_settings = SettingsStore::test(cx);
-            cx.set_global(test_settings);
-            cx.update_global::<SettingsStore, _>(|store, cx| {
-                store.update_user_settings(cx, |s| {
-                    s.project.all_languages.defaults.tab_size = NonZeroU32::new(2);
-                });
-            });
-        });
-        let language = crate::language("c", tree_sitter_c::LANGUAGE.into());
-
-        cx.new(|cx| {
-            let mut buffer = Buffer::local("", cx).with_language(language, cx);
-
-            buffer.edit(
-                [(
-                    0..0,
-                    r#"
-                    int main() {
-                    if (a)
-                    b;
-                    }
-                    "#
-                    .unindent(),
-                )],
-                Some(AutoindentMode::EachLine),
-                cx,
-            );
-            assert_eq!(
-                buffer.text(),
-                r#"
-                int main() {
-                  if (a)
-                    b;
-                }
-                "#
-                .unindent(),
-                "body of if-statement without braces should be indented"
-            );
-
-            let ix = buffer.len() - 4;
-            buffer.edit([(ix..ix, "\n.c")], Some(AutoindentMode::EachLine), cx);
-            assert_eq!(
-                buffer.text(),
-                r#"
-                int main() {
-                  if (a)
-                    b
-                      .c;
-                }
-                "#
-                .unindent(),
-                "field expression (.c) should be indented further than the statement body"
-            );
-
-            buffer.edit([(0..buffer.len(), "")], Some(AutoindentMode::EachLine), cx);
-            buffer.edit(
-                [(
-                    0..0,
-                    r#"
-                    int main() {
-                    if (a) a++;
-                    else b++;
-                    }
-                    "#
-                    .unindent(),
-                )],
-                Some(AutoindentMode::EachLine),
-                cx,
-            );
-            assert_eq!(
-                buffer.text(),
-                r#"
-                int main() {
-                  if (a) a++;
-                  else b++;
-                }
-                "#
-                .unindent(),
-                "single-line if/else without braces should align at the same level"
-            );
-
-            buffer.edit([(0..buffer.len(), "")], Some(AutoindentMode::EachLine), cx);
-            buffer.edit(
-                [(
-                    0..0,
-                    r#"
-                    int main() {
-                    if (a)
-                    b++;
-                    else
-                    c++;
-                    }
-                    "#
-                    .unindent(),
-                )],
-                Some(AutoindentMode::EachLine),
-                cx,
-            );
-            assert_eq!(
-                buffer.text(),
-                r#"
-                int main() {
-                  if (a)
-                    b++;
-                  else
-                    c++;
-                }
-                "#
-                .unindent(),
-                "multi-line if/else without braces should indent statement bodies"
-            );
-
-            buffer.edit([(0..buffer.len(), "")], Some(AutoindentMode::EachLine), cx);
-            buffer.edit(
-                [(
-                    0..0,
-                    r#"
-                    int main() {
-                    if (a)
-                    if (b)
-                    c++;
-                    }
-                    "#
-                    .unindent(),
-                )],
-                Some(AutoindentMode::EachLine),
-                cx,
-            );
-            assert_eq!(
-                buffer.text(),
-                r#"
-                int main() {
-                  if (a)
-                    if (b)
-                      c++;
-                }
-                "#
-                .unindent(),
-                "nested if statements without braces should indent properly"
-            );
-
-            buffer.edit([(0..buffer.len(), "")], Some(AutoindentMode::EachLine), cx);
-            buffer.edit(
-                [(
-                    0..0,
-                    r#"
-                    int main() {
-                    if (a)
-                    b++;
-                    else if (c)
-                    d++;
-                    else
-                    f++;
-                    }
-                    "#
-                    .unindent(),
-                )],
-                Some(AutoindentMode::EachLine),
-                cx,
-            );
-            assert_eq!(
-                buffer.text(),
-                r#"
-                int main() {
-                  if (a)
-                    b++;
-                  else if (c)
-                    d++;
-                  else
-                    f++;
-                }
-                "#
-                .unindent(),
-                "else-if chains should align all conditions at same level with indented bodies"
-            );
-
-            buffer.edit([(0..buffer.len(), "")], Some(AutoindentMode::EachLine), cx);
-            buffer.edit(
-                [(
-                    0..0,
-                    r#"
-                    int main() {
-                    if (a) {
-                    b++;
-                    } else
-                    c++;
-                    }
-                    "#
-                    .unindent(),
-                )],
-                Some(AutoindentMode::EachLine),
-                cx,
-            );
-            assert_eq!(
-                buffer.text(),
-                r#"
-                int main() {
-                  if (a) {
-                    b++;
-                  } else
-                    c++;
-                }
-                "#
-                .unindent(),
-                "mixed braces should indent properly"
-            );
-
-            buffer
-        });
-    }
-}
diff --git a/crates/languages/src/c/brackets.scm b/crates/languages/src/c/brackets.scm
deleted file mode 100644
index 2149bddc6c..0000000000
--- a/crates/languages/src/c/brackets.scm
+++ /dev/null
@@ -1,5 +0,0 @@
-("(" @open ")" @close)
-("[" @open "]" @close)
-("{" @open "}" @close)
-(("\"" @open "\"" @close) (#set! rainbow.exclude))
-(("'" @open "'" @close) (#set! rainbow.exclude))
diff --git a/crates/languages/src/c/config.toml b/crates/languages/src/c/config.toml
deleted file mode 100644
index c490269b12..0000000000
--- a/crates/languages/src/c/config.toml
+++ /dev/null
@@ -1,20 +0,0 @@
-name = "C"
-grammar = "c"
-path_suffixes = ["c"]
-line_comments = ["// "]
-decrease_indent_patterns = [
-  { pattern = "^\\s*\\{.*\\}?\\s*$", valid_after = ["if", "for", "while", "do", "switch", "else"] },
-  { pattern = "^\\s*else\\b", valid_after = ["if"] }
-]
-autoclose_before = ";:.,=}])>"
-brackets = [
-    { start = "{", end = "}", close = true, newline = true },
-    { start = "[", end = "]", close = true, newline = true },
-    { start = "(", end = ")", close = true, newline = true },
-    { start = "\"", end = "\"", close = true, newline = false, not_in = ["string"] },
-    { start = "'", end = "'", close = true, newline = false, not_in = ["string", "comment"] },
-    { start = "/*", end = " */", close = true, newline = false, not_in = ["string", "comment"] },
-]
-debuggers = ["CodeLLDB", "GDB"]
-documentation_comment = { start = "/*", prefix = "* ", end = "*/", tab_size = 1 }
-import_path_strip_regex = "^<|>$"
diff --git a/crates/languages/src/c/embedding.scm b/crates/languages/src/c/embedding.scm
deleted file mode 100644
index 0178abeb18..0000000000
--- a/crates/languages/src/c/embedding.scm
+++ /dev/null
@@ -1,43 +0,0 @@
-(
-    (comment)* @context
-    .
-    (declaration
-        declarator: [
-            (function_declarator
-                declarator: (_) @name)
-            (pointer_declarator
-                "*" @name
-                declarator: (function_declarator
-                    declarator: (_) @name))
-            (pointer_declarator
-                "*" @name
-                declarator: (pointer_declarator
-                    "*" @name
-                    declarator: (function_declarator
-                        declarator: (_) @name)))
-            ]
-        ) @item
-    )
-
-(
-    (comment)* @context
-    .
-    (function_definition
-        declarator: [
-            (function_declarator
-                declarator: (_) @name
-                )
-            (pointer_declarator
-                "*" @name
-                declarator: (function_declarator
-                    declarator: (_) @name
-                    ))
-            (pointer_declarator
-                "*" @name
-                declarator: (pointer_declarator
-                    "*" @name
-                    declarator: (function_declarator
-                        declarator: (_) @name)))
-            ]
-        ) @item
-    )
diff --git a/crates/languages/src/c/highlights.scm b/crates/languages/src/c/highlights.scm
deleted file mode 100644
index 46c970e69d..0000000000
--- a/crates/languages/src/c/highlights.scm
+++ /dev/null
@@ -1,134 +0,0 @@
-[
-  "const"
-  "enum"
-  "extern"
-  "inline"
-  "sizeof"
-  "static"
-  "struct"
-  "typedef"
-  "union"
-  "volatile"
-] @keyword
-
-[
-  "break"
-  "case"
-  "continue"
-  "default"
-  "do"
-  "else"
-  "for"
-  "goto"
-  "if"
-  "return"
-  "switch"
-  "while"
-] @keyword.control
-
-[
-  "#define"
-  "#elif"
-  "#else"
-  "#endif"
-  "#if"
-  "#ifdef"
-  "#ifndef"
-  "#include"
-  (preproc_directive)
-] @keyword.directive
-
-[
-  "="
-  "+="
-  "-="
-  "*="
-  "/="
-  "%="
-  "&="
-  "|="
-  "^="
-  "<<="
-  ">>="
-  "++"
-  "--"
-  "+"
-  "-"
-  "*"
-  "/"
-  "%"
-  "~"
-  "&"
-  "|"
-  "^"
-  "<<"
-  ">>"
-  "!"
-  "&&"
-  "||"
-  "=="
-  "!="
-  "<"
-  ">"
-  "<="
-  ">="
-  "->"
-  "?"
-  ":"
-] @operator
-
-[
-  "."
-  ";"
-  ","
-] @punctuation.delimiter
-
-[
-  "{"
-  "}"
-  "("
-  ")"
-  "["
-  "]"
-] @punctuation.bracket
-
-[
-  (string_literal)
-  (system_lib_string)
-  (char_literal)
-] @string
-
-(comment) @comment
-
-(number_literal) @number
-
-[
-  (true)
-  (false)
-] @boolean
-
-(null) @constant.builtin
-
-(identifier) @variable
-
-((identifier) @constant
- (#match? @constant "^_*[A-Z][A-Z\\d_]*$"))
-
-(call_expression
-  function: (identifier) @function)
-(call_expression
-  function: (field_expression
-    field: (field_identifier) @function))
-(function_declarator
-  declarator: (identifier) @function)
-(preproc_function_def
-  name: (identifier) @function.special)
-
-(field_identifier) @property
-(statement_identifier) @label
-
-[
-  (type_identifier)
-  (primitive_type)
-  (sized_type_specifier)
-] @type
diff --git a/crates/languages/src/c/imports.scm b/crates/languages/src/c/imports.scm
deleted file mode 100644
index c3c2c9e68c..0000000000
--- a/crates/languages/src/c/imports.scm
+++ /dev/null
@@ -1,7 +0,0 @@
-(preproc_include
-    path: [
-        (
-            (system_lib_string) @source @wildcard
-            (#strip! @source "[<>]"))
-        (string_literal (string_content) @source @wildcard)
-    ]) @import
diff --git a/crates/languages/src/c/indents.scm b/crates/languages/src/c/indents.scm
deleted file mode 100644
index 3b6d5135ab..0000000000
--- a/crates/languages/src/c/indents.scm
+++ /dev/null
@@ -1,19 +0,0 @@
-[
-  (field_expression)
-  (assignment_expression)
-  (if_statement)
-  (for_statement)
-  (while_statement)
-  (do_statement)
-  (else_clause)
-] @indent
-
-(_ "{" "}" @end) @indent
-(_ "(" ")" @end) @indent
-
-(if_statement) @start.if
-(for_statement) @start.for
-(while_statement) @start.while
-(do_statement) @start.do
-(switch_statement) @start.switch
-(else_clause) @start.else
diff --git a/crates/languages/src/c/injections.scm b/crates/languages/src/c/injections.scm
deleted file mode 100644
index d7df76b118..0000000000
--- a/crates/languages/src/c/injections.scm
+++ /dev/null
@@ -1,12 +0,0 @@
-((comment) @injection.content
-  (#match? @injection.content "^(///|//!|/\\*\\*|/\\*!)(.*)")
-  (#set! injection.language "doxygen")
-  (#set! injection.include-children))
-
-(preproc_def
-    value: (preproc_arg) @injection.content
-    (#set! injection.language "c"))
-
-(preproc_function_def
-    value: (preproc_arg) @injection.content
-    (#set! injection.language "c"))
diff --git a/crates/languages/src/c/outline.scm b/crates/languages/src/c/outline.scm
deleted file mode 100644
index 4d36606942..0000000000
--- a/crates/languages/src/c/outline.scm
+++ /dev/null
@@ -1,72 +0,0 @@
-(preproc_def
-    "#define" @context
-    name: (_) @name) @item
-
-(preproc_function_def
-    "#define" @context
-    name: (_) @name
-    parameters: (preproc_params
-        "(" @context
-        ")" @context)) @item
-
-(type_definition
-    "typedef" @context
-    declarator: (_) @name) @item
-
-(declaration
-    (type_qualifier)? @context
-    type: (_)? @context
-    declarator: [
-        (function_declarator
-            declarator: (_) @name
-            parameters: (parameter_list
-                "(" @context
-                ")" @context))
-        (pointer_declarator
-            "*" @context
-            declarator: (function_declarator
-                declarator: (_) @name
-                parameters: (parameter_list
-                    "(" @context
-                    ")" @context)))
-        (pointer_declarator
-            "*" @context
-            declarator: (pointer_declarator
-                "*" @context
-                declarator: (function_declarator
-                    declarator: (_) @name
-                    parameters: (parameter_list
-                        "(" @context
-                        ")" @context))))
-    ]
-) @item
-
-(function_definition
-    (type_qualifier)? @context
-    type: (_)? @context
-    declarator: [
-        (function_declarator
-            declarator: (_) @name
-            parameters: (parameter_list
-                "(" @context
-                ")" @context))
-        (pointer_declarator
-            "*" @context
-            declarator: (function_declarator
-                declarator: (_) @name
-                parameters: (parameter_list
-                    "(" @context
-                    ")" @context)))
-        (pointer_declarator
-            "*" @context
-            declarator: (pointer_declarator
-                "*" @context
-                declarator: (function_declarator
-                    declarator: (_) @name
-                    parameters: (parameter_list
-                        "(" @context
-                        ")" @context))))
-    ]
-) @item
-
-(comment) @annotation
diff --git a/crates/languages/src/c/overrides.scm b/crates/languages/src/c/overrides.scm
deleted file mode 100644
index 36473eb300..0000000000
--- a/crates/languages/src/c/overrides.scm
+++ /dev/null
@@ -1,2 +0,0 @@
-(comment) @comment.inclusive
-(string_literal) @string
diff --git a/crates/languages/src/c/runnables.scm b/crates/languages/src/c/runnables.scm
deleted file mode 100644
index 5a203f5d7a..0000000000
--- a/crates/languages/src/c/runnables.scm
+++ /dev/null
@@ -1,10 +0,0 @@
-; Tag the main function
-(
-  (function_definition
-    declarator: (function_declarator
-      declarator: (identifier) @run
-    )
-  ) @_c-main
-  (#eq? @run "main")
-  (#set! tag c-main)
-)
diff --git a/crates/languages/src/c/textobjects.scm b/crates/languages/src/c/textobjects.scm
deleted file mode 100644
index 832dd62288..0000000000
--- a/crates/languages/src/c/textobjects.scm
+++ /dev/null
@@ -1,25 +0,0 @@
-(declaration
-    declarator: (function_declarator)) @function.around
-
-(function_definition
-    body: (_
-        "{"
-        (_)* @function.inside
-        "}" )) @function.around
-
-(preproc_function_def
-    value: (_) @function.inside) @function.around
-
-(comment) @comment.around
-
-(struct_specifier
-    body: (_
-        "{"
-        (_)* @class.inside
-        "}")) @class.around
-
-(enum_specifier
-    body: (_
-        "{"
-        [(_) ","?]* @class.inside
-        "}")) @class.around
diff --git a/crates/languages/src/cpp.rs b/crates/languages/src/cpp.rs
deleted file mode 100644
index 85a3fb5045..0000000000
--- a/crates/languages/src/cpp.rs
+++ /dev/null
@@ -1,252 +0,0 @@
-#[cfg(test)]
-mod tests {
-    use gpui::{AppContext as _, BorrowAppContext, TestAppContext};
-    use language::{AutoindentMode, Buffer};
-    use settings::SettingsStore;
-    use std::num::NonZeroU32;
-    use unindent::Unindent;
-
-    #[gpui::test]
-    async fn test_cpp_autoindent_basic(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let test_settings = SettingsStore::test(cx);
-            cx.set_global(test_settings);
-            cx.update_global::<SettingsStore, _>(|store, cx| {
-                store.update_user_settings(cx, |s| {
-                    s.project.all_languages.defaults.tab_size = NonZeroU32::new(2);
-                });
-            });
-        });
-        let language = crate::language("cpp", tree_sitter_cpp::LANGUAGE.into());
-
-        cx.new(|cx| {
-            let mut buffer = Buffer::local("", cx).with_language(language, cx);
-
-            buffer.edit([(0..0, "int main() {}")], None, cx);
-
-            let ix = buffer.len() - 1;
-            buffer.edit([(ix..ix, "\n\n")], Some(AutoindentMode::EachLine), cx);
-            assert_eq!(
-                buffer.text(),
-                "int main() {\n  \n}",
-                "content inside braces should be indented"
-            );
-
-            buffer
-        });
-    }
-
-    #[gpui::test]
-    async fn test_cpp_autoindent_if_else(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let test_settings = SettingsStore::test(cx);
-            cx.set_global(test_settings);
-            cx.update_global::<SettingsStore, _>(|store, cx| {
-                store.update_user_settings(cx, |s| {
-                    s.project.all_languages.defaults.tab_size = NonZeroU32::new(2);
-                });
-            });
-        });
-        let language = crate::language("cpp", tree_sitter_cpp::LANGUAGE.into());
-
-        cx.new(|cx| {
-            let mut buffer = Buffer::local("", cx).with_language(language, cx);
-
-            buffer.edit(
-                [(
-                    0..0,
-                    r#"
-                    int main() {
-                    if (a)
-                    b;
-                    }
-                    "#
-                    .unindent(),
-                )],
-                Some(AutoindentMode::EachLine),
-                cx,
-            );
-            assert_eq!(
-                buffer.text(),
-                r#"
-                int main() {
-                  if (a)
-                    b;
-                }
-                "#
-                .unindent(),
-                "body of if-statement without braces should be indented"
-            );
-
-            let ix = buffer.len() - 4;
-            buffer.edit([(ix..ix, "\n.c")], Some(AutoindentMode::EachLine), cx);
-            assert_eq!(
-                buffer.text(),
-                r#"
-                int main() {
-                  if (a)
-                    b
-                      .c;
-                }
-                "#
-                .unindent(),
-                "field expression (.c) should be indented further than the statement body"
-            );
-
-            buffer.edit([(0..buffer.len(), "")], Some(AutoindentMode::EachLine), cx);
-            buffer.edit(
-                [(
-                    0..0,
-                    r#"
-                    int main() {
-                    if (a) a++;
-                    else b++;
-                    }
-                    "#
-                    .unindent(),
-                )],
-                Some(AutoindentMode::EachLine),
-                cx,
-            );
-            assert_eq!(
-                buffer.text(),
-                r#"
-                int main() {
-                  if (a) a++;
-                  else b++;
-                }
-                "#
-                .unindent(),
-                "single-line if/else without braces should align at the same level"
-            );
-
-            buffer.edit([(0..buffer.len(), "")], Some(AutoindentMode::EachLine), cx);
-            buffer.edit(
-                [(
-                    0..0,
-                    r#"
-                    int main() {
-                    if (a)
-                    b++;
-                    else
-                    c++;
-                    }
-                    "#
-                    .unindent(),
-                )],
-                Some(AutoindentMode::EachLine),
-                cx,
-            );
-            assert_eq!(
-                buffer.text(),
-                r#"
-                int main() {
-                  if (a)
-                    b++;
-                  else
-                    c++;
-                }
-                "#
-                .unindent(),
-                "multi-line if/else without braces should indent statement bodies"
-            );
-
-            buffer.edit([(0..buffer.len(), "")], Some(AutoindentMode::EachLine), cx);
-            buffer.edit(
-                [(
-                    0..0,
-                    r#"
-                    int main() {
-                    if (a)
-                    if (b)
-                    c++;
-                    }
-                    "#
-                    .unindent(),
-                )],
-                Some(AutoindentMode::EachLine),
-                cx,
-            );
-            assert_eq!(
-                buffer.text(),
-                r#"
-                int main() {
-                  if (a)
-                    if (b)
-                      c++;
-                }
-                "#
-                .unindent(),
-                "nested if statements without braces should indent properly"
-            );
-
-            buffer.edit([(0..buffer.len(), "")], Some(AutoindentMode::EachLine), cx);
-            buffer.edit(
-                [(
-                    0..0,
-                    r#"
-                    int main() {
-                    if (a)
-                    b++;
-                    else if (c)
-                    d++;
-                    else
-                    f++;
-                    }
-                    "#
-                    .unindent(),
-                )],
-                Some(AutoindentMode::EachLine),
-                cx,
-            );
-            assert_eq!(
-                buffer.text(),
-                r#"
-                int main() {
-                  if (a)
-                    b++;
-                  else if (c)
-                    d++;
-                  else
-                    f++;
-                }
-                "#
-                .unindent(),
-                "else-if chains should align all conditions at same level with indented bodies"
-            );
-
-            buffer.edit([(0..buffer.len(), "")], Some(AutoindentMode::EachLine), cx);
-            buffer.edit(
-                [(
-                    0..0,
-                    r#"
-                    int main() {
-                    if (a) {
-                    b++;
-                    } else
-                    c++;
-                    }
-                    "#
-                    .unindent(),
-                )],
-                Some(AutoindentMode::EachLine),
-                cx,
-            );
-            assert_eq!(
-                buffer.text(),
-                r#"
-                int main() {
-                  if (a) {
-                    b++;
-                  } else
-                    c++;
-                }
-                "#
-                .unindent(),
-                "mixed braces should indent properly"
-            );
-
-            buffer
-        });
-    }
-}
diff --git a/crates/languages/src/cpp/brackets.scm b/crates/languages/src/cpp/brackets.scm
deleted file mode 100644
index 2149bddc6c..0000000000
--- a/crates/languages/src/cpp/brackets.scm
+++ /dev/null
@@ -1,5 +0,0 @@
-("(" @open ")" @close)
-("[" @open "]" @close)
-("{" @open "}" @close)
-(("\"" @open "\"" @close) (#set! rainbow.exclude))
-(("'" @open "'" @close) (#set! rainbow.exclude))
diff --git a/crates/languages/src/cpp/config.toml b/crates/languages/src/cpp/config.toml
deleted file mode 100644
index 8d85b4f241..0000000000
--- a/crates/languages/src/cpp/config.toml
+++ /dev/null
@@ -1,20 +0,0 @@
-name = "C++"
-grammar = "cpp"
-path_suffixes = ["cc", "hh", "cpp", "h", "hpp", "cxx", "hxx", "c++", "h++", "ipp", "inl", "ino", "ixx", "cu", "cuh", "C", "H"]
-line_comments = ["// ", "/// ", "//! "]
-decrease_indent_patterns = [
-  { pattern = "^\\s*\\{.*\\}?\\s*$", valid_after = ["if", "for", "while", "do", "switch", "else"] },
-  { pattern = "^\\s*else\\b", valid_after = ["if"] }
-]
-autoclose_before = ";:.,=}])>"
-brackets = [
-    { start = "{", end = "}", close = true, newline = true },
-    { start = "[", end = "]", close = true, newline = true },
-    { start = "(", end = ")", close = true, newline = true },
-    { start = "\"", end = "\"", close = true, newline = false, not_in = ["string"] },
-    { start = "'", end = "'", close = true, newline = false, not_in = ["string", "comment"] },
-    { start = "/*", end = " */", close = true, newline = false, not_in = ["string", "comment"] },
-]
-debuggers = ["CodeLLDB", "GDB"]
-documentation_comment = { start = "/*", prefix = "* ", end = "*/", tab_size = 1 }
-import_path_strip_regex = "^<|>$"
diff --git a/crates/languages/src/cpp/embedding.scm b/crates/languages/src/cpp/embedding.scm
deleted file mode 100644
index bbd93f20db..0000000000
--- a/crates/languages/src/cpp/embedding.scm
+++ /dev/null
@@ -1,61 +0,0 @@
-(
-    (comment)* @context
-    .
-    (function_definition
-        (type_qualifier)? @name
-        type: (_)? @name
-        declarator: [
-            (function_declarator
-                declarator: (_) @name)
-            (pointer_declarator
-                "*" @name
-                declarator: (function_declarator
-                declarator: (_) @name))
-            (pointer_declarator
-                "*" @name
-                declarator: (pointer_declarator
-                    "*" @name
-                declarator: (function_declarator
-                    declarator: (_) @name)))
-            (reference_declarator
-                ["&" "&&"] @name
-                (function_declarator
-                declarator: (_) @name))
-        ]
-        (type_qualifier)? @name) @item
-    )
-
-(
-    (comment)* @context
-    .
-    (template_declaration
-        (class_specifier
-            "class" @name
-            name: (_) @name)
-            ) @item
-)
-
-(
-    (comment)* @context
-    .
-    (class_specifier
-        "class" @name
-        name: (_) @name) @item
-    )
-
-(
-    (comment)* @context
-    .
-    (enum_specifier
-        "enum" @name
-        name: (_) @name) @item
-    )
-
-(
-    (comment)* @context
-    .
-    (declaration
-        type: (struct_specifier
-        "struct" @name)
-        declarator: (_) @name) @item
-)
diff --git a/crates/languages/src/cpp/highlights.scm b/crates/languages/src/cpp/highlights.scm
deleted file mode 100644
index af906e6712..0000000000
--- a/crates/languages/src/cpp/highlights.scm
+++ /dev/null
@@ -1,276 +0,0 @@
-(identifier) @variable
-(field_identifier) @property
-(namespace_identifier) @namespace
-
-(concept_definition
-    name: (identifier) @concept)
-
-(requires_clause
-    constraint: (template_type
-        name: (type_identifier) @concept))
-
-(module_name
-  (identifier) @module)
-
-(module_declaration
-  name: (module_name
-    (identifier) @module))
-
-(import_declaration
-  name: (module_name
-    (identifier) @module))
-
-(import_declaration
-  partition: (module_partition
-    (module_name
-      (identifier) @module)))
-
-(call_expression
-  function: (qualified_identifier
-    name: (identifier) @function))
-
-(call_expression
-  (qualified_identifier
-    (identifier) @function.call))
-
-(call_expression
-  (qualified_identifier
-    (qualified_identifier
-      (identifier) @function.call)))
-
-(call_expression
-  (qualified_identifier
-    (qualified_identifier
-      (qualified_identifier
-        (identifier) @function.call))))
-
-((qualified_identifier
-  (qualified_identifier
-    (qualified_identifier
-      (qualified_identifier
-        (identifier) @function.call)))) @_parent
-  (#has-ancestor? @_parent call_expression))
-
-(call_expression
-  function: (identifier) @function)
-
-(call_expression
-  function: (field_expression
-    field: (field_identifier) @function))
-
-(preproc_function_def
-  name: (identifier) @function.special)
-
-(template_function
-  name: (identifier) @function)
-
-(template_method
-  name: (field_identifier) @function)
-
-(function_declarator
-  declarator: (identifier) @function)
-
-(function_declarator
-  declarator: (qualified_identifier
-    name: (identifier) @function))
-
-(function_declarator
-  declarator: (field_identifier) @function)
-
-(operator_name
-  (identifier)? @operator) @function
-
-(operator_name
-  "<=>" @operator.spaceship)
-
-(destructor_name (identifier) @function)
-
-((namespace_identifier) @type
- (#match? @type "^[A-Z]"))
-
-(auto) @type
-(type_identifier) @type
-type: (primitive_type) @type.builtin
-(sized_type_specifier) @type.builtin
-
-(attribute
-    name: (identifier) @attribute)
-
-((identifier) @constant.builtin
- (#match? @constant.builtin "^_*[A-Z][A-Z\\d_]*$"))
-
-(statement_identifier) @label
-(this) @variable.builtin
-("static_assert") @function.builtin
-
-[
-  "alignas"
-  "alignof"
-  "class"
-  "concept"
-  "consteval"
-  "constexpr"
-  "constinit"
-  "decltype"
-  "delete"
-  "enum"
-  "explicit"
-  "export"
-  "extern"
-  "final"
-  "friend"
-  "import"
-  "inline"
-  "module"
-  "namespace"
-  "new"
-  "noexcept"
-  "operator"
-  "override"
-  "private"
-  "protected"
-  "public"
-  "requires"
-  "sizeof"
-  "struct"
-  "template"
-  "thread_local"
-  "typedef"
-  "typename"
-  "union"
-  "using"
-  "virtual"
-  (storage_class_specifier)
-  (type_qualifier)
-] @keyword
-
-[
-  "break"
-  "case"
-  "catch"
-  "co_await"
-  "co_return"
-  "co_yield"
-  "continue"
-  "default"
-  "do"
-  "else"
-  "for"
-  "goto"
-  "if"
-  "return"
-  "switch"
-  "throw"
-  "try"
-  "while"
-] @keyword.control
-
-[
-  "#define"
-  "#elif"
-  "#else"
-  "#endif"
-  "#if"
-  "#ifdef"
-  "#ifndef"
-  "#include"
-  (preproc_directive)
-] @keyword.directive
-
-(comment) @comment
-
-[
-  (true)
-  (false)
-] @boolean
-
-[
-  (null)
-  ("nullptr")
-] @constant.builtin
-
-(number_literal) @number
-
-[
-  (string_literal)
-  (system_lib_string)
-  (char_literal)
-  (raw_string_literal)
-] @string
-
-[
-  ","
-  ":"
-  "::"
-  ";"
-  (raw_string_delimiter)
-] @punctuation.delimiter
-
-[
-  "{"
-  "}"
-  "("
-  ")"
-  "["
-  "]"
-] @punctuation.bracket
-
-[
-  "."
-  ".*"
-  "->*"
-  "~"
-  "-"
-  "--"
-  "-="
-  "->"
-  "="
-  "!"
-  "!="
-  "|"
-  "|="
-  "||"
-  "^"
-  "^="
-  "&"
-  "&="
-  "&&"
-  "+"
-  "++"
-  "+="
-  "*"
-  "*="
-  "/"
-  "/="
-  "%"
-  "%="
-  "<<"
-  "<<="
-  ">>"
-  ">>="
-  "<"
-  "=="
-  ">"
-  "<="
-  ">="
-  "?"
-  "and"
-  "and_eq"
-  "bitand"
-  "bitor"
-  "compl"
-  "not"
-  "not_eq"
-  "or"
-  "or_eq"
-  "xor"
-  "xor_eq"
-] @operator
-
-"<=>" @operator.spaceship
-
-(binary_expression
-  operator: "<=>" @operator.spaceship)
-
-(conditional_expression ":" @operator)
-(user_defined_literal (literal_suffix) @operator)
diff --git a/crates/languages/src/cpp/imports.scm b/crates/languages/src/cpp/imports.scm
deleted file mode 100644
index a4ef817a80..0000000000
--- a/crates/languages/src/cpp/imports.scm
+++ /dev/null
@@ -1,5 +0,0 @@
-(preproc_include
-    path: [
-        ((system_lib_string) @source @wildcard)
-        (string_literal (string_content) @source @wildcard)
-    ]) @import
diff --git a/crates/languages/src/cpp/indents.scm b/crates/languages/src/cpp/indents.scm
deleted file mode 100644
index d95dfe178c..0000000000
--- a/crates/languages/src/cpp/indents.scm
+++ /dev/null
@@ -1,19 +0,0 @@
-[
-    (field_expression)
-    (assignment_expression)
-    (if_statement)
-    (for_statement)
-    (while_statement)
-    (do_statement)
-    (else_clause)
-] @indent
-
-(_ "{" "}" @end) @indent
-(_ "(" ")" @end) @indent
-
-(if_statement) @start.if
-(for_statement) @start.for
-(while_statement) @start.while
-(do_statement) @start.do
-(switch_statement) @start.switch
-(else_clause) @start.else
diff --git a/crates/languages/src/cpp/injections.scm b/crates/languages/src/cpp/injections.scm
deleted file mode 100644
index a115a3bffd..0000000000
--- a/crates/languages/src/cpp/injections.scm
+++ /dev/null
@@ -1,16 +0,0 @@
-((comment) @injection.content
-  (#match? @injection.content "^(///|//!|/\\*\\*|/\\*!)(.*)")
-  (#set! injection.language "doxygen")
-  (#set! injection.include-children))
-
-(preproc_def
-    value: (preproc_arg) @injection.content
-    (#set! injection.language "c++"))
-
-(preproc_function_def
-    value: (preproc_arg) @injection.content
-    (#set! injection.language "c++"))
-
-(raw_string_literal
-  delimiter: (raw_string_delimiter) @injection.language
-  (raw_string_content) @injection.content)
diff --git a/crates/languages/src/cpp/outline.scm b/crates/languages/src/cpp/outline.scm
deleted file mode 100644
index c897366558..0000000000
--- a/crates/languages/src/cpp/outline.scm
+++ /dev/null
@@ -1,157 +0,0 @@
-(preproc_def
-    "#define" @context
-    name: (_) @name) @item
-
-(preproc_function_def
-    "#define" @context
-    name: (_) @name
-    parameters: (preproc_params
-        "(" @context
-        ")" @context)) @item
-
-(type_definition
-    "typedef" @context
-    declarator: (_) @name) @item
-
-(struct_specifier
-    "struct" @context
-    name: (_) @name) @item
-
-(class_specifier
-    "class" @context
-    name: (_) @name) @item
-
-(enum_specifier
-    "enum" @context
-    name: (_) @name) @item
-
-(enumerator
-    name: (_) @name) @item
-
-(concept_definition
-    "concept" @context
-    name: (_) @name) @item
-
-(declaration
-    (storage_class_specifier) @context
-    (type_qualifier)? @context
-    type: (_) @context
-    declarator: (init_declarator
-      declarator: (_) @name)) @item
-
-(function_definition
-    (type_qualifier)? @context
-    type: (_)? @context
-    declarator: [
-        (function_declarator
-            declarator: (_) @name
-            parameters: (parameter_list
-                "(" @context
-                ")" @context))
-        (pointer_declarator
-            "*" @context
-            declarator: (function_declarator
-                declarator: (_) @name
-                parameters: (parameter_list
-                    "(" @context
-                    ")" @context)))
-        (pointer_declarator
-            "*" @context
-            declarator: (pointer_declarator
-                "*" @context
-                declarator: (function_declarator
-                    declarator: (_) @name
-                    parameters: (parameter_list
-                        "(" @context
-                        ")" @context))))
-        (reference_declarator
-            ["&" "&&"] @context
-            (function_declarator
-                declarator: (_) @name
-                parameters: (parameter_list
-                    "(" @context
-                    ")" @context)))
-    ]
-    (type_qualifier)? @context) @item
-
-(declaration
-    (type_qualifier)? @context
-    type: (_)? @context
-    declarator: [
-        (field_identifier) @name
-        (pointer_declarator
-            "*" @context
-            declarator: (field_identifier) @name)
-        (function_declarator
-            declarator: (_) @name
-            parameters: (parameter_list
-                "(" @context
-                ")" @context))
-        (pointer_declarator
-            "*" @context
-            declarator: (function_declarator
-                declarator: (_) @name
-                parameters: (parameter_list
-                    "(" @context
-                    ")" @context)))
-        (pointer_declarator
-            "*" @context
-            declarator: (pointer_declarator
-                "*" @context
-                declarator: (function_declarator
-                    declarator: (_) @name
-                    parameters: (parameter_list
-                        "(" @context
-                        ")" @context))))
-        (reference_declarator
-            ["&" "&&"] @context
-            (function_declarator
-                declarator: (_) @name
-                parameters: (parameter_list
-                    "(" @context
-                    ")" @context)))
-    ]
-    (type_qualifier)? @context) @item
-
-(field_declaration
-    (type_qualifier)? @context
-    type: (_) @context
-    declarator: [
-        (field_identifier) @name
-        (pointer_declarator
-            "*" @context
-            declarator: (field_identifier) @name)
-        (function_declarator
-            declarator: (_) @name
-            parameters: (parameter_list
-                "(" @context
-                ")" @context))
-        (pointer_declarator
-            "*" @context
-            declarator: (function_declarator
-                declarator: (_) @name
-                parameters: (parameter_list
-                    "(" @context
-                    ")" @context)))
-        (pointer_declarator
-            "*" @context
-            declarator: (pointer_declarator
-                "*" @context
-                declarator: (function_declarator
-                    declarator: (_) @name
-                    parameters: (parameter_list
-                        "(" @context
-                        ")" @context))))
-        (reference_declarator
-            ["&" "&&"] @context
-            (function_declarator
-                declarator: (_) @name
-                parameters: (parameter_list
-                    "(" @context
-                    ")" @context)))
-    ; Fields declarations may define multiple fields, and so @item is on the
-    ; declarator so they each get distinct ranges.
-    ] @item
-    (type_qualifier)? @context)
-
-(comment) @annotation
diff --git a/crates/languages/src/cpp/overrides.scm b/crates/languages/src/cpp/overrides.scm
deleted file mode 100644
index 36473eb300..0000000000
--- a/crates/languages/src/cpp/overrides.scm
+++ /dev/null
@@ -1,2 +0,0 @@
-(comment) @comment.inclusive
-(string_literal) @string
diff --git a/crates/languages/src/cpp/textobjects.scm b/crates/languages/src/cpp/textobjects.scm
deleted file mode 100644
index 11a27b8d58..0000000000
--- a/crates/languages/src/cpp/textobjects.scm
+++ /dev/null
@@ -1,31 +0,0 @@
-(declaration
-    declarator: (function_declarator)) @function.around
-
-(function_definition
-    body: (_
-        "{"
-        (_)* @function.inside
-        "}" )) @function.around
-
-(preproc_function_def
-    value: (_) @function.inside) @function.around
-
-(comment) @comment.around
-
-(struct_specifier
-    body: (_
-        "{"
-        (_)* @class.inside
-        "}")) @class.around
-
-(enum_specifier
-    body: (_
-        "{"
-        [(_) ","?]* @class.inside
-        "}")) @class.around
-
-(class_specifier
-  body: (_
-      "{"
-      [(_) ":"? ";"?]* @class.inside
-      "}"?)) @class.around
diff --git a/crates/languages/src/css.rs b/crates/languages/src/css.rs
deleted file mode 100644
index 6a925586a6..0000000000
--- a/crates/languages/src/css.rs
+++ /dev/null
@@ -1,246 +0,0 @@
-use anyhow::Result;
-use async_trait::async_trait;
-use gpui::AsyncApp;
-use language::{LspAdapter, LspAdapterDelegate, LspInstaller, Toolchain};
-use lsp::{LanguageServerBinary, LanguageServerName, Uri};
-use node_runtime::{NodeRuntime, VersionStrategy};
-use project::lsp_store::language_server_settings;
-use serde_json::json;
-use std::{
-    ffi::OsString,
-    path::{Path, PathBuf},
-    sync::Arc,
-};
-use util::{ResultExt, maybe, merge_json_value_into};
-
-const SERVER_PATH: &str =
-    "node_modules/vscode-langservers-extracted/bin/vscode-css-language-server";
-
-fn server_binary_arguments(server_path: &Path) -> Vec<OsString> {
-    vec![server_path.into(), "--stdio".into()]
-}
-
-pub struct CssLspAdapter {
-    node: NodeRuntime,
-}
-
-impl CssLspAdapter {
-    const PACKAGE_NAME: &str = "vscode-langservers-extracted";
-    pub fn new(node: NodeRuntime) -> Self {
-        CssLspAdapter { node }
-    }
-}
-
-impl LspInstaller for CssLspAdapter {
-    type BinaryVersion = String;
-
-    async fn fetch_latest_server_version(
-        &self,
-        _: &dyn LspAdapterDelegate,
-        _: bool,
-        _: &mut AsyncApp,
-    ) -> Result<String> {
-        self.node
-            .npm_package_latest_version("vscode-langservers-extracted")
-            .await
-    }
-
-    async fn check_if_user_installed(
-        &self,
-        delegate: &dyn LspAdapterDelegate,
-        _: Option<Toolchain>,
-        _: &AsyncApp,
-    ) -> Option<LanguageServerBinary> {
-        let path = delegate
-            .which("vscode-css-language-server".as_ref())
-            .await?;
-        let env = delegate.shell_env().await;
-
-        Some(LanguageServerBinary {
-            path,
-            env: Some(env),
-            arguments: vec!["--stdio".into()],
-        })
-    }
-
-    async fn fetch_server_binary(
-        &self,
-        latest_version: String,
-        container_dir: PathBuf,
-        _: &dyn LspAdapterDelegate,
-    ) -> Result<LanguageServerBinary> {
-        let server_path = container_dir.join(SERVER_PATH);
-
-        self.node
-            .npm_install_packages(
-                &container_dir,
-                &[(Self::PACKAGE_NAME, latest_version.as_str())],
-            )
-            .await?;
-
-        Ok(LanguageServerBinary {
-            path: self.node.binary_path().await?,
-            env: None,
-            arguments: server_binary_arguments(&server_path),
-        })
-    }
-
-    async fn check_if_version_installed(
-        &self,
-        version: &String,
-        container_dir: &PathBuf,
-        _: &dyn LspAdapterDelegate,
-    ) -> Option<LanguageServerBinary> {
-        let server_path = container_dir.join(SERVER_PATH);
-
-        let should_install_language_server = self
-            .node
-            .should_install_npm_package(
-                Self::PACKAGE_NAME,
-                &server_path,
-                container_dir,
-                VersionStrategy::Latest(version),
-            )
-            .await;
-
-        if should_install_language_server {
-            None
-        } else {
-            Some(LanguageServerBinary {
-                path: self.node.binary_path().await.ok()?,
-                env: None,
-                arguments: server_binary_arguments(&server_path),
-            })
-        }
-    }
-
-    async fn cached_server_binary(
-        &self,
-        container_dir: PathBuf,
-        _: &dyn LspAdapterDelegate,
-    ) -> Option<LanguageServerBinary> {
-        get_cached_server_binary(container_dir, &self.node).await
-    }
-}
-
-#[async_trait(?Send)]
-impl LspAdapter for CssLspAdapter {
-    fn name(&self) -> LanguageServerName {
-        LanguageServerName("vscode-css-language-server".into())
-    }
-
-    async fn initialization_options(
-        self: Arc<Self>,
-        _: &Arc<dyn LspAdapterDelegate>,
-    ) -> Result<Option<serde_json::Value>> {
-        Ok(Some(json!({
-            "provideFormatter": true
-        })))
-    }
-
-    async fn workspace_configuration(
-        self: Arc<Self>,
-        delegate: &Arc<dyn LspAdapterDelegate>,
-        _: Option<Toolchain>,
-        _: Option<Uri>,
-        cx: &mut AsyncApp,
-    ) -> Result<serde_json::Value> {
-        let mut default_config = json!({
-            "css": {
-                "lint": {}
-            },
-            "less": {
-                "lint": {}
-            },
-            "scss": {
-                "lint": {}
-            }
-        });
-
-        let project_options = cx.update(|cx| {
-            language_server_settings(delegate.as_ref(), &self.name(), cx)
-                .and_then(|s| s.settings.clone())
-        })?;
-
-        if let Some(override_options) = project_options {
-            merge_json_value_into(override_options, &mut default_config);
-        }
-
-        Ok(default_config)
-    }
-}
-
-async fn get_cached_server_binary(
-    container_dir: PathBuf,
-    node: &NodeRuntime,
-) -> Option<LanguageServerBinary> {
-    maybe!(async {
-        let server_path = container_dir.join(SERVER_PATH);
-        anyhow::ensure!(
-            server_path.exists(),
-            "missing executable in directory {server_path:?}"
-        );
-        Ok(LanguageServerBinary {
-            path: node.binary_path().await?,
-            env: None,
-            arguments: server_binary_arguments(&server_path),
-        })
-    })
-    .await
-    .log_err()
-}
-
-#[cfg(test)]
-mod tests {
-    use gpui::{AppContext as _, TestAppContext};
-    use unindent::Unindent;
-
-    #[gpui::test]
-    async fn test_outline(cx: &mut TestAppContext) {
-        let language = crate::language("css", tree_sitter_css::LANGUAGE.into());
-
-        let text = r#"
-            /* Import statement */
-            @import './fonts.css';
-
-            /* multiline list of selectors with nesting */
-            .test-class,
-            div {
-                .nested-class {
-                    color: red;
-                }
-            }
-
-            /* descendant selectors */
-            .test .descendant {}
-
-            /* pseudo */
-            .test:not(:hover) {}
-
-            /* media queries */
-            @media screen and (min-width: 3000px) {
-                .desktop-class {}
-            }
-        "#
-        .unindent();
-
-        let buffer = cx.new(|cx| language::Buffer::local(text, cx).with_language(language, cx));
-        let outline = buffer.read_with(cx, |buffer, _| buffer.snapshot().outline(None));
-        assert_eq!(
-            outline
-                .items
-                .iter()
-                .map(|item| (item.text.as_str(), item.depth))
-                .collect::<Vec<_>>(),
-            &[
-                ("@import './fonts.css'", 0),
-                (".test-class, div", 0),
-                (".nested-class", 1),
-                (".test .descendant", 0),
-                (".test:not(:hover)", 0),
-                ("@media screen and (min-width: 3000px)", 0),
-                (".desktop-class", 1),
-            ]
-        );
-    }
-}
diff --git a/crates/languages/src/css/brackets.scm b/crates/languages/src/css/brackets.scm
deleted file mode 100644
index 2149bddc6c..0000000000
--- a/crates/languages/src/css/brackets.scm
+++ /dev/null
@@ -1,5 +0,0 @@
-("(" @open ")" @close)
-("[" @open "]" @close)
-("{" @open "}" @close)
-(("\"" @open "\"" @close) (#set! rainbow.exclude))
-(("'" @open "'" @close) (#set! rainbow.exclude))
diff --git a/crates/languages/src/css/config.toml b/crates/languages/src/css/config.toml
deleted file mode 100644
index a2ca96e76d..0000000000
--- a/crates/languages/src/css/config.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-name = "CSS"
-grammar = "css"
-path_suffixes = ["css", "postcss", "pcss"]
-autoclose_before = ";:.,=}])>"
-brackets = [
-    { start = "{", end = "}", close = true, newline = true },
-    { start = "[", end = "]", close = true, newline = true },
-    { start = "(", end = ")", close = true, newline = true },
-    { start = "\"", end = "\"", close = true, newline = false, not_in = ["string", "comment"] },
-    { start = "'", end = "'", close = true, newline = false, not_in = ["string", "comment"] },
-]
-completion_query_characters = ["-"]
-block_comment = { start = "/*", prefix = "* ", end = "*/", tab_size = 1 }
-prettier_parser_name = "css"
diff --git a/crates/languages/src/css/highlights.scm b/crates/languages/src/css/highlights.scm
deleted file mode 100644
index 8fbb9f47d2..0000000000
--- a/crates/languages/src/css/highlights.scm
+++ /dev/null
@@ -1,109 +0,0 @@
-(comment) @comment
-
-[
-  (tag_name)
-  (nesting_selector)
-  (universal_selector)
-] @tag
-
-[
-  "~"
-  ">"
-  "+"
-  "-"
-  "|"
-  "*"
-  "/"
-  "="
-  "^="
-  "|="
-  "~="
-  "$="
-  "*="
-] @operator
-
-[
-  "and"
-  "or"
-  "not"
-  "only"
-] @keyword.operator
-
-(id_name) @selector.id
-(class_name) @selector.class
-
-(namespace_name) @namespace
-(namespace_selector (tag_name) @namespace "|")
-
-(attribute_name) @attribute
-(pseudo_element_selector "::" (tag_name) @selector.pseudo)
-(pseudo_class_selector ":" (class_name) @selector.pseudo)
-
-[
-  (feature_name)
-  (property_name)
-] @property
-
-(function_name) @function
-
-[
-  (plain_value)
-  (keyframes_name)
-  (keyword_query)
-] @constant.builtin
-
-(attribute_selector
-  (plain_value) @string)
-
-(parenthesized_query
-  (keyword_query) @property)
-
-(
-  [
-    (property_name)
-    (plain_value)
-  ] @variable
-  (#match? @variable "^--")
-)
-
-[
-  "@media"
-  "@import"
-  "@charset"
-  "@namespace"
-  "@supports"
-  "@keyframes"
-  (at_keyword)
-  (to)
-  (from)
-  (important)
-] @keyword
-
-(string_value) @string
-(color_value) @string.special
-
-[
-  (integer_value)
-  (float_value)
-] @number
-
-(unit) @type.unit
-
-[
-  ","
-  ":"
-  "."
-  "::"
-  ";"
-] @punctuation.delimiter
-
-(id_selector "#" @punctuation.delimiter)
-
-[
-  "{"
-  ")"
-  "("
-  "}"
-  "["
-  "]"
-] @punctuation.bracket
diff --git a/crates/languages/src/css/indents.scm b/crates/languages/src/css/indents.scm
deleted file mode 100644
index e975469092..0000000000
--- a/crates/languages/src/css/indents.scm
+++ /dev/null
@@ -1 +0,0 @@
-(_ "{" "}" @end) @indent
diff --git a/crates/languages/src/css/injections.scm b/crates/languages/src/css/injections.scm
deleted file mode 100644
index 9117c713b9..0000000000
--- a/crates/languages/src/css/injections.scm
+++ /dev/null
@@ -1,3 +0,0 @@
-((comment) @injection.content
- (#set! injection.language "comment")
-)
diff --git a/crates/languages/src/css/outline.scm b/crates/languages/src/css/outline.scm
deleted file mode 100644
index 645616f905..0000000000
--- a/crates/languages/src/css/outline.scm
+++ /dev/null
@@ -1,18 +0,0 @@
-(stylesheet
-    (import_statement
-        "@import" @context
-        ((string_value) @name)) @item)
-
-
-(rule_set
-    (selectors
-      .
-      (_) @name
-      ("," @name (_) @name)*
-    )) @item
-
-(media_statement
-    "@media" @context
-    (_) @name
-    (block)
-) @item
diff --git a/crates/languages/src/css/overrides.scm b/crates/languages/src/css/overrides.scm
deleted file mode 100644
index e5eade4797..0000000000
--- a/crates/languages/src/css/overrides.scm
+++ /dev/null
@@ -1,2 +0,0 @@
-(comment) @comment.inclusive
-(string_value) @string
diff --git a/crates/languages/src/css/textobjects.scm b/crates/languages/src/css/textobjects.scm
deleted file mode 100644
index c9c6207b85..0000000000
--- a/crates/languages/src/css/textobjects.scm
+++ /dev/null
@@ -1,30 +0,0 @@
-(comment) @comment.around
-
-(rule_set
-    (block (
-        "{"
-        (_)* @function.inside
-        "}" ))) @function.around
-(keyframe_block
-    (block (
-        "{"
-        (_)* @function.inside
-        "}" ))) @function.around
-
-(media_statement
-    (block (
-        "{"
-        (_)* @class.inside
-        "}" ))) @class.around
-
-(supports_statement
-    (block (
-        "{"
-        (_)* @class.inside
-        "}" ))) @class.around
-
-(keyframes_statement
-    (keyframe_block_list (
-        "{"
-        (_)* @class.inside
-        "}" ))) @class.around
diff --git a/crates/languages/src/diff/config.toml b/crates/languages/src/diff/config.toml
deleted file mode 100644
index e8cc71c936..0000000000
--- a/crates/languages/src/diff/config.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-name = "Diff"
-grammar = "diff"
-path_suffixes = ["diff", "patch"]
-brackets = []
diff --git a/crates/languages/src/diff/highlights.scm b/crates/languages/src/diff/highlights.scm
deleted file mode 100644
index 4a34438903..0000000000
--- a/crates/languages/src/diff/highlights.scm
+++ /dev/null
@@ -1,48 +0,0 @@
-(comment) @comment
-
-[
-  (addition)
-  (new_file)
-] @string
-;; TODO: This should eventually be `@diff.plus` with a fallback of `@string`
-
-[
-  (deletion)
-  (old_file)
-] @keyword
-;; TODO: This should eventually be `@diff.minus` with a fallback of `@keyword`
-
-(commit) @constant
-
-(location) @attribute
-
-(command
-  "diff" @function
-  (argument) @variable.parameter)
-
-(mode) @number
-
-([
-  ".."
-  "+"
-  "++"
-  "+++"
-  "++++"
-  "-"
-  "--"
-  "---"
-  "----"
-] @punctuation.special)
-
-[
-  (binary_change)
-  (similarity)
-  (file_change)
-] @label
-
-(index
-  "index" @keyword)
-
-(similarity
-  (score) @number
-  "%" @number)
diff --git a/crates/languages/src/diff/injections.scm b/crates/languages/src/diff/injections.scm
deleted file mode 100644
index 01e833d1e3..0000000000
--- a/crates/languages/src/diff/injections.scm
+++ /dev/null
@@ -1,2 +0,0 @@
-((comment) @injection.content
-    (#set! injection.language "comment"))
diff --git a/crates/languages/src/eslint.rs b/crates/languages/src/eslint.rs
deleted file mode 100644
index fd4133d7eb..0000000000
--- a/crates/languages/src/eslint.rs
+++ /dev/null
@@ -1,772 +0,0 @@
-use anyhow::{Context as _, Result};
-use async_trait::async_trait;
-use gpui::AsyncApp;
-use http_client::{
-    github::{AssetKind, GitHubLspBinaryVersion, build_asset_url},
-    github_download::download_server_binary,
-};
-use language::{LspAdapter, LspAdapterDelegate, LspInstaller, Toolchain};
-use lsp::{CodeActionKind, LanguageServerBinary, LanguageServerName, Uri};
-use node_runtime::NodeRuntime;
-use project::lsp_store::language_server_settings_for;
-use serde::{Deserialize, Serialize};
-use serde_json::{Value, json};
-use settings::SettingsLocation;
-use smol::{fs, stream::StreamExt};
-use std::{
-    ffi::OsString,
-    path::{Path, PathBuf},
-    sync::Arc,
-};
-use util::merge_json_value_into;
-use util::{fs::remove_matching, rel_path::RelPath};
-
-fn eslint_server_binary_arguments(server_path: &Path) -> Vec<OsString> {
-    vec![
-        "--max-old-space-size=8192".into(),
-        server_path.into(),
-        "--stdio".into(),
-    ]
-}
-
-pub struct EsLintLspAdapter {
-    node: NodeRuntime,
-}
-
-impl EsLintLspAdapter {
-    const CURRENT_VERSION: &'static str = "2.4.4";
-    const CURRENT_VERSION_TAG_NAME: &'static str = "release/2.4.4";
-
-    #[cfg(not(windows))]
-    const GITHUB_ASSET_KIND: AssetKind = AssetKind::TarGz;
-    #[cfg(windows)]
-    const GITHUB_ASSET_KIND: AssetKind = AssetKind::Zip;
-
-    const SERVER_PATH: &'static str = "vscode-eslint/server/out/eslintServer.js";
-    const SERVER_NAME: LanguageServerName = LanguageServerName::new_static("eslint");
-
-    const FLAT_CONFIG_FILE_NAMES: &'static [&'static str] = &[
-        "eslint.config.js",
-        "eslint.config.mjs",
-        "eslint.config.cjs",
-        "eslint.config.ts",
-        "eslint.config.cts",
-        "eslint.config.mts",
-    ];
-
-    pub fn new(node: NodeRuntime) -> Self {
-        EsLintLspAdapter { node }
-    }
-
-    fn build_destination_path(container_dir: &Path) -> PathBuf {
-        container_dir.join(format!("vscode-eslint-{}", Self::CURRENT_VERSION))
-    }
-}
-
-impl LspInstaller for EsLintLspAdapter {
-    type BinaryVersion = GitHubLspBinaryVersion;
-
-    async fn fetch_latest_server_version(
-        &self,
-        _delegate: &dyn LspAdapterDelegate,
-        _: bool,
-        _: &mut AsyncApp,
-    ) -> Result<GitHubLspBinaryVersion> {
-        let url = build_asset_url(
-            "zed-industries/vscode-eslint",
-            Self::CURRENT_VERSION_TAG_NAME,
-            Self::GITHUB_ASSET_KIND,
-        )?;
-
-        Ok(GitHubLspBinaryVersion {
-            name: Self::CURRENT_VERSION.into(),
-            digest: None,
-            url,
-        })
-    }
-
-    async fn fetch_server_binary(
-        &self,
-        version: GitHubLspBinaryVersion,
-        container_dir: PathBuf,
-        delegate: &dyn LspAdapterDelegate,
-    ) -> Result<LanguageServerBinary> {
-        let destination_path = Self::build_destination_path(&container_dir);
-        let server_path = destination_path.join(Self::SERVER_PATH);
-
-        if fs::metadata(&server_path).await.is_err() {
-            remove_matching(&container_dir, |_| true).await;
-
-            download_server_binary(
-                &*delegate.http_client(),
-                &version.url,
-                None,
-                &destination_path,
-                Self::GITHUB_ASSET_KIND,
-            )
-            .await?;
-
-            let mut dir = fs::read_dir(&destination_path).await?;
-            let first = dir.next().await.context("missing first file")??;
-            let repo_root = destination_path.join("vscode-eslint");
-            fs::rename(first.path(), &repo_root).await?;
-
-            #[cfg(target_os = "windows")]
-            {
-                handle_symlink(
-                    repo_root.join("$shared"),
-                    repo_root.join("client").join("src").join("shared"),
-                )
-                .await?;
-                handle_symlink(
-                    repo_root.join("$shared"),
-                    repo_root.join("server").join("src").join("shared"),
-                )
-                .await?;
-            }
-
-            self.node
-                .run_npm_subcommand(Some(&repo_root), "install", &[])
-                .await?;
-
-            self.node
-                .run_npm_subcommand(Some(&repo_root), "run-script", &["compile"])
-                .await?;
-        }
-
-        Ok(LanguageServerBinary {
-            path: self.node.binary_path().await?,
-            env: None,
-            arguments: eslint_server_binary_arguments(&server_path),
-        })
-    }
-
-    async fn cached_server_binary(
-        &self,
-        container_dir: PathBuf,
-        _: &dyn LspAdapterDelegate,
-    ) -> Option<LanguageServerBinary> {
-        let server_path =
-            Self::build_destination_path(&container_dir).join(EsLintLspAdapter::SERVER_PATH);
-        Some(LanguageServerBinary {
-            path: self.node.binary_path().await.ok()?,
-            env: None,
-            arguments: eslint_server_binary_arguments(&server_path),
-        })
-    }
-}
-
-#[async_trait(?Send)]
-impl LspAdapter for EsLintLspAdapter {
-    fn code_action_kinds(&self) -> Option<Vec<CodeActionKind>> {
-        Some(vec![
-            CodeActionKind::QUICKFIX,
-            CodeActionKind::new("source.fixAll.eslint"),
-        ])
-    }
-
-    async fn workspace_configuration(
-        self: Arc<Self>,
-        delegate: &Arc<dyn LspAdapterDelegate>,
-        _: Option<Toolchain>,
-        requested_uri: Option<Uri>,
-        cx: &mut AsyncApp,
-    ) -> Result<Value> {
-        let worktree_root = delegate.worktree_root_path();
-        let use_flat_config = Self::FLAT_CONFIG_FILE_NAMES
-            .iter()
-            .any(|file| worktree_root.join(file).is_file());
-
-        let mut default_workspace_configuration = json!({
-            "validate": "on",
-            "rulesCustomizations": [],
-            "run": "onType",
-            "nodePath": null,
-            "workingDirectory": {
-                "mode": "auto"
-            },
-            "workspaceFolder": {
-                "uri": worktree_root,
-                "name": worktree_root.file_name()
-                    .unwrap_or(worktree_root.as_os_str())
-                    .to_string_lossy(),
-            },
-            "problems": {},
-            "codeActionOnSave": {
-                // We enable this, but without also configuring code_actions_on_format
-                // in the Zed configuration, it doesn't have an effect.
-                "enable": true,
-            },
-            "codeAction": {
-                "disableRuleComment": {
-                    "enable": true,
-                    "location": "separateLine",
-                },
-                "showDocumentation": {
-                    "enable": true
-                }
-            },
-            "experimental": {
-                "useFlatConfig": use_flat_config,
-            }
-        });
-
-        let file_path = requested_uri
-            .as_ref()
-            .and_then(|uri| {
-                (uri.scheme() == "file")
-                    .then(|| uri.to_file_path().ok())
-                    .flatten()
-            })
-            .and_then(|abs_path| {
-                abs_path
-                    .strip_prefix(&worktree_root)
-                    .ok()
-                    .map(ToOwned::to_owned)
-            });
-        let file_path = file_path
-            .and_then(|p| RelPath::unix(&p).ok().map(ToOwned::to_owned))
-            .unwrap_or_else(|| RelPath::empty().to_owned());
-        let override_options = cx.update(|cx| {
-            language_server_settings_for(
-                SettingsLocation {
-                    worktree_id: delegate.worktree_id(),
-                    path: &file_path,
-                },
-                &Self::SERVER_NAME,
-                cx,
-            )
-            .and_then(|s| s.settings.clone())
-        })?;
-
-        if let Some(override_options) = override_options {
-            let working_directories = override_options.get("workingDirectories").and_then(|wd| {
-                serde_json::from_value::<WorkingDirectories>(wd.clone())
-                    .ok()
-                    .and_then(|wd| wd.0)
-            });
-
-            merge_json_value_into(override_options, &mut default_workspace_configuration);
-
-            let working_directory = working_directories
-                .zip(requested_uri)
-                .and_then(|(wd, uri)| {
-                    determine_working_directory(uri, wd, worktree_root.to_owned())
-                });
-
-            if let Some(working_directory) = working_directory
-                && let Some(wd) = default_workspace_configuration.get_mut("workingDirectory")
-            {
-                *wd = serde_json::to_value(working_directory)?;
-            }
-        }
-
-        Ok(json!({
-            "": default_workspace_configuration
-        }))
-    }
-
-    fn name(&self) -> LanguageServerName {
-        Self::SERVER_NAME
-    }
-}
-
-/// On Windows, converts Unix-style separators (/) to Windows-style (\).
-/// On Unix, returns the path unchanged
-fn normalize_path_separators(path: &str) -> String {
-    #[cfg(windows)]
-    {
-        path.replace('/', "\\")
-    }
-    #[cfg(not(windows))]
-    {
-        path.to_string()
-    }
-}
-
-fn determine_working_directory(
-    uri: Uri,
-    working_directories: Vec<WorkingDirectory>,
-    workspace_folder_path: PathBuf,
-) -> Option<ResultWorkingDirectory> {
-    let mut working_directory = None;
-
-    for item in working_directories {
-        let mut directory: Option<String> = None;
-        let mut pattern: Option<String> = None;
-        let mut no_cwd = false;
-        match item {
-            WorkingDirectory::String(contents) => {
-                directory = Some(normalize_path_separators(&contents));
-            }
-            WorkingDirectory::LegacyDirectoryItem(legacy_directory_item) => {
-                directory = Some(normalize_path_separators(&legacy_directory_item.directory));
-                no_cwd = !legacy_directory_item.change_process_cwd;
-            }
-            WorkingDirectory::DirectoryItem(directory_item) => {
-                directory = Some(normalize_path_separators(&directory_item.directory));
-                if let Some(not_cwd) = directory_item.not_cwd {
-                    no_cwd = not_cwd;
-                }
-            }
-            WorkingDirectory::PatternItem(pattern_item) => {
-                pattern = Some(normalize_path_separators(&pattern_item.pattern));
-                if let Some(not_cwd) = pattern_item.not_cwd {
-                    no_cwd = not_cwd;
-                }
-            }
-            WorkingDirectory::ModeItem(mode_item) => {
-                working_directory = Some(ResultWorkingDirectory::ModeItem(mode_item));
-                continue;
-            }
-        }
-
-        let mut item_value: Option<String> = None;
-        if directory.is_some() || pattern.is_some() {
-            let file_path: Option<PathBuf> = (uri.scheme() == "file")
-                .then(|| uri.to_file_path().ok())
-                .flatten();
-            if let Some(file_path) = file_path {
-                if let Some(mut directory) = directory {
-                    if Path::new(&directory).is_relative() {
-                        directory = workspace_folder_path
-                            .join(directory)
-                            .to_string_lossy()
-                            .to_string();
-                    }
-                    if !directory.ends_with(std::path::MAIN_SEPARATOR) {
-                        directory.push(std::path::MAIN_SEPARATOR);
-                    }
-                    if file_path.starts_with(&directory) {
-                        item_value = Some(directory);
-                    }
-                } else if let Some(mut pattern) = pattern
-                    && !pattern.is_empty()
-                {
-                    if Path::new(&pattern).is_relative() {
-                        pattern = workspace_folder_path
-                            .join(pattern)
-                            .to_string_lossy()
-                            .to_string();
-                    }
-                    if !pattern.ends_with(std::path::MAIN_SEPARATOR) {
-                        pattern.push(std::path::MAIN_SEPARATOR);
-                    }
-                    if let Some(matched) = match_glob_pattern(&pattern, &file_path) {
-                        item_value = Some(matched);
-                    }
-                }
-            }
-        }
-        if let Some(item_value) = item_value {
-            if working_directory
-                .as_ref()
-                .is_none_or(|wd| matches!(wd, ResultWorkingDirectory::ModeItem(_)))
-            {
-                working_directory = Some(ResultWorkingDirectory::DirectoryItem(DirectoryItem {
-                    directory: item_value,
-                    not_cwd: Some(no_cwd),
-                }));
-            } else if let Some(ResultWorkingDirectory::DirectoryItem(item)) = &mut working_directory
-                && item.directory.len() < item_value.len()
-            {
-                item.directory = item_value;
-                item.not_cwd = Some(no_cwd);
-            }
-        }
-    }
-
-    working_directory
-}
-
-fn match_glob_pattern(pattern: &str, file_path: &Path) -> Option<String> {
-    use globset::GlobBuilder;
-
-    let glob = GlobBuilder::new(pattern)
-        .literal_separator(true)
-        .build()
-        .ok()?
-        .compile_matcher();
-
-    let mut current = file_path.to_path_buf();
-    let mut matched: Option<String> = None;
-
-    while let Some(parent) = current.parent() {
-        let mut prefix = parent.to_string_lossy().to_string();
-        if !prefix.ends_with(std::path::MAIN_SEPARATOR) {
-            prefix.push(std::path::MAIN_SEPARATOR);
-        }
-        if glob.is_match(&prefix) {
-            matched = Some(prefix);
-        }
-        current = parent.to_path_buf();
-    }
-
-    matched
-}
-
-#[cfg(target_os = "windows")]
-async fn handle_symlink(src_dir: PathBuf, dest_dir: PathBuf) -> Result<()> {
-    anyhow::ensure!(
-        fs::metadata(&src_dir).await.is_ok(),
-        "Directory {src_dir:?} is not present"
-    );
-    if fs::metadata(&dest_dir).await.is_ok() {
-        fs::remove_file(&dest_dir).await?;
-    }
-    fs::create_dir_all(&dest_dir).await?;
-    let mut entries = fs::read_dir(&src_dir).await?;
-    while let Some(entry) = entries.try_next().await? {
-        let entry_path = entry.path();
-        let entry_name = entry.file_name();
-        let dest_path = dest_dir.join(&entry_name);
-        fs::copy(&entry_path, &dest_path).await?;
-    }
-    Ok(())
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-struct LegacyDirectoryItem {
-    directory: String,
-    #[serde(rename = "changeProcessCWD")]
-    change_process_cwd: bool,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-struct DirectoryItem {
-    directory: String,
-    #[serde(rename = "!cwd")]
-    not_cwd: Option<bool>,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-struct PatternItem {
-    pattern: String,
-    #[serde(rename = "!cwd")]
-    not_cwd: Option<bool>,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-struct ModeItem {
-    mode: ModeEnum,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-#[serde(rename_all = "lowercase")]
-enum ModeEnum {
-    Auto,
-    Location,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-#[serde(untagged)]
-enum WorkingDirectory {
-    String(String),
-    LegacyDirectoryItem(LegacyDirectoryItem),
-    DirectoryItem(DirectoryItem),
-    PatternItem(PatternItem),
-    ModeItem(ModeItem),
-}
-#[derive(Serialize, Deserialize)]
-struct WorkingDirectories(Option<Vec<WorkingDirectory>>);
-
-#[derive(Serialize, Deserialize, Debug)]
-#[serde(untagged)]
-enum ResultWorkingDirectory {
-    ModeItem(ModeItem),
-    DirectoryItem(DirectoryItem),
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    mod glob_patterns {
-        use super::*;
-
-        #[test]
-        fn test_match_glob_pattern() {
-            let pattern = unix_path_to_platform("/test/*/");
-            let file_path = PathBuf::from(unix_path_to_platform("/test/foo/bar/file.txt"));
-            let matched = match_glob_pattern(&pattern, &file_path);
-            assert_eq!(matched, Some(unix_path_to_platform("/test/foo/")));
-        }
-
-        #[test]
-        fn test_match_glob_pattern_globstar() {
-            let pattern = unix_path_to_platform("/workspace/**/src/");
-            let file_path = PathBuf::from(unix_path_to_platform(
-                "/workspace/packages/core/src/index.ts",
-            ));
-            let matched = match_glob_pattern(&pattern, &file_path);
-            assert_eq!(
-                matched,
-                Some(unix_path_to_platform("/workspace/packages/core/src/"))
-            );
-        }
-
-        #[test]
-        fn test_match_glob_pattern_no_match() {
-            let pattern = unix_path_to_platform("/other/*/");
-            let file_path = PathBuf::from(unix_path_to_platform("/test/foo/bar/file.txt"));
-            let matched = match_glob_pattern(&pattern, &file_path);
-            assert_eq!(matched, None);
-        }
-    }
-
-    mod unix_style_paths {
-        use super::*;
-
-        #[test]
-        fn test_working_directory_string() {
-            let uri = make_uri("/workspace/packages/foo/src/file.ts");
-            let working_directories = vec![WorkingDirectory::String("packages/foo".to_string())];
-            let workspace_folder = PathBuf::from(unix_path_to_platform("/workspace"));
-
-            let result = determine_working_directory(uri, working_directories, workspace_folder);
-            assert_directory_result(
-                result,
-                &unix_path_to_platform("/workspace/packages/foo/"),
-                false,
-            );
-        }
-
-        #[test]
-        fn test_working_directory_absolute_path() {
-            let uri = make_uri("/workspace/packages/foo/src/file.ts");
-            let working_directories = vec![WorkingDirectory::String(unix_path_to_platform(
-                "/workspace/packages/foo",
-            ))];
-            let workspace_folder = PathBuf::from(unix_path_to_platform("/workspace"));
-
-            let result = determine_working_directory(uri, working_directories, workspace_folder);
-            assert_directory_result(
-                result,
-                &unix_path_to_platform("/workspace/packages/foo/"),
-                false,
-            );
-        }
-
-        #[test]
-        fn test_working_directory_directory_item() {
-            let uri = make_uri("/workspace/packages/foo/src/file.ts");
-            let working_directories = vec![WorkingDirectory::DirectoryItem(DirectoryItem {
-                directory: "packages/foo".to_string(),
-                not_cwd: Some(true),
-            })];
-            let workspace_folder = PathBuf::from(unix_path_to_platform("/workspace"));
-
-            let result = determine_working_directory(uri, working_directories, workspace_folder);
-            assert_directory_result(
-                result,
-                &unix_path_to_platform("/workspace/packages/foo/"),
-                true,
-            );
-        }
-
-        #[test]
-        fn test_working_directory_legacy_item() {
-            let uri = make_uri("/workspace/packages/foo/src/file.ts");
-            let working_directories =
-                vec![WorkingDirectory::LegacyDirectoryItem(LegacyDirectoryItem {
-                    directory: "packages/foo".to_string(),
-                    change_process_cwd: false,
-                })];
-            let workspace_folder = PathBuf::from(unix_path_to_platform("/workspace"));
-
-            let result = determine_working_directory(uri, working_directories, workspace_folder);
-            assert_directory_result(
-                result,
-                &unix_path_to_platform("/workspace/packages/foo/"),
-                true,
-            );
-        }
-
-        #[test]
-        fn test_working_directory_pattern_item() {
-            let uri = make_uri("/workspace/packages/foo/src/file.ts");
-            let working_directories = vec![WorkingDirectory::PatternItem(PatternItem {
-                pattern: "packages/*/".to_string(),
-                not_cwd: Some(false),
-            })];
-            let workspace_folder = PathBuf::from(unix_path_to_platform("/workspace"));
-
-            let result = determine_working_directory(uri, working_directories, workspace_folder);
-            assert_directory_result(
-                result,
-                &unix_path_to_platform("/workspace/packages/foo/"),
-                false,
-            );
-        }
-
-        #[test]
-        fn test_working_directory_multiple_patterns() {
-            let uri = make_uri("/workspace/apps/web/src/file.ts");
-            let working_directories = vec![
-                WorkingDirectory::PatternItem(PatternItem {
-                    pattern: "packages/*/".to_string(),
-                    not_cwd: None,
-                }),
-                WorkingDirectory::PatternItem(PatternItem {
-                    pattern: "apps/*/".to_string(),
-                    not_cwd: None,
-                }),
-            ];
-            let workspace_folder = PathBuf::from(unix_path_to_platform("/workspace"));
-
-            let result = determine_working_directory(uri, working_directories, workspace_folder);
-            assert_directory_result(
-                result,
-                &unix_path_to_platform("/workspace/apps/web/"),
-                false,
-            );
-        }
-    }
-
-    #[cfg(windows)]
-    mod windows_style_paths {
-        use super::*;
-
-        #[test]
-        fn test_working_directory_string() {
-            let uri = make_uri("/workspace/packages/foo/src/file.ts");
-            let working_directories = vec![WorkingDirectory::String("packages\\foo".to_string())];
-            let workspace_folder = PathBuf::from(unix_path_to_platform("/workspace"));
-
-            let result = determine_working_directory(uri, working_directories, workspace_folder);
-            assert_directory_result(
-                result,
-                &unix_path_to_platform("/workspace/packages/foo/"),
-                false,
-            );
-        }
-
-        #[test]
-        fn test_working_directory_absolute_path() {
-            let uri = make_uri("/workspace/packages/foo/src/file.ts");
-            let working_directories = vec![WorkingDirectory::String(
-                unix_path_to_platform("/workspace/packages/foo").replace('/', "\\"),
-            )];
-            let workspace_folder = PathBuf::from(unix_path_to_platform("/workspace"));
-
-            let result = determine_working_directory(uri, working_directories, workspace_folder);
-            assert_directory_result(
-                result,
-                &unix_path_to_platform("/workspace/packages/foo/"),
-                false,
-            );
-        }
-
-        #[test]
-        fn test_working_directory_directory_item() {
-            let uri = make_uri("/workspace/packages/foo/src/file.ts");
-            let working_directories = vec![WorkingDirectory::DirectoryItem(DirectoryItem {
-                directory: "packages\\foo".to_string(),
-                not_cwd: Some(true),
-            })];
-            let workspace_folder = PathBuf::from(unix_path_to_platform("/workspace"));
-
-            let result = determine_working_directory(uri, working_directories, workspace_folder);
-            assert_directory_result(
-                result,
-                &unix_path_to_platform("/workspace/packages/foo/"),
-                true,
-            );
-        }
-
-        #[test]
-        fn test_working_directory_legacy_item() {
-            let uri = make_uri("/workspace/packages/foo/src/file.ts");
-            let working_directories =
-                vec![WorkingDirectory::LegacyDirectoryItem(LegacyDirectoryItem {
-                    directory: "packages\\foo".to_string(),
-                    change_process_cwd: false,
-                })];
-            let workspace_folder = PathBuf::from(unix_path_to_platform("/workspace"));
-
-            let result = determine_working_directory(uri, working_directories, workspace_folder);
-            assert_directory_result(
-                result,
-                &unix_path_to_platform("/workspace/packages/foo/"),
-                true,
-            );
-        }
-
-        #[test]
-        fn test_working_directory_pattern_item() {
-            let uri = make_uri("/workspace/packages/foo/src/file.ts");
-            let working_directories = vec![WorkingDirectory::PatternItem(PatternItem {
-                pattern: "packages\\*\\".to_string(),
-                not_cwd: Some(false),
-            })];
-            let workspace_folder = PathBuf::from(unix_path_to_platform("/workspace"));
-
-            let result = determine_working_directory(uri, working_directories, workspace_folder);
-            assert_directory_result(
-                result,
-                &unix_path_to_platform("/workspace/packages/foo/"),
-                false,
-            );
-        }
-
-        #[test]
-        fn test_working_directory_multiple_patterns() {
-            let uri = make_uri("/workspace/apps/web/src/file.ts");
-            let working_directories = vec![
-                WorkingDirectory::PatternItem(PatternItem {
-                    pattern: "packages\\*\\".to_string(),
-                    not_cwd: None,
-                }),
-                WorkingDirectory::PatternItem(PatternItem {
-                    pattern: "apps\\*\\".to_string(),
-                    not_cwd: None,
-                }),
-            ];
-            let workspace_folder = PathBuf::from(unix_path_to_platform("/workspace"));
-
-            let result = determine_working_directory(uri, working_directories, workspace_folder);
-            assert_directory_result(
-                result,
-                &unix_path_to_platform("/workspace/apps/web/"),
-                false,
-            );
-        }
-    }
-
-    /// Converts a Unix-style path to a platform-specific path.
-    /// On Windows, converts "/workspace/foo/bar" to "C:\workspace\foo\bar"
-    /// On Unix, returns the path unchanged.
-    fn unix_path_to_platform(path: &str) -> String {
-        #[cfg(windows)]
-        {
-            if path.starts_with('/') {
-                format!("C:{}", path.replace('/', "\\"))
-            } else {
-                path.replace('/', "\\")
-            }
-        }
-        #[cfg(not(windows))]
-        {
-            path.to_string()
-        }
-    }
-
-    fn make_uri(path: &str) -> Uri {
-        let platform_path = unix_path_to_platform(path);
-        Uri::from_file_path(&platform_path).unwrap()
-    }
-
-    fn assert_directory_result(
-        result: Option<ResultWorkingDirectory>,
-        expected_directory: &str,
-        expected_not_cwd: bool,
-    ) {
-        match result {
-            Some(ResultWorkingDirectory::DirectoryItem(item)) => {
-                assert_eq!(item.directory, expected_directory);
-                assert_eq!(item.not_cwd, Some(expected_not_cwd));
-            }
-            other => panic!("Expected DirectoryItem, got {:?}", other),
-        }
-    }
-}
diff --git a/crates/languages/src/gitcommit/config.toml b/crates/languages/src/gitcommit/config.toml
deleted file mode 100644
index c2421ce006..0000000000
--- a/crates/languages/src/gitcommit/config.toml
+++ /dev/null
@@ -1,24 +0,0 @@
-name = "Git Commit"
-grammar = "gitcommit"
-path_suffixes = [
-  "TAG_EDITMSG",
-  "MERGE_MSG",
-  "COMMIT_EDITMSG",
-  "NOTES_EDITMSG",
-  "EDIT_DESCRIPTION",
-]
-line_comments = ["#"]
-brackets = [
-  { start = "(", end = ")", close = true, newline = false },
-  { start = "`", end = "`", close = true, newline = false },
-  { start = "\"", end = "\"", close = true, newline = false },
-  { start = "'", end = "'", close = true, newline = false },
-  { start = "{", end = "}", close = true, newline = false },
-  { start = "[", end = "]", close = true, newline = false },
-]
-rewrap_prefixes = [
-    "[-*+]\\s+",
-    "\\d+\\.\\s+",
-    ">\\s*",
-    "[-*+]\\s+\\[[\\sx]\\]\\s+"
-]
diff --git a/crates/languages/src/gitcommit/highlights.scm b/crates/languages/src/gitcommit/highlights.scm
deleted file mode 100644
index 8670a6615a..0000000000
--- a/crates/languages/src/gitcommit/highlights.scm
+++ /dev/null
@@ -1,18 +0,0 @@
-(subject) @markup.heading
-(path) @string.special.path
-(branch) @string.special.symbol
-(commit) @constant
-(item) @markup.link.url
-(header) @tag
-(comment) @comment
-
-(change kind: "new file" @diff.plus)
-(change kind: "deleted" @diff.minus)
-(change kind: "modified" @diff.delta)
-(change kind: "renamed" @diff.delta.moved)
-
-(trailer
-  key: (trailer_key) @variable.other.member
-  value: (trailer_value) @string)
-
-[":" "=" "->" (scissors)] @punctuation.delimiter
diff --git a/crates/languages/src/gitcommit/injections.scm b/crates/languages/src/gitcommit/injections.scm
deleted file mode 100644
index 8fb9b45967..0000000000
--- a/crates/languages/src/gitcommit/injections.scm
+++ /dev/null
@@ -1,9 +0,0 @@
-((comment) @content
- (#set! injection.language "comment")
-)
-
-((scissors) @content
- (#set! "language" "diff"))
-
-((rebase_command) @content
- (#set! "language" "git_rebase"))
diff --git a/crates/languages/src/go.rs b/crates/languages/src/go.rs
deleted file mode 100644
index 130e142076..0000000000
--- a/crates/languages/src/go.rs
+++ /dev/null
@@ -1,1345 +0,0 @@
-use anyhow::{Context as _, Result};
-use async_trait::async_trait;
-use collections::HashMap;
-use futures::StreamExt;
-use gpui::{App, AsyncApp, Task};
-use http_client::github::latest_github_release;
-pub use language::*;
-use language::{LanguageToolchainStore, LspAdapterDelegate, LspInstaller};
-use lsp::{LanguageServerBinary, LanguageServerName};
-
-use regex::Regex;
-use serde_json::json;
-use smol::fs;
-use std::{
-    borrow::Cow,
-    ffi::{OsStr, OsString},
-    ops::Range,
-    path::{Path, PathBuf},
-    process::Output,
-    str,
-    sync::{
-        Arc, LazyLock,
-        atomic::{AtomicBool, Ordering::SeqCst},
-    },
-};
-use task::{TaskTemplate, TaskTemplates, TaskVariables, VariableName};
-use util::{ResultExt, fs::remove_matching, maybe};
-
-fn server_binary_arguments() -> Vec<OsString> {
-    vec!["-mode=stdio".into()]
-}
-
-#[derive(Copy, Clone)]
-pub struct GoLspAdapter;
-
-impl GoLspAdapter {
-    const SERVER_NAME: LanguageServerName = LanguageServerName::new_static("gopls");
-}
-
-static VERSION_REGEX: LazyLock<Regex> =
-    LazyLock::new(|| Regex::new(r"\d+\.\d+\.\d+").expect("Failed to create VERSION_REGEX"));
-
-static GO_ESCAPE_SUBTEST_NAME_REGEX: LazyLock<Regex> = LazyLock::new(|| {
-    Regex::new(r#"[.*+?^${}()|\[\]\\"']"#).expect("Failed to create GO_ESCAPE_SUBTEST_NAME_REGEX")
-});
-
-const BINARY: &str = if cfg!(target_os = "windows") {
-    "gopls.exe"
-} else {
-    "gopls"
-};
-
-impl LspInstaller for GoLspAdapter {
-    type BinaryVersion = Option<String>;
-
-    async fn fetch_latest_server_version(
-        &self,
-        delegate: &dyn LspAdapterDelegate,
-        _: bool,
-        cx: &mut AsyncApp,
-    ) -> Result<Option<String>> {
-        static DID_SHOW_NOTIFICATION: AtomicBool = AtomicBool::new(false);
-
-        const NOTIFICATION_MESSAGE: &str =
-            "Could not install the Go language server `gopls`, because `go` was not found.";
-
-        if delegate.which("go".as_ref()).await.is_none() {
-            if DID_SHOW_NOTIFICATION
-                .compare_exchange(false, true, SeqCst, SeqCst)
-                .is_ok()
-            {
-                cx.update(|cx| {
-                    delegate.show_notification(NOTIFICATION_MESSAGE, cx);
-                })?
-            }
-            anyhow::bail!(
-                "Could not install the Go language server `gopls`, because `go` was not found."
-            );
-        }
-
-        let release =
-            latest_github_release("golang/tools", false, false, delegate.http_client()).await?;
-        let version: Option<String> = release.tag_name.strip_prefix("gopls/v").map(str::to_string);
-        if version.is_none() {
-            log::warn!(
-                "couldn't infer gopls version from GitHub release tag name '{}'",
-                release.tag_name
-            );
-        }
-        Ok(version)
-    }
-
-    async fn check_if_user_installed(
-        &self,
-        delegate: &dyn LspAdapterDelegate,
-        _: Option<Toolchain>,
-        _: &AsyncApp,
-    ) -> Option<LanguageServerBinary> {
-        let path = delegate.which(Self::SERVER_NAME.as_ref()).await?;
-        Some(LanguageServerBinary {
-            path,
-            arguments: server_binary_arguments(),
-            env: None,
-        })
-    }
-
-    async fn fetch_server_binary(
-        &self,
-        version: Option<String>,
-        container_dir: PathBuf,
-        delegate: &dyn LspAdapterDelegate,
-    ) -> Result<LanguageServerBinary> {
-        let go = delegate.which("go".as_ref()).await.unwrap_or("go".into());
-        let go_version_output = util::command::new_smol_command(&go)
-            .args(["version"])
-            .output()
-            .await
-            .context("failed to get go version via `go version` command`")?;
-        let go_version = parse_version_output(&go_version_output)?;
-
-        if let Some(version) = version {
-            let binary_path = container_dir.join(format!("gopls_{version}_go_{go_version}"));
-            if let Ok(metadata) = fs::metadata(&binary_path).await
-                && metadata.is_file()
-            {
-                remove_matching(&container_dir, |entry| {
-                    entry != binary_path && entry.file_name() != Some(OsStr::new("gobin"))
-                })
-                .await;
-
-                return Ok(LanguageServerBinary {
-                    path: binary_path.to_path_buf(),
-                    arguments: server_binary_arguments(),
-                    env: None,
-                });
-            }
-        } else if let Some(path) = get_cached_server_binary(&container_dir).await {
-            return Ok(path);
-        }
-
-        let gobin_dir = container_dir.join("gobin");
-        fs::create_dir_all(&gobin_dir).await?;
-        let install_output = util::command::new_smol_command(go)
-            .env("GO111MODULE", "on")
-            .env("GOBIN", &gobin_dir)
-            .args(["install", "golang.org/x/tools/gopls@latest"])
-            .output()
-            .await?;
-
-        if !install_output.status.success() {
-            log::error!(
-                "failed to install gopls via `go install`. stdout: {:?}, stderr: {:?}",
-                String::from_utf8_lossy(&install_output.stdout),
-                String::from_utf8_lossy(&install_output.stderr)
-            );
-            anyhow::bail!(
-                "failed to install gopls with `go install`. Is `go` installed and in the PATH? Check logs for more information."
-            );
-        }
-
-        let installed_binary_path = gobin_dir.join(BINARY);
-        let version_output = util::command::new_smol_command(&installed_binary_path)
-            .arg("version")
-            .output()
-            .await
-            .context("failed to run installed gopls binary")?;
-        let gopls_version = parse_version_output(&version_output)?;
-        let binary_path = container_dir.join(format!("gopls_{gopls_version}_go_{go_version}"));
-        fs::rename(&installed_binary_path, &binary_path).await?;
-
-        Ok(LanguageServerBinary {
-            path: binary_path.to_path_buf(),
-            arguments: server_binary_arguments(),
-            env: None,
-        })
-    }
-
-    async fn cached_server_binary(
-        &self,
-        container_dir: PathBuf,
-        _: &dyn LspAdapterDelegate,
-    ) -> Option<LanguageServerBinary> {
-        get_cached_server_binary(&container_dir).await
-    }
-}
-
-#[async_trait(?Send)]
-impl LspAdapter for GoLspAdapter {
-    fn name(&self) -> LanguageServerName {
-        Self::SERVER_NAME
-    }
-
-    async fn initialization_options(
-        self: Arc<Self>,
-        _: &Arc<dyn LspAdapterDelegate>,
-    ) -> Result<Option<serde_json::Value>> {
-        Ok(Some(json!({
-            "usePlaceholders": false,
-            "hints": {
-                "assignVariableTypes": true,
-                "compositeLiteralFields": true,
-                "compositeLiteralTypes": true,
-                "constantValues": true,
-                "functionTypeParameters": true,
-                "parameterNames": true,
-                "rangeVariableTypes": true
-            }
-        })))
-    }
-
-    async fn label_for_completion(
-        &self,
-        completion: &lsp::CompletionItem,
-        language: &Arc<Language>,
-    ) -> Option<CodeLabel> {
-        let label = &completion.label;
-
-        // Gopls returns nested fields and methods as completions.
-        // To syntax highlight these, combine their final component
-        // with their detail.
-        let name_offset = label.rfind('.').unwrap_or(0);
-
-        match completion.kind.zip(completion.detail.as_ref()) {
-            Some((lsp::CompletionItemKind::MODULE, detail)) => {
-                let text = format!("{label} {detail}");
-                let source = Rope::from(format!("import {text}").as_str());
-                let runs = language.highlight_text(&source, 7..7 + text[name_offset..].len());
-                let filter_range = completion
-                    .filter_text
-                    .as_deref()
-                    .and_then(|filter_text| {
-                        text.find(filter_text)
-                            .map(|start| start..start + filter_text.len())
-                    })
-                    .unwrap_or(0..label.len());
-                return Some(CodeLabel::new(text, filter_range, runs));
-            }
-            Some((
-                lsp::CompletionItemKind::CONSTANT | lsp::CompletionItemKind::VARIABLE,
-                detail,
-            )) => {
-                let text = format!("{label} {detail}");
-                let source =
-                    Rope::from(format!("var {} {}", &text[name_offset..], detail).as_str());
-                let runs = adjust_runs(
-                    name_offset,
-                    language.highlight_text(&source, 4..4 + text[name_offset..].len()),
-                );
-                let filter_range = completion
-                    .filter_text
-                    .as_deref()
-                    .and_then(|filter_text| {
-                        text.find(filter_text)
-                            .map(|start| start..start + filter_text.len())
-                    })
-                    .unwrap_or(0..label.len());
-                return Some(CodeLabel::new(text, filter_range, runs));
-            }
-            Some((lsp::CompletionItemKind::STRUCT, _)) => {
-                let text = format!("{label} struct {{}}");
-                let source = Rope::from(format!("type {}", &text[name_offset..]).as_str());
-                let runs = adjust_runs(
-                    name_offset,
-                    language.highlight_text(&source, 5..5 + text[name_offset..].len()),
-                );
-                let filter_range = completion
-                    .filter_text
-                    .as_deref()
-                    .and_then(|filter_text| {
-                        text.find(filter_text)
-                            .map(|start| start..start + filter_text.len())
-                    })
-                    .unwrap_or(0..label.len());
-                return Some(CodeLabel::new(text, filter_range, runs));
-            }
-            Some((lsp::CompletionItemKind::INTERFACE, _)) => {
-                let text = format!("{label} interface {{}}");
-                let source = Rope::from(format!("type {}", &text[name_offset..]).as_str());
-                let runs = adjust_runs(
-                    name_offset,
-                    language.highlight_text(&source, 5..5 + text[name_offset..].len()),
-                );
-                let filter_range = completion
-                    .filter_text
-                    .as_deref()
-                    .and_then(|filter_text| {
-                        text.find(filter_text)
-                            .map(|start| start..start + filter_text.len())
-                    })
-                    .unwrap_or(0..label.len());
-                return Some(CodeLabel::new(text, filter_range, runs));
-            }
-            Some((lsp::CompletionItemKind::FIELD, detail)) => {
-                let text = format!("{label} {detail}");
-                let source =
-                    Rope::from(format!("type T struct {{ {} }}", &text[name_offset..]).as_str());
-                let runs = adjust_runs(
-                    name_offset,
-                    language.highlight_text(&source, 16..16 + text[name_offset..].len()),
-                );
-                let filter_range = completion
-                    .filter_text
-                    .as_deref()
-                    .and_then(|filter_text| {
-                        text.find(filter_text)
-                            .map(|start| start..start + filter_text.len())
-                    })
-                    .unwrap_or(0..label.len());
-                return Some(CodeLabel::new(text, filter_range, runs));
-            }
-            Some((lsp::CompletionItemKind::FUNCTION | lsp::CompletionItemKind::METHOD, detail)) => {
-                if let Some(signature) = detail.strip_prefix("func") {
-                    let text = format!("{label}{signature}");
-                    let source = Rope::from(format!("func {} {{}}", &text[name_offset..]).as_str());
-                    let runs = adjust_runs(
-                        name_offset,
-                        language.highlight_text(&source, 5..5 + text[name_offset..].len()),
-                    );
-                    let filter_range = completion
-                        .filter_text
-                        .as_deref()
-                        .and_then(|filter_text| {
-                            text.find(filter_text)
-                                .map(|start| start..start + filter_text.len())
-                        })
-                        .unwrap_or(0..label.len());
-                    return Some(CodeLabel::new(text, filter_range, runs));
-                }
-            }
-            _ => {}
-        }
-        None
-    }
-
-    async fn label_for_symbol(
-        &self,
-        name: &str,
-        kind: lsp::SymbolKind,
-        language: &Arc<Language>,
-    ) -> Option<CodeLabel> {
-        let (text, filter_range, display_range) = match kind {
-            lsp::SymbolKind::METHOD | lsp::SymbolKind::FUNCTION => {
-                let text = format!("func {} () {{}}", name);
-                let filter_range = 5..5 + name.len();
-                let display_range = 0..filter_range.end;
-                (text, filter_range, display_range)
-            }
-            lsp::SymbolKind::STRUCT => {
-                let text = format!("type {} struct {{}}", name);
-                let filter_range = 5..5 + name.len();
-                let display_range = 0..text.len();
-                (text, filter_range, display_range)
-            }
-            lsp::SymbolKind::INTERFACE => {
-                let text = format!("type {} interface {{}}", name);
-                let filter_range = 5..5 + name.len();
-                let display_range = 0..text.len();
-                (text, filter_range, display_range)
-            }
-            lsp::SymbolKind::CLASS => {
-                let text = format!("type {} T", name);
-                let filter_range = 5..5 + name.len();
-                let display_range = 0..filter_range.end;
-                (text, filter_range, display_range)
-            }
-            lsp::SymbolKind::CONSTANT => {
-                let text = format!("const {} = nil", name);
-                let filter_range = 6..6 + name.len();
-                let display_range = 0..filter_range.end;
-                (text, filter_range, display_range)
-            }
-            lsp::SymbolKind::VARIABLE => {
-                let text = format!("var {} = nil", name);
-                let filter_range = 4..4 + name.len();
-                let display_range = 0..filter_range.end;
-                (text, filter_range, display_range)
-            }
-            lsp::SymbolKind::MODULE => {
-                let text = format!("package {}", name);
-                let filter_range = 8..8 + name.len();
-                let display_range = 0..filter_range.end;
-                (text, filter_range, display_range)
-            }
-            _ => return None,
-        };
-
-        Some(CodeLabel::new(
-            text[display_range.clone()].to_string(),
-            filter_range,
-            language.highlight_text(&text.as_str().into(), display_range),
-        ))
-    }
-
-    fn diagnostic_message_to_markdown(&self, message: &str) -> Option<String> {
-        static REGEX: LazyLock<Regex> =
-            LazyLock::new(|| Regex::new(r"(?m)\n\s*").expect("Failed to create REGEX"));
-        Some(REGEX.replace_all(message, "\n\n").to_string())
-    }
-}
-
-fn parse_version_output(output: &Output) -> Result<&str> {
-    let version_stdout =
-        str::from_utf8(&output.stdout).context("version command produced invalid utf8 output")?;
-
-    let version = VERSION_REGEX
-        .find(version_stdout)
-        .with_context(|| format!("failed to parse version output '{version_stdout}'"))?
-        .as_str();
-
-    Ok(version)
-}
-
-async fn get_cached_server_binary(container_dir: &Path) -> Option<LanguageServerBinary> {
-    maybe!(async {
-        let mut last_binary_path = None;
-        let mut entries = fs::read_dir(container_dir).await?;
-        while let Some(entry) = entries.next().await {
-            let entry = entry?;
-            if entry.file_type().await?.is_file()
-                && entry
-                    .file_name()
-                    .to_str()
-                    .is_some_and(|name| name.starts_with("gopls_"))
-            {
-                last_binary_path = Some(entry.path());
-            }
-        }
-
-        let path = last_binary_path.context("no cached binary")?;
-        anyhow::Ok(LanguageServerBinary {
-            path,
-            arguments: server_binary_arguments(),
-            env: None,
-        })
-    })
-    .await
-    .log_err()
-}
-
-fn adjust_runs(
-    delta: usize,
-    mut runs: Vec<(Range<usize>, HighlightId)>,
-) -> Vec<(Range<usize>, HighlightId)> {
-    for (range, _) in &mut runs {
-        range.start += delta;
-        range.end += delta;
-    }
-    runs
-}
-
-pub(crate) struct GoContextProvider;
-
-const GO_PACKAGE_TASK_VARIABLE: VariableName = VariableName::Custom(Cow::Borrowed("GO_PACKAGE"));
-const GO_MODULE_ROOT_TASK_VARIABLE: VariableName =
-    VariableName::Custom(Cow::Borrowed("GO_MODULE_ROOT"));
-const GO_SUBTEST_NAME_TASK_VARIABLE: VariableName =
-    VariableName::Custom(Cow::Borrowed("GO_SUBTEST_NAME"));
-const GO_TABLE_TEST_CASE_NAME_TASK_VARIABLE: VariableName =
-    VariableName::Custom(Cow::Borrowed("GO_TABLE_TEST_CASE_NAME"));
-const GO_SUITE_NAME_TASK_VARIABLE: VariableName =
-    VariableName::Custom(Cow::Borrowed("GO_SUITE_NAME"));
-
-impl ContextProvider for GoContextProvider {
-    fn build_context(
-        &self,
-        variables: &TaskVariables,
-        location: ContextLocation<'_>,
-        _: Option<HashMap<String, String>>,
-        _: Arc<dyn LanguageToolchainStore>,
-        cx: &mut gpui::App,
-    ) -> Task<Result<TaskVariables>> {
-        let local_abs_path = location
-            .file_location
-            .buffer
-            .read(cx)
-            .file()
-            .and_then(|file| Some(file.as_local()?.abs_path(cx)));
-
-        let go_package_variable = local_abs_path
-            .as_deref()
-            .and_then(|local_abs_path| local_abs_path.parent())
-            .map(|buffer_dir| {
-                // Prefer the relative form `./my-nested-package/is-here` over
-                // absolute path, because it's more readable in the modal, but
-                // the absolute path also works.
-                let package_name = variables
-                    .get(&VariableName::WorktreeRoot)
-                    .and_then(|worktree_abs_path| buffer_dir.strip_prefix(worktree_abs_path).ok())
-                    .map(|relative_pkg_dir| {
-                        if relative_pkg_dir.as_os_str().is_empty() {
-                            ".".into()
-                        } else {
-                            format!("./{}", relative_pkg_dir.to_string_lossy())
-                        }
-                    })
-                    .unwrap_or_else(|| format!("{}", buffer_dir.to_string_lossy()));
-
-                (GO_PACKAGE_TASK_VARIABLE.clone(), package_name)
-            });
-
-        let go_module_root_variable = local_abs_path
-            .as_deref()
-            .and_then(|local_abs_path| local_abs_path.parent())
-            .map(|buffer_dir| {
-                // Walk dirtree up until getting the first go.mod file
-                let module_dir = buffer_dir
-                    .ancestors()
-                    .find(|dir| dir.join("go.mod").is_file())
-                    .map(|dir| dir.to_string_lossy().into_owned())
-                    .unwrap_or_else(|| ".".to_string());
-
-                (GO_MODULE_ROOT_TASK_VARIABLE.clone(), module_dir)
-            });
-
-        let _subtest_name = variables.get(&VariableName::Custom(Cow::Borrowed("_subtest_name")));
-
-        let go_subtest_variable = extract_subtest_name(_subtest_name.unwrap_or(""))
-            .map(|subtest_name| (GO_SUBTEST_NAME_TASK_VARIABLE.clone(), subtest_name));
-
-        let _table_test_case_name = variables.get(&VariableName::Custom(Cow::Borrowed(
-            "_table_test_case_name",
-        )));
-
-        let go_table_test_case_variable = _table_test_case_name
-            .and_then(extract_subtest_name)
-            .map(|case_name| (GO_TABLE_TEST_CASE_NAME_TASK_VARIABLE.clone(), case_name));
-
-        let _suite_name = variables.get(&VariableName::Custom(Cow::Borrowed("_suite_name")));
-
-        let go_suite_variable = _suite_name
-            .and_then(extract_subtest_name)
-            .map(|suite_name| (GO_SUITE_NAME_TASK_VARIABLE.clone(), suite_name));
-
-        Task::ready(Ok(TaskVariables::from_iter(
-            [
-                go_package_variable,
-                go_subtest_variable,
-                go_table_test_case_variable,
-                go_suite_variable,
-                go_module_root_variable,
-            ]
-            .into_iter()
-            .flatten(),
-        )))
-    }
-
-    fn associated_tasks(&self, _: Option<Arc<dyn File>>, _: &App) -> Task<Option<TaskTemplates>> {
-        let package_cwd = if GO_PACKAGE_TASK_VARIABLE.template_value() == "." {
-            None
-        } else {
-            Some("$ZED_DIRNAME".to_string())
-        };
-        let module_cwd = Some(GO_MODULE_ROOT_TASK_VARIABLE.template_value());
-
-        Task::ready(Some(TaskTemplates(vec![
-            TaskTemplate {
-                label: format!(
-                    "go test {} -v -run Test{}/{}",
-                    GO_PACKAGE_TASK_VARIABLE.template_value(),
-                    GO_SUITE_NAME_TASK_VARIABLE.template_value(),
-                    VariableName::Symbol.template_value(),
-                ),
-                command: "go".into(),
-                args: vec![
-                    "test".into(),
-                    "-v".into(),
-                    "-run".into(),
-                    format!(
-                        "\\^Test{}\\$/\\^{}\\$",
-                        GO_SUITE_NAME_TASK_VARIABLE.template_value(),
-                        VariableName::Symbol.template_value(),
-                    ),
-                ],
-                cwd: package_cwd.clone(),
-                tags: vec!["go-testify-suite".to_owned()],
-                ..TaskTemplate::default()
-            },
-            TaskTemplate {
-                label: format!(
-                    "go test {} -v -run {}/{}",
-                    GO_PACKAGE_TASK_VARIABLE.template_value(),
-                    VariableName::Symbol.template_value(),
-                    GO_TABLE_TEST_CASE_NAME_TASK_VARIABLE.template_value(),
-                ),
-                command: "go".into(),
-                args: vec![
-                    "test".into(),
-                    "-v".into(),
-                    "-run".into(),
-                    format!(
-                        "\\^{}\\$/\\^{}\\$",
-                        VariableName::Symbol.template_value(),
-                        GO_TABLE_TEST_CASE_NAME_TASK_VARIABLE.template_value(),
-                    ),
-                ],
-                cwd: package_cwd.clone(),
-                tags: vec!["go-table-test-case".to_owned()],
-                ..TaskTemplate::default()
-            },
-            TaskTemplate {
-                label: format!(
-                    "go test {} -run {}",
-                    GO_PACKAGE_TASK_VARIABLE.template_value(),
-                    VariableName::Symbol.template_value(),
-                ),
-                command: "go".into(),
-                args: vec![
-                    "test".into(),
-                    "-run".into(),
-                    format!("\\^{}\\$", VariableName::Symbol.template_value(),),
-                ],
-                tags: vec!["go-test".to_owned()],
-                cwd: package_cwd.clone(),
-                ..TaskTemplate::default()
-            },
-            TaskTemplate {
-                label: format!(
-                    "go test {} -run {}",
-                    GO_PACKAGE_TASK_VARIABLE.template_value(),
-                    VariableName::Symbol.template_value(),
-                ),
-                command: "go".into(),
-                args: vec![
-                    "test".into(),
-                    "-run".into(),
-                    format!("\\^{}\\$", VariableName::Symbol.template_value(),),
-                ],
-                tags: vec!["go-example".to_owned()],
-                cwd: package_cwd.clone(),
-                ..TaskTemplate::default()
-            },
-            TaskTemplate {
-                label: format!("go test {}", GO_PACKAGE_TASK_VARIABLE.template_value()),
-                command: "go".into(),
-                args: vec!["test".into()],
-                cwd: package_cwd.clone(),
-                ..TaskTemplate::default()
-            },
-            TaskTemplate {
-                label: "go test ./...".into(),
-                command: "go".into(),
-                args: vec!["test".into(), "./...".into()],
-                cwd: module_cwd.clone(),
-                ..TaskTemplate::default()
-            },
-            TaskTemplate {
-                label: format!(
-                    "go test {} -v -run {}/{}",
-                    GO_PACKAGE_TASK_VARIABLE.template_value(),
-                    VariableName::Symbol.template_value(),
-                    GO_SUBTEST_NAME_TASK_VARIABLE.template_value(),
-                ),
-                command: "go".into(),
-                args: vec![
-                    "test".into(),
-                    "-v".into(),
-                    "-run".into(),
-                    format!(
-                        "'^{}$/^{}$'",
-                        VariableName::Symbol.template_value(),
-                        GO_SUBTEST_NAME_TASK_VARIABLE.template_value(),
-                    ),
-                ],
-                cwd: package_cwd.clone(),
-                tags: vec!["go-subtest".to_owned()],
-                ..TaskTemplate::default()
-            },
-            TaskTemplate {
-                label: format!(
-                    "go test {} -bench {}",
-                    GO_PACKAGE_TASK_VARIABLE.template_value(),
-                    VariableName::Symbol.template_value()
-                ),
-                command: "go".into(),
-                args: vec![
-                    "test".into(),
-                    "-benchmem".into(),
-                    "-run='^$'".into(),
-                    "-bench".into(),
-                    format!("\\^{}\\$", VariableName::Symbol.template_value()),
-                ],
-                cwd: package_cwd.clone(),
-                tags: vec!["go-benchmark".to_owned()],
-                ..TaskTemplate::default()
-            },
-            TaskTemplate {
-                label: format!(
-                    "go test {} -fuzz=Fuzz -run {}",
-                    GO_PACKAGE_TASK_VARIABLE.template_value(),
-                    VariableName::Symbol.template_value(),
-                ),
-                command: "go".into(),
-                args: vec![
-                    "test".into(),
-                    "-fuzz=Fuzz".into(),
-                    "-run".into(),
-                    format!("\\^{}\\$", VariableName::Symbol.template_value(),),
-                ],
-                tags: vec!["go-fuzz".to_owned()],
-                cwd: package_cwd.clone(),
-                ..TaskTemplate::default()
-            },
-            TaskTemplate {
-                label: format!("go run {}", GO_PACKAGE_TASK_VARIABLE.template_value(),),
-                command: "go".into(),
-                args: vec!["run".into(), ".".into()],
-                cwd: package_cwd.clone(),
-                tags: vec!["go-main".to_owned()],
-                ..TaskTemplate::default()
-            },
-            TaskTemplate {
-                label: format!("go generate {}", GO_PACKAGE_TASK_VARIABLE.template_value()),
-                command: "go".into(),
-                args: vec!["generate".into()],
-                cwd: package_cwd,
-                tags: vec!["go-generate".to_owned()],
-                ..TaskTemplate::default()
-            },
-            TaskTemplate {
-                label: "go generate ./...".into(),
-                command: "go".into(),
-                args: vec!["generate".into(), "./...".into()],
-                cwd: module_cwd,
-                ..TaskTemplate::default()
-            },
-        ])))
-    }
-}
-
-fn extract_subtest_name(input: &str) -> Option<String> {
-    let content = if input.starts_with('`') && input.ends_with('`') {
-        input.trim_matches('`')
-    } else {
-        input.trim_matches('"')
-    };
-
-    let processed = content
-        .chars()
-        .map(|c| if c.is_whitespace() { '_' } else { c })
-        .collect::<String>();
-
-    Some(
-        GO_ESCAPE_SUBTEST_NAME_REGEX
-            .replace_all(&processed, |caps: &regex::Captures| {
-                format!("\\{}", &caps[0])
-            })
-            .to_string(),
-    )
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::language;
-    use gpui::{AppContext, Hsla, TestAppContext};
-    use theme::SyntaxTheme;
-
-    #[gpui::test]
-    async fn test_go_label_for_completion() {
-        let adapter = Arc::new(GoLspAdapter);
-        let language = language("go", tree_sitter_go::LANGUAGE.into());
-
-        let theme = SyntaxTheme::new_test([
-            ("type", Hsla::default()),
-            ("keyword", Hsla::default()),
-            ("function", Hsla::default()),
-            ("number", Hsla::default()),
-            ("property", Hsla::default()),
-        ]);
-        language.set_theme(&theme);
-
-        let grammar = language.grammar().unwrap();
-        let highlight_function = grammar.highlight_id_for_name("function").unwrap();
-        let highlight_type = grammar.highlight_id_for_name("type").unwrap();
-        let highlight_keyword = grammar.highlight_id_for_name("keyword").unwrap();
-        let highlight_number = grammar.highlight_id_for_name("number").unwrap();
-        let highlight_field = grammar.highlight_id_for_name("property").unwrap();
-
-        assert_eq!(
-            adapter
-                .label_for_completion(
-                    &lsp::CompletionItem {
-                        kind: Some(lsp::CompletionItemKind::FUNCTION),
-                        label: "Hello".to_string(),
-                        detail: Some("func(a B) c.D".to_string()),
-                        ..Default::default()
-                    },
-                    &language
-                )
-                .await,
-            Some(CodeLabel::new(
-                "Hello(a B) c.D".to_string(),
-                0..5,
-                vec![
-                    (0..5, highlight_function),
-                    (8..9, highlight_type),
-                    (13..14, highlight_type),
-                ]
-            ))
-        );
-
-        // Nested methods
-        assert_eq!(
-            adapter
-                .label_for_completion(
-                    &lsp::CompletionItem {
-                        kind: Some(lsp::CompletionItemKind::METHOD),
-                        label: "one.two.Three".to_string(),
-                        detail: Some("func() [3]interface{}".to_string()),
-                        ..Default::default()
-                    },
-                    &language
-                )
-                .await,
-            Some(CodeLabel::new(
-                "one.two.Three() [3]interface{}".to_string(),
-                0..13,
-                vec![
-                    (8..13, highlight_function),
-                    (17..18, highlight_number),
-                    (19..28, highlight_keyword),
-                ],
-            ))
-        );
-
-        // Nested fields
-        assert_eq!(
-            adapter
-                .label_for_completion(
-                    &lsp::CompletionItem {
-                        kind: Some(lsp::CompletionItemKind::FIELD),
-                        label: "two.Three".to_string(),
-                        detail: Some("a.Bcd".to_string()),
-                        ..Default::default()
-                    },
-                    &language
-                )
-                .await,
-            Some(CodeLabel::new(
-                "two.Three a.Bcd".to_string(),
-                0..9,
-                vec![(4..9, highlight_field), (12..15, highlight_type)],
-            ))
-        );
-    }
-
-    #[gpui::test]
-    fn test_testify_suite_detection(cx: &mut TestAppContext) {
-        let language = language("go", tree_sitter_go::LANGUAGE.into());
-
-        let testify_suite = r#"
-        package main
-
-        import (
-            "testing"
-
-            "github.com/stretchr/testify/suite"
-        )
-
-        type ExampleSuite struct {
-            suite.Suite
-        }
-
-        func TestExampleSuite(t *testing.T) {
-            suite.Run(t, new(ExampleSuite))
-        }
-
-        func (s *ExampleSuite) TestSomething_Success() {
-            // test code
-        }
-        "#;
-
-        let buffer = cx
-            .new(|cx| crate::Buffer::local(testify_suite, cx).with_language(language.clone(), cx));
-        cx.executor().run_until_parked();
-
-        let runnables: Vec<_> = buffer.update(cx, |buffer, _| {
-            let snapshot = buffer.snapshot();
-            snapshot.runnable_ranges(0..testify_suite.len()).collect()
-        });
-
-        let tag_strings: Vec<String> = runnables
-            .iter()
-            .flat_map(|r| &r.runnable.tags)
-            .map(|tag| tag.0.to_string())
-            .collect();
-
-        assert!(
-            tag_strings.contains(&"go-test".to_string()),
-            "Should find go-test tag, found: {:?}",
-            tag_strings
-        );
-        assert!(
-            tag_strings.contains(&"go-testify-suite".to_string()),
-            "Should find go-testify-suite tag, found: {:?}",
-            tag_strings
-        );
-    }
-
-    #[gpui::test]
-    fn test_go_runnable_detection(cx: &mut TestAppContext) {
-        let language = language("go", tree_sitter_go::LANGUAGE.into());
-
-        let interpreted_string_subtest = r#"
-        package main
-
-        import "testing"
-
-        func TestExample(t *testing.T) {
-            t.Run("subtest with double quotes", func(t *testing.T) {
-                // test code
-            })
-        }
-        "#;
-
-        let raw_string_subtest = r#"
-        package main
-
-        import "testing"
-
-        func TestExample(t *testing.T) {
-            t.Run(`subtest with
-            multiline
-            backticks`, func(t *testing.T) {
-                // test code
-            })
-        }
-        "#;
-
-        let buffer = cx.new(|cx| {
-            crate::Buffer::local(interpreted_string_subtest, cx).with_language(language.clone(), cx)
-        });
-        cx.executor().run_until_parked();
-
-        let runnables: Vec<_> = buffer.update(cx, |buffer, _| {
-            let snapshot = buffer.snapshot();
-            snapshot
-                .runnable_ranges(0..interpreted_string_subtest.len())
-                .collect()
-        });
-
-        let tag_strings: Vec<String> = runnables
-            .iter()
-            .flat_map(|r| &r.runnable.tags)
-            .map(|tag| tag.0.to_string())
-            .collect();
-
-        assert!(
-            tag_strings.contains(&"go-test".to_string()),
-            "Should find go-test tag, found: {:?}",
-            tag_strings
-        );
-        assert!(
-            tag_strings.contains(&"go-subtest".to_string()),
-            "Should find go-subtest tag, found: {:?}",
-            tag_strings
-        );
-
-        let buffer = cx.new(|cx| {
-            crate::Buffer::local(raw_string_subtest, cx).with_language(language.clone(), cx)
-        });
-        cx.executor().run_until_parked();
-
-        let runnables: Vec<_> = buffer.update(cx, |buffer, _| {
-            let snapshot = buffer.snapshot();
-            snapshot
-                .runnable_ranges(0..raw_string_subtest.len())
-                .collect()
-        });
-
-        let tag_strings: Vec<String> = runnables
-            .iter()
-            .flat_map(|r| &r.runnable.tags)
-            .map(|tag| tag.0.to_string())
-            .collect();
-
-        assert!(
-            tag_strings.contains(&"go-test".to_string()),
-            "Should find go-test tag, found: {:?}",
-            tag_strings
-        );
-        assert!(
-            tag_strings.contains(&"go-subtest".to_string()),
-            "Should find go-subtest tag, found: {:?}",
-            tag_strings
-        );
-    }
-
-    #[gpui::test]
-    fn test_go_example_test_detection(cx: &mut TestAppContext) {
-        let language = language("go", tree_sitter_go::LANGUAGE.into());
-
-        let example_test = r#"
-        package main
-
-        import "fmt"
-
-        func Example() {
-            fmt.Println("Hello, world!")
-            // Output: Hello, world!
-        }
-        "#;
-
-        let buffer =
-            cx.new(|cx| crate::Buffer::local(example_test, cx).with_language(language.clone(), cx));
-        cx.executor().run_until_parked();
-
-        let runnables: Vec<_> = buffer.update(cx, |buffer, _| {
-            let snapshot = buffer.snapshot();
-            snapshot.runnable_ranges(0..example_test.len()).collect()
-        });
-
-        let tag_strings: Vec<String> = runnables
-            .iter()
-            .flat_map(|r| &r.runnable.tags)
-            .map(|tag| tag.0.to_string())
-            .collect();
-
-        assert!(
-            tag_strings.contains(&"go-example".to_string()),
-            "Should find go-example tag, found: {:?}",
-            tag_strings
-        );
-    }
-
-    #[gpui::test]
-    fn test_go_table_test_slice_detection(cx: &mut TestAppContext) {
-        let language = language("go", tree_sitter_go::LANGUAGE.into());
-
-        let table_test = r#"
-        package main
-
-        import "testing"
-
-        func TestExample(t *testing.T) {
-            _ = "some random string"
-
-            testCases := []struct{
-                name string
-                anotherStr string
-            }{
-                {
-                    name: "test case 1",
-                    anotherStr: "foo",
-                },
-                {
-                    name: "test case 2",
-                    anotherStr: "bar",
-                },
-                {
-                    name: "test case 3",
-                    anotherStr: "baz",
-                },
-            }
-
-            notATableTest := []struct{
-                name string
-            }{
-                {
-                    name: "some string",
-                },
-                {
-                    name: "some other string",
-                },
-            }
-
-            for _, tc := range testCases {
-                t.Run(tc.name, func(t *testing.T) {
-                    // test code here
-                })
-            }
-        }
-        "#;
-
-        let buffer =
-            cx.new(|cx| crate::Buffer::local(table_test, cx).with_language(language.clone(), cx));
-        cx.executor().run_until_parked();
-
-        let runnables: Vec<_> = buffer.update(cx, |buffer, _| {
-            let snapshot = buffer.snapshot();
-            snapshot.runnable_ranges(0..table_test.len()).collect()
-        });
-
-        let tag_strings: Vec<String> = runnables
-            .iter()
-            .flat_map(|r| &r.runnable.tags)
-            .map(|tag| tag.0.to_string())
-            .collect();
-
-        assert!(
-            tag_strings.contains(&"go-test".to_string()),
-            "Should find go-test tag, found: {:?}",
-            tag_strings
-        );
-        assert!(
-            tag_strings.contains(&"go-table-test-case".to_string()),
-            "Should find go-table-test-case tag, found: {:?}",
-            tag_strings
-        );
-
-        let go_test_count = tag_strings.iter().filter(|&tag| tag == "go-test").count();
-        // This is currently broken; see #39148
-        // let go_table_test_count = tag_strings
-        //     .iter()
-        //     .filter(|&tag| tag == "go-table-test-case")
-        //     .count();
-
-        assert!(
-            go_test_count == 1,
-            "Should find exactly 1 go-test, found: {}",
-            go_test_count
-        );
-        // assert!(
-        //     go_table_test_count == 3,
-        //     "Should find exactly 3 go-table-test-case, found: {}",
-        //     go_table_test_count
-        // );
-    }
-
-    #[gpui::test]
-    fn test_go_table_test_slice_ignored(cx: &mut TestAppContext) {
-        let language = language("go", tree_sitter_go::LANGUAGE.into());
-
-        let table_test = r#"
-        package main
-
-        func Example() {
-            _ = "some random string"
-
-            notATableTest := []struct{
-                name string
-            }{
-                {
-                    name: "some string",
-                },
-                {
-                    name: "some other string",
-                },
-            }
-        }
-        "#;
-
-        let buffer =
-            cx.new(|cx| crate::Buffer::local(table_test, cx).with_language(language.clone(), cx));
-        cx.executor().run_until_parked();
-
-        let runnables: Vec<_> = buffer.update(cx, |buffer, _| {
-            let snapshot = buffer.snapshot();
-            snapshot.runnable_ranges(0..table_test.len()).collect()
-        });
-
-        let tag_strings: Vec<String> = runnables
-            .iter()
-            .flat_map(|r| &r.runnable.tags)
-            .map(|tag| tag.0.to_string())
-            .collect();
-
-        assert!(
-            !tag_strings.contains(&"go-test".to_string()),
-            "Should find go-test tag, found: {:?}",
-            tag_strings
-        );
-        assert!(
-            !tag_strings.contains(&"go-table-test-case".to_string()),
-            "Should find go-table-test-case tag, found: {:?}",
-            tag_strings
-        );
-    }
-
-    #[gpui::test]
-    fn test_go_table_test_map_detection(cx: &mut TestAppContext) {
-        let language = language("go", tree_sitter_go::LANGUAGE.into());
-
-        let table_test = r#"
-        package main
-
-        import "testing"
-
-        func TestExample(t *testing.T) {
-            _ = "some random string"
-
-           	testCases := map[string]struct {
-          		someStr string
-          		fail    bool
-           	}{
-          		"test failure": {
-         			someStr: "foo",
-         			fail:    true,
-          		},
-          		"test success": {
-         			someStr: "bar",
-         			fail:    false,
-          		},
-           	}
-
-           	notATableTest := map[string]struct {
-          		someStr string
-           	}{
-          		"some string": {
-         			someStr: "foo",
-          		},
-          		"some other string": {
-         			someStr: "bar",
-          		},
-           	}
-
-            for name, tc := range testCases {
-                t.Run(name, func(t *testing.T) {
-                    // test code here
-                })
-            }
-        }
-        "#;
-
-        let buffer =
-            cx.new(|cx| crate::Buffer::local(table_test, cx).with_language(language.clone(), cx));
-        cx.executor().run_until_parked();
-
-        let runnables: Vec<_> = buffer.update(cx, |buffer, _| {
-            let snapshot = buffer.snapshot();
-            snapshot.runnable_ranges(0..table_test.len()).collect()
-        });
-
-        let tag_strings: Vec<String> = runnables
-            .iter()
-            .flat_map(|r| &r.runnable.tags)
-            .map(|tag| tag.0.to_string())
-            .collect();
-
-        assert!(
-            tag_strings.contains(&"go-test".to_string()),
-            "Should find go-test tag, found: {:?}",
-            tag_strings
-        );
-        assert!(
-            tag_strings.contains(&"go-table-test-case".to_string()),
-            "Should find go-table-test-case tag, found: {:?}",
-            tag_strings
-        );
-
-        let go_test_count = tag_strings.iter().filter(|&tag| tag == "go-test").count();
-        let go_table_test_count = tag_strings
-            .iter()
-            .filter(|&tag| tag == "go-table-test-case")
-            .count();
-
-        assert!(
-            go_test_count == 1,
-            "Should find exactly 1 go-test, found: {}",
-            go_test_count
-        );
-        assert!(
-            go_table_test_count == 2,
-            "Should find exactly 2 go-table-test-case, found: {}",
-            go_table_test_count
-        );
-    }
-
-    #[gpui::test]
-    fn test_go_table_test_map_ignored(cx: &mut TestAppContext) {
-        let language = language("go", tree_sitter_go::LANGUAGE.into());
-
-        let table_test = r#"
-        package main
-
-        func Example() {
-            _ = "some random string"
-
-           	notATableTest := map[string]struct {
-          		someStr string
-           	}{
-          		"some string": {
-         			someStr: "foo",
-          		},
-          		"some other string": {
-         			someStr: "bar",
-          		},
-           	}
-        }
-        "#;
-
-        let buffer =
-            cx.new(|cx| crate::Buffer::local(table_test, cx).with_language(language.clone(), cx));
-        cx.executor().run_until_parked();
-
-        let runnables: Vec<_> = buffer.update(cx, |buffer, _| {
-            let snapshot = buffer.snapshot();
-            snapshot.runnable_ranges(0..table_test.len()).collect()
-        });
-
-        let tag_strings: Vec<String> = runnables
-            .iter()
-            .flat_map(|r| &r.runnable.tags)
-            .map(|tag| tag.0.to_string())
-            .collect();
-
-        assert!(
-            !tag_strings.contains(&"go-test".to_string()),
-            "Should find go-test tag, found: {:?}",
-            tag_strings
-        );
-        assert!(
-            !tag_strings.contains(&"go-table-test-case".to_string()),
-            "Should find go-table-test-case tag, found: {:?}",
-            tag_strings
-        );
-    }
-
-    #[test]
-    fn test_extract_subtest_name() {
-        // Interpreted string literal
-        let input_double_quoted = r#""subtest with double quotes""#;
-        let result = extract_subtest_name(input_double_quoted);
-        assert_eq!(result, Some(r#"subtest_with_double_quotes"#.to_string()));
-
-        let input_double_quoted_with_backticks = r#""test with `backticks` inside""#;
-        let result = extract_subtest_name(input_double_quoted_with_backticks);
-        assert_eq!(result, Some(r#"test_with_`backticks`_inside"#.to_string()));
-
-        // Raw string literal
-        let input_with_backticks = r#"`subtest with backticks`"#;
-        let result = extract_subtest_name(input_with_backticks);
-        assert_eq!(result, Some(r#"subtest_with_backticks"#.to_string()));
-
-        let input_raw_with_quotes = r#"`test with "quotes" and other chars`"#;
-        let result = extract_subtest_name(input_raw_with_quotes);
-        assert_eq!(
-            result,
-            Some(r#"test_with_\"quotes\"_and_other_chars"#.to_string())
-        );
-
-        let input_multiline = r#"`subtest with
-        multiline
-        backticks`"#;
-        let result = extract_subtest_name(input_multiline);
-        assert_eq!(
-            result,
-            Some(r#"subtest_with_________multiline_________backticks"#.to_string())
-        );
-
-        let input_with_double_quotes = r#"`test with "double quotes"`"#;
-        let result = extract_subtest_name(input_with_double_quotes);
-        assert_eq!(result, Some(r#"test_with_\"double_quotes\""#.to_string()));
-    }
-}
diff --git a/crates/languages/src/go/brackets.scm b/crates/languages/src/go/brackets.scm
deleted file mode 100644
index 05fb1d7f92..0000000000
--- a/crates/languages/src/go/brackets.scm
+++ /dev/null
@@ -1,6 +0,0 @@
-("(" @open ")" @close)
-("[" @open "]" @close)
-("{" @open "}" @close)
-(("\"" @open "\"" @close) (#set! rainbow.exclude))
-(("`" @open "`" @close) (#set! rainbow.exclude))
-((rune_literal) @open @close (#set! rainbow.exclude))
diff --git a/crates/languages/src/go/config.toml b/crates/languages/src/go/config.toml
deleted file mode 100644
index 0a5122c038..0000000000
--- a/crates/languages/src/go/config.toml
+++ /dev/null
@@ -1,18 +0,0 @@
-name = "Go"
-grammar = "go"
-path_suffixes = ["go"]
-line_comments = ["// "]
-autoclose_before = ";:.,=}])>"
-brackets = [
-    { start = "{", end = "}", close = true, newline = true },
-    { start = "[", end = "]", close = true, newline = true },
-    { start = "(", end = ")", close = true, newline = true },
-    { start = "\"", end = "\"", close = true, newline = false, not_in = ["comment", "string"] },
-    { start = "'", end = "'", close = true, newline = false, not_in = ["comment", "string"] },
-    { start = "`", end = "`", close = true, newline = false, not_in = ["comment", "string"] },
-    { start = "/*", end = " */", close = true, newline = false, not_in = ["comment", "string"] },
-]
-tab_size = 4
-hard_tabs = true
-debuggers = ["Delve"]
-documentation_comment = { start = "/*", prefix = "* ", end = "*/", tab_size = 1 }
diff --git a/crates/languages/src/go/debugger.scm b/crates/languages/src/go/debugger.scm
deleted file mode 100644
index f22b91f938..0000000000
--- a/crates/languages/src/go/debugger.scm
+++ /dev/null
@@ -1,26 +0,0 @@
-(parameter_declaration (identifier) @debug-variable)
-
-(short_var_declaration (expression_list (identifier) @debug-variable))
-
-(var_declaration (var_spec (identifier) @debug-variable))
-
-(const_declaration (const_spec (identifier) @debug-variable))
-
-(assignment_statement (expression_list (identifier) @debug-variable))
-
-(binary_expression (identifier) @debug-variable
-  (#not-match? @debug-variable "^[A-Z]"))
-
-(call_expression (argument_list (identifier) @debug-variable
-  (#not-match? @debug-variable "^[A-Z]")))
-
-(return_statement (expression_list (identifier) @debug-variable
-  (#not-match? @debug-variable "^[A-Z]")))
-
-(range_clause (expression_list (identifier) @debug-variable))
-
-(parenthesized_expression (identifier) @debug-variable
-  (#not-match? @debug-variable "^[A-Z]"))
-
-(block) @debug-scope
-(function_declaration) @debug-scope
diff --git a/crates/languages/src/go/embedding.scm b/crates/languages/src/go/embedding.scm
deleted file mode 100644
index 9d8700cdfb..0000000000
--- a/crates/languages/src/go/embedding.scm
+++ /dev/null
@@ -1,24 +0,0 @@
-(
-    (comment)* @context
-    .
-    (type_declaration
-        (type_spec
-            name: (_) @name)
-    ) @item
-)
-
-(
-    (comment)* @context
-    .
-    (function_declaration
-        name: (_) @name
-    ) @item
-)
-
-(
-    (comment)* @context
-    .
-    (method_declaration
-        name: (_) @name
-    ) @item
-)
diff --git a/crates/languages/src/go/highlights.scm b/crates/languages/src/go/highlights.scm
deleted file mode 100644
index 5d630cbdfc..0000000000
--- a/crates/languages/src/go/highlights.scm
+++ /dev/null
@@ -1,140 +0,0 @@
-(identifier) @variable
-
-(type_identifier) @type
-(field_identifier) @property
-(package_identifier) @namespace
-
-(label_name) @label
-
-(keyed_element
-  .
-  (literal_element
-    (identifier) @property))
-
-(call_expression
-  function: (identifier) @function)
-
-(call_expression
-  function: (selector_expression
-    field: (field_identifier) @function.method))
-
-(function_declaration
-  name: (identifier) @function)
-
-(method_declaration
-  name: (field_identifier) @function.method)
-(method_elem
-  name: (field_identifier) @function.method)
-
-[
-  ";"
-  "."
-  ","
-  ":"
-] @punctuation.delimiter
-
-[
-  "("
-  ")"
-  "{"
-  "}"
-  "["
-  "]"
-] @punctuation.bracket
-
-[
-  "--"
-  "-"
-  "-="
-  ":="
-  "!"
-  "!="
-  "..."
-  "*"
-  "*"
-  "*="
-  "/"
-  "/="
-  "&"
-  "&&"
-  "&="
-  "%"
-  "%="
-  "^"
-  "^="
-  "+"
-  "++"
-  "+="
-  "<-"
-  "<"
-  "<<"
-  "<<="
-  "<="
-  "="
-  "=="
-  ">"
-  ">="
-  ">>"
-  ">>="
-  "|"
-  "|="
-  "||"
-  "~"
-] @operator
-
-[
-  "break"
-  "case"
-  "chan"
-  "const"
-  "continue"
-  "default"
-  "defer"
-  "else"
-  "fallthrough"
-  "for"
-  "func"
-  "go"
-  "goto"
-  "if"
-  "import"
-  "interface"
-  "map"
-  "package"
-  "range"
-  "return"
-  "select"
-  "struct"
-  "switch"
-  "type"
-  "var"
-] @keyword
-
-[
-  (interpreted_string_literal)
-  (raw_string_literal)
-  (rune_literal)
-] @string
-
-(escape_sequence) @string.escape
-
-[
-  (int_literal)
-  (float_literal)
-  (imaginary_literal)
-] @number
-
-(const_spec
-  name: (identifier) @constant)
-
-[
-  (true)
-  (false)
-] @boolean
-
-[
-  (nil)
-  (iota)
-] @constant.builtin
-
-(comment) @comment
diff --git a/crates/languages/src/go/imports.scm b/crates/languages/src/go/imports.scm
deleted file mode 100644
index 7f0ff2d46e..0000000000
--- a/crates/languages/src/go/imports.scm
+++ /dev/null
@@ -1,14 +0,0 @@
-(import_spec
-    name: [
-        (dot)
-        (package_identifier)
-    ]
-    path: (interpreted_string_literal
-        (interpreted_string_literal_content) @namespace)
-) @wildcard @import
-
-(import_spec
-    !name
-    path: (interpreted_string_literal
-        (interpreted_string_literal_content) @namespace)
-) @wildcard @import
diff --git a/crates/languages/src/go/indents.scm b/crates/languages/src/go/indents.scm
deleted file mode 100644
index abbb72eb37..0000000000
--- a/crates/languages/src/go/indents.scm
+++ /dev/null
@@ -1,9 +0,0 @@
-[
-    (assignment_statement)
-    (call_expression)
-    (selector_expression)
-] @indent
-
-(_ "[" "]" @end) @indent
-(_ "{" "}" @end) @indent
-(_ "(" ")" @end) @indent
diff --git a/crates/languages/src/go/injections.scm b/crates/languages/src/go/injections.scm
deleted file mode 100644
index 58583f4d22..0000000000
--- a/crates/languages/src/go/injections.scm
+++ /dev/null
@@ -1,735 +0,0 @@
-; Refer to https://github.com/nvim-treesitter/nvim-treesitter/blob/master/queries/go/injections.scm#L4C1-L16C41
-((comment) @injection.content
- (#set! injection.language "comment")
-)
-
-(call_expression
-  (selector_expression) @_function
-  (#any-of? @_function
-    "regexp.Match" "regexp.MatchReader" "regexp.MatchString" "regexp.Compile" "regexp.CompilePOSIX"
-    "regexp.MustCompile" "regexp.MustCompilePOSIX")
-  (argument_list
-    .
-    [
-      (raw_string_literal)
-      (interpreted_string_literal)
-    ] @injection.content
-    (#set! injection.language "regex")
-    ))
-
-; INJECT SQL
-(
-    [
-        (const_spec
-            name: (identifier)
-            "="
-            (comment) @_comment
-            value: (expression_list
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))
-
-        (var_spec
-            name: (identifier)
-            "="
-            (comment) @_comment
-            value: (expression_list
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))
-
-        (assignment_statement
-        left: (expression_list)
-        "="
-        (comment) @_comment
-        right: (expression_list
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))
-
-        (short_var_declaration
-        left: (expression_list)
-        ":="
-        (comment) @_comment
-        right: (expression_list
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))
-
-        (composite_literal
-            body: (literal_value
-            (keyed_element
-            (comment) @_comment
-            value: (literal_element
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))))
-
-        (expression_statement
-            (call_expression
-            (argument_list
-            (comment) @_comment
-            [
-               	(interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        )))
-    ]
-  (#match? @_comment "^\\/\\*\\s*sql\\s*\\*\\/$")
-  (#set! injection.language "sql")
-)
-
-; INJECT JSON
-(
-    [
-        (const_spec
-            name: (identifier)
-            "="
-            (comment) @_comment
-            value: (expression_list
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))
-
-        (var_spec
-            name: (identifier)
-            "="
-            (comment) @_comment
-            value: (expression_list
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))
-
-        (assignment_statement
-        left: (expression_list)
-        "="
-        (comment) @_comment
-        right: (expression_list
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))
-
-        (short_var_declaration
-        left: (expression_list)
-        ":="
-        (comment) @_comment
-        right: (expression_list
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))
-
-        (composite_literal
-            body: (literal_value
-            (keyed_element
-            (comment) @_comment
-            value: (literal_element
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))))
-
-        (expression_statement
-            (call_expression
-            (argument_list
-            (comment) @_comment
-            [
-               	(interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        )))
-    ]
-    (#match? @_comment "^\\/\\*\\s*json\\s*\\*\\/") ; /* json */ or /*json*/
-    (#set! injection.language "json")
-)
-
-; INJECT YAML
-(
-    [
-        (const_spec
-            name: (identifier)
-            "="
-            (comment) @_comment
-            value: (expression_list
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))
-
-        (var_spec
-            name: (identifier)
-            "="
-            (comment) @_comment
-            value: (expression_list
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))
-
-        (assignment_statement
-        left: (expression_list)
-        "="
-        (comment) @_comment
-        right: (expression_list
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))
-
-        (short_var_declaration
-        left: (expression_list)
-        ":="
-        (comment) @_comment
-        right: (expression_list
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))
-
-        (composite_literal
-            body: (literal_value
-            (keyed_element
-            (comment) @_comment
-            value: (literal_element
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))))
-
-        (expression_statement
-            (call_expression
-            (argument_list
-            (comment) @_comment
-            [
-               	(interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        )))
-    ]
-    (#match? @_comment "^\\/\\*\\s*yaml\\s*\\*\\/") ; /* yaml */ or /*yaml*/
-    (#set! injection.language "yaml")
-)
-
-; INJECT XML
-(
-    [
-        (const_spec
-            name: (identifier)
-            "="
-            (comment) @_comment
-            value: (expression_list
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))
-
-        (var_spec
-            name: (identifier)
-            "="
-            (comment) @_comment
-            value: (expression_list
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))
-
-        (assignment_statement
-        left: (expression_list)
-        "="
-        (comment) @_comment
-        right: (expression_list
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))
-
-        (short_var_declaration
-        left: (expression_list)
-        ":="
-        (comment) @_comment
-        right: (expression_list
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))
-
-        (composite_literal
-            body: (literal_value
-            (keyed_element
-            (comment) @_comment
-            value: (literal_element
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))))
-
-        (expression_statement
-            (call_expression
-            (argument_list
-            (comment) @_comment
-            [
-               	(interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        )))
-    ]
-    (#match? @_comment "^\\/\\*\\s*xml\\s*\\*\\/") ; /* xml */ or /*xml*/
-    (#set! injection.language "xml")
-)
-
-; INJECT HTML
-(
-    [
-        (const_spec
-            name: (identifier)
-            "="
-            (comment) @_comment
-            value: (expression_list
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))
-
-        (var_spec
-            name: (identifier)
-            "="
-            (comment) @_comment
-            value: (expression_list
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))
-
-        (assignment_statement
-        left: (expression_list)
-        "="
-        (comment) @_comment
-        right: (expression_list
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))
-
-        (short_var_declaration
-        left: (expression_list)
-        ":="
-        (comment) @_comment
-        right: (expression_list
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))
-
-        (composite_literal
-            body: (literal_value
-            (keyed_element
-            (comment) @_comment
-            value: (literal_element
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))))
-
-        (expression_statement
-            (call_expression
-            (argument_list
-            (comment) @_comment
-            [
-               	(interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        )))
-    ]
-    (#match? @_comment "^\\/\\*\\s*html\\s*\\*\\/") ; /* html */ or /*html*/
-    (#set! injection.language "html")
-)
-
-; INJECT JS
-(
-    [
-        (const_spec
-            name: (identifier)
-            "="
-            (comment) @_comment
-            value: (expression_list
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))
-
-        (var_spec
-            name: (identifier)
-            "="
-            (comment) @_comment
-            value: (expression_list
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))
-
-        (assignment_statement
-        left: (expression_list)
-        "="
-        (comment) @_comment
-        right: (expression_list
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))
-
-        (short_var_declaration
-        left: (expression_list)
-        ":="
-        (comment) @_comment
-        right: (expression_list
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))
-
-        (composite_literal
-            body: (literal_value
-            (keyed_element
-            (comment) @_comment
-            value: (literal_element
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))))
-
-        (expression_statement
-            (call_expression
-            (argument_list
-            (comment) @_comment
-            [
-               	(interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        )))
-    ]
-    (#match? @_comment "^\\/\\*\\s*js\\s*\\*\\/") ; /* js */ or /*js*/
-    (#set! injection.language "javascript")
-)
-
-
-; INJECT CSS
-(
-    [
-        (const_spec
-            name: (identifier)
-            "="
-            (comment) @_comment
-            value: (expression_list
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))
-
-        (var_spec
-            name: (identifier)
-            "="
-            (comment) @_comment
-            value: (expression_list
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))
-
-        (assignment_statement
-        left: (expression_list)
-        "="
-        (comment) @_comment
-        right: (expression_list
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))
-
-        (short_var_declaration
-        left: (expression_list)
-        ":="
-        (comment) @_comment
-        right: (expression_list
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))
-
-        (composite_literal
-            body: (literal_value
-            (keyed_element
-            (comment) @_comment
-            value: (literal_element
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))))
-
-        (expression_statement
-            (call_expression
-            (argument_list
-            (comment) @_comment
-            [
-               	(interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        )))
-    ]
-    (#match? @_comment "^\\/\\*\\s*css\\s*\\*\\/") ; /* css */ or /*css*/
-    (#set! injection.language "css")
-)
-
-
-; INJECT LUA
-(
-    [
-        (const_spec
-            name: (identifier)
-            "="
-            (comment) @_comment
-            value: (expression_list
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))
-
-        (var_spec
-            name: (identifier)
-            "="
-            (comment) @_comment
-            value: (expression_list
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))
-
-        (assignment_statement
-        left: (expression_list)
-        "="
-        (comment) @_comment
-        right: (expression_list
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))
-
-        (short_var_declaration
-        left: (expression_list)
-        ":="
-        (comment) @_comment
-        right: (expression_list
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))
-
-        (composite_literal
-            body: (literal_value
-            (keyed_element
-            (comment) @_comment
-            value: (literal_element
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))))
-
-        (expression_statement
-            (call_expression
-            (argument_list
-            (comment) @_comment
-            [
-               	(interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        )))
-    ]
-    (#match? @_comment "^\\/\\*\\s*lua\\s*\\*\\/") ; /* lua */ or /*lua*/
-    (#set! injection.language "lua")
-)
-
-; INJECT BASH
-(
-    [
-        (const_spec
-            name: (identifier)
-            "="
-            (comment) @_comment
-            value: (expression_list
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))
-
-        (var_spec
-            name: (identifier)
-            "="
-            (comment) @_comment
-            value: (expression_list
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))
-
-        (assignment_statement
-        left: (expression_list)
-        "="
-        (comment) @_comment
-        right: (expression_list
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))
-
-        (short_var_declaration
-        left: (expression_list)
-        ":="
-        (comment) @_comment
-        right: (expression_list
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))
-
-        (composite_literal
-            body: (literal_value
-            (keyed_element
-            (comment) @_comment
-            value: (literal_element
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))))
-
-        (expression_statement
-            (call_expression
-            (argument_list
-            (comment) @_comment
-            [
-               	(interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        )))
-    ]
-    (#match? @_comment "^\\/\\*\\s*bash\\s*\\*\\/") ; /* bash */ or /*bash*/
-    (#set! injection.language "bash")
-)
-
-; INJECT CSV
-(
-    [
-        (const_spec
-            name: (identifier)
-            "="
-            (comment) @_comment
-            value: (expression_list
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))
-
-        (var_spec
-            name: (identifier)
-            "="
-            (comment) @_comment
-            value: (expression_list
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))
-
-        (assignment_statement
-        left: (expression_list)
-        "="
-        (comment) @_comment
-        right: (expression_list
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))
-
-        (short_var_declaration
-        left: (expression_list)
-        ":="
-        (comment) @_comment
-        right: (expression_list
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))
-
-        ((comment) @_comment
-            value: (literal_element
-            [
-                (interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        ))
-
-        (argument_list
-            (comment) @_comment
-            [
-               	(interpreted_string_literal (interpreted_string_literal_content) @injection.content)
-                (raw_string_literal (raw_string_literal_content) @injection.content)
-            ]
-        )
-    ]
-    (#match? @_comment "^\\/\\*\\s*csv\\s*\\*\\/") ; /* csv */ or /*csv */
-    (#set! injection.language "csv")
-)
diff --git a/crates/languages/src/go/outline.scm b/crates/languages/src/go/outline.scm
deleted file mode 100644
index c745f55aff..0000000000
--- a/crates/languages/src/go/outline.scm
+++ /dev/null
@@ -1,67 +0,0 @@
-(comment) @annotation
-
-(type_declaration
-    "type" @context
-    [
-        (type_spec
-            name: (_) @name) @item
-        (
-            "("
-            (type_spec
-                name: (_) @name) @item
-            ")"
-      )
-    ]
-)
-
-(function_declaration
-    "func" @context
-    name: (identifier) @name
-    parameters: (parameter_list
-      "("
-      ")")) @item
-
-(method_declaration
-    "func" @context
-    receiver: (parameter_list
-        "(" @context
-        (parameter_declaration
-            name: (_) @context
-            type: (_) @context)
-        ")" @context)
-    name: (field_identifier) @name
-    parameters: (parameter_list
-      "("
-      ")")) @item
-
-(const_declaration
-    "const" @context
-    (const_spec
-        name: (identifier) @name) @item)
-
-(source_file
-    (var_declaration
-        "var" @context
-        [
-            ; The declaration may define multiple variables, and so @item is on
-            ; the identifier so they get distinct ranges.
-            (var_spec
-                name: (identifier) @name @item)
-            (var_spec_list
-                (var_spec
-                    name: (identifier) @name @item)
-            )
-        ]
-     )
-)
-
-(method_elem
-    name: (_) @name
-    parameters: (parameter_list
-      "(" @context
-      ")" @context)) @item
-
-; Fields declarations may define multiple fields, and so @item is on the
-; declarator so they each get distinct ranges.
-(field_declaration
-    name: (_) @name @item)
diff --git a/crates/languages/src/go/overrides.scm b/crates/languages/src/go/overrides.scm
deleted file mode 100644
index aae1520301..0000000000
--- a/crates/languages/src/go/overrides.scm
+++ /dev/null
@@ -1,6 +0,0 @@
-(comment) @comment.inclusive
-[
-  (interpreted_string_literal)
-  (raw_string_literal)
-  (rune_literal)
-] @string
diff --git a/crates/languages/src/go/runnables.scm b/crates/languages/src/go/runnables.scm
deleted file mode 100644
index d3002a06cc..0000000000
--- a/crates/languages/src/go/runnables.scm
+++ /dev/null
@@ -1,208 +0,0 @@
-; Functions names start with `Test`
-(
-  (
-    (function_declaration name: (_) @run
-      (#match? @run "^Test.*"))
-  ) @_
-  (#set! tag go-test)
-)
-
-; Suite test methods (testify/suite)
-(
-    (method_declaration
-      receiver: (parameter_list
-        (parameter_declaration
-            type: [
-                (pointer_type (type_identifier) @_suite_name)
-                (type_identifier) @_suite_name
-            ]
-        )
-      )
-      name: (field_identifier) @run @_subtest_name
-      (#match? @_subtest_name "^Test.*")
-      (#match? @_suite_name ".*Suite")
-    ) @_
-    (#set! tag go-testify-suite)
-)
-
-; `go:generate` comments
-(
-    ((comment) @_comment @run
-    (#match? @_comment "^//go:generate"))
-    (#set! tag go-generate)
-)
-
-; `t.Run`
-(
-  (
-    (call_expression
-      function: (
-        selector_expression
-        field: _ @run @_name
-        (#eq? @_name "Run")
-      )
-      arguments: (
-        argument_list
-        .
-        [
-          (interpreted_string_literal)
-          (raw_string_literal)
-        ] @_subtest_name
-        .
-        (func_literal
-          parameters: (
-            parameter_list
-            (parameter_declaration
-              name: (identifier) @_param_name
-              type: (pointer_type
-                (qualified_type
-                  package: (package_identifier) @_pkg
-                  name: (type_identifier) @_type
-                  (#eq? @_pkg "testing")
-                  (#eq? @_type "T")
-                )
-              )
-            )
-          )
-        ) @_second_argument
-      )
-    )
-  ) @_
-  (#set! tag go-subtest)
-)
-
-; Functions names start with `Example`
-(
-  (
-    (function_declaration name: (_) @run @_name
-      (#match? @_name "^Example.*"))
-  ) @_
-  (#set! tag go-example)
-)
-
-; Functions names start with `Benchmark`
-(
-  (
-    (function_declaration name: (_) @run @_name
-      (#match? @_name "^Benchmark.*"))
-  ) @_
-  (#set! tag go-benchmark)
-)
-
-; Functions names start with `Fuzz`
-(
-  (
-    (function_declaration name: (_) @run @_name
-      (#match? @_name "^Fuzz"))
-  ) @_
-  (#set! tag go-fuzz)
-)
-
-; go run
-(
-  (
-    (function_declaration name: (_) @run
-      (#eq? @run "main"))
-  ) @_
-  (#set! tag go-main)
-)
-
-; Table test cases - slice and map
-(
-  (short_var_declaration
-    left: (expression_list (identifier) @_collection_var)
-    right: (expression_list
-      (composite_literal
-        type: [
-          (slice_type)
-          (map_type
-            key: (type_identifier) @_key_type
-            (#eq? @_key_type "string")
-          )
-        ]
-        body: (literal_value
-          [
-            (literal_element
-              (literal_value
-                (keyed_element
-                  (literal_element
-                    (identifier) @_field_name
-                  )
-                  (literal_element
-                    [
-                      (interpreted_string_literal) @run @_table_test_case_name
-                      (raw_string_literal) @run @_table_test_case_name
-                    ]
-                  )
-                )
-              )
-            )
-            (keyed_element
-              (literal_element
-                [
-                  (interpreted_string_literal) @run @_table_test_case_name
-                  (raw_string_literal) @run @_table_test_case_name
-                ]
-              )
-            )
-          ]
-        )
-      )
-    )
-  )
-  (for_statement
-    (range_clause
-      left: (expression_list
-        [
-          (
-            (identifier)
-            (identifier) @_loop_var_inner
-          )
-          (identifier) @_loop_var_outer
-        ]
-      )
-      right: (identifier) @_range_var
-      (#eq? @_range_var @_collection_var)
-    )
-    body: (block
-      (expression_statement
-        (call_expression
-          function: (selector_expression
-            operand: (identifier)
-            field: (field_identifier) @_run_method
-            (#eq? @_run_method "Run")
-          )
-          arguments: (argument_list
-            .
-            [
-              (selector_expression
-                operand: (identifier) @_tc_var
-                (#eq? @_tc_var @_loop_var_inner)
-                field: (field_identifier) @_field_check
-                (#eq? @_field_check @_field_name)
-              )
-              (identifier) @_arg_var
-              (#eq? @_arg_var @_loop_var_outer)
-            ]
-            .
-            (func_literal
-              parameters: (parameter_list
-                (parameter_declaration
-                  type: (pointer_type
-                    (qualified_type
-                      package: (package_identifier) @_pkg
-                      name: (type_identifier) @_type
-                      (#eq? @_pkg "testing")
-                      (#eq? @_type "T")
-                    )
-                  )
-                )
-              )
-            )
-          )
-        )
-      )
-    )
-  ) @_
-  (#set! tag go-table-test-case)
-)
diff --git a/crates/languages/src/go/textobjects.scm b/crates/languages/src/go/textobjects.scm
deleted file mode 100644
index eb4f3a0050..0000000000
--- a/crates/languages/src/go/textobjects.scm
+++ /dev/null
@@ -1,25 +0,0 @@
-(function_declaration
-    body: (_
-        "{"
-        (_)* @function.inside
-        "}")) @function.around
-
-(method_declaration
-    body: (_
-        "{"
-        (_)* @function.inside
-        "}")) @function.around
-
-(type_declaration
-    (type_spec (struct_type (field_declaration_list (
-        "{"
-        (_)* @class.inside
-        "}")?)))) @class.around
-
-(type_declaration
-    (type_spec (interface_type
-        (_)* @class.inside))) @class.around
-
-(type_declaration) @class.around
-
-(comment)+ @comment.around
diff --git a/crates/languages/src/gomod/config.toml b/crates/languages/src/gomod/config.toml
deleted file mode 100644
index e70c9358bf..0000000000
--- a/crates/languages/src/gomod/config.toml
+++ /dev/null
@@ -1,9 +0,0 @@
-name = "Go Mod"
-code_fence_block_name = "go.mod"
-grammar = "gomod"
-path_suffixes = ["mod"]
-line_comments = ["//"]
-autoclose_before = ")"
-brackets = [
-    { start = "(", end = ")", close = true, newline = true}
-]
diff --git a/crates/languages/src/gomod/highlights.scm b/crates/languages/src/gomod/highlights.scm
deleted file mode 100644
index 03be1b5957..0000000000
--- a/crates/languages/src/gomod/highlights.scm
+++ /dev/null
@@ -1,20 +0,0 @@
-[
-  "require"
-  "replace"
-  "go"
-  "toolchain"
-  "tool"
-  "exclude"
-  "retract"
-  "module"
-  "ignore"
-] @keyword
-
-"=>" @operator
-
-(comment) @comment
-
-[
-(version)
-(go_version)
-] @string
diff --git a/crates/languages/src/gomod/injections.scm b/crates/languages/src/gomod/injections.scm
deleted file mode 100644
index 321c90add3..0000000000
--- a/crates/languages/src/gomod/injections.scm
+++ /dev/null
@@ -1,2 +0,0 @@
-((comment) @injection.content
- (#set! injection.language "comment"))
diff --git a/crates/languages/src/gomod/structure.scm b/crates/languages/src/gomod/structure.scm
deleted file mode 100644
index ce1bc9aa3e..0000000000
--- a/crates/languages/src/gomod/structure.scm
+++ /dev/null
@@ -1,35 +0,0 @@
-(require_directive
-  "require" @structure.anchor
-  ("(") @structure.open
-  (")") @structure.close
-)
-
-(exclude_directive
-  "exclude" @structure.anchor
-  ("(") @structure.open
-  (")") @structure.close
-)
-
-(module_directive
-  "module" @structure.anchor
-  ("(") @structure.open
-  (")") @structure.close
-)
-
-(replace_directive
-  "replace" @structure.anchor
-  ("(") @structure.open
-  (")") @structure.close
-)
-
-(retract_directive
-  "retract" @structure.anchor
-  ("(") @structure.open
-  (")") @structure.close
-)
-
-(ignore_directive
-  "ignore" @structure.anchor
-  ("(") @structure.open
-  (")") @structure.close
-)
diff --git a/crates/languages/src/gowork/config.toml b/crates/languages/src/gowork/config.toml
deleted file mode 100644
index 68beb073ab..0000000000
--- a/crates/languages/src/gowork/config.toml
+++ /dev/null
@@ -1,9 +0,0 @@
-name = "Go Work"
-code_fence_block_name = "gowork"
-grammar = "gowork"
-path_suffixes = ["work"]
-line_comments = ["//"]
-autoclose_before = ")"
-brackets = [
-    { start = "(", end = ")", close = true, newline = true}
-]
diff --git a/crates/languages/src/gowork/highlights.scm b/crates/languages/src/gowork/highlights.scm
deleted file mode 100644
index 9c84bcc449..0000000000
--- a/crates/languages/src/gowork/highlights.scm
+++ /dev/null
@@ -1,14 +0,0 @@
-[
-  "replace"
-  "go"
-  "use"
-] @keyword
-
-"=>" @operator
-
-(comment) @comment
-
-[
-(version)
-(go_version)
-] @string
diff --git a/crates/languages/src/gowork/injections.scm b/crates/languages/src/gowork/injections.scm
deleted file mode 100644
index 321c90add3..0000000000
--- a/crates/languages/src/gowork/injections.scm
+++ /dev/null
@@ -1,2 +0,0 @@
-((comment) @injection.content
- (#set! injection.language "comment"))
diff --git a/crates/languages/src/javascript/brackets.scm b/crates/languages/src/javascript/brackets.scm
deleted file mode 100644
index a16a643269..0000000000
--- a/crates/languages/src/javascript/brackets.scm
+++ /dev/null
@@ -1,9 +0,0 @@
-("(" @open ")" @close)
-("[" @open "]" @close)
-("{" @open "}" @close)
-("<" @open ">" @close)
-("<" @open "/>" @close)
-("</" @open ">" @close)
-(("\"" @open "\"" @close) (#set! rainbow.exclude))
-(("'" @open "'" @close) (#set! rainbow.exclude))
-(("`" @open "`" @close) (#set! rainbow.exclude))
diff --git a/crates/languages/src/javascript/config.toml b/crates/languages/src/javascript/config.toml
deleted file mode 100644
index 265f362ce4..0000000000
--- a/crates/languages/src/javascript/config.toml
+++ /dev/null
@@ -1,44 +0,0 @@
-name = "JavaScript"
-grammar = "tsx"
-path_suffixes = ["js", "jsx", "mjs", "cjs"]
-# [/ ] is so we match "env node" or "/node" but not "ts-node"
-first_line_pattern = '^#!.*\b(?:[/ ]node|deno run.*--ext[= ]js)\b'
-line_comments = ["// "]
-block_comment = { start = "/*", prefix = "* ", end = "*/", tab_size = 1 }
-documentation_comment = { start = "/**", prefix = "* ", end = "*/", tab_size = 1 }
-wrap_characters = { start_prefix = "<", start_suffix = ">", end_prefix = "</", end_suffix = ">" }
-autoclose_before = ";:.,=}])>"
-brackets = [
-    { start = "{", end = "}", close = true, newline = true },
-    { start = "[", end = "]", close = true, newline = true },
-    { start = "(", end = ")", close = true, newline = true },
-    { start = "<", end = ">", close = false, newline = true, not_in = ["comment", "string"] },
-    { start = "\"", end = "\"", close = true, newline = false, not_in = ["comment", "string"] },
-    { start = "'", end = "'", close = true, newline = false, not_in = ["comment", "string"] },
-    { start = "`", end = "`", close = true, newline = false, not_in = ["comment", "string"] },
-    { start = "/*", end = " */", close = true, newline = false, not_in = ["comment", "string"] },
-]
-word_characters = ["$", "#"]
-tab_size = 2
-scope_opt_in_language_servers = ["tailwindcss-language-server", "emmet-language-server"]
-prettier_parser_name = "babel"
-debuggers = ["JavaScript"]
-import_path_strip_regex = "(?:/index)?\\.[jt]s$"
-
-[jsx_tag_auto_close]
-open_tag_node_name = "jsx_opening_element"
-close_tag_node_name = "jsx_closing_element"
-jsx_element_node_name = "jsx_element"
-tag_name_node_name = "identifier"
-
-[overrides.default]
-linked_edit_characters = ["."]
-
-[overrides.element]
-line_comments = { remove = true }
-block_comment = { start = "{/* ", prefix = "", end = "*/}", tab_size = 0 }
-opt_into_language_servers = ["emmet-language-server"]
-
-[overrides.string]
-completion_query_characters = ["-", "."]
-opt_into_language_servers = ["tailwindcss-language-server"]
diff --git a/crates/languages/src/javascript/contexts.scm b/crates/languages/src/javascript/contexts.scm
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/crates/languages/src/javascript/debugger.scm b/crates/languages/src/javascript/debugger.scm
deleted file mode 100644
index a99f194a4a..0000000000
--- a/crates/languages/src/javascript/debugger.scm
+++ /dev/null
@@ -1,23 +0,0 @@
-(lexical_declaration (variable_declarator name: (identifier) @debug-variable))
-
-(for_in_statement left: (identifier) @debug-variable)
-(for_statement initializer: (lexical_declaration (variable_declarator name: (identifier) @debug-variable)))
-
-(binary_expression left: (identifier) @debug-variable (#not-match? @debug-variable "^[A-Z]"))
-(binary_expression right: (identifier) @debug-variable (#not-match? @debug-variable "^[A-Z]"))
-
-(unary_expression argument: (identifier) @debug-variable (#not-match? @debug-variable "^[A-Z]"))
-(update_expression argument: (identifier) @debug-variable (#not-match? @debug-variable "^[A-Z]"))
-
-(return_statement (identifier) @debug-variable (#not-match? @debug-variable "^[A-Z]"))
-
-(parenthesized_expression (identifier) @debug-variable (#not-match? @debug-variable "^[A-Z]"))
-
-(array (identifier) @debug-variable (#not-match? @debug-variable "^[A-Z]"))
-
-(pair value: (identifier) @debug-variable (#not-match? @debug-variable "^[A-Z]"))
-
-(member_expression object: (identifier) @debug-variable (#not-match? @debug-variable "^[A-Z]"))
-
-(statement_block) @debug-scope
-(program) @debug-scope
diff --git a/crates/languages/src/javascript/embedding.scm b/crates/languages/src/javascript/embedding.scm
deleted file mode 100644
index ab1a3b6b06..0000000000
--- a/crates/languages/src/javascript/embedding.scm
+++ /dev/null
@@ -1,71 +0,0 @@
-(
-    (comment)* @context
-    .
-    [
-        (export_statement
-            (function_declaration
-                "async"? @name
-                "function" @name
-                name: (_) @name))
-        (function_declaration
-            "async"? @name
-            "function" @name
-            name: (_) @name)
-    ] @item
-)
-
-(
-    (comment)* @context
-    .
-    [
-        (export_statement
-            (class_declaration
-                "class" @name
-                name: (_) @name))
-        (class_declaration
-            "class" @name
-            name: (_) @name)
-    ] @item
-)
-
-(
-    (comment)* @context
-    .
-    [
-        (export_statement
-            (interface_declaration
-                "interface" @name
-                name: (_) @name))
-        (interface_declaration
-            "interface" @name
-            name: (_) @name)
-    ] @item
-)
-
-(
-    (comment)* @context
-    .
-    [
-        (export_statement
-            (enum_declaration
-                "enum" @name
-                name: (_) @name))
-        (enum_declaration
-            "enum" @name
-            name: (_) @name)
-    ] @item
-)
-
-(
-    (comment)* @context
-    .
-    (method_definition
-        [
-            "get"
-            "set"
-            "async"
-            "*"
-            "static"
-            ]* @name
-        name: (_) @name) @item
-)
diff --git a/crates/languages/src/javascript/highlights.scm b/crates/languages/src/javascript/highlights.scm
deleted file mode 100644
index d13db50e2e..0000000000
--- a/crates/languages/src/javascript/highlights.scm
+++ /dev/null
@@ -1,362 +0,0 @@
-; Variables
-
-(identifier) @variable
-
-(call_expression
-  function: (member_expression
-    object: (identifier) @type.builtin
-    (#any-of?
-      @type.builtin
-      "Promise"
-      "Array"
-      "Object"
-      "Map"
-      "Set"
-      "WeakMap"
-      "WeakSet"
-      "Date"
-      "Error"
-      "TypeError"
-      "RangeError"
-      "SyntaxError"
-      "ReferenceError"
-      "EvalError"
-      "URIError"
-      "RegExp"
-      "Function"
-      "Number"
-      "String"
-      "Boolean"
-      "Symbol"
-      "BigInt"
-      "Proxy"
-      "ArrayBuffer"
-      "DataView"
-    )
-  )
-)
-
-; Properties
-
-(property_identifier) @property
-(shorthand_property_identifier) @property
-(shorthand_property_identifier_pattern) @property
-(private_property_identifier) @property
-
-; Function and method calls
-
-(call_expression
-  function: (identifier) @function)
-
-(call_expression
-  function: (member_expression
-      property: [(property_identifier) (private_property_identifier)] @function.method))
-
-(new_expression
-  constructor: (identifier) @type)
-
-(nested_type_identifier
-  module: (identifier) @type)
-
-; Function and method definitions
-
-(function_expression
-  name: (identifier) @function)
-(function_declaration
-  name: (identifier) @function)
-(method_definition
-  name: [(property_identifier) (private_property_identifier)] @function.method)
-(method_definition
-    name: (property_identifier) @constructor
-    (#eq? @constructor "constructor"))
-
-(pair
-  key: [(property_identifier) (private_property_identifier)] @function.method
-  value: [(function_expression) (arrow_function)])
-
-(assignment_expression
-  left: (member_expression
-    property: [(property_identifier) (private_property_identifier)] @function.method)
-  right: [(function_expression) (arrow_function)])
-
-(variable_declarator
-  name: (identifier) @function
-  value: [(function_expression) (arrow_function)])
-
-(assignment_expression
-  left: (identifier) @function
-  right: [(function_expression) (arrow_function)])
-
-; Parameters
-
-(required_parameter
-  (identifier) @variable.parameter)
-
-(required_parameter
-  (_
-    ([
-      (identifier)
-      (shorthand_property_identifier_pattern)
-    ]) @variable.parameter))
-
-(optional_parameter
-  (identifier) @variable.parameter)
-
-(optional_parameter
-  (_
-    ([
-      (identifier)
-      (shorthand_property_identifier_pattern)
-    ]) @variable.parameter))
-
-(catch_clause
-  parameter: (identifier) @variable.parameter)
-
-(index_signature
-  name: (identifier) @variable.parameter)
-
-(arrow_function
-  parameter: (identifier) @variable.parameter)
-
-; Special identifiers
-;
-(class_declaration
-  (type_identifier) @type.class)
-
-(extends_clause
-  value: (identifier) @type.class)
-
-(type_identifier) @type
-(predefined_type) @type.builtin
-
-([
-  (identifier)
-  (shorthand_property_identifier)
-  (shorthand_property_identifier_pattern)
- ] @constant
- (#match? @constant "^_*[A-Z_][A-Z\\d_]*$"))
-
-; Literals
-
-(this) @variable.special
-(super) @variable.special
-
-[
-  (null)
-  (undefined)
-] @constant.builtin
-
-[
-  (true)
-  (false)
-] @boolean
-
-(comment) @comment
-
-(hash_bang_line) @comment
-
-[
-  (string)
-  (template_string)
-] @string
-
-(escape_sequence) @string.escape
-
-(regex) @string.regex
-(regex_flags) @keyword.operator.regex
-(number) @number
-
-; Tokens
-
-[
-  ";"
-  "?."
-  "."
-  ","
-  ":"
-] @punctuation.delimiter
-
-[
-  "-"
-  "--"
-  "-="
-  "+"
-  "++"
-  "+="
-  "*"
-  "*="
-  "**"
-  "**="
-  "/"
-  "/="
-  "%"
-  "%="
-  "<"
-  "<="
-  "<<"
-  "<<="
-  "="
-  "=="
-  "==="
-  "!"
-  "!="
-  "!=="
-  "=>"
-  ">"
-  ">="
-  ">>"
-  ">>="
-  ">>>"
-  ">>>="
-  "~"
-  "^"
-  "&"
-  "|"
-  "^="
-  "&="
-  "|="
-  "&&"
-  "||"
-  "??"
-  "&&="
-  "||="
-  "??="
-  "..."
-] @operator
-
-(regex "/" @string.regex)
-
-[
-  "("
-  ")"
-  "["
-  "]"
-  "{"
-  "}"
-]  @punctuation.bracket
-
-(ternary_expression
-  [
-    "?"
-    ":"
-  ] @operator
-)
-
-[
-  "as"
-  "async"
-  "await"
-  "class"
-  "const"
-  "debugger"
-  "default"
-  "delete"
-  "export"
-  "extends"
-  "from"
-  "function"
-  "get"
-  "import"
-  "in"
-  "instanceof"
-  "let"
-  "new"
-  "of"
-  "set"
-  "static"
-  "target"
-  "typeof"
-  "using"
-  "var"
-  "void"
-  "with"
-] @keyword
-
-[
-  "break"
-  "case"
-  "catch"
-  "continue"
-  "do"
-  "else"
-  "finally"
-  "for"
-  "if"
-  "return"
-  "switch"
-  "throw"
-  "try"
-  "while"
-  "yield"
-] @keyword.control
-
-(switch_default "default" @keyword.control)
-
-(template_substitution
-  "${" @punctuation.special
-  "}" @punctuation.special) @embedded
-
-(type_arguments
-  "<" @punctuation.bracket
-  ">" @punctuation.bracket)
-
-(decorator "@" @punctuation.special)
-
-; Keywords
-
-[ "abstract"
-  "declare"
-  "enum"
-  "export"
-  "implements"
-  "interface"
-  "keyof"
-  "module"
-  "namespace"
-  "private"
-  "protected"
-  "public"
-  "type"
-  "readonly"
-  "override"
-] @keyword
-
-; JSX elements
-(jsx_opening_element (identifier) @tag.jsx (#match? @tag.jsx "^[a-z][^.]*$"))
-(jsx_closing_element (identifier) @tag.jsx (#match? @tag.jsx "^[a-z][^.]*$"))
-(jsx_self_closing_element (identifier) @tag.jsx (#match? @tag.jsx "^[a-z][^.]*$"))
-
-(jsx_opening_element
-  [
-    (identifier) @type
-    (member_expression
-      object: (identifier) @type
-      property: (property_identifier) @type
-    )
-  ]
-)
-(jsx_closing_element
-  [
-    (identifier) @type
-    (member_expression
-      object: (identifier) @type
-      property: (property_identifier) @type
-    )
-  ]
-)
-(jsx_self_closing_element
-  [
-    (identifier) @type
-    (member_expression
-      object: (identifier) @type
-      property: (property_identifier) @type
-    )
-  ]
-)
-
-(jsx_attribute (property_identifier) @attribute.jsx)
-(jsx_opening_element (["<" ">"]) @punctuation.bracket.jsx)
-(jsx_closing_element (["</" ">"]) @punctuation.bracket.jsx)
-(jsx_self_closing_element (["<" "/>"]) @punctuation.bracket.jsx)
-(jsx_attribute "=" @punctuation.delimiter.jsx)
-(jsx_text) @text.jsx
diff --git a/crates/languages/src/javascript/imports.scm b/crates/languages/src/javascript/imports.scm
deleted file mode 100644
index e26b97aeef..0000000000
--- a/crates/languages/src/javascript/imports.scm
+++ /dev/null
@@ -1,14 +0,0 @@
-(import_statement
-    import_clause: (import_clause
-        [
-            (identifier) @name
-            (named_imports
-                (import_specifier
-                    name: (_) @name
-                    alias: (_)? @alias))
-        ])
-    source: (string (string_fragment) @source)) @import
-
-(import_statement
-    !import_clause
-    source: (string (string_fragment) @source @wildcard)) @import
diff --git a/crates/languages/src/javascript/indents.scm b/crates/languages/src/javascript/indents.scm
deleted file mode 100644
index 9897f3060e..0000000000
--- a/crates/languages/src/javascript/indents.scm
+++ /dev/null
@@ -1,21 +0,0 @@
-[
-    (call_expression)
-    (assignment_expression)
-    (member_expression)
-    (lexical_declaration)
-    (variable_declaration)
-    (assignment_expression)
-    (if_statement)
-    (for_statement)
-] @indent
-
-(_ "[" "]" @end) @indent
-(_ "<" ">" @end) @indent
-(_ "{" "}" @end) @indent
-(_ "(" ")" @end) @indent
-
-(jsx_opening_element ">" @end) @indent
-
-(jsx_element
-  (jsx_opening_element) @start
-  (jsx_closing_element)? @end) @indent
diff --git a/crates/languages/src/javascript/injections.scm b/crates/languages/src/javascript/injections.scm
deleted file mode 100644
index f79cd788d7..0000000000
--- a/crates/languages/src/javascript/injections.scm
+++ /dev/null
@@ -1,85 +0,0 @@
-((comment) @injection.content
- (#set! injection.language "comment")
-)
-
-(((comment) @_jsdoc_comment
-  (#match? @_jsdoc_comment "(?s)^/[*][*][^*].*[*]/$")) @injection.content
-  (#set! injection.language "jsdoc"))
-
-((regex) @injection.content
-  (#set! injection.language "regex"))
-
-(call_expression
-  function: (identifier) @_name (#eq? @_name "css")
-  arguments: (template_string (string_fragment) @injection.content
-                              (#set! injection.language "css"))
-)
-
-(call_expression
-  function: (member_expression
-    object: (identifier) @_obj (#eq? @_obj "styled")
-    property: (property_identifier))
-  arguments: (template_string (string_fragment) @injection.content
-                              (#set! injection.language "css"))
-)
-
-(call_expression
-  function: (call_expression
-    function: (identifier) @_name (#eq? @_name "styled"))
-  arguments: (template_string (string_fragment) @injection.content
-                              (#set! injection.language "css"))
-)
-
-(call_expression
-  function: (identifier) @_name (#eq? @_name "html")
-  arguments: (template_string) @injection.content
-                              (#set! injection.language "html")
-)
-
-(call_expression
-  function: (identifier) @_name (#eq? @_name "js")
-  arguments: (template_string (string_fragment) @injection.content
-                              (#set! injection.language "javascript"))
-)
-
-(call_expression
-  function: (identifier) @_name (#eq? @_name "json")
-  arguments: (template_string (string_fragment) @injection.content
-                              (#set! injection.language "json"))
-)
-
-(call_expression
-  function: (identifier) @_name (#eq? @_name "sql")
-  arguments: (template_string (string_fragment) @injection.content
-                              (#set! injection.language "sql"))
-)
-
-(call_expression
-  function: (identifier) @_name (#eq? @_name "ts")
-  arguments: (template_string (string_fragment) @injection.content
-                              (#set! injection.language "typescript"))
-)
-
-(call_expression
-  function: (identifier) @_name (#match? @_name "^ya?ml$")
-  arguments: (template_string (string_fragment) @injection.content
-                              (#set! injection.language "yaml"))
-)
-
-(call_expression
-  function: (identifier) @_name (#match? @_name "^g(raph)?ql$")
-  arguments: (template_string (string_fragment) @injection.content
-                              (#set! injection.language "graphql"))
-)
-
-(call_expression
-  function: (identifier) @_name (#match? @_name "^g(raph)?ql$")
-  arguments: (arguments (template_string (string_fragment) @injection.content
-                              (#set! injection.language "graphql")))
-)
-
-(call_expression
-  function: (identifier) @_name(#match? @_name "^iso$")
-  arguments: (arguments (template_string (string_fragment) @injection.content
-                              (#set! injection.language "isograph")))
-)
diff --git a/crates/languages/src/javascript/outline.scm b/crates/languages/src/javascript/outline.scm
deleted file mode 100644
index 5f72103bc6..0000000000
--- a/crates/languages/src/javascript/outline.scm
+++ /dev/null
@@ -1,223 +0,0 @@
-(internal_module
-    "namespace" @context
-    name: (_) @name) @item
-
-(enum_declaration
-    "enum" @context
-    name: (_) @name) @item
-
-(function_declaration
-    "async"? @context
-    "function" @context
-    name: (_) @name
-    parameters: (formal_parameters
-      "(" @context
-      ")" @context)) @item
-
-(generator_function_declaration
-    "async"? @context
-    "function" @context
-    "*" @context
-    name: (_) @name
-    parameters: (formal_parameters
-      "(" @context
-      ")" @context)) @item
-
-(interface_declaration
-    "interface" @context
-    name: (_) @name) @item
-
-(program
-    (export_statement
-        (lexical_declaration
-            ["let" "const"] @context
-            (variable_declarator
-                name: (identifier) @name) @item)))
-
-; Exported array destructuring
-(program
-    (export_statement
-        (lexical_declaration
-            ["let" "const"] @context
-            (variable_declarator
-                name: (array_pattern
-                    [
-                        (identifier) @name @item
-                        (assignment_pattern left: (identifier) @name @item)
-                        (rest_pattern (identifier) @name @item)
-                    ])))))
-
-; Exported object destructuring
-(program
-    (export_statement
-        (lexical_declaration
-            ["let" "const"] @context
-            (variable_declarator
-                name: (object_pattern
-                    [(shorthand_property_identifier_pattern) @name @item
-                     (pair_pattern
-                         value: (identifier) @name @item)
-                     (pair_pattern
-                         value: (assignment_pattern left: (identifier) @name @item))
-                     (rest_pattern (identifier) @name @item)])))))
-
-(program
-    (lexical_declaration
-        ["let" "const"] @context
-        (variable_declarator
-            name: (identifier) @name) @item))
-
-; Top-level array destructuring
-(program
-    (lexical_declaration
-        ["let" "const"] @context
-        (variable_declarator
-            name: (array_pattern
-                [
-                    (identifier) @name @item
-                    (assignment_pattern left: (identifier) @name @item)
-                    (rest_pattern (identifier) @name @item)
-                ]))))
-
-; Top-level object destructuring
-(program
-    (lexical_declaration
-        ["let" "const"] @context
-        (variable_declarator
-            name: (object_pattern
-                [(shorthand_property_identifier_pattern) @name @item
-                 (pair_pattern
-                     value: (identifier) @name @item)
-                 (pair_pattern
-                     value: (assignment_pattern left: (identifier) @name @item))
-                 (rest_pattern (identifier) @name @item)]))))
-
-(class_declaration
-    "class" @context
-    name: (_) @name) @item
-
-; Method definitions in classes (not in object literals)
-(class_body
-    (method_definition
-        [
-            "get"
-            "set"
-            "async"
-            "*"
-            "readonly"
-            "static"
-            (override_modifier)
-            (accessibility_modifier)
-        ]* @context
-        name: (_) @name
-        parameters: (formal_parameters
-          "(" @context
-          ")" @context)) @item)
-
-; Object literal methods
-(variable_declarator
-    value: (object
-        (method_definition
-            [
-                "get"
-                "set"
-                "async"
-                "*"
-            ]* @context
-            name: (_) @name
-            parameters: (formal_parameters
-              "(" @context
-              ")" @context)) @item))
-
-(public_field_definition
-    [
-        "declare"
-        "readonly"
-        "abstract"
-        "static"
-        (accessibility_modifier)
-    ]* @context
-    name: (_) @name) @item
-
-; Add support for (node:test, bun:test and Jest) runnable
-(
-    (call_expression
-        function: [
-            (identifier) @_name
-            (member_expression
-                object: [
-                    (identifier) @_name
-                    (member_expression object: (identifier) @_name)
-                ]
-            )
-        ] @context
-        (#any-of? @_name "it" "test" "describe" "context" "suite")
-        arguments: (
-            arguments . [
-                (string (string_fragment) @name)
-                (identifier) @name
-            ]
-        )
-    )
-) @item
-
-; Add support for parameterized tests
-(
-    (call_expression
-        function: (call_expression
-            function: (member_expression
-                object: [(identifier) @_name (member_expression object: (identifier) @_name)]
-                property: (property_identifier) @_property
-            )
-            (#any-of? @_name "it" "test" "describe" "context" "suite")
-            (#eq? @_property "each")
-        )
-        arguments: (
-            arguments . [
-                (string (string_fragment) @name)
-                (identifier) @name
-            ]
-        )
-    )
-) @item
-
-; Object properties
-(pair
-    key: [
-        (property_identifier) @name
-        (string (string_fragment) @name)
-        (number) @name
-        (computed_property_name) @name
-    ]) @item
-
-; Nested variables in function bodies
-(statement_block
-    (lexical_declaration
-        ["let" "const"] @context
-        (variable_declarator
-            name: (identifier) @name) @item))
-
-; Nested array destructuring in functions
-(statement_block
-    (lexical_declaration
-        ["let" "const"] @context
-        (variable_declarator
-            name: (array_pattern
-                [
-                    (identifier) @name @item
-                    (assignment_pattern left: (identifier) @name @item)
-                    (rest_pattern (identifier) @name @item)
-                ]))))
-
-; Nested object destructuring in functions
-(statement_block
-    (lexical_declaration
-        ["let" "const"] @context
-        (variable_declarator
-            name: (object_pattern
-                [(shorthand_property_identifier_pattern) @name @item
-                 (pair_pattern value: (identifier) @name @item)
-                 (pair_pattern value: (assignment_pattern left: (identifier) @name @item))
-                 (rest_pattern (identifier) @name @item)]))))
-
-(comment) @annotation
diff --git a/crates/languages/src/javascript/overrides.scm b/crates/languages/src/javascript/overrides.scm
deleted file mode 100644
index 6dbbc88ef9..0000000000
--- a/crates/languages/src/javascript/overrides.scm
+++ /dev/null
@@ -1,14 +0,0 @@
-(comment) @comment.inclusive
-
-(string) @string
-
-(template_string (string_fragment) @string)
-
-(jsx_element) @element
-
-[
-  (jsx_opening_element)
-  (jsx_closing_element)
-  (jsx_self_closing_element)
-  (jsx_expression)
-] @default
diff --git a/crates/languages/src/javascript/runnables.scm b/crates/languages/src/javascript/runnables.scm
deleted file mode 100644
index c64aacb50e..0000000000
--- a/crates/languages/src/javascript/runnables.scm
+++ /dev/null
@@ -1,46 +0,0 @@
-; Add support for (node:test, bun:test and Jest) runnable
-; Function expression that has `it`, `test` or `describe` as the function name
-(
-    (call_expression
-        function: [
-            (identifier) @_name
-            (member_expression
-                object: [
-                    (identifier) @_name
-                    (member_expression object: (identifier) @_name)
-                ]
-            )
-        ]
-        (#any-of? @_name "it" "test" "describe" "context" "suite")
-        arguments: (
-            arguments . [
-                (string (string_fragment) @run)
-                (identifier) @run
-            ]
-        )
-    ) @_js-test
-
-    (#set! tag js-test)
-)
-
-; Add support for parameterized tests
-(
-    (call_expression
-        function: (call_expression
-            function: (member_expression
-                object: [(identifier) @_name (member_expression object: (identifier) @_name)]
-                property: (property_identifier) @_property
-            )
-            (#any-of? @_name "it" "test" "describe" "context" "suite")
-            (#eq? @_property "each")
-        )
-        arguments: (
-            arguments . [
-                (string (string_fragment) @run)
-                (identifier) @run
-            ]
-        )
-    ) @_js-test
-
-    (#set! tag js-test)
-)
diff --git a/crates/languages/src/javascript/textobjects.scm b/crates/languages/src/javascript/textobjects.scm
deleted file mode 100644
index 1a273ddb50..0000000000
--- a/crates/languages/src/javascript/textobjects.scm
+++ /dev/null
@@ -1,51 +0,0 @@
-(comment)+ @comment.around
-
-(function_declaration
-    body: (_
-        "{"
-        (_)* @function.inside
-        "}")) @function.around
-
-(method_definition
-    body: (_
-        "{"
-        (_)* @function.inside
-        "}")) @function.around
-
-(function_expression
-    body: (_
-        "{"
-        (_)* @function.inside
-        "}")) @function.around
-
-(arrow_function
-    body: (statement_block
-        "{"
-        (_)* @function.inside
-        "}")) @function.around
-
-(arrow_function) @function.around
-
-(generator_function
-    body: (_
-        "{"
-        (_)* @function.inside
-        "}")) @function.around
-
-(generator_function_declaration
-    body: (_
-        "{"
-        (_)* @function.inside
-        "}")) @function.around
-
-(class_declaration
-    body: (_
-        "{"
-        [(_) ";"?]* @class.inside
-        "}" )) @class.around
-
-(class
-    body: (_
-        "{"
-        [(_) ";"?]* @class.inside
-        "}" )) @class.around
diff --git a/crates/languages/src/jsdoc/brackets.scm b/crates/languages/src/jsdoc/brackets.scm
deleted file mode 100644
index 0e1bf5ca19..0000000000
--- a/crates/languages/src/jsdoc/brackets.scm
+++ /dev/null
@@ -1,2 +0,0 @@
-("[" @open "]" @close)
-("{" @open "}" @close)
diff --git a/crates/languages/src/jsdoc/config.toml b/crates/languages/src/jsdoc/config.toml
deleted file mode 100644
index 0aa0d361bd..0000000000
--- a/crates/languages/src/jsdoc/config.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-name = "JSDoc"
-grammar = "jsdoc"
-autoclose_before = "]}"
-brackets = [
-  { start = "{", end = "}", close = true, newline = false },
-  { start = "[", end = "]", close = true, newline = false },
-]
-hidden = true
diff --git a/crates/languages/src/jsdoc/highlights.scm b/crates/languages/src/jsdoc/highlights.scm
deleted file mode 100644
index 581b5d8111..0000000000
--- a/crates/languages/src/jsdoc/highlights.scm
+++ /dev/null
@@ -1,3 +0,0 @@
-(tag_name) @keyword.jsdoc
-(type) @type.jsdoc
-(identifier) @variable.jsdoc
diff --git a/crates/languages/src/json.rs b/crates/languages/src/json.rs
deleted file mode 100644
index 5168ba6e61..0000000000
--- a/crates/languages/src/json.rs
+++ /dev/null
@@ -1,461 +0,0 @@
-use anyhow::{Context as _, Result, bail};
-use async_compression::futures::bufread::GzipDecoder;
-use async_tar::Archive;
-use async_trait::async_trait;
-use collections::HashMap;
-use futures::StreamExt;
-use gpui::{App, AsyncApp, Task};
-use http_client::github::{GitHubLspBinaryVersion, latest_github_release};
-use language::{
-    ContextProvider, LanguageName, LanguageRegistry, LocalFile as _, LspAdapter,
-    LspAdapterDelegate, LspInstaller, Toolchain,
-};
-use lsp::{LanguageServerBinary, LanguageServerName, Uri};
-use node_runtime::{NodeRuntime, VersionStrategy};
-use project::lsp_store::language_server_settings;
-use serde_json::{Value, json};
-use smol::{
-    fs::{self},
-    io::BufReader,
-};
-use std::{
-    env::consts,
-    ffi::OsString,
-    path::{Path, PathBuf},
-    str::FromStr,
-    sync::Arc,
-};
-use task::{TaskTemplate, TaskTemplates, VariableName};
-use util::{
-    ResultExt, archive::extract_zip, fs::remove_matching, maybe, merge_json_value_into,
-    rel_path::RelPath,
-};
-
-use crate::PackageJsonData;
-
-const SERVER_PATH: &str =
-    "node_modules/vscode-langservers-extracted/bin/vscode-json-language-server";
-
-pub(crate) struct JsonTaskProvider;
-
-impl ContextProvider for JsonTaskProvider {
-    fn associated_tasks(
-        &self,
-        file: Option<Arc<dyn language::File>>,
-        cx: &App,
-    ) -> gpui::Task<Option<TaskTemplates>> {
-        let Some(file) = project::File::from_dyn(file.as_ref()).cloned() else {
-            return Task::ready(None);
-        };
-        let is_package_json = file.path.ends_with(RelPath::unix("package.json").unwrap());
-        let is_composer_json = file.path.ends_with(RelPath::unix("composer.json").unwrap());
-        if !is_package_json && !is_composer_json {
-            return Task::ready(None);
-        }
-
-        cx.spawn(async move |cx| {
-            let contents = file
-                .worktree
-                .update(cx, |this, cx| this.load_file(&file.path, cx))
-                .ok()?
-                .await
-                .ok()?;
-            let path = cx.update(|cx| file.abs_path(cx)).ok()?.as_path().into();
-
-            let task_templates = if is_package_json {
-                let package_json = serde_json_lenient::from_str::<
-                    HashMap<String, serde_json_lenient::Value>,
-                >(&contents.text)
-                .ok()?;
-                let package_json = PackageJsonData::new(path, package_json);
-                let command = package_json.package_manager.unwrap_or("npm").to_owned();
-                package_json
-                    .scripts
-                    .into_iter()
-                    .map(|(_, key)| TaskTemplate {
-                        label: format!("run {key}"),
-                        command: command.clone(),
-                        args: vec!["run".into(), key],
-                        cwd: Some(VariableName::Dirname.template_value()),
-                        ..TaskTemplate::default()
-                    })
-                    .chain([TaskTemplate {
-                        label: "package script $ZED_CUSTOM_script".to_owned(),
-                        command: command.clone(),
-                        args: vec![
-                            "run".into(),
-                            VariableName::Custom("script".into()).template_value(),
-                        ],
-                        cwd: Some(VariableName::Dirname.template_value()),
-                        tags: vec!["package-script".into()],
-                        ..TaskTemplate::default()
-                    }])
-                    .collect()
-            } else if is_composer_json {
-                serde_json_lenient::Value::from_str(&contents.text)
-                    .ok()?
-                    .get("scripts")?
-                    .as_object()?
-                    .keys()
-                    .map(|key| TaskTemplate {
-                        label: format!("run {key}"),
-                        command: "composer".to_owned(),
-                        args: vec!["-d".into(), "$ZED_DIRNAME".into(), key.into()],
-                        ..TaskTemplate::default()
-                    })
-                    .chain([TaskTemplate {
-                        label: "composer script $ZED_CUSTOM_script".to_owned(),
-                        command: "composer".to_owned(),
-                        args: vec![
-                            "-d".into(),
-                            "$ZED_DIRNAME".into(),
-                            VariableName::Custom("script".into()).template_value(),
-                        ],
-                        tags: vec!["composer-script".into()],
-                        ..TaskTemplate::default()
-                    }])
-                    .collect()
-            } else {
-                vec![]
-            };
-
-            Some(TaskTemplates(task_templates))
-        })
-    }
-}
-
-fn server_binary_arguments(server_path: &Path) -> Vec<OsString> {
-    vec![server_path.into(), "--stdio".into()]
-}
-
-pub struct JsonLspAdapter {
-    languages: Arc<LanguageRegistry>,
-    node: NodeRuntime,
-}
-
-impl JsonLspAdapter {
-    const PACKAGE_NAME: &str = "vscode-langservers-extracted";
-
-    pub fn new(languages: Arc<LanguageRegistry>, node: NodeRuntime) -> Self {
-        Self { languages, node }
-    }
-}
-
-impl LspInstaller for JsonLspAdapter {
-    type BinaryVersion = String;
-
-    async fn fetch_latest_server_version(
-        &self,
-        _: &dyn LspAdapterDelegate,
-        _: bool,
-        _: &mut AsyncApp,
-    ) -> Result<String> {
-        self.node
-            .npm_package_latest_version(Self::PACKAGE_NAME)
-            .await
-    }
-
-    async fn check_if_user_installed(
-        &self,
-        delegate: &dyn LspAdapterDelegate,
-        _: Option<Toolchain>,
-        _: &AsyncApp,
-    ) -> Option<LanguageServerBinary> {
-        let path = delegate
-            .which("vscode-json-language-server".as_ref())
-            .await?;
-        let env = delegate.shell_env().await;
-
-        Some(LanguageServerBinary {
-            path,
-            env: Some(env),
-            arguments: vec!["--stdio".into()],
-        })
-    }
-
-    async fn check_if_version_installed(
-        &self,
-        version: &String,
-        container_dir: &PathBuf,
-        _: &dyn LspAdapterDelegate,
-    ) -> Option<LanguageServerBinary> {
-        let server_path = container_dir.join(SERVER_PATH);
-
-        let should_install_language_server = self
-            .node
-            .should_install_npm_package(
-                Self::PACKAGE_NAME,
-                &server_path,
-                container_dir,
-                VersionStrategy::Latest(version),
-            )
-            .await;
-
-        if should_install_language_server {
-            None
-        } else {
-            Some(LanguageServerBinary {
-                path: self.node.binary_path().await.ok()?,
-                env: None,
-                arguments: server_binary_arguments(&server_path),
-            })
-        }
-    }
-
-    async fn fetch_server_binary(
-        &self,
-        latest_version: String,
-        container_dir: PathBuf,
-        _: &dyn LspAdapterDelegate,
-    ) -> Result<LanguageServerBinary> {
-        let server_path = container_dir.join(SERVER_PATH);
-
-        self.node
-            .npm_install_packages(
-                &container_dir,
-                &[(Self::PACKAGE_NAME, latest_version.as_str())],
-            )
-            .await?;
-
-        Ok(LanguageServerBinary {
-            path: self.node.binary_path().await?,
-            env: None,
-            arguments: server_binary_arguments(&server_path),
-        })
-    }
-
-    async fn cached_server_binary(
-        &self,
-        container_dir: PathBuf,
-        _: &dyn LspAdapterDelegate,
-    ) -> Option<LanguageServerBinary> {
-        get_cached_server_binary(container_dir, &self.node).await
-    }
-}
-
-#[async_trait(?Send)]
-impl LspAdapter for JsonLspAdapter {
-    fn name(&self) -> LanguageServerName {
-        LanguageServerName("json-language-server".into())
-    }
-
-    async fn initialization_options(
-        self: Arc<Self>,
-        _: &Arc<dyn LspAdapterDelegate>,
-    ) -> Result<Option<serde_json::Value>> {
-        Ok(Some(json!({
-            "provideFormatter": true
-        })))
-    }
-
-    async fn workspace_configuration(
-        self: Arc<Self>,
-        delegate: &Arc<dyn LspAdapterDelegate>,
-        _: Option<Toolchain>,
-        _: Option<Uri>,
-        cx: &mut AsyncApp,
-    ) -> Result<Value> {
-        let mut config = cx.update(|cx| {
-            let schemas = json_schema_store::all_schema_file_associations(&self.languages, cx);
-
-            // This can be viewed via `dev: open language server logs` -> `json-language-server` ->
-            // `Server Info`
-            serde_json::json!({
-                "json": {
-                    "format": {
-                        "enable": true,
-                    },
-                    "validate": {
-                        "enable": true,
-                    },
-                    "schemas": schemas
-                }
-            })
-        })?;
-        let project_options = cx.update(|cx| {
-            language_server_settings(delegate.as_ref(), &self.name(), cx)
-                .and_then(|s| s.settings.clone())
-        })?;
-
-        if let Some(override_options) = project_options {
-            merge_json_value_into(override_options, &mut config);
-        }
-
-        Ok(config)
-    }
-
-    fn language_ids(&self) -> HashMap<LanguageName, String> {
-        [
-            (LanguageName::new_static("JSON"), "json".into()),
-            (LanguageName::new_static("JSONC"), "jsonc".into()),
-        ]
-        .into_iter()
-        .collect()
-    }
-
-    fn is_primary_zed_json_schema_adapter(&self) -> bool {
-        true
-    }
-}
-
-async fn get_cached_server_binary(
-    container_dir: PathBuf,
-    node: &NodeRuntime,
-) -> Option<LanguageServerBinary> {
-    maybe!(async {
-        let server_path = container_dir.join(SERVER_PATH);
-        anyhow::ensure!(
-            server_path.exists(),
-            "missing executable in directory {server_path:?}"
-        );
-        Ok(LanguageServerBinary {
-            path: node.binary_path().await?,
-            env: None,
-            arguments: server_binary_arguments(&server_path),
-        })
-    })
-    .await
-    .log_err()
-}
-
-pub struct NodeVersionAdapter;
-
-impl NodeVersionAdapter {
-    const SERVER_NAME: LanguageServerName =
-        LanguageServerName::new_static("package-version-server");
-}
-
-impl LspInstaller for NodeVersionAdapter {
-    type BinaryVersion = GitHubLspBinaryVersion;
-
-    async fn fetch_latest_server_version(
-        &self,
-        delegate: &dyn LspAdapterDelegate,
-        _: bool,
-        _: &mut AsyncApp,
-    ) -> Result<GitHubLspBinaryVersion> {
-        let release = latest_github_release(
-            "zed-industries/package-version-server",
-            true,
-            false,
-            delegate.http_client(),
-        )
-        .await?;
-        let os = match consts::OS {
-            "macos" => "apple-darwin",
-            "linux" => "unknown-linux-gnu",
-            "windows" => "pc-windows-msvc",
-            other => bail!("Running on unsupported os: {other}"),
-        };
-        let suffix = if consts::OS == "windows" {
-            ".zip"
-        } else {
-            ".tar.gz"
-        };
-        let asset_name = format!("{}-{}-{os}{suffix}", Self::SERVER_NAME, consts::ARCH);
-        let asset = release
-            .assets
-            .iter()
-            .find(|asset| asset.name == asset_name)
-            .with_context(|| format!("no asset found matching `{asset_name:?}`"))?;
-        Ok(GitHubLspBinaryVersion {
-            name: release.tag_name,
-            url: asset.browser_download_url.clone(),
-            digest: asset.digest.clone(),
-        })
-    }
-
-    async fn check_if_user_installed(
-        &self,
-        delegate: &dyn LspAdapterDelegate,
-        _: Option<Toolchain>,
-        _: &AsyncApp,
-    ) -> Option<LanguageServerBinary> {
-        let path = delegate.which(Self::SERVER_NAME.as_ref()).await?;
-        Some(LanguageServerBinary {
-            path,
-            env: None,
-            arguments: Default::default(),
-        })
-    }
-
-    async fn fetch_server_binary(
-        &self,
-        latest_version: GitHubLspBinaryVersion,
-        container_dir: PathBuf,
-        delegate: &dyn LspAdapterDelegate,
-    ) -> Result<LanguageServerBinary> {
-        let version = &latest_version;
-        let destination_path = container_dir.join(format!(
-            "{}-{}{}",
-            Self::SERVER_NAME,
-            version.name,
-            std::env::consts::EXE_SUFFIX
-        ));
-        let destination_container_path =
-            container_dir.join(format!("{}-{}-tmp", Self::SERVER_NAME, version.name));
-        if fs::metadata(&destination_path).await.is_err() {
-            let mut response = delegate
-                .http_client()
-                .get(&version.url, Default::default(), true)
-                .await
-                .context("downloading release")?;
-            if version.url.ends_with(".zip") {
-                extract_zip(&destination_container_path, response.body_mut()).await?;
-            } else if version.url.ends_with(".tar.gz") {
-                let decompressed_bytes = GzipDecoder::new(BufReader::new(response.body_mut()));
-                let archive = Archive::new(decompressed_bytes);
-                archive.unpack(&destination_container_path).await?;
-            }
-
-            fs::copy(
-                destination_container_path.join(format!(
-                    "{}{}",
-                    Self::SERVER_NAME,
-                    std::env::consts::EXE_SUFFIX
-                )),
-                &destination_path,
-            )
-            .await?;
-            remove_matching(&container_dir, |entry| entry != destination_path).await;
-        }
-        Ok(LanguageServerBinary {
-            path: destination_path,
-            env: None,
-            arguments: Default::default(),
-        })
-    }
-
-    async fn cached_server_binary(
-        &self,
-        container_dir: PathBuf,
-        _delegate: &dyn LspAdapterDelegate,
-    ) -> Option<LanguageServerBinary> {
-        get_cached_version_server_binary(container_dir).await
-    }
-}
-
-#[async_trait(?Send)]
-impl LspAdapter for NodeVersionAdapter {
-    fn name(&self) -> LanguageServerName {
-        Self::SERVER_NAME
-    }
-}
-
-async fn get_cached_version_server_binary(container_dir: PathBuf) -> Option<LanguageServerBinary> {
-    maybe!(async {
-        let mut last = None;
-        let mut entries = fs::read_dir(&container_dir).await?;
-        while let Some(entry) = entries.next().await {
-            last = Some(entry?.path());
-        }
-
-        anyhow::Ok(LanguageServerBinary {
-            path: last.context("no cached binary")?,
-            env: None,
-            arguments: Default::default(),
-        })
-    })
-    .await
-    .log_err()
-}
diff --git a/crates/languages/src/json/brackets.scm b/crates/languages/src/json/brackets.scm
deleted file mode 100644
index cd5cdf328b..0000000000
--- a/crates/languages/src/json/brackets.scm
+++ /dev/null
@@ -1,3 +0,0 @@
-("[" @open "]" @close)
-("{" @open "}" @close)
-(("\"" @open "\"" @close) (#set! rainbow.exclude))
diff --git a/crates/languages/src/json/config.toml b/crates/languages/src/json/config.toml
deleted file mode 100644
index d21412d7bd..0000000000
--- a/crates/languages/src/json/config.toml
+++ /dev/null
@@ -1,17 +0,0 @@
-name = "JSON"
-grammar = "json"
-path_suffixes = ["json", "flake.lock"]
-line_comments = ["// "]
-autoclose_before = ",]}"
-brackets = [
-    { start = "{", end = "}", close = true, surround = true, newline = true },
-    { start = "[", end = "]", close = true, surround = true, newline = true },
-    { start = "(", end = ")", close = true, surround = true, newline = false },
-    { start = "\"", end = "\"", close = true, surround = true, newline = false, not_in = ["string"] },
-]
-tab_size = 2
-prettier_parser_name = "json"
-debuggers = ["JavaScript"]
-
-[overrides.string]
-completion_query_characters = [":", " ", "."]
diff --git a/crates/languages/src/json/embedding.scm b/crates/languages/src/json/embedding.scm
deleted file mode 100644
index fa286e3880..0000000000
--- a/crates/languages/src/json/embedding.scm
+++ /dev/null
@@ -1,14 +0,0 @@
-; Only produce one embedding for the entire file.
-(document) @item
-
-; Collapse arrays, except for the first object.
-(array
-  "[" @keep
-  .
-  (object)? @keep
-  "]" @keep) @collapse
-
-; Collapse string values (but not keys).
-(pair value: (string
-  "\"" @keep
-  "\"" @keep) @collapse)
diff --git a/crates/languages/src/json/highlights.scm b/crates/languages/src/json/highlights.scm
deleted file mode 100644
index 1098320ccb..0000000000
--- a/crates/languages/src/json/highlights.scm
+++ /dev/null
@@ -1,28 +0,0 @@
-(comment) @comment
-
-(string) @string
-(escape_sequence) @string.escape
-
-(pair
-  key: (string) @property.json_key)
-
-(number) @number
-
-[
-  (true)
-  (false)
-] @boolean
-
-(null) @constant.builtin
-
-[
-  ","
-  ":"
-] @punctuation.delimiter
-
-[
-  "{"
-  "}"
-  "["
-  "]"
-] @punctuation.bracket
diff --git a/crates/languages/src/json/indents.scm b/crates/languages/src/json/indents.scm
deleted file mode 100644
index b7b2a2e767..0000000000
--- a/crates/languages/src/json/indents.scm
+++ /dev/null
@@ -1,2 +0,0 @@
-(array "]" @end) @indent
-(object "}" @end) @indent
diff --git a/crates/languages/src/json/outline.scm b/crates/languages/src/json/outline.scm
deleted file mode 100644
index 43e2743478..0000000000
--- a/crates/languages/src/json/outline.scm
+++ /dev/null
@@ -1,2 +0,0 @@
-(pair
-  key: (string (string_content) @name)) @item
diff --git a/crates/languages/src/json/overrides.scm b/crates/languages/src/json/overrides.scm
deleted file mode 100644
index cc966ad4c1..0000000000
--- a/crates/languages/src/json/overrides.scm
+++ /dev/null
@@ -1 +0,0 @@
-(string) @string
diff --git a/crates/languages/src/json/redactions.scm b/crates/languages/src/json/redactions.scm
deleted file mode 100644
index 7359637244..0000000000
--- a/crates/languages/src/json/redactions.scm
+++ /dev/null
@@ -1,4 +0,0 @@
-(pair value: (number) @redact)
-(pair value: (string) @redact)
-(array (number) @redact)
-(array (string) @redact)
diff --git a/crates/languages/src/json/runnables.scm b/crates/languages/src/json/runnables.scm
deleted file mode 100644
index 2396f05a57..0000000000
--- a/crates/languages/src/json/runnables.scm
+++ /dev/null
@@ -1,21 +0,0 @@
-; Add support `package.json` and `composer.json` script runnable
-
-(
-    (document
-        (object
-            (pair
-                key: (string
-                    (string_content) @_name
-                    (#eq? @_name "scripts")
-                )
-                value: (object
-                    (pair
-                        key: (string (string_content) @run @script)
-                    )
-                )
-            )
-        )
-    )
-    (#set! tag package-script)
-    (#set! tag composer-script)
-)
diff --git a/crates/languages/src/json/textobjects.scm b/crates/languages/src/json/textobjects.scm
deleted file mode 100644
index 81fd20245b..0000000000
--- a/crates/languages/src/json/textobjects.scm
+++ /dev/null
@@ -1 +0,0 @@
-(comment)+ @comment.around
diff --git a/crates/languages/src/jsonc/brackets.scm b/crates/languages/src/jsonc/brackets.scm
deleted file mode 100644
index cd5cdf328b..0000000000
--- a/crates/languages/src/jsonc/brackets.scm
+++ /dev/null
@@ -1,3 +0,0 @@
-("[" @open "]" @close)
-("{" @open "}" @close)
-(("\"" @open "\"" @close) (#set! rainbow.exclude))
diff --git a/crates/languages/src/jsonc/config.toml b/crates/languages/src/jsonc/config.toml
deleted file mode 100644
index cb7ad38ec7..0000000000
--- a/crates/languages/src/jsonc/config.toml
+++ /dev/null
@@ -1,16 +0,0 @@
-name = "JSONC"
-grammar = "jsonc"
-path_suffixes = ["jsonc", "bun.lock", "tsconfig.json", "pyrightconfig.json"]
-line_comments = ["// "]
-autoclose_before = ",]}"
-brackets = [
-    { start = "{", end = "}", close = true, surround = true, newline = true },
-    { start = "[", end = "]", close = true, surround = true, newline = true },
-    { start = "(", end = ")", close = true, surround = true, newline = false },
-    { start = "\"", end = "\"", close = true, surround = true, newline = false, not_in = ["string"] },
-]
-tab_size = 2
-prettier_parser_name = "jsonc"
-
-[overrides.string]
-completion_query_characters = [":", " "]
diff --git a/crates/languages/src/jsonc/embedding.scm b/crates/languages/src/jsonc/embedding.scm
deleted file mode 100644
index fa286e3880..0000000000
--- a/crates/languages/src/jsonc/embedding.scm
+++ /dev/null
@@ -1,14 +0,0 @@
-; Only produce one embedding for the entire file.
-(document) @item
-
-; Collapse arrays, except for the first object.
-(array
-  "[" @keep
-  .
-  (object)? @keep
-  "]" @keep) @collapse
-
-; Collapse string values (but not keys).
-(pair value: (string
-  "\"" @keep
-  "\"" @keep) @collapse)
diff --git a/crates/languages/src/jsonc/highlights.scm b/crates/languages/src/jsonc/highlights.scm
deleted file mode 100644
index 1098320ccb..0000000000
--- a/crates/languages/src/jsonc/highlights.scm
+++ /dev/null
@@ -1,28 +0,0 @@
-(comment) @comment
-
-(string) @string
-(escape_sequence) @string.escape
-
-(pair
-  key: (string) @property.json_key)
-
-(number) @number
-
-[
-  (true)
-  (false)
-] @boolean
-
-(null) @constant.builtin
-
-[
-  ","
-  ":"
-] @punctuation.delimiter
-
-[
-  "{"
-  "}"
-  "["
-  "]"
-] @punctuation.bracket
diff --git a/crates/languages/src/jsonc/indents.scm b/crates/languages/src/jsonc/indents.scm
deleted file mode 100644
index b7b2a2e767..0000000000
--- a/crates/languages/src/jsonc/indents.scm
+++ /dev/null
@@ -1,2 +0,0 @@
-(array "]" @end) @indent
-(object "}" @end) @indent
diff --git a/crates/languages/src/jsonc/injections.scm b/crates/languages/src/jsonc/injections.scm
deleted file mode 100644
index 01e833d1e3..0000000000
--- a/crates/languages/src/jsonc/injections.scm
+++ /dev/null
@@ -1,2 +0,0 @@
-((comment) @injection.content
-    (#set! injection.language "comment"))
diff --git a/crates/languages/src/jsonc/outline.scm b/crates/languages/src/jsonc/outline.scm
deleted file mode 100644
index 43e2743478..0000000000
--- a/crates/languages/src/jsonc/outline.scm
+++ /dev/null
@@ -1,2 +0,0 @@
-(pair
-  key: (string (string_content) @name)) @item
diff --git a/crates/languages/src/jsonc/overrides.scm b/crates/languages/src/jsonc/overrides.scm
deleted file mode 100644
index 81fec9a5f5..0000000000
--- a/crates/languages/src/jsonc/overrides.scm
+++ /dev/null
@@ -1,2 +0,0 @@
-(comment) @comment.inclusive
-(string) @string
diff --git a/crates/languages/src/jsonc/redactions.scm b/crates/languages/src/jsonc/redactions.scm
deleted file mode 100644
index 7359637244..0000000000
--- a/crates/languages/src/jsonc/redactions.scm
+++ /dev/null
@@ -1,4 +0,0 @@
-(pair value: (number) @redact)
-(pair value: (string) @redact)
-(array (number) @redact)
-(array (string) @redact)
diff --git a/crates/languages/src/jsonc/textobjects.scm b/crates/languages/src/jsonc/textobjects.scm
deleted file mode 100644
index 81fd20245b..0000000000
--- a/crates/languages/src/jsonc/textobjects.scm
+++ /dev/null
@@ -1 +0,0 @@
-(comment)+ @comment.around
diff --git a/crates/languages/src/lib.rs b/crates/languages/src/lib.rs
deleted file mode 100644
index 8ce234a864..0000000000
--- a/crates/languages/src/lib.rs
+++ /dev/null
@@ -1,433 +0,0 @@
-use anyhow::Context as _;
-use gpui::{App, SharedString, UpdateGlobal};
-use node_runtime::NodeRuntime;
-use project::Fs;
-use python::PyprojectTomlManifestProvider;
-use rust::CargoManifestProvider;
-use rust_embed::RustEmbed;
-use settings::SettingsStore;
-use smol::stream::StreamExt;
-use std::{str, sync::Arc};
-use util::{ResultExt, asset_str};
-
-pub use language::*;
-
-use crate::{
-    json::JsonTaskProvider,
-    python::{BasedPyrightLspAdapter, RuffLspAdapter},
-};
-
-mod bash;
-mod c;
-mod cpp;
-mod css;
-mod eslint;
-mod go;
-mod json;
-mod package_json;
-mod python;
-mod rust;
-mod tailwind;
-mod typescript;
-mod vtsls;
-mod yaml;
-
-pub(crate) use package_json::{PackageJson, PackageJsonData};
-
-#[derive(RustEmbed)]
-#[folder = "src/"]
-#[exclude = "*.rs"]
-struct LanguageDir;
-
-/// A shared grammar for plain text, exposed for reuse by downstream crates.
-#[cfg(feature = "tree-sitter-gitcommit")]
-pub static LANGUAGE_GIT_COMMIT: std::sync::LazyLock<Arc<Language>> =
-    std::sync::LazyLock::new(|| {
-        Arc::new(Language::new(
-            LanguageConfig {
-                name: "Git Commit".into(),
-                soft_wrap: Some(language::language_settings::SoftWrap::EditorWidth),
-                matcher: LanguageMatcher {
-                    path_suffixes: vec!["COMMIT_EDITMSG".to_owned()],
-                    first_line_pattern: None,
-                },
-                line_comments: vec![Arc::from("#")],
-                ..LanguageConfig::default()
-            },
-            Some(tree_sitter_gitcommit::LANGUAGE.into()),
-        ))
-    });
-
-pub fn init(languages: Arc<LanguageRegistry>, fs: Arc<dyn Fs>, node: NodeRuntime, cx: &mut App) {
-    #[cfg(feature = "load-grammars")]
-    languages.register_native_grammars([
-        ("bash", tree_sitter_bash::LANGUAGE),
-        ("c", tree_sitter_c::LANGUAGE),
-        ("cpp", tree_sitter_cpp::LANGUAGE),
-        ("css", tree_sitter_css::LANGUAGE),
-        ("diff", tree_sitter_diff::LANGUAGE),
-        ("go", tree_sitter_go::LANGUAGE),
-        ("gomod", tree_sitter_go_mod::LANGUAGE),
-        ("gowork", tree_sitter_gowork::LANGUAGE),
-        ("jsdoc", tree_sitter_jsdoc::LANGUAGE),
-        ("json", tree_sitter_json::LANGUAGE),
-        ("jsonc", tree_sitter_json::LANGUAGE),
-        ("markdown", tree_sitter_md::LANGUAGE),
-        ("markdown-inline", tree_sitter_md::INLINE_LANGUAGE),
-        ("python", tree_sitter_python::LANGUAGE),
-        ("regex", tree_sitter_regex::LANGUAGE),
-        ("rust", tree_sitter_rust::LANGUAGE),
-        ("tsx", tree_sitter_typescript::LANGUAGE_TSX),
-        ("typescript", tree_sitter_typescript::LANGUAGE_TYPESCRIPT),
-        ("yaml", tree_sitter_yaml::LANGUAGE),
-        ("gitcommit", tree_sitter_gitcommit::LANGUAGE),
-    ]);
-
-    let c_lsp_adapter = Arc::new(c::CLspAdapter);
-    let css_lsp_adapter = Arc::new(css::CssLspAdapter::new(node.clone()));
-    let eslint_adapter = Arc::new(eslint::EsLintLspAdapter::new(node.clone()));
-    let go_context_provider = Arc::new(go::GoContextProvider);
-    let go_lsp_adapter = Arc::new(go::GoLspAdapter);
-    let json_context_provider = Arc::new(JsonTaskProvider);
-    let json_lsp_adapter = Arc::new(json::JsonLspAdapter::new(languages.clone(), node.clone()));
-    let node_version_lsp_adapter = Arc::new(json::NodeVersionAdapter);
-    let py_lsp_adapter = Arc::new(python::PyLspAdapter::new());
-    let ty_lsp_adapter = Arc::new(python::TyLspAdapter::new(fs.clone()));
-    let python_context_provider = Arc::new(python::PythonContextProvider);
-    let python_lsp_adapter = Arc::new(python::PyrightLspAdapter::new(node.clone()));
-    let basedpyright_lsp_adapter = Arc::new(BasedPyrightLspAdapter::new(node.clone()));
-    let ruff_lsp_adapter = Arc::new(RuffLspAdapter::new(fs.clone()));
-    let python_toolchain_provider = Arc::new(python::PythonToolchainProvider);
-    let rust_context_provider = Arc::new(rust::RustContextProvider);
-    let rust_lsp_adapter = Arc::new(rust::RustLspAdapter);
-    let tailwind_adapter = Arc::new(tailwind::TailwindLspAdapter::new(node.clone()));
-    let typescript_context = Arc::new(typescript::TypeScriptContextProvider::new(fs.clone()));
-    let typescript_lsp_adapter = Arc::new(typescript::TypeScriptLspAdapter::new(
-        node.clone(),
-        fs.clone(),
-    ));
-    let vtsls_adapter = Arc::new(vtsls::VtslsLspAdapter::new(node.clone(), fs.clone()));
-    let yaml_lsp_adapter = Arc::new(yaml::YamlLspAdapter::new(node));
-
-    let built_in_languages = [
-        LanguageInfo {
-            name: "bash",
-            context: Some(Arc::new(bash::bash_task_context())),
-            ..Default::default()
-        },
-        LanguageInfo {
-            name: "c",
-            adapters: vec![c_lsp_adapter.clone()],
-            ..Default::default()
-        },
-        LanguageInfo {
-            name: "cpp",
-            adapters: vec![c_lsp_adapter],
-            ..Default::default()
-        },
-        LanguageInfo {
-            name: "css",
-            adapters: vec![css_lsp_adapter],
-            ..Default::default()
-        },
-        LanguageInfo {
-            name: "diff",
-            adapters: vec![],
-            ..Default::default()
-        },
-        LanguageInfo {
-            name: "go",
-            adapters: vec![go_lsp_adapter.clone()],
-            context: Some(go_context_provider.clone()),
-            ..Default::default()
-        },
-        LanguageInfo {
-            name: "gomod",
-            adapters: vec![go_lsp_adapter.clone()],
-            context: Some(go_context_provider.clone()),
-            ..Default::default()
-        },
-        LanguageInfo {
-            name: "gowork",
-            adapters: vec![go_lsp_adapter],
-            context: Some(go_context_provider),
-            ..Default::default()
-        },
-        LanguageInfo {
-            name: "json",
-            adapters: vec![json_lsp_adapter.clone(), node_version_lsp_adapter],
-            context: Some(json_context_provider.clone()),
-            ..Default::default()
-        },
-        LanguageInfo {
-            name: "jsonc",
-            adapters: vec![json_lsp_adapter],
-            context: Some(json_context_provider),
-            ..Default::default()
-        },
-        LanguageInfo {
-            name: "markdown",
-            adapters: vec![],
-            ..Default::default()
-        },
-        LanguageInfo {
-            name: "markdown-inline",
-            adapters: vec![],
-            ..Default::default()
-        },
-        LanguageInfo {
-            name: "python",
-            adapters: vec![basedpyright_lsp_adapter, ruff_lsp_adapter],
-            context: Some(python_context_provider),
-            toolchain: Some(python_toolchain_provider),
-            manifest_name: Some(SharedString::new_static("pyproject.toml").into()),
-        },
-        LanguageInfo {
-            name: "rust",
-            adapters: vec![rust_lsp_adapter],
-            context: Some(rust_context_provider),
-            manifest_name: Some(SharedString::new_static("Cargo.toml").into()),
-            ..Default::default()
-        },
-        LanguageInfo {
-            name: "tsx",
-            adapters: vec![typescript_lsp_adapter.clone(), vtsls_adapter.clone()],
-            context: Some(typescript_context.clone()),
-            ..Default::default()
-        },
-        LanguageInfo {
-            name: "typescript",
-            adapters: vec![typescript_lsp_adapter.clone(), vtsls_adapter.clone()],
-            context: Some(typescript_context.clone()),
-            ..Default::default()
-        },
-        LanguageInfo {
-            name: "javascript",
-            adapters: vec![typescript_lsp_adapter.clone(), vtsls_adapter.clone()],
-            context: Some(typescript_context),
-            ..Default::default()
-        },
-        LanguageInfo {
-            name: "jsdoc",
-            adapters: vec![typescript_lsp_adapter.clone(), vtsls_adapter.clone()],
-            ..Default::default()
-        },
-        LanguageInfo {
-            name: "regex",
-            adapters: vec![],
-            ..Default::default()
-        },
-        LanguageInfo {
-            name: "yaml",
-            adapters: vec![yaml_lsp_adapter],
-            ..Default::default()
-        },
-        LanguageInfo {
-            name: "gitcommit",
-            ..Default::default()
-        },
-        LanguageInfo {
-            name: "zed-keybind-context",
-            ..Default::default()
-        },
-    ];
-
-    for registration in built_in_languages {
-        register_language(
-            &languages,
-            registration.name,
-            registration.adapters,
-            registration.context,
-            registration.toolchain,
-            registration.manifest_name,
-        );
-    }
-
-    // Register globally available language servers.
-    //
-    // This will allow users to add support for a built-in language server (e.g., Tailwind)
-    // for a given language via the `language_servers` setting:
-    //
-    // ```json
-    // {
-    //   "languages": {
-    //     "My Language": {
-    //       "language_servers": ["tailwindcss-language-server", "..."]
-    //     }
-    //   }
-    // }
-    // ```
-    languages.register_available_lsp_adapter(
-        LanguageServerName("tailwindcss-language-server".into()),
-        tailwind_adapter.clone(),
-    );
-    languages.register_available_lsp_adapter(
-        LanguageServerName("eslint".into()),
-        eslint_adapter.clone(),
-    );
-    languages.register_available_lsp_adapter(LanguageServerName("vtsls".into()), vtsls_adapter);
-    languages.register_available_lsp_adapter(
-        LanguageServerName("typescript-language-server".into()),
-        typescript_lsp_adapter,
-    );
-
-    languages.register_available_lsp_adapter(python_lsp_adapter.name(), python_lsp_adapter);
-    languages.register_available_lsp_adapter(py_lsp_adapter.name(), py_lsp_adapter);
-    languages.register_available_lsp_adapter(ty_lsp_adapter.name(), ty_lsp_adapter);
-    // Register Tailwind for the existing languages that should have it by default.
-    //
-    // This can be driven by the `language_servers` setting once we have a way for
-    // extensions to provide their own default value for that setting.
-    let tailwind_languages = [
-        "Astro",
-        "CSS",
-        "ERB",
-        "HTML+ERB",
-        "HEEX",
-        "HTML",
-        "JavaScript",
-        "TypeScript",
-        "PHP",
-        "Svelte",
-        "TSX",
-        "Vue.js",
-    ];
-
-    for language in tailwind_languages {
-        languages.register_lsp_adapter(language.into(), tailwind_adapter.clone());
-    }
-
-    let eslint_languages = ["TSX", "TypeScript", "JavaScript", "Vue.js", "Svelte"];
-    for language in eslint_languages {
-        languages.register_lsp_adapter(language.into(), eslint_adapter.clone());
-    }
-
-    let mut subscription = languages.subscribe();
-    let mut prev_language_settings = languages.language_settings();
-
-    cx.spawn(async move |cx| {
-        while subscription.next().await.is_some() {
-            let language_settings = languages.language_settings();
-            if language_settings != prev_language_settings {
-                cx.update(|cx| {
-                    SettingsStore::update_global(cx, |settings, cx| {
-                        settings
-                            .set_extension_settings(
-                                settings::ExtensionsSettingsContent {
-                                    all_languages: language_settings.clone(),
-                                },
-                                cx,
-                            )
-                            .log_err();
-                    });
-                })?;
-                prev_language_settings = language_settings;
-            }
-        }
-        anyhow::Ok(())
-    })
-    .detach();
-    let manifest_providers: [Arc<dyn ManifestProvider>; 2] = [
-        Arc::from(CargoManifestProvider),
-        Arc::from(PyprojectTomlManifestProvider),
-    ];
-    for provider in manifest_providers {
-        project::ManifestProvidersStore::global(cx).register(provider);
-    }
-}
-
-#[derive(Default)]
-struct LanguageInfo {
-    name: &'static str,
-    adapters: Vec<Arc<dyn LspAdapter>>,
-    context: Option<Arc<dyn ContextProvider>>,
-    toolchain: Option<Arc<dyn ToolchainLister>>,
-    manifest_name: Option<ManifestName>,
-}
-
-fn register_language(
-    languages: &LanguageRegistry,
-    name: &'static str,
-    adapters: Vec<Arc<dyn LspAdapter>>,
-    context: Option<Arc<dyn ContextProvider>>,
-    toolchain: Option<Arc<dyn ToolchainLister>>,
-    manifest_name: Option<ManifestName>,
-) {
-    let config = load_config(name);
-    for adapter in adapters {
-        languages.register_lsp_adapter(config.name.clone(), adapter);
-    }
-    languages.register_language(
-        config.name.clone(),
-        config.grammar.clone(),
-        config.matcher.clone(),
-        config.hidden,
-        manifest_name.clone(),
-        Arc::new(move || {
-            Ok(LoadedLanguage {
-                config: config.clone(),
-                queries: load_queries(name),
-                context_provider: context.clone(),
-                toolchain_provider: toolchain.clone(),
-                manifest_name: manifest_name.clone(),
-            })
-        }),
-    );
-}
-
-#[cfg(any(test, feature = "test-support"))]
-pub fn language(name: &str, grammar: tree_sitter::Language) -> Arc<Language> {
-    Arc::new(
-        Language::new(load_config(name), Some(grammar))
-            .with_queries(load_queries(name))
-            .unwrap(),
-    )
-}
-
-fn load_config(name: &str) -> LanguageConfig {
-    let config_toml = String::from_utf8(
-        LanguageDir::get(&format!("{}/config.toml", name))
-            .unwrap_or_else(|| panic!("missing config for language {:?}", name))
-            .data
-            .to_vec(),
-    )
-    .unwrap();
-
-    #[allow(unused_mut)]
-    let mut config: LanguageConfig = ::toml::from_str(&config_toml)
-        .with_context(|| format!("failed to load config.toml for language {name:?}"))
-        .unwrap();
-
-    #[cfg(not(any(feature = "load-grammars", test)))]
-    {
-        config = LanguageConfig {
-            name: config.name,
-            matcher: config.matcher,
-            jsx_tag_auto_close: config.jsx_tag_auto_close,
-            ..Default::default()
-        }
-    }
-
-    config
-}
-
-fn load_queries(name: &str) -> LanguageQueries {
-    let mut result = LanguageQueries::default();
-    for path in LanguageDir::iter() {
-        if let Some(remainder) = path.strip_prefix(name).and_then(|p| p.strip_prefix('/')) {
-            if !remainder.ends_with(".scm") {
-                continue;
-            }
-            for (name, query) in QUERY_FILENAME_PREFIXES {
-                if remainder.starts_with(name) {
-                    let contents = asset_str::<LanguageDir>(path.as_ref());
-                    match query(&mut result) {
-                        None => *query(&mut result) = Some(contents),
-                        Some(r) => r.to_mut().push_str(contents.as_ref()),
-                    }
-                }
-            }
-        }
-    }
-    result
-}
diff --git a/crates/languages/src/markdown-inline/config.toml b/crates/languages/src/markdown-inline/config.toml
deleted file mode 100644
index e0b41c72c2..0000000000
--- a/crates/languages/src/markdown-inline/config.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-name = "Markdown-Inline"
-grammar = "markdown-inline"
-hidden = true
diff --git a/crates/languages/src/markdown-inline/highlights.scm b/crates/languages/src/markdown-inline/highlights.scm
deleted file mode 100644
index 3c9f6fbcc3..0000000000
--- a/crates/languages/src/markdown-inline/highlights.scm
+++ /dev/null
@@ -1,22 +0,0 @@
-(emphasis) @emphasis.markup
-(strong_emphasis) @emphasis.strong.markup
-(code_span) @text.literal.markup
-(strikethrough) @strikethrough.markup
-
-[
-  (inline_link)
-  (shortcut_link)
-  (collapsed_reference_link)
-  (full_reference_link)
-  (image)
-  (link_text)
-  (link_label)
-] @link_text.markup
-
-(inline_link ["(" ")"] @link_uri.markup)
-(image ["(" ")"] @link_uri.markup)
-[
-  (link_destination)
-  (uri_autolink)
-  (email_autolink)
-] @link_uri.markup
diff --git a/crates/languages/src/markdown-inline/injections.scm b/crates/languages/src/markdown-inline/injections.scm
deleted file mode 100644
index 074b08fd87..0000000000
--- a/crates/languages/src/markdown-inline/injections.scm
+++ /dev/null
@@ -1,2 +0,0 @@
-((latex_block) @injection.content
-  (#set! injection.language "latex"))
diff --git a/crates/languages/src/markdown/brackets.scm b/crates/languages/src/markdown/brackets.scm
deleted file mode 100644
index 172a2e7f72..0000000000
--- a/crates/languages/src/markdown/brackets.scm
+++ /dev/null
@@ -1,7 +0,0 @@
-("(" @open ")" @close)
-("[" @open "]" @close)
-("{" @open "}" @close)
-(("\"" @open "\"" @close) (#set! rainbow.exclude))
-(("`" @open "`" @close) (#set! rainbow.exclude))
-(("'" @open "'" @close) (#set! rainbow.exclude))
-(((fenced_code_block_delimiter) @open (fenced_code_block_delimiter) @close) (#set! rainbow.exclude))
diff --git a/crates/languages/src/markdown/config.toml b/crates/languages/src/markdown/config.toml
deleted file mode 100644
index 84c79d2538..0000000000
--- a/crates/languages/src/markdown/config.toml
+++ /dev/null
@@ -1,32 +0,0 @@
-name = "Markdown"
-grammar = "markdown"
-path_suffixes = ["md", "mdx", "mdwn", "markdown", "MD"]
-completion_query_characters = ["-"]
-block_comment = { start = "<!--", prefix = "", end = "-->", tab_size = 0 }
-autoclose_before = ";:.,=}])>"
-brackets = [
-    { start = "{", end = "}", close = true, newline = true },
-    { start = "[", end = "]", close = true, newline = true },
-    { start = "(", end = ")", close = true, newline = true },
-    { start = "<", end = ">", close = true, newline = true },
-    { start = "\"", end = "\"", close = false, newline = false },
-    { start = "'", end = "'", close = false, newline = false },
-    { start = "`", end = "`", close = false, newline = false },
-    { start = "*", end = "*", close = false, newline = false, surround = true },
-]
-rewrap_prefixes = [
-    "[-*+]\\s+",
-    "\\d+\\.\\s+",
-    ">\\s*",
-    "[-*+]\\s+\\[[\\sx]\\]\\s+"
-]
-
-auto_indent_on_paste = false
-auto_indent_using_last_non_empty_line = false
-tab_size = 2
-decrease_indent_patterns = [
-  { pattern = "^\\s*-",    valid_after = ["list_item"] },
-  { pattern = "^\\s*\\d",    valid_after = ["list_item"] },
-  { pattern = "^\\s*",    valid_after = ["list_item"] },
-]
-prettier_parser_name = "markdown"
diff --git a/crates/languages/src/markdown/highlights.scm b/crates/languages/src/markdown/highlights.scm
deleted file mode 100644
index 707bcc0816..0000000000
--- a/crates/languages/src/markdown/highlights.scm
+++ /dev/null
@@ -1,34 +0,0 @@
-[
-  (paragraph)
-  (indented_code_block)
-  (pipe_table)
-] @text
-
-[
-  (atx_heading)
-  (setext_heading)
-  (thematic_break)
-] @title.markup
-(setext_heading (paragraph) @title.markup)
-
-[
-  (list_marker_plus)
-  (list_marker_minus)
-  (list_marker_star)
-  (list_marker_dot)
-  (list_marker_parenthesis)
-] @punctuation.list_marker.markup
-
-(block_quote_marker) @punctuation.markup
-(pipe_table_header "|" @punctuation.markup)
-(pipe_table_row "|" @punctuation.markup)
-(pipe_table_delimiter_row "|" @punctuation.markup)
-(pipe_table_delimiter_cell "-" @punctuation.markup)
-
-[
-  (fenced_code_block_delimiter)
-  (info_string)
-] @punctuation.embedded.markup
-
-(link_reference_definition) @link_text.markup
-(link_destination) @link_uri.markup
diff --git a/crates/languages/src/markdown/indents.scm b/crates/languages/src/markdown/indents.scm
deleted file mode 100644
index dc6dfa6118..0000000000
--- a/crates/languages/src/markdown/indents.scm
+++ /dev/null
@@ -1,3 +0,0 @@
-(list (list_item) @indent)
-
-(list_item) @start.list_item
diff --git a/crates/languages/src/markdown/injections.scm b/crates/languages/src/markdown/injections.scm
deleted file mode 100644
index f2b959dfda..0000000000
--- a/crates/languages/src/markdown/injections.scm
+++ /dev/null
@@ -1,14 +0,0 @@
-(fenced_code_block
-  (info_string
-    (language) @injection.language)
-  (code_fence_content) @injection.content)
-
-((inline) @injection.content
- (#set! injection.language "markdown-inline"))
-
-((html_block) @injection.content
-  (#set! injection.language "html"))
-
-((minus_metadata) @injection.content (#set! injection.language "yaml"))
-
-((plus_metadata) @injection.content (#set! injection.language "toml"))
diff --git a/crates/languages/src/markdown/outline.scm b/crates/languages/src/markdown/outline.scm
deleted file mode 100644
index 3f8311136c..0000000000
--- a/crates/languages/src/markdown/outline.scm
+++ /dev/null
@@ -1,5 +0,0 @@
-(atx_heading
-    .
-    (_) @context
-    .
-    (_) @name ) @item
diff --git a/crates/languages/src/markdown/textobjects.scm b/crates/languages/src/markdown/textobjects.scm
deleted file mode 100644
index e0f76c5365..0000000000
--- a/crates/languages/src/markdown/textobjects.scm
+++ /dev/null
@@ -1,3 +0,0 @@
-(section
-    (atx_heading)
-    (_)* @class.inside) @class.around
diff --git a/crates/languages/src/package_json.rs b/crates/languages/src/package_json.rs
deleted file mode 100644
index 80e9e3cc0d..0000000000
--- a/crates/languages/src/package_json.rs
+++ /dev/null
@@ -1,128 +0,0 @@
-use chrono::{DateTime, Local};
-use collections::{BTreeSet, HashMap};
-use serde_json_lenient::Value;
-use std::{path::Path, sync::Arc};
-
-#[derive(Clone, Debug)]
-pub struct PackageJson {
-    pub mtime: DateTime<Local>,
-    pub data: PackageJsonData,
-}
-
-#[derive(Clone, Debug, Default, PartialEq, Eq)]
-pub struct PackageJsonData {
-    pub jest_package_path: Option<Arc<Path>>,
-    pub mocha_package_path: Option<Arc<Path>>,
-    pub vitest_package_path: Option<Arc<Path>>,
-    pub jasmine_package_path: Option<Arc<Path>>,
-    pub bun_package_path: Option<Arc<Path>>,
-    pub node_package_path: Option<Arc<Path>>,
-    pub scripts: BTreeSet<(Arc<Path>, String)>,
-    pub package_manager: Option<&'static str>,
-}
-
-impl PackageJsonData {
-    pub fn new(path: Arc<Path>, package_json: HashMap<String, Value>) -> Self {
-        let mut scripts = BTreeSet::new();
-        if let Some(Value::Object(package_json_scripts)) = package_json.get("scripts") {
-            scripts.extend(
-                package_json_scripts
-                    .keys()
-                    .cloned()
-                    .map(|name| (path.clone(), name)),
-            );
-        }
-
-        let mut jest_package_path = None;
-        let mut mocha_package_path = None;
-        let mut vitest_package_path = None;
-        let mut jasmine_package_path = None;
-        let mut bun_package_path = None;
-        let mut node_package_path = None;
-        if let Some(Value::Object(dependencies)) = package_json.get("devDependencies") {
-            if dependencies.contains_key("jest") {
-                jest_package_path.get_or_insert_with(|| path.clone());
-            }
-            if dependencies.contains_key("mocha") {
-                mocha_package_path.get_or_insert_with(|| path.clone());
-            }
-            if dependencies.contains_key("vitest") {
-                vitest_package_path.get_or_insert_with(|| path.clone());
-            }
-            if dependencies.contains_key("jasmine") {
-                jasmine_package_path.get_or_insert_with(|| path.clone());
-            }
-            if dependencies.contains_key("@types/bun") {
-                bun_package_path.get_or_insert_with(|| path.clone());
-            }
-            if dependencies.contains_key("@types/node") {
-                node_package_path.get_or_insert_with(|| path.clone());
-            }
-        }
-        if let Some(Value::Object(dev_dependencies)) = package_json.get("dependencies") {
-            if dev_dependencies.contains_key("jest") {
-                jest_package_path.get_or_insert_with(|| path.clone());
-            }
-            if dev_dependencies.contains_key("mocha") {
-                mocha_package_path.get_or_insert_with(|| path.clone());
-            }
-            if dev_dependencies.contains_key("vitest") {
-                vitest_package_path.get_or_insert_with(|| path.clone());
-            }
-            if dev_dependencies.contains_key("jasmine") {
-                jasmine_package_path.get_or_insert_with(|| path.clone());
-            }
-            if dev_dependencies.contains_key("@types/bun") {
-                bun_package_path.get_or_insert_with(|| path.clone());
-            }
-            if dev_dependencies.contains_key("@types/node") {
-                node_package_path.get_or_insert_with(|| path.clone());
-            }
-        }
-
-        let package_manager = package_json
-            .get("packageManager")
-            .and_then(|value| value.as_str())
-            .and_then(|value| {
-                if value.starts_with("pnpm") {
-                    Some("pnpm")
-                } else if value.starts_with("yarn") {
-                    Some("yarn")
-                } else if value.starts_with("npm") {
-                    Some("npm")
-                } else if value.starts_with("bun") {
-                    Some("bun")
-                } else {
-                    None
-                }
-            });
-
-        Self {
-            jest_package_path,
-            mocha_package_path,
-            vitest_package_path,
-            jasmine_package_path,
-            bun_package_path,
-            node_package_path,
-            scripts,
-            package_manager,
-        }
-    }
-
-    pub fn merge(&mut self, other: Self) {
-        self.jest_package_path = self.jest_package_path.take().or(other.jest_package_path);
-        self.mocha_package_path = self.mocha_package_path.take().or(other.mocha_package_path);
-        self.vitest_package_path = self
-            .vitest_package_path
-            .take()
-            .or(other.vitest_package_path);
-        self.jasmine_package_path = self
-            .jasmine_package_path
-            .take()
-            .or(other.jasmine_package_path);
-        self.bun_package_path = self.bun_package_path.take().or(other.bun_package_path);
-        self.node_package_path = self.node_package_path.take().or(other.node_package_path);
-        self.scripts.extend(other.scripts);
-        self.package_manager = self.package_manager.or(other.package_manager);
-    }
-}
diff --git a/crates/languages/src/python.rs b/crates/languages/src/python.rs
deleted file mode 100644
index 730470d179..0000000000
--- a/crates/languages/src/python.rs
+++ /dev/null
@@ -1,2535 +0,0 @@
-use anyhow::{Context as _, ensure};
-use anyhow::{Result, anyhow};
-use async_trait::async_trait;
-use collections::HashMap;
-use futures::{AsyncBufReadExt, StreamExt as _};
-use gpui::{App, AsyncApp, SharedString, Task};
-use http_client::github::{AssetKind, GitHubLspBinaryVersion, latest_github_release};
-use language::language_settings::language_settings;
-use language::{ContextLocation, LanguageToolchainStore, LspInstaller};
-use language::{ContextProvider, LspAdapter, LspAdapterDelegate};
-use language::{LanguageName, ManifestName, ManifestProvider, ManifestQuery};
-use language::{Toolchain, ToolchainList, ToolchainLister, ToolchainMetadata};
-use lsp::LanguageServerName;
-use lsp::{LanguageServerBinary, Uri};
-use node_runtime::{NodeRuntime, VersionStrategy};
-use pet_core::Configuration;
-use pet_core::os_environment::Environment;
-use pet_core::python_environment::{PythonEnvironment, PythonEnvironmentKind};
-use pet_virtualenv::is_virtualenv_dir;
-use project::Fs;
-use project::lsp_store::language_server_settings;
-use serde::{Deserialize, Serialize};
-use serde_json::{Value, json};
-use settings::Settings;
-use smol::lock::OnceCell;
-use std::cmp::{Ordering, Reverse};
-use std::env::consts;
-use terminal::terminal_settings::TerminalSettings;
-use util::command::new_smol_command;
-use util::fs::{make_file_executable, remove_matching};
-use util::paths::PathStyle;
-use util::rel_path::RelPath;
-
-use http_client::github_download::{GithubBinaryMetadata, download_server_binary};
-use parking_lot::Mutex;
-use std::str::FromStr;
-use std::{
-    borrow::Cow,
-    fmt::Write,
-    path::{Path, PathBuf},
-    sync::Arc,
-};
-use task::{ShellKind, TaskTemplate, TaskTemplates, VariableName};
-use util::{ResultExt, maybe};
-
-#[derive(Debug, Serialize, Deserialize)]
-pub(crate) struct PythonToolchainData {
-    #[serde(flatten)]
-    environment: PythonEnvironment,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    activation_scripts: Option<HashMap<ShellKind, PathBuf>>,
-}
-
-pub(crate) struct PyprojectTomlManifestProvider;
-
-impl ManifestProvider for PyprojectTomlManifestProvider {
-    fn name(&self) -> ManifestName {
-        SharedString::new_static("pyproject.toml").into()
-    }
-
-    fn search(
-        &self,
-        ManifestQuery {
-            path,
-            depth,
-            delegate,
-        }: ManifestQuery,
-    ) -> Option<Arc<RelPath>> {
-        for path in path.ancestors().take(depth) {
-            let p = path.join(RelPath::unix("pyproject.toml").unwrap());
-            if delegate.exists(&p, Some(false)) {
-                return Some(path.into());
-            }
-        }
-
-        None
-    }
-}
-
-enum TestRunner {
-    UNITTEST,
-    PYTEST,
-}
-
-impl FromStr for TestRunner {
-    type Err = ();
-
-    fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
-        match s {
-            "unittest" => Ok(Self::UNITTEST),
-            "pytest" => Ok(Self::PYTEST),
-            _ => Err(()),
-        }
-    }
-}
-
-/// Pyright assigns each completion item a `sortText` of the form `XX.YYYY.name`.
-/// Where `XX` is the sorting category, `YYYY` is based on most recent usage,
-/// and `name` is the symbol name itself.
-///
-/// The problem with it is that Pyright adjusts the sort text based on previous resolutions (items for which we've issued `completion/resolve` call have their sortText adjusted),
-/// which - long story short - makes completion items list non-stable. Pyright probably relies on VSCode's implementation detail.
-/// see https://github.com/microsoft/pyright/blob/95ef4e103b9b2f129c9320427e51b73ea7cf78bd/packages/pyright-internal/src/languageService/completionProvider.ts#LL2873
-///
-/// upd 02.12.25:
-/// Decided to ignore Pyright's sortText() completely and to manually sort all entries
-fn process_pyright_completions(items: &mut [lsp::CompletionItem]) {
-    for item in items {
-        let is_dunder = item.label.starts_with("__") && item.label.ends_with("__");
-
-        let visibility_priority = if is_dunder {
-            '3'
-        } else if item.label.starts_with("__") {
-            '2' // private non-dunder
-        } else if item.label.starts_with('_') {
-            '1' // protected
-        } else {
-            '0' // public
-        };
-
-        // Kind priority within same visibility level
-        let kind_priority = match item.kind {
-            Some(lsp::CompletionItemKind::ENUM_MEMBER) => '0',
-            Some(lsp::CompletionItemKind::FIELD) => '1',
-            Some(lsp::CompletionItemKind::PROPERTY) => '2',
-            Some(lsp::CompletionItemKind::VARIABLE) => '3',
-            Some(lsp::CompletionItemKind::CONSTANT) => '4',
-            Some(lsp::CompletionItemKind::METHOD) => '5',
-            Some(lsp::CompletionItemKind::FUNCTION) => '5',
-            Some(lsp::CompletionItemKind::CLASS) => '6',
-            Some(lsp::CompletionItemKind::MODULE) => '7',
-            _ => '8',
-        };
-
-        item.sort_text = Some(format!(
-            "{}{}{}",
-            visibility_priority, kind_priority, item.label
-        ));
-    }
-}
-
-pub struct TyLspAdapter {
-    fs: Arc<dyn Fs>,
-}
-
-#[cfg(target_os = "macos")]
-impl TyLspAdapter {
-    const GITHUB_ASSET_KIND: AssetKind = AssetKind::TarGz;
-    const ARCH_SERVER_NAME: &str = "apple-darwin";
-}
-
-#[cfg(target_os = "linux")]
-impl TyLspAdapter {
-    const GITHUB_ASSET_KIND: AssetKind = AssetKind::TarGz;
-    const ARCH_SERVER_NAME: &str = "unknown-linux-gnu";
-}
-
-#[cfg(target_os = "freebsd")]
-impl TyLspAdapter {
-    const GITHUB_ASSET_KIND: AssetKind = AssetKind::TarGz;
-    const ARCH_SERVER_NAME: &str = "unknown-freebsd";
-}
-
-#[cfg(target_os = "windows")]
-impl TyLspAdapter {
-    const GITHUB_ASSET_KIND: AssetKind = AssetKind::Zip;
-    const ARCH_SERVER_NAME: &str = "pc-windows-msvc";
-}
-
-impl TyLspAdapter {
-    const SERVER_NAME: LanguageServerName = LanguageServerName::new_static("ty");
-
-    pub fn new(fs: Arc<dyn Fs>) -> TyLspAdapter {
-        TyLspAdapter { fs }
-    }
-
-    fn build_asset_name() -> Result<(String, String)> {
-        let arch = match consts::ARCH {
-            "x86" => "i686",
-            _ => consts::ARCH,
-        };
-        let os = Self::ARCH_SERVER_NAME;
-        let suffix = match consts::OS {
-            "windows" => "zip",
-            _ => "tar.gz",
-        };
-        let asset_name = format!("ty-{arch}-{os}.{suffix}");
-        let asset_stem = format!("ty-{arch}-{os}");
-        Ok((asset_stem, asset_name))
-    }
-}
-
-#[async_trait(?Send)]
-impl LspAdapter for TyLspAdapter {
-    fn name(&self) -> LanguageServerName {
-        Self::SERVER_NAME
-    }
-
-    async fn label_for_completion(
-        &self,
-        item: &lsp::CompletionItem,
-        language: &Arc<language::Language>,
-    ) -> Option<language::CodeLabel> {
-        let label = &item.label;
-        let label_len = label.len();
-        let grammar = language.grammar()?;
-        let highlight_id = match item.kind? {
-            lsp::CompletionItemKind::METHOD => grammar.highlight_id_for_name("function.method"),
-            lsp::CompletionItemKind::FUNCTION => grammar.highlight_id_for_name("function"),
-            lsp::CompletionItemKind::CLASS => grammar.highlight_id_for_name("type"),
-            lsp::CompletionItemKind::CONSTANT => grammar.highlight_id_for_name("constant"),
-            lsp::CompletionItemKind::VARIABLE => grammar.highlight_id_for_name("variable"),
-            _ => {
-                return None;
-            }
-        };
-
-        let mut text = label.clone();
-        if let Some(completion_details) = item
-            .label_details
-            .as_ref()
-            .and_then(|details| details.detail.as_ref())
-        {
-            write!(&mut text, " {}", completion_details).ok();
-        }
-
-        Some(language::CodeLabel::filtered(
-            text,
-            label_len,
-            item.filter_text.as_deref(),
-            highlight_id
-                .map(|id| (0..label_len, id))
-                .into_iter()
-                .collect(),
-        ))
-    }
-
-    async fn workspace_configuration(
-        self: Arc<Self>,
-        delegate: &Arc<dyn LspAdapterDelegate>,
-        toolchain: Option<Toolchain>,
-        _: Option<Uri>,
-        cx: &mut AsyncApp,
-    ) -> Result<Value> {
-        let mut ret = cx
-            .update(|cx| {
-                language_server_settings(delegate.as_ref(), &self.name(), cx)
-                    .and_then(|s| s.settings.clone())
-            })?
-            .unwrap_or_else(|| json!({}));
-        if let Some(toolchain) = toolchain.and_then(|toolchain| {
-            serde_json::from_value::<PythonToolchainData>(toolchain.as_json).ok()
-        }) {
-            _ = maybe!({
-                let uri =
-                    url::Url::from_file_path(toolchain.environment.executable.as_ref()?).ok()?;
-                let sys_prefix = toolchain.environment.prefix.clone()?;
-                let environment = json!({
-                    "executable": {
-                        "uri": uri,
-                        "sysPrefix": sys_prefix
-                    }
-                });
-                ret.as_object_mut()?
-                    .entry("pythonExtension")
-                    .or_insert_with(|| json!({ "activeEnvironment": environment }));
-                Some(())
-            });
-        }
-        Ok(json!({"ty": ret}))
-    }
-}
-
-impl LspInstaller for TyLspAdapter {
-    type BinaryVersion = GitHubLspBinaryVersion;
-    async fn fetch_latest_server_version(
-        &self,
-        delegate: &dyn LspAdapterDelegate,
-        _: bool,
-        _: &mut AsyncApp,
-    ) -> Result<Self::BinaryVersion> {
-        let release =
-            latest_github_release("astral-sh/ty", true, true, delegate.http_client()).await?;
-        let (_, asset_name) = Self::build_asset_name()?;
-        let asset = release
-            .assets
-            .into_iter()
-            .find(|asset| asset.name == asset_name)
-            .with_context(|| format!("no asset found matching `{asset_name:?}`"))?;
-        Ok(GitHubLspBinaryVersion {
-            name: release.tag_name,
-            url: asset.browser_download_url,
-            digest: asset.digest,
-        })
-    }
-
-    async fn fetch_server_binary(
-        &self,
-        latest_version: Self::BinaryVersion,
-        container_dir: PathBuf,
-        delegate: &dyn LspAdapterDelegate,
-    ) -> Result<LanguageServerBinary> {
-        let GitHubLspBinaryVersion {
-            name,
-            url,
-            digest: expected_digest,
-        } = latest_version;
-        let destination_path = container_dir.join(format!("ty-{name}"));
-
-        async_fs::create_dir_all(&destination_path).await?;
-
-        let server_path = match Self::GITHUB_ASSET_KIND {
-            AssetKind::TarGz | AssetKind::Gz => destination_path
-                .join(Self::build_asset_name()?.0)
-                .join("ty"),
-            AssetKind::Zip => destination_path.clone().join("ty.exe"),
-        };
-
-        let binary = LanguageServerBinary {
-            path: server_path.clone(),
-            env: None,
-            arguments: vec!["server".into()],
-        };
-
-        let metadata_path = destination_path.with_extension("metadata");
-        let metadata = GithubBinaryMetadata::read_from_file(&metadata_path)
-            .await
-            .ok();
-        if let Some(metadata) = metadata {
-            let validity_check = async || {
-                delegate
-                    .try_exec(LanguageServerBinary {
-                        path: server_path.clone(),
-                        arguments: vec!["--version".into()],
-                        env: None,
-                    })
-                    .await
-                    .inspect_err(|err| {
-                        log::warn!("Unable to run {server_path:?} asset, redownloading: {err:#}",)
-                    })
-            };
-            if let (Some(actual_digest), Some(expected_digest)) =
-                (&metadata.digest, &expected_digest)
-            {
-                if actual_digest == expected_digest {
-                    if validity_check().await.is_ok() {
-                        return Ok(binary);
-                    }
-                } else {
-                    log::info!(
-                        "SHA-256 mismatch for {destination_path:?} asset, downloading new asset. Expected: {expected_digest}, Got: {actual_digest}"
-                    );
-                }
-            } else if validity_check().await.is_ok() {
-                return Ok(binary);
-            }
-        }
-
-        download_server_binary(
-            &*delegate.http_client(),
-            &url,
-            expected_digest.as_deref(),
-            &destination_path,
-            Self::GITHUB_ASSET_KIND,
-        )
-        .await?;
-        make_file_executable(&server_path).await?;
-        remove_matching(&container_dir, |path| path != destination_path).await;
-        GithubBinaryMetadata::write_to_file(
-            &GithubBinaryMetadata {
-                metadata_version: 1,
-                digest: expected_digest,
-            },
-            &metadata_path,
-        )
-        .await?;
-
-        Ok(LanguageServerBinary {
-            path: server_path,
-            env: None,
-            arguments: vec!["server".into()],
-        })
-    }
-
-    async fn cached_server_binary(
-        &self,
-        container_dir: PathBuf,
-        _: &dyn LspAdapterDelegate,
-    ) -> Option<LanguageServerBinary> {
-        maybe!(async {
-            let mut last = None;
-            let mut entries = self.fs.read_dir(&container_dir).await?;
-            while let Some(entry) = entries.next().await {
-                let path = entry?;
-                if path.extension().is_some_and(|ext| ext == "metadata") {
-                    continue;
-                }
-                last = Some(path);
-            }
-
-            let path = last.context("no cached binary")?;
-            let path = match TyLspAdapter::GITHUB_ASSET_KIND {
-                AssetKind::TarGz | AssetKind::Gz => {
-                    path.join(Self::build_asset_name()?.0).join("ty")
-                }
-                AssetKind::Zip => path.join("ty.exe"),
-            };
-
-            anyhow::Ok(LanguageServerBinary {
-                path,
-                env: None,
-                arguments: vec!["server".into()],
-            })
-        })
-        .await
-        .log_err()
-    }
-}
-
-pub struct PyrightLspAdapter {
-    node: NodeRuntime,
-}
-
-impl PyrightLspAdapter {
-    const SERVER_NAME: LanguageServerName = LanguageServerName::new_static("pyright");
-    const SERVER_PATH: &str = "node_modules/pyright/langserver.index.js";
-    const NODE_MODULE_RELATIVE_SERVER_PATH: &str = "pyright/langserver.index.js";
-
-    pub fn new(node: NodeRuntime) -> Self {
-        PyrightLspAdapter { node }
-    }
-
-    async fn get_cached_server_binary(
-        container_dir: PathBuf,
-        node: &NodeRuntime,
-    ) -> Option<LanguageServerBinary> {
-        let server_path = container_dir.join(Self::SERVER_PATH);
-        if server_path.exists() {
-            Some(LanguageServerBinary {
-                path: node.binary_path().await.log_err()?,
-                env: None,
-                arguments: vec![server_path.into(), "--stdio".into()],
-            })
-        } else {
-            log::error!("missing executable in directory {:?}", server_path);
-            None
-        }
-    }
-}
-
-#[async_trait(?Send)]
-impl LspAdapter for PyrightLspAdapter {
-    fn name(&self) -> LanguageServerName {
-        Self::SERVER_NAME
-    }
-
-    async fn initialization_options(
-        self: Arc<Self>,
-        _: &Arc<dyn LspAdapterDelegate>,
-    ) -> Result<Option<Value>> {
-        // Provide minimal initialization options
-        // Virtual environment configuration will be handled through workspace configuration
-        Ok(Some(json!({
-            "python": {
-                "analysis": {
-                    "autoSearchPaths": true,
-                    "useLibraryCodeForTypes": true,
-                    "autoImportCompletions": true
-                }
-            }
-        })))
-    }
-
-    async fn process_completions(&self, items: &mut [lsp::CompletionItem]) {
-        process_pyright_completions(items);
-    }
-
-    async fn label_for_completion(
-        &self,
-        item: &lsp::CompletionItem,
-        language: &Arc<language::Language>,
-    ) -> Option<language::CodeLabel> {
-        let label = &item.label;
-        let label_len = label.len();
-        let grammar = language.grammar()?;
-        let highlight_id = match item.kind? {
-            lsp::CompletionItemKind::METHOD => grammar.highlight_id_for_name("function.method"),
-            lsp::CompletionItemKind::FUNCTION => grammar.highlight_id_for_name("function"),
-            lsp::CompletionItemKind::CLASS => grammar.highlight_id_for_name("type"),
-            lsp::CompletionItemKind::CONSTANT => grammar.highlight_id_for_name("constant"),
-            lsp::CompletionItemKind::VARIABLE => grammar.highlight_id_for_name("variable"),
-            _ => {
-                return None;
-            }
-        };
-        let mut text = label.clone();
-        if let Some(completion_details) = item
-            .label_details
-            .as_ref()
-            .and_then(|details| details.description.as_ref())
-        {
-            write!(&mut text, " {}", completion_details).ok();
-        }
-        Some(language::CodeLabel::filtered(
-            text,
-            label_len,
-            item.filter_text.as_deref(),
-            highlight_id
-                .map(|id| (0..label_len, id))
-                .into_iter()
-                .collect(),
-        ))
-    }
-
-    async fn label_for_symbol(
-        &self,
-        name: &str,
-        kind: lsp::SymbolKind,
-        language: &Arc<language::Language>,
-    ) -> Option<language::CodeLabel> {
-        let (text, filter_range, display_range) = match kind {
-            lsp::SymbolKind::METHOD | lsp::SymbolKind::FUNCTION => {
-                let text = format!("def {}():\n", name);
-                let filter_range = 4..4 + name.len();
-                let display_range = 0..filter_range.end;
-                (text, filter_range, display_range)
-            }
-            lsp::SymbolKind::CLASS => {
-                let text = format!("class {}:", name);
-                let filter_range = 6..6 + name.len();
-                let display_range = 0..filter_range.end;
-                (text, filter_range, display_range)
-            }
-            lsp::SymbolKind::CONSTANT => {
-                let text = format!("{} = 0", name);
-                let filter_range = 0..name.len();
-                let display_range = 0..filter_range.end;
-                (text, filter_range, display_range)
-            }
-            _ => return None,
-        };
-
-        Some(language::CodeLabel::new(
-            text[display_range.clone()].to_string(),
-            filter_range,
-            language.highlight_text(&text.as_str().into(), display_range),
-        ))
-    }
-
-    async fn workspace_configuration(
-        self: Arc<Self>,
-        adapter: &Arc<dyn LspAdapterDelegate>,
-        toolchain: Option<Toolchain>,
-        _: Option<Uri>,
-        cx: &mut AsyncApp,
-    ) -> Result<Value> {
-        cx.update(move |cx| {
-            let mut user_settings =
-                language_server_settings(adapter.as_ref(), &Self::SERVER_NAME, cx)
-                    .and_then(|s| s.settings.clone())
-                    .unwrap_or_default();
-
-            // If we have a detected toolchain, configure Pyright to use it
-            if let Some(toolchain) = toolchain
-                && let Ok(env) =
-                    serde_json::from_value::<PythonToolchainData>(toolchain.as_json.clone())
-            {
-                if !user_settings.is_object() {
-                    user_settings = Value::Object(serde_json::Map::default());
-                }
-                let object = user_settings.as_object_mut().unwrap();
-
-                let interpreter_path = toolchain.path.to_string();
-                if let Some(venv_dir) = &env.environment.prefix {
-                    // Set venvPath and venv at the root level
-                    // This matches the format of a pyrightconfig.json file
-                    if let Some(parent) = venv_dir.parent() {
-                        // Use relative path if the venv is inside the workspace
-                        let venv_path = if parent == adapter.worktree_root_path() {
-                            ".".to_string()
-                        } else {
-                            parent.to_string_lossy().into_owned()
-                        };
-                        object.insert("venvPath".to_string(), Value::String(venv_path));
-                    }
-
-                    if let Some(venv_name) = venv_dir.file_name() {
-                        object.insert(
-                            "venv".to_owned(),
-                            Value::String(venv_name.to_string_lossy().into_owned()),
-                        );
-                    }
-                }
-
-                // Always set the python interpreter path
-                // Get or create the python section
-                let python = object
-                    .entry("python")
-                    .and_modify(|v| {
-                        if !v.is_object() {
-                            *v = Value::Object(serde_json::Map::default());
-                        }
-                    })
-                    .or_insert(Value::Object(serde_json::Map::default()));
-                let python = python.as_object_mut().unwrap();
-
-                // Set both pythonPath and defaultInterpreterPath for compatibility
-                python.insert(
-                    "pythonPath".to_owned(),
-                    Value::String(interpreter_path.clone()),
-                );
-                python.insert(
-                    "defaultInterpreterPath".to_owned(),
-                    Value::String(interpreter_path),
-                );
-            }
-
-            user_settings
-        })
-    }
-}
-
-impl LspInstaller for PyrightLspAdapter {
-    type BinaryVersion = String;
-
-    async fn fetch_latest_server_version(
-        &self,
-        _: &dyn LspAdapterDelegate,
-        _: bool,
-        _: &mut AsyncApp,
-    ) -> Result<String> {
-        self.node
-            .npm_package_latest_version(Self::SERVER_NAME.as_ref())
-            .await
-    }
-
-    async fn check_if_user_installed(
-        &self,
-        delegate: &dyn LspAdapterDelegate,
-        _: Option<Toolchain>,
-        _: &AsyncApp,
-    ) -> Option<LanguageServerBinary> {
-        if let Some(pyright_bin) = delegate.which("pyright-langserver".as_ref()).await {
-            let env = delegate.shell_env().await;
-            Some(LanguageServerBinary {
-                path: pyright_bin,
-                env: Some(env),
-                arguments: vec!["--stdio".into()],
-            })
-        } else {
-            let node = delegate.which("node".as_ref()).await?;
-            let (node_modules_path, _) = delegate
-                .npm_package_installed_version(Self::SERVER_NAME.as_ref())
-                .await
-                .log_err()??;
-
-            let path = node_modules_path.join(Self::NODE_MODULE_RELATIVE_SERVER_PATH);
-
-            let env = delegate.shell_env().await;
-            Some(LanguageServerBinary {
-                path: node,
-                env: Some(env),
-                arguments: vec![path.into(), "--stdio".into()],
-            })
-        }
-    }
-
-    async fn fetch_server_binary(
-        &self,
-        latest_version: Self::BinaryVersion,
-        container_dir: PathBuf,
-        delegate: &dyn LspAdapterDelegate,
-    ) -> Result<LanguageServerBinary> {
-        let server_path = container_dir.join(Self::SERVER_PATH);
-
-        self.node
-            .npm_install_packages(
-                &container_dir,
-                &[(Self::SERVER_NAME.as_ref(), latest_version.as_str())],
-            )
-            .await?;
-
-        let env = delegate.shell_env().await;
-        Ok(LanguageServerBinary {
-            path: self.node.binary_path().await?,
-            env: Some(env),
-            arguments: vec![server_path.into(), "--stdio".into()],
-        })
-    }
-
-    async fn check_if_version_installed(
-        &self,
-        version: &Self::BinaryVersion,
-        container_dir: &PathBuf,
-        delegate: &dyn LspAdapterDelegate,
-    ) -> Option<LanguageServerBinary> {
-        let server_path = container_dir.join(Self::SERVER_PATH);
-
-        let should_install_language_server = self
-            .node
-            .should_install_npm_package(
-                Self::SERVER_NAME.as_ref(),
-                &server_path,
-                container_dir,
-                VersionStrategy::Latest(version),
-            )
-            .await;
-
-        if should_install_language_server {
-            None
-        } else {
-            let env = delegate.shell_env().await;
-            Some(LanguageServerBinary {
-                path: self.node.binary_path().await.ok()?,
-                env: Some(env),
-                arguments: vec![server_path.into(), "--stdio".into()],
-            })
-        }
-    }
-
-    async fn cached_server_binary(
-        &self,
-        container_dir: PathBuf,
-        delegate: &dyn LspAdapterDelegate,
-    ) -> Option<LanguageServerBinary> {
-        let mut binary = Self::get_cached_server_binary(container_dir, &self.node).await?;
-        binary.env = Some(delegate.shell_env().await);
-        Some(binary)
-    }
-}
-
-pub(crate) struct PythonContextProvider;
-
-const PYTHON_TEST_TARGET_TASK_VARIABLE: VariableName =
-    VariableName::Custom(Cow::Borrowed("PYTHON_TEST_TARGET"));
-
-const PYTHON_ACTIVE_TOOLCHAIN_PATH: VariableName =
-    VariableName::Custom(Cow::Borrowed("PYTHON_ACTIVE_ZED_TOOLCHAIN"));
-
-const PYTHON_MODULE_NAME_TASK_VARIABLE: VariableName =
-    VariableName::Custom(Cow::Borrowed("PYTHON_MODULE_NAME"));
-
-impl ContextProvider for PythonContextProvider {
-    fn build_context(
-        &self,
-        variables: &task::TaskVariables,
-        location: ContextLocation<'_>,
-        _: Option<HashMap<String, String>>,
-        toolchains: Arc<dyn LanguageToolchainStore>,
-        cx: &mut gpui::App,
-    ) -> Task<Result<task::TaskVariables>> {
-        let test_target =
-            match selected_test_runner(location.file_location.buffer.read(cx).file(), cx) {
-                TestRunner::UNITTEST => self.build_unittest_target(variables),
-                TestRunner::PYTEST => self.build_pytest_target(variables),
-            };
-
-        let module_target = self.build_module_target(variables);
-        let location_file = location.file_location.buffer.read(cx).file().cloned();
-        let worktree_id = location_file.as_ref().map(|f| f.worktree_id(cx));
-
-        cx.spawn(async move |cx| {
-            let active_toolchain = if let Some(worktree_id) = worktree_id {
-                let file_path = location_file
-                    .as_ref()
-                    .and_then(|f| f.path().parent())
-                    .map(Arc::from)
-                    .unwrap_or_else(|| RelPath::empty().into());
-
-                toolchains
-                    .active_toolchain(worktree_id, file_path, "Python".into(), cx)
-                    .await
-                    .map_or_else(
-                        || String::from("python3"),
-                        |toolchain| toolchain.path.to_string(),
-                    )
-            } else {
-                String::from("python3")
-            };
-
-            let toolchain = (PYTHON_ACTIVE_TOOLCHAIN_PATH, active_toolchain);
-
-            Ok(task::TaskVariables::from_iter(
-                test_target
-                    .into_iter()
-                    .chain(module_target.into_iter())
-                    .chain([toolchain]),
-            ))
-        })
-    }
-
-    fn associated_tasks(
-        &self,
-        file: Option<Arc<dyn language::File>>,
-        cx: &App,
-    ) -> Task<Option<TaskTemplates>> {
-        let test_runner = selected_test_runner(file.as_ref(), cx);
-
-        let mut tasks = vec![
-            // Execute a selection
-            TaskTemplate {
-                label: "execute selection".to_owned(),
-                command: PYTHON_ACTIVE_TOOLCHAIN_PATH.template_value(),
-                args: vec![
-                    "-c".to_owned(),
-                    VariableName::SelectedText.template_value_with_whitespace(),
-                ],
-                cwd: Some(VariableName::WorktreeRoot.template_value()),
-                ..TaskTemplate::default()
-            },
-            // Execute an entire file
-            TaskTemplate {
-                label: format!("run '{}'", VariableName::File.template_value()),
-                command: PYTHON_ACTIVE_TOOLCHAIN_PATH.template_value(),
-                args: vec![VariableName::File.template_value_with_whitespace()],
-                cwd: Some(VariableName::WorktreeRoot.template_value()),
-                ..TaskTemplate::default()
-            },
-            // Execute a file as module
-            TaskTemplate {
-                label: format!("run module '{}'", VariableName::File.template_value()),
-                command: PYTHON_ACTIVE_TOOLCHAIN_PATH.template_value(),
-                args: vec![
-                    "-m".to_owned(),
-                    PYTHON_MODULE_NAME_TASK_VARIABLE.template_value(),
-                ],
-                cwd: Some(VariableName::WorktreeRoot.template_value()),
-                tags: vec!["python-module-main-method".to_owned()],
-                ..TaskTemplate::default()
-            },
-        ];
-
-        tasks.extend(match test_runner {
-            TestRunner::UNITTEST => {
-                [
-                    // Run tests for an entire file
-                    TaskTemplate {
-                        label: format!("unittest '{}'", VariableName::File.template_value()),
-                        command: PYTHON_ACTIVE_TOOLCHAIN_PATH.template_value(),
-                        args: vec![
-                            "-m".to_owned(),
-                            "unittest".to_owned(),
-                            VariableName::File.template_value_with_whitespace(),
-                        ],
-                        cwd: Some(VariableName::WorktreeRoot.template_value()),
-                        ..TaskTemplate::default()
-                    },
-                    // Run test(s) for a specific target within a file
-                    TaskTemplate {
-                        label: "unittest $ZED_CUSTOM_PYTHON_TEST_TARGET".to_owned(),
-                        command: PYTHON_ACTIVE_TOOLCHAIN_PATH.template_value(),
-                        args: vec![
-                            "-m".to_owned(),
-                            "unittest".to_owned(),
-                            PYTHON_TEST_TARGET_TASK_VARIABLE.template_value_with_whitespace(),
-                        ],
-                        tags: vec![
-                            "python-unittest-class".to_owned(),
-                            "python-unittest-method".to_owned(),
-                        ],
-                        cwd: Some(VariableName::WorktreeRoot.template_value()),
-                        ..TaskTemplate::default()
-                    },
-                ]
-            }
-            TestRunner::PYTEST => {
-                [
-                    // Run tests for an entire file
-                    TaskTemplate {
-                        label: format!("pytest '{}'", VariableName::File.template_value()),
-                        command: PYTHON_ACTIVE_TOOLCHAIN_PATH.template_value(),
-                        args: vec![
-                            "-m".to_owned(),
-                            "pytest".to_owned(),
-                            VariableName::File.template_value_with_whitespace(),
-                        ],
-                        cwd: Some(VariableName::WorktreeRoot.template_value()),
-                        ..TaskTemplate::default()
-                    },
-                    // Run test(s) for a specific target within a file
-                    TaskTemplate {
-                        label: "pytest $ZED_CUSTOM_PYTHON_TEST_TARGET".to_owned(),
-                        command: PYTHON_ACTIVE_TOOLCHAIN_PATH.template_value(),
-                        args: vec![
-                            "-m".to_owned(),
-                            "pytest".to_owned(),
-                            PYTHON_TEST_TARGET_TASK_VARIABLE.template_value_with_whitespace(),
-                        ],
-                        cwd: Some(VariableName::WorktreeRoot.template_value()),
-                        tags: vec![
-                            "python-pytest-class".to_owned(),
-                            "python-pytest-method".to_owned(),
-                        ],
-                        ..TaskTemplate::default()
-                    },
-                ]
-            }
-        });
-
-        Task::ready(Some(TaskTemplates(tasks)))
-    }
-}
-
-fn selected_test_runner(location: Option<&Arc<dyn language::File>>, cx: &App) -> TestRunner {
-    const TEST_RUNNER_VARIABLE: &str = "TEST_RUNNER";
-    language_settings(Some(LanguageName::new_static("Python")), location, cx)
-        .tasks
-        .variables
-        .get(TEST_RUNNER_VARIABLE)
-        .and_then(|val| TestRunner::from_str(val).ok())
-        .unwrap_or(TestRunner::PYTEST)
-}
-
-impl PythonContextProvider {
-    fn build_unittest_target(
-        &self,
-        variables: &task::TaskVariables,
-    ) -> Option<(VariableName, String)> {
-        let python_module_name =
-            python_module_name_from_relative_path(variables.get(&VariableName::RelativeFile)?)?;
-
-        let unittest_class_name =
-            variables.get(&VariableName::Custom(Cow::Borrowed("_unittest_class_name")));
-
-        let unittest_method_name = variables.get(&VariableName::Custom(Cow::Borrowed(
-            "_unittest_method_name",
-        )));
-
-        let unittest_target_str = match (unittest_class_name, unittest_method_name) {
-            (Some(class_name), Some(method_name)) => {
-                format!("{python_module_name}.{class_name}.{method_name}")
-            }
-            (Some(class_name), None) => format!("{python_module_name}.{class_name}"),
-            (None, None) => python_module_name,
-            // should never happen, a TestCase class is the unit of testing
-            (None, Some(_)) => return None,
-        };
-
-        Some((
-            PYTHON_TEST_TARGET_TASK_VARIABLE.clone(),
-            unittest_target_str,
-        ))
-    }
-
-    fn build_pytest_target(
-        &self,
-        variables: &task::TaskVariables,
-    ) -> Option<(VariableName, String)> {
-        let file_path = variables.get(&VariableName::RelativeFile)?;
-
-        let pytest_class_name =
-            variables.get(&VariableName::Custom(Cow::Borrowed("_pytest_class_name")));
-
-        let pytest_method_name =
-            variables.get(&VariableName::Custom(Cow::Borrowed("_pytest_method_name")));
-
-        let pytest_target_str = match (pytest_class_name, pytest_method_name) {
-            (Some(class_name), Some(method_name)) => {
-                format!("{file_path}::{class_name}::{method_name}")
-            }
-            (Some(class_name), None) => {
-                format!("{file_path}::{class_name}")
-            }
-            (None, Some(method_name)) => {
-                format!("{file_path}::{method_name}")
-            }
-            (None, None) => file_path.to_string(),
-        };
-
-        Some((PYTHON_TEST_TARGET_TASK_VARIABLE.clone(), pytest_target_str))
-    }
-
-    fn build_module_target(
-        &self,
-        variables: &task::TaskVariables,
-    ) -> Result<(VariableName, String)> {
-        let python_module_name = variables
-            .get(&VariableName::RelativeFile)
-            .and_then(|module| python_module_name_from_relative_path(module))
-            .unwrap_or_default();
-
-        let module_target = (PYTHON_MODULE_NAME_TASK_VARIABLE.clone(), python_module_name);
-
-        Ok(module_target)
-    }
-}
-
-fn python_module_name_from_relative_path(relative_path: &str) -> Option<String> {
-    let rel_path = RelPath::new(relative_path.as_ref(), PathStyle::local()).ok()?;
-    let path_with_dots = rel_path.display(PathStyle::Posix).replace('/', ".");
-    Some(
-        path_with_dots
-            .strip_suffix(".py")
-            .map(ToOwned::to_owned)
-            .unwrap_or(path_with_dots),
-    )
-}
-
-fn is_python_env_global(k: &PythonEnvironmentKind) -> bool {
-    matches!(
-        k,
-        PythonEnvironmentKind::Homebrew
-            | PythonEnvironmentKind::Pyenv
-            | PythonEnvironmentKind::GlobalPaths
-            | PythonEnvironmentKind::MacPythonOrg
-            | PythonEnvironmentKind::MacCommandLineTools
-            | PythonEnvironmentKind::LinuxGlobal
-            | PythonEnvironmentKind::MacXCode
-            | PythonEnvironmentKind::WindowsStore
-            | PythonEnvironmentKind::WindowsRegistry
-    )
-}
-
-fn python_env_kind_display(k: &PythonEnvironmentKind) -> &'static str {
-    match k {
-        PythonEnvironmentKind::Conda => "Conda",
-        PythonEnvironmentKind::Pixi => "pixi",
-        PythonEnvironmentKind::Homebrew => "Homebrew",
-        PythonEnvironmentKind::Pyenv => "global (Pyenv)",
-        PythonEnvironmentKind::GlobalPaths => "global",
-        PythonEnvironmentKind::PyenvVirtualEnv => "Pyenv",
-        PythonEnvironmentKind::Pipenv => "Pipenv",
-        PythonEnvironmentKind::Poetry => "Poetry",
-        PythonEnvironmentKind::MacPythonOrg => "global (Python.org)",
-        PythonEnvironmentKind::MacCommandLineTools => "global (Command Line Tools for Xcode)",
-        PythonEnvironmentKind::LinuxGlobal => "global",
-        PythonEnvironmentKind::MacXCode => "global (Xcode)",
-        PythonEnvironmentKind::Venv => "venv",
-        PythonEnvironmentKind::VirtualEnv => "virtualenv",
-        PythonEnvironmentKind::VirtualEnvWrapper => "virtualenvwrapper",
-        PythonEnvironmentKind::WindowsStore => "global (Windows Store)",
-        PythonEnvironmentKind::WindowsRegistry => "global (Windows Registry)",
-        PythonEnvironmentKind::Uv => "uv",
-        PythonEnvironmentKind::UvWorkspace => "uv (Workspace)",
-    }
-}
-
-pub(crate) struct PythonToolchainProvider;
-
-static ENV_PRIORITY_LIST: &[PythonEnvironmentKind] = &[
-    // Prioritize non-Conda environments.
-    PythonEnvironmentKind::UvWorkspace,
-    PythonEnvironmentKind::Uv,
-    PythonEnvironmentKind::Poetry,
-    PythonEnvironmentKind::Pipenv,
-    PythonEnvironmentKind::VirtualEnvWrapper,
-    PythonEnvironmentKind::Venv,
-    PythonEnvironmentKind::VirtualEnv,
-    PythonEnvironmentKind::PyenvVirtualEnv,
-    PythonEnvironmentKind::Pixi,
-    PythonEnvironmentKind::Conda,
-    PythonEnvironmentKind::Pyenv,
-    PythonEnvironmentKind::GlobalPaths,
-    PythonEnvironmentKind::Homebrew,
-];
-
-fn env_priority(kind: Option<PythonEnvironmentKind>) -> usize {
-    if let Some(kind) = kind {
-        ENV_PRIORITY_LIST
-            .iter()
-            .position(|blessed_env| blessed_env == &kind)
-            .unwrap_or(ENV_PRIORITY_LIST.len())
-    } else {
-        // Unknown toolchains are less useful than non-blessed ones.
-        ENV_PRIORITY_LIST.len() + 1
-    }
-}
-
-/// Return the name of environment declared in <worktree-root/.venv.
-///
-/// https://virtualfish.readthedocs.io/en/latest/plugins.html#auto-activation-auto-activation
-async fn get_worktree_venv_declaration(worktree_root: &Path) -> Option<String> {
-    let file = async_fs::File::open(worktree_root.join(".venv"))
-        .await
-        .ok()?;
-    let mut venv_name = String::new();
-    smol::io::BufReader::new(file)
-        .read_line(&mut venv_name)
-        .await
-        .ok()?;
-    Some(venv_name.trim().to_string())
-}
-
-fn get_venv_parent_dir(env: &PythonEnvironment) -> Option<PathBuf> {
-    // If global, we aren't a virtual environment
-    if let Some(kind) = env.kind
-        && is_python_env_global(&kind)
-    {
-        return None;
-    }
-
-    // Check to be sure we are a virtual environment using pet's most generic
-    // virtual environment type, VirtualEnv
-    let venv = env
-        .executable
-        .as_ref()
-        .and_then(|p| p.parent())
-        .and_then(|p| p.parent())
-        .filter(|p| is_virtualenv_dir(p))?;
-
-    venv.parent().map(|parent| parent.to_path_buf())
-}
-
-// How far is this venv from the root of our current project?
-#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
-enum SubprojectDistance {
-    WithinSubproject(Reverse<usize>),
-    WithinWorktree(Reverse<usize>),
-    NotInWorktree,
-}
-
-fn wr_distance(
-    wr: &PathBuf,
-    subroot_relative_path: &RelPath,
-    venv: Option<&PathBuf>,
-) -> SubprojectDistance {
-    if let Some(venv) = venv
-        && let Ok(p) = venv.strip_prefix(wr)
-    {
-        if subroot_relative_path.components().next().is_some()
-            && let Ok(distance) = p
-                .strip_prefix(subroot_relative_path.as_std_path())
-                .map(|p| p.components().count())
-        {
-            SubprojectDistance::WithinSubproject(Reverse(distance))
-        } else {
-            SubprojectDistance::WithinWorktree(Reverse(p.components().count()))
-        }
-    } else {
-        SubprojectDistance::NotInWorktree
-    }
-}
-
-#[async_trait]
-impl ToolchainLister for PythonToolchainProvider {
-    async fn list(
-        &self,
-        worktree_root: PathBuf,
-        subroot_relative_path: Arc<RelPath>,
-        project_env: Option<HashMap<String, String>>,
-        fs: &dyn Fs,
-    ) -> ToolchainList {
-        let env = project_env.unwrap_or_default();
-        let environment = EnvironmentApi::from_env(&env);
-        let locators = pet::locators::create_locators(
-            Arc::new(pet_conda::Conda::from(&environment)),
-            Arc::new(pet_poetry::Poetry::from(&environment)),
-            &environment,
-        );
-        let mut config = Configuration::default();
-
-        // `.ancestors()` will yield at least one path, so in case of empty `subroot_relative_path`, we'll just use
-        // worktree root as the workspace directory.
-        config.workspace_directories = Some(
-            subroot_relative_path
-                .ancestors()
-                .map(|ancestor| worktree_root.join(ancestor.as_std_path()))
-                .collect(),
-        );
-        for locator in locators.iter() {
-            locator.configure(&config);
-        }
-
-        let reporter = pet_reporter::collect::create_reporter();
-        pet::find::find_and_report_envs(&reporter, config, &locators, &environment, None);
-
-        let mut toolchains = reporter
-            .environments
-            .lock()
-            .map_or(Vec::new(), |mut guard| std::mem::take(&mut guard));
-
-        let wr = worktree_root;
-        let wr_venv = get_worktree_venv_declaration(&wr).await;
-        // Sort detected environments by:
-        //     environment name matching activation file (<workdir>/.venv)
-        //     environment project dir matching worktree_root
-        //     general env priority
-        //     environment path matching the CONDA_PREFIX env var
-        //     executable path
-        toolchains.sort_by(|lhs, rhs| {
-            // Compare venv names against worktree .venv file
-            let venv_ordering =
-                wr_venv
-                    .as_ref()
-                    .map_or(Ordering::Equal, |venv| match (&lhs.name, &rhs.name) {
-                        (Some(l), Some(r)) => (r == venv).cmp(&(l == venv)),
-                        (Some(l), None) if l == venv => Ordering::Less,
-                        (None, Some(r)) if r == venv => Ordering::Greater,
-                        _ => Ordering::Equal,
-                    });
-
-            // Compare project paths against worktree root
-            let proj_ordering =
-                || {
-                    let lhs_project = lhs.project.clone().or_else(|| get_venv_parent_dir(lhs));
-                    let rhs_project = rhs.project.clone().or_else(|| get_venv_parent_dir(rhs));
-                    wr_distance(&wr, &subroot_relative_path, lhs_project.as_ref()).cmp(
-                        &wr_distance(&wr, &subroot_relative_path, rhs_project.as_ref()),
-                    )
-                };
-
-            // Compare environment priorities
-            let priority_ordering = || env_priority(lhs.kind).cmp(&env_priority(rhs.kind));
-
-            // Compare conda prefixes
-            let conda_ordering = || {
-                if lhs.kind == Some(PythonEnvironmentKind::Conda) {
-                    environment
-                        .get_env_var("CONDA_PREFIX".to_string())
-                        .map(|conda_prefix| {
-                            let is_match = |exe: &Option<PathBuf>| {
-                                exe.as_ref().is_some_and(|e| e.starts_with(&conda_prefix))
-                            };
-                            match (is_match(&lhs.executable), is_match(&rhs.executable)) {
-                                (true, false) => Ordering::Less,
-                                (false, true) => Ordering::Greater,
-                                _ => Ordering::Equal,
-                            }
-                        })
-                        .unwrap_or(Ordering::Equal)
-                } else {
-                    Ordering::Equal
-                }
-            };
-
-            // Compare Python executables
-            let exe_ordering = || lhs.executable.cmp(&rhs.executable);
-
-            venv_ordering
-                .then_with(proj_ordering)
-                .then_with(priority_ordering)
-                .then_with(conda_ordering)
-                .then_with(exe_ordering)
-        });
-
-        let mut out_toolchains = Vec::new();
-        for toolchain in toolchains {
-            let Some(toolchain) = venv_to_toolchain(toolchain, fs).await else {
-                continue;
-            };
-            out_toolchains.push(toolchain);
-        }
-        out_toolchains.dedup();
-        ToolchainList {
-            toolchains: out_toolchains,
-            default: None,
-            groups: Default::default(),
-        }
-    }
-    fn meta(&self) -> ToolchainMetadata {
-        ToolchainMetadata {
-            term: SharedString::new_static("Virtual Environment"),
-            new_toolchain_placeholder: SharedString::new_static(
-                "A path to the python3 executable within a virtual environment, or path to virtual environment itself",
-            ),
-            manifest_name: ManifestName::from(SharedString::new_static("pyproject.toml")),
-        }
-    }
-
-    async fn resolve(
-        &self,
-        path: PathBuf,
-        env: Option<HashMap<String, String>>,
-        fs: &dyn Fs,
-    ) -> anyhow::Result<Toolchain> {
-        let env = env.unwrap_or_default();
-        let environment = EnvironmentApi::from_env(&env);
-        let locators = pet::locators::create_locators(
-            Arc::new(pet_conda::Conda::from(&environment)),
-            Arc::new(pet_poetry::Poetry::from(&environment)),
-            &environment,
-        );
-        let toolchain = pet::resolve::resolve_environment(&path, &locators, &environment)
-            .context("Could not find a virtual environment in provided path")?;
-        let venv = toolchain.resolved.unwrap_or(toolchain.discovered);
-        venv_to_toolchain(venv, fs)
-            .await
-            .context("Could not convert a venv into a toolchain")
-    }
-
-    fn activation_script(&self, toolchain: &Toolchain, shell: ShellKind, cx: &App) -> Vec<String> {
-        let Ok(toolchain) =
-            serde_json::from_value::<PythonToolchainData>(toolchain.as_json.clone())
-        else {
-            return vec![];
-        };
-
-        log::debug!("(Python) Composing activation script for toolchain {toolchain:?}");
-
-        let mut activation_script = vec![];
-
-        match toolchain.environment.kind {
-            Some(PythonEnvironmentKind::Conda) => {
-                let settings = TerminalSettings::get_global(cx);
-                let conda_manager = settings
-                    .detect_venv
-                    .as_option()
-                    .map(|venv| venv.conda_manager)
-                    .unwrap_or(settings::CondaManager::Auto);
-
-                let manager = match conda_manager {
-                    settings::CondaManager::Conda => "conda",
-                    settings::CondaManager::Mamba => "mamba",
-                    settings::CondaManager::Micromamba => "micromamba",
-                    settings::CondaManager::Auto => {
-                        // When auto, prefer the detected manager or fall back to conda
-                        toolchain
-                            .environment
-                            .manager
-                            .as_ref()
-                            .and_then(|m| m.executable.file_name())
-                            .and_then(|name| name.to_str())
-                            .filter(|name| matches!(*name, "conda" | "mamba" | "micromamba"))
-                            .unwrap_or("conda")
-                    }
-                };
-
-                if let Some(name) = &toolchain.environment.name {
-                    activation_script.push(format!("{manager} activate {name}"));
-                } else {
-                    activation_script.push(format!("{manager} activate base"));
-                }
-            }
-            Some(PythonEnvironmentKind::Venv | PythonEnvironmentKind::VirtualEnv) => {
-                if let Some(activation_scripts) = &toolchain.activation_scripts {
-                    if let Some(activate_script_path) = activation_scripts.get(&shell) {
-                        let activate_keyword = shell.activate_keyword();
-                        if let Some(quoted) =
-                            shell.try_quote(&activate_script_path.to_string_lossy())
-                        {
-                            activation_script.push(format!("{activate_keyword} {quoted}"));
-                        }
-                    }
-                }
-            }
-            Some(PythonEnvironmentKind::Pyenv) => {
-                let Some(manager) = &toolchain.environment.manager else {
-                    return vec![];
-                };
-                let version = toolchain.environment.version.as_deref().unwrap_or("system");
-                let pyenv = &manager.executable;
-                let pyenv = pyenv.display();
-                activation_script.extend(match shell {
-                    ShellKind::Fish => Some(format!("\"{pyenv}\" shell - fish {version}")),
-                    ShellKind::Posix => Some(format!("\"{pyenv}\" shell - sh {version}")),
-                    ShellKind::Nushell => Some(format!("^\"{pyenv}\" shell - nu {version}")),
-                    ShellKind::PowerShell | ShellKind::Pwsh => None,
-                    ShellKind::Csh => None,
-                    ShellKind::Tcsh => None,
-                    ShellKind::Cmd => None,
-                    ShellKind::Rc => None,
-                    ShellKind::Xonsh => None,
-                    ShellKind::Elvish => None,
-                })
-            }
-            _ => {}
-        }
-        activation_script
-    }
-}
-
-async fn venv_to_toolchain(venv: PythonEnvironment, fs: &dyn Fs) -> Option<Toolchain> {
-    let mut name = String::from("Python");
-    if let Some(ref version) = venv.version {
-        _ = write!(name, " {version}");
-    }
-
-    let name_and_kind = match (&venv.name, &venv.kind) {
-        (Some(name), Some(kind)) => Some(format!("({name}; {})", python_env_kind_display(kind))),
-        (Some(name), None) => Some(format!("({name})")),
-        (None, Some(kind)) => Some(format!("({})", python_env_kind_display(kind))),
-        (None, None) => None,
-    };
-
-    if let Some(nk) = name_and_kind {
-        _ = write!(name, " {nk}");
-    }
-
-    let mut activation_scripts = HashMap::default();
-    match venv.kind {
-        Some(PythonEnvironmentKind::Venv | PythonEnvironmentKind::VirtualEnv) => {
-            resolve_venv_activation_scripts(&venv, fs, &mut activation_scripts).await
-        }
-        _ => {}
-    }
-    let data = PythonToolchainData {
-        environment: venv,
-        activation_scripts: Some(activation_scripts),
-    };
-
-    Some(Toolchain {
-        name: name.into(),
-        path: data
-            .environment
-            .executable
-            .as_ref()?
-            .to_str()?
-            .to_owned()
-            .into(),
-        language_name: LanguageName::new_static("Python"),
-        as_json: serde_json::to_value(data).ok()?,
-    })
-}
-
-async fn resolve_venv_activation_scripts(
-    venv: &PythonEnvironment,
-    fs: &dyn Fs,
-    activation_scripts: &mut HashMap<ShellKind, PathBuf>,
-) {
-    log::debug!("(Python) Resolving activation scripts for venv toolchain {venv:?}");
-    if let Some(prefix) = &venv.prefix {
-        for (shell_kind, script_name) in &[
-            (ShellKind::Posix, "activate"),
-            (ShellKind::Rc, "activate"),
-            (ShellKind::Csh, "activate.csh"),
-            (ShellKind::Tcsh, "activate.csh"),
-            (ShellKind::Fish, "activate.fish"),
-            (ShellKind::Nushell, "activate.nu"),
-            (ShellKind::PowerShell, "activate.ps1"),
-            (ShellKind::Cmd, "activate.bat"),
-            (ShellKind::Xonsh, "activate.xsh"),
-        ] {
-            let path = prefix.join(BINARY_DIR).join(script_name);
-
-            log::debug!("Trying path: {}", path.display());
-
-            if fs.is_file(&path).await {
-                activation_scripts.insert(*shell_kind, path);
-            }
-        }
-    }
-}
-
-pub struct EnvironmentApi<'a> {
-    global_search_locations: Arc<Mutex<Vec<PathBuf>>>,
-    project_env: &'a HashMap<String, String>,
-    pet_env: pet_core::os_environment::EnvironmentApi,
-}
-
-impl<'a> EnvironmentApi<'a> {
-    pub fn from_env(project_env: &'a HashMap<String, String>) -> Self {
-        let paths = project_env
-            .get("PATH")
-            .map(|p| std::env::split_paths(p).collect())
-            .unwrap_or_default();
-
-        EnvironmentApi {
-            global_search_locations: Arc::new(Mutex::new(paths)),
-            project_env,
-            pet_env: pet_core::os_environment::EnvironmentApi::new(),
-        }
-    }
-
-    fn user_home(&self) -> Option<PathBuf> {
-        self.project_env
-            .get("HOME")
-            .or_else(|| self.project_env.get("USERPROFILE"))
-            .map(|home| pet_fs::path::norm_case(PathBuf::from(home)))
-            .or_else(|| self.pet_env.get_user_home())
-    }
-}
-
-impl pet_core::os_environment::Environment for EnvironmentApi<'_> {
-    fn get_user_home(&self) -> Option<PathBuf> {
-        self.user_home()
-    }
-
-    fn get_root(&self) -> Option<PathBuf> {
-        None
-    }
-
-    fn get_env_var(&self, key: String) -> Option<String> {
-        self.project_env
-            .get(&key)
-            .cloned()
-            .or_else(|| self.pet_env.get_env_var(key))
-    }
-
-    fn get_know_global_search_locations(&self) -> Vec<PathBuf> {
-        if self.global_search_locations.lock().is_empty() {
-            let mut paths = std::env::split_paths(
-                &self
-                    .get_env_var("PATH".to_string())
-                    .or_else(|| self.get_env_var("Path".to_string()))
-                    .unwrap_or_default(),
-            )
-            .collect::<Vec<PathBuf>>();
-
-            log::trace!("Env PATH: {:?}", paths);
-            for p in self.pet_env.get_know_global_search_locations() {
-                if !paths.contains(&p) {
-                    paths.push(p);
-                }
-            }
-
-            let mut paths = paths
-                .into_iter()
-                .filter(|p| p.exists())
-                .collect::<Vec<PathBuf>>();
-
-            self.global_search_locations.lock().append(&mut paths);
-        }
-        self.global_search_locations.lock().clone()
-    }
-}
-
-pub(crate) struct PyLspAdapter {
-    python_venv_base: OnceCell<Result<Arc<Path>, String>>,
-}
-impl PyLspAdapter {
-    const SERVER_NAME: LanguageServerName = LanguageServerName::new_static("pylsp");
-    pub(crate) fn new() -> Self {
-        Self {
-            python_venv_base: OnceCell::new(),
-        }
-    }
-    async fn ensure_venv(delegate: &dyn LspAdapterDelegate) -> Result<Arc<Path>> {
-        let python_path = Self::find_base_python(delegate)
-            .await
-            .with_context(|| {
-                let mut message = "Could not find Python installation for PyLSP".to_owned();
-                if cfg!(windows){
-                    message.push_str(". Install Python from the Microsoft Store, or manually from https://www.python.org/downloads/windows.")
-                }
-                message
-            })?;
-        let work_dir = delegate
-            .language_server_download_dir(&Self::SERVER_NAME)
-            .await
-            .context("Could not get working directory for PyLSP")?;
-        let mut path = PathBuf::from(work_dir.as_ref());
-        path.push("pylsp-venv");
-        if !path.exists() {
-            util::command::new_smol_command(python_path)
-                .arg("-m")
-                .arg("venv")
-                .arg("pylsp-venv")
-                .current_dir(work_dir)
-                .spawn()?
-                .output()
-                .await?;
-        }
-
-        Ok(path.into())
-    }
-    // Find "baseline", user python version from which we'll create our own venv.
-    async fn find_base_python(delegate: &dyn LspAdapterDelegate) -> Option<PathBuf> {
-        for path in ["python3", "python"] {
-            let Some(path) = delegate.which(path.as_ref()).await else {
-                continue;
-            };
-            // Try to detect situations where `python3` exists but is not a real Python interpreter.
-            // Notably, on fresh Windows installs, `python3` is a shim that opens the Microsoft Store app
-            // when run with no arguments, and just fails otherwise.
-            let Some(output) = new_smol_command(&path)
-                .args(["-c", "print(1 + 2)"])
-                .output()
-                .await
-                .ok()
-            else {
-                continue;
-            };
-            if output.stdout.trim_ascii() != b"3" {
-                continue;
-            }
-            return Some(path);
-        }
-        None
-    }
-
-    async fn base_venv(&self, delegate: &dyn LspAdapterDelegate) -> Result<Arc<Path>, String> {
-        self.python_venv_base
-            .get_or_init(move || async move {
-                Self::ensure_venv(delegate)
-                    .await
-                    .map_err(|e| format!("{e}"))
-            })
-            .await
-            .clone()
-    }
-}
-
-const BINARY_DIR: &str = if cfg!(target_os = "windows") {
-    "Scripts"
-} else {
-    "bin"
-};
-
-#[async_trait(?Send)]
-impl LspAdapter for PyLspAdapter {
-    fn name(&self) -> LanguageServerName {
-        Self::SERVER_NAME
-    }
-
-    async fn process_completions(&self, _items: &mut [lsp::CompletionItem]) {}
-
-    async fn label_for_completion(
-        &self,
-        item: &lsp::CompletionItem,
-        language: &Arc<language::Language>,
-    ) -> Option<language::CodeLabel> {
-        let label = &item.label;
-        let label_len = label.len();
-        let grammar = language.grammar()?;
-        let highlight_id = match item.kind? {
-            lsp::CompletionItemKind::METHOD => grammar.highlight_id_for_name("function.method")?,
-            lsp::CompletionItemKind::FUNCTION => grammar.highlight_id_for_name("function")?,
-            lsp::CompletionItemKind::CLASS => grammar.highlight_id_for_name("type")?,
-            lsp::CompletionItemKind::CONSTANT => grammar.highlight_id_for_name("constant")?,
-            _ => return None,
-        };
-        Some(language::CodeLabel::filtered(
-            label.clone(),
-            label_len,
-            item.filter_text.as_deref(),
-            vec![(0..label.len(), highlight_id)],
-        ))
-    }
-
-    async fn label_for_symbol(
-        &self,
-        name: &str,
-        kind: lsp::SymbolKind,
-        language: &Arc<language::Language>,
-    ) -> Option<language::CodeLabel> {
-        let (text, filter_range, display_range) = match kind {
-            lsp::SymbolKind::METHOD | lsp::SymbolKind::FUNCTION => {
-                let text = format!("def {}():\n", name);
-                let filter_range = 4..4 + name.len();
-                let display_range = 0..filter_range.end;
-                (text, filter_range, display_range)
-            }
-            lsp::SymbolKind::CLASS => {
-                let text = format!("class {}:", name);
-                let filter_range = 6..6 + name.len();
-                let display_range = 0..filter_range.end;
-                (text, filter_range, display_range)
-            }
-            lsp::SymbolKind::CONSTANT => {
-                let text = format!("{} = 0", name);
-                let filter_range = 0..name.len();
-                let display_range = 0..filter_range.end;
-                (text, filter_range, display_range)
-            }
-            _ => return None,
-        };
-        Some(language::CodeLabel::new(
-            text[display_range.clone()].to_string(),
-            filter_range,
-            language.highlight_text(&text.as_str().into(), display_range),
-        ))
-    }
-
-    async fn workspace_configuration(
-        self: Arc<Self>,
-        adapter: &Arc<dyn LspAdapterDelegate>,
-        toolchain: Option<Toolchain>,
-        _: Option<Uri>,
-        cx: &mut AsyncApp,
-    ) -> Result<Value> {
-        cx.update(move |cx| {
-            let mut user_settings =
-                language_server_settings(adapter.as_ref(), &Self::SERVER_NAME, cx)
-                    .and_then(|s| s.settings.clone())
-                    .unwrap_or_else(|| {
-                        json!({
-                            "plugins": {
-                                "pycodestyle": {"enabled": false},
-                                "rope_autoimport": {"enabled": true, "memory": true},
-                                "pylsp_mypy": {"enabled": false}
-                            },
-                            "rope": {
-                                "ropeFolder": null
-                            },
-                        })
-                    });
-
-            // If user did not explicitly modify their python venv, use one from picker.
-            if let Some(toolchain) = toolchain {
-                if !user_settings.is_object() {
-                    user_settings = Value::Object(serde_json::Map::default());
-                }
-                let object = user_settings.as_object_mut().unwrap();
-                if let Some(python) = object
-                    .entry("plugins")
-                    .or_insert(Value::Object(serde_json::Map::default()))
-                    .as_object_mut()
-                {
-                    if let Some(jedi) = python
-                        .entry("jedi")
-                        .or_insert(Value::Object(serde_json::Map::default()))
-                        .as_object_mut()
-                    {
-                        jedi.entry("environment".to_string())
-                            .or_insert_with(|| Value::String(toolchain.path.clone().into()));
-                    }
-                    if let Some(pylint) = python
-                        .entry("pylsp_mypy")
-                        .or_insert(Value::Object(serde_json::Map::default()))
-                        .as_object_mut()
-                    {
-                        pylint.entry("overrides".to_string()).or_insert_with(|| {
-                            Value::Array(vec![
-                                Value::String("--python-executable".into()),
-                                Value::String(toolchain.path.into()),
-                                Value::String("--cache-dir=/dev/null".into()),
-                                Value::Bool(true),
-                            ])
-                        });
-                    }
-                }
-            }
-            user_settings = Value::Object(serde_json::Map::from_iter([(
-                "pylsp".to_string(),
-                user_settings,
-            )]));
-
-            user_settings
-        })
-    }
-}
-
-impl LspInstaller for PyLspAdapter {
-    type BinaryVersion = ();
-    async fn check_if_user_installed(
-        &self,
-        delegate: &dyn LspAdapterDelegate,
-        toolchain: Option<Toolchain>,
-        _: &AsyncApp,
-    ) -> Option<LanguageServerBinary> {
-        if let Some(pylsp_bin) = delegate.which(Self::SERVER_NAME.as_ref()).await {
-            let env = delegate.shell_env().await;
-            Some(LanguageServerBinary {
-                path: pylsp_bin,
-                env: Some(env),
-                arguments: vec![],
-            })
-        } else {
-            let toolchain = toolchain?;
-            let pylsp_path = Path::new(toolchain.path.as_ref()).parent()?.join("pylsp");
-            pylsp_path.exists().then(|| LanguageServerBinary {
-                path: toolchain.path.to_string().into(),
-                arguments: vec![pylsp_path.into()],
-                env: None,
-            })
-        }
-    }
-
-    async fn fetch_latest_server_version(
-        &self,
-        _: &dyn LspAdapterDelegate,
-        _: bool,
-        _: &mut AsyncApp,
-    ) -> Result<()> {
-        Ok(())
-    }
-
-    async fn fetch_server_binary(
-        &self,
-        _: (),
-        _: PathBuf,
-        delegate: &dyn LspAdapterDelegate,
-    ) -> Result<LanguageServerBinary> {
-        let venv = self.base_venv(delegate).await.map_err(|e| anyhow!(e))?;
-        let pip_path = venv.join(BINARY_DIR).join("pip3");
-        ensure!(
-            util::command::new_smol_command(pip_path.as_path())
-                .arg("install")
-                .arg("python-lsp-server[all]")
-                .arg("--upgrade")
-                .output()
-                .await?
-                .status
-                .success(),
-            "python-lsp-server[all] installation failed"
-        );
-        ensure!(
-            util::command::new_smol_command(pip_path)
-                .arg("install")
-                .arg("pylsp-mypy")
-                .arg("--upgrade")
-                .output()
-                .await?
-                .status
-                .success(),
-            "pylsp-mypy installation failed"
-        );
-        let pylsp = venv.join(BINARY_DIR).join("pylsp");
-        ensure!(
-            delegate.which(pylsp.as_os_str()).await.is_some(),
-            "pylsp installation was incomplete"
-        );
-        Ok(LanguageServerBinary {
-            path: pylsp,
-            env: None,
-            arguments: vec![],
-        })
-    }
-
-    async fn cached_server_binary(
-        &self,
-        _: PathBuf,
-        delegate: &dyn LspAdapterDelegate,
-    ) -> Option<LanguageServerBinary> {
-        let venv = self.base_venv(delegate).await.ok()?;
-        let pylsp = venv.join(BINARY_DIR).join("pylsp");
-        delegate.which(pylsp.as_os_str()).await?;
-        Some(LanguageServerBinary {
-            path: pylsp,
-            env: None,
-            arguments: vec![],
-        })
-    }
-}
-
-pub(crate) struct BasedPyrightLspAdapter {
-    node: NodeRuntime,
-}
-
-impl BasedPyrightLspAdapter {
-    const SERVER_NAME: LanguageServerName = LanguageServerName::new_static("basedpyright");
-    const BINARY_NAME: &'static str = "basedpyright-langserver";
-    const SERVER_PATH: &str = "node_modules/basedpyright/langserver.index.js";
-    const NODE_MODULE_RELATIVE_SERVER_PATH: &str = "basedpyright/langserver.index.js";
-
-    pub(crate) fn new(node: NodeRuntime) -> Self {
-        BasedPyrightLspAdapter { node }
-    }
-
-    async fn get_cached_server_binary(
-        container_dir: PathBuf,
-        node: &NodeRuntime,
-    ) -> Option<LanguageServerBinary> {
-        let server_path = container_dir.join(Self::SERVER_PATH);
-        if server_path.exists() {
-            Some(LanguageServerBinary {
-                path: node.binary_path().await.log_err()?,
-                env: None,
-                arguments: vec![server_path.into(), "--stdio".into()],
-            })
-        } else {
-            log::error!("missing executable in directory {:?}", server_path);
-            None
-        }
-    }
-}
-
-#[async_trait(?Send)]
-impl LspAdapter for BasedPyrightLspAdapter {
-    fn name(&self) -> LanguageServerName {
-        Self::SERVER_NAME
-    }
-
-    async fn initialization_options(
-        self: Arc<Self>,
-        _: &Arc<dyn LspAdapterDelegate>,
-    ) -> Result<Option<Value>> {
-        // Provide minimal initialization options
-        // Virtual environment configuration will be handled through workspace configuration
-        Ok(Some(json!({
-            "python": {
-                "analysis": {
-                    "autoSearchPaths": true,
-                    "useLibraryCodeForTypes": true,
-                    "autoImportCompletions": true
-                }
-            }
-        })))
-    }
-
-    async fn process_completions(&self, items: &mut [lsp::CompletionItem]) {
-        process_pyright_completions(items);
-    }
-
-    async fn label_for_completion(
-        &self,
-        item: &lsp::CompletionItem,
-        language: &Arc<language::Language>,
-    ) -> Option<language::CodeLabel> {
-        let label = &item.label;
-        let label_len = label.len();
-        let grammar = language.grammar()?;
-        let highlight_id = match item.kind? {
-            lsp::CompletionItemKind::METHOD => grammar.highlight_id_for_name("function.method"),
-            lsp::CompletionItemKind::FUNCTION => grammar.highlight_id_for_name("function"),
-            lsp::CompletionItemKind::CLASS => grammar.highlight_id_for_name("type"),
-            lsp::CompletionItemKind::CONSTANT => grammar.highlight_id_for_name("constant"),
-            lsp::CompletionItemKind::VARIABLE => grammar.highlight_id_for_name("variable"),
-            _ => {
-                return None;
-            }
-        };
-        let mut text = label.clone();
-        if let Some(completion_details) = item
-            .label_details
-            .as_ref()
-            .and_then(|details| details.description.as_ref())
-        {
-            write!(&mut text, " {}", completion_details).ok();
-        }
-        Some(language::CodeLabel::filtered(
-            text,
-            label_len,
-            item.filter_text.as_deref(),
-            highlight_id
-                .map(|id| (0..label.len(), id))
-                .into_iter()
-                .collect(),
-        ))
-    }
-
-    async fn label_for_symbol(
-        &self,
-        name: &str,
-        kind: lsp::SymbolKind,
-        language: &Arc<language::Language>,
-    ) -> Option<language::CodeLabel> {
-        let (text, filter_range, display_range) = match kind {
-            lsp::SymbolKind::METHOD | lsp::SymbolKind::FUNCTION => {
-                let text = format!("def {}():\n", name);
-                let filter_range = 4..4 + name.len();
-                let display_range = 0..filter_range.end;
-                (text, filter_range, display_range)
-            }
-            lsp::SymbolKind::CLASS => {
-                let text = format!("class {}:", name);
-                let filter_range = 6..6 + name.len();
-                let display_range = 0..filter_range.end;
-                (text, filter_range, display_range)
-            }
-            lsp::SymbolKind::CONSTANT => {
-                let text = format!("{} = 0", name);
-                let filter_range = 0..name.len();
-                let display_range = 0..filter_range.end;
-                (text, filter_range, display_range)
-            }
-            _ => return None,
-        };
-        Some(language::CodeLabel::new(
-            text[display_range.clone()].to_string(),
-            filter_range,
-            language.highlight_text(&text.as_str().into(), display_range),
-        ))
-    }
-
-    async fn workspace_configuration(
-        self: Arc<Self>,
-        adapter: &Arc<dyn LspAdapterDelegate>,
-        toolchain: Option<Toolchain>,
-        _: Option<Uri>,
-        cx: &mut AsyncApp,
-    ) -> Result<Value> {
-        cx.update(move |cx| {
-            let mut user_settings =
-                language_server_settings(adapter.as_ref(), &Self::SERVER_NAME, cx)
-                    .and_then(|s| s.settings.clone())
-                    .unwrap_or_default();
-
-            // If we have a detected toolchain, configure Pyright to use it
-            if let Some(toolchain) = toolchain
-                && let Ok(env) = serde_json::from_value::<
-                    pet_core::python_environment::PythonEnvironment,
-                >(toolchain.as_json.clone())
-            {
-                if !user_settings.is_object() {
-                    user_settings = Value::Object(serde_json::Map::default());
-                }
-                let object = user_settings.as_object_mut().unwrap();
-
-                let interpreter_path = toolchain.path.to_string();
-                if let Some(venv_dir) = env.prefix {
-                    // Set venvPath and venv at the root level
-                    // This matches the format of a pyrightconfig.json file
-                    if let Some(parent) = venv_dir.parent() {
-                        // Use relative path if the venv is inside the workspace
-                        let venv_path = if parent == adapter.worktree_root_path() {
-                            ".".to_string()
-                        } else {
-                            parent.to_string_lossy().into_owned()
-                        };
-                        object.insert("venvPath".to_string(), Value::String(venv_path));
-                    }
-
-                    if let Some(venv_name) = venv_dir.file_name() {
-                        object.insert(
-                            "venv".to_owned(),
-                            Value::String(venv_name.to_string_lossy().into_owned()),
-                        );
-                    }
-                }
-
-                // Set both pythonPath and defaultInterpreterPath for compatibility
-                if let Some(python) = object
-                    .entry("python")
-                    .or_insert(Value::Object(serde_json::Map::default()))
-                    .as_object_mut()
-                {
-                    python.insert(
-                        "pythonPath".to_owned(),
-                        Value::String(interpreter_path.clone()),
-                    );
-                    python.insert(
-                        "defaultInterpreterPath".to_owned(),
-                        Value::String(interpreter_path),
-                    );
-                }
-                // Basedpyright by default uses `strict` type checking, we tone it down as to not surpris users
-                maybe!({
-                    let analysis = object
-                        .entry("basedpyright.analysis")
-                        .or_insert(Value::Object(serde_json::Map::default()));
-                    if let serde_json::map::Entry::Vacant(v) =
-                        analysis.as_object_mut()?.entry("typeCheckingMode")
-                    {
-                        v.insert(Value::String("standard".to_owned()));
-                    }
-                    Some(())
-                });
-            }
-
-            user_settings
-        })
-    }
-}
-
-impl LspInstaller for BasedPyrightLspAdapter {
-    type BinaryVersion = String;
-
-    async fn fetch_latest_server_version(
-        &self,
-        _: &dyn LspAdapterDelegate,
-        _: bool,
-        _: &mut AsyncApp,
-    ) -> Result<String> {
-        self.node
-            .npm_package_latest_version(Self::SERVER_NAME.as_ref())
-            .await
-    }
-
-    async fn check_if_user_installed(
-        &self,
-        delegate: &dyn LspAdapterDelegate,
-        _: Option<Toolchain>,
-        _: &AsyncApp,
-    ) -> Option<LanguageServerBinary> {
-        if let Some(path) = delegate.which(Self::BINARY_NAME.as_ref()).await {
-            let env = delegate.shell_env().await;
-            Some(LanguageServerBinary {
-                path,
-                env: Some(env),
-                arguments: vec!["--stdio".into()],
-            })
-        } else {
-            // TODO shouldn't this be self.node.binary_path()?
-            let node = delegate.which("node".as_ref()).await?;
-            let (node_modules_path, _) = delegate
-                .npm_package_installed_version(Self::SERVER_NAME.as_ref())
-                .await
-                .log_err()??;
-
-            let path = node_modules_path.join(Self::NODE_MODULE_RELATIVE_SERVER_PATH);
-
-            let env = delegate.shell_env().await;
-            Some(LanguageServerBinary {
-                path: node,
-                env: Some(env),
-                arguments: vec![path.into(), "--stdio".into()],
-            })
-        }
-    }
-
-    async fn fetch_server_binary(
-        &self,
-        latest_version: Self::BinaryVersion,
-        container_dir: PathBuf,
-        delegate: &dyn LspAdapterDelegate,
-    ) -> Result<LanguageServerBinary> {
-        let server_path = container_dir.join(Self::SERVER_PATH);
-
-        self.node
-            .npm_install_packages(
-                &container_dir,
-                &[(Self::SERVER_NAME.as_ref(), latest_version.as_str())],
-            )
-            .await?;
-
-        let env = delegate.shell_env().await;
-        Ok(LanguageServerBinary {
-            path: self.node.binary_path().await?,
-            env: Some(env),
-            arguments: vec![server_path.into(), "--stdio".into()],
-        })
-    }
-
-    async fn check_if_version_installed(
-        &self,
-        version: &Self::BinaryVersion,
-        container_dir: &PathBuf,
-        delegate: &dyn LspAdapterDelegate,
-    ) -> Option<LanguageServerBinary> {
-        let server_path = container_dir.join(Self::SERVER_PATH);
-
-        let should_install_language_server = self
-            .node
-            .should_install_npm_package(
-                Self::SERVER_NAME.as_ref(),
-                &server_path,
-                container_dir,
-                VersionStrategy::Latest(version),
-            )
-            .await;
-
-        if should_install_language_server {
-            None
-        } else {
-            let env = delegate.shell_env().await;
-            Some(LanguageServerBinary {
-                path: self.node.binary_path().await.ok()?,
-                env: Some(env),
-                arguments: vec![server_path.into(), "--stdio".into()],
-            })
-        }
-    }
-
-    async fn cached_server_binary(
-        &self,
-        container_dir: PathBuf,
-        delegate: &dyn LspAdapterDelegate,
-    ) -> Option<LanguageServerBinary> {
-        let mut binary = Self::get_cached_server_binary(container_dir, &self.node).await?;
-        binary.env = Some(delegate.shell_env().await);
-        Some(binary)
-    }
-}
-
-pub(crate) struct RuffLspAdapter {
-    fs: Arc<dyn Fs>,
-}
-
-#[cfg(target_os = "macos")]
-impl RuffLspAdapter {
-    const GITHUB_ASSET_KIND: AssetKind = AssetKind::TarGz;
-    const ARCH_SERVER_NAME: &str = "apple-darwin";
-}
-
-#[cfg(target_os = "linux")]
-impl RuffLspAdapter {
-    const GITHUB_ASSET_KIND: AssetKind = AssetKind::TarGz;
-    const ARCH_SERVER_NAME: &str = "unknown-linux-gnu";
-}
-
-#[cfg(target_os = "freebsd")]
-impl RuffLspAdapter {
-    const GITHUB_ASSET_KIND: AssetKind = AssetKind::TarGz;
-    const ARCH_SERVER_NAME: &str = "unknown-freebsd";
-}
-
-#[cfg(target_os = "windows")]
-impl RuffLspAdapter {
-    const GITHUB_ASSET_KIND: AssetKind = AssetKind::Zip;
-    const ARCH_SERVER_NAME: &str = "pc-windows-msvc";
-}
-
-impl RuffLspAdapter {
-    const SERVER_NAME: LanguageServerName = LanguageServerName::new_static("ruff");
-
-    pub fn new(fs: Arc<dyn Fs>) -> RuffLspAdapter {
-        RuffLspAdapter { fs }
-    }
-
-    fn build_asset_name() -> Result<(String, String)> {
-        let arch = match consts::ARCH {
-            "x86" => "i686",
-            _ => consts::ARCH,
-        };
-        let os = Self::ARCH_SERVER_NAME;
-        let suffix = match consts::OS {
-            "windows" => "zip",
-            _ => "tar.gz",
-        };
-        let asset_name = format!("ruff-{arch}-{os}.{suffix}");
-        let asset_stem = format!("ruff-{arch}-{os}");
-        Ok((asset_stem, asset_name))
-    }
-}
-
-#[async_trait(?Send)]
-impl LspAdapter for RuffLspAdapter {
-    fn name(&self) -> LanguageServerName {
-        Self::SERVER_NAME
-    }
-}
-
-impl LspInstaller for RuffLspAdapter {
-    type BinaryVersion = GitHubLspBinaryVersion;
-    async fn check_if_user_installed(
-        &self,
-        delegate: &dyn LspAdapterDelegate,
-        toolchain: Option<Toolchain>,
-        _: &AsyncApp,
-    ) -> Option<LanguageServerBinary> {
-        let ruff_in_venv = if let Some(toolchain) = toolchain
-            && toolchain.language_name.as_ref() == "Python"
-        {
-            Path::new(toolchain.path.as_str())
-                .parent()
-                .map(|path| path.join("ruff"))
-        } else {
-            None
-        };
-
-        for path in ruff_in_venv.into_iter().chain(["ruff".into()]) {
-            if let Some(ruff_bin) = delegate.which(path.as_os_str()).await {
-                let env = delegate.shell_env().await;
-                return Some(LanguageServerBinary {
-                    path: ruff_bin,
-                    env: Some(env),
-                    arguments: vec!["server".into()],
-                });
-            }
-        }
-
-        None
-    }
-
-    async fn fetch_latest_server_version(
-        &self,
-        delegate: &dyn LspAdapterDelegate,
-        _: bool,
-        _: &mut AsyncApp,
-    ) -> Result<GitHubLspBinaryVersion> {
-        let release =
-            latest_github_release("astral-sh/ruff", true, false, delegate.http_client()).await?;
-        let (_, asset_name) = Self::build_asset_name()?;
-        let asset = release
-            .assets
-            .into_iter()
-            .find(|asset| asset.name == asset_name)
-            .with_context(|| format!("no asset found matching `{asset_name:?}`"))?;
-        Ok(GitHubLspBinaryVersion {
-            name: release.tag_name,
-            url: asset.browser_download_url,
-            digest: asset.digest,
-        })
-    }
-
-    async fn fetch_server_binary(
-        &self,
-        latest_version: GitHubLspBinaryVersion,
-        container_dir: PathBuf,
-        delegate: &dyn LspAdapterDelegate,
-    ) -> Result<LanguageServerBinary> {
-        let GitHubLspBinaryVersion {
-            name,
-            url,
-            digest: expected_digest,
-        } = latest_version;
-        let destination_path = container_dir.join(format!("ruff-{name}"));
-        let server_path = match Self::GITHUB_ASSET_KIND {
-            AssetKind::TarGz | AssetKind::Gz => destination_path
-                .join(Self::build_asset_name()?.0)
-                .join("ruff"),
-            AssetKind::Zip => destination_path.clone().join("ruff.exe"),
-        };
-
-        let binary = LanguageServerBinary {
-            path: server_path.clone(),
-            env: None,
-            arguments: vec!["server".into()],
-        };
-
-        let metadata_path = destination_path.with_extension("metadata");
-        let metadata = GithubBinaryMetadata::read_from_file(&metadata_path)
-            .await
-            .ok();
-        if let Some(metadata) = metadata {
-            let validity_check = async || {
-                delegate
-                    .try_exec(LanguageServerBinary {
-                        path: server_path.clone(),
-                        arguments: vec!["--version".into()],
-                        env: None,
-                    })
-                    .await
-                    .inspect_err(|err| {
-                        log::warn!("Unable to run {server_path:?} asset, redownloading: {err:#}",)
-                    })
-            };
-            if let (Some(actual_digest), Some(expected_digest)) =
-                (&metadata.digest, &expected_digest)
-            {
-                if actual_digest == expected_digest {
-                    if validity_check().await.is_ok() {
-                        return Ok(binary);
-                    }
-                } else {
-                    log::info!(
-                        "SHA-256 mismatch for {destination_path:?} asset, downloading new asset. Expected: {expected_digest}, Got: {actual_digest}"
-                    );
-                }
-            } else if validity_check().await.is_ok() {
-                return Ok(binary);
-            }
-        }
-
-        download_server_binary(
-            &*delegate.http_client(),
-            &url,
-            expected_digest.as_deref(),
-            &destination_path,
-            Self::GITHUB_ASSET_KIND,
-        )
-        .await?;
-        make_file_executable(&server_path).await?;
-        remove_matching(&container_dir, |path| path != destination_path).await;
-        GithubBinaryMetadata::write_to_file(
-            &GithubBinaryMetadata {
-                metadata_version: 1,
-                digest: expected_digest,
-            },
-            &metadata_path,
-        )
-        .await?;
-
-        Ok(LanguageServerBinary {
-            path: server_path,
-            env: None,
-            arguments: vec!["server".into()],
-        })
-    }
-
-    async fn cached_server_binary(
-        &self,
-        container_dir: PathBuf,
-        _: &dyn LspAdapterDelegate,
-    ) -> Option<LanguageServerBinary> {
-        maybe!(async {
-            let mut last = None;
-            let mut entries = self.fs.read_dir(&container_dir).await?;
-            while let Some(entry) = entries.next().await {
-                let path = entry?;
-                if path.extension().is_some_and(|ext| ext == "metadata") {
-                    continue;
-                }
-                last = Some(path);
-            }
-
-            let path = last.context("no cached binary")?;
-            let path = match Self::GITHUB_ASSET_KIND {
-                AssetKind::TarGz | AssetKind::Gz => {
-                    path.join(Self::build_asset_name()?.0).join("ruff")
-                }
-                AssetKind::Zip => path.join("ruff.exe"),
-            };
-
-            anyhow::Ok(LanguageServerBinary {
-                path,
-                env: None,
-                arguments: vec!["server".into()],
-            })
-        })
-        .await
-        .log_err()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use gpui::{AppContext as _, BorrowAppContext, Context, TestAppContext};
-    use language::{AutoindentMode, Buffer};
-    use settings::SettingsStore;
-    use std::num::NonZeroU32;
-
-    use crate::python::python_module_name_from_relative_path;
-
-    #[gpui::test]
-    async fn test_python_autoindent(cx: &mut TestAppContext) {
-        cx.executor().set_block_on_ticks(usize::MAX..=usize::MAX);
-        let language = crate::language("python", tree_sitter_python::LANGUAGE.into());
-        cx.update(|cx| {
-            let test_settings = SettingsStore::test(cx);
-            cx.set_global(test_settings);
-            cx.update_global::<SettingsStore, _>(|store, cx| {
-                store.update_user_settings(cx, |s| {
-                    s.project.all_languages.defaults.tab_size = NonZeroU32::new(2);
-                });
-            });
-        });
-
-        cx.new(|cx| {
-            let mut buffer = Buffer::local("", cx).with_language(language, cx);
-            let append = |buffer: &mut Buffer, text: &str, cx: &mut Context<Buffer>| {
-                let ix = buffer.len();
-                buffer.edit([(ix..ix, text)], Some(AutoindentMode::EachLine), cx);
-            };
-
-            // indent after "def():"
-            append(&mut buffer, "def a():\n", cx);
-            assert_eq!(buffer.text(), "def a():\n  ");
-
-            // preserve indent after blank line
-            append(&mut buffer, "\n  ", cx);
-            assert_eq!(buffer.text(), "def a():\n  \n  ");
-
-            // indent after "if"
-            append(&mut buffer, "if a:\n  ", cx);
-            assert_eq!(buffer.text(), "def a():\n  \n  if a:\n    ");
-
-            // preserve indent after statement
-            append(&mut buffer, "b()\n", cx);
-            assert_eq!(buffer.text(), "def a():\n  \n  if a:\n    b()\n    ");
-
-            // preserve indent after statement
-            append(&mut buffer, "else", cx);
-            assert_eq!(buffer.text(), "def a():\n  \n  if a:\n    b()\n    else");
-
-            // dedent "else""
-            append(&mut buffer, ":", cx);
-            assert_eq!(buffer.text(), "def a():\n  \n  if a:\n    b()\n  else:");
-
-            // indent lines after else
-            append(&mut buffer, "\n", cx);
-            assert_eq!(
-                buffer.text(),
-                "def a():\n  \n  if a:\n    b()\n  else:\n    "
-            );
-
-            // indent after an open paren. the closing paren is not indented
-            // because there is another token before it on the same line.
-            append(&mut buffer, "foo(\n1)", cx);
-            assert_eq!(
-                buffer.text(),
-                "def a():\n  \n  if a:\n    b()\n  else:\n    foo(\n      1)"
-            );
-
-            // dedent the closing paren if it is shifted to the beginning of the line
-            let argument_ix = buffer.text().find('1').unwrap();
-            buffer.edit(
-                [(argument_ix..argument_ix + 1, "")],
-                Some(AutoindentMode::EachLine),
-                cx,
-            );
-            assert_eq!(
-                buffer.text(),
-                "def a():\n  \n  if a:\n    b()\n  else:\n    foo(\n    )"
-            );
-
-            // preserve indent after the close paren
-            append(&mut buffer, "\n", cx);
-            assert_eq!(
-                buffer.text(),
-                "def a():\n  \n  if a:\n    b()\n  else:\n    foo(\n    )\n    "
-            );
-
-            // manually outdent the last line
-            let end_whitespace_ix = buffer.len() - 4;
-            buffer.edit(
-                [(end_whitespace_ix..buffer.len(), "")],
-                Some(AutoindentMode::EachLine),
-                cx,
-            );
-            assert_eq!(
-                buffer.text(),
-                "def a():\n  \n  if a:\n    b()\n  else:\n    foo(\n    )\n"
-            );
-
-            // preserve the newly reduced indentation on the next newline
-            append(&mut buffer, "\n", cx);
-            assert_eq!(
-                buffer.text(),
-                "def a():\n  \n  if a:\n    b()\n  else:\n    foo(\n    )\n\n"
-            );
-
-            // reset to a for loop statement
-            let statement = "for i in range(10):\n  print(i)\n";
-            buffer.edit([(0..buffer.len(), statement)], None, cx);
-
-            // insert single line comment after each line
-            let eol_ixs = statement
-                .char_indices()
-                .filter_map(|(ix, c)| if c == '\n' { Some(ix) } else { None })
-                .collect::<Vec<usize>>();
-            let editions = eol_ixs
-                .iter()
-                .enumerate()
-                .map(|(i, &eol_ix)| (eol_ix..eol_ix, format!(" # comment {}", i + 1)))
-                .collect::<Vec<(std::ops::Range<usize>, String)>>();
-            buffer.edit(editions, Some(AutoindentMode::EachLine), cx);
-            assert_eq!(
-                buffer.text(),
-                "for i in range(10): # comment 1\n  print(i) # comment 2\n"
-            );
-
-            // reset to a simple if statement
-            buffer.edit([(0..buffer.len(), "if a:\n  b(\n  )")], None, cx);
-
-            // dedent "else" on the line after a closing paren
-            append(&mut buffer, "\n  else:\n", cx);
-            assert_eq!(buffer.text(), "if a:\n  b(\n  )\nelse:\n  ");
-
-            buffer
-        });
-    }
-
-    #[test]
-    fn test_python_module_name_from_relative_path() {
-        assert_eq!(
-            python_module_name_from_relative_path("foo/bar.py"),
-            Some("foo.bar".to_string())
-        );
-        assert_eq!(
-            python_module_name_from_relative_path("foo/bar"),
-            Some("foo.bar".to_string())
-        );
-        if cfg!(windows) {
-            assert_eq!(
-                python_module_name_from_relative_path("foo\\bar.py"),
-                Some("foo.bar".to_string())
-            );
-            assert_eq!(
-                python_module_name_from_relative_path("foo\\bar"),
-                Some("foo.bar".to_string())
-            );
-        } else {
-            assert_eq!(
-                python_module_name_from_relative_path("foo\\bar.py"),
-                Some("foo\\bar".to_string())
-            );
-            assert_eq!(
-                python_module_name_from_relative_path("foo\\bar"),
-                Some("foo\\bar".to_string())
-            );
-        }
-    }
-}
diff --git a/crates/languages/src/python/brackets.scm b/crates/languages/src/python/brackets.scm
deleted file mode 100644
index 9e5b59788f..0000000000
--- a/crates/languages/src/python/brackets.scm
+++ /dev/null
@@ -1,4 +0,0 @@
-("(" @open ")" @close)
-("[" @open "]" @close)
-("{" @open "}" @close)
-(((string_start) @open (string_end) @close) (#set! rainbow.exclude))
diff --git a/crates/languages/src/python/config.toml b/crates/languages/src/python/config.toml
deleted file mode 100644
index c58a54fc1c..0000000000
--- a/crates/languages/src/python/config.toml
+++ /dev/null
@@ -1,38 +0,0 @@
-name = "Python"
-grammar = "python"
-path_suffixes = ["py", "pyi", "mpy"]
-first_line_pattern = '^#!.*\bpython[0-9.]*\b'
-line_comments = ["# "]
-autoclose_before = ";:.,=}])>"
-brackets = [
-    { start = "f\"", end = "\"", close = true, newline = false, not_in = ["string", "comment"] },
-    { start = "f'", end = "'", close = true, newline = false, not_in = ["string", "comment"] },
-    { start = "b\"", end = "\"", close = true, newline = false, not_in = ["string", "comment"] },
-    { start = "b'", end = "'", close = true, newline = false, not_in = ["string", "comment"] },
-    { start = "u\"", end = "\"", close = true, newline = false, not_in = ["string", "comment"] },
-    { start = "u'", end = "'", close = true, newline = false, not_in = ["string", "comment"] },
-    { start = "r\"", end = "\"", close = true, newline = false, not_in = ["string", "comment"] },
-    { start = "r'", end = "'", close = true, newline = false, not_in = ["string", "comment"] },
-    { start = "rb\"", end = "\"", close = true, newline = false, not_in = ["string", "comment"] },
-    { start = "rb'", end = "'", close = true, newline = false, not_in = ["string", "comment"] },
-    { start = "t\"", end = "\"", close = true, newline = false, not_in = ["string", "comment"] },
-    { start = "t'", end = "'", close = true, newline = false, not_in = ["string", "comment"] },
-    { start = "\"\"\"", end = "\"\"\"", close = true, newline = false, not_in = ["string"] },
-    { start = "'''", end = "'''", close = true, newline = false, not_in = ["string"] },
-    { start = "{", end = "}", close = true, newline = true },
-    { start = "[", end = "]", close = true, newline = true },
-    { start = "(", end = ")", close = true, newline = true },
-    { start = "\"", end = "\"", close = true, newline = false, not_in = ["string"] },
-    { start = "'", end = "'", close = true, newline = false, not_in = ["string"] },
-]
-
-auto_indent_using_last_non_empty_line = false
-debuggers = ["Debugpy"]
-increase_indent_pattern = "^[^#].*:\\s*(#.*)?$"
-decrease_indent_patterns = [
-  { pattern = "^\\s*elif\\b.*:\\s*(#.*)?",    valid_after = ["if", "elif"] },
-  { pattern = "^\\s*else\\b.*:\\s*(#.*)?",    valid_after = ["if", "elif", "for", "while", "except"] },
-  { pattern = "^\\s*except\\b.*:\\s*(#.*)?",  valid_after = ["try", "except"] },
-  { pattern = "^\\s*finally\\b.*:\\s*(#.*)?", valid_after = ["try", "except", "else"] },
-]
-import_path_strip_regex = "/__init__\\.py$"
diff --git a/crates/languages/src/python/debugger.scm b/crates/languages/src/python/debugger.scm
deleted file mode 100644
index 807d6e865d..0000000000
--- a/crates/languages/src/python/debugger.scm
+++ /dev/null
@@ -1,43 +0,0 @@
-(identifier) @debug-variable
-(#eq? @debug-variable "self")
-
-(assignment left: (identifier) @debug-variable)
-(assignment left: (pattern_list (identifier) @debug-variable))
-(assignment left: (tuple_pattern (identifier) @debug-variable))
-
-(augmented_assignment left: (identifier) @debug-variable)
-
-(for_statement left: (identifier) @debug-variable)
-(for_statement left: (pattern_list (identifier) @debug-variable))
-(for_statement left: (tuple_pattern (identifier) @debug-variable))
-
-(for_in_clause left: (identifier) @debug-variable)
-(for_in_clause left: (pattern_list (identifier) @debug-variable))
-(for_in_clause left: (tuple_pattern (identifier) @debug-variable))
-
-(as_pattern (identifier) @debug-variable)
-
-(binary_operator left: (identifier) @debug-variable (#not-match? @debug-variable "^[A-Z]"))
-(binary_operator right: (identifier) @debug-variable (#not-match? @debug-variable "^[A-Z]"))
-(comparison_operator (identifier) @debug-variable (#not-match? @debug-variable "^[A-Z]"))
-
-(list (identifier) @debug-variable (#not-match? @debug-variable "^[A-Z]"))
-(tuple (identifier) @debug-variable (#not-match? @debug-variable "^[A-Z]"))
-(set (identifier) @debug-variable (#not-match? @debug-variable "^[A-Z]"))
-
-(subscript value: (identifier) @debug-variable (#not-match? @debug-variable "^[A-Z]"))
-
-(attribute object: (identifier) @debug-variable (#not-match? @debug-variable "^[A-Z]"))
-
-(return_statement (identifier) @debug-variable (#not-match? @debug-variable "^[A-Z]"))
-
-(parenthesized_expression (identifier) @debug-variable (#not-match? @debug-variable "^[A-Z]"))
-
-(argument_list (identifier) @debug-variable (#not-match? @debug-variable "^[A-Z]"))
-
-(if_statement condition: (identifier) @debug-variable (#not-match? @debug-variable "^[A-Z]"))
-
-(while_statement condition: (identifier) @debug-variable (#not-match? @debug-variable "^[A-Z]"))
-
-(block) @debug-scope
-(module) @debug-scope
diff --git a/crates/languages/src/python/embedding.scm b/crates/languages/src/python/embedding.scm
deleted file mode 100644
index e3efb3dbf6..0000000000
--- a/crates/languages/src/python/embedding.scm
+++ /dev/null
@@ -1,9 +0,0 @@
-(class_definition
-    "class" @context
-    name: (identifier) @name
-    ) @item
-
-(function_definition
-    "async"? @context
-    "def" @context
-    name: (_) @name) @item
diff --git a/crates/languages/src/python/highlights.scm b/crates/languages/src/python/highlights.scm
deleted file mode 100644
index f15b3a0e2b..0000000000
--- a/crates/languages/src/python/highlights.scm
+++ /dev/null
@@ -1,303 +0,0 @@
-; Identifier naming conventions; these "soft conventions" should stay at the top of the file as they're often overridden
-(identifier) @variable
-(attribute attribute: (identifier) @property)
-
-; CamelCase for classes
-((identifier) @type.class
-  (#match? @type.class "^_*[A-Z][A-Za-z0-9_]*$"))
-
-; ALL_CAPS for constants:
-((identifier) @constant
-  (#match? @constant "^_*[A-Z][A-Z0-9_]*$"))
-
-(type (identifier) @type)
-(generic_type (identifier) @type)
-(comment) @comment
-(string) @string
-(escape_sequence) @string.escape
-
-; Type alias
-(type_alias_statement "type" @keyword)
-
-; TypeVar with constraints in type parameters
-(type
-  (tuple (identifier) @type)
-)
-
-; Forward references
-(type
-  (string) @type
-)
-
-
-; Function calls
-
-(call
-  function: (attribute attribute: (identifier) @function.method.call))
-(call
-  function: (identifier) @function.call)
-
-(decorator "@" @punctuation.special)
-(decorator
-  "@" @punctuation.special
-  [
-    (identifier) @function.decorator
-    (attribute attribute: (identifier) @function.decorator)
-    (call function: (identifier) @function.decorator.call)
-    (call (attribute attribute: (identifier) @function.decorator.call))
-  ])
-
-; Function and class definitions
-
-(function_definition
-  name: (identifier) @function.definition)
-
-((call
-  function: (identifier) @_isinstance
-  arguments: (argument_list
-    (_)
-    (identifier) @type))
-  (#eq? @_isinstance "isinstance"))
-
-((call
-  function: (identifier) @_issubclass
-  arguments: (argument_list
-    (identifier) @type
-    (identifier) @type))
-  (#eq? @_issubclass "issubclass"))
-
-; Function arguments
-(function_definition
-  parameters: (parameters
-  [
-      (identifier) @variable.parameter; Simple parameters
-      (typed_parameter
-        (identifier) @variable.parameter) ; Typed parameters
-      (default_parameter
-        name: (identifier) @variable.parameter) ; Default parameters
-      (typed_default_parameter
-        name: (identifier) @variable.parameter) ; Typed default parameters
-  ]))
-
-; Keyword arguments
-(call
-  arguments: (argument_list
-    (keyword_argument
-      name: (identifier) @function.kwargs)))
-
-; Class definitions and calling: needs to come after the regex matching above
-
-(class_definition
-  name: (identifier) @type.class.definition)
-
-(class_definition
-  superclasses: (argument_list
-  (identifier) @type.class.inheritance))
-
-(call
-  function: (identifier) @type.class.call
-  (#match? @type.class.call "^_*[A-Z][A-Za-z0-9_]*$"))
-
-; Builtins
-
-((call
-  function: (identifier) @function.builtin)
- (#any-of?
-   @function.builtin
-   "abs" "all" "any" "ascii" "bin" "bool" "breakpoint" "bytearray" "bytes" "callable" "chr" "classmethod" "compile" "complex" "delattr" "dict" "dir" "divmod" "enumerate" "eval" "exec" "filter" "float" "format" "frozenset" "getattr" "globals" "hasattr" "hash" "help" "hex" "id" "input" "int" "isinstance" "issubclass" "iter" "len" "list" "locals" "map" "max" "memoryview" "min" "next" "object" "oct" "open" "ord" "pow" "print" "property" "range" "repr" "reversed" "round" "set" "setattr" "slice" "sorted" "staticmethod" "str" "sum" "super" "tuple" "type" "vars" "zip" "__import__"))
-
-; Literals
-
-[
-  (true)
-  (false)
-] @boolean
-
-[
-  (none)
-  (ellipsis)
-] @constant.builtin
-
-[
-  (integer)
-  (float)
-] @number
-
-; Self references
-
-[
-  (parameters (identifier) @variable.special)
-  (attribute (identifier) @variable.special)
-  (#any-of? @variable.special "self" "cls")
-]
-
-[
-  "."
-  ","
-  ":"
-] @punctuation.delimiter
-
-[
-  "("
-  ")"
-  "["
-  "]"
-  "{"
-  "}"
-] @punctuation.bracket
-
-(interpolation
-  "{" @punctuation.special
-  "}" @punctuation.special) @embedded
-
-; Docstrings.
-([
-  (expression_statement (assignment))
-  (type_alias_statement)
-]
-. (expression_statement (string) @string.doc)+)
-
-(module
-  .(expression_statement (string) @string.doc)+)
-
-(class_definition
-  body: (block .(expression_statement (string) @string.doc)+))
-
-(function_definition
-  "async"?
-  "def"
-  name: (_)
-  (parameters)?
-  body: (block .(expression_statement (string) @string.doc)+))
-
-(class_definition
-  body: (block
-    . (comment) @comment*
-    . (expression_statement (string) @string.doc)+))
-
-(module
-  . (comment) @comment*
-  . (expression_statement (string) @string.doc)+)
-
-(class_definition
-  body: (block
-    (expression_statement (assignment))
-    . (expression_statement (string) @string.doc)+))
-
-(class_definition
-  body: (block
-    (function_definition
-      name: (identifier) @function.method.constructor
-      (#eq? @function.method.constructor "__init__")
-      body: (block
-        (expression_statement (assignment))
-        . (expression_statement (string) @string.doc)+))))
-
-
-[
-  "-"
-  "-="
-  "!="
-  "*"
-  "**"
-  "**="
-  "*="
-  "/"
-  "//"
-  "//="
-  "/="
-  "&"
-  "%"
-  "%="
-  "@"
-  "^"
-  "+"
-  "->"
-  "+="
-  "<"
-  "<<"
-  "<="
-  "<>"
-  "="
-  ":="
-  "=="
-  ">"
-  ">="
-  ">>"
-  "|"
-  "~"
-  "&="
-  "<<="
-  ">>="
-  "@="
-  "^="
-  "|="
-] @operator
-
-[
-  "and"
-  "in"
-  "is"
-  "not"
-  "or"
-  "is not"
-  "not in"
-] @keyword.operator
-
-[
-  "as"
-  "assert"
-  "async"
-  "await"
-  "break"
-  "class"
-  "continue"
-  "def"
-  "del"
-  "elif"
-  "else"
-  "except"
-  "exec"
-  "finally"
-  "for"
-  "from"
-  "global"
-  "if"
-  "import"
-  "lambda"
-  "nonlocal"
-  "pass"
-  "print"
-  "raise"
-  "return"
-  "try"
-  "while"
-  "with"
-  "yield"
-  "match"
-  "case"
-] @keyword
-
-; Definition keywords def, class, async def, lambda
-[
-  "async"
-  "def"
-  "class"
-  "lambda"
-] @keyword.definition
-
-(decorator (identifier) @attribute.builtin
-  (#any-of? @attribute.builtin "classmethod" "staticmethod" "property"))
-
-; Builtin types as identifiers
-[
-  (call
-    function: (identifier) @type.builtin)
-  (type (identifier) @type.builtin)
-  (generic_type (identifier) @type.builtin)
-  ; also check if type binary operator left identifier for union types
-  (type
-    (binary_operator
-      left: (identifier) @type.builtin))
-  (#any-of? @type.builtin "bool" "bytearray" "bytes" "complex" "dict" "float" "frozenset" "int" "list" "memoryview" "object" "range" "set" "slice" "str" "tuple")
-]
diff --git a/crates/languages/src/python/imports.scm b/crates/languages/src/python/imports.scm
deleted file mode 100644
index 7a1e2b225b..0000000000
--- a/crates/languages/src/python/imports.scm
+++ /dev/null
@@ -1,32 +0,0 @@
-(import_statement
-    name: [
-        (dotted_name
-            ((identifier) @namespace ".")*
-            (identifier) @namespace .)
-        (aliased_import
-            name: (dotted_name
-                ((identifier) @namespace ".")*
-                (identifier) @namespace .))
-    ]) @wildcard @import
-
-(import_from_statement
-    module_name: [
-        (dotted_name
-            ((identifier) @namespace ".")*
-            (identifier) @namespace .)
-        (relative_import
-            (dotted_name
-                ((identifier) @namespace ".")*
-                (identifier) @namespace .)?)
-    ]
-    (wildcard_import)? @wildcard
-    name: [
-        (dotted_name
-            ((identifier) @namespace ".")*
-            (identifier) @name .)
-        (aliased_import
-            name: (dotted_name
-                ((identifier) @namespace ".")*
-                (identifier) @name .)
-            alias: (identifier) @alias)
-    ]?) @import
diff --git a/crates/languages/src/python/indents.scm b/crates/languages/src/python/indents.scm
deleted file mode 100644
index 3d4c1cc9c4..0000000000
--- a/crates/languages/src/python/indents.scm
+++ /dev/null
@@ -1,17 +0,0 @@
-(_ "[" "]" @end) @indent
-(_ "{" "}" @end) @indent
-(_ "(" ")" @end) @indent
-
-(function_definition) @start.def
-(class_definition) @start.class
-(if_statement) @start.if
-(for_statement) @start.for
-(while_statement) @start.while
-(with_statement) @start.with
-(match_statement) @start.match
-(try_statement) @start.try
-(elif_clause) @start.elif
-(else_clause) @start.else
-(except_clause) @start.except
-(finally_clause) @start.finally
-(case_clause) @start.case
diff --git a/crates/languages/src/python/injections.scm b/crates/languages/src/python/injections.scm
deleted file mode 100644
index 9117c713b9..0000000000
--- a/crates/languages/src/python/injections.scm
+++ /dev/null
@@ -1,3 +0,0 @@
-((comment) @injection.content
- (#set! injection.language "comment")
-)
diff --git a/crates/languages/src/python/outline.scm b/crates/languages/src/python/outline.scm
deleted file mode 100644
index 70beb4e675..0000000000
--- a/crates/languages/src/python/outline.scm
+++ /dev/null
@@ -1,11 +0,0 @@
-(decorator) @annotation
-
-(class_definition
-    "class" @context
-    name: (identifier) @name
-    ) @item
-
-(function_definition
-    "async"? @context
-    "def" @context
-    name: (_) @name) @item
diff --git a/crates/languages/src/python/overrides.scm b/crates/languages/src/python/overrides.scm
deleted file mode 100644
index 81fec9a5f5..0000000000
--- a/crates/languages/src/python/overrides.scm
+++ /dev/null
@@ -1,2 +0,0 @@
-(comment) @comment.inclusive
-(string) @string
diff --git a/crates/languages/src/python/runnables.scm b/crates/languages/src/python/runnables.scm
deleted file mode 100644
index 1c7e76d73b..0000000000
--- a/crates/languages/src/python/runnables.scm
+++ /dev/null
@@ -1,151 +0,0 @@
-; subclasses of unittest.TestCase or TestCase
-(
-    (class_definition
-        name: (identifier) @run @_unittest_class_name
-        superclasses: (argument_list
-            [(identifier) @_superclass
-                (attribute (identifier) @_superclass)]
-            )
-        (#eq? @_superclass "TestCase")
-        ) @_python-unittest-class
-    (#set! tag python-unittest-class)
-    )
-
-; test methods whose names start with `test` in a TestCase
-(
-    (class_definition
-        name: (identifier) @_unittest_class_name
-        superclasses: (argument_list
-            [(identifier) @_superclass
-                (attribute (identifier) @_superclass)]
-            )
-        (#eq? @_superclass "TestCase")
-        body: (block
-            (function_definition
-                name: (identifier) @run @_unittest_method_name
-                (#match? @_unittest_method_name "^test.*")
-                ) @_python-unittest-method
-            (#set! tag python-unittest-method)
-            )
-        )
-    )
-
-; pytest functions
-(
-    (module
-        (function_definition
-            name: (identifier) @run @_pytest_method_name
-            (#match? @_pytest_method_name "^test_")
-            ) @_python-pytest-method
-        )
-    (#set! tag python-pytest-method)
-    )
-
-; decorated pytest functions
-(
-    (module
-        (decorated_definition
-            (decorator)+ @_decorator
-            definition: (function_definition
-                name: (identifier) @run @_pytest_method_name
-                (#match? @_pytest_method_name "^test_")
-                )
-            ) @_python-pytest-method
-        )
-    (#set! tag python-pytest-method)
-    )
-
-
-; pytest classes
-(
-    (module
-        (class_definition
-            name: (identifier) @run @_pytest_class_name
-            (#match? @_pytest_class_name "^Test")
-            )
-        (#set! tag python-pytest-class)
-        )
-    )
-
-
-; decorated pytest classes
-(
-    (module
-        (decorated_definition
-            (decorator)+ @_decorator
-            definition: (class_definition
-                name: (identifier) @run @_pytest_class_name
-                (#match? @_pytest_class_name "^Test")
-                )
-            )
-        (#set! tag python-pytest-class)
-        )
-    )
-
-
-; pytest class methods
-(
-    (module
-        (class_definition
-            name: (identifier) @_pytest_class_name
-            (#match? @_pytest_class_name "^Test")
-            body: (block
-                [(decorated_definition
-                    (decorator)+ @_decorator
-                    definition: (function_definition
-                        name: (identifier) @run @_pytest_method_name
-                        (#match? @_pytest_method_name "^test_")
-                        )
-                    )
-                (function_definition
-                    name: (identifier) @run @_pytest_method_name
-                    (#match? @_pytest_method_name "^test")
-                    )
-                ] @_python-pytest-method)
-            (#set! tag python-pytest-method)
-            )
-        )
-    )
-
-; decorated pytest class methods
-(
-    (module
-        (decorated_definition
-            (decorator)+ @_decorator
-            definition: (class_definition
-                name: (identifier) @_pytest_class_name
-                (#match? @_pytest_class_name "^Test")
-                body: (block
-                    [(decorated_definition
-                        (decorator)+ @_decorator
-                        definition: (function_definition
-                            name: (identifier) @run @_pytest_method_name
-                            (#match? @_pytest_method_name "^test_")
-                            )
-                        )
-                    (function_definition
-                        name: (identifier) @run @_pytest_method_name
-                        (#match? @_pytest_method_name "^test")
-                        )
-                    ] @_python-pytest-method)
-                (#set! tag python-pytest-method)
-                )
-            )
-        )
-    )
-
-; module main method
-(
-    (module
-        (if_statement
-            condition: (comparison_operator
-                (identifier) @run @_lhs
-                operators: "=="
-                (string) @_rhs
-                )
-            (#eq? @_lhs "__name__")
-            (#match? @_rhs "^[\"']__main__[\"']$")
-            (#set! tag python-module-main-method)
-            )
-        )
-    )
diff --git a/crates/languages/src/python/textobjects.scm b/crates/languages/src/python/textobjects.scm
deleted file mode 100644
index abd28ab75a..0000000000
--- a/crates/languages/src/python/textobjects.scm
+++ /dev/null
@@ -1,7 +0,0 @@
-(comment)+ @comment.around
-
-(function_definition
-  body: (_) @function.inside) @function.around
-
-(class_definition
-  body: (_) @class.inside) @class.around
diff --git a/crates/languages/src/regex/brackets.scm b/crates/languages/src/regex/brackets.scm
deleted file mode 100644
index 191fd9c084..0000000000
--- a/crates/languages/src/regex/brackets.scm
+++ /dev/null
@@ -1,3 +0,0 @@
-("(" @open ")" @close)
-("[" @open "]" @close)
-("{" @open "}" @close)
diff --git a/crates/languages/src/regex/config.toml b/crates/languages/src/regex/config.toml
deleted file mode 100644
index 85f2e370d6..0000000000
--- a/crates/languages/src/regex/config.toml
+++ /dev/null
@@ -1,9 +0,0 @@
-name = "Regex"
-grammar = "regex"
-autoclose_before = ")]}"
-brackets = [
-  { start = "(", end = ")", close = true, newline = false },
-  { start = "{", end = "}", close = true, newline = false },
-  { start = "[", end = "]", close = true, newline = false },
-]
-hidden = true
diff --git a/crates/languages/src/regex/highlights.scm b/crates/languages/src/regex/highlights.scm
deleted file mode 100644
index b5adecf472..0000000000
--- a/crates/languages/src/regex/highlights.scm
+++ /dev/null
@@ -1,55 +0,0 @@
-[
-  "("
-  ")"
-  "(?"
-  "(?:"
-  "(?<"
-  "(?P="
-  "<"
-  ">"
-  "["
-  "]"
-  "{"
-  "}"
-] @punctuation.bracket.regex
-
-(group_name) @label.regex
-
-[
-  (identity_escape)
-  (control_letter_escape)
-  (character_class_escape)
-  (control_escape)
-] @string.escape.regex
-
-[
-  "*"
-  "+"
-  "?"
-  "|"
-  "="
-  "!"
-  (start_assertion)
-  (end_assertion)
-  (any_character)
-  (lazy)
-] @operator.regex
-
-[
-  (boundary_assertion)
-  (non_boundary_assertion)
-  (backreference_escape)
-  (decimal_escape)
-] @keyword.operator.regex
-
-(count_quantifier
-  [
-    (decimal_digits) @number.quantifier.regex
-    "," @punctuation.delimiter.regex
-  ])
-
-(character_class
-  [
-    "^" @operator.regex
-    (class_range "-" @operator.regex)
-  ])
diff --git a/crates/languages/src/rust.rs b/crates/languages/src/rust.rs
deleted file mode 100644
index aadf882b8e..0000000000
--- a/crates/languages/src/rust.rs
+++ /dev/null
@@ -1,1821 +0,0 @@
-use anyhow::{Context as _, Result};
-use async_trait::async_trait;
-use collections::HashMap;
-use futures::StreamExt;
-use gpui::{App, AppContext, AsyncApp, SharedString, Task};
-use http_client::github::AssetKind;
-use http_client::github::{GitHubLspBinaryVersion, latest_github_release};
-use http_client::github_download::{GithubBinaryMetadata, download_server_binary};
-pub use language::*;
-use lsp::{InitializeParams, LanguageServerBinary};
-use project::lsp_store::rust_analyzer_ext::CARGO_DIAGNOSTICS_SOURCE_NAME;
-use project::project_settings::ProjectSettings;
-use regex::Regex;
-use serde_json::json;
-use settings::Settings as _;
-use smallvec::SmallVec;
-use smol::fs::{self};
-use std::cmp::Reverse;
-use std::fmt::Display;
-use std::ops::Range;
-use std::{
-    borrow::Cow,
-    path::{Path, PathBuf},
-    sync::{Arc, LazyLock},
-};
-use task::{TaskTemplate, TaskTemplates, TaskVariables, VariableName};
-use util::fs::{make_file_executable, remove_matching};
-use util::merge_json_value_into;
-use util::rel_path::RelPath;
-use util::{ResultExt, maybe};
-
-use crate::language_settings::language_settings;
-
-pub struct RustLspAdapter;
-
-#[cfg(target_os = "macos")]
-impl RustLspAdapter {
-    const GITHUB_ASSET_KIND: AssetKind = AssetKind::Gz;
-    const ARCH_SERVER_NAME: &str = "apple-darwin";
-}
-
-#[cfg(target_os = "linux")]
-impl RustLspAdapter {
-    const GITHUB_ASSET_KIND: AssetKind = AssetKind::Gz;
-    const ARCH_SERVER_NAME: &str = "unknown-linux";
-}
-
-#[cfg(target_os = "freebsd")]
-impl RustLspAdapter {
-    const GITHUB_ASSET_KIND: AssetKind = AssetKind::Gz;
-    const ARCH_SERVER_NAME: &str = "unknown-freebsd";
-}
-
-#[cfg(target_os = "windows")]
-impl RustLspAdapter {
-    const GITHUB_ASSET_KIND: AssetKind = AssetKind::Zip;
-    const ARCH_SERVER_NAME: &str = "pc-windows-msvc";
-}
-
-const SERVER_NAME: LanguageServerName = LanguageServerName::new_static("rust-analyzer");
-
-#[cfg(target_os = "linux")]
-enum LibcType {
-    Gnu,
-    Musl,
-}
-
-impl RustLspAdapter {
-    #[cfg(target_os = "linux")]
-    async fn determine_libc_type() -> LibcType {
-        use futures::pin_mut;
-
-        async fn from_ldd_version() -> Option<LibcType> {
-            use util::command::new_smol_command;
-
-            let ldd_output = new_smol_command("ldd")
-                .arg("--version")
-                .output()
-                .await
-                .ok()?;
-            let ldd_version = String::from_utf8_lossy(&ldd_output.stdout);
-
-            if ldd_version.contains("GNU libc") || ldd_version.contains("GLIBC") {
-                Some(LibcType::Gnu)
-            } else if ldd_version.contains("musl") {
-                Some(LibcType::Musl)
-            } else {
-                None
-            }
-        }
-
-        if let Some(libc_type) = from_ldd_version().await {
-            return libc_type;
-        }
-
-        let Ok(dir_entries) = smol::fs::read_dir("/lib").await else {
-            // defaulting to gnu because nix doesn't have /lib files due to not following FHS
-            return LibcType::Gnu;
-        };
-        let dir_entries = dir_entries.filter_map(async move |e| e.ok());
-        pin_mut!(dir_entries);
-
-        let mut has_musl = false;
-        let mut has_gnu = false;
-
-        while let Some(entry) = dir_entries.next().await {
-            let file_name = entry.file_name();
-            let file_name = file_name.to_string_lossy();
-            if file_name.starts_with("ld-musl-") {
-                has_musl = true;
-            } else if file_name.starts_with("ld-linux-") {
-                has_gnu = true;
-            }
-        }
-
-        match (has_musl, has_gnu) {
-            (true, _) => LibcType::Musl,
-            (_, true) => LibcType::Gnu,
-            _ => LibcType::Gnu,
-        }
-    }
-
-    #[cfg(target_os = "linux")]
-    async fn build_arch_server_name_linux() -> String {
-        let libc = match Self::determine_libc_type().await {
-            LibcType::Musl => "musl",
-            LibcType::Gnu => "gnu",
-        };
-
-        format!("{}-{}", Self::ARCH_SERVER_NAME, libc)
-    }
-
-    async fn build_asset_name() -> String {
-        let extension = match Self::GITHUB_ASSET_KIND {
-            AssetKind::TarGz => "tar.gz",
-            AssetKind::Gz => "gz",
-            AssetKind::Zip => "zip",
-        };
-
-        #[cfg(target_os = "linux")]
-        let arch_server_name = Self::build_arch_server_name_linux().await;
-        #[cfg(not(target_os = "linux"))]
-        let arch_server_name = Self::ARCH_SERVER_NAME.to_string();
-
-        format!(
-            "{}-{}-{}.{}",
-            SERVER_NAME,
-            std::env::consts::ARCH,
-            &arch_server_name,
-            extension
-        )
-    }
-}
-
-pub(crate) struct CargoManifestProvider;
-
-impl ManifestProvider for CargoManifestProvider {
-    fn name(&self) -> ManifestName {
-        SharedString::new_static("Cargo.toml").into()
-    }
-
-    fn search(
-        &self,
-        ManifestQuery {
-            path,
-            depth,
-            delegate,
-        }: ManifestQuery,
-    ) -> Option<Arc<RelPath>> {
-        let mut outermost_cargo_toml = None;
-        for path in path.ancestors().take(depth) {
-            let p = path.join(RelPath::unix("Cargo.toml").unwrap());
-            if delegate.exists(&p, Some(false)) {
-                outermost_cargo_toml = Some(Arc::from(path));
-            }
-        }
-
-        outermost_cargo_toml
-    }
-}
-
-#[async_trait(?Send)]
-impl LspAdapter for RustLspAdapter {
-    fn name(&self) -> LanguageServerName {
-        SERVER_NAME
-    }
-
-    fn disk_based_diagnostic_sources(&self) -> Vec<String> {
-        vec![CARGO_DIAGNOSTICS_SOURCE_NAME.to_owned()]
-    }
-
-    fn disk_based_diagnostics_progress_token(&self) -> Option<String> {
-        Some("rust-analyzer/flycheck".into())
-    }
-
-    fn process_diagnostics(
-        &self,
-        params: &mut lsp::PublishDiagnosticsParams,
-        _: LanguageServerId,
-        _: Option<&'_ Buffer>,
-    ) {
-        static REGEX: LazyLock<Regex> =
-            LazyLock::new(|| Regex::new(r"(?m)`([^`]+)\n`$").expect("Failed to create REGEX"));
-
-        for diagnostic in &mut params.diagnostics {
-            for message in diagnostic
-                .related_information
-                .iter_mut()
-                .flatten()
-                .map(|info| &mut info.message)
-                .chain([&mut diagnostic.message])
-            {
-                if let Cow::Owned(sanitized) = REGEX.replace_all(message, "`$1`") {
-                    *message = sanitized;
-                }
-            }
-        }
-    }
-
-    fn diagnostic_message_to_markdown(&self, message: &str) -> Option<String> {
-        static REGEX: LazyLock<Regex> =
-            LazyLock::new(|| Regex::new(r"(?m)\n *").expect("Failed to create REGEX"));
-        Some(REGEX.replace_all(message, "\n\n").to_string())
-    }
-
-    async fn label_for_completion(
-        &self,
-        completion: &lsp::CompletionItem,
-        language: &Arc<Language>,
-    ) -> Option<CodeLabel> {
-        // rust-analyzer calls these detail left and detail right in terms of where it expects things to be rendered
-        // this usually contains signatures of the thing to be completed
-        let detail_right = completion
-            .label_details
-            .as_ref()
-            .and_then(|detail| detail.description.as_ref())
-            .or(completion.detail.as_ref())
-            .map(|detail| detail.trim());
-        // this tends to contain alias and import information
-        let mut detail_left = completion
-            .label_details
-            .as_ref()
-            .and_then(|detail| detail.detail.as_deref());
-        let mk_label = |text: String, filter_range: &dyn Fn() -> Range<usize>, runs| {
-            let filter_range = completion
-                .filter_text
-                .as_deref()
-                .and_then(|filter| text.find(filter).map(|ix| ix..ix + filter.len()))
-                .or_else(|| {
-                    text.find(&completion.label)
-                        .map(|ix| ix..ix + completion.label.len())
-                })
-                .unwrap_or_else(filter_range);
-
-            CodeLabel::new(text, filter_range, runs)
-        };
-        let mut label = match (detail_right, completion.kind) {
-            (Some(signature), Some(lsp::CompletionItemKind::FIELD)) => {
-                let name = &completion.label;
-                let text = format!("{name}: {signature}");
-                let prefix = "struct S { ";
-                let source = Rope::from_iter([prefix, &text, " }"]);
-                let runs =
-                    language.highlight_text(&source, prefix.len()..prefix.len() + text.len());
-                mk_label(text, &|| 0..completion.label.len(), runs)
-            }
-            (
-                Some(signature),
-                Some(lsp::CompletionItemKind::CONSTANT | lsp::CompletionItemKind::VARIABLE),
-            ) if completion.insert_text_format != Some(lsp::InsertTextFormat::SNIPPET) => {
-                let name = &completion.label;
-                let text = format!("{name}: {signature}",);
-                let prefix = "let ";
-                let source = Rope::from_iter([prefix, &text, " = ();"]);
-                let runs =
-                    language.highlight_text(&source, prefix.len()..prefix.len() + text.len());
-                mk_label(text, &|| 0..completion.label.len(), runs)
-            }
-            (
-                function_signature,
-                Some(lsp::CompletionItemKind::FUNCTION | lsp::CompletionItemKind::METHOD),
-            ) => {
-                const FUNCTION_PREFIXES: [&str; 6] = [
-                    "async fn",
-                    "async unsafe fn",
-                    "const fn",
-                    "const unsafe fn",
-                    "unsafe fn",
-                    "fn",
-                ];
-                let fn_prefixed = FUNCTION_PREFIXES.iter().find_map(|&prefix| {
-                    function_signature?
-                        .strip_prefix(prefix)
-                        .map(|suffix| (prefix, suffix))
-                });
-                let label = if let Some(label) = completion
-                    .label
-                    .strip_suffix("(…)")
-                    .or_else(|| completion.label.strip_suffix("()"))
-                {
-                    label
-                } else {
-                    &completion.label
-                };
-
-                static FULL_SIGNATURE_REGEX: LazyLock<Regex> =
-                    LazyLock::new(|| Regex::new(r"fn (.?+)\(").expect("Failed to create REGEX"));
-                if let Some((function_signature, match_)) = function_signature
-                    .filter(|it| it.contains(&label))
-                    .and_then(|it| Some((it, FULL_SIGNATURE_REGEX.find(it)?)))
-                {
-                    let source = Rope::from(function_signature);
-                    let runs = language.highlight_text(&source, 0..function_signature.len());
-                    mk_label(
-                        function_signature.to_owned(),
-                        &|| match_.range().start - 3..match_.range().end - 1,
-                        runs,
-                    )
-                } else if let Some((prefix, suffix)) = fn_prefixed {
-                    let text = format!("{label}{suffix}");
-                    let source = Rope::from_iter([prefix, " ", &text, " {}"]);
-                    let run_start = prefix.len() + 1;
-                    let runs = language.highlight_text(&source, run_start..run_start + text.len());
-                    mk_label(text, &|| 0..label.len(), runs)
-                } else if completion
-                    .detail
-                    .as_ref()
-                    .is_some_and(|detail| detail.starts_with("macro_rules! "))
-                {
-                    let text = completion.label.clone();
-                    let len = text.len();
-                    let source = Rope::from(text.as_str());
-                    let runs = language.highlight_text(&source, 0..len);
-                    mk_label(text, &|| 0..completion.label.len(), runs)
-                } else if detail_left.is_none() {
-                    return None;
-                } else {
-                    mk_label(
-                        completion.label.clone(),
-                        &|| 0..completion.label.len(),
-                        vec![],
-                    )
-                }
-            }
-            (_, kind) => {
-                let mut label;
-                let mut runs = vec![];
-
-                if completion.insert_text_format == Some(lsp::InsertTextFormat::SNIPPET)
-                    && let Some(
-                        lsp::CompletionTextEdit::InsertAndReplace(lsp::InsertReplaceEdit {
-                            new_text,
-                            ..
-                        })
-                        | lsp::CompletionTextEdit::Edit(lsp::TextEdit { new_text, .. }),
-                    ) = completion.text_edit.as_ref()
-                    && let Ok(mut snippet) = snippet::Snippet::parse(new_text)
-                    && !snippet.tabstops.is_empty()
-                {
-                    label = String::new();
-
-                    // we never display the final tabstop
-                    snippet.tabstops.remove(snippet.tabstops.len() - 1);
-
-                    let mut text_pos = 0;
-
-                    let mut all_stop_ranges = snippet
-                        .tabstops
-                        .into_iter()
-                        .flat_map(|stop| stop.ranges)
-                        .collect::<SmallVec<[_; 8]>>();
-                    all_stop_ranges.sort_unstable_by_key(|a| (a.start, Reverse(a.end)));
-
-                    for range in &all_stop_ranges {
-                        let start_pos = range.start as usize;
-                        let end_pos = range.end as usize;
-
-                        label.push_str(&snippet.text[text_pos..end_pos]);
-                        text_pos = end_pos;
-
-                        if start_pos == end_pos {
-                            let caret_start = label.len();
-                            label.push('…');
-                            runs.push((caret_start..label.len(), HighlightId::TABSTOP_INSERT_ID));
-                        } else {
-                            runs.push((start_pos..end_pos, HighlightId::TABSTOP_REPLACE_ID));
-                        }
-                    }
-
-                    label.push_str(&snippet.text[text_pos..]);
-
-                    if detail_left.is_some_and(|detail_left| detail_left == new_text) {
-                        // We only include the left detail if it isn't the snippet again
-                        detail_left.take();
-                    }
-
-                    runs.extend(language.highlight_text(&Rope::from(&label), 0..label.len()));
-                } else {
-                    let highlight_name = kind.and_then(|kind| match kind {
-                        lsp::CompletionItemKind::STRUCT
-                        | lsp::CompletionItemKind::INTERFACE
-                        | lsp::CompletionItemKind::ENUM => Some("type"),
-                        lsp::CompletionItemKind::ENUM_MEMBER => Some("variant"),
-                        lsp::CompletionItemKind::KEYWORD => Some("keyword"),
-                        lsp::CompletionItemKind::VALUE | lsp::CompletionItemKind::CONSTANT => {
-                            Some("constant")
-                        }
-                        _ => None,
-                    });
-
-                    label = completion.label.clone();
-
-                    if let Some(highlight_name) = highlight_name {
-                        let highlight_id =
-                            language.grammar()?.highlight_id_for_name(highlight_name)?;
-                        runs.push((
-                            0..label.rfind('(').unwrap_or(completion.label.len()),
-                            highlight_id,
-                        ));
-                    } else if detail_left.is_none() {
-                        return None;
-                    }
-                }
-
-                let label_len = label.len();
-
-                mk_label(label, &|| 0..label_len, runs)
-            }
-        };
-
-        if let Some(detail_left) = detail_left {
-            label.text.push(' ');
-            if !detail_left.starts_with('(') {
-                label.text.push('(');
-            }
-            label.text.push_str(detail_left);
-            if !detail_left.ends_with(')') {
-                label.text.push(')');
-            }
-        }
-
-        Some(label)
-    }
-
-    async fn label_for_symbol(
-        &self,
-        name: &str,
-        kind: lsp::SymbolKind,
-        language: &Arc<Language>,
-    ) -> Option<CodeLabel> {
-        let (prefix, suffix) = match kind {
-            lsp::SymbolKind::METHOD | lsp::SymbolKind::FUNCTION => ("fn ", " () {}"),
-            lsp::SymbolKind::STRUCT => ("struct ", " {}"),
-            lsp::SymbolKind::ENUM => ("enum ", " {}"),
-            lsp::SymbolKind::INTERFACE => ("trait ", " {}"),
-            lsp::SymbolKind::CONSTANT => ("const ", ": () = ();"),
-            lsp::SymbolKind::MODULE => ("mod ", " {}"),
-            lsp::SymbolKind::TYPE_PARAMETER => ("type ", " {}"),
-            _ => return None,
-        };
-
-        let filter_range = prefix.len()..prefix.len() + name.len();
-        let display_range = 0..filter_range.end;
-        Some(CodeLabel::new(
-            format!("{prefix}{name}"),
-            filter_range,
-            language.highlight_text(&Rope::from_iter([prefix, name, suffix]), display_range),
-        ))
-    }
-
-    fn prepare_initialize_params(
-        &self,
-        mut original: InitializeParams,
-        cx: &App,
-    ) -> Result<InitializeParams> {
-        let enable_lsp_tasks = ProjectSettings::get_global(cx)
-            .lsp
-            .get(&SERVER_NAME)
-            .is_some_and(|s| s.enable_lsp_tasks);
-        if enable_lsp_tasks {
-            let experimental = json!({
-                "runnables": {
-                    "kinds": [ "cargo", "shell" ],
-                },
-            });
-            if let Some(original_experimental) = &mut original.capabilities.experimental {
-                merge_json_value_into(experimental, original_experimental);
-            } else {
-                original.capabilities.experimental = Some(experimental);
-            }
-        }
-
-        Ok(original)
-    }
-}
-
-impl LspInstaller for RustLspAdapter {
-    type BinaryVersion = GitHubLspBinaryVersion;
-    async fn check_if_user_installed(
-        &self,
-        delegate: &dyn LspAdapterDelegate,
-        _: Option<Toolchain>,
-        _: &AsyncApp,
-    ) -> Option<LanguageServerBinary> {
-        let path = delegate.which("rust-analyzer".as_ref()).await?;
-        let env = delegate.shell_env().await;
-
-        // It is surprisingly common for ~/.cargo/bin/rust-analyzer to be a symlink to
-        // /usr/bin/rust-analyzer that fails when you run it; so we need to test it.
-        log::debug!("found rust-analyzer in PATH. trying to run `rust-analyzer --help`");
-        let result = delegate
-            .try_exec(LanguageServerBinary {
-                path: path.clone(),
-                arguments: vec!["--help".into()],
-                env: Some(env.clone()),
-            })
-            .await;
-        if let Err(err) = result {
-            log::debug!(
-                "failed to run rust-analyzer after detecting it in PATH: binary: {:?}: {}",
-                path,
-                err
-            );
-            return None;
-        }
-
-        Some(LanguageServerBinary {
-            path,
-            env: Some(env),
-            arguments: vec![],
-        })
-    }
-
-    async fn fetch_latest_server_version(
-        &self,
-        delegate: &dyn LspAdapterDelegate,
-        pre_release: bool,
-        _: &mut AsyncApp,
-    ) -> Result<GitHubLspBinaryVersion> {
-        let release = latest_github_release(
-            "rust-lang/rust-analyzer",
-            true,
-            pre_release,
-            delegate.http_client(),
-        )
-        .await?;
-        let asset_name = Self::build_asset_name().await;
-        let asset = release
-            .assets
-            .into_iter()
-            .find(|asset| asset.name == asset_name)
-            .with_context(|| format!("no asset found matching `{asset_name:?}`"))?;
-        Ok(GitHubLspBinaryVersion {
-            name: release.tag_name,
-            url: asset.browser_download_url,
-            digest: asset.digest,
-        })
-    }
-
-    async fn fetch_server_binary(
-        &self,
-        version: GitHubLspBinaryVersion,
-        container_dir: PathBuf,
-        delegate: &dyn LspAdapterDelegate,
-    ) -> Result<LanguageServerBinary> {
-        let GitHubLspBinaryVersion {
-            name,
-            url,
-            digest: expected_digest,
-        } = version;
-        let destination_path = container_dir.join(format!("rust-analyzer-{name}"));
-        let server_path = match Self::GITHUB_ASSET_KIND {
-            AssetKind::TarGz | AssetKind::Gz => destination_path.clone(), // Tar and gzip extract in place.
-            AssetKind::Zip => destination_path.clone().join("rust-analyzer.exe"), // zip contains a .exe
-        };
-
-        let binary = LanguageServerBinary {
-            path: server_path.clone(),
-            env: None,
-            arguments: Default::default(),
-        };
-
-        let metadata_path = destination_path.with_extension("metadata");
-        let metadata = GithubBinaryMetadata::read_from_file(&metadata_path)
-            .await
-            .ok();
-        if let Some(metadata) = metadata {
-            let validity_check = async || {
-                delegate
-                    .try_exec(LanguageServerBinary {
-                        path: server_path.clone(),
-                        arguments: vec!["--version".into()],
-                        env: None,
-                    })
-                    .await
-                    .inspect_err(|err| {
-                        log::warn!("Unable to run {server_path:?} asset, redownloading: {err:#}",)
-                    })
-            };
-            if let (Some(actual_digest), Some(expected_digest)) =
-                (&metadata.digest, &expected_digest)
-            {
-                if actual_digest == expected_digest {
-                    if validity_check().await.is_ok() {
-                        return Ok(binary);
-                    }
-                } else {
-                    log::info!(
-                        "SHA-256 mismatch for {destination_path:?} asset, downloading new asset. Expected: {expected_digest}, Got: {actual_digest}"
-                    );
-                }
-            } else if validity_check().await.is_ok() {
-                return Ok(binary);
-            }
-        }
-
-        download_server_binary(
-            &*delegate.http_client(),
-            &url,
-            expected_digest.as_deref(),
-            &destination_path,
-            Self::GITHUB_ASSET_KIND,
-        )
-        .await?;
-        make_file_executable(&server_path).await?;
-        remove_matching(&container_dir, |path| path != destination_path).await;
-        GithubBinaryMetadata::write_to_file(
-            &GithubBinaryMetadata {
-                metadata_version: 1,
-                digest: expected_digest,
-            },
-            &metadata_path,
-        )
-        .await?;
-
-        Ok(LanguageServerBinary {
-            path: server_path,
-            env: None,
-            arguments: Default::default(),
-        })
-    }
-
-    async fn cached_server_binary(
-        &self,
-        container_dir: PathBuf,
-        _: &dyn LspAdapterDelegate,
-    ) -> Option<LanguageServerBinary> {
-        get_cached_server_binary(container_dir).await
-    }
-}
-
-pub(crate) struct RustContextProvider;
-
-const RUST_PACKAGE_TASK_VARIABLE: VariableName =
-    VariableName::Custom(Cow::Borrowed("RUST_PACKAGE"));
-
-/// The bin name corresponding to the current file in Cargo.toml
-const RUST_BIN_NAME_TASK_VARIABLE: VariableName =
-    VariableName::Custom(Cow::Borrowed("RUST_BIN_NAME"));
-
-/// The bin kind (bin/example) corresponding to the current file in Cargo.toml
-const RUST_BIN_KIND_TASK_VARIABLE: VariableName =
-    VariableName::Custom(Cow::Borrowed("RUST_BIN_KIND"));
-
-/// The flag to list required features for executing a bin, if any
-const RUST_BIN_REQUIRED_FEATURES_FLAG_TASK_VARIABLE: VariableName =
-    VariableName::Custom(Cow::Borrowed("RUST_BIN_REQUIRED_FEATURES_FLAG"));
-
-/// The list of required features for executing a bin, if any
-const RUST_BIN_REQUIRED_FEATURES_TASK_VARIABLE: VariableName =
-    VariableName::Custom(Cow::Borrowed("RUST_BIN_REQUIRED_FEATURES"));
-
-const RUST_TEST_FRAGMENT_TASK_VARIABLE: VariableName =
-    VariableName::Custom(Cow::Borrowed("RUST_TEST_FRAGMENT"));
-
-const RUST_DOC_TEST_NAME_TASK_VARIABLE: VariableName =
-    VariableName::Custom(Cow::Borrowed("RUST_DOC_TEST_NAME"));
-
-const RUST_TEST_NAME_TASK_VARIABLE: VariableName =
-    VariableName::Custom(Cow::Borrowed("RUST_TEST_NAME"));
-
-const RUST_MANIFEST_DIRNAME_TASK_VARIABLE: VariableName =
-    VariableName::Custom(Cow::Borrowed("RUST_MANIFEST_DIRNAME"));
-
-impl ContextProvider for RustContextProvider {
-    fn build_context(
-        &self,
-        task_variables: &TaskVariables,
-        location: ContextLocation<'_>,
-        project_env: Option<HashMap<String, String>>,
-        _: Arc<dyn LanguageToolchainStore>,
-        cx: &mut gpui::App,
-    ) -> Task<Result<TaskVariables>> {
-        let local_abs_path = location
-            .file_location
-            .buffer
-            .read(cx)
-            .file()
-            .and_then(|file| Some(file.as_local()?.abs_path(cx)));
-
-        let mut variables = TaskVariables::default();
-
-        if let (Some(path), Some(stem)) = (&local_abs_path, task_variables.get(&VariableName::Stem))
-        {
-            let fragment = test_fragment(&variables, path, stem);
-            variables.insert(RUST_TEST_FRAGMENT_TASK_VARIABLE, fragment);
-        };
-        if let Some(test_name) =
-            task_variables.get(&VariableName::Custom(Cow::Borrowed("_test_name")))
-        {
-            variables.insert(RUST_TEST_NAME_TASK_VARIABLE, test_name.into());
-        }
-        if let Some(doc_test_name) =
-            task_variables.get(&VariableName::Custom(Cow::Borrowed("_doc_test_name")))
-        {
-            variables.insert(RUST_DOC_TEST_NAME_TASK_VARIABLE, doc_test_name.into());
-        }
-        cx.background_spawn(async move {
-            if let Some(path) = local_abs_path
-                .as_deref()
-                .and_then(|local_abs_path| local_abs_path.parent())
-                && let Some(package_name) =
-                    human_readable_package_name(path, project_env.as_ref()).await
-            {
-                variables.insert(RUST_PACKAGE_TASK_VARIABLE.clone(), package_name);
-            }
-            if let Some(path) = local_abs_path.as_ref()
-                && let Some((target, manifest_path)) =
-                    target_info_from_abs_path(path, project_env.as_ref()).await
-            {
-                if let Some(target) = target {
-                    variables.extend(TaskVariables::from_iter([
-                        (RUST_PACKAGE_TASK_VARIABLE.clone(), target.package_name),
-                        (RUST_BIN_NAME_TASK_VARIABLE.clone(), target.target_name),
-                        (
-                            RUST_BIN_KIND_TASK_VARIABLE.clone(),
-                            target.target_kind.to_string(),
-                        ),
-                    ]));
-                    if target.required_features.is_empty() {
-                        variables.insert(RUST_BIN_REQUIRED_FEATURES_FLAG_TASK_VARIABLE, "".into());
-                        variables.insert(RUST_BIN_REQUIRED_FEATURES_TASK_VARIABLE, "".into());
-                    } else {
-                        variables.insert(
-                            RUST_BIN_REQUIRED_FEATURES_FLAG_TASK_VARIABLE.clone(),
-                            "--features".to_string(),
-                        );
-                        variables.insert(
-                            RUST_BIN_REQUIRED_FEATURES_TASK_VARIABLE.clone(),
-                            target.required_features.join(","),
-                        );
-                    }
-                }
-                variables.extend(TaskVariables::from_iter([(
-                    RUST_MANIFEST_DIRNAME_TASK_VARIABLE.clone(),
-                    manifest_path.to_string_lossy().into_owned(),
-                )]));
-            }
-            Ok(variables)
-        })
-    }
-
-    fn associated_tasks(
-        &self,
-        file: Option<Arc<dyn language::File>>,
-        cx: &App,
-    ) -> Task<Option<TaskTemplates>> {
-        const DEFAULT_RUN_NAME_STR: &str = "RUST_DEFAULT_PACKAGE_RUN";
-        const CUSTOM_TARGET_DIR: &str = "RUST_TARGET_DIR";
-
-        let language_sets = language_settings(Some("Rust".into()), file.as_ref(), cx);
-        let package_to_run = language_sets
-            .tasks
-            .variables
-            .get(DEFAULT_RUN_NAME_STR)
-            .cloned();
-        let custom_target_dir = language_sets
-            .tasks
-            .variables
-            .get(CUSTOM_TARGET_DIR)
-            .cloned();
-        let run_task_args = if let Some(package_to_run) = package_to_run {
-            vec!["run".into(), "-p".into(), package_to_run]
-        } else {
-            vec!["run".into()]
-        };
-        let mut task_templates = vec![
-            TaskTemplate {
-                label: format!(
-                    "Check (package: {})",
-                    RUST_PACKAGE_TASK_VARIABLE.template_value(),
-                ),
-                command: "cargo".into(),
-                args: vec![
-                    "check".into(),
-                    "-p".into(),
-                    RUST_PACKAGE_TASK_VARIABLE.template_value(),
-                ],
-                cwd: Some("$ZED_DIRNAME".to_owned()),
-                ..TaskTemplate::default()
-            },
-            TaskTemplate {
-                label: "Check all targets (workspace)".into(),
-                command: "cargo".into(),
-                args: vec!["check".into(), "--workspace".into(), "--all-targets".into()],
-                cwd: Some("$ZED_DIRNAME".to_owned()),
-                ..TaskTemplate::default()
-            },
-            TaskTemplate {
-                label: format!(
-                    "Test '{}' (package: {})",
-                    RUST_TEST_NAME_TASK_VARIABLE.template_value(),
-                    RUST_PACKAGE_TASK_VARIABLE.template_value(),
-                ),
-                command: "cargo".into(),
-                args: vec![
-                    "test".into(),
-                    "-p".into(),
-                    RUST_PACKAGE_TASK_VARIABLE.template_value(),
-                    "--".into(),
-                    "--nocapture".into(),
-                    "--include-ignored".into(),
-                    RUST_TEST_NAME_TASK_VARIABLE.template_value(),
-                ],
-                tags: vec!["rust-test".to_owned()],
-                cwd: Some(RUST_MANIFEST_DIRNAME_TASK_VARIABLE.template_value()),
-                ..TaskTemplate::default()
-            },
-            TaskTemplate {
-                label: format!(
-                    "Doc test '{}' (package: {})",
-                    RUST_DOC_TEST_NAME_TASK_VARIABLE.template_value(),
-                    RUST_PACKAGE_TASK_VARIABLE.template_value(),
-                ),
-                command: "cargo".into(),
-                args: vec![
-                    "test".into(),
-                    "--doc".into(),
-                    "-p".into(),
-                    RUST_PACKAGE_TASK_VARIABLE.template_value(),
-                    "--".into(),
-                    "--nocapture".into(),
-                    "--include-ignored".into(),
-                    RUST_DOC_TEST_NAME_TASK_VARIABLE.template_value(),
-                ],
-                tags: vec!["rust-doc-test".to_owned()],
-                cwd: Some(RUST_MANIFEST_DIRNAME_TASK_VARIABLE.template_value()),
-                ..TaskTemplate::default()
-            },
-            TaskTemplate {
-                label: format!(
-                    "Test mod '{}' (package: {})",
-                    VariableName::Stem.template_value(),
-                    RUST_PACKAGE_TASK_VARIABLE.template_value(),
-                ),
-                command: "cargo".into(),
-                args: vec![
-                    "test".into(),
-                    "-p".into(),
-                    RUST_PACKAGE_TASK_VARIABLE.template_value(),
-                    "--".into(),
-                    RUST_TEST_FRAGMENT_TASK_VARIABLE.template_value(),
-                ],
-                tags: vec!["rust-mod-test".to_owned()],
-                cwd: Some(RUST_MANIFEST_DIRNAME_TASK_VARIABLE.template_value()),
-                ..TaskTemplate::default()
-            },
-            TaskTemplate {
-                label: format!(
-                    "Run {} {} (package: {})",
-                    RUST_BIN_KIND_TASK_VARIABLE.template_value(),
-                    RUST_BIN_NAME_TASK_VARIABLE.template_value(),
-                    RUST_PACKAGE_TASK_VARIABLE.template_value(),
-                ),
-                command: "cargo".into(),
-                args: vec![
-                    "run".into(),
-                    "-p".into(),
-                    RUST_PACKAGE_TASK_VARIABLE.template_value(),
-                    format!("--{}", RUST_BIN_KIND_TASK_VARIABLE.template_value()),
-                    RUST_BIN_NAME_TASK_VARIABLE.template_value(),
-                    RUST_BIN_REQUIRED_FEATURES_FLAG_TASK_VARIABLE.template_value(),
-                    RUST_BIN_REQUIRED_FEATURES_TASK_VARIABLE.template_value(),
-                ],
-                cwd: Some(RUST_MANIFEST_DIRNAME_TASK_VARIABLE.template_value()),
-                tags: vec!["rust-main".to_owned()],
-                ..TaskTemplate::default()
-            },
-            TaskTemplate {
-                label: format!(
-                    "Test (package: {})",
-                    RUST_PACKAGE_TASK_VARIABLE.template_value()
-                ),
-                command: "cargo".into(),
-                args: vec![
-                    "test".into(),
-                    "-p".into(),
-                    RUST_PACKAGE_TASK_VARIABLE.template_value(),
-                ],
-                cwd: Some(RUST_MANIFEST_DIRNAME_TASK_VARIABLE.template_value()),
-                ..TaskTemplate::default()
-            },
-            TaskTemplate {
-                label: "Run".into(),
-                command: "cargo".into(),
-                args: run_task_args,
-                cwd: Some(RUST_MANIFEST_DIRNAME_TASK_VARIABLE.template_value()),
-                ..TaskTemplate::default()
-            },
-            TaskTemplate {
-                label: "Clean".into(),
-                command: "cargo".into(),
-                args: vec!["clean".into()],
-                cwd: Some(RUST_MANIFEST_DIRNAME_TASK_VARIABLE.template_value()),
-                ..TaskTemplate::default()
-            },
-        ];
-
-        if let Some(custom_target_dir) = custom_target_dir {
-            task_templates = task_templates
-                .into_iter()
-                .map(|mut task_template| {
-                    let mut args = task_template.args.split_off(1);
-                    task_template.args.append(&mut vec![
-                        "--target-dir".to_string(),
-                        custom_target_dir.clone(),
-                    ]);
-                    task_template.args.append(&mut args);
-
-                    task_template
-                })
-                .collect();
-        }
-
-        Task::ready(Some(TaskTemplates(task_templates)))
-    }
-
-    fn lsp_task_source(&self) -> Option<LanguageServerName> {
-        Some(SERVER_NAME)
-    }
-}
-
-/// Part of the data structure of Cargo metadata
-#[derive(Debug, serde::Deserialize)]
-struct CargoMetadata {
-    packages: Vec<CargoPackage>,
-}
-
-#[derive(Debug, serde::Deserialize)]
-struct CargoPackage {
-    id: String,
-    targets: Vec<CargoTarget>,
-    manifest_path: Arc<Path>,
-}
-
-#[derive(Debug, serde::Deserialize)]
-struct CargoTarget {
-    name: String,
-    kind: Vec<String>,
-    src_path: String,
-    #[serde(rename = "required-features", default)]
-    required_features: Vec<String>,
-}
-
-#[derive(Debug, PartialEq)]
-enum TargetKind {
-    Bin,
-    Example,
-}
-
-impl Display for TargetKind {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            TargetKind::Bin => write!(f, "bin"),
-            TargetKind::Example => write!(f, "example"),
-        }
-    }
-}
-
-impl TryFrom<&str> for TargetKind {
-    type Error = ();
-    fn try_from(value: &str) -> Result<Self, ()> {
-        match value {
-            "bin" => Ok(Self::Bin),
-            "example" => Ok(Self::Example),
-            _ => Err(()),
-        }
-    }
-}
-/// Which package and binary target are we in?
-#[derive(Debug, PartialEq)]
-struct TargetInfo {
-    package_name: String,
-    target_name: String,
-    target_kind: TargetKind,
-    required_features: Vec<String>,
-}
-
-async fn target_info_from_abs_path(
-    abs_path: &Path,
-    project_env: Option<&HashMap<String, String>>,
-) -> Option<(Option<TargetInfo>, Arc<Path>)> {
-    let mut command = util::command::new_smol_command("cargo");
-    if let Some(envs) = project_env {
-        command.envs(envs);
-    }
-    let output = command
-        .current_dir(abs_path.parent()?)
-        .arg("metadata")
-        .arg("--no-deps")
-        .arg("--format-version")
-        .arg("1")
-        .output()
-        .await
-        .log_err()?
-        .stdout;
-
-    let metadata: CargoMetadata = serde_json::from_slice(&output).log_err()?;
-    target_info_from_metadata(metadata, abs_path)
-}
-
-fn target_info_from_metadata(
-    metadata: CargoMetadata,
-    abs_path: &Path,
-) -> Option<(Option<TargetInfo>, Arc<Path>)> {
-    let mut manifest_path = None;
-    for package in metadata.packages {
-        let Some(manifest_dir_path) = package.manifest_path.parent() else {
-            continue;
-        };
-
-        let Some(path_from_manifest_dir) = abs_path.strip_prefix(manifest_dir_path).ok() else {
-            continue;
-        };
-        let candidate_path_length = path_from_manifest_dir.components().count();
-        // Pick the most specific manifest path
-        if let Some((path, current_length)) = &mut manifest_path {
-            if candidate_path_length > *current_length {
-                *path = Arc::from(manifest_dir_path);
-                *current_length = candidate_path_length;
-            }
-        } else {
-            manifest_path = Some((Arc::from(manifest_dir_path), candidate_path_length));
-        };
-
-        for target in package.targets {
-            let Some(bin_kind) = target
-                .kind
-                .iter()
-                .find_map(|kind| TargetKind::try_from(kind.as_ref()).ok())
-            else {
-                continue;
-            };
-            let target_path = PathBuf::from(target.src_path);
-            if target_path == abs_path {
-                return manifest_path.map(|(path, _)| {
-                    (
-                        package_name_from_pkgid(&package.id).map(|package_name| TargetInfo {
-                            package_name: package_name.to_owned(),
-                            target_name: target.name,
-                            required_features: target.required_features,
-                            target_kind: bin_kind,
-                        }),
-                        path,
-                    )
-                });
-            }
-        }
-    }
-
-    manifest_path.map(|(path, _)| (None, path))
-}
-
-async fn human_readable_package_name(
-    package_directory: &Path,
-    project_env: Option<&HashMap<String, String>>,
-) -> Option<String> {
-    let mut command = util::command::new_smol_command("cargo");
-    if let Some(envs) = project_env {
-        command.envs(envs);
-    }
-    let pkgid = String::from_utf8(
-        command
-            .current_dir(package_directory)
-            .arg("pkgid")
-            .output()
-            .await
-            .log_err()?
-            .stdout,
-    )
-    .ok()?;
-    Some(package_name_from_pkgid(&pkgid)?.to_owned())
-}
-
-// For providing local `cargo check -p $pkgid` task, we do not need most of the information we have returned.
-// Output example in the root of Zed project:
-// ```sh
-// ❯ cargo pkgid zed
-// path+file:///absolute/path/to/project/zed/crates/zed#0.131.0
-// ```
-// Another variant, if a project has a custom package name or hyphen in the name:
-// ```
-// path+file:///absolute/path/to/project/custom-package#my-custom-package@0.1.0
-// ```
-//
-// Extracts the package name from the output according to the spec:
-// https://doc.rust-lang.org/cargo/reference/pkgid-spec.html#specification-grammar
-fn package_name_from_pkgid(pkgid: &str) -> Option<&str> {
-    fn split_off_suffix(input: &str, suffix_start: char) -> &str {
-        match input.rsplit_once(suffix_start) {
-            Some((without_suffix, _)) => without_suffix,
-            None => input,
-        }
-    }
-
-    let (version_prefix, version_suffix) = pkgid.trim().rsplit_once('#')?;
-    let package_name = match version_suffix.rsplit_once('@') {
-        Some((custom_package_name, _version)) => custom_package_name,
-        None => {
-            let host_and_path = split_off_suffix(version_prefix, '?');
-            let (_, package_name) = host_and_path.rsplit_once('/')?;
-            package_name
-        }
-    };
-    Some(package_name)
-}
-
-async fn get_cached_server_binary(container_dir: PathBuf) -> Option<LanguageServerBinary> {
-    maybe!(async {
-        let mut last = None;
-        let mut entries = fs::read_dir(&container_dir).await?;
-        while let Some(entry) = entries.next().await {
-            let path = entry?.path();
-            if path.extension().is_some_and(|ext| ext == "metadata") {
-                continue;
-            }
-            last = Some(path);
-        }
-
-        let path = last.context("no cached binary")?;
-        let path = match RustLspAdapter::GITHUB_ASSET_KIND {
-            AssetKind::TarGz | AssetKind::Gz => path, // Tar and gzip extract in place.
-            AssetKind::Zip => path.join("rust-analyzer.exe"), // zip contains a .exe
-        };
-
-        anyhow::Ok(LanguageServerBinary {
-            path,
-            env: None,
-            arguments: Default::default(),
-        })
-    })
-    .await
-    .log_err()
-}
-
-fn test_fragment(variables: &TaskVariables, path: &Path, stem: &str) -> String {
-    let fragment = if stem == "lib" {
-        // This isn't quite right---it runs the tests for the entire library, rather than
-        // just for the top-level `mod tests`. But we don't really have the means here to
-        // filter out just that module.
-        Some("--lib".to_owned())
-    } else if stem == "mod" {
-        maybe!({ Some(path.parent()?.file_name()?.to_string_lossy().into_owned()) })
-    } else if stem == "main" {
-        if let (Some(bin_name), Some(bin_kind)) = (
-            variables.get(&RUST_BIN_NAME_TASK_VARIABLE),
-            variables.get(&RUST_BIN_KIND_TASK_VARIABLE),
-        ) {
-            Some(format!("--{bin_kind}={bin_name}"))
-        } else {
-            None
-        }
-    } else {
-        Some(stem.to_owned())
-    };
-    fragment.unwrap_or_else(|| "--".to_owned())
-}
-
-#[cfg(test)]
-mod tests {
-    use std::num::NonZeroU32;
-
-    use super::*;
-    use crate::language;
-    use gpui::{BorrowAppContext, Hsla, TestAppContext};
-    use lsp::CompletionItemLabelDetails;
-    use settings::SettingsStore;
-    use theme::SyntaxTheme;
-    use util::path;
-
-    #[gpui::test]
-    async fn test_process_rust_diagnostics() {
-        let mut params = lsp::PublishDiagnosticsParams {
-            uri: lsp::Uri::from_file_path(path!("/a")).unwrap(),
-            version: None,
-            diagnostics: vec![
-                // no newlines
-                lsp::Diagnostic {
-                    message: "use of moved value `a`".to_string(),
-                    ..Default::default()
-                },
-                // newline at the end of a code span
-                lsp::Diagnostic {
-                    message: "consider importing this struct: `use b::c;\n`".to_string(),
-                    ..Default::default()
-                },
-                // code span starting right after a newline
-                lsp::Diagnostic {
-                    message: "cannot borrow `self.d` as mutable\n`self` is a `&` reference"
-                        .to_string(),
-                    ..Default::default()
-                },
-            ],
-        };
-        RustLspAdapter.process_diagnostics(&mut params, LanguageServerId(0), None);
-
-        assert_eq!(params.diagnostics[0].message, "use of moved value `a`");
-
-        // remove trailing newline from code span
-        assert_eq!(
-            params.diagnostics[1].message,
-            "consider importing this struct: `use b::c;`"
-        );
-
-        // do not remove newline before the start of code span
-        assert_eq!(
-            params.diagnostics[2].message,
-            "cannot borrow `self.d` as mutable\n`self` is a `&` reference"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_rust_label_for_completion() {
-        let adapter = Arc::new(RustLspAdapter);
-        let language = language("rust", tree_sitter_rust::LANGUAGE.into());
-        let grammar = language.grammar().unwrap();
-        let theme = SyntaxTheme::new_test([
-            ("type", Hsla::default()),
-            ("keyword", Hsla::default()),
-            ("function", Hsla::default()),
-            ("property", Hsla::default()),
-        ]);
-
-        language.set_theme(&theme);
-
-        let highlight_function = grammar.highlight_id_for_name("function").unwrap();
-        let highlight_type = grammar.highlight_id_for_name("type").unwrap();
-        let highlight_keyword = grammar.highlight_id_for_name("keyword").unwrap();
-        let highlight_field = grammar.highlight_id_for_name("property").unwrap();
-
-        assert_eq!(
-            adapter
-                .label_for_completion(
-                    &lsp::CompletionItem {
-                        kind: Some(lsp::CompletionItemKind::FUNCTION),
-                        label: "hello(…)".to_string(),
-                        label_details: Some(CompletionItemLabelDetails {
-                            detail: Some("(use crate::foo)".into()),
-                            description: Some("fn(&mut Option<T>) -> Vec<T>".to_string())
-                        }),
-                        ..Default::default()
-                    },
-                    &language
-                )
-                .await,
-            Some(CodeLabel::new(
-                "hello(&mut Option<T>) -> Vec<T> (use crate::foo)".to_string(),
-                0..5,
-                vec![
-                    (0..5, highlight_function),
-                    (7..10, highlight_keyword),
-                    (11..17, highlight_type),
-                    (18..19, highlight_type),
-                    (25..28, highlight_type),
-                    (29..30, highlight_type),
-                ],
-            ))
-        );
-        assert_eq!(
-            adapter
-                .label_for_completion(
-                    &lsp::CompletionItem {
-                        kind: Some(lsp::CompletionItemKind::FUNCTION),
-                        label: "hello(…)".to_string(),
-                        label_details: Some(CompletionItemLabelDetails {
-                            detail: Some("(use crate::foo)".into()),
-                            description: Some("async fn(&mut Option<T>) -> Vec<T>".to_string()),
-                        }),
-                        ..Default::default()
-                    },
-                    &language
-                )
-                .await,
-            Some(CodeLabel::new(
-                "hello(&mut Option<T>) -> Vec<T> (use crate::foo)".to_string(),
-                0..5,
-                vec![
-                    (0..5, highlight_function),
-                    (7..10, highlight_keyword),
-                    (11..17, highlight_type),
-                    (18..19, highlight_type),
-                    (25..28, highlight_type),
-                    (29..30, highlight_type),
-                ],
-            ))
-        );
-        assert_eq!(
-            adapter
-                .label_for_completion(
-                    &lsp::CompletionItem {
-                        kind: Some(lsp::CompletionItemKind::FIELD),
-                        label: "len".to_string(),
-                        detail: Some("usize".to_string()),
-                        ..Default::default()
-                    },
-                    &language
-                )
-                .await,
-            Some(CodeLabel::new(
-                "len: usize".to_string(),
-                0..3,
-                vec![(0..3, highlight_field), (5..10, highlight_type),],
-            ))
-        );
-
-        assert_eq!(
-            adapter
-                .label_for_completion(
-                    &lsp::CompletionItem {
-                        kind: Some(lsp::CompletionItemKind::FUNCTION),
-                        label: "hello(…)".to_string(),
-                        label_details: Some(CompletionItemLabelDetails {
-                            detail: Some("(use crate::foo)".to_string()),
-                            description: Some("fn(&mut Option<T>) -> Vec<T>".to_string()),
-                        }),
-
-                        ..Default::default()
-                    },
-                    &language
-                )
-                .await,
-            Some(CodeLabel::new(
-                "hello(&mut Option<T>) -> Vec<T> (use crate::foo)".to_string(),
-                0..5,
-                vec![
-                    (0..5, highlight_function),
-                    (7..10, highlight_keyword),
-                    (11..17, highlight_type),
-                    (18..19, highlight_type),
-                    (25..28, highlight_type),
-                    (29..30, highlight_type),
-                ],
-            ))
-        );
-
-        assert_eq!(
-            adapter
-                .label_for_completion(
-                    &lsp::CompletionItem {
-                        kind: Some(lsp::CompletionItemKind::FUNCTION),
-                        label: "hello".to_string(),
-                        label_details: Some(CompletionItemLabelDetails {
-                            detail: Some("(use crate::foo)".to_string()),
-                            description: Some("fn(&mut Option<T>) -> Vec<T>".to_string()),
-                        }),
-                        ..Default::default()
-                    },
-                    &language
-                )
-                .await,
-            Some(CodeLabel::new(
-                "hello(&mut Option<T>) -> Vec<T> (use crate::foo)".to_string(),
-                0..5,
-                vec![
-                    (0..5, highlight_function),
-                    (7..10, highlight_keyword),
-                    (11..17, highlight_type),
-                    (18..19, highlight_type),
-                    (25..28, highlight_type),
-                    (29..30, highlight_type),
-                ],
-            ))
-        );
-
-        assert_eq!(
-            adapter
-                .label_for_completion(
-                    &lsp::CompletionItem {
-                        kind: Some(lsp::CompletionItemKind::METHOD),
-                        label: "await.as_deref_mut()".to_string(),
-                        filter_text: Some("as_deref_mut".to_string()),
-                        label_details: Some(CompletionItemLabelDetails {
-                            detail: None,
-                            description: Some("fn(&mut self) -> IterMut<'_, T>".to_string()),
-                        }),
-                        ..Default::default()
-                    },
-                    &language
-                )
-                .await,
-            Some(CodeLabel::new(
-                "await.as_deref_mut(&mut self) -> IterMut<'_, T>".to_string(),
-                6..18,
-                vec![
-                    (6..18, HighlightId(2)),
-                    (20..23, HighlightId(1)),
-                    (33..40, HighlightId(0)),
-                    (45..46, HighlightId(0))
-                ],
-            ))
-        );
-
-        assert_eq!(
-            adapter
-                .label_for_completion(
-                    &lsp::CompletionItem {
-                        kind: Some(lsp::CompletionItemKind::METHOD),
-                        label: "as_deref_mut()".to_string(),
-                        filter_text: Some("as_deref_mut".to_string()),
-                        label_details: Some(CompletionItemLabelDetails {
-                            detail: None,
-                            description: Some(
-                                "pub fn as_deref_mut(&mut self) -> IterMut<'_, T>".to_string()
-                            ),
-                        }),
-                        ..Default::default()
-                    },
-                    &language
-                )
-                .await,
-            Some(CodeLabel::new(
-                "pub fn as_deref_mut(&mut self) -> IterMut<'_, T>".to_string(),
-                7..19,
-                vec![
-                    (0..3, HighlightId(1)),
-                    (4..6, HighlightId(1)),
-                    (7..19, HighlightId(2)),
-                    (21..24, HighlightId(1)),
-                    (34..41, HighlightId(0)),
-                    (46..47, HighlightId(0))
-                ],
-            ))
-        );
-
-        assert_eq!(
-            adapter
-                .label_for_completion(
-                    &lsp::CompletionItem {
-                        kind: Some(lsp::CompletionItemKind::FIELD),
-                        label: "inner_value".to_string(),
-                        filter_text: Some("value".to_string()),
-                        detail: Some("String".to_string()),
-                        ..Default::default()
-                    },
-                    &language,
-                )
-                .await,
-            Some(CodeLabel::new(
-                "inner_value: String".to_string(),
-                6..11,
-                vec![(0..11, HighlightId(3)), (13..19, HighlightId(0))],
-            ))
-        );
-
-        // Snippet with insert tabstop (empty placeholder)
-        assert_eq!(
-            adapter
-                .label_for_completion(
-                    &lsp::CompletionItem {
-                        kind: Some(lsp::CompletionItemKind::SNIPPET),
-                        label: "println!".to_string(),
-                        insert_text_format: Some(lsp::InsertTextFormat::SNIPPET),
-                        text_edit: Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
-                            range: lsp::Range::default(),
-                            new_text: "println!(\"$1\", $2)$0".to_string(),
-                        })),
-                        ..Default::default()
-                    },
-                    &language,
-                )
-                .await,
-            Some(CodeLabel::new(
-                "println!(\"…\", …)".to_string(),
-                0..8,
-                vec![
-                    (10..13, HighlightId::TABSTOP_INSERT_ID),
-                    (16..19, HighlightId::TABSTOP_INSERT_ID),
-                    (0..7, HighlightId(2)),
-                    (7..8, HighlightId(2)),
-                ],
-            ))
-        );
-
-        // Snippet with replace tabstop (placeholder with default text)
-        assert_eq!(
-            adapter
-                .label_for_completion(
-                    &lsp::CompletionItem {
-                        kind: Some(lsp::CompletionItemKind::SNIPPET),
-                        label: "vec!".to_string(),
-                        insert_text_format: Some(lsp::InsertTextFormat::SNIPPET),
-                        text_edit: Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
-                            range: lsp::Range::default(),
-                            new_text: "vec![${1:elem}]$0".to_string(),
-                        })),
-                        ..Default::default()
-                    },
-                    &language,
-                )
-                .await,
-            Some(CodeLabel::new(
-                "vec![elem]".to_string(),
-                0..4,
-                vec![
-                    (5..9, HighlightId::TABSTOP_REPLACE_ID),
-                    (0..3, HighlightId(2)),
-                    (3..4, HighlightId(2)),
-                ],
-            ))
-        );
-
-        // Snippet with tabstop appearing more than once
-        assert_eq!(
-            adapter
-                .label_for_completion(
-                    &lsp::CompletionItem {
-                        kind: Some(lsp::CompletionItemKind::SNIPPET),
-                        label: "if let".to_string(),
-                        insert_text_format: Some(lsp::InsertTextFormat::SNIPPET),
-                        text_edit: Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
-                            range: lsp::Range::default(),
-                            new_text: "if let ${1:pat} = $1 {\n    $0\n}".to_string(),
-                        })),
-                        ..Default::default()
-                    },
-                    &language,
-                )
-                .await,
-            Some(CodeLabel::new(
-                "if let pat = … {\n    \n}".to_string(),
-                0..6,
-                vec![
-                    (7..10, HighlightId::TABSTOP_REPLACE_ID),
-                    (13..16, HighlightId::TABSTOP_INSERT_ID),
-                    (0..2, HighlightId(1)),
-                    (3..6, HighlightId(1)),
-                ],
-            ))
-        );
-
-        // Snippet with tabstops not in left-to-right order
-        assert_eq!(
-            adapter
-                .label_for_completion(
-                    &lsp::CompletionItem {
-                        kind: Some(lsp::CompletionItemKind::SNIPPET),
-                        label: "for".to_string(),
-                        insert_text_format: Some(lsp::InsertTextFormat::SNIPPET),
-                        text_edit: Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
-                            range: lsp::Range::default(),
-                            new_text: "for ${2:item} in ${1:iter} {\n    $0\n}".to_string(),
-                        })),
-                        ..Default::default()
-                    },
-                    &language,
-                )
-                .await,
-            Some(CodeLabel::new(
-                "for item in iter {\n    \n}".to_string(),
-                0..3,
-                vec![
-                    (4..8, HighlightId::TABSTOP_REPLACE_ID),
-                    (12..16, HighlightId::TABSTOP_REPLACE_ID),
-                    (0..3, HighlightId(1)),
-                    (9..11, HighlightId(1)),
-                ],
-            ))
-        );
-    }
-
-    #[gpui::test]
-    async fn test_rust_label_for_symbol() {
-        let adapter = Arc::new(RustLspAdapter);
-        let language = language("rust", tree_sitter_rust::LANGUAGE.into());
-        let grammar = language.grammar().unwrap();
-        let theme = SyntaxTheme::new_test([
-            ("type", Hsla::default()),
-            ("keyword", Hsla::default()),
-            ("function", Hsla::default()),
-            ("property", Hsla::default()),
-        ]);
-
-        language.set_theme(&theme);
-
-        let highlight_function = grammar.highlight_id_for_name("function").unwrap();
-        let highlight_type = grammar.highlight_id_for_name("type").unwrap();
-        let highlight_keyword = grammar.highlight_id_for_name("keyword").unwrap();
-
-        assert_eq!(
-            adapter
-                .label_for_symbol("hello", lsp::SymbolKind::FUNCTION, &language)
-                .await,
-            Some(CodeLabel::new(
-                "fn hello".to_string(),
-                3..8,
-                vec![(0..2, highlight_keyword), (3..8, highlight_function)],
-            ))
-        );
-
-        assert_eq!(
-            adapter
-                .label_for_symbol("World", lsp::SymbolKind::TYPE_PARAMETER, &language)
-                .await,
-            Some(CodeLabel::new(
-                "type World".to_string(),
-                5..10,
-                vec![(0..4, highlight_keyword), (5..10, highlight_type)],
-            ))
-        );
-    }
-
-    #[gpui::test]
-    async fn test_rust_autoindent(cx: &mut TestAppContext) {
-        // cx.executor().set_block_on_ticks(usize::MAX..=usize::MAX);
-        cx.update(|cx| {
-            let test_settings = SettingsStore::test(cx);
-            cx.set_global(test_settings);
-            cx.update_global::<SettingsStore, _>(|store, cx| {
-                store.update_user_settings(cx, |s| {
-                    s.project.all_languages.defaults.tab_size = NonZeroU32::new(2);
-                });
-            });
-        });
-
-        let language = crate::language("rust", tree_sitter_rust::LANGUAGE.into());
-
-        cx.new(|cx| {
-            let mut buffer = Buffer::local("", cx).with_language(language, cx);
-
-            // indent between braces
-            buffer.set_text("fn a() {}", cx);
-            let ix = buffer.len() - 1;
-            buffer.edit([(ix..ix, "\n\n")], Some(AutoindentMode::EachLine), cx);
-            assert_eq!(buffer.text(), "fn a() {\n  \n}");
-
-            // indent between braces, even after empty lines
-            buffer.set_text("fn a() {\n\n\n}", cx);
-            let ix = buffer.len() - 2;
-            buffer.edit([(ix..ix, "\n")], Some(AutoindentMode::EachLine), cx);
-            assert_eq!(buffer.text(), "fn a() {\n\n\n  \n}");
-
-            // indent a line that continues a field expression
-            buffer.set_text("fn a() {\n  \n}", cx);
-            let ix = buffer.len() - 2;
-            buffer.edit([(ix..ix, "b\n.c")], Some(AutoindentMode::EachLine), cx);
-            assert_eq!(buffer.text(), "fn a() {\n  b\n    .c\n}");
-
-            // indent further lines that continue the field expression, even after empty lines
-            let ix = buffer.len() - 2;
-            buffer.edit([(ix..ix, "\n\n.d")], Some(AutoindentMode::EachLine), cx);
-            assert_eq!(buffer.text(), "fn a() {\n  b\n    .c\n    \n    .d\n}");
-
-            // dedent the line after the field expression
-            let ix = buffer.len() - 2;
-            buffer.edit([(ix..ix, ";\ne")], Some(AutoindentMode::EachLine), cx);
-            assert_eq!(
-                buffer.text(),
-                "fn a() {\n  b\n    .c\n    \n    .d;\n  e\n}"
-            );
-
-            // indent inside a struct within a call
-            buffer.set_text("const a: B = c(D {});", cx);
-            let ix = buffer.len() - 3;
-            buffer.edit([(ix..ix, "\n\n")], Some(AutoindentMode::EachLine), cx);
-            assert_eq!(buffer.text(), "const a: B = c(D {\n  \n});");
-
-            // indent further inside a nested call
-            let ix = buffer.len() - 4;
-            buffer.edit([(ix..ix, "e: f(\n\n)")], Some(AutoindentMode::EachLine), cx);
-            assert_eq!(buffer.text(), "const a: B = c(D {\n  e: f(\n    \n  )\n});");
-
-            // keep that indent after an empty line
-            let ix = buffer.len() - 8;
-            buffer.edit([(ix..ix, "\n")], Some(AutoindentMode::EachLine), cx);
-            assert_eq!(
-                buffer.text(),
-                "const a: B = c(D {\n  e: f(\n    \n    \n  )\n});"
-            );
-
-            buffer
-        });
-    }
-
-    #[test]
-    fn test_package_name_from_pkgid() {
-        for (input, expected) in [
-            (
-                "path+file:///absolute/path/to/project/zed/crates/zed#0.131.0",
-                "zed",
-            ),
-            (
-                "path+file:///absolute/path/to/project/custom-package#my-custom-package@0.1.0",
-                "my-custom-package",
-            ),
-        ] {
-            assert_eq!(package_name_from_pkgid(input), Some(expected));
-        }
-    }
-
-    #[test]
-    fn test_target_info_from_metadata() {
-        for (input, absolute_path, expected) in [
-            (
-                r#"{"packages":[{"id":"path+file:///absolute/path/to/project/zed/crates/zed#0.131.0","manifest_path":"/path/to/zed/Cargo.toml","targets":[{"name":"zed","kind":["bin"],"src_path":"/path/to/zed/src/main.rs"}]}]}"#,
-                "/path/to/zed/src/main.rs",
-                Some((
-                    Some(TargetInfo {
-                        package_name: "zed".into(),
-                        target_name: "zed".into(),
-                        required_features: Vec::new(),
-                        target_kind: TargetKind::Bin,
-                    }),
-                    Arc::from("/path/to/zed".as_ref()),
-                )),
-            ),
-            (
-                r#"{"packages":[{"id":"path+file:///path/to/custom-package#my-custom-package@0.1.0","manifest_path":"/path/to/custom-package/Cargo.toml","targets":[{"name":"my-custom-bin","kind":["bin"],"src_path":"/path/to/custom-package/src/main.rs"}]}]}"#,
-                "/path/to/custom-package/src/main.rs",
-                Some((
-                    Some(TargetInfo {
-                        package_name: "my-custom-package".into(),
-                        target_name: "my-custom-bin".into(),
-                        required_features: Vec::new(),
-                        target_kind: TargetKind::Bin,
-                    }),
-                    Arc::from("/path/to/custom-package".as_ref()),
-                )),
-            ),
-            (
-                r#"{"packages":[{"id":"path+file:///path/to/custom-package#my-custom-package@0.1.0","targets":[{"name":"my-custom-bin","kind":["example"],"src_path":"/path/to/custom-package/src/main.rs"}],"manifest_path":"/path/to/custom-package/Cargo.toml"}]}"#,
-                "/path/to/custom-package/src/main.rs",
-                Some((
-                    Some(TargetInfo {
-                        package_name: "my-custom-package".into(),
-                        target_name: "my-custom-bin".into(),
-                        required_features: Vec::new(),
-                        target_kind: TargetKind::Example,
-                    }),
-                    Arc::from("/path/to/custom-package".as_ref()),
-                )),
-            ),
-            (
-                r#"{"packages":[{"id":"path+file:///path/to/custom-package#my-custom-package@0.1.0","manifest_path":"/path/to/custom-package/Cargo.toml","targets":[{"name":"my-custom-bin","kind":["example"],"src_path":"/path/to/custom-package/src/main.rs","required-features":["foo","bar"]}]}]}"#,
-                "/path/to/custom-package/src/main.rs",
-                Some((
-                    Some(TargetInfo {
-                        package_name: "my-custom-package".into(),
-                        target_name: "my-custom-bin".into(),
-                        required_features: vec!["foo".to_owned(), "bar".to_owned()],
-                        target_kind: TargetKind::Example,
-                    }),
-                    Arc::from("/path/to/custom-package".as_ref()),
-                )),
-            ),
-            (
-                r#"{"packages":[{"id":"path+file:///path/to/custom-package#my-custom-package@0.1.0","targets":[{"name":"my-custom-bin","kind":["example"],"src_path":"/path/to/custom-package/src/main.rs","required-features":[]}],"manifest_path":"/path/to/custom-package/Cargo.toml"}]}"#,
-                "/path/to/custom-package/src/main.rs",
-                Some((
-                    Some(TargetInfo {
-                        package_name: "my-custom-package".into(),
-                        target_name: "my-custom-bin".into(),
-                        required_features: vec![],
-                        target_kind: TargetKind::Example,
-                    }),
-                    Arc::from("/path/to/custom-package".as_ref()),
-                )),
-            ),
-            (
-                r#"{"packages":[{"id":"path+file:///path/to/custom-package#my-custom-package@0.1.0","targets":[{"name":"my-custom-package","kind":["lib"],"src_path":"/path/to/custom-package/src/main.rs"}],"manifest_path":"/path/to/custom-package/Cargo.toml"}]}"#,
-                "/path/to/custom-package/src/main.rs",
-                Some((None, Arc::from("/path/to/custom-package".as_ref()))),
-            ),
-        ] {
-            let metadata: CargoMetadata = serde_json::from_str(input).context(input).unwrap();
-
-            let absolute_path = Path::new(absolute_path);
-
-            assert_eq!(target_info_from_metadata(metadata, absolute_path), expected);
-        }
-    }
-
-    #[test]
-    fn test_rust_test_fragment() {
-        #[track_caller]
-        fn check(
-            variables: impl IntoIterator<Item = (VariableName, &'static str)>,
-            path: &str,
-            expected: &str,
-        ) {
-            let path = Path::new(path);
-            let found = test_fragment(
-                &TaskVariables::from_iter(variables.into_iter().map(|(k, v)| (k, v.to_owned()))),
-                path,
-                path.file_stem().unwrap().to_str().unwrap(),
-            );
-            assert_eq!(expected, found);
-        }
-
-        check([], "/project/src/lib.rs", "--lib");
-        check([], "/project/src/foo/mod.rs", "foo");
-        check(
-            [
-                (RUST_BIN_KIND_TASK_VARIABLE.clone(), "bin"),
-                (RUST_BIN_NAME_TASK_VARIABLE, "x"),
-            ],
-            "/project/src/main.rs",
-            "--bin=x",
-        );
-        check([], "/project/src/main.rs", "--");
-    }
-}
diff --git a/crates/languages/src/rust/brackets.scm b/crates/languages/src/rust/brackets.scm
deleted file mode 100644
index 7a35adb100..0000000000
--- a/crates/languages/src/rust/brackets.scm
+++ /dev/null
@@ -1,7 +0,0 @@
-("(" @open ")" @close)
-("[" @open "]" @close)
-("{" @open "}" @close)
-("<" @open ">" @close)
-(closure_parameters "|" @open "|" @close)
-(("\"" @open "\"" @close) (#set! rainbow.exclude))
-(("'" @open "'" @close) (#set! rainbow.exclude))
diff --git a/crates/languages/src/rust/config.toml b/crates/languages/src/rust/config.toml
deleted file mode 100644
index 826a219e98..0000000000
--- a/crates/languages/src/rust/config.toml
+++ /dev/null
@@ -1,21 +0,0 @@
-name = "Rust"
-grammar = "rust"
-path_suffixes = ["rs"]
-line_comments = ["// ", "/// ", "//! "]
-autoclose_before = ";:.,=}])>"
-brackets = [
-    { start = "{", end = "}", close = true, newline = true },
-    { start = "r#\"", end = "\"#", close = true, newline = true, not_in = ["string", "comment"] },
-    { start = "r##\"", end = "\"##", close = true, newline = true, not_in = ["string", "comment"] },
-    { start = "r###\"", end = "\"###", close = true, newline = true, not_in = ["string", "comment"] },
-    { start = "[", end = "]", close = true, newline = true },
-    { start = "(", end = ")", close = true, newline = true },
-    { start = "<", end = ">", close = false, newline = true, not_in = ["string", "comment"] },
-    { start = "\"", end = "\"", close = true, newline = false, not_in = ["string"] },
-    { start = "/*", end = " */", close = true, newline = false, not_in = ["string", "comment"] },
-]
-collapsed_placeholder = " /* ... */ "
-debuggers = ["CodeLLDB", "GDB"]
-documentation_comment = { start = "/*", prefix = "* ", end = "*/", tab_size = 1 }
-ignored_import_segments = ["crate", "super"]
-import_path_strip_regex = "/(lib|mod)\\.rs$"
diff --git a/crates/languages/src/rust/debugger.scm b/crates/languages/src/rust/debugger.scm
deleted file mode 100644
index 5347413f69..0000000000
--- a/crates/languages/src/rust/debugger.scm
+++ /dev/null
@@ -1,50 +0,0 @@
-(metavariable) @debug-variable
-
-(parameter (identifier) @debug-variable)
-
-(self) @debug-variable
-
-(static_item (identifier) @debug-variable)
-(const_item (identifier) @debug-variable)
-
-(let_declaration pattern: (identifier) @debug-variable)
-
-(let_condition (identifier) @debug-variable)
-
-(match_arm (identifier) @debug-variable)
-
-(for_expression (identifier) @debug-variable)
-
-(closure_parameters (identifier) @debug-variable)
-
-(assignment_expression (identifier) @debug-variable)
-
-(field_expression (identifier) @debug-variable)
-
-(binary_expression (identifier) @debug-variable
-  (#not-match? @debug-variable "^[A-Z]"))
-
-(reference_expression (identifier) @debug-variable
-  (#not-match? @debug-variable "^[A-Z]"))
-
-(array_expression (identifier) @debug-variable)
-(tuple_expression (identifier) @debug-variable)
-(return_expression (identifier) @debug-variable)
-(await_expression (identifier) @debug-variable)
-(try_expression (identifier) @debug-variable)
-(index_expression (identifier) @debug-variable)
-(range_expression (identifier) @debug-variable)
-(unary_expression (identifier) @debug-variable)
-
-(if_expression (identifier) @debug-variable)
-(while_expression (identifier) @debug-variable)
-
-(parenthesized_expression (identifier) @debug-variable)
-
-(arguments (identifier) @debug-variable
-  (#not-match? @debug-variable "^[A-Z]"))
-
-(macro_invocation (token_tree (identifier) @debug-variable
-  (#not-match? @debug-variable "^[A-Z]")))
-
-(block) @debug-scope
diff --git a/crates/languages/src/rust/embedding.scm b/crates/languages/src/rust/embedding.scm
deleted file mode 100644
index 286b1d1357..0000000000
--- a/crates/languages/src/rust/embedding.scm
+++ /dev/null
@@ -1,32 +0,0 @@
-(
-    [(line_comment) (attribute_item)]* @context
-    .
-    [
-
-        (struct_item
-            name: (_) @name)
-
-        (enum_item
-            name: (_) @name)
-
-        (impl_item
-            trait: (_)? @name
-            "for"? @name
-            type: (_) @name)
-
-        (trait_item
-            name: (_) @name)
-
-        (function_item
-            name: (_) @name
-            body: (block
-                "{" @keep
-                "}" @keep) @collapse)
-
-        (macro_definition
-            name: (_) @name)
-        ] @item
-    )
-
-(attribute_item) @collapse
-(use_declaration) @collapse
diff --git a/crates/languages/src/rust/highlights.scm b/crates/languages/src/rust/highlights.scm
deleted file mode 100644
index 1a08126b55..0000000000
--- a/crates/languages/src/rust/highlights.scm
+++ /dev/null
@@ -1,219 +0,0 @@
-(identifier) @variable
-(metavariable) @variable
-(type_identifier) @type
-(fragment_specifier) @type
-(primitive_type) @type.builtin
-(self) @variable.special
-(field_identifier) @property
-(shorthand_field_identifier) @property
-
-(trait_item name: (type_identifier) @type.interface)
-(impl_item trait: (type_identifier) @type.interface)
-(abstract_type trait: (type_identifier) @type.interface)
-(dynamic_type trait: (type_identifier) @type.interface)
-(trait_bounds (type_identifier) @type.interface)
-
-(call_expression
-  function: [
-    (identifier) @function
-    (scoped_identifier
-      name: (identifier) @function)
-    (field_expression
-      field: (field_identifier) @function.method)
-  ])
-
-(generic_function
-  function: [
-    (identifier) @function
-    (scoped_identifier
-      name: (identifier) @function)
-    (field_expression
-      field: (field_identifier) @function.method)
-  ])
-
-(function_item name: (identifier) @function.definition)
-(function_signature_item name: (identifier) @function.definition)
-
-(macro_invocation
-  macro: [
-    (identifier) @function.special
-    (scoped_identifier
-      name: (identifier) @function.special)
-  ])
-
-(macro_invocation
-  "!" @function.special)
-
-(macro_definition
-  name: (identifier) @function.special.definition)
-
-; Identifier conventions
-
-; Assume uppercase names are types/enum-constructors
-((identifier) @type
- (#match? @type "^[A-Z]"))
-
-; Assume all-caps names are constants
-((identifier) @constant
- (#match? @constant "^_*[A-Z][A-Z\\d_]*$"))
-
-[
-  "("
-  ")"
-  "{"
-  "}"
-  "["
-  "]"
-] @punctuation.bracket
-
-(_
-  .
-  "<" @punctuation.bracket
-  ">" @punctuation.bracket)
-
-[
-  "."
-  ";"
-  ","
-  "::"
-] @punctuation.delimiter
-
-[
-  "#"
-] @punctuation.special
-
-[
-  "as"
-  "async"
-  "const"
-  "default"
-  "dyn"
-  "enum"
-  "extern"
-  "fn"
-  "impl"
-  "let"
-  "macro_rules!"
-  "mod"
-  "move"
-  "pub"
-  "raw"
-  "ref"
-  "static"
-  "struct"
-  "for"
-  "trait"
-  "type"
-  "union"
-  "unsafe"
-  "use"
-  "where"
-  (crate)
-  (mutable_specifier)
-  (super)
-] @keyword
-
-[
-  "await"
-  "break"
-  "continue"
-  "else"
-  "if"
-  "in"
-  "loop"
-  "match"
-  "return"
-  "while"
-  "yield"
-] @keyword.control
-
-(for_expression
-  ("for" @keyword.control))
-
-[
-  (string_literal)
-  (raw_string_literal)
-  (char_literal)
-] @string
-
-(escape_sequence) @string.escape
-
-[
-  (integer_literal)
-  (float_literal)
-] @number
-
-(boolean_literal) @boolean
-
-[
-  (line_comment)
-  (block_comment)
-] @comment
-
-[
-  (line_comment (doc_comment))
-  (block_comment (doc_comment))
-] @comment.doc
-
-[
-  "!="
-  "%"
-  "%="
-  "&"
-  "&="
-  "&&"
-  "*"
-  "*="
-  "+"
-  "+="
-  "-"
-  "-="
-  "->"
-  ".."
-  "..="
-  "..."
-  "/="
-  ":"
-  "<<"
-  "<<="
-  "<"
-  "<="
-  "="
-  "=="
-  "=>"
-  ">"
-  ">="
-  ">>"
-  ">>="
-  "@"
-  "^"
-  "^="
-  "|"
-  "|="
-  "||"
-  "?"
-] @operator
-
-; Avoid highlighting these as operators when used in doc comments.
-(unary_expression "!" @operator)
-operator: "/" @operator
-
-(lifetime
-  "'" @lifetime
-  (identifier) @lifetime)
-
-(parameter (identifier) @variable.parameter)
-
-(attribute_item (attribute [
-  (identifier) @attribute
-  (scoped_identifier name: (identifier) @attribute)
-  (token_tree (identifier) @attribute (#match? @attribute "^[a-z\\d_]*$"))
-  (token_tree (identifier) @none "::" (#match? @none "^[a-z\\d_]*$"))
-]))
-
-(inner_attribute_item (attribute [
-  (identifier) @attribute
-  (scoped_identifier name: (identifier) @attribute)
-  (token_tree (identifier) @attribute (#match? @attribute "^[a-z\\d_]*$"))
-  (token_tree (identifier) @none "::" (#match? @none "^[a-z\\d_]*$"))
-]))
diff --git a/crates/languages/src/rust/imports.scm b/crates/languages/src/rust/imports.scm
deleted file mode 100644
index 3ce6a4f073..0000000000
--- a/crates/languages/src/rust/imports.scm
+++ /dev/null
@@ -1,27 +0,0 @@
-(use_declaration) @import
-
-(scoped_use_list
-    path: (_) @namespace
-    list: (_) @list)
-
-(scoped_identifier
-    path: (_) @namespace
-    name: (identifier) @name)
-
-(use_list (identifier) @name)
-
-(use_declaration (identifier) @name)
-
-(use_as_clause
-    path: (scoped_identifier
-       path: (_) @namespace
-       name: (_) @name)
-    alias: (_) @alias)
-
-(use_as_clause
-    path: (identifier) @name
-    alias: (_) @alias)
-
-(use_wildcard
-    (_)? @namespace
-    "*" @wildcard)
diff --git a/crates/languages/src/rust/indents.scm b/crates/languages/src/rust/indents.scm
deleted file mode 100644
index 9ab6b02908..0000000000
--- a/crates/languages/src/rust/indents.scm
+++ /dev/null
@@ -1,14 +0,0 @@
-[
-    ((where_clause) _ @end)
-    (field_expression)
-    (call_expression)
-    (assignment_expression)
-    (let_declaration)
-    (let_chain)
-    (await_expression)
-] @indent
-
-(_ "[" "]" @end) @indent
-(_ "<" ">" @end) @indent
-(_ "{" "}" @end) @indent
-(_ "(" ")" @end) @indent
diff --git a/crates/languages/src/rust/injections.scm b/crates/languages/src/rust/injections.scm
deleted file mode 100644
index a69e55edc9..0000000000
--- a/crates/languages/src/rust/injections.scm
+++ /dev/null
@@ -1,63 +0,0 @@
-([
-    (line_comment)
-    (block_comment)
-] @injection.content
-    (#set! injection.language "comment"))
-
-(macro_invocation
-    macro: [
-        ((identifier) @_macro_name)
-        (scoped_identifier (identifier) @_macro_name .)
-    ]
-    (token_tree) @injection.content
-    (#set! injection.language "rust"))
-
-; we need a better way for the leptos extension to declare that
-; it wants to inject inside of rust, instead of modifying the rust
-; injections to support leptos injections
-(macro_invocation
-    macro: [
-        ((identifier) @_macro_name)
-        (scoped_identifier (identifier) @_macro_name .)
-    ]
-    (#any-of? @_macro_name "view" "html")
-    (token_tree) @injection.content
-    (#set! injection.language "rstml")
-    )
-
-(macro_invocation
-    macro: [
-        ((identifier) @_macro_name)
-        (scoped_identifier (identifier) @_macro_name .)
-    ]
-    (#any-of? @_macro_name "sql")
-    (_) @injection.content
-    (#set! injection.language "sql")
-    )
-
-; lazy_regex
-(macro_invocation
-    macro: [
-        ((identifier) @_macro_name)
-        (scoped_identifier (identifier) @_macro_name .)
-    ]
-    (token_tree [
-        (string_literal (string_content) @injection.content)
-        (raw_string_literal (string_content) @injection.content)
-    ])
-    (#set! injection.language "regex")
-    (#any-of? @_macro_name "regex" "bytes_regex")
-)
-
-(call_expression
-    function: (scoped_identifier) @_fn_path
-    arguments: (arguments
-        [
-            (string_literal (string_content) @injection.content)
-            (raw_string_literal (string_content) @injection.content)
-        ]
-    )
-
-    (#match? @_fn_path ".*Regex(Builder)?::new")
-    (#set! injection.language "regex")
-)
diff --git a/crates/languages/src/rust/outline.scm b/crates/languages/src/rust/outline.scm
deleted file mode 100644
index a99f53dd2b..0000000000
--- a/crates/languages/src/rust/outline.scm
+++ /dev/null
@@ -1,73 +0,0 @@
-(attribute_item) @annotation
-(line_comment) @annotation
-
-(struct_item
-    (visibility_modifier)? @context
-    "struct" @context
-    name: (_) @name) @item
-
-(enum_item
-    (visibility_modifier)? @context
-    "enum" @context
-    name: (_) @name) @item
-
-(enum_variant
-    (visibility_modifier)? @context
-    name: (_) @name) @item
-
-(impl_item
-    "impl" @context
-    trait: (_)? @name
-    "for"? @context
-    type: (_) @name
-    body: (_ . "{" @open "}" @close .)) @item
-
-(trait_item
-    (visibility_modifier)? @context
-    "trait" @context
-    name: (_) @name) @item
-
-(function_item
-    (visibility_modifier)? @context
-    (function_modifiers)? @context
-    "fn" @context
-    name: (_) @name
-    body: (_ . "{" @open "}" @close .)) @item
-
-(function_signature_item
-    (visibility_modifier)? @context
-    (function_modifiers)? @context
-    "fn" @context
-    name: (_) @name) @item
-
-(macro_definition
-    . "macro_rules!" @context
-    name: (_) @name) @item
-
-(mod_item
-    (visibility_modifier)? @context
-    "mod" @context
-    name: (_) @name) @item
-
-(type_item
-    (visibility_modifier)? @context
-    "type" @context
-    name: (_) @name) @item
-
-(associated_type
-    "type" @context
-    name: (_) @name) @item
-
-(const_item
-    (visibility_modifier)? @context
-    "const" @context
-    name: (_) @name) @item
-
-(static_item
-    (visibility_modifier)? @context
-    "static" @context
-    name: (_) @name) @item
-
-(field_declaration
-    (visibility_modifier)? @context
-    name: (_) @name) @item
diff --git a/crates/languages/src/rust/overrides.scm b/crates/languages/src/rust/overrides.scm
deleted file mode 100644
index 91fa6139d3..0000000000
--- a/crates/languages/src/rust/overrides.scm
+++ /dev/null
@@ -1,8 +0,0 @@
-[
-  (string_literal)
-  (raw_string_literal)
-] @string
-[
-  (line_comment)
-  (block_comment)
-] @comment.inclusive
diff --git a/crates/languages/src/rust/runnables.scm b/crates/languages/src/rust/runnables.scm
deleted file mode 100644
index 7c15716144..0000000000
--- a/crates/languages/src/rust/runnables.scm
+++ /dev/null
@@ -1,92 +0,0 @@
-; Rust mod test
-(
-    (attribute_item (attribute
-        (
-          (identifier) @_attribute)
-          arguments: (
-              (token_tree (identifier) @_test)
-              (#eq? @_test "test")
-          )
-        )
-        (#eq? @_attribute "cfg")
-    )
-    .
-    (mod_item
-        name: (_) @run
-    )
-    (#set! tag rust-mod-test)
-)
-
-; Rust test
-(
-    (
-        (attribute_item (attribute
-            [((identifier) @_attribute)
-                (scoped_identifier (identifier) @_attribute)
-                ])
-            (#match? @_attribute "test")
-        ) @_start
-        .
-        (attribute_item) *
-        .
-        [(line_comment) (block_comment)] *
-        .
-        (function_item
-            name: (_) @run @_test_name
-            body: _
-        ) @_end
-    )
-    (#set! tag rust-test)
-)
-
-; Rust doc test
-(
-    (
-        (line_comment) *
-        (line_comment
-            doc: (_) @_comment_content
-        ) @_start @run
-        (#match? @_comment_content "```")
-        .
-        (line_comment) *
-        .
-        (line_comment
-            doc: (_) @_end_comment_content
-        ) @_end_code_block
-        (#match? @_end_comment_content "```")
-        .
-        (line_comment) *
-        (attribute_item) *
-        .
-        [(function_item
-            name: (_)  @_doc_test_name
-            body: _
-        ) (function_signature_item
-            name: (_) @_doc_test_name
-        ) (struct_item
-            name: (_) @_doc_test_name
-        ) (enum_item
-            name: (_) @_doc_test_name
-            body: _
-        ) (
-            (attribute_item) ?
-            (macro_definition
-                name: (_) @_doc_test_name)
-        ) (mod_item
-            name: (_) @_doc_test_name
-        )] @_end
-    )
-    (#set! tag rust-doc-test)
-)
-
-; Rust main function
-(
-    (
-        (function_item
-            name: (_) @run
-            body: _
-        ) @_rust_main_function_end
-        (#eq? @run "main")
-    )
-    (#set! tag rust-main)
-)
diff --git a/crates/languages/src/rust/textobjects.scm b/crates/languages/src/rust/textobjects.scm
deleted file mode 100644
index 4e7e7fa0cd..0000000000
--- a/crates/languages/src/rust/textobjects.scm
+++ /dev/null
@@ -1,51 +0,0 @@
-; functions
-(function_signature_item) @function.around
-
-(function_item
-    body: (_
-        "{"
-        (_)* @function.inside
-        "}" )) @function.around
-
-; classes
-(struct_item
-    body: (_
-        ["{" "("]?
-        [(_) ","?]* @class.inside
-        ["}" ")"]? )) @class.around
-
-(enum_item
-   body: (_
-       "{"
-       [(_) ","?]* @class.inside
-       "}" )) @class.around
-
-(union_item
-    body: (_
-        "{"
-        [(_) ","?]* @class.inside
-        "}" )) @class.around
-
-(trait_item
-    body: (_
-        "{"
-        [(_) ","?]* @class.inside
-        "}" )) @class.around
-
-(impl_item
-    body: (_
-        "{"
-        [(_) ","?]* @class.inside
-        "}" )) @class.around
-
-(mod_item
-    body: (_
-        "{"
-        [(_) ","?]* @class.inside
-        "}" )) @class.around
-
-; comments
-
-(line_comment)+ @comment.around
-
-(block_comment) @comment.around
diff --git a/crates/languages/src/tailwind.rs b/crates/languages/src/tailwind.rs
deleted file mode 100644
index 7e23c4ba52..0000000000
--- a/crates/languages/src/tailwind.rs
+++ /dev/null
@@ -1,228 +0,0 @@
-use anyhow::Result;
-use async_trait::async_trait;
-use collections::HashMap;
-use gpui::AsyncApp;
-use language::{LanguageName, LspAdapter, LspAdapterDelegate, LspInstaller, Toolchain};
-use lsp::{LanguageServerBinary, LanguageServerName, Uri};
-use node_runtime::{NodeRuntime, VersionStrategy};
-use project::lsp_store::language_server_settings;
-use serde_json::{Value, json};
-use std::{
-    ffi::OsString,
-    path::{Path, PathBuf},
-    sync::Arc,
-};
-use util::{ResultExt, maybe};
-
-#[cfg(target_os = "windows")]
-const SERVER_PATH: &str =
-    "node_modules/@tailwindcss/language-server/bin/tailwindcss-language-server";
-#[cfg(not(target_os = "windows"))]
-const SERVER_PATH: &str = "node_modules/.bin/tailwindcss-language-server";
-
-fn server_binary_arguments(server_path: &Path) -> Vec<OsString> {
-    vec![server_path.into(), "--stdio".into()]
-}
-
-pub struct TailwindLspAdapter {
-    node: NodeRuntime,
-}
-
-impl TailwindLspAdapter {
-    const SERVER_NAME: LanguageServerName =
-        LanguageServerName::new_static("tailwindcss-language-server");
-    const PACKAGE_NAME: &str = "@tailwindcss/language-server";
-
-    pub fn new(node: NodeRuntime) -> Self {
-        TailwindLspAdapter { node }
-    }
-}
-
-impl LspInstaller for TailwindLspAdapter {
-    type BinaryVersion = String;
-
-    async fn fetch_latest_server_version(
-        &self,
-        _: &dyn LspAdapterDelegate,
-        _: bool,
-        _: &mut AsyncApp,
-    ) -> Result<String> {
-        self.node
-            .npm_package_latest_version(Self::PACKAGE_NAME)
-            .await
-    }
-
-    async fn check_if_user_installed(
-        &self,
-        delegate: &dyn LspAdapterDelegate,
-        _: Option<Toolchain>,
-        _: &AsyncApp,
-    ) -> Option<LanguageServerBinary> {
-        let path = delegate.which(Self::SERVER_NAME.as_ref()).await?;
-        let env = delegate.shell_env().await;
-
-        Some(LanguageServerBinary {
-            path,
-            env: Some(env),
-            arguments: vec!["--stdio".into()],
-        })
-    }
-
-    async fn fetch_server_binary(
-        &self,
-        latest_version: String,
-        container_dir: PathBuf,
-        _: &dyn LspAdapterDelegate,
-    ) -> Result<LanguageServerBinary> {
-        let server_path = container_dir.join(SERVER_PATH);
-
-        self.node
-            .npm_install_packages(
-                &container_dir,
-                &[(Self::PACKAGE_NAME, latest_version.as_str())],
-            )
-            .await?;
-
-        Ok(LanguageServerBinary {
-            path: self.node.binary_path().await?,
-            env: None,
-            arguments: server_binary_arguments(&server_path),
-        })
-    }
-
-    async fn check_if_version_installed(
-        &self,
-        version: &String,
-        container_dir: &PathBuf,
-        _: &dyn LspAdapterDelegate,
-    ) -> Option<LanguageServerBinary> {
-        let server_path = container_dir.join(SERVER_PATH);
-
-        let should_install_language_server = self
-            .node
-            .should_install_npm_package(
-                Self::PACKAGE_NAME,
-                &server_path,
-                container_dir,
-                VersionStrategy::Latest(version),
-            )
-            .await;
-
-        if should_install_language_server {
-            None
-        } else {
-            Some(LanguageServerBinary {
-                path: self.node.binary_path().await.ok()?,
-                env: None,
-                arguments: server_binary_arguments(&server_path),
-            })
-        }
-    }
-
-    async fn cached_server_binary(
-        &self,
-        container_dir: PathBuf,
-        _: &dyn LspAdapterDelegate,
-    ) -> Option<LanguageServerBinary> {
-        get_cached_server_binary(container_dir, &self.node).await
-    }
-}
-
-#[async_trait(?Send)]
-impl LspAdapter for TailwindLspAdapter {
-    fn name(&self) -> LanguageServerName {
-        Self::SERVER_NAME
-    }
-
-    async fn initialization_options(
-        self: Arc<Self>,
-        _: &Arc<dyn LspAdapterDelegate>,
-    ) -> Result<Option<serde_json::Value>> {
-        Ok(Some(json!({
-            "provideFormatter": true,
-        })))
-    }
-
-    async fn workspace_configuration(
-        self: Arc<Self>,
-        delegate: &Arc<dyn LspAdapterDelegate>,
-        _: Option<Toolchain>,
-        _: Option<Uri>,
-        cx: &mut AsyncApp,
-    ) -> Result<Value> {
-        let mut tailwind_user_settings = cx.update(|cx| {
-            language_server_settings(delegate.as_ref(), &Self::SERVER_NAME, cx)
-                .and_then(|s| s.settings.clone())
-                .unwrap_or_default()
-        })?;
-
-        if tailwind_user_settings.get("emmetCompletions").is_none() {
-            tailwind_user_settings["emmetCompletions"] = Value::Bool(true);
-        }
-
-        if tailwind_user_settings.get("includeLanguages").is_none() {
-            tailwind_user_settings["includeLanguages"] = json!({
-                "html": "html",
-                "css": "css",
-                "javascript": "javascript",
-                "typescript": "typescript",
-                "typescriptreact": "typescriptreact",
-            });
-        }
-
-        Ok(json!({
-            "tailwindCSS": tailwind_user_settings
-        }))
-    }
-
-    fn language_ids(&self) -> HashMap<LanguageName, String> {
-        HashMap::from_iter([
-            (LanguageName::new_static("Astro"), "astro".to_string()),
-            (LanguageName::new_static("HTML"), "html".to_string()),
-            (LanguageName::new_static("Gleam"), "html".to_string()),
-            (LanguageName::new_static("CSS"), "css".to_string()),
-            (
-                LanguageName::new_static("JavaScript"),
-                "javascript".to_string(),
-            ),
-            (
-                LanguageName::new_static("TypeScript"),
-                "typescript".to_string(),
-            ),
-            (
-                LanguageName::new_static("TSX"),
-                "typescriptreact".to_string(),
-            ),
-            (LanguageName::new_static("Svelte"), "svelte".to_string()),
-            (
-                LanguageName::new_static("Elixir"),
-                "phoenix-heex".to_string(),
-            ),
-            (LanguageName::new_static("HEEX"), "phoenix-heex".to_string()),
-            (LanguageName::new_static("ERB"), "erb".to_string()),
-            (LanguageName::new_static("HTML+ERB"), "erb".to_string()),
-            (LanguageName::new_static("PHP"), "php".to_string()),
-            (LanguageName::new_static("Vue.js"), "vue".to_string()),
-        ])
-    }
-}
-
-async fn get_cached_server_binary(
-    container_dir: PathBuf,
-    node: &NodeRuntime,
-) -> Option<LanguageServerBinary> {
-    maybe!(async {
-        let server_path = container_dir.join(SERVER_PATH);
-        anyhow::ensure!(
-            server_path.exists(),
-            "missing executable in directory {server_path:?}"
-        );
-        Ok(LanguageServerBinary {
-            path: node.binary_path().await?,
-            env: None,
-            arguments: server_binary_arguments(&server_path),
-        })
-    })
-    .await
-    .log_err()
-}
diff --git a/crates/languages/src/tsx/brackets.scm b/crates/languages/src/tsx/brackets.scm
deleted file mode 100644
index 0e98b78036..0000000000
--- a/crates/languages/src/tsx/brackets.scm
+++ /dev/null
@@ -1,11 +0,0 @@
-("(" @open ")" @close)
-("[" @open "]" @close)
-("{" @open "}" @close)
-("<" @open ">" @close)
-("<" @open "/>" @close)
-("</" @open ">" @close)
-(("\"" @open "\"" @close) (#set! rainbow.exclude))
-(("'" @open "'" @close) (#set! rainbow.exclude))
-(("`" @open "`" @close) (#set! rainbow.exclude))
-
-((jsx_element (jsx_opening_element) @open (jsx_closing_element) @close) (#set! newline.only) (#set! rainbow.exclude))
diff --git a/crates/languages/src/tsx/config.toml b/crates/languages/src/tsx/config.toml
deleted file mode 100644
index d0a4eb6532..0000000000
--- a/crates/languages/src/tsx/config.toml
+++ /dev/null
@@ -1,46 +0,0 @@
-name = "TSX"
-grammar = "tsx"
-path_suffixes = ["tsx"]
-line_comments = ["// "]
-block_comment = { start = "/*", prefix = "* ", end = "*/", tab_size = 1 }
-documentation_comment = { start = "/**", prefix = "* ", end = "*/", tab_size = 1 }
-wrap_characters = { start_prefix = "<", start_suffix = ">", end_prefix = "</", end_suffix = ">" }
-autoclose_before = ";:.,=}])>"
-brackets = [
-    { start = "{", end = "}", close = true, newline = true },
-    { start = "[", end = "]", close = true, newline = true },
-    { start = "(", end = ")", close = true, newline = true },
-    { start = "<", end = ">", close = false, newline = true, not_in = ["string", "comment"] },
-    { start = "\"", end = "\"", close = true, newline = false, not_in = ["string"] },
-    { start = "'", end = "'", close = true, newline = false, not_in = ["string", "comment"] },
-    { start = "`", end = "`", close = true, newline = false, not_in = ["string"] },
-    { start = "/*", end = " */", close = true, newline = false, not_in = ["string", "comment"] },
-]
-word_characters = ["#", "$"]
-scope_opt_in_language_servers = ["tailwindcss-language-server", "emmet-language-server"]
-prettier_parser_name = "typescript"
-tab_size = 2
-debuggers = ["JavaScript"]
-
-[jsx_tag_auto_close]
-open_tag_node_name = "jsx_opening_element"
-close_tag_node_name = "jsx_closing_element"
-jsx_element_node_name = "jsx_element"
-tag_name_node_name = "identifier"
-tag_name_node_name_alternates = ["member_expression"]
-
-[overrides.default]
-linked_edit_characters = ["."]
-
-[overrides.element]
-line_comments = { remove = true }
-block_comment = { start = "{/*", prefix = "", end = "*/}", tab_size = 0 }
-opt_into_language_servers = ["emmet-language-server"]
-
-[overrides.string]
-completion_query_characters = ["-", "."]
-opt_into_language_servers = ["tailwindcss-language-server"]
-prefer_label_for_snippet = true
-
-[overrides.function_name_before_type_arguments]
-prefer_label_for_snippet = true
diff --git a/crates/languages/src/tsx/debugger.scm b/crates/languages/src/tsx/debugger.scm
deleted file mode 100644
index 3e73dc839e..0000000000
--- a/crates/languages/src/tsx/debugger.scm
+++ /dev/null
@@ -1,25 +0,0 @@
-(lexical_declaration (variable_declarator name: (identifier) @debug-variable))
-
-(for_in_statement left: (identifier) @debug-variable)
-(for_statement initializer: (lexical_declaration (variable_declarator name: (identifier) @debug-variable)))
-
-(binary_expression left: (identifier) @debug-variable (#not-match? @debug-variable "^[A-Z]"))
-(binary_expression right: (identifier) @debug-variable (#not-match? @debug-variable "^[A-Z]"))
-
-(unary_expression argument: (identifier) @debug-variable (#not-match? @debug-variable "^[A-Z]"))
-(update_expression argument: (identifier) @debug-variable (#not-match? @debug-variable "^[A-Z]"))
-
-(return_statement (identifier) @debug-variable (#not-match? @debug-variable "^[A-Z]"))
-
-(parenthesized_expression (identifier) @debug-variable (#not-match? @debug-variable "^[A-Z]"))
-
-(jsx_expression (identifier) @debug-variable (#not-match? @debug-variable "^[A-Z]"))
-
-(array (identifier) @debug-variable (#not-match? @debug-variable "^[A-Z]"))
-
-(pair value: (identifier) @debug-variable (#not-match? @debug-variable "^[A-Z]"))
-
-(member_expression object: (identifier) @debug-variable (#not-match? @debug-variable "^[A-Z]"))
-
-(statement_block) @debug-scope
-(program) @debug-scope
diff --git a/crates/languages/src/tsx/embedding.scm b/crates/languages/src/tsx/embedding.scm
deleted file mode 100644
index ddcff66584..0000000000
--- a/crates/languages/src/tsx/embedding.scm
+++ /dev/null
@@ -1,85 +0,0 @@
-(
-    (comment)* @context
-    .
-    [
-        (export_statement
-            (function_declaration
-                "async"? @name
-                "function" @name
-                name: (_) @name))
-        (function_declaration
-            "async"? @name
-            "function" @name
-            name: (_) @name)
-        ] @item
-    )
-
-(
-    (comment)* @context
-    .
-    [
-        (export_statement
-            (class_declaration
-                "class" @name
-                name: (_) @name))
-        (class_declaration
-            "class" @name
-            name: (_) @name)
-        ] @item
-    )
-
-(
-    (comment)* @context
-    .
-    [
-        (export_statement
-            (interface_declaration
-                "interface" @name
-                name: (_) @name))
-        (interface_declaration
-            "interface" @name
-            name: (_) @name)
-        ] @item
-    )
-
-(
-    (comment)* @context
-    .
-    [
-        (export_statement
-            (enum_declaration
-                "enum" @name
-                name: (_) @name))
-        (enum_declaration
-            "enum" @name
-            name: (_) @name)
-        ] @item
-    )
-
-(
-    (comment)* @context
-    .
-    [
-        (export_statement
-            (type_alias_declaration
-                "type" @name
-                name: (_) @name))
-        (type_alias_declaration
-            "type" @name
-            name: (_) @name)
-        ] @item
-    )
-
-(
-    (comment)* @context
-    .
-    (method_definition
-        [
-            "get"
-            "set"
-            "async"
-            "*"
-            "static"
-            ]* @name
-        name: (_) @name) @item
-    )
diff --git a/crates/languages/src/tsx/highlights.scm b/crates/languages/src/tsx/highlights.scm
deleted file mode 100644
index 83ed6d18d7..0000000000
--- a/crates/languages/src/tsx/highlights.scm
+++ /dev/null
@@ -1,422 +0,0 @@
-; Variables
-
-(identifier) @variable
-
-(call_expression
-  function: (member_expression
-    object: (identifier) @type.builtin
-    (#any-of?
-      @type.builtin
-      "Promise"
-      "Array"
-      "Object"
-      "Map"
-      "Set"
-      "WeakMap"
-      "WeakSet"
-      "Date"
-      "Error"
-      "TypeError"
-      "RangeError"
-      "SyntaxError"
-      "ReferenceError"
-      "EvalError"
-      "URIError"
-      "RegExp"
-      "Function"
-      "Number"
-      "String"
-      "Boolean"
-      "Symbol"
-      "BigInt"
-      "Proxy"
-      "ArrayBuffer"
-      "DataView"
-    )
-  )
-)
-
-; Properties
-
-(property_identifier) @property
-(shorthand_property_identifier) @property
-(shorthand_property_identifier_pattern) @property
-(private_property_identifier) @property
-
-; Function and method calls
-
-(call_expression
-  function: (identifier) @function)
-
-(call_expression
-  function: (member_expression
-    property: [(property_identifier) (private_property_identifier)] @function.method))
-
-(new_expression
-  constructor: (identifier) @type)
-
-(nested_type_identifier
-  module: (identifier) @type)
-
-; Function and method definitions
-
-(function_expression
-  name: (identifier) @function)
-(function_declaration
-  name: (identifier) @function)
-(method_definition
-  name: [(property_identifier) (private_property_identifier)] @function.method)
-(method_definition
-    name: (property_identifier) @constructor
-    (#eq? @constructor "constructor"))
-
-(pair
-  key: [(property_identifier) (private_property_identifier)] @function.method
-  value: [(function_expression) (arrow_function)])
-
-(assignment_expression
-  left: (member_expression
-    property: [(property_identifier) (private_property_identifier)] @function.method)
-  right: [(function_expression) (arrow_function)])
-
-(variable_declarator
-  name: (identifier) @function
-  value: [(function_expression) (arrow_function)])
-
-(assignment_expression
-  left: (identifier) @function
-  right: [(function_expression) (arrow_function)])
-
-; Parameters
-
-(required_parameter
-  (identifier) @variable.parameter)
-
-(required_parameter
-  (_
-    ([
-      (identifier)
-      (shorthand_property_identifier_pattern)
-    ]) @variable.parameter))
-
-(optional_parameter
-  (identifier) @variable.parameter)
-
-(optional_parameter
-  (_
-    ([
-      (identifier)
-      (shorthand_property_identifier_pattern)
-    ]) @variable.parameter))
-
-(catch_clause
-  parameter: (identifier) @variable.parameter)
-
-(index_signature
-  name: (identifier) @variable.parameter)
-
-(arrow_function
-  parameter: (identifier) @variable.parameter)
-
-(type_predicate
-  name: (identifier) @variable.parameter)
-
-; Special identifiers
-
-(type_annotation) @type
-(type_identifier) @type
-(predefined_type) @type.builtin
-
-(type_alias_declaration
-  (type_identifier) @type)
-
-(type_alias_declaration
-  value: (_
-    (type_identifier) @type))
-
-(interface_declaration
-  (type_identifier) @type)
-
-(class_declaration
-  (type_identifier) @type.class)
-
-(extends_clause
-  value: (identifier) @type.class)
-
-(extends_type_clause
-  type: (type_identifier) @type)
-
-(implements_clause
-  (type_identifier) @type)
-
-([
-  (identifier)
-  (shorthand_property_identifier)
-  (shorthand_property_identifier_pattern)
- ] @constant
- (#match? @constant "^_*[A-Z_][A-Z\\d_]*$"))
-
-; Literals
-
-(this) @variable.special
-(super) @variable.special
-
-[
-  (null)
-  (undefined)
-] @constant.builtin
-
-[
-  (true)
-  (false)
-] @boolean
-
-(comment) @comment
-
-[
-  (string)
-  (template_string)
-  (template_literal_type)
-] @string
-
-(escape_sequence) @string.escape
-
-(regex) @string.regex
-(regex_flags) @keyword.operator.regex
-(number) @number
-
-; Tokens
-
-[
-  ";"
-  "?."
-  "."
-  ","
-  ":"
-  "?"
-] @punctuation.delimiter
-
-[
-  "-"
-  "--"
-  "-="
-  "+"
-  "++"
-  "+="
-  "*"
-  "*="
-  "**"
-  "**="
-  "/"
-  "/="
-  "%"
-  "%="
-  "<"
-  "<="
-  "<<"
-  "<<="
-  "="
-  "=="
-  "==="
-  "!"
-  "!="
-  "!=="
-  "=>"
-  ">"
-  ">="
-  ">>"
-  ">>="
-  ">>>"
-  ">>>="
-  "~"
-  "^"
-  "&"
-  "|"
-  "^="
-  "&="
-  "|="
-  "&&"
-  "||"
-  "??"
-  "&&="
-  "||="
-  "??="
-  "..."
-] @operator
-
-(regex "/" @string.regex)
-
-[
-  "("
-  ")"
-  "["
-  "]"
-  "{"
-  "}"
-]  @punctuation.bracket
-
-(ternary_expression
-  [
-    "?"
-    ":"
-  ] @operator
-)
-
-[
-  "as"
-  "async"
-  "await"
-  "class"
-  "const"
-  "debugger"
-  "default"
-  "delete"
-  "export"
-  "extends"
-  "from"
-  "function"
-  "get"
-  "import"
-  "in"
-  "instanceof"
-  "is"
-  "let"
-  "new"
-  "of"
-  "satisfies"
-  "set"
-  "static"
-  "target"
-  "typeof"
-  "using"
-  "var"
-  "void"
-  "with"
-] @keyword
-
-[
-  "break"
-  "case"
-  "catch"
-  "continue"
-  "do"
-  "else"
-  "finally"
-  "for"
-  "if"
-  "return"
-  "switch"
-  "throw"
-  "try"
-  "while"
-  "yield"
-] @keyword.control
-
-(switch_default "default" @keyword.control)
-
-(template_substitution
-  "${" @punctuation.special
-  "}" @punctuation.special) @embedded
-
-(template_type
-  "${" @punctuation.special
-  "}" @punctuation.special) @embedded
-
-(type_arguments
-  "<" @punctuation.bracket
-  ">" @punctuation.bracket)
-
-(type_parameters
-  "<" @punctuation.bracket
-  ">" @punctuation.bracket)
-
-(decorator "@" @punctuation.special)
-
-(union_type
-  ("|") @punctuation.special)
-
-(intersection_type
-  ("&") @punctuation.special)
-
-(type_annotation
-  (":") @punctuation.special)
-
-(index_signature
-  (":") @punctuation.special)
-
-(type_predicate_annotation
-  (":") @punctuation.special)
-
-(public_field_definition
-  ("?") @punctuation.special)
-
-(property_signature
-  ("?") @punctuation.special)
-
-(method_signature
-  ("?") @punctuation.special)
-
-(optional_parameter
-  ([
-    "?"
-    ":"
-  ]) @punctuation.special)
-
-; Keywords
-
-[ "abstract"
-  "declare"
-  "enum"
-  "export"
-  "implements"
-  "interface"
-  "keyof"
-  "module"
-  "namespace"
-  "private"
-  "protected"
-  "public"
-  "type"
-  "readonly"
-  "override"
-] @keyword
-
-; JSX elements
-(jsx_opening_element (identifier) @tag.jsx (#match? @tag.jsx "^[a-z][^.]*$"))
-(jsx_closing_element (identifier) @tag.jsx (#match? @tag.jsx "^[a-z][^.]*$"))
-(jsx_self_closing_element (identifier) @tag.jsx (#match? @tag.jsx "^[a-z][^.]*$"))
-
-(jsx_opening_element
-  [
-    (identifier) @type
-    (member_expression
-      object: (identifier) @type
-      property: (property_identifier) @type
-    )
-  ]
-)
-(jsx_closing_element
-  [
-    (identifier) @type
-    (member_expression
-      object: (identifier) @type
-      property: (property_identifier) @type
-    )
-  ]
-)
-(jsx_self_closing_element
-  [
-    (identifier) @type
-    (member_expression
-      object: (identifier) @type
-      property: (property_identifier) @type
-    )
-  ]
-)
-
-(jsx_attribute (property_identifier) @attribute.jsx)
-(jsx_opening_element (["<" ">"]) @punctuation.bracket.jsx)
-(jsx_closing_element (["</" ">"]) @punctuation.bracket.jsx)
-(jsx_self_closing_element (["<" "/>"]) @punctuation.bracket.jsx)
-(jsx_attribute "=" @punctuation.delimiter.jsx)
-(jsx_text) @text.jsx
diff --git a/crates/languages/src/tsx/imports.scm b/crates/languages/src/tsx/imports.scm
deleted file mode 100644
index e26b97aeef..0000000000
--- a/crates/languages/src/tsx/imports.scm
+++ /dev/null
@@ -1,14 +0,0 @@
-(import_statement
-    import_clause: (import_clause
-        [
-            (identifier) @name
-            (named_imports
-                (import_specifier
-                    name: (_) @name
-                    alias: (_)? @alias))
-        ])
-    source: (string (string_fragment) @source)) @import
-
-(import_statement
-    !import_clause
-    source: (string (string_fragment) @source @wildcard)) @import
diff --git a/crates/languages/src/tsx/indents.scm b/crates/languages/src/tsx/indents.scm
deleted file mode 100644
index 9897f3060e..0000000000
--- a/crates/languages/src/tsx/indents.scm
+++ /dev/null
@@ -1,21 +0,0 @@
-[
-    (call_expression)
-    (assignment_expression)
-    (member_expression)
-    (lexical_declaration)
-    (variable_declaration)
-    (assignment_expression)
-    (if_statement)
-    (for_statement)
-] @indent
-
-(_ "[" "]" @end) @indent
-(_ "<" ">" @end) @indent
-(_ "{" "}" @end) @indent
-(_ "(" ")" @end) @indent
-
-(jsx_opening_element ">" @end) @indent
-
-(jsx_element
-  (jsx_opening_element) @start
-  (jsx_closing_element)? @end) @indent
diff --git a/crates/languages/src/tsx/injections.scm b/crates/languages/src/tsx/injections.scm
deleted file mode 100644
index 3cca9e8e81..0000000000
--- a/crates/languages/src/tsx/injections.scm
+++ /dev/null
@@ -1,85 +0,0 @@
-((comment) @injection.content
- (#set! injection.language "comment")
-)
-
-(((comment) @_jsdoc_comment
-  (#match? @_jsdoc_comment "(?s)^/[*][*][^*].*[*]/$")) @injection.content
-  (#set! injection.language "jsdoc"))
-
-((regex) @injection.content
-  (#set! injection.language "regex"))
-
-(call_expression
-  function: (identifier) @_name (#eq? @_name "css")
-  arguments: (template_string (string_fragment) @injection.content
-                              (#set! injection.language "css"))
-)
-
-(call_expression
-  function: (member_expression
-    object: (identifier) @_obj (#eq? @_obj "styled")
-    property: (property_identifier))
-  arguments: (template_string (string_fragment) @injection.content
-                              (#set! injection.language "css"))
-)
-
-(call_expression
-  function: (call_expression
-    function: (identifier) @_name (#eq? @_name "styled"))
-  arguments: (template_string (string_fragment) @injection.content
-                              (#set! injection.language "css"))
-)
-
-(call_expression
-  function: (identifier) @_name (#eq? @_name "html")
-  arguments: (template_string (string_fragment) @injection.content
-                              (#set! injection.language "html"))
-)
-
-(call_expression
-  function: (identifier) @_name (#eq? @_name "js")
-  arguments: (template_string (string_fragment) @injection.content
-                              (#set! injection.language "javascript"))
-)
-
-(call_expression
-  function: (identifier) @_name (#eq? @_name "json")
-  arguments: (template_string (string_fragment) @injection.content
-                              (#set! injection.language "json"))
-)
-
-(call_expression
-  function: (identifier) @_name (#eq? @_name "sql")
-  arguments: (template_string (string_fragment) @injection.content
-                              (#set! injection.language "sql"))
-)
-
-(call_expression
-  function: (identifier) @_name (#eq? @_name "ts")
-  arguments: (template_string (string_fragment) @injection.content
-                              (#set! injection.language "typescript"))
-)
-
-(call_expression
-  function: (identifier) @_name (#match? @_name "^ya?ml$")
-  arguments: (template_string (string_fragment) @injection.content
-                              (#set! injection.language "yaml"))
-)
-
-(call_expression
-  function: (identifier) @_name (#match? @_name "^g(raph)?ql$")
-  arguments: (template_string (string_fragment) @injection.content
-                              (#set! injection.language "graphql"))
-)
-
-(call_expression
-  function: (identifier) @_name (#match? @_name "^g(raph)?ql$")
-  arguments: (arguments (template_string (string_fragment) @injection.content
-                              (#set! injection.language "graphql")))
-)
-
-(call_expression
-  function: (identifier) @_name(#match? @_name "^iso$")
-  arguments: (arguments (template_string (string_fragment) @injection.content
-                              (#set! injection.language "isograph")))
-)
diff --git a/crates/languages/src/tsx/outline.scm b/crates/languages/src/tsx/outline.scm
deleted file mode 100644
index 54d29007c7..0000000000
--- a/crates/languages/src/tsx/outline.scm
+++ /dev/null
@@ -1,230 +0,0 @@
-(internal_module
-    "namespace" @context
-    name: (_) @name) @item
-
-(enum_declaration
-    "enum" @context
-    name: (_) @name) @item
-
-(type_alias_declaration
-    "type" @context
-    name: (_) @name) @item
-
-(function_declaration
-    "async"? @context
-    "function" @context
-    name: (_) @name
-    parameters: (formal_parameters
-      "(" @context
-      ")" @context)) @item
-
-(generator_function_declaration
-    "async"? @context
-    "function" @context
-    "*" @context
-    name: (_) @name
-    parameters: (formal_parameters
-      "(" @context
-      ")" @context)) @item
-
-(interface_declaration
-    "interface" @context
-    name: (_) @name) @item
-
-(export_statement
-    (lexical_declaration
-        ["let" "const"] @context
-        (variable_declarator
-            name: (identifier) @name) @item))
-
-; Exported array destructuring
-(export_statement
-    (lexical_declaration
-        ["let" "const"] @context
-        (variable_declarator
-            name: (array_pattern
-                [
-                    (identifier) @name @item
-                    (assignment_pattern left: (identifier) @name @item)
-                    (rest_pattern (identifier) @name @item)
-                ]))))
-
-; Exported object destructuring
-(export_statement
-    (lexical_declaration
-        ["let" "const"] @context
-        (variable_declarator
-            name: (object_pattern
-                [(shorthand_property_identifier_pattern) @name @item
-                 (pair_pattern
-                     value: (identifier) @name @item)
-                 (pair_pattern
-                     value: (assignment_pattern left: (identifier) @name @item))
-                 (rest_pattern (identifier) @name @item)]))))
-
-(program
-    (lexical_declaration
-        ["let" "const"] @context
-        (variable_declarator
-            name: (identifier) @name) @item))
-
-; Top-level array destructuring
-(program
-    (lexical_declaration
-        ["let" "const"] @context
-        (variable_declarator
-            name: (array_pattern
-                [
-                    (identifier) @name @item
-                    (assignment_pattern left: (identifier) @name @item)
-                    (rest_pattern (identifier) @name @item)
-                ]))))
-
-; Top-level object destructuring
-(program
-    (lexical_declaration
-        ["let" "const"] @context
-        (variable_declarator
-            name: (object_pattern
-                [(shorthand_property_identifier_pattern) @name @item
-                 (pair_pattern
-                     value: (identifier) @name @item)
-                 (pair_pattern
-                     value: (assignment_pattern left: (identifier) @name @item))
-                 (rest_pattern (identifier) @name @item)]))))
-
-(class_declaration
-    "class" @context
-    name: (_) @name) @item
-
-(abstract_class_declaration
-    "abstract" @context
-    "class" @context
-    name: (_) @name) @item
-
-; Method definitions in classes (not in object literals)
-(class_body
-    (method_definition
-        [
-            "get"
-            "set"
-            "async"
-            "*"
-            "readonly"
-            "static"
-            (override_modifier)
-            (accessibility_modifier)
-        ]* @context
-        name: (_) @name
-        parameters: (formal_parameters
-          "(" @context
-          ")" @context)) @item)
-
-; Object literal methods
-(variable_declarator
-    value: (object
-        (method_definition
-            [
-                "get"
-                "set"
-                "async"
-                "*"
-            ]* @context
-            name: (_) @name
-            parameters: (formal_parameters
-              "(" @context
-              ")" @context)) @item))
-
-(public_field_definition
-    [
-        "declare"
-        "readonly"
-        "abstract"
-        "static"
-        (accessibility_modifier)
-    ]* @context
-    name: (_) @name) @item
-
-; Add support for (node:test, bun:test and Jest) runnable
-(
-    (call_expression
-        function: [
-            (identifier) @_name
-            (member_expression
-                object: [
-                    (identifier) @_name
-                    (member_expression object: (identifier) @_name)
-                ]
-            )
-        ] @context
-        (#any-of? @_name "it" "test" "describe" "context" "suite")
-        arguments: (
-            arguments . [
-                (string (string_fragment) @name)
-                (identifier) @name
-            ]
-        )
-    )
-) @item
-
-; Add support for parameterized tests
-(
-    (call_expression
-        function: (call_expression
-            function: (member_expression
-                object: [(identifier) @_name (member_expression object: (identifier) @_name)]
-                property: (property_identifier) @_property
-            )
-            (#any-of? @_name "it" "test" "describe" "context" "suite")
-            (#any-of? @_property "each")
-        )
-        arguments: (
-            arguments . [
-                (string (string_fragment) @name)
-                (identifier) @name
-            ]
-        )
-    )
-) @item
-
-; Object properties
-(pair
-    key: [
-        (property_identifier) @name
-        (string (string_fragment) @name)
-        (number) @name
-        (computed_property_name) @name
-    ]) @item
-
-
-; Nested variables in function bodies
-(statement_block
-    (lexical_declaration
-        ["let" "const"] @context
-        (variable_declarator
-            name: (identifier) @name) @item))
-
-; Nested array destructuring in functions
-(statement_block
-    (lexical_declaration
-        ["let" "const"] @context
-        (variable_declarator
-            name: (array_pattern
-                [
-                    (identifier) @name @item
-                    (assignment_pattern left: (identifier) @name @item)
-                    (rest_pattern (identifier) @name @item)
-                ]))))
-
-; Nested object destructuring in functions
-(statement_block
-    (lexical_declaration
-        ["let" "const"] @context
-        (variable_declarator
-            name: (object_pattern
-                [(shorthand_property_identifier_pattern) @name @item
-                 (pair_pattern value: (identifier) @name @item)
-                 (pair_pattern value: (assignment_pattern left: (identifier) @name @item))
-                 (rest_pattern (identifier) @name @item)]))))
-
-(comment) @annotation
diff --git a/crates/languages/src/tsx/overrides.scm b/crates/languages/src/tsx/overrides.scm
deleted file mode 100644
index f5a51af33f..0000000000
--- a/crates/languages/src/tsx/overrides.scm
+++ /dev/null
@@ -1,18 +0,0 @@
-(comment) @comment.inclusive
-
-(string) @string
-
-(template_string (string_fragment) @string)
-
-(jsx_element) @element
-
-[
-  (jsx_opening_element)
-  (jsx_closing_element)
-  (jsx_self_closing_element)
-  (jsx_expression)
-] @default
-
-(_ value: (call_expression
-  function: (identifier) @function_name_before_type_arguments
-  type_arguments: (type_arguments)))
diff --git a/crates/languages/src/tsx/runnables.scm b/crates/languages/src/tsx/runnables.scm
deleted file mode 100644
index 85702cf99d..0000000000
--- a/crates/languages/src/tsx/runnables.scm
+++ /dev/null
@@ -1,46 +0,0 @@
-; Add support for (node:test, bun:test and Jest) runnable
-; Function expression that has `it`, `test` or `describe` as the function name
-(
-    (call_expression
-        function: [
-            (identifier) @_name
-            (member_expression
-                object: [
-                    (identifier) @_name
-                    (member_expression object: (identifier) @_name)
-                ]
-            )
-        ]
-        (#any-of? @_name "it" "test" "describe" "context" "suite")
-        arguments: (
-            arguments . [
-                (string (string_fragment) @run)
-                (identifier) @run
-            ]
-        )
-    ) @_js-test
-
-    (#set! tag js-test)
-)
-
-; Add support for parameterized tests
-(
-    (call_expression
-        function: (call_expression
-            function: (member_expression
-                object: [(identifier) @_name (member_expression object: (identifier) @_name)]
-                property: (property_identifier) @_property
-            )
-            (#any-of? @_name "it" "test" "describe" "context" "suite")
-            (#any-of? @_property "each")
-        )
-        arguments: (
-            arguments . [
-                (string (string_fragment) @run)
-                (identifier) @run
-            ]
-        )
-    ) @_js-test
-
-    (#set! tag js-test)
-)
diff --git a/crates/languages/src/tsx/textobjects.scm b/crates/languages/src/tsx/textobjects.scm
deleted file mode 100644
index 836fed35ba..0000000000
--- a/crates/languages/src/tsx/textobjects.scm
+++ /dev/null
@@ -1,79 +0,0 @@
-(comment)+ @comment.around
-
-(function_declaration
-    body: (_
-        "{"
-        (_)* @function.inside
-        "}")) @function.around
-
-(method_definition
-    body: (_
-        "{"
-        (_)* @function.inside
-        "}")) @function.around
-
-(function_expression
-    body: (_
-        "{"
-        (_)* @function.inside
-        "}")) @function.around
-
-(arrow_function
-    body: (statement_block
-        "{"
-        (_)* @function.inside
-        "}")) @function.around
-
-(arrow_function) @function.around
-(function_signature) @function.around
-
-(generator_function
-    body: (_
-        "{"
-        (_)* @function.inside
-        "}")) @function.around
-
-(generator_function_declaration
-    body: (_
-        "{"
-        (_)* @function.inside
-        "}")) @function.around
-
-(class_declaration
-    body: (_
-        "{"
-        [(_) ";"?]* @class.inside
-        "}" )) @class.around
-
-(class
-    body: (_
-        "{"
-        (_)* @class.inside
-        "}" )) @class.around
-
-(interface_declaration
-    body: (_
-        "{"
-        [(_) ";"?]* @class.inside
-        "}" )) @class.around
-
-(enum_declaration
-    body: (_
-        "{"
-        [(_) ","?]* @class.inside
-        "}" )) @class.around
-
-(ambient_declaration
-    (module
-    body: (_
-        "{"
-        [(_) ";"?]* @class.inside
-        "}" ))) @class.around
-
-(internal_module
-    body: (_
-        "{"
-        [(_) ";"?]* @class.inside
-        "}" )) @class.around
-
-(type_alias_declaration) @class.around
diff --git a/crates/languages/src/typescript.rs b/crates/languages/src/typescript.rs
deleted file mode 100644
index a7aa1bc49c..0000000000
--- a/crates/languages/src/typescript.rs
+++ /dev/null
@@ -1,1472 +0,0 @@
-use anyhow::{Context as _, Result};
-use async_trait::async_trait;
-use chrono::{DateTime, Local};
-use collections::HashMap;
-use futures::future::join_all;
-use gpui::{App, AppContext, AsyncApp, Task};
-use itertools::Itertools as _;
-use language::{
-    ContextLocation, ContextProvider, File, LanguageName, LanguageToolchainStore, LspAdapter,
-    LspAdapterDelegate, LspInstaller, Toolchain,
-};
-use lsp::{CodeActionKind, LanguageServerBinary, LanguageServerName, Uri};
-use node_runtime::{NodeRuntime, VersionStrategy};
-use project::{Fs, lsp_store::language_server_settings};
-use serde_json::{Value, json};
-use smol::lock::RwLock;
-use std::{
-    borrow::Cow,
-    ffi::OsString,
-    path::{Path, PathBuf},
-    sync::{Arc, LazyLock},
-};
-use task::{TaskTemplate, TaskTemplates, VariableName};
-use util::rel_path::RelPath;
-use util::{ResultExt, maybe};
-
-use crate::{PackageJson, PackageJsonData};
-
-pub(crate) struct TypeScriptContextProvider {
-    fs: Arc<dyn Fs>,
-    last_package_json: PackageJsonContents,
-}
-
-const TYPESCRIPT_RUNNER_VARIABLE: VariableName =
-    VariableName::Custom(Cow::Borrowed("TYPESCRIPT_RUNNER"));
-
-const TYPESCRIPT_JEST_TEST_NAME_VARIABLE: VariableName =
-    VariableName::Custom(Cow::Borrowed("TYPESCRIPT_JEST_TEST_NAME"));
-
-const TYPESCRIPT_VITEST_TEST_NAME_VARIABLE: VariableName =
-    VariableName::Custom(Cow::Borrowed("TYPESCRIPT_VITEST_TEST_NAME"));
-
-const TYPESCRIPT_JEST_PACKAGE_PATH_VARIABLE: VariableName =
-    VariableName::Custom(Cow::Borrowed("TYPESCRIPT_JEST_PACKAGE_PATH"));
-
-const TYPESCRIPT_MOCHA_PACKAGE_PATH_VARIABLE: VariableName =
-    VariableName::Custom(Cow::Borrowed("TYPESCRIPT_MOCHA_PACKAGE_PATH"));
-
-const TYPESCRIPT_VITEST_PACKAGE_PATH_VARIABLE: VariableName =
-    VariableName::Custom(Cow::Borrowed("TYPESCRIPT_VITEST_PACKAGE_PATH"));
-
-const TYPESCRIPT_JASMINE_PACKAGE_PATH_VARIABLE: VariableName =
-    VariableName::Custom(Cow::Borrowed("TYPESCRIPT_JASMINE_PACKAGE_PATH"));
-
-const TYPESCRIPT_BUN_PACKAGE_PATH_VARIABLE: VariableName =
-    VariableName::Custom(Cow::Borrowed("TYPESCRIPT_BUN_PACKAGE_PATH"));
-
-const TYPESCRIPT_NODE_PACKAGE_PATH_VARIABLE: VariableName =
-    VariableName::Custom(Cow::Borrowed("TYPESCRIPT_NODE_PACKAGE_PATH"));
-
-#[derive(Clone, Debug, Default)]
-struct PackageJsonContents(Arc<RwLock<HashMap<PathBuf, PackageJson>>>);
-
-impl PackageJsonData {
-    fn fill_task_templates(&self, task_templates: &mut TaskTemplates) {
-        if self.jest_package_path.is_some() {
-            task_templates.0.push(TaskTemplate {
-                label: "jest file test".to_owned(),
-                command: TYPESCRIPT_RUNNER_VARIABLE.template_value(),
-                args: vec![
-                    "exec".to_owned(),
-                    "--".to_owned(),
-                    "jest".to_owned(),
-                    "--runInBand".to_owned(),
-                    VariableName::File.template_value(),
-                ],
-                cwd: Some(TYPESCRIPT_JEST_PACKAGE_PATH_VARIABLE.template_value()),
-                ..TaskTemplate::default()
-            });
-            task_templates.0.push(TaskTemplate {
-                label: format!("jest test {}", VariableName::Symbol.template_value()),
-                command: TYPESCRIPT_RUNNER_VARIABLE.template_value(),
-                args: vec![
-                    "exec".to_owned(),
-                    "--".to_owned(),
-                    "jest".to_owned(),
-                    "--runInBand".to_owned(),
-                    "--testNamePattern".to_owned(),
-                    format!(
-                        "\"{}\"",
-                        TYPESCRIPT_JEST_TEST_NAME_VARIABLE.template_value()
-                    ),
-                    VariableName::File.template_value(),
-                ],
-                tags: vec![
-                    "ts-test".to_owned(),
-                    "js-test".to_owned(),
-                    "tsx-test".to_owned(),
-                ],
-                cwd: Some(TYPESCRIPT_JEST_PACKAGE_PATH_VARIABLE.template_value()),
-                ..TaskTemplate::default()
-            });
-        }
-
-        if self.vitest_package_path.is_some() {
-            task_templates.0.push(TaskTemplate {
-                label: format!("{} file test", "vitest".to_owned()),
-                command: TYPESCRIPT_RUNNER_VARIABLE.template_value(),
-                args: vec![
-                    "exec".to_owned(),
-                    "--".to_owned(),
-                    "vitest".to_owned(),
-                    "run".to_owned(),
-                    "--poolOptions.forks.minForks=0".to_owned(),
-                    "--poolOptions.forks.maxForks=1".to_owned(),
-                    VariableName::File.template_value(),
-                ],
-                cwd: Some(TYPESCRIPT_VITEST_PACKAGE_PATH_VARIABLE.template_value()),
-                ..TaskTemplate::default()
-            });
-            task_templates.0.push(TaskTemplate {
-                label: format!(
-                    "{} test {}",
-                    "vitest".to_owned(),
-                    VariableName::Symbol.template_value(),
-                ),
-                command: TYPESCRIPT_RUNNER_VARIABLE.template_value(),
-                args: vec![
-                    "exec".to_owned(),
-                    "--".to_owned(),
-                    "vitest".to_owned(),
-                    "run".to_owned(),
-                    "--poolOptions.forks.minForks=0".to_owned(),
-                    "--poolOptions.forks.maxForks=1".to_owned(),
-                    "--testNamePattern".to_owned(),
-                    format!(
-                        "\"{}\"",
-                        TYPESCRIPT_VITEST_TEST_NAME_VARIABLE.template_value()
-                    ),
-                    VariableName::File.template_value(),
-                ],
-                tags: vec![
-                    "ts-test".to_owned(),
-                    "js-test".to_owned(),
-                    "tsx-test".to_owned(),
-                ],
-                cwd: Some(TYPESCRIPT_VITEST_PACKAGE_PATH_VARIABLE.template_value()),
-                ..TaskTemplate::default()
-            });
-        }
-
-        if self.mocha_package_path.is_some() {
-            task_templates.0.push(TaskTemplate {
-                label: format!("{} file test", "mocha".to_owned()),
-                command: TYPESCRIPT_RUNNER_VARIABLE.template_value(),
-                args: vec![
-                    "exec".to_owned(),
-                    "--".to_owned(),
-                    "mocha".to_owned(),
-                    VariableName::File.template_value(),
-                ],
-                cwd: Some(TYPESCRIPT_MOCHA_PACKAGE_PATH_VARIABLE.template_value()),
-                ..TaskTemplate::default()
-            });
-            task_templates.0.push(TaskTemplate {
-                label: format!(
-                    "{} test {}",
-                    "mocha".to_owned(),
-                    VariableName::Symbol.template_value(),
-                ),
-                command: TYPESCRIPT_RUNNER_VARIABLE.template_value(),
-                args: vec![
-                    "exec".to_owned(),
-                    "--".to_owned(),
-                    "mocha".to_owned(),
-                    "--grep".to_owned(),
-                    format!("\"{}\"", VariableName::Symbol.template_value()),
-                    VariableName::File.template_value(),
-                ],
-                tags: vec![
-                    "ts-test".to_owned(),
-                    "js-test".to_owned(),
-                    "tsx-test".to_owned(),
-                ],
-                cwd: Some(TYPESCRIPT_MOCHA_PACKAGE_PATH_VARIABLE.template_value()),
-                ..TaskTemplate::default()
-            });
-        }
-
-        if self.jasmine_package_path.is_some() {
-            task_templates.0.push(TaskTemplate {
-                label: format!("{} file test", "jasmine".to_owned()),
-                command: TYPESCRIPT_RUNNER_VARIABLE.template_value(),
-                args: vec![
-                    "exec".to_owned(),
-                    "--".to_owned(),
-                    "jasmine".to_owned(),
-                    VariableName::File.template_value(),
-                ],
-                cwd: Some(TYPESCRIPT_JASMINE_PACKAGE_PATH_VARIABLE.template_value()),
-                ..TaskTemplate::default()
-            });
-            task_templates.0.push(TaskTemplate {
-                label: format!(
-                    "{} test {}",
-                    "jasmine".to_owned(),
-                    VariableName::Symbol.template_value(),
-                ),
-                command: TYPESCRIPT_RUNNER_VARIABLE.template_value(),
-                args: vec![
-                    "exec".to_owned(),
-                    "--".to_owned(),
-                    "jasmine".to_owned(),
-                    format!("--filter={}", VariableName::Symbol.template_value()),
-                    VariableName::File.template_value(),
-                ],
-                tags: vec![
-                    "ts-test".to_owned(),
-                    "js-test".to_owned(),
-                    "tsx-test".to_owned(),
-                ],
-                cwd: Some(TYPESCRIPT_JASMINE_PACKAGE_PATH_VARIABLE.template_value()),
-                ..TaskTemplate::default()
-            });
-        }
-
-        if self.bun_package_path.is_some() {
-            task_templates.0.push(TaskTemplate {
-                label: format!("{} file test", "bun test".to_owned()),
-                command: "bun".to_owned(),
-                args: vec!["test".to_owned(), VariableName::File.template_value()],
-                cwd: Some(TYPESCRIPT_BUN_PACKAGE_PATH_VARIABLE.template_value()),
-                ..TaskTemplate::default()
-            });
-            task_templates.0.push(TaskTemplate {
-                label: format!("bun test {}", VariableName::Symbol.template_value(),),
-                command: "bun".to_owned(),
-                args: vec![
-                    "test".to_owned(),
-                    "--test-name-pattern".to_owned(),
-                    format!("\"{}\"", VariableName::Symbol.template_value()),
-                    VariableName::File.template_value(),
-                ],
-                tags: vec![
-                    "ts-test".to_owned(),
-                    "js-test".to_owned(),
-                    "tsx-test".to_owned(),
-                ],
-                cwd: Some(TYPESCRIPT_BUN_PACKAGE_PATH_VARIABLE.template_value()),
-                ..TaskTemplate::default()
-            });
-        }
-
-        if self.node_package_path.is_some() {
-            task_templates.0.push(TaskTemplate {
-                label: format!("{} file test", "node test".to_owned()),
-                command: "node".to_owned(),
-                args: vec!["--test".to_owned(), VariableName::File.template_value()],
-                tags: vec![
-                    "ts-test".to_owned(),
-                    "js-test".to_owned(),
-                    "tsx-test".to_owned(),
-                ],
-                cwd: Some(TYPESCRIPT_NODE_PACKAGE_PATH_VARIABLE.template_value()),
-                ..TaskTemplate::default()
-            });
-            task_templates.0.push(TaskTemplate {
-                label: format!("node test {}", VariableName::Symbol.template_value()),
-                command: "node".to_owned(),
-                args: vec![
-                    "--test".to_owned(),
-                    "--test-name-pattern".to_owned(),
-                    format!("\"{}\"", VariableName::Symbol.template_value()),
-                    VariableName::File.template_value(),
-                ],
-                tags: vec![
-                    "ts-test".to_owned(),
-                    "js-test".to_owned(),
-                    "tsx-test".to_owned(),
-                ],
-                cwd: Some(TYPESCRIPT_NODE_PACKAGE_PATH_VARIABLE.template_value()),
-                ..TaskTemplate::default()
-            });
-        }
-
-        let script_name_counts: HashMap<_, usize> =
-            self.scripts
-                .iter()
-                .fold(HashMap::default(), |mut acc, (_, script)| {
-                    *acc.entry(script).or_default() += 1;
-                    acc
-                });
-        for (path, script) in &self.scripts {
-            let label = if script_name_counts.get(script).copied().unwrap_or_default() > 1
-                && let Some(parent) = path.parent().and_then(|parent| parent.file_name())
-            {
-                let parent = parent.to_string_lossy();
-                format!("{parent}/package.json > {script}")
-            } else {
-                format!("package.json > {script}")
-            };
-            task_templates.0.push(TaskTemplate {
-                label,
-                command: TYPESCRIPT_RUNNER_VARIABLE.template_value(),
-                args: vec!["run".to_owned(), script.to_owned()],
-                tags: vec!["package-script".into()],
-                cwd: Some(
-                    path.parent()
-                        .unwrap_or(Path::new("/"))
-                        .to_string_lossy()
-                        .to_string(),
-                ),
-                ..TaskTemplate::default()
-            });
-        }
-    }
-}
-
-impl TypeScriptContextProvider {
-    pub fn new(fs: Arc<dyn Fs>) -> Self {
-        Self {
-            fs,
-            last_package_json: PackageJsonContents::default(),
-        }
-    }
-
-    fn combined_package_json_data(
-        &self,
-        fs: Arc<dyn Fs>,
-        worktree_root: &Path,
-        file_relative_path: &RelPath,
-        cx: &App,
-    ) -> Task<anyhow::Result<PackageJsonData>> {
-        let new_json_data = file_relative_path
-            .ancestors()
-            .map(|path| worktree_root.join(path.as_std_path()))
-            .map(|parent_path| {
-                self.package_json_data(&parent_path, self.last_package_json.clone(), fs.clone(), cx)
-            })
-            .collect::<Vec<_>>();
-
-        cx.background_spawn(async move {
-            let mut package_json_data = PackageJsonData::default();
-            for new_data in join_all(new_json_data).await.into_iter().flatten() {
-                package_json_data.merge(new_data);
-            }
-            Ok(package_json_data)
-        })
-    }
-
-    fn package_json_data(
-        &self,
-        directory_path: &Path,
-        existing_package_json: PackageJsonContents,
-        fs: Arc<dyn Fs>,
-        cx: &App,
-    ) -> Task<anyhow::Result<PackageJsonData>> {
-        let package_json_path = directory_path.join("package.json");
-        let metadata_check_fs = fs.clone();
-        cx.background_spawn(async move {
-            let metadata = metadata_check_fs
-                .metadata(&package_json_path)
-                .await
-                .with_context(|| format!("getting metadata for {package_json_path:?}"))?
-                .with_context(|| format!("missing FS metadata for {package_json_path:?}"))?;
-            let mtime = DateTime::<Local>::from(metadata.mtime.timestamp_for_user());
-            let existing_data = {
-                let contents = existing_package_json.0.read().await;
-                contents
-                    .get(&package_json_path)
-                    .filter(|package_json| package_json.mtime == mtime)
-                    .map(|package_json| package_json.data.clone())
-            };
-            match existing_data {
-                Some(existing_data) => Ok(existing_data),
-                None => {
-                    let package_json_string =
-                        fs.load(&package_json_path).await.with_context(|| {
-                            format!("loading package.json from {package_json_path:?}")
-                        })?;
-                    let package_json: HashMap<String, serde_json_lenient::Value> =
-                        serde_json_lenient::from_str(&package_json_string).with_context(|| {
-                            format!("parsing package.json from {package_json_path:?}")
-                        })?;
-                    let new_data =
-                        PackageJsonData::new(package_json_path.as_path().into(), package_json);
-                    {
-                        let mut contents = existing_package_json.0.write().await;
-                        contents.insert(
-                            package_json_path,
-                            PackageJson {
-                                mtime,
-                                data: new_data.clone(),
-                            },
-                        );
-                    }
-                    Ok(new_data)
-                }
-            }
-        })
-    }
-}
-
-async fn detect_package_manager(
-    worktree_root: PathBuf,
-    fs: Arc<dyn Fs>,
-    package_json_data: Option<PackageJsonData>,
-) -> &'static str {
-    if let Some(package_json_data) = package_json_data
-        && let Some(package_manager) = package_json_data.package_manager
-    {
-        return package_manager;
-    }
-    if fs.is_file(&worktree_root.join("pnpm-lock.yaml")).await {
-        return "pnpm";
-    }
-    if fs.is_file(&worktree_root.join("yarn.lock")).await {
-        return "yarn";
-    }
-    "npm"
-}
-
-impl ContextProvider for TypeScriptContextProvider {
-    fn associated_tasks(
-        &self,
-        file: Option<Arc<dyn File>>,
-        cx: &App,
-    ) -> Task<Option<TaskTemplates>> {
-        let Some(file) = project::File::from_dyn(file.as_ref()).cloned() else {
-            return Task::ready(None);
-        };
-        let Some(worktree_root) = file.worktree.read(cx).root_dir() else {
-            return Task::ready(None);
-        };
-        let file_relative_path = file.path().clone();
-        let package_json_data = self.combined_package_json_data(
-            self.fs.clone(),
-            &worktree_root,
-            &file_relative_path,
-            cx,
-        );
-
-        cx.background_spawn(async move {
-            let mut task_templates = TaskTemplates(Vec::new());
-            task_templates.0.push(TaskTemplate {
-                label: format!(
-                    "execute selection {}",
-                    VariableName::SelectedText.template_value()
-                ),
-                command: "node".to_owned(),
-                args: vec![
-                    "-e".to_owned(),
-                    format!("\"{}\"", VariableName::SelectedText.template_value()),
-                ],
-                ..TaskTemplate::default()
-            });
-
-            match package_json_data.await {
-                Ok(package_json) => {
-                    package_json.fill_task_templates(&mut task_templates);
-                }
-                Err(e) => {
-                    log::error!(
-                        "Failed to read package.json for worktree {file_relative_path:?}: {e:#}"
-                    );
-                }
-            }
-
-            Some(task_templates)
-        })
-    }
-
-    fn build_context(
-        &self,
-        current_vars: &task::TaskVariables,
-        location: ContextLocation<'_>,
-        _project_env: Option<HashMap<String, String>>,
-        _toolchains: Arc<dyn LanguageToolchainStore>,
-        cx: &mut App,
-    ) -> Task<Result<task::TaskVariables>> {
-        let mut vars = task::TaskVariables::default();
-
-        if let Some(symbol) = current_vars.get(&VariableName::Symbol) {
-            vars.insert(
-                TYPESCRIPT_JEST_TEST_NAME_VARIABLE,
-                replace_test_name_parameters(symbol),
-            );
-            vars.insert(
-                TYPESCRIPT_VITEST_TEST_NAME_VARIABLE,
-                replace_test_name_parameters(symbol),
-            );
-        }
-        let file_path = location
-            .file_location
-            .buffer
-            .read(cx)
-            .file()
-            .map(|file| file.path());
-
-        let args = location.worktree_root.zip(location.fs).zip(file_path).map(
-            |((worktree_root, fs), file_path)| {
-                (
-                    self.combined_package_json_data(fs.clone(), &worktree_root, file_path, cx),
-                    worktree_root,
-                    fs,
-                )
-            },
-        );
-        cx.background_spawn(async move {
-            if let Some((task, worktree_root, fs)) = args {
-                let package_json_data = task.await.log_err();
-                vars.insert(
-                    TYPESCRIPT_RUNNER_VARIABLE,
-                    detect_package_manager(worktree_root, fs, package_json_data.clone())
-                        .await
-                        .to_owned(),
-                );
-
-                if let Some(package_json_data) = package_json_data {
-                    if let Some(path) = package_json_data.jest_package_path {
-                        vars.insert(
-                            TYPESCRIPT_JEST_PACKAGE_PATH_VARIABLE,
-                            path.parent()
-                                .unwrap_or(Path::new(""))
-                                .to_string_lossy()
-                                .to_string(),
-                        );
-                    }
-
-                    if let Some(path) = package_json_data.mocha_package_path {
-                        vars.insert(
-                            TYPESCRIPT_MOCHA_PACKAGE_PATH_VARIABLE,
-                            path.parent()
-                                .unwrap_or(Path::new(""))
-                                .to_string_lossy()
-                                .to_string(),
-                        );
-                    }
-
-                    if let Some(path) = package_json_data.vitest_package_path {
-                        vars.insert(
-                            TYPESCRIPT_VITEST_PACKAGE_PATH_VARIABLE,
-                            path.parent()
-                                .unwrap_or(Path::new(""))
-                                .to_string_lossy()
-                                .to_string(),
-                        );
-                    }
-
-                    if let Some(path) = package_json_data.jasmine_package_path {
-                        vars.insert(
-                            TYPESCRIPT_JASMINE_PACKAGE_PATH_VARIABLE,
-                            path.parent()
-                                .unwrap_or(Path::new(""))
-                                .to_string_lossy()
-                                .to_string(),
-                        );
-                    }
-
-                    if let Some(path) = package_json_data.bun_package_path {
-                        vars.insert(
-                            TYPESCRIPT_BUN_PACKAGE_PATH_VARIABLE,
-                            path.parent()
-                                .unwrap_or(Path::new(""))
-                                .to_string_lossy()
-                                .to_string(),
-                        );
-                    }
-
-                    if let Some(path) = package_json_data.node_package_path {
-                        vars.insert(
-                            TYPESCRIPT_NODE_PACKAGE_PATH_VARIABLE,
-                            path.parent()
-                                .unwrap_or(Path::new(""))
-                                .to_string_lossy()
-                                .to_string(),
-                        );
-                    }
-                }
-            }
-            Ok(vars)
-        })
-    }
-}
-
-fn typescript_server_binary_arguments(server_path: &Path) -> Vec<OsString> {
-    vec![server_path.into(), "--stdio".into()]
-}
-
-fn replace_test_name_parameters(test_name: &str) -> String {
-    static PATTERN: LazyLock<regex::Regex> =
-        LazyLock::new(|| regex::Regex::new(r"(\$([A-Za-z0-9_\.]+|[\#])|%[psdifjo#\$%])").unwrap());
-    PATTERN.split(test_name).map(regex::escape).join("(.+?)")
-}
-
-pub struct TypeScriptLspAdapter {
-    fs: Arc<dyn Fs>,
-    node: NodeRuntime,
-}
-
-impl TypeScriptLspAdapter {
-    const OLD_SERVER_PATH: &str = "node_modules/typescript-language-server/lib/cli.js";
-    const NEW_SERVER_PATH: &str = "node_modules/typescript-language-server/lib/cli.mjs";
-
-    const PACKAGE_NAME: &str = "typescript";
-    const SERVER_PACKAGE_NAME: &str = "typescript-language-server";
-
-    const SERVER_NAME: LanguageServerName =
-        LanguageServerName::new_static(Self::SERVER_PACKAGE_NAME);
-
-    pub fn new(node: NodeRuntime, fs: Arc<dyn Fs>) -> Self {
-        TypeScriptLspAdapter { fs, node }
-    }
-
-    async fn tsdk_path(&self, adapter: &Arc<dyn LspAdapterDelegate>) -> Option<&'static str> {
-        let is_yarn = adapter
-            .read_text_file(RelPath::unix(".yarn/sdks/typescript/lib/typescript.js").unwrap())
-            .await
-            .is_ok();
-
-        let tsdk_path = if is_yarn {
-            ".yarn/sdks/typescript/lib"
-        } else {
-            "node_modules/typescript/lib"
-        };
-
-        if self
-            .fs
-            .is_dir(&adapter.worktree_root_path().join(tsdk_path))
-            .await
-        {
-            Some(tsdk_path)
-        } else {
-            None
-        }
-    }
-}
-
-pub struct TypeScriptVersions {
-    typescript_version: String,
-    server_version: String,
-}
-
-impl LspInstaller for TypeScriptLspAdapter {
-    type BinaryVersion = TypeScriptVersions;
-
-    async fn fetch_latest_server_version(
-        &self,
-        _: &dyn LspAdapterDelegate,
-        _: bool,
-        _: &mut AsyncApp,
-    ) -> Result<TypeScriptVersions> {
-        Ok(TypeScriptVersions {
-            typescript_version: self
-                .node
-                .npm_package_latest_version(Self::PACKAGE_NAME)
-                .await?,
-            server_version: self
-                .node
-                .npm_package_latest_version(Self::SERVER_PACKAGE_NAME)
-                .await?,
-        })
-    }
-
-    async fn check_if_version_installed(
-        &self,
-        version: &TypeScriptVersions,
-        container_dir: &PathBuf,
-        _: &dyn LspAdapterDelegate,
-    ) -> Option<LanguageServerBinary> {
-        let server_path = container_dir.join(Self::NEW_SERVER_PATH);
-
-        if self
-            .node
-            .should_install_npm_package(
-                Self::PACKAGE_NAME,
-                &server_path,
-                container_dir,
-                VersionStrategy::Latest(version.typescript_version.as_str()),
-            )
-            .await
-        {
-            return None;
-        }
-
-        if self
-            .node
-            .should_install_npm_package(
-                Self::SERVER_PACKAGE_NAME,
-                &server_path,
-                container_dir,
-                VersionStrategy::Latest(version.server_version.as_str()),
-            )
-            .await
-        {
-            return None;
-        }
-
-        Some(LanguageServerBinary {
-            path: self.node.binary_path().await.ok()?,
-            env: None,
-            arguments: typescript_server_binary_arguments(&server_path),
-        })
-    }
-
-    async fn fetch_server_binary(
-        &self,
-        latest_version: TypeScriptVersions,
-        container_dir: PathBuf,
-        _: &dyn LspAdapterDelegate,
-    ) -> Result<LanguageServerBinary> {
-        let server_path = container_dir.join(Self::NEW_SERVER_PATH);
-
-        self.node
-            .npm_install_packages(
-                &container_dir,
-                &[
-                    (
-                        Self::PACKAGE_NAME,
-                        latest_version.typescript_version.as_str(),
-                    ),
-                    (
-                        Self::SERVER_PACKAGE_NAME,
-                        latest_version.server_version.as_str(),
-                    ),
-                ],
-            )
-            .await?;
-
-        Ok(LanguageServerBinary {
-            path: self.node.binary_path().await?,
-            env: None,
-            arguments: typescript_server_binary_arguments(&server_path),
-        })
-    }
-
-    async fn cached_server_binary(
-        &self,
-        container_dir: PathBuf,
-        _: &dyn LspAdapterDelegate,
-    ) -> Option<LanguageServerBinary> {
-        get_cached_ts_server_binary(container_dir, &self.node).await
-    }
-}
-
-#[async_trait(?Send)]
-impl LspAdapter for TypeScriptLspAdapter {
-    fn name(&self) -> LanguageServerName {
-        Self::SERVER_NAME
-    }
-
-    fn code_action_kinds(&self) -> Option<Vec<CodeActionKind>> {
-        Some(vec![
-            CodeActionKind::QUICKFIX,
-            CodeActionKind::REFACTOR,
-            CodeActionKind::REFACTOR_EXTRACT,
-            CodeActionKind::SOURCE,
-        ])
-    }
-
-    async fn label_for_completion(
-        &self,
-        item: &lsp::CompletionItem,
-        language: &Arc<language::Language>,
-    ) -> Option<language::CodeLabel> {
-        use lsp::CompletionItemKind as Kind;
-        let label_len = item.label.len();
-        let grammar = language.grammar()?;
-        let highlight_id = match item.kind? {
-            Kind::CLASS | Kind::INTERFACE | Kind::ENUM => grammar.highlight_id_for_name("type"),
-            Kind::CONSTRUCTOR => grammar.highlight_id_for_name("type"),
-            Kind::CONSTANT => grammar.highlight_id_for_name("constant"),
-            Kind::FUNCTION | Kind::METHOD => grammar.highlight_id_for_name("function"),
-            Kind::PROPERTY | Kind::FIELD => grammar.highlight_id_for_name("property"),
-            Kind::VARIABLE => grammar.highlight_id_for_name("variable"),
-            _ => None,
-        }?;
-
-        let text = if let Some(description) = item
-            .label_details
-            .as_ref()
-            .and_then(|label_details| label_details.description.as_ref())
-        {
-            format!("{} {}", item.label, description)
-        } else if let Some(detail) = &item.detail {
-            format!("{} {}", item.label, detail)
-        } else {
-            item.label.clone()
-        };
-        Some(language::CodeLabel::filtered(
-            text,
-            label_len,
-            item.filter_text.as_deref(),
-            vec![(0..label_len, highlight_id)],
-        ))
-    }
-
-    async fn initialization_options(
-        self: Arc<Self>,
-        adapter: &Arc<dyn LspAdapterDelegate>,
-    ) -> Result<Option<serde_json::Value>> {
-        let tsdk_path = self.tsdk_path(adapter).await;
-        Ok(Some(json!({
-            "provideFormatter": true,
-            "hostInfo": "zed",
-            "tsserver": {
-                "path": tsdk_path,
-            },
-            "preferences": {
-                "includeInlayParameterNameHints": "all",
-                "includeInlayParameterNameHintsWhenArgumentMatchesName": true,
-                "includeInlayFunctionParameterTypeHints": true,
-                "includeInlayVariableTypeHints": true,
-                "includeInlayVariableTypeHintsWhenTypeMatchesName": true,
-                "includeInlayPropertyDeclarationTypeHints": true,
-                "includeInlayFunctionLikeReturnTypeHints": true,
-                "includeInlayEnumMemberValueHints": true,
-            }
-        })))
-    }
-
-    async fn workspace_configuration(
-        self: Arc<Self>,
-        delegate: &Arc<dyn LspAdapterDelegate>,
-        _: Option<Toolchain>,
-        _: Option<Uri>,
-        cx: &mut AsyncApp,
-    ) -> Result<Value> {
-        let override_options = cx.update(|cx| {
-            language_server_settings(delegate.as_ref(), &Self::SERVER_NAME, cx)
-                .and_then(|s| s.settings.clone())
-        })?;
-        if let Some(options) = override_options {
-            return Ok(options);
-        }
-        Ok(json!({
-            "completions": {
-              "completeFunctionCalls": true
-            }
-        }))
-    }
-
-    fn language_ids(&self) -> HashMap<LanguageName, String> {
-        HashMap::from_iter([
-            (LanguageName::new_static("TypeScript"), "typescript".into()),
-            (LanguageName::new_static("JavaScript"), "javascript".into()),
-            (LanguageName::new_static("TSX"), "typescriptreact".into()),
-        ])
-    }
-}
-
-async fn get_cached_ts_server_binary(
-    container_dir: PathBuf,
-    node: &NodeRuntime,
-) -> Option<LanguageServerBinary> {
-    maybe!(async {
-        let old_server_path = container_dir.join(TypeScriptLspAdapter::OLD_SERVER_PATH);
-        let new_server_path = container_dir.join(TypeScriptLspAdapter::NEW_SERVER_PATH);
-        if new_server_path.exists() {
-            Ok(LanguageServerBinary {
-                path: node.binary_path().await?,
-                env: None,
-                arguments: typescript_server_binary_arguments(&new_server_path),
-            })
-        } else if old_server_path.exists() {
-            Ok(LanguageServerBinary {
-                path: node.binary_path().await?,
-                env: None,
-                arguments: typescript_server_binary_arguments(&old_server_path),
-            })
-        } else {
-            anyhow::bail!("missing executable in directory {container_dir:?}")
-        }
-    })
-    .await
-    .log_err()
-}
-
-#[cfg(test)]
-mod tests {
-    use std::path::Path;
-
-    use gpui::{AppContext as _, BackgroundExecutor, TestAppContext};
-    use project::FakeFs;
-    use serde_json::json;
-    use task::TaskTemplates;
-    use unindent::Unindent;
-    use util::{path, rel_path::rel_path};
-
-    use crate::typescript::{
-        PackageJsonData, TypeScriptContextProvider, replace_test_name_parameters,
-    };
-
-    #[gpui::test]
-    async fn test_outline(cx: &mut TestAppContext) {
-        for language in [
-            crate::language(
-                "typescript",
-                tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into(),
-            ),
-            crate::language("tsx", tree_sitter_typescript::LANGUAGE_TSX.into()),
-        ] {
-            let text = r#"
-            function a() {
-              // local variables are included
-              let a1 = 1;
-              // all functions are included
-              async function a2() {}
-            }
-            // top-level variables are included
-            let b: C
-            function getB() {}
-            // exported variables are included
-            export const d = e;
-        "#
-            .unindent();
-
-            let buffer = cx.new(|cx| language::Buffer::local(text, cx).with_language(language, cx));
-            let outline = buffer.read_with(cx, |buffer, _| buffer.snapshot().outline(None));
-            assert_eq!(
-                outline
-                    .items
-                    .iter()
-                    .map(|item| (item.text.as_str(), item.depth))
-                    .collect::<Vec<_>>(),
-                &[
-                    ("function a()", 0),
-                    ("let a1", 1),
-                    ("async function a2()", 1),
-                    ("let b", 0),
-                    ("function getB()", 0),
-                    ("const d", 0),
-                ]
-            );
-        }
-    }
-
-    #[gpui::test]
-    async fn test_outline_with_destructuring(cx: &mut TestAppContext) {
-        for language in [
-            crate::language(
-                "typescript",
-                tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into(),
-            ),
-            crate::language("tsx", tree_sitter_typescript::LANGUAGE_TSX.into()),
-        ] {
-            let text = r#"
-            // Top-level destructuring
-            const { a1, a2 } = a;
-            const [b1, b2] = b;
-
-            // Defaults and rest
-            const [c1 = 1, , c2, ...rest1] = c;
-            const { d1, d2: e1, f1 = 2, g1: h1 = 3, ...rest2 } = d;
-
-            function processData() {
-              // Nested object destructuring
-              const { c1, c2 } = c;
-              // Nested array destructuring
-              const [d1, d2, d3] = d;
-              // Destructuring with renaming
-              const { f1: g1 } = f;
-              // With defaults
-              const [x = 10, y] = xy;
-            }
-
-            class DataHandler {
-              method() {
-                // Destructuring in class method
-                const { a1, a2 } = a;
-                const [b1, ...b2] = b;
-              }
-            }
-        "#
-            .unindent();
-
-            let buffer = cx.new(|cx| language::Buffer::local(text, cx).with_language(language, cx));
-            let outline = buffer.read_with(cx, |buffer, _| buffer.snapshot().outline(None));
-            assert_eq!(
-                outline
-                    .items
-                    .iter()
-                    .map(|item| (item.text.as_str(), item.depth))
-                    .collect::<Vec<_>>(),
-                &[
-                    ("const a1", 0),
-                    ("const a2", 0),
-                    ("const b1", 0),
-                    ("const b2", 0),
-                    ("const c1", 0),
-                    ("const c2", 0),
-                    ("const rest1", 0),
-                    ("const d1", 0),
-                    ("const e1", 0),
-                    ("const h1", 0),
-                    ("const rest2", 0),
-                    ("function processData()", 0),
-                    ("const c1", 1),
-                    ("const c2", 1),
-                    ("const d1", 1),
-                    ("const d2", 1),
-                    ("const d3", 1),
-                    ("const g1", 1),
-                    ("const x", 1),
-                    ("const y", 1),
-                    ("class DataHandler", 0),
-                    ("method()", 1),
-                    ("const a1", 2),
-                    ("const a2", 2),
-                    ("const b1", 2),
-                    ("const b2", 2),
-                ]
-            );
-        }
-    }
-
-    #[gpui::test]
-    async fn test_outline_with_object_properties(cx: &mut TestAppContext) {
-        for language in [
-            crate::language(
-                "typescript",
-                tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into(),
-            ),
-            crate::language("tsx", tree_sitter_typescript::LANGUAGE_TSX.into()),
-        ] {
-            let text = r#"
-            // Object with function properties
-            const o = { m() {}, async n() {}, g: function* () {}, h: () => {}, k: function () {} };
-
-            // Object with primitive properties
-            const p = { p1: 1, p2: "hello", p3: true };
-
-            // Nested objects
-            const q = {
-                r: {
-                    // won't be included due to one-level depth limit
-                    s: 1
-                },
-                t: 2
-            };
-
-            function getData() {
-                const local = { x: 1, y: 2 };
-                return local;
-            }
-        "#
-            .unindent();
-
-            let buffer = cx.new(|cx| language::Buffer::local(text, cx).with_language(language, cx));
-            let outline = buffer.read_with(cx, |buffer, _| buffer.snapshot().outline(None));
-            assert_eq!(
-                outline
-                    .items
-                    .iter()
-                    .map(|item| (item.text.as_str(), item.depth))
-                    .collect::<Vec<_>>(),
-                &[
-                    ("const o", 0),
-                    ("m()", 1),
-                    ("async n()", 1),
-                    ("g", 1),
-                    ("h", 1),
-                    ("k", 1),
-                    ("const p", 0),
-                    ("p1", 1),
-                    ("p2", 1),
-                    ("p3", 1),
-                    ("const q", 0),
-                    ("r", 1),
-                    ("s", 2),
-                    ("t", 1),
-                    ("function getData()", 0),
-                    ("const local", 1),
-                    ("x", 2),
-                    ("y", 2),
-                ]
-            );
-        }
-    }
-
-    #[gpui::test]
-    async fn test_outline_with_computed_property_names(cx: &mut TestAppContext) {
-        for language in [
-            crate::language(
-                "typescript",
-                tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into(),
-            ),
-            crate::language("tsx", tree_sitter_typescript::LANGUAGE_TSX.into()),
-        ] {
-            let text = r#"
-            // Symbols as object keys
-            const sym = Symbol("test");
-            const obj1 = {
-                [sym]: 1,
-                [Symbol("inline")]: 2,
-                normalKey: 3
-            };
-
-            // Enums as object keys
-            enum Color { Red, Blue, Green }
-
-            const obj2 = {
-                [Color.Red]: "red value",
-                [Color.Blue]: "blue value",
-                regularProp: "normal"
-            };
-
-            // Mixed computed properties
-            const key = "dynamic";
-            const obj3 = {
-                [key]: 1,
-                ["string" + "concat"]: 2,
-                [1 + 1]: 3,
-                static: 4
-            };
-
-            // Nested objects with computed properties
-            const obj4 = {
-                [sym]: {
-                    nested: 1
-                },
-                regular: {
-                    [key]: 2
-                }
-            };
-        "#
-            .unindent();
-
-            let buffer = cx.new(|cx| language::Buffer::local(text, cx).with_language(language, cx));
-            let outline = buffer.read_with(cx, |buffer, _| buffer.snapshot().outline(None));
-            assert_eq!(
-                outline
-                    .items
-                    .iter()
-                    .map(|item| (item.text.as_str(), item.depth))
-                    .collect::<Vec<_>>(),
-                &[
-                    ("const sym", 0),
-                    ("const obj1", 0),
-                    ("[sym]", 1),
-                    ("[Symbol(\"inline\")]", 1),
-                    ("normalKey", 1),
-                    ("enum Color", 0),
-                    ("const obj2", 0),
-                    ("[Color.Red]", 1),
-                    ("[Color.Blue]", 1),
-                    ("regularProp", 1),
-                    ("const key", 0),
-                    ("const obj3", 0),
-                    ("[key]", 1),
-                    ("[\"string\" + \"concat\"]", 1),
-                    ("[1 + 1]", 1),
-                    ("static", 1),
-                    ("const obj4", 0),
-                    ("[sym]", 1),
-                    ("nested", 2),
-                    ("regular", 1),
-                    ("[key]", 2),
-                ]
-            );
-        }
-    }
-
-    #[gpui::test]
-    async fn test_generator_function_outline(cx: &mut TestAppContext) {
-        let language = crate::language("javascript", tree_sitter_typescript::LANGUAGE_TSX.into());
-
-        let text = r#"
-            function normalFunction() {
-                console.log("normal");
-            }
-
-            function* simpleGenerator() {
-                yield 1;
-                yield 2;
-            }
-
-            async function* asyncGenerator() {
-                yield await Promise.resolve(1);
-            }
-
-            function* generatorWithParams(start, end) {
-                for (let i = start; i <= end; i++) {
-                    yield i;
-                }
-            }
-
-            class TestClass {
-                *methodGenerator() {
-                    yield "method";
-                }
-
-                async *asyncMethodGenerator() {
-                    yield "async method";
-                }
-            }
-        "#
-        .unindent();
-
-        let buffer = cx.new(|cx| language::Buffer::local(text, cx).with_language(language, cx));
-        let outline = buffer.read_with(cx, |buffer, _| buffer.snapshot().outline(None));
-        assert_eq!(
-            outline
-                .items
-                .iter()
-                .map(|item| (item.text.as_str(), item.depth))
-                .collect::<Vec<_>>(),
-            &[
-                ("function normalFunction()", 0),
-                ("function* simpleGenerator()", 0),
-                ("async function* asyncGenerator()", 0),
-                ("function* generatorWithParams( )", 0),
-                ("class TestClass", 0),
-                ("*methodGenerator()", 1),
-                ("async *asyncMethodGenerator()", 1),
-            ]
-        );
-    }
-
-    #[gpui::test]
-    async fn test_package_json_discovery(executor: BackgroundExecutor, cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            settings::init(cx);
-        });
-
-        let package_json_1 = json!({
-            "dependencies": {
-                "mocha": "1.0.0",
-                "vitest": "1.0.0"
-            },
-            "scripts": {
-                "test": ""
-            }
-        })
-        .to_string();
-
-        let package_json_2 = json!({
-            "devDependencies": {
-                "vitest": "2.0.0"
-            },
-            "scripts": {
-                "test": ""
-            }
-        })
-        .to_string();
-
-        let fs = FakeFs::new(executor);
-        fs.insert_tree(
-            path!("/root"),
-            json!({
-                "package.json": package_json_1,
-                "sub": {
-                    "package.json": package_json_2,
-                    "file.js": "",
-                }
-            }),
-        )
-        .await;
-
-        let provider = TypeScriptContextProvider::new(fs.clone());
-        let package_json_data = cx
-            .update(|cx| {
-                provider.combined_package_json_data(
-                    fs.clone(),
-                    path!("/root").as_ref(),
-                    rel_path("sub/file1.js"),
-                    cx,
-                )
-            })
-            .await
-            .unwrap();
-        pretty_assertions::assert_eq!(
-            package_json_data,
-            PackageJsonData {
-                jest_package_path: None,
-                mocha_package_path: Some(Path::new(path!("/root/package.json")).into()),
-                vitest_package_path: Some(Path::new(path!("/root/sub/package.json")).into()),
-                jasmine_package_path: None,
-                bun_package_path: None,
-                node_package_path: None,
-                scripts: [
-                    (
-                        Path::new(path!("/root/package.json")).into(),
-                        "test".to_owned()
-                    ),
-                    (
-                        Path::new(path!("/root/sub/package.json")).into(),
-                        "test".to_owned()
-                    )
-                ]
-                .into_iter()
-                .collect(),
-                package_manager: None,
-            }
-        );
-
-        let mut task_templates = TaskTemplates::default();
-        package_json_data.fill_task_templates(&mut task_templates);
-        let task_templates = task_templates
-            .0
-            .into_iter()
-            .map(|template| (template.label, template.cwd))
-            .collect::<Vec<_>>();
-        pretty_assertions::assert_eq!(
-            task_templates,
-            [
-                (
-                    "vitest file test".into(),
-                    Some("$ZED_CUSTOM_TYPESCRIPT_VITEST_PACKAGE_PATH".into()),
-                ),
-                (
-                    "vitest test $ZED_SYMBOL".into(),
-                    Some("$ZED_CUSTOM_TYPESCRIPT_VITEST_PACKAGE_PATH".into()),
-                ),
-                (
-                    "mocha file test".into(),
-                    Some("$ZED_CUSTOM_TYPESCRIPT_MOCHA_PACKAGE_PATH".into()),
-                ),
-                (
-                    "mocha test $ZED_SYMBOL".into(),
-                    Some("$ZED_CUSTOM_TYPESCRIPT_MOCHA_PACKAGE_PATH".into()),
-                ),
-                (
-                    "root/package.json > test".into(),
-                    Some(path!("/root").into())
-                ),
-                (
-                    "sub/package.json > test".into(),
-                    Some(path!("/root/sub").into())
-                ),
-            ]
-        );
-    }
-
-    #[test]
-    fn test_escaping_name() {
-        let cases = [
-            ("plain test name", "plain test name"),
-            ("test name with $param_name", "test name with (.+?)"),
-            ("test name with $nested.param.name", "test name with (.+?)"),
-            ("test name with $#", "test name with (.+?)"),
-            ("test name with $##", "test name with (.+?)\\#"),
-            ("test name with %p", "test name with (.+?)"),
-            ("test name with %s", "test name with (.+?)"),
-            ("test name with %d", "test name with (.+?)"),
-            ("test name with %i", "test name with (.+?)"),
-            ("test name with %f", "test name with (.+?)"),
-            ("test name with %j", "test name with (.+?)"),
-            ("test name with %o", "test name with (.+?)"),
-            ("test name with %#", "test name with (.+?)"),
-            ("test name with %$", "test name with (.+?)"),
-            ("test name with %%", "test name with (.+?)"),
-            ("test name with %q", "test name with %q"),
-            (
-                "test name with regex chars .*+?^${}()|[]\\",
-                "test name with regex chars \\.\\*\\+\\?\\^\\$\\{\\}\\(\\)\\|\\[\\]\\\\",
-            ),
-            (
-                "test name with multiple $params and %pretty and %b and (.+?)",
-                "test name with multiple (.+?) and (.+?)retty and %b and \\(\\.\\+\\?\\)",
-            ),
-        ];
-
-        for (input, expected) in cases {
-            assert_eq!(replace_test_name_parameters(input), expected);
-        }
-    }
-
-    // The order of test runner tasks is based on inferred user preference:
-    // 1. Dedicated test runners (e.g., Jest, Vitest, Mocha, Jasmine) are prioritized.
-    // 2. Bun's built-in test runner (`bun test`) comes next.
-    // 3. Node.js's built-in test runner (`node --test`) is last.
-    // This hierarchy assumes that if a dedicated test framework is installed, it is the
-    // preferred testing mechanism. Between runtime-specific options, `bun test` is
-    // typically preferred over `node --test` when @types/bun is present.
-    #[gpui::test]
-    async fn test_task_ordering_with_multiple_test_runners(
-        executor: BackgroundExecutor,
-        cx: &mut TestAppContext,
-    ) {
-        cx.update(|cx| {
-            settings::init(cx);
-        });
-
-        // Test case with all test runners present
-        let package_json_all_runners = json!({
-            "devDependencies": {
-                "@types/bun": "1.0.0",
-                "@types/node": "^20.0.0",
-                "jest": "29.0.0",
-                "mocha": "10.0.0",
-                "vitest": "1.0.0",
-                "jasmine": "5.0.0",
-            },
-            "scripts": {
-                "test": "jest"
-            }
-        })
-        .to_string();
-
-        let fs = FakeFs::new(executor);
-        fs.insert_tree(
-            path!("/root"),
-            json!({
-                "package.json": package_json_all_runners,
-                "file.js": "",
-            }),
-        )
-        .await;
-
-        let provider = TypeScriptContextProvider::new(fs.clone());
-
-        let package_json_data = cx
-            .update(|cx| {
-                provider.combined_package_json_data(
-                    fs.clone(),
-                    path!("/root").as_ref(),
-                    rel_path("file.js"),
-                    cx,
-                )
-            })
-            .await
-            .unwrap();
-
-        assert!(package_json_data.jest_package_path.is_some());
-        assert!(package_json_data.mocha_package_path.is_some());
-        assert!(package_json_data.vitest_package_path.is_some());
-        assert!(package_json_data.jasmine_package_path.is_some());
-        assert!(package_json_data.bun_package_path.is_some());
-        assert!(package_json_data.node_package_path.is_some());
-
-        let mut task_templates = TaskTemplates::default();
-        package_json_data.fill_task_templates(&mut task_templates);
-
-        let test_tasks: Vec<_> = task_templates
-            .0
-            .iter()
-            .filter(|template| {
-                template.tags.contains(&"ts-test".to_owned())
-                    || template.tags.contains(&"js-test".to_owned())
-            })
-            .map(|template| &template.label)
-            .collect();
-
-        let node_test_index = test_tasks
-            .iter()
-            .position(|label| label.contains("node test"));
-        let jest_test_index = test_tasks.iter().position(|label| label.contains("jest"));
-        let bun_test_index = test_tasks
-            .iter()
-            .position(|label| label.contains("bun test"));
-
-        assert!(
-            node_test_index.is_some(),
-            "Node test tasks should be present"
-        );
-        assert!(
-            jest_test_index.is_some(),
-            "Jest test tasks should be present"
-        );
-        assert!(bun_test_index.is_some(), "Bun test tasks should be present");
-
-        assert!(
-            jest_test_index.unwrap() < bun_test_index.unwrap(),
-            "Jest should come before Bun"
-        );
-        assert!(
-            bun_test_index.unwrap() < node_test_index.unwrap(),
-            "Bun should come before Node"
-        );
-    }
-}
diff --git a/crates/languages/src/typescript/brackets.scm b/crates/languages/src/typescript/brackets.scm
deleted file mode 100644
index 6352338491..0000000000
--- a/crates/languages/src/typescript/brackets.scm
+++ /dev/null
@@ -1,7 +0,0 @@
-("(" @open ")" @close)
-("[" @open "]" @close)
-("{" @open "}" @close)
-("<" @open ">" @close)
-(("\"" @open "\"" @close) (#set! rainbow.exclude))
-(("'" @open "'" @close) (#set! rainbow.exclude))
-(("`" @open "`" @close) (#set! rainbow.exclude))
diff --git a/crates/languages/src/typescript/config.toml b/crates/languages/src/typescript/config.toml
deleted file mode 100644
index 67656e6a53..0000000000
--- a/crates/languages/src/typescript/config.toml
+++ /dev/null
@@ -1,33 +0,0 @@
-name = "TypeScript"
-grammar = "typescript"
-path_suffixes = ["ts", "cts", "mts"]
-first_line_pattern = '^#!.*\b(?:deno run|ts-node|bun|tsx|[/ ]node)\b'
-line_comments = ["// "]
-block_comment = { start = "/*", prefix = "* ", end = "*/", tab_size = 1 }
-documentation_comment = { start = "/**", prefix = "* ", end = "*/", tab_size = 1 }
-wrap_characters = { start_prefix = "<", start_suffix = ">", end_prefix = "</", end_suffix = ">" }
-autoclose_before = ";:.,=}])>"
-brackets = [
-    { start = "{", end = "}", close = true, newline = true },
-    { start = "[", end = "]", close = true, newline = true },
-    { start = "(", end = ")", close = true, newline = true },
-    { start = "<", end = ">", close = false, newline = true, not_in = ["string", "comment"] },
-    { start = "\"", end = "\"", close = true, newline = false, not_in = ["string"] },
-    { start = "'", end = "'", close = true, newline = false, not_in = ["string", "comment"] },
-    { start = "`", end = "`", close = true, newline = false, not_in = ["string"] },
-    { start = "/*", end = " */", close = true, newline = false, not_in = ["string", "comment"] },
-]
-word_characters = ["#", "$"]
-prettier_parser_name = "typescript"
-tab_size = 2
-debuggers = ["JavaScript"]
-scope_opt_in_language_servers = ["tailwindcss-language-server"]
-import_path_strip_regex = "(?:/index)?\\.[jt]s$"
-
-[overrides.string]
-completion_query_characters = ["-", "."]
-opt_into_language_servers = ["tailwindcss-language-server"]
-prefer_label_for_snippet = true
-
-[overrides.function_name_before_type_arguments]
-prefer_label_for_snippet = true
diff --git a/crates/languages/src/typescript/debugger.scm b/crates/languages/src/typescript/debugger.scm
deleted file mode 100644
index a99f194a4a..0000000000
--- a/crates/languages/src/typescript/debugger.scm
+++ /dev/null
@@ -1,23 +0,0 @@
-(lexical_declaration (variable_declarator name: (identifier) @debug-variable))
-
-(for_in_statement left: (identifier) @debug-variable)
-(for_statement initializer: (lexical_declaration (variable_declarator name: (identifier) @debug-variable)))
-
-(binary_expression left: (identifier) @debug-variable (#not-match? @debug-variable "^[A-Z]"))
-(binary_expression right: (identifier) @debug-variable (#not-match? @debug-variable "^[A-Z]"))
-
-(unary_expression argument: (identifier) @debug-variable (#not-match? @debug-variable "^[A-Z]"))
-(update_expression argument: (identifier) @debug-variable (#not-match? @debug-variable "^[A-Z]"))
-
-(return_statement (identifier) @debug-variable (#not-match? @debug-variable "^[A-Z]"))
-
-(parenthesized_expression (identifier) @debug-variable (#not-match? @debug-variable "^[A-Z]"))
-
-(array (identifier) @debug-variable (#not-match? @debug-variable "^[A-Z]"))
-
-(pair value: (identifier) @debug-variable (#not-match? @debug-variable "^[A-Z]"))
-
-(member_expression object: (identifier) @debug-variable (#not-match? @debug-variable "^[A-Z]"))
-
-(statement_block) @debug-scope
-(program) @debug-scope
diff --git a/crates/languages/src/typescript/embedding.scm b/crates/languages/src/typescript/embedding.scm
deleted file mode 100644
index 3170cb7c95..0000000000
--- a/crates/languages/src/typescript/embedding.scm
+++ /dev/null
@@ -1,85 +0,0 @@
-(
-    (comment)* @context
-    .
-    [
-        (export_statement
-            (function_declaration
-                "async"? @name
-                "function" @name
-                name: (_) @name))
-        (function_declaration
-            "async"? @name
-            "function" @name
-            name: (_) @name)
-    ] @item
-)
-
-(
-    (comment)* @context
-    .
-    [
-        (export_statement
-            (class_declaration
-                "class" @name
-                name: (_) @name))
-        (class_declaration
-            "class" @name
-            name: (_) @name)
-    ] @item
-)
-
-(
-    (comment)* @context
-    .
-    [
-        (export_statement
-            (interface_declaration
-                "interface" @name
-                name: (_) @name))
-        (interface_declaration
-            "interface" @name
-            name: (_) @name)
-    ] @item
-)
-
-(
-    (comment)* @context
-    .
-    [
-        (export_statement
-            (enum_declaration
-                "enum" @name
-                name: (_) @name))
-        (enum_declaration
-            "enum" @name
-            name: (_) @name)
-    ] @item
-)
-
-(
-    (comment)* @context
-    .
-    [
-        (export_statement
-            (type_alias_declaration
-                "type" @name
-                name: (_) @name))
-        (type_alias_declaration
-            "type" @name
-            name: (_) @name)
-    ] @item
-)
-
-(
-    (comment)* @context
-    .
-    (method_definition
-        [
-            "get"
-            "set"
-            "async"
-            "*"
-            "static"
-            ]* @name
-        name: (_) @name) @item
-)
diff --git a/crates/languages/src/typescript/highlights.scm b/crates/languages/src/typescript/highlights.scm
deleted file mode 100644
index f5736f4271..0000000000
--- a/crates/languages/src/typescript/highlights.scm
+++ /dev/null
@@ -1,446 +0,0 @@
-; Variables
-
-(identifier) @variable
-
-(call_expression
-  function: (member_expression
-    object: (identifier) @type.builtin
-    (#any-of?
-      @type.builtin
-      "Promise"
-      "Array"
-      "Object"
-      "Map"
-      "Set"
-      "WeakMap"
-      "WeakSet"
-      "Date"
-      "Error"
-      "TypeError"
-      "RangeError"
-      "SyntaxError"
-      "ReferenceError"
-      "EvalError"
-      "URIError"
-      "RegExp"
-      "Function"
-      "Number"
-      "String"
-      "Boolean"
-      "Symbol"
-      "BigInt"
-      "Proxy"
-      "ArrayBuffer"
-      "DataView"
-    )
-  )
-)
-
-; Special identifiers
-
-(type_annotation) @type
-
-(type_identifier) @type
-(predefined_type) @type.builtin
-
-(type_alias_declaration
-  (type_identifier) @type)
-
-(type_alias_declaration
-  value: (_
-    (type_identifier) @type))
-
-(interface_declaration
-  (type_identifier) @type)
-
-(class_declaration
-  (type_identifier) @type.class)
-
-(extends_clause
-  value: (identifier) @type.class)
-
-(extends_type_clause
-  type: (type_identifier) @type)
-
-(implements_clause
-  (type_identifier) @type)
-
-;; Enables ts-pretty-errors
-;; The Lsp returns "snippets" of typescript, which are not valid typescript in totality,
-;; but should still be highlighted
-;; Highlights object literals by hijacking the statement_block pattern, but only if
-;; the statement block follows an object literal pattern
-((statement_block
-   (labeled_statement
-     ;; highlight the label like a property name
-     label: (statement_identifier) @property.name
-     body: [
-       ;; match a terminating expression statement
-       (expression_statement
-            ;; single identifier - treat as a type name
-           [(identifier) @type.name
-            ;; object - treat as a property - type pair
-            (object
-                (pair
-                    key: (_) @property.name
-                    value: (_) @type.name))
-            ;; subscript_expression - treat as an array declaration
-            (subscript_expression
-                object: (_) @type.name
-                index: (_)
-                )
-            ;; templated string - treat each identifier contained as a type name
-            (template_string
-                (template_substitution
-                    (identifier) @type.name))
-            ])
-       ;; match a nested statement block
-       (statement_block) @nested
-     ])))
-
-(import_specifier
-  "type"
-  name: (identifier) @type
-  alias: (identifier) @type
-)
-
-(import_statement
-  "type"
-  (import_clause
-    (named_imports
-      (import_specifier
-        name: (identifier) @type
-        alias: (identifier) @type
-      )
-    )
-  )
-)
-
-([
-  (identifier)
-  (shorthand_property_identifier)
-  (shorthand_property_identifier_pattern)
- ] @constant
- (#match? @constant "^_*[A-Z_][A-Z\\d_]*$"))
-
-; Properties
-
-(property_identifier) @property
-(shorthand_property_identifier) @property
-(shorthand_property_identifier_pattern) @property
-(private_property_identifier) @property
-
-; Function and method calls
-
-(call_expression
-  function: (identifier) @function)
-
-(call_expression
-  function: (member_expression
-    property: [(property_identifier) (private_property_identifier)] @function.method))
-
-(new_expression
-  constructor: (identifier) @type)
-
-(nested_type_identifier
-  module: (identifier) @type)
-
-; Function and method definitions
-
-(function_expression
-  name: (identifier) @function)
-(function_declaration
-  name: (identifier) @function)
-(method_definition
-  name: [(property_identifier) (private_property_identifier)] @function.method)
-(method_definition
-    name: (property_identifier) @constructor
-    (#eq? @constructor "constructor"))
-
-(pair
-  key: [(property_identifier) (private_property_identifier)] @function.method
-  value: [(function_expression) (arrow_function)])
-
-(assignment_expression
-  left: (member_expression
-    property: [(property_identifier) (private_property_identifier)] @function.method)
-  right: [(function_expression) (arrow_function)])
-
-(variable_declarator
-  name: (identifier) @function
-  value: [(function_expression) (arrow_function)])
-
-(assignment_expression
-  left: (identifier) @function
-  right: [(function_expression) (arrow_function)])
-
-(arrow_function) @function
-
-; Parameters
-
-(required_parameter
-  (identifier) @variable.parameter)
-
-(required_parameter
-  (_
-    ([
-      (identifier)
-      (shorthand_property_identifier_pattern)
-    ]) @variable.parameter))
-
-(optional_parameter
-  (identifier) @variable.parameter)
-
-(optional_parameter
-  (_
-    ([
-      (identifier)
-      (shorthand_property_identifier_pattern)
-    ]) @variable.parameter))
-
-(catch_clause
-  parameter: (identifier) @variable.parameter)
-
-(index_signature
-  name: (identifier) @variable.parameter)
-
-(arrow_function
-  parameter: (identifier) @variable.parameter)
-
-(type_predicate
-  name: (identifier) @variable.parameter)
-
-; Literals
-
-(this) @variable.special
-(super) @variable.special
-
-[
-  (null)
-  (undefined)
-] @constant.builtin
-
-[
-  (true)
-  (false)
-] @boolean
-
-(literal_type
-  [
-    (null)
-    (undefined)
-    (true)
-    (false)
-  ] @type.builtin
-)
-
-(comment) @comment
-
-(hash_bang_line) @comment
-
-[
-  (string)
-  (template_string)
-  (template_literal_type)
-] @string
-
-(escape_sequence) @string.escape
-
-(regex) @string.regex
-(regex_flags) @keyword.operator.regex
-(number) @number
-
-; Tokens
-
-[
-  ";"
-  "?."
-  "."
-  ","
-  ":"
-  "?"
-] @punctuation.delimiter
-
-[
-  "..."
-  "-"
-  "--"
-  "-="
-  "+"
-  "++"
-  "+="
-  "*"
-  "*="
-  "**"
-  "**="
-  "/"
-  "/="
-  "%"
-  "%="
-  "<"
-  "<="
-  "<<"
-  "<<="
-  "="
-  "=="
-  "==="
-  "!"
-  "!="
-  "!=="
-  "=>"
-  ">"
-  ">="
-  ">>"
-  ">>="
-  ">>>"
-  ">>>="
-  "~"
-  "^"
-  "&"
-  "|"
-  "^="
-  "&="
-  "|="
-  "&&"
-  "||"
-  "??"
-  "&&="
-  "||="
-  "??="
-  "..."
-] @operator
-
-(regex "/" @string.regex)
-
-(ternary_expression
-  [
-    "?"
-    ":"
-  ] @operator
-)
-
-[
-  "("
-  ")"
-  "["
-  "]"
-  "{"
-  "}"
-]  @punctuation.bracket
-
-(template_substitution
-  "${" @punctuation.special
-  "}" @punctuation.special) @embedded
-
-(template_type
-  "${" @punctuation.special
-  "}" @punctuation.special) @embedded
-
-(type_arguments
-  "<" @punctuation.bracket
-  ">" @punctuation.bracket)
-
-(type_parameters
-  "<" @punctuation.bracket
-  ">" @punctuation.bracket)
-
-(decorator "@" @punctuation.special)
-
-(union_type
-  ("|") @punctuation.special)
-
-(intersection_type
-  ("&") @punctuation.special)
-
-(type_annotation
-  (":") @punctuation.special)
-
-(index_signature
-  (":") @punctuation.special)
-
-(type_predicate_annotation
-  (":") @punctuation.special)
-
-(public_field_definition
-  ("?") @punctuation.special)
-
-(property_signature
-  ("?") @punctuation.special)
-
-(method_signature
-  ("?") @punctuation.special)
-
-(optional_parameter
-  ([
-    "?"
-    ":"
-  ]) @punctuation.special)
-
-; Keywords
-
-[
-  "abstract"
-  "as"
-  "async"
-  "await"
-  "class"
-  "const"
-  "debugger"
-  "declare"
-  "default"
-  "delete"
-  "enum"
-  "export"
-  "extends"
-  "from"
-  "function"
-  "get"
-  "implements"
-  "import"
-  "in"
-  "infer"
-  "instanceof"
-  "interface"
-  "is"
-  "keyof"
-  "let"
-  "module"
-  "namespace"
-  "new"
-  "of"
-  "override"
-  "private"
-  "protected"
-  "public"
-  "readonly"
-  "satisfies"
-  "set"
-  "static"
-  "target"
-  "type"
-  "typeof"
-  "using"
-  "var"
-  "void"
-  "with"
-] @keyword
-
-[
-  "break"
-  "case"
-  "catch"
-  "continue"
-  "do"
-  "else"
-  "finally"
-  "for"
-  "if"
-  "return"
-  "switch"
-  "throw"
-  "try"
-  "while"
-  "yield"
-] @keyword.control
-
-(switch_default "default" @keyword.control)
diff --git a/crates/languages/src/typescript/imports.scm b/crates/languages/src/typescript/imports.scm
deleted file mode 100644
index 68ca25b2c1..0000000000
--- a/crates/languages/src/typescript/imports.scm
+++ /dev/null
@@ -1,20 +0,0 @@
-(import_statement
-    import_clause: (import_clause
-        [
-            (identifier) @name
-            (named_imports
-                (import_specifier
-                    name: (_) @name
-                    alias: (_)? @alias))
-            (namespace_import) @wildcard
-        ])
-    source: (string (string_fragment) @source)) @import
-
-(import_statement
-    !source
-    import_clause: (import_require_clause
-        source: (string (string_fragment) @source))) @wildcard @import
-
-(import_statement
-    !import_clause
-    source: (string (string_fragment) @source)) @wildcard @import
diff --git a/crates/languages/src/typescript/indents.scm b/crates/languages/src/typescript/indents.scm
deleted file mode 100644
index b4ac50bf5a..0000000000
--- a/crates/languages/src/typescript/indents.scm
+++ /dev/null
@@ -1,17 +0,0 @@
-[
-    (call_expression)
-    (assignment_expression)
-    (member_expression)
-    (lexical_declaration)
-    (variable_declaration)
-    (assignment_expression)
-    ; below handled by  `(_ "{" "}" @end) @indent`
-    ; (if_statement)
-    ; (for_statement)
-    ; (while_statement)
-] @indent
-
-(_ "[" "]" @end) @indent
-(_ "<" ">" @end) @indent
-(_ "{" "}" @end) @indent
-(_ "(" ")" @end) @indent
diff --git a/crates/languages/src/typescript/injections.scm b/crates/languages/src/typescript/injections.scm
deleted file mode 100644
index 5321e606c1..0000000000
--- a/crates/languages/src/typescript/injections.scm
+++ /dev/null
@@ -1,126 +0,0 @@
-((comment) @injection.content
- (#set! injection.language "comment")
-)
-
-(((comment) @_jsdoc_comment
-  (#match? @_jsdoc_comment "(?s)^/[*][*][^*].*[*]/$")) @injection.content
-  (#set! injection.language "jsdoc"))
-
-(((comment) @_reference
-  (#match? @_reference "^///\\s+<reference\\s+types=\"\\S+\"\\s*/>\\s*$")) @injection.content
-  (#set! injection.language "html"))
-
-((regex) @injection.content
-  (#set! injection.language "regex"))
-
-(call_expression
-  function: (identifier) @_name (#eq? @_name "css")
-  arguments: (template_string (string_fragment) @injection.content
-                              (#set! injection.language "css"))
-)
-
-(call_expression
-  function: (member_expression
-    object: (identifier) @_obj (#eq? @_obj "styled")
-    property: (property_identifier))
-  arguments: (template_string (string_fragment) @injection.content
-                              (#set! injection.language "css"))
-)
-
-(call_expression
-  function: (call_expression
-    function: (identifier) @_name (#eq? @_name "styled"))
-  arguments: (template_string (string_fragment) @injection.content
-                              (#set! injection.language "css"))
-)
-
-(call_expression
-  function: (identifier) @_name (#eq? @_name "html")
-  arguments: (template_string) @injection.content
-                              (#set! injection.language "html")
-)
-
-(call_expression
-  function: (identifier) @_name (#eq? @_name "js")
-  arguments: (template_string (string_fragment) @injection.content
-                              (#set! injection.language "javascript"))
-)
-
-(call_expression
-  function: (identifier) @_name (#eq? @_name "json")
-  arguments: (template_string (string_fragment) @injection.content
-                              (#set! injection.language "json"))
-)
-
-(call_expression
-  function: (identifier) @_name (#eq? @_name "sql")
-  arguments: (template_string (string_fragment) @injection.content
-                              (#set! injection.language "sql"))
-)
-
-(call_expression
-  function: (identifier) @_name (#eq? @_name "ts")
-  arguments: (template_string (string_fragment) @injection.content
-                              (#set! injection.language "typescript"))
-)
-
-(call_expression
-  function: (identifier) @_name (#match? @_name "^ya?ml$")
-  arguments: (template_string (string_fragment) @injection.content
-                              (#set! injection.language "yaml"))
-)
-
-(call_expression
-  function: (identifier) @_name (#match? @_name "^g(raph)?ql$")
-  arguments: (template_string (string_fragment) @injection.content
-                              (#set! injection.language "graphql"))
-)
-
-(call_expression
-  function: (identifier) @_name (#match? @_name "^g(raph)?ql$")
-  arguments: (arguments (template_string (string_fragment) @injection.content
-                              (#set! injection.language "graphql")))
-)
-
-(call_expression
-  function: (identifier) @_name(#match? @_name "^iso$")
-  arguments: (arguments (template_string (string_fragment) @injection.content
-                              (#set! injection.language "isograph")))
-)
-
-;; Angular Component template injection
-(call_expression
-  function: [
-    (identifier) @_decorator (#eq? @_decorator "Component")
-    (member_expression property: (property_identifier) @_decorator (#eq? @_decorator "Component"))
-  ]
-  arguments: (arguments (object
-    (pair
-      key: (property_identifier) @_prop (#eq? @_prop "template")
-      value: [
-        (string) @injection.content
-        (template_string) @injection.content
-        (template_string (string_fragment) @injection.content)
-      ]
-    )))
-  (#set! injection.language "angular"))
-
-;; Angular Component styles injection
-(call_expression
-  function: [
-    (identifier) @_decorator (#eq? @_decorator "Component")
-    (member_expression property: (property_identifier) @_decorator (#eq? @_decorator "Component"))
-  ]
-  arguments: (arguments (object
-    (pair
-      key: (property_identifier) @_prop (#eq? @_prop "styles")
-      value: [
-        (string) @injection.content
-        (template_string) @injection.content
-        (template_string (string_fragment) @injection.content)
-        (array (string) @injection.content)
-        (array (template_string) @injection.content)
-        (array (template_string (string_fragment)) @injection.content)
-      ]
-    )))
-  (#set! injection.language "css"))
diff --git a/crates/languages/src/typescript/outline.scm b/crates/languages/src/typescript/outline.scm
deleted file mode 100644
index 54d29007c7..0000000000
--- a/crates/languages/src/typescript/outline.scm
+++ /dev/null
@@ -1,230 +0,0 @@
-(internal_module
-    "namespace" @context
-    name: (_) @name) @item
-
-(enum_declaration
-    "enum" @context
-    name: (_) @name) @item
-
-(type_alias_declaration
-    "type" @context
-    name: (_) @name) @item
-
-(function_declaration
-    "async"? @context
-    "function" @context
-    name: (_) @name
-    parameters: (formal_parameters
-      "(" @context
-      ")" @context)) @item
-
-(generator_function_declaration
-    "async"? @context
-    "function" @context
-    "*" @context
-    name: (_) @name
-    parameters: (formal_parameters
-      "(" @context
-      ")" @context)) @item
-
-(interface_declaration
-    "interface" @context
-    name: (_) @name) @item
-
-(export_statement
-    (lexical_declaration
-        ["let" "const"] @context
-        (variable_declarator
-            name: (identifier) @name) @item))
-
-; Exported array destructuring
-(export_statement
-    (lexical_declaration
-        ["let" "const"] @context
-        (variable_declarator
-            name: (array_pattern
-                [
-                    (identifier) @name @item
-                    (assignment_pattern left: (identifier) @name @item)
-                    (rest_pattern (identifier) @name @item)
-                ]))))
-
-; Exported object destructuring
-(export_statement
-    (lexical_declaration
-        ["let" "const"] @context
-        (variable_declarator
-            name: (object_pattern
-                [(shorthand_property_identifier_pattern) @name @item
-                 (pair_pattern
-                     value: (identifier) @name @item)
-                 (pair_pattern
-                     value: (assignment_pattern left: (identifier) @name @item))
-                 (rest_pattern (identifier) @name @item)]))))
-
-(program
-    (lexical_declaration
-        ["let" "const"] @context
-        (variable_declarator
-            name: (identifier) @name) @item))
-
-; Top-level array destructuring
-(program
-    (lexical_declaration
-        ["let" "const"] @context
-        (variable_declarator
-            name: (array_pattern
-                [
-                    (identifier) @name @item
-                    (assignment_pattern left: (identifier) @name @item)
-                    (rest_pattern (identifier) @name @item)
-                ]))))
-
-; Top-level object destructuring
-(program
-    (lexical_declaration
-        ["let" "const"] @context
-        (variable_declarator
-            name: (object_pattern
-                [(shorthand_property_identifier_pattern) @name @item
-                 (pair_pattern
-                     value: (identifier) @name @item)
-                 (pair_pattern
-                     value: (assignment_pattern left: (identifier) @name @item))
-                 (rest_pattern (identifier) @name @item)]))))
-
-(class_declaration
-    "class" @context
-    name: (_) @name) @item
-
-(abstract_class_declaration
-    "abstract" @context
-    "class" @context
-    name: (_) @name) @item
-
-; Method definitions in classes (not in object literals)
-(class_body
-    (method_definition
-        [
-            "get"
-            "set"
-            "async"
-            "*"
-            "readonly"
-            "static"
-            (override_modifier)
-            (accessibility_modifier)
-        ]* @context
-        name: (_) @name
-        parameters: (formal_parameters
-          "(" @context
-          ")" @context)) @item)
-
-; Object literal methods
-(variable_declarator
-    value: (object
-        (method_definition
-            [
-                "get"
-                "set"
-                "async"
-                "*"
-            ]* @context
-            name: (_) @name
-            parameters: (formal_parameters
-              "(" @context
-              ")" @context)) @item))
-
-(public_field_definition
-    [
-        "declare"
-        "readonly"
-        "abstract"
-        "static"
-        (accessibility_modifier)
-    ]* @context
-    name: (_) @name) @item
-
-; Add support for (node:test, bun:test and Jest) runnable
-(
-    (call_expression
-        function: [
-            (identifier) @_name
-            (member_expression
-                object: [
-                    (identifier) @_name
-                    (member_expression object: (identifier) @_name)
-                ]
-            )
-        ] @context
-        (#any-of? @_name "it" "test" "describe" "context" "suite")
-        arguments: (
-            arguments . [
-                (string (string_fragment) @name)
-                (identifier) @name
-            ]
-        )
-    )
-) @item
-
-; Add support for parameterized tests
-(
-    (call_expression
-        function: (call_expression
-            function: (member_expression
-                object: [(identifier) @_name (member_expression object: (identifier) @_name)]
-                property: (property_identifier) @_property
-            )
-            (#any-of? @_name "it" "test" "describe" "context" "suite")
-            (#any-of? @_property "each")
-        )
-        arguments: (
-            arguments . [
-                (string (string_fragment) @name)
-                (identifier) @name
-            ]
-        )
-    )
-) @item
-
-; Object properties
-(pair
-    key: [
-        (property_identifier) @name
-        (string (string_fragment) @name)
-        (number) @name
-        (computed_property_name) @name
-    ]) @item
-
-
-; Nested variables in function bodies
-(statement_block
-    (lexical_declaration
-        ["let" "const"] @context
-        (variable_declarator
-            name: (identifier) @name) @item))
-
-; Nested array destructuring in functions
-(statement_block
-    (lexical_declaration
-        ["let" "const"] @context
-        (variable_declarator
-            name: (array_pattern
-                [
-                    (identifier) @name @item
-                    (assignment_pattern left: (identifier) @name @item)
-                    (rest_pattern (identifier) @name @item)
-                ]))))
-
-; Nested object destructuring in functions
-(statement_block
-    (lexical_declaration
-        ["let" "const"] @context
-        (variable_declarator
-            name: (object_pattern
-                [(shorthand_property_identifier_pattern) @name @item
-                 (pair_pattern value: (identifier) @name @item)
-                 (pair_pattern value: (assignment_pattern left: (identifier) @name @item))
-                 (rest_pattern (identifier) @name @item)]))))
-
-(comment) @annotation
diff --git a/crates/languages/src/typescript/overrides.scm b/crates/languages/src/typescript/overrides.scm
deleted file mode 100644
index 8f437a1424..0000000000
--- a/crates/languages/src/typescript/overrides.scm
+++ /dev/null
@@ -1,9 +0,0 @@
-(comment) @comment.inclusive
-
-(string) @string
-
-(template_string (string_fragment) @string)
-
-(_ value: (call_expression
-  function: (identifier) @function_name_before_type_arguments
-  type_arguments: (type_arguments)))
diff --git a/crates/languages/src/typescript/runnables.scm b/crates/languages/src/typescript/runnables.scm
deleted file mode 100644
index 6bfc536329..0000000000
--- a/crates/languages/src/typescript/runnables.scm
+++ /dev/null
@@ -1,85 +0,0 @@
-; Add support for (node:test, bun:test, Jest and Deno.test) runnable
-; Function expression that has `it`, `test` or `describe` as the function name
-(
-    (call_expression
-        function: [
-            (identifier) @_name
-            (member_expression
-                object: [
-                    (identifier) @_name
-                    (member_expression object: (identifier) @_name)
-                ]
-            )
-        ]
-        (#any-of? @_name "it" "test" "describe" "context" "suite")
-        arguments: (
-            arguments . [
-                (string (string_fragment) @run)
-                (identifier) @run
-            ]
-        )
-    ) @_js-test
-
-    (#set! tag js-test)
-)
-
-; Add support for parameterized tests
-(
-    (call_expression
-        function: (call_expression
-            function: (member_expression
-                object: [(identifier) @_name (member_expression object: (identifier) @_name)]
-                property: (property_identifier) @_property
-            )
-            (#any-of? @_name "it" "test" "describe" "context" "suite")
-            (#any-of? @_property "each")
-        )
-        arguments: (
-            arguments . [
-                (string (string_fragment) @run)
-                (identifier) @run
-            ]
-        )
-    ) @_js-test
-
-    (#set! tag js-test)
-)
-
-; Add support for Deno.test with string names
-(
-    (call_expression
-        function: (member_expression
-            object: (identifier) @_namespace
-            property: (property_identifier) @_method
-        )
-        (#eq? @_namespace "Deno")
-        (#eq? @_method "test")
-        arguments: (
-            arguments . [
-                (string (string_fragment) @run @DENO_TEST_NAME)
-                (identifier) @run @DENO_TEST_NAME
-            ]
-        )
-    ) @_js-test
-
-    (#set! tag js-test)
-)
-
-; Add support for Deno.test with named function expressions
-(
-    (call_expression
-        function: (member_expression
-            object: (identifier) @_namespace
-            property: (property_identifier) @_method
-        )
-        (#eq? @_namespace "Deno")
-        (#eq? @_method "test")
-        arguments: (
-            arguments . (function_expression
-                name: (identifier) @run @DENO_TEST_NAME
-            )
-        )
-    ) @_js-test
-
-    (#set! tag js-test)
-)
diff --git a/crates/languages/src/typescript/textobjects.scm b/crates/languages/src/typescript/textobjects.scm
deleted file mode 100644
index 836fed35ba..0000000000
--- a/crates/languages/src/typescript/textobjects.scm
+++ /dev/null
@@ -1,79 +0,0 @@
-(comment)+ @comment.around
-
-(function_declaration
-    body: (_
-        "{"
-        (_)* @function.inside
-        "}")) @function.around
-
-(method_definition
-    body: (_
-        "{"
-        (_)* @function.inside
-        "}")) @function.around
-
-(function_expression
-    body: (_
-        "{"
-        (_)* @function.inside
-        "}")) @function.around
-
-(arrow_function
-    body: (statement_block
-        "{"
-        (_)* @function.inside
-        "}")) @function.around
-
-(arrow_function) @function.around
-(function_signature) @function.around
-
-(generator_function
-    body: (_
-        "{"
-        (_)* @function.inside
-        "}")) @function.around
-
-(generator_function_declaration
-    body: (_
-        "{"
-        (_)* @function.inside
-        "}")) @function.around
-
-(class_declaration
-    body: (_
-        "{"
-        [(_) ";"?]* @class.inside
-        "}" )) @class.around
-
-(class
-    body: (_
-        "{"
-        (_)* @class.inside
-        "}" )) @class.around
-
-(interface_declaration
-    body: (_
-        "{"
-        [(_) ";"?]* @class.inside
-        "}" )) @class.around
-
-(enum_declaration
-    body: (_
-        "{"
-        [(_) ","?]* @class.inside
-        "}" )) @class.around
-
-(ambient_declaration
-    (module
-    body: (_
-        "{"
-        [(_) ";"?]* @class.inside
-        "}" ))) @class.around
-
-(internal_module
-    body: (_
-        "{"
-        [(_) ";"?]* @class.inside
-        "}" )) @class.around
-
-(type_alias_declaration) @class.around
diff --git a/crates/languages/src/vtsls.rs b/crates/languages/src/vtsls.rs
deleted file mode 100644
index b21ae1a4de..0000000000
--- a/crates/languages/src/vtsls.rs
+++ /dev/null
@@ -1,362 +0,0 @@
-use anyhow::Result;
-use async_trait::async_trait;
-use collections::HashMap;
-use gpui::AsyncApp;
-use language::{LanguageName, LspAdapter, LspAdapterDelegate, LspInstaller, Toolchain};
-use lsp::{CodeActionKind, LanguageServerBinary, LanguageServerName, Uri};
-use node_runtime::{NodeRuntime, VersionStrategy};
-use project::{Fs, lsp_store::language_server_settings};
-use regex::Regex;
-use serde_json::Value;
-use std::{
-    ffi::OsString,
-    path::{Path, PathBuf},
-    sync::{Arc, LazyLock},
-};
-use util::{ResultExt, maybe, merge_json_value_into};
-
-fn typescript_server_binary_arguments(server_path: &Path) -> Vec<OsString> {
-    vec![server_path.into(), "--stdio".into()]
-}
-
-pub struct VtslsLspAdapter {
-    node: NodeRuntime,
-    fs: Arc<dyn Fs>,
-}
-
-impl VtslsLspAdapter {
-    const PACKAGE_NAME: &'static str = "@vtsls/language-server";
-    const SERVER_PATH: &'static str = "node_modules/@vtsls/language-server/bin/vtsls.js";
-
-    const TYPESCRIPT_PACKAGE_NAME: &'static str = "typescript";
-    const TYPESCRIPT_TSDK_PATH: &'static str = "node_modules/typescript/lib";
-    const TYPESCRIPT_YARN_TSDK_PATH: &'static str = ".yarn/sdks/typescript/lib";
-
-    pub fn new(node: NodeRuntime, fs: Arc<dyn Fs>) -> Self {
-        VtslsLspAdapter { node, fs }
-    }
-
-    async fn tsdk_path(&self, adapter: &Arc<dyn LspAdapterDelegate>) -> Option<&'static str> {
-        let yarn_sdk = adapter
-            .worktree_root_path()
-            .join(Self::TYPESCRIPT_YARN_TSDK_PATH);
-
-        let tsdk_path = if self.fs.is_dir(&yarn_sdk).await {
-            Self::TYPESCRIPT_YARN_TSDK_PATH
-        } else {
-            Self::TYPESCRIPT_TSDK_PATH
-        };
-
-        if self
-            .fs
-            .is_dir(&adapter.worktree_root_path().join(tsdk_path))
-            .await
-        {
-            Some(tsdk_path)
-        } else {
-            None
-        }
-    }
-
-    pub fn enhance_diagnostic_message(message: &str) -> Option<String> {
-        static SINGLE_WORD_REGEX: LazyLock<Regex> =
-            LazyLock::new(|| Regex::new(r"'([^\s']*)'").expect("Failed to create REGEX"));
-
-        static MULTI_WORD_REGEX: LazyLock<Regex> =
-            LazyLock::new(|| Regex::new(r"'([^']+\s+[^']*)'").expect("Failed to create REGEX"));
-
-        let first = SINGLE_WORD_REGEX.replace_all(message, "`$1`").to_string();
-        let second = MULTI_WORD_REGEX
-            .replace_all(&first, "\n```typescript\n$1\n```\n")
-            .to_string();
-        Some(second)
-    }
-}
-
-pub struct TypeScriptVersions {
-    typescript_version: String,
-    server_version: String,
-}
-
-const SERVER_NAME: LanguageServerName = LanguageServerName::new_static("vtsls");
-
-impl LspInstaller for VtslsLspAdapter {
-    type BinaryVersion = TypeScriptVersions;
-
-    async fn fetch_latest_server_version(
-        &self,
-        _: &dyn LspAdapterDelegate,
-        _: bool,
-        _: &mut AsyncApp,
-    ) -> Result<TypeScriptVersions> {
-        Ok(TypeScriptVersions {
-            typescript_version: self.node.npm_package_latest_version("typescript").await?,
-            server_version: self
-                .node
-                .npm_package_latest_version("@vtsls/language-server")
-                .await?,
-        })
-    }
-
-    async fn check_if_user_installed(
-        &self,
-        delegate: &dyn LspAdapterDelegate,
-        _: Option<Toolchain>,
-        _: &AsyncApp,
-    ) -> Option<LanguageServerBinary> {
-        let env = delegate.shell_env().await;
-        let path = delegate.which(SERVER_NAME.as_ref()).await?;
-        Some(LanguageServerBinary {
-            path: path.clone(),
-            arguments: typescript_server_binary_arguments(&path),
-            env: Some(env),
-        })
-    }
-
-    async fn fetch_server_binary(
-        &self,
-        latest_version: TypeScriptVersions,
-        container_dir: PathBuf,
-        _: &dyn LspAdapterDelegate,
-    ) -> Result<LanguageServerBinary> {
-        let server_path = container_dir.join(Self::SERVER_PATH);
-
-        let mut packages_to_install = Vec::new();
-
-        if self
-            .node
-            .should_install_npm_package(
-                Self::PACKAGE_NAME,
-                &server_path,
-                &container_dir,
-                VersionStrategy::Latest(&latest_version.server_version),
-            )
-            .await
-        {
-            packages_to_install.push((Self::PACKAGE_NAME, latest_version.server_version.as_str()));
-        }
-
-        if self
-            .node
-            .should_install_npm_package(
-                Self::TYPESCRIPT_PACKAGE_NAME,
-                &container_dir.join(Self::TYPESCRIPT_TSDK_PATH),
-                &container_dir,
-                VersionStrategy::Latest(&latest_version.typescript_version),
-            )
-            .await
-        {
-            packages_to_install.push((
-                Self::TYPESCRIPT_PACKAGE_NAME,
-                latest_version.typescript_version.as_str(),
-            ));
-        }
-
-        self.node
-            .npm_install_packages(&container_dir, &packages_to_install)
-            .await?;
-
-        Ok(LanguageServerBinary {
-            path: self.node.binary_path().await?,
-            env: None,
-            arguments: typescript_server_binary_arguments(&server_path),
-        })
-    }
-
-    async fn cached_server_binary(
-        &self,
-        container_dir: PathBuf,
-        _: &dyn LspAdapterDelegate,
-    ) -> Option<LanguageServerBinary> {
-        get_cached_ts_server_binary(container_dir, &self.node).await
-    }
-}
-
-#[async_trait(?Send)]
-impl LspAdapter for VtslsLspAdapter {
-    fn name(&self) -> LanguageServerName {
-        SERVER_NAME
-    }
-
-    fn code_action_kinds(&self) -> Option<Vec<CodeActionKind>> {
-        Some(vec![
-            CodeActionKind::QUICKFIX,
-            CodeActionKind::REFACTOR,
-            CodeActionKind::REFACTOR_EXTRACT,
-            CodeActionKind::SOURCE,
-        ])
-    }
-
-    async fn label_for_completion(
-        &self,
-        item: &lsp::CompletionItem,
-        language: &Arc<language::Language>,
-    ) -> Option<language::CodeLabel> {
-        use lsp::CompletionItemKind as Kind;
-        let label_len = item.label.len();
-        let grammar = language.grammar()?;
-        let highlight_id = match item.kind? {
-            Kind::CLASS | Kind::INTERFACE | Kind::ENUM => grammar.highlight_id_for_name("type"),
-            Kind::CONSTRUCTOR => grammar.highlight_id_for_name("type"),
-            Kind::CONSTANT => grammar.highlight_id_for_name("constant"),
-            Kind::FUNCTION | Kind::METHOD => grammar.highlight_id_for_name("function"),
-            Kind::PROPERTY | Kind::FIELD => grammar.highlight_id_for_name("property"),
-            Kind::VARIABLE => grammar.highlight_id_for_name("variable"),
-            _ => None,
-        }?;
-
-        let text = if let Some(description) = item
-            .label_details
-            .as_ref()
-            .and_then(|label_details| label_details.description.as_ref())
-        {
-            format!("{} {}", item.label, description)
-        } else if let Some(detail) = &item.detail {
-            format!("{} {}", item.label, detail)
-        } else {
-            item.label.clone()
-        };
-        Some(language::CodeLabel::filtered(
-            text,
-            label_len,
-            item.filter_text.as_deref(),
-            vec![(0..label_len, highlight_id)],
-        ))
-    }
-
-    async fn workspace_configuration(
-        self: Arc<Self>,
-        delegate: &Arc<dyn LspAdapterDelegate>,
-        _: Option<Toolchain>,
-        _: Option<Uri>,
-        cx: &mut AsyncApp,
-    ) -> Result<Value> {
-        let tsdk_path = self.tsdk_path(delegate).await;
-        let config = serde_json::json!({
-            "tsdk": tsdk_path,
-            "suggest": {
-                "completeFunctionCalls": true
-            },
-            "inlayHints": {
-                "parameterNames": {
-                    "enabled": "all",
-                    "suppressWhenArgumentMatchesName": false
-                },
-                "parameterTypes": {
-                    "enabled": true
-                },
-                "variableTypes": {
-                    "enabled": true,
-                    "suppressWhenTypeMatchesName": false
-                },
-                "propertyDeclarationTypes": {
-                    "enabled": true
-                },
-                "functionLikeReturnTypes": {
-                    "enabled": true
-                },
-                "enumMemberValues": {
-                    "enabled": true
-                }
-            },
-            "tsserver": {
-                "maxTsServerMemory": 8092
-            },
-        });
-
-        let mut default_workspace_configuration = serde_json::json!({
-            "typescript": config,
-            "javascript": config,
-            "vtsls": {
-                "experimental": {
-                    "completion": {
-                        "enableServerSideFuzzyMatch": true,
-                        "entriesLimit": 5000,
-                    }
-                },
-               "autoUseWorkspaceTsdk": true
-            }
-        });
-
-        let override_options = cx.update(|cx| {
-            language_server_settings(delegate.as_ref(), &SERVER_NAME, cx)
-                .and_then(|s| s.settings.clone())
-        })?;
-
-        if let Some(override_options) = override_options {
-            merge_json_value_into(override_options, &mut default_workspace_configuration)
-        }
-
-        Ok(default_workspace_configuration)
-    }
-
-    fn diagnostic_message_to_markdown(&self, message: &str) -> Option<String> {
-        VtslsLspAdapter::enhance_diagnostic_message(message)
-    }
-
-    fn language_ids(&self) -> HashMap<LanguageName, String> {
-        HashMap::from_iter([
-            (LanguageName::new_static("TypeScript"), "typescript".into()),
-            (LanguageName::new_static("JavaScript"), "javascript".into()),
-            (LanguageName::new_static("TSX"), "typescriptreact".into()),
-        ])
-    }
-}
-
-async fn get_cached_ts_server_binary(
-    container_dir: PathBuf,
-    node: &NodeRuntime,
-) -> Option<LanguageServerBinary> {
-    maybe!(async {
-        let server_path = container_dir.join(VtslsLspAdapter::SERVER_PATH);
-        anyhow::ensure!(
-            server_path.exists(),
-            "missing executable in directory {container_dir:?}"
-        );
-        Ok(LanguageServerBinary {
-            path: node.binary_path().await?,
-            env: None,
-            arguments: typescript_server_binary_arguments(&server_path),
-        })
-    })
-    .await
-    .log_err()
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::vtsls::VtslsLspAdapter;
-
-    #[test]
-    fn test_diagnostic_message_to_markdown() {
-        // Leaves simple messages unchanged
-        let message = "The expected type comes from the return type of this signature.";
-
-        let expected = "The expected type comes from the return type of this signature.";
-
-        assert_eq!(
-            VtslsLspAdapter::enhance_diagnostic_message(message).expect("Should be some"),
-            expected
-        );
-
-        // Parses both multi-word and single-word correctly
-        let message = "Property 'baz' is missing in type '{ foo: string; bar: string; }' but required in type 'User'.";
-
-        let expected = "Property `baz` is missing in type \n```typescript\n{ foo: string; bar: string; }\n```\n but required in type `User`.";
-
-        assert_eq!(
-            VtslsLspAdapter::enhance_diagnostic_message(message).expect("Should be some"),
-            expected
-        );
-
-        // Parses multi-and-single word in any order, and ignores existing newlines
-        let message = "Type '() => { foo: string; bar: string; }' is not assignable to type 'GetUserFunction'.\n  Property 'baz' is missing in type '{ foo: string; bar: string; }' but required in type 'User'.";
-
-        let expected = "Type \n```typescript\n() => { foo: string; bar: string; }\n```\n is not assignable to type `GetUserFunction`.\n  Property `baz` is missing in type \n```typescript\n{ foo: string; bar: string; }\n```\n but required in type `User`.";
-
-        assert_eq!(
-            VtslsLspAdapter::enhance_diagnostic_message(message).expect("Should be some"),
-            expected
-        );
-    }
-}
diff --git a/crates/languages/src/yaml.rs b/crates/languages/src/yaml.rs
deleted file mode 100644
index 57f254a68f..0000000000
--- a/crates/languages/src/yaml.rs
+++ /dev/null
@@ -1,185 +0,0 @@
-use anyhow::Result;
-use async_trait::async_trait;
-use gpui::AsyncApp;
-use language::{
-    LspAdapter, LspAdapterDelegate, LspInstaller, Toolchain, language_settings::AllLanguageSettings,
-};
-use lsp::{LanguageServerBinary, LanguageServerName, Uri};
-use node_runtime::{NodeRuntime, VersionStrategy};
-use project::lsp_store::language_server_settings;
-use serde_json::Value;
-use settings::{Settings, SettingsLocation};
-use std::{
-    ffi::OsString,
-    path::{Path, PathBuf},
-    sync::Arc,
-};
-use util::{ResultExt, maybe, merge_json_value_into, rel_path::RelPath};
-
-const SERVER_PATH: &str = "node_modules/yaml-language-server/bin/yaml-language-server";
-
-fn server_binary_arguments(server_path: &Path) -> Vec<OsString> {
-    vec![server_path.into(), "--stdio".into()]
-}
-
-pub struct YamlLspAdapter {
-    node: NodeRuntime,
-}
-
-impl YamlLspAdapter {
-    const SERVER_NAME: LanguageServerName = LanguageServerName::new_static("yaml-language-server");
-    const PACKAGE_NAME: &str = "yaml-language-server";
-    pub fn new(node: NodeRuntime) -> Self {
-        YamlLspAdapter { node }
-    }
-}
-
-impl LspInstaller for YamlLspAdapter {
-    type BinaryVersion = String;
-
-    async fn fetch_latest_server_version(
-        &self,
-        _: &dyn LspAdapterDelegate,
-        _: bool,
-        _: &mut AsyncApp,
-    ) -> Result<String> {
-        self.node
-            .npm_package_latest_version("yaml-language-server")
-            .await
-    }
-
-    async fn check_if_user_installed(
-        &self,
-        delegate: &dyn LspAdapterDelegate,
-        _: Option<Toolchain>,
-        _: &AsyncApp,
-    ) -> Option<LanguageServerBinary> {
-        let path = delegate.which(Self::SERVER_NAME.as_ref()).await?;
-        let env = delegate.shell_env().await;
-
-        Some(LanguageServerBinary {
-            path,
-            env: Some(env),
-            arguments: vec!["--stdio".into()],
-        })
-    }
-
-    async fn fetch_server_binary(
-        &self,
-        latest_version: String,
-        container_dir: PathBuf,
-        _: &dyn LspAdapterDelegate,
-    ) -> Result<LanguageServerBinary> {
-        let server_path = container_dir.join(SERVER_PATH);
-
-        self.node
-            .npm_install_packages(
-                &container_dir,
-                &[(Self::PACKAGE_NAME, latest_version.as_str())],
-            )
-            .await?;
-
-        Ok(LanguageServerBinary {
-            path: self.node.binary_path().await?,
-            env: None,
-            arguments: server_binary_arguments(&server_path),
-        })
-    }
-
-    async fn check_if_version_installed(
-        &self,
-        version: &String,
-        container_dir: &PathBuf,
-        _: &dyn LspAdapterDelegate,
-    ) -> Option<LanguageServerBinary> {
-        let server_path = container_dir.join(SERVER_PATH);
-
-        let should_install_language_server = self
-            .node
-            .should_install_npm_package(
-                Self::PACKAGE_NAME,
-                &server_path,
-                container_dir,
-                VersionStrategy::Latest(version),
-            )
-            .await;
-
-        if should_install_language_server {
-            None
-        } else {
-            Some(LanguageServerBinary {
-                path: self.node.binary_path().await.ok()?,
-                env: None,
-                arguments: server_binary_arguments(&server_path),
-            })
-        }
-    }
-
-    async fn cached_server_binary(
-        &self,
-        container_dir: PathBuf,
-        _: &dyn LspAdapterDelegate,
-    ) -> Option<LanguageServerBinary> {
-        get_cached_server_binary(container_dir, &self.node).await
-    }
-}
-
-#[async_trait(?Send)]
-impl LspAdapter for YamlLspAdapter {
-    fn name(&self) -> LanguageServerName {
-        Self::SERVER_NAME
-    }
-
-    async fn workspace_configuration(
-        self: Arc<Self>,
-        delegate: &Arc<dyn LspAdapterDelegate>,
-        _: Option<Toolchain>,
-        _: Option<Uri>,
-        cx: &mut AsyncApp,
-    ) -> Result<Value> {
-        let location = SettingsLocation {
-            worktree_id: delegate.worktree_id(),
-            path: RelPath::empty(),
-        };
-
-        let tab_size = cx.update(|cx| {
-            AllLanguageSettings::get(Some(location), cx)
-                .language(Some(location), Some(&"YAML".into()), cx)
-                .tab_size
-        })?;
-
-        let mut options = serde_json::json!({
-            "[yaml]": {"editor.tabSize": tab_size},
-            "yaml": {"format": {"enable": true}}
-        });
-
-        let project_options = cx.update(|cx| {
-            language_server_settings(delegate.as_ref(), &Self::SERVER_NAME, cx)
-                .and_then(|s| s.settings.clone())
-        })?;
-        if let Some(override_options) = project_options {
-            merge_json_value_into(override_options, &mut options);
-        }
-        Ok(options)
-    }
-}
-
-async fn get_cached_server_binary(
-    container_dir: PathBuf,
-    node: &NodeRuntime,
-) -> Option<LanguageServerBinary> {
-    maybe!(async {
-        let server_path = container_dir.join(SERVER_PATH);
-        anyhow::ensure!(
-            server_path.exists(),
-            "missing executable in directory {server_path:?}"
-        );
-        Ok(LanguageServerBinary {
-            path: node.binary_path().await?,
-            env: None,
-            arguments: server_binary_arguments(&server_path),
-        })
-    })
-    .await
-    .log_err()
-}
diff --git a/crates/languages/src/yaml/brackets.scm b/crates/languages/src/yaml/brackets.scm
deleted file mode 100644
index 0cfc5072d4..0000000000
--- a/crates/languages/src/yaml/brackets.scm
+++ /dev/null
@@ -1,4 +0,0 @@
-("[" @open "]" @close)
-("{" @open "}" @close)
-(("\"" @open "\"" @close) (#set! rainbow.exclude))
-(("'" @open "'" @close) (#set! rainbow.exclude))
diff --git a/crates/languages/src/yaml/config.toml b/crates/languages/src/yaml/config.toml
deleted file mode 100644
index 51e8e1224a..0000000000
--- a/crates/languages/src/yaml/config.toml
+++ /dev/null
@@ -1,24 +0,0 @@
-name = "YAML"
-grammar = "yaml"
-path_suffixes = ["yml", "yaml", "pixi.lock", "clang-format", "clangd"]
-line_comments = ["# "]
-autoclose_before = ",]}"
-brackets = [
-    { start = "{", end = "}", close = true, newline = true },
-    { start = "[", end = "]", close = true, newline = true },
-    { start = "\"", end = "\"", close = true, newline = false, not_in = ["string"] },
-    { start = "'", end = "'", close = true, newline = false, not_in = ["string"] },
-]
-
-auto_indent_on_paste = false
-auto_indent_using_last_non_empty_line = false
-# 1st block to match basic elements followed by ':' like 'test: ' for example
-# 2nd block to match for first element in an array if it's an object
-# For example:
-# ```yaml
-# test:
-#   - first: one
-# ```
-increase_indent_pattern = "(:?^[^#]*:\\s*[|>]?\\s*$)|(:?^\\s*-[^#]*:\\s*(:?#+.*)$)"
-prettier_parser_name = "yaml"
-tab_size = 2
diff --git a/crates/languages/src/yaml/highlights.scm b/crates/languages/src/yaml/highlights.scm
deleted file mode 100644
index 0e66aca66d..0000000000
--- a/crates/languages/src/yaml/highlights.scm
+++ /dev/null
@@ -1,49 +0,0 @@
-(boolean_scalar) @boolean
-(null_scalar) @constant.builtin
-
-[
-  (double_quote_scalar)
-  (single_quote_scalar)
-  (block_scalar)
-  (string_scalar)
-] @string
-
-(escape_sequence) @string.escape
-
-[
-  (integer_scalar)
-  (float_scalar)
-] @number
-
-(comment) @comment
-
-[
-  (anchor_name)
-  (alias_name)
-  (tag)
-] @type
-
-key: (flow_node (plain_scalar (string_scalar) @property))
-
-[
- ","
- "-"
- ":"
- ">"
- "?"
- "|"
-] @punctuation.delimiter
-
-[
- "["
- "]"
- "{"
- "}"
-] @punctuation.bracket
-
-[
- "*"
- "&"
- "---"
- "..."
-] @punctuation.special
diff --git a/crates/languages/src/yaml/injections.scm b/crates/languages/src/yaml/injections.scm
deleted file mode 100644
index c9de25a18f..0000000000
--- a/crates/languages/src/yaml/injections.scm
+++ /dev/null
@@ -1,25 +0,0 @@
-((comment) @injection.content
- (#set! injection.language "comment")
-)
-
-; GitHub actions: JavaScript for workflow scripting (inline and block)
-(block_mapping
-  (block_mapping_pair
-    key: (flow_node) @_uses (#eq? @_uses "uses")
-    value: (flow_node) @_actions_ghs (#match? @_actions_ghs "^actions/github-script"))
-  (block_mapping_pair
-    key: (flow_node) @_with (#eq? @_with "with")
-    value: (block_node
-      (block_mapping
-        (block_mapping_pair
-          key: (flow_node) @_run (#eq? @_run "script")
-          value: [
-            (flow_node (plain_scalar (string_scalar) @injection.content))
-            (block_node (block_scalar) @injection.content)
-          ]
-          (#set! injection.language "javascript")
-        )
-      )
-    )
-  )
-)
diff --git a/crates/languages/src/yaml/outline.scm b/crates/languages/src/yaml/outline.scm
deleted file mode 100644
index c5a7f8e5d4..0000000000
--- a/crates/languages/src/yaml/outline.scm
+++ /dev/null
@@ -1,9 +0,0 @@
-(block_mapping_pair
-    key:
-        (flow_node
-            (plain_scalar
-                (string_scalar) @name))
-    value:
-        (flow_node
-            (plain_scalar
-                (string_scalar) @context))?) @item
diff --git a/crates/languages/src/yaml/overrides.scm b/crates/languages/src/yaml/overrides.scm
deleted file mode 100644
index 9503051a62..0000000000
--- a/crates/languages/src/yaml/overrides.scm
+++ /dev/null
@@ -1,5 +0,0 @@
-(comment) @comment.inclusive
-[
-  (single_quote_scalar)
-  (double_quote_scalar)
-] @string
diff --git a/crates/languages/src/yaml/redactions.scm b/crates/languages/src/yaml/redactions.scm
deleted file mode 100644
index 85fdbd26ea..0000000000
--- a/crates/languages/src/yaml/redactions.scm
+++ /dev/null
@@ -1 +0,0 @@
-(block_mapping_pair value: (flow_node) @redact)
diff --git a/crates/languages/src/yaml/textobjects.scm b/crates/languages/src/yaml/textobjects.scm
deleted file mode 100644
index 81fd20245b..0000000000
--- a/crates/languages/src/yaml/textobjects.scm
+++ /dev/null
@@ -1 +0,0 @@
-(comment)+ @comment.around
diff --git a/crates/languages/src/zed-keybind-context/brackets.scm b/crates/languages/src/zed-keybind-context/brackets.scm
deleted file mode 100644
index d086b2e98d..0000000000
--- a/crates/languages/src/zed-keybind-context/brackets.scm
+++ /dev/null
@@ -1 +0,0 @@
-("(" @open ")" @close)
diff --git a/crates/languages/src/zed-keybind-context/config.toml b/crates/languages/src/zed-keybind-context/config.toml
deleted file mode 100644
index a999c70f66..0000000000
--- a/crates/languages/src/zed-keybind-context/config.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-name = "Zed Keybind Context"
-grammar = "rust"
-autoclose_before = ")"
-brackets = [
-    { start = "(", end = ")", close = true, newline = false },
-]
diff --git a/crates/languages/src/zed-keybind-context/highlights.scm b/crates/languages/src/zed-keybind-context/highlights.scm
deleted file mode 100644
index 9c5ec58eae..0000000000
--- a/crates/languages/src/zed-keybind-context/highlights.scm
+++ /dev/null
@@ -1,23 +0,0 @@
-(identifier) @variable
-
-[
-  "("
-  ")"
-] @punctuation.bracket
-
-[
-  (integer_literal)
-  (float_literal)
-] @number
-
-(boolean_literal) @boolean
-
-[
-  "!="
-  "=="
-  "=>"
-  ">"
-  "&&"
-  "||"
-  "!"
-] @operator
diff --git a/crates/line_ending_selector/Cargo.toml b/crates/line_ending_selector/Cargo.toml
deleted file mode 100644
index 462404b150..0000000000
--- a/crates/line_ending_selector/Cargo.toml
+++ /dev/null
@@ -1,23 +0,0 @@
-[package]
-name = "line_ending_selector"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/line_ending_selector.rs"
-doctest = false
-
-[dependencies]
-editor.workspace = true
-gpui.workspace = true
-language.workspace = true
-picker.workspace = true
-project.workspace = true
-ui.workspace = true
-util.workspace = true
-workspace.workspace = true
diff --git a/crates/line_ending_selector/LICENSE-GPL b/crates/line_ending_selector/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/line_ending_selector/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/line_ending_selector/src/line_ending_indicator.rs b/crates/line_ending_selector/src/line_ending_indicator.rs
deleted file mode 100644
index ee858d706b..0000000000
--- a/crates/line_ending_selector/src/line_ending_indicator.rs
+++ /dev/null
@@ -1,68 +0,0 @@
-use editor::Editor;
-use gpui::{Entity, Subscription, WeakEntity};
-use language::LineEnding;
-use ui::{Tooltip, prelude::*};
-use workspace::{StatusBarSettings, StatusItemView, item::ItemHandle, item::Settings};
-
-use crate::{LineEndingSelector, Toggle};
-
-#[derive(Default)]
-pub struct LineEndingIndicator {
-    line_ending: Option<LineEnding>,
-    active_editor: Option<WeakEntity<Editor>>,
-    _observe_active_editor: Option<Subscription>,
-}
-
-impl LineEndingIndicator {
-    fn update(&mut self, editor: Entity<Editor>, _: &mut Window, cx: &mut Context<Self>) {
-        self.line_ending = None;
-        self.active_editor = None;
-
-        if let Some((_, buffer, _)) = editor.read(cx).active_excerpt(cx) {
-            let line_ending = buffer.read(cx).line_ending();
-            self.line_ending = Some(line_ending);
-            self.active_editor = Some(editor.downgrade());
-        }
-
-        cx.notify();
-    }
-}
-
-impl Render for LineEndingIndicator {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        if !StatusBarSettings::get_global(cx).line_endings_button {
-            return div();
-        }
-
-        div().when_some(self.line_ending.as_ref(), |el, line_ending| {
-            el.child(
-                Button::new("change-line-ending", line_ending.label())
-                    .label_size(LabelSize::Small)
-                    .on_click(cx.listener(|this, _, window, cx| {
-                        if let Some(editor) = this.active_editor.as_ref() {
-                            LineEndingSelector::toggle(editor, window, cx);
-                        }
-                    }))
-                    .tooltip(|_window, cx| Tooltip::for_action("Select Line Ending", &Toggle, cx)),
-            )
-        })
-    }
-}
-
-impl StatusItemView for LineEndingIndicator {
-    fn set_active_pane_item(
-        &mut self,
-        active_pane_item: Option<&dyn ItemHandle>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(editor) = active_pane_item.and_then(|item| item.downcast::<Editor>()) {
-            self._observe_active_editor = Some(cx.observe_in(&editor, window, Self::update));
-            self.update(editor, window, cx);
-        } else {
-            self.line_ending = None;
-            self._observe_active_editor = None;
-        }
-        cx.notify();
-    }
-}
diff --git a/crates/line_ending_selector/src/line_ending_selector.rs b/crates/line_ending_selector/src/line_ending_selector.rs
deleted file mode 100644
index 504c327a34..0000000000
--- a/crates/line_ending_selector/src/line_ending_selector.rs
+++ /dev/null
@@ -1,192 +0,0 @@
-mod line_ending_indicator;
-
-use editor::Editor;
-use gpui::{DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, Task, WeakEntity, actions};
-use language::{Buffer, LineEnding};
-pub use line_ending_indicator::LineEndingIndicator;
-use picker::{Picker, PickerDelegate};
-use project::Project;
-use std::sync::Arc;
-use ui::{ListItem, ListItemSpacing, prelude::*};
-use util::ResultExt;
-use workspace::ModalView;
-
-actions!(
-    line_ending_selector,
-    [
-        /// Toggles the line ending selector modal.
-        Toggle
-    ]
-);
-
-pub fn init(cx: &mut App) {
-    cx.observe_new(LineEndingSelector::register).detach();
-}
-
-pub struct LineEndingSelector {
-    picker: Entity<Picker<LineEndingSelectorDelegate>>,
-}
-
-impl LineEndingSelector {
-    fn register(editor: &mut Editor, _window: Option<&mut Window>, cx: &mut Context<Editor>) {
-        let editor_handle = cx.weak_entity();
-        editor
-            .register_action(move |_: &Toggle, window, cx| {
-                Self::toggle(&editor_handle, window, cx);
-            })
-            .detach();
-    }
-
-    fn toggle(editor: &WeakEntity<Editor>, window: &mut Window, cx: &mut App) {
-        let Some((workspace, buffer)) = editor
-            .update(cx, |editor, cx| {
-                Some((editor.workspace()?, editor.active_excerpt(cx)?.1))
-            })
-            .ok()
-            .flatten()
-        else {
-            return;
-        };
-
-        workspace.update(cx, |workspace, cx| {
-            let project = workspace.project().clone();
-            workspace.toggle_modal(window, cx, move |window, cx| {
-                LineEndingSelector::new(buffer, project, window, cx)
-            });
-        })
-    }
-
-    fn new(
-        buffer: Entity<Buffer>,
-        project: Entity<Project>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let line_ending = buffer.read(cx).line_ending();
-        let delegate =
-            LineEndingSelectorDelegate::new(cx.entity().downgrade(), buffer, project, line_ending);
-        let picker = cx.new(|cx| Picker::nonsearchable_uniform_list(delegate, window, cx));
-        Self { picker }
-    }
-}
-
-impl Render for LineEndingSelector {
-    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex().w(rems(34.)).child(self.picker.clone())
-    }
-}
-
-impl Focusable for LineEndingSelector {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        self.picker.focus_handle(cx)
-    }
-}
-
-impl EventEmitter<DismissEvent> for LineEndingSelector {}
-impl ModalView for LineEndingSelector {}
-
-struct LineEndingSelectorDelegate {
-    line_ending_selector: WeakEntity<LineEndingSelector>,
-    buffer: Entity<Buffer>,
-    project: Entity<Project>,
-    line_ending: LineEnding,
-    matches: Vec<LineEnding>,
-    selected_index: usize,
-}
-
-impl LineEndingSelectorDelegate {
-    fn new(
-        line_ending_selector: WeakEntity<LineEndingSelector>,
-        buffer: Entity<Buffer>,
-        project: Entity<Project>,
-        line_ending: LineEnding,
-    ) -> Self {
-        Self {
-            line_ending_selector,
-            buffer,
-            project,
-            line_ending,
-            matches: vec![LineEnding::Unix, LineEnding::Windows],
-            selected_index: 0,
-        }
-    }
-}
-
-impl PickerDelegate for LineEndingSelectorDelegate {
-    type ListItem = ListItem;
-
-    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
-        "Select a line ending…".into()
-    }
-
-    fn match_count(&self) -> usize {
-        self.matches.len()
-    }
-
-    fn confirm(&mut self, _: bool, window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        if let Some(line_ending) = self.matches.get(self.selected_index) {
-            self.buffer.update(cx, |this, cx| {
-                this.set_line_ending(*line_ending, cx);
-            });
-            let buffer = self.buffer.clone();
-            let project = self.project.clone();
-            cx.defer(move |cx| {
-                project.update(cx, |this, cx| {
-                    this.save_buffer(buffer, cx).detach();
-                });
-            });
-        }
-        self.dismissed(window, cx);
-    }
-
-    fn dismissed(&mut self, _: &mut Window, cx: &mut Context<Picker<Self>>) {
-        self.line_ending_selector
-            .update(cx, |_, cx| cx.emit(DismissEvent))
-            .log_err();
-    }
-
-    fn selected_index(&self) -> usize {
-        self.selected_index
-    }
-
-    fn set_selected_index(
-        &mut self,
-        ix: usize,
-        _window: &mut Window,
-        _: &mut Context<Picker<Self>>,
-    ) {
-        self.selected_index = ix;
-    }
-
-    fn update_matches(
-        &mut self,
-        _query: String,
-        _window: &mut Window,
-        _cx: &mut Context<Picker<Self>>,
-    ) -> gpui::Task<()> {
-        return Task::ready(());
-    }
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        _: &mut Window,
-        _: &mut Context<Picker<Self>>,
-    ) -> Option<Self::ListItem> {
-        let line_ending = self.matches.get(ix)?;
-        let label = line_ending.label();
-
-        let mut list_item = ListItem::new(ix)
-            .inset(true)
-            .spacing(ListItemSpacing::Sparse)
-            .toggle_state(selected)
-            .child(Label::new(label));
-
-        if &self.line_ending == line_ending {
-            list_item = list_item.end_slot(Icon::new(IconName::Check).color(Color::Muted));
-        }
-
-        Some(list_item)
-    }
-}
diff --git a/crates/livekit_api/Cargo.toml b/crates/livekit_api/Cargo.toml
deleted file mode 100644
index 421deee113..0000000000
--- a/crates/livekit_api/Cargo.toml
+++ /dev/null
@@ -1,30 +0,0 @@
-[package]
-name = "livekit_api"
-version = "0.1.0"
-edition.workspace = true
-description = "SDK for the LiveKit server API"
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/livekit_api.rs"
-doctest = false
-
-[dependencies]
-anyhow.workspace = true
-async-trait.workspace = true
-jsonwebtoken.workspace = true
-log.workspace = true
-prost.workspace = true
-prost-types.workspace = true
-reqwest.workspace = true
-serde.workspace = true
-
-[build-dependencies]
-prost-build.workspace = true
-
-[package.metadata.cargo-machete]
-ignored = ["prost-types"]
diff --git a/crates/livekit_api/LICENSE-GPL b/crates/livekit_api/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/livekit_api/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/livekit_api/build.rs b/crates/livekit_api/build.rs
deleted file mode 100644
index ce780dfc47..0000000000
--- a/crates/livekit_api/build.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-fn main() {
-    prost_build::Config::new()
-        .type_attribute("SendDataResponse", "#[allow(clippy::empty_docs)]")
-        .compile_protos(
-            &["vendored/protocol/livekit_room.proto"],
-            &["vendored/protocol"],
-        )
-        .unwrap();
-}
diff --git a/crates/livekit_api/src/livekit_api.rs b/crates/livekit_api/src/livekit_api.rs
deleted file mode 100644
index 745f511b12..0000000000
--- a/crates/livekit_api/src/livekit_api.rs
+++ /dev/null
@@ -1,182 +0,0 @@
-pub mod proto;
-pub mod token;
-
-use anyhow::Result;
-use async_trait::async_trait;
-use prost::Message;
-use reqwest::header::CONTENT_TYPE;
-use std::{future::Future, sync::Arc, time::Duration};
-
-#[async_trait]
-pub trait Client: Send + Sync {
-    fn url(&self) -> &str;
-    async fn create_room(&self, name: String) -> Result<()>;
-    async fn delete_room(&self, name: String) -> Result<()>;
-    async fn remove_participant(&self, room: String, identity: String) -> Result<()>;
-    async fn update_participant(
-        &self,
-        room: String,
-        identity: String,
-        permission: proto::ParticipantPermission,
-    ) -> Result<()>;
-    fn room_token(&self, room: &str, identity: &str) -> Result<String>;
-    fn guest_token(&self, room: &str, identity: &str) -> Result<String>;
-}
-
-pub struct LiveKitParticipantUpdate {}
-
-#[derive(Clone)]
-pub struct LiveKitClient {
-    http: reqwest::Client,
-    url: Arc<str>,
-    key: Arc<str>,
-    secret: Arc<str>,
-}
-
-impl LiveKitClient {
-    pub fn new(mut url: String, key: String, secret: String) -> Self {
-        if url.ends_with('/') {
-            url.pop();
-        }
-
-        Self {
-            http: reqwest::ClientBuilder::new()
-                .timeout(Duration::from_secs(5))
-                .build()
-                .unwrap(),
-            url: url.into(),
-            key: key.into(),
-            secret: secret.into(),
-        }
-    }
-
-    fn request<Req, Res>(
-        &self,
-        path: &str,
-        grant: token::VideoGrant,
-        body: Req,
-    ) -> impl Future<Output = Result<Res>>
-    where
-        Req: Message,
-        Res: Default + Message,
-    {
-        let client = self.http.clone();
-        let token = token::create(&self.key, &self.secret, None, grant);
-        let url = format!("{}/{}", self.url, path);
-        log::info!("Request {}: {:?}", url, body);
-        async move {
-            let token = token?;
-            let response = client
-                .post(&url)
-                .header(CONTENT_TYPE, "application/protobuf")
-                .bearer_auth(token)
-                .body(body.encode_to_vec())
-                .send()
-                .await?;
-
-            if response.status().is_success() {
-                log::info!("Response {}: {:?}", url, response.status());
-                Ok(Res::decode(response.bytes().await?)?)
-            } else {
-                log::error!("Response {}: {:?}", url, response.status());
-                anyhow::bail!(
-                    "POST {} failed with status code {:?}, {:?}",
-                    url,
-                    response.status(),
-                    response.text().await
-                );
-            }
-        }
-    }
-}
-
-#[async_trait]
-impl Client for LiveKitClient {
-    fn url(&self) -> &str {
-        &self.url
-    }
-
-    async fn create_room(&self, name: String) -> Result<()> {
-        let _: proto::Room = self
-            .request(
-                "twirp/livekit.RoomService/CreateRoom",
-                token::VideoGrant {
-                    room_create: Some(true),
-                    ..Default::default()
-                },
-                proto::CreateRoomRequest {
-                    name,
-                    ..Default::default()
-                },
-            )
-            .await?;
-        Ok(())
-    }
-
-    async fn delete_room(&self, name: String) -> Result<()> {
-        let _: proto::DeleteRoomResponse = self
-            .request(
-                "twirp/livekit.RoomService/DeleteRoom",
-                token::VideoGrant {
-                    room_create: Some(true),
-                    ..Default::default()
-                },
-                proto::DeleteRoomRequest { room: name },
-            )
-            .await?;
-        Ok(())
-    }
-
-    async fn remove_participant(&self, room: String, identity: String) -> Result<()> {
-        let _: proto::RemoveParticipantResponse = self
-            .request(
-                "twirp/livekit.RoomService/RemoveParticipant",
-                token::VideoGrant::to_admin(&room),
-                proto::RoomParticipantIdentity {
-                    room: room.clone(),
-                    identity,
-                },
-            )
-            .await?;
-        Ok(())
-    }
-
-    async fn update_participant(
-        &self,
-        room: String,
-        identity: String,
-        permission: proto::ParticipantPermission,
-    ) -> Result<()> {
-        let _: proto::ParticipantInfo = self
-            .request(
-                "twirp/livekit.RoomService/UpdateParticipant",
-                token::VideoGrant::to_admin(&room),
-                proto::UpdateParticipantRequest {
-                    room: room.clone(),
-                    identity,
-                    metadata: "".to_string(),
-                    permission: Some(permission),
-                },
-            )
-            .await?;
-        Ok(())
-    }
-
-    fn room_token(&self, room: &str, identity: &str) -> Result<String> {
-        token::create(
-            &self.key,
-            &self.secret,
-            Some(identity),
-            token::VideoGrant::to_join(room),
-        )
-    }
-
-    fn guest_token(&self, room: &str, identity: &str) -> Result<String> {
-        token::create(
-            &self.key,
-            &self.secret,
-            Some(identity),
-            token::VideoGrant::for_guest(room),
-        )
-    }
-}
diff --git a/crates/livekit_api/src/proto.rs b/crates/livekit_api/src/proto.rs
deleted file mode 100644
index a304705c59..0000000000
--- a/crates/livekit_api/src/proto.rs
+++ /dev/null
@@ -1 +0,0 @@
-include!(concat!(env!("OUT_DIR"), "/livekit.rs"));
diff --git a/crates/livekit_api/src/token.rs b/crates/livekit_api/src/token.rs
deleted file mode 100644
index 6f12d78855..0000000000
--- a/crates/livekit_api/src/token.rs
+++ /dev/null
@@ -1,110 +0,0 @@
-use anyhow::Result;
-use jsonwebtoken::{DecodingKey, EncodingKey, Header, Validation};
-use serde::{Deserialize, Serialize};
-use std::{
-    borrow::Cow,
-    ops::Add,
-    time::{Duration, SystemTime, UNIX_EPOCH},
-};
-
-const DEFAULT_TTL: Duration = Duration::from_secs(6 * 60 * 60); // 6 hours
-
-#[derive(Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ClaimGrants<'a> {
-    pub iss: Cow<'a, str>,
-    pub sub: Option<Cow<'a, str>>,
-    pub iat: u64,
-    pub exp: u64,
-    pub nbf: u64,
-    pub jwtid: Option<Cow<'a, str>>,
-    pub video: VideoGrant<'a>,
-}
-
-#[derive(Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct VideoGrant<'a> {
-    pub room_create: Option<bool>,
-    pub room_join: Option<bool>,
-    pub room_list: Option<bool>,
-    pub room_record: Option<bool>,
-    pub room_admin: Option<bool>,
-    pub room: Option<Cow<'a, str>>,
-    pub can_publish: Option<bool>,
-    pub can_subscribe: Option<bool>,
-    pub can_publish_data: Option<bool>,
-    pub hidden: Option<bool>,
-    pub recorder: Option<bool>,
-}
-
-impl<'a> VideoGrant<'a> {
-    pub fn to_admin(room: &'a str) -> Self {
-        Self {
-            room_admin: Some(true),
-            room: Some(Cow::Borrowed(room)),
-            ..Default::default()
-        }
-    }
-
-    pub fn to_join(room: &'a str) -> Self {
-        Self {
-            room: Some(Cow::Borrowed(room)),
-            room_join: Some(true),
-            can_publish: Some(true),
-            can_subscribe: Some(true),
-            ..Default::default()
-        }
-    }
-
-    pub fn for_guest(room: &'a str) -> Self {
-        Self {
-            room: Some(Cow::Borrowed(room)),
-            room_join: Some(true),
-            can_publish: Some(false),
-            can_subscribe: Some(true),
-            ..Default::default()
-        }
-    }
-}
-
-pub fn create(
-    api_key: &str,
-    secret_key: &str,
-    identity: Option<&str>,
-    video_grant: VideoGrant,
-) -> Result<String> {
-    if video_grant.room_join.is_some() && identity.is_none() {
-        anyhow::bail!("identity is required for room_join grant, but it is none");
-    }
-
-    let now = SystemTime::now();
-
-    let claims = ClaimGrants {
-        iss: Cow::Borrowed(api_key),
-        sub: identity.map(Cow::Borrowed),
-        iat: now.duration_since(UNIX_EPOCH).unwrap().as_secs(),
-        exp: now
-            .add(DEFAULT_TTL)
-            .duration_since(UNIX_EPOCH)
-            .unwrap()
-            .as_secs(),
-        nbf: 0,
-        jwtid: identity.map(Cow::Borrowed),
-        video: video_grant,
-    };
-    Ok(jsonwebtoken::encode(
-        &Header::default(),
-        &claims,
-        &EncodingKey::from_secret(secret_key.as_ref()),
-    )?)
-}
-
-pub fn validate<'a>(token: &'a str, secret_key: &str) -> Result<ClaimGrants<'a>> {
-    let token = jsonwebtoken::decode(
-        token,
-        &DecodingKey::from_secret(secret_key.as_ref()),
-        &Validation::default(),
-    )?;
-
-    Ok(token.claims)
-}
diff --git a/crates/livekit_api/vendored/protocol/README.md b/crates/livekit_api/vendored/protocol/README.md
deleted file mode 100644
index 9f3d818bb5..0000000000
--- a/crates/livekit_api/vendored/protocol/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# LiveKit Protocol
-
-This is a vendored copy of the [LiveKit protocol](https://github.com/livekit/protocol).
-
-Vendored at [`8645a138fb2ea72c4dab13e739b1f3c9ea29ac84`](https://github.com/livekit/protocol/tree/8645a138fb2ea72c4dab13e739b1f3c9ea29ac84).
diff --git a/crates/livekit_api/vendored/protocol/livekit_analytics.proto b/crates/livekit_api/vendored/protocol/livekit_analytics.proto
deleted file mode 100644
index f9b33fb408..0000000000
--- a/crates/livekit_api/vendored/protocol/livekit_analytics.proto
+++ /dev/null
@@ -1,118 +0,0 @@
-syntax = "proto3";
-
-package livekit;
-option go_package = "github.com/livekit/protocol/livekit";
-option csharp_namespace = "LiveKit.Proto";
-option ruby_package = "LiveKit::Proto";
-
-import "google/protobuf/empty.proto";
-import "google/protobuf/timestamp.proto";
-import "livekit_models.proto";
-import "livekit_egress.proto";
-import "livekit_ingress.proto";
-
-service AnalyticsRecorderService {
-  rpc IngestStats(stream AnalyticsStats) returns (google.protobuf.Empty){};
-  rpc IngestEvents(stream AnalyticsEvents) returns (google.protobuf.Empty){};
-}
-
-enum StreamType {
-  UPSTREAM = 0;
-  DOWNSTREAM = 1;
-}
-
-message AnalyticsVideoLayer {
-  int32 layer = 1;
-  uint32 packets = 2;
-  uint64 bytes = 3;
-  uint32 frames = 4;
-}
-
-message AnalyticsStream {
-  uint32 ssrc = 1;
-  uint32 primary_packets = 2;
-  uint64 primary_bytes = 3;
-  uint32 retransmit_packets = 4;
-  uint64 retransmit_bytes = 5;
-  uint32 padding_packets = 6;
-  uint64 padding_bytes = 7;
-  uint32 packets_lost = 8;
-  uint32 frames = 9;
-  uint32 rtt = 10;
-  uint32 jitter = 11;
-  uint32 nacks = 12;
-  uint32 plis = 13;
-  uint32 firs = 14;
-  repeated AnalyticsVideoLayer video_layers = 15;
-}
-
-message AnalyticsStat {
-  string analytics_key = 1;
-  StreamType kind = 2;
-  google.protobuf.Timestamp time_stamp = 3;
-  string node = 4;
-  string room_id = 5;
-  string room_name = 6;
-  string participant_id = 7;
-  string track_id = 8;
-  float score = 9;
-  repeated AnalyticsStream streams = 10;
-  string mime = 11;
-}
-
-message AnalyticsStats {
-  repeated AnalyticsStat stats = 1;
-}
-
-enum AnalyticsEventType {
-  ROOM_CREATED = 0;
-  ROOM_ENDED = 1;
-  PARTICIPANT_JOINED = 2;
-  PARTICIPANT_LEFT = 3;
-  TRACK_PUBLISHED = 4;
-  TRACK_UNPUBLISHED = 5;
-  TRACK_SUBSCRIBED = 6;
-  TRACK_UNSUBSCRIBED = 7;
-  TRACK_PUBLISHED_UPDATE = 10;
-  PARTICIPANT_ACTIVE = 11;
-  EGRESS_STARTED = 12;
-  EGRESS_ENDED = 13;
-  TRACK_MAX_SUBSCRIBED_VIDEO_QUALITY = 14;
-  RECONNECTED = 15;
-  INGRESS_STARTED = 16;
-  INGRESS_ENDED = 17;
-}
-
-message AnalyticsClientMeta {
-  string region = 1;
-  string node = 2;
-  string client_addr = 3;
-  uint32 client_connect_time = 4;
-  // udp, tcp, turn
-  string connection_type = 5;
-}
-
-message AnalyticsEvent {
-  AnalyticsEventType type = 1;
-  google.protobuf.Timestamp timestamp = 2;
-  string room_id = 3;
-  Room room = 4;
-  string participant_id = 5;
-  ParticipantInfo participant = 6;
-  string track_id = 7;
-  TrackInfo track = 8;
-  string analytics_key = 10;
-  ClientInfo  client_info = 11;
-  AnalyticsClientMeta client_meta = 12;
-  string egress_id = 13;
-  VideoQuality max_subscribed_video_quality = 14;
-  ParticipantInfo publisher = 15;
-  string mime = 16;
-  EgressInfo egress = 17;
-  IngressInfo ingress = 18;
-
-}
-
-message AnalyticsEvents {
-  repeated AnalyticsEvent events = 1;
-}
diff --git a/crates/livekit_api/vendored/protocol/livekit_egress.proto b/crates/livekit_api/vendored/protocol/livekit_egress.proto
deleted file mode 100644
index 76cdf1e086..0000000000
--- a/crates/livekit_api/vendored/protocol/livekit_egress.proto
+++ /dev/null
@@ -1,263 +0,0 @@
-syntax = "proto3";
-
-package livekit;
-option go_package = "github.com/livekit/protocol/livekit";
-option csharp_namespace = "LiveKit.Proto";
-option ruby_package = "LiveKit::Proto";
-
-service Egress {
-  // start recording or streaming a room, participant, or tracks
-  rpc StartRoomCompositeEgress(RoomCompositeEgressRequest) returns (EgressInfo);
-  rpc StartTrackCompositeEgress(TrackCompositeEgressRequest) returns (EgressInfo);
-  rpc StartTrackEgress(TrackEgressRequest) returns (EgressInfo);
-
-  // update web composite layout
-  rpc UpdateLayout(UpdateLayoutRequest) returns (EgressInfo);
-
-  // add or remove stream endpoints
-  rpc UpdateStream(UpdateStreamRequest) returns (EgressInfo);
-
-  // list available egress
-  rpc ListEgress(ListEgressRequest) returns (ListEgressResponse);
-
-  // stop a recording or stream
-  rpc StopEgress(StopEgressRequest) returns (EgressInfo);
-}
-
-// composite using a web browser
-message RoomCompositeEgressRequest {
-  string room_name = 1;         // required
-  string layout = 2;            // (optional)
-  bool audio_only = 3;          // (default false)
-  bool video_only = 4;          // (default false)
-  string custom_base_url = 5;   // (default https://recorder.livekit.io)
-  oneof output {                // required
-    EncodedFileOutput file = 6;
-    StreamOutput stream = 7;
-    SegmentedFileOutput segments = 10;
-  }
-  oneof options {
-    EncodingOptionsPreset preset = 8; // (default H264_720P_30)
-    EncodingOptions advanced = 9;     // (optional)
-  }
-}
-
-// containerize up to one audio and one video track
-message TrackCompositeEgressRequest {
-  string room_name = 1;      // required
-  string audio_track_id = 2; // (optional)
-  string video_track_id = 3; // (optional)
-  oneof output {             // required
-    EncodedFileOutput file = 4;
-    StreamOutput stream = 5;
-    SegmentedFileOutput segments = 8;
-  }
-  oneof options {
-    EncodingOptionsPreset preset = 6; // (default H264_720P_30)
-    EncodingOptions advanced = 7;     // (optional)
-  }
-}
-
-// record tracks individually, without transcoding
-message TrackEgressRequest {
-  string room_name = 1;  // required
-  string track_id = 2;   // required
-  oneof output {         // required
-    DirectFileOutput file = 3;
-    string websocket_url = 4;
-  }
-}
-
-enum EncodedFileType {
-  DEFAULT_FILETYPE = 0; // file type chosen based on codecs
-  MP4  = 1;
-  OGG = 2;
-}
-
-message EncodedFileOutput {
-  EncodedFileType file_type = 1; // (optional)
-  string filepath = 2;           // (optional)
-  oneof output {                 // required
-    S3Upload s3 = 3;
-    GCPUpload gcp = 4;
-    AzureBlobUpload azure = 5;
-  }
-}
-
-// Used to generate HLS segments or other kind of segmented output
-message SegmentedFileOutput {
-  SegmentedFileProtocol protocol = 1; // (optional)
-  string filename_prefix = 2;      // (optional)
-  string playlist_name = 3;        // (optional)
-  uint32 segment_duration = 4;     // (optional)
-  oneof output {                   // required
-    S3Upload s3 = 5;
-    GCPUpload gcp = 6;
-    AzureBlobUpload azure = 7;
-  }
-}
-
-message DirectFileOutput {
-  string filepath = 1; // (optional)
-  oneof output {       // required
-    S3Upload s3 = 2;
-    GCPUpload gcp = 3;
-    AzureBlobUpload azure = 4;
-  }
-}
-
-message S3Upload {
-  string access_key = 1;
-  string secret = 2;
-  string region = 3;
-  string endpoint = 4;
-  string bucket = 5;
-}
-
-message GCPUpload {
-  bytes credentials = 1;
-  string bucket = 2;
-}
-
-message AzureBlobUpload {
-  string account_name = 1;
-  string account_key = 2;
-  string container_name = 3;
-}
-
-enum StreamProtocol {
-  DEFAULT_PROTOCOL = 0; // protocol chosen based on urls
-  RTMP = 1;
-}
-
-enum SegmentedFileProtocol {
-  DEFAULT_SEGMENTED_FILE_PROTOCOL = 0;
-  HLS_PROTOCOL = 1;
-}
-
-message StreamOutput {
-  StreamProtocol protocol = 1; // required
-  repeated string urls = 2;    // required
-}
-
-enum AudioCodec {
-  DEFAULT_AC = 0;
-  OPUS = 1;
-  AAC = 2;
-}
-
-enum VideoCodec {
-  DEFAULT_VC = 0;
-  H264_BASELINE = 1;
-  H264_MAIN = 2;
-  H264_HIGH = 3;
-}
-
-message EncodingOptions {
-  int32 width = 1;             // (default 1920)
-  int32 height = 2;            // (default 1080)
-  int32 depth = 3;             // (default 24)
-  int32 framerate = 4;         // (default 30)
-  AudioCodec audio_codec = 5;  // (default OPUS)
-  int32 audio_bitrate = 6;     // (default 128)
-  int32 audio_frequency = 7;   // (default 44100)
-  VideoCodec video_codec = 8;  // (default H264_MAIN)
-  int32 video_bitrate = 9;     // (default 4500)
-}
-
-enum EncodingOptionsPreset {
-  H264_720P_30 = 0;           //  1280x720, 30fps, 3000kpbs, H.264_MAIN / OPUS
-  H264_720P_60 = 1;           //  1280x720, 60fps, 4500kbps, H.264_MAIN / OPUS
-  H264_1080P_30 = 2;          // 1920x1080, 30fps, 4500kbps, H.264_MAIN / OPUS
-  H264_1080P_60 = 3;          // 1920x1080, 60fps, 6000kbps, H.264_MAIN / OPUS
-  PORTRAIT_H264_720P_30 = 4;  //  720x1280, 30fps, 3000kpbs, H.264_MAIN / OPUS
-  PORTRAIT_H264_720P_60 = 5;  //  720x1280, 60fps, 4500kbps, H.264_MAIN / OPUS
-  PORTRAIT_H264_1080P_30 = 6; // 1080x1920, 30fps, 4500kbps, H.264_MAIN / OPUS
-  PORTRAIT_H264_1080P_60 = 7; // 1080x1920, 60fps, 6000kbps, H.264_MAIN / OPUS
-}
-
-message UpdateLayoutRequest {
-  string egress_id = 1;
-  string layout = 2;
-}
-
-message UpdateStreamRequest {
-  string egress_id = 1;
-  repeated string add_output_urls = 2;
-  repeated string remove_output_urls = 3;
-}
-
-message ListEgressRequest {
-  string room_name = 1; // (optional, used to filter results)
-}
-
-message ListEgressResponse {
-  repeated EgressInfo items = 1;
-}
-
-message StopEgressRequest {
-  string egress_id = 1;
-}
-
-enum EgressStatus {
-  EGRESS_STARTING = 0;
-  EGRESS_ACTIVE = 1;
-  EGRESS_ENDING = 2;
-  EGRESS_COMPLETE = 3;
-  EGRESS_FAILED = 4;
-  EGRESS_ABORTED = 5;
-  EGRESS_LIMIT_REACHED = 6;
-}
-
-message EgressInfo {
-  string egress_id = 1;
-  string room_id = 2;
-  string room_name = 13;
-  EgressStatus status = 3;
-  int64 started_at = 10;
-  int64 ended_at = 11;
-  string error = 9;
-  oneof request {
-    RoomCompositeEgressRequest room_composite = 4;
-    TrackCompositeEgressRequest track_composite = 5;
-    TrackEgressRequest track = 6;
-  }
-  oneof result {
-    StreamInfoList stream = 7;
-    FileInfo file = 8;
-    SegmentsInfo segments = 12;
-  }
-}
-
-message StreamInfoList {
-  repeated StreamInfo info = 1;
-}
-
-message StreamInfo {
-  enum Status {
-    ACTIVE = 0;
-    FINISHED = 1;
-    FAILED = 2;
-  }
-
-  string url = 1;
-  int64 started_at = 2;
-  int64 ended_at = 3;
-  int64 duration = 4;
-  Status status = 5;
-}
-
-message FileInfo {
-  string filename = 1;
-  int64 duration = 6;
-  int64 size = 4;
-  string location = 5;
-}
-
-message SegmentsInfo {
-  string playlist_name = 1;
-  int64 duration = 2;
-  int64 size = 3;
-  string playlist_location = 4;
-  int64 segment_count = 5;
-}
diff --git a/crates/livekit_api/vendored/protocol/livekit_ingress.proto b/crates/livekit_api/vendored/protocol/livekit_ingress.proto
deleted file mode 100644
index 8a2611da80..0000000000
--- a/crates/livekit_api/vendored/protocol/livekit_ingress.proto
+++ /dev/null
@@ -1,134 +0,0 @@
-syntax = "proto3";
-
-package livekit;
-
-import "livekit_models.proto";
-
-option go_package = "github.com/livekit/protocol/livekit";
-option csharp_namespace = "LiveKit.Proto";
-option ruby_package = "LiveKit::Proto";
-
-service Ingress {
-    // Create a new Ingress
-    rpc CreateIngress(CreateIngressRequest) returns (IngressInfo);
-    // Update an existing Ingress. Ingress can only be updated when it's in ENDPOINT_WAITING state.
-    rpc UpdateIngress(UpdateIngressRequest) returns (IngressInfo);
-    rpc ListIngress(ListIngressRequest) returns (ListIngressResponse);
-    rpc DeleteIngress(DeleteIngressRequest) returns (IngressInfo);
-}
-
-message CreateIngressRequest {
-    IngressInput input_type = 1;
-    // User provided identifier for the ingress
-    string name = 2;
-    // room to publish to
-    string room_name = 3;
-    // publish as participant
-    string participant_identity = 4;
-    // name of publishing participant (used for display only)
-    string participant_name = 5;
-    IngressAudioOptions audio = 6;
-    IngressVideoOptions video = 7;
-}
-
-enum IngressInput {
-    RTMP_INPUT = 0;
-    //    FILE_INPUT = 1;
-    //    SRT_INPUT = 2;
-    //    URL_INPUT = 3;
-}
-
-message IngressAudioOptions {
-    string name = 1;
-    TrackSource source = 2;
-    // desired mime_type to publish to room
-    string mime_type = 3;
-    uint32 bitrate = 4;
-    bool disable_dtx = 5;
-    uint32 channels = 6;
-}
-
-message IngressVideoOptions {
-    string name = 1;
-    TrackSource source = 2;
-    // desired mime_type to publish to room
-    string mime_type = 3;
-    // simulcast layers to publish, when empty, it'll pick default simulcast
-    // layers at 1/2 and 1/4 of the dimensions
-    repeated VideoLayer layers = 4;
-}
-
-message IngressInfo {
-    string ingress_id = 1;
-    string name = 2;
-    string stream_key = 3;
-    string url = 4;
-    // for RTMP input, it'll be a rtmp:// URL
-    // for FILE input, it'll be a http:// URL
-    // for SRT input, it'll be a srt:// URL
-    IngressInput input_type = 5;
-    IngressAudioOptions audio = 6;
-    IngressVideoOptions video = 7;
-    string room_name = 8;
-    string participant_identity = 9;
-    string participant_name = 10;
-    bool reusable = 11;
-    IngressState state = 12; // Description of error/stream non compliance and debug info for publisher otherwise (received bitrate, resolution, bandwidth)
-
-    // NEXT_ID: 13
-}
-
-message IngressState {
-    enum Status {
-        ENDPOINT_INACTIVE = 0;
-        ENDPOINT_BUFFERING = 1;
-        ENDPOINT_PUBLISHING = 2;
-        ENDPOINT_ERROR = 3;
-    }
-
-    Status status = 1;
-    string error = 2; // Error/non compliance description if any
-    InputVideoState video = 3;
-    InputAudioState audio = 4;
-    string room_id = 5; // ID of the current/previous room published to
-    int64 started_at = 7;
-    repeated TrackInfo tracks = 6;
-}
-
-message InputVideoState {
-    uint32 mime_type = 1;
-//  uint32 bitrate = 2;
-    uint32 width = 3;
-    uint32 height = 4;
-    uint32 framerate = 5;
-}
-
-message InputAudioState {
-    uint32 mime_type = 1;
-//  uint32 bitrate = 2;
-    uint32 channels = 3;
-    uint32 sample_rate = 4;
-}
-
-message UpdateIngressRequest {
-    string ingress_id = 1;
-    string name = 2;
-    string room_name = 3;
-    string participant_identity = 4;
-    string participant_name = 5;
-    IngressAudioOptions audio = 6;
-    IngressVideoOptions video = 7;
-}
-
-message ListIngressRequest {
-    // when blank, lists all ingress endpoints
-    string room_name = 1;
-}
-
-message ListIngressResponse {
-    repeated IngressInfo items = 1;
-}
-
-message DeleteIngressRequest {
-    string ingress_id = 1;
-}
diff --git a/crates/livekit_api/vendored/protocol/livekit_internal.proto b/crates/livekit_api/vendored/protocol/livekit_internal.proto
deleted file mode 100644
index 02724fb56c..0000000000
--- a/crates/livekit_api/vendored/protocol/livekit_internal.proto
+++ /dev/null
@@ -1,138 +0,0 @@
-syntax = "proto3";
-
-package livekit;
-option go_package = "github.com/livekit/protocol/livekit";
-option csharp_namespace = "LiveKit.Proto";
-option ruby_package = "LiveKit::Proto";
-
-// internal protos, not exposed to clients
-import "livekit_models.proto";
-import "livekit_rtc.proto";
-import "livekit_room.proto";
-
-enum NodeType {
-  SERVER = 0;
-  CONTROLLER = 1;
-  MEDIA = 2;
-  TURN = 4;
-}
-
-enum NodeState {
-  STARTING_UP = 0;
-  SERVING = 1;
-  SHUTTING_DOWN = 2;
-}
-
-message Node {
-  string id = 1;
-  string ip = 2;
-  uint32 num_cpus = 3;
-  NodeStats stats = 4;
-  NodeType type = 5;
-  NodeState state = 6;
-  string region = 7;
-}
-
-message NodeStats {
-  // when server was started
-  int64 started_at = 1;
-  // when server last reported its status
-  int64 updated_at = 2;
-
-  // room
-  int32 num_rooms = 3;
-  int32 num_clients = 4;
-  int32 num_tracks_in = 5;
-  int32 num_tracks_out = 6;
-
-  // packet
-  uint64 bytes_in = 7;
-  uint64 bytes_out = 8;
-  uint64 packets_in = 9;
-  uint64 packets_out = 10;
-  uint64 nack_total = 11;
-  float bytes_in_per_sec = 12;
-  float bytes_out_per_sec = 13;
-  float packets_in_per_sec = 14;
-  float packets_out_per_sec = 15;
-  float nack_per_sec = 16;
-
-  // system
-  uint32 num_cpus = 17;
-  float load_avg_last1min = 18;
-  float load_avg_last5min = 19;
-  float load_avg_last15min = 20;
-  float cpu_load = 21;
-  uint32 sys_packets_out = 28;
-  uint32 sys_packets_dropped = 29;
-  float sys_packets_out_per_sec = 30;
-  float sys_packets_dropped_per_sec = 31;
-  float sys_packets_dropped_pct_per_sec = 32;
-
-  // retransmissions
-  uint64 retransmit_bytes_out = 22;
-  uint64 retransmit_packets_out = 23;
-  float retransmit_bytes_out_per_sec = 24;
-  float retransmit_packets_out_per_sec = 25;
-
-  // participant joins
-  uint64 participant_join = 26;
-  float participant_join_per_sec = 27;
-}
-
-// message to RTC nodes
-message RTCNodeMessage {
-  string participant_key = 1;
-  int64 sender_time = 11;
-  string connection_id = 13;
-  oneof message {
-    StartSession start_session = 2;
-    SignalRequest request = 3;
-    // internal messages
-    RoomParticipantIdentity remove_participant = 4;
-    MuteRoomTrackRequest mute_track = 5;
-    UpdateParticipantRequest update_participant = 6;
-    DeleteRoomRequest delete_room = 7;
-    UpdateSubscriptionsRequest update_subscriptions = 8;
-    SendDataRequest send_data = 9;
-    UpdateRoomMetadataRequest update_room_metadata = 10;
-    KeepAlive keep_alive = 12;
-  }
-}
-
-// message to Signal nodes
-message SignalNodeMessage {
-  string connection_id = 1;
-  oneof message {
-    SignalResponse response = 2;
-    EndSession end_session = 3;
-  }
-}
-
-message StartSession {
-  string room_name = 1;
-  string identity = 2;
-  string connection_id = 3;
-  // if a client is reconnecting (i.e. resume instead of restart)
-  bool reconnect = 4;
-  bool auto_subscribe = 9;
-  bool hidden = 10;
-  ClientInfo client = 11;
-  bool recorder = 12;
-  string name = 13;
-  // A user's ClaimGrants serialized in JSON
-  string grants_json = 14;
-  bool adaptive_stream = 15;
-  //if reconnect, client will set current sid
-  string participant_id = 16; 
-}
-
-message EndSession {
-}
-
-message RemoveParticipant {
-  string participant_id = 1;
-}
-
-message KeepAlive {
-}
diff --git a/crates/livekit_api/vendored/protocol/livekit_models.proto b/crates/livekit_api/vendored/protocol/livekit_models.proto
deleted file mode 100644
index ea43e8674e..0000000000
--- a/crates/livekit_api/vendored/protocol/livekit_models.proto
+++ /dev/null
@@ -1,330 +0,0 @@
-syntax = "proto3";
-
-package livekit;
-option go_package = "github.com/livekit/protocol/livekit";
-option csharp_namespace = "LiveKit.Proto";
-option ruby_package = "LiveKit::Proto";
-
-import "google/protobuf/timestamp.proto";
-import "livekit_egress.proto";
-
-message Room {
-  string sid = 1;
-  string name = 2;
-  uint32 empty_timeout = 3;
-  uint32 max_participants = 4;
-  int64 creation_time = 5;
-  string turn_password = 6;
-  repeated Codec enabled_codecs = 7;
-  string metadata = 8;
-  uint32 num_participants = 9;
-  bool active_recording = 10;
-}
-
-// room info that should not be returned to clients
-message RoomInternal {
-  AutoTrackEgress track_egress = 1;
-}
-
-message AutoTrackEgress {
-  string file_prefix = 1;
-  oneof output {
-    S3Upload s3 = 2;
-    GCPUpload gcp = 3;
-    AzureBlobUpload azure = 4;
-  }
-}
-
-message Codec {
-  string mime = 1;
-  string fmtp_line = 2;
-}
-
-message ParticipantPermission {
-  // allow participant to subscribe to other tracks in the room
-  bool can_subscribe = 1;
-  // allow participant to publish new tracks to room
-  bool can_publish = 2;
-  // allow participant to publish data
-  bool can_publish_data = 3;
-  // indicates that it's hidden to others
-  bool hidden = 7;
-  // indicates it's a recorder instance
-  bool recorder = 8;
-}
-
-message ParticipantInfo {
-  enum State {
-    // websocket' connected, but not offered yet
-    JOINING = 0;
-    // server received client offer
-    JOINED = 1;
-    // ICE connectivity established
-    ACTIVE = 2;
-    // WS disconnected
-    DISCONNECTED = 3;
-  }
-  string sid = 1;
-  string identity = 2;
-  State state = 3;
-  repeated TrackInfo tracks = 4;
-  string metadata = 5;
-  // timestamp when participant joined room, in seconds
-  int64 joined_at = 6;
-  string name = 9;
-  uint32 version = 10;
-  ParticipantPermission permission = 11;
-  string region = 12;
-  // indicates the participant has an active publisher connection
-  // and can publish to the server
-  bool is_publisher = 13;
-}
-
-enum TrackType {
-  AUDIO = 0;
-  VIDEO = 1;
-  DATA = 2;
-}
-
-enum TrackSource {
-  UNKNOWN = 0;
-  CAMERA = 1;
-  MICROPHONE = 2;
-  SCREEN_SHARE = 3;
-  SCREEN_SHARE_AUDIO = 4;
-}
-
-message SimulcastCodecInfo {
-  string mime_type = 1;
-  string mid = 2;
-  string cid = 3;
-  repeated VideoLayer layers = 4;
-}
-
-message TrackInfo {
-  string sid = 1;
-  TrackType type = 2;
-  string name = 3;
-  bool muted = 4;
-  // original width of video (unset for audio)
-  // clients may receive a lower resolution version with simulcast
-  uint32 width = 5;
-  // original height of video (unset for audio)
-  uint32 height = 6;
-  // true if track is simulcasted
-  bool simulcast = 7;
-  // true if DTX (Discontinuous Transmission) is disabled for audio
-  bool disable_dtx = 8;
-  // source of media
-  TrackSource source = 9;
-  repeated VideoLayer layers = 10;
-  // mime type of codec
-  string mime_type = 11;
-  string mid = 12;
-  repeated SimulcastCodecInfo codecs = 13;
-}
-
-enum VideoQuality {
-  LOW = 0;
-  MEDIUM = 1;
-  HIGH = 2;
-  OFF = 3;
-}
-
-// provide information about available spatial layers
-message VideoLayer {
-  // for tracks with a single layer, this should be HIGH
-  VideoQuality quality = 1;
-  uint32 width = 2;
-  uint32 height = 3;
-  // target bitrate, server will measure actual
-  uint32 bitrate = 4;
-  uint32 ssrc = 5;
-}
-
-// new DataPacket API
-message DataPacket {
-  enum Kind {
-    RELIABLE = 0;
-    LOSSY = 1;
-  }
-  Kind kind = 1;
-  oneof value {
-    UserPacket user = 2;
-    ActiveSpeakerUpdate speaker = 3;
-  }
-}
-
-message ActiveSpeakerUpdate {
-  repeated SpeakerInfo speakers = 1;
-}
-
-message SpeakerInfo {
-  string sid = 1;
-  // audio level, 0-1.0, 1 is loudest
-  float level = 2;
-  // true if speaker is currently active
-  bool active = 3;
-}
-
-message UserPacket {
-  // participant ID of user that sent the message
-  string participant_sid = 1;
-  // user defined payload
-  bytes payload = 2;
-  // the ID of the participants who will receive the message (the message will be sent to all the people in the room if this variable is empty)
-  repeated string destination_sids = 3;
-}
-
-enum ConnectionQuality {
-  POOR = 0;
-  GOOD = 1;
-  EXCELLENT = 2;
-}
-
-message ParticipantTracks {
-  // participant ID of participant to whom the tracks belong
-  string participant_sid = 1;
-  repeated string track_sids = 2;
-}
-
-// details about the server
-message ServerInfo {
-  enum Edition {
-    Standard = 0;
-    Cloud = 1;
-  }
-  Edition edition = 1;
-  string version = 2;
-  int32 protocol = 3;
-  string region = 4;
-  string node_id = 5;
-  // additional debugging information. sent only if server is in development mode
-  string debug_info = 6;
-}
-
-// details about the client
-message ClientInfo {
-  enum SDK {
-     UNKNOWN = 0;
-     JS = 1;
-     SWIFT = 2;
-     ANDROID = 3;
-     FLUTTER = 4;
-     GO = 5;
-     UNITY = 6;
-  }
-
-  SDK sdk = 1;
-  string version = 2;
-  int32 protocol = 3;
-  string os = 4;
-  string os_version = 5;
-  string device_model = 6;
-  string browser = 7;
-  string browser_version = 8;
-  string address = 9;
-  // wifi, wired, cellular, vpn, empty if not known
-  string network = 10;
-}
-
-// server provided client configuration
-message ClientConfiguration {
-  VideoConfiguration video = 1;
-  VideoConfiguration screen = 2;
-
-  ClientConfigSetting resume_connection = 3;
-  DisabledCodecs disabled_codecs = 4;
-  ClientConfigSetting force_relay = 5;
-}
-
-enum ClientConfigSetting {
-  UNSET = 0;
-  DISABLED = 1;
-  ENABLED = 2;
-}
-
-message VideoConfiguration {
-  ClientConfigSetting hardware_encoder = 1;
-}
-
-message DisabledCodecs {
-  repeated Codec codecs = 1;
-}
-
-enum DisconnectReason {
-  UNKNOWN_REASON = 0;
-  CLIENT_INITIATED = 1;
-  DUPLICATE_IDENTITY = 2;
-  SERVER_SHUTDOWN = 3;
-  PARTICIPANT_REMOVED = 4;
-  ROOM_DELETED = 5;
-  STATE_MISMATCH = 6;
-  JOIN_FAILURE = 7;
-}
-
-message RTPStats {
-  google.protobuf.Timestamp start_time = 1;
-  google.protobuf.Timestamp end_time = 2;
-  double duration = 3;
-
-  uint32 packets = 4;
-  double packet_rate = 5;
-
-  uint64 bytes = 6;
-  uint64 header_bytes = 39;
-  double bitrate = 7;
-
-  uint32 packets_lost = 8;
-  double packet_loss_rate = 9;
-  float packet_loss_percentage = 10;
-
-  uint32 packets_duplicate = 11;
-  double packet_duplicate_rate = 12;
-
-  uint64 bytes_duplicate = 13;
-  uint64 header_bytes_duplicate = 40;
-  double bitrate_duplicate = 14;
-
-  uint32 packets_padding = 15;
-  double packet_padding_rate = 16;
-
-  uint64 bytes_padding = 17;
-  uint64 header_bytes_padding = 41;
-  double bitrate_padding = 18;
-
-  uint32 packets_out_of_order = 19;
-
-  uint32 frames = 20;
-  double frame_rate = 21;
-
-  double jitter_current = 22;
-  double jitter_max = 23;
-
-  map<int32, uint32> gap_histogram = 24;
-
-  uint32 nacks = 25;
-  uint32 nack_acks = 37;
-  uint32 nack_misses = 26;
-  uint32 nack_repeated = 38;
-
-  uint32 plis = 27;
-  google.protobuf.Timestamp last_pli = 28;
-
-  uint32 firs = 29;
-  google.protobuf.Timestamp last_fir = 30;
-
-  uint32 rtt_current = 31;
-  uint32 rtt_max = 32;
-
-  uint32 key_frames = 33;
-  google.protobuf.Timestamp last_key_frame = 34;
-
-  uint32 layer_lock_plis = 35;
-  google.protobuf.Timestamp last_layer_lock_pli = 36;
-}
-
-message TimedVersion {
-  int64 unix_micro = 1;
-  int32 ticks = 2;
-}
diff --git a/crates/livekit_api/vendored/protocol/livekit_room.proto b/crates/livekit_api/vendored/protocol/livekit_room.proto
deleted file mode 100644
index a3c10bf68c..0000000000
--- a/crates/livekit_api/vendored/protocol/livekit_room.proto
+++ /dev/null
@@ -1,159 +0,0 @@
-syntax = "proto3";
-
-package livekit;
-option go_package = "github.com/livekit/protocol/livekit";
-option csharp_namespace = "LiveKit.Proto";
-option ruby_package = "LiveKit::Proto";
-
-import "livekit_models.proto";
-import "livekit_egress.proto";
-
-// Room service that can be performed on any node
-// they are Twirp-based HTTP req/responses
-service RoomService {
-  // Creates a room with settings. Requires `roomCreate` permission.
-  // This method is optional; rooms are automatically created when clients connect to them for the first time.
-  rpc CreateRoom(CreateRoomRequest) returns (Room);
-
-  // List rooms that are active on the server. Requires `roomList` permission.
-  rpc ListRooms(ListRoomsRequest) returns (ListRoomsResponse);
-
-  // Deletes an existing room by name or id. Requires `roomCreate` permission.
-  // DeleteRoom will disconnect all participants that are currently in the room.
-  rpc DeleteRoom(DeleteRoomRequest) returns (DeleteRoomResponse);
-
-  // Lists participants in a room, Requires `roomAdmin`
-  rpc ListParticipants(ListParticipantsRequest) returns (ListParticipantsResponse);
-
-  // Get information on a specific participant, Requires `roomAdmin`
-  rpc GetParticipant(RoomParticipantIdentity) returns (ParticipantInfo);
-
-  // Removes a participant from room. Requires `roomAdmin`
-  rpc RemoveParticipant(RoomParticipantIdentity) returns (RemoveParticipantResponse);
-
-  // Mute/unmute a participant's track, Requires `roomAdmin`
-  rpc MutePublishedTrack(MuteRoomTrackRequest) returns (MuteRoomTrackResponse);
-
-  // Update participant metadata, will cause updates to be broadcasted to everyone in the room. Requires `roomAdmin`
-  rpc UpdateParticipant(UpdateParticipantRequest) returns (ParticipantInfo);
-
-  // Subscribes or unsubscribe a participant from tracks. Requires `roomAdmin`
-  rpc UpdateSubscriptions(UpdateSubscriptionsRequest) returns (UpdateSubscriptionsResponse);
-
-  // Send data over data channel to participants in a room, Requires `roomAdmin`
-  rpc SendData(SendDataRequest) returns (SendDataResponse);
-
-  // Update room metadata, will cause updates to be broadcasted to everyone in the room, Requires `roomAdmin`
-  rpc UpdateRoomMetadata (UpdateRoomMetadataRequest) returns (Room);
-}
-
-message CreateRoomRequest {
-  // name of the room
-  string name = 1;
-  // number of seconds to keep the room open if no one joins
-  uint32 empty_timeout = 2;
-  // limit number of participants that can be in a room
-  uint32 max_participants = 3;
-  // override the node room is allocated to, for debugging
-  string node_id = 4;
-  // metadata of room
-  string metadata = 5;
-  // egress
-  RoomEgress egress = 6;
-}
-
-message RoomEgress {
-  RoomCompositeEgressRequest room = 1;
-  AutoTrackEgress tracks = 2;
-}
-
-message ListRoomsRequest {
-  // when set, will only return rooms with name match
-  repeated string names = 1;
-}
-
-message ListRoomsResponse {
-  repeated Room rooms = 1;
-}
-
-message DeleteRoomRequest {
-  // name of the room
-  string room = 1;
-}
-
-message DeleteRoomResponse {
-}
-
-message ListParticipantsRequest {
-  // name of the room
-  string room = 1;
-}
-
-message ListParticipantsResponse {
-  repeated ParticipantInfo participants = 1;
-}
-
-message RoomParticipantIdentity {
-  // name of the room
-  string room = 1;
-  // identity of the participant
-  string identity = 2;
-}
-
-message RemoveParticipantResponse {
-}
-
-message MuteRoomTrackRequest {
-  // name of the room
-  string room = 1;
-  string identity = 2;
-  // sid of the track to mute
-  string track_sid = 3;
-  // set to true to mute, false to unmute
-  bool muted = 4;
-}
-
-message MuteRoomTrackResponse {
-  TrackInfo track = 1;
-}
-
-message UpdateParticipantRequest {
-  string room = 1;
-  string identity = 2;
-  // metadata to update. skipping updates if left empty
-  string metadata = 3;
-  // set to update the participant's permissions
-  ParticipantPermission permission = 4;
-}
-
-message UpdateSubscriptionsRequest {
-  string room = 1;
-  string identity = 2;
-  // list of sids of tracks
-  repeated string track_sids = 3;
-  // set to true to subscribe, false to unsubscribe from tracks
-  bool subscribe = 4;
-  // list of participants and their tracks
-  repeated ParticipantTracks participant_tracks = 5;
-}
-
-message UpdateSubscriptionsResponse {
-  // empty for now
-}
-
-message SendDataRequest {
-  string room = 1;
-  bytes data = 2;
-  DataPacket.Kind kind = 3;
-  repeated string destination_sids = 4;
-}
-
-message SendDataResponse {
-  //
-}
-
-message UpdateRoomMetadataRequest {
-  string room = 1;
-  // metadata to update. skipping updates if left empty
-  string metadata = 2;
-}
diff --git a/crates/livekit_api/vendored/protocol/livekit_rpc_internal.proto b/crates/livekit_api/vendored/protocol/livekit_rpc_internal.proto
deleted file mode 100644
index 7fc268a4fb..0000000000
--- a/crates/livekit_api/vendored/protocol/livekit_rpc_internal.proto
+++ /dev/null
@@ -1,83 +0,0 @@
-syntax = "proto3";
-
-package livekit;
-option go_package = "github.com/livekit/protocol/livekit";
-option csharp_namespace = "LiveKit.Proto";
-option ruby_package = "LiveKit::Proto";
-
-import "livekit_egress.proto";
-import "livekit_ingress.proto";
-
-message StartEgressRequest {
-  // request metadata
-  string egress_id = 1;
-  string request_id = 2;
-  string sender_id = 10;
-  int64 sent_at = 4;
-
-  // request
-  oneof request {
-    RoomCompositeEgressRequest room_composite = 5;
-    TrackCompositeEgressRequest track_composite = 6;
-    TrackEgressRequest track = 7;
-  }
-
-  // connection info
-  string room_id = 3;
-  string token = 8;
-  string ws_url = 9;
-}
-
-message EgressRequest {
-  // request metadata
-  string egress_id = 1;
-  string request_id = 2;
-  string sender_id = 5;
-
-  // request
-  oneof request {
-    UpdateStreamRequest update_stream = 3;
-    StopEgressRequest stop = 4;
-  }
-}
-
-message EgressResponse {
-  EgressInfo info = 1;
-  string error = 2;
-  string request_id = 3;
-}
-
-message IngressRequest {
-  // request metadata
-  string ingress_id = 1;
-  string request_id = 2;
-  string sender_id = 3;
-
-  oneof request {
-    UpdateIngressRequest update = 4;
-    DeleteIngressRequest delete = 5;
-  }
-}
-
-// Query an ingress info from an ingress ID or stream key
-message GetIngressInfoRequest {
-  string ingress_id = 1;
-  string stream_key = 2;
-  string request_id = 3;
-  string sender_id = 4;
-  int64 sent_at = 5;
-}
-
-message IngressResponse {
-  IngressInfo info = 1;
-  string error = 2;
-  string request_id = 3;
-}
-
-message GetIngressInfoResponse {
-  IngressInfo info = 1;
-  string token = 2;
-  string ws_url = 3;
-  string error = 4;
-  string request_id = 5;
-}
diff --git a/crates/livekit_api/vendored/protocol/livekit_rtc.proto b/crates/livekit_api/vendored/protocol/livekit_rtc.proto
deleted file mode 100644
index e0df62ada8..0000000000
--- a/crates/livekit_api/vendored/protocol/livekit_rtc.proto
+++ /dev/null
@@ -1,301 +0,0 @@
-syntax = "proto3";
-
-package livekit;
-option go_package = "github.com/livekit/protocol/livekit";
-option csharp_namespace = "LiveKit.Proto";
-option ruby_package = "LiveKit::Proto";
-
-import "livekit_models.proto";
-
-message SignalRequest {
-  oneof message {
-    // initial join exchange, for publisher
-    SessionDescription offer = 1;
-    // participant answering publisher offer
-    SessionDescription answer = 2;
-    TrickleRequest trickle = 3;
-    AddTrackRequest add_track = 4;
-    // mute the participant's published tracks
-    MuteTrackRequest mute = 5;
-    // Subscribe or unsubscribe from tracks
-    UpdateSubscription subscription = 6;
-    // Update settings of subscribed tracks
-    UpdateTrackSettings track_setting = 7;
-    // Immediately terminate session
-    LeaveRequest leave = 8;
-    // Set active published layers, deprecated in favor of automatic tracking
-//    SetSimulcastLayers simulcast = 9;
-    // Update published video layers
-    UpdateVideoLayers update_layers = 10;
-    // Update subscriber permissions
-    SubscriptionPermission subscription_permission = 11;
-    // sync client's subscribe state to server during reconnect
-    SyncState sync_state = 12;
-    // Simulate conditions, for client validations
-    SimulateScenario simulate = 13;
-    // client triggered ping to server
-    int64 ping = 14;
-  }
-}
-
-message SignalResponse {
-  oneof message {
-    // sent when join is accepted
-    JoinResponse join = 1;
-    // sent when server answers publisher
-    SessionDescription answer = 2;
-    // sent when server is sending subscriber an offer
-    SessionDescription offer = 3;
-    // sent when an ICE candidate is available
-    TrickleRequest trickle = 4;
-    // sent when participants in the room has changed
-    ParticipantUpdate update = 5;
-    // sent to the participant when their track has been published
-    TrackPublishedResponse track_published = 6;
-    // Immediately terminate session
-    LeaveRequest leave = 8;
-    // server initiated mute
-    MuteTrackRequest mute = 9;
-    // indicates changes to speaker status, including when they've gone to not speaking
-    SpeakersChanged speakers_changed = 10;
-    // sent when metadata of the room has changed
-    RoomUpdate room_update = 11;
-    // when connection quality changed
-    ConnectionQualityUpdate connection_quality = 12;
-    // when streamed tracks state changed, used to notify when any of the streams were paused due to
-    // congestion
-    StreamStateUpdate stream_state_update = 13;
-    // when max subscribe quality changed, used by dynamic broadcasting to disable unused layers
-    SubscribedQualityUpdate subscribed_quality_update = 14;
-    // when subscription permission changed
-    SubscriptionPermissionUpdate subscription_permission_update = 15;
-    // update the token the client was using, to prevent an active client from using an expired token
-    string refresh_token = 16;
-    // server initiated track unpublish
-    TrackUnpublishedResponse track_unpublished = 17;
-    // respond to ping
-    int64 pong = 18;
-  }
-}
-
-enum SignalTarget {
-  PUBLISHER = 0;
-  SUBSCRIBER = 1;
-}
-
-message SimulcastCodec {
-  string codec = 1;
-  string cid = 2;
-  bool enable_simulcast_layers = 3;
-}
-
-message AddTrackRequest {
-  // client ID of track, to match it when RTC track is received
-  string cid = 1;
-  string name = 2;
-  TrackType type = 3;
-  // to be deprecated in favor of layers
-  uint32 width = 4;
-  uint32 height = 5;
-  // true to add track and initialize to muted
-  bool muted = 6;
-  // true if DTX (Discontinuous Transmission) is disabled for audio
-  bool disable_dtx = 7;
-  TrackSource source = 8;
-  repeated VideoLayer layers = 9;
-
-  repeated SimulcastCodec simulcast_codecs = 10;
-
-  // server ID of track, publish new codec to exist track
-  string sid = 11;
-}
-
-message TrickleRequest {
-  string candidateInit = 1;
-  SignalTarget target = 2;
-}
-
-message MuteTrackRequest {
-  string sid = 1;
-  bool muted = 2;
-}
-
-message JoinResponse {
-  Room room = 1;
-  ParticipantInfo participant = 2;
-  repeated ParticipantInfo other_participants = 3;
-  // deprecated. use server_info.version instead.
-  string server_version = 4;
-  repeated ICEServer ice_servers = 5;
-  // use subscriber as the primary PeerConnection
-  bool subscriber_primary = 6;
-  // when the current server isn't available, return alternate url to retry connection
-  // when this is set, the other fields will be largely empty
-  string alternative_url = 7;
-  ClientConfiguration client_configuration = 8;
-  // deprecated. use server_info.region instead.
-  string server_region = 9;
-  int32 ping_timeout = 10;
-  int32 ping_interval = 11;
-  ServerInfo server_info = 12;
-}
-
-message TrackPublishedResponse {
-  string cid = 1;
-  TrackInfo track = 2;
-}
-
-message TrackUnpublishedResponse {
-  string track_sid = 1;
-}
-
-message SessionDescription {
-  string type = 1; // "answer" | "offer" | "pranswer" | "rollback"
-  string sdp = 2;
-}
-
-message ParticipantUpdate {
-  repeated ParticipantInfo participants = 1;
-}
-
-message UpdateSubscription {
-  repeated string track_sids = 1;
-  bool subscribe = 2;
-  repeated ParticipantTracks participant_tracks = 3;
-}
-
-message UpdateTrackSettings {
-  repeated string track_sids = 1;
-  // when true, the track is placed in a paused state, with no new data returned
-  bool disabled = 3;
-  // deprecated in favor of width & height
-  VideoQuality quality = 4;
-  // for video, width to receive
-  uint32 width = 5;
-  // for video, height to receive
-  uint32 height = 6;
-}
-
-message LeaveRequest {
-  // sent when server initiates the disconnect due to server-restart
-  // indicates clients should attempt full-reconnect sequence
-  bool can_reconnect = 1;
-  DisconnectReason reason = 2;
-}
-
-// message to indicate published video track dimensions are changing
-message UpdateVideoLayers {
-  string track_sid = 1;
-  repeated VideoLayer layers = 2;
-}
-
-message ICEServer {
-  repeated string urls = 1;
-  string username = 2;
-  string credential = 3;
-}
-
-message SpeakersChanged {
-  repeated SpeakerInfo speakers = 1;
-}
-
-message RoomUpdate {
-  Room room = 1;
-}
-
-message ConnectionQualityInfo {
-  string participant_sid = 1;
-  ConnectionQuality quality = 2;
-  float score = 3;
-}
-
-message ConnectionQualityUpdate {
-  repeated ConnectionQualityInfo updates = 1;
-}
-
-enum StreamState {
-  ACTIVE = 0;
-  PAUSED = 1;
-}
-
-message StreamStateInfo {
-  string participant_sid = 1;
-  string track_sid = 2;
-  StreamState state = 3;
-}
-
-message StreamStateUpdate {
-  repeated StreamStateInfo stream_states = 1;
-}
-
-message SubscribedQuality {
-  VideoQuality quality = 1;
-  bool enabled = 2;
-}
-
-message SubscribedCodec {
-  string codec = 1;
-  repeated SubscribedQuality qualities = 2;
-}
-
-message SubscribedQualityUpdate {
-  string track_sid = 1;
-  repeated SubscribedQuality subscribed_qualities = 2;
-  repeated SubscribedCodec subscribed_codecs = 3;
-}
-
-message TrackPermission {
-  // permission could be granted either by participant sid or identity
-  string participant_sid = 1;
-  bool all_tracks = 2;
-  repeated string track_sids = 3;
-  string participant_identity = 4;
-}
-
-message SubscriptionPermission {
-  bool all_participants = 1;
-  repeated TrackPermission track_permissions = 2;
-}
-
-message SubscriptionPermissionUpdate {
-  string participant_sid = 1;
-  string track_sid = 2;
-  bool allowed = 3;
-}
-
-message SyncState {
-  // last subscribe answer before reconnecting
-  SessionDescription answer = 1;
-  UpdateSubscription subscription = 2;
-  repeated TrackPublishedResponse publish_tracks = 3;
-  repeated DataChannelInfo data_channels = 4;
-  // last received server side offer before reconnecting
-  SessionDescription offer = 5;
-}
-
-message DataChannelInfo {
-  string label = 1;
-  uint32 id = 2;
-  SignalTarget target = 3;
-}
-
-enum CandidateProtocol {
-  UDP = 0;
-  TCP = 1;
-  TLS = 2;
-}
-
-message SimulateScenario {
-  oneof scenario {
-    // simulate N seconds of speaker activity
-    int32 speaker_update = 1;
-    // simulate local node failure
-    bool node_failure = 2;
-    // simulate migration
-    bool migration = 3;
-    // server to send leave
-    bool server_leave = 4;
-    // switch candidate protocol to tcp
-    CandidateProtocol switch_candidate_protocol = 5;
-  }
-}
diff --git a/crates/livekit_api/vendored/protocol/livekit_webhook.proto b/crates/livekit_api/vendored/protocol/livekit_webhook.proto
deleted file mode 100644
index 7428748afd..0000000000
--- a/crates/livekit_api/vendored/protocol/livekit_webhook.proto
+++ /dev/null
@@ -1,36 +0,0 @@
-syntax = "proto3";
-
-package livekit;
-option go_package = "github.com/livekit/protocol/livekit";
-option csharp_namespace = "LiveKit.Proto";
-option ruby_package = "LiveKit::Proto";
-
-import "livekit_models.proto";
-import "livekit_egress.proto";
-import "livekit_ingress.proto";
-
-message WebhookEvent {
-  // one of room_started, room_finished, participant_joined, participant_left,
-  // track_published, track_unpublished, egress_started, egress_updated, egress_ended, ingress_started, ingress_ended
-  string event = 1;
-
-  Room room = 2;
-
-  // set when event is participant_* or track_*
-  ParticipantInfo participant = 3;
-
-  // set when event is egress_*
-  EgressInfo egress_info = 9;
-
-  // set when event is ingress_*
-  IngressInfo ingress_info = 10;
-
-  // set when event is track_*
-  TrackInfo track = 8;
-
-  // unique event uuid
-  string id = 6;
-
-  // timestamp in seconds
-  int64 created_at = 7;
-}
diff --git a/crates/livekit_client/Cargo.toml b/crates/livekit_client/Cargo.toml
deleted file mode 100644
index a7766b5ba5..0000000000
--- a/crates/livekit_client/Cargo.toml
+++ /dev/null
@@ -1,73 +0,0 @@
-[package]
-name = "livekit_client"
-version = "0.1.0"
-edition.workspace = true
-description = "Logic for using LiveKit with GPUI"
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/lib.rs"
-doctest = false
-
-[[example]]
-name = "test_app"
-
-[features]
-test-support = ["collections/test-support", "gpui/test-support"]
-
-[dependencies]
-anyhow.workspace = true
-async-trait.workspace = true
-audio.workspace = true
-collections.workspace = true
-cpal.workspace = true
-futures.workspace = true
-gpui = { workspace = true, features = ["screen-capture", "x11", "wayland", "windows-manifest"] }
-gpui_tokio.workspace = true
-http_client_tls.workspace = true
-image.workspace = true
-livekit_api.workspace = true
-log.workspace = true
-nanoid.workspace = true
-parking_lot.workspace = true
-postage.workspace = true
-rodio.workspace = true
-serde.workspace = true
-serde_urlencoded.workspace = true
-settings.workspace = true
-smallvec.workspace = true
-tokio-tungstenite.workspace = true
-ui.workspace = true
-util.workspace = true
-
-[target.'cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))'.dependencies]
-libwebrtc = { rev = "5f04705ac3f356350ae31534ffbc476abc9ea83d", git = "https://github.com/zed-industries/livekit-rust-sdks" }
-livekit = { rev = "5f04705ac3f356350ae31534ffbc476abc9ea83d", git = "https://github.com/zed-industries/livekit-rust-sdks", features = [
-    "__rustls-tls"
-] }
-
-[target.'cfg(any(target_os = "linux", target_os = "freebsd", target_os = "windows"))'.dependencies]
-scap.workspace = true
-
-[target.'cfg(target_os = "macos")'.dependencies]
-core-foundation.workspace = true
-core-video.workspace = true
-coreaudio-rs = "0.12.1"
-objc.workspace = true
-
-[dev-dependencies]
-collections = { workspace = true, features = ["test-support"] }
-gpui = { workspace = true, features = ["test-support"] }
-sha2.workspace = true
-simplelog.workspace = true
-
-[build-dependencies]
-serde.workspace = true
-serde_json.workspace = true
-
-[package.metadata.cargo-machete]
-ignored = ["serde_json"]
diff --git a/crates/livekit_client/LICENSE-GPL b/crates/livekit_client/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/livekit_client/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/livekit_client/examples/test_app.rs b/crates/livekit_client/examples/test_app.rs
deleted file mode 100644
index a4d815aa9b..0000000000
--- a/crates/livekit_client/examples/test_app.rs
+++ /dev/null
@@ -1,401 +0,0 @@
-use std::sync::Arc;
-
-use futures::StreamExt;
-use gpui::{
-    AppContext as _, AsyncApp, Bounds, Context, Entity, InteractiveElement, KeyBinding, Menu,
-    MenuItem, ParentElement, Pixels, Render, ScreenCaptureStream, SharedString,
-    StatefulInteractiveElement as _, Styled, Task, Window, WindowBounds, WindowHandle,
-    WindowOptions, actions, bounds, div, point,
-    prelude::{FluentBuilder as _, IntoElement},
-    px, rgb, size,
-};
-use livekit_client::{
-    AudioStream, LocalTrackPublication, Participant, ParticipantIdentity, RemoteParticipant,
-    RemoteTrackPublication, RemoteVideoTrack, RemoteVideoTrackView, Room, RoomEvent,
-};
-
-use livekit_api::token::{self, VideoGrant};
-use log::LevelFilter;
-use simplelog::SimpleLogger;
-
-actions!(livekit_client, [Quit]);
-
-fn main() {
-    SimpleLogger::init(LevelFilter::Info, Default::default()).expect("could not initialize logger");
-
-    gpui::Application::new().run(|cx| {
-        #[cfg(any(test, feature = "test-support"))]
-        println!("USING TEST LIVEKIT");
-
-        #[cfg(not(any(test, feature = "test-support")))]
-        println!("USING REAL LIVEKIT");
-
-        gpui_tokio::init(cx);
-
-        cx.activate(true);
-        cx.on_action(quit);
-        cx.bind_keys([KeyBinding::new("cmd-q", Quit, None)]);
-        cx.set_menus(vec![Menu {
-            name: "Zed".into(),
-            items: vec![MenuItem::Action {
-                name: "Quit".into(),
-                action: Box::new(Quit),
-                os_action: None,
-                checked: false,
-            }],
-        }]);
-
-        let livekit_url = std::env::var("LIVEKIT_URL").unwrap_or("http://localhost:7880".into());
-        let livekit_key = std::env::var("LIVEKIT_KEY").unwrap_or("devkey".into());
-        let livekit_secret = std::env::var("LIVEKIT_SECRET").unwrap_or("secret".into());
-        let height = px(800.);
-        let width = px(800.);
-
-        cx.spawn(async move |cx| {
-            let mut windows = Vec::new();
-            for i in 0..2 {
-                let token = token::create(
-                    &livekit_key,
-                    &livekit_secret,
-                    Some(&format!("test-participant-{i}")),
-                    VideoGrant::to_join("wtej-trty"),
-                )
-                .unwrap();
-
-                let bounds = bounds(point(width * i, px(0.0)), size(width, height));
-                let window = LivekitWindow::new(livekit_url.clone(), token, bounds, cx).await;
-                windows.push(window);
-            }
-        })
-        .detach();
-    });
-}
-
-fn quit(_: &Quit, cx: &mut gpui::App) {
-    cx.quit();
-}
-
-struct LivekitWindow {
-    room: Arc<livekit_client::Room>,
-    microphone_track: Option<LocalTrackPublication>,
-    screen_share_track: Option<LocalTrackPublication>,
-    microphone_stream: Option<livekit_client::AudioStream>,
-    screen_share_stream: Option<Box<dyn ScreenCaptureStream>>,
-    remote_participants: Vec<(ParticipantIdentity, ParticipantState)>,
-    _events_task: Task<()>,
-}
-
-#[derive(Default)]
-struct ParticipantState {
-    audio_output_stream: Option<(RemoteTrackPublication, AudioStream)>,
-    muted: bool,
-    screen_share_output_view: Option<(RemoteVideoTrack, Entity<RemoteVideoTrackView>)>,
-    speaking: bool,
-}
-
-impl LivekitWindow {
-    async fn new(
-        url: String,
-        token: String,
-        bounds: Bounds<Pixels>,
-        cx: &mut AsyncApp,
-    ) -> WindowHandle<Self> {
-        let (room, mut events) =
-            Room::connect(url.clone(), token, cx)
-                .await
-                .unwrap_or_else(|err| {
-                    eprintln!(
-                        "Failed to connect to {url}: {err}.\nTry `foreman start` to run the livekit server"
-                    );
-
-                    std::process::exit(1)
-                });
-
-        cx.update(|cx| {
-            cx.open_window(
-                WindowOptions {
-                    window_bounds: Some(WindowBounds::Windowed(bounds)),
-                    ..Default::default()
-                },
-                |window, cx| {
-                    cx.new(|cx| {
-                        let _events_task = cx.spawn_in(window, async move |this, cx| {
-                            while let Some(event) = events.next().await {
-                                cx.update(|window, cx| {
-                                    this.update(cx, |this: &mut LivekitWindow, cx| {
-                                        this.handle_room_event(event, window, cx)
-                                    })
-                                })
-                                .ok();
-                            }
-                        });
-
-                        Self {
-                            room: Arc::new(room),
-                            microphone_track: None,
-                            microphone_stream: None,
-                            screen_share_track: None,
-                            screen_share_stream: None,
-                            remote_participants: Vec::new(),
-                            _events_task,
-                        }
-                    })
-                },
-            )
-            .unwrap()
-        })
-        .unwrap()
-    }
-
-    fn handle_room_event(&mut self, event: RoomEvent, window: &mut Window, cx: &mut Context<Self>) {
-        eprintln!("event: {event:?}");
-
-        match event {
-            RoomEvent::TrackUnpublished {
-                publication,
-                participant,
-            } => {
-                let output = self.remote_participant(participant);
-                let unpublish_sid = publication.sid();
-                if output
-                    .audio_output_stream
-                    .as_ref()
-                    .is_some_and(|(track, _)| track.sid() == unpublish_sid)
-                {
-                    output.audio_output_stream.take();
-                }
-                if output
-                    .screen_share_output_view
-                    .as_ref()
-                    .is_some_and(|(track, _)| track.sid() == unpublish_sid)
-                {
-                    output.screen_share_output_view.take();
-                }
-                cx.notify();
-            }
-
-            RoomEvent::TrackSubscribed {
-                publication,
-                participant,
-                track,
-            } => {
-                let room = self.room.clone();
-                let output = self.remote_participant(participant);
-                match track {
-                    livekit_client::RemoteTrack::Audio(track) => {
-                        output.audio_output_stream = Some((
-                            publication,
-                            room.play_remote_audio_track(&track, cx).unwrap(),
-                        ));
-                    }
-                    livekit_client::RemoteTrack::Video(track) => {
-                        output.screen_share_output_view = Some((
-                            track.clone(),
-                            cx.new(|cx| RemoteVideoTrackView::new(track, window, cx)),
-                        ));
-                    }
-                }
-                cx.notify();
-            }
-
-            RoomEvent::TrackMuted { participant, .. } => {
-                if let Participant::Remote(participant) = participant {
-                    self.remote_participant(participant).muted = true;
-                    cx.notify();
-                }
-            }
-
-            RoomEvent::TrackUnmuted { participant, .. } => {
-                if let Participant::Remote(participant) = participant {
-                    self.remote_participant(participant).muted = false;
-                    cx.notify();
-                }
-            }
-
-            RoomEvent::ActiveSpeakersChanged { speakers } => {
-                for (identity, output) in &mut self.remote_participants {
-                    output.speaking = speakers.iter().any(|speaker| {
-                        if let Participant::Remote(speaker) = speaker {
-                            speaker.identity() == *identity
-                        } else {
-                            false
-                        }
-                    });
-                }
-                cx.notify();
-            }
-
-            _ => {}
-        }
-
-        cx.notify();
-    }
-
-    fn remote_participant(&mut self, participant: RemoteParticipant) -> &mut ParticipantState {
-        match self
-            .remote_participants
-            .binary_search_by_key(&&participant.identity(), |row| &row.0)
-        {
-            Ok(ix) => &mut self.remote_participants[ix].1,
-            Err(ix) => {
-                self.remote_participants
-                    .insert(ix, (participant.identity(), ParticipantState::default()));
-                &mut self.remote_participants[ix].1
-            }
-        }
-    }
-
-    fn toggle_mute(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(track) = &self.microphone_track {
-            if track.is_muted() {
-                track.unmute(cx);
-            } else {
-                track.mute(cx);
-            }
-            cx.notify();
-        } else {
-            let room = self.room.clone();
-            cx.spawn_in(window, async move |this, cx| {
-                let (publication, stream) = room
-                    .publish_local_microphone_track("test_user".to_string(), false, cx)
-                    .await
-                    .unwrap();
-                this.update(cx, |this, cx| {
-                    this.microphone_track = Some(publication);
-                    this.microphone_stream = Some(stream);
-                    cx.notify();
-                })
-            })
-            .detach();
-        }
-    }
-
-    fn toggle_screen_share(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(track) = self.screen_share_track.take() {
-            self.screen_share_stream.take();
-            let participant = self.room.local_participant();
-            cx.spawn(async move |_, cx| {
-                participant.unpublish_track(track.sid(), cx).await.unwrap();
-            })
-            .detach();
-            cx.notify();
-        } else {
-            let participant = self.room.local_participant();
-            let sources = cx.screen_capture_sources();
-            cx.spawn_in(window, async move |this, cx| {
-                let sources = sources.await.unwrap()?;
-                let source = sources.into_iter().next().unwrap();
-
-                let (publication, stream) = participant
-                    .publish_screenshare_track(&*source, cx)
-                    .await
-                    .unwrap();
-                this.update(cx, |this, cx| {
-                    this.screen_share_track = Some(publication);
-                    this.screen_share_stream = Some(stream);
-                    cx.notify();
-                })
-            })
-            .detach();
-        }
-    }
-
-    fn toggle_remote_audio_for_participant(
-        &mut self,
-        identity: &ParticipantIdentity,
-        cx: &mut Context<Self>,
-    ) -> Option<()> {
-        let participant = self.remote_participants.iter().find_map(|(id, state)| {
-            if id == identity { Some(state) } else { None }
-        })?;
-        let publication = &participant.audio_output_stream.as_ref()?.0;
-        publication.set_enabled(!publication.is_enabled(), cx);
-        cx.notify();
-        Some(())
-    }
-}
-
-impl Render for LivekitWindow {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        fn button() -> gpui::Div {
-            div()
-                .w(px(180.0))
-                .h(px(30.0))
-                .px_2()
-                .m_2()
-                .bg(rgb(0x8888ff))
-        }
-
-        div()
-            .bg(rgb(0xffffff))
-            .size_full()
-            .flex()
-            .flex_col()
-            .child(
-                div().bg(rgb(0xffd4a8)).flex().flex_row().children([
-                    button()
-                        .id("toggle-mute")
-                        .child(if let Some(track) = &self.microphone_track {
-                            if track.is_muted() { "Unmute" } else { "Mute" }
-                        } else {
-                            "Publish mic"
-                        })
-                        .on_click(cx.listener(|this, _, window, cx| this.toggle_mute(window, cx))),
-                    button()
-                        .id("toggle-screen-share")
-                        .child(if self.screen_share_track.is_none() {
-                            "Share screen"
-                        } else {
-                            "Unshare screen"
-                        })
-                        .on_click(
-                            cx.listener(|this, _, window, cx| this.toggle_screen_share(window, cx)),
-                        ),
-                ]),
-            )
-            .child(
-                div()
-                    .id("remote-participants")
-                    .overflow_y_scroll()
-                    .flex()
-                    .flex_col()
-                    .flex_grow()
-                    .children(self.remote_participants.iter().map(|(identity, state)| {
-                        div()
-                            .h(px(1080.0))
-                            .flex()
-                            .flex_col()
-                            .m_2()
-                            .px_2()
-                            .bg(rgb(0x8888ff))
-                            .child(SharedString::from(if state.speaking {
-                                format!("{} (speaking)", &identity.0)
-                            } else if state.muted {
-                                format!("{} (muted)", &identity.0)
-                            } else {
-                                identity.0.clone()
-                            }))
-                            .when_some(state.audio_output_stream.as_ref(), |el, state| {
-                                el.child(
-                                    button()
-                                        .id(identity.0.clone())
-                                        .child(if state.0.is_enabled() {
-                                            "Deafen"
-                                        } else {
-                                            "Undeafen"
-                                        })
-                                        .on_click(cx.listener({
-                                            let identity = identity.clone();
-                                            move |this, _, _, cx| {
-                                                this.toggle_remote_audio_for_participant(
-                                                    &identity, cx,
-                                                );
-                                            }
-                                        })),
-                                )
-                            })
-                            .children(state.screen_share_output_view.as_ref().map(|e| e.1.clone()))
-                    })),
-            )
-    }
-}
diff --git a/crates/livekit_client/src/lib.rs b/crates/livekit_client/src/lib.rs
deleted file mode 100644
index 055aa3704e..0000000000
--- a/crates/livekit_client/src/lib.rs
+++ /dev/null
@@ -1,237 +0,0 @@
-use anyhow::Context as _;
-use collections::HashMap;
-
-mod remote_video_track_view;
-use cpal::traits::HostTrait as _;
-pub use remote_video_track_view::{RemoteVideoTrackView, RemoteVideoTrackViewEvent};
-use rodio::DeviceTrait as _;
-
-mod record;
-pub use record::CaptureInput;
-
-#[cfg(not(any(
-    test,
-    feature = "test-support",
-    all(target_os = "windows", target_env = "gnu"),
-    target_os = "freebsd"
-)))]
-mod livekit_client;
-#[cfg(not(any(
-    test,
-    feature = "test-support",
-    all(target_os = "windows", target_env = "gnu"),
-    target_os = "freebsd"
-)))]
-pub use livekit_client::*;
-
-// If you need proper LSP in livekit_client you've got to comment
-// - the cfg blocks above
-// - the mods: mock_client & test and their conditional blocks
-// - the pub use mock_client::* and their conditional blocks
-
-#[cfg(any(
-    test,
-    feature = "test-support",
-    all(target_os = "windows", target_env = "gnu"),
-    target_os = "freebsd"
-))]
-mod mock_client;
-#[cfg(any(
-    test,
-    feature = "test-support",
-    all(target_os = "windows", target_env = "gnu"),
-    target_os = "freebsd"
-))]
-pub mod test;
-#[cfg(any(
-    test,
-    feature = "test-support",
-    all(target_os = "windows", target_env = "gnu"),
-    target_os = "freebsd"
-))]
-pub use mock_client::*;
-
-#[derive(Debug, Clone)]
-pub enum Participant {
-    Local(LocalParticipant),
-    Remote(RemoteParticipant),
-}
-
-#[derive(Debug, Clone)]
-pub enum TrackPublication {
-    Local(LocalTrackPublication),
-    Remote(RemoteTrackPublication),
-}
-
-impl TrackPublication {
-    pub fn sid(&self) -> TrackSid {
-        match self {
-            TrackPublication::Local(local) => local.sid(),
-            TrackPublication::Remote(remote) => remote.sid(),
-        }
-    }
-
-    pub fn is_muted(&self) -> bool {
-        match self {
-            TrackPublication::Local(local) => local.is_muted(),
-            TrackPublication::Remote(remote) => remote.is_muted(),
-        }
-    }
-}
-
-#[derive(Clone, Debug)]
-pub enum RemoteTrack {
-    Audio(RemoteAudioTrack),
-    Video(RemoteVideoTrack),
-}
-
-impl RemoteTrack {
-    pub fn sid(&self) -> TrackSid {
-        match self {
-            RemoteTrack::Audio(remote_audio_track) => remote_audio_track.sid(),
-            RemoteTrack::Video(remote_video_track) => remote_video_track.sid(),
-        }
-    }
-}
-
-#[derive(Clone, Debug)]
-pub enum LocalTrack {
-    Audio(LocalAudioTrack),
-    Video(LocalVideoTrack),
-}
-
-#[derive(Clone, Debug)]
-#[non_exhaustive]
-pub enum RoomEvent {
-    ParticipantConnected(RemoteParticipant),
-    ParticipantDisconnected(RemoteParticipant),
-    LocalTrackPublished {
-        publication: LocalTrackPublication,
-        track: LocalTrack,
-        participant: LocalParticipant,
-    },
-    LocalTrackUnpublished {
-        publication: LocalTrackPublication,
-        participant: LocalParticipant,
-    },
-    LocalTrackSubscribed {
-        track: LocalTrack,
-    },
-    TrackSubscribed {
-        track: RemoteTrack,
-        publication: RemoteTrackPublication,
-        participant: RemoteParticipant,
-    },
-    TrackUnsubscribed {
-        track: RemoteTrack,
-        publication: RemoteTrackPublication,
-        participant: RemoteParticipant,
-    },
-    TrackSubscriptionFailed {
-        participant: RemoteParticipant,
-        // error: livekit::track::TrackError,
-        track_sid: TrackSid,
-    },
-    TrackPublished {
-        publication: RemoteTrackPublication,
-        participant: RemoteParticipant,
-    },
-    TrackUnpublished {
-        publication: RemoteTrackPublication,
-        participant: RemoteParticipant,
-    },
-    TrackMuted {
-        participant: Participant,
-        publication: TrackPublication,
-    },
-    TrackUnmuted {
-        participant: Participant,
-        publication: TrackPublication,
-    },
-    RoomMetadataChanged {
-        old_metadata: String,
-        metadata: String,
-    },
-    ParticipantMetadataChanged {
-        participant: Participant,
-        old_metadata: String,
-        metadata: String,
-    },
-    ParticipantNameChanged {
-        participant: Participant,
-        old_name: String,
-        name: String,
-    },
-    ParticipantAttributesChanged {
-        participant: Participant,
-        changed_attributes: HashMap<String, String>,
-    },
-    ActiveSpeakersChanged {
-        speakers: Vec<Participant>,
-    },
-    ConnectionStateChanged(ConnectionState),
-    Connected {
-        participants_with_tracks: Vec<(RemoteParticipant, Vec<RemoteTrackPublication>)>,
-    },
-    Disconnected {
-        reason: &'static str,
-    },
-    Reconnecting,
-    Reconnected,
-}
-
-pub(crate) fn default_device(
-    input: bool,
-) -> anyhow::Result<(cpal::Device, cpal::SupportedStreamConfig)> {
-    let device;
-    let config;
-    if input {
-        device = cpal::default_host()
-            .default_input_device()
-            .context("no audio input device available")?;
-        config = device
-            .default_input_config()
-            .context("failed to get default input config")?;
-    } else {
-        device = cpal::default_host()
-            .default_output_device()
-            .context("no audio output device available")?;
-        config = device
-            .default_output_config()
-            .context("failed to get default output config")?;
-    }
-    Ok((device, config))
-}
-
-pub(crate) fn get_sample_data(
-    sample_format: cpal::SampleFormat,
-    data: &cpal::Data,
-) -> anyhow::Result<Vec<i16>> {
-    match sample_format {
-        cpal::SampleFormat::I8 => Ok(convert_sample_data::<i8, i16>(data)),
-        cpal::SampleFormat::I16 => Ok(data.as_slice::<i16>().unwrap().to_vec()),
-        cpal::SampleFormat::I24 => Ok(convert_sample_data::<cpal::I24, i16>(data)),
-        cpal::SampleFormat::I32 => Ok(convert_sample_data::<i32, i16>(data)),
-        cpal::SampleFormat::I64 => Ok(convert_sample_data::<i64, i16>(data)),
-        cpal::SampleFormat::U8 => Ok(convert_sample_data::<u8, i16>(data)),
-        cpal::SampleFormat::U16 => Ok(convert_sample_data::<u16, i16>(data)),
-        cpal::SampleFormat::U32 => Ok(convert_sample_data::<u32, i16>(data)),
-        cpal::SampleFormat::U64 => Ok(convert_sample_data::<u64, i16>(data)),
-        cpal::SampleFormat::F32 => Ok(convert_sample_data::<f32, i16>(data)),
-        cpal::SampleFormat::F64 => Ok(convert_sample_data::<f64, i16>(data)),
-        _ => anyhow::bail!("Unsupported sample format"),
-    }
-}
-
-pub(crate) fn convert_sample_data<
-    TSource: cpal::SizedSample,
-    TDest: cpal::SizedSample + cpal::FromSample<TSource>,
->(
-    data: &cpal::Data,
-) -> Vec<TDest> {
-    data.as_slice::<TSource>()
-        .unwrap()
-        .iter()
-        .map(|e| e.to_sample::<TDest>())
-        .collect()
-}
diff --git a/crates/livekit_client/src/livekit_client.rs b/crates/livekit_client/src/livekit_client.rs
deleted file mode 100644
index 5d31f802c8..0000000000
--- a/crates/livekit_client/src/livekit_client.rs
+++ /dev/null
@@ -1,485 +0,0 @@
-use std::sync::Arc;
-
-use anyhow::{Context as _, Result, anyhow};
-use audio::AudioSettings;
-use collections::HashMap;
-use futures::{SinkExt, channel::mpsc};
-use gpui::{App, AsyncApp, ScreenCaptureSource, ScreenCaptureStream, Task};
-use gpui_tokio::Tokio;
-use log::info;
-use playback::capture_local_video_track;
-use settings::Settings;
-
-mod playback;
-
-use crate::{
-    LocalTrack, Participant, RemoteTrack, RoomEvent, TrackPublication,
-    livekit_client::playback::Speaker,
-};
-pub use playback::AudioStream;
-pub(crate) use playback::{RemoteVideoFrame, play_remote_video_track};
-
-#[derive(Clone, Debug)]
-pub struct RemoteVideoTrack(livekit::track::RemoteVideoTrack);
-#[derive(Clone, Debug)]
-pub struct RemoteAudioTrack(livekit::track::RemoteAudioTrack);
-#[derive(Clone, Debug)]
-pub struct RemoteTrackPublication(livekit::publication::RemoteTrackPublication);
-#[derive(Clone, Debug)]
-pub struct RemoteParticipant(livekit::participant::RemoteParticipant);
-
-#[derive(Clone, Debug)]
-pub struct LocalVideoTrack(livekit::track::LocalVideoTrack);
-#[derive(Clone, Debug)]
-pub struct LocalAudioTrack(livekit::track::LocalAudioTrack);
-#[derive(Clone, Debug)]
-pub struct LocalTrackPublication(livekit::publication::LocalTrackPublication);
-#[derive(Clone, Debug)]
-pub struct LocalParticipant(livekit::participant::LocalParticipant);
-
-pub struct Room {
-    room: livekit::Room,
-    _task: Task<()>,
-    playback: playback::AudioStack,
-}
-
-pub type TrackSid = livekit::id::TrackSid;
-pub type ConnectionState = livekit::ConnectionState;
-#[derive(Clone, Debug, Eq, Hash, PartialEq, PartialOrd, Ord)]
-pub struct ParticipantIdentity(pub String);
-
-impl Room {
-    pub async fn connect(
-        url: String,
-        token: String,
-        cx: &mut AsyncApp,
-    ) -> Result<(Self, mpsc::UnboundedReceiver<RoomEvent>)> {
-        let connector =
-            tokio_tungstenite::Connector::Rustls(Arc::new(http_client_tls::tls_config()));
-        let mut config = livekit::RoomOptions::default();
-        config.connector = Some(connector);
-        let (room, mut events) = Tokio::spawn(cx, async move {
-            livekit::Room::connect(&url, &token, config).await
-        })?
-        .await??;
-
-        let (mut tx, rx) = mpsc::unbounded();
-        let task = cx.background_executor().spawn(async move {
-            while let Some(event) = events.recv().await {
-                if let Some(event) = room_event_from_livekit(event) {
-                    tx.send(event).await.ok();
-                }
-            }
-        });
-
-        Ok((
-            Self {
-                room,
-                _task: task,
-                playback: playback::AudioStack::new(cx.background_executor().clone()),
-            },
-            rx,
-        ))
-    }
-
-    pub fn local_participant(&self) -> LocalParticipant {
-        LocalParticipant(self.room.local_participant())
-    }
-
-    pub fn remote_participants(&self) -> HashMap<ParticipantIdentity, RemoteParticipant> {
-        self.room
-            .remote_participants()
-            .into_iter()
-            .map(|(k, v)| (ParticipantIdentity(k.0), RemoteParticipant(v)))
-            .collect()
-    }
-
-    pub fn connection_state(&self) -> ConnectionState {
-        self.room.connection_state()
-    }
-
-    pub fn name(&self) -> String {
-        self.room.name()
-    }
-
-    pub async fn sid(&self) -> String {
-        self.room.sid().await.to_string()
-    }
-
-    pub async fn publish_local_microphone_track(
-        &self,
-        user_name: String,
-        is_staff: bool,
-        cx: &mut AsyncApp,
-    ) -> Result<(LocalTrackPublication, playback::AudioStream)> {
-        let (track, stream) = self
-            .playback
-            .capture_local_microphone_track(user_name, is_staff, &cx)?;
-        let publication = self
-            .local_participant()
-            .publish_track(
-                livekit::track::LocalTrack::Audio(track.0),
-                livekit::options::TrackPublishOptions {
-                    source: livekit::track::TrackSource::Microphone,
-                    ..Default::default()
-                },
-                cx,
-            )
-            .await?;
-
-        Ok((publication, stream))
-    }
-
-    pub async fn unpublish_local_track(
-        &self,
-        sid: TrackSid,
-        cx: &mut AsyncApp,
-    ) -> Result<LocalTrackPublication> {
-        self.local_participant().unpublish_track(sid, cx).await
-    }
-
-    pub fn play_remote_audio_track(
-        &self,
-        track: &RemoteAudioTrack,
-        cx: &mut App,
-    ) -> Result<playback::AudioStream> {
-        let speaker: Speaker =
-            serde_urlencoded::from_str(&track.0.name()).unwrap_or_else(|_| Speaker {
-                name: track.0.name(),
-                is_staff: false,
-                sends_legacy_audio: true,
-            });
-
-        if AudioSettings::get_global(cx).rodio_audio {
-            info!("Using experimental.rodio_audio audio pipeline for output");
-            playback::play_remote_audio_track(&track.0, speaker, cx)
-        } else if speaker.sends_legacy_audio {
-            Ok(self.playback.play_remote_audio_track(&track.0))
-        } else {
-            Err(anyhow!("Client version too old to play audio in call"))
-        }
-    }
-}
-
-impl LocalParticipant {
-    pub async fn publish_screenshare_track(
-        &self,
-        source: &dyn ScreenCaptureSource,
-        cx: &mut AsyncApp,
-    ) -> Result<(LocalTrackPublication, Box<dyn ScreenCaptureStream>)> {
-        let (track, stream) = capture_local_video_track(source, cx).await?;
-        let options = livekit::options::TrackPublishOptions {
-            source: livekit::track::TrackSource::Screenshare,
-            video_codec: livekit::options::VideoCodec::VP8,
-            ..Default::default()
-        };
-        let publication = self
-            .publish_track(livekit::track::LocalTrack::Video(track.0), options, cx)
-            .await?;
-
-        Ok((publication, stream))
-    }
-
-    async fn publish_track(
-        &self,
-        track: livekit::track::LocalTrack,
-        options: livekit::options::TrackPublishOptions,
-        cx: &mut AsyncApp,
-    ) -> Result<LocalTrackPublication> {
-        let participant = self.0.clone();
-        Tokio::spawn(cx, async move {
-            participant.publish_track(track, options).await
-        })?
-        .await?
-        .map(LocalTrackPublication)
-        .context("publishing a track")
-    }
-
-    pub async fn unpublish_track(
-        &self,
-        sid: TrackSid,
-        cx: &mut AsyncApp,
-    ) -> Result<LocalTrackPublication> {
-        let participant = self.0.clone();
-        Tokio::spawn(cx, async move { participant.unpublish_track(&sid).await })?
-            .await?
-            .map(LocalTrackPublication)
-            .context("unpublishing a track")
-    }
-}
-
-impl LocalTrackPublication {
-    pub fn mute(&self, cx: &App) {
-        let track = self.0.clone();
-        Tokio::spawn(cx, async move {
-            track.mute();
-        })
-        .detach();
-    }
-
-    pub fn unmute(&self, cx: &App) {
-        let track = self.0.clone();
-        Tokio::spawn(cx, async move {
-            track.unmute();
-        })
-        .detach();
-    }
-
-    pub fn sid(&self) -> TrackSid {
-        self.0.sid()
-    }
-
-    pub fn is_muted(&self) -> bool {
-        self.0.is_muted()
-    }
-}
-
-impl RemoteParticipant {
-    pub fn identity(&self) -> ParticipantIdentity {
-        ParticipantIdentity(self.0.identity().0)
-    }
-
-    pub fn track_publications(&self) -> HashMap<TrackSid, RemoteTrackPublication> {
-        self.0
-            .track_publications()
-            .into_iter()
-            .map(|(sid, publication)| (sid, RemoteTrackPublication(publication)))
-            .collect()
-    }
-}
-
-impl RemoteAudioTrack {
-    pub fn sid(&self) -> TrackSid {
-        self.0.sid()
-    }
-}
-
-impl RemoteVideoTrack {
-    pub fn sid(&self) -> TrackSid {
-        self.0.sid()
-    }
-}
-
-impl RemoteTrackPublication {
-    pub fn is_muted(&self) -> bool {
-        self.0.is_muted()
-    }
-
-    pub fn is_enabled(&self) -> bool {
-        self.0.is_enabled()
-    }
-
-    pub fn track(&self) -> Option<RemoteTrack> {
-        self.0.track().map(remote_track_from_livekit)
-    }
-
-    pub fn is_audio(&self) -> bool {
-        self.0.kind() == livekit::track::TrackKind::Audio
-    }
-
-    pub fn set_enabled(&self, enabled: bool, cx: &App) {
-        let track = self.0.clone();
-        Tokio::spawn(cx, async move { track.set_enabled(enabled) }).detach();
-    }
-
-    pub fn sid(&self) -> TrackSid {
-        self.0.sid()
-    }
-}
-
-impl Participant {
-    pub fn identity(&self) -> ParticipantIdentity {
-        match self {
-            Participant::Local(local_participant) => {
-                ParticipantIdentity(local_participant.0.identity().0)
-            }
-            Participant::Remote(remote_participant) => {
-                ParticipantIdentity(remote_participant.0.identity().0)
-            }
-        }
-    }
-}
-
-fn participant_from_livekit(participant: livekit::participant::Participant) -> Participant {
-    match participant {
-        livekit::participant::Participant::Local(local) => {
-            Participant::Local(LocalParticipant(local))
-        }
-        livekit::participant::Participant::Remote(remote) => {
-            Participant::Remote(RemoteParticipant(remote))
-        }
-    }
-}
-
-fn publication_from_livekit(
-    publication: livekit::publication::TrackPublication,
-) -> TrackPublication {
-    match publication {
-        livekit::publication::TrackPublication::Local(local) => {
-            TrackPublication::Local(LocalTrackPublication(local))
-        }
-        livekit::publication::TrackPublication::Remote(remote) => {
-            TrackPublication::Remote(RemoteTrackPublication(remote))
-        }
-    }
-}
-
-fn remote_track_from_livekit(track: livekit::track::RemoteTrack) -> RemoteTrack {
-    match track {
-        livekit::track::RemoteTrack::Audio(audio) => RemoteTrack::Audio(RemoteAudioTrack(audio)),
-        livekit::track::RemoteTrack::Video(video) => RemoteTrack::Video(RemoteVideoTrack(video)),
-    }
-}
-
-fn local_track_from_livekit(track: livekit::track::LocalTrack) -> LocalTrack {
-    match track {
-        livekit::track::LocalTrack::Audio(audio) => LocalTrack::Audio(LocalAudioTrack(audio)),
-        livekit::track::LocalTrack::Video(video) => LocalTrack::Video(LocalVideoTrack(video)),
-    }
-}
-fn room_event_from_livekit(event: livekit::RoomEvent) -> Option<RoomEvent> {
-    let event = match event {
-        livekit::RoomEvent::ParticipantConnected(remote_participant) => {
-            RoomEvent::ParticipantConnected(RemoteParticipant(remote_participant))
-        }
-        livekit::RoomEvent::ParticipantDisconnected(remote_participant) => {
-            RoomEvent::ParticipantDisconnected(RemoteParticipant(remote_participant))
-        }
-        livekit::RoomEvent::LocalTrackPublished {
-            publication,
-            track,
-            participant,
-        } => RoomEvent::LocalTrackPublished {
-            publication: LocalTrackPublication(publication),
-            track: local_track_from_livekit(track),
-            participant: LocalParticipant(participant),
-        },
-        livekit::RoomEvent::LocalTrackUnpublished {
-            publication,
-            participant,
-        } => RoomEvent::LocalTrackUnpublished {
-            publication: LocalTrackPublication(publication),
-            participant: LocalParticipant(participant),
-        },
-        livekit::RoomEvent::LocalTrackSubscribed { track } => RoomEvent::LocalTrackSubscribed {
-            track: local_track_from_livekit(track),
-        },
-        livekit::RoomEvent::TrackSubscribed {
-            track,
-            publication,
-            participant,
-        } => RoomEvent::TrackSubscribed {
-            track: remote_track_from_livekit(track),
-            publication: RemoteTrackPublication(publication),
-            participant: RemoteParticipant(participant),
-        },
-        livekit::RoomEvent::TrackUnsubscribed {
-            track,
-            publication,
-            participant,
-        } => RoomEvent::TrackUnsubscribed {
-            track: remote_track_from_livekit(track),
-            publication: RemoteTrackPublication(publication),
-            participant: RemoteParticipant(participant),
-        },
-        livekit::RoomEvent::TrackSubscriptionFailed {
-            participant,
-            error: _,
-            track_sid,
-        } => RoomEvent::TrackSubscriptionFailed {
-            participant: RemoteParticipant(participant),
-            track_sid,
-        },
-        livekit::RoomEvent::TrackPublished {
-            publication,
-            participant,
-        } => RoomEvent::TrackPublished {
-            publication: RemoteTrackPublication(publication),
-            participant: RemoteParticipant(participant),
-        },
-        livekit::RoomEvent::TrackUnpublished {
-            publication,
-            participant,
-        } => RoomEvent::TrackUnpublished {
-            publication: RemoteTrackPublication(publication),
-            participant: RemoteParticipant(participant),
-        },
-        livekit::RoomEvent::TrackMuted {
-            participant,
-            publication,
-        } => RoomEvent::TrackMuted {
-            publication: publication_from_livekit(publication),
-            participant: participant_from_livekit(participant),
-        },
-        livekit::RoomEvent::TrackUnmuted {
-            participant,
-            publication,
-        } => RoomEvent::TrackUnmuted {
-            publication: publication_from_livekit(publication),
-            participant: participant_from_livekit(participant),
-        },
-        livekit::RoomEvent::RoomMetadataChanged {
-            old_metadata,
-            metadata,
-        } => RoomEvent::RoomMetadataChanged {
-            old_metadata,
-            metadata,
-        },
-        livekit::RoomEvent::ParticipantMetadataChanged {
-            participant,
-            old_metadata,
-            metadata,
-        } => RoomEvent::ParticipantMetadataChanged {
-            participant: participant_from_livekit(participant),
-            old_metadata,
-            metadata,
-        },
-        livekit::RoomEvent::ParticipantNameChanged {
-            participant,
-            old_name,
-            name,
-        } => RoomEvent::ParticipantNameChanged {
-            participant: participant_from_livekit(participant),
-            old_name,
-            name,
-        },
-        livekit::RoomEvent::ParticipantAttributesChanged {
-            participant,
-            changed_attributes,
-        } => RoomEvent::ParticipantAttributesChanged {
-            participant: participant_from_livekit(participant),
-            changed_attributes: changed_attributes.into_iter().collect(),
-        },
-        livekit::RoomEvent::ActiveSpeakersChanged { speakers } => {
-            RoomEvent::ActiveSpeakersChanged {
-                speakers: speakers.into_iter().map(participant_from_livekit).collect(),
-            }
-        }
-        livekit::RoomEvent::Connected {
-            participants_with_tracks,
-        } => RoomEvent::Connected {
-            participants_with_tracks: participants_with_tracks
-                .into_iter()
-                .map({
-                    |(p, t)| {
-                        (
-                            RemoteParticipant(p),
-                            t.into_iter().map(RemoteTrackPublication).collect(),
-                        )
-                    }
-                })
-                .collect(),
-        },
-        livekit::RoomEvent::Disconnected { reason } => RoomEvent::Disconnected {
-            reason: reason.as_str_name(),
-        },
-        livekit::RoomEvent::Reconnecting => RoomEvent::Reconnecting,
-        livekit::RoomEvent::Reconnected => RoomEvent::Reconnected,
-        _ => {
-            log::trace!("dropping livekit event: {:?}", event);
-            return None;
-        }
-    };
-
-    Some(event)
-}
diff --git a/crates/livekit_client/src/livekit_client/playback.rs b/crates/livekit_client/src/livekit_client/playback.rs
deleted file mode 100644
index cdd766453c..0000000000
--- a/crates/livekit_client/src/livekit_client/playback.rs
+++ /dev/null
@@ -1,1021 +0,0 @@
-use anyhow::{Context as _, Result};
-
-use audio::{AudioSettings, CHANNEL_COUNT, LEGACY_CHANNEL_COUNT, LEGACY_SAMPLE_RATE, SAMPLE_RATE};
-use cpal::traits::{DeviceTrait, StreamTrait as _};
-use futures::channel::mpsc::UnboundedSender;
-use futures::{Stream, StreamExt as _};
-use gpui::{
-    AsyncApp, BackgroundExecutor, ScreenCaptureFrame, ScreenCaptureSource, ScreenCaptureStream,
-    Task,
-};
-use libwebrtc::native::{apm, audio_mixer, audio_resampler};
-use livekit::track;
-
-use livekit::webrtc::{
-    audio_frame::AudioFrame,
-    audio_source::{AudioSourceOptions, RtcAudioSource, native::NativeAudioSource},
-    audio_stream::native::NativeAudioStream,
-    video_frame::{VideoBuffer, VideoFrame, VideoRotation},
-    video_source::{RtcVideoSource, VideoResolution, native::NativeVideoSource},
-    video_stream::native::NativeVideoStream,
-};
-use log::info;
-use parking_lot::Mutex;
-use rodio::Source;
-use serde::{Deserialize, Serialize};
-use settings::Settings;
-use std::cell::RefCell;
-use std::sync::Weak;
-use std::sync::atomic::{AtomicBool, AtomicI32, Ordering};
-use std::time::Duration;
-use std::{borrow::Cow, collections::VecDeque, sync::Arc, thread};
-use util::{ResultExt as _, maybe};
-
-mod source;
-
-pub(crate) struct AudioStack {
-    executor: BackgroundExecutor,
-    apm: Arc<Mutex<apm::AudioProcessingModule>>,
-    mixer: Arc<Mutex<audio_mixer::AudioMixer>>,
-    _output_task: RefCell<Weak<Task<()>>>,
-    next_ssrc: AtomicI32,
-}
-
-pub(crate) fn play_remote_audio_track(
-    track: &livekit::track::RemoteAudioTrack,
-    speaker: Speaker,
-    cx: &mut gpui::App,
-) -> Result<AudioStream> {
-    info!("speaker: {speaker:?}");
-    let stream =
-        source::LiveKitStream::new(cx.background_executor(), track, speaker.sends_legacy_audio);
-
-    let stop_handle = Arc::new(AtomicBool::new(false));
-    let stop_handle_clone = stop_handle.clone();
-    let stream = stream
-        .stoppable()
-        .periodic_access(Duration::from_millis(50), move |s| {
-            if stop_handle.load(Ordering::Relaxed) {
-                s.stop();
-            }
-        });
-
-    info!("sample_rate: {:?}", stream.sample_rate());
-    info!("channel_count: {:?}", stream.channels());
-    audio::Audio::play_voip_stream(stream, speaker.name, speaker.is_staff, cx)
-        .context("Could not play audio")?;
-
-    let on_drop = util::defer(move || {
-        stop_handle_clone.store(true, Ordering::Relaxed);
-    });
-    Ok(AudioStream::Output {
-        _drop: Box::new(on_drop),
-    })
-}
-
-impl AudioStack {
-    pub(crate) fn new(executor: BackgroundExecutor) -> Self {
-        let apm = Arc::new(Mutex::new(apm::AudioProcessingModule::new(
-            true, true, true, true,
-        )));
-        let mixer = Arc::new(Mutex::new(audio_mixer::AudioMixer::new()));
-        Self {
-            executor,
-            apm,
-            mixer,
-            _output_task: RefCell::new(Weak::new()),
-            next_ssrc: AtomicI32::new(1),
-        }
-    }
-
-    pub(crate) fn play_remote_audio_track(
-        &self,
-        track: &livekit::track::RemoteAudioTrack,
-    ) -> AudioStream {
-        let output_task = self.start_output();
-
-        let next_ssrc = self.next_ssrc.fetch_add(1, Ordering::Relaxed);
-        let source = AudioMixerSource {
-            ssrc: next_ssrc,
-            sample_rate: LEGACY_SAMPLE_RATE.get(),
-            num_channels: LEGACY_CHANNEL_COUNT.get() as u32,
-            buffer: Arc::default(),
-        };
-        self.mixer.lock().add_source(source.clone());
-
-        let mut stream = NativeAudioStream::new(
-            track.rtc_track(),
-            source.sample_rate as i32,
-            source.num_channels as i32,
-        );
-
-        let receive_task = self.executor.spawn({
-            let source = source.clone();
-            async move {
-                while let Some(frame) = stream.next().await {
-                    source.receive(frame);
-                }
-            }
-        });
-
-        let mixer = self.mixer.clone();
-        let on_drop = util::defer(move || {
-            mixer.lock().remove_source(source.ssrc);
-            drop(receive_task);
-            drop(output_task);
-        });
-
-        AudioStream::Output {
-            _drop: Box::new(on_drop),
-        }
-    }
-
-    fn start_output(&self) -> Arc<Task<()>> {
-        if let Some(task) = self._output_task.borrow().upgrade() {
-            return task;
-        }
-        let task = Arc::new(self.executor.spawn({
-            let apm = self.apm.clone();
-            let mixer = self.mixer.clone();
-            async move {
-                Self::play_output(
-                    apm,
-                    mixer,
-                    LEGACY_SAMPLE_RATE.get(),
-                    LEGACY_CHANNEL_COUNT.get().into(),
-                )
-                .await
-                .log_err();
-            }
-        }));
-        *self._output_task.borrow_mut() = Arc::downgrade(&task);
-        task
-    }
-
-    pub(crate) fn capture_local_microphone_track(
-        &self,
-        user_name: String,
-        is_staff: bool,
-        cx: &AsyncApp,
-    ) -> Result<(crate::LocalAudioTrack, AudioStream)> {
-        let legacy_audio_compatible =
-            AudioSettings::try_read_global(cx, |setting| setting.legacy_audio_compatible)
-                .unwrap_or(true);
-
-        let source = if legacy_audio_compatible {
-            NativeAudioSource::new(
-                // n.b. this struct's options are always ignored, noise cancellation is provided by apm.
-                AudioSourceOptions::default(),
-                LEGACY_SAMPLE_RATE.get(),
-                LEGACY_CHANNEL_COUNT.get().into(),
-                10,
-            )
-        } else {
-            NativeAudioSource::new(
-                // n.b. this struct's options are always ignored, noise cancellation is provided by apm.
-                AudioSourceOptions::default(),
-                SAMPLE_RATE.get(),
-                CHANNEL_COUNT.get().into(),
-                10,
-            )
-        };
-
-        let speaker = Speaker {
-            name: user_name,
-            is_staff,
-            sends_legacy_audio: legacy_audio_compatible,
-        };
-        log::info!("Microphone speaker: {speaker:?}");
-        let track_name = serde_urlencoded::to_string(speaker)
-            .context("Could not encode user information in track name")?;
-
-        let track = track::LocalAudioTrack::create_audio_track(
-            &track_name,
-            RtcAudioSource::Native(source.clone()),
-        );
-
-        let apm = self.apm.clone();
-
-        let (frame_tx, mut frame_rx) = futures::channel::mpsc::unbounded();
-        let transmit_task = self.executor.spawn({
-            async move {
-                while let Some(frame) = frame_rx.next().await {
-                    source.capture_frame(&frame).await.log_err();
-                }
-            }
-        });
-        let rodio_pipeline =
-            AudioSettings::try_read_global(cx, |setting| setting.rodio_audio).unwrap_or_default();
-        let capture_task = if rodio_pipeline {
-            info!("Using experimental.rodio_audio audio pipeline");
-            let voip_parts = audio::VoipParts::new(cx)?;
-            // Audio needs to run real-time and should never be paused. That is
-            // why we are using a normal std::thread and not a background task
-            thread::Builder::new()
-                .name("MicrophoneToLivekit".to_string())
-                .spawn(move || {
-                    // microphone is non send on mac
-                    let microphone = match audio::Audio::open_microphone(voip_parts) {
-                        Ok(m) => m,
-                        Err(e) => {
-                            log::error!("Could not open microphone: {e}");
-                            return;
-                        }
-                    };
-                    send_to_livekit(frame_tx, microphone);
-                })
-                .expect("should be able to spawn threads");
-            Task::ready(Ok(()))
-        } else {
-            self.executor.spawn(async move {
-                Self::capture_input(
-                    apm,
-                    frame_tx,
-                    LEGACY_SAMPLE_RATE.get(),
-                    LEGACY_CHANNEL_COUNT.get().into(),
-                )
-                .await
-            })
-        };
-
-        let on_drop = util::defer(|| {
-            drop(transmit_task);
-            drop(capture_task);
-        });
-        Ok((
-            super::LocalAudioTrack(track),
-            AudioStream::Output {
-                _drop: Box::new(on_drop),
-            },
-        ))
-    }
-
-    async fn play_output(
-        apm: Arc<Mutex<apm::AudioProcessingModule>>,
-        mixer: Arc<Mutex<audio_mixer::AudioMixer>>,
-        sample_rate: u32,
-        num_channels: u32,
-    ) -> Result<()> {
-        loop {
-            let mut device_change_listener = DeviceChangeListener::new(false)?;
-            let (output_device, output_config) = crate::default_device(false)?;
-            let (end_on_drop_tx, end_on_drop_rx) = std::sync::mpsc::channel::<()>();
-            let mixer = mixer.clone();
-            let apm = apm.clone();
-            let mut resampler = audio_resampler::AudioResampler::default();
-            let mut buf = Vec::new();
-
-            thread::Builder::new()
-                .name("AudioPlayback".to_owned())
-                .spawn(move || {
-                    let output_stream = output_device.build_output_stream(
-                        &output_config.config(),
-                        {
-                            move |mut data, _info| {
-                                while data.len() > 0 {
-                                    if data.len() <= buf.len() {
-                                        let rest = buf.split_off(data.len());
-                                        data.copy_from_slice(&buf);
-                                        buf = rest;
-                                        return;
-                                    }
-                                    if buf.len() > 0 {
-                                        let (prefix, suffix) = data.split_at_mut(buf.len());
-                                        prefix.copy_from_slice(&buf);
-                                        data = suffix;
-                                    }
-
-                                    let mut mixer = mixer.lock();
-                                    let mixed = mixer.mix(output_config.channels() as usize);
-                                    let sampled = resampler.remix_and_resample(
-                                        mixed,
-                                        sample_rate / 100,
-                                        num_channels,
-                                        sample_rate,
-                                        output_config.channels() as u32,
-                                        output_config.sample_rate().0,
-                                    );
-                                    buf = sampled.to_vec();
-                                    apm.lock()
-                                        .process_reverse_stream(
-                                            &mut buf,
-                                            output_config.sample_rate().0 as i32,
-                                            output_config.channels() as i32,
-                                        )
-                                        .ok();
-                                }
-                            }
-                        },
-                        |error| log::error!("error playing audio track: {:?}", error),
-                        Some(Duration::from_millis(100)),
-                    );
-
-                    let Some(output_stream) = output_stream.log_err() else {
-                        return;
-                    };
-
-                    output_stream.play().log_err();
-                    // Block forever to keep the output stream alive
-                    end_on_drop_rx.recv().ok();
-                })
-                .unwrap();
-
-            device_change_listener.next().await;
-            drop(end_on_drop_tx)
-        }
-    }
-
-    async fn capture_input(
-        apm: Arc<Mutex<apm::AudioProcessingModule>>,
-        frame_tx: UnboundedSender<AudioFrame<'static>>,
-        sample_rate: u32,
-        num_channels: u32,
-    ) -> Result<()> {
-        loop {
-            let mut device_change_listener = DeviceChangeListener::new(true)?;
-            let (device, config) = crate::default_device(true)?;
-            let (end_on_drop_tx, end_on_drop_rx) = std::sync::mpsc::channel::<()>();
-            let apm = apm.clone();
-            let frame_tx = frame_tx.clone();
-            let mut resampler = audio_resampler::AudioResampler::default();
-
-            thread::Builder::new()
-                .name("AudioCapture".to_owned())
-                .spawn(move || {
-                    maybe!({
-                        if let Some(name) = device.name().ok() {
-                            log::info!("Using microphone: {}", name)
-                        } else {
-                            log::info!("Using microphone: <unknown>");
-                        }
-
-                        let ten_ms_buffer_size =
-                            (config.channels() as u32 * config.sample_rate().0 / 100) as usize;
-                        let mut buf: Vec<i16> = Vec::with_capacity(ten_ms_buffer_size);
-
-                        let stream = device
-                            .build_input_stream_raw(
-                                &config.config(),
-                                config.sample_format(),
-                                move |data, _: &_| {
-                                    let data = crate::get_sample_data(config.sample_format(), data)
-                                        .log_err();
-                                    let Some(data) = data else {
-                                        return;
-                                    };
-                                    let mut data = data.as_slice();
-
-                                    while data.len() > 0 {
-                                        let remainder =
-                                            (buf.capacity() - buf.len()).min(data.len());
-                                        buf.extend_from_slice(&data[..remainder]);
-                                        data = &data[remainder..];
-
-                                        if buf.capacity() == buf.len() {
-                                            let mut sampled = resampler
-                                                .remix_and_resample(
-                                                    buf.as_slice(),
-                                                    config.sample_rate().0 / 100,
-                                                    config.channels() as u32,
-                                                    config.sample_rate().0,
-                                                    num_channels,
-                                                    sample_rate,
-                                                )
-                                                .to_owned();
-                                            apm.lock()
-                                                .process_stream(
-                                                    &mut sampled,
-                                                    sample_rate as i32,
-                                                    num_channels as i32,
-                                                )
-                                                .log_err();
-                                            buf.clear();
-                                            frame_tx
-                                                .unbounded_send(AudioFrame {
-                                                    data: Cow::Owned(sampled),
-                                                    sample_rate,
-                                                    num_channels,
-                                                    samples_per_channel: sample_rate / 100,
-                                                })
-                                                .ok();
-                                        }
-                                    }
-                                },
-                                |err| log::error!("error capturing audio track: {:?}", err),
-                                Some(Duration::from_millis(100)),
-                            )
-                            .context("failed to build input stream")?;
-
-                        stream.play()?;
-                        // Keep the thread alive and holding onto the `stream`
-                        end_on_drop_rx.recv().ok();
-                        anyhow::Ok(Some(()))
-                    })
-                    .log_err();
-                })
-                .unwrap();
-
-            device_change_listener.next().await;
-            drop(end_on_drop_tx)
-        }
-    }
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct Speaker {
-    pub name: String,
-    pub is_staff: bool,
-    pub sends_legacy_audio: bool,
-}
-
-fn send_to_livekit(frame_tx: UnboundedSender<AudioFrame<'static>>, mut microphone: impl Source) {
-    use cpal::Sample;
-    let sample_rate = microphone.sample_rate().get();
-    let num_channels = microphone.channels().get() as u32;
-    let buffer_size = sample_rate / 100 * num_channels;
-
-    loop {
-        let sampled: Vec<_> = microphone
-            .by_ref()
-            .take(buffer_size as usize)
-            .map(|s| s.to_sample())
-            .collect();
-
-        if frame_tx
-            .unbounded_send(AudioFrame {
-                sample_rate,
-                num_channels,
-                samples_per_channel: sampled.len() as u32 / num_channels,
-                data: Cow::Owned(sampled),
-            })
-            .is_err()
-        {
-            // must rx has dropped or is not consuming
-            break;
-        }
-    }
-}
-
-use super::LocalVideoTrack;
-
-pub enum AudioStream {
-    Input { _task: Task<()> },
-    Output { _drop: Box<dyn std::any::Any> },
-}
-
-pub(crate) async fn capture_local_video_track(
-    capture_source: &dyn ScreenCaptureSource,
-    cx: &mut gpui::AsyncApp,
-) -> Result<(crate::LocalVideoTrack, Box<dyn ScreenCaptureStream>)> {
-    let metadata = capture_source.metadata()?;
-    let track_source = gpui_tokio::Tokio::spawn(cx, async move {
-        NativeVideoSource::new(VideoResolution {
-            width: metadata.resolution.width.0 as u32,
-            height: metadata.resolution.height.0 as u32,
-        })
-    })?
-    .await?;
-
-    let capture_stream = capture_source
-        .stream(cx.foreground_executor(), {
-            let track_source = track_source.clone();
-            Box::new(move |frame| {
-                if let Some(buffer) = video_frame_buffer_to_webrtc(frame) {
-                    track_source.capture_frame(&VideoFrame {
-                        rotation: VideoRotation::VideoRotation0,
-                        timestamp_us: 0,
-                        buffer,
-                    });
-                }
-            })
-        })
-        .await??;
-
-    Ok((
-        LocalVideoTrack(track::LocalVideoTrack::create_video_track(
-            "screen share",
-            RtcVideoSource::Native(track_source),
-        )),
-        capture_stream,
-    ))
-}
-
-#[derive(Clone)]
-struct AudioMixerSource {
-    ssrc: i32,
-    sample_rate: u32,
-    num_channels: u32,
-    buffer: Arc<Mutex<VecDeque<Vec<i16>>>>,
-}
-
-impl AudioMixerSource {
-    fn receive(&self, frame: AudioFrame) {
-        assert_eq!(
-            frame.data.len() as u32,
-            self.sample_rate * self.num_channels / 100
-        );
-
-        let mut buffer = self.buffer.lock();
-        buffer.push_back(frame.data.to_vec());
-        while buffer.len() > 10 {
-            buffer.pop_front();
-        }
-    }
-}
-
-impl libwebrtc::native::audio_mixer::AudioMixerSource for AudioMixerSource {
-    fn ssrc(&self) -> i32 {
-        self.ssrc
-    }
-
-    fn preferred_sample_rate(&self) -> u32 {
-        self.sample_rate
-    }
-
-    fn get_audio_frame_with_info<'a>(&self, target_sample_rate: u32) -> Option<AudioFrame<'_>> {
-        assert_eq!(self.sample_rate, target_sample_rate);
-        let buf = self.buffer.lock().pop_front()?;
-        Some(AudioFrame {
-            data: Cow::Owned(buf),
-            sample_rate: self.sample_rate,
-            num_channels: self.num_channels,
-            samples_per_channel: self.sample_rate / 100,
-        })
-    }
-}
-
-pub fn play_remote_video_track(
-    track: &crate::RemoteVideoTrack,
-) -> impl Stream<Item = RemoteVideoFrame> + use<> {
-    #[cfg(target_os = "macos")]
-    {
-        let mut pool = None;
-        let most_recent_frame_size = (0, 0);
-        NativeVideoStream::new(track.0.rtc_track()).filter_map(move |frame| {
-            if pool == None
-                || most_recent_frame_size != (frame.buffer.width(), frame.buffer.height())
-            {
-                pool = create_buffer_pool(frame.buffer.width(), frame.buffer.height()).log_err();
-            }
-            let pool = pool.clone();
-            async move {
-                if frame.buffer.width() < 10 && frame.buffer.height() < 10 {
-                    // when the remote stops sharing, we get an 8x8 black image.
-                    // In a lil bit, the unpublish will come through and close the view,
-                    // but until then, don't flash black.
-                    return None;
-                }
-
-                video_frame_buffer_from_webrtc(pool?, frame.buffer)
-            }
-        })
-    }
-    #[cfg(not(target_os = "macos"))]
-    {
-        NativeVideoStream::new(track.0.rtc_track())
-            .filter_map(|frame| async move { video_frame_buffer_from_webrtc(frame.buffer) })
-    }
-}
-
-#[cfg(target_os = "macos")]
-fn create_buffer_pool(
-    width: u32,
-    height: u32,
-) -> Result<core_video::pixel_buffer_pool::CVPixelBufferPool> {
-    use core_foundation::{base::TCFType, number::CFNumber, string::CFString};
-    use core_video::pixel_buffer;
-    use core_video::{
-        pixel_buffer::kCVPixelFormatType_420YpCbCr8BiPlanarFullRange,
-        pixel_buffer_io_surface::kCVPixelBufferIOSurfaceCoreAnimationCompatibilityKey,
-        pixel_buffer_pool::{self},
-    };
-
-    let width_key: CFString =
-        unsafe { CFString::wrap_under_get_rule(pixel_buffer::kCVPixelBufferWidthKey) };
-    let height_key: CFString =
-        unsafe { CFString::wrap_under_get_rule(pixel_buffer::kCVPixelBufferHeightKey) };
-    let animation_key: CFString = unsafe {
-        CFString::wrap_under_get_rule(kCVPixelBufferIOSurfaceCoreAnimationCompatibilityKey)
-    };
-    let format_key: CFString =
-        unsafe { CFString::wrap_under_get_rule(pixel_buffer::kCVPixelBufferPixelFormatTypeKey) };
-
-    let yes: CFNumber = 1.into();
-    let width: CFNumber = (width as i32).into();
-    let height: CFNumber = (height as i32).into();
-    let format: CFNumber = (kCVPixelFormatType_420YpCbCr8BiPlanarFullRange as i64).into();
-
-    let buffer_attributes = core_foundation::dictionary::CFDictionary::from_CFType_pairs(&[
-        (width_key, width.into_CFType()),
-        (height_key, height.into_CFType()),
-        (animation_key, yes.into_CFType()),
-        (format_key, format.into_CFType()),
-    ]);
-
-    pixel_buffer_pool::CVPixelBufferPool::new(None, Some(&buffer_attributes)).map_err(|cv_return| {
-        anyhow::anyhow!("failed to create pixel buffer pool: CVReturn({cv_return})",)
-    })
-}
-
-#[cfg(target_os = "macos")]
-pub type RemoteVideoFrame = core_video::pixel_buffer::CVPixelBuffer;
-
-#[cfg(target_os = "macos")]
-fn video_frame_buffer_from_webrtc(
-    pool: core_video::pixel_buffer_pool::CVPixelBufferPool,
-    buffer: Box<dyn VideoBuffer>,
-) -> Option<RemoteVideoFrame> {
-    use core_foundation::base::TCFType;
-    use core_video::{pixel_buffer::CVPixelBuffer, r#return::kCVReturnSuccess};
-    use livekit::webrtc::native::yuv_helper::i420_to_nv12;
-
-    if let Some(native) = buffer.as_native() {
-        let pixel_buffer = native.get_cv_pixel_buffer();
-        if pixel_buffer.is_null() {
-            return None;
-        }
-        return unsafe { Some(CVPixelBuffer::wrap_under_get_rule(pixel_buffer as _)) };
-    }
-
-    let i420_buffer = buffer.as_i420()?;
-    let pixel_buffer = pool.create_pixel_buffer().log_err()?;
-
-    let image_buffer = unsafe {
-        if pixel_buffer.lock_base_address(0) != kCVReturnSuccess {
-            return None;
-        }
-
-        let dst_y = pixel_buffer.get_base_address_of_plane(0);
-        let dst_y_stride = pixel_buffer.get_bytes_per_row_of_plane(0);
-        let dst_y_len = pixel_buffer.get_height_of_plane(0) * dst_y_stride;
-        let dst_uv = pixel_buffer.get_base_address_of_plane(1);
-        let dst_uv_stride = pixel_buffer.get_bytes_per_row_of_plane(1);
-        let dst_uv_len = pixel_buffer.get_height_of_plane(1) * dst_uv_stride;
-        let width = pixel_buffer.get_width();
-        let height = pixel_buffer.get_height();
-        let dst_y_buffer = std::slice::from_raw_parts_mut(dst_y as *mut u8, dst_y_len);
-        let dst_uv_buffer = std::slice::from_raw_parts_mut(dst_uv as *mut u8, dst_uv_len);
-
-        let (stride_y, stride_u, stride_v) = i420_buffer.strides();
-        let (src_y, src_u, src_v) = i420_buffer.data();
-        i420_to_nv12(
-            src_y,
-            stride_y,
-            src_u,
-            stride_u,
-            src_v,
-            stride_v,
-            dst_y_buffer,
-            dst_y_stride as u32,
-            dst_uv_buffer,
-            dst_uv_stride as u32,
-            width as i32,
-            height as i32,
-        );
-
-        if pixel_buffer.unlock_base_address(0) != kCVReturnSuccess {
-            return None;
-        }
-
-        pixel_buffer
-    };
-
-    Some(image_buffer)
-}
-
-#[cfg(not(target_os = "macos"))]
-pub type RemoteVideoFrame = Arc<gpui::RenderImage>;
-
-#[cfg(not(target_os = "macos"))]
-fn video_frame_buffer_from_webrtc(buffer: Box<dyn VideoBuffer>) -> Option<RemoteVideoFrame> {
-    use gpui::RenderImage;
-    use image::{Frame, RgbaImage};
-    use livekit::webrtc::prelude::VideoFormatType;
-    use smallvec::SmallVec;
-    use std::alloc::{Layout, alloc};
-
-    let width = buffer.width();
-    let height = buffer.height();
-    let stride = width * 4;
-    let byte_len = (stride * height) as usize;
-    let argb_image = unsafe {
-        // Motivation for this unsafe code is to avoid initializing the frame data, since to_argb
-        // will write all bytes anyway.
-        let start_ptr = alloc(Layout::array::<u8>(byte_len).log_err()?);
-        if start_ptr.is_null() {
-            return None;
-        }
-        let argb_frame_slice = std::slice::from_raw_parts_mut(start_ptr, byte_len);
-        buffer.to_argb(
-            VideoFormatType::ARGB,
-            argb_frame_slice,
-            stride,
-            width as i32,
-            height as i32,
-        );
-        Vec::from_raw_parts(start_ptr, byte_len, byte_len)
-    };
-
-    // TODO: Unclear why providing argb_image to RgbaImage works properly.
-    let image = RgbaImage::from_raw(width, height, argb_image)
-        .with_context(|| "Bug: not enough bytes allocated for image.")
-        .log_err()?;
-
-    Some(Arc::new(RenderImage::new(SmallVec::from_elem(
-        Frame::new(image),
-        1,
-    ))))
-}
-
-#[cfg(target_os = "macos")]
-fn video_frame_buffer_to_webrtc(frame: ScreenCaptureFrame) -> Option<impl AsRef<dyn VideoBuffer>> {
-    use livekit::webrtc;
-
-    let pixel_buffer = frame.0.as_concrete_TypeRef();
-    std::mem::forget(frame.0);
-    unsafe {
-        Some(webrtc::video_frame::native::NativeBuffer::from_cv_pixel_buffer(pixel_buffer as _))
-    }
-}
-
-#[cfg(not(target_os = "macos"))]
-fn video_frame_buffer_to_webrtc(frame: ScreenCaptureFrame) -> Option<impl AsRef<dyn VideoBuffer>> {
-    use libwebrtc::native::yuv_helper::{abgr_to_nv12, argb_to_nv12};
-    use livekit::webrtc::prelude::NV12Buffer;
-    match frame.0 {
-        scap::frame::Frame::BGRx(frame) => {
-            let mut buffer = NV12Buffer::new(frame.width as u32, frame.height as u32);
-            let (stride_y, stride_uv) = buffer.strides();
-            let (data_y, data_uv) = buffer.data_mut();
-            argb_to_nv12(
-                &frame.data,
-                frame.width as u32 * 4,
-                data_y,
-                stride_y,
-                data_uv,
-                stride_uv,
-                frame.width,
-                frame.height,
-            );
-            Some(buffer)
-        }
-        scap::frame::Frame::RGBx(frame) => {
-            let mut buffer = NV12Buffer::new(frame.width as u32, frame.height as u32);
-            let (stride_y, stride_uv) = buffer.strides();
-            let (data_y, data_uv) = buffer.data_mut();
-            abgr_to_nv12(
-                &frame.data,
-                frame.width as u32 * 4,
-                data_y,
-                stride_y,
-                data_uv,
-                stride_uv,
-                frame.width,
-                frame.height,
-            );
-            Some(buffer)
-        }
-        scap::frame::Frame::YUVFrame(yuvframe) => {
-            let mut buffer = NV12Buffer::with_strides(
-                yuvframe.width as u32,
-                yuvframe.height as u32,
-                yuvframe.luminance_stride as u32,
-                yuvframe.chrominance_stride as u32,
-            );
-            let (luminance, chrominance) = buffer.data_mut();
-            luminance.copy_from_slice(yuvframe.luminance_bytes.as_slice());
-            chrominance.copy_from_slice(yuvframe.chrominance_bytes.as_slice());
-            Some(buffer)
-        }
-        _ => {
-            log::error!(
-                "Expected BGRx or YUV frame from scap screen capture but got some other format."
-            );
-            None
-        }
-    }
-}
-
-trait DeviceChangeListenerApi: Stream<Item = ()> + Sized {
-    fn new(input: bool) -> Result<Self>;
-}
-
-#[cfg(target_os = "macos")]
-mod macos {
-
-    use coreaudio::sys::{
-        AudioObjectAddPropertyListener, AudioObjectID, AudioObjectPropertyAddress,
-        AudioObjectRemovePropertyListener, OSStatus, kAudioHardwarePropertyDefaultInputDevice,
-        kAudioHardwarePropertyDefaultOutputDevice, kAudioObjectPropertyElementMaster,
-        kAudioObjectPropertyScopeGlobal, kAudioObjectSystemObject,
-    };
-    use futures::{StreamExt, channel::mpsc::UnboundedReceiver};
-
-    /// Implementation from: https://github.com/zed-industries/cpal/blob/fd8bc2fd39f1f5fdee5a0690656caff9a26d9d50/src/host/coreaudio/macos/property_listener.rs#L15
-    pub struct CoreAudioDefaultDeviceChangeListener {
-        rx: UnboundedReceiver<()>,
-        callback: Box<PropertyListenerCallbackWrapper>,
-        input: bool,
-        device_id: AudioObjectID, // Store the device ID to properly remove listeners
-    }
-
-    trait _AssertSend: Send {}
-    impl _AssertSend for CoreAudioDefaultDeviceChangeListener {}
-
-    struct PropertyListenerCallbackWrapper(Box<dyn FnMut() + Send>);
-
-    unsafe extern "C" fn property_listener_handler_shim(
-        _: AudioObjectID,
-        _: u32,
-        _: *const AudioObjectPropertyAddress,
-        callback: *mut ::std::os::raw::c_void,
-    ) -> OSStatus {
-        let wrapper = callback as *mut PropertyListenerCallbackWrapper;
-        unsafe { (*wrapper).0() };
-        0
-    }
-
-    impl super::DeviceChangeListenerApi for CoreAudioDefaultDeviceChangeListener {
-        fn new(input: bool) -> anyhow::Result<Self> {
-            let (tx, rx) = futures::channel::mpsc::unbounded();
-
-            let callback = Box::new(PropertyListenerCallbackWrapper(Box::new(move || {
-                tx.unbounded_send(()).ok();
-            })));
-
-            // Get the current default device ID
-            let device_id = unsafe {
-                // Listen for default device changes
-                coreaudio::Error::from_os_status(AudioObjectAddPropertyListener(
-                    kAudioObjectSystemObject,
-                    &AudioObjectPropertyAddress {
-                        mSelector: if input {
-                            kAudioHardwarePropertyDefaultInputDevice
-                        } else {
-                            kAudioHardwarePropertyDefaultOutputDevice
-                        },
-                        mScope: kAudioObjectPropertyScopeGlobal,
-                        mElement: kAudioObjectPropertyElementMaster,
-                    },
-                    Some(property_listener_handler_shim),
-                    &*callback as *const _ as *mut _,
-                ))?;
-
-                // Also listen for changes to the device configuration
-                let device_id = if input {
-                    let mut input_device: AudioObjectID = 0;
-                    let mut prop_size = std::mem::size_of::<AudioObjectID>() as u32;
-                    let result = coreaudio::sys::AudioObjectGetPropertyData(
-                        kAudioObjectSystemObject,
-                        &AudioObjectPropertyAddress {
-                            mSelector: kAudioHardwarePropertyDefaultInputDevice,
-                            mScope: kAudioObjectPropertyScopeGlobal,
-                            mElement: kAudioObjectPropertyElementMaster,
-                        },
-                        0,
-                        std::ptr::null(),
-                        &mut prop_size as *mut _,
-                        &mut input_device as *mut _ as *mut _,
-                    );
-                    if result != 0 {
-                        log::warn!("Failed to get default input device ID");
-                        0
-                    } else {
-                        input_device
-                    }
-                } else {
-                    let mut output_device: AudioObjectID = 0;
-                    let mut prop_size = std::mem::size_of::<AudioObjectID>() as u32;
-                    let result = coreaudio::sys::AudioObjectGetPropertyData(
-                        kAudioObjectSystemObject,
-                        &AudioObjectPropertyAddress {
-                            mSelector: kAudioHardwarePropertyDefaultOutputDevice,
-                            mScope: kAudioObjectPropertyScopeGlobal,
-                            mElement: kAudioObjectPropertyElementMaster,
-                        },
-                        0,
-                        std::ptr::null(),
-                        &mut prop_size as *mut _,
-                        &mut output_device as *mut _ as *mut _,
-                    );
-                    if result != 0 {
-                        log::warn!("Failed to get default output device ID");
-                        0
-                    } else {
-                        output_device
-                    }
-                };
-
-                if device_id != 0 {
-                    // Listen for format changes on the device
-                    coreaudio::Error::from_os_status(AudioObjectAddPropertyListener(
-                        device_id,
-                        &AudioObjectPropertyAddress {
-                            mSelector: coreaudio::sys::kAudioDevicePropertyStreamFormat,
-                            mScope: if input {
-                                coreaudio::sys::kAudioObjectPropertyScopeInput
-                            } else {
-                                coreaudio::sys::kAudioObjectPropertyScopeOutput
-                            },
-                            mElement: kAudioObjectPropertyElementMaster,
-                        },
-                        Some(property_listener_handler_shim),
-                        &*callback as *const _ as *mut _,
-                    ))?;
-                }
-
-                device_id
-            };
-
-            Ok(Self {
-                rx,
-                callback,
-                input,
-                device_id,
-            })
-        }
-    }
-
-    impl Drop for CoreAudioDefaultDeviceChangeListener {
-        fn drop(&mut self) {
-            unsafe {
-                // Remove the system-level property listener
-                AudioObjectRemovePropertyListener(
-                    kAudioObjectSystemObject,
-                    &AudioObjectPropertyAddress {
-                        mSelector: if self.input {
-                            kAudioHardwarePropertyDefaultInputDevice
-                        } else {
-                            kAudioHardwarePropertyDefaultOutputDevice
-                        },
-                        mScope: kAudioObjectPropertyScopeGlobal,
-                        mElement: kAudioObjectPropertyElementMaster,
-                    },
-                    Some(property_listener_handler_shim),
-                    &*self.callback as *const _ as *mut _,
-                );
-
-                // Remove the device-specific property listener if we have a valid device ID
-                if self.device_id != 0 {
-                    AudioObjectRemovePropertyListener(
-                        self.device_id,
-                        &AudioObjectPropertyAddress {
-                            mSelector: coreaudio::sys::kAudioDevicePropertyStreamFormat,
-                            mScope: if self.input {
-                                coreaudio::sys::kAudioObjectPropertyScopeInput
-                            } else {
-                                coreaudio::sys::kAudioObjectPropertyScopeOutput
-                            },
-                            mElement: kAudioObjectPropertyElementMaster,
-                        },
-                        Some(property_listener_handler_shim),
-                        &*self.callback as *const _ as *mut _,
-                    );
-                }
-            }
-        }
-    }
-
-    impl futures::Stream for CoreAudioDefaultDeviceChangeListener {
-        type Item = ();
-
-        fn poll_next(
-            mut self: std::pin::Pin<&mut Self>,
-            cx: &mut std::task::Context<'_>,
-        ) -> std::task::Poll<Option<Self::Item>> {
-            self.rx.poll_next_unpin(cx)
-        }
-    }
-}
-
-#[cfg(target_os = "macos")]
-type DeviceChangeListener = macos::CoreAudioDefaultDeviceChangeListener;
-
-#[cfg(not(target_os = "macos"))]
-mod noop_change_listener {
-    use std::task::Poll;
-
-    use super::DeviceChangeListenerApi;
-
-    pub struct NoopOutputDeviceChangelistener {}
-
-    impl DeviceChangeListenerApi for NoopOutputDeviceChangelistener {
-        fn new(_input: bool) -> anyhow::Result<Self> {
-            Ok(NoopOutputDeviceChangelistener {})
-        }
-    }
-
-    impl futures::Stream for NoopOutputDeviceChangelistener {
-        type Item = ();
-
-        fn poll_next(
-            self: std::pin::Pin<&mut Self>,
-            _cx: &mut std::task::Context<'_>,
-        ) -> Poll<Option<Self::Item>> {
-            Poll::Pending
-        }
-    }
-}
-
-#[cfg(not(target_os = "macos"))]
-type DeviceChangeListener = noop_change_listener::NoopOutputDeviceChangelistener;
diff --git a/crates/livekit_client/src/livekit_client/playback/source.rs b/crates/livekit_client/src/livekit_client/playback/source.rs
deleted file mode 100644
index cde4b19fda..0000000000
--- a/crates/livekit_client/src/livekit_client/playback/source.rs
+++ /dev/null
@@ -1,92 +0,0 @@
-use std::num::NonZero;
-
-use futures::StreamExt;
-use libwebrtc::{audio_stream::native::NativeAudioStream, prelude::AudioFrame};
-use livekit::track::RemoteAudioTrack;
-use rodio::{
-    ChannelCount, SampleRate, Source, buffer::SamplesBuffer, conversions::SampleTypeConverter,
-};
-
-use audio::{CHANNEL_COUNT, LEGACY_CHANNEL_COUNT, LEGACY_SAMPLE_RATE, SAMPLE_RATE};
-
-fn frame_to_samplesbuffer(frame: AudioFrame) -> SamplesBuffer {
-    let samples = frame.data.iter().copied();
-    let samples = SampleTypeConverter::<_, _>::new(samples);
-    let samples: Vec<f32> = samples.collect();
-    SamplesBuffer::new(
-        NonZero::new(frame.num_channels as u16).expect("zero channels is nonsense"),
-        NonZero::new(frame.sample_rate).expect("samplerate zero is nonsense"),
-        samples,
-    )
-}
-
-pub struct LiveKitStream {
-    // shared_buffer: SharedBuffer,
-    inner: rodio::queue::SourcesQueueOutput,
-    _receiver_task: gpui::Task<()>,
-    channel_count: ChannelCount,
-    sample_rate: SampleRate,
-}
-
-impl LiveKitStream {
-    pub fn new(
-        executor: &gpui::BackgroundExecutor,
-        track: &RemoteAudioTrack,
-        legacy: bool,
-    ) -> Self {
-        let (channel_count, sample_rate) = if legacy {
-            (LEGACY_CHANNEL_COUNT, LEGACY_SAMPLE_RATE)
-        } else {
-            (CHANNEL_COUNT, SAMPLE_RATE)
-        };
-
-        let mut stream = NativeAudioStream::new(
-            track.rtc_track(),
-            sample_rate.get() as i32,
-            channel_count.get().into(),
-        );
-        let (queue_input, queue_output) = rodio::queue::queue(true);
-        // spawn rtc stream
-        let receiver_task = executor.spawn({
-            async move {
-                while let Some(frame) = stream.next().await {
-                    let samples = frame_to_samplesbuffer(frame);
-                    queue_input.append(samples);
-                }
-            }
-        });
-
-        LiveKitStream {
-            _receiver_task: receiver_task,
-            inner: queue_output,
-            sample_rate,
-            channel_count,
-        }
-    }
-}
-
-impl Iterator for LiveKitStream {
-    type Item = rodio::Sample;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.inner.next()
-    }
-}
-
-impl Source for LiveKitStream {
-    fn current_span_len(&self) -> Option<usize> {
-        self.inner.current_span_len()
-    }
-
-    fn channels(&self) -> rodio::ChannelCount {
-        self.channel_count
-    }
-
-    fn sample_rate(&self) -> rodio::SampleRate {
-        self.sample_rate
-    }
-
-    fn total_duration(&self) -> Option<std::time::Duration> {
-        self.inner.total_duration()
-    }
-}
diff --git a/crates/livekit_client/src/mock_client.rs b/crates/livekit_client/src/mock_client.rs
deleted file mode 100644
index 7d355749c0..0000000000
--- a/crates/livekit_client/src/mock_client.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-use crate::test;
-
-pub(crate) mod participant;
-pub(crate) mod publication;
-pub(crate) mod track;
-
-pub type RemoteVideoTrack = track::RemoteVideoTrack;
-pub type RemoteAudioTrack = track::RemoteAudioTrack;
-pub type RemoteTrackPublication = publication::RemoteTrackPublication;
-pub type RemoteParticipant = participant::RemoteParticipant;
-
-pub type LocalVideoTrack = track::LocalVideoTrack;
-pub type LocalAudioTrack = track::LocalAudioTrack;
-pub type LocalTrackPublication = publication::LocalTrackPublication;
-pub type LocalParticipant = participant::LocalParticipant;
-
-pub type Room = test::Room;
-pub use test::{ConnectionState, ParticipantIdentity, TrackSid};
-
-pub struct AudioStream {}
-
-#[cfg(not(target_os = "macos"))]
-pub type RemoteVideoFrame = std::sync::Arc<gpui::RenderImage>;
-
-#[cfg(target_os = "macos")]
-#[derive(Clone)]
-pub(crate) struct RemoteVideoFrame {}
-#[cfg(target_os = "macos")]
-impl Into<gpui::SurfaceSource> for RemoteVideoFrame {
-    fn into(self) -> gpui::SurfaceSource {
-        unimplemented!()
-    }
-}
-pub(crate) fn play_remote_video_track(
-    _track: &crate::RemoteVideoTrack,
-) -> impl futures::Stream<Item = RemoteVideoFrame> + use<> {
-    futures::stream::pending()
-}
diff --git a/crates/livekit_client/src/mock_client/participant.rs b/crates/livekit_client/src/mock_client/participant.rs
deleted file mode 100644
index 033808cbb5..0000000000
--- a/crates/livekit_client/src/mock_client/participant.rs
+++ /dev/null
@@ -1,136 +0,0 @@
-use crate::{
-    AudioStream, LocalAudioTrack, LocalTrackPublication, LocalVideoTrack, Participant,
-    ParticipantIdentity, RemoteTrack, RemoteTrackPublication, TrackSid,
-    test::{Room, WeakRoom},
-};
-use anyhow::Result;
-use collections::HashMap;
-use gpui::{
-    AsyncApp, DevicePixels, ScreenCaptureSource, ScreenCaptureStream, SourceMetadata, size,
-};
-
-#[derive(Clone, Debug)]
-pub struct LocalParticipant {
-    pub(crate) identity: ParticipantIdentity,
-    pub(crate) room: Room,
-}
-
-#[derive(Clone, Debug)]
-pub struct RemoteParticipant {
-    pub(crate) identity: ParticipantIdentity,
-    pub(crate) room: WeakRoom,
-}
-
-impl Participant {
-    pub fn identity(&self) -> ParticipantIdentity {
-        match self {
-            Participant::Local(participant) => participant.identity.clone(),
-            Participant::Remote(participant) => participant.identity.clone(),
-        }
-    }
-}
-
-impl LocalParticipant {
-    pub async fn unpublish_track(&self, track: TrackSid, _cx: &AsyncApp) -> Result<()> {
-        self.room
-            .test_server()
-            .unpublish_track(self.room.token(), &track)
-            .await
-    }
-
-    pub(crate) async fn publish_microphone_track(
-        &self,
-        _cx: &AsyncApp,
-    ) -> Result<(LocalTrackPublication, AudioStream)> {
-        let this = self.clone();
-        let server = this.room.test_server();
-        let sid = server
-            .publish_audio_track(this.room.token(), &LocalAudioTrack {})
-            .await?;
-
-        Ok((
-            LocalTrackPublication {
-                room: self.room.downgrade(),
-                sid,
-            },
-            AudioStream {},
-        ))
-    }
-
-    pub async fn publish_screenshare_track(
-        &self,
-        _source: &dyn ScreenCaptureSource,
-        _cx: &mut AsyncApp,
-    ) -> Result<(LocalTrackPublication, Box<dyn ScreenCaptureStream>)> {
-        let this = self.clone();
-        let server = this.room.test_server();
-        let sid = server
-            .publish_video_track(this.room.token(), LocalVideoTrack {})
-            .await?;
-        Ok((
-            LocalTrackPublication {
-                room: self.room.downgrade(),
-                sid,
-            },
-            Box::new(TestScreenCaptureStream {}),
-        ))
-    }
-}
-
-impl RemoteParticipant {
-    pub fn track_publications(&self) -> HashMap<TrackSid, RemoteTrackPublication> {
-        if let Some(room) = self.room.upgrade() {
-            let server = room.test_server();
-            let audio = server
-                .audio_tracks(room.token())
-                .unwrap()
-                .into_iter()
-                .filter(|track| track.publisher_id() == self.identity)
-                .map(|track| {
-                    (
-                        track.sid(),
-                        RemoteTrackPublication {
-                            sid: track.sid(),
-                            room: self.room.clone(),
-                            track: RemoteTrack::Audio(track),
-                        },
-                    )
-                });
-            let video = server
-                .video_tracks(room.token())
-                .unwrap()
-                .into_iter()
-                .filter(|track| track.publisher_id() == self.identity)
-                .map(|track| {
-                    (
-                        track.sid(),
-                        RemoteTrackPublication {
-                            sid: track.sid(),
-                            room: self.room.clone(),
-                            track: RemoteTrack::Video(track),
-                        },
-                    )
-                });
-            audio.chain(video).collect()
-        } else {
-            HashMap::default()
-        }
-    }
-
-    pub fn identity(&self) -> ParticipantIdentity {
-        self.identity.clone()
-    }
-}
-
-struct TestScreenCaptureStream;
-
-impl ScreenCaptureStream for TestScreenCaptureStream {
-    fn metadata(&self) -> Result<SourceMetadata> {
-        Ok(SourceMetadata {
-            id: 0,
-            is_main: None,
-            label: None,
-            resolution: size(DevicePixels(1), DevicePixels(1)),
-        })
-    }
-}
diff --git a/crates/livekit_client/src/mock_client/publication.rs b/crates/livekit_client/src/mock_client/publication.rs
deleted file mode 100644
index 8c6494e03a..0000000000
--- a/crates/livekit_client/src/mock_client/publication.rs
+++ /dev/null
@@ -1,91 +0,0 @@
-use gpui::App;
-
-use crate::{RemoteTrack, TrackSid, test::WeakRoom};
-
-#[derive(Clone, Debug)]
-pub struct LocalTrackPublication {
-    pub(crate) sid: TrackSid,
-    pub(crate) room: WeakRoom,
-}
-
-#[derive(Clone, Debug)]
-pub struct RemoteTrackPublication {
-    pub(crate) sid: TrackSid,
-    pub(crate) room: WeakRoom,
-    pub(crate) track: RemoteTrack,
-}
-
-impl LocalTrackPublication {
-    pub fn sid(&self) -> TrackSid {
-        self.sid.clone()
-    }
-
-    pub fn mute(&self, _cx: &App) {
-        self.set_mute(true)
-    }
-
-    pub fn unmute(&self, _cx: &App) {
-        self.set_mute(false)
-    }
-
-    fn set_mute(&self, mute: bool) {
-        if let Some(room) = self.room.upgrade() {
-            room.test_server()
-                .set_track_muted(&room.token(), &self.sid, mute)
-                .ok();
-        }
-    }
-
-    pub fn is_muted(&self) -> bool {
-        if let Some(room) = self.room.upgrade() {
-            room.test_server()
-                .is_track_muted(&room.token(), &self.sid)
-                .unwrap_or(false)
-        } else {
-            false
-        }
-    }
-}
-
-impl RemoteTrackPublication {
-    pub fn sid(&self) -> TrackSid {
-        self.sid.clone()
-    }
-
-    pub fn track(&self) -> Option<RemoteTrack> {
-        Some(self.track.clone())
-    }
-
-    pub fn is_audio(&self) -> bool {
-        matches!(self.track, RemoteTrack::Audio(_))
-    }
-
-    pub fn is_muted(&self) -> bool {
-        if let Some(room) = self.room.upgrade() {
-            room.test_server()
-                .is_track_muted(&room.token(), &self.sid)
-                .unwrap_or(false)
-        } else {
-            false
-        }
-    }
-
-    pub fn is_enabled(&self) -> bool {
-        if let Some(room) = self.room.upgrade() {
-            !room.0.lock().paused_audio_tracks.contains(&self.sid)
-        } else {
-            false
-        }
-    }
-
-    pub fn set_enabled(&self, enabled: bool, _cx: &App) {
-        if let Some(room) = self.room.upgrade() {
-            let paused_audio_tracks = &mut room.0.lock().paused_audio_tracks;
-            if enabled {
-                paused_audio_tracks.remove(&self.sid);
-            } else {
-                paused_audio_tracks.insert(self.sid.clone());
-            }
-        }
-    }
-}
diff --git a/crates/livekit_client/src/mock_client/track.rs b/crates/livekit_client/src/mock_client/track.rs
deleted file mode 100644
index e1565e8d71..0000000000
--- a/crates/livekit_client/src/mock_client/track.rs
+++ /dev/null
@@ -1,56 +0,0 @@
-use std::sync::Arc;
-
-use crate::{
-    ParticipantIdentity, TrackSid,
-    test::{TestServerAudioTrack, TestServerVideoTrack, WeakRoom},
-};
-
-#[derive(Clone, Debug)]
-pub struct LocalVideoTrack {}
-
-#[derive(Clone, Debug)]
-pub struct LocalAudioTrack {}
-
-#[derive(Clone, Debug)]
-pub struct RemoteVideoTrack {
-    pub(crate) server_track: Arc<TestServerVideoTrack>,
-    pub(crate) _room: WeakRoom,
-}
-
-#[derive(Clone, Debug)]
-pub struct RemoteAudioTrack {
-    pub(crate) server_track: Arc<TestServerAudioTrack>,
-    pub(crate) room: WeakRoom,
-}
-
-impl RemoteAudioTrack {
-    pub fn sid(&self) -> TrackSid {
-        self.server_track.sid.clone()
-    }
-
-    pub fn publisher_id(&self) -> ParticipantIdentity {
-        self.server_track.publisher_id.clone()
-    }
-
-    pub fn enabled(&self) -> bool {
-        if let Some(room) = self.room.upgrade() {
-            !room
-                .0
-                .lock()
-                .paused_audio_tracks
-                .contains(&self.server_track.sid)
-        } else {
-            false
-        }
-    }
-}
-
-impl RemoteVideoTrack {
-    pub fn sid(&self) -> TrackSid {
-        self.server_track.sid.clone()
-    }
-
-    pub fn publisher_id(&self) -> ParticipantIdentity {
-        self.server_track.publisher_id.clone()
-    }
-}
diff --git a/crates/livekit_client/src/record.rs b/crates/livekit_client/src/record.rs
deleted file mode 100644
index 24e260e716..0000000000
--- a/crates/livekit_client/src/record.rs
+++ /dev/null
@@ -1,96 +0,0 @@
-use std::{
-    env,
-    num::NonZero,
-    path::{Path, PathBuf},
-    sync::{Arc, Mutex},
-    time::Duration,
-};
-
-use anyhow::{Context, Result};
-use cpal::traits::{DeviceTrait, StreamTrait};
-use rodio::{buffer::SamplesBuffer, conversions::SampleTypeConverter};
-use util::ResultExt;
-
-pub struct CaptureInput {
-    pub name: String,
-    config: cpal::SupportedStreamConfig,
-    samples: Arc<Mutex<Vec<i16>>>,
-    _stream: cpal::Stream,
-}
-
-impl CaptureInput {
-    pub fn start() -> anyhow::Result<Self> {
-        let (device, config) = crate::default_device(true)?;
-        let name = device.name().unwrap_or("<unknown>".to_string());
-        log::info!("Using microphone: {}", name);
-
-        let samples = Arc::new(Mutex::new(Vec::new()));
-        let stream = start_capture(device, config.clone(), samples.clone())?;
-
-        Ok(Self {
-            name,
-            _stream: stream,
-            config,
-            samples,
-        })
-    }
-
-    pub fn finish(self) -> Result<PathBuf> {
-        let name = self.name;
-        let mut path = env::current_dir().context("Could not get current dir")?;
-        path.push(&format!("test_recording_{name}.wav"));
-        log::info!("Test recording written to: {}", path.display());
-        write_out(self.samples, self.config, &path)?;
-        Ok(path)
-    }
-}
-
-fn start_capture(
-    device: cpal::Device,
-    config: cpal::SupportedStreamConfig,
-    samples: Arc<Mutex<Vec<i16>>>,
-) -> Result<cpal::Stream> {
-    let stream = device
-        .build_input_stream_raw(
-            &config.config(),
-            config.sample_format(),
-            move |data, _: &_| {
-                let data = crate::get_sample_data(config.sample_format(), data).log_err();
-                let Some(data) = data else {
-                    return;
-                };
-                samples
-                    .try_lock()
-                    .expect("Only locked after stream ends")
-                    .extend_from_slice(&data);
-            },
-            |err| log::error!("error capturing audio track: {:?}", err),
-            Some(Duration::from_millis(100)),
-        )
-        .context("failed to build input stream")?;
-
-    stream.play()?;
-    Ok(stream)
-}
-
-fn write_out(
-    samples: Arc<Mutex<Vec<i16>>>,
-    config: cpal::SupportedStreamConfig,
-    path: &Path,
-) -> Result<()> {
-    let samples = std::mem::take(
-        &mut *samples
-            .try_lock()
-            .expect("Stream has ended, callback cant hold the lock"),
-    );
-    let samples: Vec<f32> = SampleTypeConverter::<_, f32>::new(samples.into_iter()).collect();
-    let mut samples = SamplesBuffer::new(
-        NonZero::new(config.channels()).expect("config channel is never zero"),
-        NonZero::new(config.sample_rate().0).expect("config sample_rate is never zero"),
-        samples,
-    );
-    match rodio::wav_to_file(&mut samples, path) {
-        Ok(_) => Ok(()),
-        Err(e) => Err(anyhow::anyhow!("Failed to write wav file: {}", e)),
-    }
-}
diff --git a/crates/livekit_client/src/remote_video_track_view.rs b/crates/livekit_client/src/remote_video_track_view.rs
deleted file mode 100644
index 189806f213..0000000000
--- a/crates/livekit_client/src/remote_video_track_view.rs
+++ /dev/null
@@ -1,109 +0,0 @@
-use super::RemoteVideoTrack;
-use futures::StreamExt as _;
-use gpui::{
-    AppContext as _, Context, Empty, Entity, EventEmitter, IntoElement, Render, Task, Window,
-};
-
-pub struct RemoteVideoTrackView {
-    track: RemoteVideoTrack,
-    latest_frame: Option<crate::RemoteVideoFrame>,
-    #[cfg(not(target_os = "macos"))]
-    current_rendered_frame: Option<crate::RemoteVideoFrame>,
-    #[cfg(not(target_os = "macos"))]
-    previous_rendered_frame: Option<crate::RemoteVideoFrame>,
-    _maintain_frame: Task<()>,
-}
-
-#[derive(Debug)]
-pub enum RemoteVideoTrackViewEvent {
-    Close,
-}
-
-impl RemoteVideoTrackView {
-    pub fn new(track: RemoteVideoTrack, window: &mut Window, cx: &mut Context<Self>) -> Self {
-        cx.focus_handle();
-        let frames = crate::play_remote_video_track(&track);
-
-        #[cfg(not(target_os = "macos"))]
-        {
-            use util::ResultExt;
-
-            let window_handle = window.window_handle();
-            cx.on_release(move |this, cx| {
-                if let Some(frame) = this.previous_rendered_frame.take() {
-                    window_handle
-                        .update(cx, |_, window, _cx| window.drop_image(frame).log_err())
-                        .ok();
-                }
-                if let Some(frame) = this.current_rendered_frame.take() {
-                    window_handle
-                        .update(cx, |_, window, _cx| window.drop_image(frame).log_err())
-                        .ok();
-                }
-            })
-            .detach();
-        }
-
-        Self {
-            track,
-            latest_frame: None,
-            _maintain_frame: cx.spawn_in(window, async move |this, cx| {
-                futures::pin_mut!(frames);
-                while let Some(frame) = frames.next().await {
-                    this.update(cx, |this, cx| {
-                        this.latest_frame = Some(frame);
-                        cx.notify();
-                    })
-                    .ok();
-                }
-                this.update(cx, |_this, cx| cx.emit(RemoteVideoTrackViewEvent::Close))
-                    .ok();
-            }),
-            #[cfg(not(target_os = "macos"))]
-            current_rendered_frame: None,
-            #[cfg(not(target_os = "macos"))]
-            previous_rendered_frame: None,
-        }
-    }
-
-    pub fn clone(&self, window: &mut Window, cx: &mut Context<Self>) -> Entity<Self> {
-        cx.new(|cx| Self::new(self.track.clone(), window, cx))
-    }
-}
-
-impl EventEmitter<RemoteVideoTrackViewEvent> for RemoteVideoTrackView {}
-
-impl Render for RemoteVideoTrackView {
-    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
-        #[cfg(target_os = "macos")]
-        if let Some(latest_frame) = &self.latest_frame {
-            use gpui::Styled as _;
-            return gpui::surface(latest_frame.clone())
-                .size_full()
-                .into_any_element();
-        }
-
-        #[cfg(not(target_os = "macos"))]
-        if let Some(latest_frame) = &self.latest_frame {
-            use gpui::Styled as _;
-            if let Some(current_rendered_frame) = self.current_rendered_frame.take() {
-                if let Some(frame) = self.previous_rendered_frame.take() {
-                    // Only drop the frame if it's not also the current frame.
-                    if frame.id != current_rendered_frame.id {
-                        use util::ResultExt as _;
-                        _window.drop_image(frame).log_err();
-                    }
-                }
-                self.previous_rendered_frame = Some(current_rendered_frame)
-            }
-            self.current_rendered_frame = Some(latest_frame.clone());
-            use gpui::ParentElement;
-            return ui::h_flex()
-                .size_full()
-                .child(gpui::img(latest_frame.clone()).size_full())
-                .into_any_element();
-        }
-
-        Empty.into_any_element()
-    }
-}
diff --git a/crates/livekit_client/src/test.rs b/crates/livekit_client/src/test.rs
deleted file mode 100644
index a8222b9a18..0000000000
--- a/crates/livekit_client/src/test.rs
+++ /dev/null
@@ -1,765 +0,0 @@
-use crate::{AudioStream, Participant, RemoteTrack, RoomEvent, TrackPublication};
-
-use crate::mock_client::{participant::*, publication::*, track::*};
-use anyhow::{Context as _, Result};
-use async_trait::async_trait;
-use collections::{BTreeMap, HashMap, HashSet, btree_map::Entry as BTreeEntry, hash_map::Entry};
-use gpui::{App, AsyncApp, BackgroundExecutor};
-use livekit_api::{proto, token};
-use parking_lot::Mutex;
-use postage::{mpsc, sink::Sink};
-use std::sync::{
-    Arc, Weak,
-    atomic::{AtomicBool, Ordering::SeqCst},
-};
-
-#[derive(Clone, Debug, Eq, Hash, PartialEq, PartialOrd, Ord)]
-pub struct ParticipantIdentity(pub String);
-
-#[derive(Clone, Debug, Eq, Hash, PartialEq, PartialOrd, Ord)]
-pub struct TrackSid(pub(crate) String);
-
-impl std::fmt::Display for TrackSid {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        self.0.fmt(f)
-    }
-}
-
-impl TryFrom<String> for TrackSid {
-    type Error = anyhow::Error;
-
-    fn try_from(value: String) -> Result<Self, Self::Error> {
-        Ok(TrackSid(value))
-    }
-}
-
-#[derive(Copy, Clone, Debug, Eq, Hash, PartialEq, PartialOrd, Ord)]
-#[non_exhaustive]
-pub enum ConnectionState {
-    Connected,
-    Disconnected,
-}
-
-static SERVERS: Mutex<BTreeMap<String, Arc<TestServer>>> = Mutex::new(BTreeMap::new());
-
-pub struct TestServer {
-    pub url: String,
-    pub api_key: String,
-    pub secret_key: String,
-    rooms: Mutex<HashMap<String, TestServerRoom>>,
-    executor: BackgroundExecutor,
-}
-
-impl TestServer {
-    pub fn create(
-        url: String,
-        api_key: String,
-        secret_key: String,
-        executor: BackgroundExecutor,
-    ) -> Result<Arc<TestServer>> {
-        let mut servers = SERVERS.lock();
-        if let BTreeEntry::Vacant(e) = servers.entry(url.clone()) {
-            let server = Arc::new(TestServer {
-                url,
-                api_key,
-                secret_key,
-                rooms: Default::default(),
-                executor,
-            });
-            e.insert(server.clone());
-            Ok(server)
-        } else {
-            anyhow::bail!("a server with url {url:?} already exists");
-        }
-    }
-
-    fn get(url: &str) -> Result<Arc<TestServer>> {
-        Ok(SERVERS
-            .lock()
-            .get(url)
-            .context("no server found for url")?
-            .clone())
-    }
-
-    pub fn teardown(&self) -> Result<()> {
-        SERVERS
-            .lock()
-            .remove(&self.url)
-            .with_context(|| format!("server with url {:?} does not exist", self.url))?;
-        Ok(())
-    }
-
-    pub fn create_api_client(&self) -> TestApiClient {
-        TestApiClient {
-            url: self.url.clone(),
-        }
-    }
-
-    pub async fn create_room(&self, room: String) -> Result<()> {
-        self.simulate_random_delay().await;
-
-        let mut server_rooms = self.rooms.lock();
-        if let Entry::Vacant(e) = server_rooms.entry(room.clone()) {
-            e.insert(Default::default());
-            Ok(())
-        } else {
-            anyhow::bail!("{room:?} already exists");
-        }
-    }
-
-    async fn delete_room(&self, room: String) -> Result<()> {
-        self.simulate_random_delay().await;
-
-        let mut server_rooms = self.rooms.lock();
-        server_rooms
-            .remove(&room)
-            .with_context(|| format!("room {room:?} does not exist"))?;
-        Ok(())
-    }
-
-    async fn join_room(&self, token: String, client_room: Room) -> Result<ParticipantIdentity> {
-        self.simulate_random_delay().await;
-
-        let claims = livekit_api::token::validate(&token, &self.secret_key)?;
-        let identity = ParticipantIdentity(claims.sub.unwrap().to_string());
-        let room_name = claims.video.room.unwrap();
-        let mut server_rooms = self.rooms.lock();
-        let room = (*server_rooms).entry(room_name.to_string()).or_default();
-
-        if let Entry::Vacant(e) = room.client_rooms.entry(identity.clone()) {
-            for server_track in &room.video_tracks {
-                let track = RemoteTrack::Video(RemoteVideoTrack {
-                    server_track: server_track.clone(),
-                    _room: client_room.downgrade(),
-                });
-                client_room
-                    .0
-                    .lock()
-                    .updates_tx
-                    .blocking_send(RoomEvent::TrackSubscribed {
-                        track: track.clone(),
-                        publication: RemoteTrackPublication {
-                            sid: server_track.sid.clone(),
-                            room: client_room.downgrade(),
-                            track,
-                        },
-                        participant: RemoteParticipant {
-                            room: client_room.downgrade(),
-                            identity: server_track.publisher_id.clone(),
-                        },
-                    })
-                    .unwrap();
-            }
-            for server_track in &room.audio_tracks {
-                let track = RemoteTrack::Audio(RemoteAudioTrack {
-                    server_track: server_track.clone(),
-                    room: client_room.downgrade(),
-                });
-                client_room
-                    .0
-                    .lock()
-                    .updates_tx
-                    .blocking_send(RoomEvent::TrackSubscribed {
-                        track: track.clone(),
-                        publication: RemoteTrackPublication {
-                            sid: server_track.sid.clone(),
-                            room: client_room.downgrade(),
-                            track,
-                        },
-                        participant: RemoteParticipant {
-                            room: client_room.downgrade(),
-                            identity: server_track.publisher_id.clone(),
-                        },
-                    })
-                    .unwrap();
-            }
-            e.insert(client_room);
-            Ok(identity)
-        } else {
-            anyhow::bail!("{identity:?} attempted to join room {room_name:?} twice");
-        }
-    }
-
-    async fn leave_room(&self, token: String) -> Result<()> {
-        self.simulate_random_delay().await;
-
-        let claims = livekit_api::token::validate(&token, &self.secret_key)?;
-        let identity = ParticipantIdentity(claims.sub.unwrap().to_string());
-        let room_name = claims.video.room.unwrap();
-        let mut server_rooms = self.rooms.lock();
-        let room = server_rooms
-            .get_mut(&*room_name)
-            .with_context(|| format!("room {room_name:?} does not exist"))?;
-        room.client_rooms.remove(&identity).with_context(|| {
-            format!("{identity:?} attempted to leave room {room_name:?} before joining it")
-        })?;
-        Ok(())
-    }
-
-    fn remote_participants(
-        &self,
-        token: String,
-    ) -> Result<HashMap<ParticipantIdentity, RemoteParticipant>> {
-        let claims = livekit_api::token::validate(&token, &self.secret_key)?;
-        let local_identity = ParticipantIdentity(claims.sub.unwrap().to_string());
-        let room_name = claims.video.room.unwrap().to_string();
-
-        if let Some(server_room) = self.rooms.lock().get(&room_name) {
-            let room = server_room
-                .client_rooms
-                .get(&local_identity)
-                .unwrap()
-                .downgrade();
-            Ok(server_room
-                .client_rooms
-                .iter()
-                .filter(|(identity, _)| *identity != &local_identity)
-                .map(|(identity, _)| {
-                    (
-                        identity.clone(),
-                        RemoteParticipant {
-                            room: room.clone(),
-                            identity: identity.clone(),
-                        },
-                    )
-                })
-                .collect())
-        } else {
-            Ok(Default::default())
-        }
-    }
-
-    async fn remove_participant(
-        &self,
-        room_name: String,
-        identity: ParticipantIdentity,
-    ) -> Result<()> {
-        self.simulate_random_delay().await;
-
-        let mut server_rooms = self.rooms.lock();
-        let room = server_rooms
-            .get_mut(&room_name)
-            .with_context(|| format!("room {room_name} does not exist"))?;
-        room.client_rooms
-            .remove(&identity)
-            .with_context(|| format!("participant {identity:?} did not join room {room_name:?}"))?;
-        Ok(())
-    }
-
-    async fn update_participant(
-        &self,
-        room_name: String,
-        identity: String,
-        permission: proto::ParticipantPermission,
-    ) -> Result<()> {
-        self.simulate_random_delay().await;
-
-        let mut server_rooms = self.rooms.lock();
-        let room = server_rooms
-            .get_mut(&room_name)
-            .with_context(|| format!("room {room_name} does not exist"))?;
-        room.participant_permissions
-            .insert(ParticipantIdentity(identity), permission);
-        Ok(())
-    }
-
-    pub async fn disconnect_client(&self, client_identity: String) {
-        let client_identity = ParticipantIdentity(client_identity);
-
-        self.simulate_random_delay().await;
-
-        let mut server_rooms = self.rooms.lock();
-        for room in server_rooms.values_mut() {
-            if let Some(room) = room.client_rooms.remove(&client_identity) {
-                let mut room = room.0.lock();
-                room.connection_state = ConnectionState::Disconnected;
-                room.updates_tx
-                    .blocking_send(RoomEvent::Disconnected {
-                        reason: "SIGNAL_CLOSED",
-                    })
-                    .ok();
-            }
-        }
-    }
-
-    pub(crate) async fn publish_video_track(
-        &self,
-        token: String,
-        _local_track: LocalVideoTrack,
-    ) -> Result<TrackSid> {
-        self.simulate_random_delay().await;
-
-        let claims = livekit_api::token::validate(&token, &self.secret_key)?;
-        let identity = ParticipantIdentity(claims.sub.unwrap().to_string());
-        let room_name = claims.video.room.unwrap();
-
-        let mut server_rooms = self.rooms.lock();
-        let room = server_rooms
-            .get_mut(&*room_name)
-            .with_context(|| format!("room {room_name} does not exist"))?;
-
-        let can_publish = room
-            .participant_permissions
-            .get(&identity)
-            .map(|permission| permission.can_publish)
-            .or(claims.video.can_publish)
-            .unwrap_or(true);
-
-        anyhow::ensure!(can_publish, "user is not allowed to publish");
-
-        let sid: TrackSid = format!("TR_{}", nanoid::nanoid!(17)).try_into().unwrap();
-        let server_track = Arc::new(TestServerVideoTrack {
-            sid: sid.clone(),
-            publisher_id: identity.clone(),
-        });
-
-        room.video_tracks.push(server_track.clone());
-
-        for (room_identity, client_room) in &room.client_rooms {
-            if *room_identity != identity {
-                let track = RemoteTrack::Video(RemoteVideoTrack {
-                    server_track: server_track.clone(),
-                    _room: client_room.downgrade(),
-                });
-                let publication = RemoteTrackPublication {
-                    sid: sid.clone(),
-                    room: client_room.downgrade(),
-                    track: track.clone(),
-                };
-                let participant = RemoteParticipant {
-                    identity: identity.clone(),
-                    room: client_room.downgrade(),
-                };
-                client_room
-                    .0
-                    .lock()
-                    .updates_tx
-                    .blocking_send(RoomEvent::TrackSubscribed {
-                        track,
-                        publication,
-                        participant,
-                    })
-                    .unwrap();
-            }
-        }
-
-        Ok(sid)
-    }
-
-    pub(crate) async fn publish_audio_track(
-        &self,
-        token: String,
-        _local_track: &LocalAudioTrack,
-    ) -> Result<TrackSid> {
-        self.simulate_random_delay().await;
-
-        let claims = livekit_api::token::validate(&token, &self.secret_key)?;
-        let identity = ParticipantIdentity(claims.sub.unwrap().to_string());
-        let room_name = claims.video.room.unwrap();
-
-        let mut server_rooms = self.rooms.lock();
-        let room = server_rooms
-            .get_mut(&*room_name)
-            .with_context(|| format!("room {room_name} does not exist"))?;
-
-        let can_publish = room
-            .participant_permissions
-            .get(&identity)
-            .map(|permission| permission.can_publish)
-            .or(claims.video.can_publish)
-            .unwrap_or(true);
-
-        anyhow::ensure!(can_publish, "user is not allowed to publish");
-
-        let sid: TrackSid = format!("TR_{}", nanoid::nanoid!(17)).try_into().unwrap();
-        let server_track = Arc::new(TestServerAudioTrack {
-            sid: sid.clone(),
-            publisher_id: identity.clone(),
-            muted: AtomicBool::new(false),
-        });
-
-        room.audio_tracks.push(server_track.clone());
-
-        for (room_identity, client_room) in &room.client_rooms {
-            if *room_identity != identity {
-                let track = RemoteTrack::Audio(RemoteAudioTrack {
-                    server_track: server_track.clone(),
-                    room: client_room.downgrade(),
-                });
-                let publication = RemoteTrackPublication {
-                    sid: sid.clone(),
-                    room: client_room.downgrade(),
-                    track: track.clone(),
-                };
-                let participant = RemoteParticipant {
-                    identity: identity.clone(),
-                    room: client_room.downgrade(),
-                };
-                client_room
-                    .0
-                    .lock()
-                    .updates_tx
-                    .blocking_send(RoomEvent::TrackSubscribed {
-                        track,
-                        publication,
-                        participant,
-                    })
-                    .ok();
-            }
-        }
-
-        Ok(sid)
-    }
-
-    pub(crate) async fn unpublish_track(&self, _token: String, _track: &TrackSid) -> Result<()> {
-        Ok(())
-    }
-
-    pub(crate) fn set_track_muted(
-        &self,
-        token: &str,
-        track_sid: &TrackSid,
-        muted: bool,
-    ) -> Result<()> {
-        let claims = livekit_api::token::validate(token, &self.secret_key)?;
-        let room_name = claims.video.room.unwrap();
-        let identity = ParticipantIdentity(claims.sub.unwrap().to_string());
-        let mut server_rooms = self.rooms.lock();
-        let room = server_rooms
-            .get_mut(&*room_name)
-            .with_context(|| format!("room {room_name} does not exist"))?;
-        if let Some(track) = room
-            .audio_tracks
-            .iter_mut()
-            .find(|track| track.sid == *track_sid)
-        {
-            track.muted.store(muted, SeqCst);
-            for (id, client_room) in room.client_rooms.iter() {
-                if *id != identity {
-                    let participant = Participant::Remote(RemoteParticipant {
-                        identity: identity.clone(),
-                        room: client_room.downgrade(),
-                    });
-                    let track = RemoteTrack::Audio(RemoteAudioTrack {
-                        server_track: track.clone(),
-                        room: client_room.downgrade(),
-                    });
-                    let publication = TrackPublication::Remote(RemoteTrackPublication {
-                        sid: track_sid.clone(),
-                        room: client_room.downgrade(),
-                        track,
-                    });
-
-                    let event = if muted {
-                        RoomEvent::TrackMuted {
-                            participant,
-                            publication,
-                        }
-                    } else {
-                        RoomEvent::TrackUnmuted {
-                            participant,
-                            publication,
-                        }
-                    };
-
-                    client_room
-                        .0
-                        .lock()
-                        .updates_tx
-                        .blocking_send(event)
-                        .unwrap();
-                }
-            }
-        }
-        Ok(())
-    }
-
-    pub(crate) fn is_track_muted(&self, token: &str, track_sid: &TrackSid) -> Option<bool> {
-        let claims = livekit_api::token::validate(token, &self.secret_key).ok()?;
-        let room_name = claims.video.room.unwrap();
-
-        let mut server_rooms = self.rooms.lock();
-        let room = server_rooms.get_mut(&*room_name)?;
-        room.audio_tracks.iter().find_map(|track| {
-            if track.sid == *track_sid {
-                Some(track.muted.load(SeqCst))
-            } else {
-                None
-            }
-        })
-    }
-
-    pub(crate) fn video_tracks(&self, token: String) -> Result<Vec<RemoteVideoTrack>> {
-        let claims = livekit_api::token::validate(&token, &self.secret_key)?;
-        let room_name = claims.video.room.unwrap();
-        let identity = ParticipantIdentity(claims.sub.unwrap().to_string());
-
-        let mut server_rooms = self.rooms.lock();
-        let room = server_rooms
-            .get_mut(&*room_name)
-            .with_context(|| format!("room {room_name} does not exist"))?;
-        let client_room = room
-            .client_rooms
-            .get(&identity)
-            .context("not a participant in room")?;
-        Ok(room
-            .video_tracks
-            .iter()
-            .map(|track| RemoteVideoTrack {
-                server_track: track.clone(),
-                _room: client_room.downgrade(),
-            })
-            .collect())
-    }
-
-    pub(crate) fn audio_tracks(&self, token: String) -> Result<Vec<RemoteAudioTrack>> {
-        let claims = livekit_api::token::validate(&token, &self.secret_key)?;
-        let room_name = claims.video.room.unwrap();
-        let identity = ParticipantIdentity(claims.sub.unwrap().to_string());
-
-        let mut server_rooms = self.rooms.lock();
-        let room = server_rooms
-            .get_mut(&*room_name)
-            .with_context(|| format!("room {room_name} does not exist"))?;
-        let client_room = room
-            .client_rooms
-            .get(&identity)
-            .context("not a participant in room")?;
-        Ok(room
-            .audio_tracks
-            .iter()
-            .map(|track| RemoteAudioTrack {
-                server_track: track.clone(),
-                room: client_room.downgrade(),
-            })
-            .collect())
-    }
-
-    async fn simulate_random_delay(&self) {
-        #[cfg(any(test, feature = "test-support"))]
-        self.executor.simulate_random_delay().await;
-    }
-}
-
-#[derive(Default, Debug)]
-struct TestServerRoom {
-    client_rooms: HashMap<ParticipantIdentity, Room>,
-    video_tracks: Vec<Arc<TestServerVideoTrack>>,
-    audio_tracks: Vec<Arc<TestServerAudioTrack>>,
-    participant_permissions: HashMap<ParticipantIdentity, proto::ParticipantPermission>,
-}
-
-#[derive(Debug)]
-pub(crate) struct TestServerVideoTrack {
-    pub(crate) sid: TrackSid,
-    pub(crate) publisher_id: ParticipantIdentity,
-    // frames_rx: async_broadcast::Receiver<Frame>,
-}
-
-#[derive(Debug)]
-pub(crate) struct TestServerAudioTrack {
-    pub(crate) sid: TrackSid,
-    pub(crate) publisher_id: ParticipantIdentity,
-    pub(crate) muted: AtomicBool,
-}
-
-pub struct TestApiClient {
-    url: String,
-}
-
-#[async_trait]
-impl livekit_api::Client for TestApiClient {
-    fn url(&self) -> &str {
-        &self.url
-    }
-
-    async fn create_room(&self, name: String) -> Result<()> {
-        let server = TestServer::get(&self.url)?;
-        server.create_room(name).await?;
-        Ok(())
-    }
-
-    async fn delete_room(&self, name: String) -> Result<()> {
-        let server = TestServer::get(&self.url)?;
-        server.delete_room(name).await?;
-        Ok(())
-    }
-
-    async fn remove_participant(&self, room: String, identity: String) -> Result<()> {
-        let server = TestServer::get(&self.url)?;
-        server
-            .remove_participant(room, ParticipantIdentity(identity))
-            .await?;
-        Ok(())
-    }
-
-    async fn update_participant(
-        &self,
-        room: String,
-        identity: String,
-        permission: livekit_api::proto::ParticipantPermission,
-    ) -> Result<()> {
-        let server = TestServer::get(&self.url)?;
-        server
-            .update_participant(room, identity, permission)
-            .await?;
-        Ok(())
-    }
-
-    fn room_token(&self, room: &str, identity: &str) -> Result<String> {
-        let server = TestServer::get(&self.url)?;
-        token::create(
-            &server.api_key,
-            &server.secret_key,
-            Some(identity),
-            token::VideoGrant::to_join(room),
-        )
-    }
-
-    fn guest_token(&self, room: &str, identity: &str) -> Result<String> {
-        let server = TestServer::get(&self.url)?;
-        token::create(
-            &server.api_key,
-            &server.secret_key,
-            Some(identity),
-            token::VideoGrant::for_guest(room),
-        )
-    }
-}
-
-pub(crate) struct RoomState {
-    pub(crate) url: String,
-    pub(crate) token: String,
-    pub(crate) local_identity: ParticipantIdentity,
-    pub(crate) connection_state: ConnectionState,
-    pub(crate) paused_audio_tracks: HashSet<TrackSid>,
-    pub(crate) updates_tx: mpsc::Sender<RoomEvent>,
-}
-
-#[derive(Clone, Debug)]
-pub struct Room(pub(crate) Arc<Mutex<RoomState>>);
-
-#[derive(Clone, Debug)]
-pub(crate) struct WeakRoom(Weak<Mutex<RoomState>>);
-
-impl std::fmt::Debug for RoomState {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("Room")
-            .field("url", &self.url)
-            .field("token", &self.token)
-            .field("local_identity", &self.local_identity)
-            .field("connection_state", &self.connection_state)
-            .field("paused_audio_tracks", &self.paused_audio_tracks)
-            .finish()
-    }
-}
-
-impl Room {
-    pub(crate) fn downgrade(&self) -> WeakRoom {
-        WeakRoom(Arc::downgrade(&self.0))
-    }
-
-    pub fn connection_state(&self) -> ConnectionState {
-        self.0.lock().connection_state
-    }
-
-    pub fn local_participant(&self) -> LocalParticipant {
-        let identity = self.0.lock().local_identity.clone();
-        LocalParticipant {
-            identity,
-            room: self.clone(),
-        }
-    }
-
-    pub async fn connect(
-        url: String,
-        token: String,
-        _cx: &mut AsyncApp,
-    ) -> Result<(Self, mpsc::Receiver<RoomEvent>)> {
-        let server = TestServer::get(&url)?;
-        let (updates_tx, updates_rx) = mpsc::channel(1024);
-        let this = Self(Arc::new(Mutex::new(RoomState {
-            local_identity: ParticipantIdentity(String::new()),
-            url: url.to_string(),
-            token: token.to_string(),
-            connection_state: ConnectionState::Disconnected,
-            paused_audio_tracks: Default::default(),
-            updates_tx,
-        })));
-
-        let identity = server
-            .join_room(token.to_string(), this.clone())
-            .await
-            .context("room join")?;
-        {
-            let mut state = this.0.lock();
-            state.local_identity = identity;
-            state.connection_state = ConnectionState::Connected;
-        }
-
-        Ok((this, updates_rx))
-    }
-
-    pub fn remote_participants(&self) -> HashMap<ParticipantIdentity, RemoteParticipant> {
-        self.test_server()
-            .remote_participants(self.0.lock().token.clone())
-            .unwrap()
-    }
-
-    pub(crate) fn test_server(&self) -> Arc<TestServer> {
-        TestServer::get(&self.0.lock().url).unwrap()
-    }
-
-    pub(crate) fn token(&self) -> String {
-        self.0.lock().token.clone()
-    }
-
-    pub fn name(&self) -> String {
-        "test_room".to_string()
-    }
-
-    pub async fn sid(&self) -> String {
-        "RM_test_session".to_string()
-    }
-
-    pub fn play_remote_audio_track(
-        &self,
-        _track: &RemoteAudioTrack,
-        _cx: &App,
-    ) -> anyhow::Result<AudioStream> {
-        Ok(AudioStream {})
-    }
-
-    pub async fn unpublish_local_track(&self, sid: TrackSid, cx: &mut AsyncApp) -> Result<()> {
-        self.local_participant().unpublish_track(sid, cx).await
-    }
-
-    pub async fn publish_local_microphone_track(
-        &self,
-        _track_name: String,
-        _is_staff: bool,
-        cx: &mut AsyncApp,
-    ) -> Result<(LocalTrackPublication, AudioStream)> {
-        self.local_participant().publish_microphone_track(cx).await
-    }
-}
-
-impl Drop for RoomState {
-    fn drop(&mut self) {
-        if self.connection_state == ConnectionState::Connected
-            && let Ok(server) = TestServer::get(&self.url)
-        {
-            let executor = server.executor.clone();
-            let token = self.token.clone();
-            executor
-                .spawn(async move { server.leave_room(token).await.ok() })
-                .detach();
-        }
-    }
-}
-
-impl WeakRoom {
-    pub(crate) fn upgrade(&self) -> Option<Room> {
-        self.0.upgrade().map(Room)
-    }
-}
diff --git a/crates/lmstudio/Cargo.toml b/crates/lmstudio/Cargo.toml
deleted file mode 100644
index 825507b915..0000000000
--- a/crates/lmstudio/Cargo.toml
+++ /dev/null
@@ -1,24 +0,0 @@
-[package]
-name = "lmstudio"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/lmstudio.rs"
-
-[features]
-default = []
-schemars = ["dep:schemars"]
-
-[dependencies]
-anyhow.workspace = true
-futures.workspace = true
-http_client.workspace = true
-schemars = { workspace = true, optional = true }
-serde.workspace = true
-serde_json.workspace = true
diff --git a/crates/lmstudio/LICENSE-GPL b/crates/lmstudio/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/lmstudio/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/lmstudio/src/lmstudio.rs b/crates/lmstudio/src/lmstudio.rs
deleted file mode 100644
index ef2f7b6208..0000000000
--- a/crates/lmstudio/src/lmstudio.rs
+++ /dev/null
@@ -1,496 +0,0 @@
-use anyhow::{Context as _, Result, anyhow};
-use futures::{AsyncBufReadExt, AsyncReadExt, StreamExt, io::BufReader, stream::BoxStream};
-use http_client::{AsyncBody, HttpClient, Method, Request as HttpRequest, http};
-use serde::{Deserialize, Serialize};
-use serde_json::Value;
-use std::{convert::TryFrom, time::Duration};
-
-pub const LMSTUDIO_API_URL: &str = "http://localhost:1234/api/v0";
-
-#[derive(Clone, Copy, Serialize, Deserialize, Debug, Eq, PartialEq)]
-#[serde(rename_all = "lowercase")]
-pub enum Role {
-    User,
-    Assistant,
-    System,
-    Tool,
-}
-
-impl TryFrom<String> for Role {
-    type Error = anyhow::Error;
-
-    fn try_from(value: String) -> Result<Self> {
-        match value.as_str() {
-            "user" => Ok(Self::User),
-            "assistant" => Ok(Self::Assistant),
-            "system" => Ok(Self::System),
-            "tool" => Ok(Self::Tool),
-            _ => anyhow::bail!("invalid role '{value}'"),
-        }
-    }
-}
-
-impl From<Role> for String {
-    fn from(val: Role) -> Self {
-        match val {
-            Role::User => "user".to_owned(),
-            Role::Assistant => "assistant".to_owned(),
-            Role::System => "system".to_owned(),
-            Role::Tool => "tool".to_owned(),
-        }
-    }
-}
-
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
-#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq)]
-pub struct Model {
-    pub name: String,
-    pub display_name: Option<String>,
-    pub max_tokens: u64,
-    pub supports_tool_calls: bool,
-    pub supports_images: bool,
-}
-
-impl Model {
-    pub fn new(
-        name: &str,
-        display_name: Option<&str>,
-        max_tokens: Option<u64>,
-        supports_tool_calls: bool,
-        supports_images: bool,
-    ) -> Self {
-        Self {
-            name: name.to_owned(),
-            display_name: display_name.map(|s| s.to_owned()),
-            max_tokens: max_tokens.unwrap_or(2048),
-            supports_tool_calls,
-            supports_images,
-        }
-    }
-
-    pub fn id(&self) -> &str {
-        &self.name
-    }
-
-    pub fn display_name(&self) -> &str {
-        self.display_name.as_ref().unwrap_or(&self.name)
-    }
-
-    pub fn max_token_count(&self) -> u64 {
-        self.max_tokens
-    }
-
-    pub fn supports_tool_calls(&self) -> bool {
-        self.supports_tool_calls
-    }
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "lowercase")]
-pub enum ToolChoice {
-    Auto,
-    Required,
-    None,
-    #[serde(untagged)]
-    Other(ToolDefinition),
-}
-
-#[derive(Clone, Deserialize, Serialize, Debug)]
-#[serde(tag = "type", rename_all = "snake_case")]
-pub enum ToolDefinition {
-    #[allow(dead_code)]
-    Function { function: FunctionDefinition },
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct FunctionDefinition {
-    pub name: String,
-    pub description: Option<String>,
-    pub parameters: Option<Value>,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-#[serde(tag = "role", rename_all = "lowercase")]
-pub enum ChatMessage {
-    Assistant {
-        #[serde(default)]
-        content: Option<MessageContent>,
-        #[serde(default, skip_serializing_if = "Vec::is_empty")]
-        tool_calls: Vec<ToolCall>,
-    },
-    User {
-        content: MessageContent,
-    },
-    System {
-        content: MessageContent,
-    },
-    Tool {
-        content: MessageContent,
-        tool_call_id: String,
-    },
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-#[serde(untagged)]
-pub enum MessageContent {
-    Plain(String),
-    Multipart(Vec<MessagePart>),
-}
-
-impl MessageContent {
-    pub fn empty() -> Self {
-        MessageContent::Multipart(vec![])
-    }
-
-    pub fn push_part(&mut self, part: MessagePart) {
-        match self {
-            MessageContent::Plain(text) => {
-                *self =
-                    MessageContent::Multipart(vec![MessagePart::Text { text: text.clone() }, part]);
-            }
-            MessageContent::Multipart(parts) if parts.is_empty() => match part {
-                MessagePart::Text { text } => *self = MessageContent::Plain(text),
-                MessagePart::Image { .. } => *self = MessageContent::Multipart(vec![part]),
-            },
-            MessageContent::Multipart(parts) => parts.push(part),
-        }
-    }
-}
-
-impl From<Vec<MessagePart>> for MessageContent {
-    fn from(mut parts: Vec<MessagePart>) -> Self {
-        if let [MessagePart::Text { text }] = parts.as_mut_slice() {
-            MessageContent::Plain(std::mem::take(text))
-        } else {
-            MessageContent::Multipart(parts)
-        }
-    }
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-#[serde(tag = "type", rename_all = "snake_case")]
-pub enum MessagePart {
-    Text {
-        text: String,
-    },
-    #[serde(rename = "image_url")]
-    Image {
-        image_url: ImageUrl,
-    },
-}
-
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq)]
-pub struct ImageUrl {
-    pub url: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub detail: Option<String>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-pub struct ToolCall {
-    pub id: String,
-    #[serde(flatten)]
-    pub content: ToolCallContent,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-#[serde(tag = "type", rename_all = "lowercase")]
-pub enum ToolCallContent {
-    Function { function: FunctionContent },
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-pub struct FunctionContent {
-    pub name: String,
-    pub arguments: String,
-}
-
-#[derive(Serialize, Debug)]
-pub struct ChatCompletionRequest {
-    pub model: String,
-    pub messages: Vec<ChatMessage>,
-    pub stream: bool,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub max_tokens: Option<i32>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub stop: Option<Vec<String>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub temperature: Option<f32>,
-    #[serde(skip_serializing_if = "Vec::is_empty")]
-    pub tools: Vec<ToolDefinition>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub tool_choice: Option<ToolChoice>,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct ChatResponse {
-    pub id: String,
-    pub object: String,
-    pub created: u64,
-    pub model: String,
-    pub choices: Vec<ChoiceDelta>,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct ChoiceDelta {
-    pub index: u32,
-    pub delta: ResponseMessageDelta,
-    pub finish_reason: Option<String>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-pub struct ToolCallChunk {
-    pub index: usize,
-    pub id: Option<String>,
-
-    // There is also an optional `type` field that would determine if a
-    // function is there. Sometimes this streams in with the `function` before
-    // it streams in the `type`
-    pub function: Option<FunctionChunk>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-pub struct FunctionChunk {
-    pub name: Option<String>,
-    pub arguments: Option<String>,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct Usage {
-    pub prompt_tokens: u64,
-    pub completion_tokens: u64,
-    pub total_tokens: u64,
-}
-
-#[derive(Debug, Default, Clone, Deserialize, PartialEq)]
-#[serde(transparent)]
-pub struct Capabilities(Vec<String>);
-
-impl Capabilities {
-    pub fn supports_tool_calls(&self) -> bool {
-        self.0.iter().any(|cap| cap == "tool_use")
-    }
-
-    pub fn supports_images(&self) -> bool {
-        self.0.iter().any(|cap| cap == "vision")
-    }
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct LmStudioError {
-    pub message: String,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-#[serde(untagged)]
-pub enum ResponseStreamResult {
-    Ok(ResponseStreamEvent),
-    Err { error: LmStudioError },
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct ResponseStreamEvent {
-    pub created: u32,
-    pub model: String,
-    pub object: String,
-    pub choices: Vec<ChoiceDelta>,
-    pub usage: Option<Usage>,
-}
-
-#[derive(Deserialize)]
-pub struct ListModelsResponse {
-    pub data: Vec<ModelEntry>,
-}
-
-#[derive(Clone, Debug, Deserialize, PartialEq)]
-pub struct ModelEntry {
-    pub id: String,
-    pub object: String,
-    pub r#type: ModelType,
-    pub publisher: String,
-    pub arch: Option<String>,
-    pub compatibility_type: CompatibilityType,
-    pub quantization: Option<String>,
-    pub state: ModelState,
-    pub max_context_length: Option<u64>,
-    pub loaded_context_length: Option<u64>,
-    #[serde(default)]
-    pub capabilities: Capabilities,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
-#[serde(rename_all = "lowercase")]
-pub enum ModelType {
-    Llm,
-    Embeddings,
-    Vlm,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
-#[serde(rename_all = "kebab-case")]
-pub enum ModelState {
-    Loaded,
-    Loading,
-    NotLoaded,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
-#[serde(rename_all = "lowercase")]
-pub enum CompatibilityType {
-    Gguf,
-    Mlx,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-pub struct ResponseMessageDelta {
-    pub role: Option<Role>,
-    pub content: Option<String>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub reasoning_content: Option<String>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub tool_calls: Option<Vec<ToolCallChunk>>,
-}
-
-pub async fn complete(
-    client: &dyn HttpClient,
-    api_url: &str,
-    request: ChatCompletionRequest,
-) -> Result<ChatResponse> {
-    let uri = format!("{api_url}/chat/completions");
-    let request_builder = HttpRequest::builder()
-        .method(Method::POST)
-        .uri(uri)
-        .header("Content-Type", "application/json");
-
-    let serialized_request = serde_json::to_string(&request)?;
-    let request = request_builder.body(AsyncBody::from(serialized_request))?;
-
-    let mut response = client.send(request).await?;
-    if response.status().is_success() {
-        let mut body = Vec::new();
-        response.body_mut().read_to_end(&mut body).await?;
-        let response_message: ChatResponse = serde_json::from_slice(&body)?;
-        Ok(response_message)
-    } else {
-        let mut body = Vec::new();
-        response.body_mut().read_to_end(&mut body).await?;
-        let body_str = std::str::from_utf8(&body)?;
-        anyhow::bail!(
-            "Failed to connect to API: {} {}",
-            response.status(),
-            body_str
-        );
-    }
-}
-
-pub async fn stream_chat_completion(
-    client: &dyn HttpClient,
-    api_url: &str,
-    request: ChatCompletionRequest,
-) -> Result<BoxStream<'static, Result<ResponseStreamEvent>>> {
-    let uri = format!("{api_url}/chat/completions");
-    let request_builder = http::Request::builder()
-        .method(Method::POST)
-        .uri(uri)
-        .header("Content-Type", "application/json");
-
-    let request = request_builder.body(AsyncBody::from(serde_json::to_string(&request)?))?;
-    let mut response = client.send(request).await?;
-    if response.status().is_success() {
-        let reader = BufReader::new(response.into_body());
-        Ok(reader
-            .lines()
-            .filter_map(|line| async move {
-                match line {
-                    Ok(line) => {
-                        let line = line.strip_prefix("data: ")?;
-                        if line == "[DONE]" {
-                            None
-                        } else {
-                            match serde_json::from_str(line) {
-                                Ok(ResponseStreamResult::Ok(response)) => Some(Ok(response)),
-                                Ok(ResponseStreamResult::Err { error, .. }) => {
-                                    Some(Err(anyhow!(error.message)))
-                                }
-                                Err(error) => Some(Err(anyhow!(error))),
-                            }
-                        }
-                    }
-                    Err(error) => Some(Err(anyhow!(error))),
-                }
-            })
-            .boxed())
-    } else {
-        let mut body = String::new();
-        response.body_mut().read_to_string(&mut body).await?;
-        anyhow::bail!(
-            "Failed to connect to LM Studio API: {} {}",
-            response.status(),
-            body,
-        );
-    }
-}
-
-pub async fn get_models(
-    client: &dyn HttpClient,
-    api_url: &str,
-    _: Option<Duration>,
-) -> Result<Vec<ModelEntry>> {
-    let uri = format!("{api_url}/models");
-    let request_builder = HttpRequest::builder()
-        .method(Method::GET)
-        .uri(uri)
-        .header("Accept", "application/json");
-
-    let request = request_builder.body(AsyncBody::default())?;
-
-    let mut response = client.send(request).await?;
-
-    let mut body = String::new();
-    response.body_mut().read_to_string(&mut body).await?;
-
-    anyhow::ensure!(
-        response.status().is_success(),
-        "Failed to connect to LM Studio API: {} {}",
-        response.status(),
-        body,
-    );
-    let response: ListModelsResponse =
-        serde_json::from_str(&body).context("Unable to parse LM Studio models response")?;
-    Ok(response.data)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_image_message_part_serialization() {
-        let image_part = MessagePart::Image {
-            image_url: ImageUrl {
-                url: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkYPhfDwAChwGA60e6kgAAAABJRU5ErkJggg==".to_string(),
-                detail: None,
-            },
-        };
-
-        let json = serde_json::to_string(&image_part).unwrap();
-        println!("Serialized image part: {}", json);
-
-        // Verify the structure matches what LM Studio expects
-        let expected_structure = r#"{"type":"image_url","image_url":{"url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkYPhfDwAChwGA60e6kgAAAABJRU5ErkJggg=="}}"#;
-        assert_eq!(json, expected_structure);
-    }
-
-    #[test]
-    fn test_text_message_part_serialization() {
-        let text_part = MessagePart::Text {
-            text: "Hello, world!".to_string(),
-        };
-
-        let json = serde_json::to_string(&text_part).unwrap();
-        println!("Serialized text part: {}", json);
-
-        let expected_structure = r#"{"type":"text","text":"Hello, world!"}"#;
-        assert_eq!(json, expected_structure);
-    }
-}
diff --git a/crates/lsp/Cargo.toml b/crates/lsp/Cargo.toml
deleted file mode 100644
index 9533ddb600..0000000000
--- a/crates/lsp/Cargo.toml
+++ /dev/null
@@ -1,41 +0,0 @@
-[package]
-name = "lsp"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/lsp.rs"
-doctest = false
-
-[features]
-test-support = ["async-pipe"]
-
-[dependencies]
-anyhow.workspace = true
-async-pipe = { workspace = true, optional = true }
-collections.workspace = true
-futures.workspace = true
-gpui.workspace = true
-log.workspace = true
-lsp-types.workspace = true
-parking_lot.workspace = true
-postage.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-schemars.workspace = true
-smol.workspace = true
-util.workspace = true
-release_channel.workspace = true
-
-[dev-dependencies]
-async-pipe.workspace = true
-ctor.workspace = true
-gpui = { workspace = true, features = ["test-support"] }
-semver.workspace = true
-util = { workspace = true, features = ["test-support"] }
-zlog.workspace = true
diff --git a/crates/lsp/LICENSE-GPL b/crates/lsp/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/lsp/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/lsp/src/input_handler.rs b/crates/lsp/src/input_handler.rs
deleted file mode 100644
index 001ebf1fc9..0000000000
--- a/crates/lsp/src/input_handler.rs
+++ /dev/null
@@ -1,157 +0,0 @@
-use std::str;
-use std::sync::Arc;
-
-use anyhow::{Context as _, Result};
-use collections::HashMap;
-use futures::{
-    AsyncBufReadExt, AsyncRead, AsyncReadExt as _,
-    channel::mpsc::{UnboundedReceiver, UnboundedSender, unbounded},
-};
-use gpui::{BackgroundExecutor, Task};
-use log::warn;
-use parking_lot::Mutex;
-use smol::io::BufReader;
-
-use crate::{
-    AnyResponse, CONTENT_LEN_HEADER, IoHandler, IoKind, NotificationOrRequest, RequestId,
-    ResponseHandler,
-};
-
-const HEADER_DELIMITER: &[u8; 4] = b"\r\n\r\n";
-/// Handler for stdout of language server.
-pub struct LspStdoutHandler {
-    pub(super) loop_handle: Task<Result<()>>,
-    pub(super) incoming_messages: UnboundedReceiver<NotificationOrRequest>,
-}
-
-async fn read_headers<Stdout>(reader: &mut BufReader<Stdout>, buffer: &mut Vec<u8>) -> Result<()>
-where
-    Stdout: AsyncRead + Unpin + Send + 'static,
-{
-    loop {
-        if buffer.len() >= HEADER_DELIMITER.len()
-            && buffer[(buffer.len() - HEADER_DELIMITER.len())..] == HEADER_DELIMITER[..]
-        {
-            return Ok(());
-        }
-
-        if reader.read_until(b'\n', buffer).await? == 0 {
-            anyhow::bail!("cannot read LSP message headers");
-        }
-    }
-}
-
-impl LspStdoutHandler {
-    pub fn new<Input>(
-        stdout: Input,
-        response_handlers: Arc<Mutex<Option<HashMap<RequestId, ResponseHandler>>>>,
-        io_handlers: Arc<Mutex<HashMap<i32, IoHandler>>>,
-        cx: BackgroundExecutor,
-    ) -> Self
-    where
-        Input: AsyncRead + Unpin + Send + 'static,
-    {
-        let (tx, notifications_channel) = unbounded();
-        let loop_handle = cx.spawn(Self::handler(stdout, tx, response_handlers, io_handlers));
-        Self {
-            loop_handle,
-            incoming_messages: notifications_channel,
-        }
-    }
-
-    async fn handler<Input>(
-        stdout: Input,
-        notifications_sender: UnboundedSender<NotificationOrRequest>,
-        response_handlers: Arc<Mutex<Option<HashMap<RequestId, ResponseHandler>>>>,
-        io_handlers: Arc<Mutex<HashMap<i32, IoHandler>>>,
-    ) -> anyhow::Result<()>
-    where
-        Input: AsyncRead + Unpin + Send + 'static,
-    {
-        let mut stdout = BufReader::new(stdout);
-
-        let mut buffer = Vec::new();
-
-        loop {
-            buffer.clear();
-
-            read_headers(&mut stdout, &mut buffer).await?;
-
-            let headers = std::str::from_utf8(&buffer)?;
-
-            let message_len = headers
-                .split('\n')
-                .find(|line| line.starts_with(CONTENT_LEN_HEADER))
-                .and_then(|line| line.strip_prefix(CONTENT_LEN_HEADER))
-                .with_context(|| format!("invalid LSP message header {headers:?}"))?
-                .trim_end()
-                .parse()?;
-
-            buffer.resize(message_len, 0);
-            stdout.read_exact(&mut buffer).await?;
-
-            if let Ok(message) = str::from_utf8(&buffer) {
-                log::trace!("incoming message: {message}");
-                for handler in io_handlers.lock().values_mut() {
-                    handler(IoKind::StdOut, message);
-                }
-            }
-
-            if let Ok(msg) = serde_json::from_slice::<NotificationOrRequest>(&buffer) {
-                notifications_sender.unbounded_send(msg)?;
-            } else if let Ok(AnyResponse {
-                id, error, result, ..
-            }) = serde_json::from_slice(&buffer)
-            {
-                let mut response_handlers = response_handlers.lock();
-                if let Some(handler) = response_handlers
-                    .as_mut()
-                    .and_then(|handlers| handlers.remove(&id))
-                {
-                    drop(response_handlers);
-                    if let Some(error) = error {
-                        handler(Err(error));
-                    } else if let Some(result) = result {
-                        handler(Ok(result.get().into()));
-                    } else {
-                        handler(Ok("null".into()));
-                    }
-                }
-            } else {
-                warn!(
-                    "failed to deserialize LSP message:\n{}",
-                    std::str::from_utf8(&buffer)?
-                );
-            }
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[gpui::test]
-    async fn test_read_headers() {
-        let mut buf = Vec::new();
-        let mut reader = smol::io::BufReader::new(b"Content-Length: 123\r\n\r\n" as &[u8]);
-        read_headers(&mut reader, &mut buf).await.unwrap();
-        assert_eq!(buf, b"Content-Length: 123\r\n\r\n");
-
-        let mut buf = Vec::new();
-        let mut reader = smol::io::BufReader::new(b"Content-Type: application/vscode-jsonrpc\r\nContent-Length: 1235\r\n\r\n{\"somecontent\":123}" as &[u8]);
-        read_headers(&mut reader, &mut buf).await.unwrap();
-        assert_eq!(
-            buf,
-            b"Content-Type: application/vscode-jsonrpc\r\nContent-Length: 1235\r\n\r\n"
-        );
-
-        let mut buf = Vec::new();
-        let mut reader = smol::io::BufReader::new(b"Content-Length: 1235\r\nContent-Type: application/vscode-jsonrpc\r\n\r\n{\"somecontent\":true}" as &[u8]);
-        read_headers(&mut reader, &mut buf).await.unwrap();
-        assert_eq!(
-            buf,
-            b"Content-Length: 1235\r\nContent-Type: application/vscode-jsonrpc\r\n\r\n"
-        );
-    }
-}
diff --git a/crates/lsp/src/lsp.rs b/crates/lsp/src/lsp.rs
deleted file mode 100644
index 9ff6e245c4..0000000000
--- a/crates/lsp/src/lsp.rs
+++ /dev/null
@@ -1,1993 +0,0 @@
-mod input_handler;
-
-pub use lsp_types::request::*;
-pub use lsp_types::*;
-
-use anyhow::{Context as _, Result, anyhow};
-use collections::{BTreeMap, HashMap};
-use futures::{
-    AsyncRead, AsyncWrite, Future, FutureExt,
-    channel::oneshot::{self, Canceled},
-    io::BufWriter,
-    select,
-};
-use gpui::{App, AppContext as _, AsyncApp, BackgroundExecutor, SharedString, Task};
-use notification::DidChangeWorkspaceFolders;
-use parking_lot::{Mutex, RwLock};
-use postage::{barrier, prelude::Stream};
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize, de::DeserializeOwned};
-use serde_json::{Value, json, value::RawValue};
-use smol::{
-    channel,
-    io::{AsyncBufReadExt, AsyncWriteExt, BufReader},
-    process::Child,
-};
-
-use std::{
-    collections::BTreeSet,
-    ffi::{OsStr, OsString},
-    fmt,
-    io::Write,
-    ops::DerefMut,
-    path::PathBuf,
-    pin::Pin,
-    sync::{
-        Arc, Weak,
-        atomic::{AtomicI32, Ordering::SeqCst},
-    },
-    task::Poll,
-    time::{Duration, Instant},
-};
-use std::{path::Path, process::Stdio};
-use util::{ConnectionResult, ResultExt, TryFutureExt, redact};
-
-const JSON_RPC_VERSION: &str = "2.0";
-const CONTENT_LEN_HEADER: &str = "Content-Length: ";
-
-pub const LSP_REQUEST_TIMEOUT: Duration = Duration::from_secs(60 * 2);
-const SERVER_SHUTDOWN_TIMEOUT: Duration = Duration::from_secs(5);
-
-type NotificationHandler = Box<dyn Send + FnMut(Option<RequestId>, Value, &mut AsyncApp)>;
-type ResponseHandler = Box<dyn Send + FnOnce(Result<String, Error>)>;
-type IoHandler = Box<dyn Send + FnMut(IoKind, &str)>;
-
-/// Kind of language server stdio given to an IO handler.
-#[derive(Debug, Clone, Copy)]
-pub enum IoKind {
-    StdOut,
-    StdIn,
-    StdErr,
-}
-
-/// Represents a launchable language server. This can either be a standalone binary or the path
-/// to a runtime with arguments to instruct it to launch the actual language server file.
-#[derive(Clone, Serialize)]
-pub struct LanguageServerBinary {
-    pub path: PathBuf,
-    pub arguments: Vec<OsString>,
-    pub env: Option<HashMap<String, String>>,
-}
-
-/// Configures the search (and installation) of language servers.
-#[derive(Debug, Clone)]
-pub struct LanguageServerBinaryOptions {
-    /// Whether the adapter should look at the users system
-    pub allow_path_lookup: bool,
-    /// Whether the adapter should download its own version
-    pub allow_binary_download: bool,
-    /// Whether the adapter should download a pre-release version
-    pub pre_release: bool,
-}
-
-struct NotificationSerializer(Box<dyn FnOnce() -> String + Send + Sync>);
-
-/// A running language server process.
-pub struct LanguageServer {
-    server_id: LanguageServerId,
-    next_id: AtomicI32,
-    outbound_tx: channel::Sender<String>,
-    notification_tx: channel::Sender<NotificationSerializer>,
-    name: LanguageServerName,
-    process_name: Arc<str>,
-    binary: LanguageServerBinary,
-    capabilities: RwLock<ServerCapabilities>,
-    /// Configuration sent to the server, stored for display in the language server logs
-    /// buffer. This is represented as the message sent to the LSP in order to avoid cloning it (can
-    /// be large in cases like sending schemas to the json server).
-    configuration: Arc<DidChangeConfigurationParams>,
-    code_action_kinds: Option<Vec<CodeActionKind>>,
-    notification_handlers: Arc<Mutex<HashMap<&'static str, NotificationHandler>>>,
-    response_handlers: Arc<Mutex<Option<HashMap<RequestId, ResponseHandler>>>>,
-    io_handlers: Arc<Mutex<HashMap<i32, IoHandler>>>,
-    executor: BackgroundExecutor,
-    #[allow(clippy::type_complexity)]
-    io_tasks: Mutex<Option<(Task<Option<()>>, Task<Option<()>>)>>,
-    output_done_rx: Mutex<Option<barrier::Receiver>>,
-    server: Arc<Mutex<Option<Child>>>,
-    workspace_folders: Option<Arc<Mutex<BTreeSet<Uri>>>>,
-    root_uri: Uri,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Hash)]
-pub enum LanguageServerSelector {
-    Id(LanguageServerId),
-    Name(LanguageServerName),
-}
-
-/// Identifies a running language server.
-#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-#[repr(transparent)]
-pub struct LanguageServerId(pub usize);
-
-impl LanguageServerId {
-    pub fn from_proto(id: u64) -> Self {
-        Self(id as usize)
-    }
-
-    pub fn to_proto(self) -> u64 {
-        self.0 as u64
-    }
-}
-
-/// A name of a language server.
-#[derive(
-    Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Deserialize, Serialize, JsonSchema,
-)]
-#[serde(transparent)]
-pub struct LanguageServerName(pub SharedString);
-
-impl std::fmt::Display for LanguageServerName {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        std::fmt::Display::fmt(&self.0, f)
-    }
-}
-
-impl AsRef<str> for LanguageServerName {
-    fn as_ref(&self) -> &str {
-        self.0.as_ref()
-    }
-}
-
-impl AsRef<OsStr> for LanguageServerName {
-    fn as_ref(&self) -> &OsStr {
-        self.0.as_ref().as_ref()
-    }
-}
-
-impl LanguageServerName {
-    pub const fn new_static(s: &'static str) -> Self {
-        Self(SharedString::new_static(s))
-    }
-
-    pub fn from_proto(s: String) -> Self {
-        Self(s.into())
-    }
-}
-
-impl<'a> From<&'a str> for LanguageServerName {
-    fn from(str: &'a str) -> LanguageServerName {
-        LanguageServerName(str.to_string().into())
-    }
-}
-
-impl PartialEq<str> for LanguageServerName {
-    fn eq(&self, other: &str) -> bool {
-        self.0 == other
-    }
-}
-
-/// Handle to a language server RPC activity subscription.
-pub enum Subscription {
-    Notification {
-        method: &'static str,
-        notification_handlers: Option<Arc<Mutex<HashMap<&'static str, NotificationHandler>>>>,
-    },
-    Io {
-        id: i32,
-        io_handlers: Option<Weak<Mutex<HashMap<i32, IoHandler>>>>,
-    },
-}
-
-/// Language server protocol RPC request message ID.
-///
-/// [LSP Specification](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#requestMessage)
-#[derive(Debug, Clone, Eq, PartialEq, Hash, Serialize, Deserialize)]
-#[serde(untagged)]
-pub enum RequestId {
-    Int(i32),
-    Str(String),
-}
-
-/// Language server protocol RPC request message.
-///
-/// [LSP Specification](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#requestMessage)
-#[derive(Serialize, Deserialize)]
-pub struct Request<'a, T> {
-    jsonrpc: &'static str,
-    id: RequestId,
-    method: &'a str,
-    params: T,
-}
-
-/// Language server protocol RPC request response message before it is deserialized into a concrete type.
-#[derive(Serialize, Deserialize)]
-struct AnyResponse<'a> {
-    jsonrpc: &'a str,
-    id: RequestId,
-    #[serde(default)]
-    error: Option<Error>,
-    #[serde(borrow)]
-    result: Option<&'a RawValue>,
-}
-
-/// Language server protocol RPC request response message.
-///
-/// [LSP Specification](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#responseMessage)
-#[derive(Serialize)]
-struct Response<T> {
-    jsonrpc: &'static str,
-    id: RequestId,
-    #[serde(flatten)]
-    value: LspResult<T>,
-}
-
-#[derive(Serialize)]
-#[serde(rename_all = "snake_case")]
-enum LspResult<T> {
-    #[serde(rename = "result")]
-    Ok(Option<T>),
-    Error(Option<Error>),
-}
-
-/// Language server protocol RPC notification message.
-///
-/// [LSP Specification](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#notificationMessage)
-#[derive(Serialize, Deserialize)]
-struct Notification<'a, T> {
-    jsonrpc: &'static str,
-    #[serde(borrow)]
-    method: &'a str,
-    params: T,
-}
-
-/// Language server RPC notification message before it is deserialized into a concrete type.
-#[derive(Debug, Clone, Deserialize)]
-struct NotificationOrRequest {
-    #[serde(default)]
-    id: Option<RequestId>,
-    method: String,
-    #[serde(default)]
-    params: Option<Value>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-struct Error {
-    code: i64,
-    message: String,
-    #[serde(default)]
-    data: Option<serde_json::Value>,
-}
-
-pub trait LspRequestFuture<O>: Future<Output = ConnectionResult<O>> {
-    fn id(&self) -> i32;
-}
-
-struct LspRequest<F> {
-    id: i32,
-    request: F,
-}
-
-impl<F> LspRequest<F> {
-    pub fn new(id: i32, request: F) -> Self {
-        Self { id, request }
-    }
-}
-
-impl<F: Future> Future for LspRequest<F> {
-    type Output = F::Output;
-
-    fn poll(self: Pin<&mut Self>, cx: &mut std::task::Context<'_>) -> Poll<Self::Output> {
-        // SAFETY: This is standard pin projection, we're pinned so our fields must be pinned.
-        let inner = unsafe { Pin::new_unchecked(&mut self.get_unchecked_mut().request) };
-        inner.poll(cx)
-    }
-}
-
-impl<F, O> LspRequestFuture<O> for LspRequest<F>
-where
-    F: Future<Output = ConnectionResult<O>>,
-{
-    fn id(&self) -> i32 {
-        self.id
-    }
-}
-
-/// Combined capabilities of the server and the adapter.
-#[derive(Debug)]
-pub struct AdapterServerCapabilities {
-    // Reported capabilities by the server
-    pub server_capabilities: ServerCapabilities,
-    // List of code actions supported by the LspAdapter matching the server
-    pub code_action_kinds: Option<Vec<CodeActionKind>>,
-}
-
-impl LanguageServer {
-    /// Starts a language server process.
-    pub fn new(
-        stderr_capture: Arc<Mutex<Option<String>>>,
-        server_id: LanguageServerId,
-        server_name: LanguageServerName,
-        binary: LanguageServerBinary,
-        root_path: &Path,
-        code_action_kinds: Option<Vec<CodeActionKind>>,
-        workspace_folders: Option<Arc<Mutex<BTreeSet<Uri>>>>,
-        cx: &mut AsyncApp,
-    ) -> Result<Self> {
-        let working_dir = if root_path.is_dir() {
-            root_path
-        } else {
-            root_path.parent().unwrap_or_else(|| Path::new("/"))
-        };
-        let root_uri = Uri::from_file_path(&working_dir)
-            .map_err(|()| anyhow!("{working_dir:?} is not a valid URI"))?;
-        log::info!(
-            "starting language server process. binary path: \
-            {:?}, working directory: {:?}, args: {:?}",
-            binary.path,
-            working_dir,
-            &binary.arguments
-        );
-        let mut command = util::command::new_smol_command(&binary.path);
-        command
-            .current_dir(working_dir)
-            .args(&binary.arguments)
-            .envs(binary.env.clone().unwrap_or_default())
-            .stdin(Stdio::piped())
-            .stdout(Stdio::piped())
-            .stderr(Stdio::piped())
-            .kill_on_drop(true);
-
-        let mut server = command
-            .spawn()
-            .with_context(|| format!("failed to spawn command {command:?}",))?;
-
-        let stdin = server.stdin.take().unwrap();
-        let stdout = server.stdout.take().unwrap();
-        let stderr = server.stderr.take().unwrap();
-        let server = Self::new_internal(
-            server_id,
-            server_name,
-            stdin,
-            stdout,
-            Some(stderr),
-            stderr_capture,
-            Some(server),
-            code_action_kinds,
-            binary,
-            root_uri,
-            workspace_folders,
-            cx,
-            move |notification| {
-                log::info!(
-                    "Language server with id {} sent unhandled notification {}:\n{}",
-                    server_id,
-                    notification.method,
-                    serde_json::to_string_pretty(&notification.params).unwrap(),
-                );
-                false
-            },
-        );
-
-        Ok(server)
-    }
-
-    fn new_internal<Stdin, Stdout, Stderr, F>(
-        server_id: LanguageServerId,
-        server_name: LanguageServerName,
-        stdin: Stdin,
-        stdout: Stdout,
-        stderr: Option<Stderr>,
-        stderr_capture: Arc<Mutex<Option<String>>>,
-        server: Option<Child>,
-        code_action_kinds: Option<Vec<CodeActionKind>>,
-        binary: LanguageServerBinary,
-        root_uri: Uri,
-        workspace_folders: Option<Arc<Mutex<BTreeSet<Uri>>>>,
-        cx: &mut AsyncApp,
-        on_unhandled_notification: F,
-    ) -> Self
-    where
-        Stdin: AsyncWrite + Unpin + Send + 'static,
-        Stdout: AsyncRead + Unpin + Send + 'static,
-        Stderr: AsyncRead + Unpin + Send + 'static,
-        F: Fn(&NotificationOrRequest) -> bool + 'static + Send + Sync + Clone,
-    {
-        let (outbound_tx, outbound_rx) = channel::unbounded::<String>();
-        let (output_done_tx, output_done_rx) = barrier::channel();
-        let notification_handlers =
-            Arc::new(Mutex::new(HashMap::<_, NotificationHandler>::default()));
-        let response_handlers =
-            Arc::new(Mutex::new(Some(HashMap::<_, ResponseHandler>::default())));
-        let io_handlers = Arc::new(Mutex::new(HashMap::default()));
-
-        let stdout_input_task = cx.spawn({
-            let unhandled_notification_wrapper = {
-                let response_channel = outbound_tx.clone();
-                async move |msg: NotificationOrRequest| {
-                    let did_handle = on_unhandled_notification(&msg);
-                    if !did_handle && let Some(message_id) = msg.id {
-                        let response = AnyResponse {
-                            jsonrpc: JSON_RPC_VERSION,
-                            id: message_id,
-                            error: Some(Error {
-                                code: -32601,
-                                message: format!("Unrecognized method `{}`", msg.method),
-                                data: None,
-                            }),
-                            result: None,
-                        };
-                        if let Ok(response) = serde_json::to_string(&response) {
-                            response_channel.send(response).await.ok();
-                        }
-                    }
-                }
-            };
-            let notification_handlers = notification_handlers.clone();
-            let response_handlers = response_handlers.clone();
-            let io_handlers = io_handlers.clone();
-            async move |cx| {
-                Self::handle_incoming_messages(
-                    stdout,
-                    unhandled_notification_wrapper,
-                    notification_handlers,
-                    response_handlers,
-                    io_handlers,
-                    cx,
-                )
-                .log_err()
-                .await
-            }
-        });
-        let stderr_input_task = stderr
-            .map(|stderr| {
-                let io_handlers = io_handlers.clone();
-                let stderr_captures = stderr_capture.clone();
-                cx.background_spawn(async move {
-                    Self::handle_stderr(stderr, io_handlers, stderr_captures)
-                        .log_err()
-                        .await
-                })
-            })
-            .unwrap_or_else(|| Task::ready(None));
-        let input_task = cx.background_spawn(async move {
-            let (stdout, stderr) = futures::join!(stdout_input_task, stderr_input_task);
-            stdout.or(stderr)
-        });
-        let output_task = cx.background_spawn({
-            Self::handle_outgoing_messages(
-                stdin,
-                outbound_rx,
-                output_done_tx,
-                response_handlers.clone(),
-                io_handlers.clone(),
-            )
-            .log_err()
-        });
-
-        let configuration = DidChangeConfigurationParams {
-            settings: Value::Null,
-        }
-        .into();
-
-        let (notification_tx, notification_rx) = channel::unbounded::<NotificationSerializer>();
-        cx.background_spawn({
-            let outbound_tx = outbound_tx.clone();
-            async move {
-                while let Ok(serializer) = notification_rx.recv().await {
-                    let serialized = (serializer.0)();
-                    let Ok(_) = outbound_tx.send(serialized).await else {
-                        return;
-                    };
-                }
-                outbound_tx.close();
-            }
-        })
-        .detach();
-        Self {
-            server_id,
-            notification_handlers,
-            notification_tx,
-            response_handlers,
-            io_handlers,
-            name: server_name,
-            process_name: binary
-                .path
-                .file_name()
-                .map(|name| Arc::from(name.to_string_lossy()))
-                .unwrap_or_default(),
-            binary,
-            capabilities: Default::default(),
-            configuration,
-            code_action_kinds,
-            next_id: Default::default(),
-            outbound_tx,
-            executor: cx.background_executor().clone(),
-            io_tasks: Mutex::new(Some((input_task, output_task))),
-            output_done_rx: Mutex::new(Some(output_done_rx)),
-            server: Arc::new(Mutex::new(server)),
-            workspace_folders,
-            root_uri,
-        }
-    }
-
-    /// List of code action kinds this language server reports being able to emit.
-    pub fn code_action_kinds(&self) -> Option<Vec<CodeActionKind>> {
-        self.code_action_kinds.clone()
-    }
-
-    async fn handle_incoming_messages<Stdout>(
-        stdout: Stdout,
-        on_unhandled_notification: impl AsyncFn(NotificationOrRequest) + 'static + Send,
-        notification_handlers: Arc<Mutex<HashMap<&'static str, NotificationHandler>>>,
-        response_handlers: Arc<Mutex<Option<HashMap<RequestId, ResponseHandler>>>>,
-        io_handlers: Arc<Mutex<HashMap<i32, IoHandler>>>,
-        cx: &mut AsyncApp,
-    ) -> anyhow::Result<()>
-    where
-        Stdout: AsyncRead + Unpin + Send + 'static,
-    {
-        use smol::stream::StreamExt;
-        let stdout = BufReader::new(stdout);
-        let _clear_response_handlers = util::defer({
-            let response_handlers = response_handlers.clone();
-            move || {
-                response_handlers.lock().take();
-            }
-        });
-        let mut input_handler = input_handler::LspStdoutHandler::new(
-            stdout,
-            response_handlers,
-            io_handlers,
-            cx.background_executor().clone(),
-        );
-
-        while let Some(msg) = input_handler.incoming_messages.next().await {
-            let unhandled_message = {
-                let mut notification_handlers = notification_handlers.lock();
-                if let Some(handler) = notification_handlers.get_mut(msg.method.as_str()) {
-                    handler(msg.id, msg.params.unwrap_or(Value::Null), cx);
-                    None
-                } else {
-                    Some(msg)
-                }
-            };
-
-            if let Some(msg) = unhandled_message {
-                on_unhandled_notification(msg).await;
-            }
-
-            // Don't starve the main thread when receiving lots of notifications at once.
-            smol::future::yield_now().await;
-        }
-        input_handler.loop_handle.await
-    }
-
-    async fn handle_stderr<Stderr>(
-        stderr: Stderr,
-        io_handlers: Arc<Mutex<HashMap<i32, IoHandler>>>,
-        stderr_capture: Arc<Mutex<Option<String>>>,
-    ) -> anyhow::Result<()>
-    where
-        Stderr: AsyncRead + Unpin + Send + 'static,
-    {
-        let mut stderr = BufReader::new(stderr);
-        let mut buffer = Vec::new();
-
-        loop {
-            buffer.clear();
-
-            let bytes_read = stderr.read_until(b'\n', &mut buffer).await?;
-            if bytes_read == 0 {
-                return Ok(());
-            }
-
-            if let Ok(message) = std::str::from_utf8(&buffer) {
-                log::trace!("incoming stderr message:{message}");
-                for handler in io_handlers.lock().values_mut() {
-                    handler(IoKind::StdErr, message);
-                }
-
-                if let Some(stderr) = stderr_capture.lock().as_mut() {
-                    stderr.push_str(message);
-                }
-            }
-
-            // Don't starve the main thread when receiving lots of messages at once.
-            smol::future::yield_now().await;
-        }
-    }
-
-    async fn handle_outgoing_messages<Stdin>(
-        stdin: Stdin,
-        outbound_rx: channel::Receiver<String>,
-        output_done_tx: barrier::Sender,
-        response_handlers: Arc<Mutex<Option<HashMap<RequestId, ResponseHandler>>>>,
-        io_handlers: Arc<Mutex<HashMap<i32, IoHandler>>>,
-    ) -> anyhow::Result<()>
-    where
-        Stdin: AsyncWrite + Unpin + Send + 'static,
-    {
-        let mut stdin = BufWriter::new(stdin);
-        let _clear_response_handlers = util::defer({
-            let response_handlers = response_handlers.clone();
-            move || {
-                response_handlers.lock().take();
-            }
-        });
-        let mut content_len_buffer = Vec::new();
-        while let Ok(message) = outbound_rx.recv().await {
-            log::trace!("outgoing message:{}", message);
-            for handler in io_handlers.lock().values_mut() {
-                handler(IoKind::StdIn, &message);
-            }
-
-            content_len_buffer.clear();
-            write!(content_len_buffer, "{}", message.len()).unwrap();
-            stdin.write_all(CONTENT_LEN_HEADER.as_bytes()).await?;
-            stdin.write_all(&content_len_buffer).await?;
-            stdin.write_all("\r\n\r\n".as_bytes()).await?;
-            stdin.write_all(message.as_bytes()).await?;
-            stdin.flush().await?;
-        }
-        drop(output_done_tx);
-        Ok(())
-    }
-
-    pub fn default_initialize_params(&self, pull_diagnostics: bool, cx: &App) -> InitializeParams {
-        let workspace_folders = self.workspace_folders.as_ref().map_or_else(
-            || {
-                vec![WorkspaceFolder {
-                    name: Default::default(),
-                    uri: self.root_uri.clone(),
-                }]
-            },
-            |folders| {
-                folders
-                    .lock()
-                    .iter()
-                    .cloned()
-                    .map(|uri| WorkspaceFolder {
-                        name: Default::default(),
-                        uri,
-                    })
-                    .collect()
-            },
-        );
-
-        #[allow(deprecated)]
-        InitializeParams {
-            process_id: Some(std::process::id()),
-            root_path: None,
-            root_uri: Some(self.root_uri.clone()),
-            initialization_options: None,
-            capabilities: ClientCapabilities {
-                general: Some(GeneralClientCapabilities {
-                    position_encodings: Some(vec![PositionEncodingKind::UTF16]),
-                    ..GeneralClientCapabilities::default()
-                }),
-                workspace: Some(WorkspaceClientCapabilities {
-                    configuration: Some(true),
-                    did_change_watched_files: Some(DidChangeWatchedFilesClientCapabilities {
-                        dynamic_registration: Some(true),
-                        relative_pattern_support: Some(true),
-                    }),
-                    did_change_configuration: Some(DynamicRegistrationClientCapabilities {
-                        dynamic_registration: Some(true),
-                    }),
-                    workspace_folders: Some(true),
-                    symbol: Some(WorkspaceSymbolClientCapabilities {
-                        resolve_support: None,
-                        dynamic_registration: Some(true),
-                        ..WorkspaceSymbolClientCapabilities::default()
-                    }),
-                    inlay_hint: Some(InlayHintWorkspaceClientCapabilities {
-                        refresh_support: Some(true),
-                    }),
-                    diagnostics: Some(DiagnosticWorkspaceClientCapabilities {
-                        refresh_support: Some(true),
-                    })
-                    .filter(|_| pull_diagnostics),
-                    code_lens: Some(CodeLensWorkspaceClientCapabilities {
-                        refresh_support: Some(true),
-                    }),
-                    workspace_edit: Some(WorkspaceEditClientCapabilities {
-                        resource_operations: Some(vec![
-                            ResourceOperationKind::Create,
-                            ResourceOperationKind::Rename,
-                            ResourceOperationKind::Delete,
-                        ]),
-                        document_changes: Some(true),
-                        snippet_edit_support: Some(true),
-                        ..WorkspaceEditClientCapabilities::default()
-                    }),
-                    file_operations: Some(WorkspaceFileOperationsClientCapabilities {
-                        dynamic_registration: Some(true),
-                        did_rename: Some(true),
-                        will_rename: Some(true),
-                        ..WorkspaceFileOperationsClientCapabilities::default()
-                    }),
-                    apply_edit: Some(true),
-                    execute_command: Some(ExecuteCommandClientCapabilities {
-                        dynamic_registration: Some(true),
-                    }),
-                    ..WorkspaceClientCapabilities::default()
-                }),
-                text_document: Some(TextDocumentClientCapabilities {
-                    definition: Some(GotoCapability {
-                        link_support: Some(true),
-                        dynamic_registration: Some(true),
-                    }),
-                    code_action: Some(CodeActionClientCapabilities {
-                        code_action_literal_support: Some(CodeActionLiteralSupport {
-                            code_action_kind: CodeActionKindLiteralSupport {
-                                value_set: vec![
-                                    CodeActionKind::REFACTOR.as_str().into(),
-                                    CodeActionKind::QUICKFIX.as_str().into(),
-                                    CodeActionKind::SOURCE.as_str().into(),
-                                ],
-                            },
-                        }),
-                        data_support: Some(true),
-                        resolve_support: Some(CodeActionCapabilityResolveSupport {
-                            properties: vec![
-                                "kind".to_string(),
-                                "diagnostics".to_string(),
-                                "isPreferred".to_string(),
-                                "disabled".to_string(),
-                                "edit".to_string(),
-                                "command".to_string(),
-                            ],
-                        }),
-                        dynamic_registration: Some(true),
-                        ..CodeActionClientCapabilities::default()
-                    }),
-                    completion: Some(CompletionClientCapabilities {
-                        completion_item: Some(CompletionItemCapability {
-                            snippet_support: Some(true),
-                            resolve_support: Some(CompletionItemCapabilityResolveSupport {
-                                properties: vec![
-                                    "additionalTextEdits".to_string(),
-                                    "command".to_string(),
-                                    "documentation".to_string(),
-                                    // NB: Do not have this resolved, otherwise Zed becomes slow to complete things
-                                    // "textEdit".to_string(),
-                                ],
-                            }),
-                            deprecated_support: Some(true),
-                            tag_support: Some(TagSupport {
-                                value_set: vec![CompletionItemTag::DEPRECATED],
-                            }),
-                            insert_replace_support: Some(true),
-                            label_details_support: Some(true),
-                            insert_text_mode_support: Some(InsertTextModeSupport {
-                                value_set: vec![
-                                    InsertTextMode::AS_IS,
-                                    InsertTextMode::ADJUST_INDENTATION,
-                                ],
-                            }),
-                            documentation_format: Some(vec![
-                                MarkupKind::Markdown,
-                                MarkupKind::PlainText,
-                            ]),
-                            ..CompletionItemCapability::default()
-                        }),
-                        insert_text_mode: Some(InsertTextMode::ADJUST_INDENTATION),
-                        completion_list: Some(CompletionListCapability {
-                            item_defaults: Some(vec![
-                                "commitCharacters".to_owned(),
-                                "editRange".to_owned(),
-                                "insertTextMode".to_owned(),
-                                "insertTextFormat".to_owned(),
-                                "data".to_owned(),
-                            ]),
-                        }),
-                        context_support: Some(true),
-                        dynamic_registration: Some(true),
-                        ..CompletionClientCapabilities::default()
-                    }),
-                    rename: Some(RenameClientCapabilities {
-                        prepare_support: Some(true),
-                        prepare_support_default_behavior: Some(
-                            PrepareSupportDefaultBehavior::IDENTIFIER,
-                        ),
-                        dynamic_registration: Some(true),
-                        ..RenameClientCapabilities::default()
-                    }),
-                    hover: Some(HoverClientCapabilities {
-                        content_format: Some(vec![MarkupKind::Markdown]),
-                        dynamic_registration: Some(true),
-                    }),
-                    inlay_hint: Some(InlayHintClientCapabilities {
-                        resolve_support: Some(InlayHintResolveClientCapabilities {
-                            properties: vec![
-                                "textEdits".to_string(),
-                                "tooltip".to_string(),
-                                "label.tooltip".to_string(),
-                                "label.location".to_string(),
-                                "label.command".to_string(),
-                            ],
-                        }),
-                        dynamic_registration: Some(true),
-                    }),
-                    publish_diagnostics: Some(PublishDiagnosticsClientCapabilities {
-                        related_information: Some(true),
-                        version_support: Some(true),
-                        data_support: Some(true),
-                        tag_support: Some(TagSupport {
-                            value_set: vec![DiagnosticTag::UNNECESSARY, DiagnosticTag::DEPRECATED],
-                        }),
-                        code_description_support: Some(true),
-                    }),
-                    formatting: Some(DynamicRegistrationClientCapabilities {
-                        dynamic_registration: Some(true),
-                    }),
-                    range_formatting: Some(DynamicRegistrationClientCapabilities {
-                        dynamic_registration: Some(true),
-                    }),
-                    on_type_formatting: Some(DynamicRegistrationClientCapabilities {
-                        dynamic_registration: Some(true),
-                    }),
-                    signature_help: Some(SignatureHelpClientCapabilities {
-                        signature_information: Some(SignatureInformationSettings {
-                            documentation_format: Some(vec![
-                                MarkupKind::Markdown,
-                                MarkupKind::PlainText,
-                            ]),
-                            parameter_information: Some(ParameterInformationSettings {
-                                label_offset_support: Some(true),
-                            }),
-                            active_parameter_support: Some(true),
-                        }),
-                        dynamic_registration: Some(true),
-                        ..SignatureHelpClientCapabilities::default()
-                    }),
-                    synchronization: Some(TextDocumentSyncClientCapabilities {
-                        did_save: Some(true),
-                        dynamic_registration: Some(true),
-                        ..TextDocumentSyncClientCapabilities::default()
-                    }),
-                    code_lens: Some(CodeLensClientCapabilities {
-                        dynamic_registration: Some(true),
-                    }),
-                    document_symbol: Some(DocumentSymbolClientCapabilities {
-                        hierarchical_document_symbol_support: Some(true),
-                        dynamic_registration: Some(true),
-                        ..DocumentSymbolClientCapabilities::default()
-                    }),
-                    diagnostic: Some(DiagnosticClientCapabilities {
-                        dynamic_registration: Some(true),
-                        related_document_support: Some(true),
-                    })
-                    .filter(|_| pull_diagnostics),
-                    color_provider: Some(DocumentColorClientCapabilities {
-                        dynamic_registration: Some(true),
-                    }),
-                    ..TextDocumentClientCapabilities::default()
-                }),
-                experimental: Some(json!({
-                    "serverStatusNotification": true,
-                    "localDocs": true,
-                })),
-                window: Some(WindowClientCapabilities {
-                    work_done_progress: Some(true),
-                    show_message: Some(ShowMessageRequestClientCapabilities {
-                        message_action_item: None,
-                    }),
-                    ..WindowClientCapabilities::default()
-                }),
-            },
-            trace: None,
-            workspace_folders: Some(workspace_folders),
-            client_info: release_channel::ReleaseChannel::try_global(cx).map(|release_channel| {
-                ClientInfo {
-                    name: release_channel.display_name().to_string(),
-                    version: Some(release_channel::AppVersion::global(cx).to_string()),
-                }
-            }),
-            locale: None,
-            ..InitializeParams::default()
-        }
-    }
-
-    /// Initializes a language server by sending the `Initialize` request.
-    /// Note that `options` is used directly to construct [`InitializeParams`], which is why it is owned.
-    ///
-    /// [LSP Specification](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#initialize)
-    pub fn initialize(
-        mut self,
-        params: InitializeParams,
-        configuration: Arc<DidChangeConfigurationParams>,
-        cx: &App,
-    ) -> Task<Result<Arc<Self>>> {
-        cx.background_spawn(async move {
-            let response = self
-                .request::<request::Initialize>(params)
-                .await
-                .into_response()
-                .with_context(|| {
-                    format!(
-                        "initializing server {}, id {}",
-                        self.name(),
-                        self.server_id()
-                    )
-                })?;
-            if let Some(info) = response.server_info {
-                self.process_name = info.name.into();
-            }
-            self.capabilities = RwLock::new(response.capabilities);
-            self.configuration = configuration;
-
-            self.notify::<notification::Initialized>(InitializedParams {})?;
-            Ok(Arc::new(self))
-        })
-    }
-
-    /// Sends a shutdown request to the language server process and prepares the [`LanguageServer`] to be dropped.
-    pub fn shutdown(&self) -> Option<impl 'static + Send + Future<Output = Option<()>> + use<>> {
-        if let Some(tasks) = self.io_tasks.lock().take() {
-            let response_handlers = self.response_handlers.clone();
-            let next_id = AtomicI32::new(self.next_id.load(SeqCst));
-            let outbound_tx = self.outbound_tx.clone();
-            let executor = self.executor.clone();
-            let notification_serializers = self.notification_tx.clone();
-            let mut output_done = self.output_done_rx.lock().take().unwrap();
-            let shutdown_request = Self::request_internal::<request::Shutdown>(
-                &next_id,
-                &response_handlers,
-                &outbound_tx,
-                &notification_serializers,
-                &executor,
-                (),
-            );
-
-            let server = self.server.clone();
-            let name = self.name.clone();
-            let server_id = self.server_id;
-            let mut timer = self.executor.timer(SERVER_SHUTDOWN_TIMEOUT).fuse();
-            Some(async move {
-                log::debug!("language server shutdown started");
-
-                select! {
-                    request_result = shutdown_request.fuse() => {
-                        match request_result {
-                            ConnectionResult::Timeout => {
-                                log::warn!("timeout waiting for language server {name} (id {server_id}) to shutdown");
-                            },
-                            ConnectionResult::ConnectionReset => {
-                                log::warn!("language server {name} (id {server_id}) closed the shutdown request connection");
-                            },
-                            ConnectionResult::Result(Err(e)) => {
-                                log::error!("Shutdown request failure, server {name} (id {server_id}): {e:#}");
-                            },
-                            ConnectionResult::Result(Ok(())) => {}
-                        }
-                    }
-
-                    _ = timer => {
-                        log::info!("timeout waiting for language server {name} (id {server_id}) to shutdown");
-                    },
-                }
-
-                response_handlers.lock().take();
-                Self::notify_internal::<notification::Exit>(&notification_serializers, ()).ok();
-                notification_serializers.close();
-                output_done.recv().await;
-                server.lock().take().map(|mut child| child.kill());
-                drop(tasks);
-                log::debug!("language server shutdown finished");
-                Some(())
-            })
-        } else {
-            None
-        }
-    }
-
-    /// Register a handler to handle incoming LSP notifications.
-    ///
-    /// [LSP Specification](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#notificationMessage)
-    #[must_use]
-    pub fn on_notification<T, F>(&self, f: F) -> Subscription
-    where
-        T: notification::Notification,
-        F: 'static + Send + FnMut(T::Params, &mut AsyncApp),
-    {
-        self.on_custom_notification(T::METHOD, f)
-    }
-
-    /// Register a handler to handle incoming LSP requests.
-    ///
-    /// [LSP Specification](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#requestMessage)
-    #[must_use]
-    pub fn on_request<T, F, Fut>(&self, f: F) -> Subscription
-    where
-        T: request::Request,
-        T::Params: 'static + Send,
-        F: 'static + FnMut(T::Params, &mut AsyncApp) -> Fut + Send,
-        Fut: 'static + Future<Output = Result<T::Result>>,
-    {
-        self.on_custom_request(T::METHOD, f)
-    }
-
-    /// Registers a handler to inspect all language server process stdio.
-    #[must_use]
-    pub fn on_io<F>(&self, f: F) -> Subscription
-    where
-        F: 'static + Send + FnMut(IoKind, &str),
-    {
-        let id = self.next_id.fetch_add(1, SeqCst);
-        self.io_handlers.lock().insert(id, Box::new(f));
-        Subscription::Io {
-            id,
-            io_handlers: Some(Arc::downgrade(&self.io_handlers)),
-        }
-    }
-
-    /// Removes a request handler registers via [`Self::on_request`].
-    pub fn remove_request_handler<T: request::Request>(&self) {
-        self.notification_handlers.lock().remove(T::METHOD);
-    }
-
-    /// Removes a notification handler registers via [`Self::on_notification`].
-    pub fn remove_notification_handler<T: notification::Notification>(&self) {
-        self.notification_handlers.lock().remove(T::METHOD);
-    }
-
-    /// Checks if a notification handler has been registered via [`Self::on_notification`].
-    pub fn has_notification_handler<T: notification::Notification>(&self) -> bool {
-        self.notification_handlers.lock().contains_key(T::METHOD)
-    }
-
-    #[must_use]
-    fn on_custom_notification<Params, F>(&self, method: &'static str, mut f: F) -> Subscription
-    where
-        F: 'static + FnMut(Params, &mut AsyncApp) + Send,
-        Params: DeserializeOwned,
-    {
-        let prev_handler = self.notification_handlers.lock().insert(
-            method,
-            Box::new(move |_, params, cx| {
-                if let Some(params) = serde_json::from_value(params).log_err() {
-                    f(params, cx);
-                }
-            }),
-        );
-        assert!(
-            prev_handler.is_none(),
-            "registered multiple handlers for the same LSP method"
-        );
-        Subscription::Notification {
-            method,
-            notification_handlers: Some(self.notification_handlers.clone()),
-        }
-    }
-
-    #[must_use]
-    fn on_custom_request<Params, Res, Fut, F>(&self, method: &'static str, mut f: F) -> Subscription
-    where
-        F: 'static + FnMut(Params, &mut AsyncApp) -> Fut + Send,
-        Fut: 'static + Future<Output = Result<Res>>,
-        Params: DeserializeOwned + Send + 'static,
-        Res: Serialize,
-    {
-        let outbound_tx = self.outbound_tx.clone();
-        let prev_handler = self.notification_handlers.lock().insert(
-            method,
-            Box::new(move |id, params, cx| {
-                if let Some(id) = id {
-                    match serde_json::from_value(params) {
-                        Ok(params) => {
-                            let response = f(params, cx);
-                            cx.foreground_executor()
-                                .spawn({
-                                    let outbound_tx = outbound_tx.clone();
-                                    async move {
-                                        let response = match response.await {
-                                            Ok(result) => Response {
-                                                jsonrpc: JSON_RPC_VERSION,
-                                                id,
-                                                value: LspResult::Ok(Some(result)),
-                                            },
-                                            Err(error) => Response {
-                                                jsonrpc: JSON_RPC_VERSION,
-                                                id,
-                                                value: LspResult::Error(Some(Error {
-                                                    code: lsp_types::error_codes::REQUEST_FAILED,
-                                                    message: error.to_string(),
-                                                    data: None,
-                                                })),
-                                            },
-                                        };
-                                        if let Some(response) =
-                                            serde_json::to_string(&response).log_err()
-                                        {
-                                            outbound_tx.try_send(response).ok();
-                                        }
-                                    }
-                                })
-                                .detach();
-                        }
-
-                        Err(error) => {
-                            log::error!("error deserializing {} request: {:?}", method, error);
-                            let response = AnyResponse {
-                                jsonrpc: JSON_RPC_VERSION,
-                                id,
-                                result: None,
-                                error: Some(Error {
-                                    code: -32700, // Parse error
-                                    message: error.to_string(),
-                                    data: None,
-                                }),
-                            };
-                            if let Some(response) = serde_json::to_string(&response).log_err() {
-                                outbound_tx.try_send(response).ok();
-                            }
-                        }
-                    }
-                }
-            }),
-        );
-        assert!(
-            prev_handler.is_none(),
-            "registered multiple handlers for the same LSP method"
-        );
-        Subscription::Notification {
-            method,
-            notification_handlers: Some(self.notification_handlers.clone()),
-        }
-    }
-
-    /// Get the name of the running language server.
-    pub fn name(&self) -> LanguageServerName {
-        self.name.clone()
-    }
-
-    pub fn process_name(&self) -> &str {
-        &self.process_name
-    }
-
-    /// Get the reported capabilities of the running language server.
-    pub fn capabilities(&self) -> ServerCapabilities {
-        self.capabilities.read().clone()
-    }
-
-    /// Get the reported capabilities of the running language server and
-    /// what we know on the client/adapter-side of its capabilities.
-    pub fn adapter_server_capabilities(&self) -> AdapterServerCapabilities {
-        AdapterServerCapabilities {
-            server_capabilities: self.capabilities(),
-            code_action_kinds: self.code_action_kinds(),
-        }
-    }
-
-    pub fn update_capabilities(&self, update: impl FnOnce(&mut ServerCapabilities)) {
-        update(self.capabilities.write().deref_mut());
-    }
-
-    pub fn configuration(&self) -> &Value {
-        &self.configuration.settings
-    }
-
-    /// Get the id of the running language server.
-    pub fn server_id(&self) -> LanguageServerId {
-        self.server_id
-    }
-
-    /// Language server's binary information.
-    pub fn binary(&self) -> &LanguageServerBinary {
-        &self.binary
-    }
-
-    /// Sends a RPC request to the language server.
-    ///
-    /// [LSP Specification](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#requestMessage)
-    pub fn request<T: request::Request>(
-        &self,
-        params: T::Params,
-    ) -> impl LspRequestFuture<T::Result> + use<T>
-    where
-        T::Result: 'static + Send,
-    {
-        Self::request_internal::<T>(
-            &self.next_id,
-            &self.response_handlers,
-            &self.outbound_tx,
-            &self.notification_tx,
-            &self.executor,
-            params,
-        )
-    }
-
-    /// Sends a RPC request to the language server, with a custom timer, a future which when becoming
-    /// ready causes the request to be timed out with the future's output message.
-    ///
-    /// [LSP Specification](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#requestMessage)
-    pub fn request_with_timer<T: request::Request, U: Future<Output = String>>(
-        &self,
-        params: T::Params,
-        timer: U,
-    ) -> impl LspRequestFuture<T::Result> + use<T, U>
-    where
-        T::Result: 'static + Send,
-    {
-        Self::request_internal_with_timer::<T, U>(
-            &self.next_id,
-            &self.response_handlers,
-            &self.outbound_tx,
-            &self.notification_tx,
-            &self.executor,
-            timer,
-            params,
-        )
-    }
-
-    fn request_internal_with_timer<T, U>(
-        next_id: &AtomicI32,
-        response_handlers: &Mutex<Option<HashMap<RequestId, ResponseHandler>>>,
-        outbound_tx: &channel::Sender<String>,
-        notification_serializers: &channel::Sender<NotificationSerializer>,
-        executor: &BackgroundExecutor,
-        timer: U,
-        params: T::Params,
-    ) -> impl LspRequestFuture<T::Result> + use<T, U>
-    where
-        T::Result: 'static + Send,
-        T: request::Request,
-        U: Future<Output = String>,
-    {
-        let id = next_id.fetch_add(1, SeqCst);
-        let message = serde_json::to_string(&Request {
-            jsonrpc: JSON_RPC_VERSION,
-            id: RequestId::Int(id),
-            method: T::METHOD,
-            params,
-        })
-        .unwrap();
-
-        let (tx, rx) = oneshot::channel();
-        let handle_response = response_handlers
-            .lock()
-            .as_mut()
-            .context("server shut down")
-            .map(|handlers| {
-                let executor = executor.clone();
-                handlers.insert(
-                    RequestId::Int(id),
-                    Box::new(move |result| {
-                        executor
-                            .spawn(async move {
-                                let response = match result {
-                                    Ok(response) => match serde_json::from_str(&response) {
-                                        Ok(deserialized) => Ok(deserialized),
-                                        Err(error) => {
-                                            log::error!("failed to deserialize response from language server: {}. response from language server: {:?}", error, response);
-                                            Err(error).context("failed to deserialize response")
-                                        }
-                                    }
-                                    Err(error) => Err(anyhow!("{}", error.message)),
-                                };
-                                _ = tx.send(response);
-                            })
-                            .detach();
-                    }),
-                );
-            });
-
-        let send = outbound_tx
-            .try_send(message)
-            .context("failed to write to language server's stdin");
-
-        let notification_serializers = notification_serializers.downgrade();
-        let started = Instant::now();
-        LspRequest::new(id, async move {
-            if let Err(e) = handle_response {
-                return ConnectionResult::Result(Err(e));
-            }
-            if let Err(e) = send {
-                return ConnectionResult::Result(Err(e));
-            }
-
-            let cancel_on_drop = util::defer(move || {
-                if let Some(notification_serializers) = notification_serializers.upgrade() {
-                    Self::notify_internal::<notification::Cancel>(
-                        &notification_serializers,
-                        CancelParams {
-                            id: NumberOrString::Number(id),
-                        },
-                    )
-                    .ok();
-                }
-            });
-
-            let method = T::METHOD;
-            select! {
-                response = rx.fuse() => {
-                    let elapsed = started.elapsed();
-                    log::trace!("Took {elapsed:?} to receive response to {method:?} id {id}");
-                    cancel_on_drop.abort();
-                    match response {
-                        Ok(response_result) => ConnectionResult::Result(response_result),
-                        Err(Canceled) => {
-                            log::error!("Server reset connection for a request {method:?} id {id}");
-                            ConnectionResult::ConnectionReset
-                        },
-                    }
-                }
-
-                message = timer.fuse() => {
-                    log::error!("Cancelled LSP request task for {method:?} id {id} {message}");
-                    ConnectionResult::Timeout
-                }
-            }
-        })
-    }
-
-    fn request_internal<T>(
-        next_id: &AtomicI32,
-        response_handlers: &Mutex<Option<HashMap<RequestId, ResponseHandler>>>,
-        outbound_tx: &channel::Sender<String>,
-        notification_serializers: &channel::Sender<NotificationSerializer>,
-        executor: &BackgroundExecutor,
-        params: T::Params,
-    ) -> impl LspRequestFuture<T::Result> + use<T>
-    where
-        T::Result: 'static + Send,
-        T: request::Request,
-    {
-        Self::request_internal_with_timer::<T, _>(
-            next_id,
-            response_handlers,
-            outbound_tx,
-            notification_serializers,
-            executor,
-            Self::default_request_timer(executor.clone()),
-            params,
-        )
-    }
-
-    pub fn default_request_timer(executor: BackgroundExecutor) -> impl Future<Output = String> {
-        executor
-            .timer(LSP_REQUEST_TIMEOUT)
-            .map(|_| format!("which took over {LSP_REQUEST_TIMEOUT:?}"))
-    }
-
-    /// Sends a RPC notification to the language server.
-    ///
-    /// [LSP Specification](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#notificationMessage)
-    pub fn notify<T: notification::Notification>(&self, params: T::Params) -> Result<()> {
-        let outbound = self.notification_tx.clone();
-        Self::notify_internal::<T>(&outbound, params)
-    }
-
-    fn notify_internal<T: notification::Notification>(
-        outbound_tx: &channel::Sender<NotificationSerializer>,
-        params: T::Params,
-    ) -> Result<()> {
-        let serializer = NotificationSerializer(Box::new(move || {
-            serde_json::to_string(&Notification {
-                jsonrpc: JSON_RPC_VERSION,
-                method: T::METHOD,
-                params,
-            })
-            .unwrap()
-        }));
-
-        outbound_tx.send_blocking(serializer)?;
-        Ok(())
-    }
-
-    /// Add new workspace folder to the list.
-    pub fn add_workspace_folder(&self, uri: Uri) {
-        if self
-            .capabilities()
-            .workspace
-            .and_then(|ws| {
-                ws.workspace_folders.and_then(|folders| {
-                    folders
-                        .change_notifications
-                        .map(|caps| matches!(caps, OneOf::Left(false)))
-                })
-            })
-            .unwrap_or(true)
-        {
-            return;
-        }
-
-        let Some(workspace_folders) = self.workspace_folders.as_ref() else {
-            return;
-        };
-        let is_new_folder = workspace_folders.lock().insert(uri.clone());
-        if is_new_folder {
-            let params = DidChangeWorkspaceFoldersParams {
-                event: WorkspaceFoldersChangeEvent {
-                    added: vec![WorkspaceFolder {
-                        uri,
-                        name: String::default(),
-                    }],
-                    removed: vec![],
-                },
-            };
-            self.notify::<DidChangeWorkspaceFolders>(params).ok();
-        }
-    }
-
-    /// Remove existing workspace folder from the list.
-    pub fn remove_workspace_folder(&self, uri: Uri) {
-        if self
-            .capabilities()
-            .workspace
-            .and_then(|ws| {
-                ws.workspace_folders.and_then(|folders| {
-                    folders
-                        .change_notifications
-                        .map(|caps| !matches!(caps, OneOf::Left(false)))
-                })
-            })
-            .unwrap_or(true)
-        {
-            return;
-        }
-        let Some(workspace_folders) = self.workspace_folders.as_ref() else {
-            return;
-        };
-        let was_removed = workspace_folders.lock().remove(&uri);
-        if was_removed {
-            let params = DidChangeWorkspaceFoldersParams {
-                event: WorkspaceFoldersChangeEvent {
-                    added: vec![],
-                    removed: vec![WorkspaceFolder {
-                        uri,
-                        name: String::default(),
-                    }],
-                },
-            };
-            self.notify::<DidChangeWorkspaceFolders>(params).ok();
-        }
-    }
-    pub fn set_workspace_folders(&self, folders: BTreeSet<Uri>) {
-        let Some(workspace_folders) = self.workspace_folders.as_ref() else {
-            return;
-        };
-        let mut workspace_folders = workspace_folders.lock();
-
-        let old_workspace_folders = std::mem::take(&mut *workspace_folders);
-        let added: Vec<_> = folders
-            .difference(&old_workspace_folders)
-            .map(|uri| WorkspaceFolder {
-                uri: uri.clone(),
-                name: String::default(),
-            })
-            .collect();
-
-        let removed: Vec<_> = old_workspace_folders
-            .difference(&folders)
-            .map(|uri| WorkspaceFolder {
-                uri: uri.clone(),
-                name: String::default(),
-            })
-            .collect();
-        *workspace_folders = folders;
-        let should_notify = !added.is_empty() || !removed.is_empty();
-        if should_notify {
-            drop(workspace_folders);
-            let params = DidChangeWorkspaceFoldersParams {
-                event: WorkspaceFoldersChangeEvent { added, removed },
-            };
-            self.notify::<DidChangeWorkspaceFolders>(params).ok();
-        }
-    }
-
-    pub fn workspace_folders(&self) -> BTreeSet<Uri> {
-        self.workspace_folders.as_ref().map_or_else(
-            || BTreeSet::from_iter([self.root_uri.clone()]),
-            |folders| folders.lock().clone(),
-        )
-    }
-
-    pub fn register_buffer(
-        &self,
-        uri: Uri,
-        language_id: String,
-        version: i32,
-        initial_text: String,
-    ) {
-        self.notify::<notification::DidOpenTextDocument>(DidOpenTextDocumentParams {
-            text_document: TextDocumentItem::new(uri, language_id, version, initial_text),
-        })
-        .ok();
-    }
-
-    pub fn unregister_buffer(&self, uri: Uri) {
-        self.notify::<notification::DidCloseTextDocument>(DidCloseTextDocumentParams {
-            text_document: TextDocumentIdentifier::new(uri),
-        })
-        .ok();
-    }
-}
-
-impl Drop for LanguageServer {
-    fn drop(&mut self) {
-        if let Some(shutdown) = self.shutdown() {
-            self.executor.spawn(shutdown).detach();
-        }
-    }
-}
-
-impl Subscription {
-    /// Detaching a subscription handle prevents it from unsubscribing on drop.
-    pub fn detach(&mut self) {
-        match self {
-            Subscription::Notification {
-                notification_handlers,
-                ..
-            } => *notification_handlers = None,
-            Subscription::Io { io_handlers, .. } => *io_handlers = None,
-        }
-    }
-}
-
-impl fmt::Display for LanguageServerId {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        self.0.fmt(f)
-    }
-}
-
-impl fmt::Debug for LanguageServer {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("LanguageServer")
-            .field("id", &self.server_id.0)
-            .field("name", &self.name)
-            .finish_non_exhaustive()
-    }
-}
-
-impl fmt::Debug for LanguageServerBinary {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        let mut debug = f.debug_struct("LanguageServerBinary");
-        debug.field("path", &self.path);
-        debug.field("arguments", &self.arguments);
-
-        if let Some(env) = &self.env {
-            let redacted_env: BTreeMap<String, String> = env
-                .iter()
-                .map(|(key, value)| {
-                    let redacted_value = if redact::should_redact(key) {
-                        "REDACTED".to_string()
-                    } else {
-                        value.clone()
-                    };
-                    (key.clone(), redacted_value)
-                })
-                .collect();
-            debug.field("env", &Some(redacted_env));
-        } else {
-            debug.field("env", &self.env);
-        }
-
-        debug.finish()
-    }
-}
-
-impl Drop for Subscription {
-    fn drop(&mut self) {
-        match self {
-            Subscription::Notification {
-                method,
-                notification_handlers,
-            } => {
-                if let Some(handlers) = notification_handlers {
-                    handlers.lock().remove(method);
-                }
-            }
-            Subscription::Io { id, io_handlers } => {
-                if let Some(io_handlers) = io_handlers.as_ref().and_then(|h| h.upgrade()) {
-                    io_handlers.lock().remove(id);
-                }
-            }
-        }
-    }
-}
-
-/// Mock language server for use in tests.
-#[cfg(any(test, feature = "test-support"))]
-#[derive(Clone)]
-pub struct FakeLanguageServer {
-    pub binary: LanguageServerBinary,
-    pub server: Arc<LanguageServer>,
-    notifications_rx: channel::Receiver<(String, String)>,
-}
-
-#[cfg(any(test, feature = "test-support"))]
-impl FakeLanguageServer {
-    /// Construct a fake language server.
-    pub fn new(
-        server_id: LanguageServerId,
-        binary: LanguageServerBinary,
-        name: String,
-        capabilities: ServerCapabilities,
-        cx: &mut AsyncApp,
-    ) -> (LanguageServer, FakeLanguageServer) {
-        let (stdin_writer, stdin_reader) = async_pipe::pipe();
-        let (stdout_writer, stdout_reader) = async_pipe::pipe();
-        let (notifications_tx, notifications_rx) = channel::unbounded();
-
-        let server_name = LanguageServerName(name.clone().into());
-        let process_name = Arc::from(name.as_str());
-        let root = Self::root_path();
-        let workspace_folders: Arc<Mutex<BTreeSet<Uri>>> = Default::default();
-        let mut server = LanguageServer::new_internal(
-            server_id,
-            server_name.clone(),
-            stdin_writer,
-            stdout_reader,
-            None::<async_pipe::PipeReader>,
-            Arc::new(Mutex::new(None)),
-            None,
-            None,
-            binary.clone(),
-            root,
-            Some(workspace_folders.clone()),
-            cx,
-            |_| false,
-        );
-        server.process_name = process_name;
-        let fake = FakeLanguageServer {
-            binary: binary.clone(),
-            server: Arc::new({
-                let mut server = LanguageServer::new_internal(
-                    server_id,
-                    server_name,
-                    stdout_writer,
-                    stdin_reader,
-                    None::<async_pipe::PipeReader>,
-                    Arc::new(Mutex::new(None)),
-                    None,
-                    None,
-                    binary,
-                    Self::root_path(),
-                    Some(workspace_folders),
-                    cx,
-                    move |msg| {
-                        notifications_tx
-                            .try_send((
-                                msg.method.to_string(),
-                                msg.params.as_ref().unwrap_or(&Value::Null).to_string(),
-                            ))
-                            .ok();
-                        true
-                    },
-                );
-                server.process_name = name.as_str().into();
-                server
-            }),
-            notifications_rx,
-        };
-        fake.set_request_handler::<request::Initialize, _, _>({
-            let capabilities = capabilities;
-            move |_, _| {
-                let capabilities = capabilities.clone();
-                let name = name.clone();
-                async move {
-                    Ok(InitializeResult {
-                        capabilities,
-                        server_info: Some(ServerInfo {
-                            name,
-                            ..Default::default()
-                        }),
-                    })
-                }
-            }
-        });
-
-        fake.set_request_handler::<request::Shutdown, _, _>(|_, _| async move { Ok(()) });
-
-        (server, fake)
-    }
-    #[cfg(target_os = "windows")]
-    fn root_path() -> Uri {
-        Uri::from_file_path("C:/").unwrap()
-    }
-
-    #[cfg(not(target_os = "windows"))]
-    fn root_path() -> Uri {
-        Uri::from_file_path("/").unwrap()
-    }
-}
-
-#[cfg(any(test, feature = "test-support"))]
-impl LanguageServer {
-    pub fn full_capabilities() -> ServerCapabilities {
-        ServerCapabilities {
-            document_highlight_provider: Some(OneOf::Left(true)),
-            code_action_provider: Some(CodeActionProviderCapability::Simple(true)),
-            document_formatting_provider: Some(OneOf::Left(true)),
-            document_range_formatting_provider: Some(OneOf::Left(true)),
-            definition_provider: Some(OneOf::Left(true)),
-            workspace_symbol_provider: Some(OneOf::Left(true)),
-            implementation_provider: Some(ImplementationProviderCapability::Simple(true)),
-            type_definition_provider: Some(TypeDefinitionProviderCapability::Simple(true)),
-            ..ServerCapabilities::default()
-        }
-    }
-}
-
-#[cfg(any(test, feature = "test-support"))]
-impl FakeLanguageServer {
-    /// See [`LanguageServer::notify`].
-    pub fn notify<T: notification::Notification>(&self, params: T::Params) {
-        self.server.notify::<T>(params).ok();
-    }
-
-    /// See [`LanguageServer::request`].
-    pub async fn request<T>(&self, params: T::Params) -> ConnectionResult<T::Result>
-    where
-        T: request::Request,
-        T::Result: 'static + Send,
-    {
-        self.server.executor.start_waiting();
-        self.server.request::<T>(params).await
-    }
-
-    /// Attempts [`Self::try_receive_notification`], unwrapping if it has not received the specified type yet.
-    pub async fn receive_notification<T: notification::Notification>(&mut self) -> T::Params {
-        self.server.executor.start_waiting();
-        self.try_receive_notification::<T>().await.unwrap()
-    }
-
-    /// Consumes the notification channel until it finds a notification for the specified type.
-    pub async fn try_receive_notification<T: notification::Notification>(
-        &mut self,
-    ) -> Option<T::Params> {
-        loop {
-            let (method, params) = self.notifications_rx.recv().await.ok()?;
-            if method == T::METHOD {
-                return Some(serde_json::from_str::<T::Params>(&params).unwrap());
-            } else {
-                log::info!("skipping message in fake language server {:?}", params);
-            }
-        }
-    }
-
-    /// Registers a handler for a specific kind of request. Removes any existing handler for specified request type.
-    pub fn set_request_handler<T, F, Fut>(
-        &self,
-        mut handler: F,
-    ) -> futures::channel::mpsc::UnboundedReceiver<()>
-    where
-        T: 'static + request::Request,
-        T::Params: 'static + Send,
-        F: 'static + Send + FnMut(T::Params, gpui::AsyncApp) -> Fut,
-        Fut: 'static + Future<Output = Result<T::Result>>,
-    {
-        let (responded_tx, responded_rx) = futures::channel::mpsc::unbounded();
-        self.server.remove_request_handler::<T>();
-        self.server
-            .on_request::<T, _, _>(move |params, cx| {
-                let result = handler(params, cx.clone());
-                let responded_tx = responded_tx.clone();
-                let executor = cx.background_executor().clone();
-                async move {
-                    executor.simulate_random_delay().await;
-                    let result = result.await;
-                    responded_tx.unbounded_send(()).ok();
-                    result
-                }
-            })
-            .detach();
-        responded_rx
-    }
-
-    /// Registers a handler for a specific kind of notification. Removes any existing handler for specified notification type.
-    pub fn handle_notification<T, F>(
-        &self,
-        mut handler: F,
-    ) -> futures::channel::mpsc::UnboundedReceiver<()>
-    where
-        T: 'static + notification::Notification,
-        T::Params: 'static + Send,
-        F: 'static + Send + FnMut(T::Params, gpui::AsyncApp),
-    {
-        let (handled_tx, handled_rx) = futures::channel::mpsc::unbounded();
-        self.server.remove_notification_handler::<T>();
-        self.server
-            .on_notification::<T, _>(move |params, cx| {
-                handler(params, cx.clone());
-                handled_tx.unbounded_send(()).ok();
-            })
-            .detach();
-        handled_rx
-    }
-
-    /// Removes any existing handler for specified notification type.
-    pub fn remove_request_handler<T>(&mut self)
-    where
-        T: 'static + request::Request,
-    {
-        self.server.remove_request_handler::<T>();
-    }
-
-    /// Simulate that the server has started work and notifies about its progress with the specified token.
-    pub async fn start_progress(&self, token: impl Into<String>) {
-        self.start_progress_with(token, Default::default()).await
-    }
-
-    pub async fn start_progress_with(
-        &self,
-        token: impl Into<String>,
-        progress: WorkDoneProgressBegin,
-    ) {
-        let token = token.into();
-        self.request::<request::WorkDoneProgressCreate>(WorkDoneProgressCreateParams {
-            token: NumberOrString::String(token.clone()),
-        })
-        .await
-        .into_response()
-        .unwrap();
-        self.notify::<notification::Progress>(ProgressParams {
-            token: NumberOrString::String(token),
-            value: ProgressParamsValue::WorkDone(WorkDoneProgress::Begin(progress)),
-        });
-    }
-
-    /// Simulate that the server has completed work and notifies about that with the specified token.
-    pub fn end_progress(&self, token: impl Into<String>) {
-        self.notify::<notification::Progress>(ProgressParams {
-            token: NumberOrString::String(token.into()),
-            value: ProgressParamsValue::WorkDone(WorkDoneProgress::End(Default::default())),
-        });
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use gpui::TestAppContext;
-    use std::str::FromStr;
-
-    #[ctor::ctor]
-    fn init_logger() {
-        zlog::init_test();
-    }
-
-    #[gpui::test]
-    async fn test_fake(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            release_channel::init(semver::Version::new(0, 0, 0), cx);
-        });
-        let (server, mut fake) = FakeLanguageServer::new(
-            LanguageServerId(0),
-            LanguageServerBinary {
-                path: "path/to/language-server".into(),
-                arguments: vec![],
-                env: None,
-            },
-            "the-lsp".to_string(),
-            Default::default(),
-            &mut cx.to_async(),
-        );
-
-        let (message_tx, message_rx) = channel::unbounded();
-        let (diagnostics_tx, diagnostics_rx) = channel::unbounded();
-        server
-            .on_notification::<notification::ShowMessage, _>(move |params, _| {
-                message_tx.try_send(params).unwrap()
-            })
-            .detach();
-        server
-            .on_notification::<notification::PublishDiagnostics, _>(move |params, _| {
-                diagnostics_tx.try_send(params).unwrap()
-            })
-            .detach();
-
-        let server = cx
-            .update(|cx| {
-                let params = server.default_initialize_params(false, cx);
-                let configuration = DidChangeConfigurationParams {
-                    settings: Default::default(),
-                };
-                server.initialize(params, configuration.into(), cx)
-            })
-            .await
-            .unwrap();
-        server
-            .notify::<notification::DidOpenTextDocument>(DidOpenTextDocumentParams {
-                text_document: TextDocumentItem::new(
-                    Uri::from_str("file://a/b").unwrap(),
-                    "rust".to_string(),
-                    0,
-                    "".to_string(),
-                ),
-            })
-            .unwrap();
-        assert_eq!(
-            fake.receive_notification::<notification::DidOpenTextDocument>()
-                .await
-                .text_document
-                .uri
-                .as_str(),
-            "file://a/b"
-        );
-
-        fake.notify::<notification::ShowMessage>(ShowMessageParams {
-            typ: MessageType::ERROR,
-            message: "ok".to_string(),
-        });
-        fake.notify::<notification::PublishDiagnostics>(PublishDiagnosticsParams {
-            uri: Uri::from_str("file://b/c").unwrap(),
-            version: Some(5),
-            diagnostics: vec![],
-        });
-        assert_eq!(message_rx.recv().await.unwrap().message, "ok");
-        assert_eq!(
-            diagnostics_rx.recv().await.unwrap().uri.as_str(),
-            "file://b/c"
-        );
-
-        fake.set_request_handler::<request::Shutdown, _, _>(|_, _| async move { Ok(()) });
-
-        drop(server);
-        cx.run_until_parked();
-        fake.receive_notification::<notification::Exit>().await;
-    }
-
-    #[gpui::test]
-    fn test_deserialize_string_digit_id() {
-        let json = r#"{"jsonrpc":"2.0","id":"2","method":"workspace/configuration","params":{"items":[{"scopeUri":"file:///Users/mph/Devel/personal/hello-scala/","section":"metals"}]}}"#;
-        let notification = serde_json::from_str::<NotificationOrRequest>(json)
-            .expect("message with string id should be parsed");
-        let expected_id = RequestId::Str("2".to_string());
-        assert_eq!(notification.id, Some(expected_id));
-    }
-
-    #[gpui::test]
-    fn test_deserialize_string_id() {
-        let json = r#"{"jsonrpc":"2.0","id":"anythingAtAll","method":"workspace/configuration","params":{"items":[{"scopeUri":"file:///Users/mph/Devel/personal/hello-scala/","section":"metals"}]}}"#;
-        let notification = serde_json::from_str::<NotificationOrRequest>(json)
-            .expect("message with string id should be parsed");
-        let expected_id = RequestId::Str("anythingAtAll".to_string());
-        assert_eq!(notification.id, Some(expected_id));
-    }
-
-    #[gpui::test]
-    fn test_deserialize_int_id() {
-        let json = r#"{"jsonrpc":"2.0","id":2,"method":"workspace/configuration","params":{"items":[{"scopeUri":"file:///Users/mph/Devel/personal/hello-scala/","section":"metals"}]}}"#;
-        let notification = serde_json::from_str::<NotificationOrRequest>(json)
-            .expect("message with string id should be parsed");
-        let expected_id = RequestId::Int(2);
-        assert_eq!(notification.id, Some(expected_id));
-    }
-
-    #[test]
-    fn test_serialize_has_no_nulls() {
-        // Ensure we're not setting both result and error variants. (ticket #10595)
-        let no_tag = Response::<u32> {
-            jsonrpc: "",
-            id: RequestId::Int(0),
-            value: LspResult::Ok(None),
-        };
-        assert_eq!(
-            serde_json::to_string(&no_tag).unwrap(),
-            "{\"jsonrpc\":\"\",\"id\":0,\"result\":null}"
-        );
-        let no_tag = Response::<u32> {
-            jsonrpc: "",
-            id: RequestId::Int(0),
-            value: LspResult::Error(None),
-        };
-        assert_eq!(
-            serde_json::to_string(&no_tag).unwrap(),
-            "{\"jsonrpc\":\"\",\"id\":0,\"error\":null}"
-        );
-    }
-}
diff --git a/crates/markdown/Cargo.toml b/crates/markdown/Cargo.toml
deleted file mode 100644
index 9e852d8074..0000000000
--- a/crates/markdown/Cargo.toml
+++ /dev/null
@@ -1,43 +0,0 @@
-[package]
-name = "markdown"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/markdown.rs"
-doctest = false
-
-[features]
-test-support = [
-    "gpui/test-support",
-    "util/test-support"
-]
-
-[dependencies]
-base64.workspace = true
-collections.workspace = true
-futures.workspace = true
-gpui.workspace = true
-language.workspace = true
-linkify.workspace = true
-log.workspace = true
-pulldown-cmark.workspace = true
-sum_tree.workspace = true
-theme.workspace = true
-ui.workspace = true
-util.workspace = true
-
-[dev-dependencies]
-assets.workspace = true
-env_logger.workspace = true
-fs = {workspace = true, features = ["test-support"]}
-gpui = { workspace = true, features = ["test-support"] }
-languages = { workspace = true, features = ["load-grammars"] }
-node_runtime.workspace = true
-settings = { workspace = true, features = ["test-support"] }
-util = { workspace = true, features = ["test-support"] }
diff --git a/crates/markdown/LICENSE-GPL b/crates/markdown/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/markdown/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/markdown/examples/markdown.rs b/crates/markdown/examples/markdown.rs
deleted file mode 100644
index c8d67eda03..0000000000
--- a/crates/markdown/examples/markdown.rs
+++ /dev/null
@@ -1,121 +0,0 @@
-use assets::Assets;
-use gpui::{Application, Entity, KeyBinding, StyleRefinement, WindowOptions, prelude::*, rgb};
-use language::LanguageRegistry;
-use markdown::{Markdown, MarkdownElement, MarkdownStyle};
-use node_runtime::NodeRuntime;
-use settings::SettingsStore;
-use std::sync::Arc;
-use theme::LoadThemes;
-use ui::prelude::*;
-use ui::{App, Window, div};
-
-const MARKDOWN_EXAMPLE: &str = r#"
-# Markdown Example Document
-
-## Headings
-Headings are created by adding one or more `#` symbols before your heading text. The number of `#` you use will determine the size of the heading.
-
-```
-function a(b: T) {
-
-}
-```
-
-Remember, markdown processors may have slight differences and extensions, so always refer to the specific documentation or guides relevant to your platform or editor for the best practices and additional features.
-
-## Images
-
-![Alt Text](data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTgiIGhlaWdodD0iMTAiIHZpZXdCb3g9IjAgMCA1NDAgMzAwIiBmaWxsPSJub25lIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgogIDxzdHlsZT4KICAgIC5ncmVlbi1zaGFwZSB7CiAgICAgIGZpbGw6ICNDNEVFRDA7IC8qIExpZ2h0IG1vZGUgKi8KICAgIH0KCiAgICBAbWVkaWEgKHByZWZlcnMtY29sb3Itc2NoZW1lOiBkYXJrKSB7CiAgICAgIC5ncmVlbi1zaGFwZSB7CiAgICAgICAgZmlsbDogIzEyNTIyNTsgLyogRGFyayBtb2RlICovCiAgICAgIH0KICAgIH0KICA8L3N0eWxlPgogIDxwYXRoIGQ9Ik00MjAgMzBMMzkwIDYwTDQ4MCAxNTBMMzkwIDI0MEwzMzAgMTgwTDMwMCAyMTBMMzkwIDMwMEw1NDAgMTUwTDQyMCAzMFoiIGNsYXNzPSJncmVlbi1zaGFwZSIvPgogIDxwYXRoIGQ9Ik0xNTAgMEwzMCAxMjBMNjAgMTUwTDE1MCA2MEwyMTAgMTIwTDI0MCA5MEwxNTAgMFoiIGNsYXNzPSJncmVlbi1zaGFwZSIvPgogIDxwYXRoIGQ9Ik0zOTAgMEw0MjAgMzBMMTUwIDMwMEwwIDE1MEwzMCAxMjBMMTUwIDI0MEwzOTAgMFoiIGZpbGw9IiMxRUE0NDYiLz4KPC9zdmc+) item one
-
-![other alt text](data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTgiIGhlaWdodD0iMTAiIHZpZXdCb3g9IjAgMCA1NDAgMzAwIiBmaWxsPSJub25lIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgogIDxzdHlsZT4KICAgIC5ncmF5LXNoYXBlIHsKICAgICAgZmlsbDogI0M2QzZDNjsgLyogTGlnaHQgbW9kZSAqLwogICAgfQoKICAgIEBtZWRpYSAocHJlZmVycy1jb2xvci1zY2hlbWU6IGRhcmspIHsKICAgICAgLmdyYXktc2hhcGUgewogICAgICAgIGZpbGw6ICM1NjU2NTY7IC8qIERhcmsgbW9kZSAqLwogICAgICB9CiAgICB9CiAgPC9zdHlsZT4KICA8cGF0aCBkPSJNMTUwIDBMMjQwIDkwTDIxMCAxMjBMMTIwIDMwTDE1MCAwWiIgZmlsbD0iI0YwOTQwOSIvPgogIDxwYXRoIGQ9Ik00MjAgMzBMNTQwIDE1MEw0MjAgMjcwTDM5MCAyNDBMNDgwIDE1MEwzOTAgNjBMNDIwIDMwWiIgY2xhc3M9ImdyYXktc2hhcGUiLz4KICA8cGF0aCBkPSJNMzMwIDE4MEwzMDAgMjEwTDM5MCAzMDBMNDIwIDI3MEwzMzAgMTgwWiIgZmlsbD0iI0YwOTQwOSIvPgogIDxwYXRoIGQ9Ik0xMjAgMzBMMTUwIDYwTDYwIDE1MEwxNTAgMjQwTDEyMCAyNzBMMCAxNTBMMTIwIDMwWiIgY2xhc3M9ImdyYXktc2hhcGUiLz4KICA8cGF0aCBkPSJNMzkwIDBMNDIwIDMwTDE1MCAzMDBMMTIwIDI3MEwzOTAgMFoiIGZpbGw9IiNGMDk0MDkiLz4KPC9zdmc+) item two
-
-![third alt text](data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTgiIGhlaWdodD0iMTAiIHZpZXdCb3g9IjAgMCA1NDAgMzAwIiBmaWxsPSJub25lIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgogIDxzdHlsZT4KICAgIC5ibHVlLXNoYXBlIHsKICAgICAgZmlsbDogI0E4QzdGQTsgLyogTGlnaHQgbW9kZSAqLwogICAgfQoKICAgIEBtZWRpYSAocHJlZmVycy1jb2xvci1zY2hlbWU6IGRhcmspIHsKICAgICAgLmJsdWUtc2hhcGUgewogICAgICAgIGZpbGw6ICMyRDUwOUU7IC8qIERhcmsgbW9kZSAqLwogICAgICB9CiAgICB9CgogICAgLmRhcmtlci1ibHVlLXNoYXBlIHsKICAgICAgICBmaWxsOiAjMUI2RUYzOwogICAgfQoKICAgIEBtZWRpYSAocHJlZmVycy1jb2xvci1zY2hlbWU6IGRhcmspIHsKICAgICAgICAuZGFya2VyLWJsdWUtc2hhcGUgewogICAgICAgICAgICBmaWxsOiAjNDE4NUZGOwogICAgICAgIH0KICAgIH0KCiAgPC9zdHlsZT4KICA8cGF0aCBkPSJNMTUwIDBMMTgwIDMwTDE1MCA2MEwxMjAgMzBMMTUwIDBaIiBjbGFzcz0iYmx1ZS1zaGFwZSIvPgogIDxwYXRoIGQ9Ik0yMTAgNjBMMjQwIDkwTDIxMCAxMjBMMTgwIDkwTDIxMCA2MFoiIGNsYXNzPSJibHVlLXNoYXBlIi8+CiAgPHBhdGggZD0iTTQ1MCA2MEw0ODAgOTBMNDUwIDEyMEw0MjAgOTBMNDUwIDYwWiIgY2xhc3M9ImJsdWUtc2hhcGUiLz4KICA8cGF0aCBkPSJNNTEwIDEyMEw1NDAgMTUwTDUxMCAxODBMNDgwIDE1MEw1MTAgMTIwWiIgY2xhc3M9ImJsdWUtc2hhcGUiLz4KICA8cGF0aCBkPSJNNDUwIDE4MEw0ODAgMjEwTDQ1MCAyNDBMNDIwIDIxMEw0NTAgMTgwWiIgY2xhc3M9ImJsdWUtc2hhcGUiLz4KICA8cGF0aCBkPSJNMzkwIDI0MEw0MjAgMjcwTDM5MCAzMDBMMzYwIDI3MEwzOTAgMjQwWiIgY2xhc3M9ImJsdWUtc2hhcGUiLz4KICA8cGF0aCBkPSJNMzMwIDE4MEwzNjAgMjEwTDMzMCAyNDBMMzAwIDIxMEwzMzAgMTgwWiIgY2xhc3M9ImJsdWUtc2hhcGUiLz4KICA8cGF0aCBkPSJNOTAgNjBMMTIwIDkwTDkwIDEyMEw2MCA5MEw5MCA2MFoiIGNsYXNzPSJibHVlLXNoYXBlIi8+CiAgPHBhdGggZD0iTTM5MCAwTDQyMCAzMEwxNTAgMzAwTDAgMTUwTDMwIDEyMEwxNTAgMjQwTDM5MCAwWiIgY2xhc3M9ImRhcmtlci1ibHVlLXNoYXBlIi8+Cjwvc3ZnPg==) item three
-
-"#;
-
-pub fn main() {
-    env_logger::init();
-    Application::new().with_assets(Assets).run(|cx| {
-        let store = SettingsStore::test(cx);
-        cx.set_global(store);
-        cx.bind_keys([KeyBinding::new("cmd-c", markdown::Copy, None)]);
-
-        let node_runtime = NodeRuntime::unavailable();
-        theme::init(LoadThemes::JustBase, cx);
-
-        let fs = fs::FakeFs::new(cx.background_executor().clone());
-        let language_registry = LanguageRegistry::new(cx.background_executor().clone());
-        language_registry.set_theme(cx.theme().clone());
-        let language_registry = Arc::new(language_registry);
-        languages::init(language_registry.clone(), fs, node_runtime, cx);
-        Assets.load_fonts(cx).unwrap();
-
-        cx.activate(true);
-        cx.open_window(WindowOptions::default(), |_, cx| {
-            cx.new(|cx| MarkdownExample::new(MARKDOWN_EXAMPLE.into(), language_registry, cx))
-        })
-        .unwrap();
-    });
-}
-
-struct MarkdownExample {
-    markdown: Entity<Markdown>,
-}
-
-impl MarkdownExample {
-    pub fn new(text: SharedString, language_registry: Arc<LanguageRegistry>, cx: &mut App) -> Self {
-        let markdown = cx
-            .new(|cx| Markdown::new(text, Some(language_registry), Some("TypeScript".into()), cx));
-        Self { markdown }
-    }
-}
-
-impl Render for MarkdownExample {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let markdown_style = MarkdownStyle {
-            base_text_style: gpui::TextStyle {
-                font_family: ".ZedSans".into(),
-                color: cx.theme().colors().terminal_ansi_black,
-                ..Default::default()
-            },
-            code_block: StyleRefinement::default()
-                .font_family(".ZedMono")
-                .m(rems(1.))
-                .bg(rgb(0xAAAAAAA)),
-            inline_code: gpui::TextStyleRefinement {
-                font_family: Some(".ZedMono".into()),
-                color: Some(cx.theme().colors().editor_foreground),
-                background_color: Some(cx.theme().colors().editor_background),
-                ..Default::default()
-            },
-            rule_color: Color::Muted.color(cx),
-            block_quote_border_color: Color::Muted.color(cx),
-            block_quote: gpui::TextStyleRefinement {
-                color: Some(Color::Muted.color(cx)),
-                ..Default::default()
-            },
-            link: gpui::TextStyleRefinement {
-                color: Some(Color::Accent.color(cx)),
-                underline: Some(gpui::UnderlineStyle {
-                    thickness: px(1.),
-                    color: Some(Color::Accent.color(cx)),
-                    wavy: false,
-                }),
-                ..Default::default()
-            },
-            syntax: cx.theme().syntax().clone(),
-            selection_background_color: cx.theme().colors().element_selection_background,
-            ..Default::default()
-        };
-
-        div()
-            .id("markdown-example")
-            .debug_selector(|| "foo".into())
-            .relative()
-            .bg(gpui::white())
-            .size_full()
-            .p_4()
-            .overflow_y_scroll()
-            .child(MarkdownElement::new(self.markdown.clone(), markdown_style))
-    }
-}
diff --git a/crates/markdown/examples/markdown_as_child.rs b/crates/markdown/examples/markdown_as_child.rs
deleted file mode 100644
index 6affa243ae..0000000000
--- a/crates/markdown/examples/markdown_as_child.rs
+++ /dev/null
@@ -1,113 +0,0 @@
-use assets::Assets;
-use gpui::{Application, Entity, KeyBinding, Length, StyleRefinement, WindowOptions, rgb};
-use language::LanguageRegistry;
-use markdown::{Markdown, MarkdownElement, MarkdownStyle};
-use node_runtime::NodeRuntime;
-use settings::SettingsStore;
-use std::sync::Arc;
-use theme::LoadThemes;
-use ui::div;
-use ui::prelude::*;
-
-const MARKDOWN_EXAMPLE: &str = r#"
-this text should be selectable
-
-wow so cool
-
-## Heading 2
-"#;
-pub fn main() {
-    env_logger::init();
-
-    Application::new().with_assets(Assets).run(|cx| {
-        let store = SettingsStore::test(cx);
-        cx.set_global(store);
-        cx.bind_keys([KeyBinding::new("cmd-c", markdown::Copy, None)]);
-
-        let node_runtime = NodeRuntime::unavailable();
-        let language_registry = Arc::new(LanguageRegistry::new(cx.background_executor().clone()));
-        let fs = fs::FakeFs::new(cx.background_executor().clone());
-        languages::init(language_registry, fs, node_runtime, cx);
-        theme::init(LoadThemes::JustBase, cx);
-        Assets.load_fonts(cx).unwrap();
-
-        cx.activate(true);
-        let _ = cx.open_window(WindowOptions::default(), |_, cx| {
-            cx.new(|cx| {
-                let markdown = cx.new(|cx| Markdown::new(MARKDOWN_EXAMPLE.into(), None, None, cx));
-
-                HelloWorld { markdown }
-            })
-        });
-    });
-}
-struct HelloWorld {
-    markdown: Entity<Markdown>,
-}
-
-impl Render for HelloWorld {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let markdown_style = MarkdownStyle {
-            base_text_style: gpui::TextStyle {
-                font_family: "Zed Mono".into(),
-                color: cx.theme().colors().text,
-                ..Default::default()
-            },
-            code_block: StyleRefinement {
-                text: Some(gpui::TextStyleRefinement {
-                    font_family: Some("Zed Mono".into()),
-                    background_color: Some(cx.theme().colors().editor_background),
-                    ..Default::default()
-                }),
-                margin: gpui::EdgesRefinement {
-                    top: Some(Length::Definite(rems(4.).into())),
-                    left: Some(Length::Definite(rems(4.).into())),
-                    right: Some(Length::Definite(rems(4.).into())),
-                    bottom: Some(Length::Definite(rems(4.).into())),
-                },
-                ..Default::default()
-            },
-            inline_code: gpui::TextStyleRefinement {
-                font_family: Some("Zed Mono".into()),
-                background_color: Some(cx.theme().colors().editor_background),
-                ..Default::default()
-            },
-            rule_color: Color::Muted.color(cx),
-            block_quote_border_color: Color::Muted.color(cx),
-            block_quote: gpui::TextStyleRefinement {
-                color: Some(Color::Muted.color(cx)),
-                ..Default::default()
-            },
-            link: gpui::TextStyleRefinement {
-                color: Some(Color::Accent.color(cx)),
-                underline: Some(gpui::UnderlineStyle {
-                    thickness: px(1.),
-                    color: Some(Color::Accent.color(cx)),
-                    wavy: false,
-                }),
-                ..Default::default()
-            },
-            syntax: cx.theme().syntax().clone(),
-            selection_background_color: cx.theme().colors().element_selection_background,
-            heading: Default::default(),
-            ..Default::default()
-        };
-
-        div()
-            .flex()
-            .bg(rgb(0x2e7d32))
-            .size(Length::Definite(px(700.0).into()))
-            .justify_center()
-            .items_center()
-            .shadow_lg()
-            .border_1()
-            .border_color(rgb(0x0000ff))
-            .text_xl()
-            .text_color(rgb(0xffffff))
-            .child(
-                div()
-                    .child(MarkdownElement::new(self.markdown.clone(), markdown_style))
-                    .p_20(),
-            )
-    }
-}
diff --git a/crates/markdown/src/markdown.rs b/crates/markdown/src/markdown.rs
deleted file mode 100644
index 317657ea5f..0000000000
--- a/crates/markdown/src/markdown.rs
+++ /dev/null
@@ -1,1994 +0,0 @@
-pub mod parser;
-mod path_range;
-
-use base64::Engine as _;
-use futures::FutureExt as _;
-use gpui::HitboxBehavior;
-use language::LanguageName;
-use log::Level;
-pub use path_range::{LineCol, PathWithRange};
-use ui::Checkbox;
-
-use std::borrow::Cow;
-use std::iter;
-use std::mem;
-use std::ops::Range;
-use std::path::Path;
-use std::rc::Rc;
-use std::sync::Arc;
-use std::time::Duration;
-
-use collections::{HashMap, HashSet};
-use gpui::{
-    AnyElement, App, BorderStyle, Bounds, ClipboardItem, CursorStyle, DispatchPhase, Edges, Entity,
-    FocusHandle, Focusable, FontStyle, FontWeight, GlobalElementId, Hitbox, Hsla, Image,
-    ImageFormat, KeyContext, Length, MouseDownEvent, MouseEvent, MouseMoveEvent, MouseUpEvent,
-    Point, ScrollHandle, Stateful, StrikethroughStyle, StyleRefinement, StyledText, Task,
-    TextLayout, TextRun, TextStyle, TextStyleRefinement, actions, img, point, quad,
-};
-use language::{Language, LanguageRegistry, Rope};
-use parser::CodeBlockMetadata;
-use parser::{MarkdownEvent, MarkdownTag, MarkdownTagEnd, parse_links_only, parse_markdown};
-use pulldown_cmark::Alignment;
-use sum_tree::TreeMap;
-use theme::SyntaxTheme;
-use ui::{ScrollAxes, Scrollbars, Tooltip, WithScrollbar, prelude::*};
-use util::ResultExt;
-
-use crate::parser::CodeBlockKind;
-
-/// A callback function that can be used to customize the style of links based on the destination URL.
-/// If the callback returns `None`, the default link style will be used.
-type LinkStyleCallback = Rc<dyn Fn(&str, &App) -> Option<TextStyleRefinement>>;
-
-/// Defines custom style refinements for each heading level (H1-H6)
-#[derive(Clone, Default)]
-pub struct HeadingLevelStyles {
-    pub h1: Option<TextStyleRefinement>,
-    pub h2: Option<TextStyleRefinement>,
-    pub h3: Option<TextStyleRefinement>,
-    pub h4: Option<TextStyleRefinement>,
-    pub h5: Option<TextStyleRefinement>,
-    pub h6: Option<TextStyleRefinement>,
-}
-
-#[derive(Clone)]
-pub struct MarkdownStyle {
-    pub base_text_style: TextStyle,
-    pub container_style: StyleRefinement,
-    pub code_block: StyleRefinement,
-    pub code_block_overflow_x_scroll: bool,
-    pub inline_code: TextStyleRefinement,
-    pub block_quote: TextStyleRefinement,
-    pub link: TextStyleRefinement,
-    pub link_callback: Option<LinkStyleCallback>,
-    pub rule_color: Hsla,
-    pub block_quote_border_color: Hsla,
-    pub syntax: Arc<SyntaxTheme>,
-    pub selection_background_color: Hsla,
-    pub heading: StyleRefinement,
-    pub heading_level_styles: Option<HeadingLevelStyles>,
-    pub height_is_multiple_of_line_height: bool,
-    pub prevent_mouse_interaction: bool,
-}
-
-impl Default for MarkdownStyle {
-    fn default() -> Self {
-        Self {
-            base_text_style: Default::default(),
-            container_style: Default::default(),
-            code_block: Default::default(),
-            code_block_overflow_x_scroll: false,
-            inline_code: Default::default(),
-            block_quote: Default::default(),
-            link: Default::default(),
-            link_callback: None,
-            rule_color: Default::default(),
-            block_quote_border_color: Default::default(),
-            syntax: Arc::new(SyntaxTheme::default()),
-            selection_background_color: Default::default(),
-            heading: Default::default(),
-            heading_level_styles: None,
-            height_is_multiple_of_line_height: false,
-            prevent_mouse_interaction: false,
-        }
-    }
-}
-
-pub struct Markdown {
-    source: SharedString,
-    selection: Selection,
-    pressed_link: Option<RenderedLink>,
-    autoscroll_request: Option<usize>,
-    parsed_markdown: ParsedMarkdown,
-    images_by_source_offset: HashMap<usize, Arc<Image>>,
-    should_reparse: bool,
-    pending_parse: Option<Task<()>>,
-    focus_handle: FocusHandle,
-    language_registry: Option<Arc<LanguageRegistry>>,
-    fallback_code_block_language: Option<LanguageName>,
-    options: Options,
-    copied_code_blocks: HashSet<ElementId>,
-    code_block_scroll_handles: HashMap<usize, ScrollHandle>,
-}
-
-struct Options {
-    parse_links_only: bool,
-}
-
-pub enum CodeBlockRenderer {
-    Default {
-        copy_button: bool,
-        copy_button_on_hover: bool,
-        border: bool,
-    },
-    Custom {
-        render: CodeBlockRenderFn,
-        /// A function that can modify the parent container after the code block
-        /// content has been appended as a child element.
-        transform: Option<CodeBlockTransformFn>,
-    },
-}
-
-pub type CodeBlockRenderFn = Arc<
-    dyn Fn(
-        &CodeBlockKind,
-        &ParsedMarkdown,
-        Range<usize>,
-        CodeBlockMetadata,
-        &mut Window,
-        &App,
-    ) -> Div,
->;
-
-pub type CodeBlockTransformFn =
-    Arc<dyn Fn(AnyDiv, Range<usize>, CodeBlockMetadata, &mut Window, &App) -> AnyDiv>;
-
-actions!(
-    markdown,
-    [
-        /// Copies the selected text to the clipboard.
-        Copy,
-        /// Copies the selected text as markdown to the clipboard.
-        CopyAsMarkdown
-    ]
-);
-
-impl Markdown {
-    pub fn new(
-        source: SharedString,
-        language_registry: Option<Arc<LanguageRegistry>>,
-        fallback_code_block_language: Option<LanguageName>,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let focus_handle = cx.focus_handle();
-        let mut this = Self {
-            source,
-            selection: Selection::default(),
-            pressed_link: None,
-            autoscroll_request: None,
-            should_reparse: false,
-            images_by_source_offset: Default::default(),
-            parsed_markdown: ParsedMarkdown::default(),
-            pending_parse: None,
-            focus_handle,
-            language_registry,
-            fallback_code_block_language,
-            options: Options {
-                parse_links_only: false,
-            },
-            copied_code_blocks: HashSet::default(),
-            code_block_scroll_handles: HashMap::default(),
-        };
-        this.parse(cx);
-        this
-    }
-
-    pub fn new_text(source: SharedString, cx: &mut Context<Self>) -> Self {
-        let focus_handle = cx.focus_handle();
-        let mut this = Self {
-            source,
-            selection: Selection::default(),
-            pressed_link: None,
-            autoscroll_request: None,
-            should_reparse: false,
-            parsed_markdown: ParsedMarkdown::default(),
-            images_by_source_offset: Default::default(),
-            pending_parse: None,
-            focus_handle,
-            language_registry: None,
-            fallback_code_block_language: None,
-            options: Options {
-                parse_links_only: true,
-            },
-            copied_code_blocks: HashSet::default(),
-            code_block_scroll_handles: HashMap::default(),
-        };
-        this.parse(cx);
-        this
-    }
-
-    fn code_block_scroll_handle(&mut self, id: usize) -> ScrollHandle {
-        self.code_block_scroll_handles
-            .entry(id)
-            .or_insert_with(ScrollHandle::new)
-            .clone()
-    }
-
-    fn retain_code_block_scroll_handles(&mut self, ids: &HashSet<usize>) {
-        self.code_block_scroll_handles
-            .retain(|id, _| ids.contains(id));
-    }
-
-    fn clear_code_block_scroll_handles(&mut self) {
-        self.code_block_scroll_handles.clear();
-    }
-
-    pub fn is_parsing(&self) -> bool {
-        self.pending_parse.is_some()
-    }
-
-    pub fn source(&self) -> &str {
-        &self.source
-    }
-
-    pub fn append(&mut self, text: &str, cx: &mut Context<Self>) {
-        self.source = SharedString::new(self.source.to_string() + text);
-        self.parse(cx);
-    }
-
-    pub fn replace(&mut self, source: impl Into<SharedString>, cx: &mut Context<Self>) {
-        self.source = source.into();
-        self.parse(cx);
-    }
-
-    pub fn reset(&mut self, source: SharedString, cx: &mut Context<Self>) {
-        if source == self.source() {
-            return;
-        }
-        self.source = source;
-        self.selection = Selection::default();
-        self.autoscroll_request = None;
-        self.pending_parse = None;
-        self.should_reparse = false;
-        self.parsed_markdown = ParsedMarkdown::default();
-        self.parse(cx);
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn parsed_markdown(&self) -> &ParsedMarkdown {
-        &self.parsed_markdown
-    }
-
-    pub fn escape(s: &str) -> Cow<'_, str> {
-        // Valid to use bytes since multi-byte UTF-8 doesn't use ASCII chars.
-        let count = s
-            .bytes()
-            .filter(|c| *c == b'\n' || c.is_ascii_punctuation())
-            .count();
-        if count > 0 {
-            let mut output = String::with_capacity(s.len() + count);
-            let mut is_newline = false;
-            for c in s.chars() {
-                if is_newline && c == ' ' {
-                    continue;
-                }
-                is_newline = c == '\n';
-                if c == '\n' {
-                    output.push('\n')
-                } else if c.is_ascii_punctuation() {
-                    output.push('\\')
-                }
-                output.push(c)
-            }
-            output.into()
-        } else {
-            s.into()
-        }
-    }
-
-    fn copy(&self, text: &RenderedText, _: &mut Window, cx: &mut Context<Self>) {
-        if self.selection.end <= self.selection.start {
-            return;
-        }
-        let text = text.text_for_range(self.selection.start..self.selection.end);
-        cx.write_to_clipboard(ClipboardItem::new_string(text));
-    }
-
-    fn copy_as_markdown(&self, _: &mut Window, cx: &mut Context<Self>) {
-        if self.selection.end <= self.selection.start {
-            return;
-        }
-        let text = self.source[self.selection.start..self.selection.end].to_string();
-        cx.write_to_clipboard(ClipboardItem::new_string(text));
-    }
-
-    fn parse(&mut self, cx: &mut Context<Self>) {
-        if self.source.is_empty() {
-            return;
-        }
-
-        if self.pending_parse.is_some() {
-            self.should_reparse = true;
-            return;
-        }
-        self.should_reparse = false;
-        self.pending_parse = Some(self.start_background_parse(cx));
-    }
-
-    fn start_background_parse(&self, cx: &Context<Self>) -> Task<()> {
-        let source = self.source.clone();
-        let should_parse_links_only = self.options.parse_links_only;
-        let language_registry = self.language_registry.clone();
-        let fallback = self.fallback_code_block_language.clone();
-
-        let parsed = cx.background_spawn(async move {
-            if should_parse_links_only {
-                return (
-                    ParsedMarkdown {
-                        events: Arc::from(parse_links_only(source.as_ref())),
-                        source,
-                        languages_by_name: TreeMap::default(),
-                        languages_by_path: TreeMap::default(),
-                    },
-                    Default::default(),
-                );
-            }
-
-            let (events, language_names, paths) = parse_markdown(&source);
-            let mut images_by_source_offset = HashMap::default();
-            let mut languages_by_name = TreeMap::default();
-            let mut languages_by_path = TreeMap::default();
-            if let Some(registry) = language_registry.as_ref() {
-                for name in language_names {
-                    let language = if !name.is_empty() {
-                        registry.language_for_name_or_extension(&name).left_future()
-                    } else if let Some(fallback) = &fallback {
-                        registry.language_for_name(fallback.as_ref()).right_future()
-                    } else {
-                        continue;
-                    };
-                    if let Ok(language) = language.await {
-                        languages_by_name.insert(name, language);
-                    }
-                }
-
-                for path in paths {
-                    if let Ok(language) = registry
-                        .load_language_for_file_path(Path::new(path.as_ref()))
-                        .await
-                    {
-                        languages_by_path.insert(path, language);
-                    }
-                }
-            }
-
-            for (range, event) in &events {
-                if let MarkdownEvent::Start(MarkdownTag::Image { dest_url, .. }) = event
-                    && let Some(data_url) = dest_url.strip_prefix("data:")
-                {
-                    let Some((mime_info, data)) = data_url.split_once(',') else {
-                        continue;
-                    };
-                    let Some((mime_type, encoding)) = mime_info.split_once(';') else {
-                        continue;
-                    };
-                    let Some(format) = ImageFormat::from_mime_type(mime_type) else {
-                        continue;
-                    };
-                    let is_base64 = encoding == "base64";
-                    if is_base64
-                        && let Some(bytes) = base64::prelude::BASE64_STANDARD
-                            .decode(data)
-                            .log_with_level(Level::Debug)
-                    {
-                        let image = Arc::new(Image::from_bytes(format, bytes));
-                        images_by_source_offset.insert(range.start, image);
-                    }
-                }
-            }
-
-            (
-                ParsedMarkdown {
-                    source,
-                    events: Arc::from(events),
-                    languages_by_name,
-                    languages_by_path,
-                },
-                images_by_source_offset,
-            )
-        });
-
-        cx.spawn(async move |this, cx| {
-            let (parsed, images_by_source_offset) = parsed.await;
-
-            this.update(cx, |this, cx| {
-                this.parsed_markdown = parsed;
-                this.images_by_source_offset = images_by_source_offset;
-                this.pending_parse.take();
-                if this.should_reparse {
-                    this.parse(cx);
-                }
-                cx.refresh_windows();
-            })
-            .ok();
-        })
-    }
-}
-
-impl Focusable for Markdown {
-    fn focus_handle(&self, _cx: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-#[derive(Copy, Clone, Default, Debug)]
-struct Selection {
-    start: usize,
-    end: usize,
-    reversed: bool,
-    pending: bool,
-}
-
-impl Selection {
-    fn set_head(&mut self, head: usize) {
-        if head < self.tail() {
-            if !self.reversed {
-                self.end = self.start;
-                self.reversed = true;
-            }
-            self.start = head;
-        } else {
-            if self.reversed {
-                self.start = self.end;
-                self.reversed = false;
-            }
-            self.end = head;
-        }
-    }
-
-    fn tail(&self) -> usize {
-        if self.reversed { self.end } else { self.start }
-    }
-}
-
-#[derive(Debug, Clone, Default)]
-pub struct ParsedMarkdown {
-    pub source: SharedString,
-    pub events: Arc<[(Range<usize>, MarkdownEvent)]>,
-    pub languages_by_name: TreeMap<SharedString, Arc<Language>>,
-    pub languages_by_path: TreeMap<Arc<str>, Arc<Language>>,
-}
-
-impl ParsedMarkdown {
-    pub fn source(&self) -> &SharedString {
-        &self.source
-    }
-
-    pub fn events(&self) -> &Arc<[(Range<usize>, MarkdownEvent)]> {
-        &self.events
-    }
-}
-
-pub struct MarkdownElement {
-    markdown: Entity<Markdown>,
-    style: MarkdownStyle,
-    code_block_renderer: CodeBlockRenderer,
-    on_url_click: Option<Box<dyn Fn(SharedString, &mut Window, &mut App)>>,
-}
-
-impl MarkdownElement {
-    pub fn new(markdown: Entity<Markdown>, style: MarkdownStyle) -> Self {
-        Self {
-            markdown,
-            style,
-            code_block_renderer: CodeBlockRenderer::Default {
-                copy_button: true,
-                copy_button_on_hover: false,
-                border: false,
-            },
-            on_url_click: None,
-        }
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn rendered_text(
-        markdown: Entity<Markdown>,
-        cx: &mut gpui::VisualTestContext,
-        style: impl FnOnce(&Window, &App) -> MarkdownStyle,
-    ) -> String {
-        use gpui::size;
-
-        let (text, _) = cx.draw(
-            Default::default(),
-            size(px(600.0), px(600.0)),
-            |window, cx| Self::new(markdown, style(window, cx)),
-        );
-        text.text
-            .lines
-            .iter()
-            .map(|line| line.layout.wrapped_text())
-            .collect::<Vec<_>>()
-            .join("\n")
-    }
-
-    pub fn code_block_renderer(mut self, variant: CodeBlockRenderer) -> Self {
-        self.code_block_renderer = variant;
-        self
-    }
-
-    pub fn on_url_click(
-        mut self,
-        handler: impl Fn(SharedString, &mut Window, &mut App) + 'static,
-    ) -> Self {
-        self.on_url_click = Some(Box::new(handler));
-        self
-    }
-
-    fn paint_selection(
-        &self,
-        bounds: Bounds<Pixels>,
-        rendered_text: &RenderedText,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        let selection = self.markdown.read(cx).selection;
-        let selection_start = rendered_text.position_for_source_index(selection.start);
-        let selection_end = rendered_text.position_for_source_index(selection.end);
-        if let Some(((start_position, start_line_height), (end_position, end_line_height))) =
-            selection_start.zip(selection_end)
-        {
-            if start_position.y == end_position.y {
-                window.paint_quad(quad(
-                    Bounds::from_corners(
-                        start_position,
-                        point(end_position.x, end_position.y + end_line_height),
-                    ),
-                    Pixels::ZERO,
-                    self.style.selection_background_color,
-                    Edges::default(),
-                    Hsla::transparent_black(),
-                    BorderStyle::default(),
-                ));
-            } else {
-                window.paint_quad(quad(
-                    Bounds::from_corners(
-                        start_position,
-                        point(bounds.right(), start_position.y + start_line_height),
-                    ),
-                    Pixels::ZERO,
-                    self.style.selection_background_color,
-                    Edges::default(),
-                    Hsla::transparent_black(),
-                    BorderStyle::default(),
-                ));
-
-                if end_position.y > start_position.y + start_line_height {
-                    window.paint_quad(quad(
-                        Bounds::from_corners(
-                            point(bounds.left(), start_position.y + start_line_height),
-                            point(bounds.right(), end_position.y),
-                        ),
-                        Pixels::ZERO,
-                        self.style.selection_background_color,
-                        Edges::default(),
-                        Hsla::transparent_black(),
-                        BorderStyle::default(),
-                    ));
-                }
-
-                window.paint_quad(quad(
-                    Bounds::from_corners(
-                        point(bounds.left(), end_position.y),
-                        point(end_position.x, end_position.y + end_line_height),
-                    ),
-                    Pixels::ZERO,
-                    self.style.selection_background_color,
-                    Edges::default(),
-                    Hsla::transparent_black(),
-                    BorderStyle::default(),
-                ));
-            }
-        }
-    }
-
-    fn paint_mouse_listeners(
-        &mut self,
-        hitbox: &Hitbox,
-        rendered_text: &RenderedText,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        if self.style.prevent_mouse_interaction {
-            return;
-        }
-
-        let is_hovering_link = hitbox.is_hovered(window)
-            && !self.markdown.read(cx).selection.pending
-            && rendered_text
-                .link_for_position(window.mouse_position())
-                .is_some();
-
-        if !self.style.prevent_mouse_interaction {
-            if is_hovering_link {
-                window.set_cursor_style(CursorStyle::PointingHand, hitbox);
-            } else {
-                window.set_cursor_style(CursorStyle::IBeam, hitbox);
-            }
-        }
-
-        let on_open_url = self.on_url_click.take();
-
-        self.on_mouse_event(window, cx, {
-            let rendered_text = rendered_text.clone();
-            let hitbox = hitbox.clone();
-            move |markdown, event: &MouseDownEvent, phase, window, cx| {
-                if hitbox.is_hovered(window) {
-                    if phase.bubble() {
-                        if let Some(link) = rendered_text.link_for_position(event.position) {
-                            markdown.pressed_link = Some(link.clone());
-                        } else {
-                            let source_index =
-                                match rendered_text.source_index_for_position(event.position) {
-                                    Ok(ix) | Err(ix) => ix,
-                                };
-                            let range = if event.click_count == 2 {
-                                rendered_text.surrounding_word_range(source_index)
-                            } else if event.click_count == 3 {
-                                rendered_text.surrounding_line_range(source_index)
-                            } else {
-                                source_index..source_index
-                            };
-                            markdown.selection = Selection {
-                                start: range.start,
-                                end: range.end,
-                                reversed: false,
-                                pending: true,
-                            };
-                            window.focus(&markdown.focus_handle);
-                        }
-
-                        window.prevent_default();
-                        cx.notify();
-                    }
-                } else if phase.capture() {
-                    markdown.selection = Selection::default();
-                    markdown.pressed_link = None;
-                    cx.notify();
-                }
-            }
-        });
-        self.on_mouse_event(window, cx, {
-            let rendered_text = rendered_text.clone();
-            let hitbox = hitbox.clone();
-            let was_hovering_link = is_hovering_link;
-            move |markdown, event: &MouseMoveEvent, phase, window, cx| {
-                if phase.capture() {
-                    return;
-                }
-
-                if markdown.selection.pending {
-                    let source_index = match rendered_text.source_index_for_position(event.position)
-                    {
-                        Ok(ix) | Err(ix) => ix,
-                    };
-                    markdown.selection.set_head(source_index);
-                    markdown.autoscroll_request = Some(source_index);
-                    cx.notify();
-                } else {
-                    let is_hovering_link = hitbox.is_hovered(window)
-                        && rendered_text.link_for_position(event.position).is_some();
-                    if is_hovering_link != was_hovering_link {
-                        cx.notify();
-                    }
-                }
-            }
-        });
-        self.on_mouse_event(window, cx, {
-            let rendered_text = rendered_text.clone();
-            move |markdown, event: &MouseUpEvent, phase, window, cx| {
-                if phase.bubble() {
-                    if let Some(pressed_link) = markdown.pressed_link.take()
-                        && Some(&pressed_link) == rendered_text.link_for_position(event.position)
-                    {
-                        if let Some(open_url) = on_open_url.as_ref() {
-                            open_url(pressed_link.destination_url, window, cx);
-                        } else {
-                            cx.open_url(&pressed_link.destination_url);
-                        }
-                    }
-                } else if markdown.selection.pending {
-                    markdown.selection.pending = false;
-                    #[cfg(any(target_os = "linux", target_os = "freebsd"))]
-                    {
-                        let text = rendered_text
-                            .text_for_range(markdown.selection.start..markdown.selection.end);
-                        cx.write_to_primary(ClipboardItem::new_string(text))
-                    }
-                    cx.notify();
-                }
-            }
-        });
-    }
-
-    fn autoscroll(
-        &self,
-        rendered_text: &RenderedText,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<()> {
-        let autoscroll_index = self
-            .markdown
-            .update(cx, |markdown, _| markdown.autoscroll_request.take())?;
-        let (position, line_height) = rendered_text.position_for_source_index(autoscroll_index)?;
-
-        let text_style = self.style.base_text_style.clone();
-        let font_id = window.text_system().resolve_font(&text_style.font());
-        let font_size = text_style.font_size.to_pixels(window.rem_size());
-        let em_width = window.text_system().em_width(font_id, font_size).unwrap();
-        window.request_autoscroll(Bounds::from_corners(
-            point(position.x - 3. * em_width, position.y - 3. * line_height),
-            point(position.x + 3. * em_width, position.y + 3. * line_height),
-        ));
-        Some(())
-    }
-
-    fn on_mouse_event<T: MouseEvent>(
-        &self,
-        window: &mut Window,
-        _cx: &mut App,
-        mut f: impl 'static
-        + FnMut(&mut Markdown, &T, DispatchPhase, &mut Window, &mut Context<Markdown>),
-    ) {
-        window.on_mouse_event({
-            let markdown = self.markdown.downgrade();
-            move |event, phase, window, cx| {
-                markdown
-                    .update(cx, |markdown, cx| f(markdown, event, phase, window, cx))
-                    .log_err();
-            }
-        });
-    }
-}
-
-impl Styled for MarkdownElement {
-    fn style(&mut self) -> &mut StyleRefinement {
-        &mut self.style.container_style
-    }
-}
-
-impl Element for MarkdownElement {
-    type RequestLayoutState = RenderedMarkdown;
-    type PrepaintState = Hitbox;
-
-    fn id(&self) -> Option<ElementId> {
-        None
-    }
-
-    fn source_location(&self) -> Option<&'static core::panic::Location<'static>> {
-        None
-    }
-
-    fn request_layout(
-        &mut self,
-        _id: Option<&GlobalElementId>,
-        _inspector_id: Option<&gpui::InspectorElementId>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> (gpui::LayoutId, Self::RequestLayoutState) {
-        let mut builder = MarkdownElementBuilder::new(
-            &self.style.container_style,
-            self.style.base_text_style.clone(),
-            self.style.syntax.clone(),
-        );
-        let (parsed_markdown, images) = {
-            let markdown = self.markdown.read(cx);
-            (
-                markdown.parsed_markdown.clone(),
-                markdown.images_by_source_offset.clone(),
-            )
-        };
-        let markdown_end = if let Some(last) = parsed_markdown.events.last() {
-            last.0.end
-        } else {
-            0
-        };
-        let mut code_block_ids = HashSet::default();
-
-        let mut current_img_block_range: Option<Range<usize>> = None;
-        for (index, (range, event)) in parsed_markdown.events.iter().enumerate() {
-            // Skip alt text for images that rendered
-            if let Some(current_img_block_range) = &current_img_block_range
-                && current_img_block_range.end > range.end
-            {
-                continue;
-            }
-
-            match event {
-                MarkdownEvent::Start(tag) => {
-                    match tag {
-                        MarkdownTag::Image { .. } => {
-                            if let Some(image) = images.get(&range.start) {
-                                current_img_block_range = Some(range.clone());
-                                builder.modify_current_div(|el| {
-                                    el.items_center()
-                                        .flex()
-                                        .flex_row()
-                                        .child(img(image.clone()))
-                                });
-                            }
-                        }
-                        MarkdownTag::Paragraph => {
-                            builder.push_div(
-                                div().when(!self.style.height_is_multiple_of_line_height, |el| {
-                                    el.mb_2().line_height(rems(1.3))
-                                }),
-                                range,
-                                markdown_end,
-                            );
-                        }
-                        MarkdownTag::Heading { level, .. } => {
-                            let mut heading = div().mb_2();
-
-                            heading = apply_heading_style(
-                                heading,
-                                *level,
-                                self.style.heading_level_styles.as_ref(),
-                            );
-
-                            heading.style().refine(&self.style.heading);
-
-                            let text_style =
-                                self.style.heading.text_style().clone().unwrap_or_default();
-
-                            builder.push_text_style(text_style);
-                            builder.push_div(heading, range, markdown_end);
-                        }
-                        MarkdownTag::BlockQuote => {
-                            builder.push_text_style(self.style.block_quote.clone());
-                            builder.push_div(
-                                div()
-                                    .pl_4()
-                                    .mb_2()
-                                    .border_l_4()
-                                    .border_color(self.style.block_quote_border_color),
-                                range,
-                                markdown_end,
-                            );
-                        }
-                        MarkdownTag::CodeBlock { kind, .. } => {
-                            let language = match kind {
-                                CodeBlockKind::Fenced => None,
-                                CodeBlockKind::FencedLang(language) => {
-                                    parsed_markdown.languages_by_name.get(language).cloned()
-                                }
-                                CodeBlockKind::FencedSrc(path_range) => parsed_markdown
-                                    .languages_by_path
-                                    .get(&path_range.path)
-                                    .cloned(),
-                                _ => None,
-                            };
-
-                            let is_indented = matches!(kind, CodeBlockKind::Indented);
-                            let scroll_handle = if self.style.code_block_overflow_x_scroll {
-                                code_block_ids.insert(range.start);
-                                Some(self.markdown.update(cx, |markdown, _| {
-                                    markdown.code_block_scroll_handle(range.start)
-                                }))
-                            } else {
-                                None
-                            };
-
-                            match (&self.code_block_renderer, is_indented) {
-                                (CodeBlockRenderer::Default { .. }, _) | (_, true) => {
-                                    // This is a parent container that we can position the copy button inside.
-                                    let parent_container =
-                                        div().group("code_block").relative().w_full();
-
-                                    let mut parent_container: AnyDiv = if let Some(scroll_handle) =
-                                        scroll_handle.as_ref()
-                                    {
-                                        let scrollbars = Scrollbars::new(ScrollAxes::Horizontal)
-                                            .id(("markdown-code-block-scrollbar", range.start))
-                                            .tracked_scroll_handle(scroll_handle)
-                                            .with_track_along(
-                                                ScrollAxes::Horizontal,
-                                                cx.theme().colors().editor_background,
-                                            )
-                                            .notify_content();
-
-                                        parent_container
-                                            .rounded_lg()
-                                            .custom_scrollbars(scrollbars, window, cx)
-                                            .into()
-                                    } else {
-                                        parent_container.into()
-                                    };
-
-                                    if let CodeBlockRenderer::Default { border: true, .. } =
-                                        &self.code_block_renderer
-                                    {
-                                        parent_container = parent_container
-                                            .rounded_md()
-                                            .border_1()
-                                            .border_color(cx.theme().colors().border_variant);
-                                    }
-
-                                    parent_container.style().refine(&self.style.code_block);
-                                    builder.push_div(parent_container, range, markdown_end);
-
-                                    let code_block = div()
-                                        .id(("code-block", range.start))
-                                        .rounded_lg()
-                                        .map(|mut code_block| {
-                                            if let Some(scroll_handle) = scroll_handle.as_ref() {
-                                                code_block.style().restrict_scroll_to_axis =
-                                                    Some(true);
-                                                code_block
-                                                    .flex()
-                                                    .overflow_x_scroll()
-                                                    .track_scroll(scroll_handle)
-                                            } else {
-                                                code_block.w_full()
-                                            }
-                                        });
-
-                                    if let Some(code_block_text_style) = &self.style.code_block.text
-                                    {
-                                        builder.push_text_style(code_block_text_style.to_owned());
-                                    }
-                                    builder.push_code_block(language);
-                                    builder.push_div(code_block, range, markdown_end);
-                                }
-                                (CodeBlockRenderer::Custom { .. }, _) => {}
-                            }
-                        }
-                        MarkdownTag::HtmlBlock => builder.push_div(div(), range, markdown_end),
-                        MarkdownTag::List(bullet_index) => {
-                            builder.push_list(*bullet_index);
-                            builder.push_div(div().pl_2p5(), range, markdown_end);
-                        }
-                        MarkdownTag::Item => {
-                            let bullet = if let Some((_, MarkdownEvent::TaskListMarker(checked))) =
-                                parsed_markdown.events.get(index.saturating_add(1))
-                            {
-                                let source = &parsed_markdown.source()[range.clone()];
-
-                                Checkbox::new(
-                                    ElementId::Name(source.to_string().into()),
-                                    if *checked {
-                                        ToggleState::Selected
-                                    } else {
-                                        ToggleState::Unselected
-                                    },
-                                )
-                                .fill()
-                                .visualization_only(true)
-                                .into_any_element()
-                            } else if let Some(bullet_index) = builder.next_bullet_index() {
-                                div().child(format!("{}.", bullet_index)).into_any_element()
-                            } else {
-                                div().child("•").into_any_element()
-                            };
-                            builder.push_div(
-                                div()
-                                    .when(!self.style.height_is_multiple_of_line_height, |el| {
-                                        el.mb_1().gap_1().line_height(rems(1.3))
-                                    })
-                                    .h_flex()
-                                    .items_start()
-                                    .child(bullet),
-                                range,
-                                markdown_end,
-                            );
-                            // Without `w_0`, text doesn't wrap to the width of the container.
-                            builder.push_div(div().flex_1().w_0(), range, markdown_end);
-                        }
-                        MarkdownTag::Emphasis => builder.push_text_style(TextStyleRefinement {
-                            font_style: Some(FontStyle::Italic),
-                            ..Default::default()
-                        }),
-                        MarkdownTag::Strong => builder.push_text_style(TextStyleRefinement {
-                            font_weight: Some(FontWeight::BOLD),
-                            ..Default::default()
-                        }),
-                        MarkdownTag::Strikethrough => {
-                            builder.push_text_style(TextStyleRefinement {
-                                strikethrough: Some(StrikethroughStyle {
-                                    thickness: px(1.),
-                                    color: None,
-                                }),
-                                ..Default::default()
-                            })
-                        }
-                        MarkdownTag::Link { dest_url, .. } => {
-                            if builder.code_block_stack.is_empty() {
-                                builder.push_link(dest_url.clone(), range.clone());
-                                let style = self
-                                    .style
-                                    .link_callback
-                                    .as_ref()
-                                    .and_then(|callback| callback(dest_url, cx))
-                                    .unwrap_or_else(|| self.style.link.clone());
-                                builder.push_text_style(style)
-                            }
-                        }
-                        MarkdownTag::MetadataBlock(_) => {}
-                        MarkdownTag::Table(alignments) => {
-                            builder.table_alignments = alignments.clone();
-
-                            builder.push_div(
-                                div()
-                                    .id(("table", range.start))
-                                    .min_w_0()
-                                    .size_full()
-                                    .mb_2()
-                                    .border_1()
-                                    .border_color(cx.theme().colors().border)
-                                    .rounded_sm()
-                                    .overflow_hidden(),
-                                range,
-                                markdown_end,
-                            );
-                        }
-                        MarkdownTag::TableHead => {
-                            let column_count = builder.table_alignments.len();
-
-                            builder.push_div(
-                                div()
-                                    .grid()
-                                    .grid_cols(column_count as u16)
-                                    .bg(cx.theme().colors().title_bar_background),
-                                range,
-                                markdown_end,
-                            );
-                            builder.push_text_style(TextStyleRefinement {
-                                font_weight: Some(FontWeight::SEMIBOLD),
-                                ..Default::default()
-                            });
-                        }
-                        MarkdownTag::TableRow => {
-                            let column_count = builder.table_alignments.len();
-
-                            builder.push_div(
-                                div().grid().grid_cols(column_count as u16),
-                                range,
-                                markdown_end,
-                            );
-                        }
-                        MarkdownTag::TableCell => {
-                            builder.push_div(
-                                div()
-                                    .min_w_0()
-                                    .border(px(0.5))
-                                    .border_color(cx.theme().colors().border)
-                                    .px_1()
-                                    .py_0p5(),
-                                range,
-                                markdown_end,
-                            );
-                        }
-                        _ => log::debug!("unsupported markdown tag {:?}", tag),
-                    }
-                }
-                MarkdownEvent::End(tag) => match tag {
-                    MarkdownTagEnd::Image => {
-                        current_img_block_range.take();
-                    }
-                    MarkdownTagEnd::Paragraph => {
-                        builder.pop_div();
-                    }
-                    MarkdownTagEnd::Heading(_) => {
-                        builder.pop_div();
-                        builder.pop_text_style()
-                    }
-                    MarkdownTagEnd::BlockQuote(_kind) => {
-                        builder.pop_text_style();
-                        builder.pop_div()
-                    }
-                    MarkdownTagEnd::CodeBlock => {
-                        builder.trim_trailing_newline();
-
-                        builder.pop_div();
-                        builder.pop_code_block();
-                        if self.style.code_block.text.is_some() {
-                            builder.pop_text_style();
-                        }
-
-                        if let CodeBlockRenderer::Default {
-                            copy_button: true, ..
-                        } = &self.code_block_renderer
-                        {
-                            builder.modify_current_div(|el| {
-                                let content_range = parser::extract_code_block_content_range(
-                                    &parsed_markdown.source()[range.clone()],
-                                );
-                                let content_range = content_range.start + range.start
-                                    ..content_range.end + range.start;
-
-                                let code = parsed_markdown.source()[content_range].to_string();
-                                let codeblock = render_copy_code_block_button(
-                                    range.end,
-                                    code,
-                                    self.markdown.clone(),
-                                    cx,
-                                );
-                                el.child(
-                                    h_flex()
-                                        .w_4()
-                                        .absolute()
-                                        .top_1p5()
-                                        .right_1p5()
-                                        .justify_end()
-                                        .child(codeblock),
-                                )
-                            });
-                        }
-
-                        if let CodeBlockRenderer::Default {
-                            copy_button_on_hover: true,
-                            ..
-                        } = &self.code_block_renderer
-                        {
-                            builder.modify_current_div(|el| {
-                                let content_range = parser::extract_code_block_content_range(
-                                    &parsed_markdown.source()[range.clone()],
-                                );
-                                let content_range = content_range.start + range.start
-                                    ..content_range.end + range.start;
-
-                                let code = parsed_markdown.source()[content_range].to_string();
-                                let codeblock = render_copy_code_block_button(
-                                    range.end,
-                                    code,
-                                    self.markdown.clone(),
-                                    cx,
-                                );
-                                el.child(
-                                    h_flex()
-                                        .w_4()
-                                        .absolute()
-                                        .top_0()
-                                        .right_0()
-                                        .justify_end()
-                                        .visible_on_hover("code_block")
-                                        .child(codeblock),
-                                )
-                            });
-                        }
-
-                        // Pop the parent container.
-                        builder.pop_div();
-                    }
-                    MarkdownTagEnd::HtmlBlock => builder.pop_div(),
-                    MarkdownTagEnd::List(_) => {
-                        builder.pop_list();
-                        builder.pop_div();
-                    }
-                    MarkdownTagEnd::Item => {
-                        builder.pop_div();
-                        builder.pop_div();
-                    }
-                    MarkdownTagEnd::Emphasis => builder.pop_text_style(),
-                    MarkdownTagEnd::Strong => builder.pop_text_style(),
-                    MarkdownTagEnd::Strikethrough => builder.pop_text_style(),
-                    MarkdownTagEnd::Link => {
-                        if builder.code_block_stack.is_empty() {
-                            builder.pop_text_style()
-                        }
-                    }
-                    MarkdownTagEnd::Table => {
-                        builder.pop_div();
-                        builder.table_alignments.clear();
-                    }
-                    MarkdownTagEnd::TableHead => {
-                        builder.pop_div();
-                        builder.pop_text_style();
-                    }
-                    MarkdownTagEnd::TableRow => {
-                        builder.pop_div();
-                    }
-                    MarkdownTagEnd::TableCell => {
-                        builder.pop_div();
-                    }
-                    _ => log::debug!("unsupported markdown tag end: {:?}", tag),
-                },
-                MarkdownEvent::Text => {
-                    builder.push_text(&parsed_markdown.source[range.clone()], range.clone());
-                }
-                MarkdownEvent::SubstitutedText(text) => {
-                    builder.push_text(text, range.clone());
-                }
-                MarkdownEvent::Code => {
-                    builder.push_text_style(self.style.inline_code.clone());
-                    builder.push_text(&parsed_markdown.source[range.clone()], range.clone());
-                    builder.pop_text_style();
-                }
-                MarkdownEvent::Html => {
-                    let html = &parsed_markdown.source[range.clone()];
-                    if html.starts_with("<!--") {
-                        builder.html_comment = true;
-                    }
-                    if html.trim_end().ends_with("-->") {
-                        builder.html_comment = false;
-                        continue;
-                    }
-                    if builder.html_comment {
-                        continue;
-                    }
-                    builder.push_text(html, range.clone());
-                }
-                MarkdownEvent::InlineHtml => {
-                    let html = &parsed_markdown.source[range.clone()];
-                    if html.starts_with("<code>") {
-                        builder.push_text_style(self.style.inline_code.clone());
-                        continue;
-                    }
-                    if html.trim_end().starts_with("</code>") {
-                        builder.pop_text_style();
-                        continue;
-                    }
-                    builder.push_text(&parsed_markdown.source[range.clone()], range.clone());
-                }
-                MarkdownEvent::Rule => {
-                    builder.push_div(
-                        div()
-                            .border_b_1()
-                            .my_2()
-                            .border_color(self.style.rule_color),
-                        range,
-                        markdown_end,
-                    );
-                    builder.pop_div()
-                }
-                MarkdownEvent::SoftBreak => builder.push_text(" ", range.clone()),
-                MarkdownEvent::HardBreak => builder.push_text("\n", range.clone()),
-                MarkdownEvent::TaskListMarker(_) => {
-                    // handled inside the `MarkdownTag::Item` case
-                }
-                _ => log::debug!("unsupported markdown event {:?}", event),
-            }
-        }
-        if self.style.code_block_overflow_x_scroll {
-            let code_block_ids = code_block_ids;
-            self.markdown.update(cx, move |markdown, _| {
-                markdown.retain_code_block_scroll_handles(&code_block_ids);
-            });
-        } else {
-            self.markdown
-                .update(cx, |markdown, _| markdown.clear_code_block_scroll_handles());
-        }
-        let mut rendered_markdown = builder.build();
-        let child_layout_id = rendered_markdown.element.request_layout(window, cx);
-        let layout_id = window.request_layout(gpui::Style::default(), [child_layout_id], cx);
-        (layout_id, rendered_markdown)
-    }
-
-    fn prepaint(
-        &mut self,
-        _id: Option<&GlobalElementId>,
-        _inspector_id: Option<&gpui::InspectorElementId>,
-        bounds: Bounds<Pixels>,
-        rendered_markdown: &mut Self::RequestLayoutState,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Self::PrepaintState {
-        let focus_handle = self.markdown.read(cx).focus_handle.clone();
-        window.set_focus_handle(&focus_handle, cx);
-        window.set_view_id(self.markdown.entity_id());
-
-        let hitbox = window.insert_hitbox(bounds, HitboxBehavior::Normal);
-        rendered_markdown.element.prepaint(window, cx);
-        self.autoscroll(&rendered_markdown.text, window, cx);
-        hitbox
-    }
-
-    fn paint(
-        &mut self,
-        _id: Option<&GlobalElementId>,
-        _inspector_id: Option<&gpui::InspectorElementId>,
-        bounds: Bounds<Pixels>,
-        rendered_markdown: &mut Self::RequestLayoutState,
-        hitbox: &mut Self::PrepaintState,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        let mut context = KeyContext::default();
-        context.add("Markdown");
-        window.set_key_context(context);
-        window.on_action(std::any::TypeId::of::<crate::Copy>(), {
-            let entity = self.markdown.clone();
-            let text = rendered_markdown.text.clone();
-            move |_, phase, window, cx| {
-                let text = text.clone();
-                if phase == DispatchPhase::Bubble {
-                    entity.update(cx, move |this, cx| this.copy(&text, window, cx))
-                }
-            }
-        });
-        window.on_action(std::any::TypeId::of::<crate::CopyAsMarkdown>(), {
-            let entity = self.markdown.clone();
-            move |_, phase, window, cx| {
-                if phase == DispatchPhase::Bubble {
-                    entity.update(cx, move |this, cx| this.copy_as_markdown(window, cx))
-                }
-            }
-        });
-
-        self.paint_mouse_listeners(hitbox, &rendered_markdown.text, window, cx);
-        rendered_markdown.element.paint(window, cx);
-        self.paint_selection(bounds, &rendered_markdown.text, window, cx);
-    }
-}
-
-fn apply_heading_style(
-    mut heading: Div,
-    level: pulldown_cmark::HeadingLevel,
-    custom_styles: Option<&HeadingLevelStyles>,
-) -> Div {
-    heading = match level {
-        pulldown_cmark::HeadingLevel::H1 => heading.text_3xl(),
-        pulldown_cmark::HeadingLevel::H2 => heading.text_2xl(),
-        pulldown_cmark::HeadingLevel::H3 => heading.text_xl(),
-        pulldown_cmark::HeadingLevel::H4 => heading.text_lg(),
-        pulldown_cmark::HeadingLevel::H5 => heading.text_base(),
-        pulldown_cmark::HeadingLevel::H6 => heading.text_sm(),
-    };
-
-    if let Some(styles) = custom_styles {
-        let style_opt = match level {
-            pulldown_cmark::HeadingLevel::H1 => &styles.h1,
-            pulldown_cmark::HeadingLevel::H2 => &styles.h2,
-            pulldown_cmark::HeadingLevel::H3 => &styles.h3,
-            pulldown_cmark::HeadingLevel::H4 => &styles.h4,
-            pulldown_cmark::HeadingLevel::H5 => &styles.h5,
-            pulldown_cmark::HeadingLevel::H6 => &styles.h6,
-        };
-
-        if let Some(style) = style_opt {
-            heading.style().text = Some(style.clone());
-        }
-    }
-
-    heading
-}
-
-fn render_copy_code_block_button(
-    id: usize,
-    code: String,
-    markdown: Entity<Markdown>,
-    cx: &App,
-) -> impl IntoElement {
-    let id = ElementId::named_usize("copy-markdown-code", id);
-    let was_copied = markdown.read(cx).copied_code_blocks.contains(&id);
-    IconButton::new(
-        id.clone(),
-        if was_copied {
-            IconName::Check
-        } else {
-            IconName::Copy
-        },
-    )
-    .icon_color(Color::Muted)
-    .icon_size(IconSize::Small)
-    .style(ButtonStyle::Filled)
-    .shape(ui::IconButtonShape::Square)
-    .tooltip(Tooltip::text("Copy"))
-    .on_click({
-        let markdown = markdown;
-        move |_event, _window, cx| {
-            let id = id.clone();
-            markdown.update(cx, |this, cx| {
-                this.copied_code_blocks.insert(id.clone());
-
-                cx.write_to_clipboard(ClipboardItem::new_string(code.clone()));
-
-                cx.spawn(async move |this, cx| {
-                    cx.background_executor().timer(Duration::from_secs(2)).await;
-
-                    cx.update(|cx| {
-                        this.update(cx, |this, cx| {
-                            this.copied_code_blocks.remove(&id);
-                            cx.notify();
-                        })
-                    })
-                    .ok();
-                })
-                .detach();
-            });
-        }
-    })
-}
-
-impl IntoElement for MarkdownElement {
-    type Element = Self;
-
-    fn into_element(self) -> Self::Element {
-        self
-    }
-}
-
-pub enum AnyDiv {
-    Div(Div),
-    Stateful(Stateful<Div>),
-}
-
-impl AnyDiv {
-    fn into_any_element(self) -> AnyElement {
-        match self {
-            Self::Div(div) => div.into_any_element(),
-            Self::Stateful(div) => div.into_any_element(),
-        }
-    }
-}
-
-impl From<Div> for AnyDiv {
-    fn from(value: Div) -> Self {
-        Self::Div(value)
-    }
-}
-
-impl From<Stateful<Div>> for AnyDiv {
-    fn from(value: Stateful<Div>) -> Self {
-        Self::Stateful(value)
-    }
-}
-
-impl Styled for AnyDiv {
-    fn style(&mut self) -> &mut StyleRefinement {
-        match self {
-            Self::Div(div) => div.style(),
-            Self::Stateful(div) => div.style(),
-        }
-    }
-}
-
-impl ParentElement for AnyDiv {
-    fn extend(&mut self, elements: impl IntoIterator<Item = AnyElement>) {
-        match self {
-            Self::Div(div) => div.extend(elements),
-            Self::Stateful(div) => div.extend(elements),
-        }
-    }
-}
-
-struct MarkdownElementBuilder {
-    div_stack: Vec<AnyDiv>,
-    rendered_lines: Vec<RenderedLine>,
-    pending_line: PendingLine,
-    rendered_links: Vec<RenderedLink>,
-    current_source_index: usize,
-    html_comment: bool,
-    base_text_style: TextStyle,
-    text_style_stack: Vec<TextStyleRefinement>,
-    code_block_stack: Vec<Option<Arc<Language>>>,
-    list_stack: Vec<ListStackEntry>,
-    table_alignments: Vec<Alignment>,
-    syntax_theme: Arc<SyntaxTheme>,
-}
-
-#[derive(Default)]
-struct PendingLine {
-    text: String,
-    runs: Vec<TextRun>,
-    source_mappings: Vec<SourceMapping>,
-}
-
-struct ListStackEntry {
-    bullet_index: Option<u64>,
-}
-
-impl MarkdownElementBuilder {
-    fn new(
-        container_style: &StyleRefinement,
-        base_text_style: TextStyle,
-        syntax_theme: Arc<SyntaxTheme>,
-    ) -> Self {
-        Self {
-            div_stack: vec![{
-                let mut base_div = div();
-                base_div.style().refine(container_style);
-                base_div.debug_selector(|| "inner".into()).into()
-            }],
-            rendered_lines: Vec::new(),
-            pending_line: PendingLine::default(),
-            rendered_links: Vec::new(),
-            current_source_index: 0,
-            html_comment: false,
-            base_text_style,
-            text_style_stack: Vec::new(),
-            code_block_stack: Vec::new(),
-            list_stack: Vec::new(),
-            table_alignments: Vec::new(),
-            syntax_theme,
-        }
-    }
-
-    fn push_text_style(&mut self, style: TextStyleRefinement) {
-        self.text_style_stack.push(style);
-    }
-
-    fn text_style(&self) -> TextStyle {
-        let mut style = self.base_text_style.clone();
-        for refinement in &self.text_style_stack {
-            style.refine(refinement);
-        }
-        style
-    }
-
-    fn pop_text_style(&mut self) {
-        self.text_style_stack.pop();
-    }
-
-    fn push_div(&mut self, div: impl Into<AnyDiv>, range: &Range<usize>, markdown_end: usize) {
-        let mut div = div.into();
-        self.flush_text();
-
-        if range.start == 0 {
-            // Remove the top margin on the first element.
-            div.style().refine(&StyleRefinement {
-                margin: gpui::EdgesRefinement {
-                    top: Some(Length::Definite(px(0.).into())),
-                    left: None,
-                    right: None,
-                    bottom: None,
-                },
-                ..Default::default()
-            });
-        }
-
-        if range.end == markdown_end {
-            div.style().refine(&StyleRefinement {
-                margin: gpui::EdgesRefinement {
-                    top: None,
-                    left: None,
-                    right: None,
-                    bottom: Some(Length::Definite(rems(0.).into())),
-                },
-                ..Default::default()
-            });
-        }
-
-        self.div_stack.push(div);
-    }
-
-    fn modify_current_div(&mut self, f: impl FnOnce(AnyDiv) -> AnyDiv) {
-        self.flush_text();
-        if let Some(div) = self.div_stack.pop() {
-            self.div_stack.push(f(div));
-        }
-    }
-
-    fn pop_div(&mut self) {
-        self.flush_text();
-        let div = self.div_stack.pop().unwrap().into_any_element();
-        self.div_stack.last_mut().unwrap().extend(iter::once(div));
-    }
-
-    fn push_list(&mut self, bullet_index: Option<u64>) {
-        self.list_stack.push(ListStackEntry { bullet_index });
-    }
-
-    fn next_bullet_index(&mut self) -> Option<u64> {
-        self.list_stack.last_mut().and_then(|entry| {
-            let item_index = entry.bullet_index.as_mut()?;
-            *item_index += 1;
-            Some(*item_index - 1)
-        })
-    }
-
-    fn pop_list(&mut self) {
-        self.list_stack.pop();
-    }
-
-    fn push_code_block(&mut self, language: Option<Arc<Language>>) {
-        self.code_block_stack.push(language);
-    }
-
-    fn pop_code_block(&mut self) {
-        self.code_block_stack.pop();
-    }
-
-    fn push_link(&mut self, destination_url: SharedString, source_range: Range<usize>) {
-        self.rendered_links.push(RenderedLink {
-            source_range,
-            destination_url,
-        });
-    }
-
-    fn push_text(&mut self, text: &str, source_range: Range<usize>) {
-        self.pending_line.source_mappings.push(SourceMapping {
-            rendered_index: self.pending_line.text.len(),
-            source_index: source_range.start,
-        });
-        self.pending_line.text.push_str(text);
-        self.current_source_index = source_range.end;
-
-        if let Some(Some(language)) = self.code_block_stack.last() {
-            let mut offset = 0;
-            for (range, highlight_id) in language.highlight_text(&Rope::from(text), 0..text.len()) {
-                if range.start > offset {
-                    self.pending_line
-                        .runs
-                        .push(self.text_style().to_run(range.start - offset));
-                }
-
-                let mut run_style = self.text_style();
-                if let Some(highlight) = highlight_id.style(&self.syntax_theme) {
-                    run_style = run_style.highlight(highlight);
-                }
-                self.pending_line.runs.push(run_style.to_run(range.len()));
-                offset = range.end;
-            }
-
-            if offset < text.len() {
-                self.pending_line
-                    .runs
-                    .push(self.text_style().to_run(text.len() - offset));
-            }
-        } else {
-            self.pending_line
-                .runs
-                .push(self.text_style().to_run(text.len()));
-        }
-    }
-
-    fn trim_trailing_newline(&mut self) {
-        if self.pending_line.text.ends_with('\n') {
-            self.pending_line
-                .text
-                .truncate(self.pending_line.text.len() - 1);
-            self.pending_line.runs.last_mut().unwrap().len -= 1;
-            self.current_source_index -= 1;
-        }
-    }
-
-    fn flush_text(&mut self) {
-        let line = mem::take(&mut self.pending_line);
-        if line.text.is_empty() {
-            return;
-        }
-
-        let text = StyledText::new(line.text).with_runs(line.runs);
-        self.rendered_lines.push(RenderedLine {
-            layout: text.layout().clone(),
-            source_mappings: line.source_mappings,
-            source_end: self.current_source_index,
-        });
-        self.div_stack.last_mut().unwrap().extend([text.into_any()]);
-    }
-
-    fn build(mut self) -> RenderedMarkdown {
-        debug_assert_eq!(self.div_stack.len(), 1);
-        self.flush_text();
-        RenderedMarkdown {
-            element: self.div_stack.pop().unwrap().into_any_element(),
-            text: RenderedText {
-                lines: self.rendered_lines.into(),
-                links: self.rendered_links.into(),
-            },
-        }
-    }
-}
-
-struct RenderedLine {
-    layout: TextLayout,
-    source_mappings: Vec<SourceMapping>,
-    source_end: usize,
-}
-
-impl RenderedLine {
-    fn rendered_index_for_source_index(&self, source_index: usize) -> usize {
-        if source_index >= self.source_end {
-            return self.layout.len();
-        }
-
-        let mapping = match self
-            .source_mappings
-            .binary_search_by_key(&source_index, |probe| probe.source_index)
-        {
-            Ok(ix) => &self.source_mappings[ix],
-            Err(ix) => &self.source_mappings[ix - 1],
-        };
-        mapping.rendered_index + (source_index - mapping.source_index)
-    }
-
-    fn source_index_for_rendered_index(&self, rendered_index: usize) -> usize {
-        if rendered_index >= self.layout.len() {
-            return self.source_end;
-        }
-
-        let mapping = match self
-            .source_mappings
-            .binary_search_by_key(&rendered_index, |probe| probe.rendered_index)
-        {
-            Ok(ix) => &self.source_mappings[ix],
-            Err(ix) => &self.source_mappings[ix - 1],
-        };
-        mapping.source_index + (rendered_index - mapping.rendered_index)
-    }
-
-    fn source_index_for_position(&self, position: Point<Pixels>) -> Result<usize, usize> {
-        let line_rendered_index;
-        let out_of_bounds;
-        match self.layout.index_for_position(position) {
-            Ok(ix) => {
-                line_rendered_index = ix;
-                out_of_bounds = false;
-            }
-            Err(ix) => {
-                line_rendered_index = ix;
-                out_of_bounds = true;
-            }
-        };
-        let source_index = self.source_index_for_rendered_index(line_rendered_index);
-        if out_of_bounds {
-            Err(source_index)
-        } else {
-            Ok(source_index)
-        }
-    }
-}
-
-#[derive(Copy, Clone, Debug, Default)]
-struct SourceMapping {
-    rendered_index: usize,
-    source_index: usize,
-}
-
-pub struct RenderedMarkdown {
-    element: AnyElement,
-    text: RenderedText,
-}
-
-#[derive(Clone)]
-struct RenderedText {
-    lines: Rc<[RenderedLine]>,
-    links: Rc<[RenderedLink]>,
-}
-
-#[derive(Debug, Clone, Eq, PartialEq)]
-struct RenderedLink {
-    source_range: Range<usize>,
-    destination_url: SharedString,
-}
-
-impl RenderedText {
-    fn source_index_for_position(&self, position: Point<Pixels>) -> Result<usize, usize> {
-        let mut lines = self.lines.iter().peekable();
-
-        while let Some(line) = lines.next() {
-            let line_bounds = line.layout.bounds();
-            if position.y > line_bounds.bottom() {
-                if let Some(next_line) = lines.peek()
-                    && position.y < next_line.layout.bounds().top()
-                {
-                    return Err(line.source_end);
-                }
-
-                continue;
-            }
-
-            return line.source_index_for_position(position);
-        }
-
-        Err(self.lines.last().map_or(0, |line| line.source_end))
-    }
-
-    fn position_for_source_index(&self, source_index: usize) -> Option<(Point<Pixels>, Pixels)> {
-        for line in self.lines.iter() {
-            let line_source_start = line.source_mappings.first().unwrap().source_index;
-            if source_index < line_source_start {
-                break;
-            } else if source_index > line.source_end {
-                continue;
-            } else {
-                let line_height = line.layout.line_height();
-                let rendered_index_within_line = line.rendered_index_for_source_index(source_index);
-                let position = line.layout.position_for_index(rendered_index_within_line)?;
-                return Some((position, line_height));
-            }
-        }
-        None
-    }
-
-    fn surrounding_word_range(&self, source_index: usize) -> Range<usize> {
-        for line in self.lines.iter() {
-            if source_index > line.source_end {
-                continue;
-            }
-
-            let line_rendered_start = line.source_mappings.first().unwrap().rendered_index;
-            let rendered_index_in_line =
-                line.rendered_index_for_source_index(source_index) - line_rendered_start;
-            let text = line.layout.text();
-            let previous_space = if let Some(idx) = text[0..rendered_index_in_line].rfind(' ') {
-                idx + ' '.len_utf8()
-            } else {
-                0
-            };
-            let next_space = if let Some(idx) = text[rendered_index_in_line..].find(' ') {
-                rendered_index_in_line + idx
-            } else {
-                text.len()
-            };
-
-            return line.source_index_for_rendered_index(line_rendered_start + previous_space)
-                ..line.source_index_for_rendered_index(line_rendered_start + next_space);
-        }
-
-        source_index..source_index
-    }
-
-    fn surrounding_line_range(&self, source_index: usize) -> Range<usize> {
-        for line in self.lines.iter() {
-            if source_index > line.source_end {
-                continue;
-            }
-            let line_source_start = line.source_mappings.first().unwrap().source_index;
-            return line_source_start..line.source_end;
-        }
-
-        source_index..source_index
-    }
-
-    fn text_for_range(&self, range: Range<usize>) -> String {
-        let mut ret = vec![];
-
-        for line in self.lines.iter() {
-            if range.start > line.source_end {
-                continue;
-            }
-            let line_source_start = line.source_mappings.first().unwrap().source_index;
-            if range.end < line_source_start {
-                break;
-            }
-
-            let text = line.layout.text();
-
-            let start = if range.start < line_source_start {
-                0
-            } else {
-                line.rendered_index_for_source_index(range.start)
-            };
-            let end = if range.end > line.source_end {
-                line.rendered_index_for_source_index(line.source_end)
-            } else {
-                line.rendered_index_for_source_index(range.end)
-            }
-            .min(text.len());
-
-            ret.push(text[start..end].to_string());
-        }
-        ret.join("\n")
-    }
-
-    fn link_for_position(&self, position: Point<Pixels>) -> Option<&RenderedLink> {
-        let source_index = self.source_index_for_position(position).ok()?;
-        self.links
-            .iter()
-            .find(|link| link.source_range.contains(&source_index))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use gpui::{TestAppContext, size};
-
-    #[gpui::test]
-    fn test_mappings(cx: &mut TestAppContext) {
-        // Formatting.
-        assert_mappings(
-            &render_markdown("He*l*lo", cx),
-            vec![vec![(0, 0), (1, 1), (2, 3), (3, 5), (4, 6), (5, 7)]],
-        );
-
-        // Multiple lines.
-        assert_mappings(
-            &render_markdown("Hello\n\nWorld", cx),
-            vec![
-                vec![(0, 0), (1, 1), (2, 2), (3, 3), (4, 4), (5, 5)],
-                vec![(0, 7), (1, 8), (2, 9), (3, 10), (4, 11), (5, 12)],
-            ],
-        );
-
-        // Multi-byte characters.
-        assert_mappings(
-            &render_markdown("αβγ\n\nδεζ", cx),
-            vec![
-                vec![(0, 0), (2, 2), (4, 4), (6, 6)],
-                vec![(0, 8), (2, 10), (4, 12), (6, 14)],
-            ],
-        );
-
-        // Smart quotes.
-        assert_mappings(&render_markdown("\"", cx), vec![vec![(0, 0), (3, 1)]]);
-        assert_mappings(
-            &render_markdown("\"hey\"", cx),
-            vec![vec![(0, 0), (3, 1), (4, 2), (5, 3), (6, 4), (9, 5)]],
-        );
-
-        // HTML Comments are ignored
-        assert_mappings(
-            &render_markdown(
-                "<!--\nrdoc-file=string.c\n- str.intern   -> symbol\n- str.to_sym   -> symbol\n-->\nReturns",
-                cx,
-            ),
-            vec![vec![
-                (0, 78),
-                (1, 79),
-                (2, 80),
-                (3, 81),
-                (4, 82),
-                (5, 83),
-                (6, 84),
-            ]],
-        );
-    }
-
-    fn render_markdown(markdown: &str, cx: &mut TestAppContext) -> RenderedText {
-        struct TestWindow;
-
-        impl Render for TestWindow {
-            fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
-                div()
-            }
-        }
-
-        let (_, cx) = cx.add_window_view(|_, _| TestWindow);
-        let markdown = cx.new(|cx| Markdown::new(markdown.to_string().into(), None, None, cx));
-        cx.run_until_parked();
-        let (rendered, _) = cx.draw(
-            Default::default(),
-            size(px(600.0), px(600.0)),
-            |_window, _cx| MarkdownElement::new(markdown, MarkdownStyle::default()),
-        );
-        rendered.text
-    }
-
-    #[test]
-    fn test_escape() {
-        assert_eq!(Markdown::escape("hello `world`"), "hello \\`world\\`");
-        assert_eq!(
-            Markdown::escape("hello\n    cool world"),
-            "hello\n\ncool world"
-        );
-    }
-
-    #[track_caller]
-    fn assert_mappings(rendered: &RenderedText, expected: Vec<Vec<(usize, usize)>>) {
-        assert_eq!(rendered.lines.len(), expected.len(), "line count mismatch");
-        for (line_ix, line_mappings) in expected.into_iter().enumerate() {
-            let line = &rendered.lines[line_ix];
-
-            assert!(
-                line.source_mappings.windows(2).all(|mappings| {
-                    mappings[0].source_index < mappings[1].source_index
-                        && mappings[0].rendered_index < mappings[1].rendered_index
-                }),
-                "line {} has duplicate mappings: {:?}",
-                line_ix,
-                line.source_mappings
-            );
-
-            for (rendered_ix, source_ix) in line_mappings {
-                assert_eq!(
-                    line.source_index_for_rendered_index(rendered_ix),
-                    source_ix,
-                    "line {}, rendered_ix {}",
-                    line_ix,
-                    rendered_ix
-                );
-
-                assert_eq!(
-                    line.rendered_index_for_source_index(source_ix),
-                    rendered_ix,
-                    "line {}, source_ix {}",
-                    line_ix,
-                    source_ix
-                );
-            }
-        }
-    }
-}
diff --git a/crates/markdown/src/parser.rs b/crates/markdown/src/parser.rs
deleted file mode 100644
index 62b210f9e3..0000000000
--- a/crates/markdown/src/parser.rs
+++ /dev/null
@@ -1,830 +0,0 @@
-use gpui::SharedString;
-use linkify::LinkFinder;
-pub use pulldown_cmark::TagEnd as MarkdownTagEnd;
-use pulldown_cmark::{
-    Alignment, CowStr, HeadingLevel, LinkType, MetadataBlockKind, Options, Parser,
-};
-use std::{ops::Range, sync::Arc};
-
-use collections::HashSet;
-
-use crate::path_range::PathWithRange;
-
-const PARSE_OPTIONS: Options = Options::ENABLE_TABLES
-    .union(Options::ENABLE_FOOTNOTES)
-    .union(Options::ENABLE_STRIKETHROUGH)
-    .union(Options::ENABLE_TASKLISTS)
-    .union(Options::ENABLE_SMART_PUNCTUATION)
-    .union(Options::ENABLE_HEADING_ATTRIBUTES)
-    .union(Options::ENABLE_PLUSES_DELIMITED_METADATA_BLOCKS)
-    .union(Options::ENABLE_OLD_FOOTNOTES)
-    .union(Options::ENABLE_GFM);
-
-pub fn parse_markdown(
-    text: &str,
-) -> (
-    Vec<(Range<usize>, MarkdownEvent)>,
-    HashSet<SharedString>,
-    HashSet<Arc<str>>,
-) {
-    let mut events = Vec::new();
-    let mut language_names = HashSet::default();
-    let mut language_paths = HashSet::default();
-    let mut within_link = false;
-    let mut within_metadata = false;
-    let mut parser = Parser::new_ext(text, PARSE_OPTIONS)
-        .into_offset_iter()
-        .peekable();
-    while let Some((pulldown_event, range)) = parser.next() {
-        if within_metadata {
-            if let pulldown_cmark::Event::End(pulldown_cmark::TagEnd::MetadataBlock { .. }) =
-                pulldown_event
-            {
-                within_metadata = false;
-            }
-            continue;
-        }
-        match pulldown_event {
-            pulldown_cmark::Event::Start(tag) => {
-                let tag = match tag {
-                    pulldown_cmark::Tag::Link {
-                        link_type,
-                        dest_url,
-                        title,
-                        id,
-                    } => {
-                        within_link = true;
-                        MarkdownTag::Link {
-                            link_type,
-                            dest_url: SharedString::from(dest_url.into_string()),
-                            title: SharedString::from(title.into_string()),
-                            id: SharedString::from(id.into_string()),
-                        }
-                    }
-                    pulldown_cmark::Tag::MetadataBlock(kind) => {
-                        within_metadata = true;
-                        MarkdownTag::MetadataBlock(kind)
-                    }
-                    pulldown_cmark::Tag::CodeBlock(pulldown_cmark::CodeBlockKind::Indented) => {
-                        MarkdownTag::CodeBlock {
-                            kind: CodeBlockKind::Indented,
-                            metadata: CodeBlockMetadata {
-                                content_range: range.clone(),
-                                line_count: 1,
-                            },
-                        }
-                    }
-                    pulldown_cmark::Tag::CodeBlock(pulldown_cmark::CodeBlockKind::Fenced(
-                        ref info,
-                    )) => {
-                        let content_range = extract_code_block_content_range(&text[range.clone()]);
-                        let content_range =
-                            content_range.start + range.start..content_range.end + range.start;
-
-                        // Valid to use bytes since multi-byte UTF-8 doesn't use ASCII chars.
-                        let line_count = text[content_range.clone()]
-                            .bytes()
-                            .filter(|c| *c == b'\n')
-                            .count();
-                        let metadata = CodeBlockMetadata {
-                            content_range,
-                            line_count,
-                        };
-
-                        let info = info.trim();
-                        let kind = if info.is_empty() {
-                            CodeBlockKind::Fenced
-                            // Languages should never contain a slash, and PathRanges always should.
-                            // (Models are told to specify them relative to a workspace root.)
-                        } else if info.contains('/') {
-                            let path_range = PathWithRange::new(info);
-                            language_paths.insert(path_range.path.clone());
-                            CodeBlockKind::FencedSrc(path_range)
-                        } else {
-                            let language = SharedString::from(info.to_string());
-                            language_names.insert(language.clone());
-                            CodeBlockKind::FencedLang(language)
-                        };
-
-                        MarkdownTag::CodeBlock { kind, metadata }
-                    }
-                    pulldown_cmark::Tag::Paragraph => MarkdownTag::Paragraph,
-                    pulldown_cmark::Tag::Heading {
-                        level,
-                        id,
-                        classes,
-                        attrs,
-                    } => {
-                        let id = id.map(|id| SharedString::from(id.into_string()));
-                        let classes = classes
-                            .into_iter()
-                            .map(|c| SharedString::from(c.into_string()))
-                            .collect();
-                        let attrs = attrs
-                            .into_iter()
-                            .map(|(key, value)| {
-                                (
-                                    SharedString::from(key.into_string()),
-                                    value.map(|v| SharedString::from(v.into_string())),
-                                )
-                            })
-                            .collect();
-                        MarkdownTag::Heading {
-                            level,
-                            id,
-                            classes,
-                            attrs,
-                        }
-                    }
-                    pulldown_cmark::Tag::BlockQuote(_kind) => MarkdownTag::BlockQuote,
-                    pulldown_cmark::Tag::List(start_number) => MarkdownTag::List(start_number),
-                    pulldown_cmark::Tag::Item => MarkdownTag::Item,
-                    pulldown_cmark::Tag::FootnoteDefinition(label) => {
-                        MarkdownTag::FootnoteDefinition(SharedString::from(label.to_string()))
-                    }
-                    pulldown_cmark::Tag::Table(alignments) => MarkdownTag::Table(alignments),
-                    pulldown_cmark::Tag::TableHead => MarkdownTag::TableHead,
-                    pulldown_cmark::Tag::TableRow => MarkdownTag::TableRow,
-                    pulldown_cmark::Tag::TableCell => MarkdownTag::TableCell,
-                    pulldown_cmark::Tag::Emphasis => MarkdownTag::Emphasis,
-                    pulldown_cmark::Tag::Strong => MarkdownTag::Strong,
-                    pulldown_cmark::Tag::Strikethrough => MarkdownTag::Strikethrough,
-                    pulldown_cmark::Tag::Image {
-                        link_type,
-                        dest_url,
-                        title,
-                        id,
-                    } => MarkdownTag::Image {
-                        link_type,
-                        dest_url: SharedString::from(dest_url.into_string()),
-                        title: SharedString::from(title.into_string()),
-                        id: SharedString::from(id.into_string()),
-                    },
-                    pulldown_cmark::Tag::HtmlBlock => MarkdownTag::HtmlBlock,
-                    pulldown_cmark::Tag::DefinitionList => MarkdownTag::DefinitionList,
-                    pulldown_cmark::Tag::DefinitionListTitle => MarkdownTag::DefinitionListTitle,
-                    pulldown_cmark::Tag::DefinitionListDefinition => {
-                        MarkdownTag::DefinitionListDefinition
-                    }
-                };
-                events.push((range, MarkdownEvent::Start(tag)))
-            }
-            pulldown_cmark::Event::End(tag) => {
-                if let pulldown_cmark::TagEnd::Link = tag {
-                    within_link = false;
-                }
-                events.push((range, MarkdownEvent::End(tag)));
-            }
-            pulldown_cmark::Event::Text(parsed) => {
-                fn event_for(
-                    text: &str,
-                    range: Range<usize>,
-                    str: &str,
-                ) -> (Range<usize>, MarkdownEvent) {
-                    if str == &text[range.clone()] {
-                        (range, MarkdownEvent::Text)
-                    } else {
-                        (range, MarkdownEvent::SubstitutedText(str.to_owned()))
-                    }
-                }
-                #[derive(Debug)]
-                struct TextRange<'a> {
-                    source_range: Range<usize>,
-                    merged_range: Range<usize>,
-                    parsed: CowStr<'a>,
-                }
-
-                let mut last_len = parsed.len();
-                let mut ranges = vec![TextRange {
-                    source_range: range.clone(),
-                    merged_range: 0..last_len,
-                    parsed,
-                }];
-
-                while matches!(parser.peek(), Some((pulldown_cmark::Event::Text(_), _))) {
-                    let Some((pulldown_cmark::Event::Text(next_event), next_range)) = parser.next()
-                    else {
-                        unreachable!()
-                    };
-                    let next_len = last_len + next_event.len();
-                    ranges.push(TextRange {
-                        source_range: next_range.clone(),
-                        merged_range: last_len..next_len,
-                        parsed: next_event,
-                    });
-                    last_len = next_len;
-                }
-
-                let mut merged_text =
-                    String::with_capacity(ranges.last().unwrap().merged_range.end);
-                for range in &ranges {
-                    merged_text.push_str(&range.parsed);
-                }
-
-                let mut ranges = ranges.into_iter().peekable();
-
-                if !within_link {
-                    let mut finder = LinkFinder::new();
-                    finder.kinds(&[linkify::LinkKind::Url]);
-
-                    // Find links in the merged text
-                    for link in finder.links(&merged_text) {
-                        let link_start_in_merged = link.start();
-                        let link_end_in_merged = link.end();
-
-                        while ranges
-                            .peek()
-                            .is_some_and(|range| range.merged_range.end <= link_start_in_merged)
-                        {
-                            let range = ranges.next().unwrap();
-                            events.push(event_for(text, range.source_range, &range.parsed));
-                        }
-
-                        let Some(range) = ranges.peek_mut() else {
-                            continue;
-                        };
-                        let prefix_len = link_start_in_merged - range.merged_range.start;
-                        if prefix_len > 0 {
-                            let (head, tail) = range.parsed.split_at(prefix_len);
-                            events.push(event_for(
-                                text,
-                                range.source_range.start..range.source_range.start + prefix_len,
-                                head,
-                            ));
-                            range.parsed = CowStr::Boxed(tail.into());
-                            range.merged_range.start += prefix_len;
-                            range.source_range.start += prefix_len;
-                        }
-
-                        let link_start_in_source = range.source_range.start;
-                        let mut link_end_in_source = range.source_range.end;
-                        let mut link_events = Vec::new();
-
-                        while ranges
-                            .peek()
-                            .is_some_and(|range| range.merged_range.end <= link_end_in_merged)
-                        {
-                            let range = ranges.next().unwrap();
-                            link_end_in_source = range.source_range.end;
-                            link_events.push(event_for(text, range.source_range, &range.parsed));
-                        }
-
-                        if let Some(range) = ranges.peek_mut() {
-                            let prefix_len = link_end_in_merged - range.merged_range.start;
-                            if prefix_len > 0 {
-                                let (head, tail) = range.parsed.split_at(prefix_len);
-                                link_events.push(event_for(
-                                    text,
-                                    range.source_range.start..range.source_range.start + prefix_len,
-                                    head,
-                                ));
-                                range.parsed = CowStr::Boxed(tail.into());
-                                range.merged_range.start += prefix_len;
-                                range.source_range.start += prefix_len;
-                                link_end_in_source = range.source_range.start;
-                            }
-                        }
-                        let link_range = link_start_in_source..link_end_in_source;
-
-                        events.push((
-                            link_range.clone(),
-                            MarkdownEvent::Start(MarkdownTag::Link {
-                                link_type: LinkType::Autolink,
-                                dest_url: SharedString::from(link.as_str().to_string()),
-                                title: SharedString::default(),
-                                id: SharedString::default(),
-                            }),
-                        ));
-                        events.extend(link_events);
-                        events.push((link_range.clone(), MarkdownEvent::End(MarkdownTagEnd::Link)));
-                    }
-                }
-
-                for range in ranges {
-                    events.push(event_for(text, range.source_range, &range.parsed));
-                }
-            }
-            pulldown_cmark::Event::Code(_) => {
-                let content_range = extract_code_content_range(&text[range.clone()]);
-                let content_range =
-                    content_range.start + range.start..content_range.end + range.start;
-                events.push((content_range, MarkdownEvent::Code))
-            }
-            pulldown_cmark::Event::Html(_) => events.push((range, MarkdownEvent::Html)),
-            pulldown_cmark::Event::InlineHtml(_) => events.push((range, MarkdownEvent::InlineHtml)),
-            pulldown_cmark::Event::FootnoteReference(_) => {
-                events.push((range, MarkdownEvent::FootnoteReference))
-            }
-            pulldown_cmark::Event::SoftBreak => events.push((range, MarkdownEvent::SoftBreak)),
-            pulldown_cmark::Event::HardBreak => events.push((range, MarkdownEvent::HardBreak)),
-            pulldown_cmark::Event::Rule => events.push((range, MarkdownEvent::Rule)),
-            pulldown_cmark::Event::TaskListMarker(checked) => {
-                events.push((range, MarkdownEvent::TaskListMarker(checked)))
-            }
-            pulldown_cmark::Event::InlineMath(_) | pulldown_cmark::Event::DisplayMath(_) => {}
-        }
-    }
-    (events, language_names, language_paths)
-}
-
-pub fn parse_links_only(text: &str) -> Vec<(Range<usize>, MarkdownEvent)> {
-    let mut events = Vec::new();
-    let mut finder = LinkFinder::new();
-    finder.kinds(&[linkify::LinkKind::Url]);
-    let mut text_range = Range {
-        start: 0,
-        end: text.len(),
-    };
-    for link in finder.links(text) {
-        let link_range = link.start()..link.end();
-
-        if link_range.start > text_range.start {
-            events.push((text_range.start..link_range.start, MarkdownEvent::Text));
-        }
-
-        events.push((
-            link_range.clone(),
-            MarkdownEvent::Start(MarkdownTag::Link {
-                link_type: LinkType::Autolink,
-                dest_url: SharedString::from(link.as_str().to_string()),
-                title: SharedString::default(),
-                id: SharedString::default(),
-            }),
-        ));
-        events.push((link_range.clone(), MarkdownEvent::Text));
-        events.push((link_range.clone(), MarkdownEvent::End(MarkdownTagEnd::Link)));
-
-        text_range.start = link_range.end;
-    }
-
-    if text_range.end > text_range.start {
-        events.push((text_range, MarkdownEvent::Text));
-    }
-
-    events
-}
-
-/// A static-lifetime equivalent of pulldown_cmark::Event so we can cache the
-/// parse result for rendering without resorting to unsafe lifetime coercion.
-#[derive(Clone, Debug, PartialEq)]
-pub enum MarkdownEvent {
-    /// Start of a tagged element. Events that are yielded after this event
-    /// and before its corresponding `End` event are inside this element.
-    /// Start and end events are guaranteed to be balanced.
-    Start(MarkdownTag),
-    /// End of a tagged element.
-    End(MarkdownTagEnd),
-    /// Text that uses the associated range from the markdown source.
-    Text,
-    /// Text that differs from the markdown source - typically due to substitution of HTML entities
-    /// and smart punctuation.
-    SubstitutedText(String),
-    /// An inline code node.
-    Code,
-    /// An HTML node.
-    Html,
-    /// An inline HTML node.
-    InlineHtml,
-    /// A reference to a footnote with given label, which may or may not be defined
-    /// by an event with a `Tag::FootnoteDefinition` tag. Definitions and references to them may
-    /// occur in any order.
-    FootnoteReference,
-    /// A soft line break.
-    SoftBreak,
-    /// A hard line break.
-    HardBreak,
-    /// A horizontal ruler.
-    Rule,
-    /// A task list marker, rendered as a checkbox in HTML. Contains a true when it is checked.
-    TaskListMarker(bool),
-}
-
-/// Tags for elements that can contain other elements.
-#[derive(Clone, Debug, PartialEq)]
-pub enum MarkdownTag {
-    /// A paragraph of text and other inline elements.
-    Paragraph,
-
-    /// A heading, with optional identifier, classes and custom attributes.
-    /// The identifier is prefixed with `#` and the last one in the attributes
-    /// list is chosen, classes are prefixed with `.` and custom attributes
-    /// have no prefix and can optionally have a value (`myattr` o `myattr=myvalue`).
-    Heading {
-        level: HeadingLevel,
-        id: Option<SharedString>,
-        classes: Vec<SharedString>,
-        /// The first item of the tuple is the attr and second one the value.
-        attrs: Vec<(SharedString, Option<SharedString>)>,
-    },
-
-    BlockQuote,
-
-    /// A code block.
-    CodeBlock {
-        kind: CodeBlockKind,
-        metadata: CodeBlockMetadata,
-    },
-
-    /// A HTML block.
-    HtmlBlock,
-
-    /// A list. If the list is ordered the field indicates the number of the first item.
-    /// Contains only list items.
-    List(Option<u64>), // TODO: add delim and tight for ast (not needed for html)
-
-    /// A list item.
-    Item,
-
-    /// A footnote definition. The value contained is the footnote's label by which it can
-    /// be referred to.
-    FootnoteDefinition(SharedString),
-
-    /// A table. Contains a vector describing the text-alignment for each of its columns.
-    Table(Vec<Alignment>),
-
-    /// A table header. Contains only `TableCell`s. Note that the table body starts immediately
-    /// after the closure of the `TableHead` tag. There is no `TableBody` tag.
-    TableHead,
-
-    /// A table row. Is used both for header rows as body rows. Contains only `TableCell`s.
-    TableRow,
-    TableCell,
-
-    // span-level tags
-    Emphasis,
-    Strong,
-    Strikethrough,
-
-    /// A link.
-    Link {
-        link_type: LinkType,
-        dest_url: SharedString,
-        title: SharedString,
-        /// Identifier of reference links, e.g. `world` in the link `[hello][world]`.
-        id: SharedString,
-    },
-
-    /// An image. The first field is the link type, the second the destination URL and the third is a title,
-    /// the fourth is the link identifier.
-    Image {
-        link_type: LinkType,
-        dest_url: SharedString,
-        title: SharedString,
-        /// Identifier of reference links, e.g. `world` in the link `[hello][world]`.
-        id: SharedString,
-    },
-
-    /// A metadata block.
-    MetadataBlock(MetadataBlockKind),
-
-    DefinitionList,
-    DefinitionListTitle,
-    DefinitionListDefinition,
-}
-
-#[derive(Clone, Debug, PartialEq)]
-pub enum CodeBlockKind {
-    Indented,
-    /// "Fenced" means "surrounded by triple backticks."
-    /// There can optionally be either a language after the backticks (like in traditional Markdown)
-    /// or, if an agent is specifying a path for a source location in the project, it can be a PathRange,
-    /// e.g. ```path/to/foo.rs#L123-456 instead of ```rust
-    Fenced,
-    FencedLang(SharedString),
-    FencedSrc(PathWithRange),
-}
-
-#[derive(Default, Clone, Debug, PartialEq)]
-pub struct CodeBlockMetadata {
-    pub content_range: Range<usize>,
-    pub line_count: usize,
-}
-
-fn extract_code_content_range(text: &str) -> Range<usize> {
-    let text_len = text.len();
-    if text_len == 0 {
-        return 0..0;
-    }
-
-    let start_ticks = text.chars().take_while(|&c| c == '`').count();
-
-    if start_ticks == 0 || start_ticks > text_len {
-        return 0..text_len;
-    }
-
-    let end_ticks = text.chars().rev().take_while(|&c| c == '`').count();
-
-    if end_ticks != start_ticks || text_len < start_ticks + end_ticks {
-        return 0..text_len;
-    }
-
-    start_ticks..text_len - end_ticks
-}
-
-pub(crate) fn extract_code_block_content_range(text: &str) -> Range<usize> {
-    let mut range = 0..text.len();
-    if text.starts_with("```") {
-        range.start += 3;
-
-        if let Some(newline_ix) = text[range.clone()].find('\n') {
-            range.start += newline_ix + 1;
-        }
-    }
-
-    if !range.is_empty() && text.ends_with("```") {
-        range.end -= 3;
-    }
-    if range.start > range.end {
-        range.end = range.start;
-    }
-    range
-}
-
-#[cfg(test)]
-mod tests {
-    use super::MarkdownEvent::*;
-    use super::MarkdownTag::*;
-    use super::*;
-
-    const UNWANTED_OPTIONS: Options = Options::ENABLE_YAML_STYLE_METADATA_BLOCKS
-        .union(Options::ENABLE_MATH)
-        .union(Options::ENABLE_DEFINITION_LIST);
-
-    #[test]
-    fn all_options_considered() {
-        // The purpose of this is to fail when new options are added to pulldown_cmark, so that they
-        // can be evaluated for inclusion.
-        assert_eq!(PARSE_OPTIONS.union(UNWANTED_OPTIONS), Options::all());
-    }
-
-    #[test]
-    fn wanted_and_unwanted_options_disjoint() {
-        assert_eq!(
-            PARSE_OPTIONS.intersection(UNWANTED_OPTIONS),
-            Options::empty()
-        );
-    }
-
-    #[test]
-    fn test_html_comments() {
-        assert_eq!(
-            parse_markdown("  <!--\nrdoc-file=string.c\n-->\nReturns"),
-            (
-                vec![
-                    (2..30, Start(HtmlBlock)),
-                    (2..2, SubstitutedText("  ".into())),
-                    (2..7, Html),
-                    (7..26, Html),
-                    (26..30, Html),
-                    (2..30, End(MarkdownTagEnd::HtmlBlock)),
-                    (30..37, Start(Paragraph)),
-                    (30..37, Text),
-                    (30..37, End(MarkdownTagEnd::Paragraph))
-                ],
-                HashSet::default(),
-                HashSet::default()
-            )
-        )
-    }
-
-    #[test]
-    fn test_plain_urls_and_escaped_text() {
-        assert_eq!(
-            parse_markdown("&nbsp;&nbsp; https://some.url some \\`&#9658;\\` text"),
-            (
-                vec![
-                    (0..51, Start(Paragraph)),
-                    (0..6, SubstitutedText("\u{a0}".into())),
-                    (6..12, SubstitutedText("\u{a0}".into())),
-                    (12..13, Text),
-                    (
-                        13..29,
-                        Start(Link {
-                            link_type: LinkType::Autolink,
-                            dest_url: "https://some.url".into(),
-                            title: "".into(),
-                            id: "".into(),
-                        })
-                    ),
-                    (13..29, Text),
-                    (13..29, End(MarkdownTagEnd::Link)),
-                    (29..35, Text),
-                    (36..37, Text), // Escaped backtick
-                    (37..44, SubstitutedText("►".into())),
-                    (45..46, Text), // Escaped backtick
-                    (46..51, Text),
-                    (0..51, End(MarkdownTagEnd::Paragraph))
-                ],
-                HashSet::default(),
-                HashSet::default()
-            )
-        );
-    }
-
-    #[test]
-    fn test_incomplete_link() {
-        assert_eq!(
-            parse_markdown("You can use the [GitHub Search API](https://docs.github.com/en").0,
-            vec![
-                (0..62, Start(Paragraph)),
-                (0..16, Text),
-                (16..17, Text),
-                (17..34, Text),
-                (34..35, Text),
-                (35..36, Text),
-                (
-                    36..62,
-                    Start(Link {
-                        link_type: LinkType::Autolink,
-                        dest_url: "https://docs.github.com/en".into(),
-                        title: "".into(),
-                        id: "".into()
-                    })
-                ),
-                (36..62, Text),
-                (36..62, End(MarkdownTagEnd::Link)),
-                (0..62, End(MarkdownTagEnd::Paragraph))
-            ],
-        );
-    }
-
-    #[test]
-    fn test_smart_punctuation() {
-        assert_eq!(
-            parse_markdown("-- --- ... \"double quoted\" 'single quoted' ----------"),
-            (
-                vec![
-                    (0..53, Start(Paragraph)),
-                    (0..2, SubstitutedText("–".into())),
-                    (2..3, Text),
-                    (3..6, SubstitutedText("—".into())),
-                    (6..7, Text),
-                    (7..10, SubstitutedText("…".into())),
-                    (10..11, Text),
-                    (11..12, SubstitutedText("“".into())),
-                    (12..25, Text),
-                    (25..26, SubstitutedText("”".into())),
-                    (26..27, Text),
-                    (27..28, SubstitutedText("‘".into())),
-                    (28..41, Text),
-                    (41..42, SubstitutedText("’".into())),
-                    (42..43, Text),
-                    (43..53, SubstitutedText("–––––".into())),
-                    (0..53, End(MarkdownTagEnd::Paragraph))
-                ],
-                HashSet::default(),
-                HashSet::default()
-            )
-        )
-    }
-
-    #[test]
-    fn test_code_block_metadata() {
-        assert_eq!(
-            parse_markdown("```rust\nfn main() {\n let a = 1;\n}\n```"),
-            (
-                vec![
-                    (
-                        0..37,
-                        Start(CodeBlock {
-                            kind: CodeBlockKind::FencedLang("rust".into()),
-                            metadata: CodeBlockMetadata {
-                                content_range: 8..34,
-                                line_count: 3
-                            }
-                        })
-                    ),
-                    (8..34, Text),
-                    (0..37, End(MarkdownTagEnd::CodeBlock)),
-                ],
-                {
-                    let mut h = HashSet::default();
-                    h.insert("rust".into());
-                    h
-                },
-                HashSet::default()
-            )
-        );
-        assert_eq!(
-            parse_markdown("    fn main() {}"),
-            (
-                vec![
-                    (
-                        4..16,
-                        Start(CodeBlock {
-                            kind: CodeBlockKind::Indented,
-                            metadata: CodeBlockMetadata {
-                                content_range: 4..16,
-                                line_count: 1
-                            }
-                        })
-                    ),
-                    (4..16, Text),
-                    (4..16, End(MarkdownTagEnd::CodeBlock))
-                ],
-                HashSet::default(),
-                HashSet::default()
-            )
-        );
-    }
-
-    #[test]
-    fn test_extract_code_content_range() {
-        let input = "```let x = 5;```";
-        assert_eq!(extract_code_content_range(input), 3..13);
-
-        let input = "``let x = 5;``";
-        assert_eq!(extract_code_content_range(input), 2..12);
-
-        let input = "`let x = 5;`";
-        assert_eq!(extract_code_content_range(input), 1..11);
-
-        let input = "plain text";
-        assert_eq!(extract_code_content_range(input), 0..10);
-
-        let input = "``let x = 5;`";
-        assert_eq!(extract_code_content_range(input), 0..13);
-    }
-
-    #[test]
-    fn test_extract_code_block_content_range() {
-        let input = "```rust\nlet x = 5;\n```";
-        assert_eq!(extract_code_block_content_range(input), 8..19);
-
-        let input = "plain text";
-        assert_eq!(extract_code_block_content_range(input), 0..10);
-
-        let input = "```python\nprint('hello')\nprint('world')\n```";
-        assert_eq!(extract_code_block_content_range(input), 10..40);
-
-        // Malformed input
-        let input = "`````";
-        assert_eq!(extract_code_block_content_range(input), 3..3);
-    }
-
-    #[test]
-    fn test_links_split_across_fragments() {
-        // This test verifies that links split across multiple text fragments due to escaping or other issues
-        // are correctly detected and processed
-        // Note: In real usage, pulldown_cmark creates separate text events for the escaped character
-        // We're verifying our parser can handle this correctly
-        assert_eq!(
-            parse_markdown("https:/\\/example.com is equivalent to https://example&#46;com!").0,
-            vec![
-                (0..62, Start(Paragraph)),
-                (
-                    0..20,
-                    Start(Link {
-                        link_type: LinkType::Autolink,
-                        dest_url: "https://example.com".into(),
-                        title: "".into(),
-                        id: "".into()
-                    })
-                ),
-                (0..7, Text),
-                (8..20, Text),
-                (0..20, End(MarkdownTagEnd::Link)),
-                (20..38, Text),
-                (
-                    38..61,
-                    Start(Link {
-                        link_type: LinkType::Autolink,
-                        dest_url: "https://example.com".into(),
-                        title: "".into(),
-                        id: "".into()
-                    })
-                ),
-                (38..53, Text),
-                (53..58, SubstitutedText(".".into())),
-                (58..61, Text),
-                (38..61, End(MarkdownTagEnd::Link)),
-                (61..62, Text),
-                (0..62, End(MarkdownTagEnd::Paragraph))
-            ],
-        );
-
-        assert_eq!(
-            parse_markdown("Visit https://example.com/cat\\/é&#8205;☕ for coffee!").0,
-            [
-                (0..55, Start(Paragraph)),
-                (0..6, Text),
-                (
-                    6..43,
-                    Start(Link {
-                        link_type: LinkType::Autolink,
-                        dest_url: "https://example.com/cat/é\u{200d}☕".into(),
-                        title: "".into(),
-                        id: "".into()
-                    })
-                ),
-                (6..29, Text),
-                (30..33, Text),
-                (33..40, SubstitutedText("\u{200d}".into())),
-                (40..43, Text),
-                (6..43, End(MarkdownTagEnd::Link)),
-                (43..55, Text),
-                (0..55, End(MarkdownTagEnd::Paragraph))
-            ]
-        );
-    }
-}
diff --git a/crates/markdown/src/path_range.rs b/crates/markdown/src/path_range.rs
deleted file mode 100644
index f98325c9b5..0000000000
--- a/crates/markdown/src/path_range.rs
+++ /dev/null
@@ -1,245 +0,0 @@
-use std::{ops::Range, sync::Arc};
-
-#[derive(Debug, Clone, PartialEq)]
-pub struct PathWithRange {
-    pub path: Arc<str>,
-    pub range: Option<Range<LineCol>>,
-}
-
-#[derive(Clone, Copy, PartialEq, Eq)]
-pub struct LineCol {
-    pub line: u32,
-    pub col: Option<u32>,
-}
-
-impl std::fmt::Debug for LineCol {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self.col {
-            Some(col) => write!(f, "L{}:{}", self.line, col),
-            None => write!(f, "L{}", self.line),
-        }
-    }
-}
-
-impl LineCol {
-    pub fn new(str: impl AsRef<str>) -> Option<Self> {
-        let str = str.as_ref();
-        match str.split_once(':') {
-            Some((line, col)) => match (line.parse::<u32>(), col.parse::<u32>()) {
-                (Ok(line), Ok(col)) => Some(Self {
-                    line,
-                    col: Some(col),
-                }),
-                _ => None,
-            },
-            None => match str.parse::<u32>() {
-                Ok(line) => Some(Self { line, col: None }),
-                Err(_) => None,
-            },
-        }
-    }
-}
-
-impl PathWithRange {
-    // Note: We could try out this as an alternative, and see how it does on evals.
-    //
-    // The closest to a standard way of including a filename is this:
-    // ```rust filename="path/to/file.rs#42:43"
-    // ```
-    //
-    // or, alternatively,
-    // ```rust filename="path/to/file.rs" lines="42:43"
-    // ```
-    //
-    // Examples where it's used this way:
-    // - https://mdxjs.com/guides/syntax-highlighting/#syntax-highlighting-with-the-meta-field
-    // - https://docusaurus.io/docs/markdown-features/code-blocks
-    // - https://spec.commonmark.org/0.31.2/#example-143
-    pub fn new(str: impl AsRef<str>) -> Self {
-        let str = str.as_ref();
-        // Sometimes the model will include a language at the start,
-        // e.g. "```rust zed/crates/markdown/src/markdown.rs#L1"
-        // We just discard that.
-        let str = match str.trim_end().rfind(' ') {
-            Some(space) => &str[space + 1..],
-            None => str.trim_start(),
-        };
-
-        match str.rsplit_once('#') {
-            Some((path, after_hash)) => {
-                // Be tolerant to the model omitting the "L" prefix, lowercasing it,
-                // or including it more than once.
-                let after_hash = after_hash.replace(['L', 'l'], "");
-
-                let range = {
-                    let mut iter = after_hash.split('-').flat_map(LineCol::new);
-                    iter.next()
-                        .map(|start| iter.next().map(|end| start..end).unwrap_or(start..start))
-                };
-
-                Self {
-                    path: path.into(),
-                    range,
-                }
-            }
-            None => Self {
-                path: str.into(),
-                range: None,
-            },
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_linecol_parsing() {
-        let line_col = LineCol::new("10:5");
-        assert_eq!(
-            line_col,
-            Some(LineCol {
-                line: 10,
-                col: Some(5)
-            })
-        );
-
-        let line_only = LineCol::new("42");
-        assert_eq!(
-            line_only,
-            Some(LineCol {
-                line: 42,
-                col: None
-            })
-        );
-
-        assert_eq!(LineCol::new(""), None);
-        assert_eq!(LineCol::new("not a number"), None);
-        assert_eq!(LineCol::new("10:not a number"), None);
-        assert_eq!(LineCol::new("not:5"), None);
-    }
-
-    #[test]
-    fn test_pathrange_parsing() {
-        let path_range = PathWithRange::new("file.rs#L10-L20");
-        assert_eq!(path_range.path.as_ref(), "file.rs");
-        assert!(path_range.range.is_some());
-        if let Some(range) = path_range.range {
-            assert_eq!(range.start.line, 10);
-            assert_eq!(range.start.col, None);
-            assert_eq!(range.end.line, 20);
-            assert_eq!(range.end.col, None);
-        }
-
-        let single_line = PathWithRange::new("file.rs#L15");
-        assert_eq!(single_line.path.as_ref(), "file.rs");
-        assert!(single_line.range.is_some());
-        if let Some(range) = single_line.range {
-            assert_eq!(range.start.line, 15);
-            assert_eq!(range.end.line, 15);
-        }
-
-        let no_range = PathWithRange::new("file.rs");
-        assert_eq!(no_range.path.as_ref(), "file.rs");
-        assert!(no_range.range.is_none());
-
-        let lowercase = PathWithRange::new("file.rs#l5-l10");
-        assert_eq!(lowercase.path.as_ref(), "file.rs");
-        assert!(lowercase.range.is_some());
-        if let Some(range) = lowercase.range {
-            assert_eq!(range.start.line, 5);
-            assert_eq!(range.end.line, 10);
-        }
-
-        let complex = PathWithRange::new("src/path/to/file.rs#L100");
-        assert_eq!(complex.path.as_ref(), "src/path/to/file.rs");
-        assert!(complex.range.is_some());
-    }
-
-    #[test]
-    fn test_pathrange_from_str() {
-        let with_range = PathWithRange::new("file.rs#L10-L20");
-        assert!(with_range.range.is_some());
-        assert_eq!(with_range.path.as_ref(), "file.rs");
-
-        let without_range = PathWithRange::new("file.rs");
-        assert!(without_range.range.is_none());
-
-        let single_line = PathWithRange::new("file.rs#L15");
-        assert!(single_line.range.is_some());
-    }
-
-    #[test]
-    fn test_pathrange_leading_text_trimming() {
-        let with_language = PathWithRange::new("```rust file.rs#L10");
-        assert_eq!(with_language.path.as_ref(), "file.rs");
-        assert!(with_language.range.is_some());
-        if let Some(range) = with_language.range {
-            assert_eq!(range.start.line, 10);
-        }
-
-        let with_spaces = PathWithRange::new("```    file.rs#L10-L20");
-        assert_eq!(with_spaces.path.as_ref(), "file.rs");
-        assert!(with_spaces.range.is_some());
-
-        let with_words = PathWithRange::new("```rust code example file.rs#L15:10");
-        assert_eq!(with_words.path.as_ref(), "file.rs");
-        assert!(with_words.range.is_some());
-        if let Some(range) = with_words.range {
-            assert_eq!(range.start.line, 15);
-            assert_eq!(range.start.col, Some(10));
-        }
-
-        let with_whitespace = PathWithRange::new("  file.rs#L5");
-        assert_eq!(with_whitespace.path.as_ref(), "file.rs");
-        assert!(with_whitespace.range.is_some());
-
-        let no_leading = PathWithRange::new("file.rs#L10");
-        assert_eq!(no_leading.path.as_ref(), "file.rs");
-        assert!(no_leading.range.is_some());
-    }
-
-    #[test]
-    fn test_pathrange_with_line_and_column() {
-        let line_and_col = PathWithRange::new("file.rs#L10:5");
-        assert_eq!(line_and_col.path.as_ref(), "file.rs");
-        assert!(line_and_col.range.is_some());
-        if let Some(range) = line_and_col.range {
-            assert_eq!(range.start.line, 10);
-            assert_eq!(range.start.col, Some(5));
-            assert_eq!(range.end.line, 10);
-            assert_eq!(range.end.col, Some(5));
-        }
-
-        let full_range = PathWithRange::new("file.rs#L10:5-L20:15");
-        assert_eq!(full_range.path.as_ref(), "file.rs");
-        assert!(full_range.range.is_some());
-        if let Some(range) = full_range.range {
-            assert_eq!(range.start.line, 10);
-            assert_eq!(range.start.col, Some(5));
-            assert_eq!(range.end.line, 20);
-            assert_eq!(range.end.col, Some(15));
-        }
-
-        let mixed_range1 = PathWithRange::new("file.rs#L10:5-L20");
-        assert_eq!(mixed_range1.path.as_ref(), "file.rs");
-        assert!(mixed_range1.range.is_some());
-        if let Some(range) = mixed_range1.range {
-            assert_eq!(range.start.line, 10);
-            assert_eq!(range.start.col, Some(5));
-            assert_eq!(range.end.line, 20);
-            assert_eq!(range.end.col, None);
-        }
-
-        let mixed_range2 = PathWithRange::new("file.rs#L10-L20:15");
-        assert_eq!(mixed_range2.path.as_ref(), "file.rs");
-        assert!(mixed_range2.range.is_some());
-        if let Some(range) = mixed_range2.range {
-            assert_eq!(range.start.line, 10);
-            assert_eq!(range.start.col, None);
-            assert_eq!(range.end.line, 20);
-            assert_eq!(range.end.col, Some(15));
-        }
-    }
-}
diff --git a/crates/markdown_preview/Cargo.toml b/crates/markdown_preview/Cargo.toml
deleted file mode 100644
index d61ec00cc8..0000000000
--- a/crates/markdown_preview/Cargo.toml
+++ /dev/null
@@ -1,40 +0,0 @@
-[package]
-name = "markdown_preview"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/markdown_preview.rs"
-
-[features]
-test-support = []
-
-[dependencies]
-anyhow.workspace = true
-async-recursion.workspace = true
-collections.workspace = true
-editor.workspace = true
-fs.workspace = true
-gpui.workspace = true
-html5ever.workspace = true
-language.workspace = true
-linkify.workspace = true
-log.workspace = true
-markup5ever_rcdom.workspace = true
-pretty_assertions.workspace = true
-pulldown-cmark.workspace = true
-settings.workspace = true
-theme.workspace = true
-ui.workspace = true
-urlencoding.workspace = true
-util.workspace = true
-workspace.workspace = true
-
-[dev-dependencies]
-editor = { workspace = true, features = ["test-support"] }
-language = { workspace = true, features = ["test-support"] }
diff --git a/crates/markdown_preview/LICENSE-GPL b/crates/markdown_preview/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/markdown_preview/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/markdown_preview/src/markdown_elements.rs b/crates/markdown_preview/src/markdown_elements.rs
deleted file mode 100644
index 23e0a69b6a..0000000000
--- a/crates/markdown_preview/src/markdown_elements.rs
+++ /dev/null
@@ -1,358 +0,0 @@
-use gpui::{
-    DefiniteLength, FontStyle, FontWeight, HighlightStyle, SharedString, StrikethroughStyle,
-    UnderlineStyle, px,
-};
-use language::HighlightId;
-use std::{fmt::Display, ops::Range, path::PathBuf};
-use urlencoding;
-
-#[derive(Debug)]
-#[cfg_attr(test, derive(PartialEq))]
-pub enum ParsedMarkdownElement {
-    Heading(ParsedMarkdownHeading),
-    ListItem(ParsedMarkdownListItem),
-    Table(ParsedMarkdownTable),
-    BlockQuote(ParsedMarkdownBlockQuote),
-    CodeBlock(ParsedMarkdownCodeBlock),
-    /// A paragraph of text and other inline elements.
-    Paragraph(MarkdownParagraph),
-    HorizontalRule(Range<usize>),
-    Image(Image),
-}
-
-impl ParsedMarkdownElement {
-    pub fn source_range(&self) -> Option<Range<usize>> {
-        Some(match self {
-            Self::Heading(heading) => heading.source_range.clone(),
-            Self::ListItem(list_item) => list_item.source_range.clone(),
-            Self::Table(table) => table.source_range.clone(),
-            Self::BlockQuote(block_quote) => block_quote.source_range.clone(),
-            Self::CodeBlock(code_block) => code_block.source_range.clone(),
-            Self::Paragraph(text) => match text.get(0)? {
-                MarkdownParagraphChunk::Text(t) => t.source_range.clone(),
-                MarkdownParagraphChunk::Image(image) => image.source_range.clone(),
-            },
-            Self::HorizontalRule(range) => range.clone(),
-            Self::Image(image) => image.source_range.clone(),
-        })
-    }
-
-    pub fn is_list_item(&self) -> bool {
-        matches!(self, Self::ListItem(_))
-    }
-}
-
-pub type MarkdownParagraph = Vec<MarkdownParagraphChunk>;
-
-#[derive(Debug)]
-#[cfg_attr(test, derive(PartialEq))]
-pub enum MarkdownParagraphChunk {
-    Text(ParsedMarkdownText),
-    Image(Image),
-}
-
-#[derive(Debug)]
-#[cfg_attr(test, derive(PartialEq))]
-pub struct ParsedMarkdown {
-    pub children: Vec<ParsedMarkdownElement>,
-}
-
-#[derive(Debug)]
-#[cfg_attr(test, derive(PartialEq))]
-pub struct ParsedMarkdownListItem {
-    pub source_range: Range<usize>,
-    /// How many indentations deep this item is.
-    pub depth: u16,
-    pub item_type: ParsedMarkdownListItemType,
-    pub content: Vec<ParsedMarkdownElement>,
-    /// Whether we can expect nested list items inside of this items `content`.
-    pub nested: bool,
-}
-
-#[derive(Debug)]
-#[cfg_attr(test, derive(PartialEq))]
-pub enum ParsedMarkdownListItemType {
-    Ordered(u64),
-    Task(bool, Range<usize>),
-    Unordered,
-}
-
-#[derive(Debug)]
-#[cfg_attr(test, derive(PartialEq))]
-pub struct ParsedMarkdownCodeBlock {
-    pub source_range: Range<usize>,
-    pub language: Option<String>,
-    pub contents: SharedString,
-    pub highlights: Option<Vec<(Range<usize>, HighlightId)>>,
-}
-
-#[derive(Debug)]
-#[cfg_attr(test, derive(PartialEq))]
-pub struct ParsedMarkdownHeading {
-    pub source_range: Range<usize>,
-    pub level: HeadingLevel,
-    pub contents: MarkdownParagraph,
-}
-
-#[derive(Debug, PartialEq)]
-pub enum HeadingLevel {
-    H1,
-    H2,
-    H3,
-    H4,
-    H5,
-    H6,
-}
-
-#[derive(Debug)]
-pub struct ParsedMarkdownTable {
-    pub source_range: Range<usize>,
-    pub header: Vec<ParsedMarkdownTableRow>,
-    pub body: Vec<ParsedMarkdownTableRow>,
-    pub caption: Option<MarkdownParagraph>,
-}
-
-#[derive(Debug, Clone, Copy, Default)]
-#[cfg_attr(test, derive(PartialEq))]
-pub enum ParsedMarkdownTableAlignment {
-    #[default]
-    None,
-    Left,
-    Center,
-    Right,
-}
-
-#[derive(Debug)]
-#[cfg_attr(test, derive(PartialEq))]
-pub struct ParsedMarkdownTableColumn {
-    pub col_span: usize,
-    pub row_span: usize,
-    pub is_header: bool,
-    pub children: MarkdownParagraph,
-    pub alignment: ParsedMarkdownTableAlignment,
-}
-
-#[derive(Debug)]
-#[cfg_attr(test, derive(PartialEq))]
-pub struct ParsedMarkdownTableRow {
-    pub columns: Vec<ParsedMarkdownTableColumn>,
-}
-
-impl Default for ParsedMarkdownTableRow {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl ParsedMarkdownTableRow {
-    pub fn new() -> Self {
-        Self {
-            columns: Vec::new(),
-        }
-    }
-
-    pub fn with_columns(columns: Vec<ParsedMarkdownTableColumn>) -> Self {
-        Self { columns }
-    }
-}
-
-#[derive(Debug)]
-#[cfg_attr(test, derive(PartialEq))]
-pub struct ParsedMarkdownBlockQuote {
-    pub source_range: Range<usize>,
-    pub children: Vec<ParsedMarkdownElement>,
-}
-
-#[derive(Debug, Clone)]
-pub struct ParsedMarkdownText {
-    /// Where the text is located in the source Markdown document.
-    pub source_range: Range<usize>,
-    /// The text content stripped of any formatting symbols.
-    pub contents: SharedString,
-    /// The list of highlights contained in the Markdown document.
-    pub highlights: Vec<(Range<usize>, MarkdownHighlight)>,
-    /// The regions of the Markdown document.
-    pub regions: Vec<(Range<usize>, ParsedRegion)>,
-}
-
-/// A run of highlighted Markdown text.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum MarkdownHighlight {
-    /// A styled Markdown highlight.
-    Style(MarkdownHighlightStyle),
-    /// A highlighted code block.
-    Code(HighlightId),
-}
-
-impl MarkdownHighlight {
-    /// Converts this [`MarkdownHighlight`] to a [`HighlightStyle`].
-    pub fn to_highlight_style(&self, theme: &theme::SyntaxTheme) -> Option<HighlightStyle> {
-        match self {
-            MarkdownHighlight::Style(style) => {
-                let mut highlight = HighlightStyle::default();
-
-                if style.italic {
-                    highlight.font_style = Some(FontStyle::Italic);
-                }
-
-                if style.underline {
-                    highlight.underline = Some(UnderlineStyle {
-                        thickness: px(1.),
-                        ..Default::default()
-                    });
-                }
-
-                if style.strikethrough {
-                    highlight.strikethrough = Some(StrikethroughStyle {
-                        thickness: px(1.),
-                        ..Default::default()
-                    });
-                }
-
-                if style.weight != FontWeight::default() {
-                    highlight.font_weight = Some(style.weight);
-                }
-
-                if style.link {
-                    highlight.underline = Some(UnderlineStyle {
-                        thickness: px(1.),
-                        ..Default::default()
-                    });
-                }
-
-                if style.oblique {
-                    highlight.font_style = Some(FontStyle::Oblique)
-                }
-
-                Some(highlight)
-            }
-
-            MarkdownHighlight::Code(id) => id.style(theme),
-        }
-    }
-}
-
-/// The style for a Markdown highlight.
-#[derive(Debug, Clone, Default, PartialEq, Eq)]
-pub struct MarkdownHighlightStyle {
-    /// Whether the text should be italicized.
-    pub italic: bool,
-    /// Whether the text should be underlined.
-    pub underline: bool,
-    /// Whether the text should be struck through.
-    pub strikethrough: bool,
-    /// The weight of the text.
-    pub weight: FontWeight,
-    /// Whether the text should be stylized as link.
-    pub link: bool,
-    // Whether the text should be obliqued.
-    pub oblique: bool,
-}
-
-/// A parsed region in a Markdown document.
-#[derive(Debug, Clone)]
-#[cfg_attr(test, derive(PartialEq))]
-pub struct ParsedRegion {
-    /// Whether the region is a code block.
-    pub code: bool,
-    /// The link contained in this region, if it has one.
-    pub link: Option<Link>,
-}
-
-/// A Markdown link.
-#[derive(Debug, Clone)]
-#[cfg_attr(test, derive(PartialEq))]
-pub enum Link {
-    /// A link to a webpage.
-    Web {
-        /// The URL of the webpage.
-        url: String,
-    },
-    /// A link to a path on the filesystem.
-    Path {
-        /// The path as provided in the Markdown document.
-        display_path: PathBuf,
-        /// The absolute path to the item.
-        path: PathBuf,
-    },
-}
-
-impl Link {
-    pub fn identify(file_location_directory: Option<PathBuf>, text: String) -> Option<Link> {
-        if text.starts_with("http") {
-            return Some(Link::Web { url: text });
-        }
-
-        // URL decode the text to handle spaces and other special characters
-        let decoded_text = urlencoding::decode(&text)
-            .map(|s| s.into_owned())
-            .unwrap_or(text);
-
-        let path = PathBuf::from(&decoded_text);
-        if path.is_absolute() && path.exists() {
-            return Some(Link::Path {
-                display_path: path.clone(),
-                path,
-            });
-        }
-
-        if let Some(file_location_directory) = file_location_directory {
-            let display_path = path;
-            let path = file_location_directory.join(decoded_text);
-            if path.exists() {
-                return Some(Link::Path { display_path, path });
-            }
-        }
-
-        None
-    }
-}
-
-impl Display for Link {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Link::Web { url } => write!(f, "{}", url),
-            Link::Path { display_path, .. } => write!(f, "{}", display_path.display()),
-        }
-    }
-}
-
-/// A Markdown Image
-#[derive(Debug, Clone)]
-#[cfg_attr(test, derive(PartialEq))]
-pub struct Image {
-    pub link: Link,
-    pub source_range: Range<usize>,
-    pub alt_text: Option<SharedString>,
-    pub width: Option<DefiniteLength>,
-    pub height: Option<DefiniteLength>,
-}
-
-impl Image {
-    pub fn identify(
-        text: String,
-        source_range: Range<usize>,
-        file_location_directory: Option<PathBuf>,
-    ) -> Option<Self> {
-        let link = Link::identify(file_location_directory, text)?;
-        Some(Self {
-            source_range,
-            link,
-            alt_text: None,
-            width: None,
-            height: None,
-        })
-    }
-
-    pub fn set_alt_text(&mut self, alt_text: SharedString) {
-        self.alt_text = Some(alt_text);
-    }
-
-    pub fn set_width(&mut self, width: DefiniteLength) {
-        self.width = Some(width);
-    }
-
-    pub fn set_height(&mut self, height: DefiniteLength) {
-        self.height = Some(height);
-    }
-}
diff --git a/crates/markdown_preview/src/markdown_minifier.rs b/crates/markdown_preview/src/markdown_minifier.rs
deleted file mode 100644
index a7d5ad0be0..0000000000
--- a/crates/markdown_preview/src/markdown_minifier.rs
+++ /dev/null
@@ -1,829 +0,0 @@
-use html5ever::{
-    Attribute, ParseOpts, QualName, parse_document,
-    tendril::{Tendril, TendrilSink, fmt::UTF8},
-};
-use markup5ever_rcdom::{Node, NodeData, RcDom};
-use std::{cell::RefCell, io, rc::Rc, str};
-
-#[derive(Default)]
-pub(crate) struct MinifierOptions {
-    pub omit_doctype: bool,
-    pub preserve_comments: bool,
-    pub collapse_whitespace: bool,
-}
-
-pub(crate) struct Minifier<'a, W: io::Write> {
-    w: &'a mut W,
-    options: MinifierOptions,
-    preceding_whitespace: bool,
-}
-
-impl<'a, W> Minifier<'a, W>
-where
-    W: io::Write,
-{
-    /// Creates a new `Minifier` instance.
-    #[inline]
-    pub fn new(w: &'a mut W, options: MinifierOptions) -> Self {
-        Self {
-            w,
-            options,
-            preceding_whitespace: false,
-        }
-    }
-
-    /// Minifies the given reader input.
-    ///
-    /// # Errors
-    ///
-    /// Will return `Err` if unable to write to the output writer.
-    #[inline]
-    pub fn minify<R: io::Read>(&mut self, mut r: &mut R) -> io::Result<()> {
-        let dom = parse_document(RcDom::default(), ParseOpts::default())
-            .from_utf8()
-            .read_from(&mut r)?;
-
-        if !self.options.omit_doctype {
-            self.w.write_all(b"<!doctype html>")?;
-        }
-
-        self.minify_node(&None, &dom.document)
-    }
-
-    fn minify_node<'b>(&mut self, ctx: &'b Option<Context>, node: &'b Node) -> io::Result<()> {
-        match &node.data {
-            NodeData::Text { contents } => {
-                // Check if whitespace collapsing disabled
-                let contents = contents.borrow();
-                let contents = contents.as_ref();
-
-                if !self.options.collapse_whitespace {
-                    return self.w.write_all(contents.as_bytes());
-                }
-
-                // Check if parent is whitespace preserving element or contains code (<script>, <style>)
-                let (skip_collapse_whitespace, contains_code) =
-                    ctx.as_ref().map_or((false, false), |ctx| {
-                        if let NodeData::Element { name, .. } = &ctx.parent.data {
-                            let name = name.local.as_ref();
-
-                            (preserve_whitespace(name), contains_code(name))
-                        } else {
-                            (false, false)
-                        }
-                    });
-
-                if skip_collapse_whitespace {
-                    return self.w.write_all(contents.as_bytes());
-                }
-
-                if contains_code {
-                    return self
-                        .w
-                        .write_all(contents.trim_matches(is_ascii_whitespace).as_bytes());
-                }
-
-                // Early exit if empty to forego expensive trim logic
-                if contents.is_empty() {
-                    return io::Result::Ok(());
-                }
-
-                let (trim_left, trim_right) = ctx
-                    .as_ref()
-                    .map_or((true, true), |ctx| ctx.trim(self.preceding_whitespace));
-                let contents = match (trim_left, trim_right) {
-                    (true, true) => contents.trim_matches(is_ascii_whitespace),
-                    (true, false) => contents.trim_start_matches(is_ascii_whitespace),
-                    (false, true) => contents.trim_end_matches(is_ascii_whitespace),
-                    _ => contents,
-                };
-
-                // Second empty check after trimming whitespace
-                if !contents.is_empty() {
-                    // replace \n, \r to ' '
-                    let contents = contents
-                        .bytes()
-                        .map(|c| if matches!(c, b'\n' | b'\r') { b' ' } else { c })
-                        .collect::<Vec<u8>>();
-
-                    self.write_collapse_whitespace(&contents, reserved_entity, None)?;
-
-                    self.preceding_whitespace = !trim_right
-                        && contents
-                            .iter()
-                            .last()
-                            .map_or(false, u8::is_ascii_whitespace);
-                }
-
-                Ok(())
-            }
-
-            NodeData::Comment { contents } if self.options.preserve_comments => {
-                self.w.write_all(b"<!--")?;
-                self.w.write_all(contents.as_bytes())?;
-                self.w.write_all(b"-->")
-            }
-
-            NodeData::Document => self.minify_children(ctx, node),
-
-            NodeData::Element { name, attrs, .. } => {
-                let attrs = attrs.borrow();
-                let tag = name.local.as_ref();
-
-                if is_self_closing(tag) {
-                    return self.write_start_tag(name, &attrs);
-                }
-
-                let (omit_start_tag, omit_end_tag) =
-                    self.omit_tags(ctx, node, tag, attrs.is_empty());
-
-                if !omit_start_tag {
-                    self.write_start_tag(name, &attrs)?;
-                }
-
-                self.minify_children(ctx, node)?;
-
-                if !omit_end_tag {
-                    self.write_end_tag(name)?;
-                }
-
-                Ok(())
-            }
-
-            _ => Ok(()),
-        }
-    }
-
-    fn next_is_comment<'b, I>(&self, v: I) -> bool
-    where
-        I: IntoIterator<Item = &'b Rc<Node>>,
-    {
-        v.into_iter()
-            .find_map(|node| match &node.data {
-                NodeData::Text { contents } => {
-                    if self.options.collapse_whitespace && is_whitespace(contents) {
-                        // Blocks of whitespace are skipped
-                        None
-                    } else {
-                        Some(false)
-                    }
-                }
-                NodeData::Comment { .. } => Some(self.options.preserve_comments),
-                _ => Some(false),
-            })
-            .unwrap_or(false)
-    }
-
-    fn is_whitespace(&self, s: &RefCell<Tendril<UTF8>>) -> Option<bool> {
-        if self.options.collapse_whitespace && is_whitespace(s) {
-            None
-        } else {
-            Some(
-                !s.borrow()
-                    .as_bytes()
-                    .iter()
-                    .next()
-                    .map_or(false, u8::is_ascii_whitespace),
-            )
-        }
-    }
-
-    /// Determines if start and end tags can be omitted.
-    /// Whitespace rules are ignored if `collapse_whitespace` is enabled.
-    #[allow(clippy::too_many_lines)]
-    fn omit_tags(
-        &self,
-        ctx: &Option<Context>,
-        node: &Node,
-        name: &str,
-        empty_attributes: bool,
-    ) -> (bool, bool) {
-        ctx.as_ref().map_or((false, false), |ctx| match name {
-            "html" => {
-                // The end tag may be omitted if the <html> element is not immediately followed by a comment.
-                let omit_end = ctx.right.map_or(true, |right| !self.next_is_comment(right));
-                // The start tag may be omitted if the first thing inside the <html> element is not a comment.
-                let omit_start =
-                    empty_attributes && omit_end && !self.next_is_comment(&*node.children.borrow());
-
-                (omit_start, omit_end)
-            }
-            "head" => {
-                // The end tag may be omitted if the first thing following the <head> element is not a space character or a comment.
-                let omit_end = ctx.right.map_or(true, |right| {
-                    right
-                        .iter()
-                        .find_map(|node| match &node.data {
-                            NodeData::Text { contents } => self.is_whitespace(contents),
-                            NodeData::Comment { .. } => {
-                                if self.options.preserve_comments {
-                                    Some(false)
-                                } else {
-                                    None
-                                }
-                            }
-                            _ => Some(true),
-                        })
-                        .unwrap_or(true)
-                });
-                // The start tag may be omitted if the first thing inside the <head> element is an element.
-                let omit_start = empty_attributes
-                    && omit_end
-                    && node
-                        .children
-                        .borrow()
-                        .iter()
-                        .find_map(|node| match &node.data {
-                            NodeData::Text { contents } => self.is_whitespace(contents),
-                            NodeData::Element { .. } => Some(true),
-                            NodeData::Comment { .. } => {
-                                if self.options.preserve_comments {
-                                    Some(false)
-                                } else {
-                                    None
-                                }
-                            }
-                            _ => Some(false),
-                        })
-                        .unwrap_or(true);
-
-                (omit_start, omit_end)
-            }
-            "body" => {
-                // The start tag may be omitted if the first thing inside it is not a space character, comment, <script> element or <style> element.
-                let omit_start = empty_attributes
-                    && node
-                        .children
-                        .borrow()
-                        .iter()
-                        .find_map(|node| match &node.data {
-                            NodeData::Text { contents } => self.is_whitespace(contents),
-                            NodeData::Element { name, .. } => {
-                                Some(!matches!(name.local.as_ref(), "script" | "style"))
-                            }
-                            NodeData::Comment { .. } => {
-                                if self.options.preserve_comments {
-                                    Some(false)
-                                } else {
-                                    None
-                                }
-                            }
-                            _ => Some(true),
-                        })
-                        .unwrap_or(true);
-                // The end tag may be omitted if the <body> element has contents or has a start tag, and is not immediately followed by a comment.
-                let omit_end = ctx.right.map_or(true, |right| !self.next_is_comment(right));
-
-                (omit_start && omit_end, omit_end)
-            }
-            "p" => {
-                let omit_end = ctx.next_element().map_or(true, |node| {
-                    if let NodeData::Element { name, .. } = &node.data {
-                        matches!(
-                            name.local.as_ref().to_ascii_lowercase().as_str(),
-                            "address"
-                                | "article"
-                                | "aside"
-                                | "blockquote"
-                                | "div"
-                                | "dl"
-                                | "fieldset"
-                                | "footer"
-                                | "form"
-                                | "h1"
-                                | "h2"
-                                | "h3"
-                                | "h4"
-                                | "h5"
-                                | "h6"
-                                | "header"
-                                | "hr"
-                                | "menu"
-                                | "nav"
-                                | "ol"
-                                | "p"
-                                | "pre"
-                                | "section"
-                                | "table"
-                                | "ul"
-                        )
-                    } else {
-                        false
-                    }
-                });
-
-                (false, omit_end)
-            }
-            // TODO: comprehensive handling of optional end element rules
-            _ => (false, optional_end_tag(name)),
-        })
-    }
-
-    #[allow(clippy::needless_pass_by_value)]
-    fn minify_children(&mut self, ctx: &Option<Context>, node: &Node) -> io::Result<()> {
-        let children = node.children.borrow();
-        let l = children.len();
-
-        children.iter().enumerate().try_for_each(|(i, child)| {
-            if self.preceding_whitespace && is_block_element(child) {
-                self.preceding_whitespace = false;
-            }
-
-            self.minify_node(
-                &Some(Context {
-                    parent: node,
-                    parent_context: ctx.as_ref(),
-                    left: if i > 0 { Some(&children[..i]) } else { None },
-                    right: if i + 1 < l {
-                        Some(&children[i + 1..])
-                    } else {
-                        None
-                    },
-                }),
-                child,
-            )
-        })
-    }
-
-    fn write_qualified_name(&mut self, name: &QualName) -> io::Result<()> {
-        if let Some(prefix) = &name.prefix {
-            self.w
-                .write_all(prefix.as_ref().to_ascii_lowercase().as_bytes())?;
-            self.w.write_all(b":")?;
-        }
-
-        self.w
-            .write_all(name.local.as_ref().to_ascii_lowercase().as_bytes())
-    }
-
-    fn write_start_tag(&mut self, name: &QualName, attrs: &[Attribute]) -> io::Result<()> {
-        self.w.write_all(b"<")?;
-        self.write_qualified_name(name)?;
-
-        attrs
-            .iter()
-            .try_for_each(|attr| self.write_attribute(attr))?;
-
-        self.w.write_all(b">")
-    }
-
-    fn write_end_tag(&mut self, name: &QualName) -> io::Result<()> {
-        self.w.write_all(b"</")?;
-        self.write_qualified_name(name)?;
-        self.w.write_all(b">")
-    }
-
-    fn write_attribute(&mut self, attr: &Attribute) -> io::Result<()> {
-        self.w.write_all(b" ")?;
-        self.write_qualified_name(&attr.name)?;
-
-        let value = attr.value.as_ref();
-        let value = if self.options.collapse_whitespace {
-            value.trim_matches(is_ascii_whitespace)
-        } else {
-            value
-        };
-
-        if value.is_empty() {
-            return io::Result::Ok(());
-        }
-
-        self.w.write_all(b"=")?;
-
-        let b = value.as_bytes();
-        let (unquoted, double, _) =
-            b.iter()
-                .fold((true, false, false), |(unquoted, double, single), &c| {
-                    let (double, single) = (double || c == b'"', single || c == b'\'');
-                    let unquoted =
-                        unquoted && !double && !single && c != b'=' && !c.is_ascii_whitespace();
-
-                    (unquoted, double, single)
-                });
-
-        if unquoted {
-            self.w.write_all(b)
-        } else if double {
-            self.write_attribute_value(b, b"'", reserved_entity_with_apos)
-        } else {
-            self.write_attribute_value(b, b"\"", reserved_entity)
-        }
-    }
-
-    fn write_attribute_value<T: AsRef<[u8]>>(
-        &mut self,
-        v: T,
-        quote: &[u8],
-        f: EntityFn,
-    ) -> io::Result<()> {
-        self.w.write_all(quote)?;
-
-        let b = v.as_ref();
-
-        if self.options.collapse_whitespace {
-            self.write_collapse_whitespace(b, f, Some(false))
-        } else {
-            self.w.write_all(b)
-        }?;
-
-        self.w.write_all(quote)
-    }
-
-    /// Efficiently writes blocks of content, e.g. a string with no collapsed
-    /// whitespace would result in a single write.
-    fn write_collapse_whitespace(
-        &mut self,
-        b: &[u8],
-        f: EntityFn,
-        preceding_whitespace: Option<bool>,
-    ) -> io::Result<()> {
-        b.iter()
-            .enumerate()
-            .try_fold(
-                (0, preceding_whitespace.unwrap_or(self.preceding_whitespace)),
-                |(pos, preceding_whitespace), (i, &c)| {
-                    let is_whitespace = c.is_ascii_whitespace();
-
-                    Ok(if is_whitespace && preceding_whitespace {
-                        if i != pos {
-                            self.write(&b[pos..i], f)?;
-                        }
-
-                        // ASCII whitespace = 1 byte
-                        (i + 1, true)
-                    } else {
-                        (pos, is_whitespace)
-                    })
-                },
-            )
-            .and_then(|(pos, _)| {
-                if pos < b.len() {
-                    self.write(&b[pos..], f)?;
-                }
-
-                Ok(())
-            })
-    }
-
-    fn write(&mut self, b: &[u8], f: EntityFn) -> io::Result<()> {
-        b.iter()
-            .enumerate()
-            .try_fold(0, |pos, (i, &c)| {
-                Ok(if let Some(entity) = f(c) {
-                    self.w.write_all(&b[pos..i])?;
-                    self.w.write_all(entity)?;
-
-                    // Reserved characters are 1 byte
-                    i + 1
-                } else {
-                    pos
-                })
-            })
-            .and_then(|pos| {
-                if pos < b.len() {
-                    self.w.write_all(&b[pos..])?;
-                }
-
-                Ok(())
-            })
-    }
-}
-
-struct Context<'a> {
-    parent: &'a Node,
-    parent_context: Option<&'a Context<'a>>,
-    left: Option<&'a [Rc<Node>]>,
-    right: Option<&'a [Rc<Node>]>,
-}
-
-impl<'a> Context<'a> {
-    /// Determine whether to trim whitespace.
-    /// Uses naive HTML5 whitespace collapsing rules.
-    fn trim(&self, preceding_whitespace: bool) -> (bool, bool) {
-        (preceding_whitespace || self.trim_left(), self.trim_right())
-    }
-
-    fn trim_left(&self) -> bool {
-        self.left.map_or_else(
-            || is_block_element(self.parent) || self.parent_trim_left(),
-            |siblings| {
-                siblings
-                    .iter()
-                    .rev()
-                    .find_map(Self::is_block_element)
-                    .unwrap_or_else(|| self.parent_trim_left())
-            },
-        )
-    }
-
-    fn parent_trim_left(&self) -> bool {
-        self.parent_context.map_or(true, Context::trim_left)
-    }
-
-    fn trim_right(&self) -> bool {
-        self.right.map_or(true, |siblings| {
-            siblings
-                .iter()
-                .find_map(Self::is_block_element)
-                .unwrap_or(true)
-        })
-    }
-
-    fn next_element(&self) -> Option<&Rc<Node>> {
-        self.right.and_then(|siblings| {
-            siblings
-                .iter()
-                .find(|node| matches!(node.data, NodeData::Element { .. }))
-        })
-    }
-
-    fn is_block_element(node: &Rc<Node>) -> Option<bool> {
-        if let NodeData::Element { name, .. } = &node.data {
-            Some(is_block_element_name(name.local.as_ref()))
-        } else {
-            None
-        }
-    }
-}
-
-type EntityFn = fn(u8) -> Option<&'static [u8]>;
-
-const fn reserved_entity(v: u8) -> Option<&'static [u8]> {
-    match v {
-        b'<' => Some(b"&lt;"),
-        b'>' => Some(b"&gt;"),
-        b'&' => Some(b"&#38;"),
-        _ => None,
-    }
-}
-
-const fn reserved_entity_with_apos(v: u8) -> Option<&'static [u8]> {
-    if v == b'\'' {
-        Some(b"&#39;")
-    } else {
-        reserved_entity(v)
-    }
-}
-
-fn is_whitespace(s: &RefCell<Tendril<UTF8>>) -> bool {
-    s.borrow().as_bytes().iter().all(u8::is_ascii_whitespace)
-}
-
-fn is_block_element_name(name: &str) -> bool {
-    matches!(
-        name,
-        "address"
-            | "article"
-            | "aside"
-            | "blockquote"
-            | "body"
-            | "br"
-            | "details"
-            | "dialog"
-            | "dd"
-            | "div"
-            | "dl"
-            | "dt"
-            | "fieldset"
-            | "figcaption"
-            | "figure"
-            | "footer"
-            | "form"
-            | "h1"
-            | "h2"
-            | "h3"
-            | "h4"
-            | "h5"
-            | "h6"
-            | "head"
-            | "header"
-            | "hgroup"
-            | "hr"
-            | "html"
-            | "li"
-            | "link"
-            | "main"
-            | "meta"
-            | "nav"
-            | "ol"
-            | "option"
-            | "p"
-            | "pre"
-            | "script"
-            | "section"
-            | "source"
-            | "table"
-            | "td"
-            | "th"
-            | "title"
-            | "tr"
-            | "ul"
-    )
-}
-
-fn is_block_element(node: &Node) -> bool {
-    match &node.data {
-        NodeData::Element { name, .. } => is_block_element_name(name.local.as_ref()),
-        NodeData::Document => true,
-        _ => false,
-    }
-}
-
-#[allow(clippy::missing_const_for_fn)]
-fn is_ascii_whitespace(c: char) -> bool {
-    c.is_ascii_whitespace()
-}
-
-fn preserve_whitespace(name: &str) -> bool {
-    matches!(name, "pre" | "textarea")
-}
-
-fn contains_code(name: &str) -> bool {
-    matches!(name, "script" | "style")
-}
-
-fn is_self_closing(name: &str) -> bool {
-    matches!(
-        name,
-        "area"
-            | "base"
-            | "br"
-            | "col"
-            | "embed"
-            | "hr"
-            | "img"
-            | "input"
-            | "link"
-            | "meta"
-            | "param"
-            | "source"
-            | "track"
-            | "wbr"
-            | "command"
-            | "keygen"
-            | "menuitem"
-    )
-}
-
-fn optional_end_tag(name: &str) -> bool {
-    matches!(
-        name,
-        "basefont"
-            | "colgroup"
-            | "dd"
-            | "dt"
-            | "frame"
-            | "isindex"
-            | "li"
-            | "option"
-            | "p"
-            | "tbody"
-            | "td"
-            | "tfoot"
-            | "th"
-            | "thead"
-            | "tr"
-    )
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use std::str;
-
-    #[test]
-    fn test_write_collapse_whitespace() {
-        for &(input, expected, preceding_whitespace) in &[
-            ("", "", false),
-            ("  ", " ", false),
-            ("   ", " ", false),
-            ("   ", "", true),
-            (" x      y  ", " x y ", false),
-            (" x      y  ", "x y ", true),
-            (" x   \n  \t \n   y  ", " x y ", false),
-            (" x   \n  \t \n   y  ", "x y ", true),
-        ] {
-            let mut w = Vec::new();
-            let mut minifier = Minifier::new(&mut w, MinifierOptions::default());
-            minifier.preceding_whitespace = preceding_whitespace;
-            minifier
-                .write_collapse_whitespace(
-                    input.as_bytes(),
-                    reserved_entity,
-                    Some(preceding_whitespace),
-                )
-                .unwrap();
-
-            let s = str::from_utf8(&w).unwrap();
-
-            assert_eq!(expected, s);
-        }
-    }
-
-    #[test]
-    fn test_omit_tags() {
-        for &(input, expected, collapse_whitespace, preserve_comments) in &[
-            // <html>
-            ("<html>", "", true, false),
-            // Comments ignored
-            ("<html><!-- -->", "", true, false),
-            // Comments preserved
-            ("<html>     <!-- -->    ", "<html><!-- -->", true, true),
-            ("<html><!-- --></html>", "<html><!-- -->", true, true),
-            (
-                "<html><!-- --></html><!-- -->",
-                "<html><!-- --></html><!-- -->",
-                true,
-                true,
-            ),
-            (
-                "<html>    <!-- -->    </html>    <!-- -->    ",
-                "<html><!-- --></html><!-- -->",
-                true,
-                true,
-            ),
-            (
-                "<html>    <!-- -->    </html>    <!-- -->    ",
-                // <body> is implicitly added to the DOM
-                "<html><!-- --><body>        </html><!-- -->",
-                false,
-                true,
-            ),
-            // <head>
-            (
-                "<html>   <head>   <title>A</title>     </head>   <body><p>     B  </p> </body>",
-                "<title>A</title><p>B",
-                true,
-                false,
-            ),
-            (
-                "<html>   <head>   <title>A</title>     </head>   <body><p>     B  </p> </body>",
-                "<head>   <title>A</title>     </head>   <p>     B   ",
-                false,
-                false,
-            ),
-            (
-                "<html>   <head><!-- -->   <title>A</title>     </head>   <body><p>     B  </p> </body>",
-                "<head><!-- --><title>A</title><p>B",
-                true,
-                true,
-            ),
-            // <body>
-            ("<body>", "", true, false),
-            (
-                "<body>    <script>let x = 1;</script>   ",
-                "<body><script>let x = 1;</script>",
-                true,
-                false,
-            ),
-            (
-                "<body>        <style>body{margin:1em}</style>",
-                "<body><style>body{margin:1em}</style>",
-                true,
-                false,
-            ),
-            ("<body>    <p>A", "<p>A", true, false),
-            ("<body id=main>    <p>A", "<body id=main><p>A", true, false),
-            // Retain whitespace, whitespace before <p>
-            (
-                "    <body>    <p>A      ",
-                "<body>    <p>A      ",
-                false,
-                false,
-            ),
-            // Retain whitespace, touching <p>
-            ("<body><p>A</body>", "<p>A", false, false),
-            // Comments ignored
-            ("<body><p>A</body><!-- -->", "<p>A", false, false),
-            // Comments preserved
-            (
-                "<body><p>A</body><!-- -->",
-                "<body><p>A</body><!-- -->",
-                false,
-                true,
-            ),
-            // Retain end tag if touching inline element
-            (
-                "<p>Some text</p><button></button>",
-                "<p>Some text</p><button></button>",
-                false,
-                false,
-            ),
-        ] {
-            let mut w = Vec::new();
-            let mut minifier = Minifier::new(
-                &mut w,
-                MinifierOptions {
-                    omit_doctype: true,
-                    preserve_comments,
-                    collapse_whitespace,
-                },
-            );
-            minifier.minify(&mut input.as_bytes()).unwrap();
-
-            let s = str::from_utf8(&w).unwrap();
-
-            assert_eq!(expected, s);
-        }
-    }
-}
diff --git a/crates/markdown_preview/src/markdown_parser.rs b/crates/markdown_preview/src/markdown_parser.rs
deleted file mode 100644
index b17ee5cac4..0000000000
--- a/crates/markdown_preview/src/markdown_parser.rs
+++ /dev/null
@@ -1,3218 +0,0 @@
-use crate::{
-    markdown_elements::*,
-    markdown_minifier::{Minifier, MinifierOptions},
-};
-use async_recursion::async_recursion;
-use collections::FxHashMap;
-use gpui::{DefiniteLength, FontWeight, px, relative};
-use html5ever::{ParseOpts, local_name, parse_document, tendril::TendrilSink};
-use language::LanguageRegistry;
-use markup5ever_rcdom::RcDom;
-use pulldown_cmark::{Alignment, Event, Options, Parser, Tag, TagEnd};
-use std::{
-    cell::RefCell, collections::HashMap, mem, ops::Range, path::PathBuf, rc::Rc, sync::Arc, vec,
-};
-use ui::SharedString;
-
-pub async fn parse_markdown(
-    markdown_input: &str,
-    file_location_directory: Option<PathBuf>,
-    language_registry: Option<Arc<LanguageRegistry>>,
-) -> ParsedMarkdown {
-    let mut options = Options::all();
-    options.remove(pulldown_cmark::Options::ENABLE_DEFINITION_LIST);
-
-    let parser = Parser::new_ext(markdown_input, options);
-    let parser = MarkdownParser::new(
-        parser.into_offset_iter().collect(),
-        file_location_directory,
-        language_registry,
-    );
-    let renderer = parser.parse_document().await;
-    ParsedMarkdown {
-        children: renderer.parsed,
-    }
-}
-
-fn cleanup_html(source: &str) -> Vec<u8> {
-    let mut writer = std::io::Cursor::new(Vec::new());
-    let mut reader = std::io::Cursor::new(source);
-    let mut minify = Minifier::new(
-        &mut writer,
-        MinifierOptions {
-            omit_doctype: true,
-            collapse_whitespace: true,
-            ..Default::default()
-        },
-    );
-    if let Ok(()) = minify.minify(&mut reader) {
-        writer.into_inner()
-    } else {
-        source.bytes().collect()
-    }
-}
-
-struct MarkdownParser<'a> {
-    tokens: Vec<(Event<'a>, Range<usize>)>,
-    /// The current index in the tokens array
-    cursor: usize,
-    /// The blocks that we have successfully parsed so far
-    parsed: Vec<ParsedMarkdownElement>,
-    file_location_directory: Option<PathBuf>,
-    language_registry: Option<Arc<LanguageRegistry>>,
-}
-
-#[derive(Debug)]
-struct ParseHtmlNodeContext {
-    list_item_depth: u16,
-}
-
-impl Default for ParseHtmlNodeContext {
-    fn default() -> Self {
-        Self { list_item_depth: 1 }
-    }
-}
-
-struct MarkdownListItem {
-    content: Vec<ParsedMarkdownElement>,
-    item_type: ParsedMarkdownListItemType,
-}
-
-impl Default for MarkdownListItem {
-    fn default() -> Self {
-        Self {
-            content: Vec::new(),
-            item_type: ParsedMarkdownListItemType::Unordered,
-        }
-    }
-}
-
-impl<'a> MarkdownParser<'a> {
-    fn new(
-        tokens: Vec<(Event<'a>, Range<usize>)>,
-        file_location_directory: Option<PathBuf>,
-        language_registry: Option<Arc<LanguageRegistry>>,
-    ) -> Self {
-        Self {
-            tokens,
-            file_location_directory,
-            language_registry,
-            cursor: 0,
-            parsed: vec![],
-        }
-    }
-
-    fn eof(&self) -> bool {
-        if self.tokens.is_empty() {
-            return true;
-        }
-        self.cursor >= self.tokens.len() - 1
-    }
-
-    fn peek(&self, steps: usize) -> Option<&(Event<'_>, Range<usize>)> {
-        if self.eof() || (steps + self.cursor) >= self.tokens.len() {
-            return self.tokens.last();
-        }
-        self.tokens.get(self.cursor + steps)
-    }
-
-    fn previous(&self) -> Option<&(Event<'_>, Range<usize>)> {
-        if self.cursor == 0 || self.cursor > self.tokens.len() {
-            return None;
-        }
-        self.tokens.get(self.cursor - 1)
-    }
-
-    fn current(&self) -> Option<&(Event<'_>, Range<usize>)> {
-        self.peek(0)
-    }
-
-    fn current_event(&self) -> Option<&Event<'_>> {
-        self.current().map(|(event, _)| event)
-    }
-
-    fn is_text_like(event: &Event) -> bool {
-        match event {
-            Event::Text(_)
-            // Represent an inline code block
-            | Event::Code(_)
-            | Event::Html(_)
-            | Event::InlineHtml(_)
-            | Event::FootnoteReference(_)
-            | Event::Start(Tag::Link { .. })
-            | Event::Start(Tag::Emphasis)
-            | Event::Start(Tag::Strong)
-            | Event::Start(Tag::Strikethrough)
-            | Event::Start(Tag::Image { .. }) => {
-                true
-            }
-            _ => false,
-        }
-    }
-
-    async fn parse_document(mut self) -> Self {
-        while !self.eof() {
-            if let Some(block) = self.parse_block().await {
-                self.parsed.extend(block);
-            } else {
-                self.cursor += 1;
-            }
-        }
-        self
-    }
-
-    #[async_recursion]
-    async fn parse_block(&mut self) -> Option<Vec<ParsedMarkdownElement>> {
-        let (current, source_range) = self.current().unwrap();
-        let source_range = source_range.clone();
-        match current {
-            Event::Start(tag) => match tag {
-                Tag::Paragraph => {
-                    self.cursor += 1;
-                    let text = self.parse_text(false, Some(source_range));
-                    Some(vec![ParsedMarkdownElement::Paragraph(text)])
-                }
-                Tag::Heading { level, .. } => {
-                    let level = *level;
-                    self.cursor += 1;
-                    let heading = self.parse_heading(level);
-                    Some(vec![ParsedMarkdownElement::Heading(heading)])
-                }
-                Tag::Table(alignment) => {
-                    let alignment = alignment.clone();
-                    self.cursor += 1;
-                    let table = self.parse_table(alignment);
-                    Some(vec![ParsedMarkdownElement::Table(table)])
-                }
-                Tag::List(order) => {
-                    let order = *order;
-                    self.cursor += 1;
-                    let list = self.parse_list(order).await;
-                    Some(list)
-                }
-                Tag::BlockQuote(_kind) => {
-                    self.cursor += 1;
-                    let block_quote = self.parse_block_quote().await;
-                    Some(vec![ParsedMarkdownElement::BlockQuote(block_quote)])
-                }
-                Tag::CodeBlock(kind) => {
-                    let language = match kind {
-                        pulldown_cmark::CodeBlockKind::Indented => None,
-                        pulldown_cmark::CodeBlockKind::Fenced(language) => {
-                            if language.is_empty() {
-                                None
-                            } else {
-                                Some(language.to_string())
-                            }
-                        }
-                    };
-
-                    self.cursor += 1;
-
-                    let code_block = self.parse_code_block(language).await?;
-                    Some(vec![ParsedMarkdownElement::CodeBlock(code_block)])
-                }
-                Tag::HtmlBlock => {
-                    self.cursor += 1;
-
-                    Some(self.parse_html_block().await)
-                }
-                _ => None,
-            },
-            Event::Rule => {
-                self.cursor += 1;
-                Some(vec![ParsedMarkdownElement::HorizontalRule(source_range)])
-            }
-            _ => None,
-        }
-    }
-
-    fn parse_text(
-        &mut self,
-        should_complete_on_soft_break: bool,
-        source_range: Option<Range<usize>>,
-    ) -> MarkdownParagraph {
-        let source_range = source_range.unwrap_or_else(|| {
-            self.current()
-                .map(|(_, range)| range.clone())
-                .unwrap_or_default()
-        });
-
-        let mut markdown_text_like = Vec::new();
-        let mut text = String::new();
-        let mut bold_depth = 0;
-        let mut italic_depth = 0;
-        let mut strikethrough_depth = 0;
-        let mut link: Option<Link> = None;
-        let mut image: Option<Image> = None;
-        let mut regions: Vec<(Range<usize>, ParsedRegion)> = vec![];
-        let mut highlights: Vec<(Range<usize>, MarkdownHighlight)> = vec![];
-        let mut link_urls: Vec<String> = vec![];
-        let mut link_ranges: Vec<Range<usize>> = vec![];
-
-        loop {
-            if self.eof() {
-                break;
-            }
-
-            let (current, _) = self.current().unwrap();
-            let prev_len = text.len();
-            match current {
-                Event::SoftBreak => {
-                    if should_complete_on_soft_break {
-                        break;
-                    }
-                    text.push(' ');
-                }
-
-                Event::HardBreak => {
-                    text.push('\n');
-                }
-
-                // We want to ignore any inline HTML tags in the text but keep
-                // the text between them
-                Event::InlineHtml(_) => {}
-
-                Event::Text(t) => {
-                    text.push_str(t.as_ref());
-                    let mut style = MarkdownHighlightStyle::default();
-
-                    if bold_depth > 0 {
-                        style.weight = FontWeight::BOLD;
-                    }
-
-                    if italic_depth > 0 {
-                        style.italic = true;
-                    }
-
-                    if strikethrough_depth > 0 {
-                        style.strikethrough = true;
-                    }
-
-                    let last_run_len = if let Some(link) = link.clone() {
-                        regions.push((
-                            prev_len..text.len(),
-                            ParsedRegion {
-                                code: false,
-                                link: Some(link),
-                            },
-                        ));
-                        style.link = true;
-                        prev_len
-                    } else {
-                        // Manually scan for links
-                        let mut finder = linkify::LinkFinder::new();
-                        finder.kinds(&[linkify::LinkKind::Url]);
-                        let mut last_link_len = prev_len;
-                        for link in finder.links(t) {
-                            let start = prev_len + link.start();
-                            let end = prev_len + link.end();
-                            let range = start..end;
-                            link_ranges.push(range.clone());
-                            link_urls.push(link.as_str().to_string());
-
-                            // If there is a style before we match a link, we have to add this to the highlighted ranges
-                            if style != MarkdownHighlightStyle::default() && last_link_len < start {
-                                highlights.push((
-                                    last_link_len..start,
-                                    MarkdownHighlight::Style(style.clone()),
-                                ));
-                            }
-
-                            highlights.push((
-                                range.clone(),
-                                MarkdownHighlight::Style(MarkdownHighlightStyle {
-                                    underline: true,
-                                    ..style
-                                }),
-                            ));
-
-                            regions.push((
-                                range.clone(),
-                                ParsedRegion {
-                                    code: false,
-                                    link: Some(Link::Web {
-                                        url: link.as_str().to_string(),
-                                    }),
-                                },
-                            ));
-                            last_link_len = end;
-                        }
-                        last_link_len
-                    };
-
-                    if style != MarkdownHighlightStyle::default() && last_run_len < text.len() {
-                        let mut new_highlight = true;
-                        if let Some((last_range, last_style)) = highlights.last_mut()
-                            && last_range.end == last_run_len
-                            && last_style == &MarkdownHighlight::Style(style.clone())
-                        {
-                            last_range.end = text.len();
-                            new_highlight = false;
-                        }
-                        if new_highlight {
-                            highlights.push((
-                                last_run_len..text.len(),
-                                MarkdownHighlight::Style(style.clone()),
-                            ));
-                        }
-                    }
-                }
-                Event::Code(t) => {
-                    text.push_str(t.as_ref());
-                    let range = prev_len..text.len();
-
-                    if link.is_some() {
-                        highlights.push((
-                            range.clone(),
-                            MarkdownHighlight::Style(MarkdownHighlightStyle {
-                                link: true,
-                                ..Default::default()
-                            }),
-                        ));
-                    }
-                    regions.push((
-                        range,
-                        ParsedRegion {
-                            code: true,
-                            link: link.clone(),
-                        },
-                    ));
-                }
-                Event::Start(tag) => match tag {
-                    Tag::Emphasis => italic_depth += 1,
-                    Tag::Strong => bold_depth += 1,
-                    Tag::Strikethrough => strikethrough_depth += 1,
-                    Tag::Link { dest_url, .. } => {
-                        link = Link::identify(
-                            self.file_location_directory.clone(),
-                            dest_url.to_string(),
-                        );
-                    }
-                    Tag::Image { dest_url, .. } => {
-                        if !text.is_empty() {
-                            let parsed_regions = MarkdownParagraphChunk::Text(ParsedMarkdownText {
-                                source_range: source_range.clone(),
-                                contents: mem::take(&mut text).into(),
-                                highlights: mem::take(&mut highlights),
-                                regions: mem::take(&mut regions),
-                            });
-                            markdown_text_like.push(parsed_regions);
-                        }
-                        image = Image::identify(
-                            dest_url.to_string(),
-                            source_range.clone(),
-                            self.file_location_directory.clone(),
-                        );
-                    }
-                    _ => {
-                        break;
-                    }
-                },
-
-                Event::End(tag) => match tag {
-                    TagEnd::Emphasis => italic_depth -= 1,
-                    TagEnd::Strong => bold_depth -= 1,
-                    TagEnd::Strikethrough => strikethrough_depth -= 1,
-                    TagEnd::Link => {
-                        link = None;
-                    }
-                    TagEnd::Image => {
-                        if let Some(mut image) = image.take() {
-                            if !text.is_empty() {
-                                image.set_alt_text(std::mem::take(&mut text).into());
-                                mem::take(&mut highlights);
-                                mem::take(&mut regions);
-                            }
-                            markdown_text_like.push(MarkdownParagraphChunk::Image(image));
-                        }
-                    }
-                    TagEnd::Paragraph => {
-                        self.cursor += 1;
-                        break;
-                    }
-                    _ => {
-                        break;
-                    }
-                },
-                _ => {
-                    break;
-                }
-            }
-
-            self.cursor += 1;
-        }
-        if !text.is_empty() {
-            markdown_text_like.push(MarkdownParagraphChunk::Text(ParsedMarkdownText {
-                source_range,
-                contents: text.into(),
-                highlights,
-                regions,
-            }));
-        }
-        markdown_text_like
-    }
-
-    fn parse_heading(&mut self, level: pulldown_cmark::HeadingLevel) -> ParsedMarkdownHeading {
-        let (_event, source_range) = self.previous().unwrap();
-        let source_range = source_range.clone();
-        let text = self.parse_text(true, None);
-
-        // Advance past the heading end tag
-        self.cursor += 1;
-
-        ParsedMarkdownHeading {
-            source_range,
-            level: match level {
-                pulldown_cmark::HeadingLevel::H1 => HeadingLevel::H1,
-                pulldown_cmark::HeadingLevel::H2 => HeadingLevel::H2,
-                pulldown_cmark::HeadingLevel::H3 => HeadingLevel::H3,
-                pulldown_cmark::HeadingLevel::H4 => HeadingLevel::H4,
-                pulldown_cmark::HeadingLevel::H5 => HeadingLevel::H5,
-                pulldown_cmark::HeadingLevel::H6 => HeadingLevel::H6,
-            },
-            contents: text,
-        }
-    }
-
-    fn parse_table(&mut self, alignment: Vec<Alignment>) -> ParsedMarkdownTable {
-        let (_event, source_range) = self.previous().unwrap();
-        let source_range = source_range.clone();
-        let mut header = vec![];
-        let mut body = vec![];
-        let mut row_columns = vec![];
-        let mut in_header = true;
-        let column_alignments = alignment
-            .iter()
-            .map(Self::convert_alignment)
-            .collect::<Vec<_>>();
-
-        loop {
-            if self.eof() {
-                break;
-            }
-
-            let (current, source_range) = self.current().unwrap();
-            let source_range = source_range.clone();
-            match current {
-                Event::Start(Tag::TableHead)
-                | Event::Start(Tag::TableRow)
-                | Event::End(TagEnd::TableCell) => {
-                    self.cursor += 1;
-                }
-                Event::Start(Tag::TableCell) => {
-                    self.cursor += 1;
-                    let cell_contents = self.parse_text(false, Some(source_range));
-                    row_columns.push(ParsedMarkdownTableColumn {
-                        col_span: 1,
-                        row_span: 1,
-                        is_header: in_header,
-                        children: cell_contents,
-                        alignment: column_alignments
-                            .get(row_columns.len())
-                            .copied()
-                            .unwrap_or_default(),
-                    });
-                }
-                Event::End(TagEnd::TableHead) | Event::End(TagEnd::TableRow) => {
-                    self.cursor += 1;
-                    let columns = std::mem::take(&mut row_columns);
-                    if in_header {
-                        header.push(ParsedMarkdownTableRow { columns: columns });
-                        in_header = false;
-                    } else {
-                        body.push(ParsedMarkdownTableRow::with_columns(columns));
-                    }
-                }
-                Event::End(TagEnd::Table) => {
-                    self.cursor += 1;
-                    break;
-                }
-                _ => {
-                    break;
-                }
-            }
-        }
-
-        ParsedMarkdownTable {
-            source_range,
-            header,
-            body,
-            caption: None,
-        }
-    }
-
-    fn convert_alignment(alignment: &Alignment) -> ParsedMarkdownTableAlignment {
-        match alignment {
-            Alignment::None => ParsedMarkdownTableAlignment::None,
-            Alignment::Left => ParsedMarkdownTableAlignment::Left,
-            Alignment::Center => ParsedMarkdownTableAlignment::Center,
-            Alignment::Right => ParsedMarkdownTableAlignment::Right,
-        }
-    }
-
-    async fn parse_list(&mut self, order: Option<u64>) -> Vec<ParsedMarkdownElement> {
-        let (_, list_source_range) = self.previous().unwrap();
-
-        let mut items = Vec::new();
-        let mut items_stack = vec![MarkdownListItem::default()];
-        let mut depth = 1;
-        let mut order = order;
-        let mut order_stack = Vec::new();
-
-        let mut insertion_indices = FxHashMap::default();
-        let mut source_ranges = FxHashMap::default();
-        let mut start_item_range = list_source_range.clone();
-
-        while !self.eof() {
-            let (current, source_range) = self.current().unwrap();
-            match current {
-                Event::Start(Tag::List(new_order)) => {
-                    if items_stack.last().is_some() && !insertion_indices.contains_key(&depth) {
-                        insertion_indices.insert(depth, items.len());
-                    }
-
-                    // We will use the start of the nested list as the end for the current item's range,
-                    // because we don't care about the hierarchy of list items
-                    if let collections::hash_map::Entry::Vacant(e) = source_ranges.entry(depth) {
-                        e.insert(start_item_range.start..source_range.start);
-                    }
-
-                    order_stack.push(order);
-                    order = *new_order;
-                    self.cursor += 1;
-                    depth += 1;
-                }
-                Event::End(TagEnd::List(_)) => {
-                    order = order_stack.pop().flatten();
-                    self.cursor += 1;
-                    depth -= 1;
-
-                    if depth == 0 {
-                        break;
-                    }
-                }
-                Event::Start(Tag::Item) => {
-                    start_item_range = source_range.clone();
-
-                    self.cursor += 1;
-                    items_stack.push(MarkdownListItem::default());
-
-                    let mut task_list = None;
-                    // Check for task list marker (`- [ ]` or `- [x]`)
-                    if let Some(event) = self.current_event() {
-                        // If there is a linebreak in between two list items the task list marker will actually be the first element of the paragraph
-                        if event == &Event::Start(Tag::Paragraph) {
-                            self.cursor += 1;
-                        }
-
-                        if let Some((Event::TaskListMarker(checked), range)) = self.current() {
-                            task_list = Some((*checked, range.clone()));
-                            self.cursor += 1;
-                        }
-                    }
-
-                    if let Some((event, range)) = self.current() {
-                        // This is a plain list item.
-                        // For example `- some text` or `1. [Docs](./docs.md)`
-                        if MarkdownParser::is_text_like(event) {
-                            let text = self.parse_text(false, Some(range.clone()));
-                            let block = ParsedMarkdownElement::Paragraph(text);
-                            if let Some(content) = items_stack.last_mut() {
-                                let item_type = if let Some((checked, range)) = task_list {
-                                    ParsedMarkdownListItemType::Task(checked, range)
-                                } else if let Some(order) = order {
-                                    ParsedMarkdownListItemType::Ordered(order)
-                                } else {
-                                    ParsedMarkdownListItemType::Unordered
-                                };
-                                content.item_type = item_type;
-                                content.content.push(block);
-                            }
-                        } else {
-                            let block = self.parse_block().await;
-                            if let Some(block) = block
-                                && let Some(list_item) = items_stack.last_mut()
-                            {
-                                list_item.content.extend(block);
-                            }
-                        }
-                    }
-
-                    // If there is a linebreak in between two list items the task list marker will actually be the first element of the paragraph
-                    if self.current_event() == Some(&Event::End(TagEnd::Paragraph)) {
-                        self.cursor += 1;
-                    }
-                }
-                Event::End(TagEnd::Item) => {
-                    self.cursor += 1;
-
-                    if let Some(current) = order {
-                        order = Some(current + 1);
-                    }
-
-                    if let Some(list_item) = items_stack.pop() {
-                        let source_range = source_ranges
-                            .remove(&depth)
-                            .unwrap_or(start_item_range.clone());
-
-                        // We need to remove the last character of the source range, because it includes the newline character
-                        let source_range = source_range.start..source_range.end - 1;
-                        let item = ParsedMarkdownElement::ListItem(ParsedMarkdownListItem {
-                            source_range,
-                            content: list_item.content,
-                            depth,
-                            item_type: list_item.item_type,
-                            nested: false,
-                        });
-
-                        if let Some(index) = insertion_indices.get(&depth) {
-                            items.insert(*index, item);
-                            insertion_indices.remove(&depth);
-                        } else {
-                            items.push(item);
-                        }
-                    }
-                }
-                _ => {
-                    if depth == 0 {
-                        break;
-                    }
-                    // This can only happen if a list item starts with more then one paragraph,
-                    // or the list item contains blocks that should be rendered after the nested list items
-                    let block = self.parse_block().await;
-                    if let Some(block) = block {
-                        if let Some(list_item) = items_stack.last_mut() {
-                            // If we did not insert any nested items yet (in this case insertion index is set), we can append the block to the current list item
-                            if !insertion_indices.contains_key(&depth) {
-                                list_item.content.extend(block);
-                                continue;
-                            }
-                        }
-
-                        // Otherwise we need to insert the block after all the nested items
-                        // that have been parsed so far
-                        items.extend(block);
-                    } else {
-                        self.cursor += 1;
-                    }
-                }
-            }
-        }
-
-        items
-    }
-
-    #[async_recursion]
-    async fn parse_block_quote(&mut self) -> ParsedMarkdownBlockQuote {
-        let (_event, source_range) = self.previous().unwrap();
-        let source_range = source_range.clone();
-        let mut nested_depth = 1;
-
-        let mut children: Vec<ParsedMarkdownElement> = vec![];
-
-        while !self.eof() {
-            let block = self.parse_block().await;
-
-            if let Some(block) = block {
-                children.extend(block);
-            } else {
-                break;
-            }
-
-            if self.eof() {
-                break;
-            }
-
-            let (current, _source_range) = self.current().unwrap();
-            match current {
-                // This is a nested block quote.
-                // Record that we're in a nested block quote and continue parsing.
-                // We don't need to advance the cursor since the next
-                // call to `parse_block` will handle it.
-                Event::Start(Tag::BlockQuote(_kind)) => {
-                    nested_depth += 1;
-                }
-                Event::End(TagEnd::BlockQuote(_kind)) => {
-                    nested_depth -= 1;
-                    if nested_depth == 0 {
-                        self.cursor += 1;
-                        break;
-                    }
-                }
-                _ => {}
-            };
-        }
-
-        ParsedMarkdownBlockQuote {
-            source_range,
-            children,
-        }
-    }
-
-    async fn parse_code_block(
-        &mut self,
-        language: Option<String>,
-    ) -> Option<ParsedMarkdownCodeBlock> {
-        let Some((_event, source_range)) = self.previous() else {
-            return None;
-        };
-
-        let source_range = source_range.clone();
-        let mut code = String::new();
-
-        while !self.eof() {
-            let Some((current, _source_range)) = self.current() else {
-                break;
-            };
-
-            match current {
-                Event::Text(text) => {
-                    code.push_str(text);
-                    self.cursor += 1;
-                }
-                Event::End(TagEnd::CodeBlock) => {
-                    self.cursor += 1;
-                    break;
-                }
-                _ => {
-                    break;
-                }
-            }
-        }
-
-        code = code.strip_suffix('\n').unwrap_or(&code).to_string();
-
-        let highlights = if let Some(language) = &language {
-            if let Some(registry) = &self.language_registry {
-                let rope: language::Rope = code.as_str().into();
-                registry
-                    .language_for_name_or_extension(language)
-                    .await
-                    .map(|l| l.highlight_text(&rope, 0..code.len()))
-                    .ok()
-            } else {
-                None
-            }
-        } else {
-            None
-        };
-
-        Some(ParsedMarkdownCodeBlock {
-            source_range,
-            contents: code.into(),
-            language,
-            highlights,
-        })
-    }
-
-    async fn parse_html_block(&mut self) -> Vec<ParsedMarkdownElement> {
-        let mut elements = Vec::new();
-        let Some((_event, _source_range)) = self.previous() else {
-            return elements;
-        };
-
-        let mut html_source_range_start = None;
-        let mut html_source_range_end = None;
-        let mut html_buffer = String::new();
-
-        while !self.eof() {
-            let Some((current, source_range)) = self.current() else {
-                break;
-            };
-            let source_range = source_range.clone();
-            match current {
-                Event::Html(html) => {
-                    html_source_range_start.get_or_insert(source_range.start);
-                    html_source_range_end = Some(source_range.end);
-                    html_buffer.push_str(html);
-                    self.cursor += 1;
-                }
-                Event::End(TagEnd::CodeBlock) => {
-                    self.cursor += 1;
-                    break;
-                }
-                _ => {
-                    break;
-                }
-            }
-        }
-
-        let bytes = cleanup_html(&html_buffer);
-
-        let mut cursor = std::io::Cursor::new(bytes);
-        if let Ok(dom) = parse_document(RcDom::default(), ParseOpts::default())
-            .from_utf8()
-            .read_from(&mut cursor)
-            && let Some((start, end)) = html_source_range_start.zip(html_source_range_end)
-        {
-            self.parse_html_node(
-                start..end,
-                &dom.document,
-                &mut elements,
-                &ParseHtmlNodeContext::default(),
-            );
-        }
-
-        elements
-    }
-
-    fn parse_html_node(
-        &self,
-        source_range: Range<usize>,
-        node: &Rc<markup5ever_rcdom::Node>,
-        elements: &mut Vec<ParsedMarkdownElement>,
-        context: &ParseHtmlNodeContext,
-    ) {
-        match &node.data {
-            markup5ever_rcdom::NodeData::Document => {
-                self.consume_children(source_range, node, elements, context);
-            }
-            markup5ever_rcdom::NodeData::Text { contents } => {
-                elements.push(ParsedMarkdownElement::Paragraph(vec![
-                    MarkdownParagraphChunk::Text(ParsedMarkdownText {
-                        source_range,
-                        regions: Vec::default(),
-                        highlights: Vec::default(),
-                        contents: contents.borrow().to_string().into(),
-                    }),
-                ]));
-            }
-            markup5ever_rcdom::NodeData::Comment { .. } => {}
-            markup5ever_rcdom::NodeData::Element { name, attrs, .. } => {
-                let mut styles = if let Some(styles) = Self::markdown_style_from_html_styles(
-                    Self::extract_styles_from_attributes(attrs),
-                ) {
-                    vec![MarkdownHighlight::Style(styles)]
-                } else {
-                    Vec::default()
-                };
-
-                if local_name!("img") == name.local {
-                    if let Some(image) = self.extract_image(source_range, attrs) {
-                        elements.push(ParsedMarkdownElement::Image(image));
-                    }
-                } else if local_name!("p") == name.local {
-                    let mut paragraph = MarkdownParagraph::new();
-                    self.parse_paragraph(
-                        source_range,
-                        node,
-                        &mut paragraph,
-                        &mut styles,
-                        &mut Vec::new(),
-                    );
-
-                    if !paragraph.is_empty() {
-                        elements.push(ParsedMarkdownElement::Paragraph(paragraph));
-                    }
-                } else if matches!(
-                    name.local,
-                    local_name!("h1")
-                        | local_name!("h2")
-                        | local_name!("h3")
-                        | local_name!("h4")
-                        | local_name!("h5")
-                        | local_name!("h6")
-                ) {
-                    let mut paragraph = MarkdownParagraph::new();
-                    self.consume_paragraph(
-                        source_range.clone(),
-                        node,
-                        &mut paragraph,
-                        &mut styles,
-                        &mut Vec::new(),
-                    );
-
-                    if !paragraph.is_empty() {
-                        elements.push(ParsedMarkdownElement::Heading(ParsedMarkdownHeading {
-                            source_range,
-                            level: match name.local {
-                                local_name!("h1") => HeadingLevel::H1,
-                                local_name!("h2") => HeadingLevel::H2,
-                                local_name!("h3") => HeadingLevel::H3,
-                                local_name!("h4") => HeadingLevel::H4,
-                                local_name!("h5") => HeadingLevel::H5,
-                                local_name!("h6") => HeadingLevel::H6,
-                                _ => unreachable!(),
-                            },
-                            contents: paragraph,
-                        }));
-                    }
-                } else if local_name!("ul") == name.local || local_name!("ol") == name.local {
-                    if let Some(list_items) = self.extract_html_list(
-                        node,
-                        local_name!("ol") == name.local,
-                        context.list_item_depth,
-                        source_range,
-                    ) {
-                        elements.extend(list_items);
-                    }
-                } else if local_name!("blockquote") == name.local {
-                    if let Some(blockquote) = self.extract_html_blockquote(node, source_range) {
-                        elements.push(ParsedMarkdownElement::BlockQuote(blockquote));
-                    }
-                } else if local_name!("table") == name.local {
-                    if let Some(table) = self.extract_html_table(node, source_range) {
-                        elements.push(ParsedMarkdownElement::Table(table));
-                    }
-                } else {
-                    self.consume_children(source_range, node, elements, context);
-                }
-            }
-            _ => {}
-        }
-    }
-
-    fn parse_paragraph(
-        &self,
-        source_range: Range<usize>,
-        node: &Rc<markup5ever_rcdom::Node>,
-        paragraph: &mut MarkdownParagraph,
-        highlights: &mut Vec<MarkdownHighlight>,
-        regions: &mut Vec<(Range<usize>, ParsedRegion)>,
-    ) {
-        fn items_with_range<T>(
-            range: Range<usize>,
-            items: impl IntoIterator<Item = T>,
-        ) -> Vec<(Range<usize>, T)> {
-            items
-                .into_iter()
-                .map(|item| (range.clone(), item))
-                .collect()
-        }
-
-        match &node.data {
-            markup5ever_rcdom::NodeData::Text { contents } => {
-                // append the text to the last chunk, so we can have a hacky version
-                // of inline text with highlighting
-                if let Some(text) = paragraph.iter_mut().last().and_then(|p| match p {
-                    MarkdownParagraphChunk::Text(text) => Some(text),
-                    _ => None,
-                }) {
-                    let mut new_text = text.contents.to_string();
-                    new_text.push_str(&contents.borrow());
-
-                    text.highlights.extend(items_with_range(
-                        text.contents.len()..new_text.len(),
-                        std::mem::take(highlights),
-                    ));
-                    text.regions.extend(items_with_range(
-                        text.contents.len()..new_text.len(),
-                        std::mem::take(regions)
-                            .into_iter()
-                            .map(|(_, region)| region),
-                    ));
-                    text.contents = SharedString::from(new_text);
-                } else {
-                    let contents = contents.borrow().to_string();
-                    paragraph.push(MarkdownParagraphChunk::Text(ParsedMarkdownText {
-                        source_range,
-                        highlights: items_with_range(0..contents.len(), std::mem::take(highlights)),
-                        regions: items_with_range(
-                            0..contents.len(),
-                            std::mem::take(regions)
-                                .into_iter()
-                                .map(|(_, region)| region),
-                        ),
-                        contents: contents.into(),
-                    }));
-                }
-            }
-            markup5ever_rcdom::NodeData::Element { name, attrs, .. } => {
-                if local_name!("img") == name.local {
-                    if let Some(image) = self.extract_image(source_range, attrs) {
-                        paragraph.push(MarkdownParagraphChunk::Image(image));
-                    }
-                } else if local_name!("b") == name.local || local_name!("strong") == name.local {
-                    highlights.push(MarkdownHighlight::Style(MarkdownHighlightStyle {
-                        weight: FontWeight::BOLD,
-                        ..Default::default()
-                    }));
-
-                    self.consume_paragraph(source_range, node, paragraph, highlights, regions);
-                } else if local_name!("i") == name.local {
-                    highlights.push(MarkdownHighlight::Style(MarkdownHighlightStyle {
-                        italic: true,
-                        ..Default::default()
-                    }));
-
-                    self.consume_paragraph(source_range, node, paragraph, highlights, regions);
-                } else if local_name!("em") == name.local {
-                    highlights.push(MarkdownHighlight::Style(MarkdownHighlightStyle {
-                        oblique: true,
-                        ..Default::default()
-                    }));
-
-                    self.consume_paragraph(source_range, node, paragraph, highlights, regions);
-                } else if local_name!("del") == name.local {
-                    highlights.push(MarkdownHighlight::Style(MarkdownHighlightStyle {
-                        strikethrough: true,
-                        ..Default::default()
-                    }));
-
-                    self.consume_paragraph(source_range, node, paragraph, highlights, regions);
-                } else if local_name!("ins") == name.local {
-                    highlights.push(MarkdownHighlight::Style(MarkdownHighlightStyle {
-                        underline: true,
-                        ..Default::default()
-                    }));
-
-                    self.consume_paragraph(source_range, node, paragraph, highlights, regions);
-                } else if local_name!("a") == name.local {
-                    if let Some(url) = Self::attr_value(attrs, local_name!("href"))
-                        && let Some(link) =
-                            Link::identify(self.file_location_directory.clone(), url)
-                    {
-                        highlights.push(MarkdownHighlight::Style(MarkdownHighlightStyle {
-                            link: true,
-                            ..Default::default()
-                        }));
-
-                        regions.push((
-                            source_range.clone(),
-                            ParsedRegion {
-                                code: false,
-                                link: Some(link),
-                            },
-                        ));
-                    }
-
-                    self.consume_paragraph(source_range, node, paragraph, highlights, regions);
-                } else {
-                    self.consume_paragraph(source_range, node, paragraph, highlights, regions);
-                }
-            }
-            _ => {}
-        }
-    }
-
-    fn consume_paragraph(
-        &self,
-        source_range: Range<usize>,
-        node: &Rc<markup5ever_rcdom::Node>,
-        paragraph: &mut MarkdownParagraph,
-        highlights: &mut Vec<MarkdownHighlight>,
-        regions: &mut Vec<(Range<usize>, ParsedRegion)>,
-    ) {
-        for node in node.children.borrow().iter() {
-            self.parse_paragraph(source_range.clone(), node, paragraph, highlights, regions);
-        }
-    }
-
-    fn parse_table_row(
-        &self,
-        source_range: Range<usize>,
-        node: &Rc<markup5ever_rcdom::Node>,
-    ) -> Option<ParsedMarkdownTableRow> {
-        let mut columns = Vec::new();
-
-        match &node.data {
-            markup5ever_rcdom::NodeData::Element { name, .. } => {
-                if local_name!("tr") != name.local {
-                    return None;
-                }
-
-                for node in node.children.borrow().iter() {
-                    if let Some(column) = self.parse_table_column(source_range.clone(), node) {
-                        columns.push(column);
-                    }
-                }
-            }
-            _ => {}
-        }
-
-        if columns.is_empty() {
-            None
-        } else {
-            Some(ParsedMarkdownTableRow { columns })
-        }
-    }
-
-    fn parse_table_column(
-        &self,
-        source_range: Range<usize>,
-        node: &Rc<markup5ever_rcdom::Node>,
-    ) -> Option<ParsedMarkdownTableColumn> {
-        match &node.data {
-            markup5ever_rcdom::NodeData::Element { name, attrs, .. } => {
-                if !matches!(name.local, local_name!("th") | local_name!("td")) {
-                    return None;
-                }
-
-                let mut children = MarkdownParagraph::new();
-                self.consume_paragraph(
-                    source_range,
-                    node,
-                    &mut children,
-                    &mut Vec::new(),
-                    &mut Vec::new(),
-                );
-
-                let is_header = matches!(name.local, local_name!("th"));
-
-                Some(ParsedMarkdownTableColumn {
-                    col_span: std::cmp::max(
-                        Self::attr_value(attrs, local_name!("colspan"))
-                            .and_then(|span| span.parse().ok())
-                            .unwrap_or(1),
-                        1,
-                    ),
-                    row_span: std::cmp::max(
-                        Self::attr_value(attrs, local_name!("rowspan"))
-                            .and_then(|span| span.parse().ok())
-                            .unwrap_or(1),
-                        1,
-                    ),
-                    is_header,
-                    children,
-                    alignment: Self::attr_value(attrs, local_name!("align"))
-                        .and_then(|align| match align.as_str() {
-                            "left" => Some(ParsedMarkdownTableAlignment::Left),
-                            "center" => Some(ParsedMarkdownTableAlignment::Center),
-                            "right" => Some(ParsedMarkdownTableAlignment::Right),
-                            _ => None,
-                        })
-                        .unwrap_or_else(|| {
-                            if is_header {
-                                ParsedMarkdownTableAlignment::Center
-                            } else {
-                                ParsedMarkdownTableAlignment::default()
-                            }
-                        }),
-                })
-            }
-            _ => None,
-        }
-    }
-
-    fn consume_children(
-        &self,
-        source_range: Range<usize>,
-        node: &Rc<markup5ever_rcdom::Node>,
-        elements: &mut Vec<ParsedMarkdownElement>,
-        context: &ParseHtmlNodeContext,
-    ) {
-        for node in node.children.borrow().iter() {
-            self.parse_html_node(source_range.clone(), node, elements, context);
-        }
-    }
-
-    fn attr_value(
-        attrs: &RefCell<Vec<html5ever::Attribute>>,
-        name: html5ever::LocalName,
-    ) -> Option<String> {
-        attrs.borrow().iter().find_map(|attr| {
-            if attr.name.local == name {
-                Some(attr.value.to_string())
-            } else {
-                None
-            }
-        })
-    }
-
-    fn markdown_style_from_html_styles(
-        styles: HashMap<String, String>,
-    ) -> Option<MarkdownHighlightStyle> {
-        let mut markdown_style = MarkdownHighlightStyle::default();
-
-        if let Some(text_decoration) = styles.get("text-decoration") {
-            match text_decoration.to_lowercase().as_str() {
-                "underline" => {
-                    markdown_style.underline = true;
-                }
-                "line-through" => {
-                    markdown_style.strikethrough = true;
-                }
-                _ => {}
-            }
-        }
-
-        if let Some(font_style) = styles.get("font-style") {
-            match font_style.to_lowercase().as_str() {
-                "italic" => {
-                    markdown_style.italic = true;
-                }
-                "oblique" => {
-                    markdown_style.oblique = true;
-                }
-                _ => {}
-            }
-        }
-
-        if let Some(font_weight) = styles.get("font-weight") {
-            match font_weight.to_lowercase().as_str() {
-                "bold" => {
-                    markdown_style.weight = FontWeight::BOLD;
-                }
-                "lighter" => {
-                    markdown_style.weight = FontWeight::THIN;
-                }
-                _ => {
-                    if let Some(weight) = font_weight.parse::<f32>().ok() {
-                        markdown_style.weight = FontWeight(weight);
-                    }
-                }
-            }
-        }
-
-        if markdown_style != MarkdownHighlightStyle::default() {
-            Some(markdown_style)
-        } else {
-            None
-        }
-    }
-
-    fn extract_styles_from_attributes(
-        attrs: &RefCell<Vec<html5ever::Attribute>>,
-    ) -> HashMap<String, String> {
-        let mut styles = HashMap::new();
-
-        if let Some(style) = Self::attr_value(attrs, local_name!("style")) {
-            for decl in style.split(';') {
-                let mut parts = decl.splitn(2, ':');
-                if let Some((key, value)) = parts.next().zip(parts.next()) {
-                    styles.insert(
-                        key.trim().to_lowercase().to_string(),
-                        value.trim().to_string(),
-                    );
-                }
-            }
-        }
-
-        styles
-    }
-
-    fn extract_image(
-        &self,
-        source_range: Range<usize>,
-        attrs: &RefCell<Vec<html5ever::Attribute>>,
-    ) -> Option<Image> {
-        let src = Self::attr_value(attrs, local_name!("src"))?;
-
-        let mut image = Image::identify(src, source_range, self.file_location_directory.clone())?;
-
-        if let Some(alt) = Self::attr_value(attrs, local_name!("alt")) {
-            image.set_alt_text(alt.into());
-        }
-
-        let styles = Self::extract_styles_from_attributes(attrs);
-
-        if let Some(width) = Self::attr_value(attrs, local_name!("width"))
-            .or_else(|| styles.get("width").cloned())
-            .and_then(|width| Self::parse_html_element_dimension(&width))
-        {
-            image.set_width(width);
-        }
-
-        if let Some(height) = Self::attr_value(attrs, local_name!("height"))
-            .or_else(|| styles.get("height").cloned())
-            .and_then(|height| Self::parse_html_element_dimension(&height))
-        {
-            image.set_height(height);
-        }
-
-        Some(image)
-    }
-
-    fn extract_html_list(
-        &self,
-        node: &Rc<markup5ever_rcdom::Node>,
-        ordered: bool,
-        depth: u16,
-        source_range: Range<usize>,
-    ) -> Option<Vec<ParsedMarkdownElement>> {
-        let mut list_items = Vec::with_capacity(node.children.borrow().len());
-
-        for (index, node) in node.children.borrow().iter().enumerate() {
-            match &node.data {
-                markup5ever_rcdom::NodeData::Element { name, .. } => {
-                    if local_name!("li") != name.local {
-                        continue;
-                    }
-
-                    let mut content = Vec::new();
-                    self.consume_children(
-                        source_range.clone(),
-                        node,
-                        &mut content,
-                        &ParseHtmlNodeContext {
-                            list_item_depth: depth + 1,
-                        },
-                    );
-
-                    if !content.is_empty() {
-                        list_items.push(ParsedMarkdownElement::ListItem(ParsedMarkdownListItem {
-                            depth,
-                            source_range: source_range.clone(),
-                            item_type: if ordered {
-                                ParsedMarkdownListItemType::Ordered(index as u64 + 1)
-                            } else {
-                                ParsedMarkdownListItemType::Unordered
-                            },
-                            content,
-                            nested: true,
-                        }));
-                    }
-                }
-                _ => {}
-            }
-        }
-
-        if list_items.is_empty() {
-            None
-        } else {
-            Some(list_items)
-        }
-    }
-
-    fn parse_html_element_dimension(value: &str) -> Option<DefiniteLength> {
-        if value.ends_with("%") {
-            value
-                .trim_end_matches("%")
-                .parse::<f32>()
-                .ok()
-                .map(|value| relative(value / 100.))
-        } else {
-            value
-                .trim_end_matches("px")
-                .parse()
-                .ok()
-                .map(|value| px(value).into())
-        }
-    }
-
-    fn extract_html_blockquote(
-        &self,
-        node: &Rc<markup5ever_rcdom::Node>,
-        source_range: Range<usize>,
-    ) -> Option<ParsedMarkdownBlockQuote> {
-        let mut children = Vec::new();
-        self.consume_children(
-            source_range.clone(),
-            node,
-            &mut children,
-            &ParseHtmlNodeContext::default(),
-        );
-
-        if children.is_empty() {
-            None
-        } else {
-            Some(ParsedMarkdownBlockQuote {
-                children,
-                source_range,
-            })
-        }
-    }
-
-    fn extract_html_table(
-        &self,
-        node: &Rc<markup5ever_rcdom::Node>,
-        source_range: Range<usize>,
-    ) -> Option<ParsedMarkdownTable> {
-        let mut header_rows = Vec::new();
-        let mut body_rows = Vec::new();
-        let mut caption = None;
-
-        // node should be a thead, tbody or caption element
-        for node in node.children.borrow().iter() {
-            match &node.data {
-                markup5ever_rcdom::NodeData::Element { name, .. } => {
-                    if local_name!("caption") == name.local {
-                        let mut paragraph = MarkdownParagraph::new();
-                        self.parse_paragraph(
-                            source_range.clone(),
-                            node,
-                            &mut paragraph,
-                            &mut Vec::new(),
-                            &mut Vec::new(),
-                        );
-                        caption = Some(paragraph);
-                    }
-                    if local_name!("thead") == name.local {
-                        // node should be a tr element
-                        for node in node.children.borrow().iter() {
-                            if let Some(row) = self.parse_table_row(source_range.clone(), node) {
-                                header_rows.push(row);
-                            }
-                        }
-                    } else if local_name!("tbody") == name.local {
-                        // node should be a tr element
-                        for node in node.children.borrow().iter() {
-                            if let Some(row) = self.parse_table_row(source_range.clone(), node) {
-                                body_rows.push(row);
-                            }
-                        }
-                    }
-                }
-                _ => {}
-            }
-        }
-
-        if !header_rows.is_empty() || !body_rows.is_empty() {
-            Some(ParsedMarkdownTable {
-                source_range,
-                body: body_rows,
-                header: header_rows,
-                caption,
-            })
-        } else {
-            None
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use ParsedMarkdownListItemType::*;
-    use core::panic;
-    use gpui::{AbsoluteLength, BackgroundExecutor, DefiniteLength};
-    use language::{HighlightId, LanguageRegistry};
-    use pretty_assertions::assert_eq;
-
-    async fn parse(input: &str) -> ParsedMarkdown {
-        parse_markdown(input, None, None).await
-    }
-
-    #[gpui::test]
-    async fn test_headings() {
-        let parsed = parse("# Heading one\n## Heading two\n### Heading three").await;
-
-        assert_eq!(
-            parsed.children,
-            vec![
-                h1(text("Heading one", 2..13), 0..14),
-                h2(text("Heading two", 17..28), 14..29),
-                h3(text("Heading three", 33..46), 29..46),
-            ]
-        );
-    }
-
-    #[gpui::test]
-    async fn test_newlines_dont_new_paragraphs() {
-        let parsed = parse("Some text **that is bolded**\n and *italicized*").await;
-
-        assert_eq!(
-            parsed.children,
-            vec![p("Some text that is bolded and italicized", 0..46)]
-        );
-    }
-
-    #[gpui::test]
-    async fn test_heading_with_paragraph() {
-        let parsed = parse("# Zed\nThe editor").await;
-
-        assert_eq!(
-            parsed.children,
-            vec![h1(text("Zed", 2..5), 0..6), p("The editor", 6..16),]
-        );
-    }
-
-    #[gpui::test]
-    async fn test_double_newlines_do_new_paragraphs() {
-        let parsed = parse("Some text **that is bolded**\n\n and *italicized*").await;
-
-        assert_eq!(
-            parsed.children,
-            vec![
-                p("Some text that is bolded", 0..29),
-                p("and italicized", 31..47),
-            ]
-        );
-    }
-
-    #[gpui::test]
-    async fn test_bold_italic_text() {
-        let parsed = parse("Some text **that is bolded** and *italicized*").await;
-
-        assert_eq!(
-            parsed.children,
-            vec![p("Some text that is bolded and italicized", 0..45)]
-        );
-    }
-
-    #[gpui::test]
-    async fn test_nested_bold_strikethrough_text() {
-        let parsed = parse("Some **bo~~strikethrough~~ld** text").await;
-
-        assert_eq!(parsed.children.len(), 1);
-        assert_eq!(
-            parsed.children[0],
-            ParsedMarkdownElement::Paragraph(vec![MarkdownParagraphChunk::Text(
-                ParsedMarkdownText {
-                    source_range: 0..35,
-                    contents: "Some bostrikethroughld text".into(),
-                    highlights: Vec::new(),
-                    regions: Vec::new(),
-                }
-            )])
-        );
-
-        let new_text = if let ParsedMarkdownElement::Paragraph(text) = &parsed.children[0] {
-            text
-        } else {
-            panic!("Expected a paragraph");
-        };
-
-        let paragraph = if let MarkdownParagraphChunk::Text(text) = &new_text[0] {
-            text
-        } else {
-            panic!("Expected a text");
-        };
-
-        assert_eq!(
-            paragraph.highlights,
-            vec![
-                (
-                    5..7,
-                    MarkdownHighlight::Style(MarkdownHighlightStyle {
-                        weight: FontWeight::BOLD,
-                        ..Default::default()
-                    }),
-                ),
-                (
-                    7..20,
-                    MarkdownHighlight::Style(MarkdownHighlightStyle {
-                        weight: FontWeight::BOLD,
-                        strikethrough: true,
-                        ..Default::default()
-                    }),
-                ),
-                (
-                    20..22,
-                    MarkdownHighlight::Style(MarkdownHighlightStyle {
-                        weight: FontWeight::BOLD,
-                        ..Default::default()
-                    }),
-                ),
-            ]
-        );
-    }
-
-    #[gpui::test]
-    async fn test_html_inline_style_elements() {
-        let parsed =
-                parse("<p>Some text <strong>strong text</strong> more text <b>bold text</b> more text <i>italic text</i> more text <em>emphasized text</em> more text <del>deleted text</del> more text <ins>inserted text</ins></p>").await;
-
-        assert_eq!(1, parsed.children.len());
-        let chunks = if let ParsedMarkdownElement::Paragraph(chunks) = &parsed.children[0] {
-            chunks
-        } else {
-            panic!("Expected a paragraph");
-        };
-
-        assert_eq!(1, chunks.len());
-        let text = if let MarkdownParagraphChunk::Text(text) = &chunks[0] {
-            text
-        } else {
-            panic!("Expected a paragraph");
-        };
-
-        assert_eq!(0..205, text.source_range);
-        assert_eq!(
-            "Some text strong text more text bold text more text italic text more text emphasized text more text deleted text more text inserted text",
-            text.contents.as_str(),
-        );
-        assert_eq!(
-            vec![
-                (
-                    10..21,
-                    MarkdownHighlight::Style(MarkdownHighlightStyle {
-                        weight: FontWeight(700.0),
-                        ..Default::default()
-                    },),
-                ),
-                (
-                    32..41,
-                    MarkdownHighlight::Style(MarkdownHighlightStyle {
-                        weight: FontWeight(700.0),
-                        ..Default::default()
-                    },),
-                ),
-                (
-                    52..63,
-                    MarkdownHighlight::Style(MarkdownHighlightStyle {
-                        italic: true,
-                        weight: FontWeight(400.0),
-                        ..Default::default()
-                    },),
-                ),
-                (
-                    74..89,
-                    MarkdownHighlight::Style(MarkdownHighlightStyle {
-                        weight: FontWeight(400.0),
-                        oblique: true,
-                        ..Default::default()
-                    },),
-                ),
-                (
-                    100..112,
-                    MarkdownHighlight::Style(MarkdownHighlightStyle {
-                        strikethrough: true,
-                        weight: FontWeight(400.0),
-                        ..Default::default()
-                    },),
-                ),
-                (
-                    123..136,
-                    MarkdownHighlight::Style(MarkdownHighlightStyle {
-                        underline: true,
-                        weight: FontWeight(400.0,),
-                        ..Default::default()
-                    },),
-                ),
-            ],
-            text.highlights
-        );
-    }
-
-    #[gpui::test]
-    async fn test_html_href_element() {
-        let parsed =
-            parse("<p>Some text <a href=\"https://example.com\">link</a> more text</p>").await;
-
-        assert_eq!(1, parsed.children.len());
-        let chunks = if let ParsedMarkdownElement::Paragraph(chunks) = &parsed.children[0] {
-            chunks
-        } else {
-            panic!("Expected a paragraph");
-        };
-
-        assert_eq!(1, chunks.len());
-        let text = if let MarkdownParagraphChunk::Text(text) = &chunks[0] {
-            text
-        } else {
-            panic!("Expected a paragraph");
-        };
-
-        assert_eq!(0..65, text.source_range);
-        assert_eq!("Some text link more text", text.contents.as_str(),);
-        assert_eq!(
-            vec![(
-                10..14,
-                MarkdownHighlight::Style(MarkdownHighlightStyle {
-                    link: true,
-                    ..Default::default()
-                },),
-            )],
-            text.highlights
-        );
-        assert_eq!(
-            vec![(
-                10..14,
-                ParsedRegion {
-                    code: false,
-                    link: Some(Link::Web {
-                        url: "https://example.com".into()
-                    })
-                }
-            )],
-            text.regions
-        )
-    }
-
-    #[gpui::test]
-    async fn test_text_with_inline_html() {
-        let parsed = parse("This is a paragraph with an inline HTML <sometag>tag</sometag>.").await;
-
-        assert_eq!(
-            parsed.children,
-            vec![p("This is a paragraph with an inline HTML tag.", 0..63),],
-        );
-    }
-
-    #[gpui::test]
-    async fn test_raw_links_detection() {
-        let parsed = parse("Checkout this https://zed.dev link").await;
-
-        assert_eq!(
-            parsed.children,
-            vec![p("Checkout this https://zed.dev link", 0..34)]
-        );
-    }
-
-    #[gpui::test]
-    async fn test_empty_image() {
-        let parsed = parse("![]()").await;
-
-        let paragraph = if let ParsedMarkdownElement::Paragraph(text) = &parsed.children[0] {
-            text
-        } else {
-            panic!("Expected a paragraph");
-        };
-        assert_eq!(paragraph.len(), 0);
-    }
-
-    #[gpui::test]
-    async fn test_image_links_detection() {
-        let parsed = parse("![test](https://blog.logrocket.com/wp-content/uploads/2024/04/exploring-zed-open-source-code-editor-rust-2.png)").await;
-
-        let paragraph = if let ParsedMarkdownElement::Paragraph(text) = &parsed.children[0] {
-            text
-        } else {
-            panic!("Expected a paragraph");
-        };
-        assert_eq!(
-                paragraph[0],
-                MarkdownParagraphChunk::Image(Image {
-                    source_range: 0..111,
-                    link: Link::Web {
-                        url: "https://blog.logrocket.com/wp-content/uploads/2024/04/exploring-zed-open-source-code-editor-rust-2.png".to_string(),
-                    },
-                    alt_text: Some("test".into()),
-                    height: None,
-                    width: None,
-                },)
-            );
-    }
-
-    #[gpui::test]
-    async fn test_image_alt_text() {
-        let parsed = parse("[![Zed](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/zed-industries/zed/main/assets/badge/v0.json)](https://zed.dev)\n ").await;
-
-        let paragraph = if let ParsedMarkdownElement::Paragraph(text) = &parsed.children[0] {
-            text
-        } else {
-            panic!("Expected a paragraph");
-        };
-        assert_eq!(
-                    paragraph[0],
-                    MarkdownParagraphChunk::Image(Image {
-                        source_range: 0..142,
-                        link: Link::Web {
-                            url: "https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/zed-industries/zed/main/assets/badge/v0.json".to_string(),
-                        },
-                        alt_text: Some("Zed".into()),
-                        height: None,
-                        width: None,
-                    },)
-                );
-    }
-
-    #[gpui::test]
-    async fn test_image_without_alt_text() {
-        let parsed = parse("![](http://example.com/foo.png)").await;
-
-        let paragraph = if let ParsedMarkdownElement::Paragraph(text) = &parsed.children[0] {
-            text
-        } else {
-            panic!("Expected a paragraph");
-        };
-        assert_eq!(
-            paragraph[0],
-            MarkdownParagraphChunk::Image(Image {
-                source_range: 0..31,
-                link: Link::Web {
-                    url: "http://example.com/foo.png".to_string(),
-                },
-                alt_text: None,
-                height: None,
-                width: None,
-            },)
-        );
-    }
-
-    #[gpui::test]
-    async fn test_image_with_alt_text_containing_formatting() {
-        let parsed = parse("![foo *bar* baz](http://example.com/foo.png)").await;
-
-        let ParsedMarkdownElement::Paragraph(chunks) = &parsed.children[0] else {
-            panic!("Expected a paragraph");
-        };
-        assert_eq!(
-            chunks,
-            &[MarkdownParagraphChunk::Image(Image {
-                source_range: 0..44,
-                link: Link::Web {
-                    url: "http://example.com/foo.png".to_string(),
-                },
-                alt_text: Some("foo bar baz".into()),
-                height: None,
-                width: None,
-            }),],
-        );
-    }
-
-    #[gpui::test]
-    async fn test_images_with_text_in_between() {
-        let parsed = parse(
-            "![foo](http://example.com/foo.png)\nLorem Ipsum\n![bar](http://example.com/bar.png)",
-        )
-        .await;
-
-        let chunks = if let ParsedMarkdownElement::Paragraph(text) = &parsed.children[0] {
-            text
-        } else {
-            panic!("Expected a paragraph");
-        };
-        assert_eq!(
-            chunks,
-            &vec![
-                MarkdownParagraphChunk::Image(Image {
-                    source_range: 0..81,
-                    link: Link::Web {
-                        url: "http://example.com/foo.png".to_string(),
-                    },
-                    alt_text: Some("foo".into()),
-                    height: None,
-                    width: None,
-                }),
-                MarkdownParagraphChunk::Text(ParsedMarkdownText {
-                    source_range: 0..81,
-                    contents: " Lorem Ipsum ".into(),
-                    highlights: Vec::new(),
-                    regions: Vec::new(),
-                }),
-                MarkdownParagraphChunk::Image(Image {
-                    source_range: 0..81,
-                    link: Link::Web {
-                        url: "http://example.com/bar.png".to_string(),
-                    },
-                    alt_text: Some("bar".into()),
-                    height: None,
-                    width: None,
-                })
-            ]
-        );
-    }
-
-    #[test]
-    fn test_parse_html_element_dimension() {
-        // Test percentage values
-        assert_eq!(
-            MarkdownParser::parse_html_element_dimension("50%"),
-            Some(DefiniteLength::Fraction(0.5))
-        );
-        assert_eq!(
-            MarkdownParser::parse_html_element_dimension("100%"),
-            Some(DefiniteLength::Fraction(1.0))
-        );
-        assert_eq!(
-            MarkdownParser::parse_html_element_dimension("25%"),
-            Some(DefiniteLength::Fraction(0.25))
-        );
-        assert_eq!(
-            MarkdownParser::parse_html_element_dimension("0%"),
-            Some(DefiniteLength::Fraction(0.0))
-        );
-
-        // Test pixel values
-        assert_eq!(
-            MarkdownParser::parse_html_element_dimension("100px"),
-            Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(100.0))))
-        );
-        assert_eq!(
-            MarkdownParser::parse_html_element_dimension("50px"),
-            Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(50.0))))
-        );
-        assert_eq!(
-            MarkdownParser::parse_html_element_dimension("0px"),
-            Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(0.0))))
-        );
-
-        // Test values without units (should be treated as pixels)
-        assert_eq!(
-            MarkdownParser::parse_html_element_dimension("100"),
-            Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(100.0))))
-        );
-        assert_eq!(
-            MarkdownParser::parse_html_element_dimension("42"),
-            Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(42.0))))
-        );
-
-        // Test invalid values
-        assert_eq!(
-            MarkdownParser::parse_html_element_dimension("invalid"),
-            None
-        );
-        assert_eq!(MarkdownParser::parse_html_element_dimension("px"), None);
-        assert_eq!(MarkdownParser::parse_html_element_dimension("%"), None);
-        assert_eq!(MarkdownParser::parse_html_element_dimension(""), None);
-        assert_eq!(MarkdownParser::parse_html_element_dimension("abc%"), None);
-        assert_eq!(MarkdownParser::parse_html_element_dimension("abcpx"), None);
-
-        // Test decimal values
-        assert_eq!(
-            MarkdownParser::parse_html_element_dimension("50.5%"),
-            Some(DefiniteLength::Fraction(0.505))
-        );
-        assert_eq!(
-            MarkdownParser::parse_html_element_dimension("100.25px"),
-            Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(100.25))))
-        );
-        assert_eq!(
-            MarkdownParser::parse_html_element_dimension("42.0"),
-            Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(42.0))))
-        );
-    }
-
-    #[gpui::test]
-    async fn test_html_unordered_list() {
-        let parsed = parse(
-            "<ul>
-              <li>Item 1</li>
-              <li>Item 2</li>
-            </ul>",
-        )
-        .await;
-
-        assert_eq!(
-            ParsedMarkdown {
-                children: vec![
-                    nested_list_item(
-                        0..82,
-                        1,
-                        ParsedMarkdownListItemType::Unordered,
-                        vec![ParsedMarkdownElement::Paragraph(text("Item 1", 0..82))]
-                    ),
-                    nested_list_item(
-                        0..82,
-                        1,
-                        ParsedMarkdownListItemType::Unordered,
-                        vec![ParsedMarkdownElement::Paragraph(text("Item 2", 0..82))]
-                    ),
-                ]
-            },
-            parsed
-        );
-    }
-
-    #[gpui::test]
-    async fn test_html_ordered_list() {
-        let parsed = parse(
-            "<ol>
-              <li>Item 1</li>
-              <li>Item 2</li>
-            </ol>",
-        )
-        .await;
-
-        assert_eq!(
-            ParsedMarkdown {
-                children: vec![
-                    nested_list_item(
-                        0..82,
-                        1,
-                        ParsedMarkdownListItemType::Ordered(1),
-                        vec![ParsedMarkdownElement::Paragraph(text("Item 1", 0..82))]
-                    ),
-                    nested_list_item(
-                        0..82,
-                        1,
-                        ParsedMarkdownListItemType::Ordered(2),
-                        vec![ParsedMarkdownElement::Paragraph(text("Item 2", 0..82))]
-                    ),
-                ]
-            },
-            parsed
-        );
-    }
-
-    #[gpui::test]
-    async fn test_html_nested_ordered_list() {
-        let parsed = parse(
-            "<ol>
-              <li>Item 1</li>
-              <li>Item 2
-                <ol>
-                  <li>Sub-Item 1</li>
-                  <li>Sub-Item 2</li>
-                </ol>
-              </li>
-            </ol>",
-        )
-        .await;
-
-        assert_eq!(
-            ParsedMarkdown {
-                children: vec![
-                    nested_list_item(
-                        0..216,
-                        1,
-                        ParsedMarkdownListItemType::Ordered(1),
-                        vec![ParsedMarkdownElement::Paragraph(text("Item 1", 0..216))]
-                    ),
-                    nested_list_item(
-                        0..216,
-                        1,
-                        ParsedMarkdownListItemType::Ordered(2),
-                        vec![
-                            ParsedMarkdownElement::Paragraph(text("Item 2", 0..216)),
-                            nested_list_item(
-                                0..216,
-                                2,
-                                ParsedMarkdownListItemType::Ordered(1),
-                                vec![ParsedMarkdownElement::Paragraph(text("Sub-Item 1", 0..216))]
-                            ),
-                            nested_list_item(
-                                0..216,
-                                2,
-                                ParsedMarkdownListItemType::Ordered(2),
-                                vec![ParsedMarkdownElement::Paragraph(text("Sub-Item 2", 0..216))]
-                            ),
-                        ]
-                    ),
-                ]
-            },
-            parsed
-        );
-    }
-
-    #[gpui::test]
-    async fn test_html_nested_unordered_list() {
-        let parsed = parse(
-            "<ul>
-              <li>Item 1</li>
-              <li>Item 2
-                <ul>
-                  <li>Sub-Item 1</li>
-                  <li>Sub-Item 2</li>
-                </ul>
-              </li>
-            </ul>",
-        )
-        .await;
-
-        assert_eq!(
-            ParsedMarkdown {
-                children: vec![
-                    nested_list_item(
-                        0..216,
-                        1,
-                        ParsedMarkdownListItemType::Unordered,
-                        vec![ParsedMarkdownElement::Paragraph(text("Item 1", 0..216))]
-                    ),
-                    nested_list_item(
-                        0..216,
-                        1,
-                        ParsedMarkdownListItemType::Unordered,
-                        vec![
-                            ParsedMarkdownElement::Paragraph(text("Item 2", 0..216)),
-                            nested_list_item(
-                                0..216,
-                                2,
-                                ParsedMarkdownListItemType::Unordered,
-                                vec![ParsedMarkdownElement::Paragraph(text("Sub-Item 1", 0..216))]
-                            ),
-                            nested_list_item(
-                                0..216,
-                                2,
-                                ParsedMarkdownListItemType::Unordered,
-                                vec![ParsedMarkdownElement::Paragraph(text("Sub-Item 2", 0..216))]
-                            ),
-                        ]
-                    ),
-                ]
-            },
-            parsed
-        );
-    }
-
-    #[gpui::test]
-    async fn test_inline_html_image_tag() {
-        let parsed =
-            parse("<p>Some text<img src=\"http://example.com/foo.png\" /> some more text</p>")
-                .await;
-
-        assert_eq!(
-            ParsedMarkdown {
-                children: vec![ParsedMarkdownElement::Paragraph(vec![
-                    MarkdownParagraphChunk::Text(ParsedMarkdownText {
-                        source_range: 0..71,
-                        contents: "Some text".into(),
-                        highlights: Default::default(),
-                        regions: Default::default()
-                    }),
-                    MarkdownParagraphChunk::Image(Image {
-                        source_range: 0..71,
-                        link: Link::Web {
-                            url: "http://example.com/foo.png".to_string(),
-                        },
-                        alt_text: None,
-                        height: None,
-                        width: None,
-                    }),
-                    MarkdownParagraphChunk::Text(ParsedMarkdownText {
-                        source_range: 0..71,
-                        contents: " some more text".into(),
-                        highlights: Default::default(),
-                        regions: Default::default()
-                    }),
-                ])]
-            },
-            parsed
-        );
-    }
-
-    #[gpui::test]
-    async fn test_html_block_quote() {
-        let parsed = parse(
-            "<blockquote>
-                <p>some description</p>
-            </blockquote>",
-        )
-        .await;
-
-        assert_eq!(
-            ParsedMarkdown {
-                children: vec![block_quote(
-                    vec![ParsedMarkdownElement::Paragraph(text(
-                        "some description",
-                        0..78
-                    ))],
-                    0..78,
-                )]
-            },
-            parsed
-        );
-    }
-
-    #[gpui::test]
-    async fn test_html_nested_block_quote() {
-        let parsed = parse(
-            "<blockquote>
-                <p>some description</p>
-                <blockquote>
-                <p>second description</p>
-                </blockquote>
-            </blockquote>",
-        )
-        .await;
-
-        assert_eq!(
-            ParsedMarkdown {
-                children: vec![block_quote(
-                    vec![
-                        ParsedMarkdownElement::Paragraph(text("some description", 0..179)),
-                        block_quote(
-                            vec![ParsedMarkdownElement::Paragraph(text(
-                                "second description",
-                                0..179
-                            ))],
-                            0..179,
-                        )
-                    ],
-                    0..179,
-                )]
-            },
-            parsed
-        );
-    }
-
-    #[gpui::test]
-    async fn test_html_table() {
-        let parsed = parse(
-            "<table>
-          <thead>
-            <tr>
-              <th>Id</th>
-              <th>Name</th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr>
-              <td>1</td>
-              <td>Chris</td>
-            </tr>
-            <tr>
-              <td>2</td>
-              <td>Dennis</td>
-            </tr>
-          </tbody>
-        </table>",
-        )
-        .await;
-
-        assert_eq!(
-            ParsedMarkdown {
-                children: vec![ParsedMarkdownElement::Table(table(
-                    0..366,
-                    None,
-                    vec![row(vec![
-                        column(
-                            1,
-                            1,
-                            true,
-                            text("Id", 0..366),
-                            ParsedMarkdownTableAlignment::Center
-                        ),
-                        column(
-                            1,
-                            1,
-                            true,
-                            text("Name ", 0..366),
-                            ParsedMarkdownTableAlignment::Center
-                        )
-                    ])],
-                    vec![
-                        row(vec![
-                            column(
-                                1,
-                                1,
-                                false,
-                                text("1", 0..366),
-                                ParsedMarkdownTableAlignment::None
-                            ),
-                            column(
-                                1,
-                                1,
-                                false,
-                                text("Chris", 0..366),
-                                ParsedMarkdownTableAlignment::None
-                            )
-                        ]),
-                        row(vec![
-                            column(
-                                1,
-                                1,
-                                false,
-                                text("2", 0..366),
-                                ParsedMarkdownTableAlignment::None
-                            ),
-                            column(
-                                1,
-                                1,
-                                false,
-                                text("Dennis", 0..366),
-                                ParsedMarkdownTableAlignment::None
-                            )
-                        ]),
-                    ],
-                ))],
-            },
-            parsed
-        );
-    }
-
-    #[gpui::test]
-    async fn test_html_table_with_caption() {
-        let parsed = parse(
-            "<table>
-            <caption>My Table</caption>
-          <tbody>
-            <tr>
-              <td>1</td>
-              <td>Chris</td>
-            </tr>
-            <tr>
-              <td>2</td>
-              <td>Dennis</td>
-            </tr>
-          </tbody>
-        </table>",
-        )
-        .await;
-
-        assert_eq!(
-            ParsedMarkdown {
-                children: vec![ParsedMarkdownElement::Table(table(
-                    0..280,
-                    Some(vec![MarkdownParagraphChunk::Text(ParsedMarkdownText {
-                        source_range: 0..280,
-                        contents: "My Table".into(),
-                        highlights: Default::default(),
-                        regions: Default::default()
-                    })]),
-                    vec![],
-                    vec![
-                        row(vec![
-                            column(
-                                1,
-                                1,
-                                false,
-                                text("1", 0..280),
-                                ParsedMarkdownTableAlignment::None
-                            ),
-                            column(
-                                1,
-                                1,
-                                false,
-                                text("Chris", 0..280),
-                                ParsedMarkdownTableAlignment::None
-                            )
-                        ]),
-                        row(vec![
-                            column(
-                                1,
-                                1,
-                                false,
-                                text("2", 0..280),
-                                ParsedMarkdownTableAlignment::None
-                            ),
-                            column(
-                                1,
-                                1,
-                                false,
-                                text("Dennis", 0..280),
-                                ParsedMarkdownTableAlignment::None
-                            )
-                        ]),
-                    ],
-                ))],
-            },
-            parsed
-        );
-    }
-
-    #[gpui::test]
-    async fn test_html_table_without_headings() {
-        let parsed = parse(
-            "<table>
-          <tbody>
-            <tr>
-              <td>1</td>
-              <td>Chris</td>
-            </tr>
-            <tr>
-              <td>2</td>
-              <td>Dennis</td>
-            </tr>
-          </tbody>
-        </table>",
-        )
-        .await;
-
-        assert_eq!(
-            ParsedMarkdown {
-                children: vec![ParsedMarkdownElement::Table(table(
-                    0..240,
-                    None,
-                    vec![],
-                    vec![
-                        row(vec![
-                            column(
-                                1,
-                                1,
-                                false,
-                                text("1", 0..240),
-                                ParsedMarkdownTableAlignment::None
-                            ),
-                            column(
-                                1,
-                                1,
-                                false,
-                                text("Chris", 0..240),
-                                ParsedMarkdownTableAlignment::None
-                            )
-                        ]),
-                        row(vec![
-                            column(
-                                1,
-                                1,
-                                false,
-                                text("2", 0..240),
-                                ParsedMarkdownTableAlignment::None
-                            ),
-                            column(
-                                1,
-                                1,
-                                false,
-                                text("Dennis", 0..240),
-                                ParsedMarkdownTableAlignment::None
-                            )
-                        ]),
-                    ],
-                ))],
-            },
-            parsed
-        );
-    }
-
-    #[gpui::test]
-    async fn test_html_table_without_body() {
-        let parsed = parse(
-            "<table>
-          <thead>
-            <tr>
-              <th>Id</th>
-              <th>Name</th>
-            </tr>
-          </thead>
-        </table>",
-        )
-        .await;
-
-        assert_eq!(
-            ParsedMarkdown {
-                children: vec![ParsedMarkdownElement::Table(table(
-                    0..150,
-                    None,
-                    vec![row(vec![
-                        column(
-                            1,
-                            1,
-                            true,
-                            text("Id", 0..150),
-                            ParsedMarkdownTableAlignment::Center
-                        ),
-                        column(
-                            1,
-                            1,
-                            true,
-                            text("Name", 0..150),
-                            ParsedMarkdownTableAlignment::Center
-                        )
-                    ])],
-                    vec![],
-                ))],
-            },
-            parsed
-        );
-    }
-
-    #[gpui::test]
-    async fn test_html_heading_tags() {
-        let parsed = parse("<h1>Heading</h1><h2>Heading</h2><h3>Heading</h3><h4>Heading</h4><h5>Heading</h5><h6>Heading</h6>").await;
-
-        assert_eq!(
-            ParsedMarkdown {
-                children: vec![
-                    ParsedMarkdownElement::Heading(ParsedMarkdownHeading {
-                        level: HeadingLevel::H1,
-                        source_range: 0..96,
-                        contents: vec![MarkdownParagraphChunk::Text(ParsedMarkdownText {
-                            source_range: 0..96,
-                            contents: "Heading".into(),
-                            highlights: Vec::default(),
-                            regions: Vec::default()
-                        })],
-                    }),
-                    ParsedMarkdownElement::Heading(ParsedMarkdownHeading {
-                        level: HeadingLevel::H2,
-                        source_range: 0..96,
-                        contents: vec![MarkdownParagraphChunk::Text(ParsedMarkdownText {
-                            source_range: 0..96,
-                            contents: "Heading".into(),
-                            highlights: Vec::default(),
-                            regions: Vec::default()
-                        })],
-                    }),
-                    ParsedMarkdownElement::Heading(ParsedMarkdownHeading {
-                        level: HeadingLevel::H3,
-                        source_range: 0..96,
-                        contents: vec![MarkdownParagraphChunk::Text(ParsedMarkdownText {
-                            source_range: 0..96,
-                            contents: "Heading".into(),
-                            highlights: Vec::default(),
-                            regions: Vec::default()
-                        })],
-                    }),
-                    ParsedMarkdownElement::Heading(ParsedMarkdownHeading {
-                        level: HeadingLevel::H4,
-                        source_range: 0..96,
-                        contents: vec![MarkdownParagraphChunk::Text(ParsedMarkdownText {
-                            source_range: 0..96,
-                            contents: "Heading".into(),
-                            highlights: Vec::default(),
-                            regions: Vec::default()
-                        })],
-                    }),
-                    ParsedMarkdownElement::Heading(ParsedMarkdownHeading {
-                        level: HeadingLevel::H5,
-                        source_range: 0..96,
-                        contents: vec![MarkdownParagraphChunk::Text(ParsedMarkdownText {
-                            source_range: 0..96,
-                            contents: "Heading".into(),
-                            highlights: Vec::default(),
-                            regions: Vec::default()
-                        })],
-                    }),
-                    ParsedMarkdownElement::Heading(ParsedMarkdownHeading {
-                        level: HeadingLevel::H6,
-                        source_range: 0..96,
-                        contents: vec![MarkdownParagraphChunk::Text(ParsedMarkdownText {
-                            source_range: 0..96,
-                            contents: "Heading".into(),
-                            highlights: Vec::default(),
-                            regions: Vec::default()
-                        })],
-                    }),
-                ],
-            },
-            parsed
-        );
-    }
-
-    #[gpui::test]
-    async fn test_html_image_tag() {
-        let parsed = parse("<img src=\"http://example.com/foo.png\" />").await;
-
-        assert_eq!(
-            ParsedMarkdown {
-                children: vec![ParsedMarkdownElement::Image(Image {
-                    source_range: 0..40,
-                    link: Link::Web {
-                        url: "http://example.com/foo.png".to_string(),
-                    },
-                    alt_text: None,
-                    height: None,
-                    width: None,
-                })]
-            },
-            parsed
-        );
-    }
-
-    #[gpui::test]
-    async fn test_html_image_tag_with_alt_text() {
-        let parsed = parse("<img src=\"http://example.com/foo.png\" alt=\"Foo\" />").await;
-
-        assert_eq!(
-            ParsedMarkdown {
-                children: vec![ParsedMarkdownElement::Image(Image {
-                    source_range: 0..50,
-                    link: Link::Web {
-                        url: "http://example.com/foo.png".to_string(),
-                    },
-                    alt_text: Some("Foo".into()),
-                    height: None,
-                    width: None,
-                })]
-            },
-            parsed
-        );
-    }
-
-    #[gpui::test]
-    async fn test_html_image_tag_with_height_and_width() {
-        let parsed =
-            parse("<img src=\"http://example.com/foo.png\" height=\"100\" width=\"200\" />").await;
-
-        assert_eq!(
-            ParsedMarkdown {
-                children: vec![ParsedMarkdownElement::Image(Image {
-                    source_range: 0..65,
-                    link: Link::Web {
-                        url: "http://example.com/foo.png".to_string(),
-                    },
-                    alt_text: None,
-                    height: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(100.)))),
-                    width: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(200.)))),
-                })]
-            },
-            parsed
-        );
-    }
-
-    #[gpui::test]
-    async fn test_html_image_style_tag_with_height_and_width() {
-        let parsed = parse(
-            "<img src=\"http://example.com/foo.png\" style=\"height:100px; width:200px;\" />",
-        )
-        .await;
-
-        assert_eq!(
-            ParsedMarkdown {
-                children: vec![ParsedMarkdownElement::Image(Image {
-                    source_range: 0..75,
-                    link: Link::Web {
-                        url: "http://example.com/foo.png".to_string(),
-                    },
-                    alt_text: None,
-                    height: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(100.)))),
-                    width: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(200.)))),
-                })]
-            },
-            parsed
-        );
-    }
-
-    #[gpui::test]
-    async fn test_header_only_table() {
-        let markdown = "\
-| Header 1 | Header 2 |
-|----------|----------|
-
-Some other content
-";
-
-        let expected_table = table(
-            0..48,
-            None,
-            vec![row(vec![
-                column(
-                    1,
-                    1,
-                    true,
-                    text("Header 1", 1..11),
-                    ParsedMarkdownTableAlignment::None,
-                ),
-                column(
-                    1,
-                    1,
-                    true,
-                    text("Header 2", 12..22),
-                    ParsedMarkdownTableAlignment::None,
-                ),
-            ])],
-            vec![],
-        );
-
-        assert_eq!(
-            parse(markdown).await.children[0],
-            ParsedMarkdownElement::Table(expected_table)
-        );
-    }
-
-    #[gpui::test]
-    async fn test_basic_table() {
-        let markdown = "\
-| Header 1 | Header 2 |
-|----------|----------|
-| Cell 1   | Cell 2   |
-| Cell 3   | Cell 4   |";
-
-        let expected_table = table(
-            0..95,
-            None,
-            vec![row(vec![
-                column(
-                    1,
-                    1,
-                    true,
-                    text("Header 1", 1..11),
-                    ParsedMarkdownTableAlignment::None,
-                ),
-                column(
-                    1,
-                    1,
-                    true,
-                    text("Header 2", 12..22),
-                    ParsedMarkdownTableAlignment::None,
-                ),
-            ])],
-            vec![
-                row(vec![
-                    column(
-                        1,
-                        1,
-                        false,
-                        text("Cell 1", 49..59),
-                        ParsedMarkdownTableAlignment::None,
-                    ),
-                    column(
-                        1,
-                        1,
-                        false,
-                        text("Cell 2", 60..70),
-                        ParsedMarkdownTableAlignment::None,
-                    ),
-                ]),
-                row(vec![
-                    column(
-                        1,
-                        1,
-                        false,
-                        text("Cell 3", 73..83),
-                        ParsedMarkdownTableAlignment::None,
-                    ),
-                    column(
-                        1,
-                        1,
-                        false,
-                        text("Cell 4", 84..94),
-                        ParsedMarkdownTableAlignment::None,
-                    ),
-                ]),
-            ],
-        );
-
-        assert_eq!(
-            parse(markdown).await.children[0],
-            ParsedMarkdownElement::Table(expected_table)
-        );
-    }
-
-    #[gpui::test]
-    async fn test_list_basic() {
-        let parsed = parse(
-            "\
-* Item 1
-* Item 2
-* Item 3
-",
-        )
-        .await;
-
-        assert_eq!(
-            parsed.children,
-            vec![
-                list_item(0..8, 1, Unordered, vec![p("Item 1", 2..8)]),
-                list_item(9..17, 1, Unordered, vec![p("Item 2", 11..17)]),
-                list_item(18..26, 1, Unordered, vec![p("Item 3", 20..26)]),
-            ],
-        );
-    }
-
-    #[gpui::test]
-    async fn test_list_with_tasks() {
-        let parsed = parse(
-            "\
-- [ ] TODO
-- [x] Checked
-",
-        )
-        .await;
-
-        assert_eq!(
-            parsed.children,
-            vec![
-                list_item(0..10, 1, Task(false, 2..5), vec![p("TODO", 6..10)]),
-                list_item(11..24, 1, Task(true, 13..16), vec![p("Checked", 17..24)]),
-            ],
-        );
-    }
-
-    #[gpui::test]
-    async fn test_list_with_indented_task() {
-        let parsed = parse(
-            "\
-- [ ] TODO
-  - [x] Checked
-  - Unordered
-  1. Number 1
-  1. Number 2
-1. Number A
-",
-        )
-        .await;
-
-        assert_eq!(
-            parsed.children,
-            vec![
-                list_item(0..12, 1, Task(false, 2..5), vec![p("TODO", 6..10)]),
-                list_item(13..26, 2, Task(true, 15..18), vec![p("Checked", 19..26)]),
-                list_item(29..40, 2, Unordered, vec![p("Unordered", 31..40)]),
-                list_item(43..54, 2, Ordered(1), vec![p("Number 1", 46..54)]),
-                list_item(57..68, 2, Ordered(2), vec![p("Number 2", 60..68)]),
-                list_item(69..80, 1, Ordered(1), vec![p("Number A", 72..80)]),
-            ],
-        );
-    }
-
-    #[gpui::test]
-    async fn test_list_with_linebreak_is_handled_correctly() {
-        let parsed = parse(
-            "\
-- [ ] Task 1
-
-- [x] Task 2
-",
-        )
-        .await;
-
-        assert_eq!(
-            parsed.children,
-            vec![
-                list_item(0..13, 1, Task(false, 2..5), vec![p("Task 1", 6..12)]),
-                list_item(14..26, 1, Task(true, 16..19), vec![p("Task 2", 20..26)]),
-            ],
-        );
-    }
-
-    #[gpui::test]
-    async fn test_list_nested() {
-        let parsed = parse(
-            "\
-* Item 1
-* Item 2
-* Item 3
-
-1. Hello
-1. Two
-   1. Three
-2. Four
-3. Five
-
-* First
-  1. Hello
-     1. Goodbyte
-        - Inner
-        - Inner
-  2. Goodbyte
-        - Next item empty
-        -
-* Last
-",
-        )
-        .await;
-
-        assert_eq!(
-            parsed.children,
-            vec![
-                list_item(0..8, 1, Unordered, vec![p("Item 1", 2..8)]),
-                list_item(9..17, 1, Unordered, vec![p("Item 2", 11..17)]),
-                list_item(18..27, 1, Unordered, vec![p("Item 3", 20..26)]),
-                list_item(28..36, 1, Ordered(1), vec![p("Hello", 31..36)]),
-                list_item(37..46, 1, Ordered(2), vec![p("Two", 40..43),]),
-                list_item(47..55, 2, Ordered(1), vec![p("Three", 50..55)]),
-                list_item(56..63, 1, Ordered(3), vec![p("Four", 59..63)]),
-                list_item(64..72, 1, Ordered(4), vec![p("Five", 67..71)]),
-                list_item(73..82, 1, Unordered, vec![p("First", 75..80)]),
-                list_item(83..96, 2, Ordered(1), vec![p("Hello", 86..91)]),
-                list_item(97..116, 3, Ordered(1), vec![p("Goodbyte", 100..108)]),
-                list_item(117..124, 4, Unordered, vec![p("Inner", 119..124)]),
-                list_item(133..140, 4, Unordered, vec![p("Inner", 135..140)]),
-                list_item(143..159, 2, Ordered(2), vec![p("Goodbyte", 146..154)]),
-                list_item(160..180, 3, Unordered, vec![p("Next item empty", 165..180)]),
-                list_item(186..190, 3, Unordered, vec![]),
-                list_item(191..197, 1, Unordered, vec![p("Last", 193..197)]),
-            ]
-        );
-    }
-
-    #[gpui::test]
-    async fn test_list_with_nested_content() {
-        let parsed = parse(
-            "\
-*   This is a list item with two paragraphs.
-
-    This is the second paragraph in the list item.
-",
-        )
-        .await;
-
-        assert_eq!(
-            parsed.children,
-            vec![list_item(
-                0..96,
-                1,
-                Unordered,
-                vec![
-                    p("This is a list item with two paragraphs.", 4..44),
-                    p("This is the second paragraph in the list item.", 50..97)
-                ],
-            ),],
-        );
-    }
-
-    #[gpui::test]
-    async fn test_list_item_with_inline_html() {
-        let parsed = parse(
-            "\
-*   This is a list item with an inline HTML <sometag>tag</sometag>.
-",
-        )
-        .await;
-
-        assert_eq!(
-            parsed.children,
-            vec![list_item(
-                0..67,
-                1,
-                Unordered,
-                vec![p("This is a list item with an inline HTML tag.", 4..44),],
-            ),],
-        );
-    }
-
-    #[gpui::test]
-    async fn test_nested_list_with_paragraph_inside() {
-        let parsed = parse(
-            "\
-1. a
-    1. b
-        1. c
-
-    text
-
-    1. d
-",
-        )
-        .await;
-
-        assert_eq!(
-            parsed.children,
-            vec![
-                list_item(0..7, 1, Ordered(1), vec![p("a", 3..4)],),
-                list_item(8..20, 2, Ordered(1), vec![p("b", 12..13),],),
-                list_item(21..27, 3, Ordered(1), vec![p("c", 25..26),],),
-                p("text", 32..37),
-                list_item(41..46, 2, Ordered(1), vec![p("d", 45..46),],),
-            ],
-        );
-    }
-
-    #[gpui::test]
-    async fn test_list_with_leading_text() {
-        let parsed = parse(
-            "\
-* `code`
-* **bold**
-* [link](https://example.com)
-",
-        )
-        .await;
-
-        assert_eq!(
-            parsed.children,
-            vec![
-                list_item(0..8, 1, Unordered, vec![p("code", 2..8)]),
-                list_item(9..19, 1, Unordered, vec![p("bold", 11..19)]),
-                list_item(20..49, 1, Unordered, vec![p("link", 22..49)],),
-            ],
-        );
-    }
-
-    #[gpui::test]
-    async fn test_simple_block_quote() {
-        let parsed = parse("> Simple block quote with **styled text**").await;
-
-        assert_eq!(
-            parsed.children,
-            vec![block_quote(
-                vec![p("Simple block quote with styled text", 2..41)],
-                0..41
-            )]
-        );
-    }
-
-    #[gpui::test]
-    async fn test_simple_block_quote_with_multiple_lines() {
-        let parsed = parse(
-            "\
-> # Heading
-> More
-> text
->
-> More text
-",
-        )
-        .await;
-
-        assert_eq!(
-            parsed.children,
-            vec![block_quote(
-                vec![
-                    h1(text("Heading", 4..11), 2..12),
-                    p("More text", 14..26),
-                    p("More text", 30..40)
-                ],
-                0..40
-            )]
-        );
-    }
-
-    #[gpui::test]
-    async fn test_nested_block_quote() {
-        let parsed = parse(
-            "\
-> A
->
-> > # B
->
-> C
-
-More text
-",
-        )
-        .await;
-
-        assert_eq!(
-            parsed.children,
-            vec![
-                block_quote(
-                    vec![
-                        p("A", 2..4),
-                        block_quote(vec![h1(text("B", 12..13), 10..14)], 8..14),
-                        p("C", 18..20)
-                    ],
-                    0..20
-                ),
-                p("More text", 21..31)
-            ]
-        );
-    }
-
-    #[gpui::test]
-    async fn test_code_block() {
-        let parsed = parse(
-            "\
-```
-fn main() {
-    return 0;
-}
-```
-",
-        )
-        .await;
-
-        assert_eq!(
-            parsed.children,
-            vec![code_block(
-                None,
-                "fn main() {\n    return 0;\n}",
-                0..35,
-                None
-            )]
-        );
-    }
-
-    #[gpui::test]
-    async fn test_code_block_with_language(executor: BackgroundExecutor) {
-        let language_registry = Arc::new(LanguageRegistry::test(executor.clone()));
-        language_registry.add(language::rust_lang());
-
-        let parsed = parse_markdown(
-            "\
-```rust
-fn main() {
-    return 0;
-}
-```
-",
-            None,
-            Some(language_registry),
-        )
-        .await;
-
-        assert_eq!(
-            parsed.children,
-            vec![code_block(
-                Some("rust".to_string()),
-                "fn main() {\n    return 0;\n}",
-                0..39,
-                Some(vec![])
-            )]
-        );
-    }
-
-    fn h1(contents: MarkdownParagraph, source_range: Range<usize>) -> ParsedMarkdownElement {
-        ParsedMarkdownElement::Heading(ParsedMarkdownHeading {
-            source_range,
-            level: HeadingLevel::H1,
-            contents,
-        })
-    }
-
-    fn h2(contents: MarkdownParagraph, source_range: Range<usize>) -> ParsedMarkdownElement {
-        ParsedMarkdownElement::Heading(ParsedMarkdownHeading {
-            source_range,
-            level: HeadingLevel::H2,
-            contents,
-        })
-    }
-
-    fn h3(contents: MarkdownParagraph, source_range: Range<usize>) -> ParsedMarkdownElement {
-        ParsedMarkdownElement::Heading(ParsedMarkdownHeading {
-            source_range,
-            level: HeadingLevel::H3,
-            contents,
-        })
-    }
-
-    fn p(contents: &str, source_range: Range<usize>) -> ParsedMarkdownElement {
-        ParsedMarkdownElement::Paragraph(text(contents, source_range))
-    }
-
-    fn text(contents: &str, source_range: Range<usize>) -> MarkdownParagraph {
-        vec![MarkdownParagraphChunk::Text(ParsedMarkdownText {
-            highlights: Vec::new(),
-            regions: Vec::new(),
-            source_range,
-            contents: contents.to_string().into(),
-        })]
-    }
-
-    fn block_quote(
-        children: Vec<ParsedMarkdownElement>,
-        source_range: Range<usize>,
-    ) -> ParsedMarkdownElement {
-        ParsedMarkdownElement::BlockQuote(ParsedMarkdownBlockQuote {
-            source_range,
-            children,
-        })
-    }
-
-    fn code_block(
-        language: Option<String>,
-        code: &str,
-        source_range: Range<usize>,
-        highlights: Option<Vec<(Range<usize>, HighlightId)>>,
-    ) -> ParsedMarkdownElement {
-        ParsedMarkdownElement::CodeBlock(ParsedMarkdownCodeBlock {
-            source_range,
-            language,
-            contents: code.to_string().into(),
-            highlights,
-        })
-    }
-
-    fn list_item(
-        source_range: Range<usize>,
-        depth: u16,
-        item_type: ParsedMarkdownListItemType,
-        content: Vec<ParsedMarkdownElement>,
-    ) -> ParsedMarkdownElement {
-        ParsedMarkdownElement::ListItem(ParsedMarkdownListItem {
-            source_range,
-            item_type,
-            depth,
-            content,
-            nested: false,
-        })
-    }
-
-    fn nested_list_item(
-        source_range: Range<usize>,
-        depth: u16,
-        item_type: ParsedMarkdownListItemType,
-        content: Vec<ParsedMarkdownElement>,
-    ) -> ParsedMarkdownElement {
-        ParsedMarkdownElement::ListItem(ParsedMarkdownListItem {
-            source_range,
-            item_type,
-            depth,
-            content,
-            nested: true,
-        })
-    }
-
-    fn table(
-        source_range: Range<usize>,
-        caption: Option<MarkdownParagraph>,
-        header: Vec<ParsedMarkdownTableRow>,
-        body: Vec<ParsedMarkdownTableRow>,
-    ) -> ParsedMarkdownTable {
-        ParsedMarkdownTable {
-            source_range,
-            header,
-            body,
-            caption,
-        }
-    }
-
-    fn row(columns: Vec<ParsedMarkdownTableColumn>) -> ParsedMarkdownTableRow {
-        ParsedMarkdownTableRow { columns }
-    }
-
-    fn column(
-        col_span: usize,
-        row_span: usize,
-        is_header: bool,
-        children: MarkdownParagraph,
-        alignment: ParsedMarkdownTableAlignment,
-    ) -> ParsedMarkdownTableColumn {
-        ParsedMarkdownTableColumn {
-            col_span,
-            row_span,
-            is_header,
-            children,
-            alignment,
-        }
-    }
-
-    impl PartialEq for ParsedMarkdownTable {
-        fn eq(&self, other: &Self) -> bool {
-            self.source_range == other.source_range
-                && self.header == other.header
-                && self.body == other.body
-        }
-    }
-
-    impl PartialEq for ParsedMarkdownText {
-        fn eq(&self, other: &Self) -> bool {
-            self.source_range == other.source_range && self.contents == other.contents
-        }
-    }
-}
diff --git a/crates/markdown_preview/src/markdown_preview.rs b/crates/markdown_preview/src/markdown_preview.rs
deleted file mode 100644
index 61c99764ad..0000000000
--- a/crates/markdown_preview/src/markdown_preview.rs
+++ /dev/null
@@ -1,44 +0,0 @@
-use gpui::{App, actions};
-use workspace::Workspace;
-
-pub mod markdown_elements;
-mod markdown_minifier;
-pub mod markdown_parser;
-pub mod markdown_preview_view;
-pub mod markdown_renderer;
-
-actions!(
-    markdown,
-    [
-        /// Scrolls up by one page in the markdown preview.
-        #[action(deprecated_aliases = ["markdown::MovePageUp"])]
-        ScrollPageUp,
-        /// Scrolls down by one page in the markdown preview.
-        #[action(deprecated_aliases = ["markdown::MovePageDown"])]
-        ScrollPageDown,
-        /// Scrolls up by approximately one visual line.
-        ScrollUp,
-        /// Scrolls down by approximately one visual line.
-        ScrollDown,
-        /// Scrolls up by one markdown element in the markdown preview
-        ScrollUpByItem,
-        /// Scrolls down by one markdown element in the markdown preview
-        ScrollDownByItem,
-        /// Opens a markdown preview for the current file.
-        OpenPreview,
-        /// Opens a markdown preview in a split pane.
-        OpenPreviewToTheSide,
-        /// Opens a following markdown preview that syncs with the editor.
-        OpenFollowingPreview
-    ]
-);
-
-pub fn init(cx: &mut App) {
-    cx.observe_new(|workspace: &mut Workspace, window, cx| {
-        let Some(window) = window else {
-            return;
-        };
-        markdown_preview_view::MarkdownPreviewView::register(workspace, window, cx);
-    })
-    .detach();
-}
diff --git a/crates/markdown_preview/src/markdown_preview_view.rs b/crates/markdown_preview/src/markdown_preview_view.rs
deleted file mode 100644
index 20613b112e..0000000000
--- a/crates/markdown_preview/src/markdown_preview_view.rs
+++ /dev/null
@@ -1,677 +0,0 @@
-use std::cmp::min;
-use std::sync::Arc;
-use std::time::Duration;
-use std::{ops::Range, path::PathBuf};
-
-use anyhow::Result;
-use editor::scroll::Autoscroll;
-use editor::{Editor, EditorEvent, MultiBufferOffset, SelectionEffects};
-use gpui::{
-    App, ClickEvent, Context, Entity, EventEmitter, FocusHandle, Focusable, InteractiveElement,
-    IntoElement, IsZero, ListState, ParentElement, Render, RetainAllImageCache, Styled,
-    Subscription, Task, WeakEntity, Window, list,
-};
-use language::LanguageRegistry;
-use settings::Settings;
-use theme::ThemeSettings;
-use ui::{WithScrollbar, prelude::*};
-use workspace::item::{Item, ItemHandle};
-use workspace::{Pane, Workspace};
-
-use crate::markdown_elements::ParsedMarkdownElement;
-use crate::markdown_renderer::CheckboxClickedEvent;
-use crate::{
-    OpenFollowingPreview, OpenPreview, OpenPreviewToTheSide, ScrollPageDown, ScrollPageUp,
-    markdown_elements::ParsedMarkdown,
-    markdown_parser::parse_markdown,
-    markdown_renderer::{RenderContext, render_markdown_block},
-};
-use crate::{ScrollDown, ScrollDownByItem, ScrollUp, ScrollUpByItem};
-
-const REPARSE_DEBOUNCE: Duration = Duration::from_millis(200);
-
-pub struct MarkdownPreviewView {
-    workspace: WeakEntity<Workspace>,
-    image_cache: Entity<RetainAllImageCache>,
-    active_editor: Option<EditorState>,
-    focus_handle: FocusHandle,
-    contents: Option<ParsedMarkdown>,
-    selected_block: usize,
-    list_state: ListState,
-    language_registry: Arc<LanguageRegistry>,
-    parsing_markdown_task: Option<Task<Result<()>>>,
-    mode: MarkdownPreviewMode,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub enum MarkdownPreviewMode {
-    /// The preview will always show the contents of the provided editor.
-    Default,
-    /// The preview will "follow" the currently active editor.
-    Follow,
-}
-
-struct EditorState {
-    editor: Entity<Editor>,
-    _subscription: Subscription,
-}
-
-impl MarkdownPreviewView {
-    pub fn register(workspace: &mut Workspace, _window: &mut Window, _cx: &mut Context<Workspace>) {
-        workspace.register_action(move |workspace, _: &OpenPreview, window, cx| {
-            if let Some(editor) = Self::resolve_active_item_as_markdown_editor(workspace, cx) {
-                let view = Self::create_markdown_view(workspace, editor.clone(), window, cx);
-                workspace.active_pane().update(cx, |pane, cx| {
-                    if let Some(existing_view_idx) =
-                        Self::find_existing_independent_preview_item_idx(pane, &editor, cx)
-                    {
-                        pane.activate_item(existing_view_idx, true, true, window, cx);
-                    } else {
-                        pane.add_item(Box::new(view.clone()), true, true, None, window, cx)
-                    }
-                });
-                cx.notify();
-            }
-        });
-
-        workspace.register_action(move |workspace, _: &OpenPreviewToTheSide, window, cx| {
-            if let Some(editor) = Self::resolve_active_item_as_markdown_editor(workspace, cx) {
-                let view = Self::create_markdown_view(workspace, editor.clone(), window, cx);
-                let pane = workspace
-                    .find_pane_in_direction(workspace::SplitDirection::Right, cx)
-                    .unwrap_or_else(|| {
-                        workspace.split_pane(
-                            workspace.active_pane().clone(),
-                            workspace::SplitDirection::Right,
-                            window,
-                            cx,
-                        )
-                    });
-                pane.update(cx, |pane, cx| {
-                    if let Some(existing_view_idx) =
-                        Self::find_existing_independent_preview_item_idx(pane, &editor, cx)
-                    {
-                        pane.activate_item(existing_view_idx, true, true, window, cx);
-                    } else {
-                        pane.add_item(Box::new(view.clone()), false, false, None, window, cx)
-                    }
-                });
-                editor.focus_handle(cx).focus(window);
-                cx.notify();
-            }
-        });
-
-        workspace.register_action(move |workspace, _: &OpenFollowingPreview, window, cx| {
-            if let Some(editor) = Self::resolve_active_item_as_markdown_editor(workspace, cx) {
-                // Check if there's already a following preview
-                let existing_follow_view_idx = {
-                    let active_pane = workspace.active_pane().read(cx);
-                    active_pane
-                        .items_of_type::<MarkdownPreviewView>()
-                        .find(|view| view.read(cx).mode == MarkdownPreviewMode::Follow)
-                        .and_then(|view| active_pane.index_for_item(&view))
-                };
-
-                if let Some(existing_follow_view_idx) = existing_follow_view_idx {
-                    workspace.active_pane().update(cx, |pane, cx| {
-                        pane.activate_item(existing_follow_view_idx, true, true, window, cx);
-                    });
-                } else {
-                    let view = Self::create_following_markdown_view(workspace, editor, window, cx);
-                    workspace.active_pane().update(cx, |pane, cx| {
-                        pane.add_item(Box::new(view.clone()), true, true, None, window, cx)
-                    });
-                }
-                cx.notify();
-            }
-        });
-    }
-
-    fn find_existing_independent_preview_item_idx(
-        pane: &Pane,
-        editor: &Entity<Editor>,
-        cx: &App,
-    ) -> Option<usize> {
-        pane.items_of_type::<MarkdownPreviewView>()
-            .find(|view| {
-                let view_read = view.read(cx);
-                // Only look for independent (Default mode) previews, not Follow previews
-                view_read.mode == MarkdownPreviewMode::Default
-                    && view_read
-                        .active_editor
-                        .as_ref()
-                        .is_some_and(|active_editor| active_editor.editor == *editor)
-            })
-            .and_then(|view| pane.index_for_item(&view))
-    }
-
-    pub fn resolve_active_item_as_markdown_editor(
-        workspace: &Workspace,
-        cx: &mut Context<Workspace>,
-    ) -> Option<Entity<Editor>> {
-        if let Some(editor) = workspace
-            .active_item(cx)
-            .and_then(|item| item.act_as::<Editor>(cx))
-            && Self::is_markdown_file(&editor, cx)
-        {
-            return Some(editor);
-        }
-        None
-    }
-
-    fn create_markdown_view(
-        workspace: &mut Workspace,
-        editor: Entity<Editor>,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) -> Entity<MarkdownPreviewView> {
-        let language_registry = workspace.project().read(cx).languages().clone();
-        let workspace_handle = workspace.weak_handle();
-        MarkdownPreviewView::new(
-            MarkdownPreviewMode::Default,
-            editor,
-            workspace_handle,
-            language_registry,
-            window,
-            cx,
-        )
-    }
-
-    fn create_following_markdown_view(
-        workspace: &mut Workspace,
-        editor: Entity<Editor>,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) -> Entity<MarkdownPreviewView> {
-        let language_registry = workspace.project().read(cx).languages().clone();
-        let workspace_handle = workspace.weak_handle();
-        MarkdownPreviewView::new(
-            MarkdownPreviewMode::Follow,
-            editor,
-            workspace_handle,
-            language_registry,
-            window,
-            cx,
-        )
-    }
-
-    pub fn new(
-        mode: MarkdownPreviewMode,
-        active_editor: Entity<Editor>,
-        workspace: WeakEntity<Workspace>,
-        language_registry: Arc<LanguageRegistry>,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) -> Entity<Self> {
-        cx.new(|cx| {
-            let list_state = ListState::new(0, gpui::ListAlignment::Top, px(1000.));
-
-            let mut this = Self {
-                selected_block: 0,
-                active_editor: None,
-                focus_handle: cx.focus_handle(),
-                workspace: workspace.clone(),
-                contents: None,
-                list_state,
-                language_registry,
-                parsing_markdown_task: None,
-                image_cache: RetainAllImageCache::new(cx),
-                mode,
-            };
-
-            this.set_editor(active_editor, window, cx);
-
-            if mode == MarkdownPreviewMode::Follow {
-                if let Some(workspace) = &workspace.upgrade() {
-                    cx.observe_in(workspace, window, |this, workspace, window, cx| {
-                        let item = workspace.read(cx).active_item(cx);
-                        this.workspace_updated(item, window, cx);
-                    })
-                    .detach();
-                } else {
-                    log::error!("Failed to listen to workspace updates");
-                }
-            }
-
-            this
-        })
-    }
-
-    fn workspace_updated(
-        &mut self,
-        active_item: Option<Box<dyn ItemHandle>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(item) = active_item
-            && item.item_id() != cx.entity_id()
-            && let Some(editor) = item.act_as::<Editor>(cx)
-            && Self::is_markdown_file(&editor, cx)
-        {
-            self.set_editor(editor, window, cx);
-        }
-    }
-
-    pub fn is_markdown_file<V>(editor: &Entity<Editor>, cx: &mut Context<V>) -> bool {
-        let buffer = editor.read(cx).buffer().read(cx);
-        if let Some(buffer) = buffer.as_singleton()
-            && let Some(language) = buffer.read(cx).language()
-        {
-            return language.name() == "Markdown".into();
-        }
-        false
-    }
-
-    fn set_editor(&mut self, editor: Entity<Editor>, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(active) = &self.active_editor
-            && active.editor == editor
-        {
-            return;
-        }
-
-        let subscription = cx.subscribe_in(
-            &editor,
-            window,
-            |this, editor, event: &EditorEvent, window, cx| {
-                match event {
-                    EditorEvent::Edited { .. }
-                    | EditorEvent::DirtyChanged
-                    | EditorEvent::ExcerptsEdited { .. } => {
-                        this.parse_markdown_from_active_editor(true, window, cx);
-                    }
-                    EditorEvent::SelectionsChanged { .. } => {
-                        let selection_range = editor.update(cx, |editor, cx| {
-                            editor
-                                .selections
-                                .last::<MultiBufferOffset>(&editor.display_snapshot(cx))
-                                .range()
-                        });
-                        this.selected_block = this.get_block_index_under_cursor(selection_range);
-                        this.list_state.scroll_to_reveal_item(this.selected_block);
-                        cx.notify();
-                    }
-                    _ => {}
-                };
-            },
-        );
-
-        self.active_editor = Some(EditorState {
-            editor,
-            _subscription: subscription,
-        });
-
-        self.parse_markdown_from_active_editor(false, window, cx);
-    }
-
-    fn parse_markdown_from_active_editor(
-        &mut self,
-        wait_for_debounce: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(state) = &self.active_editor {
-            self.parsing_markdown_task = Some(self.parse_markdown_in_background(
-                wait_for_debounce,
-                state.editor.clone(),
-                window,
-                cx,
-            ));
-        }
-    }
-
-    fn parse_markdown_in_background(
-        &mut self,
-        wait_for_debounce: bool,
-        editor: Entity<Editor>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let language_registry = self.language_registry.clone();
-
-        cx.spawn_in(window, async move |view, cx| {
-            if wait_for_debounce {
-                // Wait for the user to stop typing
-                cx.background_executor().timer(REPARSE_DEBOUNCE).await;
-            }
-
-            let (contents, file_location) = view.update(cx, |_, cx| {
-                let editor = editor.read(cx);
-                let contents = editor.buffer().read(cx).snapshot(cx).text();
-                let file_location = MarkdownPreviewView::get_folder_for_active_editor(editor, cx);
-                (contents, file_location)
-            })?;
-
-            let parsing_task = cx.background_spawn(async move {
-                parse_markdown(&contents, file_location, Some(language_registry)).await
-            });
-            let contents = parsing_task.await;
-            view.update(cx, move |view, cx| {
-                let markdown_blocks_count = contents.children.len();
-                view.contents = Some(contents);
-                let scroll_top = view.list_state.logical_scroll_top();
-                view.list_state.reset(markdown_blocks_count);
-                view.list_state.scroll_to(scroll_top);
-                cx.notify();
-            })
-        })
-    }
-
-    fn move_cursor_to_block(
-        &self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-        selection: Range<MultiBufferOffset>,
-    ) {
-        if let Some(state) = &self.active_editor {
-            state.editor.update(cx, |editor, cx| {
-                editor.change_selections(
-                    SelectionEffects::scroll(Autoscroll::center()),
-                    window,
-                    cx,
-                    |selections| selections.select_ranges(vec![selection]),
-                );
-                window.focus(&editor.focus_handle(cx));
-            });
-        }
-    }
-
-    /// The absolute path of the file that is currently being previewed.
-    fn get_folder_for_active_editor(editor: &Editor, cx: &App) -> Option<PathBuf> {
-        if let Some(file) = editor.file_at(MultiBufferOffset(0), cx) {
-            if let Some(file) = file.as_local() {
-                file.abs_path(cx).parent().map(|p| p.to_path_buf())
-            } else {
-                None
-            }
-        } else {
-            None
-        }
-    }
-
-    fn get_block_index_under_cursor(&self, selection_range: Range<MultiBufferOffset>) -> usize {
-        let mut block_index = None;
-        let cursor = selection_range.start.0;
-
-        let mut last_end = 0;
-        if let Some(content) = &self.contents {
-            for (i, block) in content.children.iter().enumerate() {
-                let Some(Range { start, end }) = block.source_range() else {
-                    continue;
-                };
-
-                // Check if the cursor is between the last block and the current block
-                if last_end <= cursor && cursor < start {
-                    block_index = Some(i.saturating_sub(1));
-                    break;
-                }
-
-                if start <= cursor && end >= cursor {
-                    block_index = Some(i);
-                    break;
-                }
-                last_end = end;
-            }
-
-            if block_index.is_none() && last_end < cursor {
-                block_index = Some(content.children.len().saturating_sub(1));
-            }
-        }
-
-        block_index.unwrap_or_default()
-    }
-
-    fn should_apply_padding_between(
-        current_block: &ParsedMarkdownElement,
-        next_block: Option<&ParsedMarkdownElement>,
-    ) -> bool {
-        !(current_block.is_list_item() && next_block.map(|b| b.is_list_item()).unwrap_or(false))
-    }
-
-    fn scroll_page_up(&mut self, _: &ScrollPageUp, _window: &mut Window, cx: &mut Context<Self>) {
-        let viewport_height = self.list_state.viewport_bounds().size.height;
-        if viewport_height.is_zero() {
-            return;
-        }
-
-        self.list_state.scroll_by(-viewport_height);
-        cx.notify();
-    }
-
-    fn scroll_page_down(
-        &mut self,
-        _: &ScrollPageDown,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let viewport_height = self.list_state.viewport_bounds().size.height;
-        if viewport_height.is_zero() {
-            return;
-        }
-
-        self.list_state.scroll_by(viewport_height);
-        cx.notify();
-    }
-
-    fn scroll_up(&mut self, _: &ScrollUp, window: &mut Window, cx: &mut Context<Self>) {
-        let scroll_top = self.list_state.logical_scroll_top();
-        if let Some(bounds) = self.list_state.bounds_for_item(scroll_top.item_ix) {
-            let item_height = bounds.size.height;
-            // Scroll no more than the rough equivalent of a large headline
-            let max_height = window.rem_size() * 2;
-            let scroll_height = min(item_height, max_height);
-            self.list_state.scroll_by(-scroll_height);
-        }
-        cx.notify();
-    }
-
-    fn scroll_down(&mut self, _: &ScrollDown, window: &mut Window, cx: &mut Context<Self>) {
-        let scroll_top = self.list_state.logical_scroll_top();
-        if let Some(bounds) = self.list_state.bounds_for_item(scroll_top.item_ix) {
-            let item_height = bounds.size.height;
-            // Scroll no more than the rough equivalent of a large headline
-            let max_height = window.rem_size() * 2;
-            let scroll_height = min(item_height, max_height);
-            self.list_state.scroll_by(scroll_height);
-        }
-        cx.notify();
-    }
-
-    fn scroll_up_by_item(
-        &mut self,
-        _: &ScrollUpByItem,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let scroll_top = self.list_state.logical_scroll_top();
-        if let Some(bounds) = self.list_state.bounds_for_item(scroll_top.item_ix) {
-            self.list_state.scroll_by(-bounds.size.height);
-        }
-        cx.notify();
-    }
-
-    fn scroll_down_by_item(
-        &mut self,
-        _: &ScrollDownByItem,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let scroll_top = self.list_state.logical_scroll_top();
-        if let Some(bounds) = self.list_state.bounds_for_item(scroll_top.item_ix) {
-            self.list_state.scroll_by(bounds.size.height);
-        }
-        cx.notify();
-    }
-}
-
-impl Focusable for MarkdownPreviewView {
-    fn focus_handle(&self, _: &App) -> gpui::FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl EventEmitter<()> for MarkdownPreviewView {}
-
-impl Item for MarkdownPreviewView {
-    type Event = ();
-
-    fn tab_icon(&self, _window: &Window, _cx: &App) -> Option<Icon> {
-        Some(Icon::new(IconName::FileDoc))
-    }
-
-    fn tab_content_text(&self, _detail: usize, cx: &App) -> SharedString {
-        self.active_editor
-            .as_ref()
-            .and_then(|editor_state| {
-                let buffer = editor_state.editor.read(cx).buffer().read(cx);
-                let buffer = buffer.as_singleton()?;
-                let file = buffer.read(cx).file()?;
-                let local_file = file.as_local()?;
-                local_file
-                    .abs_path(cx)
-                    .file_name()
-                    .map(|name| format!("Preview {}", name.to_string_lossy()).into())
-            })
-            .unwrap_or_else(|| SharedString::from("Markdown Preview"))
-    }
-
-    fn telemetry_event_text(&self) -> Option<&'static str> {
-        Some("Markdown Preview Opened")
-    }
-
-    fn to_item_events(_event: &Self::Event, _f: impl FnMut(workspace::item::ItemEvent)) {}
-}
-
-impl Render for MarkdownPreviewView {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let buffer_size = ThemeSettings::get_global(cx).buffer_font_size(cx);
-        let buffer_line_height = ThemeSettings::get_global(cx).buffer_line_height;
-
-        v_flex()
-            .image_cache(self.image_cache.clone())
-            .id("MarkdownPreview")
-            .key_context("MarkdownPreview")
-            .track_focus(&self.focus_handle(cx))
-            .on_action(cx.listener(MarkdownPreviewView::scroll_page_up))
-            .on_action(cx.listener(MarkdownPreviewView::scroll_page_down))
-            .on_action(cx.listener(MarkdownPreviewView::scroll_up))
-            .on_action(cx.listener(MarkdownPreviewView::scroll_down))
-            .on_action(cx.listener(MarkdownPreviewView::scroll_up_by_item))
-            .on_action(cx.listener(MarkdownPreviewView::scroll_down_by_item))
-            .size_full()
-            .bg(cx.theme().colors().editor_background)
-            .p_4()
-            .text_size(buffer_size)
-            .line_height(relative(buffer_line_height.value()))
-            .child(div().flex_grow().map(|this| {
-                this.child(
-                    list(
-                        self.list_state.clone(),
-                        cx.processor(|this, ix, window, cx| {
-                            let Some(contents) = &this.contents else {
-                                return div().into_any();
-                            };
-
-                            let mut render_cx =
-                                RenderContext::new(Some(this.workspace.clone()), window, cx)
-                                    .with_checkbox_clicked_callback(cx.listener(
-                                        move |this, e: &CheckboxClickedEvent, window, cx| {
-                                            if let Some(editor) = this
-                                                .active_editor
-                                                .as_ref()
-                                                .map(|s| s.editor.clone())
-                                            {
-                                                editor.update(cx, |editor, cx| {
-                                                    let task_marker =
-                                                        if e.checked() { "[x]" } else { "[ ]" };
-
-                                                    editor.edit(
-                                                        [(
-                                                            MultiBufferOffset(
-                                                                e.source_range().start,
-                                                            )
-                                                                ..MultiBufferOffset(
-                                                                    e.source_range().end,
-                                                                ),
-                                                            task_marker,
-                                                        )],
-                                                        cx,
-                                                    );
-                                                });
-                                                this.parse_markdown_from_active_editor(
-                                                    false, window, cx,
-                                                );
-                                                cx.notify();
-                                            }
-                                        },
-                                    ));
-
-                            let block = contents.children.get(ix).unwrap();
-                            let rendered_block = render_markdown_block(block, &mut render_cx);
-
-                            let should_apply_padding = Self::should_apply_padding_between(
-                                block,
-                                contents.children.get(ix + 1),
-                            );
-
-                            div()
-                                .id(ix)
-                                .when(should_apply_padding, |this| {
-                                    this.pb(render_cx.scaled_rems(0.75))
-                                })
-                                .group("markdown-block")
-                                .on_click(cx.listener(
-                                    move |this, event: &ClickEvent, window, cx| {
-                                        if event.click_count() == 2
-                                            && let Some(source_range) = this
-                                                .contents
-                                                .as_ref()
-                                                .and_then(|c| c.children.get(ix))
-                                                .and_then(|block: &ParsedMarkdownElement| {
-                                                    block.source_range()
-                                                })
-                                        {
-                                            this.move_cursor_to_block(
-                                                window,
-                                                cx,
-                                                MultiBufferOffset(source_range.start)
-                                                    ..MultiBufferOffset(source_range.start),
-                                            );
-                                        }
-                                    },
-                                ))
-                                .map(move |container| {
-                                    let indicator = div()
-                                        .h_full()
-                                        .w(px(4.0))
-                                        .when(ix == this.selected_block, |this| {
-                                            this.bg(cx.theme().colors().border)
-                                        })
-                                        .group_hover("markdown-block", |s| {
-                                            if ix == this.selected_block {
-                                                s
-                                            } else {
-                                                s.bg(cx.theme().colors().border_variant)
-                                            }
-                                        })
-                                        .rounded_xs();
-
-                                    container.child(
-                                        div()
-                                            .relative()
-                                            .child(
-                                                div()
-                                                    .pl(render_cx.scaled_rems(1.0))
-                                                    .child(rendered_block),
-                                            )
-                                            .child(indicator.absolute().left_0().top_0()),
-                                    )
-                                })
-                                .into_any()
-                        }),
-                    )
-                    .size_full(),
-                )
-            }))
-            .vertical_scrollbar_for(&self.list_state, window, cx)
-    }
-}
diff --git a/crates/markdown_preview/src/markdown_renderer.rs b/crates/markdown_preview/src/markdown_renderer.rs
deleted file mode 100644
index 336f1cacfd..0000000000
--- a/crates/markdown_preview/src/markdown_renderer.rs
+++ /dev/null
@@ -1,1083 +0,0 @@
-use crate::markdown_elements::{
-    HeadingLevel, Image, Link, MarkdownParagraph, MarkdownParagraphChunk, ParsedMarkdown,
-    ParsedMarkdownBlockQuote, ParsedMarkdownCodeBlock, ParsedMarkdownElement,
-    ParsedMarkdownHeading, ParsedMarkdownListItem, ParsedMarkdownListItemType, ParsedMarkdownTable,
-    ParsedMarkdownTableAlignment, ParsedMarkdownTableRow,
-};
-use fs::normalize_path;
-use gpui::{
-    AbsoluteLength, AnyElement, App, AppContext as _, ClipboardItem, Context, Div, Element,
-    ElementId, Entity, HighlightStyle, Hsla, ImageSource, InteractiveText, IntoElement, Keystroke,
-    Modifiers, ParentElement, Render, Resource, SharedString, Styled, StyledText, TextStyle,
-    WeakEntity, Window, div, img, rems,
-};
-use settings::Settings;
-use std::{
-    ops::{Mul, Range},
-    sync::Arc,
-    vec,
-};
-use theme::{ActiveTheme, SyntaxTheme, ThemeSettings};
-use ui::{
-    ButtonCommon, Clickable, Color, FluentBuilder, IconButton, IconName, IconSize,
-    InteractiveElement, Label, LabelCommon, LabelSize, LinkPreview, Pixels, Rems,
-    StatefulInteractiveElement, StyledExt, StyledImage, ToggleState, Tooltip, VisibleOnHover,
-    h_flex, tooltip_container, v_flex,
-};
-use workspace::{OpenOptions, OpenVisible, Workspace};
-
-pub struct CheckboxClickedEvent {
-    pub checked: bool,
-    pub source_range: Range<usize>,
-}
-
-impl CheckboxClickedEvent {
-    pub fn source_range(&self) -> Range<usize> {
-        self.source_range.clone()
-    }
-
-    pub fn checked(&self) -> bool {
-        self.checked
-    }
-}
-
-type CheckboxClickedCallback = Arc<Box<dyn Fn(&CheckboxClickedEvent, &mut Window, &mut App)>>;
-
-#[derive(Clone)]
-pub struct RenderContext {
-    workspace: Option<WeakEntity<Workspace>>,
-    next_id: usize,
-    buffer_font_family: SharedString,
-    buffer_text_style: TextStyle,
-    text_style: TextStyle,
-    border_color: Hsla,
-    title_bar_background_color: Hsla,
-    panel_background_color: Hsla,
-    text_color: Hsla,
-    link_color: Hsla,
-    window_rem_size: Pixels,
-    text_muted_color: Hsla,
-    code_block_background_color: Hsla,
-    code_span_background_color: Hsla,
-    syntax_theme: Arc<SyntaxTheme>,
-    indent: usize,
-    checkbox_clicked_callback: Option<CheckboxClickedCallback>,
-    is_last_child: bool,
-}
-
-impl RenderContext {
-    pub fn new(
-        workspace: Option<WeakEntity<Workspace>>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> RenderContext {
-        let theme = cx.theme().clone();
-
-        let settings = ThemeSettings::get_global(cx);
-        let buffer_font_family = settings.buffer_font.family.clone();
-        let buffer_font_features = settings.buffer_font.features.clone();
-        let mut buffer_text_style = window.text_style();
-        buffer_text_style.font_family = buffer_font_family.clone();
-        buffer_text_style.font_features = buffer_font_features;
-        buffer_text_style.font_size = AbsoluteLength::from(settings.buffer_font_size(cx));
-
-        RenderContext {
-            workspace,
-            next_id: 0,
-            indent: 0,
-            buffer_font_family,
-            buffer_text_style,
-            text_style: window.text_style(),
-            syntax_theme: theme.syntax().clone(),
-            border_color: theme.colors().border,
-            title_bar_background_color: theme.colors().title_bar_background,
-            panel_background_color: theme.colors().panel_background,
-            text_color: theme.colors().text,
-            link_color: theme.colors().text_accent,
-            window_rem_size: window.rem_size(),
-            text_muted_color: theme.colors().text_muted,
-            code_block_background_color: theme.colors().surface_background,
-            code_span_background_color: theme.colors().editor_document_highlight_read_background,
-            checkbox_clicked_callback: None,
-            is_last_child: false,
-        }
-    }
-
-    pub fn with_checkbox_clicked_callback(
-        mut self,
-        callback: impl Fn(&CheckboxClickedEvent, &mut Window, &mut App) + 'static,
-    ) -> Self {
-        self.checkbox_clicked_callback = Some(Arc::new(Box::new(callback)));
-        self
-    }
-
-    fn next_id(&mut self, span: &Range<usize>) -> ElementId {
-        let id = format!("markdown-{}-{}-{}", self.next_id, span.start, span.end);
-        self.next_id += 1;
-        ElementId::from(SharedString::from(id))
-    }
-
-    /// HACK: used to have rems relative to buffer font size, so that things scale appropriately as
-    /// buffer font size changes. The callees of this function should be reimplemented to use real
-    /// relative sizing once that is implemented in GPUI
-    pub fn scaled_rems(&self, rems: f32) -> Rems {
-        self.buffer_text_style
-            .font_size
-            .to_rems(self.window_rem_size)
-            .mul(rems)
-    }
-
-    /// This ensures that children inside of block quotes
-    /// have padding between them.
-    ///
-    /// For example, for this markdown:
-    ///
-    /// ```markdown
-    /// > This is a block quote.
-    /// >
-    /// > And this is the next paragraph.
-    /// ```
-    ///
-    /// We give padding between "This is a block quote."
-    /// and "And this is the next paragraph."
-    fn with_common_p(&self, element: Div) -> Div {
-        if self.indent > 0 && !self.is_last_child {
-            element.pb(self.scaled_rems(0.75))
-        } else {
-            element
-        }
-    }
-
-    /// The is used to indicate that the current element is the last child or not of its parent.
-    ///
-    /// Then we can avoid adding padding to the bottom of the last child.
-    fn with_last_child<R>(&mut self, is_last: bool, render: R) -> AnyElement
-    where
-        R: FnOnce(&mut Self) -> AnyElement,
-    {
-        self.is_last_child = is_last;
-        let element = render(self);
-        self.is_last_child = false;
-        element
-    }
-}
-
-pub fn render_parsed_markdown(
-    parsed: &ParsedMarkdown,
-    workspace: Option<WeakEntity<Workspace>>,
-    window: &mut Window,
-    cx: &mut App,
-) -> Div {
-    let mut cx = RenderContext::new(workspace, window, cx);
-
-    v_flex().gap_3().children(
-        parsed
-            .children
-            .iter()
-            .map(|block| render_markdown_block(block, &mut cx)),
-    )
-}
-pub fn render_markdown_block(block: &ParsedMarkdownElement, cx: &mut RenderContext) -> AnyElement {
-    use ParsedMarkdownElement::*;
-    match block {
-        Paragraph(text) => render_markdown_paragraph(text, cx),
-        Heading(heading) => render_markdown_heading(heading, cx),
-        ListItem(list_item) => render_markdown_list_item(list_item, cx),
-        Table(table) => render_markdown_table(table, cx),
-        BlockQuote(block_quote) => render_markdown_block_quote(block_quote, cx),
-        CodeBlock(code_block) => render_markdown_code_block(code_block, cx),
-        HorizontalRule(_) => render_markdown_rule(cx),
-        Image(image) => render_markdown_image(image, cx),
-    }
-}
-
-fn render_markdown_heading(parsed: &ParsedMarkdownHeading, cx: &mut RenderContext) -> AnyElement {
-    let size = match parsed.level {
-        HeadingLevel::H1 => 2.,
-        HeadingLevel::H2 => 1.5,
-        HeadingLevel::H3 => 1.25,
-        HeadingLevel::H4 => 1.,
-        HeadingLevel::H5 => 0.875,
-        HeadingLevel::H6 => 0.85,
-    };
-
-    let text_size = cx.scaled_rems(size);
-
-    // was `DefiniteLength::from(text_size.mul(1.25))`
-    // let line_height = DefiniteLength::from(text_size.mul(1.25));
-    let line_height = text_size * 1.25;
-
-    // was `rems(0.15)`
-    // let padding_top = cx.scaled_rems(0.15);
-    let padding_top = rems(0.15);
-
-    // was `.pb_1()` = `rems(0.25)`
-    // let padding_bottom = cx.scaled_rems(0.25);
-    let padding_bottom = rems(0.25);
-
-    let color = match parsed.level {
-        HeadingLevel::H6 => cx.text_muted_color,
-        _ => cx.text_color,
-    };
-    div()
-        .line_height(line_height)
-        .text_size(text_size)
-        .text_color(color)
-        .pt(padding_top)
-        .pb(padding_bottom)
-        .children(render_markdown_text(&parsed.contents, cx))
-        .whitespace_normal()
-        .into_any()
-}
-
-fn render_markdown_list_item(
-    parsed: &ParsedMarkdownListItem,
-    cx: &mut RenderContext,
-) -> AnyElement {
-    use ParsedMarkdownListItemType::*;
-    let depth = parsed.depth.saturating_sub(1) as usize;
-
-    let bullet = match &parsed.item_type {
-        Ordered(order) => list_item_prefix(*order as usize, true, depth).into_any_element(),
-        Unordered => list_item_prefix(1, false, depth).into_any_element(),
-        Task(checked, range) => div()
-            .id(cx.next_id(range))
-            .mt(cx.scaled_rems(3.0 / 16.0))
-            .child(
-                MarkdownCheckbox::new(
-                    "checkbox",
-                    if *checked {
-                        ToggleState::Selected
-                    } else {
-                        ToggleState::Unselected
-                    },
-                    cx.clone(),
-                )
-                .when_some(
-                    cx.checkbox_clicked_callback.clone(),
-                    |this, callback| {
-                        this.on_click({
-                            let range = range.clone();
-                            move |selection, window, cx| {
-                                let checked = match selection {
-                                    ToggleState::Selected => true,
-                                    ToggleState::Unselected => false,
-                                    _ => return,
-                                };
-
-                                if window.modifiers().secondary() {
-                                    callback(
-                                        &CheckboxClickedEvent {
-                                            checked,
-                                            source_range: range.clone(),
-                                        },
-                                        window,
-                                        cx,
-                                    );
-                                }
-                            }
-                        })
-                    },
-                ),
-            )
-            .hover(|s| s.cursor_pointer())
-            .tooltip(|_, cx| {
-                InteractiveMarkdownElementTooltip::new(None, "toggle checkbox", cx).into()
-            })
-            .into_any_element(),
-    };
-    let bullet = div().mr(cx.scaled_rems(0.5)).child(bullet);
-
-    let contents: Vec<AnyElement> = parsed
-        .content
-        .iter()
-        .map(|c| render_markdown_block(c, cx))
-        .collect();
-
-    let item = h_flex()
-        .when(!parsed.nested, |this| this.pl(cx.scaled_rems(depth as f32)))
-        .when(parsed.nested && depth > 0, |this| this.ml_neg_1p5())
-        .items_start()
-        .children(vec![
-            bullet,
-            v_flex()
-                .children(contents)
-                .when(!parsed.nested, |this| this.gap(cx.scaled_rems(1.0)))
-                .pr(cx.scaled_rems(1.0))
-                .w_full(),
-        ]);
-
-    cx.with_common_p(item).into_any()
-}
-
-/// # MarkdownCheckbox ///
-/// HACK: Copied from `ui/src/components/toggle.rs` to deal with scaling issues in markdown preview
-/// changes should be integrated into `Checkbox` in `toggle.rs` while making sure checkboxes elsewhere in the
-/// app are not visually affected
-#[derive(gpui::IntoElement)]
-struct MarkdownCheckbox {
-    id: ElementId,
-    toggle_state: ToggleState,
-    disabled: bool,
-    placeholder: bool,
-    on_click: Option<Box<dyn Fn(&ToggleState, &mut Window, &mut App) + 'static>>,
-    filled: bool,
-    style: ui::ToggleStyle,
-    tooltip: Option<Box<dyn Fn(&mut Window, &mut App) -> gpui::AnyView>>,
-    label: Option<SharedString>,
-    render_cx: RenderContext,
-}
-
-impl MarkdownCheckbox {
-    /// Creates a new [`Checkbox`].
-    fn new(id: impl Into<ElementId>, checked: ToggleState, render_cx: RenderContext) -> Self {
-        Self {
-            id: id.into(),
-            toggle_state: checked,
-            disabled: false,
-            on_click: None,
-            filled: false,
-            style: ui::ToggleStyle::default(),
-            tooltip: None,
-            label: None,
-            placeholder: false,
-            render_cx,
-        }
-    }
-
-    /// Binds a handler to the [`Checkbox`] that will be called when clicked.
-    fn on_click(mut self, handler: impl Fn(&ToggleState, &mut Window, &mut App) + 'static) -> Self {
-        self.on_click = Some(Box::new(handler));
-        self
-    }
-
-    fn bg_color(&self, cx: &App) -> Hsla {
-        let style = self.style.clone();
-        match (style, self.filled) {
-            (ui::ToggleStyle::Ghost, false) => cx.theme().colors().ghost_element_background,
-            (ui::ToggleStyle::Ghost, true) => cx.theme().colors().element_background,
-            (ui::ToggleStyle::ElevationBased(_), false) => gpui::transparent_black(),
-            (ui::ToggleStyle::ElevationBased(elevation), true) => elevation.darker_bg(cx),
-            (ui::ToggleStyle::Custom(_), false) => gpui::transparent_black(),
-            (ui::ToggleStyle::Custom(color), true) => color.opacity(0.2),
-        }
-    }
-
-    fn border_color(&self, cx: &App) -> Hsla {
-        if self.disabled {
-            return cx.theme().colors().border_variant;
-        }
-
-        match self.style.clone() {
-            ui::ToggleStyle::Ghost => cx.theme().colors().border,
-            ui::ToggleStyle::ElevationBased(_) => cx.theme().colors().border,
-            ui::ToggleStyle::Custom(color) => color.opacity(0.3),
-        }
-    }
-}
-
-impl gpui::RenderOnce for MarkdownCheckbox {
-    fn render(self, _: &mut Window, cx: &mut App) -> impl IntoElement {
-        let group_id = format!("checkbox_group_{:?}", self.id);
-        let color = if self.disabled {
-            Color::Disabled
-        } else {
-            Color::Selected
-        };
-        let icon_size_small = IconSize::Custom(self.render_cx.scaled_rems(14. / 16.)); // was IconSize::Small
-        let icon = match self.toggle_state {
-            ToggleState::Selected => {
-                if self.placeholder {
-                    None
-                } else {
-                    Some(
-                        ui::Icon::new(IconName::Check)
-                            .size(icon_size_small)
-                            .color(color),
-                    )
-                }
-            }
-            ToggleState::Indeterminate => Some(
-                ui::Icon::new(IconName::Dash)
-                    .size(icon_size_small)
-                    .color(color),
-            ),
-            ToggleState::Unselected => None,
-        };
-
-        let bg_color = self.bg_color(cx);
-        let border_color = self.border_color(cx);
-        let hover_border_color = border_color.alpha(0.7);
-
-        let size = self.render_cx.scaled_rems(1.25); // was Self::container_size(); (20px)
-
-        let checkbox = h_flex()
-            .id(self.id.clone())
-            .justify_center()
-            .items_center()
-            .size(size)
-            .group(group_id.clone())
-            .child(
-                div()
-                    .flex()
-                    .flex_none()
-                    .justify_center()
-                    .items_center()
-                    .m(self.render_cx.scaled_rems(0.25)) // was .m_1
-                    .size(self.render_cx.scaled_rems(1.0)) // was .size_4
-                    .rounded(self.render_cx.scaled_rems(0.125)) // was .rounded_xs
-                    .border_1()
-                    .bg(bg_color)
-                    .border_color(border_color)
-                    .when(self.disabled, |this| this.cursor_not_allowed())
-                    .when(self.disabled, |this| {
-                        this.bg(cx.theme().colors().element_disabled.opacity(0.6))
-                    })
-                    .when(!self.disabled, |this| {
-                        this.group_hover(group_id.clone(), |el| el.border_color(hover_border_color))
-                    })
-                    .when(self.placeholder, |this| {
-                        this.child(
-                            div()
-                                .flex_none()
-                                .rounded_full()
-                                .bg(color.color(cx).alpha(0.5))
-                                .size(self.render_cx.scaled_rems(0.25)), // was .size_1
-                        )
-                    })
-                    .children(icon),
-            );
-
-        h_flex()
-            .id(self.id)
-            .gap(ui::DynamicSpacing::Base06.rems(cx))
-            .child(checkbox)
-            .when_some(
-                self.on_click.filter(|_| !self.disabled),
-                |this, on_click| {
-                    this.on_click(move |_, window, cx| {
-                        on_click(&self.toggle_state.inverse(), window, cx)
-                    })
-                },
-            )
-            // TODO: Allow label size to be different from default.
-            // TODO: Allow label color to be different from muted.
-            .when_some(self.label, |this, label| {
-                this.child(Label::new(label).color(Color::Muted))
-            })
-            .when_some(self.tooltip, |this, tooltip| {
-                this.tooltip(move |window, cx| tooltip(window, cx))
-            })
-    }
-}
-
-fn calculate_table_columns_count(rows: &Vec<ParsedMarkdownTableRow>) -> usize {
-    let mut actual_column_count = 0;
-    for row in rows {
-        actual_column_count = actual_column_count.max(
-            row.columns
-                .iter()
-                .map(|column| column.col_span)
-                .sum::<usize>(),
-        );
-    }
-    actual_column_count
-}
-
-fn render_markdown_table(parsed: &ParsedMarkdownTable, cx: &mut RenderContext) -> AnyElement {
-    let actual_header_column_count = calculate_table_columns_count(&parsed.header);
-    let actual_body_column_count = calculate_table_columns_count(&parsed.body);
-    let max_column_count = std::cmp::max(actual_header_column_count, actual_body_column_count);
-
-    let total_rows = parsed.header.len() + parsed.body.len();
-
-    // Track which grid cells are occupied by spanning cells
-    let mut grid_occupied = vec![vec![false; max_column_count]; total_rows];
-
-    let mut cells = Vec::with_capacity(total_rows * max_column_count);
-
-    for (row_idx, row) in parsed.header.iter().chain(parsed.body.iter()).enumerate() {
-        let mut col_idx = 0;
-
-        for cell in row.columns.iter() {
-            // Skip columns occupied by row-spanning cells from previous rows
-            while col_idx < max_column_count && grid_occupied[row_idx][col_idx] {
-                col_idx += 1;
-            }
-
-            if col_idx >= max_column_count {
-                break;
-            }
-
-            let container = match cell.alignment {
-                ParsedMarkdownTableAlignment::Left | ParsedMarkdownTableAlignment::None => div(),
-                ParsedMarkdownTableAlignment::Center => v_flex().items_center(),
-                ParsedMarkdownTableAlignment::Right => v_flex().items_end(),
-            };
-
-            let cell_element = container
-                .col_span(cell.col_span.min(max_column_count - col_idx) as u16)
-                .row_span(cell.row_span.min(total_rows - row_idx) as u16)
-                .children(render_markdown_text(&cell.children, cx))
-                .px_2()
-                .py_1()
-                .border_1()
-                .border_color(cx.border_color)
-                .when(cell.is_header, |this| {
-                    this.bg(cx.title_bar_background_color)
-                })
-                .when(cell.row_span > 1, |this| this.justify_center())
-                .when(row_idx % 2 == 1, |this| this.bg(cx.panel_background_color));
-
-            cells.push(cell_element);
-
-            // Mark grid positions as occupied for row-spanning cells
-            for r in 0..cell.row_span {
-                for c in 0..cell.col_span {
-                    if row_idx + r < total_rows && col_idx + c < max_column_count {
-                        grid_occupied[row_idx + r][col_idx + c] = true;
-                    }
-                }
-            }
-
-            col_idx += cell.col_span;
-        }
-
-        // Fill remaining columns with empty cells if needed
-        while col_idx < max_column_count {
-            if grid_occupied[row_idx][col_idx] {
-                col_idx += 1;
-                continue;
-            }
-
-            let empty_cell = div()
-                .border_1()
-                .border_color(cx.border_color)
-                .when(row_idx % 2 == 1, |this| this.bg(cx.panel_background_color));
-
-            cells.push(empty_cell);
-            col_idx += 1;
-        }
-    }
-
-    cx.with_common_p(v_flex().items_start())
-        .when_some(parsed.caption.as_ref(), |this, caption| {
-            this.children(render_markdown_text(caption, cx))
-        })
-        .child(
-            div()
-                .grid()
-                .grid_cols(max_column_count as u16)
-                .border_1()
-                .border_color(cx.border_color)
-                .children(cells),
-        )
-        .into_any()
-}
-
-fn render_markdown_block_quote(
-    parsed: &ParsedMarkdownBlockQuote,
-    cx: &mut RenderContext,
-) -> AnyElement {
-    cx.indent += 1;
-
-    let children: Vec<AnyElement> = parsed
-        .children
-        .iter()
-        .enumerate()
-        .map(|(ix, child)| {
-            cx.with_last_child(ix + 1 == parsed.children.len(), |cx| {
-                render_markdown_block(child, cx)
-            })
-        })
-        .collect();
-
-    cx.indent -= 1;
-
-    cx.with_common_p(div())
-        .child(
-            div()
-                .border_l_4()
-                .border_color(cx.border_color)
-                .pl_3()
-                .children(children),
-        )
-        .into_any()
-}
-
-fn render_markdown_code_block(
-    parsed: &ParsedMarkdownCodeBlock,
-    cx: &mut RenderContext,
-) -> AnyElement {
-    let body = if let Some(highlights) = parsed.highlights.as_ref() {
-        StyledText::new(parsed.contents.clone()).with_default_highlights(
-            &cx.buffer_text_style,
-            highlights.iter().filter_map(|(range, highlight_id)| {
-                highlight_id
-                    .style(cx.syntax_theme.as_ref())
-                    .map(|style| (range.clone(), style))
-            }),
-        )
-    } else {
-        StyledText::new(parsed.contents.clone())
-    };
-
-    let copy_block_button = IconButton::new("copy-code", IconName::Copy)
-        .icon_size(IconSize::Small)
-        .on_click({
-            let contents = parsed.contents.clone();
-            move |_, _window, cx| {
-                cx.write_to_clipboard(ClipboardItem::new_string(contents.to_string()));
-            }
-        })
-        .tooltip(Tooltip::text("Copy code block"))
-        .visible_on_hover("markdown-block");
-
-    let font = gpui::Font {
-        family: cx.buffer_font_family.clone(),
-        features: cx.buffer_text_style.font_features.clone(),
-        ..Default::default()
-    };
-
-    cx.with_common_p(div())
-        .font(font)
-        .px_3()
-        .py_3()
-        .bg(cx.code_block_background_color)
-        .rounded_sm()
-        .child(body)
-        .child(
-            div()
-                .h_flex()
-                .absolute()
-                .right_1()
-                .top_1()
-                .child(copy_block_button),
-        )
-        .into_any()
-}
-
-fn render_markdown_paragraph(parsed: &MarkdownParagraph, cx: &mut RenderContext) -> AnyElement {
-    cx.with_common_p(div())
-        .children(render_markdown_text(parsed, cx))
-        .flex()
-        .flex_col()
-        .into_any_element()
-}
-
-fn render_markdown_text(parsed_new: &MarkdownParagraph, cx: &mut RenderContext) -> Vec<AnyElement> {
-    let mut any_element = Vec::with_capacity(parsed_new.len());
-    // these values are cloned in-order satisfy borrow checker
-    let syntax_theme = cx.syntax_theme.clone();
-    let workspace_clone = cx.workspace.clone();
-    let code_span_bg_color = cx.code_span_background_color;
-    let text_style = cx.text_style.clone();
-    let link_color = cx.link_color;
-
-    for parsed_region in parsed_new {
-        match parsed_region {
-            MarkdownParagraphChunk::Text(parsed) => {
-                let element_id = cx.next_id(&parsed.source_range);
-
-                let highlights = gpui::combine_highlights(
-                    parsed.highlights.iter().filter_map(|(range, highlight)| {
-                        highlight
-                            .to_highlight_style(&syntax_theme)
-                            .map(|style| (range.clone(), style))
-                    }),
-                    parsed.regions.iter().filter_map(|(range, region)| {
-                        if region.code {
-                            Some((
-                                range.clone(),
-                                HighlightStyle {
-                                    background_color: Some(code_span_bg_color),
-                                    ..Default::default()
-                                },
-                            ))
-                        } else if region.link.is_some() {
-                            Some((
-                                range.clone(),
-                                HighlightStyle {
-                                    color: Some(link_color),
-                                    ..Default::default()
-                                },
-                            ))
-                        } else {
-                            None
-                        }
-                    }),
-                );
-                let mut links = Vec::new();
-                let mut link_ranges = Vec::new();
-                for (range, region) in parsed.regions.iter() {
-                    if let Some(link) = region.link.clone() {
-                        links.push(link);
-                        link_ranges.push(range.clone());
-                    }
-                }
-                let workspace = workspace_clone.clone();
-                let element = div()
-                    .child(
-                        InteractiveText::new(
-                            element_id,
-                            StyledText::new(parsed.contents.clone())
-                                .with_default_highlights(&text_style, highlights),
-                        )
-                        .tooltip({
-                            let links = links.clone();
-                            let link_ranges = link_ranges.clone();
-                            move |idx, _, cx| {
-                                for (ix, range) in link_ranges.iter().enumerate() {
-                                    if range.contains(&idx) {
-                                        return Some(LinkPreview::new(&links[ix].to_string(), cx));
-                                    }
-                                }
-                                None
-                            }
-                        })
-                        .on_click(
-                            link_ranges,
-                            move |clicked_range_ix, window, cx| match &links[clicked_range_ix] {
-                                Link::Web { url } => cx.open_url(url),
-                                Link::Path { path, .. } => {
-                                    if let Some(workspace) = &workspace {
-                                        _ = workspace.update(cx, |workspace, cx| {
-                                            workspace
-                                                .open_abs_path(
-                                                    normalize_path(path.clone().as_path()),
-                                                    OpenOptions {
-                                                        visible: Some(OpenVisible::None),
-                                                        ..Default::default()
-                                                    },
-                                                    window,
-                                                    cx,
-                                                )
-                                                .detach();
-                                        });
-                                    }
-                                }
-                            },
-                        ),
-                    )
-                    .into_any();
-                any_element.push(element);
-            }
-
-            MarkdownParagraphChunk::Image(image) => {
-                any_element.push(render_markdown_image(image, cx));
-            }
-        }
-    }
-
-    any_element
-}
-
-fn render_markdown_rule(cx: &mut RenderContext) -> AnyElement {
-    let rule = div().w_full().h(cx.scaled_rems(0.125)).bg(cx.border_color);
-    div().py(cx.scaled_rems(0.5)).child(rule).into_any()
-}
-
-fn render_markdown_image(image: &Image, cx: &mut RenderContext) -> AnyElement {
-    let image_resource = match image.link.clone() {
-        Link::Web { url } => Resource::Uri(url.into()),
-        Link::Path { path, .. } => Resource::Path(Arc::from(path)),
-    };
-
-    let element_id = cx.next_id(&image.source_range);
-    let workspace = cx.workspace.clone();
-
-    div()
-        .id(element_id)
-        .cursor_pointer()
-        .child(
-            img(ImageSource::Resource(image_resource))
-                .max_w_full()
-                .with_fallback({
-                    let alt_text = image.alt_text.clone();
-                    move || div().children(alt_text.clone()).into_any_element()
-                })
-                .when_some(image.height, |this, height| this.h(height))
-                .when_some(image.width, |this, width| this.w(width)),
-        )
-        .tooltip({
-            let link = image.link.clone();
-            let alt_text = image.alt_text.clone();
-            move |_, cx| {
-                InteractiveMarkdownElementTooltip::new(
-                    Some(alt_text.clone().unwrap_or(link.to_string().into())),
-                    "open image",
-                    cx,
-                )
-                .into()
-            }
-        })
-        .on_click({
-            let link = image.link.clone();
-            move |_, window, cx| {
-                if window.modifiers().secondary() {
-                    match &link {
-                        Link::Web { url } => cx.open_url(url),
-                        Link::Path { path, .. } => {
-                            if let Some(workspace) = &workspace {
-                                _ = workspace.update(cx, |workspace, cx| {
-                                    workspace
-                                        .open_abs_path(
-                                            path.clone(),
-                                            OpenOptions {
-                                                visible: Some(OpenVisible::None),
-                                                ..Default::default()
-                                            },
-                                            window,
-                                            cx,
-                                        )
-                                        .detach();
-                                });
-                            }
-                        }
-                    }
-                }
-            }
-        })
-        .into_any()
-}
-
-struct InteractiveMarkdownElementTooltip {
-    tooltip_text: Option<SharedString>,
-    action_text: SharedString,
-}
-
-impl InteractiveMarkdownElementTooltip {
-    pub fn new(
-        tooltip_text: Option<SharedString>,
-        action_text: impl Into<SharedString>,
-        cx: &mut App,
-    ) -> Entity<Self> {
-        let tooltip_text = tooltip_text.map(|t| util::truncate_and_trailoff(&t, 50).into());
-
-        cx.new(|_cx| Self {
-            tooltip_text,
-            action_text: action_text.into(),
-        })
-    }
-}
-
-impl Render for InteractiveMarkdownElementTooltip {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        tooltip_container(cx, |el, _| {
-            let secondary_modifier = Keystroke {
-                modifiers: Modifiers::secondary_key(),
-                ..Default::default()
-            };
-
-            el.child(
-                v_flex()
-                    .gap_1()
-                    .when_some(self.tooltip_text.clone(), |this, text| {
-                        this.child(Label::new(text).size(LabelSize::Small))
-                    })
-                    .child(
-                        Label::new(format!(
-                            "{}-click to {}",
-                            secondary_modifier, self.action_text
-                        ))
-                        .size(LabelSize::Small)
-                        .color(Color::Muted),
-                    ),
-            )
-        })
-    }
-}
-
-/// Returns the prefix for a list item.
-fn list_item_prefix(order: usize, ordered: bool, depth: usize) -> String {
-    let ix = order.saturating_sub(1);
-    const NUMBERED_PREFIXES_1: &str = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-    const NUMBERED_PREFIXES_2: &str = "abcdefghijklmnopqrstuvwxyz";
-    const BULLETS: [&str; 5] = ["•", "◦", "▪", "‣", "⁃"];
-
-    if ordered {
-        match depth {
-            0 => format!("{}. ", order),
-            1 => format!(
-                "{}. ",
-                NUMBERED_PREFIXES_1
-                    .chars()
-                    .nth(ix % NUMBERED_PREFIXES_1.len())
-                    .unwrap()
-            ),
-            _ => format!(
-                "{}. ",
-                NUMBERED_PREFIXES_2
-                    .chars()
-                    .nth(ix % NUMBERED_PREFIXES_2.len())
-                    .unwrap()
-            ),
-        }
-    } else {
-        let depth = depth.min(BULLETS.len() - 1);
-        let bullet = BULLETS[depth];
-        return format!("{} ", bullet);
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::markdown_elements::ParsedMarkdownTableColumn;
-    use crate::markdown_elements::ParsedMarkdownText;
-
-    fn text(text: &str) -> MarkdownParagraphChunk {
-        MarkdownParagraphChunk::Text(ParsedMarkdownText {
-            source_range: 0..text.len(),
-            contents: SharedString::new(text),
-            highlights: Default::default(),
-            regions: Default::default(),
-        })
-    }
-
-    fn column(
-        col_span: usize,
-        row_span: usize,
-        children: Vec<MarkdownParagraphChunk>,
-    ) -> ParsedMarkdownTableColumn {
-        ParsedMarkdownTableColumn {
-            col_span,
-            row_span,
-            is_header: false,
-            children,
-            alignment: ParsedMarkdownTableAlignment::None,
-        }
-    }
-
-    fn column_with_row_span(
-        col_span: usize,
-        row_span: usize,
-        children: Vec<MarkdownParagraphChunk>,
-    ) -> ParsedMarkdownTableColumn {
-        ParsedMarkdownTableColumn {
-            col_span,
-            row_span,
-            is_header: false,
-            children,
-            alignment: ParsedMarkdownTableAlignment::None,
-        }
-    }
-
-    #[test]
-    fn test_calculate_table_columns_count() {
-        assert_eq!(0, calculate_table_columns_count(&vec![]));
-
-        assert_eq!(
-            1,
-            calculate_table_columns_count(&vec![ParsedMarkdownTableRow::with_columns(vec![
-                column(1, 1, vec![text("column1")])
-            ])])
-        );
-
-        assert_eq!(
-            2,
-            calculate_table_columns_count(&vec![ParsedMarkdownTableRow::with_columns(vec![
-                column(1, 1, vec![text("column1")]),
-                column(1, 1, vec![text("column2")]),
-            ])])
-        );
-
-        assert_eq!(
-            2,
-            calculate_table_columns_count(&vec![ParsedMarkdownTableRow::with_columns(vec![
-                column(2, 1, vec![text("column1")])
-            ])])
-        );
-
-        assert_eq!(
-            3,
-            calculate_table_columns_count(&vec![ParsedMarkdownTableRow::with_columns(vec![
-                column(1, 1, vec![text("column1")]),
-                column(2, 1, vec![text("column2")]),
-            ])])
-        );
-
-        assert_eq!(
-            2,
-            calculate_table_columns_count(&vec![
-                ParsedMarkdownTableRow::with_columns(vec![
-                    column(1, 1, vec![text("column1")]),
-                    column(1, 1, vec![text("column2")]),
-                ]),
-                ParsedMarkdownTableRow::with_columns(vec![column(1, 1, vec![text("column1")]),])
-            ])
-        );
-
-        assert_eq!(
-            3,
-            calculate_table_columns_count(&vec![
-                ParsedMarkdownTableRow::with_columns(vec![
-                    column(1, 1, vec![text("column1")]),
-                    column(1, 1, vec![text("column2")]),
-                ]),
-                ParsedMarkdownTableRow::with_columns(vec![column(3, 3, vec![text("column1")]),])
-            ])
-        );
-    }
-
-    #[test]
-    fn test_row_span_support() {
-        assert_eq!(
-            3,
-            calculate_table_columns_count(&vec![
-                ParsedMarkdownTableRow::with_columns(vec![
-                    column_with_row_span(1, 2, vec![text("spans 2 rows")]),
-                    column(1, 1, vec![text("column2")]),
-                    column(1, 1, vec![text("column3")]),
-                ]),
-                ParsedMarkdownTableRow::with_columns(vec![
-                    // First column is covered by row span from above
-                    column(1, 1, vec![text("column2 row2")]),
-                    column(1, 1, vec![text("column3 row2")]),
-                ])
-            ])
-        );
-
-        assert_eq!(
-            4,
-            calculate_table_columns_count(&vec![
-                ParsedMarkdownTableRow::with_columns(vec![
-                    column_with_row_span(1, 3, vec![text("spans 3 rows")]),
-                    column_with_row_span(2, 1, vec![text("spans 2 cols")]),
-                    column(1, 1, vec![text("column4")]),
-                ]),
-                ParsedMarkdownTableRow::with_columns(vec![
-                    // First column covered by row span
-                    column(1, 1, vec![text("column2")]),
-                    column(1, 1, vec![text("column3")]),
-                    column(1, 1, vec![text("column4")]),
-                ]),
-                ParsedMarkdownTableRow::with_columns(vec![
-                    // First column still covered by row span
-                    column(3, 1, vec![text("spans 3 cols")]),
-                ])
-            ])
-        );
-    }
-
-    #[test]
-    fn test_list_item_prefix() {
-        assert_eq!(list_item_prefix(1, true, 0), "1. ");
-        assert_eq!(list_item_prefix(2, true, 0), "2. ");
-        assert_eq!(list_item_prefix(3, true, 0), "3. ");
-        assert_eq!(list_item_prefix(11, true, 0), "11. ");
-        assert_eq!(list_item_prefix(1, true, 1), "A. ");
-        assert_eq!(list_item_prefix(2, true, 1), "B. ");
-        assert_eq!(list_item_prefix(3, true, 1), "C. ");
-        assert_eq!(list_item_prefix(1, true, 2), "a. ");
-        assert_eq!(list_item_prefix(2, true, 2), "b. ");
-        assert_eq!(list_item_prefix(7, true, 2), "g. ");
-        assert_eq!(list_item_prefix(1, true, 1), "A. ");
-        assert_eq!(list_item_prefix(1, true, 2), "a. ");
-        assert_eq!(list_item_prefix(1, false, 0), "• ");
-        assert_eq!(list_item_prefix(1, false, 1), "◦ ");
-        assert_eq!(list_item_prefix(1, false, 2), "▪ ");
-        assert_eq!(list_item_prefix(1, false, 3), "‣ ");
-        assert_eq!(list_item_prefix(1, false, 4), "⁃ ");
-    }
-}
diff --git a/crates/menu/Cargo.toml b/crates/menu/Cargo.toml
deleted file mode 100644
index fcb209df88..0000000000
--- a/crates/menu/Cargo.toml
+++ /dev/null
@@ -1,16 +0,0 @@
-[package]
-name = "menu"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/menu.rs"
-doctest = false
-
-[dependencies]
-gpui.workspace = true
diff --git a/crates/menu/LICENSE-GPL b/crates/menu/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/menu/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/menu/src/menu.rs b/crates/menu/src/menu.rs
deleted file mode 100644
index 9a1937d100..0000000000
--- a/crates/menu/src/menu.rs
+++ /dev/null
@@ -1,33 +0,0 @@
-use gpui::actions;
-
-// If the zed binary doesn't use anything in this crate, it will be optimized away
-// and the actions won't initialize. So we just provide an empty initialization function
-// to be called from main.
-//
-// These may provide relevant context:
-// https://github.com/rust-lang/rust/issues/47384
-// https://github.com/mmastrac/rust-ctor/issues/280
-pub fn init() {}
-
-actions!(
-    menu,
-    [
-        /// Cancels the current menu operation.
-        Cancel,
-        /// Confirms the selected menu item.
-        Confirm,
-        /// Performs secondary confirmation action.
-        SecondaryConfirm,
-        /// Selects the previous item in the menu.
-        SelectPrevious,
-        /// Selects the next item in the menu.
-        SelectNext,
-        /// Selects the first item in the menu.
-        SelectFirst,
-        /// Selects the last item in the menu.
-        SelectLast,
-        /// Restarts the menu from the beginning.
-        Restart,
-        EndSlot,
-    ]
-);
diff --git a/crates/migrator/Cargo.toml b/crates/migrator/Cargo.toml
deleted file mode 100644
index e0a7578474..0000000000
--- a/crates/migrator/Cargo.toml
+++ /dev/null
@@ -1,29 +0,0 @@
-[package]
-name = "migrator"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/migrator.rs"
-doctest = false
-
-[dependencies]
-anyhow.workspace = true
-collections.workspace = true
-convert_case.workspace = true
-log.workspace = true
-streaming-iterator.workspace = true
-tree-sitter-json.workspace = true
-tree-sitter.workspace = true
-serde_json_lenient.workspace = true
-serde_json.workspace = true
-settings_json.workspace = true
-
-[dev-dependencies]
-pretty_assertions.workspace = true
-unindent.workspace = true
diff --git a/crates/migrator/LICENSE-GPL b/crates/migrator/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/migrator/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/migrator/src/migrations.rs b/crates/migrator/src/migrations.rs
deleted file mode 100644
index 398d5aaf94..0000000000
--- a/crates/migrator/src/migrations.rs
+++ /dev/null
@@ -1,161 +0,0 @@
-pub(crate) mod m_2025_01_02 {
-    mod settings;
-
-    pub(crate) use settings::SETTINGS_PATTERNS;
-}
-
-pub(crate) mod m_2025_01_29 {
-    mod keymap;
-    mod settings;
-
-    pub(crate) use keymap::KEYMAP_PATTERNS;
-    pub(crate) use settings::{SETTINGS_PATTERNS, replace_edit_prediction_provider_setting};
-}
-
-pub(crate) mod m_2025_01_30 {
-    mod keymap;
-    mod settings;
-
-    pub(crate) use keymap::KEYMAP_PATTERNS;
-    pub(crate) use settings::SETTINGS_PATTERNS;
-}
-
-pub(crate) mod m_2025_03_03 {
-    mod keymap;
-
-    pub(crate) use keymap::KEYMAP_PATTERNS;
-}
-
-pub(crate) mod m_2025_03_06 {
-    mod keymap;
-
-    pub(crate) use keymap::KEYMAP_PATTERNS;
-}
-
-pub(crate) mod m_2025_03_29 {
-    mod settings;
-
-    pub(crate) use settings::SETTINGS_PATTERNS;
-}
-
-pub(crate) mod m_2025_04_15 {
-    mod keymap;
-    mod settings;
-
-    pub(crate) use keymap::KEYMAP_PATTERNS;
-    pub(crate) use settings::SETTINGS_PATTERNS;
-}
-
-pub(crate) mod m_2025_04_21 {
-    mod settings;
-
-    pub(crate) use settings::SETTINGS_PATTERNS;
-}
-
-pub(crate) mod m_2025_04_23 {
-    mod settings;
-
-    pub(crate) use settings::SETTINGS_PATTERNS;
-}
-
-pub(crate) mod m_2025_05_05 {
-    mod settings;
-
-    pub(crate) use settings::SETTINGS_PATTERNS;
-}
-
-pub(crate) mod m_2025_05_08 {
-    mod settings;
-
-    pub(crate) use settings::SETTINGS_PATTERNS;
-}
-
-pub(crate) mod m_2025_05_29 {
-    mod settings;
-
-    pub(crate) use settings::SETTINGS_PATTERNS;
-}
-
-pub(crate) mod m_2025_06_16 {
-    mod settings;
-
-    pub(crate) use settings::SETTINGS_PATTERNS;
-}
-
-pub(crate) mod m_2025_06_25 {
-    mod settings;
-
-    pub(crate) use settings::SETTINGS_PATTERNS;
-}
-
-pub(crate) mod m_2025_06_27 {
-    mod settings;
-
-    pub(crate) use settings::SETTINGS_PATTERNS;
-}
-
-pub(crate) mod m_2025_07_08 {
-    mod settings;
-
-    pub(crate) use settings::SETTINGS_PATTERNS;
-}
-
-pub(crate) mod m_2025_10_01 {
-    mod settings;
-
-    pub(crate) use settings::flatten_code_actions_formatters;
-}
-
-pub(crate) mod m_2025_10_02 {
-    mod settings;
-
-    pub(crate) use settings::remove_formatters_on_save;
-}
-
-pub(crate) mod m_2025_10_03 {
-    mod settings;
-
-    pub(crate) use settings::SETTINGS_PATTERNS;
-}
-
-pub(crate) mod m_2025_10_16 {
-    mod settings;
-
-    pub(crate) use settings::restore_code_actions_on_format;
-}
-
-pub(crate) mod m_2025_10_17 {
-    mod settings;
-
-    pub(crate) use settings::make_file_finder_include_ignored_an_enum;
-}
-
-pub(crate) mod m_2025_10_21 {
-    mod settings;
-
-    pub(crate) use settings::make_relative_line_numbers_an_enum;
-}
-
-pub(crate) mod m_2025_11_12 {
-    mod settings;
-
-    pub(crate) use settings::SETTINGS_PATTERNS;
-}
-
-pub(crate) mod m_2025_11_20 {
-    mod settings;
-
-    pub(crate) use settings::SETTINGS_PATTERNS;
-}
-
-pub(crate) mod m_2025_11_25 {
-    mod settings;
-
-    pub(crate) use settings::remove_context_server_source;
-}
-
-pub(crate) mod m_2025_12_01 {
-    mod settings;
-
-    pub(crate) use settings::SETTINGS_PATTERNS;
-}
diff --git a/crates/migrator/src/migrations/m_2025_01_02/settings.rs b/crates/migrator/src/migrations/m_2025_01_02/settings.rs
deleted file mode 100644
index a35b1ebd2e..0000000000
--- a/crates/migrator/src/migrations/m_2025_01_02/settings.rs
+++ /dev/null
@@ -1,62 +0,0 @@
-use collections::HashMap;
-use std::{ops::Range, sync::LazyLock};
-use tree_sitter::{Query, QueryMatch};
-
-use crate::MigrationPatterns;
-use crate::patterns::SETTINGS_NESTED_KEY_VALUE_PATTERN;
-
-pub const SETTINGS_PATTERNS: MigrationPatterns = &[(
-    SETTINGS_NESTED_KEY_VALUE_PATTERN,
-    replace_deprecated_settings_values,
-)];
-
-fn replace_deprecated_settings_values(
-    contents: &str,
-    mat: &QueryMatch,
-    query: &Query,
-) -> Option<(Range<usize>, String)> {
-    let parent_object_capture_ix = query.capture_index_for_name("parent_key")?;
-    let parent_object_range = mat
-        .nodes_for_capture_index(parent_object_capture_ix)
-        .next()?
-        .byte_range();
-    let parent_object_name = contents.get(parent_object_range)?;
-
-    let setting_name_ix = query.capture_index_for_name("setting_name")?;
-    let setting_name_range = mat
-        .nodes_for_capture_index(setting_name_ix)
-        .next()?
-        .byte_range();
-    let setting_name = contents.get(setting_name_range)?;
-
-    let setting_value_ix = query.capture_index_for_name("setting_value")?;
-    let setting_value_range = mat
-        .nodes_for_capture_index(setting_value_ix)
-        .next()?
-        .byte_range();
-    let setting_value = contents.get(setting_value_range.clone())?;
-
-    UPDATED_SETTINGS
-        .get(&(parent_object_name, setting_name))
-        .and_then(|new_values| {
-            new_values
-                .iter()
-                .find_map(|(old_value, new_value)| {
-                    (*old_value == setting_value).then(|| new_value.to_string())
-                })
-                .map(|new_value| (setting_value_range, new_value))
-        })
-}
-
-static UPDATED_SETTINGS: LazyLock<HashMap<(&str, &str), Vec<(&str, &str)>>> = LazyLock::new(|| {
-    HashMap::from_iter([
-        (
-            ("chat_panel", "button"),
-            vec![("true", "\"always\""), ("false", "\"never\"")],
-        ),
-        (
-            ("scrollbar", "diagnostics"),
-            vec![("true", "\"all\""), ("false", "\"none\"")],
-        ),
-    ])
-});
diff --git a/crates/migrator/src/migrations/m_2025_01_29/keymap.rs b/crates/migrator/src/migrations/m_2025_01_29/keymap.rs
deleted file mode 100644
index 222ad9716b..0000000000
--- a/crates/migrator/src/migrations/m_2025_01_29/keymap.rs
+++ /dev/null
@@ -1,307 +0,0 @@
-use collections::HashMap;
-use std::{ops::Range, sync::LazyLock};
-use tree_sitter::{Query, QueryMatch};
-
-use crate::MigrationPatterns;
-use crate::patterns::{
-    KEYMAP_ACTION_ARRAY_ARGUMENT_AS_OBJECT_PATTERN, KEYMAP_ACTION_ARRAY_PATTERN,
-    KEYMAP_ACTION_STRING_PATTERN, KEYMAP_CONTEXT_PATTERN,
-};
-
-pub const KEYMAP_PATTERNS: MigrationPatterns = &[
-    (
-        KEYMAP_ACTION_ARRAY_PATTERN,
-        replace_array_with_single_string,
-    ),
-    (
-        KEYMAP_ACTION_ARRAY_ARGUMENT_AS_OBJECT_PATTERN,
-        replace_action_argument_object_with_single_value,
-    ),
-    (KEYMAP_ACTION_STRING_PATTERN, replace_string_action),
-    (KEYMAP_CONTEXT_PATTERN, rename_context_key),
-];
-
-fn replace_array_with_single_string(
-    contents: &str,
-    mat: &QueryMatch,
-    query: &Query,
-) -> Option<(Range<usize>, String)> {
-    let array_ix = query.capture_index_for_name("array")?;
-    let action_name_ix = query.capture_index_for_name("action_name")?;
-    let argument_ix = query.capture_index_for_name("argument")?;
-
-    let action_name = contents.get(
-        mat.nodes_for_capture_index(action_name_ix)
-            .next()?
-            .byte_range(),
-    )?;
-    let argument = contents.get(
-        mat.nodes_for_capture_index(argument_ix)
-            .next()?
-            .byte_range(),
-    )?;
-
-    let replacement = TRANSFORM_ARRAY.get(&(action_name, argument))?;
-    let replacement_as_string = format!("\"{replacement}\"");
-    let range_to_replace = mat.nodes_for_capture_index(array_ix).next()?.byte_range();
-
-    Some((range_to_replace, replacement_as_string))
-}
-
-static TRANSFORM_ARRAY: LazyLock<HashMap<(&str, &str), &str>> = LazyLock::new(|| {
-    HashMap::from_iter([
-        // activate
-        (
-            ("workspace::ActivatePaneInDirection", "Up"),
-            "workspace::ActivatePaneUp",
-        ),
-        (
-            ("workspace::ActivatePaneInDirection", "Down"),
-            "workspace::ActivatePaneDown",
-        ),
-        (
-            ("workspace::ActivatePaneInDirection", "Left"),
-            "workspace::ActivatePaneLeft",
-        ),
-        (
-            ("workspace::ActivatePaneInDirection", "Right"),
-            "workspace::ActivatePaneRight",
-        ),
-        // swap
-        (
-            ("workspace::SwapPaneInDirection", "Up"),
-            "workspace::SwapPaneUp",
-        ),
-        (
-            ("workspace::SwapPaneInDirection", "Down"),
-            "workspace::SwapPaneDown",
-        ),
-        (
-            ("workspace::SwapPaneInDirection", "Left"),
-            "workspace::SwapPaneLeft",
-        ),
-        (
-            ("workspace::SwapPaneInDirection", "Right"),
-            "workspace::SwapPaneRight",
-        ),
-        // menu
-        (
-            ("app_menu::NavigateApplicationMenuInDirection", "Left"),
-            "app_menu::ActivateMenuLeft",
-        ),
-        (
-            ("app_menu::NavigateApplicationMenuInDirection", "Right"),
-            "app_menu::ActivateMenuRight",
-        ),
-        // vim push
-        (("vim::PushOperator", "Change"), "vim::PushChange"),
-        (("vim::PushOperator", "Delete"), "vim::PushDelete"),
-        (("vim::PushOperator", "Yank"), "vim::PushYank"),
-        (("vim::PushOperator", "Replace"), "vim::PushReplace"),
-        (
-            ("vim::PushOperator", "DeleteSurrounds"),
-            "vim::PushDeleteSurrounds",
-        ),
-        (("vim::PushOperator", "Mark"), "vim::PushMark"),
-        (("vim::PushOperator", "Indent"), "vim::PushIndent"),
-        (("vim::PushOperator", "Outdent"), "vim::PushOutdent"),
-        (("vim::PushOperator", "AutoIndent"), "vim::PushAutoIndent"),
-        (("vim::PushOperator", "Rewrap"), "vim::PushRewrap"),
-        (
-            ("vim::PushOperator", "ShellCommand"),
-            "vim::PushShellCommand",
-        ),
-        (("vim::PushOperator", "Lowercase"), "vim::PushLowercase"),
-        (("vim::PushOperator", "Uppercase"), "vim::PushUppercase"),
-        (
-            ("vim::PushOperator", "OppositeCase"),
-            "vim::PushOppositeCase",
-        ),
-        (("vim::PushOperator", "Register"), "vim::PushRegister"),
-        (
-            ("vim::PushOperator", "RecordRegister"),
-            "vim::PushRecordRegister",
-        ),
-        (
-            ("vim::PushOperator", "ReplayRegister"),
-            "vim::PushReplayRegister",
-        ),
-        (
-            ("vim::PushOperator", "ReplaceWithRegister"),
-            "vim::PushReplaceWithRegister",
-        ),
-        (
-            ("vim::PushOperator", "ToggleComments"),
-            "vim::PushToggleComments",
-        ),
-        // vim switch
-        (("vim::SwitchMode", "Normal"), "vim::SwitchToNormalMode"),
-        (("vim::SwitchMode", "Insert"), "vim::SwitchToInsertMode"),
-        (("vim::SwitchMode", "Replace"), "vim::SwitchToReplaceMode"),
-        (("vim::SwitchMode", "Visual"), "vim::SwitchToVisualMode"),
-        (
-            ("vim::SwitchMode", "VisualLine"),
-            "vim::SwitchToVisualLineMode",
-        ),
-        (
-            ("vim::SwitchMode", "VisualBlock"),
-            "vim::SwitchToVisualBlockMode",
-        ),
-        (
-            ("vim::SwitchMode", "HelixNormal"),
-            "vim::SwitchToHelixNormalMode",
-        ),
-        // vim resize
-        (("vim::ResizePane", "Widen"), "vim::ResizePaneRight"),
-        (("vim::ResizePane", "Narrow"), "vim::ResizePaneLeft"),
-        (("vim::ResizePane", "Shorten"), "vim::ResizePaneDown"),
-        (("vim::ResizePane", "Lengthen"), "vim::ResizePaneUp"),
-        // fold at level
-        (("editor::FoldAtLevel", "1"), "editor::FoldAtLevel1"),
-        (("editor::FoldAtLevel", "2"), "editor::FoldAtLevel2"),
-        (("editor::FoldAtLevel", "3"), "editor::FoldAtLevel3"),
-        (("editor::FoldAtLevel", "4"), "editor::FoldAtLevel4"),
-        (("editor::FoldAtLevel", "5"), "editor::FoldAtLevel5"),
-        (("editor::FoldAtLevel", "6"), "editor::FoldAtLevel6"),
-        (("editor::FoldAtLevel", "7"), "editor::FoldAtLevel7"),
-        (("editor::FoldAtLevel", "8"), "editor::FoldAtLevel8"),
-        (("editor::FoldAtLevel", "9"), "editor::FoldAtLevel9"),
-    ])
-});
-
-/// [ "editor::FoldAtLevel", { "level": 1 } ] -> [ "editor::FoldAtLevel", 1 ]
-fn replace_action_argument_object_with_single_value(
-    contents: &str,
-    mat: &QueryMatch,
-    query: &Query,
-) -> Option<(Range<usize>, String)> {
-    let array_ix = query.capture_index_for_name("array")?;
-    let action_name_ix = query.capture_index_for_name("action_name")?;
-    let argument_key_ix = query.capture_index_for_name("argument_key")?;
-    let argument_value_ix = query.capture_index_for_name("argument_value")?;
-
-    let action_name = contents.get(
-        mat.nodes_for_capture_index(action_name_ix)
-            .next()?
-            .byte_range(),
-    )?;
-    let argument_key = contents.get(
-        mat.nodes_for_capture_index(argument_key_ix)
-            .next()?
-            .byte_range(),
-    )?;
-    let argument_value = contents.get(
-        mat.nodes_for_capture_index(argument_value_ix)
-            .next()?
-            .byte_range(),
-    )?;
-
-    let new_action_name = UNWRAP_OBJECTS.get(&action_name)?.get(&argument_key)?;
-
-    let range_to_replace = mat.nodes_for_capture_index(array_ix).next()?.byte_range();
-    let replacement = format!("[\"{}\", {}]", new_action_name, argument_value);
-    Some((range_to_replace, replacement))
-}
-
-/// "ctrl-k ctrl-1": [ "editor::PushOperator", { "Object": {} } ] -> [ "editor::vim::PushObject", {} ]
-static UNWRAP_OBJECTS: LazyLock<HashMap<&str, HashMap<&str, &str>>> = LazyLock::new(|| {
-    HashMap::from_iter([
-        (
-            "editor::FoldAtLevel",
-            HashMap::from_iter([("level", "editor::FoldAtLevel")]),
-        ),
-        (
-            "vim::PushOperator",
-            HashMap::from_iter([
-                ("Object", "vim::PushObject"),
-                ("FindForward", "vim::PushFindForward"),
-                ("FindBackward", "vim::PushFindBackward"),
-                ("Sneak", "vim::PushSneak"),
-                ("SneakBackward", "vim::PushSneakBackward"),
-                ("AddSurrounds", "vim::PushAddSurrounds"),
-                ("ChangeSurrounds", "vim::PushChangeSurrounds"),
-                ("Jump", "vim::PushJump"),
-                ("Digraph", "vim::PushDigraph"),
-                ("Literal", "vim::PushLiteral"),
-            ]),
-        ),
-    ])
-});
-
-fn replace_string_action(
-    contents: &str,
-    mat: &QueryMatch,
-    query: &Query,
-) -> Option<(Range<usize>, String)> {
-    let action_name_ix = query.capture_index_for_name("action_name")?;
-    let action_name_node = mat.nodes_for_capture_index(action_name_ix).next()?;
-    let action_name_range = action_name_node.byte_range();
-    let action_name = contents.get(action_name_range.clone())?;
-
-    if let Some(new_action_name) = STRING_REPLACE.get(&action_name) {
-        return Some((action_name_range, new_action_name.to_string()));
-    }
-
-    None
-}
-
-/// "ctrl-k ctrl-1": "inline_completion::ToggleMenu" -> "edit_prediction::ToggleMenu"
-static STRING_REPLACE: LazyLock<HashMap<&str, &str>> = LazyLock::new(|| {
-    HashMap::from_iter([
-        (
-            "inline_completion::ToggleMenu",
-            "edit_prediction::ToggleMenu",
-        ),
-        ("editor::NextInlineCompletion", "editor::NextEditPrediction"),
-        (
-            "editor::PreviousInlineCompletion",
-            "editor::PreviousEditPrediction",
-        ),
-        (
-            "editor::AcceptPartialInlineCompletion",
-            "editor::AcceptPartialEditPrediction",
-        ),
-        ("editor::ShowInlineCompletion", "editor::ShowEditPrediction"),
-        (
-            "editor::AcceptInlineCompletion",
-            "editor::AcceptEditPrediction",
-        ),
-        (
-            "editor::ToggleInlineCompletions",
-            "editor::ToggleEditPrediction",
-        ),
-    ])
-});
-
-fn rename_context_key(
-    contents: &str,
-    mat: &QueryMatch,
-    query: &Query,
-) -> Option<(Range<usize>, String)> {
-    let context_predicate_ix = query.capture_index_for_name("context_predicate")?;
-    let context_predicate_range = mat
-        .nodes_for_capture_index(context_predicate_ix)
-        .next()?
-        .byte_range();
-    let old_predicate = contents.get(context_predicate_range.clone())?.to_string();
-    let mut new_predicate = old_predicate.to_string();
-    for (old_key, new_key) in CONTEXT_REPLACE.iter() {
-        new_predicate = new_predicate.replace(old_key, new_key);
-    }
-    if new_predicate != old_predicate {
-        Some((context_predicate_range, new_predicate))
-    } else {
-        None
-    }
-}
-
-/// "context": "Editor && inline_completion && !showing_completions" -> "Editor && edit_prediction && !showing_completions"
-pub static CONTEXT_REPLACE: LazyLock<HashMap<&str, &str>> = LazyLock::new(|| {
-    HashMap::from_iter([
-        ("inline_completion", "edit_prediction"),
-        (
-            "inline_completion_requires_modifier",
-            "edit_prediction_requires_modifier",
-        ),
-    ])
-});
diff --git a/crates/migrator/src/migrations/m_2025_01_29/settings.rs b/crates/migrator/src/migrations/m_2025_01_29/settings.rs
deleted file mode 100644
index 46cfe2f178..0000000000
--- a/crates/migrator/src/migrations/m_2025_01_29/settings.rs
+++ /dev/null
@@ -1,101 +0,0 @@
-use collections::HashMap;
-use std::{ops::Range, sync::LazyLock};
-use tree_sitter::{Query, QueryMatch};
-
-use crate::MigrationPatterns;
-use crate::patterns::{
-    SETTINGS_LANGUAGES_PATTERN, SETTINGS_NESTED_KEY_VALUE_PATTERN, SETTINGS_ROOT_KEY_VALUE_PATTERN,
-};
-
-pub const SETTINGS_PATTERNS: MigrationPatterns = &[
-    (SETTINGS_ROOT_KEY_VALUE_PATTERN, replace_setting_name),
-    (
-        SETTINGS_NESTED_KEY_VALUE_PATTERN,
-        replace_edit_prediction_provider_setting,
-    ),
-    (SETTINGS_LANGUAGES_PATTERN, replace_setting_in_languages),
-];
-
-fn replace_setting_name(
-    contents: &str,
-    mat: &QueryMatch,
-    query: &Query,
-) -> Option<(Range<usize>, String)> {
-    let setting_capture_ix = query.capture_index_for_name("name")?;
-    let setting_name_range = mat
-        .nodes_for_capture_index(setting_capture_ix)
-        .next()?
-        .byte_range();
-    let setting_name = contents.get(setting_name_range.clone())?;
-    let new_setting_name = SETTINGS_STRING_REPLACE.get(&setting_name)?;
-    Some((setting_name_range, new_setting_name.to_string()))
-}
-
-pub static SETTINGS_STRING_REPLACE: LazyLock<HashMap<&'static str, &'static str>> =
-    LazyLock::new(|| {
-        HashMap::from_iter([
-            (
-                "show_inline_completions_in_menu",
-                "show_edit_predictions_in_menu",
-            ),
-            ("show_inline_completions", "show_edit_predictions"),
-            (
-                "inline_completions_disabled_in",
-                "edit_predictions_disabled_in",
-            ),
-            ("inline_completions", "edit_predictions"),
-        ])
-    });
-
-pub fn replace_edit_prediction_provider_setting(
-    contents: &str,
-    mat: &QueryMatch,
-    query: &Query,
-) -> Option<(Range<usize>, String)> {
-    let parent_object_capture_ix = query.capture_index_for_name("parent_key")?;
-    let parent_object_range = mat
-        .nodes_for_capture_index(parent_object_capture_ix)
-        .next()?
-        .byte_range();
-    let parent_object_name = contents.get(parent_object_range)?;
-
-    let setting_name_ix = query.capture_index_for_name("setting_name")?;
-    let setting_range = mat
-        .nodes_for_capture_index(setting_name_ix)
-        .next()?
-        .byte_range();
-    let setting_name = contents.get(setting_range.clone())?;
-
-    if parent_object_name == "features" && setting_name == "inline_completion_provider" {
-        return Some((setting_range, "edit_prediction_provider".into()));
-    }
-
-    None
-}
-
-fn replace_setting_in_languages(
-    contents: &str,
-    mat: &QueryMatch,
-    query: &Query,
-) -> Option<(Range<usize>, String)> {
-    let setting_capture_ix = query.capture_index_for_name("setting_name")?;
-    let setting_name_range = mat
-        .nodes_for_capture_index(setting_capture_ix)
-        .next()?
-        .byte_range();
-    let setting_name = contents.get(setting_name_range.clone())?;
-    let new_setting_name = LANGUAGE_SETTINGS_REPLACE.get(&setting_name)?;
-
-    Some((setting_name_range, new_setting_name.to_string()))
-}
-
-static LANGUAGE_SETTINGS_REPLACE: LazyLock<HashMap<&'static str, &'static str>> =
-    LazyLock::new(|| {
-        HashMap::from_iter([
-            ("show_inline_completions", "show_edit_predictions"),
-            (
-                "inline_completions_disabled_in",
-                "edit_predictions_disabled_in",
-            ),
-        ])
-    });
diff --git a/crates/migrator/src/migrations/m_2025_01_30/keymap.rs b/crates/migrator/src/migrations/m_2025_01_30/keymap.rs
deleted file mode 100644
index 0e131fea02..0000000000
--- a/crates/migrator/src/migrations/m_2025_01_30/keymap.rs
+++ /dev/null
@@ -1,82 +0,0 @@
-use collections::HashMap;
-use convert_case::{Case, Casing};
-use std::{ops::Range, sync::LazyLock};
-use tree_sitter::{Query, QueryMatch};
-
-use crate::MigrationPatterns;
-use crate::patterns::KEYMAP_ACTION_ARRAY_ARGUMENT_AS_OBJECT_PATTERN;
-
-pub const KEYMAP_PATTERNS: MigrationPatterns = &[(
-    KEYMAP_ACTION_ARRAY_ARGUMENT_AS_OBJECT_PATTERN,
-    action_argument_snake_case,
-)];
-
-fn to_snake_case(text: &str) -> String {
-    text.to_case(Case::Snake)
-}
-
-fn action_argument_snake_case(
-    contents: &str,
-    mat: &QueryMatch,
-    query: &Query,
-) -> Option<(Range<usize>, String)> {
-    let array_ix = query.capture_index_for_name("array")?;
-    let action_name_ix = query.capture_index_for_name("action_name")?;
-    let argument_key_ix = query.capture_index_for_name("argument_key")?;
-    let argument_value_ix = query.capture_index_for_name("argument_value")?;
-    let action_name = contents.get(
-        mat.nodes_for_capture_index(action_name_ix)
-            .next()?
-            .byte_range(),
-    )?;
-
-    let replacement_key = ACTION_ARGUMENT_SNAKE_CASE_REPLACE.get(action_name)?;
-    let argument_key = contents.get(
-        mat.nodes_for_capture_index(argument_key_ix)
-            .next()?
-            .byte_range(),
-    )?;
-
-    if argument_key != *replacement_key {
-        return None;
-    }
-
-    let argument_value_node = mat.nodes_for_capture_index(argument_value_ix).next()?;
-    let argument_value = contents.get(argument_value_node.byte_range())?;
-
-    let new_key = to_snake_case(argument_key);
-    let new_value = if argument_value_node.kind() == "string" {
-        format!("\"{}\"", to_snake_case(argument_value.trim_matches('"')))
-    } else {
-        argument_value.to_string()
-    };
-
-    let range_to_replace = mat.nodes_for_capture_index(array_ix).next()?.byte_range();
-    let replacement = format!(
-        "[\"{}\", {{ \"{}\": {} }}]",
-        action_name, new_key, new_value
-    );
-
-    Some((range_to_replace, replacement))
-}
-
-static ACTION_ARGUMENT_SNAKE_CASE_REPLACE: LazyLock<HashMap<&str, &str>> = LazyLock::new(|| {
-    HashMap::from_iter([
-        ("vim::NextWordStart", "ignorePunctuation"),
-        ("vim::NextWordEnd", "ignorePunctuation"),
-        ("vim::PreviousWordStart", "ignorePunctuation"),
-        ("vim::PreviousWordEnd", "ignorePunctuation"),
-        ("vim::MoveToNext", "partialWord"),
-        ("vim::MoveToPrev", "partialWord"),
-        ("vim::Down", "displayLines"),
-        ("vim::Up", "displayLines"),
-        ("vim::EndOfLine", "displayLines"),
-        ("vim::StartOfLine", "displayLines"),
-        ("vim::FirstNonWhitespace", "displayLines"),
-        ("pane::CloseActiveItem", "saveIntent"),
-        ("vim::Paste", "preserveClipboard"),
-        ("vim::Word", "ignorePunctuation"),
-        ("vim::Subword", "ignorePunctuation"),
-        ("vim::IndentObj", "includeBelow"),
-    ])
-});
diff --git a/crates/migrator/src/migrations/m_2025_01_30/settings.rs b/crates/migrator/src/migrations/m_2025_01_30/settings.rs
deleted file mode 100644
index 2d763e4722..0000000000
--- a/crates/migrator/src/migrations/m_2025_01_30/settings.rs
+++ /dev/null
@@ -1,83 +0,0 @@
-use std::ops::Range;
-use tree_sitter::{Query, QueryMatch};
-
-use crate::MigrationPatterns;
-use crate::patterns::SETTINGS_NESTED_KEY_VALUE_PATTERN;
-
-pub const SETTINGS_PATTERNS: MigrationPatterns = &[
-    (
-        SETTINGS_NESTED_KEY_VALUE_PATTERN,
-        replace_tab_close_button_setting_key,
-    ),
-    (
-        SETTINGS_NESTED_KEY_VALUE_PATTERN,
-        replace_tab_close_button_setting_value,
-    ),
-];
-
-fn replace_tab_close_button_setting_key(
-    contents: &str,
-    mat: &QueryMatch,
-    query: &Query,
-) -> Option<(Range<usize>, String)> {
-    let parent_object_capture_ix = query.capture_index_for_name("parent_key")?;
-    let parent_object_range = mat
-        .nodes_for_capture_index(parent_object_capture_ix)
-        .next()?
-        .byte_range();
-    let parent_object_name = contents.get(parent_object_range)?;
-
-    let setting_name_ix = query.capture_index_for_name("setting_name")?;
-    let setting_range = mat
-        .nodes_for_capture_index(setting_name_ix)
-        .next()?
-        .byte_range();
-    let setting_name = contents.get(setting_range.clone())?;
-
-    if parent_object_name == "tabs" && setting_name == "always_show_close_button" {
-        return Some((setting_range, "show_close_button".into()));
-    }
-
-    None
-}
-
-fn replace_tab_close_button_setting_value(
-    contents: &str,
-    mat: &QueryMatch,
-    query: &Query,
-) -> Option<(Range<usize>, String)> {
-    let parent_object_capture_ix = query.capture_index_for_name("parent_key")?;
-    let parent_object_range = mat
-        .nodes_for_capture_index(parent_object_capture_ix)
-        .next()?
-        .byte_range();
-    let parent_object_name = contents.get(parent_object_range)?;
-
-    let setting_name_ix = query.capture_index_for_name("setting_name")?;
-    let setting_name_range = mat
-        .nodes_for_capture_index(setting_name_ix)
-        .next()?
-        .byte_range();
-    let setting_name = contents.get(setting_name_range)?;
-
-    let setting_value_ix = query.capture_index_for_name("setting_value")?;
-    let setting_value_range = mat
-        .nodes_for_capture_index(setting_value_ix)
-        .next()?
-        .byte_range();
-    let setting_value = contents.get(setting_value_range.clone())?;
-
-    if parent_object_name == "tabs" && setting_name == "always_show_close_button" {
-        match setting_value {
-            "true" => {
-                return Some((setting_value_range, "\"always\"".to_string()));
-            }
-            "false" => {
-                return Some((setting_value_range, "\"hover\"".to_string()));
-            }
-            _ => {}
-        }
-    }
-
-    None
-}
diff --git a/crates/migrator/src/migrations/m_2025_03_03/keymap.rs b/crates/migrator/src/migrations/m_2025_03_03/keymap.rs
deleted file mode 100644
index 2342a8f696..0000000000
--- a/crates/migrator/src/migrations/m_2025_03_03/keymap.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-use collections::HashMap;
-use std::{ops::Range, sync::LazyLock};
-use tree_sitter::{Query, QueryMatch};
-
-use crate::MigrationPatterns;
-use crate::patterns::KEYMAP_ACTION_STRING_PATTERN;
-
-pub const KEYMAP_PATTERNS: MigrationPatterns =
-    &[(KEYMAP_ACTION_STRING_PATTERN, replace_string_action)];
-
-fn replace_string_action(
-    contents: &str,
-    mat: &QueryMatch,
-    query: &Query,
-) -> Option<(Range<usize>, String)> {
-    let action_name_ix = query.capture_index_for_name("action_name")?;
-    let action_name_node = mat.nodes_for_capture_index(action_name_ix).next()?;
-    let action_name_range = action_name_node.byte_range();
-    let action_name = contents.get(action_name_range.clone())?;
-
-    if let Some(new_action_name) = STRING_REPLACE.get(&action_name) {
-        return Some((action_name_range, new_action_name.to_string()));
-    }
-
-    if let Some((new_action_name, options)) = STRING_TO_ARRAY_REPLACE.get(action_name) {
-        let full_string_range = action_name_node.parent()?.byte_range();
-        let mut options_parts = Vec::new();
-        for (key, value) in options.iter() {
-            options_parts.push(format!("\"{}\": {}", key, value));
-        }
-        let options_str = options_parts.join(", ");
-        let replacement = format!("[\"{}\", {{ {} }}]", new_action_name, options_str);
-        return Some((full_string_range, replacement));
-    }
-
-    None
-}
-
-static STRING_REPLACE: LazyLock<HashMap<&str, &str>> = LazyLock::new(|| {
-    HashMap::from_iter([
-        (
-            "editor::GoToPrevDiagnostic",
-            "editor::GoToPreviousDiagnostic",
-        ),
-        ("editor::ContextMenuPrev", "editor::ContextMenuPrevious"),
-        ("search::SelectPrevMatch", "search::SelectPreviousMatch"),
-        ("file_finder::SelectPrev", "file_finder::SelectPrevious"),
-        ("menu::SelectPrev", "menu::SelectPrevious"),
-        ("editor::TabPrev", "editor::Backtab"),
-        ("pane::ActivatePrevItem", "pane::ActivatePreviousItem"),
-        ("vim::MoveToPrev", "vim::MoveToPrevious"),
-        ("vim::MoveToPrevMatch", "vim::MoveToPreviousMatch"),
-    ])
-});
-
-/// "editor::GoToPrevHunk" -> ["editor::GoToPreviousHunk", { "center_cursor": true }]
-static STRING_TO_ARRAY_REPLACE: LazyLock<HashMap<&str, (&str, HashMap<&str, bool>)>> =
-    LazyLock::new(|| {
-        HashMap::from_iter([
-            (
-                "editor::GoToHunk",
-                (
-                    "editor::GoToHunk",
-                    HashMap::from_iter([("center_cursor", true)]),
-                ),
-            ),
-            (
-                "editor::GoToPrevHunk",
-                (
-                    "editor::GoToPreviousHunk",
-                    HashMap::from_iter([("center_cursor", true)]),
-                ),
-            ),
-        ])
-    });
diff --git a/crates/migrator/src/migrations/m_2025_03_06/keymap.rs b/crates/migrator/src/migrations/m_2025_03_06/keymap.rs
deleted file mode 100644
index 333535908d..0000000000
--- a/crates/migrator/src/migrations/m_2025_03_06/keymap.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-use collections::HashSet;
-use std::{ops::Range, sync::LazyLock};
-use tree_sitter::{Query, QueryMatch};
-
-use crate::MigrationPatterns;
-use crate::patterns::KEYMAP_ACTION_ARRAY_ARGUMENT_AS_OBJECT_PATTERN;
-
-pub const KEYMAP_PATTERNS: MigrationPatterns = &[(
-    KEYMAP_ACTION_ARRAY_ARGUMENT_AS_OBJECT_PATTERN,
-    replace_array_with_single_string,
-)];
-
-fn replace_array_with_single_string(
-    contents: &str,
-    mat: &QueryMatch,
-    query: &Query,
-) -> Option<(Range<usize>, String)> {
-    let array_ix = query.capture_index_for_name("array")?;
-    let action_name_ix = query.capture_index_for_name("action_name")?;
-
-    let action_name = contents.get(
-        mat.nodes_for_capture_index(action_name_ix)
-            .next()?
-            .byte_range(),
-    )?;
-
-    if TRANSFORM_ARRAY.contains(&action_name) {
-        let replacement_as_string = format!("\"{action_name}\"");
-        let range_to_replace = mat.nodes_for_capture_index(array_ix).next()?.byte_range();
-        return Some((range_to_replace, replacement_as_string));
-    }
-
-    None
-}
-
-/// ["editor::GoToPreviousHunk", { "center_cursor": true }] -> "editor::GoToPreviousHunk"
-static TRANSFORM_ARRAY: LazyLock<HashSet<&str>> =
-    LazyLock::new(|| HashSet::from_iter(["editor::GoToHunk", "editor::GoToPreviousHunk"]));
diff --git a/crates/migrator/src/migrations/m_2025_03_29/settings.rs b/crates/migrator/src/migrations/m_2025_03_29/settings.rs
deleted file mode 100644
index 8f83d8e39e..0000000000
--- a/crates/migrator/src/migrations/m_2025_03_29/settings.rs
+++ /dev/null
@@ -1,65 +0,0 @@
-use std::ops::Range;
-use tree_sitter::{Query, QueryMatch};
-
-use crate::MigrationPatterns;
-use crate::patterns::SETTINGS_ROOT_KEY_VALUE_PATTERN;
-
-pub const SETTINGS_PATTERNS: MigrationPatterns = &[
-    (SETTINGS_ROOT_KEY_VALUE_PATTERN, replace_setting_name),
-    (SETTINGS_ROOT_KEY_VALUE_PATTERN, replace_setting_value),
-];
-
-fn replace_setting_value(
-    contents: &str,
-    mat: &QueryMatch,
-    query: &Query,
-) -> Option<(Range<usize>, String)> {
-    let setting_capture_ix = query.capture_index_for_name("name")?;
-    let setting_name_range = mat
-        .nodes_for_capture_index(setting_capture_ix)
-        .next()?
-        .byte_range();
-    let setting_name = contents.get(setting_name_range)?;
-
-    if setting_name != "hide_mouse_while_typing" {
-        return None;
-    }
-
-    let value_capture_ix = query.capture_index_for_name("value")?;
-    let value_range = mat
-        .nodes_for_capture_index(value_capture_ix)
-        .next()?
-        .byte_range();
-    let value = contents.get(value_range.clone())?;
-
-    let new_value = if value.trim() == "true" {
-        "\"on_typing_and_movement\""
-    } else if value.trim() == "false" {
-        "\"never\""
-    } else {
-        return None;
-    };
-
-    Some((value_range, new_value.to_string()))
-}
-
-fn replace_setting_name(
-    contents: &str,
-    mat: &QueryMatch,
-    query: &Query,
-) -> Option<(Range<usize>, String)> {
-    let setting_capture_ix = query.capture_index_for_name("name")?;
-    let setting_name_range = mat
-        .nodes_for_capture_index(setting_capture_ix)
-        .next()?
-        .byte_range();
-    let setting_name = contents.get(setting_name_range.clone())?;
-
-    let new_setting_name = if setting_name == "hide_mouse_while_typing" {
-        "hide_mouse"
-    } else {
-        return None;
-    };
-
-    Some((setting_name_range, new_setting_name.to_string()))
-}
diff --git a/crates/migrator/src/migrations/m_2025_04_15/keymap.rs b/crates/migrator/src/migrations/m_2025_04_15/keymap.rs
deleted file mode 100644
index efbdc6b1c6..0000000000
--- a/crates/migrator/src/migrations/m_2025_04_15/keymap.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-use collections::HashMap;
-use std::{ops::Range, sync::LazyLock};
-use tree_sitter::{Query, QueryMatch};
-
-use crate::MigrationPatterns;
-use crate::patterns::KEYMAP_ACTION_STRING_PATTERN;
-
-pub const KEYMAP_PATTERNS: MigrationPatterns =
-    &[(KEYMAP_ACTION_STRING_PATTERN, replace_string_action)];
-
-fn replace_string_action(
-    contents: &str,
-    mat: &QueryMatch,
-    query: &Query,
-) -> Option<(Range<usize>, String)> {
-    let action_name_ix = query.capture_index_for_name("action_name")?;
-    let action_name_node = mat.nodes_for_capture_index(action_name_ix).next()?;
-    let action_name_range = action_name_node.byte_range();
-    let action_name = contents.get(action_name_range.clone())?;
-
-    if let Some(new_action_name) = STRING_REPLACE.get(&action_name) {
-        return Some((action_name_range, new_action_name.to_string()));
-    }
-
-    None
-}
-
-/// "space": "outline_panel::Open" -> "outline_panel::OpenSelectedEntry"
-static STRING_REPLACE: LazyLock<HashMap<&str, &str>> = LazyLock::new(|| {
-    HashMap::from_iter([("outline_panel::Open", "outline_panel::OpenSelectedEntry")])
-});
diff --git a/crates/migrator/src/migrations/m_2025_04_15/settings.rs b/crates/migrator/src/migrations/m_2025_04_15/settings.rs
deleted file mode 100644
index cbebd2a902..0000000000
--- a/crates/migrator/src/migrations/m_2025_04_15/settings.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-use std::ops::Range;
-use tree_sitter::{Query, QueryMatch};
-
-use crate::MigrationPatterns;
-use crate::patterns::SETTINGS_ASSISTANT_TOOLS_PATTERN;
-
-pub const SETTINGS_PATTERNS: MigrationPatterns = &[(
-    SETTINGS_ASSISTANT_TOOLS_PATTERN,
-    replace_bash_with_terminal_in_profiles,
-)];
-
-fn replace_bash_with_terminal_in_profiles(
-    contents: &str,
-    mat: &QueryMatch,
-    query: &Query,
-) -> Option<(Range<usize>, String)> {
-    let tool_name_capture_ix = query.capture_index_for_name("tool_name")?;
-    let tool_name_range = mat
-        .nodes_for_capture_index(tool_name_capture_ix)
-        .next()?
-        .byte_range();
-    let tool_name = contents.get(tool_name_range.clone())?;
-
-    if tool_name != "bash" {
-        return None;
-    }
-
-    Some((tool_name_range, "terminal".to_string()))
-}
diff --git a/crates/migrator/src/migrations/m_2025_04_21/settings.rs b/crates/migrator/src/migrations/m_2025_04_21/settings.rs
deleted file mode 100644
index 55afc54928..0000000000
--- a/crates/migrator/src/migrations/m_2025_04_21/settings.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-use std::ops::Range;
-use tree_sitter::{Query, QueryMatch};
-
-use crate::MigrationPatterns;
-use crate::patterns::SETTINGS_ASSISTANT_TOOLS_PATTERN;
-
-pub const SETTINGS_PATTERNS: MigrationPatterns =
-    &[(SETTINGS_ASSISTANT_TOOLS_PATTERN, rename_tools)];
-
-fn rename_tools(contents: &str, mat: &QueryMatch, query: &Query) -> Option<(Range<usize>, String)> {
-    let tool_name_capture_ix = query.capture_index_for_name("tool_name")?;
-    let tool_name_range = mat
-        .nodes_for_capture_index(tool_name_capture_ix)
-        .next()?
-        .byte_range();
-    let tool_name = contents.get(tool_name_range.clone())?;
-
-    let new_name = match tool_name {
-        "find_replace_file" => "edit_file",
-        "regex_search" => "grep",
-        _ => return None,
-    };
-
-    Some((tool_name_range, new_name.to_string()))
-}
diff --git a/crates/migrator/src/migrations/m_2025_04_23/settings.rs b/crates/migrator/src/migrations/m_2025_04_23/settings.rs
deleted file mode 100644
index 54bb999640..0000000000
--- a/crates/migrator/src/migrations/m_2025_04_23/settings.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-use std::ops::Range;
-use tree_sitter::{Query, QueryMatch};
-
-use crate::MigrationPatterns;
-use crate::patterns::SETTINGS_ASSISTANT_TOOLS_PATTERN;
-
-pub const SETTINGS_PATTERNS: MigrationPatterns =
-    &[(SETTINGS_ASSISTANT_TOOLS_PATTERN, rename_path_search_tool)];
-
-fn rename_path_search_tool(
-    contents: &str,
-    mat: &QueryMatch,
-    query: &Query,
-) -> Option<(Range<usize>, String)> {
-    let tool_name_capture_ix = query.capture_index_for_name("tool_name")?;
-    let tool_name_range = mat
-        .nodes_for_capture_index(tool_name_capture_ix)
-        .next()?
-        .byte_range();
-    let tool_name = contents.get(tool_name_range.clone())?;
-
-    if tool_name == "path_search" {
-        return Some((tool_name_range, "find_path".to_string()));
-    }
-
-    None
-}
diff --git a/crates/migrator/src/migrations/m_2025_05_05/settings.rs b/crates/migrator/src/migrations/m_2025_05_05/settings.rs
deleted file mode 100644
index 77da1b9a07..0000000000
--- a/crates/migrator/src/migrations/m_2025_05_05/settings.rs
+++ /dev/null
@@ -1,41 +0,0 @@
-use std::ops::Range;
-use tree_sitter::{Query, QueryMatch};
-
-use crate::{
-    MigrationPatterns, patterns::SETTINGS_ASSISTANT_PATTERN,
-    patterns::SETTINGS_EDIT_PREDICTIONS_ASSISTANT_PATTERN,
-};
-
-pub const SETTINGS_PATTERNS: MigrationPatterns = &[
-    (SETTINGS_ASSISTANT_PATTERN, rename_assistant),
-    (
-        SETTINGS_EDIT_PREDICTIONS_ASSISTANT_PATTERN,
-        rename_edit_prediction_assistant,
-    ),
-];
-
-fn rename_assistant(
-    _contents: &str,
-    mat: &QueryMatch,
-    query: &Query,
-) -> Option<(Range<usize>, String)> {
-    let key_capture_ix = query.capture_index_for_name("key")?;
-    let key_range = mat
-        .nodes_for_capture_index(key_capture_ix)
-        .next()?
-        .byte_range();
-    Some((key_range, "agent".to_string()))
-}
-
-fn rename_edit_prediction_assistant(
-    _contents: &str,
-    mat: &QueryMatch,
-    query: &Query,
-) -> Option<(Range<usize>, String)> {
-    let key_capture_ix = query.capture_index_for_name("enabled_in_assistant")?;
-    let key_range = mat
-        .nodes_for_capture_index(key_capture_ix)
-        .next()?
-        .byte_range();
-    Some((key_range, "enabled_in_text_threads".to_string()))
-}
diff --git a/crates/migrator/src/migrations/m_2025_05_08/settings.rs b/crates/migrator/src/migrations/m_2025_05_08/settings.rs
deleted file mode 100644
index 6157ad0d43..0000000000
--- a/crates/migrator/src/migrations/m_2025_05_08/settings.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-use std::ops::Range;
-use tree_sitter::{Query, QueryMatch};
-
-use crate::{MigrationPatterns, patterns::SETTINGS_DUPLICATED_AGENT_PATTERN};
-
-pub const SETTINGS_PATTERNS: MigrationPatterns =
-    &[(SETTINGS_DUPLICATED_AGENT_PATTERN, comment_duplicated_agent)];
-
-fn comment_duplicated_agent(
-    contents: &str,
-    mat: &QueryMatch,
-    query: &Query,
-) -> Option<(Range<usize>, String)> {
-    let pair_ix = query.capture_index_for_name("pair1")?;
-    let mut range = mat.nodes_for_capture_index(pair_ix).next()?.byte_range();
-
-    // Include the comma into the commented region
-    let rtext = &contents[range.end..];
-    if let Some(comma_index) = rtext.find(',') {
-        range.end += comma_index + 1;
-    }
-
-    let value = contents[range.clone()].to_string();
-    let commented_value = format!("/* Duplicated key auto-commented: {value} */");
-    Some((range, commented_value))
-}
diff --git a/crates/migrator/src/migrations/m_2025_05_29/settings.rs b/crates/migrator/src/migrations/m_2025_05_29/settings.rs
deleted file mode 100644
index 37ef0e45cc..0000000000
--- a/crates/migrator/src/migrations/m_2025_05_29/settings.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-use std::ops::Range;
-use tree_sitter::{Query, QueryMatch};
-
-use crate::MigrationPatterns;
-use crate::patterns::SETTINGS_NESTED_KEY_VALUE_PATTERN;
-
-pub const SETTINGS_PATTERNS: MigrationPatterns = &[(
-    SETTINGS_NESTED_KEY_VALUE_PATTERN,
-    replace_preferred_completion_mode_value,
-)];
-
-fn replace_preferred_completion_mode_value(
-    contents: &str,
-    mat: &QueryMatch,
-    query: &Query,
-) -> Option<(Range<usize>, String)> {
-    let parent_object_capture_ix = query.capture_index_for_name("parent_key")?;
-    let parent_object_range = mat
-        .nodes_for_capture_index(parent_object_capture_ix)
-        .next()?
-        .byte_range();
-    let parent_object_name = contents.get(parent_object_range)?;
-
-    if parent_object_name != "agent" {
-        return None;
-    }
-
-    let setting_name_capture_ix = query.capture_index_for_name("setting_name")?;
-    let setting_name_range = mat
-        .nodes_for_capture_index(setting_name_capture_ix)
-        .next()?
-        .byte_range();
-    let setting_name = contents.get(setting_name_range)?;
-
-    if setting_name != "preferred_completion_mode" {
-        return None;
-    }
-
-    let value_capture_ix = query.capture_index_for_name("setting_value")?;
-    let value_range = mat
-        .nodes_for_capture_index(value_capture_ix)
-        .next()?
-        .byte_range();
-    let value = contents.get(value_range.clone())?;
-
-    if value.trim() == "\"max\"" {
-        Some((value_range, "\"burn\"".to_string()))
-    } else {
-        None
-    }
-}
diff --git a/crates/migrator/src/migrations/m_2025_06_16/settings.rs b/crates/migrator/src/migrations/m_2025_06_16/settings.rs
deleted file mode 100644
index cd79eae204..0000000000
--- a/crates/migrator/src/migrations/m_2025_06_16/settings.rs
+++ /dev/null
@@ -1,90 +0,0 @@
-use std::ops::Range;
-
-use tree_sitter::{Query, QueryMatch};
-
-use crate::MigrationPatterns;
-
-pub const SETTINGS_PATTERNS: MigrationPatterns = &[(
-    SETTINGS_CONTEXT_SERVER_PATTERN,
-    migrate_context_server_settings,
-)];
-
-const SETTINGS_CONTEXT_SERVER_PATTERN: &str = r#"(document
-    (object
-        (pair
-            key: (string (string_content) @context-servers)
-            value: (object
-                (pair
-                    key: (string (string_content) @server-name)
-                    value: (object) @server-settings
-                )
-            )
-        )
-    )
-    (#eq? @context-servers "context_servers")
-)"#;
-
-fn migrate_context_server_settings(
-    contents: &str,
-    mat: &QueryMatch,
-    query: &Query,
-) -> Option<(Range<usize>, String)> {
-    let server_settings_index = query.capture_index_for_name("server-settings")?;
-    let server_settings = mat.nodes_for_capture_index(server_settings_index).next()?;
-
-    let mut has_command = false;
-    let mut has_settings = false;
-    let mut other_keys = 0;
-    let mut column = None;
-
-    // Parse the server settings to check what keys it contains
-    let mut cursor = server_settings.walk();
-    for child in server_settings.children(&mut cursor) {
-        if child.kind() == "pair"
-            && let Some(key_node) = child.child_by_field_name("key")
-        {
-            if let (None, Some(quote_content)) = (column, key_node.child(0)) {
-                column = Some(quote_content.start_position().column);
-            }
-            if let Some(string_content) = key_node.child(1) {
-                let key = &contents[string_content.byte_range()];
-                match key {
-                    // If it already has a source key, don't modify it
-                    "source" => return None,
-                    "command" => has_command = true,
-                    "settings" => has_settings = true,
-                    _ => other_keys += 1,
-                }
-            }
-        }
-    }
-
-    let source_type = if has_command { "custom" } else { "extension" };
-
-    // Insert the source key at the beginning of the object
-    let start = server_settings.start_byte() + 1;
-    let indent = " ".repeat(column.unwrap_or(12));
-
-    if !has_command && !has_settings {
-        return Some((
-            start..start,
-            format!(
-                r#"
-{indent}"source": "{}",
-{indent}"settings": {{}}{}
-        "#,
-                source_type,
-                if other_keys > 0 { "," } else { "" }
-            ),
-        ));
-    }
-
-    Some((
-        start..start,
-        format!(
-            r#"
-{indent}"source": "{}","#,
-            source_type
-        ),
-    ))
-}
diff --git a/crates/migrator/src/migrations/m_2025_06_25/settings.rs b/crates/migrator/src/migrations/m_2025_06_25/settings.rs
deleted file mode 100644
index 2bf7658eeb..0000000000
--- a/crates/migrator/src/migrations/m_2025_06_25/settings.rs
+++ /dev/null
@@ -1,133 +0,0 @@
-use std::ops::Range;
-use tree_sitter::{Query, QueryMatch};
-
-use crate::MigrationPatterns;
-
-pub const SETTINGS_PATTERNS: MigrationPatterns = &[
-    (SETTINGS_VERSION_PATTERN, remove_version_fields),
-    (
-        SETTINGS_NESTED_VERSION_PATTERN,
-        remove_nested_version_fields,
-    ),
-];
-
-const SETTINGS_VERSION_PATTERN: &str = r#"(document
-    (object
-        (pair
-            key: (string (string_content) @key)
-            value: (object
-                (pair
-                    key: (string (string_content) @version_key)
-                    value: (_) @version_value
-                ) @version_pair
-            )
-        )
-    )
-    (#eq? @key "agent")
-    (#eq? @version_key "version")
-)"#;
-
-const SETTINGS_NESTED_VERSION_PATTERN: &str = r#"(document
-    (object
-        (pair
-            key: (string (string_content) @language_models)
-            value: (object
-                (pair
-                    key: (string (string_content) @provider)
-                    value: (object
-                        (pair
-                            key: (string (string_content) @version_key)
-                            value: (_) @version_value
-                        ) @version_pair
-                    )
-                )
-            )
-        )
-    )
-    (#eq? @language_models "language_models")
-    (#match? @provider "^(anthropic|openai)$")
-    (#eq? @version_key "version")
-)"#;
-
-fn remove_version_fields(
-    contents: &str,
-    mat: &QueryMatch,
-    query: &Query,
-) -> Option<(Range<usize>, String)> {
-    let version_pair_ix = query.capture_index_for_name("version_pair")?;
-    let version_pair_node = mat.nodes_for_capture_index(version_pair_ix).next()?;
-
-    remove_pair_with_whitespace(contents, version_pair_node)
-}
-
-fn remove_nested_version_fields(
-    contents: &str,
-    mat: &QueryMatch,
-    query: &Query,
-) -> Option<(Range<usize>, String)> {
-    let version_pair_ix = query.capture_index_for_name("version_pair")?;
-    let version_pair_node = mat.nodes_for_capture_index(version_pair_ix).next()?;
-
-    remove_pair_with_whitespace(contents, version_pair_node)
-}
-
-fn remove_pair_with_whitespace(
-    contents: &str,
-    pair_node: tree_sitter::Node,
-) -> Option<(Range<usize>, String)> {
-    let mut range_to_remove = pair_node.byte_range();
-
-    // Check if there's a comma after this pair
-    if let Some(next_sibling) = pair_node.next_sibling() {
-        if next_sibling.kind() == "," {
-            range_to_remove.end = next_sibling.end_byte();
-        }
-    } else {
-        // If no next sibling, check if there's a comma before
-        if let Some(prev_sibling) = pair_node.prev_sibling()
-            && prev_sibling.kind() == ","
-        {
-            range_to_remove.start = prev_sibling.start_byte();
-        }
-    }
-
-    // Include any leading whitespace/newline, including comments
-    let text_before = &contents[..range_to_remove.start];
-    if let Some(last_newline) = text_before.rfind('\n') {
-        let whitespace_start = last_newline + 1;
-        let potential_whitespace = &contents[whitespace_start..range_to_remove.start];
-
-        // Check if it's only whitespace or comments
-        let mut is_whitespace_or_comment = true;
-        let mut in_comment = false;
-        let mut chars = potential_whitespace.chars().peekable();
-
-        while let Some(ch) = chars.next() {
-            if in_comment {
-                if ch == '\n' {
-                    in_comment = false;
-                }
-            } else if ch == '/' && chars.peek() == Some(&'/') {
-                in_comment = true;
-                chars.next(); // Skip the second '/'
-            } else if !ch.is_whitespace() {
-                is_whitespace_or_comment = false;
-                break;
-            }
-        }
-
-        if is_whitespace_or_comment {
-            range_to_remove.start = whitespace_start;
-        }
-    }
-
-    // Also check if we need to include trailing whitespace up to the next line
-    let text_after = &contents[range_to_remove.end..];
-    if let Some(newline_pos) = text_after.find('\n')
-        && text_after[..newline_pos].chars().all(|c| c.is_whitespace())
-    {
-        range_to_remove.end += newline_pos + 1;
-    }
-
-    Some((range_to_remove, String::new()))
-}
diff --git a/crates/migrator/src/migrations/m_2025_06_27/settings.rs b/crates/migrator/src/migrations/m_2025_06_27/settings.rs
deleted file mode 100644
index e3e951b1a6..0000000000
--- a/crates/migrator/src/migrations/m_2025_06_27/settings.rs
+++ /dev/null
@@ -1,132 +0,0 @@
-use std::ops::Range;
-use tree_sitter::{Query, QueryMatch};
-
-use crate::MigrationPatterns;
-
-pub const SETTINGS_PATTERNS: MigrationPatterns = &[(
-    SETTINGS_CONTEXT_SERVER_PATTERN,
-    flatten_context_server_command,
-)];
-
-const SETTINGS_CONTEXT_SERVER_PATTERN: &str = r#"(document
-    (object
-        (pair
-            key: (string (string_content) @context-servers)
-            value: (object
-                (pair
-                    key: (string (string_content) @server-name)
-                    value: (object
-                        (pair
-                            key: (string (string_content) @source-key)
-                            value: (string (string_content) @source-value)
-                        )
-                        (pair
-                            key: (string (string_content) @command-key)
-                            value: (object) @command-object
-                        ) @command-pair
-                    ) @server-settings
-                )
-            )
-        )
-    )
-    (#eq? @context-servers "context_servers")
-    (#eq? @source-key "source")
-    (#eq? @source-value "custom")
-    (#eq? @command-key "command")
-)"#;
-
-fn flatten_context_server_command(
-    contents: &str,
-    mat: &QueryMatch,
-    query: &Query,
-) -> Option<(Range<usize>, String)> {
-    let command_pair_index = query.capture_index_for_name("command-pair")?;
-    let command_pair = mat.nodes_for_capture_index(command_pair_index).next()?;
-
-    let command_object_index = query.capture_index_for_name("command-object")?;
-    let command_object = mat.nodes_for_capture_index(command_object_index).next()?;
-
-    let server_settings_index = query.capture_index_for_name("server-settings")?;
-    let _server_settings = mat.nodes_for_capture_index(server_settings_index).next()?;
-
-    // Parse the command object to extract path, args, and env
-    let mut path_value = None;
-    let mut args_value = None;
-    let mut env_value = None;
-
-    let mut cursor = command_object.walk();
-    for child in command_object.children(&mut cursor) {
-        if child.kind() == "pair"
-            && let Some(key_node) = child.child_by_field_name("key")
-            && let Some(string_content) = key_node.child(1)
-        {
-            let key = &contents[string_content.byte_range()];
-            if let Some(value_node) = child.child_by_field_name("value") {
-                let value_range = value_node.byte_range();
-                match key {
-                    "path" => path_value = Some(&contents[value_range]),
-                    "args" => args_value = Some(&contents[value_range]),
-                    "env" => env_value = Some(&contents[value_range]),
-                    _ => {}
-                }
-            }
-        }
-    }
-
-    let path = path_value?;
-
-    // Get the proper indentation from the command pair
-    let command_pair_start = command_pair.start_byte();
-    let line_start = contents[..command_pair_start]
-        .rfind('\n')
-        .map(|pos| pos + 1)
-        .unwrap_or(0);
-    let indent = &contents[line_start..command_pair_start];
-
-    // Build the replacement string
-    let mut replacement = format!("\"command\": {}", path);
-
-    // Add args if present - need to reduce indentation
-    if let Some(args) = args_value {
-        replacement.push_str(",\n");
-        replacement.push_str(indent);
-        replacement.push_str("\"args\": ");
-        let reduced_args = reduce_indentation(args, 4);
-        replacement.push_str(&reduced_args);
-    }
-
-    // Add env if present - need to reduce indentation
-    if let Some(env) = env_value {
-        replacement.push_str(",\n");
-        replacement.push_str(indent);
-        replacement.push_str("\"env\": ");
-        replacement.push_str(&reduce_indentation(env, 4));
-    }
-
-    let range_to_replace = command_pair.byte_range();
-    Some((range_to_replace, replacement))
-}
-
-fn reduce_indentation(text: &str, spaces: usize) -> String {
-    let lines: Vec<&str> = text.lines().collect();
-    let mut result = String::new();
-
-    for (i, line) in lines.iter().enumerate() {
-        if i > 0 {
-            result.push('\n');
-        }
-
-        // Count leading spaces
-        let leading_spaces = line.chars().take_while(|&c| c == ' ').count();
-
-        if leading_spaces >= spaces {
-            // Reduce indentation
-            result.push_str(&line[spaces..]);
-        } else {
-            // Keep line as is if it doesn't have enough indentation
-            result.push_str(line);
-        }
-    }
-
-    result
-}
diff --git a/crates/migrator/src/migrations/m_2025_07_08/settings.rs b/crates/migrator/src/migrations/m_2025_07_08/settings.rs
deleted file mode 100644
index c9656491ce..0000000000
--- a/crates/migrator/src/migrations/m_2025_07_08/settings.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-use std::ops::Range;
-use tree_sitter::{Query, QueryMatch};
-
-use crate::MigrationPatterns;
-use crate::patterns::SETTINGS_ROOT_KEY_VALUE_PATTERN;
-
-pub const SETTINGS_PATTERNS: MigrationPatterns = &[(
-    SETTINGS_ROOT_KEY_VALUE_PATTERN,
-    migrate_drag_and_drop_selection,
-)];
-
-fn migrate_drag_and_drop_selection(
-    contents: &str,
-    mat: &QueryMatch,
-    query: &Query,
-) -> Option<(Range<usize>, String)> {
-    let name_ix = query.capture_index_for_name("name")?;
-    let name_range = mat.nodes_for_capture_index(name_ix).next()?.byte_range();
-    let name = contents.get(name_range)?;
-
-    if name != "drag_and_drop_selection" {
-        return None;
-    }
-
-    let value_ix = query.capture_index_for_name("value")?;
-    let value_node = mat.nodes_for_capture_index(value_ix).next()?;
-    let value_range = value_node.byte_range();
-    let value = contents.get(value_range.clone())?;
-
-    match value {
-        "true" | "false" => {
-            let replacement = format!("{{\n    \"enabled\": {}\n  }}", value);
-            Some((value_range, replacement))
-        }
-        _ => None,
-    }
-}
diff --git a/crates/migrator/src/migrations/m_2025_10_01/settings.rs b/crates/migrator/src/migrations/m_2025_10_01/settings.rs
deleted file mode 100644
index 84cf950491..0000000000
--- a/crates/migrator/src/migrations/m_2025_10_01/settings.rs
+++ /dev/null
@@ -1,74 +0,0 @@
-use crate::patterns::migrate_language_setting;
-use anyhow::Result;
-use serde_json::Value;
-
-pub fn flatten_code_actions_formatters(value: &mut Value) -> Result<()> {
-    migrate_language_setting(value, |value, _path| {
-        let Some(obj) = value.as_object_mut() else {
-            return Ok(());
-        };
-        for key in ["formatter", "format_on_save"] {
-            let Some(formatter) = obj.get_mut(key) else {
-                continue;
-            };
-            let new_formatter = match formatter {
-                Value::Array(arr) => {
-                    let mut new_arr = Vec::new();
-                    let mut found_code_actions = false;
-                    for item in arr {
-                        let Some(obj) = item.as_object() else {
-                            new_arr.push(item.clone());
-                            continue;
-                        };
-                        let code_actions_obj = obj
-                            .get("code_actions")
-                            .and_then(|code_actions| code_actions.as_object());
-                        let Some(code_actions) = code_actions_obj else {
-                            new_arr.push(item.clone());
-                            continue;
-                        };
-                        found_code_actions = true;
-                        for (name, enabled) in code_actions {
-                            if !enabled.as_bool().unwrap_or(true) {
-                                continue;
-                            }
-                            new_arr.push(serde_json::json!({
-                                "code_action": name
-                            }));
-                        }
-                    }
-                    if !found_code_actions {
-                        continue;
-                    }
-                    Value::Array(new_arr)
-                }
-                Value::Object(obj) => {
-                    let mut new_arr = Vec::new();
-                    let code_actions_obj = obj
-                        .get("code_actions")
-                        .and_then(|code_actions| code_actions.as_object());
-                    let Some(code_actions) = code_actions_obj else {
-                        continue;
-                    };
-                    for (name, enabled) in code_actions {
-                        if !enabled.as_bool().unwrap_or(true) {
-                            continue;
-                        }
-                        new_arr.push(serde_json::json!({
-                            "code_action": name
-                        }));
-                    }
-                    if new_arr.len() == 1 {
-                        new_arr.pop().unwrap()
-                    } else {
-                        Value::Array(new_arr)
-                    }
-                }
-                _ => continue,
-            };
-
-            obj.insert(key.to_string(), new_formatter);
-        }
-        return Ok(());
-    })
-}
diff --git a/crates/migrator/src/migrations/m_2025_10_02/settings.rs b/crates/migrator/src/migrations/m_2025_10_02/settings.rs
deleted file mode 100644
index cb0d63ca85..0000000000
--- a/crates/migrator/src/migrations/m_2025_10_02/settings.rs
+++ /dev/null
@@ -1,41 +0,0 @@
-use anyhow::Result;
-use serde_json::Value;
-
-use crate::patterns::migrate_language_setting;
-
-pub fn remove_formatters_on_save(value: &mut Value) -> Result<()> {
-    migrate_language_setting(value, remove_formatters_on_save_inner)
-}
-
-fn remove_formatters_on_save_inner(value: &mut Value, path: &[&str]) -> Result<()> {
-    let Some(obj) = value.as_object_mut() else {
-        return Ok(());
-    };
-    let Some(format_on_save) = obj.get("format_on_save").cloned() else {
-        return Ok(());
-    };
-    let is_format_on_save_set_to_formatter = format_on_save
-        .as_str()
-        .map_or(true, |s| s != "on" && s != "off");
-    if !is_format_on_save_set_to_formatter {
-        return Ok(());
-    }
-
-    fn fmt_path(path: &[&str], key: &str) -> String {
-        let mut path = path.to_vec();
-        path.push(key);
-        path.join(".")
-    }
-
-    anyhow::ensure!(
-        obj.get("formatter").is_none(),
-        r#"Setting formatters in both "format_on_save" and "formatter" is deprecated. Please migrate the formatters from {} into {}"#,
-        fmt_path(path, "format_on_save"),
-        fmt_path(path, "formatter")
-    );
-
-    obj.insert("format_on_save".to_string(), serde_json::json!("on"));
-    obj.insert("formatter".to_string(), format_on_save);
-
-    Ok(())
-}
diff --git a/crates/migrator/src/migrations/m_2025_10_03/settings.rs b/crates/migrator/src/migrations/m_2025_10_03/settings.rs
deleted file mode 100644
index 47d15e8ddf..0000000000
--- a/crates/migrator/src/migrations/m_2025_10_03/settings.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-use std::ops::Range;
-use tree_sitter::{Query, QueryMatch};
-
-use crate::MigrationPatterns;
-use crate::patterns::SETTINGS_ROOT_KEY_VALUE_PATTERN;
-
-pub const SETTINGS_PATTERNS: MigrationPatterns =
-    &[(SETTINGS_ROOT_KEY_VALUE_PATTERN, rename_agent_font_size)];
-
-/// Renames the setting `agent_font_size` to `agent_ui_font_size`
-fn rename_agent_font_size(
-    contents: &str,
-    mat: &QueryMatch,
-    query: &Query,
-) -> Option<(Range<usize>, String)> {
-    let setting_capture_ix = query.capture_index_for_name("name")?;
-
-    let setting_name_range = mat
-        .nodes_for_capture_index(setting_capture_ix)
-        .next()?
-        .byte_range();
-
-    let setting_name = contents.get(setting_name_range.clone())?;
-
-    if setting_name != "agent_font_size" {
-        return None;
-    }
-
-    Some((setting_name_range, "agent_ui_font_size".to_string()))
-}
diff --git a/crates/migrator/src/migrations/m_2025_10_16/settings.rs b/crates/migrator/src/migrations/m_2025_10_16/settings.rs
deleted file mode 100644
index 3fa8c509b1..0000000000
--- a/crates/migrator/src/migrations/m_2025_10_16/settings.rs
+++ /dev/null
@@ -1,71 +0,0 @@
-use anyhow::Result;
-use serde_json::Value;
-
-use crate::patterns::migrate_language_setting;
-
-pub fn restore_code_actions_on_format(value: &mut Value) -> Result<()> {
-    migrate_language_setting(value, restore_code_actions_on_format_inner)
-}
-
-fn restore_code_actions_on_format_inner(value: &mut Value, path: &[&str]) -> Result<()> {
-    let Some(obj) = value.as_object_mut() else {
-        return Ok(());
-    };
-    let code_actions_on_format = obj
-        .get("code_actions_on_format")
-        .cloned()
-        .unwrap_or_else(|| Value::Object(Default::default()));
-
-    fn fmt_path(path: &[&str], key: &str) -> String {
-        let mut path = path.to_vec();
-        path.push(key);
-        path.join(".")
-    }
-
-    let Some(mut code_actions_map) = code_actions_on_format.as_object().cloned() else {
-        anyhow::bail!(
-            r#"The `code_actions_on_format` is in an invalid state and cannot be migrated at {}. Please ensure the code_actions_on_format setting is a Map<String, bool>"#,
-            fmt_path(path, "code_actions_on_format"),
-        );
-    };
-
-    let Some(formatter) = obj.get("formatter") else {
-        return Ok(());
-    };
-    let formatter_array = if let Some(array) = formatter.as_array() {
-        array.clone()
-    } else {
-        vec![formatter.clone()]
-    };
-    if formatter_array.is_empty() {
-        return Ok(());
-    }
-    let mut code_action_formatters = Vec::new();
-    for formatter in formatter_array {
-        let Some(code_action) = formatter.get("code_action") else {
-            return Ok(());
-        };
-        let Some(code_action_name) = code_action.as_str() else {
-            anyhow::bail!(
-                r#"The `code_action` is in an invalid state and cannot be migrated at {}. Please ensure the code_action setting is a String"#,
-                fmt_path(path, "formatter"),
-            );
-        };
-        code_action_formatters.push(code_action_name.to_string());
-    }
-
-    code_actions_map.extend(
-        code_action_formatters
-            .into_iter()
-            .rev()
-            .map(|code_action| (code_action, Value::Bool(true))),
-    );
-
-    obj.insert("formatter".to_string(), Value::Array(vec![]));
-    obj.insert(
-        "code_actions_on_format".into(),
-        Value::Object(code_actions_map),
-    );
-
-    Ok(())
-}
diff --git a/crates/migrator/src/migrations/m_2025_10_17/settings.rs b/crates/migrator/src/migrations/m_2025_10_17/settings.rs
deleted file mode 100644
index 519ec74034..0000000000
--- a/crates/migrator/src/migrations/m_2025_10_17/settings.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-use anyhow::Result;
-use serde_json::Value;
-
-pub fn make_file_finder_include_ignored_an_enum(value: &mut Value) -> Result<()> {
-    let Some(file_finder) = value.get_mut("file_finder") else {
-        return Ok(());
-    };
-
-    let Some(file_finder_obj) = file_finder.as_object_mut() else {
-        anyhow::bail!("Expected file_finder to be an object");
-    };
-
-    let Some(include_ignored) = file_finder_obj.get_mut("include_ignored") else {
-        return Ok(());
-    };
-    *include_ignored = match include_ignored {
-        Value::Bool(true) => Value::String("all".to_string()),
-        Value::Bool(false) => Value::String("indexed".to_string()),
-        Value::Null => Value::String("smart".to_string()),
-        Value::String(s) if s == "all" || s == "indexed" || s == "smart" => return Ok(()),
-        _ => anyhow::bail!("Expected include_ignored to be a boolean or null"),
-    };
-    Ok(())
-}
diff --git a/crates/migrator/src/migrations/m_2025_10_21/settings.rs b/crates/migrator/src/migrations/m_2025_10_21/settings.rs
deleted file mode 100644
index 1f78f93327..0000000000
--- a/crates/migrator/src/migrations/m_2025_10_21/settings.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-use anyhow::Result;
-use serde_json::Value;
-
-pub fn make_relative_line_numbers_an_enum(value: &mut Value) -> Result<()> {
-    let Some(relative_line_numbers) = value.get_mut("relative_line_numbers") else {
-        return Ok(());
-    };
-
-    *relative_line_numbers = match relative_line_numbers {
-        Value::Bool(true) => Value::String("enabled".to_string()),
-        Value::Bool(false) => Value::String("disabled".to_string()),
-        Value::String(s) if s == "enabled" || s == "disabled" || s == "wrapped" => return Ok(()),
-        _ => anyhow::bail!("Expected relative_line_numbers to be a boolean"),
-    };
-    Ok(())
-}
diff --git a/crates/migrator/src/migrations/m_2025_11_12/settings.rs b/crates/migrator/src/migrations/m_2025_11_12/settings.rs
deleted file mode 100644
index 6483f9e44b..0000000000
--- a/crates/migrator/src/migrations/m_2025_11_12/settings.rs
+++ /dev/null
@@ -1,84 +0,0 @@
-use std::ops::Range;
-use tree_sitter::{Query, QueryMatch};
-
-use crate::MigrationPatterns;
-use crate::patterns::SETTINGS_NESTED_KEY_VALUE_PATTERN;
-
-pub const SETTINGS_PATTERNS: MigrationPatterns = &[
-    (
-        SETTINGS_NESTED_KEY_VALUE_PATTERN,
-        rename_open_file_on_paste_setting,
-    ),
-    (
-        SETTINGS_NESTED_KEY_VALUE_PATTERN,
-        replace_open_file_on_paste_setting_value,
-    ),
-];
-
-fn rename_open_file_on_paste_setting(
-    contents: &str,
-    mat: &QueryMatch,
-    query: &Query,
-) -> Option<(Range<usize>, String)> {
-    if !is_project_panel_open_file_on_paste(contents, mat, query) {
-        return None;
-    }
-
-    let setting_name_ix = query.capture_index_for_name("setting_name")?;
-    let setting_name_range = mat
-        .nodes_for_capture_index(setting_name_ix)
-        .next()?
-        .byte_range();
-
-    Some((setting_name_range, "auto_open".to_string()))
-}
-
-fn replace_open_file_on_paste_setting_value(
-    contents: &str,
-    mat: &QueryMatch,
-    query: &Query,
-) -> Option<(Range<usize>, String)> {
-    if !is_project_panel_open_file_on_paste(contents, mat, query) {
-        return None;
-    }
-
-    let value_ix = query.capture_index_for_name("setting_value")?;
-    let value_node = mat.nodes_for_capture_index(value_ix).next()?;
-    let value_range = value_node.byte_range();
-    let value_text = contents.get(value_range.clone())?.trim();
-
-    let normalized_value = match value_text {
-        "true" => "true",
-        "false" => "false",
-        _ => return None,
-    };
-
-    Some((
-        value_range,
-        format!("{{ \"on_paste\": {normalized_value} }}"),
-    ))
-}
-
-fn is_project_panel_open_file_on_paste(contents: &str, mat: &QueryMatch, query: &Query) -> bool {
-    let parent_key_ix = match query.capture_index_for_name("parent_key") {
-        Some(ix) => ix,
-        None => return false,
-    };
-    let parent_range = match mat.nodes_for_capture_index(parent_key_ix).next() {
-        Some(node) => node.byte_range(),
-        None => return false,
-    };
-    if contents.get(parent_range) != Some("project_panel") {
-        return false;
-    }
-
-    let setting_name_ix = match query.capture_index_for_name("setting_name") {
-        Some(ix) => ix,
-        None => return false,
-    };
-    let setting_name_range = match mat.nodes_for_capture_index(setting_name_ix).next() {
-        Some(node) => node.byte_range(),
-        None => return false,
-    };
-    contents.get(setting_name_range) == Some("open_file_on_paste")
-}
diff --git a/crates/migrator/src/migrations/m_2025_11_20/settings.rs b/crates/migrator/src/migrations/m_2025_11_20/settings.rs
deleted file mode 100644
index db56fb04d4..0000000000
--- a/crates/migrator/src/migrations/m_2025_11_20/settings.rs
+++ /dev/null
@@ -1,76 +0,0 @@
-use std::ops::Range;
-
-use tree_sitter::{Query, QueryMatch};
-
-use crate::MigrationPatterns;
-
-pub const SETTINGS_PATTERNS: MigrationPatterns = &[(
-    SETTINGS_AGENT_SERVERS_CUSTOM_PATTERN,
-    migrate_custom_agent_settings,
-)];
-
-const SETTINGS_AGENT_SERVERS_CUSTOM_PATTERN: &str = r#"(document
-    (object
-        (pair
-            key: (string (string_content) @agent-servers)
-            value: (object
-                (pair
-                    key: (string (string_content) @server-name)
-                    value: (object) @server-settings
-                )
-            )
-        )
-    )
-    (#eq? @agent-servers "agent_servers")
-)"#;
-
-fn migrate_custom_agent_settings(
-    contents: &str,
-    mat: &QueryMatch,
-    query: &Query,
-) -> Option<(Range<usize>, String)> {
-    let server_name_index = query.capture_index_for_name("server-name")?;
-    let server_name = mat.nodes_for_capture_index(server_name_index).next()?;
-    let server_name_text = &contents[server_name.byte_range()];
-
-    if matches!(server_name_text, "gemini" | "claude" | "codex") {
-        return None;
-    }
-
-    let server_settings_index = query.capture_index_for_name("server-settings")?;
-    let server_settings = mat.nodes_for_capture_index(server_settings_index).next()?;
-
-    let mut column = None;
-
-    // Parse the server settings to check what keys it contains
-    let mut cursor = server_settings.walk();
-    for child in server_settings.children(&mut cursor) {
-        if child.kind() == "pair" {
-            if let Some(key_node) = child.child_by_field_name("key") {
-                if let (None, Some(quote_content)) = (column, key_node.child(0)) {
-                    column = Some(quote_content.start_position().column);
-                }
-                if let Some(string_content) = key_node.child(1) {
-                    let key = &contents[string_content.byte_range()];
-                    match key {
-                        // If it already has a type key, don't modify it
-                        "type" => return None,
-                        _ => {}
-                    }
-                }
-            }
-        }
-    }
-
-    // Insert the type key at the beginning of the object
-    let start = server_settings.start_byte() + 1;
-    let indent = " ".repeat(column.unwrap_or(12));
-
-    Some((
-        start..start,
-        format!(
-            r#"
-{indent}"type": "custom","#
-        ),
-    ))
-}
diff --git a/crates/migrator/src/migrations/m_2025_11_25/settings.rs b/crates/migrator/src/migrations/m_2025_11_25/settings.rs
deleted file mode 100644
index 944eee8a11..0000000000
--- a/crates/migrator/src/migrations/m_2025_11_25/settings.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-use anyhow::Result;
-use serde_json::Value;
-
-pub fn remove_context_server_source(settings: &mut Value) -> Result<()> {
-    if let Some(obj) = settings.as_object_mut() {
-        if let Some(context_servers) = obj.get_mut("context_servers") {
-            if let Some(servers) = context_servers.as_object_mut() {
-                for (_, server) in servers.iter_mut() {
-                    if let Some(server_obj) = server.as_object_mut() {
-                        server_obj.remove("source");
-                    }
-                }
-            }
-        }
-    }
-    Ok(())
-}
diff --git a/crates/migrator/src/migrations/m_2025_12_01/settings.rs b/crates/migrator/src/migrations/m_2025_12_01/settings.rs
deleted file mode 100644
index 2c3816dab3..0000000000
--- a/crates/migrator/src/migrations/m_2025_12_01/settings.rs
+++ /dev/null
@@ -1,55 +0,0 @@
-use std::ops::Range;
-use tree_sitter::{Query, QueryMatch};
-
-use crate::MigrationPatterns;
-use crate::patterns::SETTINGS_NESTED_KEY_VALUE_PATTERN;
-
-pub const SETTINGS_PATTERNS: MigrationPatterns = &[(
-    SETTINGS_NESTED_KEY_VALUE_PATTERN,
-    rename_enable_preview_from_code_navigation_setting,
-)];
-
-fn rename_enable_preview_from_code_navigation_setting(
-    contents: &str,
-    mat: &QueryMatch,
-    query: &Query,
-) -> Option<(Range<usize>, String)> {
-    if !is_enable_preview_from_code_navigation(contents, mat, query) {
-        return None;
-    }
-
-    let setting_name_ix = query.capture_index_for_name("setting_name")?;
-    let setting_name_range = mat
-        .nodes_for_capture_index(setting_name_ix)
-        .next()?
-        .byte_range();
-
-    Some((
-        setting_name_range,
-        "enable_keep_preview_on_code_navigation".to_string(),
-    ))
-}
-
-fn is_enable_preview_from_code_navigation(contents: &str, mat: &QueryMatch, query: &Query) -> bool {
-    let parent_key_ix = match query.capture_index_for_name("parent_key") {
-        Some(ix) => ix,
-        None => return false,
-    };
-    let parent_range = match mat.nodes_for_capture_index(parent_key_ix).next() {
-        Some(node) => node.byte_range(),
-        None => return false,
-    };
-    if contents.get(parent_range) != Some("preview_tabs") {
-        return false;
-    }
-
-    let setting_name_ix = match query.capture_index_for_name("setting_name") {
-        Some(ix) => ix,
-        None => return false,
-    };
-    let setting_name_range = match mat.nodes_for_capture_index(setting_name_ix).next() {
-        Some(node) => node.byte_range(),
-        None => return false,
-    };
-    contents.get(setting_name_range) == Some("enable_preview_from_code_navigation")
-}
diff --git a/crates/migrator/src/migrator.rs b/crates/migrator/src/migrator.rs
deleted file mode 100644
index 9fb6d8a115..0000000000
--- a/crates/migrator/src/migrator.rs
+++ /dev/null
@@ -1,2418 +0,0 @@
-//! ## When to create a migration and why?
-//! A migration is necessary when keymap actions or settings are renamed or transformed (e.g., from an array to a string, a string to an array, a boolean to an enum, etc.).
-//!
-//! This ensures that users with outdated settings are automatically updated to use the corresponding new settings internally.
-//! It also provides a quick way to migrate their existing settings to the latest state using button in UI.
-//!
-//! ## How to create a migration?
-//! Migrations use Tree-sitter to query commonly used patterns, such as actions with a string or actions with an array where the second argument is an object, etc.
-//! Once queried, *you can filter out the modified items* and write the replacement logic.
-//!
-//! You *must not* modify previous migrations; always create new ones instead.
-//! This is important because if a user is in an intermediate state, they can smoothly transition to the latest state.
-//! Modifying existing migrations means they will only work for users upgrading from version x-1 to x, but not from x-2 to x, and so on, where x is the latest version.
-//!
-//! You only need to write replacement logic for x-1 to x because you can be certain that, internally, every user will be at x-1, regardless of their on disk state.
-
-use anyhow::{Context as _, Result};
-use settings_json::{infer_json_indent_size, parse_json_with_comments, update_value_in_json_text};
-use std::{cmp::Reverse, ops::Range, sync::LazyLock};
-use streaming_iterator::StreamingIterator;
-use tree_sitter::{Query, QueryMatch};
-
-use patterns::SETTINGS_NESTED_KEY_VALUE_PATTERN;
-
-mod migrations;
-mod patterns;
-
-fn migrate(text: &str, patterns: MigrationPatterns, query: &Query) -> Result<Option<String>> {
-    let mut parser = tree_sitter::Parser::new();
-    parser.set_language(&tree_sitter_json::LANGUAGE.into())?;
-    let syntax_tree = parser
-        .parse(text, None)
-        .context("failed to parse settings")?;
-
-    let mut cursor = tree_sitter::QueryCursor::new();
-    let mut matches = cursor.matches(query, syntax_tree.root_node(), text.as_bytes());
-
-    let mut edits = vec![];
-    while let Some(mat) = matches.next() {
-        if let Some((_, callback)) = patterns.get(mat.pattern_index) {
-            edits.extend(callback(text, mat, query));
-        }
-    }
-
-    edits.sort_by_key(|(range, _)| (range.start, Reverse(range.end)));
-    edits.dedup_by(|(range_b, _), (range_a, _)| {
-        range_a.contains(&range_b.start) || range_a.contains(&range_b.end)
-    });
-
-    if edits.is_empty() {
-        Ok(None)
-    } else {
-        let mut new_text = text.to_string();
-        for (range, replacement) in edits.iter().rev() {
-            new_text.replace_range(range.clone(), replacement);
-        }
-        if new_text == text {
-            log::error!(
-                "Edits computed for configuration migration do not cause a change: {:?}",
-                edits
-            );
-            Ok(None)
-        } else {
-            Ok(Some(new_text))
-        }
-    }
-}
-
-/// Runs the provided migrations on the given text.
-/// Will automatically return `Ok(None)` if there's no content to migrate.
-fn run_migrations(text: &str, migrations: &[MigrationType]) -> Result<Option<String>> {
-    if text.is_empty() {
-        return Ok(None);
-    }
-
-    let mut current_text = text.to_string();
-    let mut result: Option<String> = None;
-    let json_indent_size = infer_json_indent_size(&current_text);
-    for migration in migrations.iter() {
-        let migrated_text = match migration {
-            MigrationType::TreeSitter(patterns, query) => migrate(&current_text, patterns, query)?,
-            MigrationType::Json(callback) => {
-                if current_text.trim().is_empty() {
-                    return Ok(None);
-                }
-                let old_content: serde_json_lenient::Value =
-                    parse_json_with_comments(&current_text)?;
-                let old_value = serde_json::to_value(&old_content).unwrap();
-                let mut new_value = old_value.clone();
-                callback(&mut new_value)?;
-                if new_value != old_value {
-                    let mut current = current_text.clone();
-                    let mut edits = vec![];
-                    update_value_in_json_text(
-                        &mut current,
-                        &mut vec![],
-                        json_indent_size,
-                        &old_value,
-                        &new_value,
-                        &mut edits,
-                    );
-                    let mut migrated_text = current_text.clone();
-                    for (range, replacement) in edits.into_iter() {
-                        migrated_text.replace_range(range, &replacement);
-                    }
-                    Some(migrated_text)
-                } else {
-                    None
-                }
-            }
-        };
-        if let Some(migrated_text) = migrated_text {
-            current_text = migrated_text.clone();
-            result = Some(migrated_text);
-        }
-    }
-    Ok(result.filter(|new_text| text != new_text))
-}
-
-pub fn migrate_keymap(text: &str) -> Result<Option<String>> {
-    let migrations: &[MigrationType] = &[
-        MigrationType::TreeSitter(
-            migrations::m_2025_01_29::KEYMAP_PATTERNS,
-            &KEYMAP_QUERY_2025_01_29,
-        ),
-        MigrationType::TreeSitter(
-            migrations::m_2025_01_30::KEYMAP_PATTERNS,
-            &KEYMAP_QUERY_2025_01_30,
-        ),
-        MigrationType::TreeSitter(
-            migrations::m_2025_03_03::KEYMAP_PATTERNS,
-            &KEYMAP_QUERY_2025_03_03,
-        ),
-        MigrationType::TreeSitter(
-            migrations::m_2025_03_06::KEYMAP_PATTERNS,
-            &KEYMAP_QUERY_2025_03_06,
-        ),
-        MigrationType::TreeSitter(
-            migrations::m_2025_04_15::KEYMAP_PATTERNS,
-            &KEYMAP_QUERY_2025_04_15,
-        ),
-    ];
-    run_migrations(text, migrations)
-}
-
-enum MigrationType<'a> {
-    TreeSitter(MigrationPatterns, &'a Query),
-    Json(fn(&mut serde_json::Value) -> Result<()>),
-}
-
-pub fn migrate_settings(text: &str) -> Result<Option<String>> {
-    let migrations: &[MigrationType] = &[
-        MigrationType::TreeSitter(
-            migrations::m_2025_01_02::SETTINGS_PATTERNS,
-            &SETTINGS_QUERY_2025_01_02,
-        ),
-        MigrationType::TreeSitter(
-            migrations::m_2025_01_29::SETTINGS_PATTERNS,
-            &SETTINGS_QUERY_2025_01_29,
-        ),
-        MigrationType::TreeSitter(
-            migrations::m_2025_01_30::SETTINGS_PATTERNS,
-            &SETTINGS_QUERY_2025_01_30,
-        ),
-        MigrationType::TreeSitter(
-            migrations::m_2025_03_29::SETTINGS_PATTERNS,
-            &SETTINGS_QUERY_2025_03_29,
-        ),
-        MigrationType::TreeSitter(
-            migrations::m_2025_04_15::SETTINGS_PATTERNS,
-            &SETTINGS_QUERY_2025_04_15,
-        ),
-        MigrationType::TreeSitter(
-            migrations::m_2025_04_21::SETTINGS_PATTERNS,
-            &SETTINGS_QUERY_2025_04_21,
-        ),
-        MigrationType::TreeSitter(
-            migrations::m_2025_04_23::SETTINGS_PATTERNS,
-            &SETTINGS_QUERY_2025_04_23,
-        ),
-        MigrationType::TreeSitter(
-            migrations::m_2025_05_05::SETTINGS_PATTERNS,
-            &SETTINGS_QUERY_2025_05_05,
-        ),
-        MigrationType::TreeSitter(
-            migrations::m_2025_05_08::SETTINGS_PATTERNS,
-            &SETTINGS_QUERY_2025_05_08,
-        ),
-        MigrationType::TreeSitter(
-            migrations::m_2025_05_29::SETTINGS_PATTERNS,
-            &SETTINGS_QUERY_2025_05_29,
-        ),
-        MigrationType::TreeSitter(
-            migrations::m_2025_06_16::SETTINGS_PATTERNS,
-            &SETTINGS_QUERY_2025_06_16,
-        ),
-        MigrationType::TreeSitter(
-            migrations::m_2025_06_25::SETTINGS_PATTERNS,
-            &SETTINGS_QUERY_2025_06_25,
-        ),
-        MigrationType::TreeSitter(
-            migrations::m_2025_06_27::SETTINGS_PATTERNS,
-            &SETTINGS_QUERY_2025_06_27,
-        ),
-        MigrationType::TreeSitter(
-            migrations::m_2025_07_08::SETTINGS_PATTERNS,
-            &SETTINGS_QUERY_2025_07_08,
-        ),
-        MigrationType::Json(migrations::m_2025_10_01::flatten_code_actions_formatters),
-        MigrationType::Json(migrations::m_2025_10_02::remove_formatters_on_save),
-        MigrationType::TreeSitter(
-            migrations::m_2025_10_03::SETTINGS_PATTERNS,
-            &SETTINGS_QUERY_2025_10_03,
-        ),
-        MigrationType::Json(migrations::m_2025_10_16::restore_code_actions_on_format),
-        MigrationType::Json(migrations::m_2025_10_17::make_file_finder_include_ignored_an_enum),
-        MigrationType::Json(migrations::m_2025_10_21::make_relative_line_numbers_an_enum),
-        MigrationType::TreeSitter(
-            migrations::m_2025_11_12::SETTINGS_PATTERNS,
-            &SETTINGS_QUERY_2025_11_12,
-        ),
-        MigrationType::TreeSitter(
-            migrations::m_2025_12_01::SETTINGS_PATTERNS,
-            &SETTINGS_QUERY_2025_12_01,
-        ),
-        MigrationType::TreeSitter(
-            migrations::m_2025_11_20::SETTINGS_PATTERNS,
-            &SETTINGS_QUERY_2025_11_20,
-        ),
-        MigrationType::Json(migrations::m_2025_11_25::remove_context_server_source),
-    ];
-    run_migrations(text, migrations)
-}
-
-pub fn migrate_edit_prediction_provider_settings(text: &str) -> Result<Option<String>> {
-    migrate(
-        text,
-        &[(
-            SETTINGS_NESTED_KEY_VALUE_PATTERN,
-            migrations::m_2025_01_29::replace_edit_prediction_provider_setting,
-        )],
-        &EDIT_PREDICTION_SETTINGS_MIGRATION_QUERY,
-    )
-}
-
-pub type MigrationPatterns = &'static [(
-    &'static str,
-    fn(&str, &QueryMatch, &Query) -> Option<(Range<usize>, String)>,
-)];
-
-macro_rules! define_query {
-    ($var_name:ident, $patterns_path:path) => {
-        static $var_name: LazyLock<Query> = LazyLock::new(|| {
-            Query::new(
-                &tree_sitter_json::LANGUAGE.into(),
-                &$patterns_path
-                    .iter()
-                    .map(|pattern| pattern.0)
-                    .collect::<String>(),
-            )
-            .unwrap()
-        });
-    };
-}
-
-// keymap
-define_query!(
-    KEYMAP_QUERY_2025_01_29,
-    migrations::m_2025_01_29::KEYMAP_PATTERNS
-);
-define_query!(
-    KEYMAP_QUERY_2025_01_30,
-    migrations::m_2025_01_30::KEYMAP_PATTERNS
-);
-define_query!(
-    KEYMAP_QUERY_2025_03_03,
-    migrations::m_2025_03_03::KEYMAP_PATTERNS
-);
-define_query!(
-    KEYMAP_QUERY_2025_03_06,
-    migrations::m_2025_03_06::KEYMAP_PATTERNS
-);
-define_query!(
-    KEYMAP_QUERY_2025_04_15,
-    migrations::m_2025_04_15::KEYMAP_PATTERNS
-);
-
-// settings
-define_query!(
-    SETTINGS_QUERY_2025_01_02,
-    migrations::m_2025_01_02::SETTINGS_PATTERNS
-);
-define_query!(
-    SETTINGS_QUERY_2025_01_29,
-    migrations::m_2025_01_29::SETTINGS_PATTERNS
-);
-define_query!(
-    SETTINGS_QUERY_2025_01_30,
-    migrations::m_2025_01_30::SETTINGS_PATTERNS
-);
-define_query!(
-    SETTINGS_QUERY_2025_03_29,
-    migrations::m_2025_03_29::SETTINGS_PATTERNS
-);
-define_query!(
-    SETTINGS_QUERY_2025_04_15,
-    migrations::m_2025_04_15::SETTINGS_PATTERNS
-);
-define_query!(
-    SETTINGS_QUERY_2025_04_21,
-    migrations::m_2025_04_21::SETTINGS_PATTERNS
-);
-define_query!(
-    SETTINGS_QUERY_2025_04_23,
-    migrations::m_2025_04_23::SETTINGS_PATTERNS
-);
-define_query!(
-    SETTINGS_QUERY_2025_05_05,
-    migrations::m_2025_05_05::SETTINGS_PATTERNS
-);
-define_query!(
-    SETTINGS_QUERY_2025_05_08,
-    migrations::m_2025_05_08::SETTINGS_PATTERNS
-);
-define_query!(
-    SETTINGS_QUERY_2025_05_29,
-    migrations::m_2025_05_29::SETTINGS_PATTERNS
-);
-define_query!(
-    SETTINGS_QUERY_2025_06_16,
-    migrations::m_2025_06_16::SETTINGS_PATTERNS
-);
-define_query!(
-    SETTINGS_QUERY_2025_06_25,
-    migrations::m_2025_06_25::SETTINGS_PATTERNS
-);
-define_query!(
-    SETTINGS_QUERY_2025_06_27,
-    migrations::m_2025_06_27::SETTINGS_PATTERNS
-);
-define_query!(
-    SETTINGS_QUERY_2025_07_08,
-    migrations::m_2025_07_08::SETTINGS_PATTERNS
-);
-define_query!(
-    SETTINGS_QUERY_2025_10_03,
-    migrations::m_2025_10_03::SETTINGS_PATTERNS
-);
-define_query!(
-    SETTINGS_QUERY_2025_11_12,
-    migrations::m_2025_11_12::SETTINGS_PATTERNS
-);
-define_query!(
-    SETTINGS_QUERY_2025_12_01,
-    migrations::m_2025_12_01::SETTINGS_PATTERNS
-);
-define_query!(
-    SETTINGS_QUERY_2025_11_20,
-    migrations::m_2025_11_20::SETTINGS_PATTERNS
-);
-
-// custom query
-static EDIT_PREDICTION_SETTINGS_MIGRATION_QUERY: LazyLock<Query> = LazyLock::new(|| {
-    Query::new(
-        &tree_sitter_json::LANGUAGE.into(),
-        SETTINGS_NESTED_KEY_VALUE_PATTERN,
-    )
-    .unwrap()
-});
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use unindent::Unindent as _;
-
-    #[track_caller]
-    fn assert_migrated_correctly(migrated: Option<String>, expected: Option<&str>) {
-        match (&migrated, &expected) {
-            (Some(migrated), Some(expected)) => {
-                pretty_assertions::assert_str_eq!(expected, migrated);
-            }
-            _ => {
-                pretty_assertions::assert_eq!(migrated.as_deref(), expected);
-            }
-        }
-    }
-
-    fn assert_migrate_keymap(input: &str, output: Option<&str>) {
-        let migrated = migrate_keymap(input).unwrap();
-        pretty_assertions::assert_eq!(migrated.as_deref(), output);
-    }
-
-    #[track_caller]
-    fn assert_migrate_settings(input: &str, output: Option<&str>) {
-        let migrated = migrate_settings(input).unwrap();
-        assert_migrated_correctly(migrated.clone(), output);
-
-        // expect that rerunning the migration does not result in another migration
-        if let Some(migrated) = migrated {
-            let rerun = migrate_settings(&migrated).unwrap();
-            assert_migrated_correctly(rerun, None);
-        }
-    }
-
-    #[track_caller]
-    fn assert_migrate_settings_with_migrations(
-        migrations: &[MigrationType],
-        input: &str,
-        output: Option<&str>,
-    ) {
-        let migrated = run_migrations(input, migrations).unwrap();
-        assert_migrated_correctly(migrated.clone(), output);
-
-        // expect that rerunning the migration does not result in another migration
-        if let Some(migrated) = migrated {
-            let rerun = run_migrations(&migrated, migrations).unwrap();
-            assert_migrated_correctly(rerun, None);
-        }
-    }
-
-    #[test]
-    fn test_empty_content() {
-        assert_migrate_settings("", None)
-    }
-
-    #[test]
-    fn test_replace_array_with_single_string() {
-        assert_migrate_keymap(
-            r#"
-            [
-                {
-                    "bindings": {
-                        "cmd-1": ["workspace::ActivatePaneInDirection", "Up"]
-                    }
-                }
-            ]
-            "#,
-            Some(
-                r#"
-            [
-                {
-                    "bindings": {
-                        "cmd-1": "workspace::ActivatePaneUp"
-                    }
-                }
-            ]
-            "#,
-            ),
-        )
-    }
-
-    #[test]
-    fn test_replace_action_argument_object_with_single_value() {
-        assert_migrate_keymap(
-            r#"
-            [
-                {
-                    "bindings": {
-                        "cmd-1": ["editor::FoldAtLevel", { "level": 1 }]
-                    }
-                }
-            ]
-            "#,
-            Some(
-                r#"
-            [
-                {
-                    "bindings": {
-                        "cmd-1": ["editor::FoldAtLevel", 1]
-                    }
-                }
-            ]
-            "#,
-            ),
-        )
-    }
-
-    #[test]
-    fn test_replace_action_argument_object_with_single_value_2() {
-        assert_migrate_keymap(
-            r#"
-            [
-                {
-                    "bindings": {
-                        "cmd-1": ["vim::PushOperator", { "Object": { "some" : "value" } }]
-                    }
-                }
-            ]
-            "#,
-            Some(
-                r#"
-            [
-                {
-                    "bindings": {
-                        "cmd-1": ["vim::PushObject", { "some" : "value" }]
-                    }
-                }
-            ]
-            "#,
-            ),
-        )
-    }
-
-    #[test]
-    fn test_rename_string_action() {
-        assert_migrate_keymap(
-            r#"
-                [
-                    {
-                        "bindings": {
-                            "cmd-1": "inline_completion::ToggleMenu"
-                        }
-                    }
-                ]
-            "#,
-            Some(
-                r#"
-                [
-                    {
-                        "bindings": {
-                            "cmd-1": "edit_prediction::ToggleMenu"
-                        }
-                    }
-                ]
-            "#,
-            ),
-        )
-    }
-
-    #[test]
-    fn test_rename_context_key() {
-        assert_migrate_keymap(
-            r#"
-                [
-                    {
-                        "context": "Editor && inline_completion && !showing_completions"
-                    }
-                ]
-            "#,
-            Some(
-                r#"
-                [
-                    {
-                        "context": "Editor && edit_prediction && !showing_completions"
-                    }
-                ]
-            "#,
-            ),
-        )
-    }
-
-    #[test]
-    fn test_incremental_migrations() {
-        // Here string transforms to array internally. Then, that array transforms back to string.
-        assert_migrate_keymap(
-            r#"
-                [
-                    {
-                        "bindings": {
-                            "ctrl-q": "editor::GoToHunk", // should remain same
-                            "ctrl-w": "editor::GoToPrevHunk", // should rename
-                            "ctrl-q": ["editor::GoToHunk", { "center_cursor": true }], // should transform
-                            "ctrl-w": ["editor::GoToPreviousHunk", { "center_cursor": true }] // should transform
-                        }
-                    }
-                ]
-            "#,
-            Some(
-                r#"
-                [
-                    {
-                        "bindings": {
-                            "ctrl-q": "editor::GoToHunk", // should remain same
-                            "ctrl-w": "editor::GoToPreviousHunk", // should rename
-                            "ctrl-q": "editor::GoToHunk", // should transform
-                            "ctrl-w": "editor::GoToPreviousHunk" // should transform
-                        }
-                    }
-                ]
-            "#,
-            ),
-        )
-    }
-
-    #[test]
-    fn test_action_argument_snake_case() {
-        // First performs transformations, then replacements
-        assert_migrate_keymap(
-            r#"
-            [
-                {
-                    "bindings": {
-                        "cmd-1": ["vim::PushOperator", { "Object": { "around": false } }],
-                        "cmd-3": ["pane::CloseActiveItem", { "saveIntent": "saveAll" }],
-                        "cmd-2": ["vim::NextWordStart", { "ignorePunctuation": true }],
-                        "cmd-4": ["task::Spawn", { "task_name": "a b" }] // should remain as it is
-                    }
-                }
-            ]
-            "#,
-            Some(
-                r#"
-            [
-                {
-                    "bindings": {
-                        "cmd-1": ["vim::PushObject", { "around": false }],
-                        "cmd-3": ["pane::CloseActiveItem", { "save_intent": "save_all" }],
-                        "cmd-2": ["vim::NextWordStart", { "ignore_punctuation": true }],
-                        "cmd-4": ["task::Spawn", { "task_name": "a b" }] // should remain as it is
-                    }
-                }
-            ]
-            "#,
-            ),
-        )
-    }
-
-    #[test]
-    fn test_replace_setting_name() {
-        assert_migrate_settings(
-            r#"
-                {
-                    "show_inline_completions_in_menu": true,
-                    "show_inline_completions": true,
-                    "inline_completions_disabled_in": ["string"],
-                    "inline_completions": { "some" : "value" }
-                }
-            "#,
-            Some(
-                r#"
-                {
-                    "show_edit_predictions_in_menu": true,
-                    "show_edit_predictions": true,
-                    "edit_predictions_disabled_in": ["string"],
-                    "edit_predictions": { "some" : "value" }
-                }
-            "#,
-            ),
-        )
-    }
-
-    #[test]
-    fn test_nested_string_replace_for_settings() {
-        assert_migrate_settings(
-            r#"
-                {
-                    "features": {
-                        "inline_completion_provider": "zed"
-                    },
-                }
-            "#,
-            Some(
-                r#"
-                {
-                    "features": {
-                        "edit_prediction_provider": "zed"
-                    },
-                }
-            "#,
-            ),
-        )
-    }
-
-    #[test]
-    fn test_replace_settings_in_languages() {
-        assert_migrate_settings(
-            r#"
-                {
-                    "languages": {
-                        "Astro": {
-                            "show_inline_completions": true
-                        }
-                    }
-                }
-            "#,
-            Some(
-                r#"
-                {
-                    "languages": {
-                        "Astro": {
-                            "show_edit_predictions": true
-                        }
-                    }
-                }
-            "#,
-            ),
-        )
-    }
-
-    #[test]
-    fn test_replace_settings_value() {
-        assert_migrate_settings(
-            r#"
-                {
-                    "scrollbar": {
-                        "diagnostics": true
-                    },
-                    "chat_panel": {
-                        "button": true
-                    }
-                }
-            "#,
-            Some(
-                r#"
-                {
-                    "scrollbar": {
-                        "diagnostics": "all"
-                    },
-                    "chat_panel": {
-                        "button": "always"
-                    }
-                }
-            "#,
-            ),
-        )
-    }
-
-    #[test]
-    fn test_replace_settings_name_and_value() {
-        assert_migrate_settings(
-            r#"
-                {
-                    "tabs": {
-                        "always_show_close_button": true
-                    }
-                }
-            "#,
-            Some(
-                r#"
-                {
-                    "tabs": {
-                        "show_close_button": "always"
-                    }
-                }
-            "#,
-            ),
-        )
-    }
-
-    #[test]
-    fn test_replace_bash_with_terminal_in_profiles() {
-        assert_migrate_settings(
-            r#"
-                {
-                    "assistant": {
-                        "profiles": {
-                            "custom": {
-                                "name": "Custom",
-                                "tools": {
-                                    "bash": true,
-                                    "diagnostics": true
-                                }
-                            }
-                        }
-                    }
-                }
-            "#,
-            Some(
-                r#"
-                {
-                    "agent": {
-                        "profiles": {
-                            "custom": {
-                                "name": "Custom",
-                                "tools": {
-                                    "terminal": true,
-                                    "diagnostics": true
-                                }
-                            }
-                        }
-                    }
-                }
-            "#,
-            ),
-        )
-    }
-
-    #[test]
-    fn test_replace_bash_false_with_terminal_in_profiles() {
-        assert_migrate_settings(
-            r#"
-                {
-                    "assistant": {
-                        "profiles": {
-                            "custom": {
-                                "name": "Custom",
-                                "tools": {
-                                    "bash": false,
-                                    "diagnostics": true
-                                }
-                            }
-                        }
-                    }
-                }
-            "#,
-            Some(
-                r#"
-                {
-                    "agent": {
-                        "profiles": {
-                            "custom": {
-                                "name": "Custom",
-                                "tools": {
-                                    "terminal": false,
-                                    "diagnostics": true
-                                }
-                            }
-                        }
-                    }
-                }
-            "#,
-            ),
-        )
-    }
-
-    #[test]
-    fn test_no_bash_in_profiles() {
-        assert_migrate_settings(
-            r#"
-                {
-                    "assistant": {
-                        "profiles": {
-                            "custom": {
-                                "name": "Custom",
-                                "tools": {
-                                    "diagnostics": true,
-                                    "find_path": true,
-                                    "read_file": true
-                                }
-                            }
-                        }
-                    }
-                }
-            "#,
-            Some(
-                r#"
-                {
-                    "agent": {
-                        "profiles": {
-                            "custom": {
-                                "name": "Custom",
-                                "tools": {
-                                    "diagnostics": true,
-                                    "find_path": true,
-                                    "read_file": true
-                                }
-                            }
-                        }
-                    }
-                }
-            "#,
-            ),
-        )
-    }
-
-    #[test]
-    fn test_rename_path_search_to_find_path() {
-        assert_migrate_settings(
-            r#"
-                {
-                    "assistant": {
-                        "profiles": {
-                            "default": {
-                                "tools": {
-                                    "path_search": true,
-                                    "read_file": true
-                                }
-                            }
-                        }
-                    }
-                }
-            "#,
-            Some(
-                r#"
-                {
-                    "agent": {
-                        "profiles": {
-                            "default": {
-                                "tools": {
-                                    "find_path": true,
-                                    "read_file": true
-                                }
-                            }
-                        }
-                    }
-                }
-            "#,
-            ),
-        );
-    }
-
-    #[test]
-    fn test_rename_assistant() {
-        assert_migrate_settings(
-            r#"{
-                "assistant": {
-                    "foo": "bar"
-                },
-                "edit_predictions": {
-                    "enabled_in_assistant": false,
-                }
-            }"#,
-            Some(
-                r#"{
-                "agent": {
-                    "foo": "bar"
-                },
-                "edit_predictions": {
-                    "enabled_in_text_threads": false,
-                }
-            }"#,
-            ),
-        );
-    }
-
-    #[test]
-    fn test_comment_duplicated_agent() {
-        assert_migrate_settings(
-            r#"{
-                "agent": {
-                    "name": "assistant-1",
-                "model": "gpt-4", // weird formatting
-                    "utf8": "привіт"
-                },
-                "something": "else",
-                "agent": {
-                    "name": "assistant-2",
-                    "model": "gemini-pro"
-                }
-            }
-        "#,
-            Some(
-                r#"{
-                /* Duplicated key auto-commented: "agent": {
-                    "name": "assistant-1",
-                "model": "gpt-4", // weird formatting
-                    "utf8": "привіт"
-                }, */
-                "something": "else",
-                "agent": {
-                    "name": "assistant-2",
-                    "model": "gemini-pro"
-                }
-            }
-        "#,
-            ),
-        );
-    }
-
-    #[test]
-    fn test_preferred_completion_mode_migration() {
-        assert_migrate_settings(
-            r#"{
-                "agent": {
-                    "preferred_completion_mode": "max",
-                    "enabled": true
-                }
-            }"#,
-            Some(
-                r#"{
-                "agent": {
-                    "preferred_completion_mode": "burn",
-                    "enabled": true
-                }
-            }"#,
-            ),
-        );
-
-        assert_migrate_settings(
-            r#"{
-                "agent": {
-                    "preferred_completion_mode": "normal",
-                    "enabled": true
-                }
-            }"#,
-            None,
-        );
-
-        assert_migrate_settings(
-            r#"{
-                "agent": {
-                    "preferred_completion_mode": "burn",
-                    "enabled": true
-                }
-            }"#,
-            None,
-        );
-
-        assert_migrate_settings(
-            r#"{
-                "other_section": {
-                    "preferred_completion_mode": "max"
-                },
-                "agent": {
-                    "preferred_completion_mode": "max"
-                }
-            }"#,
-            Some(
-                r#"{
-                "other_section": {
-                    "preferred_completion_mode": "max"
-                },
-                "agent": {
-                    "preferred_completion_mode": "burn"
-                }
-            }"#,
-            ),
-        );
-    }
-
-    #[test]
-    fn test_mcp_settings_migration() {
-        assert_migrate_settings_with_migrations(
-            &[MigrationType::TreeSitter(
-                migrations::m_2025_06_16::SETTINGS_PATTERNS,
-                &SETTINGS_QUERY_2025_06_16,
-            )],
-            r#"{
-    "context_servers": {
-        "empty_server": {},
-        "extension_server": {
-            "settings": {
-                "foo": "bar"
-            }
-        },
-        "custom_server": {
-            "command": {
-                "path": "foo",
-                "args": ["bar"],
-                "env": {
-                    "FOO": "BAR"
-                }
-            }
-        },
-        "invalid_server": {
-            "command": {
-                "path": "foo",
-                "args": ["bar"],
-                "env": {
-                    "FOO": "BAR"
-                }
-            },
-            "settings": {
-                "foo": "bar"
-            }
-        },
-        "empty_server2": {},
-        "extension_server2": {
-            "foo": "bar",
-            "settings": {
-                "foo": "bar"
-            },
-            "bar": "foo"
-        },
-        "custom_server2": {
-            "foo": "bar",
-            "command": {
-                "path": "foo",
-                "args": ["bar"],
-                "env": {
-                    "FOO": "BAR"
-                }
-            },
-            "bar": "foo"
-        },
-        "invalid_server2": {
-            "foo": "bar",
-            "command": {
-                "path": "foo",
-                "args": ["bar"],
-                "env": {
-                    "FOO": "BAR"
-                }
-            },
-            "bar": "foo",
-            "settings": {
-                "foo": "bar"
-            }
-        }
-    }
-}"#,
-            Some(
-                r#"{
-    "context_servers": {
-        "empty_server": {
-            "source": "extension",
-            "settings": {}
-        },
-        "extension_server": {
-            "source": "extension",
-            "settings": {
-                "foo": "bar"
-            }
-        },
-        "custom_server": {
-            "source": "custom",
-            "command": {
-                "path": "foo",
-                "args": ["bar"],
-                "env": {
-                    "FOO": "BAR"
-                }
-            }
-        },
-        "invalid_server": {
-            "source": "custom",
-            "command": {
-                "path": "foo",
-                "args": ["bar"],
-                "env": {
-                    "FOO": "BAR"
-                }
-            },
-            "settings": {
-                "foo": "bar"
-            }
-        },
-        "empty_server2": {
-            "source": "extension",
-            "settings": {}
-        },
-        "extension_server2": {
-            "source": "extension",
-            "foo": "bar",
-            "settings": {
-                "foo": "bar"
-            },
-            "bar": "foo"
-        },
-        "custom_server2": {
-            "source": "custom",
-            "foo": "bar",
-            "command": {
-                "path": "foo",
-                "args": ["bar"],
-                "env": {
-                    "FOO": "BAR"
-                }
-            },
-            "bar": "foo"
-        },
-        "invalid_server2": {
-            "source": "custom",
-            "foo": "bar",
-            "command": {
-                "path": "foo",
-                "args": ["bar"],
-                "env": {
-                    "FOO": "BAR"
-                }
-            },
-            "bar": "foo",
-            "settings": {
-                "foo": "bar"
-            }
-        }
-    }
-}"#,
-            ),
-        );
-    }
-
-    #[test]
-    fn test_mcp_settings_migration_doesnt_change_valid_settings() {
-        let settings = r#"{
-    "context_servers": {
-        "empty_server": {
-            "source": "extension",
-            "settings": {}
-        },
-        "extension_server": {
-            "source": "extension",
-            "settings": {
-                "foo": "bar"
-            }
-        },
-        "custom_server": {
-            "source": "custom",
-            "command": {
-                "path": "foo",
-                "args": ["bar"],
-                "env": {
-                    "FOO": "BAR"
-                }
-            }
-        },
-        "invalid_server": {
-            "source": "custom",
-            "command": {
-                "path": "foo",
-                "args": ["bar"],
-                "env": {
-                    "FOO": "BAR"
-                }
-            },
-            "settings": {
-                "foo": "bar"
-            }
-        }
-    }
-}"#;
-        assert_migrate_settings_with_migrations(
-            &[MigrationType::TreeSitter(
-                migrations::m_2025_06_16::SETTINGS_PATTERNS,
-                &SETTINGS_QUERY_2025_06_16,
-            )],
-            settings,
-            None,
-        );
-    }
-
-    #[test]
-    fn test_custom_agent_server_settings_migration() {
-        assert_migrate_settings_with_migrations(
-            &[MigrationType::TreeSitter(
-                migrations::m_2025_11_20::SETTINGS_PATTERNS,
-                &SETTINGS_QUERY_2025_11_20,
-            )],
-            r#"{
-    "agent_servers": {
-        "gemini": {
-            "default_model": "gemini-1.5-pro"
-        },
-        "claude": {},
-        "codex": {},
-        "my-custom-agent": {
-            "command": "/path/to/agent",
-            "args": ["--foo"],
-            "default_model": "my-model"
-        },
-        "already-migrated-agent": {
-            "type": "custom",
-            "command": "/path/to/agent"
-        },
-        "future-extension-agent": {
-            "type": "extension",
-            "default_model": "ext-model"
-        }
-    }
-}"#,
-            Some(
-                r#"{
-    "agent_servers": {
-        "gemini": {
-            "default_model": "gemini-1.5-pro"
-        },
-        "claude": {},
-        "codex": {},
-        "my-custom-agent": {
-            "type": "custom",
-            "command": "/path/to/agent",
-            "args": ["--foo"],
-            "default_model": "my-model"
-        },
-        "already-migrated-agent": {
-            "type": "custom",
-            "command": "/path/to/agent"
-        },
-        "future-extension-agent": {
-            "type": "extension",
-            "default_model": "ext-model"
-        }
-    }
-}"#,
-            ),
-        );
-    }
-
-    #[test]
-    fn test_remove_version_fields() {
-        assert_migrate_settings(
-            r#"{
-    "language_models": {
-        "anthropic": {
-            "version": "1",
-            "api_url": "https://api.anthropic.com"
-        },
-        "openai": {
-            "version": "1",
-            "api_url": "https://api.openai.com/v1"
-        }
-    },
-    "agent": {
-        "version": "2",
-        "enabled": true,
-        "preferred_completion_mode": "normal",
-        "button": true,
-        "dock": "right",
-        "default_width": 640,
-        "default_height": 320,
-        "default_model": {
-            "provider": "zed.dev",
-            "model": "claude-sonnet-4"
-        }
-    }
-}"#,
-            Some(
-                r#"{
-    "language_models": {
-        "anthropic": {
-            "api_url": "https://api.anthropic.com"
-        },
-        "openai": {
-            "api_url": "https://api.openai.com/v1"
-        }
-    },
-    "agent": {
-        "enabled": true,
-        "preferred_completion_mode": "normal",
-        "button": true,
-        "dock": "right",
-        "default_width": 640,
-        "default_height": 320,
-        "default_model": {
-            "provider": "zed.dev",
-            "model": "claude-sonnet-4"
-        }
-    }
-}"#,
-            ),
-        );
-
-        // Test that version fields in other contexts are not removed
-        assert_migrate_settings(
-            r#"{
-    "language_models": {
-        "other_provider": {
-            "version": "1",
-            "api_url": "https://api.example.com"
-        }
-    },
-    "other_section": {
-        "version": "1"
-    }
-}"#,
-            None,
-        );
-    }
-
-    #[test]
-    fn test_flatten_context_server_command() {
-        assert_migrate_settings(
-            r#"{
-    "context_servers": {
-        "some-mcp-server": {
-            "command": {
-                "path": "npx",
-                "args": [
-                    "-y",
-                    "@supabase/mcp-server-supabase@latest",
-                    "--read-only",
-                    "--project-ref=<project-ref>"
-                ],
-                "env": {
-                    "SUPABASE_ACCESS_TOKEN": "<personal-access-token>"
-                }
-            }
-        }
-    }
-}"#,
-            Some(
-                r#"{
-    "context_servers": {
-        "some-mcp-server": {
-            "command": "npx",
-            "args": [
-                "-y",
-                "@supabase/mcp-server-supabase@latest",
-                "--read-only",
-                "--project-ref=<project-ref>"
-            ],
-            "env": {
-                "SUPABASE_ACCESS_TOKEN": "<personal-access-token>"
-            }
-        }
-    }
-}"#,
-            ),
-        );
-
-        // Test with additional keys in server object
-        assert_migrate_settings(
-            r#"{
-    "context_servers": {
-        "server-with-extras": {
-            "command": {
-                "path": "/usr/bin/node",
-                "args": ["server.js"]
-            },
-            "settings": {}
-        }
-    }
-}"#,
-            Some(
-                r#"{
-    "context_servers": {
-        "server-with-extras": {
-            "command": "/usr/bin/node",
-            "args": ["server.js"],
-            "settings": {}
-        }
-    }
-}"#,
-            ),
-        );
-
-        // Test command without args or env
-        assert_migrate_settings(
-            r#"{
-    "context_servers": {
-        "simple-server": {
-            "command": {
-                "path": "simple-mcp-server"
-            }
-        }
-    }
-}"#,
-            Some(
-                r#"{
-    "context_servers": {
-        "simple-server": {
-            "command": "simple-mcp-server"
-        }
-    }
-}"#,
-            ),
-        );
-    }
-
-    #[test]
-    fn test_flatten_code_action_formatters_basic_array() {
-        assert_migrate_settings_with_migrations(
-            &[MigrationType::Json(
-                migrations::m_2025_10_01::flatten_code_actions_formatters,
-            )],
-            &r#"{
-        "formatter": [
-          {
-            "code_actions": {
-              "included-1": true,
-              "included-2": true,
-              "excluded": false,
-            }
-          }
-        ]
-      }"#
-            .unindent(),
-            Some(
-                &r#"{
-        "formatter": [
-          {
-            "code_action": "included-1"
-          },
-          {
-            "code_action": "included-2"
-          }
-        ]
-      }"#
-                .unindent(),
-            ),
-        );
-    }
-
-    #[test]
-    fn test_flatten_code_action_formatters_basic_object() {
-        assert_migrate_settings_with_migrations(
-            &[MigrationType::Json(
-                migrations::m_2025_10_01::flatten_code_actions_formatters,
-            )],
-            &r#"{
-        "formatter": {
-          "code_actions": {
-            "included-1": true,
-            "excluded": false,
-            "included-2": true
-          }
-        }
-      }"#
-            .unindent(),
-            Some(
-                &r#"{
-                  "formatter": [
-                    {
-                      "code_action": "included-1"
-                    },
-                    {
-                      "code_action": "included-2"
-                    }
-                  ]
-                }"#
-                .unindent(),
-            ),
-        );
-    }
-
-    #[test]
-    fn test_flatten_code_action_formatters_array_with_multiple_action_blocks() {
-        assert_migrate_settings(
-            &r#"{
-          "formatter": [
-            {
-               "code_actions": {
-                  "included-1": true,
-                  "included-2": true,
-                  "excluded": false,
-               }
-            },
-            {
-              "language_server": "ruff"
-            },
-            {
-               "code_actions": {
-                  "excluded": false,
-                  "excluded-2": false,
-               }
-            }
-            // some comment
-            ,
-            {
-               "code_actions": {
-                "excluded": false,
-                "included-3": true,
-                "included-4": true,
-               }
-            },
-          ]
-        }"#
-            .unindent(),
-            Some(
-                &r#"{
-        "formatter": [
-          {
-            "code_action": "included-1"
-          },
-          {
-            "code_action": "included-2"
-          },
-          {
-            "language_server": "ruff"
-          },
-          {
-            "code_action": "included-3"
-          },
-          {
-            "code_action": "included-4"
-          }
-        ]
-      }"#
-                .unindent(),
-            ),
-        );
-    }
-
-    #[test]
-    fn test_flatten_code_action_formatters_array_with_multiple_action_blocks_in_languages() {
-        assert_migrate_settings(
-            &r#"{
-        "languages": {
-          "Rust": {
-            "formatter": [
-              {
-                "code_actions": {
-                  "included-1": true,
-                  "included-2": true,
-                  "excluded": false,
-                }
-              },
-              {
-                "language_server": "ruff"
-              },
-              {
-                "code_actions": {
-                  "excluded": false,
-                  "excluded-2": false,
-                }
-              }
-              // some comment
-              ,
-              {
-                "code_actions": {
-                  "excluded": false,
-                  "included-3": true,
-                  "included-4": true,
-                }
-              },
-            ]
-          }
-        }
-      }"#
-            .unindent(),
-            Some(
-                &r#"{
-          "languages": {
-            "Rust": {
-              "formatter": [
-                {
-                  "code_action": "included-1"
-                },
-                {
-                  "code_action": "included-2"
-                },
-                {
-                  "language_server": "ruff"
-                },
-                {
-                  "code_action": "included-3"
-                },
-                {
-                  "code_action": "included-4"
-                }
-              ]
-            }
-          }
-        }"#
-                .unindent(),
-            ),
-        );
-    }
-
-    #[test]
-    fn test_flatten_code_action_formatters_array_with_multiple_action_blocks_in_defaults_and_multiple_languages()
-     {
-        assert_migrate_settings_with_migrations(
-            &[MigrationType::Json(
-                migrations::m_2025_10_01::flatten_code_actions_formatters,
-            )],
-            &r#"{
-        "formatter": {
-          "code_actions": {
-            "default-1": true,
-            "default-2": true,
-            "default-3": true,
-            "default-4": true,
-          }
-        },
-        "languages": {
-          "Rust": {
-            "formatter": [
-              {
-                "code_actions": {
-                  "included-1": true,
-                  "included-2": true,
-                  "excluded": false,
-                }
-              },
-              {
-                "language_server": "ruff"
-              },
-              {
-                "code_actions": {
-                  "excluded": false,
-                  "excluded-2": false,
-                }
-              }
-              // some comment
-              ,
-              {
-                "code_actions": {
-                  "excluded": false,
-                  "included-3": true,
-                  "included-4": true,
-                }
-              },
-            ]
-          },
-          "Python": {
-            "formatter": [
-              {
-                "language_server": "ruff"
-              },
-              {
-                "code_actions": {
-                  "excluded": false,
-                  "excluded-2": false,
-                }
-              }
-              // some comment
-              ,
-              {
-                "code_actions": {
-                  "excluded": false,
-                  "included-3": true,
-                  "included-4": true,
-                }
-              },
-            ]
-          }
-        }
-      }"#
-            .unindent(),
-            Some(
-                &r#"{
-          "formatter": [
-            {
-              "code_action": "default-1"
-            },
-            {
-              "code_action": "default-2"
-            },
-            {
-              "code_action": "default-3"
-            },
-            {
-              "code_action": "default-4"
-            }
-          ],
-          "languages": {
-            "Rust": {
-              "formatter": [
-                {
-                  "code_action": "included-1"
-                },
-                {
-                  "code_action": "included-2"
-                },
-                {
-                  "language_server": "ruff"
-                },
-                {
-                  "code_action": "included-3"
-                },
-                {
-                  "code_action": "included-4"
-                }
-              ]
-            },
-            "Python": {
-              "formatter": [
-                {
-                  "language_server": "ruff"
-                },
-                {
-                  "code_action": "included-3"
-                },
-                {
-                  "code_action": "included-4"
-                }
-              ]
-            }
-          }
-        }"#
-                .unindent(),
-            ),
-        );
-    }
-
-    #[test]
-    fn test_flatten_code_action_formatters_array_with_format_on_save_and_multiple_languages() {
-        assert_migrate_settings_with_migrations(
-            &[MigrationType::Json(
-                migrations::m_2025_10_01::flatten_code_actions_formatters,
-            )],
-            &r#"{
-        "formatter": {
-          "code_actions": {
-            "default-1": true,
-            "default-2": true,
-            "default-3": true,
-            "default-4": true,
-          }
-        },
-        "format_on_save": [
-          {
-            "code_actions": {
-              "included-1": true,
-              "included-2": true,
-              "excluded": false,
-            }
-          },
-          {
-            "language_server": "ruff"
-          },
-          {
-            "code_actions": {
-              "excluded": false,
-              "excluded-2": false,
-            }
-          }
-          // some comment
-          ,
-          {
-            "code_actions": {
-              "excluded": false,
-              "included-3": true,
-              "included-4": true,
-            }
-          },
-        ],
-        "languages": {
-          "Rust": {
-            "format_on_save": "prettier",
-            "formatter": [
-              {
-                "code_actions": {
-                  "included-1": true,
-                  "included-2": true,
-                  "excluded": false,
-                }
-              },
-              {
-                "language_server": "ruff"
-              },
-              {
-                "code_actions": {
-                  "excluded": false,
-                  "excluded-2": false,
-                }
-              }
-              // some comment
-              ,
-              {
-                "code_actions": {
-                  "excluded": false,
-                  "included-3": true,
-                  "included-4": true,
-                }
-              },
-            ]
-          },
-          "Python": {
-            "format_on_save": {
-              "code_actions": {
-                "on-save-1": true,
-                "on-save-2": true,
-              }
-            },
-            "formatter": [
-              {
-                "language_server": "ruff"
-              },
-              {
-                "code_actions": {
-                  "excluded": false,
-                  "excluded-2": false,
-                }
-              }
-              // some comment
-              ,
-              {
-                "code_actions": {
-                  "excluded": false,
-                  "included-3": true,
-                  "included-4": true,
-                }
-              },
-            ]
-          }
-        }
-      }"#
-            .unindent(),
-            Some(
-                &r#"
-        {
-          "formatter": [
-            {
-              "code_action": "default-1"
-            },
-            {
-              "code_action": "default-2"
-            },
-            {
-              "code_action": "default-3"
-            },
-            {
-              "code_action": "default-4"
-            }
-          ],
-          "format_on_save": [
-            {
-              "code_action": "included-1"
-            },
-            {
-              "code_action": "included-2"
-            },
-            {
-              "language_server": "ruff"
-            },
-            {
-              "code_action": "included-3"
-            },
-            {
-              "code_action": "included-4"
-            }
-          ],
-          "languages": {
-            "Rust": {
-              "format_on_save": "prettier",
-              "formatter": [
-                {
-                  "code_action": "included-1"
-                },
-                {
-                  "code_action": "included-2"
-                },
-                {
-                  "language_server": "ruff"
-                },
-                {
-                  "code_action": "included-3"
-                },
-                {
-                  "code_action": "included-4"
-                }
-              ]
-            },
-            "Python": {
-              "format_on_save": [
-                {
-                  "code_action": "on-save-1"
-                },
-                {
-                  "code_action": "on-save-2"
-                }
-              ],
-              "formatter": [
-                {
-                  "language_server": "ruff"
-                },
-                {
-                  "code_action": "included-3"
-                },
-                {
-                  "code_action": "included-4"
-                }
-              ]
-            }
-          }
-        }"#
-                .unindent(),
-            ),
-        );
-    }
-
-    #[test]
-    fn test_format_on_save_formatter_migration_basic() {
-        assert_migrate_settings_with_migrations(
-            &[MigrationType::Json(
-                migrations::m_2025_10_02::remove_formatters_on_save,
-            )],
-            &r#"{
-                  "format_on_save": "prettier"
-              }"#
-            .unindent(),
-            Some(
-                &r#"{
-                      "formatter": "prettier",
-                      "format_on_save": "on"
-                  }"#
-                .unindent(),
-            ),
-        );
-    }
-
-    #[test]
-    fn test_format_on_save_formatter_migration_array() {
-        assert_migrate_settings_with_migrations(
-            &[MigrationType::Json(
-                migrations::m_2025_10_02::remove_formatters_on_save,
-            )],
-            &r#"{
-                "format_on_save": ["prettier", {"language_server": "eslint"}]
-            }"#
-            .unindent(),
-            Some(
-                &r#"{
-                    "formatter": [
-                        "prettier",
-                        {
-                            "language_server": "eslint"
-                        }
-                    ],
-                    "format_on_save": "on"
-                }"#
-                .unindent(),
-            ),
-        );
-    }
-
-    #[test]
-    fn test_format_on_save_on_off_unchanged() {
-        assert_migrate_settings_with_migrations(
-            &[MigrationType::Json(
-                migrations::m_2025_10_02::remove_formatters_on_save,
-            )],
-            &r#"{
-                "format_on_save": "on"
-            }"#
-            .unindent(),
-            None,
-        );
-
-        assert_migrate_settings_with_migrations(
-            &[MigrationType::Json(
-                migrations::m_2025_10_02::remove_formatters_on_save,
-            )],
-            &r#"{
-                "format_on_save": "off"
-            }"#
-            .unindent(),
-            None,
-        );
-    }
-
-    #[test]
-    fn test_format_on_save_formatter_migration_in_languages() {
-        assert_migrate_settings_with_migrations(
-            &[MigrationType::Json(
-                migrations::m_2025_10_02::remove_formatters_on_save,
-            )],
-            &r#"{
-                "languages": {
-                    "Rust": {
-                        "format_on_save": "rust-analyzer"
-                    },
-                    "Python": {
-                        "format_on_save": ["ruff", "black"]
-                    }
-                }
-            }"#
-            .unindent(),
-            Some(
-                &r#"{
-                    "languages": {
-                        "Rust": {
-                            "formatter": "rust-analyzer",
-                            "format_on_save": "on"
-                        },
-                        "Python": {
-                            "formatter": [
-                                "ruff",
-                                "black"
-                            ],
-                            "format_on_save": "on"
-                        }
-                    }
-                }"#
-                .unindent(),
-            ),
-        );
-    }
-
-    #[test]
-    fn test_format_on_save_formatter_migration_mixed_global_and_languages() {
-        assert_migrate_settings_with_migrations(
-            &[MigrationType::Json(
-                migrations::m_2025_10_02::remove_formatters_on_save,
-            )],
-            &r#"{
-                "format_on_save": "prettier",
-                "languages": {
-                    "Rust": {
-                        "format_on_save": "rust-analyzer"
-                    },
-                    "Python": {
-                        "format_on_save": "on"
-                    }
-                }
-            }"#
-            .unindent(),
-            Some(
-                &r#"{
-                    "formatter": "prettier",
-                    "format_on_save": "on",
-                    "languages": {
-                        "Rust": {
-                            "formatter": "rust-analyzer",
-                            "format_on_save": "on"
-                        },
-                        "Python": {
-                            "format_on_save": "on"
-                        }
-                    }
-                }"#
-                .unindent(),
-            ),
-        );
-    }
-
-    #[test]
-    fn test_format_on_save_no_migration_when_no_format_on_save() {
-        assert_migrate_settings_with_migrations(
-            &[MigrationType::Json(
-                migrations::m_2025_10_02::remove_formatters_on_save,
-            )],
-            &r#"{
-                "formatter": ["prettier"]
-            }"#
-            .unindent(),
-            None,
-        );
-    }
-
-    #[test]
-    fn test_restore_code_actions_on_format() {
-        assert_migrate_settings_with_migrations(
-            &[MigrationType::Json(
-                migrations::m_2025_10_16::restore_code_actions_on_format,
-            )],
-            &r#"{
-                "formatter": {
-                    "code_action": "foo"
-                }
-            }"#
-            .unindent(),
-            Some(
-                &r#"{
-                    "code_actions_on_format": {
-                        "foo": true
-                    },
-                    "formatter": []
-                }"#
-                .unindent(),
-            ),
-        );
-
-        assert_migrate_settings_with_migrations(
-            &[MigrationType::Json(
-                migrations::m_2025_10_16::restore_code_actions_on_format,
-            )],
-            &r#"{
-                "formatter": [
-                    { "code_action": "foo" },
-                    "auto"
-                ]
-            }"#
-            .unindent(),
-            None,
-        );
-
-        assert_migrate_settings_with_migrations(
-            &[MigrationType::Json(
-                migrations::m_2025_10_16::restore_code_actions_on_format,
-            )],
-            &r#"{
-                "formatter": {
-                    "code_action": "foo"
-                },
-                "code_actions_on_format": {
-                    "bar": true,
-                    "baz": false
-                }
-            }"#
-            .unindent(),
-            Some(
-                &r#"{
-                    "formatter": [],
-                    "code_actions_on_format": {
-                        "foo": true,
-                        "bar": true,
-                        "baz": false
-                    }
-                }"#
-                .unindent(),
-            ),
-        );
-
-        assert_migrate_settings_with_migrations(
-            &[MigrationType::Json(
-                migrations::m_2025_10_16::restore_code_actions_on_format,
-            )],
-            &r#"{
-                "formatter": [
-                    { "code_action": "foo" },
-                    { "code_action": "qux" },
-                ],
-                "code_actions_on_format": {
-                    "bar": true,
-                    "baz": false
-                }
-            }"#
-            .unindent(),
-            Some(
-                &r#"{
-                    "formatter": [],
-                    "code_actions_on_format": {
-                        "foo": true,
-                        "qux": true,
-                        "bar": true,
-                        "baz": false
-                    }
-                }"#
-                .unindent(),
-            ),
-        );
-
-        assert_migrate_settings_with_migrations(
-            &[MigrationType::Json(
-                migrations::m_2025_10_16::restore_code_actions_on_format,
-            )],
-            &r#"{
-                "formatter": [],
-                "code_actions_on_format": {
-                    "bar": true,
-                    "baz": false
-                }
-            }"#
-            .unindent(),
-            None,
-        );
-    }
-
-    #[test]
-    fn test_make_file_finder_include_ignored_an_enum() {
-        assert_migrate_settings_with_migrations(
-            &[MigrationType::Json(
-                migrations::m_2025_10_17::make_file_finder_include_ignored_an_enum,
-            )],
-            &r#"{ }"#.unindent(),
-            None,
-        );
-
-        assert_migrate_settings_with_migrations(
-            &[MigrationType::Json(
-                migrations::m_2025_10_17::make_file_finder_include_ignored_an_enum,
-            )],
-            &r#"{
-                "file_finder": {
-                    "include_ignored": true
-                }
-            }"#
-            .unindent(),
-            Some(
-                &r#"{
-                    "file_finder": {
-                        "include_ignored": "all"
-                    }
-                }"#
-                .unindent(),
-            ),
-        );
-
-        assert_migrate_settings_with_migrations(
-            &[MigrationType::Json(
-                migrations::m_2025_10_17::make_file_finder_include_ignored_an_enum,
-            )],
-            &r#"{
-                "file_finder": {
-                    "include_ignored": false
-                }
-            }"#
-            .unindent(),
-            Some(
-                &r#"{
-                    "file_finder": {
-                        "include_ignored": "indexed"
-                    }
-                }"#
-                .unindent(),
-            ),
-        );
-
-        assert_migrate_settings_with_migrations(
-            &[MigrationType::Json(
-                migrations::m_2025_10_17::make_file_finder_include_ignored_an_enum,
-            )],
-            &r#"{
-                "file_finder": {
-                    "include_ignored": null
-                }
-            }"#
-            .unindent(),
-            Some(
-                &r#"{
-                    "file_finder": {
-                        "include_ignored": "smart"
-                    }
-                }"#
-                .unindent(),
-            ),
-        );
-    }
-
-    #[test]
-    fn test_remove_context_server_source() {
-        assert_migrate_settings(
-            &r#"
-            {
-                "context_servers": {
-                    "extension_server": {
-                        "source": "extension",
-                        "settings": {
-                            "foo": "bar"
-                        }
-                    },
-                    "custom_server": {
-                        "source": "custom",
-                        "command": "foo",
-                        "args": ["bar"],
-                        "env": {
-                            "FOO": "BAR"
-                        }
-                    },
-                }
-            }
-            "#
-            .unindent(),
-            Some(
-                &r#"
-                {
-                    "context_servers": {
-                        "extension_server": {
-                            "settings": {
-                                "foo": "bar"
-                            }
-                        },
-                        "custom_server": {
-                            "command": "foo",
-                            "args": ["bar"],
-                            "env": {
-                                "FOO": "BAR"
-                            }
-                        },
-                    }
-                }
-                "#
-                .unindent(),
-            ),
-        );
-    }
-
-    #[test]
-    fn test_project_panel_open_file_on_paste_migration() {
-        assert_migrate_settings(
-            &r#"
-            {
-                "project_panel": {
-                    "open_file_on_paste": true
-                }
-            }
-            "#
-            .unindent(),
-            Some(
-                &r#"
-                {
-                    "project_panel": {
-                        "auto_open": { "on_paste": true }
-                    }
-                }
-                "#
-                .unindent(),
-            ),
-        );
-
-        assert_migrate_settings(
-            &r#"
-            {
-                "project_panel": {
-                    "open_file_on_paste": false
-                }
-            }
-            "#
-            .unindent(),
-            Some(
-                &r#"
-                {
-                    "project_panel": {
-                        "auto_open": { "on_paste": false }
-                    }
-                }
-                "#
-                .unindent(),
-            ),
-        );
-    }
-
-    #[test]
-    fn test_enable_preview_from_code_navigation_migration() {
-        assert_migrate_settings(
-            &r#"
-            {
-                "other_setting_1": 1,
-                "preview_tabs": {
-                    "other_setting_2": 2,
-                    "enable_preview_from_code_navigation": false
-                }
-            }
-            "#
-            .unindent(),
-            Some(
-                &r#"
-                {
-                    "other_setting_1": 1,
-                    "preview_tabs": {
-                        "other_setting_2": 2,
-                        "enable_keep_preview_on_code_navigation": false
-                    }
-                }
-                "#
-                .unindent(),
-            ),
-        );
-
-        assert_migrate_settings(
-            &r#"
-            {
-                "other_setting_1": 1,
-                "preview_tabs": {
-                    "other_setting_2": 2,
-                    "enable_preview_from_code_navigation": true
-                }
-            }
-            "#
-            .unindent(),
-            Some(
-                &r#"
-                {
-                    "other_setting_1": 1,
-                    "preview_tabs": {
-                        "other_setting_2": 2,
-                        "enable_keep_preview_on_code_navigation": true
-                    }
-                }
-                "#
-                .unindent(),
-            ),
-        );
-    }
-}
diff --git a/crates/migrator/src/patterns.rs b/crates/migrator/src/patterns.rs
deleted file mode 100644
index 4132c93d93..0000000000
--- a/crates/migrator/src/patterns.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-mod keymap;
-mod settings;
-
-pub(crate) use keymap::{
-    KEYMAP_ACTION_ARRAY_ARGUMENT_AS_OBJECT_PATTERN, KEYMAP_ACTION_ARRAY_PATTERN,
-    KEYMAP_ACTION_STRING_PATTERN, KEYMAP_CONTEXT_PATTERN,
-};
-
-pub(crate) use settings::{
-    SETTINGS_ASSISTANT_PATTERN, SETTINGS_ASSISTANT_TOOLS_PATTERN,
-    SETTINGS_DUPLICATED_AGENT_PATTERN, SETTINGS_EDIT_PREDICTIONS_ASSISTANT_PATTERN,
-    SETTINGS_LANGUAGES_PATTERN, SETTINGS_NESTED_KEY_VALUE_PATTERN, SETTINGS_ROOT_KEY_VALUE_PATTERN,
-    migrate_language_setting,
-};
diff --git a/crates/migrator/src/patterns/keymap.rs b/crates/migrator/src/patterns/keymap.rs
deleted file mode 100644
index 439c10fd4a..0000000000
--- a/crates/migrator/src/patterns/keymap.rs
+++ /dev/null
@@ -1,77 +0,0 @@
-pub const KEYMAP_ACTION_ARRAY_PATTERN: &str = r#"(document
-    (array
-   	    (object
-            (pair
-                key: (string (string_content) @name)
-                value: (
-                    (object
-                        (pair
-                            key: (string)
-                            value: ((array
-                                . (string (string_content) @action_name)
-                                . (string (string_content) @argument)
-                                .)) @array
-                        )
-                    )
-                )
-            )
-        )
-    )
-    (#eq? @name "bindings")
-)"#;
-
-pub const KEYMAP_ACTION_STRING_PATTERN: &str = r#"(document
-    (array
-        (object
-            (pair
-                key: (string (string_content) @name)
-                value: (
-                    (object
-                        (pair
-                            key: (string)
-                            value: (string (string_content) @action_name)
-                        )
-                    )
-                )
-            )
-        )
-    )
-    (#eq? @name "bindings")
-)"#;
-
-pub const KEYMAP_CONTEXT_PATTERN: &str = r#"(document
-    (array
-        (object
-            (pair
-                key: (string (string_content) @name)
-                value: (string (string_content) @context_predicate)
-            )
-        )
-    )
-    (#eq? @name "context")
-)"#;
-
-pub const KEYMAP_ACTION_ARRAY_ARGUMENT_AS_OBJECT_PATTERN: &str = r#"(document
-    (array
-        (object
-            (pair
-                key: (string (string_content) @name)
-                value: (
-                    (object
-                        (pair
-                            key: (string)
-                            value: ((array
-                                . (string (string_content) @action_name)
-                                . (object
-                                    (pair
-                                    key: (string (string_content) @argument_key)
-                                    value: (_)  @argument_value))
-                                . ) @array
-                            ))
-                        )
-                    )
-                )
-            )
-        )
-    (#eq? @name "bindings")
-)"#;
diff --git a/crates/migrator/src/patterns/settings.rs b/crates/migrator/src/patterns/settings.rs
deleted file mode 100644
index a068cce23b..0000000000
--- a/crates/migrator/src/patterns/settings.rs
+++ /dev/null
@@ -1,131 +0,0 @@
-pub const SETTINGS_ROOT_KEY_VALUE_PATTERN: &str = r#"(document
-    (object
-        (pair
-            key: (string (string_content) @name)
-            value: (_)  @value
-        )
-    )
-)"#;
-
-pub const SETTINGS_NESTED_KEY_VALUE_PATTERN: &str = r#"(document
-    (object
-        (pair
-            key: (string (string_content) @parent_key)
-            value: (object
-                (pair
-                    key: (string (string_content) @setting_name)
-                    value: (_) @setting_value
-                )
-            )
-        )
-    )
-)"#;
-
-pub const SETTINGS_LANGUAGES_PATTERN: &str = r#"(document
-    (object
-        (pair
-            key: (string (string_content) @languages)
-            value: (object
-            (pair
-                key: (string)
-                value: (object
-                    (pair
-                        key: (string (string_content) @setting_name)
-                        value: (_) @value
-                    )
-                )
-            ))
-        )
-    )
-    (#eq? @languages "languages")
-)"#;
-
-pub const SETTINGS_ASSISTANT_TOOLS_PATTERN: &str = r#"(document
-    (object
-        (pair
-            key: (string (string_content) @assistant)
-            value: (object
-                (pair
-                    key: (string (string_content) @profiles)
-                    value: (object
-                        (pair
-                            key: (_)
-                            value: (object
-                                (pair
-                                    key: (string (string_content) @tools_key)
-                                    value: (object
-                                        (pair
-                                            key: (string (string_content) @tool_name)
-                                            value: (_) @tool_value
-                                        )
-                                    )
-                                )
-                            )
-                        )
-                    )
-                )
-            )
-        )
-    )
-    (#eq? @assistant "assistant")
-    (#eq? @profiles "profiles")
-    (#eq? @tools_key "tools")
-)"#;
-
-pub const SETTINGS_ASSISTANT_PATTERN: &str = r#"(document
-    (object
-        (pair
-            key: (string (string_content) @key)
-        )
-    )
-    (#eq? @key "assistant")
-)"#;
-
-pub const SETTINGS_EDIT_PREDICTIONS_ASSISTANT_PATTERN: &str = r#"(document
-    (object
-        (pair
-            key: (string (string_content) @edit_predictions)
-            value: (object
-                (pair key: (string (string_content) @enabled_in_assistant))
-            )
-        )
-    )
-    (#eq? @edit_predictions "edit_predictions")
-    (#eq? @enabled_in_assistant "enabled_in_assistant")
-)"#;
-
-pub const SETTINGS_DUPLICATED_AGENT_PATTERN: &str = r#"(document
-    (object
-        (pair
-            key: (string (string_content) @agent1)
-            value: (_)
-        ) @pair1
-        (pair
-            key: (string (string_content) @agent2)
-            value: (_)
-        )
-    )
-    (#eq? @agent1 "agent")
-    (#eq? @agent2 "agent")
-)"#;
-
-/// Migrate language settings,
-/// calls `migrate_fn` with the top level object as well as all language settings under the "languages" key
-/// Fails early if `migrate_fn` returns an error at any point
-pub fn migrate_language_setting(
-    value: &mut serde_json::Value,
-    migrate_fn: fn(&mut serde_json::Value, path: &[&str]) -> anyhow::Result<()>,
-) -> anyhow::Result<()> {
-    migrate_fn(value, &[])?;
-    let languages = value
-        .as_object_mut()
-        .and_then(|obj| obj.get_mut("languages"))
-        .and_then(|languages| languages.as_object_mut());
-    if let Some(languages) = languages {
-        for (language_name, language) in languages.iter_mut() {
-            let path = vec!["languages", language_name];
-            migrate_fn(language, &path)?;
-        }
-    }
-    Ok(())
-}
diff --git a/crates/miniprofiler_ui/Cargo.toml b/crates/miniprofiler_ui/Cargo.toml
deleted file mode 100644
index bb508a188e..0000000000
--- a/crates/miniprofiler_ui/Cargo.toml
+++ /dev/null
@@ -1,23 +0,0 @@
-[package]
-name = "miniprofiler_ui"
-version = "0.1.0"
-publish.workspace = true
-edition.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/miniprofiler_ui.rs"
-
-[dependencies]
-gpui.workspace = true
-zed_actions.workspace = true
-workspace.workspace = true
-util.workspace = true
-serde_json.workspace = true
-smol.workspace = true
-
-[dev-dependencies]
-gpui = { workspace = true, features = ["test-support"] }
diff --git a/crates/miniprofiler_ui/LICENSE-GPL b/crates/miniprofiler_ui/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/miniprofiler_ui/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/miniprofiler_ui/src/miniprofiler_ui.rs b/crates/miniprofiler_ui/src/miniprofiler_ui.rs
deleted file mode 100644
index ea59b43cc1..0000000000
--- a/crates/miniprofiler_ui/src/miniprofiler_ui.rs
+++ /dev/null
@@ -1,410 +0,0 @@
-use std::{
-    ops::Range,
-    path::PathBuf,
-    rc::Rc,
-    time::{Duration, Instant},
-};
-
-use gpui::{
-    App, AppContext, ClipboardItem, Context, Div, Entity, Hsla, InteractiveElement,
-    ParentElement as _, Render, SerializedTaskTiming, SharedString, StatefulInteractiveElement,
-    Styled, Task, TaskTiming, TitlebarOptions, UniformListScrollHandle, WindowBounds, WindowHandle,
-    WindowOptions, div, prelude::FluentBuilder, px, relative, size, uniform_list,
-};
-use util::ResultExt;
-use workspace::{
-    Workspace,
-    ui::{
-        ActiveTheme, Button, ButtonCommon, ButtonStyle, Checkbox, Clickable, Divider,
-        ScrollableHandle as _, ToggleState, Tooltip, WithScrollbar, h_flex, v_flex,
-    },
-};
-use zed_actions::OpenPerformanceProfiler;
-
-pub fn init(startup_time: Instant, cx: &mut App) {
-    cx.observe_new(move |workspace: &mut workspace::Workspace, _, _| {
-        workspace.register_action(move |workspace, _: &OpenPerformanceProfiler, window, cx| {
-            let window_handle = window
-                .window_handle()
-                .downcast::<Workspace>()
-                .expect("Workspaces are root Windows");
-            open_performance_profiler(startup_time, workspace, window_handle, cx);
-        });
-    })
-    .detach();
-}
-
-fn open_performance_profiler(
-    startup_time: Instant,
-    _workspace: &mut workspace::Workspace,
-    workspace_handle: WindowHandle<Workspace>,
-    cx: &mut App,
-) {
-    let existing_window = cx
-        .windows()
-        .into_iter()
-        .find_map(|window| window.downcast::<ProfilerWindow>());
-
-    if let Some(existing_window) = existing_window {
-        existing_window
-            .update(cx, |profiler_window, window, _cx| {
-                profiler_window.workspace = Some(workspace_handle);
-                window.activate_window();
-            })
-            .log_err();
-        return;
-    }
-
-    let default_bounds = size(px(1280.), px(720.)); // 16:9
-
-    cx.open_window(
-        WindowOptions {
-            titlebar: Some(TitlebarOptions {
-                title: Some("Profiler Window".into()),
-                appears_transparent: false,
-                traffic_light_position: None,
-            }),
-            focus: true,
-            show: true,
-            is_movable: true,
-            kind: gpui::WindowKind::Normal,
-            window_background: cx.theme().window_background_appearance(),
-            window_decorations: None,
-            window_min_size: Some(default_bounds),
-            window_bounds: Some(WindowBounds::centered(default_bounds, cx)),
-            ..Default::default()
-        },
-        |_window, cx| ProfilerWindow::new(startup_time, Some(workspace_handle), cx),
-    )
-    .log_err();
-}
-
-enum DataMode {
-    Realtime(Option<Vec<TaskTiming>>),
-    Snapshot(Vec<TaskTiming>),
-}
-
-struct TimingBar {
-    location: &'static core::panic::Location<'static>,
-    start: Instant,
-    end: Instant,
-    color: Hsla,
-}
-
-pub struct ProfilerWindow {
-    startup_time: Instant,
-    data: DataMode,
-    include_self_timings: ToggleState,
-    autoscroll: bool,
-    scroll_handle: UniformListScrollHandle,
-    workspace: Option<WindowHandle<Workspace>>,
-    _refresh: Option<Task<()>>,
-}
-
-impl ProfilerWindow {
-    pub fn new(
-        startup_time: Instant,
-        workspace_handle: Option<WindowHandle<Workspace>>,
-        cx: &mut App,
-    ) -> Entity<Self> {
-        let entity = cx.new(|cx| ProfilerWindow {
-            startup_time,
-            data: DataMode::Realtime(None),
-            include_self_timings: ToggleState::Unselected,
-            autoscroll: true,
-            scroll_handle: UniformListScrollHandle::default(),
-            workspace: workspace_handle,
-            _refresh: Some(Self::begin_listen(cx)),
-        });
-
-        entity
-    }
-
-    fn begin_listen(cx: &mut Context<Self>) -> Task<()> {
-        cx.spawn(async move |this, cx| {
-            loop {
-                let data = cx
-                    .foreground_executor()
-                    .dispatcher
-                    .get_current_thread_timings();
-
-                this.update(cx, |this: &mut ProfilerWindow, cx| {
-                    this.data = DataMode::Realtime(Some(data));
-                    cx.notify();
-                })
-                .ok();
-
-                // yield to the executor
-                cx.background_executor()
-                    .timer(Duration::from_micros(1))
-                    .await;
-            }
-        })
-    }
-
-    fn get_timings(&self) -> Option<&Vec<TaskTiming>> {
-        match &self.data {
-            DataMode::Realtime(data) => data.as_ref(),
-            DataMode::Snapshot(data) => Some(data),
-        }
-    }
-
-    fn render_timing(value_range: Range<Instant>, item: TimingBar, cx: &App) -> Div {
-        let time_ms = item.end.duration_since(item.start).as_secs_f32() * 1000f32;
-
-        let remap = value_range
-            .end
-            .duration_since(value_range.start)
-            .as_secs_f32()
-            * 1000f32;
-
-        let start = (item.start.duration_since(value_range.start).as_secs_f32() * 1000f32) / remap;
-        let end = (item.end.duration_since(value_range.start).as_secs_f32() * 1000f32) / remap;
-
-        let bar_width = end - start.abs();
-
-        let location = item
-            .location
-            .file()
-            .rsplit_once("/")
-            .unwrap_or(("", item.location.file()))
-            .1;
-        let location = location.rsplit_once("\\").unwrap_or(("", location)).1;
-
-        let label = SharedString::from(format!(
-            "{}:{}:{}",
-            location,
-            item.location.line(),
-            item.location.column()
-        ));
-
-        h_flex()
-            .gap_2()
-            .w_full()
-            .h(px(32.0))
-            .child(
-                div()
-                    .id(label.clone())
-                    .w(px(200.0))
-                    .flex_shrink_0()
-                    .overflow_hidden()
-                    .child(div().text_ellipsis().child(label.clone()))
-                    .tooltip(Tooltip::text(label.clone()))
-                    .on_click(move |_, _, cx| {
-                        cx.write_to_clipboard(ClipboardItem::new_string(label.to_string()))
-                    }),
-            )
-            .child(
-                div()
-                    .flex_1()
-                    .h(px(24.0))
-                    .bg(cx.theme().colors().background)
-                    .rounded_md()
-                    .p(px(2.0))
-                    .relative()
-                    .child(
-                        div()
-                            .absolute()
-                            .h_full()
-                            .rounded_sm()
-                            .bg(item.color)
-                            .left(relative(start.max(0f32)))
-                            .w(relative(bar_width)),
-                    ),
-            )
-            .child(
-                div()
-                    .min_w(px(70.))
-                    .flex_shrink_0()
-                    .text_right()
-                    .child(format!("{:.1} ms", time_ms)),
-            )
-    }
-}
-
-impl Render for ProfilerWindow {
-    fn render(
-        &mut self,
-        window: &mut gpui::Window,
-        cx: &mut gpui::Context<Self>,
-    ) -> impl gpui::IntoElement {
-        let scroll_offset = self.scroll_handle.offset();
-        let max_offset = self.scroll_handle.max_offset();
-        self.autoscroll = -scroll_offset.y >= (max_offset.height - px(24.));
-        if self.autoscroll {
-            self.scroll_handle.scroll_to_bottom();
-        }
-
-        v_flex()
-            .id("profiler")
-            .w_full()
-            .h_full()
-            .bg(cx.theme().colors().surface_background)
-            .text_color(cx.theme().colors().text)
-            .child(
-                h_flex()
-                    .py_2()
-                    .px_4()
-                    .w_full()
-                    .justify_between()
-                    .child(
-                        h_flex()
-                            .gap_2()
-                            .child(
-                                Button::new(
-                                    "switch-mode",
-                                    match self.data {
-                                        DataMode::Snapshot { .. } => "Resume",
-                                        DataMode::Realtime(_) => "Pause",
-                                    },
-                                )
-                                .style(ButtonStyle::Filled)
-                                .on_click(cx.listener(
-                                    |this, _, _window, cx| {
-                                        match &this.data {
-                                            DataMode::Realtime(Some(data)) => {
-                                                this._refresh = None;
-                                                this.data = DataMode::Snapshot(data.clone());
-                                            }
-                                            DataMode::Snapshot { .. } => {
-                                                this._refresh = Some(Self::begin_listen(cx));
-                                                this.data = DataMode::Realtime(None);
-                                            }
-                                            _ => {}
-                                        };
-                                        cx.notify();
-                                    },
-                                )),
-                            )
-                            .child(
-                                Button::new("export-data", "Save")
-                                    .style(ButtonStyle::Filled)
-                                    .on_click(cx.listener(|this, _, _window, cx| {
-                                        let Some(workspace) = this.workspace else {
-                                            return;
-                                        };
-
-                                        let Some(data) = this.get_timings() else {
-                                            return;
-                                        };
-                                        let timings =
-                                            SerializedTaskTiming::convert(this.startup_time, &data);
-
-                                        let active_path = workspace
-                                            .read_with(cx, |workspace, cx| {
-                                                workspace.most_recent_active_path(cx)
-                                            })
-                                            .log_err()
-                                            .flatten()
-                                            .and_then(|p| p.parent().map(|p| p.to_owned()))
-                                            .unwrap_or_else(|| PathBuf::default());
-
-                                        let path = cx.prompt_for_new_path(
-                                            &active_path,
-                                            Some("performance_profile.miniprof"),
-                                        );
-
-                                        cx.background_spawn(async move {
-                                            let path = path.await;
-                                            let path =
-                                                path.log_err().and_then(|p| p.log_err()).flatten();
-
-                                            let Some(path) = path else {
-                                                return;
-                                            };
-
-                                            let Some(timings) =
-                                                serde_json::to_string(&timings).log_err()
-                                            else {
-                                                return;
-                                            };
-
-                                            smol::fs::write(path, &timings).await.log_err();
-                                        })
-                                        .detach();
-                                    })),
-                            ),
-                    )
-                    .child(
-                        Checkbox::new("include-self", self.include_self_timings)
-                            .label("Include profiler timings")
-                            .on_click(cx.listener(|this, checked, _window, cx| {
-                                this.include_self_timings = *checked;
-                                cx.notify();
-                            })),
-                    ),
-            )
-            .when_some(self.get_timings(), |div, e| {
-                if e.len() == 0 {
-                    return div;
-                }
-
-                let min = e[0].start;
-                let max = e[e.len() - 1].end.unwrap_or_else(|| Instant::now());
-                let timings = Rc::new(
-                    e.into_iter()
-                        .filter(|timing| {
-                            timing
-                                .end
-                                .unwrap_or_else(|| Instant::now())
-                                .duration_since(timing.start)
-                                .as_millis()
-                                >= 1
-                        })
-                        .filter(|timing| {
-                            if self.include_self_timings.selected() {
-                                true
-                            } else {
-                                !timing.location.file().ends_with("miniprofiler_ui.rs")
-                            }
-                        })
-                        .cloned()
-                        .collect::<Vec<_>>(),
-                );
-
-                div.child(Divider::horizontal()).child(
-                    v_flex()
-                        .id("timings.bars")
-                        .w_full()
-                        .h_full()
-                        .gap_2()
-                        .child(
-                            uniform_list("list", timings.len(), {
-                                let timings = timings.clone();
-                                move |visible_range, _, cx| {
-                                    let mut items = vec![];
-                                    for i in visible_range {
-                                        let timing = &timings[i];
-                                        let value_range =
-                                            max.checked_sub(Duration::from_secs(10)).unwrap_or(min)
-                                                ..max;
-                                        items.push(Self::render_timing(
-                                            value_range,
-                                            TimingBar {
-                                                location: timing.location,
-                                                start: timing.start,
-                                                end: timing.end.unwrap_or_else(|| Instant::now()),
-                                                color: cx
-                                                    .theme()
-                                                    .accents()
-                                                    .color_for_index(i as u32),
-                                            },
-                                            cx,
-                                        ));
-                                    }
-                                    items
-                                }
-                            })
-                            .p_4()
-                            .on_scroll_wheel(cx.listener(|this, _, _, cx| {
-                                this.autoscroll = false;
-                                cx.notify();
-                            }))
-                            .track_scroll(&self.scroll_handle)
-                            .size_full(),
-                        )
-                        .vertical_scrollbar_for(&self.scroll_handle, window, cx),
-                )
-            })
-    }
-}
diff --git a/crates/mistral/Cargo.toml b/crates/mistral/Cargo.toml
deleted file mode 100644
index c4d475f014..0000000000
--- a/crates/mistral/Cargo.toml
+++ /dev/null
@@ -1,25 +0,0 @@
-[package]
-name = "mistral"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/mistral.rs"
-
-[features]
-default = []
-schemars = ["dep:schemars"]
-
-[dependencies]
-anyhow.workspace = true
-futures.workspace = true
-http_client.workspace = true
-schemars = { workspace = true, optional = true }
-serde.workspace = true
-serde_json.workspace = true
-strum.workspace = true
diff --git a/crates/mistral/LICENSE-GPL b/crates/mistral/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/mistral/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/mistral/src/mistral.rs b/crates/mistral/src/mistral.rs
deleted file mode 100644
index eca4743d04..0000000000
--- a/crates/mistral/src/mistral.rs
+++ /dev/null
@@ -1,482 +0,0 @@
-use anyhow::{Result, anyhow};
-use futures::{AsyncBufReadExt, AsyncReadExt, StreamExt, io::BufReader, stream::BoxStream};
-use http_client::{AsyncBody, HttpClient, Method, Request as HttpRequest};
-use serde::{Deserialize, Serialize};
-use serde_json::Value;
-use std::convert::TryFrom;
-use strum::EnumIter;
-
-pub const MISTRAL_API_URL: &str = "https://api.mistral.ai/v1";
-pub const CODESTRAL_API_URL: &str = "https://codestral.mistral.ai";
-
-#[derive(Clone, Copy, Serialize, Deserialize, Debug, Eq, PartialEq)]
-#[serde(rename_all = "lowercase")]
-pub enum Role {
-    User,
-    Assistant,
-    System,
-    Tool,
-}
-
-impl TryFrom<String> for Role {
-    type Error = anyhow::Error;
-
-    fn try_from(value: String) -> Result<Self> {
-        match value.as_str() {
-            "user" => Ok(Self::User),
-            "assistant" => Ok(Self::Assistant),
-            "system" => Ok(Self::System),
-            "tool" => Ok(Self::Tool),
-            _ => anyhow::bail!("invalid role '{value}'"),
-        }
-    }
-}
-
-impl From<Role> for String {
-    fn from(val: Role) -> Self {
-        match val {
-            Role::User => "user".to_owned(),
-            Role::Assistant => "assistant".to_owned(),
-            Role::System => "system".to_owned(),
-            Role::Tool => "tool".to_owned(),
-        }
-    }
-}
-
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
-#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq, EnumIter)]
-pub enum Model {
-    #[serde(rename = "codestral-latest", alias = "codestral-latest")]
-    #[default]
-    CodestralLatest,
-
-    #[serde(rename = "mistral-large-latest", alias = "mistral-large-latest")]
-    MistralLargeLatest,
-    #[serde(rename = "mistral-medium-latest", alias = "mistral-medium-latest")]
-    MistralMediumLatest,
-    #[serde(rename = "mistral-small-latest", alias = "mistral-small-latest")]
-    MistralSmallLatest,
-
-    #[serde(rename = "magistral-medium-latest", alias = "magistral-medium-latest")]
-    MagistralMediumLatest,
-    #[serde(rename = "magistral-small-latest", alias = "magistral-small-latest")]
-    MagistralSmallLatest,
-
-    #[serde(rename = "open-mistral-nemo", alias = "open-mistral-nemo")]
-    OpenMistralNemo,
-    #[serde(rename = "open-codestral-mamba", alias = "open-codestral-mamba")]
-    OpenCodestralMamba,
-
-    #[serde(rename = "devstral-medium-latest", alias = "devstral-medium-latest")]
-    DevstralMediumLatest,
-    #[serde(rename = "devstral-small-latest", alias = "devstral-small-latest")]
-    DevstralSmallLatest,
-
-    #[serde(rename = "pixtral-12b-latest", alias = "pixtral-12b-latest")]
-    Pixtral12BLatest,
-    #[serde(rename = "pixtral-large-latest", alias = "pixtral-large-latest")]
-    PixtralLargeLatest,
-
-    #[serde(rename = "custom")]
-    Custom {
-        name: String,
-        /// The name displayed in the UI, such as in the assistant panel model dropdown menu.
-        display_name: Option<String>,
-        max_tokens: u64,
-        max_output_tokens: Option<u64>,
-        max_completion_tokens: Option<u64>,
-        supports_tools: Option<bool>,
-        supports_images: Option<bool>,
-        supports_thinking: Option<bool>,
-    },
-}
-
-impl Model {
-    pub fn default_fast() -> Self {
-        Model::MistralSmallLatest
-    }
-
-    pub fn from_id(id: &str) -> Result<Self> {
-        match id {
-            "codestral-latest" => Ok(Self::CodestralLatest),
-            "mistral-large-latest" => Ok(Self::MistralLargeLatest),
-            "mistral-medium-latest" => Ok(Self::MistralMediumLatest),
-            "mistral-small-latest" => Ok(Self::MistralSmallLatest),
-            "magistral-medium-latest" => Ok(Self::MagistralMediumLatest),
-            "magistral-small-latest" => Ok(Self::MagistralSmallLatest),
-            "open-mistral-nemo" => Ok(Self::OpenMistralNemo),
-            "open-codestral-mamba" => Ok(Self::OpenCodestralMamba),
-            "devstral-medium-latest" => Ok(Self::DevstralMediumLatest),
-            "devstral-small-latest" => Ok(Self::DevstralSmallLatest),
-            "pixtral-12b-latest" => Ok(Self::Pixtral12BLatest),
-            "pixtral-large-latest" => Ok(Self::PixtralLargeLatest),
-            invalid_id => anyhow::bail!("invalid model id '{invalid_id}'"),
-        }
-    }
-
-    pub fn id(&self) -> &str {
-        match self {
-            Self::CodestralLatest => "codestral-latest",
-            Self::MistralLargeLatest => "mistral-large-latest",
-            Self::MistralMediumLatest => "mistral-medium-latest",
-            Self::MistralSmallLatest => "mistral-small-latest",
-            Self::MagistralMediumLatest => "magistral-medium-latest",
-            Self::MagistralSmallLatest => "magistral-small-latest",
-            Self::OpenMistralNemo => "open-mistral-nemo",
-            Self::OpenCodestralMamba => "open-codestral-mamba",
-            Self::DevstralMediumLatest => "devstral-medium-latest",
-            Self::DevstralSmallLatest => "devstral-small-latest",
-            Self::Pixtral12BLatest => "pixtral-12b-latest",
-            Self::PixtralLargeLatest => "pixtral-large-latest",
-            Self::Custom { name, .. } => name,
-        }
-    }
-
-    pub fn display_name(&self) -> &str {
-        match self {
-            Self::CodestralLatest => "codestral-latest",
-            Self::MistralLargeLatest => "mistral-large-latest",
-            Self::MistralMediumLatest => "mistral-medium-latest",
-            Self::MistralSmallLatest => "mistral-small-latest",
-            Self::MagistralMediumLatest => "magistral-medium-latest",
-            Self::MagistralSmallLatest => "magistral-small-latest",
-            Self::OpenMistralNemo => "open-mistral-nemo",
-            Self::OpenCodestralMamba => "open-codestral-mamba",
-            Self::DevstralMediumLatest => "devstral-medium-latest",
-            Self::DevstralSmallLatest => "devstral-small-latest",
-            Self::Pixtral12BLatest => "pixtral-12b-latest",
-            Self::PixtralLargeLatest => "pixtral-large-latest",
-            Self::Custom {
-                name, display_name, ..
-            } => display_name.as_ref().unwrap_or(name),
-        }
-    }
-
-    pub fn max_token_count(&self) -> u64 {
-        match self {
-            Self::CodestralLatest => 256000,
-            Self::MistralLargeLatest => 131000,
-            Self::MistralMediumLatest => 128000,
-            Self::MistralSmallLatest => 32000,
-            Self::MagistralMediumLatest => 40000,
-            Self::MagistralSmallLatest => 40000,
-            Self::OpenMistralNemo => 131000,
-            Self::OpenCodestralMamba => 256000,
-            Self::DevstralMediumLatest => 128000,
-            Self::DevstralSmallLatest => 262144,
-            Self::Pixtral12BLatest => 128000,
-            Self::PixtralLargeLatest => 128000,
-            Self::Custom { max_tokens, .. } => *max_tokens,
-        }
-    }
-
-    pub fn max_output_tokens(&self) -> Option<u64> {
-        match self {
-            Self::Custom {
-                max_output_tokens, ..
-            } => *max_output_tokens,
-            _ => None,
-        }
-    }
-
-    pub fn supports_tools(&self) -> bool {
-        match self {
-            Self::CodestralLatest
-            | Self::MistralLargeLatest
-            | Self::MistralMediumLatest
-            | Self::MistralSmallLatest
-            | Self::MagistralMediumLatest
-            | Self::MagistralSmallLatest
-            | Self::OpenMistralNemo
-            | Self::OpenCodestralMamba
-            | Self::DevstralMediumLatest
-            | Self::DevstralSmallLatest
-            | Self::Pixtral12BLatest
-            | Self::PixtralLargeLatest => true,
-            Self::Custom { supports_tools, .. } => supports_tools.unwrap_or(false),
-        }
-    }
-
-    pub fn supports_images(&self) -> bool {
-        match self {
-            Self::Pixtral12BLatest
-            | Self::PixtralLargeLatest
-            | Self::MistralMediumLatest
-            | Self::MistralSmallLatest => true,
-            Self::CodestralLatest
-            | Self::MistralLargeLatest
-            | Self::MagistralMediumLatest
-            | Self::MagistralSmallLatest
-            | Self::OpenMistralNemo
-            | Self::OpenCodestralMamba
-            | Self::DevstralMediumLatest
-            | Self::DevstralSmallLatest => false,
-            Self::Custom {
-                supports_images, ..
-            } => supports_images.unwrap_or(false),
-        }
-    }
-
-    pub fn supports_thinking(&self) -> bool {
-        match self {
-            Self::MagistralMediumLatest | Self::MagistralSmallLatest => true,
-            Self::Custom {
-                supports_thinking, ..
-            } => supports_thinking.unwrap_or(false),
-            _ => false,
-        }
-    }
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct Request {
-    pub model: String,
-    pub messages: Vec<RequestMessage>,
-    pub stream: bool,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub max_tokens: Option<u64>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub temperature: Option<f32>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub response_format: Option<ResponseFormat>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub tool_choice: Option<ToolChoice>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub parallel_tool_calls: Option<bool>,
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub tools: Vec<ToolDefinition>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum ResponseFormat {
-    Text,
-    #[serde(rename = "json_object")]
-    JsonObject,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(tag = "type", rename_all = "snake_case")]
-pub enum ToolDefinition {
-    Function { function: FunctionDefinition },
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct FunctionDefinition {
-    pub name: String,
-    pub description: Option<String>,
-    pub parameters: Option<Value>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "lowercase")]
-pub enum ToolChoice {
-    Auto,
-    Required,
-    None,
-    Any,
-    #[serde(untagged)]
-    Function(ToolDefinition),
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-#[serde(tag = "role", rename_all = "lowercase")]
-pub enum RequestMessage {
-    Assistant {
-        #[serde(flatten)]
-        #[serde(default, skip_serializing_if = "Option::is_none")]
-        content: Option<MessageContent>,
-        #[serde(default, skip_serializing_if = "Vec::is_empty")]
-        tool_calls: Vec<ToolCall>,
-    },
-    User {
-        #[serde(flatten)]
-        content: MessageContent,
-    },
-    System {
-        #[serde(flatten)]
-        content: MessageContent,
-    },
-    Tool {
-        content: String,
-        tool_call_id: String,
-    },
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)]
-#[serde(untagged)]
-pub enum MessageContent {
-    #[serde(rename = "content")]
-    Plain { content: String },
-    #[serde(rename = "content")]
-    Multipart { content: Vec<MessagePart> },
-}
-
-impl MessageContent {
-    pub fn empty() -> Self {
-        Self::Plain {
-            content: String::new(),
-        }
-    }
-
-    pub fn push_part(&mut self, part: MessagePart) {
-        match self {
-            Self::Plain { content } => match part {
-                MessagePart::Text { text } => {
-                    content.push_str(&text);
-                }
-                part => {
-                    let mut parts = if content.is_empty() {
-                        Vec::new()
-                    } else {
-                        vec![MessagePart::Text {
-                            text: content.clone(),
-                        }]
-                    };
-                    parts.push(part);
-                    *self = Self::Multipart { content: parts };
-                }
-            },
-            Self::Multipart { content } => {
-                content.push(part);
-            }
-        }
-    }
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)]
-#[serde(tag = "type", rename_all = "snake_case")]
-pub enum MessagePart {
-    Text { text: String },
-    ImageUrl { image_url: String },
-    Thinking { thinking: Vec<ThinkingPart> },
-}
-
-// Backwards-compatibility alias for provider code that refers to ContentPart
-pub type ContentPart = MessagePart;
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)]
-#[serde(tag = "type", rename_all = "snake_case")]
-pub enum ThinkingPart {
-    Text { text: String },
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-pub struct ToolCall {
-    pub id: String,
-    #[serde(flatten)]
-    pub content: ToolCallContent,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-#[serde(tag = "type", rename_all = "lowercase")]
-pub enum ToolCallContent {
-    Function { function: FunctionContent },
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-pub struct FunctionContent {
-    pub name: String,
-    pub arguments: String,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct Usage {
-    pub prompt_tokens: u64,
-    pub completion_tokens: u64,
-    pub total_tokens: u64,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct StreamResponse {
-    pub id: String,
-    pub object: String,
-    pub created: u64,
-    pub model: String,
-    pub choices: Vec<StreamChoice>,
-    pub usage: Option<Usage>,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct StreamChoice {
-    pub index: u32,
-    pub delta: StreamDelta,
-    pub finish_reason: Option<String>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct StreamDelta {
-    pub role: Option<Role>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub content: Option<MessageContentDelta>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub tool_calls: Option<Vec<ToolCallChunk>>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)]
-#[serde(untagged)]
-pub enum MessageContentDelta {
-    Text(String),
-    Parts(Vec<MessagePart>),
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)]
-pub struct ToolCallChunk {
-    pub index: usize,
-    pub id: Option<String>,
-    pub function: Option<FunctionChunk>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)]
-pub struct FunctionChunk {
-    pub name: Option<String>,
-    pub arguments: Option<String>,
-}
-
-pub async fn stream_completion(
-    client: &dyn HttpClient,
-    api_url: &str,
-    api_key: &str,
-    request: Request,
-) -> Result<BoxStream<'static, Result<StreamResponse>>> {
-    let uri = format!("{api_url}/chat/completions");
-    let request_builder = HttpRequest::builder()
-        .method(Method::POST)
-        .uri(uri)
-        .header("Content-Type", "application/json")
-        .header("Authorization", format!("Bearer {}", api_key.trim()));
-
-    let request = request_builder.body(AsyncBody::from(serde_json::to_string(&request)?))?;
-    let mut response = client.send(request).await?;
-
-    if response.status().is_success() {
-        let reader = BufReader::new(response.into_body());
-        Ok(reader
-            .lines()
-            .filter_map(|line| async move {
-                match line {
-                    Ok(line) => {
-                        let line = line.strip_prefix("data: ")?;
-                        if line == "[DONE]" {
-                            None
-                        } else {
-                            match serde_json::from_str(line) {
-                                Ok(response) => Some(Ok(response)),
-                                Err(error) => Some(Err(anyhow!(error))),
-                            }
-                        }
-                    }
-                    Err(error) => Some(Err(anyhow!(error))),
-                }
-            })
-            .boxed())
-    } else {
-        let mut body = String::new();
-        response.body_mut().read_to_string(&mut body).await?;
-        anyhow::bail!(
-            "Failed to connect to Mistral API: {} {}",
-            response.status(),
-            body,
-        );
-    }
-}
diff --git a/crates/multi_buffer/Cargo.toml b/crates/multi_buffer/Cargo.toml
deleted file mode 100644
index 524c916682..0000000000
--- a/crates/multi_buffer/Cargo.toml
+++ /dev/null
@@ -1,63 +0,0 @@
-[package]
-name = "multi_buffer"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/multi_buffer.rs"
-doctest = false
-
-[features]
-test-support = [
-    "buffer_diff/test-support",
-    "gpui/test-support",
-    "language/test-support",
-    "text/test-support",
-    "util/test-support",
-]
-
-[dependencies]
-anyhow.workspace = true
-clock.workspace = true
-collections.workspace = true
-ctor.workspace = true
-buffer_diff.workspace = true
-gpui.workspace = true
-itertools.workspace = true
-language.workspace = true
-log.workspace = true
-parking_lot.workspace = true
-rand.workspace = true
-rope.workspace = true
-smol.workspace = true
-settings.workspace = true
-serde.workspace = true
-smallvec.workspace = true
-sum_tree.workspace = true
-text.workspace = true
-theme.workspace = true
-tree-sitter.workspace = true
-ztracing.workspace = true
-tracing.workspace = true
-util.workspace = true
-
-[dev-dependencies]
-buffer_diff = { workspace = true, features = ["test-support"] }
-gpui = { workspace = true, features = ["test-support"] }
-indoc.workspace = true
-language = { workspace = true, features = ["test-support"] }
-pretty_assertions.workspace = true
-project = { workspace = true, features = ["test-support"] }
-rand.workspace = true
-settings = { workspace = true, features = ["test-support"] }
-text = { workspace = true, features = ["test-support"] }
-util = { workspace = true, features = ["test-support"] }
-zlog.workspace = true
-
-[package.metadata.cargo-machete]
-ignored = ["tracing"]
diff --git a/crates/multi_buffer/LICENSE-GPL b/crates/multi_buffer/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/multi_buffer/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/multi_buffer/src/anchor.rs b/crates/multi_buffer/src/anchor.rs
deleted file mode 100644
index 51696ba09e..0000000000
--- a/crates/multi_buffer/src/anchor.rs
+++ /dev/null
@@ -1,257 +0,0 @@
-use crate::{MultiBufferDimension, MultiBufferOffset, MultiBufferOffsetUtf16};
-
-use super::{ExcerptId, MultiBufferSnapshot, ToOffset, ToPoint};
-use language::Point;
-use std::{
-    cmp::Ordering,
-    ops::{AddAssign, Range, Sub},
-};
-use sum_tree::Bias;
-
-#[derive(Clone, Copy, Eq, PartialEq, Hash)]
-pub struct Anchor {
-    pub excerpt_id: ExcerptId,
-    pub text_anchor: text::Anchor,
-    pub diff_base_anchor: Option<text::Anchor>,
-}
-
-impl std::fmt::Debug for Anchor {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        if self.is_min() {
-            return write!(f, "Anchor::min({:?})", self.text_anchor.buffer_id);
-        }
-        if self.is_max() {
-            return write!(f, "Anchor::max({:?})", self.text_anchor.buffer_id);
-        }
-
-        f.debug_struct("Anchor")
-            .field("excerpt_id", &self.excerpt_id)
-            .field("text_anchor", &self.text_anchor)
-            .field("diff_base_anchor", &self.diff_base_anchor)
-            .finish()
-    }
-}
-
-impl Anchor {
-    pub fn with_diff_base_anchor(self, diff_base_anchor: text::Anchor) -> Self {
-        Self {
-            diff_base_anchor: Some(diff_base_anchor),
-            ..self
-        }
-    }
-
-    pub fn in_buffer(excerpt_id: ExcerptId, text_anchor: text::Anchor) -> Self {
-        Self {
-            excerpt_id,
-            text_anchor,
-            diff_base_anchor: None,
-        }
-    }
-
-    pub fn range_in_buffer(excerpt_id: ExcerptId, range: Range<text::Anchor>) -> Range<Self> {
-        Self::in_buffer(excerpt_id, range.start)..Self::in_buffer(excerpt_id, range.end)
-    }
-
-    pub fn min() -> Self {
-        Self {
-            excerpt_id: ExcerptId::min(),
-            text_anchor: text::Anchor::MIN,
-            diff_base_anchor: None,
-        }
-    }
-
-    pub fn max() -> Self {
-        Self {
-            excerpt_id: ExcerptId::max(),
-            text_anchor: text::Anchor::MAX,
-            diff_base_anchor: None,
-        }
-    }
-
-    pub fn is_min(&self) -> bool {
-        self.excerpt_id == ExcerptId::min()
-            && self.text_anchor.is_min()
-            && self.diff_base_anchor.is_none()
-    }
-
-    pub fn is_max(&self) -> bool {
-        self.excerpt_id == ExcerptId::max()
-            && self.text_anchor.is_max()
-            && self.diff_base_anchor.is_none()
-    }
-
-    pub fn cmp(&self, other: &Anchor, snapshot: &MultiBufferSnapshot) -> Ordering {
-        if self == other {
-            return Ordering::Equal;
-        }
-
-        let self_excerpt_id = snapshot.latest_excerpt_id(self.excerpt_id);
-        let other_excerpt_id = snapshot.latest_excerpt_id(other.excerpt_id);
-
-        let excerpt_id_cmp = self_excerpt_id.cmp(&other_excerpt_id, snapshot);
-        if excerpt_id_cmp.is_ne() {
-            return excerpt_id_cmp;
-        }
-        if self_excerpt_id == ExcerptId::max()
-            && self.text_anchor.is_max()
-            && self.text_anchor.is_max()
-            && self.diff_base_anchor.is_none()
-            && other.diff_base_anchor.is_none()
-        {
-            return Ordering::Equal;
-        }
-        if let Some(excerpt) = snapshot.excerpt(self_excerpt_id) {
-            let text_cmp = self.text_anchor.cmp(&other.text_anchor, &excerpt.buffer);
-            if text_cmp.is_ne() {
-                return text_cmp;
-            }
-            if (self.diff_base_anchor.is_some() || other.diff_base_anchor.is_some())
-                && let Some(base_text) = snapshot
-                    .diffs
-                    .get(&excerpt.buffer_id)
-                    .map(|diff| diff.base_text())
-            {
-                let self_anchor = self.diff_base_anchor.filter(|a| base_text.can_resolve(a));
-                let other_anchor = other.diff_base_anchor.filter(|a| base_text.can_resolve(a));
-                return match (self_anchor, other_anchor) {
-                    (Some(a), Some(b)) => a.cmp(&b, base_text),
-                    (Some(_), None) => match other.text_anchor.bias {
-                        Bias::Left => Ordering::Greater,
-                        Bias::Right => Ordering::Less,
-                    },
-                    (None, Some(_)) => match self.text_anchor.bias {
-                        Bias::Left => Ordering::Less,
-                        Bias::Right => Ordering::Greater,
-                    },
-                    (None, None) => Ordering::Equal,
-                };
-            }
-        }
-        Ordering::Equal
-    }
-
-    pub fn bias(&self) -> Bias {
-        self.text_anchor.bias
-    }
-
-    pub fn bias_left(&self, snapshot: &MultiBufferSnapshot) -> Anchor {
-        if self.text_anchor.bias != Bias::Left
-            && let Some(excerpt) = snapshot.excerpt(self.excerpt_id)
-        {
-            return Self {
-                excerpt_id: excerpt.id,
-                text_anchor: self.text_anchor.bias_left(&excerpt.buffer),
-                diff_base_anchor: self.diff_base_anchor.map(|a| {
-                    if let Some(base_text) = snapshot
-                        .diffs
-                        .get(&excerpt.buffer_id)
-                        .map(|diff| diff.base_text())
-                        && a.buffer_id == Some(base_text.remote_id())
-                    {
-                        return a.bias_left(base_text);
-                    }
-                    a
-                }),
-            };
-        }
-        *self
-    }
-
-    pub fn bias_right(&self, snapshot: &MultiBufferSnapshot) -> Anchor {
-        if self.text_anchor.bias != Bias::Right
-            && let Some(excerpt) = snapshot.excerpt(self.excerpt_id)
-        {
-            return Self {
-                excerpt_id: excerpt.id,
-                text_anchor: self.text_anchor.bias_right(&excerpt.buffer),
-                diff_base_anchor: self.diff_base_anchor.map(|a| {
-                    if let Some(base_text) = snapshot
-                        .diffs
-                        .get(&excerpt.buffer_id)
-                        .map(|diff| diff.base_text())
-                        && a.buffer_id == Some(base_text.remote_id())
-                    {
-                        return a.bias_right(base_text);
-                    }
-                    a
-                }),
-            };
-        }
-        *self
-    }
-
-    pub fn summary<D>(&self, snapshot: &MultiBufferSnapshot) -> D
-    where
-        D: MultiBufferDimension
-            + Ord
-            + Sub<Output = D::TextDimension>
-            + AddAssign<D::TextDimension>,
-        D::TextDimension: Sub<Output = D::TextDimension> + Ord,
-    {
-        snapshot.summary_for_anchor(self)
-    }
-
-    pub fn is_valid(&self, snapshot: &MultiBufferSnapshot) -> bool {
-        if self.is_min() || self.is_max() {
-            true
-        } else if let Some(excerpt) = snapshot.excerpt(self.excerpt_id) {
-            (self.text_anchor == excerpt.range.context.start
-                || self.text_anchor == excerpt.range.context.end
-                || self.text_anchor.is_valid(&excerpt.buffer))
-                && excerpt.contains(self)
-        } else {
-            false
-        }
-    }
-}
-
-impl ToOffset for Anchor {
-    fn to_offset(&self, snapshot: &MultiBufferSnapshot) -> MultiBufferOffset {
-        self.summary(snapshot)
-    }
-    fn to_offset_utf16(&self, snapshot: &MultiBufferSnapshot) -> MultiBufferOffsetUtf16 {
-        self.summary(snapshot)
-    }
-}
-
-impl ToPoint for Anchor {
-    fn to_point<'a>(&self, snapshot: &MultiBufferSnapshot) -> Point {
-        self.summary(snapshot)
-    }
-    fn to_point_utf16(&self, snapshot: &MultiBufferSnapshot) -> rope::PointUtf16 {
-        self.summary(snapshot)
-    }
-}
-
-pub trait AnchorRangeExt {
-    fn cmp(&self, other: &Range<Anchor>, buffer: &MultiBufferSnapshot) -> Ordering;
-    fn includes(&self, other: &Range<Anchor>, buffer: &MultiBufferSnapshot) -> bool;
-    fn overlaps(&self, other: &Range<Anchor>, buffer: &MultiBufferSnapshot) -> bool;
-    fn to_offset(&self, content: &MultiBufferSnapshot) -> Range<MultiBufferOffset>;
-    fn to_point(&self, content: &MultiBufferSnapshot) -> Range<Point>;
-}
-
-impl AnchorRangeExt for Range<Anchor> {
-    fn cmp(&self, other: &Range<Anchor>, buffer: &MultiBufferSnapshot) -> Ordering {
-        match self.start.cmp(&other.start, buffer) {
-            Ordering::Equal => other.end.cmp(&self.end, buffer),
-            ord => ord,
-        }
-    }
-
-    fn includes(&self, other: &Range<Anchor>, buffer: &MultiBufferSnapshot) -> bool {
-        self.start.cmp(&other.start, buffer).is_le() && other.end.cmp(&self.end, buffer).is_le()
-    }
-
-    fn overlaps(&self, other: &Range<Anchor>, buffer: &MultiBufferSnapshot) -> bool {
-        self.end.cmp(&other.start, buffer).is_ge() && self.start.cmp(&other.end, buffer).is_le()
-    }
-
-    fn to_offset(&self, content: &MultiBufferSnapshot) -> Range<MultiBufferOffset> {
-        self.start.to_offset(content)..self.end.to_offset(content)
-    }
-
-    fn to_point(&self, content: &MultiBufferSnapshot) -> Range<Point> {
-        self.start.to_point(content)..self.end.to_point(content)
-    }
-}
diff --git a/crates/multi_buffer/src/multi_buffer.rs b/crates/multi_buffer/src/multi_buffer.rs
deleted file mode 100644
index 5b343ecc57..0000000000
--- a/crates/multi_buffer/src/multi_buffer.rs
+++ /dev/null
@@ -1,8227 +0,0 @@
-mod anchor;
-#[cfg(test)]
-mod multi_buffer_tests;
-mod path_key;
-mod transaction;
-
-use self::transaction::History;
-
-pub use anchor::{Anchor, AnchorRangeExt};
-
-use anyhow::{Result, anyhow};
-use buffer_diff::{
-    BufferDiff, BufferDiffEvent, BufferDiffSnapshot, DiffHunkSecondaryStatus, DiffHunkStatus,
-    DiffHunkStatusKind,
-};
-use clock::ReplicaId;
-use collections::{BTreeMap, Bound, HashMap, HashSet};
-use gpui::{App, Context, Entity, EntityId, EventEmitter};
-use itertools::Itertools;
-use language::{
-    AutoindentMode, BracketMatch, Buffer, BufferChunks, BufferRow, BufferSnapshot, Capability,
-    CharClassifier, CharKind, CharScopeContext, Chunk, CursorShape, DiagnosticEntryRef, DiskState,
-    File, IndentGuideSettings, IndentSize, Language, LanguageScope, OffsetRangeExt, OffsetUtf16,
-    Outline, OutlineItem, Point, PointUtf16, Selection, TextDimension, TextObject, ToOffset as _,
-    ToPoint as _, TransactionId, TreeSitterOptions, Unclipped,
-    language_settings::{LanguageSettings, language_settings},
-};
-
-#[cfg(any(test, feature = "test-support"))]
-use gpui::AppContext as _;
-
-use rope::DimensionPair;
-use smallvec::SmallVec;
-use smol::future::yield_now;
-use std::{
-    any::type_name,
-    borrow::Cow,
-    cell::{Cell, Ref, RefCell},
-    cmp,
-    collections::VecDeque,
-    fmt::{self, Debug},
-    future::Future,
-    io,
-    iter::{self, FromIterator},
-    mem,
-    ops::{self, AddAssign, ControlFlow, Range, RangeBounds, Sub, SubAssign},
-    rc::Rc,
-    str,
-    sync::Arc,
-    time::Duration,
-};
-use sum_tree::{Bias, Cursor, Dimension, Dimensions, SumTree, TreeMap};
-use text::{
-    BufferId, Edit, LineIndent, TextSummary,
-    locator::Locator,
-    subscription::{Subscription, Topic},
-};
-use theme::SyntaxTheme;
-use util::post_inc;
-use ztracing::instrument;
-
-pub use self::path_key::PathKey;
-
-#[derive(Debug, Default, Clone, Copy, Hash, PartialEq, Eq, PartialOrd, Ord)]
-pub struct ExcerptId(u32);
-
-#[derive(Debug, Default, Clone, Copy, Hash, PartialEq, Eq, PartialOrd, Ord)]
-pub struct BaseTextRow(pub u32);
-
-/// One or more [`Buffers`](Buffer) being edited in a single view.
-///
-/// See <https://zed.dev/features#multi-buffers>
-pub struct MultiBuffer {
-    /// A snapshot of the [`Excerpt`]s in the MultiBuffer.
-    /// Use [`MultiBuffer::snapshot`] to get a up-to-date snapshot.
-    snapshot: RefCell<MultiBufferSnapshot>,
-    /// Contains the state of the buffers being edited
-    buffers: HashMap<BufferId, BufferState>,
-    /// Mapping from path keys to their excerpts.
-    excerpts_by_path: BTreeMap<PathKey, Vec<ExcerptId>>,
-    /// Mapping from excerpt IDs to their path key.
-    paths_by_excerpt: HashMap<ExcerptId, PathKey>,
-    /// Mapping from buffer IDs to their diff states
-    diffs: HashMap<BufferId, DiffState>,
-    subscriptions: Topic<MultiBufferOffset>,
-    /// If true, the multi-buffer only contains a single [`Buffer`] and a single [`Excerpt`]
-    singleton: bool,
-    /// The history of the multi-buffer.
-    history: History,
-    /// The explicit title of the multi-buffer.
-    /// If `None`, it will be derived from the underlying path or content.
-    title: Option<String>,
-    /// The writing capability of the multi-buffer.
-    capability: Capability,
-    buffer_changed_since_sync: Rc<Cell<bool>>,
-    follower: Option<Entity<MultiBuffer>>,
-    filter_mode: Option<MultiBufferFilterMode>,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum MultiBufferFilterMode {
-    KeepInsertions,
-    KeepDeletions,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum Event {
-    ExcerptsAdded {
-        buffer: Entity<Buffer>,
-        predecessor: ExcerptId,
-        excerpts: Vec<(ExcerptId, ExcerptRange<language::Anchor>)>,
-    },
-    ExcerptsRemoved {
-        ids: Vec<ExcerptId>,
-        removed_buffer_ids: Vec<BufferId>,
-    },
-    ExcerptsExpanded {
-        ids: Vec<ExcerptId>,
-    },
-    ExcerptsEdited {
-        excerpt_ids: Vec<ExcerptId>,
-        buffer_ids: Vec<BufferId>,
-    },
-    DiffHunksToggled,
-    Edited {
-        edited_buffer: Option<Entity<Buffer>>,
-    },
-    TransactionUndone {
-        transaction_id: TransactionId,
-    },
-    Reloaded,
-    LanguageChanged(BufferId, bool),
-    Reparsed(BufferId),
-    Saved,
-    FileHandleChanged,
-    DirtyChanged,
-    DiagnosticsUpdated,
-    BufferDiffChanged,
-}
-
-/// A diff hunk, representing a range of consequent lines in a multibuffer.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct MultiBufferDiffHunk {
-    /// The row range in the multibuffer where this diff hunk appears.
-    pub row_range: Range<MultiBufferRow>,
-    /// The buffer ID that this hunk belongs to.
-    pub buffer_id: BufferId,
-    /// The range of the underlying buffer that this hunk corresponds to.
-    pub buffer_range: Range<text::Anchor>,
-    /// The excerpt that contains the diff hunk.
-    pub excerpt_id: ExcerptId,
-    /// The range within the buffer's diff base that this hunk corresponds to.
-    pub diff_base_byte_range: Range<BufferOffset>,
-    /// Whether or not this hunk also appears in the 'secondary diff'.
-    pub secondary_status: DiffHunkSecondaryStatus,
-    /// The word diffs for this hunk.
-    pub word_diffs: Vec<Range<MultiBufferOffset>>,
-}
-
-impl MultiBufferDiffHunk {
-    pub fn status(&self) -> DiffHunkStatus {
-        let kind = if self.buffer_range.start == self.buffer_range.end {
-            DiffHunkStatusKind::Deleted
-        } else if self.diff_base_byte_range.is_empty() {
-            DiffHunkStatusKind::Added
-        } else {
-            DiffHunkStatusKind::Modified
-        };
-        DiffHunkStatus {
-            kind,
-            secondary: self.secondary_status,
-        }
-    }
-
-    pub fn is_created_file(&self) -> bool {
-        self.diff_base_byte_range == (BufferOffset(0)..BufferOffset(0))
-            && self.buffer_range.start.is_min()
-            && self.buffer_range.end.is_max()
-    }
-
-    pub fn multi_buffer_range(&self) -> Range<Anchor> {
-        let start = Anchor::in_buffer(self.excerpt_id, self.buffer_range.start);
-        let end = Anchor::in_buffer(self.excerpt_id, self.buffer_range.end);
-        start..end
-    }
-}
-
-pub type MultiBufferPoint = Point;
-type ExcerptOffset = ExcerptDimension<MultiBufferOffset>;
-type ExcerptPoint = ExcerptDimension<Point>;
-
-#[derive(Copy, Clone, Debug, Default, Eq, Ord, PartialOrd, PartialEq, Hash, serde::Deserialize)]
-#[serde(transparent)]
-pub struct MultiBufferRow(pub u32);
-
-impl MultiBufferRow {
-    pub const MIN: Self = Self(0);
-    pub const MAX: Self = Self(u32::MAX);
-}
-
-impl ops::Add<usize> for MultiBufferRow {
-    type Output = Self;
-
-    fn add(self, rhs: usize) -> Self::Output {
-        MultiBufferRow(self.0 + rhs as u32)
-    }
-}
-
-pub trait MultiBufferDimension: 'static + Copy + Default + std::fmt::Debug {
-    type TextDimension: TextDimension;
-    fn from_summary(summary: &MBTextSummary) -> Self;
-
-    fn add_text_dim(&mut self, summary: &Self::TextDimension);
-
-    fn add_mb_text_summary(&mut self, summary: &MBTextSummary);
-}
-
-// todo(lw): MultiBufferPoint
-impl MultiBufferDimension for Point {
-    type TextDimension = Point;
-    fn from_summary(summary: &MBTextSummary) -> Self {
-        summary.lines
-    }
-
-    fn add_text_dim(&mut self, other: &Self::TextDimension) {
-        *self += *other;
-    }
-
-    fn add_mb_text_summary(&mut self, summary: &MBTextSummary) {
-        *self += summary.lines;
-    }
-}
-
-// todo(lw): MultiBufferPointUtf16
-impl MultiBufferDimension for PointUtf16 {
-    type TextDimension = PointUtf16;
-    fn from_summary(summary: &MBTextSummary) -> Self {
-        summary.lines_utf16()
-    }
-
-    fn add_text_dim(&mut self, other: &Self::TextDimension) {
-        *self += *other;
-    }
-
-    fn add_mb_text_summary(&mut self, summary: &MBTextSummary) {
-        *self += summary.lines_utf16();
-    }
-}
-
-#[derive(Copy, Clone, Debug, Default, Eq, Ord, PartialOrd, PartialEq, Hash, serde::Deserialize)]
-pub struct MultiBufferOffset(pub usize);
-
-impl fmt::Display for MultiBufferOffset {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
-impl rand::distr::uniform::SampleUniform for MultiBufferOffset {
-    type Sampler = MultiBufferOffsetUniformSampler;
-}
-
-pub struct MultiBufferOffsetUniformSampler {
-    sampler: rand::distr::uniform::UniformUsize,
-}
-
-impl rand::distr::uniform::UniformSampler for MultiBufferOffsetUniformSampler {
-    type X = MultiBufferOffset;
-
-    fn new<B1, B2>(low_b: B1, high_b: B2) -> Result<Self, rand::distr::uniform::Error>
-    where
-        B1: rand::distr::uniform::SampleBorrow<Self::X> + Sized,
-        B2: rand::distr::uniform::SampleBorrow<Self::X> + Sized,
-    {
-        let low = *low_b.borrow();
-        let high = *high_b.borrow();
-        let sampler = rand::distr::uniform::UniformUsize::new(low.0, high.0);
-        sampler.map(|sampler| MultiBufferOffsetUniformSampler { sampler })
-    }
-
-    #[inline] // if the range is constant, this helps LLVM to do the
-    // calculations at compile-time.
-    fn new_inclusive<B1, B2>(low_b: B1, high_b: B2) -> Result<Self, rand::distr::uniform::Error>
-    where
-        B1: rand::distr::uniform::SampleBorrow<Self::X> + Sized,
-        B2: rand::distr::uniform::SampleBorrow<Self::X> + Sized,
-    {
-        let low = *low_b.borrow();
-        let high = *high_b.borrow();
-        let sampler = rand::distr::uniform::UniformUsize::new_inclusive(low.0, high.0);
-        sampler.map(|sampler| MultiBufferOffsetUniformSampler { sampler })
-    }
-
-    fn sample<R: rand::Rng + ?Sized>(&self, rng: &mut R) -> Self::X {
-        MultiBufferOffset(self.sampler.sample(rng))
-    }
-}
-impl MultiBufferDimension for MultiBufferOffset {
-    type TextDimension = usize;
-    fn from_summary(summary: &MBTextSummary) -> Self {
-        summary.len
-    }
-
-    fn add_text_dim(&mut self, other: &Self::TextDimension) {
-        self.0 += *other;
-    }
-
-    fn add_mb_text_summary(&mut self, summary: &MBTextSummary) {
-        *self += summary.len;
-    }
-}
-impl MultiBufferDimension for MultiBufferOffsetUtf16 {
-    type TextDimension = OffsetUtf16;
-    fn from_summary(summary: &MBTextSummary) -> Self {
-        MultiBufferOffsetUtf16(summary.len_utf16)
-    }
-
-    fn add_text_dim(&mut self, other: &Self::TextDimension) {
-        self.0 += *other;
-    }
-
-    fn add_mb_text_summary(&mut self, summary: &MBTextSummary) {
-        self.0 += summary.len_utf16;
-    }
-}
-
-#[derive(Copy, Clone, Debug, Default, Eq, Ord, PartialOrd, PartialEq, Hash, serde::Deserialize)]
-pub struct BufferOffset(pub usize);
-
-impl TextDimension for BufferOffset {
-    fn from_text_summary(summary: &TextSummary) -> Self {
-        BufferOffset(usize::from_text_summary(summary))
-    }
-    fn from_chunk(chunk: rope::ChunkSlice) -> Self {
-        BufferOffset(usize::from_chunk(chunk))
-    }
-    fn add_assign(&mut self, other: &Self) {
-        TextDimension::add_assign(&mut self.0, &other.0);
-    }
-}
-impl<'a> sum_tree::Dimension<'a, rope::ChunkSummary> for BufferOffset {
-    fn zero(cx: ()) -> Self {
-        BufferOffset(<usize as sum_tree::Dimension<'a, rope::ChunkSummary>>::zero(cx))
-    }
-
-    fn add_summary(&mut self, summary: &'a rope::ChunkSummary, cx: ()) {
-        usize::add_summary(&mut self.0, summary, cx);
-    }
-}
-
-impl Sub for BufferOffset {
-    type Output = usize;
-
-    fn sub(self, other: BufferOffset) -> Self::Output {
-        self.0 - other.0
-    }
-}
-
-impl AddAssign<DimensionPair<usize, Point>> for BufferOffset {
-    fn add_assign(&mut self, other: DimensionPair<usize, Point>) {
-        self.0 += other.key;
-    }
-}
-
-impl language::ToPoint for BufferOffset {
-    fn to_point(&self, snapshot: &text::BufferSnapshot) -> Point {
-        self.0.to_point(snapshot)
-    }
-}
-
-impl language::ToPointUtf16 for BufferOffset {
-    fn to_point_utf16(&self, snapshot: &text::BufferSnapshot) -> PointUtf16 {
-        self.0.to_point_utf16(snapshot)
-    }
-}
-
-impl language::ToOffset for BufferOffset {
-    fn to_offset(&self, snapshot: &text::BufferSnapshot) -> usize {
-        self.0.to_offset(snapshot)
-    }
-}
-
-impl language::ToOffsetUtf16 for BufferOffset {
-    fn to_offset_utf16(&self, snapshot: &text::BufferSnapshot) -> OffsetUtf16 {
-        self.0.to_offset_utf16(snapshot)
-    }
-}
-
-#[derive(Copy, Clone, Debug, Default, Eq, Ord, PartialOrd, PartialEq)]
-pub struct MultiBufferOffsetUtf16(pub OffsetUtf16);
-
-impl ops::Add<usize> for MultiBufferOffsetUtf16 {
-    type Output = MultiBufferOffsetUtf16;
-
-    fn add(self, rhs: usize) -> Self::Output {
-        MultiBufferOffsetUtf16(OffsetUtf16(self.0.0 + rhs))
-    }
-}
-
-impl AddAssign<OffsetUtf16> for MultiBufferOffsetUtf16 {
-    fn add_assign(&mut self, rhs: OffsetUtf16) {
-        self.0 += rhs;
-    }
-}
-
-impl AddAssign<usize> for MultiBufferOffsetUtf16 {
-    fn add_assign(&mut self, rhs: usize) {
-        self.0.0 += rhs;
-    }
-}
-
-impl Sub for MultiBufferOffsetUtf16 {
-    type Output = OffsetUtf16;
-
-    fn sub(self, other: MultiBufferOffsetUtf16) -> Self::Output {
-        self.0 - other.0
-    }
-}
-
-#[derive(Copy, Clone, Debug, Default, Eq, Ord, PartialOrd, PartialEq)]
-pub struct BufferOffsetUtf16(pub OffsetUtf16);
-
-impl MultiBufferOffset {
-    const ZERO: Self = Self(0);
-    pub fn saturating_sub(self, other: MultiBufferOffset) -> usize {
-        self.0.saturating_sub(other.0)
-    }
-    pub fn saturating_sub_usize(self, other: usize) -> MultiBufferOffset {
-        MultiBufferOffset(self.0.saturating_sub(other))
-    }
-}
-
-impl ops::Sub for MultiBufferOffset {
-    type Output = usize;
-
-    fn sub(self, other: MultiBufferOffset) -> Self::Output {
-        self.0 - other.0
-    }
-}
-
-impl ops::Sub<usize> for MultiBufferOffset {
-    type Output = Self;
-
-    fn sub(self, other: usize) -> Self::Output {
-        MultiBufferOffset(self.0 - other)
-    }
-}
-
-impl ops::SubAssign<usize> for MultiBufferOffset {
-    fn sub_assign(&mut self, other: usize) {
-        self.0 -= other;
-    }
-}
-
-impl ops::Add<usize> for BufferOffset {
-    type Output = Self;
-
-    fn add(self, rhs: usize) -> Self::Output {
-        BufferOffset(self.0 + rhs)
-    }
-}
-
-impl ops::AddAssign<usize> for BufferOffset {
-    fn add_assign(&mut self, other: usize) {
-        self.0 += other;
-    }
-}
-
-impl ops::Add<usize> for MultiBufferOffset {
-    type Output = Self;
-
-    fn add(self, rhs: usize) -> Self::Output {
-        MultiBufferOffset(self.0 + rhs)
-    }
-}
-
-impl ops::AddAssign<usize> for MultiBufferOffset {
-    fn add_assign(&mut self, other: usize) {
-        self.0 += other;
-    }
-}
-
-impl ops::Add<isize> for MultiBufferOffset {
-    type Output = Self;
-
-    fn add(self, rhs: isize) -> Self::Output {
-        MultiBufferOffset((self.0 as isize + rhs) as usize)
-    }
-}
-
-impl ops::Add for MultiBufferOffset {
-    type Output = Self;
-
-    fn add(self, rhs: MultiBufferOffset) -> Self::Output {
-        MultiBufferOffset(self.0 + rhs.0)
-    }
-}
-
-impl ops::AddAssign<MultiBufferOffset> for MultiBufferOffset {
-    fn add_assign(&mut self, other: MultiBufferOffset) {
-        self.0 += other.0;
-    }
-}
-
-pub trait ToOffset: 'static + fmt::Debug {
-    fn to_offset(&self, snapshot: &MultiBufferSnapshot) -> MultiBufferOffset;
-    fn to_offset_utf16(&self, snapshot: &MultiBufferSnapshot) -> MultiBufferOffsetUtf16;
-}
-
-pub trait ToPoint: 'static + fmt::Debug {
-    fn to_point(&self, snapshot: &MultiBufferSnapshot) -> Point;
-    fn to_point_utf16(&self, snapshot: &MultiBufferSnapshot) -> PointUtf16;
-}
-
-struct BufferState {
-    buffer: Entity<Buffer>,
-    last_version: RefCell<clock::Global>,
-    last_non_text_state_update_count: Cell<usize>,
-    excerpts: Vec<Locator>,
-    _subscriptions: [gpui::Subscription; 2],
-}
-
-struct DiffState {
-    diff: Entity<BufferDiff>,
-    _subscription: gpui::Subscription,
-}
-
-impl DiffState {
-    fn new(diff: Entity<BufferDiff>, cx: &mut Context<MultiBuffer>) -> Self {
-        DiffState {
-            _subscription: cx.subscribe(&diff, |this, diff, event, cx| match event {
-                BufferDiffEvent::DiffChanged { changed_range } => {
-                    if let Some(changed_range) = changed_range.clone() {
-                        this.buffer_diff_changed(diff, changed_range, cx)
-                    }
-                    cx.emit(Event::BufferDiffChanged);
-                }
-                BufferDiffEvent::LanguageChanged => this.buffer_diff_language_changed(diff, cx),
-                _ => {}
-            }),
-            diff,
-        }
-    }
-}
-
-/// The contents of a [`MultiBuffer`] at a single point in time.
-#[derive(Clone, Default)]
-pub struct MultiBufferSnapshot {
-    excerpts: SumTree<Excerpt>,
-    diffs: TreeMap<BufferId, BufferDiffSnapshot>,
-    diff_transforms: SumTree<DiffTransform>,
-    non_text_state_update_count: usize,
-    edit_count: usize,
-    is_dirty: bool,
-    has_deleted_file: bool,
-    has_conflict: bool,
-    /// immutable fields
-    singleton: bool,
-    excerpt_ids: SumTree<ExcerptIdMapping>,
-    replaced_excerpts: TreeMap<ExcerptId, ExcerptId>,
-    trailing_excerpt_update_count: usize,
-    all_diff_hunks_expanded: bool,
-    show_headers: bool,
-}
-
-#[derive(Debug, Clone)]
-/// A piece of text in the multi-buffer
-enum DiffTransform {
-    Unmodified {
-        summary: MBTextSummary,
-    },
-    InsertedHunk {
-        summary: MBTextSummary,
-        hunk_info: DiffTransformHunkInfo,
-    },
-    FilteredInsertedHunk {
-        summary: MBTextSummary,
-        hunk_info: DiffTransformHunkInfo,
-    },
-    DeletedHunk {
-        summary: TextSummary,
-        buffer_id: BufferId,
-        hunk_info: DiffTransformHunkInfo,
-        has_trailing_newline: bool,
-    },
-}
-
-#[derive(Clone, Debug)]
-struct DiffTransformHunkInfo {
-    excerpt_id: ExcerptId,
-    hunk_start_anchor: text::Anchor,
-    hunk_secondary_status: DiffHunkSecondaryStatus,
-    base_text_byte_range: Range<usize>,
-}
-
-impl Eq for DiffTransformHunkInfo {}
-
-impl PartialEq for DiffTransformHunkInfo {
-    fn eq(&self, other: &DiffTransformHunkInfo) -> bool {
-        self.excerpt_id == other.excerpt_id && self.hunk_start_anchor == other.hunk_start_anchor
-    }
-}
-
-impl std::hash::Hash for DiffTransformHunkInfo {
-    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-        self.excerpt_id.hash(state);
-        self.hunk_start_anchor.hash(state);
-    }
-}
-
-#[derive(Clone)]
-pub struct ExcerptInfo {
-    pub id: ExcerptId,
-    pub buffer: BufferSnapshot,
-    pub buffer_id: BufferId,
-    pub range: ExcerptRange<text::Anchor>,
-    pub end_row: MultiBufferRow,
-}
-
-/// Used with [`MultiBuffer::push_buffer_content_transform`]
-#[derive(Clone, Debug)]
-struct CurrentInsertedHunk {
-    hunk_excerpt_start: ExcerptOffset,
-    insertion_end_offset: ExcerptOffset,
-    hunk_info: DiffTransformHunkInfo,
-    is_filtered: bool,
-}
-
-impl std::fmt::Debug for ExcerptInfo {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct(type_name::<Self>())
-            .field("id", &self.id)
-            .field("buffer_id", &self.buffer_id)
-            .field("path", &self.buffer.file().map(|f| f.path()))
-            .field("range", &self.range)
-            .finish()
-    }
-}
-
-/// A boundary between `Excerpt`s in a [`MultiBuffer`]
-#[derive(Debug)]
-pub struct ExcerptBoundary {
-    pub prev: Option<ExcerptInfo>,
-    pub next: ExcerptInfo,
-    /// The row in the `MultiBuffer` where the boundary is located
-    pub row: MultiBufferRow,
-}
-
-impl ExcerptBoundary {
-    pub fn starts_new_buffer(&self) -> bool {
-        match (self.prev.as_ref(), &self.next) {
-            (None, _) => true,
-            (Some(prev), next) => prev.buffer_id != next.buffer_id,
-        }
-    }
-}
-
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub struct ExpandInfo {
-    pub direction: ExpandExcerptDirection,
-    pub excerpt_id: ExcerptId,
-}
-
-#[derive(Copy, Clone, Debug, Default, PartialEq, Eq)]
-pub struct RowInfo {
-    pub buffer_id: Option<BufferId>,
-    pub buffer_row: Option<u32>,
-    pub base_text_row: Option<BaseTextRow>,
-    pub multibuffer_row: Option<MultiBufferRow>,
-    pub diff_status: Option<buffer_diff::DiffHunkStatus>,
-    pub expand_info: Option<ExpandInfo>,
-    pub wrapped_buffer_row: Option<u32>,
-}
-
-/// A slice into a [`Buffer`] that is being edited in a [`MultiBuffer`].
-#[derive(Clone)]
-struct Excerpt {
-    /// The unique identifier for this excerpt
-    id: ExcerptId,
-    /// The location of the excerpt in the [`MultiBuffer`]
-    locator: Locator,
-    /// The buffer being excerpted
-    buffer_id: BufferId,
-    /// A snapshot of the buffer being excerpted
-    buffer: BufferSnapshot,
-    /// The range of the buffer to be shown in the excerpt
-    range: ExcerptRange<text::Anchor>,
-    /// The last row in the excerpted slice of the buffer
-    max_buffer_row: BufferRow,
-    /// A summary of the text in the excerpt
-    text_summary: TextSummary,
-    has_trailing_newline: bool,
-}
-
-/// A public view into an `Excerpt` in a [`MultiBuffer`].
-///
-/// Contains methods for getting the [`Buffer`] of the excerpt,
-/// as well as mapping offsets to/from buffer and multibuffer coordinates.
-#[derive(Clone)]
-pub struct MultiBufferExcerpt<'a> {
-    excerpt: &'a Excerpt,
-    diff_transforms:
-        sum_tree::Cursor<'a, 'static, DiffTransform, DiffTransforms<MultiBufferOffset>>,
-    /// The offset in the multibuffer considering diff transforms.
-    offset: MultiBufferOffset,
-    /// The offset in the multibuffer without diff transforms.
-    excerpt_offset: ExcerptOffset,
-    buffer_offset: BufferOffset,
-}
-
-#[derive(Clone, Debug)]
-struct ExcerptIdMapping {
-    id: ExcerptId,
-    locator: Locator,
-}
-
-/// A range of text from a single [`Buffer`], to be shown as an `Excerpt`.
-/// These ranges are relative to the buffer itself
-#[derive(Clone, Debug, Eq, PartialEq, Hash)]
-pub struct ExcerptRange<T> {
-    /// The full range of text to be shown in the excerpt.
-    pub context: Range<T>,
-    /// The primary range of text to be highlighted in the excerpt.
-    /// In a multi-buffer search, this would be the text that matched the search
-    pub primary: Range<T>,
-}
-
-impl<T: Clone> ExcerptRange<T> {
-    pub fn new(context: Range<T>) -> Self {
-        Self {
-            context: context.clone(),
-            primary: context,
-        }
-    }
-}
-
-#[derive(Clone, Debug, Default)]
-pub struct ExcerptSummary {
-    excerpt_id: ExcerptId,
-    /// The location of the last [`Excerpt`] being summarized
-    excerpt_locator: Locator,
-    widest_line_number: u32,
-    text: MBTextSummary,
-}
-
-#[derive(Debug, Clone)]
-pub struct DiffTransformSummary {
-    input: MBTextSummary,
-    output: MBTextSummary,
-}
-
-/// Summary of a string of text.
-#[derive(Copy, Clone, Debug, Default, Eq, PartialEq)]
-pub struct MBTextSummary {
-    /// Length in bytes.
-    pub len: MultiBufferOffset,
-    /// Length in UTF-8.
-    pub chars: usize,
-    /// Length in UTF-16 code units
-    pub len_utf16: OffsetUtf16,
-    /// A point representing the number of lines and the length of the last line.
-    ///
-    /// In other words, it marks the point after the last byte in the text, (if
-    /// EOF was a character, this would be its position).
-    pub lines: Point,
-    /// How many `char`s are in the first line
-    pub first_line_chars: u32,
-    /// How many `char`s are in the last line
-    pub last_line_chars: u32,
-    /// How many UTF-16 code units are in the last line
-    pub last_line_len_utf16: u32,
-    /// The row idx of the longest row
-    pub longest_row: u32,
-    /// How many `char`s are in the longest row
-    pub longest_row_chars: u32,
-}
-
-impl From<TextSummary> for MBTextSummary {
-    fn from(summary: TextSummary) -> Self {
-        MBTextSummary {
-            len: MultiBufferOffset(summary.len),
-            chars: summary.chars,
-            len_utf16: summary.len_utf16,
-            lines: summary.lines,
-            first_line_chars: summary.first_line_chars,
-            last_line_chars: summary.last_line_chars,
-            last_line_len_utf16: summary.last_line_len_utf16,
-            longest_row: summary.longest_row,
-            longest_row_chars: summary.longest_row_chars,
-        }
-    }
-}
-impl From<&str> for MBTextSummary {
-    fn from(text: &str) -> Self {
-        MBTextSummary::from(TextSummary::from(text))
-    }
-}
-
-impl MultiBufferDimension for MBTextSummary {
-    type TextDimension = TextSummary;
-
-    fn from_summary(summary: &MBTextSummary) -> Self {
-        *summary
-    }
-
-    fn add_text_dim(&mut self, summary: &Self::TextDimension) {
-        *self += *summary;
-    }
-
-    fn add_mb_text_summary(&mut self, summary: &MBTextSummary) {
-        *self += *summary;
-    }
-}
-
-impl AddAssign for MBTextSummary {
-    fn add_assign(&mut self, other: MBTextSummary) {
-        let joined_chars = self.last_line_chars + other.first_line_chars;
-        if joined_chars > self.longest_row_chars {
-            self.longest_row = self.lines.row;
-            self.longest_row_chars = joined_chars;
-        }
-        if other.longest_row_chars > self.longest_row_chars {
-            self.longest_row = self.lines.row + other.longest_row;
-            self.longest_row_chars = other.longest_row_chars;
-        }
-
-        if self.lines.row == 0 {
-            self.first_line_chars += other.first_line_chars;
-        }
-
-        if other.lines.row == 0 {
-            self.last_line_chars += other.first_line_chars;
-            self.last_line_len_utf16 += other.last_line_len_utf16;
-        } else {
-            self.last_line_chars = other.last_line_chars;
-            self.last_line_len_utf16 = other.last_line_len_utf16;
-        }
-
-        self.chars += other.chars;
-        self.len += other.len;
-        self.len_utf16 += other.len_utf16;
-        self.lines += other.lines;
-    }
-}
-
-impl AddAssign<TextSummary> for MBTextSummary {
-    fn add_assign(&mut self, other: TextSummary) {
-        *self += MBTextSummary::from(other);
-    }
-}
-
-impl MBTextSummary {
-    pub fn lines_utf16(&self) -> PointUtf16 {
-        PointUtf16 {
-            row: self.lines.row,
-            column: self.last_line_len_utf16,
-        }
-    }
-}
-
-impl<K, V> MultiBufferDimension for DimensionPair<K, V>
-where
-    K: MultiBufferDimension,
-    V: MultiBufferDimension,
-{
-    type TextDimension = DimensionPair<K::TextDimension, V::TextDimension>;
-
-    fn from_summary(summary: &MBTextSummary) -> Self {
-        Self {
-            key: K::from_summary(summary),
-            value: Some(V::from_summary(summary)),
-        }
-    }
-
-    fn add_text_dim(&mut self, summary: &Self::TextDimension) {
-        self.key.add_text_dim(&summary.key);
-        if let Some(value) = &mut self.value {
-            if let Some(other_value) = summary.value.as_ref() {
-                value.add_text_dim(other_value);
-            }
-        }
-    }
-
-    fn add_mb_text_summary(&mut self, summary: &MBTextSummary) {
-        self.key.add_mb_text_summary(summary);
-        if let Some(value) = &mut self.value {
-            value.add_mb_text_summary(summary);
-        }
-    }
-}
-
-#[derive(Clone)]
-pub struct MultiBufferRows<'a> {
-    point: Point,
-    is_empty: bool,
-    is_singleton: bool,
-    cursor: MultiBufferCursor<'a, Point, Point>,
-}
-
-pub struct MultiBufferChunks<'a> {
-    excerpts: Cursor<'a, 'static, Excerpt, ExcerptOffset>,
-    diff_transforms:
-        Cursor<'a, 'static, DiffTransform, Dimensions<MultiBufferOffset, ExcerptOffset>>,
-    diffs: &'a TreeMap<BufferId, BufferDiffSnapshot>,
-    diff_base_chunks: Option<(BufferId, BufferChunks<'a>)>,
-    buffer_chunk: Option<Chunk<'a>>,
-    range: Range<MultiBufferOffset>,
-    excerpt_offset_range: Range<ExcerptOffset>,
-    excerpt_chunks: Option<ExcerptChunks<'a>>,
-    language_aware: bool,
-}
-
-pub struct ReversedMultiBufferChunks<'a> {
-    cursor: MultiBufferCursor<'a, MultiBufferOffset, BufferOffset>,
-    current_chunks: Option<rope::Chunks<'a>>,
-    start: MultiBufferOffset,
-    offset: MultiBufferOffset,
-}
-
-pub struct MultiBufferBytes<'a> {
-    range: Range<MultiBufferOffset>,
-    cursor: MultiBufferCursor<'a, MultiBufferOffset, BufferOffset>,
-    excerpt_bytes: Option<text::Bytes<'a>>,
-    has_trailing_newline: bool,
-    chunk: &'a [u8],
-}
-
-pub struct ReversedMultiBufferBytes<'a> {
-    range: Range<MultiBufferOffset>,
-    chunks: ReversedMultiBufferChunks<'a>,
-    chunk: &'a [u8],
-}
-
-#[derive(Clone)]
-struct DiffTransforms<MBD> {
-    output_dimension: OutputDimension<MBD>,
-    excerpt_dimension: ExcerptDimension<MBD>,
-}
-
-impl<'a, MBD: MultiBufferDimension> Dimension<'a, DiffTransformSummary> for DiffTransforms<MBD> {
-    fn zero(cx: <DiffTransformSummary as sum_tree::Summary>::Context<'_>) -> Self {
-        Self {
-            output_dimension: OutputDimension::zero(cx),
-            excerpt_dimension: <ExcerptDimension<MBD> as Dimension<'a, DiffTransformSummary>>::zero(
-                cx,
-            ),
-        }
-    }
-
-    fn add_summary(
-        &mut self,
-        summary: &'a DiffTransformSummary,
-        cx: <DiffTransformSummary as sum_tree::Summary>::Context<'_>,
-    ) {
-        self.output_dimension.add_summary(summary, cx);
-        self.excerpt_dimension.add_summary(summary, cx);
-    }
-}
-
-#[derive(Clone)]
-struct MultiBufferCursor<'a, MBD, BD> {
-    excerpts: Cursor<'a, 'static, Excerpt, ExcerptDimension<MBD>>,
-    diff_transforms: Cursor<'a, 'static, DiffTransform, DiffTransforms<MBD>>,
-    snapshot: &'a MultiBufferSnapshot,
-    cached_region: Option<MultiBufferRegion<'a, MBD, BD>>,
-}
-
-/// Matches transformations to an item
-/// This is essentially a more detailed version of DiffTransform
-#[derive(Clone)]
-struct MultiBufferRegion<'a, MBD, BD> {
-    buffer: &'a BufferSnapshot,
-    is_main_buffer: bool,
-    diff_hunk_status: Option<DiffHunkStatus>,
-    excerpt: &'a Excerpt,
-    buffer_range: Range<BD>,
-    diff_base_byte_range: Option<Range<usize>>,
-    range: Range<MBD>,
-    has_trailing_newline: bool,
-}
-
-impl<'a, MBD, BD> MultiBufferRegion<'a, MBD, BD>
-where
-    MBD: Ord,
-    BD: Ord,
-{
-    fn is_filtered(&self) -> bool {
-        self.range.is_empty() && self.buffer_range.is_empty() && self.diff_hunk_status == None
-    }
-}
-
-struct ExcerptChunks<'a> {
-    excerpt_id: ExcerptId,
-    content_chunks: BufferChunks<'a>,
-    has_footer: bool,
-}
-
-#[derive(Debug)]
-struct BufferEdit {
-    range: Range<BufferOffset>,
-    new_text: Arc<str>,
-    is_insertion: bool,
-    original_indent_column: Option<u32>,
-    excerpt_id: ExcerptId,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq)]
-enum DiffChangeKind {
-    BufferEdited,
-    DiffUpdated { base_changed: bool },
-    ExpandOrCollapseHunks { expand: bool },
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub enum ExpandExcerptDirection {
-    Up,
-    Down,
-    UpAndDown,
-}
-
-impl ExpandExcerptDirection {
-    pub fn should_expand_up(&self) -> bool {
-        match self {
-            ExpandExcerptDirection::Up => true,
-            ExpandExcerptDirection::Down => false,
-            ExpandExcerptDirection::UpAndDown => true,
-        }
-    }
-
-    pub fn should_expand_down(&self) -> bool {
-        match self {
-            ExpandExcerptDirection::Up => false,
-            ExpandExcerptDirection::Down => true,
-            ExpandExcerptDirection::UpAndDown => true,
-        }
-    }
-}
-
-#[derive(Clone, Debug, PartialEq)]
-pub struct IndentGuide {
-    pub buffer_id: BufferId,
-    pub start_row: MultiBufferRow,
-    pub end_row: MultiBufferRow,
-    pub depth: u32,
-    pub tab_size: u32,
-    pub settings: IndentGuideSettings,
-}
-
-impl IndentGuide {
-    pub fn indent_level(&self) -> u32 {
-        self.depth * self.tab_size
-    }
-}
-
-impl MultiBuffer {
-    pub fn new(capability: Capability) -> Self {
-        Self::new_(
-            capability,
-            MultiBufferSnapshot {
-                show_headers: true,
-                ..MultiBufferSnapshot::default()
-            },
-        )
-    }
-
-    pub fn without_headers(capability: Capability) -> Self {
-        Self::new_(capability, Default::default())
-    }
-
-    pub fn singleton(buffer: Entity<Buffer>, cx: &mut Context<Self>) -> Self {
-        let mut this = Self::new_(
-            buffer.read(cx).capability(),
-            MultiBufferSnapshot {
-                singleton: true,
-                ..MultiBufferSnapshot::default()
-            },
-        );
-        this.singleton = true;
-        let buffer_id = buffer.read(cx).remote_id();
-        this.push_excerpts(
-            buffer,
-            [ExcerptRange::new(text::Anchor::min_max_range_for_buffer(
-                buffer_id,
-            ))],
-            cx,
-        );
-        this
-    }
-
-    #[inline]
-    pub fn new_(capability: Capability, snapshot: MultiBufferSnapshot) -> Self {
-        Self {
-            snapshot: RefCell::new(snapshot),
-            buffers: Default::default(),
-            diffs: HashMap::default(),
-            subscriptions: Topic::default(),
-            singleton: false,
-            capability,
-            title: None,
-            excerpts_by_path: Default::default(),
-            paths_by_excerpt: Default::default(),
-            buffer_changed_since_sync: Default::default(),
-            history: History::default(),
-            follower: None,
-            filter_mode: None,
-        }
-    }
-
-    pub fn clone(&self, new_cx: &mut Context<Self>) -> Self {
-        let mut buffers = HashMap::default();
-        let buffer_changed_since_sync = Rc::new(Cell::new(false));
-        for (buffer_id, buffer_state) in self.buffers.iter() {
-            buffer_state.buffer.update(new_cx, |buffer, _| {
-                buffer.record_changes(Rc::downgrade(&buffer_changed_since_sync));
-            });
-            buffers.insert(
-                *buffer_id,
-                BufferState {
-                    buffer: buffer_state.buffer.clone(),
-                    last_version: buffer_state.last_version.clone(),
-                    last_non_text_state_update_count: buffer_state
-                        .last_non_text_state_update_count
-                        .clone(),
-                    excerpts: buffer_state.excerpts.clone(),
-                    _subscriptions: [
-                        new_cx.observe(&buffer_state.buffer, |_, _, cx| cx.notify()),
-                        new_cx.subscribe(&buffer_state.buffer, Self::on_buffer_event),
-                    ],
-                },
-            );
-        }
-        let mut diff_bases = HashMap::default();
-        for (buffer_id, diff) in self.diffs.iter() {
-            diff_bases.insert(*buffer_id, DiffState::new(diff.diff.clone(), new_cx));
-        }
-        Self {
-            snapshot: RefCell::new(self.snapshot.borrow().clone()),
-            buffers: buffers,
-            excerpts_by_path: self.excerpts_by_path.clone(),
-            paths_by_excerpt: self.paths_by_excerpt.clone(),
-            diffs: diff_bases,
-            subscriptions: Default::default(),
-            singleton: self.singleton,
-            capability: self.capability,
-            history: self.history.clone(),
-            title: self.title.clone(),
-            buffer_changed_since_sync,
-            follower: None,
-            filter_mode: None,
-        }
-    }
-
-    pub fn get_or_create_follower(&mut self, cx: &mut Context<Self>) -> Entity<MultiBuffer> {
-        use gpui::AppContext as _;
-
-        if let Some(follower) = &self.follower {
-            return follower.clone();
-        }
-
-        let follower = cx.new(|cx| self.clone(cx));
-        follower.update(cx, |follower, _cx| {
-            follower.capability = Capability::ReadOnly;
-        });
-        self.follower = Some(follower.clone());
-        follower
-    }
-
-    pub fn set_filter_mode(&mut self, new_mode: Option<MultiBufferFilterMode>) {
-        self.filter_mode = new_mode;
-        let excerpt_len = self
-            .snapshot
-            .get_mut()
-            .diff_transforms
-            .summary()
-            .excerpt_len();
-        let edits = Self::sync_diff_transforms(
-            self.snapshot.get_mut(),
-            vec![Edit {
-                old: ExcerptDimension(MultiBufferOffset(0))..excerpt_len,
-                new: ExcerptDimension(MultiBufferOffset(0))..excerpt_len,
-            }],
-            // TODO(split-diff) is this right?
-            DiffChangeKind::BufferEdited,
-            new_mode,
-        );
-        if !edits.is_empty() {
-            self.subscriptions.publish(edits);
-        }
-    }
-
-    pub fn set_group_interval(&mut self, group_interval: Duration) {
-        self.history.set_group_interval(group_interval);
-    }
-
-    pub fn with_title(mut self, title: String) -> Self {
-        self.title = Some(title);
-        self
-    }
-
-    pub fn read_only(&self) -> bool {
-        self.capability == Capability::ReadOnly
-    }
-
-    /// Returns an up-to-date snapshot of the MultiBuffer.
-    #[ztracing::instrument(skip_all)]
-    pub fn snapshot(&self, cx: &App) -> MultiBufferSnapshot {
-        self.sync(cx);
-        self.snapshot.borrow().clone()
-    }
-
-    pub fn read(&self, cx: &App) -> Ref<'_, MultiBufferSnapshot> {
-        self.sync(cx);
-        self.snapshot.borrow()
-    }
-
-    pub fn as_singleton(&self) -> Option<Entity<Buffer>> {
-        if self.singleton {
-            Some(self.buffers.values().next().unwrap().buffer.clone())
-        } else {
-            None
-        }
-    }
-
-    pub fn is_singleton(&self) -> bool {
-        self.singleton
-    }
-
-    pub fn subscribe(&mut self) -> Subscription<MultiBufferOffset> {
-        self.subscriptions.subscribe()
-    }
-
-    pub fn is_dirty(&self, cx: &App) -> bool {
-        self.read(cx).is_dirty()
-    }
-
-    pub fn has_deleted_file(&self, cx: &App) -> bool {
-        self.read(cx).has_deleted_file()
-    }
-
-    pub fn has_conflict(&self, cx: &App) -> bool {
-        self.read(cx).has_conflict()
-    }
-
-    // The `is_empty` signature doesn't match what clippy expects
-    #[allow(clippy::len_without_is_empty)]
-    pub fn len(&self, cx: &App) -> MultiBufferOffset {
-        self.read(cx).len()
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.buffers.is_empty()
-    }
-
-    pub fn edit<I, S, T>(
-        &mut self,
-        edits: I,
-        autoindent_mode: Option<AutoindentMode>,
-        cx: &mut Context<Self>,
-    ) where
-        I: IntoIterator<Item = (Range<S>, T)>,
-        S: ToOffset,
-        T: Into<Arc<str>>,
-    {
-        if self.read_only() || self.buffers.is_empty() {
-            return;
-        }
-        self.sync_mut(cx);
-        let edits = edits
-            .into_iter()
-            .map(|(range, new_text)| {
-                let mut range = range.start.to_offset(self.snapshot.get_mut())
-                    ..range.end.to_offset(self.snapshot.get_mut());
-                if range.start > range.end {
-                    mem::swap(&mut range.start, &mut range.end);
-                }
-                (range, new_text.into())
-            })
-            .collect::<Vec<_>>();
-
-        return edit_internal(self, edits, autoindent_mode, cx);
-
-        // Non-generic part of edit, hoisted out to avoid blowing up LLVM IR.
-        fn edit_internal(
-            this: &mut MultiBuffer,
-            edits: Vec<(Range<MultiBufferOffset>, Arc<str>)>,
-            mut autoindent_mode: Option<AutoindentMode>,
-            cx: &mut Context<MultiBuffer>,
-        ) {
-            let original_indent_columns = match &mut autoindent_mode {
-                Some(AutoindentMode::Block {
-                    original_indent_columns,
-                }) => mem::take(original_indent_columns),
-                _ => Default::default(),
-            };
-
-            let (buffer_edits, edited_excerpt_ids) = MultiBuffer::convert_edits_to_buffer_edits(
-                edits,
-                this.snapshot.get_mut(),
-                &original_indent_columns,
-            );
-
-            let mut buffer_ids = Vec::with_capacity(buffer_edits.len());
-            for (buffer_id, mut edits) in buffer_edits {
-                buffer_ids.push(buffer_id);
-                edits.sort_by_key(|edit| edit.range.start);
-                this.buffers[&buffer_id].buffer.update(cx, |buffer, cx| {
-                    let mut edits = edits.into_iter().peekable();
-                    let mut insertions = Vec::new();
-                    let mut original_indent_columns = Vec::new();
-                    let mut deletions = Vec::new();
-                    let empty_str: Arc<str> = Arc::default();
-                    while let Some(BufferEdit {
-                        mut range,
-                        mut new_text,
-                        mut is_insertion,
-                        original_indent_column,
-                        excerpt_id,
-                    }) = edits.next()
-                    {
-                        while let Some(BufferEdit {
-                            range: next_range,
-                            is_insertion: next_is_insertion,
-                            new_text: next_new_text,
-                            excerpt_id: next_excerpt_id,
-                            ..
-                        }) = edits.peek()
-                        {
-                            if range.end >= next_range.start {
-                                range.end = cmp::max(next_range.end, range.end);
-                                is_insertion |= *next_is_insertion;
-                                if excerpt_id == *next_excerpt_id {
-                                    new_text = format!("{new_text}{next_new_text}").into();
-                                }
-                                edits.next();
-                            } else {
-                                break;
-                            }
-                        }
-
-                        if is_insertion {
-                            original_indent_columns.push(original_indent_column);
-                            insertions.push((
-                                buffer.anchor_before(range.start)..buffer.anchor_before(range.end),
-                                new_text.clone(),
-                            ));
-                        } else if !range.is_empty() {
-                            deletions.push((
-                                buffer.anchor_before(range.start)..buffer.anchor_before(range.end),
-                                empty_str.clone(),
-                            ));
-                        }
-                    }
-
-                    let deletion_autoindent_mode =
-                        if let Some(AutoindentMode::Block { .. }) = autoindent_mode {
-                            Some(AutoindentMode::Block {
-                                original_indent_columns: Default::default(),
-                            })
-                        } else {
-                            autoindent_mode.clone()
-                        };
-                    let insertion_autoindent_mode =
-                        if let Some(AutoindentMode::Block { .. }) = autoindent_mode {
-                            Some(AutoindentMode::Block {
-                                original_indent_columns,
-                            })
-                        } else {
-                            autoindent_mode.clone()
-                        };
-
-                    buffer.edit(deletions, deletion_autoindent_mode, cx);
-                    buffer.edit(insertions, insertion_autoindent_mode, cx);
-                })
-            }
-
-            cx.emit(Event::ExcerptsEdited {
-                excerpt_ids: edited_excerpt_ids,
-                buffer_ids,
-            });
-        }
-    }
-
-    fn convert_edits_to_buffer_edits(
-        edits: Vec<(Range<MultiBufferOffset>, Arc<str>)>,
-        snapshot: &MultiBufferSnapshot,
-        original_indent_columns: &[Option<u32>],
-    ) -> (HashMap<BufferId, Vec<BufferEdit>>, Vec<ExcerptId>) {
-        let mut buffer_edits: HashMap<BufferId, Vec<BufferEdit>> = Default::default();
-        let mut edited_excerpt_ids = Vec::new();
-        let mut cursor = snapshot.cursor::<MultiBufferOffset, BufferOffset>();
-        for (ix, (range, new_text)) in edits.into_iter().enumerate() {
-            let original_indent_column = original_indent_columns.get(ix).copied().flatten();
-
-            cursor.seek(&range.start);
-            let mut start_region = cursor.region().expect("start offset out of bounds");
-            if !start_region.is_main_buffer {
-                cursor.next();
-                if let Some(region) = cursor.region() {
-                    start_region = region;
-                } else {
-                    continue;
-                }
-            }
-
-            if range.end < start_region.range.start {
-                continue;
-            }
-
-            if range.end > start_region.range.end {
-                cursor.seek_forward(&range.end);
-            }
-            let mut end_region = cursor.region().expect("end offset out of bounds");
-            if !end_region.is_main_buffer {
-                cursor.prev();
-                if let Some(region) = cursor.region() {
-                    end_region = region;
-                } else {
-                    continue;
-                }
-            }
-
-            if range.start > end_region.range.end {
-                continue;
-            }
-
-            let start_overshoot = range.start.saturating_sub(start_region.range.start);
-            let end_overshoot = range.end.saturating_sub(end_region.range.start);
-            let buffer_start = (start_region.buffer_range.start + start_overshoot)
-                .min(start_region.buffer_range.end);
-            let buffer_end =
-                (end_region.buffer_range.start + end_overshoot).min(end_region.buffer_range.end);
-
-            if start_region.excerpt.id == end_region.excerpt.id {
-                if start_region.is_main_buffer {
-                    edited_excerpt_ids.push(start_region.excerpt.id);
-                    buffer_edits
-                        .entry(start_region.buffer.remote_id())
-                        .or_default()
-                        .push(BufferEdit {
-                            range: buffer_start..buffer_end,
-                            new_text,
-                            is_insertion: true,
-                            original_indent_column,
-                            excerpt_id: start_region.excerpt.id,
-                        });
-                }
-            } else {
-                let start_excerpt_range = buffer_start..start_region.buffer_range.end;
-                let end_excerpt_range = end_region.buffer_range.start..buffer_end;
-                if start_region.is_main_buffer {
-                    edited_excerpt_ids.push(start_region.excerpt.id);
-                    buffer_edits
-                        .entry(start_region.buffer.remote_id())
-                        .or_default()
-                        .push(BufferEdit {
-                            range: start_excerpt_range,
-                            new_text: new_text.clone(),
-                            is_insertion: true,
-                            original_indent_column,
-                            excerpt_id: start_region.excerpt.id,
-                        });
-                }
-                if end_region.is_main_buffer {
-                    edited_excerpt_ids.push(end_region.excerpt.id);
-                    buffer_edits
-                        .entry(end_region.buffer.remote_id())
-                        .or_default()
-                        .push(BufferEdit {
-                            range: end_excerpt_range,
-                            new_text: new_text.clone(),
-                            is_insertion: false,
-                            original_indent_column,
-                            excerpt_id: end_region.excerpt.id,
-                        });
-                }
-
-                cursor.seek(&range.start);
-                cursor.next_excerpt();
-                while let Some(region) = cursor.region() {
-                    if region.excerpt.id == end_region.excerpt.id {
-                        break;
-                    }
-                    if region.is_main_buffer {
-                        edited_excerpt_ids.push(region.excerpt.id);
-                        buffer_edits
-                            .entry(region.buffer.remote_id())
-                            .or_default()
-                            .push(BufferEdit {
-                                range: region.buffer_range,
-                                new_text: new_text.clone(),
-                                is_insertion: false,
-                                original_indent_column,
-                                excerpt_id: region.excerpt.id,
-                            });
-                    }
-                    cursor.next_excerpt();
-                }
-            }
-        }
-        (buffer_edits, edited_excerpt_ids)
-    }
-
-    pub fn autoindent_ranges<I, S>(&mut self, ranges: I, cx: &mut Context<Self>)
-    where
-        I: IntoIterator<Item = Range<S>>,
-        S: ToOffset,
-    {
-        if self.read_only() || self.buffers.is_empty() {
-            return;
-        }
-        self.sync_mut(cx);
-        let empty = Arc::<str>::from("");
-        let edits = ranges
-            .into_iter()
-            .map(|range| {
-                let mut range = range.start.to_offset(self.snapshot.get_mut())
-                    ..range.end.to_offset(&self.snapshot.get_mut());
-                if range.start > range.end {
-                    mem::swap(&mut range.start, &mut range.end);
-                }
-                (range, empty.clone())
-            })
-            .collect::<Vec<_>>();
-
-        return autoindent_ranges_internal(self, edits, cx);
-
-        fn autoindent_ranges_internal(
-            this: &mut MultiBuffer,
-            edits: Vec<(Range<MultiBufferOffset>, Arc<str>)>,
-            cx: &mut Context<MultiBuffer>,
-        ) {
-            let (buffer_edits, edited_excerpt_ids) =
-                MultiBuffer::convert_edits_to_buffer_edits(edits, this.snapshot.get_mut(), &[]);
-
-            let mut buffer_ids = Vec::new();
-            for (buffer_id, mut edits) in buffer_edits {
-                buffer_ids.push(buffer_id);
-                edits.sort_unstable_by_key(|edit| edit.range.start);
-
-                let mut ranges: Vec<Range<BufferOffset>> = Vec::new();
-                for edit in edits {
-                    if let Some(last_range) = ranges.last_mut()
-                        && edit.range.start <= last_range.end
-                    {
-                        last_range.end = last_range.end.max(edit.range.end);
-                        continue;
-                    }
-                    ranges.push(edit.range);
-                }
-
-                this.buffers[&buffer_id].buffer.update(cx, |buffer, cx| {
-                    buffer.autoindent_ranges(ranges, cx);
-                })
-            }
-
-            cx.emit(Event::ExcerptsEdited {
-                excerpt_ids: edited_excerpt_ids,
-                buffer_ids,
-            });
-        }
-    }
-
-    /// Inserts newlines at the given position to create an empty line, returning the start of the new line.
-    /// You can also request the insertion of empty lines above and below the line starting at the returned point.
-    /// Panics if the given position is invalid.
-    pub fn insert_empty_line(
-        &mut self,
-        position: impl ToPoint,
-        space_above: bool,
-        space_below: bool,
-        cx: &mut Context<Self>,
-    ) -> Point {
-        let multibuffer_point = position.to_point(&self.read(cx));
-        let (buffer, buffer_point, _) = self.point_to_buffer_point(multibuffer_point, cx).unwrap();
-        self.start_transaction(cx);
-        let empty_line_start = buffer.update(cx, |buffer, cx| {
-            buffer.insert_empty_line(buffer_point, space_above, space_below, cx)
-        });
-        self.end_transaction(cx);
-        multibuffer_point + (empty_line_start - buffer_point)
-    }
-
-    pub fn set_active_selections(
-        &self,
-        selections: &[Selection<Anchor>],
-        line_mode: bool,
-        cursor_shape: CursorShape,
-        cx: &mut Context<Self>,
-    ) {
-        let mut selections_by_buffer: HashMap<BufferId, Vec<Selection<text::Anchor>>> =
-            Default::default();
-        let snapshot = self.read(cx);
-        let mut cursor = snapshot.excerpts.cursor::<Option<&Locator>>(());
-        for selection in selections {
-            let start_locator = snapshot.excerpt_locator_for_id(selection.start.excerpt_id);
-            let end_locator = snapshot.excerpt_locator_for_id(selection.end.excerpt_id);
-
-            cursor.seek(&Some(start_locator), Bias::Left);
-            while let Some(excerpt) = cursor.item()
-                && excerpt.locator <= *end_locator
-            {
-                let mut start = excerpt.range.context.start;
-                let mut end = excerpt.range.context.end;
-                if excerpt.id == selection.start.excerpt_id {
-                    start = selection.start.text_anchor;
-                }
-                if excerpt.id == selection.end.excerpt_id {
-                    end = selection.end.text_anchor;
-                }
-                selections_by_buffer
-                    .entry(excerpt.buffer_id)
-                    .or_default()
-                    .push(Selection {
-                        id: selection.id,
-                        start,
-                        end,
-                        reversed: selection.reversed,
-                        goal: selection.goal,
-                    });
-
-                cursor.next();
-            }
-        }
-
-        for (buffer_id, buffer_state) in self.buffers.iter() {
-            if !selections_by_buffer.contains_key(buffer_id) {
-                buffer_state
-                    .buffer
-                    .update(cx, |buffer, cx| buffer.remove_active_selections(cx));
-            }
-        }
-
-        for (buffer_id, mut selections) in selections_by_buffer {
-            self.buffers[&buffer_id].buffer.update(cx, |buffer, cx| {
-                selections.sort_unstable_by(|a, b| a.start.cmp(&b.start, buffer));
-                let mut selections = selections.into_iter().peekable();
-                let merged_selections = Arc::from_iter(iter::from_fn(|| {
-                    let mut selection = selections.next()?;
-                    while let Some(next_selection) = selections.peek() {
-                        if selection.end.cmp(&next_selection.start, buffer).is_ge() {
-                            let next_selection = selections.next().unwrap();
-                            if next_selection.end.cmp(&selection.end, buffer).is_ge() {
-                                selection.end = next_selection.end;
-                            }
-                        } else {
-                            break;
-                        }
-                    }
-                    Some(selection)
-                }));
-                buffer.set_active_selections(merged_selections, line_mode, cursor_shape, cx);
-            });
-        }
-    }
-
-    pub fn remove_active_selections(&self, cx: &mut Context<Self>) {
-        for buffer in self.buffers.values() {
-            buffer
-                .buffer
-                .update(cx, |buffer, cx| buffer.remove_active_selections(cx));
-        }
-    }
-
-    pub fn push_excerpts<O>(
-        &mut self,
-        buffer: Entity<Buffer>,
-        ranges: impl IntoIterator<Item = ExcerptRange<O>>,
-        cx: &mut Context<Self>,
-    ) -> Vec<ExcerptId>
-    where
-        O: text::ToOffset + Clone,
-    {
-        self.insert_excerpts_after(ExcerptId::max(), buffer, ranges, cx)
-    }
-
-    #[instrument(skip_all)]
-    fn merge_excerpt_ranges<'a>(
-        expanded_ranges: impl IntoIterator<Item = &'a ExcerptRange<Point>> + 'a,
-    ) -> (Vec<ExcerptRange<Point>>, Vec<usize>) {
-        let mut merged_ranges: Vec<ExcerptRange<Point>> = Vec::new();
-        let mut counts: Vec<usize> = Vec::new();
-        for range in expanded_ranges {
-            if let Some(last_range) = merged_ranges.last_mut() {
-                assert!(
-                    last_range.context.start <= range.context.start,
-                    "ranges must be sorted: {last_range:?} <= {range:?}"
-                );
-                if last_range.context.end >= range.context.start
-                    || last_range.context.end.row + 1 == range.context.start.row
-                {
-                    last_range.context.end = range.context.end.max(last_range.context.end);
-                    *counts.last_mut().unwrap() += 1;
-                    continue;
-                }
-            }
-            merged_ranges.push(range.clone());
-            counts.push(1);
-        }
-        (merged_ranges, counts)
-    }
-
-    pub fn insert_excerpts_after<O>(
-        &mut self,
-        prev_excerpt_id: ExcerptId,
-        buffer: Entity<Buffer>,
-        ranges: impl IntoIterator<Item = ExcerptRange<O>>,
-        cx: &mut Context<Self>,
-    ) -> Vec<ExcerptId>
-    where
-        O: text::ToOffset + Clone,
-    {
-        let mut ids = Vec::new();
-        let mut next_excerpt_id =
-            if let Some(last_entry) = self.snapshot.borrow().excerpt_ids.last() {
-                last_entry.id.0 + 1
-            } else {
-                1
-            };
-        self.insert_excerpts_with_ids_after(
-            prev_excerpt_id,
-            buffer,
-            ranges.into_iter().map(|range| {
-                let id = ExcerptId(post_inc(&mut next_excerpt_id));
-                ids.push(id);
-                (id, range)
-            }),
-            cx,
-        );
-        ids
-    }
-
-    pub fn insert_excerpts_with_ids_after<O>(
-        &mut self,
-        prev_excerpt_id: ExcerptId,
-        buffer: Entity<Buffer>,
-        ranges: impl IntoIterator<Item = (ExcerptId, ExcerptRange<O>)>,
-        cx: &mut Context<Self>,
-    ) where
-        O: text::ToOffset + Clone,
-    {
-        // TODO(split-diff) see if it's worth time avoiding collecting here later
-        let collected_ranges: Vec<_> = ranges.into_iter().collect();
-
-        assert_eq!(self.history.transaction_depth(), 0);
-        let mut ranges = collected_ranges.iter().cloned().peekable();
-        if ranges.peek().is_none() {
-            return Default::default();
-        }
-
-        self.sync_mut(cx);
-
-        let buffer_snapshot = buffer.read(cx).snapshot();
-        let buffer_id = buffer_snapshot.remote_id();
-
-        let buffer_state = self.buffers.entry(buffer_id).or_insert_with(|| {
-            self.buffer_changed_since_sync.replace(true);
-            buffer.update(cx, |buffer, _| {
-                buffer.record_changes(Rc::downgrade(&self.buffer_changed_since_sync));
-            });
-            BufferState {
-                last_version: RefCell::new(buffer_snapshot.version().clone()),
-                last_non_text_state_update_count: Cell::new(
-                    buffer_snapshot.non_text_state_update_count(),
-                ),
-                excerpts: Default::default(),
-                _subscriptions: [
-                    cx.observe(&buffer, |_, _, cx| cx.notify()),
-                    cx.subscribe(&buffer, Self::on_buffer_event),
-                ],
-                buffer: buffer.clone(),
-            }
-        });
-
-        let mut snapshot = self.snapshot.get_mut();
-
-        let mut prev_locator = snapshot.excerpt_locator_for_id(prev_excerpt_id).clone();
-        let mut new_excerpt_ids = mem::take(&mut snapshot.excerpt_ids);
-        let mut cursor = snapshot.excerpts.cursor::<Option<&Locator>>(());
-        let mut new_excerpts = cursor.slice(&prev_locator, Bias::Right);
-        prev_locator = cursor.start().unwrap_or(Locator::min_ref()).clone();
-
-        let edit_start = ExcerptDimension(new_excerpts.summary().text.len);
-        new_excerpts.update_last(
-            |excerpt| {
-                excerpt.has_trailing_newline = true;
-            },
-            (),
-        );
-
-        let next_locator = if let Some(excerpt) = cursor.item() {
-            excerpt.locator.clone()
-        } else {
-            Locator::max()
-        };
-
-        let mut excerpts = Vec::new();
-        while let Some((id, range)) = ranges.next() {
-            let locator = Locator::between(&prev_locator, &next_locator);
-            if let Err(ix) = buffer_state.excerpts.binary_search(&locator) {
-                buffer_state.excerpts.insert(ix, locator.clone());
-            }
-            let range = ExcerptRange {
-                context: buffer_snapshot.anchor_before(&range.context.start)
-                    ..buffer_snapshot.anchor_after(&range.context.end),
-                primary: buffer_snapshot.anchor_before(&range.primary.start)
-                    ..buffer_snapshot.anchor_after(&range.primary.end),
-            };
-            excerpts.push((id, range.clone()));
-            let excerpt = Excerpt::new(
-                id,
-                locator.clone(),
-                buffer_id,
-                buffer_snapshot.clone(),
-                range,
-                ranges.peek().is_some() || cursor.item().is_some(),
-            );
-            new_excerpts.push(excerpt, ());
-            prev_locator = locator.clone();
-
-            if let Some(last_mapping_entry) = new_excerpt_ids.last() {
-                assert!(id > last_mapping_entry.id, "excerpt ids must be increasing");
-            }
-            new_excerpt_ids.push(ExcerptIdMapping { id, locator }, ());
-        }
-
-        let edit_end = ExcerptDimension(new_excerpts.summary().text.len);
-
-        let suffix = cursor.suffix();
-        let changed_trailing_excerpt = suffix.is_empty();
-        new_excerpts.append(suffix, ());
-        drop(cursor);
-        snapshot.excerpts = new_excerpts;
-        snapshot.excerpt_ids = new_excerpt_ids;
-        if changed_trailing_excerpt {
-            snapshot.trailing_excerpt_update_count += 1;
-        }
-
-        let edits = Self::sync_diff_transforms(
-            &mut snapshot,
-            vec![Edit {
-                old: edit_start..edit_start,
-                new: edit_start..edit_end,
-            }],
-            DiffChangeKind::BufferEdited,
-            self.filter_mode,
-        );
-        if !edits.is_empty() {
-            self.subscriptions.publish(edits);
-        }
-
-        if let Some(follower) = &self.follower {
-            follower.update(cx, |follower, cx| {
-                follower.insert_excerpts_with_ids_after(
-                    prev_excerpt_id,
-                    buffer.clone(),
-                    collected_ranges,
-                    cx,
-                );
-            })
-        }
-
-        cx.emit(Event::Edited {
-            edited_buffer: None,
-        });
-        cx.emit(Event::ExcerptsAdded {
-            buffer,
-            predecessor: prev_excerpt_id,
-            excerpts,
-        });
-        cx.notify();
-    }
-
-    pub fn clear(&mut self, cx: &mut Context<Self>) {
-        self.sync_mut(cx);
-        let ids = self.excerpt_ids();
-        let removed_buffer_ids = self.buffers.drain().map(|(id, _)| id).collect();
-        self.excerpts_by_path.clear();
-        self.paths_by_excerpt.clear();
-        let MultiBufferSnapshot {
-            excerpts,
-            diffs: _,
-            diff_transforms: _,
-            non_text_state_update_count: _,
-            edit_count: _,
-            is_dirty,
-            has_deleted_file,
-            has_conflict,
-            singleton: _,
-            excerpt_ids: _,
-            replaced_excerpts,
-            trailing_excerpt_update_count,
-            all_diff_hunks_expanded: _,
-            show_headers: _,
-        } = self.snapshot.get_mut();
-        let start = ExcerptDimension(MultiBufferOffset::ZERO);
-        let prev_len = ExcerptDimension(excerpts.summary().text.len);
-        *excerpts = Default::default();
-        *trailing_excerpt_update_count += 1;
-        *is_dirty = false;
-        *has_deleted_file = false;
-        *has_conflict = false;
-        replaced_excerpts.clear();
-
-        let edits = Self::sync_diff_transforms(
-            self.snapshot.get_mut(),
-            vec![Edit {
-                old: start..prev_len,
-                new: start..start,
-            }],
-            DiffChangeKind::BufferEdited,
-            self.filter_mode,
-        );
-        if !edits.is_empty() {
-            self.subscriptions.publish(edits);
-        }
-        if let Some(follower) = &self.follower {
-            follower.update(cx, |follower, cx| {
-                follower.clear(cx);
-            })
-        }
-        cx.emit(Event::Edited {
-            edited_buffer: None,
-        });
-        cx.emit(Event::ExcerptsRemoved {
-            ids,
-            removed_buffer_ids,
-        });
-        cx.notify();
-    }
-
-    #[ztracing::instrument(skip_all)]
-    pub fn excerpts_for_buffer(
-        &self,
-        buffer_id: BufferId,
-        cx: &App,
-    ) -> Vec<(ExcerptId, ExcerptRange<text::Anchor>)> {
-        let mut excerpts = Vec::new();
-        let snapshot = self.read(cx);
-        let mut cursor = snapshot.excerpts.cursor::<Option<&Locator>>(());
-        if let Some(locators) = self.buffers.get(&buffer_id).map(|state| &state.excerpts) {
-            for locator in locators {
-                cursor.seek_forward(&Some(locator), Bias::Left);
-                if let Some(excerpt) = cursor.item()
-                    && excerpt.locator == *locator
-                {
-                    excerpts.push((excerpt.id, excerpt.range.clone()));
-                }
-            }
-        }
-
-        excerpts
-    }
-
-    pub fn excerpt_ranges_for_buffer(&self, buffer_id: BufferId, cx: &App) -> Vec<Range<Point>> {
-        let snapshot = self.read(cx);
-        let mut excerpts = snapshot
-            .excerpts
-            .cursor::<Dimensions<Option<&Locator>, ExcerptPoint>>(());
-        let mut diff_transforms = snapshot
-            .diff_transforms
-            .cursor::<Dimensions<ExcerptPoint, OutputDimension<Point>>>(());
-        diff_transforms.next();
-        let locators = self
-            .buffers
-            .get(&buffer_id)
-            .into_iter()
-            .flat_map(|state| &state.excerpts);
-        let mut result = Vec::new();
-        for locator in locators {
-            excerpts.seek_forward(&Some(locator), Bias::Left);
-            if let Some(excerpt) = excerpts.item()
-                && excerpt.locator == *locator
-            {
-                let excerpt_start = excerpts.start().1;
-                let excerpt_end = excerpt_start + excerpt.text_summary.lines;
-
-                diff_transforms.seek_forward(&excerpt_start, Bias::Left);
-                let overshoot = excerpt_start - diff_transforms.start().0;
-                let start = diff_transforms.start().1 + overshoot;
-
-                diff_transforms.seek_forward(&excerpt_end, Bias::Right);
-                let overshoot = excerpt_end - diff_transforms.start().0;
-                let end = diff_transforms.start().1 + overshoot;
-
-                result.push(start.0..end.0)
-            }
-        }
-        result
-    }
-
-    pub fn excerpt_buffer_ids(&self) -> Vec<BufferId> {
-        self.snapshot
-            .borrow()
-            .excerpts
-            .iter()
-            .map(|entry| entry.buffer_id)
-            .collect()
-    }
-
-    pub fn excerpt_ids(&self) -> Vec<ExcerptId> {
-        self.snapshot
-            .borrow()
-            .excerpts
-            .iter()
-            .map(|entry| entry.id)
-            .collect()
-    }
-
-    pub fn excerpt_containing(
-        &self,
-        position: impl ToOffset,
-        cx: &App,
-    ) -> Option<(ExcerptId, Entity<Buffer>, Range<text::Anchor>)> {
-        let snapshot = self.read(cx);
-        let offset = position.to_offset(&snapshot);
-
-        let mut cursor = snapshot.cursor::<MultiBufferOffset, BufferOffset>();
-        cursor.seek(&offset);
-        cursor
-            .excerpt()
-            .or_else(|| snapshot.excerpts.last())
-            .map(|excerpt| {
-                (
-                    excerpt.id,
-                    self.buffers.get(&excerpt.buffer_id).unwrap().buffer.clone(),
-                    excerpt.range.context.clone(),
-                )
-            })
-    }
-
-    pub fn buffer_for_anchor(&self, anchor: Anchor, cx: &App) -> Option<Entity<Buffer>> {
-        if let Some(buffer_id) = anchor.text_anchor.buffer_id {
-            self.buffer(buffer_id)
-        } else {
-            let (_, buffer, _) = self.excerpt_containing(anchor, cx)?;
-            Some(buffer)
-        }
-    }
-
-    // If point is at the end of the buffer, the last excerpt is returned
-    pub fn point_to_buffer_offset<T: ToOffset>(
-        &self,
-        point: T,
-        cx: &App,
-    ) -> Option<(Entity<Buffer>, BufferOffset)> {
-        let snapshot = self.read(cx);
-        let (buffer, offset) = snapshot.point_to_buffer_offset(point)?;
-        Some((
-            self.buffers.get(&buffer.remote_id())?.buffer.clone(),
-            offset,
-        ))
-    }
-
-    // If point is at the end of the buffer, the last excerpt is returned
-    pub fn point_to_buffer_point<T: ToPoint>(
-        &self,
-        point: T,
-        cx: &App,
-    ) -> Option<(Entity<Buffer>, Point, ExcerptId)> {
-        let snapshot = self.read(cx);
-        let (buffer, point, is_main_buffer) =
-            snapshot.point_to_buffer_point(point.to_point(&snapshot))?;
-        Some((
-            self.buffers.get(&buffer.remote_id())?.buffer.clone(),
-            point,
-            is_main_buffer,
-        ))
-    }
-
-    pub fn buffer_point_to_anchor(
-        &self,
-        buffer: &Entity<Buffer>,
-        point: Point,
-        cx: &App,
-    ) -> Option<Anchor> {
-        let mut found = None;
-        let snapshot = buffer.read(cx).snapshot();
-        for (excerpt_id, range) in self.excerpts_for_buffer(snapshot.remote_id(), cx) {
-            let start = range.context.start.to_point(&snapshot);
-            let end = range.context.end.to_point(&snapshot);
-            if start <= point && point < end {
-                found = Some((snapshot.clip_point(point, Bias::Left), excerpt_id));
-                break;
-            }
-            if point < start {
-                found = Some((start, excerpt_id));
-            }
-            if point > end {
-                found = Some((end, excerpt_id));
-            }
-        }
-
-        found.map(|(point, excerpt_id)| {
-            let text_anchor = snapshot.anchor_after(point);
-            Anchor::in_buffer(excerpt_id, text_anchor)
-        })
-    }
-
-    pub fn buffer_anchor_to_anchor(
-        &self,
-        buffer: &Entity<Buffer>,
-        anchor: text::Anchor,
-        cx: &App,
-    ) -> Option<Anchor> {
-        let snapshot = buffer.read(cx).snapshot();
-        for (excerpt_id, range) in self.excerpts_for_buffer(snapshot.remote_id(), cx) {
-            if range.context.start.cmp(&anchor, &snapshot).is_le()
-                && range.context.end.cmp(&anchor, &snapshot).is_ge()
-            {
-                return Some(Anchor::in_buffer(excerpt_id, anchor));
-            }
-        }
-
-        None
-    }
-
-    pub fn remove_excerpts(
-        &mut self,
-        excerpt_ids: impl IntoIterator<Item = ExcerptId>,
-        cx: &mut Context<Self>,
-    ) {
-        self.sync_mut(cx);
-        let ids = excerpt_ids.into_iter().collect::<Vec<_>>();
-        if ids.is_empty() {
-            return;
-        }
-        self.buffer_changed_since_sync.replace(true);
-
-        let mut snapshot = self.snapshot.get_mut();
-        let mut new_excerpts = SumTree::default();
-        let mut cursor = snapshot
-            .excerpts
-            .cursor::<Dimensions<Option<&Locator>, ExcerptOffset>>(());
-        let mut edits = Vec::new();
-        let mut excerpt_ids = ids.iter().copied().peekable();
-        let mut removed_buffer_ids = Vec::new();
-
-        while let Some(excerpt_id) = excerpt_ids.next() {
-            self.paths_by_excerpt.remove(&excerpt_id);
-            // Seek to the next excerpt to remove, preserving any preceding excerpts.
-            let locator = snapshot.excerpt_locator_for_id(excerpt_id);
-            new_excerpts.append(cursor.slice(&Some(locator), Bias::Left), ());
-
-            if let Some(mut excerpt) = cursor.item() {
-                if excerpt.id != excerpt_id {
-                    continue;
-                }
-                let mut old_start = cursor.start().1;
-
-                // Skip over the removed excerpt.
-                'remove_excerpts: loop {
-                    if let Some(buffer_state) = self.buffers.get_mut(&excerpt.buffer_id) {
-                        buffer_state.excerpts.retain(|l| l != &excerpt.locator);
-                        if buffer_state.excerpts.is_empty() {
-                            log::debug!(
-                                "removing buffer and diff for buffer {}",
-                                excerpt.buffer_id
-                            );
-                            self.buffers.remove(&excerpt.buffer_id);
-                            removed_buffer_ids.push(excerpt.buffer_id);
-                        }
-                    }
-                    cursor.next();
-
-                    // Skip over any subsequent excerpts that are also removed.
-                    if let Some(&next_excerpt_id) = excerpt_ids.peek() {
-                        let next_locator = snapshot.excerpt_locator_for_id(next_excerpt_id);
-                        if let Some(next_excerpt) = cursor.item()
-                            && next_excerpt.locator == *next_locator
-                        {
-                            excerpt_ids.next();
-                            excerpt = next_excerpt;
-                            continue 'remove_excerpts;
-                        }
-                    }
-
-                    break;
-                }
-
-                // When removing the last excerpt, remove the trailing newline from
-                // the previous excerpt.
-                if cursor.item().is_none() && old_start > MultiBufferOffset::ZERO {
-                    old_start -= 1;
-                    new_excerpts.update_last(|e| e.has_trailing_newline = false, ());
-                }
-
-                // Push an edit for the removal of this run of excerpts.
-                let old_end = cursor.start().1;
-                let new_start = ExcerptDimension(new_excerpts.summary().text.len);
-                edits.push(Edit {
-                    old: old_start..old_end,
-                    new: new_start..new_start,
-                });
-            }
-        }
-        let suffix = cursor.suffix();
-        let changed_trailing_excerpt = suffix.is_empty();
-        new_excerpts.append(suffix, ());
-        drop(cursor);
-        snapshot.excerpts = new_excerpts;
-        for buffer_id in &removed_buffer_ids {
-            self.diffs.remove(buffer_id);
-            snapshot.diffs.remove(buffer_id);
-        }
-
-        if changed_trailing_excerpt {
-            snapshot.trailing_excerpt_update_count += 1;
-        }
-
-        let edits = Self::sync_diff_transforms(
-            &mut snapshot,
-            edits,
-            DiffChangeKind::BufferEdited,
-            self.filter_mode,
-        );
-        if !edits.is_empty() {
-            self.subscriptions.publish(edits);
-        }
-
-        if let Some(follower) = &self.follower {
-            follower.update(cx, |follower, cx| {
-                follower.remove_excerpts(ids.clone(), cx);
-            })
-        }
-
-        cx.emit(Event::Edited {
-            edited_buffer: None,
-        });
-        cx.emit(Event::ExcerptsRemoved {
-            ids,
-            removed_buffer_ids,
-        });
-        cx.notify();
-    }
-
-    pub fn wait_for_anchors<'a, Anchors: 'a + Iterator<Item = Anchor>>(
-        &self,
-        anchors: Anchors,
-        cx: &mut Context<Self>,
-    ) -> impl 'static + Future<Output = Result<()>> + use<Anchors> {
-        let mut error = None;
-        let mut futures = Vec::new();
-        for anchor in anchors {
-            if let Some(buffer_id) = anchor.text_anchor.buffer_id {
-                if let Some(buffer) = self.buffers.get(&buffer_id) {
-                    buffer.buffer.update(cx, |buffer, _| {
-                        futures.push(buffer.wait_for_anchors([anchor.text_anchor]))
-                    });
-                } else {
-                    error = Some(anyhow!(
-                        "buffer {buffer_id} is not part of this multi-buffer"
-                    ));
-                    break;
-                }
-            }
-        }
-        async move {
-            if let Some(error) = error {
-                Err(error)?;
-            }
-            for future in futures {
-                future.await?;
-            }
-            Ok(())
-        }
-    }
-
-    pub fn text_anchor_for_position<T: ToOffset>(
-        &self,
-        position: T,
-        cx: &App,
-    ) -> Option<(Entity<Buffer>, language::Anchor)> {
-        let snapshot = self.read(cx);
-        let anchor = snapshot.anchor_before(position);
-        let buffer = self
-            .buffers
-            .get(&anchor.text_anchor.buffer_id?)?
-            .buffer
-            .clone();
-        Some((buffer, anchor.text_anchor))
-    }
-
-    fn on_buffer_event(
-        &mut self,
-        buffer: Entity<Buffer>,
-        event: &language::BufferEvent,
-        cx: &mut Context<Self>,
-    ) {
-        use language::BufferEvent;
-        let buffer_id = buffer.read(cx).remote_id();
-        cx.emit(match event {
-            BufferEvent::Edited => Event::Edited {
-                edited_buffer: Some(buffer),
-            },
-            BufferEvent::DirtyChanged => Event::DirtyChanged,
-            BufferEvent::Saved => Event::Saved,
-            BufferEvent::FileHandleChanged => Event::FileHandleChanged,
-            BufferEvent::Reloaded => Event::Reloaded,
-            BufferEvent::LanguageChanged(has_language) => {
-                Event::LanguageChanged(buffer_id, *has_language)
-            }
-            BufferEvent::Reparsed => Event::Reparsed(buffer_id),
-            BufferEvent::DiagnosticsUpdated => Event::DiagnosticsUpdated,
-            BufferEvent::CapabilityChanged => {
-                self.capability = buffer.read(cx).capability();
-                return;
-            }
-            BufferEvent::Operation { .. } | BufferEvent::ReloadNeeded => return,
-        });
-    }
-
-    fn buffer_diff_language_changed(&mut self, diff: Entity<BufferDiff>, cx: &mut Context<Self>) {
-        let diff = diff.read(cx);
-        let buffer_id = diff.buffer_id;
-        let diff = diff.snapshot(cx);
-        self.snapshot.get_mut().diffs.insert(buffer_id, diff);
-    }
-
-    fn buffer_diff_changed(
-        &mut self,
-        diff: Entity<BufferDiff>,
-        range: Range<text::Anchor>,
-        cx: &mut Context<Self>,
-    ) {
-        self.sync_mut(cx);
-
-        let diff = diff.read(cx);
-        let buffer_id = diff.buffer_id;
-        let Some(buffer_state) = self.buffers.get(&buffer_id) else {
-            return;
-        };
-        self.buffer_changed_since_sync.replace(true);
-
-        let buffer = buffer_state.buffer.read(cx);
-        let diff_change_range = range.to_offset(buffer);
-
-        let new_diff = diff.snapshot(cx);
-        let mut snapshot = self.snapshot.get_mut();
-        let base_text_changed = snapshot
-            .diffs
-            .get(&buffer_id)
-            .is_none_or(|old_diff| !new_diff.base_texts_eq(old_diff));
-
-        snapshot.diffs.insert_or_replace(buffer_id, new_diff);
-
-        let mut excerpt_edits = Vec::new();
-        for locator in &buffer_state.excerpts {
-            let mut cursor = snapshot
-                .excerpts
-                .cursor::<Dimensions<Option<&Locator>, ExcerptOffset>>(());
-            cursor.seek_forward(&Some(locator), Bias::Left);
-            if let Some(excerpt) = cursor.item()
-                && excerpt.locator == *locator
-            {
-                let excerpt_buffer_range = excerpt.range.context.to_offset(&excerpt.buffer);
-                if diff_change_range.end < excerpt_buffer_range.start
-                    || diff_change_range.start > excerpt_buffer_range.end
-                {
-                    continue;
-                }
-                let excerpt_start = cursor.start().1;
-                let excerpt_len = excerpt.text_summary.len;
-                let diff_change_start_in_excerpt = diff_change_range
-                    .start
-                    .saturating_sub(excerpt_buffer_range.start);
-                let diff_change_end_in_excerpt = diff_change_range
-                    .end
-                    .saturating_sub(excerpt_buffer_range.start);
-                let edit_start = excerpt_start + diff_change_start_in_excerpt.min(excerpt_len);
-                let edit_end = excerpt_start + diff_change_end_in_excerpt.min(excerpt_len);
-                excerpt_edits.push(Edit {
-                    old: edit_start..edit_end,
-                    new: edit_start..edit_end,
-                });
-            }
-        }
-
-        let edits = Self::sync_diff_transforms(
-            &mut snapshot,
-            excerpt_edits,
-            DiffChangeKind::DiffUpdated {
-                base_changed: base_text_changed,
-            },
-            self.filter_mode,
-        );
-        if !edits.is_empty() {
-            self.subscriptions.publish(edits);
-        }
-        cx.emit(Event::Edited {
-            edited_buffer: None,
-        });
-    }
-
-    pub fn all_buffers(&self) -> HashSet<Entity<Buffer>> {
-        self.buffers
-            .values()
-            .map(|state| state.buffer.clone())
-            .collect()
-    }
-
-    pub fn all_buffer_ids(&self) -> Vec<BufferId> {
-        self.buffers.keys().copied().collect()
-    }
-
-    pub fn buffer(&self, buffer_id: BufferId) -> Option<Entity<Buffer>> {
-        self.buffers
-            .get(&buffer_id)
-            .map(|state| state.buffer.clone())
-    }
-
-    pub fn language_at<T: ToOffset>(&self, point: T, cx: &App) -> Option<Arc<Language>> {
-        self.point_to_buffer_offset(point, cx)
-            .and_then(|(buffer, offset)| buffer.read(cx).language_at(offset))
-    }
-
-    pub fn language_settings<'a>(&'a self, cx: &'a App) -> Cow<'a, LanguageSettings> {
-        let buffer_id = self
-            .snapshot
-            .borrow()
-            .excerpts
-            .first()
-            .map(|excerpt| excerpt.buffer.remote_id());
-        buffer_id
-            .and_then(|buffer_id| self.buffer(buffer_id))
-            .map(|buffer| {
-                let buffer = buffer.read(cx);
-                language_settings(buffer.language().map(|l| l.name()), buffer.file(), cx)
-            })
-            .unwrap_or_else(move || self.language_settings_at(MultiBufferOffset::default(), cx))
-    }
-
-    pub fn language_settings_at<'a, T: ToOffset>(
-        &'a self,
-        point: T,
-        cx: &'a App,
-    ) -> Cow<'a, LanguageSettings> {
-        let mut language = None;
-        let mut file = None;
-        if let Some((buffer, offset)) = self.point_to_buffer_offset(point, cx) {
-            let buffer = buffer.read(cx);
-            language = buffer.language_at(offset);
-            file = buffer.file();
-        }
-        language_settings(language.map(|l| l.name()), file, cx)
-    }
-
-    pub fn for_each_buffer(&self, mut f: impl FnMut(&Entity<Buffer>)) {
-        self.buffers.values().for_each(|state| f(&state.buffer))
-    }
-
-    pub fn explicit_title(&self) -> Option<&str> {
-        self.title.as_deref()
-    }
-
-    pub fn title<'a>(&'a self, cx: &'a App) -> Cow<'a, str> {
-        if let Some(title) = self.title.as_ref() {
-            return title.into();
-        }
-
-        if let Some(buffer) = self.as_singleton() {
-            let buffer = buffer.read(cx);
-
-            if let Some(file) = buffer.file() {
-                return file.file_name(cx).into();
-            }
-
-            if let Some(title) = self.buffer_content_title(buffer) {
-                return title;
-            }
-        };
-
-        "untitled".into()
-    }
-
-    fn buffer_content_title(&self, buffer: &Buffer) -> Option<Cow<'_, str>> {
-        let mut is_leading_whitespace = true;
-        let mut count = 0;
-        let mut prev_was_space = false;
-        let mut title = String::new();
-
-        for ch in buffer.snapshot().chars() {
-            if is_leading_whitespace && ch.is_whitespace() {
-                continue;
-            }
-
-            is_leading_whitespace = false;
-
-            if ch == '\n' || count >= 40 {
-                break;
-            }
-
-            if ch.is_whitespace() {
-                if !prev_was_space {
-                    title.push(' ');
-                    count += 1;
-                    prev_was_space = true;
-                }
-            } else {
-                title.push(ch);
-                count += 1;
-                prev_was_space = false;
-            }
-        }
-
-        let title = title.trim_end().to_string();
-
-        if title.is_empty() {
-            return None;
-        }
-
-        Some(title.into())
-    }
-
-    pub fn set_title(&mut self, title: String, cx: &mut Context<Self>) {
-        self.title = Some(title);
-        cx.notify();
-    }
-
-    /// Preserve preview tabs containing this multibuffer until additional edits occur.
-    pub fn refresh_preview(&self, cx: &mut Context<Self>) {
-        for buffer_state in self.buffers.values() {
-            buffer_state
-                .buffer
-                .update(cx, |buffer, _cx| buffer.refresh_preview());
-        }
-    }
-
-    /// Whether we should preserve the preview status of a tab containing this multi-buffer.
-    pub fn preserve_preview(&self, cx: &App) -> bool {
-        self.buffers
-            .values()
-            .all(|state| state.buffer.read(cx).preserve_preview())
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn is_parsing(&self, cx: &App) -> bool {
-        self.as_singleton().unwrap().read(cx).is_parsing()
-    }
-
-    pub fn add_diff(&mut self, diff: Entity<BufferDiff>, cx: &mut Context<Self>) {
-        let buffer_id = diff.read(cx).buffer_id;
-        self.buffer_diff_changed(
-            diff.clone(),
-            text::Anchor::min_max_range_for_buffer(buffer_id),
-            cx,
-        );
-        self.diffs
-            .insert(buffer_id, DiffState::new(diff.clone(), cx));
-
-        if let Some(follower) = &self.follower {
-            follower.update(cx, |follower, cx| {
-                follower.add_diff(diff, cx);
-            })
-        }
-    }
-
-    pub fn diff_for(&self, buffer_id: BufferId) -> Option<Entity<BufferDiff>> {
-        self.diffs.get(&buffer_id).map(|state| state.diff.clone())
-    }
-
-    pub fn expand_diff_hunks(&mut self, ranges: Vec<Range<Anchor>>, cx: &mut Context<Self>) {
-        self.expand_or_collapse_diff_hunks(ranges, true, cx);
-    }
-
-    pub fn collapse_diff_hunks(&mut self, ranges: Vec<Range<Anchor>>, cx: &mut Context<Self>) {
-        self.expand_or_collapse_diff_hunks(ranges, false, cx);
-    }
-
-    pub fn set_all_diff_hunks_expanded(&mut self, cx: &mut Context<Self>) {
-        self.snapshot.get_mut().all_diff_hunks_expanded = true;
-        self.expand_or_collapse_diff_hunks(vec![Anchor::min()..Anchor::max()], true, cx);
-    }
-
-    pub fn all_diff_hunks_expanded(&self) -> bool {
-        self.snapshot.borrow().all_diff_hunks_expanded
-    }
-
-    pub fn set_all_diff_hunks_collapsed(&mut self, cx: &mut Context<Self>) {
-        self.snapshot.get_mut().all_diff_hunks_expanded = false;
-        self.expand_or_collapse_diff_hunks(vec![Anchor::min()..Anchor::max()], false, cx);
-    }
-
-    pub fn has_multiple_hunks(&self, cx: &App) -> bool {
-        self.read(cx)
-            .diff_hunks_in_range(Anchor::min()..Anchor::max())
-            .nth(1)
-            .is_some()
-    }
-
-    pub fn single_hunk_is_expanded(&self, range: Range<Anchor>, cx: &App) -> bool {
-        let snapshot = self.read(cx);
-        let mut cursor = snapshot.diff_transforms.cursor::<MultiBufferOffset>(());
-        let offset_range = range.to_offset(&snapshot);
-        cursor.seek(&offset_range.start, Bias::Left);
-        while let Some(item) = cursor.item() {
-            if *cursor.start() >= offset_range.end && *cursor.start() > offset_range.start {
-                break;
-            }
-            if item.hunk_info().is_some() {
-                return true;
-            }
-            cursor.next();
-        }
-        false
-    }
-
-    pub fn has_expanded_diff_hunks_in_ranges(&self, ranges: &[Range<Anchor>], cx: &App) -> bool {
-        let snapshot = self.read(cx);
-        let mut cursor = snapshot.diff_transforms.cursor::<MultiBufferOffset>(());
-        for range in ranges {
-            let range = range.to_point(&snapshot);
-            let start = snapshot.point_to_offset(Point::new(range.start.row, 0));
-            let end = snapshot.point_to_offset(Point::new(range.end.row + 1, 0));
-            let start = start.saturating_sub_usize(1);
-            let end = snapshot.len().min(end + 1usize);
-            cursor.seek(&start, Bias::Right);
-            while let Some(item) = cursor.item() {
-                if *cursor.start() >= end {
-                    break;
-                }
-                if item.hunk_info().is_some() {
-                    return true;
-                }
-                cursor.next();
-            }
-        }
-        false
-    }
-
-    pub fn expand_or_collapse_diff_hunks_inner(
-        &mut self,
-        ranges: impl IntoIterator<Item = (Range<Point>, ExcerptId)>,
-        expand: bool,
-        cx: &mut Context<Self>,
-    ) {
-        if self.snapshot.borrow().all_diff_hunks_expanded && !expand {
-            return;
-        }
-        self.sync_mut(cx);
-        let mut snapshot = self.snapshot.get_mut();
-        let mut excerpt_edits = Vec::new();
-        let mut last_hunk_row = None;
-        for (range, end_excerpt_id) in ranges {
-            for diff_hunk in snapshot.diff_hunks_in_range(range) {
-                if diff_hunk.excerpt_id.cmp(&end_excerpt_id, &snapshot).is_gt() {
-                    continue;
-                }
-                if last_hunk_row.is_some_and(|row| row >= diff_hunk.row_range.start) {
-                    continue;
-                }
-                let start = Anchor::in_buffer(diff_hunk.excerpt_id, diff_hunk.buffer_range.start);
-                let end = Anchor::in_buffer(diff_hunk.excerpt_id, diff_hunk.buffer_range.end);
-                let start = snapshot.excerpt_offset_for_anchor(&start);
-                let end = snapshot.excerpt_offset_for_anchor(&end);
-                last_hunk_row = Some(diff_hunk.row_range.start);
-                excerpt_edits.push(text::Edit {
-                    old: start..end,
-                    new: start..end,
-                });
-            }
-        }
-
-        let edits = Self::sync_diff_transforms(
-            &mut snapshot,
-            excerpt_edits,
-            DiffChangeKind::ExpandOrCollapseHunks { expand },
-            self.filter_mode,
-        );
-        if !edits.is_empty() {
-            self.subscriptions.publish(edits);
-        }
-        cx.emit(Event::DiffHunksToggled);
-        cx.emit(Event::Edited {
-            edited_buffer: None,
-        });
-    }
-
-    pub fn expand_or_collapse_diff_hunks(
-        &mut self,
-        ranges: Vec<Range<Anchor>>,
-        expand: bool,
-        cx: &mut Context<Self>,
-    ) {
-        let snapshot = self.snapshot.borrow().clone();
-        let ranges = ranges.iter().map(move |range| {
-            let end_excerpt_id = range.end.excerpt_id;
-            let range = range.to_point(&snapshot);
-            let mut peek_end = range.end;
-            if range.end.row < snapshot.max_row().0 {
-                peek_end = Point::new(range.end.row + 1, 0);
-            };
-            (range.start..peek_end, end_excerpt_id)
-        });
-        self.expand_or_collapse_diff_hunks_inner(ranges, expand, cx);
-    }
-
-    pub fn resize_excerpt(
-        &mut self,
-        id: ExcerptId,
-        range: Range<text::Anchor>,
-        cx: &mut Context<Self>,
-    ) {
-        self.sync_mut(cx);
-
-        let mut snapshot = self.snapshot.get_mut();
-        let locator = snapshot.excerpt_locator_for_id(id);
-        let mut new_excerpts = SumTree::default();
-        let mut cursor = snapshot
-            .excerpts
-            .cursor::<Dimensions<Option<&Locator>, ExcerptOffset>>(());
-        let mut edits = Vec::<Edit<ExcerptOffset>>::new();
-
-        let prefix = cursor.slice(&Some(locator), Bias::Left);
-        new_excerpts.append(prefix, ());
-
-        let mut excerpt = cursor.item().unwrap().clone();
-        let old_text_len = excerpt.text_summary.len;
-
-        excerpt.range.context.start = range.start;
-        excerpt.range.context.end = range.end;
-        excerpt.max_buffer_row = range.end.to_point(&excerpt.buffer).row;
-
-        excerpt.text_summary = excerpt
-            .buffer
-            .text_summary_for_range(excerpt.range.context.clone());
-
-        let new_start_offset = ExcerptDimension(new_excerpts.summary().text.len);
-        let old_start_offset = cursor.start().1;
-        let new_text_len = excerpt.text_summary.len;
-        let edit = Edit {
-            old: old_start_offset..old_start_offset + old_text_len,
-            new: new_start_offset..new_start_offset + new_text_len,
-        };
-
-        if let Some(last_edit) = edits.last_mut() {
-            if last_edit.old.end == edit.old.start {
-                last_edit.old.end = edit.old.end;
-                last_edit.new.end = edit.new.end;
-            } else {
-                edits.push(edit);
-            }
-        } else {
-            edits.push(edit);
-        }
-
-        new_excerpts.push(excerpt, ());
-
-        cursor.next();
-
-        new_excerpts.append(cursor.suffix(), ());
-
-        drop(cursor);
-        snapshot.excerpts = new_excerpts;
-
-        if let Some(follower) = &self.follower {
-            follower.update(cx, |follower, cx| follower.resize_excerpt(id, range, cx));
-        }
-
-        let edits = Self::sync_diff_transforms(
-            &mut snapshot,
-            edits,
-            DiffChangeKind::BufferEdited,
-            self.filter_mode,
-        );
-        if !edits.is_empty() {
-            self.subscriptions.publish(edits);
-        }
-        cx.emit(Event::Edited {
-            edited_buffer: None,
-        });
-        cx.emit(Event::ExcerptsExpanded { ids: vec![id] });
-        cx.notify();
-    }
-
-    pub fn expand_excerpts(
-        &mut self,
-        ids: impl IntoIterator<Item = ExcerptId>,
-        line_count: u32,
-        direction: ExpandExcerptDirection,
-        cx: &mut Context<Self>,
-    ) {
-        if line_count == 0 {
-            return;
-        }
-        self.sync_mut(cx);
-        if !self.excerpts_by_path.is_empty() {
-            self.expand_excerpts_with_paths(ids, line_count, direction, cx);
-            return;
-        }
-        let mut snapshot = self.snapshot.get_mut();
-
-        let ids = ids.into_iter().collect::<Vec<_>>();
-        let locators = snapshot.excerpt_locators_for_ids(ids.iter().copied());
-        let mut new_excerpts = SumTree::default();
-        let mut cursor = snapshot
-            .excerpts
-            .cursor::<Dimensions<Option<&Locator>, ExcerptOffset>>(());
-        let mut excerpt_edits = Vec::<Edit<ExcerptOffset>>::new();
-
-        for locator in &locators {
-            let prefix = cursor.slice(&Some(locator), Bias::Left);
-            new_excerpts.append(prefix, ());
-
-            let mut excerpt = cursor.item().unwrap().clone();
-            let old_text_len = excerpt.text_summary.len;
-
-            let up_line_count = if direction.should_expand_up() {
-                line_count
-            } else {
-                0
-            };
-
-            let start_row = excerpt
-                .range
-                .context
-                .start
-                .to_point(&excerpt.buffer)
-                .row
-                .saturating_sub(up_line_count);
-            let start_point = Point::new(start_row, 0);
-            excerpt.range.context.start = excerpt.buffer.anchor_before(start_point);
-
-            let down_line_count = if direction.should_expand_down() {
-                line_count
-            } else {
-                0
-            };
-
-            let mut end_point = excerpt.buffer.clip_point(
-                excerpt.range.context.end.to_point(&excerpt.buffer)
-                    + Point::new(down_line_count, 0),
-                Bias::Left,
-            );
-            end_point.column = excerpt.buffer.line_len(end_point.row);
-            excerpt.range.context.end = excerpt.buffer.anchor_after(end_point);
-            excerpt.max_buffer_row = end_point.row;
-
-            excerpt.text_summary = excerpt
-                .buffer
-                .text_summary_for_range(excerpt.range.context.clone());
-
-            let new_start_offset = ExcerptDimension(new_excerpts.summary().text.len);
-            let old_start_offset = cursor.start().1;
-            let new_text_len = excerpt.text_summary.len;
-            let edit = Edit {
-                old: old_start_offset..old_start_offset + old_text_len,
-                new: new_start_offset..new_start_offset + new_text_len,
-            };
-
-            if let Some(last_edit) = excerpt_edits.last_mut() {
-                if last_edit.old.end == edit.old.start {
-                    last_edit.old.end = edit.old.end;
-                    last_edit.new.end = edit.new.end;
-                } else {
-                    excerpt_edits.push(edit);
-                }
-            } else {
-                excerpt_edits.push(edit);
-            }
-
-            new_excerpts.push(excerpt, ());
-
-            cursor.next();
-        }
-
-        new_excerpts.append(cursor.suffix(), ());
-
-        drop(cursor);
-        snapshot.excerpts = new_excerpts.clone();
-
-        let edits = Self::sync_diff_transforms(
-            &mut snapshot,
-            excerpt_edits.clone(),
-            DiffChangeKind::BufferEdited,
-            self.filter_mode,
-        );
-        if !edits.is_empty() {
-            self.subscriptions.publish(edits);
-        }
-        if let Some(follower) = &self.follower {
-            follower.update(cx, |follower, cx| {
-                follower.expand_excerpts(ids.clone(), line_count, direction, cx);
-            })
-        }
-        cx.emit(Event::Edited {
-            edited_buffer: None,
-        });
-        cx.emit(Event::ExcerptsExpanded { ids });
-        cx.notify();
-    }
-
-    #[ztracing::instrument(skip_all)]
-    fn sync(&self, cx: &App) {
-        let changed = self.buffer_changed_since_sync.replace(false);
-        if !changed {
-            return;
-        }
-        let edits = Self::sync_from_buffer_changes(
-            &mut self.snapshot.borrow_mut(),
-            &self.buffers,
-            &self.diffs,
-            self.filter_mode,
-            cx,
-        );
-        if !edits.is_empty() {
-            self.subscriptions.publish(edits);
-        }
-    }
-
-    fn sync_mut(&mut self, cx: &App) {
-        let changed = self.buffer_changed_since_sync.replace(false);
-        if !changed {
-            return;
-        }
-        let edits = Self::sync_from_buffer_changes(
-            self.snapshot.get_mut(),
-            &self.buffers,
-            &self.diffs,
-            self.filter_mode,
-            cx,
-        );
-
-        if !edits.is_empty() {
-            self.subscriptions.publish(edits);
-        }
-    }
-
-    fn sync_from_buffer_changes(
-        snapshot: &mut MultiBufferSnapshot,
-        buffers: &HashMap<BufferId, BufferState>,
-        diffs: &HashMap<BufferId, DiffState>,
-        filter_mode: Option<MultiBufferFilterMode>,
-        cx: &App,
-    ) -> Vec<Edit<MultiBufferOffset>> {
-        let MultiBufferSnapshot {
-            excerpts,
-            diffs: buffer_diff,
-            diff_transforms: _,
-            non_text_state_update_count,
-            edit_count,
-            is_dirty,
-            has_deleted_file,
-            has_conflict,
-            singleton: _,
-            excerpt_ids: _,
-            replaced_excerpts: _,
-            trailing_excerpt_update_count: _,
-            all_diff_hunks_expanded: _,
-            show_headers: _,
-        } = snapshot;
-        *is_dirty = false;
-        *has_deleted_file = false;
-        *has_conflict = false;
-
-        let mut excerpts_to_edit = Vec::new();
-        let mut non_text_state_updated = false;
-        let mut edited = false;
-        for buffer_state in buffers.values() {
-            let buffer = buffer_state.buffer.read(cx);
-            let version = buffer.version();
-            let non_text_state_update_count = buffer.non_text_state_update_count();
-
-            let buffer_edited = version.changed_since(&buffer_state.last_version.borrow());
-            let buffer_non_text_state_updated =
-                non_text_state_update_count > buffer_state.last_non_text_state_update_count.get();
-            if buffer_edited || buffer_non_text_state_updated {
-                *buffer_state.last_version.borrow_mut() = version;
-                buffer_state
-                    .last_non_text_state_update_count
-                    .set(non_text_state_update_count);
-                excerpts_to_edit.extend(
-                    buffer_state
-                        .excerpts
-                        .iter()
-                        .map(|locator| (locator, buffer_state.buffer.clone(), buffer_edited)),
-                );
-            }
-
-            edited |= buffer_edited;
-            non_text_state_updated |= buffer_non_text_state_updated;
-            *is_dirty |= buffer.is_dirty();
-            *has_deleted_file |= buffer
-                .file()
-                .is_some_and(|file| file.disk_state() == DiskState::Deleted);
-            *has_conflict |= buffer.has_conflict();
-        }
-        if edited {
-            *edit_count += 1;
-        }
-        if non_text_state_updated {
-            *non_text_state_update_count += 1;
-        }
-
-        for (id, diff) in diffs.iter() {
-            if buffer_diff.get(id).is_none() {
-                buffer_diff.insert(*id, diff.diff.read(cx).snapshot(cx));
-            }
-        }
-
-        excerpts_to_edit.sort_unstable_by_key(|(locator, _, _)| *locator);
-
-        let mut edits = Vec::new();
-        let mut new_excerpts = SumTree::default();
-        let mut cursor = excerpts.cursor::<Dimensions<Option<&Locator>, ExcerptOffset>>(());
-
-        for (locator, buffer, buffer_edited) in excerpts_to_edit {
-            new_excerpts.append(cursor.slice(&Some(locator), Bias::Left), ());
-            let old_excerpt = cursor.item().unwrap();
-            let buffer = buffer.read(cx);
-            let buffer_id = buffer.remote_id();
-
-            let mut new_excerpt;
-            if buffer_edited {
-                edits.extend(
-                    buffer
-                        .edits_since_in_range::<usize>(
-                            old_excerpt.buffer.version(),
-                            old_excerpt.range.context.clone(),
-                        )
-                        .map(|edit| {
-                            let excerpt_old_start = cursor.start().1;
-                            let excerpt_new_start =
-                                ExcerptDimension(new_excerpts.summary().text.len);
-                            let old_start = excerpt_old_start + edit.old.start;
-                            let old_end = excerpt_old_start + edit.old.end;
-                            let new_start = excerpt_new_start + edit.new.start;
-                            let new_end = excerpt_new_start + edit.new.end;
-                            Edit {
-                                old: old_start..old_end,
-                                new: new_start..new_end,
-                            }
-                        }),
-                );
-
-                new_excerpt = Excerpt::new(
-                    old_excerpt.id,
-                    locator.clone(),
-                    buffer_id,
-                    buffer.snapshot(),
-                    old_excerpt.range.clone(),
-                    old_excerpt.has_trailing_newline,
-                );
-            } else {
-                new_excerpt = old_excerpt.clone();
-                new_excerpt.buffer = buffer.snapshot();
-            }
-
-            new_excerpts.push(new_excerpt, ());
-            cursor.next();
-        }
-        new_excerpts.append(cursor.suffix(), ());
-
-        drop(cursor);
-        *excerpts = new_excerpts;
-        Self::sync_diff_transforms(snapshot, edits, DiffChangeKind::BufferEdited, filter_mode)
-    }
-
-    fn sync_diff_transforms(
-        snapshot: &mut MultiBufferSnapshot,
-        excerpt_edits: Vec<text::Edit<ExcerptOffset>>,
-        change_kind: DiffChangeKind,
-        filter_mode: Option<MultiBufferFilterMode>,
-    ) -> Vec<Edit<MultiBufferOffset>> {
-        if excerpt_edits.is_empty() {
-            return vec![];
-        }
-
-        let mut excerpts = snapshot.excerpts.cursor::<ExcerptOffset>(());
-        let mut old_diff_transforms = snapshot
-            .diff_transforms
-            .cursor::<Dimensions<ExcerptOffset, MultiBufferOffset>>(());
-        let mut new_diff_transforms = SumTree::default();
-        let mut old_expanded_hunks = HashSet::default();
-        let mut output_edits = Vec::new();
-        let mut output_delta = 0_isize;
-        let mut at_transform_boundary = true;
-        let mut end_of_current_insert = None;
-
-        let mut excerpt_edits: VecDeque<_> = excerpt_edits.into_iter().collect();
-        while let Some(edit) = excerpt_edits.pop_front() {
-            excerpts.seek_forward(&edit.new.start, Bias::Right);
-            if excerpts.item().is_none() && *excerpts.start() == edit.new.start {
-                excerpts.prev();
-            }
-
-            // Keep any transforms that are before the edit.
-            if at_transform_boundary {
-                at_transform_boundary = false;
-                let transforms_before_edit = old_diff_transforms.slice(&edit.old.start, Bias::Left);
-                Self::append_diff_transforms(&mut new_diff_transforms, transforms_before_edit);
-                if let Some(transform) = old_diff_transforms.item()
-                    && old_diff_transforms.end().0 == edit.old.start
-                    && old_diff_transforms.start().0 < edit.old.start
-                {
-                    Self::push_diff_transform(&mut new_diff_transforms, transform.clone());
-                    old_diff_transforms.next();
-                }
-            }
-
-            // Compute the start of the edit in output coordinates.
-            let edit_start_overshoot = if let Some(DiffTransform::FilteredInsertedHunk { .. }) =
-                old_diff_transforms.item()
-            {
-                0
-            } else {
-                edit.old.start - old_diff_transforms.start().0
-            };
-            let edit_old_start = old_diff_transforms.start().1 + edit_start_overshoot;
-            let edit_new_start =
-                MultiBufferOffset((edit_old_start.0 as isize + output_delta) as usize);
-
-            let changed_diff_hunks = Self::recompute_diff_transforms_for_edit(
-                &edit,
-                &mut excerpts,
-                &mut old_diff_transforms,
-                &mut new_diff_transforms,
-                &mut end_of_current_insert,
-                &mut old_expanded_hunks,
-                snapshot,
-                change_kind,
-                filter_mode,
-            );
-
-            // When the added range of a hunk is edited, the end anchor of the hunk may be moved later
-            // in response by hunks_intersecting_range to keep it at a row boundary. In KeepDeletions
-            // mode, we need to make sure that the whole added range is still filtered out in this situation.
-            // We do that by adding an additional edit that covers the rest of the hunk added range.
-            if let Some(current_inserted_hunk) = &end_of_current_insert
-                && current_inserted_hunk.is_filtered
-                // No additional edit needed if we've already covered the whole added range.
-                && current_inserted_hunk.insertion_end_offset > edit.new.end
-                // No additional edit needed if this edit just touched the start of the hunk
-                // (this also prevents pushing the deleted region for the hunk twice).
-                && edit.new.end > current_inserted_hunk.hunk_excerpt_start
-                // No additional edit needed if there is a subsequent edit that intersects
-                // the same hunk (the last such edit will take care of it).
-                && excerpt_edits.front().is_none_or(|next_edit| {
-                    next_edit.new.start >= current_inserted_hunk.insertion_end_offset
-                })
-            {
-                let overshoot = current_inserted_hunk.insertion_end_offset - edit.new.end;
-                let additional_edit = Edit {
-                    old: edit.old.end..edit.old.end + overshoot,
-                    new: edit.new.end..current_inserted_hunk.insertion_end_offset,
-                };
-                excerpt_edits.push_front(additional_edit);
-            }
-
-            // Compute the end of the edit in output coordinates.
-            let edit_old_end_overshoot = if let Some(DiffTransform::FilteredInsertedHunk {
-                ..
-            }) = old_diff_transforms.item()
-            {
-                ExcerptDimension(MultiBufferOffset(0))
-            } else {
-                ExcerptDimension(MultiBufferOffset(
-                    edit.old.end - old_diff_transforms.start().0,
-                ))
-            };
-            let edit_new_end_overshoot = if let Some(current_inserted_hunk) = &end_of_current_insert
-                && current_inserted_hunk.is_filtered
-            {
-                let insertion_end_offset = current_inserted_hunk.insertion_end_offset;
-                let excerpt_len = new_diff_transforms.summary().excerpt_len();
-                let base = insertion_end_offset.max(excerpt_len);
-                edit.new.end.saturating_sub(base)
-            } else {
-                edit.new.end - new_diff_transforms.summary().excerpt_len()
-            };
-            let edit_old_end = old_diff_transforms.start().1 + edit_old_end_overshoot.0;
-            let edit_new_end = new_diff_transforms.summary().output.len + edit_new_end_overshoot;
-            let output_edit = Edit {
-                old: edit_old_start..edit_old_end,
-                new: edit_new_start..edit_new_end,
-            };
-
-            output_delta += (output_edit.new.end - output_edit.new.start) as isize;
-            output_delta -= (output_edit.old.end - output_edit.old.start) as isize;
-            if changed_diff_hunks || matches!(change_kind, DiffChangeKind::BufferEdited) {
-                output_edits.push(output_edit);
-            }
-
-            // If this is the last edit that intersects the current diff transform,
-            // then recreate the content up to the end of this transform, to prepare
-            // for reusing additional slices of the old transforms.
-            if excerpt_edits
-                .front()
-                .is_none_or(|next_edit| next_edit.old.start >= old_diff_transforms.end().0)
-            {
-                let keep_next_old_transform = (old_diff_transforms.start().0 >= edit.old.end)
-                    && match old_diff_transforms.item() {
-                        Some(
-                            DiffTransform::InsertedHunk { hunk_info, .. }
-                            | DiffTransform::FilteredInsertedHunk { hunk_info, .. },
-                        ) => excerpts.item().is_some_and(|excerpt| {
-                            hunk_info.hunk_start_anchor.is_valid(&excerpt.buffer)
-                        }),
-                        _ => true,
-                    };
-
-                let mut excerpt_offset = edit.new.end;
-                if !keep_next_old_transform {
-                    excerpt_offset += old_diff_transforms.end().0 - edit.old.end;
-                    old_diff_transforms.next();
-                }
-
-                old_expanded_hunks.clear();
-                Self::push_buffer_content_transform(
-                    snapshot,
-                    &mut new_diff_transforms,
-                    excerpt_offset,
-                    end_of_current_insert.as_ref(),
-                );
-                at_transform_boundary = true;
-            }
-        }
-
-        // Keep any transforms that are after the last edit.
-        Self::append_diff_transforms(&mut new_diff_transforms, old_diff_transforms.suffix());
-
-        // Ensure there's always at least one buffer content transform.
-        if new_diff_transforms.is_empty() {
-            new_diff_transforms.push(
-                DiffTransform::Unmodified {
-                    summary: Default::default(),
-                },
-                (),
-            );
-        }
-
-        drop(old_diff_transforms);
-        drop(excerpts);
-        snapshot.diff_transforms = new_diff_transforms;
-        snapshot.edit_count += 1;
-
-        #[cfg(any(test, feature = "test-support"))]
-        snapshot.check_invariants();
-        output_edits
-    }
-
-    fn recompute_diff_transforms_for_edit(
-        edit: &Edit<ExcerptOffset>,
-        excerpts: &mut Cursor<Excerpt, ExcerptOffset>,
-        old_diff_transforms: &mut Cursor<
-            DiffTransform,
-            Dimensions<ExcerptOffset, MultiBufferOffset>,
-        >,
-        new_diff_transforms: &mut SumTree<DiffTransform>,
-        end_of_current_insert: &mut Option<CurrentInsertedHunk>,
-        old_expanded_hunks: &mut HashSet<DiffTransformHunkInfo>,
-        snapshot: &MultiBufferSnapshot,
-        change_kind: DiffChangeKind,
-        filter_mode: Option<MultiBufferFilterMode>,
-    ) -> bool {
-        log::trace!(
-            "recomputing diff transform for edit {:?} => {:?}",
-            edit.old.start..edit.old.end,
-            edit.new.start..edit.new.end
-        );
-
-        // Record which hunks were previously expanded.
-        while let Some(item) = old_diff_transforms.item() {
-            if let Some(hunk_info) = item.hunk_info() {
-                log::trace!(
-                    "previously expanded hunk at {:?}",
-                    old_diff_transforms.start()
-                );
-                old_expanded_hunks.insert(hunk_info);
-            }
-            if old_diff_transforms.end().0 > edit.old.end {
-                break;
-            }
-            old_diff_transforms.next();
-        }
-
-        // Avoid querying diff hunks if there's no possibility of hunks being expanded.
-        let all_diff_hunks_expanded = snapshot.all_diff_hunks_expanded;
-        if old_expanded_hunks.is_empty()
-            && change_kind == DiffChangeKind::BufferEdited
-            && !all_diff_hunks_expanded
-        {
-            return false;
-        }
-
-        // Visit each excerpt that intersects the edit.
-        let mut did_expand_hunks = false;
-        while let Some(excerpt) = excerpts.item() {
-            // Recompute the expanded hunks in the portion of the excerpt that
-            // intersects the edit.
-            if let Some(diff) = snapshot.diffs.get(&excerpt.buffer_id) {
-                let buffer = &excerpt.buffer;
-                let excerpt_start = *excerpts.start();
-                let excerpt_end = excerpt_start + excerpt.text_summary.len;
-                let excerpt_buffer_start = excerpt.range.context.start.to_offset(buffer);
-                let excerpt_buffer_end = excerpt_buffer_start + excerpt.text_summary.len;
-                let edit_buffer_start =
-                    excerpt_buffer_start + edit.new.start.saturating_sub(excerpt_start);
-                let edit_buffer_end =
-                    excerpt_buffer_start + edit.new.end.saturating_sub(excerpt_start);
-                let edit_buffer_end = edit_buffer_end.min(excerpt_buffer_end);
-                let edit_anchor_range =
-                    buffer.anchor_before(edit_buffer_start)..buffer.anchor_after(edit_buffer_end);
-
-                for hunk in diff.hunks_intersecting_range(edit_anchor_range, buffer) {
-                    if hunk.is_created_file() && !all_diff_hunks_expanded {
-                        continue;
-                    }
-
-                    let hunk_buffer_range = hunk.buffer_range.to_offset(buffer);
-                    if hunk_buffer_range.start < excerpt_buffer_start {
-                        log::trace!("skipping hunk that starts before excerpt");
-                        continue;
-                    }
-
-                    let hunk_info = DiffTransformHunkInfo {
-                        excerpt_id: excerpt.id,
-                        hunk_start_anchor: hunk.buffer_range.start,
-                        hunk_secondary_status: hunk.secondary_status,
-                        base_text_byte_range: hunk.diff_base_byte_range.clone(),
-                    };
-
-                    let hunk_excerpt_start = excerpt_start
-                        + hunk_buffer_range.start.saturating_sub(excerpt_buffer_start);
-                    let hunk_excerpt_end = excerpt_end
-                        .min(excerpt_start + (hunk_buffer_range.end - excerpt_buffer_start));
-
-                    Self::push_buffer_content_transform(
-                        snapshot,
-                        new_diff_transforms,
-                        hunk_excerpt_start,
-                        end_of_current_insert.as_ref(),
-                    );
-
-                    // For every existing hunk, determine if it was previously expanded
-                    // and if it should currently be expanded.
-                    let was_previously_expanded = old_expanded_hunks.contains(&hunk_info);
-                    let should_expand_hunk = match &change_kind {
-                        DiffChangeKind::DiffUpdated { base_changed: true } => {
-                            was_previously_expanded || all_diff_hunks_expanded
-                        }
-                        DiffChangeKind::ExpandOrCollapseHunks { expand } => {
-                            let intersects = hunk_buffer_range.is_empty()
-                                || hunk_buffer_range.end > edit_buffer_start;
-                            if *expand {
-                                intersects || was_previously_expanded || all_diff_hunks_expanded
-                            } else {
-                                !intersects && (was_previously_expanded || all_diff_hunks_expanded)
-                            }
-                        }
-                        _ => was_previously_expanded || all_diff_hunks_expanded,
-                    };
-
-                    if should_expand_hunk {
-                        did_expand_hunks = true;
-                        log::trace!(
-                            "expanding hunk {:?}, excerpt:{:?}",
-                            hunk_excerpt_start..hunk_excerpt_end,
-                            excerpt.id
-                        );
-
-                        if !hunk.diff_base_byte_range.is_empty()
-                            && hunk_buffer_range.start >= edit_buffer_start
-                            && hunk_buffer_range.start <= excerpt_buffer_end
-                            && filter_mode != Some(MultiBufferFilterMode::KeepInsertions)
-                        {
-                            let base_text = diff.base_text();
-                            let mut text_cursor =
-                                base_text.as_rope().cursor(hunk.diff_base_byte_range.start);
-                            let mut base_text_summary =
-                                text_cursor.summary::<TextSummary>(hunk.diff_base_byte_range.end);
-
-                            let mut has_trailing_newline = false;
-                            if base_text_summary.last_line_chars > 0 {
-                                base_text_summary += TextSummary::newline();
-                                has_trailing_newline = true;
-                            }
-
-                            new_diff_transforms.push(
-                                DiffTransform::DeletedHunk {
-                                    summary: base_text_summary,
-                                    buffer_id: excerpt.buffer_id,
-                                    hunk_info: hunk_info.clone(),
-                                    has_trailing_newline,
-                                },
-                                (),
-                            );
-                        }
-
-                        if !hunk_buffer_range.is_empty() {
-                            let is_filtered =
-                                filter_mode == Some(MultiBufferFilterMode::KeepDeletions);
-                            let insertion_end_offset = hunk_excerpt_end.min(excerpt_end);
-                            *end_of_current_insert = Some(CurrentInsertedHunk {
-                                hunk_excerpt_start,
-                                insertion_end_offset,
-                                hunk_info,
-                                is_filtered,
-                            });
-                        }
-                    }
-                }
-            }
-
-            if excerpts.end() <= edit.new.end {
-                excerpts.next();
-            } else {
-                break;
-            }
-        }
-
-        did_expand_hunks || !old_expanded_hunks.is_empty()
-    }
-
-    fn append_diff_transforms(
-        new_transforms: &mut SumTree<DiffTransform>,
-        subtree: SumTree<DiffTransform>,
-    ) {
-        if let Some(transform) = subtree.first()
-            && Self::extend_last_buffer_content_transform(new_transforms, transform)
-        {
-            let mut cursor = subtree.cursor::<()>(());
-            cursor.next();
-            cursor.next();
-            new_transforms.append(cursor.suffix(), ());
-            return;
-        }
-        new_transforms.append(subtree, ());
-    }
-
-    fn push_diff_transform(new_transforms: &mut SumTree<DiffTransform>, transform: DiffTransform) {
-        if Self::extend_last_buffer_content_transform(new_transforms, &transform) {
-            return;
-        }
-        new_transforms.push(transform, ());
-    }
-
-    fn push_buffer_content_transform(
-        old_snapshot: &MultiBufferSnapshot,
-        new_transforms: &mut SumTree<DiffTransform>,
-        end_offset: ExcerptOffset,
-        current_inserted_hunk: Option<&CurrentInsertedHunk>,
-    ) {
-        if let Some(current_inserted_hunk) = current_inserted_hunk {
-            let start_offset = new_transforms.summary().excerpt_len();
-            let end_offset = current_inserted_hunk.insertion_end_offset.min(end_offset);
-            if end_offset > start_offset {
-                let summary_to_add = old_snapshot
-                    .text_summary_for_excerpt_offset_range::<MBTextSummary>(
-                        start_offset..end_offset,
-                    );
-
-                let transform = if current_inserted_hunk.is_filtered {
-                    DiffTransform::FilteredInsertedHunk {
-                        summary: summary_to_add,
-                        hunk_info: current_inserted_hunk.hunk_info.clone(),
-                    }
-                } else {
-                    DiffTransform::InsertedHunk {
-                        summary: summary_to_add,
-                        hunk_info: current_inserted_hunk.hunk_info.clone(),
-                    }
-                };
-                if !Self::extend_last_buffer_content_transform(new_transforms, &transform) {
-                    new_transforms.push(transform, ())
-                }
-            }
-        }
-
-        let start_offset = new_transforms.summary().excerpt_len();
-        if end_offset > start_offset {
-            let summary_to_add = old_snapshot
-                .text_summary_for_excerpt_offset_range::<MBTextSummary>(start_offset..end_offset);
-
-            let transform = DiffTransform::Unmodified {
-                summary: summary_to_add,
-            };
-            if !Self::extend_last_buffer_content_transform(new_transforms, &transform) {
-                new_transforms.push(transform, ())
-            }
-        }
-    }
-
-    fn extend_last_buffer_content_transform(
-        new_transforms: &mut SumTree<DiffTransform>,
-        transform: &DiffTransform,
-    ) -> bool {
-        let mut did_extend = false;
-        new_transforms.update_last(
-            |last_transform| {
-                did_extend = last_transform.merge_with(&transform);
-            },
-            (),
-        );
-        did_extend
-    }
-}
-
-impl DiffTransform {
-    /// Ergonomic wrapper for [`DiffTransform::merged_with`] that applies the
-    /// merging in-place. Returns `true` if merging was possible.
-    #[must_use = "check whether merging actually succeeded"]
-    fn merge_with(&mut self, other: &Self) -> bool {
-        match self.to_owned().merged_with(other) {
-            Some(merged) => {
-                *self = merged;
-                true
-            }
-            None => false,
-        }
-    }
-
-    /// Attempt to merge `self` with `other`, and return the merged transform.
-    ///
-    /// This will succeed if all of the following are true:
-    /// - both transforms are the same variant
-    /// - neither transform is [`DiffTransform::DeletedHunk`]
-    /// - if both transform are either [`DiffTransform::InsertedHunk`] or
-    ///   [`DiffTransform::FilteredInsertedHunk`], then their
-    ///   `hunk_info.hunk_start_anchor`s match
-    #[must_use = "check whether merging actually succeeded"]
-    #[rustfmt::skip]
-    fn merged_with(self, other: &Self) -> Option<Self> {
-        match (self, other) {
-            (
-                DiffTransform::Unmodified { mut summary },
-                DiffTransform::Unmodified { summary: other_summary },
-            ) => {
-                summary += *other_summary;
-                Some(DiffTransform::Unmodified { summary })
-            }
-            (
-                DiffTransform::FilteredInsertedHunk { mut summary, hunk_info },
-                DiffTransform::FilteredInsertedHunk {
-                    hunk_info: other_hunk_info,
-                    summary: other_summary,
-                },
-            ) => {
-                if hunk_info.hunk_start_anchor == other_hunk_info.hunk_start_anchor {
-                    summary += *other_summary;
-                    Some(DiffTransform::FilteredInsertedHunk { summary, hunk_info })
-                } else {
-                    None
-                }
-            }
-            (
-                DiffTransform::InsertedHunk { mut summary, hunk_info },
-                DiffTransform::InsertedHunk {
-                    hunk_info: other_hunk_info,
-                    summary: other_summary,
-                },
-            ) => {
-                if hunk_info.hunk_start_anchor == other_hunk_info.hunk_start_anchor {
-                    summary += *other_summary;
-                    Some(DiffTransform::InsertedHunk { summary, hunk_info })
-                } else {
-                    None
-                }
-            }
-            _ => return None,
-        }
-    }
-}
-
-fn build_excerpt_ranges(
-    ranges: impl IntoIterator<Item = Range<Point>>,
-    context_line_count: u32,
-    buffer_snapshot: &BufferSnapshot,
-) -> Vec<ExcerptRange<Point>> {
-    ranges
-        .into_iter()
-        .map(|range| {
-            let start_row = range.start.row.saturating_sub(context_line_count);
-            let start = Point::new(start_row, 0);
-            let end_row = (range.end.row + context_line_count).min(buffer_snapshot.max_point().row);
-            let end = Point::new(end_row, buffer_snapshot.line_len(end_row));
-            ExcerptRange {
-                context: start..end,
-                primary: range,
-            }
-        })
-        .collect()
-}
-
-#[cfg(any(test, feature = "test-support"))]
-impl MultiBuffer {
-    pub fn build_simple(text: &str, cx: &mut gpui::App) -> Entity<Self> {
-        let buffer = cx.new(|cx| Buffer::local(text, cx));
-        cx.new(|cx| Self::singleton(buffer, cx))
-    }
-
-    pub fn build_multi<const COUNT: usize>(
-        excerpts: [(&str, Vec<Range<Point>>); COUNT],
-        cx: &mut gpui::App,
-    ) -> Entity<Self> {
-        let multi = cx.new(|_| Self::new(Capability::ReadWrite));
-        for (text, ranges) in excerpts {
-            let buffer = cx.new(|cx| Buffer::local(text, cx));
-            let excerpt_ranges = ranges.into_iter().map(ExcerptRange::new);
-            multi.update(cx, |multi, cx| {
-                multi.push_excerpts(buffer, excerpt_ranges, cx)
-            });
-        }
-
-        multi
-    }
-
-    pub fn build_from_buffer(buffer: Entity<Buffer>, cx: &mut gpui::App) -> Entity<Self> {
-        cx.new(|cx| Self::singleton(buffer, cx))
-    }
-
-    pub fn build_random(rng: &mut impl rand::Rng, cx: &mut gpui::App) -> Entity<Self> {
-        cx.new(|cx| {
-            let mut multibuffer = MultiBuffer::new(Capability::ReadWrite);
-            let mutation_count = rng.random_range(1..=5);
-            multibuffer.randomly_edit_excerpts(rng, mutation_count, cx);
-            multibuffer
-        })
-    }
-
-    pub fn randomly_edit(
-        &mut self,
-        rng: &mut impl rand::Rng,
-        edit_count: usize,
-        cx: &mut Context<Self>,
-    ) {
-        use util::RandomCharIter;
-
-        let snapshot = self.read(cx);
-        let mut edits: Vec<(Range<MultiBufferOffset>, Arc<str>)> = Vec::new();
-        let mut last_end = None;
-        for _ in 0..edit_count {
-            if last_end.is_some_and(|last_end| last_end >= snapshot.len()) {
-                break;
-            }
-
-            let new_start = last_end.map_or(MultiBufferOffset::ZERO, |last_end| last_end + 1usize);
-            let end =
-                snapshot.clip_offset(rng.random_range(new_start..=snapshot.len()), Bias::Right);
-            let start = snapshot.clip_offset(rng.random_range(new_start..=end), Bias::Right);
-            last_end = Some(end);
-
-            let mut range = start..end;
-            if rng.random_bool(0.2) {
-                mem::swap(&mut range.start, &mut range.end);
-            }
-
-            let new_text_len = rng.random_range(0..10);
-            let new_text: String = RandomCharIter::new(&mut *rng).take(new_text_len).collect();
-
-            edits.push((range, new_text.into()));
-        }
-        log::info!("mutating multi-buffer with {:?}", edits);
-        drop(snapshot);
-
-        self.edit(edits, None, cx);
-    }
-
-    pub fn randomly_edit_excerpts(
-        &mut self,
-        rng: &mut impl rand::Rng,
-        mutation_count: usize,
-        cx: &mut Context<Self>,
-    ) {
-        use rand::prelude::*;
-        use std::env;
-        use util::RandomCharIter;
-
-        let max_excerpts = env::var("MAX_EXCERPTS")
-            .map(|i| i.parse().expect("invalid `MAX_EXCERPTS` variable"))
-            .unwrap_or(5);
-
-        let mut buffers = Vec::new();
-        for _ in 0..mutation_count {
-            if rng.random_bool(0.05) {
-                log::info!("Clearing multi-buffer");
-                self.clear(cx);
-                continue;
-            } else if rng.random_bool(0.1) && !self.excerpt_ids().is_empty() {
-                let ids = self.excerpt_ids();
-                let mut excerpts = HashSet::default();
-                for _ in 0..rng.random_range(0..ids.len()) {
-                    excerpts.extend(ids.choose(rng).copied());
-                }
-
-                let line_count = rng.random_range(0..5);
-
-                log::info!("Expanding excerpts {excerpts:?} by {line_count} lines");
-
-                self.expand_excerpts(
-                    excerpts.iter().cloned(),
-                    line_count,
-                    ExpandExcerptDirection::UpAndDown,
-                    cx,
-                );
-                continue;
-            }
-
-            let excerpt_ids = self.excerpt_ids();
-            if excerpt_ids.is_empty() || (rng.random() && excerpt_ids.len() < max_excerpts) {
-                let buffer_handle = if rng.random() || self.buffers.is_empty() {
-                    let text = RandomCharIter::new(&mut *rng).take(10).collect::<String>();
-                    buffers.push(cx.new(|cx| Buffer::local(text, cx)));
-                    let buffer = buffers.last().unwrap().read(cx);
-                    log::info!(
-                        "Creating new buffer {} with text: {:?}",
-                        buffer.remote_id(),
-                        buffer.text()
-                    );
-                    buffers.last().unwrap().clone()
-                } else {
-                    self.buffers.values().choose(rng).unwrap().buffer.clone()
-                };
-
-                let buffer = buffer_handle.read(cx);
-                let buffer_text = buffer.text();
-                let ranges = (0..rng.random_range(0..5))
-                    .map(|_| {
-                        let end_ix =
-                            buffer.clip_offset(rng.random_range(0..=buffer.len()), Bias::Right);
-                        let start_ix = buffer.clip_offset(rng.random_range(0..=end_ix), Bias::Left);
-                        ExcerptRange::new(start_ix..end_ix)
-                    })
-                    .collect::<Vec<_>>();
-                log::info!(
-                    "Inserting excerpts from buffer {} and ranges {:?}: {:?}",
-                    buffer_handle.read(cx).remote_id(),
-                    ranges.iter().map(|r| &r.context).collect::<Vec<_>>(),
-                    ranges
-                        .iter()
-                        .map(|r| &buffer_text[r.context.clone()])
-                        .collect::<Vec<_>>()
-                );
-
-                let excerpt_id = self.push_excerpts(buffer_handle.clone(), ranges, cx);
-                log::info!("Inserted with ids: {:?}", excerpt_id);
-            } else {
-                let remove_count = rng.random_range(1..=excerpt_ids.len());
-                let mut excerpts_to_remove = excerpt_ids
-                    .choose_multiple(rng, remove_count)
-                    .cloned()
-                    .collect::<Vec<_>>();
-                let snapshot = self.snapshot.borrow();
-                excerpts_to_remove.sort_unstable_by(|a, b| a.cmp(b, &snapshot));
-                drop(snapshot);
-                log::info!("Removing excerpts {:?}", excerpts_to_remove);
-                self.remove_excerpts(excerpts_to_remove, cx);
-            }
-        }
-    }
-
-    pub fn randomly_mutate(
-        &mut self,
-        rng: &mut impl rand::Rng,
-        mutation_count: usize,
-        cx: &mut Context<Self>,
-    ) {
-        use rand::prelude::*;
-
-        if rng.random_bool(0.7) || self.singleton {
-            let buffer = self
-                .buffers
-                .values()
-                .choose(rng)
-                .map(|state| state.buffer.clone());
-
-            if let Some(buffer) = buffer {
-                buffer.update(cx, |buffer, cx| {
-                    if rng.random() {
-                        buffer.randomly_edit(rng, mutation_count, cx);
-                    } else {
-                        buffer.randomly_undo_redo(rng, cx);
-                    }
-                });
-            } else {
-                self.randomly_edit(rng, mutation_count, cx);
-            }
-        } else {
-            self.randomly_edit_excerpts(rng, mutation_count, cx);
-        }
-
-        self.check_invariants(cx);
-    }
-
-    fn check_invariants(&self, cx: &App) {
-        self.read(cx).check_invariants();
-    }
-}
-
-impl EventEmitter<Event> for MultiBuffer {}
-
-impl MultiBufferSnapshot {
-    pub fn text(&self) -> String {
-        self.chunks(MultiBufferOffset::ZERO..self.len(), false)
-            .map(|chunk| chunk.text)
-            .collect()
-    }
-
-    pub fn reversed_chars_at<T: ToOffset>(&self, position: T) -> impl Iterator<Item = char> + '_ {
-        self.reversed_chunks_in_range(MultiBufferOffset::ZERO..position.to_offset(self))
-            .flat_map(|c| c.chars().rev())
-    }
-
-    fn reversed_chunks_in_range(
-        &self,
-        range: Range<MultiBufferOffset>,
-    ) -> ReversedMultiBufferChunks<'_> {
-        let mut cursor = self.cursor::<MultiBufferOffset, BufferOffset>();
-        cursor.seek(&range.end);
-        let current_chunks = cursor.region().as_ref().map(|region| {
-            let start_overshoot = range.start.saturating_sub(region.range.start);
-            let end_overshoot = range.end - region.range.start;
-            let end = (region.buffer_range.start + end_overshoot).min(region.buffer_range.end);
-            let start = region.buffer_range.start + start_overshoot;
-            region.buffer.reversed_chunks_in_range(start..end)
-        });
-        ReversedMultiBufferChunks {
-            cursor,
-            current_chunks,
-            start: range.start,
-            offset: range.end,
-        }
-    }
-
-    pub fn chars_at<T: ToOffset>(&self, position: T) -> impl Iterator<Item = char> + '_ {
-        let offset = position.to_offset(self);
-        self.text_for_range(offset..self.len())
-            .flat_map(|chunk| chunk.chars())
-    }
-
-    pub fn text_for_range<T: ToOffset>(&self, range: Range<T>) -> impl Iterator<Item = &str> + '_ {
-        self.chunks(range, false).map(|chunk| chunk.text)
-    }
-
-    pub fn is_line_blank(&self, row: MultiBufferRow) -> bool {
-        self.text_for_range(Point::new(row.0, 0)..Point::new(row.0, self.line_len(row)))
-            .all(|chunk| chunk.matches(|c: char| !c.is_whitespace()).next().is_none())
-    }
-
-    pub fn contains_str_at<T>(&self, position: T, needle: &str) -> bool
-    where
-        T: ToOffset,
-    {
-        let position = position.to_offset(self);
-        position == self.clip_offset(position, Bias::Left)
-            && self
-                .bytes_in_range(position..self.len())
-                .flatten()
-                .copied()
-                .take(needle.len())
-                .eq(needle.bytes())
-    }
-
-    pub fn diff_hunks(&self) -> impl Iterator<Item = MultiBufferDiffHunk> + '_ {
-        self.diff_hunks_in_range(Anchor::min()..Anchor::max())
-    }
-
-    pub fn diff_hunks_in_range<T: ToPoint>(
-        &self,
-        range: Range<T>,
-    ) -> impl Iterator<Item = MultiBufferDiffHunk> + '_ {
-        let query_range = range.start.to_point(self)..range.end.to_point(self);
-        self.lift_buffer_metadata(query_range.clone(), move |buffer, buffer_range| {
-            let diff = self.diffs.get(&buffer.remote_id())?;
-            let buffer_start = buffer.anchor_before(buffer_range.start);
-            let buffer_end = buffer.anchor_after(buffer_range.end);
-            Some(
-                diff.hunks_intersecting_range(buffer_start..buffer_end, buffer)
-                    .filter_map(|hunk| {
-                        if hunk.is_created_file() && !self.all_diff_hunks_expanded {
-                            return None;
-                        }
-                        Some((hunk.range.clone(), hunk))
-                    }),
-            )
-        })
-        .filter_map(move |(range, hunk, excerpt)| {
-            if range.start != range.end && range.end == query_range.start && !hunk.range.is_empty()
-            {
-                return None;
-            }
-            let end_row = if range.end.column == 0 {
-                range.end.row
-            } else {
-                range.end.row + 1
-            };
-
-            let word_diffs = (!hunk.base_word_diffs.is_empty()
-                || !hunk.buffer_word_diffs.is_empty())
-            .then(|| {
-                let hunk_start_offset =
-                    Anchor::in_buffer(excerpt.id, hunk.buffer_range.start).to_offset(self);
-
-                hunk.base_word_diffs
-                    .iter()
-                    .map(|diff| hunk_start_offset + diff.start..hunk_start_offset + diff.end)
-                    .chain(
-                        hunk.buffer_word_diffs
-                            .into_iter()
-                            .map(|diff| Anchor::range_in_buffer(excerpt.id, diff).to_offset(self)),
-                    )
-                    .collect()
-            })
-            .unwrap_or_default();
-
-            Some(MultiBufferDiffHunk {
-                row_range: MultiBufferRow(range.start.row)..MultiBufferRow(end_row),
-                buffer_id: excerpt.buffer_id,
-                excerpt_id: excerpt.id,
-                buffer_range: hunk.buffer_range.clone(),
-                word_diffs,
-                diff_base_byte_range: BufferOffset(hunk.diff_base_byte_range.start)
-                    ..BufferOffset(hunk.diff_base_byte_range.end),
-                secondary_status: hunk.secondary_status,
-            })
-        })
-    }
-
-    fn excerpts_for_range<T: ToOffset>(
-        &self,
-        range: Range<T>,
-    ) -> impl Iterator<Item = &Excerpt> + '_ {
-        let range = range.start.to_offset(self)..range.end.to_offset(self);
-        let mut cursor = self.cursor::<MultiBufferOffset, BufferOffset>();
-        cursor.seek(&range.start);
-        std::iter::from_fn(move || {
-            let region = cursor.region()?;
-            if region.range.start > range.end
-                || region.range.start == range.end && region.range.start > range.start
-            {
-                return None;
-            }
-            cursor.next_excerpt();
-            Some(region.excerpt)
-        })
-    }
-
-    pub fn excerpt_ids_for_range<T: ToOffset>(
-        &self,
-        range: Range<T>,
-    ) -> impl Iterator<Item = ExcerptId> + '_ {
-        self.excerpts_for_range(range).map(|excerpt| excerpt.id)
-    }
-
-    pub fn buffer_ids_for_range<T: ToOffset>(
-        &self,
-        range: Range<T>,
-    ) -> impl Iterator<Item = BufferId> + '_ {
-        self.excerpts_for_range(range)
-            .map(|excerpt| excerpt.buffer_id)
-    }
-
-    pub fn ranges_to_buffer_ranges<T: ToOffset>(
-        &self,
-        ranges: impl Iterator<Item = Range<T>>,
-    ) -> impl Iterator<Item = (&BufferSnapshot, Range<BufferOffset>, ExcerptId)> {
-        ranges.flat_map(|range| self.range_to_buffer_ranges(range).into_iter())
-    }
-
-    pub fn range_to_buffer_ranges<T: ToOffset>(
-        &self,
-        range: Range<T>,
-    ) -> Vec<(&BufferSnapshot, Range<BufferOffset>, ExcerptId)> {
-        let start = range.start.to_offset(self);
-        let end = range.end.to_offset(self);
-
-        let mut cursor = self.cursor::<MultiBufferOffset, BufferOffset>();
-        cursor.seek(&start);
-
-        let mut result: Vec<(&BufferSnapshot, Range<BufferOffset>, ExcerptId)> = Vec::new();
-        while let Some(region) = cursor.region() {
-            if region.range.start > end {
-                break;
-            }
-            if region.is_main_buffer {
-                let start_overshoot = start.saturating_sub(region.range.start);
-                let end_overshoot = end.saturating_sub(region.range.start);
-                let start = region
-                    .buffer_range
-                    .end
-                    .min(region.buffer_range.start + start_overshoot);
-                let end = region
-                    .buffer_range
-                    .end
-                    .min(region.buffer_range.start + end_overshoot);
-                if let Some(prev) = result.last_mut().filter(|(_, prev_range, excerpt_id)| {
-                    *excerpt_id == region.excerpt.id && prev_range.end == start
-                }) {
-                    prev.1.end = end;
-                } else {
-                    result.push((region.buffer, start..end, region.excerpt.id));
-                }
-            }
-            cursor.next();
-        }
-        result
-    }
-
-    pub fn range_to_buffer_ranges_with_deleted_hunks<T: ToOffset>(
-        &self,
-        range: Range<T>,
-    ) -> impl Iterator<
-        Item = (
-            &BufferSnapshot,
-            Range<BufferOffset>,
-            ExcerptId,
-            Option<Anchor>,
-        ),
-    > + '_ {
-        let start = range.start.to_offset(self);
-        let end = range.end.to_offset(self);
-
-        let mut cursor = self.cursor::<MultiBufferOffset, BufferOffset>();
-        cursor.seek(&start);
-
-        std::iter::from_fn(move || {
-            let region = cursor.region()?;
-            if region.range.start > end {
-                return None;
-            }
-            let start_overshoot = start.saturating_sub(region.range.start);
-            let end_overshoot = end.saturating_sub(region.range.start);
-            let start = region
-                .buffer_range
-                .end
-                .min(region.buffer_range.start + start_overshoot);
-            let end = region
-                .buffer_range
-                .end
-                .min(region.buffer_range.start + end_overshoot);
-
-            let region_excerpt_id = region.excerpt.id;
-            let deleted_hunk_anchor = if region.is_main_buffer {
-                None
-            } else {
-                Some(self.anchor_before(region.range.start))
-            };
-            let result = (
-                region.buffer,
-                start..end,
-                region_excerpt_id,
-                deleted_hunk_anchor,
-            );
-            cursor.next();
-            Some(result)
-        })
-    }
-
-    /// Retrieves buffer metadata for the given range, and converts it into multi-buffer
-    /// coordinates.
-    ///
-    /// The given callback will be called for every excerpt intersecting the given range. It will
-    /// be passed the excerpt's buffer and the buffer range that the input range intersects.
-    /// The callback should return an iterator of metadata items from that buffer, each paired
-    /// with a buffer range.
-    ///
-    /// The returned iterator yields each of these metadata items, paired with its range in
-    /// multi-buffer coordinates.
-    fn lift_buffer_metadata<'a, MBD, M, I>(
-        &'a self,
-        query_range: Range<MBD>,
-        get_buffer_metadata: impl 'a + Fn(&'a BufferSnapshot, Range<MBD::TextDimension>) -> Option<I>,
-    ) -> impl Iterator<Item = (Range<MBD>, M, &'a Excerpt)> + 'a
-    where
-        I: Iterator<Item = (Range<MBD::TextDimension>, M)> + 'a,
-        MBD: MultiBufferDimension
-            + Ord
-            + Sub<Output = MBD::TextDimension>
-            + ops::Add<MBD::TextDimension, Output = MBD>
-            + ops::AddAssign<MBD::TextDimension>,
-        MBD::TextDimension: Sub<Output = MBD::TextDimension>
-            + ops::Add<Output = MBD::TextDimension>
-            + AddAssign<MBD::TextDimension>
-            + Ord,
-    {
-        let mut current_excerpt_metadata: Option<(ExcerptId, I)> = None;
-        let mut cursor = self.cursor::<MBD, MBD::TextDimension>();
-
-        // Find the excerpt and buffer offset where the given range ends.
-        cursor.seek(&query_range.end);
-        let mut range_end = None;
-        while let Some(region) = cursor.region() {
-            if region.is_main_buffer {
-                let mut buffer_end = region.buffer_range.start;
-                let overshoot = if query_range.end > region.range.start {
-                    query_range.end - region.range.start
-                } else {
-                    <MBD::TextDimension>::default()
-                };
-                buffer_end = buffer_end + overshoot;
-                range_end = Some((region.excerpt.id, buffer_end));
-                break;
-            }
-            cursor.next();
-        }
-
-        cursor.seek(&query_range.start);
-
-        if let Some(region) = cursor.region().filter(|region| !region.is_main_buffer)
-            && region.range.start > MBD::default()
-        {
-            cursor.prev()
-        }
-
-        iter::from_fn(move || {
-            loop {
-                let excerpt = cursor.excerpt()?;
-
-                // If we have already retrieved metadata for this excerpt, continue to use it.
-                let metadata_iter = if let Some((_, metadata)) = current_excerpt_metadata
-                    .as_mut()
-                    .filter(|(excerpt_id, _)| *excerpt_id == excerpt.id)
-                {
-                    Some(metadata)
-                }
-                // Otherwise, compute the intersection of the input range with the excerpt's range,
-                // and retrieve the metadata for the resulting range.
-                else {
-                    let region = cursor.region()?;
-                    let mut buffer_start;
-                    if region.is_main_buffer {
-                        buffer_start = region.buffer_range.start;
-                        if query_range.start > region.range.start {
-                            let overshoot = query_range.start - region.range.start;
-                            buffer_start = buffer_start + overshoot;
-                        }
-                        buffer_start = buffer_start.min(region.buffer_range.end);
-                    } else {
-                        buffer_start = cursor.main_buffer_position()?;
-                    };
-                    let mut buffer_end = excerpt
-                        .range
-                        .context
-                        .end
-                        .summary::<MBD::TextDimension>(&excerpt.buffer);
-                    if let Some((end_excerpt_id, end_buffer_offset)) = range_end
-                        && excerpt.id == end_excerpt_id
-                    {
-                        buffer_end = buffer_end.min(end_buffer_offset);
-                    }
-
-                    get_buffer_metadata(&excerpt.buffer, buffer_start..buffer_end).map(|iterator| {
-                        &mut current_excerpt_metadata.insert((excerpt.id, iterator)).1
-                    })
-                };
-
-                // Visit each metadata item.
-                if let Some((metadata_buffer_range, metadata)) =
-                    metadata_iter.and_then(Iterator::next)
-                {
-                    // Find the multibuffer regions that contain the start and end of
-                    // the metadata item's range.
-                    if metadata_buffer_range.start > <MBD::TextDimension>::default() {
-                        while let Some(region) = cursor.region() {
-                            if region.is_main_buffer
-                                && (region.buffer_range.end >= metadata_buffer_range.start
-                                    || cursor.is_at_end_of_excerpt())
-                            {
-                                break;
-                            }
-                            cursor.next();
-                        }
-                    }
-                    let start_region = cursor.region()?;
-                    while let Some(region) = cursor.region() {
-                        if region.is_main_buffer
-                            && (region.buffer_range.end > metadata_buffer_range.end
-                                || cursor.is_at_end_of_excerpt())
-                        {
-                            break;
-                        }
-                        cursor.next();
-                    }
-                    let end_region = cursor.region();
-
-                    // Convert the metadata item's range into multibuffer coordinates.
-                    let mut start_position = start_region.range.start;
-                    let region_buffer_start = start_region.buffer_range.start;
-                    if start_region.is_main_buffer
-                        && metadata_buffer_range.start > region_buffer_start
-                    {
-                        start_position =
-                            start_position + (metadata_buffer_range.start - region_buffer_start);
-                        start_position = start_position.min(start_region.range.end);
-                    }
-
-                    let mut end_position = self.max_position();
-                    if let Some(end_region) = &end_region {
-                        end_position = end_region.range.start;
-                        debug_assert!(end_region.is_main_buffer);
-                        let region_buffer_start = end_region.buffer_range.start;
-                        if metadata_buffer_range.end > region_buffer_start {
-                            end_position =
-                                end_position + (metadata_buffer_range.end - region_buffer_start);
-                        }
-                        end_position = end_position.min(end_region.range.end);
-                    }
-
-                    if start_position <= query_range.end && end_position >= query_range.start {
-                        return Some((start_position..end_position, metadata, excerpt));
-                    }
-                }
-                // When there are no more metadata items for this excerpt, move to the next excerpt.
-                else {
-                    current_excerpt_metadata.take();
-                    if let Some((end_excerpt_id, _)) = range_end
-                        && excerpt.id == end_excerpt_id
-                    {
-                        return None;
-                    }
-                    cursor.next_excerpt();
-                }
-            }
-        })
-    }
-
-    pub fn diff_hunk_before<T: ToOffset>(&self, position: T) -> Option<MultiBufferRow> {
-        let offset = position.to_offset(self);
-
-        let mut cursor = self
-            .cursor::<DimensionPair<MultiBufferOffset, Point>, DimensionPair<BufferOffset, Point>>(
-            );
-        cursor.seek(&DimensionPair {
-            key: offset,
-            value: None,
-        });
-        cursor.seek_to_start_of_current_excerpt();
-        let excerpt = cursor.excerpt()?;
-
-        let excerpt_end = excerpt.range.context.end.to_offset(&excerpt.buffer);
-        let current_position = self
-            .anchor_before(offset)
-            .text_anchor
-            .to_offset(&excerpt.buffer);
-        let excerpt_end = excerpt
-            .buffer
-            .anchor_before(excerpt_end.min(current_position));
-
-        if let Some(diff) = self.diffs.get(&excerpt.buffer_id) {
-            for hunk in diff.hunks_intersecting_range_rev(
-                excerpt.range.context.start..excerpt_end,
-                &excerpt.buffer,
-            ) {
-                let hunk_end = hunk.buffer_range.end.to_offset(&excerpt.buffer);
-                if hunk_end >= current_position {
-                    continue;
-                }
-                let start = Anchor::in_buffer(excerpt.id, hunk.buffer_range.start).to_point(self);
-                return Some(MultiBufferRow(start.row));
-            }
-        }
-
-        loop {
-            cursor.prev_excerpt();
-            let excerpt = cursor.excerpt()?;
-
-            let Some(diff) = self.diffs.get(&excerpt.buffer_id) else {
-                continue;
-            };
-            let mut hunks =
-                diff.hunks_intersecting_range_rev(excerpt.range.context.clone(), &excerpt.buffer);
-            let Some(hunk) = hunks.next() else {
-                continue;
-            };
-            let start = Anchor::in_buffer(excerpt.id, hunk.buffer_range.start).to_point(self);
-            return Some(MultiBufferRow(start.row));
-        }
-    }
-
-    pub fn has_diff_hunks(&self) -> bool {
-        self.diffs.values().any(|diff| !diff.is_empty())
-    }
-
-    pub fn is_inside_word<T: ToOffset>(
-        &self,
-        position: T,
-        scope_context: Option<CharScopeContext>,
-    ) -> bool {
-        let position = position.to_offset(self);
-        let classifier = self
-            .char_classifier_at(position)
-            .scope_context(scope_context);
-        let next_char_kind = self.chars_at(position).next().map(|c| classifier.kind(c));
-        let prev_char_kind = self
-            .reversed_chars_at(position)
-            .next()
-            .map(|c| classifier.kind(c));
-        prev_char_kind.zip(next_char_kind) == Some((CharKind::Word, CharKind::Word))
-    }
-
-    pub fn surrounding_word<T: ToOffset>(
-        &self,
-        start: T,
-        scope_context: Option<CharScopeContext>,
-    ) -> (Range<MultiBufferOffset>, Option<CharKind>) {
-        let mut start = start.to_offset(self);
-        let mut end = start;
-        let mut next_chars = self.chars_at(start).peekable();
-        let mut prev_chars = self.reversed_chars_at(start).peekable();
-
-        let classifier = self.char_classifier_at(start).scope_context(scope_context);
-
-        let word_kind = cmp::max(
-            prev_chars.peek().copied().map(|c| classifier.kind(c)),
-            next_chars.peek().copied().map(|c| classifier.kind(c)),
-        );
-
-        for ch in prev_chars {
-            if Some(classifier.kind(ch)) == word_kind && ch != '\n' {
-                start -= ch.len_utf8();
-            } else {
-                break;
-            }
-        }
-
-        for ch in next_chars {
-            if Some(classifier.kind(ch)) == word_kind && ch != '\n' {
-                end += ch.len_utf8();
-            } else {
-                break;
-            }
-        }
-
-        (start..end, word_kind)
-    }
-
-    pub fn char_kind_before<T: ToOffset>(
-        &self,
-        start: T,
-        scope_context: Option<CharScopeContext>,
-    ) -> Option<CharKind> {
-        let start = start.to_offset(self);
-        let classifier = self.char_classifier_at(start).scope_context(scope_context);
-        self.reversed_chars_at(start)
-            .next()
-            .map(|ch| classifier.kind(ch))
-    }
-
-    pub fn is_singleton(&self) -> bool {
-        self.singleton
-    }
-
-    pub fn as_singleton(&self) -> Option<(&ExcerptId, BufferId, &BufferSnapshot)> {
-        if self.singleton {
-            self.excerpts
-                .iter()
-                .next()
-                .map(|e| (&e.id, e.buffer_id, &e.buffer))
-        } else {
-            None
-        }
-    }
-
-    pub fn len(&self) -> MultiBufferOffset {
-        self.diff_transforms.summary().output.len
-    }
-
-    pub fn max_position<MBD: MultiBufferDimension>(&self) -> MBD {
-        MBD::from_summary(&self.text_summary())
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.diff_transforms.summary().output.len == MultiBufferOffset(0)
-    }
-
-    pub fn widest_line_number(&self) -> u32 {
-        // widest_line_number is 0-based, so 1 is added to get the displayed line number.
-        self.excerpts.summary().widest_line_number + 1
-    }
-
-    pub fn bytes_in_range<T: ToOffset>(&self, range: Range<T>) -> MultiBufferBytes<'_> {
-        let range = range.start.to_offset(self)..range.end.to_offset(self);
-        let mut excerpts = self.cursor::<MultiBufferOffset, BufferOffset>();
-        excerpts.seek(&range.start);
-
-        let mut chunk;
-        let mut has_trailing_newline;
-        let excerpt_bytes;
-        if let Some(region) = excerpts.region() {
-            let mut bytes = region.buffer.bytes_in_range(
-                region.buffer_range.start + (range.start - region.range.start)
-                    ..(region.buffer_range.start + (range.end - region.range.start))
-                        .min(region.buffer_range.end),
-            );
-            chunk = bytes.next().unwrap_or(&[][..]);
-            excerpt_bytes = Some(bytes);
-            has_trailing_newline = region.has_trailing_newline && range.end >= region.range.end;
-            if chunk.is_empty() && has_trailing_newline {
-                chunk = b"\n";
-                has_trailing_newline = false;
-            }
-        } else {
-            chunk = &[][..];
-            excerpt_bytes = None;
-            has_trailing_newline = false;
-        };
-
-        MultiBufferBytes {
-            range,
-            cursor: excerpts,
-            excerpt_bytes,
-            has_trailing_newline,
-            chunk,
-        }
-    }
-
-    pub fn reversed_bytes_in_range<T: ToOffset>(
-        &self,
-        range: Range<T>,
-    ) -> ReversedMultiBufferBytes<'_> {
-        let range = range.start.to_offset(self)..range.end.to_offset(self);
-        let mut chunks = self.reversed_chunks_in_range(range.clone());
-        let chunk = chunks.next().map_or(&[][..], |c| c.as_bytes());
-        ReversedMultiBufferBytes {
-            range,
-            chunks,
-            chunk,
-        }
-    }
-
-    pub fn row_infos(&self, start_row: MultiBufferRow) -> MultiBufferRows<'_> {
-        let mut cursor = self.cursor::<Point, Point>();
-        cursor.seek(&Point::new(start_row.0, 0));
-        let mut result = MultiBufferRows {
-            point: Point::new(0, 0),
-            is_empty: self.excerpts.is_empty(),
-            is_singleton: self.is_singleton(),
-            cursor,
-        };
-        result.seek(start_row);
-        result
-    }
-
-    pub fn chunks<T: ToOffset>(
-        &self,
-        range: Range<T>,
-        language_aware: bool,
-    ) -> MultiBufferChunks<'_> {
-        let mut chunks = MultiBufferChunks {
-            excerpt_offset_range: ExcerptDimension(MultiBufferOffset::ZERO)
-                ..ExcerptDimension(MultiBufferOffset::ZERO),
-            range: MultiBufferOffset::ZERO..MultiBufferOffset::ZERO,
-            excerpts: self.excerpts.cursor(()),
-            diff_transforms: self.diff_transforms.cursor(()),
-            diffs: &self.diffs,
-            diff_base_chunks: None,
-            excerpt_chunks: None,
-            buffer_chunk: None,
-            language_aware,
-        };
-        let range = range.start.to_offset(self)..range.end.to_offset(self);
-        chunks.seek(range);
-        chunks
-    }
-
-    pub fn clip_offset(&self, offset: MultiBufferOffset, bias: Bias) -> MultiBufferOffset {
-        self.clip_dimension(offset, bias, text::BufferSnapshot::clip_offset)
-    }
-
-    pub fn clip_point(&self, point: Point, bias: Bias) -> Point {
-        self.clip_dimension(point, bias, text::BufferSnapshot::clip_point)
-    }
-
-    pub fn clip_offset_utf16(
-        &self,
-        offset: MultiBufferOffsetUtf16,
-        bias: Bias,
-    ) -> MultiBufferOffsetUtf16 {
-        self.clip_dimension(offset, bias, text::BufferSnapshot::clip_offset_utf16)
-    }
-
-    pub fn clip_point_utf16(&self, point: Unclipped<PointUtf16>, bias: Bias) -> PointUtf16 {
-        self.clip_dimension(point.0, bias, |buffer, point, bias| {
-            buffer.clip_point_utf16(Unclipped(point), bias)
-        })
-    }
-
-    pub fn offset_to_point(&self, offset: MultiBufferOffset) -> Point {
-        self.convert_dimension(offset, text::BufferSnapshot::offset_to_point)
-    }
-
-    pub fn offset_to_point_utf16(&self, offset: MultiBufferOffset) -> PointUtf16 {
-        self.convert_dimension(offset, text::BufferSnapshot::offset_to_point_utf16)
-    }
-
-    pub fn point_to_point_utf16(&self, point: Point) -> PointUtf16 {
-        self.convert_dimension(point, text::BufferSnapshot::point_to_point_utf16)
-    }
-
-    pub fn point_utf16_to_point(&self, point: PointUtf16) -> Point {
-        self.convert_dimension(point, text::BufferSnapshot::point_utf16_to_point)
-    }
-
-    #[instrument(skip_all)]
-    pub fn point_to_offset(&self, point: Point) -> MultiBufferOffset {
-        self.convert_dimension(point, text::BufferSnapshot::point_to_offset)
-    }
-
-    pub fn point_to_offset_utf16(&self, point: Point) -> MultiBufferOffsetUtf16 {
-        self.convert_dimension(point, text::BufferSnapshot::point_to_offset_utf16)
-    }
-
-    pub fn offset_utf16_to_offset(&self, offset: MultiBufferOffsetUtf16) -> MultiBufferOffset {
-        self.convert_dimension(offset, text::BufferSnapshot::offset_utf16_to_offset)
-    }
-
-    pub fn offset_to_offset_utf16(&self, offset: MultiBufferOffset) -> MultiBufferOffsetUtf16 {
-        self.convert_dimension(offset, text::BufferSnapshot::offset_to_offset_utf16)
-    }
-
-    pub fn point_utf16_to_offset(&self, point: PointUtf16) -> MultiBufferOffset {
-        self.convert_dimension(point, text::BufferSnapshot::point_utf16_to_offset)
-    }
-
-    pub fn point_utf16_to_offset_utf16(&self, point: PointUtf16) -> MultiBufferOffsetUtf16 {
-        self.convert_dimension(point, text::BufferSnapshot::point_utf16_to_offset_utf16)
-    }
-
-    fn clip_dimension<MBD, BD>(
-        &self,
-        position: MBD,
-        bias: Bias,
-        clip_buffer_position: fn(&text::BufferSnapshot, BD, Bias) -> BD,
-    ) -> MBD
-    where
-        MBD: MultiBufferDimension + Ord + Sub + ops::AddAssign<<MBD as Sub>::Output>,
-        BD: TextDimension + Sub<Output = <MBD as Sub>::Output> + AddAssign<<MBD as Sub>::Output>,
-    {
-        let mut cursor = self.cursor::<MBD, BD>();
-        cursor.seek(&position);
-        if let Some(region) = cursor.region() {
-            if position >= region.range.end {
-                return region.range.end;
-            }
-            let overshoot = position - region.range.start;
-            let mut buffer_position = region.buffer_range.start;
-            buffer_position += overshoot;
-            let clipped_buffer_position =
-                clip_buffer_position(region.buffer, buffer_position, bias);
-            let mut position = region.range.start;
-            position += clipped_buffer_position - region.buffer_range.start;
-            position
-        } else {
-            self.max_position()
-        }
-    }
-
-    #[instrument(skip_all)]
-    fn convert_dimension<MBR1, MBR2, BR1, BR2>(
-        &self,
-        key: MBR1,
-        convert_buffer_dimension: fn(&text::BufferSnapshot, BR1) -> BR2,
-    ) -> MBR2
-    where
-        MBR1: MultiBufferDimension + Ord + Sub + ops::AddAssign<<MBR1 as Sub>::Output>,
-        BR1: TextDimension + Sub<Output = <MBR1 as Sub>::Output> + AddAssign<<MBR1 as Sub>::Output>,
-        MBR2: MultiBufferDimension + Ord + Sub + ops::AddAssign<<MBR2 as Sub>::Output>,
-        BR2: TextDimension + Sub<Output = <MBR2 as Sub>::Output> + AddAssign<<MBR2 as Sub>::Output>,
-    {
-        let mut cursor = self.cursor::<DimensionPair<MBR1, MBR2>, DimensionPair<BR1, BR2>>();
-        cursor.seek(&DimensionPair { key, value: None });
-        if let Some(region) = cursor.region() {
-            if key >= region.range.end.key {
-                return region.range.end.value.unwrap();
-            }
-            let start_key = region.range.start.key;
-            let start_value = region.range.start.value.unwrap();
-            let buffer_start_key = region.buffer_range.start.key;
-            let buffer_start_value = region.buffer_range.start.value.unwrap();
-            let mut buffer_key = buffer_start_key;
-            buffer_key += key - start_key;
-            let buffer_value = convert_buffer_dimension(region.buffer, buffer_key);
-            let mut result = start_value;
-            result += buffer_value - buffer_start_value;
-            result
-        } else {
-            self.max_position()
-        }
-    }
-
-    pub fn point_to_buffer_offset<T: ToOffset>(
-        &self,
-        point: T,
-    ) -> Option<(&BufferSnapshot, BufferOffset)> {
-        let offset = point.to_offset(self);
-        let mut cursor = self.cursor::<MultiBufferOffset, BufferOffset>();
-        cursor.seek(&offset);
-        let region = cursor.region()?;
-        let overshoot = offset - region.range.start;
-        let buffer_offset = region.buffer_range.start + overshoot;
-        if buffer_offset == BufferOffset(region.buffer.len() + 1)
-            && region.has_trailing_newline
-            && !region.is_main_buffer
-        {
-            let main_buffer_position = cursor.main_buffer_position()?;
-            let buffer_snapshot = &cursor.excerpt()?.buffer;
-            return Some((buffer_snapshot, main_buffer_position));
-        } else if buffer_offset > BufferOffset(region.buffer.len()) {
-            return None;
-        }
-        Some((region.buffer, buffer_offset))
-    }
-
-    pub fn point_to_buffer_point(
-        &self,
-        point: Point,
-    ) -> Option<(&BufferSnapshot, Point, ExcerptId)> {
-        let mut cursor = self.cursor::<Point, Point>();
-        cursor.seek(&point);
-        let region = cursor.region()?;
-        let overshoot = point - region.range.start;
-        let buffer_point = region.buffer_range.start + overshoot;
-        let excerpt = cursor.excerpt()?;
-        if buffer_point == region.buffer.max_point() + Point::new(1, 0)
-            && region.has_trailing_newline
-            && !region.is_main_buffer
-        {
-            return Some((&excerpt.buffer, cursor.main_buffer_position()?, excerpt.id));
-        } else if buffer_point > region.buffer.max_point() {
-            return None;
-        }
-        Some((region.buffer, buffer_point, excerpt.id))
-    }
-
-    pub fn suggested_indents(
-        &self,
-        rows: impl IntoIterator<Item = u32>,
-        cx: &App,
-    ) -> BTreeMap<MultiBufferRow, IndentSize> {
-        let mut result = BTreeMap::new();
-        self.suggested_indents_callback(
-            rows,
-            |row, indent| {
-                result.insert(row, indent);
-                ControlFlow::Continue(())
-            },
-            cx,
-        );
-        result
-    }
-
-    // move this to be a generator once those are a thing
-    pub fn suggested_indents_callback(
-        &self,
-        rows: impl IntoIterator<Item = u32>,
-        mut cb: impl FnMut(MultiBufferRow, IndentSize) -> ControlFlow<()>,
-        cx: &App,
-    ) {
-        let mut rows_for_excerpt = Vec::new();
-        let mut cursor = self.cursor::<Point, Point>();
-        let mut rows = rows.into_iter().peekable();
-        let mut prev_row = u32::MAX;
-        let mut prev_language_indent_size = IndentSize::default();
-
-        while let Some(row) = rows.next() {
-            cursor.seek(&Point::new(row, 0));
-            let Some(region) = cursor.region() else {
-                continue;
-            };
-
-            // Retrieve the language and indent size once for each disjoint region being indented.
-            let single_indent_size = if row.saturating_sub(1) == prev_row {
-                prev_language_indent_size
-            } else {
-                region
-                    .buffer
-                    .language_indent_size_at(Point::new(row, 0), cx)
-            };
-            prev_language_indent_size = single_indent_size;
-            prev_row = row;
-
-            let start_buffer_row = region.buffer_range.start.row;
-            let start_multibuffer_row = region.range.start.row;
-            let end_multibuffer_row = region.range.end.row;
-
-            rows_for_excerpt.push(row);
-            while let Some(next_row) = rows.peek().copied() {
-                if end_multibuffer_row > next_row {
-                    rows_for_excerpt.push(next_row);
-                    rows.next();
-                } else {
-                    break;
-                }
-            }
-
-            let buffer_rows = rows_for_excerpt
-                .drain(..)
-                .map(|row| start_buffer_row + row - start_multibuffer_row);
-            let buffer_indents = region
-                .buffer
-                .suggested_indents(buffer_rows, single_indent_size);
-            for (row, indent) in buffer_indents {
-                if cb(
-                    MultiBufferRow(start_multibuffer_row + row - start_buffer_row),
-                    indent,
-                )
-                .is_break()
-                {
-                    return;
-                }
-            }
-        }
-    }
-
-    pub fn indent_size_for_line(&self, row: MultiBufferRow) -> IndentSize {
-        if let Some((buffer, range)) = self.buffer_line_for_row(row) {
-            let mut size = buffer.indent_size_for_line(range.start.row);
-            size.len = size
-                .len
-                .min(range.end.column)
-                .saturating_sub(range.start.column);
-            size
-        } else {
-            IndentSize::spaces(0)
-        }
-    }
-
-    pub fn line_indent_for_row(&self, row: MultiBufferRow) -> LineIndent {
-        if let Some((buffer, range)) = self.buffer_line_for_row(row) {
-            LineIndent::from_iter(buffer.text_for_range(range).flat_map(|s| s.chars()))
-        } else {
-            LineIndent::spaces(0)
-        }
-    }
-
-    pub fn indent_and_comment_for_line(&self, row: MultiBufferRow, cx: &App) -> String {
-        let mut indent = self.indent_size_for_line(row).chars().collect::<String>();
-
-        if self.language_settings(cx).extend_comment_on_newline
-            && let Some(language_scope) = self.language_scope_at(Point::new(row.0, 0))
-        {
-            let delimiters = language_scope.line_comment_prefixes();
-            for delimiter in delimiters {
-                if *self
-                    .chars_at(Point::new(row.0, indent.len() as u32))
-                    .take(delimiter.chars().count())
-                    .collect::<String>()
-                    .as_str()
-                    == **delimiter
-                {
-                    indent.push_str(delimiter);
-                    break;
-                }
-            }
-        }
-
-        indent
-    }
-
-    pub fn is_line_whitespace_upto<T>(&self, position: T) -> bool
-    where
-        T: ToOffset,
-    {
-        for char in self.reversed_chars_at(position) {
-            if !char.is_whitespace() {
-                return false;
-            }
-            if char == '\n' {
-                return true;
-            }
-        }
-        true
-    }
-
-    pub fn prev_non_blank_row(&self, mut row: MultiBufferRow) -> Option<MultiBufferRow> {
-        while row.0 > 0 {
-            row.0 -= 1;
-            if !self.is_line_blank(row) {
-                return Some(row);
-            }
-        }
-        None
-    }
-
-    pub fn line_len(&self, row: MultiBufferRow) -> u32 {
-        if let Some((_, range)) = self.buffer_line_for_row(row) {
-            range.end.column - range.start.column
-        } else {
-            0
-        }
-    }
-
-    pub fn buffer_line_for_row(
-        &self,
-        row: MultiBufferRow,
-    ) -> Option<(&BufferSnapshot, Range<Point>)> {
-        let mut cursor = self.cursor::<Point, Point>();
-        let point = Point::new(row.0, 0);
-        cursor.seek(&point);
-        let region = cursor.region()?;
-        let overshoot = point.min(region.range.end) - region.range.start;
-        let buffer_point = region.buffer_range.start + overshoot;
-        if buffer_point.row > region.buffer_range.end.row {
-            return None;
-        }
-        let line_start = Point::new(buffer_point.row, 0).max(region.buffer_range.start);
-        let line_end = Point::new(buffer_point.row, region.buffer.line_len(buffer_point.row))
-            .min(region.buffer_range.end);
-        Some((region.buffer, line_start..line_end))
-    }
-
-    pub fn max_point(&self) -> Point {
-        self.text_summary().lines
-    }
-
-    pub fn max_row(&self) -> MultiBufferRow {
-        MultiBufferRow(self.text_summary().lines.row)
-    }
-
-    pub fn text_summary(&self) -> MBTextSummary {
-        self.diff_transforms.summary().output
-    }
-
-    pub fn text_summary_for_range<MBD, O>(&self, range: Range<O>) -> MBD
-    where
-        MBD: MultiBufferDimension + AddAssign,
-        O: ToOffset,
-    {
-        let range = range.start.to_offset(self)..range.end.to_offset(self);
-        let mut cursor = self
-            .diff_transforms
-            .cursor::<Dimensions<MultiBufferOffset, ExcerptOffset>>(());
-        cursor.seek(&range.start, Bias::Right);
-
-        let Some(first_transform) = cursor.item() else {
-            return MBD::from_summary(&MBTextSummary::default());
-        };
-
-        let diff_transform_start = cursor.start().0;
-        let diff_transform_end = cursor.end().0;
-        let diff_start = range.start;
-        let start_overshoot = diff_start - diff_transform_start;
-        let end_overshoot = std::cmp::min(range.end, diff_transform_end) - diff_transform_start;
-
-        let mut result = match first_transform {
-            DiffTransform::Unmodified { .. } | DiffTransform::InsertedHunk { .. } => {
-                let excerpt_start = cursor.start().1 + start_overshoot;
-                let excerpt_end = cursor.start().1 + end_overshoot;
-                self.text_summary_for_excerpt_offset_range(excerpt_start..excerpt_end)
-            }
-            DiffTransform::FilteredInsertedHunk { .. } => MBD::default(),
-            DiffTransform::DeletedHunk {
-                buffer_id,
-                has_trailing_newline,
-                hunk_info,
-                ..
-            } => {
-                let buffer_start = hunk_info.base_text_byte_range.start + start_overshoot;
-                let mut buffer_end = hunk_info.base_text_byte_range.start + end_overshoot;
-                let Some(base_text) = self.diffs.get(buffer_id).map(|diff| diff.base_text()) else {
-                    panic!("{:?} is in non-existent deleted hunk", range.start)
-                };
-
-                let include_trailing_newline =
-                    *has_trailing_newline && range.end >= diff_transform_end;
-                if include_trailing_newline {
-                    buffer_end -= 1;
-                }
-
-                let mut summary = base_text
-                    .text_summary_for_range::<MBD::TextDimension, _>(buffer_start..buffer_end);
-
-                if include_trailing_newline {
-                    summary.add_assign(&<MBD::TextDimension>::from_text_summary(
-                        &TextSummary::newline(),
-                    ))
-                }
-
-                let mut result = MBD::default();
-                result.add_text_dim(&summary);
-                result
-            }
-        };
-        if range.end < diff_transform_end {
-            return result;
-        }
-
-        cursor.next();
-        result.add_mb_text_summary(
-            &cursor
-                .summary::<_, OutputDimension<_>>(&range.end, Bias::Right)
-                .0,
-        );
-
-        let Some(last_transform) = cursor.item() else {
-            return result;
-        };
-
-        let overshoot = range.end - cursor.start().0;
-        let suffix = match last_transform {
-            DiffTransform::Unmodified { .. } | DiffTransform::InsertedHunk { .. } => {
-                let end = cursor.start().1 + overshoot;
-                self.text_summary_for_excerpt_offset_range::<MBD>(cursor.start().1..end)
-            }
-            DiffTransform::FilteredInsertedHunk { .. } => MBD::default(),
-            DiffTransform::DeletedHunk {
-                buffer_id,
-                has_trailing_newline,
-                hunk_info,
-                ..
-            } => {
-                let buffer_end = hunk_info.base_text_byte_range.start + overshoot;
-                let Some(base_text) = self.diffs.get(buffer_id).map(|diff| diff.base_text()) else {
-                    panic!("{:?} is in non-existent deleted hunk", range.end)
-                };
-
-                let mut suffix = base_text.text_summary_for_range::<MBD::TextDimension, _>(
-                    hunk_info.base_text_byte_range.start..buffer_end,
-                );
-                if *has_trailing_newline && buffer_end == hunk_info.base_text_byte_range.end + 1 {
-                    suffix.add_assign(&<MBD::TextDimension>::from_text_summary(
-                        &TextSummary::from("\n"),
-                    ))
-                }
-
-                let mut result = MBD::default();
-                result.add_text_dim(&suffix);
-                result
-            }
-        };
-
-        result += suffix;
-        result
-    }
-
-    fn text_summary_for_excerpt_offset_range<MBD>(&self, mut range: Range<ExcerptOffset>) -> MBD
-    where
-        MBD: MultiBufferDimension + AddAssign,
-    {
-        let mut summary = MBD::default();
-        let mut cursor = self.excerpts.cursor::<ExcerptOffset>(());
-        cursor.seek(&range.start, Bias::Right);
-        if let Some(excerpt) = cursor.item() {
-            let mut end_before_newline = cursor.end();
-            if excerpt.has_trailing_newline {
-                end_before_newline -= 1;
-            }
-
-            let excerpt_start = excerpt.range.context.start.to_offset(&excerpt.buffer);
-            let start_in_excerpt = excerpt_start + (range.start - *cursor.start());
-            let end_in_excerpt =
-                excerpt_start + (cmp::min(end_before_newline, range.end) - *cursor.start());
-            summary.add_text_dim(
-                &excerpt
-                    .buffer
-                    .text_summary_for_range::<MBD::TextDimension, _>(
-                        start_in_excerpt..end_in_excerpt,
-                    ),
-            );
-
-            if range.end > end_before_newline {
-                summary.add_mb_text_summary(&MBTextSummary::from(TextSummary::newline()));
-            }
-
-            cursor.next();
-        }
-
-        if range.end > *cursor.start() {
-            summary += cursor
-                .summary::<_, ExcerptDimension<MBD>>(&range.end, Bias::Right)
-                .0;
-            if let Some(excerpt) = cursor.item() {
-                range.end = cmp::max(*cursor.start(), range.end);
-
-                let excerpt_start = excerpt.range.context.start.to_offset(&excerpt.buffer);
-                let end_in_excerpt = excerpt_start + (range.end - *cursor.start());
-                summary.add_text_dim(
-                    &excerpt
-                        .buffer
-                        .text_summary_for_range::<MBD::TextDimension, _>(
-                            excerpt_start..end_in_excerpt,
-                        ),
-                );
-            }
-        }
-
-        summary
-    }
-
-    pub fn summary_for_anchor<MBD>(&self, anchor: &Anchor) -> MBD
-    where
-        MBD: MultiBufferDimension
-            + Ord
-            + Sub<Output = MBD::TextDimension>
-            + AddAssign<MBD::TextDimension>,
-        MBD::TextDimension: Sub<Output = MBD::TextDimension> + Ord,
-    {
-        self.summaries_for_anchors([anchor])[0]
-    }
-
-    fn resolve_summary_for_anchor<MBD>(
-        &self,
-        anchor: &Anchor,
-        excerpt_position: ExcerptDimension<MBD>,
-        diff_transforms: &mut Cursor<
-            DiffTransform,
-            Dimensions<ExcerptDimension<MBD>, OutputDimension<MBD>>,
-        >,
-    ) -> MBD
-    where
-        MBD: MultiBufferDimension + Ord + Sub + AddAssign<<MBD as Sub>::Output>,
-    {
-        loop {
-            let transform_end_position = diff_transforms.end().0;
-            let at_transform_end =
-                transform_end_position == excerpt_position && diff_transforms.item().is_some();
-            if at_transform_end && anchor.text_anchor.bias == Bias::Right {
-                diff_transforms.next();
-                continue;
-            }
-
-            let mut position = diff_transforms.start().1;
-            match diff_transforms.item() {
-                Some(DiffTransform::DeletedHunk {
-                    buffer_id,
-                    hunk_info,
-                    ..
-                }) => {
-                    if let Some(diff_base_anchor) = &anchor.diff_base_anchor
-                        && let Some(base_text) =
-                            self.diffs.get(buffer_id).map(|diff| diff.base_text())
-                        && base_text.can_resolve(diff_base_anchor)
-                    {
-                        let base_text_offset = diff_base_anchor.to_offset(base_text);
-                        if base_text_offset >= hunk_info.base_text_byte_range.start
-                            && base_text_offset <= hunk_info.base_text_byte_range.end
-                        {
-                            let position_in_hunk = base_text
-                                .text_summary_for_range::<MBD::TextDimension, _>(
-                                    hunk_info.base_text_byte_range.start..base_text_offset,
-                                );
-                            position.0.add_text_dim(&position_in_hunk);
-                        } else if at_transform_end {
-                            diff_transforms.next();
-                            continue;
-                        }
-                    }
-                }
-                _ => {
-                    if at_transform_end && anchor.diff_base_anchor.is_some() {
-                        diff_transforms.next();
-                        continue;
-                    }
-
-                    if !matches!(
-                        diff_transforms.item(),
-                        Some(DiffTransform::FilteredInsertedHunk { .. })
-                    ) {
-                        let overshoot = excerpt_position - diff_transforms.start().0;
-                        position += overshoot;
-                    }
-                }
-            }
-
-            return position.0;
-        }
-    }
-
-    fn excerpt_offset_for_anchor(&self, anchor: &Anchor) -> ExcerptOffset {
-        let mut cursor = self
-            .excerpts
-            .cursor::<Dimensions<Option<&Locator>, ExcerptOffset>>(());
-        let locator = self.excerpt_locator_for_id(anchor.excerpt_id);
-
-        cursor.seek(&Some(locator), Bias::Left);
-        if cursor.item().is_none() && anchor.excerpt_id == ExcerptId::max() {
-            cursor.prev();
-        }
-
-        let mut position = cursor.start().1;
-        if let Some(excerpt) = cursor.item()
-            && (excerpt.id == anchor.excerpt_id || anchor.excerpt_id == ExcerptId::max())
-        {
-            let excerpt_buffer_start = excerpt
-                .buffer
-                .offset_for_anchor(&excerpt.range.context.start);
-            let excerpt_buffer_end = excerpt.buffer.offset_for_anchor(&excerpt.range.context.end);
-            let buffer_position = cmp::min(
-                excerpt_buffer_end,
-                excerpt.buffer.offset_for_anchor(&anchor.text_anchor),
-            );
-            if buffer_position > excerpt_buffer_start {
-                position += buffer_position - excerpt_buffer_start;
-            }
-        }
-        position
-    }
-
-    pub fn latest_excerpt_id(&self, mut excerpt_id: ExcerptId) -> ExcerptId {
-        while let Some(replacement) = self.replaced_excerpts.get(&excerpt_id) {
-            excerpt_id = *replacement;
-        }
-        excerpt_id
-    }
-
-    pub fn summaries_for_anchors<'a, MBD, I>(&'a self, anchors: I) -> Vec<MBD>
-    where
-        MBD: MultiBufferDimension
-            + Ord
-            + Sub<Output = MBD::TextDimension>
-            + AddAssign<MBD::TextDimension>,
-        MBD::TextDimension: Sub<Output = MBD::TextDimension> + Ord,
-        I: 'a + IntoIterator<Item = &'a Anchor>,
-    {
-        let mut anchors = anchors.into_iter().peekable();
-        let mut cursor = self.excerpts.cursor::<ExcerptSummary>(());
-        let mut diff_transforms_cursor = self
-            .diff_transforms
-            .cursor::<Dimensions<ExcerptDimension<MBD>, OutputDimension<MBD>>>(());
-        diff_transforms_cursor.next();
-
-        let mut summaries = Vec::new();
-        while let Some(anchor) = anchors.peek() {
-            let excerpt_id = self.latest_excerpt_id(anchor.excerpt_id);
-
-            let excerpt_anchors = anchors.peeking_take_while(|anchor| {
-                self.latest_excerpt_id(anchor.excerpt_id) == excerpt_id
-            });
-
-            let locator = self.excerpt_locator_for_id(excerpt_id);
-            cursor.seek_forward(locator, Bias::Left);
-            if cursor.item().is_none() && excerpt_id == ExcerptId::max() {
-                cursor.prev();
-            }
-
-            let excerpt_start_position = ExcerptDimension(MBD::from_summary(&cursor.start().text));
-            if let Some(excerpt) = cursor.item() {
-                if excerpt.id != excerpt_id && excerpt_id != ExcerptId::max() {
-                    let position = self.resolve_summary_for_anchor(
-                        &Anchor::min(),
-                        excerpt_start_position,
-                        &mut diff_transforms_cursor,
-                    );
-                    summaries.extend(excerpt_anchors.map(|_| position));
-                    continue;
-                }
-                let excerpt_buffer_start = excerpt
-                    .range
-                    .context
-                    .start
-                    .summary::<MBD::TextDimension>(&excerpt.buffer);
-                let excerpt_buffer_end = excerpt
-                    .range
-                    .context
-                    .end
-                    .summary::<MBD::TextDimension>(&excerpt.buffer);
-                for (buffer_summary, anchor) in excerpt
-                    .buffer
-                    .summaries_for_anchors_with_payload::<MBD::TextDimension, _, _>(
-                        excerpt_anchors.map(|a| (&a.text_anchor, a)),
-                    )
-                {
-                    let summary = cmp::min(excerpt_buffer_end, buffer_summary);
-                    let mut position = excerpt_start_position;
-                    if summary > excerpt_buffer_start {
-                        position += summary - excerpt_buffer_start;
-                    }
-
-                    if diff_transforms_cursor.start().0 < position {
-                        diff_transforms_cursor.seek_forward(&position, Bias::Left);
-                    }
-
-                    summaries.push(self.resolve_summary_for_anchor(
-                        anchor,
-                        position,
-                        &mut diff_transforms_cursor,
-                    ));
-                }
-            } else {
-                diff_transforms_cursor.seek_forward(&excerpt_start_position, Bias::Left);
-                let position = self.resolve_summary_for_anchor(
-                    &Anchor::max(),
-                    excerpt_start_position,
-                    &mut diff_transforms_cursor,
-                );
-                summaries.extend(excerpt_anchors.map(|_| position));
-            }
-        }
-
-        summaries
-    }
-
-    pub fn dimensions_from_points<'a, MBD>(
-        &'a self,
-        points: impl 'a + IntoIterator<Item = Point>,
-    ) -> impl 'a + Iterator<Item = MBD>
-    where
-        MBD: MultiBufferDimension + Sub + AddAssign<<MBD as Sub>::Output>,
-    {
-        let mut cursor = self.cursor::<DimensionPair<Point, MBD>, Point>();
-        cursor.seek(&DimensionPair {
-            key: Point::default(),
-            value: None,
-        });
-        let mut points = points.into_iter();
-        iter::from_fn(move || {
-            let point = points.next()?;
-
-            cursor.seek_forward(&DimensionPair {
-                key: point,
-                value: None,
-            });
-
-            if let Some(region) = cursor.region() {
-                let overshoot = point - region.range.start.key;
-                let buffer_point = region.buffer_range.start + overshoot;
-                let mut position = region.range.start.value.unwrap();
-                position.add_text_dim(
-                    &region
-                        .buffer
-                        .text_summary_for_range(region.buffer_range.start..buffer_point),
-                );
-                if point == region.range.end.key && region.has_trailing_newline {
-                    position.add_mb_text_summary(&MBTextSummary::from(TextSummary::newline()));
-                }
-                Some(position)
-            } else {
-                Some(MBD::from_summary(&self.text_summary()))
-            }
-        })
-    }
-
-    pub fn refresh_anchors<'a, I>(&'a self, anchors: I) -> Vec<(usize, Anchor, bool)>
-    where
-        I: 'a + IntoIterator<Item = &'a Anchor>,
-    {
-        let mut anchors = anchors.into_iter().enumerate().peekable();
-        let mut cursor = self.excerpts.cursor::<Option<&Locator>>(());
-        cursor.next();
-
-        let mut result = Vec::new();
-
-        while let Some((_, anchor)) = anchors.peek() {
-            let old_excerpt_id = anchor.excerpt_id;
-
-            // Find the location where this anchor's excerpt should be.
-            let old_locator = self.excerpt_locator_for_id(old_excerpt_id);
-            cursor.seek_forward(&Some(old_locator), Bias::Left);
-
-            let next_excerpt = cursor.item();
-            let prev_excerpt = cursor.prev_item();
-
-            // Process all of the anchors for this excerpt.
-            while let Some((anchor_ix, &anchor)) =
-                anchors.next_if(|(_, anchor)| anchor.excerpt_id == old_excerpt_id)
-            {
-                let mut anchor = anchor;
-
-                // Leave min and max anchors unchanged if invalid or
-                // if the old excerpt still exists at this location
-                let mut kept_position = next_excerpt
-                    .is_some_and(|e| e.id == old_excerpt_id && e.contains(&anchor))
-                    || old_excerpt_id == ExcerptId::max()
-                    || old_excerpt_id == ExcerptId::min();
-
-                // If the old excerpt no longer exists at this location, then attempt to
-                // find an equivalent position for this anchor in an adjacent excerpt.
-                if !kept_position {
-                    for excerpt in [next_excerpt, prev_excerpt].iter().filter_map(|e| *e) {
-                        if excerpt.contains(&anchor) {
-                            anchor.excerpt_id = excerpt.id;
-                            kept_position = true;
-                            break;
-                        }
-                    }
-                }
-
-                // If there's no adjacent excerpt that contains the anchor's position,
-                // then report that the anchor has lost its position.
-                if !kept_position {
-                    anchor = if let Some(excerpt) = next_excerpt {
-                        let mut text_anchor = excerpt
-                            .range
-                            .context
-                            .start
-                            .bias(anchor.text_anchor.bias, &excerpt.buffer);
-                        if text_anchor
-                            .cmp(&excerpt.range.context.end, &excerpt.buffer)
-                            .is_gt()
-                        {
-                            text_anchor = excerpt.range.context.end;
-                        }
-                        Anchor::in_buffer(excerpt.id, text_anchor)
-                    } else if let Some(excerpt) = prev_excerpt {
-                        let mut text_anchor = excerpt
-                            .range
-                            .context
-                            .end
-                            .bias(anchor.text_anchor.bias, &excerpt.buffer);
-                        if text_anchor
-                            .cmp(&excerpt.range.context.start, &excerpt.buffer)
-                            .is_lt()
-                        {
-                            text_anchor = excerpt.range.context.start;
-                        }
-                        Anchor::in_buffer(excerpt.id, text_anchor)
-                    } else if anchor.text_anchor.bias == Bias::Left {
-                        Anchor::min()
-                    } else {
-                        Anchor::max()
-                    };
-                }
-
-                result.push((anchor_ix, anchor, kept_position));
-            }
-        }
-        result.sort_unstable_by(|a, b| a.1.cmp(&b.1, self));
-        result
-    }
-
-    pub fn anchor_before<T: ToOffset>(&self, position: T) -> Anchor {
-        self.anchor_at(position, Bias::Left)
-    }
-
-    pub fn anchor_after<T: ToOffset>(&self, position: T) -> Anchor {
-        self.anchor_at(position, Bias::Right)
-    }
-
-    pub fn anchor_at<T: ToOffset>(&self, position: T, mut bias: Bias) -> Anchor {
-        let offset = position.to_offset(self);
-
-        // Find the given position in the diff transforms. Determine the corresponding
-        // offset in the excerpts, and whether the position is within a deleted hunk.
-        let mut diff_transforms = self
-            .diff_transforms
-            .cursor::<Dimensions<MultiBufferOffset, ExcerptOffset>>(());
-        diff_transforms.seek(&offset, Bias::Right);
-
-        if offset == diff_transforms.start().0
-            && bias == Bias::Left
-            && let Some(prev_item) = diff_transforms.prev_item()
-            && let DiffTransform::DeletedHunk { .. } = prev_item
-        {
-            diff_transforms.prev();
-        }
-        let offset_in_transform = offset - diff_transforms.start().0;
-        let mut excerpt_offset = diff_transforms.start().1;
-        let mut diff_base_anchor = None;
-        if let Some(DiffTransform::DeletedHunk {
-            buffer_id,
-            has_trailing_newline,
-            hunk_info,
-            ..
-        }) = diff_transforms.item()
-        {
-            let base_text_byte_range = &hunk_info.base_text_byte_range;
-            let diff = self.diffs.get(buffer_id).expect("missing diff");
-            if offset_in_transform > base_text_byte_range.len() {
-                debug_assert!(*has_trailing_newline);
-                bias = Bias::Right;
-            } else {
-                diff_base_anchor = Some(
-                    diff.base_text()
-                        .anchor_at(base_text_byte_range.start + offset_in_transform, bias),
-                );
-                bias = Bias::Left;
-            }
-        } else {
-            excerpt_offset += MultiBufferOffset(offset_in_transform);
-        };
-
-        let mut excerpts = self
-            .excerpts
-            .cursor::<Dimensions<ExcerptOffset, Option<ExcerptId>>>(());
-        excerpts.seek(&excerpt_offset, Bias::Right);
-        if excerpts.item().is_none() && excerpt_offset == excerpts.start().0 && bias == Bias::Left {
-            excerpts.prev();
-        }
-        if let Some(excerpt) = excerpts.item() {
-            let mut overshoot = excerpt_offset.saturating_sub(excerpts.start().0);
-            if excerpt.has_trailing_newline && excerpt_offset == excerpts.end().0 {
-                overshoot -= 1;
-                bias = Bias::Right;
-            }
-
-            let buffer_start = excerpt.range.context.start.to_offset(&excerpt.buffer);
-            let text_anchor =
-                excerpt.clip_anchor(excerpt.buffer.anchor_at(buffer_start + overshoot, bias));
-            let anchor = Anchor::in_buffer(excerpt.id, text_anchor);
-            match diff_base_anchor {
-                Some(diff_base_anchor) => anchor.with_diff_base_anchor(diff_base_anchor),
-                None => anchor,
-            }
-        } else if excerpt_offset == ExcerptDimension(MultiBufferOffset::ZERO) && bias == Bias::Left
-        {
-            Anchor::min()
-        } else {
-            Anchor::max()
-        }
-    }
-
-    /// Wraps the [`text::Anchor`] in a [`multi_buffer::Anchor`] if this multi-buffer is a singleton.
-    pub fn as_singleton_anchor(&self, text_anchor: text::Anchor) -> Option<Anchor> {
-        let (excerpt, buffer, _) = self.as_singleton()?;
-        if text_anchor.buffer_id.is_none_or(|id| id == buffer) {
-            Some(Anchor::in_buffer(*excerpt, text_anchor))
-        } else {
-            None
-        }
-    }
-
-    /// Returns an anchor for the given excerpt and text anchor,
-    /// Returns [`None`] if the excerpt_id is no longer valid or the text anchor range is out of excerpt's bounds.
-    pub fn anchor_range_in_excerpt(
-        &self,
-        excerpt_id: ExcerptId,
-        text_anchor: Range<text::Anchor>,
-    ) -> Option<Range<Anchor>> {
-        let excerpt = self.excerpt(self.latest_excerpt_id(excerpt_id))?;
-
-        Some(
-            Self::anchor_in_excerpt_(excerpt, text_anchor.start)?
-                ..Self::anchor_in_excerpt_(excerpt, text_anchor.end)?,
-        )
-    }
-
-    /// Returns an anchor for the given excerpt and text anchor,
-    /// Returns [`None`] if the excerpt_id is no longer valid or the text anchor range is out of excerpt's bounds.
-    pub fn anchor_in_excerpt(
-        &self,
-        excerpt_id: ExcerptId,
-        text_anchor: text::Anchor,
-    ) -> Option<Anchor> {
-        let excerpt = self.excerpt(self.latest_excerpt_id(excerpt_id))?;
-        Self::anchor_in_excerpt_(excerpt, text_anchor)
-    }
-
-    /// Same as [`MultiBuffer::anchor_in_excerpt`], but more efficient than calling it multiple times.
-    pub fn anchors_in_excerpt(
-        &self,
-        excerpt_id: ExcerptId,
-        text_anchors: impl IntoIterator<Item = text::Anchor>,
-    ) -> Option<impl Iterator<Item = Option<Anchor>>> {
-        let excerpt = self.excerpt(self.latest_excerpt_id(excerpt_id))?;
-        Some(
-            text_anchors
-                .into_iter()
-                .map(|text_anchor| Self::anchor_in_excerpt_(excerpt, text_anchor)),
-        )
-    }
-
-    fn anchor_in_excerpt_(excerpt: &Excerpt, text_anchor: text::Anchor) -> Option<Anchor> {
-        match text_anchor.buffer_id {
-            Some(buffer_id) if buffer_id == excerpt.buffer_id => (),
-            Some(_) => return None,
-            None if text_anchor.is_max() || text_anchor.is_min() => {
-                return Some(Anchor::in_buffer(excerpt.id, text_anchor));
-            }
-            None => return None,
-        }
-
-        let context = &excerpt.range.context;
-        if context.start.cmp(&text_anchor, &excerpt.buffer).is_gt()
-            || context.end.cmp(&text_anchor, &excerpt.buffer).is_lt()
-        {
-            return None;
-        }
-
-        Some(Anchor::in_buffer(excerpt.id, text_anchor))
-    }
-
-    pub fn context_range_for_excerpt(&self, excerpt_id: ExcerptId) -> Option<Range<text::Anchor>> {
-        Some(self.excerpt(excerpt_id)?.range.context.clone())
-    }
-
-    pub fn can_resolve(&self, anchor: &Anchor) -> bool {
-        if anchor.is_min() || anchor.is_max() {
-            // todo(lw): should be `!self.is_empty()`
-            true
-        } else if let Some(excerpt) = self.excerpt(anchor.excerpt_id) {
-            excerpt.buffer.can_resolve(&anchor.text_anchor)
-        } else {
-            false
-        }
-    }
-
-    pub fn excerpts(
-        &self,
-    ) -> impl Iterator<Item = (ExcerptId, &BufferSnapshot, ExcerptRange<text::Anchor>)> {
-        self.excerpts
-            .iter()
-            .map(|excerpt| (excerpt.id, &excerpt.buffer, excerpt.range.clone()))
-    }
-
-    fn cursor<'a, MBD, BD>(&'a self) -> MultiBufferCursor<'a, MBD, BD>
-    where
-        MBD: MultiBufferDimension + Ord + Sub + ops::AddAssign<<MBD as Sub>::Output>,
-        BD: TextDimension + AddAssign<<MBD as Sub>::Output>,
-    {
-        let excerpts = self.excerpts.cursor(());
-        let diff_transforms = self.diff_transforms.cursor(());
-        MultiBufferCursor {
-            excerpts,
-            diff_transforms,
-            snapshot: &self,
-            cached_region: None,
-        }
-    }
-
-    pub fn excerpt_before(&self, excerpt_id: ExcerptId) -> Option<MultiBufferExcerpt<'_>> {
-        let start_locator = self.excerpt_locator_for_id(excerpt_id);
-        let mut excerpts = self
-            .excerpts
-            .cursor::<Dimensions<Option<&Locator>, ExcerptOffset>>(());
-        excerpts.seek(&Some(start_locator), Bias::Left);
-        excerpts.prev();
-
-        let mut diff_transforms = self
-            .diff_transforms
-            .cursor::<DiffTransforms<MultiBufferOffset>>(());
-        diff_transforms.seek(&excerpts.start().1, Bias::Left);
-        if diff_transforms.end().excerpt_dimension < excerpts.start().1 {
-            diff_transforms.next();
-        }
-
-        let excerpt = excerpts.item()?;
-        Some(MultiBufferExcerpt {
-            excerpt,
-            offset: diff_transforms.start().output_dimension.0,
-            buffer_offset: BufferOffset(excerpt.range.context.start.to_offset(&excerpt.buffer)),
-            excerpt_offset: excerpts.start().1,
-            diff_transforms,
-        })
-    }
-
-    pub fn excerpt_boundaries_in_range<R, T>(
-        &self,
-        range: R,
-    ) -> impl Iterator<Item = ExcerptBoundary> + '_
-    where
-        R: RangeBounds<T>,
-        T: ToOffset,
-    {
-        let start_offset;
-        let start = match range.start_bound() {
-            Bound::Included(start) => {
-                start_offset = start.to_offset(self);
-                Bound::Included(start_offset)
-            }
-            Bound::Excluded(_) => {
-                panic!("not supported")
-            }
-            Bound::Unbounded => {
-                start_offset = MultiBufferOffset::ZERO;
-                Bound::Unbounded
-            }
-        };
-        let end = match range.end_bound() {
-            Bound::Included(end) => Bound::Included(end.to_offset(self)),
-            Bound::Excluded(end) => Bound::Excluded(end.to_offset(self)),
-            Bound::Unbounded => Bound::Unbounded,
-        };
-        let bounds = (start, end);
-        let mut cursor = self.cursor::<DimensionPair<MultiBufferOffset, Point>, BufferOffset>();
-        cursor.seek(&DimensionPair {
-            key: start_offset,
-            value: None,
-        });
-
-        if cursor
-            .region()
-            .is_some_and(|region| bounds.contains(&region.range.start.key))
-        {
-            cursor.prev_excerpt();
-        } else {
-            cursor.seek_to_start_of_current_excerpt();
-        }
-        let mut prev_region = cursor.region();
-
-        cursor.next_excerpt();
-
-        iter::from_fn(move || {
-            loop {
-                if self.singleton {
-                    return None;
-                }
-
-                let next_region = cursor.region()?;
-                cursor.next_excerpt();
-                if !bounds.contains(&next_region.range.start.key) {
-                    prev_region = Some(next_region);
-                    continue;
-                }
-
-                let next_region_start = next_region.range.start.value.unwrap();
-                let next_region_end = if let Some(region) = cursor.region() {
-                    region.range.start.value.unwrap()
-                } else {
-                    self.max_point()
-                };
-
-                let prev = prev_region.as_ref().map(|region| ExcerptInfo {
-                    id: region.excerpt.id,
-                    buffer: region.excerpt.buffer.clone(),
-                    buffer_id: region.excerpt.buffer_id,
-                    range: region.excerpt.range.clone(),
-                    end_row: MultiBufferRow(next_region_start.row),
-                });
-
-                let next = ExcerptInfo {
-                    id: next_region.excerpt.id,
-                    buffer: next_region.excerpt.buffer.clone(),
-                    buffer_id: next_region.excerpt.buffer_id,
-                    range: next_region.excerpt.range.clone(),
-                    end_row: if next_region.excerpt.has_trailing_newline {
-                        MultiBufferRow(next_region_end.row - 1)
-                    } else {
-                        MultiBufferRow(next_region_end.row)
-                    },
-                };
-
-                let row = MultiBufferRow(next_region_start.row);
-
-                prev_region = Some(next_region);
-
-                return Some(ExcerptBoundary { row, prev, next });
-            }
-        })
-    }
-
-    pub fn edit_count(&self) -> usize {
-        self.edit_count
-    }
-
-    pub fn non_text_state_update_count(&self) -> usize {
-        self.non_text_state_update_count
-    }
-
-    /// Returns the smallest enclosing bracket ranges containing the given range or
-    /// None if no brackets contain range or the range is not contained in a single
-    /// excerpt
-    ///
-    /// Can optionally pass a range_filter to filter the ranges of brackets to consider
-    #[ztracing::instrument(skip_all)]
-    pub fn innermost_enclosing_bracket_ranges<T: ToOffset>(
-        &self,
-        range: Range<T>,
-        range_filter: Option<
-            &dyn Fn(&BufferSnapshot, Range<BufferOffset>, Range<BufferOffset>) -> bool,
-        >,
-    ) -> Option<(Range<MultiBufferOffset>, Range<MultiBufferOffset>)> {
-        let range = range.start.to_offset(self)..range.end.to_offset(self);
-        let mut excerpt = self.excerpt_containing(range.clone())?;
-        let buffer = excerpt.buffer();
-        let excerpt_buffer_range = excerpt.buffer_range();
-
-        // Filter to ranges contained in the excerpt
-        let range_filter = |open: Range<usize>, close: Range<usize>| -> bool {
-            excerpt_buffer_range.contains(&BufferOffset(open.start))
-                && excerpt_buffer_range.contains(&BufferOffset(close.end))
-                && range_filter.is_none_or(|filter| {
-                    filter(
-                        buffer,
-                        BufferOffset(open.start)..BufferOffset(close.end),
-                        BufferOffset(close.start)..BufferOffset(close.end),
-                    )
-                })
-        };
-
-        let (open, close) = excerpt.buffer().innermost_enclosing_bracket_ranges(
-            excerpt.map_range_to_buffer(range),
-            Some(&range_filter),
-        )?;
-
-        Some((
-            excerpt.map_range_from_buffer(BufferOffset(open.start)..BufferOffset(open.end)),
-            excerpt.map_range_from_buffer(BufferOffset(close.start)..BufferOffset(close.end)),
-        ))
-    }
-
-    /// Returns enclosing bracket ranges containing the given range or returns None if the range is
-    /// not contained in a single excerpt
-    pub fn enclosing_bracket_ranges<T: ToOffset>(
-        &self,
-        range: Range<T>,
-    ) -> Option<impl Iterator<Item = (Range<MultiBufferOffset>, Range<MultiBufferOffset>)> + '_>
-    {
-        let range = range.start.to_offset(self)..range.end.to_offset(self);
-        let mut excerpt = self.excerpt_containing(range.clone())?;
-
-        Some(
-            excerpt
-                .buffer()
-                .enclosing_bracket_ranges(excerpt.map_range_to_buffer(range))
-                .filter_map(move |pair| {
-                    let open_range =
-                        BufferOffset(pair.open_range.start)..BufferOffset(pair.open_range.end);
-                    let close_range =
-                        BufferOffset(pair.close_range.start)..BufferOffset(pair.close_range.end);
-                    if excerpt.contains_buffer_range(open_range.start..close_range.end) {
-                        Some((
-                            excerpt.map_range_from_buffer(open_range),
-                            excerpt.map_range_from_buffer(close_range),
-                        ))
-                    } else {
-                        None
-                    }
-                }),
-        )
-    }
-
-    /// Returns enclosing bracket ranges containing the given range or returns None if the range is
-    /// not contained in a single excerpt
-    pub fn text_object_ranges<T: ToOffset>(
-        &self,
-        range: Range<T>,
-        options: TreeSitterOptions,
-    ) -> impl Iterator<Item = (Range<MultiBufferOffset>, TextObject)> + '_ {
-        let range = range.start.to_offset(self)..range.end.to_offset(self);
-        self.excerpt_containing(range.clone())
-            .map(|mut excerpt| {
-                excerpt
-                    .buffer()
-                    .text_object_ranges(excerpt.map_range_to_buffer(range), options)
-                    .filter_map(move |(range, text_object)| {
-                        let range = BufferOffset(range.start)..BufferOffset(range.end);
-                        if excerpt.contains_buffer_range(range.clone()) {
-                            Some((excerpt.map_range_from_buffer(range), text_object))
-                        } else {
-                            None
-                        }
-                    })
-            })
-            .into_iter()
-            .flatten()
-    }
-
-    /// Returns bracket range pairs overlapping the given `range` or returns None if the `range` is
-    /// not contained in a single excerpt
-    pub fn bracket_ranges<T: ToOffset>(
-        &self,
-        range: Range<T>,
-    ) -> Option<impl Iterator<Item = (Range<MultiBufferOffset>, Range<MultiBufferOffset>)> + '_>
-    {
-        let range = range.start.to_offset(self)..range.end.to_offset(self);
-        let mut excerpt = self.excerpt_containing(range.clone())?;
-        Some(
-            excerpt
-                .buffer()
-                .bracket_ranges(excerpt.map_range_to_buffer(range))
-                .filter_map(move |pair| {
-                    let open_range =
-                        BufferOffset(pair.open_range.start)..BufferOffset(pair.open_range.end);
-                    let close_range =
-                        BufferOffset(pair.close_range.start)..BufferOffset(pair.close_range.end);
-                    excerpt
-                        .contains_buffer_range(open_range.start..close_range.end)
-                        .then(|| BracketMatch {
-                            open_range: excerpt.map_range_from_buffer(open_range),
-                            close_range: excerpt.map_range_from_buffer(close_range),
-                            color_index: pair.color_index,
-                            newline_only: pair.newline_only,
-                            syntax_layer_depth: pair.syntax_layer_depth,
-                        })
-                })
-                .map(BracketMatch::bracket_ranges),
-        )
-    }
-
-    pub fn redacted_ranges<'a, T: ToOffset>(
-        &'a self,
-        range: Range<T>,
-        redaction_enabled: impl Fn(Option<&Arc<dyn File>>) -> bool + 'a,
-    ) -> impl Iterator<Item = Range<MultiBufferOffset>> + 'a {
-        let range = range.start.to_offset(self)..range.end.to_offset(self);
-        self.lift_buffer_metadata(range, move |buffer, range| {
-            if redaction_enabled(buffer.file()) {
-                Some(buffer.redacted_ranges(range).map(|range| (range, ())))
-            } else {
-                None
-            }
-        })
-        .map(|(range, _, _)| range)
-    }
-
-    pub fn runnable_ranges(
-        &self,
-        range: Range<Anchor>,
-    ) -> impl Iterator<Item = (Range<MultiBufferOffset>, language::RunnableRange)> + '_ {
-        let range = range.start.to_offset(self)..range.end.to_offset(self);
-        self.lift_buffer_metadata(range, move |buffer, range| {
-            Some(
-                buffer
-                    .runnable_ranges(range.clone())
-                    .filter(move |runnable| {
-                        runnable.run_range.start >= range.start
-                            && runnable.run_range.end < range.end
-                    })
-                    .map(|runnable| (runnable.run_range.clone(), runnable)),
-            )
-        })
-        .map(|(run_range, runnable, _)| (run_range, runnable))
-    }
-
-    pub fn line_indents(
-        &self,
-        start_row: MultiBufferRow,
-        buffer_filter: impl Fn(&BufferSnapshot) -> bool,
-    ) -> impl Iterator<Item = (MultiBufferRow, LineIndent, &BufferSnapshot)> {
-        let max_point = self.max_point();
-        let mut cursor = self.cursor::<Point, Point>();
-        cursor.seek(&Point::new(start_row.0, 0));
-        iter::from_fn(move || {
-            let mut region = cursor.region()?;
-            while !buffer_filter(&region.excerpt.buffer) {
-                cursor.next();
-                region = cursor.region()?;
-            }
-            let overshoot = start_row.0.saturating_sub(region.range.start.row);
-            let buffer_start_row =
-                (region.buffer_range.start.row + overshoot).min(region.buffer_range.end.row);
-
-            let buffer_end_row = if region.is_main_buffer
-                && (region.has_trailing_newline || region.range.end == max_point)
-            {
-                region.buffer_range.end.row
-            } else {
-                region.buffer_range.end.row.saturating_sub(1)
-            };
-
-            let line_indents = region
-                .buffer
-                .line_indents_in_row_range(buffer_start_row..buffer_end_row);
-            cursor.next();
-            Some(line_indents.map(move |(buffer_row, indent)| {
-                let row = region.range.start.row + (buffer_row - region.buffer_range.start.row);
-                (MultiBufferRow(row), indent, &region.excerpt.buffer)
-            }))
-        })
-        .flatten()
-    }
-
-    pub fn reversed_line_indents(
-        &self,
-        end_row: MultiBufferRow,
-        buffer_filter: impl Fn(&BufferSnapshot) -> bool,
-    ) -> impl Iterator<Item = (MultiBufferRow, LineIndent, &BufferSnapshot)> {
-        let max_point = self.max_point();
-        let mut cursor = self.cursor::<Point, Point>();
-        cursor.seek(&Point::new(end_row.0, 0));
-        iter::from_fn(move || {
-            let mut region = cursor.region()?;
-            while !buffer_filter(&region.excerpt.buffer) {
-                cursor.prev();
-                region = cursor.region()?;
-            }
-
-            let buffer_start_row = region.buffer_range.start.row;
-            let buffer_end_row = if region.is_main_buffer
-                && (region.has_trailing_newline || region.range.end == max_point)
-            {
-                region.buffer_range.end.row + 1
-            } else {
-                region.buffer_range.end.row
-            };
-
-            let overshoot = end_row.0 - region.range.start.row;
-            let buffer_end_row =
-                (region.buffer_range.start.row + overshoot + 1).min(buffer_end_row);
-
-            let line_indents = region
-                .buffer
-                .reversed_line_indents_in_row_range(buffer_start_row..buffer_end_row);
-            cursor.prev();
-            Some(line_indents.map(move |(buffer_row, indent)| {
-                let row = region.range.start.row + (buffer_row - region.buffer_range.start.row);
-                (MultiBufferRow(row), indent, &region.excerpt.buffer)
-            }))
-        })
-        .flatten()
-    }
-
-    pub async fn enclosing_indent(
-        &self,
-        mut target_row: MultiBufferRow,
-    ) -> Option<(Range<MultiBufferRow>, LineIndent)> {
-        let max_row = MultiBufferRow(self.max_point().row);
-        if target_row >= max_row {
-            return None;
-        }
-
-        let mut target_indent = self.line_indent_for_row(target_row);
-
-        // If the current row is at the start of an indented block, we want to return this
-        // block as the enclosing indent.
-        if !target_indent.is_line_empty() && target_row < max_row {
-            let next_line_indent = self.line_indent_for_row(MultiBufferRow(target_row.0 + 1));
-            if !next_line_indent.is_line_empty()
-                && target_indent.raw_len() < next_line_indent.raw_len()
-            {
-                target_indent = next_line_indent;
-                target_row.0 += 1;
-            }
-        }
-
-        const SEARCH_ROW_LIMIT: u32 = 25000;
-        const SEARCH_WHITESPACE_ROW_LIMIT: u32 = 2500;
-        const YIELD_INTERVAL: u32 = 100;
-
-        let mut accessed_row_counter = 0;
-
-        // If there is a blank line at the current row, search for the next non indented lines
-        if target_indent.is_line_empty() {
-            let start = MultiBufferRow(target_row.0.saturating_sub(SEARCH_WHITESPACE_ROW_LIMIT));
-            let end =
-                MultiBufferRow((max_row.0 + 1).min(target_row.0 + SEARCH_WHITESPACE_ROW_LIMIT));
-
-            let mut non_empty_line_above = None;
-            for (row, indent, _) in self.reversed_line_indents(target_row, |_| true) {
-                if row < start {
-                    break;
-                }
-                accessed_row_counter += 1;
-                if accessed_row_counter == YIELD_INTERVAL {
-                    accessed_row_counter = 0;
-                    yield_now().await;
-                }
-                if !indent.is_line_empty() {
-                    non_empty_line_above = Some((row, indent));
-                    break;
-                }
-            }
-
-            let mut non_empty_line_below = None;
-            for (row, indent, _) in self.line_indents(target_row, |_| true) {
-                if row > end {
-                    break;
-                }
-                accessed_row_counter += 1;
-                if accessed_row_counter == YIELD_INTERVAL {
-                    accessed_row_counter = 0;
-                    yield_now().await;
-                }
-                if !indent.is_line_empty() {
-                    non_empty_line_below = Some((row, indent));
-                    break;
-                }
-            }
-
-            let (row, indent) = match (non_empty_line_above, non_empty_line_below) {
-                (Some((above_row, above_indent)), Some((below_row, below_indent))) => {
-                    if above_indent.raw_len() >= below_indent.raw_len() {
-                        (above_row, above_indent)
-                    } else {
-                        (below_row, below_indent)
-                    }
-                }
-                (Some(above), None) => above,
-                (None, Some(below)) => below,
-                _ => return None,
-            };
-
-            target_indent = indent;
-            target_row = row;
-        }
-
-        let start = MultiBufferRow(target_row.0.saturating_sub(SEARCH_ROW_LIMIT));
-        let end = MultiBufferRow((max_row.0 + 1).min(target_row.0 + SEARCH_ROW_LIMIT));
-
-        let mut start_indent = None;
-        for (row, indent, _) in self.reversed_line_indents(target_row, |_| true) {
-            if row < start {
-                break;
-            }
-            accessed_row_counter += 1;
-            if accessed_row_counter == YIELD_INTERVAL {
-                accessed_row_counter = 0;
-                yield_now().await;
-            }
-            if !indent.is_line_empty() && indent.raw_len() < target_indent.raw_len() {
-                start_indent = Some((row, indent));
-                break;
-            }
-        }
-        let (start_row, start_indent_size) = start_indent?;
-
-        let mut end_indent = (end, None);
-        for (row, indent, _) in self.line_indents(target_row, |_| true) {
-            if row > end {
-                break;
-            }
-            accessed_row_counter += 1;
-            if accessed_row_counter == YIELD_INTERVAL {
-                accessed_row_counter = 0;
-                yield_now().await;
-            }
-            if !indent.is_line_empty() && indent.raw_len() < target_indent.raw_len() {
-                end_indent = (MultiBufferRow(row.0.saturating_sub(1)), Some(indent));
-                break;
-            }
-        }
-        let (end_row, end_indent_size) = end_indent;
-
-        let indent = if let Some(end_indent_size) = end_indent_size {
-            if start_indent_size.raw_len() > end_indent_size.raw_len() {
-                start_indent_size
-            } else {
-                end_indent_size
-            }
-        } else {
-            start_indent_size
-        };
-
-        Some((start_row..end_row, indent))
-    }
-
-    pub fn indent_guides_in_range<T: ToPoint>(
-        &self,
-        range: Range<T>,
-        ignore_disabled_for_language: bool,
-        cx: &App,
-    ) -> impl Iterator<Item = IndentGuide> {
-        let range = range.start.to_point(self)..range.end.to_point(self);
-        let start_row = MultiBufferRow(range.start.row);
-        let end_row = MultiBufferRow(range.end.row);
-
-        let mut row_indents = self.line_indents(start_row, |buffer| {
-            let settings =
-                language_settings(buffer.language().map(|l| l.name()), buffer.file(), cx);
-            settings.indent_guides.enabled || ignore_disabled_for_language
-        });
-
-        let mut result = Vec::new();
-        let mut indent_stack = SmallVec::<[IndentGuide; 8]>::new();
-
-        let mut prev_settings = None;
-        while let Some((first_row, mut line_indent, buffer)) = row_indents.next() {
-            if first_row > end_row {
-                break;
-            }
-            let current_depth = indent_stack.len() as u32;
-
-            // Avoid retrieving the language settings repeatedly for every buffer row.
-            if let Some((prev_buffer_id, _)) = &prev_settings
-                && prev_buffer_id != &buffer.remote_id()
-            {
-                prev_settings.take();
-            }
-            let settings = &prev_settings
-                .get_or_insert_with(|| {
-                    (
-                        buffer.remote_id(),
-                        language_settings(buffer.language().map(|l| l.name()), buffer.file(), cx),
-                    )
-                })
-                .1;
-            let tab_size = settings.tab_size.get();
-
-            // When encountering empty, continue until found useful line indent
-            // then add to the indent stack with the depth found
-            let mut found_indent = false;
-            let mut last_row = first_row;
-            if line_indent.is_line_blank() {
-                while !found_indent {
-                    let Some((target_row, new_line_indent, _)) = row_indents.next() else {
-                        break;
-                    };
-                    const TRAILING_ROW_SEARCH_LIMIT: u32 = 25;
-                    if target_row > MultiBufferRow(end_row.0 + TRAILING_ROW_SEARCH_LIMIT) {
-                        break;
-                    }
-
-                    if new_line_indent.is_line_blank() {
-                        continue;
-                    }
-                    last_row = target_row.min(end_row);
-                    line_indent = new_line_indent;
-                    found_indent = true;
-                    break;
-                }
-            } else {
-                found_indent = true
-            }
-
-            let depth = if found_indent {
-                line_indent.len(tab_size) / tab_size
-            } else {
-                0
-            };
-
-            match depth.cmp(&current_depth) {
-                cmp::Ordering::Less => {
-                    for _ in 0..(current_depth - depth) {
-                        let mut indent = indent_stack.pop().unwrap();
-                        if last_row != first_row {
-                            // In this case, we landed on an empty row, had to seek forward,
-                            // and discovered that the indent we where on is ending.
-                            // This means that the last display row must
-                            // be on line that ends this indent range, so we
-                            // should display the range up to the first non-empty line
-                            indent.end_row = MultiBufferRow(first_row.0.saturating_sub(1));
-                        }
-
-                        result.push(indent)
-                    }
-                }
-                cmp::Ordering::Greater => {
-                    for next_depth in current_depth..depth {
-                        indent_stack.push(IndentGuide {
-                            buffer_id: buffer.remote_id(),
-                            start_row: first_row,
-                            end_row: last_row,
-                            depth: next_depth,
-                            tab_size,
-                            settings: settings.indent_guides.clone(),
-                        });
-                    }
-                }
-                _ => {}
-            }
-
-            for indent in indent_stack.iter_mut() {
-                indent.end_row = last_row;
-            }
-        }
-
-        result.extend(indent_stack);
-        result.into_iter()
-    }
-
-    pub fn trailing_excerpt_update_count(&self) -> usize {
-        self.trailing_excerpt_update_count
-    }
-
-    pub fn file_at<T: ToOffset>(&self, point: T) -> Option<&Arc<dyn File>> {
-        self.point_to_buffer_offset(point)
-            .and_then(|(buffer, _)| buffer.file())
-    }
-
-    pub fn language_at<T: ToOffset>(&self, offset: T) -> Option<&Arc<Language>> {
-        self.point_to_buffer_offset(offset)
-            .and_then(|(buffer, offset)| buffer.language_at(offset))
-    }
-
-    fn language_settings<'a>(&'a self, cx: &'a App) -> Cow<'a, LanguageSettings> {
-        self.excerpts
-            .first()
-            .map(|excerpt| &excerpt.buffer)
-            .map(|buffer| {
-                language_settings(
-                    buffer.language().map(|language| language.name()),
-                    buffer.file(),
-                    cx,
-                )
-            })
-            .unwrap_or_else(move || self.language_settings_at(MultiBufferOffset::ZERO, cx))
-    }
-
-    pub fn language_settings_at<'a, T: ToOffset>(
-        &'a self,
-        point: T,
-        cx: &'a App,
-    ) -> Cow<'a, LanguageSettings> {
-        let mut language = None;
-        let mut file = None;
-        if let Some((buffer, offset)) = self.point_to_buffer_offset(point) {
-            language = buffer.language_at(offset);
-            file = buffer.file();
-        }
-        language_settings(language.map(|l| l.name()), file, cx)
-    }
-
-    pub fn language_scope_at<T: ToOffset>(&self, point: T) -> Option<LanguageScope> {
-        self.point_to_buffer_offset(point)
-            .and_then(|(buffer, offset)| buffer.language_scope_at(offset))
-    }
-
-    pub fn char_classifier_at<T: ToOffset>(&self, point: T) -> CharClassifier {
-        self.point_to_buffer_offset(point)
-            .map(|(buffer, offset)| buffer.char_classifier_at(offset))
-            .unwrap_or_default()
-    }
-
-    pub fn language_indent_size_at<T: ToOffset>(
-        &self,
-        position: T,
-        cx: &App,
-    ) -> Option<IndentSize> {
-        let (buffer_snapshot, offset) = self.point_to_buffer_offset(position)?;
-        Some(buffer_snapshot.language_indent_size_at(offset, cx))
-    }
-
-    pub fn is_dirty(&self) -> bool {
-        self.is_dirty
-    }
-
-    pub fn has_deleted_file(&self) -> bool {
-        self.has_deleted_file
-    }
-
-    pub fn has_conflict(&self) -> bool {
-        self.has_conflict
-    }
-
-    pub fn has_diagnostics(&self) -> bool {
-        self.excerpts
-            .iter()
-            .any(|excerpt| excerpt.buffer.has_diagnostics())
-    }
-
-    pub fn diagnostic_group(
-        &self,
-        buffer_id: BufferId,
-        group_id: usize,
-    ) -> impl Iterator<Item = DiagnosticEntryRef<'_, Point>> + '_ {
-        self.lift_buffer_metadata::<Point, _, _>(
-            Point::zero()..self.max_point(),
-            move |buffer, range| {
-                if buffer.remote_id() != buffer_id {
-                    return None;
-                };
-                Some(
-                    buffer
-                        .diagnostics_in_range(range, false)
-                        .filter(move |diagnostic| diagnostic.diagnostic.group_id == group_id)
-                        .map(move |DiagnosticEntryRef { diagnostic, range }| (range, diagnostic)),
-                )
-            },
-        )
-        .map(|(range, diagnostic, _)| DiagnosticEntryRef { diagnostic, range })
-    }
-
-    pub fn diagnostics_in_range<'a, MBD>(
-        &'a self,
-        range: Range<MBD>,
-    ) -> impl Iterator<Item = DiagnosticEntryRef<'a, MBD>> + 'a
-    where
-        MBD::TextDimension: 'a
-            + text::ToOffset
-            + text::FromAnchor
-            + Sub<Output = MBD::TextDimension>
-            + fmt::Debug
-            + ops::Add<Output = MBD::TextDimension>
-            + ops::AddAssign
-            + Ord,
-        MBD: MultiBufferDimension
-            + Ord
-            + Sub<Output = MBD::TextDimension>
-            + ops::Add<MBD::TextDimension, Output = MBD>
-            + ops::AddAssign<MBD::TextDimension>
-            + 'a,
-    {
-        self.lift_buffer_metadata::<MBD, _, _>(range, move |buffer, buffer_range| {
-            Some(
-                buffer
-                    .diagnostics_in_range(buffer_range.start..buffer_range.end, false)
-                    .map(|entry| (entry.range, entry.diagnostic)),
-            )
-        })
-        .map(|(range, diagnostic, _)| DiagnosticEntryRef { diagnostic, range })
-    }
-
-    pub fn diagnostics_with_buffer_ids_in_range<'a, MBD>(
-        &'a self,
-        range: Range<MBD>,
-    ) -> impl Iterator<Item = (BufferId, DiagnosticEntryRef<'a, MBD>)> + 'a
-    where
-        MBD: MultiBufferDimension
-            + Ord
-            + Sub<Output = MBD::TextDimension>
-            + ops::Add<MBD::TextDimension, Output = MBD>
-            + ops::AddAssign<MBD::TextDimension>,
-        MBD::TextDimension: Sub<Output = MBD::TextDimension>
-            + ops::Add<Output = MBD::TextDimension>
-            + text::ToOffset
-            + text::FromAnchor
-            + AddAssign<MBD::TextDimension>
-            + Ord,
-    {
-        self.lift_buffer_metadata::<MBD, _, _>(range, move |buffer, buffer_range| {
-            Some(
-                buffer
-                    .diagnostics_in_range(buffer_range.start..buffer_range.end, false)
-                    .map(|entry| (entry.range, entry.diagnostic)),
-            )
-        })
-        .map(|(range, diagnostic, b)| (b.buffer_id, DiagnosticEntryRef { diagnostic, range }))
-    }
-
-    pub fn syntax_ancestor<T: ToOffset>(
-        &self,
-        range: Range<T>,
-    ) -> Option<(tree_sitter::Node<'_>, Range<MultiBufferOffset>)> {
-        let range = range.start.to_offset(self)..range.end.to_offset(self);
-        let mut excerpt = self.excerpt_containing(range.clone())?;
-        let node = excerpt
-            .buffer()
-            .syntax_ancestor(excerpt.map_range_to_buffer(range))?;
-        let node_range = node.byte_range();
-        let node_range = BufferOffset(node_range.start)..BufferOffset(node_range.end);
-        if !excerpt.contains_buffer_range(node_range.clone()) {
-            return None;
-        };
-        Some((node, excerpt.map_range_from_buffer(node_range)))
-    }
-
-    pub fn outline(&self, theme: Option<&SyntaxTheme>) -> Option<Outline<Anchor>> {
-        let (excerpt_id, _, buffer) = self.as_singleton()?;
-        let outline = buffer.outline(theme);
-        Some(Outline::new(
-            outline
-                .items
-                .into_iter()
-                .flat_map(|item| {
-                    Some(OutlineItem {
-                        depth: item.depth,
-                        range: self.anchor_range_in_excerpt(*excerpt_id, item.range)?,
-                        source_range_for_text: self
-                            .anchor_range_in_excerpt(*excerpt_id, item.source_range_for_text)?,
-                        text: item.text,
-                        highlight_ranges: item.highlight_ranges,
-                        name_ranges: item.name_ranges,
-                        body_range: item.body_range.and_then(|body_range| {
-                            self.anchor_range_in_excerpt(*excerpt_id, body_range)
-                        }),
-                        annotation_range: item.annotation_range.and_then(|annotation_range| {
-                            self.anchor_range_in_excerpt(*excerpt_id, annotation_range)
-                        }),
-                    })
-                })
-                .collect(),
-        ))
-    }
-
-    pub fn symbols_containing<T: ToOffset>(
-        &self,
-        offset: T,
-        theme: Option<&SyntaxTheme>,
-    ) -> Option<(BufferId, Vec<OutlineItem<Anchor>>)> {
-        let anchor = self.anchor_before(offset);
-        let excerpt @ &Excerpt {
-            id: excerpt_id,
-            buffer_id,
-            ref buffer,
-            ..
-        } = self.excerpt(anchor.excerpt_id)?;
-        if cfg!(debug_assertions) {
-            match anchor.text_anchor.buffer_id {
-                // we clearly are hitting this according to sentry, but in what situations can this occur?
-                Some(anchor_buffer_id) => {
-                    assert_eq!(
-                        anchor_buffer_id, buffer_id,
-                        "anchor {anchor:?} does not match with resolved excerpt {excerpt:?}"
-                    )
-                }
-                None => assert!(anchor.is_max()),
-            }
-        };
-        Some((
-            buffer_id,
-            buffer
-                .symbols_containing(anchor.text_anchor, theme)
-                .into_iter()
-                .flat_map(|item| {
-                    Some(OutlineItem {
-                        depth: item.depth,
-                        source_range_for_text: Anchor::range_in_buffer(
-                            excerpt_id,
-                            item.source_range_for_text,
-                        ),
-                        range: Anchor::range_in_buffer(excerpt_id, item.range),
-                        text: item.text,
-                        highlight_ranges: item.highlight_ranges,
-                        name_ranges: item.name_ranges,
-                        body_range: item
-                            .body_range
-                            .map(|body_range| Anchor::range_in_buffer(excerpt_id, body_range)),
-                        annotation_range: item
-                            .annotation_range
-                            .map(|body_range| Anchor::range_in_buffer(excerpt_id, body_range)),
-                    })
-                })
-                .collect(),
-        ))
-    }
-
-    fn excerpt_locator_for_id(&self, id: ExcerptId) -> &Locator {
-        if id == ExcerptId::min() {
-            Locator::min_ref()
-        } else if id == ExcerptId::max() {
-            Locator::max_ref()
-        } else {
-            let (_, _, item) = self.excerpt_ids.find::<ExcerptId, _>((), &id, Bias::Left);
-            if let Some(entry) = item
-                && entry.id == id
-            {
-                return &entry.locator;
-            }
-            panic!("invalid excerpt id {id:?}")
-        }
-    }
-
-    /// Returns the locators referenced by the given excerpt IDs, sorted by locator.
-    fn excerpt_locators_for_ids(
-        &self,
-        ids: impl IntoIterator<Item = ExcerptId>,
-    ) -> SmallVec<[Locator; 1]> {
-        let mut sorted_ids = ids.into_iter().collect::<SmallVec<[_; 1]>>();
-        sorted_ids.sort_unstable();
-        sorted_ids.dedup();
-        let mut locators = SmallVec::new();
-
-        while sorted_ids.last() == Some(&ExcerptId::max()) {
-            sorted_ids.pop();
-            locators.push(Locator::max());
-        }
-
-        let mut sorted_ids = sorted_ids.into_iter().peekable();
-        locators.extend(
-            sorted_ids
-                .peeking_take_while(|excerpt| *excerpt == ExcerptId::min())
-                .map(|_| Locator::min()),
-        );
-
-        let mut cursor = self.excerpt_ids.cursor::<ExcerptId>(());
-        for id in sorted_ids {
-            if cursor.seek_forward(&id, Bias::Left) {
-                locators.push(cursor.item().unwrap().locator.clone());
-            } else {
-                panic!("invalid excerpt id {:?}", id);
-            }
-        }
-
-        locators.sort_unstable();
-        locators
-    }
-
-    pub fn buffer_id_for_excerpt(&self, excerpt_id: ExcerptId) -> Option<BufferId> {
-        Some(self.excerpt(excerpt_id)?.buffer_id)
-    }
-
-    pub fn buffer_for_excerpt(&self, excerpt_id: ExcerptId) -> Option<&BufferSnapshot> {
-        Some(&self.excerpt(excerpt_id)?.buffer)
-    }
-
-    pub fn range_for_excerpt(&self, excerpt_id: ExcerptId) -> Option<Range<Point>> {
-        let mut cursor = self
-            .excerpts
-            .cursor::<Dimensions<Option<&Locator>, ExcerptPoint>>(());
-        let locator = self.excerpt_locator_for_id(excerpt_id);
-        let mut sought_exact = cursor.seek(&Some(locator), Bias::Left);
-        if cursor.item().is_none() && excerpt_id == ExcerptId::max() {
-            sought_exact = true;
-            cursor.prev();
-        } else if excerpt_id == ExcerptId::min() {
-            sought_exact = true;
-        }
-        if sought_exact {
-            let start = cursor.start().1;
-            let end = cursor.end().1;
-            let mut diff_transforms = self
-                .diff_transforms
-                .cursor::<Dimensions<ExcerptPoint, OutputDimension<Point>>>(());
-            diff_transforms.seek(&start, Bias::Left);
-            let overshoot = start - diff_transforms.start().0;
-            let start = diff_transforms.start().1 + overshoot;
-            diff_transforms.seek(&end, Bias::Right);
-            let overshoot = end - diff_transforms.start().0;
-            let end = diff_transforms.start().1 + overshoot;
-            Some(start.0..end.0)
-        } else {
-            None
-        }
-    }
-
-    /// Returns the excerpt for the given id. The returned excerpt is guaranteed
-    /// to have the latest excerpt id for the one passed in and will also remap
-    /// `ExcerptId::max()` to the corresponding excertp ID.
-    ///
-    /// Callers of this function should generally use the resulting excerpt's `id` field
-    /// afterwards.
-    fn excerpt(&self, excerpt_id: ExcerptId) -> Option<&Excerpt> {
-        let excerpt_id = self.latest_excerpt_id(excerpt_id);
-        let mut cursor = self.excerpts.cursor::<Option<&Locator>>(());
-        let locator = self.excerpt_locator_for_id(excerpt_id);
-        cursor.seek(&Some(locator), Bias::Left);
-        if let Some(excerpt) = cursor.item()
-            && excerpt.id == excerpt_id
-        {
-            return Some(excerpt);
-        } else if cursor.item().is_none() && excerpt_id == ExcerptId::max() {
-            cursor.prev();
-            return cursor.item();
-        }
-        None
-    }
-
-    /// Returns the excerpt containing range and its offset start within the multibuffer or none if `range` spans multiple excerpts
-    pub fn excerpt_containing<T: ToOffset>(
-        &self,
-        range: Range<T>,
-    ) -> Option<MultiBufferExcerpt<'_>> {
-        let range = range.start.to_offset(self)..range.end.to_offset(self);
-        let mut cursor = self.cursor::<MultiBufferOffset, BufferOffset>();
-        cursor.seek(&range.start);
-
-        let start_excerpt = cursor.excerpt()?;
-        if range.end != range.start {
-            cursor.seek_forward(&range.end);
-            if cursor.excerpt()?.id != start_excerpt.id {
-                return None;
-            }
-        }
-
-        cursor.seek_to_start_of_current_excerpt();
-        let region = cursor.region()?;
-        let offset = region.range.start;
-        let buffer_offset = start_excerpt.buffer_start_offset();
-        let excerpt_offset = *cursor.excerpts.start();
-        Some(MultiBufferExcerpt {
-            diff_transforms: cursor.diff_transforms,
-            excerpt: start_excerpt,
-            offset,
-            buffer_offset,
-            excerpt_offset,
-        })
-    }
-
-    pub fn buffer_id_for_anchor(&self, anchor: Anchor) -> Option<BufferId> {
-        if let Some(id) = anchor.text_anchor.buffer_id {
-            return Some(id);
-        }
-        let excerpt = self.excerpt_containing(anchor..anchor)?;
-        Some(excerpt.buffer_id())
-    }
-
-    pub fn selections_in_range<'a>(
-        &'a self,
-        range: &'a Range<Anchor>,
-        include_local: bool,
-    ) -> impl 'a + Iterator<Item = (ReplicaId, bool, CursorShape, Selection<Anchor>)> {
-        let mut cursor = self.excerpts.cursor::<ExcerptSummary>(());
-        let start_locator = self.excerpt_locator_for_id(range.start.excerpt_id);
-        let end_locator = self.excerpt_locator_for_id(range.end.excerpt_id);
-        cursor.seek(start_locator, Bias::Left);
-        cursor
-            .take_while(move |excerpt| excerpt.locator <= *end_locator)
-            .flat_map(move |excerpt| {
-                let mut query_range = excerpt.range.context.start..excerpt.range.context.end;
-                if excerpt.id == range.start.excerpt_id {
-                    query_range.start = range.start.text_anchor;
-                }
-                if excerpt.id == range.end.excerpt_id {
-                    query_range.end = range.end.text_anchor;
-                }
-
-                excerpt
-                    .buffer
-                    .selections_in_range(query_range, include_local)
-                    .flat_map(move |(replica_id, line_mode, cursor_shape, selections)| {
-                        selections.map(move |selection| {
-                            let mut start = Anchor::in_buffer(excerpt.id, selection.start);
-                            let mut end = Anchor::in_buffer(excerpt.id, selection.end);
-                            if range.start.cmp(&start, self).is_gt() {
-                                start = range.start;
-                            }
-                            if range.end.cmp(&end, self).is_lt() {
-                                end = range.end;
-                            }
-
-                            (
-                                replica_id,
-                                line_mode,
-                                cursor_shape,
-                                Selection {
-                                    id: selection.id,
-                                    start,
-                                    end,
-                                    reversed: selection.reversed,
-                                    goal: selection.goal,
-                                },
-                            )
-                        })
-                    })
-            })
-    }
-
-    pub fn show_headers(&self) -> bool {
-        self.show_headers
-    }
-
-    pub fn diff_for_buffer_id(&self, buffer_id: BufferId) -> Option<&BufferDiffSnapshot> {
-        self.diffs.get(&buffer_id)
-    }
-
-    /// Visually annotates a position or range with the `Debug` representation of a value. The
-    /// callsite of this function is used as a key - previous annotations will be removed.
-    #[cfg(debug_assertions)]
-    #[track_caller]
-    pub fn debug<V, R>(&self, ranges: &R, value: V)
-    where
-        R: debug::ToMultiBufferDebugRanges,
-        V: std::fmt::Debug,
-    {
-        self.debug_with_key(std::panic::Location::caller(), ranges, value);
-    }
-
-    /// Visually annotates a position or range with the `Debug` representation of a value. Previous
-    /// debug annotations with the same key will be removed. The key is also used to determine the
-    /// annotation's color.
-    #[cfg(debug_assertions)]
-    #[track_caller]
-    pub fn debug_with_key<K, R, V>(&self, key: &K, ranges: &R, value: V)
-    where
-        K: std::hash::Hash + 'static,
-        R: debug::ToMultiBufferDebugRanges,
-        V: std::fmt::Debug,
-    {
-        let text_ranges = ranges
-            .to_multi_buffer_debug_ranges(self)
-            .into_iter()
-            .flat_map(|range| {
-                self.range_to_buffer_ranges(range).into_iter().map(
-                    |(buffer, range, _excerpt_id)| {
-                        buffer.anchor_after(range.start)..buffer.anchor_before(range.end)
-                    },
-                )
-            })
-            .collect();
-        text::debug::GlobalDebugRanges::with_locked(|debug_ranges| {
-            debug_ranges.insert(key, text_ranges, format!("{value:?}").into())
-        });
-    }
-}
-
-#[cfg(any(test, feature = "test-support"))]
-impl MultiBufferSnapshot {
-    pub fn random_byte_range(
-        &self,
-        start_offset: MultiBufferOffset,
-        rng: &mut impl rand::Rng,
-    ) -> Range<MultiBufferOffset> {
-        let end = self.clip_offset(rng.random_range(start_offset..=self.len()), Bias::Right);
-        let start = self.clip_offset(rng.random_range(start_offset..=end), Bias::Right);
-        start..end
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    fn check_invariants(&self) {
-        let excerpts = self.excerpts.items(());
-        let excerpt_ids = self.excerpt_ids.items(());
-
-        assert!(
-            self.excerpts.is_empty() || !self.diff_transforms.is_empty(),
-            "must be at least one diff transform if excerpts exist"
-        );
-
-        for (ix, excerpt) in excerpts.iter().enumerate() {
-            if ix == 0 {
-                if excerpt.locator <= Locator::min() {
-                    panic!("invalid first excerpt locator {:?}", excerpt.locator);
-                }
-            } else if excerpt.locator <= excerpts[ix - 1].locator {
-                panic!("excerpts are out-of-order: {:?}", excerpts);
-            }
-        }
-
-        for (ix, entry) in excerpt_ids.iter().enumerate() {
-            if ix == 0 {
-                if entry.id.cmp(&ExcerptId::min(), self).is_le() {
-                    panic!("invalid first excerpt id {:?}", entry.id);
-                }
-            } else if entry.id <= excerpt_ids[ix - 1].id {
-                panic!("excerpt ids are out-of-order: {:?}", excerpt_ids);
-            }
-        }
-
-        if self.diff_transforms.summary().input != self.excerpts.summary().text {
-            panic!(
-                "incorrect input summary. expected {:#?}, got {:#?}. transforms: {:#?}",
-                self.excerpts.summary().text,
-                self.diff_transforms.summary().input,
-                self.diff_transforms.items(()),
-            );
-        }
-
-        for (left, right) in self.diff_transforms.iter().tuple_windows() {
-            use sum_tree::Item;
-
-            if left.is_buffer_content()
-                && left.summary(()).input.len == MultiBufferOffset(0)
-                && !self.is_empty()
-            {
-                panic!("empty buffer content transform in non-empty snapshot");
-            }
-            assert!(
-                left.clone().merged_with(right).is_none(),
-                "two consecutive diff transforms could have been merged, but weren't"
-            );
-        }
-    }
-}
-
-impl<'a, MBD, BD> MultiBufferCursor<'a, MBD, BD>
-where
-    MBD: MultiBufferDimension + Ord + Sub + ops::AddAssign<<MBD as Sub>::Output>,
-    BD: TextDimension + AddAssign<<MBD as Sub>::Output>,
-{
-    #[instrument(skip_all)]
-    fn seek(&mut self, position: &MBD) {
-        let position = OutputDimension(*position);
-        self.cached_region.take();
-        self.diff_transforms.seek(&position, Bias::Right);
-        if self.diff_transforms.item().is_none()
-            && self.diff_transforms.start().output_dimension == position
-        {
-            self.diff_transforms.prev();
-        }
-
-        let mut excerpt_position = self.diff_transforms.start().excerpt_dimension;
-        if let Some(item) = self.diff_transforms.item()
-            && item.is_buffer_content()
-        {
-            let overshoot = position - self.diff_transforms.start().output_dimension;
-            excerpt_position += overshoot;
-        }
-
-        self.excerpts.seek(&excerpt_position, Bias::Right);
-        if self.excerpts.item().is_none() && excerpt_position == *self.excerpts.start() {
-            self.excerpts.prev();
-        }
-    }
-
-    fn seek_forward(&mut self, position: &MBD) {
-        let position = OutputDimension(*position);
-        self.cached_region.take();
-        self.diff_transforms.seek_forward(&position, Bias::Right);
-        if self.diff_transforms.item().is_none()
-            && self.diff_transforms.start().output_dimension == position
-        {
-            self.diff_transforms.prev();
-        }
-
-        let overshoot = position - self.diff_transforms.start().output_dimension;
-        let mut excerpt_position = self.diff_transforms.start().excerpt_dimension;
-        if let Some(item) = self.diff_transforms.item()
-            && item.is_buffer_content()
-        {
-            excerpt_position += overshoot;
-        }
-
-        self.excerpts.seek_forward(&excerpt_position, Bias::Right);
-        if self.excerpts.item().is_none() && excerpt_position == *self.excerpts.start() {
-            self.excerpts.prev();
-        }
-    }
-
-    fn next_excerpt(&mut self) {
-        self.excerpts.next();
-        self.seek_to_start_of_current_excerpt();
-    }
-
-    fn prev_excerpt(&mut self) {
-        self.excerpts.prev();
-        self.seek_to_start_of_current_excerpt();
-    }
-
-    fn seek_to_start_of_current_excerpt(&mut self) {
-        self.cached_region.take();
-        self.diff_transforms.seek(self.excerpts.start(), Bias::Left);
-        if self.diff_transforms.end().excerpt_dimension == *self.excerpts.start()
-            && self.diff_transforms.start().excerpt_dimension < *self.excerpts.start()
-            && self.diff_transforms.next_item().is_some()
-        {
-            self.diff_transforms.next();
-        }
-    }
-
-    fn next(&mut self) {
-        self.cached_region.take();
-        match self
-            .diff_transforms
-            .end()
-            .excerpt_dimension
-            .cmp(&self.excerpts.end())
-        {
-            cmp::Ordering::Less => {
-                self.diff_transforms.next();
-            }
-            cmp::Ordering::Greater => {
-                self.excerpts.next();
-            }
-            cmp::Ordering::Equal => {
-                self.diff_transforms.next();
-                if self.diff_transforms.end().excerpt_dimension > self.excerpts.end()
-                    || self.diff_transforms.item().is_none()
-                {
-                    self.excerpts.next();
-                } else if let Some(DiffTransform::DeletedHunk { hunk_info, .. }) =
-                    self.diff_transforms.item()
-                    && self
-                        .excerpts
-                        .item()
-                        .is_some_and(|excerpt| excerpt.id != hunk_info.excerpt_id)
-                {
-                    self.excerpts.next();
-                }
-            }
-        }
-    }
-
-    fn prev(&mut self) {
-        self.cached_region.take();
-        match self
-            .diff_transforms
-            .start()
-            .excerpt_dimension
-            .cmp(self.excerpts.start())
-        {
-            cmp::Ordering::Less => self.excerpts.prev(),
-            cmp::Ordering::Greater => self.diff_transforms.prev(),
-            cmp::Ordering::Equal => {
-                self.diff_transforms.prev();
-                if self.diff_transforms.start().excerpt_dimension < *self.excerpts.start()
-                    || self.diff_transforms.item().is_none()
-                {
-                    self.excerpts.prev();
-                }
-            }
-        }
-    }
-
-    fn region(&mut self) -> Option<MultiBufferRegion<'a, MBD, BD>> {
-        if self.cached_region.is_none() {
-            self.cached_region = self.build_region();
-        }
-        self.cached_region.clone()
-    }
-
-    fn is_at_start_of_excerpt(&mut self) -> bool {
-        if self.diff_transforms.start().excerpt_dimension > *self.excerpts.start() {
-            return false;
-        } else if self.diff_transforms.start().excerpt_dimension < *self.excerpts.start() {
-            return true;
-        }
-
-        self.diff_transforms.prev();
-        let prev_transform = self.diff_transforms.item();
-        self.diff_transforms.next();
-
-        prev_transform.is_none_or(|prev_transform| prev_transform.is_buffer_content())
-    }
-
-    fn is_at_end_of_excerpt(&mut self) -> bool {
-        if self.diff_transforms.end().excerpt_dimension < self.excerpts.end() {
-            return false;
-        } else if self.diff_transforms.end().excerpt_dimension > self.excerpts.end()
-            || self.diff_transforms.item().is_none()
-        {
-            return true;
-        }
-
-        let next_transform = self.diff_transforms.next_item();
-        next_transform.is_none_or(|next_transform| match next_transform {
-            DiffTransform::Unmodified { .. }
-            | DiffTransform::InsertedHunk { .. }
-            | DiffTransform::FilteredInsertedHunk { .. } => true,
-            DiffTransform::DeletedHunk { hunk_info, .. } => self
-                .excerpts
-                .item()
-                .is_some_and(|excerpt| excerpt.id != hunk_info.excerpt_id),
-        })
-    }
-
-    fn main_buffer_position(&self) -> Option<BD> {
-        let excerpt = self.excerpts.item()?;
-        let buffer = &excerpt.buffer;
-        let buffer_context_start = excerpt.range.context.start.summary::<BD>(buffer);
-        let mut buffer_start = buffer_context_start;
-        let overshoot = self.diff_transforms.end().excerpt_dimension - *self.excerpts.start();
-        buffer_start += overshoot;
-        Some(buffer_start)
-    }
-
-    fn build_region(&self) -> Option<MultiBufferRegion<'a, MBD, BD>> {
-        let excerpt = self.excerpts.item()?;
-        match self.diff_transforms.item()? {
-            DiffTransform::DeletedHunk {
-                buffer_id,
-                has_trailing_newline,
-                hunk_info,
-                ..
-            } => {
-                let diff = self.snapshot.diffs.get(buffer_id)?;
-                let buffer = diff.base_text();
-                let mut rope_cursor = buffer.as_rope().cursor(0);
-                let buffer_start = rope_cursor.summary::<BD>(hunk_info.base_text_byte_range.start);
-                let buffer_range_len =
-                    rope_cursor.summary::<BD>(hunk_info.base_text_byte_range.end);
-                let mut buffer_end = buffer_start;
-                TextDimension::add_assign(&mut buffer_end, &buffer_range_len);
-                let start = self.diff_transforms.start().output_dimension.0;
-                let end = self.diff_transforms.end().output_dimension.0;
-
-                Some(MultiBufferRegion {
-                    buffer,
-                    excerpt,
-                    has_trailing_newline: *has_trailing_newline,
-                    is_main_buffer: false,
-                    diff_hunk_status: Some(DiffHunkStatus::deleted(
-                        hunk_info.hunk_secondary_status,
-                    )),
-                    buffer_range: buffer_start..buffer_end,
-                    range: start..end,
-                    diff_base_byte_range: Some(hunk_info.base_text_byte_range.clone()),
-                })
-            }
-            transform @ (DiffTransform::Unmodified { .. }
-            | DiffTransform::InsertedHunk { .. }
-            | DiffTransform::FilteredInsertedHunk { .. }) => {
-                let mut diff_hunk_status = transform
-                    .hunk_info()
-                    .map(|hunk_info| DiffHunkStatus::added(hunk_info.hunk_secondary_status));
-
-                let diff_base_byte_range = transform
-                    .hunk_info()
-                    .map(|hunk_info| hunk_info.base_text_byte_range);
-
-                let buffer = &excerpt.buffer;
-                let buffer_context_start = excerpt.range.context.start.summary::<BD>(buffer);
-
-                let mut start = self.diff_transforms.start().output_dimension.0;
-                let mut buffer_start = buffer_context_start;
-                if self.diff_transforms.start().excerpt_dimension < *self.excerpts.start() {
-                    let overshoot =
-                        *self.excerpts.start() - self.diff_transforms.start().excerpt_dimension;
-                    start += overshoot;
-                } else {
-                    let overshoot =
-                        self.diff_transforms.start().excerpt_dimension - *self.excerpts.start();
-                    buffer_start += overshoot;
-                }
-
-                let mut end;
-                let mut buffer_end;
-                let has_trailing_newline;
-                if self.diff_transforms.end().excerpt_dimension < self.excerpts.end() {
-                    let overshoot =
-                        self.diff_transforms.end().excerpt_dimension - *self.excerpts.start();
-                    end = self.diff_transforms.end().output_dimension.0;
-                    buffer_end = buffer_context_start;
-                    buffer_end += overshoot;
-                    has_trailing_newline = false;
-                } else {
-                    let overshoot =
-                        self.excerpts.end() - self.diff_transforms.start().excerpt_dimension;
-                    end = self.diff_transforms.start().output_dimension.0;
-                    end += overshoot;
-                    buffer_end = excerpt.range.context.end.summary::<BD>(buffer);
-                    has_trailing_newline = excerpt.has_trailing_newline;
-                };
-
-                if matches!(transform, DiffTransform::FilteredInsertedHunk { .. }) {
-                    buffer_end = buffer_start;
-                    end = start;
-                    diff_hunk_status = None;
-                }
-
-                Some(MultiBufferRegion {
-                    buffer,
-                    excerpt,
-                    has_trailing_newline,
-                    is_main_buffer: true,
-                    diff_hunk_status,
-                    diff_base_byte_range,
-                    buffer_range: buffer_start..buffer_end,
-                    range: start..end,
-                })
-            }
-        }
-    }
-
-    fn excerpt(&self) -> Option<&'a Excerpt> {
-        self.excerpts.item()
-    }
-}
-
-impl Excerpt {
-    fn new(
-        id: ExcerptId,
-        locator: Locator,
-        buffer_id: BufferId,
-        buffer: BufferSnapshot,
-        range: ExcerptRange<text::Anchor>,
-        has_trailing_newline: bool,
-    ) -> Self {
-        Excerpt {
-            id,
-            locator,
-            max_buffer_row: range.context.end.to_point(&buffer).row,
-            text_summary: buffer
-                .text_summary_for_range::<TextSummary, _>(range.context.to_offset(&buffer)),
-            buffer_id,
-            buffer,
-            range,
-            has_trailing_newline,
-        }
-    }
-
-    fn chunks_in_range(&self, range: Range<usize>, language_aware: bool) -> ExcerptChunks<'_> {
-        let content_start = self.range.context.start.to_offset(&self.buffer);
-        let chunks_start = content_start + range.start;
-        let chunks_end = content_start + cmp::min(range.end, self.text_summary.len);
-
-        let has_footer = self.has_trailing_newline
-            && range.start <= self.text_summary.len
-            && range.end > self.text_summary.len;
-
-        let content_chunks = self.buffer.chunks(chunks_start..chunks_end, language_aware);
-
-        ExcerptChunks {
-            excerpt_id: self.id,
-            content_chunks,
-            has_footer,
-        }
-    }
-
-    fn seek_chunks(&self, excerpt_chunks: &mut ExcerptChunks, range: Range<usize>) {
-        let content_start = self.range.context.start.to_offset(&self.buffer);
-        let chunks_start = content_start + range.start;
-        let chunks_end = content_start + cmp::min(range.end, self.text_summary.len);
-        excerpt_chunks.content_chunks.seek(chunks_start..chunks_end);
-        excerpt_chunks.has_footer = self.has_trailing_newline
-            && range.start <= self.text_summary.len
-            && range.end > self.text_summary.len;
-    }
-
-    fn clip_anchor(&self, text_anchor: text::Anchor) -> text::Anchor {
-        if text_anchor
-            .cmp(&self.range.context.start, &self.buffer)
-            .is_lt()
-        {
-            self.range.context.start
-        } else if text_anchor
-            .cmp(&self.range.context.end, &self.buffer)
-            .is_gt()
-        {
-            self.range.context.end
-        } else {
-            text_anchor
-        }
-    }
-
-    fn contains(&self, anchor: &Anchor) -> bool {
-        (anchor.text_anchor.buffer_id == None
-            || anchor.text_anchor.buffer_id == Some(self.buffer_id))
-            && self
-                .range
-                .context
-                .start
-                .cmp(&anchor.text_anchor, &self.buffer)
-                .is_le()
-            && self
-                .range
-                .context
-                .end
-                .cmp(&anchor.text_anchor, &self.buffer)
-                .is_ge()
-    }
-
-    /// The [`Excerpt`]'s start offset in its [`Buffer`]
-    fn buffer_start_offset(&self) -> BufferOffset {
-        BufferOffset(self.range.context.start.to_offset(&self.buffer))
-    }
-
-    /// The [`Excerpt`]'s end offset in its [`Buffer`]
-    fn buffer_end_offset(&self) -> BufferOffset {
-        self.buffer_start_offset() + self.text_summary.len
-    }
-}
-
-impl<'a> MultiBufferExcerpt<'a> {
-    pub fn id(&self) -> ExcerptId {
-        self.excerpt.id
-    }
-
-    pub fn buffer_id(&self) -> BufferId {
-        self.excerpt.buffer_id
-    }
-
-    pub fn start_anchor(&self) -> Anchor {
-        Anchor::in_buffer(self.excerpt.id, self.excerpt.range.context.start)
-    }
-
-    pub fn end_anchor(&self) -> Anchor {
-        Anchor::in_buffer(self.excerpt.id, self.excerpt.range.context.end)
-    }
-
-    pub fn buffer(&self) -> &'a BufferSnapshot {
-        &self.excerpt.buffer
-    }
-
-    pub fn buffer_range(&self) -> Range<BufferOffset> {
-        self.buffer_offset
-            ..BufferOffset(
-                self.excerpt
-                    .range
-                    .context
-                    .end
-                    .to_offset(&self.excerpt.buffer.text),
-            )
-    }
-
-    pub fn start_offset(&self) -> MultiBufferOffset {
-        self.offset
-    }
-
-    /// Maps an offset within the [`MultiBuffer`] to an offset within the [`Buffer`]
-    pub fn map_offset_to_buffer(&mut self, offset: MultiBufferOffset) -> BufferOffset {
-        self.map_range_to_buffer(offset..offset).start
-    }
-
-    /// Maps a range within the [`MultiBuffer`] to a range within the [`Buffer`]
-    pub fn map_range_to_buffer(&mut self, range: Range<MultiBufferOffset>) -> Range<BufferOffset> {
-        self.diff_transforms
-            .seek(&OutputDimension(range.start), Bias::Right);
-        let start = self.map_offset_to_buffer_internal(range.start);
-        let end = if range.end > range.start {
-            self.diff_transforms
-                .seek_forward(&OutputDimension(range.end), Bias::Right);
-            self.map_offset_to_buffer_internal(range.end)
-        } else {
-            start
-        };
-        start..end
-    }
-
-    fn map_offset_to_buffer_internal(&self, offset: MultiBufferOffset) -> BufferOffset {
-        let mut excerpt_offset = self.diff_transforms.start().excerpt_dimension;
-        if self
-            .diff_transforms
-            .item()
-            .is_some_and(|t| t.is_buffer_content())
-        {
-            excerpt_offset += offset - self.diff_transforms.start().output_dimension.0;
-        };
-        let offset_in_excerpt = excerpt_offset.saturating_sub(self.excerpt_offset);
-        self.buffer_offset + offset_in_excerpt
-    }
-
-    /// Map an offset within the [`Buffer`] to an offset within the [`MultiBuffer`]
-    pub fn map_offset_from_buffer(&mut self, buffer_offset: BufferOffset) -> MultiBufferOffset {
-        self.map_range_from_buffer(buffer_offset..buffer_offset)
-            .start
-    }
-
-    /// Map a range within the [`Buffer`] to a range within the [`MultiBuffer`]
-    pub fn map_range_from_buffer(
-        &mut self,
-        buffer_range: Range<BufferOffset>,
-    ) -> Range<MultiBufferOffset> {
-        if buffer_range.start < self.buffer_offset {
-            log::warn!(
-                "Attempting to map a range from a buffer offset that starts before the current buffer offset"
-            );
-            return self.offset..self.offset;
-        }
-        let overshoot = buffer_range.start - self.buffer_offset;
-        let excerpt_offset = self.excerpt_offset + overshoot;
-        let excerpt_seek_dim = excerpt_offset;
-        self.diff_transforms.seek(&excerpt_seek_dim, Bias::Right);
-        if self.diff_transforms.start().excerpt_dimension > excerpt_offset {
-            log::warn!(
-                "Attempting to map a range from a buffer offset that starts before the current buffer offset"
-            );
-            return self.offset..self.offset;
-        }
-        let overshoot = excerpt_offset - self.diff_transforms.start().excerpt_dimension;
-        let start = self.diff_transforms.start().output_dimension.0 + overshoot;
-
-        let end = if buffer_range.start < buffer_range.end {
-            let overshoot = buffer_range.end - self.buffer_offset;
-            let excerpt_offset = self.excerpt_offset + overshoot;
-            let excerpt_seek_dim = excerpt_offset;
-            self.diff_transforms
-                .seek_forward(&excerpt_seek_dim, Bias::Right);
-            let overshoot = excerpt_offset - self.diff_transforms.start().excerpt_dimension;
-            // todo(lw): Clamp end to the excerpt boundaries
-            self.diff_transforms.start().output_dimension.0 + overshoot
-        } else {
-            start
-        };
-
-        start..end
-    }
-
-    /// Returns true if the entirety of the given range is in the buffer's excerpt
-    pub fn contains_buffer_range(&self, range: Range<BufferOffset>) -> bool {
-        range.start >= self.excerpt.buffer_start_offset()
-            && range.end <= self.excerpt.buffer_end_offset()
-    }
-
-    pub fn max_buffer_row(&self) -> u32 {
-        self.excerpt.max_buffer_row
-    }
-}
-
-impl ExcerptId {
-    pub fn min() -> Self {
-        Self(0)
-    }
-
-    pub fn max() -> Self {
-        Self(u32::MAX)
-    }
-
-    pub fn to_proto(self) -> u64 {
-        self.0 as _
-    }
-
-    pub fn from_proto(proto: u64) -> Self {
-        Self(proto as _)
-    }
-
-    pub fn cmp(&self, other: &Self, snapshot: &MultiBufferSnapshot) -> cmp::Ordering {
-        let a = snapshot.excerpt_locator_for_id(*self);
-        let b = snapshot.excerpt_locator_for_id(*other);
-        a.cmp(b).then_with(|| self.0.cmp(&other.0))
-    }
-}
-
-impl From<ExcerptId> for usize {
-    fn from(val: ExcerptId) -> Self {
-        val.0 as usize
-    }
-}
-
-impl fmt::Debug for Excerpt {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("Excerpt")
-            .field("id", &self.id)
-            .field("locator", &self.locator)
-            .field("buffer_id", &self.buffer_id)
-            .field("range", &self.range)
-            .field("text_summary", &self.text_summary)
-            .field("has_trailing_newline", &self.has_trailing_newline)
-            .finish()
-    }
-}
-
-impl sum_tree::Item for Excerpt {
-    type Summary = ExcerptSummary;
-
-    fn summary(&self, _cx: ()) -> Self::Summary {
-        let mut text = self.text_summary;
-        if self.has_trailing_newline {
-            text += TextSummary::from("\n");
-        }
-        ExcerptSummary {
-            excerpt_id: self.id,
-            excerpt_locator: self.locator.clone(),
-            widest_line_number: self.max_buffer_row,
-            text: text.into(),
-        }
-    }
-}
-
-impl sum_tree::Item for ExcerptIdMapping {
-    type Summary = ExcerptId;
-
-    fn summary(&self, _cx: ()) -> Self::Summary {
-        self.id
-    }
-}
-
-impl sum_tree::KeyedItem for ExcerptIdMapping {
-    type Key = ExcerptId;
-
-    fn key(&self) -> Self::Key {
-        self.id
-    }
-}
-
-impl DiffTransform {
-    fn hunk_info(&self) -> Option<DiffTransformHunkInfo> {
-        match self {
-            DiffTransform::DeletedHunk { hunk_info, .. }
-            | DiffTransform::InsertedHunk { hunk_info, .. }
-            | DiffTransform::FilteredInsertedHunk { hunk_info, .. } => Some(hunk_info.clone()),
-            DiffTransform::Unmodified { .. } => None,
-        }
-    }
-
-    fn is_buffer_content(&self) -> bool {
-        match self {
-            Self::Unmodified { .. }
-            | Self::InsertedHunk { .. }
-            | Self::FilteredInsertedHunk { .. } => true,
-            Self::DeletedHunk { .. } => false,
-        }
-    }
-}
-
-impl sum_tree::Item for DiffTransform {
-    type Summary = DiffTransformSummary;
-
-    fn summary(&self, _: <Self::Summary as sum_tree::Summary>::Context<'_>) -> Self::Summary {
-        match self {
-            DiffTransform::InsertedHunk { summary, .. }
-            | DiffTransform::Unmodified { summary, .. } => DiffTransformSummary {
-                input: *summary,
-                output: *summary,
-            },
-            &DiffTransform::DeletedHunk { summary, .. } => DiffTransformSummary {
-                input: MBTextSummary::default(),
-                output: summary.into(),
-            },
-            DiffTransform::FilteredInsertedHunk { summary, .. } => DiffTransformSummary {
-                input: *summary,
-                output: MBTextSummary::default(),
-            },
-        }
-    }
-}
-
-impl DiffTransformSummary {
-    fn excerpt_len(&self) -> ExcerptOffset {
-        ExcerptDimension(self.input.len)
-    }
-}
-
-impl sum_tree::ContextLessSummary for DiffTransformSummary {
-    fn zero() -> Self {
-        DiffTransformSummary {
-            input: MBTextSummary::default(),
-            output: MBTextSummary::default(),
-        }
-    }
-
-    fn add_summary(&mut self, other: &Self) {
-        self.input += other.input;
-        self.output += other.output;
-    }
-}
-
-impl sum_tree::ContextLessSummary for ExcerptId {
-    fn zero() -> Self {
-        Self(0)
-    }
-
-    fn add_summary(&mut self, summary: &Self) {
-        *self = cmp::max(*self, *summary);
-    }
-}
-
-impl sum_tree::ContextLessSummary for ExcerptSummary {
-    fn zero() -> Self {
-        Self::default()
-    }
-
-    fn add_summary(&mut self, summary: &Self) {
-        debug_assert!(summary.excerpt_locator > self.excerpt_locator);
-        self.excerpt_locator = summary.excerpt_locator.clone();
-        self.text += summary.text;
-        self.widest_line_number = cmp::max(self.widest_line_number, summary.widest_line_number);
-    }
-}
-
-impl<'a> sum_tree::SeekTarget<'a, ExcerptSummary, Option<&'a Locator>> for Locator {
-    fn cmp(&self, cursor_location: &Option<&'a Locator>, _: ()) -> cmp::Ordering {
-        Ord::cmp(&Some(self), cursor_location)
-    }
-}
-
-impl sum_tree::SeekTarget<'_, ExcerptSummary, ExcerptSummary> for Locator {
-    fn cmp(&self, cursor_location: &ExcerptSummary, _: ()) -> cmp::Ordering {
-        Ord::cmp(self, &cursor_location.excerpt_locator)
-    }
-}
-
-impl<'a, MBD> sum_tree::Dimension<'a, ExcerptSummary> for ExcerptDimension<MBD>
-where
-    MBD: MultiBufferDimension + Default,
-{
-    fn zero(_: ()) -> Self {
-        ExcerptDimension(MBD::default())
-    }
-
-    fn add_summary(&mut self, summary: &'a ExcerptSummary, _: ()) {
-        MultiBufferDimension::add_mb_text_summary(&mut self.0, &summary.text)
-    }
-}
-
-impl<'a> sum_tree::Dimension<'a, ExcerptSummary> for Option<&'a Locator> {
-    fn zero(_cx: ()) -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, summary: &'a ExcerptSummary, _: ()) {
-        *self = Some(&summary.excerpt_locator);
-    }
-}
-
-impl<'a> sum_tree::Dimension<'a, ExcerptSummary> for Option<ExcerptId> {
-    fn zero(_cx: ()) -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, summary: &'a ExcerptSummary, _: ()) {
-        *self = Some(summary.excerpt_id);
-    }
-}
-
-#[derive(Copy, Clone, PartialOrd, Ord, Eq, PartialEq, Debug)]
-struct OutputDimension<T>(T);
-
-impl<T: PartialEq> PartialEq<T> for OutputDimension<T> {
-    fn eq(&self, other: &T) -> bool {
-        self.0 == *other
-    }
-}
-
-impl<T: PartialOrd> PartialOrd<T> for OutputDimension<T> {
-    fn partial_cmp(&self, other: &T) -> Option<cmp::Ordering> {
-        self.0.partial_cmp(other)
-    }
-}
-
-impl<R, T, U> ops::Sub<OutputDimension<U>> for OutputDimension<T>
-where
-    T: ops::Sub<U, Output = R>,
-{
-    type Output = R;
-
-    fn sub(self, other: OutputDimension<U>) -> Self::Output {
-        self.0 - other.0
-    }
-}
-
-impl<R, T, U> ops::Add<U> for OutputDimension<T>
-where
-    T: ops::Add<U, Output = R>,
-{
-    type Output = OutputDimension<R>;
-
-    fn add(self, other: U) -> Self::Output {
-        OutputDimension(self.0 + other)
-    }
-}
-
-impl<T, U> AddAssign<U> for OutputDimension<T>
-where
-    T: AddAssign<U>,
-{
-    fn add_assign(&mut self, other: U) {
-        self.0 += other;
-    }
-}
-
-impl<T, U> SubAssign<U> for OutputDimension<T>
-where
-    T: SubAssign<U>,
-{
-    fn sub_assign(&mut self, other: U) {
-        self.0 -= other;
-    }
-}
-
-#[derive(Copy, Clone, PartialOrd, Ord, Eq, PartialEq, Debug)]
-struct ExcerptDimension<T>(T);
-
-impl<T: PartialEq> PartialEq<T> for ExcerptDimension<T> {
-    fn eq(&self, other: &T) -> bool {
-        self.0 == *other
-    }
-}
-
-impl<T: PartialOrd> PartialOrd<T> for ExcerptDimension<T> {
-    fn partial_cmp(&self, other: &T) -> Option<cmp::Ordering> {
-        self.0.partial_cmp(other)
-    }
-}
-
-impl ExcerptOffset {
-    fn saturating_sub(self, other: ExcerptOffset) -> usize {
-        self.0.saturating_sub(other.0)
-    }
-}
-
-impl<R, T, U> ops::Sub<ExcerptDimension<U>> for ExcerptDimension<T>
-where
-    T: ops::Sub<U, Output = R>,
-{
-    type Output = R;
-
-    fn sub(self, other: ExcerptDimension<U>) -> Self::Output {
-        self.0 - other.0
-    }
-}
-
-impl<R, T, U> ops::Add<U> for ExcerptDimension<T>
-where
-    T: ops::Add<U, Output = R>,
-{
-    type Output = ExcerptDimension<R>;
-
-    fn add(self, other: U) -> Self::Output {
-        ExcerptDimension(self.0 + other)
-    }
-}
-
-impl<T, U> AddAssign<U> for ExcerptDimension<T>
-where
-    T: AddAssign<U>,
-{
-    fn add_assign(&mut self, other: U) {
-        self.0 += other;
-    }
-}
-
-impl<T, U> SubAssign<U> for ExcerptDimension<T>
-where
-    T: SubAssign<U>,
-{
-    fn sub_assign(&mut self, other: U) {
-        self.0 -= other;
-    }
-}
-
-impl<'a> sum_tree::Dimension<'a, DiffTransformSummary> for MultiBufferOffset {
-    fn zero(_: ()) -> Self {
-        MultiBufferOffset::ZERO
-    }
-
-    fn add_summary(&mut self, summary: &'a DiffTransformSummary, _: ()) {
-        *self += summary.output.len;
-    }
-}
-
-impl<MBD> sum_tree::SeekTarget<'_, DiffTransformSummary, DiffTransformSummary>
-    for ExcerptDimension<MBD>
-where
-    MBD: MultiBufferDimension + Ord,
-{
-    fn cmp(&self, cursor_location: &DiffTransformSummary, _: ()) -> cmp::Ordering {
-        Ord::cmp(&self.0, &MBD::from_summary(&cursor_location.input))
-    }
-}
-
-impl<'a, MBD> sum_tree::SeekTarget<'a, DiffTransformSummary, DiffTransforms<MBD>>
-    for ExcerptDimension<MBD>
-where
-    MBD: MultiBufferDimension + Ord,
-{
-    fn cmp(&self, cursor_location: &DiffTransforms<MBD>, _: ()) -> cmp::Ordering {
-        Ord::cmp(&self.0, &cursor_location.excerpt_dimension.0)
-    }
-}
-
-impl<'a, MBD: MultiBufferDimension> sum_tree::Dimension<'a, DiffTransformSummary>
-    for ExcerptDimension<MBD>
-{
-    fn zero(_: ()) -> Self {
-        ExcerptDimension(MBD::default())
-    }
-
-    fn add_summary(&mut self, summary: &'a DiffTransformSummary, _: ()) {
-        self.0.add_mb_text_summary(&summary.input)
-    }
-}
-
-impl<'a, MBD> sum_tree::SeekTarget<'a, DiffTransformSummary, DiffTransforms<MBD>>
-    for OutputDimension<MBD>
-where
-    MBD: MultiBufferDimension + Ord,
-{
-    fn cmp(&self, cursor_location: &DiffTransforms<MBD>, _: ()) -> cmp::Ordering {
-        Ord::cmp(&self.0, &cursor_location.output_dimension.0)
-    }
-}
-
-impl<'a, MBD: MultiBufferDimension> sum_tree::Dimension<'a, DiffTransformSummary>
-    for OutputDimension<MBD>
-{
-    fn zero(_: ()) -> Self {
-        OutputDimension(MBD::default())
-    }
-
-    fn add_summary(&mut self, summary: &'a DiffTransformSummary, _: ()) {
-        self.0.add_mb_text_summary(&summary.output)
-    }
-}
-
-impl MultiBufferRows<'_> {
-    pub fn seek(&mut self, MultiBufferRow(row): MultiBufferRow) {
-        self.point = Point::new(row, 0);
-        self.cursor.seek(&self.point);
-    }
-}
-
-impl Iterator for MultiBufferRows<'_> {
-    type Item = RowInfo;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        if self.is_empty && self.point.row == 0 {
-            self.point += Point::new(1, 0);
-            return Some(RowInfo {
-                buffer_id: None,
-                buffer_row: Some(0),
-                base_text_row: Some(BaseTextRow(0)),
-                multibuffer_row: Some(MultiBufferRow(0)),
-                diff_status: None,
-                expand_info: None,
-                wrapped_buffer_row: None,
-            });
-        }
-
-        let mut region = self.cursor.region()?;
-        while self.point >= region.range.end {
-            self.cursor.next();
-            if let Some(next_region) = self.cursor.region() {
-                region = next_region;
-            } else if self.point == self.cursor.diff_transforms.end().output_dimension.0 {
-                let multibuffer_row = MultiBufferRow(self.point.row);
-                let last_excerpt = self
-                    .cursor
-                    .excerpts
-                    .item()
-                    .or(self.cursor.excerpts.prev_item())?;
-                let last_row = last_excerpt
-                    .range
-                    .context
-                    .end
-                    .to_point(&last_excerpt.buffer)
-                    .row;
-                // TODO(split-diff) perf
-                let base_text_row = self
-                    .cursor
-                    .snapshot
-                    .diffs
-                    .get(&last_excerpt.buffer_id)
-                    .map(|diff| diff.row_to_base_text_row(last_row, &last_excerpt.buffer))
-                    .map(BaseTextRow);
-
-                let first_row = last_excerpt
-                    .range
-                    .context
-                    .start
-                    .to_point(&last_excerpt.buffer)
-                    .row;
-
-                let expand_info = if self.is_singleton {
-                    None
-                } else {
-                    let needs_expand_up = first_row == last_row
-                        && (last_row > 0)
-                        && !region.diff_hunk_status.is_some_and(|d| d.is_deleted())
-                        && !(region.is_filtered()
-                            && region
-                                .diff_base_byte_range
-                                .is_some_and(|range| !range.is_empty()));
-                    let needs_expand_down = last_row < last_excerpt.buffer.max_point().row;
-
-                    if needs_expand_up && needs_expand_down {
-                        Some(ExpandExcerptDirection::UpAndDown)
-                    } else if needs_expand_up {
-                        Some(ExpandExcerptDirection::Up)
-                    } else if needs_expand_down {
-                        Some(ExpandExcerptDirection::Down)
-                    } else {
-                        None
-                    }
-                    .map(|direction| ExpandInfo {
-                        direction,
-                        excerpt_id: last_excerpt.id,
-                    })
-                };
-                self.point += Point::new(1, 0);
-                return Some(RowInfo {
-                    buffer_id: Some(last_excerpt.buffer_id),
-                    buffer_row: Some(last_row),
-                    base_text_row,
-                    multibuffer_row: Some(multibuffer_row),
-                    diff_status: None,
-                    wrapped_buffer_row: None,
-                    expand_info,
-                });
-            } else {
-                return None;
-            };
-        }
-
-        let overshoot = self.point - region.range.start;
-        let buffer_point = region.buffer_range.start + overshoot;
-        let diff_status = region
-            .diff_hunk_status
-            .filter(|_| self.point < region.range.end);
-        let base_text_row = match diff_status {
-            // TODO(split-diff) perf
-            None => self
-                .cursor
-                .snapshot
-                .diffs
-                .get(&region.excerpt.buffer_id)
-                .map(|diff| diff.row_to_base_text_row(buffer_point.row, &region.buffer))
-                .map(BaseTextRow),
-            Some(DiffHunkStatus {
-                kind: DiffHunkStatusKind::Added,
-                ..
-            }) => None,
-            Some(DiffHunkStatus {
-                kind: DiffHunkStatusKind::Deleted,
-                ..
-            }) => Some(BaseTextRow(buffer_point.row)),
-            Some(DiffHunkStatus {
-                kind: DiffHunkStatusKind::Modified,
-                ..
-            }) => unreachable!(),
-        };
-        let expand_info = if self.is_singleton {
-            None
-        } else {
-            let needs_expand_up = self.point.row == region.range.start.row
-                && self.cursor.is_at_start_of_excerpt()
-                && buffer_point.row > 0;
-            let needs_expand_down = (region.excerpt.has_trailing_newline
-                && self.point.row + 1 == region.range.end.row
-                || !region.excerpt.has_trailing_newline && self.point.row == region.range.end.row)
-                && self.cursor.is_at_end_of_excerpt()
-                && buffer_point.row < region.buffer.max_point().row;
-
-            if needs_expand_up && needs_expand_down {
-                Some(ExpandExcerptDirection::UpAndDown)
-            } else if needs_expand_up {
-                Some(ExpandExcerptDirection::Up)
-            } else if needs_expand_down {
-                Some(ExpandExcerptDirection::Down)
-            } else {
-                None
-            }
-            .map(|direction| ExpandInfo {
-                direction,
-                excerpt_id: region.excerpt.id,
-            })
-        };
-
-        let result = Some(RowInfo {
-            buffer_id: Some(region.buffer.remote_id()),
-            buffer_row: Some(buffer_point.row),
-            base_text_row,
-            multibuffer_row: Some(MultiBufferRow(self.point.row)),
-            diff_status,
-            expand_info,
-            wrapped_buffer_row: None,
-        });
-        self.point += Point::new(1, 0);
-        result
-    }
-}
-
-impl<'a> MultiBufferChunks<'a> {
-    pub fn offset(&self) -> MultiBufferOffset {
-        self.range.start
-    }
-
-    pub fn seek(&mut self, range: Range<MultiBufferOffset>) {
-        self.diff_transforms.seek(&range.end, Bias::Right);
-        let mut excerpt_end = self.diff_transforms.start().1;
-        if self
-            .diff_transforms
-            .item()
-            .is_some_and(|t| t.is_buffer_content())
-        {
-            let overshoot = range.end - self.diff_transforms.start().0;
-            excerpt_end += overshoot;
-        }
-
-        self.diff_transforms.seek(&range.start, Bias::Right);
-        let mut excerpt_start = self.diff_transforms.start().1;
-        if self
-            .diff_transforms
-            .item()
-            .is_some_and(|t| t.is_buffer_content())
-        {
-            let overshoot = range.start - self.diff_transforms.start().0;
-            excerpt_start += overshoot;
-        }
-
-        self.seek_to_excerpt_offset_range(excerpt_start..excerpt_end);
-        self.buffer_chunk.take();
-        self.range = range;
-    }
-
-    fn seek_to_excerpt_offset_range(&mut self, new_range: Range<ExcerptOffset>) {
-        self.excerpt_offset_range = new_range.clone();
-        self.excerpts.seek(&new_range.start, Bias::Right);
-        if let Some(excerpt) = self.excerpts.item() {
-            let excerpt_start = *self.excerpts.start();
-            if let Some(excerpt_chunks) = self
-                .excerpt_chunks
-                .as_mut()
-                .filter(|chunks| excerpt.id == chunks.excerpt_id)
-            {
-                excerpt.seek_chunks(
-                    excerpt_chunks,
-                    (self.excerpt_offset_range.start - excerpt_start)
-                        ..(self.excerpt_offset_range.end - excerpt_start),
-                );
-            } else {
-                self.excerpt_chunks = Some(excerpt.chunks_in_range(
-                    (self.excerpt_offset_range.start - excerpt_start)
-                        ..(self.excerpt_offset_range.end - excerpt_start),
-                    self.language_aware,
-                ));
-            }
-        } else {
-            self.excerpt_chunks = None;
-        }
-    }
-
-    fn next_excerpt_chunk(&mut self) -> Option<Chunk<'a>> {
-        loop {
-            if self.excerpt_offset_range.is_empty() {
-                return None;
-            } else if let Some(chunk) = self.excerpt_chunks.as_mut()?.next() {
-                self.excerpt_offset_range.start += chunk.text.len();
-                return Some(chunk);
-            } else {
-                self.excerpts.next();
-                let excerpt = self.excerpts.item()?;
-                self.excerpt_chunks = Some(excerpt.chunks_in_range(
-                    0..(self.excerpt_offset_range.end - *self.excerpts.start()),
-                    self.language_aware,
-                ));
-            }
-        }
-    }
-}
-
-impl<'a> Iterator for ReversedMultiBufferChunks<'a> {
-    type Item = &'a str;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        let mut region = self.cursor.region()?;
-        if self.offset == region.range.start {
-            self.cursor.prev();
-            while let Some(region) = self.cursor.region()
-                && region.buffer_range.is_empty()
-                && !region.has_trailing_newline
-            {
-                self.cursor.prev();
-            }
-            region = self.cursor.region()?;
-            let start_overshoot = self.start.saturating_sub(region.range.start);
-            self.current_chunks = Some(region.buffer.reversed_chunks_in_range(
-                region.buffer_range.start + start_overshoot..region.buffer_range.end,
-            ));
-        }
-
-        if self.offset == region.range.end && region.has_trailing_newline {
-            self.offset -= 1;
-            Some("\n")
-        } else {
-            let chunk = self.current_chunks.as_mut().unwrap().next()?;
-            self.offset -= chunk.len();
-            Some(chunk)
-        }
-    }
-}
-
-impl<'a> Iterator for MultiBufferChunks<'a> {
-    type Item = Chunk<'a>;
-
-    fn next(&mut self) -> Option<Chunk<'a>> {
-        if self.range.start >= self.range.end {
-            return None;
-        }
-        if self.range.start == self.diff_transforms.end().0 {
-            self.diff_transforms.next();
-        }
-        while let Some(DiffTransform::FilteredInsertedHunk { .. }) = self.diff_transforms.item() {
-            self.diff_transforms.next();
-            let mut range = self.excerpt_offset_range.clone();
-            range.start = self.diff_transforms.start().1;
-            self.seek_to_excerpt_offset_range(range);
-            self.buffer_chunk.take();
-        }
-
-        let diff_transform_start = self.diff_transforms.start().0;
-        let diff_transform_end = self.diff_transforms.end().0;
-        debug_assert!(
-            self.range.start < diff_transform_end,
-            "{:?} < {:?} of ({1:?}..{2:?})",
-            self.range.start,
-            diff_transform_end,
-            diff_transform_start
-        );
-
-        let diff_transform = self.diff_transforms.item()?;
-        match diff_transform {
-            DiffTransform::Unmodified { .. }
-            | DiffTransform::InsertedHunk { .. }
-            | DiffTransform::FilteredInsertedHunk { .. } => {
-                let chunk = if let Some(chunk) = &mut self.buffer_chunk {
-                    chunk
-                } else {
-                    let chunk = self.next_excerpt_chunk().unwrap();
-                    self.buffer_chunk.insert(chunk)
-                };
-
-                let chunk_end = self.range.start + chunk.text.len();
-                let diff_transform_end = diff_transform_end.min(self.range.end);
-
-                if diff_transform_end < chunk_end {
-                    let split_idx = diff_transform_end - self.range.start;
-                    let (before, after) = chunk.text.split_at(split_idx);
-                    self.range.start = diff_transform_end;
-                    let mask = 1u128.unbounded_shl(split_idx as u32).wrapping_sub(1);
-                    let chars = chunk.chars & mask;
-                    let tabs = chunk.tabs & mask;
-
-                    chunk.text = after;
-                    chunk.chars = chunk.chars >> split_idx;
-                    chunk.tabs = chunk.tabs >> split_idx;
-
-                    Some(Chunk {
-                        text: before,
-                        chars,
-                        tabs,
-                        ..chunk.clone()
-                    })
-                } else {
-                    self.range.start = chunk_end;
-                    self.buffer_chunk.take()
-                }
-            }
-            DiffTransform::DeletedHunk {
-                buffer_id,
-                hunk_info,
-                has_trailing_newline,
-                ..
-            } => {
-                let base_text_start = hunk_info.base_text_byte_range.start
-                    + (self.range.start - diff_transform_start);
-                let base_text_end =
-                    hunk_info.base_text_byte_range.start + (self.range.end - diff_transform_start);
-                let base_text_end = base_text_end.min(hunk_info.base_text_byte_range.end);
-
-                let mut chunks = if let Some((_, mut chunks)) = self
-                    .diff_base_chunks
-                    .take()
-                    .filter(|(id, _)| id == buffer_id)
-                {
-                    if chunks.range().start != base_text_start || chunks.range().end < base_text_end
-                    {
-                        chunks.seek(base_text_start..base_text_end);
-                    }
-                    chunks
-                } else {
-                    let base_buffer = &self.diffs.get(buffer_id)?.base_text();
-                    base_buffer.chunks(base_text_start..base_text_end, self.language_aware)
-                };
-
-                let chunk = if let Some(chunk) = chunks.next() {
-                    self.range.start += chunk.text.len();
-                    self.diff_base_chunks = Some((*buffer_id, chunks));
-                    chunk
-                } else {
-                    debug_assert!(has_trailing_newline);
-                    self.range.start += "\n".len();
-                    Chunk {
-                        text: "\n",
-                        chars: 1u128,
-                        ..Default::default()
-                    }
-                };
-                Some(chunk)
-            }
-        }
-    }
-}
-
-impl MultiBufferBytes<'_> {
-    fn consume(&mut self, len: usize) {
-        self.range.start += len;
-        self.chunk = &self.chunk[len..];
-
-        if !self.range.is_empty() && self.chunk.is_empty() {
-            if let Some(chunk) = self.excerpt_bytes.as_mut().and_then(|bytes| bytes.next()) {
-                self.chunk = chunk;
-            } else if self.has_trailing_newline {
-                self.has_trailing_newline = false;
-                self.chunk = b"\n";
-            } else {
-                self.cursor.next();
-                while let Some(region) = self.cursor.region()
-                    && region.buffer_range.is_empty()
-                    && !region.has_trailing_newline
-                {
-                    self.cursor.next();
-                }
-                if let Some(region) = self.cursor.region() {
-                    let mut excerpt_bytes = region.buffer.bytes_in_range(
-                        region.buffer_range.start
-                            ..(region.buffer_range.start + (self.range.end - region.range.start))
-                                .min(region.buffer_range.end),
-                    );
-                    self.chunk = excerpt_bytes.next().unwrap_or(&[]);
-                    self.excerpt_bytes = Some(excerpt_bytes);
-                    self.has_trailing_newline =
-                        region.has_trailing_newline && self.range.end >= region.range.end;
-                    if self.chunk.is_empty() && self.has_trailing_newline {
-                        self.has_trailing_newline = false;
-                        self.chunk = b"\n";
-                    }
-                }
-            }
-        }
-    }
-}
-
-impl<'a> Iterator for MultiBufferBytes<'a> {
-    type Item = &'a [u8];
-
-    fn next(&mut self) -> Option<Self::Item> {
-        let chunk = self.chunk;
-        if chunk.is_empty() {
-            None
-        } else {
-            self.consume(chunk.len());
-            Some(chunk)
-        }
-    }
-}
-
-impl io::Read for MultiBufferBytes<'_> {
-    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        let len = cmp::min(buf.len(), self.chunk.len());
-        buf[..len].copy_from_slice(&self.chunk[..len]);
-        if len > 0 {
-            self.consume(len);
-        }
-        Ok(len)
-    }
-}
-
-impl io::Read for ReversedMultiBufferBytes<'_> {
-    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        let len = cmp::min(buf.len(), self.chunk.len());
-        buf[..len].copy_from_slice(&self.chunk[..len]);
-        buf[..len].reverse();
-        if len > 0 {
-            self.range.end -= len;
-            self.chunk = &self.chunk[..self.chunk.len() - len];
-            if !self.range.is_empty()
-                && self.chunk.is_empty()
-                && let Some(chunk) = self.chunks.next()
-            {
-                self.chunk = chunk.as_bytes();
-            }
-        }
-        Ok(len)
-    }
-}
-
-impl<'a> Iterator for ExcerptChunks<'a> {
-    type Item = Chunk<'a>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        if let Some(chunk) = self.content_chunks.next() {
-            return Some(chunk);
-        }
-
-        if self.has_footer {
-            let text = "\n";
-            let chars = 0b1;
-            self.has_footer = false;
-            return Some(Chunk {
-                text,
-                chars,
-                ..Default::default()
-            });
-        }
-
-        None
-    }
-}
-
-impl ToOffset for Point {
-    fn to_offset<'a>(&self, snapshot: &MultiBufferSnapshot) -> MultiBufferOffset {
-        snapshot.point_to_offset(*self)
-    }
-    fn to_offset_utf16(&self, snapshot: &MultiBufferSnapshot) -> MultiBufferOffsetUtf16 {
-        snapshot.point_to_offset_utf16(*self)
-    }
-}
-
-impl ToOffset for MultiBufferOffset {
-    #[track_caller]
-    fn to_offset<'a>(&self, snapshot: &MultiBufferSnapshot) -> MultiBufferOffset {
-        assert!(
-            *self <= snapshot.len(),
-            "offset {} is greater than the snapshot.len() {}",
-            self.0,
-            snapshot.len().0,
-        );
-        *self
-    }
-    fn to_offset_utf16(&self, snapshot: &MultiBufferSnapshot) -> MultiBufferOffsetUtf16 {
-        snapshot.offset_to_offset_utf16(*self)
-    }
-}
-
-impl ToOffset for MultiBufferOffsetUtf16 {
-    fn to_offset<'a>(&self, snapshot: &MultiBufferSnapshot) -> MultiBufferOffset {
-        snapshot.offset_utf16_to_offset(*self)
-    }
-
-    fn to_offset_utf16(&self, _snapshot: &MultiBufferSnapshot) -> MultiBufferOffsetUtf16 {
-        *self
-    }
-}
-
-impl ToOffset for PointUtf16 {
-    fn to_offset<'a>(&self, snapshot: &MultiBufferSnapshot) -> MultiBufferOffset {
-        snapshot.point_utf16_to_offset(*self)
-    }
-    fn to_offset_utf16(&self, snapshot: &MultiBufferSnapshot) -> MultiBufferOffsetUtf16 {
-        snapshot.point_utf16_to_offset_utf16(*self)
-    }
-}
-
-impl ToPoint for MultiBufferOffset {
-    fn to_point<'a>(&self, snapshot: &MultiBufferSnapshot) -> Point {
-        snapshot.offset_to_point(*self)
-    }
-    fn to_point_utf16<'a>(&self, snapshot: &MultiBufferSnapshot) -> PointUtf16 {
-        snapshot.offset_to_point_utf16(*self)
-    }
-}
-
-impl ToPoint for Point {
-    fn to_point<'a>(&self, _: &MultiBufferSnapshot) -> Point {
-        *self
-    }
-    fn to_point_utf16<'a>(&self, snapshot: &MultiBufferSnapshot) -> PointUtf16 {
-        snapshot.point_to_point_utf16(*self)
-    }
-}
-
-impl ToPoint for PointUtf16 {
-    fn to_point<'a>(&self, snapshot: &MultiBufferSnapshot) -> Point {
-        snapshot.point_utf16_to_point(*self)
-    }
-    fn to_point_utf16<'a>(&self, _: &MultiBufferSnapshot) -> PointUtf16 {
-        *self
-    }
-}
-
-impl From<ExcerptId> for EntityId {
-    fn from(id: ExcerptId) -> Self {
-        EntityId::from(id.0 as u64)
-    }
-}
-
-#[cfg(debug_assertions)]
-pub mod debug {
-    use super::*;
-
-    pub trait ToMultiBufferDebugRanges {
-        fn to_multi_buffer_debug_ranges(
-            &self,
-            snapshot: &MultiBufferSnapshot,
-        ) -> Vec<Range<MultiBufferOffset>>;
-    }
-
-    impl<T: ToOffset> ToMultiBufferDebugRanges for T {
-        fn to_multi_buffer_debug_ranges(
-            &self,
-            snapshot: &MultiBufferSnapshot,
-        ) -> Vec<Range<MultiBufferOffset>> {
-            [self.to_offset(snapshot)].to_multi_buffer_debug_ranges(snapshot)
-        }
-    }
-
-    impl<T: ToOffset> ToMultiBufferDebugRanges for Range<T> {
-        fn to_multi_buffer_debug_ranges(
-            &self,
-            snapshot: &MultiBufferSnapshot,
-        ) -> Vec<Range<MultiBufferOffset>> {
-            [self.start.to_offset(snapshot)..self.end.to_offset(snapshot)]
-                .to_multi_buffer_debug_ranges(snapshot)
-        }
-    }
-
-    impl<T: ToOffset> ToMultiBufferDebugRanges for Vec<T> {
-        fn to_multi_buffer_debug_ranges(
-            &self,
-            snapshot: &MultiBufferSnapshot,
-        ) -> Vec<Range<MultiBufferOffset>> {
-            self.as_slice().to_multi_buffer_debug_ranges(snapshot)
-        }
-    }
-
-    impl<T: ToOffset> ToMultiBufferDebugRanges for Vec<Range<T>> {
-        fn to_multi_buffer_debug_ranges(
-            &self,
-            snapshot: &MultiBufferSnapshot,
-        ) -> Vec<Range<MultiBufferOffset>> {
-            self.as_slice().to_multi_buffer_debug_ranges(snapshot)
-        }
-    }
-
-    impl<T: ToOffset> ToMultiBufferDebugRanges for [T] {
-        fn to_multi_buffer_debug_ranges(
-            &self,
-            snapshot: &MultiBufferSnapshot,
-        ) -> Vec<Range<MultiBufferOffset>> {
-            self.iter()
-                .map(|item| {
-                    let offset = item.to_offset(snapshot);
-                    offset..offset
-                })
-                .collect()
-        }
-    }
-
-    impl<T: ToOffset> ToMultiBufferDebugRanges for [Range<T>] {
-        fn to_multi_buffer_debug_ranges(
-            &self,
-            snapshot: &MultiBufferSnapshot,
-        ) -> Vec<Range<MultiBufferOffset>> {
-            self.iter()
-                .map(|range| range.start.to_offset(snapshot)..range.end.to_offset(snapshot))
-                .collect()
-        }
-    }
-}
diff --git a/crates/multi_buffer/src/multi_buffer_tests.rs b/crates/multi_buffer/src/multi_buffer_tests.rs
deleted file mode 100644
index fc2edcac15..0000000000
--- a/crates/multi_buffer/src/multi_buffer_tests.rs
+++ /dev/null
@@ -1,4652 +0,0 @@
-use super::*;
-use buffer_diff::{DiffHunkStatus, DiffHunkStatusKind};
-use gpui::{App, TestAppContext};
-use indoc::indoc;
-use language::{Buffer, Rope};
-use parking_lot::RwLock;
-use rand::prelude::*;
-use settings::SettingsStore;
-use std::env;
-use std::time::{Duration, Instant};
-use util::RandomCharIter;
-use util::rel_path::rel_path;
-use util::test::sample_text;
-
-#[ctor::ctor]
-fn init_logger() {
-    zlog::init_test();
-}
-
-#[gpui::test]
-fn test_empty_singleton(cx: &mut App) {
-    let buffer = cx.new(|cx| Buffer::local("", cx));
-    let buffer_id = buffer.read(cx).remote_id();
-    let multibuffer = cx.new(|cx| MultiBuffer::singleton(buffer.clone(), cx));
-    let snapshot = multibuffer.read(cx).snapshot(cx);
-    assert_eq!(snapshot.text(), "");
-    assert_eq!(
-        snapshot.row_infos(MultiBufferRow(0)).collect::<Vec<_>>(),
-        [RowInfo {
-            buffer_id: Some(buffer_id),
-            buffer_row: Some(0),
-            base_text_row: None,
-            multibuffer_row: Some(MultiBufferRow(0)),
-            diff_status: None,
-            expand_info: None,
-            wrapped_buffer_row: None,
-        }]
-    );
-}
-
-#[gpui::test]
-fn test_singleton(cx: &mut App) {
-    let buffer = cx.new(|cx| Buffer::local(sample_text(6, 6, 'a'), cx));
-    let multibuffer = cx.new(|cx| MultiBuffer::singleton(buffer.clone(), cx));
-
-    let snapshot = multibuffer.read(cx).snapshot(cx);
-    assert_eq!(snapshot.text(), buffer.read(cx).text());
-
-    assert_eq!(
-        snapshot
-            .row_infos(MultiBufferRow(0))
-            .map(|info| info.buffer_row)
-            .collect::<Vec<_>>(),
-        (0..buffer.read(cx).row_count())
-            .map(Some)
-            .collect::<Vec<_>>()
-    );
-    assert_consistent_line_numbers(&snapshot);
-
-    buffer.update(cx, |buffer, cx| buffer.edit([(1..3, "XXX\n")], None, cx));
-    let snapshot = multibuffer.read(cx).snapshot(cx);
-
-    assert_eq!(snapshot.text(), buffer.read(cx).text());
-    assert_eq!(
-        snapshot
-            .row_infos(MultiBufferRow(0))
-            .map(|info| info.buffer_row)
-            .collect::<Vec<_>>(),
-        (0..buffer.read(cx).row_count())
-            .map(Some)
-            .collect::<Vec<_>>()
-    );
-    assert_consistent_line_numbers(&snapshot);
-}
-
-#[gpui::test]
-fn test_remote(cx: &mut App) {
-    let host_buffer = cx.new(|cx| Buffer::local("a", cx));
-    let guest_buffer = cx.new(|cx| {
-        let state = host_buffer.read(cx).to_proto(cx);
-        let ops = cx
-            .background_executor()
-            .block(host_buffer.read(cx).serialize_ops(None, cx));
-        let mut buffer =
-            Buffer::from_proto(ReplicaId::REMOTE_SERVER, Capability::ReadWrite, state, None)
-                .unwrap();
-        buffer.apply_ops(
-            ops.into_iter()
-                .map(|op| language::proto::deserialize_operation(op).unwrap()),
-            cx,
-        );
-        buffer
-    });
-    let multibuffer = cx.new(|cx| MultiBuffer::singleton(guest_buffer.clone(), cx));
-    let snapshot = multibuffer.read(cx).snapshot(cx);
-    assert_eq!(snapshot.text(), "a");
-
-    guest_buffer.update(cx, |buffer, cx| buffer.edit([(1..1, "b")], None, cx));
-    let snapshot = multibuffer.read(cx).snapshot(cx);
-    assert_eq!(snapshot.text(), "ab");
-
-    guest_buffer.update(cx, |buffer, cx| buffer.edit([(2..2, "c")], None, cx));
-    let snapshot = multibuffer.read(cx).snapshot(cx);
-    assert_eq!(snapshot.text(), "abc");
-}
-
-#[gpui::test]
-fn test_excerpt_boundaries_and_clipping(cx: &mut App) {
-    let buffer_1 = cx.new(|cx| Buffer::local(sample_text(6, 6, 'a'), cx));
-    let buffer_2 = cx.new(|cx| Buffer::local(sample_text(6, 6, 'g'), cx));
-    let multibuffer = cx.new(|_| MultiBuffer::new(Capability::ReadWrite));
-
-    let events = Arc::new(RwLock::new(Vec::<Event>::new()));
-    multibuffer.update(cx, |_, cx| {
-        let events = events.clone();
-        cx.subscribe(&multibuffer, move |_, _, event, _| {
-            if let Event::Edited { .. } = event {
-                events.write().push(event.clone())
-            }
-        })
-        .detach();
-    });
-
-    let subscription = multibuffer.update(cx, |multibuffer, cx| {
-        let subscription = multibuffer.subscribe();
-        multibuffer.push_excerpts(
-            buffer_1.clone(),
-            [ExcerptRange::new(Point::new(1, 2)..Point::new(2, 5))],
-            cx,
-        );
-        assert_eq!(
-            subscription.consume().into_inner(),
-            [Edit {
-                old: MultiBufferOffset(0)..MultiBufferOffset(0),
-                new: MultiBufferOffset(0)..MultiBufferOffset(10)
-            }]
-        );
-
-        multibuffer.push_excerpts(
-            buffer_1.clone(),
-            [ExcerptRange::new(Point::new(3, 3)..Point::new(4, 4))],
-            cx,
-        );
-        multibuffer.push_excerpts(
-            buffer_2.clone(),
-            [ExcerptRange::new(Point::new(3, 1)..Point::new(3, 3))],
-            cx,
-        );
-        assert_eq!(
-            subscription.consume().into_inner(),
-            [Edit {
-                old: MultiBufferOffset(10)..MultiBufferOffset(10),
-                new: MultiBufferOffset(10)..MultiBufferOffset(22)
-            }]
-        );
-
-        subscription
-    });
-
-    // Adding excerpts emits an edited event.
-    assert_eq!(
-        events.read().as_slice(),
-        &[
-            Event::Edited {
-                edited_buffer: None,
-            },
-            Event::Edited {
-                edited_buffer: None,
-            },
-            Event::Edited {
-                edited_buffer: None,
-            }
-        ]
-    );
-
-    let snapshot = multibuffer.read(cx).snapshot(cx);
-    assert_eq!(
-        snapshot.text(),
-        indoc!(
-            "
-            bbbb
-            ccccc
-            ddd
-            eeee
-            jj"
-        ),
-    );
-    assert_eq!(
-        snapshot
-            .row_infos(MultiBufferRow(0))
-            .map(|info| info.buffer_row)
-            .collect::<Vec<_>>(),
-        [Some(1), Some(2), Some(3), Some(4), Some(3)]
-    );
-    assert_eq!(
-        snapshot
-            .row_infos(MultiBufferRow(2))
-            .map(|info| info.buffer_row)
-            .collect::<Vec<_>>(),
-        [Some(3), Some(4), Some(3)]
-    );
-    assert_eq!(
-        snapshot
-            .row_infos(MultiBufferRow(4))
-            .map(|info| info.buffer_row)
-            .collect::<Vec<_>>(),
-        [Some(3)]
-    );
-    assert!(
-        snapshot
-            .row_infos(MultiBufferRow(5))
-            .map(|info| info.buffer_row)
-            .collect::<Vec<_>>()
-            .is_empty()
-    );
-
-    assert_eq!(
-        boundaries_in_range(Point::new(0, 0)..Point::new(4, 2), &snapshot),
-        &[
-            (MultiBufferRow(0), "bbbb\nccccc".to_string(), true),
-            (MultiBufferRow(2), "ddd\neeee".to_string(), false),
-            (MultiBufferRow(4), "jj".to_string(), true),
-        ]
-    );
-    assert_eq!(
-        boundaries_in_range(Point::new(0, 0)..Point::new(2, 0), &snapshot),
-        &[(MultiBufferRow(0), "bbbb\nccccc".to_string(), true)]
-    );
-    assert_eq!(
-        boundaries_in_range(Point::new(1, 0)..Point::new(1, 5), &snapshot),
-        &[]
-    );
-    assert_eq!(
-        boundaries_in_range(Point::new(1, 0)..Point::new(2, 0), &snapshot),
-        &[]
-    );
-    assert_eq!(
-        boundaries_in_range(Point::new(1, 0)..Point::new(4, 0), &snapshot),
-        &[(MultiBufferRow(2), "ddd\neeee".to_string(), false)]
-    );
-    assert_eq!(
-        boundaries_in_range(Point::new(1, 0)..Point::new(4, 0), &snapshot),
-        &[(MultiBufferRow(2), "ddd\neeee".to_string(), false)]
-    );
-    assert_eq!(
-        boundaries_in_range(Point::new(2, 0)..Point::new(3, 0), &snapshot),
-        &[(MultiBufferRow(2), "ddd\neeee".to_string(), false)]
-    );
-    assert_eq!(
-        boundaries_in_range(Point::new(4, 0)..Point::new(4, 2), &snapshot),
-        &[(MultiBufferRow(4), "jj".to_string(), true)]
-    );
-    assert_eq!(
-        boundaries_in_range(Point::new(4, 2)..Point::new(4, 2), &snapshot),
-        &[]
-    );
-
-    buffer_1.update(cx, |buffer, cx| {
-        let text = "\n";
-        buffer.edit(
-            [
-                (Point::new(0, 0)..Point::new(0, 0), text),
-                (Point::new(2, 1)..Point::new(2, 3), text),
-            ],
-            None,
-            cx,
-        );
-    });
-
-    let snapshot = multibuffer.read(cx).snapshot(cx);
-    assert_eq!(
-        snapshot.text(),
-        concat!(
-            "bbbb\n", // Preserve newlines
-            "c\n",    //
-            "cc\n",   //
-            "ddd\n",  //
-            "eeee\n", //
-            "jj"      //
-        )
-    );
-
-    assert_eq!(
-        subscription.consume().into_inner(),
-        [Edit {
-            old: MultiBufferOffset(6)..MultiBufferOffset(8),
-            new: MultiBufferOffset(6)..MultiBufferOffset(7)
-        }]
-    );
-
-    let snapshot = multibuffer.read(cx).snapshot(cx);
-    assert_eq!(
-        snapshot.clip_point(Point::new(0, 5), Bias::Left),
-        Point::new(0, 4)
-    );
-    assert_eq!(
-        snapshot.clip_point(Point::new(0, 5), Bias::Right),
-        Point::new(0, 4)
-    );
-    assert_eq!(
-        snapshot.clip_point(Point::new(5, 1), Bias::Right),
-        Point::new(5, 1)
-    );
-    assert_eq!(
-        snapshot.clip_point(Point::new(5, 2), Bias::Right),
-        Point::new(5, 2)
-    );
-    assert_eq!(
-        snapshot.clip_point(Point::new(5, 3), Bias::Right),
-        Point::new(5, 2)
-    );
-
-    let snapshot = multibuffer.update(cx, |multibuffer, cx| {
-        let (buffer_2_excerpt_id, _) =
-            multibuffer.excerpts_for_buffer(buffer_2.read(cx).remote_id(), cx)[0].clone();
-        multibuffer.remove_excerpts([buffer_2_excerpt_id], cx);
-        multibuffer.snapshot(cx)
-    });
-
-    assert_eq!(
-        snapshot.text(),
-        concat!(
-            "bbbb\n", // Preserve newlines
-            "c\n",    //
-            "cc\n",   //
-            "ddd\n",  //
-            "eeee",   //
-        )
-    );
-
-    fn boundaries_in_range(
-        range: Range<Point>,
-        snapshot: &MultiBufferSnapshot,
-    ) -> Vec<(MultiBufferRow, String, bool)> {
-        snapshot
-            .excerpt_boundaries_in_range(range)
-            .map(|boundary| {
-                let starts_new_buffer = boundary.starts_new_buffer();
-                (
-                    boundary.row,
-                    boundary
-                        .next
-                        .buffer
-                        .text_for_range(boundary.next.range.context)
-                        .collect::<String>(),
-                    starts_new_buffer,
-                )
-            })
-            .collect::<Vec<_>>()
-    }
-}
-
-#[gpui::test]
-async fn test_diff_boundary_anchors(cx: &mut TestAppContext) {
-    let base_text = "one\ntwo\nthree\n";
-    let text = "one\nthree\n";
-    let buffer = cx.new(|cx| Buffer::local(text, cx));
-    let diff = cx.new(|cx| BufferDiff::new_with_base_text(base_text, &buffer, cx));
-    let multibuffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-    multibuffer.update(cx, |multibuffer, cx| multibuffer.add_diff(diff, cx));
-
-    let (before, after) = multibuffer.update(cx, |multibuffer, cx| {
-        let before = multibuffer.snapshot(cx).anchor_before(Point::new(1, 0));
-        let after = multibuffer.snapshot(cx).anchor_after(Point::new(1, 0));
-        multibuffer.set_all_diff_hunks_expanded(cx);
-        (before, after)
-    });
-    cx.run_until_parked();
-
-    let snapshot = multibuffer.read_with(cx, |multibuffer, cx| multibuffer.snapshot(cx));
-    let actual_text = snapshot.text();
-    let actual_row_infos = snapshot.row_infos(MultiBufferRow(0)).collect::<Vec<_>>();
-    let actual_diff = format_diff(&actual_text, &actual_row_infos, &Default::default(), None);
-    pretty_assertions::assert_eq!(
-        actual_diff,
-        indoc! {
-            "  one
-             - two
-               three
-             "
-        },
-    );
-
-    multibuffer.update(cx, |multibuffer, cx| {
-        let snapshot = multibuffer.snapshot(cx);
-        assert_eq!(before.to_point(&snapshot), Point::new(1, 0));
-        assert_eq!(after.to_point(&snapshot), Point::new(2, 0));
-        assert_eq!(
-            vec![Point::new(1, 0), Point::new(2, 0),],
-            snapshot.summaries_for_anchors::<Point, _>(&[before, after]),
-        )
-    })
-}
-
-#[gpui::test]
-async fn test_diff_hunks_in_range(cx: &mut TestAppContext) {
-    let base_text = "one\ntwo\nthree\nfour\nfive\nsix\nseven\neight\n";
-    let text = "one\nfour\nseven\n";
-    let buffer = cx.new(|cx| Buffer::local(text, cx));
-    let diff = cx.new(|cx| BufferDiff::new_with_base_text(base_text, &buffer, cx));
-    let multibuffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-    let (mut snapshot, mut subscription) = multibuffer.update(cx, |multibuffer, cx| {
-        (multibuffer.snapshot(cx), multibuffer.subscribe())
-    });
-
-    multibuffer.update(cx, |multibuffer, cx| {
-        multibuffer.add_diff(diff, cx);
-        multibuffer.expand_diff_hunks(vec![Anchor::min()..Anchor::max()], cx);
-    });
-
-    assert_new_snapshot(
-        &multibuffer,
-        &mut snapshot,
-        &mut subscription,
-        cx,
-        indoc! {
-            "  one
-             - two
-             - three
-               four
-             - five
-             - six
-               seven
-             - eight
-            "
-        },
-    );
-
-    assert_eq!(
-        snapshot
-            .diff_hunks_in_range(Point::new(1, 0)..Point::MAX)
-            .map(|hunk| hunk.row_range.start.0..hunk.row_range.end.0)
-            .collect::<Vec<_>>(),
-        vec![1..3, 4..6, 7..8]
-    );
-
-    assert_eq!(snapshot.diff_hunk_before(Point::new(1, 1)), None,);
-    assert_eq!(
-        snapshot.diff_hunk_before(Point::new(7, 0)),
-        Some(MultiBufferRow(4))
-    );
-    assert_eq!(
-        snapshot.diff_hunk_before(Point::new(4, 0)),
-        Some(MultiBufferRow(1))
-    );
-
-    multibuffer.update(cx, |multibuffer, cx| {
-        multibuffer.collapse_diff_hunks(vec![Anchor::min()..Anchor::max()], cx);
-    });
-
-    assert_new_snapshot(
-        &multibuffer,
-        &mut snapshot,
-        &mut subscription,
-        cx,
-        indoc! {
-            "
-            one
-            four
-            seven
-            "
-        },
-    );
-
-    assert_eq!(
-        snapshot.diff_hunk_before(Point::new(2, 0)),
-        Some(MultiBufferRow(1)),
-    );
-    assert_eq!(
-        snapshot.diff_hunk_before(Point::new(4, 0)),
-        Some(MultiBufferRow(2))
-    );
-}
-
-#[gpui::test]
-async fn test_editing_text_in_diff_hunks(cx: &mut TestAppContext) {
-    let base_text = "one\ntwo\nfour\nfive\nsix\nseven\n";
-    let text = "one\ntwo\nTHREE\nfour\nfive\nseven\n";
-    let buffer = cx.new(|cx| Buffer::local(text, cx));
-    let diff = cx.new(|cx| BufferDiff::new_with_base_text(base_text, &buffer, cx));
-    let multibuffer = cx.new(|cx| MultiBuffer::singleton(buffer.clone(), cx));
-
-    let (mut snapshot, mut subscription) = multibuffer.update(cx, |multibuffer, cx| {
-        multibuffer.add_diff(diff.clone(), cx);
-        (multibuffer.snapshot(cx), multibuffer.subscribe())
-    });
-
-    cx.executor().run_until_parked();
-    multibuffer.update(cx, |multibuffer, cx| {
-        multibuffer.set_all_diff_hunks_expanded(cx);
-    });
-
-    assert_new_snapshot(
-        &multibuffer,
-        &mut snapshot,
-        &mut subscription,
-        cx,
-        indoc! {
-            "
-              one
-              two
-            + THREE
-              four
-              five
-            - six
-              seven
-            "
-        },
-    );
-
-    // Insert a newline within an insertion hunk
-    multibuffer.update(cx, |multibuffer, cx| {
-        multibuffer.edit([(Point::new(2, 0)..Point::new(2, 0), "__\n__")], None, cx);
-    });
-    assert_new_snapshot(
-        &multibuffer,
-        &mut snapshot,
-        &mut subscription,
-        cx,
-        indoc! {
-            "
-              one
-              two
-            + __
-            + __THREE
-              four
-              five
-            - six
-              seven
-            "
-        },
-    );
-
-    // Delete the newline before a deleted hunk.
-    multibuffer.update(cx, |multibuffer, cx| {
-        multibuffer.edit([(Point::new(5, 4)..Point::new(6, 0), "")], None, cx);
-    });
-    assert_new_snapshot(
-        &multibuffer,
-        &mut snapshot,
-        &mut subscription,
-        cx,
-        indoc! {
-            "
-              one
-              two
-            + __
-            + __THREE
-              four
-              fiveseven
-            "
-        },
-    );
-
-    multibuffer.update(cx, |multibuffer, cx| multibuffer.undo(cx));
-    assert_new_snapshot(
-        &multibuffer,
-        &mut snapshot,
-        &mut subscription,
-        cx,
-        indoc! {
-            "
-              one
-              two
-            + __
-            + __THREE
-              four
-              five
-            - six
-              seven
-            "
-        },
-    );
-
-    // Cannot (yet) insert at the beginning of a deleted hunk.
-    // (because it would put the newline in the wrong place)
-    multibuffer.update(cx, |multibuffer, cx| {
-        multibuffer.edit([(Point::new(6, 0)..Point::new(6, 0), "\n")], None, cx);
-    });
-    assert_new_snapshot(
-        &multibuffer,
-        &mut snapshot,
-        &mut subscription,
-        cx,
-        indoc! {
-            "
-              one
-              two
-            + __
-            + __THREE
-              four
-              five
-            - six
-              seven
-            "
-        },
-    );
-
-    // Replace a range that ends in a deleted hunk.
-    multibuffer.update(cx, |multibuffer, cx| {
-        multibuffer.edit([(Point::new(5, 2)..Point::new(6, 2), "fty-")], None, cx);
-    });
-    assert_new_snapshot(
-        &multibuffer,
-        &mut snapshot,
-        &mut subscription,
-        cx,
-        indoc! {
-            "
-              one
-              two
-            + __
-            + __THREE
-              four
-              fifty-seven
-            "
-        },
-    );
-}
-
-#[gpui::test]
-fn test_excerpt_events(cx: &mut App) {
-    let buffer_1 = cx.new(|cx| Buffer::local(sample_text(10, 3, 'a'), cx));
-    let buffer_2 = cx.new(|cx| Buffer::local(sample_text(10, 3, 'm'), cx));
-
-    let leader_multibuffer = cx.new(|_| MultiBuffer::new(Capability::ReadWrite));
-    let follower_multibuffer = cx.new(|_| MultiBuffer::new(Capability::ReadWrite));
-    let follower_edit_event_count = Arc::new(RwLock::new(0));
-
-    follower_multibuffer.update(cx, |_, cx| {
-        let follower_edit_event_count = follower_edit_event_count.clone();
-        cx.subscribe(
-            &leader_multibuffer,
-            move |follower, _, event, cx| match event.clone() {
-                Event::ExcerptsAdded {
-                    buffer,
-                    predecessor,
-                    excerpts,
-                } => follower.insert_excerpts_with_ids_after(predecessor, buffer, excerpts, cx),
-                Event::ExcerptsRemoved { ids, .. } => follower.remove_excerpts(ids, cx),
-                Event::Edited { .. } => {
-                    *follower_edit_event_count.write() += 1;
-                }
-                _ => {}
-            },
-        )
-        .detach();
-    });
-
-    leader_multibuffer.update(cx, |leader, cx| {
-        leader.push_excerpts(
-            buffer_1.clone(),
-            [ExcerptRange::new(0..8), ExcerptRange::new(12..16)],
-            cx,
-        );
-        leader.insert_excerpts_after(
-            leader.excerpt_ids()[0],
-            buffer_2.clone(),
-            [ExcerptRange::new(0..5), ExcerptRange::new(10..15)],
-            cx,
-        )
-    });
-    assert_eq!(
-        leader_multibuffer.read(cx).snapshot(cx).text(),
-        follower_multibuffer.read(cx).snapshot(cx).text(),
-    );
-    assert_eq!(*follower_edit_event_count.read(), 2);
-
-    leader_multibuffer.update(cx, |leader, cx| {
-        let excerpt_ids = leader.excerpt_ids();
-        leader.remove_excerpts([excerpt_ids[1], excerpt_ids[3]], cx);
-    });
-    assert_eq!(
-        leader_multibuffer.read(cx).snapshot(cx).text(),
-        follower_multibuffer.read(cx).snapshot(cx).text(),
-    );
-    assert_eq!(*follower_edit_event_count.read(), 3);
-
-    // Removing an empty set of excerpts is a noop.
-    leader_multibuffer.update(cx, |leader, cx| {
-        leader.remove_excerpts([], cx);
-    });
-    assert_eq!(
-        leader_multibuffer.read(cx).snapshot(cx).text(),
-        follower_multibuffer.read(cx).snapshot(cx).text(),
-    );
-    assert_eq!(*follower_edit_event_count.read(), 3);
-
-    // Adding an empty set of excerpts is a noop.
-    leader_multibuffer.update(cx, |leader, cx| {
-        leader.push_excerpts::<usize>(buffer_2.clone(), [], cx);
-    });
-    assert_eq!(
-        leader_multibuffer.read(cx).snapshot(cx).text(),
-        follower_multibuffer.read(cx).snapshot(cx).text(),
-    );
-    assert_eq!(*follower_edit_event_count.read(), 3);
-
-    leader_multibuffer.update(cx, |leader, cx| {
-        leader.clear(cx);
-    });
-    assert_eq!(
-        leader_multibuffer.read(cx).snapshot(cx).text(),
-        follower_multibuffer.read(cx).snapshot(cx).text(),
-    );
-    assert_eq!(*follower_edit_event_count.read(), 4);
-}
-
-#[gpui::test]
-fn test_expand_excerpts(cx: &mut App) {
-    let buffer = cx.new(|cx| Buffer::local(sample_text(20, 3, 'a'), cx));
-    let multibuffer = cx.new(|_| MultiBuffer::new(Capability::ReadWrite));
-
-    multibuffer.update(cx, |multibuffer, cx| {
-        multibuffer.set_excerpts_for_path(
-            PathKey::for_buffer(&buffer, cx),
-            buffer,
-            vec![
-                // Note that in this test, this first excerpt
-                // does not contain a new line
-                Point::new(3, 2)..Point::new(3, 3),
-                Point::new(7, 1)..Point::new(7, 3),
-                Point::new(15, 0)..Point::new(15, 0),
-            ],
-            1,
-            cx,
-        )
-    });
-
-    let snapshot = multibuffer.read(cx).snapshot(cx);
-
-    assert_eq!(
-        snapshot.text(),
-        concat!(
-            "ccc\n", //
-            "ddd\n", //
-            "eee",   //
-            "\n",    // End of excerpt
-            "ggg\n", //
-            "hhh\n", //
-            "iii",   //
-            "\n",    // End of excerpt
-            "ooo\n", //
-            "ppp\n", //
-            "qqq",   // End of excerpt
-        )
-    );
-    drop(snapshot);
-
-    multibuffer.update(cx, |multibuffer, cx| {
-        let line_zero = multibuffer.snapshot(cx).anchor_before(Point::new(0, 0));
-        multibuffer.expand_excerpts(
-            multibuffer.excerpt_ids(),
-            1,
-            ExpandExcerptDirection::UpAndDown,
-            cx,
-        );
-        let snapshot = multibuffer.snapshot(cx);
-        let line_two = snapshot.anchor_before(Point::new(2, 0));
-        assert_eq!(line_two.cmp(&line_zero, &snapshot), cmp::Ordering::Greater);
-    });
-
-    let snapshot = multibuffer.read(cx).snapshot(cx);
-
-    assert_eq!(
-        snapshot.text(),
-        concat!(
-            "bbb\n", //
-            "ccc\n", //
-            "ddd\n", //
-            "eee\n", //
-            "fff\n", //
-            "ggg\n", //
-            "hhh\n", //
-            "iii\n", //
-            "jjj\n", // End of excerpt
-            "nnn\n", //
-            "ooo\n", //
-            "ppp\n", //
-            "qqq\n", //
-            "rrr",   // End of excerpt
-        )
-    );
-}
-
-#[gpui::test(iterations = 100)]
-async fn test_set_anchored_excerpts_for_path(cx: &mut TestAppContext) {
-    let buffer_1 = cx.new(|cx| Buffer::local(sample_text(20, 3, 'a'), cx));
-    let buffer_2 = cx.new(|cx| Buffer::local(sample_text(15, 4, 'a'), cx));
-    let snapshot_1 = buffer_1.update(cx, |buffer, _| buffer.snapshot());
-    let snapshot_2 = buffer_2.update(cx, |buffer, _| buffer.snapshot());
-    let ranges_1 = vec![
-        snapshot_1.anchor_before(Point::new(3, 2))..snapshot_1.anchor_before(Point::new(4, 2)),
-        snapshot_1.anchor_before(Point::new(7, 1))..snapshot_1.anchor_before(Point::new(7, 3)),
-        snapshot_1.anchor_before(Point::new(15, 0))..snapshot_1.anchor_before(Point::new(15, 0)),
-    ];
-    let ranges_2 = vec![
-        snapshot_2.anchor_before(Point::new(2, 1))..snapshot_2.anchor_before(Point::new(3, 1)),
-        snapshot_2.anchor_before(Point::new(10, 0))..snapshot_2.anchor_before(Point::new(10, 2)),
-    ];
-
-    let multibuffer = cx.new(|_| MultiBuffer::new(Capability::ReadWrite));
-    let anchor_ranges_1 = multibuffer
-        .update(cx, |multibuffer, cx| {
-            multibuffer.set_anchored_excerpts_for_path(
-                PathKey::for_buffer(&buffer_1, cx),
-                buffer_1.clone(),
-                ranges_1,
-                2,
-                cx,
-            )
-        })
-        .await;
-    let snapshot_1 = multibuffer.update(cx, |multibuffer, cx| multibuffer.snapshot(cx));
-    assert_eq!(
-        anchor_ranges_1
-            .iter()
-            .map(|range| range.to_point(&snapshot_1))
-            .collect::<Vec<_>>(),
-        vec![
-            Point::new(2, 2)..Point::new(3, 2),
-            Point::new(6, 1)..Point::new(6, 3),
-            Point::new(11, 0)..Point::new(11, 0),
-        ]
-    );
-    let anchor_ranges_2 = multibuffer
-        .update(cx, |multibuffer, cx| {
-            multibuffer.set_anchored_excerpts_for_path(
-                PathKey::for_buffer(&buffer_2, cx),
-                buffer_2.clone(),
-                ranges_2,
-                2,
-                cx,
-            )
-        })
-        .await;
-    let snapshot_2 = multibuffer.update(cx, |multibuffer, cx| multibuffer.snapshot(cx));
-    assert_eq!(
-        anchor_ranges_2
-            .iter()
-            .map(|range| range.to_point(&snapshot_2))
-            .collect::<Vec<_>>(),
-        vec![
-            Point::new(16, 1)..Point::new(17, 1),
-            Point::new(22, 0)..Point::new(22, 2)
-        ]
-    );
-
-    let snapshot = multibuffer.update(cx, |multibuffer, cx| multibuffer.snapshot(cx));
-    assert_eq!(
-        snapshot.text(),
-        concat!(
-            "bbb\n", // buffer_1
-            "ccc\n", //
-            "ddd\n", // <-- excerpt 1
-            "eee\n", // <-- excerpt 1
-            "fff\n", //
-            "ggg\n", //
-            "hhh\n", // <-- excerpt 2
-            "iii\n", //
-            "jjj\n", //
-            //
-            "nnn\n", //
-            "ooo\n", //
-            "ppp\n", // <-- excerpt 3
-            "qqq\n", //
-            "rrr\n", //
-            //
-            "aaaa\n", // buffer 2
-            "bbbb\n", //
-            "cccc\n", // <-- excerpt 4
-            "dddd\n", // <-- excerpt 4
-            "eeee\n", //
-            "ffff\n", //
-            //
-            "iiii\n", //
-            "jjjj\n", //
-            "kkkk\n", // <-- excerpt 5
-            "llll\n", //
-            "mmmm",   //
-        )
-    );
-}
-
-#[gpui::test]
-fn test_empty_multibuffer(cx: &mut App) {
-    let multibuffer = cx.new(|_| MultiBuffer::new(Capability::ReadWrite));
-
-    let snapshot = multibuffer.read(cx).snapshot(cx);
-    assert_eq!(snapshot.text(), "");
-    assert_eq!(
-        snapshot
-            .row_infos(MultiBufferRow(0))
-            .map(|info| info.buffer_row)
-            .collect::<Vec<_>>(),
-        &[Some(0)]
-    );
-    assert!(
-        snapshot
-            .row_infos(MultiBufferRow(1))
-            .map(|info| info.buffer_row)
-            .collect::<Vec<_>>()
-            .is_empty(),
-    );
-}
-
-#[gpui::test]
-async fn test_empty_diff_excerpt(cx: &mut TestAppContext) {
-    let multibuffer = cx.new(|_| MultiBuffer::new(Capability::ReadWrite));
-    let buffer = cx.new(|cx| Buffer::local("", cx));
-    let base_text = "a\nb\nc";
-
-    let diff = cx.new(|cx| BufferDiff::new_with_base_text(base_text, &buffer, cx));
-    multibuffer.update(cx, |multibuffer, cx| {
-        multibuffer.push_excerpts(buffer.clone(), [ExcerptRange::new(0..0)], cx);
-        multibuffer.set_all_diff_hunks_expanded(cx);
-        multibuffer.add_diff(diff.clone(), cx);
-    });
-    cx.run_until_parked();
-
-    let snapshot = multibuffer.update(cx, |multibuffer, cx| multibuffer.snapshot(cx));
-    assert_eq!(snapshot.text(), "a\nb\nc\n");
-
-    let hunk = snapshot
-        .diff_hunks_in_range(Point::new(1, 1)..Point::new(1, 1))
-        .next()
-        .unwrap();
-
-    assert_eq!(hunk.diff_base_byte_range.start, BufferOffset(0));
-
-    let buf2 = cx.new(|cx| Buffer::local("X", cx));
-    multibuffer.update(cx, |multibuffer, cx| {
-        multibuffer.push_excerpts(buf2, [ExcerptRange::new(0..1)], cx);
-    });
-
-    buffer.update(cx, |buffer, cx| {
-        buffer.edit([(0..0, "a\nb\nc")], None, cx);
-        diff.update(cx, |diff, cx| {
-            diff.recalculate_diff_sync(buffer.snapshot().text, cx);
-        });
-        assert_eq!(buffer.text(), "a\nb\nc")
-    });
-    cx.run_until_parked();
-
-    let snapshot = multibuffer.update(cx, |multibuffer, cx| multibuffer.snapshot(cx));
-    assert_eq!(snapshot.text(), "a\nb\nc\nX");
-
-    buffer.update(cx, |buffer, cx| {
-        buffer.undo(cx);
-        diff.update(cx, |diff, cx| {
-            diff.recalculate_diff_sync(buffer.snapshot().text, cx);
-        });
-        assert_eq!(buffer.text(), "")
-    });
-    cx.run_until_parked();
-
-    let snapshot = multibuffer.update(cx, |multibuffer, cx| multibuffer.snapshot(cx));
-    assert_eq!(snapshot.text(), "a\nb\nc\n\nX");
-}
-
-#[gpui::test]
-fn test_singleton_multibuffer_anchors(cx: &mut App) {
-    let buffer = cx.new(|cx| Buffer::local("abcd", cx));
-    let multibuffer = cx.new(|cx| MultiBuffer::singleton(buffer.clone(), cx));
-    let old_snapshot = multibuffer.read(cx).snapshot(cx);
-    buffer.update(cx, |buffer, cx| {
-        buffer.edit([(0..0, "X")], None, cx);
-        buffer.edit([(5..5, "Y")], None, cx);
-    });
-    let new_snapshot = multibuffer.read(cx).snapshot(cx);
-
-    assert_eq!(old_snapshot.text(), "abcd");
-    assert_eq!(new_snapshot.text(), "XabcdY");
-
-    assert_eq!(
-        old_snapshot
-            .anchor_before(MultiBufferOffset(0))
-            .to_offset(&new_snapshot),
-        MultiBufferOffset(0)
-    );
-    assert_eq!(
-        old_snapshot
-            .anchor_after(MultiBufferOffset(0))
-            .to_offset(&new_snapshot),
-        MultiBufferOffset(1)
-    );
-    assert_eq!(
-        old_snapshot
-            .anchor_before(MultiBufferOffset(4))
-            .to_offset(&new_snapshot),
-        MultiBufferOffset(5)
-    );
-    assert_eq!(
-        old_snapshot
-            .anchor_after(MultiBufferOffset(4))
-            .to_offset(&new_snapshot),
-        MultiBufferOffset(6)
-    );
-}
-
-#[gpui::test]
-fn test_multibuffer_anchors(cx: &mut App) {
-    let buffer_1 = cx.new(|cx| Buffer::local("abcd", cx));
-    let buffer_2 = cx.new(|cx| Buffer::local("efghi", cx));
-    let multibuffer = cx.new(|cx| {
-        let mut multibuffer = MultiBuffer::new(Capability::ReadWrite);
-        multibuffer.push_excerpts(buffer_1.clone(), [ExcerptRange::new(0..4)], cx);
-        multibuffer.push_excerpts(buffer_2.clone(), [ExcerptRange::new(0..5)], cx);
-        multibuffer
-    });
-    let old_snapshot = multibuffer.read(cx).snapshot(cx);
-
-    assert_eq!(
-        old_snapshot
-            .anchor_before(MultiBufferOffset(0))
-            .to_offset(&old_snapshot),
-        MultiBufferOffset(0)
-    );
-    assert_eq!(
-        old_snapshot
-            .anchor_after(MultiBufferOffset(0))
-            .to_offset(&old_snapshot),
-        MultiBufferOffset(0)
-    );
-    assert_eq!(Anchor::min().to_offset(&old_snapshot), MultiBufferOffset(0));
-    assert_eq!(Anchor::min().to_offset(&old_snapshot), MultiBufferOffset(0));
-    assert_eq!(
-        Anchor::max().to_offset(&old_snapshot),
-        MultiBufferOffset(10)
-    );
-    assert_eq!(
-        Anchor::max().to_offset(&old_snapshot),
-        MultiBufferOffset(10)
-    );
-
-    buffer_1.update(cx, |buffer, cx| {
-        buffer.edit([(0..0, "W")], None, cx);
-        buffer.edit([(5..5, "X")], None, cx);
-    });
-    buffer_2.update(cx, |buffer, cx| {
-        buffer.edit([(0..0, "Y")], None, cx);
-        buffer.edit([(6..6, "Z")], None, cx);
-    });
-    let new_snapshot = multibuffer.read(cx).snapshot(cx);
-
-    assert_eq!(old_snapshot.text(), "abcd\nefghi");
-    assert_eq!(new_snapshot.text(), "WabcdX\nYefghiZ");
-
-    assert_eq!(
-        old_snapshot
-            .anchor_before(MultiBufferOffset(0))
-            .to_offset(&new_snapshot),
-        MultiBufferOffset(0)
-    );
-    assert_eq!(
-        old_snapshot
-            .anchor_after(MultiBufferOffset(0))
-            .to_offset(&new_snapshot),
-        MultiBufferOffset(1)
-    );
-    assert_eq!(
-        old_snapshot
-            .anchor_before(MultiBufferOffset(1))
-            .to_offset(&new_snapshot),
-        MultiBufferOffset(2)
-    );
-    assert_eq!(
-        old_snapshot
-            .anchor_after(MultiBufferOffset(1))
-            .to_offset(&new_snapshot),
-        MultiBufferOffset(2)
-    );
-    assert_eq!(
-        old_snapshot
-            .anchor_before(MultiBufferOffset(2))
-            .to_offset(&new_snapshot),
-        MultiBufferOffset(3)
-    );
-    assert_eq!(
-        old_snapshot
-            .anchor_after(MultiBufferOffset(2))
-            .to_offset(&new_snapshot),
-        MultiBufferOffset(3)
-    );
-    assert_eq!(
-        old_snapshot
-            .anchor_before(MultiBufferOffset(5))
-            .to_offset(&new_snapshot),
-        MultiBufferOffset(7)
-    );
-    assert_eq!(
-        old_snapshot
-            .anchor_after(MultiBufferOffset(5))
-            .to_offset(&new_snapshot),
-        MultiBufferOffset(8)
-    );
-    assert_eq!(
-        old_snapshot
-            .anchor_before(MultiBufferOffset(10))
-            .to_offset(&new_snapshot),
-        MultiBufferOffset(13)
-    );
-    assert_eq!(
-        old_snapshot
-            .anchor_after(MultiBufferOffset(10))
-            .to_offset(&new_snapshot),
-        MultiBufferOffset(14)
-    );
-}
-
-#[gpui::test]
-fn test_resolving_anchors_after_replacing_their_excerpts(cx: &mut App) {
-    let buffer_1 = cx.new(|cx| Buffer::local("abcd", cx));
-    let buffer_2 = cx.new(|cx| Buffer::local("ABCDEFGHIJKLMNOP", cx));
-    let multibuffer = cx.new(|_| MultiBuffer::new(Capability::ReadWrite));
-
-    // Create an insertion id in buffer 1 that doesn't exist in buffer 2.
-    // Add an excerpt from buffer 1 that spans this new insertion.
-    buffer_1.update(cx, |buffer, cx| buffer.edit([(4..4, "123")], None, cx));
-    let excerpt_id_1 = multibuffer.update(cx, |multibuffer, cx| {
-        multibuffer
-            .push_excerpts(buffer_1.clone(), [ExcerptRange::new(0..7)], cx)
-            .pop()
-            .unwrap()
-    });
-
-    let snapshot_1 = multibuffer.read(cx).snapshot(cx);
-    assert_eq!(snapshot_1.text(), "abcd123");
-
-    // Replace the buffer 1 excerpt with new excerpts from buffer 2.
-    let (excerpt_id_2, excerpt_id_3) = multibuffer.update(cx, |multibuffer, cx| {
-        multibuffer.remove_excerpts([excerpt_id_1], cx);
-        let mut ids = multibuffer
-            .push_excerpts(
-                buffer_2.clone(),
-                [
-                    ExcerptRange::new(0..4),
-                    ExcerptRange::new(6..10),
-                    ExcerptRange::new(12..16),
-                ],
-                cx,
-            )
-            .into_iter();
-        (ids.next().unwrap(), ids.next().unwrap())
-    });
-    let snapshot_2 = multibuffer.read(cx).snapshot(cx);
-    assert_eq!(snapshot_2.text(), "ABCD\nGHIJ\nMNOP");
-
-    // The old excerpt id doesn't get reused.
-    assert_ne!(excerpt_id_2, excerpt_id_1);
-
-    // Resolve some anchors from the previous snapshot in the new snapshot.
-    // The current excerpts are from a different buffer, so we don't attempt to
-    // resolve the old text anchor in the new buffer.
-    assert_eq!(
-        snapshot_2.summary_for_anchor::<MultiBufferOffset>(
-            &snapshot_1.anchor_before(MultiBufferOffset(2))
-        ),
-        MultiBufferOffset(0)
-    );
-    assert_eq!(
-        snapshot_2.summaries_for_anchors::<MultiBufferOffset, _>(&[
-            snapshot_1.anchor_before(MultiBufferOffset(2)),
-            snapshot_1.anchor_after(MultiBufferOffset(3))
-        ]),
-        vec![MultiBufferOffset(0), MultiBufferOffset(0)]
-    );
-
-    // Refresh anchors from the old snapshot. The return value indicates that both
-    // anchors lost their original excerpt.
-    let refresh = snapshot_2.refresh_anchors(&[
-        snapshot_1.anchor_before(MultiBufferOffset(2)),
-        snapshot_1.anchor_after(MultiBufferOffset(3)),
-    ]);
-    assert_eq!(
-        refresh,
-        &[
-            (0, snapshot_2.anchor_before(MultiBufferOffset(0)), false),
-            (1, snapshot_2.anchor_after(MultiBufferOffset(0)), false),
-        ]
-    );
-
-    // Replace the middle excerpt with a smaller excerpt in buffer 2,
-    // that intersects the old excerpt.
-    let excerpt_id_5 = multibuffer.update(cx, |multibuffer, cx| {
-        multibuffer.remove_excerpts([excerpt_id_3], cx);
-        multibuffer
-            .insert_excerpts_after(
-                excerpt_id_2,
-                buffer_2.clone(),
-                [ExcerptRange::new(5..8)],
-                cx,
-            )
-            .pop()
-            .unwrap()
-    });
-
-    let snapshot_3 = multibuffer.read(cx).snapshot(cx);
-    assert_eq!(snapshot_3.text(), "ABCD\nFGH\nMNOP");
-    assert_ne!(excerpt_id_5, excerpt_id_3);
-
-    // Resolve some anchors from the previous snapshot in the new snapshot.
-    // The third anchor can't be resolved, since its excerpt has been removed,
-    // so it resolves to the same position as its predecessor.
-    let anchors = [
-        snapshot_2.anchor_before(MultiBufferOffset(0)),
-        snapshot_2.anchor_after(MultiBufferOffset(2)),
-        snapshot_2.anchor_after(MultiBufferOffset(6)),
-        snapshot_2.anchor_after(MultiBufferOffset(14)),
-    ];
-    assert_eq!(
-        snapshot_3.summaries_for_anchors::<MultiBufferOffset, _>(&anchors),
-        &[
-            MultiBufferOffset(0),
-            MultiBufferOffset(2),
-            MultiBufferOffset(9),
-            MultiBufferOffset(13)
-        ]
-    );
-
-    let new_anchors = snapshot_3.refresh_anchors(&anchors);
-    assert_eq!(
-        new_anchors.iter().map(|a| (a.0, a.2)).collect::<Vec<_>>(),
-        &[(0, true), (1, true), (2, true), (3, true)]
-    );
-    assert_eq!(
-        snapshot_3.summaries_for_anchors::<MultiBufferOffset, _>(new_anchors.iter().map(|a| &a.1)),
-        &[
-            MultiBufferOffset(0),
-            MultiBufferOffset(2),
-            MultiBufferOffset(7),
-            MultiBufferOffset(13)
-        ]
-    );
-}
-
-#[gpui::test]
-async fn test_basic_diff_hunks(cx: &mut TestAppContext) {
-    let text = indoc!(
-        "
-        ZERO
-        one
-        TWO
-        three
-        six
-        "
-    );
-    let base_text = indoc!(
-        "
-        one
-        two
-        three
-        four
-        five
-        six
-        "
-    );
-
-    let buffer = cx.new(|cx| Buffer::local(text, cx));
-    let diff = cx.new(|cx| BufferDiff::new_with_base_text(base_text, &buffer, cx));
-    cx.run_until_parked();
-
-    let multibuffer = cx.new(|cx| {
-        let mut multibuffer = MultiBuffer::singleton(buffer.clone(), cx);
-        multibuffer.add_diff(diff.clone(), cx);
-        multibuffer
-    });
-
-    let (mut snapshot, mut subscription) = multibuffer.update(cx, |multibuffer, cx| {
-        (multibuffer.snapshot(cx), multibuffer.subscribe())
-    });
-    assert_eq!(
-        snapshot.text(),
-        indoc!(
-            "
-            ZERO
-            one
-            TWO
-            three
-            six
-            "
-        ),
-    );
-
-    multibuffer.update(cx, |multibuffer, cx| {
-        multibuffer.expand_diff_hunks(vec![Anchor::min()..Anchor::max()], cx);
-    });
-
-    assert_new_snapshot(
-        &multibuffer,
-        &mut snapshot,
-        &mut subscription,
-        cx,
-        indoc!(
-            "
-            + ZERO
-              one
-            - two
-            + TWO
-              three
-            - four
-            - five
-              six
-            "
-        ),
-    );
-
-    assert_eq!(
-        snapshot
-            .row_infos(MultiBufferRow(0))
-            .map(|info| (info.buffer_row, info.diff_status))
-            .collect::<Vec<_>>(),
-        vec![
-            (Some(0), Some(DiffHunkStatus::added_none())),
-            (Some(1), None),
-            (Some(1), Some(DiffHunkStatus::deleted_none())),
-            (Some(2), Some(DiffHunkStatus::added_none())),
-            (Some(3), None),
-            (Some(3), Some(DiffHunkStatus::deleted_none())),
-            (Some(4), Some(DiffHunkStatus::deleted_none())),
-            (Some(4), None),
-            (Some(5), None)
-        ]
-    );
-
-    assert_chunks_in_ranges(&snapshot);
-    assert_consistent_line_numbers(&snapshot);
-    assert_position_translation(&snapshot);
-    assert_line_indents(&snapshot);
-
-    multibuffer.update(cx, |multibuffer, cx| {
-        multibuffer.collapse_diff_hunks(vec![Anchor::min()..Anchor::max()], cx)
-    });
-    assert_new_snapshot(
-        &multibuffer,
-        &mut snapshot,
-        &mut subscription,
-        cx,
-        indoc!(
-            "
-            ZERO
-            one
-            TWO
-            three
-            six
-            "
-        ),
-    );
-
-    assert_chunks_in_ranges(&snapshot);
-    assert_consistent_line_numbers(&snapshot);
-    assert_position_translation(&snapshot);
-    assert_line_indents(&snapshot);
-
-    // Expand the first diff hunk
-    multibuffer.update(cx, |multibuffer, cx| {
-        let position = multibuffer.read(cx).anchor_before(Point::new(2, 2));
-        multibuffer.expand_diff_hunks(vec![position..position], cx)
-    });
-    assert_new_snapshot(
-        &multibuffer,
-        &mut snapshot,
-        &mut subscription,
-        cx,
-        indoc!(
-            "
-              ZERO
-              one
-            - two
-            + TWO
-              three
-              six
-            "
-        ),
-    );
-
-    // Expand the second diff hunk
-    multibuffer.update(cx, |multibuffer, cx| {
-        let start = multibuffer.read(cx).anchor_before(Point::new(4, 0));
-        let end = multibuffer.read(cx).anchor_before(Point::new(5, 0));
-        multibuffer.expand_diff_hunks(vec![start..end], cx)
-    });
-    assert_new_snapshot(
-        &multibuffer,
-        &mut snapshot,
-        &mut subscription,
-        cx,
-        indoc!(
-            "
-              ZERO
-              one
-            - two
-            + TWO
-              three
-            - four
-            - five
-              six
-            "
-        ),
-    );
-
-    assert_chunks_in_ranges(&snapshot);
-    assert_consistent_line_numbers(&snapshot);
-    assert_position_translation(&snapshot);
-    assert_line_indents(&snapshot);
-
-    // Edit the buffer before the first hunk
-    buffer.update(cx, |buffer, cx| {
-        buffer.edit_via_marked_text(
-            indoc!(
-                "
-                ZERO
-                one« hundred
-                  thousand»
-                TWO
-                three
-                six
-                "
-            ),
-            None,
-            cx,
-        );
-    });
-    assert_new_snapshot(
-        &multibuffer,
-        &mut snapshot,
-        &mut subscription,
-        cx,
-        indoc!(
-            "
-              ZERO
-              one hundred
-                thousand
-            - two
-            + TWO
-              three
-            - four
-            - five
-              six
-            "
-        ),
-    );
-
-    assert_chunks_in_ranges(&snapshot);
-    assert_consistent_line_numbers(&snapshot);
-    assert_position_translation(&snapshot);
-    assert_line_indents(&snapshot);
-
-    // Recalculate the diff, changing the first diff hunk.
-    diff.update(cx, |diff, cx| {
-        diff.recalculate_diff_sync(buffer.read(cx).text_snapshot(), cx);
-    });
-    cx.run_until_parked();
-    assert_new_snapshot(
-        &multibuffer,
-        &mut snapshot,
-        &mut subscription,
-        cx,
-        indoc!(
-            "
-              ZERO
-              one hundred
-                thousand
-              TWO
-              three
-            - four
-            - five
-              six
-            "
-        ),
-    );
-
-    assert_eq!(
-        snapshot
-            .diff_hunks_in_range(MultiBufferOffset(0)..snapshot.len())
-            .map(|hunk| hunk.row_range.start.0..hunk.row_range.end.0)
-            .collect::<Vec<_>>(),
-        &[0..4, 5..7]
-    );
-}
-
-#[gpui::test]
-async fn test_repeatedly_expand_a_diff_hunk(cx: &mut TestAppContext) {
-    let text = indoc!(
-        "
-        one
-        TWO
-        THREE
-        four
-        FIVE
-        six
-        "
-    );
-    let base_text = indoc!(
-        "
-        one
-        four
-        five
-        six
-        "
-    );
-
-    let buffer = cx.new(|cx| Buffer::local(text, cx));
-    let diff = cx.new(|cx| BufferDiff::new_with_base_text(base_text, &buffer, cx));
-    cx.run_until_parked();
-
-    let multibuffer = cx.new(|cx| {
-        let mut multibuffer = MultiBuffer::singleton(buffer.clone(), cx);
-        multibuffer.add_diff(diff.clone(), cx);
-        multibuffer
-    });
-
-    let (mut snapshot, mut subscription) = multibuffer.update(cx, |multibuffer, cx| {
-        (multibuffer.snapshot(cx), multibuffer.subscribe())
-    });
-
-    multibuffer.update(cx, |multibuffer, cx| {
-        multibuffer.expand_diff_hunks(vec![Anchor::min()..Anchor::max()], cx);
-    });
-
-    assert_new_snapshot(
-        &multibuffer,
-        &mut snapshot,
-        &mut subscription,
-        cx,
-        indoc!(
-            "
-              one
-            + TWO
-            + THREE
-              four
-            - five
-            + FIVE
-              six
-            "
-        ),
-    );
-
-    // Regression test: expanding diff hunks that are already expanded should not change anything.
-    multibuffer.update(cx, |multibuffer, cx| {
-        multibuffer.expand_diff_hunks(
-            vec![
-                snapshot.anchor_before(Point::new(2, 0))..snapshot.anchor_before(Point::new(2, 0)),
-            ],
-            cx,
-        );
-    });
-
-    assert_new_snapshot(
-        &multibuffer,
-        &mut snapshot,
-        &mut subscription,
-        cx,
-        indoc!(
-            "
-              one
-            + TWO
-            + THREE
-              four
-            - five
-            + FIVE
-              six
-            "
-        ),
-    );
-
-    // Now collapse all diff hunks
-    multibuffer.update(cx, |multibuffer, cx| {
-        multibuffer.collapse_diff_hunks(vec![Anchor::min()..Anchor::max()], cx);
-    });
-
-    assert_new_snapshot(
-        &multibuffer,
-        &mut snapshot,
-        &mut subscription,
-        cx,
-        indoc!(
-            "
-            one
-            TWO
-            THREE
-            four
-            FIVE
-            six
-            "
-        ),
-    );
-
-    // Expand the hunks again, but this time provide two ranges that are both within the same hunk
-    // Target the first hunk which is between "one" and "four"
-    multibuffer.update(cx, |multibuffer, cx| {
-        multibuffer.expand_diff_hunks(
-            vec![
-                snapshot.anchor_before(Point::new(4, 0))..snapshot.anchor_before(Point::new(4, 0)),
-                snapshot.anchor_before(Point::new(4, 2))..snapshot.anchor_before(Point::new(4, 2)),
-            ],
-            cx,
-        );
-    });
-    assert_new_snapshot(
-        &multibuffer,
-        &mut snapshot,
-        &mut subscription,
-        cx,
-        indoc!(
-            "
-              one
-              TWO
-              THREE
-              four
-            - five
-            + FIVE
-              six
-            "
-        ),
-    );
-}
-
-#[gpui::test]
-fn test_set_excerpts_for_buffer_ordering(cx: &mut TestAppContext) {
-    let buf1 = cx.new(|cx| {
-        Buffer::local(
-            indoc! {
-            "zero
-            one
-            two
-            two.five
-            three
-            four
-            five
-            six
-            seven
-            eight
-            nine
-            ten
-            eleven
-            ",
-            },
-            cx,
-        )
-    });
-    let path1: PathKey = PathKey::with_sort_prefix(0, rel_path("root").into_arc());
-
-    let multibuffer = cx.new(|_| MultiBuffer::new(Capability::ReadWrite));
-    multibuffer.update(cx, |multibuffer, cx| {
-        multibuffer.set_excerpts_for_path(
-            path1.clone(),
-            buf1.clone(),
-            vec![
-                Point::row_range(1..2),
-                Point::row_range(6..7),
-                Point::row_range(11..12),
-            ],
-            1,
-            cx,
-        );
-    });
-
-    assert_excerpts_match(
-        &multibuffer,
-        cx,
-        indoc! {
-            "-----
-            zero
-            one
-            two
-            two.five
-            -----
-            four
-            five
-            six
-            seven
-            -----
-            nine
-            ten
-            eleven
-            "
-        },
-    );
-
-    buf1.update(cx, |buffer, cx| buffer.edit([(0..5, "")], None, cx));
-
-    multibuffer.update(cx, |multibuffer, cx| {
-        multibuffer.set_excerpts_for_path(
-            path1.clone(),
-            buf1.clone(),
-            vec![
-                Point::row_range(0..3),
-                Point::row_range(5..7),
-                Point::row_range(10..11),
-            ],
-            1,
-            cx,
-        );
-    });
-
-    assert_excerpts_match(
-        &multibuffer,
-        cx,
-        indoc! {
-            "-----
-             one
-             two
-             two.five
-             three
-             four
-             five
-             six
-             seven
-             eight
-             nine
-             ten
-             eleven
-            "
-        },
-    );
-}
-
-#[gpui::test]
-fn test_set_excerpts_for_buffer(cx: &mut TestAppContext) {
-    let buf1 = cx.new(|cx| {
-        Buffer::local(
-            indoc! {
-            "zero
-            one
-            two
-            three
-            four
-            five
-            six
-            seven
-            ",
-            },
-            cx,
-        )
-    });
-    let path1: PathKey = PathKey::with_sort_prefix(0, rel_path("root").into_arc());
-    let buf2 = cx.new(|cx| {
-        Buffer::local(
-            indoc! {
-            "000
-            111
-            222
-            333
-            444
-            555
-            666
-            777
-            888
-            999
-            "
-            },
-            cx,
-        )
-    });
-    let path2 = PathKey::with_sort_prefix(1, rel_path("root").into_arc());
-
-    let multibuffer = cx.new(|_| MultiBuffer::new(Capability::ReadWrite));
-    multibuffer.update(cx, |multibuffer, cx| {
-        multibuffer.set_excerpts_for_path(
-            path1.clone(),
-            buf1.clone(),
-            vec![Point::row_range(0..1)],
-            2,
-            cx,
-        );
-    });
-
-    assert_excerpts_match(
-        &multibuffer,
-        cx,
-        indoc! {
-        "-----
-        zero
-        one
-        two
-        three
-        "
-        },
-    );
-
-    multibuffer.update(cx, |multibuffer, cx| {
-        multibuffer.set_excerpts_for_path(path1.clone(), buf1.clone(), vec![], 2, cx);
-    });
-
-    assert_excerpts_match(&multibuffer, cx, "");
-
-    multibuffer.update(cx, |multibuffer, cx| {
-        multibuffer.set_excerpts_for_path(
-            path1.clone(),
-            buf1.clone(),
-            vec![Point::row_range(0..1), Point::row_range(7..8)],
-            2,
-            cx,
-        );
-    });
-
-    assert_excerpts_match(
-        &multibuffer,
-        cx,
-        indoc! {"-----
-                zero
-                one
-                two
-                three
-                -----
-                five
-                six
-                seven
-                "},
-    );
-
-    multibuffer.update(cx, |multibuffer, cx| {
-        multibuffer.set_excerpts_for_path(
-            path1.clone(),
-            buf1.clone(),
-            vec![Point::row_range(0..1), Point::row_range(5..6)],
-            2,
-            cx,
-        );
-    });
-
-    assert_excerpts_match(
-        &multibuffer,
-        cx,
-        indoc! {"-----
-                    zero
-                    one
-                    two
-                    three
-                    four
-                    five
-                    six
-                    seven
-                    "},
-    );
-
-    multibuffer.update(cx, |multibuffer, cx| {
-        multibuffer.set_excerpts_for_path(
-            path2.clone(),
-            buf2.clone(),
-            vec![Point::row_range(2..3)],
-            2,
-            cx,
-        );
-    });
-
-    assert_excerpts_match(
-        &multibuffer,
-        cx,
-        indoc! {"-----
-                zero
-                one
-                two
-                three
-                four
-                five
-                six
-                seven
-                -----
-                000
-                111
-                222
-                333
-                444
-                555
-                "},
-    );
-
-    multibuffer.update(cx, |multibuffer, cx| {
-        multibuffer.set_excerpts_for_path(path1.clone(), buf1.clone(), vec![], 2, cx);
-    });
-
-    multibuffer.update(cx, |multibuffer, cx| {
-        multibuffer.set_excerpts_for_path(
-            path1.clone(),
-            buf1.clone(),
-            vec![Point::row_range(3..4)],
-            2,
-            cx,
-        );
-    });
-
-    assert_excerpts_match(
-        &multibuffer,
-        cx,
-        indoc! {"-----
-                one
-                two
-                three
-                four
-                five
-                six
-                -----
-                000
-                111
-                222
-                333
-                444
-                555
-                "},
-    );
-
-    multibuffer.update(cx, |multibuffer, cx| {
-        multibuffer.set_excerpts_for_path(
-            path1.clone(),
-            buf1.clone(),
-            vec![Point::row_range(3..4)],
-            2,
-            cx,
-        );
-    });
-}
-
-#[gpui::test]
-fn test_set_excerpts_for_buffer_rename(cx: &mut TestAppContext) {
-    let buf1 = cx.new(|cx| {
-        Buffer::local(
-            indoc! {
-            "zero
-            one
-            two
-            three
-            four
-            five
-            six
-            seven
-            ",
-            },
-            cx,
-        )
-    });
-    let path: PathKey = PathKey::with_sort_prefix(0, rel_path("root").into_arc());
-    let buf2 = cx.new(|cx| {
-        Buffer::local(
-            indoc! {
-            "000
-            111
-            222
-            333
-            "
-            },
-            cx,
-        )
-    });
-
-    let multibuffer = cx.new(|_| MultiBuffer::new(Capability::ReadWrite));
-    multibuffer.update(cx, |multibuffer, cx| {
-        multibuffer.set_excerpts_for_path(
-            path.clone(),
-            buf1.clone(),
-            vec![Point::row_range(1..1), Point::row_range(4..5)],
-            1,
-            cx,
-        );
-    });
-
-    assert_excerpts_match(
-        &multibuffer,
-        cx,
-        indoc! {
-        "-----
-        zero
-        one
-        two
-        three
-        four
-        five
-        six
-        "
-        },
-    );
-
-    multibuffer.update(cx, |multibuffer, cx| {
-        multibuffer.set_excerpts_for_path(
-            path.clone(),
-            buf2.clone(),
-            vec![Point::row_range(0..1)],
-            2,
-            cx,
-        );
-    });
-
-    assert_excerpts_match(
-        &multibuffer,
-        cx,
-        indoc! {"-----
-                000
-                111
-                222
-                333
-                "},
-    );
-}
-
-#[gpui::test]
-async fn test_diff_hunks_with_multiple_excerpts(cx: &mut TestAppContext) {
-    let base_text_1 = indoc!(
-        "
-        one
-        two
-            three
-        four
-        five
-        six
-        "
-    );
-    let text_1 = indoc!(
-        "
-        ZERO
-        one
-        TWO
-            three
-        six
-        "
-    );
-    let base_text_2 = indoc!(
-        "
-        seven
-          eight
-        nine
-        ten
-        eleven
-        twelve
-        "
-    );
-    let text_2 = indoc!(
-        "
-          eight
-        nine
-        eleven
-        THIRTEEN
-        FOURTEEN
-        "
-    );
-
-    let buffer_1 = cx.new(|cx| Buffer::local(text_1, cx));
-    let buffer_2 = cx.new(|cx| Buffer::local(text_2, cx));
-    let diff_1 = cx.new(|cx| BufferDiff::new_with_base_text(base_text_1, &buffer_1, cx));
-    let diff_2 = cx.new(|cx| BufferDiff::new_with_base_text(base_text_2, &buffer_2, cx));
-    cx.run_until_parked();
-
-    let multibuffer = cx.new(|cx| {
-        let mut multibuffer = MultiBuffer::new(Capability::ReadWrite);
-        multibuffer.push_excerpts(
-            buffer_1.clone(),
-            [ExcerptRange::new(text::Anchor::MIN..text::Anchor::MAX)],
-            cx,
-        );
-        multibuffer.push_excerpts(
-            buffer_2.clone(),
-            [ExcerptRange::new(text::Anchor::MIN..text::Anchor::MAX)],
-            cx,
-        );
-        multibuffer.add_diff(diff_1.clone(), cx);
-        multibuffer.add_diff(diff_2.clone(), cx);
-        multibuffer
-    });
-
-    let (mut snapshot, mut subscription) = multibuffer.update(cx, |multibuffer, cx| {
-        (multibuffer.snapshot(cx), multibuffer.subscribe())
-    });
-    assert_eq!(
-        snapshot.text(),
-        indoc!(
-            "
-            ZERO
-            one
-            TWO
-                three
-            six
-
-              eight
-            nine
-            eleven
-            THIRTEEN
-            FOURTEEN
-            "
-        ),
-    );
-
-    multibuffer.update(cx, |multibuffer, cx| {
-        multibuffer.expand_diff_hunks(vec![Anchor::min()..Anchor::max()], cx);
-    });
-
-    assert_new_snapshot(
-        &multibuffer,
-        &mut snapshot,
-        &mut subscription,
-        cx,
-        indoc!(
-            "
-            + ZERO
-              one
-            - two
-            + TWO
-                  three
-            - four
-            - five
-              six
-
-            - seven
-                eight
-              nine
-            - ten
-              eleven
-            - twelve
-            + THIRTEEN
-            + FOURTEEN
-            "
-        ),
-    );
-
-    let id_1 = buffer_1.read_with(cx, |buffer, _| buffer.remote_id());
-    let id_2 = buffer_2.read_with(cx, |buffer, _| buffer.remote_id());
-    let base_id_1 = diff_1.read_with(cx, |diff, _| diff.base_text().remote_id());
-    let base_id_2 = diff_2.read_with(cx, |diff, _| diff.base_text().remote_id());
-
-    let buffer_lines = (0..=snapshot.max_row().0)
-        .map(|row| {
-            let (buffer, range) = snapshot.buffer_line_for_row(MultiBufferRow(row))?;
-            Some((
-                buffer.remote_id(),
-                buffer.text_for_range(range).collect::<String>(),
-            ))
-        })
-        .collect::<Vec<_>>();
-    pretty_assertions::assert_eq!(
-        buffer_lines,
-        [
-            Some((id_1, "ZERO".into())),
-            Some((id_1, "one".into())),
-            Some((base_id_1, "two".into())),
-            Some((id_1, "TWO".into())),
-            Some((id_1, "    three".into())),
-            Some((base_id_1, "four".into())),
-            Some((base_id_1, "five".into())),
-            Some((id_1, "six".into())),
-            Some((id_1, "".into())),
-            Some((base_id_2, "seven".into())),
-            Some((id_2, "  eight".into())),
-            Some((id_2, "nine".into())),
-            Some((base_id_2, "ten".into())),
-            Some((id_2, "eleven".into())),
-            Some((base_id_2, "twelve".into())),
-            Some((id_2, "THIRTEEN".into())),
-            Some((id_2, "FOURTEEN".into())),
-            Some((id_2, "".into())),
-        ]
-    );
-
-    let buffer_ids_by_range = [
-        (Point::new(0, 0)..Point::new(0, 0), &[id_1] as &[_]),
-        (Point::new(0, 0)..Point::new(2, 0), &[id_1]),
-        (Point::new(2, 0)..Point::new(2, 0), &[id_1]),
-        (Point::new(3, 0)..Point::new(3, 0), &[id_1]),
-        (Point::new(8, 0)..Point::new(9, 0), &[id_1]),
-        (Point::new(8, 0)..Point::new(10, 0), &[id_1, id_2]),
-        (Point::new(9, 0)..Point::new(9, 0), &[id_2]),
-    ];
-    for (range, buffer_ids) in buffer_ids_by_range {
-        assert_eq!(
-            snapshot
-                .buffer_ids_for_range(range.clone())
-                .collect::<Vec<_>>(),
-            buffer_ids,
-            "buffer_ids_for_range({range:?}"
-        );
-    }
-
-    assert_position_translation(&snapshot);
-    assert_line_indents(&snapshot);
-
-    assert_eq!(
-        snapshot
-            .diff_hunks_in_range(MultiBufferOffset(0)..snapshot.len())
-            .map(|hunk| hunk.row_range.start.0..hunk.row_range.end.0)
-            .collect::<Vec<_>>(),
-        &[0..1, 2..4, 5..7, 9..10, 12..13, 14..17]
-    );
-
-    buffer_2.update(cx, |buffer, cx| {
-        buffer.edit_via_marked_text(
-            indoc!(
-                "
-                  eight
-                «»eleven
-                THIRTEEN
-                FOURTEEN
-                "
-            ),
-            None,
-            cx,
-        );
-    });
-
-    assert_new_snapshot(
-        &multibuffer,
-        &mut snapshot,
-        &mut subscription,
-        cx,
-        indoc!(
-            "
-            + ZERO
-              one
-            - two
-            + TWO
-                  three
-            - four
-            - five
-              six
-
-            - seven
-                eight
-              eleven
-            - twelve
-            + THIRTEEN
-            + FOURTEEN
-            "
-        ),
-    );
-
-    assert_line_indents(&snapshot);
-}
-
-/// A naive implementation of a multi-buffer that does not maintain
-/// any derived state, used for comparison in a randomized test.
-#[derive(Default)]
-struct ReferenceMultibuffer {
-    excerpts: Vec<ReferenceExcerpt>,
-    diffs: HashMap<BufferId, Entity<BufferDiff>>,
-}
-
-#[derive(Debug)]
-struct ReferenceExcerpt {
-    id: ExcerptId,
-    buffer: Entity<Buffer>,
-    range: Range<text::Anchor>,
-    expanded_diff_hunks: Vec<text::Anchor>,
-}
-
-#[derive(Debug)]
-struct ReferenceRegion {
-    buffer_id: Option<BufferId>,
-    range: Range<usize>,
-    buffer_range: Option<Range<Point>>,
-    status: Option<DiffHunkStatus>,
-    excerpt_id: Option<ExcerptId>,
-}
-
-impl ReferenceMultibuffer {
-    fn expand_excerpts(&mut self, excerpts: &HashSet<ExcerptId>, line_count: u32, cx: &App) {
-        if line_count == 0 {
-            return;
-        }
-
-        for id in excerpts {
-            let excerpt = self.excerpts.iter_mut().find(|e| e.id == *id).unwrap();
-            let snapshot = excerpt.buffer.read(cx).snapshot();
-            let mut point_range = excerpt.range.to_point(&snapshot);
-            point_range.start = Point::new(point_range.start.row.saturating_sub(line_count), 0);
-            point_range.end =
-                snapshot.clip_point(Point::new(point_range.end.row + line_count, 0), Bias::Left);
-            point_range.end.column = snapshot.line_len(point_range.end.row);
-            excerpt.range =
-                snapshot.anchor_before(point_range.start)..snapshot.anchor_after(point_range.end);
-        }
-    }
-
-    fn remove_excerpt(&mut self, id: ExcerptId, cx: &App) {
-        let ix = self
-            .excerpts
-            .iter()
-            .position(|excerpt| excerpt.id == id)
-            .unwrap();
-        let excerpt = self.excerpts.remove(ix);
-        let buffer = excerpt.buffer.read(cx);
-        let id = buffer.remote_id();
-        log::info!(
-            "Removing excerpt {}: {:?}",
-            ix,
-            buffer
-                .text_for_range(excerpt.range.to_offset(buffer))
-                .collect::<String>(),
-        );
-        if !self
-            .excerpts
-            .iter()
-            .any(|excerpt| excerpt.buffer.read(cx).remote_id() == id)
-        {
-            self.diffs.remove(&id);
-        }
-    }
-
-    fn insert_excerpt_after(
-        &mut self,
-        prev_id: ExcerptId,
-        new_excerpt_id: ExcerptId,
-        (buffer_handle, anchor_range): (Entity<Buffer>, Range<text::Anchor>),
-    ) {
-        let excerpt_ix = if prev_id == ExcerptId::max() {
-            self.excerpts.len()
-        } else {
-            self.excerpts
-                .iter()
-                .position(|excerpt| excerpt.id == prev_id)
-                .unwrap()
-                + 1
-        };
-        self.excerpts.insert(
-            excerpt_ix,
-            ReferenceExcerpt {
-                id: new_excerpt_id,
-                buffer: buffer_handle,
-                range: anchor_range,
-                expanded_diff_hunks: Vec::new(),
-            },
-        );
-    }
-
-    fn expand_diff_hunks(&mut self, excerpt_id: ExcerptId, range: Range<text::Anchor>, cx: &App) {
-        let excerpt = self
-            .excerpts
-            .iter_mut()
-            .find(|e| e.id == excerpt_id)
-            .unwrap();
-        let buffer = excerpt.buffer.read(cx).snapshot();
-        let buffer_id = buffer.remote_id();
-        let Some(diff) = self.diffs.get(&buffer_id) else {
-            return;
-        };
-        let excerpt_range = excerpt.range.to_offset(&buffer);
-        for hunk in diff.read(cx).hunks_intersecting_range(range, &buffer, cx) {
-            let hunk_range = hunk.buffer_range.to_offset(&buffer);
-            if hunk_range.start < excerpt_range.start || hunk_range.start > excerpt_range.end {
-                continue;
-            }
-            if let Err(ix) = excerpt
-                .expanded_diff_hunks
-                .binary_search_by(|anchor| anchor.cmp(&hunk.buffer_range.start, &buffer))
-            {
-                log::info!(
-                    "expanding diff hunk {:?}. excerpt:{:?}, excerpt range:{:?}",
-                    hunk_range,
-                    excerpt_id,
-                    excerpt_range
-                );
-                excerpt
-                    .expanded_diff_hunks
-                    .insert(ix, hunk.buffer_range.start);
-            } else {
-                log::trace!("hunk {hunk_range:?} already expanded in excerpt {excerpt_id:?}");
-            }
-        }
-    }
-
-    fn expected_content(
-        &self,
-        filter_mode: Option<MultiBufferFilterMode>,
-        all_diff_hunks_expanded: bool,
-        cx: &App,
-    ) -> (String, Vec<RowInfo>, HashSet<MultiBufferRow>) {
-        let mut text = String::new();
-        let mut regions = Vec::<ReferenceRegion>::new();
-        let mut filtered_regions = Vec::<ReferenceRegion>::new();
-        let mut excerpt_boundary_rows = HashSet::default();
-        for excerpt in &self.excerpts {
-            excerpt_boundary_rows.insert(MultiBufferRow(text.matches('\n').count() as u32));
-            let buffer = excerpt.buffer.read(cx);
-            let buffer_range = excerpt.range.to_offset(buffer);
-            let diff = self.diffs.get(&buffer.remote_id()).unwrap().read(cx);
-            let base_buffer = diff.base_text();
-
-            let mut offset = buffer_range.start;
-            let hunks = diff
-                .hunks_intersecting_range(excerpt.range.clone(), buffer, cx)
-                .peekable();
-
-            for hunk in hunks {
-                // Ignore hunks that are outside the excerpt range.
-                let mut hunk_range = hunk.buffer_range.to_offset(buffer);
-
-                hunk_range.end = hunk_range.end.min(buffer_range.end);
-                if hunk_range.start > buffer_range.end || hunk_range.start < buffer_range.start {
-                    log::trace!("skipping hunk outside excerpt range");
-                    continue;
-                }
-
-                if !all_diff_hunks_expanded
-                    && !excerpt.expanded_diff_hunks.iter().any(|expanded_anchor| {
-                        expanded_anchor.to_offset(buffer).max(buffer_range.start)
-                            == hunk_range.start.max(buffer_range.start)
-                    })
-                {
-                    log::trace!("skipping a hunk that's not marked as expanded");
-                    continue;
-                }
-
-                if !hunk.buffer_range.start.is_valid(buffer) {
-                    log::trace!("skipping hunk with deleted start: {:?}", hunk.range);
-                    continue;
-                }
-
-                if hunk_range.start >= offset {
-                    // Add the buffer text before the hunk
-                    let len = text.len();
-                    text.extend(buffer.text_for_range(offset..hunk_range.start));
-                    if text.len() > len {
-                        regions.push(ReferenceRegion {
-                            buffer_id: Some(buffer.remote_id()),
-                            range: len..text.len(),
-                            buffer_range: Some((offset..hunk_range.start).to_point(&buffer)),
-                            status: None,
-                            excerpt_id: Some(excerpt.id),
-                        });
-                    }
-
-                    // Add the deleted text for the hunk.
-                    if !hunk.diff_base_byte_range.is_empty()
-                        && filter_mode != Some(MultiBufferFilterMode::KeepInsertions)
-                    {
-                        let mut base_text = base_buffer
-                            .text_for_range(hunk.diff_base_byte_range.clone())
-                            .collect::<String>();
-                        if !base_text.ends_with('\n') {
-                            base_text.push('\n');
-                        }
-                        let len = text.len();
-                        text.push_str(&base_text);
-                        regions.push(ReferenceRegion {
-                            buffer_id: Some(base_buffer.remote_id()),
-                            range: len..text.len(),
-                            buffer_range: Some(hunk.diff_base_byte_range.to_point(&base_buffer)),
-                            status: Some(DiffHunkStatus::deleted(hunk.secondary_status)),
-                            excerpt_id: Some(excerpt.id),
-                        });
-                    }
-
-                    offset = hunk_range.start;
-                }
-
-                // Add the inserted text for the hunk.
-                if hunk_range.end > offset {
-                    let is_filtered = filter_mode == Some(MultiBufferFilterMode::KeepDeletions);
-                    let range = if is_filtered {
-                        text.len()..text.len()
-                    } else {
-                        let len = text.len();
-                        text.extend(buffer.text_for_range(offset..hunk_range.end));
-                        len..text.len()
-                    };
-                    let region = ReferenceRegion {
-                        buffer_id: Some(buffer.remote_id()),
-                        range,
-                        buffer_range: Some((offset..hunk_range.end).to_point(&buffer)),
-                        status: Some(DiffHunkStatus::added(hunk.secondary_status)),
-                        excerpt_id: Some(excerpt.id),
-                    };
-                    offset = hunk_range.end;
-                    if is_filtered {
-                        filtered_regions.push(region);
-                    } else {
-                        regions.push(region);
-                    }
-                }
-            }
-
-            // Add the buffer text for the rest of the excerpt.
-            let len = text.len();
-            text.extend(buffer.text_for_range(offset..buffer_range.end));
-            text.push('\n');
-            regions.push(ReferenceRegion {
-                buffer_id: Some(buffer.remote_id()),
-                range: len..text.len(),
-                buffer_range: Some((offset..buffer_range.end).to_point(&buffer)),
-                status: None,
-                excerpt_id: Some(excerpt.id),
-            });
-        }
-
-        // Remove final trailing newline.
-        if self.excerpts.is_empty() {
-            regions.push(ReferenceRegion {
-                buffer_id: None,
-                range: 0..1,
-                buffer_range: Some(Point::new(0, 0)..Point::new(0, 1)),
-                status: None,
-                excerpt_id: None,
-            });
-        } else {
-            text.pop();
-        }
-
-        // Retrieve the row info using the region that contains
-        // the start of each multi-buffer line.
-        let mut ix = 0;
-        let row_infos = text
-            .split('\n')
-            .map(|line| {
-                let row_info = regions
-                    .iter()
-                    .position(|region| region.range.contains(&ix))
-                    .map_or(RowInfo::default(), |region_ix| {
-                        let region = &regions[region_ix];
-                        let buffer_row = region.buffer_range.as_ref().map(|buffer_range| {
-                            buffer_range.start.row
-                                + text[region.range.start..ix].matches('\n').count() as u32
-                        });
-                        let main_buffer = self
-                            .excerpts
-                            .iter()
-                            .find(|e| e.id == region.excerpt_id.unwrap())
-                            .map(|e| e.buffer.clone());
-                        let base_text_row = match region.status {
-                            None => Some(
-                                main_buffer
-                                    .as_ref()
-                                    .map(|main_buffer| {
-                                        let diff = self
-                                            .diffs
-                                            .get(&main_buffer.read(cx).remote_id())
-                                            .unwrap();
-                                        let buffer_row = buffer_row.unwrap();
-                                        BaseTextRow(
-                                            diff.read(cx).snapshot(cx).row_to_base_text_row(
-                                                buffer_row,
-                                                &main_buffer.read(cx).snapshot(),
-                                            ),
-                                        )
-                                    })
-                                    .unwrap_or_default(),
-                            ),
-                            Some(DiffHunkStatus {
-                                kind: DiffHunkStatusKind::Added,
-                                ..
-                            }) => None,
-                            Some(DiffHunkStatus {
-                                kind: DiffHunkStatusKind::Deleted,
-                                ..
-                            }) => Some(BaseTextRow(buffer_row.unwrap())),
-                            Some(DiffHunkStatus {
-                                kind: DiffHunkStatusKind::Modified,
-                                ..
-                            }) => unreachable!(),
-                        };
-                        let is_excerpt_start = region_ix == 0
-                            || &regions[region_ix - 1].excerpt_id != &region.excerpt_id
-                            || regions[region_ix - 1].range.is_empty();
-                        let mut is_excerpt_end = region_ix == regions.len() - 1
-                            || &regions[region_ix + 1].excerpt_id != &region.excerpt_id;
-                        let is_start = !text[region.range.start..ix].contains('\n');
-                        let mut is_end = if region.range.end > text.len() {
-                            !text[ix..].contains('\n')
-                        } else {
-                            text[ix..region.range.end.min(text.len())]
-                                .matches('\n')
-                                .count()
-                                == 1
-                        };
-                        if region_ix < regions.len() - 1
-                            && !text[ix..].contains("\n")
-                            && region.status == Some(DiffHunkStatus::added_none())
-                            && regions[region_ix + 1].excerpt_id == region.excerpt_id
-                            && regions[region_ix + 1].range.start == text.len()
-                        {
-                            is_end = true;
-                            is_excerpt_end = true;
-                        }
-                        let multibuffer_row =
-                            MultiBufferRow(text[..ix].matches('\n').count() as u32);
-                        let mut expand_direction = None;
-                        if let Some(buffer) = &main_buffer {
-                            let buffer_row = buffer_row.unwrap();
-                            let needs_expand_up = is_excerpt_start && is_start && buffer_row > 0;
-                            let needs_expand_down = is_excerpt_end
-                                && is_end
-                                && buffer.read(cx).max_point().row > buffer_row;
-                            expand_direction = if needs_expand_up && needs_expand_down {
-                                Some(ExpandExcerptDirection::UpAndDown)
-                            } else if needs_expand_up {
-                                Some(ExpandExcerptDirection::Up)
-                            } else if needs_expand_down {
-                                Some(ExpandExcerptDirection::Down)
-                            } else {
-                                None
-                            };
-                        }
-                        RowInfo {
-                            buffer_id: region.buffer_id,
-                            diff_status: region.status,
-                            buffer_row,
-                            base_text_row,
-                            wrapped_buffer_row: None,
-
-                            multibuffer_row: Some(multibuffer_row),
-                            expand_info: expand_direction.zip(region.excerpt_id).map(
-                                |(direction, excerpt_id)| ExpandInfo {
-                                    direction,
-                                    excerpt_id,
-                                },
-                            ),
-                        }
-                    });
-                ix += line.len() + 1;
-                row_info
-            })
-            .collect();
-
-        (text, row_infos, excerpt_boundary_rows)
-    }
-
-    fn diffs_updated(&mut self, cx: &App) {
-        for excerpt in &mut self.excerpts {
-            let buffer = excerpt.buffer.read(cx).snapshot();
-            let excerpt_range = excerpt.range.to_offset(&buffer);
-            let buffer_id = buffer.remote_id();
-            let diff = self.diffs.get(&buffer_id).unwrap().read(cx);
-            let mut hunks = diff.hunks_in_row_range(0..u32::MAX, &buffer, cx).peekable();
-            excerpt.expanded_diff_hunks.retain(|hunk_anchor| {
-                if !hunk_anchor.is_valid(&buffer) {
-                    return false;
-                }
-                while let Some(hunk) = hunks.peek() {
-                    match hunk.buffer_range.start.cmp(hunk_anchor, &buffer) {
-                        cmp::Ordering::Less => {
-                            hunks.next();
-                        }
-                        cmp::Ordering::Equal => {
-                            let hunk_range = hunk.buffer_range.to_offset(&buffer);
-                            return hunk_range.end >= excerpt_range.start
-                                && hunk_range.start <= excerpt_range.end;
-                        }
-                        cmp::Ordering::Greater => break,
-                    }
-                }
-                false
-            });
-        }
-    }
-
-    fn add_diff(&mut self, diff: Entity<BufferDiff>, cx: &mut App) {
-        let buffer_id = diff.read(cx).buffer_id;
-        self.diffs.insert(buffer_id, diff);
-    }
-}
-
-#[gpui::test(iterations = 100)]
-async fn test_random_set_ranges(cx: &mut TestAppContext, mut rng: StdRng) {
-    let base_text = "a\n".repeat(100);
-    let buf = cx.update(|cx| cx.new(|cx| Buffer::local(base_text, cx)));
-    let multibuffer = cx.new(|_| MultiBuffer::new(Capability::ReadWrite));
-
-    let operations = env::var("OPERATIONS")
-        .map(|i| i.parse().expect("invalid `OPERATIONS` variable"))
-        .unwrap_or(10);
-
-    fn row_ranges(ranges: &Vec<Range<Point>>) -> Vec<Range<u32>> {
-        ranges
-            .iter()
-            .map(|range| range.start.row..range.end.row)
-            .collect()
-    }
-
-    for _ in 0..operations {
-        let snapshot = buf.update(cx, |buf, _| buf.snapshot());
-        let num_ranges = rng.random_range(0..=10);
-        let max_row = snapshot.max_point().row;
-        let mut ranges = (0..num_ranges)
-            .map(|_| {
-                let start = rng.random_range(0..max_row);
-                let end = rng.random_range(start + 1..max_row + 1);
-                Point::row_range(start..end)
-            })
-            .collect::<Vec<_>>();
-        ranges.sort_by_key(|range| range.start);
-        log::info!("Setting ranges: {:?}", row_ranges(&ranges));
-        let (created, _) = multibuffer.update(cx, |multibuffer, cx| {
-            multibuffer.set_excerpts_for_path(
-                PathKey::for_buffer(&buf, cx),
-                buf.clone(),
-                ranges.clone(),
-                2,
-                cx,
-            )
-        });
-
-        assert_eq!(created.len(), ranges.len());
-
-        let snapshot = multibuffer.update(cx, |multibuffer, cx| multibuffer.snapshot(cx));
-        let mut last_end = None;
-        let mut seen_ranges = Vec::default();
-
-        for (_, buf, range) in snapshot.excerpts() {
-            let start = range.context.start.to_point(buf);
-            let end = range.context.end.to_point(buf);
-            seen_ranges.push(start..end);
-
-            if let Some(last_end) = last_end.take() {
-                assert!(
-                    start > last_end,
-                    "multibuffer has out-of-order ranges: {:?}; {:?} <= {:?}",
-                    row_ranges(&seen_ranges),
-                    start,
-                    last_end
-                )
-            }
-
-            ranges.retain(|range| range.start < start || range.end > end);
-
-            last_end = Some(end)
-        }
-
-        assert!(
-            ranges.is_empty(),
-            "multibuffer {:?} did not include all ranges: {:?}",
-            row_ranges(&seen_ranges),
-            row_ranges(&ranges)
-        );
-    }
-}
-
-// TODO(split-diff) bump up iterations
-// #[gpui::test(iterations = 100)]
-#[gpui::test]
-async fn test_random_filtered_multibuffer(cx: &mut TestAppContext, rng: StdRng) {
-    let multibuffer = cx.new(|cx| {
-        let mut multibuffer = MultiBuffer::new(Capability::ReadWrite);
-        multibuffer.set_all_diff_hunks_expanded(cx);
-        multibuffer.set_filter_mode(Some(MultiBufferFilterMode::KeepInsertions));
-        multibuffer
-    });
-    let follower = multibuffer.update(cx, |multibuffer, cx| multibuffer.get_or_create_follower(cx));
-    follower.update(cx, |follower, _| {
-        assert!(follower.all_diff_hunks_expanded());
-        follower.set_filter_mode(Some(MultiBufferFilterMode::KeepDeletions));
-    });
-    test_random_multibuffer_impl(multibuffer, cx, rng).await;
-}
-
-#[gpui::test(iterations = 100)]
-async fn test_random_multibuffer(cx: &mut TestAppContext, rng: StdRng) {
-    let multibuffer = cx.new(|_| MultiBuffer::new(Capability::ReadWrite));
-    test_random_multibuffer_impl(multibuffer, cx, rng).await;
-}
-
-async fn test_random_multibuffer_impl(
-    multibuffer: Entity<MultiBuffer>,
-    cx: &mut TestAppContext,
-    mut rng: StdRng,
-) {
-    let operations = env::var("OPERATIONS")
-        .map(|i| i.parse().expect("invalid `OPERATIONS` variable"))
-        .unwrap_or(10);
-
-    multibuffer.read_with(cx, |multibuffer, _| assert!(multibuffer.is_empty()));
-    let all_diff_hunks_expanded =
-        multibuffer.read_with(cx, |multibuffer, _| multibuffer.all_diff_hunks_expanded());
-    let mut buffers: Vec<Entity<Buffer>> = Vec::new();
-    let mut base_texts: HashMap<BufferId, String> = HashMap::default();
-    let mut reference = ReferenceMultibuffer::default();
-    let mut anchors = Vec::new();
-    let mut old_versions = Vec::new();
-    let mut old_follower_versions = Vec::new();
-    let mut needs_diff_calculation = false;
-
-    for _ in 0..operations {
-        match rng.random_range(0..100) {
-            0..=14 if !buffers.is_empty() => {
-                let buffer = buffers.choose(&mut rng).unwrap();
-                buffer.update(cx, |buf, cx| {
-                    let edit_count = rng.random_range(1..5);
-                    buf.randomly_edit(&mut rng, edit_count, cx);
-                    log::info!("buffer text:\n{}", buf.text());
-                    needs_diff_calculation = true;
-                });
-                cx.update(|cx| reference.diffs_updated(cx));
-            }
-            15..=19 if !reference.excerpts.is_empty() => {
-                multibuffer.update(cx, |multibuffer, cx| {
-                    let ids = multibuffer.excerpt_ids();
-                    let mut excerpts = HashSet::default();
-                    for _ in 0..rng.random_range(0..ids.len()) {
-                        excerpts.extend(ids.choose(&mut rng).copied());
-                    }
-
-                    let line_count = rng.random_range(0..5);
-
-                    let excerpt_ixs = excerpts
-                        .iter()
-                        .map(|id| reference.excerpts.iter().position(|e| e.id == *id).unwrap())
-                        .collect::<Vec<_>>();
-                    log::info!("Expanding excerpts {excerpt_ixs:?} by {line_count} lines");
-                    multibuffer.expand_excerpts(
-                        excerpts.iter().cloned(),
-                        line_count,
-                        ExpandExcerptDirection::UpAndDown,
-                        cx,
-                    );
-
-                    reference.expand_excerpts(&excerpts, line_count, cx);
-                });
-            }
-            20..=29 if !reference.excerpts.is_empty() => {
-                let mut ids_to_remove = vec![];
-                for _ in 0..rng.random_range(1..=3) {
-                    let Some(excerpt) = reference.excerpts.choose(&mut rng) else {
-                        break;
-                    };
-                    let id = excerpt.id;
-                    cx.update(|cx| reference.remove_excerpt(id, cx));
-                    ids_to_remove.push(id);
-                }
-                let snapshot =
-                    multibuffer.read_with(cx, |multibuffer, cx| multibuffer.snapshot(cx));
-                ids_to_remove.sort_unstable_by(|a, b| a.cmp(b, &snapshot));
-                drop(snapshot);
-                multibuffer.update(cx, |multibuffer, cx| {
-                    multibuffer.remove_excerpts(ids_to_remove, cx)
-                });
-            }
-            30..=39 if !reference.excerpts.is_empty() => {
-                let multibuffer =
-                    multibuffer.read_with(cx, |multibuffer, cx| multibuffer.snapshot(cx));
-                let offset = multibuffer.clip_offset(
-                    MultiBufferOffset(rng.random_range(0..=multibuffer.len().0)),
-                    Bias::Left,
-                );
-                let bias = if rng.random() {
-                    Bias::Left
-                } else {
-                    Bias::Right
-                };
-                log::info!("Creating anchor at {} with bias {:?}", offset.0, bias);
-                anchors.push(multibuffer.anchor_at(offset, bias));
-                anchors.sort_by(|a, b| a.cmp(b, &multibuffer));
-            }
-            40..=44 if !anchors.is_empty() => {
-                let multibuffer =
-                    multibuffer.read_with(cx, |multibuffer, cx| multibuffer.snapshot(cx));
-                let prev_len = anchors.len();
-                anchors = multibuffer
-                    .refresh_anchors(&anchors)
-                    .into_iter()
-                    .map(|a| a.1)
-                    .collect();
-
-                // Ensure the newly-refreshed anchors point to a valid excerpt and don't
-                // overshoot its boundaries.
-                assert_eq!(anchors.len(), prev_len);
-                for anchor in &anchors {
-                    if anchor.excerpt_id == ExcerptId::min()
-                        || anchor.excerpt_id == ExcerptId::max()
-                    {
-                        continue;
-                    }
-
-                    let excerpt = multibuffer.excerpt(anchor.excerpt_id).unwrap();
-                    assert_eq!(excerpt.id, anchor.excerpt_id);
-                    assert!(excerpt.contains(anchor));
-                }
-            }
-            45..=55 if !reference.excerpts.is_empty() && !all_diff_hunks_expanded => {
-                multibuffer.update(cx, |multibuffer, cx| {
-                    let snapshot = multibuffer.snapshot(cx);
-                    let excerpt_ix = rng.random_range(0..reference.excerpts.len());
-                    let excerpt = &reference.excerpts[excerpt_ix];
-                    let start = excerpt.range.start;
-                    let end = excerpt.range.end;
-                    let range = snapshot.anchor_in_excerpt(excerpt.id, start).unwrap()
-                        ..snapshot.anchor_in_excerpt(excerpt.id, end).unwrap();
-
-                    log::info!(
-                        "expanding diff hunks in range {:?} (excerpt id {:?}, index {excerpt_ix:?}, buffer id {:?})",
-                        range.to_offset(&snapshot),
-                        excerpt.id,
-                        excerpt.buffer.read(cx).remote_id(),
-                    );
-                    reference.expand_diff_hunks(excerpt.id, start..end, cx);
-                    multibuffer.expand_diff_hunks(vec![range], cx);
-                });
-            }
-            56..=85 if needs_diff_calculation => {
-                multibuffer.update(cx, |multibuffer, cx| {
-                    for buffer in multibuffer.all_buffers() {
-                        let snapshot = buffer.read(cx).snapshot();
-                        multibuffer.diff_for(snapshot.remote_id()).unwrap().update(
-                            cx,
-                            |diff, cx| {
-                                log::info!(
-                                    "recalculating diff for buffer {:?}",
-                                    snapshot.remote_id(),
-                                );
-                                diff.recalculate_diff_sync(snapshot.text, cx);
-                            },
-                        );
-                    }
-                    reference.diffs_updated(cx);
-                    needs_diff_calculation = false;
-                });
-            }
-            _ => {
-                let buffer_handle = if buffers.is_empty() || rng.random_bool(0.4) {
-                    let mut base_text = util::RandomCharIter::new(&mut rng)
-                        .take(256)
-                        .collect::<String>();
-
-                    let buffer = cx.new(|cx| Buffer::local(base_text.clone(), cx));
-                    text::LineEnding::normalize(&mut base_text);
-                    base_texts.insert(
-                        buffer.read_with(cx, |buffer, _| buffer.remote_id()),
-                        base_text,
-                    );
-                    buffers.push(buffer);
-                    buffers.last().unwrap()
-                } else {
-                    buffers.choose(&mut rng).unwrap()
-                };
-
-                let prev_excerpt_ix = rng.random_range(0..=reference.excerpts.len());
-                let prev_excerpt_id = reference
-                    .excerpts
-                    .get(prev_excerpt_ix)
-                    .map_or(ExcerptId::max(), |e| e.id);
-                let excerpt_ix = (prev_excerpt_ix + 1).min(reference.excerpts.len());
-
-                let (range, anchor_range) = buffer_handle.read_with(cx, |buffer, _| {
-                    let end_row = rng.random_range(0..=buffer.max_point().row);
-                    let start_row = rng.random_range(0..=end_row);
-                    let end_ix = buffer.point_to_offset(Point::new(end_row, 0));
-                    let start_ix = buffer.point_to_offset(Point::new(start_row, 0));
-                    let anchor_range = buffer.anchor_before(start_ix)..buffer.anchor_after(end_ix);
-
-                    log::info!(
-                        "Inserting excerpt at {} of {} for buffer {}: {:?}[{:?}] = {:?}",
-                        excerpt_ix,
-                        reference.excerpts.len(),
-                        buffer.remote_id(),
-                        buffer.text(),
-                        start_ix..end_ix,
-                        &buffer.text()[start_ix..end_ix]
-                    );
-
-                    (start_ix..end_ix, anchor_range)
-                });
-
-                let excerpt_id = multibuffer.update(cx, |multibuffer, cx| {
-                    multibuffer
-                        .insert_excerpts_after(
-                            prev_excerpt_id,
-                            buffer_handle.clone(),
-                            [ExcerptRange::new(range.clone())],
-                            cx,
-                        )
-                        .pop()
-                        .unwrap()
-                });
-
-                reference.insert_excerpt_after(
-                    prev_excerpt_id,
-                    excerpt_id,
-                    (buffer_handle.clone(), anchor_range),
-                );
-
-                multibuffer.update(cx, |multibuffer, cx| {
-                    let id = buffer_handle.read(cx).remote_id();
-                    if multibuffer.diff_for(id).is_none() {
-                        let base_text = base_texts.get(&id).unwrap();
-                        let diff = cx
-                            .new(|cx| BufferDiff::new_with_base_text(base_text, buffer_handle, cx));
-                        reference.add_diff(diff.clone(), cx);
-                        multibuffer.add_diff(diff, cx)
-                    }
-                });
-            }
-        }
-
-        if rng.random_bool(0.3) {
-            multibuffer.update(cx, |multibuffer, cx| {
-                old_versions.push((multibuffer.snapshot(cx), multibuffer.subscribe()));
-
-                if let Some(follower) = &multibuffer.follower {
-                    follower.update(cx, |follower, cx| {
-                        old_follower_versions.push((follower.snapshot(cx), follower.subscribe()));
-                    })
-                }
-            })
-        }
-
-        multibuffer.read_with(cx, |multibuffer, cx| {
-            check_multibuffer(multibuffer, &reference, &anchors, cx, &mut rng);
-
-            if let Some(follower) = &multibuffer.follower {
-                check_multibuffer(follower.read(cx), &reference, &anchors, cx, &mut rng);
-            }
-        });
-    }
-
-    let snapshot = multibuffer.read_with(cx, |multibuffer, cx| multibuffer.snapshot(cx));
-    for (old_snapshot, subscription) in old_versions {
-        check_multibuffer_edits(&snapshot, &old_snapshot, subscription);
-    }
-    if let Some(follower) = multibuffer.read_with(cx, |multibuffer, _| multibuffer.follower.clone())
-    {
-        let snapshot = follower.read_with(cx, |follower, cx| follower.snapshot(cx));
-        for (old_snapshot, subscription) in old_follower_versions {
-            check_multibuffer_edits(&snapshot, &old_snapshot, subscription);
-        }
-    }
-}
-
-fn check_multibuffer(
-    multibuffer: &MultiBuffer,
-    reference: &ReferenceMultibuffer,
-    anchors: &[Anchor],
-    cx: &App,
-    rng: &mut StdRng,
-) {
-    let snapshot = multibuffer.snapshot(cx);
-    let filter_mode = multibuffer.filter_mode;
-    assert!(filter_mode.is_some() == snapshot.all_diff_hunks_expanded);
-    let actual_text = snapshot.text();
-    let actual_boundary_rows = snapshot
-        .excerpt_boundaries_in_range(MultiBufferOffset(0)..)
-        .map(|b| b.row)
-        .collect::<HashSet<_>>();
-    let actual_row_infos = snapshot.row_infos(MultiBufferRow(0)).collect::<Vec<_>>();
-
-    let (expected_text, expected_row_infos, expected_boundary_rows) =
-        reference.expected_content(filter_mode, snapshot.all_diff_hunks_expanded, cx);
-
-    let (unfiltered_text, unfiltered_row_infos, unfiltered_boundary_rows) =
-        reference.expected_content(None, snapshot.all_diff_hunks_expanded, cx);
-
-    let has_diff = actual_row_infos
-        .iter()
-        .any(|info| info.diff_status.is_some())
-        || unfiltered_row_infos
-            .iter()
-            .any(|info| info.diff_status.is_some());
-    let actual_diff = format_diff(
-        &actual_text,
-        &actual_row_infos,
-        &actual_boundary_rows,
-        Some(has_diff),
-    );
-    let expected_diff = format_diff(
-        &expected_text,
-        &expected_row_infos,
-        &expected_boundary_rows,
-        Some(has_diff),
-    );
-
-    log::info!("Multibuffer content:\n{}", actual_diff);
-    if filter_mode.is_some() {
-        log::info!(
-            "Unfiltered multibuffer content:\n{}",
-            format_diff(
-                &unfiltered_text,
-                &unfiltered_row_infos,
-                &unfiltered_boundary_rows,
-                None,
-            ),
-        );
-    }
-
-    assert_eq!(
-        actual_row_infos.len(),
-        actual_text.split('\n').count(),
-        "line count: {}",
-        actual_text.split('\n').count()
-    );
-    pretty_assertions::assert_eq!(actual_diff, expected_diff);
-    pretty_assertions::assert_eq!(actual_text, expected_text);
-    pretty_assertions::assert_eq!(actual_row_infos, expected_row_infos);
-
-    for _ in 0..5 {
-        let start_row = rng.random_range(0..=expected_row_infos.len());
-        assert_eq!(
-            snapshot
-                .row_infos(MultiBufferRow(start_row as u32))
-                .collect::<Vec<_>>(),
-            &expected_row_infos[start_row..],
-            "buffer_rows({})",
-            start_row
-        );
-    }
-
-    assert_eq!(
-        snapshot.widest_line_number(),
-        expected_row_infos
-            .into_iter()
-            .filter_map(|info| {
-                if info.diff_status.is_some_and(|status| status.is_deleted()) {
-                    None
-                } else {
-                    info.buffer_row
-                }
-            })
-            .max()
-            .unwrap()
-            + 1
-    );
-    let reference_ranges = reference
-        .excerpts
-        .iter()
-        .map(|excerpt| {
-            (
-                excerpt.id,
-                excerpt.range.to_offset(&excerpt.buffer.read(cx).snapshot()),
-            )
-        })
-        .collect::<HashMap<_, _>>();
-    for i in 0..snapshot.len().0 {
-        let excerpt = snapshot
-            .excerpt_containing(MultiBufferOffset(i)..MultiBufferOffset(i))
-            .unwrap();
-        assert_eq!(
-            excerpt.buffer_range().start.0..excerpt.buffer_range().end.0,
-            reference_ranges[&excerpt.id()]
-        );
-    }
-
-    assert_consistent_line_numbers(&snapshot);
-    assert_position_translation(&snapshot);
-
-    for (row, line) in expected_text.split('\n').enumerate() {
-        assert_eq!(
-            snapshot.line_len(MultiBufferRow(row as u32)),
-            line.len() as u32,
-            "line_len({}).",
-            row
-        );
-    }
-
-    let text_rope = Rope::from(expected_text.as_str());
-    for _ in 0..10 {
-        let end_ix = text_rope.clip_offset(rng.random_range(0..=text_rope.len()), Bias::Right);
-        let start_ix = text_rope.clip_offset(rng.random_range(0..=end_ix), Bias::Left);
-
-        let text_for_range = snapshot
-            .text_for_range(MultiBufferOffset(start_ix)..MultiBufferOffset(end_ix))
-            .collect::<String>();
-        assert_eq!(
-            text_for_range,
-            &expected_text[start_ix..end_ix],
-            "incorrect text for range {:?}",
-            start_ix..end_ix
-        );
-
-        let expected_summary =
-            MBTextSummary::from(TextSummary::from(&expected_text[start_ix..end_ix]));
-        assert_eq!(
-            snapshot.text_summary_for_range::<MBTextSummary, _>(
-                MultiBufferOffset(start_ix)..MultiBufferOffset(end_ix)
-            ),
-            expected_summary,
-            "incorrect summary for range {:?}",
-            start_ix..end_ix
-        );
-    }
-
-    // Anchor resolution
-    let summaries = snapshot.summaries_for_anchors::<MultiBufferOffset, _>(anchors);
-    assert_eq!(anchors.len(), summaries.len());
-    for (anchor, resolved_offset) in anchors.iter().zip(summaries) {
-        assert!(resolved_offset <= snapshot.len());
-        assert_eq!(
-            snapshot.summary_for_anchor::<MultiBufferOffset>(anchor),
-            resolved_offset,
-            "anchor: {:?}",
-            anchor
-        );
-    }
-
-    for _ in 0..10 {
-        let end_ix = text_rope.clip_offset(rng.random_range(0..=text_rope.len()), Bias::Right);
-        assert_eq!(
-            snapshot
-                .reversed_chars_at(MultiBufferOffset(end_ix))
-                .collect::<String>(),
-            expected_text[..end_ix].chars().rev().collect::<String>(),
-        );
-    }
-
-    for _ in 0..10 {
-        let end_ix = rng.random_range(0..=text_rope.len());
-        let end_ix = text_rope.floor_char_boundary(end_ix);
-        let start_ix = rng.random_range(0..=end_ix);
-        let start_ix = text_rope.floor_char_boundary(start_ix);
-        assert_eq!(
-            snapshot
-                .bytes_in_range(MultiBufferOffset(start_ix)..MultiBufferOffset(end_ix))
-                .flatten()
-                .copied()
-                .collect::<Vec<_>>(),
-            expected_text.as_bytes()[start_ix..end_ix].to_vec(),
-            "bytes_in_range({:?})",
-            start_ix..end_ix,
-        );
-    }
-}
-
-fn check_multibuffer_edits(
-    snapshot: &MultiBufferSnapshot,
-    old_snapshot: &MultiBufferSnapshot,
-    subscription: Subscription<MultiBufferOffset>,
-) {
-    let edits = subscription.consume().into_inner();
-
-    log::info!(
-        "applying subscription edits to old text: {:?}: {:#?}",
-        old_snapshot.text(),
-        edits,
-    );
-
-    let mut text = old_snapshot.text();
-    for edit in edits {
-        let new_text: String = snapshot
-            .text_for_range(edit.new.start..edit.new.end)
-            .collect();
-        text.replace_range(
-            (edit.new.start.0..edit.new.start.0 + (edit.old.end.0 - edit.old.start.0)).clone(),
-            &new_text,
-        );
-        pretty_assertions::assert_eq!(
-            &text[0..edit.new.end.0],
-            snapshot
-                .text_for_range(MultiBufferOffset(0)..edit.new.end)
-                .collect::<String>()
-        );
-    }
-    pretty_assertions::assert_eq!(text, snapshot.text());
-}
-
-#[gpui::test]
-fn test_history(cx: &mut App) {
-    let test_settings = SettingsStore::test(cx);
-    cx.set_global(test_settings);
-
-    let group_interval: Duration = Duration::from_millis(1);
-    let buffer_1 = cx.new(|cx| {
-        let mut buf = Buffer::local("1234", cx);
-        buf.set_group_interval(group_interval);
-        buf
-    });
-    let buffer_2 = cx.new(|cx| {
-        let mut buf = Buffer::local("5678", cx);
-        buf.set_group_interval(group_interval);
-        buf
-    });
-    let multibuffer = cx.new(|_| MultiBuffer::new(Capability::ReadWrite));
-    multibuffer.update(cx, |this, _| {
-        this.set_group_interval(group_interval);
-    });
-    multibuffer.update(cx, |multibuffer, cx| {
-        multibuffer.push_excerpts(
-            buffer_1.clone(),
-            [ExcerptRange::new(0..buffer_1.read(cx).len())],
-            cx,
-        );
-        multibuffer.push_excerpts(
-            buffer_2.clone(),
-            [ExcerptRange::new(0..buffer_2.read(cx).len())],
-            cx,
-        );
-    });
-
-    let mut now = Instant::now();
-
-    multibuffer.update(cx, |multibuffer, cx| {
-        let transaction_1 = multibuffer.start_transaction_at(now, cx).unwrap();
-        multibuffer.edit(
-            [
-                (Point::new(0, 0)..Point::new(0, 0), "A"),
-                (Point::new(1, 0)..Point::new(1, 0), "A"),
-            ],
-            None,
-            cx,
-        );
-        multibuffer.edit(
-            [
-                (Point::new(0, 1)..Point::new(0, 1), "B"),
-                (Point::new(1, 1)..Point::new(1, 1), "B"),
-            ],
-            None,
-            cx,
-        );
-        multibuffer.end_transaction_at(now, cx);
-        assert_eq!(multibuffer.read(cx).text(), "AB1234\nAB5678");
-
-        // Verify edited ranges for transaction 1
-        assert_eq!(
-            multibuffer.edited_ranges_for_transaction(transaction_1, cx),
-            &[
-                Point::new(0, 0)..Point::new(0, 2),
-                Point::new(1, 0)..Point::new(1, 2)
-            ]
-        );
-
-        // Edit buffer 1 through the multibuffer
-        now += 2 * group_interval;
-        multibuffer.start_transaction_at(now, cx);
-        multibuffer.edit(
-            [(MultiBufferOffset(2)..MultiBufferOffset(2), "C")],
-            None,
-            cx,
-        );
-        multibuffer.end_transaction_at(now, cx);
-        assert_eq!(multibuffer.read(cx).text(), "ABC1234\nAB5678");
-
-        // Edit buffer 1 independently
-        buffer_1.update(cx, |buffer_1, cx| {
-            buffer_1.start_transaction_at(now);
-            buffer_1.edit([(3..3, "D")], None, cx);
-            buffer_1.end_transaction_at(now, cx);
-
-            now += 2 * group_interval;
-            buffer_1.start_transaction_at(now);
-            buffer_1.edit([(4..4, "E")], None, cx);
-            buffer_1.end_transaction_at(now, cx);
-        });
-        assert_eq!(multibuffer.read(cx).text(), "ABCDE1234\nAB5678");
-
-        // An undo in the multibuffer undoes the multibuffer transaction
-        // and also any individual buffer edits that have occurred since
-        // that transaction.
-        multibuffer.undo(cx);
-        assert_eq!(multibuffer.read(cx).text(), "AB1234\nAB5678");
-
-        multibuffer.undo(cx);
-        assert_eq!(multibuffer.read(cx).text(), "1234\n5678");
-
-        multibuffer.redo(cx);
-        assert_eq!(multibuffer.read(cx).text(), "AB1234\nAB5678");
-
-        multibuffer.redo(cx);
-        assert_eq!(multibuffer.read(cx).text(), "ABCDE1234\nAB5678");
-
-        // Undo buffer 2 independently.
-        buffer_2.update(cx, |buffer_2, cx| buffer_2.undo(cx));
-        assert_eq!(multibuffer.read(cx).text(), "ABCDE1234\n5678");
-
-        // An undo in the multibuffer undoes the components of the
-        // the last multibuffer transaction that are not already undone.
-        multibuffer.undo(cx);
-        assert_eq!(multibuffer.read(cx).text(), "AB1234\n5678");
-
-        multibuffer.undo(cx);
-        assert_eq!(multibuffer.read(cx).text(), "1234\n5678");
-
-        multibuffer.redo(cx);
-        assert_eq!(multibuffer.read(cx).text(), "AB1234\nAB5678");
-
-        buffer_1.update(cx, |buffer_1, cx| buffer_1.redo(cx));
-        assert_eq!(multibuffer.read(cx).text(), "ABCD1234\nAB5678");
-
-        // Redo stack gets cleared after an edit.
-        now += 2 * group_interval;
-        multibuffer.start_transaction_at(now, cx);
-        multibuffer.edit(
-            [(MultiBufferOffset(0)..MultiBufferOffset(0), "X")],
-            None,
-            cx,
-        );
-        multibuffer.end_transaction_at(now, cx);
-        assert_eq!(multibuffer.read(cx).text(), "XABCD1234\nAB5678");
-        multibuffer.redo(cx);
-        assert_eq!(multibuffer.read(cx).text(), "XABCD1234\nAB5678");
-        multibuffer.undo(cx);
-        assert_eq!(multibuffer.read(cx).text(), "ABCD1234\nAB5678");
-        multibuffer.undo(cx);
-        assert_eq!(multibuffer.read(cx).text(), "1234\n5678");
-
-        // Transactions can be grouped manually.
-        multibuffer.redo(cx);
-        multibuffer.redo(cx);
-        assert_eq!(multibuffer.read(cx).text(), "XABCD1234\nAB5678");
-        multibuffer.group_until_transaction(transaction_1, cx);
-        multibuffer.undo(cx);
-        assert_eq!(multibuffer.read(cx).text(), "1234\n5678");
-        multibuffer.redo(cx);
-        assert_eq!(multibuffer.read(cx).text(), "XABCD1234\nAB5678");
-    });
-}
-
-#[gpui::test]
-async fn test_enclosing_indent(cx: &mut TestAppContext) {
-    async fn enclosing_indent(
-        text: &str,
-        buffer_row: u32,
-        cx: &mut TestAppContext,
-    ) -> Option<(Range<u32>, LineIndent)> {
-        let buffer = cx.update(|cx| MultiBuffer::build_simple(text, cx));
-        let snapshot = cx.read(|cx| buffer.read(cx).snapshot(cx));
-        let (range, indent) = snapshot
-            .enclosing_indent(MultiBufferRow(buffer_row))
-            .await?;
-        Some((range.start.0..range.end.0, indent))
-    }
-
-    assert_eq!(
-        enclosing_indent(
-            indoc!(
-                "
-                fn b() {
-                    if c {
-                        let d = 2;
-                    }
-                }
-                "
-            ),
-            1,
-            cx,
-        )
-        .await,
-        Some((
-            1..2,
-            LineIndent {
-                tabs: 0,
-                spaces: 4,
-                line_blank: false,
-            }
-        ))
-    );
-
-    assert_eq!(
-        enclosing_indent(
-            indoc!(
-                "
-                fn b() {
-                    if c {
-                        let d = 2;
-                    }
-                }
-                "
-            ),
-            2,
-            cx,
-        )
-        .await,
-        Some((
-            1..2,
-            LineIndent {
-                tabs: 0,
-                spaces: 4,
-                line_blank: false,
-            }
-        ))
-    );
-
-    assert_eq!(
-        enclosing_indent(
-            indoc!(
-                "
-                fn b() {
-                    if c {
-                        let d = 2;
-
-                        let e = 5;
-                    }
-                }
-                "
-            ),
-            3,
-            cx,
-        )
-        .await,
-        Some((
-            1..4,
-            LineIndent {
-                tabs: 0,
-                spaces: 4,
-                line_blank: false,
-            }
-        ))
-    );
-}
-
-#[gpui::test]
-async fn test_summaries_for_anchors(cx: &mut TestAppContext) {
-    let base_text_1 = indoc!(
-        "
-        bar
-        "
-    );
-    let text_1 = indoc!(
-        "
-        BAR
-        "
-    );
-    let base_text_2 = indoc!(
-        "
-        foo
-        "
-    );
-    let text_2 = indoc!(
-        "
-        FOO
-        "
-    );
-
-    let buffer_1 = cx.new(|cx| Buffer::local(text_1, cx));
-    let buffer_2 = cx.new(|cx| Buffer::local(text_2, cx));
-    let diff_1 = cx.new(|cx| BufferDiff::new_with_base_text(base_text_1, &buffer_1, cx));
-    let diff_2 = cx.new(|cx| BufferDiff::new_with_base_text(base_text_2, &buffer_2, cx));
-    cx.run_until_parked();
-
-    let mut ids = vec![];
-    let multibuffer = cx.new(|cx| {
-        let mut multibuffer = MultiBuffer::new(Capability::ReadWrite);
-        multibuffer.set_all_diff_hunks_expanded(cx);
-        ids.extend(multibuffer.push_excerpts(
-            buffer_1.clone(),
-            [ExcerptRange::new(text::Anchor::MIN..text::Anchor::MAX)],
-            cx,
-        ));
-        ids.extend(multibuffer.push_excerpts(
-            buffer_2.clone(),
-            [ExcerptRange::new(text::Anchor::MIN..text::Anchor::MAX)],
-            cx,
-        ));
-        multibuffer.add_diff(diff_1.clone(), cx);
-        multibuffer.add_diff(diff_2.clone(), cx);
-        multibuffer
-    });
-
-    let (mut snapshot, mut subscription) = multibuffer.update(cx, |multibuffer, cx| {
-        (multibuffer.snapshot(cx), multibuffer.subscribe())
-    });
-
-    assert_new_snapshot(
-        &multibuffer,
-        &mut snapshot,
-        &mut subscription,
-        cx,
-        indoc!(
-            "
-            - bar
-            + BAR
-
-            - foo
-            + FOO
-            "
-        ),
-    );
-
-    let anchor_1 = Anchor::in_buffer(ids[0], text::Anchor::MIN);
-    let point_1 = snapshot.summaries_for_anchors::<Point, _>([&anchor_1])[0];
-    assert_eq!(point_1, Point::new(0, 0));
-
-    let anchor_2 = Anchor::in_buffer(ids[1], text::Anchor::MIN);
-    let point_2 = snapshot.summaries_for_anchors::<Point, _>([&anchor_2])[0];
-    assert_eq!(point_2, Point::new(3, 0));
-}
-
-#[gpui::test]
-async fn test_trailing_deletion_without_newline(cx: &mut TestAppContext) {
-    let base_text_1 = "one\ntwo".to_owned();
-    let text_1 = "one\n".to_owned();
-
-    let buffer_1 = cx.new(|cx| Buffer::local(text_1, cx));
-    let diff_1 = cx.new(|cx| BufferDiff::new_with_base_text(&base_text_1, &buffer_1, cx));
-    cx.run_until_parked();
-
-    let multibuffer = cx.new(|cx| {
-        let mut multibuffer = MultiBuffer::singleton(buffer_1.clone(), cx);
-        multibuffer.add_diff(diff_1.clone(), cx);
-        multibuffer.expand_diff_hunks(vec![Anchor::min()..Anchor::max()], cx);
-        multibuffer
-    });
-
-    let (mut snapshot, mut subscription) = multibuffer.update(cx, |multibuffer, cx| {
-        (multibuffer.snapshot(cx), multibuffer.subscribe())
-    });
-
-    assert_new_snapshot(
-        &multibuffer,
-        &mut snapshot,
-        &mut subscription,
-        cx,
-        indoc!(
-            "
-              one
-            - two
-            "
-        ),
-    );
-
-    assert_eq!(snapshot.max_point(), Point::new(2, 0));
-    assert_eq!(snapshot.len().0, 8);
-
-    assert_eq!(
-        snapshot
-            .dimensions_from_points::<Point>([Point::new(2, 0)])
-            .collect::<Vec<_>>(),
-        vec![Point::new(2, 0)]
-    );
-
-    let (_, translated_offset) = snapshot.point_to_buffer_offset(Point::new(2, 0)).unwrap();
-    assert_eq!(translated_offset.0, "one\n".len());
-    let (_, translated_point, _) = snapshot.point_to_buffer_point(Point::new(2, 0)).unwrap();
-    assert_eq!(translated_point, Point::new(1, 0));
-
-    // The same, for an excerpt that's not at the end of the multibuffer.
-
-    let text_2 = "foo\n".to_owned();
-    let buffer_2 = cx.new(|cx| Buffer::local(&text_2, cx));
-    multibuffer.update(cx, |multibuffer, cx| {
-        multibuffer.push_excerpts(
-            buffer_2.clone(),
-            [ExcerptRange::new(Point::new(0, 0)..Point::new(1, 0))],
-            cx,
-        );
-    });
-
-    assert_new_snapshot(
-        &multibuffer,
-        &mut snapshot,
-        &mut subscription,
-        cx,
-        indoc!(
-            "
-              one
-            - two
-
-              foo
-            "
-        ),
-    );
-
-    assert_eq!(
-        snapshot
-            .dimensions_from_points::<Point>([Point::new(2, 0)])
-            .collect::<Vec<_>>(),
-        vec![Point::new(2, 0)]
-    );
-
-    let buffer_1_id = buffer_1.read_with(cx, |buffer_1, _| buffer_1.remote_id());
-    let (buffer, translated_offset) = snapshot.point_to_buffer_offset(Point::new(2, 0)).unwrap();
-    assert_eq!(buffer.remote_id(), buffer_1_id);
-    assert_eq!(translated_offset.0, "one\n".len());
-    let (buffer, translated_point, _) = snapshot.point_to_buffer_point(Point::new(2, 0)).unwrap();
-    assert_eq!(buffer.remote_id(), buffer_1_id);
-    assert_eq!(translated_point, Point::new(1, 0));
-}
-
-fn format_diff(
-    text: &str,
-    row_infos: &Vec<RowInfo>,
-    boundary_rows: &HashSet<MultiBufferRow>,
-    has_diff: Option<bool>,
-) -> String {
-    let has_diff =
-        has_diff.unwrap_or_else(|| row_infos.iter().any(|info| info.diff_status.is_some()));
-    text.split('\n')
-        .enumerate()
-        .zip(row_infos)
-        .map(|((ix, line), info)| {
-            let marker = match info.diff_status.map(|status| status.kind) {
-                Some(DiffHunkStatusKind::Added) => "+ ",
-                Some(DiffHunkStatusKind::Deleted) => "- ",
-                Some(DiffHunkStatusKind::Modified) => unreachable!(),
-                None => {
-                    if has_diff && !line.is_empty() {
-                        "  "
-                    } else {
-                        ""
-                    }
-                }
-            };
-            let boundary_row = if boundary_rows.contains(&MultiBufferRow(ix as u32)) {
-                if has_diff {
-                    "  ----------\n"
-                } else {
-                    "---------\n"
-                }
-            } else {
-                ""
-            };
-            let expand = info
-                .expand_info
-                .map(|expand_info| match expand_info.direction {
-                    ExpandExcerptDirection::Up => " [↑]",
-                    ExpandExcerptDirection::Down => " [↓]",
-                    ExpandExcerptDirection::UpAndDown => " [↕]",
-                })
-                .unwrap_or_default();
-
-            format!("{boundary_row}{marker}{line}{expand}")
-            // let mbr = info
-            //     .multibuffer_row
-            //     .map(|row| format!("{:0>3}", row.0))
-            //     .unwrap_or_else(|| "???".to_string());
-            // let byte_range = format!("{byte_range_start:0>3}..{byte_range_end:0>3}");
-            // format!("{boundary_row}Row: {mbr}, Bytes: {byte_range} | {marker}{line}{expand}")
-        })
-        .collect::<Vec<_>>()
-        .join("\n")
-}
-
-// fn format_transforms(snapshot: &MultiBufferSnapshot) -> String {
-//     snapshot
-//         .diff_transforms
-//         .iter()
-//         .map(|transform| {
-//             let (kind, summary) = match transform {
-//                 DiffTransform::DeletedHunk { summary, .. } => ("   Deleted", (*summary).into()),
-//                 DiffTransform::FilteredInsertedHunk { summary, .. } => ("  Filtered", *summary),
-//                 DiffTransform::InsertedHunk { summary, .. } => ("  Inserted", *summary),
-//                 DiffTransform::Unmodified { summary, .. } => ("Unmodified", *summary),
-//             };
-//             format!("{kind}(len: {}, lines: {:?})", summary.len, summary.lines)
-//         })
-//         .join("\n")
-// }
-
-// fn format_excerpts(snapshot: &MultiBufferSnapshot) -> String {
-//     snapshot
-//         .excerpts
-//         .iter()
-//         .map(|excerpt| {
-//             format!(
-//                 "Excerpt(buffer_range = {:?}, lines = {:?}, has_trailing_newline = {:?})",
-//                 excerpt.range.context.to_point(&excerpt.buffer),
-//                 excerpt.text_summary.lines,
-//                 excerpt.has_trailing_newline
-//             )
-//         })
-//         .join("\n")
-// }
-
-#[gpui::test]
-async fn test_basic_filtering(cx: &mut TestAppContext) {
-    let text = indoc!(
-        "
-        ZERO
-        one
-        TWO
-        three
-        six
-        "
-    );
-    let base_text = indoc!(
-        "
-        one
-        two
-        three
-        four
-        five
-        six
-        "
-    );
-
-    let buffer = cx.new(|cx| Buffer::local(text, cx));
-    let diff = cx.new(|cx| BufferDiff::new_with_base_text(base_text, &buffer, cx));
-    cx.run_until_parked();
-
-    let multibuffer = cx.new(|cx| {
-        let mut multibuffer = MultiBuffer::singleton(buffer.clone(), cx);
-        multibuffer.add_diff(diff.clone(), cx);
-        multibuffer.set_all_diff_hunks_expanded(cx);
-        multibuffer.set_filter_mode(Some(MultiBufferFilterMode::KeepDeletions));
-        multibuffer
-    });
-
-    let (mut snapshot, mut subscription) = multibuffer.update(cx, |multibuffer, cx| {
-        (multibuffer.snapshot(cx), multibuffer.subscribe())
-    });
-
-    assert_eq!(snapshot.text(), base_text);
-    assert_new_snapshot(
-        &multibuffer,
-        &mut snapshot,
-        &mut subscription,
-        cx,
-        indoc!(
-            "
-              one
-            - two
-              three
-            - four
-            - five
-              six
-            "
-        ),
-    );
-
-    buffer.update(cx, |buffer, cx| {
-        buffer.edit_via_marked_text(
-            indoc!(
-                "
-                ZERO
-                one
-                «<inserted>»W«O
-                T»hree
-                six
-                "
-            ),
-            None,
-            cx,
-        );
-    });
-    assert_new_snapshot(
-        &multibuffer,
-        &mut snapshot,
-        &mut subscription,
-        cx,
-        indoc! {
-            "
-              one
-            - two
-            - four
-            - five
-              six
-            "
-        },
-    );
-}
-
-#[gpui::test]
-async fn test_base_text_line_numbers(cx: &mut TestAppContext) {
-    let base_text = indoc! {"
-        one
-        two
-        three
-        four
-        five
-        six
-    "};
-    let buffer_text = indoc! {"
-        two
-        THREE
-        five
-        six
-        SEVEN
-    "};
-    let multibuffer = cx.update(|cx| MultiBuffer::build_simple(buffer_text, cx));
-    multibuffer.update(cx, |multibuffer, cx| {
-        let buffer = multibuffer.all_buffers().into_iter().next().unwrap();
-        let diff = cx.new(|cx| BufferDiff::new_with_base_text(base_text, &buffer, cx));
-        multibuffer.set_all_diff_hunks_expanded(cx);
-        multibuffer.add_diff(diff, cx);
-    });
-    let (mut snapshot, mut subscription) = multibuffer.update(cx, |multibuffer, cx| {
-        (multibuffer.snapshot(cx), multibuffer.subscribe())
-    });
-
-    assert_new_snapshot(
-        &multibuffer,
-        &mut snapshot,
-        &mut subscription,
-        cx,
-        indoc! {"
-            - one
-              two
-            - three
-            - four
-            + THREE
-              five
-              six
-            + SEVEN
-        "},
-    );
-    let base_text_rows = snapshot
-        .row_infos(MultiBufferRow(0))
-        .map(|row_info| row_info.base_text_row)
-        .collect::<Vec<_>>();
-    pretty_assertions::assert_eq!(
-        base_text_rows,
-        vec![
-            Some(BaseTextRow(0)),
-            Some(BaseTextRow(1)),
-            Some(BaseTextRow(2)),
-            Some(BaseTextRow(3)),
-            None,
-            Some(BaseTextRow(4)),
-            Some(BaseTextRow(5)),
-            None,
-            Some(BaseTextRow(6)),
-        ]
-    )
-}
-
-#[track_caller]
-fn assert_excerpts_match(
-    multibuffer: &Entity<MultiBuffer>,
-    cx: &mut TestAppContext,
-    expected: &str,
-) {
-    let mut output = String::new();
-    multibuffer.read_with(cx, |multibuffer, cx| {
-        for (_, buffer, range) in multibuffer.snapshot(cx).excerpts() {
-            output.push_str("-----\n");
-            output.extend(buffer.text_for_range(range.context));
-            if !output.ends_with('\n') {
-                output.push('\n');
-            }
-        }
-    });
-    assert_eq!(output, expected);
-}
-
-#[track_caller]
-fn assert_new_snapshot(
-    multibuffer: &Entity<MultiBuffer>,
-    snapshot: &mut MultiBufferSnapshot,
-    subscription: &mut Subscription<MultiBufferOffset>,
-    cx: &mut TestAppContext,
-    expected_diff: &str,
-) {
-    let new_snapshot = multibuffer.read_with(cx, |multibuffer, cx| multibuffer.snapshot(cx));
-    let actual_text = new_snapshot.text();
-    let line_infos = new_snapshot
-        .row_infos(MultiBufferRow(0))
-        .collect::<Vec<_>>();
-    let actual_diff = format_diff(&actual_text, &line_infos, &Default::default(), None);
-    pretty_assertions::assert_eq!(actual_diff, expected_diff);
-    check_edits(
-        snapshot,
-        &new_snapshot,
-        &subscription.consume().into_inner(),
-    );
-    *snapshot = new_snapshot;
-}
-
-#[track_caller]
-fn check_edits(
-    old_snapshot: &MultiBufferSnapshot,
-    new_snapshot: &MultiBufferSnapshot,
-    edits: &[Edit<MultiBufferOffset>],
-) {
-    let mut text = old_snapshot.text();
-    let new_text = new_snapshot.text();
-    for edit in edits.iter().rev() {
-        if !text.is_char_boundary(edit.old.start.0)
-            || !text.is_char_boundary(edit.old.end.0)
-            || !new_text.is_char_boundary(edit.new.start.0)
-            || !new_text.is_char_boundary(edit.new.end.0)
-        {
-            panic!(
-                "invalid edits: {:?}\nold text: {:?}\nnew text: {:?}",
-                edits, text, new_text
-            );
-        }
-
-        text.replace_range(
-            edit.old.start.0..edit.old.end.0,
-            &new_text[edit.new.start.0..edit.new.end.0],
-        );
-    }
-
-    pretty_assertions::assert_eq!(text, new_text, "invalid edits: {:?}", edits);
-}
-
-#[track_caller]
-fn assert_chunks_in_ranges(snapshot: &MultiBufferSnapshot) {
-    let full_text = snapshot.text();
-    for ix in 0..full_text.len() {
-        let mut chunks = snapshot.chunks(MultiBufferOffset(0)..snapshot.len(), false);
-        chunks.seek(MultiBufferOffset(ix)..snapshot.len());
-        let tail = chunks.map(|chunk| chunk.text).collect::<String>();
-        assert_eq!(tail, &full_text[ix..], "seek to range: {:?}", ix..);
-    }
-}
-
-#[track_caller]
-fn assert_consistent_line_numbers(snapshot: &MultiBufferSnapshot) {
-    let all_line_numbers = snapshot.row_infos(MultiBufferRow(0)).collect::<Vec<_>>();
-    for start_row in 1..all_line_numbers.len() {
-        let line_numbers = snapshot
-            .row_infos(MultiBufferRow(start_row as u32))
-            .collect::<Vec<_>>();
-        assert_eq!(
-            line_numbers,
-            all_line_numbers[start_row..],
-            "start_row: {start_row}"
-        );
-    }
-}
-
-#[track_caller]
-fn assert_position_translation(snapshot: &MultiBufferSnapshot) {
-    let text = Rope::from(snapshot.text());
-
-    let mut left_anchors = Vec::new();
-    let mut right_anchors = Vec::new();
-    let mut offsets = Vec::new();
-    let mut points = Vec::new();
-    for offset in 0..=text.len() + 1 {
-        let offset = MultiBufferOffset(offset);
-        let clipped_left = snapshot.clip_offset(offset, Bias::Left);
-        let clipped_right = snapshot.clip_offset(offset, Bias::Right);
-        assert_eq!(
-            clipped_left.0,
-            text.clip_offset(offset.0, Bias::Left),
-            "clip_offset({offset:?}, Left)"
-        );
-        assert_eq!(
-            clipped_right.0,
-            text.clip_offset(offset.0, Bias::Right),
-            "clip_offset({offset:?}, Right)"
-        );
-        assert_eq!(
-            snapshot.offset_to_point(clipped_left),
-            text.offset_to_point(clipped_left.0),
-            "offset_to_point({})",
-            clipped_left.0
-        );
-        assert_eq!(
-            snapshot.offset_to_point(clipped_right),
-            text.offset_to_point(clipped_right.0),
-            "offset_to_point({})",
-            clipped_right.0
-        );
-        let anchor_after = snapshot.anchor_after(clipped_left);
-        assert_eq!(
-            anchor_after.to_offset(snapshot),
-            clipped_left,
-            "anchor_after({}).to_offset {anchor_after:?}",
-            clipped_left.0
-        );
-        let anchor_before = snapshot.anchor_before(clipped_left);
-        assert_eq!(
-            anchor_before.to_offset(snapshot),
-            clipped_left,
-            "anchor_before({}).to_offset",
-            clipped_left.0
-        );
-        left_anchors.push(anchor_before);
-        right_anchors.push(anchor_after);
-        offsets.push(clipped_left);
-        points.push(text.offset_to_point(clipped_left.0));
-    }
-
-    for row in 0..text.max_point().row {
-        for column in 0..text.line_len(row) + 1 {
-            let point = Point { row, column };
-            let clipped_left = snapshot.clip_point(point, Bias::Left);
-            let clipped_right = snapshot.clip_point(point, Bias::Right);
-            assert_eq!(
-                clipped_left,
-                text.clip_point(point, Bias::Left),
-                "clip_point({point:?}, Left)"
-            );
-            assert_eq!(
-                clipped_right,
-                text.clip_point(point, Bias::Right),
-                "clip_point({point:?}, Right)"
-            );
-            assert_eq!(
-                snapshot.point_to_offset(clipped_left).0,
-                text.point_to_offset(clipped_left),
-                "point_to_offset({clipped_left:?})"
-            );
-            assert_eq!(
-                snapshot.point_to_offset(clipped_right).0,
-                text.point_to_offset(clipped_right),
-                "point_to_offset({clipped_right:?})"
-            );
-        }
-    }
-
-    assert_eq!(
-        snapshot.summaries_for_anchors::<MultiBufferOffset, _>(&left_anchors),
-        offsets,
-        "left_anchors <-> offsets"
-    );
-    assert_eq!(
-        snapshot.summaries_for_anchors::<Point, _>(&left_anchors),
-        points,
-        "left_anchors <-> points"
-    );
-    assert_eq!(
-        snapshot.summaries_for_anchors::<MultiBufferOffset, _>(&right_anchors),
-        offsets,
-        "right_anchors <-> offsets"
-    );
-    assert_eq!(
-        snapshot.summaries_for_anchors::<Point, _>(&right_anchors),
-        points,
-        "right_anchors <-> points"
-    );
-
-    for (anchors, bias) in [(&left_anchors, Bias::Left), (&right_anchors, Bias::Right)] {
-        for (ix, (offset, anchor)) in offsets.iter().zip(anchors).enumerate() {
-            if ix > 0 && *offset == MultiBufferOffset(252) && offset > &offsets[ix - 1] {
-                let prev_anchor = left_anchors[ix - 1];
-                assert!(
-                    anchor.cmp(&prev_anchor, snapshot).is_gt(),
-                    "anchor({}, {bias:?}).cmp(&anchor({}, {bias:?}).is_gt()",
-                    offsets[ix],
-                    offsets[ix - 1],
-                );
-                assert!(
-                    prev_anchor.cmp(anchor, snapshot).is_lt(),
-                    "anchor({}, {bias:?}).cmp(&anchor({}, {bias:?}).is_lt()",
-                    offsets[ix - 1],
-                    offsets[ix],
-                );
-            }
-        }
-    }
-
-    if let Some((buffer, offset)) = snapshot.point_to_buffer_offset(snapshot.max_point()) {
-        assert!(offset.0 <= buffer.len());
-    }
-    if let Some((buffer, point, _)) = snapshot.point_to_buffer_point(snapshot.max_point()) {
-        assert!(point <= buffer.max_point());
-    }
-}
-
-fn assert_line_indents(snapshot: &MultiBufferSnapshot) {
-    let max_row = snapshot.max_point().row;
-    let buffer_id = snapshot.excerpts().next().unwrap().1.remote_id();
-    let text = text::Buffer::new(ReplicaId::LOCAL, buffer_id, snapshot.text());
-    let mut line_indents = text
-        .line_indents_in_row_range(0..max_row + 1)
-        .collect::<Vec<_>>();
-    for start_row in 0..snapshot.max_point().row {
-        pretty_assertions::assert_eq!(
-            snapshot
-                .line_indents(MultiBufferRow(start_row), |_| true)
-                .map(|(row, indent, _)| (row.0, indent))
-                .collect::<Vec<_>>(),
-            &line_indents[(start_row as usize)..],
-            "line_indents({start_row})"
-        );
-    }
-
-    line_indents.reverse();
-    pretty_assertions::assert_eq!(
-        snapshot
-            .reversed_line_indents(MultiBufferRow(max_row), |_| true)
-            .map(|(row, indent, _)| (row.0, indent))
-            .collect::<Vec<_>>(),
-        &line_indents[..],
-        "reversed_line_indents({max_row})"
-    );
-}
-
-#[gpui::test]
-fn test_new_empty_buffer_uses_untitled_title(cx: &mut App) {
-    let buffer = cx.new(|cx| Buffer::local("", cx));
-    let multibuffer = cx.new(|cx| MultiBuffer::singleton(buffer.clone(), cx));
-
-    assert_eq!(multibuffer.read(cx).title(cx), "untitled");
-}
-
-#[gpui::test]
-fn test_new_empty_buffer_uses_untitled_title_when_only_contains_whitespace(cx: &mut App) {
-    let buffer = cx.new(|cx| Buffer::local("\n ", cx));
-    let multibuffer = cx.new(|cx| MultiBuffer::singleton(buffer.clone(), cx));
-
-    assert_eq!(multibuffer.read(cx).title(cx), "untitled");
-}
-
-#[gpui::test]
-fn test_new_empty_buffer_takes_first_line_for_title(cx: &mut App) {
-    let buffer = cx.new(|cx| Buffer::local("Hello World\nSecond line", cx));
-    let multibuffer = cx.new(|cx| MultiBuffer::singleton(buffer.clone(), cx));
-
-    assert_eq!(multibuffer.read(cx).title(cx), "Hello World");
-}
-
-#[gpui::test]
-fn test_new_empty_buffer_takes_trimmed_first_line_for_title(cx: &mut App) {
-    let buffer = cx.new(|cx| Buffer::local("\nHello, World ", cx));
-    let multibuffer = cx.new(|cx| MultiBuffer::singleton(buffer.clone(), cx));
-
-    assert_eq!(multibuffer.read(cx).title(cx), "Hello, World");
-}
-
-#[gpui::test]
-fn test_new_empty_buffer_uses_truncated_first_line_for_title(cx: &mut App) {
-    let title = "aaaaaaaaaabbbbbbbbbbccccccccccddddddddddeeeeeeeeee";
-    let title_after = "aaaaaaaaaabbbbbbbbbbccccccccccdddddddddd";
-    let buffer = cx.new(|cx| Buffer::local(title, cx));
-    let multibuffer = cx.new(|cx| MultiBuffer::singleton(buffer.clone(), cx));
-
-    assert_eq!(multibuffer.read(cx).title(cx), title_after);
-}
-
-#[gpui::test]
-fn test_new_empty_buffer_uses_truncated_first_line_for_title_after_merging_adjacent_spaces(
-    cx: &mut App,
-) {
-    let title = "aaaaaaaaaabbbbbbbbbb    ccccccccccddddddddddeeeeeeeeee";
-    let title_after = "aaaaaaaaaabbbbbbbbbb ccccccccccddddddddd";
-    let buffer = cx.new(|cx| Buffer::local(title, cx));
-    let multibuffer = cx.new(|cx| MultiBuffer::singleton(buffer.clone(), cx));
-
-    assert_eq!(multibuffer.read(cx).title(cx), title_after);
-}
-
-#[gpui::test]
-fn test_new_empty_buffers_title_can_be_set(cx: &mut App) {
-    let buffer = cx.new(|cx| Buffer::local("Hello World", cx));
-    let multibuffer = cx.new(|cx| MultiBuffer::singleton(buffer.clone(), cx));
-    assert_eq!(multibuffer.read(cx).title(cx), "Hello World");
-
-    multibuffer.update(cx, |multibuffer, cx| {
-        multibuffer.set_title("Hey".into(), cx)
-    });
-    assert_eq!(multibuffer.read(cx).title(cx), "Hey");
-}
-
-#[gpui::test(iterations = 100)]
-fn test_random_chunk_bitmaps(cx: &mut App, mut rng: StdRng) {
-    let multibuffer = if rng.random() {
-        let len = rng.random_range(0..10000);
-        let text = RandomCharIter::new(&mut rng).take(len).collect::<String>();
-        let buffer = cx.new(|cx| Buffer::local(text, cx));
-        cx.new(|cx| MultiBuffer::singleton(buffer, cx))
-    } else {
-        MultiBuffer::build_random(&mut rng, cx)
-    };
-
-    let snapshot = multibuffer.read(cx).snapshot(cx);
-
-    let chunks = snapshot.chunks(MultiBufferOffset(0)..snapshot.len(), false);
-
-    for chunk in chunks {
-        let chunk_text = chunk.text;
-        let chars_bitmap = chunk.chars;
-        let tabs_bitmap = chunk.tabs;
-
-        if chunk_text.is_empty() {
-            assert_eq!(
-                chars_bitmap, 0,
-                "Empty chunk should have empty chars bitmap"
-            );
-            assert_eq!(tabs_bitmap, 0, "Empty chunk should have empty tabs bitmap");
-            continue;
-        }
-
-        assert!(
-            chunk_text.len() <= 128,
-            "Chunk text length {} exceeds 128 bytes",
-            chunk_text.len()
-        );
-
-        // Verify chars bitmap
-        let char_indices = chunk_text
-            .char_indices()
-            .map(|(i, _)| i)
-            .collect::<Vec<_>>();
-
-        for byte_idx in 0..chunk_text.len() {
-            let should_have_bit = char_indices.contains(&byte_idx);
-            let has_bit = chars_bitmap & (1 << byte_idx) != 0;
-
-            if has_bit != should_have_bit {
-                eprintln!("Chunk text bytes: {:?}", chunk_text.as_bytes());
-                eprintln!("Char indices: {:?}", char_indices);
-                eprintln!("Chars bitmap: {:#b}", chars_bitmap);
-            }
-
-            assert_eq!(
-                has_bit, should_have_bit,
-                "Chars bitmap mismatch at byte index {} in chunk {:?}. Expected bit: {}, Got bit: {}",
-                byte_idx, chunk_text, should_have_bit, has_bit
-            );
-        }
-
-        for (byte_idx, byte) in chunk_text.bytes().enumerate() {
-            let is_tab = byte == b'\t';
-            let has_bit = tabs_bitmap & (1 << byte_idx) != 0;
-
-            if has_bit != is_tab {
-                eprintln!("Chunk text bytes: {:?}", chunk_text.as_bytes());
-                eprintln!("Tabs bitmap: {:#b}", tabs_bitmap);
-                assert_eq!(
-                    has_bit, is_tab,
-                    "Tabs bitmap mismatch at byte index {} in chunk {:?}. Byte: {:?}, Expected bit: {}, Got bit: {}",
-                    byte_idx, chunk_text, byte as char, is_tab, has_bit
-                );
-            }
-        }
-    }
-}
-
-#[gpui::test(iterations = 10)]
-fn test_random_chunk_bitmaps_with_diffs(cx: &mut App, mut rng: StdRng) {
-    let settings_store = SettingsStore::test(cx);
-    cx.set_global(settings_store);
-    use buffer_diff::BufferDiff;
-    use util::RandomCharIter;
-
-    let multibuffer = if rng.random() {
-        let len = rng.random_range(100..10000);
-        let text = RandomCharIter::new(&mut rng).take(len).collect::<String>();
-        let buffer = cx.new(|cx| Buffer::local(text, cx));
-        cx.new(|cx| MultiBuffer::singleton(buffer, cx))
-    } else {
-        MultiBuffer::build_random(&mut rng, cx)
-    };
-
-    let _diff_count = rng.random_range(1..5);
-    let mut diffs = Vec::new();
-
-    multibuffer.update(cx, |multibuffer, cx| {
-        for buffer_id in multibuffer.excerpt_buffer_ids() {
-            if rng.random_bool(0.7) {
-                if let Some(buffer_handle) = multibuffer.buffer(buffer_id) {
-                    let buffer_text = buffer_handle.read(cx).text();
-                    let mut base_text = String::new();
-
-                    for line in buffer_text.lines() {
-                        if rng.random_bool(0.3) {
-                            continue;
-                        } else if rng.random_bool(0.3) {
-                            let line_len = rng.random_range(0..50);
-                            let modified_line = RandomCharIter::new(&mut rng)
-                                .take(line_len)
-                                .collect::<String>();
-                            base_text.push_str(&modified_line);
-                            base_text.push('\n');
-                        } else {
-                            base_text.push_str(line);
-                            base_text.push('\n');
-                        }
-                    }
-
-                    if rng.random_bool(0.5) {
-                        let extra_lines = rng.random_range(1..5);
-                        for _ in 0..extra_lines {
-                            let line_len = rng.random_range(0..50);
-                            let extra_line = RandomCharIter::new(&mut rng)
-                                .take(line_len)
-                                .collect::<String>();
-                            base_text.push_str(&extra_line);
-                            base_text.push('\n');
-                        }
-                    }
-
-                    let diff =
-                        cx.new(|cx| BufferDiff::new_with_base_text(&base_text, &buffer_handle, cx));
-                    diffs.push(diff.clone());
-                    multibuffer.add_diff(diff, cx);
-                }
-            }
-        }
-    });
-
-    multibuffer.update(cx, |multibuffer, cx| {
-        if rng.random_bool(0.5) {
-            multibuffer.set_all_diff_hunks_expanded(cx);
-        } else {
-            let snapshot = multibuffer.snapshot(cx);
-            let text = snapshot.text();
-
-            let mut ranges = Vec::new();
-            for _ in 0..rng.random_range(1..5) {
-                if snapshot.len().0 == 0 {
-                    break;
-                }
-
-                let diff_size = rng.random_range(5..1000);
-                let mut start = rng.random_range(0..snapshot.len().0);
-
-                while !text.is_char_boundary(start) {
-                    start = start.saturating_sub(1);
-                }
-
-                let mut end = rng.random_range(start..snapshot.len().0.min(start + diff_size));
-
-                while !text.is_char_boundary(end) {
-                    end = end.saturating_add(1);
-                }
-                let start_anchor = snapshot.anchor_after(MultiBufferOffset(start));
-                let end_anchor = snapshot.anchor_before(MultiBufferOffset(end));
-                ranges.push(start_anchor..end_anchor);
-            }
-            multibuffer.expand_diff_hunks(ranges, cx);
-        }
-    });
-
-    let snapshot = multibuffer.read(cx).snapshot(cx);
-
-    let chunks = snapshot.chunks(MultiBufferOffset(0)..snapshot.len(), false);
-
-    for chunk in chunks {
-        let chunk_text = chunk.text;
-        let chars_bitmap = chunk.chars;
-        let tabs_bitmap = chunk.tabs;
-
-        if chunk_text.is_empty() {
-            assert_eq!(
-                chars_bitmap, 0,
-                "Empty chunk should have empty chars bitmap"
-            );
-            assert_eq!(tabs_bitmap, 0, "Empty chunk should have empty tabs bitmap");
-            continue;
-        }
-
-        assert!(
-            chunk_text.len() <= 128,
-            "Chunk text length {} exceeds 128 bytes",
-            chunk_text.len()
-        );
-
-        let char_indices = chunk_text
-            .char_indices()
-            .map(|(i, _)| i)
-            .collect::<Vec<_>>();
-
-        for byte_idx in 0..chunk_text.len() {
-            let should_have_bit = char_indices.contains(&byte_idx);
-            let has_bit = chars_bitmap & (1 << byte_idx) != 0;
-
-            if has_bit != should_have_bit {
-                eprintln!("Chunk text bytes: {:?}", chunk_text.as_bytes());
-                eprintln!("Char indices: {:?}", char_indices);
-                eprintln!("Chars bitmap: {:#b}", chars_bitmap);
-            }
-
-            assert_eq!(
-                has_bit, should_have_bit,
-                "Chars bitmap mismatch at byte index {} in chunk {:?}. Expected bit: {}, Got bit: {}",
-                byte_idx, chunk_text, should_have_bit, has_bit
-            );
-        }
-
-        for (byte_idx, byte) in chunk_text.bytes().enumerate() {
-            let is_tab = byte == b'\t';
-            let has_bit = tabs_bitmap & (1 << byte_idx) != 0;
-
-            if has_bit != is_tab {
-                eprintln!("Chunk text bytes: {:?}", chunk_text.as_bytes());
-                eprintln!("Tabs bitmap: {:#b}", tabs_bitmap);
-                assert_eq!(
-                    has_bit, is_tab,
-                    "Tabs bitmap mismatch at byte index {} in chunk {:?}. Byte: {:?}, Expected bit: {}, Got bit: {}",
-                    byte_idx, chunk_text, byte as char, is_tab, has_bit
-                );
-            }
-        }
-    }
-}
-
-fn collect_word_diffs(
-    base_text: &str,
-    modified_text: &str,
-    cx: &mut TestAppContext,
-) -> Vec<String> {
-    let buffer = cx.new(|cx| Buffer::local(modified_text, cx));
-    let diff = cx.new(|cx| BufferDiff::new_with_base_text(base_text, &buffer, cx));
-    cx.run_until_parked();
-
-    let multibuffer = cx.new(|cx| {
-        let mut multibuffer = MultiBuffer::singleton(buffer.clone(), cx);
-        multibuffer.add_diff(diff.clone(), cx);
-        multibuffer
-    });
-
-    multibuffer.update(cx, |multibuffer, cx| {
-        multibuffer.expand_diff_hunks(vec![Anchor::min()..Anchor::max()], cx);
-    });
-
-    let snapshot = multibuffer.read_with(cx, |multibuffer, cx| multibuffer.snapshot(cx));
-    let text = snapshot.text();
-
-    snapshot
-        .diff_hunks()
-        .flat_map(|hunk| hunk.word_diffs)
-        .map(|range| text[range.start.0..range.end.0].to_string())
-        .collect()
-}
-
-#[gpui::test]
-async fn test_word_diff_simple_replacement(cx: &mut TestAppContext) {
-    let settings_store = cx.update(|cx| SettingsStore::test(cx));
-    cx.set_global(settings_store);
-
-    let base_text = "hello world foo bar\n";
-    let modified_text = "hello WORLD foo BAR\n";
-
-    let word_diffs = collect_word_diffs(base_text, modified_text, cx);
-
-    assert_eq!(word_diffs, vec!["world", "bar", "WORLD", "BAR"]);
-}
-
-#[gpui::test]
-async fn test_word_diff_consecutive_modified_lines(cx: &mut TestAppContext) {
-    let settings_store = cx.update(|cx| SettingsStore::test(cx));
-    cx.set_global(settings_store);
-
-    let base_text = "aaa bbb\nccc ddd\n";
-    let modified_text = "aaa BBB\nccc DDD\n";
-
-    let word_diffs = collect_word_diffs(base_text, modified_text, cx);
-
-    assert_eq!(
-        word_diffs,
-        vec!["bbb", "ddd", "BBB", "DDD"],
-        "consecutive modified lines should produce word diffs when line counts match"
-    );
-}
-
-#[gpui::test]
-async fn test_word_diff_modified_lines_with_deletion_between(cx: &mut TestAppContext) {
-    let settings_store = cx.update(|cx| SettingsStore::test(cx));
-    cx.set_global(settings_store);
-
-    let base_text = "aaa bbb\ndeleted line\nccc ddd\n";
-    let modified_text = "aaa BBB\nccc DDD\n";
-
-    let word_diffs = collect_word_diffs(base_text, modified_text, cx);
-
-    assert_eq!(
-        word_diffs,
-        Vec::<String>::new(),
-        "modified lines with a deleted line between should not produce word diffs"
-    );
-}
-
-#[gpui::test]
-async fn test_word_diff_disabled(cx: &mut TestAppContext) {
-    let settings_store = cx.update(|cx| {
-        let mut settings_store = SettingsStore::test(cx);
-        settings_store.update_user_settings(cx, |settings| {
-            settings.project.all_languages.defaults.word_diff_enabled = Some(false);
-        });
-        settings_store
-    });
-    cx.set_global(settings_store);
-
-    let base_text = "hello world\n";
-    let modified_text = "hello WORLD\n";
-
-    let word_diffs = collect_word_diffs(base_text, modified_text, cx);
-
-    assert_eq!(
-        word_diffs,
-        Vec::<String>::new(),
-        "word diffs should be empty when disabled"
-    );
-}
-
-/// Tests `excerpt_containing` and `excerpts_for_range` (functions mapping multi-buffer text-coordinates to excerpts)
-#[gpui::test]
-fn test_excerpts_containment_functions(cx: &mut App) {
-    // Multibuffer content for these tests:
-    //    0123
-    // 0: aa0
-    // 1: aa1
-    //    -----
-    // 2: bb0
-    // 3: bb1
-    //    -----MultiBufferOffset(0)..
-    // 4: cc0
-
-    let buffer_1 = cx.new(|cx| Buffer::local("aa0\naa1", cx));
-    let buffer_2 = cx.new(|cx| Buffer::local("bb0\nbb1", cx));
-    let buffer_3 = cx.new(|cx| Buffer::local("cc0", cx));
-
-    let multibuffer = cx.new(|_| MultiBuffer::new(Capability::ReadWrite));
-
-    let (excerpt_1_id, excerpt_2_id, excerpt_3_id) = multibuffer.update(cx, |multibuffer, cx| {
-        let excerpt_1_id = multibuffer.push_excerpts(
-            buffer_1.clone(),
-            [ExcerptRange::new(Point::new(0, 0)..Point::new(1, 3))],
-            cx,
-        )[0];
-
-        let excerpt_2_id = multibuffer.push_excerpts(
-            buffer_2.clone(),
-            [ExcerptRange::new(Point::new(0, 0)..Point::new(1, 3))],
-            cx,
-        )[0];
-
-        let excerpt_3_id = multibuffer.push_excerpts(
-            buffer_3.clone(),
-            [ExcerptRange::new(Point::new(0, 0)..Point::new(0, 3))],
-            cx,
-        )[0];
-
-        (excerpt_1_id, excerpt_2_id, excerpt_3_id)
-    });
-
-    let snapshot = multibuffer.read(cx).snapshot(cx);
-
-    assert_eq!(snapshot.text(), "aa0\naa1\nbb0\nbb1\ncc0");
-
-    //// Test `excerpts_for_range`
-
-    let p00 = snapshot.point_to_offset(Point::new(0, 0));
-    let p10 = snapshot.point_to_offset(Point::new(1, 0));
-    let p20 = snapshot.point_to_offset(Point::new(2, 0));
-    let p23 = snapshot.point_to_offset(Point::new(2, 3));
-    let p13 = snapshot.point_to_offset(Point::new(1, 3));
-    let p40 = snapshot.point_to_offset(Point::new(4, 0));
-    let p43 = snapshot.point_to_offset(Point::new(4, 3));
-
-    let excerpts: Vec<_> = snapshot.excerpts_for_range(p00..p00).collect();
-    assert_eq!(excerpts.len(), 1);
-    assert_eq!(excerpts[0].id, excerpt_1_id);
-
-    // Cursor at very end of excerpt 3
-    let excerpts: Vec<_> = snapshot.excerpts_for_range(p43..p43).collect();
-    assert_eq!(excerpts.len(), 1);
-    assert_eq!(excerpts[0].id, excerpt_3_id);
-
-    let excerpts: Vec<_> = snapshot.excerpts_for_range(p00..p23).collect();
-    assert_eq!(excerpts.len(), 2);
-    assert_eq!(excerpts[0].id, excerpt_1_id);
-    assert_eq!(excerpts[1].id, excerpt_2_id);
-
-    // This range represent an selection with end-point just inside excerpt_2
-    // Today we only expand the first excerpt, but another interpretation that
-    // we could consider is expanding both here
-    let excerpts: Vec<_> = snapshot.excerpts_for_range(p10..p20).collect();
-    assert_eq!(excerpts.len(), 1);
-    assert_eq!(excerpts[0].id, excerpt_1_id);
-
-    //// Test that `excerpts_for_range` and `excerpt_containing` agree for all single offsets (cursor positions)
-    for offset in 0..=snapshot.len().0 {
-        let offset = MultiBufferOffset(offset);
-        let excerpts_for_range: Vec<_> = snapshot.excerpts_for_range(offset..offset).collect();
-        assert_eq!(
-            excerpts_for_range.len(),
-            1,
-            "Expected exactly one excerpt for offset {offset}",
-        );
-
-        let excerpt_containing = snapshot.excerpt_containing(offset..offset);
-        assert!(
-            excerpt_containing.is_some(),
-            "Expected excerpt_containing to find excerpt for offset {offset}",
-        );
-
-        assert_eq!(
-            excerpts_for_range[0].id,
-            excerpt_containing.unwrap().id(),
-            "excerpts_for_range and excerpt_containing should agree for offset {offset}",
-        );
-    }
-
-    //// Test `excerpt_containing` behavior with ranges:
-
-    // Ranges intersecting a single-excerpt
-    let containing = snapshot.excerpt_containing(p00..p13);
-    assert!(containing.is_some());
-    assert_eq!(containing.unwrap().id(), excerpt_1_id);
-
-    // Ranges intersecting multiple excerpts (should return None)
-    let containing = snapshot.excerpt_containing(p20..p40);
-    assert!(
-        containing.is_none(),
-        "excerpt_containing should return None for ranges spanning multiple excerpts"
-    );
-}
diff --git a/crates/multi_buffer/src/path_key.rs b/crates/multi_buffer/src/path_key.rs
deleted file mode 100644
index 119194d088..0000000000
--- a/crates/multi_buffer/src/path_key.rs
+++ /dev/null
@@ -1,437 +0,0 @@
-use std::{mem, ops::Range, sync::Arc};
-
-use collections::HashSet;
-use gpui::{App, AppContext, Context, Entity};
-use itertools::Itertools;
-use language::{Buffer, BufferSnapshot};
-use rope::Point;
-use text::{Bias, BufferId, OffsetRangeExt, locator::Locator};
-use util::{post_inc, rel_path::RelPath};
-use ztracing::instrument;
-
-use crate::{
-    Anchor, ExcerptId, ExcerptRange, ExpandExcerptDirection, MultiBuffer, build_excerpt_ranges,
-};
-
-#[derive(PartialEq, Eq, Ord, PartialOrd, Clone, Hash, Debug)]
-pub struct PathKey {
-    // Used by the derived PartialOrd & Ord
-    pub sort_prefix: Option<u64>,
-    pub path: Arc<RelPath>,
-}
-
-impl PathKey {
-    pub fn with_sort_prefix(sort_prefix: u64, path: Arc<RelPath>) -> Self {
-        Self {
-            sort_prefix: Some(sort_prefix),
-            path,
-        }
-    }
-
-    pub fn for_buffer(buffer: &Entity<Buffer>, cx: &App) -> Self {
-        if let Some(file) = buffer.read(cx).file() {
-            Self::with_sort_prefix(file.worktree_id(cx).to_proto(), file.path().clone())
-        } else {
-            Self {
-                sort_prefix: None,
-                path: RelPath::unix(&buffer.entity_id().to_string())
-                    .unwrap()
-                    .into_arc(),
-            }
-        }
-    }
-}
-
-impl MultiBuffer {
-    pub fn paths(&self) -> impl Iterator<Item = PathKey> + '_ {
-        self.excerpts_by_path.keys().cloned()
-    }
-
-    pub fn remove_excerpts_for_path(&mut self, path: PathKey, cx: &mut Context<Self>) {
-        if let Some(to_remove) = self.excerpts_by_path.remove(&path) {
-            self.remove_excerpts(to_remove, cx)
-        }
-        if let Some(follower) = &self.follower {
-            follower.update(cx, |follower, cx| {
-                follower.remove_excerpts_for_path(path, cx);
-            });
-        }
-    }
-
-    pub fn location_for_path(&self, path: &PathKey, cx: &App) -> Option<Anchor> {
-        let excerpt_id = self.excerpts_by_path.get(path)?.first()?;
-        let snapshot = self.read(cx);
-        let excerpt = snapshot.excerpt(*excerpt_id)?;
-        Some(Anchor::in_buffer(excerpt.id, excerpt.range.context.start))
-    }
-
-    pub fn excerpt_paths(&self) -> impl Iterator<Item = &PathKey> {
-        self.excerpts_by_path.keys()
-    }
-
-    /// Sets excerpts, returns `true` if at least one new excerpt was added.
-    #[instrument(skip_all)]
-    pub fn set_excerpts_for_path(
-        &mut self,
-        path: PathKey,
-        buffer: Entity<Buffer>,
-        ranges: impl IntoIterator<Item = Range<Point>>,
-        context_line_count: u32,
-        cx: &mut Context<Self>,
-    ) -> (Vec<Range<Anchor>>, bool) {
-        let buffer_snapshot = buffer.read(cx).snapshot();
-        let excerpt_ranges = build_excerpt_ranges(ranges, context_line_count, &buffer_snapshot);
-
-        let (new, counts) = Self::merge_excerpt_ranges(&excerpt_ranges);
-        self.set_merged_excerpt_ranges_for_path(
-            path,
-            buffer,
-            excerpt_ranges,
-            &buffer_snapshot,
-            new,
-            counts,
-            cx,
-        )
-    }
-
-    pub fn set_excerpt_ranges_for_path(
-        &mut self,
-        path: PathKey,
-        buffer: Entity<Buffer>,
-        buffer_snapshot: &BufferSnapshot,
-        excerpt_ranges: Vec<ExcerptRange<Point>>,
-        cx: &mut Context<Self>,
-    ) -> (Vec<Range<Anchor>>, bool) {
-        let (new, counts) = Self::merge_excerpt_ranges(&excerpt_ranges);
-        self.set_merged_excerpt_ranges_for_path(
-            path,
-            buffer,
-            excerpt_ranges,
-            buffer_snapshot,
-            new,
-            counts,
-            cx,
-        )
-    }
-
-    pub fn set_anchored_excerpts_for_path(
-        &self,
-        path_key: PathKey,
-        buffer: Entity<Buffer>,
-        ranges: Vec<Range<text::Anchor>>,
-        context_line_count: u32,
-        cx: &Context<Self>,
-    ) -> impl Future<Output = Vec<Range<Anchor>>> + use<> {
-        let buffer_snapshot = buffer.read(cx).snapshot();
-        let multi_buffer = cx.weak_entity();
-        let mut app = cx.to_async();
-        async move {
-            let snapshot = buffer_snapshot.clone();
-            let (excerpt_ranges, new, counts) = app
-                .background_spawn(async move {
-                    let ranges = ranges.into_iter().map(|range| range.to_point(&snapshot));
-                    let excerpt_ranges =
-                        build_excerpt_ranges(ranges, context_line_count, &snapshot);
-                    let (new, counts) = Self::merge_excerpt_ranges(&excerpt_ranges);
-                    (excerpt_ranges, new, counts)
-                })
-                .await;
-
-            multi_buffer
-                .update(&mut app, move |multi_buffer, cx| {
-                    let (ranges, _) = multi_buffer.set_merged_excerpt_ranges_for_path(
-                        path_key,
-                        buffer,
-                        excerpt_ranges,
-                        &buffer_snapshot,
-                        new,
-                        counts,
-                        cx,
-                    );
-                    ranges
-                })
-                .ok()
-                .unwrap_or_default()
-        }
-    }
-
-    pub fn remove_excerpts_for_buffer(&mut self, buffer: BufferId, cx: &mut Context<Self>) {
-        self.remove_excerpts(
-            self.excerpts_for_buffer(buffer, cx)
-                .into_iter()
-                .map(|(excerpt, _)| excerpt),
-            cx,
-        );
-    }
-
-    pub(super) fn expand_excerpts_with_paths(
-        &mut self,
-        ids: impl IntoIterator<Item = ExcerptId>,
-        line_count: u32,
-        direction: ExpandExcerptDirection,
-        cx: &mut Context<Self>,
-    ) {
-        let grouped = ids
-            .into_iter()
-            .chunk_by(|id| self.paths_by_excerpt.get(id).cloned())
-            .into_iter()
-            .filter_map(|(k, v)| Some((k?, v.into_iter().collect::<Vec<_>>())))
-            .collect::<Vec<_>>();
-        let snapshot = self.snapshot(cx);
-
-        for (path, ids) in grouped.into_iter() {
-            let Some(excerpt_ids) = self.excerpts_by_path.get(&path) else {
-                continue;
-            };
-
-            let ids_to_expand = HashSet::from_iter(ids);
-            let mut excerpt_id_ = None;
-            let expanded_ranges = excerpt_ids.iter().filter_map(|excerpt_id| {
-                let excerpt = snapshot.excerpt(*excerpt_id)?;
-                let excerpt_id = excerpt.id;
-                if excerpt_id_.is_none() {
-                    excerpt_id_ = Some(excerpt_id);
-                }
-
-                let mut context = excerpt.range.context.to_point(&excerpt.buffer);
-                if ids_to_expand.contains(&excerpt_id) {
-                    match direction {
-                        ExpandExcerptDirection::Up => {
-                            context.start.row = context.start.row.saturating_sub(line_count);
-                            context.start.column = 0;
-                        }
-                        ExpandExcerptDirection::Down => {
-                            context.end.row =
-                                (context.end.row + line_count).min(excerpt.buffer.max_point().row);
-                            context.end.column = excerpt.buffer.line_len(context.end.row);
-                        }
-                        ExpandExcerptDirection::UpAndDown => {
-                            context.start.row = context.start.row.saturating_sub(line_count);
-                            context.start.column = 0;
-                            context.end.row =
-                                (context.end.row + line_count).min(excerpt.buffer.max_point().row);
-                            context.end.column = excerpt.buffer.line_len(context.end.row);
-                        }
-                    }
-                }
-
-                Some(ExcerptRange {
-                    context,
-                    primary: excerpt.range.primary.to_point(&excerpt.buffer),
-                })
-            });
-            let mut merged_ranges: Vec<ExcerptRange<Point>> = Vec::new();
-            for range in expanded_ranges {
-                if let Some(last_range) = merged_ranges.last_mut()
-                    && last_range.context.end >= range.context.start
-                {
-                    last_range.context.end = range.context.end;
-                    continue;
-                }
-                merged_ranges.push(range)
-            }
-            let Some(excerpt_id) = excerpt_id_ else {
-                continue;
-            };
-            let Some(buffer_id) = &snapshot.buffer_id_for_excerpt(excerpt_id) else {
-                continue;
-            };
-
-            let Some(buffer) = self.buffers.get(buffer_id).map(|b| b.buffer.clone()) else {
-                continue;
-            };
-
-            let buffer_snapshot = buffer.read(cx).snapshot();
-            self.update_path_excerpts(path.clone(), buffer, &buffer_snapshot, merged_ranges, cx);
-        }
-    }
-
-    /// Sets excerpts, returns `true` if at least one new excerpt was added.
-    fn set_merged_excerpt_ranges_for_path(
-        &mut self,
-        path: PathKey,
-        buffer: Entity<Buffer>,
-        ranges: Vec<ExcerptRange<Point>>,
-        buffer_snapshot: &BufferSnapshot,
-        new: Vec<ExcerptRange<Point>>,
-        counts: Vec<usize>,
-        cx: &mut Context<Self>,
-    ) -> (Vec<Range<Anchor>>, bool) {
-        let (excerpt_ids, added_a_new_excerpt) =
-            self.update_path_excerpts(path, buffer, buffer_snapshot, new, cx);
-
-        let mut result = Vec::new();
-        let mut ranges = ranges.into_iter();
-        for (excerpt_id, range_count) in excerpt_ids.into_iter().zip(counts.into_iter()) {
-            for range in ranges.by_ref().take(range_count) {
-                let range = Anchor::range_in_buffer(
-                    excerpt_id,
-                    buffer_snapshot.anchor_before(&range.primary.start)
-                        ..buffer_snapshot.anchor_after(&range.primary.end),
-                );
-                result.push(range)
-            }
-        }
-        (result, added_a_new_excerpt)
-    }
-
-    fn update_path_excerpts(
-        &mut self,
-        path: PathKey,
-        buffer: Entity<Buffer>,
-        buffer_snapshot: &BufferSnapshot,
-        new: Vec<ExcerptRange<Point>>,
-        cx: &mut Context<Self>,
-    ) -> (Vec<ExcerptId>, bool) {
-        let mut insert_after = self
-            .excerpts_by_path
-            .range(..path.clone())
-            .next_back()
-            .and_then(|(_, value)| value.last().copied())
-            .unwrap_or(ExcerptId::min());
-
-        let existing = self
-            .excerpts_by_path
-            .get(&path)
-            .cloned()
-            .unwrap_or_default();
-        let mut new_iter = new.into_iter().peekable();
-        let mut existing_iter = existing.into_iter().peekable();
-
-        let mut excerpt_ids = Vec::new();
-        let mut to_remove = Vec::new();
-        let mut to_insert: Vec<(ExcerptId, ExcerptRange<Point>)> = Vec::new();
-        let mut added_a_new_excerpt = false;
-        let snapshot = self.snapshot(cx);
-
-        let mut next_excerpt_id =
-            // todo(lw): is this right? What if we remove the last excerpt, then we might reallocate with a wrong mapping?
-            if let Some(last_entry) = self.snapshot.borrow().excerpt_ids.last() {
-                last_entry.id.0 + 1
-            } else {
-                1
-            };
-
-        let mut next_excerpt_id = move || ExcerptId(post_inc(&mut next_excerpt_id));
-
-        let mut excerpts_cursor = snapshot.excerpts.cursor::<Option<&Locator>>(());
-        excerpts_cursor.next();
-
-        loop {
-            let existing = if let Some(&existing_id) = existing_iter.peek() {
-                let locator = snapshot.excerpt_locator_for_id(existing_id);
-                excerpts_cursor.seek_forward(&Some(locator), Bias::Left);
-                if let Some(excerpt) = excerpts_cursor.item() {
-                    if excerpt.buffer_id != buffer_snapshot.remote_id() {
-                        to_remove.push(existing_id);
-                        existing_iter.next();
-                        continue;
-                    }
-                    Some((existing_id, excerpt.range.context.to_point(buffer_snapshot)))
-                } else {
-                    None
-                }
-            } else {
-                None
-            };
-
-            let new = new_iter.peek();
-            if let Some((last_id, last)) = to_insert.last_mut() {
-                if let Some(new) = new
-                    && last.context.end >= new.context.start
-                {
-                    last.context.end = last.context.end.max(new.context.end);
-                    excerpt_ids.push(*last_id);
-                    new_iter.next();
-                    continue;
-                }
-                if let Some((existing_id, existing_range)) = &existing
-                    && last.context.end >= existing_range.start
-                {
-                    last.context.end = last.context.end.max(existing_range.end);
-                    to_remove.push(*existing_id);
-                    self.snapshot
-                        .get_mut()
-                        .replaced_excerpts
-                        .insert(*existing_id, *last_id);
-                    existing_iter.next();
-                    continue;
-                }
-            }
-
-            match (new, existing) {
-                (None, None) => break,
-                (None, Some((existing_id, _))) => {
-                    existing_iter.next();
-                    to_remove.push(existing_id);
-                    continue;
-                }
-                (Some(_), None) => {
-                    added_a_new_excerpt = true;
-                    let new_id = next_excerpt_id();
-                    excerpt_ids.push(new_id);
-                    to_insert.push((new_id, new_iter.next().unwrap()));
-                    continue;
-                }
-                (Some(new), Some((_, existing_range))) => {
-                    if existing_range.end < new.context.start {
-                        let existing_id = existing_iter.next().unwrap();
-                        to_remove.push(existing_id);
-                        continue;
-                    } else if existing_range.start > new.context.end {
-                        let new_id = next_excerpt_id();
-                        excerpt_ids.push(new_id);
-                        to_insert.push((new_id, new_iter.next().unwrap()));
-                        continue;
-                    }
-
-                    if existing_range.start == new.context.start
-                        && existing_range.end == new.context.end
-                    {
-                        self.insert_excerpts_with_ids_after(
-                            insert_after,
-                            buffer.clone(),
-                            mem::take(&mut to_insert),
-                            cx,
-                        );
-                        insert_after = existing_iter.next().unwrap();
-                        excerpt_ids.push(insert_after);
-                        new_iter.next();
-                    } else {
-                        let existing_id = existing_iter.next().unwrap();
-                        let new_id = next_excerpt_id();
-                        self.snapshot
-                            .get_mut()
-                            .replaced_excerpts
-                            .insert(existing_id, new_id);
-                        to_remove.push(existing_id);
-                        let mut range = new_iter.next().unwrap();
-                        range.context.start = range.context.start.min(existing_range.start);
-                        range.context.end = range.context.end.max(existing_range.end);
-                        excerpt_ids.push(new_id);
-                        to_insert.push((new_id, range));
-                    }
-                }
-            };
-        }
-
-        self.insert_excerpts_with_ids_after(insert_after, buffer, to_insert, cx);
-        // todo(lw): There is a logic bug somewhere that causes the to_remove vector to be not ordered correctly
-        to_remove.sort_by_cached_key(|&id| snapshot.excerpt_locator_for_id(id));
-        self.remove_excerpts(to_remove, cx);
-
-        if excerpt_ids.is_empty() {
-            self.excerpts_by_path.remove(&path);
-        } else {
-            for excerpt_id in &excerpt_ids {
-                self.paths_by_excerpt.insert(*excerpt_id, path.clone());
-            }
-            let snapshot = &*self.snapshot.get_mut();
-            let mut excerpt_ids: Vec<_> = excerpt_ids.iter().dedup().cloned().collect();
-            excerpt_ids.sort_by_cached_key(|&id| snapshot.excerpt_locator_for_id(id));
-            self.excerpts_by_path.insert(path, excerpt_ids);
-        }
-
-        (excerpt_ids, added_a_new_excerpt)
-    }
-}
diff --git a/crates/multi_buffer/src/transaction.rs b/crates/multi_buffer/src/transaction.rs
deleted file mode 100644
index a65e394c8f..0000000000
--- a/crates/multi_buffer/src/transaction.rs
+++ /dev/null
@@ -1,538 +0,0 @@
-use gpui::{App, Context, Entity};
-use language::{self, Buffer, TransactionId};
-use std::{
-    collections::HashMap,
-    ops::{AddAssign, Range, Sub},
-    time::{Duration, Instant},
-};
-use sum_tree::Bias;
-use text::BufferId;
-
-use crate::{BufferState, MultiBufferDimension};
-
-use super::{Event, ExcerptSummary, MultiBuffer};
-
-#[derive(Clone)]
-pub(super) struct History {
-    next_transaction_id: TransactionId,
-    undo_stack: Vec<Transaction>,
-    redo_stack: Vec<Transaction>,
-    transaction_depth: usize,
-    group_interval: Duration,
-}
-
-impl Default for History {
-    fn default() -> Self {
-        History {
-            next_transaction_id: clock::Lamport::MIN,
-            undo_stack: Vec::new(),
-            redo_stack: Vec::new(),
-            transaction_depth: 0,
-            group_interval: Duration::from_millis(300),
-        }
-    }
-}
-
-#[derive(Clone)]
-struct Transaction {
-    id: TransactionId,
-    buffer_transactions: HashMap<BufferId, text::TransactionId>,
-    first_edit_at: Instant,
-    last_edit_at: Instant,
-    suppress_grouping: bool,
-}
-
-impl History {
-    fn start_transaction(&mut self, now: Instant) -> Option<TransactionId> {
-        self.transaction_depth += 1;
-        if self.transaction_depth == 1 {
-            let id = self.next_transaction_id.tick();
-            self.undo_stack.push(Transaction {
-                id,
-                buffer_transactions: Default::default(),
-                first_edit_at: now,
-                last_edit_at: now,
-                suppress_grouping: false,
-            });
-            Some(id)
-        } else {
-            None
-        }
-    }
-
-    fn end_transaction(
-        &mut self,
-        now: Instant,
-        buffer_transactions: HashMap<BufferId, text::TransactionId>,
-    ) -> bool {
-        assert_ne!(self.transaction_depth, 0);
-        self.transaction_depth -= 1;
-        if self.transaction_depth == 0 {
-            if buffer_transactions.is_empty() {
-                self.undo_stack.pop();
-                false
-            } else {
-                self.redo_stack.clear();
-                let transaction = self.undo_stack.last_mut().unwrap();
-                transaction.last_edit_at = now;
-                for (buffer_id, transaction_id) in buffer_transactions {
-                    transaction
-                        .buffer_transactions
-                        .entry(buffer_id)
-                        .or_insert(transaction_id);
-                }
-                true
-            }
-        } else {
-            false
-        }
-    }
-
-    fn push_transaction<'a, T>(
-        &mut self,
-        buffer_transactions: T,
-        now: Instant,
-        cx: &Context<MultiBuffer>,
-    ) where
-        T: IntoIterator<Item = (&'a Entity<Buffer>, &'a language::Transaction)>,
-    {
-        assert_eq!(self.transaction_depth, 0);
-        let transaction = Transaction {
-            id: self.next_transaction_id.tick(),
-            buffer_transactions: buffer_transactions
-                .into_iter()
-                .map(|(buffer, transaction)| (buffer.read(cx).remote_id(), transaction.id))
-                .collect(),
-            first_edit_at: now,
-            last_edit_at: now,
-            suppress_grouping: false,
-        };
-        if !transaction.buffer_transactions.is_empty() {
-            self.undo_stack.push(transaction);
-            self.redo_stack.clear();
-        }
-    }
-
-    fn finalize_last_transaction(&mut self) {
-        if let Some(transaction) = self.undo_stack.last_mut() {
-            transaction.suppress_grouping = true;
-        }
-    }
-
-    fn forget(&mut self, transaction_id: TransactionId) -> Option<Transaction> {
-        if let Some(ix) = self
-            .undo_stack
-            .iter()
-            .rposition(|transaction| transaction.id == transaction_id)
-        {
-            Some(self.undo_stack.remove(ix))
-        } else if let Some(ix) = self
-            .redo_stack
-            .iter()
-            .rposition(|transaction| transaction.id == transaction_id)
-        {
-            Some(self.redo_stack.remove(ix))
-        } else {
-            None
-        }
-    }
-
-    fn transaction(&self, transaction_id: TransactionId) -> Option<&Transaction> {
-        self.undo_stack
-            .iter()
-            .find(|transaction| transaction.id == transaction_id)
-            .or_else(|| {
-                self.redo_stack
-                    .iter()
-                    .find(|transaction| transaction.id == transaction_id)
-            })
-    }
-
-    fn transaction_mut(&mut self, transaction_id: TransactionId) -> Option<&mut Transaction> {
-        self.undo_stack
-            .iter_mut()
-            .find(|transaction| transaction.id == transaction_id)
-            .or_else(|| {
-                self.redo_stack
-                    .iter_mut()
-                    .find(|transaction| transaction.id == transaction_id)
-            })
-    }
-
-    fn pop_undo(&mut self) -> Option<&mut Transaction> {
-        assert_eq!(self.transaction_depth, 0);
-        if let Some(transaction) = self.undo_stack.pop() {
-            self.redo_stack.push(transaction);
-            self.redo_stack.last_mut()
-        } else {
-            None
-        }
-    }
-
-    fn pop_redo(&mut self) -> Option<&mut Transaction> {
-        assert_eq!(self.transaction_depth, 0);
-        if let Some(transaction) = self.redo_stack.pop() {
-            self.undo_stack.push(transaction);
-            self.undo_stack.last_mut()
-        } else {
-            None
-        }
-    }
-
-    fn remove_from_undo(&mut self, transaction_id: TransactionId) -> Option<&Transaction> {
-        let ix = self
-            .undo_stack
-            .iter()
-            .rposition(|transaction| transaction.id == transaction_id)?;
-        let transaction = self.undo_stack.remove(ix);
-        self.redo_stack.push(transaction);
-        self.redo_stack.last()
-    }
-
-    fn group(&mut self) -> Option<TransactionId> {
-        let mut count = 0;
-        let mut transactions = self.undo_stack.iter();
-        if let Some(mut transaction) = transactions.next_back() {
-            while let Some(prev_transaction) = transactions.next_back() {
-                if !prev_transaction.suppress_grouping
-                    && transaction.first_edit_at - prev_transaction.last_edit_at
-                        <= self.group_interval
-                {
-                    transaction = prev_transaction;
-                    count += 1;
-                } else {
-                    break;
-                }
-            }
-        }
-        self.group_trailing(count)
-    }
-
-    fn group_until(&mut self, transaction_id: TransactionId) {
-        let mut count = 0;
-        for transaction in self.undo_stack.iter().rev() {
-            if transaction.id == transaction_id {
-                self.group_trailing(count);
-                break;
-            } else if transaction.suppress_grouping {
-                break;
-            } else {
-                count += 1;
-            }
-        }
-    }
-
-    fn group_trailing(&mut self, n: usize) -> Option<TransactionId> {
-        let new_len = self.undo_stack.len() - n;
-        let (transactions_to_keep, transactions_to_merge) = self.undo_stack.split_at_mut(new_len);
-        if let Some(last_transaction) = transactions_to_keep.last_mut() {
-            if let Some(transaction) = transactions_to_merge.last() {
-                last_transaction.last_edit_at = transaction.last_edit_at;
-            }
-            for to_merge in transactions_to_merge {
-                for (buffer_id, transaction_id) in &to_merge.buffer_transactions {
-                    last_transaction
-                        .buffer_transactions
-                        .entry(*buffer_id)
-                        .or_insert(*transaction_id);
-                }
-            }
-        }
-
-        self.undo_stack.truncate(new_len);
-        self.undo_stack.last().map(|t| t.id)
-    }
-
-    pub(super) fn transaction_depth(&self) -> usize {
-        self.transaction_depth
-    }
-
-    pub fn set_group_interval(&mut self, group_interval: Duration) {
-        self.group_interval = group_interval;
-    }
-}
-
-impl MultiBuffer {
-    pub fn start_transaction(&mut self, cx: &mut Context<Self>) -> Option<TransactionId> {
-        self.start_transaction_at(Instant::now(), cx)
-    }
-
-    pub fn start_transaction_at(
-        &mut self,
-        now: Instant,
-        cx: &mut Context<Self>,
-    ) -> Option<TransactionId> {
-        if let Some(buffer) = self.as_singleton() {
-            return buffer.update(cx, |buffer, _| buffer.start_transaction_at(now));
-        }
-
-        for BufferState { buffer, .. } in self.buffers.values() {
-            buffer.update(cx, |buffer, _| buffer.start_transaction_at(now));
-        }
-        self.history.start_transaction(now)
-    }
-
-    pub fn last_transaction_id(&self, cx: &App) -> Option<TransactionId> {
-        if let Some(buffer) = self.as_singleton() {
-            buffer
-                .read(cx)
-                .peek_undo_stack()
-                .map(|history_entry| history_entry.transaction_id())
-        } else {
-            let last_transaction = self.history.undo_stack.last()?;
-            Some(last_transaction.id)
-        }
-    }
-
-    pub fn end_transaction(&mut self, cx: &mut Context<Self>) -> Option<TransactionId> {
-        self.end_transaction_at(Instant::now(), cx)
-    }
-
-    pub fn end_transaction_at(
-        &mut self,
-        now: Instant,
-        cx: &mut Context<Self>,
-    ) -> Option<TransactionId> {
-        if let Some(buffer) = self.as_singleton() {
-            return buffer.update(cx, |buffer, cx| buffer.end_transaction_at(now, cx));
-        }
-
-        let mut buffer_transactions = HashMap::default();
-        for BufferState { buffer, .. } in self.buffers.values() {
-            if let Some(transaction_id) =
-                buffer.update(cx, |buffer, cx| buffer.end_transaction_at(now, cx))
-            {
-                buffer_transactions.insert(buffer.read(cx).remote_id(), transaction_id);
-            }
-        }
-
-        if self.history.end_transaction(now, buffer_transactions) {
-            let transaction_id = self.history.group().unwrap();
-            Some(transaction_id)
-        } else {
-            None
-        }
-    }
-
-    pub fn edited_ranges_for_transaction<D>(
-        &self,
-        transaction_id: TransactionId,
-        cx: &App,
-    ) -> Vec<Range<D>>
-    where
-        D: MultiBufferDimension
-            + Ord
-            + Sub<D, Output = D::TextDimension>
-            + AddAssign<D::TextDimension>,
-        D::TextDimension: PartialOrd + Sub<D::TextDimension, Output = D::TextDimension>,
-    {
-        let Some(transaction) = self.history.transaction(transaction_id) else {
-            return Vec::new();
-        };
-
-        let mut ranges = Vec::new();
-        let snapshot = self.read(cx);
-        let mut cursor = snapshot.excerpts.cursor::<ExcerptSummary>(());
-
-        for (buffer_id, buffer_transaction) in &transaction.buffer_transactions {
-            let Some(buffer_state) = self.buffers.get(buffer_id) else {
-                continue;
-            };
-
-            let buffer = buffer_state.buffer.read(cx);
-            for range in
-                buffer.edited_ranges_for_transaction_id::<D::TextDimension>(*buffer_transaction)
-            {
-                for excerpt_id in &buffer_state.excerpts {
-                    cursor.seek(excerpt_id, Bias::Left);
-                    if let Some(excerpt) = cursor.item()
-                        && excerpt.locator == *excerpt_id
-                    {
-                        let excerpt_buffer_start = excerpt
-                            .range
-                            .context
-                            .start
-                            .summary::<D::TextDimension>(buffer);
-                        let excerpt_buffer_end = excerpt
-                            .range
-                            .context
-                            .end
-                            .summary::<D::TextDimension>(buffer);
-                        let excerpt_range = excerpt_buffer_start..excerpt_buffer_end;
-                        if excerpt_range.contains(&range.start)
-                            && excerpt_range.contains(&range.end)
-                        {
-                            let excerpt_start = D::from_summary(&cursor.start().text);
-
-                            let mut start = excerpt_start;
-                            start += range.start - excerpt_buffer_start;
-                            let mut end = excerpt_start;
-                            end += range.end - excerpt_buffer_start;
-
-                            ranges.push(start..end);
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-
-        ranges.sort_by_key(|range| range.start);
-        ranges
-    }
-
-    pub fn merge_transactions(
-        &mut self,
-        transaction: TransactionId,
-        destination: TransactionId,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(buffer) = self.as_singleton() {
-            buffer.update(cx, |buffer, _| {
-                buffer.merge_transactions(transaction, destination)
-            });
-        } else if let Some(transaction) = self.history.forget(transaction)
-            && let Some(destination) = self.history.transaction_mut(destination)
-        {
-            for (buffer_id, buffer_transaction_id) in transaction.buffer_transactions {
-                if let Some(destination_buffer_transaction_id) =
-                    destination.buffer_transactions.get(&buffer_id)
-                {
-                    if let Some(state) = self.buffers.get(&buffer_id) {
-                        state.buffer.update(cx, |buffer, _| {
-                            buffer.merge_transactions(
-                                buffer_transaction_id,
-                                *destination_buffer_transaction_id,
-                            )
-                        });
-                    }
-                } else {
-                    destination
-                        .buffer_transactions
-                        .insert(buffer_id, buffer_transaction_id);
-                }
-            }
-        }
-    }
-
-    pub fn finalize_last_transaction(&mut self, cx: &mut Context<Self>) {
-        self.history.finalize_last_transaction();
-        for BufferState { buffer, .. } in self.buffers.values() {
-            buffer.update(cx, |buffer, _| {
-                buffer.finalize_last_transaction();
-            });
-        }
-    }
-
-    pub fn push_transaction<'a, T>(&mut self, buffer_transactions: T, cx: &Context<Self>)
-    where
-        T: IntoIterator<Item = (&'a Entity<Buffer>, &'a language::Transaction)>,
-    {
-        self.history
-            .push_transaction(buffer_transactions, Instant::now(), cx);
-        self.history.finalize_last_transaction();
-    }
-
-    pub fn group_until_transaction(
-        &mut self,
-        transaction_id: TransactionId,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(buffer) = self.as_singleton() {
-            buffer.update(cx, |buffer, _| {
-                buffer.group_until_transaction(transaction_id)
-            });
-        } else {
-            self.history.group_until(transaction_id);
-        }
-    }
-    pub fn undo(&mut self, cx: &mut Context<Self>) -> Option<TransactionId> {
-        let mut transaction_id = None;
-        if let Some(buffer) = self.as_singleton() {
-            transaction_id = buffer.update(cx, |buffer, cx| buffer.undo(cx));
-        } else {
-            while let Some(transaction) = self.history.pop_undo() {
-                let mut undone = false;
-                for (buffer_id, buffer_transaction_id) in &mut transaction.buffer_transactions {
-                    if let Some(BufferState { buffer, .. }) = self.buffers.get(buffer_id) {
-                        undone |= buffer.update(cx, |buffer, cx| {
-                            let undo_to = *buffer_transaction_id;
-                            if let Some(entry) = buffer.peek_undo_stack() {
-                                *buffer_transaction_id = entry.transaction_id();
-                            }
-                            buffer.undo_to_transaction(undo_to, cx)
-                        });
-                    }
-                }
-
-                if undone {
-                    transaction_id = Some(transaction.id);
-                    break;
-                }
-            }
-        }
-
-        if let Some(transaction_id) = transaction_id {
-            cx.emit(Event::TransactionUndone { transaction_id });
-        }
-
-        transaction_id
-    }
-
-    pub fn redo(&mut self, cx: &mut Context<Self>) -> Option<TransactionId> {
-        if let Some(buffer) = self.as_singleton() {
-            return buffer.update(cx, |buffer, cx| buffer.redo(cx));
-        }
-
-        while let Some(transaction) = self.history.pop_redo() {
-            let mut redone = false;
-            for (buffer_id, buffer_transaction_id) in transaction.buffer_transactions.iter_mut() {
-                if let Some(BufferState { buffer, .. }) = self.buffers.get(buffer_id) {
-                    redone |= buffer.update(cx, |buffer, cx| {
-                        let redo_to = *buffer_transaction_id;
-                        if let Some(entry) = buffer.peek_redo_stack() {
-                            *buffer_transaction_id = entry.transaction_id();
-                        }
-                        buffer.redo_to_transaction(redo_to, cx)
-                    });
-                }
-            }
-
-            if redone {
-                return Some(transaction.id);
-            }
-        }
-
-        None
-    }
-
-    pub fn undo_transaction(&mut self, transaction_id: TransactionId, cx: &mut Context<Self>) {
-        if let Some(buffer) = self.as_singleton() {
-            buffer.update(cx, |buffer, cx| buffer.undo_transaction(transaction_id, cx));
-        } else if let Some(transaction) = self.history.remove_from_undo(transaction_id) {
-            for (buffer_id, transaction_id) in &transaction.buffer_transactions {
-                if let Some(BufferState { buffer, .. }) = self.buffers.get(buffer_id) {
-                    buffer.update(cx, |buffer, cx| {
-                        buffer.undo_transaction(*transaction_id, cx)
-                    });
-                }
-            }
-        }
-    }
-
-    pub fn forget_transaction(&mut self, transaction_id: TransactionId, cx: &mut Context<Self>) {
-        if let Some(buffer) = self.as_singleton() {
-            buffer.update(cx, |buffer, _| {
-                buffer.forget_transaction(transaction_id);
-            });
-        } else if let Some(transaction) = self.history.forget(transaction_id) {
-            for (buffer_id, buffer_transaction_id) in transaction.buffer_transactions {
-                if let Some(state) = self.buffers.get_mut(&buffer_id) {
-                    state.buffer.update(cx, |buffer, _| {
-                        buffer.forget_transaction(buffer_transaction_id);
-                    });
-                }
-            }
-        }
-    }
-}
diff --git a/crates/nc/Cargo.toml b/crates/nc/Cargo.toml
deleted file mode 100644
index 534ec2271c..0000000000
--- a/crates/nc/Cargo.toml
+++ /dev/null
@@ -1,19 +0,0 @@
-[package]
-name = "nc"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/nc.rs"
-doctest = false
-
-[dependencies]
-anyhow.workspace = true
-futures.workspace = true
-net.workspace = true
-smol.workspace = true
diff --git a/crates/nc/LICENSE-GPL b/crates/nc/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/nc/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/nc/src/nc.rs b/crates/nc/src/nc.rs
deleted file mode 100644
index fccb4d726c..0000000000
--- a/crates/nc/src/nc.rs
+++ /dev/null
@@ -1,56 +0,0 @@
-use anyhow::Result;
-
-#[cfg(windows)]
-pub fn main(_socket: &str) -> Result<()> {
-    // It looks like we can't get an async stdio stream on Windows from smol.
-    //
-    // We decided to merge this with a panic on Windows since this is only used
-    // by the experimental Claude Code Agent Server.
-    //
-    // We're tracking this internally, and we will address it before shipping the integration.
-    panic!("--nc isn't yet supported on Windows");
-}
-
-/// The main function for when Zed is running in netcat mode
-#[cfg(not(windows))]
-pub fn main(socket: &str) -> Result<()> {
-    use futures::{AsyncReadExt as _, AsyncWriteExt as _, FutureExt as _, io::BufReader, select};
-    use net::async_net::UnixStream;
-    use smol::{Async, io::AsyncBufReadExt};
-
-    smol::block_on(async {
-        let socket_stream = UnixStream::connect(socket).await?;
-        let (socket_read, mut socket_write) = socket_stream.split();
-        let mut socket_reader = BufReader::new(socket_read);
-
-        let mut stdout = Async::new(std::io::stdout())?;
-        let stdin = Async::new(std::io::stdin())?;
-        let mut stdin_reader = BufReader::new(stdin);
-
-        let mut socket_line = Vec::new();
-        let mut stdin_line = Vec::new();
-
-        loop {
-            select! {
-                bytes_read = socket_reader.read_until(b'\n', &mut socket_line).fuse() => {
-                    if bytes_read? == 0 {
-                        break
-                    }
-                    stdout.write_all(&socket_line).await?;
-                    stdout.flush().await?;
-                    socket_line.clear();
-                }
-                bytes_read = stdin_reader.read_until(b'\n', &mut stdin_line).fuse() => {
-                    if bytes_read? == 0 {
-                        break
-                    }
-                    socket_write.write_all(&stdin_line).await?;
-                    socket_write.flush().await?;
-                    stdin_line.clear();
-                }
-            }
-        }
-
-        anyhow::Ok(())
-    })
-}
diff --git a/crates/net/Cargo.toml b/crates/net/Cargo.toml
deleted file mode 100644
index 8ce273e30c..0000000000
--- a/crates/net/Cargo.toml
+++ /dev/null
@@ -1,24 +0,0 @@
-[package]
-name = "net"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/net.rs"
-doctest = false
-
-[dependencies]
-smol.workspace = true
-
-[target.'cfg(target_os = "windows")'.dependencies]
-anyhow.workspace = true
-async-io = "2.4"
-windows.workspace = true
-
-[dev-dependencies]
-tempfile.workspace = true
diff --git a/crates/net/LICENSE-GPL b/crates/net/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/net/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/net/src/async_net.rs b/crates/net/src/async_net.rs
deleted file mode 100644
index 6a47902bd8..0000000000
--- a/crates/net/src/async_net.rs
+++ /dev/null
@@ -1,69 +0,0 @@
-#[cfg(not(target_os = "windows"))]
-pub use smol::net::unix::{UnixListener, UnixStream};
-
-#[cfg(target_os = "windows")]
-pub use windows::{UnixListener, UnixStream};
-
-#[cfg(target_os = "windows")]
-pub mod windows {
-    use std::{
-        io::Result,
-        path::Path,
-        pin::Pin,
-        task::{Context, Poll},
-    };
-
-    use smol::{
-        Async,
-        io::{AsyncRead, AsyncWrite},
-    };
-
-    pub struct UnixListener(Async<crate::UnixListener>);
-
-    impl UnixListener {
-        pub fn bind<P: AsRef<Path>>(path: P) -> Result<Self> {
-            Ok(UnixListener(Async::new(crate::UnixListener::bind(path)?)?))
-        }
-
-        pub async fn accept(&self) -> Result<(UnixStream, ())> {
-            let (sock, _) = self.0.read_with(|listener| listener.accept()).await?;
-            Ok((UnixStream(Async::new(sock)?), ()))
-        }
-    }
-
-    pub struct UnixStream(Async<crate::UnixStream>);
-
-    impl UnixStream {
-        pub async fn connect<P: AsRef<Path>>(path: P) -> Result<Self> {
-            Ok(UnixStream(Async::new(crate::UnixStream::connect(path)?)?))
-        }
-    }
-
-    impl AsyncRead for UnixStream {
-        fn poll_read(
-            mut self: Pin<&mut Self>,
-            cx: &mut Context<'_>,
-            buf: &mut [u8],
-        ) -> Poll<Result<usize>> {
-            Pin::new(&mut self.0).poll_read(cx, buf)
-        }
-    }
-
-    impl AsyncWrite for UnixStream {
-        fn poll_write(
-            mut self: Pin<&mut Self>,
-            cx: &mut Context<'_>,
-            buf: &[u8],
-        ) -> Poll<Result<usize>> {
-            Pin::new(&mut self.0).poll_write(cx, buf)
-        }
-
-        fn poll_flush(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<()>> {
-            Pin::new(&mut self.0).poll_flush(cx)
-        }
-
-        fn poll_close(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<()>> {
-            Pin::new(&mut self.0).poll_close(cx)
-        }
-    }
-}
diff --git a/crates/net/src/listener.rs b/crates/net/src/listener.rs
deleted file mode 100644
index 4774bb850b..0000000000
--- a/crates/net/src/listener.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-use std::{
-    io::Result,
-    os::windows::io::{AsSocket, BorrowedSocket},
-    path::Path,
-};
-
-use windows::Win32::Networking::WinSock::{SOCKADDR_UN, SOMAXCONN, bind, listen};
-
-use crate::{
-    socket::UnixSocket,
-    stream::UnixStream,
-    util::{init, map_ret, sockaddr_un},
-};
-
-pub struct UnixListener(UnixSocket);
-
-impl UnixListener {
-    pub fn bind<P: AsRef<Path>>(path: P) -> Result<Self> {
-        init();
-        let socket = UnixSocket::new()?;
-        let (addr, len) = sockaddr_un(path)?;
-        unsafe {
-            map_ret(bind(
-                socket.as_raw(),
-                &addr as *const _ as *const _,
-                len as i32,
-            ))?;
-            map_ret(listen(socket.as_raw(), SOMAXCONN as _))?;
-        }
-        Ok(Self(socket))
-    }
-
-    pub fn accept(&self) -> Result<(UnixStream, ())> {
-        let mut storage = SOCKADDR_UN::default();
-        let mut len = std::mem::size_of_val(&storage) as i32;
-        let raw = self.0.accept(&mut storage as *mut _ as *mut _, &mut len)?;
-        Ok((UnixStream::new(raw), ()))
-    }
-}
-
-impl AsSocket for UnixListener {
-    fn as_socket(&self) -> BorrowedSocket<'_> {
-        unsafe { BorrowedSocket::borrow_raw(self.0.as_raw().0 as _) }
-    }
-}
diff --git a/crates/net/src/net.rs b/crates/net/src/net.rs
deleted file mode 100644
index 4fa76ffcb8..0000000000
--- a/crates/net/src/net.rs
+++ /dev/null
@@ -1,107 +0,0 @@
-pub mod async_net;
-#[cfg(target_os = "windows")]
-pub mod listener;
-#[cfg(target_os = "windows")]
-pub mod socket;
-#[cfg(target_os = "windows")]
-pub mod stream;
-#[cfg(target_os = "windows")]
-mod util;
-
-#[cfg(target_os = "windows")]
-pub use listener::*;
-#[cfg(target_os = "windows")]
-pub use socket::*;
-#[cfg(not(target_os = "windows"))]
-pub use std::os::unix::net::{UnixListener, UnixStream};
-#[cfg(target_os = "windows")]
-pub use stream::*;
-
-#[cfg(test)]
-mod tests {
-    use std::io::{Read, Write};
-
-    use smol::io::{AsyncReadExt, AsyncWriteExt};
-
-    const SERVER_MESSAGE: &str = "Connection closed";
-    const CLIENT_MESSAGE: &str = "Hello, server!";
-    const BUFFER_SIZE: usize = 32;
-
-    #[test]
-    fn test_windows_listener() -> std::io::Result<()> {
-        use crate::{UnixListener, UnixStream};
-
-        let temp = tempfile::tempdir()?;
-        let socket = temp.path().join("socket.sock");
-        let listener = UnixListener::bind(&socket)?;
-
-        // Server
-        let server = std::thread::spawn(move || {
-            let (mut stream, _) = listener.accept().unwrap();
-
-            // Read data from the client
-            let mut buffer = [0; BUFFER_SIZE];
-            let bytes_read = stream.read(&mut buffer).unwrap();
-            let string = String::from_utf8_lossy(&buffer[..bytes_read]);
-            assert_eq!(string, CLIENT_MESSAGE);
-
-            // Send a message back to the client
-            stream.write_all(SERVER_MESSAGE.as_bytes()).unwrap();
-        });
-
-        // Client
-        let mut client = UnixStream::connect(&socket)?;
-
-        // Send data to the server
-        client.write_all(CLIENT_MESSAGE.as_bytes())?;
-        let mut buffer = [0; BUFFER_SIZE];
-
-        // Read the response from the server
-        let bytes_read = client.read(&mut buffer)?;
-        let string = String::from_utf8_lossy(&buffer[..bytes_read]);
-        assert_eq!(string, SERVER_MESSAGE);
-        client.flush()?;
-
-        server.join().unwrap();
-        Ok(())
-    }
-
-    #[test]
-    fn test_unix_listener() -> std::io::Result<()> {
-        use crate::async_net::{UnixListener, UnixStream};
-
-        smol::block_on(async {
-            let temp = tempfile::tempdir()?;
-            let socket = temp.path().join("socket.sock");
-            let listener = UnixListener::bind(&socket)?;
-
-            // Server
-            let server = smol::spawn(async move {
-                let (mut stream, _) = listener.accept().await.unwrap();
-
-                // Read data from the client
-                let mut buffer = [0; BUFFER_SIZE];
-                let bytes_read = stream.read(&mut buffer).await.unwrap();
-                let string = String::from_utf8_lossy(&buffer[..bytes_read]);
-                assert_eq!(string, CLIENT_MESSAGE);
-
-                // Send a message back to the client
-                stream.write_all(SERVER_MESSAGE.as_bytes()).await.unwrap();
-            });
-
-            // Client
-            let mut client = UnixStream::connect(&socket).await?;
-            client.write_all(CLIENT_MESSAGE.as_bytes()).await?;
-
-            // Read the response from the server
-            let mut buffer = [0; BUFFER_SIZE];
-            let bytes_read = client.read(&mut buffer).await?;
-            let string = String::from_utf8_lossy(&buffer[..bytes_read]);
-            assert_eq!(string, "Connection closed");
-            client.flush().await?;
-
-            server.await;
-            Ok(())
-        })
-    }
-}
diff --git a/crates/net/src/socket.rs b/crates/net/src/socket.rs
deleted file mode 100644
index 6a1fa3d4c4..0000000000
--- a/crates/net/src/socket.rs
+++ /dev/null
@@ -1,59 +0,0 @@
-use std::io::{Error, ErrorKind, Result};
-
-use windows::Win32::{
-    Foundation::{HANDLE, HANDLE_FLAG_INHERIT, HANDLE_FLAGS, SetHandleInformation},
-    Networking::WinSock::{
-        AF_UNIX, SEND_RECV_FLAGS, SOCK_STREAM, SOCKADDR, SOCKET, WSA_FLAG_OVERLAPPED,
-        WSAEWOULDBLOCK, WSASocketW, accept, closesocket, recv, send,
-    },
-};
-
-use crate::util::map_ret;
-
-pub struct UnixSocket(SOCKET);
-
-impl UnixSocket {
-    pub fn new() -> Result<Self> {
-        unsafe {
-            let raw = WSASocketW(AF_UNIX as _, SOCK_STREAM.0, 0, None, 0, WSA_FLAG_OVERLAPPED)?;
-            SetHandleInformation(
-                HANDLE(raw.0 as _),
-                HANDLE_FLAG_INHERIT.0,
-                HANDLE_FLAGS::default(),
-            )?;
-            Ok(Self(raw))
-        }
-    }
-
-    pub(crate) fn as_raw(&self) -> SOCKET {
-        self.0
-    }
-
-    pub fn accept(&self, storage: *mut SOCKADDR, len: &mut i32) -> Result<Self> {
-        match unsafe { accept(self.0, Some(storage), Some(len)) } {
-            Ok(sock) => Ok(Self(sock)),
-            Err(err) => {
-                let wsa_err = unsafe { windows::Win32::Networking::WinSock::WSAGetLastError().0 };
-                if wsa_err == WSAEWOULDBLOCK.0 {
-                    Err(Error::new(ErrorKind::WouldBlock, "accept would block"))
-                } else {
-                    Err(err.into())
-                }
-            }
-        }
-    }
-
-    pub(crate) fn recv(&self, buf: &mut [u8]) -> Result<usize> {
-        map_ret(unsafe { recv(self.0, buf, SEND_RECV_FLAGS::default()) })
-    }
-
-    pub(crate) fn send(&self, buf: &[u8]) -> Result<usize> {
-        map_ret(unsafe { send(self.0, buf, SEND_RECV_FLAGS::default()) })
-    }
-}
-
-impl Drop for UnixSocket {
-    fn drop(&mut self) {
-        unsafe { closesocket(self.0) };
-    }
-}
diff --git a/crates/net/src/stream.rs b/crates/net/src/stream.rs
deleted file mode 100644
index d8b6852fcf..0000000000
--- a/crates/net/src/stream.rs
+++ /dev/null
@@ -1,60 +0,0 @@
-use std::{
-    io::{Read, Result, Write},
-    os::windows::io::{AsSocket, BorrowedSocket},
-    path::Path,
-};
-
-use async_io::IoSafe;
-use windows::Win32::Networking::WinSock::connect;
-
-use crate::{
-    socket::UnixSocket,
-    util::{init, map_ret, sockaddr_un},
-};
-
-pub struct UnixStream(UnixSocket);
-
-unsafe impl IoSafe for UnixStream {}
-
-impl UnixStream {
-    pub fn new(socket: UnixSocket) -> Self {
-        Self(socket)
-    }
-
-    pub fn connect<P: AsRef<Path>>(path: P) -> Result<Self> {
-        init();
-        unsafe {
-            let inner = UnixSocket::new()?;
-            let (addr, len) = sockaddr_un(path)?;
-
-            map_ret(connect(
-                inner.as_raw(),
-                &addr as *const _ as *const _,
-                len as i32,
-            ))?;
-            Ok(Self(inner))
-        }
-    }
-}
-
-impl Read for UnixStream {
-    fn read(&mut self, buf: &mut [u8]) -> Result<usize> {
-        self.0.recv(buf)
-    }
-}
-
-impl Write for UnixStream {
-    fn write(&mut self, buf: &[u8]) -> Result<usize> {
-        self.0.send(buf)
-    }
-
-    fn flush(&mut self) -> Result<()> {
-        Ok(())
-    }
-}
-
-impl AsSocket for UnixStream {
-    fn as_socket(&self) -> BorrowedSocket<'_> {
-        unsafe { BorrowedSocket::borrow_raw(self.0.as_raw().0 as _) }
-    }
-}
diff --git a/crates/net/src/util.rs b/crates/net/src/util.rs
deleted file mode 100644
index f454c099c7..0000000000
--- a/crates/net/src/util.rs
+++ /dev/null
@@ -1,76 +0,0 @@
-use std::{
-    io::{Error, ErrorKind, Result},
-    path::Path,
-    sync::Once,
-};
-
-use windows::Win32::Networking::WinSock::{
-    ADDRESS_FAMILY, AF_UNIX, SOCKADDR_UN, SOCKET_ERROR, WSAGetLastError, WSAStartup,
-};
-
-pub(crate) fn init() {
-    static ONCE: Once = Once::new();
-
-    ONCE.call_once(|| unsafe {
-        let mut wsa_data = std::mem::zeroed();
-        let result = WSAStartup(0x202, &mut wsa_data);
-        if result != 0 {
-            panic!("WSAStartup failed: {}", result);
-        }
-    });
-}
-
-// https://devblogs.microsoft.com/commandline/af_unix-comes-to-windows/
-pub(crate) fn sockaddr_un<P: AsRef<Path>>(path: P) -> Result<(SOCKADDR_UN, usize)> {
-    let mut addr = SOCKADDR_UN::default();
-    addr.sun_family = ADDRESS_FAMILY(AF_UNIX);
-
-    let bytes = path
-        .as_ref()
-        .to_str()
-        .map(|s| s.as_bytes())
-        .ok_or(ErrorKind::InvalidInput)?;
-
-    if bytes.contains(&0) {
-        return Err(Error::new(
-            ErrorKind::InvalidInput,
-            "paths may not contain interior null bytes",
-        ));
-    }
-    if bytes.len() >= addr.sun_path.len() {
-        return Err(Error::new(
-            ErrorKind::InvalidInput,
-            "path must be shorter than SUN_LEN",
-        ));
-    }
-
-    unsafe {
-        std::ptr::copy_nonoverlapping(
-            bytes.as_ptr(),
-            addr.sun_path.as_mut_ptr().cast(),
-            bytes.len(),
-        );
-    }
-
-    let mut len = sun_path_offset(&addr) + bytes.len();
-    match bytes.first() {
-        Some(&0) | None => {}
-        Some(_) => len += 1,
-    }
-    Ok((addr, len))
-}
-
-pub(crate) fn map_ret(ret: i32) -> Result<usize> {
-    if ret == SOCKET_ERROR {
-        Err(Error::from_raw_os_error(unsafe { WSAGetLastError().0 }))
-    } else {
-        Ok(ret as usize)
-    }
-}
-
-fn sun_path_offset(addr: &SOCKADDR_UN) -> usize {
-    // Work with an actual instance of the type since using a null pointer is UB
-    let base = addr as *const _ as usize;
-    let path = &addr.sun_path as *const _ as usize;
-    path - base
-}
diff --git a/crates/node_runtime/Cargo.toml b/crates/node_runtime/Cargo.toml
deleted file mode 100644
index dfa40ad666..0000000000
--- a/crates/node_runtime/Cargo.toml
+++ /dev/null
@@ -1,36 +0,0 @@
-[package]
-name = "node_runtime"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/node_runtime.rs"
-doctest = false
-
-[features]
-test-support = []
-
-[dependencies]
-anyhow.workspace = true
-async-compression.workspace = true
-async-tar.workspace = true
-async-trait.workspace = true
-futures.workspace = true
-http_client.workspace = true
-log.workspace = true
-paths.workspace = true
-semver.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-smol.workspace = true
-util.workspace = true
-watch.workspace = true
-which.workspace = true
-
-[target.'cfg(windows)'.dependencies]
-async-std = { version = "1.12.0", features = ["unstable"] }
diff --git a/crates/node_runtime/LICENSE-GPL b/crates/node_runtime/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/node_runtime/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/node_runtime/src/node_runtime.rs b/crates/node_runtime/src/node_runtime.rs
deleted file mode 100644
index 1eb6714500..0000000000
--- a/crates/node_runtime/src/node_runtime.rs
+++ /dev/null
@@ -1,880 +0,0 @@
-use anyhow::{Context as _, Result, anyhow, bail};
-use async_compression::futures::bufread::GzipDecoder;
-use async_tar::Archive;
-use futures::{AsyncReadExt, FutureExt as _, channel::oneshot, future::Shared};
-use http_client::{Host, HttpClient, Url};
-use log::Level;
-use semver::Version;
-use serde::Deserialize;
-use smol::io::BufReader;
-use smol::{fs, lock::Mutex};
-use std::fmt::Display;
-use std::{
-    env::{self, consts},
-    ffi::OsString,
-    io,
-    net::{IpAddr, Ipv4Addr},
-    path::{Path, PathBuf},
-    process::Output,
-    sync::Arc,
-};
-use util::ResultExt;
-use util::archive::extract_zip;
-
-const NODE_CA_CERTS_ENV_VAR: &str = "NODE_EXTRA_CA_CERTS";
-
-#[derive(Clone, Debug, Default, Eq, PartialEq)]
-pub struct NodeBinaryOptions {
-    pub allow_path_lookup: bool,
-    pub allow_binary_download: bool,
-    pub use_paths: Option<(PathBuf, PathBuf)>,
-}
-
-pub enum VersionStrategy<'a> {
-    /// Install if current version doesn't match pinned version
-    Pin(&'a str),
-    /// Install if current version is older than latest version
-    Latest(&'a str),
-}
-
-#[derive(Clone)]
-pub struct NodeRuntime(Arc<Mutex<NodeRuntimeState>>);
-
-struct NodeRuntimeState {
-    http: Arc<dyn HttpClient>,
-    instance: Option<Box<dyn NodeRuntimeTrait>>,
-    last_options: Option<NodeBinaryOptions>,
-    options: watch::Receiver<Option<NodeBinaryOptions>>,
-    shell_env_loaded: Shared<oneshot::Receiver<()>>,
-}
-
-impl NodeRuntime {
-    pub fn new(
-        http: Arc<dyn HttpClient>,
-        shell_env_loaded: Option<oneshot::Receiver<()>>,
-        options: watch::Receiver<Option<NodeBinaryOptions>>,
-    ) -> Self {
-        NodeRuntime(Arc::new(Mutex::new(NodeRuntimeState {
-            http,
-            instance: None,
-            last_options: None,
-            options,
-            shell_env_loaded: shell_env_loaded.unwrap_or(oneshot::channel().1).shared(),
-        })))
-    }
-
-    pub fn unavailable() -> Self {
-        NodeRuntime(Arc::new(Mutex::new(NodeRuntimeState {
-            http: Arc::new(http_client::BlockedHttpClient),
-            instance: None,
-            last_options: None,
-            options: watch::channel(Some(NodeBinaryOptions::default())).1,
-            shell_env_loaded: oneshot::channel().1.shared(),
-        })))
-    }
-
-    async fn instance(&self) -> Box<dyn NodeRuntimeTrait> {
-        let mut state = self.0.lock().await;
-
-        let options = loop {
-            if let Some(options) = state.options.borrow().as_ref() {
-                break options.clone();
-            }
-            match state.options.changed().await {
-                Ok(()) => {}
-                // failure case not cached
-                Err(err) => {
-                    return Box::new(UnavailableNodeRuntime {
-                        error_message: err.to_string().into(),
-                    });
-                }
-            }
-        };
-
-        if state.last_options.as_ref() != Some(&options) {
-            state.instance.take();
-        }
-        if let Some(instance) = state.instance.as_ref() {
-            return instance.boxed_clone();
-        }
-
-        if let Some((node, npm)) = options.use_paths.as_ref() {
-            let instance = match SystemNodeRuntime::new(node.clone(), npm.clone()).await {
-                Ok(instance) => {
-                    log::info!("using Node.js from `node.path` in settings: {:?}", instance);
-                    Box::new(instance)
-                }
-                Err(err) => {
-                    // failure case not cached, since it's cheap to check again
-                    return Box::new(UnavailableNodeRuntime {
-                        error_message: format!(
-                            "failure checking Node.js from `node.path` in settings ({}): {:?}",
-                            node.display(),
-                            err
-                        )
-                        .into(),
-                    });
-                }
-            };
-            state.instance = Some(instance.boxed_clone());
-            state.last_options = Some(options);
-            return instance;
-        }
-
-        let system_node_error = if options.allow_path_lookup {
-            state.shell_env_loaded.clone().await.ok();
-            match SystemNodeRuntime::detect().await {
-                Ok(instance) => {
-                    log::info!("using Node.js found on PATH: {:?}", instance);
-                    state.instance = Some(instance.boxed_clone());
-                    state.last_options = Some(options);
-                    return Box::new(instance);
-                }
-                Err(err) => Some(err),
-            }
-        } else {
-            None
-        };
-
-        let instance = if options.allow_binary_download {
-            let (log_level, why_using_managed) = match system_node_error {
-                Some(err @ DetectError::Other(_)) => (Level::Warn, err.to_string()),
-                Some(err @ DetectError::NotInPath(_)) => (Level::Info, err.to_string()),
-                None => (
-                    Level::Info,
-                    "`node.ignore_system_version` is `true` in settings".to_string(),
-                ),
-            };
-            match ManagedNodeRuntime::install_if_needed(&state.http).await {
-                Ok(instance) => {
-                    log::log!(
-                        log_level,
-                        "using Zed managed Node.js at {} since {}",
-                        instance.installation_path.display(),
-                        why_using_managed
-                    );
-                    Box::new(instance) as Box<dyn NodeRuntimeTrait>
-                }
-                Err(err) => {
-                    // failure case is cached, since downloading + installing may be expensive. The
-                    // downside of this is that it may fail due to an intermittent network issue.
-                    //
-                    // TODO: Have `install_if_needed` indicate which failure cases are retryable
-                    // and/or have shared tracking of when internet is available.
-                    Box::new(UnavailableNodeRuntime {
-                        error_message: format!(
-                            "failure while downloading and/or installing Zed managed Node.js, \
-                            restart Zed to retry: {}",
-                            err
-                        )
-                        .into(),
-                    }) as Box<dyn NodeRuntimeTrait>
-                }
-            }
-        } else if let Some(system_node_error) = system_node_error {
-            // failure case not cached, since it's cheap to check again
-            //
-            // TODO: When support is added for setting `options.allow_binary_download`, update this
-            // error message.
-            return Box::new(UnavailableNodeRuntime {
-                error_message: format!(
-                    "failure while checking system Node.js from PATH: {}",
-                    system_node_error
-                )
-                .into(),
-            });
-        } else {
-            // failure case is cached because it will always happen with these options
-            //
-            // TODO: When support is added for setting `options.allow_binary_download`, update this
-            // error message.
-            Box::new(UnavailableNodeRuntime {
-                error_message: "`node` settings do not allow any way to use Node.js"
-                    .to_string()
-                    .into(),
-            })
-        };
-
-        state.instance = Some(instance.boxed_clone());
-        state.last_options = Some(options);
-        instance
-    }
-
-    pub async fn binary_path(&self) -> Result<PathBuf> {
-        self.instance().await.binary_path()
-    }
-
-    pub async fn run_npm_subcommand(
-        &self,
-        directory: Option<&Path>,
-        subcommand: &str,
-        args: &[&str],
-    ) -> Result<Output> {
-        let http = self.0.lock().await.http.clone();
-        self.instance()
-            .await
-            .run_npm_subcommand(directory, http.proxy(), subcommand, args)
-            .await
-    }
-
-    pub async fn npm_package_installed_version(
-        &self,
-        local_package_directory: &Path,
-        name: &str,
-    ) -> Result<Option<String>> {
-        self.instance()
-            .await
-            .npm_package_installed_version(local_package_directory, name)
-            .await
-    }
-
-    pub async fn npm_package_latest_version(&self, name: &str) -> Result<String> {
-        let http = self.0.lock().await.http.clone();
-        let output = self
-            .instance()
-            .await
-            .run_npm_subcommand(
-                None,
-                http.proxy(),
-                "info",
-                &[
-                    name,
-                    "--json",
-                    "--fetch-retry-mintimeout",
-                    "2000",
-                    "--fetch-retry-maxtimeout",
-                    "5000",
-                    "--fetch-timeout",
-                    "5000",
-                ],
-            )
-            .await?;
-
-        let mut info: NpmInfo = serde_json::from_slice(&output.stdout)?;
-        info.dist_tags
-            .latest
-            .or_else(|| info.versions.pop())
-            .with_context(|| format!("no version found for npm package {name}"))
-    }
-
-    pub async fn npm_install_packages(
-        &self,
-        directory: &Path,
-        packages: &[(&str, &str)],
-    ) -> Result<()> {
-        if packages.is_empty() {
-            return Ok(());
-        }
-
-        let packages: Vec<_> = packages
-            .iter()
-            .map(|(name, version)| format!("{name}@{version}"))
-            .collect();
-
-        let mut arguments: Vec<_> = packages.iter().map(|p| p.as_str()).collect();
-        arguments.extend_from_slice(&[
-            "--save-exact",
-            "--fetch-retry-mintimeout",
-            "2000",
-            "--fetch-retry-maxtimeout",
-            "5000",
-            "--fetch-timeout",
-            "5000",
-        ]);
-
-        // This is also wrong because the directory is wrong.
-        self.run_npm_subcommand(Some(directory), "install", &arguments)
-            .await?;
-        Ok(())
-    }
-
-    pub async fn should_install_npm_package(
-        &self,
-        package_name: &str,
-        local_executable_path: &Path,
-        local_package_directory: &Path,
-        version_strategy: VersionStrategy<'_>,
-    ) -> bool {
-        // In the case of the local system not having the package installed,
-        // or in the instances where we fail to parse package.json data,
-        // we attempt to install the package.
-        if fs::metadata(local_executable_path).await.is_err() {
-            return true;
-        }
-
-        let Some(installed_version) = self
-            .npm_package_installed_version(local_package_directory, package_name)
-            .await
-            .log_err()
-            .flatten()
-        else {
-            return true;
-        };
-
-        let Some(installed_version) = Version::parse(&installed_version).log_err() else {
-            return true;
-        };
-
-        match version_strategy {
-            VersionStrategy::Pin(pinned_version) => {
-                let Some(pinned_version) = Version::parse(pinned_version).log_err() else {
-                    return true;
-                };
-                installed_version != pinned_version
-            }
-            VersionStrategy::Latest(latest_version) => {
-                let Some(latest_version) = Version::parse(latest_version).log_err() else {
-                    return true;
-                };
-                installed_version < latest_version
-            }
-        }
-    }
-}
-
-enum ArchiveType {
-    TarGz,
-    Zip,
-}
-
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "kebab-case")]
-pub struct NpmInfo {
-    #[serde(default)]
-    dist_tags: NpmInfoDistTags,
-    versions: Vec<String>,
-}
-
-#[derive(Debug, Deserialize, Default)]
-pub struct NpmInfoDistTags {
-    latest: Option<String>,
-}
-
-#[async_trait::async_trait]
-trait NodeRuntimeTrait: Send + Sync {
-    fn boxed_clone(&self) -> Box<dyn NodeRuntimeTrait>;
-    fn binary_path(&self) -> Result<PathBuf>;
-
-    async fn run_npm_subcommand(
-        &self,
-        directory: Option<&Path>,
-        proxy: Option<&Url>,
-        subcommand: &str,
-        args: &[&str],
-    ) -> Result<Output>;
-
-    async fn npm_package_installed_version(
-        &self,
-        local_package_directory: &Path,
-        name: &str,
-    ) -> Result<Option<String>>;
-}
-
-#[derive(Clone)]
-struct ManagedNodeRuntime {
-    installation_path: PathBuf,
-}
-
-impl ManagedNodeRuntime {
-    const VERSION: &str = "v24.11.0";
-
-    #[cfg(not(windows))]
-    const NODE_PATH: &str = "bin/node";
-    #[cfg(windows)]
-    const NODE_PATH: &str = "node.exe";
-
-    #[cfg(not(windows))]
-    const NPM_PATH: &str = "bin/npm";
-    #[cfg(windows)]
-    const NPM_PATH: &str = "node_modules/npm/bin/npm-cli.js";
-
-    async fn install_if_needed(http: &Arc<dyn HttpClient>) -> Result<Self> {
-        log::info!("Node runtime install_if_needed");
-
-        let os = match consts::OS {
-            "macos" => "darwin",
-            "linux" => "linux",
-            "windows" => "win",
-            other => bail!("Running on unsupported os: {other}"),
-        };
-
-        let arch = match consts::ARCH {
-            "x86_64" => "x64",
-            "aarch64" => "arm64",
-            other => bail!("Running on unsupported architecture: {other}"),
-        };
-
-        let version = Self::VERSION;
-        let folder_name = format!("node-{version}-{os}-{arch}");
-        let node_containing_dir = paths::data_dir().join("node");
-        let node_dir = node_containing_dir.join(folder_name);
-        let node_binary = node_dir.join(Self::NODE_PATH);
-        let npm_file = node_dir.join(Self::NPM_PATH);
-        let node_ca_certs = env::var(NODE_CA_CERTS_ENV_VAR).unwrap_or_else(|_| String::new());
-
-        let valid = if fs::metadata(&node_binary).await.is_ok() {
-            let result = util::command::new_smol_command(&node_binary)
-                .env(NODE_CA_CERTS_ENV_VAR, node_ca_certs)
-                .arg(npm_file)
-                .arg("--version")
-                .args(["--cache".into(), node_dir.join("cache")])
-                .args(["--userconfig".into(), node_dir.join("blank_user_npmrc")])
-                .args(["--globalconfig".into(), node_dir.join("blank_global_npmrc")])
-                .output()
-                .await;
-            match result {
-                Ok(output) => {
-                    if output.status.success() {
-                        true
-                    } else {
-                        log::warn!(
-                            "Zed managed Node.js binary at {} failed check with output: {:?}",
-                            node_binary.display(),
-                            output
-                        );
-                        false
-                    }
-                }
-                Err(err) => {
-                    log::warn!(
-                        "Zed managed Node.js binary at {} failed check, so re-downloading it. \
-                        Error: {}",
-                        node_binary.display(),
-                        err
-                    );
-                    false
-                }
-            }
-        } else {
-            false
-        };
-
-        if !valid {
-            _ = fs::remove_dir_all(&node_containing_dir).await;
-            fs::create_dir(&node_containing_dir)
-                .await
-                .context("error creating node containing dir")?;
-
-            let archive_type = match consts::OS {
-                "macos" | "linux" => ArchiveType::TarGz,
-                "windows" => ArchiveType::Zip,
-                other => bail!("Running on unsupported os: {other}"),
-            };
-
-            let version = Self::VERSION;
-            let file_name = format!(
-                "node-{version}-{os}-{arch}.{extension}",
-                extension = match archive_type {
-                    ArchiveType::TarGz => "tar.gz",
-                    ArchiveType::Zip => "zip",
-                }
-            );
-
-            let url = format!("https://nodejs.org/dist/{version}/{file_name}");
-            log::info!("Downloading Node.js binary from {url}");
-            let mut response = http
-                .get(&url, Default::default(), true)
-                .await
-                .context("error downloading Node binary tarball")?;
-            log::info!("Download of Node.js complete, extracting...");
-
-            let body = response.body_mut();
-            match archive_type {
-                ArchiveType::TarGz => {
-                    let decompressed_bytes = GzipDecoder::new(BufReader::new(response.body_mut()));
-                    let archive = Archive::new(decompressed_bytes);
-                    archive.unpack(&node_containing_dir).await?;
-                }
-                ArchiveType::Zip => extract_zip(&node_containing_dir, body).await?,
-            }
-            log::info!("Extracted Node.js to {}", node_containing_dir.display())
-        }
-
-        // Note: Not in the `if !valid {}` so we can populate these for existing installations
-        _ = fs::create_dir(node_dir.join("cache")).await;
-        _ = fs::write(node_dir.join("blank_user_npmrc"), []).await;
-        _ = fs::write(node_dir.join("blank_global_npmrc"), []).await;
-
-        anyhow::Ok(ManagedNodeRuntime {
-            installation_path: node_dir,
-        })
-    }
-}
-
-fn path_with_node_binary_prepended(node_binary: &Path) -> Option<OsString> {
-    let existing_path = env::var_os("PATH");
-    let node_bin_dir = node_binary.parent().map(|dir| dir.as_os_str());
-    match (existing_path, node_bin_dir) {
-        (Some(existing_path), Some(node_bin_dir)) => {
-            if let Ok(joined) = env::join_paths(
-                [PathBuf::from(node_bin_dir)]
-                    .into_iter()
-                    .chain(env::split_paths(&existing_path)),
-            ) {
-                Some(joined)
-            } else {
-                Some(existing_path)
-            }
-        }
-        (Some(existing_path), None) => Some(existing_path),
-        (None, Some(node_bin_dir)) => Some(node_bin_dir.to_owned()),
-        _ => None,
-    }
-}
-
-#[async_trait::async_trait]
-impl NodeRuntimeTrait for ManagedNodeRuntime {
-    fn boxed_clone(&self) -> Box<dyn NodeRuntimeTrait> {
-        Box::new(self.clone())
-    }
-
-    fn binary_path(&self) -> Result<PathBuf> {
-        Ok(self.installation_path.join(Self::NODE_PATH))
-    }
-
-    async fn run_npm_subcommand(
-        &self,
-        directory: Option<&Path>,
-        proxy: Option<&Url>,
-        subcommand: &str,
-        args: &[&str],
-    ) -> Result<Output> {
-        let attempt = || async move {
-            let node_binary = self.installation_path.join(Self::NODE_PATH);
-            let npm_file = self.installation_path.join(Self::NPM_PATH);
-            let env_path = path_with_node_binary_prepended(&node_binary).unwrap_or_default();
-
-            anyhow::ensure!(
-                smol::fs::metadata(&node_binary).await.is_ok(),
-                "missing node binary file"
-            );
-            anyhow::ensure!(
-                smol::fs::metadata(&npm_file).await.is_ok(),
-                "missing npm file"
-            );
-
-            let node_ca_certs = env::var(NODE_CA_CERTS_ENV_VAR).unwrap_or_else(|_| String::new());
-
-            let mut command = util::command::new_smol_command(node_binary);
-            command.env("PATH", env_path);
-            command.env(NODE_CA_CERTS_ENV_VAR, node_ca_certs);
-            command.arg(npm_file).arg(subcommand);
-            command.arg(format!(
-                "--cache={}",
-                self.installation_path.join("cache").display()
-            ));
-            command.args([
-                "--userconfig".into(),
-                self.installation_path.join("blank_user_npmrc"),
-            ]);
-            command.args([
-                "--globalconfig".into(),
-                self.installation_path.join("blank_global_npmrc"),
-            ]);
-            command.args(args);
-            configure_npm_command(&mut command, directory, proxy);
-            command.output().await.map_err(|e| anyhow!("{e}"))
-        };
-
-        let mut output = attempt().await;
-        if output.is_err() {
-            output = attempt().await;
-            anyhow::ensure!(
-                output.is_ok(),
-                "failed to launch npm subcommand {subcommand} subcommand\nerr: {:?}",
-                output.err()
-            );
-        }
-
-        if let Ok(output) = &output {
-            anyhow::ensure!(
-                output.status.success(),
-                "failed to execute npm {subcommand} subcommand:\nstdout: {:?}\nstderr: {:?}",
-                String::from_utf8_lossy(&output.stdout),
-                String::from_utf8_lossy(&output.stderr)
-            );
-        }
-
-        output.map_err(|e| anyhow!("{e}"))
-    }
-    async fn npm_package_installed_version(
-        &self,
-        local_package_directory: &Path,
-        name: &str,
-    ) -> Result<Option<String>> {
-        read_package_installed_version(local_package_directory.join("node_modules"), name).await
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct SystemNodeRuntime {
-    node: PathBuf,
-    npm: PathBuf,
-    global_node_modules: PathBuf,
-    scratch_dir: PathBuf,
-}
-
-impl SystemNodeRuntime {
-    const MIN_VERSION: semver::Version = Version::new(22, 0, 0);
-    async fn new(node: PathBuf, npm: PathBuf) -> Result<Self> {
-        let output = util::command::new_smol_command(&node)
-            .arg("--version")
-            .output()
-            .await
-            .with_context(|| format!("running node from {:?}", node))?;
-        if !output.status.success() {
-            anyhow::bail!(
-                "failed to run node --version. stdout: {}, stderr: {}",
-                String::from_utf8_lossy(&output.stdout),
-                String::from_utf8_lossy(&output.stderr),
-            );
-        }
-        let version_str = String::from_utf8_lossy(&output.stdout);
-        let version = semver::Version::parse(version_str.trim().trim_start_matches('v'))?;
-        if version < Self::MIN_VERSION {
-            anyhow::bail!(
-                "node at {} is too old. want: {}, got: {}",
-                node.to_string_lossy(),
-                Self::MIN_VERSION,
-                version
-            )
-        }
-
-        let scratch_dir = paths::data_dir().join("node");
-        fs::create_dir(&scratch_dir).await.ok();
-        fs::create_dir(scratch_dir.join("cache")).await.ok();
-
-        let mut this = Self {
-            node,
-            npm,
-            global_node_modules: PathBuf::default(),
-            scratch_dir,
-        };
-        let output = this.run_npm_subcommand(None, None, "root", &["-g"]).await?;
-        this.global_node_modules =
-            PathBuf::from(String::from_utf8_lossy(&output.stdout).to_string());
-
-        Ok(this)
-    }
-
-    async fn detect() -> std::result::Result<Self, DetectError> {
-        let node = which::which("node").map_err(DetectError::NotInPath)?;
-        let npm = which::which("npm").map_err(DetectError::NotInPath)?;
-        Self::new(node, npm).await.map_err(DetectError::Other)
-    }
-}
-
-enum DetectError {
-    NotInPath(which::Error),
-    Other(anyhow::Error),
-}
-
-impl Display for DetectError {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            DetectError::NotInPath(err) => {
-                write!(f, "system Node.js wasn't found on PATH: {}", err)
-            }
-            DetectError::Other(err) => {
-                write!(f, "checking system Node.js failed with error: {}", err)
-            }
-        }
-    }
-}
-
-#[async_trait::async_trait]
-impl NodeRuntimeTrait for SystemNodeRuntime {
-    fn boxed_clone(&self) -> Box<dyn NodeRuntimeTrait> {
-        Box::new(self.clone())
-    }
-
-    fn binary_path(&self) -> Result<PathBuf> {
-        Ok(self.node.clone())
-    }
-
-    async fn run_npm_subcommand(
-        &self,
-        directory: Option<&Path>,
-        proxy: Option<&Url>,
-        subcommand: &str,
-        args: &[&str],
-    ) -> anyhow::Result<Output> {
-        let node_ca_certs = env::var(NODE_CA_CERTS_ENV_VAR).unwrap_or_else(|_| String::new());
-        let mut command = util::command::new_smol_command(self.npm.clone());
-        let path = path_with_node_binary_prepended(&self.node).unwrap_or_default();
-        command
-            .env("PATH", path)
-            .env(NODE_CA_CERTS_ENV_VAR, node_ca_certs)
-            .arg(subcommand)
-            .arg(format!(
-                "--cache={}",
-                self.scratch_dir.join("cache").display()
-            ))
-            .args(args);
-        configure_npm_command(&mut command, directory, proxy);
-        let output = command.output().await?;
-        anyhow::ensure!(
-            output.status.success(),
-            "failed to execute npm {subcommand} subcommand:\nstdout: {:?}\nstderr: {:?}",
-            String::from_utf8_lossy(&output.stdout),
-            String::from_utf8_lossy(&output.stderr)
-        );
-        Ok(output)
-    }
-
-    async fn npm_package_installed_version(
-        &self,
-        local_package_directory: &Path,
-        name: &str,
-    ) -> Result<Option<String>> {
-        read_package_installed_version(local_package_directory.join("node_modules"), name).await
-        // todo: allow returning a globally installed version (requires callers not to hard-code the path)
-    }
-}
-
-pub async fn read_package_installed_version(
-    node_module_directory: PathBuf,
-    name: &str,
-) -> Result<Option<String>> {
-    let package_json_path = node_module_directory.join(name).join("package.json");
-
-    let mut file = match fs::File::open(package_json_path).await {
-        Ok(file) => file,
-        Err(err) => {
-            if err.kind() == io::ErrorKind::NotFound {
-                return Ok(None);
-            }
-
-            Err(err)?
-        }
-    };
-
-    #[derive(Deserialize)]
-    struct PackageJson {
-        version: String,
-    }
-
-    let mut contents = String::new();
-    file.read_to_string(&mut contents).await?;
-    let package_json: PackageJson = serde_json::from_str(&contents)?;
-    Ok(Some(package_json.version))
-}
-
-#[derive(Clone)]
-pub struct UnavailableNodeRuntime {
-    error_message: Arc<String>,
-}
-
-#[async_trait::async_trait]
-impl NodeRuntimeTrait for UnavailableNodeRuntime {
-    fn boxed_clone(&self) -> Box<dyn NodeRuntimeTrait> {
-        Box::new(self.clone())
-    }
-    fn binary_path(&self) -> Result<PathBuf> {
-        bail!("{}", self.error_message)
-    }
-
-    async fn run_npm_subcommand(
-        &self,
-        _: Option<&Path>,
-        _: Option<&Url>,
-        _: &str,
-        _: &[&str],
-    ) -> anyhow::Result<Output> {
-        bail!("{}", self.error_message)
-    }
-
-    async fn npm_package_installed_version(
-        &self,
-        _local_package_directory: &Path,
-        _: &str,
-    ) -> Result<Option<String>> {
-        bail!("{}", self.error_message)
-    }
-}
-
-fn configure_npm_command(
-    command: &mut smol::process::Command,
-    directory: Option<&Path>,
-    proxy: Option<&Url>,
-) {
-    if let Some(directory) = directory {
-        command.current_dir(directory);
-        command.args(["--prefix".into(), directory.to_path_buf()]);
-    }
-
-    if let Some(mut proxy) = proxy.cloned() {
-        // Map proxy settings from `http://localhost:10809` to `http://127.0.0.1:10809`
-        // NodeRuntime without environment information can not parse `localhost`
-        // correctly.
-        // TODO: map to `[::1]` if we are using ipv6
-        if matches!(proxy.host(), Some(Host::Domain(domain)) if domain.eq_ignore_ascii_case("localhost"))
-        {
-            // When localhost is a valid Host, so is `127.0.0.1`
-            let _ = proxy.set_ip_host(IpAddr::V4(Ipv4Addr::LOCALHOST));
-        }
-
-        command.args(["--proxy", proxy.as_str()]);
-    }
-
-    #[cfg(windows)]
-    {
-        // SYSTEMROOT is a critical environment variables for Windows.
-        if let Some(val) = env::var("SYSTEMROOT")
-            .context("Missing environment variable: SYSTEMROOT!")
-            .log_err()
-        {
-            command.env("SYSTEMROOT", val);
-        }
-        // Without ComSpec, the post-install will always fail.
-        if let Some(val) = env::var("ComSpec")
-            .context("Missing environment variable: ComSpec!")
-            .log_err()
-        {
-            command.env("ComSpec", val);
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use http_client::Url;
-
-    use super::configure_npm_command;
-
-    // Map localhost to 127.0.0.1
-    // NodeRuntime without environment information can not parse `localhost` correctly.
-    #[test]
-    fn test_configure_npm_command_map_localhost_proxy() {
-        const CASES: [(&str, &str); 4] = [
-            // Map localhost to 127.0.0.1
-            ("http://localhost:9090/", "http://127.0.0.1:9090/"),
-            ("https://google.com/", "https://google.com/"),
-            (
-                "http://username:password@proxy.thing.com:8080/",
-                "http://username:password@proxy.thing.com:8080/",
-            ),
-            // Test when localhost is contained within a different part of the URL
-            (
-                "http://username:localhost@localhost:8080/",
-                "http://username:localhost@127.0.0.1:8080/",
-            ),
-        ];
-
-        for (proxy, mapped_proxy) in CASES {
-            let mut dummy = smol::process::Command::new("");
-            let proxy = Url::parse(proxy).unwrap();
-            configure_npm_command(&mut dummy, None, Some(&proxy));
-            let proxy = dummy
-                .get_args()
-                .skip_while(|&arg| arg != "--proxy")
-                .skip(1)
-                .next();
-            let proxy = proxy.expect("Proxy was not passed to Command correctly");
-            assert_eq!(
-                proxy, mapped_proxy,
-                "Incorrectly mapped localhost to 127.0.0.1"
-            );
-        }
-    }
-}
diff --git a/crates/notifications/Cargo.toml b/crates/notifications/Cargo.toml
deleted file mode 100644
index 8304c788fd..0000000000
--- a/crates/notifications/Cargo.toml
+++ /dev/null
@@ -1,44 +0,0 @@
-[package]
-name = "notifications"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/notifications.rs"
-doctest = false
-
-[features]
-test-support = [
-    "channel/test-support",
-    "collections/test-support",
-    "gpui/test-support",
-    "rpc/test-support",
-]
-
-[dependencies]
-anyhow.workspace = true
-channel.workspace = true
-client.workspace = true
-component.workspace = true
-db.workspace = true
-gpui.workspace = true
-rpc.workspace = true
-sum_tree.workspace = true
-time.workspace = true
-ui.workspace = true
-util.workspace = true
-workspace.workspace = true
-zed_actions.workspace = true
-
-[dev-dependencies]
-client = { workspace = true, features = ["test-support"] }
-collections = { workspace = true, features = ["test-support"] }
-gpui = { workspace = true, features = ["test-support"] }
-rpc = { workspace = true, features = ["test-support"] }
-settings = { workspace = true, features = ["test-support"] }
-util = { workspace = true, features = ["test-support"] }
diff --git a/crates/notifications/LICENSE-GPL b/crates/notifications/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/notifications/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/notifications/src/notification_store.rs b/crates/notifications/src/notification_store.rs
deleted file mode 100644
index 7cae74a729..0000000000
--- a/crates/notifications/src/notification_store.rs
+++ /dev/null
@@ -1,432 +0,0 @@
-use anyhow::{Context as _, Result};
-use channel::ChannelStore;
-use client::{ChannelId, Client, UserStore};
-use db::smol::stream::StreamExt;
-use gpui::{App, AppContext as _, AsyncApp, Context, Entity, EventEmitter, Global, Task};
-use rpc::{Notification, TypedEnvelope, proto};
-use std::{ops::Range, sync::Arc};
-use sum_tree::{Bias, Dimensions, SumTree};
-use time::OffsetDateTime;
-use util::ResultExt;
-
-pub fn init(client: Arc<Client>, user_store: Entity<UserStore>, cx: &mut App) {
-    let notification_store = cx.new(|cx| NotificationStore::new(client, user_store, cx));
-    cx.set_global(GlobalNotificationStore(notification_store));
-}
-
-struct GlobalNotificationStore(Entity<NotificationStore>);
-
-impl Global for GlobalNotificationStore {}
-
-pub struct NotificationStore {
-    client: Arc<Client>,
-    user_store: Entity<UserStore>,
-    channel_store: Entity<ChannelStore>,
-    notifications: SumTree<NotificationEntry>,
-    loaded_all_notifications: bool,
-    _watch_connection_status: Task<Option<()>>,
-    _subscriptions: Vec<client::Subscription>,
-}
-
-#[derive(Clone, PartialEq, Eq, Debug)]
-pub enum NotificationEvent {
-    NotificationsUpdated {
-        old_range: Range<usize>,
-        new_count: usize,
-    },
-    NewNotification {
-        entry: NotificationEntry,
-    },
-    NotificationRemoved {
-        entry: NotificationEntry,
-    },
-    NotificationRead {
-        entry: NotificationEntry,
-    },
-}
-
-#[derive(Debug, PartialEq, Eq, Clone)]
-pub struct NotificationEntry {
-    pub id: u64,
-    pub notification: Notification,
-    pub timestamp: OffsetDateTime,
-    pub is_read: bool,
-    pub response: Option<bool>,
-}
-
-#[derive(Clone, Debug, Default)]
-pub struct NotificationSummary {
-    max_id: u64,
-    count: usize,
-    unread_count: usize,
-}
-
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, PartialOrd, Ord)]
-struct Count(usize);
-
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, PartialOrd, Ord)]
-struct NotificationId(u64);
-
-impl NotificationStore {
-    pub fn global(cx: &App) -> Entity<Self> {
-        cx.global::<GlobalNotificationStore>().0.clone()
-    }
-
-    pub fn new(client: Arc<Client>, user_store: Entity<UserStore>, cx: &mut Context<Self>) -> Self {
-        let mut connection_status = client.status();
-        let watch_connection_status = cx.spawn(async move |this, cx| {
-            while let Some(status) = connection_status.next().await {
-                let this = this.upgrade()?;
-                match status {
-                    client::Status::Connected { .. } => {
-                        if let Some(task) = this
-                            .update(cx, |this, cx| this.handle_connect(cx))
-                            .log_err()?
-                        {
-                            task.await.log_err()?;
-                        }
-                    }
-                    _ => this
-                        .update(cx, |this, cx| this.handle_disconnect(cx))
-                        .log_err()?,
-                }
-            }
-            Some(())
-        });
-
-        Self {
-            channel_store: ChannelStore::global(cx),
-            notifications: Default::default(),
-            loaded_all_notifications: false,
-            _watch_connection_status: watch_connection_status,
-            _subscriptions: vec![
-                client.add_message_handler(cx.weak_entity(), Self::handle_new_notification),
-                client.add_message_handler(cx.weak_entity(), Self::handle_delete_notification),
-            ],
-            user_store,
-            client,
-        }
-    }
-
-    pub fn notification_count(&self) -> usize {
-        self.notifications.summary().count
-    }
-
-    pub fn unread_notification_count(&self) -> usize {
-        self.notifications.summary().unread_count
-    }
-
-    // Get the nth newest notification.
-    pub fn notification_at(&self, ix: usize) -> Option<&NotificationEntry> {
-        let count = self.notifications.summary().count;
-        if ix >= count {
-            return None;
-        }
-        let ix = count - 1 - ix;
-        let (.., item) = self
-            .notifications
-            .find::<Count, _>((), &Count(ix), Bias::Right);
-        item
-    }
-    pub fn notification_for_id(&self, id: u64) -> Option<&NotificationEntry> {
-        let (.., item) =
-            self.notifications
-                .find::<NotificationId, _>((), &NotificationId(id), Bias::Left);
-        if let Some(item) = item
-            && item.id == id
-        {
-            return Some(item);
-        }
-        None
-    }
-
-    pub fn load_more_notifications(
-        &self,
-        clear_old: bool,
-        cx: &mut Context<Self>,
-    ) -> Option<Task<Result<()>>> {
-        if self.loaded_all_notifications && !clear_old {
-            return None;
-        }
-
-        let before_id = if clear_old {
-            None
-        } else {
-            self.notifications.first().map(|entry| entry.id)
-        };
-        let request = self.client.request(proto::GetNotifications { before_id });
-        Some(cx.spawn(async move |this, cx| {
-            let this = this
-                .upgrade()
-                .context("Notification store was dropped while loading notifications")?;
-
-            let response = request.await?;
-            this.update(cx, |this, _| this.loaded_all_notifications = response.done)?;
-            Self::add_notifications(
-                this,
-                response.notifications,
-                AddNotificationsOptions {
-                    is_new: false,
-                    clear_old,
-                    includes_first: response.done,
-                },
-                cx,
-            )
-            .await?;
-            Ok(())
-        }))
-    }
-
-    fn handle_connect(&mut self, cx: &mut Context<Self>) -> Option<Task<Result<()>>> {
-        self.notifications = Default::default();
-        cx.notify();
-        self.load_more_notifications(true, cx)
-    }
-
-    fn handle_disconnect(&mut self, cx: &mut Context<Self>) {
-        cx.notify()
-    }
-
-    async fn handle_new_notification(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::AddNotification>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        Self::add_notifications(
-            this,
-            envelope.payload.notification.into_iter().collect(),
-            AddNotificationsOptions {
-                is_new: true,
-                clear_old: false,
-                includes_first: false,
-            },
-            &mut cx,
-        )
-        .await
-    }
-
-    async fn handle_delete_notification(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::DeleteNotification>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        this.update(&mut cx, |this, cx| {
-            this.splice_notifications([(envelope.payload.notification_id, None)], false, cx);
-            Ok(())
-        })?
-    }
-
-    async fn add_notifications(
-        this: Entity<Self>,
-        notifications: Vec<proto::Notification>,
-        options: AddNotificationsOptions,
-        cx: &mut AsyncApp,
-    ) -> Result<()> {
-        let mut user_ids = Vec::new();
-
-        let notifications = notifications
-            .into_iter()
-            .filter_map(|message| {
-                Some(NotificationEntry {
-                    id: message.id,
-                    is_read: message.is_read,
-                    timestamp: OffsetDateTime::from_unix_timestamp(message.timestamp as i64)
-                        .ok()?,
-                    notification: Notification::from_proto(&message)?,
-                    response: message.response,
-                })
-            })
-            .collect::<Vec<_>>();
-        if notifications.is_empty() {
-            return Ok(());
-        }
-
-        for entry in &notifications {
-            match entry.notification {
-                Notification::ChannelInvitation { inviter_id, .. } => {
-                    user_ids.push(inviter_id);
-                }
-                Notification::ContactRequest {
-                    sender_id: requester_id,
-                } => {
-                    user_ids.push(requester_id);
-                }
-                Notification::ContactRequestAccepted {
-                    responder_id: contact_id,
-                } => {
-                    user_ids.push(contact_id);
-                }
-            }
-        }
-
-        let user_store = this.read_with(cx, |this, _| this.user_store.clone())?;
-
-        user_store
-            .update(cx, |store, cx| store.get_users(user_ids, cx))?
-            .await?;
-        this.update(cx, |this, cx| {
-            if options.clear_old {
-                cx.emit(NotificationEvent::NotificationsUpdated {
-                    old_range: 0..this.notifications.summary().count,
-                    new_count: 0,
-                });
-                this.notifications = SumTree::default();
-                this.loaded_all_notifications = false;
-            }
-
-            if options.includes_first {
-                this.loaded_all_notifications = true;
-            }
-
-            this.splice_notifications(
-                notifications
-                    .into_iter()
-                    .map(|notification| (notification.id, Some(notification))),
-                options.is_new,
-                cx,
-            );
-        })
-        .log_err();
-
-        Ok(())
-    }
-
-    fn splice_notifications(
-        &mut self,
-        notifications: impl IntoIterator<Item = (u64, Option<NotificationEntry>)>,
-        is_new: bool,
-        cx: &mut Context<NotificationStore>,
-    ) {
-        let mut cursor = self
-            .notifications
-            .cursor::<Dimensions<NotificationId, Count>>(());
-        let mut new_notifications = SumTree::default();
-        let mut old_range = 0..0;
-
-        for (i, (id, new_notification)) in notifications.into_iter().enumerate() {
-            new_notifications.append(cursor.slice(&NotificationId(id), Bias::Left), ());
-
-            if i == 0 {
-                old_range.start = cursor.start().1.0;
-            }
-
-            let old_notification = cursor.item();
-            if let Some(old_notification) = old_notification {
-                if old_notification.id == id {
-                    cursor.next();
-
-                    if let Some(new_notification) = &new_notification {
-                        if new_notification.is_read {
-                            cx.emit(NotificationEvent::NotificationRead {
-                                entry: new_notification.clone(),
-                            });
-                        }
-                    } else {
-                        cx.emit(NotificationEvent::NotificationRemoved {
-                            entry: old_notification.clone(),
-                        });
-                    }
-                }
-            } else if let Some(new_notification) = &new_notification
-                && is_new
-            {
-                cx.emit(NotificationEvent::NewNotification {
-                    entry: new_notification.clone(),
-                });
-            }
-
-            if let Some(notification) = new_notification {
-                new_notifications.push(notification, ());
-            }
-        }
-
-        old_range.end = cursor.start().1.0;
-        let new_count = new_notifications.summary().count - old_range.start;
-        new_notifications.append(cursor.suffix(), ());
-        drop(cursor);
-
-        self.notifications = new_notifications;
-        cx.emit(NotificationEvent::NotificationsUpdated {
-            old_range,
-            new_count,
-        });
-    }
-
-    pub fn respond_to_notification(
-        &mut self,
-        notification: Notification,
-        response: bool,
-        cx: &mut Context<Self>,
-    ) {
-        match notification {
-            Notification::ContactRequest { sender_id } => {
-                self.user_store
-                    .update(cx, |store, cx| {
-                        store.respond_to_contact_request(sender_id, response, cx)
-                    })
-                    .detach();
-            }
-            Notification::ChannelInvitation { channel_id, .. } => {
-                self.channel_store
-                    .update(cx, |store, cx| {
-                        store.respond_to_channel_invite(ChannelId(channel_id), response, cx)
-                    })
-                    .detach();
-            }
-            _ => {}
-        }
-    }
-}
-
-impl EventEmitter<NotificationEvent> for NotificationStore {}
-
-impl sum_tree::Item for NotificationEntry {
-    type Summary = NotificationSummary;
-
-    fn summary(&self, _cx: ()) -> Self::Summary {
-        NotificationSummary {
-            max_id: self.id,
-            count: 1,
-            unread_count: if self.is_read { 0 } else { 1 },
-        }
-    }
-}
-
-impl sum_tree::ContextLessSummary for NotificationSummary {
-    fn zero() -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, summary: &Self) {
-        self.max_id = self.max_id.max(summary.max_id);
-        self.count += summary.count;
-        self.unread_count += summary.unread_count;
-    }
-}
-
-impl sum_tree::Dimension<'_, NotificationSummary> for NotificationId {
-    fn zero(_cx: ()) -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, summary: &NotificationSummary, _: ()) {
-        debug_assert!(summary.max_id > self.0);
-        self.0 = summary.max_id;
-    }
-}
-
-impl sum_tree::Dimension<'_, NotificationSummary> for Count {
-    fn zero(_cx: ()) -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, summary: &NotificationSummary, _: ()) {
-        self.0 += summary.count;
-    }
-}
-
-struct AddNotificationsOptions {
-    is_new: bool,
-    clear_old: bool,
-    includes_first: bool,
-}
diff --git a/crates/notifications/src/notifications.rs b/crates/notifications/src/notifications.rs
deleted file mode 100644
index ee952555eb..0000000000
--- a/crates/notifications/src/notifications.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-mod notification_store;
-
-pub use notification_store::*;
-pub mod status_toast;
diff --git a/crates/notifications/src/status_toast.rs b/crates/notifications/src/status_toast.rs
deleted file mode 100644
index 7affa93f5a..0000000000
--- a/crates/notifications/src/status_toast.rs
+++ /dev/null
@@ -1,254 +0,0 @@
-use std::rc::Rc;
-
-use gpui::{DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, IntoElement};
-use ui::{Tooltip, prelude::*};
-use workspace::{ToastAction, ToastView};
-use zed_actions::toast;
-
-#[derive(Clone, Copy)]
-pub struct ToastIcon {
-    icon: IconName,
-    color: Color,
-}
-
-impl ToastIcon {
-    pub fn new(icon: IconName) -> Self {
-        Self {
-            icon,
-            color: Color::default(),
-        }
-    }
-
-    pub fn color(mut self, color: Color) -> Self {
-        self.color = color;
-        self
-    }
-}
-
-impl From<IconName> for ToastIcon {
-    fn from(icon: IconName) -> Self {
-        Self {
-            icon,
-            color: Color::default(),
-        }
-    }
-}
-
-#[derive(RegisterComponent)]
-pub struct StatusToast {
-    icon: Option<ToastIcon>,
-    text: SharedString,
-    action: Option<ToastAction>,
-    show_dismiss: bool,
-    this_handle: Entity<Self>,
-    focus_handle: FocusHandle,
-}
-
-impl StatusToast {
-    pub fn new(
-        text: impl Into<SharedString>,
-        cx: &mut App,
-        f: impl FnOnce(Self, &mut Context<Self>) -> Self,
-    ) -> Entity<Self> {
-        cx.new(|cx| {
-            let focus_handle = cx.focus_handle();
-
-            f(
-                Self {
-                    text: text.into(),
-                    icon: None,
-                    action: None,
-                    show_dismiss: false,
-                    this_handle: cx.entity(),
-                    focus_handle,
-                },
-                cx,
-            )
-        })
-    }
-
-    pub fn icon(mut self, icon: ToastIcon) -> Self {
-        self.icon = Some(icon);
-        self
-    }
-
-    pub fn action(
-        mut self,
-        label: impl Into<SharedString>,
-        f: impl Fn(&mut Window, &mut App) + 'static,
-    ) -> Self {
-        let this_handle = self.this_handle.clone();
-        self.action = Some(ToastAction::new(
-            label.into(),
-            Some(Rc::new(move |window, cx| {
-                this_handle.update(cx, |_, cx| {
-                    cx.emit(DismissEvent);
-                });
-                f(window, cx);
-            })),
-        ));
-        self
-    }
-
-    pub fn dismiss_button(mut self, show: bool) -> Self {
-        self.show_dismiss = show;
-        self
-    }
-}
-
-impl Render for StatusToast {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let has_action_or_dismiss = self.action.is_some() || self.show_dismiss;
-
-        h_flex()
-            .id("status-toast")
-            .elevation_3(cx)
-            .gap_2()
-            .py_1p5()
-            .pl_2p5()
-            .map(|this| {
-                if has_action_or_dismiss {
-                    this.pr_1p5()
-                } else {
-                    this.pr_2p5()
-                }
-            })
-            .flex_none()
-            .bg(cx.theme().colors().surface_background)
-            .shadow_lg()
-            .when_some(self.icon.as_ref(), |this, icon| {
-                this.child(Icon::new(icon.icon).color(icon.color))
-            })
-            .child(Label::new(self.text.clone()).color(Color::Default))
-            .when_some(self.action.as_ref(), |this, action| {
-                this.child(
-                    Button::new(action.id.clone(), action.label.clone())
-                        .tooltip(Tooltip::for_action_title(
-                            action.label.clone(),
-                            &toast::RunAction,
-                        ))
-                        .color(Color::Muted)
-                        .when_some(action.on_click.clone(), |el, handler| {
-                            el.on_click(move |_click_event, window, cx| handler(window, cx))
-                        }),
-                )
-            })
-            .when(self.show_dismiss, |this| {
-                let handle = self.this_handle.clone();
-                this.child(
-                    IconButton::new("dismiss", IconName::Close)
-                        .icon_size(IconSize::XSmall)
-                        .icon_color(Color::Muted)
-                        .tooltip(Tooltip::text("Dismiss"))
-                        .on_click(move |_click_event, _window, cx| {
-                            handle.update(cx, |_, cx| {
-                                cx.emit(DismissEvent);
-                            });
-                        }),
-                )
-            })
-    }
-}
-
-impl ToastView for StatusToast {
-    fn action(&self) -> Option<ToastAction> {
-        self.action.clone()
-    }
-}
-
-impl Focusable for StatusToast {
-    fn focus_handle(&self, _cx: &App) -> gpui::FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl EventEmitter<DismissEvent> for StatusToast {}
-
-impl Component for StatusToast {
-    fn scope() -> ComponentScope {
-        ComponentScope::Notification
-    }
-
-    fn preview(_window: &mut Window, cx: &mut App) -> Option<AnyElement> {
-        let text_example = StatusToast::new("Operation completed", cx, |this, _| this);
-
-        let action_example = StatusToast::new("Update ready to install", cx, |this, _cx| {
-            this.action("Restart", |_, _| {})
-        });
-
-        let dismiss_button_example =
-            StatusToast::new("Dismiss Button", cx, |this, _| this.dismiss_button(true));
-
-        let icon_example = StatusToast::new(
-            "Nathan Sobo accepted your contact request",
-            cx,
-            |this, _| this.icon(ToastIcon::new(IconName::Check).color(Color::Muted)),
-        );
-
-        let success_example = StatusToast::new("Pushed 4 changes to `zed/main`", cx, |this, _| {
-            this.icon(ToastIcon::new(IconName::Check).color(Color::Success))
-        });
-
-        let error_example = StatusToast::new(
-            "git push: Couldn't find remote origin `iamnbutler/zed`",
-            cx,
-            |this, _cx| {
-                this.icon(ToastIcon::new(IconName::XCircle).color(Color::Error))
-                    .action("More Info", |_, _| {})
-            },
-        );
-
-        let warning_example = StatusToast::new("You have outdated settings", cx, |this, _cx| {
-            this.icon(ToastIcon::new(IconName::Warning).color(Color::Warning))
-                .action("More Info", |_, _| {})
-        });
-
-        let pr_example =
-            StatusToast::new("`zed/new-notification-system` created!", cx, |this, _cx| {
-                this.icon(ToastIcon::new(IconName::GitBranchAlt).color(Color::Muted))
-                    .action("Open Pull Request", |_, cx| {
-                        cx.open_url("https://github.com/")
-                    })
-            });
-
-        Some(
-            v_flex()
-                .gap_6()
-                .p_4()
-                .children(vec![
-                    example_group_with_title(
-                        "Basic Toast",
-                        vec![
-                            single_example("Text", div().child(text_example).into_any_element()),
-                            single_example(
-                                "Action",
-                                div().child(action_example).into_any_element(),
-                            ),
-                            single_example("Icon", div().child(icon_example).into_any_element()),
-                            single_example(
-                                "Dismiss Button",
-                                div().child(dismiss_button_example).into_any_element(),
-                            ),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "Examples",
-                        vec![
-                            single_example(
-                                "Success",
-                                div().child(success_example).into_any_element(),
-                            ),
-                            single_example("Error", div().child(error_example).into_any_element()),
-                            single_example(
-                                "Warning",
-                                div().child(warning_example).into_any_element(),
-                            ),
-                            single_example("Create PR", div().child(pr_example).into_any_element()),
-                        ],
-                    )
-                    .vertical(),
-                ])
-                .into_any_element(),
-        )
-    }
-}
diff --git a/crates/ollama/Cargo.toml b/crates/ollama/Cargo.toml
deleted file mode 100644
index fed74993fa..0000000000
--- a/crates/ollama/Cargo.toml
+++ /dev/null
@@ -1,25 +0,0 @@
-[package]
-name = "ollama"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/ollama.rs"
-
-[features]
-default = []
-schemars = ["dep:schemars"]
-
-[dependencies]
-anyhow.workspace = true
-futures.workspace = true
-http_client.workspace = true
-schemars = { workspace = true, optional = true }
-serde.workspace = true
-serde_json.workspace = true
-settings.workspace = true
diff --git a/crates/ollama/LICENSE-GPL b/crates/ollama/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/ollama/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/ollama/src/ollama.rs b/crates/ollama/src/ollama.rs
deleted file mode 100644
index f6614379fa..0000000000
--- a/crates/ollama/src/ollama.rs
+++ /dev/null
@@ -1,660 +0,0 @@
-use anyhow::{Context as _, Result};
-use futures::{AsyncBufReadExt, AsyncReadExt, StreamExt, io::BufReader, stream::BoxStream};
-use http_client::{AsyncBody, HttpClient, HttpRequestExt, Method, Request as HttpRequest};
-use serde::{Deserialize, Serialize};
-use serde_json::Value;
-pub use settings::KeepAlive;
-
-pub const OLLAMA_API_URL: &str = "http://localhost:11434";
-
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
-#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq)]
-pub struct Model {
-    pub name: String,
-    pub display_name: Option<String>,
-    pub max_tokens: u64,
-    pub keep_alive: Option<KeepAlive>,
-    pub supports_tools: Option<bool>,
-    pub supports_vision: Option<bool>,
-    pub supports_thinking: Option<bool>,
-}
-
-fn get_max_tokens(name: &str) -> u64 {
-    /// Default context length for unknown models.
-    const DEFAULT_TOKENS: u64 = 4096;
-    /// Magic number. Lets many Ollama models work with ~16GB of ram.
-    /// Models that support context beyond 16k such as codestral (32k) or devstral (128k) will be clamped down to 16k
-    const MAXIMUM_TOKENS: u64 = 16384;
-
-    match name.split(':').next().unwrap() {
-        "granite-code" | "phi" | "tinyllama" => 2048,
-        "llama2" | "stablelm2" | "vicuna" | "yi" => 4096,
-        "aya" | "codegemma" | "gemma" | "gemma2" | "llama3" | "starcoder" => 8192,
-        "codellama" | "starcoder2" => 16384,
-        "codestral" | "dolphin-mixtral" | "llava" | "magistral" | "mistral" | "mixstral"
-        | "qwen2" | "qwen2.5-coder" => 32768,
-        "cogito" | "command-r" | "deepseek-coder-v2" | "deepseek-r1" | "deepseek-v3"
-        | "devstral" | "gemma3" | "gpt-oss" | "granite3.3" | "llama3.1" | "llama3.2"
-        | "llama3.3" | "mistral-nemo" | "phi3" | "phi3.5" | "phi4" | "qwen3" | "yi-coder" => 128000,
-        "qwen3-coder" => 256000,
-        _ => DEFAULT_TOKENS,
-    }
-    .clamp(1, MAXIMUM_TOKENS)
-}
-
-impl Model {
-    pub fn new(
-        name: &str,
-        display_name: Option<&str>,
-        max_tokens: Option<u64>,
-        supports_tools: Option<bool>,
-        supports_vision: Option<bool>,
-        supports_thinking: Option<bool>,
-    ) -> Self {
-        Self {
-            name: name.to_owned(),
-            display_name: display_name
-                .map(ToString::to_string)
-                .or_else(|| name.strip_suffix(":latest").map(ToString::to_string)),
-            max_tokens: max_tokens.unwrap_or_else(|| get_max_tokens(name)),
-            keep_alive: Some(KeepAlive::indefinite()),
-            supports_tools,
-            supports_vision,
-            supports_thinking,
-        }
-    }
-
-    pub fn id(&self) -> &str {
-        &self.name
-    }
-
-    pub fn display_name(&self) -> &str {
-        self.display_name.as_ref().unwrap_or(&self.name)
-    }
-
-    pub fn max_token_count(&self) -> u64 {
-        self.max_tokens
-    }
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-#[serde(tag = "role", rename_all = "lowercase")]
-pub enum ChatMessage {
-    Assistant {
-        content: String,
-        tool_calls: Option<Vec<OllamaToolCall>>,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        images: Option<Vec<String>>,
-        thinking: Option<String>,
-    },
-    User {
-        content: String,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        images: Option<Vec<String>>,
-    },
-    System {
-        content: String,
-    },
-    Tool {
-        tool_name: String,
-        content: String,
-    },
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct OllamaToolCall {
-    // TODO: Remove `Option` after most users have updated to Ollama v0.12.10,
-    // which was released on the 4th of November 2025
-    pub id: Option<String>,
-    pub function: OllamaFunctionCall,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct OllamaFunctionCall {
-    pub name: String,
-    pub arguments: Value,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-pub struct OllamaFunctionTool {
-    pub name: String,
-    pub description: Option<String>,
-    pub parameters: Option<Value>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-#[serde(tag = "type", rename_all = "lowercase")]
-pub enum OllamaTool {
-    Function { function: OllamaFunctionTool },
-}
-
-#[derive(Serialize, Debug)]
-pub struct ChatRequest {
-    pub model: String,
-    pub messages: Vec<ChatMessage>,
-    pub stream: bool,
-    pub keep_alive: KeepAlive,
-    pub options: Option<ChatOptions>,
-    pub tools: Vec<OllamaTool>,
-    pub think: Option<bool>,
-}
-
-// https://github.com/ollama/ollama/blob/main/docs/modelfile.md#valid-parameters-and-values
-#[derive(Serialize, Default, Debug)]
-pub struct ChatOptions {
-    pub num_ctx: Option<u64>,
-    pub num_predict: Option<isize>,
-    pub stop: Option<Vec<String>>,
-    pub temperature: Option<f32>,
-    pub top_p: Option<f32>,
-}
-
-#[derive(Deserialize, Debug)]
-pub struct ChatResponseDelta {
-    pub model: String,
-    pub created_at: String,
-    pub message: ChatMessage,
-    pub done_reason: Option<String>,
-    pub done: bool,
-    pub prompt_eval_count: Option<u64>,
-    pub eval_count: Option<u64>,
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct LocalModelsResponse {
-    pub models: Vec<LocalModelListing>,
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct LocalModelListing {
-    pub name: String,
-    pub modified_at: String,
-    pub size: u64,
-    pub digest: String,
-    pub details: ModelDetails,
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct LocalModel {
-    pub modelfile: String,
-    pub parameters: String,
-    pub template: String,
-    pub details: ModelDetails,
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct ModelDetails {
-    pub format: String,
-    pub family: String,
-    pub families: Option<Vec<String>>,
-    pub parameter_size: String,
-    pub quantization_level: String,
-}
-
-#[derive(Debug)]
-pub struct ModelShow {
-    pub capabilities: Vec<String>,
-    pub context_length: Option<u64>,
-    pub architecture: Option<String>,
-}
-
-impl<'de> Deserialize<'de> for ModelShow {
-    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        use serde::de::{self, MapAccess, Visitor};
-        use std::fmt;
-
-        struct ModelShowVisitor;
-
-        impl<'de> Visitor<'de> for ModelShowVisitor {
-            type Value = ModelShow;
-
-            fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-                formatter.write_str("a ModelShow object")
-            }
-
-            fn visit_map<A>(self, mut map: A) -> Result<Self::Value, A::Error>
-            where
-                A: MapAccess<'de>,
-            {
-                let mut capabilities: Vec<String> = Vec::new();
-                let mut architecture: Option<String> = None;
-                let mut context_length: Option<u64> = None;
-
-                while let Some(key) = map.next_key::<String>()? {
-                    match key.as_str() {
-                        "capabilities" => {
-                            capabilities = map.next_value()?;
-                        }
-                        "model_info" => {
-                            let model_info: Value = map.next_value()?;
-                            if let Value::Object(obj) = model_info {
-                                architecture = obj
-                                    .get("general.architecture")
-                                    .and_then(|v| v.as_str())
-                                    .map(String::from);
-
-                                if let Some(arch) = &architecture {
-                                    context_length = obj
-                                        .get(&format!("{}.context_length", arch))
-                                        .and_then(|v| v.as_u64());
-                                }
-                            }
-                        }
-                        _ => {
-                            let _: de::IgnoredAny = map.next_value()?;
-                        }
-                    }
-                }
-
-                Ok(ModelShow {
-                    capabilities,
-                    context_length,
-                    architecture,
-                })
-            }
-        }
-
-        deserializer.deserialize_map(ModelShowVisitor)
-    }
-}
-
-impl ModelShow {
-    pub fn supports_tools(&self) -> bool {
-        // .contains expects &String, which would require an additional allocation
-        self.capabilities.iter().any(|v| v == "tools")
-    }
-
-    pub fn supports_vision(&self) -> bool {
-        self.capabilities.iter().any(|v| v == "vision")
-    }
-
-    pub fn supports_thinking(&self) -> bool {
-        self.capabilities.iter().any(|v| v == "thinking")
-    }
-}
-
-pub async fn stream_chat_completion(
-    client: &dyn HttpClient,
-    api_url: &str,
-    api_key: Option<&str>,
-    request: ChatRequest,
-) -> Result<BoxStream<'static, Result<ChatResponseDelta>>> {
-    let uri = format!("{api_url}/api/chat");
-    let request = HttpRequest::builder()
-        .method(Method::POST)
-        .uri(uri)
-        .header("Content-Type", "application/json")
-        .when_some(api_key, |builder, api_key| {
-            builder.header("Authorization", format!("Bearer {api_key}"))
-        })
-        .body(AsyncBody::from(serde_json::to_string(&request)?))?;
-
-    let mut response = client.send(request).await?;
-    if response.status().is_success() {
-        let reader = BufReader::new(response.into_body());
-
-        Ok(reader
-            .lines()
-            .map(|line| match line {
-                Ok(line) => serde_json::from_str(&line).context("Unable to parse chat response"),
-                Err(e) => Err(e.into()),
-            })
-            .boxed())
-    } else {
-        let mut body = String::new();
-        response.body_mut().read_to_string(&mut body).await?;
-        anyhow::bail!(
-            "Failed to connect to Ollama API: {} {}",
-            response.status(),
-            body,
-        );
-    }
-}
-
-pub async fn get_models(
-    client: &dyn HttpClient,
-    api_url: &str,
-    api_key: Option<&str>,
-) -> Result<Vec<LocalModelListing>> {
-    let uri = format!("{api_url}/api/tags");
-    let request = HttpRequest::builder()
-        .method(Method::GET)
-        .uri(uri)
-        .header("Accept", "application/json")
-        .when_some(api_key, |builder, api_key| {
-            builder.header("Authorization", format!("Bearer {api_key}"))
-        })
-        .body(AsyncBody::default())?;
-
-    let mut response = client.send(request).await?;
-
-    let mut body = String::new();
-    response.body_mut().read_to_string(&mut body).await?;
-
-    anyhow::ensure!(
-        response.status().is_success(),
-        "Failed to connect to Ollama API: {} {}",
-        response.status(),
-        body,
-    );
-    let response: LocalModelsResponse =
-        serde_json::from_str(&body).context("Unable to parse Ollama tag listing")?;
-    Ok(response.models)
-}
-
-/// Fetch details of a model, used to determine model capabilities
-pub async fn show_model(
-    client: &dyn HttpClient,
-    api_url: &str,
-    api_key: Option<&str>,
-    model: &str,
-) -> Result<ModelShow> {
-    let uri = format!("{api_url}/api/show");
-    let request = HttpRequest::builder()
-        .method(Method::POST)
-        .uri(uri)
-        .header("Content-Type", "application/json")
-        .when_some(api_key, |builder, api_key| {
-            builder.header("Authorization", format!("Bearer {api_key}"))
-        })
-        .body(AsyncBody::from(
-            serde_json::json!({ "model": model }).to_string(),
-        ))?;
-
-    let mut response = client.send(request).await?;
-    let mut body = String::new();
-    response.body_mut().read_to_string(&mut body).await?;
-
-    anyhow::ensure!(
-        response.status().is_success(),
-        "Failed to connect to Ollama API: {} {}",
-        response.status(),
-        body,
-    );
-    let details: ModelShow = serde_json::from_str(body.as_str())?;
-    Ok(details)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn parse_completion() {
-        let response = serde_json::json!({
-        "model": "llama3.2",
-        "created_at": "2023-12-12T14:13:43.416799Z",
-        "message": {
-            "role": "assistant",
-            "content": "Hello! How are you today?"
-        },
-        "done": true,
-        "total_duration": 5191566416u64,
-        "load_duration": 2154458,
-        "prompt_eval_count": 26,
-        "prompt_eval_duration": 383809000,
-        "eval_count": 298,
-        "eval_duration": 4799921000u64
-        });
-        let _: ChatResponseDelta = serde_json::from_value(response).unwrap();
-    }
-
-    #[test]
-    fn parse_streaming_completion() {
-        let partial = serde_json::json!({
-        "model": "llama3.2",
-        "created_at": "2023-08-04T08:52:19.385406455-07:00",
-        "message": {
-            "role": "assistant",
-            "content": "The",
-            "images": null
-        },
-        "done": false
-        });
-
-        let _: ChatResponseDelta = serde_json::from_value(partial).unwrap();
-
-        let last = serde_json::json!({
-        "model": "llama3.2",
-        "created_at": "2023-08-04T19:22:45.499127Z",
-        "message": {
-            "role": "assistant",
-            "content": ""
-        },
-        "done": true,
-        "total_duration": 4883583458u64,
-        "load_duration": 1334875,
-        "prompt_eval_count": 26,
-        "prompt_eval_duration": 342546000,
-        "eval_count": 282,
-        "eval_duration": 4535599000u64
-        });
-
-        let _: ChatResponseDelta = serde_json::from_value(last).unwrap();
-    }
-
-    #[test]
-    fn parse_tool_call() {
-        let response = serde_json::json!({
-            "model": "llama3.2:3b",
-            "created_at": "2025-04-28T20:02:02.140489Z",
-            "message": {
-                "role": "assistant",
-                "content": "",
-                "tool_calls": [
-                    {
-                        "id": "call_llama3.2:3b_145155",
-                        "function": {
-                            "name": "weather",
-                            "arguments": {
-                                "city": "london",
-                            }
-                        }
-                    }
-                ]
-            },
-            "done_reason": "stop",
-            "done": true,
-            "total_duration": 2758629166u64,
-            "load_duration": 1770059875,
-            "prompt_eval_count": 147,
-            "prompt_eval_duration": 684637583,
-            "eval_count": 16,
-            "eval_duration": 302561917,
-        });
-
-        let result: ChatResponseDelta = serde_json::from_value(response).unwrap();
-        match result.message {
-            ChatMessage::Assistant {
-                content,
-                tool_calls,
-                images: _,
-                thinking,
-            } => {
-                assert!(content.is_empty());
-                assert!(tool_calls.is_some_and(|v| !v.is_empty()));
-                assert!(thinking.is_none());
-            }
-            _ => panic!("Deserialized wrong role"),
-        }
-    }
-
-    // Backwards compatibility with Ollama versions prior to v0.12.10 November 2025
-    // This test is a copy of `parse_tool_call()` with the `id` field omitted.
-    #[test]
-    fn parse_tool_call_pre_0_12_10() {
-        let response = serde_json::json!({
-            "model": "llama3.2:3b",
-            "created_at": "2025-04-28T20:02:02.140489Z",
-            "message": {
-                "role": "assistant",
-                "content": "",
-                "tool_calls": [
-                    {
-                        "function": {
-                            "name": "weather",
-                            "arguments": {
-                                "city": "london",
-                            }
-                        }
-                    }
-                ]
-            },
-            "done_reason": "stop",
-            "done": true,
-            "total_duration": 2758629166u64,
-            "load_duration": 1770059875,
-            "prompt_eval_count": 147,
-            "prompt_eval_duration": 684637583,
-            "eval_count": 16,
-            "eval_duration": 302561917,
-        });
-
-        let result: ChatResponseDelta = serde_json::from_value(response).unwrap();
-        match result.message {
-            ChatMessage::Assistant {
-                content,
-                tool_calls: Some(tool_calls),
-                images: _,
-                thinking,
-            } => {
-                assert!(content.is_empty());
-                assert!(thinking.is_none());
-
-                // When the `Option` around `id` is removed, this test should complain
-                // and be subsequently deleted in favor of `parse_tool_call()`
-                assert!(tool_calls.first().is_some_and(|call| call.id.is_none()))
-            }
-            _ => panic!("Deserialized wrong role"),
-        }
-    }
-
-    #[test]
-    fn parse_show_model() {
-        let response = serde_json::json!({
-            "license": "LLAMA 3.2 COMMUNITY LICENSE AGREEMENT...",
-            "details": {
-                "parent_model": "",
-                "format": "gguf",
-                "family": "llama",
-                "families": ["llama"],
-                "parameter_size": "3.2B",
-                "quantization_level": "Q4_K_M"
-            },
-            "model_info": {
-                "general.architecture": "llama",
-                "general.basename": "Llama-3.2",
-                "general.file_type": 15,
-                "general.finetune": "Instruct",
-                "general.languages": ["en", "de", "fr", "it", "pt", "hi", "es", "th"],
-                "general.parameter_count": 3212749888u64,
-                "general.quantization_version": 2,
-                "general.size_label": "3B",
-                "general.tags": ["facebook", "meta", "pytorch", "llama", "llama-3", "text-generation"],
-                "general.type": "model",
-                "llama.attention.head_count": 24,
-                "llama.attention.head_count_kv": 8,
-                "llama.attention.key_length": 128,
-                "llama.attention.layer_norm_rms_epsilon": 0.00001,
-                "llama.attention.value_length": 128,
-                "llama.block_count": 28,
-                "llama.context_length": 131072,
-                "llama.embedding_length": 3072,
-                "llama.feed_forward_length": 8192,
-                "llama.rope.dimension_count": 128,
-                "llama.rope.freq_base": 500000,
-                "llama.vocab_size": 128256,
-                "tokenizer.ggml.bos_token_id": 128000,
-                "tokenizer.ggml.eos_token_id": 128009,
-                "tokenizer.ggml.merges": null,
-                "tokenizer.ggml.model": "gpt2",
-                "tokenizer.ggml.pre": "llama-bpe",
-                "tokenizer.ggml.token_type": null,
-                "tokenizer.ggml.tokens": null
-            },
-            "tensors": [
-                { "name": "rope_freqs.weight", "type": "F32", "shape": [64] },
-                { "name": "token_embd.weight", "type": "Q4_K_S", "shape": [3072, 128256] }
-            ],
-            "capabilities": ["completion", "tools"],
-            "modified_at": "2025-04-29T21:24:41.445877632+03:00"
-        });
-
-        let result: ModelShow = serde_json::from_value(response).unwrap();
-        assert!(result.supports_tools());
-        assert!(result.capabilities.contains(&"tools".to_string()));
-        assert!(result.capabilities.contains(&"completion".to_string()));
-
-        assert_eq!(result.architecture, Some("llama".to_string()));
-        assert_eq!(result.context_length, Some(131072));
-    }
-
-    #[test]
-    fn serialize_chat_request_with_images() {
-        let base64_image = "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==";
-
-        let request = ChatRequest {
-            model: "llava".to_string(),
-            messages: vec![ChatMessage::User {
-                content: "What do you see in this image?".to_string(),
-                images: Some(vec![base64_image.to_string()]),
-            }],
-            stream: false,
-            keep_alive: KeepAlive::default(),
-            options: None,
-            think: None,
-            tools: vec![],
-        };
-
-        let serialized = serde_json::to_string(&request).unwrap();
-        assert!(serialized.contains("images"));
-        assert!(serialized.contains(base64_image));
-    }
-
-    #[test]
-    fn serialize_chat_request_without_images() {
-        let request = ChatRequest {
-            model: "llama3.2".to_string(),
-            messages: vec![ChatMessage::User {
-                content: "Hello, world!".to_string(),
-                images: None,
-            }],
-            stream: false,
-            keep_alive: KeepAlive::default(),
-            options: None,
-            think: None,
-            tools: vec![],
-        };
-
-        let serialized = serde_json::to_string(&request).unwrap();
-        assert!(!serialized.contains("images"));
-    }
-
-    #[test]
-    fn test_json_format_with_images() {
-        let base64_image = "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==";
-
-        let request = ChatRequest {
-            model: "llava".to_string(),
-            messages: vec![ChatMessage::User {
-                content: "What do you see?".to_string(),
-                images: Some(vec![base64_image.to_string()]),
-            }],
-            stream: false,
-            keep_alive: KeepAlive::default(),
-            options: None,
-            think: None,
-            tools: vec![],
-        };
-
-        let serialized = serde_json::to_string(&request).unwrap();
-
-        let parsed: serde_json::Value = serde_json::from_str(&serialized).unwrap();
-        let message_images = parsed["messages"][0]["images"].as_array().unwrap();
-        assert_eq!(message_images.len(), 1);
-        assert_eq!(message_images[0].as_str().unwrap(), base64_image);
-    }
-}
diff --git a/crates/onboarding/Cargo.toml b/crates/onboarding/Cargo.toml
deleted file mode 100644
index 2ff3467c48..0000000000
--- a/crates/onboarding/Cargo.toml
+++ /dev/null
@@ -1,44 +0,0 @@
-[package]
-name = "onboarding"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/onboarding.rs"
-
-[features]
-default = []
-
-[dependencies]
-anyhow.workspace = true
-client.workspace = true
-component.workspace = true
-db.workspace = true
-documented.workspace = true
-fs.workspace = true
-fuzzy.workspace = true
-git.workspace = true
-gpui.workspace = true
-menu.workspace = true
-notifications.workspace = true
-picker.workspace = true
-project.workspace = true
-schemars.workspace = true
-serde.workspace = true
-settings.workspace = true
-telemetry.workspace = true
-theme.workspace = true
-ui.workspace = true
-util.workspace = true
-vim_mode_setting.workspace = true
-workspace.workspace = true
-zed_actions.workspace = true
-zlog.workspace = true
-
-[dev-dependencies]
-db = {workspace = true, features = ["test-support"]}
diff --git a/crates/onboarding/LICENSE-GPL b/crates/onboarding/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/onboarding/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/onboarding/src/base_keymap_picker.rs b/crates/onboarding/src/base_keymap_picker.rs
deleted file mode 100644
index 63a2894a93..0000000000
--- a/crates/onboarding/src/base_keymap_picker.rs
+++ /dev/null
@@ -1,229 +0,0 @@
-use fuzzy::{StringMatch, StringMatchCandidate, match_strings};
-use gpui::{
-    App, Context, DismissEvent, Entity, EventEmitter, Focusable, Render, Task, WeakEntity, Window,
-    actions,
-};
-use picker::{Picker, PickerDelegate};
-use project::Fs;
-use settings::{BaseKeymap, Settings, update_settings_file};
-use std::sync::Arc;
-use ui::{ListItem, ListItemSpacing, prelude::*};
-use util::ResultExt;
-use workspace::{ModalView, Workspace, ui::HighlightedLabel};
-
-actions!(
-    zed,
-    [
-        /// Toggles the base keymap selector modal.
-        ToggleBaseKeymapSelector
-    ]
-);
-
-pub fn init(cx: &mut App) {
-    cx.observe_new(|workspace: &mut Workspace, _window, _cx| {
-        workspace.register_action(toggle);
-    })
-    .detach();
-}
-
-pub fn toggle(
-    workspace: &mut Workspace,
-    _: &ToggleBaseKeymapSelector,
-    window: &mut Window,
-    cx: &mut Context<Workspace>,
-) {
-    let fs = workspace.app_state().fs.clone();
-    workspace.toggle_modal(window, cx, |window, cx| {
-        BaseKeymapSelector::new(
-            BaseKeymapSelectorDelegate::new(cx.entity().downgrade(), fs, cx),
-            window,
-            cx,
-        )
-    });
-}
-
-pub struct BaseKeymapSelector {
-    picker: Entity<Picker<BaseKeymapSelectorDelegate>>,
-}
-
-impl Focusable for BaseKeymapSelector {
-    fn focus_handle(&self, cx: &App) -> gpui::FocusHandle {
-        self.picker.focus_handle(cx)
-    }
-}
-
-impl EventEmitter<DismissEvent> for BaseKeymapSelector {}
-impl ModalView for BaseKeymapSelector {}
-
-impl BaseKeymapSelector {
-    pub fn new(
-        delegate: BaseKeymapSelectorDelegate,
-        window: &mut Window,
-        cx: &mut Context<BaseKeymapSelector>,
-    ) -> Self {
-        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx));
-        Self { picker }
-    }
-}
-
-impl Render for BaseKeymapSelector {
-    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex().w(rems(34.)).child(self.picker.clone())
-    }
-}
-
-pub struct BaseKeymapSelectorDelegate {
-    selector: WeakEntity<BaseKeymapSelector>,
-    matches: Vec<StringMatch>,
-    selected_index: usize,
-    fs: Arc<dyn Fs>,
-}
-
-impl BaseKeymapSelectorDelegate {
-    fn new(
-        selector: WeakEntity<BaseKeymapSelector>,
-        fs: Arc<dyn Fs>,
-        cx: &mut Context<BaseKeymapSelector>,
-    ) -> Self {
-        let base = BaseKeymap::get(None, cx);
-        let selected_index = BaseKeymap::OPTIONS
-            .iter()
-            .position(|(_, value)| value == base)
-            .unwrap_or(0);
-        Self {
-            selector,
-            matches: Vec::new(),
-            selected_index,
-            fs,
-        }
-    }
-}
-
-impl PickerDelegate for BaseKeymapSelectorDelegate {
-    type ListItem = ui::ListItem;
-
-    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
-        "Select a base keymap...".into()
-    }
-
-    fn match_count(&self) -> usize {
-        self.matches.len()
-    }
-
-    fn selected_index(&self) -> usize {
-        self.selected_index
-    }
-
-    fn set_selected_index(
-        &mut self,
-        ix: usize,
-        _window: &mut Window,
-        _: &mut Context<Picker<BaseKeymapSelectorDelegate>>,
-    ) {
-        self.selected_index = ix;
-    }
-
-    fn update_matches(
-        &mut self,
-        query: String,
-        window: &mut Window,
-        cx: &mut Context<Picker<BaseKeymapSelectorDelegate>>,
-    ) -> Task<()> {
-        let background = cx.background_executor().clone();
-        let candidates = BaseKeymap::names()
-            .enumerate()
-            .map(|(id, name)| StringMatchCandidate::new(id, name))
-            .collect::<Vec<_>>();
-
-        cx.spawn_in(window, async move |this, cx| {
-            let matches = if query.is_empty() {
-                candidates
-                    .into_iter()
-                    .enumerate()
-                    .map(|(index, candidate)| StringMatch {
-                        candidate_id: index,
-                        string: candidate.string,
-                        positions: Vec::new(),
-                        score: 0.0,
-                    })
-                    .collect()
-            } else {
-                match_strings(
-                    &candidates,
-                    &query,
-                    false,
-                    true,
-                    100,
-                    &Default::default(),
-                    background,
-                )
-                .await
-            };
-
-            this.update(cx, |this, _| {
-                this.delegate.matches = matches;
-                this.delegate.selected_index = this
-                    .delegate
-                    .selected_index
-                    .min(this.delegate.matches.len().saturating_sub(1));
-            })
-            .log_err();
-        })
-    }
-
-    fn confirm(
-        &mut self,
-        _: bool,
-        _: &mut Window,
-        cx: &mut Context<Picker<BaseKeymapSelectorDelegate>>,
-    ) {
-        if let Some(selection) = self.matches.get(self.selected_index) {
-            let base_keymap = BaseKeymap::from_names(&selection.string);
-
-            telemetry::event!(
-                "Settings Changed",
-                setting = "keymap",
-                value = base_keymap.to_string()
-            );
-
-            update_settings_file(self.fs.clone(), cx, move |setting, _| {
-                setting.base_keymap = Some(base_keymap.into())
-            });
-        }
-
-        self.selector
-            .update(cx, |_, cx| {
-                cx.emit(DismissEvent);
-            })
-            .ok();
-    }
-
-    fn dismissed(&mut self, _: &mut Window, cx: &mut Context<Picker<BaseKeymapSelectorDelegate>>) {
-        self.selector
-            .update(cx, |_, cx| {
-                cx.emit(DismissEvent);
-            })
-            .log_err();
-    }
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        _window: &mut Window,
-        _cx: &mut Context<Picker<Self>>,
-    ) -> Option<Self::ListItem> {
-        let keymap_match = &self.matches.get(ix)?;
-
-        Some(
-            ListItem::new(ix)
-                .inset(true)
-                .spacing(ListItemSpacing::Sparse)
-                .toggle_state(selected)
-                .child(HighlightedLabel::new(
-                    keymap_match.string.clone(),
-                    keymap_match.positions.clone(),
-                )),
-        )
-    }
-}
diff --git a/crates/onboarding/src/basics_page.rs b/crates/onboarding/src/basics_page.rs
deleted file mode 100644
index ab5d578f7d..0000000000
--- a/crates/onboarding/src/basics_page.rs
+++ /dev/null
@@ -1,486 +0,0 @@
-use std::sync::Arc;
-
-use client::TelemetrySettings;
-use fs::Fs;
-use gpui::{Action, App, IntoElement};
-use settings::{BaseKeymap, Settings, update_settings_file};
-use theme::{
-    Appearance, SystemAppearance, ThemeAppearanceMode, ThemeName, ThemeRegistry, ThemeSelection,
-    ThemeSettings,
-};
-use ui::{
-    Divider, ParentElement as _, StatefulInteractiveElement, SwitchField, TintColor,
-    ToggleButtonGroup, ToggleButtonGroupSize, ToggleButtonSimple, ToggleButtonWithIcon, prelude::*,
-    rems_from_px,
-};
-use vim_mode_setting::VimModeSetting;
-
-use crate::{
-    ImportCursorSettings, ImportVsCodeSettings, SettingsImportState,
-    theme_preview::{ThemePreviewStyle, ThemePreviewTile},
-};
-
-const LIGHT_THEMES: [&str; 3] = ["One Light", "Ayu Light", "Gruvbox Light"];
-const DARK_THEMES: [&str; 3] = ["One Dark", "Ayu Dark", "Gruvbox Dark"];
-const FAMILY_NAMES: [SharedString; 3] = [
-    SharedString::new_static("One"),
-    SharedString::new_static("Ayu"),
-    SharedString::new_static("Gruvbox"),
-];
-
-fn get_theme_family_themes(theme_name: &str) -> Option<(&'static str, &'static str)> {
-    for i in 0..LIGHT_THEMES.len() {
-        if LIGHT_THEMES[i] == theme_name || DARK_THEMES[i] == theme_name {
-            return Some((LIGHT_THEMES[i], DARK_THEMES[i]));
-        }
-    }
-    None
-}
-
-fn render_theme_section(tab_index: &mut isize, cx: &mut App) -> impl IntoElement {
-    let theme_selection = ThemeSettings::get_global(cx).theme.clone();
-    let system_appearance = theme::SystemAppearance::global(cx);
-
-    let theme_mode = theme_selection
-        .mode()
-        .unwrap_or_else(|| match *system_appearance {
-            Appearance::Light => ThemeAppearanceMode::Light,
-            Appearance::Dark => ThemeAppearanceMode::Dark,
-        });
-
-    return v_flex()
-        .gap_2()
-        .child(
-            h_flex().justify_between().child(Label::new("Theme")).child(
-                ToggleButtonGroup::single_row(
-                    "theme-selector-onboarding-dark-light",
-                    [
-                        ThemeAppearanceMode::Light,
-                        ThemeAppearanceMode::Dark,
-                        ThemeAppearanceMode::System,
-                    ]
-                    .map(|mode| {
-                        const MODE_NAMES: [SharedString; 3] = [
-                            SharedString::new_static("Light"),
-                            SharedString::new_static("Dark"),
-                            SharedString::new_static("System"),
-                        ];
-                        ToggleButtonSimple::new(
-                            MODE_NAMES[mode as usize].clone(),
-                            move |_, _, cx| {
-                                write_mode_change(mode, cx);
-
-                                telemetry::event!(
-                                    "Welcome Theme mode Changed",
-                                    from = theme_mode,
-                                    to = mode
-                                );
-                            },
-                        )
-                    }),
-                )
-                .size(ToggleButtonGroupSize::Medium)
-                .tab_index(tab_index)
-                .selected_index(theme_mode as usize)
-                .style(ui::ToggleButtonGroupStyle::Outlined)
-                .width(rems_from_px(3. * 64.)),
-            ),
-        )
-        .child(
-            h_flex()
-                .gap_4()
-                .justify_between()
-                .children(render_theme_previews(tab_index, &theme_selection, cx)),
-        );
-
-    fn render_theme_previews(
-        tab_index: &mut isize,
-        theme_selection: &ThemeSelection,
-        cx: &mut App,
-    ) -> [impl IntoElement; 3] {
-        let system_appearance = SystemAppearance::global(cx);
-        let theme_registry = ThemeRegistry::global(cx);
-
-        let theme_seed = 0xBEEF as f32;
-        let theme_mode = theme_selection
-            .mode()
-            .unwrap_or_else(|| match *system_appearance {
-                Appearance::Light => ThemeAppearanceMode::Light,
-                Appearance::Dark => ThemeAppearanceMode::Dark,
-            });
-        let appearance = match theme_mode {
-            ThemeAppearanceMode::Light => Appearance::Light,
-            ThemeAppearanceMode::Dark => Appearance::Dark,
-            ThemeAppearanceMode::System => *system_appearance,
-        };
-        let current_theme_name: SharedString = theme_selection.name(appearance).0.into();
-
-        let theme_names = match appearance {
-            Appearance::Light => LIGHT_THEMES,
-            Appearance::Dark => DARK_THEMES,
-        };
-
-        let themes = theme_names.map(|theme| theme_registry.get(theme).unwrap());
-
-        [0, 1, 2].map(|index| {
-            let theme = &themes[index];
-            let is_selected = theme.name == current_theme_name;
-            let name = theme.name.clone();
-            let colors = cx.theme().colors();
-
-            v_flex()
-                .w_full()
-                .items_center()
-                .gap_1()
-                .child(
-                    h_flex()
-                        .id(name)
-                        .relative()
-                        .w_full()
-                        .border_2()
-                        .border_color(colors.border_transparent)
-                        .rounded(ThemePreviewTile::ROOT_RADIUS)
-                        .map(|this| {
-                            if is_selected {
-                                this.border_color(colors.border_selected)
-                            } else {
-                                this.opacity(0.8).hover(|s| s.border_color(colors.border))
-                            }
-                        })
-                        .tab_index({
-                            *tab_index += 1;
-                            *tab_index - 1
-                        })
-                        .focus(|mut style| {
-                            style.border_color = Some(colors.border_focused);
-                            style
-                        })
-                        .on_click({
-                            let theme_name = theme.name.clone();
-                            let current_theme_name = current_theme_name.clone();
-
-                            move |_, _, cx| {
-                                write_theme_change(theme_name.clone(), theme_mode, cx);
-                                telemetry::event!(
-                                    "Welcome Theme Changed",
-                                    from = current_theme_name,
-                                    to = theme_name
-                                );
-                            }
-                        })
-                        .map(|this| {
-                            if theme_mode == ThemeAppearanceMode::System {
-                                let (light, dark) = (
-                                    theme_registry.get(LIGHT_THEMES[index]).unwrap(),
-                                    theme_registry.get(DARK_THEMES[index]).unwrap(),
-                                );
-                                this.child(
-                                    ThemePreviewTile::new(light, theme_seed)
-                                        .style(ThemePreviewStyle::SideBySide(dark)),
-                                )
-                            } else {
-                                this.child(
-                                    ThemePreviewTile::new(theme.clone(), theme_seed)
-                                        .style(ThemePreviewStyle::Bordered),
-                                )
-                            }
-                        }),
-                )
-                .child(
-                    Label::new(FAMILY_NAMES[index].clone())
-                        .color(Color::Muted)
-                        .size(LabelSize::Small),
-                )
-        })
-    }
-
-    fn write_mode_change(mode: ThemeAppearanceMode, cx: &mut App) {
-        let fs = <dyn Fs>::global(cx);
-        update_settings_file(fs, cx, move |settings, _cx| {
-            theme::set_mode(settings, mode);
-        });
-    }
-
-    fn write_theme_change(
-        theme: impl Into<Arc<str>>,
-        theme_mode: ThemeAppearanceMode,
-        cx: &mut App,
-    ) {
-        let fs = <dyn Fs>::global(cx);
-        let theme = theme.into();
-        update_settings_file(fs, cx, move |settings, cx| {
-            if theme_mode == ThemeAppearanceMode::System {
-                let (light_theme, dark_theme) =
-                    get_theme_family_themes(&theme).unwrap_or((theme.as_ref(), theme.as_ref()));
-
-                settings.theme.theme = Some(settings::ThemeSelection::Dynamic {
-                    mode: ThemeAppearanceMode::System,
-                    light: ThemeName(light_theme.into()),
-                    dark: ThemeName(dark_theme.into()),
-                });
-            } else {
-                let appearance = *SystemAppearance::global(cx);
-                theme::set_theme(settings, theme, appearance, appearance);
-            }
-        });
-    }
-}
-
-fn render_telemetry_section(tab_index: &mut isize, cx: &App) -> impl IntoElement {
-    let fs = <dyn Fs>::global(cx);
-
-    v_flex()
-        .gap_4()
-        .child(
-            SwitchField::new(
-                "onboarding-telemetry-metrics",
-                None::<&str>,
-                Some("Help improve Zed by sending anonymous usage data".into()),
-                if TelemetrySettings::get_global(cx).metrics {
-                    ui::ToggleState::Selected
-                } else {
-                    ui::ToggleState::Unselected
-                },
-                {
-                    let fs = fs.clone();
-                    move |selection, _, cx| {
-                        let enabled = match selection {
-                            ToggleState::Selected => true,
-                            ToggleState::Unselected => false,
-                            ToggleState::Indeterminate => {
-                                return;
-                            }
-                        };
-
-                        update_settings_file(fs.clone(), cx, move |setting, _| {
-                            setting.telemetry.get_or_insert_default().metrics = Some(enabled);
-                        });
-
-                        // This telemetry event shouldn't fire when it's off. If it does we'll be alerted
-                        // and can fix it in a timely manner to respect a user's choice.
-                        telemetry::event!(
-                            "Welcome Page Telemetry Metrics Toggled",
-                            options = if enabled { "on" } else { "off" }
-                        );
-                    }
-                },
-            )
-            .tab_index({
-                *tab_index += 1;
-                *tab_index
-            }),
-        )
-        .child(
-            SwitchField::new(
-                "onboarding-telemetry-crash-reports",
-                None::<&str>,
-                Some(
-                    "Help fix Zed by sending crash reports so we can fix critical issues fast"
-                        .into(),
-                ),
-                if TelemetrySettings::get_global(cx).diagnostics {
-                    ui::ToggleState::Selected
-                } else {
-                    ui::ToggleState::Unselected
-                },
-                {
-                    let fs = fs.clone();
-                    move |selection, _, cx| {
-                        let enabled = match selection {
-                            ToggleState::Selected => true,
-                            ToggleState::Unselected => false,
-                            ToggleState::Indeterminate => {
-                                return;
-                            }
-                        };
-
-                        update_settings_file(fs.clone(), cx, move |setting, _| {
-                            setting.telemetry.get_or_insert_default().diagnostics = Some(enabled);
-                        });
-
-                        // This telemetry event shouldn't fire when it's off. If it does we'll be alerted
-                        // and can fix it in a timely manner to respect a user's choice.
-                        telemetry::event!(
-                            "Welcome Page Telemetry Diagnostics Toggled",
-                            options = if enabled { "on" } else { "off" }
-                        );
-                    }
-                },
-            )
-            .tab_index({
-                *tab_index += 1;
-                *tab_index
-            }),
-        )
-}
-
-fn render_base_keymap_section(tab_index: &mut isize, cx: &mut App) -> impl IntoElement {
-    let base_keymap = match BaseKeymap::get_global(cx) {
-        BaseKeymap::VSCode => Some(0),
-        BaseKeymap::JetBrains => Some(1),
-        BaseKeymap::SublimeText => Some(2),
-        BaseKeymap::Atom => Some(3),
-        BaseKeymap::Emacs => Some(4),
-        BaseKeymap::Cursor => Some(5),
-        BaseKeymap::TextMate | BaseKeymap::None => None,
-    };
-
-    return v_flex().gap_2().child(Label::new("Base Keymap")).child(
-        ToggleButtonGroup::two_rows(
-            "base_keymap_selection",
-            [
-                ToggleButtonWithIcon::new("VS Code", IconName::EditorVsCode, |_, _, cx| {
-                    write_keymap_base(BaseKeymap::VSCode, cx);
-                }),
-                ToggleButtonWithIcon::new("JetBrains", IconName::EditorJetBrains, |_, _, cx| {
-                    write_keymap_base(BaseKeymap::JetBrains, cx);
-                }),
-                ToggleButtonWithIcon::new("Sublime Text", IconName::EditorSublime, |_, _, cx| {
-                    write_keymap_base(BaseKeymap::SublimeText, cx);
-                }),
-            ],
-            [
-                ToggleButtonWithIcon::new("Atom", IconName::EditorAtom, |_, _, cx| {
-                    write_keymap_base(BaseKeymap::Atom, cx);
-                }),
-                ToggleButtonWithIcon::new("Emacs", IconName::EditorEmacs, |_, _, cx| {
-                    write_keymap_base(BaseKeymap::Emacs, cx);
-                }),
-                ToggleButtonWithIcon::new("Cursor", IconName::EditorCursor, |_, _, cx| {
-                    write_keymap_base(BaseKeymap::Cursor, cx);
-                }),
-            ],
-        )
-        .when_some(base_keymap, |this, base_keymap| {
-            this.selected_index(base_keymap)
-        })
-        .full_width()
-        .tab_index(tab_index)
-        .size(ui::ToggleButtonGroupSize::Medium)
-        .style(ui::ToggleButtonGroupStyle::Outlined),
-    );
-
-    fn write_keymap_base(keymap_base: BaseKeymap, cx: &App) {
-        let fs = <dyn Fs>::global(cx);
-
-        update_settings_file(fs, cx, move |setting, _| {
-            setting.base_keymap = Some(keymap_base.into());
-        });
-
-        telemetry::event!("Welcome Keymap Changed", keymap = keymap_base);
-    }
-}
-
-fn render_vim_mode_switch(tab_index: &mut isize, cx: &mut App) -> impl IntoElement {
-    let toggle_state = if VimModeSetting::get_global(cx).0 {
-        ui::ToggleState::Selected
-    } else {
-        ui::ToggleState::Unselected
-    };
-    SwitchField::new(
-        "onboarding-vim-mode",
-        Some("Vim Mode"),
-        Some("Coming from Neovim? Use our first-class implementation of Vim Mode".into()),
-        toggle_state,
-        {
-            let fs = <dyn Fs>::global(cx);
-            move |&selection, _, cx| {
-                let vim_mode = match selection {
-                    ToggleState::Selected => true,
-                    ToggleState::Unselected => false,
-                    ToggleState::Indeterminate => {
-                        return;
-                    }
-                };
-                update_settings_file(fs.clone(), cx, move |setting, _| {
-                    setting.vim_mode = Some(vim_mode);
-                });
-
-                telemetry::event!(
-                    "Welcome Vim Mode Toggled",
-                    options = if vim_mode { "on" } else { "off" },
-                );
-            }
-        },
-    )
-    .tab_index({
-        *tab_index += 1;
-        *tab_index - 1
-    })
-}
-
-fn render_setting_import_button(
-    tab_index: isize,
-    label: SharedString,
-    action: &dyn Action,
-    imported: bool,
-) -> impl IntoElement + 'static {
-    let action = action.boxed_clone();
-
-    Button::new(label.clone(), label.clone())
-        .style(ButtonStyle::OutlinedGhost)
-        .size(ButtonSize::Medium)
-        .label_size(LabelSize::Small)
-        .selected_style(ButtonStyle::Tinted(TintColor::Accent))
-        .toggle_state(imported)
-        .tab_index(tab_index)
-        .when(imported, |this| {
-            this.icon(IconName::Check)
-                .icon_size(IconSize::Small)
-                .color(Color::Success)
-        })
-        .on_click(move |_, window, cx| {
-            telemetry::event!("Welcome Import Settings", import_source = label,);
-            window.dispatch_action(action.boxed_clone(), cx);
-        })
-}
-
-fn render_import_settings_section(tab_index: &mut isize, cx: &mut App) -> impl IntoElement {
-    let import_state = SettingsImportState::global(cx);
-    let imports: [(SharedString, &dyn Action, bool); 2] = [
-        (
-            "VS Code".into(),
-            &ImportVsCodeSettings { skip_prompt: false },
-            import_state.vscode,
-        ),
-        (
-            "Cursor".into(),
-            &ImportCursorSettings { skip_prompt: false },
-            import_state.cursor,
-        ),
-    ];
-
-    let [vscode, cursor] = imports.map(|(label, action, imported)| {
-        *tab_index += 1;
-        render_setting_import_button(*tab_index - 1, label, action, imported)
-    });
-
-    h_flex()
-        .gap_2()
-        .flex_wrap()
-        .justify_between()
-        .child(
-            v_flex()
-                .gap_0p5()
-                .max_w_5_6()
-                .child(Label::new("Import Settings"))
-                .child(
-                    Label::new("Automatically pull your settings from other editors")
-                        .color(Color::Muted),
-                ),
-        )
-        .child(h_flex().gap_1().child(vscode).child(cursor))
-}
-
-pub(crate) fn render_basics_page(cx: &mut App) -> impl IntoElement {
-    let mut tab_index = 0;
-    v_flex()
-        .id("basics-page")
-        .gap_6()
-        .child(render_theme_section(&mut tab_index, cx))
-        .child(render_base_keymap_section(&mut tab_index, cx))
-        .child(render_import_settings_section(&mut tab_index, cx))
-        .child(render_vim_mode_switch(&mut tab_index, cx))
-        .child(Divider::horizontal().color(ui::DividerColor::BorderVariant))
-        .child(render_telemetry_section(&mut tab_index, cx))
-}
diff --git a/crates/onboarding/src/multibuffer_hint.rs b/crates/onboarding/src/multibuffer_hint.rs
deleted file mode 100644
index 9d290306d8..0000000000
--- a/crates/onboarding/src/multibuffer_hint.rs
+++ /dev/null
@@ -1,184 +0,0 @@
-use std::collections::HashSet;
-use std::sync::OnceLock;
-use std::sync::atomic::{AtomicUsize, Ordering};
-
-use db::kvp::KEY_VALUE_STORE;
-use gpui::{App, EntityId, EventEmitter, Subscription};
-use ui::{IconButtonShape, Tooltip, prelude::*};
-use workspace::item::{ItemBufferKind, ItemEvent, ItemHandle};
-use workspace::{ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView};
-
-pub struct MultibufferHint {
-    shown_on: HashSet<EntityId>,
-    active_item: Option<Box<dyn ItemHandle>>,
-    subscription: Option<Subscription>,
-}
-
-const NUMBER_OF_HINTS: usize = 10;
-
-const SHOWN_COUNT_KEY: &str = "MULTIBUFFER_HINT_SHOWN_COUNT";
-
-impl Default for MultibufferHint {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl MultibufferHint {
-    pub fn new() -> Self {
-        Self {
-            shown_on: Default::default(),
-            active_item: None,
-            subscription: None,
-        }
-    }
-}
-
-impl MultibufferHint {
-    fn counter() -> &'static AtomicUsize {
-        static SHOWN_COUNT: OnceLock<AtomicUsize> = OnceLock::new();
-        SHOWN_COUNT.get_or_init(|| {
-            let value: usize = KEY_VALUE_STORE
-                .read_kvp(SHOWN_COUNT_KEY)
-                .ok()
-                .flatten()
-                .and_then(|v| v.parse().ok())
-                .unwrap_or(0);
-
-            AtomicUsize::new(value)
-        })
-    }
-
-    fn shown_count() -> usize {
-        Self::counter().load(Ordering::Relaxed)
-    }
-
-    fn increment_count(cx: &mut App) {
-        Self::set_count(Self::shown_count() + 1, cx)
-    }
-
-    pub(crate) fn set_count(count: usize, cx: &mut App) {
-        Self::counter().store(count, Ordering::Relaxed);
-
-        db::write_and_log(cx, move || {
-            KEY_VALUE_STORE.write_kvp(SHOWN_COUNT_KEY.to_string(), format!("{}", count))
-        });
-    }
-
-    fn dismiss(&mut self, cx: &mut App) {
-        Self::set_count(NUMBER_OF_HINTS, cx)
-    }
-
-    /// Determines the toolbar location for this [`MultibufferHint`].
-    fn determine_toolbar_location(&mut self, cx: &mut Context<Self>) -> ToolbarItemLocation {
-        if Self::shown_count() >= NUMBER_OF_HINTS {
-            return ToolbarItemLocation::Hidden;
-        }
-
-        let Some(active_pane_item) = self.active_item.as_ref() else {
-            return ToolbarItemLocation::Hidden;
-        };
-
-        if active_pane_item.buffer_kind(cx) == ItemBufferKind::Singleton
-            || active_pane_item.breadcrumbs(cx.theme(), cx).is_none()
-            || !active_pane_item.can_save(cx)
-        {
-            return ToolbarItemLocation::Hidden;
-        }
-
-        if self.shown_on.insert(active_pane_item.item_id()) {
-            Self::increment_count(cx);
-        }
-
-        ToolbarItemLocation::Secondary
-    }
-}
-
-impl EventEmitter<ToolbarItemEvent> for MultibufferHint {}
-
-impl ToolbarItemView for MultibufferHint {
-    fn set_active_pane_item(
-        &mut self,
-        active_pane_item: Option<&dyn ItemHandle>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> ToolbarItemLocation {
-        cx.notify();
-        self.active_item = active_pane_item.map(|item| item.boxed_clone());
-
-        let Some(active_pane_item) = active_pane_item else {
-            return ToolbarItemLocation::Hidden;
-        };
-
-        let this = cx.entity().downgrade();
-        self.subscription = Some(active_pane_item.subscribe_to_item_events(
-            window,
-            cx,
-            Box::new(move |event, _, cx| {
-                if let ItemEvent::UpdateBreadcrumbs = event {
-                    this.update(cx, |this, cx| {
-                        cx.notify();
-                        let location = this.determine_toolbar_location(cx);
-                        cx.emit(ToolbarItemEvent::ChangeLocation(location))
-                    })
-                    .ok();
-                }
-            }),
-        ));
-
-        self.determine_toolbar_location(cx)
-    }
-}
-
-impl Render for MultibufferHint {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        h_flex()
-            .px_2()
-            .py_0p5()
-            .justify_between()
-            .bg(cx.theme().status().info_background.opacity(0.5))
-            .border_1()
-            .border_color(cx.theme().colors().border_variant)
-            .rounded_sm()
-            .overflow_hidden()
-            .child(
-                h_flex()
-                    .gap_0p5()
-                    .child(
-                        h_flex()
-                            .gap_2()
-                            .child(
-                                Icon::new(IconName::Info)
-                                    .size(IconSize::XSmall)
-                                    .color(Color::Muted),
-                            )
-                            .child(Label::new(
-                                "Edit and save files directly in the results multibuffer!",
-                            )),
-                    )
-                    .child(
-                        Button::new("open_docs", "Learn More")
-                            .icon(IconName::ArrowUpRight)
-                            .icon_size(IconSize::Small)
-                            .icon_color(Color::Muted)
-                            .icon_position(IconPosition::End)
-                            .on_click(move |_event, _, cx| {
-                                cx.open_url("https://zed.dev/docs/multibuffers")
-                            }),
-                    ),
-            )
-            .child(
-                IconButton::new("dismiss", IconName::Close)
-                    .shape(IconButtonShape::Square)
-                    .icon_size(IconSize::Small)
-                    .on_click(cx.listener(|this, _event, _, cx| {
-                        this.dismiss(cx);
-                        cx.emit(ToolbarItemEvent::ChangeLocation(
-                            ToolbarItemLocation::Hidden,
-                        ))
-                    }))
-                    .tooltip(Tooltip::text("Dismiss Hint")),
-            )
-            .into_any_element()
-    }
-}
diff --git a/crates/onboarding/src/onboarding.rs b/crates/onboarding/src/onboarding.rs
deleted file mode 100644
index 94581e1423..0000000000
--- a/crates/onboarding/src/onboarding.rs
+++ /dev/null
@@ -1,676 +0,0 @@
-pub use crate::welcome::ShowWelcome;
-use crate::{multibuffer_hint::MultibufferHint, welcome::WelcomePage};
-use client::{Client, UserStore, zed_urls};
-use db::kvp::KEY_VALUE_STORE;
-use fs::Fs;
-use gpui::{
-    Action, AnyElement, App, AppContext, AsyncWindowContext, Context, Entity, EventEmitter,
-    FocusHandle, Focusable, Global, IntoElement, KeyContext, Render, ScrollHandle, SharedString,
-    Subscription, Task, WeakEntity, Window, actions,
-};
-use notifications::status_toast::{StatusToast, ToastIcon};
-use schemars::JsonSchema;
-use serde::Deserialize;
-use settings::{SettingsStore, VsCodeSettingsSource};
-use std::sync::Arc;
-use ui::{
-    Divider, KeyBinding, ParentElement as _, StatefulInteractiveElement, Vector, VectorName,
-    WithScrollbar as _, prelude::*, rems_from_px,
-};
-use workspace::{
-    AppState, Workspace, WorkspaceId,
-    dock::DockPosition,
-    item::{Item, ItemEvent},
-    notifications::NotifyResultExt as _,
-    open_new, register_serializable_item, with_active_or_new_workspace,
-};
-
-mod base_keymap_picker;
-mod basics_page;
-pub mod multibuffer_hint;
-mod theme_preview;
-mod welcome;
-
-/// Imports settings from Visual Studio Code.
-#[derive(Copy, Clone, Debug, Default, PartialEq, Deserialize, JsonSchema, Action)]
-#[action(namespace = zed)]
-#[serde(deny_unknown_fields)]
-pub struct ImportVsCodeSettings {
-    #[serde(default)]
-    pub skip_prompt: bool,
-}
-
-/// Imports settings from Cursor editor.
-#[derive(Copy, Clone, Debug, Default, PartialEq, Deserialize, JsonSchema, Action)]
-#[action(namespace = zed)]
-#[serde(deny_unknown_fields)]
-pub struct ImportCursorSettings {
-    #[serde(default)]
-    pub skip_prompt: bool,
-}
-
-pub const FIRST_OPEN: &str = "first_open";
-pub const DOCS_URL: &str = "https://zed.dev/docs/";
-
-actions!(
-    zed,
-    [
-        /// Opens the onboarding view.
-        OpenOnboarding
-    ]
-);
-
-actions!(
-    onboarding,
-    [
-        /// Finish the onboarding process.
-        Finish,
-        /// Sign in while in the onboarding flow.
-        SignIn,
-        /// Open the user account in zed.dev while in the onboarding flow.
-        OpenAccount,
-        /// Resets the welcome screen hints to their initial state.
-        ResetHints
-    ]
-);
-
-pub fn init(cx: &mut App) {
-    cx.observe_new(|workspace: &mut Workspace, _, _cx| {
-        workspace
-            .register_action(|_workspace, _: &ResetHints, _, cx| MultibufferHint::set_count(0, cx));
-    })
-    .detach();
-
-    cx.on_action(|_: &OpenOnboarding, cx| {
-        with_active_or_new_workspace(cx, |workspace, window, cx| {
-            workspace
-                .with_local_workspace(window, cx, |workspace, window, cx| {
-                    let existing = workspace
-                        .active_pane()
-                        .read(cx)
-                        .items()
-                        .find_map(|item| item.downcast::<Onboarding>());
-
-                    if let Some(existing) = existing {
-                        workspace.activate_item(&existing, true, true, window, cx);
-                    } else {
-                        let settings_page = Onboarding::new(workspace, cx);
-                        workspace.add_item_to_active_pane(
-                            Box::new(settings_page),
-                            None,
-                            true,
-                            window,
-                            cx,
-                        )
-                    }
-                })
-                .detach();
-        });
-    });
-
-    cx.on_action(|_: &ShowWelcome, cx| {
-        with_active_or_new_workspace(cx, |workspace, window, cx| {
-            workspace
-                .with_local_workspace(window, cx, |workspace, window, cx| {
-                    let existing = workspace
-                        .active_pane()
-                        .read(cx)
-                        .items()
-                        .find_map(|item| item.downcast::<WelcomePage>());
-
-                    if let Some(existing) = existing {
-                        workspace.activate_item(&existing, true, true, window, cx);
-                    } else {
-                        let settings_page = WelcomePage::new(window, cx);
-                        workspace.add_item_to_active_pane(
-                            Box::new(settings_page),
-                            None,
-                            true,
-                            window,
-                            cx,
-                        )
-                    }
-                })
-                .detach();
-        });
-    });
-
-    cx.observe_new(|workspace: &mut Workspace, _window, _cx| {
-        workspace.register_action(|_workspace, action: &ImportVsCodeSettings, window, cx| {
-            let fs = <dyn Fs>::global(cx);
-            let action = *action;
-
-            let workspace = cx.weak_entity();
-
-            window
-                .spawn(cx, async move |cx: &mut AsyncWindowContext| {
-                    handle_import_vscode_settings(
-                        workspace,
-                        VsCodeSettingsSource::VsCode,
-                        action.skip_prompt,
-                        fs,
-                        cx,
-                    )
-                    .await
-                })
-                .detach();
-        });
-
-        workspace.register_action(|_workspace, action: &ImportCursorSettings, window, cx| {
-            let fs = <dyn Fs>::global(cx);
-            let action = *action;
-
-            let workspace = cx.weak_entity();
-
-            window
-                .spawn(cx, async move |cx: &mut AsyncWindowContext| {
-                    handle_import_vscode_settings(
-                        workspace,
-                        VsCodeSettingsSource::Cursor,
-                        action.skip_prompt,
-                        fs,
-                        cx,
-                    )
-                    .await
-                })
-                .detach();
-        });
-    })
-    .detach();
-
-    base_keymap_picker::init(cx);
-
-    register_serializable_item::<Onboarding>(cx);
-    register_serializable_item::<WelcomePage>(cx);
-}
-
-pub fn show_onboarding_view(app_state: Arc<AppState>, cx: &mut App) -> Task<anyhow::Result<()>> {
-    telemetry::event!("Onboarding Page Opened");
-    open_new(
-        Default::default(),
-        app_state,
-        cx,
-        |workspace, window, cx| {
-            {
-                workspace.toggle_dock(DockPosition::Left, window, cx);
-                let onboarding_page = Onboarding::new(workspace, cx);
-                workspace.add_item_to_center(Box::new(onboarding_page.clone()), window, cx);
-
-                window.focus(&onboarding_page.focus_handle(cx));
-
-                cx.notify();
-            };
-            db::write_and_log(cx, || {
-                KEY_VALUE_STORE.write_kvp(FIRST_OPEN.to_string(), "false".to_string())
-            });
-        },
-    )
-}
-
-struct Onboarding {
-    workspace: WeakEntity<Workspace>,
-    focus_handle: FocusHandle,
-    user_store: Entity<UserStore>,
-    scroll_handle: ScrollHandle,
-    _settings_subscription: Subscription,
-}
-
-impl Onboarding {
-    fn new(workspace: &Workspace, cx: &mut App) -> Entity<Self> {
-        let font_family_cache = theme::FontFamilyCache::global(cx);
-
-        cx.new(|cx| {
-            cx.spawn(async move |this, cx| {
-                font_family_cache.prefetch(cx).await;
-                this.update(cx, |_, cx| {
-                    cx.notify();
-                })
-            })
-            .detach();
-
-            Self {
-                workspace: workspace.weak_handle(),
-                focus_handle: cx.focus_handle(),
-                scroll_handle: ScrollHandle::new(),
-                user_store: workspace.user_store().clone(),
-                _settings_subscription: cx
-                    .observe_global::<SettingsStore>(move |_, cx| cx.notify()),
-            }
-        })
-    }
-
-    fn on_finish(_: &Finish, _: &mut Window, cx: &mut App) {
-        telemetry::event!("Finish Setup");
-        go_to_welcome_page(cx);
-    }
-
-    fn handle_sign_in(_: &SignIn, window: &mut Window, cx: &mut App) {
-        let client = Client::global(cx);
-
-        window
-            .spawn(cx, async move |cx| {
-                client
-                    .sign_in_with_optional_connect(true, cx)
-                    .await
-                    .notify_async_err(cx);
-            })
-            .detach();
-    }
-
-    fn handle_open_account(_: &OpenAccount, _: &mut Window, cx: &mut App) {
-        cx.open_url(&zed_urls::account_url(cx))
-    }
-
-    fn render_page(&mut self, cx: &mut Context<Self>) -> AnyElement {
-        crate::basics_page::render_basics_page(cx).into_any_element()
-    }
-}
-
-impl Render for Onboarding {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        div()
-            .image_cache(gpui::retain_all("onboarding-page"))
-            .key_context({
-                let mut ctx = KeyContext::new_with_defaults();
-                ctx.add("Onboarding");
-                ctx.add("menu");
-                ctx
-            })
-            .track_focus(&self.focus_handle)
-            .size_full()
-            .bg(cx.theme().colors().editor_background)
-            .on_action(Self::on_finish)
-            .on_action(Self::handle_sign_in)
-            .on_action(Self::handle_open_account)
-            .on_action(cx.listener(|_, _: &menu::SelectNext, window, cx| {
-                window.focus_next();
-                cx.notify();
-            }))
-            .on_action(cx.listener(|_, _: &menu::SelectPrevious, window, cx| {
-                window.focus_prev();
-                cx.notify();
-            }))
-            .child(
-                div()
-                    .max_w(Rems(48.0))
-                    .size_full()
-                    .mx_auto()
-                    .child(
-                        v_flex()
-                            .id("page-content")
-                            .m_auto()
-                            .p_12()
-                            .size_full()
-                            .max_w_full()
-                            .min_w_0()
-                            .gap_6()
-                            .overflow_y_scroll()
-                            .child(
-                                h_flex()
-                                    .w_full()
-                                    .gap_4()
-                                    .justify_between()
-                                    .child(
-                                        h_flex()
-                                            .gap_4()
-                                            .child(Vector::square(VectorName::ZedLogo, rems(2.5)))
-                                            .child(
-                                                v_flex()
-                                                    .child(
-                                                        Headline::new("Welcome to Zed")
-                                                            .size(HeadlineSize::Small),
-                                                    )
-                                                    .child(
-                                                        Label::new("The editor for what's next")
-                                                            .color(Color::Muted)
-                                                            .size(LabelSize::Small)
-                                                            .italic(),
-                                                    ),
-                                            ),
-                                    )
-                                    .child({
-                                        Button::new("finish_setup", "Finish Setup")
-                                            .style(ButtonStyle::Filled)
-                                            .size(ButtonSize::Medium)
-                                            .width(Rems(12.0))
-                                            .key_binding(
-                                                KeyBinding::for_action_in(
-                                                    &Finish,
-                                                    &self.focus_handle,
-                                                    cx,
-                                                )
-                                                .size(rems_from_px(12.)),
-                                            )
-                                            .on_click(|_, window, cx| {
-                                                window.dispatch_action(Finish.boxed_clone(), cx);
-                                            })
-                                    }),
-                            )
-                            .child(Divider::horizontal().color(ui::DividerColor::BorderVariant))
-                            .child(self.render_page(cx))
-                            .track_scroll(&self.scroll_handle),
-                    )
-                    .vertical_scrollbar_for(&self.scroll_handle, window, cx),
-            )
-    }
-}
-
-impl EventEmitter<ItemEvent> for Onboarding {}
-
-impl Focusable for Onboarding {
-    fn focus_handle(&self, _: &App) -> gpui::FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl Item for Onboarding {
-    type Event = ItemEvent;
-
-    fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString {
-        "Onboarding".into()
-    }
-
-    fn telemetry_event_text(&self) -> Option<&'static str> {
-        Some("Onboarding Page Opened")
-    }
-
-    fn show_toolbar(&self) -> bool {
-        false
-    }
-
-    fn can_split(&self) -> bool {
-        true
-    }
-
-    fn clone_on_split(
-        &self,
-        _workspace_id: Option<WorkspaceId>,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Option<Entity<Self>>> {
-        Task::ready(Some(cx.new(|cx| Onboarding {
-            workspace: self.workspace.clone(),
-            user_store: self.user_store.clone(),
-            scroll_handle: ScrollHandle::new(),
-            focus_handle: cx.focus_handle(),
-            _settings_subscription: cx.observe_global::<SettingsStore>(move |_, cx| cx.notify()),
-        })))
-    }
-
-    fn to_item_events(event: &Self::Event, mut f: impl FnMut(workspace::item::ItemEvent)) {
-        f(*event)
-    }
-}
-
-fn go_to_welcome_page(cx: &mut App) {
-    with_active_or_new_workspace(cx, |workspace, window, cx| {
-        let Some((onboarding_id, onboarding_idx)) = workspace
-            .active_pane()
-            .read(cx)
-            .items()
-            .enumerate()
-            .find_map(|(idx, item)| {
-                let _ = item.downcast::<Onboarding>()?;
-                Some((item.item_id(), idx))
-            })
-        else {
-            return;
-        };
-
-        workspace.active_pane().update(cx, |pane, cx| {
-            // Get the index here to get around the borrow checker
-            let idx = pane.items().enumerate().find_map(|(idx, item)| {
-                let _ = item.downcast::<WelcomePage>()?;
-                Some(idx)
-            });
-
-            if let Some(idx) = idx {
-                pane.activate_item(idx, true, true, window, cx);
-            } else {
-                let item = Box::new(WelcomePage::new(window, cx));
-                pane.add_item(item, true, true, Some(onboarding_idx), window, cx);
-            }
-
-            pane.remove_item(onboarding_id, false, false, window, cx);
-        });
-    });
-}
-
-pub async fn handle_import_vscode_settings(
-    workspace: WeakEntity<Workspace>,
-    source: VsCodeSettingsSource,
-    skip_prompt: bool,
-    fs: Arc<dyn Fs>,
-    cx: &mut AsyncWindowContext,
-) {
-    use util::truncate_and_remove_front;
-
-    let vscode_settings =
-        match settings::VsCodeSettings::load_user_settings(source, fs.clone()).await {
-            Ok(vscode_settings) => vscode_settings,
-            Err(err) => {
-                zlog::error!("{err:?}");
-                let _ = cx.prompt(
-                    gpui::PromptLevel::Info,
-                    &format!("Could not find or load a {source} settings file"),
-                    None,
-                    &["Ok"],
-                );
-                return;
-            }
-        };
-
-    if !skip_prompt {
-        let prompt = cx.prompt(
-            gpui::PromptLevel::Warning,
-            &format!(
-                "Importing {} settings may overwrite your existing settings. \
-                Will import settings from {}",
-                vscode_settings.source,
-                truncate_and_remove_front(&vscode_settings.path.to_string_lossy(), 128),
-            ),
-            None,
-            &["Ok", "Cancel"],
-        );
-        let result = cx.spawn(async move |_| prompt.await.ok()).await;
-        if result != Some(0) {
-            return;
-        }
-    };
-
-    let Ok(result_channel) = cx.update(|_, cx| {
-        let source = vscode_settings.source;
-        let path = vscode_settings.path.clone();
-        let result_channel = cx
-            .global::<SettingsStore>()
-            .import_vscode_settings(fs, vscode_settings);
-        zlog::info!("Imported {source} settings from {}", path.display());
-        result_channel
-    }) else {
-        return;
-    };
-
-    let result = result_channel.await;
-    workspace
-        .update_in(cx, |workspace, _, cx| match result {
-            Ok(_) => {
-                let confirmation_toast = StatusToast::new(
-                    format!("Your {} settings were successfully imported.", source),
-                    cx,
-                    |this, _| {
-                        this.icon(ToastIcon::new(IconName::Check).color(Color::Success))
-                            .dismiss_button(true)
-                    },
-                );
-                SettingsImportState::update(cx, |state, _| match source {
-                    VsCodeSettingsSource::VsCode => {
-                        state.vscode = true;
-                    }
-                    VsCodeSettingsSource::Cursor => {
-                        state.cursor = true;
-                    }
-                });
-                workspace.toggle_status_toast(confirmation_toast, cx);
-            }
-            Err(_) => {
-                let error_toast = StatusToast::new(
-                    "Failed to import settings. See log for details",
-                    cx,
-                    |this, _| {
-                        this.icon(ToastIcon::new(IconName::Close).color(Color::Error))
-                            .action("Open Log", |window, cx| {
-                                window.dispatch_action(workspace::OpenLog.boxed_clone(), cx)
-                            })
-                            .dismiss_button(true)
-                    },
-                );
-                workspace.toggle_status_toast(error_toast, cx);
-            }
-        })
-        .ok();
-}
-
-#[derive(Default, Copy, Clone)]
-pub struct SettingsImportState {
-    pub cursor: bool,
-    pub vscode: bool,
-}
-
-impl Global for SettingsImportState {}
-
-impl SettingsImportState {
-    pub fn global(cx: &App) -> Self {
-        cx.try_global().cloned().unwrap_or_default()
-    }
-    pub fn update<R>(cx: &mut App, f: impl FnOnce(&mut Self, &mut App) -> R) -> R {
-        cx.update_default_global(f)
-    }
-}
-
-impl workspace::SerializableItem for Onboarding {
-    fn serialized_item_kind() -> &'static str {
-        "OnboardingPage"
-    }
-
-    fn cleanup(
-        workspace_id: workspace::WorkspaceId,
-        alive_items: Vec<workspace::ItemId>,
-        _window: &mut Window,
-        cx: &mut App,
-    ) -> gpui::Task<gpui::Result<()>> {
-        workspace::delete_unloaded_items(
-            alive_items,
-            workspace_id,
-            "onboarding_pages",
-            &persistence::ONBOARDING_PAGES,
-            cx,
-        )
-    }
-
-    fn deserialize(
-        _project: Entity<project::Project>,
-        workspace: WeakEntity<Workspace>,
-        workspace_id: workspace::WorkspaceId,
-        item_id: workspace::ItemId,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> gpui::Task<gpui::Result<Entity<Self>>> {
-        window.spawn(cx, async move |cx| {
-            if let Some(_) =
-                persistence::ONBOARDING_PAGES.get_onboarding_page(item_id, workspace_id)?
-            {
-                workspace.update(cx, |workspace, cx| Onboarding::new(workspace, cx))
-            } else {
-                Err(anyhow::anyhow!("No onboarding page to deserialize"))
-            }
-        })
-    }
-
-    fn serialize(
-        &mut self,
-        workspace: &mut Workspace,
-        item_id: workspace::ItemId,
-        _closing: bool,
-        _window: &mut Window,
-        cx: &mut ui::Context<Self>,
-    ) -> Option<gpui::Task<gpui::Result<()>>> {
-        let workspace_id = workspace.database_id()?;
-
-        Some(cx.background_spawn(async move {
-            persistence::ONBOARDING_PAGES
-                .save_onboarding_page(item_id, workspace_id)
-                .await
-        }))
-    }
-
-    fn should_serialize(&self, event: &Self::Event) -> bool {
-        event == &ItemEvent::UpdateTab
-    }
-}
-
-mod persistence {
-    use db::{
-        query,
-        sqlez::{domain::Domain, thread_safe_connection::ThreadSafeConnection},
-        sqlez_macros::sql,
-    };
-    use workspace::WorkspaceDb;
-
-    pub struct OnboardingPagesDb(ThreadSafeConnection);
-
-    impl Domain for OnboardingPagesDb {
-        const NAME: &str = stringify!(OnboardingPagesDb);
-
-        const MIGRATIONS: &[&str] = &[
-            sql!(
-                        CREATE TABLE onboarding_pages (
-                            workspace_id INTEGER,
-                            item_id INTEGER UNIQUE,
-                            page_number INTEGER,
-
-                            PRIMARY KEY(workspace_id, item_id),
-                            FOREIGN KEY(workspace_id) REFERENCES workspaces(workspace_id)
-                            ON DELETE CASCADE
-                        ) STRICT;
-            ),
-            sql!(
-                        CREATE TABLE onboarding_pages_2 (
-                            workspace_id INTEGER,
-                            item_id INTEGER UNIQUE,
-
-                            PRIMARY KEY(workspace_id, item_id),
-                            FOREIGN KEY(workspace_id) REFERENCES workspaces(workspace_id)
-                            ON DELETE CASCADE
-                        ) STRICT;
-                        INSERT INTO onboarding_pages_2 SELECT workspace_id, item_id FROM onboarding_pages;
-                        DROP TABLE onboarding_pages;
-                        ALTER TABLE onboarding_pages_2 RENAME TO onboarding_pages;
-            ),
-        ];
-    }
-
-    db::static_connection!(ONBOARDING_PAGES, OnboardingPagesDb, [WorkspaceDb]);
-
-    impl OnboardingPagesDb {
-        query! {
-            pub async fn save_onboarding_page(
-                item_id: workspace::ItemId,
-                workspace_id: workspace::WorkspaceId
-            ) -> Result<()> {
-                INSERT OR REPLACE INTO onboarding_pages(item_id, workspace_id)
-                VALUES (?, ?)
-            }
-        }
-
-        query! {
-            pub fn get_onboarding_page(
-                item_id: workspace::ItemId,
-                workspace_id: workspace::WorkspaceId
-            ) -> Result<Option<workspace::ItemId>> {
-                SELECT item_id
-                FROM onboarding_pages
-                WHERE item_id = ? AND workspace_id = ?
-            }
-        }
-    }
-}
diff --git a/crates/onboarding/src/theme_preview.rs b/crates/onboarding/src/theme_preview.rs
deleted file mode 100644
index 8bd65d8a27..0000000000
--- a/crates/onboarding/src/theme_preview.rs
+++ /dev/null
@@ -1,381 +0,0 @@
-#![allow(unused, dead_code)]
-use gpui::{Hsla, Length};
-use std::{
-    cell::LazyCell,
-    sync::{Arc, LazyLock, OnceLock},
-};
-use theme::{Theme, ThemeColors, ThemeRegistry};
-use ui::{
-    IntoElement, RenderOnce, component_prelude::Documented, prelude::*, utils::inner_corner_radius,
-};
-
-#[derive(Clone, PartialEq)]
-pub enum ThemePreviewStyle {
-    Bordered,
-    Borderless,
-    SideBySide(Arc<Theme>),
-}
-
-/// Shows a preview of a theme as an abstract illustration
-/// of a thumbnail-sized editor.
-#[derive(IntoElement, RegisterComponent, Documented)]
-pub struct ThemePreviewTile {
-    theme: Arc<Theme>,
-    seed: f32,
-    style: ThemePreviewStyle,
-}
-
-static CHILD_RADIUS: LazyLock<Pixels> = LazyLock::new(|| {
-    inner_corner_radius(
-        ThemePreviewTile::ROOT_RADIUS,
-        ThemePreviewTile::ROOT_BORDER,
-        ThemePreviewTile::ROOT_PADDING,
-        ThemePreviewTile::CHILD_BORDER,
-    )
-});
-
-impl ThemePreviewTile {
-    pub const SKELETON_HEIGHT_DEFAULT: Pixels = px(2.);
-    pub const SIDEBAR_SKELETON_ITEM_COUNT: usize = 8;
-    pub const SIDEBAR_WIDTH_DEFAULT: DefiniteLength = relative(0.25);
-    pub const ROOT_RADIUS: Pixels = px(8.0);
-    pub const ROOT_BORDER: Pixels = px(2.0);
-    pub const ROOT_PADDING: Pixels = px(2.0);
-    pub const CHILD_BORDER: Pixels = px(1.0);
-
-    pub fn new(theme: Arc<Theme>, seed: f32) -> Self {
-        Self {
-            theme,
-            seed,
-            style: ThemePreviewStyle::Bordered,
-        }
-    }
-
-    pub fn style(mut self, style: ThemePreviewStyle) -> Self {
-        self.style = style;
-        self
-    }
-
-    pub fn item_skeleton(w: Length, h: Length, bg: Hsla) -> impl IntoElement {
-        div().w(w).h(h).rounded_full().bg(bg)
-    }
-
-    pub fn render_sidebar_skeleton_items(
-        seed: f32,
-        colors: &ThemeColors,
-        skeleton_height: impl Into<Length> + Clone,
-    ) -> [impl IntoElement; Self::SIDEBAR_SKELETON_ITEM_COUNT] {
-        let skeleton_height = skeleton_height.into();
-        std::array::from_fn(|index| {
-            let width = {
-                let value = (seed * 1000.0 + index as f32 * 10.0).sin() * 0.5 + 0.5;
-                0.5 + value * 0.45
-            };
-            Self::item_skeleton(
-                relative(width).into(),
-                skeleton_height,
-                colors.text.alpha(0.45),
-            )
-        })
-    }
-
-    pub fn render_pseudo_code_skeleton(
-        seed: f32,
-        theme: Arc<Theme>,
-        skeleton_height: impl Into<Length>,
-    ) -> impl IntoElement {
-        let colors = theme.colors();
-        let syntax = theme.syntax();
-
-        let keyword_color = syntax.get("keyword").color;
-        let function_color = syntax.get("function").color;
-        let string_color = syntax.get("string").color;
-        let comment_color = syntax.get("comment").color;
-        let variable_color = syntax.get("variable").color;
-        let type_color = syntax.get("type").color;
-        let punctuation_color = syntax.get("punctuation").color;
-
-        let syntax_colors = [
-            keyword_color,
-            function_color,
-            string_color,
-            variable_color,
-            type_color,
-            punctuation_color,
-            comment_color,
-        ];
-
-        let skeleton_height = skeleton_height.into();
-
-        let line_width = |line_idx: usize, block_idx: usize| -> f32 {
-            let val =
-                (seed * 100.0 + line_idx as f32 * 20.0 + block_idx as f32 * 5.0).sin() * 0.5 + 0.5;
-            0.05 + val * 0.2
-        };
-
-        let indentation = |line_idx: usize| -> f32 {
-            let step = line_idx % 6;
-            if step < 3 {
-                step as f32 * 0.1
-            } else {
-                (5 - step) as f32 * 0.1
-            }
-        };
-
-        let pick_color = |line_idx: usize, block_idx: usize| -> Hsla {
-            let idx = ((seed * 10.0 + line_idx as f32 * 7.0 + block_idx as f32 * 3.0).sin() * 3.5)
-                .abs() as usize
-                % syntax_colors.len();
-            syntax_colors[idx].unwrap_or(colors.text)
-        };
-
-        let line_count = 13;
-
-        let lines = (0..line_count)
-            .map(|line_idx| {
-                let block_count = (((seed * 30.0 + line_idx as f32 * 12.0).sin() * 0.5 + 0.5) * 3.0)
-                    .round() as usize
-                    + 2;
-
-                let indent = indentation(line_idx);
-
-                let blocks = (0..block_count)
-                    .map(|block_idx| {
-                        let width = line_width(line_idx, block_idx);
-                        let color = pick_color(line_idx, block_idx);
-                        Self::item_skeleton(relative(width).into(), skeleton_height, color)
-                    })
-                    .collect::<Vec<_>>();
-
-                h_flex().gap(px(2.)).ml(relative(indent)).children(blocks)
-            })
-            .collect::<Vec<_>>();
-
-        v_flex().size_full().p_1().gap_1p5().children(lines)
-    }
-
-    pub fn render_sidebar(
-        seed: f32,
-        colors: &ThemeColors,
-        width: impl Into<Length> + Clone,
-        skeleton_height: impl Into<Length>,
-    ) -> impl IntoElement {
-        div()
-            .h_full()
-            .w(width)
-            .border_r(px(1.))
-            .border_color(colors.border_transparent)
-            .bg(colors.panel_background)
-            .child(v_flex().p_2().size_full().gap_1().children(
-                Self::render_sidebar_skeleton_items(seed, colors, skeleton_height.into()),
-            ))
-    }
-
-    pub fn render_pane(
-        seed: f32,
-        theme: Arc<Theme>,
-        skeleton_height: impl Into<Length>,
-    ) -> impl IntoElement {
-        v_flex().h_full().flex_grow().child(
-            div()
-                .size_full()
-                .overflow_hidden()
-                .bg(theme.colors().editor_background)
-                .p_2()
-                .child(Self::render_pseudo_code_skeleton(
-                    seed,
-                    theme,
-                    skeleton_height.into(),
-                )),
-        )
-    }
-
-    pub fn render_editor(
-        seed: f32,
-        theme: Arc<Theme>,
-        sidebar_width: impl Into<Length> + Clone,
-        skeleton_height: impl Into<Length> + Clone,
-    ) -> impl IntoElement {
-        div()
-            .size_full()
-            .flex()
-            .bg(theme.colors().background.alpha(1.00))
-            .child(Self::render_sidebar(
-                seed,
-                theme.colors(),
-                sidebar_width,
-                skeleton_height.clone(),
-            ))
-            .child(Self::render_pane(seed, theme, skeleton_height))
-    }
-
-    fn render_borderless(seed: f32, theme: Arc<Theme>) -> impl IntoElement {
-        Self::render_editor(
-            seed,
-            theme,
-            Self::SIDEBAR_WIDTH_DEFAULT,
-            Self::SKELETON_HEIGHT_DEFAULT,
-        )
-    }
-
-    fn render_border(seed: f32, theme: Arc<Theme>) -> impl IntoElement {
-        div()
-            .size_full()
-            .p(Self::ROOT_PADDING)
-            .rounded(Self::ROOT_RADIUS)
-            .child(
-                div()
-                    .size_full()
-                    .rounded(*CHILD_RADIUS)
-                    .border(Self::CHILD_BORDER)
-                    .border_color(theme.colors().border)
-                    .child(Self::render_editor(
-                        seed,
-                        theme.clone(),
-                        Self::SIDEBAR_WIDTH_DEFAULT,
-                        Self::SKELETON_HEIGHT_DEFAULT,
-                    )),
-            )
-    }
-
-    fn render_side_by_side(
-        seed: f32,
-        theme: Arc<Theme>,
-        other_theme: Arc<Theme>,
-        border_color: Hsla,
-    ) -> impl IntoElement {
-        let sidebar_width = relative(0.20);
-
-        div()
-            .size_full()
-            .p(Self::ROOT_PADDING)
-            .rounded(Self::ROOT_RADIUS)
-            .child(
-                h_flex()
-                    .size_full()
-                    .relative()
-                    .rounded(*CHILD_RADIUS)
-                    .border(Self::CHILD_BORDER)
-                    .border_color(border_color)
-                    .overflow_hidden()
-                    .child(div().size_full().child(Self::render_editor(
-                        seed,
-                        theme,
-                        sidebar_width,
-                        Self::SKELETON_HEIGHT_DEFAULT,
-                    )))
-                    .child(
-                        div()
-                            .size_full()
-                            .absolute()
-                            .left_1_2()
-                            .bg(other_theme.colors().editor_background)
-                            .child(Self::render_editor(
-                                seed,
-                                other_theme,
-                                sidebar_width,
-                                Self::SKELETON_HEIGHT_DEFAULT,
-                            )),
-                    ),
-            )
-            .into_any_element()
-    }
-}
-
-impl RenderOnce for ThemePreviewTile {
-    fn render(self, _window: &mut ui::Window, _cx: &mut ui::App) -> impl IntoElement {
-        match self.style {
-            ThemePreviewStyle::Bordered => {
-                Self::render_border(self.seed, self.theme).into_any_element()
-            }
-            ThemePreviewStyle::Borderless => {
-                Self::render_borderless(self.seed, self.theme).into_any_element()
-            }
-            ThemePreviewStyle::SideBySide(other_theme) => Self::render_side_by_side(
-                self.seed,
-                self.theme,
-                other_theme,
-                _cx.theme().colors().border,
-            )
-            .into_any_element(),
-        }
-    }
-}
-
-impl Component for ThemePreviewTile {
-    fn scope() -> ComponentScope {
-        ComponentScope::Onboarding
-    }
-
-    fn name() -> &'static str {
-        "Theme Preview Tile"
-    }
-
-    fn sort_name() -> &'static str {
-        "Theme Preview Tile"
-    }
-
-    fn description() -> Option<&'static str> {
-        Some(Self::DOCS)
-    }
-
-    fn preview(_window: &mut Window, cx: &mut App) -> Option<AnyElement> {
-        let theme_registry = ThemeRegistry::global(cx);
-
-        let one_dark = theme_registry.get("One Dark");
-        let one_light = theme_registry.get("One Light");
-        let gruvbox_dark = theme_registry.get("Gruvbox Dark");
-        let gruvbox_light = theme_registry.get("Gruvbox Light");
-
-        let themes_to_preview = vec![
-            one_dark.clone().ok(),
-            one_light.ok(),
-            gruvbox_dark.ok(),
-            gruvbox_light.ok(),
-        ]
-        .into_iter()
-        .flatten()
-        .collect::<Vec<_>>();
-
-        Some(
-            v_flex()
-                .gap_6()
-                .p_4()
-                .children({
-                    if let Some(one_dark) = one_dark.ok() {
-                        vec![example_group(vec![single_example(
-                            "Default",
-                            div()
-                                .w(px(240.))
-                                .h(px(180.))
-                                .child(ThemePreviewTile::new(one_dark, 0.42))
-                                .into_any_element(),
-                        )])]
-                    } else {
-                        vec![]
-                    }
-                })
-                .child(
-                    example_group(vec![single_example(
-                        "Default Themes",
-                        h_flex()
-                            .gap_4()
-                            .children(
-                                themes_to_preview
-                                    .into_iter()
-                                    .map(|theme| {
-                                        div()
-                                            .w(px(200.))
-                                            .h(px(140.))
-                                            .child(ThemePreviewTile::new(theme, 0.42))
-                                    })
-                                    .collect::<Vec<_>>(),
-                            )
-                            .into_any_element(),
-                    )])
-                    .grow(),
-                )
-                .into_any_element(),
-        )
-    }
-}
diff --git a/crates/onboarding/src/welcome.rs b/crates/onboarding/src/welcome.rs
deleted file mode 100644
index b2711cd52d..0000000000
--- a/crates/onboarding/src/welcome.rs
+++ /dev/null
@@ -1,443 +0,0 @@
-use gpui::{
-    Action, App, Context, Entity, EventEmitter, FocusHandle, Focusable, InteractiveElement,
-    ParentElement, Render, Styled, Task, Window, actions,
-};
-use menu::{SelectNext, SelectPrevious};
-use ui::{ButtonLike, Divider, DividerColor, KeyBinding, Vector, VectorName, prelude::*};
-use workspace::{
-    NewFile, Open,
-    item::{Item, ItemEvent},
-    with_active_or_new_workspace,
-};
-use zed_actions::{Extensions, OpenSettings, agent, command_palette};
-
-use crate::{Onboarding, OpenOnboarding};
-
-actions!(
-    zed,
-    [
-        /// Show the Zed welcome screen
-        ShowWelcome
-    ]
-);
-
-const CONTENT: (Section<4>, Section<3>) = (
-    Section {
-        title: "Get Started",
-        entries: [
-            SectionEntry {
-                icon: IconName::Plus,
-                title: "New File",
-                action: &NewFile,
-            },
-            SectionEntry {
-                icon: IconName::FolderOpen,
-                title: "Open Project",
-                action: &Open,
-            },
-            SectionEntry {
-                icon: IconName::CloudDownload,
-                title: "Clone Repository",
-                action: &git::Clone,
-            },
-            SectionEntry {
-                icon: IconName::ListCollapse,
-                title: "Open Command Palette",
-                action: &command_palette::Toggle,
-            },
-        ],
-    },
-    Section {
-        title: "Configure",
-        entries: [
-            SectionEntry {
-                icon: IconName::Settings,
-                title: "Open Settings",
-                action: &OpenSettings,
-            },
-            SectionEntry {
-                icon: IconName::ZedAssistant,
-                title: "View AI Settings",
-                action: &agent::OpenSettings,
-            },
-            SectionEntry {
-                icon: IconName::Blocks,
-                title: "Explore Extensions",
-                action: &Extensions {
-                    category_filter: None,
-                    id: None,
-                },
-            },
-        ],
-    },
-);
-
-struct Section<const COLS: usize> {
-    title: &'static str,
-    entries: [SectionEntry; COLS],
-}
-
-impl<const COLS: usize> Section<COLS> {
-    fn render(self, index_offset: usize, focus: &FocusHandle, cx: &mut App) -> impl IntoElement {
-        v_flex()
-            .min_w_full()
-            .child(
-                h_flex()
-                    .px_1()
-                    .mb_2()
-                    .gap_2()
-                    .child(
-                        Label::new(self.title.to_ascii_uppercase())
-                            .buffer_font(cx)
-                            .color(Color::Muted)
-                            .size(LabelSize::XSmall),
-                    )
-                    .child(Divider::horizontal().color(DividerColor::BorderVariant)),
-            )
-            .children(
-                self.entries
-                    .iter()
-                    .enumerate()
-                    .map(|(index, entry)| entry.render(index_offset + index, focus, cx)),
-            )
-    }
-}
-
-struct SectionEntry {
-    icon: IconName,
-    title: &'static str,
-    action: &'static dyn Action,
-}
-
-impl SectionEntry {
-    fn render(&self, button_index: usize, focus: &FocusHandle, cx: &App) -> impl IntoElement {
-        ButtonLike::new(("onboarding-button-id", button_index))
-            .tab_index(button_index as isize)
-            .full_width()
-            .size(ButtonSize::Medium)
-            .child(
-                h_flex()
-                    .w_full()
-                    .justify_between()
-                    .child(
-                        h_flex()
-                            .gap_2()
-                            .child(
-                                Icon::new(self.icon)
-                                    .color(Color::Muted)
-                                    .size(IconSize::XSmall),
-                            )
-                            .child(Label::new(self.title)),
-                    )
-                    .child(
-                        KeyBinding::for_action_in(self.action, focus, cx).size(rems_from_px(12.)),
-                    ),
-            )
-            .on_click(|_, window, cx| window.dispatch_action(self.action.boxed_clone(), cx))
-    }
-}
-
-pub struct WelcomePage {
-    focus_handle: FocusHandle,
-}
-
-impl WelcomePage {
-    fn select_next(&mut self, _: &SelectNext, window: &mut Window, cx: &mut Context<Self>) {
-        window.focus_next();
-        cx.notify();
-    }
-
-    fn select_previous(&mut self, _: &SelectPrevious, window: &mut Window, cx: &mut Context<Self>) {
-        window.focus_prev();
-        cx.notify();
-    }
-}
-
-impl Render for WelcomePage {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let (first_section, second_section) = CONTENT;
-        let first_section_entries = first_section.entries.len();
-        let last_index = first_section_entries + second_section.entries.len();
-
-        h_flex()
-            .size_full()
-            .justify_center()
-            .overflow_hidden()
-            .bg(cx.theme().colors().editor_background)
-            .key_context("Welcome")
-            .track_focus(&self.focus_handle(cx))
-            .on_action(cx.listener(Self::select_previous))
-            .on_action(cx.listener(Self::select_next))
-            .child(
-                h_flex()
-                    .px_12()
-                    .py_40()
-                    .size_full()
-                    .relative()
-                    .max_w(px(1100.))
-                    .child(
-                        div()
-                            .size_full()
-                            .max_w_128()
-                            .mx_auto()
-                            .child(
-                                h_flex()
-                                    .w_full()
-                                    .justify_center()
-                                    .gap_4()
-                                    .child(Vector::square(VectorName::ZedLogo, rems(2.)))
-                                    .child(
-                                        div().child(Headline::new("Welcome to Zed")).child(
-                                            Label::new("The editor for what's next")
-                                                .size(LabelSize::Small)
-                                                .color(Color::Muted)
-                                                .italic(),
-                                        ),
-                                    ),
-                            )
-                            .child(
-                                v_flex()
-                                    .mt_10()
-                                    .gap_6()
-                                    .child(first_section.render(
-                                        Default::default(),
-                                        &self.focus_handle,
-                                        cx,
-                                    ))
-                                    .child(second_section.render(
-                                        first_section_entries,
-                                        &self.focus_handle,
-                                        cx,
-                                    ))
-                                    .child(
-                                        h_flex()
-                                            .w_full()
-                                            .pt_4()
-                                            .justify_center()
-                                            // We call this a hack
-                                            .rounded_b_xs()
-                                            .border_t_1()
-                                            .border_color(cx.theme().colors().border.opacity(0.6))
-                                            .border_dashed()
-                                            .child(
-                                                    Button::new("welcome-exit", "Return to Setup")
-                                                        .tab_index(last_index as isize)
-                                                        .full_width()
-                                                        .label_size(LabelSize::XSmall)
-                                                        .on_click(|_, window, cx| {
-                                                            window.dispatch_action(
-                                                                OpenOnboarding.boxed_clone(),
-                                                                cx,
-                                                            );
-
-                                                            with_active_or_new_workspace(cx, |workspace, window, cx| {
-                                                                let Some((welcome_id, welcome_idx)) = workspace
-                                                                    .active_pane()
-                                                                    .read(cx)
-                                                                    .items()
-                                                                    .enumerate()
-                                                                    .find_map(|(idx, item)| {
-                                                                        let _ = item.downcast::<WelcomePage>()?;
-                                                                        Some((item.item_id(), idx))
-                                                                    })
-                                                                else {
-                                                                    return;
-                                                                };
-
-                                                                workspace.active_pane().update(cx, |pane, cx| {
-                                                                    // Get the index here to get around the borrow checker
-                                                                    let idx = pane.items().enumerate().find_map(
-                                                                        |(idx, item)| {
-                                                                            let _ =
-                                                                                item.downcast::<Onboarding>()?;
-                                                                            Some(idx)
-                                                                        },
-                                                                    );
-
-                                                                    if let Some(idx) = idx {
-                                                                        pane.activate_item(
-                                                                            idx, true, true, window, cx,
-                                                                        );
-                                                                    } else {
-                                                                        let item =
-                                                                            Box::new(Onboarding::new(workspace, cx));
-                                                                        pane.add_item(
-                                                                            item,
-                                                                            true,
-                                                                            true,
-                                                                            Some(welcome_idx),
-                                                                            window,
-                                                                            cx,
-                                                                        );
-                                                                    }
-
-                                                                    pane.remove_item(
-                                                                        welcome_id,
-                                                                        false,
-                                                                        false,
-                                                                        window,
-                                                                        cx,
-                                                                    );
-                                                                });
-                                                            });
-                                                        }),
-                                                ),
-                                    ),
-                            ),
-                    ),
-            )
-    }
-}
-
-impl WelcomePage {
-    pub fn new(window: &mut Window, cx: &mut App) -> Entity<Self> {
-        cx.new(|cx| {
-            let focus_handle = cx.focus_handle();
-            cx.on_focus(&focus_handle, window, |_, _, cx| cx.notify())
-                .detach();
-
-            WelcomePage { focus_handle }
-        })
-    }
-}
-
-impl EventEmitter<ItemEvent> for WelcomePage {}
-
-impl Focusable for WelcomePage {
-    fn focus_handle(&self, _: &App) -> gpui::FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl Item for WelcomePage {
-    type Event = ItemEvent;
-
-    fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString {
-        "Welcome".into()
-    }
-
-    fn telemetry_event_text(&self) -> Option<&'static str> {
-        Some("New Welcome Page Opened")
-    }
-
-    fn show_toolbar(&self) -> bool {
-        false
-    }
-
-    fn to_item_events(event: &Self::Event, mut f: impl FnMut(workspace::item::ItemEvent)) {
-        f(*event)
-    }
-}
-
-impl workspace::SerializableItem for WelcomePage {
-    fn serialized_item_kind() -> &'static str {
-        "WelcomePage"
-    }
-
-    fn cleanup(
-        workspace_id: workspace::WorkspaceId,
-        alive_items: Vec<workspace::ItemId>,
-        _window: &mut Window,
-        cx: &mut App,
-    ) -> Task<gpui::Result<()>> {
-        workspace::delete_unloaded_items(
-            alive_items,
-            workspace_id,
-            "welcome_pages",
-            &persistence::WELCOME_PAGES,
-            cx,
-        )
-    }
-
-    fn deserialize(
-        _project: Entity<project::Project>,
-        _workspace: gpui::WeakEntity<workspace::Workspace>,
-        workspace_id: workspace::WorkspaceId,
-        item_id: workspace::ItemId,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<gpui::Result<Entity<Self>>> {
-        if persistence::WELCOME_PAGES
-            .get_welcome_page(item_id, workspace_id)
-            .ok()
-            .is_some_and(|is_open| is_open)
-        {
-            window.spawn(cx, async move |cx| cx.update(WelcomePage::new))
-        } else {
-            Task::ready(Err(anyhow::anyhow!("No welcome page to deserialize")))
-        }
-    }
-
-    fn serialize(
-        &mut self,
-        workspace: &mut workspace::Workspace,
-        item_id: workspace::ItemId,
-        _closing: bool,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Task<gpui::Result<()>>> {
-        let workspace_id = workspace.database_id()?;
-        Some(cx.background_spawn(async move {
-            persistence::WELCOME_PAGES
-                .save_welcome_page(item_id, workspace_id, true)
-                .await
-        }))
-    }
-
-    fn should_serialize(&self, event: &Self::Event) -> bool {
-        event == &ItemEvent::UpdateTab
-    }
-}
-
-mod persistence {
-    use db::{
-        query,
-        sqlez::{domain::Domain, thread_safe_connection::ThreadSafeConnection},
-        sqlez_macros::sql,
-    };
-    use workspace::WorkspaceDb;
-
-    pub struct WelcomePagesDb(ThreadSafeConnection);
-
-    impl Domain for WelcomePagesDb {
-        const NAME: &str = stringify!(WelcomePagesDb);
-
-        const MIGRATIONS: &[&str] = (&[sql!(
-                    CREATE TABLE welcome_pages (
-                        workspace_id INTEGER,
-                        item_id INTEGER UNIQUE,
-                        is_open INTEGER DEFAULT FALSE,
-
-                        PRIMARY KEY(workspace_id, item_id),
-                        FOREIGN KEY(workspace_id) REFERENCES workspaces(workspace_id)
-                        ON DELETE CASCADE
-                    ) STRICT;
-        )]);
-    }
-
-    db::static_connection!(WELCOME_PAGES, WelcomePagesDb, [WorkspaceDb]);
-
-    impl WelcomePagesDb {
-        query! {
-            pub async fn save_welcome_page(
-                item_id: workspace::ItemId,
-                workspace_id: workspace::WorkspaceId,
-                is_open: bool
-            ) -> Result<()> {
-                INSERT OR REPLACE INTO welcome_pages(item_id, workspace_id, is_open)
-                VALUES (?, ?, ?)
-            }
-        }
-
-        query! {
-            pub fn get_welcome_page(
-                item_id: workspace::ItemId,
-                workspace_id: workspace::WorkspaceId
-            ) -> Result<bool> {
-                SELECT is_open
-                FROM welcome_pages
-                WHERE item_id = ? AND workspace_id = ?
-            }
-        }
-    }
-}
diff --git a/crates/open_ai/Cargo.toml b/crates/open_ai/Cargo.toml
deleted file mode 100644
index 037ca14437..0000000000
--- a/crates/open_ai/Cargo.toml
+++ /dev/null
@@ -1,28 +0,0 @@
-[package]
-name = "open_ai"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/open_ai.rs"
-
-[features]
-default = []
-schemars = ["dep:schemars"]
-
-[dependencies]
-anyhow.workspace = true
-futures.workspace = true
-http_client.workspace = true
-schemars = { workspace = true, optional = true }
-log.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-strum.workspace = true
-thiserror.workspace = true
diff --git a/crates/open_ai/LICENSE-GPL b/crates/open_ai/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/open_ai/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/open_ai/src/open_ai.rs b/crates/open_ai/src/open_ai.rs
deleted file mode 100644
index d8b4722543..0000000000
--- a/crates/open_ai/src/open_ai.rs
+++ /dev/null
@@ -1,626 +0,0 @@
-use anyhow::{Context as _, Result, anyhow};
-use futures::{AsyncBufReadExt, AsyncReadExt, StreamExt, io::BufReader, stream::BoxStream};
-use http_client::{
-    AsyncBody, HttpClient, Method, Request as HttpRequest, StatusCode,
-    http::{HeaderMap, HeaderValue},
-};
-use serde::{Deserialize, Serialize};
-use serde_json::Value;
-pub use settings::OpenAiReasoningEffort as ReasoningEffort;
-use std::{convert::TryFrom, future::Future};
-use strum::EnumIter;
-use thiserror::Error;
-
-pub const OPEN_AI_API_URL: &str = "https://api.openai.com/v1";
-
-fn is_none_or_empty<T: AsRef<[U]>, U>(opt: &Option<T>) -> bool {
-    opt.as_ref().is_none_or(|v| v.as_ref().is_empty())
-}
-
-#[derive(Clone, Copy, Serialize, Deserialize, Debug, Eq, PartialEq)]
-#[serde(rename_all = "lowercase")]
-pub enum Role {
-    User,
-    Assistant,
-    System,
-    Tool,
-}
-
-impl TryFrom<String> for Role {
-    type Error = anyhow::Error;
-
-    fn try_from(value: String) -> Result<Self> {
-        match value.as_str() {
-            "user" => Ok(Self::User),
-            "assistant" => Ok(Self::Assistant),
-            "system" => Ok(Self::System),
-            "tool" => Ok(Self::Tool),
-            _ => anyhow::bail!("invalid role '{value}'"),
-        }
-    }
-}
-
-impl From<Role> for String {
-    fn from(val: Role) -> Self {
-        match val {
-            Role::User => "user".to_owned(),
-            Role::Assistant => "assistant".to_owned(),
-            Role::System => "system".to_owned(),
-            Role::Tool => "tool".to_owned(),
-        }
-    }
-}
-
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
-#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq, EnumIter)]
-pub enum Model {
-    #[serde(rename = "gpt-3.5-turbo")]
-    ThreePointFiveTurbo,
-    #[serde(rename = "gpt-4")]
-    Four,
-    #[serde(rename = "gpt-4-turbo")]
-    FourTurbo,
-    #[serde(rename = "gpt-4o")]
-    #[default]
-    FourOmni,
-    #[serde(rename = "gpt-4o-mini")]
-    FourOmniMini,
-    #[serde(rename = "gpt-4.1")]
-    FourPointOne,
-    #[serde(rename = "gpt-4.1-mini")]
-    FourPointOneMini,
-    #[serde(rename = "gpt-4.1-nano")]
-    FourPointOneNano,
-    #[serde(rename = "o1")]
-    O1,
-    #[serde(rename = "o3-mini")]
-    O3Mini,
-    #[serde(rename = "o3")]
-    O3,
-    #[serde(rename = "o4-mini")]
-    O4Mini,
-    #[serde(rename = "gpt-5")]
-    Five,
-    #[serde(rename = "gpt-5-mini")]
-    FiveMini,
-    #[serde(rename = "gpt-5-nano")]
-    FiveNano,
-    #[serde(rename = "gpt-5.1")]
-    FivePointOne,
-    #[serde(rename = "gpt-5.2")]
-    FivePointTwo,
-    #[serde(rename = "custom")]
-    Custom {
-        name: String,
-        /// The name displayed in the UI, such as in the assistant panel model dropdown menu.
-        display_name: Option<String>,
-        max_tokens: u64,
-        max_output_tokens: Option<u64>,
-        max_completion_tokens: Option<u64>,
-        reasoning_effort: Option<ReasoningEffort>,
-    },
-}
-
-impl Model {
-    pub fn default_fast() -> Self {
-        // TODO: Replace with FiveMini since all other models are deprecated
-        Self::FourPointOneMini
-    }
-
-    pub fn from_id(id: &str) -> Result<Self> {
-        match id {
-            "gpt-3.5-turbo" => Ok(Self::ThreePointFiveTurbo),
-            "gpt-4" => Ok(Self::Four),
-            "gpt-4-turbo-preview" => Ok(Self::FourTurbo),
-            "gpt-4o" => Ok(Self::FourOmni),
-            "gpt-4o-mini" => Ok(Self::FourOmniMini),
-            "gpt-4.1" => Ok(Self::FourPointOne),
-            "gpt-4.1-mini" => Ok(Self::FourPointOneMini),
-            "gpt-4.1-nano" => Ok(Self::FourPointOneNano),
-            "o1" => Ok(Self::O1),
-            "o3-mini" => Ok(Self::O3Mini),
-            "o3" => Ok(Self::O3),
-            "o4-mini" => Ok(Self::O4Mini),
-            "gpt-5" => Ok(Self::Five),
-            "gpt-5-mini" => Ok(Self::FiveMini),
-            "gpt-5-nano" => Ok(Self::FiveNano),
-            "gpt-5.1" => Ok(Self::FivePointOne),
-            "gpt-5.2" => Ok(Self::FivePointTwo),
-            invalid_id => anyhow::bail!("invalid model id '{invalid_id}'"),
-        }
-    }
-
-    pub fn id(&self) -> &str {
-        match self {
-            Self::ThreePointFiveTurbo => "gpt-3.5-turbo",
-            Self::Four => "gpt-4",
-            Self::FourTurbo => "gpt-4-turbo",
-            Self::FourOmni => "gpt-4o",
-            Self::FourOmniMini => "gpt-4o-mini",
-            Self::FourPointOne => "gpt-4.1",
-            Self::FourPointOneMini => "gpt-4.1-mini",
-            Self::FourPointOneNano => "gpt-4.1-nano",
-            Self::O1 => "o1",
-            Self::O3Mini => "o3-mini",
-            Self::O3 => "o3",
-            Self::O4Mini => "o4-mini",
-            Self::Five => "gpt-5",
-            Self::FiveMini => "gpt-5-mini",
-            Self::FiveNano => "gpt-5-nano",
-            Self::FivePointOne => "gpt-5.1",
-            Self::FivePointTwo => "gpt-5.2",
-            Self::Custom { name, .. } => name,
-        }
-    }
-
-    pub fn display_name(&self) -> &str {
-        match self {
-            Self::ThreePointFiveTurbo => "gpt-3.5-turbo",
-            Self::Four => "gpt-4",
-            Self::FourTurbo => "gpt-4-turbo",
-            Self::FourOmni => "gpt-4o",
-            Self::FourOmniMini => "gpt-4o-mini",
-            Self::FourPointOne => "gpt-4.1",
-            Self::FourPointOneMini => "gpt-4.1-mini",
-            Self::FourPointOneNano => "gpt-4.1-nano",
-            Self::O1 => "o1",
-            Self::O3Mini => "o3-mini",
-            Self::O3 => "o3",
-            Self::O4Mini => "o4-mini",
-            Self::Five => "gpt-5",
-            Self::FiveMini => "gpt-5-mini",
-            Self::FiveNano => "gpt-5-nano",
-            Self::FivePointOne => "gpt-5.1",
-            Self::FivePointTwo => "gpt-5.2",
-            Self::Custom {
-                name, display_name, ..
-            } => display_name.as_ref().unwrap_or(name),
-        }
-    }
-
-    pub fn max_token_count(&self) -> u64 {
-        match self {
-            Self::ThreePointFiveTurbo => 16_385,
-            Self::Four => 8_192,
-            Self::FourTurbo => 128_000,
-            Self::FourOmni => 128_000,
-            Self::FourOmniMini => 128_000,
-            Self::FourPointOne => 1_047_576,
-            Self::FourPointOneMini => 1_047_576,
-            Self::FourPointOneNano => 1_047_576,
-            Self::O1 => 200_000,
-            Self::O3Mini => 200_000,
-            Self::O3 => 200_000,
-            Self::O4Mini => 200_000,
-            Self::Five => 272_000,
-            Self::FiveMini => 272_000,
-            Self::FiveNano => 272_000,
-            Self::FivePointOne => 400_000,
-            Self::FivePointTwo => 400_000,
-            Self::Custom { max_tokens, .. } => *max_tokens,
-        }
-    }
-
-    pub fn max_output_tokens(&self) -> Option<u64> {
-        match self {
-            Self::Custom {
-                max_output_tokens, ..
-            } => *max_output_tokens,
-            Self::ThreePointFiveTurbo => Some(4_096),
-            Self::Four => Some(8_192),
-            Self::FourTurbo => Some(4_096),
-            Self::FourOmni => Some(16_384),
-            Self::FourOmniMini => Some(16_384),
-            Self::FourPointOne => Some(32_768),
-            Self::FourPointOneMini => Some(32_768),
-            Self::FourPointOneNano => Some(32_768),
-            Self::O1 => Some(100_000),
-            Self::O3Mini => Some(100_000),
-            Self::O3 => Some(100_000),
-            Self::O4Mini => Some(100_000),
-            Self::Five => Some(128_000),
-            Self::FiveMini => Some(128_000),
-            Self::FiveNano => Some(128_000),
-            Self::FivePointOne => Some(128_000),
-            Self::FivePointTwo => Some(128_000),
-        }
-    }
-
-    pub fn reasoning_effort(&self) -> Option<ReasoningEffort> {
-        match self {
-            Self::Custom {
-                reasoning_effort, ..
-            } => reasoning_effort.to_owned(),
-            _ => None,
-        }
-    }
-
-    /// Returns whether the given model supports the `parallel_tool_calls` parameter.
-    ///
-    /// If the model does not support the parameter, do not pass it up, or the API will return an error.
-    pub fn supports_parallel_tool_calls(&self) -> bool {
-        match self {
-            Self::ThreePointFiveTurbo
-            | Self::Four
-            | Self::FourTurbo
-            | Self::FourOmni
-            | Self::FourOmniMini
-            | Self::FourPointOne
-            | Self::FourPointOneMini
-            | Self::FourPointOneNano
-            | Self::Five
-            | Self::FiveMini
-            | Self::FivePointOne
-            | Self::FivePointTwo
-            | Self::FiveNano => true,
-            Self::O1 | Self::O3 | Self::O3Mini | Self::O4Mini | Model::Custom { .. } => false,
-        }
-    }
-
-    /// Returns whether the given model supports the `prompt_cache_key` parameter.
-    ///
-    /// If the model does not support the parameter, do not pass it up.
-    pub fn supports_prompt_cache_key(&self) -> bool {
-        true
-    }
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct Request {
-    pub model: String,
-    pub messages: Vec<RequestMessage>,
-    pub stream: bool,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub max_completion_tokens: Option<u64>,
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub stop: Vec<String>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub temperature: Option<f32>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub tool_choice: Option<ToolChoice>,
-    /// Whether to enable parallel function calling during tool use.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub parallel_tool_calls: Option<bool>,
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub tools: Vec<ToolDefinition>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub prompt_cache_key: Option<String>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub reasoning_effort: Option<ReasoningEffort>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "lowercase")]
-pub enum ToolChoice {
-    Auto,
-    Required,
-    None,
-    #[serde(untagged)]
-    Other(ToolDefinition),
-}
-
-#[derive(Clone, Deserialize, Serialize, Debug)]
-#[serde(tag = "type", rename_all = "snake_case")]
-pub enum ToolDefinition {
-    #[allow(dead_code)]
-    Function { function: FunctionDefinition },
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct FunctionDefinition {
-    pub name: String,
-    pub description: Option<String>,
-    pub parameters: Option<Value>,
-}
-
-#[derive(Clone, Serialize, Deserialize, Debug, Eq, PartialEq)]
-#[serde(tag = "role", rename_all = "lowercase")]
-pub enum RequestMessage {
-    Assistant {
-        content: Option<MessageContent>,
-        #[serde(default, skip_serializing_if = "Vec::is_empty")]
-        tool_calls: Vec<ToolCall>,
-    },
-    User {
-        content: MessageContent,
-    },
-    System {
-        content: MessageContent,
-    },
-    Tool {
-        content: MessageContent,
-        tool_call_id: String,
-    },
-}
-
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq)]
-#[serde(untagged)]
-pub enum MessageContent {
-    Plain(String),
-    Multipart(Vec<MessagePart>),
-}
-
-impl MessageContent {
-    pub fn empty() -> Self {
-        MessageContent::Multipart(vec![])
-    }
-
-    pub fn push_part(&mut self, part: MessagePart) {
-        match self {
-            MessageContent::Plain(text) => {
-                *self =
-                    MessageContent::Multipart(vec![MessagePart::Text { text: text.clone() }, part]);
-            }
-            MessageContent::Multipart(parts) if parts.is_empty() => match part {
-                MessagePart::Text { text } => *self = MessageContent::Plain(text),
-                MessagePart::Image { .. } => *self = MessageContent::Multipart(vec![part]),
-            },
-            MessageContent::Multipart(parts) => parts.push(part),
-        }
-    }
-}
-
-impl From<Vec<MessagePart>> for MessageContent {
-    fn from(mut parts: Vec<MessagePart>) -> Self {
-        if let [MessagePart::Text { text }] = parts.as_mut_slice() {
-            MessageContent::Plain(std::mem::take(text))
-        } else {
-            MessageContent::Multipart(parts)
-        }
-    }
-}
-
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq)]
-#[serde(tag = "type")]
-pub enum MessagePart {
-    #[serde(rename = "text")]
-    Text { text: String },
-    #[serde(rename = "image_url")]
-    Image { image_url: ImageUrl },
-}
-
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq)]
-pub struct ImageUrl {
-    pub url: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub detail: Option<String>,
-}
-
-#[derive(Clone, Serialize, Deserialize, Debug, Eq, PartialEq)]
-pub struct ToolCall {
-    pub id: String,
-    #[serde(flatten)]
-    pub content: ToolCallContent,
-}
-
-#[derive(Clone, Serialize, Deserialize, Debug, Eq, PartialEq)]
-#[serde(tag = "type", rename_all = "lowercase")]
-pub enum ToolCallContent {
-    Function { function: FunctionContent },
-}
-
-#[derive(Clone, Serialize, Deserialize, Debug, Eq, PartialEq)]
-pub struct FunctionContent {
-    pub name: String,
-    pub arguments: String,
-}
-
-#[derive(Clone, Serialize, Deserialize, Debug)]
-pub struct Response {
-    pub id: String,
-    pub object: String,
-    pub created: u64,
-    pub model: String,
-    pub choices: Vec<Choice>,
-    pub usage: Usage,
-}
-
-#[derive(Clone, Serialize, Deserialize, Debug)]
-pub struct Choice {
-    pub index: u32,
-    pub message: RequestMessage,
-    pub finish_reason: Option<String>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-pub struct ResponseMessageDelta {
-    pub role: Option<Role>,
-    pub content: Option<String>,
-    #[serde(default, skip_serializing_if = "is_none_or_empty")]
-    pub tool_calls: Option<Vec<ToolCallChunk>>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-pub struct ToolCallChunk {
-    pub index: usize,
-    pub id: Option<String>,
-
-    // There is also an optional `type` field that would determine if a
-    // function is there. Sometimes this streams in with the `function` before
-    // it streams in the `type`
-    pub function: Option<FunctionChunk>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-pub struct FunctionChunk {
-    pub name: Option<String>,
-    pub arguments: Option<String>,
-}
-
-#[derive(Clone, Serialize, Deserialize, Debug)]
-pub struct Usage {
-    pub prompt_tokens: u64,
-    pub completion_tokens: u64,
-    pub total_tokens: u64,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct ChoiceDelta {
-    pub index: u32,
-    pub delta: Option<ResponseMessageDelta>,
-    pub finish_reason: Option<String>,
-}
-
-#[derive(Error, Debug)]
-pub enum RequestError {
-    #[error("HTTP response error from {provider}'s API: status {status_code} - {body:?}")]
-    HttpResponseError {
-        provider: String,
-        status_code: StatusCode,
-        body: String,
-        headers: HeaderMap<HeaderValue>,
-    },
-    #[error(transparent)]
-    Other(#[from] anyhow::Error),
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct ResponseStreamError {
-    message: String,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-#[serde(untagged)]
-pub enum ResponseStreamResult {
-    Ok(ResponseStreamEvent),
-    Err { error: ResponseStreamError },
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct ResponseStreamEvent {
-    pub choices: Vec<ChoiceDelta>,
-    pub usage: Option<Usage>,
-}
-
-pub async fn stream_completion(
-    client: &dyn HttpClient,
-    provider_name: &str,
-    api_url: &str,
-    api_key: &str,
-    request: Request,
-) -> Result<BoxStream<'static, Result<ResponseStreamEvent>>, RequestError> {
-    let uri = format!("{api_url}/chat/completions");
-    let request_builder = HttpRequest::builder()
-        .method(Method::POST)
-        .uri(uri)
-        .header("Content-Type", "application/json")
-        .header("Authorization", format!("Bearer {}", api_key.trim()));
-
-    let request = request_builder
-        .body(AsyncBody::from(
-            serde_json::to_string(&request).map_err(|e| RequestError::Other(e.into()))?,
-        ))
-        .map_err(|e| RequestError::Other(e.into()))?;
-
-    let mut response = client.send(request).await?;
-    if response.status().is_success() {
-        let reader = BufReader::new(response.into_body());
-        Ok(reader
-            .lines()
-            .filter_map(|line| async move {
-                match line {
-                    Ok(line) => {
-                        let line = line.strip_prefix("data: ").or_else(|| line.strip_prefix("data:"))?;
-                        if line == "[DONE]" {
-                            None
-                        } else {
-                            match serde_json::from_str(line) {
-                                Ok(ResponseStreamResult::Ok(response)) => Some(Ok(response)),
-                                Ok(ResponseStreamResult::Err { error }) => {
-                                    Some(Err(anyhow!(error.message)))
-                                }
-                                Err(error) => {
-                                    log::error!(
-                                        "Failed to parse OpenAI response into ResponseStreamResult: `{}`\n\
-                                        Response: `{}`",
-                                        error,
-                                        line,
-                                    );
-                                    Some(Err(anyhow!(error)))
-                                }
-                            }
-                        }
-                    }
-                    Err(error) => Some(Err(anyhow!(error))),
-                }
-            })
-            .boxed())
-    } else {
-        let mut body = String::new();
-        response
-            .body_mut()
-            .read_to_string(&mut body)
-            .await
-            .map_err(|e| RequestError::Other(e.into()))?;
-
-        Err(RequestError::HttpResponseError {
-            provider: provider_name.to_owned(),
-            status_code: response.status(),
-            body,
-            headers: response.headers().clone(),
-        })
-    }
-}
-
-#[derive(Copy, Clone, Serialize, Deserialize)]
-pub enum OpenAiEmbeddingModel {
-    #[serde(rename = "text-embedding-3-small")]
-    TextEmbedding3Small,
-    #[serde(rename = "text-embedding-3-large")]
-    TextEmbedding3Large,
-}
-
-#[derive(Serialize)]
-struct OpenAiEmbeddingRequest<'a> {
-    model: OpenAiEmbeddingModel,
-    input: Vec<&'a str>,
-}
-
-#[derive(Deserialize)]
-pub struct OpenAiEmbeddingResponse {
-    pub data: Vec<OpenAiEmbedding>,
-}
-
-#[derive(Deserialize)]
-pub struct OpenAiEmbedding {
-    pub embedding: Vec<f32>,
-}
-
-pub fn embed<'a>(
-    client: &dyn HttpClient,
-    api_url: &str,
-    api_key: &str,
-    model: OpenAiEmbeddingModel,
-    texts: impl IntoIterator<Item = &'a str>,
-) -> impl 'static + Future<Output = Result<OpenAiEmbeddingResponse>> {
-    let uri = format!("{api_url}/embeddings");
-
-    let request = OpenAiEmbeddingRequest {
-        model,
-        input: texts.into_iter().collect(),
-    };
-    let body = AsyncBody::from(serde_json::to_string(&request).unwrap());
-    let request = HttpRequest::builder()
-        .method(Method::POST)
-        .uri(uri)
-        .header("Content-Type", "application/json")
-        .header("Authorization", format!("Bearer {}", api_key.trim()))
-        .body(body)
-        .map(|request| client.send(request));
-
-    async move {
-        let mut response = request?.await?;
-        let mut body = String::new();
-        response.body_mut().read_to_string(&mut body).await?;
-
-        anyhow::ensure!(
-            response.status().is_success(),
-            "error during embedding, status: {:?}, body: {:?}",
-            response.status(),
-            body
-        );
-        let response: OpenAiEmbeddingResponse =
-            serde_json::from_str(&body).context("failed to parse OpenAI embedding response")?;
-        Ok(response)
-    }
-}
diff --git a/crates/open_router/Cargo.toml b/crates/open_router/Cargo.toml
deleted file mode 100644
index cccb92c33b..0000000000
--- a/crates/open_router/Cargo.toml
+++ /dev/null
@@ -1,27 +0,0 @@
-[package]
-name = "open_router"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/open_router.rs"
-
-[features]
-default = []
-schemars = ["dep:schemars"]
-
-[dependencies]
-anyhow.workspace = true
-futures.workspace = true
-http_client.workspace = true
-schemars = { workspace = true, optional = true }
-serde.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-strum.workspace = true
-thiserror.workspace = true
diff --git a/crates/open_router/LICENSE-GPL b/crates/open_router/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/open_router/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/open_router/src/open_router.rs b/crates/open_router/src/open_router.rs
deleted file mode 100644
index 57ff9558c2..0000000000
--- a/crates/open_router/src/open_router.rs
+++ /dev/null
@@ -1,750 +0,0 @@
-use anyhow::{Result, anyhow};
-use futures::{AsyncBufReadExt, AsyncReadExt, StreamExt, io::BufReader, stream::BoxStream};
-use http_client::{AsyncBody, HttpClient, Method, Request as HttpRequest, http};
-use serde::{Deserialize, Serialize};
-use serde_json::Value;
-pub use settings::DataCollection;
-pub use settings::ModelMode;
-pub use settings::OpenRouterAvailableModel as AvailableModel;
-pub use settings::OpenRouterProvider as Provider;
-use std::{convert::TryFrom, io, time::Duration};
-use strum::EnumString;
-use thiserror::Error;
-
-pub const OPEN_ROUTER_API_URL: &str = "https://openrouter.ai/api/v1";
-
-fn extract_retry_after(headers: &http::HeaderMap) -> Option<std::time::Duration> {
-    if let Some(reset) = headers.get("X-RateLimit-Reset") {
-        if let Ok(s) = reset.to_str() {
-            if let Ok(epoch_ms) = s.parse::<u64>() {
-                let now = std::time::SystemTime::now()
-                    .duration_since(std::time::UNIX_EPOCH)
-                    .unwrap_or_default()
-                    .as_millis() as u64;
-                if epoch_ms > now {
-                    return Some(std::time::Duration::from_millis(epoch_ms - now));
-                }
-            }
-        }
-    }
-    None
-}
-
-fn is_none_or_empty<T: AsRef<[U]>, U>(opt: &Option<T>) -> bool {
-    opt.as_ref().is_none_or(|v| v.as_ref().is_empty())
-}
-
-#[derive(Clone, Copy, Serialize, Deserialize, Debug, Eq, PartialEq)]
-#[serde(rename_all = "lowercase")]
-pub enum Role {
-    User,
-    Assistant,
-    System,
-    Tool,
-}
-
-impl TryFrom<String> for Role {
-    type Error = anyhow::Error;
-
-    fn try_from(value: String) -> Result<Self> {
-        match value.as_str() {
-            "user" => Ok(Self::User),
-            "assistant" => Ok(Self::Assistant),
-            "system" => Ok(Self::System),
-            "tool" => Ok(Self::Tool),
-            _ => Err(anyhow!("invalid role '{value}'")),
-        }
-    }
-}
-
-impl From<Role> for String {
-    fn from(val: Role) -> Self {
-        match val {
-            Role::User => "user".to_owned(),
-            Role::Assistant => "assistant".to_owned(),
-            Role::System => "system".to_owned(),
-            Role::Tool => "tool".to_owned(),
-        }
-    }
-}
-
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
-#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq)]
-pub struct Model {
-    pub name: String,
-    pub display_name: Option<String>,
-    pub max_tokens: u64,
-    pub supports_tools: Option<bool>,
-    pub supports_images: Option<bool>,
-    #[serde(default)]
-    pub mode: ModelMode,
-    pub provider: Option<Provider>,
-}
-
-impl Model {
-    pub fn default_fast() -> Self {
-        Self::new(
-            "openrouter/auto",
-            Some("Auto Router"),
-            Some(2000000),
-            Some(true),
-            Some(false),
-            Some(ModelMode::Default),
-            None,
-        )
-    }
-
-    pub fn default() -> Self {
-        Self::default_fast()
-    }
-
-    pub fn new(
-        name: &str,
-        display_name: Option<&str>,
-        max_tokens: Option<u64>,
-        supports_tools: Option<bool>,
-        supports_images: Option<bool>,
-        mode: Option<ModelMode>,
-        provider: Option<Provider>,
-    ) -> Self {
-        Self {
-            name: name.to_owned(),
-            display_name: display_name.map(|s| s.to_owned()),
-            max_tokens: max_tokens.unwrap_or(2000000),
-            supports_tools,
-            supports_images,
-            mode: mode.unwrap_or(ModelMode::Default),
-            provider,
-        }
-    }
-
-    pub fn id(&self) -> &str {
-        &self.name
-    }
-
-    pub fn display_name(&self) -> &str {
-        self.display_name.as_ref().unwrap_or(&self.name)
-    }
-
-    pub fn max_token_count(&self) -> u64 {
-        self.max_tokens
-    }
-
-    pub fn max_output_tokens(&self) -> Option<u64> {
-        None
-    }
-
-    pub fn supports_tool_calls(&self) -> bool {
-        self.supports_tools.unwrap_or(false)
-    }
-
-    pub fn supports_parallel_tool_calls(&self) -> bool {
-        false
-    }
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct Request {
-    pub model: String,
-    pub messages: Vec<RequestMessage>,
-    pub stream: bool,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub max_tokens: Option<u64>,
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub stop: Vec<String>,
-    pub temperature: f32,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub tool_choice: Option<ToolChoice>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub parallel_tool_calls: Option<bool>,
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub tools: Vec<ToolDefinition>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub reasoning: Option<Reasoning>,
-    pub usage: RequestUsage,
-    pub provider: Option<Provider>,
-}
-
-#[derive(Debug, Default, Serialize, Deserialize)]
-pub struct RequestUsage {
-    pub include: bool,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "lowercase")]
-pub enum ToolChoice {
-    Auto,
-    Required,
-    None,
-    #[serde(untagged)]
-    Other(ToolDefinition),
-}
-
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
-#[derive(Clone, Deserialize, Serialize, Debug)]
-#[serde(tag = "type", rename_all = "snake_case")]
-pub enum ToolDefinition {
-    #[allow(dead_code)]
-    Function { function: FunctionDefinition },
-}
-
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct FunctionDefinition {
-    pub name: String,
-    pub description: Option<String>,
-    pub parameters: Option<Value>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct Reasoning {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub effort: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub max_tokens: Option<u32>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub exclude: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub enabled: Option<bool>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-#[serde(tag = "role", rename_all = "lowercase")]
-pub enum RequestMessage {
-    Assistant {
-        content: Option<MessageContent>,
-        #[serde(default, skip_serializing_if = "Vec::is_empty")]
-        tool_calls: Vec<ToolCall>,
-        #[serde(default, skip_serializing_if = "Option::is_none")]
-        reasoning_details: Option<serde_json::Value>,
-    },
-    User {
-        content: MessageContent,
-    },
-    System {
-        content: MessageContent,
-    },
-    Tool {
-        content: MessageContent,
-        tool_call_id: String,
-    },
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-#[serde(untagged)]
-pub enum MessageContent {
-    Plain(String),
-    Multipart(Vec<MessagePart>),
-}
-
-impl MessageContent {
-    pub fn empty() -> Self {
-        Self::Plain(String::new())
-    }
-
-    pub fn push_part(&mut self, part: MessagePart) {
-        match self {
-            Self::Plain(text) if text.is_empty() => {
-                *self = Self::Multipart(vec![part]);
-            }
-            Self::Plain(text) => {
-                let text_part = MessagePart::Text {
-                    text: std::mem::take(text),
-                };
-                *self = Self::Multipart(vec![text_part, part]);
-            }
-            Self::Multipart(parts) => parts.push(part),
-        }
-    }
-}
-
-impl From<Vec<MessagePart>> for MessageContent {
-    fn from(parts: Vec<MessagePart>) -> Self {
-        if parts.len() == 1
-            && let MessagePart::Text { text } = &parts[0]
-        {
-            return Self::Plain(text.clone());
-        }
-        Self::Multipart(parts)
-    }
-}
-
-impl From<String> for MessageContent {
-    fn from(text: String) -> Self {
-        Self::Plain(text)
-    }
-}
-
-impl From<&str> for MessageContent {
-    fn from(text: &str) -> Self {
-        Self::Plain(text.to_string())
-    }
-}
-
-impl MessageContent {
-    pub fn as_text(&self) -> Option<&str> {
-        match self {
-            Self::Plain(text) => Some(text),
-            Self::Multipart(parts) if parts.len() == 1 => {
-                if let MessagePart::Text { text } = &parts[0] {
-                    Some(text)
-                } else {
-                    None
-                }
-            }
-            _ => None,
-        }
-    }
-
-    pub fn to_text(&self) -> String {
-        match self {
-            Self::Plain(text) => text.clone(),
-            Self::Multipart(parts) => parts
-                .iter()
-                .filter_map(|part| {
-                    if let MessagePart::Text { text } = part {
-                        Some(text.as_str())
-                    } else {
-                        None
-                    }
-                })
-                .collect::<Vec<_>>()
-                .join(""),
-        }
-    }
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-#[serde(tag = "type", rename_all = "snake_case")]
-pub enum MessagePart {
-    Text {
-        text: String,
-    },
-    #[serde(rename = "image_url")]
-    Image {
-        image_url: String,
-    },
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-pub struct ToolCall {
-    pub id: String,
-    #[serde(flatten)]
-    pub content: ToolCallContent,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-#[serde(tag = "type", rename_all = "lowercase")]
-pub enum ToolCallContent {
-    Function { function: FunctionContent },
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-pub struct FunctionContent {
-    pub name: String,
-    pub arguments: String,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub thought_signature: Option<String>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-pub struct ResponseMessageDelta {
-    pub role: Option<Role>,
-    pub content: Option<String>,
-    pub reasoning: Option<String>,
-    #[serde(default, skip_serializing_if = "is_none_or_empty")]
-    pub tool_calls: Option<Vec<ToolCallChunk>>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub reasoning_details: Option<serde_json::Value>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-pub struct ToolCallChunk {
-    pub index: usize,
-    pub id: Option<String>,
-    pub function: Option<FunctionChunk>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
-pub struct FunctionChunk {
-    pub name: Option<String>,
-    pub arguments: Option<String>,
-    #[serde(default)]
-    pub thought_signature: Option<String>,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct Usage {
-    pub prompt_tokens: u64,
-    pub completion_tokens: u64,
-    pub total_tokens: u64,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct ChoiceDelta {
-    pub index: u32,
-    pub delta: ResponseMessageDelta,
-    pub finish_reason: Option<String>,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct ResponseStreamEvent {
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub id: Option<String>,
-    pub created: u32,
-    pub model: String,
-    pub choices: Vec<ChoiceDelta>,
-    pub usage: Option<Usage>,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct Response {
-    pub id: String,
-    pub object: String,
-    pub created: u64,
-    pub model: String,
-    pub choices: Vec<Choice>,
-    pub usage: Usage,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct Choice {
-    pub index: u32,
-    pub message: RequestMessage,
-    pub finish_reason: Option<String>,
-}
-
-#[derive(Default, Debug, Clone, PartialEq, Deserialize)]
-pub struct ListModelsResponse {
-    pub data: Vec<ModelEntry>,
-}
-
-#[derive(Default, Debug, Clone, PartialEq, Deserialize)]
-pub struct ModelEntry {
-    pub id: String,
-    pub name: String,
-    pub created: usize,
-    pub description: String,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub context_length: Option<u64>,
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub supported_parameters: Vec<String>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub architecture: Option<ModelArchitecture>,
-}
-
-#[derive(Default, Debug, Clone, PartialEq, Deserialize)]
-pub struct ModelArchitecture {
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub input_modalities: Vec<String>,
-}
-
-pub async fn stream_completion(
-    client: &dyn HttpClient,
-    api_url: &str,
-    api_key: &str,
-    request: Request,
-) -> Result<BoxStream<'static, Result<ResponseStreamEvent, OpenRouterError>>, OpenRouterError> {
-    let uri = format!("{api_url}/chat/completions");
-    let request_builder = HttpRequest::builder()
-        .method(Method::POST)
-        .uri(uri)
-        .header("Content-Type", "application/json")
-        .header("Authorization", format!("Bearer {}", api_key))
-        .header("HTTP-Referer", "https://zed.dev")
-        .header("X-Title", "Zed Editor");
-
-    let request = request_builder
-        .body(AsyncBody::from(
-            serde_json::to_string(&request).map_err(OpenRouterError::SerializeRequest)?,
-        ))
-        .map_err(OpenRouterError::BuildRequestBody)?;
-    let mut response = client
-        .send(request)
-        .await
-        .map_err(OpenRouterError::HttpSend)?;
-
-    if response.status().is_success() {
-        let reader = BufReader::new(response.into_body());
-        Ok(reader
-            .lines()
-            .filter_map(|line| async move {
-                match line {
-                    Ok(line) => {
-                        if line.starts_with(':') {
-                            return None;
-                        }
-
-                        let line = line.strip_prefix("data: ")?;
-                        if line == "[DONE]" {
-                            None
-                        } else {
-                            match serde_json::from_str::<ResponseStreamEvent>(line) {
-                                Ok(response) => Some(Ok(response)),
-                                Err(error) => {
-                                    if line.trim().is_empty() {
-                                        None
-                                    } else {
-                                        Some(Err(OpenRouterError::DeserializeResponse(error)))
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    Err(error) => Some(Err(OpenRouterError::ReadResponse(error))),
-                }
-            })
-            .boxed())
-    } else {
-        let code = ApiErrorCode::from_status(response.status().as_u16());
-
-        let mut body = String::new();
-        response
-            .body_mut()
-            .read_to_string(&mut body)
-            .await
-            .map_err(OpenRouterError::ReadResponse)?;
-
-        let error_response = match serde_json::from_str::<OpenRouterErrorResponse>(&body) {
-            Ok(OpenRouterErrorResponse { error }) => error,
-            Err(_) => OpenRouterErrorBody {
-                code: response.status().as_u16(),
-                message: body,
-                metadata: None,
-            },
-        };
-
-        match code {
-            ApiErrorCode::RateLimitError => {
-                let retry_after = extract_retry_after(response.headers());
-                Err(OpenRouterError::RateLimit {
-                    retry_after: retry_after.unwrap_or_else(|| std::time::Duration::from_secs(60)),
-                })
-            }
-            ApiErrorCode::OverloadedError => {
-                let retry_after = extract_retry_after(response.headers());
-                Err(OpenRouterError::ServerOverloaded { retry_after })
-            }
-            _ => Err(OpenRouterError::ApiError(ApiError {
-                code: code,
-                message: error_response.message,
-            })),
-        }
-    }
-}
-
-pub async fn list_models(
-    client: &dyn HttpClient,
-    api_url: &str,
-    api_key: &str,
-) -> Result<Vec<Model>, OpenRouterError> {
-    let uri = format!("{api_url}/models/user");
-    let request_builder = HttpRequest::builder()
-        .method(Method::GET)
-        .uri(uri)
-        .header("Accept", "application/json")
-        .header("Authorization", format!("Bearer {}", api_key))
-        .header("HTTP-Referer", "https://zed.dev")
-        .header("X-Title", "Zed Editor");
-
-    let request = request_builder
-        .body(AsyncBody::default())
-        .map_err(OpenRouterError::BuildRequestBody)?;
-    let mut response = client
-        .send(request)
-        .await
-        .map_err(OpenRouterError::HttpSend)?;
-
-    let mut body = String::new();
-    response
-        .body_mut()
-        .read_to_string(&mut body)
-        .await
-        .map_err(OpenRouterError::ReadResponse)?;
-
-    if response.status().is_success() {
-        let response: ListModelsResponse =
-            serde_json::from_str(&body).map_err(OpenRouterError::DeserializeResponse)?;
-
-        let models = response
-            .data
-            .into_iter()
-            .map(|entry| Model {
-                name: entry.id,
-                // OpenRouter returns display names in the format "provider_name: model_name".
-                // When displayed in the UI, these names can get truncated from the right.
-                // Since users typically already know the provider, we extract just the model name
-                // portion (after the colon) to create a more concise and user-friendly label
-                // for the model dropdown in the agent panel.
-                display_name: Some(
-                    entry
-                        .name
-                        .split(':')
-                        .next_back()
-                        .unwrap_or(&entry.name)
-                        .trim()
-                        .to_string(),
-                ),
-                max_tokens: entry.context_length.unwrap_or(2000000),
-                supports_tools: Some(entry.supported_parameters.contains(&"tools".to_string())),
-                supports_images: Some(
-                    entry
-                        .architecture
-                        .as_ref()
-                        .map(|arch| arch.input_modalities.contains(&"image".to_string()))
-                        .unwrap_or(false),
-                ),
-                mode: if entry
-                    .supported_parameters
-                    .contains(&"reasoning".to_string())
-                {
-                    ModelMode::Thinking {
-                        budget_tokens: Some(4_096),
-                    }
-                } else {
-                    ModelMode::Default
-                },
-                provider: None,
-            })
-            .collect();
-
-        Ok(models)
-    } else {
-        let code = ApiErrorCode::from_status(response.status().as_u16());
-
-        let mut body = String::new();
-        response
-            .body_mut()
-            .read_to_string(&mut body)
-            .await
-            .map_err(OpenRouterError::ReadResponse)?;
-
-        let error_response = match serde_json::from_str::<OpenRouterErrorResponse>(&body) {
-            Ok(OpenRouterErrorResponse { error }) => error,
-            Err(_) => OpenRouterErrorBody {
-                code: response.status().as_u16(),
-                message: body,
-                metadata: None,
-            },
-        };
-
-        match code {
-            ApiErrorCode::RateLimitError => {
-                let retry_after = extract_retry_after(response.headers());
-                Err(OpenRouterError::RateLimit {
-                    retry_after: retry_after.unwrap_or_else(|| std::time::Duration::from_secs(60)),
-                })
-            }
-            ApiErrorCode::OverloadedError => {
-                let retry_after = extract_retry_after(response.headers());
-                Err(OpenRouterError::ServerOverloaded { retry_after })
-            }
-            _ => Err(OpenRouterError::ApiError(ApiError {
-                code: code,
-                message: error_response.message,
-            })),
-        }
-    }
-}
-
-#[derive(Debug)]
-pub enum OpenRouterError {
-    /// Failed to serialize the HTTP request body to JSON
-    SerializeRequest(serde_json::Error),
-
-    /// Failed to construct the HTTP request body
-    BuildRequestBody(http::Error),
-
-    /// Failed to send the HTTP request
-    HttpSend(anyhow::Error),
-
-    /// Failed to deserialize the response from JSON
-    DeserializeResponse(serde_json::Error),
-
-    /// Failed to read from response stream
-    ReadResponse(io::Error),
-
-    /// Rate limit exceeded
-    RateLimit { retry_after: Duration },
-
-    /// Server overloaded
-    ServerOverloaded { retry_after: Option<Duration> },
-
-    /// API returned an error response
-    ApiError(ApiError),
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct OpenRouterErrorBody {
-    pub code: u16,
-    pub message: String,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub metadata: Option<std::collections::HashMap<String, serde_json::Value>>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct OpenRouterErrorResponse {
-    pub error: OpenRouterErrorBody,
-}
-
-#[derive(Debug, Serialize, Deserialize, Error)]
-#[error("OpenRouter API Error: {code}: {message}")]
-pub struct ApiError {
-    pub code: ApiErrorCode,
-    pub message: String,
-}
-
-/// An OpenROuter API error code.
-/// <https://openrouter.ai/docs/api-reference/errors#error-codes>
-#[derive(Debug, PartialEq, Eq, Clone, Copy, EnumString, Serialize, Deserialize)]
-#[strum(serialize_all = "snake_case")]
-pub enum ApiErrorCode {
-    /// 400: Bad Request (invalid or missing params, CORS)
-    InvalidRequestError,
-    /// 401: Invalid credentials (OAuth session expired, disabled/invalid API key)
-    AuthenticationError,
-    /// 402: Your account or API key has insufficient credits. Add more credits and retry the request.
-    PaymentRequiredError,
-    /// 403: Your chosen model requires moderation and your input was flagged
-    PermissionError,
-    /// 408: Your request timed out
-    RequestTimedOut,
-    /// 429: You are being rate limited
-    RateLimitError,
-    /// 502: Your chosen model is down or we received an invalid response from it
-    ApiError,
-    /// 503: There is no available model provider that meets your routing requirements
-    OverloadedError,
-}
-
-impl std::fmt::Display for ApiErrorCode {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let s = match self {
-            ApiErrorCode::InvalidRequestError => "invalid_request_error",
-            ApiErrorCode::AuthenticationError => "authentication_error",
-            ApiErrorCode::PaymentRequiredError => "payment_required_error",
-            ApiErrorCode::PermissionError => "permission_error",
-            ApiErrorCode::RequestTimedOut => "request_timed_out",
-            ApiErrorCode::RateLimitError => "rate_limit_error",
-            ApiErrorCode::ApiError => "api_error",
-            ApiErrorCode::OverloadedError => "overloaded_error",
-        };
-        write!(f, "{s}")
-    }
-}
-
-impl ApiErrorCode {
-    pub fn from_status(status: u16) -> Self {
-        match status {
-            400 => ApiErrorCode::InvalidRequestError,
-            401 => ApiErrorCode::AuthenticationError,
-            402 => ApiErrorCode::PaymentRequiredError,
-            403 => ApiErrorCode::PermissionError,
-            408 => ApiErrorCode::RequestTimedOut,
-            429 => ApiErrorCode::RateLimitError,
-            502 => ApiErrorCode::ApiError,
-            503 => ApiErrorCode::OverloadedError,
-            _ => ApiErrorCode::ApiError,
-        }
-    }
-}
diff --git a/crates/outline/Cargo.toml b/crates/outline/Cargo.toml
deleted file mode 100644
index 5069fa2373..0000000000
--- a/crates/outline/Cargo.toml
+++ /dev/null
@@ -1,41 +0,0 @@
-[package]
-name = "outline"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/outline.rs"
-doctest = false
-
-[dependencies]
-editor.workspace = true
-fuzzy.workspace = true
-gpui.workspace = true
-language.workspace = true
-ordered-float.workspace = true
-picker.workspace = true
-settings.workspace = true
-smol.workspace = true
-theme.workspace = true
-ui.workspace = true
-util.workspace = true
-workspace.workspace = true
-zed_actions.workspace = true
-
-[dev-dependencies]
-editor = { workspace = true, features = ["test-support"] }
-gpui = { workspace = true, features = ["test-support"] }
-indoc.workspace = true
-language = { workspace = true, features = ["test-support"] }
-menu.workspace = true
-project = { workspace = true, features = ["test-support"] }
-rope.workspace = true
-serde_json.workspace = true
-tree-sitter-rust.workspace = true
-tree-sitter-typescript.workspace = true
-workspace = { workspace = true, features = ["test-support"] }
diff --git a/crates/outline/LICENSE-GPL b/crates/outline/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/outline/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/outline/src/outline.rs b/crates/outline/src/outline.rs
deleted file mode 100644
index 1f5cf1edab..0000000000
--- a/crates/outline/src/outline.rs
+++ /dev/null
@@ -1,610 +0,0 @@
-use std::ops::Range;
-use std::{
-    cmp::{self, Reverse},
-    sync::Arc,
-};
-
-use editor::scroll::ScrollOffset;
-use editor::{Anchor, AnchorRangeExt, Editor, scroll::Autoscroll};
-use editor::{MultiBufferOffset, RowHighlightOptions, SelectionEffects};
-use fuzzy::StringMatch;
-use gpui::{
-    App, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, HighlightStyle,
-    ParentElement, Point, Render, Styled, StyledText, Task, TextStyle, WeakEntity, Window, div,
-    rems,
-};
-use language::{Outline, OutlineItem};
-use ordered_float::OrderedFloat;
-use picker::{Picker, PickerDelegate};
-use settings::Settings;
-use theme::{ActiveTheme, ThemeSettings};
-use ui::{ListItem, ListItemSpacing, prelude::*};
-use util::ResultExt;
-use workspace::{DismissDecision, ModalView, Workspace};
-
-pub fn init(cx: &mut App) {
-    cx.observe_new(OutlineView::register).detach();
-    zed_actions::outline::TOGGLE_OUTLINE
-        .set(|view, window, cx| {
-            let Ok(editor) = view.downcast::<Editor>() else {
-                return;
-            };
-
-            toggle(editor, &Default::default(), window, cx);
-        })
-        .ok();
-}
-
-pub fn toggle(
-    editor: Entity<Editor>,
-    _: &zed_actions::outline::ToggleOutline,
-    window: &mut Window,
-    cx: &mut App,
-) {
-    let outline = editor
-        .read(cx)
-        .buffer()
-        .read(cx)
-        .snapshot(cx)
-        .outline(Some(cx.theme().syntax()));
-
-    let workspace = window.root::<Workspace>().flatten();
-    if let Some((workspace, outline)) = workspace.zip(outline) {
-        workspace.update(cx, |workspace, cx| {
-            workspace.toggle_modal(window, cx, |window, cx| {
-                OutlineView::new(outline, editor, window, cx)
-            });
-        })
-    }
-}
-
-pub struct OutlineView {
-    picker: Entity<Picker<OutlineViewDelegate>>,
-}
-
-impl Focusable for OutlineView {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        self.picker.focus_handle(cx)
-    }
-}
-
-impl EventEmitter<DismissEvent> for OutlineView {}
-impl ModalView for OutlineView {
-    fn on_before_dismiss(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> DismissDecision {
-        self.picker.update(cx, |picker, cx| {
-            picker.delegate.restore_active_editor(window, cx)
-        });
-        DismissDecision::Dismiss(true)
-    }
-}
-
-impl Render for OutlineView {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .w(rems(34.))
-            .on_action(cx.listener(
-                |_this: &mut OutlineView,
-                 _: &zed_actions::outline::ToggleOutline,
-                 _window: &mut Window,
-                 cx: &mut Context<OutlineView>| {
-                    // When outline::Toggle is triggered while the outline is open, dismiss it
-                    cx.emit(DismissEvent);
-                },
-            ))
-            .child(self.picker.clone())
-    }
-}
-
-impl OutlineView {
-    fn register(editor: &mut Editor, _: Option<&mut Window>, cx: &mut Context<Editor>) {
-        if editor.mode().is_full() {
-            let handle = cx.entity().downgrade();
-            editor
-                .register_action(move |action, window, cx| {
-                    if let Some(editor) = handle.upgrade() {
-                        toggle(editor, action, window, cx);
-                    }
-                })
-                .detach();
-        }
-    }
-
-    fn new(
-        outline: Outline<Anchor>,
-        editor: Entity<Editor>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> OutlineView {
-        let delegate = OutlineViewDelegate::new(cx.entity().downgrade(), outline, editor, cx);
-        let picker = cx.new(|cx| {
-            Picker::uniform_list(delegate, window, cx).max_height(Some(vh(0.75, window)))
-        });
-        OutlineView { picker }
-    }
-}
-
-struct OutlineViewDelegate {
-    outline_view: WeakEntity<OutlineView>,
-    active_editor: Entity<Editor>,
-    outline: Outline<Anchor>,
-    selected_match_index: usize,
-    prev_scroll_position: Option<Point<ScrollOffset>>,
-    matches: Vec<StringMatch>,
-    last_query: String,
-}
-
-enum OutlineRowHighlights {}
-
-impl OutlineViewDelegate {
-    fn new(
-        outline_view: WeakEntity<OutlineView>,
-        outline: Outline<Anchor>,
-        editor: Entity<Editor>,
-
-        cx: &mut Context<OutlineView>,
-    ) -> Self {
-        Self {
-            outline_view,
-            last_query: Default::default(),
-            matches: Default::default(),
-            selected_match_index: 0,
-            prev_scroll_position: Some(editor.update(cx, |editor, cx| editor.scroll_position(cx))),
-            active_editor: editor,
-            outline,
-        }
-    }
-
-    fn restore_active_editor(&mut self, window: &mut Window, cx: &mut App) {
-        self.active_editor.update(cx, |editor, cx| {
-            editor.clear_row_highlights::<OutlineRowHighlights>();
-            if let Some(scroll_position) = self.prev_scroll_position {
-                editor.set_scroll_position(scroll_position, window, cx);
-            }
-        })
-    }
-
-    fn set_selected_index(
-        &mut self,
-        ix: usize,
-        navigate: bool,
-
-        cx: &mut Context<Picker<OutlineViewDelegate>>,
-    ) {
-        self.selected_match_index = ix;
-
-        if navigate && !self.matches.is_empty() {
-            let selected_match = &self.matches[self.selected_match_index];
-            let outline_item = &self.outline.items[selected_match.candidate_id];
-
-            self.active_editor.update(cx, |active_editor, cx| {
-                active_editor.clear_row_highlights::<OutlineRowHighlights>();
-                active_editor.highlight_rows::<OutlineRowHighlights>(
-                    outline_item.range.start..outline_item.range.end,
-                    cx.theme().colors().editor_highlighted_line_background,
-                    RowHighlightOptions {
-                        autoscroll: true,
-                        ..Default::default()
-                    },
-                    cx,
-                );
-                active_editor.request_autoscroll(Autoscroll::center(), cx);
-            });
-        }
-    }
-}
-
-impl PickerDelegate for OutlineViewDelegate {
-    type ListItem = ListItem;
-
-    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
-        "Search buffer symbols...".into()
-    }
-
-    fn match_count(&self) -> usize {
-        self.matches.len()
-    }
-
-    fn selected_index(&self) -> usize {
-        self.selected_match_index
-    }
-
-    fn set_selected_index(
-        &mut self,
-        ix: usize,
-        _: &mut Window,
-        cx: &mut Context<Picker<OutlineViewDelegate>>,
-    ) {
-        self.set_selected_index(ix, true, cx);
-    }
-
-    fn update_matches(
-        &mut self,
-        query: String,
-        window: &mut Window,
-        cx: &mut Context<Picker<OutlineViewDelegate>>,
-    ) -> Task<()> {
-        let selected_index;
-        if query.is_empty() {
-            self.restore_active_editor(window, cx);
-            self.matches = self
-                .outline
-                .items
-                .iter()
-                .enumerate()
-                .map(|(index, _)| StringMatch {
-                    candidate_id: index,
-                    score: Default::default(),
-                    positions: Default::default(),
-                    string: Default::default(),
-                })
-                .collect();
-
-            let (buffer, cursor_offset) = self.active_editor.update(cx, |editor, cx| {
-                let buffer = editor.buffer().read(cx).snapshot(cx);
-                let cursor_offset = editor
-                    .selections
-                    .newest::<MultiBufferOffset>(&editor.display_snapshot(cx))
-                    .head();
-                (buffer, cursor_offset)
-            });
-            selected_index = self
-                .outline
-                .items
-                .iter()
-                .enumerate()
-                .map(|(ix, item)| {
-                    let range = item.range.to_offset(&buffer);
-                    let distance_to_closest_endpoint = cmp::min(
-                        (range.start.0 as isize - cursor_offset.0 as isize).abs(),
-                        (range.end.0 as isize - cursor_offset.0 as isize).abs(),
-                    );
-                    let depth = if range.contains(&cursor_offset) {
-                        Some(item.depth)
-                    } else {
-                        None
-                    };
-                    (ix, depth, distance_to_closest_endpoint)
-                })
-                .max_by_key(|(_, depth, distance)| (*depth, Reverse(*distance)))
-                .map(|(ix, _, _)| ix)
-                .unwrap_or(0);
-        } else {
-            self.matches = smol::block_on(
-                self.outline
-                    .search(&query, cx.background_executor().clone()),
-            );
-            selected_index = self
-                .matches
-                .iter()
-                .enumerate()
-                .max_by_key(|(_, m)| OrderedFloat(m.score))
-                .map(|(ix, _)| ix)
-                .unwrap_or(0);
-        }
-        self.last_query = query;
-        self.set_selected_index(selected_index, !self.last_query.is_empty(), cx);
-        Task::ready(())
-    }
-
-    fn confirm(
-        &mut self,
-        _: bool,
-        window: &mut Window,
-        cx: &mut Context<Picker<OutlineViewDelegate>>,
-    ) {
-        self.prev_scroll_position.take();
-        self.set_selected_index(self.selected_match_index, true, cx);
-
-        self.active_editor.update(cx, |active_editor, cx| {
-            let highlight = active_editor
-                .highlighted_rows::<OutlineRowHighlights>()
-                .next();
-            if let Some((rows, _)) = highlight {
-                active_editor.change_selections(
-                    SelectionEffects::scroll(Autoscroll::center()),
-                    window,
-                    cx,
-                    |s| s.select_ranges([rows.start..rows.start]),
-                );
-                active_editor.clear_row_highlights::<OutlineRowHighlights>();
-                window.focus(&active_editor.focus_handle(cx));
-            }
-        });
-
-        self.dismissed(window, cx);
-    }
-
-    fn dismissed(&mut self, window: &mut Window, cx: &mut Context<Picker<OutlineViewDelegate>>) {
-        self.outline_view
-            .update(cx, |_, cx| cx.emit(DismissEvent))
-            .log_err();
-        self.restore_active_editor(window, cx);
-    }
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        _: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<Self::ListItem> {
-        let mat = self.matches.get(ix)?;
-        let outline_item = self.outline.items.get(mat.candidate_id)?;
-
-        Some(
-            ListItem::new(ix)
-                .inset(true)
-                .spacing(ListItemSpacing::Sparse)
-                .toggle_state(selected)
-                .child(
-                    div()
-                        .text_ui(cx)
-                        .pl(rems(outline_item.depth as f32))
-                        .child(render_item(outline_item, mat.ranges(), cx)),
-                ),
-        )
-    }
-}
-
-pub fn render_item<T>(
-    outline_item: &OutlineItem<T>,
-    match_ranges: impl IntoIterator<Item = Range<usize>>,
-    cx: &App,
-) -> StyledText {
-    let highlight_style = HighlightStyle {
-        background_color: Some(cx.theme().colors().text_accent.alpha(0.3)),
-        ..Default::default()
-    };
-    let custom_highlights = match_ranges
-        .into_iter()
-        .map(|range| (range, highlight_style));
-
-    let settings = ThemeSettings::get_global(cx);
-
-    // TODO: We probably shouldn't need to build a whole new text style here
-    // but I'm not sure how to get the current one and modify it.
-    // Before this change TextStyle::default() was used here, which was giving us the wrong font and text color.
-    let text_style = TextStyle {
-        color: cx.theme().colors().text,
-        font_family: settings.buffer_font.family.clone(),
-        font_features: settings.buffer_font.features.clone(),
-        font_fallbacks: settings.buffer_font.fallbacks.clone(),
-        font_size: settings.buffer_font_size(cx).into(),
-        font_weight: settings.buffer_font.weight,
-        line_height: relative(1.),
-        ..Default::default()
-    };
-    let highlights = gpui::combine_highlights(
-        custom_highlights,
-        outline_item.highlight_ranges.iter().cloned(),
-    );
-
-    StyledText::new(outline_item.text.clone()).with_default_highlights(&text_style, highlights)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use gpui::{TestAppContext, VisualTestContext};
-    use indoc::indoc;
-    use project::{FakeFs, Project};
-    use serde_json::json;
-    use util::{path, rel_path::rel_path};
-    use workspace::{AppState, Workspace};
-
-    #[gpui::test]
-    async fn test_outline_view_row_highlights(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/dir"),
-            json!({
-                "a.rs": indoc!{"
-                                       // display line 0
-                    struct SingleLine; // display line 1
-                                       // display line 2
-                    struct MultiLine { // display line 3
-                        field_1: i32,  // display line 4
-                        field_2: i32,  // display line 5
-                    }                  // display line 6
-                "}
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
-        project.read_with(cx, |project, _| {
-            project.languages().add(language::rust_lang())
-        });
-
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let worktree_id = workspace.update(cx, |workspace, cx| {
-            workspace.project().update(cx, |project, cx| {
-                project.worktrees(cx).next().unwrap().read(cx).id()
-            })
-        });
-        let _buffer = project
-            .update(cx, |project, cx| {
-                project.open_local_buffer(path!("/dir/a.rs"), cx)
-            })
-            .await
-            .unwrap();
-        let editor = workspace
-            .update_in(cx, |workspace, window, cx| {
-                workspace.open_path((worktree_id, rel_path("a.rs")), None, true, window, cx)
-            })
-            .await
-            .unwrap()
-            .downcast::<Editor>()
-            .unwrap();
-        let ensure_outline_view_contents =
-            |outline_view: &Entity<Picker<OutlineViewDelegate>>, cx: &mut VisualTestContext| {
-                assert_eq!(query(outline_view, cx), "");
-                assert_eq!(
-                    outline_names(outline_view, cx),
-                    vec![
-                        "struct SingleLine",
-                        "struct MultiLine",
-                        "field_1",
-                        "field_2"
-                    ],
-                );
-            };
-
-        let outline_view = open_outline_view(&workspace, cx);
-        ensure_outline_view_contents(&outline_view, cx);
-        assert_eq!(
-            highlighted_display_rows(&editor, cx),
-            Vec::<u32>::new(),
-            "Initially opened outline view should have no highlights"
-        );
-        assert_single_caret_at_row(&editor, 0, cx);
-
-        cx.dispatch_action(menu::Confirm);
-        // Ensures that outline still goes to entry even if no queries have been made
-        assert_single_caret_at_row(&editor, 1, cx);
-
-        let outline_view = open_outline_view(&workspace, cx);
-
-        cx.dispatch_action(menu::SelectNext);
-        ensure_outline_view_contents(&outline_view, cx);
-        assert_eq!(
-            highlighted_display_rows(&editor, cx),
-            vec![3, 4, 5, 6],
-            "Second struct's rows should be highlighted"
-        );
-        assert_single_caret_at_row(&editor, 1, cx);
-
-        cx.dispatch_action(menu::SelectPrevious);
-        ensure_outline_view_contents(&outline_view, cx);
-        assert_eq!(
-            highlighted_display_rows(&editor, cx),
-            vec![1],
-            "First struct's row should be highlighted"
-        );
-        assert_single_caret_at_row(&editor, 1, cx);
-
-        cx.dispatch_action(menu::Cancel);
-        ensure_outline_view_contents(&outline_view, cx);
-        assert_eq!(
-            highlighted_display_rows(&editor, cx),
-            Vec::<u32>::new(),
-            "No rows should be highlighted after outline view is cancelled and closed"
-        );
-        assert_single_caret_at_row(&editor, 1, cx);
-
-        let outline_view = open_outline_view(&workspace, cx);
-        ensure_outline_view_contents(&outline_view, cx);
-        assert_eq!(
-            highlighted_display_rows(&editor, cx),
-            Vec::<u32>::new(),
-            "Reopened outline view should have no highlights"
-        );
-        assert_single_caret_at_row(&editor, 1, cx);
-
-        let expected_first_highlighted_row = 3;
-        cx.dispatch_action(menu::SelectNext);
-        ensure_outline_view_contents(&outline_view, cx);
-        assert_eq!(
-            highlighted_display_rows(&editor, cx),
-            vec![expected_first_highlighted_row, 4, 5, 6]
-        );
-        assert_single_caret_at_row(&editor, 1, cx);
-        cx.dispatch_action(menu::Confirm);
-        ensure_outline_view_contents(&outline_view, cx);
-        assert_eq!(
-            highlighted_display_rows(&editor, cx),
-            Vec::<u32>::new(),
-            "No rows should be highlighted after outline view is confirmed and closed"
-        );
-        // On confirm, should place the caret on the first row of the highlighted rows range.
-        assert_single_caret_at_row(&editor, expected_first_highlighted_row, cx);
-    }
-
-    fn open_outline_view(
-        workspace: &Entity<Workspace>,
-        cx: &mut VisualTestContext,
-    ) -> Entity<Picker<OutlineViewDelegate>> {
-        cx.dispatch_action(zed_actions::outline::ToggleOutline);
-        workspace.update(cx, |workspace, cx| {
-            workspace
-                .active_modal::<OutlineView>(cx)
-                .unwrap()
-                .read(cx)
-                .picker
-                .clone()
-        })
-    }
-
-    fn query(
-        outline_view: &Entity<Picker<OutlineViewDelegate>>,
-        cx: &mut VisualTestContext,
-    ) -> String {
-        outline_view.update(cx, |outline_view, cx| outline_view.query(cx))
-    }
-
-    fn outline_names(
-        outline_view: &Entity<Picker<OutlineViewDelegate>>,
-        cx: &mut VisualTestContext,
-    ) -> Vec<String> {
-        outline_view.read_with(cx, |outline_view, _| {
-            let items = &outline_view.delegate.outline.items;
-            outline_view
-                .delegate
-                .matches
-                .iter()
-                .map(|hit| items[hit.candidate_id].text.clone())
-                .collect::<Vec<_>>()
-        })
-    }
-
-    fn highlighted_display_rows(editor: &Entity<Editor>, cx: &mut VisualTestContext) -> Vec<u32> {
-        editor.update_in(cx, |editor, window, cx| {
-            editor
-                .highlighted_display_rows(window, cx)
-                .into_keys()
-                .map(|r| r.0)
-                .collect()
-        })
-    }
-
-    fn init_test(cx: &mut TestAppContext) -> Arc<AppState> {
-        cx.update(|cx| {
-            let state = AppState::test(cx);
-            crate::init(cx);
-            editor::init(cx);
-            state
-        })
-    }
-
-    #[track_caller]
-    fn assert_single_caret_at_row(
-        editor: &Entity<Editor>,
-        buffer_row: u32,
-        cx: &mut VisualTestContext,
-    ) {
-        let selections = editor.update(cx, |editor, cx| {
-            editor
-                .selections
-                .all::<rope::Point>(&editor.display_snapshot(cx))
-                .into_iter()
-                .map(|s| s.start..s.end)
-                .collect::<Vec<_>>()
-        });
-        assert!(
-            selections.len() == 1,
-            "Expected one caret selection but got: {selections:?}"
-        );
-        let selection = &selections[0];
-        assert!(
-            selection.start == selection.end,
-            "Expected a single caret selection, but got: {selection:?}"
-        );
-        assert_eq!(selection.start.row, buffer_row);
-    }
-}
diff --git a/crates/outline_panel/Cargo.toml b/crates/outline_panel/Cargo.toml
deleted file mode 100644
index 72e2d1eb63..0000000000
--- a/crates/outline_panel/Cargo.toml
+++ /dev/null
@@ -1,47 +0,0 @@
-[package]
-name = "outline_panel"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/outline_panel.rs"
-doctest = false
-
-[dependencies]
-anyhow.workspace = true
-collections.workspace = true
-db.workspace = true
-editor.workspace = true
-file_icons.workspace = true
-fuzzy.workspace = true
-gpui.workspace = true
-itertools.workspace = true
-language.workspace = true
-log.workspace = true
-menu.workspace = true
-outline.workspace = true
-project.workspace = true
-search.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-smallvec.workspace = true
-smol.workspace = true
-theme.workspace = true
-ui.workspace = true
-util.workspace = true
-workspace.workspace = true
-worktree.workspace = true
-zed_actions.workspace = true
-
-[dev-dependencies]
-search = { workspace = true, features = ["test-support"] }
-pretty_assertions.workspace = true
-
-[package.metadata.cargo-machete]
-ignored = ["log"]
diff --git a/crates/outline_panel/LICENSE-GPL b/crates/outline_panel/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/outline_panel/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/outline_panel/src/outline_panel.rs b/crates/outline_panel/src/outline_panel.rs
deleted file mode 100644
index a787ad5b03..0000000000
--- a/crates/outline_panel/src/outline_panel.rs
+++ /dev/null
@@ -1,7760 +0,0 @@
-mod outline_panel_settings;
-
-use anyhow::Context as _;
-use collections::{BTreeSet, HashMap, HashSet, hash_map};
-use db::kvp::KEY_VALUE_STORE;
-use editor::{
-    AnchorRangeExt, Bias, DisplayPoint, Editor, EditorEvent, ExcerptId, ExcerptRange,
-    MultiBufferSnapshot, RangeToAnchorExt, SelectionEffects,
-    display_map::ToDisplayPoint,
-    items::{entry_git_aware_label_color, entry_label_color},
-    scroll::{Autoscroll, ScrollAnchor},
-};
-use file_icons::FileIcons;
-use fuzzy::{StringMatch, StringMatchCandidate, match_strings};
-use gpui::{
-    Action, AnyElement, App, AppContext as _, AsyncWindowContext, Bounds, ClipboardItem, Context,
-    DismissEvent, Div, ElementId, Entity, EventEmitter, FocusHandle, Focusable, HighlightStyle,
-    InteractiveElement, IntoElement, KeyContext, ListHorizontalSizingBehavior, ListSizingBehavior,
-    MouseButton, MouseDownEvent, ParentElement, Pixels, Point, Render, ScrollStrategy,
-    SharedString, Stateful, StatefulInteractiveElement as _, Styled, Subscription, Task,
-    UniformListScrollHandle, WeakEntity, Window, actions, anchored, deferred, div, point, px, size,
-    uniform_list,
-};
-use itertools::Itertools;
-use language::{Anchor, BufferId, BufferSnapshot, OffsetRangeExt, OutlineItem};
-use menu::{Cancel, SelectFirst, SelectLast, SelectNext, SelectPrevious};
-use std::{
-    cmp,
-    collections::BTreeMap,
-    hash::Hash,
-    ops::Range,
-    path::{Path, PathBuf},
-    sync::{
-        Arc, OnceLock,
-        atomic::{self, AtomicBool},
-    },
-    time::Duration,
-    u32,
-};
-
-use outline_panel_settings::{DockSide, OutlinePanelSettings, ShowIndentGuides};
-use project::{File, Fs, GitEntry, GitTraversal, Project, ProjectItem};
-use search::{BufferSearchBar, ProjectSearchView};
-use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsStore};
-use smol::channel;
-use theme::{SyntaxTheme, ThemeSettings};
-use ui::{
-    ContextMenu, FluentBuilder, HighlightedLabel, IconButton, IconButtonShape, IndentGuideColors,
-    IndentGuideLayout, ListItem, ScrollAxes, Scrollbars, Tab, Tooltip, WithScrollbar, prelude::*,
-};
-use util::{RangeExt, ResultExt, TryFutureExt, debug_panic, rel_path::RelPath};
-use workspace::{
-    OpenInTerminal, WeakItemHandle, Workspace,
-    dock::{DockPosition, Panel, PanelEvent},
-    item::ItemHandle,
-    searchable::{SearchEvent, SearchableItem},
-};
-use worktree::{Entry, ProjectEntryId, WorktreeId};
-
-actions!(
-    outline_panel,
-    [
-        /// Collapses all entries in the outline tree.
-        CollapseAllEntries,
-        /// Collapses the currently selected entry.
-        CollapseSelectedEntry,
-        /// Expands all entries in the outline tree.
-        ExpandAllEntries,
-        /// Expands the currently selected entry.
-        ExpandSelectedEntry,
-        /// Folds the selected directory.
-        FoldDirectory,
-        /// Opens the selected entry in the editor.
-        OpenSelectedEntry,
-        /// Reveals the selected item in the system file manager.
-        RevealInFileManager,
-        /// Selects the parent of the current entry.
-        SelectParent,
-        /// Toggles the pin status of the active editor.
-        ToggleActiveEditorPin,
-        /// Unfolds the selected directory.
-        UnfoldDirectory,
-        /// Toggles focus on the outline panel.
-        ToggleFocus,
-    ]
-);
-
-const OUTLINE_PANEL_KEY: &str = "OutlinePanel";
-const UPDATE_DEBOUNCE: Duration = Duration::from_millis(50);
-
-type Outline = OutlineItem<language::Anchor>;
-type HighlightStyleData = Arc<OnceLock<Vec<(Range<usize>, HighlightStyle)>>>;
-
-pub struct OutlinePanel {
-    fs: Arc<dyn Fs>,
-    width: Option<Pixels>,
-    project: Entity<Project>,
-    workspace: WeakEntity<Workspace>,
-    active: bool,
-    pinned: bool,
-    scroll_handle: UniformListScrollHandle,
-    context_menu: Option<(Entity<ContextMenu>, Point<Pixels>, Subscription)>,
-    focus_handle: FocusHandle,
-    pending_serialization: Task<Option<()>>,
-    fs_entries_depth: HashMap<(WorktreeId, ProjectEntryId), usize>,
-    fs_entries: Vec<FsEntry>,
-    fs_children_count: HashMap<WorktreeId, HashMap<Arc<RelPath>, FsChildren>>,
-    collapsed_entries: HashSet<CollapsedEntry>,
-    unfolded_dirs: HashMap<WorktreeId, BTreeSet<ProjectEntryId>>,
-    selected_entry: SelectedEntry,
-    active_item: Option<ActiveItem>,
-    _subscriptions: Vec<Subscription>,
-    new_entries_for_fs_update: HashSet<ExcerptId>,
-    fs_entries_update_task: Task<()>,
-    cached_entries_update_task: Task<()>,
-    reveal_selection_task: Task<anyhow::Result<()>>,
-    outline_fetch_tasks: HashMap<(BufferId, ExcerptId), Task<()>>,
-    excerpts: HashMap<BufferId, HashMap<ExcerptId, Excerpt>>,
-    cached_entries: Vec<CachedEntry>,
-    filter_editor: Entity<Editor>,
-    mode: ItemsDisplayMode,
-    max_width_item_index: Option<usize>,
-    preserve_selection_on_buffer_fold_toggles: HashSet<BufferId>,
-    pending_default_expansion_depth: Option<usize>,
-    outline_children_cache: HashMap<BufferId, HashMap<(Range<Anchor>, usize), bool>>,
-}
-
-#[derive(Debug)]
-enum ItemsDisplayMode {
-    Search(SearchState),
-    Outline,
-}
-
-#[derive(Debug)]
-struct SearchState {
-    kind: SearchKind,
-    query: String,
-    matches: Vec<(Range<editor::Anchor>, Arc<OnceLock<SearchData>>)>,
-    highlight_search_match_tx: channel::Sender<HighlightArguments>,
-    _search_match_highlighter: Task<()>,
-    _search_match_notify: Task<()>,
-}
-
-struct HighlightArguments {
-    multi_buffer_snapshot: MultiBufferSnapshot,
-    match_range: Range<editor::Anchor>,
-    search_data: Arc<OnceLock<SearchData>>,
-}
-
-impl SearchState {
-    fn new(
-        kind: SearchKind,
-        query: String,
-        previous_matches: HashMap<Range<editor::Anchor>, Arc<OnceLock<SearchData>>>,
-        new_matches: Vec<Range<editor::Anchor>>,
-        theme: Arc<SyntaxTheme>,
-        window: &mut Window,
-        cx: &mut Context<OutlinePanel>,
-    ) -> Self {
-        let (highlight_search_match_tx, highlight_search_match_rx) = channel::unbounded();
-        let (notify_tx, notify_rx) = channel::unbounded::<()>();
-        Self {
-            kind,
-            query,
-            matches: new_matches
-                .into_iter()
-                .map(|range| {
-                    let search_data = previous_matches
-                        .get(&range)
-                        .map(Arc::clone)
-                        .unwrap_or_default();
-                    (range, search_data)
-                })
-                .collect(),
-            highlight_search_match_tx,
-            _search_match_highlighter: cx.background_spawn(async move {
-                while let Ok(highlight_arguments) = highlight_search_match_rx.recv().await {
-                    let needs_init = highlight_arguments.search_data.get().is_none();
-                    let search_data = highlight_arguments.search_data.get_or_init(|| {
-                        SearchData::new(
-                            &highlight_arguments.match_range,
-                            &highlight_arguments.multi_buffer_snapshot,
-                        )
-                    });
-                    if needs_init {
-                        notify_tx.try_send(()).ok();
-                    }
-
-                    let highlight_data = &search_data.highlights_data;
-                    if highlight_data.get().is_some() {
-                        continue;
-                    }
-                    let mut left_whitespaces_count = 0;
-                    let mut non_whitespace_symbol_occurred = false;
-                    let context_offset_range = search_data
-                        .context_range
-                        .to_offset(&highlight_arguments.multi_buffer_snapshot);
-                    let mut offset = context_offset_range.start;
-                    let mut context_text = String::new();
-                    let mut highlight_ranges = Vec::new();
-                    for mut chunk in highlight_arguments
-                        .multi_buffer_snapshot
-                        .chunks(context_offset_range.start..context_offset_range.end, true)
-                    {
-                        if !non_whitespace_symbol_occurred {
-                            for c in chunk.text.chars() {
-                                if c.is_whitespace() {
-                                    left_whitespaces_count += c.len_utf8();
-                                } else {
-                                    non_whitespace_symbol_occurred = true;
-                                    break;
-                                }
-                            }
-                        }
-
-                        if chunk.text.len() > context_offset_range.end - offset {
-                            chunk.text = &chunk.text[0..(context_offset_range.end - offset)];
-                            offset = context_offset_range.end;
-                        } else {
-                            offset += chunk.text.len();
-                        }
-                        let style = chunk
-                            .syntax_highlight_id
-                            .and_then(|highlight| highlight.style(&theme));
-                        if let Some(style) = style {
-                            let start = context_text.len();
-                            let end = start + chunk.text.len();
-                            highlight_ranges.push((start..end, style));
-                        }
-                        context_text.push_str(chunk.text);
-                        if offset >= context_offset_range.end {
-                            break;
-                        }
-                    }
-
-                    highlight_ranges.iter_mut().for_each(|(range, _)| {
-                        range.start = range.start.saturating_sub(left_whitespaces_count);
-                        range.end = range.end.saturating_sub(left_whitespaces_count);
-                    });
-                    if highlight_data.set(highlight_ranges).ok().is_some() {
-                        notify_tx.try_send(()).ok();
-                    }
-
-                    let trimmed_text = context_text[left_whitespaces_count..].to_owned();
-                    debug_assert_eq!(
-                        trimmed_text, search_data.context_text,
-                        "Highlighted text that does not match the buffer text"
-                    );
-                }
-            }),
-            _search_match_notify: cx.spawn_in(window, async move |outline_panel, cx| {
-                loop {
-                    match notify_rx.recv().await {
-                        Ok(()) => {}
-                        Err(_) => break,
-                    };
-                    while let Ok(()) = notify_rx.try_recv() {
-                        //
-                    }
-                    let update_result = outline_panel.update(cx, |_, cx| {
-                        cx.notify();
-                    });
-                    if update_result.is_err() {
-                        break;
-                    }
-                }
-            }),
-        }
-    }
-}
-
-#[derive(Debug)]
-enum SelectedEntry {
-    Invalidated(Option<PanelEntry>),
-    Valid(PanelEntry, usize),
-    None,
-}
-
-impl SelectedEntry {
-    fn invalidate(&mut self) {
-        match std::mem::replace(self, SelectedEntry::None) {
-            Self::Valid(entry, _) => *self = Self::Invalidated(Some(entry)),
-            Self::None => *self = Self::Invalidated(None),
-            other => *self = other,
-        }
-    }
-
-    fn is_invalidated(&self) -> bool {
-        matches!(self, Self::Invalidated(_))
-    }
-}
-
-#[derive(Debug, Clone, Copy, Default)]
-struct FsChildren {
-    files: usize,
-    dirs: usize,
-}
-
-impl FsChildren {
-    fn may_be_fold_part(&self) -> bool {
-        self.dirs == 0 || (self.dirs == 1 && self.files == 0)
-    }
-}
-
-#[derive(Clone, Debug)]
-struct CachedEntry {
-    depth: usize,
-    string_match: Option<StringMatch>,
-    entry: PanelEntry,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Hash)]
-enum CollapsedEntry {
-    Dir(WorktreeId, ProjectEntryId),
-    File(WorktreeId, BufferId),
-    ExternalFile(BufferId),
-    Excerpt(BufferId, ExcerptId),
-    Outline(BufferId, ExcerptId, Range<Anchor>),
-}
-
-#[derive(Debug)]
-struct Excerpt {
-    range: ExcerptRange<language::Anchor>,
-    outlines: ExcerptOutlines,
-}
-
-impl Excerpt {
-    fn invalidate_outlines(&mut self) {
-        if let ExcerptOutlines::Outlines(valid_outlines) = &mut self.outlines {
-            self.outlines = ExcerptOutlines::Invalidated(std::mem::take(valid_outlines));
-        }
-    }
-
-    fn iter_outlines(&self) -> impl Iterator<Item = &Outline> {
-        match &self.outlines {
-            ExcerptOutlines::Outlines(outlines) => outlines.iter(),
-            ExcerptOutlines::Invalidated(outlines) => outlines.iter(),
-            ExcerptOutlines::NotFetched => [].iter(),
-        }
-    }
-
-    fn should_fetch_outlines(&self) -> bool {
-        match &self.outlines {
-            ExcerptOutlines::Outlines(_) => false,
-            ExcerptOutlines::Invalidated(_) => true,
-            ExcerptOutlines::NotFetched => true,
-        }
-    }
-}
-
-#[derive(Debug)]
-enum ExcerptOutlines {
-    Outlines(Vec<Outline>),
-    Invalidated(Vec<Outline>),
-    NotFetched,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-struct FoldedDirsEntry {
-    worktree_id: WorktreeId,
-    entries: Vec<GitEntry>,
-}
-
-// TODO: collapse the inner enums into panel entry
-#[derive(Clone, Debug)]
-enum PanelEntry {
-    Fs(FsEntry),
-    FoldedDirs(FoldedDirsEntry),
-    Outline(OutlineEntry),
-    Search(SearchEntry),
-}
-
-#[derive(Clone, Debug)]
-struct SearchEntry {
-    match_range: Range<editor::Anchor>,
-    kind: SearchKind,
-    render_data: Arc<OnceLock<SearchData>>,
-}
-
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
-enum SearchKind {
-    Project,
-    Buffer,
-}
-
-#[derive(Clone, Debug)]
-struct SearchData {
-    context_range: Range<editor::Anchor>,
-    context_text: String,
-    truncated_left: bool,
-    truncated_right: bool,
-    search_match_indices: Vec<Range<usize>>,
-    highlights_data: HighlightStyleData,
-}
-
-impl PartialEq for PanelEntry {
-    fn eq(&self, other: &Self) -> bool {
-        match (self, other) {
-            (Self::Fs(a), Self::Fs(b)) => a == b,
-            (
-                Self::FoldedDirs(FoldedDirsEntry {
-                    worktree_id: worktree_id_a,
-                    entries: entries_a,
-                }),
-                Self::FoldedDirs(FoldedDirsEntry {
-                    worktree_id: worktree_id_b,
-                    entries: entries_b,
-                }),
-            ) => worktree_id_a == worktree_id_b && entries_a == entries_b,
-            (Self::Outline(a), Self::Outline(b)) => a == b,
-            (
-                Self::Search(SearchEntry {
-                    match_range: match_range_a,
-                    kind: kind_a,
-                    ..
-                }),
-                Self::Search(SearchEntry {
-                    match_range: match_range_b,
-                    kind: kind_b,
-                    ..
-                }),
-            ) => match_range_a == match_range_b && kind_a == kind_b,
-            _ => false,
-        }
-    }
-}
-
-impl Eq for PanelEntry {}
-
-const SEARCH_MATCH_CONTEXT_SIZE: u32 = 40;
-const TRUNCATED_CONTEXT_MARK: &str = "…";
-
-impl SearchData {
-    fn new(
-        match_range: &Range<editor::Anchor>,
-        multi_buffer_snapshot: &MultiBufferSnapshot,
-    ) -> Self {
-        let match_point_range = match_range.to_point(multi_buffer_snapshot);
-        let context_left_border = multi_buffer_snapshot.clip_point(
-            language::Point::new(
-                match_point_range.start.row,
-                match_point_range
-                    .start
-                    .column
-                    .saturating_sub(SEARCH_MATCH_CONTEXT_SIZE),
-            ),
-            Bias::Left,
-        );
-        let context_right_border = multi_buffer_snapshot.clip_point(
-            language::Point::new(
-                match_point_range.end.row,
-                match_point_range.end.column + SEARCH_MATCH_CONTEXT_SIZE,
-            ),
-            Bias::Right,
-        );
-
-        let context_anchor_range =
-            (context_left_border..context_right_border).to_anchors(multi_buffer_snapshot);
-        let context_offset_range = context_anchor_range.to_offset(multi_buffer_snapshot);
-        let match_offset_range = match_range.to_offset(multi_buffer_snapshot);
-
-        let mut search_match_indices = vec![
-            match_offset_range.start - context_offset_range.start
-                ..match_offset_range.end - context_offset_range.start,
-        ];
-
-        let entire_context_text = multi_buffer_snapshot
-            .text_for_range(context_offset_range.clone())
-            .collect::<String>();
-        let left_whitespaces_offset = entire_context_text
-            .chars()
-            .take_while(|c| c.is_whitespace())
-            .map(|c| c.len_utf8())
-            .sum::<usize>();
-
-        let mut extended_context_left_border = context_left_border;
-        extended_context_left_border.column = extended_context_left_border.column.saturating_sub(1);
-        let extended_context_left_border =
-            multi_buffer_snapshot.clip_point(extended_context_left_border, Bias::Left);
-        let mut extended_context_right_border = context_right_border;
-        extended_context_right_border.column += 1;
-        let extended_context_right_border =
-            multi_buffer_snapshot.clip_point(extended_context_right_border, Bias::Right);
-
-        let truncated_left = left_whitespaces_offset == 0
-            && extended_context_left_border < context_left_border
-            && multi_buffer_snapshot
-                .chars_at(extended_context_left_border)
-                .last()
-                .is_some_and(|c| !c.is_whitespace());
-        let truncated_right = entire_context_text
-            .chars()
-            .last()
-            .is_none_or(|c| !c.is_whitespace())
-            && extended_context_right_border > context_right_border
-            && multi_buffer_snapshot
-                .chars_at(extended_context_right_border)
-                .next()
-                .is_some_and(|c| !c.is_whitespace());
-        search_match_indices.iter_mut().for_each(|range| {
-            range.start = range.start.saturating_sub(left_whitespaces_offset);
-            range.end = range.end.saturating_sub(left_whitespaces_offset);
-        });
-
-        let trimmed_row_offset_range =
-            context_offset_range.start + left_whitespaces_offset..context_offset_range.end;
-        let trimmed_text = entire_context_text[left_whitespaces_offset..].to_owned();
-        Self {
-            highlights_data: Arc::default(),
-            search_match_indices,
-            context_range: trimmed_row_offset_range.to_anchors(multi_buffer_snapshot),
-            context_text: trimmed_text,
-            truncated_left,
-            truncated_right,
-        }
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Hash)]
-struct OutlineEntryExcerpt {
-    id: ExcerptId,
-    buffer_id: BufferId,
-    range: ExcerptRange<language::Anchor>,
-}
-
-#[derive(Clone, Debug, Eq)]
-struct OutlineEntryOutline {
-    buffer_id: BufferId,
-    excerpt_id: ExcerptId,
-    outline: Outline,
-}
-
-impl PartialEq for OutlineEntryOutline {
-    fn eq(&self, other: &Self) -> bool {
-        self.buffer_id == other.buffer_id
-            && self.excerpt_id == other.excerpt_id
-            && self.outline.depth == other.outline.depth
-            && self.outline.range == other.outline.range
-            && self.outline.text == other.outline.text
-    }
-}
-
-impl Hash for OutlineEntryOutline {
-    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-        (
-            self.buffer_id,
-            self.excerpt_id,
-            self.outline.depth,
-            &self.outline.range,
-            &self.outline.text,
-        )
-            .hash(state);
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-enum OutlineEntry {
-    Excerpt(OutlineEntryExcerpt),
-    Outline(OutlineEntryOutline),
-}
-
-impl OutlineEntry {
-    fn ids(&self) -> (BufferId, ExcerptId) {
-        match self {
-            OutlineEntry::Excerpt(excerpt) => (excerpt.buffer_id, excerpt.id),
-            OutlineEntry::Outline(outline) => (outline.buffer_id, outline.excerpt_id),
-        }
-    }
-}
-
-#[derive(Debug, Clone, Eq)]
-struct FsEntryFile {
-    worktree_id: WorktreeId,
-    entry: GitEntry,
-    buffer_id: BufferId,
-    excerpts: Vec<ExcerptId>,
-}
-
-impl PartialEq for FsEntryFile {
-    fn eq(&self, other: &Self) -> bool {
-        self.worktree_id == other.worktree_id
-            && self.entry.id == other.entry.id
-            && self.buffer_id == other.buffer_id
-    }
-}
-
-impl Hash for FsEntryFile {
-    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-        (self.buffer_id, self.entry.id, self.worktree_id).hash(state);
-    }
-}
-
-#[derive(Debug, Clone, Eq)]
-struct FsEntryDirectory {
-    worktree_id: WorktreeId,
-    entry: GitEntry,
-}
-
-impl PartialEq for FsEntryDirectory {
-    fn eq(&self, other: &Self) -> bool {
-        self.worktree_id == other.worktree_id && self.entry.id == other.entry.id
-    }
-}
-
-impl Hash for FsEntryDirectory {
-    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-        (self.worktree_id, self.entry.id).hash(state);
-    }
-}
-
-#[derive(Debug, Clone, Eq)]
-struct FsEntryExternalFile {
-    buffer_id: BufferId,
-    excerpts: Vec<ExcerptId>,
-}
-
-impl PartialEq for FsEntryExternalFile {
-    fn eq(&self, other: &Self) -> bool {
-        self.buffer_id == other.buffer_id
-    }
-}
-
-impl Hash for FsEntryExternalFile {
-    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-        self.buffer_id.hash(state);
-    }
-}
-
-#[derive(Clone, Debug, Eq, PartialEq)]
-enum FsEntry {
-    ExternalFile(FsEntryExternalFile),
-    Directory(FsEntryDirectory),
-    File(FsEntryFile),
-}
-
-struct ActiveItem {
-    item_handle: Box<dyn WeakItemHandle>,
-    active_editor: WeakEntity<Editor>,
-    _buffer_search_subscription: Subscription,
-    _editor_subscription: Subscription,
-}
-
-#[derive(Debug)]
-pub enum Event {
-    Focus,
-}
-
-#[derive(Serialize, Deserialize)]
-struct SerializedOutlinePanel {
-    width: Option<Pixels>,
-    active: Option<bool>,
-}
-
-pub fn init(cx: &mut App) {
-    cx.observe_new(|workspace: &mut Workspace, _, _| {
-        workspace.register_action(|workspace, _: &ToggleFocus, window, cx| {
-            workspace.toggle_panel_focus::<OutlinePanel>(window, cx);
-        });
-    })
-    .detach();
-}
-
-impl OutlinePanel {
-    pub async fn load(
-        workspace: WeakEntity<Workspace>,
-        mut cx: AsyncWindowContext,
-    ) -> anyhow::Result<Entity<Self>> {
-        let serialized_panel = match workspace
-            .read_with(&cx, |workspace, _| {
-                OutlinePanel::serialization_key(workspace)
-            })
-            .ok()
-            .flatten()
-        {
-            Some(serialization_key) => cx
-                .background_spawn(async move { KEY_VALUE_STORE.read_kvp(&serialization_key) })
-                .await
-                .context("loading outline panel")
-                .log_err()
-                .flatten()
-                .map(|panel| serde_json::from_str::<SerializedOutlinePanel>(&panel))
-                .transpose()
-                .log_err()
-                .flatten(),
-            None => None,
-        };
-
-        workspace.update_in(&mut cx, |workspace, window, cx| {
-            let panel = Self::new(workspace, window, cx);
-            if let Some(serialized_panel) = serialized_panel {
-                panel.update(cx, |panel, cx| {
-                    panel.width = serialized_panel.width.map(|px| px.round());
-                    panel.active = serialized_panel.active.unwrap_or(false);
-                    cx.notify();
-                });
-            }
-            panel
-        })
-    }
-
-    fn new(
-        workspace: &mut Workspace,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) -> Entity<Self> {
-        let project = workspace.project().clone();
-        let workspace_handle = cx.entity().downgrade();
-
-        cx.new(|cx| {
-            let filter_editor = cx.new(|cx| {
-                let mut editor = Editor::single_line(window, cx);
-                editor.set_placeholder_text("Search buffer symbols…", window, cx);
-                editor
-            });
-            let filter_update_subscription = cx.subscribe_in(
-                &filter_editor,
-                window,
-                |outline_panel: &mut Self, _, event, window, cx| {
-                    if let editor::EditorEvent::BufferEdited = event {
-                        outline_panel.update_cached_entries(Some(UPDATE_DEBOUNCE), window, cx);
-                    }
-                },
-            );
-
-            let focus_handle = cx.focus_handle();
-            let focus_subscription = cx.on_focus(&focus_handle, window, Self::focus_in);
-            let workspace_subscription = cx.subscribe_in(
-                &workspace
-                    .weak_handle()
-                    .upgrade()
-                    .expect("have a &mut Workspace"),
-                window,
-                move |outline_panel, workspace, event, window, cx| {
-                    if let workspace::Event::ActiveItemChanged = event {
-                        if let Some((new_active_item, new_active_editor)) =
-                            workspace_active_editor(workspace.read(cx), cx)
-                        {
-                            if outline_panel.should_replace_active_item(new_active_item.as_ref()) {
-                                outline_panel.replace_active_editor(
-                                    new_active_item,
-                                    new_active_editor,
-                                    window,
-                                    cx,
-                                );
-                            }
-                        } else {
-                            outline_panel.clear_previous(window, cx);
-                            cx.notify();
-                        }
-                    }
-                },
-            );
-
-            let icons_subscription = cx.observe_global::<FileIcons>(|_, cx| {
-                cx.notify();
-            });
-
-            let mut outline_panel_settings = *OutlinePanelSettings::get_global(cx);
-            let mut current_theme = ThemeSettings::get_global(cx).clone();
-            let settings_subscription =
-                cx.observe_global_in::<SettingsStore>(window, move |outline_panel, window, cx| {
-                    let new_settings = OutlinePanelSettings::get_global(cx);
-                    let new_theme = ThemeSettings::get_global(cx);
-                    if &current_theme != new_theme {
-                        outline_panel_settings = *new_settings;
-                        current_theme = new_theme.clone();
-                        for excerpts in outline_panel.excerpts.values_mut() {
-                            for excerpt in excerpts.values_mut() {
-                                excerpt.invalidate_outlines();
-                            }
-                        }
-                        let update_cached_items = outline_panel.update_non_fs_items(window, cx);
-                        if update_cached_items {
-                            outline_panel.update_cached_entries(Some(UPDATE_DEBOUNCE), window, cx);
-                        }
-                    } else if &outline_panel_settings != new_settings {
-                        let old_expansion_depth = outline_panel_settings.expand_outlines_with_depth;
-                        outline_panel_settings = *new_settings;
-
-                        if old_expansion_depth != new_settings.expand_outlines_with_depth {
-                            let old_collapsed_entries = outline_panel.collapsed_entries.clone();
-                            outline_panel
-                                .collapsed_entries
-                                .retain(|entry| !matches!(entry, CollapsedEntry::Outline(..)));
-
-                            let new_depth = new_settings.expand_outlines_with_depth;
-
-                            for (buffer_id, excerpts) in &outline_panel.excerpts {
-                                for (excerpt_id, excerpt) in excerpts {
-                                    if let ExcerptOutlines::Outlines(outlines) = &excerpt.outlines {
-                                        for outline in outlines {
-                                            if outline_panel
-                                                .outline_children_cache
-                                                .get(buffer_id)
-                                                .and_then(|children_map| {
-                                                    let key =
-                                                        (outline.range.clone(), outline.depth);
-                                                    children_map.get(&key)
-                                                })
-                                                .copied()
-                                                .unwrap_or(false)
-                                                && (new_depth == 0 || outline.depth >= new_depth)
-                                            {
-                                                outline_panel.collapsed_entries.insert(
-                                                    CollapsedEntry::Outline(
-                                                        *buffer_id,
-                                                        *excerpt_id,
-                                                        outline.range.clone(),
-                                                    ),
-                                                );
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-
-                            if old_collapsed_entries != outline_panel.collapsed_entries {
-                                outline_panel.update_cached_entries(
-                                    Some(UPDATE_DEBOUNCE),
-                                    window,
-                                    cx,
-                                );
-                            }
-                        } else {
-                            cx.notify();
-                        }
-                    }
-                });
-
-            let scroll_handle = UniformListScrollHandle::new();
-
-            let mut outline_panel = Self {
-                mode: ItemsDisplayMode::Outline,
-                active: false,
-                pinned: false,
-                workspace: workspace_handle,
-                project,
-                fs: workspace.app_state().fs.clone(),
-                max_width_item_index: None,
-                scroll_handle,
-                focus_handle,
-                filter_editor,
-                fs_entries: Vec::new(),
-                fs_entries_depth: HashMap::default(),
-                fs_children_count: HashMap::default(),
-                collapsed_entries: HashSet::default(),
-                unfolded_dirs: HashMap::default(),
-                selected_entry: SelectedEntry::None,
-                context_menu: None,
-                width: None,
-                active_item: None,
-                pending_serialization: Task::ready(None),
-                new_entries_for_fs_update: HashSet::default(),
-                preserve_selection_on_buffer_fold_toggles: HashSet::default(),
-                pending_default_expansion_depth: None,
-                fs_entries_update_task: Task::ready(()),
-                cached_entries_update_task: Task::ready(()),
-                reveal_selection_task: Task::ready(Ok(())),
-                outline_fetch_tasks: HashMap::default(),
-                excerpts: HashMap::default(),
-                cached_entries: Vec::new(),
-                _subscriptions: vec![
-                    settings_subscription,
-                    icons_subscription,
-                    focus_subscription,
-                    workspace_subscription,
-                    filter_update_subscription,
-                ],
-                outline_children_cache: HashMap::default(),
-            };
-            if let Some((item, editor)) = workspace_active_editor(workspace, cx) {
-                outline_panel.replace_active_editor(item, editor, window, cx);
-            }
-            outline_panel
-        })
-    }
-
-    fn serialization_key(workspace: &Workspace) -> Option<String> {
-        workspace
-            .database_id()
-            .map(|id| i64::from(id).to_string())
-            .or(workspace.session_id())
-            .map(|id| format!("{}-{:?}", OUTLINE_PANEL_KEY, id))
-    }
-
-    fn serialize(&mut self, cx: &mut Context<Self>) {
-        let Some(serialization_key) = self
-            .workspace
-            .read_with(cx, |workspace, _| {
-                OutlinePanel::serialization_key(workspace)
-            })
-            .ok()
-            .flatten()
-        else {
-            return;
-        };
-        let width = self.width;
-        let active = Some(self.active);
-        self.pending_serialization = cx.background_spawn(
-            async move {
-                KEY_VALUE_STORE
-                    .write_kvp(
-                        serialization_key,
-                        serde_json::to_string(&SerializedOutlinePanel { width, active })?,
-                    )
-                    .await?;
-                anyhow::Ok(())
-            }
-            .log_err(),
-        );
-    }
-
-    fn dispatch_context(&self, window: &mut Window, cx: &mut Context<Self>) -> KeyContext {
-        let mut dispatch_context = KeyContext::new_with_defaults();
-        dispatch_context.add("OutlinePanel");
-        dispatch_context.add("menu");
-        let identifier = if self.filter_editor.focus_handle(cx).is_focused(window) {
-            "editing"
-        } else {
-            "not_editing"
-        };
-        dispatch_context.add(identifier);
-        dispatch_context
-    }
-
-    fn unfold_directory(
-        &mut self,
-        _: &UnfoldDirectory,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(PanelEntry::FoldedDirs(FoldedDirsEntry {
-            worktree_id,
-            entries,
-            ..
-        })) = self.selected_entry().cloned()
-        {
-            self.unfolded_dirs
-                .entry(worktree_id)
-                .or_default()
-                .extend(entries.iter().map(|entry| entry.id));
-            self.update_cached_entries(None, window, cx);
-        }
-    }
-
-    fn fold_directory(&mut self, _: &FoldDirectory, window: &mut Window, cx: &mut Context<Self>) {
-        let (worktree_id, entry) = match self.selected_entry().cloned() {
-            Some(PanelEntry::Fs(FsEntry::Directory(directory))) => {
-                (directory.worktree_id, Some(directory.entry))
-            }
-            Some(PanelEntry::FoldedDirs(folded_dirs)) => {
-                (folded_dirs.worktree_id, folded_dirs.entries.last().cloned())
-            }
-            _ => return,
-        };
-        let Some(entry) = entry else {
-            return;
-        };
-        let unfolded_dirs = self.unfolded_dirs.get_mut(&worktree_id);
-        let worktree = self
-            .project
-            .read(cx)
-            .worktree_for_id(worktree_id, cx)
-            .map(|w| w.read(cx).snapshot());
-        let Some((_, unfolded_dirs)) = worktree.zip(unfolded_dirs) else {
-            return;
-        };
-
-        unfolded_dirs.remove(&entry.id);
-        self.update_cached_entries(None, window, cx);
-    }
-
-    fn open_selected_entry(
-        &mut self,
-        _: &OpenSelectedEntry,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.filter_editor.focus_handle(cx).is_focused(window) {
-            cx.propagate()
-        } else if let Some(selected_entry) = self.selected_entry().cloned() {
-            self.scroll_editor_to_entry(&selected_entry, true, true, window, cx);
-        }
-    }
-
-    fn cancel(&mut self, _: &Cancel, window: &mut Window, cx: &mut Context<Self>) {
-        if self.filter_editor.focus_handle(cx).is_focused(window) {
-            self.focus_handle.focus(window);
-        } else {
-            self.filter_editor.focus_handle(cx).focus(window);
-        }
-
-        if self.context_menu.is_some() {
-            self.context_menu.take();
-            cx.notify();
-        }
-    }
-
-    fn open_excerpts(
-        &mut self,
-        action: &editor::actions::OpenExcerpts,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.filter_editor.focus_handle(cx).is_focused(window) {
-            cx.propagate()
-        } else if let Some((active_editor, selected_entry)) =
-            self.active_editor().zip(self.selected_entry().cloned())
-        {
-            self.scroll_editor_to_entry(&selected_entry, true, true, window, cx);
-            active_editor.update(cx, |editor, cx| editor.open_excerpts(action, window, cx));
-        }
-    }
-
-    fn open_excerpts_split(
-        &mut self,
-        action: &editor::actions::OpenExcerptsSplit,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.filter_editor.focus_handle(cx).is_focused(window) {
-            cx.propagate()
-        } else if let Some((active_editor, selected_entry)) =
-            self.active_editor().zip(self.selected_entry().cloned())
-        {
-            self.scroll_editor_to_entry(&selected_entry, true, true, window, cx);
-            active_editor.update(cx, |editor, cx| {
-                editor.open_excerpts_in_split(action, window, cx)
-            });
-        }
-    }
-
-    fn scroll_editor_to_entry(
-        &mut self,
-        entry: &PanelEntry,
-        prefer_selection_change: bool,
-        prefer_focus_change: bool,
-        window: &mut Window,
-        cx: &mut Context<OutlinePanel>,
-    ) {
-        let Some(active_editor) = self.active_editor() else {
-            return;
-        };
-        let active_multi_buffer = active_editor.read(cx).buffer().clone();
-        let multi_buffer_snapshot = active_multi_buffer.read(cx).snapshot(cx);
-        let mut change_selection = prefer_selection_change;
-        let mut change_focus = prefer_focus_change;
-        let mut scroll_to_buffer = None;
-        let scroll_target = match entry {
-            PanelEntry::FoldedDirs(..) | PanelEntry::Fs(FsEntry::Directory(..)) => {
-                change_focus = false;
-                None
-            }
-            PanelEntry::Fs(FsEntry::ExternalFile(file)) => {
-                change_selection = false;
-                scroll_to_buffer = Some(file.buffer_id);
-                multi_buffer_snapshot.excerpts().find_map(
-                    |(excerpt_id, buffer_snapshot, excerpt_range)| {
-                        if buffer_snapshot.remote_id() == file.buffer_id {
-                            multi_buffer_snapshot
-                                .anchor_in_excerpt(excerpt_id, excerpt_range.context.start)
-                        } else {
-                            None
-                        }
-                    },
-                )
-            }
-
-            PanelEntry::Fs(FsEntry::File(file)) => {
-                change_selection = false;
-                scroll_to_buffer = Some(file.buffer_id);
-                self.project
-                    .update(cx, |project, cx| {
-                        project
-                            .path_for_entry(file.entry.id, cx)
-                            .and_then(|path| project.get_open_buffer(&path, cx))
-                    })
-                    .map(|buffer| {
-                        active_multi_buffer
-                            .read(cx)
-                            .excerpts_for_buffer(buffer.read(cx).remote_id(), cx)
-                    })
-                    .and_then(|excerpts| {
-                        let (excerpt_id, excerpt_range) = excerpts.first()?;
-                        multi_buffer_snapshot
-                            .anchor_in_excerpt(*excerpt_id, excerpt_range.context.start)
-                    })
-            }
-            PanelEntry::Outline(OutlineEntry::Outline(outline)) => multi_buffer_snapshot
-                .anchor_in_excerpt(outline.excerpt_id, outline.outline.range.start)
-                .or_else(|| {
-                    multi_buffer_snapshot
-                        .anchor_in_excerpt(outline.excerpt_id, outline.outline.range.end)
-                }),
-            PanelEntry::Outline(OutlineEntry::Excerpt(excerpt)) => {
-                change_selection = false;
-                change_focus = false;
-                multi_buffer_snapshot.anchor_in_excerpt(excerpt.id, excerpt.range.context.start)
-            }
-            PanelEntry::Search(search_entry) => Some(search_entry.match_range.start),
-        };
-
-        if let Some(anchor) = scroll_target {
-            let activate = self
-                .workspace
-                .update(cx, |workspace, cx| match self.active_item() {
-                    Some(active_item) => workspace.activate_item(
-                        active_item.as_ref(),
-                        true,
-                        change_focus,
-                        window,
-                        cx,
-                    ),
-                    None => workspace.activate_item(&active_editor, true, change_focus, window, cx),
-                });
-
-            if activate.is_ok() {
-                self.select_entry(entry.clone(), true, window, cx);
-                if change_selection {
-                    active_editor.update(cx, |editor, cx| {
-                        editor.change_selections(
-                            SelectionEffects::scroll(Autoscroll::center()),
-                            window,
-                            cx,
-                            |s| s.select_ranges(Some(anchor..anchor)),
-                        );
-                    });
-                } else {
-                    let mut offset = Point::default();
-                    if let Some(buffer_id) = scroll_to_buffer
-                        && multi_buffer_snapshot.as_singleton().is_none()
-                        && !active_editor.read(cx).is_buffer_folded(buffer_id, cx)
-                    {
-                        offset.y = -(active_editor.read(cx).file_header_size() as f64);
-                    }
-
-                    active_editor.update(cx, |editor, cx| {
-                        editor.set_scroll_anchor(ScrollAnchor { offset, anchor }, window, cx);
-                    });
-                }
-
-                if change_focus {
-                    active_editor.focus_handle(cx).focus(window);
-                } else {
-                    self.focus_handle.focus(window);
-                }
-            }
-        }
-    }
-
-    fn select_next(&mut self, _: &SelectNext, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(entry_to_select) = self.selected_entry().and_then(|selected_entry| {
-            self.cached_entries
-                .iter()
-                .map(|cached_entry| &cached_entry.entry)
-                .skip_while(|entry| entry != &selected_entry)
-                .nth(1)
-                .cloned()
-        }) {
-            self.select_entry(entry_to_select, true, window, cx);
-        } else {
-            self.select_first(&SelectFirst {}, window, cx)
-        }
-        if let Some(selected_entry) = self.selected_entry().cloned() {
-            self.scroll_editor_to_entry(&selected_entry, true, false, window, cx);
-        }
-    }
-
-    fn select_previous(&mut self, _: &SelectPrevious, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(entry_to_select) = self.selected_entry().and_then(|selected_entry| {
-            self.cached_entries
-                .iter()
-                .rev()
-                .map(|cached_entry| &cached_entry.entry)
-                .skip_while(|entry| entry != &selected_entry)
-                .nth(1)
-                .cloned()
-        }) {
-            self.select_entry(entry_to_select, true, window, cx);
-        } else {
-            self.select_last(&SelectLast, window, cx)
-        }
-        if let Some(selected_entry) = self.selected_entry().cloned() {
-            self.scroll_editor_to_entry(&selected_entry, true, false, window, cx);
-        }
-    }
-
-    fn select_parent(&mut self, _: &SelectParent, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(entry_to_select) = self.selected_entry().and_then(|selected_entry| {
-            let mut previous_entries = self
-                .cached_entries
-                .iter()
-                .rev()
-                .map(|cached_entry| &cached_entry.entry)
-                .skip_while(|entry| entry != &selected_entry)
-                .skip(1);
-            match &selected_entry {
-                PanelEntry::Fs(fs_entry) => match fs_entry {
-                    FsEntry::ExternalFile(..) => None,
-                    FsEntry::File(FsEntryFile {
-                        worktree_id, entry, ..
-                    })
-                    | FsEntry::Directory(FsEntryDirectory {
-                        worktree_id, entry, ..
-                    }) => entry.path.parent().and_then(|parent_path| {
-                        previous_entries.find(|entry| match entry {
-                            PanelEntry::Fs(FsEntry::Directory(directory)) => {
-                                directory.worktree_id == *worktree_id
-                                    && directory.entry.path.as_ref() == parent_path
-                            }
-                            PanelEntry::FoldedDirs(FoldedDirsEntry {
-                                worktree_id: dirs_worktree_id,
-                                entries: dirs,
-                                ..
-                            }) => {
-                                dirs_worktree_id == worktree_id
-                                    && dirs
-                                        .last()
-                                        .is_some_and(|dir| dir.path.as_ref() == parent_path)
-                            }
-                            _ => false,
-                        })
-                    }),
-                },
-                PanelEntry::FoldedDirs(folded_dirs) => folded_dirs
-                    .entries
-                    .first()
-                    .and_then(|entry| entry.path.parent())
-                    .and_then(|parent_path| {
-                        previous_entries.find(|entry| {
-                            if let PanelEntry::Fs(FsEntry::Directory(directory)) = entry {
-                                directory.worktree_id == folded_dirs.worktree_id
-                                    && directory.entry.path.as_ref() == parent_path
-                            } else {
-                                false
-                            }
-                        })
-                    }),
-                PanelEntry::Outline(OutlineEntry::Excerpt(excerpt)) => {
-                    previous_entries.find(|entry| match entry {
-                        PanelEntry::Fs(FsEntry::File(file)) => {
-                            file.buffer_id == excerpt.buffer_id
-                                && file.excerpts.contains(&excerpt.id)
-                        }
-                        PanelEntry::Fs(FsEntry::ExternalFile(external_file)) => {
-                            external_file.buffer_id == excerpt.buffer_id
-                                && external_file.excerpts.contains(&excerpt.id)
-                        }
-                        _ => false,
-                    })
-                }
-                PanelEntry::Outline(OutlineEntry::Outline(outline)) => {
-                    previous_entries.find(|entry| {
-                        if let PanelEntry::Outline(OutlineEntry::Excerpt(excerpt)) = entry {
-                            outline.buffer_id == excerpt.buffer_id
-                                && outline.excerpt_id == excerpt.id
-                        } else {
-                            false
-                        }
-                    })
-                }
-                PanelEntry::Search(_) => {
-                    previous_entries.find(|entry| !matches!(entry, PanelEntry::Search(_)))
-                }
-            }
-        }) {
-            self.select_entry(entry_to_select.clone(), true, window, cx);
-        } else {
-            self.select_first(&SelectFirst {}, window, cx);
-        }
-    }
-
-    fn select_first(&mut self, _: &SelectFirst, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(first_entry) = self.cached_entries.first() {
-            self.select_entry(first_entry.entry.clone(), true, window, cx);
-        }
-    }
-
-    fn select_last(&mut self, _: &SelectLast, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(new_selection) = self
-            .cached_entries
-            .iter()
-            .rev()
-            .map(|cached_entry| &cached_entry.entry)
-            .next()
-        {
-            self.select_entry(new_selection.clone(), true, window, cx);
-        }
-    }
-
-    fn autoscroll(&mut self, cx: &mut Context<Self>) {
-        if let Some(selected_entry) = self.selected_entry() {
-            let index = self
-                .cached_entries
-                .iter()
-                .position(|cached_entry| &cached_entry.entry == selected_entry);
-            if let Some(index) = index {
-                self.scroll_handle
-                    .scroll_to_item(index, ScrollStrategy::Center);
-                cx.notify();
-            }
-        }
-    }
-
-    fn focus_in(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if !self.focus_handle.contains_focused(window, cx) {
-            cx.emit(Event::Focus);
-        }
-    }
-
-    fn deploy_context_menu(
-        &mut self,
-        position: Point<Pixels>,
-        entry: PanelEntry,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.select_entry(entry.clone(), true, window, cx);
-        let is_root = match &entry {
-            PanelEntry::Fs(FsEntry::File(FsEntryFile {
-                worktree_id, entry, ..
-            }))
-            | PanelEntry::Fs(FsEntry::Directory(FsEntryDirectory {
-                worktree_id, entry, ..
-            })) => self
-                .project
-                .read(cx)
-                .worktree_for_id(*worktree_id, cx)
-                .map(|worktree| {
-                    worktree.read(cx).root_entry().map(|entry| entry.id) == Some(entry.id)
-                })
-                .unwrap_or(false),
-            PanelEntry::FoldedDirs(FoldedDirsEntry {
-                worktree_id,
-                entries,
-                ..
-            }) => entries
-                .first()
-                .and_then(|entry| {
-                    self.project
-                        .read(cx)
-                        .worktree_for_id(*worktree_id, cx)
-                        .map(|worktree| {
-                            worktree.read(cx).root_entry().map(|entry| entry.id) == Some(entry.id)
-                        })
-                })
-                .unwrap_or(false),
-            PanelEntry::Fs(FsEntry::ExternalFile(..)) => false,
-            PanelEntry::Outline(..) => {
-                cx.notify();
-                return;
-            }
-            PanelEntry::Search(_) => {
-                cx.notify();
-                return;
-            }
-        };
-        let auto_fold_dirs = OutlinePanelSettings::get_global(cx).auto_fold_dirs;
-        let is_foldable = auto_fold_dirs && !is_root && self.is_foldable(&entry);
-        let is_unfoldable = auto_fold_dirs && !is_root && self.is_unfoldable(&entry);
-
-        let context_menu = ContextMenu::build(window, cx, |menu, _, _| {
-            menu.context(self.focus_handle.clone())
-                .when(cfg!(target_os = "macos"), |menu| {
-                    menu.action("Reveal in Finder", Box::new(RevealInFileManager))
-                })
-                .when(cfg!(not(target_os = "macos")), |menu| {
-                    menu.action("Reveal in File Manager", Box::new(RevealInFileManager))
-                })
-                .action("Open in Terminal", Box::new(OpenInTerminal))
-                .when(is_unfoldable, |menu| {
-                    menu.action("Unfold Directory", Box::new(UnfoldDirectory))
-                })
-                .when(is_foldable, |menu| {
-                    menu.action("Fold Directory", Box::new(FoldDirectory))
-                })
-                .separator()
-                .action("Copy Path", Box::new(zed_actions::workspace::CopyPath))
-                .action(
-                    "Copy Relative Path",
-                    Box::new(zed_actions::workspace::CopyRelativePath),
-                )
-        });
-        window.focus(&context_menu.focus_handle(cx));
-        let subscription = cx.subscribe(&context_menu, |outline_panel, _, _: &DismissEvent, cx| {
-            outline_panel.context_menu.take();
-            cx.notify();
-        });
-        self.context_menu = Some((context_menu, position, subscription));
-        cx.notify();
-    }
-
-    fn is_unfoldable(&self, entry: &PanelEntry) -> bool {
-        matches!(entry, PanelEntry::FoldedDirs(..))
-    }
-
-    fn is_foldable(&self, entry: &PanelEntry) -> bool {
-        let (directory_worktree, directory_entry) = match entry {
-            PanelEntry::Fs(FsEntry::Directory(FsEntryDirectory {
-                worktree_id,
-                entry: directory_entry,
-                ..
-            })) => (*worktree_id, Some(directory_entry)),
-            _ => return false,
-        };
-        let Some(directory_entry) = directory_entry else {
-            return false;
-        };
-
-        if self
-            .unfolded_dirs
-            .get(&directory_worktree)
-            .is_none_or(|unfolded_dirs| !unfolded_dirs.contains(&directory_entry.id))
-        {
-            return false;
-        }
-
-        let children = self
-            .fs_children_count
-            .get(&directory_worktree)
-            .and_then(|entries| entries.get(&directory_entry.path))
-            .copied()
-            .unwrap_or_default();
-
-        children.may_be_fold_part() && children.dirs > 0
-    }
-
-    fn expand_selected_entry(
-        &mut self,
-        _: &ExpandSelectedEntry,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(active_editor) = self.active_editor() else {
-            return;
-        };
-        let Some(selected_entry) = self.selected_entry().cloned() else {
-            return;
-        };
-        let mut buffers_to_unfold = HashSet::default();
-        let entry_to_expand = match &selected_entry {
-            PanelEntry::FoldedDirs(FoldedDirsEntry {
-                entries: dir_entries,
-                worktree_id,
-                ..
-            }) => dir_entries.last().map(|entry| {
-                buffers_to_unfold.extend(self.buffers_inside_directory(*worktree_id, entry));
-                CollapsedEntry::Dir(*worktree_id, entry.id)
-            }),
-            PanelEntry::Fs(FsEntry::Directory(FsEntryDirectory {
-                worktree_id, entry, ..
-            })) => {
-                buffers_to_unfold.extend(self.buffers_inside_directory(*worktree_id, entry));
-                Some(CollapsedEntry::Dir(*worktree_id, entry.id))
-            }
-            PanelEntry::Fs(FsEntry::File(FsEntryFile {
-                worktree_id,
-                buffer_id,
-                ..
-            })) => {
-                buffers_to_unfold.insert(*buffer_id);
-                Some(CollapsedEntry::File(*worktree_id, *buffer_id))
-            }
-            PanelEntry::Fs(FsEntry::ExternalFile(external_file)) => {
-                buffers_to_unfold.insert(external_file.buffer_id);
-                Some(CollapsedEntry::ExternalFile(external_file.buffer_id))
-            }
-            PanelEntry::Outline(OutlineEntry::Excerpt(excerpt)) => {
-                Some(CollapsedEntry::Excerpt(excerpt.buffer_id, excerpt.id))
-            }
-            PanelEntry::Outline(OutlineEntry::Outline(outline)) => Some(CollapsedEntry::Outline(
-                outline.buffer_id,
-                outline.excerpt_id,
-                outline.outline.range.clone(),
-            )),
-            PanelEntry::Search(_) => return,
-        };
-        let Some(collapsed_entry) = entry_to_expand else {
-            return;
-        };
-        let expanded = self.collapsed_entries.remove(&collapsed_entry);
-        if expanded {
-            if let CollapsedEntry::Dir(worktree_id, dir_entry_id) = collapsed_entry {
-                let task = self.project.update(cx, |project, cx| {
-                    project.expand_entry(worktree_id, dir_entry_id, cx)
-                });
-                if let Some(task) = task {
-                    task.detach_and_log_err(cx);
-                }
-            };
-
-            active_editor.update(cx, |editor, cx| {
-                buffers_to_unfold.retain(|buffer_id| editor.is_buffer_folded(*buffer_id, cx));
-            });
-            self.select_entry(selected_entry, true, window, cx);
-            if buffers_to_unfold.is_empty() {
-                self.update_cached_entries(None, window, cx);
-            } else {
-                self.toggle_buffers_fold(buffers_to_unfold, false, window, cx)
-                    .detach();
-            }
-        } else {
-            self.select_next(&SelectNext, window, cx)
-        }
-    }
-
-    fn collapse_selected_entry(
-        &mut self,
-        _: &CollapseSelectedEntry,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(active_editor) = self.active_editor() else {
-            return;
-        };
-        let Some(selected_entry) = self.selected_entry().cloned() else {
-            return;
-        };
-
-        let mut buffers_to_fold = HashSet::default();
-        let collapsed = match &selected_entry {
-            PanelEntry::Fs(FsEntry::Directory(FsEntryDirectory {
-                worktree_id, entry, ..
-            })) => {
-                if self
-                    .collapsed_entries
-                    .insert(CollapsedEntry::Dir(*worktree_id, entry.id))
-                {
-                    buffers_to_fold.extend(self.buffers_inside_directory(*worktree_id, entry));
-                    true
-                } else {
-                    false
-                }
-            }
-            PanelEntry::Fs(FsEntry::File(FsEntryFile {
-                worktree_id,
-                buffer_id,
-                ..
-            })) => {
-                if self
-                    .collapsed_entries
-                    .insert(CollapsedEntry::File(*worktree_id, *buffer_id))
-                {
-                    buffers_to_fold.insert(*buffer_id);
-                    true
-                } else {
-                    false
-                }
-            }
-            PanelEntry::Fs(FsEntry::ExternalFile(external_file)) => {
-                if self
-                    .collapsed_entries
-                    .insert(CollapsedEntry::ExternalFile(external_file.buffer_id))
-                {
-                    buffers_to_fold.insert(external_file.buffer_id);
-                    true
-                } else {
-                    false
-                }
-            }
-            PanelEntry::FoldedDirs(folded_dirs) => {
-                let mut folded = false;
-                if let Some(dir_entry) = folded_dirs.entries.last()
-                    && self
-                        .collapsed_entries
-                        .insert(CollapsedEntry::Dir(folded_dirs.worktree_id, dir_entry.id))
-                {
-                    folded = true;
-                    buffers_to_fold
-                        .extend(self.buffers_inside_directory(folded_dirs.worktree_id, dir_entry));
-                }
-                folded
-            }
-            PanelEntry::Outline(OutlineEntry::Excerpt(excerpt)) => self
-                .collapsed_entries
-                .insert(CollapsedEntry::Excerpt(excerpt.buffer_id, excerpt.id)),
-            PanelEntry::Outline(OutlineEntry::Outline(outline)) => {
-                self.collapsed_entries.insert(CollapsedEntry::Outline(
-                    outline.buffer_id,
-                    outline.excerpt_id,
-                    outline.outline.range.clone(),
-                ))
-            }
-            PanelEntry::Search(_) => false,
-        };
-
-        if collapsed {
-            active_editor.update(cx, |editor, cx| {
-                buffers_to_fold.retain(|buffer_id| !editor.is_buffer_folded(*buffer_id, cx));
-            });
-            self.select_entry(selected_entry, true, window, cx);
-            if buffers_to_fold.is_empty() {
-                self.update_cached_entries(None, window, cx);
-            } else {
-                self.toggle_buffers_fold(buffers_to_fold, true, window, cx)
-                    .detach();
-            }
-        } else {
-            self.select_parent(&SelectParent, window, cx);
-        }
-    }
-
-    pub fn expand_all_entries(
-        &mut self,
-        _: &ExpandAllEntries,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(active_editor) = self.active_editor() else {
-            return;
-        };
-
-        let mut to_uncollapse: HashSet<CollapsedEntry> = HashSet::default();
-        let mut buffers_to_unfold: HashSet<BufferId> = HashSet::default();
-
-        for fs_entry in &self.fs_entries {
-            match fs_entry {
-                FsEntry::File(FsEntryFile {
-                    worktree_id,
-                    buffer_id,
-                    ..
-                }) => {
-                    to_uncollapse.insert(CollapsedEntry::File(*worktree_id, *buffer_id));
-                    buffers_to_unfold.insert(*buffer_id);
-                }
-                FsEntry::ExternalFile(FsEntryExternalFile { buffer_id, .. }) => {
-                    to_uncollapse.insert(CollapsedEntry::ExternalFile(*buffer_id));
-                    buffers_to_unfold.insert(*buffer_id);
-                }
-                FsEntry::Directory(FsEntryDirectory {
-                    worktree_id, entry, ..
-                }) => {
-                    to_uncollapse.insert(CollapsedEntry::Dir(*worktree_id, entry.id));
-                }
-            }
-        }
-
-        for (&buffer_id, excerpts) in &self.excerpts {
-            for (&excerpt_id, excerpt) in excerpts {
-                match &excerpt.outlines {
-                    ExcerptOutlines::Outlines(outlines) => {
-                        for outline in outlines {
-                            to_uncollapse.insert(CollapsedEntry::Outline(
-                                buffer_id,
-                                excerpt_id,
-                                outline.range.clone(),
-                            ));
-                        }
-                    }
-                    ExcerptOutlines::Invalidated(outlines) => {
-                        for outline in outlines {
-                            to_uncollapse.insert(CollapsedEntry::Outline(
-                                buffer_id,
-                                excerpt_id,
-                                outline.range.clone(),
-                            ));
-                        }
-                    }
-                    ExcerptOutlines::NotFetched => {}
-                }
-                to_uncollapse.insert(CollapsedEntry::Excerpt(buffer_id, excerpt_id));
-            }
-        }
-
-        for cached in &self.cached_entries {
-            if let PanelEntry::FoldedDirs(FoldedDirsEntry {
-                worktree_id,
-                entries,
-                ..
-            }) = &cached.entry
-            {
-                if let Some(last) = entries.last() {
-                    to_uncollapse.insert(CollapsedEntry::Dir(*worktree_id, last.id));
-                }
-            }
-        }
-
-        self.collapsed_entries
-            .retain(|entry| !to_uncollapse.contains(entry));
-
-        active_editor.update(cx, |editor, cx| {
-            buffers_to_unfold.retain(|buffer_id| editor.is_buffer_folded(*buffer_id, cx));
-        });
-
-        if buffers_to_unfold.is_empty() {
-            self.update_cached_entries(None, window, cx);
-        } else {
-            self.toggle_buffers_fold(buffers_to_unfold, false, window, cx)
-                .detach();
-        }
-    }
-
-    pub fn collapse_all_entries(
-        &mut self,
-        _: &CollapseAllEntries,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(active_editor) = self.active_editor() else {
-            return;
-        };
-        let mut buffers_to_fold = HashSet::default();
-        self.collapsed_entries
-            .extend(self.cached_entries.iter().filter_map(
-                |cached_entry| match &cached_entry.entry {
-                    PanelEntry::Fs(FsEntry::Directory(FsEntryDirectory {
-                        worktree_id,
-                        entry,
-                        ..
-                    })) => Some(CollapsedEntry::Dir(*worktree_id, entry.id)),
-                    PanelEntry::Fs(FsEntry::File(FsEntryFile {
-                        worktree_id,
-                        buffer_id,
-                        ..
-                    })) => {
-                        buffers_to_fold.insert(*buffer_id);
-                        Some(CollapsedEntry::File(*worktree_id, *buffer_id))
-                    }
-                    PanelEntry::Fs(FsEntry::ExternalFile(external_file)) => {
-                        buffers_to_fold.insert(external_file.buffer_id);
-                        Some(CollapsedEntry::ExternalFile(external_file.buffer_id))
-                    }
-                    PanelEntry::FoldedDirs(FoldedDirsEntry {
-                        worktree_id,
-                        entries,
-                        ..
-                    }) => Some(CollapsedEntry::Dir(*worktree_id, entries.last()?.id)),
-                    PanelEntry::Outline(OutlineEntry::Excerpt(excerpt)) => {
-                        Some(CollapsedEntry::Excerpt(excerpt.buffer_id, excerpt.id))
-                    }
-                    PanelEntry::Outline(OutlineEntry::Outline(outline)) => {
-                        Some(CollapsedEntry::Outline(
-                            outline.buffer_id,
-                            outline.excerpt_id,
-                            outline.outline.range.clone(),
-                        ))
-                    }
-                    PanelEntry::Search(_) => None,
-                },
-            ));
-
-        active_editor.update(cx, |editor, cx| {
-            buffers_to_fold.retain(|buffer_id| !editor.is_buffer_folded(*buffer_id, cx));
-        });
-        if buffers_to_fold.is_empty() {
-            self.update_cached_entries(None, window, cx);
-        } else {
-            self.toggle_buffers_fold(buffers_to_fold, true, window, cx)
-                .detach();
-        }
-    }
-
-    fn toggle_expanded(&mut self, entry: &PanelEntry, window: &mut Window, cx: &mut Context<Self>) {
-        let Some(active_editor) = self.active_editor() else {
-            return;
-        };
-        let mut fold = false;
-        let mut buffers_to_toggle = HashSet::default();
-        match entry {
-            PanelEntry::Fs(FsEntry::Directory(FsEntryDirectory {
-                worktree_id,
-                entry: dir_entry,
-                ..
-            })) => {
-                let entry_id = dir_entry.id;
-                let collapsed_entry = CollapsedEntry::Dir(*worktree_id, entry_id);
-                buffers_to_toggle.extend(self.buffers_inside_directory(*worktree_id, dir_entry));
-                if self.collapsed_entries.remove(&collapsed_entry) {
-                    self.project
-                        .update(cx, |project, cx| {
-                            project.expand_entry(*worktree_id, entry_id, cx)
-                        })
-                        .unwrap_or_else(|| Task::ready(Ok(())))
-                        .detach_and_log_err(cx);
-                } else {
-                    self.collapsed_entries.insert(collapsed_entry);
-                    fold = true;
-                }
-            }
-            PanelEntry::Fs(FsEntry::File(FsEntryFile {
-                worktree_id,
-                buffer_id,
-                ..
-            })) => {
-                let collapsed_entry = CollapsedEntry::File(*worktree_id, *buffer_id);
-                buffers_to_toggle.insert(*buffer_id);
-                if !self.collapsed_entries.remove(&collapsed_entry) {
-                    self.collapsed_entries.insert(collapsed_entry);
-                    fold = true;
-                }
-            }
-            PanelEntry::Fs(FsEntry::ExternalFile(external_file)) => {
-                let collapsed_entry = CollapsedEntry::ExternalFile(external_file.buffer_id);
-                buffers_to_toggle.insert(external_file.buffer_id);
-                if !self.collapsed_entries.remove(&collapsed_entry) {
-                    self.collapsed_entries.insert(collapsed_entry);
-                    fold = true;
-                }
-            }
-            PanelEntry::FoldedDirs(FoldedDirsEntry {
-                worktree_id,
-                entries: dir_entries,
-                ..
-            }) => {
-                if let Some(dir_entry) = dir_entries.first() {
-                    let entry_id = dir_entry.id;
-                    let collapsed_entry = CollapsedEntry::Dir(*worktree_id, entry_id);
-                    buffers_to_toggle
-                        .extend(self.buffers_inside_directory(*worktree_id, dir_entry));
-                    if self.collapsed_entries.remove(&collapsed_entry) {
-                        self.project
-                            .update(cx, |project, cx| {
-                                project.expand_entry(*worktree_id, entry_id, cx)
-                            })
-                            .unwrap_or_else(|| Task::ready(Ok(())))
-                            .detach_and_log_err(cx);
-                    } else {
-                        self.collapsed_entries.insert(collapsed_entry);
-                        fold = true;
-                    }
-                }
-            }
-            PanelEntry::Outline(OutlineEntry::Excerpt(excerpt)) => {
-                let collapsed_entry = CollapsedEntry::Excerpt(excerpt.buffer_id, excerpt.id);
-                if !self.collapsed_entries.remove(&collapsed_entry) {
-                    self.collapsed_entries.insert(collapsed_entry);
-                }
-            }
-            PanelEntry::Outline(OutlineEntry::Outline(outline)) => {
-                let collapsed_entry = CollapsedEntry::Outline(
-                    outline.buffer_id,
-                    outline.excerpt_id,
-                    outline.outline.range.clone(),
-                );
-                if !self.collapsed_entries.remove(&collapsed_entry) {
-                    self.collapsed_entries.insert(collapsed_entry);
-                }
-            }
-            _ => {}
-        }
-
-        active_editor.update(cx, |editor, cx| {
-            buffers_to_toggle.retain(|buffer_id| {
-                let folded = editor.is_buffer_folded(*buffer_id, cx);
-                if fold { !folded } else { folded }
-            });
-        });
-
-        self.select_entry(entry.clone(), true, window, cx);
-        if buffers_to_toggle.is_empty() {
-            self.update_cached_entries(None, window, cx);
-        } else {
-            self.toggle_buffers_fold(buffers_to_toggle, fold, window, cx)
-                .detach();
-        }
-    }
-
-    fn toggle_buffers_fold(
-        &self,
-        buffers: HashSet<BufferId>,
-        fold: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<()> {
-        let Some(active_editor) = self.active_editor() else {
-            return Task::ready(());
-        };
-        cx.spawn_in(window, async move |outline_panel, cx| {
-            outline_panel
-                .update_in(cx, |outline_panel, window, cx| {
-                    active_editor.update(cx, |editor, cx| {
-                        for buffer_id in buffers {
-                            outline_panel
-                                .preserve_selection_on_buffer_fold_toggles
-                                .insert(buffer_id);
-                            if fold {
-                                editor.fold_buffer(buffer_id, cx);
-                            } else {
-                                editor.unfold_buffer(buffer_id, cx);
-                            }
-                        }
-                    });
-                    if let Some(selection) = outline_panel.selected_entry().cloned() {
-                        outline_panel.scroll_editor_to_entry(&selection, false, false, window, cx);
-                    }
-                })
-                .ok();
-        })
-    }
-
-    fn copy_path(
-        &mut self,
-        _: &zed_actions::workspace::CopyPath,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(clipboard_text) = self
-            .selected_entry()
-            .and_then(|entry| self.abs_path(entry, cx))
-            .map(|p| p.to_string_lossy().into_owned())
-        {
-            cx.write_to_clipboard(ClipboardItem::new_string(clipboard_text));
-        }
-    }
-
-    fn copy_relative_path(
-        &mut self,
-        _: &zed_actions::workspace::CopyRelativePath,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let path_style = self.project.read(cx).path_style(cx);
-        if let Some(clipboard_text) = self
-            .selected_entry()
-            .and_then(|entry| match entry {
-                PanelEntry::Fs(entry) => self.relative_path(entry, cx),
-                PanelEntry::FoldedDirs(folded_dirs) => {
-                    folded_dirs.entries.last().map(|entry| entry.path.clone())
-                }
-                PanelEntry::Search(_) | PanelEntry::Outline(..) => None,
-            })
-            .map(|p| p.display(path_style).to_string())
-        {
-            cx.write_to_clipboard(ClipboardItem::new_string(clipboard_text));
-        }
-    }
-
-    fn reveal_in_finder(
-        &mut self,
-        _: &RevealInFileManager,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(abs_path) = self
-            .selected_entry()
-            .and_then(|entry| self.abs_path(entry, cx))
-        {
-            cx.reveal_path(&abs_path);
-        }
-    }
-
-    fn open_in_terminal(
-        &mut self,
-        _: &OpenInTerminal,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let selected_entry = self.selected_entry();
-        let abs_path = selected_entry.and_then(|entry| self.abs_path(entry, cx));
-        let working_directory = if let (
-            Some(abs_path),
-            Some(PanelEntry::Fs(FsEntry::File(..) | FsEntry::ExternalFile(..))),
-        ) = (&abs_path, selected_entry)
-        {
-            abs_path.parent().map(|p| p.to_owned())
-        } else {
-            abs_path
-        };
-
-        if let Some(working_directory) = working_directory {
-            window.dispatch_action(
-                workspace::OpenTerminal { working_directory }.boxed_clone(),
-                cx,
-            )
-        }
-    }
-
-    fn reveal_entry_for_selection(
-        &mut self,
-        editor: Entity<Editor>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if !self.active
-            || !OutlinePanelSettings::get_global(cx).auto_reveal_entries
-            || self.focus_handle.contains_focused(window, cx)
-        {
-            return;
-        }
-        let project = self.project.clone();
-        self.reveal_selection_task = cx.spawn_in(window, async move |outline_panel, cx| {
-            cx.background_executor().timer(UPDATE_DEBOUNCE).await;
-            let entry_with_selection =
-                outline_panel.update_in(cx, |outline_panel, window, cx| {
-                    outline_panel.location_for_editor_selection(&editor, window, cx)
-                })?;
-            let Some(entry_with_selection) = entry_with_selection else {
-                outline_panel.update(cx, |outline_panel, cx| {
-                    outline_panel.selected_entry = SelectedEntry::None;
-                    cx.notify();
-                })?;
-                return Ok(());
-            };
-            let related_buffer_entry = match &entry_with_selection {
-                PanelEntry::Fs(FsEntry::File(FsEntryFile {
-                    worktree_id,
-                    buffer_id,
-                    ..
-                })) => project.update(cx, |project, cx| {
-                    let entry_id = project
-                        .buffer_for_id(*buffer_id, cx)
-                        .and_then(|buffer| buffer.read(cx).entry_id(cx));
-                    project
-                        .worktree_for_id(*worktree_id, cx)
-                        .zip(entry_id)
-                        .and_then(|(worktree, entry_id)| {
-                            let entry = worktree.read(cx).entry_for_id(entry_id)?.clone();
-                            Some((worktree, entry))
-                        })
-                })?,
-                PanelEntry::Outline(outline_entry) => {
-                    let (buffer_id, excerpt_id) = outline_entry.ids();
-                    outline_panel.update(cx, |outline_panel, cx| {
-                        outline_panel
-                            .collapsed_entries
-                            .remove(&CollapsedEntry::ExternalFile(buffer_id));
-                        outline_panel
-                            .collapsed_entries
-                            .remove(&CollapsedEntry::Excerpt(buffer_id, excerpt_id));
-                        let project = outline_panel.project.read(cx);
-                        let entry_id = project
-                            .buffer_for_id(buffer_id, cx)
-                            .and_then(|buffer| buffer.read(cx).entry_id(cx));
-
-                        entry_id.and_then(|entry_id| {
-                            project
-                                .worktree_for_entry(entry_id, cx)
-                                .and_then(|worktree| {
-                                    let worktree_id = worktree.read(cx).id();
-                                    outline_panel
-                                        .collapsed_entries
-                                        .remove(&CollapsedEntry::File(worktree_id, buffer_id));
-                                    let entry = worktree.read(cx).entry_for_id(entry_id)?.clone();
-                                    Some((worktree, entry))
-                                })
-                        })
-                    })?
-                }
-                PanelEntry::Fs(FsEntry::ExternalFile(..)) => None,
-                PanelEntry::Search(SearchEntry { match_range, .. }) => match_range
-                    .start
-                    .text_anchor
-                    .buffer_id
-                    .or(match_range.end.text_anchor.buffer_id)
-                    .map(|buffer_id| {
-                        outline_panel.update(cx, |outline_panel, cx| {
-                            outline_panel
-                                .collapsed_entries
-                                .remove(&CollapsedEntry::ExternalFile(buffer_id));
-                            let project = project.read(cx);
-                            let entry_id = project
-                                .buffer_for_id(buffer_id, cx)
-                                .and_then(|buffer| buffer.read(cx).entry_id(cx));
-
-                            entry_id.and_then(|entry_id| {
-                                project
-                                    .worktree_for_entry(entry_id, cx)
-                                    .and_then(|worktree| {
-                                        let worktree_id = worktree.read(cx).id();
-                                        outline_panel
-                                            .collapsed_entries
-                                            .remove(&CollapsedEntry::File(worktree_id, buffer_id));
-                                        let entry =
-                                            worktree.read(cx).entry_for_id(entry_id)?.clone();
-                                        Some((worktree, entry))
-                                    })
-                            })
-                        })
-                    })
-                    .transpose()?
-                    .flatten(),
-                _ => return anyhow::Ok(()),
-            };
-            if let Some((worktree, buffer_entry)) = related_buffer_entry {
-                outline_panel.update(cx, |outline_panel, cx| {
-                    let worktree_id = worktree.read(cx).id();
-                    let mut dirs_to_expand = Vec::new();
-                    {
-                        let mut traversal = worktree.read(cx).traverse_from_path(
-                            true,
-                            true,
-                            true,
-                            buffer_entry.path.as_ref(),
-                        );
-                        let mut current_entry = buffer_entry;
-                        loop {
-                            if current_entry.is_dir()
-                                && outline_panel
-                                    .collapsed_entries
-                                    .remove(&CollapsedEntry::Dir(worktree_id, current_entry.id))
-                            {
-                                dirs_to_expand.push(current_entry.id);
-                            }
-
-                            if traversal.back_to_parent()
-                                && let Some(parent_entry) = traversal.entry()
-                            {
-                                current_entry = parent_entry.clone();
-                                continue;
-                            }
-                            break;
-                        }
-                    }
-                    for dir_to_expand in dirs_to_expand {
-                        project
-                            .update(cx, |project, cx| {
-                                project.expand_entry(worktree_id, dir_to_expand, cx)
-                            })
-                            .unwrap_or_else(|| Task::ready(Ok(())))
-                            .detach_and_log_err(cx)
-                    }
-                })?
-            }
-
-            outline_panel.update_in(cx, |outline_panel, window, cx| {
-                outline_panel.select_entry(entry_with_selection, false, window, cx);
-                outline_panel.update_cached_entries(None, window, cx);
-            })?;
-
-            anyhow::Ok(())
-        });
-    }
-
-    fn render_excerpt(
-        &self,
-        excerpt: &OutlineEntryExcerpt,
-        depth: usize,
-        window: &mut Window,
-        cx: &mut Context<OutlinePanel>,
-    ) -> Option<Stateful<Div>> {
-        let item_id = ElementId::from(excerpt.id.to_proto() as usize);
-        let is_active = match self.selected_entry() {
-            Some(PanelEntry::Outline(OutlineEntry::Excerpt(selected_excerpt))) => {
-                selected_excerpt.buffer_id == excerpt.buffer_id && selected_excerpt.id == excerpt.id
-            }
-            _ => false,
-        };
-        let has_outlines = self
-            .excerpts
-            .get(&excerpt.buffer_id)
-            .and_then(|excerpts| match &excerpts.get(&excerpt.id)?.outlines {
-                ExcerptOutlines::Outlines(outlines) => Some(outlines),
-                ExcerptOutlines::Invalidated(outlines) => Some(outlines),
-                ExcerptOutlines::NotFetched => None,
-            })
-            .is_some_and(|outlines| !outlines.is_empty());
-        let is_expanded = !self
-            .collapsed_entries
-            .contains(&CollapsedEntry::Excerpt(excerpt.buffer_id, excerpt.id));
-        let color = entry_label_color(is_active);
-        let icon = if has_outlines {
-            FileIcons::get_chevron_icon(is_expanded, cx)
-                .map(|icon_path| Icon::from_path(icon_path).color(color).into_any_element())
-        } else {
-            None
-        }
-        .unwrap_or_else(empty_icon);
-
-        let label = self.excerpt_label(excerpt.buffer_id, &excerpt.range, cx)?;
-        let label_element = Label::new(label)
-            .single_line()
-            .color(color)
-            .into_any_element();
-
-        Some(self.entry_element(
-            PanelEntry::Outline(OutlineEntry::Excerpt(excerpt.clone())),
-            item_id,
-            depth,
-            icon,
-            is_active,
-            label_element,
-            window,
-            cx,
-        ))
-    }
-
-    fn excerpt_label(
-        &self,
-        buffer_id: BufferId,
-        range: &ExcerptRange<language::Anchor>,
-        cx: &App,
-    ) -> Option<String> {
-        let buffer_snapshot = self.buffer_snapshot_for_id(buffer_id, cx)?;
-        let excerpt_range = range.context.to_point(&buffer_snapshot);
-        Some(format!(
-            "Lines {}- {}",
-            excerpt_range.start.row + 1,
-            excerpt_range.end.row + 1,
-        ))
-    }
-
-    fn render_outline(
-        &self,
-        outline: &OutlineEntryOutline,
-        depth: usize,
-        string_match: Option<&StringMatch>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Stateful<Div> {
-        let item_id = ElementId::from(SharedString::from(format!(
-            "{:?}|{:?}{:?}|{:?}",
-            outline.buffer_id, outline.excerpt_id, outline.outline.range, &outline.outline.text,
-        )));
-
-        let label_element = outline::render_item(
-            &outline.outline,
-            string_match
-                .map(|string_match| string_match.ranges().collect::<Vec<_>>())
-                .unwrap_or_default(),
-            cx,
-        )
-        .into_any_element();
-
-        let is_active = match self.selected_entry() {
-            Some(PanelEntry::Outline(OutlineEntry::Outline(selected))) => {
-                outline == selected && outline.outline == selected.outline
-            }
-            _ => false,
-        };
-
-        let has_children = self
-            .outline_children_cache
-            .get(&outline.buffer_id)
-            .and_then(|children_map| {
-                let key = (outline.outline.range.clone(), outline.outline.depth);
-                children_map.get(&key)
-            })
-            .copied()
-            .unwrap_or(false);
-        let is_expanded = !self.collapsed_entries.contains(&CollapsedEntry::Outline(
-            outline.buffer_id,
-            outline.excerpt_id,
-            outline.outline.range.clone(),
-        ));
-
-        let icon = if has_children {
-            FileIcons::get_chevron_icon(is_expanded, cx)
-                .map(|icon_path| {
-                    Icon::from_path(icon_path)
-                        .color(entry_label_color(is_active))
-                        .into_any_element()
-                })
-                .unwrap_or_else(empty_icon)
-        } else {
-            empty_icon()
-        };
-
-        self.entry_element(
-            PanelEntry::Outline(OutlineEntry::Outline(outline.clone())),
-            item_id,
-            depth,
-            icon,
-            is_active,
-            label_element,
-            window,
-            cx,
-        )
-    }
-
-    fn render_entry(
-        &self,
-        rendered_entry: &FsEntry,
-        depth: usize,
-        string_match: Option<&StringMatch>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Stateful<Div> {
-        let settings = OutlinePanelSettings::get_global(cx);
-        let is_active = match self.selected_entry() {
-            Some(PanelEntry::Fs(selected_entry)) => selected_entry == rendered_entry,
-            _ => false,
-        };
-        let (item_id, label_element, icon) = match rendered_entry {
-            FsEntry::File(FsEntryFile {
-                worktree_id, entry, ..
-            }) => {
-                let name = self.entry_name(worktree_id, entry, cx);
-                let color =
-                    entry_git_aware_label_color(entry.git_summary, entry.is_ignored, is_active);
-                let icon = if settings.file_icons {
-                    FileIcons::get_icon(entry.path.as_std_path(), cx)
-                        .map(|icon_path| Icon::from_path(icon_path).color(color).into_any_element())
-                } else {
-                    None
-                };
-                (
-                    ElementId::from(entry.id.to_proto() as usize),
-                    HighlightedLabel::new(
-                        name,
-                        string_match
-                            .map(|string_match| string_match.positions.clone())
-                            .unwrap_or_default(),
-                    )
-                    .color(color)
-                    .into_any_element(),
-                    icon.unwrap_or_else(empty_icon),
-                )
-            }
-            FsEntry::Directory(directory) => {
-                let name = self.entry_name(&directory.worktree_id, &directory.entry, cx);
-
-                let is_expanded = !self.collapsed_entries.contains(&CollapsedEntry::Dir(
-                    directory.worktree_id,
-                    directory.entry.id,
-                ));
-                let color = entry_git_aware_label_color(
-                    directory.entry.git_summary,
-                    directory.entry.is_ignored,
-                    is_active,
-                );
-                let icon = if settings.folder_icons {
-                    FileIcons::get_folder_icon(is_expanded, directory.entry.path.as_std_path(), cx)
-                } else {
-                    FileIcons::get_chevron_icon(is_expanded, cx)
-                }
-                .map(Icon::from_path)
-                .map(|icon| icon.color(color).into_any_element());
-                (
-                    ElementId::from(directory.entry.id.to_proto() as usize),
-                    HighlightedLabel::new(
-                        name,
-                        string_match
-                            .map(|string_match| string_match.positions.clone())
-                            .unwrap_or_default(),
-                    )
-                    .color(color)
-                    .into_any_element(),
-                    icon.unwrap_or_else(empty_icon),
-                )
-            }
-            FsEntry::ExternalFile(external_file) => {
-                let color = entry_label_color(is_active);
-                let (icon, name) = match self.buffer_snapshot_for_id(external_file.buffer_id, cx) {
-                    Some(buffer_snapshot) => match buffer_snapshot.file() {
-                        Some(file) => {
-                            let path = file.path();
-                            let icon = if settings.file_icons {
-                                FileIcons::get_icon(path.as_std_path(), cx)
-                            } else {
-                                None
-                            }
-                            .map(Icon::from_path)
-                            .map(|icon| icon.color(color).into_any_element());
-                            (icon, file_name(path.as_std_path()))
-                        }
-                        None => (None, "Untitled".to_string()),
-                    },
-                    None => (None, "Unknown buffer".to_string()),
-                };
-                (
-                    ElementId::from(external_file.buffer_id.to_proto() as usize),
-                    HighlightedLabel::new(
-                        name,
-                        string_match
-                            .map(|string_match| string_match.positions.clone())
-                            .unwrap_or_default(),
-                    )
-                    .color(color)
-                    .into_any_element(),
-                    icon.unwrap_or_else(empty_icon),
-                )
-            }
-        };
-
-        self.entry_element(
-            PanelEntry::Fs(rendered_entry.clone()),
-            item_id,
-            depth,
-            icon,
-            is_active,
-            label_element,
-            window,
-            cx,
-        )
-    }
-
-    fn render_folded_dirs(
-        &self,
-        folded_dir: &FoldedDirsEntry,
-        depth: usize,
-        string_match: Option<&StringMatch>,
-        window: &mut Window,
-        cx: &mut Context<OutlinePanel>,
-    ) -> Stateful<Div> {
-        let settings = OutlinePanelSettings::get_global(cx);
-        let is_active = match self.selected_entry() {
-            Some(PanelEntry::FoldedDirs(selected_dirs)) => {
-                selected_dirs.worktree_id == folded_dir.worktree_id
-                    && selected_dirs.entries == folded_dir.entries
-            }
-            _ => false,
-        };
-        let (item_id, label_element, icon) = {
-            let name = self.dir_names_string(&folded_dir.entries, folded_dir.worktree_id, cx);
-
-            let is_expanded = folded_dir.entries.iter().all(|dir| {
-                !self
-                    .collapsed_entries
-                    .contains(&CollapsedEntry::Dir(folded_dir.worktree_id, dir.id))
-            });
-            let is_ignored = folded_dir.entries.iter().any(|entry| entry.is_ignored);
-            let git_status = folded_dir
-                .entries
-                .first()
-                .map(|entry| entry.git_summary)
-                .unwrap_or_default();
-            let color = entry_git_aware_label_color(git_status, is_ignored, is_active);
-            let icon = if settings.folder_icons {
-                FileIcons::get_folder_icon(is_expanded, &Path::new(&name), cx)
-            } else {
-                FileIcons::get_chevron_icon(is_expanded, cx)
-            }
-            .map(Icon::from_path)
-            .map(|icon| icon.color(color).into_any_element());
-            (
-                ElementId::from(
-                    folded_dir
-                        .entries
-                        .last()
-                        .map(|entry| entry.id.to_proto())
-                        .unwrap_or_else(|| folded_dir.worktree_id.to_proto())
-                        as usize,
-                ),
-                HighlightedLabel::new(
-                    name,
-                    string_match
-                        .map(|string_match| string_match.positions.clone())
-                        .unwrap_or_default(),
-                )
-                .color(color)
-                .into_any_element(),
-                icon.unwrap_or_else(empty_icon),
-            )
-        };
-
-        self.entry_element(
-            PanelEntry::FoldedDirs(folded_dir.clone()),
-            item_id,
-            depth,
-            icon,
-            is_active,
-            label_element,
-            window,
-            cx,
-        )
-    }
-
-    fn render_search_match(
-        &mut self,
-        multi_buffer_snapshot: Option<&MultiBufferSnapshot>,
-        match_range: &Range<editor::Anchor>,
-        render_data: &Arc<OnceLock<SearchData>>,
-        kind: SearchKind,
-        depth: usize,
-        string_match: Option<&StringMatch>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Stateful<Div>> {
-        let search_data = match render_data.get() {
-            Some(search_data) => search_data,
-            None => {
-                if let ItemsDisplayMode::Search(search_state) = &mut self.mode
-                    && let Some(multi_buffer_snapshot) = multi_buffer_snapshot
-                {
-                    search_state
-                        .highlight_search_match_tx
-                        .try_send(HighlightArguments {
-                            multi_buffer_snapshot: multi_buffer_snapshot.clone(),
-                            match_range: match_range.clone(),
-                            search_data: Arc::clone(render_data),
-                        })
-                        .ok();
-                }
-                return None;
-            }
-        };
-        let search_matches = string_match
-            .iter()
-            .flat_map(|string_match| string_match.ranges())
-            .collect::<Vec<_>>();
-        let match_ranges = if search_matches.is_empty() {
-            &search_data.search_match_indices
-        } else {
-            &search_matches
-        };
-        let label_element = outline::render_item(
-            &OutlineItem {
-                depth,
-                annotation_range: None,
-                range: search_data.context_range.clone(),
-                text: search_data.context_text.clone(),
-                source_range_for_text: search_data.context_range.clone(),
-                highlight_ranges: search_data
-                    .highlights_data
-                    .get()
-                    .cloned()
-                    .unwrap_or_default(),
-                name_ranges: search_data.search_match_indices.clone(),
-                body_range: Some(search_data.context_range.clone()),
-            },
-            match_ranges.iter().cloned(),
-            cx,
-        );
-        let truncated_contents_label = || Label::new(TRUNCATED_CONTEXT_MARK);
-        let entire_label = h_flex()
-            .justify_center()
-            .p_0()
-            .when(search_data.truncated_left, |parent| {
-                parent.child(truncated_contents_label())
-            })
-            .child(label_element)
-            .when(search_data.truncated_right, |parent| {
-                parent.child(truncated_contents_label())
-            })
-            .into_any_element();
-
-        let is_active = match self.selected_entry() {
-            Some(PanelEntry::Search(SearchEntry {
-                match_range: selected_match_range,
-                ..
-            })) => match_range == selected_match_range,
-            _ => false,
-        };
-        Some(self.entry_element(
-            PanelEntry::Search(SearchEntry {
-                kind,
-                match_range: match_range.clone(),
-                render_data: render_data.clone(),
-            }),
-            ElementId::from(SharedString::from(format!("search-{match_range:?}"))),
-            depth,
-            empty_icon(),
-            is_active,
-            entire_label,
-            window,
-            cx,
-        ))
-    }
-
-    fn entry_element(
-        &self,
-        rendered_entry: PanelEntry,
-        item_id: ElementId,
-        depth: usize,
-        icon_element: AnyElement,
-        is_active: bool,
-        label_element: gpui::AnyElement,
-        window: &mut Window,
-        cx: &mut Context<OutlinePanel>,
-    ) -> Stateful<Div> {
-        let settings = OutlinePanelSettings::get_global(cx);
-        div()
-            .text_ui(cx)
-            .id(item_id.clone())
-            .on_click({
-                let clicked_entry = rendered_entry.clone();
-                cx.listener(move |outline_panel, event: &gpui::ClickEvent, window, cx| {
-                    if event.is_right_click() || event.first_focus() {
-                        return;
-                    }
-
-                    let change_focus = event.click_count() > 1;
-                    outline_panel.toggle_expanded(&clicked_entry, window, cx);
-
-                    outline_panel.scroll_editor_to_entry(
-                        &clicked_entry,
-                        true,
-                        change_focus,
-                        window,
-                        cx,
-                    );
-                })
-            })
-            .cursor_pointer()
-            .child(
-                ListItem::new(item_id)
-                    .indent_level(depth)
-                    .indent_step_size(px(settings.indent_size))
-                    .toggle_state(is_active)
-                    .child(
-                        h_flex()
-                            .child(h_flex().w(px(16.)).justify_center().child(icon_element))
-                            .child(h_flex().h_6().child(label_element).ml_1()),
-                    )
-                    .on_secondary_mouse_down(cx.listener(
-                        move |outline_panel, event: &MouseDownEvent, window, cx| {
-                            // Stop propagation to prevent the catch-all context menu for the project
-                            // panel from being deployed.
-                            cx.stop_propagation();
-                            outline_panel.deploy_context_menu(
-                                event.position,
-                                rendered_entry.clone(),
-                                window,
-                                cx,
-                            )
-                        },
-                    )),
-            )
-            .border_1()
-            .border_r_2()
-            .rounded_none()
-            .hover(|style| {
-                if is_active {
-                    style
-                } else {
-                    let hover_color = cx.theme().colors().ghost_element_hover;
-                    style.bg(hover_color).border_color(hover_color)
-                }
-            })
-            .when(
-                is_active && self.focus_handle.contains_focused(window, cx),
-                |div| div.border_color(Color::Selected.color(cx)),
-            )
-    }
-
-    fn entry_name(&self, worktree_id: &WorktreeId, entry: &Entry, cx: &App) -> String {
-        match self.project.read(cx).worktree_for_id(*worktree_id, cx) {
-            Some(worktree) => {
-                let worktree = worktree.read(cx);
-                match worktree.snapshot().root_entry() {
-                    Some(root_entry) => {
-                        if root_entry.id == entry.id {
-                            file_name(worktree.abs_path().as_ref())
-                        } else {
-                            let path = worktree.absolutize(entry.path.as_ref());
-                            file_name(&path)
-                        }
-                    }
-                    None => {
-                        let path = worktree.absolutize(entry.path.as_ref());
-                        file_name(&path)
-                    }
-                }
-            }
-            None => file_name(entry.path.as_std_path()),
-        }
-    }
-
-    fn update_fs_entries(
-        &mut self,
-        active_editor: Entity<Editor>,
-        debounce: Option<Duration>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if !self.active {
-            return;
-        }
-
-        let auto_fold_dirs = OutlinePanelSettings::get_global(cx).auto_fold_dirs;
-        let active_multi_buffer = active_editor.read(cx).buffer().clone();
-        let new_entries = self.new_entries_for_fs_update.clone();
-        let repo_snapshots = self.project.update(cx, |project, cx| {
-            project.git_store().read(cx).repo_snapshots(cx)
-        });
-        self.fs_entries_update_task = cx.spawn_in(window, async move |outline_panel, cx| {
-            if let Some(debounce) = debounce {
-                cx.background_executor().timer(debounce).await;
-            }
-
-            let mut new_collapsed_entries = HashSet::default();
-            let mut new_unfolded_dirs = HashMap::default();
-            let mut root_entries = HashSet::default();
-            let mut new_excerpts = HashMap::<BufferId, HashMap<ExcerptId, Excerpt>>::default();
-            let Ok(buffer_excerpts) = outline_panel.update(cx, |outline_panel, cx| {
-                let git_store = outline_panel.project.read(cx).git_store().clone();
-                new_collapsed_entries = outline_panel.collapsed_entries.clone();
-                new_unfolded_dirs = outline_panel.unfolded_dirs.clone();
-                let multi_buffer_snapshot = active_multi_buffer.read(cx).snapshot(cx);
-
-                multi_buffer_snapshot.excerpts().fold(
-                    HashMap::default(),
-                    |mut buffer_excerpts, (excerpt_id, buffer_snapshot, excerpt_range)| {
-                        let buffer_id = buffer_snapshot.remote_id();
-                        let file = File::from_dyn(buffer_snapshot.file());
-                        let entry_id = file.and_then(|file| file.project_entry_id());
-                        let worktree = file.map(|file| file.worktree.read(cx).snapshot());
-                        let is_new = new_entries.contains(&excerpt_id)
-                            || !outline_panel.excerpts.contains_key(&buffer_id);
-                        let is_folded = active_editor.read(cx).is_buffer_folded(buffer_id, cx);
-                        let status = git_store
-                            .read(cx)
-                            .repository_and_path_for_buffer_id(buffer_id, cx)
-                            .and_then(|(repo, path)| {
-                                Some(repo.read(cx).status_for_path(&path)?.status)
-                            });
-                        buffer_excerpts
-                            .entry(buffer_id)
-                            .or_insert_with(|| {
-                                (is_new, is_folded, Vec::new(), entry_id, worktree, status)
-                            })
-                            .2
-                            .push(excerpt_id);
-
-                        let outlines = match outline_panel
-                            .excerpts
-                            .get(&buffer_id)
-                            .and_then(|excerpts| excerpts.get(&excerpt_id))
-                        {
-                            Some(old_excerpt) => match &old_excerpt.outlines {
-                                ExcerptOutlines::Outlines(outlines) => {
-                                    ExcerptOutlines::Outlines(outlines.clone())
-                                }
-                                ExcerptOutlines::Invalidated(_) => ExcerptOutlines::NotFetched,
-                                ExcerptOutlines::NotFetched => ExcerptOutlines::NotFetched,
-                            },
-                            None => ExcerptOutlines::NotFetched,
-                        };
-                        new_excerpts.entry(buffer_id).or_default().insert(
-                            excerpt_id,
-                            Excerpt {
-                                range: excerpt_range,
-                                outlines,
-                            },
-                        );
-                        buffer_excerpts
-                    },
-                )
-            }) else {
-                return;
-            };
-
-            let Some((
-                new_collapsed_entries,
-                new_unfolded_dirs,
-                new_fs_entries,
-                new_depth_map,
-                new_children_count,
-            )) = cx
-                .background_spawn(async move {
-                    let mut processed_external_buffers = HashSet::default();
-                    let mut new_worktree_entries =
-                        BTreeMap::<WorktreeId, HashMap<ProjectEntryId, GitEntry>>::default();
-                    let mut worktree_excerpts = HashMap::<
-                        WorktreeId,
-                        HashMap<ProjectEntryId, (BufferId, Vec<ExcerptId>)>,
-                    >::default();
-                    let mut external_excerpts = HashMap::default();
-
-                    for (buffer_id, (is_new, is_folded, excerpts, entry_id, worktree, status)) in
-                        buffer_excerpts
-                    {
-                        if is_folded {
-                            match &worktree {
-                                Some(worktree) => {
-                                    new_collapsed_entries
-                                        .insert(CollapsedEntry::File(worktree.id(), buffer_id));
-                                }
-                                None => {
-                                    new_collapsed_entries
-                                        .insert(CollapsedEntry::ExternalFile(buffer_id));
-                                }
-                            }
-                        } else if is_new {
-                            match &worktree {
-                                Some(worktree) => {
-                                    new_collapsed_entries
-                                        .remove(&CollapsedEntry::File(worktree.id(), buffer_id));
-                                }
-                                None => {
-                                    new_collapsed_entries
-                                        .remove(&CollapsedEntry::ExternalFile(buffer_id));
-                                }
-                            }
-                        }
-
-                        if let Some(worktree) = worktree {
-                            let worktree_id = worktree.id();
-                            let unfolded_dirs = new_unfolded_dirs.entry(worktree_id).or_default();
-
-                            match entry_id.and_then(|id| worktree.entry_for_id(id)).cloned() {
-                                Some(entry) => {
-                                    let entry = GitEntry {
-                                        git_summary: status
-                                            .map(|status| status.summary())
-                                            .unwrap_or_default(),
-                                        entry,
-                                    };
-                                    let mut traversal = GitTraversal::new(
-                                        &repo_snapshots,
-                                        worktree.traverse_from_path(
-                                            true,
-                                            true,
-                                            true,
-                                            entry.path.as_ref(),
-                                        ),
-                                    );
-
-                                    let mut entries_to_add = HashMap::default();
-                                    worktree_excerpts
-                                        .entry(worktree_id)
-                                        .or_default()
-                                        .insert(entry.id, (buffer_id, excerpts));
-                                    let mut current_entry = entry;
-                                    loop {
-                                        if current_entry.is_dir() {
-                                            let is_root =
-                                                worktree.root_entry().map(|entry| entry.id)
-                                                    == Some(current_entry.id);
-                                            if is_root {
-                                                root_entries.insert(current_entry.id);
-                                                if auto_fold_dirs {
-                                                    unfolded_dirs.insert(current_entry.id);
-                                                }
-                                            }
-                                            if is_new {
-                                                new_collapsed_entries.remove(&CollapsedEntry::Dir(
-                                                    worktree_id,
-                                                    current_entry.id,
-                                                ));
-                                            }
-                                        }
-
-                                        let new_entry_added = entries_to_add
-                                            .insert(current_entry.id, current_entry)
-                                            .is_none();
-                                        if new_entry_added
-                                            && traversal.back_to_parent()
-                                            && let Some(parent_entry) = traversal.entry()
-                                        {
-                                            current_entry = parent_entry.to_owned();
-                                            continue;
-                                        }
-                                        break;
-                                    }
-                                    new_worktree_entries
-                                        .entry(worktree_id)
-                                        .or_insert_with(HashMap::default)
-                                        .extend(entries_to_add);
-                                }
-                                None => {
-                                    if processed_external_buffers.insert(buffer_id) {
-                                        external_excerpts
-                                            .entry(buffer_id)
-                                            .or_insert_with(Vec::new)
-                                            .extend(excerpts);
-                                    }
-                                }
-                            }
-                        } else if processed_external_buffers.insert(buffer_id) {
-                            external_excerpts
-                                .entry(buffer_id)
-                                .or_insert_with(Vec::new)
-                                .extend(excerpts);
-                        }
-                    }
-
-                    let mut new_children_count =
-                        HashMap::<WorktreeId, HashMap<Arc<RelPath>, FsChildren>>::default();
-
-                    let worktree_entries = new_worktree_entries
-                        .into_iter()
-                        .map(|(worktree_id, entries)| {
-                            let mut entries = entries.into_values().collect::<Vec<_>>();
-                            entries.sort_by(|a, b| a.path.as_ref().cmp(b.path.as_ref()));
-                            (worktree_id, entries)
-                        })
-                        .flat_map(|(worktree_id, entries)| {
-                            {
-                                entries
-                                    .into_iter()
-                                    .filter_map(|entry| {
-                                        if auto_fold_dirs && let Some(parent) = entry.path.parent()
-                                        {
-                                            let children = new_children_count
-                                                .entry(worktree_id)
-                                                .or_default()
-                                                .entry(Arc::from(parent))
-                                                .or_default();
-                                            if entry.is_dir() {
-                                                children.dirs += 1;
-                                            } else {
-                                                children.files += 1;
-                                            }
-                                        }
-
-                                        if entry.is_dir() {
-                                            Some(FsEntry::Directory(FsEntryDirectory {
-                                                worktree_id,
-                                                entry,
-                                            }))
-                                        } else {
-                                            let (buffer_id, excerpts) = worktree_excerpts
-                                                .get_mut(&worktree_id)
-                                                .and_then(|worktree_excerpts| {
-                                                    worktree_excerpts.remove(&entry.id)
-                                                })?;
-                                            Some(FsEntry::File(FsEntryFile {
-                                                worktree_id,
-                                                buffer_id,
-                                                entry,
-                                                excerpts,
-                                            }))
-                                        }
-                                    })
-                                    .collect::<Vec<_>>()
-                            }
-                        })
-                        .collect::<Vec<_>>();
-
-                    let mut visited_dirs = Vec::new();
-                    let mut new_depth_map = HashMap::default();
-                    let new_visible_entries = external_excerpts
-                        .into_iter()
-                        .sorted_by_key(|(id, _)| *id)
-                        .map(|(buffer_id, excerpts)| {
-                            FsEntry::ExternalFile(FsEntryExternalFile {
-                                buffer_id,
-                                excerpts,
-                            })
-                        })
-                        .chain(worktree_entries)
-                        .filter(|visible_item| {
-                            match visible_item {
-                                FsEntry::Directory(directory) => {
-                                    let parent_id = back_to_common_visited_parent(
-                                        &mut visited_dirs,
-                                        &directory.worktree_id,
-                                        &directory.entry,
-                                    );
-
-                                    let mut depth = 0;
-                                    if !root_entries.contains(&directory.entry.id) {
-                                        if auto_fold_dirs {
-                                            let children = new_children_count
-                                                .get(&directory.worktree_id)
-                                                .and_then(|children_count| {
-                                                    children_count.get(&directory.entry.path)
-                                                })
-                                                .copied()
-                                                .unwrap_or_default();
-
-                                            if !children.may_be_fold_part()
-                                                || (children.dirs == 0
-                                                    && visited_dirs
-                                                        .last()
-                                                        .map(|(parent_dir_id, _)| {
-                                                            new_unfolded_dirs
-                                                                .get(&directory.worktree_id)
-                                                                .is_none_or(|unfolded_dirs| {
-                                                                    unfolded_dirs
-                                                                        .contains(parent_dir_id)
-                                                                })
-                                                        })
-                                                        .unwrap_or(true))
-                                            {
-                                                new_unfolded_dirs
-                                                    .entry(directory.worktree_id)
-                                                    .or_default()
-                                                    .insert(directory.entry.id);
-                                            }
-                                        }
-
-                                        depth = parent_id
-                                            .and_then(|(worktree_id, id)| {
-                                                new_depth_map.get(&(worktree_id, id)).copied()
-                                            })
-                                            .unwrap_or(0)
-                                            + 1;
-                                    };
-                                    visited_dirs
-                                        .push((directory.entry.id, directory.entry.path.clone()));
-                                    new_depth_map
-                                        .insert((directory.worktree_id, directory.entry.id), depth);
-                                }
-                                FsEntry::File(FsEntryFile {
-                                    worktree_id,
-                                    entry: file_entry,
-                                    ..
-                                }) => {
-                                    let parent_id = back_to_common_visited_parent(
-                                        &mut visited_dirs,
-                                        worktree_id,
-                                        file_entry,
-                                    );
-                                    let depth = if root_entries.contains(&file_entry.id) {
-                                        0
-                                    } else {
-                                        parent_id
-                                            .and_then(|(worktree_id, id)| {
-                                                new_depth_map.get(&(worktree_id, id)).copied()
-                                            })
-                                            .unwrap_or(0)
-                                            + 1
-                                    };
-                                    new_depth_map.insert((*worktree_id, file_entry.id), depth);
-                                }
-                                FsEntry::ExternalFile(..) => {
-                                    visited_dirs.clear();
-                                }
-                            }
-
-                            true
-                        })
-                        .collect::<Vec<_>>();
-
-                    anyhow::Ok((
-                        new_collapsed_entries,
-                        new_unfolded_dirs,
-                        new_visible_entries,
-                        new_depth_map,
-                        new_children_count,
-                    ))
-                })
-                .await
-                .log_err()
-            else {
-                return;
-            };
-
-            outline_panel
-                .update_in(cx, |outline_panel, window, cx| {
-                    outline_panel.new_entries_for_fs_update.clear();
-                    outline_panel.excerpts = new_excerpts;
-                    outline_panel.collapsed_entries = new_collapsed_entries;
-                    outline_panel.unfolded_dirs = new_unfolded_dirs;
-                    outline_panel.fs_entries = new_fs_entries;
-                    outline_panel.fs_entries_depth = new_depth_map;
-                    outline_panel.fs_children_count = new_children_count;
-                    outline_panel.update_non_fs_items(window, cx);
-
-                    // Only update cached entries if we don't have outlines to fetch
-                    // If we do have outlines to fetch, let fetch_outdated_outlines handle the update
-                    if outline_panel.excerpt_fetch_ranges(cx).is_empty() {
-                        outline_panel.update_cached_entries(debounce, window, cx);
-                    }
-
-                    cx.notify();
-                })
-                .ok();
-        });
-    }
-
-    fn replace_active_editor(
-        &mut self,
-        new_active_item: Box<dyn ItemHandle>,
-        new_active_editor: Entity<Editor>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.clear_previous(window, cx);
-
-        let default_expansion_depth =
-            OutlinePanelSettings::get_global(cx).expand_outlines_with_depth;
-        // We'll apply the expansion depth after outlines are loaded
-        self.pending_default_expansion_depth = Some(default_expansion_depth);
-
-        let buffer_search_subscription = cx.subscribe_in(
-            &new_active_editor,
-            window,
-            |outline_panel: &mut Self,
-             _,
-             e: &SearchEvent,
-             window: &mut Window,
-             cx: &mut Context<Self>| {
-                if matches!(e, SearchEvent::MatchesInvalidated) {
-                    let update_cached_items = outline_panel.update_search_matches(window, cx);
-                    if update_cached_items {
-                        outline_panel.selected_entry.invalidate();
-                        outline_panel.update_cached_entries(Some(UPDATE_DEBOUNCE), window, cx);
-                    }
-                };
-                outline_panel.autoscroll(cx);
-            },
-        );
-        self.active_item = Some(ActiveItem {
-            _buffer_search_subscription: buffer_search_subscription,
-            _editor_subscription: subscribe_for_editor_events(&new_active_editor, window, cx),
-            item_handle: new_active_item.downgrade_item(),
-            active_editor: new_active_editor.downgrade(),
-        });
-        self.new_entries_for_fs_update
-            .extend(new_active_editor.read(cx).buffer().read(cx).excerpt_ids());
-        self.selected_entry.invalidate();
-        self.update_fs_entries(new_active_editor, None, window, cx);
-    }
-
-    fn clear_previous(&mut self, window: &mut Window, cx: &mut App) {
-        self.fs_entries_update_task = Task::ready(());
-        self.outline_fetch_tasks.clear();
-        self.cached_entries_update_task = Task::ready(());
-        self.reveal_selection_task = Task::ready(Ok(()));
-        self.filter_editor
-            .update(cx, |editor, cx| editor.clear(window, cx));
-        self.collapsed_entries.clear();
-        self.unfolded_dirs.clear();
-        self.active_item = None;
-        self.fs_entries.clear();
-        self.fs_entries_depth.clear();
-        self.fs_children_count.clear();
-        self.excerpts.clear();
-        self.cached_entries = Vec::new();
-        self.selected_entry = SelectedEntry::None;
-        self.pinned = false;
-        self.mode = ItemsDisplayMode::Outline;
-        self.pending_default_expansion_depth = None;
-    }
-
-    fn location_for_editor_selection(
-        &self,
-        editor: &Entity<Editor>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<PanelEntry> {
-        let selection = editor.update(cx, |editor, cx| {
-            editor
-                .selections
-                .newest::<language::Point>(&editor.display_snapshot(cx))
-                .head()
-        });
-        let editor_snapshot = editor.update(cx, |editor, cx| editor.snapshot(window, cx));
-        let multi_buffer = editor.read(cx).buffer();
-        let multi_buffer_snapshot = multi_buffer.read(cx).snapshot(cx);
-        let (excerpt_id, buffer, _) = editor
-            .read(cx)
-            .buffer()
-            .read(cx)
-            .excerpt_containing(selection, cx)?;
-        let buffer_id = buffer.read(cx).remote_id();
-
-        if editor.read(cx).is_buffer_folded(buffer_id, cx) {
-            return self
-                .fs_entries
-                .iter()
-                .find(|fs_entry| match fs_entry {
-                    FsEntry::Directory(..) => false,
-                    FsEntry::File(FsEntryFile {
-                        buffer_id: other_buffer_id,
-                        ..
-                    })
-                    | FsEntry::ExternalFile(FsEntryExternalFile {
-                        buffer_id: other_buffer_id,
-                        ..
-                    }) => buffer_id == *other_buffer_id,
-                })
-                .cloned()
-                .map(PanelEntry::Fs);
-        }
-
-        let selection_display_point = selection.to_display_point(&editor_snapshot);
-
-        match &self.mode {
-            ItemsDisplayMode::Search(search_state) => search_state
-                .matches
-                .iter()
-                .rev()
-                .min_by_key(|&(match_range, _)| {
-                    let match_display_range =
-                        match_range.clone().to_display_points(&editor_snapshot);
-                    let start_distance = if selection_display_point < match_display_range.start {
-                        match_display_range.start - selection_display_point
-                    } else {
-                        selection_display_point - match_display_range.start
-                    };
-                    let end_distance = if selection_display_point < match_display_range.end {
-                        match_display_range.end - selection_display_point
-                    } else {
-                        selection_display_point - match_display_range.end
-                    };
-                    start_distance + end_distance
-                })
-                .and_then(|(closest_range, _)| {
-                    self.cached_entries.iter().find_map(|cached_entry| {
-                        if let PanelEntry::Search(SearchEntry { match_range, .. }) =
-                            &cached_entry.entry
-                        {
-                            if match_range == closest_range {
-                                Some(cached_entry.entry.clone())
-                            } else {
-                                None
-                            }
-                        } else {
-                            None
-                        }
-                    })
-                }),
-            ItemsDisplayMode::Outline => self.outline_location(
-                buffer_id,
-                excerpt_id,
-                multi_buffer_snapshot,
-                editor_snapshot,
-                selection_display_point,
-            ),
-        }
-    }
-
-    fn outline_location(
-        &self,
-        buffer_id: BufferId,
-        excerpt_id: ExcerptId,
-        multi_buffer_snapshot: editor::MultiBufferSnapshot,
-        editor_snapshot: editor::EditorSnapshot,
-        selection_display_point: DisplayPoint,
-    ) -> Option<PanelEntry> {
-        let excerpt_outlines = self
-            .excerpts
-            .get(&buffer_id)
-            .and_then(|excerpts| excerpts.get(&excerpt_id))
-            .into_iter()
-            .flat_map(|excerpt| excerpt.iter_outlines())
-            .flat_map(|outline| {
-                let range = multi_buffer_snapshot
-                    .anchor_range_in_excerpt(excerpt_id, outline.range.clone())?;
-                Some((
-                    range.start.to_display_point(&editor_snapshot)
-                        ..range.end.to_display_point(&editor_snapshot),
-                    outline,
-                ))
-            })
-            .collect::<Vec<_>>();
-
-        let mut matching_outline_indices = Vec::new();
-        let mut children = HashMap::default();
-        let mut parents_stack = Vec::<(&Range<DisplayPoint>, &&Outline, usize)>::new();
-
-        for (i, (outline_range, outline)) in excerpt_outlines.iter().enumerate() {
-            if outline_range
-                .to_inclusive()
-                .contains(&selection_display_point)
-            {
-                matching_outline_indices.push(i);
-            } else if (outline_range.start.row()..outline_range.end.row())
-                .to_inclusive()
-                .contains(&selection_display_point.row())
-            {
-                matching_outline_indices.push(i);
-            }
-
-            while let Some((parent_range, parent_outline, _)) = parents_stack.last() {
-                if parent_outline.depth >= outline.depth
-                    || !parent_range.contains(&outline_range.start)
-                {
-                    parents_stack.pop();
-                } else {
-                    break;
-                }
-            }
-            if let Some((_, _, parent_index)) = parents_stack.last_mut() {
-                children
-                    .entry(*parent_index)
-                    .or_insert_with(Vec::new)
-                    .push(i);
-            }
-            parents_stack.push((outline_range, outline, i));
-        }
-
-        let outline_item = matching_outline_indices
-            .into_iter()
-            .flat_map(|i| Some((i, excerpt_outlines.get(i)?)))
-            .filter(|(i, _)| {
-                children
-                    .get(i)
-                    .map(|children| {
-                        children.iter().all(|child_index| {
-                            excerpt_outlines
-                                .get(*child_index)
-                                .map(|(child_range, _)| child_range.start > selection_display_point)
-                                .unwrap_or(false)
-                        })
-                    })
-                    .unwrap_or(true)
-            })
-            .min_by_key(|(_, (outline_range, outline))| {
-                let distance_from_start = if outline_range.start > selection_display_point {
-                    outline_range.start - selection_display_point
-                } else {
-                    selection_display_point - outline_range.start
-                };
-                let distance_from_end = if outline_range.end > selection_display_point {
-                    outline_range.end - selection_display_point
-                } else {
-                    selection_display_point - outline_range.end
-                };
-
-                (
-                    cmp::Reverse(outline.depth),
-                    distance_from_start + distance_from_end,
-                )
-            })
-            .map(|(_, (_, outline))| *outline)
-            .cloned();
-
-        let closest_container = match outline_item {
-            Some(outline) => PanelEntry::Outline(OutlineEntry::Outline(OutlineEntryOutline {
-                buffer_id,
-                excerpt_id,
-                outline,
-            })),
-            None => {
-                self.cached_entries.iter().rev().find_map(|cached_entry| {
-                    match &cached_entry.entry {
-                        PanelEntry::Outline(OutlineEntry::Excerpt(excerpt)) => {
-                            if excerpt.buffer_id == buffer_id && excerpt.id == excerpt_id {
-                                Some(cached_entry.entry.clone())
-                            } else {
-                                None
-                            }
-                        }
-                        PanelEntry::Fs(
-                            FsEntry::ExternalFile(FsEntryExternalFile {
-                                buffer_id: file_buffer_id,
-                                excerpts: file_excerpts,
-                            })
-                            | FsEntry::File(FsEntryFile {
-                                buffer_id: file_buffer_id,
-                                excerpts: file_excerpts,
-                                ..
-                            }),
-                        ) => {
-                            if file_buffer_id == &buffer_id && file_excerpts.contains(&excerpt_id) {
-                                Some(cached_entry.entry.clone())
-                            } else {
-                                None
-                            }
-                        }
-                        _ => None,
-                    }
-                })?
-            }
-        };
-        Some(closest_container)
-    }
-
-    fn fetch_outdated_outlines(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let excerpt_fetch_ranges = self.excerpt_fetch_ranges(cx);
-        if excerpt_fetch_ranges.is_empty() {
-            return;
-        }
-
-        let syntax_theme = cx.theme().syntax().clone();
-        let first_update = Arc::new(AtomicBool::new(true));
-        for (buffer_id, (buffer_snapshot, excerpt_ranges)) in excerpt_fetch_ranges {
-            for (excerpt_id, excerpt_range) in excerpt_ranges {
-                let syntax_theme = syntax_theme.clone();
-                let buffer_snapshot = buffer_snapshot.clone();
-                let first_update = first_update.clone();
-                self.outline_fetch_tasks.insert(
-                    (buffer_id, excerpt_id),
-                    cx.spawn_in(window, async move |outline_panel, cx| {
-                        let buffer_language = buffer_snapshot.language().cloned();
-                        let fetched_outlines = cx
-                            .background_spawn(async move {
-                                let mut outlines = buffer_snapshot.outline_items_containing(
-                                    excerpt_range.context,
-                                    false,
-                                    Some(&syntax_theme),
-                                );
-                                outlines.retain(|outline| {
-                                    buffer_language.is_none()
-                                        || buffer_language.as_ref()
-                                            == buffer_snapshot.language_at(outline.range.start)
-                                });
-
-                                let outlines_with_children = outlines
-                                    .windows(2)
-                                    .filter_map(|window| {
-                                        let current = &window[0];
-                                        let next = &window[1];
-                                        if next.depth > current.depth {
-                                            Some((current.range.clone(), current.depth))
-                                        } else {
-                                            None
-                                        }
-                                    })
-                                    .collect::<HashSet<_>>();
-
-                                (outlines, outlines_with_children)
-                            })
-                            .await;
-
-                        let (fetched_outlines, outlines_with_children) = fetched_outlines;
-
-                        outline_panel
-                            .update_in(cx, |outline_panel, window, cx| {
-                                let pending_default_depth =
-                                    outline_panel.pending_default_expansion_depth.take();
-
-                                let debounce =
-                                    if first_update.fetch_and(false, atomic::Ordering::AcqRel) {
-                                        None
-                                    } else {
-                                        Some(UPDATE_DEBOUNCE)
-                                    };
-
-                                if let Some(excerpt) = outline_panel
-                                    .excerpts
-                                    .entry(buffer_id)
-                                    .or_default()
-                                    .get_mut(&excerpt_id)
-                                {
-                                    excerpt.outlines = ExcerptOutlines::Outlines(fetched_outlines);
-
-                                    if let Some(default_depth) = pending_default_depth
-                                        && let ExcerptOutlines::Outlines(outlines) =
-                                            &excerpt.outlines
-                                    {
-                                        outlines
-                                            .iter()
-                                            .filter(|outline| {
-                                                (default_depth == 0
-                                                    || outline.depth >= default_depth)
-                                                    && outlines_with_children.contains(&(
-                                                        outline.range.clone(),
-                                                        outline.depth,
-                                                    ))
-                                            })
-                                            .for_each(|outline| {
-                                                outline_panel.collapsed_entries.insert(
-                                                    CollapsedEntry::Outline(
-                                                        buffer_id,
-                                                        excerpt_id,
-                                                        outline.range.clone(),
-                                                    ),
-                                                );
-                                            });
-                                    }
-
-                                    // Even if no outlines to check, we still need to update cached entries
-                                    // to show the outline entries that were just fetched
-                                    outline_panel.update_cached_entries(debounce, window, cx);
-                                }
-                            })
-                            .ok();
-                    }),
-                );
-            }
-        }
-    }
-
-    fn is_singleton_active(&self, cx: &App) -> bool {
-        self.active_editor()
-            .is_some_and(|active_editor| active_editor.read(cx).buffer().read(cx).is_singleton())
-    }
-
-    fn invalidate_outlines(&mut self, ids: &[ExcerptId]) {
-        self.outline_fetch_tasks.clear();
-        let mut ids = ids.iter().collect::<HashSet<_>>();
-        for excerpts in self.excerpts.values_mut() {
-            ids.retain(|id| {
-                if let Some(excerpt) = excerpts.get_mut(id) {
-                    excerpt.invalidate_outlines();
-                    false
-                } else {
-                    true
-                }
-            });
-            if ids.is_empty() {
-                break;
-            }
-        }
-    }
-
-    fn excerpt_fetch_ranges(
-        &self,
-        cx: &App,
-    ) -> HashMap<
-        BufferId,
-        (
-            BufferSnapshot,
-            HashMap<ExcerptId, ExcerptRange<language::Anchor>>,
-        ),
-    > {
-        self.fs_entries
-            .iter()
-            .fold(HashMap::default(), |mut excerpts_to_fetch, fs_entry| {
-                match fs_entry {
-                    FsEntry::File(FsEntryFile {
-                        buffer_id,
-                        excerpts: file_excerpts,
-                        ..
-                    })
-                    | FsEntry::ExternalFile(FsEntryExternalFile {
-                        buffer_id,
-                        excerpts: file_excerpts,
-                    }) => {
-                        let excerpts = self.excerpts.get(buffer_id);
-                        for &file_excerpt in file_excerpts {
-                            if let Some(excerpt) = excerpts
-                                .and_then(|excerpts| excerpts.get(&file_excerpt))
-                                .filter(|excerpt| excerpt.should_fetch_outlines())
-                            {
-                                match excerpts_to_fetch.entry(*buffer_id) {
-                                    hash_map::Entry::Occupied(mut o) => {
-                                        o.get_mut().1.insert(file_excerpt, excerpt.range.clone());
-                                    }
-                                    hash_map::Entry::Vacant(v) => {
-                                        if let Some(buffer_snapshot) =
-                                            self.buffer_snapshot_for_id(*buffer_id, cx)
-                                        {
-                                            v.insert((buffer_snapshot, HashMap::default()))
-                                                .1
-                                                .insert(file_excerpt, excerpt.range.clone());
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    FsEntry::Directory(..) => {}
-                }
-                excerpts_to_fetch
-            })
-    }
-
-    fn buffer_snapshot_for_id(&self, buffer_id: BufferId, cx: &App) -> Option<BufferSnapshot> {
-        let editor = self.active_editor()?;
-        Some(
-            editor
-                .read(cx)
-                .buffer()
-                .read(cx)
-                .buffer(buffer_id)?
-                .read(cx)
-                .snapshot(),
-        )
-    }
-
-    fn abs_path(&self, entry: &PanelEntry, cx: &App) -> Option<PathBuf> {
-        match entry {
-            PanelEntry::Fs(
-                FsEntry::File(FsEntryFile { buffer_id, .. })
-                | FsEntry::ExternalFile(FsEntryExternalFile { buffer_id, .. }),
-            ) => self
-                .buffer_snapshot_for_id(*buffer_id, cx)
-                .and_then(|buffer_snapshot| {
-                    let file = File::from_dyn(buffer_snapshot.file())?;
-                    Some(file.worktree.read(cx).absolutize(&file.path))
-                }),
-            PanelEntry::Fs(FsEntry::Directory(FsEntryDirectory {
-                worktree_id, entry, ..
-            })) => Some(
-                self.project
-                    .read(cx)
-                    .worktree_for_id(*worktree_id, cx)?
-                    .read(cx)
-                    .absolutize(&entry.path),
-            ),
-            PanelEntry::FoldedDirs(FoldedDirsEntry {
-                worktree_id,
-                entries: dirs,
-                ..
-            }) => dirs.last().and_then(|entry| {
-                self.project
-                    .read(cx)
-                    .worktree_for_id(*worktree_id, cx)
-                    .map(|worktree| worktree.read(cx).absolutize(&entry.path))
-            }),
-            PanelEntry::Search(_) | PanelEntry::Outline(..) => None,
-        }
-    }
-
-    fn relative_path(&self, entry: &FsEntry, cx: &App) -> Option<Arc<RelPath>> {
-        match entry {
-            FsEntry::ExternalFile(FsEntryExternalFile { buffer_id, .. }) => {
-                let buffer_snapshot = self.buffer_snapshot_for_id(*buffer_id, cx)?;
-                Some(buffer_snapshot.file()?.path().clone())
-            }
-            FsEntry::Directory(FsEntryDirectory { entry, .. }) => Some(entry.path.clone()),
-            FsEntry::File(FsEntryFile { entry, .. }) => Some(entry.path.clone()),
-        }
-    }
-
-    fn update_cached_entries(
-        &mut self,
-        debounce: Option<Duration>,
-        window: &mut Window,
-        cx: &mut Context<OutlinePanel>,
-    ) {
-        if !self.active {
-            return;
-        }
-
-        let is_singleton = self.is_singleton_active(cx);
-        let query = self.query(cx);
-        self.cached_entries_update_task = cx.spawn_in(window, async move |outline_panel, cx| {
-            if let Some(debounce) = debounce {
-                cx.background_executor().timer(debounce).await;
-            }
-            let Some(new_cached_entries) = outline_panel
-                .update_in(cx, |outline_panel, window, cx| {
-                    outline_panel.generate_cached_entries(is_singleton, query, window, cx)
-                })
-                .ok()
-            else {
-                return;
-            };
-            let (new_cached_entries, max_width_item_index) = new_cached_entries.await;
-            outline_panel
-                .update_in(cx, |outline_panel, window, cx| {
-                    outline_panel.cached_entries = new_cached_entries;
-                    outline_panel.max_width_item_index = max_width_item_index;
-                    if (outline_panel.selected_entry.is_invalidated()
-                        || matches!(outline_panel.selected_entry, SelectedEntry::None))
-                        && let Some(new_selected_entry) =
-                            outline_panel.active_editor().and_then(|active_editor| {
-                                outline_panel.location_for_editor_selection(
-                                    &active_editor,
-                                    window,
-                                    cx,
-                                )
-                            })
-                    {
-                        outline_panel.select_entry(new_selected_entry, false, window, cx);
-                    }
-
-                    outline_panel.autoscroll(cx);
-                    cx.notify();
-                })
-                .ok();
-        });
-    }
-
-    fn generate_cached_entries(
-        &self,
-        is_singleton: bool,
-        query: Option<String>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<(Vec<CachedEntry>, Option<usize>)> {
-        let project = self.project.clone();
-        let Some(active_editor) = self.active_editor() else {
-            return Task::ready((Vec::new(), None));
-        };
-        cx.spawn_in(window, async move |outline_panel, cx| {
-            let mut generation_state = GenerationState::default();
-
-            let Ok(()) = outline_panel.update(cx, |outline_panel, cx| {
-                let auto_fold_dirs = OutlinePanelSettings::get_global(cx).auto_fold_dirs;
-                let mut folded_dirs_entry = None::<(usize, FoldedDirsEntry)>;
-                let track_matches = query.is_some();
-
-                #[derive(Debug)]
-                struct ParentStats {
-                    path: Arc<RelPath>,
-                    folded: bool,
-                    expanded: bool,
-                    depth: usize,
-                }
-                let mut parent_dirs = Vec::<ParentStats>::new();
-                for entry in outline_panel.fs_entries.clone() {
-                    let is_expanded = outline_panel.is_expanded(&entry);
-                    let (depth, should_add) = match &entry {
-                        FsEntry::Directory(directory_entry) => {
-                            let mut should_add = true;
-                            let is_root = project
-                                .read(cx)
-                                .worktree_for_id(directory_entry.worktree_id, cx)
-                                .is_some_and(|worktree| {
-                                    worktree.read(cx).root_entry() == Some(&directory_entry.entry)
-                                });
-                            let folded = auto_fold_dirs
-                                && !is_root
-                                && outline_panel
-                                    .unfolded_dirs
-                                    .get(&directory_entry.worktree_id)
-                                    .is_none_or(|unfolded_dirs| {
-                                        !unfolded_dirs.contains(&directory_entry.entry.id)
-                                    });
-                            let fs_depth = outline_panel
-                                .fs_entries_depth
-                                .get(&(directory_entry.worktree_id, directory_entry.entry.id))
-                                .copied()
-                                .unwrap_or(0);
-                            while let Some(parent) = parent_dirs.last() {
-                                if !is_root && directory_entry.entry.path.starts_with(&parent.path)
-                                {
-                                    break;
-                                }
-                                parent_dirs.pop();
-                            }
-                            let auto_fold = match parent_dirs.last() {
-                                Some(parent) => {
-                                    parent.folded
-                                        && Some(parent.path.as_ref())
-                                            == directory_entry.entry.path.parent()
-                                        && outline_panel
-                                            .fs_children_count
-                                            .get(&directory_entry.worktree_id)
-                                            .and_then(|entries| {
-                                                entries.get(&directory_entry.entry.path)
-                                            })
-                                            .copied()
-                                            .unwrap_or_default()
-                                            .may_be_fold_part()
-                                }
-                                None => false,
-                            };
-                            let folded = folded || auto_fold;
-                            let (depth, parent_expanded, parent_folded) = match parent_dirs.last() {
-                                Some(parent) => {
-                                    let parent_folded = parent.folded;
-                                    let parent_expanded = parent.expanded;
-                                    let new_depth = if parent_folded {
-                                        parent.depth
-                                    } else {
-                                        parent.depth + 1
-                                    };
-                                    parent_dirs.push(ParentStats {
-                                        path: directory_entry.entry.path.clone(),
-                                        folded,
-                                        expanded: parent_expanded && is_expanded,
-                                        depth: new_depth,
-                                    });
-                                    (new_depth, parent_expanded, parent_folded)
-                                }
-                                None => {
-                                    parent_dirs.push(ParentStats {
-                                        path: directory_entry.entry.path.clone(),
-                                        folded,
-                                        expanded: is_expanded,
-                                        depth: fs_depth,
-                                    });
-                                    (fs_depth, true, false)
-                                }
-                            };
-
-                            if let Some((folded_depth, mut folded_dirs)) = folded_dirs_entry.take()
-                            {
-                                if folded
-                                    && directory_entry.worktree_id == folded_dirs.worktree_id
-                                    && directory_entry.entry.path.parent()
-                                        == folded_dirs
-                                            .entries
-                                            .last()
-                                            .map(|entry| entry.path.as_ref())
-                                {
-                                    folded_dirs.entries.push(directory_entry.entry.clone());
-                                    folded_dirs_entry = Some((folded_depth, folded_dirs))
-                                } else {
-                                    if !is_singleton {
-                                        let start_of_collapsed_dir_sequence = !parent_expanded
-                                            && parent_dirs
-                                                .iter()
-                                                .rev()
-                                                .nth(folded_dirs.entries.len() + 1)
-                                                .is_none_or(|parent| parent.expanded);
-                                        if start_of_collapsed_dir_sequence
-                                            || parent_expanded
-                                            || query.is_some()
-                                        {
-                                            if parent_folded {
-                                                folded_dirs
-                                                    .entries
-                                                    .push(directory_entry.entry.clone());
-                                                should_add = false;
-                                            }
-                                            let new_folded_dirs =
-                                                PanelEntry::FoldedDirs(folded_dirs.clone());
-                                            outline_panel.push_entry(
-                                                &mut generation_state,
-                                                track_matches,
-                                                new_folded_dirs,
-                                                folded_depth,
-                                                cx,
-                                            );
-                                        }
-                                    }
-
-                                    folded_dirs_entry = if parent_folded {
-                                        None
-                                    } else {
-                                        Some((
-                                            depth,
-                                            FoldedDirsEntry {
-                                                worktree_id: directory_entry.worktree_id,
-                                                entries: vec![directory_entry.entry.clone()],
-                                            },
-                                        ))
-                                    };
-                                }
-                            } else if folded {
-                                folded_dirs_entry = Some((
-                                    depth,
-                                    FoldedDirsEntry {
-                                        worktree_id: directory_entry.worktree_id,
-                                        entries: vec![directory_entry.entry.clone()],
-                                    },
-                                ));
-                            }
-
-                            let should_add =
-                                should_add && parent_expanded && folded_dirs_entry.is_none();
-                            (depth, should_add)
-                        }
-                        FsEntry::ExternalFile(..) => {
-                            if let Some((folded_depth, folded_dir)) = folded_dirs_entry.take() {
-                                let parent_expanded = parent_dirs
-                                    .iter()
-                                    .rev()
-                                    .find(|parent| {
-                                        folded_dir
-                                            .entries
-                                            .iter()
-                                            .all(|entry| entry.path != parent.path)
-                                    })
-                                    .is_none_or(|parent| parent.expanded);
-                                if !is_singleton && (parent_expanded || query.is_some()) {
-                                    outline_panel.push_entry(
-                                        &mut generation_state,
-                                        track_matches,
-                                        PanelEntry::FoldedDirs(folded_dir),
-                                        folded_depth,
-                                        cx,
-                                    );
-                                }
-                            }
-                            parent_dirs.clear();
-                            (0, true)
-                        }
-                        FsEntry::File(file) => {
-                            if let Some((folded_depth, folded_dirs)) = folded_dirs_entry.take() {
-                                let parent_expanded = parent_dirs
-                                    .iter()
-                                    .rev()
-                                    .find(|parent| {
-                                        folded_dirs
-                                            .entries
-                                            .iter()
-                                            .all(|entry| entry.path != parent.path)
-                                    })
-                                    .is_none_or(|parent| parent.expanded);
-                                if !is_singleton && (parent_expanded || query.is_some()) {
-                                    outline_panel.push_entry(
-                                        &mut generation_state,
-                                        track_matches,
-                                        PanelEntry::FoldedDirs(folded_dirs),
-                                        folded_depth,
-                                        cx,
-                                    );
-                                }
-                            }
-
-                            let fs_depth = outline_panel
-                                .fs_entries_depth
-                                .get(&(file.worktree_id, file.entry.id))
-                                .copied()
-                                .unwrap_or(0);
-                            while let Some(parent) = parent_dirs.last() {
-                                if file.entry.path.starts_with(&parent.path) {
-                                    break;
-                                }
-                                parent_dirs.pop();
-                            }
-                            match parent_dirs.last() {
-                                Some(parent) => {
-                                    let new_depth = parent.depth + 1;
-                                    (new_depth, parent.expanded)
-                                }
-                                None => (fs_depth, true),
-                            }
-                        }
-                    };
-
-                    if !is_singleton
-                        && (should_add || (query.is_some() && folded_dirs_entry.is_none()))
-                    {
-                        outline_panel.push_entry(
-                            &mut generation_state,
-                            track_matches,
-                            PanelEntry::Fs(entry.clone()),
-                            depth,
-                            cx,
-                        );
-                    }
-
-                    match outline_panel.mode {
-                        ItemsDisplayMode::Search(_) => {
-                            if is_singleton || query.is_some() || (should_add && is_expanded) {
-                                outline_panel.add_search_entries(
-                                    &mut generation_state,
-                                    &active_editor,
-                                    entry.clone(),
-                                    depth,
-                                    query.clone(),
-                                    is_singleton,
-                                    cx,
-                                );
-                            }
-                        }
-                        ItemsDisplayMode::Outline => {
-                            let excerpts_to_consider =
-                                if is_singleton || query.is_some() || (should_add && is_expanded) {
-                                    match &entry {
-                                        FsEntry::File(FsEntryFile {
-                                            buffer_id,
-                                            excerpts,
-                                            ..
-                                        })
-                                        | FsEntry::ExternalFile(FsEntryExternalFile {
-                                            buffer_id,
-                                            excerpts,
-                                            ..
-                                        }) => Some((*buffer_id, excerpts)),
-                                        _ => None,
-                                    }
-                                } else {
-                                    None
-                                };
-                            if let Some((buffer_id, entry_excerpts)) = excerpts_to_consider
-                                && !active_editor.read(cx).is_buffer_folded(buffer_id, cx)
-                            {
-                                outline_panel.add_excerpt_entries(
-                                    &mut generation_state,
-                                    buffer_id,
-                                    entry_excerpts,
-                                    depth,
-                                    track_matches,
-                                    is_singleton,
-                                    query.as_deref(),
-                                    cx,
-                                );
-                            }
-                        }
-                    }
-
-                    if is_singleton
-                        && matches!(entry, FsEntry::File(..) | FsEntry::ExternalFile(..))
-                        && !generation_state.entries.iter().any(|item| {
-                            matches!(item.entry, PanelEntry::Outline(..) | PanelEntry::Search(_))
-                        })
-                    {
-                        outline_panel.push_entry(
-                            &mut generation_state,
-                            track_matches,
-                            PanelEntry::Fs(entry.clone()),
-                            0,
-                            cx,
-                        );
-                    }
-                }
-
-                if let Some((folded_depth, folded_dirs)) = folded_dirs_entry.take() {
-                    let parent_expanded = parent_dirs
-                        .iter()
-                        .rev()
-                        .find(|parent| {
-                            folded_dirs
-                                .entries
-                                .iter()
-                                .all(|entry| entry.path != parent.path)
-                        })
-                        .is_none_or(|parent| parent.expanded);
-                    if parent_expanded || query.is_some() {
-                        outline_panel.push_entry(
-                            &mut generation_state,
-                            track_matches,
-                            PanelEntry::FoldedDirs(folded_dirs),
-                            folded_depth,
-                            cx,
-                        );
-                    }
-                }
-            }) else {
-                return (Vec::new(), None);
-            };
-
-            let Some(query) = query else {
-                return (
-                    generation_state.entries,
-                    generation_state
-                        .max_width_estimate_and_index
-                        .map(|(_, index)| index),
-                );
-            };
-
-            let mut matched_ids = match_strings(
-                &generation_state.match_candidates,
-                &query,
-                true,
-                true,
-                usize::MAX,
-                &AtomicBool::default(),
-                cx.background_executor().clone(),
-            )
-            .await
-            .into_iter()
-            .map(|string_match| (string_match.candidate_id, string_match))
-            .collect::<HashMap<_, _>>();
-
-            let mut id = 0;
-            generation_state.entries.retain_mut(|cached_entry| {
-                let retain = match matched_ids.remove(&id) {
-                    Some(string_match) => {
-                        cached_entry.string_match = Some(string_match);
-                        true
-                    }
-                    None => false,
-                };
-                id += 1;
-                retain
-            });
-
-            (
-                generation_state.entries,
-                generation_state
-                    .max_width_estimate_and_index
-                    .map(|(_, index)| index),
-            )
-        })
-    }
-
-    fn push_entry(
-        &self,
-        state: &mut GenerationState,
-        track_matches: bool,
-        entry: PanelEntry,
-        depth: usize,
-        cx: &mut App,
-    ) {
-        let entry = if let PanelEntry::FoldedDirs(folded_dirs_entry) = &entry {
-            match folded_dirs_entry.entries.len() {
-                0 => {
-                    debug_panic!("Empty folded dirs receiver");
-                    return;
-                }
-                1 => PanelEntry::Fs(FsEntry::Directory(FsEntryDirectory {
-                    worktree_id: folded_dirs_entry.worktree_id,
-                    entry: folded_dirs_entry.entries[0].clone(),
-                })),
-                _ => entry,
-            }
-        } else {
-            entry
-        };
-
-        if track_matches {
-            let id = state.entries.len();
-            match &entry {
-                PanelEntry::Fs(fs_entry) => {
-                    if let Some(file_name) = self
-                        .relative_path(fs_entry, cx)
-                        .and_then(|path| Some(path.file_name()?.to_string()))
-                    {
-                        state
-                            .match_candidates
-                            .push(StringMatchCandidate::new(id, &file_name));
-                    }
-                }
-                PanelEntry::FoldedDirs(folded_dir_entry) => {
-                    let dir_names = self.dir_names_string(
-                        &folded_dir_entry.entries,
-                        folded_dir_entry.worktree_id,
-                        cx,
-                    );
-                    {
-                        state
-                            .match_candidates
-                            .push(StringMatchCandidate::new(id, &dir_names));
-                    }
-                }
-                PanelEntry::Outline(OutlineEntry::Outline(outline_entry)) => state
-                    .match_candidates
-                    .push(StringMatchCandidate::new(id, &outline_entry.outline.text)),
-                PanelEntry::Outline(OutlineEntry::Excerpt(_)) => {}
-                PanelEntry::Search(new_search_entry) => {
-                    if let Some(search_data) = new_search_entry.render_data.get() {
-                        state
-                            .match_candidates
-                            .push(StringMatchCandidate::new(id, &search_data.context_text));
-                    }
-                }
-            }
-        }
-
-        let width_estimate = self.width_estimate(depth, &entry, cx);
-        if Some(width_estimate)
-            > state
-                .max_width_estimate_and_index
-                .map(|(estimate, _)| estimate)
-        {
-            state.max_width_estimate_and_index = Some((width_estimate, state.entries.len()));
-        }
-        state.entries.push(CachedEntry {
-            depth,
-            entry,
-            string_match: None,
-        });
-    }
-
-    fn dir_names_string(&self, entries: &[GitEntry], worktree_id: WorktreeId, cx: &App) -> String {
-        let dir_names_segment = entries
-            .iter()
-            .map(|entry| self.entry_name(&worktree_id, entry, cx))
-            .collect::<PathBuf>();
-        dir_names_segment.to_string_lossy().into_owned()
-    }
-
-    fn query(&self, cx: &App) -> Option<String> {
-        let query = self.filter_editor.read(cx).text(cx);
-        if query.trim().is_empty() {
-            None
-        } else {
-            Some(query)
-        }
-    }
-
-    fn is_expanded(&self, entry: &FsEntry) -> bool {
-        let entry_to_check = match entry {
-            FsEntry::ExternalFile(FsEntryExternalFile { buffer_id, .. }) => {
-                CollapsedEntry::ExternalFile(*buffer_id)
-            }
-            FsEntry::File(FsEntryFile {
-                worktree_id,
-                buffer_id,
-                ..
-            }) => CollapsedEntry::File(*worktree_id, *buffer_id),
-            FsEntry::Directory(FsEntryDirectory {
-                worktree_id, entry, ..
-            }) => CollapsedEntry::Dir(*worktree_id, entry.id),
-        };
-        !self.collapsed_entries.contains(&entry_to_check)
-    }
-
-    fn update_non_fs_items(&mut self, window: &mut Window, cx: &mut Context<OutlinePanel>) -> bool {
-        if !self.active {
-            return false;
-        }
-
-        let mut update_cached_items = false;
-        update_cached_items |= self.update_search_matches(window, cx);
-        self.fetch_outdated_outlines(window, cx);
-        if update_cached_items {
-            self.selected_entry.invalidate();
-        }
-        update_cached_items
-    }
-
-    fn update_search_matches(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<OutlinePanel>,
-    ) -> bool {
-        if !self.active {
-            return false;
-        }
-
-        let project_search = self
-            .active_item()
-            .and_then(|item| item.downcast::<ProjectSearchView>());
-        let project_search_matches = project_search
-            .as_ref()
-            .map(|project_search| project_search.read(cx).get_matches(cx))
-            .unwrap_or_default();
-
-        let buffer_search = self
-            .active_item()
-            .as_deref()
-            .and_then(|active_item| {
-                self.workspace
-                    .upgrade()
-                    .and_then(|workspace| workspace.read(cx).pane_for(active_item))
-            })
-            .and_then(|pane| {
-                pane.read(cx)
-                    .toolbar()
-                    .read(cx)
-                    .item_of_type::<BufferSearchBar>()
-            });
-        let buffer_search_matches = self
-            .active_editor()
-            .map(|active_editor| {
-                active_editor.update(cx, |editor, cx| editor.get_matches(window, cx))
-            })
-            .unwrap_or_default();
-
-        let mut update_cached_entries = false;
-        if buffer_search_matches.is_empty() && project_search_matches.is_empty() {
-            if matches!(self.mode, ItemsDisplayMode::Search(_)) {
-                self.mode = ItemsDisplayMode::Outline;
-                update_cached_entries = true;
-            }
-        } else {
-            let (kind, new_search_matches, new_search_query) = if buffer_search_matches.is_empty() {
-                (
-                    SearchKind::Project,
-                    project_search_matches,
-                    project_search
-                        .map(|project_search| project_search.read(cx).search_query_text(cx))
-                        .unwrap_or_default(),
-                )
-            } else {
-                (
-                    SearchKind::Buffer,
-                    buffer_search_matches,
-                    buffer_search
-                        .map(|buffer_search| buffer_search.read(cx).query(cx))
-                        .unwrap_or_default(),
-                )
-            };
-
-            let mut previous_matches = HashMap::default();
-            update_cached_entries = match &mut self.mode {
-                ItemsDisplayMode::Search(current_search_state) => {
-                    let update = current_search_state.query != new_search_query
-                        || current_search_state.kind != kind
-                        || current_search_state.matches.is_empty()
-                        || current_search_state.matches.iter().enumerate().any(
-                            |(i, (match_range, _))| new_search_matches.get(i) != Some(match_range),
-                        );
-                    if current_search_state.kind == kind {
-                        previous_matches.extend(current_search_state.matches.drain(..));
-                    }
-                    update
-                }
-                ItemsDisplayMode::Outline => true,
-            };
-            self.mode = ItemsDisplayMode::Search(SearchState::new(
-                kind,
-                new_search_query,
-                previous_matches,
-                new_search_matches,
-                cx.theme().syntax().clone(),
-                window,
-                cx,
-            ));
-        }
-        update_cached_entries
-    }
-
-    fn add_excerpt_entries(
-        &mut self,
-        state: &mut GenerationState,
-        buffer_id: BufferId,
-        entries_to_add: &[ExcerptId],
-        parent_depth: usize,
-        track_matches: bool,
-        is_singleton: bool,
-        query: Option<&str>,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(excerpts) = self.excerpts.get(&buffer_id) {
-            let buffer_snapshot = self.buffer_snapshot_for_id(buffer_id, cx);
-
-            for &excerpt_id in entries_to_add {
-                let Some(excerpt) = excerpts.get(&excerpt_id) else {
-                    continue;
-                };
-                let excerpt_depth = parent_depth + 1;
-                self.push_entry(
-                    state,
-                    track_matches,
-                    PanelEntry::Outline(OutlineEntry::Excerpt(OutlineEntryExcerpt {
-                        buffer_id,
-                        id: excerpt_id,
-                        range: excerpt.range.clone(),
-                    })),
-                    excerpt_depth,
-                    cx,
-                );
-
-                let mut outline_base_depth = excerpt_depth + 1;
-                if is_singleton {
-                    outline_base_depth = 0;
-                    state.clear();
-                } else if query.is_none()
-                    && self
-                        .collapsed_entries
-                        .contains(&CollapsedEntry::Excerpt(buffer_id, excerpt_id))
-                {
-                    continue;
-                }
-
-                let mut last_depth_at_level: Vec<Option<Range<Anchor>>> = vec![None; 10];
-
-                let all_outlines: Vec<_> = excerpt.iter_outlines().collect();
-
-                let mut outline_has_children = HashMap::default();
-                let mut visible_outlines = Vec::new();
-                let mut collapsed_state: Option<(usize, Range<Anchor>)> = None;
-
-                for (i, &outline) in all_outlines.iter().enumerate() {
-                    let has_children = all_outlines
-                        .get(i + 1)
-                        .map(|next| next.depth > outline.depth)
-                        .unwrap_or(false);
-
-                    outline_has_children
-                        .insert((outline.range.clone(), outline.depth), has_children);
-
-                    let mut should_include = true;
-
-                    if let Some((collapsed_depth, collapsed_range)) = &collapsed_state {
-                        if outline.depth <= *collapsed_depth {
-                            collapsed_state = None;
-                        } else if let Some(buffer_snapshot) = buffer_snapshot.as_ref() {
-                            let outline_start = outline.range.start;
-                            if outline_start
-                                .cmp(&collapsed_range.start, buffer_snapshot)
-                                .is_ge()
-                                && outline_start
-                                    .cmp(&collapsed_range.end, buffer_snapshot)
-                                    .is_lt()
-                            {
-                                should_include = false; // Skip - inside collapsed range
-                            } else {
-                                collapsed_state = None;
-                            }
-                        }
-                    }
-
-                    // Check if this outline itself is collapsed
-                    if should_include
-                        && self.collapsed_entries.contains(&CollapsedEntry::Outline(
-                            buffer_id,
-                            excerpt_id,
-                            outline.range.clone(),
-                        ))
-                    {
-                        collapsed_state = Some((outline.depth, outline.range.clone()));
-                    }
-
-                    if should_include {
-                        visible_outlines.push(outline);
-                    }
-                }
-
-                self.outline_children_cache
-                    .entry(buffer_id)
-                    .or_default()
-                    .extend(outline_has_children);
-
-                for outline in visible_outlines {
-                    let outline_entry = OutlineEntryOutline {
-                        buffer_id,
-                        excerpt_id,
-                        outline: outline.clone(),
-                    };
-
-                    if outline.depth < last_depth_at_level.len() {
-                        last_depth_at_level[outline.depth] = Some(outline.range.clone());
-                        // Clear deeper levels when we go back to a shallower depth
-                        for d in (outline.depth + 1)..last_depth_at_level.len() {
-                            last_depth_at_level[d] = None;
-                        }
-                    }
-
-                    self.push_entry(
-                        state,
-                        track_matches,
-                        PanelEntry::Outline(OutlineEntry::Outline(outline_entry)),
-                        outline_base_depth + outline.depth,
-                        cx,
-                    );
-                }
-            }
-        }
-    }
-
-    fn add_search_entries(
-        &mut self,
-        state: &mut GenerationState,
-        active_editor: &Entity<Editor>,
-        parent_entry: FsEntry,
-        parent_depth: usize,
-        filter_query: Option<String>,
-        is_singleton: bool,
-        cx: &mut Context<Self>,
-    ) {
-        let ItemsDisplayMode::Search(search_state) = &mut self.mode else {
-            return;
-        };
-
-        let kind = search_state.kind;
-        let related_excerpts = match &parent_entry {
-            FsEntry::Directory(_) => return,
-            FsEntry::ExternalFile(external) => &external.excerpts,
-            FsEntry::File(file) => &file.excerpts,
-        }
-        .iter()
-        .copied()
-        .collect::<HashSet<_>>();
-
-        let depth = if is_singleton { 0 } else { parent_depth + 1 };
-        let new_search_matches = search_state
-            .matches
-            .iter()
-            .filter(|(match_range, _)| {
-                related_excerpts.contains(&match_range.start.excerpt_id)
-                    || related_excerpts.contains(&match_range.end.excerpt_id)
-            })
-            .filter(|(match_range, _)| {
-                let editor = active_editor.read(cx);
-                let snapshot = editor.buffer().read(cx).snapshot(cx);
-                if let Some(buffer_id) = snapshot.buffer_id_for_anchor(match_range.start)
-                    && editor.is_buffer_folded(buffer_id, cx)
-                {
-                    return false;
-                }
-                if let Some(buffer_id) = snapshot.buffer_id_for_anchor(match_range.end)
-                    && editor.is_buffer_folded(buffer_id, cx)
-                {
-                    return false;
-                }
-                true
-            });
-
-        let new_search_entries = new_search_matches
-            .map(|(match_range, search_data)| SearchEntry {
-                match_range: match_range.clone(),
-                kind,
-                render_data: Arc::clone(search_data),
-            })
-            .collect::<Vec<_>>();
-        for new_search_entry in new_search_entries {
-            self.push_entry(
-                state,
-                filter_query.is_some(),
-                PanelEntry::Search(new_search_entry),
-                depth,
-                cx,
-            );
-        }
-    }
-
-    fn active_editor(&self) -> Option<Entity<Editor>> {
-        self.active_item.as_ref()?.active_editor.upgrade()
-    }
-
-    fn active_item(&self) -> Option<Box<dyn ItemHandle>> {
-        self.active_item.as_ref()?.item_handle.upgrade()
-    }
-
-    fn should_replace_active_item(&self, new_active_item: &dyn ItemHandle) -> bool {
-        self.active_item().is_none_or(|active_item| {
-            !self.pinned && active_item.item_id() != new_active_item.item_id()
-        })
-    }
-
-    pub fn toggle_active_editor_pin(
-        &mut self,
-        _: &ToggleActiveEditorPin,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.pinned = !self.pinned;
-        if !self.pinned
-            && let Some((active_item, active_editor)) = self
-                .workspace
-                .upgrade()
-                .and_then(|workspace| workspace_active_editor(workspace.read(cx), cx))
-            && self.should_replace_active_item(active_item.as_ref())
-        {
-            self.replace_active_editor(active_item, active_editor, window, cx);
-        }
-
-        cx.notify();
-    }
-
-    fn selected_entry(&self) -> Option<&PanelEntry> {
-        match &self.selected_entry {
-            SelectedEntry::Invalidated(entry) => entry.as_ref(),
-            SelectedEntry::Valid(entry, _) => Some(entry),
-            SelectedEntry::None => None,
-        }
-    }
-
-    fn select_entry(
-        &mut self,
-        entry: PanelEntry,
-        focus: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if focus {
-            self.focus_handle.focus(window);
-        }
-        let ix = self
-            .cached_entries
-            .iter()
-            .enumerate()
-            .find(|(_, cached_entry)| &cached_entry.entry == &entry)
-            .map(|(i, _)| i)
-            .unwrap_or_default();
-
-        self.selected_entry = SelectedEntry::Valid(entry, ix);
-
-        self.autoscroll(cx);
-        cx.notify();
-    }
-
-    fn width_estimate(&self, depth: usize, entry: &PanelEntry, cx: &App) -> u64 {
-        let item_text_chars = match entry {
-            PanelEntry::Fs(FsEntry::ExternalFile(external)) => self
-                .buffer_snapshot_for_id(external.buffer_id, cx)
-                .and_then(|snapshot| Some(snapshot.file()?.path().file_name()?.len()))
-                .unwrap_or_default(),
-            PanelEntry::Fs(FsEntry::Directory(directory)) => directory
-                .entry
-                .path
-                .file_name()
-                .map(|name| name.len())
-                .unwrap_or_default(),
-            PanelEntry::Fs(FsEntry::File(file)) => file
-                .entry
-                .path
-                .file_name()
-                .map(|name| name.len())
-                .unwrap_or_default(),
-            PanelEntry::FoldedDirs(folded_dirs) => {
-                folded_dirs
-                    .entries
-                    .iter()
-                    .map(|dir| {
-                        dir.path
-                            .file_name()
-                            .map(|name| name.len())
-                            .unwrap_or_default()
-                    })
-                    .sum::<usize>()
-                    + folded_dirs.entries.len().saturating_sub(1) * "/".len()
-            }
-            PanelEntry::Outline(OutlineEntry::Excerpt(excerpt)) => self
-                .excerpt_label(excerpt.buffer_id, &excerpt.range, cx)
-                .map(|label| label.len())
-                .unwrap_or_default(),
-            PanelEntry::Outline(OutlineEntry::Outline(entry)) => entry.outline.text.len(),
-            PanelEntry::Search(search) => search
-                .render_data
-                .get()
-                .map(|data| data.context_text.len())
-                .unwrap_or_default(),
-        };
-
-        (item_text_chars + depth) as u64
-    }
-
-    fn render_main_contents(
-        &mut self,
-        query: Option<String>,
-        show_indent_guides: bool,
-        indent_size: f32,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let contents = if self.cached_entries.is_empty() {
-            let header = if query.is_some() {
-                "No matches for query"
-            } else {
-                "No outlines available"
-            };
-
-            v_flex()
-                .id("empty-outline-state")
-                .gap_0p5()
-                .flex_1()
-                .justify_center()
-                .size_full()
-                .child(h_flex().justify_center().child(Label::new(header)))
-                .when_some(query, |panel, query| {
-                    panel.child(
-                        h_flex()
-                            .px_0p5()
-                            .justify_center()
-                            .bg(cx.theme().colors().element_selected.opacity(0.2))
-                            .child(Label::new(query)),
-                    )
-                })
-                .child(h_flex().justify_center().child({
-                    let keystroke = match self.position(window, cx) {
-                        DockPosition::Left => window.keystroke_text_for(&workspace::ToggleLeftDock),
-                        DockPosition::Bottom => {
-                            window.keystroke_text_for(&workspace::ToggleBottomDock)
-                        }
-                        DockPosition::Right => {
-                            window.keystroke_text_for(&workspace::ToggleRightDock)
-                        }
-                    };
-                    Label::new(format!("Toggle Panel With {keystroke}")).color(Color::Muted)
-                }))
-        } else {
-            let list_contents = {
-                let items_len = self.cached_entries.len();
-                let multi_buffer_snapshot = self
-                    .active_editor()
-                    .map(|editor| editor.read(cx).buffer().read(cx).snapshot(cx));
-                uniform_list(
-                    "entries",
-                    items_len,
-                    cx.processor(move |outline_panel, range: Range<usize>, window, cx| {
-                        let entries = outline_panel.cached_entries.get(range);
-                        entries
-                            .map(|entries| entries.to_vec())
-                            .unwrap_or_default()
-                            .into_iter()
-                            .filter_map(|cached_entry| match cached_entry.entry {
-                                PanelEntry::Fs(entry) => Some(outline_panel.render_entry(
-                                    &entry,
-                                    cached_entry.depth,
-                                    cached_entry.string_match.as_ref(),
-                                    window,
-                                    cx,
-                                )),
-                                PanelEntry::FoldedDirs(folded_dirs_entry) => {
-                                    Some(outline_panel.render_folded_dirs(
-                                        &folded_dirs_entry,
-                                        cached_entry.depth,
-                                        cached_entry.string_match.as_ref(),
-                                        window,
-                                        cx,
-                                    ))
-                                }
-                                PanelEntry::Outline(OutlineEntry::Excerpt(excerpt)) => {
-                                    outline_panel.render_excerpt(
-                                        &excerpt,
-                                        cached_entry.depth,
-                                        window,
-                                        cx,
-                                    )
-                                }
-                                PanelEntry::Outline(OutlineEntry::Outline(entry)) => {
-                                    Some(outline_panel.render_outline(
-                                        &entry,
-                                        cached_entry.depth,
-                                        cached_entry.string_match.as_ref(),
-                                        window,
-                                        cx,
-                                    ))
-                                }
-                                PanelEntry::Search(SearchEntry {
-                                    match_range,
-                                    render_data,
-                                    kind,
-                                    ..
-                                }) => outline_panel.render_search_match(
-                                    multi_buffer_snapshot.as_ref(),
-                                    &match_range,
-                                    &render_data,
-                                    kind,
-                                    cached_entry.depth,
-                                    cached_entry.string_match.as_ref(),
-                                    window,
-                                    cx,
-                                ),
-                            })
-                            .collect()
-                    }),
-                )
-                .with_sizing_behavior(ListSizingBehavior::Infer)
-                .with_horizontal_sizing_behavior(ListHorizontalSizingBehavior::Unconstrained)
-                .with_width_from_item(self.max_width_item_index)
-                .track_scroll(&self.scroll_handle)
-                .when(show_indent_guides, |list| {
-                    list.with_decoration(
-                        ui::indent_guides(px(indent_size), IndentGuideColors::panel(cx))
-                            .with_compute_indents_fn(cx.entity(), |outline_panel, range, _, _| {
-                                let entries = outline_panel.cached_entries.get(range);
-                                if let Some(entries) = entries {
-                                    entries.iter().map(|item| item.depth).collect()
-                                } else {
-                                    smallvec::SmallVec::new()
-                                }
-                            })
-                            .with_render_fn(cx.entity(), move |outline_panel, params, _, _| {
-                                const LEFT_OFFSET: Pixels = px(14.);
-
-                                let indent_size = params.indent_size;
-                                let item_height = params.item_height;
-                                let active_indent_guide_ix = find_active_indent_guide_ix(
-                                    outline_panel,
-                                    &params.indent_guides,
-                                );
-
-                                params
-                                    .indent_guides
-                                    .into_iter()
-                                    .enumerate()
-                                    .map(|(ix, layout)| {
-                                        let bounds = Bounds::new(
-                                            point(
-                                                layout.offset.x * indent_size + LEFT_OFFSET,
-                                                layout.offset.y * item_height,
-                                            ),
-                                            size(px(1.), layout.length * item_height),
-                                        );
-                                        ui::RenderedIndentGuide {
-                                            bounds,
-                                            layout,
-                                            is_active: active_indent_guide_ix == Some(ix),
-                                            hitbox: None,
-                                        }
-                                    })
-                                    .collect()
-                            }),
-                    )
-                })
-            };
-
-            v_flex()
-                .flex_shrink()
-                .size_full()
-                .child(list_contents.size_full().flex_shrink())
-                .custom_scrollbars(
-                    Scrollbars::for_settings::<OutlinePanelSettings>()
-                        .tracked_scroll_handle(&self.scroll_handle.clone())
-                        .with_track_along(
-                            ScrollAxes::Horizontal,
-                            cx.theme().colors().panel_background,
-                        )
-                        .tracked_entity(cx.entity_id()),
-                    window,
-                    cx,
-                )
-        }
-        .children(self.context_menu.as_ref().map(|(menu, position, _)| {
-            deferred(
-                anchored()
-                    .position(*position)
-                    .anchor(gpui::Corner::TopLeft)
-                    .child(menu.clone()),
-            )
-            .with_priority(1)
-        }));
-
-        v_flex().w_full().flex_1().overflow_hidden().child(contents)
-    }
-
-    fn render_filter_footer(&mut self, pinned: bool, cx: &mut Context<Self>) -> Div {
-        let (icon, icon_tooltip) = if pinned {
-            (IconName::Unpin, "Unpin Outline")
-        } else {
-            (IconName::Pin, "Pin Active Outline")
-        };
-
-        h_flex()
-            .p_2()
-            .h(Tab::container_height(cx))
-            .justify_between()
-            .border_b_1()
-            .border_color(cx.theme().colors().border)
-            .child(
-                h_flex()
-                    .w_full()
-                    .gap_1p5()
-                    .child(
-                        Icon::new(IconName::MagnifyingGlass)
-                            .size(IconSize::Small)
-                            .color(Color::Muted),
-                    )
-                    .child(self.filter_editor.clone()),
-            )
-            .child(
-                IconButton::new("pin_button", icon)
-                    .tooltip(Tooltip::text(icon_tooltip))
-                    .shape(IconButtonShape::Square)
-                    .on_click(cx.listener(|outline_panel, _, window, cx| {
-                        outline_panel.toggle_active_editor_pin(&ToggleActiveEditorPin, window, cx);
-                    })),
-            )
-    }
-
-    fn buffers_inside_directory(
-        &self,
-        dir_worktree: WorktreeId,
-        dir_entry: &GitEntry,
-    ) -> HashSet<BufferId> {
-        if !dir_entry.is_dir() {
-            debug_panic!("buffers_inside_directory called on a non-directory entry {dir_entry:?}");
-            return HashSet::default();
-        }
-
-        self.fs_entries
-            .iter()
-            .skip_while(|fs_entry| match fs_entry {
-                FsEntry::Directory(directory) => {
-                    directory.worktree_id != dir_worktree || &directory.entry != dir_entry
-                }
-                _ => true,
-            })
-            .skip(1)
-            .take_while(|fs_entry| match fs_entry {
-                FsEntry::ExternalFile(..) => false,
-                FsEntry::Directory(directory) => {
-                    directory.worktree_id == dir_worktree
-                        && directory.entry.path.starts_with(&dir_entry.path)
-                }
-                FsEntry::File(file) => {
-                    file.worktree_id == dir_worktree && file.entry.path.starts_with(&dir_entry.path)
-                }
-            })
-            .filter_map(|fs_entry| match fs_entry {
-                FsEntry::File(file) => Some(file.buffer_id),
-                _ => None,
-            })
-            .collect()
-    }
-}
-
-fn workspace_active_editor(
-    workspace: &Workspace,
-    cx: &App,
-) -> Option<(Box<dyn ItemHandle>, Entity<Editor>)> {
-    let active_item = workspace.active_item(cx)?;
-    let active_editor = active_item
-        .act_as::<Editor>(cx)
-        .filter(|editor| editor.read(cx).mode().is_full())?;
-    Some((active_item, active_editor))
-}
-
-fn back_to_common_visited_parent(
-    visited_dirs: &mut Vec<(ProjectEntryId, Arc<RelPath>)>,
-    worktree_id: &WorktreeId,
-    new_entry: &Entry,
-) -> Option<(WorktreeId, ProjectEntryId)> {
-    while let Some((visited_dir_id, visited_path)) = visited_dirs.last() {
-        match new_entry.path.parent() {
-            Some(parent_path) => {
-                if parent_path == visited_path.as_ref() {
-                    return Some((*worktree_id, *visited_dir_id));
-                }
-            }
-            None => {
-                break;
-            }
-        }
-        visited_dirs.pop();
-    }
-    None
-}
-
-fn file_name(path: &Path) -> String {
-    let mut current_path = path;
-    loop {
-        if let Some(file_name) = current_path.file_name() {
-            return file_name.to_string_lossy().into_owned();
-        }
-        match current_path.parent() {
-            Some(parent) => current_path = parent,
-            None => return path.to_string_lossy().into_owned(),
-        }
-    }
-}
-
-impl Panel for OutlinePanel {
-    fn persistent_name() -> &'static str {
-        "Outline Panel"
-    }
-
-    fn panel_key() -> &'static str {
-        OUTLINE_PANEL_KEY
-    }
-
-    fn position(&self, _: &Window, cx: &App) -> DockPosition {
-        match OutlinePanelSettings::get_global(cx).dock {
-            DockSide::Left => DockPosition::Left,
-            DockSide::Right => DockPosition::Right,
-        }
-    }
-
-    fn position_is_valid(&self, position: DockPosition) -> bool {
-        matches!(position, DockPosition::Left | DockPosition::Right)
-    }
-
-    fn set_position(&mut self, position: DockPosition, _: &mut Window, cx: &mut Context<Self>) {
-        settings::update_settings_file(self.fs.clone(), cx, move |settings, _| {
-            let dock = match position {
-                DockPosition::Left | DockPosition::Bottom => DockSide::Left,
-                DockPosition::Right => DockSide::Right,
-            };
-            settings.outline_panel.get_or_insert_default().dock = Some(dock);
-        });
-    }
-
-    fn size(&self, _: &Window, cx: &App) -> Pixels {
-        self.width
-            .unwrap_or_else(|| OutlinePanelSettings::get_global(cx).default_width)
-    }
-
-    fn set_size(&mut self, size: Option<Pixels>, window: &mut Window, cx: &mut Context<Self>) {
-        self.width = size;
-        cx.notify();
-        cx.defer_in(window, |this, _, cx| {
-            this.serialize(cx);
-        });
-    }
-
-    fn icon(&self, _: &Window, cx: &App) -> Option<IconName> {
-        OutlinePanelSettings::get_global(cx)
-            .button
-            .then_some(IconName::ListTree)
-    }
-
-    fn icon_tooltip(&self, _window: &Window, _: &App) -> Option<&'static str> {
-        Some("Outline Panel")
-    }
-
-    fn toggle_action(&self) -> Box<dyn Action> {
-        Box::new(ToggleFocus)
-    }
-
-    fn starts_open(&self, _window: &Window, _: &App) -> bool {
-        self.active
-    }
-
-    fn set_active(&mut self, active: bool, window: &mut Window, cx: &mut Context<Self>) {
-        cx.spawn_in(window, async move |outline_panel, cx| {
-            outline_panel
-                .update_in(cx, |outline_panel, window, cx| {
-                    let old_active = outline_panel.active;
-                    outline_panel.active = active;
-                    if old_active != active {
-                        if active
-                            && let Some((active_item, active_editor)) =
-                                outline_panel.workspace.upgrade().and_then(|workspace| {
-                                    workspace_active_editor(workspace.read(cx), cx)
-                                })
-                        {
-                            if outline_panel.should_replace_active_item(active_item.as_ref()) {
-                                outline_panel.replace_active_editor(
-                                    active_item,
-                                    active_editor,
-                                    window,
-                                    cx,
-                                );
-                            } else {
-                                outline_panel.update_fs_entries(active_editor, None, window, cx)
-                            }
-                            return;
-                        }
-
-                        if !outline_panel.pinned {
-                            outline_panel.clear_previous(window, cx);
-                        }
-                    }
-                    outline_panel.serialize(cx);
-                })
-                .ok();
-        })
-        .detach()
-    }
-
-    fn activation_priority(&self) -> u32 {
-        5
-    }
-}
-
-impl Focusable for OutlinePanel {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        self.filter_editor.focus_handle(cx)
-    }
-}
-
-impl EventEmitter<Event> for OutlinePanel {}
-
-impl EventEmitter<PanelEvent> for OutlinePanel {}
-
-impl Render for OutlinePanel {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let (is_local, is_via_ssh) = self.project.read_with(cx, |project, _| {
-            (project.is_local(), project.is_via_remote_server())
-        });
-        let query = self.query(cx);
-        let pinned = self.pinned;
-        let settings = OutlinePanelSettings::get_global(cx);
-        let indent_size = settings.indent_size;
-        let show_indent_guides = settings.indent_guides.show == ShowIndentGuides::Always;
-
-        let search_query = match &self.mode {
-            ItemsDisplayMode::Search(search_query) => Some(search_query),
-            _ => None,
-        };
-
-        let search_query_text = search_query.map(|sq| sq.query.to_string());
-
-        v_flex()
-            .id("outline-panel")
-            .size_full()
-            .overflow_hidden()
-            .relative()
-            .key_context(self.dispatch_context(window, cx))
-            .on_action(cx.listener(Self::open_selected_entry))
-            .on_action(cx.listener(Self::cancel))
-            .on_action(cx.listener(Self::select_next))
-            .on_action(cx.listener(Self::select_previous))
-            .on_action(cx.listener(Self::select_first))
-            .on_action(cx.listener(Self::select_last))
-            .on_action(cx.listener(Self::select_parent))
-            .on_action(cx.listener(Self::expand_selected_entry))
-            .on_action(cx.listener(Self::collapse_selected_entry))
-            .on_action(cx.listener(Self::expand_all_entries))
-            .on_action(cx.listener(Self::collapse_all_entries))
-            .on_action(cx.listener(Self::copy_path))
-            .on_action(cx.listener(Self::copy_relative_path))
-            .on_action(cx.listener(Self::toggle_active_editor_pin))
-            .on_action(cx.listener(Self::unfold_directory))
-            .on_action(cx.listener(Self::fold_directory))
-            .on_action(cx.listener(Self::open_excerpts))
-            .on_action(cx.listener(Self::open_excerpts_split))
-            .when(is_local, |el| {
-                el.on_action(cx.listener(Self::reveal_in_finder))
-            })
-            .when(is_local || is_via_ssh, |el| {
-                el.on_action(cx.listener(Self::open_in_terminal))
-            })
-            .on_mouse_down(
-                MouseButton::Right,
-                cx.listener(move |outline_panel, event: &MouseDownEvent, window, cx| {
-                    if let Some(entry) = outline_panel.selected_entry().cloned() {
-                        outline_panel.deploy_context_menu(event.position, entry, window, cx)
-                    } else if let Some(entry) = outline_panel.fs_entries.first().cloned() {
-                        outline_panel.deploy_context_menu(
-                            event.position,
-                            PanelEntry::Fs(entry),
-                            window,
-                            cx,
-                        )
-                    }
-                }),
-            )
-            .track_focus(&self.focus_handle)
-            .child(self.render_filter_footer(pinned, cx))
-            .when_some(search_query_text, |outline_panel, query_text| {
-                outline_panel.child(
-                    h_flex()
-                        .py_1p5()
-                        .px_2()
-                        .h(Tab::container_height(cx))
-                        .gap_0p5()
-                        .border_b_1()
-                        .border_color(cx.theme().colors().border_variant)
-                        .child(Label::new("Searching:").color(Color::Muted))
-                        .child(Label::new(query_text)),
-                )
-            })
-            .child(self.render_main_contents(query, show_indent_guides, indent_size, window, cx))
-    }
-}
-
-fn find_active_indent_guide_ix(
-    outline_panel: &OutlinePanel,
-    candidates: &[IndentGuideLayout],
-) -> Option<usize> {
-    let SelectedEntry::Valid(_, target_ix) = &outline_panel.selected_entry else {
-        return None;
-    };
-    let target_depth = outline_panel
-        .cached_entries
-        .get(*target_ix)
-        .map(|cached_entry| cached_entry.depth)?;
-
-    let (target_ix, target_depth) = if let Some(target_depth) = outline_panel
-        .cached_entries
-        .get(target_ix + 1)
-        .filter(|cached_entry| cached_entry.depth > target_depth)
-        .map(|entry| entry.depth)
-    {
-        (target_ix + 1, target_depth.saturating_sub(1))
-    } else {
-        (*target_ix, target_depth.saturating_sub(1))
-    };
-
-    candidates
-        .iter()
-        .enumerate()
-        .find(|(_, guide)| {
-            guide.offset.y <= target_ix
-                && target_ix < guide.offset.y + guide.length
-                && guide.offset.x == target_depth
-        })
-        .map(|(ix, _)| ix)
-}
-
-fn subscribe_for_editor_events(
-    editor: &Entity<Editor>,
-    window: &mut Window,
-    cx: &mut Context<OutlinePanel>,
-) -> Subscription {
-    let debounce = Some(UPDATE_DEBOUNCE);
-    cx.subscribe_in(
-        editor,
-        window,
-        move |outline_panel, editor, e: &EditorEvent, window, cx| {
-            if !outline_panel.active {
-                return;
-            }
-            match e {
-                EditorEvent::SelectionsChanged { local: true } => {
-                    outline_panel.reveal_entry_for_selection(editor.clone(), window, cx);
-                    cx.notify();
-                }
-                EditorEvent::ExcerptsAdded { excerpts, .. } => {
-                    outline_panel
-                        .new_entries_for_fs_update
-                        .extend(excerpts.iter().map(|&(excerpt_id, _)| excerpt_id));
-                    outline_panel.update_fs_entries(editor.clone(), debounce, window, cx);
-                }
-                EditorEvent::ExcerptsRemoved { ids, .. } => {
-                    let mut ids = ids.iter().collect::<HashSet<_>>();
-                    for excerpts in outline_panel.excerpts.values_mut() {
-                        excerpts.retain(|excerpt_id, _| !ids.remove(excerpt_id));
-                        if ids.is_empty() {
-                            break;
-                        }
-                    }
-                    outline_panel.update_fs_entries(editor.clone(), debounce, window, cx);
-                }
-                EditorEvent::ExcerptsExpanded { ids } => {
-                    outline_panel.invalidate_outlines(ids);
-                    let update_cached_items = outline_panel.update_non_fs_items(window, cx);
-                    if update_cached_items {
-                        outline_panel.update_cached_entries(Some(UPDATE_DEBOUNCE), window, cx);
-                    }
-                }
-                EditorEvent::ExcerptsEdited { ids } => {
-                    outline_panel.invalidate_outlines(ids);
-                    let update_cached_items = outline_panel.update_non_fs_items(window, cx);
-                    if update_cached_items {
-                        outline_panel.update_cached_entries(Some(UPDATE_DEBOUNCE), window, cx);
-                    }
-                }
-                EditorEvent::BufferFoldToggled { ids, .. } => {
-                    outline_panel.invalidate_outlines(ids);
-                    let mut latest_unfolded_buffer_id = None;
-                    let mut latest_folded_buffer_id = None;
-                    let mut ignore_selections_change = false;
-                    outline_panel.new_entries_for_fs_update.extend(
-                        ids.iter()
-                            .filter(|id| {
-                                outline_panel
-                                    .excerpts
-                                    .iter()
-                                    .find_map(|(buffer_id, excerpts)| {
-                                        if excerpts.contains_key(id) {
-                                            ignore_selections_change |= outline_panel
-                                                .preserve_selection_on_buffer_fold_toggles
-                                                .remove(buffer_id);
-                                            Some(buffer_id)
-                                        } else {
-                                            None
-                                        }
-                                    })
-                                    .map(|buffer_id| {
-                                        if editor.read(cx).is_buffer_folded(*buffer_id, cx) {
-                                            latest_folded_buffer_id = Some(*buffer_id);
-                                            false
-                                        } else {
-                                            latest_unfolded_buffer_id = Some(*buffer_id);
-                                            true
-                                        }
-                                    })
-                                    .unwrap_or(true)
-                            })
-                            .copied(),
-                    );
-                    if !ignore_selections_change
-                        && let Some(entry_to_select) = latest_unfolded_buffer_id
-                            .or(latest_folded_buffer_id)
-                            .and_then(|toggled_buffer_id| {
-                                outline_panel.fs_entries.iter().find_map(
-                                    |fs_entry| match fs_entry {
-                                        FsEntry::ExternalFile(external) => {
-                                            if external.buffer_id == toggled_buffer_id {
-                                                Some(fs_entry.clone())
-                                            } else {
-                                                None
-                                            }
-                                        }
-                                        FsEntry::File(FsEntryFile { buffer_id, .. }) => {
-                                            if *buffer_id == toggled_buffer_id {
-                                                Some(fs_entry.clone())
-                                            } else {
-                                                None
-                                            }
-                                        }
-                                        FsEntry::Directory(..) => None,
-                                    },
-                                )
-                            })
-                            .map(PanelEntry::Fs)
-                    {
-                        outline_panel.select_entry(entry_to_select, true, window, cx);
-                    }
-
-                    outline_panel.update_fs_entries(editor.clone(), debounce, window, cx);
-                }
-                EditorEvent::Reparsed(buffer_id) => {
-                    if let Some(excerpts) = outline_panel.excerpts.get_mut(buffer_id) {
-                        for excerpt in excerpts.values_mut() {
-                            excerpt.invalidate_outlines();
-                        }
-                    }
-                    let update_cached_items = outline_panel.update_non_fs_items(window, cx);
-                    if update_cached_items {
-                        outline_panel.update_cached_entries(Some(UPDATE_DEBOUNCE), window, cx);
-                    }
-                }
-                EditorEvent::TitleChanged => {
-                    outline_panel.update_fs_entries(editor.clone(), debounce, window, cx);
-                }
-                _ => {}
-            }
-        },
-    )
-}
-
-fn empty_icon() -> AnyElement {
-    h_flex()
-        .size(IconSize::default().rems())
-        .invisible()
-        .flex_none()
-        .into_any_element()
-}
-
-#[derive(Debug, Default)]
-struct GenerationState {
-    entries: Vec<CachedEntry>,
-    match_candidates: Vec<StringMatchCandidate>,
-    max_width_estimate_and_index: Option<(u64, usize)>,
-}
-
-impl GenerationState {
-    fn clear(&mut self) {
-        self.entries.clear();
-        self.match_candidates.clear();
-        self.max_width_estimate_and_index = None;
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use db::indoc;
-    use gpui::{TestAppContext, VisualTestContext, WindowHandle};
-    use language::rust_lang;
-    use pretty_assertions::assert_eq;
-    use project::FakeFs;
-    use search::{
-        buffer_search,
-        project_search::{self, perform_project_search},
-    };
-    use serde_json::json;
-    use util::path;
-    use workspace::{OpenOptions, OpenVisible, ToolbarItemView};
-
-    use super::*;
-
-    const SELECTED_MARKER: &str = "  <==== selected";
-
-    #[gpui::test(iterations = 10)]
-    async fn test_project_search_results_toggling(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.background_executor.clone());
-        let root = path!("/rust-analyzer");
-        populate_with_test_ra_project(&fs, root).await;
-        let project = Project::test(fs.clone(), [Path::new(root)], cx).await;
-        project.read_with(cx, |project, _| project.languages().add(rust_lang()));
-        let workspace = add_outline_panel(&project, cx).await;
-        let cx = &mut VisualTestContext::from_window(*workspace, cx);
-        let outline_panel = outline_panel(&workspace, cx);
-        outline_panel.update_in(cx, |outline_panel, window, cx| {
-            outline_panel.set_active(true, window, cx)
-        });
-
-        workspace
-            .update(cx, |workspace, window, cx| {
-                ProjectSearchView::deploy_search(
-                    workspace,
-                    &workspace::DeploySearch::default(),
-                    window,
-                    cx,
-                )
-            })
-            .unwrap();
-        let search_view = workspace
-            .update(cx, |workspace, _, cx| {
-                workspace
-                    .active_pane()
-                    .read(cx)
-                    .items()
-                    .find_map(|item| item.downcast::<ProjectSearchView>())
-                    .expect("Project search view expected to appear after new search event trigger")
-            })
-            .unwrap();
-
-        let query = "param_names_for_lifetime_elision_hints";
-        perform_project_search(&search_view, query, cx);
-        search_view.update(cx, |search_view, cx| {
-            search_view
-                .results_editor()
-                .update(cx, |results_editor, cx| {
-                    assert_eq!(
-                        results_editor.display_text(cx).match_indices(query).count(),
-                        9
-                    );
-                });
-        });
-
-        let all_matches = r#"rust-analyzer/
-  crates/
-    ide/src/
-      inlay_hints/
-        fn_lifetime_fn.rs
-          search: match config.«param_names_for_lifetime_elision_hints» {
-          search: allocated_lifetimes.push(if config.«param_names_for_lifetime_elision_hints» {
-          search: Some(it) if config.«param_names_for_lifetime_elision_hints» => {
-          search: InlayHintsConfig { «param_names_for_lifetime_elision_hints»: true, ..TEST_CONFIG },
-      inlay_hints.rs
-        search: pub «param_names_for_lifetime_elision_hints»: bool,
-        search: «param_names_for_lifetime_elision_hints»: self
-      static_index.rs
-        search: «param_names_for_lifetime_elision_hints»: false,
-    rust-analyzer/src/
-      cli/
-        analysis_stats.rs
-          search: «param_names_for_lifetime_elision_hints»: true,
-      config.rs
-        search: «param_names_for_lifetime_elision_hints»: self"#
-            .to_string();
-
-        let select_first_in_all_matches = |line_to_select: &str| {
-            assert!(
-                all_matches.contains(line_to_select),
-                "`{line_to_select}` was not found in all matches `{all_matches}`"
-            );
-            all_matches.replacen(
-                line_to_select,
-                &format!("{line_to_select}{SELECTED_MARKER}"),
-                1,
-            )
-        };
-
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(100));
-        cx.run_until_parked();
-        outline_panel.update(cx, |outline_panel, cx| {
-            assert_eq!(
-                display_entries(
-                    &project,
-                    &snapshot(outline_panel, cx),
-                    &outline_panel.cached_entries,
-                    outline_panel.selected_entry(),
-                    cx,
-                ),
-                select_first_in_all_matches(
-                    "search: match config.«param_names_for_lifetime_elision_hints» {"
-                )
-            );
-        });
-
-        outline_panel.update_in(cx, |outline_panel, window, cx| {
-            outline_panel.select_parent(&SelectParent, window, cx);
-            assert_eq!(
-                display_entries(
-                    &project,
-                    &snapshot(outline_panel, cx),
-                    &outline_panel.cached_entries,
-                    outline_panel.selected_entry(),
-                    cx,
-                ),
-                select_first_in_all_matches("fn_lifetime_fn.rs")
-            );
-        });
-        outline_panel.update_in(cx, |outline_panel, window, cx| {
-            outline_panel.collapse_selected_entry(&CollapseSelectedEntry, window, cx);
-        });
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(100));
-        cx.run_until_parked();
-        outline_panel.update(cx, |outline_panel, cx| {
-            assert_eq!(
-                display_entries(
-                    &project,
-                    &snapshot(outline_panel, cx),
-                    &outline_panel.cached_entries,
-                    outline_panel.selected_entry(),
-                    cx,
-                ),
-                format!(
-                    r#"rust-analyzer/
-  crates/
-    ide/src/
-      inlay_hints/
-        fn_lifetime_fn.rs{SELECTED_MARKER}
-      inlay_hints.rs
-        search: pub «param_names_for_lifetime_elision_hints»: bool,
-        search: «param_names_for_lifetime_elision_hints»: self
-      static_index.rs
-        search: «param_names_for_lifetime_elision_hints»: false,
-    rust-analyzer/src/
-      cli/
-        analysis_stats.rs
-          search: «param_names_for_lifetime_elision_hints»: true,
-      config.rs
-        search: «param_names_for_lifetime_elision_hints»: self"#,
-                )
-            );
-        });
-
-        outline_panel.update_in(cx, |outline_panel, window, cx| {
-            outline_panel.expand_all_entries(&ExpandAllEntries, window, cx);
-        });
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(100));
-        cx.run_until_parked();
-        outline_panel.update_in(cx, |outline_panel, window, cx| {
-            outline_panel.select_parent(&SelectParent, window, cx);
-            assert_eq!(
-                display_entries(
-                    &project,
-                    &snapshot(outline_panel, cx),
-                    &outline_panel.cached_entries,
-                    outline_panel.selected_entry(),
-                    cx,
-                ),
-                select_first_in_all_matches("inlay_hints/")
-            );
-        });
-
-        outline_panel.update_in(cx, |outline_panel, window, cx| {
-            outline_panel.select_parent(&SelectParent, window, cx);
-            assert_eq!(
-                display_entries(
-                    &project,
-                    &snapshot(outline_panel, cx),
-                    &outline_panel.cached_entries,
-                    outline_panel.selected_entry(),
-                    cx,
-                ),
-                select_first_in_all_matches("ide/src/")
-            );
-        });
-
-        outline_panel.update_in(cx, |outline_panel, window, cx| {
-            outline_panel.collapse_selected_entry(&CollapseSelectedEntry, window, cx);
-        });
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(100));
-        cx.run_until_parked();
-        outline_panel.update(cx, |outline_panel, cx| {
-            assert_eq!(
-                display_entries(
-                    &project,
-                    &snapshot(outline_panel, cx),
-                    &outline_panel.cached_entries,
-                    outline_panel.selected_entry(),
-                    cx,
-                ),
-                format!(
-                    r#"rust-analyzer/
-  crates/
-    ide/src/{SELECTED_MARKER}
-    rust-analyzer/src/
-      cli/
-        analysis_stats.rs
-          search: «param_names_for_lifetime_elision_hints»: true,
-      config.rs
-        search: «param_names_for_lifetime_elision_hints»: self"#,
-                )
-            );
-        });
-        outline_panel.update_in(cx, |outline_panel, window, cx| {
-            outline_panel.expand_selected_entry(&ExpandSelectedEntry, window, cx);
-        });
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(100));
-        cx.run_until_parked();
-        outline_panel.update(cx, |outline_panel, cx| {
-            assert_eq!(
-                display_entries(
-                    &project,
-                    &snapshot(outline_panel, cx),
-                    &outline_panel.cached_entries,
-                    outline_panel.selected_entry(),
-                    cx,
-                ),
-                select_first_in_all_matches("ide/src/")
-            );
-        });
-    }
-
-    #[gpui::test(iterations = 10)]
-    async fn test_item_filtering(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.background_executor.clone());
-        let root = path!("/rust-analyzer");
-        populate_with_test_ra_project(&fs, root).await;
-        let project = Project::test(fs.clone(), [Path::new(root)], cx).await;
-        project.read_with(cx, |project, _| project.languages().add(rust_lang()));
-        let workspace = add_outline_panel(&project, cx).await;
-        let cx = &mut VisualTestContext::from_window(*workspace, cx);
-        let outline_panel = outline_panel(&workspace, cx);
-        outline_panel.update_in(cx, |outline_panel, window, cx| {
-            outline_panel.set_active(true, window, cx)
-        });
-
-        workspace
-            .update(cx, |workspace, window, cx| {
-                ProjectSearchView::deploy_search(
-                    workspace,
-                    &workspace::DeploySearch::default(),
-                    window,
-                    cx,
-                )
-            })
-            .unwrap();
-        let search_view = workspace
-            .update(cx, |workspace, _, cx| {
-                workspace
-                    .active_pane()
-                    .read(cx)
-                    .items()
-                    .find_map(|item| item.downcast::<ProjectSearchView>())
-                    .expect("Project search view expected to appear after new search event trigger")
-            })
-            .unwrap();
-
-        let query = "param_names_for_lifetime_elision_hints";
-        perform_project_search(&search_view, query, cx);
-        search_view.update(cx, |search_view, cx| {
-            search_view
-                .results_editor()
-                .update(cx, |results_editor, cx| {
-                    assert_eq!(
-                        results_editor.display_text(cx).match_indices(query).count(),
-                        9
-                    );
-                });
-        });
-        let all_matches = r#"rust-analyzer/
-  crates/
-    ide/src/
-      inlay_hints/
-        fn_lifetime_fn.rs
-          search: match config.«param_names_for_lifetime_elision_hints» {
-          search: allocated_lifetimes.push(if config.«param_names_for_lifetime_elision_hints» {
-          search: Some(it) if config.«param_names_for_lifetime_elision_hints» => {
-          search: InlayHintsConfig { «param_names_for_lifetime_elision_hints»: true, ..TEST_CONFIG },
-      inlay_hints.rs
-        search: pub «param_names_for_lifetime_elision_hints»: bool,
-        search: «param_names_for_lifetime_elision_hints»: self
-      static_index.rs
-        search: «param_names_for_lifetime_elision_hints»: false,
-    rust-analyzer/src/
-      cli/
-        analysis_stats.rs
-          search: «param_names_for_lifetime_elision_hints»: true,
-      config.rs
-        search: «param_names_for_lifetime_elision_hints»: self"#
-            .to_string();
-
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(100));
-        cx.run_until_parked();
-        outline_panel.update(cx, |outline_panel, cx| {
-            assert_eq!(
-                display_entries(
-                    &project,
-                    &snapshot(outline_panel, cx),
-                    &outline_panel.cached_entries,
-                    None,
-                    cx,
-                ),
-                all_matches,
-            );
-        });
-
-        let filter_text = "a";
-        outline_panel.update_in(cx, |outline_panel, window, cx| {
-            outline_panel.filter_editor.update(cx, |filter_editor, cx| {
-                filter_editor.set_text(filter_text, window, cx);
-            });
-        });
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(100));
-        cx.run_until_parked();
-
-        outline_panel.update(cx, |outline_panel, cx| {
-            assert_eq!(
-                display_entries(
-                    &project,
-                    &snapshot(outline_panel, cx),
-                    &outline_panel.cached_entries,
-                    None,
-                    cx,
-                ),
-                all_matches
-                    .lines()
-                    .skip(1) // `/rust-analyzer/` is a root entry with path `` and it will be filtered out
-                    .filter(|item| item.contains(filter_text))
-                    .collect::<Vec<_>>()
-                    .join("\n"),
-            );
-        });
-
-        outline_panel.update_in(cx, |outline_panel, window, cx| {
-            outline_panel.filter_editor.update(cx, |filter_editor, cx| {
-                filter_editor.set_text("", window, cx);
-            });
-        });
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(100));
-        cx.run_until_parked();
-        outline_panel.update(cx, |outline_panel, cx| {
-            assert_eq!(
-                display_entries(
-                    &project,
-                    &snapshot(outline_panel, cx),
-                    &outline_panel.cached_entries,
-                    None,
-                    cx,
-                ),
-                all_matches,
-            );
-        });
-    }
-
-    #[gpui::test(iterations = 10)]
-    async fn test_item_opening(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.background_executor.clone());
-        let root = path!("/rust-analyzer");
-        populate_with_test_ra_project(&fs, root).await;
-        let project = Project::test(fs.clone(), [Path::new(root)], cx).await;
-        project.read_with(cx, |project, _| project.languages().add(rust_lang()));
-        let workspace = add_outline_panel(&project, cx).await;
-        let cx = &mut VisualTestContext::from_window(*workspace, cx);
-        let outline_panel = outline_panel(&workspace, cx);
-        outline_panel.update_in(cx, |outline_panel, window, cx| {
-            outline_panel.set_active(true, window, cx)
-        });
-
-        workspace
-            .update(cx, |workspace, window, cx| {
-                ProjectSearchView::deploy_search(
-                    workspace,
-                    &workspace::DeploySearch::default(),
-                    window,
-                    cx,
-                )
-            })
-            .unwrap();
-        let search_view = workspace
-            .update(cx, |workspace, _, cx| {
-                workspace
-                    .active_pane()
-                    .read(cx)
-                    .items()
-                    .find_map(|item| item.downcast::<ProjectSearchView>())
-                    .expect("Project search view expected to appear after new search event trigger")
-            })
-            .unwrap();
-
-        let query = "param_names_for_lifetime_elision_hints";
-        perform_project_search(&search_view, query, cx);
-        search_view.update(cx, |search_view, cx| {
-            search_view
-                .results_editor()
-                .update(cx, |results_editor, cx| {
-                    assert_eq!(
-                        results_editor.display_text(cx).match_indices(query).count(),
-                        9
-                    );
-                });
-        });
-        let all_matches = r#"rust-analyzer/
-  crates/
-    ide/src/
-      inlay_hints/
-        fn_lifetime_fn.rs
-          search: match config.«param_names_for_lifetime_elision_hints» {
-          search: allocated_lifetimes.push(if config.«param_names_for_lifetime_elision_hints» {
-          search: Some(it) if config.«param_names_for_lifetime_elision_hints» => {
-          search: InlayHintsConfig { «param_names_for_lifetime_elision_hints»: true, ..TEST_CONFIG },
-      inlay_hints.rs
-        search: pub «param_names_for_lifetime_elision_hints»: bool,
-        search: «param_names_for_lifetime_elision_hints»: self
-      static_index.rs
-        search: «param_names_for_lifetime_elision_hints»: false,
-    rust-analyzer/src/
-      cli/
-        analysis_stats.rs
-          search: «param_names_for_lifetime_elision_hints»: true,
-      config.rs
-        search: «param_names_for_lifetime_elision_hints»: self"#
-            .to_string();
-        let select_first_in_all_matches = |line_to_select: &str| {
-            assert!(
-                all_matches.contains(line_to_select),
-                "`{line_to_select}` was not found in all matches `{all_matches}`"
-            );
-            all_matches.replacen(
-                line_to_select,
-                &format!("{line_to_select}{SELECTED_MARKER}"),
-                1,
-            )
-        };
-        let clear_outline_metadata = |input: &str| {
-            input
-                .replace("search: ", "")
-                .replace("«", "")
-                .replace("»", "")
-        };
-
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(100));
-        cx.run_until_parked();
-
-        let active_editor = outline_panel.read_with(cx, |outline_panel, _| {
-            outline_panel
-                .active_editor()
-                .expect("should have an active editor open")
-        });
-        let initial_outline_selection =
-            "search: match config.«param_names_for_lifetime_elision_hints» {";
-        outline_panel.update_in(cx, |outline_panel, window, cx| {
-            assert_eq!(
-                display_entries(
-                    &project,
-                    &snapshot(outline_panel, cx),
-                    &outline_panel.cached_entries,
-                    outline_panel.selected_entry(),
-                    cx,
-                ),
-                select_first_in_all_matches(initial_outline_selection)
-            );
-            assert_eq!(
-                selected_row_text(&active_editor, cx),
-                clear_outline_metadata(initial_outline_selection),
-                "Should place the initial editor selection on the corresponding search result"
-            );
-
-            outline_panel.select_next(&SelectNext, window, cx);
-            outline_panel.select_next(&SelectNext, window, cx);
-        });
-
-        let navigated_outline_selection =
-            "search: Some(it) if config.«param_names_for_lifetime_elision_hints» => {";
-        outline_panel.update(cx, |outline_panel, cx| {
-            assert_eq!(
-                display_entries(
-                    &project,
-                    &snapshot(outline_panel, cx),
-                    &outline_panel.cached_entries,
-                    outline_panel.selected_entry(),
-                    cx,
-                ),
-                select_first_in_all_matches(navigated_outline_selection)
-            );
-        });
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(100));
-        outline_panel.update(cx, |_, cx| {
-            assert_eq!(
-                selected_row_text(&active_editor, cx),
-                clear_outline_metadata(navigated_outline_selection),
-                "Should still have the initial caret position after SelectNext calls"
-            );
-        });
-
-        outline_panel.update_in(cx, |outline_panel, window, cx| {
-            outline_panel.open_selected_entry(&OpenSelectedEntry, window, cx);
-        });
-        outline_panel.update(cx, |_outline_panel, cx| {
-            assert_eq!(
-                selected_row_text(&active_editor, cx),
-                clear_outline_metadata(navigated_outline_selection),
-                "After opening, should move the caret to the opened outline entry's position"
-            );
-        });
-
-        outline_panel.update_in(cx, |outline_panel, window, cx| {
-            outline_panel.select_next(&SelectNext, window, cx);
-        });
-        let next_navigated_outline_selection = "search: InlayHintsConfig { «param_names_for_lifetime_elision_hints»: true, ..TEST_CONFIG },";
-        outline_panel.update(cx, |outline_panel, cx| {
-            assert_eq!(
-                display_entries(
-                    &project,
-                    &snapshot(outline_panel, cx),
-                    &outline_panel.cached_entries,
-                    outline_panel.selected_entry(),
-                    cx,
-                ),
-                select_first_in_all_matches(next_navigated_outline_selection)
-            );
-        });
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(100));
-        outline_panel.update(cx, |_outline_panel, cx| {
-            assert_eq!(
-                selected_row_text(&active_editor, cx),
-                clear_outline_metadata(next_navigated_outline_selection),
-                "Should again preserve the selection after another SelectNext call"
-            );
-        });
-
-        outline_panel.update_in(cx, |outline_panel, window, cx| {
-            outline_panel.open_excerpts(&editor::actions::OpenExcerpts, window, cx);
-        });
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(100));
-        cx.run_until_parked();
-        let new_active_editor = outline_panel.read_with(cx, |outline_panel, _| {
-            outline_panel
-                .active_editor()
-                .expect("should have an active editor open")
-        });
-        outline_panel.update(cx, |outline_panel, cx| {
-            assert_ne!(
-                active_editor, new_active_editor,
-                "After opening an excerpt, new editor should be open"
-            );
-            assert_eq!(
-                display_entries(
-                    &project,
-                    &snapshot(outline_panel, cx),
-                    &outline_panel.cached_entries,
-                    outline_panel.selected_entry(),
-                    cx,
-                ),
-                "outline: pub(super) fn hints
-outline: fn hints_lifetimes_named  <==== selected"
-            );
-            assert_eq!(
-                selected_row_text(&new_active_editor, cx),
-                clear_outline_metadata(next_navigated_outline_selection),
-                "When opening the excerpt, should navigate to the place corresponding the outline entry"
-            );
-        });
-    }
-
-    #[gpui::test]
-    async fn test_multiple_worktrees(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(
-            path!("/root"),
-            json!({
-                "one": {
-                    "a.txt": "aaa aaa"
-                },
-                "two": {
-                    "b.txt": "a aaa"
-                }
-
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), [Path::new(path!("/root/one"))], cx).await;
-        let workspace = add_outline_panel(&project, cx).await;
-        let cx = &mut VisualTestContext::from_window(*workspace, cx);
-        let outline_panel = outline_panel(&workspace, cx);
-        outline_panel.update_in(cx, |outline_panel, window, cx| {
-            outline_panel.set_active(true, window, cx)
-        });
-
-        let items = workspace
-            .update(cx, |workspace, window, cx| {
-                workspace.open_paths(
-                    vec![PathBuf::from(path!("/root/two"))],
-                    OpenOptions {
-                        visible: Some(OpenVisible::OnlyDirectories),
-                        ..Default::default()
-                    },
-                    None,
-                    window,
-                    cx,
-                )
-            })
-            .unwrap()
-            .await;
-        assert_eq!(items.len(), 1, "Were opening another worktree directory");
-        assert!(
-            items[0].is_none(),
-            "Directory should be opened successfully"
-        );
-
-        workspace
-            .update(cx, |workspace, window, cx| {
-                ProjectSearchView::deploy_search(
-                    workspace,
-                    &workspace::DeploySearch::default(),
-                    window,
-                    cx,
-                )
-            })
-            .unwrap();
-        let search_view = workspace
-            .update(cx, |workspace, _, cx| {
-                workspace
-                    .active_pane()
-                    .read(cx)
-                    .items()
-                    .find_map(|item| item.downcast::<ProjectSearchView>())
-                    .expect("Project search view expected to appear after new search event trigger")
-            })
-            .unwrap();
-
-        let query = "aaa";
-        perform_project_search(&search_view, query, cx);
-        search_view.update(cx, |search_view, cx| {
-            search_view
-                .results_editor()
-                .update(cx, |results_editor, cx| {
-                    assert_eq!(
-                        results_editor.display_text(cx).match_indices(query).count(),
-                        3
-                    );
-                });
-        });
-
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(100));
-        cx.run_until_parked();
-        outline_panel.update(cx, |outline_panel, cx| {
-            assert_eq!(
-                display_entries(
-                    &project,
-                    &snapshot(outline_panel, cx),
-                    &outline_panel.cached_entries,
-                    outline_panel.selected_entry(),
-                    cx,
-                ),
-                format!(
-                    r#"one/
-  a.txt
-    search: «aaa» aaa  <==== selected
-    search: aaa «aaa»
-two/
-  b.txt
-    search: a «aaa»"#,
-                ),
-            );
-        });
-
-        outline_panel.update_in(cx, |outline_panel, window, cx| {
-            outline_panel.select_previous(&SelectPrevious, window, cx);
-            outline_panel.collapse_selected_entry(&CollapseSelectedEntry, window, cx);
-        });
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(100));
-        cx.run_until_parked();
-        outline_panel.update(cx, |outline_panel, cx| {
-            assert_eq!(
-                display_entries(
-                    &project,
-                    &snapshot(outline_panel, cx),
-                    &outline_panel.cached_entries,
-                    outline_panel.selected_entry(),
-                    cx,
-                ),
-                format!(
-                    r#"one/
-  a.txt  <==== selected
-two/
-  b.txt
-    search: a «aaa»"#,
-                ),
-            );
-        });
-
-        outline_panel.update_in(cx, |outline_panel, window, cx| {
-            outline_panel.select_next(&SelectNext, window, cx);
-            outline_panel.collapse_selected_entry(&CollapseSelectedEntry, window, cx);
-        });
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(100));
-        cx.run_until_parked();
-        outline_panel.update(cx, |outline_panel, cx| {
-            assert_eq!(
-                display_entries(
-                    &project,
-                    &snapshot(outline_panel, cx),
-                    &outline_panel.cached_entries,
-                    outline_panel.selected_entry(),
-                    cx,
-                ),
-                format!(
-                    r#"one/
-  a.txt
-two/  <==== selected"#,
-                ),
-            );
-        });
-
-        outline_panel.update_in(cx, |outline_panel, window, cx| {
-            outline_panel.expand_selected_entry(&ExpandSelectedEntry, window, cx);
-        });
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(100));
-        cx.run_until_parked();
-        outline_panel.update(cx, |outline_panel, cx| {
-            assert_eq!(
-                display_entries(
-                    &project,
-                    &snapshot(outline_panel, cx),
-                    &outline_panel.cached_entries,
-                    outline_panel.selected_entry(),
-                    cx,
-                ),
-                format!(
-                    r#"one/
-  a.txt
-two/  <==== selected
-  b.txt
-    search: a «aaa»"#,
-                )
-            );
-        });
-    }
-
-    #[gpui::test]
-    async fn test_navigating_in_singleton(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let root = path!("/root");
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(
-            root,
-            json!({
-                "src": {
-                    "lib.rs": indoc!("
-#[derive(Clone, Debug, PartialEq, Eq, Hash)]
-struct OutlineEntryExcerpt {
-    id: ExcerptId,
-    buffer_id: BufferId,
-    range: ExcerptRange<language::Anchor>,
-}"),
-                }
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), [Path::new(root)], cx).await;
-        project.read_with(cx, |project, _| project.languages().add(rust_lang()));
-        let workspace = add_outline_panel(&project, cx).await;
-        let cx = &mut VisualTestContext::from_window(*workspace, cx);
-        let outline_panel = outline_panel(&workspace, cx);
-        cx.update(|window, cx| {
-            outline_panel.update(cx, |outline_panel, cx| {
-                outline_panel.set_active(true, window, cx)
-            });
-        });
-
-        let _editor = workspace
-            .update(cx, |workspace, window, cx| {
-                workspace.open_abs_path(
-                    PathBuf::from(path!("/root/src/lib.rs")),
-                    OpenOptions {
-                        visible: Some(OpenVisible::All),
-                        ..Default::default()
-                    },
-                    window,
-                    cx,
-                )
-            })
-            .unwrap()
-            .await
-            .expect("Failed to open Rust source file")
-            .downcast::<Editor>()
-            .expect("Should open an editor for Rust source file");
-
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(100));
-        cx.run_until_parked();
-        outline_panel.update(cx, |outline_panel, cx| {
-            assert_eq!(
-                display_entries(
-                    &project,
-                    &snapshot(outline_panel, cx),
-                    &outline_panel.cached_entries,
-                    outline_panel.selected_entry(),
-                    cx,
-                ),
-                indoc!(
-                    "
-outline: struct OutlineEntryExcerpt
-  outline: id
-  outline: buffer_id
-  outline: range"
-                )
-            );
-        });
-
-        cx.update(|window, cx| {
-            outline_panel.update(cx, |outline_panel, cx| {
-                outline_panel.select_next(&SelectNext, window, cx);
-            });
-        });
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(100));
-        cx.run_until_parked();
-        outline_panel.update(cx, |outline_panel, cx| {
-            assert_eq!(
-                display_entries(
-                    &project,
-                    &snapshot(outline_panel, cx),
-                    &outline_panel.cached_entries,
-                    outline_panel.selected_entry(),
-                    cx,
-                ),
-                indoc!(
-                    "
-outline: struct OutlineEntryExcerpt  <==== selected
-  outline: id
-  outline: buffer_id
-  outline: range"
-                )
-            );
-        });
-
-        cx.update(|window, cx| {
-            outline_panel.update(cx, |outline_panel, cx| {
-                outline_panel.select_next(&SelectNext, window, cx);
-            });
-        });
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(100));
-        cx.run_until_parked();
-        outline_panel.update(cx, |outline_panel, cx| {
-            assert_eq!(
-                display_entries(
-                    &project,
-                    &snapshot(outline_panel, cx),
-                    &outline_panel.cached_entries,
-                    outline_panel.selected_entry(),
-                    cx,
-                ),
-                indoc!(
-                    "
-outline: struct OutlineEntryExcerpt
-  outline: id  <==== selected
-  outline: buffer_id
-  outline: range"
-                )
-            );
-        });
-
-        cx.update(|window, cx| {
-            outline_panel.update(cx, |outline_panel, cx| {
-                outline_panel.select_next(&SelectNext, window, cx);
-            });
-        });
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(100));
-        cx.run_until_parked();
-        outline_panel.update(cx, |outline_panel, cx| {
-            assert_eq!(
-                display_entries(
-                    &project,
-                    &snapshot(outline_panel, cx),
-                    &outline_panel.cached_entries,
-                    outline_panel.selected_entry(),
-                    cx,
-                ),
-                indoc!(
-                    "
-outline: struct OutlineEntryExcerpt
-  outline: id
-  outline: buffer_id  <==== selected
-  outline: range"
-                )
-            );
-        });
-
-        cx.update(|window, cx| {
-            outline_panel.update(cx, |outline_panel, cx| {
-                outline_panel.select_next(&SelectNext, window, cx);
-            });
-        });
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(100));
-        cx.run_until_parked();
-        outline_panel.update(cx, |outline_panel, cx| {
-            assert_eq!(
-                display_entries(
-                    &project,
-                    &snapshot(outline_panel, cx),
-                    &outline_panel.cached_entries,
-                    outline_panel.selected_entry(),
-                    cx,
-                ),
-                indoc!(
-                    "
-outline: struct OutlineEntryExcerpt
-  outline: id
-  outline: buffer_id
-  outline: range  <==== selected"
-                )
-            );
-        });
-
-        cx.update(|window, cx| {
-            outline_panel.update(cx, |outline_panel, cx| {
-                outline_panel.select_next(&SelectNext, window, cx);
-            });
-        });
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(100));
-        cx.run_until_parked();
-        outline_panel.update(cx, |outline_panel, cx| {
-            assert_eq!(
-                display_entries(
-                    &project,
-                    &snapshot(outline_panel, cx),
-                    &outline_panel.cached_entries,
-                    outline_panel.selected_entry(),
-                    cx,
-                ),
-                indoc!(
-                    "
-outline: struct OutlineEntryExcerpt  <==== selected
-  outline: id
-  outline: buffer_id
-  outline: range"
-                )
-            );
-        });
-
-        cx.update(|window, cx| {
-            outline_panel.update(cx, |outline_panel, cx| {
-                outline_panel.select_previous(&SelectPrevious, window, cx);
-            });
-        });
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(100));
-        cx.run_until_parked();
-        outline_panel.update(cx, |outline_panel, cx| {
-            assert_eq!(
-                display_entries(
-                    &project,
-                    &snapshot(outline_panel, cx),
-                    &outline_panel.cached_entries,
-                    outline_panel.selected_entry(),
-                    cx,
-                ),
-                indoc!(
-                    "
-outline: struct OutlineEntryExcerpt
-  outline: id
-  outline: buffer_id
-  outline: range  <==== selected"
-                )
-            );
-        });
-
-        cx.update(|window, cx| {
-            outline_panel.update(cx, |outline_panel, cx| {
-                outline_panel.select_previous(&SelectPrevious, window, cx);
-            });
-        });
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(100));
-        cx.run_until_parked();
-        outline_panel.update(cx, |outline_panel, cx| {
-            assert_eq!(
-                display_entries(
-                    &project,
-                    &snapshot(outline_panel, cx),
-                    &outline_panel.cached_entries,
-                    outline_panel.selected_entry(),
-                    cx,
-                ),
-                indoc!(
-                    "
-outline: struct OutlineEntryExcerpt
-  outline: id
-  outline: buffer_id  <==== selected
-  outline: range"
-                )
-            );
-        });
-
-        cx.update(|window, cx| {
-            outline_panel.update(cx, |outline_panel, cx| {
-                outline_panel.select_previous(&SelectPrevious, window, cx);
-            });
-        });
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(100));
-        cx.run_until_parked();
-        outline_panel.update(cx, |outline_panel, cx| {
-            assert_eq!(
-                display_entries(
-                    &project,
-                    &snapshot(outline_panel, cx),
-                    &outline_panel.cached_entries,
-                    outline_panel.selected_entry(),
-                    cx,
-                ),
-                indoc!(
-                    "
-outline: struct OutlineEntryExcerpt
-  outline: id  <==== selected
-  outline: buffer_id
-  outline: range"
-                )
-            );
-        });
-
-        cx.update(|window, cx| {
-            outline_panel.update(cx, |outline_panel, cx| {
-                outline_panel.select_previous(&SelectPrevious, window, cx);
-            });
-        });
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(100));
-        cx.run_until_parked();
-        outline_panel.update(cx, |outline_panel, cx| {
-            assert_eq!(
-                display_entries(
-                    &project,
-                    &snapshot(outline_panel, cx),
-                    &outline_panel.cached_entries,
-                    outline_panel.selected_entry(),
-                    cx,
-                ),
-                indoc!(
-                    "
-outline: struct OutlineEntryExcerpt  <==== selected
-  outline: id
-  outline: buffer_id
-  outline: range"
-                )
-            );
-        });
-
-        cx.update(|window, cx| {
-            outline_panel.update(cx, |outline_panel, cx| {
-                outline_panel.select_previous(&SelectPrevious, window, cx);
-            });
-        });
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(100));
-        cx.run_until_parked();
-        outline_panel.update(cx, |outline_panel, cx| {
-            assert_eq!(
-                display_entries(
-                    &project,
-                    &snapshot(outline_panel, cx),
-                    &outline_panel.cached_entries,
-                    outline_panel.selected_entry(),
-                    cx,
-                ),
-                indoc!(
-                    "
-outline: struct OutlineEntryExcerpt
-  outline: id
-  outline: buffer_id
-  outline: range  <==== selected"
-                )
-            );
-        });
-    }
-
-    #[gpui::test(iterations = 10)]
-    async fn test_frontend_repo_structure(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let root = path!("/frontend-project");
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(
-            root,
-            json!({
-                "public": {
-                    "lottie": {
-                        "syntax-tree.json": r#"{ "something": "static" }"#
-                    }
-                },
-                "src": {
-                    "app": {
-                        "(site)": {
-                            "(about)": {
-                                "jobs": {
-                                    "[slug]": {
-                                        "page.tsx": r#"static"#
-                                    }
-                                }
-                            },
-                            "(blog)": {
-                                "post": {
-                                    "[slug]": {
-                                        "page.tsx": r#"static"#
-                                    }
-                                }
-                            },
-                        }
-                    },
-                    "components": {
-                        "ErrorBoundary.tsx": r#"static"#,
-                    }
-                }
-
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), [Path::new(root)], cx).await;
-        let workspace = add_outline_panel(&project, cx).await;
-        let cx = &mut VisualTestContext::from_window(*workspace, cx);
-        let outline_panel = outline_panel(&workspace, cx);
-        outline_panel.update_in(cx, |outline_panel, window, cx| {
-            outline_panel.set_active(true, window, cx)
-        });
-
-        workspace
-            .update(cx, |workspace, window, cx| {
-                ProjectSearchView::deploy_search(
-                    workspace,
-                    &workspace::DeploySearch::default(),
-                    window,
-                    cx,
-                )
-            })
-            .unwrap();
-        let search_view = workspace
-            .update(cx, |workspace, _, cx| {
-                workspace
-                    .active_pane()
-                    .read(cx)
-                    .items()
-                    .find_map(|item| item.downcast::<ProjectSearchView>())
-                    .expect("Project search view expected to appear after new search event trigger")
-            })
-            .unwrap();
-
-        let query = "static";
-        perform_project_search(&search_view, query, cx);
-        search_view.update(cx, |search_view, cx| {
-            search_view
-                .results_editor()
-                .update(cx, |results_editor, cx| {
-                    assert_eq!(
-                        results_editor.display_text(cx).match_indices(query).count(),
-                        4
-                    );
-                });
-        });
-
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(100));
-        cx.run_until_parked();
-        outline_panel.update(cx, |outline_panel, cx| {
-            assert_eq!(
-                display_entries(
-                    &project,
-                    &snapshot(outline_panel, cx),
-                    &outline_panel.cached_entries,
-                    outline_panel.selected_entry(),
-                    cx,
-                ),
-                format!(
-                    r#"frontend-project/
-  public/lottie/
-    syntax-tree.json
-      search: {{ "something": "«static»" }}  <==== selected
-  src/
-    app/(site)/
-      (about)/jobs/[slug]/
-        page.tsx
-          search: «static»
-      (blog)/post/[slug]/
-        page.tsx
-          search: «static»
-    components/
-      ErrorBoundary.tsx
-        search: «static»"#
-                )
-            );
-        });
-
-        outline_panel.update_in(cx, |outline_panel, window, cx| {
-            // Move to 5th element in the list, 3 items down.
-            for _ in 0..2 {
-                outline_panel.select_next(&SelectNext, window, cx);
-            }
-            outline_panel.collapse_selected_entry(&CollapseSelectedEntry, window, cx);
-        });
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(100));
-        cx.run_until_parked();
-        outline_panel.update(cx, |outline_panel, cx| {
-            assert_eq!(
-                display_entries(
-                    &project,
-                    &snapshot(outline_panel, cx),
-                    &outline_panel.cached_entries,
-                    outline_panel.selected_entry(),
-                    cx,
-                ),
-                format!(
-                    r#"frontend-project/
-  public/lottie/
-    syntax-tree.json
-      search: {{ "something": "«static»" }}
-  src/
-    app/(site)/  <==== selected
-    components/
-      ErrorBoundary.tsx
-        search: «static»"#
-                )
-            );
-        });
-
-        outline_panel.update_in(cx, |outline_panel, window, cx| {
-            // Move to the next visible non-FS entry
-            for _ in 0..3 {
-                outline_panel.select_next(&SelectNext, window, cx);
-            }
-        });
-        cx.run_until_parked();
-        outline_panel.update(cx, |outline_panel, cx| {
-            assert_eq!(
-                display_entries(
-                    &project,
-                    &snapshot(outline_panel, cx),
-                    &outline_panel.cached_entries,
-                    outline_panel.selected_entry(),
-                    cx,
-                ),
-                format!(
-                    r#"frontend-project/
-  public/lottie/
-    syntax-tree.json
-      search: {{ "something": "«static»" }}
-  src/
-    app/(site)/
-    components/
-      ErrorBoundary.tsx
-        search: «static»  <==== selected"#
-                )
-            );
-        });
-
-        outline_panel.update_in(cx, |outline_panel, window, cx| {
-            outline_panel
-                .active_editor()
-                .expect("Should have an active editor")
-                .update(cx, |editor, cx| {
-                    editor.toggle_fold(&editor::actions::ToggleFold, window, cx)
-                });
-        });
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(100));
-        cx.run_until_parked();
-        outline_panel.update(cx, |outline_panel, cx| {
-            assert_eq!(
-                display_entries(
-                    &project,
-                    &snapshot(outline_panel, cx),
-                    &outline_panel.cached_entries,
-                    outline_panel.selected_entry(),
-                    cx,
-                ),
-                format!(
-                    r#"frontend-project/
-  public/lottie/
-    syntax-tree.json
-      search: {{ "something": "«static»" }}
-  src/
-    app/(site)/
-    components/
-      ErrorBoundary.tsx  <==== selected"#
-                )
-            );
-        });
-
-        outline_panel.update_in(cx, |outline_panel, window, cx| {
-            outline_panel
-                .active_editor()
-                .expect("Should have an active editor")
-                .update(cx, |editor, cx| {
-                    editor.toggle_fold(&editor::actions::ToggleFold, window, cx)
-                });
-        });
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(100));
-        cx.run_until_parked();
-        outline_panel.update(cx, |outline_panel, cx| {
-            assert_eq!(
-                display_entries(
-                    &project,
-                    &snapshot(outline_panel, cx),
-                    &outline_panel.cached_entries,
-                    outline_panel.selected_entry(),
-                    cx,
-                ),
-                format!(
-                    r#"frontend-project/
-  public/lottie/
-    syntax-tree.json
-      search: {{ "something": "«static»" }}
-  src/
-    app/(site)/
-    components/
-      ErrorBoundary.tsx  <==== selected
-        search: «static»"#
-                )
-            );
-        });
-
-        outline_panel.update_in(cx, |outline_panel, window, cx| {
-            outline_panel.collapse_all_entries(&CollapseAllEntries, window, cx);
-        });
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(100));
-        cx.run_until_parked();
-        outline_panel.update(cx, |outline_panel, cx| {
-            assert_eq!(
-                display_entries(
-                    &project,
-                    &snapshot(outline_panel, cx),
-                    &outline_panel.cached_entries,
-                    outline_panel.selected_entry(),
-                    cx,
-                ),
-                format!(r#"frontend-project/"#)
-            );
-        });
-
-        outline_panel.update_in(cx, |outline_panel, window, cx| {
-            outline_panel.expand_all_entries(&ExpandAllEntries, window, cx);
-        });
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(100));
-        cx.run_until_parked();
-        outline_panel.update(cx, |outline_panel, cx| {
-            assert_eq!(
-                display_entries(
-                    &project,
-                    &snapshot(outline_panel, cx),
-                    &outline_panel.cached_entries,
-                    outline_panel.selected_entry(),
-                    cx,
-                ),
-                format!(
-                    r#"frontend-project/
-  public/lottie/
-    syntax-tree.json
-      search: {{ "something": "«static»" }}
-  src/
-    app/(site)/
-      (about)/jobs/[slug]/
-        page.tsx
-          search: «static»
-      (blog)/post/[slug]/
-        page.tsx
-          search: «static»
-    components/
-      ErrorBoundary.tsx  <==== selected
-        search: «static»"#
-                )
-            );
-        });
-    }
-
-    async fn add_outline_panel(
-        project: &Entity<Project>,
-        cx: &mut TestAppContext,
-    ) -> WindowHandle<Workspace> {
-        let window = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-        let outline_panel = window
-            .update(cx, |_, window, cx| {
-                cx.spawn_in(window, async |this, cx| {
-                    OutlinePanel::load(this, cx.clone()).await
-                })
-            })
-            .unwrap()
-            .await
-            .expect("Failed to load outline panel");
-
-        window
-            .update(cx, |workspace, window, cx| {
-                workspace.add_panel(outline_panel, window, cx);
-            })
-            .unwrap();
-        window
-    }
-
-    fn outline_panel(
-        workspace: &WindowHandle<Workspace>,
-        cx: &mut TestAppContext,
-    ) -> Entity<OutlinePanel> {
-        workspace
-            .update(cx, |workspace, _, cx| {
-                workspace
-                    .panel::<OutlinePanel>(cx)
-                    .expect("no outline panel")
-            })
-            .unwrap()
-    }
-
-    fn display_entries(
-        project: &Entity<Project>,
-        multi_buffer_snapshot: &MultiBufferSnapshot,
-        cached_entries: &[CachedEntry],
-        selected_entry: Option<&PanelEntry>,
-        cx: &mut App,
-    ) -> String {
-        let project = project.read(cx);
-        let mut display_string = String::new();
-        for entry in cached_entries {
-            if !display_string.is_empty() {
-                display_string += "\n";
-            }
-            for _ in 0..entry.depth {
-                display_string += "  ";
-            }
-            display_string += &match &entry.entry {
-                PanelEntry::Fs(entry) => match entry {
-                    FsEntry::ExternalFile(_) => {
-                        panic!("Did not cover external files with tests")
-                    }
-                    FsEntry::Directory(directory) => {
-                        let path = if let Some(worktree) = project
-                            .worktree_for_id(directory.worktree_id, cx)
-                            .filter(|worktree| {
-                                worktree.read(cx).root_entry() == Some(&directory.entry.entry)
-                            }) {
-                            worktree
-                                .read(cx)
-                                .root_name()
-                                .join(&directory.entry.path)
-                                .as_unix_str()
-                                .to_string()
-                        } else {
-                            directory
-                                .entry
-                                .path
-                                .file_name()
-                                .unwrap_or_default()
-                                .to_string()
-                        };
-                        format!("{path}/")
-                    }
-                    FsEntry::File(file) => file
-                        .entry
-                        .path
-                        .file_name()
-                        .map(|name| name.to_string())
-                        .unwrap_or_default(),
-                },
-                PanelEntry::FoldedDirs(folded_dirs) => folded_dirs
-                    .entries
-                    .iter()
-                    .filter_map(|dir| dir.path.file_name())
-                    .map(|name| name.to_string() + "/")
-                    .collect(),
-                PanelEntry::Outline(outline_entry) => match outline_entry {
-                    OutlineEntry::Excerpt(_) => continue,
-                    OutlineEntry::Outline(outline_entry) => {
-                        format!("outline: {}", outline_entry.outline.text)
-                    }
-                },
-                PanelEntry::Search(search_entry) => {
-                    let search_data = search_entry.render_data.get_or_init(|| {
-                        SearchData::new(&search_entry.match_range, multi_buffer_snapshot)
-                    });
-                    let mut search_result = String::new();
-                    let mut last_end = 0;
-                    for range in &search_data.search_match_indices {
-                        search_result.push_str(&search_data.context_text[last_end..range.start]);
-                        search_result.push('«');
-                        search_result.push_str(&search_data.context_text[range.start..range.end]);
-                        search_result.push('»');
-                        last_end = range.end;
-                    }
-                    search_result.push_str(&search_data.context_text[last_end..]);
-
-                    format!("search: {search_result}")
-                }
-            };
-
-            if Some(&entry.entry) == selected_entry {
-                display_string += SELECTED_MARKER;
-            }
-        }
-        display_string
-    }
-
-    fn init_test(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let settings = SettingsStore::test(cx);
-            cx.set_global(settings);
-
-            theme::init(theme::LoadThemes::JustBase, cx);
-
-            editor::init(cx);
-            project_search::init(cx);
-            buffer_search::init(cx);
-            super::init(cx);
-        });
-    }
-
-    // Based on https://github.com/rust-lang/rust-analyzer/
-    async fn populate_with_test_ra_project(fs: &FakeFs, root: &str) {
-        fs.insert_tree(
-            root,
-            json!({
-                    "crates": {
-                        "ide": {
-                            "src": {
-                                "inlay_hints": {
-                                    "fn_lifetime_fn.rs": r##"
-        pub(super) fn hints(
-            acc: &mut Vec<InlayHint>,
-            config: &InlayHintsConfig,
-            func: ast::Fn,
-        ) -> Option<()> {
-            // ... snip
-
-            let mut used_names: FxHashMap<SmolStr, usize> =
-                match config.param_names_for_lifetime_elision_hints {
-                    true => generic_param_list
-                        .iter()
-                        .flat_map(|gpl| gpl.lifetime_params())
-                        .filter_map(|param| param.lifetime())
-                        .filter_map(|lt| Some((SmolStr::from(lt.text().as_str().get(1..)?), 0)))
-                        .collect(),
-                    false => Default::default(),
-                };
-            {
-                let mut potential_lt_refs = potential_lt_refs.iter().filter(|&&(.., is_elided)| is_elided);
-                if self_param.is_some() && potential_lt_refs.next().is_some() {
-                    allocated_lifetimes.push(if config.param_names_for_lifetime_elision_hints {
-                        // self can't be used as a lifetime, so no need to check for collisions
-                        "'self".into()
-                    } else {
-                        gen_idx_name()
-                    });
-                }
-                potential_lt_refs.for_each(|(name, ..)| {
-                    let name = match name {
-                        Some(it) if config.param_names_for_lifetime_elision_hints => {
-                            if let Some(c) = used_names.get_mut(it.text().as_str()) {
-                                *c += 1;
-                                SmolStr::from(format!("'{text}{c}", text = it.text().as_str()))
-                            } else {
-                                used_names.insert(it.text().as_str().into(), 0);
-                                SmolStr::from_iter(["\'", it.text().as_str()])
-                            }
-                        }
-                        _ => gen_idx_name(),
-                    };
-                    allocated_lifetimes.push(name);
-                });
-            }
-
-            // ... snip
-        }
-
-        // ... snip
-
-            #[test]
-            fn hints_lifetimes_named() {
-                check_with_config(
-                    InlayHintsConfig { param_names_for_lifetime_elision_hints: true, ..TEST_CONFIG },
-                    r#"
-        fn nested_in<'named>(named: &        &X<      &()>) {}
-        //          ^'named1, 'named2, 'named3, $
-                                  //^'named1 ^'named2 ^'named3
-        "#,
-                );
-            }
-
-        // ... snip
-        "##,
-                                },
-                        "inlay_hints.rs": r#"
-    #[derive(Clone, Debug, PartialEq, Eq)]
-    pub struct InlayHintsConfig {
-        // ... snip
-        pub param_names_for_lifetime_elision_hints: bool,
-        pub max_length: Option<usize>,
-        // ... snip
-    }
-
-    impl Config {
-        pub fn inlay_hints(&self) -> InlayHintsConfig {
-            InlayHintsConfig {
-                // ... snip
-                param_names_for_lifetime_elision_hints: self
-                    .inlayHints_lifetimeElisionHints_useParameterNames()
-                    .to_owned(),
-                max_length: self.inlayHints_maxLength().to_owned(),
-                // ... snip
-            }
-        }
-    }
-    "#,
-                        "static_index.rs": r#"
-// ... snip
-        fn add_file(&mut self, file_id: FileId) {
-            let current_crate = crates_for(self.db, file_id).pop().map(Into::into);
-            let folds = self.analysis.folding_ranges(file_id).unwrap();
-            let inlay_hints = self
-                .analysis
-                .inlay_hints(
-                    &InlayHintsConfig {
-                        // ... snip
-                        closure_style: hir::ClosureStyle::ImplFn,
-                        param_names_for_lifetime_elision_hints: false,
-                        binding_mode_hints: false,
-                        max_length: Some(25),
-                        closure_capture_hints: false,
-                        // ... snip
-                    },
-                    file_id,
-                    None,
-                )
-                .unwrap();
-            // ... snip
-    }
-// ... snip
-    "#
-                            }
-                        },
-                        "rust-analyzer": {
-                            "src": {
-                                "cli": {
-                                    "analysis_stats.rs": r#"
-        // ... snip
-                for &file_id in &file_ids {
-                    _ = analysis.inlay_hints(
-                        &InlayHintsConfig {
-                            // ... snip
-                            implicit_drop_hints: true,
-                            lifetime_elision_hints: ide::LifetimeElisionHints::Always,
-                            param_names_for_lifetime_elision_hints: true,
-                            hide_named_constructor_hints: false,
-                            hide_closure_initialization_hints: false,
-                            closure_style: hir::ClosureStyle::ImplFn,
-                            max_length: Some(25),
-                            closing_brace_hints_min_lines: Some(20),
-                            fields_to_resolve: InlayFieldsToResolve::empty(),
-                            range_exclusive_hints: true,
-                        },
-                        file_id.into(),
-                        None,
-                    );
-                }
-        // ... snip
-                                    "#,
-                                },
-                                "config.rs": r#"
-                config_data! {
-                    /// Configs that only make sense when they are set by a client. As such they can only be defined
-                    /// by setting them using client's settings (e.g `settings.json` on VS Code).
-                    client: struct ClientDefaultConfigData <- ClientConfigInput -> {
-                        // ... snip
-                        /// Maximum length for inlay hints. Set to null to have an unlimited length.
-                        inlayHints_maxLength: Option<usize>                        = Some(25),
-                        // ... snip
-                        /// Whether to prefer using parameter names as the name for elided lifetime hints if possible.
-                        inlayHints_lifetimeElisionHints_useParameterNames: bool    = false,
-                        // ... snip
-                    }
-                }
-
-                impl Config {
-                    // ... snip
-                    pub fn inlay_hints(&self) -> InlayHintsConfig {
-                        InlayHintsConfig {
-                            // ... snip
-                            param_names_for_lifetime_elision_hints: self
-                                .inlayHints_lifetimeElisionHints_useParameterNames()
-                                .to_owned(),
-                            max_length: self.inlayHints_maxLength().to_owned(),
-                            // ... snip
-                        }
-                    }
-                    // ... snip
-                }
-                "#
-                                }
-                        }
-                    }
-            }),
-        )
-        .await;
-    }
-
-    fn snapshot(outline_panel: &OutlinePanel, cx: &App) -> MultiBufferSnapshot {
-        outline_panel
-            .active_editor()
-            .unwrap()
-            .read(cx)
-            .buffer()
-            .read(cx)
-            .snapshot(cx)
-    }
-
-    fn selected_row_text(editor: &Entity<Editor>, cx: &mut App) -> String {
-        editor.update(cx, |editor, cx| {
-            let selections = editor.selections.all::<language::Point>(&editor.display_snapshot(cx));
-            assert_eq!(selections.len(), 1, "Active editor should have exactly one selection after any outline panel interactions");
-            let selection = selections.first().unwrap();
-            let multi_buffer_snapshot = editor.buffer().read(cx).snapshot(cx);
-            let line_start = language::Point::new(selection.start.row, 0);
-            let line_end = multi_buffer_snapshot.clip_point(language::Point::new(selection.end.row, u32::MAX), language::Bias::Right);
-            multi_buffer_snapshot.text_for_range(line_start..line_end).collect::<String>().trim().to_owned()
-        })
-    }
-
-    #[gpui::test]
-    async fn test_outline_keyboard_expand_collapse(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(
-            "/test",
-            json!({
-                "src": {
-                    "lib.rs": indoc!("
-                            mod outer {
-                                pub struct OuterStruct {
-                                    field: String,
-                                }
-                                impl OuterStruct {
-                                    pub fn new() -> Self {
-                                        Self { field: String::new() }
-                                    }
-                                    pub fn method(&self) {
-                                        println!(\"{}\", self.field);
-                                    }
-                                }
-                                mod inner {
-                                    pub fn inner_function() {
-                                        let x = 42;
-                                        println!(\"{}\", x);
-                                    }
-                                    pub struct InnerStruct {
-                                        value: i32,
-                                    }
-                                }
-                            }
-                            fn main() {
-                                let s = outer::OuterStruct::new();
-                                s.method();
-                            }
-                        "),
-                }
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs.clone(), ["/test".as_ref()], cx).await;
-        project.read_with(cx, |project, _| project.languages().add(rust_lang()));
-        let workspace = add_outline_panel(&project, cx).await;
-        let cx = &mut VisualTestContext::from_window(*workspace, cx);
-        let outline_panel = outline_panel(&workspace, cx);
-
-        outline_panel.update_in(cx, |outline_panel, window, cx| {
-            outline_panel.set_active(true, window, cx)
-        });
-
-        workspace
-            .update(cx, |workspace, window, cx| {
-                workspace.open_abs_path(
-                    PathBuf::from("/test/src/lib.rs"),
-                    OpenOptions {
-                        visible: Some(OpenVisible::All),
-                        ..Default::default()
-                    },
-                    window,
-                    cx,
-                )
-            })
-            .unwrap()
-            .await
-            .unwrap();
-
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(500));
-        cx.run_until_parked();
-
-        // Force another update cycle to ensure outlines are fetched
-        outline_panel.update_in(cx, |panel, window, cx| {
-            panel.update_non_fs_items(window, cx);
-            panel.update_cached_entries(Some(UPDATE_DEBOUNCE), window, cx);
-        });
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(500));
-        cx.run_until_parked();
-
-        outline_panel.update(cx, |outline_panel, cx| {
-            assert_eq!(
-                display_entries(
-                    &project,
-                    &snapshot(outline_panel, cx),
-                    &outline_panel.cached_entries,
-                    outline_panel.selected_entry(),
-                    cx,
-                ),
-                indoc!(
-                    "
-outline: mod outer  <==== selected
-  outline: pub struct OuterStruct
-    outline: field
-  outline: impl OuterStruct
-    outline: pub fn new
-    outline: pub fn method
-  outline: mod inner
-    outline: pub fn inner_function
-    outline: pub struct InnerStruct
-      outline: value
-outline: fn main"
-                )
-            );
-        });
-
-        let parent_outline = outline_panel
-            .read_with(cx, |panel, _cx| {
-                panel
-                    .cached_entries
-                    .iter()
-                    .find_map(|entry| match &entry.entry {
-                        PanelEntry::Outline(OutlineEntry::Outline(outline))
-                            if panel
-                                .outline_children_cache
-                                .get(&outline.buffer_id)
-                                .and_then(|children_map| {
-                                    let key =
-                                        (outline.outline.range.clone(), outline.outline.depth);
-                                    children_map.get(&key)
-                                })
-                                .copied()
-                                .unwrap_or(false) =>
-                        {
-                            Some(entry.entry.clone())
-                        }
-                        _ => None,
-                    })
-            })
-            .expect("Should find an outline with children");
-
-        outline_panel.update_in(cx, |panel, window, cx| {
-            panel.select_entry(parent_outline.clone(), true, window, cx);
-            panel.collapse_selected_entry(&CollapseSelectedEntry, window, cx);
-        });
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(100));
-        cx.run_until_parked();
-
-        outline_panel.update(cx, |outline_panel, cx| {
-            assert_eq!(
-                display_entries(
-                    &project,
-                    &snapshot(outline_panel, cx),
-                    &outline_panel.cached_entries,
-                    outline_panel.selected_entry(),
-                    cx,
-                ),
-                indoc!(
-                    "
-outline: mod outer  <==== selected
-outline: fn main"
-                )
-            );
-        });
-
-        outline_panel.update_in(cx, |panel, window, cx| {
-            panel.expand_selected_entry(&ExpandSelectedEntry, window, cx);
-        });
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(100));
-        cx.run_until_parked();
-
-        outline_panel.update(cx, |outline_panel, cx| {
-            assert_eq!(
-                display_entries(
-                    &project,
-                    &snapshot(outline_panel, cx),
-                    &outline_panel.cached_entries,
-                    outline_panel.selected_entry(),
-                    cx,
-                ),
-                indoc!(
-                    "
-outline: mod outer  <==== selected
-  outline: pub struct OuterStruct
-    outline: field
-  outline: impl OuterStruct
-    outline: pub fn new
-    outline: pub fn method
-  outline: mod inner
-    outline: pub fn inner_function
-    outline: pub struct InnerStruct
-      outline: value
-outline: fn main"
-                )
-            );
-        });
-
-        outline_panel.update_in(cx, |panel, window, cx| {
-            panel.collapsed_entries.clear();
-            panel.update_cached_entries(None, window, cx);
-        });
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(100));
-        cx.run_until_parked();
-
-        outline_panel.update_in(cx, |panel, window, cx| {
-            let outlines_with_children: Vec<_> = panel
-                .cached_entries
-                .iter()
-                .filter_map(|entry| match &entry.entry {
-                    PanelEntry::Outline(OutlineEntry::Outline(outline))
-                        if panel
-                            .outline_children_cache
-                            .get(&outline.buffer_id)
-                            .and_then(|children_map| {
-                                let key = (outline.outline.range.clone(), outline.outline.depth);
-                                children_map.get(&key)
-                            })
-                            .copied()
-                            .unwrap_or(false) =>
-                    {
-                        Some(entry.entry.clone())
-                    }
-                    _ => None,
-                })
-                .collect();
-
-            for outline in outlines_with_children {
-                panel.select_entry(outline, false, window, cx);
-                panel.collapse_selected_entry(&CollapseSelectedEntry, window, cx);
-            }
-        });
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(100));
-        cx.run_until_parked();
-
-        outline_panel.update(cx, |outline_panel, cx| {
-            assert_eq!(
-                display_entries(
-                    &project,
-                    &snapshot(outline_panel, cx),
-                    &outline_panel.cached_entries,
-                    outline_panel.selected_entry(),
-                    cx,
-                ),
-                indoc!(
-                    "
-outline: mod outer
-outline: fn main"
-                )
-            );
-        });
-
-        let collapsed_entries_count =
-            outline_panel.read_with(cx, |panel, _| panel.collapsed_entries.len());
-        assert!(
-            collapsed_entries_count > 0,
-            "Should have collapsed entries tracked"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_outline_click_toggle_behavior(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(
-            "/test",
-            json!({
-                "src": {
-                    "main.rs": indoc!("
-                            struct Config {
-                                name: String,
-                                value: i32,
-                            }
-                            impl Config {
-                                fn new(name: String) -> Self {
-                                    Self { name, value: 0 }
-                                }
-                                fn get_value(&self) -> i32 {
-                                    self.value
-                                }
-                            }
-                            enum Status {
-                                Active,
-                                Inactive,
-                            }
-                            fn process_config(config: Config) -> Status {
-                                if config.get_value() > 0 {
-                                    Status::Active
-                                } else {
-                                    Status::Inactive
-                                }
-                            }
-                            fn main() {
-                                let config = Config::new(\"test\".to_string());
-                                let status = process_config(config);
-                            }
-                        "),
-                }
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs.clone(), ["/test".as_ref()], cx).await;
-        project.read_with(cx, |project, _| project.languages().add(rust_lang()));
-
-        let workspace = add_outline_panel(&project, cx).await;
-        let cx = &mut VisualTestContext::from_window(*workspace, cx);
-        let outline_panel = outline_panel(&workspace, cx);
-
-        outline_panel.update_in(cx, |outline_panel, window, cx| {
-            outline_panel.set_active(true, window, cx)
-        });
-
-        let _editor = workspace
-            .update(cx, |workspace, window, cx| {
-                workspace.open_abs_path(
-                    PathBuf::from("/test/src/main.rs"),
-                    OpenOptions {
-                        visible: Some(OpenVisible::All),
-                        ..Default::default()
-                    },
-                    window,
-                    cx,
-                )
-            })
-            .unwrap()
-            .await
-            .unwrap();
-
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(100));
-        cx.run_until_parked();
-
-        outline_panel.update(cx, |outline_panel, _cx| {
-            outline_panel.selected_entry = SelectedEntry::None;
-        });
-
-        // Check initial state - all entries should be expanded by default
-        outline_panel.update(cx, |outline_panel, cx| {
-            assert_eq!(
-                display_entries(
-                    &project,
-                    &snapshot(outline_panel, cx),
-                    &outline_panel.cached_entries,
-                    outline_panel.selected_entry(),
-                    cx,
-                ),
-                indoc!(
-                    "
-outline: struct Config
-  outline: name
-  outline: value
-outline: impl Config
-  outline: fn new
-  outline: fn get_value
-outline: enum Status
-  outline: Active
-  outline: Inactive
-outline: fn process_config
-outline: fn main"
-                )
-            );
-        });
-
-        outline_panel.update(cx, |outline_panel, _cx| {
-            outline_panel.selected_entry = SelectedEntry::None;
-        });
-
-        cx.update(|window, cx| {
-            outline_panel.update(cx, |outline_panel, cx| {
-                outline_panel.select_first(&SelectFirst, window, cx);
-            });
-        });
-
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(100));
-        cx.run_until_parked();
-
-        outline_panel.update(cx, |outline_panel, cx| {
-            assert_eq!(
-                display_entries(
-                    &project,
-                    &snapshot(outline_panel, cx),
-                    &outline_panel.cached_entries,
-                    outline_panel.selected_entry(),
-                    cx,
-                ),
-                indoc!(
-                    "
-outline: struct Config  <==== selected
-  outline: name
-  outline: value
-outline: impl Config
-  outline: fn new
-  outline: fn get_value
-outline: enum Status
-  outline: Active
-  outline: Inactive
-outline: fn process_config
-outline: fn main"
-                )
-            );
-        });
-
-        cx.update(|window, cx| {
-            outline_panel.update(cx, |outline_panel, cx| {
-                outline_panel.collapse_selected_entry(&CollapseSelectedEntry, window, cx);
-            });
-        });
-
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(100));
-        cx.run_until_parked();
-
-        outline_panel.update(cx, |outline_panel, cx| {
-            assert_eq!(
-                display_entries(
-                    &project,
-                    &snapshot(outline_panel, cx),
-                    &outline_panel.cached_entries,
-                    outline_panel.selected_entry(),
-                    cx,
-                ),
-                indoc!(
-                    "
-outline: struct Config  <==== selected
-outline: impl Config
-  outline: fn new
-  outline: fn get_value
-outline: enum Status
-  outline: Active
-  outline: Inactive
-outline: fn process_config
-outline: fn main"
-                )
-            );
-        });
-
-        cx.update(|window, cx| {
-            outline_panel.update(cx, |outline_panel, cx| {
-                outline_panel.expand_selected_entry(&ExpandSelectedEntry, window, cx);
-            });
-        });
-
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(100));
-        cx.run_until_parked();
-
-        outline_panel.update(cx, |outline_panel, cx| {
-            assert_eq!(
-                display_entries(
-                    &project,
-                    &snapshot(outline_panel, cx),
-                    &outline_panel.cached_entries,
-                    outline_panel.selected_entry(),
-                    cx,
-                ),
-                indoc!(
-                    "
-outline: struct Config  <==== selected
-  outline: name
-  outline: value
-outline: impl Config
-  outline: fn new
-  outline: fn get_value
-outline: enum Status
-  outline: Active
-  outline: Inactive
-outline: fn process_config
-outline: fn main"
-                )
-            );
-        });
-    }
-
-    #[gpui::test]
-    async fn test_outline_expand_collapse_all(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(
-            "/test",
-            json!({
-                "src": {
-                    "lib.rs": indoc!("
-                            mod outer {
-                                pub struct OuterStruct {
-                                    field: String,
-                                }
-                                impl OuterStruct {
-                                    pub fn new() -> Self {
-                                        Self { field: String::new() }
-                                    }
-                                    pub fn method(&self) {
-                                        println!(\"{}\", self.field);
-                                    }
-                                }
-                                mod inner {
-                                    pub fn inner_function() {
-                                        let x = 42;
-                                        println!(\"{}\", x);
-                                    }
-                                    pub struct InnerStruct {
-                                        value: i32,
-                                    }
-                                }
-                            }
-                            fn main() {
-                                let s = outer::OuterStruct::new();
-                                s.method();
-                            }
-                        "),
-                }
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs.clone(), ["/test".as_ref()], cx).await;
-        project.read_with(cx, |project, _| project.languages().add(rust_lang()));
-        let workspace = add_outline_panel(&project, cx).await;
-        let cx = &mut VisualTestContext::from_window(*workspace, cx);
-        let outline_panel = outline_panel(&workspace, cx);
-
-        outline_panel.update_in(cx, |outline_panel, window, cx| {
-            outline_panel.set_active(true, window, cx)
-        });
-
-        workspace
-            .update(cx, |workspace, window, cx| {
-                workspace.open_abs_path(
-                    PathBuf::from("/test/src/lib.rs"),
-                    OpenOptions {
-                        visible: Some(OpenVisible::All),
-                        ..Default::default()
-                    },
-                    window,
-                    cx,
-                )
-            })
-            .unwrap()
-            .await
-            .unwrap();
-
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(500));
-        cx.run_until_parked();
-
-        // Force another update cycle to ensure outlines are fetched
-        outline_panel.update_in(cx, |panel, window, cx| {
-            panel.update_non_fs_items(window, cx);
-            panel.update_cached_entries(Some(UPDATE_DEBOUNCE), window, cx);
-        });
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(500));
-        cx.run_until_parked();
-
-        outline_panel.update(cx, |outline_panel, cx| {
-            assert_eq!(
-                display_entries(
-                    &project,
-                    &snapshot(outline_panel, cx),
-                    &outline_panel.cached_entries,
-                    outline_panel.selected_entry(),
-                    cx,
-                ),
-                indoc!(
-                    "
-outline: mod outer  <==== selected
-  outline: pub struct OuterStruct
-    outline: field
-  outline: impl OuterStruct
-    outline: pub fn new
-    outline: pub fn method
-  outline: mod inner
-    outline: pub fn inner_function
-    outline: pub struct InnerStruct
-      outline: value
-outline: fn main"
-                )
-            );
-        });
-
-        let _parent_outline = outline_panel
-            .read_with(cx, |panel, _cx| {
-                panel
-                    .cached_entries
-                    .iter()
-                    .find_map(|entry| match &entry.entry {
-                        PanelEntry::Outline(OutlineEntry::Outline(outline))
-                            if panel
-                                .outline_children_cache
-                                .get(&outline.buffer_id)
-                                .and_then(|children_map| {
-                                    let key =
-                                        (outline.outline.range.clone(), outline.outline.depth);
-                                    children_map.get(&key)
-                                })
-                                .copied()
-                                .unwrap_or(false) =>
-                        {
-                            Some(entry.entry.clone())
-                        }
-                        _ => None,
-                    })
-            })
-            .expect("Should find an outline with children");
-
-        // Collapse all entries
-        outline_panel.update_in(cx, |panel, window, cx| {
-            panel.collapse_all_entries(&CollapseAllEntries, window, cx);
-        });
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(100));
-        cx.run_until_parked();
-
-        let expected_collapsed_output = indoc!(
-            "
-        outline: mod outer  <==== selected
-        outline: fn main"
-        );
-
-        outline_panel.update(cx, |panel, cx| {
-            assert_eq! {
-                display_entries(
-                    &project,
-                    &snapshot(panel, cx),
-                    &panel.cached_entries,
-                    panel.selected_entry(),
-                    cx,
-                ),
-                expected_collapsed_output
-            };
-        });
-
-        // Expand all entries
-        outline_panel.update_in(cx, |panel, window, cx| {
-            panel.expand_all_entries(&ExpandAllEntries, window, cx);
-        });
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(100));
-        cx.run_until_parked();
-
-        let expected_expanded_output = indoc!(
-            "
-        outline: mod outer  <==== selected
-          outline: pub struct OuterStruct
-            outline: field
-          outline: impl OuterStruct
-            outline: pub fn new
-            outline: pub fn method
-          outline: mod inner
-            outline: pub fn inner_function
-            outline: pub struct InnerStruct
-              outline: value
-        outline: fn main"
-        );
-
-        outline_panel.update(cx, |panel, cx| {
-            assert_eq! {
-                display_entries(
-                    &project,
-                    &snapshot(panel, cx),
-                    &panel.cached_entries,
-                    panel.selected_entry(),
-                    cx,
-                ),
-                expected_expanded_output
-            };
-        });
-    }
-
-    #[gpui::test]
-    async fn test_buffer_search(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(
-            "/test",
-            json!({
-                "foo.txt": r#"<_constitution>
-
-</_constitution>
-
-
-
-## 📊 Output
-
-| Field          | Meaning                |
-"#
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs.clone(), ["/test".as_ref()], cx).await;
-        let workspace = add_outline_panel(&project, cx).await;
-        let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-        let editor = workspace
-            .update(cx, |workspace, window, cx| {
-                workspace.open_abs_path(
-                    PathBuf::from("/test/foo.txt"),
-                    OpenOptions {
-                        visible: Some(OpenVisible::All),
-                        ..OpenOptions::default()
-                    },
-                    window,
-                    cx,
-                )
-            })
-            .unwrap()
-            .await
-            .unwrap()
-            .downcast::<Editor>()
-            .unwrap();
-
-        let search_bar = workspace
-            .update(cx, |_, window, cx| {
-                cx.new(|cx| {
-                    let mut search_bar = BufferSearchBar::new(None, window, cx);
-                    search_bar.set_active_pane_item(Some(&editor), window, cx);
-                    search_bar.show(window, cx);
-                    search_bar
-                })
-            })
-            .unwrap();
-
-        let outline_panel = outline_panel(&workspace, cx);
-
-        outline_panel.update_in(cx, |outline_panel, window, cx| {
-            outline_panel.set_active(true, window, cx)
-        });
-
-        search_bar
-            .update_in(cx, |search_bar, window, cx| {
-                search_bar.search("  ", None, true, window, cx)
-            })
-            .await
-            .unwrap();
-
-        cx.executor()
-            .advance_clock(UPDATE_DEBOUNCE + Duration::from_millis(500));
-        cx.run_until_parked();
-
-        outline_panel.update(cx, |outline_panel, cx| {
-            assert_eq!(
-                display_entries(
-                    &project,
-                    &snapshot(outline_panel, cx),
-                    &outline_panel.cached_entries,
-                    outline_panel.selected_entry(),
-                    cx,
-                ),
-                "search: | Field«  »        | Meaning                |  <==== selected
-search: | Field  «  »      | Meaning                |
-search: | Field    «  »    | Meaning                |
-search: | Field      «  »  | Meaning                |
-search: | Field        «  »| Meaning                |
-search: | Field          | Meaning«  »              |
-search: | Field          | Meaning  «  »            |
-search: | Field          | Meaning    «  »          |
-search: | Field          | Meaning      «  »        |
-search: | Field          | Meaning        «  »      |
-search: | Field          | Meaning          «  »    |
-search: | Field          | Meaning            «  »  |
-search: | Field          | Meaning              «  »|"
-            );
-        });
-    }
-}
diff --git a/crates/outline_panel/src/outline_panel_settings.rs b/crates/outline_panel/src/outline_panel_settings.rs
deleted file mode 100644
index b2b1a6fe68..0000000000
--- a/crates/outline_panel/src/outline_panel_settings.rs
+++ /dev/null
@@ -1,66 +0,0 @@
-use editor::EditorSettings;
-use gpui::{App, Pixels};
-use settings::RegisterSetting;
-pub use settings::{DockSide, Settings, ShowIndentGuides};
-use ui::scrollbars::{ScrollbarVisibility, ShowScrollbar};
-
-#[derive(Debug, Clone, Copy, PartialEq, RegisterSetting)]
-pub struct OutlinePanelSettings {
-    pub button: bool,
-    pub default_width: Pixels,
-    pub dock: DockSide,
-    pub file_icons: bool,
-    pub folder_icons: bool,
-    pub git_status: bool,
-    pub indent_size: f32,
-    pub indent_guides: IndentGuidesSettings,
-    pub auto_reveal_entries: bool,
-    pub auto_fold_dirs: bool,
-    pub scrollbar: ScrollbarSettings,
-    pub expand_outlines_with_depth: usize,
-}
-
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub struct ScrollbarSettings {
-    /// When to show the scrollbar in the project panel.
-    ///
-    /// Default: inherits editor scrollbar settings
-    pub show: Option<ShowScrollbar>,
-}
-
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub struct IndentGuidesSettings {
-    pub show: ShowIndentGuides,
-}
-
-impl ScrollbarVisibility for OutlinePanelSettings {
-    fn visibility(&self, cx: &App) -> ShowScrollbar {
-        self.scrollbar
-            .show
-            .unwrap_or_else(|| EditorSettings::get_global(cx).scrollbar.show)
-    }
-}
-
-impl Settings for OutlinePanelSettings {
-    fn from_settings(content: &settings::SettingsContent) -> Self {
-        let panel = content.outline_panel.as_ref().unwrap();
-        Self {
-            button: panel.button.unwrap(),
-            default_width: panel.default_width.map(gpui::px).unwrap(),
-            dock: panel.dock.unwrap(),
-            file_icons: panel.file_icons.unwrap(),
-            folder_icons: panel.folder_icons.unwrap(),
-            git_status: panel.git_status.unwrap(),
-            indent_size: panel.indent_size.unwrap(),
-            indent_guides: IndentGuidesSettings {
-                show: panel.indent_guides.unwrap().show.unwrap(),
-            },
-            auto_reveal_entries: panel.auto_reveal_entries.unwrap(),
-            auto_fold_dirs: panel.auto_fold_dirs.unwrap(),
-            scrollbar: ScrollbarSettings {
-                show: panel.scrollbar.unwrap().show.map(Into::into),
-            },
-            expand_outlines_with_depth: panel.expand_outlines_with_depth.unwrap(),
-        }
-    }
-}
diff --git a/crates/panel/Cargo.toml b/crates/panel/Cargo.toml
deleted file mode 100644
index 3c51e6d6dc..0000000000
--- a/crates/panel/Cargo.toml
+++ /dev/null
@@ -1,20 +0,0 @@
-[package]
-name = "panel"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/panel.rs"
-
-[dependencies]
-editor.workspace = true
-gpui.workspace = true
-settings.workspace = true
-theme.workspace = true
-ui.workspace = true
-workspace.workspace = true
diff --git a/crates/panel/LICENSE-GPL b/crates/panel/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/panel/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/panel/src/panel.rs b/crates/panel/src/panel.rs
deleted file mode 100644
index 1930f654e9..0000000000
--- a/crates/panel/src/panel.rs
+++ /dev/null
@@ -1,136 +0,0 @@
-//! # panel
-use editor::{Editor, EditorElement, EditorStyle};
-use gpui::{Entity, TextStyle, actions};
-use settings::Settings;
-use theme::ThemeSettings;
-use ui::{Tab, prelude::*};
-
-actions!(
-    panel,
-    [
-        /// Navigates to the next tab in the panel.
-        NextPanelTab,
-        /// Navigates to the previous tab in the panel.
-        PreviousPanelTab
-    ]
-);
-
-pub trait PanelHeader: workspace::Panel {
-    fn header_height(&self, cx: &mut App) -> Pixels {
-        Tab::container_height(cx)
-    }
-
-    fn panel_header_container(&self, _window: &mut Window, cx: &mut App) -> Div {
-        h_flex()
-            .h(self.header_height(cx))
-            .w_full()
-            .px_1()
-            .flex_none()
-    }
-}
-
-/// Implement this trait to enable a panel to have tabs.
-pub trait PanelTabs: PanelHeader {
-    /// Returns the index of the currently selected tab.
-    fn selected_tab(&self, cx: &mut App) -> usize;
-    /// Selects the tab at the given index.
-    fn select_tab(&self, cx: &mut App, index: usize);
-    /// Moves to the next tab.
-    fn next_tab(&self, _: NextPanelTab, cx: &mut App) -> Self;
-    /// Moves to the previous tab.
-    fn previous_tab(&self, _: PreviousPanelTab, cx: &mut App) -> Self;
-}
-
-#[derive(IntoElement)]
-pub struct PanelTab {}
-
-impl RenderOnce for PanelTab {
-    fn render(self, _window: &mut Window, _cx: &mut App) -> impl IntoElement {
-        div()
-    }
-}
-
-pub fn panel_button(label: impl Into<SharedString>) -> ui::Button {
-    let label = label.into();
-    let id = ElementId::Name(label.to_lowercase().replace(' ', "_").into());
-    ui::Button::new(id, label)
-        .label_size(ui::LabelSize::Small)
-        .icon_size(ui::IconSize::Small)
-        // TODO: Change this once we use on_surface_bg in button_like
-        .layer(ui::ElevationIndex::ModalSurface)
-        .size(ui::ButtonSize::Compact)
-}
-
-pub fn panel_filled_button(label: impl Into<SharedString>) -> ui::Button {
-    panel_button(label).style(ui::ButtonStyle::Filled)
-}
-
-pub fn panel_icon_button(id: impl Into<SharedString>, icon: IconName) -> ui::IconButton {
-    let id = ElementId::Name(id.into());
-
-    IconButton::new(id, icon)
-        // TODO: Change this once we use on_surface_bg in button_like
-        .layer(ui::ElevationIndex::ModalSurface)
-}
-
-pub fn panel_filled_icon_button(id: impl Into<SharedString>, icon: IconName) -> ui::IconButton {
-    panel_icon_button(id, icon).style(ui::ButtonStyle::Filled)
-}
-
-pub fn panel_editor_container(_window: &mut Window, cx: &mut App) -> Div {
-    v_flex()
-        .size_full()
-        .gap(px(8.))
-        .p_2()
-        .bg(cx.theme().colors().editor_background)
-}
-
-pub fn panel_editor_style(monospace: bool, window: &Window, cx: &App) -> EditorStyle {
-    let settings = ThemeSettings::get_global(cx);
-
-    let font_size = TextSize::Small.rems(cx).to_pixels(window.rem_size());
-
-    let (font_family, font_fallbacks, font_features, font_weight, line_height) = if monospace {
-        (
-            settings.buffer_font.family.clone(),
-            settings.buffer_font.fallbacks.clone(),
-            settings.buffer_font.features.clone(),
-            settings.buffer_font.weight,
-            font_size * settings.buffer_line_height.value(),
-        )
-    } else {
-        (
-            settings.ui_font.family.clone(),
-            settings.ui_font.fallbacks.clone(),
-            settings.ui_font.features.clone(),
-            settings.ui_font.weight,
-            window.line_height(),
-        )
-    };
-
-    EditorStyle {
-        background: cx.theme().colors().editor_background,
-        local_player: cx.theme().players().local(),
-        text: TextStyle {
-            color: cx.theme().colors().text,
-            font_family,
-            font_fallbacks,
-            font_features,
-            font_size: TextSize::Small.rems(cx).into(),
-            font_weight,
-            line_height: line_height.into(),
-            ..Default::default()
-        },
-        syntax: cx.theme().syntax().clone(),
-        ..Default::default()
-    }
-}
-
-pub fn panel_editor_element(
-    editor: &Entity<Editor>,
-    monospace: bool,
-    window: &mut Window,
-    cx: &mut App,
-) -> EditorElement {
-    EditorElement::new(editor, panel_editor_style(monospace, window, cx))
-}
diff --git a/crates/paths/Cargo.toml b/crates/paths/Cargo.toml
deleted file mode 100644
index 24da7d46e9..0000000000
--- a/crates/paths/Cargo.toml
+++ /dev/null
@@ -1,20 +0,0 @@
-[package]
-name = "paths"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[features]
-test-support = []
-
-[lib]
-path = "src/paths.rs"
-
-[dependencies]
-dirs.workspace = true
-ignore.workspace = true
-util.workspace = true
diff --git a/crates/paths/LICENSE-GPL b/crates/paths/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/paths/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/paths/src/paths.rs b/crates/paths/src/paths.rs
deleted file mode 100644
index a6aa8354b4..0000000000
--- a/crates/paths/src/paths.rs
+++ /dev/null
@@ -1,566 +0,0 @@
-//! Paths to locations used by Zed.
-
-use std::env;
-use std::path::{Path, PathBuf};
-use std::sync::{LazyLock, OnceLock};
-
-pub use util::paths::home_dir;
-use util::rel_path::RelPath;
-
-/// A default editorconfig file name to use when resolving project settings.
-pub const EDITORCONFIG_NAME: &str = ".editorconfig";
-
-/// A custom data directory override, set only by `set_custom_data_dir`.
-/// This is used to override the default data directory location.
-/// The directory will be created if it doesn't exist when set.
-static CUSTOM_DATA_DIR: OnceLock<PathBuf> = OnceLock::new();
-
-/// The resolved data directory, combining custom override or platform defaults.
-/// This is set once and cached for subsequent calls.
-/// On macOS, this is `~/Library/Application Support/Zed`.
-/// On Linux/FreeBSD, this is `$XDG_DATA_HOME/zed`.
-/// On Windows, this is `%LOCALAPPDATA%\Zed`.
-static CURRENT_DATA_DIR: OnceLock<PathBuf> = OnceLock::new();
-
-/// The resolved config directory, combining custom override or platform defaults.
-/// This is set once and cached for subsequent calls.
-/// On macOS, this is `~/.config/zed`.
-/// On Linux/FreeBSD, this is `$XDG_CONFIG_HOME/zed`.
-/// On Windows, this is `%APPDATA%\Zed`.
-static CONFIG_DIR: OnceLock<PathBuf> = OnceLock::new();
-
-/// Returns the relative path to the zed_server directory on the ssh host.
-pub fn remote_server_dir_relative() -> &'static RelPath {
-    static CACHED: LazyLock<&'static RelPath> =
-        LazyLock::new(|| RelPath::unix(".zed_server").unwrap());
-    *CACHED
-}
-
-/// Returns the relative path to the zed_wsl_server directory on the wsl host.
-pub fn remote_wsl_server_dir_relative() -> &'static RelPath {
-    static CACHED: LazyLock<&'static RelPath> =
-        LazyLock::new(|| RelPath::unix(".zed_wsl_server").unwrap());
-    *CACHED
-}
-
-/// Sets a custom directory for all user data, overriding the default data directory.
-/// This function must be called before any other path operations that depend on the data directory.
-/// The directory's path will be canonicalized to an absolute path by a blocking FS operation.
-/// The directory will be created if it doesn't exist.
-///
-/// # Arguments
-///
-/// * `dir` - The path to use as the custom data directory. This will be used as the base
-///   directory for all user data, including databases, extensions, and logs.
-///
-/// # Returns
-///
-/// A reference to the static `PathBuf` containing the custom data directory path.
-///
-/// # Panics
-///
-/// Panics if:
-/// * Called after the data directory has been initialized (e.g., via `data_dir` or `config_dir`)
-/// * The directory's path cannot be canonicalized to an absolute path
-/// * The directory cannot be created
-pub fn set_custom_data_dir(dir: &str) -> &'static PathBuf {
-    if CURRENT_DATA_DIR.get().is_some() || CONFIG_DIR.get().is_some() {
-        panic!("set_custom_data_dir called after data_dir or config_dir was initialized");
-    }
-    CUSTOM_DATA_DIR.get_or_init(|| {
-        let mut path = PathBuf::from(dir);
-        if path.is_relative() && path.exists() {
-            let abs_path = path
-                .canonicalize()
-                .expect("failed to canonicalize custom data directory's path to an absolute path");
-            path = util::paths::SanitizedPath::new(&abs_path).into()
-        }
-        std::fs::create_dir_all(&path).expect("failed to create custom data directory");
-        path
-    })
-}
-
-/// Returns the path to the configuration directory used by Zed.
-pub fn config_dir() -> &'static PathBuf {
-    CONFIG_DIR.get_or_init(|| {
-        if let Some(custom_dir) = CUSTOM_DATA_DIR.get() {
-            custom_dir.join("config")
-        } else if cfg!(target_os = "windows") {
-            dirs::config_dir()
-                .expect("failed to determine RoamingAppData directory")
-                .join("Zed")
-        } else if cfg!(any(target_os = "linux", target_os = "freebsd")) {
-            if let Ok(flatpak_xdg_config) = std::env::var("FLATPAK_XDG_CONFIG_HOME") {
-                flatpak_xdg_config.into()
-            } else {
-                dirs::config_dir().expect("failed to determine XDG_CONFIG_HOME directory")
-            }
-            .join("zed")
-        } else {
-            home_dir().join(".config").join("zed")
-        }
-    })
-}
-
-/// Returns the path to the data directory used by Zed.
-pub fn data_dir() -> &'static PathBuf {
-    CURRENT_DATA_DIR.get_or_init(|| {
-        if let Some(custom_dir) = CUSTOM_DATA_DIR.get() {
-            custom_dir.clone()
-        } else if cfg!(target_os = "macos") {
-            home_dir().join("Library/Application Support/Zed")
-        } else if cfg!(any(target_os = "linux", target_os = "freebsd")) {
-            if let Ok(flatpak_xdg_data) = std::env::var("FLATPAK_XDG_DATA_HOME") {
-                flatpak_xdg_data.into()
-            } else {
-                dirs::data_local_dir().expect("failed to determine XDG_DATA_HOME directory")
-            }
-            .join("zed")
-        } else if cfg!(target_os = "windows") {
-            dirs::data_local_dir()
-                .expect("failed to determine LocalAppData directory")
-                .join("Zed")
-        } else {
-            config_dir().clone() // Fallback
-        }
-    })
-}
-
-/// Returns the path to the temp directory used by Zed.
-pub fn temp_dir() -> &'static PathBuf {
-    static TEMP_DIR: OnceLock<PathBuf> = OnceLock::new();
-    TEMP_DIR.get_or_init(|| {
-        if cfg!(target_os = "macos") {
-            return dirs::cache_dir()
-                .expect("failed to determine cachesDirectory directory")
-                .join("Zed");
-        }
-
-        if cfg!(target_os = "windows") {
-            return dirs::cache_dir()
-                .expect("failed to determine LocalAppData directory")
-                .join("Zed");
-        }
-
-        if cfg!(any(target_os = "linux", target_os = "freebsd")) {
-            return if let Ok(flatpak_xdg_cache) = std::env::var("FLATPAK_XDG_CACHE_HOME") {
-                flatpak_xdg_cache.into()
-            } else {
-                dirs::cache_dir().expect("failed to determine XDG_CACHE_HOME directory")
-            }
-            .join("zed");
-        }
-
-        home_dir().join(".cache").join("zed")
-    })
-}
-
-/// Returns the path to the hang traces directory.
-pub fn hang_traces_dir() -> &'static PathBuf {
-    static LOGS_DIR: OnceLock<PathBuf> = OnceLock::new();
-    LOGS_DIR.get_or_init(|| data_dir().join("hang_traces"))
-}
-
-/// Returns the path to the logs directory.
-pub fn logs_dir() -> &'static PathBuf {
-    static LOGS_DIR: OnceLock<PathBuf> = OnceLock::new();
-    LOGS_DIR.get_or_init(|| {
-        if cfg!(target_os = "macos") {
-            home_dir().join("Library/Logs/Zed")
-        } else {
-            data_dir().join("logs")
-        }
-    })
-}
-
-/// Returns the path to the Zed server directory on this SSH host.
-pub fn remote_server_state_dir() -> &'static PathBuf {
-    static REMOTE_SERVER_STATE: OnceLock<PathBuf> = OnceLock::new();
-    REMOTE_SERVER_STATE.get_or_init(|| data_dir().join("server_state"))
-}
-
-/// Returns the path to the `Zed.log` file.
-pub fn log_file() -> &'static PathBuf {
-    static LOG_FILE: OnceLock<PathBuf> = OnceLock::new();
-    LOG_FILE.get_or_init(|| logs_dir().join("Zed.log"))
-}
-
-/// Returns the path to the `Zed.log.old` file.
-pub fn old_log_file() -> &'static PathBuf {
-    static OLD_LOG_FILE: OnceLock<PathBuf> = OnceLock::new();
-    OLD_LOG_FILE.get_or_init(|| logs_dir().join("Zed.log.old"))
-}
-
-/// Returns the path to the database directory.
-pub fn database_dir() -> &'static PathBuf {
-    static DATABASE_DIR: OnceLock<PathBuf> = OnceLock::new();
-    DATABASE_DIR.get_or_init(|| data_dir().join("db"))
-}
-
-/// Returns the path to the crashes directory, if it exists for the current platform.
-pub fn crashes_dir() -> &'static Option<PathBuf> {
-    static CRASHES_DIR: OnceLock<Option<PathBuf>> = OnceLock::new();
-    CRASHES_DIR.get_or_init(|| {
-        cfg!(target_os = "macos").then_some(home_dir().join("Library/Logs/DiagnosticReports"))
-    })
-}
-
-/// Returns the path to the retired crashes directory, if it exists for the current platform.
-pub fn crashes_retired_dir() -> &'static Option<PathBuf> {
-    static CRASHES_RETIRED_DIR: OnceLock<Option<PathBuf>> = OnceLock::new();
-    CRASHES_RETIRED_DIR.get_or_init(|| crashes_dir().as_ref().map(|dir| dir.join("Retired")))
-}
-
-/// Returns the path to the `settings.json` file.
-pub fn settings_file() -> &'static PathBuf {
-    static SETTINGS_FILE: OnceLock<PathBuf> = OnceLock::new();
-    SETTINGS_FILE.get_or_init(|| config_dir().join("settings.json"))
-}
-
-/// Returns the path to the global settings file.
-pub fn global_settings_file() -> &'static PathBuf {
-    static GLOBAL_SETTINGS_FILE: OnceLock<PathBuf> = OnceLock::new();
-    GLOBAL_SETTINGS_FILE.get_or_init(|| config_dir().join("global_settings.json"))
-}
-
-/// Returns the path to the `settings_backup.json` file.
-pub fn settings_backup_file() -> &'static PathBuf {
-    static SETTINGS_FILE: OnceLock<PathBuf> = OnceLock::new();
-    SETTINGS_FILE.get_or_init(|| config_dir().join("settings_backup.json"))
-}
-
-/// Returns the path to the `keymap.json` file.
-pub fn keymap_file() -> &'static PathBuf {
-    static KEYMAP_FILE: OnceLock<PathBuf> = OnceLock::new();
-    KEYMAP_FILE.get_or_init(|| config_dir().join("keymap.json"))
-}
-
-/// Returns the path to the `keymap_backup.json` file.
-pub fn keymap_backup_file() -> &'static PathBuf {
-    static KEYMAP_FILE: OnceLock<PathBuf> = OnceLock::new();
-    KEYMAP_FILE.get_or_init(|| config_dir().join("keymap_backup.json"))
-}
-
-/// Returns the path to the `tasks.json` file.
-pub fn tasks_file() -> &'static PathBuf {
-    static TASKS_FILE: OnceLock<PathBuf> = OnceLock::new();
-    TASKS_FILE.get_or_init(|| config_dir().join("tasks.json"))
-}
-
-/// Returns the path to the `debug.json` file.
-pub fn debug_scenarios_file() -> &'static PathBuf {
-    static DEBUG_SCENARIOS_FILE: OnceLock<PathBuf> = OnceLock::new();
-    DEBUG_SCENARIOS_FILE.get_or_init(|| config_dir().join("debug.json"))
-}
-
-/// Returns the path to the extensions directory.
-///
-/// This is where installed extensions are stored.
-pub fn extensions_dir() -> &'static PathBuf {
-    static EXTENSIONS_DIR: OnceLock<PathBuf> = OnceLock::new();
-    EXTENSIONS_DIR.get_or_init(|| data_dir().join("extensions"))
-}
-
-/// Returns the path to the extensions directory.
-///
-/// This is where installed extensions are stored on a remote.
-pub fn remote_extensions_dir() -> &'static PathBuf {
-    static EXTENSIONS_DIR: OnceLock<PathBuf> = OnceLock::new();
-    EXTENSIONS_DIR.get_or_init(|| data_dir().join("remote_extensions"))
-}
-
-/// Returns the path to the extensions directory.
-///
-/// This is where installed extensions are stored on a remote.
-pub fn remote_extensions_uploads_dir() -> &'static PathBuf {
-    static UPLOAD_DIR: OnceLock<PathBuf> = OnceLock::new();
-    UPLOAD_DIR.get_or_init(|| remote_extensions_dir().join("uploads"))
-}
-
-/// Returns the path to the themes directory.
-///
-/// This is where themes that are not provided by extensions are stored.
-pub fn themes_dir() -> &'static PathBuf {
-    static THEMES_DIR: OnceLock<PathBuf> = OnceLock::new();
-    THEMES_DIR.get_or_init(|| config_dir().join("themes"))
-}
-
-/// Returns the path to the snippets directory.
-pub fn snippets_dir() -> &'static PathBuf {
-    static SNIPPETS_DIR: OnceLock<PathBuf> = OnceLock::new();
-    SNIPPETS_DIR.get_or_init(|| config_dir().join("snippets"))
-}
-
-/// Returns the path to the contexts directory.
-///
-/// This is where the saved contexts from the Assistant are stored.
-pub fn text_threads_dir() -> &'static PathBuf {
-    static CONTEXTS_DIR: OnceLock<PathBuf> = OnceLock::new();
-    CONTEXTS_DIR.get_or_init(|| {
-        if cfg!(target_os = "macos") {
-            config_dir().join("conversations")
-        } else {
-            data_dir().join("conversations")
-        }
-    })
-}
-
-/// Returns the path to the contexts directory.
-///
-/// This is where the prompts for use with the Assistant are stored.
-pub fn prompts_dir() -> &'static PathBuf {
-    static PROMPTS_DIR: OnceLock<PathBuf> = OnceLock::new();
-    PROMPTS_DIR.get_or_init(|| {
-        if cfg!(target_os = "macos") {
-            config_dir().join("prompts")
-        } else {
-            data_dir().join("prompts")
-        }
-    })
-}
-
-/// Returns the path to the prompt templates directory.
-///
-/// This is where the prompt templates for core features can be overridden with templates.
-///
-/// # Arguments
-///
-/// * `dev_mode` - If true, assumes the current working directory is the Zed repository.
-pub fn prompt_overrides_dir(repo_path: Option<&Path>) -> PathBuf {
-    if let Some(path) = repo_path {
-        let dev_path = path.join("assets").join("prompts");
-        if dev_path.exists() {
-            return dev_path;
-        }
-    }
-
-    static PROMPT_TEMPLATES_DIR: OnceLock<PathBuf> = OnceLock::new();
-    PROMPT_TEMPLATES_DIR
-        .get_or_init(|| {
-            if cfg!(target_os = "macos") {
-                config_dir().join("prompt_overrides")
-            } else {
-                data_dir().join("prompt_overrides")
-            }
-        })
-        .clone()
-}
-
-/// Returns the path to the semantic search's embeddings directory.
-///
-/// This is where the embeddings used to power semantic search are stored.
-pub fn embeddings_dir() -> &'static PathBuf {
-    static EMBEDDINGS_DIR: OnceLock<PathBuf> = OnceLock::new();
-    EMBEDDINGS_DIR.get_or_init(|| {
-        if cfg!(target_os = "macos") {
-            config_dir().join("embeddings")
-        } else {
-            data_dir().join("embeddings")
-        }
-    })
-}
-
-/// Returns the path to the languages directory.
-///
-/// This is where language servers are downloaded to for languages built-in to Zed.
-pub fn languages_dir() -> &'static PathBuf {
-    static LANGUAGES_DIR: OnceLock<PathBuf> = OnceLock::new();
-    LANGUAGES_DIR.get_or_init(|| data_dir().join("languages"))
-}
-
-/// Returns the path to the debug adapters directory
-///
-/// This is where debug adapters are downloaded to for DAPs that are built-in to Zed.
-pub fn debug_adapters_dir() -> &'static PathBuf {
-    static DEBUG_ADAPTERS_DIR: OnceLock<PathBuf> = OnceLock::new();
-    DEBUG_ADAPTERS_DIR.get_or_init(|| data_dir().join("debug_adapters"))
-}
-
-/// Returns the path to the external agents directory
-///
-/// This is where agent servers are downloaded to
-pub fn external_agents_dir() -> &'static PathBuf {
-    static EXTERNAL_AGENTS_DIR: OnceLock<PathBuf> = OnceLock::new();
-    EXTERNAL_AGENTS_DIR.get_or_init(|| data_dir().join("external_agents"))
-}
-
-/// Returns the path to the Copilot directory.
-pub fn copilot_dir() -> &'static PathBuf {
-    static COPILOT_DIR: OnceLock<PathBuf> = OnceLock::new();
-    COPILOT_DIR.get_or_init(|| data_dir().join("copilot"))
-}
-
-/// Returns the path to the Supermaven directory.
-pub fn supermaven_dir() -> &'static PathBuf {
-    static SUPERMAVEN_DIR: OnceLock<PathBuf> = OnceLock::new();
-    SUPERMAVEN_DIR.get_or_init(|| data_dir().join("supermaven"))
-}
-
-/// Returns the path to the default Prettier directory.
-pub fn default_prettier_dir() -> &'static PathBuf {
-    static DEFAULT_PRETTIER_DIR: OnceLock<PathBuf> = OnceLock::new();
-    DEFAULT_PRETTIER_DIR.get_or_init(|| data_dir().join("prettier"))
-}
-
-/// Returns the path to the remote server binaries directory.
-pub fn remote_servers_dir() -> &'static PathBuf {
-    static REMOTE_SERVERS_DIR: OnceLock<PathBuf> = OnceLock::new();
-    REMOTE_SERVERS_DIR.get_or_init(|| data_dir().join("remote_servers"))
-}
-
-/// Returns the path to the directory where the devcontainer CLI is installed.
-pub fn devcontainer_dir() -> &'static PathBuf {
-    static DEVCONTAINER_DIR: OnceLock<PathBuf> = OnceLock::new();
-    DEVCONTAINER_DIR.get_or_init(|| data_dir().join("devcontainer"))
-}
-
-/// Returns the relative path to a `.zed` folder within a project.
-pub fn local_settings_folder_name() -> &'static str {
-    ".zed"
-}
-
-/// Returns the relative path to a `.vscode` folder within a project.
-pub fn local_vscode_folder_name() -> &'static str {
-    ".vscode"
-}
-
-/// Returns the relative path to a `settings.json` file within a project.
-pub fn local_settings_file_relative_path() -> &'static RelPath {
-    static CACHED: LazyLock<&'static RelPath> =
-        LazyLock::new(|| RelPath::unix(".zed/settings.json").unwrap());
-    *CACHED
-}
-
-/// Returns the relative path to a `tasks.json` file within a project.
-pub fn local_tasks_file_relative_path() -> &'static RelPath {
-    static CACHED: LazyLock<&'static RelPath> =
-        LazyLock::new(|| RelPath::unix(".zed/tasks.json").unwrap());
-    *CACHED
-}
-
-/// Returns the relative path to a `.vscode/tasks.json` file within a project.
-pub fn local_vscode_tasks_file_relative_path() -> &'static RelPath {
-    static CACHED: LazyLock<&'static RelPath> =
-        LazyLock::new(|| RelPath::unix(".vscode/tasks.json").unwrap());
-    *CACHED
-}
-
-pub fn debug_task_file_name() -> &'static str {
-    "debug.json"
-}
-
-pub fn task_file_name() -> &'static str {
-    "tasks.json"
-}
-
-/// Returns the relative path to a `debug.json` file within a project.
-/// .zed/debug.json
-pub fn local_debug_file_relative_path() -> &'static RelPath {
-    static CACHED: LazyLock<&'static RelPath> =
-        LazyLock::new(|| RelPath::unix(".zed/debug.json").unwrap());
-    *CACHED
-}
-
-/// Returns the relative path to a `.vscode/launch.json` file within a project.
-pub fn local_vscode_launch_file_relative_path() -> &'static RelPath {
-    static CACHED: LazyLock<&'static RelPath> =
-        LazyLock::new(|| RelPath::unix(".vscode/launch.json").unwrap());
-    *CACHED
-}
-
-pub fn user_ssh_config_file() -> PathBuf {
-    home_dir().join(".ssh/config")
-}
-
-pub fn global_ssh_config_file() -> Option<&'static Path> {
-    if cfg!(windows) {
-        None
-    } else {
-        Some(Path::new("/etc/ssh/ssh_config"))
-    }
-}
-
-/// Returns candidate paths for the vscode user settings file
-pub fn vscode_settings_file_paths() -> Vec<PathBuf> {
-    let mut paths = vscode_user_data_paths();
-    for path in paths.iter_mut() {
-        path.push("User/settings.json");
-    }
-    paths
-}
-
-/// Returns candidate paths for the cursor user settings file
-pub fn cursor_settings_file_paths() -> Vec<PathBuf> {
-    let mut paths = cursor_user_data_paths();
-    for path in paths.iter_mut() {
-        path.push("User/settings.json");
-    }
-    paths
-}
-
-fn vscode_user_data_paths() -> Vec<PathBuf> {
-    // https://github.com/microsoft/vscode/blob/23e7148cdb6d8a27f0109ff77e5b1e019f8da051/src/vs/platform/environment/node/userDataPath.ts#L45
-    const VSCODE_PRODUCT_NAMES: &[&str] = &[
-        "Code",
-        "Code - OSS",
-        "VSCodium",
-        "Code Dev",
-        "Code - OSS Dev",
-        "code-oss-dev",
-    ];
-    let mut paths = Vec::new();
-    if let Ok(portable_path) = env::var("VSCODE_PORTABLE") {
-        paths.push(Path::new(&portable_path).join("user-data"));
-    }
-    if let Ok(vscode_appdata) = env::var("VSCODE_APPDATA") {
-        for product_name in VSCODE_PRODUCT_NAMES {
-            paths.push(Path::new(&vscode_appdata).join(product_name));
-        }
-    }
-    for product_name in VSCODE_PRODUCT_NAMES {
-        add_vscode_user_data_paths(&mut paths, product_name);
-    }
-    paths
-}
-
-fn cursor_user_data_paths() -> Vec<PathBuf> {
-    let mut paths = Vec::new();
-    add_vscode_user_data_paths(&mut paths, "Cursor");
-    paths
-}
-
-fn add_vscode_user_data_paths(paths: &mut Vec<PathBuf>, product_name: &str) {
-    if cfg!(target_os = "macos") {
-        paths.push(
-            home_dir()
-                .join("Library/Application Support")
-                .join(product_name),
-        );
-    } else if cfg!(target_os = "windows") {
-        if let Some(data_local_dir) = dirs::data_local_dir() {
-            paths.push(data_local_dir.join(product_name));
-        }
-        if let Some(data_dir) = dirs::data_dir() {
-            paths.push(data_dir.join(product_name));
-        }
-    } else {
-        paths.push(
-            dirs::config_dir()
-                .unwrap_or(home_dir().join(".config"))
-                .join(product_name),
-        );
-    }
-}
-
-#[cfg(any(test, feature = "test-support"))]
-pub fn global_gitignore_path() -> Option<PathBuf> {
-    Some(home_dir().join(".config").join("git").join("ignore"))
-}
-
-#[cfg(not(any(test, feature = "test-support")))]
-pub fn global_gitignore_path() -> Option<PathBuf> {
-    static GLOBAL_GITIGNORE_PATH: OnceLock<Option<PathBuf>> = OnceLock::new();
-    GLOBAL_GITIGNORE_PATH
-        .get_or_init(::ignore::gitignore::gitconfig_excludes_path)
-        .clone()
-}
diff --git a/crates/picker/Cargo.toml b/crates/picker/Cargo.toml
deleted file mode 100644
index 1344d177f4..0000000000
--- a/crates/picker/Cargo.toml
+++ /dev/null
@@ -1,34 +0,0 @@
-[package]
-name = "picker"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/picker.rs"
-doctest = false
-
-[features]
-test-support = []
-
-[dependencies]
-anyhow.workspace = true
-editor.workspace = true
-gpui.workspace = true
-menu.workspace = true
-schemars.workspace = true
-serde.workspace = true
-theme.workspace = true
-ui.workspace = true
-workspace.workspace = true
-
-[dev-dependencies]
-ctor.workspace = true
-editor = { workspace = true, features = ["test-support"] }
-env_logger.workspace = true
-gpui = { workspace = true, features = ["test-support"] }
-serde_json.workspace = true
diff --git a/crates/picker/LICENSE-GPL b/crates/picker/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/picker/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/picker/src/head.rs b/crates/picker/src/head.rs
deleted file mode 100644
index 700896e341..0000000000
--- a/crates/picker/src/head.rs
+++ /dev/null
@@ -1,68 +0,0 @@
-use std::sync::Arc;
-
-use editor::{Editor, EditorEvent};
-use gpui::{App, Entity, FocusHandle, Focusable, prelude::*};
-use ui::prelude::*;
-
-/// The head of a [`Picker`](crate::Picker).
-pub(crate) enum Head {
-    /// Picker has an editor that allows the user to filter the list.
-    Editor(Entity<Editor>),
-
-    /// Picker has no head, it's just a list of items.
-    Empty(Entity<EmptyHead>),
-}
-
-impl Head {
-    pub fn editor<V: 'static>(
-        placeholder_text: Arc<str>,
-        edit_handler: impl FnMut(&mut V, &Entity<Editor>, &EditorEvent, &mut Window, &mut Context<V>)
-        + 'static,
-        window: &mut Window,
-        cx: &mut Context<V>,
-    ) -> Self {
-        let editor = cx.new(|cx| {
-            let mut editor = Editor::single_line(window, cx);
-            editor.set_placeholder_text(placeholder_text.as_ref(), window, cx);
-            editor
-        });
-        cx.subscribe_in(&editor, window, edit_handler).detach();
-        Self::Editor(editor)
-    }
-
-    pub fn empty<V: 'static>(
-        blur_handler: impl FnMut(&mut V, &mut Window, &mut Context<V>) + 'static,
-        window: &mut Window,
-        cx: &mut Context<V>,
-    ) -> Self {
-        let head = cx.new(EmptyHead::new);
-        cx.on_blur(&head.focus_handle(cx), window, blur_handler)
-            .detach();
-        Self::Empty(head)
-    }
-}
-
-/// An invisible element that can hold focus.
-pub(crate) struct EmptyHead {
-    focus_handle: FocusHandle,
-}
-
-impl EmptyHead {
-    fn new(cx: &mut Context<Self>) -> Self {
-        Self {
-            focus_handle: cx.focus_handle(),
-        }
-    }
-}
-
-impl Render for EmptyHead {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        div().track_focus(&self.focus_handle(cx))
-    }
-}
-
-impl Focusable for EmptyHead {
-    fn focus_handle(&self, _: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
diff --git a/crates/picker/src/highlighted_match_with_paths.rs b/crates/picker/src/highlighted_match_with_paths.rs
deleted file mode 100644
index 7427104762..0000000000
--- a/crates/picker/src/highlighted_match_with_paths.rs
+++ /dev/null
@@ -1,116 +0,0 @@
-use ui::{HighlightedLabel, prelude::*};
-
-#[derive(Clone)]
-pub struct HighlightedMatchWithPaths {
-    pub prefix: Option<SharedString>,
-    pub match_label: HighlightedMatch,
-    pub paths: Vec<HighlightedMatch>,
-}
-
-#[derive(Debug, Clone, IntoElement)]
-pub struct HighlightedMatch {
-    pub text: String,
-    pub highlight_positions: Vec<usize>,
-    pub color: Color,
-}
-
-impl HighlightedMatch {
-    pub fn join(components: impl Iterator<Item = Self>, separator: &str) -> Self {
-        // Track a running byte offset and insert separators between parts.
-        let mut first = true;
-        let mut byte_offset = 0;
-        let mut text = String::new();
-        let mut highlight_positions = Vec::new();
-        for component in components {
-            if !first {
-                text.push_str(separator);
-                byte_offset += separator.len();
-            }
-            first = false;
-
-            highlight_positions.extend(
-                component
-                    .highlight_positions
-                    .iter()
-                    .map(|position| position + byte_offset),
-            );
-            text.push_str(&component.text);
-            byte_offset += component.text.len();
-        }
-
-        Self {
-            text,
-            highlight_positions,
-            color: Color::Default,
-        }
-    }
-
-    pub fn color(self, color: Color) -> Self {
-        Self { color, ..self }
-    }
-}
-impl RenderOnce for HighlightedMatch {
-    fn render(self, _window: &mut Window, _: &mut App) -> impl IntoElement {
-        HighlightedLabel::new(self.text, self.highlight_positions).color(self.color)
-    }
-}
-
-impl HighlightedMatchWithPaths {
-    pub fn render_paths_children(&mut self, element: Div) -> Div {
-        element.children(self.paths.clone().into_iter().map(|path| {
-            HighlightedLabel::new(path.text, path.highlight_positions)
-                .size(LabelSize::Small)
-                .color(Color::Muted)
-        }))
-    }
-}
-
-impl RenderOnce for HighlightedMatchWithPaths {
-    fn render(mut self, _window: &mut Window, _: &mut App) -> impl IntoElement {
-        v_flex()
-            .child(
-                h_flex().gap_1().child(self.match_label.clone()).when_some(
-                    self.prefix.as_ref(),
-                    |this, prefix| {
-                        this.child(Label::new(format!("({})", prefix)).color(Color::Muted))
-                    },
-                ),
-            )
-            .when(!self.paths.is_empty(), |this| {
-                self.render_paths_children(this)
-            })
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn join_offsets_positions_by_bytes_not_chars() {
-        // "αβγ" is 3 Unicode scalar values, 6 bytes in UTF-8.
-        let left_text = "αβγ".to_string();
-        let right_text = "label".to_string();
-        let left = HighlightedMatch {
-            text: left_text,
-            highlight_positions: vec![],
-            color: Color::Default,
-        };
-        let right = HighlightedMatch {
-            text: right_text,
-            highlight_positions: vec![0, 1],
-            color: Color::Default,
-        };
-        let joined = HighlightedMatch::join([left, right].into_iter(), "");
-
-        assert!(
-            joined
-                .highlight_positions
-                .iter()
-                .all(|&p| joined.text.is_char_boundary(p)),
-            "join produced non-boundary positions {:?} for text {:?}",
-            joined.highlight_positions,
-            joined.text
-        );
-    }
-}
diff --git a/crates/picker/src/picker.rs b/crates/picker/src/picker.rs
deleted file mode 100644
index 3d6ae27dfa..0000000000
--- a/crates/picker/src/picker.rs
+++ /dev/null
@@ -1,976 +0,0 @@
-mod head;
-pub mod highlighted_match_with_paths;
-pub mod popover_menu;
-
-use anyhow::Result;
-use editor::{
-    Editor, SelectionEffects,
-    actions::{MoveDown, MoveUp},
-    scroll::Autoscroll,
-};
-use gpui::{
-    Action, AnyElement, App, ClickEvent, Context, DismissEvent, Entity, EventEmitter, FocusHandle,
-    Focusable, Length, ListSizingBehavior, ListState, MouseButton, MouseUpEvent, Render,
-    ScrollStrategy, Task, UniformListScrollHandle, Window, actions, div, list, prelude::*,
-    uniform_list,
-};
-use head::Head;
-use schemars::JsonSchema;
-use serde::Deserialize;
-use std::{ops::Range, sync::Arc, time::Duration};
-use theme::ThemeSettings;
-use ui::{
-    Color, Divider, DocumentationAside, DocumentationEdge, DocumentationSide, Label, ListItem,
-    ListItemSpacing, ScrollAxes, Scrollbars, WithScrollbar, prelude::*, utils::WithRemSize, v_flex,
-};
-use workspace::{ModalView, item::Settings};
-
-enum ElementContainer {
-    List(ListState),
-    UniformList(UniformListScrollHandle),
-}
-
-pub enum Direction {
-    Up,
-    Down,
-}
-
-actions!(
-    picker,
-    [
-        /// Confirms the selected completion in the picker.
-        ConfirmCompletion
-    ]
-);
-
-/// ConfirmInput is an alternative editor action which - instead of selecting active picker entry - treats pickers editor input literally,
-/// performing some kind of action on it.
-#[derive(Clone, PartialEq, Deserialize, JsonSchema, Default, Action)]
-#[action(namespace = picker)]
-#[serde(deny_unknown_fields)]
-pub struct ConfirmInput {
-    pub secondary: bool,
-}
-
-struct PendingUpdateMatches {
-    delegate_update_matches: Option<Task<()>>,
-    _task: Task<Result<()>>,
-}
-
-pub struct Picker<D: PickerDelegate> {
-    pub delegate: D,
-    element_container: ElementContainer,
-    head: Head,
-    pending_update_matches: Option<PendingUpdateMatches>,
-    confirm_on_update: Option<bool>,
-    width: Option<Length>,
-    widest_item: Option<usize>,
-    max_height: Option<Length>,
-    /// An external control to display a scrollbar in the `Picker`.
-    show_scrollbar: bool,
-    /// Whether the `Picker` is rendered as a self-contained modal.
-    ///
-    /// Set this to `false` when rendering the `Picker` as part of a larger modal.
-    is_modal: bool,
-}
-
-#[derive(Debug, Default, Clone, Copy, PartialEq)]
-pub enum PickerEditorPosition {
-    #[default]
-    /// Render the editor at the start of the picker. Usually the top
-    Start,
-    /// Render the editor at the end of the picker. Usually the bottom
-    End,
-}
-
-pub trait PickerDelegate: Sized + 'static {
-    type ListItem: IntoElement;
-
-    fn match_count(&self) -> usize;
-    fn selected_index(&self) -> usize;
-    fn separators_after_indices(&self) -> Vec<usize> {
-        Vec::new()
-    }
-    fn set_selected_index(
-        &mut self,
-        ix: usize,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    );
-
-    /// Called before the picker handles `SelectPrevious` or `SelectNext`. Return `Some(query)` to
-    /// set a new query and prevent the default selection behavior.
-    fn select_history(
-        &mut self,
-        _direction: Direction,
-        _query: &str,
-        _window: &mut Window,
-        _cx: &mut App,
-    ) -> Option<String> {
-        None
-    }
-    fn can_select(
-        &mut self,
-        _ix: usize,
-        _window: &mut Window,
-        _cx: &mut Context<Picker<Self>>,
-    ) -> bool {
-        true
-    }
-
-    // Allows binding some optional effect to when the selection changes.
-    fn selected_index_changed(
-        &self,
-        _ix: usize,
-        _window: &mut Window,
-        _cx: &mut Context<Picker<Self>>,
-    ) -> Option<Box<dyn Fn(&mut Window, &mut App) + 'static>> {
-        None
-    }
-    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str>;
-    fn no_matches_text(&self, _window: &mut Window, _cx: &mut App) -> Option<SharedString> {
-        Some("No matches".into())
-    }
-    fn update_matches(
-        &mut self,
-        query: String,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Task<()>;
-
-    // Delegates that support this method (e.g. the CommandPalette) can chose to block on any background
-    // work for up to `duration` to try and get a result synchronously.
-    // This avoids a flash of an empty command-palette on cmd-shift-p, and lets workspace::SendKeystrokes
-    // mostly work when dismissing a palette.
-    fn finalize_update_matches(
-        &mut self,
-        _query: String,
-        _duration: Duration,
-        _window: &mut Window,
-        _cx: &mut Context<Picker<Self>>,
-    ) -> bool {
-        false
-    }
-
-    /// Override if you want to have <enter> update the query instead of confirming.
-    fn confirm_update_query(
-        &mut self,
-        _window: &mut Window,
-        _cx: &mut Context<Picker<Self>>,
-    ) -> Option<String> {
-        None
-    }
-    fn confirm(&mut self, secondary: bool, window: &mut Window, cx: &mut Context<Picker<Self>>);
-    /// Instead of interacting with currently selected entry, treats editor input literally,
-    /// performing some kind of action on it.
-    fn confirm_input(
-        &mut self,
-        _secondary: bool,
-        _window: &mut Window,
-        _: &mut Context<Picker<Self>>,
-    ) {
-    }
-    fn dismissed(&mut self, window: &mut Window, cx: &mut Context<Picker<Self>>);
-    fn should_dismiss(&self) -> bool {
-        true
-    }
-    fn confirm_completion(
-        &mut self,
-        _query: String,
-        _window: &mut Window,
-        _: &mut Context<Picker<Self>>,
-    ) -> Option<String> {
-        None
-    }
-
-    fn editor_position(&self) -> PickerEditorPosition {
-        PickerEditorPosition::default()
-    }
-
-    fn render_editor(
-        &self,
-        editor: &Entity<Editor>,
-        _window: &mut Window,
-        _cx: &mut Context<Picker<Self>>,
-    ) -> Div {
-        v_flex()
-            .when(
-                self.editor_position() == PickerEditorPosition::End,
-                |this| this.child(Divider::horizontal()),
-            )
-            .child(
-                h_flex()
-                    .overflow_hidden()
-                    .flex_none()
-                    .h_9()
-                    .px_2p5()
-                    .child(editor.clone()),
-            )
-            .when(
-                self.editor_position() == PickerEditorPosition::Start,
-                |this| this.child(Divider::horizontal()),
-            )
-    }
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<Self::ListItem>;
-
-    fn render_header(
-        &self,
-        _window: &mut Window,
-        _: &mut Context<Picker<Self>>,
-    ) -> Option<AnyElement> {
-        None
-    }
-
-    fn render_footer(
-        &self,
-        _window: &mut Window,
-        _: &mut Context<Picker<Self>>,
-    ) -> Option<AnyElement> {
-        None
-    }
-
-    fn documentation_aside(
-        &self,
-        _window: &mut Window,
-        _cx: &mut Context<Picker<Self>>,
-    ) -> Option<DocumentationAside> {
-        None
-    }
-}
-
-impl<D: PickerDelegate> Focusable for Picker<D> {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        match &self.head {
-            Head::Editor(editor) => editor.focus_handle(cx),
-            Head::Empty(head) => head.focus_handle(cx),
-        }
-    }
-}
-
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
-enum ContainerKind {
-    List,
-    UniformList,
-}
-
-impl<D: PickerDelegate> Picker<D> {
-    /// A picker, which displays its matches using `gpui::uniform_list`, all matches should have the same height.
-    /// The picker allows the user to perform search items by text.
-    /// If `PickerDelegate::render_match` can return items with different heights, use `Picker::list`.
-    pub fn uniform_list(delegate: D, window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let head = Head::editor(
-            delegate.placeholder_text(window, cx),
-            Self::on_input_editor_event,
-            window,
-            cx,
-        );
-
-        Self::new(delegate, ContainerKind::UniformList, head, window, cx)
-    }
-
-    /// A picker, which displays its matches using `gpui::uniform_list`, all matches should have the same height.
-    /// If `PickerDelegate::render_match` can return items with different heights, use `Picker::list`.
-    pub fn nonsearchable_uniform_list(
-        delegate: D,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let head = Head::empty(Self::on_empty_head_blur, window, cx);
-
-        Self::new(delegate, ContainerKind::UniformList, head, window, cx)
-    }
-
-    /// A picker, which displays its matches using `gpui::list`, matches can have different heights.
-    /// The picker allows the user to perform search items by text.
-    /// If `PickerDelegate::render_match` only returns items with the same height, use `Picker::uniform_list` as its implementation is optimized for that.
-    pub fn nonsearchable_list(delegate: D, window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let head = Head::empty(Self::on_empty_head_blur, window, cx);
-
-        Self::new(delegate, ContainerKind::List, head, window, cx)
-    }
-
-    /// A picker, which displays its matches using `gpui::list`, matches can have different heights.
-    /// The picker allows the user to perform search items by text.
-    /// If `PickerDelegate::render_match` only returns items with the same height, use `Picker::uniform_list` as its implementation is optimized for that.
-    pub fn list(delegate: D, window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let head = Head::editor(
-            delegate.placeholder_text(window, cx),
-            Self::on_input_editor_event,
-            window,
-            cx,
-        );
-
-        Self::new(delegate, ContainerKind::List, head, window, cx)
-    }
-
-    fn new(
-        delegate: D,
-        container: ContainerKind,
-        head: Head,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let element_container = Self::create_element_container(container);
-        let mut this = Self {
-            delegate,
-            head,
-            element_container,
-            pending_update_matches: None,
-            confirm_on_update: None,
-            width: None,
-            widest_item: None,
-            max_height: Some(rems(24.).into()),
-            show_scrollbar: false,
-            is_modal: true,
-        };
-        this.update_matches("".to_string(), window, cx);
-        // give the delegate 4ms to render the first set of suggestions.
-        this.delegate
-            .finalize_update_matches("".to_string(), Duration::from_millis(4), window, cx);
-        this
-    }
-
-    fn create_element_container(container: ContainerKind) -> ElementContainer {
-        match container {
-            ContainerKind::UniformList => {
-                ElementContainer::UniformList(UniformListScrollHandle::new())
-            }
-            ContainerKind::List => {
-                ElementContainer::List(ListState::new(0, gpui::ListAlignment::Top, px(1000.)))
-            }
-        }
-    }
-
-    pub fn width(mut self, width: impl Into<gpui::Length>) -> Self {
-        self.width = Some(width.into());
-        self
-    }
-
-    pub fn widest_item(mut self, ix: Option<usize>) -> Self {
-        self.widest_item = ix;
-        self
-    }
-
-    pub fn max_height(mut self, max_height: Option<gpui::Length>) -> Self {
-        self.max_height = max_height;
-        self
-    }
-
-    pub fn show_scrollbar(mut self, show_scrollbar: bool) -> Self {
-        self.show_scrollbar = show_scrollbar;
-        self
-    }
-
-    pub fn modal(mut self, modal: bool) -> Self {
-        self.is_modal = modal;
-        self
-    }
-
-    pub fn list_measure_all(mut self) -> Self {
-        match self.element_container {
-            ElementContainer::List(state) => {
-                self.element_container = ElementContainer::List(state.measure_all());
-            }
-            _ => {}
-        }
-        self
-    }
-
-    pub fn focus(&self, window: &mut Window, cx: &mut App) {
-        self.focus_handle(cx).focus(window);
-    }
-
-    /// Handles the selecting an index, and passing the change to the delegate.
-    /// If `fallback_direction` is set to `None`, the index will not be selected
-    /// if the element at that index cannot be selected.
-    /// If `fallback_direction` is set to
-    /// `Some(..)`, the next selectable element will be selected in the
-    /// specified direction (Down or Up), cycling through all elements until
-    /// finding one that can be selected or returning if there are no selectable elements.
-    /// If `scroll_to_index` is true, the new selected index will be scrolled into
-    /// view.
-    ///
-    /// If some effect is bound to `selected_index_changed`, it will be executed.
-    pub fn set_selected_index(
-        &mut self,
-        mut ix: usize,
-        fallback_direction: Option<Direction>,
-        scroll_to_index: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let match_count = self.delegate.match_count();
-        if match_count == 0 {
-            return;
-        }
-
-        if let Some(bias) = fallback_direction {
-            let mut curr_ix = ix;
-            while !self.delegate.can_select(curr_ix, window, cx) {
-                curr_ix = match bias {
-                    Direction::Down => {
-                        if curr_ix == match_count - 1 {
-                            0
-                        } else {
-                            curr_ix + 1
-                        }
-                    }
-                    Direction::Up => {
-                        if curr_ix == 0 {
-                            match_count - 1
-                        } else {
-                            curr_ix - 1
-                        }
-                    }
-                };
-                // There is no item that can be selected
-                if ix == curr_ix {
-                    return;
-                }
-            }
-            ix = curr_ix;
-        } else if !self.delegate.can_select(ix, window, cx) {
-            return;
-        }
-
-        let previous_index = self.delegate.selected_index();
-        self.delegate.set_selected_index(ix, window, cx);
-        let current_index = self.delegate.selected_index();
-
-        if previous_index != current_index {
-            if let Some(action) = self.delegate.selected_index_changed(ix, window, cx) {
-                action(window, cx);
-            }
-            if scroll_to_index {
-                self.scroll_to_item_index(ix);
-            }
-        }
-    }
-
-    pub fn select_next(
-        &mut self,
-        _: &menu::SelectNext,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let query = self.query(cx);
-        if let Some(query) = self
-            .delegate
-            .select_history(Direction::Down, &query, window, cx)
-        {
-            self.set_query(query, window, cx);
-            return;
-        }
-        let count = self.delegate.match_count();
-        if count > 0 {
-            let index = self.delegate.selected_index();
-            let ix = if index == count - 1 { 0 } else { index + 1 };
-            self.set_selected_index(ix, Some(Direction::Down), true, window, cx);
-            cx.notify();
-        }
-    }
-
-    pub fn editor_move_up(&mut self, _: &MoveUp, window: &mut Window, cx: &mut Context<Self>) {
-        self.select_previous(&Default::default(), window, cx);
-    }
-
-    fn select_previous(
-        &mut self,
-        _: &menu::SelectPrevious,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let query = self.query(cx);
-        if let Some(query) = self
-            .delegate
-            .select_history(Direction::Up, &query, window, cx)
-        {
-            self.set_query(query, window, cx);
-            return;
-        }
-        let count = self.delegate.match_count();
-        if count > 0 {
-            let index = self.delegate.selected_index();
-            let ix = if index == 0 { count - 1 } else { index - 1 };
-            self.set_selected_index(ix, Some(Direction::Up), true, window, cx);
-            cx.notify();
-        }
-    }
-
-    pub fn editor_move_down(&mut self, _: &MoveDown, window: &mut Window, cx: &mut Context<Self>) {
-        self.select_next(&Default::default(), window, cx);
-    }
-
-    pub fn select_first(
-        &mut self,
-        _: &menu::SelectFirst,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let count = self.delegate.match_count();
-        if count > 0 {
-            self.set_selected_index(0, Some(Direction::Down), true, window, cx);
-            cx.notify();
-        }
-    }
-
-    fn select_last(&mut self, _: &menu::SelectLast, window: &mut Window, cx: &mut Context<Self>) {
-        let count = self.delegate.match_count();
-        if count > 0 {
-            self.set_selected_index(count - 1, Some(Direction::Up), true, window, cx);
-            cx.notify();
-        }
-    }
-
-    pub fn cycle_selection(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let count = self.delegate.match_count();
-        let index = self.delegate.selected_index();
-        let new_index = if index + 1 == count { 0 } else { index + 1 };
-        self.set_selected_index(new_index, Some(Direction::Down), true, window, cx);
-        cx.notify();
-    }
-
-    pub fn cancel(&mut self, _: &menu::Cancel, window: &mut Window, cx: &mut Context<Self>) {
-        if self.delegate.should_dismiss() {
-            self.delegate.dismissed(window, cx);
-            cx.emit(DismissEvent);
-        }
-    }
-
-    fn confirm(&mut self, _: &menu::Confirm, window: &mut Window, cx: &mut Context<Self>) {
-        if self.pending_update_matches.is_some()
-            && !self.delegate.finalize_update_matches(
-                self.query(cx),
-                Duration::from_millis(16),
-                window,
-                cx,
-            )
-        {
-            self.confirm_on_update = Some(false)
-        } else {
-            self.pending_update_matches.take();
-            self.do_confirm(false, window, cx);
-        }
-    }
-
-    fn secondary_confirm(
-        &mut self,
-        _: &menu::SecondaryConfirm,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.pending_update_matches.is_some()
-            && !self.delegate.finalize_update_matches(
-                self.query(cx),
-                Duration::from_millis(16),
-                window,
-                cx,
-            )
-        {
-            self.confirm_on_update = Some(true)
-        } else {
-            self.do_confirm(true, window, cx);
-        }
-    }
-
-    fn confirm_input(&mut self, input: &ConfirmInput, window: &mut Window, cx: &mut Context<Self>) {
-        self.delegate.confirm_input(input.secondary, window, cx);
-    }
-
-    fn confirm_completion(
-        &mut self,
-        _: &ConfirmCompletion,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(new_query) = self.delegate.confirm_completion(self.query(cx), window, cx) {
-            self.set_query(new_query, window, cx);
-        } else {
-            cx.propagate()
-        }
-    }
-
-    fn handle_click(
-        &mut self,
-        ix: usize,
-        secondary: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        cx.stop_propagation();
-        window.prevent_default();
-        self.set_selected_index(ix, None, false, window, cx);
-        self.do_confirm(secondary, window, cx)
-    }
-
-    fn do_confirm(&mut self, secondary: bool, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(update_query) = self.delegate.confirm_update_query(window, cx) {
-            self.set_query(update_query, window, cx);
-            self.set_selected_index(0, Some(Direction::Down), false, window, cx);
-        } else {
-            self.delegate.confirm(secondary, window, cx)
-        }
-    }
-
-    fn on_input_editor_event(
-        &mut self,
-        _: &Entity<Editor>,
-        event: &editor::EditorEvent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Head::Editor(editor) = &self.head else {
-            panic!("unexpected call");
-        };
-        match event {
-            editor::EditorEvent::BufferEdited => {
-                let query = editor.read(cx).text(cx);
-                self.update_matches(query, window, cx);
-            }
-            editor::EditorEvent::Blurred => {
-                if self.is_modal && window.is_window_active() {
-                    self.cancel(&menu::Cancel, window, cx);
-                }
-            }
-            _ => {}
-        }
-    }
-
-    fn on_empty_head_blur(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let Head::Empty(_) = &self.head else {
-            panic!("unexpected call");
-        };
-        if window.is_window_active() {
-            self.cancel(&menu::Cancel, window, cx);
-        }
-    }
-
-    pub fn refresh_placeholder(&mut self, window: &mut Window, cx: &mut App) {
-        match &self.head {
-            Head::Editor(editor) => {
-                let placeholder = self.delegate.placeholder_text(window, cx);
-                editor.update(cx, |editor, cx| {
-                    editor.set_placeholder_text(placeholder.as_ref(), window, cx);
-                    cx.notify();
-                });
-            }
-            Head::Empty(_) => {}
-        }
-    }
-
-    pub fn refresh(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let query = self.query(cx);
-        self.update_matches(query, window, cx);
-    }
-
-    pub fn update_matches(&mut self, query: String, window: &mut Window, cx: &mut Context<Self>) {
-        let delegate_pending_update_matches = self.delegate.update_matches(query, window, cx);
-
-        self.matches_updated(window, cx);
-        // This struct ensures that we can synchronously drop the task returned by the
-        // delegate's `update_matches` method and the task that the picker is spawning.
-        // If we simply capture the delegate's task into the picker's task, when the picker's
-        // task gets synchronously dropped, the delegate's task would keep running until
-        // the picker's task has a chance of being scheduled, because dropping a task happens
-        // asynchronously.
-        self.pending_update_matches = Some(PendingUpdateMatches {
-            delegate_update_matches: Some(delegate_pending_update_matches),
-            _task: cx.spawn_in(window, async move |this, cx| {
-                let delegate_pending_update_matches = this.update(cx, |this, _| {
-                    this.pending_update_matches
-                        .as_mut()
-                        .unwrap()
-                        .delegate_update_matches
-                        .take()
-                        .unwrap()
-                })?;
-                delegate_pending_update_matches.await;
-                this.update_in(cx, |this, window, cx| {
-                    this.matches_updated(window, cx);
-                })
-            }),
-        });
-    }
-
-    fn matches_updated(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if let ElementContainer::List(state) = &mut self.element_container {
-            state.reset(self.delegate.match_count());
-        }
-
-        let index = self.delegate.selected_index();
-        self.scroll_to_item_index(index);
-        self.pending_update_matches = None;
-        if let Some(secondary) = self.confirm_on_update.take() {
-            self.do_confirm(secondary, window, cx);
-        }
-        cx.notify();
-    }
-
-    pub fn query(&self, cx: &App) -> String {
-        match &self.head {
-            Head::Editor(editor) => editor.read(cx).text(cx),
-            Head::Empty(_) => "".to_string(),
-        }
-    }
-
-    pub fn set_query(&self, query: impl Into<Arc<str>>, window: &mut Window, cx: &mut App) {
-        if let Head::Editor(editor) = &self.head {
-            editor.update(cx, |editor, cx| {
-                editor.set_text(query, window, cx);
-                let editor_offset = editor.buffer().read(cx).len(cx);
-                editor.change_selections(
-                    SelectionEffects::scroll(Autoscroll::Next),
-                    window,
-                    cx,
-                    |s| s.select_ranges(Some(editor_offset..editor_offset)),
-                );
-            });
-        }
-    }
-
-    fn scroll_to_item_index(&mut self, ix: usize) {
-        match &mut self.element_container {
-            ElementContainer::List(state) => state.scroll_to_reveal_item(ix),
-            ElementContainer::UniformList(scroll_handle) => {
-                scroll_handle.scroll_to_item(ix, ScrollStrategy::Nearest)
-            }
-        }
-    }
-
-    fn render_element(
-        &self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-        ix: usize,
-    ) -> impl IntoElement + use<D> {
-        div()
-            .id(("item", ix))
-            .cursor_pointer()
-            .on_click(cx.listener(move |this, event: &ClickEvent, window, cx| {
-                this.handle_click(ix, event.modifiers().secondary(), window, cx)
-            }))
-            // As of this writing, GPUI intercepts `ctrl-[mouse-event]`s on macOS
-            // and produces right mouse button events. This matches platforms norms
-            // but means that UIs which depend on holding ctrl down (such as the tab
-            // switcher) can't be clicked on. Hence, this handler.
-            .on_mouse_up(
-                MouseButton::Right,
-                cx.listener(move |this, event: &MouseUpEvent, window, cx| {
-                    // We specifically want to use the platform key here, as
-                    // ctrl will already be held down for the tab switcher.
-                    this.handle_click(ix, event.modifiers.platform, window, cx)
-                }),
-            )
-            .children(self.delegate.render_match(
-                ix,
-                ix == self.delegate.selected_index(),
-                window,
-                cx,
-            ))
-            .when(
-                self.delegate.separators_after_indices().contains(&ix),
-                |picker| {
-                    picker
-                        .border_color(cx.theme().colors().border_variant)
-                        .border_b_1()
-                        .py(px(-1.0))
-                },
-            )
-    }
-
-    fn render_element_container(&self, cx: &mut Context<Self>) -> impl IntoElement {
-        let sizing_behavior = if self.max_height.is_some() {
-            ListSizingBehavior::Infer
-        } else {
-            ListSizingBehavior::Auto
-        };
-
-        match &self.element_container {
-            ElementContainer::UniformList(scroll_handle) => uniform_list(
-                "candidates",
-                self.delegate.match_count(),
-                cx.processor(move |picker, visible_range: Range<usize>, window, cx| {
-                    visible_range
-                        .map(|ix| picker.render_element(window, cx, ix))
-                        .collect()
-                }),
-            )
-            .with_sizing_behavior(sizing_behavior)
-            .when_some(self.widest_item, |el, widest_item| {
-                el.with_width_from_item(Some(widest_item))
-            })
-            .flex_grow()
-            .py_1()
-            .track_scroll(&scroll_handle)
-            .into_any_element(),
-            ElementContainer::List(state) => list(
-                state.clone(),
-                cx.processor(|this, ix, window, cx| {
-                    this.render_element(window, cx, ix).into_any_element()
-                }),
-            )
-            .with_sizing_behavior(sizing_behavior)
-            .flex_grow()
-            .py_2()
-            .into_any_element(),
-        }
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn logical_scroll_top_index(&self) -> usize {
-        match &self.element_container {
-            ElementContainer::List(state) => state.logical_scroll_top().item_ix,
-            ElementContainer::UniformList(scroll_handle) => {
-                scroll_handle.logical_scroll_top_index()
-            }
-        }
-    }
-}
-
-impl<D: PickerDelegate> EventEmitter<DismissEvent> for Picker<D> {}
-impl<D: PickerDelegate> ModalView for Picker<D> {}
-
-impl<D: PickerDelegate> Render for Picker<D> {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let ui_font_size = ThemeSettings::get_global(cx).ui_font_size(cx);
-        let window_size = window.viewport_size();
-        let rem_size = window.rem_size();
-        let is_wide_window = window_size.width / rem_size > rems_from_px(800.).0;
-
-        let aside = self.delegate.documentation_aside(window, cx);
-
-        let editor_position = self.delegate.editor_position();
-        let menu = v_flex()
-            .key_context("Picker")
-            .size_full()
-            .when_some(self.width, |el, width| el.w(width))
-            .overflow_hidden()
-            // This is a bit of a hack to remove the modal styling when we're rendering the `Picker`
-            // as a part of a modal rather than the entire modal.
-            //
-            // We should revisit how the `Picker` is styled to make it more composable.
-            .when(self.is_modal, |this| this.elevation_3(cx))
-            .on_action(cx.listener(Self::select_next))
-            .on_action(cx.listener(Self::select_previous))
-            .on_action(cx.listener(Self::editor_move_down))
-            .on_action(cx.listener(Self::editor_move_up))
-            .on_action(cx.listener(Self::select_first))
-            .on_action(cx.listener(Self::select_last))
-            .on_action(cx.listener(Self::cancel))
-            .on_action(cx.listener(Self::confirm))
-            .on_action(cx.listener(Self::secondary_confirm))
-            .on_action(cx.listener(Self::confirm_completion))
-            .on_action(cx.listener(Self::confirm_input))
-            .children(match &self.head {
-                Head::Editor(editor) => {
-                    if editor_position == PickerEditorPosition::Start {
-                        Some(self.delegate.render_editor(&editor.clone(), window, cx))
-                    } else {
-                        None
-                    }
-                }
-                Head::Empty(empty_head) => Some(div().child(empty_head.clone())),
-            })
-            .when(self.delegate.match_count() > 0, |el| {
-                el.child(
-                    v_flex()
-                        .id("element-container")
-                        .relative()
-                        .flex_grow()
-                        .when_some(self.max_height, |div, max_h| div.max_h(max_h))
-                        .overflow_hidden()
-                        .children(self.delegate.render_header(window, cx))
-                        .child(self.render_element_container(cx))
-                        .when(self.show_scrollbar, |this| {
-                            let base_scrollbar_config =
-                                Scrollbars::new(ScrollAxes::Vertical).width_sm();
-
-                            this.map(|this| match &self.element_container {
-                                ElementContainer::List(state) => this.custom_scrollbars(
-                                    base_scrollbar_config.tracked_scroll_handle(state),
-                                    window,
-                                    cx,
-                                ),
-                                ElementContainer::UniformList(state) => this.custom_scrollbars(
-                                    base_scrollbar_config.tracked_scroll_handle(state),
-                                    window,
-                                    cx,
-                                ),
-                            })
-                        }),
-                )
-            })
-            .when(self.delegate.match_count() == 0, |el| {
-                el.when_some(self.delegate.no_matches_text(window, cx), |el, text| {
-                    el.child(
-                        v_flex().flex_grow().py_2().child(
-                            ListItem::new("empty_state")
-                                .inset(true)
-                                .spacing(ListItemSpacing::Sparse)
-                                .disabled(true)
-                                .child(Label::new(text).color(Color::Muted)),
-                        ),
-                    )
-                })
-            })
-            .children(self.delegate.render_footer(window, cx))
-            .children(match &self.head {
-                Head::Editor(editor) => {
-                    if editor_position == PickerEditorPosition::End {
-                        Some(self.delegate.render_editor(&editor.clone(), window, cx))
-                    } else {
-                        None
-                    }
-                }
-                Head::Empty(empty_head) => Some(div().child(empty_head.clone())),
-            });
-
-        let Some(aside) = aside else {
-            return menu;
-        };
-
-        let render_aside = |aside: DocumentationAside, cx: &mut Context<Self>| {
-            WithRemSize::new(ui_font_size)
-                .occlude()
-                .elevation_2(cx)
-                .w_full()
-                .p_2()
-                .overflow_hidden()
-                .when(is_wide_window, |this| this.max_w_96())
-                .when(!is_wide_window, |this| this.max_w_48())
-                .child((aside.render)(cx))
-        };
-
-        if is_wide_window {
-            div().relative().child(menu).child(
-                h_flex()
-                    .absolute()
-                    .when(aside.side == DocumentationSide::Left, |this| {
-                        this.right_full().mr_1()
-                    })
-                    .when(aside.side == DocumentationSide::Right, |this| {
-                        this.left_full().ml_1()
-                    })
-                    .when(aside.edge == DocumentationEdge::Top, |this| this.top_0())
-                    .when(aside.edge == DocumentationEdge::Bottom, |this| {
-                        this.bottom_0()
-                    })
-                    .child(render_aside(aside, cx)),
-            )
-        } else {
-            v_flex()
-                .w_full()
-                .gap_1()
-                .justify_end()
-                .child(render_aside(aside, cx))
-                .child(menu)
-        }
-    }
-}
diff --git a/crates/picker/src/popover_menu.rs b/crates/picker/src/popover_menu.rs
deleted file mode 100644
index 42eedb2492..0000000000
--- a/crates/picker/src/popover_menu.rs
+++ /dev/null
@@ -1,101 +0,0 @@
-use gpui::{
-    AnyView, Corner, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, Pixels, Point,
-    Subscription,
-};
-use ui::{
-    FluentBuilder as _, IntoElement, PopoverMenu, PopoverMenuHandle, PopoverTrigger, prelude::*,
-};
-
-use crate::{Picker, PickerDelegate};
-
-pub struct PickerPopoverMenu<T, TT, P>
-where
-    T: PopoverTrigger + ButtonCommon,
-    TT: Fn(&mut Window, &mut App) -> AnyView + 'static,
-    P: PickerDelegate,
-{
-    picker: Entity<Picker<P>>,
-    trigger: T,
-    tooltip: TT,
-    handle: Option<PopoverMenuHandle<Picker<P>>>,
-    anchor: Corner,
-    offset: Option<Point<Pixels>>,
-    _subscriptions: Vec<Subscription>,
-}
-
-impl<T, TT, P> PickerPopoverMenu<T, TT, P>
-where
-    T: PopoverTrigger + ButtonCommon,
-    TT: Fn(&mut Window, &mut App) -> AnyView + 'static,
-    P: PickerDelegate,
-{
-    pub fn new(
-        picker: Entity<Picker<P>>,
-        trigger: T,
-        tooltip: TT,
-        anchor: Corner,
-        cx: &mut App,
-    ) -> Self {
-        Self {
-            _subscriptions: vec![cx.subscribe(&picker, |picker, &DismissEvent, cx| {
-                picker.update(cx, |_, cx| cx.emit(DismissEvent));
-            })],
-            picker,
-            trigger,
-            tooltip,
-            handle: None,
-            offset: Some(Point {
-                x: px(0.0),
-                y: px(-2.0),
-            }),
-            anchor,
-        }
-    }
-
-    pub fn with_handle(mut self, handle: PopoverMenuHandle<Picker<P>>) -> Self {
-        self.handle = Some(handle);
-        self
-    }
-
-    pub fn offset(mut self, offset: Point<Pixels>) -> Self {
-        self.offset = Some(offset);
-        self
-    }
-}
-
-impl<T, TT, P> EventEmitter<DismissEvent> for PickerPopoverMenu<T, TT, P>
-where
-    T: PopoverTrigger + ButtonCommon,
-    TT: Fn(&mut Window, &mut App) -> AnyView + 'static,
-    P: PickerDelegate,
-{
-}
-
-impl<T, TT, P> Focusable for PickerPopoverMenu<T, TT, P>
-where
-    T: PopoverTrigger + ButtonCommon,
-    TT: Fn(&mut Window, &mut App) -> AnyView + 'static,
-    P: PickerDelegate,
-{
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        self.picker.focus_handle(cx)
-    }
-}
-
-impl<T, TT, P> RenderOnce for PickerPopoverMenu<T, TT, P>
-where
-    T: PopoverTrigger + ButtonCommon,
-    TT: Fn(&mut Window, &mut App) -> AnyView + 'static,
-    P: PickerDelegate,
-{
-    fn render(self, _window: &mut Window, _cx: &mut App) -> impl IntoElement {
-        let picker = self.picker.clone();
-
-        PopoverMenu::new("popover-menu")
-            .menu(move |_window, _cx| Some(picker.clone()))
-            .trigger_with_tooltip(self.trigger, self.tooltip)
-            .anchor(self.anchor)
-            .when_some(self.handle, |menu, handle| menu.with_handle(handle))
-            .when_some(self.offset, |menu, offset| menu.offset(offset))
-    }
-}
diff --git a/crates/prettier/Cargo.toml b/crates/prettier/Cargo.toml
deleted file mode 100644
index 9da1e4c8d6..0000000000
--- a/crates/prettier/Cargo.toml
+++ /dev/null
@@ -1,36 +0,0 @@
-[package]
-name = "prettier"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/prettier.rs"
-doctest = false
-
-[features]
-test-support = []
-
-[dependencies]
-anyhow.workspace = true
-collections.workspace = true
-fs.workspace = true
-gpui.workspace = true
-language.workspace = true
-log.workspace = true
-lsp.workspace = true
-node_runtime.workspace = true
-parking_lot.workspace = true
-paths.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-util.workspace = true
-
-[dev-dependencies]
-fs = { workspace = true,  features = ["test-support"] }
-gpui = { workspace = true, features = ["test-support"] }
-language = { workspace = true, features = ["test-support"] }
diff --git a/crates/prettier/LICENSE-GPL b/crates/prettier/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/prettier/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/prettier/src/prettier.rs b/crates/prettier/src/prettier.rs
deleted file mode 100644
index bc4ce609a1..0000000000
--- a/crates/prettier/src/prettier.rs
+++ /dev/null
@@ -1,1191 +0,0 @@
-use anyhow::Context as _;
-use collections::{HashMap, HashSet};
-use fs::Fs;
-use gpui::{AsyncApp, Entity};
-use language::language_settings::PrettierSettings;
-use language::{Buffer, Diff, Language, language_settings::language_settings};
-use lsp::{LanguageServer, LanguageServerId};
-use node_runtime::NodeRuntime;
-use paths::default_prettier_dir;
-use serde::{Deserialize, Serialize};
-use std::{
-    ops::ControlFlow,
-    path::{Path, PathBuf},
-    sync::Arc,
-};
-use util::{
-    paths::{PathMatcher, PathStyle},
-    rel_path::RelPath,
-};
-
-#[derive(Debug, Clone)]
-pub enum Prettier {
-    Real(RealPrettier),
-    #[cfg(any(test, feature = "test-support"))]
-    Test(TestPrettier),
-}
-
-#[derive(Debug, Clone)]
-pub struct RealPrettier {
-    default: bool,
-    prettier_dir: PathBuf,
-    server: Arc<LanguageServer>,
-}
-
-#[cfg(any(test, feature = "test-support"))]
-#[derive(Debug, Clone)]
-pub struct TestPrettier {
-    prettier_dir: PathBuf,
-    default: bool,
-}
-
-pub const FAIL_THRESHOLD: usize = 4;
-pub const PRETTIER_SERVER_FILE: &str = "prettier_server.js";
-pub const PRETTIER_SERVER_JS: &str = include_str!("./prettier_server.js");
-const PRETTIER_PACKAGE_NAME: &str = "prettier";
-const TAILWIND_PRETTIER_PLUGIN_PACKAGE_NAME: &str = "prettier-plugin-tailwindcss";
-
-#[cfg(any(test, feature = "test-support"))]
-pub const FORMAT_SUFFIX: &str = "\nformatted by test prettier";
-
-impl Prettier {
-    pub const CONFIG_FILE_NAMES: &'static [&'static str] = &[
-        ".prettierrc",
-        ".prettierrc.json",
-        ".prettierrc.json5",
-        ".prettierrc.yaml",
-        ".prettierrc.yml",
-        ".prettierrc.toml",
-        ".prettierrc.js",
-        ".prettierrc.cjs",
-        ".prettierrc.mjs",
-        ".prettierrc.ts",
-        ".prettierrc.cts",
-        ".prettierrc.mts",
-        "package.json",
-        "prettier.config.js",
-        "prettier.config.cjs",
-        "prettier.config.mjs",
-        "prettier.config.ts",
-        "prettier.config.cts",
-        "prettier.config.mts",
-        ".editorconfig",
-        ".prettierignore",
-    ];
-
-    pub async fn locate_prettier_installation(
-        fs: &dyn Fs,
-        installed_prettiers: &HashSet<PathBuf>,
-        locate_from: &Path,
-    ) -> anyhow::Result<ControlFlow<(), Option<PathBuf>>> {
-        let mut path_to_check = locate_from
-            .components()
-            .take_while(|component| component.as_os_str().to_string_lossy() != "node_modules")
-            .collect::<PathBuf>();
-        if path_to_check != locate_from {
-            log::debug!(
-                "Skipping prettier location for path {path_to_check:?} that is inside node_modules"
-            );
-            return Ok(ControlFlow::Break(()));
-        }
-        let path_to_check_metadata = fs
-            .metadata(&path_to_check)
-            .await
-            .with_context(|| format!("failed to get metadata for initial path {path_to_check:?}"))?
-            .with_context(|| format!("empty metadata for initial path {path_to_check:?}"))?;
-        if !path_to_check_metadata.is_dir {
-            path_to_check.pop();
-        }
-
-        let mut closest_package_json_path = None;
-        loop {
-            if installed_prettiers.contains(&path_to_check) {
-                log::debug!("Found prettier path {path_to_check:?} in installed prettiers");
-                return Ok(ControlFlow::Continue(Some(path_to_check)));
-            } else if let Some(package_json_contents) =
-                read_package_json(fs, &path_to_check).await?
-            {
-                if has_prettier_in_node_modules(fs, &path_to_check).await? {
-                    log::debug!("Found prettier path {path_to_check:?} in the node_modules");
-                    return Ok(ControlFlow::Continue(Some(path_to_check)));
-                } else {
-                    match &closest_package_json_path {
-                        None => closest_package_json_path = Some(path_to_check.clone()),
-                        Some(closest_package_json_path) => {
-                            match package_json_contents.get("workspaces") {
-                                Some(serde_json::Value::Array(workspaces)) => {
-                                    let subproject_path = closest_package_json_path.strip_prefix(&path_to_check).expect("traversing path parents, should be able to strip prefix");
-                                    if workspaces.iter().filter_map(|value| {
-                                        if let serde_json::Value::String(s) = value {
-                                            Some(s.clone())
-                                        } else {
-                                            log::warn!("Skipping non-string 'workspaces' value: {value:?}");
-                                            None
-                                        }
-                                    }).any(|workspace_definition| {
-                                        workspace_definition == subproject_path.to_string_lossy() || PathMatcher::new(&[workspace_definition], PathStyle::local()).ok().is_some_and(
-                                            |path_matcher| RelPath::new(subproject_path, PathStyle::local()).is_ok_and(|path|  path_matcher.is_match(path)))
-                                    }) {
-                                        anyhow::ensure!(has_prettier_in_node_modules(fs, &path_to_check).await?,
-                                            "Path {path_to_check:?} is the workspace root for project in \
-                                            {closest_package_json_path:?}, but it has no prettier installed"
-                                        );
-                                        log::info!(
-                                            "Found prettier path {path_to_check:?} in the workspace \
-                                            root for project in {closest_package_json_path:?}"
-                                        );
-                                        return Ok(ControlFlow::Continue(Some(path_to_check)));
-                                    } else {
-                                        log::warn!(
-                                            "Skipping path {path_to_check:?} workspace root with \
-                                            workspaces {workspaces:?} that have no prettier installed"
-                                        );
-                                    }
-                                }
-                                Some(unknown) => log::error!(
-                                    "Failed to parse workspaces for {path_to_check:?} from package.json, \
-                                    got {unknown:?}. Skipping."
-                                ),
-                                None => log::warn!(
-                                    "Skipping path {path_to_check:?} that has no prettier \
-                                    dependency and no workspaces section in its package.json"
-                                ),
-                            }
-                        }
-                    }
-                }
-            }
-
-            if !path_to_check.pop() {
-                log::debug!("Found no prettier in ancestors of {locate_from:?}");
-                return Ok(ControlFlow::Continue(None));
-            }
-        }
-    }
-
-    pub async fn locate_prettier_ignore(
-        fs: &dyn Fs,
-        prettier_ignores: &HashSet<PathBuf>,
-        locate_from: &Path,
-    ) -> anyhow::Result<ControlFlow<(), Option<PathBuf>>> {
-        let mut path_to_check = locate_from
-            .components()
-            .take_while(|component| component.as_os_str().to_string_lossy() != "node_modules")
-            .collect::<PathBuf>();
-        if path_to_check != locate_from {
-            log::debug!(
-                "Skipping prettier ignore location for path {path_to_check:?} that is inside node_modules"
-            );
-            return Ok(ControlFlow::Break(()));
-        }
-
-        let path_to_check_metadata = fs
-            .metadata(&path_to_check)
-            .await
-            .with_context(|| format!("failed to get metadata for initial path {path_to_check:?}"))?
-            .with_context(|| format!("empty metadata for initial path {path_to_check:?}"))?;
-        if !path_to_check_metadata.is_dir {
-            path_to_check.pop();
-        }
-
-        let mut closest_package_json_path = None;
-        loop {
-            if prettier_ignores.contains(&path_to_check) {
-                log::debug!("Found prettier ignore at {path_to_check:?}");
-                return Ok(ControlFlow::Continue(Some(path_to_check)));
-            } else if let Some(package_json_contents) =
-                read_package_json(fs, &path_to_check).await?
-            {
-                let ignore_path = path_to_check.join(".prettierignore");
-                if let Some(metadata) = fs
-                    .metadata(&ignore_path)
-                    .await
-                    .with_context(|| format!("fetching metadata for {ignore_path:?}"))?
-                    && !metadata.is_dir
-                    && !metadata.is_symlink
-                {
-                    log::info!("Found prettier ignore at {ignore_path:?}");
-                    return Ok(ControlFlow::Continue(Some(path_to_check)));
-                }
-                match &closest_package_json_path {
-                    None => closest_package_json_path = Some(path_to_check.clone()),
-                    Some(closest_package_json_path) => {
-                        if let Some(serde_json::Value::Array(workspaces)) =
-                            package_json_contents.get("workspaces")
-                        {
-                            let subproject_path = closest_package_json_path
-                                .strip_prefix(&path_to_check)
-                                .expect("traversing path parents, should be able to strip prefix");
-
-                            if workspaces
-                                .iter()
-                                .filter_map(|value| {
-                                    if let serde_json::Value::String(s) = value {
-                                        Some(s.clone())
-                                    } else {
-                                        log::warn!(
-                                            "Skipping non-string 'workspaces' value: {value:?}"
-                                        );
-                                        None
-                                    }
-                                })
-                                .any(|workspace_definition| {
-                                    workspace_definition == subproject_path.to_string_lossy()
-                                        || PathMatcher::new(
-                                            &[workspace_definition],
-                                            PathStyle::local(),
-                                        )
-                                        .ok()
-                                        .is_some_and(
-                                            |path_matcher| {
-                                                RelPath::new(subproject_path, PathStyle::local())
-                                                    .is_ok_and(|rel_path| {
-                                                        path_matcher.is_match(rel_path)
-                                                    })
-                                            },
-                                        )
-                                })
-                            {
-                                let workspace_ignore = path_to_check.join(".prettierignore");
-                                if let Some(metadata) = fs.metadata(&workspace_ignore).await?
-                                    && !metadata.is_dir
-                                {
-                                    log::info!(
-                                        "Found prettier ignore at workspace root {workspace_ignore:?}"
-                                    );
-                                    return Ok(ControlFlow::Continue(Some(path_to_check)));
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            if !path_to_check.pop() {
-                log::debug!("Found no prettier ignore in ancestors of {locate_from:?}");
-                return Ok(ControlFlow::Continue(None));
-            }
-        }
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub async fn start(
-        _: LanguageServerId,
-        prettier_dir: PathBuf,
-        _: NodeRuntime,
-        _: AsyncApp,
-    ) -> anyhow::Result<Self> {
-        Ok(Self::Test(TestPrettier {
-            default: prettier_dir == default_prettier_dir().as_path(),
-            prettier_dir,
-        }))
-    }
-
-    #[cfg(not(any(test, feature = "test-support")))]
-    pub async fn start(
-        server_id: LanguageServerId,
-        prettier_dir: PathBuf,
-        node: NodeRuntime,
-        mut cx: AsyncApp,
-    ) -> anyhow::Result<Self> {
-        use lsp::{LanguageServerBinary, LanguageServerName};
-
-        let executor = cx.background_executor().clone();
-        anyhow::ensure!(
-            prettier_dir.is_dir(),
-            "Prettier dir {prettier_dir:?} is not a directory"
-        );
-        let prettier_server = default_prettier_dir().join(PRETTIER_SERVER_FILE);
-        anyhow::ensure!(
-            prettier_server.is_file(),
-            "no prettier server package found at {prettier_server:?}"
-        );
-
-        let node_path = executor
-            .spawn(async move { node.binary_path().await })
-            .await?;
-        let server_name = LanguageServerName("prettier".into());
-        let server_binary = LanguageServerBinary {
-            path: node_path,
-            arguments: vec![prettier_server.into(), prettier_dir.as_path().into()],
-            env: None,
-        };
-        let server = LanguageServer::new(
-            Arc::new(parking_lot::Mutex::new(None)),
-            server_id,
-            server_name,
-            server_binary,
-            &prettier_dir,
-            None,
-            Default::default(),
-            &mut cx,
-        )
-        .context("prettier server creation")?;
-
-        let server = cx
-            .update(|cx| {
-                let params = server.default_initialize_params(false, cx);
-                let configuration = lsp::DidChangeConfigurationParams {
-                    settings: Default::default(),
-                };
-                executor.spawn(server.initialize(params, configuration.into(), cx))
-            })?
-            .await
-            .context("prettier server initialization")?;
-        Ok(Self::Real(RealPrettier {
-            server,
-            default: prettier_dir == default_prettier_dir().as_path(),
-            prettier_dir,
-        }))
-    }
-
-    pub async fn format(
-        &self,
-        buffer: &Entity<Buffer>,
-        buffer_path: Option<PathBuf>,
-        ignore_dir: Option<PathBuf>,
-        cx: &mut AsyncApp,
-    ) -> anyhow::Result<Diff> {
-        match self {
-            Self::Real(local) => {
-                let params = buffer
-                    .update(cx, |buffer, cx| {
-                        let buffer_language = buffer.language().map(|language| language.as_ref());
-                        let language_settings = language_settings(buffer_language.map(|l| l.name()), buffer.file(), cx);
-                        let prettier_settings = &language_settings.prettier;
-                        anyhow::ensure!(
-                            prettier_settings.allowed,
-                            "Cannot format: prettier is not allowed for language {buffer_language:?}"
-                        );
-                        let prettier_node_modules = self.prettier_dir().join("node_modules");
-                        anyhow::ensure!(
-                            prettier_node_modules.is_dir(),
-                            "Prettier node_modules dir does not exist: {prettier_node_modules:?}"
-                        );
-                        let plugin_name_into_path = |plugin_name: &str| {
-                            let prettier_plugin_dir = prettier_node_modules.join(plugin_name);
-                            [
-                                prettier_plugin_dir.join("dist").join("index.mjs"),
-                                prettier_plugin_dir.join("dist").join("index.js"),
-                                prettier_plugin_dir.join("dist").join("plugin.js"),
-                                prettier_plugin_dir.join("src").join("plugin.js"),
-                                prettier_plugin_dir.join("lib").join("index.js"),
-                                prettier_plugin_dir.join("index.mjs"),
-                                prettier_plugin_dir.join("index.js"),
-                                prettier_plugin_dir.join("plugin.js"),
-                                // this one is for @prettier/plugin-php
-                                prettier_plugin_dir.join("standalone.js"),
-                                // this one is for prettier-plugin-latex
-                                prettier_plugin_dir.join("dist").join("prettier-plugin-latex.js"),
-                                prettier_plugin_dir,
-                            ]
-                            .into_iter()
-                            .find(|possible_plugin_path| possible_plugin_path.is_file())
-                        };
-
-                        // Tailwind plugin requires being added last
-                        // https://github.com/tailwindlabs/prettier-plugin-tailwindcss#compatibility-with-other-prettier-plugins
-                        let mut add_tailwind_back = false;
-
-                        let mut located_plugins = prettier_settings.plugins.iter()
-                            .filter(|plugin_name| {
-                                if plugin_name.as_str() == TAILWIND_PRETTIER_PLUGIN_PACKAGE_NAME {
-                                    add_tailwind_back = true;
-                                    false
-                                } else {
-                                    true
-                                }
-                            })
-                            .map(|plugin_name| {
-                                let plugin_path = plugin_name_into_path(plugin_name);
-                                (plugin_name.clone(), plugin_path)
-                            })
-                            .collect::<Vec<_>>();
-                        if add_tailwind_back {
-                            located_plugins.push((
-                                TAILWIND_PRETTIER_PLUGIN_PACKAGE_NAME.to_owned(),
-                                plugin_name_into_path(TAILWIND_PRETTIER_PLUGIN_PACKAGE_NAME),
-                            ));
-                        }
-
-                        let prettier_options = if self.is_default() {
-                            let mut options = prettier_settings.options.clone();
-                            if !options.contains_key("tabWidth") {
-                                options.insert(
-                                    "tabWidth".to_string(),
-                                    serde_json::Value::Number(serde_json::Number::from(
-                                        language_settings.tab_size.get(),
-                                    )),
-                                );
-                            }
-                            if !options.contains_key("printWidth") {
-                                options.insert(
-                                    "printWidth".to_string(),
-                                    serde_json::Value::Number(serde_json::Number::from(
-                                        language_settings.preferred_line_length,
-                                    )),
-                                );
-                            }
-                            if !options.contains_key("useTabs") {
-                                options.insert(
-                                    "useTabs".to_string(),
-                                    serde_json::Value::Bool(language_settings.hard_tabs),
-                                );
-                            }
-                            Some(options)
-                        } else {
-                            None
-                        };
-
-                        let plugins = located_plugins
-                            .into_iter()
-                            .filter_map(|(plugin_name, located_plugin_path)| {
-                                match located_plugin_path {
-                                    Some(path) => Some(path),
-                                    None => {
-                                        log::error!("Have not found plugin path for {plugin_name:?} inside {prettier_node_modules:?}");
-                                        None
-                                    }
-                                }
-                            })
-                            .collect();
-
-                        let parser = prettier_parser_name(buffer_path.as_deref(), buffer_language, prettier_settings).context("getting prettier parser")?;
-
-                        let ignore_path = ignore_dir.and_then(|dir| {
-                            let ignore_file = dir.join(".prettierignore");
-                            ignore_file.is_file().then_some(ignore_file)
-                        });
-
-                        log::debug!(
-                            "Formatting file {:?} with prettier, plugins :{:?}, options: {:?}, ignore_path: {:?}",
-                            buffer.file().map(|f| f.full_path(cx)),
-                            plugins,
-                            prettier_options,
-                            ignore_path,
-                        );
-
-                        anyhow::Ok(FormatParams {
-                            text: buffer.text(),
-                            options: FormatOptions {
-                                path: buffer_path,
-                                parser,
-                                plugins,
-                                prettier_options,
-                                ignore_path,
-                            },
-                        })
-                })?
-                .context("building prettier request")?;
-
-                let response = local
-                    .server
-                    .request::<Format>(params)
-                    .await
-                    .into_response()?;
-                let diff_task = buffer.update(cx, |buffer, cx| buffer.diff(response.text, cx))?;
-                Ok(diff_task.await)
-            }
-            #[cfg(any(test, feature = "test-support"))]
-            Self::Test(_) => Ok(buffer
-                .update(cx, |buffer, cx| {
-                    match buffer
-                        .language()
-                        .map(|language| language.lsp_id())
-                        .as_deref()
-                    {
-                        Some("rust") => anyhow::bail!("prettier does not support Rust"),
-                        Some(_other) => {
-                            let mut formatted_text = buffer.text() + FORMAT_SUFFIX;
-
-                            let buffer_language =
-                                buffer.language().map(|language| language.as_ref());
-                            let language_settings = language_settings(
-                                buffer_language.map(|l| l.name()),
-                                buffer.file(),
-                                cx,
-                            );
-                            let prettier_settings = &language_settings.prettier;
-                            let parser = prettier_parser_name(
-                                buffer_path.as_deref(),
-                                buffer_language,
-                                prettier_settings,
-                            )?;
-
-                            if let Some(parser) = parser {
-                                formatted_text = format!("{formatted_text}\n{parser}");
-                            }
-
-                            Ok(buffer.diff(formatted_text, cx))
-                        }
-                        None => panic!("Should not format buffer without a language with prettier"),
-                    }
-                })??
-                .await),
-        }
-    }
-
-    pub async fn clear_cache(&self) -> anyhow::Result<()> {
-        match self {
-            Self::Real(local) => local
-                .server
-                .request::<ClearCache>(())
-                .await
-                .into_response()
-                .context("prettier clear cache"),
-            #[cfg(any(test, feature = "test-support"))]
-            Self::Test(_) => Ok(()),
-        }
-    }
-
-    pub fn server(&self) -> Option<&Arc<LanguageServer>> {
-        match self {
-            Self::Real(local) => Some(&local.server),
-            #[cfg(any(test, feature = "test-support"))]
-            Self::Test(_) => None,
-        }
-    }
-
-    pub fn is_default(&self) -> bool {
-        match self {
-            Self::Real(local) => local.default,
-            #[cfg(any(test, feature = "test-support"))]
-            Self::Test(test_prettier) => test_prettier.default,
-        }
-    }
-
-    pub fn prettier_dir(&self) -> &Path {
-        match self {
-            Self::Real(local) => &local.prettier_dir,
-            #[cfg(any(test, feature = "test-support"))]
-            Self::Test(test_prettier) => &test_prettier.prettier_dir,
-        }
-    }
-}
-
-fn prettier_parser_name(
-    buffer_path: Option<&Path>,
-    buffer_language: Option<&Language>,
-    prettier_settings: &PrettierSettings,
-) -> anyhow::Result<Option<String>> {
-    let parser = if buffer_path.is_none() {
-        let parser = prettier_settings
-            .parser
-            .as_deref()
-            .or_else(|| buffer_language.and_then(|language| language.prettier_parser_name()));
-        if parser.is_none() {
-            log::error!(
-                "Formatting unsaved file with prettier failed. No prettier parser configured for language {buffer_language:?}"
-            );
-            anyhow::bail!("Cannot determine prettier parser for unsaved file");
-        }
-        parser
-    } else if let (Some(buffer_language), Some(buffer_path)) = (buffer_language, buffer_path)
-        && buffer_path.extension().is_some_and(|extension| {
-            !buffer_language
-                .config()
-                .matcher
-                .path_suffixes
-                .contains(&extension.to_string_lossy().into_owned())
-        })
-    {
-        buffer_language.prettier_parser_name()
-    } else {
-        prettier_settings.parser.as_deref()
-    };
-
-    Ok(parser.map(ToOwned::to_owned))
-}
-
-async fn has_prettier_in_node_modules(fs: &dyn Fs, path: &Path) -> anyhow::Result<bool> {
-    let possible_node_modules_location = path.join("node_modules").join(PRETTIER_PACKAGE_NAME);
-    if let Some(node_modules_location_metadata) = fs
-        .metadata(&possible_node_modules_location)
-        .await
-        .with_context(|| format!("fetching metadata for {possible_node_modules_location:?}"))?
-    {
-        return Ok(node_modules_location_metadata.is_dir);
-    }
-    Ok(false)
-}
-
-async fn read_package_json(
-    fs: &dyn Fs,
-    path: &Path,
-) -> anyhow::Result<Option<HashMap<String, serde_json::Value>>> {
-    let possible_package_json = path.join("package.json");
-    if let Some(package_json_metadata) = fs
-        .metadata(&possible_package_json)
-        .await
-        .with_context(|| format!("fetching metadata for package json {possible_package_json:?}"))?
-        && !package_json_metadata.is_dir
-        && !package_json_metadata.is_symlink
-    {
-        let package_json_contents = fs
-            .load(&possible_package_json)
-            .await
-            .with_context(|| format!("reading {possible_package_json:?} file contents"))?;
-        return serde_json::from_str::<HashMap<String, serde_json::Value>>(&package_json_contents)
-            .map(Some)
-            .with_context(|| format!("parsing {possible_package_json:?} file contents"));
-    }
-    Ok(None)
-}
-
-enum Format {}
-
-#[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct FormatParams {
-    text: String,
-    options: FormatOptions,
-}
-
-#[derive(Clone, Debug, Default, Eq, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct FormatOptions {
-    plugins: Vec<PathBuf>,
-    parser: Option<String>,
-    #[serde(rename = "filepath")]
-    path: Option<PathBuf>,
-    prettier_options: Option<HashMap<String, serde_json::Value>>,
-    ignore_path: Option<PathBuf>,
-}
-
-#[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct FormatResult {
-    text: String,
-}
-
-impl lsp::request::Request for Format {
-    type Params = FormatParams;
-    type Result = FormatResult;
-    const METHOD: &'static str = "prettier/format";
-}
-
-enum ClearCache {}
-
-impl lsp::request::Request for ClearCache {
-    type Params = ();
-    type Result = ();
-    const METHOD: &'static str = "prettier/clear_cache";
-}
-
-#[cfg(test)]
-mod tests {
-    use fs::FakeFs;
-    use serde_json::json;
-
-    use super::*;
-
-    #[gpui::test]
-    async fn test_prettier_lookup_finds_nothing(cx: &mut gpui::TestAppContext) {
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            "/root",
-            json!({
-                ".config": {
-                    "zed": {
-                        "settings.json": r#"{ "formatter": "auto" }"#,
-                    },
-                },
-                "work": {
-                    "project": {
-                        "src": {
-                            "index.js": "// index.js file contents",
-                        },
-                        "node_modules": {
-                            "expect": {
-                                "build": {
-                                    "print.js": "// print.js file contents",
-                                },
-                                "package.json": r#"{
-                                    "devDependencies": {
-                                        "prettier": "2.5.1"
-                                    }
-                                }"#,
-                            },
-                            "prettier": {
-                                "index.js": "// Dummy prettier package file",
-                            },
-                        },
-                        "package.json": r#"{}"#
-                    },
-                }
-            }),
-        )
-        .await;
-
-        assert_eq!(
-            Prettier::locate_prettier_installation(
-                fs.as_ref(),
-                &HashSet::default(),
-                Path::new("/root/.config/zed/settings.json"),
-            )
-            .await
-            .unwrap(),
-            ControlFlow::Continue(None),
-            "Should find no prettier for path hierarchy without it"
-        );
-        assert_eq!(
-            Prettier::locate_prettier_installation(
-                fs.as_ref(),
-                &HashSet::default(),
-                Path::new("/root/work/project/src/index.js")
-            )
-            .await
-            .unwrap(),
-            ControlFlow::Continue(Some(PathBuf::from("/root/work/project"))),
-            "Should successfully find a prettier for path hierarchy that has node_modules with prettier, but no package.json mentions of it"
-        );
-        assert_eq!(
-            Prettier::locate_prettier_installation(
-                fs.as_ref(),
-                &HashSet::default(),
-                Path::new("/root/work/project/node_modules/expect/build/print.js")
-            )
-            .await
-            .unwrap(),
-            ControlFlow::Break(()),
-            "Should not format files inside node_modules/"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_prettier_lookup_in_simple_npm_projects(cx: &mut gpui::TestAppContext) {
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            "/root",
-            json!({
-                "web_blog": {
-                    "node_modules": {
-                        "prettier": {
-                            "index.js": "// Dummy prettier package file",
-                        },
-                        "expect": {
-                            "build": {
-                                "print.js": "// print.js file contents",
-                            },
-                            "package.json": r#"{
-                                "devDependencies": {
-                                    "prettier": "2.5.1"
-                                }
-                            }"#,
-                        },
-                    },
-                    "pages": {
-                        "[slug].tsx": "// [slug].tsx file contents",
-                    },
-                    "package.json": r#"{
-                        "devDependencies": {
-                            "prettier": "2.3.0"
-                        },
-                        "prettier": {
-                            "semi": false,
-                            "printWidth": 80,
-                            "htmlWhitespaceSensitivity": "strict",
-                            "tabWidth": 4
-                        }
-                    }"#
-                }
-            }),
-        )
-        .await;
-
-        assert_eq!(
-            Prettier::locate_prettier_installation(
-                fs.as_ref(),
-                &HashSet::default(),
-                Path::new("/root/web_blog/pages/[slug].tsx")
-            )
-            .await
-            .unwrap(),
-            ControlFlow::Continue(Some(PathBuf::from("/root/web_blog"))),
-            "Should find a preinstalled prettier in the project root"
-        );
-        assert_eq!(
-            Prettier::locate_prettier_installation(
-                fs.as_ref(),
-                &HashSet::default(),
-                Path::new("/root/web_blog/node_modules/expect/build/print.js")
-            )
-            .await
-            .unwrap(),
-            ControlFlow::Break(()),
-            "Should not allow formatting node_modules/ contents"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_prettier_lookup_for_not_installed(cx: &mut gpui::TestAppContext) {
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            "/root",
-            json!({
-                "work": {
-                    "web_blog": {
-                        "node_modules": {
-                            "expect": {
-                                "build": {
-                                    "print.js": "// print.js file contents",
-                                },
-                                "package.json": r#"{
-                                    "devDependencies": {
-                                        "prettier": "2.5.1"
-                                    }
-                                }"#,
-                            },
-                        },
-                        "pages": {
-                            "[slug].tsx": "// [slug].tsx file contents",
-                        },
-                        "package.json": r#"{
-                            "devDependencies": {
-                                "prettier": "2.3.0"
-                            },
-                            "prettier": {
-                                "semi": false,
-                                "printWidth": 80,
-                                "htmlWhitespaceSensitivity": "strict",
-                                "tabWidth": 4
-                            }
-                        }"#
-                    }
-                }
-            }),
-        )
-        .await;
-
-        assert_eq!(
-            Prettier::locate_prettier_installation(
-                fs.as_ref(),
-                &HashSet::default(),
-                Path::new("/root/work/web_blog/pages/[slug].tsx")
-            )
-            .await
-            .unwrap(),
-            ControlFlow::Continue(None),
-            "Should find no prettier when node_modules don't have it"
-        );
-
-        assert_eq!(
-            Prettier::locate_prettier_installation(
-                fs.as_ref(),
-                &HashSet::from_iter(
-                    [PathBuf::from("/root"), PathBuf::from("/root/work")].into_iter()
-                ),
-                Path::new("/root/work/web_blog/pages/[slug].tsx")
-            )
-            .await
-            .unwrap(),
-            ControlFlow::Continue(Some(PathBuf::from("/root/work"))),
-            "Should return closest cached value found without path checks"
-        );
-
-        assert_eq!(
-            Prettier::locate_prettier_installation(
-                fs.as_ref(),
-                &HashSet::default(),
-                Path::new("/root/work/web_blog/node_modules/expect/build/print.js")
-            )
-            .await
-            .unwrap(),
-            ControlFlow::Break(()),
-            "Should not allow formatting files inside node_modules/"
-        );
-        assert_eq!(
-            Prettier::locate_prettier_installation(
-                fs.as_ref(),
-                &HashSet::from_iter(
-                    [PathBuf::from("/root"), PathBuf::from("/root/work")].into_iter()
-                ),
-                Path::new("/root/work/web_blog/node_modules/expect/build/print.js")
-            )
-            .await
-            .unwrap(),
-            ControlFlow::Break(()),
-            "Should ignore cache lookup for files inside node_modules/"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_prettier_lookup_in_npm_workspaces(cx: &mut gpui::TestAppContext) {
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            "/root",
-            json!({
-                "work": {
-                    "full-stack-foundations": {
-                        "exercises": {
-                            "03.loading": {
-                                "01.problem.loader": {
-                                    "app": {
-                                        "routes": {
-                                            "users+": {
-                                                "$username_+": {
-                                                    "notes.tsx": "// notes.tsx file contents",
-                                                },
-                                            },
-                                        },
-                                    },
-                                    "node_modules": {
-                                        "test.js": "// test.js contents",
-                                    },
-                                    "package.json": r#"{
-                                        "devDependencies": {
-                                            "prettier": "^3.0.3"
-                                        }
-                                    }"#
-                                },
-                            },
-                        },
-                        "package.json": r#"{
-                            "workspaces": ["exercises/*/*", "examples/*"]
-                        }"#,
-                        "node_modules": {
-                            "prettier": {
-                                "index.js": "// Dummy prettier package file",
-                            },
-                        },
-                    },
-                }
-            }),
-        )
-        .await;
-
-        assert_eq!(
-            Prettier::locate_prettier_installation(
-                fs.as_ref(),
-                &HashSet::default(),
-                Path::new("/root/work/full-stack-foundations/exercises/03.loading/01.problem.loader/app/routes/users+/$username_+/notes.tsx"),
-            ).await.unwrap(),
-            ControlFlow::Continue(Some(PathBuf::from("/root/work/full-stack-foundations"))),
-            "Should ascend to the multi-workspace root and find the prettier there",
-        );
-
-        assert_eq!(
-            Prettier::locate_prettier_installation(
-                fs.as_ref(),
-                &HashSet::default(),
-                Path::new("/root/work/full-stack-foundations/node_modules/prettier/index.js")
-            )
-            .await
-            .unwrap(),
-            ControlFlow::Break(()),
-            "Should not allow formatting files inside root node_modules/"
-        );
-        assert_eq!(
-            Prettier::locate_prettier_installation(
-                fs.as_ref(),
-                &HashSet::default(),
-                Path::new("/root/work/full-stack-foundations/exercises/03.loading/01.problem.loader/node_modules/test.js")
-            )
-            .await
-            .unwrap(),
-            ControlFlow::Break(()),
-            "Should not allow formatting files inside submodule's node_modules/"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_prettier_lookup_in_npm_workspaces_for_not_installed(
-        cx: &mut gpui::TestAppContext,
-    ) {
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            "/root",
-            json!({
-                "work": {
-                    "full-stack-foundations": {
-                        "exercises": {
-                            "03.loading": {
-                                "01.problem.loader": {
-                                    "app": {
-                                        "routes": {
-                                            "users+": {
-                                                "$username_+": {
-                                                    "notes.tsx": "// notes.tsx file contents",
-                                                },
-                                            },
-                                        },
-                                    },
-                                    "node_modules": {},
-                                    "package.json": r#"{
-                                        "devDependencies": {
-                                            "prettier": "^3.0.3"
-                                        }
-                                    }"#
-                                },
-                            },
-                        },
-                        "package.json": r#"{
-                            "workspaces": ["exercises/*/*", "examples/*"]
-                        }"#,
-                    },
-                }
-            }),
-        )
-        .await;
-
-        match Prettier::locate_prettier_installation(
-            fs.as_ref(),
-            &HashSet::default(),
-            Path::new("/root/work/full-stack-foundations/exercises/03.loading/01.problem.loader/app/routes/users+/$username_+/notes.tsx")
-        )
-        .await {
-            Ok(path) => panic!("Expected to fail for prettier in package.json but not in node_modules found, but got path {path:?}"),
-            Err(e) => {
-                let message = e.to_string().replace("\\\\", "/");
-                assert!(message.contains("/root/work/full-stack-foundations/exercises/03.loading/01.problem.loader"), "Error message should mention which project had prettier defined");
-                assert!(message.contains("/root/work/full-stack-foundations"), "Error message should mention potential candidates without prettier node_modules contents");
-            },
-        };
-    }
-
-    #[gpui::test]
-    async fn test_prettier_ignore_with_editor_prettier(cx: &mut gpui::TestAppContext) {
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            "/root",
-            json!({
-                "project": {
-                    "src": {
-                        "index.js": "// index.js file contents",
-                        "ignored.js": "// this file should be ignored",
-                    },
-                    ".prettierignore": "ignored.js",
-                    "package.json": r#"{
-                        "name": "test-project"
-                    }"#
-                }
-            }),
-        )
-        .await;
-
-        assert_eq!(
-            Prettier::locate_prettier_ignore(
-                fs.as_ref(),
-                &HashSet::default(),
-                Path::new("/root/project/src/index.js"),
-            )
-            .await
-            .unwrap(),
-            ControlFlow::Continue(Some(PathBuf::from("/root/project"))),
-            "Should find prettierignore in project root"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_prettier_ignore_in_monorepo_with_only_child_ignore(
-        cx: &mut gpui::TestAppContext,
-    ) {
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            "/root",
-            json!({
-                "monorepo": {
-                    "node_modules": {
-                        "prettier": {
-                            "index.js": "// Dummy prettier package file",
-                        }
-                    },
-                    "packages": {
-                        "web": {
-                            "src": {
-                                "index.js": "// index.js contents",
-                                "ignored.js": "// this should be ignored",
-                            },
-                            ".prettierignore": "ignored.js",
-                            "package.json": r#"{
-                                "name": "web-package"
-                            }"#
-                        }
-                    },
-                    "package.json": r#"{
-                        "workspaces": ["packages/*"],
-                        "devDependencies": {
-                            "prettier": "^2.0.0"
-                        }
-                    }"#
-                }
-            }),
-        )
-        .await;
-
-        assert_eq!(
-            Prettier::locate_prettier_ignore(
-                fs.as_ref(),
-                &HashSet::default(),
-                Path::new("/root/monorepo/packages/web/src/index.js"),
-            )
-            .await
-            .unwrap(),
-            ControlFlow::Continue(Some(PathBuf::from("/root/monorepo/packages/web"))),
-            "Should find prettierignore in child package"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_prettier_ignore_in_monorepo_with_root_and_child_ignores(
-        cx: &mut gpui::TestAppContext,
-    ) {
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            "/root",
-            json!({
-                "monorepo": {
-                    "node_modules": {
-                        "prettier": {
-                            "index.js": "// Dummy prettier package file",
-                        }
-                    },
-                    ".prettierignore": "main.js",
-                    "packages": {
-                        "web": {
-                            "src": {
-                                "main.js": "// this should not be ignored",
-                                "ignored.js": "// this should be ignored",
-                            },
-                            ".prettierignore": "ignored.js",
-                            "package.json": r#"{
-                                "name": "web-package"
-                            }"#
-                        }
-                    },
-                    "package.json": r#"{
-                        "workspaces": ["packages/*"],
-                        "devDependencies": {
-                            "prettier": "^2.0.0"
-                        }
-                    }"#
-                }
-            }),
-        )
-        .await;
-
-        assert_eq!(
-            Prettier::locate_prettier_ignore(
-                fs.as_ref(),
-                &HashSet::default(),
-                Path::new("/root/monorepo/packages/web/src/main.js"),
-            )
-            .await
-            .unwrap(),
-            ControlFlow::Continue(Some(PathBuf::from("/root/monorepo/packages/web"))),
-            "Should find child package prettierignore first"
-        );
-
-        assert_eq!(
-            Prettier::locate_prettier_ignore(
-                fs.as_ref(),
-                &HashSet::default(),
-                Path::new("/root/monorepo/packages/web/src/ignored.js"),
-            )
-            .await
-            .unwrap(),
-            ControlFlow::Continue(Some(PathBuf::from("/root/monorepo/packages/web"))),
-            "Should find child package prettierignore first"
-        );
-    }
-}
diff --git a/crates/prettier/src/prettier_server.js b/crates/prettier/src/prettier_server.js
deleted file mode 100644
index b3d8a660a4..0000000000
--- a/crates/prettier/src/prettier_server.js
+++ /dev/null
@@ -1,266 +0,0 @@
-const { Buffer } = require("buffer");
-const fs = require("fs");
-const path = require("path");
-const { once } = require("events");
-
-const prettierContainerPath = process.argv[2];
-if (prettierContainerPath == null || prettierContainerPath.length == 0) {
-  process.stderr.write(
-    `Prettier path argument was not specified or empty.\nUsage: ${process.argv[0]} ${process.argv[1]} prettier/path\n`,
-  );
-  process.exit(1);
-}
-fs.stat(prettierContainerPath, (err, stats) => {
-  if (err) {
-    process.stderr.write(`Path '${prettierContainerPath}' does not exist\n`);
-    process.exit(1);
-  }
-
-  if (!stats.isDirectory()) {
-    process.stderr.write(`Path '${prettierContainerPath}' exists but is not a directory\n`);
-    process.exit(1);
-  }
-});
-const prettierPath = path.join(prettierContainerPath, "node_modules/prettier");
-
-class Prettier {
-  constructor(path, prettier, config) {
-    this.path = path;
-    this.prettier = prettier;
-    this.config = config;
-  }
-}
-
-(async () => {
-  let prettier;
-  let config;
-  try {
-    prettier = await loadPrettier(prettierPath);
-    config = (await prettier.resolveConfig(prettierPath)) || {};
-  } catch (e) {
-    process.stderr.write(`Failed to load prettier: ${e}\n`);
-    process.exit(1);
-  }
-  process.stderr.write(`Prettier at path '${prettierPath}' loaded successfully, config: ${JSON.stringify(config)}\n`);
-  process.stdin.resume();
-  handleBuffer(new Prettier(prettierPath, prettier, config));
-})();
-
-async function handleBuffer(prettier) {
-  for await (const messageText of readStdin()) {
-    let message;
-    try {
-      message = JSON.parse(messageText);
-    } catch (e) {
-      sendResponse(makeError(`Parse error in request message: ${e}\nMessage: ${messageText}`));
-      continue;
-    }
-    // allow concurrent request handling by not `await`ing the message handling promise (async function)
-    handleMessage(message, prettier).catch((e) => {
-      if ((message.params || {}).text !== undefined) {
-        message.params.text = "..snip..";
-      }
-      sendResponse({
-        id: message.id,
-        ...makeError(`${e}\nWhile handling prettier request: ${JSON.stringify(message)}`),
-      });
-    });
-  }
-}
-
-const headerSeparator = "\r\n";
-const contentLengthHeaderName = "Content-Length";
-
-async function* readStdin() {
-  let buffer = Buffer.alloc(0);
-  let streamEnded = false;
-  process.stdin.on("end", () => {
-    streamEnded = true;
-  });
-  process.stdin.on("data", (data) => {
-    buffer = Buffer.concat([buffer, data]);
-  });
-
-  async function handleStreamEnded(errorMessage) {
-    sendResponse(makeError(errorMessage));
-    buffer = Buffer.alloc(0);
-    messageLength = null;
-    await once(process.stdin, "readable");
-    streamEnded = false;
-  }
-
-  try {
-    let headersLength = null;
-    let messageLength = null;
-    main_loop: while (true) {
-      if (messageLength === null) {
-        while (buffer.indexOf(`${headerSeparator}${headerSeparator}`) === -1) {
-          if (streamEnded) {
-            await handleStreamEnded("Unexpected end of stream: headers not found");
-            continue main_loop;
-          } else if (buffer.length > contentLengthHeaderName.length * 10) {
-            await handleStreamEnded(
-              `Unexpected stream of bytes: no headers end found after ${buffer.length} bytes of input`,
-            );
-            continue main_loop;
-          }
-          await once(process.stdin, "readable");
-        }
-        const headers = buffer.subarray(0, buffer.indexOf(`${headerSeparator}${headerSeparator}`)).toString("ascii");
-        const contentLengthHeader = headers
-          .split(headerSeparator)
-          .map((header) => header.split(":"))
-          .filter((header) => header[2] === undefined)
-          .filter((header) => (header[1] || "").length > 0)
-          .find((header) => (header[0] || "").trim() === contentLengthHeaderName);
-        const contentLength = (contentLengthHeader || [])[1];
-        if (contentLength === undefined) {
-          await handleStreamEnded(`Missing or incorrect ${contentLengthHeaderName} header: ${headers}`);
-          continue main_loop;
-        }
-        headersLength = headers.length + headerSeparator.length * 2;
-        messageLength = parseInt(contentLength, 10);
-      }
-
-      while (buffer.length < headersLength + messageLength) {
-        if (streamEnded) {
-          await handleStreamEnded(
-            `Unexpected end of stream: buffer length ${buffer.length} does not match expected header length ${headersLength} + body length ${messageLength}`,
-          );
-          continue main_loop;
-        }
-        await once(process.stdin, "readable");
-      }
-
-      const messageEnd = headersLength + messageLength;
-      const message = buffer.subarray(headersLength, messageEnd);
-      buffer = buffer.subarray(messageEnd);
-      headersLength = null;
-      messageLength = null;
-      yield message.toString("utf8");
-    }
-  } catch (e) {
-    sendResponse(makeError(`Error reading stdin: ${e}`));
-  } finally {
-    process.stdin.off("data", () => {});
-  }
-}
-
-async function handleMessage(message, prettier) {
-  const { method, id, params } = message;
-  if (method === undefined) {
-    throw new Error(`Message method is undefined: ${JSON.stringify(message)}`);
-  } else if (method == "initialized") {
-    return;
-  } else if (method === "shutdown") {
-    sendResponse({ result: {} });
-  } else if (method == "exit") {
-    process.exit(0);
-  }
-
-  if (id === undefined) {
-    throw new Error(`Message id is undefined: ${JSON.stringify(message)}`);
-  }
-
-  if (method === "prettier/format") {
-    if (params === undefined || params.text === undefined) {
-      throw new Error(`Message params.text is undefined: ${JSON.stringify(message)}`);
-    }
-    if (params.options === undefined) {
-      throw new Error(`Message params.options is undefined: ${JSON.stringify(message)}`);
-    }
-
-    let resolvedConfig = {};
-    if (params.options.filepath) {
-      resolvedConfig = (await prettier.prettier.resolveConfig(params.options.filepath)) || {};
-
-      if (params.options.ignorePath) {
-        const fileInfo = await prettier.prettier.getFileInfo(params.options.filepath, {
-          ignorePath: params.options.ignorePath,
-        });
-        if (fileInfo.ignored) {
-          process.stderr.write(
-            `Ignoring file '${params.options.filepath}' based on rules in '${params.options.ignorePath}'\n`,
-          );
-          sendResponse({ id, result: { text: params.text } });
-          return;
-        }
-      }
-    }
-
-    // Marking the params.options.filepath as undefined makes
-    // prettier.format() work even if no filepath is set.
-    if (params.options.filepath === null) {
-      params.options.filepath = undefined;
-    }
-
-    const plugins =
-      Array.isArray(resolvedConfig?.plugins) && resolvedConfig.plugins.length > 0
-        ? resolvedConfig.plugins
-        : params.options.plugins;
-
-    const options = {
-      ...(params.options.prettierOptions || prettier.config),
-      ...resolvedConfig,
-      plugins,
-      parser: params.options.parser,
-      filepath: params.options.filepath,
-    };
-    process.stderr.write(
-      `Resolved config: ${JSON.stringify(resolvedConfig)}, will format file '${
-        params.options.filepath || ""
-      }' with options: ${JSON.stringify(options)}\n`,
-    );
-    const formattedText = await prettier.prettier.format(params.text, options);
-    sendResponse({ id, result: { text: formattedText } });
-  } else if (method === "prettier/clear_cache") {
-    prettier.prettier.clearConfigCache();
-    prettier.config = (await prettier.prettier.resolveConfig(prettier.path)) || {};
-    sendResponse({ id, result: null });
-  } else if (method === "initialize") {
-    sendResponse({
-      id,
-      result: {
-        capabilities: {},
-      },
-    });
-  } else {
-    throw new Error(`Unknown method: ${method}`);
-  }
-}
-
-function makeError(message) {
-  return {
-    error: {
-      code: -32600, // invalid request code
-      message,
-    },
-  };
-}
-
-function sendResponse(response) {
-  const responsePayloadString = JSON.stringify({
-    jsonrpc: "2.0",
-    ...response,
-  });
-  const headers = `${contentLengthHeaderName}: ${Buffer.byteLength(
-    responsePayloadString,
-  )}${headerSeparator}${headerSeparator}`;
-  process.stdout.write(headers + responsePayloadString);
-}
-
-function loadPrettier(prettierPath) {
-  return new Promise((resolve, reject) => {
-    fs.access(prettierPath, fs.constants.F_OK, (err) => {
-      if (err) {
-        reject(`Path '${prettierPath}' does not exist.Error: ${err}`);
-      } else {
-        try {
-          resolve(require(prettierPath));
-        } catch (err) {
-          reject(`Error requiring prettier module from path '${prettierPath}'.Error: ${err}`);
-        }
-      }
-    });
-  });
-}
diff --git a/crates/project/Cargo.toml b/crates/project/Cargo.toml
deleted file mode 100644
index 9e2789fc10..0000000000
--- a/crates/project/Cargo.toml
+++ /dev/null
@@ -1,120 +0,0 @@
-[package]
-name = "project"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/project.rs"
-doctest = false
-
-[features]
-test-support = [
-    "buffer_diff/test-support",
-    "client/test-support",
-    "language/test-support",
-    "settings/test-support",
-    "snippet_provider/test-support",
-    "text/test-support",
-    "prettier/test-support",
-    "worktree/test-support",
-    "gpui/test-support",
-    "dap/test-support",
-    "dap_adapters/test-support",
-]
-
-[dependencies]
-aho-corasick.workspace = true
-anyhow.workspace = true
-askpass.workspace = true
-async-trait.workspace = true
-base64.workspace = true
-buffer_diff.workspace = true
-circular-buffer.workspace = true
-client.workspace = true
-clock.workspace = true
-collections.workspace = true
-context_server.workspace = true
-dap.workspace = true
-extension.workspace = true
-fancy-regex.workspace = true
-fs.workspace = true
-futures.workspace = true
-fuzzy.workspace = true
-git.workspace = true
-git_hosting_providers.workspace = true
-globset.workspace = true
-gpui.workspace = true
-http_client.workspace = true
-image.workspace = true
-itertools.workspace = true
-indexmap.workspace = true
-language.workspace = true
-log.workspace = true
-lsp.workspace = true
-markdown.workspace = true
-node_runtime.workspace = true
-parking_lot.workspace = true
-paths.workspace = true
-postage.workspace = true
-prettier.workspace = true
-rand.workspace = true
-regex.workspace = true
-remote.workspace = true
-rpc.workspace = true
-schemars.workspace = true
-semver.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-sha2.workspace = true
-shellexpand.workspace = true
-smallvec.workspace = true
-smol.workspace = true
-snippet.workspace = true
-snippet_provider.workspace = true
-sum_tree.workspace = true
-task.workspace = true
-tempfile.workspace = true
-terminal.workspace = true
-text.workspace = true
-toml.workspace = true
-url.workspace = true
-util.workspace = true
-watch.workspace = true
-wax.workspace = true
-which.workspace = true
-worktree.workspace = true
-zeroize.workspace = true
-zlog.workspace = true
-ztracing.workspace = true
-tracing.workspace = true
-
-[dev-dependencies]
-client = { workspace = true, features = ["test-support"] }
-collections = { workspace = true, features = ["test-support"] }
-context_server = { workspace = true, features = ["test-support"] }
-buffer_diff = { workspace = true, features = ["test-support"] }
-dap = { workspace = true, features = ["test-support"] }
-dap_adapters = { workspace = true, features = ["test-support"] }
-fs = { workspace = true, features = ["test-support"] }
-git2.workspace = true
-gpui = { workspace = true, features = ["test-support"] }
-language = { workspace = true, features = ["test-support"] }
-lsp = { workspace = true, features = ["test-support"] }
-prettier = { workspace = true, features = ["test-support"] }
-pretty_assertions.workspace = true
-release_channel.workspace = true
-rpc = { workspace = true, features = ["test-support"] }
-settings = { workspace = true, features = ["test-support"] }
-snippet_provider = { workspace = true, features = ["test-support"] }
-unindent.workspace = true
-util = { workspace = true, features = ["test-support"] }
-worktree = { workspace = true, features = ["test-support"] }
-
-[package.metadata.cargo-machete]
-ignored = ["tracing"]
diff --git a/crates/project/LICENSE-GPL b/crates/project/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/project/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/project/src/agent_server_store.rs b/crates/project/src/agent_server_store.rs
deleted file mode 100644
index a2cc57beae..0000000000
--- a/crates/project/src/agent_server_store.rs
+++ /dev/null
@@ -1,2346 +0,0 @@
-use std::{
-    any::Any,
-    borrow::Borrow,
-    path::{Path, PathBuf},
-    str::FromStr as _,
-    sync::Arc,
-    time::Duration,
-};
-
-use anyhow::{Context as _, Result, bail};
-use collections::HashMap;
-use fs::{Fs, RemoveOptions, RenameOptions};
-use futures::StreamExt as _;
-use gpui::{
-    AppContext as _, AsyncApp, Context, Entity, EventEmitter, SharedString, Subscription, Task,
-};
-use http_client::{HttpClient, github::AssetKind};
-use node_runtime::NodeRuntime;
-use remote::RemoteClient;
-use rpc::{
-    AnyProtoClient, TypedEnvelope,
-    proto::{self, ExternalExtensionAgent},
-};
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use settings::{RegisterSetting, SettingsStore};
-use task::{Shell, SpawnInTerminal};
-use util::{ResultExt as _, debug_panic};
-
-use crate::ProjectEnvironment;
-
-#[derive(Deserialize, Serialize, Clone, PartialEq, Eq, JsonSchema)]
-pub struct AgentServerCommand {
-    #[serde(rename = "command")]
-    pub path: PathBuf,
-    #[serde(default)]
-    pub args: Vec<String>,
-    pub env: Option<HashMap<String, String>>,
-}
-
-impl std::fmt::Debug for AgentServerCommand {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let filtered_env = self.env.as_ref().map(|env| {
-            env.iter()
-                .map(|(k, v)| {
-                    (
-                        k,
-                        if util::redact::should_redact(k) {
-                            "[REDACTED]"
-                        } else {
-                            v
-                        },
-                    )
-                })
-                .collect::<Vec<_>>()
-        });
-
-        f.debug_struct("AgentServerCommand")
-            .field("path", &self.path)
-            .field("args", &self.args)
-            .field("env", &filtered_env)
-            .finish()
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Hash)]
-pub struct ExternalAgentServerName(pub SharedString);
-
-impl std::fmt::Display for ExternalAgentServerName {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
-impl From<&'static str> for ExternalAgentServerName {
-    fn from(value: &'static str) -> Self {
-        ExternalAgentServerName(value.into())
-    }
-}
-
-impl From<ExternalAgentServerName> for SharedString {
-    fn from(value: ExternalAgentServerName) -> Self {
-        value.0
-    }
-}
-
-impl Borrow<str> for ExternalAgentServerName {
-    fn borrow(&self) -> &str {
-        &self.0
-    }
-}
-
-pub trait ExternalAgentServer {
-    fn get_command(
-        &mut self,
-        root_dir: Option<&str>,
-        extra_env: HashMap<String, String>,
-        status_tx: Option<watch::Sender<SharedString>>,
-        new_version_available_tx: Option<watch::Sender<Option<String>>>,
-        cx: &mut AsyncApp,
-    ) -> Task<Result<(AgentServerCommand, String, Option<task::SpawnInTerminal>)>>;
-
-    fn as_any_mut(&mut self) -> &mut dyn Any;
-}
-
-impl dyn ExternalAgentServer {
-    fn downcast_mut<T: ExternalAgentServer + 'static>(&mut self) -> Option<&mut T> {
-        self.as_any_mut().downcast_mut()
-    }
-}
-
-enum AgentServerStoreState {
-    Local {
-        node_runtime: NodeRuntime,
-        fs: Arc<dyn Fs>,
-        project_environment: Entity<ProjectEnvironment>,
-        downstream_client: Option<(u64, AnyProtoClient)>,
-        settings: Option<AllAgentServersSettings>,
-        http_client: Arc<dyn HttpClient>,
-        extension_agents: Vec<(
-            Arc<str>,
-            String,
-            HashMap<String, extension::TargetConfig>,
-            HashMap<String, String>,
-            Option<String>,
-        )>,
-        _subscriptions: [Subscription; 1],
-    },
-    Remote {
-        project_id: u64,
-        upstream_client: Entity<RemoteClient>,
-    },
-    Collab,
-}
-
-pub struct AgentServerStore {
-    state: AgentServerStoreState,
-    external_agents: HashMap<ExternalAgentServerName, Box<dyn ExternalAgentServer>>,
-    agent_icons: HashMap<ExternalAgentServerName, SharedString>,
-    agent_display_names: HashMap<ExternalAgentServerName, SharedString>,
-}
-
-pub struct AgentServersUpdated;
-
-impl EventEmitter<AgentServersUpdated> for AgentServerStore {}
-
-#[cfg(test)]
-mod ext_agent_tests {
-    use super::*;
-    use std::{collections::HashSet, fmt::Write as _};
-
-    // Helper to build a store in Collab mode so we can mutate internal maps without
-    // needing to spin up a full project environment.
-    fn collab_store() -> AgentServerStore {
-        AgentServerStore {
-            state: AgentServerStoreState::Collab,
-            external_agents: HashMap::default(),
-            agent_icons: HashMap::default(),
-            agent_display_names: HashMap::default(),
-        }
-    }
-
-    // A simple fake that implements ExternalAgentServer without needing async plumbing.
-    struct NoopExternalAgent;
-
-    impl ExternalAgentServer for NoopExternalAgent {
-        fn get_command(
-            &mut self,
-            _root_dir: Option<&str>,
-            _extra_env: HashMap<String, String>,
-            _status_tx: Option<watch::Sender<SharedString>>,
-            _new_version_available_tx: Option<watch::Sender<Option<String>>>,
-            _cx: &mut AsyncApp,
-        ) -> Task<Result<(AgentServerCommand, String, Option<task::SpawnInTerminal>)>> {
-            Task::ready(Ok((
-                AgentServerCommand {
-                    path: PathBuf::from("noop"),
-                    args: Vec::new(),
-                    env: None,
-                },
-                "".to_string(),
-                None,
-            )))
-        }
-
-        fn as_any_mut(&mut self) -> &mut dyn Any {
-            self
-        }
-    }
-
-    #[test]
-    fn external_agent_server_name_display() {
-        let name = ExternalAgentServerName(SharedString::from("Ext: Tool"));
-        let mut s = String::new();
-        write!(&mut s, "{name}").unwrap();
-        assert_eq!(s, "Ext: Tool");
-    }
-
-    #[test]
-    fn sync_extension_agents_removes_previous_extension_entries() {
-        let mut store = collab_store();
-
-        // Seed with a couple of agents that will be replaced by extensions
-        store.external_agents.insert(
-            ExternalAgentServerName(SharedString::from("foo-agent")),
-            Box::new(NoopExternalAgent) as Box<dyn ExternalAgentServer>,
-        );
-        store.external_agents.insert(
-            ExternalAgentServerName(SharedString::from("bar-agent")),
-            Box::new(NoopExternalAgent) as Box<dyn ExternalAgentServer>,
-        );
-        store.external_agents.insert(
-            ExternalAgentServerName(SharedString::from("custom")),
-            Box::new(NoopExternalAgent) as Box<dyn ExternalAgentServer>,
-        );
-
-        // Simulate the removal phase: if we're syncing extensions that provide
-        // "foo-agent" and "bar-agent", those should be removed first
-        let extension_agent_names: HashSet<String> =
-            ["foo-agent".to_string(), "bar-agent".to_string()]
-                .into_iter()
-                .collect();
-
-        let keys_to_remove: Vec<_> = store
-            .external_agents
-            .keys()
-            .filter(|name| extension_agent_names.contains(name.0.as_ref()))
-            .cloned()
-            .collect();
-
-        for key in keys_to_remove {
-            store.external_agents.remove(&key);
-        }
-
-        // Only the custom entry should remain.
-        let remaining: Vec<_> = store
-            .external_agents
-            .keys()
-            .map(|k| k.0.to_string())
-            .collect();
-        assert_eq!(remaining, vec!["custom".to_string()]);
-    }
-}
-
-impl AgentServerStore {
-    /// Synchronizes extension-provided agent servers with the store.
-    pub fn sync_extension_agents<'a, I>(
-        &mut self,
-        manifests: I,
-        extensions_dir: PathBuf,
-        cx: &mut Context<Self>,
-    ) where
-        I: IntoIterator<Item = (&'a str, &'a extension::ExtensionManifest)>,
-    {
-        // Collect manifests first so we can iterate twice
-        let manifests: Vec<_> = manifests.into_iter().collect();
-
-        // Remove all extension-provided agents
-        // (They will be re-added below if they're in the currently installed extensions)
-        self.external_agents.retain(|name, agent| {
-            if agent.downcast_mut::<LocalExtensionArchiveAgent>().is_some() {
-                self.agent_icons.remove(name);
-                self.agent_display_names.remove(name);
-                false
-            } else {
-                // Keep the hardcoded external agents that don't come from extensions
-                // (In the future we may move these over to being extensions too.)
-                true
-            }
-        });
-
-        // Insert agent servers from extension manifests
-        match &mut self.state {
-            AgentServerStoreState::Local {
-                extension_agents, ..
-            } => {
-                extension_agents.clear();
-                for (ext_id, manifest) in manifests {
-                    for (agent_name, agent_entry) in &manifest.agent_servers {
-                        // Store absolute icon path if provided, resolving symlinks for dev extensions
-                        // Store display name from manifest
-                        self.agent_display_names.insert(
-                            ExternalAgentServerName(agent_name.clone().into()),
-                            SharedString::from(agent_entry.name.clone()),
-                        );
-
-                        let icon_path = if let Some(icon) = &agent_entry.icon {
-                            let icon_path = extensions_dir.join(ext_id).join(icon);
-                            // Canonicalize to resolve symlinks (dev extensions are symlinked)
-                            let absolute_icon_path = icon_path
-                                .canonicalize()
-                                .unwrap_or(icon_path)
-                                .to_string_lossy()
-                                .to_string();
-                            self.agent_icons.insert(
-                                ExternalAgentServerName(agent_name.clone().into()),
-                                SharedString::from(absolute_icon_path.clone()),
-                            );
-                            Some(absolute_icon_path)
-                        } else {
-                            None
-                        };
-
-                        extension_agents.push((
-                            agent_name.clone(),
-                            ext_id.to_owned(),
-                            agent_entry.targets.clone(),
-                            agent_entry.env.clone(),
-                            icon_path,
-                        ));
-                    }
-                }
-                self.reregister_agents(cx);
-            }
-            AgentServerStoreState::Remote {
-                project_id,
-                upstream_client,
-            } => {
-                let mut agents = vec![];
-                for (ext_id, manifest) in manifests {
-                    for (agent_name, agent_entry) in &manifest.agent_servers {
-                        // Store display name from manifest
-                        self.agent_display_names.insert(
-                            ExternalAgentServerName(agent_name.clone().into()),
-                            SharedString::from(agent_entry.name.clone()),
-                        );
-
-                        // Store absolute icon path if provided, resolving symlinks for dev extensions
-                        let icon = if let Some(icon) = &agent_entry.icon {
-                            let icon_path = extensions_dir.join(ext_id).join(icon);
-                            // Canonicalize to resolve symlinks (dev extensions are symlinked)
-                            let absolute_icon_path = icon_path
-                                .canonicalize()
-                                .unwrap_or(icon_path)
-                                .to_string_lossy()
-                                .to_string();
-
-                            // Store icon locally for remote client
-                            self.agent_icons.insert(
-                                ExternalAgentServerName(agent_name.clone().into()),
-                                SharedString::from(absolute_icon_path.clone()),
-                            );
-
-                            Some(absolute_icon_path)
-                        } else {
-                            None
-                        };
-
-                        agents.push(ExternalExtensionAgent {
-                            name: agent_name.to_string(),
-                            icon_path: icon,
-                            extension_id: ext_id.to_string(),
-                            targets: agent_entry
-                                .targets
-                                .iter()
-                                .map(|(k, v)| (k.clone(), v.to_proto()))
-                                .collect(),
-                            env: agent_entry
-                                .env
-                                .iter()
-                                .map(|(k, v)| (k.clone(), v.clone()))
-                                .collect(),
-                        });
-                    }
-                }
-                upstream_client
-                    .read(cx)
-                    .proto_client()
-                    .send(proto::ExternalExtensionAgentsUpdated {
-                        project_id: *project_id,
-                        agents,
-                    })
-                    .log_err();
-            }
-            AgentServerStoreState::Collab => {
-                // Do nothing
-            }
-        }
-
-        cx.emit(AgentServersUpdated);
-    }
-
-    pub fn agent_icon(&self, name: &ExternalAgentServerName) -> Option<SharedString> {
-        self.agent_icons.get(name).cloned()
-    }
-
-    pub fn agent_display_name(&self, name: &ExternalAgentServerName) -> Option<SharedString> {
-        self.agent_display_names.get(name).cloned()
-    }
-
-    pub fn init_remote(session: &AnyProtoClient) {
-        session.add_entity_message_handler(Self::handle_external_agents_updated);
-        session.add_entity_message_handler(Self::handle_loading_status_updated);
-        session.add_entity_message_handler(Self::handle_new_version_available);
-    }
-
-    pub fn init_headless(session: &AnyProtoClient) {
-        session.add_entity_message_handler(Self::handle_external_extension_agents_updated);
-        session.add_entity_request_handler(Self::handle_get_agent_server_command);
-    }
-
-    fn agent_servers_settings_changed(&mut self, cx: &mut Context<Self>) {
-        let AgentServerStoreState::Local {
-            settings: old_settings,
-            ..
-        } = &mut self.state
-        else {
-            debug_panic!(
-                "should not be subscribed to agent server settings changes in non-local project"
-            );
-            return;
-        };
-
-        let new_settings = cx
-            .global::<SettingsStore>()
-            .get::<AllAgentServersSettings>(None)
-            .clone();
-        if Some(&new_settings) == old_settings.as_ref() {
-            return;
-        }
-
-        self.reregister_agents(cx);
-    }
-
-    fn reregister_agents(&mut self, cx: &mut Context<Self>) {
-        let AgentServerStoreState::Local {
-            node_runtime,
-            fs,
-            project_environment,
-            downstream_client,
-            settings: old_settings,
-            http_client,
-            extension_agents,
-            ..
-        } = &mut self.state
-        else {
-            debug_panic!("Non-local projects should never attempt to reregister. This is a bug!");
-
-            return;
-        };
-
-        let new_settings = cx
-            .global::<SettingsStore>()
-            .get::<AllAgentServersSettings>(None)
-            .clone();
-
-        self.external_agents.clear();
-        self.external_agents.insert(
-            GEMINI_NAME.into(),
-            Box::new(LocalGemini {
-                fs: fs.clone(),
-                node_runtime: node_runtime.clone(),
-                project_environment: project_environment.clone(),
-                custom_command: new_settings
-                    .gemini
-                    .clone()
-                    .and_then(|settings| settings.custom_command()),
-                ignore_system_version: new_settings
-                    .gemini
-                    .as_ref()
-                    .and_then(|settings| settings.ignore_system_version)
-                    .unwrap_or(false),
-            }),
-        );
-        self.external_agents.insert(
-            CODEX_NAME.into(),
-            Box::new(LocalCodex {
-                fs: fs.clone(),
-                project_environment: project_environment.clone(),
-                custom_command: new_settings
-                    .codex
-                    .clone()
-                    .and_then(|settings| settings.custom_command()),
-                http_client: http_client.clone(),
-                no_browser: downstream_client
-                    .as_ref()
-                    .is_some_and(|(_, client)| !client.has_wsl_interop()),
-            }),
-        );
-        self.external_agents.insert(
-            CLAUDE_CODE_NAME.into(),
-            Box::new(LocalClaudeCode {
-                fs: fs.clone(),
-                node_runtime: node_runtime.clone(),
-                project_environment: project_environment.clone(),
-                custom_command: new_settings
-                    .claude
-                    .clone()
-                    .and_then(|settings| settings.custom_command()),
-            }),
-        );
-        self.external_agents
-            .extend(
-                new_settings
-                    .custom
-                    .iter()
-                    .filter_map(|(name, settings)| match settings {
-                        CustomAgentServerSettings::Custom { command, .. } => Some((
-                            ExternalAgentServerName(name.clone()),
-                            Box::new(LocalCustomAgent {
-                                command: command.clone(),
-                                project_environment: project_environment.clone(),
-                            }) as Box<dyn ExternalAgentServer>,
-                        )),
-                        CustomAgentServerSettings::Extension { .. } => None,
-                    }),
-            );
-        self.external_agents.extend(extension_agents.iter().map(
-            |(agent_name, ext_id, targets, env, icon_path)| {
-                let name = ExternalAgentServerName(agent_name.clone().into());
-
-                // Restore icon if present
-                if let Some(icon) = icon_path {
-                    self.agent_icons
-                        .insert(name.clone(), SharedString::from(icon.clone()));
-                }
-
-                (
-                    name,
-                    Box::new(LocalExtensionArchiveAgent {
-                        fs: fs.clone(),
-                        http_client: http_client.clone(),
-                        node_runtime: node_runtime.clone(),
-                        project_environment: project_environment.clone(),
-                        extension_id: Arc::from(&**ext_id),
-                        targets: targets.clone(),
-                        env: env.clone(),
-                        agent_id: agent_name.clone(),
-                    }) as Box<dyn ExternalAgentServer>,
-                )
-            },
-        ));
-
-        *old_settings = Some(new_settings.clone());
-
-        if let Some((project_id, downstream_client)) = downstream_client {
-            downstream_client
-                .send(proto::ExternalAgentsUpdated {
-                    project_id: *project_id,
-                    names: self
-                        .external_agents
-                        .keys()
-                        .map(|name| name.to_string())
-                        .collect(),
-                })
-                .log_err();
-        }
-        cx.emit(AgentServersUpdated);
-    }
-
-    pub fn node_runtime(&self) -> Option<NodeRuntime> {
-        match &self.state {
-            AgentServerStoreState::Local { node_runtime, .. } => Some(node_runtime.clone()),
-            _ => None,
-        }
-    }
-
-    pub fn local(
-        node_runtime: NodeRuntime,
-        fs: Arc<dyn Fs>,
-        project_environment: Entity<ProjectEnvironment>,
-        http_client: Arc<dyn HttpClient>,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let subscription = cx.observe_global::<SettingsStore>(|this, cx| {
-            this.agent_servers_settings_changed(cx);
-        });
-        let mut this = Self {
-            state: AgentServerStoreState::Local {
-                node_runtime,
-                fs,
-                project_environment,
-                http_client,
-                downstream_client: None,
-                settings: None,
-                extension_agents: vec![],
-                _subscriptions: [subscription],
-            },
-            external_agents: Default::default(),
-            agent_icons: Default::default(),
-            agent_display_names: Default::default(),
-        };
-        if let Some(_events) = extension::ExtensionEvents::try_global(cx) {}
-        this.agent_servers_settings_changed(cx);
-        this
-    }
-
-    pub(crate) fn remote(project_id: u64, upstream_client: Entity<RemoteClient>) -> Self {
-        // Set up the builtin agents here so they're immediately available in
-        // remote projects--we know that the HeadlessProject on the other end
-        // will have them.
-        let external_agents: [(ExternalAgentServerName, Box<dyn ExternalAgentServer>); 3] = [
-            (
-                CLAUDE_CODE_NAME.into(),
-                Box::new(RemoteExternalAgentServer {
-                    project_id,
-                    upstream_client: upstream_client.clone(),
-                    name: CLAUDE_CODE_NAME.into(),
-                    status_tx: None,
-                    new_version_available_tx: None,
-                }) as Box<dyn ExternalAgentServer>,
-            ),
-            (
-                CODEX_NAME.into(),
-                Box::new(RemoteExternalAgentServer {
-                    project_id,
-                    upstream_client: upstream_client.clone(),
-                    name: CODEX_NAME.into(),
-                    status_tx: None,
-                    new_version_available_tx: None,
-                }) as Box<dyn ExternalAgentServer>,
-            ),
-            (
-                GEMINI_NAME.into(),
-                Box::new(RemoteExternalAgentServer {
-                    project_id,
-                    upstream_client: upstream_client.clone(),
-                    name: GEMINI_NAME.into(),
-                    status_tx: None,
-                    new_version_available_tx: None,
-                }) as Box<dyn ExternalAgentServer>,
-            ),
-        ];
-
-        Self {
-            state: AgentServerStoreState::Remote {
-                project_id,
-                upstream_client,
-            },
-            external_agents: external_agents.into_iter().collect(),
-            agent_icons: HashMap::default(),
-            agent_display_names: HashMap::default(),
-        }
-    }
-
-    pub(crate) fn collab(_cx: &mut Context<Self>) -> Self {
-        Self {
-            state: AgentServerStoreState::Collab,
-            external_agents: Default::default(),
-            agent_icons: Default::default(),
-            agent_display_names: Default::default(),
-        }
-    }
-
-    pub fn shared(&mut self, project_id: u64, client: AnyProtoClient, cx: &mut Context<Self>) {
-        match &mut self.state {
-            AgentServerStoreState::Local {
-                downstream_client, ..
-            } => {
-                *downstream_client = Some((project_id, client.clone()));
-                // Send the current list of external agents downstream, but only after a delay,
-                // to avoid having the message arrive before the downstream project's agent server store
-                // sets up its handlers.
-                cx.spawn(async move |this, cx| {
-                    cx.background_executor().timer(Duration::from_secs(1)).await;
-                    let names = this.update(cx, |this, _| {
-                        this.external_agents
-                            .keys()
-                            .map(|name| name.to_string())
-                            .collect()
-                    })?;
-                    client
-                        .send(proto::ExternalAgentsUpdated { project_id, names })
-                        .log_err();
-                    anyhow::Ok(())
-                })
-                .detach();
-            }
-            AgentServerStoreState::Remote { .. } => {
-                debug_panic!(
-                    "external agents over collab not implemented, remote project should not be shared"
-                );
-            }
-            AgentServerStoreState::Collab => {
-                debug_panic!("external agents over collab not implemented, should not be shared");
-            }
-        }
-    }
-
-    pub fn get_external_agent(
-        &mut self,
-        name: &ExternalAgentServerName,
-    ) -> Option<&mut (dyn ExternalAgentServer + 'static)> {
-        self.external_agents
-            .get_mut(name)
-            .map(|agent| agent.as_mut())
-    }
-
-    pub fn external_agents(&self) -> impl Iterator<Item = &ExternalAgentServerName> {
-        self.external_agents.keys()
-    }
-
-    async fn handle_get_agent_server_command(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::GetAgentServerCommand>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::AgentServerCommand> {
-        let (command, root_dir, login_command) = this
-            .update(&mut cx, |this, cx| {
-                let AgentServerStoreState::Local {
-                    downstream_client, ..
-                } = &this.state
-                else {
-                    debug_panic!("should not receive GetAgentServerCommand in a non-local project");
-                    bail!("unexpected GetAgentServerCommand request in a non-local project");
-                };
-                let agent = this
-                    .external_agents
-                    .get_mut(&*envelope.payload.name)
-                    .with_context(|| format!("agent `{}` not found", envelope.payload.name))?;
-                let (status_tx, new_version_available_tx) = downstream_client
-                    .clone()
-                    .map(|(project_id, downstream_client)| {
-                        let (status_tx, mut status_rx) = watch::channel(SharedString::from(""));
-                        let (new_version_available_tx, mut new_version_available_rx) =
-                            watch::channel(None);
-                        cx.spawn({
-                            let downstream_client = downstream_client.clone();
-                            let name = envelope.payload.name.clone();
-                            async move |_, _| {
-                                while let Some(status) = status_rx.recv().await.ok() {
-                                    downstream_client.send(
-                                        proto::ExternalAgentLoadingStatusUpdated {
-                                            project_id,
-                                            name: name.clone(),
-                                            status: status.to_string(),
-                                        },
-                                    )?;
-                                }
-                                anyhow::Ok(())
-                            }
-                        })
-                        .detach_and_log_err(cx);
-                        cx.spawn({
-                            let name = envelope.payload.name.clone();
-                            async move |_, _| {
-                                if let Some(version) =
-                                    new_version_available_rx.recv().await.ok().flatten()
-                                {
-                                    downstream_client.send(
-                                        proto::NewExternalAgentVersionAvailable {
-                                            project_id,
-                                            name: name.clone(),
-                                            version,
-                                        },
-                                    )?;
-                                }
-                                anyhow::Ok(())
-                            }
-                        })
-                        .detach_and_log_err(cx);
-                        (status_tx, new_version_available_tx)
-                    })
-                    .unzip();
-                anyhow::Ok(agent.get_command(
-                    envelope.payload.root_dir.as_deref(),
-                    HashMap::default(),
-                    status_tx,
-                    new_version_available_tx,
-                    &mut cx.to_async(),
-                ))
-            })??
-            .await?;
-        Ok(proto::AgentServerCommand {
-            path: command.path.to_string_lossy().into_owned(),
-            args: command.args,
-            env: command
-                .env
-                .map(|env| env.into_iter().collect())
-                .unwrap_or_default(),
-            root_dir: root_dir,
-            login: login_command.map(|cmd| cmd.to_proto()),
-        })
-    }
-
-    async fn handle_external_agents_updated(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::ExternalAgentsUpdated>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        this.update(&mut cx, |this, cx| {
-            let AgentServerStoreState::Remote {
-                project_id,
-                upstream_client,
-            } = &this.state
-            else {
-                debug_panic!(
-                    "handle_external_agents_updated should not be called for a non-remote project"
-                );
-                bail!("unexpected ExternalAgentsUpdated message")
-            };
-
-            let mut status_txs = this
-                .external_agents
-                .iter_mut()
-                .filter_map(|(name, agent)| {
-                    Some((
-                        name.clone(),
-                        agent
-                            .downcast_mut::<RemoteExternalAgentServer>()?
-                            .status_tx
-                            .take(),
-                    ))
-                })
-                .collect::<HashMap<_, _>>();
-            let mut new_version_available_txs = this
-                .external_agents
-                .iter_mut()
-                .filter_map(|(name, agent)| {
-                    Some((
-                        name.clone(),
-                        agent
-                            .downcast_mut::<RemoteExternalAgentServer>()?
-                            .new_version_available_tx
-                            .take(),
-                    ))
-                })
-                .collect::<HashMap<_, _>>();
-
-            this.external_agents = envelope
-                .payload
-                .names
-                .into_iter()
-                .map(|name| {
-                    let agent = RemoteExternalAgentServer {
-                        project_id: *project_id,
-                        upstream_client: upstream_client.clone(),
-                        name: ExternalAgentServerName(name.clone().into()),
-                        status_tx: status_txs.remove(&*name).flatten(),
-                        new_version_available_tx: new_version_available_txs
-                            .remove(&*name)
-                            .flatten(),
-                    };
-                    (
-                        ExternalAgentServerName(name.into()),
-                        Box::new(agent) as Box<dyn ExternalAgentServer>,
-                    )
-                })
-                .collect();
-            cx.emit(AgentServersUpdated);
-            Ok(())
-        })?
-    }
-
-    async fn handle_external_extension_agents_updated(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::ExternalExtensionAgentsUpdated>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        this.update(&mut cx, |this, cx| {
-            let AgentServerStoreState::Local {
-                extension_agents, ..
-            } = &mut this.state
-            else {
-                panic!(
-                    "handle_external_extension_agents_updated \
-                    should not be called for a non-remote project"
-                );
-            };
-
-            for ExternalExtensionAgent {
-                name,
-                icon_path,
-                extension_id,
-                targets,
-                env,
-            } in envelope.payload.agents
-            {
-                let icon_path_string = icon_path.clone();
-                if let Some(icon_path) = icon_path {
-                    this.agent_icons.insert(
-                        ExternalAgentServerName(name.clone().into()),
-                        icon_path.into(),
-                    );
-                }
-                extension_agents.push((
-                    Arc::from(&*name),
-                    extension_id,
-                    targets
-                        .into_iter()
-                        .map(|(k, v)| (k, extension::TargetConfig::from_proto(v)))
-                        .collect(),
-                    env.into_iter().collect(),
-                    icon_path_string,
-                ));
-            }
-
-            this.reregister_agents(cx);
-            cx.emit(AgentServersUpdated);
-            Ok(())
-        })?
-    }
-
-    async fn handle_loading_status_updated(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::ExternalAgentLoadingStatusUpdated>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        this.update(&mut cx, |this, _| {
-            if let Some(agent) = this.external_agents.get_mut(&*envelope.payload.name)
-                && let Some(agent) = agent.downcast_mut::<RemoteExternalAgentServer>()
-                && let Some(status_tx) = &mut agent.status_tx
-            {
-                status_tx.send(envelope.payload.status.into()).ok();
-            }
-        })
-    }
-
-    async fn handle_new_version_available(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::NewExternalAgentVersionAvailable>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        this.update(&mut cx, |this, _| {
-            if let Some(agent) = this.external_agents.get_mut(&*envelope.payload.name)
-                && let Some(agent) = agent.downcast_mut::<RemoteExternalAgentServer>()
-                && let Some(new_version_available_tx) = &mut agent.new_version_available_tx
-            {
-                new_version_available_tx
-                    .send(Some(envelope.payload.version))
-                    .ok();
-            }
-        })
-    }
-
-    pub fn get_extension_id_for_agent(
-        &mut self,
-        name: &ExternalAgentServerName,
-    ) -> Option<Arc<str>> {
-        self.external_agents.get_mut(name).and_then(|agent| {
-            agent
-                .as_any_mut()
-                .downcast_ref::<LocalExtensionArchiveAgent>()
-                .map(|ext_agent| ext_agent.extension_id.clone())
-        })
-    }
-}
-
-fn get_or_npm_install_builtin_agent(
-    binary_name: SharedString,
-    package_name: SharedString,
-    entrypoint_path: PathBuf,
-    minimum_version: Option<semver::Version>,
-    status_tx: Option<watch::Sender<SharedString>>,
-    new_version_available: Option<watch::Sender<Option<String>>>,
-    fs: Arc<dyn Fs>,
-    node_runtime: NodeRuntime,
-    cx: &mut AsyncApp,
-) -> Task<std::result::Result<AgentServerCommand, anyhow::Error>> {
-    cx.spawn(async move |cx| {
-        let node_path = node_runtime.binary_path().await?;
-        let dir = paths::external_agents_dir().join(binary_name.as_str());
-        fs.create_dir(&dir).await?;
-
-        let mut stream = fs.read_dir(&dir).await?;
-        let mut versions = Vec::new();
-        let mut to_delete = Vec::new();
-        while let Some(entry) = stream.next().await {
-            let Ok(entry) = entry else { continue };
-            let Some(file_name) = entry.file_name() else {
-                continue;
-            };
-
-            if let Some(name) = file_name.to_str()
-                && let Some(version) = semver::Version::from_str(name).ok()
-                && fs
-                    .is_file(&dir.join(file_name).join(&entrypoint_path))
-                    .await
-            {
-                versions.push((version, file_name.to_owned()));
-            } else {
-                to_delete.push(file_name.to_owned())
-            }
-        }
-
-        versions.sort();
-        let newest_version = if let Some((version, file_name)) = versions.last().cloned()
-            && minimum_version.is_none_or(|minimum_version| version >= minimum_version)
-        {
-            versions.pop();
-            Some(file_name)
-        } else {
-            None
-        };
-        log::debug!("existing version of {package_name}: {newest_version:?}");
-        to_delete.extend(versions.into_iter().map(|(_, file_name)| file_name));
-
-        cx.background_spawn({
-            let fs = fs.clone();
-            let dir = dir.clone();
-            async move {
-                for file_name in to_delete {
-                    fs.remove_dir(
-                        &dir.join(file_name),
-                        RemoveOptions {
-                            recursive: true,
-                            ignore_if_not_exists: false,
-                        },
-                    )
-                    .await
-                    .ok();
-                }
-            }
-        })
-        .detach();
-
-        let version = if let Some(file_name) = newest_version {
-            cx.background_spawn({
-                let file_name = file_name.clone();
-                let dir = dir.clone();
-                let fs = fs.clone();
-                async move {
-                    let latest_version = node_runtime
-                        .npm_package_latest_version(&package_name)
-                        .await
-                        .ok();
-                    if let Some(latest_version) = latest_version
-                        && &latest_version != &file_name.to_string_lossy()
-                    {
-                        let download_result = download_latest_version(
-                            fs,
-                            dir.clone(),
-                            node_runtime,
-                            package_name.clone(),
-                        )
-                        .await
-                        .log_err();
-                        if let Some(mut new_version_available) = new_version_available
-                            && download_result.is_some()
-                        {
-                            new_version_available.send(Some(latest_version)).ok();
-                        }
-                    }
-                }
-            })
-            .detach();
-            file_name
-        } else {
-            if let Some(mut status_tx) = status_tx {
-                status_tx.send("Installing…".into()).ok();
-            }
-            let dir = dir.clone();
-            cx.background_spawn(download_latest_version(
-                fs.clone(),
-                dir.clone(),
-                node_runtime,
-                package_name.clone(),
-            ))
-            .await?
-            .into()
-        };
-
-        let agent_server_path = dir.join(version).join(entrypoint_path);
-        let agent_server_path_exists = fs.is_file(&agent_server_path).await;
-        anyhow::ensure!(
-            agent_server_path_exists,
-            "Missing entrypoint path {} after installation",
-            agent_server_path.to_string_lossy()
-        );
-
-        anyhow::Ok(AgentServerCommand {
-            path: node_path,
-            args: vec![agent_server_path.to_string_lossy().into_owned()],
-            env: None,
-        })
-    })
-}
-
-fn find_bin_in_path(
-    bin_name: SharedString,
-    root_dir: PathBuf,
-    env: HashMap<String, String>,
-    cx: &mut AsyncApp,
-) -> Task<Option<PathBuf>> {
-    cx.background_executor().spawn(async move {
-        let which_result = if cfg!(windows) {
-            which::which(bin_name.as_str())
-        } else {
-            let shell_path = env.get("PATH").cloned();
-            which::which_in(bin_name.as_str(), shell_path.as_ref(), &root_dir)
-        };
-
-        if let Err(which::Error::CannotFindBinaryPath) = which_result {
-            return None;
-        }
-
-        which_result.log_err()
-    })
-}
-
-async fn download_latest_version(
-    fs: Arc<dyn Fs>,
-    dir: PathBuf,
-    node_runtime: NodeRuntime,
-    package_name: SharedString,
-) -> Result<String> {
-    log::debug!("downloading latest version of {package_name}");
-
-    let tmp_dir = tempfile::tempdir_in(&dir)?;
-
-    node_runtime
-        .npm_install_packages(tmp_dir.path(), &[(&package_name, "latest")])
-        .await?;
-
-    let version = node_runtime
-        .npm_package_installed_version(tmp_dir.path(), &package_name)
-        .await?
-        .context("expected package to be installed")?;
-
-    fs.rename(
-        &tmp_dir.keep(),
-        &dir.join(&version),
-        RenameOptions {
-            ignore_if_exists: true,
-            overwrite: true,
-            create_parents: false,
-        },
-    )
-    .await?;
-
-    anyhow::Ok(version)
-}
-
-struct RemoteExternalAgentServer {
-    project_id: u64,
-    upstream_client: Entity<RemoteClient>,
-    name: ExternalAgentServerName,
-    status_tx: Option<watch::Sender<SharedString>>,
-    new_version_available_tx: Option<watch::Sender<Option<String>>>,
-}
-
-impl ExternalAgentServer for RemoteExternalAgentServer {
-    fn get_command(
-        &mut self,
-        root_dir: Option<&str>,
-        extra_env: HashMap<String, String>,
-        status_tx: Option<watch::Sender<SharedString>>,
-        new_version_available_tx: Option<watch::Sender<Option<String>>>,
-        cx: &mut AsyncApp,
-    ) -> Task<Result<(AgentServerCommand, String, Option<task::SpawnInTerminal>)>> {
-        let project_id = self.project_id;
-        let name = self.name.to_string();
-        let upstream_client = self.upstream_client.downgrade();
-        let root_dir = root_dir.map(|root_dir| root_dir.to_owned());
-        self.status_tx = status_tx;
-        self.new_version_available_tx = new_version_available_tx;
-        cx.spawn(async move |cx| {
-            let mut response = upstream_client
-                .update(cx, |upstream_client, _| {
-                    upstream_client
-                        .proto_client()
-                        .request(proto::GetAgentServerCommand {
-                            project_id,
-                            name,
-                            root_dir: root_dir.clone(),
-                        })
-                })?
-                .await?;
-            let root_dir = response.root_dir;
-            response.env.extend(extra_env);
-            let command = upstream_client.update(cx, |client, _| {
-                client.build_command(
-                    Some(response.path),
-                    &response.args,
-                    &response.env.into_iter().collect(),
-                    Some(root_dir.clone()),
-                    None,
-                )
-            })??;
-            Ok((
-                AgentServerCommand {
-                    path: command.program.into(),
-                    args: command.args,
-                    env: Some(command.env),
-                },
-                root_dir,
-                response.login.map(SpawnInTerminal::from_proto),
-            ))
-        })
-    }
-
-    fn as_any_mut(&mut self) -> &mut dyn Any {
-        self
-    }
-}
-
-struct LocalGemini {
-    fs: Arc<dyn Fs>,
-    node_runtime: NodeRuntime,
-    project_environment: Entity<ProjectEnvironment>,
-    custom_command: Option<AgentServerCommand>,
-    ignore_system_version: bool,
-}
-
-impl ExternalAgentServer for LocalGemini {
-    fn get_command(
-        &mut self,
-        root_dir: Option<&str>,
-        extra_env: HashMap<String, String>,
-        status_tx: Option<watch::Sender<SharedString>>,
-        new_version_available_tx: Option<watch::Sender<Option<String>>>,
-        cx: &mut AsyncApp,
-    ) -> Task<Result<(AgentServerCommand, String, Option<task::SpawnInTerminal>)>> {
-        let fs = self.fs.clone();
-        let node_runtime = self.node_runtime.clone();
-        let project_environment = self.project_environment.downgrade();
-        let custom_command = self.custom_command.clone();
-        let ignore_system_version = self.ignore_system_version;
-        let root_dir: Arc<Path> = root_dir
-            .map(|root_dir| Path::new(root_dir))
-            .unwrap_or(paths::home_dir())
-            .into();
-
-        cx.spawn(async move |cx| {
-            let mut env = project_environment
-                .update(cx, |project_environment, cx| {
-                    project_environment.local_directory_environment(
-                        &Shell::System,
-                        root_dir.clone(),
-                        cx,
-                    )
-                })?
-                .await
-                .unwrap_or_default();
-
-            let mut command = if let Some(mut custom_command) = custom_command {
-                env.extend(custom_command.env.unwrap_or_default());
-                custom_command.env = Some(env);
-                custom_command
-            } else if !ignore_system_version
-                && let Some(bin) =
-                    find_bin_in_path("gemini".into(), root_dir.to_path_buf(), env.clone(), cx).await
-            {
-                AgentServerCommand {
-                    path: bin,
-                    args: Vec::new(),
-                    env: Some(env),
-                }
-            } else {
-                let mut command = get_or_npm_install_builtin_agent(
-                    GEMINI_NAME.into(),
-                    "@google/gemini-cli".into(),
-                    "node_modules/@google/gemini-cli/dist/index.js".into(),
-                    if cfg!(windows) {
-                        // v0.8.x on Windows has a bug that causes the initialize request to hang forever
-                        Some("0.9.0".parse().unwrap())
-                    } else {
-                        Some("0.2.1".parse().unwrap())
-                    },
-                    status_tx,
-                    new_version_available_tx,
-                    fs,
-                    node_runtime,
-                    cx,
-                )
-                .await?;
-                command.env = Some(env);
-                command
-            };
-
-            // Gemini CLI doesn't seem to have a dedicated invocation for logging in--we just run it normally without any arguments.
-            let login = task::SpawnInTerminal {
-                command: Some(command.path.to_string_lossy().into_owned()),
-                args: command.args.clone(),
-                env: command.env.clone().unwrap_or_default(),
-                label: "gemini /auth".into(),
-                ..Default::default()
-            };
-
-            command.env.get_or_insert_default().extend(extra_env);
-            command.args.push("--experimental-acp".into());
-            Ok((
-                command,
-                root_dir.to_string_lossy().into_owned(),
-                Some(login),
-            ))
-        })
-    }
-
-    fn as_any_mut(&mut self) -> &mut dyn Any {
-        self
-    }
-}
-
-struct LocalClaudeCode {
-    fs: Arc<dyn Fs>,
-    node_runtime: NodeRuntime,
-    project_environment: Entity<ProjectEnvironment>,
-    custom_command: Option<AgentServerCommand>,
-}
-
-impl ExternalAgentServer for LocalClaudeCode {
-    fn get_command(
-        &mut self,
-        root_dir: Option<&str>,
-        extra_env: HashMap<String, String>,
-        status_tx: Option<watch::Sender<SharedString>>,
-        new_version_available_tx: Option<watch::Sender<Option<String>>>,
-        cx: &mut AsyncApp,
-    ) -> Task<Result<(AgentServerCommand, String, Option<task::SpawnInTerminal>)>> {
-        let fs = self.fs.clone();
-        let node_runtime = self.node_runtime.clone();
-        let project_environment = self.project_environment.downgrade();
-        let custom_command = self.custom_command.clone();
-        let root_dir: Arc<Path> = root_dir
-            .map(|root_dir| Path::new(root_dir))
-            .unwrap_or(paths::home_dir())
-            .into();
-
-        cx.spawn(async move |cx| {
-            let mut env = project_environment
-                .update(cx, |project_environment, cx| {
-                    project_environment.local_directory_environment(
-                        &Shell::System,
-                        root_dir.clone(),
-                        cx,
-                    )
-                })?
-                .await
-                .unwrap_or_default();
-            env.insert("ANTHROPIC_API_KEY".into(), "".into());
-
-            let (mut command, login_command) = if let Some(mut custom_command) = custom_command {
-                env.extend(custom_command.env.unwrap_or_default());
-                custom_command.env = Some(env);
-                (custom_command, None)
-            } else {
-                let mut command = get_or_npm_install_builtin_agent(
-                    "claude-code-acp".into(),
-                    "@zed-industries/claude-code-acp".into(),
-                    "node_modules/@zed-industries/claude-code-acp/dist/index.js".into(),
-                    Some("0.5.2".parse().unwrap()),
-                    status_tx,
-                    new_version_available_tx,
-                    fs,
-                    node_runtime,
-                    cx,
-                )
-                .await?;
-                command.env = Some(env);
-                let login = command
-                    .args
-                    .first()
-                    .and_then(|path| {
-                        path.strip_suffix("/@zed-industries/claude-code-acp/dist/index.js")
-                    })
-                    .map(|path_prefix| task::SpawnInTerminal {
-                        command: Some(command.path.to_string_lossy().into_owned()),
-                        args: vec![
-                            Path::new(path_prefix)
-                                .join("@anthropic-ai/claude-agent-sdk/cli.js")
-                                .to_string_lossy()
-                                .to_string(),
-                            "/login".into(),
-                        ],
-                        env: command.env.clone().unwrap_or_default(),
-                        label: "claude /login".into(),
-                        ..Default::default()
-                    });
-                (command, login)
-            };
-
-            command.env.get_or_insert_default().extend(extra_env);
-            Ok((
-                command,
-                root_dir.to_string_lossy().into_owned(),
-                login_command,
-            ))
-        })
-    }
-
-    fn as_any_mut(&mut self) -> &mut dyn Any {
-        self
-    }
-}
-
-struct LocalCodex {
-    fs: Arc<dyn Fs>,
-    project_environment: Entity<ProjectEnvironment>,
-    http_client: Arc<dyn HttpClient>,
-    custom_command: Option<AgentServerCommand>,
-    no_browser: bool,
-}
-
-impl ExternalAgentServer for LocalCodex {
-    fn get_command(
-        &mut self,
-        root_dir: Option<&str>,
-        extra_env: HashMap<String, String>,
-        mut status_tx: Option<watch::Sender<SharedString>>,
-        _new_version_available_tx: Option<watch::Sender<Option<String>>>,
-        cx: &mut AsyncApp,
-    ) -> Task<Result<(AgentServerCommand, String, Option<task::SpawnInTerminal>)>> {
-        let fs = self.fs.clone();
-        let project_environment = self.project_environment.downgrade();
-        let http = self.http_client.clone();
-        let custom_command = self.custom_command.clone();
-        let root_dir: Arc<Path> = root_dir
-            .map(|root_dir| Path::new(root_dir))
-            .unwrap_or(paths::home_dir())
-            .into();
-        let no_browser = self.no_browser;
-
-        cx.spawn(async move |cx| {
-            let mut env = project_environment
-                .update(cx, |project_environment, cx| {
-                    project_environment.local_directory_environment(
-                        &Shell::System,
-                        root_dir.clone(),
-                        cx,
-                    )
-                })?
-                .await
-                .unwrap_or_default();
-            if no_browser {
-                env.insert("NO_BROWSER".to_owned(), "1".to_owned());
-            }
-
-            let mut command = if let Some(mut custom_command) = custom_command {
-                env.extend(custom_command.env.unwrap_or_default());
-                custom_command.env = Some(env);
-                custom_command
-            } else {
-                let dir = paths::external_agents_dir().join(CODEX_NAME);
-                fs.create_dir(&dir).await?;
-
-                let bin_name = if cfg!(windows) {
-                    "codex-acp.exe"
-                } else {
-                    "codex-acp"
-                };
-
-                let find_latest_local_version = async || -> Option<PathBuf> {
-                    let mut local_versions: Vec<(semver::Version, String)> = Vec::new();
-                    let mut stream = fs.read_dir(&dir).await.ok()?;
-                    while let Some(entry) = stream.next().await {
-                        let Ok(entry) = entry else { continue };
-                        let Some(file_name) = entry.file_name() else {
-                            continue;
-                        };
-                        let version_path = dir.join(&file_name);
-                        if fs.is_file(&version_path.join(bin_name)).await {
-                            let version_str = file_name.to_string_lossy();
-                            if let Ok(version) =
-                                semver::Version::from_str(version_str.trim_start_matches('v'))
-                            {
-                                local_versions.push((version, version_str.into_owned()));
-                            }
-                        }
-                    }
-                    local_versions.sort_by(|(a, _), (b, _)| a.cmp(b));
-                    local_versions.last().map(|(_, v)| dir.join(v))
-                };
-
-                let fallback_to_latest_local_version =
-                    async |err: anyhow::Error| -> Result<PathBuf, anyhow::Error> {
-                        if let Some(local) = find_latest_local_version().await {
-                            log::info!(
-                                "Falling back to locally installed Codex version: {}",
-                                local.display()
-                            );
-                            Ok(local)
-                        } else {
-                            Err(err)
-                        }
-                    };
-
-                let version_dir = match ::http_client::github::latest_github_release(
-                    CODEX_ACP_REPO,
-                    true,
-                    false,
-                    http.clone(),
-                )
-                .await
-                {
-                    Ok(release) => {
-                        let version_dir = dir.join(&release.tag_name);
-                        if !fs.is_dir(&version_dir).await {
-                            if let Some(ref mut status_tx) = status_tx {
-                                status_tx.send("Installing…".into()).ok();
-                            }
-
-                            let tag = release.tag_name.clone();
-                            let version_number = tag.trim_start_matches('v');
-                            let asset_name = asset_name(version_number)
-                                .context("codex acp is not supported for this architecture")?;
-                            let asset = release
-                                .assets
-                                .into_iter()
-                                .find(|asset| asset.name == asset_name)
-                                .with_context(|| {
-                                    format!("no asset found matching `{asset_name:?}`")
-                                })?;
-                            // Strip "sha256:" prefix from digest if present (GitHub API format)
-                            let digest = asset
-                                .digest
-                                .as_deref()
-                                .and_then(|d| d.strip_prefix("sha256:").or(Some(d)));
-                            match ::http_client::github_download::download_server_binary(
-                                &*http,
-                                &asset.browser_download_url,
-                                digest,
-                                &version_dir,
-                                if cfg!(target_os = "windows") && cfg!(target_arch = "x86_64") {
-                                    AssetKind::Zip
-                                } else {
-                                    AssetKind::TarGz
-                                },
-                            )
-                            .await
-                            {
-                                Ok(()) => {
-                                    // remove older versions
-                                    util::fs::remove_matching(&dir, |entry| entry != version_dir)
-                                        .await;
-                                    version_dir
-                                }
-                                Err(err) => {
-                                    log::error!(
-                                        "Failed to download Codex release {}: {err:#}",
-                                        release.tag_name
-                                    );
-                                    fallback_to_latest_local_version(err).await?
-                                }
-                            }
-                        } else {
-                            version_dir
-                        }
-                    }
-                    Err(err) => {
-                        log::error!("Failed to fetch Codex latest release: {err:#}");
-                        fallback_to_latest_local_version(err).await?
-                    }
-                };
-
-                let bin_path = version_dir.join(bin_name);
-                anyhow::ensure!(
-                    fs.is_file(&bin_path).await,
-                    "Missing Codex binary at {} after installation",
-                    bin_path.to_string_lossy()
-                );
-
-                let mut cmd = AgentServerCommand {
-                    path: bin_path,
-                    args: Vec::new(),
-                    env: None,
-                };
-                cmd.env = Some(env);
-                cmd
-            };
-
-            command.env.get_or_insert_default().extend(extra_env);
-            Ok((command, root_dir.to_string_lossy().into_owned(), None))
-        })
-    }
-
-    fn as_any_mut(&mut self) -> &mut dyn Any {
-        self
-    }
-}
-
-pub const CODEX_ACP_REPO: &str = "zed-industries/codex-acp";
-
-fn get_platform_info() -> Option<(&'static str, &'static str, &'static str)> {
-    let arch = if cfg!(target_arch = "x86_64") {
-        "x86_64"
-    } else if cfg!(target_arch = "aarch64") {
-        "aarch64"
-    } else {
-        return None;
-    };
-
-    let platform = if cfg!(target_os = "macos") {
-        "apple-darwin"
-    } else if cfg!(target_os = "windows") {
-        "pc-windows-msvc"
-    } else if cfg!(target_os = "linux") {
-        "unknown-linux-gnu"
-    } else {
-        return None;
-    };
-
-    // Windows uses .zip in release assets
-    let ext = if cfg!(target_os = "windows") {
-        "zip"
-    } else {
-        "tar.gz"
-    };
-
-    Some((arch, platform, ext))
-}
-
-fn asset_name(version: &str) -> Option<String> {
-    let (arch, platform, ext) = get_platform_info()?;
-    Some(format!("codex-acp-{version}-{arch}-{platform}.{ext}"))
-}
-
-struct LocalExtensionArchiveAgent {
-    fs: Arc<dyn Fs>,
-    http_client: Arc<dyn HttpClient>,
-    node_runtime: NodeRuntime,
-    project_environment: Entity<ProjectEnvironment>,
-    extension_id: Arc<str>,
-    agent_id: Arc<str>,
-    targets: HashMap<String, extension::TargetConfig>,
-    env: HashMap<String, String>,
-}
-
-struct LocalCustomAgent {
-    project_environment: Entity<ProjectEnvironment>,
-    command: AgentServerCommand,
-}
-
-impl ExternalAgentServer for LocalExtensionArchiveAgent {
-    fn get_command(
-        &mut self,
-        root_dir: Option<&str>,
-        extra_env: HashMap<String, String>,
-        _status_tx: Option<watch::Sender<SharedString>>,
-        _new_version_available_tx: Option<watch::Sender<Option<String>>>,
-        cx: &mut AsyncApp,
-    ) -> Task<Result<(AgentServerCommand, String, Option<task::SpawnInTerminal>)>> {
-        let fs = self.fs.clone();
-        let http_client = self.http_client.clone();
-        let node_runtime = self.node_runtime.clone();
-        let project_environment = self.project_environment.downgrade();
-        let extension_id = self.extension_id.clone();
-        let agent_id = self.agent_id.clone();
-        let targets = self.targets.clone();
-        let base_env = self.env.clone();
-
-        let root_dir: Arc<Path> = root_dir
-            .map(|root_dir| Path::new(root_dir))
-            .unwrap_or(paths::home_dir())
-            .into();
-
-        cx.spawn(async move |cx| {
-            // Get project environment
-            let mut env = project_environment
-                .update(cx, |project_environment, cx| {
-                    project_environment.local_directory_environment(
-                        &Shell::System,
-                        root_dir.clone(),
-                        cx,
-                    )
-                })?
-                .await
-                .unwrap_or_default();
-
-            // Merge manifest env and extra env
-            env.extend(base_env);
-            env.extend(extra_env);
-
-            let cache_key = format!("{}/{}", extension_id, agent_id);
-            let dir = paths::external_agents_dir().join(&cache_key);
-            fs.create_dir(&dir).await?;
-
-            // Determine platform key
-            let os = if cfg!(target_os = "macos") {
-                "darwin"
-            } else if cfg!(target_os = "linux") {
-                "linux"
-            } else if cfg!(target_os = "windows") {
-                "windows"
-            } else {
-                anyhow::bail!("unsupported OS");
-            };
-
-            let arch = if cfg!(target_arch = "aarch64") {
-                "aarch64"
-            } else if cfg!(target_arch = "x86_64") {
-                "x86_64"
-            } else {
-                anyhow::bail!("unsupported architecture");
-            };
-
-            let platform_key = format!("{}-{}", os, arch);
-            let target_config = targets.get(&platform_key).with_context(|| {
-                format!(
-                    "no target specified for platform '{}'. Available platforms: {}",
-                    platform_key,
-                    targets
-                        .keys()
-                        .map(|k| k.as_str())
-                        .collect::<Vec<_>>()
-                        .join(", ")
-                )
-            })?;
-
-            let archive_url = &target_config.archive;
-
-            // Use URL as version identifier for caching
-            // Hash the URL to get a stable directory name
-            use std::collections::hash_map::DefaultHasher;
-            use std::hash::{Hash, Hasher};
-            let mut hasher = DefaultHasher::new();
-            archive_url.hash(&mut hasher);
-            let url_hash = hasher.finish();
-            let version_dir = dir.join(format!("v_{:x}", url_hash));
-
-            if !fs.is_dir(&version_dir).await {
-                // Determine SHA256 for verification
-                let sha256 = if let Some(provided_sha) = &target_config.sha256 {
-                    // Use provided SHA256
-                    Some(provided_sha.clone())
-                } else if archive_url.starts_with("https://github.com/") {
-                    // Try to fetch SHA256 from GitHub API
-                    // Parse URL to extract repo and tag/file info
-                    // Format: https://github.com/owner/repo/releases/download/tag/file.zip
-                    if let Some(caps) = archive_url.strip_prefix("https://github.com/") {
-                        let parts: Vec<&str> = caps.split('/').collect();
-                        if parts.len() >= 6 && parts[2] == "releases" && parts[3] == "download" {
-                            let repo = format!("{}/{}", parts[0], parts[1]);
-                            let tag = parts[4];
-                            let filename = parts[5..].join("/");
-
-                            // Try to get release info from GitHub
-                            if let Ok(release) = ::http_client::github::get_release_by_tag_name(
-                                &repo,
-                                tag,
-                                http_client.clone(),
-                            )
-                            .await
-                            {
-                                // Find matching asset
-                                if let Some(asset) =
-                                    release.assets.iter().find(|a| a.name == filename)
-                                {
-                                    // Strip "sha256:" prefix if present
-                                    asset.digest.as_ref().and_then(|d| {
-                                        d.strip_prefix("sha256:")
-                                            .map(|s| s.to_string())
-                                            .or_else(|| Some(d.clone()))
-                                    })
-                                } else {
-                                    None
-                                }
-                            } else {
-                                None
-                            }
-                        } else {
-                            None
-                        }
-                    } else {
-                        None
-                    }
-                } else {
-                    None
-                };
-
-                // Determine archive type from URL
-                let asset_kind = if archive_url.ends_with(".zip") {
-                    AssetKind::Zip
-                } else if archive_url.ends_with(".tar.gz") || archive_url.ends_with(".tgz") {
-                    AssetKind::TarGz
-                } else {
-                    anyhow::bail!("unsupported archive type in URL: {}", archive_url);
-                };
-
-                // Download and extract
-                ::http_client::github_download::download_server_binary(
-                    &*http_client,
-                    archive_url,
-                    sha256.as_deref(),
-                    &version_dir,
-                    asset_kind,
-                )
-                .await?;
-            }
-
-            // Validate and resolve cmd path
-            let cmd = &target_config.cmd;
-
-            let cmd_path = if cmd == "node" {
-                // Use Zed's managed Node.js runtime
-                node_runtime.binary_path().await?
-            } else {
-                if cmd.contains("..") {
-                    anyhow::bail!("command path cannot contain '..': {}", cmd);
-                }
-
-                if cmd.starts_with("./") || cmd.starts_with(".\\") {
-                    // Relative to extraction directory
-                    let cmd_path = version_dir.join(&cmd[2..]);
-                    anyhow::ensure!(
-                        fs.is_file(&cmd_path).await,
-                        "Missing command {} after extraction",
-                        cmd_path.to_string_lossy()
-                    );
-                    cmd_path
-                } else {
-                    // On PATH
-                    anyhow::bail!("command must be relative (start with './'): {}", cmd);
-                }
-            };
-
-            let command = AgentServerCommand {
-                path: cmd_path,
-                args: target_config.args.clone(),
-                env: Some(env),
-            };
-
-            Ok((command, version_dir.to_string_lossy().into_owned(), None))
-        })
-    }
-
-    fn as_any_mut(&mut self) -> &mut dyn Any {
-        self
-    }
-}
-
-impl ExternalAgentServer for LocalCustomAgent {
-    fn get_command(
-        &mut self,
-        root_dir: Option<&str>,
-        extra_env: HashMap<String, String>,
-        _status_tx: Option<watch::Sender<SharedString>>,
-        _new_version_available_tx: Option<watch::Sender<Option<String>>>,
-        cx: &mut AsyncApp,
-    ) -> Task<Result<(AgentServerCommand, String, Option<task::SpawnInTerminal>)>> {
-        let mut command = self.command.clone();
-        let root_dir: Arc<Path> = root_dir
-            .map(|root_dir| Path::new(root_dir))
-            .unwrap_or(paths::home_dir())
-            .into();
-        let project_environment = self.project_environment.downgrade();
-        cx.spawn(async move |cx| {
-            let mut env = project_environment
-                .update(cx, |project_environment, cx| {
-                    project_environment.local_directory_environment(
-                        &Shell::System,
-                        root_dir.clone(),
-                        cx,
-                    )
-                })?
-                .await
-                .unwrap_or_default();
-            env.extend(command.env.unwrap_or_default());
-            env.extend(extra_env);
-            command.env = Some(env);
-            Ok((command, root_dir.to_string_lossy().into_owned(), None))
-        })
-    }
-
-    fn as_any_mut(&mut self) -> &mut dyn Any {
-        self
-    }
-}
-
-pub const GEMINI_NAME: &'static str = "gemini";
-pub const CLAUDE_CODE_NAME: &'static str = "claude";
-pub const CODEX_NAME: &'static str = "codex";
-
-#[derive(Default, Clone, JsonSchema, Debug, PartialEq, RegisterSetting)]
-pub struct AllAgentServersSettings {
-    pub gemini: Option<BuiltinAgentServerSettings>,
-    pub claude: Option<BuiltinAgentServerSettings>,
-    pub codex: Option<BuiltinAgentServerSettings>,
-    pub custom: HashMap<SharedString, CustomAgentServerSettings>,
-}
-#[derive(Default, Clone, JsonSchema, Debug, PartialEq)]
-pub struct BuiltinAgentServerSettings {
-    pub path: Option<PathBuf>,
-    pub args: Option<Vec<String>>,
-    pub env: Option<HashMap<String, String>>,
-    pub ignore_system_version: Option<bool>,
-    pub default_mode: Option<String>,
-    pub default_model: Option<String>,
-}
-
-impl BuiltinAgentServerSettings {
-    pub(crate) fn custom_command(self) -> Option<AgentServerCommand> {
-        self.path.map(|path| AgentServerCommand {
-            path,
-            args: self.args.unwrap_or_default(),
-            env: self.env,
-        })
-    }
-}
-
-impl From<settings::BuiltinAgentServerSettings> for BuiltinAgentServerSettings {
-    fn from(value: settings::BuiltinAgentServerSettings) -> Self {
-        BuiltinAgentServerSettings {
-            path: value
-                .path
-                .map(|p| PathBuf::from(shellexpand::tilde(&p.to_string_lossy()).as_ref())),
-            args: value.args,
-            env: value.env,
-            ignore_system_version: value.ignore_system_version,
-            default_mode: value.default_mode,
-            default_model: value.default_model,
-        }
-    }
-}
-
-impl From<AgentServerCommand> for BuiltinAgentServerSettings {
-    fn from(value: AgentServerCommand) -> Self {
-        BuiltinAgentServerSettings {
-            path: Some(value.path),
-            args: Some(value.args),
-            env: value.env,
-            ..Default::default()
-        }
-    }
-}
-
-#[derive(Clone, JsonSchema, Debug, PartialEq)]
-pub enum CustomAgentServerSettings {
-    Custom {
-        command: AgentServerCommand,
-        /// The default mode to use for this agent.
-        ///
-        /// Note: Not only all agents support modes.
-        ///
-        /// Default: None
-        default_mode: Option<String>,
-        /// The default model to use for this agent.
-        ///
-        /// This should be the model ID as reported by the agent.
-        ///
-        /// Default: None
-        default_model: Option<String>,
-    },
-    Extension {
-        /// The default mode to use for this agent.
-        ///
-        /// Note: Not only all agents support modes.
-        ///
-        /// Default: None
-        default_mode: Option<String>,
-        /// The default model to use for this agent.
-        ///
-        /// This should be the model ID as reported by the agent.
-        ///
-        /// Default: None
-        default_model: Option<String>,
-    },
-}
-
-impl CustomAgentServerSettings {
-    pub fn command(&self) -> Option<&AgentServerCommand> {
-        match self {
-            CustomAgentServerSettings::Custom { command, .. } => Some(command),
-            CustomAgentServerSettings::Extension { .. } => None,
-        }
-    }
-
-    pub fn default_mode(&self) -> Option<&str> {
-        match self {
-            CustomAgentServerSettings::Custom { default_mode, .. }
-            | CustomAgentServerSettings::Extension { default_mode, .. } => default_mode.as_deref(),
-        }
-    }
-
-    pub fn default_model(&self) -> Option<&str> {
-        match self {
-            CustomAgentServerSettings::Custom { default_model, .. }
-            | CustomAgentServerSettings::Extension { default_model, .. } => {
-                default_model.as_deref()
-            }
-        }
-    }
-}
-
-impl From<settings::CustomAgentServerSettings> for CustomAgentServerSettings {
-    fn from(value: settings::CustomAgentServerSettings) -> Self {
-        match value {
-            settings::CustomAgentServerSettings::Custom {
-                path,
-                args,
-                env,
-                default_mode,
-                default_model,
-            } => CustomAgentServerSettings::Custom {
-                command: AgentServerCommand {
-                    path: PathBuf::from(shellexpand::tilde(&path.to_string_lossy()).as_ref()),
-                    args,
-                    env,
-                },
-                default_mode,
-                default_model,
-            },
-            settings::CustomAgentServerSettings::Extension {
-                default_mode,
-                default_model,
-            } => CustomAgentServerSettings::Extension {
-                default_mode,
-                default_model,
-            },
-        }
-    }
-}
-
-impl settings::Settings for AllAgentServersSettings {
-    fn from_settings(content: &settings::SettingsContent) -> Self {
-        let agent_settings = content.agent_servers.clone().unwrap();
-        Self {
-            gemini: agent_settings.gemini.map(Into::into),
-            claude: agent_settings.claude.map(Into::into),
-            codex: agent_settings.codex.map(Into::into),
-            custom: agent_settings
-                .custom
-                .into_iter()
-                .map(|(k, v)| (k, v.into()))
-                .collect(),
-        }
-    }
-}
-
-#[cfg(test)]
-mod extension_agent_tests {
-    use crate::worktree_store::WorktreeStore;
-
-    use super::*;
-    use gpui::TestAppContext;
-    use std::sync::Arc;
-
-    #[test]
-    fn extension_agent_constructs_proper_display_names() {
-        // Verify the display name format for extension-provided agents
-        let name1 = ExternalAgentServerName(SharedString::from("Extension: Agent"));
-        assert!(name1.0.contains(": "));
-
-        let name2 = ExternalAgentServerName(SharedString::from("MyExt: MyAgent"));
-        assert_eq!(name2.0, "MyExt: MyAgent");
-
-        // Non-extension agents shouldn't have the separator
-        let custom = ExternalAgentServerName(SharedString::from("custom"));
-        assert!(!custom.0.contains(": "));
-    }
-
-    struct NoopExternalAgent;
-
-    impl ExternalAgentServer for NoopExternalAgent {
-        fn get_command(
-            &mut self,
-            _root_dir: Option<&str>,
-            _extra_env: HashMap<String, String>,
-            _status_tx: Option<watch::Sender<SharedString>>,
-            _new_version_available_tx: Option<watch::Sender<Option<String>>>,
-            _cx: &mut AsyncApp,
-        ) -> Task<Result<(AgentServerCommand, String, Option<task::SpawnInTerminal>)>> {
-            Task::ready(Ok((
-                AgentServerCommand {
-                    path: PathBuf::from("noop"),
-                    args: Vec::new(),
-                    env: None,
-                },
-                "".to_string(),
-                None,
-            )))
-        }
-
-        fn as_any_mut(&mut self) -> &mut dyn Any {
-            self
-        }
-    }
-
-    #[test]
-    fn sync_removes_only_extension_provided_agents() {
-        let mut store = AgentServerStore {
-            state: AgentServerStoreState::Collab,
-            external_agents: HashMap::default(),
-            agent_icons: HashMap::default(),
-            agent_display_names: HashMap::default(),
-        };
-
-        // Seed with extension agents (contain ": ") and custom agents (don't contain ": ")
-        store.external_agents.insert(
-            ExternalAgentServerName(SharedString::from("Ext1: Agent1")),
-            Box::new(NoopExternalAgent) as Box<dyn ExternalAgentServer>,
-        );
-        store.external_agents.insert(
-            ExternalAgentServerName(SharedString::from("Ext2: Agent2")),
-            Box::new(NoopExternalAgent) as Box<dyn ExternalAgentServer>,
-        );
-        store.external_agents.insert(
-            ExternalAgentServerName(SharedString::from("custom-agent")),
-            Box::new(NoopExternalAgent) as Box<dyn ExternalAgentServer>,
-        );
-
-        // Simulate removal phase
-        let keys_to_remove: Vec<_> = store
-            .external_agents
-            .keys()
-            .filter(|name| name.0.contains(": "))
-            .cloned()
-            .collect();
-
-        for key in keys_to_remove {
-            store.external_agents.remove(&key);
-        }
-
-        // Only custom-agent should remain
-        assert_eq!(store.external_agents.len(), 1);
-        assert!(
-            store
-                .external_agents
-                .contains_key(&ExternalAgentServerName(SharedString::from("custom-agent")))
-        );
-    }
-
-    #[test]
-    fn archive_launcher_constructs_with_all_fields() {
-        use extension::AgentServerManifestEntry;
-
-        let mut env = HashMap::default();
-        env.insert("GITHUB_TOKEN".into(), "secret".into());
-
-        let mut targets = HashMap::default();
-        targets.insert(
-            "darwin-aarch64".to_string(),
-            extension::TargetConfig {
-                archive:
-                    "https://github.com/owner/repo/releases/download/v1.0.0/agent-darwin-arm64.zip"
-                        .into(),
-                cmd: "./agent".into(),
-                args: vec![],
-                sha256: None,
-                env: Default::default(),
-            },
-        );
-
-        let _entry = AgentServerManifestEntry {
-            name: "GitHub Agent".into(),
-            targets,
-            env,
-            icon: None,
-        };
-
-        // Verify display name construction
-        let expected_name = ExternalAgentServerName(SharedString::from("GitHub Agent"));
-        assert_eq!(expected_name.0, "GitHub Agent");
-    }
-
-    #[gpui::test]
-    async fn archive_agent_uses_extension_and_agent_id_for_cache_key(cx: &mut TestAppContext) {
-        let fs = fs::FakeFs::new(cx.background_executor.clone());
-        let http_client = http_client::FakeHttpClient::with_404_response();
-        let worktree_store = cx.new(|_| WorktreeStore::local(false, fs.clone()));
-        let project_environment = cx.new(|cx| {
-            crate::ProjectEnvironment::new(None, worktree_store.downgrade(), None, false, cx)
-        });
-
-        let agent = LocalExtensionArchiveAgent {
-            fs,
-            http_client,
-            node_runtime: node_runtime::NodeRuntime::unavailable(),
-            project_environment,
-            extension_id: Arc::from("my-extension"),
-            agent_id: Arc::from("my-agent"),
-            targets: {
-                let mut map = HashMap::default();
-                map.insert(
-                    "darwin-aarch64".to_string(),
-                    extension::TargetConfig {
-                        archive: "https://example.com/my-agent-darwin-arm64.zip".into(),
-                        cmd: "./my-agent".into(),
-                        args: vec!["--serve".into()],
-                        sha256: None,
-                        env: Default::default(),
-                    },
-                );
-                map
-            },
-            env: {
-                let mut map = HashMap::default();
-                map.insert("PORT".into(), "8080".into());
-                map
-            },
-        };
-
-        // Verify agent is properly constructed
-        assert_eq!(agent.extension_id.as_ref(), "my-extension");
-        assert_eq!(agent.agent_id.as_ref(), "my-agent");
-        assert_eq!(agent.env.get("PORT"), Some(&"8080".to_string()));
-        assert!(agent.targets.contains_key("darwin-aarch64"));
-    }
-
-    #[test]
-    fn sync_extension_agents_registers_archive_launcher() {
-        use extension::AgentServerManifestEntry;
-
-        let expected_name = ExternalAgentServerName(SharedString::from("Release Agent"));
-        assert_eq!(expected_name.0, "Release Agent");
-
-        // Verify the manifest entry structure for archive-based installation
-        let mut env = HashMap::default();
-        env.insert("API_KEY".into(), "secret".into());
-
-        let mut targets = HashMap::default();
-        targets.insert(
-            "linux-x86_64".to_string(),
-            extension::TargetConfig {
-                archive: "https://github.com/org/project/releases/download/v2.1.0/release-agent-linux-x64.tar.gz".into(),
-                cmd: "./release-agent".into(),
-                args: vec!["serve".into()],
-                sha256: None,
-                env: Default::default(),
-            },
-        );
-
-        let manifest_entry = AgentServerManifestEntry {
-            name: "Release Agent".into(),
-            targets: targets.clone(),
-            env,
-            icon: None,
-        };
-
-        // Verify target config is present
-        assert!(manifest_entry.targets.contains_key("linux-x86_64"));
-        let target = manifest_entry.targets.get("linux-x86_64").unwrap();
-        assert_eq!(target.cmd, "./release-agent");
-    }
-
-    #[gpui::test]
-    async fn test_node_command_uses_managed_runtime(cx: &mut TestAppContext) {
-        let fs = fs::FakeFs::new(cx.background_executor.clone());
-        let http_client = http_client::FakeHttpClient::with_404_response();
-        let node_runtime = NodeRuntime::unavailable();
-        let worktree_store = cx.new(|_| WorktreeStore::local(false, fs.clone()));
-        let project_environment = cx.new(|cx| {
-            crate::ProjectEnvironment::new(None, worktree_store.downgrade(), None, false, cx)
-        });
-
-        let agent = LocalExtensionArchiveAgent {
-            fs: fs.clone(),
-            http_client,
-            node_runtime,
-            project_environment,
-            extension_id: Arc::from("node-extension"),
-            agent_id: Arc::from("node-agent"),
-            targets: {
-                let mut map = HashMap::default();
-                map.insert(
-                    "darwin-aarch64".to_string(),
-                    extension::TargetConfig {
-                        archive: "https://example.com/node-agent.zip".into(),
-                        cmd: "node".into(),
-                        args: vec!["index.js".into()],
-                        sha256: None,
-                        env: Default::default(),
-                    },
-                );
-                map
-            },
-            env: HashMap::default(),
-        };
-
-        // Verify that when cmd is "node", it attempts to use the node runtime
-        assert_eq!(agent.extension_id.as_ref(), "node-extension");
-        assert_eq!(agent.agent_id.as_ref(), "node-agent");
-
-        let target = agent.targets.get("darwin-aarch64").unwrap();
-        assert_eq!(target.cmd, "node");
-        assert_eq!(target.args, vec!["index.js"]);
-    }
-
-    #[gpui::test]
-    async fn test_commands_run_in_extraction_directory(cx: &mut TestAppContext) {
-        let fs = fs::FakeFs::new(cx.background_executor.clone());
-        let http_client = http_client::FakeHttpClient::with_404_response();
-        let node_runtime = NodeRuntime::unavailable();
-        let worktree_store = cx.new(|_| WorktreeStore::local(false, fs.clone()));
-        let project_environment = cx.new(|cx| {
-            crate::ProjectEnvironment::new(None, worktree_store.downgrade(), None, false, cx)
-        });
-
-        let agent = LocalExtensionArchiveAgent {
-            fs: fs.clone(),
-            http_client,
-            node_runtime,
-            project_environment,
-            extension_id: Arc::from("test-ext"),
-            agent_id: Arc::from("test-agent"),
-            targets: {
-                let mut map = HashMap::default();
-                map.insert(
-                    "darwin-aarch64".to_string(),
-                    extension::TargetConfig {
-                        archive: "https://example.com/test.zip".into(),
-                        cmd: "node".into(),
-                        args: vec![
-                            "server.js".into(),
-                            "--config".into(),
-                            "./config.json".into(),
-                        ],
-                        sha256: None,
-                        env: Default::default(),
-                    },
-                );
-                map
-            },
-            env: HashMap::default(),
-        };
-
-        // Verify the agent is configured with relative paths in args
-        let target = agent.targets.get("darwin-aarch64").unwrap();
-        assert_eq!(target.args[0], "server.js");
-        assert_eq!(target.args[2], "./config.json");
-        // These relative paths will resolve relative to the extraction directory
-        // when the command is executed
-    }
-
-    #[test]
-    fn test_tilde_expansion_in_settings() {
-        let settings = settings::BuiltinAgentServerSettings {
-            path: Some(PathBuf::from("~/bin/agent")),
-            args: Some(vec!["--flag".into()]),
-            env: None,
-            ignore_system_version: None,
-            default_mode: None,
-            default_model: None,
-        };
-
-        let BuiltinAgentServerSettings { path, .. } = settings.into();
-
-        let path = path.unwrap();
-        assert!(
-            !path.to_string_lossy().starts_with("~"),
-            "Tilde should be expanded for builtin agent path"
-        );
-
-        let settings = settings::CustomAgentServerSettings::Custom {
-            path: PathBuf::from("~/custom/agent"),
-            args: vec!["serve".into()],
-            env: None,
-            default_mode: None,
-            default_model: None,
-        };
-
-        let converted: CustomAgentServerSettings = settings.into();
-        let CustomAgentServerSettings::Custom {
-            command: AgentServerCommand { path, .. },
-            ..
-        } = converted
-        else {
-            panic!("Expected Custom variant");
-        };
-
-        assert!(
-            !path.to_string_lossy().starts_with("~"),
-            "Tilde should be expanded for custom agent path"
-        );
-    }
-}
diff --git a/crates/project/src/buffer_store.rs b/crates/project/src/buffer_store.rs
deleted file mode 100644
index aea2482c83..0000000000
--- a/crates/project/src/buffer_store.rs
+++ /dev/null
@@ -1,1686 +0,0 @@
-use crate::{
-    ProjectPath,
-    lsp_store::OpenLspBufferHandle,
-    worktree_store::{WorktreeStore, WorktreeStoreEvent},
-};
-use anyhow::{Context as _, Result, anyhow};
-use client::Client;
-use collections::{HashMap, HashSet, hash_map};
-use futures::{Future, FutureExt as _, channel::oneshot, future::Shared};
-use gpui::{
-    App, AppContext as _, AsyncApp, Context, Entity, EventEmitter, Subscription, Task, WeakEntity,
-};
-use language::{
-    Buffer, BufferEvent, Capability, DiskState, File as _, Language, Operation,
-    proto::{
-        deserialize_line_ending, deserialize_version, serialize_line_ending, serialize_version,
-        split_operations,
-    },
-};
-use rpc::{
-    AnyProtoClient, ErrorCode, ErrorExt as _, TypedEnvelope,
-    proto::{self},
-};
-
-use std::{io, sync::Arc, time::Instant};
-use text::{BufferId, ReplicaId};
-use util::{ResultExt as _, TryFutureExt, debug_panic, maybe, rel_path::RelPath};
-use worktree::{File, PathChange, ProjectEntryId, Worktree, WorktreeId};
-
-/// A set of open buffers.
-pub struct BufferStore {
-    state: BufferStoreState,
-    #[allow(clippy::type_complexity)]
-    loading_buffers: HashMap<ProjectPath, Shared<Task<Result<Entity<Buffer>, Arc<anyhow::Error>>>>>,
-    worktree_store: Entity<WorktreeStore>,
-    opened_buffers: HashMap<BufferId, OpenBuffer>,
-    path_to_buffer_id: HashMap<ProjectPath, BufferId>,
-    downstream_client: Option<(AnyProtoClient, u64)>,
-    shared_buffers: HashMap<proto::PeerId, HashMap<BufferId, SharedBuffer>>,
-    non_searchable_buffers: HashSet<BufferId>,
-}
-
-#[derive(Hash, Eq, PartialEq, Clone)]
-struct SharedBuffer {
-    buffer: Entity<Buffer>,
-    lsp_handle: Option<OpenLspBufferHandle>,
-}
-
-enum BufferStoreState {
-    Local(LocalBufferStore),
-    Remote(RemoteBufferStore),
-}
-
-struct RemoteBufferStore {
-    shared_with_me: HashSet<Entity<Buffer>>,
-    upstream_client: AnyProtoClient,
-    project_id: u64,
-    loading_remote_buffers_by_id: HashMap<BufferId, Entity<Buffer>>,
-    remote_buffer_listeners:
-        HashMap<BufferId, Vec<oneshot::Sender<anyhow::Result<Entity<Buffer>>>>>,
-    worktree_store: Entity<WorktreeStore>,
-}
-
-struct LocalBufferStore {
-    local_buffer_ids_by_entry_id: HashMap<ProjectEntryId, BufferId>,
-    worktree_store: Entity<WorktreeStore>,
-    _subscription: Subscription,
-}
-
-enum OpenBuffer {
-    Complete { buffer: WeakEntity<Buffer> },
-    Operations(Vec<Operation>),
-}
-
-pub enum BufferStoreEvent {
-    BufferAdded(Entity<Buffer>),
-    BufferOpened {
-        buffer: Entity<Buffer>,
-        project_path: ProjectPath,
-    },
-    SharedBufferClosed(proto::PeerId, BufferId),
-    BufferDropped(BufferId),
-    BufferChangedFilePath {
-        buffer: Entity<Buffer>,
-        old_file: Option<Arc<dyn language::File>>,
-    },
-}
-
-#[derive(Default, Debug, Clone)]
-pub struct ProjectTransaction(pub HashMap<Entity<Buffer>, language::Transaction>);
-
-impl PartialEq for ProjectTransaction {
-    fn eq(&self, other: &Self) -> bool {
-        self.0.len() == other.0.len()
-            && self.0.iter().all(|(buffer, transaction)| {
-                other.0.get(buffer).is_some_and(|t| t.id == transaction.id)
-            })
-    }
-}
-
-impl EventEmitter<BufferStoreEvent> for BufferStore {}
-
-impl RemoteBufferStore {
-    pub fn wait_for_remote_buffer(
-        &mut self,
-        id: BufferId,
-        cx: &mut Context<BufferStore>,
-    ) -> Task<Result<Entity<Buffer>>> {
-        let (tx, rx) = oneshot::channel();
-        self.remote_buffer_listeners.entry(id).or_default().push(tx);
-
-        cx.spawn(async move |this, cx| {
-            if let Some(buffer) = this
-                .read_with(cx, |buffer_store, _| buffer_store.get(id))
-                .ok()
-                .flatten()
-            {
-                return Ok(buffer);
-            }
-
-            cx.background_spawn(async move { rx.await? }).await
-        })
-    }
-
-    fn save_remote_buffer(
-        &self,
-        buffer_handle: Entity<Buffer>,
-        new_path: Option<proto::ProjectPath>,
-        cx: &Context<BufferStore>,
-    ) -> Task<Result<()>> {
-        let buffer = buffer_handle.read(cx);
-        let buffer_id = buffer.remote_id().into();
-        let version = buffer.version();
-        let rpc = self.upstream_client.clone();
-        let project_id = self.project_id;
-        cx.spawn(async move |_, cx| {
-            let response = rpc
-                .request(proto::SaveBuffer {
-                    project_id,
-                    buffer_id,
-                    new_path,
-                    version: serialize_version(&version),
-                })
-                .await?;
-            let version = deserialize_version(&response.version);
-            let mtime = response.mtime.map(|mtime| mtime.into());
-
-            buffer_handle.update(cx, |buffer, cx| {
-                buffer.did_save(version.clone(), mtime, cx);
-            })?;
-
-            Ok(())
-        })
-    }
-
-    pub fn handle_create_buffer_for_peer(
-        &mut self,
-        envelope: TypedEnvelope<proto::CreateBufferForPeer>,
-        replica_id: ReplicaId,
-        capability: Capability,
-        cx: &mut Context<BufferStore>,
-    ) -> Result<Option<Entity<Buffer>>> {
-        match envelope.payload.variant.context("missing variant")? {
-            proto::create_buffer_for_peer::Variant::State(mut state) => {
-                let buffer_id = BufferId::new(state.id)?;
-
-                let buffer_result = maybe!({
-                    let mut buffer_file = None;
-                    if let Some(file) = state.file.take() {
-                        let worktree_id = worktree::WorktreeId::from_proto(file.worktree_id);
-                        let worktree = self
-                            .worktree_store
-                            .read(cx)
-                            .worktree_for_id(worktree_id, cx)
-                            .with_context(|| {
-                                format!("no worktree found for id {}", file.worktree_id)
-                            })?;
-                        buffer_file = Some(Arc::new(File::from_proto(file, worktree, cx)?)
-                            as Arc<dyn language::File>);
-                    }
-                    Buffer::from_proto(replica_id, capability, state, buffer_file)
-                });
-
-                match buffer_result {
-                    Ok(buffer) => {
-                        let buffer = cx.new(|_| buffer);
-                        self.loading_remote_buffers_by_id.insert(buffer_id, buffer);
-                    }
-                    Err(error) => {
-                        if let Some(listeners) = self.remote_buffer_listeners.remove(&buffer_id) {
-                            for listener in listeners {
-                                listener.send(Err(anyhow!(error.cloned()))).ok();
-                            }
-                        }
-                    }
-                }
-            }
-            proto::create_buffer_for_peer::Variant::Chunk(chunk) => {
-                let buffer_id = BufferId::new(chunk.buffer_id)?;
-                let buffer = self
-                    .loading_remote_buffers_by_id
-                    .get(&buffer_id)
-                    .cloned()
-                    .with_context(|| {
-                        format!(
-                            "received chunk for buffer {} without initial state",
-                            chunk.buffer_id
-                        )
-                    })?;
-
-                let result = maybe!({
-                    let operations = chunk
-                        .operations
-                        .into_iter()
-                        .map(language::proto::deserialize_operation)
-                        .collect::<Result<Vec<_>>>()?;
-                    buffer.update(cx, |buffer, cx| buffer.apply_ops(operations, cx));
-                    anyhow::Ok(())
-                });
-
-                if let Err(error) = result {
-                    self.loading_remote_buffers_by_id.remove(&buffer_id);
-                    if let Some(listeners) = self.remote_buffer_listeners.remove(&buffer_id) {
-                        for listener in listeners {
-                            listener.send(Err(error.cloned())).ok();
-                        }
-                    }
-                } else if chunk.is_last {
-                    self.loading_remote_buffers_by_id.remove(&buffer_id);
-                    if self.upstream_client.is_via_collab() {
-                        // retain buffers sent by peers to avoid races.
-                        self.shared_with_me.insert(buffer.clone());
-                    }
-
-                    if let Some(senders) = self.remote_buffer_listeners.remove(&buffer_id) {
-                        for sender in senders {
-                            sender.send(Ok(buffer.clone())).ok();
-                        }
-                    }
-                    return Ok(Some(buffer));
-                }
-            }
-        }
-        Ok(None)
-    }
-
-    pub fn incomplete_buffer_ids(&self) -> Vec<BufferId> {
-        self.loading_remote_buffers_by_id
-            .keys()
-            .copied()
-            .collect::<Vec<_>>()
-    }
-
-    pub fn deserialize_project_transaction(
-        &self,
-        message: proto::ProjectTransaction,
-        push_to_history: bool,
-        cx: &mut Context<BufferStore>,
-    ) -> Task<Result<ProjectTransaction>> {
-        cx.spawn(async move |this, cx| {
-            let mut project_transaction = ProjectTransaction::default();
-            for (buffer_id, transaction) in message.buffer_ids.into_iter().zip(message.transactions)
-            {
-                let buffer_id = BufferId::new(buffer_id)?;
-                let buffer = this
-                    .update(cx, |this, cx| this.wait_for_remote_buffer(buffer_id, cx))?
-                    .await?;
-                let transaction = language::proto::deserialize_transaction(transaction)?;
-                project_transaction.0.insert(buffer, transaction);
-            }
-
-            for (buffer, transaction) in &project_transaction.0 {
-                buffer
-                    .update(cx, |buffer, _| {
-                        buffer.wait_for_edits(transaction.edit_ids.iter().copied())
-                    })?
-                    .await?;
-
-                if push_to_history {
-                    buffer.update(cx, |buffer, _| {
-                        buffer.push_transaction(transaction.clone(), Instant::now());
-                        buffer.finalize_last_transaction();
-                    })?;
-                }
-            }
-
-            Ok(project_transaction)
-        })
-    }
-
-    fn open_buffer(
-        &self,
-        path: Arc<RelPath>,
-        worktree: Entity<Worktree>,
-        cx: &mut Context<BufferStore>,
-    ) -> Task<Result<Entity<Buffer>>> {
-        let worktree_id = worktree.read(cx).id().to_proto();
-        let project_id = self.project_id;
-        let client = self.upstream_client.clone();
-        cx.spawn(async move |this, cx| {
-            let response = client
-                .request(proto::OpenBufferByPath {
-                    project_id,
-                    worktree_id,
-                    path: path.to_proto(),
-                })
-                .await?;
-            let buffer_id = BufferId::new(response.buffer_id)?;
-
-            let buffer = this
-                .update(cx, {
-                    |this, cx| this.wait_for_remote_buffer(buffer_id, cx)
-                })?
-                .await?;
-
-            Ok(buffer)
-        })
-    }
-
-    fn create_buffer(
-        &self,
-        project_searchable: bool,
-        cx: &mut Context<BufferStore>,
-    ) -> Task<Result<Entity<Buffer>>> {
-        let create = self.upstream_client.request(proto::OpenNewBuffer {
-            project_id: self.project_id,
-        });
-        cx.spawn(async move |this, cx| {
-            let response = create.await?;
-            let buffer_id = BufferId::new(response.buffer_id)?;
-
-            this.update(cx, |this, cx| {
-                if !project_searchable {
-                    this.non_searchable_buffers.insert(buffer_id);
-                }
-                this.wait_for_remote_buffer(buffer_id, cx)
-            })?
-            .await
-        })
-    }
-
-    fn reload_buffers(
-        &self,
-        buffers: HashSet<Entity<Buffer>>,
-        push_to_history: bool,
-        cx: &mut Context<BufferStore>,
-    ) -> Task<Result<ProjectTransaction>> {
-        let request = self.upstream_client.request(proto::ReloadBuffers {
-            project_id: self.project_id,
-            buffer_ids: buffers
-                .iter()
-                .map(|buffer| buffer.read(cx).remote_id().to_proto())
-                .collect(),
-        });
-
-        cx.spawn(async move |this, cx| {
-            let response = request.await?.transaction.context("missing transaction")?;
-            this.update(cx, |this, cx| {
-                this.deserialize_project_transaction(response, push_to_history, cx)
-            })?
-            .await
-        })
-    }
-}
-
-impl LocalBufferStore {
-    fn save_local_buffer(
-        &self,
-        buffer_handle: Entity<Buffer>,
-        worktree: Entity<Worktree>,
-        path: Arc<RelPath>,
-        mut has_changed_file: bool,
-        cx: &mut Context<BufferStore>,
-    ) -> Task<Result<()>> {
-        let buffer = buffer_handle.read(cx);
-
-        let text = buffer.as_rope().clone();
-        let line_ending = buffer.line_ending();
-        let version = buffer.version();
-        let buffer_id = buffer.remote_id();
-        let file = buffer.file().cloned();
-        if file
-            .as_ref()
-            .is_some_and(|file| file.disk_state() == DiskState::New)
-        {
-            has_changed_file = true;
-        }
-
-        let save = worktree.update(cx, |worktree, cx| {
-            worktree.write_file(path, text, line_ending, cx)
-        });
-
-        cx.spawn(async move |this, cx| {
-            let new_file = save.await?;
-            let mtime = new_file.disk_state().mtime();
-            this.update(cx, |this, cx| {
-                if let Some((downstream_client, project_id)) = this.downstream_client.clone() {
-                    if has_changed_file {
-                        downstream_client
-                            .send(proto::UpdateBufferFile {
-                                project_id,
-                                buffer_id: buffer_id.to_proto(),
-                                file: Some(language::File::to_proto(&*new_file, cx)),
-                            })
-                            .log_err();
-                    }
-                    downstream_client
-                        .send(proto::BufferSaved {
-                            project_id,
-                            buffer_id: buffer_id.to_proto(),
-                            version: serialize_version(&version),
-                            mtime: mtime.map(|time| time.into()),
-                        })
-                        .log_err();
-                }
-            })?;
-            buffer_handle.update(cx, |buffer, cx| {
-                if has_changed_file {
-                    buffer.file_updated(new_file, cx);
-                }
-                buffer.did_save(version.clone(), mtime, cx);
-            })
-        })
-    }
-
-    fn subscribe_to_worktree(
-        &mut self,
-        worktree: &Entity<Worktree>,
-        cx: &mut Context<BufferStore>,
-    ) {
-        cx.subscribe(worktree, |this, worktree, event, cx| {
-            if worktree.read(cx).is_local()
-                && let worktree::Event::UpdatedEntries(changes) = event
-            {
-                Self::local_worktree_entries_changed(this, &worktree, changes, cx);
-            }
-        })
-        .detach();
-    }
-
-    fn local_worktree_entries_changed(
-        this: &mut BufferStore,
-        worktree_handle: &Entity<Worktree>,
-        changes: &[(Arc<RelPath>, ProjectEntryId, PathChange)],
-        cx: &mut Context<BufferStore>,
-    ) {
-        let snapshot = worktree_handle.read(cx).snapshot();
-        for (path, entry_id, _) in changes {
-            Self::local_worktree_entry_changed(
-                this,
-                *entry_id,
-                path,
-                worktree_handle,
-                &snapshot,
-                cx,
-            );
-        }
-    }
-
-    fn local_worktree_entry_changed(
-        this: &mut BufferStore,
-        entry_id: ProjectEntryId,
-        path: &Arc<RelPath>,
-        worktree: &Entity<worktree::Worktree>,
-        snapshot: &worktree::Snapshot,
-        cx: &mut Context<BufferStore>,
-    ) -> Option<()> {
-        let project_path = ProjectPath {
-            worktree_id: snapshot.id(),
-            path: path.clone(),
-        };
-
-        let buffer_id = this
-            .as_local_mut()
-            .and_then(|local| local.local_buffer_ids_by_entry_id.get(&entry_id))
-            .copied()
-            .or_else(|| this.path_to_buffer_id.get(&project_path).copied())?;
-
-        let buffer = if let Some(buffer) = this.get(buffer_id) {
-            Some(buffer)
-        } else {
-            this.opened_buffers.remove(&buffer_id);
-            this.non_searchable_buffers.remove(&buffer_id);
-            None
-        };
-
-        let buffer = if let Some(buffer) = buffer {
-            buffer
-        } else {
-            this.path_to_buffer_id.remove(&project_path);
-            let this = this.as_local_mut()?;
-            this.local_buffer_ids_by_entry_id.remove(&entry_id);
-            return None;
-        };
-
-        let events = buffer.update(cx, |buffer, cx| {
-            let file = buffer.file()?;
-            let old_file = File::from_dyn(Some(file))?;
-            if old_file.worktree != *worktree {
-                return None;
-            }
-
-            let snapshot_entry = old_file
-                .entry_id
-                .and_then(|entry_id| snapshot.entry_for_id(entry_id))
-                .or_else(|| snapshot.entry_for_path(old_file.path.as_ref()));
-
-            let new_file = if let Some(entry) = snapshot_entry {
-                File {
-                    disk_state: match entry.mtime {
-                        Some(mtime) => DiskState::Present { mtime },
-                        None => old_file.disk_state,
-                    },
-                    is_local: true,
-                    entry_id: Some(entry.id),
-                    path: entry.path.clone(),
-                    worktree: worktree.clone(),
-                    is_private: entry.is_private,
-                }
-            } else {
-                File {
-                    disk_state: DiskState::Deleted,
-                    is_local: true,
-                    entry_id: old_file.entry_id,
-                    path: old_file.path.clone(),
-                    worktree: worktree.clone(),
-                    is_private: old_file.is_private,
-                }
-            };
-
-            if new_file == *old_file {
-                return None;
-            }
-
-            let mut events = Vec::new();
-            if new_file.path != old_file.path {
-                this.path_to_buffer_id.remove(&ProjectPath {
-                    path: old_file.path.clone(),
-                    worktree_id: old_file.worktree_id(cx),
-                });
-                this.path_to_buffer_id.insert(
-                    ProjectPath {
-                        worktree_id: new_file.worktree_id(cx),
-                        path: new_file.path.clone(),
-                    },
-                    buffer_id,
-                );
-                events.push(BufferStoreEvent::BufferChangedFilePath {
-                    buffer: cx.entity(),
-                    old_file: buffer.file().cloned(),
-                });
-            }
-            let local = this.as_local_mut()?;
-            if new_file.entry_id != old_file.entry_id {
-                if let Some(entry_id) = old_file.entry_id {
-                    local.local_buffer_ids_by_entry_id.remove(&entry_id);
-                }
-                if let Some(entry_id) = new_file.entry_id {
-                    local
-                        .local_buffer_ids_by_entry_id
-                        .insert(entry_id, buffer_id);
-                }
-            }
-
-            if let Some((client, project_id)) = &this.downstream_client {
-                client
-                    .send(proto::UpdateBufferFile {
-                        project_id: *project_id,
-                        buffer_id: buffer_id.to_proto(),
-                        file: Some(new_file.to_proto(cx)),
-                    })
-                    .ok();
-            }
-
-            buffer.file_updated(Arc::new(new_file), cx);
-            Some(events)
-        })?;
-
-        for event in events {
-            cx.emit(event);
-        }
-
-        None
-    }
-
-    fn save_buffer(
-        &self,
-        buffer: Entity<Buffer>,
-        cx: &mut Context<BufferStore>,
-    ) -> Task<Result<()>> {
-        let Some(file) = File::from_dyn(buffer.read(cx).file()) else {
-            return Task::ready(Err(anyhow!("buffer doesn't have a file")));
-        };
-        let worktree = file.worktree.clone();
-        self.save_local_buffer(buffer, worktree, file.path.clone(), false, cx)
-    }
-
-    fn save_buffer_as(
-        &self,
-        buffer: Entity<Buffer>,
-        path: ProjectPath,
-        cx: &mut Context<BufferStore>,
-    ) -> Task<Result<()>> {
-        let Some(worktree) = self
-            .worktree_store
-            .read(cx)
-            .worktree_for_id(path.worktree_id, cx)
-        else {
-            return Task::ready(Err(anyhow!("no such worktree")));
-        };
-        self.save_local_buffer(buffer, worktree, path.path, true, cx)
-    }
-
-    fn open_buffer(
-        &self,
-        path: Arc<RelPath>,
-        worktree: Entity<Worktree>,
-        cx: &mut Context<BufferStore>,
-    ) -> Task<Result<Entity<Buffer>>> {
-        let load_file = worktree.update(cx, |worktree, cx| worktree.load_file(path.as_ref(), cx));
-        cx.spawn(async move |this, cx| {
-            let path = path.clone();
-            let buffer = match load_file.await {
-                Ok(loaded) => {
-                    let reservation = cx.reserve_entity::<Buffer>()?;
-                    let buffer_id = BufferId::from(reservation.entity_id().as_non_zero_u64());
-                    let text_buffer = cx
-                        .background_spawn(async move {
-                            text::Buffer::new(ReplicaId::LOCAL, buffer_id, loaded.text)
-                        })
-                        .await;
-                    cx.insert_entity(reservation, |_| {
-                        Buffer::build(text_buffer, Some(loaded.file), Capability::ReadWrite)
-                    })?
-                }
-                Err(error) if is_not_found_error(&error) => cx.new(|cx| {
-                    let buffer_id = BufferId::from(cx.entity_id().as_non_zero_u64());
-                    let text_buffer = text::Buffer::new(ReplicaId::LOCAL, buffer_id, "");
-                    Buffer::build(
-                        text_buffer,
-                        Some(Arc::new(File {
-                            worktree,
-                            path,
-                            disk_state: DiskState::New,
-                            entry_id: None,
-                            is_local: true,
-                            is_private: false,
-                        })),
-                        Capability::ReadWrite,
-                    )
-                })?,
-                Err(e) => return Err(e),
-            };
-            this.update(cx, |this, cx| {
-                this.add_buffer(buffer.clone(), cx)?;
-                let buffer_id = buffer.read(cx).remote_id();
-                if let Some(file) = File::from_dyn(buffer.read(cx).file()) {
-                    this.path_to_buffer_id.insert(
-                        ProjectPath {
-                            worktree_id: file.worktree_id(cx),
-                            path: file.path.clone(),
-                        },
-                        buffer_id,
-                    );
-                    let this = this.as_local_mut().unwrap();
-                    if let Some(entry_id) = file.entry_id {
-                        this.local_buffer_ids_by_entry_id
-                            .insert(entry_id, buffer_id);
-                    }
-                }
-
-                anyhow::Ok(())
-            })??;
-
-            Ok(buffer)
-        })
-    }
-
-    fn create_buffer(
-        &self,
-        project_searchable: bool,
-        cx: &mut Context<BufferStore>,
-    ) -> Task<Result<Entity<Buffer>>> {
-        cx.spawn(async move |buffer_store, cx| {
-            let buffer =
-                cx.new(|cx| Buffer::local("", cx).with_language(language::PLAIN_TEXT.clone(), cx))?;
-            buffer_store.update(cx, |buffer_store, cx| {
-                buffer_store.add_buffer(buffer.clone(), cx).log_err();
-                if !project_searchable {
-                    buffer_store
-                        .non_searchable_buffers
-                        .insert(buffer.read(cx).remote_id());
-                }
-            })?;
-            Ok(buffer)
-        })
-    }
-
-    fn reload_buffers(
-        &self,
-        buffers: HashSet<Entity<Buffer>>,
-        push_to_history: bool,
-        cx: &mut Context<BufferStore>,
-    ) -> Task<Result<ProjectTransaction>> {
-        cx.spawn(async move |_, cx| {
-            let mut project_transaction = ProjectTransaction::default();
-            for buffer in buffers {
-                let transaction = buffer.update(cx, |buffer, cx| buffer.reload(cx))?.await?;
-                buffer.update(cx, |buffer, cx| {
-                    if let Some(transaction) = transaction {
-                        if !push_to_history {
-                            buffer.forget_transaction(transaction.id);
-                        }
-                        project_transaction.0.insert(cx.entity(), transaction);
-                    }
-                })?;
-            }
-
-            Ok(project_transaction)
-        })
-    }
-}
-
-impl BufferStore {
-    pub fn init(client: &AnyProtoClient) {
-        client.add_entity_message_handler(Self::handle_buffer_reloaded);
-        client.add_entity_message_handler(Self::handle_buffer_saved);
-        client.add_entity_message_handler(Self::handle_update_buffer_file);
-        client.add_entity_request_handler(Self::handle_save_buffer);
-        client.add_entity_request_handler(Self::handle_reload_buffers);
-    }
-
-    /// Creates a buffer store, optionally retaining its buffers.
-    pub fn local(worktree_store: Entity<WorktreeStore>, cx: &mut Context<Self>) -> Self {
-        Self {
-            state: BufferStoreState::Local(LocalBufferStore {
-                local_buffer_ids_by_entry_id: Default::default(),
-                worktree_store: worktree_store.clone(),
-                _subscription: cx.subscribe(&worktree_store, |this, _, event, cx| {
-                    if let WorktreeStoreEvent::WorktreeAdded(worktree) = event {
-                        let this = this.as_local_mut().unwrap();
-                        this.subscribe_to_worktree(worktree, cx);
-                    }
-                }),
-            }),
-            downstream_client: None,
-            opened_buffers: Default::default(),
-            path_to_buffer_id: Default::default(),
-            shared_buffers: Default::default(),
-            loading_buffers: Default::default(),
-            non_searchable_buffers: Default::default(),
-            worktree_store,
-        }
-    }
-
-    pub fn remote(
-        worktree_store: Entity<WorktreeStore>,
-        upstream_client: AnyProtoClient,
-        remote_id: u64,
-        _cx: &mut Context<Self>,
-    ) -> Self {
-        Self {
-            state: BufferStoreState::Remote(RemoteBufferStore {
-                shared_with_me: Default::default(),
-                loading_remote_buffers_by_id: Default::default(),
-                remote_buffer_listeners: Default::default(),
-                project_id: remote_id,
-                upstream_client,
-                worktree_store: worktree_store.clone(),
-            }),
-            downstream_client: None,
-            opened_buffers: Default::default(),
-            path_to_buffer_id: Default::default(),
-            loading_buffers: Default::default(),
-            shared_buffers: Default::default(),
-            non_searchable_buffers: Default::default(),
-            worktree_store,
-        }
-    }
-
-    fn as_local_mut(&mut self) -> Option<&mut LocalBufferStore> {
-        match &mut self.state {
-            BufferStoreState::Local(state) => Some(state),
-            _ => None,
-        }
-    }
-
-    fn as_remote_mut(&mut self) -> Option<&mut RemoteBufferStore> {
-        match &mut self.state {
-            BufferStoreState::Remote(state) => Some(state),
-            _ => None,
-        }
-    }
-
-    fn as_remote(&self) -> Option<&RemoteBufferStore> {
-        match &self.state {
-            BufferStoreState::Remote(state) => Some(state),
-            _ => None,
-        }
-    }
-
-    pub fn open_buffer(
-        &mut self,
-        project_path: ProjectPath,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Entity<Buffer>>> {
-        if let Some(buffer) = self.get_by_path(&project_path) {
-            cx.emit(BufferStoreEvent::BufferOpened {
-                buffer: buffer.clone(),
-                project_path,
-            });
-
-            return Task::ready(Ok(buffer));
-        }
-
-        let task = match self.loading_buffers.entry(project_path.clone()) {
-            hash_map::Entry::Occupied(e) => e.get().clone(),
-            hash_map::Entry::Vacant(entry) => {
-                let path = project_path.path.clone();
-                let Some(worktree) = self
-                    .worktree_store
-                    .read(cx)
-                    .worktree_for_id(project_path.worktree_id, cx)
-                else {
-                    return Task::ready(Err(anyhow!("no such worktree")));
-                };
-                let load_buffer = match &self.state {
-                    BufferStoreState::Local(this) => this.open_buffer(path, worktree, cx),
-                    BufferStoreState::Remote(this) => this.open_buffer(path, worktree, cx),
-                };
-
-                entry
-                    .insert(
-                        // todo(lw): hot foreground spawn
-                        cx.spawn(async move |this, cx| {
-                            let load_result = load_buffer.await;
-                            this.update(cx, |this, cx| {
-                                // Record the fact that the buffer is no longer loading.
-                                this.loading_buffers.remove(&project_path);
-
-                                let buffer = load_result.map_err(Arc::new)?;
-                                cx.emit(BufferStoreEvent::BufferOpened {
-                                    buffer: buffer.clone(),
-                                    project_path,
-                                });
-
-                                Ok(buffer)
-                            })?
-                        })
-                        .shared(),
-                    )
-                    .clone()
-            }
-        };
-
-        cx.background_spawn(async move {
-            task.await.map_err(|e| {
-                if e.error_code() != ErrorCode::Internal {
-                    anyhow!(e.error_code())
-                } else {
-                    anyhow!("{e}")
-                }
-            })
-        })
-    }
-
-    pub fn create_buffer(
-        &mut self,
-        project_searchable: bool,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Entity<Buffer>>> {
-        match &self.state {
-            BufferStoreState::Local(this) => this.create_buffer(project_searchable, cx),
-            BufferStoreState::Remote(this) => this.create_buffer(project_searchable, cx),
-        }
-    }
-
-    pub fn save_buffer(
-        &mut self,
-        buffer: Entity<Buffer>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        match &mut self.state {
-            BufferStoreState::Local(this) => this.save_buffer(buffer, cx),
-            BufferStoreState::Remote(this) => this.save_remote_buffer(buffer, None, cx),
-        }
-    }
-
-    pub fn save_buffer_as(
-        &mut self,
-        buffer: Entity<Buffer>,
-        path: ProjectPath,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let old_file = buffer.read(cx).file().cloned();
-        let task = match &self.state {
-            BufferStoreState::Local(this) => this.save_buffer_as(buffer.clone(), path, cx),
-            BufferStoreState::Remote(this) => {
-                this.save_remote_buffer(buffer.clone(), Some(path.to_proto()), cx)
-            }
-        };
-        cx.spawn(async move |this, cx| {
-            task.await?;
-            this.update(cx, |this, cx| {
-                old_file.clone().and_then(|file| {
-                    this.path_to_buffer_id.remove(&ProjectPath {
-                        worktree_id: file.worktree_id(cx),
-                        path: file.path().clone(),
-                    })
-                });
-
-                cx.emit(BufferStoreEvent::BufferChangedFilePath { buffer, old_file });
-            })
-        })
-    }
-
-    fn add_buffer(&mut self, buffer_entity: Entity<Buffer>, cx: &mut Context<Self>) -> Result<()> {
-        let buffer = buffer_entity.read(cx);
-        let remote_id = buffer.remote_id();
-        let path = File::from_dyn(buffer.file()).map(|file| ProjectPath {
-            path: file.path.clone(),
-            worktree_id: file.worktree_id(cx),
-        });
-        let is_remote = buffer.replica_id().is_remote();
-        let open_buffer = OpenBuffer::Complete {
-            buffer: buffer_entity.downgrade(),
-        };
-
-        let handle = cx.entity().downgrade();
-        buffer_entity.update(cx, move |_, cx| {
-            cx.on_release(move |buffer, cx| {
-                handle
-                    .update(cx, |_, cx| {
-                        cx.emit(BufferStoreEvent::BufferDropped(buffer.remote_id()))
-                    })
-                    .ok();
-            })
-            .detach()
-        });
-        let _expect_path_to_exist;
-        match self.opened_buffers.entry(remote_id) {
-            hash_map::Entry::Vacant(entry) => {
-                entry.insert(open_buffer);
-                _expect_path_to_exist = false;
-            }
-            hash_map::Entry::Occupied(mut entry) => {
-                if let OpenBuffer::Operations(operations) = entry.get_mut() {
-                    buffer_entity.update(cx, |b, cx| b.apply_ops(operations.drain(..), cx));
-                } else if entry.get().upgrade().is_some() {
-                    if is_remote {
-                        return Ok(());
-                    } else {
-                        debug_panic!("buffer {remote_id} was already registered");
-                        anyhow::bail!("buffer {remote_id} was already registered");
-                    }
-                }
-                entry.insert(open_buffer);
-                _expect_path_to_exist = true;
-            }
-        }
-
-        if let Some(path) = path {
-            self.path_to_buffer_id.insert(path, remote_id);
-        }
-
-        cx.subscribe(&buffer_entity, Self::on_buffer_event).detach();
-        cx.emit(BufferStoreEvent::BufferAdded(buffer_entity));
-        Ok(())
-    }
-
-    pub fn buffers(&self) -> impl '_ + Iterator<Item = Entity<Buffer>> {
-        self.opened_buffers
-            .values()
-            .filter_map(|buffer| buffer.upgrade())
-    }
-
-    pub(crate) fn is_searchable(&self, id: &BufferId) -> bool {
-        !self.non_searchable_buffers.contains(&id)
-    }
-
-    pub fn loading_buffers(
-        &self,
-    ) -> impl Iterator<Item = (&ProjectPath, impl Future<Output = Result<Entity<Buffer>>>)> {
-        self.loading_buffers.iter().map(|(path, task)| {
-            let task = task.clone();
-            (path, async move {
-                task.await.map_err(|e| {
-                    if e.error_code() != ErrorCode::Internal {
-                        anyhow!(e.error_code())
-                    } else {
-                        anyhow!("{e}")
-                    }
-                })
-            })
-        })
-    }
-
-    pub fn buffer_id_for_project_path(&self, project_path: &ProjectPath) -> Option<&BufferId> {
-        self.path_to_buffer_id.get(project_path)
-    }
-
-    pub fn get_by_path(&self, path: &ProjectPath) -> Option<Entity<Buffer>> {
-        self.path_to_buffer_id
-            .get(path)
-            .and_then(|buffer_id| self.get(*buffer_id))
-    }
-
-    pub fn get(&self, buffer_id: BufferId) -> Option<Entity<Buffer>> {
-        self.opened_buffers.get(&buffer_id)?.upgrade()
-    }
-
-    pub fn get_existing(&self, buffer_id: BufferId) -> Result<Entity<Buffer>> {
-        self.get(buffer_id)
-            .with_context(|| format!("unknown buffer id {buffer_id}"))
-    }
-
-    pub fn get_possibly_incomplete(&self, buffer_id: BufferId) -> Option<Entity<Buffer>> {
-        self.get(buffer_id).or_else(|| {
-            self.as_remote()
-                .and_then(|remote| remote.loading_remote_buffers_by_id.get(&buffer_id).cloned())
-        })
-    }
-
-    pub fn buffer_version_info(&self, cx: &App) -> (Vec<proto::BufferVersion>, Vec<BufferId>) {
-        let buffers = self
-            .buffers()
-            .map(|buffer| {
-                let buffer = buffer.read(cx);
-                proto::BufferVersion {
-                    id: buffer.remote_id().into(),
-                    version: language::proto::serialize_version(&buffer.version),
-                }
-            })
-            .collect();
-        let incomplete_buffer_ids = self
-            .as_remote()
-            .map(|remote| remote.incomplete_buffer_ids())
-            .unwrap_or_default();
-        (buffers, incomplete_buffer_ids)
-    }
-
-    pub fn disconnected_from_host(&mut self, cx: &mut App) {
-        for open_buffer in self.opened_buffers.values_mut() {
-            if let Some(buffer) = open_buffer.upgrade() {
-                buffer.update(cx, |buffer, _| buffer.give_up_waiting());
-            }
-        }
-
-        for buffer in self.buffers() {
-            buffer.update(cx, |buffer, cx| {
-                buffer.set_capability(Capability::ReadOnly, cx)
-            });
-        }
-
-        if let Some(remote) = self.as_remote_mut() {
-            // Wake up all futures currently waiting on a buffer to get opened,
-            // to give them a chance to fail now that we've disconnected.
-            remote.remote_buffer_listeners.clear()
-        }
-    }
-
-    pub fn shared(&mut self, remote_id: u64, downstream_client: AnyProtoClient, _cx: &mut App) {
-        self.downstream_client = Some((downstream_client, remote_id));
-    }
-
-    pub fn unshared(&mut self, _cx: &mut Context<Self>) {
-        self.downstream_client.take();
-        self.forget_shared_buffers();
-    }
-
-    pub fn discard_incomplete(&mut self) {
-        self.opened_buffers
-            .retain(|_, buffer| !matches!(buffer, OpenBuffer::Operations(_)));
-    }
-
-    fn buffer_changed_file(&mut self, buffer: Entity<Buffer>, cx: &mut App) -> Option<()> {
-        let file = File::from_dyn(buffer.read(cx).file())?;
-
-        let remote_id = buffer.read(cx).remote_id();
-        if let Some(entry_id) = file.entry_id {
-            if let Some(local) = self.as_local_mut() {
-                match local.local_buffer_ids_by_entry_id.get(&entry_id) {
-                    Some(_) => {
-                        return None;
-                    }
-                    None => {
-                        local
-                            .local_buffer_ids_by_entry_id
-                            .insert(entry_id, remote_id);
-                    }
-                }
-            }
-            self.path_to_buffer_id.insert(
-                ProjectPath {
-                    worktree_id: file.worktree_id(cx),
-                    path: file.path.clone(),
-                },
-                remote_id,
-            );
-        };
-
-        Some(())
-    }
-
-    fn on_buffer_event(
-        &mut self,
-        buffer: Entity<Buffer>,
-        event: &BufferEvent,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            BufferEvent::FileHandleChanged => {
-                self.buffer_changed_file(buffer, cx);
-            }
-            BufferEvent::Reloaded => {
-                let Some((downstream_client, project_id)) = self.downstream_client.as_ref() else {
-                    return;
-                };
-                let buffer = buffer.read(cx);
-                downstream_client
-                    .send(proto::BufferReloaded {
-                        project_id: *project_id,
-                        buffer_id: buffer.remote_id().to_proto(),
-                        version: serialize_version(&buffer.version()),
-                        mtime: buffer.saved_mtime().map(|t| t.into()),
-                        line_ending: serialize_line_ending(buffer.line_ending()) as i32,
-                    })
-                    .log_err();
-            }
-            BufferEvent::LanguageChanged(_) => {}
-            _ => {}
-        }
-    }
-
-    pub async fn handle_update_buffer(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::UpdateBuffer>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::Ack> {
-        let payload = envelope.payload;
-        let buffer_id = BufferId::new(payload.buffer_id)?;
-        let ops = payload
-            .operations
-            .into_iter()
-            .map(language::proto::deserialize_operation)
-            .collect::<Result<Vec<_>, _>>()?;
-        this.update(&mut cx, |this, cx| {
-            match this.opened_buffers.entry(buffer_id) {
-                hash_map::Entry::Occupied(mut e) => match e.get_mut() {
-                    OpenBuffer::Operations(operations) => operations.extend_from_slice(&ops),
-                    OpenBuffer::Complete { buffer, .. } => {
-                        if let Some(buffer) = buffer.upgrade() {
-                            buffer.update(cx, |buffer, cx| buffer.apply_ops(ops, cx));
-                        }
-                    }
-                },
-                hash_map::Entry::Vacant(e) => {
-                    e.insert(OpenBuffer::Operations(ops));
-                }
-            }
-            Ok(proto::Ack {})
-        })?
-    }
-
-    pub fn register_shared_lsp_handle(
-        &mut self,
-        peer_id: proto::PeerId,
-        buffer_id: BufferId,
-        handle: OpenLspBufferHandle,
-    ) {
-        if let Some(shared_buffers) = self.shared_buffers.get_mut(&peer_id)
-            && let Some(buffer) = shared_buffers.get_mut(&buffer_id)
-        {
-            buffer.lsp_handle = Some(handle);
-            return;
-        }
-        debug_panic!("tried to register shared lsp handle, but buffer was not shared")
-    }
-
-    pub fn handle_synchronize_buffers(
-        &mut self,
-        envelope: TypedEnvelope<proto::SynchronizeBuffers>,
-        cx: &mut Context<Self>,
-        client: Arc<Client>,
-    ) -> Result<proto::SynchronizeBuffersResponse> {
-        let project_id = envelope.payload.project_id;
-        let mut response = proto::SynchronizeBuffersResponse {
-            buffers: Default::default(),
-        };
-        let Some(guest_id) = envelope.original_sender_id else {
-            anyhow::bail!("missing original_sender_id on SynchronizeBuffers request");
-        };
-
-        self.shared_buffers.entry(guest_id).or_default().clear();
-        for buffer in envelope.payload.buffers {
-            let buffer_id = BufferId::new(buffer.id)?;
-            let remote_version = language::proto::deserialize_version(&buffer.version);
-            if let Some(buffer) = self.get(buffer_id) {
-                self.shared_buffers
-                    .entry(guest_id)
-                    .or_default()
-                    .entry(buffer_id)
-                    .or_insert_with(|| SharedBuffer {
-                        buffer: buffer.clone(),
-                        lsp_handle: None,
-                    });
-
-                let buffer = buffer.read(cx);
-                response.buffers.push(proto::BufferVersion {
-                    id: buffer_id.into(),
-                    version: language::proto::serialize_version(&buffer.version),
-                });
-
-                let operations = buffer.serialize_ops(Some(remote_version), cx);
-                let client = client.clone();
-                if let Some(file) = buffer.file() {
-                    client
-                        .send(proto::UpdateBufferFile {
-                            project_id,
-                            buffer_id: buffer_id.into(),
-                            file: Some(file.to_proto(cx)),
-                        })
-                        .log_err();
-                }
-
-                // TODO(max): do something
-                // client
-                //     .send(proto::UpdateStagedText {
-                //         project_id,
-                //         buffer_id: buffer_id.into(),
-                //         diff_base: buffer.diff_base().map(ToString::to_string),
-                //     })
-                //     .log_err();
-
-                client
-                    .send(proto::BufferReloaded {
-                        project_id,
-                        buffer_id: buffer_id.into(),
-                        version: language::proto::serialize_version(buffer.saved_version()),
-                        mtime: buffer.saved_mtime().map(|time| time.into()),
-                        line_ending: language::proto::serialize_line_ending(buffer.line_ending())
-                            as i32,
-                    })
-                    .log_err();
-
-                cx.background_spawn(
-                    async move {
-                        let operations = operations.await;
-                        for chunk in split_operations(operations) {
-                            client
-                                .request(proto::UpdateBuffer {
-                                    project_id,
-                                    buffer_id: buffer_id.into(),
-                                    operations: chunk,
-                                })
-                                .await?;
-                        }
-                        anyhow::Ok(())
-                    }
-                    .log_err(),
-                )
-                .detach();
-            }
-        }
-        Ok(response)
-    }
-
-    pub fn handle_create_buffer_for_peer(
-        &mut self,
-        envelope: TypedEnvelope<proto::CreateBufferForPeer>,
-        replica_id: ReplicaId,
-        capability: Capability,
-        cx: &mut Context<Self>,
-    ) -> Result<()> {
-        let remote = self
-            .as_remote_mut()
-            .context("buffer store is not a remote")?;
-
-        if let Some(buffer) =
-            remote.handle_create_buffer_for_peer(envelope, replica_id, capability, cx)?
-        {
-            self.add_buffer(buffer, cx)?;
-        }
-
-        Ok(())
-    }
-
-    pub async fn handle_update_buffer_file(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::UpdateBufferFile>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        let buffer_id = envelope.payload.buffer_id;
-        let buffer_id = BufferId::new(buffer_id)?;
-
-        this.update(&mut cx, |this, cx| {
-            let payload = envelope.payload.clone();
-            if let Some(buffer) = this.get_possibly_incomplete(buffer_id) {
-                let file = payload.file.context("invalid file")?;
-                let worktree = this
-                    .worktree_store
-                    .read(cx)
-                    .worktree_for_id(WorktreeId::from_proto(file.worktree_id), cx)
-                    .context("no such worktree")?;
-                let file = File::from_proto(file, worktree, cx)?;
-                let old_file = buffer.update(cx, |buffer, cx| {
-                    let old_file = buffer.file().cloned();
-                    let new_path = file.path.clone();
-
-                    buffer.file_updated(Arc::new(file), cx);
-                    if old_file.as_ref().is_none_or(|old| *old.path() != new_path) {
-                        Some(old_file)
-                    } else {
-                        None
-                    }
-                });
-                if let Some(old_file) = old_file {
-                    cx.emit(BufferStoreEvent::BufferChangedFilePath { buffer, old_file });
-                }
-            }
-            if let Some((downstream_client, project_id)) = this.downstream_client.as_ref() {
-                downstream_client
-                    .send(proto::UpdateBufferFile {
-                        project_id: *project_id,
-                        buffer_id: buffer_id.into(),
-                        file: envelope.payload.file,
-                    })
-                    .log_err();
-            }
-            Ok(())
-        })?
-    }
-
-    pub async fn handle_save_buffer(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::SaveBuffer>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::BufferSaved> {
-        let buffer_id = BufferId::new(envelope.payload.buffer_id)?;
-        let (buffer, project_id) = this.read_with(&cx, |this, _| {
-            anyhow::Ok((
-                this.get_existing(buffer_id)?,
-                this.downstream_client
-                    .as_ref()
-                    .map(|(_, project_id)| *project_id)
-                    .context("project is not shared")?,
-            ))
-        })??;
-        buffer
-            .update(&mut cx, |buffer, _| {
-                buffer.wait_for_version(deserialize_version(&envelope.payload.version))
-            })?
-            .await?;
-        let buffer_id = buffer.read_with(&cx, |buffer, _| buffer.remote_id())?;
-
-        if let Some(new_path) = envelope.payload.new_path
-            && let Some(new_path) = ProjectPath::from_proto(new_path)
-        {
-            this.update(&mut cx, |this, cx| {
-                this.save_buffer_as(buffer.clone(), new_path, cx)
-            })?
-            .await?;
-        } else {
-            this.update(&mut cx, |this, cx| this.save_buffer(buffer.clone(), cx))?
-                .await?;
-        }
-
-        buffer.read_with(&cx, |buffer, _| proto::BufferSaved {
-            project_id,
-            buffer_id: buffer_id.into(),
-            version: serialize_version(buffer.saved_version()),
-            mtime: buffer.saved_mtime().map(|time| time.into()),
-        })
-    }
-
-    pub async fn handle_close_buffer(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::CloseBuffer>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        let peer_id = envelope.sender_id;
-        let buffer_id = BufferId::new(envelope.payload.buffer_id)?;
-        this.update(&mut cx, |this, cx| {
-            if let Some(shared) = this.shared_buffers.get_mut(&peer_id)
-                && shared.remove(&buffer_id).is_some()
-            {
-                cx.emit(BufferStoreEvent::SharedBufferClosed(peer_id, buffer_id));
-                if shared.is_empty() {
-                    this.shared_buffers.remove(&peer_id);
-                }
-                return;
-            }
-            debug_panic!(
-                "peer_id {} closed buffer_id {} which was either not open or already closed",
-                peer_id,
-                buffer_id
-            )
-        })
-    }
-
-    pub async fn handle_buffer_saved(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::BufferSaved>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        let buffer_id = BufferId::new(envelope.payload.buffer_id)?;
-        let version = deserialize_version(&envelope.payload.version);
-        let mtime = envelope.payload.mtime.clone().map(|time| time.into());
-        this.update(&mut cx, move |this, cx| {
-            if let Some(buffer) = this.get_possibly_incomplete(buffer_id) {
-                buffer.update(cx, |buffer, cx| {
-                    buffer.did_save(version, mtime, cx);
-                });
-            }
-
-            if let Some((downstream_client, project_id)) = this.downstream_client.as_ref() {
-                downstream_client
-                    .send(proto::BufferSaved {
-                        project_id: *project_id,
-                        buffer_id: buffer_id.into(),
-                        mtime: envelope.payload.mtime,
-                        version: envelope.payload.version,
-                    })
-                    .log_err();
-            }
-        })
-    }
-
-    pub async fn handle_buffer_reloaded(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::BufferReloaded>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        let buffer_id = BufferId::new(envelope.payload.buffer_id)?;
-        let version = deserialize_version(&envelope.payload.version);
-        let mtime = envelope.payload.mtime.clone().map(|time| time.into());
-        let line_ending = deserialize_line_ending(
-            proto::LineEnding::from_i32(envelope.payload.line_ending)
-                .context("missing line ending")?,
-        );
-        this.update(&mut cx, |this, cx| {
-            if let Some(buffer) = this.get_possibly_incomplete(buffer_id) {
-                buffer.update(cx, |buffer, cx| {
-                    buffer.did_reload(version, line_ending, mtime, cx);
-                });
-            }
-
-            if let Some((downstream_client, project_id)) = this.downstream_client.as_ref() {
-                downstream_client
-                    .send(proto::BufferReloaded {
-                        project_id: *project_id,
-                        buffer_id: buffer_id.into(),
-                        mtime: envelope.payload.mtime,
-                        version: envelope.payload.version,
-                        line_ending: envelope.payload.line_ending,
-                    })
-                    .log_err();
-            }
-        })
-    }
-
-    pub fn reload_buffers(
-        &self,
-        buffers: HashSet<Entity<Buffer>>,
-        push_to_history: bool,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<ProjectTransaction>> {
-        if buffers.is_empty() {
-            return Task::ready(Ok(ProjectTransaction::default()));
-        }
-        match &self.state {
-            BufferStoreState::Local(this) => this.reload_buffers(buffers, push_to_history, cx),
-            BufferStoreState::Remote(this) => this.reload_buffers(buffers, push_to_history, cx),
-        }
-    }
-
-    async fn handle_reload_buffers(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::ReloadBuffers>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::ReloadBuffersResponse> {
-        let sender_id = envelope.original_sender_id().unwrap_or_default();
-        let reload = this.update(&mut cx, |this, cx| {
-            let mut buffers = HashSet::default();
-            for buffer_id in &envelope.payload.buffer_ids {
-                let buffer_id = BufferId::new(*buffer_id)?;
-                buffers.insert(this.get_existing(buffer_id)?);
-            }
-            anyhow::Ok(this.reload_buffers(buffers, false, cx))
-        })??;
-
-        let project_transaction = reload.await?;
-        let project_transaction = this.update(&mut cx, |this, cx| {
-            this.serialize_project_transaction_for_peer(project_transaction, sender_id, cx)
-        })?;
-        Ok(proto::ReloadBuffersResponse {
-            transaction: Some(project_transaction),
-        })
-    }
-
-    pub fn create_buffer_for_peer(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        peer_id: proto::PeerId,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let buffer_id = buffer.read(cx).remote_id();
-        let shared_buffers = self.shared_buffers.entry(peer_id).or_default();
-        if shared_buffers.contains_key(&buffer_id) {
-            return Task::ready(Ok(()));
-        }
-        shared_buffers.insert(
-            buffer_id,
-            SharedBuffer {
-                buffer: buffer.clone(),
-                lsp_handle: None,
-            },
-        );
-
-        let Some((client, project_id)) = self.downstream_client.clone() else {
-            return Task::ready(Ok(()));
-        };
-
-        cx.spawn(async move |this, cx| {
-            let Some(buffer) = this.read_with(cx, |this, _| this.get(buffer_id))? else {
-                return anyhow::Ok(());
-            };
-
-            let operations = buffer.update(cx, |b, cx| b.serialize_ops(None, cx))?;
-            let operations = operations.await;
-            let state = buffer.update(cx, |buffer, cx| buffer.to_proto(cx))?;
-
-            let initial_state = proto::CreateBufferForPeer {
-                project_id,
-                peer_id: Some(peer_id),
-                variant: Some(proto::create_buffer_for_peer::Variant::State(state)),
-            };
-
-            if client.send(initial_state).log_err().is_some() {
-                let client = client.clone();
-                cx.background_spawn(async move {
-                    let mut chunks = split_operations(operations).peekable();
-                    while let Some(chunk) = chunks.next() {
-                        let is_last = chunks.peek().is_none();
-                        client.send(proto::CreateBufferForPeer {
-                            project_id,
-                            peer_id: Some(peer_id),
-                            variant: Some(proto::create_buffer_for_peer::Variant::Chunk(
-                                proto::BufferChunk {
-                                    buffer_id: buffer_id.into(),
-                                    operations: chunk,
-                                    is_last,
-                                },
-                            )),
-                        })?;
-                    }
-                    anyhow::Ok(())
-                })
-                .await
-                .log_err();
-            }
-            Ok(())
-        })
-    }
-
-    pub fn forget_shared_buffers(&mut self) {
-        self.shared_buffers.clear();
-    }
-
-    pub fn forget_shared_buffers_for(&mut self, peer_id: &proto::PeerId) {
-        self.shared_buffers.remove(peer_id);
-    }
-
-    pub fn update_peer_id(&mut self, old_peer_id: &proto::PeerId, new_peer_id: proto::PeerId) {
-        if let Some(buffers) = self.shared_buffers.remove(old_peer_id) {
-            self.shared_buffers.insert(new_peer_id, buffers);
-        }
-    }
-
-    pub fn has_shared_buffers(&self) -> bool {
-        !self.shared_buffers.is_empty()
-    }
-
-    pub fn create_local_buffer(
-        &mut self,
-        text: &str,
-        language: Option<Arc<Language>>,
-        project_searchable: bool,
-        cx: &mut Context<Self>,
-    ) -> Entity<Buffer> {
-        let buffer = cx.new(|cx| {
-            Buffer::local(text, cx)
-                .with_language(language.unwrap_or_else(|| language::PLAIN_TEXT.clone()), cx)
-        });
-
-        self.add_buffer(buffer.clone(), cx).log_err();
-        let buffer_id = buffer.read(cx).remote_id();
-        if !project_searchable {
-            self.non_searchable_buffers.insert(buffer_id);
-        }
-
-        if let Some(file) = File::from_dyn(buffer.read(cx).file()) {
-            self.path_to_buffer_id.insert(
-                ProjectPath {
-                    worktree_id: file.worktree_id(cx),
-                    path: file.path.clone(),
-                },
-                buffer_id,
-            );
-            let this = self
-                .as_local_mut()
-                .expect("local-only method called in a non-local context");
-            if let Some(entry_id) = file.entry_id {
-                this.local_buffer_ids_by_entry_id
-                    .insert(entry_id, buffer_id);
-            }
-        }
-        buffer
-    }
-
-    pub fn deserialize_project_transaction(
-        &mut self,
-        message: proto::ProjectTransaction,
-        push_to_history: bool,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<ProjectTransaction>> {
-        if let Some(this) = self.as_remote_mut() {
-            this.deserialize_project_transaction(message, push_to_history, cx)
-        } else {
-            debug_panic!("not a remote buffer store");
-            Task::ready(Err(anyhow!("not a remote buffer store")))
-        }
-    }
-
-    pub fn wait_for_remote_buffer(
-        &mut self,
-        id: BufferId,
-        cx: &mut Context<BufferStore>,
-    ) -> Task<Result<Entity<Buffer>>> {
-        if let Some(this) = self.as_remote_mut() {
-            this.wait_for_remote_buffer(id, cx)
-        } else {
-            debug_panic!("not a remote buffer store");
-            Task::ready(Err(anyhow!("not a remote buffer store")))
-        }
-    }
-
-    pub fn serialize_project_transaction_for_peer(
-        &mut self,
-        project_transaction: ProjectTransaction,
-        peer_id: proto::PeerId,
-        cx: &mut Context<Self>,
-    ) -> proto::ProjectTransaction {
-        let mut serialized_transaction = proto::ProjectTransaction {
-            buffer_ids: Default::default(),
-            transactions: Default::default(),
-        };
-        for (buffer, transaction) in project_transaction.0 {
-            self.create_buffer_for_peer(&buffer, peer_id, cx)
-                .detach_and_log_err(cx);
-            serialized_transaction
-                .buffer_ids
-                .push(buffer.read(cx).remote_id().into());
-            serialized_transaction
-                .transactions
-                .push(language::proto::serialize_transaction(&transaction));
-        }
-        serialized_transaction
-    }
-}
-
-impl OpenBuffer {
-    fn upgrade(&self) -> Option<Entity<Buffer>> {
-        match self {
-            OpenBuffer::Complete { buffer, .. } => buffer.upgrade(),
-            OpenBuffer::Operations(_) => None,
-        }
-    }
-}
-
-fn is_not_found_error(error: &anyhow::Error) -> bool {
-    error
-        .root_cause()
-        .downcast_ref::<io::Error>()
-        .is_some_and(|err| err.kind() == io::ErrorKind::NotFound)
-}
diff --git a/crates/project/src/color_extractor.rs b/crates/project/src/color_extractor.rs
deleted file mode 100644
index 6e9907e30b..0000000000
--- a/crates/project/src/color_extractor.rs
+++ /dev/null
@@ -1,295 +0,0 @@
-use std::sync::LazyLock;
-
-use gpui::{Hsla, Rgba};
-use lsp::{CompletionItem, Documentation};
-use regex::{Regex, RegexBuilder};
-
-const HEX: &str = r#"(#(?:[\da-fA-F]{3}){1,2})"#;
-const RGB_OR_HSL: &str = r#"(rgba?|hsla?)\(\s*(\d{1,3}%?)\s*,\s*(\d{1,3}%?)\s*,\s*(\d{1,3}%?)\s*(?:,\s*(1|0?\.\d+))?\s*\)"#;
-
-static RELAXED_HEX_REGEX: LazyLock<Regex> = LazyLock::new(|| {
-    RegexBuilder::new(HEX)
-        .case_insensitive(false)
-        .build()
-        .expect("Failed to create RELAXED_HEX_REGEX")
-});
-
-static STRICT_HEX_REGEX: LazyLock<Regex> = LazyLock::new(|| {
-    RegexBuilder::new(&format!("^{HEX}$"))
-        .case_insensitive(true)
-        .build()
-        .expect("Failed to create STRICT_HEX_REGEX")
-});
-
-static RELAXED_RGB_OR_HSL_REGEX: LazyLock<Regex> = LazyLock::new(|| {
-    RegexBuilder::new(RGB_OR_HSL)
-        .case_insensitive(false)
-        .build()
-        .expect("Failed to create RELAXED_RGB_OR_HSL_REGEX")
-});
-
-static STRICT_RGB_OR_HSL_REGEX: LazyLock<Regex> = LazyLock::new(|| {
-    RegexBuilder::new(&format!("^{RGB_OR_HSL}$"))
-        .case_insensitive(true)
-        .build()
-        .expect("Failed to create STRICT_RGB_OR_HSL_REGEX")
-});
-
-/// Extracts a color from an LSP [`CompletionItem`].
-///
-/// Adapted from https://github.com/microsoft/vscode/blob/a6870fcb6d79093738c17e8319b760cf1c41764a/src/vs/editor/contrib/suggest/browser/suggestWidgetRenderer.ts#L34-L61
-pub fn extract_color(item: &CompletionItem) -> Option<Hsla> {
-    // Try to extract from entire `label` field.
-    parse(&item.label, ParseMode::Strict)
-        // Try to extract from entire `detail` field.
-        .or_else(|| {
-            item.detail
-                .as_ref()
-                .and_then(|detail| parse(detail, ParseMode::Strict))
-        })
-        // Try to extract from beginning or end of `documentation` field.
-        .or_else(|| match item.documentation {
-            Some(Documentation::String(ref str)) => parse(str, ParseMode::Relaxed),
-            Some(Documentation::MarkupContent(ref markup)) => {
-                parse(&markup.value, ParseMode::Relaxed)
-            }
-            None => None,
-        })
-}
-
-enum ParseMode {
-    Strict,
-    Relaxed,
-}
-
-fn parse(str: &str, mode: ParseMode) -> Option<Hsla> {
-    let (hex, rgb) = match mode {
-        ParseMode::Strict => (&STRICT_HEX_REGEX, &STRICT_RGB_OR_HSL_REGEX),
-        ParseMode::Relaxed => (&RELAXED_HEX_REGEX, &RELAXED_RGB_OR_HSL_REGEX),
-    };
-
-    if let Some(captures) = hex.captures(str) {
-        let rmatch = captures.get(0)?;
-
-        // Color must be anchored to start or end of string.
-        if rmatch.start() > 0 && rmatch.end() != str.len() {
-            return None;
-        }
-
-        let hex = captures.get(1)?.as_str();
-
-        return from_hex(hex);
-    }
-
-    if let Some(captures) = rgb.captures(str) {
-        let rmatch = captures.get(0)?;
-
-        // Color must be anchored to start or end of string.
-        if rmatch.start() > 0 && rmatch.end() != str.len() {
-            return None;
-        }
-
-        let typ = captures.get(1)?.as_str();
-        let r_or_h = captures.get(2)?.as_str();
-        let g_or_s = captures.get(3)?.as_str();
-        let b_or_l = captures.get(4)?.as_str();
-        let a = captures.get(5).map(|a| a.as_str());
-
-        return match (typ, a) {
-            ("rgb", None) | ("rgba", Some(_)) => from_rgb(r_or_h, g_or_s, b_or_l, a),
-            ("hsl", None) | ("hsla", Some(_)) => from_hsl(r_or_h, g_or_s, b_or_l, a),
-            _ => None,
-        };
-    }
-
-    None
-}
-
-fn parse_component(value: &str, max: f32) -> Option<f32> {
-    if let Some(field) = value.strip_suffix("%") {
-        field.parse::<f32>().map(|value| value / 100.).ok()
-    } else {
-        value.parse::<f32>().map(|value| value / max).ok()
-    }
-}
-
-fn from_hex(hex: &str) -> Option<Hsla> {
-    Rgba::try_from(hex).map(Hsla::from).ok()
-}
-
-fn from_rgb(r: &str, g: &str, b: &str, a: Option<&str>) -> Option<Hsla> {
-    let r = parse_component(r, 255.)?;
-    let g = parse_component(g, 255.)?;
-    let b = parse_component(b, 255.)?;
-    let a = a.and_then(|a| parse_component(a, 1.0)).unwrap_or(1.0);
-
-    Some(Rgba { r, g, b, a }.into())
-}
-
-fn from_hsl(h: &str, s: &str, l: &str, a: Option<&str>) -> Option<Hsla> {
-    let h = parse_component(h, 360.)?;
-    let s = parse_component(s, 100.)?;
-    let l = parse_component(l, 100.)?;
-    let a = a.and_then(|a| parse_component(a, 1.0)).unwrap_or(1.0);
-
-    Some(Hsla { h, s, l, a })
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use gpui::rgba;
-    use lsp::{CompletionItem, CompletionItemKind};
-
-    pub const COLOR_TABLE: &[(&str, Option<u32>)] = &[
-        // -- Invalid --
-        // Invalid hex
-        ("f0f", None),
-        ("#fof", None),
-        // Extra field
-        ("rgb(255, 0, 0, 0.0)", None),
-        ("hsl(120, 0, 0, 0.0)", None),
-        // Missing field
-        ("rgba(255, 0, 0)", None),
-        ("hsla(120, 0, 0)", None),
-        // No decimal after zero
-        ("rgba(255, 0, 0, 0)", None),
-        ("hsla(120, 0, 0, 0)", None),
-        // Decimal after one
-        ("rgba(255, 0, 0, 1.0)", None),
-        ("hsla(120, 0, 0, 1.0)", None),
-        // HEX (sRGB)
-        ("#f0f", Some(0xFF00FFFF)),
-        ("#ff0000", Some(0xFF0000FF)),
-        // RGB / RGBA (sRGB)
-        ("rgb(255, 0, 0)", Some(0xFF0000FF)),
-        ("rgba(255, 0, 0, 0.4)", Some(0xFF000066)),
-        ("rgba(255, 0, 0, 1)", Some(0xFF0000FF)),
-        ("rgb(20%, 0%, 0%)", Some(0x330000FF)),
-        ("rgba(20%, 0%, 0%, 1)", Some(0x330000FF)),
-        ("rgb(0%, 20%, 0%)", Some(0x003300FF)),
-        ("rgba(0%, 20%, 0%, 1)", Some(0x003300FF)),
-        ("rgb(0%, 0%, 20%)", Some(0x000033FF)),
-        ("rgba(0%, 0%, 20%, 1)", Some(0x000033FF)),
-        // HSL / HSLA (sRGB)
-        ("hsl(0, 100%, 50%)", Some(0xFF0000FF)),
-        ("hsl(120, 100%, 50%)", Some(0x00FF00FF)),
-        ("hsla(0, 100%, 50%, 0.0)", Some(0xFF000000)),
-        ("hsla(0, 100%, 50%, 0.4)", Some(0xFF000066)),
-        ("hsla(0, 100%, 50%, 1)", Some(0xFF0000FF)),
-        ("hsla(120, 100%, 50%, 0.0)", Some(0x00FF0000)),
-        ("hsla(120, 100%, 50%, 0.4)", Some(0x00FF0066)),
-        ("hsla(120, 100%, 50%, 1)", Some(0x00FF00FF)),
-    ];
-
-    #[test]
-    fn can_extract_from_label() {
-        for (color_str, color_val) in COLOR_TABLE.iter() {
-            let color = extract_color(&CompletionItem {
-                kind: Some(CompletionItemKind::COLOR),
-                label: color_str.to_string(),
-                detail: None,
-                documentation: None,
-                ..Default::default()
-            });
-
-            assert_eq!(color, color_val.map(|v| Hsla::from(rgba(v))));
-        }
-    }
-
-    #[test]
-    fn only_whole_label_matches_are_allowed() {
-        for (color_str, _) in COLOR_TABLE.iter() {
-            let color = extract_color(&CompletionItem {
-                kind: Some(CompletionItemKind::COLOR),
-                label: format!("{} foo", color_str).to_string(),
-                detail: None,
-                documentation: None,
-                ..Default::default()
-            });
-
-            assert_eq!(color, None);
-        }
-    }
-
-    #[test]
-    fn can_extract_from_detail() {
-        for (color_str, color_val) in COLOR_TABLE.iter() {
-            let color = extract_color(&CompletionItem {
-                kind: Some(CompletionItemKind::COLOR),
-                label: "".to_string(),
-                detail: Some(color_str.to_string()),
-                documentation: None,
-                ..Default::default()
-            });
-
-            assert_eq!(color, color_val.map(|v| Hsla::from(rgba(v))));
-        }
-    }
-
-    #[test]
-    fn only_whole_detail_matches_are_allowed() {
-        for (color_str, _) in COLOR_TABLE.iter() {
-            let color = extract_color(&CompletionItem {
-                kind: Some(CompletionItemKind::COLOR),
-                label: "".to_string(),
-                detail: Some(format!("{} foo", color_str).to_string()),
-                documentation: None,
-                ..Default::default()
-            });
-
-            assert_eq!(color, None);
-        }
-    }
-
-    #[test]
-    fn can_extract_from_documentation_start() {
-        for (color_str, color_val) in COLOR_TABLE.iter() {
-            let color = extract_color(&CompletionItem {
-                kind: Some(CompletionItemKind::COLOR),
-                label: "".to_string(),
-                detail: None,
-                documentation: Some(Documentation::String(
-                    format!("{} foo", color_str).to_string(),
-                )),
-                ..Default::default()
-            });
-
-            assert_eq!(color, color_val.map(|v| Hsla::from(rgba(v))));
-        }
-    }
-
-    #[test]
-    fn can_extract_from_documentation_end() {
-        for (color_str, color_val) in COLOR_TABLE.iter() {
-            let color = extract_color(&CompletionItem {
-                kind: Some(CompletionItemKind::COLOR),
-                label: "".to_string(),
-                detail: None,
-                documentation: Some(Documentation::String(
-                    format!("foo {}", color_str).to_string(),
-                )),
-                ..Default::default()
-            });
-
-            assert_eq!(color, color_val.map(|v| Hsla::from(rgba(v))));
-        }
-    }
-
-    #[test]
-    fn cannot_extract_from_documentation_middle() {
-        for (color_str, _) in COLOR_TABLE.iter() {
-            let color = extract_color(&CompletionItem {
-                kind: Some(CompletionItemKind::COLOR),
-                label: "".to_string(),
-                detail: None,
-                documentation: Some(Documentation::String(
-                    format!("foo {} foo", color_str).to_string(),
-                )),
-                ..Default::default()
-            });
-
-            assert_eq!(color, None);
-        }
-    }
-}
diff --git a/crates/project/src/connection_manager.rs b/crates/project/src/connection_manager.rs
deleted file mode 100644
index 253d5d32a1..0000000000
--- a/crates/project/src/connection_manager.rs
+++ /dev/null
@@ -1,223 +0,0 @@
-use super::Project;
-use anyhow::Result;
-use client::Client;
-use collections::{HashMap, HashSet};
-use futures::{FutureExt, StreamExt};
-use gpui::{App, AppContext as _, AsyncApp, Context, Entity, Global, Task, WeakEntity};
-use postage::stream::Stream;
-use rpc::proto;
-use std::{sync::Arc, time::Duration};
-use util::ResultExt;
-
-impl Global for GlobalManager {}
-struct GlobalManager(Entity<Manager>);
-
-pub const RECONNECT_TIMEOUT: Duration = Duration::from_secs(30);
-
-pub struct Manager {
-    client: Arc<Client>,
-    maintain_connection: Option<Task<Option<()>>>,
-    projects: HashSet<WeakEntity<Project>>,
-}
-
-pub fn init(client: Arc<Client>, cx: &mut App) {
-    let manager = cx.new(|_| Manager {
-        client,
-        maintain_connection: None,
-        projects: HashSet::default(),
-    });
-    cx.set_global(GlobalManager(manager));
-}
-
-impl Manager {
-    pub fn global(cx: &App) -> Entity<Manager> {
-        cx.global::<GlobalManager>().0.clone()
-    }
-
-    pub fn maintain_project_connection(
-        &mut self,
-        project: &Entity<Project>,
-        cx: &mut Context<Self>,
-    ) {
-        let manager = cx.weak_entity();
-        project.update(cx, |_, cx| {
-            let manager = manager.clone();
-            cx.on_release(move |project, cx| {
-                manager
-                    .update(cx, |manager, cx| {
-                        manager.projects.retain(|p| {
-                            if let Some(p) = p.upgrade() {
-                                p.read(cx).remote_id() != project.remote_id()
-                            } else {
-                                false
-                            }
-                        });
-                        if manager.projects.is_empty() {
-                            manager.maintain_connection.take();
-                        }
-                    })
-                    .ok();
-            })
-            .detach();
-        });
-
-        self.projects.insert(project.downgrade());
-        if self.maintain_connection.is_none() {
-            self.maintain_connection = Some(cx.spawn({
-                let client = self.client.clone();
-                async move |_, cx| {
-                    Self::maintain_connection(manager, client.clone(), cx)
-                        .await
-                        .log_err()
-                }
-            }));
-        }
-    }
-
-    fn reconnected(&mut self, cx: &mut Context<Self>) -> Task<Result<()>> {
-        let mut projects = HashMap::default();
-
-        let request = self.client.request_envelope(proto::RejoinRemoteProjects {
-            rejoined_projects: self
-                .projects
-                .iter()
-                .filter_map(|project| {
-                    if let Some(handle) = project.upgrade() {
-                        let project = handle.read(cx);
-                        let project_id = project.remote_id()?;
-                        projects.insert(project_id, handle.clone());
-                        let mut worktrees = Vec::new();
-                        let mut repositories = Vec::new();
-                        for (id, repository) in project.repositories(cx) {
-                            repositories.push(proto::RejoinRepository {
-                                id: id.to_proto(),
-                                scan_id: repository.read(cx).scan_id,
-                            });
-                        }
-                        for worktree in project.worktrees(cx) {
-                            let worktree = worktree.read(cx);
-                            worktrees.push(proto::RejoinWorktree {
-                                id: worktree.id().to_proto(),
-                                scan_id: worktree.completed_scan_id() as u64,
-                            });
-                        }
-                        Some(proto::RejoinProject {
-                            id: project_id,
-                            worktrees,
-                            repositories,
-                        })
-                    } else {
-                        None
-                    }
-                })
-                .collect(),
-        });
-
-        cx.spawn(async move |this, cx| {
-            let response = request.await?;
-            let message_id = response.message_id;
-
-            this.update(cx, |_, cx| {
-                for rejoined_project in response.payload.rejoined_projects {
-                    if let Some(project) = projects.get(&rejoined_project.id) {
-                        project.update(cx, |project, cx| {
-                            project.rejoined(rejoined_project, message_id, cx).log_err();
-                        });
-                    }
-                }
-            })
-        })
-    }
-
-    fn connection_lost(&mut self, cx: &mut Context<Self>) {
-        for project in self.projects.drain() {
-            if let Some(project) = project.upgrade() {
-                project.update(cx, |project, cx| {
-                    project.disconnected_from_host(cx);
-                    project.close(cx);
-                });
-            }
-        }
-        self.maintain_connection.take();
-    }
-
-    async fn maintain_connection(
-        this: WeakEntity<Self>,
-        client: Arc<Client>,
-        cx: &mut AsyncApp,
-    ) -> Result<()> {
-        let mut client_status = client.status();
-        loop {
-            let _ = client_status.try_recv();
-
-            let is_connected = client_status.borrow().is_connected();
-            // Even if we're initially connected, any future change of the status means we momentarily disconnected.
-            if !is_connected || client_status.next().await.is_some() {
-                log::info!("detected client disconnection");
-
-                // Wait for client to re-establish a connection to the server.
-                {
-                    let mut reconnection_timeout =
-                        cx.background_executor().timer(RECONNECT_TIMEOUT).fuse();
-                    let client_reconnection = async {
-                        let mut remaining_attempts = 3;
-                        while remaining_attempts > 0 {
-                            if client_status.borrow().is_connected() {
-                                log::info!("client reconnected, attempting to rejoin projects");
-
-                                let Some(this) = this.upgrade() else { break };
-                                match this.update(cx, |this, cx| this.reconnected(cx)) {
-                                    Ok(task) => {
-                                        if task.await.log_err().is_some() {
-                                            return true;
-                                        } else {
-                                            remaining_attempts -= 1;
-                                        }
-                                    }
-                                    Err(_app_dropped) => return false,
-                                }
-                            } else if client_status.borrow().is_signed_out() {
-                                return false;
-                            }
-
-                            log::info!(
-                                "waiting for client status change, remaining attempts {}",
-                                remaining_attempts
-                            );
-                            client_status.next().await;
-                        }
-                        false
-                    }
-                    .fuse();
-                    futures::pin_mut!(client_reconnection);
-
-                    futures::select_biased! {
-                        reconnected = client_reconnection => {
-                            if reconnected {
-                                log::info!("successfully reconnected");
-                                // If we successfully joined the room, go back around the loop
-                                // waiting for future connection status changes.
-                                continue;
-                            }
-                        }
-                        _ = reconnection_timeout => {
-                            log::info!("rejoin project reconnection timeout expired");
-                        }
-                    }
-                }
-
-                break;
-            }
-        }
-
-        // The client failed to re-establish a connection to the server
-        // or an error occurred while trying to re-join the room. Either way
-        // we leave the room and return an error.
-        if let Some(this) = this.upgrade() {
-            log::info!("reconnection failed, disconnecting projects");
-            this.update(cx, |this, cx| this.connection_lost(cx))?;
-        }
-
-        Ok(())
-    }
-}
diff --git a/crates/project/src/context_server_store.rs b/crates/project/src/context_server_store.rs
deleted file mode 100644
index 7ba46a4687..0000000000
--- a/crates/project/src/context_server_store.rs
+++ /dev/null
@@ -1,1437 +0,0 @@
-pub mod extension;
-pub mod registry;
-
-use std::sync::Arc;
-
-use anyhow::{Context as _, Result};
-use collections::{HashMap, HashSet};
-use context_server::{ContextServer, ContextServerCommand, ContextServerId};
-use futures::{FutureExt as _, future::join_all};
-use gpui::{App, AsyncApp, Context, Entity, EventEmitter, Subscription, Task, WeakEntity, actions};
-use registry::ContextServerDescriptorRegistry;
-use settings::{Settings as _, SettingsStore};
-use util::{ResultExt as _, rel_path::RelPath};
-
-use crate::{
-    Project,
-    project_settings::{ContextServerSettings, ProjectSettings},
-    worktree_store::WorktreeStore,
-};
-
-pub fn init(cx: &mut App) {
-    extension::init(cx);
-}
-
-actions!(
-    context_server,
-    [
-        /// Restarts the context server.
-        Restart
-    ]
-);
-
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub enum ContextServerStatus {
-    Starting,
-    Running,
-    Stopped,
-    Error(Arc<str>),
-}
-
-impl ContextServerStatus {
-    fn from_state(state: &ContextServerState) -> Self {
-        match state {
-            ContextServerState::Starting { .. } => ContextServerStatus::Starting,
-            ContextServerState::Running { .. } => ContextServerStatus::Running,
-            ContextServerState::Stopped { .. } => ContextServerStatus::Stopped,
-            ContextServerState::Error { error, .. } => ContextServerStatus::Error(error.clone()),
-        }
-    }
-}
-
-enum ContextServerState {
-    Starting {
-        server: Arc<ContextServer>,
-        configuration: Arc<ContextServerConfiguration>,
-        _task: Task<()>,
-    },
-    Running {
-        server: Arc<ContextServer>,
-        configuration: Arc<ContextServerConfiguration>,
-    },
-    Stopped {
-        server: Arc<ContextServer>,
-        configuration: Arc<ContextServerConfiguration>,
-    },
-    Error {
-        server: Arc<ContextServer>,
-        configuration: Arc<ContextServerConfiguration>,
-        error: Arc<str>,
-    },
-}
-
-impl ContextServerState {
-    pub fn server(&self) -> Arc<ContextServer> {
-        match self {
-            ContextServerState::Starting { server, .. } => server.clone(),
-            ContextServerState::Running { server, .. } => server.clone(),
-            ContextServerState::Stopped { server, .. } => server.clone(),
-            ContextServerState::Error { server, .. } => server.clone(),
-        }
-    }
-
-    pub fn configuration(&self) -> Arc<ContextServerConfiguration> {
-        match self {
-            ContextServerState::Starting { configuration, .. } => configuration.clone(),
-            ContextServerState::Running { configuration, .. } => configuration.clone(),
-            ContextServerState::Stopped { configuration, .. } => configuration.clone(),
-            ContextServerState::Error { configuration, .. } => configuration.clone(),
-        }
-    }
-}
-
-#[derive(Debug, PartialEq, Eq)]
-pub enum ContextServerConfiguration {
-    Custom {
-        command: ContextServerCommand,
-    },
-    Extension {
-        command: ContextServerCommand,
-        settings: serde_json::Value,
-    },
-    Http {
-        url: url::Url,
-        headers: HashMap<String, String>,
-    },
-}
-
-impl ContextServerConfiguration {
-    pub fn command(&self) -> Option<&ContextServerCommand> {
-        match self {
-            ContextServerConfiguration::Custom { command } => Some(command),
-            ContextServerConfiguration::Extension { command, .. } => Some(command),
-            ContextServerConfiguration::Http { .. } => None,
-        }
-    }
-
-    pub async fn from_settings(
-        settings: ContextServerSettings,
-        id: ContextServerId,
-        registry: Entity<ContextServerDescriptorRegistry>,
-        worktree_store: Entity<WorktreeStore>,
-        cx: &AsyncApp,
-    ) -> Option<Self> {
-        match settings {
-            ContextServerSettings::Stdio {
-                enabled: _,
-                command,
-            } => Some(ContextServerConfiguration::Custom { command }),
-            ContextServerSettings::Extension {
-                enabled: _,
-                settings,
-            } => {
-                let descriptor = cx
-                    .update(|cx| registry.read(cx).context_server_descriptor(&id.0))
-                    .ok()
-                    .flatten()?;
-
-                match descriptor.command(worktree_store, cx).await {
-                    Ok(command) => {
-                        Some(ContextServerConfiguration::Extension { command, settings })
-                    }
-                    Err(e) => {
-                        log::error!(
-                            "Failed to create context server configuration from settings: {e:#}"
-                        );
-                        None
-                    }
-                }
-            }
-            ContextServerSettings::Http {
-                enabled: _,
-                url,
-                headers: auth,
-            } => {
-                let url = url::Url::parse(&url).log_err()?;
-                Some(ContextServerConfiguration::Http { url, headers: auth })
-            }
-        }
-    }
-}
-
-pub type ContextServerFactory =
-    Box<dyn Fn(ContextServerId, Arc<ContextServerConfiguration>) -> Arc<ContextServer>>;
-
-pub struct ContextServerStore {
-    context_server_settings: HashMap<Arc<str>, ContextServerSettings>,
-    servers: HashMap<ContextServerId, ContextServerState>,
-    worktree_store: Entity<WorktreeStore>,
-    project: WeakEntity<Project>,
-    registry: Entity<ContextServerDescriptorRegistry>,
-    update_servers_task: Option<Task<Result<()>>>,
-    context_server_factory: Option<ContextServerFactory>,
-    needs_server_update: bool,
-    _subscriptions: Vec<Subscription>,
-}
-
-pub enum Event {
-    ServerStatusChanged {
-        server_id: ContextServerId,
-        status: ContextServerStatus,
-    },
-}
-
-impl EventEmitter<Event> for ContextServerStore {}
-
-impl ContextServerStore {
-    pub fn new(
-        worktree_store: Entity<WorktreeStore>,
-        weak_project: WeakEntity<Project>,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        Self::new_internal(
-            true,
-            None,
-            ContextServerDescriptorRegistry::default_global(cx),
-            worktree_store,
-            weak_project,
-            cx,
-        )
-    }
-
-    /// Returns all configured context server ids, excluding the ones that are disabled
-    pub fn configured_server_ids(&self) -> Vec<ContextServerId> {
-        self.context_server_settings
-            .iter()
-            .filter(|(_, settings)| settings.enabled())
-            .map(|(id, _)| ContextServerId(id.clone()))
-            .collect()
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn test(
-        registry: Entity<ContextServerDescriptorRegistry>,
-        worktree_store: Entity<WorktreeStore>,
-        weak_project: WeakEntity<Project>,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        Self::new_internal(false, None, registry, worktree_store, weak_project, cx)
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn test_maintain_server_loop(
-        context_server_factory: Option<ContextServerFactory>,
-        registry: Entity<ContextServerDescriptorRegistry>,
-        worktree_store: Entity<WorktreeStore>,
-        weak_project: WeakEntity<Project>,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        Self::new_internal(
-            true,
-            context_server_factory,
-            registry,
-            worktree_store,
-            weak_project,
-            cx,
-        )
-    }
-
-    fn new_internal(
-        maintain_server_loop: bool,
-        context_server_factory: Option<ContextServerFactory>,
-        registry: Entity<ContextServerDescriptorRegistry>,
-        worktree_store: Entity<WorktreeStore>,
-        weak_project: WeakEntity<Project>,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let subscriptions = if maintain_server_loop {
-            vec![
-                cx.observe(&registry, |this, _registry, cx| {
-                    this.available_context_servers_changed(cx);
-                }),
-                cx.observe_global::<SettingsStore>(|this, cx| {
-                    let settings = Self::resolve_context_server_settings(&this.worktree_store, cx);
-                    if &this.context_server_settings == settings {
-                        return;
-                    }
-                    this.context_server_settings = settings.clone();
-                    this.available_context_servers_changed(cx);
-                }),
-            ]
-        } else {
-            Vec::new()
-        };
-
-        let mut this = Self {
-            _subscriptions: subscriptions,
-            context_server_settings: Self::resolve_context_server_settings(&worktree_store, cx)
-                .clone(),
-            worktree_store,
-            project: weak_project,
-            registry,
-            needs_server_update: false,
-            servers: HashMap::default(),
-            update_servers_task: None,
-            context_server_factory,
-        };
-        if maintain_server_loop {
-            this.available_context_servers_changed(cx);
-        }
-        this
-    }
-
-    pub fn get_server(&self, id: &ContextServerId) -> Option<Arc<ContextServer>> {
-        self.servers.get(id).map(|state| state.server())
-    }
-
-    pub fn get_running_server(&self, id: &ContextServerId) -> Option<Arc<ContextServer>> {
-        if let Some(ContextServerState::Running { server, .. }) = self.servers.get(id) {
-            Some(server.clone())
-        } else {
-            None
-        }
-    }
-
-    pub fn status_for_server(&self, id: &ContextServerId) -> Option<ContextServerStatus> {
-        self.servers.get(id).map(ContextServerStatus::from_state)
-    }
-
-    pub fn configuration_for_server(
-        &self,
-        id: &ContextServerId,
-    ) -> Option<Arc<ContextServerConfiguration>> {
-        self.servers.get(id).map(|state| state.configuration())
-    }
-
-    pub fn server_ids(&self, cx: &App) -> HashSet<ContextServerId> {
-        self.servers
-            .keys()
-            .cloned()
-            .chain(
-                self.registry
-                    .read(cx)
-                    .context_server_descriptors()
-                    .into_iter()
-                    .map(|(id, _)| ContextServerId(id)),
-            )
-            .collect()
-    }
-
-    pub fn running_servers(&self) -> Vec<Arc<ContextServer>> {
-        self.servers
-            .values()
-            .filter_map(|state| {
-                if let ContextServerState::Running { server, .. } = state {
-                    Some(server.clone())
-                } else {
-                    None
-                }
-            })
-            .collect()
-    }
-
-    pub fn start_server(&mut self, server: Arc<ContextServer>, cx: &mut Context<Self>) {
-        cx.spawn(async move |this, cx| {
-            let this = this.upgrade().context("Context server store dropped")?;
-            let settings = this
-                .update(cx, |this, _| {
-                    this.context_server_settings.get(&server.id().0).cloned()
-                })
-                .ok()
-                .flatten()
-                .context("Failed to get context server settings")?;
-
-            if !settings.enabled() {
-                return Ok(());
-            }
-
-            let (registry, worktree_store) = this.update(cx, |this, _| {
-                (this.registry.clone(), this.worktree_store.clone())
-            })?;
-            let configuration = ContextServerConfiguration::from_settings(
-                settings,
-                server.id(),
-                registry,
-                worktree_store,
-                cx,
-            )
-            .await
-            .context("Failed to create context server configuration")?;
-
-            this.update(cx, |this, cx| {
-                this.run_server(server, Arc::new(configuration), cx)
-            })
-        })
-        .detach_and_log_err(cx);
-    }
-
-    pub fn stop_server(&mut self, id: &ContextServerId, cx: &mut Context<Self>) -> Result<()> {
-        if matches!(
-            self.servers.get(id),
-            Some(ContextServerState::Stopped { .. })
-        ) {
-            return Ok(());
-        }
-
-        let state = self
-            .servers
-            .remove(id)
-            .context("Context server not found")?;
-
-        let server = state.server();
-        let configuration = state.configuration();
-        let mut result = Ok(());
-        if let ContextServerState::Running { server, .. } = &state {
-            result = server.stop();
-        }
-        drop(state);
-
-        self.update_server_state(
-            id.clone(),
-            ContextServerState::Stopped {
-                configuration,
-                server,
-            },
-            cx,
-        );
-
-        result
-    }
-
-    fn run_server(
-        &mut self,
-        server: Arc<ContextServer>,
-        configuration: Arc<ContextServerConfiguration>,
-        cx: &mut Context<Self>,
-    ) {
-        let id = server.id();
-        if matches!(
-            self.servers.get(&id),
-            Some(ContextServerState::Starting { .. } | ContextServerState::Running { .. })
-        ) {
-            self.stop_server(&id, cx).log_err();
-        }
-        let task = cx.spawn({
-            let id = server.id();
-            let server = server.clone();
-            let configuration = configuration.clone();
-
-            async move |this, cx| {
-                match server.clone().start(cx).await {
-                    Ok(_) => {
-                        debug_assert!(server.client().is_some());
-
-                        this.update(cx, |this, cx| {
-                            this.update_server_state(
-                                id.clone(),
-                                ContextServerState::Running {
-                                    server,
-                                    configuration,
-                                },
-                                cx,
-                            )
-                        })
-                        .log_err()
-                    }
-                    Err(err) => {
-                        log::error!("{} context server failed to start: {}", id, err);
-                        this.update(cx, |this, cx| {
-                            this.update_server_state(
-                                id.clone(),
-                                ContextServerState::Error {
-                                    configuration,
-                                    server,
-                                    error: err.to_string().into(),
-                                },
-                                cx,
-                            )
-                        })
-                        .log_err()
-                    }
-                };
-            }
-        });
-
-        self.update_server_state(
-            id.clone(),
-            ContextServerState::Starting {
-                configuration,
-                _task: task,
-                server,
-            },
-            cx,
-        );
-    }
-
-    fn remove_server(&mut self, id: &ContextServerId, cx: &mut Context<Self>) -> Result<()> {
-        let state = self
-            .servers
-            .remove(id)
-            .context("Context server not found")?;
-        drop(state);
-        cx.emit(Event::ServerStatusChanged {
-            server_id: id.clone(),
-            status: ContextServerStatus::Stopped,
-        });
-        Ok(())
-    }
-
-    fn create_context_server(
-        &self,
-        id: ContextServerId,
-        configuration: Arc<ContextServerConfiguration>,
-        cx: &mut Context<Self>,
-    ) -> Result<Arc<ContextServer>> {
-        if let Some(factory) = self.context_server_factory.as_ref() {
-            return Ok(factory(id, configuration));
-        }
-
-        match configuration.as_ref() {
-            ContextServerConfiguration::Http { url, headers } => Ok(Arc::new(ContextServer::http(
-                id,
-                url,
-                headers.clone(),
-                cx.http_client(),
-                cx.background_executor().clone(),
-            )?)),
-            _ => {
-                let root_path = self
-                    .project
-                    .read_with(cx, |project, cx| project.active_project_directory(cx))
-                    .ok()
-                    .flatten()
-                    .or_else(|| {
-                        self.worktree_store.read_with(cx, |store, cx| {
-                            store.visible_worktrees(cx).fold(None, |acc, item| {
-                                if acc.is_none() {
-                                    item.read(cx).root_dir()
-                                } else {
-                                    acc
-                                }
-                            })
-                        })
-                    });
-                Ok(Arc::new(ContextServer::stdio(
-                    id,
-                    configuration.command().unwrap().clone(),
-                    root_path,
-                )))
-            }
-        }
-    }
-
-    fn resolve_context_server_settings<'a>(
-        worktree_store: &'a Entity<WorktreeStore>,
-        cx: &'a App,
-    ) -> &'a HashMap<Arc<str>, ContextServerSettings> {
-        let location = worktree_store
-            .read(cx)
-            .visible_worktrees(cx)
-            .next()
-            .map(|worktree| settings::SettingsLocation {
-                worktree_id: worktree.read(cx).id(),
-                path: RelPath::empty(),
-            });
-        &ProjectSettings::get(location, cx).context_servers
-    }
-
-    fn update_server_state(
-        &mut self,
-        id: ContextServerId,
-        state: ContextServerState,
-        cx: &mut Context<Self>,
-    ) {
-        let status = ContextServerStatus::from_state(&state);
-        self.servers.insert(id.clone(), state);
-        cx.emit(Event::ServerStatusChanged {
-            server_id: id,
-            status,
-        });
-    }
-
-    fn available_context_servers_changed(&mut self, cx: &mut Context<Self>) {
-        if self.update_servers_task.is_some() {
-            self.needs_server_update = true;
-        } else {
-            self.needs_server_update = false;
-            self.update_servers_task = Some(cx.spawn(async move |this, cx| {
-                if let Err(err) = Self::maintain_servers(this.clone(), cx).await {
-                    log::error!("Error maintaining context servers: {}", err);
-                }
-
-                this.update(cx, |this, cx| {
-                    this.update_servers_task.take();
-                    if this.needs_server_update {
-                        this.available_context_servers_changed(cx);
-                    }
-                })?;
-
-                Ok(())
-            }));
-        }
-    }
-
-    async fn maintain_servers(this: WeakEntity<Self>, cx: &mut AsyncApp) -> Result<()> {
-        let (mut configured_servers, registry, worktree_store) = this.update(cx, |this, _| {
-            (
-                this.context_server_settings.clone(),
-                this.registry.clone(),
-                this.worktree_store.clone(),
-            )
-        })?;
-
-        for (id, _) in
-            registry.read_with(cx, |registry, _| registry.context_server_descriptors())?
-        {
-            configured_servers
-                .entry(id)
-                .or_insert(ContextServerSettings::default_extension());
-        }
-
-        let (enabled_servers, disabled_servers): (HashMap<_, _>, HashMap<_, _>) =
-            configured_servers
-                .into_iter()
-                .partition(|(_, settings)| settings.enabled());
-
-        let configured_servers = join_all(enabled_servers.into_iter().map(|(id, settings)| {
-            let id = ContextServerId(id);
-            ContextServerConfiguration::from_settings(
-                settings,
-                id.clone(),
-                registry.clone(),
-                worktree_store.clone(),
-                cx,
-            )
-            .map(|config| (id, config))
-        }))
-        .await
-        .into_iter()
-        .filter_map(|(id, config)| config.map(|config| (id, config)))
-        .collect::<HashMap<_, _>>();
-
-        let mut servers_to_start = Vec::new();
-        let mut servers_to_remove = HashSet::default();
-        let mut servers_to_stop = HashSet::default();
-
-        this.update(cx, |this, cx| {
-            for server_id in this.servers.keys() {
-                // All servers that are not in desired_servers should be removed from the store.
-                // This can happen if the user removed a server from the context server settings.
-                if !configured_servers.contains_key(server_id) {
-                    if disabled_servers.contains_key(&server_id.0) {
-                        servers_to_stop.insert(server_id.clone());
-                    } else {
-                        servers_to_remove.insert(server_id.clone());
-                    }
-                }
-            }
-
-            for (id, config) in configured_servers {
-                let state = this.servers.get(&id);
-                let is_stopped = matches!(state, Some(ContextServerState::Stopped { .. }));
-                let existing_config = state.as_ref().map(|state| state.configuration());
-                if existing_config.as_deref() != Some(&config) || is_stopped {
-                    let config = Arc::new(config);
-                    let server = this.create_context_server(id.clone(), config.clone(), cx)?;
-                    servers_to_start.push((server, config));
-                    if this.servers.contains_key(&id) {
-                        servers_to_stop.insert(id);
-                    }
-                }
-            }
-
-            anyhow::Ok(())
-        })??;
-
-        this.update(cx, |this, cx| {
-            for id in servers_to_stop {
-                this.stop_server(&id, cx)?;
-            }
-            for id in servers_to_remove {
-                this.remove_server(&id, cx)?;
-            }
-            for (server, config) in servers_to_start {
-                this.run_server(server, config, cx);
-            }
-            anyhow::Ok(())
-        })?
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::{
-        FakeFs, Project, context_server_store::registry::ContextServerDescriptor,
-        project_settings::ProjectSettings,
-    };
-    use context_server::test::create_fake_transport;
-    use gpui::{AppContext, TestAppContext, UpdateGlobal as _};
-    use http_client::{FakeHttpClient, Response};
-    use serde_json::json;
-    use std::{cell::RefCell, path::PathBuf, rc::Rc};
-    use util::path;
-
-    #[gpui::test]
-    async fn test_context_server_status(cx: &mut TestAppContext) {
-        const SERVER_1_ID: &str = "mcp-1";
-        const SERVER_2_ID: &str = "mcp-2";
-
-        let (_fs, project) = setup_context_server_test(
-            cx,
-            json!({"code.rs": ""}),
-            vec![
-                (SERVER_1_ID.into(), dummy_server_settings()),
-                (SERVER_2_ID.into(), dummy_server_settings()),
-            ],
-        )
-        .await;
-
-        let registry = cx.new(|_| ContextServerDescriptorRegistry::new());
-        let store = cx.new(|cx| {
-            ContextServerStore::test(
-                registry.clone(),
-                project.read(cx).worktree_store(),
-                project.downgrade(),
-                cx,
-            )
-        });
-
-        let server_1_id = ContextServerId(SERVER_1_ID.into());
-        let server_2_id = ContextServerId(SERVER_2_ID.into());
-
-        let server_1 = Arc::new(ContextServer::new(
-            server_1_id.clone(),
-            Arc::new(create_fake_transport(SERVER_1_ID, cx.executor())),
-        ));
-        let server_2 = Arc::new(ContextServer::new(
-            server_2_id.clone(),
-            Arc::new(create_fake_transport(SERVER_2_ID, cx.executor())),
-        ));
-
-        store.update(cx, |store, cx| store.start_server(server_1, cx));
-
-        cx.run_until_parked();
-
-        cx.update(|cx| {
-            assert_eq!(
-                store.read(cx).status_for_server(&server_1_id),
-                Some(ContextServerStatus::Running)
-            );
-            assert_eq!(store.read(cx).status_for_server(&server_2_id), None);
-        });
-
-        store.update(cx, |store, cx| store.start_server(server_2.clone(), cx));
-
-        cx.run_until_parked();
-
-        cx.update(|cx| {
-            assert_eq!(
-                store.read(cx).status_for_server(&server_1_id),
-                Some(ContextServerStatus::Running)
-            );
-            assert_eq!(
-                store.read(cx).status_for_server(&server_2_id),
-                Some(ContextServerStatus::Running)
-            );
-        });
-
-        store
-            .update(cx, |store, cx| store.stop_server(&server_2_id, cx))
-            .unwrap();
-
-        cx.update(|cx| {
-            assert_eq!(
-                store.read(cx).status_for_server(&server_1_id),
-                Some(ContextServerStatus::Running)
-            );
-            assert_eq!(
-                store.read(cx).status_for_server(&server_2_id),
-                Some(ContextServerStatus::Stopped)
-            );
-        });
-    }
-
-    #[gpui::test]
-    async fn test_context_server_status_events(cx: &mut TestAppContext) {
-        const SERVER_1_ID: &str = "mcp-1";
-        const SERVER_2_ID: &str = "mcp-2";
-
-        let (_fs, project) = setup_context_server_test(
-            cx,
-            json!({"code.rs": ""}),
-            vec![
-                (SERVER_1_ID.into(), dummy_server_settings()),
-                (SERVER_2_ID.into(), dummy_server_settings()),
-            ],
-        )
-        .await;
-
-        let registry = cx.new(|_| ContextServerDescriptorRegistry::new());
-        let store = cx.new(|cx| {
-            ContextServerStore::test(
-                registry.clone(),
-                project.read(cx).worktree_store(),
-                project.downgrade(),
-                cx,
-            )
-        });
-
-        let server_1_id = ContextServerId(SERVER_1_ID.into());
-        let server_2_id = ContextServerId(SERVER_2_ID.into());
-
-        let server_1 = Arc::new(ContextServer::new(
-            server_1_id.clone(),
-            Arc::new(create_fake_transport(SERVER_1_ID, cx.executor())),
-        ));
-        let server_2 = Arc::new(ContextServer::new(
-            server_2_id.clone(),
-            Arc::new(create_fake_transport(SERVER_2_ID, cx.executor())),
-        ));
-
-        let _server_events = assert_server_events(
-            &store,
-            vec![
-                (server_1_id.clone(), ContextServerStatus::Starting),
-                (server_1_id, ContextServerStatus::Running),
-                (server_2_id.clone(), ContextServerStatus::Starting),
-                (server_2_id.clone(), ContextServerStatus::Running),
-                (server_2_id.clone(), ContextServerStatus::Stopped),
-            ],
-            cx,
-        );
-
-        store.update(cx, |store, cx| store.start_server(server_1, cx));
-
-        cx.run_until_parked();
-
-        store.update(cx, |store, cx| store.start_server(server_2.clone(), cx));
-
-        cx.run_until_parked();
-
-        store
-            .update(cx, |store, cx| store.stop_server(&server_2_id, cx))
-            .unwrap();
-    }
-
-    #[gpui::test(iterations = 25)]
-    async fn test_context_server_concurrent_starts(cx: &mut TestAppContext) {
-        const SERVER_1_ID: &str = "mcp-1";
-
-        let (_fs, project) = setup_context_server_test(
-            cx,
-            json!({"code.rs": ""}),
-            vec![(SERVER_1_ID.into(), dummy_server_settings())],
-        )
-        .await;
-
-        let registry = cx.new(|_| ContextServerDescriptorRegistry::new());
-        let store = cx.new(|cx| {
-            ContextServerStore::test(
-                registry.clone(),
-                project.read(cx).worktree_store(),
-                project.downgrade(),
-                cx,
-            )
-        });
-
-        let server_id = ContextServerId(SERVER_1_ID.into());
-
-        let server_with_same_id_1 = Arc::new(ContextServer::new(
-            server_id.clone(),
-            Arc::new(create_fake_transport(SERVER_1_ID, cx.executor())),
-        ));
-        let server_with_same_id_2 = Arc::new(ContextServer::new(
-            server_id.clone(),
-            Arc::new(create_fake_transport(SERVER_1_ID, cx.executor())),
-        ));
-
-        // If we start another server with the same id, we should report that we stopped the previous one
-        let _server_events = assert_server_events(
-            &store,
-            vec![
-                (server_id.clone(), ContextServerStatus::Starting),
-                (server_id.clone(), ContextServerStatus::Stopped),
-                (server_id.clone(), ContextServerStatus::Starting),
-                (server_id.clone(), ContextServerStatus::Running),
-            ],
-            cx,
-        );
-
-        store.update(cx, |store, cx| {
-            store.start_server(server_with_same_id_1.clone(), cx)
-        });
-        store.update(cx, |store, cx| {
-            store.start_server(server_with_same_id_2.clone(), cx)
-        });
-
-        cx.run_until_parked();
-
-        cx.update(|cx| {
-            assert_eq!(
-                store.read(cx).status_for_server(&server_id),
-                Some(ContextServerStatus::Running)
-            );
-        });
-    }
-
-    #[gpui::test]
-    async fn test_context_server_maintain_servers_loop(cx: &mut TestAppContext) {
-        const SERVER_1_ID: &str = "mcp-1";
-        const SERVER_2_ID: &str = "mcp-2";
-
-        let server_1_id = ContextServerId(SERVER_1_ID.into());
-        let server_2_id = ContextServerId(SERVER_2_ID.into());
-
-        let fake_descriptor_1 = Arc::new(FakeContextServerDescriptor::new(SERVER_1_ID));
-
-        let (_fs, project) = setup_context_server_test(
-            cx,
-            json!({"code.rs": ""}),
-            vec![(
-                SERVER_1_ID.into(),
-                ContextServerSettings::Extension {
-                    enabled: true,
-                    settings: json!({
-                        "somevalue": true
-                    }),
-                },
-            )],
-        )
-        .await;
-
-        let executor = cx.executor();
-        let registry = cx.new(|cx| {
-            let mut registry = ContextServerDescriptorRegistry::new();
-            registry.register_context_server_descriptor(SERVER_1_ID.into(), fake_descriptor_1, cx);
-            registry
-        });
-        let store = cx.new(|cx| {
-            ContextServerStore::test_maintain_server_loop(
-                Some(Box::new(move |id, _| {
-                    Arc::new(ContextServer::new(
-                        id.clone(),
-                        Arc::new(create_fake_transport(id.0.to_string(), executor.clone())),
-                    ))
-                })),
-                registry.clone(),
-                project.read(cx).worktree_store(),
-                project.downgrade(),
-                cx,
-            )
-        });
-
-        // Ensure that mcp-1 starts up
-        {
-            let _server_events = assert_server_events(
-                &store,
-                vec![
-                    (server_1_id.clone(), ContextServerStatus::Starting),
-                    (server_1_id.clone(), ContextServerStatus::Running),
-                ],
-                cx,
-            );
-            cx.run_until_parked();
-        }
-
-        // Ensure that mcp-1 is restarted when the configuration was changed
-        {
-            let _server_events = assert_server_events(
-                &store,
-                vec![
-                    (server_1_id.clone(), ContextServerStatus::Stopped),
-                    (server_1_id.clone(), ContextServerStatus::Starting),
-                    (server_1_id.clone(), ContextServerStatus::Running),
-                ],
-                cx,
-            );
-            set_context_server_configuration(
-                vec![(
-                    server_1_id.0.clone(),
-                    settings::ContextServerSettingsContent::Extension {
-                        enabled: true,
-                        settings: json!({
-                            "somevalue": false
-                        }),
-                    },
-                )],
-                cx,
-            );
-
-            cx.run_until_parked();
-        }
-
-        // Ensure that mcp-1 is not restarted when the configuration was not changed
-        {
-            let _server_events = assert_server_events(&store, vec![], cx);
-            set_context_server_configuration(
-                vec![(
-                    server_1_id.0.clone(),
-                    settings::ContextServerSettingsContent::Extension {
-                        enabled: true,
-                        settings: json!({
-                            "somevalue": false
-                        }),
-                    },
-                )],
-                cx,
-            );
-
-            cx.run_until_parked();
-        }
-
-        // Ensure that mcp-2 is started once it is added to the settings
-        {
-            let _server_events = assert_server_events(
-                &store,
-                vec![
-                    (server_2_id.clone(), ContextServerStatus::Starting),
-                    (server_2_id.clone(), ContextServerStatus::Running),
-                ],
-                cx,
-            );
-            set_context_server_configuration(
-                vec![
-                    (
-                        server_1_id.0.clone(),
-                        settings::ContextServerSettingsContent::Extension {
-                            enabled: true,
-                            settings: json!({
-                                "somevalue": false
-                            }),
-                        },
-                    ),
-                    (
-                        server_2_id.0.clone(),
-                        settings::ContextServerSettingsContent::Stdio {
-                            enabled: true,
-                            command: ContextServerCommand {
-                                path: "somebinary".into(),
-                                args: vec!["arg".to_string()],
-                                env: None,
-                                timeout: None,
-                            },
-                        },
-                    ),
-                ],
-                cx,
-            );
-
-            cx.run_until_parked();
-        }
-
-        // Ensure that mcp-2 is restarted once the args have changed
-        {
-            let _server_events = assert_server_events(
-                &store,
-                vec![
-                    (server_2_id.clone(), ContextServerStatus::Stopped),
-                    (server_2_id.clone(), ContextServerStatus::Starting),
-                    (server_2_id.clone(), ContextServerStatus::Running),
-                ],
-                cx,
-            );
-            set_context_server_configuration(
-                vec![
-                    (
-                        server_1_id.0.clone(),
-                        settings::ContextServerSettingsContent::Extension {
-                            enabled: true,
-                            settings: json!({
-                                "somevalue": false
-                            }),
-                        },
-                    ),
-                    (
-                        server_2_id.0.clone(),
-                        settings::ContextServerSettingsContent::Stdio {
-                            enabled: true,
-                            command: ContextServerCommand {
-                                path: "somebinary".into(),
-                                args: vec!["anotherArg".to_string()],
-                                env: None,
-                                timeout: None,
-                            },
-                        },
-                    ),
-                ],
-                cx,
-            );
-
-            cx.run_until_parked();
-        }
-
-        // Ensure that mcp-2 is removed once it is removed from the settings
-        {
-            let _server_events = assert_server_events(
-                &store,
-                vec![(server_2_id.clone(), ContextServerStatus::Stopped)],
-                cx,
-            );
-            set_context_server_configuration(
-                vec![(
-                    server_1_id.0.clone(),
-                    settings::ContextServerSettingsContent::Extension {
-                        enabled: true,
-                        settings: json!({
-                            "somevalue": false
-                        }),
-                    },
-                )],
-                cx,
-            );
-
-            cx.run_until_parked();
-
-            cx.update(|cx| {
-                assert_eq!(store.read(cx).status_for_server(&server_2_id), None);
-            });
-        }
-
-        // Ensure that nothing happens if the settings do not change
-        {
-            let _server_events = assert_server_events(&store, vec![], cx);
-            set_context_server_configuration(
-                vec![(
-                    server_1_id.0.clone(),
-                    settings::ContextServerSettingsContent::Extension {
-                        enabled: true,
-                        settings: json!({
-                            "somevalue": false
-                        }),
-                    },
-                )],
-                cx,
-            );
-
-            cx.run_until_parked();
-
-            cx.update(|cx| {
-                assert_eq!(
-                    store.read(cx).status_for_server(&server_1_id),
-                    Some(ContextServerStatus::Running)
-                );
-                assert_eq!(store.read(cx).status_for_server(&server_2_id), None);
-            });
-        }
-    }
-
-    #[gpui::test]
-    async fn test_context_server_enabled_disabled(cx: &mut TestAppContext) {
-        const SERVER_1_ID: &str = "mcp-1";
-
-        let server_1_id = ContextServerId(SERVER_1_ID.into());
-
-        let (_fs, project) = setup_context_server_test(
-            cx,
-            json!({"code.rs": ""}),
-            vec![(
-                SERVER_1_ID.into(),
-                ContextServerSettings::Stdio {
-                    enabled: true,
-                    command: ContextServerCommand {
-                        path: "somebinary".into(),
-                        args: vec!["arg".to_string()],
-                        env: None,
-                        timeout: None,
-                    },
-                },
-            )],
-        )
-        .await;
-
-        let executor = cx.executor();
-        let registry = cx.new(|_| ContextServerDescriptorRegistry::new());
-        let store = cx.new(|cx| {
-            ContextServerStore::test_maintain_server_loop(
-                Some(Box::new(move |id, _| {
-                    Arc::new(ContextServer::new(
-                        id.clone(),
-                        Arc::new(create_fake_transport(id.0.to_string(), executor.clone())),
-                    ))
-                })),
-                registry.clone(),
-                project.read(cx).worktree_store(),
-                project.downgrade(),
-                cx,
-            )
-        });
-
-        // Ensure that mcp-1 starts up
-        {
-            let _server_events = assert_server_events(
-                &store,
-                vec![
-                    (server_1_id.clone(), ContextServerStatus::Starting),
-                    (server_1_id.clone(), ContextServerStatus::Running),
-                ],
-                cx,
-            );
-            cx.run_until_parked();
-        }
-
-        // Ensure that mcp-1 is stopped once it is disabled.
-        {
-            let _server_events = assert_server_events(
-                &store,
-                vec![(server_1_id.clone(), ContextServerStatus::Stopped)],
-                cx,
-            );
-            set_context_server_configuration(
-                vec![(
-                    server_1_id.0.clone(),
-                    settings::ContextServerSettingsContent::Stdio {
-                        enabled: false,
-                        command: ContextServerCommand {
-                            path: "somebinary".into(),
-                            args: vec!["arg".to_string()],
-                            env: None,
-                            timeout: None,
-                        },
-                    },
-                )],
-                cx,
-            );
-
-            cx.run_until_parked();
-        }
-
-        // Ensure that mcp-1 is started once it is enabled again.
-        {
-            let _server_events = assert_server_events(
-                &store,
-                vec![
-                    (server_1_id.clone(), ContextServerStatus::Starting),
-                    (server_1_id.clone(), ContextServerStatus::Running),
-                ],
-                cx,
-            );
-            set_context_server_configuration(
-                vec![(
-                    server_1_id.0.clone(),
-                    settings::ContextServerSettingsContent::Stdio {
-                        enabled: true,
-                        command: ContextServerCommand {
-                            path: "somebinary".into(),
-                            args: vec!["arg".to_string()],
-                            timeout: None,
-                            env: None,
-                        },
-                    },
-                )],
-                cx,
-            );
-
-            cx.run_until_parked();
-        }
-    }
-
-    fn set_context_server_configuration(
-        context_servers: Vec<(Arc<str>, settings::ContextServerSettingsContent)>,
-        cx: &mut TestAppContext,
-    ) {
-        cx.update(|cx| {
-            SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |content| {
-                    content.project.context_servers.clear();
-                    for (id, config) in context_servers {
-                        content.project.context_servers.insert(id, config);
-                    }
-                });
-            })
-        });
-    }
-
-    #[gpui::test]
-    async fn test_remote_context_server(cx: &mut TestAppContext) {
-        const SERVER_ID: &str = "remote-server";
-        let server_id = ContextServerId(SERVER_ID.into());
-        let server_url = "http://example.com/api";
-
-        let (_fs, project) = setup_context_server_test(
-            cx,
-            json!({ "code.rs": "" }),
-            vec![(
-                SERVER_ID.into(),
-                ContextServerSettings::Http {
-                    enabled: true,
-                    url: server_url.to_string(),
-                    headers: Default::default(),
-                },
-            )],
-        )
-        .await;
-
-        let client = FakeHttpClient::create(|_| async move {
-            use http_client::AsyncBody;
-
-            let response = Response::builder()
-                .status(200)
-                .header("Content-Type", "application/json")
-                .body(AsyncBody::from(
-                    serde_json::to_string(&json!({
-                        "jsonrpc": "2.0",
-                        "id": 0,
-                        "result": {
-                            "protocolVersion": "2024-11-05",
-                            "capabilities": {},
-                            "serverInfo": {
-                                "name": "test-server",
-                                "version": "1.0.0"
-                            }
-                        }
-                    }))
-                    .unwrap(),
-                ))
-                .unwrap();
-            Ok(response)
-        });
-        cx.update(|cx| cx.set_http_client(client));
-        let registry = cx.new(|_| ContextServerDescriptorRegistry::new());
-        let store = cx.new(|cx| {
-            ContextServerStore::test_maintain_server_loop(
-                None,
-                registry.clone(),
-                project.read(cx).worktree_store(),
-                project.downgrade(),
-                cx,
-            )
-        });
-
-        let _server_events = assert_server_events(
-            &store,
-            vec![
-                (server_id.clone(), ContextServerStatus::Starting),
-                (server_id.clone(), ContextServerStatus::Running),
-            ],
-            cx,
-        );
-        cx.run_until_parked();
-    }
-
-    struct ServerEvents {
-        received_event_count: Rc<RefCell<usize>>,
-        expected_event_count: usize,
-        _subscription: Subscription,
-    }
-
-    impl Drop for ServerEvents {
-        fn drop(&mut self) {
-            let actual_event_count = *self.received_event_count.borrow();
-            assert_eq!(
-                actual_event_count, self.expected_event_count,
-                "
-                Expected to receive {} context server store events, but received {} events",
-                self.expected_event_count, actual_event_count
-            );
-        }
-    }
-
-    fn dummy_server_settings() -> ContextServerSettings {
-        ContextServerSettings::Stdio {
-            enabled: true,
-            command: ContextServerCommand {
-                path: "somebinary".into(),
-                args: vec!["arg".to_string()],
-                env: None,
-                timeout: None,
-            },
-        }
-    }
-
-    fn assert_server_events(
-        store: &Entity<ContextServerStore>,
-        expected_events: Vec<(ContextServerId, ContextServerStatus)>,
-        cx: &mut TestAppContext,
-    ) -> ServerEvents {
-        cx.update(|cx| {
-            let mut ix = 0;
-            let received_event_count = Rc::new(RefCell::new(0));
-            let expected_event_count = expected_events.len();
-            let subscription = cx.subscribe(store, {
-                let received_event_count = received_event_count.clone();
-                move |_, event, _| match event {
-                    Event::ServerStatusChanged {
-                        server_id: actual_server_id,
-                        status: actual_status,
-                    } => {
-                        let (expected_server_id, expected_status) = &expected_events[ix];
-
-                        assert_eq!(
-                            actual_server_id, expected_server_id,
-                            "Expected different server id at index {}",
-                            ix
-                        );
-                        assert_eq!(
-                            actual_status, expected_status,
-                            "Expected different status at index {}",
-                            ix
-                        );
-                        ix += 1;
-                        *received_event_count.borrow_mut() += 1;
-                    }
-                }
-            });
-            ServerEvents {
-                expected_event_count,
-                received_event_count,
-                _subscription: subscription,
-            }
-        })
-    }
-
-    async fn setup_context_server_test(
-        cx: &mut TestAppContext,
-        files: serde_json::Value,
-        context_server_configurations: Vec<(Arc<str>, ContextServerSettings)>,
-    ) -> (Arc<FakeFs>, Entity<Project>) {
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-            let mut settings = ProjectSettings::get_global(cx).clone();
-            for (id, config) in context_server_configurations {
-                settings.context_servers.insert(id, config);
-            }
-            ProjectSettings::override_global(settings, cx);
-        });
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(path!("/test"), files).await;
-        let project = Project::test(fs.clone(), [path!("/test").as_ref()], cx).await;
-
-        (fs, project)
-    }
-
-    struct FakeContextServerDescriptor {
-        path: PathBuf,
-    }
-
-    impl FakeContextServerDescriptor {
-        fn new(path: impl Into<PathBuf>) -> Self {
-            Self { path: path.into() }
-        }
-    }
-
-    impl ContextServerDescriptor for FakeContextServerDescriptor {
-        fn command(
-            &self,
-            _worktree_store: Entity<WorktreeStore>,
-            _cx: &AsyncApp,
-        ) -> Task<Result<ContextServerCommand>> {
-            Task::ready(Ok(ContextServerCommand {
-                path: self.path.clone(),
-                args: vec!["arg1".to_string(), "arg2".to_string()],
-                env: None,
-                timeout: None,
-            }))
-        }
-
-        fn configuration(
-            &self,
-            _worktree_store: Entity<WorktreeStore>,
-            _cx: &AsyncApp,
-        ) -> Task<Result<Option<::extension::ContextServerConfiguration>>> {
-            Task::ready(Ok(None))
-        }
-    }
-}
diff --git a/crates/project/src/context_server_store/extension.rs b/crates/project/src/context_server_store/extension.rs
deleted file mode 100644
index ca5cacf3b5..0000000000
--- a/crates/project/src/context_server_store/extension.rs
+++ /dev/null
@@ -1,120 +0,0 @@
-use std::sync::Arc;
-
-use anyhow::Result;
-use context_server::ContextServerCommand;
-use extension::{
-    ContextServerConfiguration, Extension, ExtensionContextServerProxy, ExtensionHostProxy,
-    ProjectDelegate,
-};
-use gpui::{App, AsyncApp, Entity, Task};
-
-use crate::worktree_store::WorktreeStore;
-
-use super::registry::{self, ContextServerDescriptorRegistry};
-
-pub fn init(cx: &mut App) {
-    let proxy = ExtensionHostProxy::default_global(cx);
-    proxy.register_context_server_proxy(ContextServerDescriptorRegistryProxy {
-        context_server_factory_registry: ContextServerDescriptorRegistry::default_global(cx),
-    });
-}
-
-struct ExtensionProject {
-    worktree_ids: Vec<u64>,
-}
-
-impl ProjectDelegate for ExtensionProject {
-    fn worktree_ids(&self) -> Vec<u64> {
-        self.worktree_ids.clone()
-    }
-}
-
-struct ContextServerDescriptor {
-    id: Arc<str>,
-    extension: Arc<dyn Extension>,
-}
-
-fn extension_project(
-    worktree_store: Entity<WorktreeStore>,
-    cx: &mut AsyncApp,
-) -> Result<Arc<ExtensionProject>> {
-    worktree_store.update(cx, |worktree_store, cx| {
-        Arc::new(ExtensionProject {
-            worktree_ids: worktree_store
-                .visible_worktrees(cx)
-                .map(|worktree| worktree.read(cx).id().to_proto())
-                .collect(),
-        })
-    })
-}
-
-impl registry::ContextServerDescriptor for ContextServerDescriptor {
-    fn command(
-        &self,
-        worktree_store: Entity<WorktreeStore>,
-        cx: &AsyncApp,
-    ) -> Task<Result<ContextServerCommand>> {
-        let id = self.id.clone();
-        let extension = self.extension.clone();
-        cx.spawn(async move |cx| {
-            let extension_project = extension_project(worktree_store, cx)?;
-            let mut command = extension
-                .context_server_command(id.clone(), extension_project.clone())
-                .await?;
-            command.command = extension.path_from_extension(&command.command);
-
-            log::debug!("loaded command for context server {id}: {command:?}");
-
-            Ok(ContextServerCommand {
-                path: command.command,
-                args: command.args,
-                env: Some(command.env.into_iter().collect()),
-                timeout: None,
-            })
-        })
-    }
-
-    fn configuration(
-        &self,
-        worktree_store: Entity<WorktreeStore>,
-        cx: &AsyncApp,
-    ) -> Task<Result<Option<ContextServerConfiguration>>> {
-        let id = self.id.clone();
-        let extension = self.extension.clone();
-        cx.spawn(async move |cx| {
-            let extension_project = extension_project(worktree_store, cx)?;
-            let configuration = extension
-                .context_server_configuration(id.clone(), extension_project)
-                .await?;
-
-            log::debug!("loaded configuration for context server {id}: {configuration:?}");
-
-            Ok(configuration)
-        })
-    }
-}
-
-struct ContextServerDescriptorRegistryProxy {
-    context_server_factory_registry: Entity<ContextServerDescriptorRegistry>,
-}
-
-impl ExtensionContextServerProxy for ContextServerDescriptorRegistryProxy {
-    fn register_context_server(&self, extension: Arc<dyn Extension>, id: Arc<str>, cx: &mut App) {
-        self.context_server_factory_registry
-            .update(cx, |registry, cx| {
-                registry.register_context_server_descriptor(
-                    id.clone(),
-                    Arc::new(ContextServerDescriptor { id, extension })
-                        as Arc<dyn registry::ContextServerDescriptor>,
-                    cx,
-                )
-            });
-    }
-
-    fn unregister_context_server(&self, server_id: Arc<str>, cx: &mut App) {
-        self.context_server_factory_registry
-            .update(cx, |registry, cx| {
-                registry.unregister_context_server_descriptor_by_id(&server_id, cx)
-            });
-    }
-}
diff --git a/crates/project/src/context_server_store/registry.rs b/crates/project/src/context_server_store/registry.rs
deleted file mode 100644
index b705fcadee..0000000000
--- a/crates/project/src/context_server_store/registry.rs
+++ /dev/null
@@ -1,84 +0,0 @@
-use std::sync::Arc;
-
-use anyhow::Result;
-use collections::HashMap;
-use context_server::ContextServerCommand;
-use extension::ContextServerConfiguration;
-use gpui::{App, AppContext as _, AsyncApp, Context, Entity, Global, Task};
-
-use crate::worktree_store::WorktreeStore;
-
-pub trait ContextServerDescriptor {
-    fn command(
-        &self,
-        worktree_store: Entity<WorktreeStore>,
-        cx: &AsyncApp,
-    ) -> Task<Result<ContextServerCommand>>;
-    fn configuration(
-        &self,
-        worktree_store: Entity<WorktreeStore>,
-        cx: &AsyncApp,
-    ) -> Task<Result<Option<ContextServerConfiguration>>>;
-}
-
-struct GlobalContextServerDescriptorRegistry(Entity<ContextServerDescriptorRegistry>);
-
-impl Global for GlobalContextServerDescriptorRegistry {}
-
-#[derive(Default)]
-pub struct ContextServerDescriptorRegistry {
-    context_servers: HashMap<Arc<str>, Arc<dyn ContextServerDescriptor>>,
-}
-
-impl ContextServerDescriptorRegistry {
-    /// Returns the global [`ContextServerDescriptorRegistry`].
-    ///
-    /// Inserts a default [`ContextServerDescriptorRegistry`] if one does not yet exist.
-    pub fn default_global(cx: &mut App) -> Entity<Self> {
-        if !cx.has_global::<GlobalContextServerDescriptorRegistry>() {
-            let registry = cx.new(|_| Self::new());
-            cx.set_global(GlobalContextServerDescriptorRegistry(registry));
-        }
-        cx.global::<GlobalContextServerDescriptorRegistry>()
-            .0
-            .clone()
-    }
-
-    pub fn new() -> Self {
-        Self {
-            context_servers: HashMap::default(),
-        }
-    }
-
-    pub fn context_server_descriptors(&self) -> Vec<(Arc<str>, Arc<dyn ContextServerDescriptor>)> {
-        self.context_servers
-            .iter()
-            .map(|(id, factory)| (id.clone(), factory.clone()))
-            .collect()
-    }
-
-    pub fn context_server_descriptor(&self, id: &str) -> Option<Arc<dyn ContextServerDescriptor>> {
-        self.context_servers.get(id).cloned()
-    }
-
-    /// Registers the provided [`ContextServerDescriptor`].
-    pub fn register_context_server_descriptor(
-        &mut self,
-        id: Arc<str>,
-        descriptor: Arc<dyn ContextServerDescriptor>,
-        cx: &mut Context<Self>,
-    ) {
-        self.context_servers.insert(id, descriptor);
-        cx.notify();
-    }
-
-    /// Unregisters the [`ContextServerDescriptor`] for the server with the given ID.
-    pub fn unregister_context_server_descriptor_by_id(
-        &mut self,
-        server_id: &str,
-        cx: &mut Context<Self>,
-    ) {
-        self.context_servers.remove(server_id);
-        cx.notify();
-    }
-}
diff --git a/crates/project/src/debounced_delay.rs b/crates/project/src/debounced_delay.rs
deleted file mode 100644
index 0ea045be5f..0000000000
--- a/crates/project/src/debounced_delay.rs
+++ /dev/null
@@ -1,54 +0,0 @@
-use futures::{FutureExt, channel::oneshot};
-use gpui::{Context, Task};
-use std::{marker::PhantomData, time::Duration};
-
-pub struct DebouncedDelay<E: 'static> {
-    task: Option<Task<()>>,
-    cancel_channel: Option<oneshot::Sender<()>>,
-    _phantom_data: PhantomData<E>,
-}
-
-impl<E: 'static> Default for DebouncedDelay<E> {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl<E: 'static> DebouncedDelay<E> {
-    pub fn new() -> Self {
-        Self {
-            task: None,
-            cancel_channel: None,
-            _phantom_data: PhantomData,
-        }
-    }
-
-    pub fn fire_new<F>(&mut self, delay: Duration, cx: &mut Context<E>, func: F)
-    where
-        F: 'static + Send + FnOnce(&mut E, &mut Context<E>) -> Task<()>,
-    {
-        if let Some(channel) = self.cancel_channel.take() {
-            _ = channel.send(());
-        }
-
-        let (sender, mut receiver) = oneshot::channel::<()>();
-        self.cancel_channel = Some(sender);
-
-        let previous_task = self.task.take();
-        self.task = Some(cx.spawn(async move |entity, cx| {
-            let mut timer = cx.background_executor().timer(delay).fuse();
-            if let Some(previous_task) = previous_task {
-                previous_task.await;
-            }
-
-            futures::select_biased! {
-                _ = receiver => return,
-                _ = timer => {}
-            }
-
-            if let Ok(task) = entity.update(cx, |project, cx| (func)(project, cx)) {
-                task.await;
-            }
-        }));
-    }
-}
diff --git a/crates/project/src/debugger.rs b/crates/project/src/debugger.rs
deleted file mode 100644
index 0bf6a0d61b..0000000000
--- a/crates/project/src/debugger.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-//! Zed's debugger data layer is implemented in terms of 3 concepts:
-//! - DAP store - that knows about all of the available debug sessions.
-//! - Debug sessions - that bear responsibility of communicating with debug adapters and managing the state of each individual session.
-//!   For the most part it is agnostic over the communication layer (it'll use RPC for peers and actual DAP requests for the host).
-//! - Breakpoint store - that knows about all breakpoints set for a project.
-//!
-//! There are few reasons for this divide:
-//! - Breakpoints persist across debug sessions and they're not really specific to any particular session. Sure, we have to send protocol messages for them
-//!   (so they're a "thing" in the protocol), but we also want to set them before any session starts up.
-//! - Debug clients are doing the heavy lifting, and this is where UI grabs all of it's data from. They also rely on breakpoint store during initialization to obtain
-//!   current set of breakpoints.
-//! - Since DAP store knows about all of the available debug sessions, it is responsible for routing RPC requests to sessions. It also knows how to find adapters for particular kind of session.
-
-pub mod breakpoint_store;
-pub mod dap_command;
-pub mod dap_store;
-pub mod locators;
-mod memory;
-pub mod session;
-
-#[cfg(any(feature = "test-support", test))]
-pub mod test;
-pub use memory::MemoryCell;
diff --git a/crates/project/src/debugger/breakpoint_store.rs b/crates/project/src/debugger/breakpoint_store.rs
deleted file mode 100644
index 42663ab985..0000000000
--- a/crates/project/src/debugger/breakpoint_store.rs
+++ /dev/null
@@ -1,1034 +0,0 @@
-//! Module for managing breakpoints in a project.
-//!
-//! Breakpoints are separate from a session because they're not associated with any particular debug session. They can also be set up without a session running.
-use anyhow::{Context as _, Result};
-pub use breakpoints_in_file::{BreakpointSessionState, BreakpointWithPosition};
-use breakpoints_in_file::{BreakpointsInFile, StatefulBreakpoint};
-use collections::{BTreeMap, HashMap};
-use dap::{StackFrameId, client::SessionId};
-use gpui::{App, AppContext, AsyncApp, Context, Entity, EventEmitter, Subscription, Task};
-use itertools::Itertools;
-use language::{Buffer, BufferSnapshot, proto::serialize_anchor as serialize_text_anchor};
-use rpc::{
-    AnyProtoClient, TypedEnvelope,
-    proto::{self},
-};
-use std::{hash::Hash, ops::Range, path::Path, sync::Arc, u32};
-use text::{Point, PointUtf16};
-use util::maybe;
-
-use crate::{Project, ProjectPath, buffer_store::BufferStore, worktree_store::WorktreeStore};
-
-use super::session::ThreadId;
-
-mod breakpoints_in_file {
-    use collections::HashMap;
-    use language::{BufferEvent, DiskState};
-
-    use super::*;
-
-    #[derive(Clone, Debug, PartialEq, Eq)]
-    pub struct BreakpointWithPosition {
-        pub position: text::Anchor,
-        pub bp: Breakpoint,
-    }
-
-    /// A breakpoint with per-session data about it's state (as seen by the Debug Adapter).
-    #[derive(Clone, Debug)]
-    pub struct StatefulBreakpoint {
-        pub bp: BreakpointWithPosition,
-        pub session_state: HashMap<SessionId, BreakpointSessionState>,
-    }
-
-    impl StatefulBreakpoint {
-        pub(super) fn new(bp: BreakpointWithPosition) -> Self {
-            Self {
-                bp,
-                session_state: Default::default(),
-            }
-        }
-        pub(super) fn position(&self) -> &text::Anchor {
-            &self.bp.position
-        }
-    }
-
-    #[derive(Clone, Copy, Debug, Hash, PartialEq, Eq)]
-    pub struct BreakpointSessionState {
-        /// Session-specific identifier for the breakpoint, as assigned by Debug Adapter.
-        pub id: u64,
-        pub verified: bool,
-    }
-    #[derive(Clone)]
-    pub(super) struct BreakpointsInFile {
-        pub(super) buffer: Entity<Buffer>,
-        // TODO: This is.. less than ideal, as it's O(n) and does not return entries in order. We'll have to change TreeMap to support passing in the context for comparisons
-        pub(super) breakpoints: Vec<StatefulBreakpoint>,
-        _subscription: Arc<Subscription>,
-    }
-
-    impl BreakpointsInFile {
-        pub(super) fn new(buffer: Entity<Buffer>, cx: &mut Context<BreakpointStore>) -> Self {
-            let subscription = Arc::from(cx.subscribe(
-                &buffer,
-                |breakpoint_store, buffer, event, cx| match event {
-                    BufferEvent::Saved => {
-                        if let Some(abs_path) = BreakpointStore::abs_path_from_buffer(&buffer, cx) {
-                            cx.emit(BreakpointStoreEvent::BreakpointsUpdated(
-                                abs_path,
-                                BreakpointUpdatedReason::FileSaved,
-                            ));
-                        }
-                    }
-                    BufferEvent::FileHandleChanged => {
-                        let entity_id = buffer.entity_id();
-
-                        if buffer.read(cx).file().is_none_or(|f| f.disk_state() == DiskState::Deleted) {
-                            breakpoint_store.breakpoints.retain(|_, breakpoints_in_file| {
-                                breakpoints_in_file.buffer.entity_id() != entity_id
-                            });
-
-                            cx.notify();
-                            return;
-                        }
-
-                        if let Some(abs_path) = BreakpointStore::abs_path_from_buffer(&buffer, cx) {
-                            if breakpoint_store.breakpoints.contains_key(&abs_path) {
-                                return;
-                            }
-
-                            if let Some(old_path) = breakpoint_store
-                                .breakpoints
-                                .iter()
-                                .find(|(_, in_file)| in_file.buffer.entity_id() == entity_id)
-                                .map(|values| values.0)
-                                .cloned()
-                            {
-                                let Some(breakpoints_in_file) =
-                                    breakpoint_store.breakpoints.remove(&old_path) else {
-                                        log::error!("Couldn't get breakpoints in file from old path during buffer rename handling");
-                                        return;
-                                    };
-
-                                breakpoint_store.breakpoints.insert(abs_path, breakpoints_in_file);
-                                cx.notify();
-                            }
-                        }
-                    }
-                    _ => {}
-                },
-            ));
-
-            BreakpointsInFile {
-                buffer,
-                breakpoints: Vec::new(),
-                _subscription: subscription,
-            }
-        }
-    }
-}
-
-#[derive(Clone)]
-struct RemoteBreakpointStore {
-    upstream_client: AnyProtoClient,
-    _upstream_project_id: u64,
-}
-
-#[derive(Clone)]
-struct LocalBreakpointStore {
-    worktree_store: Entity<WorktreeStore>,
-    buffer_store: Entity<BufferStore>,
-}
-
-#[derive(Clone)]
-enum BreakpointStoreMode {
-    Local(LocalBreakpointStore),
-    Remote(RemoteBreakpointStore),
-}
-
-#[derive(Clone, PartialEq)]
-pub struct ActiveStackFrame {
-    pub session_id: SessionId,
-    pub thread_id: ThreadId,
-    pub stack_frame_id: StackFrameId,
-    pub path: Arc<Path>,
-    pub position: text::Anchor,
-}
-
-pub struct BreakpointStore {
-    breakpoints: BTreeMap<Arc<Path>, BreakpointsInFile>,
-    downstream_client: Option<(AnyProtoClient, u64)>,
-    active_stack_frame: Option<ActiveStackFrame>,
-    // E.g ssh
-    mode: BreakpointStoreMode,
-}
-
-impl BreakpointStore {
-    pub fn init(client: &AnyProtoClient) {
-        client.add_entity_request_handler(Self::handle_toggle_breakpoint);
-        client.add_entity_message_handler(Self::handle_breakpoints_for_file);
-    }
-    pub fn local(worktree_store: Entity<WorktreeStore>, buffer_store: Entity<BufferStore>) -> Self {
-        BreakpointStore {
-            breakpoints: BTreeMap::new(),
-            mode: BreakpointStoreMode::Local(LocalBreakpointStore {
-                worktree_store,
-                buffer_store,
-            }),
-            downstream_client: None,
-            active_stack_frame: Default::default(),
-        }
-    }
-
-    pub(crate) fn remote(upstream_project_id: u64, upstream_client: AnyProtoClient) -> Self {
-        BreakpointStore {
-            breakpoints: BTreeMap::new(),
-            mode: BreakpointStoreMode::Remote(RemoteBreakpointStore {
-                upstream_client,
-                _upstream_project_id: upstream_project_id,
-            }),
-            downstream_client: None,
-            active_stack_frame: Default::default(),
-        }
-    }
-
-    pub(crate) fn shared(&mut self, project_id: u64, downstream_client: AnyProtoClient) {
-        self.downstream_client = Some((downstream_client, project_id));
-    }
-
-    pub(crate) fn unshared(&mut self, cx: &mut Context<Self>) {
-        self.downstream_client.take();
-
-        cx.notify();
-    }
-
-    async fn handle_breakpoints_for_file(
-        this: Entity<Project>,
-        message: TypedEnvelope<proto::BreakpointsForFile>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        let breakpoints = cx.update(|cx| this.read(cx).breakpoint_store())?;
-        if message.payload.breakpoints.is_empty() {
-            return Ok(());
-        }
-
-        let buffer = this
-            .update(&mut cx, |this, cx| {
-                let path =
-                    this.project_path_for_absolute_path(message.payload.path.as_ref(), cx)?;
-                Some(this.open_buffer(path, cx))
-            })
-            .ok()
-            .flatten()
-            .context("Invalid project path")?
-            .await?;
-
-        breakpoints.update(&mut cx, move |this, cx| {
-            let bps = this
-                .breakpoints
-                .entry(Arc::<Path>::from(message.payload.path.as_ref()))
-                .or_insert_with(|| BreakpointsInFile::new(buffer, cx));
-
-            bps.breakpoints = message
-                .payload
-                .breakpoints
-                .into_iter()
-                .filter_map(|breakpoint| {
-                    let position =
-                        language::proto::deserialize_anchor(breakpoint.position.clone()?)?;
-                    let session_state = breakpoint
-                        .session_state
-                        .iter()
-                        .map(|(session_id, state)| {
-                            let state = BreakpointSessionState {
-                                id: state.id,
-                                verified: state.verified,
-                            };
-                            (SessionId::from_proto(*session_id), state)
-                        })
-                        .collect();
-                    let breakpoint = Breakpoint::from_proto(breakpoint)?;
-                    let bp = BreakpointWithPosition {
-                        position,
-                        bp: breakpoint,
-                    };
-
-                    Some(StatefulBreakpoint { bp, session_state })
-                })
-                .collect();
-
-            cx.notify();
-        })?;
-
-        Ok(())
-    }
-
-    async fn handle_toggle_breakpoint(
-        this: Entity<Project>,
-        message: TypedEnvelope<proto::ToggleBreakpoint>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::Ack> {
-        let breakpoints = this.read_with(&cx, |this, _| this.breakpoint_store())?;
-        let path = this
-            .update(&mut cx, |this, cx| {
-                this.project_path_for_absolute_path(message.payload.path.as_ref(), cx)
-            })?
-            .context("Could not resolve provided abs path")?;
-        let buffer = this
-            .update(&mut cx, |this, cx| {
-                this.buffer_store().read(cx).get_by_path(&path)
-            })?
-            .context("Could not find buffer for a given path")?;
-        let breakpoint = message
-            .payload
-            .breakpoint
-            .context("Breakpoint not present in RPC payload")?;
-        let position = language::proto::deserialize_anchor(
-            breakpoint
-                .position
-                .clone()
-                .context("Anchor not present in RPC payload")?,
-        )
-        .context("Anchor deserialization failed")?;
-        let breakpoint =
-            Breakpoint::from_proto(breakpoint).context("Could not deserialize breakpoint")?;
-
-        breakpoints.update(&mut cx, |this, cx| {
-            this.toggle_breakpoint(
-                buffer,
-                BreakpointWithPosition {
-                    position,
-                    bp: breakpoint,
-                },
-                BreakpointEditAction::Toggle,
-                cx,
-            );
-        })?;
-        Ok(proto::Ack {})
-    }
-
-    pub(crate) fn broadcast(&self) {
-        if let Some((client, project_id)) = &self.downstream_client {
-            for (path, breakpoint_set) in &self.breakpoints {
-                let _ = client.send(proto::BreakpointsForFile {
-                    project_id: *project_id,
-                    path: path.to_str().map(ToOwned::to_owned).unwrap(),
-                    breakpoints: breakpoint_set
-                        .breakpoints
-                        .iter()
-                        .filter_map(|breakpoint| {
-                            breakpoint.bp.bp.to_proto(
-                                path,
-                                breakpoint.position(),
-                                &breakpoint.session_state,
-                            )
-                        })
-                        .collect(),
-                });
-            }
-        }
-    }
-
-    pub(crate) fn update_session_breakpoint(
-        &mut self,
-        session_id: SessionId,
-        _: dap::BreakpointEventReason,
-        breakpoint: dap::Breakpoint,
-    ) {
-        maybe!({
-            let event_id = breakpoint.id?;
-
-            let state = self
-                .breakpoints
-                .values_mut()
-                .find_map(|breakpoints_in_file| {
-                    breakpoints_in_file
-                        .breakpoints
-                        .iter_mut()
-                        .find_map(|state| {
-                            let state = state.session_state.get_mut(&session_id)?;
-
-                            if state.id == event_id {
-                                Some(state)
-                            } else {
-                                None
-                            }
-                        })
-                })?;
-
-            state.verified = breakpoint.verified;
-            Some(())
-        });
-    }
-
-    pub(super) fn mark_breakpoints_verified(
-        &mut self,
-        session_id: SessionId,
-        abs_path: &Path,
-
-        it: impl Iterator<Item = (BreakpointWithPosition, BreakpointSessionState)>,
-    ) {
-        maybe!({
-            let breakpoints = self.breakpoints.get_mut(abs_path)?;
-            for (breakpoint, state) in it {
-                if let Some(to_update) = breakpoints
-                    .breakpoints
-                    .iter_mut()
-                    .find(|bp| *bp.position() == breakpoint.position)
-                {
-                    to_update
-                        .session_state
-                        .entry(session_id)
-                        .insert_entry(state);
-                }
-            }
-            Some(())
-        });
-    }
-
-    pub fn abs_path_from_buffer(buffer: &Entity<Buffer>, cx: &App) -> Option<Arc<Path>> {
-        worktree::File::from_dyn(buffer.read(cx).file())
-            .map(|file| file.worktree.read(cx).absolutize(&file.path))
-            .map(Arc::<Path>::from)
-    }
-
-    pub fn toggle_breakpoint(
-        &mut self,
-        buffer: Entity<Buffer>,
-        mut breakpoint: BreakpointWithPosition,
-        edit_action: BreakpointEditAction,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(abs_path) = Self::abs_path_from_buffer(&buffer, cx) else {
-            return;
-        };
-
-        let breakpoint_set = self
-            .breakpoints
-            .entry(abs_path.clone())
-            .or_insert_with(|| BreakpointsInFile::new(buffer, cx));
-
-        match edit_action {
-            BreakpointEditAction::Toggle => {
-                let len_before = breakpoint_set.breakpoints.len();
-                breakpoint_set
-                    .breakpoints
-                    .retain(|value| breakpoint != value.bp);
-                if len_before == breakpoint_set.breakpoints.len() {
-                    // We did not remove any breakpoint, hence let's toggle one.
-                    breakpoint_set
-                        .breakpoints
-                        .push(StatefulBreakpoint::new(breakpoint.clone()));
-                }
-            }
-            BreakpointEditAction::InvertState => {
-                if let Some(bp) = breakpoint_set
-                    .breakpoints
-                    .iter_mut()
-                    .find(|value| breakpoint == value.bp)
-                {
-                    let bp = &mut bp.bp.bp;
-                    if bp.is_enabled() {
-                        bp.state = BreakpointState::Disabled;
-                    } else {
-                        bp.state = BreakpointState::Enabled;
-                    }
-                } else {
-                    breakpoint.bp.state = BreakpointState::Disabled;
-                    breakpoint_set
-                        .breakpoints
-                        .push(StatefulBreakpoint::new(breakpoint.clone()));
-                }
-            }
-            BreakpointEditAction::EditLogMessage(log_message) => {
-                if !log_message.is_empty() {
-                    let found_bp = breakpoint_set.breakpoints.iter_mut().find_map(|bp| {
-                        if breakpoint.position == *bp.position() {
-                            Some(&mut bp.bp.bp)
-                        } else {
-                            None
-                        }
-                    });
-
-                    if let Some(found_bp) = found_bp {
-                        found_bp.message = Some(log_message);
-                    } else {
-                        breakpoint.bp.message = Some(log_message);
-                        // We did not remove any breakpoint, hence let's toggle one.
-                        breakpoint_set
-                            .breakpoints
-                            .push(StatefulBreakpoint::new(breakpoint.clone()));
-                    }
-                } else if breakpoint.bp.message.is_some() {
-                    if let Some(position) = breakpoint_set
-                        .breakpoints
-                        .iter()
-                        .find_position(|other| breakpoint == other.bp)
-                        .map(|res| res.0)
-                    {
-                        breakpoint_set.breakpoints.remove(position);
-                    } else {
-                        log::error!("Failed to find position of breakpoint to delete")
-                    }
-                }
-            }
-            BreakpointEditAction::EditHitCondition(hit_condition) => {
-                if !hit_condition.is_empty() {
-                    let found_bp = breakpoint_set.breakpoints.iter_mut().find_map(|other| {
-                        if breakpoint.position == *other.position() {
-                            Some(&mut other.bp.bp)
-                        } else {
-                            None
-                        }
-                    });
-
-                    if let Some(found_bp) = found_bp {
-                        found_bp.hit_condition = Some(hit_condition);
-                    } else {
-                        breakpoint.bp.hit_condition = Some(hit_condition);
-                        // We did not remove any breakpoint, hence let's toggle one.
-                        breakpoint_set
-                            .breakpoints
-                            .push(StatefulBreakpoint::new(breakpoint.clone()))
-                    }
-                } else if breakpoint.bp.hit_condition.is_some() {
-                    if let Some(position) = breakpoint_set
-                        .breakpoints
-                        .iter()
-                        .find_position(|bp| breakpoint == bp.bp)
-                        .map(|res| res.0)
-                    {
-                        breakpoint_set.breakpoints.remove(position);
-                    } else {
-                        log::error!("Failed to find position of breakpoint to delete")
-                    }
-                }
-            }
-            BreakpointEditAction::EditCondition(condition) => {
-                if !condition.is_empty() {
-                    let found_bp = breakpoint_set.breakpoints.iter_mut().find_map(|other| {
-                        if breakpoint.position == *other.position() {
-                            Some(&mut other.bp.bp)
-                        } else {
-                            None
-                        }
-                    });
-
-                    if let Some(found_bp) = found_bp {
-                        found_bp.condition = Some(condition);
-                    } else {
-                        breakpoint.bp.condition = Some(condition);
-                        // We did not remove any breakpoint, hence let's toggle one.
-                        breakpoint_set
-                            .breakpoints
-                            .push(StatefulBreakpoint::new(breakpoint.clone()));
-                    }
-                } else if breakpoint.bp.condition.is_some() {
-                    if let Some(position) = breakpoint_set
-                        .breakpoints
-                        .iter()
-                        .find_position(|bp| breakpoint == bp.bp)
-                        .map(|res| res.0)
-                    {
-                        breakpoint_set.breakpoints.remove(position);
-                    } else {
-                        log::error!("Failed to find position of breakpoint to delete")
-                    }
-                }
-            }
-        }
-
-        if breakpoint_set.breakpoints.is_empty() {
-            self.breakpoints.remove(&abs_path);
-        }
-        if let BreakpointStoreMode::Remote(remote) = &self.mode {
-            if let Some(breakpoint) =
-                breakpoint
-                    .bp
-                    .to_proto(&abs_path, &breakpoint.position, &HashMap::default())
-            {
-                cx.background_spawn(remote.upstream_client.request(proto::ToggleBreakpoint {
-                    project_id: remote._upstream_project_id,
-                    path: abs_path.to_str().map(ToOwned::to_owned).unwrap(),
-                    breakpoint: Some(breakpoint),
-                }))
-                .detach();
-            }
-        } else if let Some((client, project_id)) = &self.downstream_client {
-            let breakpoints = self
-                .breakpoints
-                .get(&abs_path)
-                .map(|breakpoint_set| {
-                    breakpoint_set
-                        .breakpoints
-                        .iter()
-                        .filter_map(|bp| {
-                            bp.bp
-                                .bp
-                                .to_proto(&abs_path, bp.position(), &bp.session_state)
-                        })
-                        .collect()
-                })
-                .unwrap_or_default();
-
-            let _ = client.send(proto::BreakpointsForFile {
-                project_id: *project_id,
-                path: abs_path.to_str().map(ToOwned::to_owned).unwrap(),
-                breakpoints,
-            });
-        }
-
-        cx.emit(BreakpointStoreEvent::BreakpointsUpdated(
-            abs_path,
-            BreakpointUpdatedReason::Toggled,
-        ));
-        cx.notify();
-    }
-
-    pub fn on_file_rename(
-        &mut self,
-        old_path: Arc<Path>,
-        new_path: Arc<Path>,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(breakpoints) = self.breakpoints.remove(&old_path) {
-            self.breakpoints.insert(new_path, breakpoints);
-
-            cx.notify();
-        }
-    }
-
-    pub fn clear_breakpoints(&mut self, cx: &mut Context<Self>) {
-        let breakpoint_paths = self.breakpoints.keys().cloned().collect();
-        self.breakpoints.clear();
-        cx.emit(BreakpointStoreEvent::BreakpointsCleared(breakpoint_paths));
-    }
-
-    pub fn breakpoints<'a>(
-        &'a self,
-        buffer: &'a Entity<Buffer>,
-        range: Option<Range<text::Anchor>>,
-        buffer_snapshot: &'a BufferSnapshot,
-        cx: &App,
-    ) -> impl Iterator<Item = (&'a BreakpointWithPosition, Option<BreakpointSessionState>)> + 'a
-    {
-        let abs_path = Self::abs_path_from_buffer(buffer, cx);
-        let active_session_id = self
-            .active_stack_frame
-            .as_ref()
-            .map(|frame| frame.session_id);
-        abs_path
-            .and_then(|path| self.breakpoints.get(&path))
-            .into_iter()
-            .flat_map(move |file_breakpoints| {
-                file_breakpoints.breakpoints.iter().filter_map({
-                    let range = range.clone();
-                    move |bp| {
-                        if let Some(range) = &range
-                            && (bp.position().cmp(&range.start, buffer_snapshot).is_lt()
-                                || bp.position().cmp(&range.end, buffer_snapshot).is_gt())
-                        {
-                            return None;
-                        }
-                        let session_state = active_session_id
-                            .and_then(|id| bp.session_state.get(&id))
-                            .copied();
-                        Some((&bp.bp, session_state))
-                    }
-                })
-            })
-    }
-
-    pub fn active_position(&self) -> Option<&ActiveStackFrame> {
-        self.active_stack_frame.as_ref()
-    }
-
-    pub fn remove_active_position(
-        &mut self,
-        session_id: Option<SessionId>,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(session_id) = session_id {
-            self.active_stack_frame
-                .take_if(|active_stack_frame| active_stack_frame.session_id == session_id);
-        } else {
-            self.active_stack_frame.take();
-        }
-
-        cx.emit(BreakpointStoreEvent::ClearDebugLines);
-        cx.notify();
-    }
-
-    pub fn set_active_position(&mut self, position: ActiveStackFrame, cx: &mut Context<Self>) {
-        if self
-            .active_stack_frame
-            .as_ref()
-            .is_some_and(|active_position| active_position == &position)
-        {
-            cx.emit(BreakpointStoreEvent::SetDebugLine);
-            return;
-        }
-
-        if self.active_stack_frame.is_some() {
-            cx.emit(BreakpointStoreEvent::ClearDebugLines);
-        }
-
-        self.active_stack_frame = Some(position);
-
-        cx.emit(BreakpointStoreEvent::SetDebugLine);
-        cx.notify();
-    }
-
-    pub fn breakpoint_at_row(
-        &self,
-        path: &Path,
-        row: u32,
-        cx: &App,
-    ) -> Option<(Entity<Buffer>, BreakpointWithPosition)> {
-        self.breakpoints.get(path).and_then(|breakpoints| {
-            let snapshot = breakpoints.buffer.read(cx).text_snapshot();
-
-            breakpoints
-                .breakpoints
-                .iter()
-                .find(|bp| bp.position().summary::<Point>(&snapshot).row == row)
-                .map(|breakpoint| (breakpoints.buffer.clone(), breakpoint.bp.clone()))
-        })
-    }
-
-    pub fn breakpoints_from_path(&self, path: &Arc<Path>) -> Vec<BreakpointWithPosition> {
-        self.breakpoints
-            .get(path)
-            .map(|bp| bp.breakpoints.iter().map(|bp| bp.bp.clone()).collect())
-            .unwrap_or_default()
-    }
-
-    pub fn source_breakpoints_from_path(
-        &self,
-        path: &Arc<Path>,
-        cx: &App,
-    ) -> Vec<SourceBreakpoint> {
-        self.breakpoints
-            .get(path)
-            .map(|bp| {
-                let snapshot = bp.buffer.read(cx).snapshot();
-                bp.breakpoints
-                    .iter()
-                    .map(|bp| {
-                        let position = snapshot.summary_for_anchor::<PointUtf16>(bp.position()).row;
-                        let bp = &bp.bp;
-                        SourceBreakpoint {
-                            row: position,
-                            path: path.clone(),
-                            state: bp.bp.state,
-                            message: bp.bp.message.clone(),
-                            condition: bp.bp.condition.clone(),
-                            hit_condition: bp.bp.hit_condition.clone(),
-                        }
-                    })
-                    .collect()
-            })
-            .unwrap_or_default()
-    }
-
-    pub fn all_breakpoints(&self) -> BTreeMap<Arc<Path>, Vec<BreakpointWithPosition>> {
-        self.breakpoints
-            .iter()
-            .map(|(path, bp)| {
-                (
-                    path.clone(),
-                    bp.breakpoints.iter().map(|bp| bp.bp.clone()).collect(),
-                )
-            })
-            .collect()
-    }
-    pub fn all_source_breakpoints(&self, cx: &App) -> BTreeMap<Arc<Path>, Vec<SourceBreakpoint>> {
-        self.breakpoints
-            .iter()
-            .map(|(path, bp)| {
-                let snapshot = bp.buffer.read(cx).snapshot();
-                (
-                    path.clone(),
-                    bp.breakpoints
-                        .iter()
-                        .map(|breakpoint| {
-                            let position = snapshot
-                                .summary_for_anchor::<PointUtf16>(breakpoint.position())
-                                .row;
-                            let breakpoint = &breakpoint.bp;
-                            SourceBreakpoint {
-                                row: position,
-                                path: path.clone(),
-                                message: breakpoint.bp.message.clone(),
-                                state: breakpoint.bp.state,
-                                hit_condition: breakpoint.bp.hit_condition.clone(),
-                                condition: breakpoint.bp.condition.clone(),
-                            }
-                        })
-                        .collect(),
-                )
-            })
-            .collect()
-    }
-
-    pub fn with_serialized_breakpoints(
-        &self,
-        breakpoints: BTreeMap<Arc<Path>, Vec<SourceBreakpoint>>,
-        cx: &mut Context<BreakpointStore>,
-    ) -> Task<Result<()>> {
-        if let BreakpointStoreMode::Local(mode) = &self.mode {
-            let mode = mode.clone();
-            cx.spawn(async move |this, cx| {
-                let mut new_breakpoints = BTreeMap::default();
-                for (path, bps) in breakpoints {
-                    if bps.is_empty() {
-                        continue;
-                    }
-                    let (worktree, relative_path) = mode
-                        .worktree_store
-                        .update(cx, |this, cx| {
-                            this.find_or_create_worktree(&path, false, cx)
-                        })?
-                        .await?;
-                    let buffer = mode
-                        .buffer_store
-                        .update(cx, |this, cx| {
-                            let path = ProjectPath {
-                                worktree_id: worktree.read(cx).id(),
-                                path: relative_path,
-                            };
-                            this.open_buffer(path, cx)
-                        })?
-                        .await;
-                    let Ok(buffer) = buffer else {
-                        log::error!("Todo: Serialized breakpoints which do not have buffer (yet)");
-                        continue;
-                    };
-                    let snapshot = buffer.read_with(cx, |buffer, _| buffer.snapshot())?;
-
-                    let mut breakpoints_for_file =
-                        this.update(cx, |_, cx| BreakpointsInFile::new(buffer, cx))?;
-
-                    for bp in bps {
-                        let max_point = snapshot.max_point_utf16();
-                        let point = PointUtf16::new(bp.row, 0);
-                        if point > max_point {
-                            log::error!("skipping a deserialized breakpoint that's out of range");
-                            continue;
-                        }
-                        let position = snapshot.anchor_after(point);
-                        breakpoints_for_file
-                            .breakpoints
-                            .push(StatefulBreakpoint::new(BreakpointWithPosition {
-                                position,
-                                bp: Breakpoint {
-                                    message: bp.message,
-                                    state: bp.state,
-                                    condition: bp.condition,
-                                    hit_condition: bp.hit_condition,
-                                },
-                            }))
-                    }
-                    new_breakpoints.insert(path, breakpoints_for_file);
-                }
-                this.update(cx, |this, cx| {
-                    for (path, count) in new_breakpoints.iter().map(|(path, bp_in_file)| {
-                        (path.to_string_lossy(), bp_in_file.breakpoints.len())
-                    }) {
-                        let breakpoint_str = if count > 1 {
-                            "breakpoints"
-                        } else {
-                            "breakpoint"
-                        };
-                        log::debug!("Deserialized {count} {breakpoint_str} at path: {path}");
-                    }
-
-                    this.breakpoints = new_breakpoints;
-
-                    cx.notify();
-                })?;
-
-                Ok(())
-            })
-        } else {
-            Task::ready(Ok(()))
-        }
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub(crate) fn breakpoint_paths(&self) -> Vec<Arc<Path>> {
-        self.breakpoints.keys().cloned().collect()
-    }
-}
-
-#[derive(Clone, Copy)]
-pub enum BreakpointUpdatedReason {
-    Toggled,
-    FileSaved,
-}
-
-pub enum BreakpointStoreEvent {
-    SetDebugLine,
-    ClearDebugLines,
-    BreakpointsUpdated(Arc<Path>, BreakpointUpdatedReason),
-    BreakpointsCleared(Vec<Arc<Path>>),
-}
-
-impl EventEmitter<BreakpointStoreEvent> for BreakpointStore {}
-
-type BreakpointMessage = Arc<str>;
-
-#[derive(Clone, Debug)]
-pub enum BreakpointEditAction {
-    Toggle,
-    InvertState,
-    EditLogMessage(BreakpointMessage),
-    EditCondition(BreakpointMessage),
-    EditHitCondition(BreakpointMessage),
-}
-
-#[derive(Copy, Clone, Debug, Hash, PartialEq, Eq)]
-pub enum BreakpointState {
-    Enabled,
-    Disabled,
-}
-
-impl BreakpointState {
-    #[inline]
-    pub fn is_enabled(&self) -> bool {
-        matches!(self, BreakpointState::Enabled)
-    }
-
-    #[inline]
-    pub fn is_disabled(&self) -> bool {
-        matches!(self, BreakpointState::Disabled)
-    }
-
-    #[inline]
-    pub fn to_int(self) -> i32 {
-        match self {
-            BreakpointState::Enabled => 0,
-            BreakpointState::Disabled => 1,
-        }
-    }
-}
-
-#[derive(Clone, Debug, Hash, PartialEq, Eq)]
-pub struct Breakpoint {
-    pub message: Option<BreakpointMessage>,
-    /// How many times do we hit the breakpoint until we actually stop at it e.g. (2 = 2 times of the breakpoint action)
-    pub hit_condition: Option<Arc<str>>,
-    pub condition: Option<BreakpointMessage>,
-    pub state: BreakpointState,
-}
-
-impl Breakpoint {
-    pub fn new_standard() -> Self {
-        Self {
-            state: BreakpointState::Enabled,
-            hit_condition: None,
-            condition: None,
-            message: None,
-        }
-    }
-
-    pub fn new_condition(hit_condition: &str) -> Self {
-        Self {
-            state: BreakpointState::Enabled,
-            condition: None,
-            hit_condition: Some(hit_condition.into()),
-            message: None,
-        }
-    }
-
-    pub fn new_log(log_message: &str) -> Self {
-        Self {
-            state: BreakpointState::Enabled,
-            hit_condition: None,
-            condition: None,
-            message: Some(log_message.into()),
-        }
-    }
-
-    fn to_proto(
-        &self,
-        _path: &Path,
-        position: &text::Anchor,
-        session_states: &HashMap<SessionId, BreakpointSessionState>,
-    ) -> Option<client::proto::Breakpoint> {
-        Some(client::proto::Breakpoint {
-            position: Some(serialize_text_anchor(position)),
-            state: match self.state {
-                BreakpointState::Enabled => proto::BreakpointState::Enabled.into(),
-                BreakpointState::Disabled => proto::BreakpointState::Disabled.into(),
-            },
-            message: self.message.as_ref().map(|s| String::from(s.as_ref())),
-            condition: self.condition.as_ref().map(|s| String::from(s.as_ref())),
-            hit_condition: self
-                .hit_condition
-                .as_ref()
-                .map(|s| String::from(s.as_ref())),
-            session_state: session_states
-                .iter()
-                .map(|(session_id, state)| {
-                    (
-                        session_id.to_proto(),
-                        proto::BreakpointSessionState {
-                            id: state.id,
-                            verified: state.verified,
-                        },
-                    )
-                })
-                .collect(),
-        })
-    }
-
-    fn from_proto(breakpoint: client::proto::Breakpoint) -> Option<Self> {
-        Some(Self {
-            state: match proto::BreakpointState::from_i32(breakpoint.state) {
-                Some(proto::BreakpointState::Disabled) => BreakpointState::Disabled,
-                None | Some(proto::BreakpointState::Enabled) => BreakpointState::Enabled,
-            },
-            message: breakpoint.message.map(Into::into),
-            condition: breakpoint.condition.map(Into::into),
-            hit_condition: breakpoint.hit_condition.map(Into::into),
-        })
-    }
-
-    #[inline]
-    pub fn is_enabled(&self) -> bool {
-        self.state.is_enabled()
-    }
-
-    #[inline]
-    pub fn is_disabled(&self) -> bool {
-        self.state.is_disabled()
-    }
-}
-
-/// Breakpoint for location within source code.
-#[derive(Clone, Debug, Hash, PartialEq, Eq)]
-pub struct SourceBreakpoint {
-    pub row: u32,
-    pub path: Arc<Path>,
-    pub message: Option<Arc<str>>,
-    pub condition: Option<Arc<str>>,
-    pub hit_condition: Option<Arc<str>>,
-    pub state: BreakpointState,
-}
-
-impl From<SourceBreakpoint> for dap::SourceBreakpoint {
-    fn from(bp: SourceBreakpoint) -> Self {
-        Self {
-            line: bp.row as u64 + 1,
-            column: None,
-            condition: bp
-                .condition
-                .map(|condition| String::from(condition.as_ref())),
-            hit_condition: bp
-                .hit_condition
-                .map(|hit_condition| String::from(hit_condition.as_ref())),
-            log_message: bp.message.map(|message| String::from(message.as_ref())),
-            mode: None,
-        }
-    }
-}
diff --git a/crates/project/src/debugger/dap_command.rs b/crates/project/src/debugger/dap_command.rs
deleted file mode 100644
index 772ff2dcfe..0000000000
--- a/crates/project/src/debugger/dap_command.rs
+++ /dev/null
@@ -1,1975 +0,0 @@
-use std::sync::Arc;
-
-use anyhow::{Context as _, Ok, Result};
-use base64::Engine;
-use dap::{
-    Capabilities, ContinueArguments, ExceptionFilterOptions, InitializeRequestArguments,
-    InitializeRequestArgumentsPathFormat, NextArguments, SetVariableResponse, SourceBreakpoint,
-    StepInArguments, StepOutArguments, SteppingGranularity, ValueFormat, Variable,
-    VariablesArgumentsFilter,
-    client::SessionId,
-    proto_conversions::ProtoConversion,
-    requests::{Continue, Next},
-};
-
-use rpc::proto;
-use serde_json::Value;
-use util::ResultExt;
-
-pub trait LocalDapCommand: 'static + Send + Sync + std::fmt::Debug {
-    type Response: 'static + Send + std::fmt::Debug;
-    type DapRequest: 'static + Send + dap::requests::Request;
-    /// Is this request idempotent? Is it safe to cache the response for as long as the execution environment is unchanged?
-    const CACHEABLE: bool = false;
-
-    fn is_supported(_capabilities: &Capabilities) -> bool {
-        true
-    }
-
-    fn to_dap(&self) -> <Self::DapRequest as dap::requests::Request>::Arguments;
-
-    fn response_from_dap(
-        &self,
-        message: <Self::DapRequest as dap::requests::Request>::Response,
-    ) -> Result<Self::Response>;
-}
-
-pub trait DapCommand: LocalDapCommand {
-    type ProtoRequest: 'static + Send;
-    type ProtoResponse: 'static + Send;
-
-    #[allow(dead_code)]
-    fn client_id_from_proto(request: &Self::ProtoRequest) -> SessionId;
-
-    #[allow(dead_code)]
-    fn from_proto(request: &Self::ProtoRequest) -> Self;
-
-    #[allow(unused)]
-    fn to_proto(&self, debug_client_id: SessionId, upstream_project_id: u64) -> Self::ProtoRequest;
-
-    #[allow(dead_code)]
-    fn response_to_proto(
-        debug_client_id: SessionId,
-        message: Self::Response,
-    ) -> Self::ProtoResponse;
-
-    #[allow(unused)]
-    fn response_from_proto(&self, message: Self::ProtoResponse) -> Result<Self::Response>;
-}
-
-impl<T: LocalDapCommand> LocalDapCommand for Arc<T> {
-    type Response = T::Response;
-    type DapRequest = T::DapRequest;
-
-    fn is_supported(capabilities: &Capabilities) -> bool {
-        T::is_supported(capabilities)
-    }
-
-    fn to_dap(&self) -> <Self::DapRequest as dap::requests::Request>::Arguments {
-        T::to_dap(self)
-    }
-
-    fn response_from_dap(
-        &self,
-        message: <Self::DapRequest as dap::requests::Request>::Response,
-    ) -> Result<Self::Response> {
-        T::response_from_dap(self, message)
-    }
-}
-
-impl<T: DapCommand> DapCommand for Arc<T> {
-    type ProtoRequest = T::ProtoRequest;
-    type ProtoResponse = T::ProtoResponse;
-
-    fn client_id_from_proto(request: &Self::ProtoRequest) -> SessionId {
-        T::client_id_from_proto(request)
-    }
-
-    fn from_proto(request: &Self::ProtoRequest) -> Self {
-        Arc::new(T::from_proto(request))
-    }
-
-    fn to_proto(&self, debug_client_id: SessionId, upstream_project_id: u64) -> Self::ProtoRequest {
-        T::to_proto(self, debug_client_id, upstream_project_id)
-    }
-
-    fn response_to_proto(
-        debug_client_id: SessionId,
-        message: Self::Response,
-    ) -> Self::ProtoResponse {
-        T::response_to_proto(debug_client_id, message)
-    }
-
-    fn response_from_proto(&self, message: Self::ProtoResponse) -> Result<Self::Response> {
-        T::response_from_proto(self, message)
-    }
-}
-
-#[derive(Debug, Hash, PartialEq, Eq)]
-pub struct StepCommand {
-    pub thread_id: i64,
-    pub granularity: Option<SteppingGranularity>,
-    pub single_thread: Option<bool>,
-}
-
-impl StepCommand {
-    fn from_proto(message: proto::DapNextRequest) -> Self {
-        const LINE: i32 = proto::SteppingGranularity::Line as i32;
-        const INSTRUCTION: i32 = proto::SteppingGranularity::Instruction as i32;
-
-        let granularity = message.granularity.map(|granularity| match granularity {
-            LINE => SteppingGranularity::Line,
-            INSTRUCTION => SteppingGranularity::Instruction,
-            _ => SteppingGranularity::Statement,
-        });
-
-        Self {
-            thread_id: message.thread_id,
-            granularity,
-            single_thread: message.single_thread,
-        }
-    }
-}
-
-#[derive(Debug, Hash, PartialEq, Eq)]
-pub(crate) struct NextCommand {
-    pub inner: StepCommand,
-}
-
-impl LocalDapCommand for NextCommand {
-    type Response = <Next as dap::requests::Request>::Response;
-    type DapRequest = Next;
-
-    fn to_dap(&self) -> <Self::DapRequest as dap::requests::Request>::Arguments {
-        NextArguments {
-            thread_id: self.inner.thread_id,
-            single_thread: self.inner.single_thread,
-            granularity: self.inner.granularity,
-        }
-    }
-    fn response_from_dap(
-        &self,
-        _message: <Self::DapRequest as dap::requests::Request>::Response,
-    ) -> Result<Self::Response> {
-        Ok(())
-    }
-}
-
-impl DapCommand for NextCommand {
-    type ProtoRequest = proto::DapNextRequest;
-    type ProtoResponse = proto::Ack;
-
-    fn client_id_from_proto(request: &Self::ProtoRequest) -> SessionId {
-        SessionId::from_proto(request.client_id)
-    }
-
-    fn from_proto(request: &Self::ProtoRequest) -> Self {
-        Self {
-            inner: StepCommand::from_proto(request.clone()),
-        }
-    }
-
-    fn response_to_proto(
-        _debug_client_id: SessionId,
-        _message: Self::Response,
-    ) -> Self::ProtoResponse {
-        proto::Ack {}
-    }
-
-    fn to_proto(
-        &self,
-        debug_client_id: SessionId,
-        upstream_project_id: u64,
-    ) -> proto::DapNextRequest {
-        proto::DapNextRequest {
-            project_id: upstream_project_id,
-            client_id: debug_client_id.to_proto(),
-            thread_id: self.inner.thread_id,
-            single_thread: self.inner.single_thread,
-            granularity: self.inner.granularity.map(|gran| gran.to_proto() as i32),
-        }
-    }
-
-    fn response_from_proto(&self, _message: Self::ProtoResponse) -> Result<Self::Response> {
-        Ok(())
-    }
-}
-
-#[derive(Debug, Hash, PartialEq, Eq)]
-pub(crate) struct StepInCommand {
-    pub inner: StepCommand,
-}
-
-impl LocalDapCommand for StepInCommand {
-    type Response = <dap::requests::StepIn as dap::requests::Request>::Response;
-    type DapRequest = dap::requests::StepIn;
-
-    fn to_dap(&self) -> <Self::DapRequest as dap::requests::Request>::Arguments {
-        StepInArguments {
-            thread_id: self.inner.thread_id,
-            single_thread: self.inner.single_thread,
-            target_id: None,
-            granularity: self.inner.granularity,
-        }
-    }
-
-    fn response_from_dap(
-        &self,
-        _message: <Self::DapRequest as dap::requests::Request>::Response,
-    ) -> Result<Self::Response> {
-        Ok(())
-    }
-}
-
-impl DapCommand for StepInCommand {
-    type ProtoRequest = proto::DapStepInRequest;
-    type ProtoResponse = proto::Ack;
-
-    fn client_id_from_proto(request: &Self::ProtoRequest) -> SessionId {
-        SessionId::from_proto(request.client_id)
-    }
-
-    fn from_proto(request: &Self::ProtoRequest) -> Self {
-        Self {
-            inner: StepCommand::from_proto(proto::DapNextRequest {
-                project_id: request.project_id,
-                client_id: request.client_id,
-                thread_id: request.thread_id,
-                single_thread: request.single_thread,
-                granularity: request.granularity,
-            }),
-        }
-    }
-
-    fn response_to_proto(
-        _debug_client_id: SessionId,
-        _message: Self::Response,
-    ) -> Self::ProtoResponse {
-        proto::Ack {}
-    }
-
-    fn to_proto(
-        &self,
-        debug_client_id: SessionId,
-        upstream_project_id: u64,
-    ) -> proto::DapStepInRequest {
-        proto::DapStepInRequest {
-            project_id: upstream_project_id,
-            client_id: debug_client_id.to_proto(),
-            thread_id: self.inner.thread_id,
-            single_thread: self.inner.single_thread,
-            granularity: self.inner.granularity.map(|gran| gran.to_proto() as i32),
-            target_id: None,
-        }
-    }
-
-    fn response_from_proto(&self, _message: Self::ProtoResponse) -> Result<Self::Response> {
-        Ok(())
-    }
-}
-
-#[derive(Debug, Hash, PartialEq, Eq)]
-pub(crate) struct StepOutCommand {
-    pub inner: StepCommand,
-}
-
-impl LocalDapCommand for StepOutCommand {
-    type Response = <dap::requests::StepOut as dap::requests::Request>::Response;
-    type DapRequest = dap::requests::StepOut;
-
-    fn to_dap(&self) -> <Self::DapRequest as dap::requests::Request>::Arguments {
-        StepOutArguments {
-            thread_id: self.inner.thread_id,
-            single_thread: self.inner.single_thread,
-            granularity: self.inner.granularity,
-        }
-    }
-
-    fn response_from_dap(
-        &self,
-        _message: <Self::DapRequest as dap::requests::Request>::Response,
-    ) -> Result<Self::Response> {
-        Ok(())
-    }
-}
-
-impl DapCommand for StepOutCommand {
-    type ProtoRequest = proto::DapStepOutRequest;
-    type ProtoResponse = proto::Ack;
-
-    fn client_id_from_proto(request: &Self::ProtoRequest) -> SessionId {
-        SessionId::from_proto(request.client_id)
-    }
-
-    fn from_proto(request: &Self::ProtoRequest) -> Self {
-        Self {
-            inner: StepCommand::from_proto(proto::DapNextRequest {
-                project_id: request.project_id,
-                client_id: request.client_id,
-                thread_id: request.thread_id,
-                single_thread: request.single_thread,
-                granularity: request.granularity,
-            }),
-        }
-    }
-
-    fn response_to_proto(
-        _debug_client_id: SessionId,
-        _message: Self::Response,
-    ) -> Self::ProtoResponse {
-        proto::Ack {}
-    }
-
-    fn to_proto(
-        &self,
-        debug_client_id: SessionId,
-        upstream_project_id: u64,
-    ) -> proto::DapStepOutRequest {
-        proto::DapStepOutRequest {
-            project_id: upstream_project_id,
-            client_id: debug_client_id.to_proto(),
-            thread_id: self.inner.thread_id,
-            single_thread: self.inner.single_thread,
-            granularity: self.inner.granularity.map(|gran| gran.to_proto() as i32),
-        }
-    }
-
-    fn response_from_proto(&self, _message: Self::ProtoResponse) -> Result<Self::Response> {
-        Ok(())
-    }
-}
-
-#[derive(Debug, Hash, PartialEq, Eq)]
-pub(crate) struct StepBackCommand {
-    pub inner: StepCommand,
-}
-impl LocalDapCommand for StepBackCommand {
-    type Response = <dap::requests::StepBack as dap::requests::Request>::Response;
-    type DapRequest = dap::requests::StepBack;
-
-    fn is_supported(capabilities: &Capabilities) -> bool {
-        capabilities.supports_step_back.unwrap_or_default()
-    }
-
-    fn to_dap(&self) -> <Self::DapRequest as dap::requests::Request>::Arguments {
-        dap::StepBackArguments {
-            thread_id: self.inner.thread_id,
-            single_thread: self.inner.single_thread,
-            granularity: self.inner.granularity,
-        }
-    }
-
-    fn response_from_dap(
-        &self,
-        _message: <Self::DapRequest as dap::requests::Request>::Response,
-    ) -> Result<Self::Response> {
-        Ok(())
-    }
-}
-
-impl DapCommand for StepBackCommand {
-    type ProtoRequest = proto::DapStepBackRequest;
-    type ProtoResponse = proto::Ack;
-
-    fn client_id_from_proto(request: &Self::ProtoRequest) -> SessionId {
-        SessionId::from_proto(request.client_id)
-    }
-
-    fn from_proto(request: &Self::ProtoRequest) -> Self {
-        Self {
-            inner: StepCommand::from_proto(proto::DapNextRequest {
-                project_id: request.project_id,
-                client_id: request.client_id,
-                thread_id: request.thread_id,
-                single_thread: request.single_thread,
-                granularity: request.granularity,
-            }),
-        }
-    }
-
-    fn response_to_proto(
-        _debug_client_id: SessionId,
-        _message: Self::Response,
-    ) -> Self::ProtoResponse {
-        proto::Ack {}
-    }
-
-    fn to_proto(
-        &self,
-        debug_client_id: SessionId,
-        upstream_project_id: u64,
-    ) -> proto::DapStepBackRequest {
-        proto::DapStepBackRequest {
-            project_id: upstream_project_id,
-            client_id: debug_client_id.to_proto(),
-            thread_id: self.inner.thread_id,
-            single_thread: self.inner.single_thread,
-            granularity: self.inner.granularity.map(|gran| gran.to_proto() as i32),
-        }
-    }
-
-    fn response_from_proto(&self, _message: Self::ProtoResponse) -> Result<Self::Response> {
-        Ok(())
-    }
-}
-
-#[derive(Debug, Hash, PartialEq, Eq)]
-pub(crate) struct ContinueCommand {
-    pub args: ContinueArguments,
-}
-
-impl LocalDapCommand for ContinueCommand {
-    type Response = <Continue as dap::requests::Request>::Response;
-    type DapRequest = Continue;
-
-    fn to_dap(&self) -> <Self::DapRequest as dap::requests::Request>::Arguments {
-        self.args.clone()
-    }
-
-    fn response_from_dap(
-        &self,
-        message: <Self::DapRequest as dap::requests::Request>::Response,
-    ) -> Result<Self::Response> {
-        Ok(message)
-    }
-}
-
-impl DapCommand for ContinueCommand {
-    type ProtoRequest = proto::DapContinueRequest;
-    type ProtoResponse = proto::DapContinueResponse;
-
-    fn client_id_from_proto(request: &Self::ProtoRequest) -> SessionId {
-        SessionId::from_proto(request.client_id)
-    }
-
-    fn to_proto(
-        &self,
-        debug_client_id: SessionId,
-        upstream_project_id: u64,
-    ) -> proto::DapContinueRequest {
-        proto::DapContinueRequest {
-            project_id: upstream_project_id,
-            client_id: debug_client_id.to_proto(),
-            thread_id: self.args.thread_id,
-            single_thread: self.args.single_thread,
-        }
-    }
-
-    fn from_proto(request: &Self::ProtoRequest) -> Self {
-        Self {
-            args: ContinueArguments {
-                thread_id: request.thread_id,
-                single_thread: request.single_thread,
-            },
-        }
-    }
-
-    fn response_from_proto(&self, message: Self::ProtoResponse) -> Result<Self::Response> {
-        Ok(Self::Response {
-            all_threads_continued: message.all_threads_continued,
-        })
-    }
-
-    fn response_to_proto(
-        debug_client_id: SessionId,
-        message: Self::Response,
-    ) -> Self::ProtoResponse {
-        proto::DapContinueResponse {
-            client_id: debug_client_id.to_proto(),
-            all_threads_continued: message.all_threads_continued,
-        }
-    }
-}
-
-#[derive(Debug, Hash, PartialEq, Eq)]
-pub(crate) struct PauseCommand {
-    pub thread_id: i64,
-}
-
-impl LocalDapCommand for PauseCommand {
-    type Response = <dap::requests::Pause as dap::requests::Request>::Response;
-    type DapRequest = dap::requests::Pause;
-    fn to_dap(&self) -> <Self::DapRequest as dap::requests::Request>::Arguments {
-        dap::PauseArguments {
-            thread_id: self.thread_id,
-        }
-    }
-
-    fn response_from_dap(
-        &self,
-        _message: <Self::DapRequest as dap::requests::Request>::Response,
-    ) -> Result<Self::Response> {
-        Ok(())
-    }
-}
-
-impl DapCommand for PauseCommand {
-    type ProtoRequest = proto::DapPauseRequest;
-    type ProtoResponse = proto::Ack;
-
-    fn client_id_from_proto(request: &Self::ProtoRequest) -> SessionId {
-        SessionId::from_proto(request.client_id)
-    }
-
-    fn from_proto(request: &Self::ProtoRequest) -> Self {
-        Self {
-            thread_id: request.thread_id,
-        }
-    }
-
-    fn to_proto(
-        &self,
-        debug_client_id: SessionId,
-        upstream_project_id: u64,
-    ) -> proto::DapPauseRequest {
-        proto::DapPauseRequest {
-            project_id: upstream_project_id,
-            client_id: debug_client_id.to_proto(),
-            thread_id: self.thread_id,
-        }
-    }
-
-    fn response_to_proto(
-        _debug_client_id: SessionId,
-        _message: Self::Response,
-    ) -> Self::ProtoResponse {
-        proto::Ack {}
-    }
-
-    fn response_from_proto(&self, _message: Self::ProtoResponse) -> Result<Self::Response> {
-        Ok(())
-    }
-}
-
-#[derive(Debug, Hash, PartialEq, Eq)]
-pub(crate) struct DisconnectCommand {
-    pub restart: Option<bool>,
-    pub terminate_debuggee: Option<bool>,
-    pub suspend_debuggee: Option<bool>,
-}
-
-impl LocalDapCommand for DisconnectCommand {
-    type Response = <dap::requests::Disconnect as dap::requests::Request>::Response;
-    type DapRequest = dap::requests::Disconnect;
-
-    fn to_dap(&self) -> <Self::DapRequest as dap::requests::Request>::Arguments {
-        dap::DisconnectArguments {
-            restart: self.restart,
-            terminate_debuggee: self.terminate_debuggee,
-            suspend_debuggee: self.suspend_debuggee,
-        }
-    }
-
-    fn response_from_dap(
-        &self,
-        _message: <Self::DapRequest as dap::requests::Request>::Response,
-    ) -> Result<Self::Response> {
-        Ok(())
-    }
-}
-
-impl DapCommand for DisconnectCommand {
-    type ProtoRequest = proto::DapDisconnectRequest;
-    type ProtoResponse = proto::Ack;
-
-    fn client_id_from_proto(request: &Self::ProtoRequest) -> SessionId {
-        SessionId::from_proto(request.client_id)
-    }
-
-    fn from_proto(request: &Self::ProtoRequest) -> Self {
-        Self {
-            restart: request.restart,
-            terminate_debuggee: request.terminate_debuggee,
-            suspend_debuggee: request.suspend_debuggee,
-        }
-    }
-
-    fn to_proto(
-        &self,
-        debug_client_id: SessionId,
-        upstream_project_id: u64,
-    ) -> proto::DapDisconnectRequest {
-        proto::DapDisconnectRequest {
-            project_id: upstream_project_id,
-            client_id: debug_client_id.to_proto(),
-            restart: self.restart,
-            terminate_debuggee: self.terminate_debuggee,
-            suspend_debuggee: self.suspend_debuggee,
-        }
-    }
-
-    fn response_to_proto(
-        _debug_client_id: SessionId,
-        _message: Self::Response,
-    ) -> Self::ProtoResponse {
-        proto::Ack {}
-    }
-
-    fn response_from_proto(&self, _message: Self::ProtoResponse) -> Result<Self::Response> {
-        Ok(())
-    }
-}
-
-#[derive(Debug, Hash, PartialEq, Eq)]
-pub(crate) struct TerminateThreadsCommand {
-    pub thread_ids: Option<Vec<i64>>,
-}
-
-impl LocalDapCommand for TerminateThreadsCommand {
-    type Response = <dap::requests::TerminateThreads as dap::requests::Request>::Response;
-    type DapRequest = dap::requests::TerminateThreads;
-
-    fn is_supported(capabilities: &Capabilities) -> bool {
-        capabilities
-            .supports_terminate_threads_request
-            .unwrap_or_default()
-    }
-
-    fn to_dap(&self) -> <Self::DapRequest as dap::requests::Request>::Arguments {
-        dap::TerminateThreadsArguments {
-            thread_ids: self.thread_ids.clone(),
-        }
-    }
-
-    fn response_from_dap(
-        &self,
-        _message: <Self::DapRequest as dap::requests::Request>::Response,
-    ) -> Result<Self::Response> {
-        Ok(())
-    }
-}
-
-impl DapCommand for TerminateThreadsCommand {
-    type ProtoRequest = proto::DapTerminateThreadsRequest;
-    type ProtoResponse = proto::Ack;
-
-    fn client_id_from_proto(request: &Self::ProtoRequest) -> SessionId {
-        SessionId::from_proto(request.client_id)
-    }
-
-    fn from_proto(request: &Self::ProtoRequest) -> Self {
-        let thread_ids = if request.thread_ids.is_empty() {
-            None
-        } else {
-            Some(request.thread_ids.clone())
-        };
-
-        Self { thread_ids }
-    }
-
-    fn to_proto(
-        &self,
-        debug_client_id: SessionId,
-        upstream_project_id: u64,
-    ) -> proto::DapTerminateThreadsRequest {
-        proto::DapTerminateThreadsRequest {
-            project_id: upstream_project_id,
-            client_id: debug_client_id.to_proto(),
-            thread_ids: self.thread_ids.clone().unwrap_or_default(),
-        }
-    }
-
-    fn response_to_proto(
-        _debug_client_id: SessionId,
-        _message: Self::Response,
-    ) -> Self::ProtoResponse {
-        proto::Ack {}
-    }
-
-    fn response_from_proto(&self, _message: Self::ProtoResponse) -> Result<Self::Response> {
-        Ok(())
-    }
-}
-
-#[derive(Debug, Hash, PartialEq, Eq)]
-pub(crate) struct TerminateCommand {
-    pub restart: Option<bool>,
-}
-
-impl LocalDapCommand for TerminateCommand {
-    type Response = <dap::requests::Terminate as dap::requests::Request>::Response;
-    type DapRequest = dap::requests::Terminate;
-
-    fn is_supported(capabilities: &Capabilities) -> bool {
-        capabilities.supports_terminate_request.unwrap_or_default()
-    }
-    fn to_dap(&self) -> <Self::DapRequest as dap::requests::Request>::Arguments {
-        dap::TerminateArguments {
-            restart: self.restart,
-        }
-    }
-
-    fn response_from_dap(
-        &self,
-        _message: <Self::DapRequest as dap::requests::Request>::Response,
-    ) -> Result<Self::Response> {
-        Ok(())
-    }
-}
-
-impl DapCommand for TerminateCommand {
-    type ProtoRequest = proto::DapTerminateRequest;
-    type ProtoResponse = proto::Ack;
-
-    fn client_id_from_proto(request: &Self::ProtoRequest) -> SessionId {
-        SessionId::from_proto(request.client_id)
-    }
-
-    fn from_proto(request: &Self::ProtoRequest) -> Self {
-        Self {
-            restart: request.restart,
-        }
-    }
-
-    fn to_proto(
-        &self,
-        debug_client_id: SessionId,
-        upstream_project_id: u64,
-    ) -> proto::DapTerminateRequest {
-        proto::DapTerminateRequest {
-            project_id: upstream_project_id,
-            client_id: debug_client_id.to_proto(),
-            restart: self.restart,
-        }
-    }
-
-    fn response_to_proto(
-        _debug_client_id: SessionId,
-        _message: Self::Response,
-    ) -> Self::ProtoResponse {
-        proto::Ack {}
-    }
-
-    fn response_from_proto(&self, _message: Self::ProtoResponse) -> Result<Self::Response> {
-        Ok(())
-    }
-}
-
-#[derive(Debug, Hash, PartialEq, Eq)]
-pub(crate) struct RestartCommand {
-    pub raw: serde_json::Value,
-}
-
-impl LocalDapCommand for RestartCommand {
-    type Response = <dap::requests::Restart as dap::requests::Request>::Response;
-    type DapRequest = dap::requests::Restart;
-
-    fn is_supported(capabilities: &Capabilities) -> bool {
-        capabilities.supports_restart_request.unwrap_or_default()
-    }
-
-    fn to_dap(&self) -> <Self::DapRequest as dap::requests::Request>::Arguments {
-        dap::RestartArguments {
-            raw: self.raw.clone(),
-        }
-    }
-
-    fn response_from_dap(
-        &self,
-        _message: <Self::DapRequest as dap::requests::Request>::Response,
-    ) -> Result<Self::Response> {
-        Ok(())
-    }
-}
-
-impl DapCommand for RestartCommand {
-    type ProtoRequest = proto::DapRestartRequest;
-    type ProtoResponse = proto::Ack;
-
-    fn client_id_from_proto(request: &Self::ProtoRequest) -> SessionId {
-        SessionId::from_proto(request.client_id)
-    }
-
-    fn from_proto(request: &Self::ProtoRequest) -> Self {
-        Self {
-            raw: serde_json::from_slice(&request.raw_args)
-                .log_err()
-                .unwrap_or(serde_json::Value::Null),
-        }
-    }
-
-    fn to_proto(
-        &self,
-        debug_client_id: SessionId,
-        upstream_project_id: u64,
-    ) -> proto::DapRestartRequest {
-        let raw_args = serde_json::to_vec(&self.raw).log_err().unwrap_or_default();
-
-        proto::DapRestartRequest {
-            project_id: upstream_project_id,
-            client_id: debug_client_id.to_proto(),
-            raw_args,
-        }
-    }
-
-    fn response_to_proto(
-        _debug_client_id: SessionId,
-        _message: Self::Response,
-    ) -> Self::ProtoResponse {
-        proto::Ack {}
-    }
-
-    fn response_from_proto(&self, _message: Self::ProtoResponse) -> Result<Self::Response> {
-        Ok(())
-    }
-}
-
-#[derive(Clone, Debug, Hash, PartialEq, Eq)]
-pub struct VariablesCommand {
-    pub variables_reference: u64,
-    pub filter: Option<VariablesArgumentsFilter>,
-    pub start: Option<u64>,
-    pub count: Option<u64>,
-    pub format: Option<ValueFormat>,
-}
-
-impl LocalDapCommand for VariablesCommand {
-    type Response = Vec<Variable>;
-    type DapRequest = dap::requests::Variables;
-    const CACHEABLE: bool = true;
-
-    fn to_dap(&self) -> <Self::DapRequest as dap::requests::Request>::Arguments {
-        dap::VariablesArguments {
-            variables_reference: self.variables_reference,
-            filter: self.filter,
-            start: self.start,
-            count: self.count,
-            format: self.format.clone(),
-        }
-    }
-
-    fn response_from_dap(
-        &self,
-        message: <Self::DapRequest as dap::requests::Request>::Response,
-    ) -> Result<Self::Response> {
-        Ok(message.variables)
-    }
-}
-
-impl DapCommand for VariablesCommand {
-    type ProtoRequest = proto::VariablesRequest;
-    type ProtoResponse = proto::DapVariables;
-
-    fn client_id_from_proto(request: &Self::ProtoRequest) -> SessionId {
-        SessionId::from_proto(request.client_id)
-    }
-
-    fn to_proto(&self, debug_client_id: SessionId, upstream_project_id: u64) -> Self::ProtoRequest {
-        proto::VariablesRequest {
-            project_id: upstream_project_id,
-            client_id: debug_client_id.to_proto(),
-            variables_reference: self.variables_reference,
-            filter: None,
-            start: self.start,
-            count: self.count,
-            format: None,
-        }
-    }
-
-    fn from_proto(request: &Self::ProtoRequest) -> Self {
-        Self {
-            variables_reference: request.variables_reference,
-            filter: None,
-            start: request.start,
-            count: request.count,
-            format: None,
-        }
-    }
-
-    fn response_to_proto(
-        debug_client_id: SessionId,
-        message: Self::Response,
-    ) -> Self::ProtoResponse {
-        proto::DapVariables {
-            client_id: debug_client_id.to_proto(),
-            variables: message.to_proto(),
-        }
-    }
-
-    fn response_from_proto(&self, message: Self::ProtoResponse) -> Result<Self::Response> {
-        Ok(Vec::from_proto(message.variables))
-    }
-}
-
-#[derive(Debug, Hash, PartialEq, Eq)]
-pub(crate) struct SetVariableValueCommand {
-    pub name: String,
-    pub value: String,
-    pub variables_reference: u64,
-}
-impl LocalDapCommand for SetVariableValueCommand {
-    type Response = SetVariableResponse;
-    type DapRequest = dap::requests::SetVariable;
-    fn is_supported(capabilities: &Capabilities) -> bool {
-        capabilities.supports_set_variable.unwrap_or_default()
-    }
-    fn to_dap(&self) -> <Self::DapRequest as dap::requests::Request>::Arguments {
-        dap::SetVariableArguments {
-            format: None,
-            name: self.name.clone(),
-            value: self.value.clone(),
-            variables_reference: self.variables_reference,
-        }
-    }
-    fn response_from_dap(
-        &self,
-        message: <Self::DapRequest as dap::requests::Request>::Response,
-    ) -> Result<Self::Response> {
-        Ok(message)
-    }
-}
-
-impl DapCommand for SetVariableValueCommand {
-    type ProtoRequest = proto::DapSetVariableValueRequest;
-    type ProtoResponse = proto::DapSetVariableValueResponse;
-
-    fn client_id_from_proto(request: &Self::ProtoRequest) -> SessionId {
-        SessionId::from_proto(request.client_id)
-    }
-
-    fn to_proto(&self, debug_client_id: SessionId, upstream_project_id: u64) -> Self::ProtoRequest {
-        proto::DapSetVariableValueRequest {
-            project_id: upstream_project_id,
-            client_id: debug_client_id.to_proto(),
-            variables_reference: self.variables_reference,
-            value: self.value.clone(),
-            name: self.name.clone(),
-        }
-    }
-
-    fn from_proto(request: &Self::ProtoRequest) -> Self {
-        Self {
-            variables_reference: request.variables_reference,
-            name: request.name.clone(),
-            value: request.value.clone(),
-        }
-    }
-
-    fn response_to_proto(
-        debug_client_id: SessionId,
-        message: Self::Response,
-    ) -> Self::ProtoResponse {
-        proto::DapSetVariableValueResponse {
-            client_id: debug_client_id.to_proto(),
-            value: message.value,
-            variable_type: message.type_,
-            named_variables: message.named_variables,
-            variables_reference: message.variables_reference,
-            indexed_variables: message.indexed_variables,
-            memory_reference: message.memory_reference,
-        }
-    }
-
-    fn response_from_proto(&self, message: Self::ProtoResponse) -> Result<Self::Response> {
-        Ok(SetVariableResponse {
-            value: message.value,
-            type_: message.variable_type,
-            variables_reference: message.variables_reference,
-            named_variables: message.named_variables,
-            indexed_variables: message.indexed_variables,
-            memory_reference: message.memory_reference,
-            value_location_reference: None, // TODO
-        })
-    }
-}
-
-#[derive(Debug, Clone, Hash, PartialEq, Eq)]
-pub(crate) struct RestartStackFrameCommand {
-    pub stack_frame_id: u64,
-}
-
-impl LocalDapCommand for RestartStackFrameCommand {
-    type Response = <dap::requests::RestartFrame as dap::requests::Request>::Response;
-    type DapRequest = dap::requests::RestartFrame;
-
-    fn is_supported(capabilities: &Capabilities) -> bool {
-        capabilities.supports_restart_frame.unwrap_or_default()
-    }
-
-    fn to_dap(&self) -> <Self::DapRequest as dap::requests::Request>::Arguments {
-        dap::RestartFrameArguments {
-            frame_id: self.stack_frame_id,
-        }
-    }
-
-    fn response_from_dap(
-        &self,
-        _message: <Self::DapRequest as dap::requests::Request>::Response,
-    ) -> Result<Self::Response> {
-        Ok(())
-    }
-}
-
-impl DapCommand for RestartStackFrameCommand {
-    type ProtoRequest = proto::DapRestartStackFrameRequest;
-    type ProtoResponse = proto::Ack;
-
-    fn client_id_from_proto(request: &Self::ProtoRequest) -> SessionId {
-        SessionId::from_proto(request.client_id)
-    }
-
-    fn from_proto(request: &Self::ProtoRequest) -> Self {
-        Self {
-            stack_frame_id: request.stack_frame_id,
-        }
-    }
-
-    fn to_proto(
-        &self,
-        debug_client_id: SessionId,
-        upstream_project_id: u64,
-    ) -> proto::DapRestartStackFrameRequest {
-        proto::DapRestartStackFrameRequest {
-            project_id: upstream_project_id,
-            client_id: debug_client_id.to_proto(),
-            stack_frame_id: self.stack_frame_id,
-        }
-    }
-
-    fn response_to_proto(
-        _debug_client_id: SessionId,
-        _message: Self::Response,
-    ) -> Self::ProtoResponse {
-        proto::Ack {}
-    }
-
-    fn response_from_proto(&self, _message: Self::ProtoResponse) -> Result<Self::Response> {
-        Ok(())
-    }
-}
-
-#[derive(Debug, Clone, Hash, PartialEq, Eq)]
-pub(crate) struct ModulesCommand;
-
-impl LocalDapCommand for ModulesCommand {
-    type Response = Vec<dap::Module>;
-    type DapRequest = dap::requests::Modules;
-    const CACHEABLE: bool = true;
-
-    fn is_supported(capabilities: &Capabilities) -> bool {
-        capabilities.supports_modules_request.unwrap_or_default()
-    }
-
-    fn to_dap(&self) -> <Self::DapRequest as dap::requests::Request>::Arguments {
-        dap::ModulesArguments {
-            start_module: None,
-            module_count: None,
-        }
-    }
-
-    fn response_from_dap(
-        &self,
-        message: <Self::DapRequest as dap::requests::Request>::Response,
-    ) -> Result<Self::Response> {
-        Ok(message.modules)
-    }
-}
-
-impl DapCommand for ModulesCommand {
-    type ProtoRequest = proto::DapModulesRequest;
-    type ProtoResponse = proto::DapModulesResponse;
-
-    fn client_id_from_proto(request: &Self::ProtoRequest) -> SessionId {
-        SessionId::from_proto(request.client_id)
-    }
-
-    fn from_proto(_request: &Self::ProtoRequest) -> Self {
-        Self {}
-    }
-
-    fn to_proto(
-        &self,
-        debug_client_id: SessionId,
-        upstream_project_id: u64,
-    ) -> proto::DapModulesRequest {
-        proto::DapModulesRequest {
-            project_id: upstream_project_id,
-            client_id: debug_client_id.to_proto(),
-        }
-    }
-
-    fn response_to_proto(
-        debug_client_id: SessionId,
-        message: Self::Response,
-    ) -> Self::ProtoResponse {
-        proto::DapModulesResponse {
-            modules: message
-                .into_iter()
-                .map(|module| module.to_proto())
-                .collect(),
-            client_id: debug_client_id.to_proto(),
-        }
-    }
-
-    fn response_from_proto(&self, message: Self::ProtoResponse) -> Result<Self::Response> {
-        Ok(message
-            .modules
-            .into_iter()
-            .filter_map(|module| dap::Module::from_proto(module).ok())
-            .collect())
-    }
-}
-
-#[derive(Debug, Clone, Hash, PartialEq, Eq)]
-pub(crate) struct LoadedSourcesCommand;
-
-impl LocalDapCommand for LoadedSourcesCommand {
-    type Response = Vec<dap::Source>;
-    type DapRequest = dap::requests::LoadedSources;
-    const CACHEABLE: bool = true;
-
-    fn is_supported(capabilities: &Capabilities) -> bool {
-        capabilities
-            .supports_loaded_sources_request
-            .unwrap_or_default()
-    }
-    fn to_dap(&self) -> <Self::DapRequest as dap::requests::Request>::Arguments {
-        dap::LoadedSourcesArguments {}
-    }
-
-    fn response_from_dap(
-        &self,
-        message: <Self::DapRequest as dap::requests::Request>::Response,
-    ) -> Result<Self::Response> {
-        Ok(message.sources)
-    }
-}
-
-impl DapCommand for LoadedSourcesCommand {
-    type ProtoRequest = proto::DapLoadedSourcesRequest;
-    type ProtoResponse = proto::DapLoadedSourcesResponse;
-
-    fn client_id_from_proto(request: &Self::ProtoRequest) -> SessionId {
-        SessionId::from_proto(request.client_id)
-    }
-
-    fn from_proto(_request: &Self::ProtoRequest) -> Self {
-        Self {}
-    }
-
-    fn to_proto(
-        &self,
-        debug_client_id: SessionId,
-        upstream_project_id: u64,
-    ) -> proto::DapLoadedSourcesRequest {
-        proto::DapLoadedSourcesRequest {
-            project_id: upstream_project_id,
-            client_id: debug_client_id.to_proto(),
-        }
-    }
-
-    fn response_to_proto(
-        debug_client_id: SessionId,
-        message: Self::Response,
-    ) -> Self::ProtoResponse {
-        proto::DapLoadedSourcesResponse {
-            sources: message
-                .into_iter()
-                .map(|source| source.to_proto())
-                .collect(),
-            client_id: debug_client_id.to_proto(),
-        }
-    }
-
-    fn response_from_proto(&self, message: Self::ProtoResponse) -> Result<Self::Response> {
-        Ok(message
-            .sources
-            .into_iter()
-            .map(dap::Source::from_proto)
-            .collect())
-    }
-}
-
-#[derive(Debug, Clone, Hash, PartialEq, Eq)]
-pub(crate) struct StackTraceCommand {
-    pub thread_id: i64,
-    pub start_frame: Option<u64>,
-    pub levels: Option<u64>,
-}
-
-impl LocalDapCommand for StackTraceCommand {
-    type Response = Vec<dap::StackFrame>;
-    type DapRequest = dap::requests::StackTrace;
-    const CACHEABLE: bool = true;
-
-    fn to_dap(&self) -> <Self::DapRequest as dap::requests::Request>::Arguments {
-        dap::StackTraceArguments {
-            thread_id: self.thread_id,
-            start_frame: self.start_frame,
-            levels: self.levels,
-            format: None,
-        }
-    }
-
-    fn response_from_dap(
-        &self,
-        message: <Self::DapRequest as dap::requests::Request>::Response,
-    ) -> Result<Self::Response> {
-        Ok(message.stack_frames)
-    }
-}
-
-impl DapCommand for StackTraceCommand {
-    type ProtoRequest = proto::DapStackTraceRequest;
-    type ProtoResponse = proto::DapStackTraceResponse;
-
-    fn to_proto(&self, debug_client_id: SessionId, upstream_project_id: u64) -> Self::ProtoRequest {
-        proto::DapStackTraceRequest {
-            project_id: upstream_project_id,
-            client_id: debug_client_id.to_proto(),
-            thread_id: self.thread_id,
-            start_frame: self.start_frame,
-            stack_trace_levels: self.levels,
-        }
-    }
-
-    fn from_proto(request: &Self::ProtoRequest) -> Self {
-        Self {
-            thread_id: request.thread_id,
-            start_frame: request.start_frame,
-            levels: request.stack_trace_levels,
-        }
-    }
-
-    fn client_id_from_proto(request: &Self::ProtoRequest) -> SessionId {
-        SessionId::from_proto(request.client_id)
-    }
-
-    fn response_from_proto(&self, message: Self::ProtoResponse) -> Result<Self::Response> {
-        Ok(message
-            .frames
-            .into_iter()
-            .map(dap::StackFrame::from_proto)
-            .collect())
-    }
-
-    fn response_to_proto(
-        _debug_client_id: SessionId,
-        message: Self::Response,
-    ) -> Self::ProtoResponse {
-        proto::DapStackTraceResponse {
-            frames: message.to_proto(),
-        }
-    }
-}
-
-#[derive(Debug, Clone, Hash, PartialEq, Eq)]
-pub(crate) struct ScopesCommand {
-    pub stack_frame_id: u64,
-}
-
-impl LocalDapCommand for ScopesCommand {
-    type Response = Vec<dap::Scope>;
-    type DapRequest = dap::requests::Scopes;
-    const CACHEABLE: bool = true;
-
-    fn to_dap(&self) -> <Self::DapRequest as dap::requests::Request>::Arguments {
-        dap::ScopesArguments {
-            frame_id: self.stack_frame_id,
-        }
-    }
-
-    fn response_from_dap(
-        &self,
-        message: <Self::DapRequest as dap::requests::Request>::Response,
-    ) -> Result<Self::Response> {
-        Ok(message.scopes)
-    }
-}
-
-impl DapCommand for ScopesCommand {
-    type ProtoRequest = proto::DapScopesRequest;
-    type ProtoResponse = proto::DapScopesResponse;
-
-    fn to_proto(&self, debug_client_id: SessionId, upstream_project_id: u64) -> Self::ProtoRequest {
-        proto::DapScopesRequest {
-            project_id: upstream_project_id,
-            client_id: debug_client_id.to_proto(),
-            stack_frame_id: self.stack_frame_id,
-        }
-    }
-
-    fn from_proto(request: &Self::ProtoRequest) -> Self {
-        Self {
-            stack_frame_id: request.stack_frame_id,
-        }
-    }
-
-    fn client_id_from_proto(request: &Self::ProtoRequest) -> SessionId {
-        SessionId::from_proto(request.client_id)
-    }
-
-    fn response_from_proto(&self, message: Self::ProtoResponse) -> Result<Self::Response> {
-        Ok(Vec::from_proto(message.scopes))
-    }
-
-    fn response_to_proto(
-        _debug_client_id: SessionId,
-        message: Self::Response,
-    ) -> Self::ProtoResponse {
-        proto::DapScopesResponse {
-            scopes: message.to_proto(),
-        }
-    }
-}
-
-impl LocalDapCommand for super::session::CompletionsQuery {
-    type Response = dap::CompletionsResponse;
-    type DapRequest = dap::requests::Completions;
-    const CACHEABLE: bool = true;
-
-    fn to_dap(&self) -> <Self::DapRequest as dap::requests::Request>::Arguments {
-        dap::CompletionsArguments {
-            text: self.query.clone(),
-            frame_id: self.frame_id,
-            column: self.column,
-            line: None,
-        }
-    }
-
-    fn response_from_dap(
-        &self,
-        message: <Self::DapRequest as dap::requests::Request>::Response,
-    ) -> Result<Self::Response> {
-        Ok(message)
-    }
-
-    fn is_supported(capabilities: &Capabilities) -> bool {
-        capabilities
-            .supports_completions_request
-            .unwrap_or_default()
-    }
-}
-
-impl DapCommand for super::session::CompletionsQuery {
-    type ProtoRequest = proto::DapCompletionRequest;
-    type ProtoResponse = proto::DapCompletionResponse;
-
-    fn to_proto(&self, debug_client_id: SessionId, upstream_project_id: u64) -> Self::ProtoRequest {
-        proto::DapCompletionRequest {
-            client_id: debug_client_id.to_proto(),
-            project_id: upstream_project_id,
-            frame_id: self.frame_id,
-            query: self.query.clone(),
-            column: self.column,
-            line: self.line,
-        }
-    }
-
-    fn client_id_from_proto(request: &Self::ProtoRequest) -> SessionId {
-        SessionId::from_proto(request.client_id)
-    }
-
-    fn from_proto(request: &Self::ProtoRequest) -> Self {
-        Self {
-            query: request.query.clone(),
-            frame_id: request.frame_id,
-            column: request.column,
-            line: request.line,
-        }
-    }
-
-    fn response_from_proto(&self, message: Self::ProtoResponse) -> Result<Self::Response> {
-        Ok(dap::CompletionsResponse {
-            targets: Vec::from_proto(message.completions),
-        })
-    }
-
-    fn response_to_proto(
-        _debug_client_id: SessionId,
-        message: Self::Response,
-    ) -> Self::ProtoResponse {
-        proto::DapCompletionResponse {
-            client_id: _debug_client_id.to_proto(),
-            completions: message.targets.to_proto(),
-        }
-    }
-}
-
-#[derive(Debug, Clone, Hash, PartialEq, Eq)]
-pub(crate) struct EvaluateCommand {
-    pub expression: String,
-    pub frame_id: Option<u64>,
-    pub context: Option<dap::EvaluateArgumentsContext>,
-    pub source: Option<dap::Source>,
-}
-
-impl LocalDapCommand for EvaluateCommand {
-    type Response = dap::EvaluateResponse;
-    type DapRequest = dap::requests::Evaluate;
-    fn to_dap(&self) -> <Self::DapRequest as dap::requests::Request>::Arguments {
-        dap::EvaluateArguments {
-            expression: self.expression.clone(),
-            frame_id: self.frame_id,
-            context: self.context.clone(),
-            source: self.source.clone(),
-            line: None,
-            column: None,
-            format: None,
-        }
-    }
-
-    fn response_from_dap(
-        &self,
-        message: <Self::DapRequest as dap::requests::Request>::Response,
-    ) -> Result<Self::Response> {
-        Ok(message)
-    }
-}
-impl DapCommand for EvaluateCommand {
-    type ProtoRequest = proto::DapEvaluateRequest;
-    type ProtoResponse = proto::DapEvaluateResponse;
-
-    fn to_proto(&self, debug_client_id: SessionId, upstream_project_id: u64) -> Self::ProtoRequest {
-        proto::DapEvaluateRequest {
-            client_id: debug_client_id.to_proto(),
-            project_id: upstream_project_id,
-            expression: self.expression.clone(),
-            frame_id: self.frame_id,
-            context: self
-                .context
-                .clone()
-                .map(|context| context.to_proto().into()),
-        }
-    }
-
-    fn client_id_from_proto(request: &Self::ProtoRequest) -> SessionId {
-        SessionId::from_proto(request.client_id)
-    }
-
-    fn from_proto(request: &Self::ProtoRequest) -> Self {
-        Self {
-            expression: request.expression.clone(),
-            frame_id: request.frame_id,
-            context: Some(dap::EvaluateArgumentsContext::from_proto(request.context())),
-            source: None,
-        }
-    }
-
-    fn response_from_proto(&self, message: Self::ProtoResponse) -> Result<Self::Response> {
-        Ok(dap::EvaluateResponse {
-            result: message.result.clone(),
-            type_: message.evaluate_type.clone(),
-            presentation_hint: None,
-            variables_reference: message.variable_reference,
-            named_variables: message.named_variables,
-            indexed_variables: message.indexed_variables,
-            memory_reference: message.memory_reference,
-            value_location_reference: None, //TODO
-        })
-    }
-
-    fn response_to_proto(
-        _debug_client_id: SessionId,
-        message: Self::Response,
-    ) -> Self::ProtoResponse {
-        proto::DapEvaluateResponse {
-            result: message.result,
-            evaluate_type: message.type_,
-            variable_reference: message.variables_reference,
-            named_variables: message.named_variables,
-            indexed_variables: message.indexed_variables,
-            memory_reference: message.memory_reference,
-        }
-    }
-}
-
-#[derive(Debug, Clone, Hash, PartialEq, Eq)]
-pub(crate) struct ThreadsCommand;
-
-impl LocalDapCommand for ThreadsCommand {
-    type Response = Vec<dap::Thread>;
-    type DapRequest = dap::requests::Threads;
-    const CACHEABLE: bool = true;
-
-    fn to_dap(&self) -> <Self::DapRequest as dap::requests::Request>::Arguments {
-        dap::ThreadsArgument {}
-    }
-
-    fn response_from_dap(
-        &self,
-        message: <Self::DapRequest as dap::requests::Request>::Response,
-    ) -> Result<Self::Response> {
-        Ok(message.threads)
-    }
-}
-
-impl DapCommand for ThreadsCommand {
-    type ProtoRequest = proto::DapThreadsRequest;
-    type ProtoResponse = proto::DapThreadsResponse;
-
-    fn to_proto(&self, debug_client_id: SessionId, upstream_project_id: u64) -> Self::ProtoRequest {
-        proto::DapThreadsRequest {
-            project_id: upstream_project_id,
-            client_id: debug_client_id.to_proto(),
-        }
-    }
-
-    fn from_proto(_request: &Self::ProtoRequest) -> Self {
-        Self {}
-    }
-
-    fn client_id_from_proto(request: &Self::ProtoRequest) -> SessionId {
-        SessionId::from_proto(request.client_id)
-    }
-
-    fn response_from_proto(&self, message: Self::ProtoResponse) -> Result<Self::Response> {
-        Ok(Vec::from_proto(message.threads))
-    }
-
-    fn response_to_proto(
-        _debug_client_id: SessionId,
-        message: Self::Response,
-    ) -> Self::ProtoResponse {
-        proto::DapThreadsResponse {
-            threads: message.to_proto(),
-        }
-    }
-}
-
-#[derive(Clone, Debug, Hash, PartialEq)]
-pub(super) struct Initialize {
-    pub(super) adapter_id: String,
-}
-
-fn dap_client_capabilities(adapter_id: String) -> InitializeRequestArguments {
-    InitializeRequestArguments {
-        client_id: Some("zed".to_owned()),
-        client_name: Some("Zed".to_owned()),
-        adapter_id,
-        locale: Some("en-US".to_owned()),
-        path_format: Some(InitializeRequestArgumentsPathFormat::Path),
-        supports_variable_type: Some(true),
-        supports_variable_paging: Some(false),
-        supports_run_in_terminal_request: Some(true),
-        supports_memory_references: Some(true),
-        supports_progress_reporting: Some(false),
-        supports_invalidated_event: Some(false),
-        lines_start_at1: Some(true),
-        columns_start_at1: Some(true),
-        supports_memory_event: Some(false),
-        supports_args_can_be_interpreted_by_shell: Some(false),
-        supports_start_debugging_request: Some(true),
-        supports_ansistyling: Some(true),
-    }
-}
-
-impl LocalDapCommand for Initialize {
-    type Response = Capabilities;
-    type DapRequest = dap::requests::Initialize;
-
-    fn to_dap(&self) -> <Self::DapRequest as dap::requests::Request>::Arguments {
-        dap_client_capabilities(self.adapter_id.clone())
-    }
-
-    fn response_from_dap(
-        &self,
-        message: <Self::DapRequest as dap::requests::Request>::Response,
-    ) -> Result<Self::Response> {
-        Ok(message)
-    }
-}
-
-#[derive(Clone, Debug, Hash, PartialEq)]
-pub(super) struct ConfigurationDone {}
-
-impl LocalDapCommand for ConfigurationDone {
-    type Response = ();
-    type DapRequest = dap::requests::ConfigurationDone;
-
-    fn is_supported(capabilities: &Capabilities) -> bool {
-        capabilities
-            .supports_configuration_done_request
-            .unwrap_or_default()
-    }
-
-    fn to_dap(&self) -> <Self::DapRequest as dap::requests::Request>::Arguments {
-        dap::ConfigurationDoneArguments {}
-    }
-
-    fn response_from_dap(
-        &self,
-        message: <Self::DapRequest as dap::requests::Request>::Response,
-    ) -> Result<Self::Response> {
-        Ok(message)
-    }
-}
-
-#[derive(Clone, Debug, Hash, PartialEq)]
-pub(super) struct Launch {
-    pub(super) raw: Value,
-}
-
-impl LocalDapCommand for Launch {
-    type Response = ();
-    type DapRequest = dap::requests::Launch;
-
-    fn to_dap(&self) -> <Self::DapRequest as dap::requests::Request>::Arguments {
-        dap::LaunchRequestArguments {
-            raw: self.raw.clone(),
-        }
-    }
-
-    fn response_from_dap(
-        &self,
-        message: <Self::DapRequest as dap::requests::Request>::Response,
-    ) -> Result<Self::Response> {
-        Ok(message)
-    }
-}
-
-#[derive(Clone, Debug, Hash, PartialEq)]
-pub(super) struct Attach {
-    pub(super) raw: Value,
-}
-
-impl LocalDapCommand for Attach {
-    type Response = ();
-    type DapRequest = dap::requests::Attach;
-
-    fn to_dap(&self) -> <Self::DapRequest as dap::requests::Request>::Arguments {
-        dap::AttachRequestArguments {
-            raw: self.raw.clone(),
-        }
-    }
-
-    fn response_from_dap(
-        &self,
-        message: <Self::DapRequest as dap::requests::Request>::Response,
-    ) -> Result<Self::Response> {
-        Ok(message)
-    }
-}
-
-#[derive(Clone, Debug, Hash, PartialEq)]
-pub(super) struct SetBreakpoints {
-    pub(super) source: dap::Source,
-    pub(super) breakpoints: Vec<SourceBreakpoint>,
-    pub(super) source_modified: Option<bool>,
-}
-
-impl LocalDapCommand for SetBreakpoints {
-    type Response = Vec<dap::Breakpoint>;
-    type DapRequest = dap::requests::SetBreakpoints;
-
-    fn to_dap(&self) -> <Self::DapRequest as dap::requests::Request>::Arguments {
-        dap::SetBreakpointsArguments {
-            lines: None,
-            source_modified: self.source_modified,
-            source: self.source.clone(),
-            breakpoints: Some(self.breakpoints.clone()),
-        }
-    }
-
-    fn response_from_dap(
-        &self,
-        message: <Self::DapRequest as dap::requests::Request>::Response,
-    ) -> Result<Self::Response> {
-        Ok(message.breakpoints)
-    }
-}
-
-#[derive(Clone, Debug, Hash, PartialEq, Eq)]
-pub enum DataBreakpointContext {
-    Variable {
-        variables_reference: u64,
-        name: String,
-        bytes: Option<u64>,
-    },
-    Expression {
-        expression: String,
-        frame_id: Option<u64>,
-    },
-    Address {
-        address: String,
-        bytes: Option<u64>,
-    },
-}
-
-impl DataBreakpointContext {
-    pub fn human_readable_label(&self) -> String {
-        match self {
-            DataBreakpointContext::Variable { name, .. } => format!("Variable: {}", name),
-            DataBreakpointContext::Expression { expression, .. } => {
-                format!("Expression: {}", expression)
-            }
-            DataBreakpointContext::Address { address, bytes } => {
-                let mut label = format!("Address: {}", address);
-                if let Some(bytes) = bytes {
-                    label.push_str(&format!(
-                        " ({} byte{})",
-                        bytes,
-                        if *bytes == 1 { "" } else { "s" }
-                    ));
-                }
-                label
-            }
-        }
-    }
-}
-
-#[derive(Clone, Debug, Hash, PartialEq, Eq)]
-pub(crate) struct DataBreakpointInfoCommand {
-    pub context: Arc<DataBreakpointContext>,
-    pub mode: Option<String>,
-}
-
-impl LocalDapCommand for DataBreakpointInfoCommand {
-    type Response = dap::DataBreakpointInfoResponse;
-    type DapRequest = dap::requests::DataBreakpointInfo;
-    const CACHEABLE: bool = true;
-
-    // todo(debugger): We should expand this trait in the future to take a &self
-    // Depending on this command is_supported could be differentb
-    fn is_supported(capabilities: &Capabilities) -> bool {
-        capabilities.supports_data_breakpoints.unwrap_or(false)
-    }
-
-    fn to_dap(&self) -> <Self::DapRequest as dap::requests::Request>::Arguments {
-        let (variables_reference, name, frame_id, as_address, bytes) = match &*self.context {
-            DataBreakpointContext::Variable {
-                variables_reference,
-                name,
-                bytes,
-            } => (
-                Some(*variables_reference),
-                name.clone(),
-                None,
-                Some(false),
-                *bytes,
-            ),
-            DataBreakpointContext::Expression {
-                expression,
-                frame_id,
-            } => (None, expression.clone(), *frame_id, Some(false), None),
-            DataBreakpointContext::Address { address, bytes } => {
-                (None, address.clone(), None, Some(true), *bytes)
-            }
-        };
-
-        dap::DataBreakpointInfoArguments {
-            variables_reference,
-            name,
-            frame_id,
-            bytes,
-            as_address,
-            mode: self.mode.clone(),
-        }
-    }
-
-    fn response_from_dap(
-        &self,
-        message: <Self::DapRequest as dap::requests::Request>::Response,
-    ) -> Result<Self::Response> {
-        Ok(message)
-    }
-}
-
-#[derive(Clone, Debug, Hash, PartialEq, Eq)]
-pub(crate) struct SetDataBreakpointsCommand {
-    pub breakpoints: Vec<dap::DataBreakpoint>,
-}
-
-impl LocalDapCommand for SetDataBreakpointsCommand {
-    type Response = Vec<dap::Breakpoint>;
-    type DapRequest = dap::requests::SetDataBreakpoints;
-
-    fn is_supported(capabilities: &Capabilities) -> bool {
-        capabilities.supports_data_breakpoints.unwrap_or(false)
-    }
-
-    fn to_dap(&self) -> <Self::DapRequest as dap::requests::Request>::Arguments {
-        dap::SetDataBreakpointsArguments {
-            breakpoints: self.breakpoints.clone(),
-        }
-    }
-
-    fn response_from_dap(
-        &self,
-        message: <Self::DapRequest as dap::requests::Request>::Response,
-    ) -> Result<Self::Response> {
-        Ok(message.breakpoints)
-    }
-}
-
-#[derive(Clone, Debug, Hash, PartialEq)]
-pub(super) enum SetExceptionBreakpoints {
-    Plain {
-        filters: Vec<String>,
-    },
-    WithOptions {
-        filters: Vec<ExceptionFilterOptions>,
-    },
-}
-
-impl LocalDapCommand for SetExceptionBreakpoints {
-    type Response = Vec<dap::Breakpoint>;
-    type DapRequest = dap::requests::SetExceptionBreakpoints;
-
-    fn to_dap(&self) -> <Self::DapRequest as dap::requests::Request>::Arguments {
-        match self {
-            SetExceptionBreakpoints::Plain { filters } => dap::SetExceptionBreakpointsArguments {
-                filters: filters.clone(),
-                exception_options: None,
-                filter_options: None,
-            },
-            SetExceptionBreakpoints::WithOptions { filters } => {
-                dap::SetExceptionBreakpointsArguments {
-                    filters: vec![],
-                    filter_options: Some(filters.clone()),
-                    exception_options: None,
-                }
-            }
-        }
-    }
-
-    fn response_from_dap(
-        &self,
-        message: <Self::DapRequest as dap::requests::Request>::Response,
-    ) -> Result<Self::Response> {
-        Ok(message.breakpoints.unwrap_or_default())
-    }
-}
-
-#[derive(Clone, Debug, Hash, PartialEq, Eq)]
-pub(super) struct LocationsCommand {
-    pub(super) reference: u64,
-}
-
-impl LocalDapCommand for LocationsCommand {
-    type Response = dap::LocationsResponse;
-    type DapRequest = dap::requests::Locations;
-    const CACHEABLE: bool = true;
-
-    fn to_dap(&self) -> <Self::DapRequest as dap::requests::Request>::Arguments {
-        dap::LocationsArguments {
-            location_reference: self.reference,
-        }
-    }
-
-    fn response_from_dap(
-        &self,
-        message: <Self::DapRequest as dap::requests::Request>::Response,
-    ) -> Result<Self::Response> {
-        Ok(message)
-    }
-}
-
-impl DapCommand for LocationsCommand {
-    type ProtoRequest = proto::DapLocationsRequest;
-    type ProtoResponse = proto::DapLocationsResponse;
-
-    fn client_id_from_proto(message: &Self::ProtoRequest) -> SessionId {
-        SessionId::from_proto(message.session_id)
-    }
-
-    fn from_proto(message: &Self::ProtoRequest) -> Self {
-        Self {
-            reference: message.location_reference,
-        }
-    }
-
-    fn to_proto(&self, session_id: SessionId, project_id: u64) -> Self::ProtoRequest {
-        proto::DapLocationsRequest {
-            project_id,
-            session_id: session_id.to_proto(),
-            location_reference: self.reference,
-        }
-    }
-
-    fn response_to_proto(_: SessionId, response: Self::Response) -> Self::ProtoResponse {
-        proto::DapLocationsResponse {
-            source: Some(response.source.to_proto()),
-            line: response.line,
-            column: response.column,
-            end_line: response.end_line,
-            end_column: response.end_column,
-        }
-    }
-
-    fn response_from_proto(&self, response: Self::ProtoResponse) -> Result<Self::Response> {
-        Ok(dap::LocationsResponse {
-            source: response
-                .source
-                .map(<dap::Source as ProtoConversion>::from_proto)
-                .context("Missing `source` field in Locations proto")?,
-            line: response.line,
-            column: response.column,
-            end_line: response.end_line,
-            end_column: response.end_column,
-        })
-    }
-}
-
-#[derive(Clone, Debug, Hash, PartialEq, Eq)]
-pub(crate) struct ReadMemory {
-    pub(crate) memory_reference: String,
-    pub(crate) offset: Option<u64>,
-    pub(crate) count: u64,
-}
-
-#[derive(Clone, Debug, PartialEq)]
-pub(crate) struct ReadMemoryResponse {
-    pub(super) address: Arc<str>,
-    pub(super) unreadable_bytes: Option<u64>,
-    pub(super) content: Arc<[u8]>,
-}
-
-impl LocalDapCommand for ReadMemory {
-    type Response = ReadMemoryResponse;
-    type DapRequest = dap::requests::ReadMemory;
-    const CACHEABLE: bool = true;
-
-    fn is_supported(capabilities: &Capabilities) -> bool {
-        capabilities
-            .supports_read_memory_request
-            .unwrap_or_default()
-    }
-    fn to_dap(&self) -> <Self::DapRequest as dap::requests::Request>::Arguments {
-        dap::ReadMemoryArguments {
-            memory_reference: self.memory_reference.clone(),
-            offset: self.offset,
-            count: self.count,
-        }
-    }
-
-    fn response_from_dap(
-        &self,
-        message: <Self::DapRequest as dap::requests::Request>::Response,
-    ) -> Result<Self::Response> {
-        let data = if let Some(data) = message.data {
-            base64::engine::general_purpose::STANDARD
-                .decode(data)
-                .log_err()
-                .context("parsing base64 data from DAP's ReadMemory response")?
-        } else {
-            vec![]
-        };
-
-        Ok(ReadMemoryResponse {
-            address: message.address.into(),
-            content: data.into(),
-            unreadable_bytes: message.unreadable_bytes,
-        })
-    }
-}
-
-impl LocalDapCommand for dap::WriteMemoryArguments {
-    type Response = dap::WriteMemoryResponse;
-    type DapRequest = dap::requests::WriteMemory;
-    fn is_supported(capabilities: &Capabilities) -> bool {
-        capabilities
-            .supports_write_memory_request
-            .unwrap_or_default()
-    }
-    fn to_dap(&self) -> <Self::DapRequest as dap::requests::Request>::Arguments {
-        self.clone()
-    }
-
-    fn response_from_dap(
-        &self,
-        message: <Self::DapRequest as dap::requests::Request>::Response,
-    ) -> Result<Self::Response> {
-        Ok(message)
-    }
-}
diff --git a/crates/project/src/debugger/dap_store.rs b/crates/project/src/debugger/dap_store.rs
deleted file mode 100644
index 4a588e7c43..0000000000
--- a/crates/project/src/debugger/dap_store.rs
+++ /dev/null
@@ -1,1035 +0,0 @@
-use super::{
-    breakpoint_store::BreakpointStore,
-    dap_command::EvaluateCommand,
-    locators,
-    session::{self, Session, SessionStateEvent},
-};
-use crate::{
-    InlayHint, InlayHintLabel, ProjectEnvironment, ResolveState,
-    debugger::session::SessionQuirks,
-    project_settings::{DapBinary, ProjectSettings},
-    worktree_store::WorktreeStore,
-};
-use anyhow::{Context as _, Result, anyhow};
-use async_trait::async_trait;
-use collections::HashMap;
-use dap::{
-    Capabilities, DapRegistry, DebugRequest, EvaluateArgumentsContext, StackFrameId,
-    adapters::{
-        DapDelegate, DebugAdapterBinary, DebugAdapterName, DebugTaskDefinition, TcpArguments,
-    },
-    client::SessionId,
-    inline_value::VariableLookupKind,
-    messages::Message,
-};
-use fs::{Fs, RemoveOptions};
-use futures::{
-    StreamExt, TryStreamExt as _,
-    channel::mpsc::{self, UnboundedSender},
-    future::{Shared, join_all},
-};
-use gpui::{App, AppContext, AsyncApp, Context, Entity, EventEmitter, SharedString, Task};
-use http_client::HttpClient;
-use language::{Buffer, LanguageToolchainStore};
-use node_runtime::NodeRuntime;
-use settings::InlayHintKind;
-
-use remote::RemoteClient;
-use rpc::{
-    AnyProtoClient, TypedEnvelope,
-    proto::{self},
-};
-use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsLocation, WorktreeId};
-use std::{
-    borrow::Borrow,
-    collections::BTreeMap,
-    ffi::OsStr,
-    net::Ipv4Addr,
-    path::{Path, PathBuf},
-    sync::{Arc, Once},
-};
-use task::{DebugScenario, SpawnInTerminal, TaskContext, TaskTemplate};
-use util::{ResultExt as _, rel_path::RelPath};
-use worktree::Worktree;
-
-#[derive(Debug)]
-pub enum DapStoreEvent {
-    DebugClientStarted(SessionId),
-    DebugSessionInitialized(SessionId),
-    DebugClientShutdown(SessionId),
-    DebugClientEvent {
-        session_id: SessionId,
-        message: Message,
-    },
-    Notification(String),
-    RemoteHasInitialized,
-}
-
-enum DapStoreMode {
-    Local(LocalDapStore),
-    Remote(RemoteDapStore),
-    Collab,
-}
-
-pub struct LocalDapStore {
-    fs: Arc<dyn Fs>,
-    node_runtime: NodeRuntime,
-    http_client: Arc<dyn HttpClient>,
-    environment: Entity<ProjectEnvironment>,
-    toolchain_store: Arc<dyn LanguageToolchainStore>,
-    is_headless: bool,
-}
-
-pub struct RemoteDapStore {
-    remote_client: Entity<RemoteClient>,
-    upstream_client: AnyProtoClient,
-    upstream_project_id: u64,
-    node_runtime: NodeRuntime,
-    http_client: Arc<dyn HttpClient>,
-}
-
-pub struct DapStore {
-    mode: DapStoreMode,
-    downstream_client: Option<(AnyProtoClient, u64)>,
-    breakpoint_store: Entity<BreakpointStore>,
-    worktree_store: Entity<WorktreeStore>,
-    sessions: BTreeMap<SessionId, Entity<Session>>,
-    next_session_id: u32,
-    adapter_options: BTreeMap<DebugAdapterName, Arc<PersistedAdapterOptions>>,
-}
-
-impl EventEmitter<DapStoreEvent> for DapStore {}
-
-#[derive(Clone, Serialize, Deserialize)]
-pub struct PersistedExceptionBreakpoint {
-    pub enabled: bool,
-}
-
-/// Represents best-effort serialization of adapter state during last session (e.g. watches)
-#[derive(Clone, Default, Serialize, Deserialize)]
-pub struct PersistedAdapterOptions {
-    /// Which exception breakpoints were enabled during the last session with this adapter?
-    pub exception_breakpoints: BTreeMap<String, PersistedExceptionBreakpoint>,
-}
-
-impl DapStore {
-    pub fn init(client: &AnyProtoClient, cx: &mut App) {
-        static ADD_LOCATORS: Once = Once::new();
-        ADD_LOCATORS.call_once(|| {
-            let registry = DapRegistry::global(cx);
-            registry.add_locator(Arc::new(locators::cargo::CargoLocator {}));
-            registry.add_locator(Arc::new(locators::go::GoLocator {}));
-            registry.add_locator(Arc::new(locators::node::NodeLocator));
-            registry.add_locator(Arc::new(locators::python::PythonLocator));
-        });
-        client.add_entity_request_handler(Self::handle_run_debug_locator);
-        client.add_entity_request_handler(Self::handle_get_debug_adapter_binary);
-        client.add_entity_message_handler(Self::handle_log_to_debug_console);
-    }
-
-    #[expect(clippy::too_many_arguments)]
-    pub fn new_local(
-        http_client: Arc<dyn HttpClient>,
-        node_runtime: NodeRuntime,
-        fs: Arc<dyn Fs>,
-        environment: Entity<ProjectEnvironment>,
-        toolchain_store: Arc<dyn LanguageToolchainStore>,
-        worktree_store: Entity<WorktreeStore>,
-        breakpoint_store: Entity<BreakpointStore>,
-        is_headless: bool,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let mode = DapStoreMode::Local(LocalDapStore {
-            fs: fs.clone(),
-            environment,
-            http_client,
-            node_runtime,
-            toolchain_store,
-            is_headless,
-        });
-
-        Self::new(mode, breakpoint_store, worktree_store, fs, cx)
-    }
-
-    pub fn new_remote(
-        project_id: u64,
-        remote_client: Entity<RemoteClient>,
-        breakpoint_store: Entity<BreakpointStore>,
-        worktree_store: Entity<WorktreeStore>,
-        node_runtime: NodeRuntime,
-        http_client: Arc<dyn HttpClient>,
-        fs: Arc<dyn Fs>,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let mode = DapStoreMode::Remote(RemoteDapStore {
-            upstream_client: remote_client.read(cx).proto_client(),
-            remote_client,
-            upstream_project_id: project_id,
-            node_runtime,
-            http_client,
-        });
-
-        Self::new(mode, breakpoint_store, worktree_store, fs, cx)
-    }
-
-    pub fn new_collab(
-        _project_id: u64,
-        _upstream_client: AnyProtoClient,
-        breakpoint_store: Entity<BreakpointStore>,
-        worktree_store: Entity<WorktreeStore>,
-        fs: Arc<dyn Fs>,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        Self::new(
-            DapStoreMode::Collab,
-            breakpoint_store,
-            worktree_store,
-            fs,
-            cx,
-        )
-    }
-
-    fn new(
-        mode: DapStoreMode,
-        breakpoint_store: Entity<BreakpointStore>,
-        worktree_store: Entity<WorktreeStore>,
-        fs: Arc<dyn Fs>,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        cx.background_spawn(async move {
-            let dir = paths::debug_adapters_dir().join("js-debug-companion");
-
-            let mut children = fs.read_dir(&dir).await?.try_collect::<Vec<_>>().await?;
-            children.sort_by_key(|child| semver::Version::parse(child.file_name()?.to_str()?).ok());
-
-            if let Some(child) = children.last()
-                && let Some(name) = child.file_name()
-                && let Some(name) = name.to_str()
-                && semver::Version::parse(name).is_ok()
-            {
-                children.pop();
-            }
-
-            for child in children {
-                fs.remove_dir(
-                    &child,
-                    RemoveOptions {
-                        recursive: true,
-                        ignore_if_not_exists: true,
-                    },
-                )
-                .await
-                .ok();
-            }
-
-            anyhow::Ok(())
-        })
-        .detach();
-
-        Self {
-            mode,
-            next_session_id: 0,
-            downstream_client: None,
-            breakpoint_store,
-            worktree_store,
-            sessions: Default::default(),
-            adapter_options: Default::default(),
-        }
-    }
-
-    pub fn get_debug_adapter_binary(
-        &mut self,
-        definition: DebugTaskDefinition,
-        session_id: SessionId,
-        worktree: &Entity<Worktree>,
-        console: UnboundedSender<String>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<DebugAdapterBinary>> {
-        match &self.mode {
-            DapStoreMode::Local(_) => {
-                let Some(adapter) = DapRegistry::global(cx).adapter(&definition.adapter) else {
-                    return Task::ready(Err(anyhow!("Failed to find a debug adapter")));
-                };
-
-                let settings_location = SettingsLocation {
-                    worktree_id: worktree.read(cx).id(),
-                    path: RelPath::empty(),
-                };
-                let dap_settings = ProjectSettings::get(Some(settings_location), cx)
-                    .dap
-                    .get(&adapter.name());
-                let user_installed_path = dap_settings.and_then(|s| match &s.binary {
-                    DapBinary::Default => None,
-                    DapBinary::Custom(binary) => {
-                        let path = PathBuf::from(binary);
-                        Some(worktree.read(cx).resolve_executable_path(path))
-                    }
-                });
-                let user_args = dap_settings.map(|s| s.args.clone());
-                let user_env = dap_settings.map(|s| s.env.clone());
-
-                let delegate = self.delegate(worktree, console, cx);
-
-                let worktree = worktree.clone();
-                cx.spawn(async move |this, cx| {
-                    let mut binary = adapter
-                        .get_binary(
-                            &delegate,
-                            &definition,
-                            user_installed_path,
-                            user_args,
-                            user_env,
-                            cx,
-                        )
-                        .await?;
-
-                    let env = this
-                        .update(cx, |this, cx| {
-                            this.as_local()
-                                .unwrap()
-                                .environment
-                                .update(cx, |environment, cx| {
-                                    environment.worktree_environment(worktree, cx)
-                                })
-                        })?
-                        .await;
-
-                    if let Some(mut env) = env {
-                        env.extend(std::mem::take(&mut binary.envs));
-                        binary.envs = env;
-                    }
-
-                    Ok(binary)
-                })
-            }
-            DapStoreMode::Remote(remote) => {
-                let request = remote
-                    .upstream_client
-                    .request(proto::GetDebugAdapterBinary {
-                        session_id: session_id.to_proto(),
-                        project_id: remote.upstream_project_id,
-                        worktree_id: worktree.read(cx).id().to_proto(),
-                        definition: Some(definition.to_proto()),
-                    });
-                let remote = remote.remote_client.clone();
-
-                cx.spawn(async move |_, cx| {
-                    let response = request.await?;
-                    let binary = DebugAdapterBinary::from_proto(response)?;
-
-                    let port_forwarding;
-                    let connection;
-                    if let Some(c) = binary.connection {
-                        let host = Ipv4Addr::LOCALHOST;
-                        let port;
-                        if remote.read_with(cx, |remote, _cx| remote.shares_network_interface())? {
-                            port = c.port;
-                            port_forwarding = None;
-                        } else {
-                            port = dap::transport::TcpTransport::unused_port(host).await?;
-                            port_forwarding = Some((port, c.host.to_string(), c.port));
-                        }
-                        connection = Some(TcpArguments {
-                            port,
-                            host,
-                            timeout: c.timeout,
-                        })
-                    } else {
-                        port_forwarding = None;
-                        connection = None;
-                    }
-
-                    let command = remote.read_with(cx, |remote, _cx| {
-                        remote.build_command(
-                            binary.command,
-                            &binary.arguments,
-                            &binary.envs,
-                            binary.cwd.map(|path| path.display().to_string()),
-                            port_forwarding,
-                        )
-                    })??;
-
-                    Ok(DebugAdapterBinary {
-                        command: Some(command.program),
-                        arguments: command.args,
-                        envs: command.env,
-                        cwd: None,
-                        connection,
-                        request_args: binary.request_args,
-                    })
-                })
-            }
-            DapStoreMode::Collab => {
-                Task::ready(Err(anyhow!("Debugging is not yet supported via collab")))
-            }
-        }
-    }
-
-    pub fn debug_scenario_for_build_task(
-        &self,
-        build: TaskTemplate,
-        adapter: DebugAdapterName,
-        label: SharedString,
-        cx: &mut App,
-    ) -> Task<Option<DebugScenario>> {
-        let locators = DapRegistry::global(cx).locators();
-
-        cx.background_spawn(async move {
-            for locator in locators.values() {
-                if let Some(scenario) = locator.create_scenario(&build, &label, &adapter).await {
-                    return Some(scenario);
-                }
-            }
-            None
-        })
-    }
-
-    pub fn run_debug_locator(
-        &mut self,
-        locator_name: &str,
-        build_command: SpawnInTerminal,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<DebugRequest>> {
-        match &self.mode {
-            DapStoreMode::Local(_) => {
-                // Pre-resolve args with existing environment.
-                let locators = DapRegistry::global(cx).locators();
-                let locator = locators.get(locator_name);
-
-                if let Some(locator) = locator.cloned() {
-                    cx.background_spawn(async move {
-                        let result = locator
-                            .run(build_command.clone())
-                            .await
-                            .log_with_level(log::Level::Error);
-                        if let Some(result) = result {
-                            return Ok(result);
-                        }
-
-                        anyhow::bail!(
-                            "None of the locators for task `{}` completed successfully",
-                            build_command.label
-                        )
-                    })
-                } else {
-                    Task::ready(Err(anyhow!(
-                        "Couldn't find any locator for task `{}`. Specify the `attach` or `launch` arguments in your debug scenario definition",
-                        build_command.label
-                    )))
-                }
-            }
-            DapStoreMode::Remote(remote) => {
-                let request = remote.upstream_client.request(proto::RunDebugLocators {
-                    project_id: remote.upstream_project_id,
-                    build_command: Some(build_command.to_proto()),
-                    locator: locator_name.to_owned(),
-                });
-                cx.background_spawn(async move {
-                    let response = request.await?;
-                    DebugRequest::from_proto(response)
-                })
-            }
-            DapStoreMode::Collab => {
-                Task::ready(Err(anyhow!("Debugging is not yet supported via collab")))
-            }
-        }
-    }
-
-    fn as_local(&self) -> Option<&LocalDapStore> {
-        match &self.mode {
-            DapStoreMode::Local(local_dap_store) => Some(local_dap_store),
-            _ => None,
-        }
-    }
-
-    pub fn new_session(
-        &mut self,
-        label: Option<SharedString>,
-        adapter: DebugAdapterName,
-        task_context: TaskContext,
-        parent_session: Option<Entity<Session>>,
-        quirks: SessionQuirks,
-        cx: &mut Context<Self>,
-    ) -> Entity<Session> {
-        let session_id = SessionId(util::post_inc(&mut self.next_session_id));
-
-        if let Some(session) = &parent_session {
-            session.update(cx, |session, _| {
-                session.add_child_session_id(session_id);
-            });
-        }
-
-        let (remote_client, node_runtime, http_client) = match &self.mode {
-            DapStoreMode::Local(_) => (None, None, None),
-            DapStoreMode::Remote(remote_dap_store) => (
-                Some(remote_dap_store.remote_client.clone()),
-                Some(remote_dap_store.node_runtime.clone()),
-                Some(remote_dap_store.http_client.clone()),
-            ),
-            DapStoreMode::Collab => (None, None, None),
-        };
-        let session = Session::new(
-            self.breakpoint_store.clone(),
-            session_id,
-            parent_session,
-            label,
-            adapter,
-            task_context,
-            quirks,
-            remote_client,
-            node_runtime,
-            http_client,
-            cx,
-        );
-
-        self.sessions.insert(session_id, session.clone());
-        cx.notify();
-
-        cx.subscribe(&session, {
-            move |this: &mut DapStore, _, event: &SessionStateEvent, cx| match event {
-                SessionStateEvent::Shutdown => {
-                    this.shutdown_session(session_id, cx).detach_and_log_err(cx);
-                }
-                SessionStateEvent::Restart | SessionStateEvent::SpawnChildSession { .. } => {}
-                SessionStateEvent::Running => {
-                    cx.emit(DapStoreEvent::DebugClientStarted(session_id));
-                }
-            }
-        })
-        .detach();
-
-        session
-    }
-
-    pub fn boot_session(
-        &self,
-        session: Entity<Session>,
-        definition: DebugTaskDefinition,
-        worktree: Entity<Worktree>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let dap_store = cx.weak_entity();
-        let console = session.update(cx, |session, cx| session.console_output(cx));
-        let session_id = session.read(cx).session_id();
-
-        cx.spawn({
-            let session = session.clone();
-            async move |this, cx| {
-                let binary = this
-                    .update(cx, |this, cx| {
-                        this.get_debug_adapter_binary(
-                            definition.clone(),
-                            session_id,
-                            &worktree,
-                            console,
-                            cx,
-                        )
-                    })?
-                    .await?;
-                session
-                    .update(cx, |session, cx| {
-                        session.boot(binary, worktree, dap_store, cx)
-                    })?
-                    .await
-            }
-        })
-    }
-
-    pub fn session_by_id(
-        &self,
-        session_id: impl Borrow<SessionId>,
-    ) -> Option<Entity<session::Session>> {
-        let session_id = session_id.borrow();
-
-        self.sessions.get(session_id).cloned()
-    }
-    pub fn sessions(&self) -> impl Iterator<Item = &Entity<Session>> {
-        self.sessions.values()
-    }
-
-    pub fn capabilities_by_id(
-        &self,
-        session_id: impl Borrow<SessionId>,
-        cx: &App,
-    ) -> Option<Capabilities> {
-        let session_id = session_id.borrow();
-        self.sessions
-            .get(session_id)
-            .map(|client| client.read(cx).capabilities.clone())
-    }
-
-    pub fn breakpoint_store(&self) -> &Entity<BreakpointStore> {
-        &self.breakpoint_store
-    }
-
-    pub fn worktree_store(&self) -> &Entity<WorktreeStore> {
-        &self.worktree_store
-    }
-
-    #[allow(dead_code)]
-    async fn handle_ignore_breakpoint_state(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::IgnoreBreakpointState>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        let session_id = SessionId::from_proto(envelope.payload.session_id);
-
-        this.update(&mut cx, |this, cx| {
-            if let Some(session) = this.session_by_id(&session_id) {
-                session.update(cx, |session, cx| {
-                    session.set_ignore_breakpoints(envelope.payload.ignore, cx)
-                })
-            } else {
-                Task::ready(HashMap::default())
-            }
-        })?
-        .await;
-
-        Ok(())
-    }
-
-    fn delegate(
-        &self,
-        worktree: &Entity<Worktree>,
-        console: UnboundedSender<String>,
-        cx: &mut App,
-    ) -> Arc<dyn DapDelegate> {
-        let Some(local_store) = self.as_local() else {
-            unimplemented!("Starting session on remote side");
-        };
-
-        Arc::new(DapAdapterDelegate::new(
-            local_store.fs.clone(),
-            worktree.read(cx).snapshot(),
-            console,
-            local_store.node_runtime.clone(),
-            local_store.http_client.clone(),
-            local_store.toolchain_store.clone(),
-            local_store
-                .environment
-                .update(cx, |env, cx| env.worktree_environment(worktree.clone(), cx)),
-            local_store.is_headless,
-        ))
-    }
-
-    pub fn resolve_inline_value_locations(
-        &self,
-        session: Entity<Session>,
-        stack_frame_id: StackFrameId,
-        buffer_handle: Entity<Buffer>,
-        inline_value_locations: Vec<dap::inline_value::InlineValueLocation>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Vec<InlayHint>>> {
-        let snapshot = buffer_handle.read(cx).snapshot();
-        let local_variables =
-            session
-                .read(cx)
-                .variables_by_stack_frame_id(stack_frame_id, false, true);
-        let global_variables =
-            session
-                .read(cx)
-                .variables_by_stack_frame_id(stack_frame_id, true, false);
-
-        fn format_value(mut value: String) -> String {
-            const LIMIT: usize = 100;
-
-            if let Some(index) = value.find("\n") {
-                value.truncate(index);
-                value.push_str("…");
-            }
-
-            if value.len() > LIMIT {
-                let mut index = LIMIT;
-                // If index isn't a char boundary truncate will cause a panic
-                while !value.is_char_boundary(index) {
-                    index -= 1;
-                }
-                value.truncate(index);
-                value.push_str("…");
-            }
-
-            format!(": {}", value)
-        }
-
-        cx.spawn(async move |_, cx| {
-            let mut inlay_hints = Vec::with_capacity(inline_value_locations.len());
-            for inline_value_location in inline_value_locations.iter() {
-                let point = snapshot.point_to_point_utf16(language::Point::new(
-                    inline_value_location.row as u32,
-                    inline_value_location.column as u32,
-                ));
-                let position = snapshot.anchor_after(point);
-
-                match inline_value_location.lookup {
-                    VariableLookupKind::Variable => {
-                        let variable_search =
-                            if inline_value_location.scope
-                                == dap::inline_value::VariableScope::Local
-                            {
-                                local_variables.iter().chain(global_variables.iter()).find(
-                                    |variable| variable.name == inline_value_location.variable_name,
-                                )
-                            } else {
-                                global_variables.iter().find(|variable| {
-                                    variable.name == inline_value_location.variable_name
-                                })
-                            };
-
-                        let Some(variable) = variable_search else {
-                            continue;
-                        };
-
-                        inlay_hints.push(InlayHint {
-                            position,
-                            label: InlayHintLabel::String(format_value(variable.value.clone())),
-                            kind: Some(InlayHintKind::Type),
-                            padding_left: false,
-                            padding_right: false,
-                            tooltip: None,
-                            resolve_state: ResolveState::Resolved,
-                        });
-                    }
-                    VariableLookupKind::Expression => {
-                        let Ok(eval_task) = session.read_with(cx, |session, _| {
-                            session.state.request_dap(EvaluateCommand {
-                                expression: inline_value_location.variable_name.clone(),
-                                frame_id: Some(stack_frame_id),
-                                source: None,
-                                context: Some(EvaluateArgumentsContext::Variables),
-                            })
-                        }) else {
-                            continue;
-                        };
-
-                        if let Some(response) = eval_task.await.log_err() {
-                            inlay_hints.push(InlayHint {
-                                position,
-                                label: InlayHintLabel::String(format_value(response.result)),
-                                kind: Some(InlayHintKind::Type),
-                                padding_left: false,
-                                padding_right: false,
-                                tooltip: None,
-                                resolve_state: ResolveState::Resolved,
-                            });
-                        };
-                    }
-                };
-            }
-
-            Ok(inlay_hints)
-        })
-    }
-
-    pub fn shutdown_sessions(&mut self, cx: &mut Context<Self>) -> Task<()> {
-        let mut tasks = vec![];
-        for session_id in self.sessions.keys().cloned().collect::<Vec<_>>() {
-            tasks.push(self.shutdown_session(session_id, cx));
-        }
-
-        cx.background_executor().spawn(async move {
-            futures::future::join_all(tasks).await;
-        })
-    }
-
-    pub fn shutdown_session(
-        &mut self,
-        session_id: SessionId,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let Some(session) = self.sessions.remove(&session_id) else {
-            return Task::ready(Err(anyhow!("Could not find session: {:?}", session_id)));
-        };
-
-        let shutdown_children = session
-            .read(cx)
-            .child_session_ids()
-            .iter()
-            .map(|session_id| self.shutdown_session(*session_id, cx))
-            .collect::<Vec<_>>();
-
-        let shutdown_parent_task = if let Some(parent_session) = session
-            .read(cx)
-            .parent_id(cx)
-            .and_then(|session_id| self.session_by_id(session_id))
-        {
-            let shutdown_id = parent_session.update(cx, |parent_session, _| {
-                parent_session.remove_child_session_id(session_id);
-
-                if parent_session.child_session_ids().is_empty() {
-                    Some(parent_session.session_id())
-                } else {
-                    None
-                }
-            });
-
-            shutdown_id.map(|session_id| self.shutdown_session(session_id, cx))
-        } else {
-            None
-        };
-
-        let shutdown_task = session.update(cx, |this, cx| this.shutdown(cx));
-
-        cx.emit(DapStoreEvent::DebugClientShutdown(session_id));
-
-        cx.background_spawn(async move {
-            if !shutdown_children.is_empty() {
-                let _ = join_all(shutdown_children).await;
-            }
-
-            shutdown_task.await;
-
-            if let Some(parent_task) = shutdown_parent_task {
-                parent_task.await?;
-            }
-
-            Ok(())
-        })
-    }
-
-    pub fn shared(
-        &mut self,
-        project_id: u64,
-        downstream_client: AnyProtoClient,
-        _: &mut Context<Self>,
-    ) {
-        self.downstream_client = Some((downstream_client, project_id));
-    }
-
-    pub fn unshared(&mut self, cx: &mut Context<Self>) {
-        self.downstream_client.take();
-
-        cx.notify();
-    }
-
-    async fn handle_run_debug_locator(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::RunDebugLocators>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::DebugRequest> {
-        let task = envelope
-            .payload
-            .build_command
-            .context("missing definition")?;
-        let build_task = SpawnInTerminal::from_proto(task);
-        let locator = envelope.payload.locator;
-        let request = this
-            .update(&mut cx, |this, cx| {
-                this.run_debug_locator(&locator, build_task, cx)
-            })?
-            .await?;
-
-        Ok(request.to_proto())
-    }
-
-    async fn handle_get_debug_adapter_binary(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::GetDebugAdapterBinary>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::DebugAdapterBinary> {
-        let definition = DebugTaskDefinition::from_proto(
-            envelope.payload.definition.context("missing definition")?,
-        )?;
-        let (tx, mut rx) = mpsc::unbounded();
-        let session_id = envelope.payload.session_id;
-        cx.spawn({
-            let this = this.clone();
-            async move |cx| {
-                while let Some(message) = rx.next().await {
-                    this.read_with(cx, |this, _| {
-                        if let Some((downstream, project_id)) = this.downstream_client.clone() {
-                            downstream
-                                .send(proto::LogToDebugConsole {
-                                    project_id,
-                                    session_id,
-                                    message,
-                                })
-                                .ok();
-                        }
-                    })
-                    .ok();
-                }
-            }
-        })
-        .detach();
-
-        let worktree = this
-            .update(&mut cx, |this, cx| {
-                this.worktree_store
-                    .read(cx)
-                    .worktree_for_id(WorktreeId::from_proto(envelope.payload.worktree_id), cx)
-            })?
-            .context("Failed to find worktree with a given ID")?;
-        let binary = this
-            .update(&mut cx, |this, cx| {
-                this.get_debug_adapter_binary(
-                    definition,
-                    SessionId::from_proto(session_id),
-                    &worktree,
-                    tx,
-                    cx,
-                )
-            })?
-            .await?;
-        Ok(binary.to_proto())
-    }
-
-    async fn handle_log_to_debug_console(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::LogToDebugConsole>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        let session_id = SessionId::from_proto(envelope.payload.session_id);
-        this.update(&mut cx, |this, cx| {
-            let Some(session) = this.sessions.get(&session_id) else {
-                return;
-            };
-            session.update(cx, |session, cx| {
-                session
-                    .console_output(cx)
-                    .unbounded_send(envelope.payload.message)
-                    .ok();
-            })
-        })
-    }
-
-    pub fn sync_adapter_options(
-        &mut self,
-        session: &Entity<Session>,
-        cx: &App,
-    ) -> Arc<PersistedAdapterOptions> {
-        let session = session.read(cx);
-        let adapter = session.adapter();
-        let exceptions = session.exception_breakpoints();
-        let exception_breakpoints = exceptions
-            .map(|(exception, enabled)| {
-                (
-                    exception.filter.clone(),
-                    PersistedExceptionBreakpoint { enabled: *enabled },
-                )
-            })
-            .collect();
-        let options = Arc::new(PersistedAdapterOptions {
-            exception_breakpoints,
-        });
-        self.adapter_options.insert(adapter, options.clone());
-        options
-    }
-
-    pub fn set_adapter_options(
-        &mut self,
-        adapter: DebugAdapterName,
-        options: PersistedAdapterOptions,
-    ) {
-        self.adapter_options.insert(adapter, Arc::new(options));
-    }
-
-    pub fn adapter_options(&self, name: &str) -> Option<Arc<PersistedAdapterOptions>> {
-        self.adapter_options.get(name).cloned()
-    }
-
-    pub fn all_adapter_options(&self) -> &BTreeMap<DebugAdapterName, Arc<PersistedAdapterOptions>> {
-        &self.adapter_options
-    }
-}
-
-#[derive(Clone)]
-pub struct DapAdapterDelegate {
-    fs: Arc<dyn Fs>,
-    console: mpsc::UnboundedSender<String>,
-    worktree: worktree::Snapshot,
-    node_runtime: NodeRuntime,
-    http_client: Arc<dyn HttpClient>,
-    toolchain_store: Arc<dyn LanguageToolchainStore>,
-    load_shell_env_task: Shared<Task<Option<HashMap<String, String>>>>,
-    is_headless: bool,
-}
-
-impl DapAdapterDelegate {
-    pub fn new(
-        fs: Arc<dyn Fs>,
-        worktree: worktree::Snapshot,
-        status: mpsc::UnboundedSender<String>,
-        node_runtime: NodeRuntime,
-        http_client: Arc<dyn HttpClient>,
-        toolchain_store: Arc<dyn LanguageToolchainStore>,
-        load_shell_env_task: Shared<Task<Option<HashMap<String, String>>>>,
-        is_headless: bool,
-    ) -> Self {
-        Self {
-            fs,
-            console: status,
-            worktree,
-            http_client,
-            node_runtime,
-            toolchain_store,
-            load_shell_env_task,
-            is_headless,
-        }
-    }
-}
-
-#[async_trait]
-impl dap::adapters::DapDelegate for DapAdapterDelegate {
-    fn worktree_id(&self) -> WorktreeId {
-        self.worktree.id()
-    }
-
-    fn worktree_root_path(&self) -> &Path {
-        self.worktree.abs_path()
-    }
-    fn http_client(&self) -> Arc<dyn HttpClient> {
-        self.http_client.clone()
-    }
-
-    fn node_runtime(&self) -> NodeRuntime {
-        self.node_runtime.clone()
-    }
-
-    fn fs(&self) -> Arc<dyn Fs> {
-        self.fs.clone()
-    }
-
-    fn output_to_console(&self, msg: String) {
-        self.console.unbounded_send(msg).ok();
-    }
-
-    #[cfg(not(target_os = "windows"))]
-    async fn which(&self, command: &OsStr) -> Option<PathBuf> {
-        let worktree_abs_path = self.worktree.abs_path();
-        let shell_path = self.shell_env().await.get("PATH").cloned();
-        which::which_in(command, shell_path.as_ref(), worktree_abs_path).ok()
-    }
-
-    #[cfg(target_os = "windows")]
-    async fn which(&self, command: &OsStr) -> Option<PathBuf> {
-        // On Windows, `PATH` is handled differently from Unix. Windows generally expects users to modify the `PATH` themselves,
-        // and every program loads it directly from the system at startup.
-        // There's also no concept of a default shell on Windows, and you can't really retrieve one, so trying to get shell environment variables
-        // from a specific directory doesn’t make sense on Windows.
-        which::which(command).ok()
-    }
-
-    async fn shell_env(&self) -> HashMap<String, String> {
-        let task = self.load_shell_env_task.clone();
-        task.await.unwrap_or_default()
-    }
-
-    fn toolchain_store(&self) -> Arc<dyn LanguageToolchainStore> {
-        self.toolchain_store.clone()
-    }
-
-    async fn read_text_file(&self, path: &RelPath) -> Result<String> {
-        let entry = self
-            .worktree
-            .entry_for_path(path)
-            .with_context(|| format!("no worktree entry for path {path:?}"))?;
-        let abs_path = self.worktree.absolutize(&entry.path);
-
-        self.fs.load(&abs_path).await
-    }
-
-    fn is_headless(&self) -> bool {
-        self.is_headless
-    }
-}
diff --git a/crates/project/src/debugger/locators.rs b/crates/project/src/debugger/locators.rs
deleted file mode 100644
index 2faa4c4ca9..0000000000
--- a/crates/project/src/debugger/locators.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-pub(crate) mod cargo;
-pub(crate) mod go;
-pub(crate) mod node;
-pub(crate) mod python;
diff --git a/crates/project/src/debugger/locators/cargo.rs b/crates/project/src/debugger/locators/cargo.rs
deleted file mode 100644
index 2f7d8cdc5f..0000000000
--- a/crates/project/src/debugger/locators/cargo.rs
+++ /dev/null
@@ -1,219 +0,0 @@
-use anyhow::{Context as _, Result};
-use async_trait::async_trait;
-use dap::{DapLocator, DebugRequest, adapters::DebugAdapterName};
-use gpui::SharedString;
-use serde_json::{Value, json};
-use smol::{Timer, io::AsyncReadExt, process::Stdio};
-use std::time::Duration;
-use task::{BuildTaskDefinition, DebugScenario, ShellBuilder, SpawnInTerminal, TaskTemplate};
-use util::command::new_smol_command;
-
-pub(crate) struct CargoLocator;
-
-async fn find_best_executable(executables: &[String], test_name: &str) -> Option<String> {
-    if executables.len() == 1 {
-        return executables.first().cloned();
-    }
-    for executable in executables {
-        let Some(mut child) = new_smol_command(&executable)
-            .arg("--list")
-            .stdout(Stdio::piped())
-            .spawn()
-            .ok()
-        else {
-            continue;
-        };
-        let mut test_lines = String::default();
-        let exec_result = smol::future::race(
-            async {
-                if let Some(mut stdout) = child.stdout.take() {
-                    stdout.read_to_string(&mut test_lines).await?;
-                }
-                Ok(())
-            },
-            async {
-                Timer::after(Duration::from_secs(3)).await;
-                anyhow::bail!("Timed out waiting for executable stdout")
-            },
-        );
-
-        if let Err(err) = exec_result.await {
-            log::warn!("Failed to list tests for {executable}: {err}");
-        } else {
-            for line in test_lines.lines() {
-                if line.contains(&test_name) {
-                    return Some(executable.clone());
-                }
-            }
-        }
-        let _ = child.kill();
-    }
-    None
-}
-#[async_trait]
-impl DapLocator for CargoLocator {
-    fn name(&self) -> SharedString {
-        SharedString::new_static("rust-cargo-locator")
-    }
-    async fn create_scenario(
-        &self,
-        build_config: &TaskTemplate,
-        resolved_label: &str,
-        adapter: &DebugAdapterName,
-    ) -> Option<DebugScenario> {
-        if build_config.command != "cargo" {
-            return None;
-        }
-        let mut task_template = build_config.clone();
-        let cargo_action = task_template.args.first_mut()?;
-        if cargo_action == "check" || cargo_action == "clean" {
-            return None;
-        }
-
-        match cargo_action.as_ref() {
-            "run" | "r" => {
-                *cargo_action = "build".to_owned();
-            }
-            "test" | "t" | "bench" => {
-                let delimiter = task_template
-                    .args
-                    .iter()
-                    .position(|arg| arg == "--")
-                    .unwrap_or(task_template.args.len());
-                if !task_template.args[..delimiter]
-                    .iter()
-                    .any(|arg| arg == "--no-run")
-                {
-                    task_template.args.insert(delimiter, "--no-run".to_owned());
-                }
-            }
-            _ => {}
-        }
-
-        let config = if adapter.as_ref() == "CodeLLDB" {
-            json!({
-                "sourceLanguages": ["rust"]
-            })
-        } else {
-            Value::Null
-        };
-        Some(DebugScenario {
-            adapter: adapter.0.clone(),
-            label: resolved_label.to_string().into(),
-            build: Some(BuildTaskDefinition::Template {
-                task_template,
-                locator_name: Some(self.name()),
-            }),
-            config,
-            tcp_connection: None,
-        })
-    }
-
-    async fn run(&self, build_config: SpawnInTerminal) -> Result<DebugRequest> {
-        let cwd = build_config
-            .cwd
-            .clone()
-            .context("Couldn't get cwd from debug config which is needed for locators")?;
-        let builder = ShellBuilder::new(&build_config.shell, cfg!(windows)).non_interactive();
-        let mut child = builder
-            .build_command(
-                Some("cargo".into()),
-                &build_config
-                    .args
-                    .iter()
-                    .cloned()
-                    .take_while(|arg| arg != "--")
-                    .chain(Some("--message-format=json".to_owned()))
-                    .collect::<Vec<_>>(),
-            )
-            .envs(build_config.env.iter().map(|(k, v)| (k.clone(), v.clone())))
-            .current_dir(cwd)
-            .stdout(Stdio::piped())
-            .spawn()?;
-
-        let mut output = String::new();
-        if let Some(mut stdout) = child.stdout.take() {
-            stdout.read_to_string(&mut output).await?;
-        }
-
-        let status = child.status().await?;
-        anyhow::ensure!(status.success(), "Cargo command failed");
-
-        let is_test = build_config
-            .args
-            .first()
-            .is_some_and(|arg| arg == "test" || arg == "t");
-
-        let is_ignored = build_config.args.contains(&"--include-ignored".to_owned());
-
-        let executables = output
-            .lines()
-            .filter(|line| !line.trim().is_empty())
-            .filter_map(|line| serde_json::from_str(line).ok())
-            .filter(|json: &Value| {
-                let is_test_binary = json
-                    .get("profile")
-                    .and_then(|profile| profile.get("test"))
-                    .and_then(Value::as_bool)
-                    .unwrap_or(false);
-
-                if is_test {
-                    is_test_binary
-                } else {
-                    !is_test_binary
-                }
-            })
-            .filter_map(|json: Value| {
-                json.get("executable")
-                    .and_then(Value::as_str)
-                    .map(String::from)
-            })
-            .collect::<Vec<_>>();
-        anyhow::ensure!(
-            !executables.is_empty(),
-            "Couldn't get executable in cargo locator"
-        );
-
-        let mut test_name = None;
-        if is_test {
-            test_name = build_config
-                .args
-                .iter()
-                .rev()
-                .take_while(|name| "--" != name.as_str())
-                .find(|name| !name.starts_with("-"))
-                .cloned();
-        }
-        let executable = {
-            if let Some(name) = test_name.as_ref().and_then(|name| {
-                name.strip_prefix('$')
-                    .map(|name| build_config.env.get(name))
-                    .unwrap_or(Some(name))
-            }) {
-                find_best_executable(&executables, name).await
-            } else {
-                None
-            }
-        };
-
-        let Some(executable) = executable.or_else(|| executables.first().cloned()) else {
-            anyhow::bail!("Couldn't get executable in cargo locator");
-        };
-
-        let mut args: Vec<_> = test_name.into_iter().collect();
-        if is_test {
-            args.push("--nocapture".to_owned());
-            if is_ignored {
-                args.push("--include-ignored".to_owned());
-                args.push("--exact".to_owned());
-            }
-        }
-
-        Ok(DebugRequest::Launch(task::LaunchRequest {
-            program: executable,
-            cwd: build_config.cwd,
-            args,
-            env: build_config.env.into_iter().collect(),
-        }))
-    }
-}
diff --git a/crates/project/src/debugger/locators/go.rs b/crates/project/src/debugger/locators/go.rs
deleted file mode 100644
index eec06084ec..0000000000
--- a/crates/project/src/debugger/locators/go.rs
+++ /dev/null
@@ -1,441 +0,0 @@
-use anyhow::Result;
-use async_trait::async_trait;
-use collections::HashMap;
-use dap::{DapLocator, DebugRequest, adapters::DebugAdapterName};
-use gpui::SharedString;
-use serde::{Deserialize, Serialize};
-use task::{DebugScenario, SpawnInTerminal, TaskTemplate};
-
-pub(crate) struct GoLocator;
-
-#[derive(Serialize, Deserialize, Debug, PartialEq, Eq)]
-#[serde(rename_all = "camelCase")]
-struct DelveLaunchRequest {
-    request: String,
-    mode: String,
-    program: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    cwd: Option<String>,
-    args: Vec<String>,
-    build_flags: Vec<String>,
-    env: HashMap<String, String>,
-}
-
-fn is_debug_flag(arg: &str) -> Option<bool> {
-    let mut part = if let Some(suffix) = arg.strip_prefix("test.") {
-        suffix
-    } else {
-        arg
-    };
-    let mut might_have_arg = true;
-    if let Some(idx) = part.find('=') {
-        might_have_arg = false;
-        part = &part[..idx];
-    }
-    match part {
-        "benchmem" | "failfast" | "fullpath" | "fuzzworker" | "json" | "short" | "v"
-        | "paniconexit0" => Some(false),
-        "bench"
-        | "benchtime"
-        | "blockprofile"
-        | "blockprofilerate"
-        | "count"
-        | "coverprofile"
-        | "cpu"
-        | "cpuprofile"
-        | "fuzz"
-        | "fuzzcachedir"
-        | "fuzzminimizetime"
-        | "fuzztime"
-        | "gocoverdir"
-        | "list"
-        | "memprofile"
-        | "memprofilerate"
-        | "mutexprofile"
-        | "mutexprofilefraction"
-        | "outputdir"
-        | "parallel"
-        | "run"
-        | "shuffle"
-        | "skip"
-        | "testlogfile"
-        | "timeout"
-        | "trace" => Some(might_have_arg),
-        _ if arg.starts_with("test.") => Some(false),
-        _ => None,
-    }
-}
-
-fn is_build_flag(mut arg: &str) -> Option<bool> {
-    let mut might_have_arg = true;
-    if let Some(idx) = arg.find('=') {
-        might_have_arg = false;
-        arg = &arg[..idx];
-    }
-    match arg {
-        "a" | "n" | "race" | "msan" | "asan" | "cover" | "work" | "x" | "v" | "buildvcs"
-        | "json" | "linkshared" | "modcacherw" | "trimpath" => Some(false),
-
-        "p" | "covermode" | "coverpkg" | "asmflags" | "buildmode" | "compiler" | "gccgoflags"
-        | "gcflags" | "installsuffix" | "ldflags" | "mod" | "modfile" | "overlay" | "pgo"
-        | "pkgdir" | "tags" | "toolexec" => Some(might_have_arg),
-        _ => None,
-    }
-}
-
-#[async_trait]
-impl DapLocator for GoLocator {
-    fn name(&self) -> SharedString {
-        SharedString::new_static("go-debug-locator")
-    }
-
-    async fn create_scenario(
-        &self,
-        build_config: &TaskTemplate,
-        resolved_label: &str,
-        adapter: &DebugAdapterName,
-    ) -> Option<DebugScenario> {
-        if build_config.command != "go" {
-            return None;
-        }
-        let go_action = build_config.args.first()?;
-
-        match go_action.as_str() {
-            "test" => {
-                let mut program = ".".to_string();
-                let mut args = Vec::default();
-                let mut build_flags = Vec::default();
-
-                let mut all_args_are_test = false;
-                let mut next_arg_is_test = false;
-                let mut next_arg_is_build = false;
-                let mut seen_pkg = false;
-                let mut seen_v = false;
-
-                for arg in build_config.args.iter().skip(1) {
-                    if all_args_are_test || next_arg_is_test {
-                        // HACK: tasks assume that they are run in a shell context,
-                        // so the -run regex has escaped specials. Delve correctly
-                        // handles escaping, so we undo that here.
-                        if let Some((left, right)) = arg.split_once("/")
-                            && left.starts_with("\\^")
-                            && left.ends_with("\\$")
-                            && right.starts_with("\\^")
-                            && right.ends_with("\\$")
-                        {
-                            let mut left = left[1..left.len() - 2].to_string();
-                            left.push('$');
-
-                            let mut right = right[1..right.len() - 2].to_string();
-                            right.push('$');
-
-                            args.push(format!("{left}/{right}"));
-                        } else if arg.starts_with("\\^") && arg.ends_with("\\$") {
-                            let mut arg = arg[1..arg.len() - 2].to_string();
-                            arg.push('$');
-                            args.push(arg);
-                        } else {
-                            args.push(arg.clone());
-                        }
-                        next_arg_is_test = false;
-                    } else if next_arg_is_build {
-                        build_flags.push(arg.clone());
-                        next_arg_is_build = false;
-                    } else if arg.starts_with('-') {
-                        let flag = arg.trim_start_matches('-');
-                        if flag == "args" {
-                            all_args_are_test = true;
-                        } else if let Some(has_arg) = is_debug_flag(flag) {
-                            if flag == "v" || flag == "test.v" {
-                                seen_v = true;
-                            }
-                            if flag.starts_with("test.") {
-                                args.push(arg.clone());
-                            } else {
-                                args.push(format!("-test.{flag}"))
-                            }
-                            next_arg_is_test = has_arg;
-                        } else if let Some(has_arg) = is_build_flag(flag) {
-                            build_flags.push(arg.clone());
-                            next_arg_is_build = has_arg;
-                        }
-                    } else if !seen_pkg {
-                        program = arg.clone();
-                        seen_pkg = true;
-                    } else {
-                        args.push(arg.clone());
-                    }
-                }
-                if !seen_v {
-                    args.push("-test.v".to_string());
-                }
-
-                let config: serde_json::Value = serde_json::to_value(DelveLaunchRequest {
-                    request: "launch".to_string(),
-                    mode: "test".to_string(),
-                    program,
-                    args,
-                    build_flags,
-                    cwd: build_config.cwd.clone(),
-                    env: build_config.env.clone(),
-                })
-                .unwrap();
-
-                Some(DebugScenario {
-                    label: resolved_label.to_string().into(),
-                    adapter: adapter.0.clone(),
-                    build: None,
-                    config,
-                    tcp_connection: None,
-                })
-            }
-            "run" => {
-                let mut next_arg_is_build = false;
-                let mut seen_pkg = false;
-
-                let mut program = ".".to_string();
-                let mut args = Vec::default();
-                let mut build_flags = Vec::default();
-
-                for arg in build_config.args.iter().skip(1) {
-                    if seen_pkg {
-                        args.push(arg.clone())
-                    } else if next_arg_is_build {
-                        build_flags.push(arg.clone());
-                        next_arg_is_build = false;
-                    } else if arg.starts_with("-") {
-                        if let Some(has_arg) = is_build_flag(arg.trim_start_matches("-")) {
-                            next_arg_is_build = has_arg;
-                        }
-                        build_flags.push(arg.clone())
-                    } else {
-                        program = arg.to_string();
-                        seen_pkg = true;
-                    }
-                }
-
-                let config: serde_json::Value = serde_json::to_value(DelveLaunchRequest {
-                    cwd: build_config.cwd.clone(),
-                    env: build_config.env.clone(),
-                    request: "launch".to_string(),
-                    mode: "debug".to_string(),
-                    program,
-                    args,
-                    build_flags,
-                })
-                .unwrap();
-
-                Some(DebugScenario {
-                    label: resolved_label.to_string().into(),
-                    adapter: adapter.0.clone(),
-                    build: None,
-                    config,
-                    tcp_connection: None,
-                })
-            }
-            _ => None,
-        }
-    }
-
-    async fn run(&self, _build_config: SpawnInTerminal) -> Result<DebugRequest> {
-        unreachable!()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use gpui::TestAppContext;
-    use task::{HideStrategy, RevealStrategy, RevealTarget, Shell, TaskTemplate};
-
-    #[gpui::test]
-    async fn test_create_scenario_for_go_build(_: &mut TestAppContext) {
-        let locator = GoLocator;
-        let task = TaskTemplate {
-            label: "go build".into(),
-            command: "go".into(),
-            args: vec!["build".into(), ".".into()],
-            env: Default::default(),
-            cwd: Some("${ZED_WORKTREE_ROOT}".into()),
-            use_new_terminal: false,
-            allow_concurrent_runs: false,
-            reveal: RevealStrategy::Always,
-            reveal_target: RevealTarget::Dock,
-            hide: HideStrategy::Never,
-            shell: Shell::System,
-            tags: vec![],
-            show_summary: true,
-            show_command: true,
-        };
-
-        let scenario = locator
-            .create_scenario(&task, "test label", &DebugAdapterName("Delve".into()))
-            .await;
-
-        assert!(scenario.is_none());
-    }
-
-    #[gpui::test]
-    async fn test_skip_non_go_commands_with_non_delve_adapter(_: &mut TestAppContext) {
-        let locator = GoLocator;
-        let task = TaskTemplate {
-            label: "cargo build".into(),
-            command: "cargo".into(),
-            args: vec!["build".into()],
-            env: Default::default(),
-            cwd: Some("${ZED_WORKTREE_ROOT}".into()),
-            use_new_terminal: false,
-            allow_concurrent_runs: false,
-            reveal: RevealStrategy::Always,
-            reveal_target: RevealTarget::Dock,
-            hide: HideStrategy::Never,
-            shell: Shell::System,
-            tags: vec![],
-            show_summary: true,
-            show_command: true,
-        };
-
-        let scenario = locator
-            .create_scenario(
-                &task,
-                "test label",
-                &DebugAdapterName("SomeOtherAdapter".into()),
-            )
-            .await;
-        assert!(scenario.is_none());
-
-        let scenario = locator
-            .create_scenario(&task, "test label", &DebugAdapterName("Delve".into()))
-            .await;
-        assert!(scenario.is_none());
-    }
-    #[gpui::test]
-    async fn test_go_locator_run(_: &mut TestAppContext) {
-        let locator = GoLocator;
-        let delve = DebugAdapterName("Delve".into());
-
-        let task = TaskTemplate {
-            label: "go run with flags".into(),
-            command: "go".into(),
-            args: vec![
-                "run".to_string(),
-                "-race".to_string(),
-                "-ldflags".to_string(),
-                "-X main.version=1.0".to_string(),
-                "./cmd/myapp".to_string(),
-                "--config".to_string(),
-                "production.yaml".to_string(),
-                "--verbose".to_string(),
-            ],
-            env: {
-                let mut env = HashMap::default();
-                env.insert("GO_ENV".to_string(), "production".to_string());
-                env
-            },
-            cwd: Some("/project/root".into()),
-            ..Default::default()
-        };
-
-        let scenario = locator
-            .create_scenario(&task, "test run label", &delve)
-            .await
-            .unwrap();
-
-        let config: DelveLaunchRequest = serde_json::from_value(scenario.config).unwrap();
-
-        assert_eq!(
-            config,
-            DelveLaunchRequest {
-                request: "launch".to_string(),
-                mode: "debug".to_string(),
-                program: "./cmd/myapp".to_string(),
-                build_flags: vec![
-                    "-race".to_string(),
-                    "-ldflags".to_string(),
-                    "-X main.version=1.0".to_string()
-                ],
-                args: vec![
-                    "--config".to_string(),
-                    "production.yaml".to_string(),
-                    "--verbose".to_string(),
-                ],
-                env: {
-                    let mut env = HashMap::default();
-                    env.insert("GO_ENV".to_string(), "production".to_string());
-                    env
-                },
-                cwd: Some("/project/root".to_string()),
-            }
-        );
-    }
-
-    #[gpui::test]
-    async fn test_go_locator_test(_: &mut TestAppContext) {
-        let locator = GoLocator;
-        let delve = DebugAdapterName("Delve".into());
-
-        // Test with tags and run flag
-        let task_with_tags = TaskTemplate {
-            label: "test".into(),
-            command: "go".into(),
-            args: vec![
-                "test".to_string(),
-                "-tags".to_string(),
-                "integration,unit".to_string(),
-                "-run".to_string(),
-                "Foo".to_string(),
-                ".".to_string(),
-            ],
-            ..Default::default()
-        };
-        let result = locator
-            .create_scenario(&task_with_tags, "", &delve)
-            .await
-            .unwrap();
-
-        let config: DelveLaunchRequest = serde_json::from_value(result.config).unwrap();
-
-        assert_eq!(
-            config,
-            DelveLaunchRequest {
-                request: "launch".to_string(),
-                mode: "test".to_string(),
-                program: ".".to_string(),
-                build_flags: vec!["-tags".to_string(), "integration,unit".to_string(),],
-                args: vec![
-                    "-test.run".to_string(),
-                    "Foo".to_string(),
-                    "-test.v".to_string()
-                ],
-                env: HashMap::default(),
-                cwd: None,
-            }
-        );
-    }
-
-    #[gpui::test]
-    async fn test_skip_unsupported_go_commands(_: &mut TestAppContext) {
-        let locator = GoLocator;
-        let task = TaskTemplate {
-            label: "go clean".into(),
-            command: "go".into(),
-            args: vec!["clean".into()],
-            env: Default::default(),
-            cwd: Some("${ZED_WORKTREE_ROOT}".into()),
-            use_new_terminal: false,
-            allow_concurrent_runs: false,
-            reveal: RevealStrategy::Always,
-            reveal_target: RevealTarget::Dock,
-            hide: HideStrategy::Never,
-            shell: Shell::System,
-            tags: vec![],
-            show_summary: true,
-            show_command: true,
-        };
-
-        let scenario = locator
-            .create_scenario(&task, "test label", &DebugAdapterName("Delve".into()))
-            .await;
-        assert!(scenario.is_none());
-    }
-}
diff --git a/crates/project/src/debugger/locators/node.rs b/crates/project/src/debugger/locators/node.rs
deleted file mode 100644
index a535c7165a..0000000000
--- a/crates/project/src/debugger/locators/node.rs
+++ /dev/null
@@ -1,62 +0,0 @@
-use std::borrow::Cow;
-
-use anyhow::{Result, bail};
-use async_trait::async_trait;
-use dap::{DapLocator, DebugRequest, adapters::DebugAdapterName};
-use gpui::SharedString;
-
-use task::{DebugScenario, SpawnInTerminal, TaskTemplate, VariableName};
-
-pub(crate) struct NodeLocator;
-
-const TYPESCRIPT_RUNNER_VARIABLE: VariableName =
-    VariableName::Custom(Cow::Borrowed("TYPESCRIPT_RUNNER"));
-
-#[async_trait]
-impl DapLocator for NodeLocator {
-    fn name(&self) -> SharedString {
-        SharedString::new_static("Node")
-    }
-
-    /// Determines whether this locator can generate debug target for given task.
-    async fn create_scenario(
-        &self,
-        build_config: &TaskTemplate,
-        resolved_label: &str,
-        adapter: &DebugAdapterName,
-    ) -> Option<DebugScenario> {
-        if adapter.0.as_ref() != "JavaScript" {
-            return None;
-        }
-        if build_config.command != TYPESCRIPT_RUNNER_VARIABLE.template_value()
-            && build_config.command != "npm"
-            && build_config.command != "pnpm"
-            && build_config.command != "yarn"
-        {
-            return None;
-        }
-
-        let config = serde_json::json!({
-            "request": "launch",
-            "type": "pwa-node",
-            "args": build_config.args.clone(),
-            "cwd": build_config.cwd.clone(),
-            "runtimeExecutable": build_config.command.clone(),
-            "env": build_config.env.clone(),
-            "runtimeArgs": ["--inspect-brk"],
-            "console": "integratedTerminal",
-        });
-
-        Some(DebugScenario {
-            adapter: adapter.0.clone(),
-            label: resolved_label.to_string().into(),
-            build: None,
-            config,
-            tcp_connection: None,
-        })
-    }
-
-    async fn run(&self, _: SpawnInTerminal) -> Result<DebugRequest> {
-        bail!("JavaScript locator should not require DapLocator::run to be ran");
-    }
-}
diff --git a/crates/project/src/debugger/locators/python.rs b/crates/project/src/debugger/locators/python.rs
deleted file mode 100644
index c3754548d0..0000000000
--- a/crates/project/src/debugger/locators/python.rs
+++ /dev/null
@@ -1,146 +0,0 @@
-use std::path::Path;
-
-use anyhow::{Result, bail};
-use async_trait::async_trait;
-use dap::{DapLocator, DebugRequest, adapters::DebugAdapterName};
-use gpui::SharedString;
-
-use task::{DebugScenario, SpawnInTerminal, TaskTemplate, VariableName};
-
-pub(crate) struct PythonLocator;
-
-#[async_trait]
-impl DapLocator for PythonLocator {
-    fn name(&self) -> SharedString {
-        SharedString::new_static("Python")
-    }
-
-    /// Determines whether this locator can generate debug target for given task.
-    async fn create_scenario(
-        &self,
-        build_config: &TaskTemplate,
-        resolved_label: &str,
-        adapter: &DebugAdapterName,
-    ) -> Option<DebugScenario> {
-        if adapter.0.as_ref() != "Debugpy" {
-            return None;
-        }
-        let valid_program = build_config.command.starts_with("$ZED_")
-            || Path::new(&build_config.command)
-                .file_name()
-                .is_some_and(|name| name.to_str().is_some_and(|path| path.starts_with("python")));
-        if !valid_program || build_config.args.iter().any(|arg| arg == "-c") {
-            // We cannot debug selections.
-            return None;
-        }
-        let command = build_config.command.clone();
-        let module_specifier_position = build_config
-            .args
-            .iter()
-            .position(|arg| arg == "-m")
-            .map(|position| position + 1);
-        // Skip the -m and module name, get all that's after.
-        let mut rest_of_the_args = module_specifier_position
-            .and_then(|position| build_config.args.get(position..))
-            .into_iter()
-            .flatten()
-            .fuse();
-        let mod_name = rest_of_the_args.next();
-        let args = rest_of_the_args.collect::<Vec<_>>();
-
-        let program_position = mod_name
-            .is_none()
-            .then(|| {
-                let zed_file = VariableName::File.template_value_with_whitespace();
-                build_config.args.iter().position(|arg| *arg == zed_file)
-            })
-            .flatten();
-        let args = if let Some(position) = program_position {
-            args.into_iter().skip(position).collect::<Vec<_>>()
-        } else {
-            args
-        };
-        if program_position.is_none() && mod_name.is_none() {
-            return None;
-        }
-        let mut config = serde_json::json!({
-            "request": "launch",
-            "python": command,
-            "args": args,
-            "cwd": build_config.cwd.clone()
-        });
-        if let Some(config_obj) = config.as_object_mut() {
-            if let Some(module) = mod_name {
-                config_obj.insert("module".to_string(), module.clone().into());
-            }
-            if let Some(program) = program_position {
-                config_obj.insert(
-                    "program".to_string(),
-                    build_config.args[program].clone().into(),
-                );
-            }
-        }
-
-        Some(DebugScenario {
-            adapter: adapter.0.clone(),
-            label: resolved_label.to_string().into(),
-            build: None,
-            config,
-            tcp_connection: None,
-        })
-    }
-
-    async fn run(&self, _: SpawnInTerminal) -> Result<DebugRequest> {
-        bail!("Python locator should not require DapLocator::run to be ran");
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use serde_json::json;
-
-    use super::*;
-
-    #[gpui::test]
-    async fn test_python_locator() {
-        let adapter = DebugAdapterName("Debugpy".into());
-        let build_task = TaskTemplate {
-            label: "run module '$ZED_FILE'".into(),
-            command: "$ZED_CUSTOM_PYTHON_ACTIVE_ZED_TOOLCHAIN".into(),
-            args: vec!["-m".into(), "$ZED_CUSTOM_PYTHON_MODULE_NAME".into()],
-            env: Default::default(),
-            cwd: Some("$ZED_WORKTREE_ROOT".into()),
-            use_new_terminal: false,
-            allow_concurrent_runs: false,
-            reveal: task::RevealStrategy::Always,
-            reveal_target: task::RevealTarget::Dock,
-            hide: task::HideStrategy::Never,
-            tags: vec!["python-module-main-method".into()],
-            shell: task::Shell::System,
-            show_summary: false,
-            show_command: false,
-        };
-
-        let expected_scenario = DebugScenario {
-            adapter: "Debugpy".into(),
-            label: "run module 'main.py'".into(),
-            build: None,
-            config: json!({
-                "request": "launch",
-                "python": "$ZED_CUSTOM_PYTHON_ACTIVE_ZED_TOOLCHAIN",
-                "args": [],
-                "cwd": "$ZED_WORKTREE_ROOT",
-                "module": "$ZED_CUSTOM_PYTHON_MODULE_NAME",
-            }),
-            tcp_connection: None,
-        };
-
-        assert_eq!(
-            PythonLocator
-                .create_scenario(&build_task, "run module 'main.py'", &adapter)
-                .await
-                .expect("Failed to create a scenario"),
-            expected_scenario
-        );
-    }
-}
diff --git a/crates/project/src/debugger/memory.rs b/crates/project/src/debugger/memory.rs
deleted file mode 100644
index 42ad64e688..0000000000
--- a/crates/project/src/debugger/memory.rs
+++ /dev/null
@@ -1,384 +0,0 @@
-//! This module defines the format in which memory of debuggee is represented.
-//!
-//! Each byte in memory can either be mapped or unmapped. We try to mimic that twofold:
-//! - We assume that the memory is divided into pages of a fixed size.
-//! - We assume that each page can be either mapped or unmapped.
-//!
-//! These two assumptions drive the shape of the memory representation.
-//! In particular, we want the unmapped pages to be represented without allocating any memory, as *most*
-//! of the memory in a program space is usually unmapped.
-//! Note that per DAP we don't know what the address space layout is, so we can't optimize off of it.
-//! Note that while we optimize for a paged layout, we also want to be able to represent memory that is not paged.
-//! This use case is relevant to embedded folks. Furthermore, we cater to default 4k page size.
-//! It is picked arbitrarily as a ubiquous default - other than that, the underlying format of Zed's memory storage should not be relevant
-//! to the users of this module.
-
-use std::{collections::BTreeMap, ops::RangeInclusive, sync::Arc};
-
-use gpui::BackgroundExecutor;
-use smallvec::SmallVec;
-
-const PAGE_SIZE: u64 = 4096;
-
-/// Represents the contents of a single page. We special-case unmapped pages to be allocation-free,
-/// since they're going to make up the majority of the memory in a program space (even though the user might not even get to see them - ever).
-#[derive(Clone, Debug)]
-pub(super) enum PageContents {
-    /// Whole page is unreadable.
-    Unmapped,
-    Mapped(Arc<MappedPageContents>),
-}
-
-impl PageContents {
-    #[cfg(test)]
-    fn mapped(contents: Vec<u8>) -> Self {
-        PageContents::Mapped(Arc::new(MappedPageContents(
-            vec![PageChunk::Mapped(contents.into())].into(),
-        )))
-    }
-}
-
-#[derive(Clone, Debug)]
-enum PageChunk {
-    Mapped(Arc<[u8]>),
-    Unmapped(u64),
-}
-
-impl PageChunk {
-    fn len(&self) -> u64 {
-        match self {
-            PageChunk::Mapped(contents) => contents.len() as u64,
-            PageChunk::Unmapped(size) => *size,
-        }
-    }
-}
-
-impl MappedPageContents {
-    fn len(&self) -> u64 {
-        self.0.iter().map(|chunk| chunk.len()).sum()
-    }
-}
-/// We hope for the whole page to be mapped in a single chunk, but we do leave the possibility open
-/// of having interleaved read permissions in a single page; debuggee's execution environment might either
-/// have a different page size OR it might not have paged memory layout altogether
-/// (which might be relevant to embedded systems).
-///
-/// As stated previously, the concept of a page in this module has to do more
-/// with optimizing fetching of the memory and not with the underlying bits and pieces
-/// of the memory of a debuggee.
-
-#[derive(Default, Debug)]
-pub(super) struct MappedPageContents(
-    /// Most of the time there should be only one chunk (either mapped or unmapped),
-    /// but we do leave the possibility open of having multiple regions of memory in a single page.
-    SmallVec<[PageChunk; 1]>,
-);
-
-type MemoryAddress = u64;
-#[derive(Clone, Copy, Debug, PartialEq, PartialOrd, Ord, Eq)]
-#[repr(transparent)]
-pub(super) struct PageAddress(u64);
-
-impl PageAddress {
-    pub(super) fn iter_range(
-        range: RangeInclusive<PageAddress>,
-    ) -> impl Iterator<Item = PageAddress> {
-        let mut current = range.start().0;
-        let end = range.end().0;
-
-        std::iter::from_fn(move || {
-            if current > end {
-                None
-            } else {
-                let addr = PageAddress(current);
-                current += PAGE_SIZE;
-                Some(addr)
-            }
-        })
-    }
-}
-
-pub(super) struct Memory {
-    pages: BTreeMap<PageAddress, PageContents>,
-}
-
-/// Represents a single memory cell (or None if a given cell is unmapped/unknown).
-#[derive(Copy, Clone, Debug, PartialEq, PartialOrd, Ord, Eq)]
-#[repr(transparent)]
-pub struct MemoryCell(pub Option<u8>);
-
-impl Memory {
-    pub(super) fn new() -> Self {
-        Self {
-            pages: Default::default(),
-        }
-    }
-
-    pub(super) fn memory_range_to_page_range(
-        range: RangeInclusive<MemoryAddress>,
-    ) -> RangeInclusive<PageAddress> {
-        let start_page = (range.start() / PAGE_SIZE) * PAGE_SIZE;
-        let end_page = (range.end() / PAGE_SIZE) * PAGE_SIZE;
-        PageAddress(start_page)..=PageAddress(end_page)
-    }
-
-    pub(super) fn build_page(&self, page_address: PageAddress) -> Option<MemoryPageBuilder> {
-        if self.pages.contains_key(&page_address) {
-            // We already know the state of this page.
-            None
-        } else {
-            Some(MemoryPageBuilder::new(page_address))
-        }
-    }
-
-    pub(super) fn insert_page(&mut self, address: PageAddress, page: PageContents) {
-        self.pages.insert(address, page);
-    }
-
-    pub(super) fn memory_range(&self, range: RangeInclusive<MemoryAddress>) -> MemoryIterator {
-        let pages = Self::memory_range_to_page_range(range.clone());
-        let pages = self
-            .pages
-            .range(pages)
-            .map(|(address, page)| (*address, page.clone()))
-            .collect::<Vec<_>>();
-        MemoryIterator::new(range, pages.into_iter())
-    }
-
-    pub(crate) fn clear(&mut self, background_executor: &BackgroundExecutor) {
-        let memory = std::mem::take(&mut self.pages);
-        background_executor
-            .spawn(async move {
-                drop(memory);
-            })
-            .detach();
-    }
-}
-
-/// Builder for memory pages.
-///
-/// Memory reads in DAP are sequential (or at least we make them so).
-/// ReadMemory response includes `unreadableBytes` property indicating the number of bytes
-/// that could not be read after the last successfully read byte.
-///
-/// We use it as follows:
-/// - We start off with a "large" 1-page ReadMemory request.
-/// - If it succeeds/fails wholesale, cool; we have no unknown memory regions in this page.
-/// - If it succeeds partially, we know # of mapped bytes.
-///   We might also know the # of unmapped bytes.
-///
-/// However, we're still unsure about what's *after* the unreadable region.
-/// This is where this builder comes in. It lets us track the state of figuring out contents of a single page.
-pub(super) struct MemoryPageBuilder {
-    chunks: MappedPageContents,
-    base_address: PageAddress,
-    left_to_read: u64,
-}
-
-/// Represents a chunk of memory of which we don't know if it's mapped or unmapped; thus we need
-/// to issue a request to figure out it's state.
-pub(super) struct UnknownMemory {
-    pub(super) address: MemoryAddress,
-    pub(super) size: u64,
-}
-
-impl MemoryPageBuilder {
-    fn new(base_address: PageAddress) -> Self {
-        Self {
-            chunks: Default::default(),
-            base_address,
-            left_to_read: PAGE_SIZE,
-        }
-    }
-
-    pub(super) fn build(self) -> (PageAddress, PageContents) {
-        debug_assert_eq!(self.left_to_read, 0);
-        debug_assert_eq!(
-            self.chunks.len(),
-            PAGE_SIZE,
-            "Expected `build` to be called on a fully-fetched page"
-        );
-        let contents = if let Some(first) = self.chunks.0.first()
-            && self.chunks.len() == 1
-            && matches!(first, PageChunk::Unmapped(PAGE_SIZE))
-        {
-            PageContents::Unmapped
-        } else {
-            PageContents::Mapped(Arc::new(MappedPageContents(self.chunks.0)))
-        };
-        (self.base_address, contents)
-    }
-    /// Drives the fetching of memory, in an iterator-esque style.
-    pub(super) fn next_request(&self) -> Option<UnknownMemory> {
-        if self.left_to_read == 0 {
-            None
-        } else {
-            let offset_in_current_page = PAGE_SIZE - self.left_to_read;
-            Some(UnknownMemory {
-                address: self.base_address.0 + offset_in_current_page,
-                size: self.left_to_read,
-            })
-        }
-    }
-    pub(super) fn unknown(&mut self, bytes: u64) {
-        if bytes == 0 {
-            return;
-        }
-        self.left_to_read -= bytes;
-        self.chunks.0.push(PageChunk::Unmapped(bytes));
-    }
-    pub(super) fn known(&mut self, data: Arc<[u8]>) {
-        if data.is_empty() {
-            return;
-        }
-        self.left_to_read -= data.len() as u64;
-        self.chunks.0.push(PageChunk::Mapped(data));
-    }
-}
-
-fn page_contents_into_iter(data: Arc<MappedPageContents>) -> Box<dyn Iterator<Item = MemoryCell>> {
-    let mut data_range = 0..data.0.len();
-    let iter = std::iter::from_fn(move || {
-        let data = &data;
-        let data_ref = data.clone();
-        data_range.next().map(move |index| {
-            let contents = &data_ref.0[index];
-            match contents {
-                PageChunk::Mapped(items) => {
-                    let chunk_range = 0..items.len();
-                    let items = items.clone();
-                    Box::new(
-                        chunk_range
-                            .into_iter()
-                            .map(move |ix| MemoryCell(Some(items[ix]))),
-                    ) as Box<dyn Iterator<Item = MemoryCell>>
-                }
-                PageChunk::Unmapped(len) => {
-                    Box::new(std::iter::repeat_n(MemoryCell(None), *len as usize))
-                }
-            }
-        })
-    })
-    .flatten();
-
-    Box::new(iter)
-}
-/// Defines an iteration over a range of memory. Some of this memory might be unmapped or straight up missing.
-/// Thus, this iterator alternates between synthesizing values and yielding known memory.
-pub struct MemoryIterator {
-    start: MemoryAddress,
-    end: MemoryAddress,
-    current_known_page: Option<(PageAddress, Box<dyn Iterator<Item = MemoryCell>>)>,
-    pages: std::vec::IntoIter<(PageAddress, PageContents)>,
-}
-
-impl MemoryIterator {
-    fn new(
-        range: RangeInclusive<MemoryAddress>,
-        pages: std::vec::IntoIter<(PageAddress, PageContents)>,
-    ) -> Self {
-        Self {
-            start: *range.start(),
-            end: *range.end(),
-            current_known_page: None,
-            pages,
-        }
-    }
-    fn fetch_next_page(&mut self) -> bool {
-        if let Some((mut address, chunk)) = self.pages.next() {
-            let mut contents = match chunk {
-                PageContents::Unmapped => None,
-                PageContents::Mapped(mapped_page_contents) => {
-                    Some(page_contents_into_iter(mapped_page_contents))
-                }
-            };
-
-            if address.0 < self.start {
-                // Skip ahead till our iterator is at the start of the range
-
-                //address: 20, start: 25
-                //
-                let to_skip = self.start - address.0;
-                address.0 += to_skip;
-                if let Some(contents) = &mut contents {
-                    contents.nth(to_skip as usize - 1);
-                }
-            }
-            self.current_known_page = contents.map(|contents| (address, contents));
-            true
-        } else {
-            false
-        }
-    }
-}
-impl Iterator for MemoryIterator {
-    type Item = MemoryCell;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        if self.start > self.end {
-            return None;
-        }
-        if let Some((current_page_address, current_memory_chunk)) = self.current_known_page.as_mut()
-            && current_page_address.0 <= self.start
-        {
-            if let Some(next_cell) = current_memory_chunk.next() {
-                self.start += 1;
-                return Some(next_cell);
-            } else {
-                self.current_known_page.take();
-            }
-        }
-        if !self.fetch_next_page() {
-            self.start += 1;
-            Some(MemoryCell(None))
-        } else {
-            self.next()
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::debugger::{
-        MemoryCell,
-        memory::{MemoryIterator, PageAddress, PageContents},
-    };
-
-    #[test]
-    fn iterate_over_unmapped_memory() {
-        let empty_iterator = MemoryIterator::new(0..=127, Default::default());
-        let actual = empty_iterator.collect::<Vec<_>>();
-        let expected = vec![MemoryCell(None); 128];
-        assert_eq!(actual.len(), expected.len());
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn iterate_over_partially_mapped_memory() {
-        let it = MemoryIterator::new(
-            0..=127,
-            vec![(PageAddress(5), PageContents::mapped(vec![1]))].into_iter(),
-        );
-        let actual = it.collect::<Vec<_>>();
-        let expected = std::iter::repeat_n(MemoryCell(None), 5)
-            .chain(std::iter::once(MemoryCell(Some(1))))
-            .chain(std::iter::repeat_n(MemoryCell(None), 122))
-            .collect::<Vec<_>>();
-        assert_eq!(actual.len(), expected.len());
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn reads_from_the_middle_of_a_page() {
-        let partial_iter = MemoryIterator::new(
-            20..=30,
-            vec![(PageAddress(0), PageContents::mapped((0..255).collect()))].into_iter(),
-        );
-        let actual = partial_iter.collect::<Vec<_>>();
-        let expected = (20..=30)
-            .map(|val| MemoryCell(Some(val)))
-            .collect::<Vec<_>>();
-        assert_eq!(actual.len(), expected.len());
-        assert_eq!(actual, expected);
-    }
-}
diff --git a/crates/project/src/debugger/session.rs b/crates/project/src/debugger/session.rs
deleted file mode 100644
index 82a139ea24..0000000000
--- a/crates/project/src/debugger/session.rs
+++ /dev/null
@@ -1,3177 +0,0 @@
-use super::breakpoint_store::{
-    BreakpointStore, BreakpointStoreEvent, BreakpointUpdatedReason, SourceBreakpoint,
-};
-use super::dap_command::{
-    self, Attach, ConfigurationDone, ContinueCommand, DataBreakpointInfoCommand, DisconnectCommand,
-    EvaluateCommand, Initialize, Launch, LoadedSourcesCommand, LocalDapCommand, LocationsCommand,
-    ModulesCommand, NextCommand, PauseCommand, RestartCommand, RestartStackFrameCommand,
-    ScopesCommand, SetDataBreakpointsCommand, SetExceptionBreakpoints, SetVariableValueCommand,
-    StackTraceCommand, StepBackCommand, StepCommand, StepInCommand, StepOutCommand,
-    TerminateCommand, TerminateThreadsCommand, ThreadsCommand, VariablesCommand,
-};
-use super::dap_store::DapStore;
-use crate::debugger::breakpoint_store::BreakpointSessionState;
-use crate::debugger::dap_command::{DataBreakpointContext, ReadMemory};
-use crate::debugger::memory::{self, Memory, MemoryIterator, MemoryPageBuilder, PageAddress};
-use anyhow::{Context as _, Result, anyhow, bail};
-use base64::Engine;
-use collections::{HashMap, HashSet, IndexMap};
-use dap::adapters::{DebugAdapterBinary, DebugAdapterName};
-use dap::messages::Response;
-use dap::requests::{Request, RunInTerminal, StartDebugging};
-use dap::transport::TcpTransport;
-use dap::{
-    Capabilities, ContinueArguments, EvaluateArgumentsContext, Module, Source, StackFrameId,
-    SteppingGranularity, StoppedEvent, VariableReference,
-    client::{DebugAdapterClient, SessionId},
-    messages::{Events, Message},
-};
-use dap::{
-    ExceptionBreakpointsFilter, ExceptionFilterOptions, OutputEvent, OutputEventCategory,
-    RunInTerminalRequestArguments, StackFramePresentationHint, StartDebuggingRequestArguments,
-    StartDebuggingRequestArgumentsRequest, VariablePresentationHint, WriteMemoryArguments,
-};
-use futures::channel::mpsc::UnboundedSender;
-use futures::channel::{mpsc, oneshot};
-use futures::io::BufReader;
-use futures::{AsyncBufReadExt as _, SinkExt, StreamExt, TryStreamExt};
-use futures::{FutureExt, future::Shared};
-use gpui::{
-    App, AppContext, AsyncApp, BackgroundExecutor, Context, Entity, EventEmitter, SharedString,
-    Task, WeakEntity,
-};
-use http_client::HttpClient;
-use node_runtime::NodeRuntime;
-use remote::RemoteClient;
-use serde::{Deserialize, Serialize};
-use serde_json::Value;
-use smol::net::{TcpListener, TcpStream};
-use std::any::TypeId;
-use std::collections::{BTreeMap, VecDeque};
-use std::net::Ipv4Addr;
-use std::ops::RangeInclusive;
-use std::path::PathBuf;
-use std::process::Stdio;
-use std::time::Duration;
-use std::u64;
-use std::{
-    any::Any,
-    collections::hash_map::Entry,
-    hash::{Hash, Hasher},
-    path::Path,
-    sync::Arc,
-};
-use task::TaskContext;
-use text::{PointUtf16, ToPointUtf16};
-use url::Url;
-use util::command::new_smol_command;
-use util::{ResultExt, debug_panic, maybe};
-use worktree::Worktree;
-
-const MAX_TRACKED_OUTPUT_EVENTS: usize = 5000;
-const DEBUG_HISTORY_LIMIT: usize = 10;
-
-#[derive(Debug, Copy, Clone, Hash, PartialEq, PartialOrd, Ord, Eq)]
-#[repr(transparent)]
-pub struct ThreadId(pub i64);
-
-impl From<i64> for ThreadId {
-    fn from(id: i64) -> Self {
-        Self(id)
-    }
-}
-
-#[derive(Clone, Debug)]
-pub struct StackFrame {
-    pub dap: dap::StackFrame,
-    pub scopes: Vec<dap::Scope>,
-}
-
-impl From<dap::StackFrame> for StackFrame {
-    fn from(stack_frame: dap::StackFrame) -> Self {
-        Self {
-            scopes: vec![],
-            dap: stack_frame,
-        }
-    }
-}
-
-#[derive(Copy, Clone, Debug, Default, PartialEq, Eq)]
-pub enum ThreadStatus {
-    #[default]
-    Running,
-    Stopped,
-    Stepping,
-    Exited,
-    Ended,
-}
-
-impl ThreadStatus {
-    pub fn label(&self) -> &'static str {
-        match self {
-            ThreadStatus::Running => "Running",
-            ThreadStatus::Stopped => "Stopped",
-            ThreadStatus::Stepping => "Stepping",
-            ThreadStatus::Exited => "Exited",
-            ThreadStatus::Ended => "Ended",
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct Thread {
-    dap: dap::Thread,
-    stack_frames: Vec<StackFrame>,
-    stack_frames_error: Option<SharedString>,
-    _has_stopped: bool,
-}
-
-impl From<dap::Thread> for Thread {
-    fn from(dap: dap::Thread) -> Self {
-        Self {
-            dap,
-            stack_frames: Default::default(),
-            stack_frames_error: None,
-            _has_stopped: false,
-        }
-    }
-}
-
-#[derive(Debug, Clone, PartialEq)]
-pub struct Watcher {
-    pub expression: SharedString,
-    pub value: SharedString,
-    pub variables_reference: u64,
-    pub presentation_hint: Option<VariablePresentationHint>,
-}
-
-#[derive(Debug, Clone, PartialEq)]
-pub struct DataBreakpointState {
-    pub dap: dap::DataBreakpoint,
-    pub is_enabled: bool,
-    pub context: Arc<DataBreakpointContext>,
-}
-
-pub enum SessionState {
-    /// Represents a session that is building/initializing
-    /// even if a session doesn't have a pre build task this state
-    /// is used to run all the async tasks that are required to start the session
-    Booting(Option<Task<Result<()>>>),
-    Running(RunningMode),
-}
-
-#[derive(Clone)]
-pub struct RunningMode {
-    client: Arc<DebugAdapterClient>,
-    binary: DebugAdapterBinary,
-    tmp_breakpoint: Option<SourceBreakpoint>,
-    worktree: WeakEntity<Worktree>,
-    executor: BackgroundExecutor,
-    is_started: bool,
-    has_ever_stopped: bool,
-    messages_tx: UnboundedSender<Message>,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Default)]
-pub struct SessionQuirks {
-    pub compact: bool,
-    pub prefer_thread_name: bool,
-}
-
-fn client_source(abs_path: &Path) -> dap::Source {
-    dap::Source {
-        name: abs_path
-            .file_name()
-            .map(|filename| filename.to_string_lossy().into_owned()),
-        path: Some(abs_path.to_string_lossy().into_owned()),
-        source_reference: None,
-        presentation_hint: None,
-        origin: None,
-        sources: None,
-        adapter_data: None,
-        checksums: None,
-    }
-}
-
-impl RunningMode {
-    async fn new(
-        session_id: SessionId,
-        parent_session: Option<Entity<Session>>,
-        worktree: WeakEntity<Worktree>,
-        binary: DebugAdapterBinary,
-        messages_tx: futures::channel::mpsc::UnboundedSender<Message>,
-        cx: &mut AsyncApp,
-    ) -> Result<Self> {
-        let message_handler = Box::new({
-            let messages_tx = messages_tx.clone();
-            move |message| {
-                messages_tx.unbounded_send(message).ok();
-            }
-        });
-
-        let client = if let Some(client) = parent_session
-            .and_then(|session| cx.update(|cx| session.read(cx).adapter_client()).ok())
-            .flatten()
-        {
-            client
-                .create_child_connection(session_id, binary.clone(), message_handler, cx)
-                .await?
-        } else {
-            DebugAdapterClient::start(session_id, binary.clone(), message_handler, cx).await?
-        };
-
-        Ok(Self {
-            client: Arc::new(client),
-            worktree,
-            tmp_breakpoint: None,
-            binary,
-            executor: cx.background_executor().clone(),
-            is_started: false,
-            has_ever_stopped: false,
-            messages_tx,
-        })
-    }
-
-    pub(crate) fn worktree(&self) -> &WeakEntity<Worktree> {
-        &self.worktree
-    }
-
-    fn unset_breakpoints_from_paths(&self, paths: &Vec<Arc<Path>>, cx: &mut App) -> Task<()> {
-        let tasks: Vec<_> = paths
-            .iter()
-            .map(|path| {
-                self.request(dap_command::SetBreakpoints {
-                    source: client_source(path),
-                    source_modified: None,
-                    breakpoints: vec![],
-                })
-            })
-            .collect();
-
-        cx.background_spawn(async move {
-            futures::future::join_all(tasks)
-                .await
-                .iter()
-                .for_each(|res| match res {
-                    Ok(_) => {}
-                    Err(err) => {
-                        log::warn!("Set breakpoints request failed: {}", err);
-                    }
-                });
-        })
-    }
-
-    fn send_breakpoints_from_path(
-        &self,
-        abs_path: Arc<Path>,
-        reason: BreakpointUpdatedReason,
-        breakpoint_store: &Entity<BreakpointStore>,
-        cx: &mut App,
-    ) -> Task<()> {
-        let breakpoints =
-            breakpoint_store
-                .read(cx)
-                .source_breakpoints_from_path(&abs_path, cx)
-                .into_iter()
-                .filter(|bp| bp.state.is_enabled())
-                .chain(self.tmp_breakpoint.iter().filter_map(|breakpoint| {
-                    breakpoint.path.eq(&abs_path).then(|| breakpoint.clone())
-                }))
-                .map(Into::into)
-                .collect();
-
-        let raw_breakpoints = breakpoint_store
-            .read(cx)
-            .breakpoints_from_path(&abs_path)
-            .into_iter()
-            .filter(|bp| bp.bp.state.is_enabled())
-            .collect::<Vec<_>>();
-
-        let task = self.request(dap_command::SetBreakpoints {
-            source: client_source(&abs_path),
-            source_modified: Some(matches!(reason, BreakpointUpdatedReason::FileSaved)),
-            breakpoints,
-        });
-        let session_id = self.client.id();
-        let breakpoint_store = breakpoint_store.downgrade();
-        cx.spawn(async move |cx| match cx.background_spawn(task).await {
-            Ok(breakpoints) => {
-                let breakpoints =
-                    breakpoints
-                        .into_iter()
-                        .zip(raw_breakpoints)
-                        .filter_map(|(dap_bp, zed_bp)| {
-                            Some((
-                                zed_bp,
-                                BreakpointSessionState {
-                                    id: dap_bp.id?,
-                                    verified: dap_bp.verified,
-                                },
-                            ))
-                        });
-                breakpoint_store
-                    .update(cx, |this, _| {
-                        this.mark_breakpoints_verified(session_id, &abs_path, breakpoints);
-                    })
-                    .ok();
-            }
-            Err(err) => log::warn!("Set breakpoints request failed for path: {}", err),
-        })
-    }
-
-    fn send_exception_breakpoints(
-        &self,
-        filters: Vec<ExceptionBreakpointsFilter>,
-        supports_filter_options: bool,
-    ) -> Task<Result<Vec<dap::Breakpoint>>> {
-        let arg = if supports_filter_options {
-            SetExceptionBreakpoints::WithOptions {
-                filters: filters
-                    .into_iter()
-                    .map(|filter| ExceptionFilterOptions {
-                        filter_id: filter.filter,
-                        condition: None,
-                        mode: None,
-                    })
-                    .collect(),
-            }
-        } else {
-            SetExceptionBreakpoints::Plain {
-                filters: filters.into_iter().map(|filter| filter.filter).collect(),
-            }
-        };
-        self.request(arg)
-    }
-
-    fn send_source_breakpoints(
-        &self,
-        ignore_breakpoints: bool,
-        breakpoint_store: &Entity<BreakpointStore>,
-        cx: &App,
-    ) -> Task<HashMap<Arc<Path>, anyhow::Error>> {
-        let mut breakpoint_tasks = Vec::new();
-        let breakpoints = breakpoint_store.read(cx).all_source_breakpoints(cx);
-        let mut raw_breakpoints = breakpoint_store.read_with(cx, |this, _| this.all_breakpoints());
-        debug_assert_eq!(raw_breakpoints.len(), breakpoints.len());
-        let session_id = self.client.id();
-        for (path, breakpoints) in breakpoints {
-            let breakpoints = if ignore_breakpoints {
-                vec![]
-            } else {
-                breakpoints
-                    .into_iter()
-                    .filter(|bp| bp.state.is_enabled())
-                    .map(Into::into)
-                    .collect()
-            };
-
-            let raw_breakpoints = raw_breakpoints
-                .remove(&path)
-                .unwrap_or_default()
-                .into_iter()
-                .filter(|bp| bp.bp.state.is_enabled());
-            let error_path = path.clone();
-            let send_request = self
-                .request(dap_command::SetBreakpoints {
-                    source: client_source(&path),
-                    source_modified: Some(false),
-                    breakpoints,
-                })
-                .map(|result| result.map_err(move |e| (error_path, e)));
-
-            let task = cx.spawn({
-                let breakpoint_store = breakpoint_store.downgrade();
-                async move |cx| {
-                    let breakpoints = cx.background_spawn(send_request).await?;
-
-                    let breakpoints = breakpoints.into_iter().zip(raw_breakpoints).filter_map(
-                        |(dap_bp, zed_bp)| {
-                            Some((
-                                zed_bp,
-                                BreakpointSessionState {
-                                    id: dap_bp.id?,
-                                    verified: dap_bp.verified,
-                                },
-                            ))
-                        },
-                    );
-                    breakpoint_store
-                        .update(cx, |this, _| {
-                            this.mark_breakpoints_verified(session_id, &path, breakpoints);
-                        })
-                        .ok();
-
-                    Ok(())
-                }
-            });
-            breakpoint_tasks.push(task);
-        }
-
-        cx.background_spawn(async move {
-            futures::future::join_all(breakpoint_tasks)
-                .await
-                .into_iter()
-                .filter_map(Result::err)
-                .collect::<HashMap<_, _>>()
-        })
-    }
-
-    fn initialize_sequence(
-        &self,
-        capabilities: &Capabilities,
-        initialized_rx: oneshot::Receiver<()>,
-        dap_store: WeakEntity<DapStore>,
-        cx: &mut Context<Session>,
-    ) -> Task<Result<()>> {
-        let raw = self.binary.request_args.clone();
-
-        // Of relevance: https://github.com/microsoft/vscode/issues/4902#issuecomment-368583522
-        let launch = match raw.request {
-            dap::StartDebuggingRequestArgumentsRequest::Launch => self.request(Launch {
-                raw: raw.configuration,
-            }),
-            dap::StartDebuggingRequestArgumentsRequest::Attach => self.request(Attach {
-                raw: raw.configuration,
-            }),
-        };
-
-        let configuration_done_supported = ConfigurationDone::is_supported(capabilities);
-        // From spec (on initialization sequence):
-        // client sends a setExceptionBreakpoints request if one or more exceptionBreakpointFilters have been defined (or if supportsConfigurationDoneRequest is not true)
-        //
-        // Thus we should send setExceptionBreakpoints even if `exceptionFilters` variable is empty (as long as there were some options in the first place).
-        let should_send_exception_breakpoints = capabilities
-            .exception_breakpoint_filters
-            .as_ref()
-            .is_some_and(|filters| !filters.is_empty())
-            || !configuration_done_supported;
-        let supports_exception_filters = capabilities
-            .supports_exception_filter_options
-            .unwrap_or_default();
-        let this = self.clone();
-        let worktree = self.worktree().clone();
-        let mut filters = capabilities
-            .exception_breakpoint_filters
-            .clone()
-            .unwrap_or_default();
-        let configuration_sequence = cx.spawn({
-            async move |session, cx| {
-                let adapter_name = session.read_with(cx, |this, _| this.adapter())?;
-                let (breakpoint_store, adapter_defaults) =
-                    dap_store.read_with(cx, |dap_store, _| {
-                        (
-                            dap_store.breakpoint_store().clone(),
-                            dap_store.adapter_options(&adapter_name),
-                        )
-                    })?;
-                initialized_rx.await?;
-                let errors_by_path = cx
-                    .update(|cx| this.send_source_breakpoints(false, &breakpoint_store, cx))?
-                    .await;
-
-                dap_store.update(cx, |_, cx| {
-                    let Some(worktree) = worktree.upgrade() else {
-                        return;
-                    };
-
-                    for (path, error) in &errors_by_path {
-                        log::error!("failed to set breakpoints for {path:?}: {error}");
-                    }
-
-                    if let Some(failed_path) = errors_by_path.keys().next() {
-                        let failed_path = failed_path
-                            .strip_prefix(worktree.read(cx).abs_path())
-                            .unwrap_or(failed_path)
-                            .display();
-                        let message = format!(
-                            "Failed to set breakpoints for {failed_path}{}",
-                            match errors_by_path.len() {
-                                0 => unreachable!(),
-                                1 => "".into(),
-                                2 => " and 1 other path".into(),
-                                n => format!(" and {} other paths", n - 1),
-                            }
-                        );
-                        cx.emit(super::dap_store::DapStoreEvent::Notification(message));
-                    }
-                })?;
-
-                if should_send_exception_breakpoints {
-                    _ = session.update(cx, |this, _| {
-                        filters.retain(|filter| {
-                            let is_enabled = if let Some(defaults) = adapter_defaults.as_ref() {
-                                defaults
-                                    .exception_breakpoints
-                                    .get(&filter.filter)
-                                    .map(|options| options.enabled)
-                                    .unwrap_or_else(|| filter.default.unwrap_or_default())
-                            } else {
-                                filter.default.unwrap_or_default()
-                            };
-                            this.exception_breakpoints
-                                .entry(filter.filter.clone())
-                                .or_insert_with(|| (filter.clone(), is_enabled));
-                            is_enabled
-                        });
-                    });
-
-                    this.send_exception_breakpoints(filters, supports_exception_filters)
-                        .await
-                        .ok();
-                }
-
-                if configuration_done_supported {
-                    this.request(ConfigurationDone {})
-                } else {
-                    Task::ready(Ok(()))
-                }
-                .await
-            }
-        });
-
-        let task = cx.background_spawn(futures::future::try_join(launch, configuration_sequence));
-
-        cx.spawn(async move |this, cx| {
-            let result = task.await;
-
-            this.update(cx, |this, cx| {
-                if let Some(this) = this.as_running_mut() {
-                    this.is_started = true;
-                    cx.notify();
-                }
-            })
-            .ok();
-
-            result?;
-            anyhow::Ok(())
-        })
-    }
-
-    fn reconnect_for_ssh(&self, cx: &mut AsyncApp) -> Option<Task<Result<()>>> {
-        let client = self.client.clone();
-        let messages_tx = self.messages_tx.clone();
-        let message_handler = Box::new(move |message| {
-            messages_tx.unbounded_send(message).ok();
-        });
-        if client.should_reconnect_for_ssh() {
-            Some(cx.spawn(async move |cx| {
-                client.connect(message_handler, cx).await?;
-                anyhow::Ok(())
-            }))
-        } else {
-            None
-        }
-    }
-
-    fn request<R: LocalDapCommand>(&self, request: R) -> Task<Result<R::Response>>
-    where
-        <R::DapRequest as dap::requests::Request>::Response: 'static,
-        <R::DapRequest as dap::requests::Request>::Arguments: 'static + Send,
-    {
-        let request = Arc::new(request);
-
-        let request_clone = request.clone();
-        let connection = self.client.clone();
-        self.executor.spawn(async move {
-            let args = request_clone.to_dap();
-            let response = connection.request::<R::DapRequest>(args).await?;
-            request.response_from_dap(response)
-        })
-    }
-}
-
-impl SessionState {
-    pub(super) fn request_dap<R: LocalDapCommand>(&self, request: R) -> Task<Result<R::Response>>
-    where
-        <R::DapRequest as dap::requests::Request>::Response: 'static,
-        <R::DapRequest as dap::requests::Request>::Arguments: 'static + Send,
-    {
-        match self {
-            SessionState::Running(debug_adapter_client) => debug_adapter_client.request(request),
-            SessionState::Booting(_) => Task::ready(Err(anyhow!(
-                "no adapter running to send request: {request:?}"
-            ))),
-        }
-    }
-
-    /// Did this debug session stop at least once?
-    pub(crate) fn has_ever_stopped(&self) -> bool {
-        match self {
-            SessionState::Booting(_) => false,
-            SessionState::Running(running_mode) => running_mode.has_ever_stopped,
-        }
-    }
-
-    fn stopped(&mut self) {
-        if let SessionState::Running(running) = self {
-            running.has_ever_stopped = true;
-        }
-    }
-}
-
-#[derive(Default)]
-struct ThreadStates {
-    global_state: Option<ThreadStatus>,
-    known_thread_states: IndexMap<ThreadId, ThreadStatus>,
-}
-
-impl ThreadStates {
-    fn stop_all_threads(&mut self) {
-        self.global_state = Some(ThreadStatus::Stopped);
-        self.known_thread_states.clear();
-    }
-
-    fn exit_all_threads(&mut self) {
-        self.global_state = Some(ThreadStatus::Exited);
-        self.known_thread_states.clear();
-    }
-
-    fn continue_all_threads(&mut self) {
-        self.global_state = Some(ThreadStatus::Running);
-        self.known_thread_states.clear();
-    }
-
-    fn stop_thread(&mut self, thread_id: ThreadId) {
-        self.known_thread_states
-            .insert(thread_id, ThreadStatus::Stopped);
-    }
-
-    fn continue_thread(&mut self, thread_id: ThreadId) {
-        self.known_thread_states
-            .insert(thread_id, ThreadStatus::Running);
-    }
-
-    fn process_step(&mut self, thread_id: ThreadId) {
-        self.known_thread_states
-            .insert(thread_id, ThreadStatus::Stepping);
-    }
-
-    fn thread_status(&self, thread_id: ThreadId) -> ThreadStatus {
-        self.thread_state(thread_id)
-            .unwrap_or(ThreadStatus::Running)
-    }
-
-    fn thread_state(&self, thread_id: ThreadId) -> Option<ThreadStatus> {
-        self.known_thread_states
-            .get(&thread_id)
-            .copied()
-            .or(self.global_state)
-    }
-
-    fn exit_thread(&mut self, thread_id: ThreadId) {
-        self.known_thread_states
-            .insert(thread_id, ThreadStatus::Exited);
-    }
-
-    fn any_stopped_thread(&self) -> bool {
-        self.global_state
-            .is_some_and(|state| state == ThreadStatus::Stopped)
-            || self
-                .known_thread_states
-                .values()
-                .any(|status| *status == ThreadStatus::Stopped)
-    }
-}
-
-// TODO(debugger): Wrap dap types with reference counting so the UI doesn't have to clone them on refresh
-#[derive(Default)]
-pub struct SessionSnapshot {
-    threads: IndexMap<ThreadId, Thread>,
-    thread_states: ThreadStates,
-    variables: HashMap<VariableReference, Vec<dap::Variable>>,
-    stack_frames: IndexMap<StackFrameId, StackFrame>,
-    locations: HashMap<u64, dap::LocationsResponse>,
-    modules: Vec<dap::Module>,
-    loaded_sources: Vec<dap::Source>,
-}
-
-type IsEnabled = bool;
-
-#[derive(Copy, Clone, Default, Debug, PartialEq, PartialOrd, Eq, Ord)]
-pub struct OutputToken(pub usize);
-/// Represents a current state of a single debug adapter and provides ways to mutate it.
-pub struct Session {
-    pub state: SessionState,
-    active_snapshot: SessionSnapshot,
-    snapshots: VecDeque<SessionSnapshot>,
-    selected_snapshot_index: Option<usize>,
-    id: SessionId,
-    label: Option<SharedString>,
-    adapter: DebugAdapterName,
-    pub(super) capabilities: Capabilities,
-    child_session_ids: HashSet<SessionId>,
-    parent_session: Option<Entity<Session>>,
-    output_token: OutputToken,
-    output: Box<circular_buffer::CircularBuffer<MAX_TRACKED_OUTPUT_EVENTS, dap::OutputEvent>>,
-    watchers: HashMap<SharedString, Watcher>,
-    is_session_terminated: bool,
-    requests: HashMap<TypeId, HashMap<RequestSlot, Shared<Task<Option<()>>>>>,
-    pub(crate) breakpoint_store: Entity<BreakpointStore>,
-    ignore_breakpoints: bool,
-    exception_breakpoints: BTreeMap<String, (ExceptionBreakpointsFilter, IsEnabled)>,
-    data_breakpoints: BTreeMap<String, DataBreakpointState>,
-    background_tasks: Vec<Task<()>>,
-    restart_task: Option<Task<()>>,
-    task_context: TaskContext,
-    memory: memory::Memory,
-    quirks: SessionQuirks,
-    remote_client: Option<Entity<RemoteClient>>,
-    node_runtime: Option<NodeRuntime>,
-    http_client: Option<Arc<dyn HttpClient>>,
-    companion_port: Option<u16>,
-}
-
-trait CacheableCommand: Any + Send + Sync {
-    fn dyn_eq(&self, rhs: &dyn CacheableCommand) -> bool;
-    fn dyn_hash(&self, hasher: &mut dyn Hasher);
-    fn as_any_arc(self: Arc<Self>) -> Arc<dyn Any + Send + Sync>;
-}
-
-impl<T> CacheableCommand for T
-where
-    T: LocalDapCommand + PartialEq + Eq + Hash,
-{
-    fn dyn_eq(&self, rhs: &dyn CacheableCommand) -> bool {
-        (rhs as &dyn Any).downcast_ref::<Self>() == Some(self)
-    }
-
-    fn dyn_hash(&self, mut hasher: &mut dyn Hasher) {
-        T::hash(self, &mut hasher);
-    }
-
-    fn as_any_arc(self: Arc<Self>) -> Arc<dyn Any + Send + Sync> {
-        self
-    }
-}
-
-pub(crate) struct RequestSlot(Arc<dyn CacheableCommand>);
-
-impl<T: LocalDapCommand + PartialEq + Eq + Hash> From<T> for RequestSlot {
-    fn from(request: T) -> Self {
-        Self(Arc::new(request))
-    }
-}
-
-impl PartialEq for RequestSlot {
-    fn eq(&self, other: &Self) -> bool {
-        self.0.dyn_eq(other.0.as_ref())
-    }
-}
-
-impl Eq for RequestSlot {}
-
-impl Hash for RequestSlot {
-    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-        self.0.dyn_hash(state);
-        (&*self.0 as &dyn Any).type_id().hash(state)
-    }
-}
-
-#[derive(Debug, Clone, Hash, PartialEq, Eq)]
-pub struct CompletionsQuery {
-    pub query: String,
-    pub column: u64,
-    pub line: Option<u64>,
-    pub frame_id: Option<u64>,
-}
-
-impl CompletionsQuery {
-    pub fn new(
-        buffer: &language::Buffer,
-        cursor_position: language::Anchor,
-        frame_id: Option<u64>,
-    ) -> Self {
-        let PointUtf16 { row, column } = cursor_position.to_point_utf16(&buffer.snapshot());
-        Self {
-            query: buffer.text(),
-            column: column as u64,
-            frame_id,
-            line: Some(row as u64),
-        }
-    }
-}
-
-#[derive(Debug)]
-pub enum SessionEvent {
-    Modules,
-    LoadedSources,
-    Stopped(Option<ThreadId>),
-    StackTrace,
-    Variables,
-    Watchers,
-    Threads,
-    InvalidateInlineValue,
-    CapabilitiesLoaded,
-    RunInTerminal {
-        request: RunInTerminalRequestArguments,
-        sender: mpsc::Sender<Result<u32>>,
-    },
-    DataBreakpointInfo,
-    ConsoleOutput,
-    HistoricSnapshotSelected,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum SessionStateEvent {
-    Running,
-    Shutdown,
-    Restart,
-    SpawnChildSession {
-        request: StartDebuggingRequestArguments,
-    },
-}
-
-impl EventEmitter<SessionEvent> for Session {}
-impl EventEmitter<SessionStateEvent> for Session {}
-
-// local session will send breakpoint updates to DAP for all new breakpoints
-// remote side will only send breakpoint updates when it is a breakpoint created by that peer
-// BreakpointStore notifies session on breakpoint changes
-impl Session {
-    pub(crate) fn new(
-        breakpoint_store: Entity<BreakpointStore>,
-        session_id: SessionId,
-        parent_session: Option<Entity<Session>>,
-        label: Option<SharedString>,
-        adapter: DebugAdapterName,
-        task_context: TaskContext,
-        quirks: SessionQuirks,
-        remote_client: Option<Entity<RemoteClient>>,
-        node_runtime: Option<NodeRuntime>,
-        http_client: Option<Arc<dyn HttpClient>>,
-        cx: &mut App,
-    ) -> Entity<Self> {
-        cx.new::<Self>(|cx| {
-            cx.subscribe(&breakpoint_store, |this, store, event, cx| match event {
-                BreakpointStoreEvent::BreakpointsUpdated(path, reason) => {
-                    if let Some(local) = (!this.ignore_breakpoints)
-                        .then(|| this.as_running_mut())
-                        .flatten()
-                    {
-                        local
-                            .send_breakpoints_from_path(path.clone(), *reason, &store, cx)
-                            .detach();
-                    };
-                }
-                BreakpointStoreEvent::BreakpointsCleared(paths) => {
-                    if let Some(local) = (!this.ignore_breakpoints)
-                        .then(|| this.as_running_mut())
-                        .flatten()
-                    {
-                        local.unset_breakpoints_from_paths(paths, cx).detach();
-                    }
-                }
-                BreakpointStoreEvent::SetDebugLine | BreakpointStoreEvent::ClearDebugLines => {}
-            })
-            .detach();
-
-            Self {
-                state: SessionState::Booting(None),
-                snapshots: VecDeque::with_capacity(DEBUG_HISTORY_LIMIT),
-                selected_snapshot_index: None,
-                active_snapshot: Default::default(),
-                id: session_id,
-                child_session_ids: HashSet::default(),
-                parent_session,
-                capabilities: Capabilities::default(),
-                watchers: HashMap::default(),
-                output_token: OutputToken(0),
-                output: circular_buffer::CircularBuffer::boxed(),
-                requests: HashMap::default(),
-                background_tasks: Vec::default(),
-                restart_task: None,
-                is_session_terminated: false,
-                ignore_breakpoints: false,
-                breakpoint_store,
-                data_breakpoints: Default::default(),
-                exception_breakpoints: Default::default(),
-                label,
-                adapter,
-                task_context,
-                memory: memory::Memory::new(),
-                quirks,
-                remote_client,
-                node_runtime,
-                http_client,
-                companion_port: None,
-            }
-        })
-    }
-
-    pub fn task_context(&self) -> &TaskContext {
-        &self.task_context
-    }
-
-    pub fn worktree(&self) -> Option<Entity<Worktree>> {
-        match &self.state {
-            SessionState::Booting(_) => None,
-            SessionState::Running(local_mode) => local_mode.worktree.upgrade(),
-        }
-    }
-
-    pub fn boot(
-        &mut self,
-        binary: DebugAdapterBinary,
-        worktree: Entity<Worktree>,
-        dap_store: WeakEntity<DapStore>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let (message_tx, mut message_rx) = futures::channel::mpsc::unbounded();
-        let (initialized_tx, initialized_rx) = futures::channel::oneshot::channel();
-
-        let background_tasks = vec![cx.spawn(async move |this: WeakEntity<Session>, cx| {
-            let mut initialized_tx = Some(initialized_tx);
-            while let Some(message) = message_rx.next().await {
-                if let Message::Event(event) = message {
-                    if let Events::Initialized(_) = *event {
-                        if let Some(tx) = initialized_tx.take() {
-                            tx.send(()).ok();
-                        }
-                    } else {
-                        let Ok(_) = this.update(cx, |session, cx| {
-                            session.handle_dap_event(event, cx);
-                        }) else {
-                            break;
-                        };
-                    }
-                } else if let Message::Request(request) = message {
-                    let Ok(_) = this.update(cx, |this, cx| {
-                        if request.command == StartDebugging::COMMAND {
-                            this.handle_start_debugging_request(request, cx)
-                                .detach_and_log_err(cx);
-                        } else if request.command == RunInTerminal::COMMAND {
-                            this.handle_run_in_terminal_request(request, cx)
-                                .detach_and_log_err(cx);
-                        }
-                    }) else {
-                        break;
-                    };
-                }
-            }
-        })];
-        self.background_tasks = background_tasks;
-        let id = self.id;
-        let parent_session = self.parent_session.clone();
-
-        cx.spawn(async move |this, cx| {
-            let mode = RunningMode::new(
-                id,
-                parent_session,
-                worktree.downgrade(),
-                binary.clone(),
-                message_tx,
-                cx,
-            )
-            .await?;
-            this.update(cx, |this, cx| {
-                match &mut this.state {
-                    SessionState::Booting(task) if task.is_some() => {
-                        task.take().unwrap().detach_and_log_err(cx);
-                    }
-                    SessionState::Booting(_) => {}
-                    SessionState::Running(_) => {
-                        debug_panic!("Attempting to boot a session that is already running");
-                    }
-                };
-                this.state = SessionState::Running(mode);
-                cx.emit(SessionStateEvent::Running);
-            })?;
-
-            this.update(cx, |session, cx| session.request_initialize(cx))?
-                .await?;
-
-            let result = this
-                .update(cx, |session, cx| {
-                    session.initialize_sequence(initialized_rx, dap_store.clone(), cx)
-                })?
-                .await;
-
-            if result.is_err() {
-                let mut console = this.update(cx, |session, cx| session.console_output(cx))?;
-
-                console
-                    .send(format!(
-                        "Tried to launch debugger with: {}",
-                        serde_json::to_string_pretty(&binary.request_args.configuration)
-                            .unwrap_or_default(),
-                    ))
-                    .await
-                    .ok();
-            }
-
-            result
-        })
-    }
-
-    pub fn session_id(&self) -> SessionId {
-        self.id
-    }
-
-    pub fn child_session_ids(&self) -> HashSet<SessionId> {
-        self.child_session_ids.clone()
-    }
-
-    pub fn add_child_session_id(&mut self, session_id: SessionId) {
-        self.child_session_ids.insert(session_id);
-    }
-
-    pub fn remove_child_session_id(&mut self, session_id: SessionId) {
-        self.child_session_ids.remove(&session_id);
-    }
-
-    pub fn parent_id(&self, cx: &App) -> Option<SessionId> {
-        self.parent_session
-            .as_ref()
-            .map(|session| session.read(cx).id)
-    }
-
-    pub fn parent_session(&self) -> Option<&Entity<Self>> {
-        self.parent_session.as_ref()
-    }
-
-    pub fn on_app_quit(&mut self, cx: &mut Context<Self>) -> Task<()> {
-        let Some(client) = self.adapter_client() else {
-            return Task::ready(());
-        };
-
-        let supports_terminate = self
-            .capabilities
-            .support_terminate_debuggee
-            .unwrap_or(false);
-
-        cx.background_spawn(async move {
-            if supports_terminate {
-                client
-                    .request::<dap::requests::Terminate>(dap::TerminateArguments {
-                        restart: Some(false),
-                    })
-                    .await
-                    .ok();
-            } else {
-                client
-                    .request::<dap::requests::Disconnect>(dap::DisconnectArguments {
-                        restart: Some(false),
-                        terminate_debuggee: Some(true),
-                        suspend_debuggee: Some(false),
-                    })
-                    .await
-                    .ok();
-            }
-        })
-    }
-
-    pub fn capabilities(&self) -> &Capabilities {
-        &self.capabilities
-    }
-
-    pub fn binary(&self) -> Option<&DebugAdapterBinary> {
-        match &self.state {
-            SessionState::Booting(_) => None,
-            SessionState::Running(running_mode) => Some(&running_mode.binary),
-        }
-    }
-
-    pub fn adapter(&self) -> DebugAdapterName {
-        self.adapter.clone()
-    }
-
-    pub fn label(&self) -> Option<SharedString> {
-        self.label.clone()
-    }
-
-    pub fn is_terminated(&self) -> bool {
-        self.is_session_terminated
-    }
-
-    pub fn console_output(&mut self, cx: &mut Context<Self>) -> mpsc::UnboundedSender<String> {
-        let (tx, mut rx) = mpsc::unbounded();
-
-        cx.spawn(async move |this, cx| {
-            while let Some(output) = rx.next().await {
-                this.update(cx, |this, _| {
-                    let event = dap::OutputEvent {
-                        category: None,
-                        output,
-                        group: None,
-                        variables_reference: None,
-                        source: None,
-                        line: None,
-                        column: None,
-                        data: None,
-                        location_reference: None,
-                    };
-                    this.push_output(event);
-                })?;
-            }
-            anyhow::Ok(())
-        })
-        .detach();
-
-        tx
-    }
-
-    pub fn is_started(&self) -> bool {
-        match &self.state {
-            SessionState::Booting(_) => false,
-            SessionState::Running(running) => running.is_started,
-        }
-    }
-
-    pub fn is_building(&self) -> bool {
-        matches!(self.state, SessionState::Booting(_))
-    }
-
-    pub fn as_running_mut(&mut self) -> Option<&mut RunningMode> {
-        match &mut self.state {
-            SessionState::Running(local_mode) => Some(local_mode),
-            SessionState::Booting(_) => None,
-        }
-    }
-
-    pub fn as_running(&self) -> Option<&RunningMode> {
-        match &self.state {
-            SessionState::Running(local_mode) => Some(local_mode),
-            SessionState::Booting(_) => None,
-        }
-    }
-
-    fn handle_start_debugging_request(
-        &mut self,
-        request: dap::messages::Request,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let request_seq = request.seq;
-
-        let launch_request: Option<Result<StartDebuggingRequestArguments, _>> = request
-            .arguments
-            .as_ref()
-            .map(|value| serde_json::from_value(value.clone()));
-
-        let mut success = true;
-        if let Some(Ok(request)) = launch_request {
-            cx.emit(SessionStateEvent::SpawnChildSession { request });
-        } else {
-            log::error!(
-                "Failed to parse launch request arguments: {:?}",
-                request.arguments
-            );
-            success = false;
-        }
-
-        cx.spawn(async move |this, cx| {
-            this.update(cx, |this, cx| {
-                this.respond_to_client(
-                    request_seq,
-                    success,
-                    StartDebugging::COMMAND.to_string(),
-                    None,
-                    cx,
-                )
-            })?
-            .await
-        })
-    }
-
-    fn handle_run_in_terminal_request(
-        &mut self,
-        request: dap::messages::Request,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let request_args = match serde_json::from_value::<RunInTerminalRequestArguments>(
-            request.arguments.unwrap_or_default(),
-        ) {
-            Ok(args) => args,
-            Err(error) => {
-                return cx.spawn(async move |session, cx| {
-                    let error = serde_json::to_value(dap::ErrorResponse {
-                        error: Some(dap::Message {
-                            id: request.seq,
-                            format: error.to_string(),
-                            variables: None,
-                            send_telemetry: None,
-                            show_user: None,
-                            url: None,
-                            url_label: None,
-                        }),
-                    })
-                    .ok();
-
-                    session
-                        .update(cx, |this, cx| {
-                            this.respond_to_client(
-                                request.seq,
-                                false,
-                                StartDebugging::COMMAND.to_string(),
-                                error,
-                                cx,
-                            )
-                        })?
-                        .await?;
-
-                    Err(anyhow!("Failed to parse RunInTerminalRequestArguments"))
-                });
-            }
-        };
-
-        let seq = request.seq;
-
-        let (tx, mut rx) = mpsc::channel::<Result<u32>>(1);
-        cx.emit(SessionEvent::RunInTerminal {
-            request: request_args,
-            sender: tx,
-        });
-        cx.notify();
-
-        cx.spawn(async move |session, cx| {
-            let result = util::maybe!(async move {
-                rx.next().await.ok_or_else(|| {
-                    anyhow!("failed to receive response from spawn terminal".to_string())
-                })?
-            })
-            .await;
-            let (success, body) = match result {
-                Ok(pid) => (
-                    true,
-                    serde_json::to_value(dap::RunInTerminalResponse {
-                        process_id: None,
-                        shell_process_id: Some(pid as u64),
-                    })
-                    .ok(),
-                ),
-                Err(error) => (
-                    false,
-                    serde_json::to_value(dap::ErrorResponse {
-                        error: Some(dap::Message {
-                            id: seq,
-                            format: error.to_string(),
-                            variables: None,
-                            send_telemetry: None,
-                            show_user: None,
-                            url: None,
-                            url_label: None,
-                        }),
-                    })
-                    .ok(),
-                ),
-            };
-
-            session
-                .update(cx, |session, cx| {
-                    session.respond_to_client(
-                        seq,
-                        success,
-                        RunInTerminal::COMMAND.to_string(),
-                        body,
-                        cx,
-                    )
-                })?
-                .await
-        })
-    }
-
-    pub(super) fn request_initialize(&mut self, cx: &mut Context<Self>) -> Task<Result<()>> {
-        let adapter_id = self.adapter().to_string();
-        let request = Initialize { adapter_id };
-
-        let SessionState::Running(running) = &self.state else {
-            return Task::ready(Err(anyhow!(
-                "Cannot send initialize request, task still building"
-            )));
-        };
-        let mut response = running.request(request.clone());
-
-        cx.spawn(async move |this, cx| {
-            loop {
-                let capabilities = response.await;
-                match capabilities {
-                    Err(e) => {
-                        let Ok(Some(reconnect)) = this.update(cx, |this, cx| {
-                            this.as_running()
-                                .and_then(|running| running.reconnect_for_ssh(&mut cx.to_async()))
-                        }) else {
-                            return Err(e);
-                        };
-                        log::info!("Failed to connect to debug adapter: {}, retrying...", e);
-                        reconnect.await?;
-
-                        let Ok(Some(r)) = this.update(cx, |this, _| {
-                            this.as_running()
-                                .map(|running| running.request(request.clone()))
-                        }) else {
-                            return Err(e);
-                        };
-                        response = r
-                    }
-                    Ok(capabilities) => {
-                        this.update(cx, |session, cx| {
-                            session.capabilities = capabilities;
-
-                            cx.emit(SessionEvent::CapabilitiesLoaded);
-                        })?;
-                        return Ok(());
-                    }
-                }
-            }
-        })
-    }
-
-    pub(super) fn initialize_sequence(
-        &mut self,
-        initialize_rx: oneshot::Receiver<()>,
-        dap_store: WeakEntity<DapStore>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        match &self.state {
-            SessionState::Running(local_mode) => {
-                local_mode.initialize_sequence(&self.capabilities, initialize_rx, dap_store, cx)
-            }
-            SessionState::Booting(_) => {
-                Task::ready(Err(anyhow!("cannot initialize, still building")))
-            }
-        }
-    }
-
-    pub fn run_to_position(
-        &mut self,
-        breakpoint: SourceBreakpoint,
-        active_thread_id: ThreadId,
-        cx: &mut Context<Self>,
-    ) {
-        match &mut self.state {
-            SessionState::Running(local_mode) => {
-                if !matches!(
-                    self.active_snapshot
-                        .thread_states
-                        .thread_state(active_thread_id),
-                    Some(ThreadStatus::Stopped)
-                ) {
-                    return;
-                };
-                let path = breakpoint.path.clone();
-                local_mode.tmp_breakpoint = Some(breakpoint);
-                let task = local_mode.send_breakpoints_from_path(
-                    path,
-                    BreakpointUpdatedReason::Toggled,
-                    &self.breakpoint_store,
-                    cx,
-                );
-
-                cx.spawn(async move |this, cx| {
-                    task.await;
-                    this.update(cx, |this, cx| {
-                        this.continue_thread(active_thread_id, cx);
-                    })
-                })
-                .detach();
-            }
-            SessionState::Booting(_) => {}
-        }
-    }
-
-    pub fn has_new_output(&self, last_update: OutputToken) -> bool {
-        self.output_token.0.checked_sub(last_update.0).unwrap_or(0) != 0
-    }
-
-    pub fn output(
-        &self,
-        since: OutputToken,
-    ) -> (impl Iterator<Item = &dap::OutputEvent>, OutputToken) {
-        if self.output_token.0 == 0 {
-            return (self.output.range(0..0), OutputToken(0));
-        };
-
-        let events_since = self.output_token.0.checked_sub(since.0).unwrap_or(0);
-
-        let clamped_events_since = events_since.clamp(0, self.output.len());
-        (
-            self.output
-                .range(self.output.len() - clamped_events_since..),
-            self.output_token,
-        )
-    }
-
-    pub fn respond_to_client(
-        &self,
-        request_seq: u64,
-        success: bool,
-        command: String,
-        body: Option<serde_json::Value>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let Some(local_session) = self.as_running() else {
-            unreachable!("Cannot respond to remote client");
-        };
-        let client = local_session.client.clone();
-
-        cx.background_spawn(async move {
-            client
-                .send_message(Message::Response(Response {
-                    body,
-                    success,
-                    command,
-                    seq: request_seq + 1,
-                    request_seq,
-                    message: None,
-                }))
-                .await
-        })
-    }
-
-    fn session_state(&self) -> &SessionSnapshot {
-        self.selected_snapshot_index
-            .and_then(|ix| self.snapshots.get(ix))
-            .unwrap_or_else(|| &self.active_snapshot)
-    }
-
-    fn push_to_history(&mut self) {
-        if !self.has_ever_stopped() {
-            return;
-        }
-
-        while self.snapshots.len() >= DEBUG_HISTORY_LIMIT {
-            self.snapshots.pop_front();
-        }
-
-        self.snapshots
-            .push_back(std::mem::take(&mut self.active_snapshot));
-    }
-
-    pub fn historic_snapshots(&self) -> &VecDeque<SessionSnapshot> {
-        &self.snapshots
-    }
-
-    pub fn select_historic_snapshot(&mut self, ix: Option<usize>, cx: &mut Context<Session>) {
-        if self.selected_snapshot_index == ix {
-            return;
-        }
-
-        if self
-            .selected_snapshot_index
-            .is_some_and(|ix| self.snapshots.len() <= ix)
-        {
-            debug_panic!("Attempted to select a debug session with an out of bounds index");
-            return;
-        }
-
-        self.selected_snapshot_index = ix;
-        cx.emit(SessionEvent::HistoricSnapshotSelected);
-        cx.notify();
-    }
-
-    pub fn active_snapshot_index(&self) -> Option<usize> {
-        self.selected_snapshot_index
-    }
-
-    fn handle_stopped_event(&mut self, event: StoppedEvent, cx: &mut Context<Self>) {
-        self.push_to_history();
-
-        self.state.stopped();
-        // todo(debugger): Find a clean way to get around the clone
-        let breakpoint_store = self.breakpoint_store.clone();
-        if let Some((local, path)) = self.as_running_mut().and_then(|local| {
-            let breakpoint = local.tmp_breakpoint.take()?;
-            let path = breakpoint.path;
-            Some((local, path))
-        }) {
-            local
-                .send_breakpoints_from_path(
-                    path,
-                    BreakpointUpdatedReason::Toggled,
-                    &breakpoint_store,
-                    cx,
-                )
-                .detach();
-        };
-
-        if event.all_threads_stopped.unwrap_or_default() || event.thread_id.is_none() {
-            self.active_snapshot.thread_states.stop_all_threads();
-            self.invalidate_command_type::<StackTraceCommand>();
-        }
-
-        // Event if we stopped all threads we still need to insert the thread_id
-        // to our own data
-        if let Some(thread_id) = event.thread_id {
-            self.active_snapshot
-                .thread_states
-                .stop_thread(ThreadId(thread_id));
-
-            self.invalidate_state(
-                &StackTraceCommand {
-                    thread_id,
-                    start_frame: None,
-                    levels: None,
-                }
-                .into(),
-            );
-        }
-
-        self.invalidate_generic();
-        self.active_snapshot.threads.clear();
-        self.active_snapshot.variables.clear();
-        cx.emit(SessionEvent::Stopped(
-            event
-                .thread_id
-                .map(Into::into)
-                .filter(|_| !event.preserve_focus_hint.unwrap_or(false)),
-        ));
-        cx.emit(SessionEvent::InvalidateInlineValue);
-        cx.notify();
-    }
-
-    pub(crate) fn handle_dap_event(&mut self, event: Box<Events>, cx: &mut Context<Self>) {
-        match *event {
-            Events::Initialized(_) => {
-                debug_assert!(
-                    false,
-                    "Initialized event should have been handled in LocalMode"
-                );
-            }
-            Events::Stopped(event) => self.handle_stopped_event(event, cx),
-            Events::Continued(event) => {
-                if event.all_threads_continued.unwrap_or_default() {
-                    self.active_snapshot.thread_states.continue_all_threads();
-                    self.breakpoint_store.update(cx, |store, cx| {
-                        store.remove_active_position(Some(self.session_id()), cx)
-                    });
-                } else {
-                    self.active_snapshot
-                        .thread_states
-                        .continue_thread(ThreadId(event.thread_id));
-                }
-                // todo(debugger): We should be able to get away with only invalidating generic if all threads were continued
-                self.invalidate_generic();
-            }
-            Events::Exited(_event) => {
-                self.clear_active_debug_line(cx);
-            }
-            Events::Terminated(_) => {
-                self.shutdown(cx).detach();
-            }
-            Events::Thread(event) => {
-                let thread_id = ThreadId(event.thread_id);
-
-                match event.reason {
-                    dap::ThreadEventReason::Started => {
-                        self.active_snapshot
-                            .thread_states
-                            .continue_thread(thread_id);
-                    }
-                    dap::ThreadEventReason::Exited => {
-                        self.active_snapshot.thread_states.exit_thread(thread_id);
-                    }
-                    reason => {
-                        log::error!("Unhandled thread event reason {:?}", reason);
-                    }
-                }
-                self.invalidate_state(&ThreadsCommand.into());
-                cx.notify();
-            }
-            Events::Output(event) => {
-                if event
-                    .category
-                    .as_ref()
-                    .is_some_and(|category| *category == OutputEventCategory::Telemetry)
-                {
-                    return;
-                }
-
-                self.push_output(event);
-                cx.notify();
-            }
-            Events::Breakpoint(event) => self.breakpoint_store.update(cx, |store, _| {
-                store.update_session_breakpoint(self.session_id(), event.reason, event.breakpoint);
-            }),
-            Events::Module(event) => {
-                match event.reason {
-                    dap::ModuleEventReason::New => {
-                        self.active_snapshot.modules.push(event.module);
-                    }
-                    dap::ModuleEventReason::Changed => {
-                        if let Some(module) = self
-                            .active_snapshot
-                            .modules
-                            .iter_mut()
-                            .find(|other| event.module.id == other.id)
-                        {
-                            *module = event.module;
-                        }
-                    }
-                    dap::ModuleEventReason::Removed => {
-                        self.active_snapshot
-                            .modules
-                            .retain(|other| event.module.id != other.id);
-                    }
-                }
-
-                // todo(debugger): We should only send the invalidate command to downstream clients.
-                // self.invalidate_state(&ModulesCommand.into());
-            }
-            Events::LoadedSource(_) => {
-                self.invalidate_state(&LoadedSourcesCommand.into());
-            }
-            Events::Capabilities(event) => {
-                self.capabilities = self.capabilities.merge(event.capabilities);
-
-                // The adapter might've enabled new exception breakpoints (or disabled existing ones).
-                let recent_filters = self
-                    .capabilities
-                    .exception_breakpoint_filters
-                    .iter()
-                    .flatten()
-                    .map(|filter| (filter.filter.clone(), filter.clone()))
-                    .collect::<BTreeMap<_, _>>();
-                for filter in recent_filters.values() {
-                    let default = filter.default.unwrap_or_default();
-                    self.exception_breakpoints
-                        .entry(filter.filter.clone())
-                        .or_insert_with(|| (filter.clone(), default));
-                }
-                self.exception_breakpoints
-                    .retain(|k, _| recent_filters.contains_key(k));
-                if self.is_started() {
-                    self.send_exception_breakpoints(cx);
-                }
-
-                // Remove the ones that no longer exist.
-                cx.notify();
-            }
-            Events::Memory(_) => {}
-            Events::Process(_) => {}
-            Events::ProgressEnd(_) => {}
-            Events::ProgressStart(_) => {}
-            Events::ProgressUpdate(_) => {}
-            Events::Invalidated(_) => {}
-            Events::Other(event) => {
-                if event.event == "launchBrowserInCompanion" {
-                    let Some(request) = serde_json::from_value(event.body).ok() else {
-                        log::error!("failed to deserialize launchBrowserInCompanion event");
-                        return;
-                    };
-                    self.launch_browser_for_remote_server(request, cx);
-                } else if event.event == "killCompanionBrowser" {
-                    let Some(request) = serde_json::from_value(event.body).ok() else {
-                        log::error!("failed to deserialize killCompanionBrowser event");
-                        return;
-                    };
-                    self.kill_browser(request, cx);
-                }
-            }
-        }
-    }
-
-    /// Ensure that there's a request in flight for the given command, and if not, send it. Use this to run requests that are idempotent.
-    fn fetch<T: LocalDapCommand + PartialEq + Eq + Hash>(
-        &mut self,
-        request: T,
-        process_result: impl FnOnce(&mut Self, Result<T::Response>, &mut Context<Self>) + 'static,
-        cx: &mut Context<Self>,
-    ) {
-        const {
-            assert!(
-                T::CACHEABLE,
-                "Only requests marked as cacheable should invoke `fetch`"
-            );
-        }
-
-        if (!self.active_snapshot.thread_states.any_stopped_thread()
-            && request.type_id() != TypeId::of::<ThreadsCommand>())
-            || self.selected_snapshot_index.is_some()
-            || self.is_session_terminated
-        {
-            return;
-        }
-
-        let request_map = self
-            .requests
-            .entry(std::any::TypeId::of::<T>())
-            .or_default();
-
-        if let Entry::Vacant(vacant) = request_map.entry(request.into()) {
-            let command = vacant.key().0.clone().as_any_arc().downcast::<T>().unwrap();
-
-            let task = Self::request_inner::<Arc<T>>(
-                &self.capabilities,
-                &self.state,
-                command,
-                |this, result, cx| {
-                    process_result(this, result, cx);
-                    None
-                },
-                cx,
-            );
-            let task = cx
-                .background_executor()
-                .spawn(async move {
-                    let _ = task.await?;
-                    Some(())
-                })
-                .shared();
-
-            vacant.insert(task);
-            cx.notify();
-        }
-    }
-
-    fn request_inner<T: LocalDapCommand + PartialEq + Eq + Hash>(
-        capabilities: &Capabilities,
-        mode: &SessionState,
-        request: T,
-        process_result: impl FnOnce(
-            &mut Self,
-            Result<T::Response>,
-            &mut Context<Self>,
-        ) -> Option<T::Response>
-        + 'static,
-        cx: &mut Context<Self>,
-    ) -> Task<Option<T::Response>> {
-        if !T::is_supported(capabilities) {
-            log::warn!(
-                "Attempted to send a DAP request that isn't supported: {:?}",
-                request
-            );
-            let error = Err(anyhow::Error::msg(
-                "Couldn't complete request because it's not supported",
-            ));
-            return cx.spawn(async move |this, cx| {
-                this.update(cx, |this, cx| process_result(this, error, cx))
-                    .ok()
-                    .flatten()
-            });
-        }
-
-        let request = mode.request_dap(request);
-        cx.spawn(async move |this, cx| {
-            let result = request.await;
-            this.update(cx, |this, cx| process_result(this, result, cx))
-                .ok()
-                .flatten()
-        })
-    }
-
-    fn request<T: LocalDapCommand + PartialEq + Eq + Hash>(
-        &self,
-        request: T,
-        process_result: impl FnOnce(
-            &mut Self,
-            Result<T::Response>,
-            &mut Context<Self>,
-        ) -> Option<T::Response>
-        + 'static,
-        cx: &mut Context<Self>,
-    ) -> Task<Option<T::Response>> {
-        Self::request_inner(&self.capabilities, &self.state, request, process_result, cx)
-    }
-
-    fn invalidate_command_type<Command: LocalDapCommand>(&mut self) {
-        self.requests.remove(&std::any::TypeId::of::<Command>());
-    }
-
-    fn invalidate_generic(&mut self) {
-        self.invalidate_command_type::<ModulesCommand>();
-        self.invalidate_command_type::<LoadedSourcesCommand>();
-        self.invalidate_command_type::<ThreadsCommand>();
-        self.invalidate_command_type::<DataBreakpointInfoCommand>();
-        self.invalidate_command_type::<ReadMemory>();
-        let executor = self.as_running().map(|running| running.executor.clone());
-        if let Some(executor) = executor {
-            self.memory.clear(&executor);
-        }
-    }
-
-    fn invalidate_state(&mut self, key: &RequestSlot) {
-        self.requests
-            .entry((&*key.0 as &dyn Any).type_id())
-            .and_modify(|request_map| {
-                request_map.remove(key);
-            });
-    }
-
-    fn push_output(&mut self, event: OutputEvent) {
-        self.output.push_back(event);
-        self.output_token.0 += 1;
-    }
-
-    pub fn any_stopped_thread(&self) -> bool {
-        self.active_snapshot.thread_states.any_stopped_thread()
-    }
-
-    pub fn thread_status(&self, thread_id: ThreadId) -> ThreadStatus {
-        self.active_snapshot.thread_states.thread_status(thread_id)
-    }
-
-    pub fn threads(&mut self, cx: &mut Context<Self>) -> Vec<(dap::Thread, ThreadStatus)> {
-        self.fetch(
-            dap_command::ThreadsCommand,
-            |this, result, cx| {
-                let Some(result) = result.log_err() else {
-                    return;
-                };
-
-                this.active_snapshot.threads = result
-                    .into_iter()
-                    .map(|thread| (ThreadId(thread.id), Thread::from(thread)))
-                    .collect();
-
-                this.invalidate_command_type::<StackTraceCommand>();
-                cx.emit(SessionEvent::Threads);
-                cx.notify();
-            },
-            cx,
-        );
-
-        let state = self.session_state();
-        state
-            .threads
-            .values()
-            .map(|thread| {
-                (
-                    thread.dap.clone(),
-                    state.thread_states.thread_status(ThreadId(thread.dap.id)),
-                )
-            })
-            .collect()
-    }
-
-    pub fn modules(&mut self, cx: &mut Context<Self>) -> &[Module] {
-        self.fetch(
-            dap_command::ModulesCommand,
-            |this, result, cx| {
-                let Some(result) = result.log_err() else {
-                    return;
-                };
-
-                this.active_snapshot.modules = result;
-                cx.emit(SessionEvent::Modules);
-                cx.notify();
-            },
-            cx,
-        );
-
-        &self.session_state().modules
-    }
-
-    // CodeLLDB returns the size of a pointed-to-memory, which we can use to make the experience of go-to-memory better.
-    pub fn data_access_size(
-        &mut self,
-        frame_id: Option<u64>,
-        evaluate_name: &str,
-        cx: &mut Context<Self>,
-    ) -> Task<Option<u64>> {
-        let request = self.request(
-            EvaluateCommand {
-                expression: format!("?${{sizeof({evaluate_name})}}"),
-                frame_id,
-
-                context: Some(EvaluateArgumentsContext::Repl),
-                source: None,
-            },
-            |_, response, _| response.ok(),
-            cx,
-        );
-        cx.background_spawn(async move {
-            let result = request.await?;
-            result.result.parse().ok()
-        })
-    }
-
-    pub fn memory_reference_of_expr(
-        &mut self,
-        frame_id: Option<u64>,
-        expression: String,
-        cx: &mut Context<Self>,
-    ) -> Task<Option<(String, Option<String>)>> {
-        let request = self.request(
-            EvaluateCommand {
-                expression,
-                frame_id,
-
-                context: Some(EvaluateArgumentsContext::Repl),
-                source: None,
-            },
-            |_, response, _| response.ok(),
-            cx,
-        );
-        cx.background_spawn(async move {
-            let result = request.await?;
-            result
-                .memory_reference
-                .map(|reference| (reference, result.type_))
-        })
-    }
-
-    pub fn write_memory(&mut self, address: u64, data: &[u8], cx: &mut Context<Self>) {
-        let data = base64::engine::general_purpose::STANDARD.encode(data);
-        self.request(
-            WriteMemoryArguments {
-                memory_reference: address.to_string(),
-                data,
-                allow_partial: None,
-                offset: None,
-            },
-            |this, response, cx| {
-                this.memory.clear(cx.background_executor());
-                this.invalidate_command_type::<ReadMemory>();
-                this.invalidate_command_type::<VariablesCommand>();
-                cx.emit(SessionEvent::Variables);
-                response.ok()
-            },
-            cx,
-        )
-        .detach();
-    }
-    pub fn read_memory(
-        &mut self,
-        range: RangeInclusive<u64>,
-        cx: &mut Context<Self>,
-    ) -> MemoryIterator {
-        // This function is a bit more involved when it comes to fetching data.
-        // Since we attempt to read memory in pages, we need to account for some parts
-        // of memory being unreadable. Therefore, we start off by fetching a page per request.
-        // In case that fails, we try to re-fetch smaller regions until we have the full range.
-        let page_range = Memory::memory_range_to_page_range(range.clone());
-        for page_address in PageAddress::iter_range(page_range) {
-            self.read_single_page_memory(page_address, cx);
-        }
-        self.memory.memory_range(range)
-    }
-
-    fn read_single_page_memory(&mut self, page_start: PageAddress, cx: &mut Context<Self>) {
-        _ = maybe!({
-            let builder = self.memory.build_page(page_start)?;
-
-            self.memory_read_fetch_page_recursive(builder, cx);
-            Some(())
-        });
-    }
-    fn memory_read_fetch_page_recursive(
-        &mut self,
-        mut builder: MemoryPageBuilder,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(next_request) = builder.next_request() else {
-            // We're done fetching. Let's grab the page and insert it into our memory store.
-            let (address, contents) = builder.build();
-            self.memory.insert_page(address, contents);
-
-            return;
-        };
-        let size = next_request.size;
-        self.fetch(
-            ReadMemory {
-                memory_reference: format!("0x{:X}", next_request.address),
-                offset: Some(0),
-                count: next_request.size,
-            },
-            move |this, memory, cx| {
-                if let Ok(memory) = memory {
-                    builder.known(memory.content);
-                    if let Some(unknown) = memory.unreadable_bytes {
-                        builder.unknown(unknown);
-                    }
-                    // This is the recursive bit: if we're not yet done with
-                    // the whole page, we'll kick off a new request with smaller range.
-                    // Note that this function is recursive only conceptually;
-                    // since it kicks off a new request with callback, we don't need to worry about stack overflow.
-                    this.memory_read_fetch_page_recursive(builder, cx);
-                } else {
-                    builder.unknown(size);
-                }
-            },
-            cx,
-        );
-    }
-
-    pub fn ignore_breakpoints(&self) -> bool {
-        self.ignore_breakpoints
-    }
-
-    pub fn toggle_ignore_breakpoints(
-        &mut self,
-        cx: &mut App,
-    ) -> Task<HashMap<Arc<Path>, anyhow::Error>> {
-        self.set_ignore_breakpoints(!self.ignore_breakpoints, cx)
-    }
-
-    pub(crate) fn set_ignore_breakpoints(
-        &mut self,
-        ignore: bool,
-        cx: &mut App,
-    ) -> Task<HashMap<Arc<Path>, anyhow::Error>> {
-        if self.ignore_breakpoints == ignore {
-            return Task::ready(HashMap::default());
-        }
-
-        self.ignore_breakpoints = ignore;
-
-        if let Some(local) = self.as_running() {
-            local.send_source_breakpoints(ignore, &self.breakpoint_store, cx)
-        } else {
-            // todo(debugger): We need to propagate this change to downstream sessions and send a message to upstream sessions
-            unimplemented!()
-        }
-    }
-
-    pub fn data_breakpoints(&self) -> impl Iterator<Item = &DataBreakpointState> {
-        self.data_breakpoints.values()
-    }
-
-    pub fn exception_breakpoints(
-        &self,
-    ) -> impl Iterator<Item = &(ExceptionBreakpointsFilter, IsEnabled)> {
-        self.exception_breakpoints.values()
-    }
-
-    pub fn toggle_exception_breakpoint(&mut self, id: &str, cx: &App) {
-        if let Some((_, is_enabled)) = self.exception_breakpoints.get_mut(id) {
-            *is_enabled = !*is_enabled;
-            self.send_exception_breakpoints(cx);
-        }
-    }
-
-    fn send_exception_breakpoints(&mut self, cx: &App) {
-        if let Some(local) = self.as_running() {
-            let exception_filters = self
-                .exception_breakpoints
-                .values()
-                .filter_map(|(filter, is_enabled)| is_enabled.then(|| filter.clone()))
-                .collect();
-
-            let supports_exception_filters = self
-                .capabilities
-                .supports_exception_filter_options
-                .unwrap_or_default();
-            local
-                .send_exception_breakpoints(exception_filters, supports_exception_filters)
-                .detach_and_log_err(cx);
-        } else {
-            debug_assert!(false, "Not implemented");
-        }
-    }
-
-    pub fn toggle_data_breakpoint(&mut self, id: &str, cx: &mut Context<'_, Session>) {
-        if let Some(state) = self.data_breakpoints.get_mut(id) {
-            state.is_enabled = !state.is_enabled;
-            self.send_exception_breakpoints(cx);
-        }
-    }
-
-    fn send_data_breakpoints(&mut self, cx: &mut Context<Self>) {
-        if let Some(mode) = self.as_running() {
-            let breakpoints = self
-                .data_breakpoints
-                .values()
-                .filter_map(|state| state.is_enabled.then(|| state.dap.clone()))
-                .collect();
-            let command = SetDataBreakpointsCommand { breakpoints };
-            mode.request(command).detach_and_log_err(cx);
-        }
-    }
-
-    pub fn create_data_breakpoint(
-        &mut self,
-        context: Arc<DataBreakpointContext>,
-        data_id: String,
-        dap: dap::DataBreakpoint,
-        cx: &mut Context<Self>,
-    ) {
-        if self.data_breakpoints.remove(&data_id).is_none() {
-            self.data_breakpoints.insert(
-                data_id,
-                DataBreakpointState {
-                    dap,
-                    is_enabled: true,
-                    context,
-                },
-            );
-        }
-        self.send_data_breakpoints(cx);
-    }
-
-    pub fn breakpoints_enabled(&self) -> bool {
-        self.ignore_breakpoints
-    }
-
-    pub fn loaded_sources(&mut self, cx: &mut Context<Self>) -> &[Source] {
-        self.fetch(
-            dap_command::LoadedSourcesCommand,
-            |this, result, cx| {
-                let Some(result) = result.log_err() else {
-                    return;
-                };
-                this.active_snapshot.loaded_sources = result;
-                cx.emit(SessionEvent::LoadedSources);
-                cx.notify();
-            },
-            cx,
-        );
-        &self.session_state().loaded_sources
-    }
-
-    fn fallback_to_manual_restart(
-        &mut self,
-        res: Result<()>,
-        cx: &mut Context<Self>,
-    ) -> Option<()> {
-        if res.log_err().is_none() {
-            cx.emit(SessionStateEvent::Restart);
-            return None;
-        }
-        Some(())
-    }
-
-    fn empty_response(&mut self, res: Result<()>, _cx: &mut Context<Self>) -> Option<()> {
-        res.log_err()?;
-        Some(())
-    }
-
-    fn on_step_response<T: LocalDapCommand + PartialEq + Eq + Hash>(
-        thread_id: ThreadId,
-    ) -> impl FnOnce(&mut Self, Result<T::Response>, &mut Context<Self>) -> Option<T::Response> + 'static
-    {
-        move |this, response, cx| match response.log_err() {
-            Some(response) => {
-                this.breakpoint_store.update(cx, |store, cx| {
-                    store.remove_active_position(Some(this.session_id()), cx)
-                });
-                Some(response)
-            }
-            None => {
-                this.active_snapshot.thread_states.stop_thread(thread_id);
-                cx.notify();
-                None
-            }
-        }
-    }
-
-    fn clear_active_debug_line_response(
-        &mut self,
-        response: Result<()>,
-        cx: &mut Context<Session>,
-    ) -> Option<()> {
-        response.log_err()?;
-        self.clear_active_debug_line(cx);
-        Some(())
-    }
-
-    fn clear_active_debug_line(&mut self, cx: &mut Context<Session>) {
-        self.breakpoint_store.update(cx, |store, cx| {
-            store.remove_active_position(Some(self.id), cx)
-        });
-    }
-
-    pub fn pause_thread(&mut self, thread_id: ThreadId, cx: &mut Context<Self>) {
-        self.request(
-            PauseCommand {
-                thread_id: thread_id.0,
-            },
-            Self::empty_response,
-            cx,
-        )
-        .detach();
-    }
-
-    pub fn restart_stack_frame(&mut self, stack_frame_id: u64, cx: &mut Context<Self>) {
-        self.request(
-            RestartStackFrameCommand { stack_frame_id },
-            Self::empty_response,
-            cx,
-        )
-        .detach();
-    }
-
-    pub fn restart(&mut self, args: Option<Value>, cx: &mut Context<Self>) {
-        if self.restart_task.is_some() || self.as_running().is_none() {
-            return;
-        }
-
-        let supports_dap_restart =
-            self.capabilities.supports_restart_request.unwrap_or(false) && !self.is_terminated();
-
-        self.restart_task = Some(cx.spawn(async move |this, cx| {
-            let _ = this.update(cx, |session, cx| {
-                if supports_dap_restart {
-                    session
-                        .request(
-                            RestartCommand {
-                                raw: args.unwrap_or(Value::Null),
-                            },
-                            Self::fallback_to_manual_restart,
-                            cx,
-                        )
-                        .detach();
-                } else {
-                    cx.emit(SessionStateEvent::Restart);
-                }
-            });
-        }));
-    }
-
-    pub fn shutdown(&mut self, cx: &mut Context<Self>) -> Task<()> {
-        if self.is_session_terminated {
-            return Task::ready(());
-        }
-
-        self.is_session_terminated = true;
-        self.active_snapshot.thread_states.exit_all_threads();
-        cx.notify();
-
-        let task = match &mut self.state {
-            SessionState::Running(_) => {
-                if self
-                    .capabilities
-                    .supports_terminate_request
-                    .unwrap_or_default()
-                {
-                    self.request(
-                        TerminateCommand {
-                            restart: Some(false),
-                        },
-                        Self::clear_active_debug_line_response,
-                        cx,
-                    )
-                } else {
-                    self.request(
-                        DisconnectCommand {
-                            restart: Some(false),
-                            terminate_debuggee: Some(true),
-                            suspend_debuggee: Some(false),
-                        },
-                        Self::clear_active_debug_line_response,
-                        cx,
-                    )
-                }
-            }
-            SessionState::Booting(build_task) => {
-                build_task.take();
-                Task::ready(Some(()))
-            }
-        };
-
-        cx.emit(SessionStateEvent::Shutdown);
-
-        cx.spawn(async move |this, cx| {
-            task.await;
-            let _ = this.update(cx, |this, _| {
-                if let Some(adapter_client) = this.adapter_client() {
-                    adapter_client.kill();
-                }
-            });
-        })
-    }
-
-    pub fn completions(
-        &mut self,
-        query: CompletionsQuery,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Vec<dap::CompletionItem>>> {
-        let task = self.request(query, |_, result, _| result.log_err(), cx);
-
-        cx.background_executor().spawn(async move {
-            anyhow::Ok(
-                task.await
-                    .map(|response| response.targets)
-                    .context("failed to fetch completions")?,
-            )
-        })
-    }
-
-    pub fn continue_thread(&mut self, thread_id: ThreadId, cx: &mut Context<Self>) {
-        self.select_historic_snapshot(None, cx);
-
-        let supports_single_thread_execution_requests =
-            self.capabilities.supports_single_thread_execution_requests;
-        self.active_snapshot
-            .thread_states
-            .continue_thread(thread_id);
-        self.request(
-            ContinueCommand {
-                args: ContinueArguments {
-                    thread_id: thread_id.0,
-                    single_thread: supports_single_thread_execution_requests,
-                },
-            },
-            Self::on_step_response::<ContinueCommand>(thread_id),
-            cx,
-        )
-        .detach();
-    }
-
-    pub fn adapter_client(&self) -> Option<Arc<DebugAdapterClient>> {
-        match self.state {
-            SessionState::Running(ref local) => Some(local.client.clone()),
-            SessionState::Booting(_) => None,
-        }
-    }
-
-    pub fn has_ever_stopped(&self) -> bool {
-        self.state.has_ever_stopped()
-    }
-
-    pub fn step_over(
-        &mut self,
-        thread_id: ThreadId,
-        granularity: SteppingGranularity,
-        cx: &mut Context<Self>,
-    ) {
-        self.select_historic_snapshot(None, cx);
-
-        let supports_single_thread_execution_requests =
-            self.capabilities.supports_single_thread_execution_requests;
-        let supports_stepping_granularity = self
-            .capabilities
-            .supports_stepping_granularity
-            .unwrap_or_default();
-
-        let command = NextCommand {
-            inner: StepCommand {
-                thread_id: thread_id.0,
-                granularity: supports_stepping_granularity.then(|| granularity),
-                single_thread: supports_single_thread_execution_requests,
-            },
-        };
-
-        self.active_snapshot.thread_states.process_step(thread_id);
-        self.request(
-            command,
-            Self::on_step_response::<NextCommand>(thread_id),
-            cx,
-        )
-        .detach();
-    }
-
-    pub fn step_in(
-        &mut self,
-        thread_id: ThreadId,
-        granularity: SteppingGranularity,
-        cx: &mut Context<Self>,
-    ) {
-        self.select_historic_snapshot(None, cx);
-
-        let supports_single_thread_execution_requests =
-            self.capabilities.supports_single_thread_execution_requests;
-        let supports_stepping_granularity = self
-            .capabilities
-            .supports_stepping_granularity
-            .unwrap_or_default();
-
-        let command = StepInCommand {
-            inner: StepCommand {
-                thread_id: thread_id.0,
-                granularity: supports_stepping_granularity.then(|| granularity),
-                single_thread: supports_single_thread_execution_requests,
-            },
-        };
-
-        self.active_snapshot.thread_states.process_step(thread_id);
-        self.request(
-            command,
-            Self::on_step_response::<StepInCommand>(thread_id),
-            cx,
-        )
-        .detach();
-    }
-
-    pub fn step_out(
-        &mut self,
-        thread_id: ThreadId,
-        granularity: SteppingGranularity,
-        cx: &mut Context<Self>,
-    ) {
-        self.select_historic_snapshot(None, cx);
-
-        let supports_single_thread_execution_requests =
-            self.capabilities.supports_single_thread_execution_requests;
-        let supports_stepping_granularity = self
-            .capabilities
-            .supports_stepping_granularity
-            .unwrap_or_default();
-
-        let command = StepOutCommand {
-            inner: StepCommand {
-                thread_id: thread_id.0,
-                granularity: supports_stepping_granularity.then(|| granularity),
-                single_thread: supports_single_thread_execution_requests,
-            },
-        };
-
-        self.active_snapshot.thread_states.process_step(thread_id);
-        self.request(
-            command,
-            Self::on_step_response::<StepOutCommand>(thread_id),
-            cx,
-        )
-        .detach();
-    }
-
-    pub fn step_back(
-        &mut self,
-        thread_id: ThreadId,
-        granularity: SteppingGranularity,
-        cx: &mut Context<Self>,
-    ) {
-        self.select_historic_snapshot(None, cx);
-
-        let supports_single_thread_execution_requests =
-            self.capabilities.supports_single_thread_execution_requests;
-        let supports_stepping_granularity = self
-            .capabilities
-            .supports_stepping_granularity
-            .unwrap_or_default();
-
-        let command = StepBackCommand {
-            inner: StepCommand {
-                thread_id: thread_id.0,
-                granularity: supports_stepping_granularity.then(|| granularity),
-                single_thread: supports_single_thread_execution_requests,
-            },
-        };
-
-        self.active_snapshot.thread_states.process_step(thread_id);
-
-        self.request(
-            command,
-            Self::on_step_response::<StepBackCommand>(thread_id),
-            cx,
-        )
-        .detach();
-    }
-
-    pub fn stack_frames(
-        &mut self,
-        thread_id: ThreadId,
-        cx: &mut Context<Self>,
-    ) -> Result<Vec<StackFrame>> {
-        if self.active_snapshot.thread_states.thread_status(thread_id) == ThreadStatus::Stopped
-            && self.requests.contains_key(&ThreadsCommand.type_id())
-            && self.active_snapshot.threads.contains_key(&thread_id)
-        // ^ todo(debugger): We need a better way to check that we're not querying stale data
-        // We could still be using an old thread id and have sent a new thread's request
-        // This isn't the biggest concern right now because it hasn't caused any issues outside of tests
-        // But it very well could cause a minor bug in the future that is hard to track down
-        {
-            self.fetch(
-                super::dap_command::StackTraceCommand {
-                    thread_id: thread_id.0,
-                    start_frame: None,
-                    levels: None,
-                },
-                move |this, stack_frames, cx| {
-                    let entry =
-                        this.active_snapshot
-                            .threads
-                            .entry(thread_id)
-                            .and_modify(|thread| match &stack_frames {
-                                Ok(stack_frames) => {
-                                    thread.stack_frames = stack_frames
-                                        .iter()
-                                        .cloned()
-                                        .map(StackFrame::from)
-                                        .collect();
-                                    thread.stack_frames_error = None;
-                                }
-                                Err(error) => {
-                                    thread.stack_frames.clear();
-                                    thread.stack_frames_error = Some(error.to_string().into());
-                                }
-                            });
-                    debug_assert!(
-                        matches!(entry, indexmap::map::Entry::Occupied(_)),
-                        "Sent request for thread_id that doesn't exist"
-                    );
-                    if let Ok(stack_frames) = stack_frames {
-                        this.active_snapshot.stack_frames.extend(
-                            stack_frames
-                                .into_iter()
-                                .filter(|frame| {
-                                    // Workaround for JavaScript debug adapter sending out "fake" stack frames for delineating await points. This is fine,
-                                    // except that they always use an id of 0 for it, which collides with other (valid) stack frames.
-                                    !(frame.id == 0
-                                        && frame.line == 0
-                                        && frame.column == 0
-                                        && frame.presentation_hint
-                                            == Some(StackFramePresentationHint::Label))
-                                })
-                                .map(|frame| (frame.id, StackFrame::from(frame))),
-                        );
-                    }
-
-                    this.invalidate_command_type::<ScopesCommand>();
-                    this.invalidate_command_type::<VariablesCommand>();
-
-                    cx.emit(SessionEvent::StackTrace);
-                },
-                cx,
-            );
-        }
-
-        match self.session_state().threads.get(&thread_id) {
-            Some(thread) => {
-                if let Some(error) = &thread.stack_frames_error {
-                    Err(anyhow!(error.to_string()))
-                } else {
-                    Ok(thread.stack_frames.clone())
-                }
-            }
-            None => Ok(Vec::new()),
-        }
-    }
-
-    pub fn scopes(&mut self, stack_frame_id: u64, cx: &mut Context<Self>) -> &[dap::Scope] {
-        if self.requests.contains_key(&TypeId::of::<ThreadsCommand>())
-            && self
-                .requests
-                .contains_key(&TypeId::of::<StackTraceCommand>())
-        {
-            self.fetch(
-                ScopesCommand { stack_frame_id },
-                move |this, scopes, cx| {
-                    let Some(scopes) = scopes.log_err() else {
-                        return
-                    };
-
-                    for scope in scopes.iter() {
-                        this.variables(scope.variables_reference, cx);
-                    }
-
-                    let entry = this
-                        .active_snapshot
-                        .stack_frames
-                        .entry(stack_frame_id)
-                        .and_modify(|stack_frame| {
-                            stack_frame.scopes = scopes;
-                        });
-
-                    cx.emit(SessionEvent::Variables);
-
-                    debug_assert!(
-                        matches!(entry, indexmap::map::Entry::Occupied(_)),
-                        "Sent scopes request for stack_frame_id that doesn't exist or hasn't been fetched"
-                    );
-                },
-                cx,
-            );
-        }
-
-        self.session_state()
-            .stack_frames
-            .get(&stack_frame_id)
-            .map(|frame| frame.scopes.as_slice())
-            .unwrap_or_default()
-    }
-
-    pub fn variables_by_stack_frame_id(
-        &self,
-        stack_frame_id: StackFrameId,
-        globals: bool,
-        locals: bool,
-    ) -> Vec<dap::Variable> {
-        let state = self.session_state();
-        let Some(stack_frame) = state.stack_frames.get(&stack_frame_id) else {
-            return Vec::new();
-        };
-
-        stack_frame
-            .scopes
-            .iter()
-            .filter(|scope| {
-                (scope.name.to_lowercase().contains("local") && locals)
-                    || (scope.name.to_lowercase().contains("global") && globals)
-            })
-            .filter_map(|scope| state.variables.get(&scope.variables_reference))
-            .flatten()
-            .cloned()
-            .collect()
-    }
-
-    pub fn watchers(&self) -> &HashMap<SharedString, Watcher> {
-        &self.watchers
-    }
-
-    pub fn add_watcher(
-        &mut self,
-        expression: SharedString,
-        frame_id: u64,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let request = self.state.request_dap(EvaluateCommand {
-            expression: expression.to_string(),
-            context: Some(EvaluateArgumentsContext::Watch),
-            frame_id: Some(frame_id),
-            source: None,
-        });
-
-        cx.spawn(async move |this, cx| {
-            let response = request.await?;
-
-            this.update(cx, |session, cx| {
-                session.watchers.insert(
-                    expression.clone(),
-                    Watcher {
-                        expression,
-                        value: response.result.into(),
-                        variables_reference: response.variables_reference,
-                        presentation_hint: response.presentation_hint,
-                    },
-                );
-                cx.emit(SessionEvent::Watchers);
-            })
-        })
-    }
-
-    pub fn refresh_watchers(&mut self, frame_id: u64, cx: &mut Context<Self>) {
-        let watches = self.watchers.clone();
-        for (_, watch) in watches.into_iter() {
-            self.add_watcher(watch.expression.clone(), frame_id, cx)
-                .detach();
-        }
-    }
-
-    pub fn remove_watcher(&mut self, expression: SharedString) {
-        self.watchers.remove(&expression);
-    }
-
-    pub fn variables(
-        &mut self,
-        variables_reference: VariableReference,
-        cx: &mut Context<Self>,
-    ) -> Vec<dap::Variable> {
-        let command = VariablesCommand {
-            variables_reference,
-            filter: None,
-            start: None,
-            count: None,
-            format: None,
-        };
-
-        self.fetch(
-            command,
-            move |this, variables, cx| {
-                let Some(variables) = variables.log_err() else {
-                    return;
-                };
-
-                this.active_snapshot
-                    .variables
-                    .insert(variables_reference, variables);
-
-                cx.emit(SessionEvent::Variables);
-                cx.emit(SessionEvent::InvalidateInlineValue);
-            },
-            cx,
-        );
-
-        self.session_state()
-            .variables
-            .get(&variables_reference)
-            .cloned()
-            .unwrap_or_default()
-    }
-
-    pub fn data_breakpoint_info(
-        &mut self,
-        context: Arc<DataBreakpointContext>,
-        mode: Option<String>,
-        cx: &mut Context<Self>,
-    ) -> Task<Option<dap::DataBreakpointInfoResponse>> {
-        let command = DataBreakpointInfoCommand { context, mode };
-
-        self.request(command, |_, response, _| response.ok(), cx)
-    }
-
-    pub fn set_variable_value(
-        &mut self,
-        stack_frame_id: u64,
-        variables_reference: u64,
-        name: String,
-        value: String,
-        cx: &mut Context<Self>,
-    ) {
-        if self.capabilities.supports_set_variable.unwrap_or_default() {
-            self.request(
-                SetVariableValueCommand {
-                    name,
-                    value,
-                    variables_reference,
-                },
-                move |this, response, cx| {
-                    let response = response.log_err()?;
-                    this.invalidate_command_type::<VariablesCommand>();
-                    this.invalidate_command_type::<ReadMemory>();
-                    this.memory.clear(cx.background_executor());
-                    this.refresh_watchers(stack_frame_id, cx);
-                    cx.emit(SessionEvent::Variables);
-                    Some(response)
-                },
-                cx,
-            )
-            .detach();
-        }
-    }
-
-    pub fn evaluate(
-        &mut self,
-        expression: String,
-        context: Option<EvaluateArgumentsContext>,
-        frame_id: Option<u64>,
-        source: Option<Source>,
-        cx: &mut Context<Self>,
-    ) -> Task<()> {
-        let event = dap::OutputEvent {
-            category: None,
-            output: format!("> {expression}"),
-            group: None,
-            variables_reference: None,
-            source: None,
-            line: None,
-            column: None,
-            data: None,
-            location_reference: None,
-        };
-        self.push_output(event);
-        let request = self.state.request_dap(EvaluateCommand {
-            expression,
-            context,
-            frame_id,
-            source,
-        });
-        cx.spawn(async move |this, cx| {
-            let response = request.await;
-            this.update(cx, |this, cx| {
-                this.memory.clear(cx.background_executor());
-                this.invalidate_command_type::<ReadMemory>();
-                this.invalidate_command_type::<VariablesCommand>();
-                cx.emit(SessionEvent::Variables);
-                match response {
-                    Ok(response) => {
-                        let event = dap::OutputEvent {
-                            category: None,
-                            output: format!("< {}", &response.result),
-                            group: None,
-                            variables_reference: Some(response.variables_reference),
-                            source: None,
-                            line: None,
-                            column: None,
-                            data: None,
-                            location_reference: None,
-                        };
-                        this.push_output(event);
-                    }
-                    Err(e) => {
-                        let event = dap::OutputEvent {
-                            category: None,
-                            output: format!("{}", e),
-                            group: None,
-                            variables_reference: None,
-                            source: None,
-                            line: None,
-                            column: None,
-                            data: None,
-                            location_reference: None,
-                        };
-                        this.push_output(event);
-                    }
-                };
-                cx.notify();
-            })
-            .ok();
-        })
-    }
-
-    pub fn location(
-        &mut self,
-        reference: u64,
-        cx: &mut Context<Self>,
-    ) -> Option<dap::LocationsResponse> {
-        self.fetch(
-            LocationsCommand { reference },
-            move |this, response, _| {
-                let Some(response) = response.log_err() else {
-                    return;
-                };
-                this.active_snapshot.locations.insert(reference, response);
-            },
-            cx,
-        );
-        self.session_state().locations.get(&reference).cloned()
-    }
-
-    pub fn is_attached(&self) -> bool {
-        let SessionState::Running(local_mode) = &self.state else {
-            return false;
-        };
-        local_mode.binary.request_args.request == StartDebuggingRequestArgumentsRequest::Attach
-    }
-
-    pub fn disconnect_client(&mut self, cx: &mut Context<Self>) {
-        let command = DisconnectCommand {
-            restart: Some(false),
-            terminate_debuggee: Some(false),
-            suspend_debuggee: Some(false),
-        };
-
-        self.request(command, Self::empty_response, cx).detach()
-    }
-
-    pub fn terminate_threads(&mut self, thread_ids: Option<Vec<ThreadId>>, cx: &mut Context<Self>) {
-        if self
-            .capabilities
-            .supports_terminate_threads_request
-            .unwrap_or_default()
-        {
-            self.request(
-                TerminateThreadsCommand {
-                    thread_ids: thread_ids.map(|ids| ids.into_iter().map(|id| id.0).collect()),
-                },
-                Self::clear_active_debug_line_response,
-                cx,
-            )
-            .detach();
-        } else {
-            self.shutdown(cx).detach();
-        }
-    }
-
-    pub fn thread_state(&self, thread_id: ThreadId) -> Option<ThreadStatus> {
-        self.session_state().thread_states.thread_state(thread_id)
-    }
-
-    pub fn quirks(&self) -> SessionQuirks {
-        self.quirks
-    }
-
-    fn launch_browser_for_remote_server(
-        &mut self,
-        mut request: LaunchBrowserInCompanionParams,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(remote_client) = self.remote_client.clone() else {
-            log::error!("can't launch browser in companion for non-remote project");
-            return;
-        };
-        let Some(http_client) = self.http_client.clone() else {
-            return;
-        };
-        let Some(node_runtime) = self.node_runtime.clone() else {
-            return;
-        };
-
-        let mut console_output = self.console_output(cx);
-        let task = cx.spawn(async move |this, cx| {
-            let forward_ports_process = if remote_client
-                .read_with(cx, |client, _| client.shares_network_interface())?
-            {
-                request.other.insert(
-                    "proxyUri".into(),
-                    format!("127.0.0.1:{}", request.server_port).into(),
-                );
-                None
-            } else {
-                let port = TcpTransport::unused_port(Ipv4Addr::LOCALHOST)
-                    .await
-                    .context("getting port for DAP")?;
-                request
-                    .other
-                    .insert("proxyUri".into(), format!("127.0.0.1:{port}").into());
-                let mut port_forwards = vec![(port, "localhost".to_owned(), request.server_port)];
-
-                if let Some(value) = request.params.get("url")
-                    && let Some(url) = value.as_str()
-                    && let Some(url) = Url::parse(url).ok()
-                    && let Some(frontend_port) = url.port()
-                {
-                    port_forwards.push((frontend_port, "localhost".to_owned(), frontend_port));
-                }
-
-                let child = remote_client.update(cx, |client, _| {
-                    let command = client.build_forward_ports_command(port_forwards)?;
-                    let child = new_smol_command(command.program)
-                        .args(command.args)
-                        .envs(command.env)
-                        .spawn()
-                        .context("spawning port forwarding process")?;
-                    anyhow::Ok(child)
-                })??;
-                Some(child)
-            };
-
-            let mut companion_process = None;
-            let companion_port =
-                if let Some(companion_port) = this.read_with(cx, |this, _| this.companion_port)? {
-                    companion_port
-                } else {
-                    let task = cx.spawn(async move |cx| spawn_companion(node_runtime, cx).await);
-                    match task.await {
-                        Ok((port, child)) => {
-                            companion_process = Some(child);
-                            port
-                        }
-                        Err(e) => {
-                            console_output
-                                .send(format!("Failed to launch browser companion process: {e}"))
-                                .await
-                                .ok();
-                            return Err(e);
-                        }
-                    }
-                };
-
-            let mut background_tasks = Vec::new();
-            if let Some(mut forward_ports_process) = forward_ports_process {
-                background_tasks.push(cx.spawn(async move |_| {
-                    forward_ports_process.status().await.log_err();
-                }));
-            };
-            if let Some(mut companion_process) = companion_process {
-                if let Some(stderr) = companion_process.stderr.take() {
-                    let mut console_output = console_output.clone();
-                    background_tasks.push(cx.spawn(async move |_| {
-                        let mut stderr = BufReader::new(stderr);
-                        let mut line = String::new();
-                        while let Ok(n) = stderr.read_line(&mut line).await
-                            && n > 0
-                        {
-                            console_output
-                                .send(format!("companion stderr: {line}"))
-                                .await
-                                .ok();
-                            line.clear();
-                        }
-                    }));
-                }
-                background_tasks.push(cx.spawn({
-                    let mut console_output = console_output.clone();
-                    async move |_| match companion_process.status().await {
-                        Ok(status) => {
-                            if status.success() {
-                                console_output
-                                    .send("Companion process exited normally".into())
-                                    .await
-                                    .ok();
-                            } else {
-                                console_output
-                                    .send(format!(
-                                        "Companion process exited abnormally with {status:?}"
-                                    ))
-                                    .await
-                                    .ok();
-                            }
-                        }
-                        Err(e) => {
-                            console_output
-                                .send(format!("Failed to join companion process: {e}"))
-                                .await
-                                .ok();
-                        }
-                    }
-                }));
-            }
-
-            // TODO pass wslInfo as needed
-
-            let companion_address = format!("127.0.0.1:{companion_port}");
-            let mut companion_started = false;
-            for _ in 0..10 {
-                if TcpStream::connect(&companion_address).await.is_ok() {
-                    companion_started = true;
-                    break;
-                }
-                cx.background_executor()
-                    .timer(Duration::from_millis(100))
-                    .await;
-            }
-            if !companion_started {
-                console_output
-                    .send("Browser companion failed to start".into())
-                    .await
-                    .ok();
-                bail!("Browser companion failed to start");
-            }
-
-            let response = http_client
-                .post_json(
-                    &format!("http://{companion_address}/launch-and-attach"),
-                    serde_json::to_string(&request)
-                        .context("serializing request")?
-                        .into(),
-                )
-                .await;
-            match response {
-                Ok(response) => {
-                    if !response.status().is_success() {
-                        console_output
-                            .send("Launch request to companion failed".into())
-                            .await
-                            .ok();
-                        return Err(anyhow!("launch request failed"));
-                    }
-                }
-                Err(e) => {
-                    console_output
-                        .send("Failed to read response from companion".into())
-                        .await
-                        .ok();
-                    return Err(e);
-                }
-            }
-
-            this.update(cx, |this, _| {
-                this.background_tasks.extend(background_tasks);
-                this.companion_port = Some(companion_port);
-            })?;
-
-            anyhow::Ok(())
-        });
-        self.background_tasks.push(cx.spawn(async move |_, _| {
-            task.await.log_err();
-        }));
-    }
-
-    fn kill_browser(&self, request: KillCompanionBrowserParams, cx: &mut App) {
-        let Some(companion_port) = self.companion_port else {
-            log::error!("received killCompanionBrowser but js-debug-companion is not running");
-            return;
-        };
-        let Some(http_client) = self.http_client.clone() else {
-            return;
-        };
-
-        cx.spawn(async move |_| {
-            http_client
-                .post_json(
-                    &format!("http://127.0.0.1:{companion_port}/kill"),
-                    serde_json::to_string(&request)
-                        .context("serializing request")?
-                        .into(),
-                )
-                .await?;
-            anyhow::Ok(())
-        })
-        .detach_and_log_err(cx)
-    }
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-#[serde(rename_all = "camelCase")]
-struct LaunchBrowserInCompanionParams {
-    server_port: u16,
-    params: HashMap<String, serde_json::Value>,
-    #[serde(flatten)]
-    other: HashMap<String, serde_json::Value>,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-#[serde(rename_all = "camelCase")]
-struct KillCompanionBrowserParams {
-    launch_id: u64,
-}
-
-async fn spawn_companion(
-    node_runtime: NodeRuntime,
-    cx: &mut AsyncApp,
-) -> Result<(u16, smol::process::Child)> {
-    let binary_path = node_runtime
-        .binary_path()
-        .await
-        .context("getting node path")?;
-    let path = cx
-        .spawn(async move |cx| get_or_install_companion(node_runtime, cx).await)
-        .await?;
-    log::info!("will launch js-debug-companion version {path:?}");
-
-    let port = {
-        let listener = TcpListener::bind("127.0.0.1:0")
-            .await
-            .context("getting port for companion")?;
-        listener.local_addr()?.port()
-    };
-
-    let dir = paths::data_dir()
-        .join("js_debug_companion_state")
-        .to_string_lossy()
-        .to_string();
-
-    let child = new_smol_command(binary_path)
-        .arg(path)
-        .args([
-            format!("--listen=127.0.0.1:{port}"),
-            format!("--state={dir}"),
-        ])
-        .stdin(Stdio::piped())
-        .stdout(Stdio::piped())
-        .stderr(Stdio::piped())
-        .spawn()
-        .context("spawning companion child process")?;
-
-    Ok((port, child))
-}
-
-async fn get_or_install_companion(node: NodeRuntime, cx: &mut AsyncApp) -> Result<PathBuf> {
-    const PACKAGE_NAME: &str = "@zed-industries/js-debug-companion-cli";
-
-    async fn install_latest_version(dir: PathBuf, node: NodeRuntime) -> Result<PathBuf> {
-        let temp_dir = tempfile::tempdir().context("creating temporary directory")?;
-        node.npm_install_packages(temp_dir.path(), &[(PACKAGE_NAME, "latest")])
-            .await
-            .context("installing latest companion package")?;
-        let version = node
-            .npm_package_installed_version(temp_dir.path(), PACKAGE_NAME)
-            .await
-            .context("getting installed companion version")?
-            .context("companion was not installed")?;
-        smol::fs::rename(temp_dir.path(), dir.join(&version))
-            .await
-            .context("moving companion package into place")?;
-        Ok(dir.join(version))
-    }
-
-    let dir = paths::debug_adapters_dir().join("js-debug-companion");
-    let (latest_installed_version, latest_version) = cx
-        .background_spawn({
-            let dir = dir.clone();
-            let node = node.clone();
-            async move {
-                smol::fs::create_dir_all(&dir)
-                    .await
-                    .context("creating companion installation directory")?;
-
-                let mut children = smol::fs::read_dir(&dir)
-                    .await
-                    .context("reading companion installation directory")?
-                    .try_collect::<Vec<_>>()
-                    .await
-                    .context("reading companion installation directory entries")?;
-                children
-                    .sort_by_key(|child| semver::Version::parse(child.file_name().to_str()?).ok());
-
-                let latest_installed_version = children.last().and_then(|child| {
-                    let version = child.file_name().into_string().ok()?;
-                    Some((child.path(), version))
-                });
-                let latest_version = node
-                    .npm_package_latest_version(PACKAGE_NAME)
-                    .await
-                    .log_err();
-                anyhow::Ok((latest_installed_version, latest_version))
-            }
-        })
-        .await?;
-
-    let path = if let Some((installed_path, installed_version)) = latest_installed_version {
-        if let Some(latest_version) = latest_version
-            && latest_version != installed_version
-        {
-            cx.background_spawn(install_latest_version(dir.clone(), node.clone()))
-                .detach();
-        }
-        Ok(installed_path)
-    } else {
-        cx.background_spawn(install_latest_version(dir.clone(), node.clone()))
-            .await
-    };
-
-    Ok(path?
-        .join("node_modules")
-        .join(PACKAGE_NAME)
-        .join("out")
-        .join("cli.js"))
-}
diff --git a/crates/project/src/debugger/test.rs b/crates/project/src/debugger/test.rs
deleted file mode 100644
index 53b88323e6..0000000000
--- a/crates/project/src/debugger/test.rs
+++ /dev/null
@@ -1,55 +0,0 @@
-use std::{path::Path, sync::Arc};
-
-use dap::client::DebugAdapterClient;
-use gpui::{App, Subscription};
-
-use super::session::{Session, SessionStateEvent};
-
-pub fn intercept_debug_sessions<T: Fn(&Arc<DebugAdapterClient>) + 'static>(
-    cx: &mut gpui::TestAppContext,
-    configure: T,
-) -> Subscription {
-    cx.update(|cx| {
-        let configure = Arc::new(configure);
-        cx.observe_new::<Session>(move |_, _, cx| {
-            let configure = configure.clone();
-            cx.subscribe_self(move |session, event, cx| {
-                let configure = configure.clone();
-                if matches!(event, SessionStateEvent::Running) {
-                    let client = session.adapter_client().unwrap();
-                    register_default_handlers(session, &client, cx);
-                    configure(&client);
-                }
-            })
-            .detach();
-        })
-    })
-}
-
-fn register_default_handlers(session: &Session, client: &Arc<DebugAdapterClient>, cx: &mut App) {
-    client.on_request::<dap::requests::Initialize, _>(move |_, _| Ok(Default::default()));
-    let paths = session.breakpoint_store.read(cx).breakpoint_paths();
-
-    client.on_request::<dap::requests::SetBreakpoints, _>(move |_, args| {
-        let p = Arc::from(Path::new(&args.source.path.unwrap()));
-        if !paths.contains(&p) {
-            panic!("Sent breakpoints for path without any")
-        }
-
-        Ok(dap::SetBreakpointsResponse {
-            breakpoints: Vec::default(),
-        })
-    });
-
-    client.on_request::<dap::requests::Launch, _>(move |_, _| Ok(()));
-
-    client.on_request::<dap::requests::SetExceptionBreakpoints, _>(move |_, _| {
-        Ok(dap::SetExceptionBreakpointsResponse { breakpoints: None })
-    });
-
-    client.on_request::<dap::requests::Disconnect, _>(move |_, _| Ok(()));
-
-    client.on_request::<dap::requests::Threads, _>(move |_, _| {
-        Ok(dap::ThreadsResponse { threads: vec![] })
-    });
-}
diff --git a/crates/project/src/environment.rs b/crates/project/src/environment.rs
deleted file mode 100644
index c4e807621e..0000000000
--- a/crates/project/src/environment.rs
+++ /dev/null
@@ -1,421 +0,0 @@
-use anyhow::{Context as _, bail};
-use futures::{FutureExt, StreamExt as _, channel::mpsc, future::Shared};
-use language::Buffer;
-use remote::RemoteClient;
-use rpc::proto::{self, REMOTE_SERVER_PROJECT_ID};
-use std::{collections::VecDeque, path::Path, sync::Arc};
-use task::{Shell, shell_to_proto};
-use terminal::terminal_settings::TerminalSettings;
-use util::{ResultExt, command::new_smol_command, rel_path::RelPath};
-use worktree::Worktree;
-
-use collections::HashMap;
-use gpui::{App, AppContext as _, Context, Entity, EventEmitter, Task, WeakEntity};
-use settings::Settings as _;
-
-use crate::{
-    project_settings::{DirenvSettings, ProjectSettings},
-    worktree_store::WorktreeStore,
-};
-
-pub struct ProjectEnvironment {
-    cli_environment: Option<HashMap<String, String>>,
-    local_environments: HashMap<(Shell, Arc<Path>), Shared<Task<Option<HashMap<String, String>>>>>,
-    remote_environments: HashMap<(Shell, Arc<Path>), Shared<Task<Option<HashMap<String, String>>>>>,
-    environment_error_messages: VecDeque<String>,
-    environment_error_messages_tx: mpsc::UnboundedSender<String>,
-    worktree_store: WeakEntity<WorktreeStore>,
-    remote_client: Option<WeakEntity<RemoteClient>>,
-    is_remote_project: bool,
-    _tasks: Vec<Task<()>>,
-}
-
-pub enum ProjectEnvironmentEvent {
-    ErrorsUpdated,
-}
-
-impl EventEmitter<ProjectEnvironmentEvent> for ProjectEnvironment {}
-
-impl ProjectEnvironment {
-    pub fn new(
-        cli_environment: Option<HashMap<String, String>>,
-        worktree_store: WeakEntity<WorktreeStore>,
-        remote_client: Option<WeakEntity<RemoteClient>>,
-        is_remote_project: bool,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let (tx, mut rx) = mpsc::unbounded();
-        let task = cx.spawn(async move |this, cx| {
-            while let Some(message) = rx.next().await {
-                this.update(cx, |this, cx| {
-                    this.environment_error_messages.push_back(message);
-                    cx.emit(ProjectEnvironmentEvent::ErrorsUpdated);
-                })
-                .ok();
-            }
-        });
-        Self {
-            cli_environment,
-            local_environments: Default::default(),
-            remote_environments: Default::default(),
-            environment_error_messages: Default::default(),
-            environment_error_messages_tx: tx,
-            worktree_store,
-            remote_client,
-            is_remote_project,
-            _tasks: vec![task],
-        }
-    }
-
-    /// Returns the inherited CLI environment, if this project was opened from the Zed CLI.
-    pub(crate) fn get_cli_environment(&self) -> Option<HashMap<String, String>> {
-        if cfg!(any(test, feature = "test-support")) {
-            return Some(HashMap::default());
-        }
-        if let Some(mut env) = self.cli_environment.clone() {
-            set_origin_marker(&mut env, EnvironmentOrigin::Cli);
-            Some(env)
-        } else {
-            None
-        }
-    }
-
-    pub fn buffer_environment(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        worktree_store: &Entity<WorktreeStore>,
-        cx: &mut Context<Self>,
-    ) -> Shared<Task<Option<HashMap<String, String>>>> {
-        if let Some(cli_environment) = self.get_cli_environment() {
-            log::debug!("using project environment variables from CLI");
-            return Task::ready(Some(cli_environment)).shared();
-        }
-
-        let Some(worktree) = buffer
-            .read(cx)
-            .file()
-            .map(|f| f.worktree_id(cx))
-            .and_then(|worktree_id| worktree_store.read(cx).worktree_for_id(worktree_id, cx))
-        else {
-            return Task::ready(None).shared();
-        };
-        self.worktree_environment(worktree, cx)
-    }
-
-    pub fn worktree_environment(
-        &mut self,
-        worktree: Entity<Worktree>,
-        cx: &mut App,
-    ) -> Shared<Task<Option<HashMap<String, String>>>> {
-        if let Some(cli_environment) = self.get_cli_environment() {
-            log::debug!("using project environment variables from CLI");
-            return Task::ready(Some(cli_environment)).shared();
-        }
-
-        let worktree = worktree.read(cx);
-        let mut abs_path = worktree.abs_path();
-        if worktree.is_single_file() {
-            let Some(parent) = abs_path.parent() else {
-                return Task::ready(None).shared();
-            };
-            abs_path = parent.into();
-        }
-
-        let remote_client = self.remote_client.as_ref().and_then(|it| it.upgrade());
-        match remote_client {
-            Some(remote_client) => remote_client.clone().read(cx).shell().map(|shell| {
-                self.remote_directory_environment(
-                    &Shell::Program(shell),
-                    abs_path,
-                    remote_client,
-                    cx,
-                )
-            }),
-            None if self.is_remote_project => {
-                Some(self.local_directory_environment(&Shell::System, abs_path, cx))
-            }
-            None => Some({
-                let shell = TerminalSettings::get(
-                    Some(settings::SettingsLocation {
-                        worktree_id: worktree.id(),
-                        path: RelPath::empty(),
-                    }),
-                    cx,
-                )
-                .shell
-                .clone();
-
-                self.local_directory_environment(&shell, abs_path, cx)
-            }),
-        }
-        .unwrap_or_else(|| Task::ready(None).shared())
-    }
-
-    pub fn directory_environment(
-        &mut self,
-        abs_path: Arc<Path>,
-        cx: &mut App,
-    ) -> Shared<Task<Option<HashMap<String, String>>>> {
-        let remote_client = self.remote_client.as_ref().and_then(|it| it.upgrade());
-        match remote_client {
-            Some(remote_client) => remote_client.clone().read(cx).shell().map(|shell| {
-                self.remote_directory_environment(
-                    &Shell::Program(shell),
-                    abs_path,
-                    remote_client,
-                    cx,
-                )
-            }),
-            None if self.is_remote_project => {
-                Some(self.local_directory_environment(&Shell::System, abs_path, cx))
-            }
-            None => self
-                .worktree_store
-                .read_with(cx, |worktree_store, cx| {
-                    worktree_store.find_worktree(&abs_path, cx)
-                })
-                .ok()
-                .map(|worktree| {
-                    let shell = terminal::terminal_settings::TerminalSettings::get(
-                        worktree
-                            .as_ref()
-                            .map(|(worktree, path)| settings::SettingsLocation {
-                                worktree_id: worktree.read(cx).id(),
-                                path: &path,
-                            }),
-                        cx,
-                    )
-                    .shell
-                    .clone();
-
-                    self.local_directory_environment(&shell, abs_path, cx)
-                }),
-        }
-        .unwrap_or_else(|| Task::ready(None).shared())
-    }
-
-    /// Returns the project environment, if possible.
-    /// If the project was opened from the CLI, then the inherited CLI environment is returned.
-    /// If it wasn't opened from the CLI, and an absolute path is given, then a shell is spawned in
-    /// that directory, to get environment variables as if the user has `cd`'d there.
-    pub fn local_directory_environment(
-        &mut self,
-        shell: &Shell,
-        abs_path: Arc<Path>,
-        cx: &mut App,
-    ) -> Shared<Task<Option<HashMap<String, String>>>> {
-        if let Some(cli_environment) = self.get_cli_environment() {
-            log::debug!("using project environment variables from CLI");
-            return Task::ready(Some(cli_environment)).shared();
-        }
-
-        self.local_environments
-            .entry((shell.clone(), abs_path.clone()))
-            .or_insert_with(|| {
-                let load_direnv = ProjectSettings::get_global(cx).load_direnv.clone();
-                let shell = shell.clone();
-                let tx = self.environment_error_messages_tx.clone();
-                cx.spawn(async move |cx| {
-                    let mut shell_env = cx
-                        .background_spawn(load_directory_shell_environment(
-                            shell,
-                            abs_path.clone(),
-                            load_direnv,
-                            tx,
-                        ))
-                        .await
-                        .log_err();
-
-                    if let Some(shell_env) = shell_env.as_mut() {
-                        let path = shell_env
-                            .get("PATH")
-                            .map(|path| path.as_str())
-                            .unwrap_or_default();
-                        log::debug!(
-                            "using project environment variables shell launched in {:?}. PATH={:?}",
-                            abs_path,
-                            path
-                        );
-
-                        set_origin_marker(shell_env, EnvironmentOrigin::WorktreeShell);
-                    }
-
-                    shell_env
-                })
-                .shared()
-            })
-            .clone()
-    }
-
-    pub fn remote_directory_environment(
-        &mut self,
-        shell: &Shell,
-        abs_path: Arc<Path>,
-        remote_client: Entity<RemoteClient>,
-        cx: &mut App,
-    ) -> Shared<Task<Option<HashMap<String, String>>>> {
-        if cfg!(any(test, feature = "test-support")) {
-            return Task::ready(Some(HashMap::default())).shared();
-        }
-
-        self.remote_environments
-            .entry((shell.clone(), abs_path.clone()))
-            .or_insert_with(|| {
-                let response =
-                    remote_client
-                        .read(cx)
-                        .proto_client()
-                        .request(proto::GetDirectoryEnvironment {
-                            project_id: REMOTE_SERVER_PROJECT_ID,
-                            shell: Some(shell_to_proto(shell.clone())),
-                            directory: abs_path.to_string_lossy().to_string(),
-                        });
-                cx.background_spawn(async move {
-                    let environment = response.await.log_err()?;
-                    Some(environment.environment.into_iter().collect())
-                })
-                .shared()
-            })
-            .clone()
-    }
-
-    pub fn peek_environment_error(&self) -> Option<&String> {
-        self.environment_error_messages.front()
-    }
-
-    pub fn pop_environment_error(&mut self) -> Option<String> {
-        self.environment_error_messages.pop_front()
-    }
-}
-
-fn set_origin_marker(env: &mut HashMap<String, String>, origin: EnvironmentOrigin) {
-    env.insert(ZED_ENVIRONMENT_ORIGIN_MARKER.to_string(), origin.into());
-}
-
-const ZED_ENVIRONMENT_ORIGIN_MARKER: &str = "ZED_ENVIRONMENT";
-
-enum EnvironmentOrigin {
-    Cli,
-    WorktreeShell,
-}
-
-impl From<EnvironmentOrigin> for String {
-    fn from(val: EnvironmentOrigin) -> Self {
-        match val {
-            EnvironmentOrigin::Cli => "cli".into(),
-            EnvironmentOrigin::WorktreeShell => "worktree-shell".into(),
-        }
-    }
-}
-
-async fn load_directory_shell_environment(
-    shell: Shell,
-    abs_path: Arc<Path>,
-    load_direnv: DirenvSettings,
-    tx: mpsc::UnboundedSender<String>,
-) -> anyhow::Result<HashMap<String, String>> {
-    if let DirenvSettings::Disabled = load_direnv {
-        return Ok(HashMap::default());
-    }
-
-    let meta = smol::fs::metadata(&abs_path).await.with_context(|| {
-        tx.unbounded_send(format!("Failed to open {}", abs_path.display()))
-            .ok();
-        format!("stat {abs_path:?}")
-    })?;
-
-    let dir = if meta.is_dir() {
-        abs_path.clone()
-    } else {
-        abs_path
-            .parent()
-            .with_context(|| {
-                tx.unbounded_send(format!("Failed to open {}", abs_path.display()))
-                    .ok();
-                format!("getting parent of {abs_path:?}")
-            })?
-            .into()
-    };
-
-    let (shell, args) = shell.program_and_args();
-    let mut envs = util::shell_env::capture(shell.clone(), args, abs_path)
-        .await
-        .with_context(|| {
-            tx.unbounded_send("Failed to load environment variables".into())
-                .ok();
-            format!("capturing shell environment with {shell:?}")
-        })?;
-
-    if cfg!(target_os = "windows")
-        && let Some(path) = envs.remove("Path")
-    {
-        // windows env vars are case-insensitive, so normalize the path var
-        // so we can just assume `PATH` in other places
-        envs.insert("PATH".into(), path);
-    }
-    // If the user selects `Direct` for direnv, it would set an environment
-    // variable that later uses to know that it should not run the hook.
-    // We would include in `.envs` call so it is okay to run the hook
-    // even if direnv direct mode is enabled.
-    let direnv_environment = match load_direnv {
-        DirenvSettings::ShellHook => None,
-        DirenvSettings::Disabled => bail!("direnv integration is disabled"),
-        // Note: direnv is not available on Windows, so we skip direnv processing
-        // and just return the shell environment
-        DirenvSettings::Direct if cfg!(target_os = "windows") => None,
-        DirenvSettings::Direct => load_direnv_environment(&envs, &dir)
-            .await
-            .with_context(|| {
-                tx.unbounded_send("Failed to load direnv environment".into())
-                    .ok();
-                "load direnv environment"
-            })
-            .log_err(),
-    };
-    if let Some(direnv_environment) = direnv_environment {
-        for (key, value) in direnv_environment {
-            if let Some(value) = value {
-                envs.insert(key, value);
-            } else {
-                envs.remove(&key);
-            }
-        }
-    }
-
-    Ok(envs)
-}
-
-async fn load_direnv_environment(
-    env: &HashMap<String, String>,
-    dir: &Path,
-) -> anyhow::Result<HashMap<String, Option<String>>> {
-    let Some(direnv_path) = which::which("direnv").ok() else {
-        return Ok(HashMap::default());
-    };
-
-    let args = &["export", "json"];
-    let direnv_output = new_smol_command(&direnv_path)
-        .args(args)
-        .envs(env)
-        .env("TERM", "dumb")
-        .current_dir(dir)
-        .output()
-        .await
-        .context("running direnv")?;
-
-    if !direnv_output.status.success() {
-        bail!(
-            "Loading direnv environment failed ({}), stderr: {}",
-            direnv_output.status,
-            String::from_utf8_lossy(&direnv_output.stderr)
-        );
-    }
-
-    let output = String::from_utf8_lossy(&direnv_output.stdout);
-    if output.is_empty() {
-        // direnv outputs nothing when it has no changes to apply to environment variables
-        return Ok(HashMap::default());
-    }
-
-    serde_json::from_str(&output).context("parsing direnv json")
-}
diff --git a/crates/project/src/git_store.rs b/crates/project/src/git_store.rs
deleted file mode 100644
index c73ab914b7..0000000000
--- a/crates/project/src/git_store.rs
+++ /dev/null
@@ -1,6297 +0,0 @@
-pub mod branch_diff;
-mod conflict_set;
-pub mod git_traversal;
-pub mod pending_op;
-
-use crate::{
-    ProjectEnvironment, ProjectItem, ProjectPath,
-    buffer_store::{BufferStore, BufferStoreEvent},
-    worktree_store::{WorktreeStore, WorktreeStoreEvent},
-};
-use anyhow::{Context as _, Result, anyhow, bail};
-use askpass::{AskPassDelegate, EncryptedPassword, IKnowWhatIAmDoingAndIHaveReadTheDocs};
-use buffer_diff::{BufferDiff, BufferDiffEvent};
-use client::ProjectId;
-use collections::HashMap;
-pub use conflict_set::{ConflictRegion, ConflictSet, ConflictSetSnapshot, ConflictSetUpdate};
-use fs::Fs;
-use futures::{
-    FutureExt, StreamExt,
-    channel::{
-        mpsc,
-        oneshot::{self, Canceled},
-    },
-    future::{self, Shared},
-    stream::FuturesOrdered,
-};
-use git::{
-    BuildPermalinkParams, GitHostingProviderRegistry, Oid, RunHook,
-    blame::Blame,
-    parse_git_remote_url,
-    repository::{
-        Branch, CommitDetails, CommitDiff, CommitFile, CommitOptions, DiffType, FetchOptions,
-        GitRepository, GitRepositoryCheckpoint, PushOptions, Remote, RemoteCommandOutput, RepoPath,
-        ResetMode, UpstreamTrackingStatus, Worktree as GitWorktree,
-    },
-    stash::{GitStash, StashEntry},
-    status::{
-        DiffTreeType, FileStatus, GitSummary, StatusCode, TrackedStatus, TreeDiff, TreeDiffStatus,
-        UnmergedStatus, UnmergedStatusCode,
-    },
-};
-use gpui::{
-    App, AppContext, AsyncApp, Context, Entity, EventEmitter, SharedString, Subscription, Task,
-    WeakEntity,
-};
-use language::{
-    Buffer, BufferEvent, Language, LanguageRegistry,
-    proto::{deserialize_version, serialize_version},
-};
-use parking_lot::Mutex;
-use pending_op::{PendingOp, PendingOpId, PendingOps, PendingOpsSummary};
-use postage::stream::Stream as _;
-use rpc::{
-    AnyProtoClient, TypedEnvelope,
-    proto::{self, git_reset, split_repository_update},
-};
-use serde::Deserialize;
-use settings::WorktreeId;
-use smol::future::yield_now;
-use std::{
-    cmp::Ordering,
-    collections::{BTreeSet, HashSet, VecDeque},
-    future::Future,
-    mem,
-    ops::Range,
-    path::{Path, PathBuf},
-    str::FromStr,
-    sync::{
-        Arc,
-        atomic::{self, AtomicU64},
-    },
-    time::Instant,
-};
-use sum_tree::{Edit, SumTree, TreeSet};
-use task::Shell;
-use text::{Bias, BufferId};
-use util::{
-    ResultExt, debug_panic,
-    paths::{PathStyle, SanitizedPath},
-    post_inc,
-    rel_path::RelPath,
-};
-use worktree::{
-    File, PathChange, PathKey, PathProgress, PathSummary, PathTarget, ProjectEntryId,
-    UpdatedGitRepositoriesSet, UpdatedGitRepository, Worktree,
-};
-use zeroize::Zeroize;
-
-pub struct GitStore {
-    state: GitStoreState,
-    buffer_store: Entity<BufferStore>,
-    worktree_store: Entity<WorktreeStore>,
-    repositories: HashMap<RepositoryId, Entity<Repository>>,
-    worktree_ids: HashMap<RepositoryId, HashSet<WorktreeId>>,
-    active_repo_id: Option<RepositoryId>,
-    #[allow(clippy::type_complexity)]
-    loading_diffs:
-        HashMap<(BufferId, DiffKind), Shared<Task<Result<Entity<BufferDiff>, Arc<anyhow::Error>>>>>,
-    diffs: HashMap<BufferId, Entity<BufferGitState>>,
-    shared_diffs: HashMap<proto::PeerId, HashMap<BufferId, SharedDiffs>>,
-    _subscriptions: Vec<Subscription>,
-}
-
-#[derive(Default)]
-struct SharedDiffs {
-    unstaged: Option<Entity<BufferDiff>>,
-    uncommitted: Option<Entity<BufferDiff>>,
-}
-
-struct BufferGitState {
-    unstaged_diff: Option<WeakEntity<BufferDiff>>,
-    uncommitted_diff: Option<WeakEntity<BufferDiff>>,
-    conflict_set: Option<WeakEntity<ConflictSet>>,
-    recalculate_diff_task: Option<Task<Result<()>>>,
-    reparse_conflict_markers_task: Option<Task<Result<()>>>,
-    language: Option<Arc<Language>>,
-    language_registry: Option<Arc<LanguageRegistry>>,
-    conflict_updated_futures: Vec<oneshot::Sender<()>>,
-    recalculating_tx: postage::watch::Sender<bool>,
-
-    /// These operation counts are used to ensure that head and index text
-    /// values read from the git repository are up-to-date with any hunk staging
-    /// operations that have been performed on the BufferDiff.
-    ///
-    /// The operation count is incremented immediately when the user initiates a
-    /// hunk stage/unstage operation. Then, upon finishing writing the new index
-    /// text do disk, the `operation count as of write` is updated to reflect
-    /// the operation count that prompted the write.
-    hunk_staging_operation_count: usize,
-    hunk_staging_operation_count_as_of_write: usize,
-
-    head_text: Option<Arc<String>>,
-    index_text: Option<Arc<String>>,
-    head_changed: bool,
-    index_changed: bool,
-    language_changed: bool,
-}
-
-#[derive(Clone, Debug)]
-enum DiffBasesChange {
-    SetIndex(Option<String>),
-    SetHead(Option<String>),
-    SetEach {
-        index: Option<String>,
-        head: Option<String>,
-    },
-    SetBoth(Option<String>),
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
-enum DiffKind {
-    Unstaged,
-    Uncommitted,
-}
-
-enum GitStoreState {
-    Local {
-        next_repository_id: Arc<AtomicU64>,
-        downstream: Option<LocalDownstreamState>,
-        project_environment: Entity<ProjectEnvironment>,
-        fs: Arc<dyn Fs>,
-    },
-    Remote {
-        upstream_client: AnyProtoClient,
-        upstream_project_id: u64,
-        downstream: Option<(AnyProtoClient, ProjectId)>,
-    },
-}
-
-enum DownstreamUpdate {
-    UpdateRepository(RepositorySnapshot),
-    RemoveRepository(RepositoryId),
-}
-
-struct LocalDownstreamState {
-    client: AnyProtoClient,
-    project_id: ProjectId,
-    updates_tx: mpsc::UnboundedSender<DownstreamUpdate>,
-    _task: Task<Result<()>>,
-}
-
-#[derive(Clone, Debug)]
-pub struct GitStoreCheckpoint {
-    checkpoints_by_work_dir_abs_path: HashMap<Arc<Path>, GitRepositoryCheckpoint>,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct StatusEntry {
-    pub repo_path: RepoPath,
-    pub status: FileStatus,
-}
-
-impl StatusEntry {
-    fn to_proto(&self) -> proto::StatusEntry {
-        let simple_status = match self.status {
-            FileStatus::Ignored | FileStatus::Untracked => proto::GitStatus::Added as i32,
-            FileStatus::Unmerged { .. } => proto::GitStatus::Conflict as i32,
-            FileStatus::Tracked(TrackedStatus {
-                index_status,
-                worktree_status,
-            }) => tracked_status_to_proto(if worktree_status != StatusCode::Unmodified {
-                worktree_status
-            } else {
-                index_status
-            }),
-        };
-
-        proto::StatusEntry {
-            repo_path: self.repo_path.to_proto(),
-            simple_status,
-            status: Some(status_to_proto(self.status)),
-        }
-    }
-}
-
-impl TryFrom<proto::StatusEntry> for StatusEntry {
-    type Error = anyhow::Error;
-
-    fn try_from(value: proto::StatusEntry) -> Result<Self, Self::Error> {
-        let repo_path = RepoPath::from_proto(&value.repo_path).context("invalid repo path")?;
-        let status = status_from_proto(value.simple_status, value.status)?;
-        Ok(Self { repo_path, status })
-    }
-}
-
-impl sum_tree::Item for StatusEntry {
-    type Summary = PathSummary<GitSummary>;
-
-    fn summary(&self, _: <Self::Summary as sum_tree::Summary>::Context<'_>) -> Self::Summary {
-        PathSummary {
-            max_path: self.repo_path.as_ref().clone(),
-            item_summary: self.status.summary(),
-        }
-    }
-}
-
-impl sum_tree::KeyedItem for StatusEntry {
-    type Key = PathKey;
-
-    fn key(&self) -> Self::Key {
-        PathKey(self.repo_path.as_ref().clone())
-    }
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct RepositoryId(pub u64);
-
-#[derive(Clone, Debug, Default, PartialEq, Eq)]
-pub struct MergeDetails {
-    pub conflicted_paths: TreeSet<RepoPath>,
-    pub message: Option<SharedString>,
-    pub heads: Vec<Option<SharedString>>,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct RepositorySnapshot {
-    pub id: RepositoryId,
-    pub statuses_by_path: SumTree<StatusEntry>,
-    pub work_directory_abs_path: Arc<Path>,
-    pub path_style: PathStyle,
-    pub branch: Option<Branch>,
-    pub head_commit: Option<CommitDetails>,
-    pub scan_id: u64,
-    pub merge: MergeDetails,
-    pub remote_origin_url: Option<String>,
-    pub remote_upstream_url: Option<String>,
-    pub stash_entries: GitStash,
-}
-
-type JobId = u64;
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct JobInfo {
-    pub start: Instant,
-    pub message: SharedString,
-}
-
-pub struct Repository {
-    this: WeakEntity<Self>,
-    snapshot: RepositorySnapshot,
-    commit_message_buffer: Option<Entity<Buffer>>,
-    git_store: WeakEntity<GitStore>,
-    // For a local repository, holds paths that have had worktree events since the last status scan completed,
-    // and that should be examined during the next status scan.
-    paths_needing_status_update: BTreeSet<RepoPath>,
-    job_sender: mpsc::UnboundedSender<GitJob>,
-    active_jobs: HashMap<JobId, JobInfo>,
-    pending_ops: SumTree<PendingOps>,
-    job_id: JobId,
-    askpass_delegates: Arc<Mutex<HashMap<u64, AskPassDelegate>>>,
-    latest_askpass_id: u64,
-    repository_state: Shared<Task<Result<RepositoryState, String>>>,
-}
-
-impl std::ops::Deref for Repository {
-    type Target = RepositorySnapshot;
-
-    fn deref(&self) -> &Self::Target {
-        &self.snapshot
-    }
-}
-
-#[derive(Clone)]
-pub struct LocalRepositoryState {
-    pub fs: Arc<dyn Fs>,
-    pub backend: Arc<dyn GitRepository>,
-    pub environment: Arc<HashMap<String, String>>,
-}
-
-impl LocalRepositoryState {
-    async fn new(
-        work_directory_abs_path: Arc<Path>,
-        dot_git_abs_path: Arc<Path>,
-        project_environment: WeakEntity<ProjectEnvironment>,
-        fs: Arc<dyn Fs>,
-        cx: &mut AsyncApp,
-    ) -> anyhow::Result<Self> {
-        let environment = project_environment
-                .update(cx, |project_environment, cx| {
-                    project_environment.local_directory_environment(&Shell::System, work_directory_abs_path.clone(), cx)
-                })?
-                .await
-                .unwrap_or_else(|| {
-                    log::error!("failed to get working directory environment for repository {work_directory_abs_path:?}");
-                    HashMap::default()
-                });
-        let search_paths = environment.get("PATH").map(|val| val.to_owned());
-        let backend = cx
-            .background_spawn({
-                let fs = fs.clone();
-                async move {
-                    let system_git_binary_path = search_paths
-                        .and_then(|search_paths| {
-                            which::which_in("git", Some(search_paths), &work_directory_abs_path)
-                                .ok()
-                        })
-                        .or_else(|| which::which("git").ok());
-                    fs.open_repo(&dot_git_abs_path, system_git_binary_path.as_deref())
-                        .with_context(|| format!("opening repository at {dot_git_abs_path:?}"))
-                }
-            })
-            .await?;
-        Ok(LocalRepositoryState {
-            backend,
-            environment: Arc::new(environment),
-            fs,
-        })
-    }
-}
-
-#[derive(Clone)]
-pub struct RemoteRepositoryState {
-    pub project_id: ProjectId,
-    pub client: AnyProtoClient,
-}
-
-#[derive(Clone)]
-pub enum RepositoryState {
-    Local(LocalRepositoryState),
-    Remote(RemoteRepositoryState),
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum RepositoryEvent {
-    StatusesChanged,
-    MergeHeadsChanged,
-    BranchChanged,
-    StashEntriesChanged,
-    PendingOpsChanged { pending_ops: SumTree<PendingOps> },
-}
-
-#[derive(Clone, Debug)]
-pub struct JobsUpdated;
-
-#[derive(Debug)]
-pub enum GitStoreEvent {
-    ActiveRepositoryChanged(Option<RepositoryId>),
-    RepositoryUpdated(RepositoryId, RepositoryEvent, bool),
-    RepositoryAdded,
-    RepositoryRemoved(RepositoryId),
-    IndexWriteError(anyhow::Error),
-    JobsUpdated,
-    ConflictsUpdated,
-}
-
-impl EventEmitter<RepositoryEvent> for Repository {}
-impl EventEmitter<JobsUpdated> for Repository {}
-impl EventEmitter<GitStoreEvent> for GitStore {}
-
-pub struct GitJob {
-    job: Box<dyn FnOnce(RepositoryState, &mut AsyncApp) -> Task<()>>,
-    key: Option<GitJobKey>,
-}
-
-#[derive(PartialEq, Eq)]
-enum GitJobKey {
-    WriteIndex(Vec<RepoPath>),
-    ReloadBufferDiffBases,
-    RefreshStatuses,
-    ReloadGitState,
-}
-
-impl GitStore {
-    pub fn local(
-        worktree_store: &Entity<WorktreeStore>,
-        buffer_store: Entity<BufferStore>,
-        environment: Entity<ProjectEnvironment>,
-        fs: Arc<dyn Fs>,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        Self::new(
-            worktree_store.clone(),
-            buffer_store,
-            GitStoreState::Local {
-                next_repository_id: Arc::new(AtomicU64::new(1)),
-                downstream: None,
-                project_environment: environment,
-                fs,
-            },
-            cx,
-        )
-    }
-
-    pub fn remote(
-        worktree_store: &Entity<WorktreeStore>,
-        buffer_store: Entity<BufferStore>,
-        upstream_client: AnyProtoClient,
-        project_id: u64,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        Self::new(
-            worktree_store.clone(),
-            buffer_store,
-            GitStoreState::Remote {
-                upstream_client,
-                upstream_project_id: project_id,
-                downstream: None,
-            },
-            cx,
-        )
-    }
-
-    fn new(
-        worktree_store: Entity<WorktreeStore>,
-        buffer_store: Entity<BufferStore>,
-        state: GitStoreState,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let _subscriptions = vec![
-            cx.subscribe(&worktree_store, Self::on_worktree_store_event),
-            cx.subscribe(&buffer_store, Self::on_buffer_store_event),
-        ];
-
-        GitStore {
-            state,
-            buffer_store,
-            worktree_store,
-            repositories: HashMap::default(),
-            worktree_ids: HashMap::default(),
-            active_repo_id: None,
-            _subscriptions,
-            loading_diffs: HashMap::default(),
-            shared_diffs: HashMap::default(),
-            diffs: HashMap::default(),
-        }
-    }
-
-    pub fn init(client: &AnyProtoClient) {
-        client.add_entity_request_handler(Self::handle_get_remotes);
-        client.add_entity_request_handler(Self::handle_get_branches);
-        client.add_entity_request_handler(Self::handle_get_default_branch);
-        client.add_entity_request_handler(Self::handle_change_branch);
-        client.add_entity_request_handler(Self::handle_create_branch);
-        client.add_entity_request_handler(Self::handle_rename_branch);
-        client.add_entity_request_handler(Self::handle_create_remote);
-        client.add_entity_request_handler(Self::handle_remove_remote);
-        client.add_entity_request_handler(Self::handle_delete_branch);
-        client.add_entity_request_handler(Self::handle_git_init);
-        client.add_entity_request_handler(Self::handle_push);
-        client.add_entity_request_handler(Self::handle_pull);
-        client.add_entity_request_handler(Self::handle_fetch);
-        client.add_entity_request_handler(Self::handle_stage);
-        client.add_entity_request_handler(Self::handle_unstage);
-        client.add_entity_request_handler(Self::handle_stash);
-        client.add_entity_request_handler(Self::handle_stash_pop);
-        client.add_entity_request_handler(Self::handle_stash_apply);
-        client.add_entity_request_handler(Self::handle_stash_drop);
-        client.add_entity_request_handler(Self::handle_commit);
-        client.add_entity_request_handler(Self::handle_run_hook);
-        client.add_entity_request_handler(Self::handle_reset);
-        client.add_entity_request_handler(Self::handle_show);
-        client.add_entity_request_handler(Self::handle_load_commit_diff);
-        client.add_entity_request_handler(Self::handle_file_history);
-        client.add_entity_request_handler(Self::handle_checkout_files);
-        client.add_entity_request_handler(Self::handle_open_commit_message_buffer);
-        client.add_entity_request_handler(Self::handle_set_index_text);
-        client.add_entity_request_handler(Self::handle_askpass);
-        client.add_entity_request_handler(Self::handle_check_for_pushed_commits);
-        client.add_entity_request_handler(Self::handle_git_diff);
-        client.add_entity_request_handler(Self::handle_tree_diff);
-        client.add_entity_request_handler(Self::handle_get_blob_content);
-        client.add_entity_request_handler(Self::handle_open_unstaged_diff);
-        client.add_entity_request_handler(Self::handle_open_uncommitted_diff);
-        client.add_entity_message_handler(Self::handle_update_diff_bases);
-        client.add_entity_request_handler(Self::handle_get_permalink_to_line);
-        client.add_entity_request_handler(Self::handle_blame_buffer);
-        client.add_entity_message_handler(Self::handle_update_repository);
-        client.add_entity_message_handler(Self::handle_remove_repository);
-        client.add_entity_request_handler(Self::handle_git_clone);
-        client.add_entity_request_handler(Self::handle_get_worktrees);
-        client.add_entity_request_handler(Self::handle_create_worktree);
-    }
-
-    pub fn is_local(&self) -> bool {
-        matches!(self.state, GitStoreState::Local { .. })
-    }
-    pub fn set_active_repo_for_path(&mut self, project_path: &ProjectPath, cx: &mut Context<Self>) {
-        if let Some((repo, _)) = self.repository_and_path_for_project_path(project_path, cx) {
-            let id = repo.read(cx).id;
-            if self.active_repo_id != Some(id) {
-                self.active_repo_id = Some(id);
-                cx.emit(GitStoreEvent::ActiveRepositoryChanged(Some(id)));
-            }
-        }
-    }
-
-    pub fn shared(&mut self, project_id: u64, client: AnyProtoClient, cx: &mut Context<Self>) {
-        match &mut self.state {
-            GitStoreState::Remote {
-                downstream: downstream_client,
-                ..
-            } => {
-                for repo in self.repositories.values() {
-                    let update = repo.read(cx).snapshot.initial_update(project_id);
-                    for update in split_repository_update(update) {
-                        client.send(update).log_err();
-                    }
-                }
-                *downstream_client = Some((client, ProjectId(project_id)));
-            }
-            GitStoreState::Local {
-                downstream: downstream_client,
-                ..
-            } => {
-                let mut snapshots = HashMap::default();
-                let (updates_tx, mut updates_rx) = mpsc::unbounded();
-                for repo in self.repositories.values() {
-                    updates_tx
-                        .unbounded_send(DownstreamUpdate::UpdateRepository(
-                            repo.read(cx).snapshot.clone(),
-                        ))
-                        .ok();
-                }
-                *downstream_client = Some(LocalDownstreamState {
-                    client: client.clone(),
-                    project_id: ProjectId(project_id),
-                    updates_tx,
-                    _task: cx.spawn(async move |this, cx| {
-                        cx.background_spawn(async move {
-                            while let Some(update) = updates_rx.next().await {
-                                match update {
-                                    DownstreamUpdate::UpdateRepository(snapshot) => {
-                                        if let Some(old_snapshot) = snapshots.get_mut(&snapshot.id)
-                                        {
-                                            let update =
-                                                snapshot.build_update(old_snapshot, project_id);
-                                            *old_snapshot = snapshot;
-                                            for update in split_repository_update(update) {
-                                                client.send(update)?;
-                                            }
-                                        } else {
-                                            let update = snapshot.initial_update(project_id);
-                                            for update in split_repository_update(update) {
-                                                client.send(update)?;
-                                            }
-                                            snapshots.insert(snapshot.id, snapshot);
-                                        }
-                                    }
-                                    DownstreamUpdate::RemoveRepository(id) => {
-                                        client.send(proto::RemoveRepository {
-                                            project_id,
-                                            id: id.to_proto(),
-                                        })?;
-                                    }
-                                }
-                            }
-                            anyhow::Ok(())
-                        })
-                        .await
-                        .ok();
-                        this.update(cx, |this, _| {
-                            if let GitStoreState::Local {
-                                downstream: downstream_client,
-                                ..
-                            } = &mut this.state
-                            {
-                                downstream_client.take();
-                            } else {
-                                unreachable!("unshared called on remote store");
-                            }
-                        })
-                    }),
-                });
-            }
-        }
-    }
-
-    pub fn unshared(&mut self, _cx: &mut Context<Self>) {
-        match &mut self.state {
-            GitStoreState::Local {
-                downstream: downstream_client,
-                ..
-            } => {
-                downstream_client.take();
-            }
-            GitStoreState::Remote {
-                downstream: downstream_client,
-                ..
-            } => {
-                downstream_client.take();
-            }
-        }
-        self.shared_diffs.clear();
-    }
-
-    pub(crate) fn forget_shared_diffs_for(&mut self, peer_id: &proto::PeerId) {
-        self.shared_diffs.remove(peer_id);
-    }
-
-    pub fn active_repository(&self) -> Option<Entity<Repository>> {
-        self.active_repo_id
-            .as_ref()
-            .map(|id| self.repositories[id].clone())
-    }
-
-    pub fn open_unstaged_diff(
-        &mut self,
-        buffer: Entity<Buffer>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Entity<BufferDiff>>> {
-        let buffer_id = buffer.read(cx).remote_id();
-        if let Some(diff_state) = self.diffs.get(&buffer_id)
-            && let Some(unstaged_diff) = diff_state
-                .read(cx)
-                .unstaged_diff
-                .as_ref()
-                .and_then(|weak| weak.upgrade())
-        {
-            if let Some(task) =
-                diff_state.update(cx, |diff_state, _| diff_state.wait_for_recalculation())
-            {
-                return cx.background_executor().spawn(async move {
-                    task.await;
-                    Ok(unstaged_diff)
-                });
-            }
-            return Task::ready(Ok(unstaged_diff));
-        }
-
-        let Some((repo, repo_path)) =
-            self.repository_and_path_for_buffer_id(buffer.read(cx).remote_id(), cx)
-        else {
-            return Task::ready(Err(anyhow!("failed to find git repository for buffer")));
-        };
-
-        let task = self
-            .loading_diffs
-            .entry((buffer_id, DiffKind::Unstaged))
-            .or_insert_with(|| {
-                let staged_text = repo.update(cx, |repo, cx| {
-                    repo.load_staged_text(buffer_id, repo_path, cx)
-                });
-                cx.spawn(async move |this, cx| {
-                    Self::open_diff_internal(
-                        this,
-                        DiffKind::Unstaged,
-                        staged_text.await.map(DiffBasesChange::SetIndex),
-                        buffer,
-                        cx,
-                    )
-                    .await
-                    .map_err(Arc::new)
-                })
-                .shared()
-            })
-            .clone();
-
-        cx.background_spawn(async move { task.await.map_err(|e| anyhow!("{e}")) })
-    }
-
-    pub fn open_diff_since(
-        &mut self,
-        oid: Option<git::Oid>,
-        buffer: Entity<Buffer>,
-        repo: Entity<Repository>,
-        languages: Arc<LanguageRegistry>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Entity<BufferDiff>>> {
-        cx.spawn(async move |this, cx| {
-            let buffer_snapshot = buffer.update(cx, |buffer, _| buffer.snapshot())?;
-            let content = match oid {
-                None => None,
-                Some(oid) => Some(
-                    repo.update(cx, |repo, cx| repo.load_blob_content(oid, cx))?
-                        .await?,
-                ),
-            };
-            let buffer_diff = cx.new(|cx| BufferDiff::new(&buffer_snapshot, cx))?;
-
-            buffer_diff
-                .update(cx, |buffer_diff, cx| {
-                    buffer_diff.set_base_text(
-                        content.map(Arc::new),
-                        buffer_snapshot.language().cloned(),
-                        Some(languages.clone()),
-                        buffer_snapshot.text,
-                        cx,
-                    )
-                })?
-                .await?;
-            let unstaged_diff = this
-                .update(cx, |this, cx| this.open_unstaged_diff(buffer.clone(), cx))?
-                .await?;
-            buffer_diff.update(cx, |buffer_diff, _| {
-                buffer_diff.set_secondary_diff(unstaged_diff);
-            })?;
-
-            this.update(cx, |_, cx| {
-                cx.subscribe(&buffer_diff, Self::on_buffer_diff_event)
-                    .detach();
-            })?;
-
-            Ok(buffer_diff)
-        })
-    }
-
-    pub fn open_uncommitted_diff(
-        &mut self,
-        buffer: Entity<Buffer>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Entity<BufferDiff>>> {
-        let buffer_id = buffer.read(cx).remote_id();
-
-        if let Some(diff_state) = self.diffs.get(&buffer_id)
-            && let Some(uncommitted_diff) = diff_state
-                .read(cx)
-                .uncommitted_diff
-                .as_ref()
-                .and_then(|weak| weak.upgrade())
-        {
-            if let Some(task) =
-                diff_state.update(cx, |diff_state, _| diff_state.wait_for_recalculation())
-            {
-                return cx.background_executor().spawn(async move {
-                    task.await;
-                    Ok(uncommitted_diff)
-                });
-            }
-            return Task::ready(Ok(uncommitted_diff));
-        }
-
-        let Some((repo, repo_path)) =
-            self.repository_and_path_for_buffer_id(buffer.read(cx).remote_id(), cx)
-        else {
-            return Task::ready(Err(anyhow!("failed to find git repository for buffer")));
-        };
-
-        let task = self
-            .loading_diffs
-            .entry((buffer_id, DiffKind::Uncommitted))
-            .or_insert_with(|| {
-                let changes = repo.update(cx, |repo, cx| {
-                    repo.load_committed_text(buffer_id, repo_path, cx)
-                });
-
-                // todo(lw): hot foreground spawn
-                cx.spawn(async move |this, cx| {
-                    Self::open_diff_internal(this, DiffKind::Uncommitted, changes.await, buffer, cx)
-                        .await
-                        .map_err(Arc::new)
-                })
-                .shared()
-            })
-            .clone();
-
-        cx.background_spawn(async move { task.await.map_err(|e| anyhow!("{e}")) })
-    }
-
-    async fn open_diff_internal(
-        this: WeakEntity<Self>,
-        kind: DiffKind,
-        texts: Result<DiffBasesChange>,
-        buffer_entity: Entity<Buffer>,
-        cx: &mut AsyncApp,
-    ) -> Result<Entity<BufferDiff>> {
-        let diff_bases_change = match texts {
-            Err(e) => {
-                this.update(cx, |this, cx| {
-                    let buffer = buffer_entity.read(cx);
-                    let buffer_id = buffer.remote_id();
-                    this.loading_diffs.remove(&(buffer_id, kind));
-                })?;
-                return Err(e);
-            }
-            Ok(change) => change,
-        };
-
-        this.update(cx, |this, cx| {
-            let buffer = buffer_entity.read(cx);
-            let buffer_id = buffer.remote_id();
-            let language = buffer.language().cloned();
-            let language_registry = buffer.language_registry();
-            let text_snapshot = buffer.text_snapshot();
-            this.loading_diffs.remove(&(buffer_id, kind));
-
-            let git_store = cx.weak_entity();
-            let diff_state = this
-                .diffs
-                .entry(buffer_id)
-                .or_insert_with(|| cx.new(|_| BufferGitState::new(git_store)));
-
-            let diff = cx.new(|cx| BufferDiff::new(&text_snapshot, cx));
-
-            cx.subscribe(&diff, Self::on_buffer_diff_event).detach();
-            diff_state.update(cx, |diff_state, cx| {
-                diff_state.language = language;
-                diff_state.language_registry = language_registry;
-
-                match kind {
-                    DiffKind::Unstaged => diff_state.unstaged_diff = Some(diff.downgrade()),
-                    DiffKind::Uncommitted => {
-                        let unstaged_diff = if let Some(diff) = diff_state.unstaged_diff() {
-                            diff
-                        } else {
-                            let unstaged_diff = cx.new(|cx| BufferDiff::new(&text_snapshot, cx));
-                            diff_state.unstaged_diff = Some(unstaged_diff.downgrade());
-                            unstaged_diff
-                        };
-
-                        diff.update(cx, |diff, _| diff.set_secondary_diff(unstaged_diff));
-                        diff_state.uncommitted_diff = Some(diff.downgrade())
-                    }
-                }
-
-                diff_state.diff_bases_changed(text_snapshot, Some(diff_bases_change), cx);
-                let rx = diff_state.wait_for_recalculation();
-
-                anyhow::Ok(async move {
-                    if let Some(rx) = rx {
-                        rx.await;
-                    }
-                    Ok(diff)
-                })
-            })
-        })??
-        .await
-    }
-
-    pub fn get_unstaged_diff(&self, buffer_id: BufferId, cx: &App) -> Option<Entity<BufferDiff>> {
-        let diff_state = self.diffs.get(&buffer_id)?;
-        diff_state.read(cx).unstaged_diff.as_ref()?.upgrade()
-    }
-
-    pub fn get_uncommitted_diff(
-        &self,
-        buffer_id: BufferId,
-        cx: &App,
-    ) -> Option<Entity<BufferDiff>> {
-        let diff_state = self.diffs.get(&buffer_id)?;
-        diff_state.read(cx).uncommitted_diff.as_ref()?.upgrade()
-    }
-
-    pub fn open_conflict_set(
-        &mut self,
-        buffer: Entity<Buffer>,
-        cx: &mut Context<Self>,
-    ) -> Entity<ConflictSet> {
-        log::debug!("open conflict set");
-        let buffer_id = buffer.read(cx).remote_id();
-
-        if let Some(git_state) = self.diffs.get(&buffer_id)
-            && let Some(conflict_set) = git_state
-                .read(cx)
-                .conflict_set
-                .as_ref()
-                .and_then(|weak| weak.upgrade())
-        {
-            let conflict_set = conflict_set;
-            let buffer_snapshot = buffer.read(cx).text_snapshot();
-
-            git_state.update(cx, |state, cx| {
-                let _ = state.reparse_conflict_markers(buffer_snapshot, cx);
-            });
-
-            return conflict_set;
-        }
-
-        let is_unmerged = self
-            .repository_and_path_for_buffer_id(buffer_id, cx)
-            .is_some_and(|(repo, path)| repo.read(cx).snapshot.has_conflict(&path));
-        let git_store = cx.weak_entity();
-        let buffer_git_state = self
-            .diffs
-            .entry(buffer_id)
-            .or_insert_with(|| cx.new(|_| BufferGitState::new(git_store)));
-        let conflict_set = cx.new(|cx| ConflictSet::new(buffer_id, is_unmerged, cx));
-
-        self._subscriptions
-            .push(cx.subscribe(&conflict_set, |_, _, _, cx| {
-                cx.emit(GitStoreEvent::ConflictsUpdated);
-            }));
-
-        buffer_git_state.update(cx, |state, cx| {
-            state.conflict_set = Some(conflict_set.downgrade());
-            let buffer_snapshot = buffer.read(cx).text_snapshot();
-            let _ = state.reparse_conflict_markers(buffer_snapshot, cx);
-        });
-
-        conflict_set
-    }
-
-    pub fn project_path_git_status(
-        &self,
-        project_path: &ProjectPath,
-        cx: &App,
-    ) -> Option<FileStatus> {
-        let (repo, repo_path) = self.repository_and_path_for_project_path(project_path, cx)?;
-        Some(repo.read(cx).status_for_path(&repo_path)?.status)
-    }
-
-    pub fn checkpoint(&self, cx: &mut App) -> Task<Result<GitStoreCheckpoint>> {
-        let mut work_directory_abs_paths = Vec::new();
-        let mut checkpoints = Vec::new();
-        for repository in self.repositories.values() {
-            repository.update(cx, |repository, _| {
-                work_directory_abs_paths.push(repository.snapshot.work_directory_abs_path.clone());
-                checkpoints.push(repository.checkpoint().map(|checkpoint| checkpoint?));
-            });
-        }
-
-        cx.background_executor().spawn(async move {
-            let checkpoints = future::try_join_all(checkpoints).await?;
-            Ok(GitStoreCheckpoint {
-                checkpoints_by_work_dir_abs_path: work_directory_abs_paths
-                    .into_iter()
-                    .zip(checkpoints)
-                    .collect(),
-            })
-        })
-    }
-
-    pub fn restore_checkpoint(
-        &self,
-        checkpoint: GitStoreCheckpoint,
-        cx: &mut App,
-    ) -> Task<Result<()>> {
-        let repositories_by_work_dir_abs_path = self
-            .repositories
-            .values()
-            .map(|repo| (repo.read(cx).snapshot.work_directory_abs_path.clone(), repo))
-            .collect::<HashMap<_, _>>();
-
-        let mut tasks = Vec::new();
-        for (work_dir_abs_path, checkpoint) in checkpoint.checkpoints_by_work_dir_abs_path {
-            if let Some(repository) = repositories_by_work_dir_abs_path.get(&work_dir_abs_path) {
-                let restore = repository.update(cx, |repository, _| {
-                    repository.restore_checkpoint(checkpoint)
-                });
-                tasks.push(async move { restore.await? });
-            }
-        }
-        cx.background_spawn(async move {
-            future::try_join_all(tasks).await?;
-            Ok(())
-        })
-    }
-
-    /// Compares two checkpoints, returning true if they are equal.
-    pub fn compare_checkpoints(
-        &self,
-        left: GitStoreCheckpoint,
-        mut right: GitStoreCheckpoint,
-        cx: &mut App,
-    ) -> Task<Result<bool>> {
-        let repositories_by_work_dir_abs_path = self
-            .repositories
-            .values()
-            .map(|repo| (repo.read(cx).snapshot.work_directory_abs_path.clone(), repo))
-            .collect::<HashMap<_, _>>();
-
-        let mut tasks = Vec::new();
-        for (work_dir_abs_path, left_checkpoint) in left.checkpoints_by_work_dir_abs_path {
-            if let Some(right_checkpoint) = right
-                .checkpoints_by_work_dir_abs_path
-                .remove(&work_dir_abs_path)
-            {
-                if let Some(repository) = repositories_by_work_dir_abs_path.get(&work_dir_abs_path)
-                {
-                    let compare = repository.update(cx, |repository, _| {
-                        repository.compare_checkpoints(left_checkpoint, right_checkpoint)
-                    });
-
-                    tasks.push(async move { compare.await? });
-                }
-            } else {
-                return Task::ready(Ok(false));
-            }
-        }
-        cx.background_spawn(async move {
-            Ok(future::try_join_all(tasks)
-                .await?
-                .into_iter()
-                .all(|result| result))
-        })
-    }
-
-    /// Blames a buffer.
-    pub fn blame_buffer(
-        &self,
-        buffer: &Entity<Buffer>,
-        version: Option<clock::Global>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Option<Blame>>> {
-        let buffer = buffer.read(cx);
-        let Some((repo, repo_path)) =
-            self.repository_and_path_for_buffer_id(buffer.remote_id(), cx)
-        else {
-            return Task::ready(Err(anyhow!("failed to find a git repository for buffer")));
-        };
-        let content = match &version {
-            Some(version) => buffer.rope_for_version(version),
-            None => buffer.as_rope().clone(),
-        };
-        let line_ending = buffer.line_ending();
-        let version = version.unwrap_or(buffer.version());
-        let buffer_id = buffer.remote_id();
-
-        let repo = repo.downgrade();
-        cx.spawn(async move |_, cx| {
-            let repository_state = repo
-                .update(cx, |repo, _| repo.repository_state.clone())?
-                .await
-                .map_err(|err| anyhow::anyhow!(err))?;
-            match repository_state {
-                RepositoryState::Local(LocalRepositoryState { backend, .. }) => backend
-                    .blame(repo_path.clone(), content, line_ending)
-                    .await
-                    .with_context(|| format!("Failed to blame {:?}", repo_path.as_ref()))
-                    .map(Some),
-                RepositoryState::Remote(RemoteRepositoryState { project_id, client }) => {
-                    let response = client
-                        .request(proto::BlameBuffer {
-                            project_id: project_id.to_proto(),
-                            buffer_id: buffer_id.into(),
-                            version: serialize_version(&version),
-                        })
-                        .await?;
-                    Ok(deserialize_blame_buffer_response(response))
-                }
-            }
-        })
-    }
-
-    pub fn file_history(
-        &self,
-        repo: &Entity<Repository>,
-        path: RepoPath,
-        cx: &mut App,
-    ) -> Task<Result<git::repository::FileHistory>> {
-        let rx = repo.update(cx, |repo, _| repo.file_history(path));
-
-        cx.spawn(|_: &mut AsyncApp| async move { rx.await? })
-    }
-
-    pub fn file_history_paginated(
-        &self,
-        repo: &Entity<Repository>,
-        path: RepoPath,
-        skip: usize,
-        limit: Option<usize>,
-        cx: &mut App,
-    ) -> Task<Result<git::repository::FileHistory>> {
-        let rx = repo.update(cx, |repo, _| repo.file_history_paginated(path, skip, limit));
-
-        cx.spawn(|_: &mut AsyncApp| async move { rx.await? })
-    }
-
-    pub fn get_permalink_to_line(
-        &self,
-        buffer: &Entity<Buffer>,
-        selection: Range<u32>,
-        cx: &mut App,
-    ) -> Task<Result<url::Url>> {
-        let Some(file) = File::from_dyn(buffer.read(cx).file()) else {
-            return Task::ready(Err(anyhow!("buffer has no file")));
-        };
-
-        let Some((repo, repo_path)) = self.repository_and_path_for_project_path(
-            &(file.worktree.read(cx).id(), file.path.clone()).into(),
-            cx,
-        ) else {
-            // If we're not in a Git repo, check whether this is a Rust source
-            // file in the Cargo registry (presumably opened with go-to-definition
-            // from a normal Rust file). If so, we can put together a permalink
-            // using crate metadata.
-            if buffer
-                .read(cx)
-                .language()
-                .is_none_or(|lang| lang.name() != "Rust".into())
-            {
-                return Task::ready(Err(anyhow!("no permalink available")));
-            }
-            let file_path = file.worktree.read(cx).absolutize(&file.path);
-            return cx.spawn(async move |cx| {
-                let provider_registry = cx.update(GitHostingProviderRegistry::default_global)?;
-                get_permalink_in_rust_registry_src(provider_registry, file_path, selection)
-                    .context("no permalink available")
-            });
-        };
-
-        let buffer_id = buffer.read(cx).remote_id();
-        let branch = repo.read(cx).branch.clone();
-        let remote = branch
-            .as_ref()
-            .and_then(|b| b.upstream.as_ref())
-            .and_then(|b| b.remote_name())
-            .unwrap_or("origin")
-            .to_string();
-
-        let rx = repo.update(cx, |repo, _| {
-            repo.send_job(None, move |state, cx| async move {
-                match state {
-                    RepositoryState::Local(LocalRepositoryState { backend, .. }) => {
-                        let origin_url = backend
-                            .remote_url(&remote)
-                            .await
-                            .with_context(|| format!("remote \"{remote}\" not found"))?;
-
-                        let sha = backend.head_sha().await.context("reading HEAD SHA")?;
-
-                        let provider_registry =
-                            cx.update(GitHostingProviderRegistry::default_global)?;
-
-                        let (provider, remote) =
-                            parse_git_remote_url(provider_registry, &origin_url)
-                                .context("parsing Git remote URL")?;
-
-                        Ok(provider.build_permalink(
-                            remote,
-                            BuildPermalinkParams::new(&sha, &repo_path, Some(selection)),
-                        ))
-                    }
-                    RepositoryState::Remote(RemoteRepositoryState { project_id, client }) => {
-                        let response = client
-                            .request(proto::GetPermalinkToLine {
-                                project_id: project_id.to_proto(),
-                                buffer_id: buffer_id.into(),
-                                selection: Some(proto::Range {
-                                    start: selection.start as u64,
-                                    end: selection.end as u64,
-                                }),
-                            })
-                            .await?;
-
-                        url::Url::parse(&response.permalink).context("failed to parse permalink")
-                    }
-                }
-            })
-        });
-        cx.spawn(|_: &mut AsyncApp| async move { rx.await? })
-    }
-
-    fn downstream_client(&self) -> Option<(AnyProtoClient, ProjectId)> {
-        match &self.state {
-            GitStoreState::Local {
-                downstream: downstream_client,
-                ..
-            } => downstream_client
-                .as_ref()
-                .map(|state| (state.client.clone(), state.project_id)),
-            GitStoreState::Remote {
-                downstream: downstream_client,
-                ..
-            } => downstream_client.clone(),
-        }
-    }
-
-    fn upstream_client(&self) -> Option<AnyProtoClient> {
-        match &self.state {
-            GitStoreState::Local { .. } => None,
-            GitStoreState::Remote {
-                upstream_client, ..
-            } => Some(upstream_client.clone()),
-        }
-    }
-
-    fn on_worktree_store_event(
-        &mut self,
-        worktree_store: Entity<WorktreeStore>,
-        event: &WorktreeStoreEvent,
-        cx: &mut Context<Self>,
-    ) {
-        let GitStoreState::Local {
-            project_environment,
-            downstream,
-            next_repository_id,
-            fs,
-        } = &self.state
-        else {
-            return;
-        };
-
-        match event {
-            WorktreeStoreEvent::WorktreeUpdatedEntries(worktree_id, updated_entries) => {
-                if let Some(worktree) = self
-                    .worktree_store
-                    .read(cx)
-                    .worktree_for_id(*worktree_id, cx)
-                {
-                    let paths_by_git_repo =
-                        self.process_updated_entries(&worktree, updated_entries, cx);
-                    let downstream = downstream
-                        .as_ref()
-                        .map(|downstream| downstream.updates_tx.clone());
-                    cx.spawn(async move |_, cx| {
-                        let paths_by_git_repo = paths_by_git_repo.await;
-                        for (repo, paths) in paths_by_git_repo {
-                            repo.update(cx, |repo, cx| {
-                                repo.paths_changed(paths, downstream.clone(), cx);
-                            })
-                            .ok();
-                        }
-                    })
-                    .detach();
-                }
-            }
-            WorktreeStoreEvent::WorktreeUpdatedGitRepositories(worktree_id, changed_repos) => {
-                let Some(worktree) = worktree_store.read(cx).worktree_for_id(*worktree_id, cx)
-                else {
-                    return;
-                };
-                if !worktree.read(cx).is_visible() {
-                    log::debug!(
-                        "not adding repositories for local worktree {:?} because it's not visible",
-                        worktree.read(cx).abs_path()
-                    );
-                    return;
-                }
-                self.update_repositories_from_worktree(
-                    *worktree_id,
-                    project_environment.clone(),
-                    next_repository_id.clone(),
-                    downstream
-                        .as_ref()
-                        .map(|downstream| downstream.updates_tx.clone()),
-                    changed_repos.clone(),
-                    fs.clone(),
-                    cx,
-                );
-                self.local_worktree_git_repos_changed(worktree, changed_repos, cx);
-            }
-            WorktreeStoreEvent::WorktreeRemoved(_entity_id, worktree_id) => {
-                let repos_without_worktree: Vec<RepositoryId> = self
-                    .worktree_ids
-                    .iter_mut()
-                    .filter_map(|(repo_id, worktree_ids)| {
-                        worktree_ids.remove(worktree_id);
-                        if worktree_ids.is_empty() {
-                            Some(*repo_id)
-                        } else {
-                            None
-                        }
-                    })
-                    .collect();
-                let is_active_repo_removed = repos_without_worktree
-                    .iter()
-                    .any(|repo_id| self.active_repo_id == Some(*repo_id));
-
-                for repo_id in repos_without_worktree {
-                    self.repositories.remove(&repo_id);
-                    self.worktree_ids.remove(&repo_id);
-                    if let Some(updates_tx) =
-                        downstream.as_ref().map(|downstream| &downstream.updates_tx)
-                    {
-                        updates_tx
-                            .unbounded_send(DownstreamUpdate::RemoveRepository(repo_id))
-                            .ok();
-                    }
-                }
-
-                if is_active_repo_removed {
-                    if let Some((&repo_id, _)) = self.repositories.iter().next() {
-                        self.active_repo_id = Some(repo_id);
-                        cx.emit(GitStoreEvent::ActiveRepositoryChanged(Some(repo_id)));
-                    } else {
-                        self.active_repo_id = None;
-                        cx.emit(GitStoreEvent::ActiveRepositoryChanged(None));
-                    }
-                }
-            }
-            _ => {}
-        }
-    }
-    fn on_repository_event(
-        &mut self,
-        repo: Entity<Repository>,
-        event: &RepositoryEvent,
-        cx: &mut Context<Self>,
-    ) {
-        let id = repo.read(cx).id;
-        let repo_snapshot = repo.read(cx).snapshot.clone();
-        for (buffer_id, diff) in self.diffs.iter() {
-            if let Some((buffer_repo, repo_path)) =
-                self.repository_and_path_for_buffer_id(*buffer_id, cx)
-                && buffer_repo == repo
-            {
-                diff.update(cx, |diff, cx| {
-                    if let Some(conflict_set) = &diff.conflict_set {
-                        let conflict_status_changed =
-                            conflict_set.update(cx, |conflict_set, cx| {
-                                let has_conflict = repo_snapshot.has_conflict(&repo_path);
-                                conflict_set.set_has_conflict(has_conflict, cx)
-                            })?;
-                        if conflict_status_changed {
-                            let buffer_store = self.buffer_store.read(cx);
-                            if let Some(buffer) = buffer_store.get(*buffer_id) {
-                                let _ = diff
-                                    .reparse_conflict_markers(buffer.read(cx).text_snapshot(), cx);
-                            }
-                        }
-                    }
-                    anyhow::Ok(())
-                })
-                .ok();
-            }
-        }
-        cx.emit(GitStoreEvent::RepositoryUpdated(
-            id,
-            event.clone(),
-            self.active_repo_id == Some(id),
-        ))
-    }
-
-    fn on_jobs_updated(&mut self, _: Entity<Repository>, _: &JobsUpdated, cx: &mut Context<Self>) {
-        cx.emit(GitStoreEvent::JobsUpdated)
-    }
-
-    /// Update our list of repositories and schedule git scans in response to a notification from a worktree,
-    fn update_repositories_from_worktree(
-        &mut self,
-        worktree_id: WorktreeId,
-        project_environment: Entity<ProjectEnvironment>,
-        next_repository_id: Arc<AtomicU64>,
-        updates_tx: Option<mpsc::UnboundedSender<DownstreamUpdate>>,
-        updated_git_repositories: UpdatedGitRepositoriesSet,
-        fs: Arc<dyn Fs>,
-        cx: &mut Context<Self>,
-    ) {
-        let mut removed_ids = Vec::new();
-        for update in updated_git_repositories.iter() {
-            if let Some((id, existing)) = self.repositories.iter().find(|(_, repo)| {
-                let existing_work_directory_abs_path =
-                    repo.read(cx).work_directory_abs_path.clone();
-                Some(&existing_work_directory_abs_path)
-                    == update.old_work_directory_abs_path.as_ref()
-                    || Some(&existing_work_directory_abs_path)
-                        == update.new_work_directory_abs_path.as_ref()
-            }) {
-                let repo_id = *id;
-                if let Some(new_work_directory_abs_path) =
-                    update.new_work_directory_abs_path.clone()
-                {
-                    self.worktree_ids
-                        .entry(repo_id)
-                        .or_insert_with(HashSet::new)
-                        .insert(worktree_id);
-                    existing.update(cx, |existing, cx| {
-                        existing.snapshot.work_directory_abs_path = new_work_directory_abs_path;
-                        existing.schedule_scan(updates_tx.clone(), cx);
-                    });
-                } else {
-                    if let Some(worktree_ids) = self.worktree_ids.get_mut(&repo_id) {
-                        worktree_ids.remove(&worktree_id);
-                        if worktree_ids.is_empty() {
-                            removed_ids.push(repo_id);
-                        }
-                    }
-                }
-            } else if let UpdatedGitRepository {
-                new_work_directory_abs_path: Some(work_directory_abs_path),
-                dot_git_abs_path: Some(dot_git_abs_path),
-                repository_dir_abs_path: Some(_repository_dir_abs_path),
-                common_dir_abs_path: Some(_common_dir_abs_path),
-                ..
-            } = update
-            {
-                let id = RepositoryId(next_repository_id.fetch_add(1, atomic::Ordering::Release));
-                let git_store = cx.weak_entity();
-                let repo = cx.new(|cx| {
-                    let mut repo = Repository::local(
-                        id,
-                        work_directory_abs_path.clone(),
-                        dot_git_abs_path.clone(),
-                        project_environment.downgrade(),
-                        fs.clone(),
-                        git_store,
-                        cx,
-                    );
-                    if let Some(updates_tx) = updates_tx.as_ref() {
-                        // trigger an empty `UpdateRepository` to ensure remote active_repo_id is set correctly
-                        updates_tx
-                            .unbounded_send(DownstreamUpdate::UpdateRepository(repo.snapshot()))
-                            .ok();
-                    }
-                    repo.schedule_scan(updates_tx.clone(), cx);
-                    repo
-                });
-                self._subscriptions
-                    .push(cx.subscribe(&repo, Self::on_repository_event));
-                self._subscriptions
-                    .push(cx.subscribe(&repo, Self::on_jobs_updated));
-                self.repositories.insert(id, repo);
-                self.worktree_ids.insert(id, HashSet::from([worktree_id]));
-                cx.emit(GitStoreEvent::RepositoryAdded);
-                self.active_repo_id.get_or_insert_with(|| {
-                    cx.emit(GitStoreEvent::ActiveRepositoryChanged(Some(id)));
-                    id
-                });
-            }
-        }
-
-        for id in removed_ids {
-            if self.active_repo_id == Some(id) {
-                self.active_repo_id = None;
-                cx.emit(GitStoreEvent::ActiveRepositoryChanged(None));
-            }
-            self.repositories.remove(&id);
-            if let Some(updates_tx) = updates_tx.as_ref() {
-                updates_tx
-                    .unbounded_send(DownstreamUpdate::RemoveRepository(id))
-                    .ok();
-            }
-        }
-    }
-
-    fn on_buffer_store_event(
-        &mut self,
-        _: Entity<BufferStore>,
-        event: &BufferStoreEvent,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            BufferStoreEvent::BufferAdded(buffer) => {
-                cx.subscribe(buffer, |this, buffer, event, cx| {
-                    if let BufferEvent::LanguageChanged(_) = event {
-                        let buffer_id = buffer.read(cx).remote_id();
-                        if let Some(diff_state) = this.diffs.get(&buffer_id) {
-                            diff_state.update(cx, |diff_state, cx| {
-                                diff_state.buffer_language_changed(buffer, cx);
-                            });
-                        }
-                    }
-                })
-                .detach();
-            }
-            BufferStoreEvent::SharedBufferClosed(peer_id, buffer_id) => {
-                if let Some(diffs) = self.shared_diffs.get_mut(peer_id) {
-                    diffs.remove(buffer_id);
-                }
-            }
-            BufferStoreEvent::BufferDropped(buffer_id) => {
-                self.diffs.remove(buffer_id);
-                for diffs in self.shared_diffs.values_mut() {
-                    diffs.remove(buffer_id);
-                }
-            }
-            BufferStoreEvent::BufferChangedFilePath { buffer, .. } => {
-                // Whenever a buffer's file path changes, it's possible that the
-                // new path is actually a path that is being tracked by a git
-                // repository. In that case, we'll want to update the buffer's
-                // `BufferDiffState`, in case it already has one.
-                let buffer_id = buffer.read(cx).remote_id();
-                let diff_state = self.diffs.get(&buffer_id);
-                let repo = self.repository_and_path_for_buffer_id(buffer_id, cx);
-
-                if let Some(diff_state) = diff_state
-                    && let Some((repo, repo_path)) = repo
-                {
-                    let buffer = buffer.clone();
-                    let diff_state = diff_state.clone();
-
-                    cx.spawn(async move |_git_store, cx| {
-                        async {
-                            let diff_bases_change = repo
-                                .update(cx, |repo, cx| {
-                                    repo.load_committed_text(buffer_id, repo_path, cx)
-                                })?
-                                .await?;
-
-                            diff_state.update(cx, |diff_state, cx| {
-                                let buffer_snapshot = buffer.read(cx).text_snapshot();
-                                diff_state.diff_bases_changed(
-                                    buffer_snapshot,
-                                    Some(diff_bases_change),
-                                    cx,
-                                );
-                            })
-                        }
-                        .await
-                        .log_err();
-                    })
-                    .detach();
-                }
-            }
-            _ => {}
-        }
-    }
-
-    pub fn recalculate_buffer_diffs(
-        &mut self,
-        buffers: Vec<Entity<Buffer>>,
-        cx: &mut Context<Self>,
-    ) -> impl Future<Output = ()> + use<> {
-        let mut futures = Vec::new();
-        for buffer in buffers {
-            if let Some(diff_state) = self.diffs.get_mut(&buffer.read(cx).remote_id()) {
-                let buffer = buffer.read(cx).text_snapshot();
-                diff_state.update(cx, |diff_state, cx| {
-                    diff_state.recalculate_diffs(buffer.clone(), cx);
-                    futures.extend(diff_state.wait_for_recalculation().map(FutureExt::boxed));
-                });
-                futures.push(diff_state.update(cx, |diff_state, cx| {
-                    diff_state
-                        .reparse_conflict_markers(buffer, cx)
-                        .map(|_| {})
-                        .boxed()
-                }));
-            }
-        }
-        async move {
-            futures::future::join_all(futures).await;
-        }
-    }
-
-    fn on_buffer_diff_event(
-        &mut self,
-        diff: Entity<buffer_diff::BufferDiff>,
-        event: &BufferDiffEvent,
-        cx: &mut Context<Self>,
-    ) {
-        if let BufferDiffEvent::HunksStagedOrUnstaged(new_index_text) = event {
-            let buffer_id = diff.read(cx).buffer_id;
-            if let Some(diff_state) = self.diffs.get(&buffer_id) {
-                let hunk_staging_operation_count = diff_state.update(cx, |diff_state, _| {
-                    diff_state.hunk_staging_operation_count += 1;
-                    diff_state.hunk_staging_operation_count
-                });
-                if let Some((repo, path)) = self.repository_and_path_for_buffer_id(buffer_id, cx) {
-                    let recv = repo.update(cx, |repo, cx| {
-                        log::debug!("hunks changed for {}", path.as_unix_str());
-                        repo.spawn_set_index_text_job(
-                            path,
-                            new_index_text.as_ref().map(|rope| rope.to_string()),
-                            Some(hunk_staging_operation_count),
-                            cx,
-                        )
-                    });
-                    let diff = diff.downgrade();
-                    cx.spawn(async move |this, cx| {
-                        if let Ok(Err(error)) = cx.background_spawn(recv).await {
-                            diff.update(cx, |diff, cx| {
-                                diff.clear_pending_hunks(cx);
-                            })
-                            .ok();
-                            this.update(cx, |_, cx| cx.emit(GitStoreEvent::IndexWriteError(error)))
-                                .ok();
-                        }
-                    })
-                    .detach();
-                }
-            }
-        }
-    }
-
-    fn local_worktree_git_repos_changed(
-        &mut self,
-        worktree: Entity<Worktree>,
-        changed_repos: &UpdatedGitRepositoriesSet,
-        cx: &mut Context<Self>,
-    ) {
-        log::debug!("local worktree repos changed");
-        debug_assert!(worktree.read(cx).is_local());
-
-        for repository in self.repositories.values() {
-            repository.update(cx, |repository, cx| {
-                let repo_abs_path = &repository.work_directory_abs_path;
-                if changed_repos.iter().any(|update| {
-                    update.old_work_directory_abs_path.as_ref() == Some(repo_abs_path)
-                        || update.new_work_directory_abs_path.as_ref() == Some(repo_abs_path)
-                }) {
-                    repository.reload_buffer_diff_bases(cx);
-                }
-            });
-        }
-    }
-
-    pub fn repositories(&self) -> &HashMap<RepositoryId, Entity<Repository>> {
-        &self.repositories
-    }
-
-    pub fn status_for_buffer_id(&self, buffer_id: BufferId, cx: &App) -> Option<FileStatus> {
-        let (repo, path) = self.repository_and_path_for_buffer_id(buffer_id, cx)?;
-        let status = repo.read(cx).snapshot.status_for_path(&path)?;
-        Some(status.status)
-    }
-
-    pub fn repository_and_path_for_buffer_id(
-        &self,
-        buffer_id: BufferId,
-        cx: &App,
-    ) -> Option<(Entity<Repository>, RepoPath)> {
-        let buffer = self.buffer_store.read(cx).get(buffer_id)?;
-        let project_path = buffer.read(cx).project_path(cx)?;
-        self.repository_and_path_for_project_path(&project_path, cx)
-    }
-
-    pub fn repository_and_path_for_project_path(
-        &self,
-        path: &ProjectPath,
-        cx: &App,
-    ) -> Option<(Entity<Repository>, RepoPath)> {
-        let abs_path = self.worktree_store.read(cx).absolutize(path, cx)?;
-        self.repositories
-            .values()
-            .filter_map(|repo| {
-                let repo_path = repo.read(cx).abs_path_to_repo_path(&abs_path)?;
-                Some((repo.clone(), repo_path))
-            })
-            .max_by_key(|(repo, _)| repo.read(cx).work_directory_abs_path.clone())
-    }
-
-    pub fn git_init(
-        &self,
-        path: Arc<Path>,
-        fallback_branch_name: String,
-        cx: &App,
-    ) -> Task<Result<()>> {
-        match &self.state {
-            GitStoreState::Local { fs, .. } => {
-                let fs = fs.clone();
-                cx.background_executor()
-                    .spawn(async move { fs.git_init(&path, fallback_branch_name).await })
-            }
-            GitStoreState::Remote {
-                upstream_client,
-                upstream_project_id: project_id,
-                ..
-            } => {
-                let client = upstream_client.clone();
-                let project_id = *project_id;
-                cx.background_executor().spawn(async move {
-                    client
-                        .request(proto::GitInit {
-                            project_id: project_id,
-                            abs_path: path.to_string_lossy().into_owned(),
-                            fallback_branch_name,
-                        })
-                        .await?;
-                    Ok(())
-                })
-            }
-        }
-    }
-
-    pub fn git_clone(
-        &self,
-        repo: String,
-        path: impl Into<Arc<std::path::Path>>,
-        cx: &App,
-    ) -> Task<Result<()>> {
-        let path = path.into();
-        match &self.state {
-            GitStoreState::Local { fs, .. } => {
-                let fs = fs.clone();
-                cx.background_executor()
-                    .spawn(async move { fs.git_clone(&repo, &path).await })
-            }
-            GitStoreState::Remote {
-                upstream_client,
-                upstream_project_id,
-                ..
-            } => {
-                if upstream_client.is_via_collab() {
-                    return Task::ready(Err(anyhow!(
-                        "Git Clone isn't supported for project guests"
-                    )));
-                }
-                let request = upstream_client.request(proto::GitClone {
-                    project_id: *upstream_project_id,
-                    abs_path: path.to_string_lossy().into_owned(),
-                    remote_repo: repo,
-                });
-
-                cx.background_spawn(async move {
-                    let result = request.await?;
-
-                    match result.success {
-                        true => Ok(()),
-                        false => Err(anyhow!("Git Clone failed")),
-                    }
-                })
-            }
-        }
-    }
-
-    async fn handle_update_repository(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::UpdateRepository>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        this.update(&mut cx, |this, cx| {
-            let path_style = this.worktree_store.read(cx).path_style();
-            let mut update = envelope.payload;
-
-            let id = RepositoryId::from_proto(update.id);
-            let client = this.upstream_client().context("no upstream client")?;
-
-            let mut repo_subscription = None;
-            let repo = this.repositories.entry(id).or_insert_with(|| {
-                let git_store = cx.weak_entity();
-                let repo = cx.new(|cx| {
-                    Repository::remote(
-                        id,
-                        Path::new(&update.abs_path).into(),
-                        path_style,
-                        ProjectId(update.project_id),
-                        client,
-                        git_store,
-                        cx,
-                    )
-                });
-                repo_subscription = Some(cx.subscribe(&repo, Self::on_repository_event));
-                cx.emit(GitStoreEvent::RepositoryAdded);
-                repo
-            });
-            this._subscriptions.extend(repo_subscription);
-
-            repo.update(cx, {
-                let update = update.clone();
-                |repo, cx| repo.apply_remote_update(update, cx)
-            })?;
-
-            this.active_repo_id.get_or_insert_with(|| {
-                cx.emit(GitStoreEvent::ActiveRepositoryChanged(Some(id)));
-                id
-            });
-
-            if let Some((client, project_id)) = this.downstream_client() {
-                update.project_id = project_id.to_proto();
-                client.send(update).log_err();
-            }
-            Ok(())
-        })?
-    }
-
-    async fn handle_remove_repository(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::RemoveRepository>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        this.update(&mut cx, |this, cx| {
-            let mut update = envelope.payload;
-            let id = RepositoryId::from_proto(update.id);
-            this.repositories.remove(&id);
-            if let Some((client, project_id)) = this.downstream_client() {
-                update.project_id = project_id.to_proto();
-                client.send(update).log_err();
-            }
-            if this.active_repo_id == Some(id) {
-                this.active_repo_id = None;
-                cx.emit(GitStoreEvent::ActiveRepositoryChanged(None));
-            }
-            cx.emit(GitStoreEvent::RepositoryRemoved(id));
-        })
-    }
-
-    async fn handle_git_init(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::GitInit>,
-        cx: AsyncApp,
-    ) -> Result<proto::Ack> {
-        let path: Arc<Path> = PathBuf::from(envelope.payload.abs_path).into();
-        let name = envelope.payload.fallback_branch_name;
-        cx.update(|cx| this.read(cx).git_init(path, name, cx))?
-            .await?;
-
-        Ok(proto::Ack {})
-    }
-
-    async fn handle_git_clone(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::GitClone>,
-        cx: AsyncApp,
-    ) -> Result<proto::GitCloneResponse> {
-        let path: Arc<Path> = PathBuf::from(envelope.payload.abs_path).into();
-        let repo_name = envelope.payload.remote_repo;
-        let result = cx
-            .update(|cx| this.read(cx).git_clone(repo_name, path, cx))?
-            .await;
-
-        Ok(proto::GitCloneResponse {
-            success: result.is_ok(),
-        })
-    }
-
-    async fn handle_fetch(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::Fetch>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::RemoteMessageResponse> {
-        let repository_id = RepositoryId::from_proto(envelope.payload.repository_id);
-        let repository_handle = Self::repository_for_request(&this, repository_id, &mut cx)?;
-        let fetch_options = FetchOptions::from_proto(envelope.payload.remote);
-        let askpass_id = envelope.payload.askpass_id;
-
-        let askpass = make_remote_delegate(
-            this,
-            envelope.payload.project_id,
-            repository_id,
-            askpass_id,
-            &mut cx,
-        );
-
-        let remote_output = repository_handle
-            .update(&mut cx, |repository_handle, cx| {
-                repository_handle.fetch(fetch_options, askpass, cx)
-            })?
-            .await??;
-
-        Ok(proto::RemoteMessageResponse {
-            stdout: remote_output.stdout,
-            stderr: remote_output.stderr,
-        })
-    }
-
-    async fn handle_push(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::Push>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::RemoteMessageResponse> {
-        let repository_id = RepositoryId::from_proto(envelope.payload.repository_id);
-        let repository_handle = Self::repository_for_request(&this, repository_id, &mut cx)?;
-
-        let askpass_id = envelope.payload.askpass_id;
-        let askpass = make_remote_delegate(
-            this,
-            envelope.payload.project_id,
-            repository_id,
-            askpass_id,
-            &mut cx,
-        );
-
-        let options = envelope
-            .payload
-            .options
-            .as_ref()
-            .map(|_| match envelope.payload.options() {
-                proto::push::PushOptions::SetUpstream => git::repository::PushOptions::SetUpstream,
-                proto::push::PushOptions::Force => git::repository::PushOptions::Force,
-            });
-
-        let branch_name = envelope.payload.branch_name.into();
-        let remote_name = envelope.payload.remote_name.into();
-
-        let remote_output = repository_handle
-            .update(&mut cx, |repository_handle, cx| {
-                repository_handle.push(branch_name, remote_name, options, askpass, cx)
-            })?
-            .await??;
-        Ok(proto::RemoteMessageResponse {
-            stdout: remote_output.stdout,
-            stderr: remote_output.stderr,
-        })
-    }
-
-    async fn handle_pull(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::Pull>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::RemoteMessageResponse> {
-        let repository_id = RepositoryId::from_proto(envelope.payload.repository_id);
-        let repository_handle = Self::repository_for_request(&this, repository_id, &mut cx)?;
-        let askpass_id = envelope.payload.askpass_id;
-        let askpass = make_remote_delegate(
-            this,
-            envelope.payload.project_id,
-            repository_id,
-            askpass_id,
-            &mut cx,
-        );
-
-        let branch_name = envelope.payload.branch_name.map(|name| name.into());
-        let remote_name = envelope.payload.remote_name.into();
-        let rebase = envelope.payload.rebase;
-
-        let remote_message = repository_handle
-            .update(&mut cx, |repository_handle, cx| {
-                repository_handle.pull(branch_name, remote_name, rebase, askpass, cx)
-            })?
-            .await??;
-
-        Ok(proto::RemoteMessageResponse {
-            stdout: remote_message.stdout,
-            stderr: remote_message.stderr,
-        })
-    }
-
-    async fn handle_stage(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::Stage>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::Ack> {
-        let repository_id = RepositoryId::from_proto(envelope.payload.repository_id);
-        let repository_handle = Self::repository_for_request(&this, repository_id, &mut cx)?;
-
-        let entries = envelope
-            .payload
-            .paths
-            .into_iter()
-            .map(|path| RepoPath::new(&path))
-            .collect::<Result<Vec<_>>>()?;
-
-        repository_handle
-            .update(&mut cx, |repository_handle, cx| {
-                repository_handle.stage_entries(entries, cx)
-            })?
-            .await?;
-        Ok(proto::Ack {})
-    }
-
-    async fn handle_unstage(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::Unstage>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::Ack> {
-        let repository_id = RepositoryId::from_proto(envelope.payload.repository_id);
-        let repository_handle = Self::repository_for_request(&this, repository_id, &mut cx)?;
-
-        let entries = envelope
-            .payload
-            .paths
-            .into_iter()
-            .map(|path| RepoPath::new(&path))
-            .collect::<Result<Vec<_>>>()?;
-
-        repository_handle
-            .update(&mut cx, |repository_handle, cx| {
-                repository_handle.unstage_entries(entries, cx)
-            })?
-            .await?;
-
-        Ok(proto::Ack {})
-    }
-
-    async fn handle_stash(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::Stash>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::Ack> {
-        let repository_id = RepositoryId::from_proto(envelope.payload.repository_id);
-        let repository_handle = Self::repository_for_request(&this, repository_id, &mut cx)?;
-
-        let entries = envelope
-            .payload
-            .paths
-            .into_iter()
-            .map(|path| RepoPath::new(&path))
-            .collect::<Result<Vec<_>>>()?;
-
-        repository_handle
-            .update(&mut cx, |repository_handle, cx| {
-                repository_handle.stash_entries(entries, cx)
-            })?
-            .await?;
-
-        Ok(proto::Ack {})
-    }
-
-    async fn handle_stash_pop(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::StashPop>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::Ack> {
-        let repository_id = RepositoryId::from_proto(envelope.payload.repository_id);
-        let repository_handle = Self::repository_for_request(&this, repository_id, &mut cx)?;
-        let stash_index = envelope.payload.stash_index.map(|i| i as usize);
-
-        repository_handle
-            .update(&mut cx, |repository_handle, cx| {
-                repository_handle.stash_pop(stash_index, cx)
-            })?
-            .await?;
-
-        Ok(proto::Ack {})
-    }
-
-    async fn handle_stash_apply(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::StashApply>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::Ack> {
-        let repository_id = RepositoryId::from_proto(envelope.payload.repository_id);
-        let repository_handle = Self::repository_for_request(&this, repository_id, &mut cx)?;
-        let stash_index = envelope.payload.stash_index.map(|i| i as usize);
-
-        repository_handle
-            .update(&mut cx, |repository_handle, cx| {
-                repository_handle.stash_apply(stash_index, cx)
-            })?
-            .await?;
-
-        Ok(proto::Ack {})
-    }
-
-    async fn handle_stash_drop(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::StashDrop>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::Ack> {
-        let repository_id = RepositoryId::from_proto(envelope.payload.repository_id);
-        let repository_handle = Self::repository_for_request(&this, repository_id, &mut cx)?;
-        let stash_index = envelope.payload.stash_index.map(|i| i as usize);
-
-        repository_handle
-            .update(&mut cx, |repository_handle, cx| {
-                repository_handle.stash_drop(stash_index, cx)
-            })?
-            .await??;
-
-        Ok(proto::Ack {})
-    }
-
-    async fn handle_set_index_text(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::SetIndexText>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::Ack> {
-        let repository_id = RepositoryId::from_proto(envelope.payload.repository_id);
-        let repository_handle = Self::repository_for_request(&this, repository_id, &mut cx)?;
-        let repo_path = RepoPath::from_proto(&envelope.payload.path)?;
-
-        repository_handle
-            .update(&mut cx, |repository_handle, cx| {
-                repository_handle.spawn_set_index_text_job(
-                    repo_path,
-                    envelope.payload.text,
-                    None,
-                    cx,
-                )
-            })?
-            .await??;
-        Ok(proto::Ack {})
-    }
-
-    async fn handle_run_hook(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::RunGitHook>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::Ack> {
-        let repository_id = RepositoryId::from_proto(envelope.payload.repository_id);
-        let repository_handle = Self::repository_for_request(&this, repository_id, &mut cx)?;
-        let hook = RunHook::from_proto(envelope.payload.hook).context("invalid hook")?;
-        repository_handle
-            .update(&mut cx, |repository_handle, cx| {
-                repository_handle.run_hook(hook, cx)
-            })?
-            .await??;
-        Ok(proto::Ack {})
-    }
-
-    async fn handle_commit(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::Commit>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::Ack> {
-        let repository_id = RepositoryId::from_proto(envelope.payload.repository_id);
-        let repository_handle = Self::repository_for_request(&this, repository_id, &mut cx)?;
-        let askpass_id = envelope.payload.askpass_id;
-
-        let askpass = make_remote_delegate(
-            this,
-            envelope.payload.project_id,
-            repository_id,
-            askpass_id,
-            &mut cx,
-        );
-
-        let message = SharedString::from(envelope.payload.message);
-        let name = envelope.payload.name.map(SharedString::from);
-        let email = envelope.payload.email.map(SharedString::from);
-        let options = envelope.payload.options.unwrap_or_default();
-
-        repository_handle
-            .update(&mut cx, |repository_handle, cx| {
-                repository_handle.commit(
-                    message,
-                    name.zip(email),
-                    CommitOptions {
-                        amend: options.amend,
-                        signoff: options.signoff,
-                    },
-                    askpass,
-                    cx,
-                )
-            })?
-            .await??;
-        Ok(proto::Ack {})
-    }
-
-    async fn handle_get_remotes(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::GetRemotes>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::GetRemotesResponse> {
-        let repository_id = RepositoryId::from_proto(envelope.payload.repository_id);
-        let repository_handle = Self::repository_for_request(&this, repository_id, &mut cx)?;
-
-        let branch_name = envelope.payload.branch_name;
-        let is_push = envelope.payload.is_push;
-
-        let remotes = repository_handle
-            .update(&mut cx, |repository_handle, _| {
-                repository_handle.get_remotes(branch_name, is_push)
-            })?
-            .await??;
-
-        Ok(proto::GetRemotesResponse {
-            remotes: remotes
-                .into_iter()
-                .map(|remotes| proto::get_remotes_response::Remote {
-                    name: remotes.name.to_string(),
-                })
-                .collect::<Vec<_>>(),
-        })
-    }
-
-    async fn handle_get_worktrees(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::GitGetWorktrees>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::GitWorktreesResponse> {
-        let repository_id = RepositoryId::from_proto(envelope.payload.repository_id);
-        let repository_handle = Self::repository_for_request(&this, repository_id, &mut cx)?;
-
-        let worktrees = repository_handle
-            .update(&mut cx, |repository_handle, _| {
-                repository_handle.worktrees()
-            })?
-            .await??;
-
-        Ok(proto::GitWorktreesResponse {
-            worktrees: worktrees
-                .into_iter()
-                .map(|worktree| worktree_to_proto(&worktree))
-                .collect::<Vec<_>>(),
-        })
-    }
-
-    async fn handle_create_worktree(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::GitCreateWorktree>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::Ack> {
-        let repository_id = RepositoryId::from_proto(envelope.payload.repository_id);
-        let repository_handle = Self::repository_for_request(&this, repository_id, &mut cx)?;
-        let directory = PathBuf::from(envelope.payload.directory);
-        let name = envelope.payload.name;
-        let commit = envelope.payload.commit;
-
-        repository_handle
-            .update(&mut cx, |repository_handle, _| {
-                repository_handle.create_worktree(name, directory, commit)
-            })?
-            .await??;
-
-        Ok(proto::Ack {})
-    }
-
-    async fn handle_get_branches(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::GitGetBranches>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::GitBranchesResponse> {
-        let repository_id = RepositoryId::from_proto(envelope.payload.repository_id);
-        let repository_handle = Self::repository_for_request(&this, repository_id, &mut cx)?;
-
-        let branches = repository_handle
-            .update(&mut cx, |repository_handle, _| repository_handle.branches())?
-            .await??;
-
-        Ok(proto::GitBranchesResponse {
-            branches: branches
-                .into_iter()
-                .map(|branch| branch_to_proto(&branch))
-                .collect::<Vec<_>>(),
-        })
-    }
-    async fn handle_get_default_branch(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::GetDefaultBranch>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::GetDefaultBranchResponse> {
-        let repository_id = RepositoryId::from_proto(envelope.payload.repository_id);
-        let repository_handle = Self::repository_for_request(&this, repository_id, &mut cx)?;
-
-        let branch = repository_handle
-            .update(&mut cx, |repository_handle, _| {
-                repository_handle.default_branch()
-            })?
-            .await??
-            .map(Into::into);
-
-        Ok(proto::GetDefaultBranchResponse { branch })
-    }
-    async fn handle_create_branch(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::GitCreateBranch>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::Ack> {
-        let repository_id = RepositoryId::from_proto(envelope.payload.repository_id);
-        let repository_handle = Self::repository_for_request(&this, repository_id, &mut cx)?;
-        let branch_name = envelope.payload.branch_name;
-
-        repository_handle
-            .update(&mut cx, |repository_handle, _| {
-                repository_handle.create_branch(branch_name, None)
-            })?
-            .await??;
-
-        Ok(proto::Ack {})
-    }
-
-    async fn handle_change_branch(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::GitChangeBranch>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::Ack> {
-        let repository_id = RepositoryId::from_proto(envelope.payload.repository_id);
-        let repository_handle = Self::repository_for_request(&this, repository_id, &mut cx)?;
-        let branch_name = envelope.payload.branch_name;
-
-        repository_handle
-            .update(&mut cx, |repository_handle, _| {
-                repository_handle.change_branch(branch_name)
-            })?
-            .await??;
-
-        Ok(proto::Ack {})
-    }
-
-    async fn handle_rename_branch(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::GitRenameBranch>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::Ack> {
-        let repository_id = RepositoryId::from_proto(envelope.payload.repository_id);
-        let repository_handle = Self::repository_for_request(&this, repository_id, &mut cx)?;
-        let branch = envelope.payload.branch;
-        let new_name = envelope.payload.new_name;
-
-        repository_handle
-            .update(&mut cx, |repository_handle, _| {
-                repository_handle.rename_branch(branch, new_name)
-            })?
-            .await??;
-
-        Ok(proto::Ack {})
-    }
-
-    async fn handle_create_remote(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::GitCreateRemote>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::Ack> {
-        let repository_id = RepositoryId::from_proto(envelope.payload.repository_id);
-        let repository_handle = Self::repository_for_request(&this, repository_id, &mut cx)?;
-        let remote_name = envelope.payload.remote_name;
-        let remote_url = envelope.payload.remote_url;
-
-        repository_handle
-            .update(&mut cx, |repository_handle, _| {
-                repository_handle.create_remote(remote_name, remote_url)
-            })?
-            .await??;
-
-        Ok(proto::Ack {})
-    }
-
-    async fn handle_delete_branch(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::GitDeleteBranch>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::Ack> {
-        let repository_id = RepositoryId::from_proto(envelope.payload.repository_id);
-        let repository_handle = Self::repository_for_request(&this, repository_id, &mut cx)?;
-        let branch_name = envelope.payload.branch_name;
-
-        repository_handle
-            .update(&mut cx, |repository_handle, _| {
-                repository_handle.delete_branch(branch_name)
-            })?
-            .await??;
-
-        Ok(proto::Ack {})
-    }
-
-    async fn handle_remove_remote(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::GitRemoveRemote>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::Ack> {
-        let repository_id = RepositoryId::from_proto(envelope.payload.repository_id);
-        let repository_handle = Self::repository_for_request(&this, repository_id, &mut cx)?;
-        let remote_name = envelope.payload.remote_name;
-
-        repository_handle
-            .update(&mut cx, |repository_handle, _| {
-                repository_handle.remove_remote(remote_name)
-            })?
-            .await??;
-
-        Ok(proto::Ack {})
-    }
-
-    async fn handle_show(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::GitShow>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::GitCommitDetails> {
-        let repository_id = RepositoryId::from_proto(envelope.payload.repository_id);
-        let repository_handle = Self::repository_for_request(&this, repository_id, &mut cx)?;
-
-        let commit = repository_handle
-            .update(&mut cx, |repository_handle, _| {
-                repository_handle.show(envelope.payload.commit)
-            })?
-            .await??;
-        Ok(proto::GitCommitDetails {
-            sha: commit.sha.into(),
-            message: commit.message.into(),
-            commit_timestamp: commit.commit_timestamp,
-            author_email: commit.author_email.into(),
-            author_name: commit.author_name.into(),
-        })
-    }
-
-    async fn handle_load_commit_diff(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::LoadCommitDiff>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::LoadCommitDiffResponse> {
-        let repository_id = RepositoryId::from_proto(envelope.payload.repository_id);
-        let repository_handle = Self::repository_for_request(&this, repository_id, &mut cx)?;
-
-        let commit_diff = repository_handle
-            .update(&mut cx, |repository_handle, _| {
-                repository_handle.load_commit_diff(envelope.payload.commit)
-            })?
-            .await??;
-        Ok(proto::LoadCommitDiffResponse {
-            files: commit_diff
-                .files
-                .into_iter()
-                .map(|file| proto::CommitFile {
-                    path: file.path.to_proto(),
-                    old_text: file.old_text,
-                    new_text: file.new_text,
-                })
-                .collect(),
-        })
-    }
-
-    async fn handle_file_history(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::GitFileHistory>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::GitFileHistoryResponse> {
-        let repository_id = RepositoryId::from_proto(envelope.payload.repository_id);
-        let repository_handle = Self::repository_for_request(&this, repository_id, &mut cx)?;
-        let path = RepoPath::from_proto(&envelope.payload.path)?;
-        let skip = envelope.payload.skip as usize;
-        let limit = envelope.payload.limit.map(|l| l as usize);
-
-        let file_history = repository_handle
-            .update(&mut cx, |repository_handle, _| {
-                repository_handle.file_history_paginated(path, skip, limit)
-            })?
-            .await??;
-
-        Ok(proto::GitFileHistoryResponse {
-            entries: file_history
-                .entries
-                .into_iter()
-                .map(|entry| proto::FileHistoryEntry {
-                    sha: entry.sha.to_string(),
-                    subject: entry.subject.to_string(),
-                    message: entry.message.to_string(),
-                    commit_timestamp: entry.commit_timestamp,
-                    author_name: entry.author_name.to_string(),
-                    author_email: entry.author_email.to_string(),
-                })
-                .collect(),
-            path: file_history.path.to_proto(),
-        })
-    }
-
-    async fn handle_reset(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::GitReset>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::Ack> {
-        let repository_id = RepositoryId::from_proto(envelope.payload.repository_id);
-        let repository_handle = Self::repository_for_request(&this, repository_id, &mut cx)?;
-
-        let mode = match envelope.payload.mode() {
-            git_reset::ResetMode::Soft => ResetMode::Soft,
-            git_reset::ResetMode::Mixed => ResetMode::Mixed,
-        };
-
-        repository_handle
-            .update(&mut cx, |repository_handle, cx| {
-                repository_handle.reset(envelope.payload.commit, mode, cx)
-            })?
-            .await??;
-        Ok(proto::Ack {})
-    }
-
-    async fn handle_checkout_files(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::GitCheckoutFiles>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::Ack> {
-        let repository_id = RepositoryId::from_proto(envelope.payload.repository_id);
-        let repository_handle = Self::repository_for_request(&this, repository_id, &mut cx)?;
-        let paths = envelope
-            .payload
-            .paths
-            .iter()
-            .map(|s| RepoPath::from_proto(s))
-            .collect::<Result<Vec<_>>>()?;
-
-        repository_handle
-            .update(&mut cx, |repository_handle, cx| {
-                repository_handle.checkout_files(&envelope.payload.commit, paths, cx)
-            })?
-            .await?;
-        Ok(proto::Ack {})
-    }
-
-    async fn handle_open_commit_message_buffer(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::OpenCommitMessageBuffer>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::OpenBufferResponse> {
-        let repository_id = RepositoryId::from_proto(envelope.payload.repository_id);
-        let repository = Self::repository_for_request(&this, repository_id, &mut cx)?;
-        let buffer = repository
-            .update(&mut cx, |repository, cx| {
-                repository.open_commit_buffer(None, this.read(cx).buffer_store.clone(), cx)
-            })?
-            .await?;
-
-        let buffer_id = buffer.read_with(&cx, |buffer, _| buffer.remote_id())?;
-        this.update(&mut cx, |this, cx| {
-            this.buffer_store.update(cx, |buffer_store, cx| {
-                buffer_store
-                    .create_buffer_for_peer(
-                        &buffer,
-                        envelope.original_sender_id.unwrap_or(envelope.sender_id),
-                        cx,
-                    )
-                    .detach_and_log_err(cx);
-            })
-        })?;
-
-        Ok(proto::OpenBufferResponse {
-            buffer_id: buffer_id.to_proto(),
-        })
-    }
-
-    async fn handle_askpass(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::AskPassRequest>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::AskPassResponse> {
-        let repository_id = RepositoryId::from_proto(envelope.payload.repository_id);
-        let repository = Self::repository_for_request(&this, repository_id, &mut cx)?;
-
-        let delegates = cx.update(|cx| repository.read(cx).askpass_delegates.clone())?;
-        let Some(mut askpass) = delegates.lock().remove(&envelope.payload.askpass_id) else {
-            debug_panic!("no askpass found");
-            anyhow::bail!("no askpass found");
-        };
-
-        let response = askpass
-            .ask_password(envelope.payload.prompt)
-            .await
-            .ok_or_else(|| anyhow::anyhow!("askpass cancelled"))?;
-
-        delegates
-            .lock()
-            .insert(envelope.payload.askpass_id, askpass);
-
-        // In fact, we don't quite know what we're doing here, as we're sending askpass password unencrypted, but..
-        Ok(proto::AskPassResponse {
-            response: response.decrypt(IKnowWhatIAmDoingAndIHaveReadTheDocs)?,
-        })
-    }
-
-    async fn handle_check_for_pushed_commits(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::CheckForPushedCommits>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::CheckForPushedCommitsResponse> {
-        let repository_id = RepositoryId::from_proto(envelope.payload.repository_id);
-        let repository_handle = Self::repository_for_request(&this, repository_id, &mut cx)?;
-
-        let branches = repository_handle
-            .update(&mut cx, |repository_handle, _| {
-                repository_handle.check_for_pushed_commits()
-            })?
-            .await??;
-        Ok(proto::CheckForPushedCommitsResponse {
-            pushed_to: branches
-                .into_iter()
-                .map(|commit| commit.to_string())
-                .collect(),
-        })
-    }
-
-    async fn handle_git_diff(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::GitDiff>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::GitDiffResponse> {
-        let repository_id = RepositoryId::from_proto(envelope.payload.repository_id);
-        let repository_handle = Self::repository_for_request(&this, repository_id, &mut cx)?;
-        let diff_type = match envelope.payload.diff_type() {
-            proto::git_diff::DiffType::HeadToIndex => DiffType::HeadToIndex,
-            proto::git_diff::DiffType::HeadToWorktree => DiffType::HeadToWorktree,
-        };
-
-        let mut diff = repository_handle
-            .update(&mut cx, |repository_handle, cx| {
-                repository_handle.diff(diff_type, cx)
-            })?
-            .await??;
-        const ONE_MB: usize = 1_000_000;
-        if diff.len() > ONE_MB {
-            diff = diff.chars().take(ONE_MB).collect()
-        }
-
-        Ok(proto::GitDiffResponse { diff })
-    }
-
-    async fn handle_tree_diff(
-        this: Entity<Self>,
-        request: TypedEnvelope<proto::GetTreeDiff>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::GetTreeDiffResponse> {
-        let repository_id = RepositoryId(request.payload.repository_id);
-        let diff_type = if request.payload.is_merge {
-            DiffTreeType::MergeBase {
-                base: request.payload.base.into(),
-                head: request.payload.head.into(),
-            }
-        } else {
-            DiffTreeType::Since {
-                base: request.payload.base.into(),
-                head: request.payload.head.into(),
-            }
-        };
-
-        let diff = this
-            .update(&mut cx, |this, cx| {
-                let repository = this.repositories().get(&repository_id)?;
-                Some(repository.update(cx, |repo, cx| repo.diff_tree(diff_type, cx)))
-            })?
-            .context("missing repository")?
-            .await??;
-
-        Ok(proto::GetTreeDiffResponse {
-            entries: diff
-                .entries
-                .into_iter()
-                .map(|(path, status)| proto::TreeDiffStatus {
-                    path: path.as_ref().to_proto(),
-                    status: match status {
-                        TreeDiffStatus::Added {} => proto::tree_diff_status::Status::Added.into(),
-                        TreeDiffStatus::Modified { .. } => {
-                            proto::tree_diff_status::Status::Modified.into()
-                        }
-                        TreeDiffStatus::Deleted { .. } => {
-                            proto::tree_diff_status::Status::Deleted.into()
-                        }
-                    },
-                    oid: match status {
-                        TreeDiffStatus::Deleted { old } | TreeDiffStatus::Modified { old } => {
-                            Some(old.to_string())
-                        }
-                        TreeDiffStatus::Added => None,
-                    },
-                })
-                .collect(),
-        })
-    }
-
-    async fn handle_get_blob_content(
-        this: Entity<Self>,
-        request: TypedEnvelope<proto::GetBlobContent>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::GetBlobContentResponse> {
-        let oid = git::Oid::from_str(&request.payload.oid)?;
-        let repository_id = RepositoryId(request.payload.repository_id);
-        let content = this
-            .update(&mut cx, |this, cx| {
-                let repository = this.repositories().get(&repository_id)?;
-                Some(repository.update(cx, |repo, cx| repo.load_blob_content(oid, cx)))
-            })?
-            .context("missing repository")?
-            .await?;
-        Ok(proto::GetBlobContentResponse { content })
-    }
-
-    async fn handle_open_unstaged_diff(
-        this: Entity<Self>,
-        request: TypedEnvelope<proto::OpenUnstagedDiff>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::OpenUnstagedDiffResponse> {
-        let buffer_id = BufferId::new(request.payload.buffer_id)?;
-        let diff = this
-            .update(&mut cx, |this, cx| {
-                let buffer = this.buffer_store.read(cx).get(buffer_id)?;
-                Some(this.open_unstaged_diff(buffer, cx))
-            })?
-            .context("missing buffer")?
-            .await?;
-        this.update(&mut cx, |this, _| {
-            let shared_diffs = this
-                .shared_diffs
-                .entry(request.original_sender_id.unwrap_or(request.sender_id))
-                .or_default();
-            shared_diffs.entry(buffer_id).or_default().unstaged = Some(diff.clone());
-        })?;
-        let staged_text = diff.read_with(&cx, |diff, _| diff.base_text_string())?;
-        Ok(proto::OpenUnstagedDiffResponse { staged_text })
-    }
-
-    async fn handle_open_uncommitted_diff(
-        this: Entity<Self>,
-        request: TypedEnvelope<proto::OpenUncommittedDiff>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::OpenUncommittedDiffResponse> {
-        let buffer_id = BufferId::new(request.payload.buffer_id)?;
-        let diff = this
-            .update(&mut cx, |this, cx| {
-                let buffer = this.buffer_store.read(cx).get(buffer_id)?;
-                Some(this.open_uncommitted_diff(buffer, cx))
-            })?
-            .context("missing buffer")?
-            .await?;
-        this.update(&mut cx, |this, _| {
-            let shared_diffs = this
-                .shared_diffs
-                .entry(request.original_sender_id.unwrap_or(request.sender_id))
-                .or_default();
-            shared_diffs.entry(buffer_id).or_default().uncommitted = Some(diff.clone());
-        })?;
-        diff.read_with(&cx, |diff, cx| {
-            use proto::open_uncommitted_diff_response::Mode;
-
-            let unstaged_diff = diff.secondary_diff();
-            let index_snapshot = unstaged_diff.and_then(|diff| {
-                let diff = diff.read(cx);
-                diff.base_text_exists().then(|| diff.base_text())
-            });
-
-            let mode;
-            let staged_text;
-            let committed_text;
-            if diff.base_text_exists() {
-                let committed_snapshot = diff.base_text();
-                committed_text = Some(committed_snapshot.text());
-                if let Some(index_text) = index_snapshot {
-                    if index_text.remote_id() == committed_snapshot.remote_id() {
-                        mode = Mode::IndexMatchesHead;
-                        staged_text = None;
-                    } else {
-                        mode = Mode::IndexAndHead;
-                        staged_text = Some(index_text.text());
-                    }
-                } else {
-                    mode = Mode::IndexAndHead;
-                    staged_text = None;
-                }
-            } else {
-                mode = Mode::IndexAndHead;
-                committed_text = None;
-                staged_text = index_snapshot.as_ref().map(|buffer| buffer.text());
-            }
-
-            proto::OpenUncommittedDiffResponse {
-                committed_text,
-                staged_text,
-                mode: mode.into(),
-            }
-        })
-    }
-
-    async fn handle_update_diff_bases(
-        this: Entity<Self>,
-        request: TypedEnvelope<proto::UpdateDiffBases>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        let buffer_id = BufferId::new(request.payload.buffer_id)?;
-        this.update(&mut cx, |this, cx| {
-            if let Some(diff_state) = this.diffs.get_mut(&buffer_id)
-                && let Some(buffer) = this.buffer_store.read(cx).get(buffer_id)
-            {
-                let buffer = buffer.read(cx).text_snapshot();
-                diff_state.update(cx, |diff_state, cx| {
-                    diff_state.handle_base_texts_updated(buffer, request.payload, cx);
-                })
-            }
-        })
-    }
-
-    async fn handle_blame_buffer(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::BlameBuffer>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::BlameBufferResponse> {
-        let buffer_id = BufferId::new(envelope.payload.buffer_id)?;
-        let version = deserialize_version(&envelope.payload.version);
-        let buffer = this.read_with(&cx, |this, cx| {
-            this.buffer_store.read(cx).get_existing(buffer_id)
-        })??;
-        buffer
-            .update(&mut cx, |buffer, _| {
-                buffer.wait_for_version(version.clone())
-            })?
-            .await?;
-        let blame = this
-            .update(&mut cx, |this, cx| {
-                this.blame_buffer(&buffer, Some(version), cx)
-            })?
-            .await?;
-        Ok(serialize_blame_buffer_response(blame))
-    }
-
-    async fn handle_get_permalink_to_line(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::GetPermalinkToLine>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::GetPermalinkToLineResponse> {
-        let buffer_id = BufferId::new(envelope.payload.buffer_id)?;
-        // let version = deserialize_version(&envelope.payload.version);
-        let selection = {
-            let proto_selection = envelope
-                .payload
-                .selection
-                .context("no selection to get permalink for defined")?;
-            proto_selection.start as u32..proto_selection.end as u32
-        };
-        let buffer = this.read_with(&cx, |this, cx| {
-            this.buffer_store.read(cx).get_existing(buffer_id)
-        })??;
-        let permalink = this
-            .update(&mut cx, |this, cx| {
-                this.get_permalink_to_line(&buffer, selection, cx)
-            })?
-            .await?;
-        Ok(proto::GetPermalinkToLineResponse {
-            permalink: permalink.to_string(),
-        })
-    }
-
-    fn repository_for_request(
-        this: &Entity<Self>,
-        id: RepositoryId,
-        cx: &mut AsyncApp,
-    ) -> Result<Entity<Repository>> {
-        this.read_with(cx, |this, _| {
-            this.repositories
-                .get(&id)
-                .context("missing repository handle")
-                .cloned()
-        })?
-    }
-
-    pub fn repo_snapshots(&self, cx: &App) -> HashMap<RepositoryId, RepositorySnapshot> {
-        self.repositories
-            .iter()
-            .map(|(id, repo)| (*id, repo.read(cx).snapshot.clone()))
-            .collect()
-    }
-
-    fn process_updated_entries(
-        &self,
-        worktree: &Entity<Worktree>,
-        updated_entries: &[(Arc<RelPath>, ProjectEntryId, PathChange)],
-        cx: &mut App,
-    ) -> Task<HashMap<Entity<Repository>, Vec<RepoPath>>> {
-        let path_style = worktree.read(cx).path_style();
-        let mut repo_paths = self
-            .repositories
-            .values()
-            .map(|repo| (repo.read(cx).work_directory_abs_path.clone(), repo.clone()))
-            .collect::<Vec<_>>();
-        let mut entries: Vec<_> = updated_entries
-            .iter()
-            .map(|(path, _, _)| path.clone())
-            .collect();
-        entries.sort();
-        let worktree = worktree.read(cx);
-
-        let entries = entries
-            .into_iter()
-            .map(|path| worktree.absolutize(&path))
-            .collect::<Arc<[_]>>();
-
-        let executor = cx.background_executor().clone();
-        cx.background_executor().spawn(async move {
-            repo_paths.sort_by(|lhs, rhs| lhs.0.cmp(&rhs.0));
-            let mut paths_by_git_repo = HashMap::<_, Vec<_>>::default();
-            let mut tasks = FuturesOrdered::new();
-            for (repo_path, repo) in repo_paths.into_iter().rev() {
-                let entries = entries.clone();
-                let task = executor.spawn(async move {
-                    // Find all repository paths that belong to this repo
-                    let mut ix = entries.partition_point(|path| path < &*repo_path);
-                    if ix == entries.len() {
-                        return None;
-                    };
-
-                    let mut paths = Vec::new();
-                    // All paths prefixed by a given repo will constitute a continuous range.
-                    while let Some(path) = entries.get(ix)
-                        && let Some(repo_path) = RepositorySnapshot::abs_path_to_repo_path_inner(
-                            &repo_path, path, path_style,
-                        )
-                    {
-                        paths.push((repo_path, ix));
-                        ix += 1;
-                    }
-                    if paths.is_empty() {
-                        None
-                    } else {
-                        Some((repo, paths))
-                    }
-                });
-                tasks.push_back(task);
-            }
-
-            // Now, let's filter out the "duplicate" entries that were processed by multiple distinct repos.
-            let mut path_was_used = vec![false; entries.len()];
-            let tasks = tasks.collect::<Vec<_>>().await;
-            // Process tasks from the back: iterating backwards allows us to see more-specific paths first.
-            // We always want to assign a path to it's innermost repository.
-            for t in tasks {
-                let Some((repo, paths)) = t else {
-                    continue;
-                };
-                let entry = paths_by_git_repo.entry(repo).or_default();
-                for (repo_path, ix) in paths {
-                    if path_was_used[ix] {
-                        continue;
-                    }
-                    path_was_used[ix] = true;
-                    entry.push(repo_path);
-                }
-            }
-
-            paths_by_git_repo
-        })
-    }
-}
-
-impl BufferGitState {
-    fn new(_git_store: WeakEntity<GitStore>) -> Self {
-        Self {
-            unstaged_diff: Default::default(),
-            uncommitted_diff: Default::default(),
-            recalculate_diff_task: Default::default(),
-            language: Default::default(),
-            language_registry: Default::default(),
-            recalculating_tx: postage::watch::channel_with(false).0,
-            hunk_staging_operation_count: 0,
-            hunk_staging_operation_count_as_of_write: 0,
-            head_text: Default::default(),
-            index_text: Default::default(),
-            head_changed: Default::default(),
-            index_changed: Default::default(),
-            language_changed: Default::default(),
-            conflict_updated_futures: Default::default(),
-            conflict_set: Default::default(),
-            reparse_conflict_markers_task: Default::default(),
-        }
-    }
-
-    fn buffer_language_changed(&mut self, buffer: Entity<Buffer>, cx: &mut Context<Self>) {
-        self.language = buffer.read(cx).language().cloned();
-        self.language_changed = true;
-        let _ = self.recalculate_diffs(buffer.read(cx).text_snapshot(), cx);
-    }
-
-    fn reparse_conflict_markers(
-        &mut self,
-        buffer: text::BufferSnapshot,
-        cx: &mut Context<Self>,
-    ) -> oneshot::Receiver<()> {
-        let (tx, rx) = oneshot::channel();
-
-        let Some(conflict_set) = self
-            .conflict_set
-            .as_ref()
-            .and_then(|conflict_set| conflict_set.upgrade())
-        else {
-            return rx;
-        };
-
-        let old_snapshot = conflict_set.read_with(cx, |conflict_set, _| {
-            if conflict_set.has_conflict {
-                Some(conflict_set.snapshot())
-            } else {
-                None
-            }
-        });
-
-        if let Some(old_snapshot) = old_snapshot {
-            self.conflict_updated_futures.push(tx);
-            self.reparse_conflict_markers_task = Some(cx.spawn(async move |this, cx| {
-                let (snapshot, changed_range) = cx
-                    .background_spawn(async move {
-                        let new_snapshot = ConflictSet::parse(&buffer);
-                        let changed_range = old_snapshot.compare(&new_snapshot, &buffer);
-                        (new_snapshot, changed_range)
-                    })
-                    .await;
-                this.update(cx, |this, cx| {
-                    if let Some(conflict_set) = &this.conflict_set {
-                        conflict_set
-                            .update(cx, |conflict_set, cx| {
-                                conflict_set.set_snapshot(snapshot, changed_range, cx);
-                            })
-                            .ok();
-                    }
-                    let futures = std::mem::take(&mut this.conflict_updated_futures);
-                    for tx in futures {
-                        tx.send(()).ok();
-                    }
-                })
-            }))
-        }
-
-        rx
-    }
-
-    fn unstaged_diff(&self) -> Option<Entity<BufferDiff>> {
-        self.unstaged_diff.as_ref().and_then(|set| set.upgrade())
-    }
-
-    fn uncommitted_diff(&self) -> Option<Entity<BufferDiff>> {
-        self.uncommitted_diff.as_ref().and_then(|set| set.upgrade())
-    }
-
-    fn handle_base_texts_updated(
-        &mut self,
-        buffer: text::BufferSnapshot,
-        message: proto::UpdateDiffBases,
-        cx: &mut Context<Self>,
-    ) {
-        use proto::update_diff_bases::Mode;
-
-        let Some(mode) = Mode::from_i32(message.mode) else {
-            return;
-        };
-
-        let diff_bases_change = match mode {
-            Mode::HeadOnly => DiffBasesChange::SetHead(message.committed_text),
-            Mode::IndexOnly => DiffBasesChange::SetIndex(message.staged_text),
-            Mode::IndexMatchesHead => DiffBasesChange::SetBoth(message.committed_text),
-            Mode::IndexAndHead => DiffBasesChange::SetEach {
-                index: message.staged_text,
-                head: message.committed_text,
-            },
-        };
-
-        self.diff_bases_changed(buffer, Some(diff_bases_change), cx);
-    }
-
-    pub fn wait_for_recalculation(&mut self) -> Option<impl Future<Output = ()> + use<>> {
-        if *self.recalculating_tx.borrow() {
-            let mut rx = self.recalculating_tx.subscribe();
-            Some(async move {
-                loop {
-                    let is_recalculating = rx.recv().await;
-                    if is_recalculating != Some(true) {
-                        break;
-                    }
-                }
-            })
-        } else {
-            None
-        }
-    }
-
-    fn diff_bases_changed(
-        &mut self,
-        buffer: text::BufferSnapshot,
-        diff_bases_change: Option<DiffBasesChange>,
-        cx: &mut Context<Self>,
-    ) {
-        match diff_bases_change {
-            Some(DiffBasesChange::SetIndex(index)) => {
-                self.index_text = index.map(|mut index| {
-                    text::LineEnding::normalize(&mut index);
-                    Arc::new(index)
-                });
-                self.index_changed = true;
-            }
-            Some(DiffBasesChange::SetHead(head)) => {
-                self.head_text = head.map(|mut head| {
-                    text::LineEnding::normalize(&mut head);
-                    Arc::new(head)
-                });
-                self.head_changed = true;
-            }
-            Some(DiffBasesChange::SetBoth(text)) => {
-                let text = text.map(|mut text| {
-                    text::LineEnding::normalize(&mut text);
-                    Arc::new(text)
-                });
-                self.head_text = text.clone();
-                self.index_text = text;
-                self.head_changed = true;
-                self.index_changed = true;
-            }
-            Some(DiffBasesChange::SetEach { index, head }) => {
-                self.index_text = index.map(|mut index| {
-                    text::LineEnding::normalize(&mut index);
-                    Arc::new(index)
-                });
-                self.index_changed = true;
-                self.head_text = head.map(|mut head| {
-                    text::LineEnding::normalize(&mut head);
-                    Arc::new(head)
-                });
-                self.head_changed = true;
-            }
-            None => {}
-        }
-
-        self.recalculate_diffs(buffer, cx)
-    }
-
-    fn recalculate_diffs(&mut self, buffer: text::BufferSnapshot, cx: &mut Context<Self>) {
-        *self.recalculating_tx.borrow_mut() = true;
-
-        let language = self.language.clone();
-        let language_registry = self.language_registry.clone();
-        let unstaged_diff = self.unstaged_diff();
-        let uncommitted_diff = self.uncommitted_diff();
-        let head = self.head_text.clone();
-        let index = self.index_text.clone();
-        let index_changed = self.index_changed;
-        let head_changed = self.head_changed;
-        let language_changed = self.language_changed;
-        let prev_hunk_staging_operation_count = self.hunk_staging_operation_count_as_of_write;
-        let index_matches_head = match (self.index_text.as_ref(), self.head_text.as_ref()) {
-            (Some(index), Some(head)) => Arc::ptr_eq(index, head),
-            (None, None) => true,
-            _ => false,
-        };
-        self.recalculate_diff_task = Some(cx.spawn(async move |this, cx| {
-            log::debug!(
-                "start recalculating diffs for buffer {}",
-                buffer.remote_id()
-            );
-
-            let mut new_unstaged_diff = None;
-            if let Some(unstaged_diff) = &unstaged_diff {
-                new_unstaged_diff = Some(
-                    BufferDiff::update_diff(
-                        unstaged_diff.clone(),
-                        buffer.clone(),
-                        index,
-                        index_changed,
-                        language_changed,
-                        language.clone(),
-                        language_registry.clone(),
-                        cx,
-                    )
-                    .await?,
-                );
-            }
-
-            // Dropping BufferDiff can be expensive, so yield back to the event loop
-            // for a bit
-            yield_now().await;
-
-            let mut new_uncommitted_diff = None;
-            if let Some(uncommitted_diff) = &uncommitted_diff {
-                new_uncommitted_diff = if index_matches_head {
-                    new_unstaged_diff.clone()
-                } else {
-                    Some(
-                        BufferDiff::update_diff(
-                            uncommitted_diff.clone(),
-                            buffer.clone(),
-                            head,
-                            head_changed,
-                            language_changed,
-                            language.clone(),
-                            language_registry.clone(),
-                            cx,
-                        )
-                        .await?,
-                    )
-                }
-            }
-
-            // Dropping BufferDiff can be expensive, so yield back to the event loop
-            // for a bit
-            yield_now().await;
-
-            let cancel = this.update(cx, |this, _| {
-                // This checks whether all pending stage/unstage operations
-                // have quiesced (i.e. both the corresponding write and the
-                // read of that write have completed). If not, then we cancel
-                // this recalculation attempt to avoid invalidating pending
-                // state too quickly; another recalculation will come along
-                // later and clear the pending state once the state of the index has settled.
-                if this.hunk_staging_operation_count > prev_hunk_staging_operation_count {
-                    *this.recalculating_tx.borrow_mut() = false;
-                    true
-                } else {
-                    false
-                }
-            })?;
-            if cancel {
-                log::debug!(
-                    concat!(
-                        "aborting recalculating diffs for buffer {}",
-                        "due to subsequent hunk operations",
-                    ),
-                    buffer.remote_id()
-                );
-                return Ok(());
-            }
-
-            let unstaged_changed_range = if let Some((unstaged_diff, new_unstaged_diff)) =
-                unstaged_diff.as_ref().zip(new_unstaged_diff.clone())
-            {
-                unstaged_diff.update(cx, |diff, cx| {
-                    if language_changed {
-                        diff.language_changed(cx);
-                    }
-                    diff.set_snapshot(new_unstaged_diff, &buffer, cx)
-                })?
-            } else {
-                None
-            };
-
-            yield_now().await;
-
-            if let Some((uncommitted_diff, new_uncommitted_diff)) =
-                uncommitted_diff.as_ref().zip(new_uncommitted_diff.clone())
-            {
-                uncommitted_diff.update(cx, |diff, cx| {
-                    if language_changed {
-                        diff.language_changed(cx);
-                    }
-                    diff.set_snapshot_with_secondary(
-                        new_uncommitted_diff,
-                        &buffer,
-                        unstaged_changed_range,
-                        true,
-                        cx,
-                    );
-                })?;
-            }
-
-            log::debug!(
-                "finished recalculating diffs for buffer {}",
-                buffer.remote_id()
-            );
-
-            if let Some(this) = this.upgrade() {
-                this.update(cx, |this, _| {
-                    this.index_changed = false;
-                    this.head_changed = false;
-                    this.language_changed = false;
-                    *this.recalculating_tx.borrow_mut() = false;
-                })?;
-            }
-
-            Ok(())
-        }));
-    }
-}
-
-fn make_remote_delegate(
-    this: Entity<GitStore>,
-    project_id: u64,
-    repository_id: RepositoryId,
-    askpass_id: u64,
-    cx: &mut AsyncApp,
-) -> AskPassDelegate {
-    AskPassDelegate::new(cx, move |prompt, tx, cx| {
-        this.update(cx, |this, cx| {
-            let Some((client, _)) = this.downstream_client() else {
-                return;
-            };
-            let response = client.request(proto::AskPassRequest {
-                project_id,
-                repository_id: repository_id.to_proto(),
-                askpass_id,
-                prompt,
-            });
-            cx.spawn(async move |_, _| {
-                let mut response = response.await?.response;
-                tx.send(EncryptedPassword::try_from(response.as_ref())?)
-                    .ok();
-                response.zeroize();
-                anyhow::Ok(())
-            })
-            .detach_and_log_err(cx);
-        })
-        .log_err();
-    })
-}
-
-impl RepositoryId {
-    pub fn to_proto(self) -> u64 {
-        self.0
-    }
-
-    pub fn from_proto(id: u64) -> Self {
-        RepositoryId(id)
-    }
-}
-
-impl RepositorySnapshot {
-    fn empty(id: RepositoryId, work_directory_abs_path: Arc<Path>, path_style: PathStyle) -> Self {
-        Self {
-            id,
-            statuses_by_path: Default::default(),
-            work_directory_abs_path,
-            branch: None,
-            head_commit: None,
-            scan_id: 0,
-            merge: Default::default(),
-            remote_origin_url: None,
-            remote_upstream_url: None,
-            stash_entries: Default::default(),
-            path_style,
-        }
-    }
-
-    fn initial_update(&self, project_id: u64) -> proto::UpdateRepository {
-        proto::UpdateRepository {
-            branch_summary: self.branch.as_ref().map(branch_to_proto),
-            head_commit_details: self.head_commit.as_ref().map(commit_details_to_proto),
-            updated_statuses: self
-                .statuses_by_path
-                .iter()
-                .map(|entry| entry.to_proto())
-                .collect(),
-            removed_statuses: Default::default(),
-            current_merge_conflicts: self
-                .merge
-                .conflicted_paths
-                .iter()
-                .map(|repo_path| repo_path.to_proto())
-                .collect(),
-            merge_message: self.merge.message.as_ref().map(|msg| msg.to_string()),
-            project_id,
-            id: self.id.to_proto(),
-            abs_path: self.work_directory_abs_path.to_string_lossy().into_owned(),
-            entry_ids: vec![self.id.to_proto()],
-            scan_id: self.scan_id,
-            is_last_update: true,
-            stash_entries: self
-                .stash_entries
-                .entries
-                .iter()
-                .map(stash_to_proto)
-                .collect(),
-            remote_upstream_url: self.remote_upstream_url.clone(),
-            remote_origin_url: self.remote_origin_url.clone(),
-        }
-    }
-
-    fn build_update(&self, old: &Self, project_id: u64) -> proto::UpdateRepository {
-        let mut updated_statuses: Vec<proto::StatusEntry> = Vec::new();
-        let mut removed_statuses: Vec<String> = Vec::new();
-
-        let mut new_statuses = self.statuses_by_path.iter().peekable();
-        let mut old_statuses = old.statuses_by_path.iter().peekable();
-
-        let mut current_new_entry = new_statuses.next();
-        let mut current_old_entry = old_statuses.next();
-        loop {
-            match (current_new_entry, current_old_entry) {
-                (Some(new_entry), Some(old_entry)) => {
-                    match new_entry.repo_path.cmp(&old_entry.repo_path) {
-                        Ordering::Less => {
-                            updated_statuses.push(new_entry.to_proto());
-                            current_new_entry = new_statuses.next();
-                        }
-                        Ordering::Equal => {
-                            if new_entry.status != old_entry.status {
-                                updated_statuses.push(new_entry.to_proto());
-                            }
-                            current_old_entry = old_statuses.next();
-                            current_new_entry = new_statuses.next();
-                        }
-                        Ordering::Greater => {
-                            removed_statuses.push(old_entry.repo_path.to_proto());
-                            current_old_entry = old_statuses.next();
-                        }
-                    }
-                }
-                (None, Some(old_entry)) => {
-                    removed_statuses.push(old_entry.repo_path.to_proto());
-                    current_old_entry = old_statuses.next();
-                }
-                (Some(new_entry), None) => {
-                    updated_statuses.push(new_entry.to_proto());
-                    current_new_entry = new_statuses.next();
-                }
-                (None, None) => break,
-            }
-        }
-
-        proto::UpdateRepository {
-            branch_summary: self.branch.as_ref().map(branch_to_proto),
-            head_commit_details: self.head_commit.as_ref().map(commit_details_to_proto),
-            updated_statuses,
-            removed_statuses,
-            current_merge_conflicts: self
-                .merge
-                .conflicted_paths
-                .iter()
-                .map(|path| path.to_proto())
-                .collect(),
-            merge_message: self.merge.message.as_ref().map(|msg| msg.to_string()),
-            project_id,
-            id: self.id.to_proto(),
-            abs_path: self.work_directory_abs_path.to_string_lossy().into_owned(),
-            entry_ids: vec![],
-            scan_id: self.scan_id,
-            is_last_update: true,
-            stash_entries: self
-                .stash_entries
-                .entries
-                .iter()
-                .map(stash_to_proto)
-                .collect(),
-            remote_upstream_url: self.remote_upstream_url.clone(),
-            remote_origin_url: self.remote_origin_url.clone(),
-        }
-    }
-
-    pub fn status(&self) -> impl Iterator<Item = StatusEntry> + '_ {
-        self.statuses_by_path.iter().cloned()
-    }
-
-    pub fn status_summary(&self) -> GitSummary {
-        self.statuses_by_path.summary().item_summary
-    }
-
-    pub fn status_for_path(&self, path: &RepoPath) -> Option<StatusEntry> {
-        self.statuses_by_path
-            .get(&PathKey(path.as_ref().clone()), ())
-            .cloned()
-    }
-
-    pub fn abs_path_to_repo_path(&self, abs_path: &Path) -> Option<RepoPath> {
-        Self::abs_path_to_repo_path_inner(&self.work_directory_abs_path, abs_path, self.path_style)
-    }
-
-    fn repo_path_to_abs_path(&self, repo_path: &RepoPath) -> PathBuf {
-        self.path_style
-            .join(&self.work_directory_abs_path, repo_path.as_std_path())
-            .unwrap()
-            .into()
-    }
-
-    #[inline]
-    fn abs_path_to_repo_path_inner(
-        work_directory_abs_path: &Path,
-        abs_path: &Path,
-        path_style: PathStyle,
-    ) -> Option<RepoPath> {
-        let rel_path = path_style.strip_prefix(abs_path, work_directory_abs_path)?;
-        Some(RepoPath::from_rel_path(&rel_path))
-    }
-
-    pub fn had_conflict_on_last_merge_head_change(&self, repo_path: &RepoPath) -> bool {
-        self.merge.conflicted_paths.contains(repo_path)
-    }
-
-    pub fn has_conflict(&self, repo_path: &RepoPath) -> bool {
-        let had_conflict_on_last_merge_head_change =
-            self.merge.conflicted_paths.contains(repo_path);
-        let has_conflict_currently = self
-            .status_for_path(repo_path)
-            .is_some_and(|entry| entry.status.is_conflicted());
-        had_conflict_on_last_merge_head_change || has_conflict_currently
-    }
-
-    /// This is the name that will be displayed in the repository selector for this repository.
-    pub fn display_name(&self) -> SharedString {
-        self.work_directory_abs_path
-            .file_name()
-            .unwrap_or_default()
-            .to_string_lossy()
-            .to_string()
-            .into()
-    }
-}
-
-pub fn stash_to_proto(entry: &StashEntry) -> proto::StashEntry {
-    proto::StashEntry {
-        oid: entry.oid.as_bytes().to_vec(),
-        message: entry.message.clone(),
-        branch: entry.branch.clone(),
-        index: entry.index as u64,
-        timestamp: entry.timestamp,
-    }
-}
-
-pub fn proto_to_stash(entry: &proto::StashEntry) -> Result<StashEntry> {
-    Ok(StashEntry {
-        oid: Oid::from_bytes(&entry.oid)?,
-        message: entry.message.clone(),
-        index: entry.index as usize,
-        branch: entry.branch.clone(),
-        timestamp: entry.timestamp,
-    })
-}
-
-impl MergeDetails {
-    async fn load(
-        backend: &Arc<dyn GitRepository>,
-        status: &SumTree<StatusEntry>,
-        prev_snapshot: &RepositorySnapshot,
-    ) -> Result<(MergeDetails, bool)> {
-        log::debug!("load merge details");
-        let message = backend.merge_message().await;
-        let heads = backend
-            .revparse_batch(vec![
-                "MERGE_HEAD".into(),
-                "CHERRY_PICK_HEAD".into(),
-                "REBASE_HEAD".into(),
-                "REVERT_HEAD".into(),
-                "APPLY_HEAD".into(),
-            ])
-            .await
-            .log_err()
-            .unwrap_or_default()
-            .into_iter()
-            .map(|opt| opt.map(SharedString::from))
-            .collect::<Vec<_>>();
-        let merge_heads_changed = heads != prev_snapshot.merge.heads;
-        let conflicted_paths = if merge_heads_changed {
-            let current_conflicted_paths = TreeSet::from_ordered_entries(
-                status
-                    .iter()
-                    .filter(|entry| entry.status.is_conflicted())
-                    .map(|entry| entry.repo_path.clone()),
-            );
-
-            // It can happen that we run a scan while a lengthy merge is in progress
-            // that will eventually result in conflicts, but before those conflicts
-            // are reported by `git status`. Since for the moment we only care about
-            // the merge heads state for the purposes of tracking conflicts, don't update
-            // this state until we see some conflicts.
-            if heads.iter().any(Option::is_some)
-                && !prev_snapshot.merge.heads.iter().any(Option::is_some)
-                && current_conflicted_paths.is_empty()
-            {
-                log::debug!("not updating merge heads because no conflicts found");
-                return Ok((
-                    MergeDetails {
-                        message: message.map(SharedString::from),
-                        ..prev_snapshot.merge.clone()
-                    },
-                    false,
-                ));
-            }
-
-            current_conflicted_paths
-        } else {
-            prev_snapshot.merge.conflicted_paths.clone()
-        };
-        let details = MergeDetails {
-            conflicted_paths,
-            message: message.map(SharedString::from),
-            heads,
-        };
-        Ok((details, merge_heads_changed))
-    }
-}
-
-impl Repository {
-    pub fn snapshot(&self) -> RepositorySnapshot {
-        self.snapshot.clone()
-    }
-
-    pub fn pending_ops(&self) -> impl Iterator<Item = PendingOps> + '_ {
-        self.pending_ops.iter().cloned()
-    }
-
-    pub fn pending_ops_summary(&self) -> PathSummary<PendingOpsSummary> {
-        self.pending_ops.summary().clone()
-    }
-
-    pub fn pending_ops_for_path(&self, path: &RepoPath) -> Option<PendingOps> {
-        self.pending_ops
-            .get(&PathKey(path.as_ref().clone()), ())
-            .cloned()
-    }
-
-    fn local(
-        id: RepositoryId,
-        work_directory_abs_path: Arc<Path>,
-        dot_git_abs_path: Arc<Path>,
-        project_environment: WeakEntity<ProjectEnvironment>,
-        fs: Arc<dyn Fs>,
-        git_store: WeakEntity<GitStore>,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let snapshot =
-            RepositorySnapshot::empty(id, work_directory_abs_path.clone(), PathStyle::local());
-        let state = cx
-            .spawn(async move |_, cx| {
-                LocalRepositoryState::new(
-                    work_directory_abs_path,
-                    dot_git_abs_path,
-                    project_environment,
-                    fs,
-                    cx,
-                )
-                .await
-                .map_err(|err| err.to_string())
-            })
-            .shared();
-        let job_sender = Repository::spawn_local_git_worker(state.clone(), cx);
-        let state = cx
-            .spawn(async move |_, _| {
-                let state = state.await?;
-                Ok(RepositoryState::Local(state))
-            })
-            .shared();
-
-        Repository {
-            this: cx.weak_entity(),
-            git_store,
-            snapshot,
-            pending_ops: Default::default(),
-            repository_state: state,
-            commit_message_buffer: None,
-            askpass_delegates: Default::default(),
-            paths_needing_status_update: Default::default(),
-            latest_askpass_id: 0,
-            job_sender,
-            job_id: 0,
-            active_jobs: Default::default(),
-        }
-    }
-
-    fn remote(
-        id: RepositoryId,
-        work_directory_abs_path: Arc<Path>,
-        path_style: PathStyle,
-        project_id: ProjectId,
-        client: AnyProtoClient,
-        git_store: WeakEntity<GitStore>,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let snapshot = RepositorySnapshot::empty(id, work_directory_abs_path, path_style);
-        let repository_state = RemoteRepositoryState { project_id, client };
-        let job_sender = Self::spawn_remote_git_worker(repository_state.clone(), cx);
-        let repository_state = Task::ready(Ok(RepositoryState::Remote(repository_state))).shared();
-        Self {
-            this: cx.weak_entity(),
-            snapshot,
-            commit_message_buffer: None,
-            git_store,
-            pending_ops: Default::default(),
-            paths_needing_status_update: Default::default(),
-            job_sender,
-            repository_state,
-            askpass_delegates: Default::default(),
-            latest_askpass_id: 0,
-            active_jobs: Default::default(),
-            job_id: 0,
-        }
-    }
-
-    pub fn git_store(&self) -> Option<Entity<GitStore>> {
-        self.git_store.upgrade()
-    }
-
-    fn reload_buffer_diff_bases(&mut self, cx: &mut Context<Self>) {
-        let this = cx.weak_entity();
-        let git_store = self.git_store.clone();
-        let _ = self.send_keyed_job(
-            Some(GitJobKey::ReloadBufferDiffBases),
-            None,
-            |state, mut cx| async move {
-                let RepositoryState::Local(LocalRepositoryState { backend, .. }) = state else {
-                    log::error!("tried to recompute diffs for a non-local repository");
-                    return Ok(());
-                };
-
-                let Some(this) = this.upgrade() else {
-                    return Ok(());
-                };
-
-                let repo_diff_state_updates = this.update(&mut cx, |this, cx| {
-                    git_store.update(cx, |git_store, cx| {
-                        git_store
-                            .diffs
-                            .iter()
-                            .filter_map(|(buffer_id, diff_state)| {
-                                let buffer_store = git_store.buffer_store.read(cx);
-                                let buffer = buffer_store.get(*buffer_id)?;
-                                let file = File::from_dyn(buffer.read(cx).file())?;
-                                let abs_path = file.worktree.read(cx).absolutize(&file.path);
-                                let repo_path = this.abs_path_to_repo_path(&abs_path)?;
-                                log::debug!(
-                                    "start reload diff bases for repo path {}",
-                                    repo_path.as_unix_str()
-                                );
-                                diff_state.update(cx, |diff_state, _| {
-                                    let has_unstaged_diff = diff_state
-                                        .unstaged_diff
-                                        .as_ref()
-                                        .is_some_and(|diff| diff.is_upgradable());
-                                    let has_uncommitted_diff = diff_state
-                                        .uncommitted_diff
-                                        .as_ref()
-                                        .is_some_and(|set| set.is_upgradable());
-
-                                    Some((
-                                        buffer,
-                                        repo_path,
-                                        has_unstaged_diff.then(|| diff_state.index_text.clone()),
-                                        has_uncommitted_diff.then(|| diff_state.head_text.clone()),
-                                    ))
-                                })
-                            })
-                            .collect::<Vec<_>>()
-                    })
-                })??;
-
-                let buffer_diff_base_changes = cx
-                    .background_spawn(async move {
-                        let mut changes = Vec::new();
-                        for (buffer, repo_path, current_index_text, current_head_text) in
-                            &repo_diff_state_updates
-                        {
-                            let index_text = if current_index_text.is_some() {
-                                backend.load_index_text(repo_path.clone()).await
-                            } else {
-                                None
-                            };
-                            let head_text = if current_head_text.is_some() {
-                                backend.load_committed_text(repo_path.clone()).await
-                            } else {
-                                None
-                            };
-
-                            let change =
-                                match (current_index_text.as_ref(), current_head_text.as_ref()) {
-                                    (Some(current_index), Some(current_head)) => {
-                                        let index_changed =
-                                            index_text.as_ref() != current_index.as_deref();
-                                        let head_changed =
-                                            head_text.as_ref() != current_head.as_deref();
-                                        if index_changed && head_changed {
-                                            if index_text == head_text {
-                                                Some(DiffBasesChange::SetBoth(head_text))
-                                            } else {
-                                                Some(DiffBasesChange::SetEach {
-                                                    index: index_text,
-                                                    head: head_text,
-                                                })
-                                            }
-                                        } else if index_changed {
-                                            Some(DiffBasesChange::SetIndex(index_text))
-                                        } else if head_changed {
-                                            Some(DiffBasesChange::SetHead(head_text))
-                                        } else {
-                                            None
-                                        }
-                                    }
-                                    (Some(current_index), None) => {
-                                        let index_changed =
-                                            index_text.as_ref() != current_index.as_deref();
-                                        index_changed
-                                            .then_some(DiffBasesChange::SetIndex(index_text))
-                                    }
-                                    (None, Some(current_head)) => {
-                                        let head_changed =
-                                            head_text.as_ref() != current_head.as_deref();
-                                        head_changed.then_some(DiffBasesChange::SetHead(head_text))
-                                    }
-                                    (None, None) => None,
-                                };
-
-                            changes.push((buffer.clone(), change))
-                        }
-                        changes
-                    })
-                    .await;
-
-                git_store.update(&mut cx, |git_store, cx| {
-                    for (buffer, diff_bases_change) in buffer_diff_base_changes {
-                        let buffer_snapshot = buffer.read(cx).text_snapshot();
-                        let buffer_id = buffer_snapshot.remote_id();
-                        let Some(diff_state) = git_store.diffs.get(&buffer_id) else {
-                            continue;
-                        };
-
-                        let downstream_client = git_store.downstream_client();
-                        diff_state.update(cx, |diff_state, cx| {
-                            use proto::update_diff_bases::Mode;
-
-                            if let Some((diff_bases_change, (client, project_id))) =
-                                diff_bases_change.clone().zip(downstream_client)
-                            {
-                                let (staged_text, committed_text, mode) = match diff_bases_change {
-                                    DiffBasesChange::SetIndex(index) => {
-                                        (index, None, Mode::IndexOnly)
-                                    }
-                                    DiffBasesChange::SetHead(head) => (None, head, Mode::HeadOnly),
-                                    DiffBasesChange::SetEach { index, head } => {
-                                        (index, head, Mode::IndexAndHead)
-                                    }
-                                    DiffBasesChange::SetBoth(text) => {
-                                        (None, text, Mode::IndexMatchesHead)
-                                    }
-                                };
-                                client
-                                    .send(proto::UpdateDiffBases {
-                                        project_id: project_id.to_proto(),
-                                        buffer_id: buffer_id.to_proto(),
-                                        staged_text,
-                                        committed_text,
-                                        mode: mode as i32,
-                                    })
-                                    .log_err();
-                            }
-
-                            diff_state.diff_bases_changed(buffer_snapshot, diff_bases_change, cx);
-                        });
-                    }
-                })
-            },
-        );
-    }
-
-    pub fn send_job<F, Fut, R>(
-        &mut self,
-        status: Option<SharedString>,
-        job: F,
-    ) -> oneshot::Receiver<R>
-    where
-        F: FnOnce(RepositoryState, AsyncApp) -> Fut + 'static,
-        Fut: Future<Output = R> + 'static,
-        R: Send + 'static,
-    {
-        self.send_keyed_job(None, status, job)
-    }
-
-    fn send_keyed_job<F, Fut, R>(
-        &mut self,
-        key: Option<GitJobKey>,
-        status: Option<SharedString>,
-        job: F,
-    ) -> oneshot::Receiver<R>
-    where
-        F: FnOnce(RepositoryState, AsyncApp) -> Fut + 'static,
-        Fut: Future<Output = R> + 'static,
-        R: Send + 'static,
-    {
-        let (result_tx, result_rx) = futures::channel::oneshot::channel();
-        let job_id = post_inc(&mut self.job_id);
-        let this = self.this.clone();
-        self.job_sender
-            .unbounded_send(GitJob {
-                key,
-                job: Box::new(move |state, cx: &mut AsyncApp| {
-                    let job = job(state, cx.clone());
-                    cx.spawn(async move |cx| {
-                        if let Some(s) = status.clone() {
-                            this.update(cx, |this, cx| {
-                                this.active_jobs.insert(
-                                    job_id,
-                                    JobInfo {
-                                        start: Instant::now(),
-                                        message: s.clone(),
-                                    },
-                                );
-
-                                cx.notify();
-                            })
-                            .ok();
-                        }
-                        let result = job.await;
-
-                        this.update(cx, |this, cx| {
-                            this.active_jobs.remove(&job_id);
-                            cx.notify();
-                        })
-                        .ok();
-
-                        result_tx.send(result).ok();
-                    })
-                }),
-            })
-            .ok();
-        result_rx
-    }
-
-    pub fn set_as_active_repository(&self, cx: &mut Context<Self>) {
-        let Some(git_store) = self.git_store.upgrade() else {
-            return;
-        };
-        let entity = cx.entity();
-        git_store.update(cx, |git_store, cx| {
-            let Some((&id, _)) = git_store
-                .repositories
-                .iter()
-                .find(|(_, handle)| *handle == &entity)
-            else {
-                return;
-            };
-            git_store.active_repo_id = Some(id);
-            cx.emit(GitStoreEvent::ActiveRepositoryChanged(Some(id)));
-        });
-    }
-
-    pub fn cached_status(&self) -> impl '_ + Iterator<Item = StatusEntry> {
-        self.snapshot.status()
-    }
-
-    pub fn cached_stash(&self) -> GitStash {
-        self.snapshot.stash_entries.clone()
-    }
-
-    pub fn repo_path_to_project_path(&self, path: &RepoPath, cx: &App) -> Option<ProjectPath> {
-        let git_store = self.git_store.upgrade()?;
-        let worktree_store = git_store.read(cx).worktree_store.read(cx);
-        let abs_path = self.snapshot.repo_path_to_abs_path(path);
-        let abs_path = SanitizedPath::new(&abs_path);
-        let (worktree, relative_path) = worktree_store.find_worktree(abs_path, cx)?;
-        Some(ProjectPath {
-            worktree_id: worktree.read(cx).id(),
-            path: relative_path,
-        })
-    }
-
-    pub fn project_path_to_repo_path(&self, path: &ProjectPath, cx: &App) -> Option<RepoPath> {
-        let git_store = self.git_store.upgrade()?;
-        let worktree_store = git_store.read(cx).worktree_store.read(cx);
-        let abs_path = worktree_store.absolutize(path, cx)?;
-        self.snapshot.abs_path_to_repo_path(&abs_path)
-    }
-
-    pub fn contains_sub_repo(&self, other: &Entity<Self>, cx: &App) -> bool {
-        other
-            .read(cx)
-            .snapshot
-            .work_directory_abs_path
-            .starts_with(&self.snapshot.work_directory_abs_path)
-    }
-
-    pub fn open_commit_buffer(
-        &mut self,
-        languages: Option<Arc<LanguageRegistry>>,
-        buffer_store: Entity<BufferStore>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Entity<Buffer>>> {
-        let id = self.id;
-        if let Some(buffer) = self.commit_message_buffer.clone() {
-            return Task::ready(Ok(buffer));
-        }
-        let this = cx.weak_entity();
-
-        let rx = self.send_job(None, move |state, mut cx| async move {
-            let Some(this) = this.upgrade() else {
-                bail!("git store was dropped");
-            };
-            match state {
-                RepositoryState::Local(..) => {
-                    this.update(&mut cx, |_, cx| {
-                        Self::open_local_commit_buffer(languages, buffer_store, cx)
-                    })?
-                    .await
-                }
-                RepositoryState::Remote(RemoteRepositoryState { project_id, client }) => {
-                    let request = client.request(proto::OpenCommitMessageBuffer {
-                        project_id: project_id.0,
-                        repository_id: id.to_proto(),
-                    });
-                    let response = request.await.context("requesting to open commit buffer")?;
-                    let buffer_id = BufferId::new(response.buffer_id)?;
-                    let buffer = buffer_store
-                        .update(&mut cx, |buffer_store, cx| {
-                            buffer_store.wait_for_remote_buffer(buffer_id, cx)
-                        })?
-                        .await?;
-                    if let Some(language_registry) = languages {
-                        let git_commit_language =
-                            language_registry.language_for_name("Git Commit").await?;
-                        buffer.update(&mut cx, |buffer, cx| {
-                            buffer.set_language(Some(git_commit_language), cx);
-                        })?;
-                    }
-                    this.update(&mut cx, |this, _| {
-                        this.commit_message_buffer = Some(buffer.clone());
-                    })?;
-                    Ok(buffer)
-                }
-            }
-        });
-
-        cx.spawn(|_, _: &mut AsyncApp| async move { rx.await? })
-    }
-
-    fn open_local_commit_buffer(
-        language_registry: Option<Arc<LanguageRegistry>>,
-        buffer_store: Entity<BufferStore>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Entity<Buffer>>> {
-        cx.spawn(async move |repository, cx| {
-            let buffer = buffer_store
-                .update(cx, |buffer_store, cx| buffer_store.create_buffer(false, cx))?
-                .await?;
-
-            if let Some(language_registry) = language_registry {
-                let git_commit_language = language_registry.language_for_name("Git Commit").await?;
-                buffer.update(cx, |buffer, cx| {
-                    buffer.set_language(Some(git_commit_language), cx);
-                })?;
-            }
-
-            repository.update(cx, |repository, _| {
-                repository.commit_message_buffer = Some(buffer.clone());
-            })?;
-            Ok(buffer)
-        })
-    }
-
-    pub fn checkout_files(
-        &mut self,
-        commit: &str,
-        paths: Vec<RepoPath>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let commit = commit.to_string();
-        let id = self.id;
-
-        self.spawn_job_with_tracking(
-            paths.clone(),
-            pending_op::GitStatus::Reverted,
-            cx,
-            async move |this, cx| {
-                this.update(cx, |this, _cx| {
-                    this.send_job(
-                        Some(format!("git checkout {}", commit).into()),
-                        move |git_repo, _| async move {
-                            match git_repo {
-                                RepositoryState::Local(LocalRepositoryState {
-                                    backend,
-                                    environment,
-                                    ..
-                                }) => {
-                                    backend
-                                        .checkout_files(commit, paths, environment.clone())
-                                        .await
-                                }
-                                RepositoryState::Remote(RemoteRepositoryState {
-                                    project_id,
-                                    client,
-                                }) => {
-                                    client
-                                        .request(proto::GitCheckoutFiles {
-                                            project_id: project_id.0,
-                                            repository_id: id.to_proto(),
-                                            commit,
-                                            paths: paths
-                                                .into_iter()
-                                                .map(|p| p.to_proto())
-                                                .collect(),
-                                        })
-                                        .await?;
-
-                                    Ok(())
-                                }
-                            }
-                        },
-                    )
-                })?
-                .await?
-            },
-        )
-    }
-
-    pub fn reset(
-        &mut self,
-        commit: String,
-        reset_mode: ResetMode,
-        _cx: &mut App,
-    ) -> oneshot::Receiver<Result<()>> {
-        let id = self.id;
-
-        self.send_job(None, move |git_repo, _| async move {
-            match git_repo {
-                RepositoryState::Local(LocalRepositoryState {
-                    backend,
-                    environment,
-                    ..
-                }) => backend.reset(commit, reset_mode, environment).await,
-                RepositoryState::Remote(RemoteRepositoryState { project_id, client }) => {
-                    client
-                        .request(proto::GitReset {
-                            project_id: project_id.0,
-                            repository_id: id.to_proto(),
-                            commit,
-                            mode: match reset_mode {
-                                ResetMode::Soft => git_reset::ResetMode::Soft.into(),
-                                ResetMode::Mixed => git_reset::ResetMode::Mixed.into(),
-                            },
-                        })
-                        .await?;
-
-                    Ok(())
-                }
-            }
-        })
-    }
-
-    pub fn show(&mut self, commit: String) -> oneshot::Receiver<Result<CommitDetails>> {
-        let id = self.id;
-        self.send_job(None, move |git_repo, _cx| async move {
-            match git_repo {
-                RepositoryState::Local(LocalRepositoryState { backend, .. }) => {
-                    backend.show(commit).await
-                }
-                RepositoryState::Remote(RemoteRepositoryState { project_id, client }) => {
-                    let resp = client
-                        .request(proto::GitShow {
-                            project_id: project_id.0,
-                            repository_id: id.to_proto(),
-                            commit,
-                        })
-                        .await?;
-
-                    Ok(CommitDetails {
-                        sha: resp.sha.into(),
-                        message: resp.message.into(),
-                        commit_timestamp: resp.commit_timestamp,
-                        author_email: resp.author_email.into(),
-                        author_name: resp.author_name.into(),
-                    })
-                }
-            }
-        })
-    }
-
-    pub fn load_commit_diff(&mut self, commit: String) -> oneshot::Receiver<Result<CommitDiff>> {
-        let id = self.id;
-        self.send_job(None, move |git_repo, cx| async move {
-            match git_repo {
-                RepositoryState::Local(LocalRepositoryState { backend, .. }) => {
-                    backend.load_commit(commit, cx).await
-                }
-                RepositoryState::Remote(RemoteRepositoryState {
-                    client, project_id, ..
-                }) => {
-                    let response = client
-                        .request(proto::LoadCommitDiff {
-                            project_id: project_id.0,
-                            repository_id: id.to_proto(),
-                            commit,
-                        })
-                        .await?;
-                    Ok(CommitDiff {
-                        files: response
-                            .files
-                            .into_iter()
-                            .map(|file| {
-                                Ok(CommitFile {
-                                    path: RepoPath::from_proto(&file.path)?,
-                                    old_text: file.old_text,
-                                    new_text: file.new_text,
-                                })
-                            })
-                            .collect::<Result<Vec<_>>>()?,
-                    })
-                }
-            }
-        })
-    }
-
-    pub fn file_history(
-        &mut self,
-        path: RepoPath,
-    ) -> oneshot::Receiver<Result<git::repository::FileHistory>> {
-        self.file_history_paginated(path, 0, None)
-    }
-
-    pub fn file_history_paginated(
-        &mut self,
-        path: RepoPath,
-        skip: usize,
-        limit: Option<usize>,
-    ) -> oneshot::Receiver<Result<git::repository::FileHistory>> {
-        let id = self.id;
-        self.send_job(None, move |git_repo, _cx| async move {
-            match git_repo {
-                RepositoryState::Local(LocalRepositoryState { backend, .. }) => {
-                    backend.file_history_paginated(path, skip, limit).await
-                }
-                RepositoryState::Remote(RemoteRepositoryState { client, project_id }) => {
-                    let response = client
-                        .request(proto::GitFileHistory {
-                            project_id: project_id.0,
-                            repository_id: id.to_proto(),
-                            path: path.to_proto(),
-                            skip: skip as u64,
-                            limit: limit.map(|l| l as u64),
-                        })
-                        .await?;
-                    Ok(git::repository::FileHistory {
-                        entries: response
-                            .entries
-                            .into_iter()
-                            .map(|entry| git::repository::FileHistoryEntry {
-                                sha: entry.sha.into(),
-                                subject: entry.subject.into(),
-                                message: entry.message.into(),
-                                commit_timestamp: entry.commit_timestamp,
-                                author_name: entry.author_name.into(),
-                                author_email: entry.author_email.into(),
-                            })
-                            .collect(),
-                        path: RepoPath::from_proto(&response.path)?,
-                    })
-                }
-            }
-        })
-    }
-
-    fn buffer_store(&self, cx: &App) -> Option<Entity<BufferStore>> {
-        Some(self.git_store.upgrade()?.read(cx).buffer_store.clone())
-    }
-
-    fn save_buffers<'a>(
-        &self,
-        entries: impl IntoIterator<Item = &'a RepoPath>,
-        cx: &mut Context<Self>,
-    ) -> Vec<Task<anyhow::Result<()>>> {
-        let mut save_futures = Vec::new();
-        if let Some(buffer_store) = self.buffer_store(cx) {
-            buffer_store.update(cx, |buffer_store, cx| {
-                for path in entries {
-                    let Some(project_path) = self.repo_path_to_project_path(path, cx) else {
-                        continue;
-                    };
-                    if let Some(buffer) = buffer_store.get_by_path(&project_path)
-                        && buffer
-                            .read(cx)
-                            .file()
-                            .is_some_and(|file| file.disk_state().exists())
-                        && buffer.read(cx).has_unsaved_edits()
-                    {
-                        save_futures.push(buffer_store.save_buffer(buffer, cx));
-                    }
-                }
-            })
-        }
-        save_futures
-    }
-
-    pub fn stage_entries(
-        &mut self,
-        entries: Vec<RepoPath>,
-        cx: &mut Context<Self>,
-    ) -> Task<anyhow::Result<()>> {
-        if entries.is_empty() {
-            return Task::ready(Ok(()));
-        }
-        let id = self.id;
-        let save_tasks = self.save_buffers(&entries, cx);
-        let paths = entries
-            .iter()
-            .map(|p| p.as_unix_str())
-            .collect::<Vec<_>>()
-            .join(" ");
-        let status = format!("git add {paths}");
-        let job_key = GitJobKey::WriteIndex(entries.clone());
-
-        self.spawn_job_with_tracking(
-            entries.clone(),
-            pending_op::GitStatus::Staged,
-            cx,
-            async move |this, cx| {
-                for save_task in save_tasks {
-                    save_task.await?;
-                }
-
-                this.update(cx, |this, _| {
-                    this.send_keyed_job(
-                        Some(job_key),
-                        Some(status.into()),
-                        move |git_repo, _cx| async move {
-                            match git_repo {
-                                RepositoryState::Local(LocalRepositoryState {
-                                    backend,
-                                    environment,
-                                    ..
-                                }) => backend.stage_paths(entries, environment.clone()).await,
-                                RepositoryState::Remote(RemoteRepositoryState {
-                                    project_id,
-                                    client,
-                                }) => {
-                                    client
-                                        .request(proto::Stage {
-                                            project_id: project_id.0,
-                                            repository_id: id.to_proto(),
-                                            paths: entries
-                                                .into_iter()
-                                                .map(|repo_path| repo_path.to_proto())
-                                                .collect(),
-                                        })
-                                        .await
-                                        .context("sending stage request")?;
-
-                                    Ok(())
-                                }
-                            }
-                        },
-                    )
-                })?
-                .await?
-            },
-        )
-    }
-
-    pub fn unstage_entries(
-        &mut self,
-        entries: Vec<RepoPath>,
-        cx: &mut Context<Self>,
-    ) -> Task<anyhow::Result<()>> {
-        if entries.is_empty() {
-            return Task::ready(Ok(()));
-        }
-        let id = self.id;
-        let save_tasks = self.save_buffers(&entries, cx);
-        let paths = entries
-            .iter()
-            .map(|p| p.as_unix_str())
-            .collect::<Vec<_>>()
-            .join(" ");
-        let status = format!("git reset {paths}");
-        let job_key = GitJobKey::WriteIndex(entries.clone());
-
-        self.spawn_job_with_tracking(
-            entries.clone(),
-            pending_op::GitStatus::Unstaged,
-            cx,
-            async move |this, cx| {
-                for save_task in save_tasks {
-                    save_task.await?;
-                }
-
-                this.update(cx, |this, _| {
-                    this.send_keyed_job(
-                        Some(job_key),
-                        Some(status.into()),
-                        move |git_repo, _cx| async move {
-                            match git_repo {
-                                RepositoryState::Local(LocalRepositoryState {
-                                    backend,
-                                    environment,
-                                    ..
-                                }) => backend.unstage_paths(entries, environment).await,
-                                RepositoryState::Remote(RemoteRepositoryState {
-                                    project_id,
-                                    client,
-                                }) => {
-                                    client
-                                        .request(proto::Unstage {
-                                            project_id: project_id.0,
-                                            repository_id: id.to_proto(),
-                                            paths: entries
-                                                .into_iter()
-                                                .map(|repo_path| repo_path.to_proto())
-                                                .collect(),
-                                        })
-                                        .await
-                                        .context("sending unstage request")?;
-
-                                    Ok(())
-                                }
-                            }
-                        },
-                    )
-                })?
-                .await?
-            },
-        )
-    }
-
-    pub fn stage_all(&mut self, cx: &mut Context<Self>) -> Task<anyhow::Result<()>> {
-        let to_stage = self
-            .cached_status()
-            .filter_map(|entry| {
-                if let Some(ops) = self.pending_ops_for_path(&entry.repo_path) {
-                    if ops.staging() || ops.staged() {
-                        None
-                    } else {
-                        Some(entry.repo_path)
-                    }
-                } else if entry.status.staging().is_fully_staged() {
-                    None
-                } else {
-                    Some(entry.repo_path)
-                }
-            })
-            .collect();
-        self.stage_entries(to_stage, cx)
-    }
-
-    pub fn unstage_all(&mut self, cx: &mut Context<Self>) -> Task<anyhow::Result<()>> {
-        let to_unstage = self
-            .cached_status()
-            .filter_map(|entry| {
-                if let Some(ops) = self.pending_ops_for_path(&entry.repo_path) {
-                    if !ops.staging() && !ops.staged() {
-                        None
-                    } else {
-                        Some(entry.repo_path)
-                    }
-                } else if entry.status.staging().is_fully_unstaged() {
-                    None
-                } else {
-                    Some(entry.repo_path)
-                }
-            })
-            .collect();
-        self.unstage_entries(to_unstage, cx)
-    }
-
-    pub fn stash_all(&mut self, cx: &mut Context<Self>) -> Task<anyhow::Result<()>> {
-        let to_stash = self.cached_status().map(|entry| entry.repo_path).collect();
-
-        self.stash_entries(to_stash, cx)
-    }
-
-    pub fn stash_entries(
-        &mut self,
-        entries: Vec<RepoPath>,
-        cx: &mut Context<Self>,
-    ) -> Task<anyhow::Result<()>> {
-        let id = self.id;
-
-        cx.spawn(async move |this, cx| {
-            this.update(cx, |this, _| {
-                this.send_job(None, move |git_repo, _cx| async move {
-                    match git_repo {
-                        RepositoryState::Local(LocalRepositoryState {
-                            backend,
-                            environment,
-                            ..
-                        }) => backend.stash_paths(entries, environment).await,
-                        RepositoryState::Remote(RemoteRepositoryState { project_id, client }) => {
-                            client
-                                .request(proto::Stash {
-                                    project_id: project_id.0,
-                                    repository_id: id.to_proto(),
-                                    paths: entries
-                                        .into_iter()
-                                        .map(|repo_path| repo_path.to_proto())
-                                        .collect(),
-                                })
-                                .await
-                                .context("sending stash request")?;
-                            Ok(())
-                        }
-                    }
-                })
-            })?
-            .await??;
-            Ok(())
-        })
-    }
-
-    pub fn stash_pop(
-        &mut self,
-        index: Option<usize>,
-        cx: &mut Context<Self>,
-    ) -> Task<anyhow::Result<()>> {
-        let id = self.id;
-        cx.spawn(async move |this, cx| {
-            this.update(cx, |this, _| {
-                this.send_job(None, move |git_repo, _cx| async move {
-                    match git_repo {
-                        RepositoryState::Local(LocalRepositoryState {
-                            backend,
-                            environment,
-                            ..
-                        }) => backend.stash_pop(index, environment).await,
-                        RepositoryState::Remote(RemoteRepositoryState { project_id, client }) => {
-                            client
-                                .request(proto::StashPop {
-                                    project_id: project_id.0,
-                                    repository_id: id.to_proto(),
-                                    stash_index: index.map(|i| i as u64),
-                                })
-                                .await
-                                .context("sending stash pop request")?;
-                            Ok(())
-                        }
-                    }
-                })
-            })?
-            .await??;
-            Ok(())
-        })
-    }
-
-    pub fn stash_apply(
-        &mut self,
-        index: Option<usize>,
-        cx: &mut Context<Self>,
-    ) -> Task<anyhow::Result<()>> {
-        let id = self.id;
-        cx.spawn(async move |this, cx| {
-            this.update(cx, |this, _| {
-                this.send_job(None, move |git_repo, _cx| async move {
-                    match git_repo {
-                        RepositoryState::Local(LocalRepositoryState {
-                            backend,
-                            environment,
-                            ..
-                        }) => backend.stash_apply(index, environment).await,
-                        RepositoryState::Remote(RemoteRepositoryState { project_id, client }) => {
-                            client
-                                .request(proto::StashApply {
-                                    project_id: project_id.0,
-                                    repository_id: id.to_proto(),
-                                    stash_index: index.map(|i| i as u64),
-                                })
-                                .await
-                                .context("sending stash apply request")?;
-                            Ok(())
-                        }
-                    }
-                })
-            })?
-            .await??;
-            Ok(())
-        })
-    }
-
-    pub fn stash_drop(
-        &mut self,
-        index: Option<usize>,
-        cx: &mut Context<Self>,
-    ) -> oneshot::Receiver<anyhow::Result<()>> {
-        let id = self.id;
-        let updates_tx = self
-            .git_store()
-            .and_then(|git_store| match &git_store.read(cx).state {
-                GitStoreState::Local { downstream, .. } => downstream
-                    .as_ref()
-                    .map(|downstream| downstream.updates_tx.clone()),
-                _ => None,
-            });
-        let this = cx.weak_entity();
-        self.send_job(None, move |git_repo, mut cx| async move {
-            match git_repo {
-                RepositoryState::Local(LocalRepositoryState {
-                    backend,
-                    environment,
-                    ..
-                }) => {
-                    // TODO would be nice to not have to do this manually
-                    let result = backend.stash_drop(index, environment).await;
-                    if result.is_ok()
-                        && let Ok(stash_entries) = backend.stash_entries().await
-                    {
-                        let snapshot = this.update(&mut cx, |this, cx| {
-                            this.snapshot.stash_entries = stash_entries;
-                            cx.emit(RepositoryEvent::StashEntriesChanged);
-                            this.snapshot.clone()
-                        })?;
-                        if let Some(updates_tx) = updates_tx {
-                            updates_tx
-                                .unbounded_send(DownstreamUpdate::UpdateRepository(snapshot))
-                                .ok();
-                        }
-                    }
-
-                    result
-                }
-                RepositoryState::Remote(RemoteRepositoryState { project_id, client }) => {
-                    client
-                        .request(proto::StashDrop {
-                            project_id: project_id.0,
-                            repository_id: id.to_proto(),
-                            stash_index: index.map(|i| i as u64),
-                        })
-                        .await
-                        .context("sending stash pop request")?;
-                    Ok(())
-                }
-            }
-        })
-    }
-
-    pub fn run_hook(&mut self, hook: RunHook, _cx: &mut App) -> oneshot::Receiver<Result<()>> {
-        let id = self.id;
-        self.send_job(
-            Some(format!("git hook {}", hook.as_str()).into()),
-            move |git_repo, _cx| async move {
-                match git_repo {
-                    RepositoryState::Local(LocalRepositoryState {
-                        backend,
-                        environment,
-                        ..
-                    }) => backend.run_hook(hook, environment.clone()).await,
-                    RepositoryState::Remote(RemoteRepositoryState { project_id, client }) => {
-                        client
-                            .request(proto::RunGitHook {
-                                project_id: project_id.0,
-                                repository_id: id.to_proto(),
-                                hook: hook.to_proto(),
-                            })
-                            .await?;
-
-                        Ok(())
-                    }
-                }
-            },
-        )
-    }
-
-    pub fn commit(
-        &mut self,
-        message: SharedString,
-        name_and_email: Option<(SharedString, SharedString)>,
-        options: CommitOptions,
-        askpass: AskPassDelegate,
-        cx: &mut App,
-    ) -> oneshot::Receiver<Result<()>> {
-        let id = self.id;
-        let askpass_delegates = self.askpass_delegates.clone();
-        let askpass_id = util::post_inc(&mut self.latest_askpass_id);
-
-        let rx = self.run_hook(RunHook::PreCommit, cx);
-
-        self.send_job(Some("git commit".into()), move |git_repo, _cx| async move {
-            rx.await??;
-
-            match git_repo {
-                RepositoryState::Local(LocalRepositoryState {
-                    backend,
-                    environment,
-                    ..
-                }) => {
-                    backend
-                        .commit(message, name_and_email, options, askpass, environment)
-                        .await
-                }
-                RepositoryState::Remote(RemoteRepositoryState { project_id, client }) => {
-                    askpass_delegates.lock().insert(askpass_id, askpass);
-                    let _defer = util::defer(|| {
-                        let askpass_delegate = askpass_delegates.lock().remove(&askpass_id);
-                        debug_assert!(askpass_delegate.is_some());
-                    });
-                    let (name, email) = name_and_email.unzip();
-                    client
-                        .request(proto::Commit {
-                            project_id: project_id.0,
-                            repository_id: id.to_proto(),
-                            message: String::from(message),
-                            name: name.map(String::from),
-                            email: email.map(String::from),
-                            options: Some(proto::commit::CommitOptions {
-                                amend: options.amend,
-                                signoff: options.signoff,
-                            }),
-                            askpass_id,
-                        })
-                        .await
-                        .context("sending commit request")?;
-
-                    Ok(())
-                }
-            }
-        })
-    }
-
-    pub fn fetch(
-        &mut self,
-        fetch_options: FetchOptions,
-        askpass: AskPassDelegate,
-        _cx: &mut App,
-    ) -> oneshot::Receiver<Result<RemoteCommandOutput>> {
-        let askpass_delegates = self.askpass_delegates.clone();
-        let askpass_id = util::post_inc(&mut self.latest_askpass_id);
-        let id = self.id;
-
-        self.send_job(Some("git fetch".into()), move |git_repo, cx| async move {
-            match git_repo {
-                RepositoryState::Local(LocalRepositoryState {
-                    backend,
-                    environment,
-                    ..
-                }) => backend.fetch(fetch_options, askpass, environment, cx).await,
-                RepositoryState::Remote(RemoteRepositoryState { project_id, client }) => {
-                    askpass_delegates.lock().insert(askpass_id, askpass);
-                    let _defer = util::defer(|| {
-                        let askpass_delegate = askpass_delegates.lock().remove(&askpass_id);
-                        debug_assert!(askpass_delegate.is_some());
-                    });
-
-                    let response = client
-                        .request(proto::Fetch {
-                            project_id: project_id.0,
-                            repository_id: id.to_proto(),
-                            askpass_id,
-                            remote: fetch_options.to_proto(),
-                        })
-                        .await
-                        .context("sending fetch request")?;
-
-                    Ok(RemoteCommandOutput {
-                        stdout: response.stdout,
-                        stderr: response.stderr,
-                    })
-                }
-            }
-        })
-    }
-
-    pub fn push(
-        &mut self,
-        branch: SharedString,
-        remote: SharedString,
-        options: Option<PushOptions>,
-        askpass: AskPassDelegate,
-        cx: &mut Context<Self>,
-    ) -> oneshot::Receiver<Result<RemoteCommandOutput>> {
-        let askpass_delegates = self.askpass_delegates.clone();
-        let askpass_id = util::post_inc(&mut self.latest_askpass_id);
-        let id = self.id;
-
-        let args = options
-            .map(|option| match option {
-                PushOptions::SetUpstream => " --set-upstream",
-                PushOptions::Force => " --force-with-lease",
-            })
-            .unwrap_or("");
-
-        let updates_tx = self
-            .git_store()
-            .and_then(|git_store| match &git_store.read(cx).state {
-                GitStoreState::Local { downstream, .. } => downstream
-                    .as_ref()
-                    .map(|downstream| downstream.updates_tx.clone()),
-                _ => None,
-            });
-
-        let this = cx.weak_entity();
-        self.send_job(
-            Some(format!("git push {} {} {}", args, remote, branch).into()),
-            move |git_repo, mut cx| async move {
-                match git_repo {
-                    RepositoryState::Local(LocalRepositoryState {
-                        backend,
-                        environment,
-                        ..
-                    }) => {
-                        let result = backend
-                            .push(
-                                branch.to_string(),
-                                remote.to_string(),
-                                options,
-                                askpass,
-                                environment.clone(),
-                                cx.clone(),
-                            )
-                            .await;
-                        // TODO would be nice to not have to do this manually
-                        if result.is_ok() {
-                            let branches = backend.branches().await?;
-                            let branch = branches.into_iter().find(|branch| branch.is_head);
-                            log::info!("head branch after scan is {branch:?}");
-                            let snapshot = this.update(&mut cx, |this, cx| {
-                                this.snapshot.branch = branch;
-                                cx.emit(RepositoryEvent::BranchChanged);
-                                this.snapshot.clone()
-                            })?;
-                            if let Some(updates_tx) = updates_tx {
-                                updates_tx
-                                    .unbounded_send(DownstreamUpdate::UpdateRepository(snapshot))
-                                    .ok();
-                            }
-                        }
-                        result
-                    }
-                    RepositoryState::Remote(RemoteRepositoryState { project_id, client }) => {
-                        askpass_delegates.lock().insert(askpass_id, askpass);
-                        let _defer = util::defer(|| {
-                            let askpass_delegate = askpass_delegates.lock().remove(&askpass_id);
-                            debug_assert!(askpass_delegate.is_some());
-                        });
-                        let response = client
-                            .request(proto::Push {
-                                project_id: project_id.0,
-                                repository_id: id.to_proto(),
-                                askpass_id,
-                                branch_name: branch.to_string(),
-                                remote_name: remote.to_string(),
-                                options: options.map(|options| match options {
-                                    PushOptions::Force => proto::push::PushOptions::Force,
-                                    PushOptions::SetUpstream => {
-                                        proto::push::PushOptions::SetUpstream
-                                    }
-                                }
-                                    as i32),
-                            })
-                            .await
-                            .context("sending push request")?;
-
-                        Ok(RemoteCommandOutput {
-                            stdout: response.stdout,
-                            stderr: response.stderr,
-                        })
-                    }
-                }
-            },
-        )
-    }
-
-    pub fn pull(
-        &mut self,
-        branch: Option<SharedString>,
-        remote: SharedString,
-        rebase: bool,
-        askpass: AskPassDelegate,
-        _cx: &mut App,
-    ) -> oneshot::Receiver<Result<RemoteCommandOutput>> {
-        let askpass_delegates = self.askpass_delegates.clone();
-        let askpass_id = util::post_inc(&mut self.latest_askpass_id);
-        let id = self.id;
-
-        let mut status = "git pull".to_string();
-        if rebase {
-            status.push_str(" --rebase");
-        }
-        status.push_str(&format!(" {}", remote));
-        if let Some(b) = &branch {
-            status.push_str(&format!(" {}", b));
-        }
-
-        self.send_job(Some(status.into()), move |git_repo, cx| async move {
-            match git_repo {
-                RepositoryState::Local(LocalRepositoryState {
-                    backend,
-                    environment,
-                    ..
-                }) => {
-                    backend
-                        .pull(
-                            branch.as_ref().map(|b| b.to_string()),
-                            remote.to_string(),
-                            rebase,
-                            askpass,
-                            environment.clone(),
-                            cx,
-                        )
-                        .await
-                }
-                RepositoryState::Remote(RemoteRepositoryState { project_id, client }) => {
-                    askpass_delegates.lock().insert(askpass_id, askpass);
-                    let _defer = util::defer(|| {
-                        let askpass_delegate = askpass_delegates.lock().remove(&askpass_id);
-                        debug_assert!(askpass_delegate.is_some());
-                    });
-                    let response = client
-                        .request(proto::Pull {
-                            project_id: project_id.0,
-                            repository_id: id.to_proto(),
-                            askpass_id,
-                            rebase,
-                            branch_name: branch.as_ref().map(|b| b.to_string()),
-                            remote_name: remote.to_string(),
-                        })
-                        .await
-                        .context("sending pull request")?;
-
-                    Ok(RemoteCommandOutput {
-                        stdout: response.stdout,
-                        stderr: response.stderr,
-                    })
-                }
-            }
-        })
-    }
-
-    fn spawn_set_index_text_job(
-        &mut self,
-        path: RepoPath,
-        content: Option<String>,
-        hunk_staging_operation_count: Option<usize>,
-        cx: &mut Context<Self>,
-    ) -> oneshot::Receiver<anyhow::Result<()>> {
-        let id = self.id;
-        let this = cx.weak_entity();
-        let git_store = self.git_store.clone();
-        let abs_path = self.snapshot.repo_path_to_abs_path(&path);
-        self.send_keyed_job(
-            Some(GitJobKey::WriteIndex(vec![path.clone()])),
-            None,
-            move |git_repo, mut cx| async move {
-                log::debug!(
-                    "start updating index text for buffer {}",
-                    path.as_unix_str()
-                );
-
-                match git_repo {
-                    RepositoryState::Local(LocalRepositoryState {
-                        fs,
-                        backend,
-                        environment,
-                        ..
-                    }) => {
-                        let executable = match fs.metadata(&abs_path).await {
-                            Ok(Some(meta)) => meta.is_executable,
-                            Ok(None) => false,
-                            Err(_err) => false,
-                        };
-                        backend
-                            .set_index_text(path.clone(), content, environment.clone(), executable)
-                            .await?;
-                    }
-                    RepositoryState::Remote(RemoteRepositoryState { project_id, client }) => {
-                        client
-                            .request(proto::SetIndexText {
-                                project_id: project_id.0,
-                                repository_id: id.to_proto(),
-                                path: path.to_proto(),
-                                text: content,
-                            })
-                            .await?;
-                    }
-                }
-                log::debug!(
-                    "finish updating index text for buffer {}",
-                    path.as_unix_str()
-                );
-
-                if let Some(hunk_staging_operation_count) = hunk_staging_operation_count {
-                    let project_path = this
-                        .read_with(&cx, |this, cx| this.repo_path_to_project_path(&path, cx))
-                        .ok()
-                        .flatten();
-                    git_store.update(&mut cx, |git_store, cx| {
-                        let buffer_id = git_store
-                            .buffer_store
-                            .read(cx)
-                            .get_by_path(&project_path?)?
-                            .read(cx)
-                            .remote_id();
-                        let diff_state = git_store.diffs.get(&buffer_id)?;
-                        diff_state.update(cx, |diff_state, _| {
-                            diff_state.hunk_staging_operation_count_as_of_write =
-                                hunk_staging_operation_count;
-                        });
-                        Some(())
-                    })?;
-                }
-                Ok(())
-            },
-        )
-    }
-
-    pub fn create_remote(
-        &mut self,
-        remote_name: String,
-        remote_url: String,
-    ) -> oneshot::Receiver<Result<()>> {
-        let id = self.id;
-        self.send_job(
-            Some(format!("git remote add {remote_name} {remote_url}").into()),
-            move |repo, _cx| async move {
-                match repo {
-                    RepositoryState::Local(LocalRepositoryState { backend, .. }) => {
-                        backend.create_remote(remote_name, remote_url).await
-                    }
-                    RepositoryState::Remote(RemoteRepositoryState { project_id, client }) => {
-                        client
-                            .request(proto::GitCreateRemote {
-                                project_id: project_id.0,
-                                repository_id: id.to_proto(),
-                                remote_name,
-                                remote_url,
-                            })
-                            .await?;
-
-                        Ok(())
-                    }
-                }
-            },
-        )
-    }
-
-    pub fn remove_remote(&mut self, remote_name: String) -> oneshot::Receiver<Result<()>> {
-        let id = self.id;
-        self.send_job(
-            Some(format!("git remove remote {remote_name}").into()),
-            move |repo, _cx| async move {
-                match repo {
-                    RepositoryState::Local(LocalRepositoryState { backend, .. }) => {
-                        backend.remove_remote(remote_name).await
-                    }
-                    RepositoryState::Remote(RemoteRepositoryState { project_id, client }) => {
-                        client
-                            .request(proto::GitRemoveRemote {
-                                project_id: project_id.0,
-                                repository_id: id.to_proto(),
-                                remote_name,
-                            })
-                            .await?;
-
-                        Ok(())
-                    }
-                }
-            },
-        )
-    }
-
-    pub fn get_remotes(
-        &mut self,
-        branch_name: Option<String>,
-        is_push: bool,
-    ) -> oneshot::Receiver<Result<Vec<Remote>>> {
-        let id = self.id;
-        self.send_job(None, move |repo, _cx| async move {
-            match repo {
-                RepositoryState::Local(LocalRepositoryState { backend, .. }) => {
-                    let remote = if let Some(branch_name) = branch_name {
-                        if is_push {
-                            backend.get_push_remote(branch_name).await?
-                        } else {
-                            backend.get_branch_remote(branch_name).await?
-                        }
-                    } else {
-                        None
-                    };
-
-                    match remote {
-                        Some(remote) => Ok(vec![remote]),
-                        None => backend.get_all_remotes().await,
-                    }
-                }
-                RepositoryState::Remote(RemoteRepositoryState { project_id, client }) => {
-                    let response = client
-                        .request(proto::GetRemotes {
-                            project_id: project_id.0,
-                            repository_id: id.to_proto(),
-                            branch_name,
-                            is_push,
-                        })
-                        .await?;
-
-                    let remotes = response
-                        .remotes
-                        .into_iter()
-                        .map(|remotes| Remote {
-                            name: remotes.name.into(),
-                        })
-                        .collect();
-
-                    Ok(remotes)
-                }
-            }
-        })
-    }
-
-    pub fn branches(&mut self) -> oneshot::Receiver<Result<Vec<Branch>>> {
-        let id = self.id;
-        self.send_job(None, move |repo, _| async move {
-            match repo {
-                RepositoryState::Local(LocalRepositoryState { backend, .. }) => {
-                    backend.branches().await
-                }
-                RepositoryState::Remote(RemoteRepositoryState { project_id, client }) => {
-                    let response = client
-                        .request(proto::GitGetBranches {
-                            project_id: project_id.0,
-                            repository_id: id.to_proto(),
-                        })
-                        .await?;
-
-                    let branches = response
-                        .branches
-                        .into_iter()
-                        .map(|branch| proto_to_branch(&branch))
-                        .collect();
-
-                    Ok(branches)
-                }
-            }
-        })
-    }
-
-    pub fn worktrees(&mut self) -> oneshot::Receiver<Result<Vec<GitWorktree>>> {
-        let id = self.id;
-        self.send_job(None, move |repo, _| async move {
-            match repo {
-                RepositoryState::Local(LocalRepositoryState { backend, .. }) => {
-                    backend.worktrees().await
-                }
-                RepositoryState::Remote(RemoteRepositoryState { project_id, client }) => {
-                    let response = client
-                        .request(proto::GitGetWorktrees {
-                            project_id: project_id.0,
-                            repository_id: id.to_proto(),
-                        })
-                        .await?;
-
-                    let worktrees = response
-                        .worktrees
-                        .into_iter()
-                        .map(|worktree| proto_to_worktree(&worktree))
-                        .collect();
-
-                    Ok(worktrees)
-                }
-            }
-        })
-    }
-
-    pub fn create_worktree(
-        &mut self,
-        name: String,
-        path: PathBuf,
-        commit: Option<String>,
-    ) -> oneshot::Receiver<Result<()>> {
-        let id = self.id;
-        self.send_job(
-            Some("git worktree add".into()),
-            move |repo, _cx| async move {
-                match repo {
-                    RepositoryState::Local(LocalRepositoryState { backend, .. }) => {
-                        backend.create_worktree(name, path, commit).await
-                    }
-                    RepositoryState::Remote(RemoteRepositoryState { project_id, client }) => {
-                        client
-                            .request(proto::GitCreateWorktree {
-                                project_id: project_id.0,
-                                repository_id: id.to_proto(),
-                                name,
-                                directory: path.to_string_lossy().to_string(),
-                                commit,
-                            })
-                            .await?;
-
-                        Ok(())
-                    }
-                }
-            },
-        )
-    }
-
-    pub fn default_branch(&mut self) -> oneshot::Receiver<Result<Option<SharedString>>> {
-        let id = self.id;
-        self.send_job(None, move |repo, _| async move {
-            match repo {
-                RepositoryState::Local(LocalRepositoryState { backend, .. }) => {
-                    backend.default_branch().await
-                }
-                RepositoryState::Remote(RemoteRepositoryState { project_id, client }) => {
-                    let response = client
-                        .request(proto::GetDefaultBranch {
-                            project_id: project_id.0,
-                            repository_id: id.to_proto(),
-                        })
-                        .await?;
-
-                    anyhow::Ok(response.branch.map(SharedString::from))
-                }
-            }
-        })
-    }
-
-    pub fn diff_tree(
-        &mut self,
-        diff_type: DiffTreeType,
-        _cx: &App,
-    ) -> oneshot::Receiver<Result<TreeDiff>> {
-        let repository_id = self.snapshot.id;
-        self.send_job(None, move |repo, _cx| async move {
-            match repo {
-                RepositoryState::Local(LocalRepositoryState { backend, .. }) => {
-                    backend.diff_tree(diff_type).await
-                }
-                RepositoryState::Remote(RemoteRepositoryState { client, project_id }) => {
-                    let response = client
-                        .request(proto::GetTreeDiff {
-                            project_id: project_id.0,
-                            repository_id: repository_id.0,
-                            is_merge: matches!(diff_type, DiffTreeType::MergeBase { .. }),
-                            base: diff_type.base().to_string(),
-                            head: diff_type.head().to_string(),
-                        })
-                        .await?;
-
-                    let entries = response
-                        .entries
-                        .into_iter()
-                        .filter_map(|entry| {
-                            let status = match entry.status() {
-                                proto::tree_diff_status::Status::Added => TreeDiffStatus::Added,
-                                proto::tree_diff_status::Status::Modified => {
-                                    TreeDiffStatus::Modified {
-                                        old: git::Oid::from_str(
-                                            &entry.oid.context("missing oid").log_err()?,
-                                        )
-                                        .log_err()?,
-                                    }
-                                }
-                                proto::tree_diff_status::Status::Deleted => {
-                                    TreeDiffStatus::Deleted {
-                                        old: git::Oid::from_str(
-                                            &entry.oid.context("missing oid").log_err()?,
-                                        )
-                                        .log_err()?,
-                                    }
-                                }
-                            };
-                            Some((
-                                RepoPath::from_rel_path(
-                                    &RelPath::from_proto(&entry.path).log_err()?,
-                                ),
-                                status,
-                            ))
-                        })
-                        .collect();
-
-                    Ok(TreeDiff { entries })
-                }
-            }
-        })
-    }
-
-    pub fn diff(&mut self, diff_type: DiffType, _cx: &App) -> oneshot::Receiver<Result<String>> {
-        let id = self.id;
-        self.send_job(None, move |repo, _cx| async move {
-            match repo {
-                RepositoryState::Local(LocalRepositoryState { backend, .. }) => {
-                    backend.diff(diff_type).await
-                }
-                RepositoryState::Remote(RemoteRepositoryState { project_id, client }) => {
-                    let response = client
-                        .request(proto::GitDiff {
-                            project_id: project_id.0,
-                            repository_id: id.to_proto(),
-                            diff_type: match diff_type {
-                                DiffType::HeadToIndex => {
-                                    proto::git_diff::DiffType::HeadToIndex.into()
-                                }
-                                DiffType::HeadToWorktree => {
-                                    proto::git_diff::DiffType::HeadToWorktree.into()
-                                }
-                            },
-                        })
-                        .await?;
-
-                    Ok(response.diff)
-                }
-            }
-        })
-    }
-
-    pub fn create_branch(
-        &mut self,
-        branch_name: String,
-        base_branch: Option<String>,
-    ) -> oneshot::Receiver<Result<()>> {
-        let id = self.id;
-        let status_msg = if let Some(ref base) = base_branch {
-            format!("git switch -c {branch_name} {base}").into()
-        } else {
-            format!("git switch -c {branch_name}").into()
-        };
-        self.send_job(Some(status_msg), move |repo, _cx| async move {
-            match repo {
-                RepositoryState::Local(LocalRepositoryState { backend, .. }) => {
-                    backend.create_branch(branch_name, base_branch).await
-                }
-                RepositoryState::Remote(RemoteRepositoryState { project_id, client }) => {
-                    client
-                        .request(proto::GitCreateBranch {
-                            project_id: project_id.0,
-                            repository_id: id.to_proto(),
-                            branch_name,
-                        })
-                        .await?;
-
-                    Ok(())
-                }
-            }
-        })
-    }
-
-    pub fn change_branch(&mut self, branch_name: String) -> oneshot::Receiver<Result<()>> {
-        let id = self.id;
-        self.send_job(
-            Some(format!("git switch {branch_name}").into()),
-            move |repo, _cx| async move {
-                match repo {
-                    RepositoryState::Local(LocalRepositoryState { backend, .. }) => {
-                        backend.change_branch(branch_name).await
-                    }
-                    RepositoryState::Remote(RemoteRepositoryState { project_id, client }) => {
-                        client
-                            .request(proto::GitChangeBranch {
-                                project_id: project_id.0,
-                                repository_id: id.to_proto(),
-                                branch_name,
-                            })
-                            .await?;
-
-                        Ok(())
-                    }
-                }
-            },
-        )
-    }
-
-    pub fn delete_branch(&mut self, branch_name: String) -> oneshot::Receiver<Result<()>> {
-        let id = self.id;
-        self.send_job(
-            Some(format!("git branch -d {branch_name}").into()),
-            move |repo, _cx| async move {
-                match repo {
-                    RepositoryState::Local(state) => state.backend.delete_branch(branch_name).await,
-                    RepositoryState::Remote(RemoteRepositoryState { project_id, client }) => {
-                        client
-                            .request(proto::GitDeleteBranch {
-                                project_id: project_id.0,
-                                repository_id: id.to_proto(),
-                                branch_name,
-                            })
-                            .await?;
-
-                        Ok(())
-                    }
-                }
-            },
-        )
-    }
-
-    pub fn rename_branch(
-        &mut self,
-        branch: String,
-        new_name: String,
-    ) -> oneshot::Receiver<Result<()>> {
-        let id = self.id;
-        self.send_job(
-            Some(format!("git branch -m {branch} {new_name}").into()),
-            move |repo, _cx| async move {
-                match repo {
-                    RepositoryState::Local(LocalRepositoryState { backend, .. }) => {
-                        backend.rename_branch(branch, new_name).await
-                    }
-                    RepositoryState::Remote(RemoteRepositoryState { project_id, client }) => {
-                        client
-                            .request(proto::GitRenameBranch {
-                                project_id: project_id.0,
-                                repository_id: id.to_proto(),
-                                branch,
-                                new_name,
-                            })
-                            .await?;
-
-                        Ok(())
-                    }
-                }
-            },
-        )
-    }
-
-    pub fn check_for_pushed_commits(&mut self) -> oneshot::Receiver<Result<Vec<SharedString>>> {
-        let id = self.id;
-        self.send_job(None, move |repo, _cx| async move {
-            match repo {
-                RepositoryState::Local(LocalRepositoryState { backend, .. }) => {
-                    backend.check_for_pushed_commit().await
-                }
-                RepositoryState::Remote(RemoteRepositoryState { project_id, client }) => {
-                    let response = client
-                        .request(proto::CheckForPushedCommits {
-                            project_id: project_id.0,
-                            repository_id: id.to_proto(),
-                        })
-                        .await?;
-
-                    let branches = response.pushed_to.into_iter().map(Into::into).collect();
-
-                    Ok(branches)
-                }
-            }
-        })
-    }
-
-    pub fn checkpoint(&mut self) -> oneshot::Receiver<Result<GitRepositoryCheckpoint>> {
-        self.send_job(None, |repo, _cx| async move {
-            match repo {
-                RepositoryState::Local(LocalRepositoryState { backend, .. }) => {
-                    backend.checkpoint().await
-                }
-                RepositoryState::Remote(..) => anyhow::bail!("not implemented yet"),
-            }
-        })
-    }
-
-    pub fn restore_checkpoint(
-        &mut self,
-        checkpoint: GitRepositoryCheckpoint,
-    ) -> oneshot::Receiver<Result<()>> {
-        self.send_job(None, move |repo, _cx| async move {
-            match repo {
-                RepositoryState::Local(LocalRepositoryState { backend, .. }) => {
-                    backend.restore_checkpoint(checkpoint).await
-                }
-                RepositoryState::Remote { .. } => anyhow::bail!("not implemented yet"),
-            }
-        })
-    }
-
-    pub(crate) fn apply_remote_update(
-        &mut self,
-        update: proto::UpdateRepository,
-        cx: &mut Context<Self>,
-    ) -> Result<()> {
-        let conflicted_paths = TreeSet::from_ordered_entries(
-            update
-                .current_merge_conflicts
-                .into_iter()
-                .filter_map(|path| RepoPath::from_proto(&path).log_err()),
-        );
-        let new_branch = update.branch_summary.as_ref().map(proto_to_branch);
-        let new_head_commit = update
-            .head_commit_details
-            .as_ref()
-            .map(proto_to_commit_details);
-        if self.snapshot.branch != new_branch || self.snapshot.head_commit != new_head_commit {
-            cx.emit(RepositoryEvent::BranchChanged)
-        }
-        self.snapshot.branch = new_branch;
-        self.snapshot.head_commit = new_head_commit;
-
-        self.snapshot.merge.conflicted_paths = conflicted_paths;
-        self.snapshot.merge.message = update.merge_message.map(SharedString::from);
-        let new_stash_entries = GitStash {
-            entries: update
-                .stash_entries
-                .iter()
-                .filter_map(|entry| proto_to_stash(entry).ok())
-                .collect(),
-        };
-        if self.snapshot.stash_entries != new_stash_entries {
-            cx.emit(RepositoryEvent::StashEntriesChanged)
-        }
-        self.snapshot.stash_entries = new_stash_entries;
-        self.snapshot.remote_upstream_url = update.remote_upstream_url;
-        self.snapshot.remote_origin_url = update.remote_origin_url;
-
-        let edits = update
-            .removed_statuses
-            .into_iter()
-            .filter_map(|path| {
-                Some(sum_tree::Edit::Remove(PathKey(
-                    RelPath::from_proto(&path).log_err()?,
-                )))
-            })
-            .chain(
-                update
-                    .updated_statuses
-                    .into_iter()
-                    .filter_map(|updated_status| {
-                        Some(sum_tree::Edit::Insert(updated_status.try_into().log_err()?))
-                    }),
-            )
-            .collect::<Vec<_>>();
-        if !edits.is_empty() {
-            cx.emit(RepositoryEvent::StatusesChanged);
-        }
-        self.snapshot.statuses_by_path.edit(edits, ());
-        if update.is_last_update {
-            self.snapshot.scan_id = update.scan_id;
-        }
-        self.clear_pending_ops(cx);
-        Ok(())
-    }
-
-    pub fn compare_checkpoints(
-        &mut self,
-        left: GitRepositoryCheckpoint,
-        right: GitRepositoryCheckpoint,
-    ) -> oneshot::Receiver<Result<bool>> {
-        self.send_job(None, move |repo, _cx| async move {
-            match repo {
-                RepositoryState::Local(LocalRepositoryState { backend, .. }) => {
-                    backend.compare_checkpoints(left, right).await
-                }
-                RepositoryState::Remote { .. } => anyhow::bail!("not implemented yet"),
-            }
-        })
-    }
-
-    pub fn diff_checkpoints(
-        &mut self,
-        base_checkpoint: GitRepositoryCheckpoint,
-        target_checkpoint: GitRepositoryCheckpoint,
-    ) -> oneshot::Receiver<Result<String>> {
-        self.send_job(None, move |repo, _cx| async move {
-            match repo {
-                RepositoryState::Local(LocalRepositoryState { backend, .. }) => {
-                    backend
-                        .diff_checkpoints(base_checkpoint, target_checkpoint)
-                        .await
-                }
-                RepositoryState::Remote { .. } => anyhow::bail!("not implemented yet"),
-            }
-        })
-    }
-
-    fn clear_pending_ops(&mut self, cx: &mut Context<Self>) {
-        let updated = SumTree::from_iter(
-            self.pending_ops.iter().filter_map(|ops| {
-                let inner_ops: Vec<PendingOp> =
-                    ops.ops.iter().filter(|op| op.running()).cloned().collect();
-                if inner_ops.is_empty() {
-                    None
-                } else {
-                    Some(PendingOps {
-                        repo_path: ops.repo_path.clone(),
-                        ops: inner_ops,
-                    })
-                }
-            }),
-            (),
-        );
-
-        if updated != self.pending_ops {
-            cx.emit(RepositoryEvent::PendingOpsChanged {
-                pending_ops: self.pending_ops.clone(),
-            })
-        }
-
-        self.pending_ops = updated;
-    }
-
-    fn schedule_scan(
-        &mut self,
-        updates_tx: Option<mpsc::UnboundedSender<DownstreamUpdate>>,
-        cx: &mut Context<Self>,
-    ) {
-        let this = cx.weak_entity();
-        let _ = self.send_keyed_job(
-            Some(GitJobKey::ReloadGitState),
-            None,
-            |state, mut cx| async move {
-                log::debug!("run scheduled git status scan");
-
-                let Some(this) = this.upgrade() else {
-                    return Ok(());
-                };
-                let RepositoryState::Local(LocalRepositoryState { backend, .. }) = state else {
-                    bail!("not a local repository")
-                };
-                let (snapshot, events) = this
-                    .update(&mut cx, |this, _| {
-                        this.paths_needing_status_update.clear();
-                        compute_snapshot(
-                            this.id,
-                            this.work_directory_abs_path.clone(),
-                            this.snapshot.clone(),
-                            backend.clone(),
-                        )
-                    })?
-                    .await?;
-                this.update(&mut cx, |this, cx| {
-                    this.snapshot = snapshot.clone();
-                    this.clear_pending_ops(cx);
-                    for event in events {
-                        cx.emit(event);
-                    }
-                })?;
-                if let Some(updates_tx) = updates_tx {
-                    updates_tx
-                        .unbounded_send(DownstreamUpdate::UpdateRepository(snapshot))
-                        .ok();
-                }
-                Ok(())
-            },
-        );
-    }
-
-    fn spawn_local_git_worker(
-        state: Shared<Task<Result<LocalRepositoryState, String>>>,
-        cx: &mut Context<Self>,
-    ) -> mpsc::UnboundedSender<GitJob> {
-        let (job_tx, mut job_rx) = mpsc::unbounded::<GitJob>();
-
-        cx.spawn(async move |_, cx| {
-            let state = state.await.map_err(|err| anyhow::anyhow!(err))?;
-            if let Some(git_hosting_provider_registry) =
-                cx.update(|cx| GitHostingProviderRegistry::try_global(cx))?
-            {
-                git_hosting_providers::register_additional_providers(
-                    git_hosting_provider_registry,
-                    state.backend.clone(),
-                )
-                .await;
-            }
-            let state = RepositoryState::Local(state);
-            let mut jobs = VecDeque::new();
-            loop {
-                while let Ok(Some(next_job)) = job_rx.try_next() {
-                    jobs.push_back(next_job);
-                }
-
-                if let Some(job) = jobs.pop_front() {
-                    if let Some(current_key) = &job.key
-                        && jobs
-                            .iter()
-                            .any(|other_job| other_job.key.as_ref() == Some(current_key))
-                    {
-                        continue;
-                    }
-                    (job.job)(state.clone(), cx).await;
-                } else if let Some(job) = job_rx.next().await {
-                    jobs.push_back(job);
-                } else {
-                    break;
-                }
-            }
-            anyhow::Ok(())
-        })
-        .detach_and_log_err(cx);
-
-        job_tx
-    }
-
-    fn spawn_remote_git_worker(
-        state: RemoteRepositoryState,
-        cx: &mut Context<Self>,
-    ) -> mpsc::UnboundedSender<GitJob> {
-        let (job_tx, mut job_rx) = mpsc::unbounded::<GitJob>();
-
-        cx.spawn(async move |_, cx| {
-            let state = RepositoryState::Remote(state);
-            let mut jobs = VecDeque::new();
-            loop {
-                while let Ok(Some(next_job)) = job_rx.try_next() {
-                    jobs.push_back(next_job);
-                }
-
-                if let Some(job) = jobs.pop_front() {
-                    if let Some(current_key) = &job.key
-                        && jobs
-                            .iter()
-                            .any(|other_job| other_job.key.as_ref() == Some(current_key))
-                    {
-                        continue;
-                    }
-                    (job.job)(state.clone(), cx).await;
-                } else if let Some(job) = job_rx.next().await {
-                    jobs.push_back(job);
-                } else {
-                    break;
-                }
-            }
-            anyhow::Ok(())
-        })
-        .detach_and_log_err(cx);
-
-        job_tx
-    }
-
-    fn load_staged_text(
-        &mut self,
-        buffer_id: BufferId,
-        repo_path: RepoPath,
-        cx: &App,
-    ) -> Task<Result<Option<String>>> {
-        let rx = self.send_job(None, move |state, _| async move {
-            match state {
-                RepositoryState::Local(LocalRepositoryState { backend, .. }) => {
-                    anyhow::Ok(backend.load_index_text(repo_path).await)
-                }
-                RepositoryState::Remote(RemoteRepositoryState { project_id, client }) => {
-                    let response = client
-                        .request(proto::OpenUnstagedDiff {
-                            project_id: project_id.to_proto(),
-                            buffer_id: buffer_id.to_proto(),
-                        })
-                        .await?;
-                    Ok(response.staged_text)
-                }
-            }
-        });
-        cx.spawn(|_: &mut AsyncApp| async move { rx.await? })
-    }
-
-    fn load_committed_text(
-        &mut self,
-        buffer_id: BufferId,
-        repo_path: RepoPath,
-        cx: &App,
-    ) -> Task<Result<DiffBasesChange>> {
-        let rx = self.send_job(None, move |state, _| async move {
-            match state {
-                RepositoryState::Local(LocalRepositoryState { backend, .. }) => {
-                    let committed_text = backend.load_committed_text(repo_path.clone()).await;
-                    let staged_text = backend.load_index_text(repo_path).await;
-                    let diff_bases_change = if committed_text == staged_text {
-                        DiffBasesChange::SetBoth(committed_text)
-                    } else {
-                        DiffBasesChange::SetEach {
-                            index: staged_text,
-                            head: committed_text,
-                        }
-                    };
-                    anyhow::Ok(diff_bases_change)
-                }
-                RepositoryState::Remote(RemoteRepositoryState { project_id, client }) => {
-                    use proto::open_uncommitted_diff_response::Mode;
-
-                    let response = client
-                        .request(proto::OpenUncommittedDiff {
-                            project_id: project_id.to_proto(),
-                            buffer_id: buffer_id.to_proto(),
-                        })
-                        .await?;
-                    let mode = Mode::from_i32(response.mode).context("Invalid mode")?;
-                    let bases = match mode {
-                        Mode::IndexMatchesHead => DiffBasesChange::SetBoth(response.committed_text),
-                        Mode::IndexAndHead => DiffBasesChange::SetEach {
-                            head: response.committed_text,
-                            index: response.staged_text,
-                        },
-                    };
-                    Ok(bases)
-                }
-            }
-        });
-
-        cx.spawn(|_: &mut AsyncApp| async move { rx.await? })
-    }
-    fn load_blob_content(&mut self, oid: Oid, cx: &App) -> Task<Result<String>> {
-        let repository_id = self.snapshot.id;
-        let rx = self.send_job(None, move |state, _| async move {
-            match state {
-                RepositoryState::Local(LocalRepositoryState { backend, .. }) => {
-                    backend.load_blob_content(oid).await
-                }
-                RepositoryState::Remote(RemoteRepositoryState { client, project_id }) => {
-                    let response = client
-                        .request(proto::GetBlobContent {
-                            project_id: project_id.to_proto(),
-                            repository_id: repository_id.0,
-                            oid: oid.to_string(),
-                        })
-                        .await?;
-                    Ok(response.content)
-                }
-            }
-        });
-        cx.spawn(|_: &mut AsyncApp| async move { rx.await? })
-    }
-
-    fn paths_changed(
-        &mut self,
-        paths: Vec<RepoPath>,
-        updates_tx: Option<mpsc::UnboundedSender<DownstreamUpdate>>,
-        cx: &mut Context<Self>,
-    ) {
-        self.paths_needing_status_update.extend(paths);
-
-        let this = cx.weak_entity();
-        let _ = self.send_keyed_job(
-            Some(GitJobKey::RefreshStatuses),
-            None,
-            |state, mut cx| async move {
-                let (prev_snapshot, mut changed_paths) = this.update(&mut cx, |this, _| {
-                    (
-                        this.snapshot.clone(),
-                        mem::take(&mut this.paths_needing_status_update),
-                    )
-                })?;
-                let RepositoryState::Local(LocalRepositoryState { backend, .. }) = state else {
-                    bail!("not a local repository")
-                };
-
-                let paths = changed_paths.iter().cloned().collect::<Vec<_>>();
-                if paths.is_empty() {
-                    return Ok(());
-                }
-                let statuses = backend.status(&paths).await?;
-                let stash_entries = backend.stash_entries().await?;
-
-                let changed_path_statuses = cx
-                    .background_spawn(async move {
-                        let mut changed_path_statuses = Vec::new();
-                        let prev_statuses = prev_snapshot.statuses_by_path.clone();
-                        let mut cursor = prev_statuses.cursor::<PathProgress>(());
-
-                        for (repo_path, status) in &*statuses.entries {
-                            changed_paths.remove(repo_path);
-                            if cursor.seek_forward(&PathTarget::Path(repo_path), Bias::Left)
-                                && cursor.item().is_some_and(|entry| entry.status == *status)
-                            {
-                                continue;
-                            }
-
-                            changed_path_statuses.push(Edit::Insert(StatusEntry {
-                                repo_path: repo_path.clone(),
-                                status: *status,
-                            }));
-                        }
-                        let mut cursor = prev_statuses.cursor::<PathProgress>(());
-                        for path in changed_paths.into_iter() {
-                            if cursor.seek_forward(&PathTarget::Path(&path), Bias::Left) {
-                                changed_path_statuses
-                                    .push(Edit::Remove(PathKey(path.as_ref().clone())));
-                            }
-                        }
-                        changed_path_statuses
-                    })
-                    .await;
-
-                this.update(&mut cx, |this, cx| {
-                    if this.snapshot.stash_entries != stash_entries {
-                        cx.emit(RepositoryEvent::StashEntriesChanged);
-                        this.snapshot.stash_entries = stash_entries;
-                    }
-
-                    if !changed_path_statuses.is_empty() {
-                        cx.emit(RepositoryEvent::StatusesChanged);
-                        this.snapshot
-                            .statuses_by_path
-                            .edit(changed_path_statuses, ());
-                        this.snapshot.scan_id += 1;
-                    }
-
-                    if let Some(updates_tx) = updates_tx {
-                        updates_tx
-                            .unbounded_send(DownstreamUpdate::UpdateRepository(
-                                this.snapshot.clone(),
-                            ))
-                            .ok();
-                    }
-                })
-            },
-        );
-    }
-
-    /// currently running git command and when it started
-    pub fn current_job(&self) -> Option<JobInfo> {
-        self.active_jobs.values().next().cloned()
-    }
-
-    pub fn barrier(&mut self) -> oneshot::Receiver<()> {
-        self.send_job(None, |_, _| async {})
-    }
-
-    fn spawn_job_with_tracking<AsyncFn>(
-        &mut self,
-        paths: Vec<RepoPath>,
-        git_status: pending_op::GitStatus,
-        cx: &mut Context<Self>,
-        f: AsyncFn,
-    ) -> Task<Result<()>>
-    where
-        AsyncFn: AsyncFnOnce(WeakEntity<Repository>, &mut AsyncApp) -> Result<()> + 'static,
-    {
-        let ids = self.new_pending_ops_for_paths(paths, git_status);
-
-        cx.spawn(async move |this, cx| {
-            let (job_status, result) = match f(this.clone(), cx).await {
-                Ok(()) => (pending_op::JobStatus::Finished, Ok(())),
-                Err(err) if err.is::<Canceled>() => (pending_op::JobStatus::Skipped, Ok(())),
-                Err(err) => (pending_op::JobStatus::Error, Err(err)),
-            };
-
-            this.update(cx, |this, _| {
-                let mut edits = Vec::with_capacity(ids.len());
-                for (id, entry) in ids {
-                    if let Some(mut ops) = this
-                        .pending_ops
-                        .get(&PathKey(entry.as_ref().clone()), ())
-                        .cloned()
-                    {
-                        if let Some(op) = ops.op_by_id_mut(id) {
-                            op.job_status = job_status;
-                        }
-                        edits.push(sum_tree::Edit::Insert(ops));
-                    }
-                }
-                this.pending_ops.edit(edits, ());
-            })?;
-
-            result
-        })
-    }
-
-    fn new_pending_ops_for_paths(
-        &mut self,
-        paths: Vec<RepoPath>,
-        git_status: pending_op::GitStatus,
-    ) -> Vec<(PendingOpId, RepoPath)> {
-        let mut edits = Vec::with_capacity(paths.len());
-        let mut ids = Vec::with_capacity(paths.len());
-        for path in paths {
-            let mut ops = self
-                .pending_ops
-                .get(&PathKey(path.as_ref().clone()), ())
-                .cloned()
-                .unwrap_or_else(|| PendingOps::new(&path));
-            let id = ops.max_id() + 1;
-            ops.ops.push(PendingOp {
-                id,
-                git_status,
-                job_status: pending_op::JobStatus::Running,
-            });
-            edits.push(sum_tree::Edit::Insert(ops));
-            ids.push((id, path));
-        }
-        self.pending_ops.edit(edits, ());
-        ids
-    }
-}
-
-fn get_permalink_in_rust_registry_src(
-    provider_registry: Arc<GitHostingProviderRegistry>,
-    path: PathBuf,
-    selection: Range<u32>,
-) -> Result<url::Url> {
-    #[derive(Deserialize)]
-    struct CargoVcsGit {
-        sha1: String,
-    }
-
-    #[derive(Deserialize)]
-    struct CargoVcsInfo {
-        git: CargoVcsGit,
-        path_in_vcs: String,
-    }
-
-    #[derive(Deserialize)]
-    struct CargoPackage {
-        repository: String,
-    }
-
-    #[derive(Deserialize)]
-    struct CargoToml {
-        package: CargoPackage,
-    }
-
-    let Some((dir, cargo_vcs_info_json)) = path.ancestors().skip(1).find_map(|dir| {
-        let json = std::fs::read_to_string(dir.join(".cargo_vcs_info.json")).ok()?;
-        Some((dir, json))
-    }) else {
-        bail!("No .cargo_vcs_info.json found in parent directories")
-    };
-    let cargo_vcs_info = serde_json::from_str::<CargoVcsInfo>(&cargo_vcs_info_json)?;
-    let cargo_toml = std::fs::read_to_string(dir.join("Cargo.toml"))?;
-    let manifest = toml::from_str::<CargoToml>(&cargo_toml)?;
-    let (provider, remote) = parse_git_remote_url(provider_registry, &manifest.package.repository)
-        .context("parsing package.repository field of manifest")?;
-    let path = PathBuf::from(cargo_vcs_info.path_in_vcs).join(path.strip_prefix(dir).unwrap());
-    let permalink = provider.build_permalink(
-        remote,
-        BuildPermalinkParams::new(
-            &cargo_vcs_info.git.sha1,
-            &RepoPath::from_rel_path(
-                &RelPath::new(&path, PathStyle::local()).context("invalid path")?,
-            ),
-            Some(selection),
-        ),
-    );
-    Ok(permalink)
-}
-
-fn serialize_blame_buffer_response(blame: Option<git::blame::Blame>) -> proto::BlameBufferResponse {
-    let Some(blame) = blame else {
-        return proto::BlameBufferResponse {
-            blame_response: None,
-        };
-    };
-
-    let entries = blame
-        .entries
-        .into_iter()
-        .map(|entry| proto::BlameEntry {
-            sha: entry.sha.as_bytes().into(),
-            start_line: entry.range.start,
-            end_line: entry.range.end,
-            original_line_number: entry.original_line_number,
-            author: entry.author,
-            author_mail: entry.author_mail,
-            author_time: entry.author_time,
-            author_tz: entry.author_tz,
-            committer: entry.committer_name,
-            committer_mail: entry.committer_email,
-            committer_time: entry.committer_time,
-            committer_tz: entry.committer_tz,
-            summary: entry.summary,
-            previous: entry.previous,
-            filename: entry.filename,
-        })
-        .collect::<Vec<_>>();
-
-    let messages = blame
-        .messages
-        .into_iter()
-        .map(|(oid, message)| proto::CommitMessage {
-            oid: oid.as_bytes().into(),
-            message,
-        })
-        .collect::<Vec<_>>();
-
-    proto::BlameBufferResponse {
-        blame_response: Some(proto::blame_buffer_response::BlameResponse { entries, messages }),
-    }
-}
-
-fn deserialize_blame_buffer_response(
-    response: proto::BlameBufferResponse,
-) -> Option<git::blame::Blame> {
-    let response = response.blame_response?;
-    let entries = response
-        .entries
-        .into_iter()
-        .filter_map(|entry| {
-            Some(git::blame::BlameEntry {
-                sha: git::Oid::from_bytes(&entry.sha).ok()?,
-                range: entry.start_line..entry.end_line,
-                original_line_number: entry.original_line_number,
-                committer_name: entry.committer,
-                committer_time: entry.committer_time,
-                committer_tz: entry.committer_tz,
-                committer_email: entry.committer_mail,
-                author: entry.author,
-                author_mail: entry.author_mail,
-                author_time: entry.author_time,
-                author_tz: entry.author_tz,
-                summary: entry.summary,
-                previous: entry.previous,
-                filename: entry.filename,
-            })
-        })
-        .collect::<Vec<_>>();
-
-    let messages = response
-        .messages
-        .into_iter()
-        .filter_map(|message| Some((git::Oid::from_bytes(&message.oid).ok()?, message.message)))
-        .collect::<HashMap<_, _>>();
-
-    Some(Blame { entries, messages })
-}
-
-fn branch_to_proto(branch: &git::repository::Branch) -> proto::Branch {
-    proto::Branch {
-        is_head: branch.is_head,
-        ref_name: branch.ref_name.to_string(),
-        unix_timestamp: branch
-            .most_recent_commit
-            .as_ref()
-            .map(|commit| commit.commit_timestamp as u64),
-        upstream: branch.upstream.as_ref().map(|upstream| proto::GitUpstream {
-            ref_name: upstream.ref_name.to_string(),
-            tracking: upstream
-                .tracking
-                .status()
-                .map(|upstream| proto::UpstreamTracking {
-                    ahead: upstream.ahead as u64,
-                    behind: upstream.behind as u64,
-                }),
-        }),
-        most_recent_commit: branch
-            .most_recent_commit
-            .as_ref()
-            .map(|commit| proto::CommitSummary {
-                sha: commit.sha.to_string(),
-                subject: commit.subject.to_string(),
-                commit_timestamp: commit.commit_timestamp,
-                author_name: commit.author_name.to_string(),
-            }),
-    }
-}
-
-fn worktree_to_proto(worktree: &git::repository::Worktree) -> proto::Worktree {
-    proto::Worktree {
-        path: worktree.path.to_string_lossy().to_string(),
-        ref_name: worktree.ref_name.to_string(),
-        sha: worktree.sha.to_string(),
-    }
-}
-
-fn proto_to_worktree(proto: &proto::Worktree) -> git::repository::Worktree {
-    git::repository::Worktree {
-        path: PathBuf::from(proto.path.clone()),
-        ref_name: proto.ref_name.clone().into(),
-        sha: proto.sha.clone().into(),
-    }
-}
-
-fn proto_to_branch(proto: &proto::Branch) -> git::repository::Branch {
-    git::repository::Branch {
-        is_head: proto.is_head,
-        ref_name: proto.ref_name.clone().into(),
-        upstream: proto
-            .upstream
-            .as_ref()
-            .map(|upstream| git::repository::Upstream {
-                ref_name: upstream.ref_name.to_string().into(),
-                tracking: upstream
-                    .tracking
-                    .as_ref()
-                    .map(|tracking| {
-                        git::repository::UpstreamTracking::Tracked(UpstreamTrackingStatus {
-                            ahead: tracking.ahead as u32,
-                            behind: tracking.behind as u32,
-                        })
-                    })
-                    .unwrap_or(git::repository::UpstreamTracking::Gone),
-            }),
-        most_recent_commit: proto.most_recent_commit.as_ref().map(|commit| {
-            git::repository::CommitSummary {
-                sha: commit.sha.to_string().into(),
-                subject: commit.subject.to_string().into(),
-                commit_timestamp: commit.commit_timestamp,
-                author_name: commit.author_name.to_string().into(),
-                has_parent: true,
-            }
-        }),
-    }
-}
-
-fn commit_details_to_proto(commit: &CommitDetails) -> proto::GitCommitDetails {
-    proto::GitCommitDetails {
-        sha: commit.sha.to_string(),
-        message: commit.message.to_string(),
-        commit_timestamp: commit.commit_timestamp,
-        author_email: commit.author_email.to_string(),
-        author_name: commit.author_name.to_string(),
-    }
-}
-
-fn proto_to_commit_details(proto: &proto::GitCommitDetails) -> CommitDetails {
-    CommitDetails {
-        sha: proto.sha.clone().into(),
-        message: proto.message.clone().into(),
-        commit_timestamp: proto.commit_timestamp,
-        author_email: proto.author_email.clone().into(),
-        author_name: proto.author_name.clone().into(),
-    }
-}
-
-async fn compute_snapshot(
-    id: RepositoryId,
-    work_directory_abs_path: Arc<Path>,
-    prev_snapshot: RepositorySnapshot,
-    backend: Arc<dyn GitRepository>,
-) -> Result<(RepositorySnapshot, Vec<RepositoryEvent>)> {
-    let mut events = Vec::new();
-    let branches = backend.branches().await?;
-    let branch = branches.into_iter().find(|branch| branch.is_head);
-    let statuses = backend
-        .status(&[RepoPath::from_rel_path(
-            &RelPath::new(".".as_ref(), PathStyle::local()).unwrap(),
-        )])
-        .await?;
-    let stash_entries = backend.stash_entries().await?;
-    let statuses_by_path = SumTree::from_iter(
-        statuses
-            .entries
-            .iter()
-            .map(|(repo_path, status)| StatusEntry {
-                repo_path: repo_path.clone(),
-                status: *status,
-            }),
-        (),
-    );
-    let (merge_details, merge_heads_changed) =
-        MergeDetails::load(&backend, &statuses_by_path, &prev_snapshot).await?;
-    log::debug!("new merge details (changed={merge_heads_changed:?}): {merge_details:?}");
-
-    if merge_heads_changed {
-        events.push(RepositoryEvent::MergeHeadsChanged);
-    }
-
-    if statuses_by_path != prev_snapshot.statuses_by_path {
-        events.push(RepositoryEvent::StatusesChanged)
-    }
-
-    // Useful when branch is None in detached head state
-    let head_commit = match backend.head_sha().await {
-        Some(head_sha) => backend.show(head_sha).await.log_err(),
-        None => None,
-    };
-
-    if branch != prev_snapshot.branch || head_commit != prev_snapshot.head_commit {
-        events.push(RepositoryEvent::BranchChanged);
-    }
-
-    let remote_origin_url = backend.remote_url("origin").await;
-    let remote_upstream_url = backend.remote_url("upstream").await;
-
-    let snapshot = RepositorySnapshot {
-        id,
-        statuses_by_path,
-        work_directory_abs_path,
-        path_style: prev_snapshot.path_style,
-        scan_id: prev_snapshot.scan_id + 1,
-        branch,
-        head_commit,
-        merge: merge_details,
-        remote_origin_url,
-        remote_upstream_url,
-        stash_entries,
-    };
-
-    Ok((snapshot, events))
-}
-
-fn status_from_proto(
-    simple_status: i32,
-    status: Option<proto::GitFileStatus>,
-) -> anyhow::Result<FileStatus> {
-    use proto::git_file_status::Variant;
-
-    let Some(variant) = status.and_then(|status| status.variant) else {
-        let code = proto::GitStatus::from_i32(simple_status)
-            .with_context(|| format!("Invalid git status code: {simple_status}"))?;
-        let result = match code {
-            proto::GitStatus::Added => TrackedStatus {
-                worktree_status: StatusCode::Added,
-                index_status: StatusCode::Unmodified,
-            }
-            .into(),
-            proto::GitStatus::Modified => TrackedStatus {
-                worktree_status: StatusCode::Modified,
-                index_status: StatusCode::Unmodified,
-            }
-            .into(),
-            proto::GitStatus::Conflict => UnmergedStatus {
-                first_head: UnmergedStatusCode::Updated,
-                second_head: UnmergedStatusCode::Updated,
-            }
-            .into(),
-            proto::GitStatus::Deleted => TrackedStatus {
-                worktree_status: StatusCode::Deleted,
-                index_status: StatusCode::Unmodified,
-            }
-            .into(),
-            _ => anyhow::bail!("Invalid code for simple status: {simple_status}"),
-        };
-        return Ok(result);
-    };
-
-    let result = match variant {
-        Variant::Untracked(_) => FileStatus::Untracked,
-        Variant::Ignored(_) => FileStatus::Ignored,
-        Variant::Unmerged(unmerged) => {
-            let [first_head, second_head] =
-                [unmerged.first_head, unmerged.second_head].map(|head| {
-                    let code = proto::GitStatus::from_i32(head)
-                        .with_context(|| format!("Invalid git status code: {head}"))?;
-                    let result = match code {
-                        proto::GitStatus::Added => UnmergedStatusCode::Added,
-                        proto::GitStatus::Updated => UnmergedStatusCode::Updated,
-                        proto::GitStatus::Deleted => UnmergedStatusCode::Deleted,
-                        _ => anyhow::bail!("Invalid code for unmerged status: {code:?}"),
-                    };
-                    Ok(result)
-                });
-            let [first_head, second_head] = [first_head?, second_head?];
-            UnmergedStatus {
-                first_head,
-                second_head,
-            }
-            .into()
-        }
-        Variant::Tracked(tracked) => {
-            let [index_status, worktree_status] = [tracked.index_status, tracked.worktree_status]
-                .map(|status| {
-                    let code = proto::GitStatus::from_i32(status)
-                        .with_context(|| format!("Invalid git status code: {status}"))?;
-                    let result = match code {
-                        proto::GitStatus::Modified => StatusCode::Modified,
-                        proto::GitStatus::TypeChanged => StatusCode::TypeChanged,
-                        proto::GitStatus::Added => StatusCode::Added,
-                        proto::GitStatus::Deleted => StatusCode::Deleted,
-                        proto::GitStatus::Renamed => StatusCode::Renamed,
-                        proto::GitStatus::Copied => StatusCode::Copied,
-                        proto::GitStatus::Unmodified => StatusCode::Unmodified,
-                        _ => anyhow::bail!("Invalid code for tracked status: {code:?}"),
-                    };
-                    Ok(result)
-                });
-            let [index_status, worktree_status] = [index_status?, worktree_status?];
-            TrackedStatus {
-                index_status,
-                worktree_status,
-            }
-            .into()
-        }
-    };
-    Ok(result)
-}
-
-fn status_to_proto(status: FileStatus) -> proto::GitFileStatus {
-    use proto::git_file_status::{Tracked, Unmerged, Variant};
-
-    let variant = match status {
-        FileStatus::Untracked => Variant::Untracked(Default::default()),
-        FileStatus::Ignored => Variant::Ignored(Default::default()),
-        FileStatus::Unmerged(UnmergedStatus {
-            first_head,
-            second_head,
-        }) => Variant::Unmerged(Unmerged {
-            first_head: unmerged_status_to_proto(first_head),
-            second_head: unmerged_status_to_proto(second_head),
-        }),
-        FileStatus::Tracked(TrackedStatus {
-            index_status,
-            worktree_status,
-        }) => Variant::Tracked(Tracked {
-            index_status: tracked_status_to_proto(index_status),
-            worktree_status: tracked_status_to_proto(worktree_status),
-        }),
-    };
-    proto::GitFileStatus {
-        variant: Some(variant),
-    }
-}
-
-fn unmerged_status_to_proto(code: UnmergedStatusCode) -> i32 {
-    match code {
-        UnmergedStatusCode::Added => proto::GitStatus::Added as _,
-        UnmergedStatusCode::Deleted => proto::GitStatus::Deleted as _,
-        UnmergedStatusCode::Updated => proto::GitStatus::Updated as _,
-    }
-}
-
-fn tracked_status_to_proto(code: StatusCode) -> i32 {
-    match code {
-        StatusCode::Added => proto::GitStatus::Added as _,
-        StatusCode::Deleted => proto::GitStatus::Deleted as _,
-        StatusCode::Modified => proto::GitStatus::Modified as _,
-        StatusCode::Renamed => proto::GitStatus::Renamed as _,
-        StatusCode::TypeChanged => proto::GitStatus::TypeChanged as _,
-        StatusCode::Copied => proto::GitStatus::Copied as _,
-        StatusCode::Unmodified => proto::GitStatus::Unmodified as _,
-    }
-}
diff --git a/crates/project/src/git_store/branch_diff.rs b/crates/project/src/git_store/branch_diff.rs
deleted file mode 100644
index dd0026961e..0000000000
--- a/crates/project/src/git_store/branch_diff.rs
+++ /dev/null
@@ -1,386 +0,0 @@
-use anyhow::Result;
-use buffer_diff::BufferDiff;
-use collections::HashSet;
-use futures::StreamExt;
-use git::{
-    repository::RepoPath,
-    status::{DiffTreeType, FileStatus, StatusCode, TrackedStatus, TreeDiff, TreeDiffStatus},
-};
-use gpui::{
-    App, AsyncWindowContext, Context, Entity, EventEmitter, SharedString, Subscription, Task,
-    WeakEntity, Window,
-};
-
-use language::Buffer;
-use text::BufferId;
-use util::ResultExt;
-use ztracing::instrument;
-
-use crate::{
-    Project,
-    git_store::{GitStoreEvent, Repository, RepositoryEvent},
-};
-
-#[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
-pub enum DiffBase {
-    Head,
-    Merge { base_ref: SharedString },
-}
-
-impl DiffBase {
-    pub fn is_merge_base(&self) -> bool {
-        matches!(self, DiffBase::Merge { .. })
-    }
-}
-
-pub struct BranchDiff {
-    diff_base: DiffBase,
-    repo: Option<Entity<Repository>>,
-    project: Entity<Project>,
-    base_commit: Option<SharedString>,
-    head_commit: Option<SharedString>,
-    tree_diff: Option<TreeDiff>,
-    _subscription: Subscription,
-    update_needed: postage::watch::Sender<()>,
-    _task: Task<()>,
-}
-
-pub enum BranchDiffEvent {
-    FileListChanged,
-}
-
-impl EventEmitter<BranchDiffEvent> for BranchDiff {}
-
-impl BranchDiff {
-    pub fn new(
-        source: DiffBase,
-        project: Entity<Project>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let git_store = project.read(cx).git_store().clone();
-        let git_store_subscription = cx.subscribe_in(
-            &git_store,
-            window,
-            move |this, _git_store, event, _window, cx| match event {
-                GitStoreEvent::ActiveRepositoryChanged(_)
-                | GitStoreEvent::RepositoryUpdated(_, RepositoryEvent::StatusesChanged, true)
-                | GitStoreEvent::ConflictsUpdated => {
-                    cx.emit(BranchDiffEvent::FileListChanged);
-                    *this.update_needed.borrow_mut() = ();
-                }
-                _ => {}
-            },
-        );
-
-        let (send, recv) = postage::watch::channel::<()>();
-        let worker = window.spawn(cx, {
-            let this = cx.weak_entity();
-            async |cx| Self::handle_status_updates(this, recv, cx).await
-        });
-        let repo = git_store.read(cx).active_repository();
-
-        Self {
-            diff_base: source,
-            repo,
-            project,
-            tree_diff: None,
-            base_commit: None,
-            head_commit: None,
-            _subscription: git_store_subscription,
-            _task: worker,
-            update_needed: send,
-        }
-    }
-
-    pub fn diff_base(&self) -> &DiffBase {
-        &self.diff_base
-    }
-
-    pub async fn handle_status_updates(
-        this: WeakEntity<Self>,
-        mut recv: postage::watch::Receiver<()>,
-        cx: &mut AsyncWindowContext,
-    ) {
-        Self::reload_tree_diff(this.clone(), cx).await.log_err();
-        while recv.next().await.is_some() {
-            let Ok(needs_update) = this.update(cx, |this, cx| {
-                let mut needs_update = false;
-                let active_repo = this
-                    .project
-                    .read(cx)
-                    .git_store()
-                    .read(cx)
-                    .active_repository();
-                if active_repo != this.repo {
-                    needs_update = true;
-                    this.repo = active_repo;
-                } else if let Some(repo) = this.repo.as_ref() {
-                    repo.update(cx, |repo, _| {
-                        if let Some(branch) = &repo.branch
-                            && let DiffBase::Merge { base_ref } = &this.diff_base
-                            && let Some(commit) = branch.most_recent_commit.as_ref()
-                            && &branch.ref_name == base_ref
-                            && this.base_commit.as_ref() != Some(&commit.sha)
-                        {
-                            this.base_commit = Some(commit.sha.clone());
-                            needs_update = true;
-                        }
-
-                        if repo.head_commit.as_ref().map(|c| &c.sha) != this.head_commit.as_ref() {
-                            this.head_commit = repo.head_commit.as_ref().map(|c| c.sha.clone());
-                            needs_update = true;
-                        }
-                    })
-                }
-                needs_update
-            }) else {
-                return;
-            };
-
-            if needs_update {
-                Self::reload_tree_diff(this.clone(), cx).await.log_err();
-            }
-        }
-    }
-
-    pub fn status_for_buffer_id(&self, buffer_id: BufferId, cx: &App) -> Option<FileStatus> {
-        let (repo, path) = self
-            .project
-            .read(cx)
-            .git_store()
-            .read(cx)
-            .repository_and_path_for_buffer_id(buffer_id, cx)?;
-        if self.repo() == Some(&repo) {
-            return self.merge_statuses(
-                repo.read(cx)
-                    .status_for_path(&path)
-                    .map(|status| status.status),
-                self.tree_diff
-                    .as_ref()
-                    .and_then(|diff| diff.entries.get(&path)),
-            );
-        }
-        None
-    }
-
-    pub fn merge_statuses(
-        &self,
-        diff_from_head: Option<FileStatus>,
-        diff_from_merge_base: Option<&TreeDiffStatus>,
-    ) -> Option<FileStatus> {
-        match (diff_from_head, diff_from_merge_base) {
-            (None, None) => None,
-            (Some(diff_from_head), None) => Some(diff_from_head),
-            (Some(diff_from_head @ FileStatus::Unmerged(_)), _) => Some(diff_from_head),
-
-            // file does not exist in HEAD
-            // but *does* exist in work-tree
-            // and *does* exist in merge-base
-            (
-                Some(FileStatus::Untracked)
-                | Some(FileStatus::Tracked(TrackedStatus {
-                    index_status: StatusCode::Added,
-                    worktree_status: _,
-                })),
-                Some(_),
-            ) => Some(FileStatus::Tracked(TrackedStatus {
-                index_status: StatusCode::Modified,
-                worktree_status: StatusCode::Modified,
-            })),
-
-            // file exists in HEAD
-            // but *does not* exist in work-tree
-            (Some(diff_from_head), Some(diff_from_merge_base)) if diff_from_head.is_deleted() => {
-                match diff_from_merge_base {
-                    TreeDiffStatus::Added => None, // unchanged, didn't exist in merge base or worktree
-                    _ => Some(diff_from_head),
-                }
-            }
-
-            // file exists in HEAD
-            // and *does* exist in work-tree
-            (Some(FileStatus::Tracked(_)), Some(tree_status)) => {
-                Some(FileStatus::Tracked(TrackedStatus {
-                    index_status: match tree_status {
-                        TreeDiffStatus::Added { .. } => StatusCode::Added,
-                        _ => StatusCode::Modified,
-                    },
-                    worktree_status: match tree_status {
-                        TreeDiffStatus::Added => StatusCode::Added,
-                        _ => StatusCode::Modified,
-                    },
-                }))
-            }
-
-            (_, Some(diff_from_merge_base)) => {
-                Some(diff_status_to_file_status(diff_from_merge_base))
-            }
-        }
-    }
-
-    pub async fn reload_tree_diff(
-        this: WeakEntity<Self>,
-        cx: &mut AsyncWindowContext,
-    ) -> Result<()> {
-        let task = this.update(cx, |this, cx| {
-            let DiffBase::Merge { base_ref } = this.diff_base.clone() else {
-                return None;
-            };
-            let Some(repo) = this.repo.as_ref() else {
-                this.tree_diff.take();
-                return None;
-            };
-            repo.update(cx, |repo, cx| {
-                Some(repo.diff_tree(
-                    DiffTreeType::MergeBase {
-                        base: base_ref,
-                        head: "HEAD".into(),
-                    },
-                    cx,
-                ))
-            })
-        })?;
-        let Some(task) = task else { return Ok(()) };
-
-        let diff = task.await??;
-        this.update(cx, |this, cx| {
-            this.tree_diff = Some(diff);
-            cx.emit(BranchDiffEvent::FileListChanged);
-            cx.notify();
-        })
-    }
-
-    pub fn repo(&self) -> Option<&Entity<Repository>> {
-        self.repo.as_ref()
-    }
-
-    #[instrument(skip_all)]
-    pub fn load_buffers(&mut self, cx: &mut Context<Self>) -> Vec<DiffBuffer> {
-        let mut output = Vec::default();
-        let Some(repo) = self.repo.clone() else {
-            return output;
-        };
-
-        self.project.update(cx, |_project, cx| {
-            let mut seen = HashSet::default();
-
-            for item in repo.read(cx).cached_status() {
-                seen.insert(item.repo_path.clone());
-                let branch_diff = self
-                    .tree_diff
-                    .as_ref()
-                    .and_then(|t| t.entries.get(&item.repo_path))
-                    .cloned();
-                let Some(status) = self.merge_statuses(Some(item.status), branch_diff.as_ref())
-                else {
-                    continue;
-                };
-                if !status.has_changes() {
-                    continue;
-                }
-
-                let Some(project_path) =
-                    repo.read(cx).repo_path_to_project_path(&item.repo_path, cx)
-                else {
-                    continue;
-                };
-                let task = Self::load_buffer(branch_diff, project_path, repo.clone(), cx);
-
-                output.push(DiffBuffer {
-                    repo_path: item.repo_path.clone(),
-                    load: task,
-                    file_status: item.status,
-                });
-            }
-            let Some(tree_diff) = self.tree_diff.as_ref() else {
-                return;
-            };
-
-            for (path, branch_diff) in tree_diff.entries.iter() {
-                if seen.contains(&path) {
-                    continue;
-                }
-
-                let Some(project_path) = repo.read(cx).repo_path_to_project_path(&path, cx) else {
-                    continue;
-                };
-                let task =
-                    Self::load_buffer(Some(branch_diff.clone()), project_path, repo.clone(), cx);
-
-                let file_status = diff_status_to_file_status(branch_diff);
-
-                output.push(DiffBuffer {
-                    repo_path: path.clone(),
-                    load: task,
-                    file_status,
-                });
-            }
-        });
-        output
-    }
-
-    #[instrument(skip_all)]
-    fn load_buffer(
-        branch_diff: Option<git::status::TreeDiffStatus>,
-        project_path: crate::ProjectPath,
-        repo: Entity<Repository>,
-        cx: &Context<'_, Project>,
-    ) -> Task<Result<(Entity<Buffer>, Entity<BufferDiff>)>> {
-        let task = cx.spawn(async move |project, cx| {
-            let buffer = project
-                .update(cx, |project, cx| project.open_buffer(project_path, cx))?
-                .await?;
-
-            let languages = project.update(cx, |project, _cx| project.languages().clone())?;
-
-            let changes = if let Some(entry) = branch_diff {
-                let oid = match entry {
-                    git::status::TreeDiffStatus::Added { .. } => None,
-                    git::status::TreeDiffStatus::Modified { old, .. }
-                    | git::status::TreeDiffStatus::Deleted { old } => Some(old),
-                };
-                project
-                    .update(cx, |project, cx| {
-                        project.git_store().update(cx, |git_store, cx| {
-                            git_store.open_diff_since(oid, buffer.clone(), repo, languages, cx)
-                        })
-                    })?
-                    .await?
-            } else {
-                project
-                    .update(cx, |project, cx| {
-                        project.open_uncommitted_diff(buffer.clone(), cx)
-                    })?
-                    .await?
-            };
-            Ok((buffer, changes))
-        });
-        task
-    }
-}
-
-fn diff_status_to_file_status(branch_diff: &git::status::TreeDiffStatus) -> FileStatus {
-    let file_status = match branch_diff {
-        git::status::TreeDiffStatus::Added { .. } => FileStatus::Tracked(TrackedStatus {
-            index_status: StatusCode::Added,
-            worktree_status: StatusCode::Added,
-        }),
-        git::status::TreeDiffStatus::Modified { .. } => FileStatus::Tracked(TrackedStatus {
-            index_status: StatusCode::Modified,
-            worktree_status: StatusCode::Modified,
-        }),
-        git::status::TreeDiffStatus::Deleted { .. } => FileStatus::Tracked(TrackedStatus {
-            index_status: StatusCode::Deleted,
-            worktree_status: StatusCode::Deleted,
-        }),
-    };
-    file_status
-}
-
-#[derive(Debug)]
-pub struct DiffBuffer {
-    pub repo_path: RepoPath,
-    pub file_status: FileStatus,
-    pub load: Task<Result<(Entity<Buffer>, Entity<BufferDiff>)>>,
-}
diff --git a/crates/project/src/git_store/conflict_set.rs b/crates/project/src/git_store/conflict_set.rs
deleted file mode 100644
index 064b6998cd..0000000000
--- a/crates/project/src/git_store/conflict_set.rs
+++ /dev/null
@@ -1,742 +0,0 @@
-use gpui::{App, Context, Entity, EventEmitter, SharedString};
-use std::{cmp::Ordering, ops::Range, sync::Arc};
-use text::{Anchor, BufferId, OffsetRangeExt as _};
-
-pub struct ConflictSet {
-    pub has_conflict: bool,
-    pub snapshot: ConflictSetSnapshot,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct ConflictSetUpdate {
-    pub buffer_range: Option<Range<Anchor>>,
-    pub old_range: Range<usize>,
-    pub new_range: Range<usize>,
-}
-
-#[derive(Debug, Clone)]
-pub struct ConflictSetSnapshot {
-    pub buffer_id: BufferId,
-    pub conflicts: Arc<[ConflictRegion]>,
-}
-
-impl ConflictSetSnapshot {
-    pub fn conflicts_in_range(
-        &self,
-        range: Range<Anchor>,
-        buffer: &text::BufferSnapshot,
-    ) -> &[ConflictRegion] {
-        let start_ix = self
-            .conflicts
-            .binary_search_by(|conflict| {
-                conflict
-                    .range
-                    .end
-                    .cmp(&range.start, buffer)
-                    .then(Ordering::Greater)
-            })
-            .unwrap_err();
-        let end_ix = start_ix
-            + self.conflicts[start_ix..]
-                .binary_search_by(|conflict| {
-                    conflict
-                        .range
-                        .start
-                        .cmp(&range.end, buffer)
-                        .then(Ordering::Less)
-                })
-                .unwrap_err();
-        &self.conflicts[start_ix..end_ix]
-    }
-
-    pub fn compare(&self, other: &Self, buffer: &text::BufferSnapshot) -> ConflictSetUpdate {
-        let common_prefix_len = self
-            .conflicts
-            .iter()
-            .zip(other.conflicts.iter())
-            .take_while(|(old, new)| old == new)
-            .count();
-        let common_suffix_len = self.conflicts[common_prefix_len..]
-            .iter()
-            .rev()
-            .zip(other.conflicts[common_prefix_len..].iter().rev())
-            .take_while(|(old, new)| old == new)
-            .count();
-        let old_conflicts =
-            &self.conflicts[common_prefix_len..(self.conflicts.len() - common_suffix_len)];
-        let new_conflicts =
-            &other.conflicts[common_prefix_len..(other.conflicts.len() - common_suffix_len)];
-        let old_range = common_prefix_len..(common_prefix_len + old_conflicts.len());
-        let new_range = common_prefix_len..(common_prefix_len + new_conflicts.len());
-        let start = match (old_conflicts.first(), new_conflicts.first()) {
-            (None, None) => None,
-            (None, Some(conflict)) => Some(conflict.range.start),
-            (Some(conflict), None) => Some(conflict.range.start),
-            (Some(first), Some(second)) => {
-                Some(*first.range.start.min(&second.range.start, buffer))
-            }
-        };
-        let end = match (old_conflicts.last(), new_conflicts.last()) {
-            (None, None) => None,
-            (None, Some(conflict)) => Some(conflict.range.end),
-            (Some(first), None) => Some(first.range.end),
-            (Some(first), Some(second)) => Some(*first.range.end.max(&second.range.end, buffer)),
-        };
-        ConflictSetUpdate {
-            buffer_range: start.zip(end).map(|(start, end)| start..end),
-            old_range,
-            new_range,
-        }
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct ConflictRegion {
-    pub ours_branch_name: SharedString,
-    pub theirs_branch_name: SharedString,
-    pub range: Range<Anchor>,
-    pub ours: Range<Anchor>,
-    pub theirs: Range<Anchor>,
-    pub base: Option<Range<Anchor>>,
-}
-
-impl ConflictRegion {
-    pub fn resolve(
-        &self,
-        buffer: Entity<language::Buffer>,
-        ranges: &[Range<Anchor>],
-        cx: &mut App,
-    ) {
-        let buffer_snapshot = buffer.read(cx).snapshot();
-        let mut deletions = Vec::new();
-        let empty = "";
-        let outer_range = self.range.to_offset(&buffer_snapshot);
-        let mut offset = outer_range.start;
-        for kept_range in ranges {
-            let kept_range = kept_range.to_offset(&buffer_snapshot);
-            if kept_range.start > offset {
-                deletions.push((offset..kept_range.start, empty));
-            }
-            offset = kept_range.end;
-        }
-        if outer_range.end > offset {
-            deletions.push((offset..outer_range.end, empty));
-        }
-
-        buffer.update(cx, |buffer, cx| {
-            buffer.edit(deletions, None, cx);
-        });
-    }
-}
-
-impl ConflictSet {
-    pub fn new(buffer_id: BufferId, has_conflict: bool, _: &mut Context<Self>) -> Self {
-        Self {
-            has_conflict,
-            snapshot: ConflictSetSnapshot {
-                buffer_id,
-                conflicts: Default::default(),
-            },
-        }
-    }
-
-    pub fn set_has_conflict(&mut self, has_conflict: bool, cx: &mut Context<Self>) -> bool {
-        if has_conflict != self.has_conflict {
-            self.has_conflict = has_conflict;
-            if !self.has_conflict {
-                cx.emit(ConflictSetUpdate {
-                    buffer_range: None,
-                    old_range: 0..self.snapshot.conflicts.len(),
-                    new_range: 0..0,
-                });
-                self.snapshot.conflicts = Default::default();
-            }
-            true
-        } else {
-            false
-        }
-    }
-
-    pub fn snapshot(&self) -> ConflictSetSnapshot {
-        self.snapshot.clone()
-    }
-
-    pub fn set_snapshot(
-        &mut self,
-        snapshot: ConflictSetSnapshot,
-        update: ConflictSetUpdate,
-        cx: &mut Context<Self>,
-    ) {
-        self.snapshot = snapshot;
-        cx.emit(update);
-    }
-
-    pub fn parse(buffer: &text::BufferSnapshot) -> ConflictSetSnapshot {
-        let mut conflicts = Vec::new();
-
-        let mut line_pos = 0;
-        let buffer_len = buffer.len();
-        let mut lines = buffer.text_for_range(0..buffer_len).lines();
-
-        let mut conflict_start: Option<usize> = None;
-        let mut ours_start: Option<usize> = None;
-        let mut ours_end: Option<usize> = None;
-        let mut ours_branch_name: Option<SharedString> = None;
-        let mut base_start: Option<usize> = None;
-        let mut base_end: Option<usize> = None;
-        let mut theirs_start: Option<usize> = None;
-        let mut theirs_branch_name: Option<SharedString> = None;
-
-        while let Some(line) = lines.next() {
-            let line_end = line_pos + line.len();
-
-            if let Some(branch_name) = line.strip_prefix("<<<<<<< ") {
-                // If we see a new conflict marker while already parsing one,
-                // abandon the previous one and start a new one
-                conflict_start = Some(line_pos);
-                ours_start = Some(line_end + 1);
-
-                let branch_name = branch_name.trim();
-                if !branch_name.is_empty() {
-                    ours_branch_name = Some(SharedString::new(branch_name));
-                }
-            } else if line.starts_with("||||||| ")
-                && conflict_start.is_some()
-                && ours_start.is_some()
-            {
-                ours_end = Some(line_pos);
-                base_start = Some(line_end + 1);
-            } else if line.starts_with("=======")
-                && conflict_start.is_some()
-                && ours_start.is_some()
-            {
-                // Set ours_end if not already set (would be set if we have base markers)
-                if ours_end.is_none() {
-                    ours_end = Some(line_pos);
-                } else if base_start.is_some() {
-                    base_end = Some(line_pos);
-                }
-                theirs_start = Some(line_end + 1);
-            } else if let Some(branch_name) = line.strip_prefix(">>>>>>> ")
-                && conflict_start.is_some()
-                && ours_start.is_some()
-                && ours_end.is_some()
-                && theirs_start.is_some()
-            {
-                let branch_name = branch_name.trim();
-                if !branch_name.is_empty() {
-                    theirs_branch_name = Some(SharedString::new(branch_name));
-                }
-
-                let theirs_end = line_pos;
-                let conflict_end = (line_end + 1).min(buffer_len);
-
-                let range = buffer.anchor_after(conflict_start.unwrap())
-                    ..buffer.anchor_before(conflict_end);
-                let ours = buffer.anchor_after(ours_start.unwrap())
-                    ..buffer.anchor_before(ours_end.unwrap());
-                let theirs =
-                    buffer.anchor_after(theirs_start.unwrap())..buffer.anchor_before(theirs_end);
-
-                let base = base_start
-                    .zip(base_end)
-                    .map(|(start, end)| buffer.anchor_after(start)..buffer.anchor_before(end));
-
-                conflicts.push(ConflictRegion {
-                    ours_branch_name: ours_branch_name
-                        .take()
-                        .unwrap_or_else(|| SharedString::new_static("HEAD")),
-                    theirs_branch_name: theirs_branch_name
-                        .take()
-                        .unwrap_or_else(|| SharedString::new_static("Origin")),
-                    range,
-                    ours,
-                    theirs,
-                    base,
-                });
-
-                conflict_start = None;
-                ours_start = None;
-                ours_end = None;
-                base_start = None;
-                base_end = None;
-                theirs_start = None;
-            }
-
-            line_pos = line_end + 1;
-        }
-
-        ConflictSetSnapshot {
-            conflicts: conflicts.into(),
-            buffer_id: buffer.remote_id(),
-        }
-    }
-}
-
-impl EventEmitter<ConflictSetUpdate> for ConflictSet {}
-
-#[cfg(test)]
-mod tests {
-    use std::sync::mpsc;
-
-    use crate::Project;
-
-    use super::*;
-    use fs::FakeFs;
-    use git::{
-        repository::{RepoPath, repo_path},
-        status::{UnmergedStatus, UnmergedStatusCode},
-    };
-    use gpui::{BackgroundExecutor, TestAppContext};
-    use serde_json::json;
-    use text::{Buffer, BufferId, Point, ReplicaId, ToOffset as _};
-    use unindent::Unindent as _;
-    use util::{path, rel_path::rel_path};
-
-    #[test]
-    fn test_parse_conflicts_in_buffer() {
-        // Create a buffer with conflict markers
-        let test_content = r#"
-            This is some text before the conflict.
-            <<<<<<< HEAD
-            This is our version
-            =======
-            This is their version
-            >>>>>>> branch-name
-
-            Another conflict:
-            <<<<<<< HEAD
-            Our second change
-            ||||||| merged common ancestors
-            Original content
-            =======
-            Their second change
-            >>>>>>> branch-name
-        "#
-        .unindent();
-
-        let buffer_id = BufferId::new(1).unwrap();
-        let buffer = Buffer::new(ReplicaId::LOCAL, buffer_id, test_content);
-        let snapshot = buffer.snapshot();
-
-        let conflict_snapshot = ConflictSet::parse(&snapshot);
-        assert_eq!(conflict_snapshot.conflicts.len(), 2);
-
-        let first = &conflict_snapshot.conflicts[0];
-        assert!(first.base.is_none());
-        assert_eq!(first.ours_branch_name.as_ref(), "HEAD");
-        assert_eq!(first.theirs_branch_name.as_ref(), "branch-name");
-        let our_text = snapshot
-            .text_for_range(first.ours.clone())
-            .collect::<String>();
-        let their_text = snapshot
-            .text_for_range(first.theirs.clone())
-            .collect::<String>();
-        assert_eq!(our_text, "This is our version\n");
-        assert_eq!(their_text, "This is their version\n");
-
-        let second = &conflict_snapshot.conflicts[1];
-        assert!(second.base.is_some());
-        assert_eq!(second.ours_branch_name.as_ref(), "HEAD");
-        assert_eq!(second.theirs_branch_name.as_ref(), "branch-name");
-        let our_text = snapshot
-            .text_for_range(second.ours.clone())
-            .collect::<String>();
-        let their_text = snapshot
-            .text_for_range(second.theirs.clone())
-            .collect::<String>();
-        let base_text = snapshot
-            .text_for_range(second.base.as_ref().unwrap().clone())
-            .collect::<String>();
-        assert_eq!(our_text, "Our second change\n");
-        assert_eq!(their_text, "Their second change\n");
-        assert_eq!(base_text, "Original content\n");
-
-        // Test conflicts_in_range
-        let range = snapshot.anchor_before(0)..snapshot.anchor_before(snapshot.len());
-        let conflicts_in_range = conflict_snapshot.conflicts_in_range(range, &snapshot);
-        assert_eq!(conflicts_in_range.len(), 2);
-
-        // Test with a range that includes only the first conflict
-        let first_conflict_end = conflict_snapshot.conflicts[0].range.end;
-        let range = snapshot.anchor_before(0)..first_conflict_end;
-        let conflicts_in_range = conflict_snapshot.conflicts_in_range(range, &snapshot);
-        assert_eq!(conflicts_in_range.len(), 1);
-
-        // Test with a range that includes only the second conflict
-        let second_conflict_start = conflict_snapshot.conflicts[1].range.start;
-        let range = second_conflict_start..snapshot.anchor_before(snapshot.len());
-        let conflicts_in_range = conflict_snapshot.conflicts_in_range(range, &snapshot);
-        assert_eq!(conflicts_in_range.len(), 1);
-
-        // Test with a range that doesn't include any conflicts
-        let range = buffer.anchor_after(first_conflict_end.to_next_offset(&buffer))
-            ..buffer.anchor_before(second_conflict_start.to_previous_offset(&buffer));
-        let conflicts_in_range = conflict_snapshot.conflicts_in_range(range, &snapshot);
-        assert_eq!(conflicts_in_range.len(), 0);
-    }
-
-    #[test]
-    fn test_nested_conflict_markers() {
-        // Create a buffer with nested conflict markers
-        let test_content = r#"
-            This is some text before the conflict.
-            <<<<<<< HEAD
-            This is our version
-            <<<<<<< HEAD
-            This is a nested conflict marker
-            =======
-            This is their version in a nested conflict
-            >>>>>>> branch-nested
-            =======
-            This is their version
-            >>>>>>> branch-name
-        "#
-        .unindent();
-
-        let buffer_id = BufferId::new(1).unwrap();
-        let buffer = Buffer::new(ReplicaId::LOCAL, buffer_id, test_content);
-        let snapshot = buffer.snapshot();
-
-        let conflict_snapshot = ConflictSet::parse(&snapshot);
-
-        assert_eq!(conflict_snapshot.conflicts.len(), 1);
-
-        // The conflict should have our version, their version, but no base
-        let conflict = &conflict_snapshot.conflicts[0];
-        assert!(conflict.base.is_none());
-        assert_eq!(conflict.ours_branch_name.as_ref(), "HEAD");
-        assert_eq!(conflict.theirs_branch_name.as_ref(), "branch-nested");
-
-        // Check that the nested conflict was detected correctly
-        let our_text = snapshot
-            .text_for_range(conflict.ours.clone())
-            .collect::<String>();
-        assert_eq!(our_text, "This is a nested conflict marker\n");
-        let their_text = snapshot
-            .text_for_range(conflict.theirs.clone())
-            .collect::<String>();
-        assert_eq!(their_text, "This is their version in a nested conflict\n");
-    }
-
-    #[test]
-    fn test_conflict_markers_at_eof() {
-        let test_content = r#"
-            <<<<<<< ours
-            =======
-            This is their version
-            >>>>>>> "#
-            .unindent();
-        let buffer_id = BufferId::new(1).unwrap();
-        let buffer = Buffer::new(ReplicaId::LOCAL, buffer_id, test_content);
-        let snapshot = buffer.snapshot();
-
-        let conflict_snapshot = ConflictSet::parse(&snapshot);
-        assert_eq!(conflict_snapshot.conflicts.len(), 1);
-        assert_eq!(
-            conflict_snapshot.conflicts[0].ours_branch_name.as_ref(),
-            "ours"
-        );
-        assert_eq!(
-            conflict_snapshot.conflicts[0].theirs_branch_name.as_ref(),
-            "Origin" // default branch name if there is none
-        );
-    }
-
-    #[test]
-    fn test_conflicts_in_range() {
-        // Create a buffer with conflict markers
-        let test_content = r#"
-            one
-            <<<<<<< HEAD1
-            two
-            =======
-            three
-            >>>>>>> branch1
-            four
-            five
-            <<<<<<< HEAD2
-            six
-            =======
-            seven
-            >>>>>>> branch2
-            eight
-            nine
-            <<<<<<< HEAD3
-            ten
-            =======
-            eleven
-            >>>>>>> branch3
-            twelve
-            <<<<<<< HEAD4
-            thirteen
-            =======
-            fourteen
-            >>>>>>> branch4
-            fifteen
-        "#
-        .unindent();
-
-        let buffer_id = BufferId::new(1).unwrap();
-        let buffer = Buffer::new(ReplicaId::LOCAL, buffer_id, test_content.clone());
-        let snapshot = buffer.snapshot();
-
-        let conflict_snapshot = ConflictSet::parse(&snapshot);
-        assert_eq!(conflict_snapshot.conflicts.len(), 4);
-        assert_eq!(
-            conflict_snapshot.conflicts[0].ours_branch_name.as_ref(),
-            "HEAD1"
-        );
-        assert_eq!(
-            conflict_snapshot.conflicts[0].theirs_branch_name.as_ref(),
-            "branch1"
-        );
-        assert_eq!(
-            conflict_snapshot.conflicts[1].ours_branch_name.as_ref(),
-            "HEAD2"
-        );
-        assert_eq!(
-            conflict_snapshot.conflicts[1].theirs_branch_name.as_ref(),
-            "branch2"
-        );
-        assert_eq!(
-            conflict_snapshot.conflicts[2].ours_branch_name.as_ref(),
-            "HEAD3"
-        );
-        assert_eq!(
-            conflict_snapshot.conflicts[2].theirs_branch_name.as_ref(),
-            "branch3"
-        );
-        assert_eq!(
-            conflict_snapshot.conflicts[3].ours_branch_name.as_ref(),
-            "HEAD4"
-        );
-        assert_eq!(
-            conflict_snapshot.conflicts[3].theirs_branch_name.as_ref(),
-            "branch4"
-        );
-
-        let range = test_content.find("seven").unwrap()..test_content.find("eleven").unwrap();
-        let range = buffer.anchor_before(range.start)..buffer.anchor_after(range.end);
-        assert_eq!(
-            conflict_snapshot.conflicts_in_range(range, &snapshot),
-            &conflict_snapshot.conflicts[1..=2]
-        );
-
-        let range = test_content.find("one").unwrap()..test_content.find("<<<<<<< HEAD2").unwrap();
-        let range = buffer.anchor_before(range.start)..buffer.anchor_after(range.end);
-        assert_eq!(
-            conflict_snapshot.conflicts_in_range(range, &snapshot),
-            &conflict_snapshot.conflicts[0..=1]
-        );
-
-        let range =
-            test_content.find("eight").unwrap() - 1..test_content.find(">>>>>>> branch3").unwrap();
-        let range = buffer.anchor_before(range.start)..buffer.anchor_after(range.end);
-        assert_eq!(
-            conflict_snapshot.conflicts_in_range(range, &snapshot),
-            &conflict_snapshot.conflicts[1..=2]
-        );
-
-        let range = test_content.find("thirteen").unwrap() - 1..test_content.len();
-        let range = buffer.anchor_before(range.start)..buffer.anchor_after(range.end);
-        assert_eq!(
-            conflict_snapshot.conflicts_in_range(range, &snapshot),
-            &conflict_snapshot.conflicts[3..=3]
-        );
-    }
-
-    #[gpui::test]
-    async fn test_conflict_updates(executor: BackgroundExecutor, cx: &mut TestAppContext) {
-        zlog::init_test();
-        cx.update(|cx| {
-            settings::init(cx);
-        });
-        let initial_text = "
-            one
-            two
-            three
-            four
-            five
-        "
-        .unindent();
-        let fs = FakeFs::new(executor);
-        fs.insert_tree(
-            path!("/project"),
-            json!({
-                ".git": {},
-                "a.txt": initial_text,
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
-        let (git_store, buffer) = project.update(cx, |project, cx| {
-            (
-                project.git_store().clone(),
-                project.open_local_buffer(path!("/project/a.txt"), cx),
-            )
-        });
-        let buffer = buffer.await.unwrap();
-        let conflict_set = git_store.update(cx, |git_store, cx| {
-            git_store.open_conflict_set(buffer.clone(), cx)
-        });
-        let (events_tx, events_rx) = mpsc::channel::<ConflictSetUpdate>();
-        let _conflict_set_subscription = cx.update(|cx| {
-            cx.subscribe(&conflict_set, move |_, event, _| {
-                events_tx.send(event.clone()).ok();
-            })
-        });
-        let conflicts_snapshot =
-            conflict_set.read_with(cx, |conflict_set, _| conflict_set.snapshot());
-        assert!(conflicts_snapshot.conflicts.is_empty());
-
-        buffer.update(cx, |buffer, cx| {
-            buffer.edit(
-                [
-                    (4..4, "<<<<<<< HEAD\n"),
-                    (14..14, "=======\nTWO\n>>>>>>> branch\n"),
-                ],
-                None,
-                cx,
-            );
-        });
-
-        cx.run_until_parked();
-        events_rx.try_recv().expect_err(
-            "no conflicts should be registered as long as the file's status is unchanged",
-        );
-
-        fs.with_git_state(path!("/project/.git").as_ref(), true, |state| {
-            state.unmerged_paths.insert(
-                repo_path("a.txt"),
-                UnmergedStatus {
-                    first_head: UnmergedStatusCode::Updated,
-                    second_head: UnmergedStatusCode::Updated,
-                },
-            );
-            // Cause the repository to emit MergeHeadsChanged.
-            state.refs.insert("MERGE_HEAD".into(), "123".into())
-        })
-        .unwrap();
-
-        cx.run_until_parked();
-        let update = events_rx
-            .try_recv()
-            .expect("status change should trigger conflict parsing");
-        assert_eq!(update.old_range, 0..0);
-        assert_eq!(update.new_range, 0..1);
-
-        let conflict = conflict_set.read_with(cx, |conflict_set, _| {
-            conflict_set.snapshot().conflicts[0].clone()
-        });
-        cx.update(|cx| {
-            conflict.resolve(buffer.clone(), std::slice::from_ref(&conflict.theirs), cx);
-        });
-
-        cx.run_until_parked();
-        let update = events_rx
-            .try_recv()
-            .expect("conflicts should be removed after resolution");
-        assert_eq!(update.old_range, 0..1);
-        assert_eq!(update.new_range, 0..0);
-    }
-
-    #[gpui::test]
-    async fn test_conflict_updates_without_merge_head(
-        executor: BackgroundExecutor,
-        cx: &mut TestAppContext,
-    ) {
-        zlog::init_test();
-        cx.update(|cx| {
-            settings::init(cx);
-        });
-
-        let initial_text = "
-            zero
-            <<<<<<< HEAD
-            one
-            =======
-            two
-            >>>>>>> Stashed Changes
-            three
-        "
-        .unindent();
-
-        let fs = FakeFs::new(executor);
-        fs.insert_tree(
-            path!("/project"),
-            json!({
-                ".git": {},
-                "a.txt": initial_text,
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
-        let (git_store, buffer) = project.update(cx, |project, cx| {
-            (
-                project.git_store().clone(),
-                project.open_local_buffer(path!("/project/a.txt"), cx),
-            )
-        });
-
-        cx.run_until_parked();
-        fs.with_git_state(path!("/project/.git").as_ref(), true, |state| {
-            state.unmerged_paths.insert(
-                RepoPath::from_rel_path(rel_path("a.txt")),
-                UnmergedStatus {
-                    first_head: UnmergedStatusCode::Updated,
-                    second_head: UnmergedStatusCode::Updated,
-                },
-            )
-        })
-        .unwrap();
-
-        let buffer = buffer.await.unwrap();
-
-        // Open the conflict set for a file that currently has conflicts.
-        let conflict_set = git_store.update(cx, |git_store, cx| {
-            git_store.open_conflict_set(buffer.clone(), cx)
-        });
-
-        cx.run_until_parked();
-        conflict_set.update(cx, |conflict_set, cx| {
-            let conflict_range = conflict_set.snapshot().conflicts[0]
-                .range
-                .to_point(buffer.read(cx));
-            assert_eq!(conflict_range, Point::new(1, 0)..Point::new(6, 0));
-        });
-
-        // Simulate the conflict being removed by e.g. staging the file.
-        fs.with_git_state(path!("/project/.git").as_ref(), true, |state| {
-            state.unmerged_paths.remove(&repo_path("a.txt"))
-        })
-        .unwrap();
-
-        cx.run_until_parked();
-        conflict_set.update(cx, |conflict_set, _| {
-            assert!(!conflict_set.has_conflict);
-            assert_eq!(conflict_set.snapshot.conflicts.len(), 0);
-        });
-
-        // Simulate the conflict being re-added.
-        fs.with_git_state(path!("/project/.git").as_ref(), true, |state| {
-            state.unmerged_paths.insert(
-                repo_path("a.txt"),
-                UnmergedStatus {
-                    first_head: UnmergedStatusCode::Updated,
-                    second_head: UnmergedStatusCode::Updated,
-                },
-            )
-        })
-        .unwrap();
-
-        cx.run_until_parked();
-        conflict_set.update(cx, |conflict_set, cx| {
-            let conflict_range = conflict_set.snapshot().conflicts[0]
-                .range
-                .to_point(buffer.read(cx));
-            assert_eq!(conflict_range, Point::new(1, 0)..Point::new(6, 0));
-        });
-    }
-}
diff --git a/crates/project/src/git_store/git_traversal.rs b/crates/project/src/git_store/git_traversal.rs
deleted file mode 100644
index 39857951ad..0000000000
--- a/crates/project/src/git_store/git_traversal.rs
+++ /dev/null
@@ -1,793 +0,0 @@
-use collections::HashMap;
-use git::{repository::RepoPath, status::GitSummary};
-use std::{collections::BTreeMap, ops::Deref, path::Path};
-use sum_tree::Cursor;
-use text::Bias;
-use util::rel_path::RelPath;
-use worktree::{Entry, PathProgress, PathTarget, Traversal};
-
-use super::{RepositoryId, RepositorySnapshot, StatusEntry};
-
-/// Walks the worktree entries and their associated git statuses.
-pub struct GitTraversal<'a> {
-    traversal: Traversal<'a>,
-    current_entry_summary: Option<GitSummary>,
-    repo_root_to_snapshot: BTreeMap<&'a Path, &'a RepositorySnapshot>,
-    repo_location: Option<(
-        RepositoryId,
-        Cursor<'a, 'static, StatusEntry, PathProgress<'a>>,
-    )>,
-}
-
-impl<'a> GitTraversal<'a> {
-    pub fn new(
-        repo_snapshots: &'a HashMap<RepositoryId, RepositorySnapshot>,
-        traversal: Traversal<'a>,
-    ) -> GitTraversal<'a> {
-        let repo_root_to_snapshot = repo_snapshots
-            .values()
-            .map(|snapshot| (&*snapshot.work_directory_abs_path, snapshot))
-            .collect();
-        let mut this = GitTraversal {
-            traversal,
-            current_entry_summary: None,
-            repo_location: None,
-            repo_root_to_snapshot,
-        };
-        this.synchronize_statuses(true);
-        this
-    }
-
-    fn repo_root_for_path(&self, path: &Path) -> Option<(&'a RepositorySnapshot, RepoPath)> {
-        // We might need to perform a range search multiple times, as there may be a nested repository inbetween
-        // the target and our path. E.g:
-        // /our_root_repo/
-        //   .git/
-        //   other_repo/
-        //     .git/
-        //   our_query.txt
-        let query = path.ancestors();
-        for query in query {
-            let (_, snapshot) = self
-                .repo_root_to_snapshot
-                .range(Path::new("")..=query)
-                .last()?;
-
-            let stripped = snapshot
-                .abs_path_to_repo_path(path)
-                .map(|repo_path| (*snapshot, repo_path));
-            if stripped.is_some() {
-                return stripped;
-            }
-        }
-
-        None
-    }
-
-    fn synchronize_statuses(&mut self, reset: bool) {
-        self.current_entry_summary = None;
-
-        let Some(entry) = self.entry() else {
-            return;
-        };
-
-        let abs_path = self.traversal.snapshot().absolutize(&entry.path);
-
-        let Some((repo, repo_path)) = self.repo_root_for_path(&abs_path) else {
-            self.repo_location = None;
-            return;
-        };
-
-        // Update our state if we changed repositories.
-        if reset
-            || self
-                .repo_location
-                .as_ref()
-                .map(|(prev_repo_id, _)| *prev_repo_id)
-                != Some(repo.id)
-        {
-            self.repo_location = Some((repo.id, repo.statuses_by_path.cursor::<PathProgress>(())));
-        }
-
-        let Some((_, statuses)) = &mut self.repo_location else {
-            return;
-        };
-
-        if entry.is_dir() {
-            let mut statuses = statuses.clone();
-            statuses.seek_forward(&PathTarget::Path(&repo_path), Bias::Left);
-            let summary = statuses.summary(&PathTarget::Successor(&repo_path), Bias::Left);
-
-            self.current_entry_summary = Some(summary);
-        } else if entry.is_file() {
-            // For a file entry, park the cursor on the corresponding status
-            if statuses.seek_forward(&PathTarget::Path(&repo_path), Bias::Left) {
-                // TODO: Investigate statuses.item() being None here.
-                self.current_entry_summary = statuses.item().map(|item| item.status.into());
-            } else {
-                self.current_entry_summary = Some(GitSummary::UNCHANGED);
-            }
-        }
-    }
-
-    pub fn advance(&mut self) -> bool {
-        let found = self.traversal.advance_by(1);
-        self.synchronize_statuses(false);
-        found
-    }
-
-    pub fn advance_to_sibling(&mut self) -> bool {
-        let found = self.traversal.advance_to_sibling();
-        self.synchronize_statuses(false);
-        found
-    }
-
-    pub fn back_to_parent(&mut self) -> bool {
-        let found = self.traversal.back_to_parent();
-        self.synchronize_statuses(true);
-        found
-    }
-
-    pub fn start_offset(&self) -> usize {
-        self.traversal.start_offset()
-    }
-
-    pub fn end_offset(&self) -> usize {
-        self.traversal.end_offset()
-    }
-
-    pub fn entry(&self) -> Option<GitEntryRef<'a>> {
-        let entry = self.traversal.entry()?;
-        let git_summary = self.current_entry_summary.unwrap_or(GitSummary::UNCHANGED);
-        Some(GitEntryRef { entry, git_summary })
-    }
-}
-
-impl<'a> Iterator for GitTraversal<'a> {
-    type Item = GitEntryRef<'a>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        if let Some(item) = self.entry() {
-            self.advance();
-            Some(item)
-        } else {
-            None
-        }
-    }
-}
-
-pub struct ChildEntriesGitIter<'a> {
-    parent_path: &'a RelPath,
-    traversal: GitTraversal<'a>,
-}
-
-impl<'a> ChildEntriesGitIter<'a> {
-    pub fn new(
-        repo_snapshots: &'a HashMap<RepositoryId, RepositorySnapshot>,
-        worktree_snapshot: &'a worktree::Snapshot,
-        parent_path: &'a RelPath,
-    ) -> Self {
-        let mut traversal = GitTraversal::new(
-            repo_snapshots,
-            worktree_snapshot.traverse_from_path(true, true, true, parent_path),
-        );
-        traversal.advance();
-        ChildEntriesGitIter {
-            parent_path,
-            traversal,
-        }
-    }
-}
-
-impl<'a> Iterator for ChildEntriesGitIter<'a> {
-    type Item = GitEntryRef<'a>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        if let Some(item) = self.traversal.entry()
-            && item.path.starts_with(self.parent_path)
-        {
-            self.traversal.advance_to_sibling();
-            return Some(item);
-        }
-        None
-    }
-}
-
-#[derive(Debug, Clone, Copy)]
-pub struct GitEntryRef<'a> {
-    pub entry: &'a Entry,
-    pub git_summary: GitSummary,
-}
-
-impl GitEntryRef<'_> {
-    pub fn to_owned(self) -> GitEntry {
-        GitEntry {
-            entry: self.entry.clone(),
-            git_summary: self.git_summary,
-        }
-    }
-}
-
-impl Deref for GitEntryRef<'_> {
-    type Target = Entry;
-
-    fn deref(&self) -> &Self::Target {
-        self.entry
-    }
-}
-
-impl AsRef<Entry> for GitEntryRef<'_> {
-    fn as_ref(&self) -> &Entry {
-        self.entry
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct GitEntry {
-    pub entry: Entry,
-    pub git_summary: GitSummary,
-}
-
-impl GitEntry {
-    pub fn to_ref(&self) -> GitEntryRef<'_> {
-        GitEntryRef {
-            entry: &self.entry,
-            git_summary: self.git_summary,
-        }
-    }
-}
-
-impl Deref for GitEntry {
-    type Target = Entry;
-
-    fn deref(&self) -> &Self::Target {
-        &self.entry
-    }
-}
-
-impl AsRef<Entry> for GitEntry {
-    fn as_ref(&self) -> &Entry {
-        &self.entry
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::time::Duration;
-
-    use crate::Project;
-
-    use super::*;
-    use fs::FakeFs;
-    use git::status::{FileStatus, StatusCode, TrackedSummary, UnmergedStatus, UnmergedStatusCode};
-    use gpui::TestAppContext;
-    use serde_json::json;
-    use settings::SettingsStore;
-    use util::{path, rel_path::rel_path};
-
-    const CONFLICT: FileStatus = FileStatus::Unmerged(UnmergedStatus {
-        first_head: UnmergedStatusCode::Updated,
-        second_head: UnmergedStatusCode::Updated,
-    });
-    const ADDED: GitSummary = GitSummary {
-        index: TrackedSummary::ADDED,
-        count: 1,
-        ..GitSummary::UNCHANGED
-    };
-    const MODIFIED: GitSummary = GitSummary {
-        index: TrackedSummary::MODIFIED,
-        count: 1,
-        ..GitSummary::UNCHANGED
-    };
-
-    #[gpui::test]
-    async fn test_git_traversal_with_one_repo(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(
-            path!("/root"),
-            json!({
-                "x": {
-                    ".git": {},
-                    "x1.txt": "foo",
-                    "x2.txt": "bar",
-                    "y": {
-                        ".git": {},
-                        "y1.txt": "baz",
-                        "y2.txt": "qux"
-                    },
-                    "z.txt": "sneaky..."
-                },
-                "z": {
-                    ".git": {},
-                    "z1.txt": "quux",
-                    "z2.txt": "quuux"
-                }
-            }),
-        )
-        .await;
-
-        fs.set_status_for_repo(
-            Path::new(path!("/root/x/.git")),
-            &[
-                ("x2.txt", StatusCode::Modified.index()),
-                ("z.txt", StatusCode::Added.index()),
-            ],
-        );
-        fs.set_status_for_repo(Path::new(path!("/root/x/y/.git")), &[("y1.txt", CONFLICT)]);
-        fs.set_status_for_repo(
-            Path::new(path!("/root/z/.git")),
-            &[("z2.txt", StatusCode::Added.index())],
-        );
-
-        let project = Project::test(fs, [path!("/root").as_ref()], cx).await;
-        cx.executor().run_until_parked();
-
-        let (repo_snapshots, worktree_snapshot) = project.read_with(cx, |project, cx| {
-            (
-                project.git_store().read(cx).repo_snapshots(cx),
-                project.worktrees(cx).next().unwrap().read(cx).snapshot(),
-            )
-        });
-
-        let traversal = GitTraversal::new(
-            &repo_snapshots,
-            worktree_snapshot.traverse_from_path(true, false, true, RelPath::unix("x").unwrap()),
-        );
-        let entries = traversal
-            .map(|entry| (entry.path.clone(), entry.git_summary))
-            .collect::<Vec<_>>();
-        pretty_assertions::assert_eq!(
-            entries,
-            [
-                (rel_path("x/x1.txt").into(), GitSummary::UNCHANGED),
-                (rel_path("x/x2.txt").into(), MODIFIED),
-                (rel_path("x/y/y1.txt").into(), GitSummary::CONFLICT),
-                (rel_path("x/y/y2.txt").into(), GitSummary::UNCHANGED),
-                (rel_path("x/z.txt").into(), ADDED),
-                (rel_path("z/z1.txt").into(), GitSummary::UNCHANGED),
-                (rel_path("z/z2.txt").into(), ADDED),
-            ]
-        )
-    }
-
-    #[gpui::test]
-    async fn test_git_traversal_with_nested_repos(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(
-            path!("/root"),
-            json!({
-                "x": {
-                    ".git": {},
-                    "x1.txt": "foo",
-                    "x2.txt": "bar",
-                    "y": {
-                        ".git": {},
-                        "y1.txt": "baz",
-                        "y2.txt": "qux"
-                    },
-                    "z.txt": "sneaky..."
-                },
-                "z": {
-                    ".git": {},
-                    "z1.txt": "quux",
-                    "z2.txt": "quuux"
-                }
-            }),
-        )
-        .await;
-
-        fs.set_status_for_repo(
-            Path::new(path!("/root/x/.git")),
-            &[
-                ("x2.txt", StatusCode::Modified.index()),
-                ("z.txt", StatusCode::Added.index()),
-            ],
-        );
-        fs.set_status_for_repo(Path::new(path!("/root/x/y/.git")), &[("y1.txt", CONFLICT)]);
-
-        fs.set_status_for_repo(
-            Path::new(path!("/root/z/.git")),
-            &[("z2.txt", StatusCode::Added.index())],
-        );
-
-        let project = Project::test(fs, [path!("/root").as_ref()], cx).await;
-        cx.executor().run_until_parked();
-
-        let (repo_snapshots, worktree_snapshot) = project.read_with(cx, |project, cx| {
-            (
-                project.git_store().read(cx).repo_snapshots(cx),
-                project.worktrees(cx).next().unwrap().read(cx).snapshot(),
-            )
-        });
-
-        // Sanity check the propagation for x/y and z
-        check_git_statuses(
-            &repo_snapshots,
-            &worktree_snapshot,
-            &[
-                ("x/y", GitSummary::CONFLICT),
-                ("x/y/y1.txt", GitSummary::CONFLICT),
-                ("x/y/y2.txt", GitSummary::UNCHANGED),
-            ],
-        );
-        check_git_statuses(
-            &repo_snapshots,
-            &worktree_snapshot,
-            &[
-                ("z", ADDED),
-                ("z/z1.txt", GitSummary::UNCHANGED),
-                ("z/z2.txt", ADDED),
-            ],
-        );
-
-        // Test one of the fundamental cases of propagation blocking, the transition from one git repository to another
-        check_git_statuses(
-            &repo_snapshots,
-            &worktree_snapshot,
-            &[
-                ("x", MODIFIED + ADDED),
-                ("x/y", GitSummary::CONFLICT),
-                ("x/y/y1.txt", GitSummary::CONFLICT),
-            ],
-        );
-
-        // Sanity check everything around it
-        check_git_statuses(
-            &repo_snapshots,
-            &worktree_snapshot,
-            &[
-                ("x", MODIFIED + ADDED),
-                ("x/x1.txt", GitSummary::UNCHANGED),
-                ("x/x2.txt", MODIFIED),
-                ("x/y", GitSummary::CONFLICT),
-                ("x/y/y1.txt", GitSummary::CONFLICT),
-                ("x/y/y2.txt", GitSummary::UNCHANGED),
-                ("x/z.txt", ADDED),
-            ],
-        );
-
-        // Test the other fundamental case, transitioning from git repository to non-git repository
-        check_git_statuses(
-            &repo_snapshots,
-            &worktree_snapshot,
-            &[
-                ("", GitSummary::UNCHANGED),
-                ("x", MODIFIED + ADDED),
-                ("x/x1.txt", GitSummary::UNCHANGED),
-            ],
-        );
-
-        // And all together now
-        check_git_statuses(
-            &repo_snapshots,
-            &worktree_snapshot,
-            &[
-                ("", GitSummary::UNCHANGED),
-                ("x", MODIFIED + ADDED),
-                ("x/x1.txt", GitSummary::UNCHANGED),
-                ("x/x2.txt", MODIFIED),
-                ("x/y", GitSummary::CONFLICT),
-                ("x/y/y1.txt", GitSummary::CONFLICT),
-                ("x/y/y2.txt", GitSummary::UNCHANGED),
-                ("x/z.txt", ADDED),
-                ("z", ADDED),
-                ("z/z1.txt", GitSummary::UNCHANGED),
-                ("z/z2.txt", ADDED),
-            ],
-        );
-    }
-
-    #[gpui::test]
-    async fn test_git_traversal_simple(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(
-            path!("/root"),
-            json!({
-                ".git": {},
-                "a": {
-                    "b": {
-                        "c1.txt": "",
-                        "c2.txt": "",
-                    },
-                    "d": {
-                        "e1.txt": "",
-                        "e2.txt": "",
-                        "e3.txt": "",
-                    }
-                },
-                "f": {
-                    "no-status.txt": ""
-                },
-                "g": {
-                    "h1.txt": "",
-                    "h2.txt": ""
-                },
-            }),
-        )
-        .await;
-
-        fs.set_status_for_repo(
-            Path::new(path!("/root/.git")),
-            &[
-                ("a/b/c1.txt", StatusCode::Added.index()),
-                ("a/d/e2.txt", StatusCode::Modified.index()),
-                ("g/h2.txt", CONFLICT),
-            ],
-        );
-
-        let project = Project::test(fs, [path!("/root").as_ref()], cx).await;
-        cx.executor().run_until_parked();
-
-        let (repo_snapshots, worktree_snapshot) = project.read_with(cx, |project, cx| {
-            (
-                project.git_store().read(cx).repo_snapshots(cx),
-                project.worktrees(cx).next().unwrap().read(cx).snapshot(),
-            )
-        });
-
-        check_git_statuses(
-            &repo_snapshots,
-            &worktree_snapshot,
-            &[
-                ("", GitSummary::CONFLICT + MODIFIED + ADDED),
-                ("g", GitSummary::CONFLICT),
-                ("g/h2.txt", GitSummary::CONFLICT),
-            ],
-        );
-
-        check_git_statuses(
-            &repo_snapshots,
-            &worktree_snapshot,
-            &[
-                ("", GitSummary::CONFLICT + ADDED + MODIFIED),
-                ("a", ADDED + MODIFIED),
-                ("a/b", ADDED),
-                ("a/b/c1.txt", ADDED),
-                ("a/b/c2.txt", GitSummary::UNCHANGED),
-                ("a/d", MODIFIED),
-                ("a/d/e2.txt", MODIFIED),
-                ("f", GitSummary::UNCHANGED),
-                ("f/no-status.txt", GitSummary::UNCHANGED),
-                ("g", GitSummary::CONFLICT),
-                ("g/h2.txt", GitSummary::CONFLICT),
-            ],
-        );
-
-        check_git_statuses(
-            &repo_snapshots,
-            &worktree_snapshot,
-            &[
-                ("a/b", ADDED),
-                ("a/b/c1.txt", ADDED),
-                ("a/b/c2.txt", GitSummary::UNCHANGED),
-                ("a/d", MODIFIED),
-                ("a/d/e1.txt", GitSummary::UNCHANGED),
-                ("a/d/e2.txt", MODIFIED),
-                ("f", GitSummary::UNCHANGED),
-                ("f/no-status.txt", GitSummary::UNCHANGED),
-                ("g", GitSummary::CONFLICT),
-            ],
-        );
-
-        check_git_statuses(
-            &repo_snapshots,
-            &worktree_snapshot,
-            &[
-                ("a/b/c1.txt", ADDED),
-                ("a/b/c2.txt", GitSummary::UNCHANGED),
-                ("a/d/e1.txt", GitSummary::UNCHANGED),
-                ("a/d/e2.txt", MODIFIED),
-                ("f/no-status.txt", GitSummary::UNCHANGED),
-            ],
-        );
-    }
-
-    #[gpui::test]
-    async fn test_git_traversal_with_repos_under_project(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(
-            path!("/root"),
-            json!({
-                "x": {
-                    ".git": {},
-                    "x1.txt": "foo",
-                    "x2.txt": "bar"
-                },
-                "y": {
-                    ".git": {},
-                    "y1.txt": "baz",
-                    "y2.txt": "qux"
-                },
-                "z": {
-                    ".git": {},
-                    "z1.txt": "quux",
-                    "z2.txt": "quuux"
-                }
-            }),
-        )
-        .await;
-
-        fs.set_status_for_repo(
-            Path::new(path!("/root/x/.git")),
-            &[("x1.txt", StatusCode::Added.index())],
-        );
-        fs.set_status_for_repo(
-            Path::new(path!("/root/y/.git")),
-            &[
-                ("y1.txt", CONFLICT),
-                ("y2.txt", StatusCode::Modified.index()),
-            ],
-        );
-        fs.set_status_for_repo(
-            Path::new(path!("/root/z/.git")),
-            &[("z2.txt", StatusCode::Modified.index())],
-        );
-
-        let project = Project::test(fs, [path!("/root").as_ref()], cx).await;
-        cx.executor().run_until_parked();
-
-        let (repo_snapshots, worktree_snapshot) = project.read_with(cx, |project, cx| {
-            (
-                project.git_store().read(cx).repo_snapshots(cx),
-                project.worktrees(cx).next().unwrap().read(cx).snapshot(),
-            )
-        });
-
-        check_git_statuses(
-            &repo_snapshots,
-            &worktree_snapshot,
-            &[("x", ADDED), ("x/x1.txt", ADDED)],
-        );
-
-        check_git_statuses(
-            &repo_snapshots,
-            &worktree_snapshot,
-            &[
-                ("y", GitSummary::CONFLICT + MODIFIED),
-                ("y/y1.txt", GitSummary::CONFLICT),
-                ("y/y2.txt", MODIFIED),
-            ],
-        );
-
-        check_git_statuses(
-            &repo_snapshots,
-            &worktree_snapshot,
-            &[("z", MODIFIED), ("z/z2.txt", MODIFIED)],
-        );
-
-        check_git_statuses(
-            &repo_snapshots,
-            &worktree_snapshot,
-            &[("x", ADDED), ("x/x1.txt", ADDED)],
-        );
-
-        check_git_statuses(
-            &repo_snapshots,
-            &worktree_snapshot,
-            &[
-                ("x", ADDED),
-                ("x/x1.txt", ADDED),
-                ("x/x2.txt", GitSummary::UNCHANGED),
-                ("y", GitSummary::CONFLICT + MODIFIED),
-                ("y/y1.txt", GitSummary::CONFLICT),
-                ("y/y2.txt", MODIFIED),
-                ("z", MODIFIED),
-                ("z/z1.txt", GitSummary::UNCHANGED),
-                ("z/z2.txt", MODIFIED),
-            ],
-        );
-    }
-
-    fn init_test(cx: &mut gpui::TestAppContext) {
-        zlog::init_test();
-
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-        });
-    }
-
-    #[gpui::test]
-    async fn test_bump_mtime_of_git_repo_workdir(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        // Create a worktree with a git directory.
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(
-            path!("/root"),
-            json!({
-                ".git": {},
-                "a.txt": "",
-                "b": {
-                    "c.txt": "",
-                },
-            }),
-        )
-        .await;
-        fs.set_head_and_index_for_repo(
-            path!("/root/.git").as_ref(),
-            &[("a.txt", "".into()), ("b/c.txt", "".into())],
-        );
-        cx.run_until_parked();
-
-        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-        cx.executor().run_until_parked();
-
-        let (old_entry_ids, old_mtimes) = project.read_with(cx, |project, cx| {
-            let tree = project.worktrees(cx).next().unwrap().read(cx);
-            (
-                tree.entries(true, 0).map(|e| e.id).collect::<Vec<_>>(),
-                tree.entries(true, 0).map(|e| e.mtime).collect::<Vec<_>>(),
-            )
-        });
-
-        // Regression test: after the directory is scanned, touch the git repo's
-        // working directory, bumping its mtime. That directory keeps its project
-        // entry id after the directories are re-scanned.
-        fs.touch_path(path!("/root")).await;
-        cx.executor().run_until_parked();
-
-        let (new_entry_ids, new_mtimes) = project.read_with(cx, |project, cx| {
-            let tree = project.worktrees(cx).next().unwrap().read(cx);
-            (
-                tree.entries(true, 0).map(|e| e.id).collect::<Vec<_>>(),
-                tree.entries(true, 0).map(|e| e.mtime).collect::<Vec<_>>(),
-            )
-        });
-        assert_eq!(new_entry_ids, old_entry_ids);
-        assert_ne!(new_mtimes, old_mtimes);
-
-        // Regression test: changes to the git repository should still be
-        // detected.
-        fs.set_head_for_repo(
-            path!("/root/.git").as_ref(),
-            &[("a.txt", "".into()), ("b/c.txt", "something-else".into())],
-            "deadbeef",
-        );
-        cx.executor().run_until_parked();
-        cx.executor().advance_clock(Duration::from_secs(1));
-
-        let (repo_snapshots, worktree_snapshot) = project.read_with(cx, |project, cx| {
-            (
-                project.git_store().read(cx).repo_snapshots(cx),
-                project.worktrees(cx).next().unwrap().read(cx).snapshot(),
-            )
-        });
-
-        check_git_statuses(
-            &repo_snapshots,
-            &worktree_snapshot,
-            &[
-                ("", MODIFIED),
-                ("a.txt", GitSummary::UNCHANGED),
-                ("b/c.txt", MODIFIED),
-            ],
-        );
-    }
-
-    #[track_caller]
-    fn check_git_statuses(
-        repo_snapshots: &HashMap<RepositoryId, RepositorySnapshot>,
-        worktree_snapshot: &worktree::Snapshot,
-        expected_statuses: &[(&str, GitSummary)],
-    ) {
-        let mut traversal = GitTraversal::new(
-            repo_snapshots,
-            worktree_snapshot.traverse_from_path(true, true, false, RelPath::empty()),
-        );
-        let found_statuses = expected_statuses
-            .iter()
-            .map(|&(path, _)| {
-                let git_entry = traversal
-                    .find(|git_entry| git_entry.path.as_ref() == rel_path(path))
-                    .unwrap_or_else(|| panic!("Traversal has no entry for {path:?}"));
-                (path, git_entry.git_summary)
-            })
-            .collect::<Vec<_>>();
-        pretty_assertions::assert_eq!(found_statuses, expected_statuses);
-    }
-}
diff --git a/crates/project/src/git_store/pending_op.rs b/crates/project/src/git_store/pending_op.rs
deleted file mode 100644
index 1991eed407..0000000000
--- a/crates/project/src/git_store/pending_op.rs
+++ /dev/null
@@ -1,147 +0,0 @@
-use git::repository::RepoPath;
-use std::ops::Add;
-use sum_tree::{ContextLessSummary, Item, KeyedItem};
-use worktree::{PathKey, PathSummary};
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum GitStatus {
-    Staged,
-    Unstaged,
-    Reverted,
-    Unchanged,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum JobStatus {
-    Running,
-    Finished,
-    Skipped,
-    Error,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct PendingOps {
-    pub repo_path: RepoPath,
-    pub ops: Vec<PendingOp>,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct PendingOp {
-    pub id: PendingOpId,
-    pub git_status: GitStatus,
-    pub job_status: JobStatus,
-}
-
-#[derive(Clone, Debug)]
-pub struct PendingOpsSummary {
-    pub staged_count: usize,
-    pub staging_count: usize,
-}
-
-#[derive(Debug, Default, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
-pub struct PendingOpId(pub u16);
-
-impl Item for PendingOps {
-    type Summary = PathSummary<PendingOpsSummary>;
-
-    fn summary(&self, _cx: ()) -> Self::Summary {
-        PathSummary {
-            max_path: self.repo_path.as_ref().clone(),
-            item_summary: PendingOpsSummary {
-                staged_count: self.staged() as usize,
-                staging_count: self.staging() as usize,
-            },
-        }
-    }
-}
-
-impl ContextLessSummary for PendingOpsSummary {
-    fn zero() -> Self {
-        Self {
-            staged_count: 0,
-            staging_count: 0,
-        }
-    }
-
-    fn add_summary(&mut self, summary: &Self) {
-        self.staged_count += summary.staged_count;
-        self.staging_count += summary.staging_count;
-    }
-}
-
-impl KeyedItem for PendingOps {
-    type Key = PathKey;
-
-    fn key(&self) -> Self::Key {
-        PathKey(self.repo_path.as_ref().clone())
-    }
-}
-
-impl Add<u16> for PendingOpId {
-    type Output = PendingOpId;
-
-    fn add(self, rhs: u16) -> Self::Output {
-        Self(self.0 + rhs)
-    }
-}
-
-impl From<u16> for PendingOpId {
-    fn from(id: u16) -> Self {
-        Self(id)
-    }
-}
-
-impl PendingOps {
-    pub fn new(path: &RepoPath) -> Self {
-        Self {
-            repo_path: path.clone(),
-            ops: Vec::new(),
-        }
-    }
-
-    pub fn max_id(&self) -> PendingOpId {
-        self.ops.last().map(|op| op.id).unwrap_or_default()
-    }
-
-    pub fn op_by_id(&self, id: PendingOpId) -> Option<&PendingOp> {
-        self.ops.iter().find(|op| op.id == id)
-    }
-
-    pub fn op_by_id_mut(&mut self, id: PendingOpId) -> Option<&mut PendingOp> {
-        self.ops.iter_mut().find(|op| op.id == id)
-    }
-
-    /// File is staged if the last job is finished and has status Staged.
-    pub fn staged(&self) -> bool {
-        if let Some(last) = self.ops.last() {
-            if last.git_status == GitStatus::Staged && last.job_status == JobStatus::Finished {
-                return true;
-            }
-        }
-        false
-    }
-
-    /// File is staged if the last job is not finished and has status Staged.
-    pub fn staging(&self) -> bool {
-        if let Some(last) = self.ops.last() {
-            if last.git_status == GitStatus::Staged && last.job_status != JobStatus::Finished {
-                return true;
-            }
-        }
-        false
-    }
-}
-
-impl PendingOp {
-    pub fn running(&self) -> bool {
-        self.job_status == JobStatus::Running
-    }
-
-    pub fn finished(&self) -> bool {
-        matches!(self.job_status, JobStatus::Finished | JobStatus::Skipped)
-    }
-
-    pub fn error(&self) -> bool {
-        self.job_status == JobStatus::Error
-    }
-}
diff --git a/crates/project/src/image_store.rs b/crates/project/src/image_store.rs
deleted file mode 100644
index 71bee30b99..0000000000
--- a/crates/project/src/image_store.rs
+++ /dev/null
@@ -1,987 +0,0 @@
-use crate::{
-    Project, ProjectEntryId, ProjectItem, ProjectPath,
-    worktree_store::{WorktreeStore, WorktreeStoreEvent},
-};
-use anyhow::{Context as _, Result};
-use collections::{HashMap, HashSet, hash_map};
-use futures::{StreamExt, channel::oneshot};
-use gpui::{
-    App, AsyncApp, Context, Entity, EventEmitter, Img, Subscription, Task, WeakEntity, prelude::*,
-};
-pub use image::ImageFormat;
-use image::{ExtendedColorType, GenericImageView, ImageReader};
-use language::{DiskState, File};
-use rpc::{AnyProtoClient, ErrorExt as _, TypedEnvelope, proto};
-use std::num::NonZeroU64;
-use std::path::PathBuf;
-use std::sync::Arc;
-use util::{ResultExt, rel_path::RelPath};
-use worktree::{LoadedBinaryFile, PathChange, Worktree, WorktreeId};
-
-#[derive(Clone, Copy, Debug, Hash, PartialEq, PartialOrd, Ord, Eq)]
-pub struct ImageId(NonZeroU64);
-
-impl ImageId {
-    pub fn to_proto(&self) -> u64 {
-        self.0.get()
-    }
-}
-
-impl std::fmt::Display for ImageId {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
-impl From<NonZeroU64> for ImageId {
-    fn from(id: NonZeroU64) -> Self {
-        ImageId(id)
-    }
-}
-
-#[derive(Debug)]
-pub enum ImageItemEvent {
-    ReloadNeeded,
-    Reloaded,
-    FileHandleChanged,
-    MetadataUpdated,
-}
-
-impl EventEmitter<ImageItemEvent> for ImageItem {}
-
-pub enum ImageStoreEvent {
-    ImageAdded(Entity<ImageItem>),
-}
-
-impl EventEmitter<ImageStoreEvent> for ImageStore {}
-
-#[derive(Debug, Clone, Copy)]
-pub struct ImageMetadata {
-    pub width: u32,
-    pub height: u32,
-    pub file_size: u64,
-    pub colors: Option<ImageColorInfo>,
-    pub format: ImageFormat,
-}
-
-#[derive(Debug, Clone, Copy)]
-pub struct ImageColorInfo {
-    pub channels: u8,
-    pub bits_per_channel: u8,
-}
-
-impl ImageColorInfo {
-    pub fn from_color_type(color_type: impl Into<ExtendedColorType>) -> Option<Self> {
-        let (channels, bits_per_channel) = match color_type.into() {
-            ExtendedColorType::L8 => (1, 8),
-            ExtendedColorType::L16 => (1, 16),
-            ExtendedColorType::La8 => (2, 8),
-            ExtendedColorType::La16 => (2, 16),
-            ExtendedColorType::Rgb8 => (3, 8),
-            ExtendedColorType::Rgb16 => (3, 16),
-            ExtendedColorType::Rgba8 => (4, 8),
-            ExtendedColorType::Rgba16 => (4, 16),
-            ExtendedColorType::A8 => (1, 8),
-            ExtendedColorType::Bgr8 => (3, 8),
-            ExtendedColorType::Bgra8 => (4, 8),
-            ExtendedColorType::Cmyk8 => (4, 8),
-            _ => return None,
-        };
-
-        Some(Self {
-            channels,
-            bits_per_channel,
-        })
-    }
-
-    pub const fn bits_per_pixel(&self) -> u8 {
-        self.channels * self.bits_per_channel
-    }
-}
-
-pub struct ImageItem {
-    pub id: ImageId,
-    pub file: Arc<worktree::File>,
-    pub image: Arc<gpui::Image>,
-    reload_task: Option<Task<()>>,
-    pub image_metadata: Option<ImageMetadata>,
-}
-
-impl ImageItem {
-    fn compute_metadata_from_bytes(image_bytes: &[u8]) -> Result<ImageMetadata> {
-        let image_format = image::guess_format(image_bytes)?;
-
-        let mut image_reader = ImageReader::new(std::io::Cursor::new(image_bytes));
-        image_reader.set_format(image_format);
-        let image = image_reader.decode()?;
-
-        let (width, height) = image.dimensions();
-
-        Ok(ImageMetadata {
-            width,
-            height,
-            file_size: image_bytes.len() as u64,
-            format: image_format,
-            colors: ImageColorInfo::from_color_type(image.color()),
-        })
-    }
-
-    pub async fn load_image_metadata(
-        image: Entity<ImageItem>,
-        project: Entity<Project>,
-        cx: &mut AsyncApp,
-    ) -> Result<ImageMetadata> {
-        let (fs, image_path) = cx.update(|cx| {
-            let fs = project.read(cx).fs().clone();
-            let image_path = image
-                .read(cx)
-                .abs_path(cx)
-                .context("absolutizing image file path")?;
-            anyhow::Ok((fs, image_path))
-        })??;
-
-        let image_bytes = fs.load_bytes(&image_path).await?;
-        Self::compute_metadata_from_bytes(&image_bytes)
-    }
-
-    pub fn project_path(&self, cx: &App) -> ProjectPath {
-        ProjectPath {
-            worktree_id: self.file.worktree_id(cx),
-            path: self.file.path().clone(),
-        }
-    }
-
-    pub fn abs_path(&self, cx: &App) -> Option<PathBuf> {
-        Some(self.file.as_local()?.abs_path(cx))
-    }
-
-    fn file_updated(&mut self, new_file: Arc<worktree::File>, cx: &mut Context<Self>) {
-        let mut file_changed = false;
-
-        let old_file = &self.file;
-        if new_file.path() != old_file.path() {
-            file_changed = true;
-        }
-
-        let old_state = old_file.disk_state();
-        let new_state = new_file.disk_state();
-        if old_state != new_state {
-            file_changed = true;
-            if matches!(new_state, DiskState::Present { .. }) {
-                cx.emit(ImageItemEvent::ReloadNeeded)
-            }
-        }
-
-        self.file = new_file;
-        if file_changed {
-            cx.emit(ImageItemEvent::FileHandleChanged);
-            cx.notify();
-        }
-    }
-
-    fn reload(&mut self, cx: &mut Context<Self>) -> Option<oneshot::Receiver<()>> {
-        let local_file = self.file.as_local()?;
-        let (tx, rx) = futures::channel::oneshot::channel();
-
-        let content = local_file.load_bytes(cx);
-        self.reload_task = Some(cx.spawn(async move |this, cx| {
-            if let Some(image) = content
-                .await
-                .context("Failed to load image content")
-                .and_then(create_gpui_image)
-                .log_err()
-            {
-                this.update(cx, |this, cx| {
-                    this.image = image;
-                    cx.emit(ImageItemEvent::Reloaded);
-                })
-                .log_err();
-            }
-            _ = tx.send(());
-        }));
-        Some(rx)
-    }
-}
-
-pub fn is_image_file(project: &Entity<Project>, path: &ProjectPath, cx: &App) -> bool {
-    let ext = util::maybe!({
-        let worktree_abs_path = project
-            .read(cx)
-            .worktree_for_id(path.worktree_id, cx)?
-            .read(cx)
-            .abs_path();
-        path.path
-            .extension()
-            .or_else(|| worktree_abs_path.extension()?.to_str())
-            .map(str::to_lowercase)
-    });
-
-    match ext {
-        Some(ext) => Img::extensions().contains(&ext.as_str()) && !ext.contains("svg"),
-        None => false,
-    }
-}
-
-impl ProjectItem for ImageItem {
-    fn try_open(
-        project: &Entity<Project>,
-        path: &ProjectPath,
-        cx: &mut App,
-    ) -> Option<Task<anyhow::Result<Entity<Self>>>> {
-        if is_image_file(project, path, cx) {
-            Some(cx.spawn({
-                let path = path.clone();
-                let project = project.clone();
-                async move |cx| {
-                    project
-                        .update(cx, |project, cx| project.open_image(path, cx))?
-                        .await
-                }
-            }))
-        } else {
-            None
-        }
-    }
-
-    fn entry_id(&self, _: &App) -> Option<ProjectEntryId> {
-        self.file.entry_id
-    }
-
-    fn project_path(&self, cx: &App) -> Option<ProjectPath> {
-        Some(self.project_path(cx))
-    }
-
-    fn is_dirty(&self) -> bool {
-        false
-    }
-}
-
-trait ImageStoreImpl {
-    fn open_image(
-        &self,
-        path: Arc<RelPath>,
-        worktree: Entity<Worktree>,
-        cx: &mut Context<ImageStore>,
-    ) -> Task<Result<Entity<ImageItem>>>;
-
-    fn reload_images(
-        &self,
-        images: HashSet<Entity<ImageItem>>,
-        cx: &mut Context<ImageStore>,
-    ) -> Task<Result<()>>;
-
-    fn as_local(&self) -> Option<Entity<LocalImageStore>>;
-    fn as_remote(&self) -> Option<Entity<RemoteImageStore>>;
-}
-
-struct RemoteImageStore {
-    upstream_client: AnyProtoClient,
-    project_id: u64,
-    loading_remote_images_by_id: HashMap<ImageId, LoadingRemoteImage>,
-    remote_image_listeners:
-        HashMap<ImageId, Vec<oneshot::Sender<anyhow::Result<Entity<ImageItem>>>>>,
-    loaded_images: HashMap<ImageId, Entity<ImageItem>>,
-}
-
-struct LoadingRemoteImage {
-    state: proto::ImageState,
-    chunks: Vec<Vec<u8>>,
-    received_size: u64,
-}
-
-struct LocalImageStore {
-    local_image_ids_by_path: HashMap<ProjectPath, ImageId>,
-    local_image_ids_by_entry_id: HashMap<ProjectEntryId, ImageId>,
-    image_store: WeakEntity<ImageStore>,
-    _subscription: Subscription,
-}
-
-pub struct ImageStore {
-    state: Box<dyn ImageStoreImpl>,
-    opened_images: HashMap<ImageId, WeakEntity<ImageItem>>,
-    worktree_store: Entity<WorktreeStore>,
-    #[allow(clippy::type_complexity)]
-    loading_images_by_path: HashMap<
-        ProjectPath,
-        postage::watch::Receiver<Option<Result<Entity<ImageItem>, Arc<anyhow::Error>>>>,
-    >,
-}
-
-impl ImageStore {
-    pub fn local(worktree_store: Entity<WorktreeStore>, cx: &mut Context<Self>) -> Self {
-        let this = cx.weak_entity();
-        Self {
-            state: Box::new(cx.new(|cx| {
-                let subscription = cx.subscribe(
-                    &worktree_store,
-                    |this: &mut LocalImageStore, _, event, cx| {
-                        if let WorktreeStoreEvent::WorktreeAdded(worktree) = event {
-                            this.subscribe_to_worktree(worktree, cx);
-                        }
-                    },
-                );
-
-                LocalImageStore {
-                    local_image_ids_by_path: Default::default(),
-                    local_image_ids_by_entry_id: Default::default(),
-                    image_store: this,
-                    _subscription: subscription,
-                }
-            })),
-            opened_images: Default::default(),
-            loading_images_by_path: Default::default(),
-            worktree_store,
-        }
-    }
-
-    pub fn remote(
-        worktree_store: Entity<WorktreeStore>,
-        upstream_client: AnyProtoClient,
-        project_id: u64,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        Self {
-            state: Box::new(cx.new(|_| RemoteImageStore {
-                upstream_client,
-                project_id,
-                loading_remote_images_by_id: Default::default(),
-                remote_image_listeners: Default::default(),
-                loaded_images: Default::default(),
-            })),
-            opened_images: Default::default(),
-            loading_images_by_path: Default::default(),
-            worktree_store,
-        }
-    }
-
-    pub fn images(&self) -> impl '_ + Iterator<Item = Entity<ImageItem>> {
-        self.opened_images
-            .values()
-            .filter_map(|image| image.upgrade())
-    }
-
-    pub fn get(&self, image_id: ImageId) -> Option<Entity<ImageItem>> {
-        self.opened_images
-            .get(&image_id)
-            .and_then(|image| image.upgrade())
-    }
-
-    pub fn get_by_path(&self, path: &ProjectPath, cx: &App) -> Option<Entity<ImageItem>> {
-        self.images()
-            .find(|image| &image.read(cx).project_path(cx) == path)
-    }
-
-    pub fn open_image(
-        &mut self,
-        project_path: ProjectPath,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Entity<ImageItem>>> {
-        let existing_image = self.get_by_path(&project_path, cx);
-        if let Some(existing_image) = existing_image {
-            return Task::ready(Ok(existing_image));
-        }
-
-        let Some(worktree) = self
-            .worktree_store
-            .read(cx)
-            .worktree_for_id(project_path.worktree_id, cx)
-        else {
-            return Task::ready(Err(anyhow::anyhow!("no such worktree")));
-        };
-
-        let loading_watch = match self.loading_images_by_path.entry(project_path.clone()) {
-            // If the given path is already being loaded, then wait for that existing
-            // task to complete and return the same image.
-            hash_map::Entry::Occupied(e) => e.get().clone(),
-
-            // Otherwise, record the fact that this path is now being loaded.
-            hash_map::Entry::Vacant(entry) => {
-                let (mut tx, rx) = postage::watch::channel();
-                entry.insert(rx.clone());
-
-                let load_image = self
-                    .state
-                    .open_image(project_path.path.clone(), worktree, cx);
-
-                cx.spawn(async move |this, cx| {
-                    let load_result = load_image.await;
-                    *tx.borrow_mut() = Some(this.update(cx, |this, _cx| {
-                        // Record the fact that the image is no longer loading.
-                        this.loading_images_by_path.remove(&project_path);
-                        let image = load_result.map_err(Arc::new)?;
-                        Ok(image)
-                    })?);
-                    anyhow::Ok(())
-                })
-                .detach();
-                rx
-            }
-        };
-
-        cx.background_spawn(async move {
-            Self::wait_for_loading_image(loading_watch)
-                .await
-                .map_err(|e| e.cloned())
-        })
-    }
-
-    pub async fn wait_for_loading_image(
-        mut receiver: postage::watch::Receiver<
-            Option<Result<Entity<ImageItem>, Arc<anyhow::Error>>>,
-        >,
-    ) -> Result<Entity<ImageItem>, Arc<anyhow::Error>> {
-        loop {
-            if let Some(result) = receiver.borrow().as_ref() {
-                match result {
-                    Ok(image) => return Ok(image.to_owned()),
-                    Err(e) => return Err(e.to_owned()),
-                }
-            }
-            receiver.next().await;
-        }
-    }
-
-    pub fn reload_images(
-        &self,
-        images: HashSet<Entity<ImageItem>>,
-        cx: &mut Context<ImageStore>,
-    ) -> Task<Result<()>> {
-        if images.is_empty() {
-            return Task::ready(Ok(()));
-        }
-
-        self.state.reload_images(images, cx)
-    }
-
-    fn add_image(&mut self, image: Entity<ImageItem>, cx: &mut Context<ImageStore>) -> Result<()> {
-        let image_id = image.read(cx).id;
-        self.opened_images.insert(image_id, image.downgrade());
-        cx.subscribe(&image, Self::on_image_event).detach();
-        cx.emit(ImageStoreEvent::ImageAdded(image));
-        Ok(())
-    }
-
-    fn on_image_event(
-        &mut self,
-        image: Entity<ImageItem>,
-        event: &ImageItemEvent,
-        cx: &mut Context<Self>,
-    ) {
-        if let ImageItemEvent::FileHandleChanged = event
-            && let Some(local) = self.state.as_local()
-        {
-            local.update(cx, |local, cx| {
-                local.image_changed_file(image, cx);
-            })
-        }
-    }
-
-    pub fn handle_create_image_for_peer(
-        &mut self,
-        envelope: TypedEnvelope<proto::CreateImageForPeer>,
-        cx: &mut Context<Self>,
-    ) -> Result<()> {
-        if let Some(remote) = self.state.as_remote() {
-            let worktree_store = self.worktree_store.clone();
-            let image = remote.update(cx, |remote, cx| {
-                remote.handle_create_image_for_peer(envelope, &worktree_store, cx)
-            })?;
-            if let Some(image) = image {
-                remote.update(cx, |this, cx| {
-                    let image = image.clone();
-                    let image_id = image.read(cx).id;
-                    this.loaded_images.insert(image_id, image)
-                });
-
-                self.add_image(image, cx)?;
-            }
-        }
-
-        Ok(())
-    }
-}
-
-impl RemoteImageStore {
-    pub fn wait_for_remote_image(
-        &mut self,
-        id: ImageId,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Entity<ImageItem>>> {
-        if let Some(image) = self.loaded_images.remove(&id) {
-            return Task::ready(Ok(image));
-        }
-
-        let (tx, rx) = oneshot::channel();
-        self.remote_image_listeners.entry(id).or_default().push(tx);
-
-        cx.spawn(async move |_this, cx| {
-            let result = cx.background_spawn(async move { rx.await? }).await;
-            result
-        })
-    }
-
-    pub fn handle_create_image_for_peer(
-        &mut self,
-        envelope: TypedEnvelope<proto::CreateImageForPeer>,
-        worktree_store: &Entity<WorktreeStore>,
-        cx: &mut Context<Self>,
-    ) -> Result<Option<Entity<ImageItem>>> {
-        use proto::create_image_for_peer::Variant;
-        match envelope.payload.variant {
-            Some(Variant::State(state)) => {
-                let image_id =
-                    ImageId::from(NonZeroU64::new(state.id).context("invalid image id")?);
-
-                self.loading_remote_images_by_id.insert(
-                    image_id,
-                    LoadingRemoteImage {
-                        state,
-                        chunks: Vec::new(),
-                        received_size: 0,
-                    },
-                );
-                Ok(None)
-            }
-            Some(Variant::Chunk(chunk)) => {
-                let image_id =
-                    ImageId::from(NonZeroU64::new(chunk.image_id).context("invalid image id")?);
-
-                let loading = self
-                    .loading_remote_images_by_id
-                    .get_mut(&image_id)
-                    .context("received chunk for unknown image")?;
-
-                loading.received_size += chunk.data.len() as u64;
-                loading.chunks.push(chunk.data);
-
-                if loading.received_size == loading.state.content_size {
-                    let loading = self.loading_remote_images_by_id.remove(&image_id).unwrap();
-
-                    let mut content = Vec::with_capacity(loading.received_size as usize);
-                    for chunk_data in loading.chunks {
-                        content.extend_from_slice(&chunk_data);
-                    }
-
-                    let image_metadata = ImageItem::compute_metadata_from_bytes(&content).log_err();
-                    let image = create_gpui_image(content)?;
-
-                    let proto_file = loading.state.file.context("missing file in image state")?;
-                    let worktree_id = WorktreeId::from_proto(proto_file.worktree_id);
-                    let worktree = worktree_store
-                        .read(cx)
-                        .worktree_for_id(worktree_id, cx)
-                        .context("worktree not found")?;
-
-                    let file = Arc::new(
-                        worktree::File::from_proto(proto_file, worktree, cx)
-                            .context("invalid file in image state")?,
-                    );
-
-                    let entity = cx.new(|_cx| ImageItem {
-                        id: image_id,
-                        file,
-                        image,
-                        image_metadata,
-                        reload_task: None,
-                    });
-
-                    if let Some(listeners) = self.remote_image_listeners.remove(&image_id) {
-                        for listener in listeners {
-                            listener.send(Ok(entity.clone())).ok();
-                        }
-                    }
-
-                    Ok(Some(entity))
-                } else {
-                    Ok(None)
-                }
-            }
-            None => {
-                log::warn!("Received CreateImageForPeer with no variant");
-                Ok(None)
-            }
-        }
-    }
-
-    // TODO: subscribe to worktree and update image contents or at least mark as dirty on file changes
-}
-
-impl ImageStoreImpl for Entity<LocalImageStore> {
-    fn open_image(
-        &self,
-        path: Arc<RelPath>,
-        worktree: Entity<Worktree>,
-        cx: &mut Context<ImageStore>,
-    ) -> Task<Result<Entity<ImageItem>>> {
-        let this = self.clone();
-
-        let load_file = worktree.update(cx, |worktree, cx| {
-            worktree.load_binary_file(path.as_ref(), cx)
-        });
-        cx.spawn(async move |image_store, cx| {
-            let LoadedBinaryFile { file, content } = load_file.await?;
-            let image = create_gpui_image(content)?;
-
-            let entity = cx.new(|cx| ImageItem {
-                id: cx.entity_id().as_non_zero_u64().into(),
-                file: file.clone(),
-                image,
-                image_metadata: None,
-                reload_task: None,
-            })?;
-
-            let image_id = cx.read_entity(&entity, |model, _| model.id)?;
-
-            this.update(cx, |this, cx| {
-                image_store.update(cx, |image_store, cx| {
-                    image_store.add_image(entity.clone(), cx)
-                })??;
-                this.local_image_ids_by_path.insert(
-                    ProjectPath {
-                        worktree_id: file.worktree_id(cx),
-                        path: file.path.clone(),
-                    },
-                    image_id,
-                );
-
-                if let Some(entry_id) = file.entry_id {
-                    this.local_image_ids_by_entry_id.insert(entry_id, image_id);
-                }
-
-                anyhow::Ok(())
-            })??;
-
-            Ok(entity)
-        })
-    }
-
-    fn reload_images(
-        &self,
-        images: HashSet<Entity<ImageItem>>,
-        cx: &mut Context<ImageStore>,
-    ) -> Task<Result<()>> {
-        cx.spawn(async move |_, cx| {
-            for image in images {
-                if let Some(rec) = image.update(cx, |image, cx| image.reload(cx))? {
-                    rec.await?
-                }
-            }
-            Ok(())
-        })
-    }
-
-    fn as_local(&self) -> Option<Entity<LocalImageStore>> {
-        Some(self.clone())
-    }
-
-    fn as_remote(&self) -> Option<Entity<RemoteImageStore>> {
-        None
-    }
-}
-
-impl ImageStoreImpl for Entity<RemoteImageStore> {
-    fn open_image(
-        &self,
-        path: Arc<RelPath>,
-        worktree: Entity<Worktree>,
-        cx: &mut Context<ImageStore>,
-    ) -> Task<Result<Entity<ImageItem>>> {
-        let worktree_id = worktree.read(cx).id().to_proto();
-        let (project_id, client) = {
-            let store = self.read(cx);
-            (store.project_id, store.upstream_client.clone())
-        };
-        let remote_store = self.clone();
-
-        cx.spawn(async move |_image_store, cx| {
-            let response = client
-                .request(rpc::proto::OpenImageByPath {
-                    project_id,
-                    worktree_id,
-                    path: path.to_proto(),
-                })
-                .await?;
-
-            let image_id = ImageId::from(
-                NonZeroU64::new(response.image_id).context("invalid image_id in response")?,
-            );
-
-            remote_store
-                .update(cx, |remote_store, cx| {
-                    remote_store.wait_for_remote_image(image_id, cx)
-                })?
-                .await
-        })
-    }
-
-    fn reload_images(
-        &self,
-        _images: HashSet<Entity<ImageItem>>,
-        _cx: &mut Context<ImageStore>,
-    ) -> Task<Result<()>> {
-        Task::ready(Err(anyhow::anyhow!(
-            "Reloading images from remote is not supported"
-        )))
-    }
-
-    fn as_local(&self) -> Option<Entity<LocalImageStore>> {
-        None
-    }
-
-    fn as_remote(&self) -> Option<Entity<RemoteImageStore>> {
-        Some(self.clone())
-    }
-}
-
-impl LocalImageStore {
-    fn subscribe_to_worktree(&mut self, worktree: &Entity<Worktree>, cx: &mut Context<Self>) {
-        cx.subscribe(worktree, |this, worktree, event, cx| {
-            if worktree.read(cx).is_local()
-                && let worktree::Event::UpdatedEntries(changes) = event
-            {
-                this.local_worktree_entries_changed(&worktree, changes, cx);
-            }
-        })
-        .detach();
-    }
-
-    fn local_worktree_entries_changed(
-        &mut self,
-        worktree_handle: &Entity<Worktree>,
-        changes: &[(Arc<RelPath>, ProjectEntryId, PathChange)],
-        cx: &mut Context<Self>,
-    ) {
-        let snapshot = worktree_handle.read(cx).snapshot();
-        for (path, entry_id, _) in changes {
-            self.local_worktree_entry_changed(*entry_id, path, worktree_handle, &snapshot, cx);
-        }
-    }
-
-    fn local_worktree_entry_changed(
-        &mut self,
-        entry_id: ProjectEntryId,
-        path: &Arc<RelPath>,
-        worktree: &Entity<worktree::Worktree>,
-        snapshot: &worktree::Snapshot,
-        cx: &mut Context<Self>,
-    ) -> Option<()> {
-        let project_path = ProjectPath {
-            worktree_id: snapshot.id(),
-            path: path.clone(),
-        };
-        let image_id = match self.local_image_ids_by_entry_id.get(&entry_id) {
-            Some(&image_id) => image_id,
-            None => self.local_image_ids_by_path.get(&project_path).copied()?,
-        };
-
-        let image = self
-            .image_store
-            .update(cx, |image_store, _| {
-                if let Some(image) = image_store.get(image_id) {
-                    Some(image)
-                } else {
-                    image_store.opened_images.remove(&image_id);
-                    None
-                }
-            })
-            .ok()
-            .flatten();
-        let image = if let Some(image) = image {
-            image
-        } else {
-            self.local_image_ids_by_path.remove(&project_path);
-            self.local_image_ids_by_entry_id.remove(&entry_id);
-            return None;
-        };
-
-        image.update(cx, |image, cx| {
-            let old_file = &image.file;
-            if old_file.worktree != *worktree {
-                return;
-            }
-
-            let snapshot_entry = old_file
-                .entry_id
-                .and_then(|entry_id| snapshot.entry_for_id(entry_id))
-                .or_else(|| snapshot.entry_for_path(old_file.path.as_ref()));
-
-            let new_file = if let Some(entry) = snapshot_entry {
-                worktree::File {
-                    disk_state: match entry.mtime {
-                        Some(mtime) => DiskState::Present { mtime },
-                        None => old_file.disk_state,
-                    },
-                    is_local: true,
-                    entry_id: Some(entry.id),
-                    path: entry.path.clone(),
-                    worktree: worktree.clone(),
-                    is_private: entry.is_private,
-                }
-            } else {
-                worktree::File {
-                    disk_state: DiskState::Deleted,
-                    is_local: true,
-                    entry_id: old_file.entry_id,
-                    path: old_file.path.clone(),
-                    worktree: worktree.clone(),
-                    is_private: old_file.is_private,
-                }
-            };
-
-            if new_file == **old_file {
-                return;
-            }
-
-            if new_file.path != old_file.path {
-                self.local_image_ids_by_path.remove(&ProjectPath {
-                    path: old_file.path.clone(),
-                    worktree_id: old_file.worktree_id(cx),
-                });
-                self.local_image_ids_by_path.insert(
-                    ProjectPath {
-                        worktree_id: new_file.worktree_id(cx),
-                        path: new_file.path.clone(),
-                    },
-                    image_id,
-                );
-            }
-
-            if new_file.entry_id != old_file.entry_id {
-                if let Some(entry_id) = old_file.entry_id {
-                    self.local_image_ids_by_entry_id.remove(&entry_id);
-                }
-                if let Some(entry_id) = new_file.entry_id {
-                    self.local_image_ids_by_entry_id.insert(entry_id, image_id);
-                }
-            }
-
-            image.file_updated(Arc::new(new_file), cx);
-        });
-        None
-    }
-
-    fn image_changed_file(&mut self, image: Entity<ImageItem>, cx: &mut App) -> Option<()> {
-        let image = image.read(cx);
-        let file = &image.file;
-
-        let image_id = image.id;
-        if let Some(entry_id) = file.entry_id {
-            match self.local_image_ids_by_entry_id.get(&entry_id) {
-                Some(_) => {
-                    return None;
-                }
-                None => {
-                    self.local_image_ids_by_entry_id.insert(entry_id, image_id);
-                }
-            }
-        };
-        self.local_image_ids_by_path.insert(
-            ProjectPath {
-                worktree_id: file.worktree_id(cx),
-                path: file.path.clone(),
-            },
-            image_id,
-        );
-
-        Some(())
-    }
-}
-
-fn create_gpui_image(content: Vec<u8>) -> anyhow::Result<Arc<gpui::Image>> {
-    let format = image::guess_format(&content)?;
-
-    Ok(Arc::new(gpui::Image::from_bytes(
-        match format {
-            image::ImageFormat::Png => gpui::ImageFormat::Png,
-            image::ImageFormat::Jpeg => gpui::ImageFormat::Jpeg,
-            image::ImageFormat::WebP => gpui::ImageFormat::Webp,
-            image::ImageFormat::Gif => gpui::ImageFormat::Gif,
-            image::ImageFormat::Bmp => gpui::ImageFormat::Bmp,
-            image::ImageFormat::Tiff => gpui::ImageFormat::Tiff,
-            image::ImageFormat::Ico => gpui::ImageFormat::Ico,
-            format => anyhow::bail!("Image format {format:?} not supported"),
-        },
-        content,
-    )))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use fs::FakeFs;
-    use gpui::TestAppContext;
-    use serde_json::json;
-    use settings::SettingsStore;
-    use util::rel_path::rel_path;
-
-    pub fn init_test(cx: &mut TestAppContext) {
-        zlog::init_test();
-
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-        });
-    }
-
-    #[gpui::test]
-    async fn test_image_not_loaded_twice(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        fs.insert_tree("/root", json!({})).await;
-        // Create a png file that consists of a single white pixel
-        fs.insert_file(
-            "/root/image_1.png",
-            vec![
-                0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, 0x00, 0x0D, 0x49, 0x48,
-                0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x08, 0x06, 0x00, 0x00,
-                0x00, 0x1F, 0x15, 0xC4, 0x89, 0x00, 0x00, 0x00, 0x0A, 0x49, 0x44, 0x41, 0x54, 0x78,
-                0x9C, 0x63, 0x00, 0x01, 0x00, 0x00, 0x05, 0x00, 0x01, 0x0D, 0x0A, 0x2D, 0xB4, 0x00,
-                0x00, 0x00, 0x00, 0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82,
-            ],
-        )
-        .await;
-
-        let project = Project::test(fs, ["/root".as_ref()], cx).await;
-
-        let worktree_id =
-            cx.update(|cx| project.read(cx).worktrees(cx).next().unwrap().read(cx).id());
-
-        let project_path = ProjectPath {
-            worktree_id,
-            path: rel_path("image_1.png").into(),
-        };
-
-        let (task1, task2) = project.update(cx, |project, cx| {
-            (
-                project.open_image(project_path.clone(), cx),
-                project.open_image(project_path.clone(), cx),
-            )
-        });
-
-        let image1 = task1.await.unwrap();
-        let image2 = task2.await.unwrap();
-
-        assert_eq!(image1, image2);
-    }
-
-    #[gpui::test]
-    fn test_compute_metadata_from_bytes() {
-        // Single white pixel PNG
-        let png_bytes = vec![
-            0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, 0x00, 0x0D, 0x49, 0x48,
-            0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x08, 0x06, 0x00, 0x00,
-            0x00, 0x1F, 0x15, 0xC4, 0x89, 0x00, 0x00, 0x00, 0x0A, 0x49, 0x44, 0x41, 0x54, 0x78,
-            0x9C, 0x63, 0x00, 0x01, 0x00, 0x00, 0x05, 0x00, 0x01, 0x0D, 0x0A, 0x2D, 0xB4, 0x00,
-            0x00, 0x00, 0x00, 0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82,
-        ];
-
-        let metadata = ImageItem::compute_metadata_from_bytes(&png_bytes).unwrap();
-
-        assert_eq!(metadata.width, 1);
-        assert_eq!(metadata.height, 1);
-        assert_eq!(metadata.file_size, png_bytes.len() as u64);
-        assert_eq!(metadata.format, image::ImageFormat::Png);
-        assert!(metadata.colors.is_some());
-    }
-}
diff --git a/crates/project/src/lsp_command.rs b/crates/project/src/lsp_command.rs
deleted file mode 100644
index 05ee70bf66..0000000000
--- a/crates/project/src/lsp_command.rs
+++ /dev/null
@@ -1,4643 +0,0 @@
-mod signature_help;
-
-use crate::{
-    CodeAction, CompletionSource, CoreCompletion, CoreCompletionResponse, DocumentColor,
-    DocumentHighlight, DocumentSymbol, Hover, HoverBlock, HoverBlockKind, InlayHint,
-    InlayHintLabel, InlayHintLabelPart, InlayHintLabelPartTooltip, InlayHintTooltip, Location,
-    LocationLink, LspAction, LspPullDiagnostics, MarkupContent, PrepareRenameResponse,
-    ProjectTransaction, PulledDiagnostics, ResolveState,
-    lsp_store::{LocalLspStore, LspStore},
-};
-use anyhow::{Context as _, Result};
-use async_trait::async_trait;
-use client::proto::{self, PeerId};
-use clock::Global;
-use collections::{HashMap, HashSet};
-use futures::future;
-use gpui::{App, AsyncApp, Entity, SharedString, Task};
-use language::{
-    Anchor, Bias, Buffer, BufferSnapshot, CachedLspAdapter, CharKind, CharScopeContext,
-    OffsetRangeExt, PointUtf16, ToOffset, ToPointUtf16, Transaction, Unclipped,
-    language_settings::{InlayHintKind, LanguageSettings, language_settings},
-    point_from_lsp, point_to_lsp,
-    proto::{deserialize_anchor, deserialize_version, serialize_anchor, serialize_version},
-    range_from_lsp, range_to_lsp,
-};
-use lsp::{
-    AdapterServerCapabilities, CodeActionKind, CodeActionOptions, CodeDescription,
-    CompletionContext, CompletionListItemDefaultsEditRange, CompletionTriggerKind,
-    DocumentHighlightKind, LanguageServer, LanguageServerId, LinkedEditingRangeServerCapabilities,
-    OneOf, RenameOptions, ServerCapabilities,
-};
-use serde_json::Value;
-use signature_help::{lsp_to_proto_signature, proto_to_lsp_signature};
-use std::{
-    cmp::Reverse, collections::hash_map, mem, ops::Range, path::Path, str::FromStr, sync::Arc,
-};
-use text::{BufferId, LineEnding};
-use util::{ResultExt as _, debug_panic};
-
-pub use signature_help::SignatureHelp;
-
-pub fn lsp_formatting_options(settings: &LanguageSettings) -> lsp::FormattingOptions {
-    lsp::FormattingOptions {
-        tab_size: settings.tab_size.into(),
-        insert_spaces: !settings.hard_tabs,
-        trim_trailing_whitespace: Some(settings.remove_trailing_whitespace_on_save),
-        trim_final_newlines: Some(settings.ensure_final_newline_on_save),
-        insert_final_newline: Some(settings.ensure_final_newline_on_save),
-        ..lsp::FormattingOptions::default()
-    }
-}
-
-pub fn file_path_to_lsp_url(path: &Path) -> Result<lsp::Uri> {
-    match lsp::Uri::from_file_path(path) {
-        Ok(url) => Ok(url),
-        Err(()) => anyhow::bail!("Invalid file path provided to LSP request: {path:?}"),
-    }
-}
-
-pub(crate) fn make_text_document_identifier(path: &Path) -> Result<lsp::TextDocumentIdentifier> {
-    Ok(lsp::TextDocumentIdentifier {
-        uri: file_path_to_lsp_url(path)?,
-    })
-}
-
-pub(crate) fn make_lsp_text_document_position(
-    path: &Path,
-    position: PointUtf16,
-) -> Result<lsp::TextDocumentPositionParams> {
-    Ok(lsp::TextDocumentPositionParams {
-        text_document: make_text_document_identifier(path)?,
-        position: point_to_lsp(position),
-    })
-}
-
-#[async_trait(?Send)]
-pub trait LspCommand: 'static + Sized + Send + std::fmt::Debug {
-    type Response: 'static + Default + Send + std::fmt::Debug;
-    type LspRequest: 'static + Send + lsp::request::Request;
-    type ProtoRequest: 'static + Send + proto::RequestMessage;
-
-    fn display_name(&self) -> &str;
-
-    fn status(&self) -> Option<String> {
-        None
-    }
-
-    fn to_lsp_params_or_response(
-        &self,
-        path: &Path,
-        buffer: &Buffer,
-        language_server: &Arc<LanguageServer>,
-        cx: &App,
-    ) -> Result<
-        LspParamsOrResponse<<Self::LspRequest as lsp::request::Request>::Params, Self::Response>,
-    > {
-        if self.check_capabilities(language_server.adapter_server_capabilities()) {
-            Ok(LspParamsOrResponse::Params(self.to_lsp(
-                path,
-                buffer,
-                language_server,
-                cx,
-            )?))
-        } else {
-            Ok(LspParamsOrResponse::Response(Default::default()))
-        }
-    }
-
-    /// When false, `to_lsp_params_or_response` default implementation will return the default response.
-    fn check_capabilities(&self, _: AdapterServerCapabilities) -> bool;
-
-    fn to_lsp(
-        &self,
-        path: &Path,
-        buffer: &Buffer,
-        language_server: &Arc<LanguageServer>,
-        cx: &App,
-    ) -> Result<<Self::LspRequest as lsp::request::Request>::Params>;
-
-    async fn response_from_lsp(
-        self,
-        message: <Self::LspRequest as lsp::request::Request>::Result,
-        lsp_store: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        server_id: LanguageServerId,
-        cx: AsyncApp,
-    ) -> Result<Self::Response>;
-
-    fn to_proto(&self, project_id: u64, buffer: &Buffer) -> Self::ProtoRequest;
-
-    async fn from_proto(
-        message: Self::ProtoRequest,
-        lsp_store: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        cx: AsyncApp,
-    ) -> Result<Self>;
-
-    fn response_to_proto(
-        response: Self::Response,
-        lsp_store: &mut LspStore,
-        peer_id: PeerId,
-        buffer_version: &clock::Global,
-        cx: &mut App,
-    ) -> <Self::ProtoRequest as proto::RequestMessage>::Response;
-
-    async fn response_from_proto(
-        self,
-        message: <Self::ProtoRequest as proto::RequestMessage>::Response,
-        lsp_store: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        cx: AsyncApp,
-    ) -> Result<Self::Response>;
-
-    fn buffer_id_from_proto(message: &Self::ProtoRequest) -> Result<BufferId>;
-}
-
-pub enum LspParamsOrResponse<P, R> {
-    Params(P),
-    Response(R),
-}
-
-#[derive(Debug)]
-pub(crate) struct PrepareRename {
-    pub position: PointUtf16,
-}
-
-#[derive(Debug)]
-pub(crate) struct PerformRename {
-    pub position: PointUtf16,
-    pub new_name: String,
-    pub push_to_history: bool,
-}
-
-#[derive(Debug, Clone, Copy)]
-pub struct GetDefinitions {
-    pub position: PointUtf16,
-}
-
-#[derive(Debug, Clone, Copy)]
-pub(crate) struct GetDeclarations {
-    pub position: PointUtf16,
-}
-
-#[derive(Debug, Clone, Copy)]
-pub(crate) struct GetTypeDefinitions {
-    pub position: PointUtf16,
-}
-
-#[derive(Debug, Clone, Copy)]
-pub(crate) struct GetImplementations {
-    pub position: PointUtf16,
-}
-
-#[derive(Debug, Clone, Copy)]
-pub(crate) struct GetReferences {
-    pub position: PointUtf16,
-}
-
-#[derive(Debug)]
-pub(crate) struct GetDocumentHighlights {
-    pub position: PointUtf16,
-}
-
-#[derive(Debug, Copy, Clone)]
-pub(crate) struct GetDocumentSymbols;
-
-#[derive(Clone, Debug)]
-pub(crate) struct GetSignatureHelp {
-    pub position: PointUtf16,
-}
-
-#[derive(Clone, Debug)]
-pub(crate) struct GetHover {
-    pub position: PointUtf16,
-}
-
-#[derive(Debug)]
-pub(crate) struct GetCompletions {
-    pub position: PointUtf16,
-    pub context: CompletionContext,
-    pub server_id: Option<lsp::LanguageServerId>,
-}
-
-#[derive(Clone, Debug)]
-pub(crate) struct GetCodeActions {
-    pub range: Range<Anchor>,
-    pub kinds: Option<Vec<lsp::CodeActionKind>>,
-}
-
-#[derive(Debug)]
-pub(crate) struct OnTypeFormatting {
-    pub position: PointUtf16,
-    pub trigger: String,
-    pub options: lsp::FormattingOptions,
-    pub push_to_history: bool,
-}
-
-#[derive(Clone, Debug)]
-pub(crate) struct InlayHints {
-    pub range: Range<Anchor>,
-}
-
-#[derive(Debug, Copy, Clone)]
-pub(crate) struct GetCodeLens;
-
-#[derive(Debug, Copy, Clone)]
-pub(crate) struct GetDocumentColor;
-
-impl GetCodeLens {
-    pub(crate) fn can_resolve_lens(capabilities: &ServerCapabilities) -> bool {
-        capabilities
-            .code_lens_provider
-            .as_ref()
-            .and_then(|code_lens_options| code_lens_options.resolve_provider)
-            .unwrap_or(false)
-    }
-}
-
-#[derive(Debug)]
-pub(crate) struct LinkedEditingRange {
-    pub position: Anchor,
-}
-
-#[derive(Clone, Debug)]
-pub(crate) struct GetDocumentDiagnostics {
-    /// We cannot blindly rely on server's capabilities.diagnostic_provider, as they're a singular field, whereas
-    /// a server can register multiple diagnostic providers post-mortem.
-    pub registration_id: Option<SharedString>,
-    pub identifier: Option<String>,
-    pub previous_result_id: Option<SharedString>,
-}
-
-#[async_trait(?Send)]
-impl LspCommand for PrepareRename {
-    type Response = PrepareRenameResponse;
-    type LspRequest = lsp::request::PrepareRenameRequest;
-    type ProtoRequest = proto::PrepareRename;
-
-    fn display_name(&self) -> &str {
-        "Prepare rename"
-    }
-
-    fn check_capabilities(&self, capabilities: AdapterServerCapabilities) -> bool {
-        capabilities
-            .server_capabilities
-            .rename_provider
-            .is_some_and(|capability| match capability {
-                OneOf::Left(enabled) => enabled,
-                OneOf::Right(options) => options.prepare_provider.unwrap_or(false),
-            })
-    }
-
-    fn to_lsp_params_or_response(
-        &self,
-        path: &Path,
-        buffer: &Buffer,
-        language_server: &Arc<LanguageServer>,
-        cx: &App,
-    ) -> Result<LspParamsOrResponse<lsp::TextDocumentPositionParams, PrepareRenameResponse>> {
-        let rename_provider = language_server
-            .adapter_server_capabilities()
-            .server_capabilities
-            .rename_provider;
-        match rename_provider {
-            Some(lsp::OneOf::Right(RenameOptions {
-                prepare_provider: Some(true),
-                ..
-            })) => Ok(LspParamsOrResponse::Params(self.to_lsp(
-                path,
-                buffer,
-                language_server,
-                cx,
-            )?)),
-            Some(lsp::OneOf::Right(_)) => Ok(LspParamsOrResponse::Response(
-                PrepareRenameResponse::OnlyUnpreparedRenameSupported,
-            )),
-            Some(lsp::OneOf::Left(true)) => Ok(LspParamsOrResponse::Response(
-                PrepareRenameResponse::OnlyUnpreparedRenameSupported,
-            )),
-            _ => anyhow::bail!("Rename not supported"),
-        }
-    }
-
-    fn to_lsp(
-        &self,
-        path: &Path,
-        _: &Buffer,
-        _: &Arc<LanguageServer>,
-        _: &App,
-    ) -> Result<lsp::TextDocumentPositionParams> {
-        make_lsp_text_document_position(path, self.position)
-    }
-
-    async fn response_from_lsp(
-        self,
-        message: Option<lsp::PrepareRenameResponse>,
-        _: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        _: LanguageServerId,
-        cx: AsyncApp,
-    ) -> Result<PrepareRenameResponse> {
-        buffer.read_with(&cx, |buffer, _| match message {
-            Some(lsp::PrepareRenameResponse::Range(range))
-            | Some(lsp::PrepareRenameResponse::RangeWithPlaceholder { range, .. }) => {
-                let Range { start, end } = range_from_lsp(range);
-                if buffer.clip_point_utf16(start, Bias::Left) == start.0
-                    && buffer.clip_point_utf16(end, Bias::Left) == end.0
-                {
-                    Ok(PrepareRenameResponse::Success(
-                        buffer.anchor_after(start)..buffer.anchor_before(end),
-                    ))
-                } else {
-                    Ok(PrepareRenameResponse::InvalidPosition)
-                }
-            }
-            Some(lsp::PrepareRenameResponse::DefaultBehavior { .. }) => {
-                let snapshot = buffer.snapshot();
-                let (range, _) = snapshot.surrounding_word(self.position, None);
-                let range = snapshot.anchor_after(range.start)..snapshot.anchor_before(range.end);
-                Ok(PrepareRenameResponse::Success(range))
-            }
-            None => Ok(PrepareRenameResponse::InvalidPosition),
-        })?
-    }
-
-    fn to_proto(&self, project_id: u64, buffer: &Buffer) -> proto::PrepareRename {
-        proto::PrepareRename {
-            project_id,
-            buffer_id: buffer.remote_id().into(),
-            position: Some(language::proto::serialize_anchor(
-                &buffer.anchor_before(self.position),
-            )),
-            version: serialize_version(&buffer.version()),
-        }
-    }
-
-    async fn from_proto(
-        message: proto::PrepareRename,
-        _: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        mut cx: AsyncApp,
-    ) -> Result<Self> {
-        let position = message
-            .position
-            .and_then(deserialize_anchor)
-            .context("invalid position")?;
-        buffer
-            .update(&mut cx, |buffer, _| {
-                buffer.wait_for_version(deserialize_version(&message.version))
-            })?
-            .await?;
-
-        Ok(Self {
-            position: buffer.read_with(&cx, |buffer, _| position.to_point_utf16(buffer))?,
-        })
-    }
-
-    fn response_to_proto(
-        response: PrepareRenameResponse,
-        _: &mut LspStore,
-        _: PeerId,
-        buffer_version: &clock::Global,
-        _: &mut App,
-    ) -> proto::PrepareRenameResponse {
-        match response {
-            PrepareRenameResponse::Success(range) => proto::PrepareRenameResponse {
-                can_rename: true,
-                only_unprepared_rename_supported: false,
-                start: Some(language::proto::serialize_anchor(&range.start)),
-                end: Some(language::proto::serialize_anchor(&range.end)),
-                version: serialize_version(buffer_version),
-            },
-            PrepareRenameResponse::OnlyUnpreparedRenameSupported => proto::PrepareRenameResponse {
-                can_rename: false,
-                only_unprepared_rename_supported: true,
-                start: None,
-                end: None,
-                version: vec![],
-            },
-            PrepareRenameResponse::InvalidPosition => proto::PrepareRenameResponse {
-                can_rename: false,
-                only_unprepared_rename_supported: false,
-                start: None,
-                end: None,
-                version: vec![],
-            },
-        }
-    }
-
-    async fn response_from_proto(
-        self,
-        message: proto::PrepareRenameResponse,
-        _: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        mut cx: AsyncApp,
-    ) -> Result<PrepareRenameResponse> {
-        if message.can_rename {
-            buffer
-                .update(&mut cx, |buffer, _| {
-                    buffer.wait_for_version(deserialize_version(&message.version))
-                })?
-                .await?;
-            if let (Some(start), Some(end)) = (
-                message.start.and_then(deserialize_anchor),
-                message.end.and_then(deserialize_anchor),
-            ) {
-                Ok(PrepareRenameResponse::Success(start..end))
-            } else {
-                anyhow::bail!(
-                    "Missing start or end position in remote project PrepareRenameResponse"
-                );
-            }
-        } else if message.only_unprepared_rename_supported {
-            Ok(PrepareRenameResponse::OnlyUnpreparedRenameSupported)
-        } else {
-            Ok(PrepareRenameResponse::InvalidPosition)
-        }
-    }
-
-    fn buffer_id_from_proto(message: &proto::PrepareRename) -> Result<BufferId> {
-        BufferId::new(message.buffer_id)
-    }
-}
-
-#[async_trait(?Send)]
-impl LspCommand for PerformRename {
-    type Response = ProjectTransaction;
-    type LspRequest = lsp::request::Rename;
-    type ProtoRequest = proto::PerformRename;
-
-    fn display_name(&self) -> &str {
-        "Rename"
-    }
-
-    fn check_capabilities(&self, capabilities: AdapterServerCapabilities) -> bool {
-        capabilities
-            .server_capabilities
-            .rename_provider
-            .is_some_and(|capability| match capability {
-                OneOf::Left(enabled) => enabled,
-                OneOf::Right(_options) => true,
-            })
-    }
-
-    fn to_lsp(
-        &self,
-        path: &Path,
-        _: &Buffer,
-        _: &Arc<LanguageServer>,
-        _: &App,
-    ) -> Result<lsp::RenameParams> {
-        Ok(lsp::RenameParams {
-            text_document_position: make_lsp_text_document_position(path, self.position)?,
-            new_name: self.new_name.clone(),
-            work_done_progress_params: Default::default(),
-        })
-    }
-
-    async fn response_from_lsp(
-        self,
-        message: Option<lsp::WorkspaceEdit>,
-        lsp_store: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        server_id: LanguageServerId,
-        mut cx: AsyncApp,
-    ) -> Result<ProjectTransaction> {
-        if let Some(edit) = message {
-            let (_, lsp_server) =
-                language_server_for_buffer(&lsp_store, &buffer, server_id, &mut cx)?;
-            LocalLspStore::deserialize_workspace_edit(
-                lsp_store,
-                edit,
-                self.push_to_history,
-                lsp_server,
-                &mut cx,
-            )
-            .await
-        } else {
-            Ok(ProjectTransaction::default())
-        }
-    }
-
-    fn to_proto(&self, project_id: u64, buffer: &Buffer) -> proto::PerformRename {
-        proto::PerformRename {
-            project_id,
-            buffer_id: buffer.remote_id().into(),
-            position: Some(language::proto::serialize_anchor(
-                &buffer.anchor_before(self.position),
-            )),
-            new_name: self.new_name.clone(),
-            version: serialize_version(&buffer.version()),
-        }
-    }
-
-    async fn from_proto(
-        message: proto::PerformRename,
-        _: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        mut cx: AsyncApp,
-    ) -> Result<Self> {
-        let position = message
-            .position
-            .and_then(deserialize_anchor)
-            .context("invalid position")?;
-        buffer
-            .update(&mut cx, |buffer, _| {
-                buffer.wait_for_version(deserialize_version(&message.version))
-            })?
-            .await?;
-        Ok(Self {
-            position: buffer.read_with(&cx, |buffer, _| position.to_point_utf16(buffer))?,
-            new_name: message.new_name,
-            push_to_history: false,
-        })
-    }
-
-    fn response_to_proto(
-        response: ProjectTransaction,
-        lsp_store: &mut LspStore,
-        peer_id: PeerId,
-        _: &clock::Global,
-        cx: &mut App,
-    ) -> proto::PerformRenameResponse {
-        let transaction = lsp_store.buffer_store().update(cx, |buffer_store, cx| {
-            buffer_store.serialize_project_transaction_for_peer(response, peer_id, cx)
-        });
-        proto::PerformRenameResponse {
-            transaction: Some(transaction),
-        }
-    }
-
-    async fn response_from_proto(
-        self,
-        message: proto::PerformRenameResponse,
-        lsp_store: Entity<LspStore>,
-        _: Entity<Buffer>,
-        mut cx: AsyncApp,
-    ) -> Result<ProjectTransaction> {
-        let message = message.transaction.context("missing transaction")?;
-        lsp_store
-            .update(&mut cx, |lsp_store, cx| {
-                lsp_store.buffer_store().update(cx, |buffer_store, cx| {
-                    buffer_store.deserialize_project_transaction(message, self.push_to_history, cx)
-                })
-            })?
-            .await
-    }
-
-    fn buffer_id_from_proto(message: &proto::PerformRename) -> Result<BufferId> {
-        BufferId::new(message.buffer_id)
-    }
-}
-
-#[async_trait(?Send)]
-impl LspCommand for GetDefinitions {
-    type Response = Vec<LocationLink>;
-    type LspRequest = lsp::request::GotoDefinition;
-    type ProtoRequest = proto::GetDefinition;
-
-    fn display_name(&self) -> &str {
-        "Get definition"
-    }
-
-    fn check_capabilities(&self, capabilities: AdapterServerCapabilities) -> bool {
-        capabilities
-            .server_capabilities
-            .definition_provider
-            .is_some_and(|capability| match capability {
-                OneOf::Left(supported) => supported,
-                OneOf::Right(_options) => true,
-            })
-    }
-
-    fn to_lsp(
-        &self,
-        path: &Path,
-        _: &Buffer,
-        _: &Arc<LanguageServer>,
-        _: &App,
-    ) -> Result<lsp::GotoDefinitionParams> {
-        Ok(lsp::GotoDefinitionParams {
-            text_document_position_params: make_lsp_text_document_position(path, self.position)?,
-            work_done_progress_params: Default::default(),
-            partial_result_params: Default::default(),
-        })
-    }
-
-    async fn response_from_lsp(
-        self,
-        message: Option<lsp::GotoDefinitionResponse>,
-        lsp_store: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        server_id: LanguageServerId,
-        cx: AsyncApp,
-    ) -> Result<Vec<LocationLink>> {
-        location_links_from_lsp(message, lsp_store, buffer, server_id, cx).await
-    }
-
-    fn to_proto(&self, project_id: u64, buffer: &Buffer) -> proto::GetDefinition {
-        proto::GetDefinition {
-            project_id,
-            buffer_id: buffer.remote_id().into(),
-            position: Some(language::proto::serialize_anchor(
-                &buffer.anchor_before(self.position),
-            )),
-            version: serialize_version(&buffer.version()),
-        }
-    }
-
-    async fn from_proto(
-        message: proto::GetDefinition,
-        _: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        mut cx: AsyncApp,
-    ) -> Result<Self> {
-        let position = message
-            .position
-            .and_then(deserialize_anchor)
-            .context("invalid position")?;
-        buffer
-            .update(&mut cx, |buffer, _| {
-                buffer.wait_for_version(deserialize_version(&message.version))
-            })?
-            .await?;
-        Ok(Self {
-            position: buffer.read_with(&cx, |buffer, _| position.to_point_utf16(buffer))?,
-        })
-    }
-
-    fn response_to_proto(
-        response: Vec<LocationLink>,
-        lsp_store: &mut LspStore,
-        peer_id: PeerId,
-        _: &clock::Global,
-        cx: &mut App,
-    ) -> proto::GetDefinitionResponse {
-        let links = location_links_to_proto(response, lsp_store, peer_id, cx);
-        proto::GetDefinitionResponse { links }
-    }
-
-    async fn response_from_proto(
-        self,
-        message: proto::GetDefinitionResponse,
-        lsp_store: Entity<LspStore>,
-        _: Entity<Buffer>,
-        cx: AsyncApp,
-    ) -> Result<Vec<LocationLink>> {
-        location_links_from_proto(message.links, lsp_store, cx).await
-    }
-
-    fn buffer_id_from_proto(message: &proto::GetDefinition) -> Result<BufferId> {
-        BufferId::new(message.buffer_id)
-    }
-}
-
-#[async_trait(?Send)]
-impl LspCommand for GetDeclarations {
-    type Response = Vec<LocationLink>;
-    type LspRequest = lsp::request::GotoDeclaration;
-    type ProtoRequest = proto::GetDeclaration;
-
-    fn display_name(&self) -> &str {
-        "Get declaration"
-    }
-
-    fn check_capabilities(&self, capabilities: AdapterServerCapabilities) -> bool {
-        capabilities
-            .server_capabilities
-            .declaration_provider
-            .is_some_and(|capability| match capability {
-                lsp::DeclarationCapability::Simple(supported) => supported,
-                lsp::DeclarationCapability::RegistrationOptions(..) => true,
-                lsp::DeclarationCapability::Options(..) => true,
-            })
-    }
-
-    fn to_lsp(
-        &self,
-        path: &Path,
-        _: &Buffer,
-        _: &Arc<LanguageServer>,
-        _: &App,
-    ) -> Result<lsp::GotoDeclarationParams> {
-        Ok(lsp::GotoDeclarationParams {
-            text_document_position_params: make_lsp_text_document_position(path, self.position)?,
-            work_done_progress_params: Default::default(),
-            partial_result_params: Default::default(),
-        })
-    }
-
-    async fn response_from_lsp(
-        self,
-        message: Option<lsp::GotoDeclarationResponse>,
-        lsp_store: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        server_id: LanguageServerId,
-        cx: AsyncApp,
-    ) -> Result<Vec<LocationLink>> {
-        location_links_from_lsp(message, lsp_store, buffer, server_id, cx).await
-    }
-
-    fn to_proto(&self, project_id: u64, buffer: &Buffer) -> proto::GetDeclaration {
-        proto::GetDeclaration {
-            project_id,
-            buffer_id: buffer.remote_id().into(),
-            position: Some(language::proto::serialize_anchor(
-                &buffer.anchor_before(self.position),
-            )),
-            version: serialize_version(&buffer.version()),
-        }
-    }
-
-    async fn from_proto(
-        message: proto::GetDeclaration,
-        _: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        mut cx: AsyncApp,
-    ) -> Result<Self> {
-        let position = message
-            .position
-            .and_then(deserialize_anchor)
-            .context("invalid position")?;
-        buffer
-            .update(&mut cx, |buffer, _| {
-                buffer.wait_for_version(deserialize_version(&message.version))
-            })?
-            .await?;
-        Ok(Self {
-            position: buffer.read_with(&cx, |buffer, _| position.to_point_utf16(buffer))?,
-        })
-    }
-
-    fn response_to_proto(
-        response: Vec<LocationLink>,
-        lsp_store: &mut LspStore,
-        peer_id: PeerId,
-        _: &clock::Global,
-        cx: &mut App,
-    ) -> proto::GetDeclarationResponse {
-        let links = location_links_to_proto(response, lsp_store, peer_id, cx);
-        proto::GetDeclarationResponse { links }
-    }
-
-    async fn response_from_proto(
-        self,
-        message: proto::GetDeclarationResponse,
-        lsp_store: Entity<LspStore>,
-        _: Entity<Buffer>,
-        cx: AsyncApp,
-    ) -> Result<Vec<LocationLink>> {
-        location_links_from_proto(message.links, lsp_store, cx).await
-    }
-
-    fn buffer_id_from_proto(message: &proto::GetDeclaration) -> Result<BufferId> {
-        BufferId::new(message.buffer_id)
-    }
-}
-
-#[async_trait(?Send)]
-impl LspCommand for GetImplementations {
-    type Response = Vec<LocationLink>;
-    type LspRequest = lsp::request::GotoImplementation;
-    type ProtoRequest = proto::GetImplementation;
-
-    fn display_name(&self) -> &str {
-        "Get implementation"
-    }
-
-    fn check_capabilities(&self, capabilities: AdapterServerCapabilities) -> bool {
-        capabilities
-            .server_capabilities
-            .implementation_provider
-            .is_some_and(|capability| match capability {
-                lsp::ImplementationProviderCapability::Simple(enabled) => enabled,
-                lsp::ImplementationProviderCapability::Options(_options) => true,
-            })
-    }
-
-    fn to_lsp(
-        &self,
-        path: &Path,
-        _: &Buffer,
-        _: &Arc<LanguageServer>,
-        _: &App,
-    ) -> Result<lsp::GotoImplementationParams> {
-        Ok(lsp::GotoImplementationParams {
-            text_document_position_params: make_lsp_text_document_position(path, self.position)?,
-            work_done_progress_params: Default::default(),
-            partial_result_params: Default::default(),
-        })
-    }
-
-    async fn response_from_lsp(
-        self,
-        message: Option<lsp::GotoImplementationResponse>,
-        lsp_store: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        server_id: LanguageServerId,
-        cx: AsyncApp,
-    ) -> Result<Vec<LocationLink>> {
-        location_links_from_lsp(message, lsp_store, buffer, server_id, cx).await
-    }
-
-    fn to_proto(&self, project_id: u64, buffer: &Buffer) -> proto::GetImplementation {
-        proto::GetImplementation {
-            project_id,
-            buffer_id: buffer.remote_id().into(),
-            position: Some(language::proto::serialize_anchor(
-                &buffer.anchor_before(self.position),
-            )),
-            version: serialize_version(&buffer.version()),
-        }
-    }
-
-    async fn from_proto(
-        message: proto::GetImplementation,
-        _: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        mut cx: AsyncApp,
-    ) -> Result<Self> {
-        let position = message
-            .position
-            .and_then(deserialize_anchor)
-            .context("invalid position")?;
-        buffer
-            .update(&mut cx, |buffer, _| {
-                buffer.wait_for_version(deserialize_version(&message.version))
-            })?
-            .await?;
-        Ok(Self {
-            position: buffer.read_with(&cx, |buffer, _| position.to_point_utf16(buffer))?,
-        })
-    }
-
-    fn response_to_proto(
-        response: Vec<LocationLink>,
-        lsp_store: &mut LspStore,
-        peer_id: PeerId,
-        _: &clock::Global,
-        cx: &mut App,
-    ) -> proto::GetImplementationResponse {
-        let links = location_links_to_proto(response, lsp_store, peer_id, cx);
-        proto::GetImplementationResponse { links }
-    }
-
-    async fn response_from_proto(
-        self,
-        message: proto::GetImplementationResponse,
-        project: Entity<LspStore>,
-        _: Entity<Buffer>,
-        cx: AsyncApp,
-    ) -> Result<Vec<LocationLink>> {
-        location_links_from_proto(message.links, project, cx).await
-    }
-
-    fn buffer_id_from_proto(message: &proto::GetImplementation) -> Result<BufferId> {
-        BufferId::new(message.buffer_id)
-    }
-}
-
-#[async_trait(?Send)]
-impl LspCommand for GetTypeDefinitions {
-    type Response = Vec<LocationLink>;
-    type LspRequest = lsp::request::GotoTypeDefinition;
-    type ProtoRequest = proto::GetTypeDefinition;
-
-    fn display_name(&self) -> &str {
-        "Get type definition"
-    }
-
-    fn check_capabilities(&self, capabilities: AdapterServerCapabilities) -> bool {
-        !matches!(
-            &capabilities.server_capabilities.type_definition_provider,
-            None | Some(lsp::TypeDefinitionProviderCapability::Simple(false))
-        )
-    }
-
-    fn to_lsp(
-        &self,
-        path: &Path,
-        _: &Buffer,
-        _: &Arc<LanguageServer>,
-        _: &App,
-    ) -> Result<lsp::GotoTypeDefinitionParams> {
-        Ok(lsp::GotoTypeDefinitionParams {
-            text_document_position_params: make_lsp_text_document_position(path, self.position)?,
-            work_done_progress_params: Default::default(),
-            partial_result_params: Default::default(),
-        })
-    }
-
-    async fn response_from_lsp(
-        self,
-        message: Option<lsp::GotoTypeDefinitionResponse>,
-        project: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        server_id: LanguageServerId,
-        cx: AsyncApp,
-    ) -> Result<Vec<LocationLink>> {
-        location_links_from_lsp(message, project, buffer, server_id, cx).await
-    }
-
-    fn to_proto(&self, project_id: u64, buffer: &Buffer) -> proto::GetTypeDefinition {
-        proto::GetTypeDefinition {
-            project_id,
-            buffer_id: buffer.remote_id().into(),
-            position: Some(language::proto::serialize_anchor(
-                &buffer.anchor_before(self.position),
-            )),
-            version: serialize_version(&buffer.version()),
-        }
-    }
-
-    async fn from_proto(
-        message: proto::GetTypeDefinition,
-        _: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        mut cx: AsyncApp,
-    ) -> Result<Self> {
-        let position = message
-            .position
-            .and_then(deserialize_anchor)
-            .context("invalid position")?;
-        buffer
-            .update(&mut cx, |buffer, _| {
-                buffer.wait_for_version(deserialize_version(&message.version))
-            })?
-            .await?;
-        Ok(Self {
-            position: buffer.read_with(&cx, |buffer, _| position.to_point_utf16(buffer))?,
-        })
-    }
-
-    fn response_to_proto(
-        response: Vec<LocationLink>,
-        lsp_store: &mut LspStore,
-        peer_id: PeerId,
-        _: &clock::Global,
-        cx: &mut App,
-    ) -> proto::GetTypeDefinitionResponse {
-        let links = location_links_to_proto(response, lsp_store, peer_id, cx);
-        proto::GetTypeDefinitionResponse { links }
-    }
-
-    async fn response_from_proto(
-        self,
-        message: proto::GetTypeDefinitionResponse,
-        project: Entity<LspStore>,
-        _: Entity<Buffer>,
-        cx: AsyncApp,
-    ) -> Result<Vec<LocationLink>> {
-        location_links_from_proto(message.links, project, cx).await
-    }
-
-    fn buffer_id_from_proto(message: &proto::GetTypeDefinition) -> Result<BufferId> {
-        BufferId::new(message.buffer_id)
-    }
-}
-
-fn language_server_for_buffer(
-    lsp_store: &Entity<LspStore>,
-    buffer: &Entity<Buffer>,
-    server_id: LanguageServerId,
-    cx: &mut AsyncApp,
-) -> Result<(Arc<CachedLspAdapter>, Arc<LanguageServer>)> {
-    lsp_store
-        .update(cx, |lsp_store, cx| {
-            buffer.update(cx, |buffer, cx| {
-                lsp_store
-                    .language_server_for_local_buffer(buffer, server_id, cx)
-                    .map(|(adapter, server)| (adapter.clone(), server.clone()))
-            })
-        })?
-        .context("no language server found for buffer")
-}
-
-pub async fn location_links_from_proto(
-    proto_links: Vec<proto::LocationLink>,
-    lsp_store: Entity<LspStore>,
-    mut cx: AsyncApp,
-) -> Result<Vec<LocationLink>> {
-    let mut links = Vec::new();
-
-    for link in proto_links {
-        links.push(location_link_from_proto(link, lsp_store.clone(), &mut cx).await?)
-    }
-
-    Ok(links)
-}
-
-pub fn location_link_from_proto(
-    link: proto::LocationLink,
-    lsp_store: Entity<LspStore>,
-    cx: &mut AsyncApp,
-) -> Task<Result<LocationLink>> {
-    cx.spawn(async move |cx| {
-        let origin = match link.origin {
-            Some(origin) => {
-                let buffer_id = BufferId::new(origin.buffer_id)?;
-                let buffer = lsp_store
-                    .update(cx, |lsp_store, cx| {
-                        lsp_store.wait_for_remote_buffer(buffer_id, cx)
-                    })?
-                    .await?;
-                let start = origin
-                    .start
-                    .and_then(deserialize_anchor)
-                    .context("missing origin start")?;
-                let end = origin
-                    .end
-                    .and_then(deserialize_anchor)
-                    .context("missing origin end")?;
-                buffer
-                    .update(cx, |buffer, _| buffer.wait_for_anchors([start, end]))?
-                    .await?;
-                Some(Location {
-                    buffer,
-                    range: start..end,
-                })
-            }
-            None => None,
-        };
-
-        let target = link.target.context("missing target")?;
-        let buffer_id = BufferId::new(target.buffer_id)?;
-        let buffer = lsp_store
-            .update(cx, |lsp_store, cx| {
-                lsp_store.wait_for_remote_buffer(buffer_id, cx)
-            })?
-            .await?;
-        let start = target
-            .start
-            .and_then(deserialize_anchor)
-            .context("missing target start")?;
-        let end = target
-            .end
-            .and_then(deserialize_anchor)
-            .context("missing target end")?;
-        buffer
-            .update(cx, |buffer, _| buffer.wait_for_anchors([start, end]))?
-            .await?;
-        let target = Location {
-            buffer,
-            range: start..end,
-        };
-        Ok(LocationLink { origin, target })
-    })
-}
-
-pub async fn location_links_from_lsp(
-    message: Option<lsp::GotoDefinitionResponse>,
-    lsp_store: Entity<LspStore>,
-    buffer: Entity<Buffer>,
-    server_id: LanguageServerId,
-    mut cx: AsyncApp,
-) -> Result<Vec<LocationLink>> {
-    let message = match message {
-        Some(message) => message,
-        None => return Ok(Vec::new()),
-    };
-
-    let mut unresolved_links = Vec::new();
-    match message {
-        lsp::GotoDefinitionResponse::Scalar(loc) => {
-            unresolved_links.push((None, loc.uri, loc.range));
-        }
-
-        lsp::GotoDefinitionResponse::Array(locs) => {
-            unresolved_links.extend(locs.into_iter().map(|l| (None, l.uri, l.range)));
-        }
-
-        lsp::GotoDefinitionResponse::Link(links) => {
-            unresolved_links.extend(links.into_iter().map(|l| {
-                (
-                    l.origin_selection_range,
-                    l.target_uri,
-                    l.target_selection_range,
-                )
-            }));
-        }
-    }
-
-    let (_, language_server) = language_server_for_buffer(&lsp_store, &buffer, server_id, &mut cx)?;
-    let mut definitions = Vec::new();
-    for (origin_range, target_uri, target_range) in unresolved_links {
-        let target_buffer_handle = lsp_store
-            .update(&mut cx, |this, cx| {
-                this.open_local_buffer_via_lsp(target_uri, language_server.server_id(), cx)
-            })?
-            .await?;
-
-        cx.update(|cx| {
-            let origin_location = origin_range.map(|origin_range| {
-                let origin_buffer = buffer.read(cx);
-                let origin_start =
-                    origin_buffer.clip_point_utf16(point_from_lsp(origin_range.start), Bias::Left);
-                let origin_end =
-                    origin_buffer.clip_point_utf16(point_from_lsp(origin_range.end), Bias::Left);
-                Location {
-                    buffer: buffer.clone(),
-                    range: origin_buffer.anchor_after(origin_start)
-                        ..origin_buffer.anchor_before(origin_end),
-                }
-            });
-
-            let target_buffer = target_buffer_handle.read(cx);
-            let target_start =
-                target_buffer.clip_point_utf16(point_from_lsp(target_range.start), Bias::Left);
-            let target_end =
-                target_buffer.clip_point_utf16(point_from_lsp(target_range.end), Bias::Left);
-            let target_location = Location {
-                buffer: target_buffer_handle,
-                range: target_buffer.anchor_after(target_start)
-                    ..target_buffer.anchor_before(target_end),
-            };
-
-            definitions.push(LocationLink {
-                origin: origin_location,
-                target: target_location,
-            })
-        })?;
-    }
-    Ok(definitions)
-}
-
-pub async fn location_link_from_lsp(
-    link: lsp::LocationLink,
-    lsp_store: &Entity<LspStore>,
-    buffer: &Entity<Buffer>,
-    server_id: LanguageServerId,
-    cx: &mut AsyncApp,
-) -> Result<LocationLink> {
-    let (_, language_server) = language_server_for_buffer(lsp_store, buffer, server_id, cx)?;
-
-    let (origin_range, target_uri, target_range) = (
-        link.origin_selection_range,
-        link.target_uri,
-        link.target_selection_range,
-    );
-
-    let target_buffer_handle = lsp_store
-        .update(cx, |lsp_store, cx| {
-            lsp_store.open_local_buffer_via_lsp(target_uri, language_server.server_id(), cx)
-        })?
-        .await?;
-
-    cx.update(|cx| {
-        let origin_location = origin_range.map(|origin_range| {
-            let origin_buffer = buffer.read(cx);
-            let origin_start =
-                origin_buffer.clip_point_utf16(point_from_lsp(origin_range.start), Bias::Left);
-            let origin_end =
-                origin_buffer.clip_point_utf16(point_from_lsp(origin_range.end), Bias::Left);
-            Location {
-                buffer: buffer.clone(),
-                range: origin_buffer.anchor_after(origin_start)
-                    ..origin_buffer.anchor_before(origin_end),
-            }
-        });
-
-        let target_buffer = target_buffer_handle.read(cx);
-        let target_start =
-            target_buffer.clip_point_utf16(point_from_lsp(target_range.start), Bias::Left);
-        let target_end =
-            target_buffer.clip_point_utf16(point_from_lsp(target_range.end), Bias::Left);
-        let target_location = Location {
-            buffer: target_buffer_handle,
-            range: target_buffer.anchor_after(target_start)
-                ..target_buffer.anchor_before(target_end),
-        };
-
-        LocationLink {
-            origin: origin_location,
-            target: target_location,
-        }
-    })
-}
-
-pub fn location_links_to_proto(
-    links: Vec<LocationLink>,
-    lsp_store: &mut LspStore,
-    peer_id: PeerId,
-    cx: &mut App,
-) -> Vec<proto::LocationLink> {
-    links
-        .into_iter()
-        .map(|definition| location_link_to_proto(definition, lsp_store, peer_id, cx))
-        .collect()
-}
-
-pub fn location_link_to_proto(
-    location: LocationLink,
-    lsp_store: &mut LspStore,
-    peer_id: PeerId,
-    cx: &mut App,
-) -> proto::LocationLink {
-    let origin = location.origin.map(|origin| {
-        lsp_store
-            .buffer_store()
-            .update(cx, |buffer_store, cx| {
-                buffer_store.create_buffer_for_peer(&origin.buffer, peer_id, cx)
-            })
-            .detach_and_log_err(cx);
-
-        let buffer_id = origin.buffer.read(cx).remote_id().into();
-        proto::Location {
-            start: Some(serialize_anchor(&origin.range.start)),
-            end: Some(serialize_anchor(&origin.range.end)),
-            buffer_id,
-        }
-    });
-
-    lsp_store
-        .buffer_store()
-        .update(cx, |buffer_store, cx| {
-            buffer_store.create_buffer_for_peer(&location.target.buffer, peer_id, cx)
-        })
-        .detach_and_log_err(cx);
-
-    let buffer_id = location.target.buffer.read(cx).remote_id().into();
-    let target = proto::Location {
-        start: Some(serialize_anchor(&location.target.range.start)),
-        end: Some(serialize_anchor(&location.target.range.end)),
-        buffer_id,
-    };
-
-    proto::LocationLink {
-        origin,
-        target: Some(target),
-    }
-}
-
-#[async_trait(?Send)]
-impl LspCommand for GetReferences {
-    type Response = Vec<Location>;
-    type LspRequest = lsp::request::References;
-    type ProtoRequest = proto::GetReferences;
-
-    fn display_name(&self) -> &str {
-        "Find all references"
-    }
-
-    fn status(&self) -> Option<String> {
-        Some("Finding references...".to_owned())
-    }
-
-    fn check_capabilities(&self, capabilities: AdapterServerCapabilities) -> bool {
-        match &capabilities.server_capabilities.references_provider {
-            Some(OneOf::Left(has_support)) => *has_support,
-            Some(OneOf::Right(_)) => true,
-            None => false,
-        }
-    }
-
-    fn to_lsp(
-        &self,
-        path: &Path,
-        _: &Buffer,
-        _: &Arc<LanguageServer>,
-        _: &App,
-    ) -> Result<lsp::ReferenceParams> {
-        Ok(lsp::ReferenceParams {
-            text_document_position: make_lsp_text_document_position(path, self.position)?,
-            work_done_progress_params: Default::default(),
-            partial_result_params: Default::default(),
-            context: lsp::ReferenceContext {
-                include_declaration: true,
-            },
-        })
-    }
-
-    async fn response_from_lsp(
-        self,
-        locations: Option<Vec<lsp::Location>>,
-        lsp_store: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        server_id: LanguageServerId,
-        mut cx: AsyncApp,
-    ) -> Result<Vec<Location>> {
-        let mut references = Vec::new();
-        let (_, language_server) =
-            language_server_for_buffer(&lsp_store, &buffer, server_id, &mut cx)?;
-
-        if let Some(locations) = locations {
-            for lsp_location in locations {
-                let target_buffer_handle = lsp_store
-                    .update(&mut cx, |lsp_store, cx| {
-                        lsp_store.open_local_buffer_via_lsp(
-                            lsp_location.uri,
-                            language_server.server_id(),
-                            cx,
-                        )
-                    })?
-                    .await?;
-
-                target_buffer_handle
-                    .clone()
-                    .read_with(&cx, |target_buffer, _| {
-                        let target_start = target_buffer
-                            .clip_point_utf16(point_from_lsp(lsp_location.range.start), Bias::Left);
-                        let target_end = target_buffer
-                            .clip_point_utf16(point_from_lsp(lsp_location.range.end), Bias::Left);
-                        references.push(Location {
-                            buffer: target_buffer_handle,
-                            range: target_buffer.anchor_after(target_start)
-                                ..target_buffer.anchor_before(target_end),
-                        });
-                    })?;
-            }
-        }
-
-        Ok(references)
-    }
-
-    fn to_proto(&self, project_id: u64, buffer: &Buffer) -> proto::GetReferences {
-        proto::GetReferences {
-            project_id,
-            buffer_id: buffer.remote_id().into(),
-            position: Some(language::proto::serialize_anchor(
-                &buffer.anchor_before(self.position),
-            )),
-            version: serialize_version(&buffer.version()),
-        }
-    }
-
-    async fn from_proto(
-        message: proto::GetReferences,
-        _: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        mut cx: AsyncApp,
-    ) -> Result<Self> {
-        let position = message
-            .position
-            .and_then(deserialize_anchor)
-            .context("invalid position")?;
-        buffer
-            .update(&mut cx, |buffer, _| {
-                buffer.wait_for_version(deserialize_version(&message.version))
-            })?
-            .await?;
-        Ok(Self {
-            position: buffer.read_with(&cx, |buffer, _| position.to_point_utf16(buffer))?,
-        })
-    }
-
-    fn response_to_proto(
-        response: Vec<Location>,
-        lsp_store: &mut LspStore,
-        peer_id: PeerId,
-        _: &clock::Global,
-        cx: &mut App,
-    ) -> proto::GetReferencesResponse {
-        let locations = response
-            .into_iter()
-            .map(|definition| {
-                lsp_store
-                    .buffer_store()
-                    .update(cx, |buffer_store, cx| {
-                        buffer_store.create_buffer_for_peer(&definition.buffer, peer_id, cx)
-                    })
-                    .detach_and_log_err(cx);
-                let buffer_id = definition.buffer.read(cx).remote_id();
-                proto::Location {
-                    start: Some(serialize_anchor(&definition.range.start)),
-                    end: Some(serialize_anchor(&definition.range.end)),
-                    buffer_id: buffer_id.into(),
-                }
-            })
-            .collect();
-        proto::GetReferencesResponse { locations }
-    }
-
-    async fn response_from_proto(
-        self,
-        message: proto::GetReferencesResponse,
-        project: Entity<LspStore>,
-        _: Entity<Buffer>,
-        mut cx: AsyncApp,
-    ) -> Result<Vec<Location>> {
-        let mut locations = Vec::new();
-        for location in message.locations {
-            let buffer_id = BufferId::new(location.buffer_id)?;
-            let target_buffer = project
-                .update(&mut cx, |this, cx| {
-                    this.wait_for_remote_buffer(buffer_id, cx)
-                })?
-                .await?;
-            let start = location
-                .start
-                .and_then(deserialize_anchor)
-                .context("missing target start")?;
-            let end = location
-                .end
-                .and_then(deserialize_anchor)
-                .context("missing target end")?;
-            target_buffer
-                .update(&mut cx, |buffer, _| buffer.wait_for_anchors([start, end]))?
-                .await?;
-            locations.push(Location {
-                buffer: target_buffer,
-                range: start..end,
-            })
-        }
-        Ok(locations)
-    }
-
-    fn buffer_id_from_proto(message: &proto::GetReferences) -> Result<BufferId> {
-        BufferId::new(message.buffer_id)
-    }
-}
-
-#[async_trait(?Send)]
-impl LspCommand for GetDocumentHighlights {
-    type Response = Vec<DocumentHighlight>;
-    type LspRequest = lsp::request::DocumentHighlightRequest;
-    type ProtoRequest = proto::GetDocumentHighlights;
-
-    fn display_name(&self) -> &str {
-        "Get document highlights"
-    }
-
-    fn check_capabilities(&self, capabilities: AdapterServerCapabilities) -> bool {
-        capabilities
-            .server_capabilities
-            .document_highlight_provider
-            .is_some_and(|capability| match capability {
-                OneOf::Left(supported) => supported,
-                OneOf::Right(_options) => true,
-            })
-    }
-
-    fn to_lsp(
-        &self,
-        path: &Path,
-        _: &Buffer,
-        _: &Arc<LanguageServer>,
-        _: &App,
-    ) -> Result<lsp::DocumentHighlightParams> {
-        Ok(lsp::DocumentHighlightParams {
-            text_document_position_params: make_lsp_text_document_position(path, self.position)?,
-            work_done_progress_params: Default::default(),
-            partial_result_params: Default::default(),
-        })
-    }
-
-    async fn response_from_lsp(
-        self,
-        lsp_highlights: Option<Vec<lsp::DocumentHighlight>>,
-        _: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        _: LanguageServerId,
-        cx: AsyncApp,
-    ) -> Result<Vec<DocumentHighlight>> {
-        buffer.read_with(&cx, |buffer, _| {
-            let mut lsp_highlights = lsp_highlights.unwrap_or_default();
-            lsp_highlights.sort_unstable_by_key(|h| (h.range.start, Reverse(h.range.end)));
-            lsp_highlights
-                .into_iter()
-                .map(|lsp_highlight| {
-                    let start = buffer
-                        .clip_point_utf16(point_from_lsp(lsp_highlight.range.start), Bias::Left);
-                    let end = buffer
-                        .clip_point_utf16(point_from_lsp(lsp_highlight.range.end), Bias::Left);
-                    DocumentHighlight {
-                        range: buffer.anchor_after(start)..buffer.anchor_before(end),
-                        kind: lsp_highlight
-                            .kind
-                            .unwrap_or(lsp::DocumentHighlightKind::READ),
-                    }
-                })
-                .collect()
-        })
-    }
-
-    fn to_proto(&self, project_id: u64, buffer: &Buffer) -> proto::GetDocumentHighlights {
-        proto::GetDocumentHighlights {
-            project_id,
-            buffer_id: buffer.remote_id().into(),
-            position: Some(language::proto::serialize_anchor(
-                &buffer.anchor_before(self.position),
-            )),
-            version: serialize_version(&buffer.version()),
-        }
-    }
-
-    async fn from_proto(
-        message: proto::GetDocumentHighlights,
-        _: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        mut cx: AsyncApp,
-    ) -> Result<Self> {
-        let position = message
-            .position
-            .and_then(deserialize_anchor)
-            .context("invalid position")?;
-        buffer
-            .update(&mut cx, |buffer, _| {
-                buffer.wait_for_version(deserialize_version(&message.version))
-            })?
-            .await?;
-        Ok(Self {
-            position: buffer.read_with(&cx, |buffer, _| position.to_point_utf16(buffer))?,
-        })
-    }
-
-    fn response_to_proto(
-        response: Vec<DocumentHighlight>,
-        _: &mut LspStore,
-        _: PeerId,
-        _: &clock::Global,
-        _: &mut App,
-    ) -> proto::GetDocumentHighlightsResponse {
-        let highlights = response
-            .into_iter()
-            .map(|highlight| proto::DocumentHighlight {
-                start: Some(serialize_anchor(&highlight.range.start)),
-                end: Some(serialize_anchor(&highlight.range.end)),
-                kind: match highlight.kind {
-                    DocumentHighlightKind::TEXT => proto::document_highlight::Kind::Text.into(),
-                    DocumentHighlightKind::WRITE => proto::document_highlight::Kind::Write.into(),
-                    DocumentHighlightKind::READ => proto::document_highlight::Kind::Read.into(),
-                    _ => proto::document_highlight::Kind::Text.into(),
-                },
-            })
-            .collect();
-        proto::GetDocumentHighlightsResponse { highlights }
-    }
-
-    async fn response_from_proto(
-        self,
-        message: proto::GetDocumentHighlightsResponse,
-        _: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        mut cx: AsyncApp,
-    ) -> Result<Vec<DocumentHighlight>> {
-        let mut highlights = Vec::new();
-        for highlight in message.highlights {
-            let start = highlight
-                .start
-                .and_then(deserialize_anchor)
-                .context("missing target start")?;
-            let end = highlight
-                .end
-                .and_then(deserialize_anchor)
-                .context("missing target end")?;
-            buffer
-                .update(&mut cx, |buffer, _| buffer.wait_for_anchors([start, end]))?
-                .await?;
-            let kind = match proto::document_highlight::Kind::from_i32(highlight.kind) {
-                Some(proto::document_highlight::Kind::Text) => DocumentHighlightKind::TEXT,
-                Some(proto::document_highlight::Kind::Read) => DocumentHighlightKind::READ,
-                Some(proto::document_highlight::Kind::Write) => DocumentHighlightKind::WRITE,
-                None => DocumentHighlightKind::TEXT,
-            };
-            highlights.push(DocumentHighlight {
-                range: start..end,
-                kind,
-            });
-        }
-        Ok(highlights)
-    }
-
-    fn buffer_id_from_proto(message: &proto::GetDocumentHighlights) -> Result<BufferId> {
-        BufferId::new(message.buffer_id)
-    }
-}
-
-#[async_trait(?Send)]
-impl LspCommand for GetDocumentSymbols {
-    type Response = Vec<DocumentSymbol>;
-    type LspRequest = lsp::request::DocumentSymbolRequest;
-    type ProtoRequest = proto::GetDocumentSymbols;
-
-    fn display_name(&self) -> &str {
-        "Get document symbols"
-    }
-
-    fn check_capabilities(&self, capabilities: AdapterServerCapabilities) -> bool {
-        capabilities
-            .server_capabilities
-            .document_symbol_provider
-            .is_some_and(|capability| match capability {
-                OneOf::Left(supported) => supported,
-                OneOf::Right(_options) => true,
-            })
-    }
-
-    fn to_lsp(
-        &self,
-        path: &Path,
-        _: &Buffer,
-        _: &Arc<LanguageServer>,
-        _: &App,
-    ) -> Result<lsp::DocumentSymbolParams> {
-        Ok(lsp::DocumentSymbolParams {
-            text_document: make_text_document_identifier(path)?,
-            work_done_progress_params: Default::default(),
-            partial_result_params: Default::default(),
-        })
-    }
-
-    async fn response_from_lsp(
-        self,
-        lsp_symbols: Option<lsp::DocumentSymbolResponse>,
-        _: Entity<LspStore>,
-        _: Entity<Buffer>,
-        _: LanguageServerId,
-        _: AsyncApp,
-    ) -> Result<Vec<DocumentSymbol>> {
-        let Some(lsp_symbols) = lsp_symbols else {
-            return Ok(Vec::new());
-        };
-
-        let symbols: Vec<_> = match lsp_symbols {
-            lsp::DocumentSymbolResponse::Flat(symbol_information) => symbol_information
-                .into_iter()
-                .map(|lsp_symbol| DocumentSymbol {
-                    name: lsp_symbol.name,
-                    kind: lsp_symbol.kind,
-                    range: range_from_lsp(lsp_symbol.location.range),
-                    selection_range: range_from_lsp(lsp_symbol.location.range),
-                    children: Vec::new(),
-                })
-                .collect(),
-            lsp::DocumentSymbolResponse::Nested(nested_responses) => {
-                fn convert_symbol(lsp_symbol: lsp::DocumentSymbol) -> DocumentSymbol {
-                    DocumentSymbol {
-                        name: lsp_symbol.name,
-                        kind: lsp_symbol.kind,
-                        range: range_from_lsp(lsp_symbol.range),
-                        selection_range: range_from_lsp(lsp_symbol.selection_range),
-                        children: lsp_symbol
-                            .children
-                            .map(|children| {
-                                children.into_iter().map(convert_symbol).collect::<Vec<_>>()
-                            })
-                            .unwrap_or_default(),
-                    }
-                }
-                nested_responses.into_iter().map(convert_symbol).collect()
-            }
-        };
-        Ok(symbols)
-    }
-
-    fn to_proto(&self, project_id: u64, buffer: &Buffer) -> proto::GetDocumentSymbols {
-        proto::GetDocumentSymbols {
-            project_id,
-            buffer_id: buffer.remote_id().into(),
-            version: serialize_version(&buffer.version()),
-        }
-    }
-
-    async fn from_proto(
-        message: proto::GetDocumentSymbols,
-        _: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        mut cx: AsyncApp,
-    ) -> Result<Self> {
-        buffer
-            .update(&mut cx, |buffer, _| {
-                buffer.wait_for_version(deserialize_version(&message.version))
-            })?
-            .await?;
-        Ok(Self)
-    }
-
-    fn response_to_proto(
-        response: Vec<DocumentSymbol>,
-        _: &mut LspStore,
-        _: PeerId,
-        _: &clock::Global,
-        _: &mut App,
-    ) -> proto::GetDocumentSymbolsResponse {
-        let symbols = response
-            .into_iter()
-            .map(|symbol| {
-                fn convert_symbol_to_proto(symbol: DocumentSymbol) -> proto::DocumentSymbol {
-                    proto::DocumentSymbol {
-                        name: symbol.name.clone(),
-                        kind: unsafe { mem::transmute::<lsp::SymbolKind, i32>(symbol.kind) },
-                        start: Some(proto::PointUtf16 {
-                            row: symbol.range.start.0.row,
-                            column: symbol.range.start.0.column,
-                        }),
-                        end: Some(proto::PointUtf16 {
-                            row: symbol.range.end.0.row,
-                            column: symbol.range.end.0.column,
-                        }),
-                        selection_start: Some(proto::PointUtf16 {
-                            row: symbol.selection_range.start.0.row,
-                            column: symbol.selection_range.start.0.column,
-                        }),
-                        selection_end: Some(proto::PointUtf16 {
-                            row: symbol.selection_range.end.0.row,
-                            column: symbol.selection_range.end.0.column,
-                        }),
-                        children: symbol
-                            .children
-                            .into_iter()
-                            .map(convert_symbol_to_proto)
-                            .collect(),
-                    }
-                }
-                convert_symbol_to_proto(symbol)
-            })
-            .collect::<Vec<_>>();
-
-        proto::GetDocumentSymbolsResponse { symbols }
-    }
-
-    async fn response_from_proto(
-        self,
-        message: proto::GetDocumentSymbolsResponse,
-        _: Entity<LspStore>,
-        _: Entity<Buffer>,
-        _: AsyncApp,
-    ) -> Result<Vec<DocumentSymbol>> {
-        let mut symbols = Vec::with_capacity(message.symbols.len());
-        for serialized_symbol in message.symbols {
-            fn deserialize_symbol_with_children(
-                serialized_symbol: proto::DocumentSymbol,
-            ) -> Result<DocumentSymbol> {
-                let kind =
-                    unsafe { mem::transmute::<i32, lsp::SymbolKind>(serialized_symbol.kind) };
-
-                let start = serialized_symbol.start.context("invalid start")?;
-                let end = serialized_symbol.end.context("invalid end")?;
-
-                let selection_start = serialized_symbol
-                    .selection_start
-                    .context("invalid selection start")?;
-                let selection_end = serialized_symbol
-                    .selection_end
-                    .context("invalid selection end")?;
-
-                Ok(DocumentSymbol {
-                    name: serialized_symbol.name,
-                    kind,
-                    range: Unclipped(PointUtf16::new(start.row, start.column))
-                        ..Unclipped(PointUtf16::new(end.row, end.column)),
-                    selection_range: Unclipped(PointUtf16::new(
-                        selection_start.row,
-                        selection_start.column,
-                    ))
-                        ..Unclipped(PointUtf16::new(selection_end.row, selection_end.column)),
-                    children: serialized_symbol
-                        .children
-                        .into_iter()
-                        .filter_map(|symbol| deserialize_symbol_with_children(symbol).ok())
-                        .collect::<Vec<_>>(),
-                })
-            }
-
-            symbols.push(deserialize_symbol_with_children(serialized_symbol)?);
-        }
-
-        Ok(symbols)
-    }
-
-    fn buffer_id_from_proto(message: &proto::GetDocumentSymbols) -> Result<BufferId> {
-        BufferId::new(message.buffer_id)
-    }
-}
-
-#[async_trait(?Send)]
-impl LspCommand for GetSignatureHelp {
-    type Response = Option<SignatureHelp>;
-    type LspRequest = lsp::SignatureHelpRequest;
-    type ProtoRequest = proto::GetSignatureHelp;
-
-    fn display_name(&self) -> &str {
-        "Get signature help"
-    }
-
-    fn check_capabilities(&self, capabilities: AdapterServerCapabilities) -> bool {
-        capabilities
-            .server_capabilities
-            .signature_help_provider
-            .is_some()
-    }
-
-    fn to_lsp(
-        &self,
-        path: &Path,
-        _: &Buffer,
-        _: &Arc<LanguageServer>,
-        _cx: &App,
-    ) -> Result<lsp::SignatureHelpParams> {
-        Ok(lsp::SignatureHelpParams {
-            text_document_position_params: make_lsp_text_document_position(path, self.position)?,
-            context: None,
-            work_done_progress_params: Default::default(),
-        })
-    }
-
-    async fn response_from_lsp(
-        self,
-        message: Option<lsp::SignatureHelp>,
-        lsp_store: Entity<LspStore>,
-        _: Entity<Buffer>,
-        id: LanguageServerId,
-        cx: AsyncApp,
-    ) -> Result<Self::Response> {
-        let Some(message) = message else {
-            return Ok(None);
-        };
-        cx.update(|cx| {
-            SignatureHelp::new(
-                message,
-                Some(lsp_store.read(cx).languages.clone()),
-                Some(id),
-                cx,
-            )
-        })
-    }
-
-    fn to_proto(&self, project_id: u64, buffer: &Buffer) -> Self::ProtoRequest {
-        let offset = buffer.point_utf16_to_offset(self.position);
-        proto::GetSignatureHelp {
-            project_id,
-            buffer_id: buffer.remote_id().to_proto(),
-            position: Some(serialize_anchor(&buffer.anchor_after(offset))),
-            version: serialize_version(&buffer.version()),
-        }
-    }
-
-    async fn from_proto(
-        payload: Self::ProtoRequest,
-        _: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        mut cx: AsyncApp,
-    ) -> Result<Self> {
-        buffer
-            .update(&mut cx, |buffer, _| {
-                buffer.wait_for_version(deserialize_version(&payload.version))
-            })?
-            .await
-            .with_context(|| format!("waiting for version for buffer {}", buffer.entity_id()))?;
-        let buffer_snapshot = buffer.read_with(&cx, |buffer, _| buffer.snapshot())?;
-        Ok(Self {
-            position: payload
-                .position
-                .and_then(deserialize_anchor)
-                .context("invalid position")?
-                .to_point_utf16(&buffer_snapshot),
-        })
-    }
-
-    fn response_to_proto(
-        response: Self::Response,
-        _: &mut LspStore,
-        _: PeerId,
-        _: &Global,
-        _: &mut App,
-    ) -> proto::GetSignatureHelpResponse {
-        proto::GetSignatureHelpResponse {
-            signature_help: response
-                .map(|signature_help| lsp_to_proto_signature(signature_help.original_data)),
-        }
-    }
-
-    async fn response_from_proto(
-        self,
-        response: proto::GetSignatureHelpResponse,
-        lsp_store: Entity<LspStore>,
-        _: Entity<Buffer>,
-        cx: AsyncApp,
-    ) -> Result<Self::Response> {
-        cx.update(|cx| {
-            response
-                .signature_help
-                .map(proto_to_lsp_signature)
-                .and_then(|signature| {
-                    SignatureHelp::new(
-                        signature,
-                        Some(lsp_store.read(cx).languages.clone()),
-                        None,
-                        cx,
-                    )
-                })
-        })
-    }
-
-    fn buffer_id_from_proto(message: &Self::ProtoRequest) -> Result<BufferId> {
-        BufferId::new(message.buffer_id)
-    }
-}
-
-#[async_trait(?Send)]
-impl LspCommand for GetHover {
-    type Response = Option<Hover>;
-    type LspRequest = lsp::request::HoverRequest;
-    type ProtoRequest = proto::GetHover;
-
-    fn display_name(&self) -> &str {
-        "Get hover"
-    }
-
-    fn check_capabilities(&self, capabilities: AdapterServerCapabilities) -> bool {
-        match capabilities.server_capabilities.hover_provider {
-            Some(lsp::HoverProviderCapability::Simple(enabled)) => enabled,
-            Some(lsp::HoverProviderCapability::Options(_)) => true,
-            None => false,
-        }
-    }
-
-    fn to_lsp(
-        &self,
-        path: &Path,
-        _: &Buffer,
-        _: &Arc<LanguageServer>,
-        _: &App,
-    ) -> Result<lsp::HoverParams> {
-        Ok(lsp::HoverParams {
-            text_document_position_params: make_lsp_text_document_position(path, self.position)?,
-            work_done_progress_params: Default::default(),
-        })
-    }
-
-    async fn response_from_lsp(
-        self,
-        message: Option<lsp::Hover>,
-        _: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        _: LanguageServerId,
-        cx: AsyncApp,
-    ) -> Result<Self::Response> {
-        let Some(hover) = message else {
-            return Ok(None);
-        };
-
-        let (language, range) = buffer.read_with(&cx, |buffer, _| {
-            (
-                buffer.language().cloned(),
-                hover.range.map(|range| {
-                    let token_start =
-                        buffer.clip_point_utf16(point_from_lsp(range.start), Bias::Left);
-                    let token_end = buffer.clip_point_utf16(point_from_lsp(range.end), Bias::Left);
-                    buffer.anchor_after(token_start)..buffer.anchor_before(token_end)
-                }),
-            )
-        })?;
-
-        fn hover_blocks_from_marked_string(marked_string: lsp::MarkedString) -> Option<HoverBlock> {
-            let block = match marked_string {
-                lsp::MarkedString::String(content) => HoverBlock {
-                    text: content,
-                    kind: HoverBlockKind::Markdown,
-                },
-                lsp::MarkedString::LanguageString(lsp::LanguageString { language, value }) => {
-                    HoverBlock {
-                        text: value,
-                        kind: HoverBlockKind::Code { language },
-                    }
-                }
-            };
-            if block.text.is_empty() {
-                None
-            } else {
-                Some(block)
-            }
-        }
-
-        let contents = match hover.contents {
-            lsp::HoverContents::Scalar(marked_string) => {
-                hover_blocks_from_marked_string(marked_string)
-                    .into_iter()
-                    .collect()
-            }
-            lsp::HoverContents::Array(marked_strings) => marked_strings
-                .into_iter()
-                .filter_map(hover_blocks_from_marked_string)
-                .collect(),
-            lsp::HoverContents::Markup(markup_content) => vec![HoverBlock {
-                text: markup_content.value,
-                kind: if markup_content.kind == lsp::MarkupKind::Markdown {
-                    HoverBlockKind::Markdown
-                } else {
-                    HoverBlockKind::PlainText
-                },
-            }],
-        };
-
-        Ok(Some(Hover {
-            contents,
-            range,
-            language,
-        }))
-    }
-
-    fn to_proto(&self, project_id: u64, buffer: &Buffer) -> Self::ProtoRequest {
-        proto::GetHover {
-            project_id,
-            buffer_id: buffer.remote_id().into(),
-            position: Some(language::proto::serialize_anchor(
-                &buffer.anchor_before(self.position),
-            )),
-            version: serialize_version(&buffer.version),
-        }
-    }
-
-    async fn from_proto(
-        message: Self::ProtoRequest,
-        _: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        mut cx: AsyncApp,
-    ) -> Result<Self> {
-        let position = message
-            .position
-            .and_then(deserialize_anchor)
-            .context("invalid position")?;
-        buffer
-            .update(&mut cx, |buffer, _| {
-                buffer.wait_for_version(deserialize_version(&message.version))
-            })?
-            .await?;
-        Ok(Self {
-            position: buffer.read_with(&cx, |buffer, _| position.to_point_utf16(buffer))?,
-        })
-    }
-
-    fn response_to_proto(
-        response: Self::Response,
-        _: &mut LspStore,
-        _: PeerId,
-        _: &clock::Global,
-        _: &mut App,
-    ) -> proto::GetHoverResponse {
-        if let Some(response) = response {
-            let (start, end) = if let Some(range) = response.range {
-                (
-                    Some(language::proto::serialize_anchor(&range.start)),
-                    Some(language::proto::serialize_anchor(&range.end)),
-                )
-            } else {
-                (None, None)
-            };
-
-            let contents = response
-                .contents
-                .into_iter()
-                .map(|block| proto::HoverBlock {
-                    text: block.text,
-                    is_markdown: block.kind == HoverBlockKind::Markdown,
-                    language: if let HoverBlockKind::Code { language } = block.kind {
-                        Some(language)
-                    } else {
-                        None
-                    },
-                })
-                .collect();
-
-            proto::GetHoverResponse {
-                start,
-                end,
-                contents,
-            }
-        } else {
-            proto::GetHoverResponse {
-                start: None,
-                end: None,
-                contents: Vec::new(),
-            }
-        }
-    }
-
-    async fn response_from_proto(
-        self,
-        message: proto::GetHoverResponse,
-        _: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        mut cx: AsyncApp,
-    ) -> Result<Self::Response> {
-        let contents: Vec<_> = message
-            .contents
-            .into_iter()
-            .map(|block| HoverBlock {
-                text: block.text,
-                kind: if let Some(language) = block.language {
-                    HoverBlockKind::Code { language }
-                } else if block.is_markdown {
-                    HoverBlockKind::Markdown
-                } else {
-                    HoverBlockKind::PlainText
-                },
-            })
-            .collect();
-        if contents.is_empty() {
-            return Ok(None);
-        }
-
-        let language = buffer.read_with(&cx, |buffer, _| buffer.language().cloned())?;
-        let range = if let (Some(start), Some(end)) = (message.start, message.end) {
-            language::proto::deserialize_anchor(start)
-                .and_then(|start| language::proto::deserialize_anchor(end).map(|end| start..end))
-        } else {
-            None
-        };
-        if let Some(range) = range.as_ref() {
-            buffer
-                .update(&mut cx, |buffer, _| {
-                    buffer.wait_for_anchors([range.start, range.end])
-                })?
-                .await?;
-        }
-
-        Ok(Some(Hover {
-            contents,
-            range,
-            language,
-        }))
-    }
-
-    fn buffer_id_from_proto(message: &Self::ProtoRequest) -> Result<BufferId> {
-        BufferId::new(message.buffer_id)
-    }
-}
-
-impl GetCompletions {
-    pub fn can_resolve_completions(capabilities: &lsp::ServerCapabilities) -> bool {
-        capabilities
-            .completion_provider
-            .as_ref()
-            .and_then(|options| options.resolve_provider)
-            .unwrap_or(false)
-    }
-}
-
-#[async_trait(?Send)]
-impl LspCommand for GetCompletions {
-    type Response = CoreCompletionResponse;
-    type LspRequest = lsp::request::Completion;
-    type ProtoRequest = proto::GetCompletions;
-
-    fn display_name(&self) -> &str {
-        "Get completion"
-    }
-
-    fn check_capabilities(&self, capabilities: AdapterServerCapabilities) -> bool {
-        capabilities
-            .server_capabilities
-            .completion_provider
-            .is_some()
-    }
-
-    fn to_lsp(
-        &self,
-        path: &Path,
-        _: &Buffer,
-        _: &Arc<LanguageServer>,
-        _: &App,
-    ) -> Result<lsp::CompletionParams> {
-        Ok(lsp::CompletionParams {
-            text_document_position: make_lsp_text_document_position(path, self.position)?,
-            context: Some(self.context.clone()),
-            work_done_progress_params: Default::default(),
-            partial_result_params: Default::default(),
-        })
-    }
-
-    async fn response_from_lsp(
-        self,
-        completions: Option<lsp::CompletionResponse>,
-        lsp_store: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        server_id: LanguageServerId,
-        mut cx: AsyncApp,
-    ) -> Result<Self::Response> {
-        let mut response_list = None;
-        let (mut completions, mut is_incomplete) = if let Some(completions) = completions {
-            match completions {
-                lsp::CompletionResponse::Array(completions) => (completions, false),
-                lsp::CompletionResponse::List(mut list) => {
-                    let is_incomplete = list.is_incomplete;
-                    let items = std::mem::take(&mut list.items);
-                    response_list = Some(list);
-                    (items, is_incomplete)
-                }
-            }
-        } else {
-            (Vec::new(), false)
-        };
-
-        let unfiltered_completions_count = completions.len();
-
-        let language_server_adapter = lsp_store
-            .read_with(&cx, |lsp_store, _| {
-                lsp_store.language_server_adapter_for_id(server_id)
-            })?
-            .with_context(|| format!("no language server with id {server_id}"))?;
-
-        let lsp_defaults = response_list
-            .as_ref()
-            .and_then(|list| list.item_defaults.clone())
-            .map(Arc::new);
-
-        let mut completion_edits = Vec::new();
-        buffer.update(&mut cx, |buffer, _cx| {
-            let snapshot = buffer.snapshot();
-            let clipped_position = buffer.clip_point_utf16(Unclipped(self.position), Bias::Left);
-
-            let mut range_for_token = None;
-            completions.retain(|lsp_completion| {
-                let lsp_edit = lsp_completion.text_edit.clone().or_else(|| {
-                    let default_text_edit = lsp_defaults.as_deref()?.edit_range.as_ref()?;
-                    let new_text = lsp_completion
-                        .text_edit_text
-                        .as_ref()
-                        .unwrap_or(&lsp_completion.label)
-                        .clone();
-                    match default_text_edit {
-                        CompletionListItemDefaultsEditRange::Range(range) => {
-                            Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
-                                range: *range,
-                                new_text,
-                            }))
-                        }
-                        CompletionListItemDefaultsEditRange::InsertAndReplace {
-                            insert,
-                            replace,
-                        } => Some(lsp::CompletionTextEdit::InsertAndReplace(
-                            lsp::InsertReplaceEdit {
-                                new_text,
-                                insert: *insert,
-                                replace: *replace,
-                            },
-                        )),
-                    }
-                });
-
-                let edit = match lsp_edit {
-                    // If the language server provides a range to overwrite, then
-                    // check that the range is valid.
-                    Some(completion_text_edit) => {
-                        match parse_completion_text_edit(&completion_text_edit, &snapshot) {
-                            Some(edit) => edit,
-                            None => return false,
-                        }
-                    }
-                    // If the language server does not provide a range, then infer
-                    // the range based on the syntax tree.
-                    None => {
-                        if self.position != clipped_position {
-                            log::info!("completion out of expected range ");
-                            return false;
-                        }
-
-                        let default_edit_range = lsp_defaults.as_ref().and_then(|lsp_defaults| {
-                            lsp_defaults
-                                .edit_range
-                                .as_ref()
-                                .and_then(|range| match range {
-                                    CompletionListItemDefaultsEditRange::Range(r) => Some(r),
-                                    _ => None,
-                                })
-                        });
-
-                        let range = if let Some(range) = default_edit_range {
-                            let range = range_from_lsp(*range);
-                            let start = snapshot.clip_point_utf16(range.start, Bias::Left);
-                            let end = snapshot.clip_point_utf16(range.end, Bias::Left);
-                            if start != range.start.0 || end != range.end.0 {
-                                log::info!("completion out of expected range");
-                                return false;
-                            }
-
-                            snapshot.anchor_before(start)..snapshot.anchor_after(end)
-                        } else {
-                            range_for_token
-                                .get_or_insert_with(|| {
-                                    let offset = self.position.to_offset(&snapshot);
-                                    let (range, kind) = snapshot.surrounding_word(
-                                        offset,
-                                        Some(CharScopeContext::Completion),
-                                    );
-                                    let range = if kind == Some(CharKind::Word) {
-                                        range
-                                    } else {
-                                        offset..offset
-                                    };
-
-                                    snapshot.anchor_before(range.start)
-                                        ..snapshot.anchor_after(range.end)
-                                })
-                                .clone()
-                        };
-
-                        // We already know text_edit is None here
-                        let text = lsp_completion
-                            .insert_text
-                            .as_ref()
-                            .unwrap_or(&lsp_completion.label)
-                            .clone();
-
-                        ParsedCompletionEdit {
-                            replace_range: range,
-                            insert_range: None,
-                            new_text: text,
-                        }
-                    }
-                };
-
-                completion_edits.push(edit);
-                true
-            });
-        })?;
-
-        // If completions were filtered out due to errors that may be transient, mark the result
-        // incomplete so that it is re-queried.
-        if unfiltered_completions_count != completions.len() {
-            is_incomplete = true;
-        }
-
-        language_server_adapter
-            .process_completions(&mut completions)
-            .await;
-
-        let completions = completions
-            .into_iter()
-            .zip(completion_edits)
-            .map(|(mut lsp_completion, mut edit)| {
-                LineEnding::normalize(&mut edit.new_text);
-                if lsp_completion.data.is_none()
-                    && let Some(default_data) = lsp_defaults
-                        .as_ref()
-                        .and_then(|item_defaults| item_defaults.data.clone())
-                {
-                    // Servers (e.g. JDTLS) prefer unchanged completions, when resolving the items later,
-                    // so we do not insert the defaults here, but `data` is needed for resolving, so this is an exception.
-                    lsp_completion.data = Some(default_data);
-                }
-                CoreCompletion {
-                    replace_range: edit.replace_range,
-                    new_text: edit.new_text,
-                    source: CompletionSource::Lsp {
-                        insert_range: edit.insert_range,
-                        server_id,
-                        lsp_completion: Box::new(lsp_completion),
-                        lsp_defaults: lsp_defaults.clone(),
-                        resolved: false,
-                    },
-                }
-            })
-            .collect();
-
-        Ok(CoreCompletionResponse {
-            completions,
-            is_incomplete,
-        })
-    }
-
-    fn to_proto(&self, project_id: u64, buffer: &Buffer) -> proto::GetCompletions {
-        let anchor = buffer.anchor_after(self.position);
-        proto::GetCompletions {
-            project_id,
-            buffer_id: buffer.remote_id().into(),
-            position: Some(language::proto::serialize_anchor(&anchor)),
-            version: serialize_version(&buffer.version()),
-            server_id: self.server_id.map(|id| id.to_proto()),
-        }
-    }
-
-    async fn from_proto(
-        message: proto::GetCompletions,
-        _: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        mut cx: AsyncApp,
-    ) -> Result<Self> {
-        let version = deserialize_version(&message.version);
-        buffer
-            .update(&mut cx, |buffer, _| buffer.wait_for_version(version))?
-            .await?;
-        let position = message
-            .position
-            .and_then(language::proto::deserialize_anchor)
-            .map(|p| {
-                buffer.read_with(&cx, |buffer, _| {
-                    buffer.clip_point_utf16(Unclipped(p.to_point_utf16(buffer)), Bias::Left)
-                })
-            })
-            .context("invalid position")??;
-        Ok(Self {
-            position,
-            context: CompletionContext {
-                trigger_kind: CompletionTriggerKind::INVOKED,
-                trigger_character: None,
-            },
-            server_id: message
-                .server_id
-                .map(|id| lsp::LanguageServerId::from_proto(id)),
-        })
-    }
-
-    fn response_to_proto(
-        response: CoreCompletionResponse,
-        _: &mut LspStore,
-        _: PeerId,
-        buffer_version: &clock::Global,
-        _: &mut App,
-    ) -> proto::GetCompletionsResponse {
-        proto::GetCompletionsResponse {
-            completions: response
-                .completions
-                .iter()
-                .map(LspStore::serialize_completion)
-                .collect(),
-            version: serialize_version(buffer_version),
-            can_reuse: !response.is_incomplete,
-        }
-    }
-
-    async fn response_from_proto(
-        self,
-        message: proto::GetCompletionsResponse,
-        _project: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        mut cx: AsyncApp,
-    ) -> Result<Self::Response> {
-        buffer
-            .update(&mut cx, |buffer, _| {
-                buffer.wait_for_version(deserialize_version(&message.version))
-            })?
-            .await?;
-
-        let completions = message
-            .completions
-            .into_iter()
-            .map(LspStore::deserialize_completion)
-            .collect::<Result<Vec<_>>>()?;
-
-        Ok(CoreCompletionResponse {
-            completions,
-            is_incomplete: !message.can_reuse,
-        })
-    }
-
-    fn buffer_id_from_proto(message: &proto::GetCompletions) -> Result<BufferId> {
-        BufferId::new(message.buffer_id)
-    }
-}
-
-pub struct ParsedCompletionEdit {
-    pub replace_range: Range<Anchor>,
-    pub insert_range: Option<Range<Anchor>>,
-    pub new_text: String,
-}
-
-pub(crate) fn parse_completion_text_edit(
-    edit: &lsp::CompletionTextEdit,
-    snapshot: &BufferSnapshot,
-) -> Option<ParsedCompletionEdit> {
-    let (replace_range, insert_range, new_text) = match edit {
-        lsp::CompletionTextEdit::Edit(edit) => (edit.range, None, &edit.new_text),
-        lsp::CompletionTextEdit::InsertAndReplace(edit) => {
-            (edit.replace, Some(edit.insert), &edit.new_text)
-        }
-    };
-
-    let replace_range = {
-        let range = range_from_lsp(replace_range);
-        let start = snapshot.clip_point_utf16(range.start, Bias::Left);
-        let end = snapshot.clip_point_utf16(range.end, Bias::Left);
-        if start != range.start.0 || end != range.end.0 {
-            log::info!(
-                "completion out of expected range, start: {start:?}, end: {end:?}, range: {range:?}"
-            );
-            return None;
-        }
-        snapshot.anchor_before(start)..snapshot.anchor_after(end)
-    };
-
-    let insert_range = match insert_range {
-        None => None,
-        Some(insert_range) => {
-            let range = range_from_lsp(insert_range);
-            let start = snapshot.clip_point_utf16(range.start, Bias::Left);
-            let end = snapshot.clip_point_utf16(range.end, Bias::Left);
-            if start != range.start.0 || end != range.end.0 {
-                log::info!("completion (insert) out of expected range");
-                return None;
-            }
-            Some(snapshot.anchor_before(start)..snapshot.anchor_after(end))
-        }
-    };
-
-    Some(ParsedCompletionEdit {
-        insert_range,
-        replace_range,
-        new_text: new_text.clone(),
-    })
-}
-
-#[async_trait(?Send)]
-impl LspCommand for GetCodeActions {
-    type Response = Vec<CodeAction>;
-    type LspRequest = lsp::request::CodeActionRequest;
-    type ProtoRequest = proto::GetCodeActions;
-
-    fn display_name(&self) -> &str {
-        "Get code actions"
-    }
-
-    fn check_capabilities(&self, capabilities: AdapterServerCapabilities) -> bool {
-        match &capabilities.server_capabilities.code_action_provider {
-            None => false,
-            Some(lsp::CodeActionProviderCapability::Simple(false)) => false,
-            _ => {
-                // If we do know that we want specific code actions AND we know that
-                // the server only supports specific code actions, then we want to filter
-                // down to the ones that are supported.
-                if let Some((requested, supported)) = self
-                    .kinds
-                    .as_ref()
-                    .zip(Self::supported_code_action_kinds(capabilities))
-                {
-                    let server_supported = supported.into_iter().collect::<HashSet<_>>();
-                    requested.iter().any(|kind| server_supported.contains(kind))
-                } else {
-                    true
-                }
-            }
-        }
-    }
-
-    fn to_lsp(
-        &self,
-        path: &Path,
-        buffer: &Buffer,
-        language_server: &Arc<LanguageServer>,
-        _: &App,
-    ) -> Result<lsp::CodeActionParams> {
-        let mut relevant_diagnostics = Vec::new();
-        for entry in buffer
-            .snapshot()
-            .diagnostics_in_range::<_, language::PointUtf16>(self.range.clone(), false)
-        {
-            relevant_diagnostics.push(entry.to_lsp_diagnostic_stub()?);
-        }
-
-        let supported =
-            Self::supported_code_action_kinds(language_server.adapter_server_capabilities());
-
-        let only = if let Some(requested) = &self.kinds {
-            if let Some(supported_kinds) = supported {
-                let server_supported = supported_kinds.into_iter().collect::<HashSet<_>>();
-
-                let filtered = requested
-                    .iter()
-                    .filter(|kind| server_supported.contains(kind))
-                    .cloned()
-                    .collect();
-                Some(filtered)
-            } else {
-                Some(requested.clone())
-            }
-        } else {
-            supported
-        };
-
-        Ok(lsp::CodeActionParams {
-            text_document: make_text_document_identifier(path)?,
-            range: range_to_lsp(self.range.to_point_utf16(buffer))?,
-            work_done_progress_params: Default::default(),
-            partial_result_params: Default::default(),
-            context: lsp::CodeActionContext {
-                diagnostics: relevant_diagnostics,
-                only,
-                ..lsp::CodeActionContext::default()
-            },
-        })
-    }
-
-    async fn response_from_lsp(
-        self,
-        actions: Option<lsp::CodeActionResponse>,
-        lsp_store: Entity<LspStore>,
-        _: Entity<Buffer>,
-        server_id: LanguageServerId,
-        cx: AsyncApp,
-    ) -> Result<Vec<CodeAction>> {
-        let requested_kinds_set = self
-            .kinds
-            .map(|kinds| kinds.into_iter().collect::<HashSet<_>>());
-
-        let language_server = cx.update(|cx| {
-            lsp_store
-                .read(cx)
-                .language_server_for_id(server_id)
-                .with_context(|| {
-                    format!("Missing the language server that just returned a response {server_id}")
-                })
-        })??;
-
-        let server_capabilities = language_server.capabilities();
-        let available_commands = server_capabilities
-            .execute_command_provider
-            .as_ref()
-            .map(|options| options.commands.as_slice())
-            .unwrap_or_default();
-        Ok(actions
-            .unwrap_or_default()
-            .into_iter()
-            .filter_map(|entry| {
-                let (lsp_action, resolved) = match entry {
-                    lsp::CodeActionOrCommand::CodeAction(lsp_action) => {
-                        if let Some(command) = lsp_action.command.as_ref()
-                            && !available_commands.contains(&command.command)
-                        {
-                            return None;
-                        }
-                        (LspAction::Action(Box::new(lsp_action)), false)
-                    }
-                    lsp::CodeActionOrCommand::Command(command) => {
-                        if available_commands.contains(&command.command) {
-                            (LspAction::Command(command), true)
-                        } else {
-                            return None;
-                        }
-                    }
-                };
-
-                if let Some((requested_kinds, kind)) =
-                    requested_kinds_set.as_ref().zip(lsp_action.action_kind())
-                    && !requested_kinds.contains(&kind)
-                {
-                    return None;
-                }
-
-                Some(CodeAction {
-                    server_id,
-                    range: self.range.clone(),
-                    lsp_action,
-                    resolved,
-                })
-            })
-            .collect())
-    }
-
-    fn to_proto(&self, project_id: u64, buffer: &Buffer) -> proto::GetCodeActions {
-        proto::GetCodeActions {
-            project_id,
-            buffer_id: buffer.remote_id().into(),
-            start: Some(language::proto::serialize_anchor(&self.range.start)),
-            end: Some(language::proto::serialize_anchor(&self.range.end)),
-            version: serialize_version(&buffer.version()),
-        }
-    }
-
-    async fn from_proto(
-        message: proto::GetCodeActions,
-        _: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        mut cx: AsyncApp,
-    ) -> Result<Self> {
-        let start = message
-            .start
-            .and_then(language::proto::deserialize_anchor)
-            .context("invalid start")?;
-        let end = message
-            .end
-            .and_then(language::proto::deserialize_anchor)
-            .context("invalid end")?;
-        buffer
-            .update(&mut cx, |buffer, _| {
-                buffer.wait_for_version(deserialize_version(&message.version))
-            })?
-            .await?;
-
-        Ok(Self {
-            range: start..end,
-            kinds: None,
-        })
-    }
-
-    fn response_to_proto(
-        code_actions: Vec<CodeAction>,
-        _: &mut LspStore,
-        _: PeerId,
-        buffer_version: &clock::Global,
-        _: &mut App,
-    ) -> proto::GetCodeActionsResponse {
-        proto::GetCodeActionsResponse {
-            actions: code_actions
-                .iter()
-                .map(LspStore::serialize_code_action)
-                .collect(),
-            version: serialize_version(buffer_version),
-        }
-    }
-
-    async fn response_from_proto(
-        self,
-        message: proto::GetCodeActionsResponse,
-        _: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        mut cx: AsyncApp,
-    ) -> Result<Vec<CodeAction>> {
-        buffer
-            .update(&mut cx, |buffer, _| {
-                buffer.wait_for_version(deserialize_version(&message.version))
-            })?
-            .await?;
-        message
-            .actions
-            .into_iter()
-            .map(LspStore::deserialize_code_action)
-            .collect()
-    }
-
-    fn buffer_id_from_proto(message: &proto::GetCodeActions) -> Result<BufferId> {
-        BufferId::new(message.buffer_id)
-    }
-}
-
-impl GetCodeActions {
-    fn supported_code_action_kinds(
-        capabilities: AdapterServerCapabilities,
-    ) -> Option<Vec<CodeActionKind>> {
-        match capabilities.server_capabilities.code_action_provider {
-            Some(lsp::CodeActionProviderCapability::Options(CodeActionOptions {
-                code_action_kinds: Some(supported_action_kinds),
-                ..
-            })) => Some(supported_action_kinds),
-            _ => capabilities.code_action_kinds,
-        }
-    }
-
-    pub fn can_resolve_actions(capabilities: &ServerCapabilities) -> bool {
-        capabilities
-            .code_action_provider
-            .as_ref()
-            .and_then(|options| match options {
-                lsp::CodeActionProviderCapability::Simple(_is_supported) => None,
-                lsp::CodeActionProviderCapability::Options(options) => options.resolve_provider,
-            })
-            .unwrap_or(false)
-    }
-}
-
-impl OnTypeFormatting {
-    pub fn supports_on_type_formatting(trigger: &str, capabilities: &ServerCapabilities) -> bool {
-        let Some(on_type_formatting_options) = &capabilities.document_on_type_formatting_provider
-        else {
-            return false;
-        };
-        on_type_formatting_options
-            .first_trigger_character
-            .contains(trigger)
-            || on_type_formatting_options
-                .more_trigger_character
-                .iter()
-                .flatten()
-                .any(|chars| chars.contains(trigger))
-    }
-}
-
-#[async_trait(?Send)]
-impl LspCommand for OnTypeFormatting {
-    type Response = Option<Transaction>;
-    type LspRequest = lsp::request::OnTypeFormatting;
-    type ProtoRequest = proto::OnTypeFormatting;
-
-    fn display_name(&self) -> &str {
-        "Formatting on typing"
-    }
-
-    fn check_capabilities(&self, capabilities: AdapterServerCapabilities) -> bool {
-        Self::supports_on_type_formatting(&self.trigger, &capabilities.server_capabilities)
-    }
-
-    fn to_lsp(
-        &self,
-        path: &Path,
-        _: &Buffer,
-        _: &Arc<LanguageServer>,
-        _: &App,
-    ) -> Result<lsp::DocumentOnTypeFormattingParams> {
-        Ok(lsp::DocumentOnTypeFormattingParams {
-            text_document_position: make_lsp_text_document_position(path, self.position)?,
-            ch: self.trigger.clone(),
-            options: self.options.clone(),
-        })
-    }
-
-    async fn response_from_lsp(
-        self,
-        message: Option<Vec<lsp::TextEdit>>,
-        lsp_store: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        server_id: LanguageServerId,
-        mut cx: AsyncApp,
-    ) -> Result<Option<Transaction>> {
-        if let Some(edits) = message {
-            let (lsp_adapter, lsp_server) =
-                language_server_for_buffer(&lsp_store, &buffer, server_id, &mut cx)?;
-            LocalLspStore::deserialize_text_edits(
-                lsp_store,
-                buffer,
-                edits,
-                self.push_to_history,
-                lsp_adapter,
-                lsp_server,
-                &mut cx,
-            )
-            .await
-        } else {
-            Ok(None)
-        }
-    }
-
-    fn to_proto(&self, project_id: u64, buffer: &Buffer) -> proto::OnTypeFormatting {
-        proto::OnTypeFormatting {
-            project_id,
-            buffer_id: buffer.remote_id().into(),
-            position: Some(language::proto::serialize_anchor(
-                &buffer.anchor_before(self.position),
-            )),
-            trigger: self.trigger.clone(),
-            version: serialize_version(&buffer.version()),
-        }
-    }
-
-    async fn from_proto(
-        message: proto::OnTypeFormatting,
-        _: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        mut cx: AsyncApp,
-    ) -> Result<Self> {
-        let position = message
-            .position
-            .and_then(deserialize_anchor)
-            .context("invalid position")?;
-        buffer
-            .update(&mut cx, |buffer, _| {
-                buffer.wait_for_version(deserialize_version(&message.version))
-            })?
-            .await?;
-
-        let options = buffer.update(&mut cx, |buffer, cx| {
-            lsp_formatting_options(
-                language_settings(buffer.language().map(|l| l.name()), buffer.file(), cx).as_ref(),
-            )
-        })?;
-
-        Ok(Self {
-            position: buffer.read_with(&cx, |buffer, _| position.to_point_utf16(buffer))?,
-            trigger: message.trigger.clone(),
-            options,
-            push_to_history: false,
-        })
-    }
-
-    fn response_to_proto(
-        response: Option<Transaction>,
-        _: &mut LspStore,
-        _: PeerId,
-        _: &clock::Global,
-        _: &mut App,
-    ) -> proto::OnTypeFormattingResponse {
-        proto::OnTypeFormattingResponse {
-            transaction: response
-                .map(|transaction| language::proto::serialize_transaction(&transaction)),
-        }
-    }
-
-    async fn response_from_proto(
-        self,
-        message: proto::OnTypeFormattingResponse,
-        _: Entity<LspStore>,
-        _: Entity<Buffer>,
-        _: AsyncApp,
-    ) -> Result<Option<Transaction>> {
-        let Some(transaction) = message.transaction else {
-            return Ok(None);
-        };
-        Ok(Some(language::proto::deserialize_transaction(transaction)?))
-    }
-
-    fn buffer_id_from_proto(message: &proto::OnTypeFormatting) -> Result<BufferId> {
-        BufferId::new(message.buffer_id)
-    }
-}
-
-impl InlayHints {
-    pub async fn lsp_to_project_hint(
-        lsp_hint: lsp::InlayHint,
-        buffer_handle: &Entity<Buffer>,
-        server_id: LanguageServerId,
-        resolve_state: ResolveState,
-        force_no_type_left_padding: bool,
-        cx: &mut AsyncApp,
-    ) -> anyhow::Result<InlayHint> {
-        let kind = lsp_hint.kind.and_then(|kind| match kind {
-            lsp::InlayHintKind::TYPE => Some(InlayHintKind::Type),
-            lsp::InlayHintKind::PARAMETER => Some(InlayHintKind::Parameter),
-            _ => None,
-        });
-
-        let position = buffer_handle.read_with(cx, |buffer, _| {
-            let position = buffer.clip_point_utf16(point_from_lsp(lsp_hint.position), Bias::Left);
-            if kind == Some(InlayHintKind::Parameter) {
-                buffer.anchor_before(position)
-            } else {
-                buffer.anchor_after(position)
-            }
-        })?;
-        let label = Self::lsp_inlay_label_to_project(lsp_hint.label, server_id)
-            .await
-            .context("lsp to project inlay hint conversion")?;
-        let padding_left = if force_no_type_left_padding && kind == Some(InlayHintKind::Type) {
-            false
-        } else {
-            lsp_hint.padding_left.unwrap_or(false)
-        };
-
-        Ok(InlayHint {
-            position,
-            padding_left,
-            padding_right: lsp_hint.padding_right.unwrap_or(false),
-            label,
-            kind,
-            tooltip: lsp_hint.tooltip.map(|tooltip| match tooltip {
-                lsp::InlayHintTooltip::String(s) => InlayHintTooltip::String(s),
-                lsp::InlayHintTooltip::MarkupContent(markup_content) => {
-                    InlayHintTooltip::MarkupContent(MarkupContent {
-                        kind: match markup_content.kind {
-                            lsp::MarkupKind::PlainText => HoverBlockKind::PlainText,
-                            lsp::MarkupKind::Markdown => HoverBlockKind::Markdown,
-                        },
-                        value: markup_content.value,
-                    })
-                }
-            }),
-            resolve_state,
-        })
-    }
-
-    async fn lsp_inlay_label_to_project(
-        lsp_label: lsp::InlayHintLabel,
-        server_id: LanguageServerId,
-    ) -> anyhow::Result<InlayHintLabel> {
-        let label = match lsp_label {
-            lsp::InlayHintLabel::String(s) => InlayHintLabel::String(s),
-            lsp::InlayHintLabel::LabelParts(lsp_parts) => {
-                let mut parts = Vec::with_capacity(lsp_parts.len());
-                for lsp_part in lsp_parts {
-                    parts.push(InlayHintLabelPart {
-                        value: lsp_part.value,
-                        tooltip: lsp_part.tooltip.map(|tooltip| match tooltip {
-                            lsp::InlayHintLabelPartTooltip::String(s) => {
-                                InlayHintLabelPartTooltip::String(s)
-                            }
-                            lsp::InlayHintLabelPartTooltip::MarkupContent(markup_content) => {
-                                InlayHintLabelPartTooltip::MarkupContent(MarkupContent {
-                                    kind: match markup_content.kind {
-                                        lsp::MarkupKind::PlainText => HoverBlockKind::PlainText,
-                                        lsp::MarkupKind::Markdown => HoverBlockKind::Markdown,
-                                    },
-                                    value: markup_content.value,
-                                })
-                            }
-                        }),
-                        location: Some(server_id).zip(lsp_part.location),
-                    });
-                }
-                InlayHintLabel::LabelParts(parts)
-            }
-        };
-
-        Ok(label)
-    }
-
-    pub fn project_to_proto_hint(response_hint: InlayHint) -> proto::InlayHint {
-        let (state, lsp_resolve_state) = match response_hint.resolve_state {
-            ResolveState::Resolved => (0, None),
-            ResolveState::CanResolve(server_id, resolve_data) => (
-                1,
-                Some(proto::resolve_state::LspResolveState {
-                    server_id: server_id.0 as u64,
-                    value: resolve_data.map(|json_data| {
-                        serde_json::to_string(&json_data)
-                            .expect("failed to serialize resolve json data")
-                    }),
-                }),
-            ),
-            ResolveState::Resolving => (2, None),
-        };
-        let resolve_state = Some(proto::ResolveState {
-            state,
-            lsp_resolve_state,
-        });
-        proto::InlayHint {
-            position: Some(language::proto::serialize_anchor(&response_hint.position)),
-            padding_left: response_hint.padding_left,
-            padding_right: response_hint.padding_right,
-            label: Some(proto::InlayHintLabel {
-                label: Some(match response_hint.label {
-                    InlayHintLabel::String(s) => proto::inlay_hint_label::Label::Value(s),
-                    InlayHintLabel::LabelParts(label_parts) => {
-                        proto::inlay_hint_label::Label::LabelParts(proto::InlayHintLabelParts {
-                            parts: label_parts.into_iter().map(|label_part| {
-                                let location_url = label_part.location.as_ref().map(|(_, location)| location.uri.to_string());
-                                let location_range_start = label_part.location.as_ref().map(|(_, location)| point_from_lsp(location.range.start).0).map(|point| proto::PointUtf16 { row: point.row, column: point.column });
-                                let location_range_end = label_part.location.as_ref().map(|(_, location)| point_from_lsp(location.range.end).0).map(|point| proto::PointUtf16 { row: point.row, column: point.column });
-                                proto::InlayHintLabelPart {
-                                value: label_part.value,
-                                tooltip: label_part.tooltip.map(|tooltip| {
-                                    let proto_tooltip = match tooltip {
-                                        InlayHintLabelPartTooltip::String(s) => proto::inlay_hint_label_part_tooltip::Content::Value(s),
-                                        InlayHintLabelPartTooltip::MarkupContent(markup_content) => proto::inlay_hint_label_part_tooltip::Content::MarkupContent(proto::MarkupContent {
-                                            is_markdown: markup_content.kind == HoverBlockKind::Markdown,
-                                            value: markup_content.value,
-                                        }),
-                                    };
-                                    proto::InlayHintLabelPartTooltip {content: Some(proto_tooltip)}
-                                }),
-                                location_url,
-                                location_range_start,
-                                location_range_end,
-                                language_server_id: label_part.location.as_ref().map(|(server_id, _)| server_id.0 as u64),
-                            }}).collect()
-                        })
-                    }
-                }),
-            }),
-            kind: response_hint.kind.map(|kind| kind.name().to_string()),
-            tooltip: response_hint.tooltip.map(|response_tooltip| {
-                let proto_tooltip = match response_tooltip {
-                    InlayHintTooltip::String(s) => proto::inlay_hint_tooltip::Content::Value(s),
-                    InlayHintTooltip::MarkupContent(markup_content) => {
-                        proto::inlay_hint_tooltip::Content::MarkupContent(proto::MarkupContent {
-                            is_markdown: markup_content.kind == HoverBlockKind::Markdown,
-                            value: markup_content.value,
-                        })
-                    }
-                };
-                proto::InlayHintTooltip {
-                    content: Some(proto_tooltip),
-                }
-            }),
-            resolve_state,
-        }
-    }
-
-    pub fn proto_to_project_hint(message_hint: proto::InlayHint) -> anyhow::Result<InlayHint> {
-        let resolve_state = message_hint.resolve_state.as_ref().unwrap_or_else(|| {
-            panic!("incorrect proto inlay hint message: no resolve state in hint {message_hint:?}",)
-        });
-        let resolve_state_data = resolve_state
-            .lsp_resolve_state.as_ref()
-            .map(|lsp_resolve_state| {
-                let value = lsp_resolve_state.value.as_deref().map(|value| {
-                    serde_json::from_str::<Option<lsp::LSPAny>>(value)
-                        .with_context(|| format!("incorrect proto inlay hint message: non-json resolve state {lsp_resolve_state:?}"))
-                }).transpose()?.flatten();
-                anyhow::Ok((LanguageServerId(lsp_resolve_state.server_id as usize), value))
-            })
-            .transpose()?;
-        let resolve_state = match resolve_state.state {
-            0 => ResolveState::Resolved,
-            1 => {
-                let (server_id, lsp_resolve_state) = resolve_state_data.with_context(|| {
-                    format!(
-                        "No lsp resolve data for the hint that can be resolved: {message_hint:?}"
-                    )
-                })?;
-                ResolveState::CanResolve(server_id, lsp_resolve_state)
-            }
-            2 => ResolveState::Resolving,
-            invalid => {
-                anyhow::bail!("Unexpected resolve state {invalid} for hint {message_hint:?}")
-            }
-        };
-        Ok(InlayHint {
-            position: message_hint
-                .position
-                .and_then(language::proto::deserialize_anchor)
-                .context("invalid position")?,
-            label: match message_hint
-                .label
-                .and_then(|label| label.label)
-                .context("missing label")?
-            {
-                proto::inlay_hint_label::Label::Value(s) => InlayHintLabel::String(s),
-                proto::inlay_hint_label::Label::LabelParts(parts) => {
-                    let mut label_parts = Vec::new();
-                    for part in parts.parts {
-                        label_parts.push(InlayHintLabelPart {
-                            value: part.value,
-                            tooltip: part.tooltip.map(|tooltip| match tooltip.content {
-                                Some(proto::inlay_hint_label_part_tooltip::Content::Value(s)) => {
-                                    InlayHintLabelPartTooltip::String(s)
-                                }
-                                Some(
-                                    proto::inlay_hint_label_part_tooltip::Content::MarkupContent(
-                                        markup_content,
-                                    ),
-                                ) => InlayHintLabelPartTooltip::MarkupContent(MarkupContent {
-                                    kind: if markup_content.is_markdown {
-                                        HoverBlockKind::Markdown
-                                    } else {
-                                        HoverBlockKind::PlainText
-                                    },
-                                    value: markup_content.value,
-                                }),
-                                None => InlayHintLabelPartTooltip::String(String::new()),
-                            }),
-                            location: {
-                                match part
-                                    .location_url
-                                    .zip(
-                                        part.location_range_start.and_then(|start| {
-                                            Some(start..part.location_range_end?)
-                                        }),
-                                    )
-                                    .zip(part.language_server_id)
-                                {
-                                    Some(((uri, range), server_id)) => Some((
-                                        LanguageServerId(server_id as usize),
-                                        lsp::Location {
-                                            uri: lsp::Uri::from_str(&uri)
-                                                .context("invalid uri in hint part {part:?}")?,
-                                            range: lsp::Range::new(
-                                                point_to_lsp(PointUtf16::new(
-                                                    range.start.row,
-                                                    range.start.column,
-                                                )),
-                                                point_to_lsp(PointUtf16::new(
-                                                    range.end.row,
-                                                    range.end.column,
-                                                )),
-                                            ),
-                                        },
-                                    )),
-                                    None => None,
-                                }
-                            },
-                        });
-                    }
-
-                    InlayHintLabel::LabelParts(label_parts)
-                }
-            },
-            padding_left: message_hint.padding_left,
-            padding_right: message_hint.padding_right,
-            kind: message_hint
-                .kind
-                .as_deref()
-                .and_then(InlayHintKind::from_name),
-            tooltip: message_hint.tooltip.and_then(|tooltip| {
-                Some(match tooltip.content? {
-                    proto::inlay_hint_tooltip::Content::Value(s) => InlayHintTooltip::String(s),
-                    proto::inlay_hint_tooltip::Content::MarkupContent(markup_content) => {
-                        InlayHintTooltip::MarkupContent(MarkupContent {
-                            kind: if markup_content.is_markdown {
-                                HoverBlockKind::Markdown
-                            } else {
-                                HoverBlockKind::PlainText
-                            },
-                            value: markup_content.value,
-                        })
-                    }
-                })
-            }),
-            resolve_state,
-        })
-    }
-
-    pub fn project_to_lsp_hint(hint: InlayHint, snapshot: &BufferSnapshot) -> lsp::InlayHint {
-        lsp::InlayHint {
-            position: point_to_lsp(hint.position.to_point_utf16(snapshot)),
-            kind: hint.kind.map(|kind| match kind {
-                InlayHintKind::Type => lsp::InlayHintKind::TYPE,
-                InlayHintKind::Parameter => lsp::InlayHintKind::PARAMETER,
-            }),
-            text_edits: None,
-            tooltip: hint.tooltip.and_then(|tooltip| {
-                Some(match tooltip {
-                    InlayHintTooltip::String(s) => lsp::InlayHintTooltip::String(s),
-                    InlayHintTooltip::MarkupContent(markup_content) => {
-                        lsp::InlayHintTooltip::MarkupContent(lsp::MarkupContent {
-                            kind: match markup_content.kind {
-                                HoverBlockKind::PlainText => lsp::MarkupKind::PlainText,
-                                HoverBlockKind::Markdown => lsp::MarkupKind::Markdown,
-                                HoverBlockKind::Code { .. } => return None,
-                            },
-                            value: markup_content.value,
-                        })
-                    }
-                })
-            }),
-            label: match hint.label {
-                InlayHintLabel::String(s) => lsp::InlayHintLabel::String(s),
-                InlayHintLabel::LabelParts(label_parts) => lsp::InlayHintLabel::LabelParts(
-                    label_parts
-                        .into_iter()
-                        .map(|part| lsp::InlayHintLabelPart {
-                            value: part.value,
-                            tooltip: part.tooltip.and_then(|tooltip| {
-                                Some(match tooltip {
-                                    InlayHintLabelPartTooltip::String(s) => {
-                                        lsp::InlayHintLabelPartTooltip::String(s)
-                                    }
-                                    InlayHintLabelPartTooltip::MarkupContent(markup_content) => {
-                                        lsp::InlayHintLabelPartTooltip::MarkupContent(
-                                            lsp::MarkupContent {
-                                                kind: match markup_content.kind {
-                                                    HoverBlockKind::PlainText => {
-                                                        lsp::MarkupKind::PlainText
-                                                    }
-                                                    HoverBlockKind::Markdown => {
-                                                        lsp::MarkupKind::Markdown
-                                                    }
-                                                    HoverBlockKind::Code { .. } => return None,
-                                                },
-                                                value: markup_content.value,
-                                            },
-                                        )
-                                    }
-                                })
-                            }),
-                            location: part.location.map(|(_, location)| location),
-                            command: None,
-                        })
-                        .collect(),
-                ),
-            },
-            padding_left: Some(hint.padding_left),
-            padding_right: Some(hint.padding_right),
-            data: match hint.resolve_state {
-                ResolveState::CanResolve(_, data) => data,
-                ResolveState::Resolving | ResolveState::Resolved => None,
-            },
-        }
-    }
-
-    pub fn can_resolve_inlays(capabilities: &ServerCapabilities) -> bool {
-        capabilities
-            .inlay_hint_provider
-            .as_ref()
-            .and_then(|options| match options {
-                OneOf::Left(_is_supported) => None,
-                OneOf::Right(capabilities) => match capabilities {
-                    lsp::InlayHintServerCapabilities::Options(o) => o.resolve_provider,
-                    lsp::InlayHintServerCapabilities::RegistrationOptions(o) => {
-                        o.inlay_hint_options.resolve_provider
-                    }
-                },
-            })
-            .unwrap_or(false)
-    }
-
-    pub fn check_capabilities(capabilities: &ServerCapabilities) -> bool {
-        capabilities
-            .inlay_hint_provider
-            .as_ref()
-            .is_some_and(|inlay_hint_provider| match inlay_hint_provider {
-                lsp::OneOf::Left(enabled) => *enabled,
-                lsp::OneOf::Right(_) => true,
-            })
-    }
-}
-
-#[async_trait(?Send)]
-impl LspCommand for InlayHints {
-    type Response = Vec<InlayHint>;
-    type LspRequest = lsp::InlayHintRequest;
-    type ProtoRequest = proto::InlayHints;
-
-    fn display_name(&self) -> &str {
-        "Inlay hints"
-    }
-
-    fn check_capabilities(&self, capabilities: AdapterServerCapabilities) -> bool {
-        Self::check_capabilities(&capabilities.server_capabilities)
-    }
-
-    fn to_lsp(
-        &self,
-        path: &Path,
-        buffer: &Buffer,
-        _: &Arc<LanguageServer>,
-        _: &App,
-    ) -> Result<lsp::InlayHintParams> {
-        Ok(lsp::InlayHintParams {
-            text_document: lsp::TextDocumentIdentifier {
-                uri: file_path_to_lsp_url(path)?,
-            },
-            range: range_to_lsp(self.range.to_point_utf16(buffer))?,
-            work_done_progress_params: Default::default(),
-        })
-    }
-
-    async fn response_from_lsp(
-        self,
-        message: Option<Vec<lsp::InlayHint>>,
-        lsp_store: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        server_id: LanguageServerId,
-        mut cx: AsyncApp,
-    ) -> anyhow::Result<Vec<InlayHint>> {
-        let (lsp_adapter, lsp_server) =
-            language_server_for_buffer(&lsp_store, &buffer, server_id, &mut cx)?;
-        // `typescript-language-server` adds padding to the left for type hints, turning
-        // `const foo: boolean` into `const foo : boolean` which looks odd.
-        // `rust-analyzer` does not have the padding for this case, and we have to accommodate both.
-        //
-        // We could trim the whole string, but being pessimistic on par with the situation above,
-        // there might be a hint with multiple whitespaces at the end(s) which we need to display properly.
-        // Hence let's use a heuristic first to handle the most awkward case and look for more.
-        let force_no_type_left_padding =
-            lsp_adapter.name.0.as_ref() == "typescript-language-server";
-
-        let hints = message.unwrap_or_default().into_iter().map(|lsp_hint| {
-            let resolve_state = if InlayHints::can_resolve_inlays(&lsp_server.capabilities()) {
-                ResolveState::CanResolve(lsp_server.server_id(), lsp_hint.data.clone())
-            } else {
-                ResolveState::Resolved
-            };
-
-            let buffer = buffer.clone();
-            cx.spawn(async move |cx| {
-                InlayHints::lsp_to_project_hint(
-                    lsp_hint,
-                    &buffer,
-                    server_id,
-                    resolve_state,
-                    force_no_type_left_padding,
-                    cx,
-                )
-                .await
-            })
-        });
-        future::join_all(hints)
-            .await
-            .into_iter()
-            .collect::<anyhow::Result<_>>()
-            .context("lsp to project inlay hints conversion")
-    }
-
-    fn to_proto(&self, project_id: u64, buffer: &Buffer) -> proto::InlayHints {
-        proto::InlayHints {
-            project_id,
-            buffer_id: buffer.remote_id().into(),
-            start: Some(language::proto::serialize_anchor(&self.range.start)),
-            end: Some(language::proto::serialize_anchor(&self.range.end)),
-            version: serialize_version(&buffer.version()),
-        }
-    }
-
-    async fn from_proto(
-        message: proto::InlayHints,
-        _: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        mut cx: AsyncApp,
-    ) -> Result<Self> {
-        let start = message
-            .start
-            .and_then(language::proto::deserialize_anchor)
-            .context("invalid start")?;
-        let end = message
-            .end
-            .and_then(language::proto::deserialize_anchor)
-            .context("invalid end")?;
-        buffer
-            .update(&mut cx, |buffer, _| {
-                buffer.wait_for_version(deserialize_version(&message.version))
-            })?
-            .await?;
-
-        Ok(Self { range: start..end })
-    }
-
-    fn response_to_proto(
-        response: Vec<InlayHint>,
-        _: &mut LspStore,
-        _: PeerId,
-        buffer_version: &clock::Global,
-        _: &mut App,
-    ) -> proto::InlayHintsResponse {
-        proto::InlayHintsResponse {
-            hints: response
-                .into_iter()
-                .map(InlayHints::project_to_proto_hint)
-                .collect(),
-            version: serialize_version(buffer_version),
-        }
-    }
-
-    async fn response_from_proto(
-        self,
-        message: proto::InlayHintsResponse,
-        _: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        mut cx: AsyncApp,
-    ) -> anyhow::Result<Vec<InlayHint>> {
-        buffer
-            .update(&mut cx, |buffer, _| {
-                buffer.wait_for_version(deserialize_version(&message.version))
-            })?
-            .await?;
-
-        let mut hints = Vec::new();
-        for message_hint in message.hints {
-            hints.push(InlayHints::proto_to_project_hint(message_hint)?);
-        }
-
-        Ok(hints)
-    }
-
-    fn buffer_id_from_proto(message: &proto::InlayHints) -> Result<BufferId> {
-        BufferId::new(message.buffer_id)
-    }
-}
-
-#[async_trait(?Send)]
-impl LspCommand for GetCodeLens {
-    type Response = Vec<CodeAction>;
-    type LspRequest = lsp::CodeLensRequest;
-    type ProtoRequest = proto::GetCodeLens;
-
-    fn display_name(&self) -> &str {
-        "Code Lens"
-    }
-
-    fn check_capabilities(&self, capabilities: AdapterServerCapabilities) -> bool {
-        capabilities
-            .server_capabilities
-            .code_lens_provider
-            .is_some()
-    }
-
-    fn to_lsp(
-        &self,
-        path: &Path,
-        _: &Buffer,
-        _: &Arc<LanguageServer>,
-        _: &App,
-    ) -> Result<lsp::CodeLensParams> {
-        Ok(lsp::CodeLensParams {
-            text_document: lsp::TextDocumentIdentifier {
-                uri: file_path_to_lsp_url(path)?,
-            },
-            work_done_progress_params: lsp::WorkDoneProgressParams::default(),
-            partial_result_params: lsp::PartialResultParams::default(),
-        })
-    }
-
-    async fn response_from_lsp(
-        self,
-        message: Option<Vec<lsp::CodeLens>>,
-        lsp_store: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        server_id: LanguageServerId,
-        cx: AsyncApp,
-    ) -> anyhow::Result<Vec<CodeAction>> {
-        let snapshot = buffer.read_with(&cx, |buffer, _| buffer.snapshot())?;
-        let language_server = cx.update(|cx| {
-            lsp_store
-                .read(cx)
-                .language_server_for_id(server_id)
-                .with_context(|| {
-                    format!("Missing the language server that just returned a response {server_id}")
-                })
-        })??;
-        let server_capabilities = language_server.capabilities();
-        let available_commands = server_capabilities
-            .execute_command_provider
-            .as_ref()
-            .map(|options| options.commands.as_slice())
-            .unwrap_or_default();
-        Ok(message
-            .unwrap_or_default()
-            .into_iter()
-            .filter(|code_lens| {
-                code_lens
-                    .command
-                    .as_ref()
-                    .is_none_or(|command| available_commands.contains(&command.command))
-            })
-            .map(|code_lens| {
-                let code_lens_range = range_from_lsp(code_lens.range);
-                let start = snapshot.clip_point_utf16(code_lens_range.start, Bias::Left);
-                let end = snapshot.clip_point_utf16(code_lens_range.end, Bias::Right);
-                let range = snapshot.anchor_before(start)..snapshot.anchor_after(end);
-                CodeAction {
-                    server_id,
-                    range,
-                    lsp_action: LspAction::CodeLens(code_lens),
-                    resolved: false,
-                }
-            })
-            .collect())
-    }
-
-    fn to_proto(&self, project_id: u64, buffer: &Buffer) -> proto::GetCodeLens {
-        proto::GetCodeLens {
-            project_id,
-            buffer_id: buffer.remote_id().into(),
-            version: serialize_version(&buffer.version()),
-        }
-    }
-
-    async fn from_proto(
-        message: proto::GetCodeLens,
-        _: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        mut cx: AsyncApp,
-    ) -> Result<Self> {
-        buffer
-            .update(&mut cx, |buffer, _| {
-                buffer.wait_for_version(deserialize_version(&message.version))
-            })?
-            .await?;
-        Ok(Self)
-    }
-
-    fn response_to_proto(
-        response: Vec<CodeAction>,
-        _: &mut LspStore,
-        _: PeerId,
-        buffer_version: &clock::Global,
-        _: &mut App,
-    ) -> proto::GetCodeLensResponse {
-        proto::GetCodeLensResponse {
-            lens_actions: response
-                .iter()
-                .map(LspStore::serialize_code_action)
-                .collect(),
-            version: serialize_version(buffer_version),
-        }
-    }
-
-    async fn response_from_proto(
-        self,
-        message: proto::GetCodeLensResponse,
-        _: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        mut cx: AsyncApp,
-    ) -> anyhow::Result<Vec<CodeAction>> {
-        buffer
-            .update(&mut cx, |buffer, _| {
-                buffer.wait_for_version(deserialize_version(&message.version))
-            })?
-            .await?;
-        message
-            .lens_actions
-            .into_iter()
-            .map(LspStore::deserialize_code_action)
-            .collect::<Result<Vec<_>>>()
-            .context("deserializing proto code lens response")
-    }
-
-    fn buffer_id_from_proto(message: &proto::GetCodeLens) -> Result<BufferId> {
-        BufferId::new(message.buffer_id)
-    }
-}
-
-impl LinkedEditingRange {
-    pub fn check_server_capabilities(capabilities: ServerCapabilities) -> bool {
-        let Some(linked_editing_options) = capabilities.linked_editing_range_provider else {
-            return false;
-        };
-        if let LinkedEditingRangeServerCapabilities::Simple(false) = linked_editing_options {
-            return false;
-        }
-        true
-    }
-}
-
-#[async_trait(?Send)]
-impl LspCommand for LinkedEditingRange {
-    type Response = Vec<Range<Anchor>>;
-    type LspRequest = lsp::request::LinkedEditingRange;
-    type ProtoRequest = proto::LinkedEditingRange;
-
-    fn display_name(&self) -> &str {
-        "Linked editing range"
-    }
-
-    fn check_capabilities(&self, capabilities: AdapterServerCapabilities) -> bool {
-        Self::check_server_capabilities(capabilities.server_capabilities)
-    }
-
-    fn to_lsp(
-        &self,
-        path: &Path,
-        buffer: &Buffer,
-        _server: &Arc<LanguageServer>,
-        _: &App,
-    ) -> Result<lsp::LinkedEditingRangeParams> {
-        let position = self.position.to_point_utf16(&buffer.snapshot());
-        Ok(lsp::LinkedEditingRangeParams {
-            text_document_position_params: make_lsp_text_document_position(path, position)?,
-            work_done_progress_params: Default::default(),
-        })
-    }
-
-    async fn response_from_lsp(
-        self,
-        message: Option<lsp::LinkedEditingRanges>,
-        _: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        _server_id: LanguageServerId,
-        cx: AsyncApp,
-    ) -> Result<Vec<Range<Anchor>>> {
-        if let Some(lsp::LinkedEditingRanges { mut ranges, .. }) = message {
-            ranges.sort_by_key(|range| range.start);
-
-            buffer.read_with(&cx, |buffer, _| {
-                ranges
-                    .into_iter()
-                    .map(|range| {
-                        let start =
-                            buffer.clip_point_utf16(point_from_lsp(range.start), Bias::Left);
-                        let end = buffer.clip_point_utf16(point_from_lsp(range.end), Bias::Left);
-                        buffer.anchor_before(start)..buffer.anchor_after(end)
-                    })
-                    .collect()
-            })
-        } else {
-            Ok(vec![])
-        }
-    }
-
-    fn to_proto(&self, project_id: u64, buffer: &Buffer) -> proto::LinkedEditingRange {
-        proto::LinkedEditingRange {
-            project_id,
-            buffer_id: buffer.remote_id().to_proto(),
-            position: Some(serialize_anchor(&self.position)),
-            version: serialize_version(&buffer.version()),
-        }
-    }
-
-    async fn from_proto(
-        message: proto::LinkedEditingRange,
-        _: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        mut cx: AsyncApp,
-    ) -> Result<Self> {
-        let position = message.position.context("invalid position")?;
-        buffer
-            .update(&mut cx, |buffer, _| {
-                buffer.wait_for_version(deserialize_version(&message.version))
-            })?
-            .await?;
-        let position = deserialize_anchor(position).context("invalid position")?;
-        buffer
-            .update(&mut cx, |buffer, _| buffer.wait_for_anchors([position]))?
-            .await?;
-        Ok(Self { position })
-    }
-
-    fn response_to_proto(
-        response: Vec<Range<Anchor>>,
-        _: &mut LspStore,
-        _: PeerId,
-        buffer_version: &clock::Global,
-        _: &mut App,
-    ) -> proto::LinkedEditingRangeResponse {
-        proto::LinkedEditingRangeResponse {
-            items: response
-                .into_iter()
-                .map(|range| proto::AnchorRange {
-                    start: Some(serialize_anchor(&range.start)),
-                    end: Some(serialize_anchor(&range.end)),
-                })
-                .collect(),
-            version: serialize_version(buffer_version),
-        }
-    }
-
-    async fn response_from_proto(
-        self,
-        message: proto::LinkedEditingRangeResponse,
-        _: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        mut cx: AsyncApp,
-    ) -> Result<Vec<Range<Anchor>>> {
-        buffer
-            .update(&mut cx, |buffer, _| {
-                buffer.wait_for_version(deserialize_version(&message.version))
-            })?
-            .await?;
-        let items: Vec<Range<Anchor>> = message
-            .items
-            .into_iter()
-            .filter_map(|range| {
-                let start = deserialize_anchor(range.start?)?;
-                let end = deserialize_anchor(range.end?)?;
-                Some(start..end)
-            })
-            .collect();
-        for range in &items {
-            buffer
-                .update(&mut cx, |buffer, _| {
-                    buffer.wait_for_anchors([range.start, range.end])
-                })?
-                .await?;
-        }
-        Ok(items)
-    }
-
-    fn buffer_id_from_proto(message: &proto::LinkedEditingRange) -> Result<BufferId> {
-        BufferId::new(message.buffer_id)
-    }
-}
-
-impl GetDocumentDiagnostics {
-    pub fn diagnostics_from_proto(
-        response: proto::GetDocumentDiagnosticsResponse,
-    ) -> Vec<LspPullDiagnostics> {
-        response
-            .pulled_diagnostics
-            .into_iter()
-            .filter_map(|diagnostics| {
-                Some(LspPullDiagnostics::Response {
-                    registration_id: diagnostics.registration_id.map(SharedString::from),
-                    server_id: LanguageServerId::from_proto(diagnostics.server_id),
-                    uri: lsp::Uri::from_str(diagnostics.uri.as_str()).log_err()?,
-                    diagnostics: if diagnostics.changed {
-                        PulledDiagnostics::Unchanged {
-                            result_id: SharedString::new(diagnostics.result_id?),
-                        }
-                    } else {
-                        PulledDiagnostics::Changed {
-                            result_id: diagnostics.result_id.map(SharedString::new),
-                            diagnostics: diagnostics
-                                .diagnostics
-                                .into_iter()
-                                .filter_map(|diagnostic| {
-                                    GetDocumentDiagnostics::deserialize_lsp_diagnostic(diagnostic)
-                                        .context("deserializing diagnostics")
-                                        .log_err()
-                                })
-                                .collect(),
-                        }
-                    },
-                })
-            })
-            .collect()
-    }
-
-    fn deserialize_lsp_diagnostic(diagnostic: proto::LspDiagnostic) -> Result<lsp::Diagnostic> {
-        let start = diagnostic.start.context("invalid start range")?;
-        let end = diagnostic.end.context("invalid end range")?;
-
-        let range = Range::<PointUtf16> {
-            start: PointUtf16 {
-                row: start.row,
-                column: start.column,
-            },
-            end: PointUtf16 {
-                row: end.row,
-                column: end.column,
-            },
-        };
-
-        let data = diagnostic.data.and_then(|data| Value::from_str(&data).ok());
-        let code = diagnostic.code.map(lsp::NumberOrString::String);
-
-        let related_information = diagnostic
-            .related_information
-            .into_iter()
-            .map(|info| {
-                let start = info.location_range_start.unwrap();
-                let end = info.location_range_end.unwrap();
-
-                lsp::DiagnosticRelatedInformation {
-                    location: lsp::Location {
-                        range: lsp::Range {
-                            start: point_to_lsp(PointUtf16::new(start.row, start.column)),
-                            end: point_to_lsp(PointUtf16::new(end.row, end.column)),
-                        },
-                        uri: lsp::Uri::from_str(&info.location_url.unwrap()).unwrap(),
-                    },
-                    message: info.message,
-                }
-            })
-            .collect::<Vec<_>>();
-
-        let tags = diagnostic
-            .tags
-            .into_iter()
-            .filter_map(|tag| match proto::LspDiagnosticTag::from_i32(tag) {
-                Some(proto::LspDiagnosticTag::Unnecessary) => Some(lsp::DiagnosticTag::UNNECESSARY),
-                Some(proto::LspDiagnosticTag::Deprecated) => Some(lsp::DiagnosticTag::DEPRECATED),
-                _ => None,
-            })
-            .collect::<Vec<_>>();
-
-        Ok(lsp::Diagnostic {
-            range: language::range_to_lsp(range)?,
-            severity: match proto::lsp_diagnostic::Severity::from_i32(diagnostic.severity).unwrap()
-            {
-                proto::lsp_diagnostic::Severity::Error => Some(lsp::DiagnosticSeverity::ERROR),
-                proto::lsp_diagnostic::Severity::Warning => Some(lsp::DiagnosticSeverity::WARNING),
-                proto::lsp_diagnostic::Severity::Information => {
-                    Some(lsp::DiagnosticSeverity::INFORMATION)
-                }
-                proto::lsp_diagnostic::Severity::Hint => Some(lsp::DiagnosticSeverity::HINT),
-                _ => None,
-            },
-            code,
-            code_description: diagnostic
-                .code_description
-                .map(|code_description| CodeDescription {
-                    href: Some(lsp::Uri::from_str(&code_description).unwrap()),
-                }),
-            related_information: Some(related_information),
-            tags: Some(tags),
-            source: diagnostic.source.clone(),
-            message: diagnostic.message,
-            data,
-        })
-    }
-
-    fn serialize_lsp_diagnostic(diagnostic: lsp::Diagnostic) -> Result<proto::LspDiagnostic> {
-        let range = language::range_from_lsp(diagnostic.range);
-        let related_information = diagnostic
-            .related_information
-            .unwrap_or_default()
-            .into_iter()
-            .map(|related_information| {
-                let location_range_start =
-                    point_from_lsp(related_information.location.range.start).0;
-                let location_range_end = point_from_lsp(related_information.location.range.end).0;
-
-                Ok(proto::LspDiagnosticRelatedInformation {
-                    location_url: Some(related_information.location.uri.to_string()),
-                    location_range_start: Some(proto::PointUtf16 {
-                        row: location_range_start.row,
-                        column: location_range_start.column,
-                    }),
-                    location_range_end: Some(proto::PointUtf16 {
-                        row: location_range_end.row,
-                        column: location_range_end.column,
-                    }),
-                    message: related_information.message,
-                })
-            })
-            .collect::<Result<Vec<_>>>()?;
-
-        let tags = diagnostic
-            .tags
-            .unwrap_or_default()
-            .into_iter()
-            .map(|tag| match tag {
-                lsp::DiagnosticTag::UNNECESSARY => proto::LspDiagnosticTag::Unnecessary,
-                lsp::DiagnosticTag::DEPRECATED => proto::LspDiagnosticTag::Deprecated,
-                _ => proto::LspDiagnosticTag::None,
-            } as i32)
-            .collect();
-
-        Ok(proto::LspDiagnostic {
-            start: Some(proto::PointUtf16 {
-                row: range.start.0.row,
-                column: range.start.0.column,
-            }),
-            end: Some(proto::PointUtf16 {
-                row: range.end.0.row,
-                column: range.end.0.column,
-            }),
-            severity: match diagnostic.severity {
-                Some(lsp::DiagnosticSeverity::ERROR) => proto::lsp_diagnostic::Severity::Error,
-                Some(lsp::DiagnosticSeverity::WARNING) => proto::lsp_diagnostic::Severity::Warning,
-                Some(lsp::DiagnosticSeverity::INFORMATION) => {
-                    proto::lsp_diagnostic::Severity::Information
-                }
-                Some(lsp::DiagnosticSeverity::HINT) => proto::lsp_diagnostic::Severity::Hint,
-                _ => proto::lsp_diagnostic::Severity::None,
-            } as i32,
-            code: diagnostic.code.as_ref().map(|code| match code {
-                lsp::NumberOrString::Number(code) => code.to_string(),
-                lsp::NumberOrString::String(code) => code.clone(),
-            }),
-            source: diagnostic.source.clone(),
-            related_information,
-            tags,
-            code_description: diagnostic
-                .code_description
-                .and_then(|desc| desc.href.map(|url| url.to_string())),
-            message: diagnostic.message,
-            data: diagnostic.data.as_ref().map(|data| data.to_string()),
-        })
-    }
-
-    pub fn deserialize_workspace_diagnostics_report(
-        report: lsp::WorkspaceDiagnosticReportResult,
-        server_id: LanguageServerId,
-        registration_id: Option<SharedString>,
-    ) -> Vec<WorkspaceLspPullDiagnostics> {
-        let mut pulled_diagnostics = HashMap::default();
-        match report {
-            lsp::WorkspaceDiagnosticReportResult::Report(workspace_diagnostic_report) => {
-                for report in workspace_diagnostic_report.items {
-                    match report {
-                        lsp::WorkspaceDocumentDiagnosticReport::Full(report) => {
-                            process_full_workspace_diagnostics_report(
-                                &mut pulled_diagnostics,
-                                server_id,
-                                report,
-                                registration_id.clone(),
-                            )
-                        }
-                        lsp::WorkspaceDocumentDiagnosticReport::Unchanged(report) => {
-                            process_unchanged_workspace_diagnostics_report(
-                                &mut pulled_diagnostics,
-                                server_id,
-                                report,
-                                registration_id.clone(),
-                            )
-                        }
-                    }
-                }
-            }
-            lsp::WorkspaceDiagnosticReportResult::Partial(
-                workspace_diagnostic_report_partial_result,
-            ) => {
-                for report in workspace_diagnostic_report_partial_result.items {
-                    match report {
-                        lsp::WorkspaceDocumentDiagnosticReport::Full(report) => {
-                            process_full_workspace_diagnostics_report(
-                                &mut pulled_diagnostics,
-                                server_id,
-                                report,
-                                registration_id.clone(),
-                            )
-                        }
-                        lsp::WorkspaceDocumentDiagnosticReport::Unchanged(report) => {
-                            process_unchanged_workspace_diagnostics_report(
-                                &mut pulled_diagnostics,
-                                server_id,
-                                report,
-                                registration_id.clone(),
-                            )
-                        }
-                    }
-                }
-            }
-        }
-        pulled_diagnostics.into_values().collect()
-    }
-}
-
-#[derive(Debug)]
-pub struct WorkspaceLspPullDiagnostics {
-    pub version: Option<i32>,
-    pub diagnostics: LspPullDiagnostics,
-}
-
-fn process_full_workspace_diagnostics_report(
-    diagnostics: &mut HashMap<lsp::Uri, WorkspaceLspPullDiagnostics>,
-    server_id: LanguageServerId,
-    report: lsp::WorkspaceFullDocumentDiagnosticReport,
-    registration_id: Option<SharedString>,
-) {
-    let mut new_diagnostics = HashMap::default();
-    process_full_diagnostics_report(
-        &mut new_diagnostics,
-        server_id,
-        report.uri,
-        report.full_document_diagnostic_report,
-        registration_id,
-    );
-    diagnostics.extend(new_diagnostics.into_iter().map(|(uri, diagnostics)| {
-        (
-            uri,
-            WorkspaceLspPullDiagnostics {
-                version: report.version.map(|v| v as i32),
-                diagnostics,
-            },
-        )
-    }));
-}
-
-fn process_unchanged_workspace_diagnostics_report(
-    diagnostics: &mut HashMap<lsp::Uri, WorkspaceLspPullDiagnostics>,
-    server_id: LanguageServerId,
-    report: lsp::WorkspaceUnchangedDocumentDiagnosticReport,
-    registration_id: Option<SharedString>,
-) {
-    let mut new_diagnostics = HashMap::default();
-    process_unchanged_diagnostics_report(
-        &mut new_diagnostics,
-        server_id,
-        report.uri,
-        report.unchanged_document_diagnostic_report,
-        registration_id,
-    );
-    diagnostics.extend(new_diagnostics.into_iter().map(|(uri, diagnostics)| {
-        (
-            uri,
-            WorkspaceLspPullDiagnostics {
-                version: report.version.map(|v| v as i32),
-                diagnostics,
-            },
-        )
-    }));
-}
-
-#[async_trait(?Send)]
-impl LspCommand for GetDocumentDiagnostics {
-    type Response = Vec<LspPullDiagnostics>;
-    type LspRequest = lsp::request::DocumentDiagnosticRequest;
-    type ProtoRequest = proto::GetDocumentDiagnostics;
-
-    fn display_name(&self) -> &str {
-        "Get diagnostics"
-    }
-
-    fn check_capabilities(&self, _: AdapterServerCapabilities) -> bool {
-        true
-    }
-
-    fn to_lsp(
-        &self,
-        path: &Path,
-        _: &Buffer,
-        _: &Arc<LanguageServer>,
-        _: &App,
-    ) -> Result<lsp::DocumentDiagnosticParams> {
-        Ok(lsp::DocumentDiagnosticParams {
-            text_document: lsp::TextDocumentIdentifier {
-                uri: file_path_to_lsp_url(path)?,
-            },
-            identifier: self.identifier.clone(),
-            previous_result_id: self.previous_result_id.clone().map(|id| id.to_string()),
-            partial_result_params: Default::default(),
-            work_done_progress_params: Default::default(),
-        })
-    }
-
-    async fn response_from_lsp(
-        self,
-        message: lsp::DocumentDiagnosticReportResult,
-        _: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        server_id: LanguageServerId,
-        cx: AsyncApp,
-    ) -> Result<Self::Response> {
-        let url = buffer.read_with(&cx, |buffer, cx| {
-            buffer
-                .file()
-                .and_then(|file| file.as_local())
-                .map(|file| {
-                    let abs_path = file.abs_path(cx);
-                    file_path_to_lsp_url(&abs_path)
-                })
-                .transpose()?
-                .with_context(|| format!("missing url on buffer {}", buffer.remote_id()))
-        })??;
-
-        let mut pulled_diagnostics = HashMap::default();
-        match message {
-            lsp::DocumentDiagnosticReportResult::Report(report) => match report {
-                lsp::DocumentDiagnosticReport::Full(report) => {
-                    if let Some(related_documents) = report.related_documents {
-                        process_related_documents(
-                            &mut pulled_diagnostics,
-                            server_id,
-                            related_documents,
-                            self.registration_id.clone(),
-                        );
-                    }
-                    process_full_diagnostics_report(
-                        &mut pulled_diagnostics,
-                        server_id,
-                        url,
-                        report.full_document_diagnostic_report,
-                        self.registration_id,
-                    );
-                }
-                lsp::DocumentDiagnosticReport::Unchanged(report) => {
-                    if let Some(related_documents) = report.related_documents {
-                        process_related_documents(
-                            &mut pulled_diagnostics,
-                            server_id,
-                            related_documents,
-                            self.registration_id.clone(),
-                        );
-                    }
-                    process_unchanged_diagnostics_report(
-                        &mut pulled_diagnostics,
-                        server_id,
-                        url,
-                        report.unchanged_document_diagnostic_report,
-                        self.registration_id,
-                    );
-                }
-            },
-            lsp::DocumentDiagnosticReportResult::Partial(report) => {
-                if let Some(related_documents) = report.related_documents {
-                    process_related_documents(
-                        &mut pulled_diagnostics,
-                        server_id,
-                        related_documents,
-                        self.registration_id,
-                    );
-                }
-            }
-        }
-
-        Ok(pulled_diagnostics.into_values().collect())
-    }
-
-    fn to_proto(&self, project_id: u64, buffer: &Buffer) -> proto::GetDocumentDiagnostics {
-        proto::GetDocumentDiagnostics {
-            project_id,
-            buffer_id: buffer.remote_id().into(),
-            version: serialize_version(&buffer.version()),
-        }
-    }
-
-    async fn from_proto(
-        _: proto::GetDocumentDiagnostics,
-        _: Entity<LspStore>,
-        _: Entity<Buffer>,
-        _: AsyncApp,
-    ) -> Result<Self> {
-        anyhow::bail!(
-            "proto::GetDocumentDiagnostics is not expected to be converted from proto directly, as it needs `previous_result_id` fetched first"
-        )
-    }
-
-    fn response_to_proto(
-        response: Self::Response,
-        _: &mut LspStore,
-        _: PeerId,
-        _: &clock::Global,
-        _: &mut App,
-    ) -> proto::GetDocumentDiagnosticsResponse {
-        let pulled_diagnostics = response
-            .into_iter()
-            .filter_map(|diagnostics| match diagnostics {
-                LspPullDiagnostics::Default => None,
-                LspPullDiagnostics::Response {
-                    server_id,
-                    uri,
-                    diagnostics,
-                    registration_id,
-                } => {
-                    let mut changed = false;
-                    let (diagnostics, result_id) = match diagnostics {
-                        PulledDiagnostics::Unchanged { result_id } => (Vec::new(), Some(result_id)),
-                        PulledDiagnostics::Changed {
-                            result_id,
-                            diagnostics,
-                        } => {
-                            changed = true;
-                            (diagnostics, result_id)
-                        }
-                    };
-                    Some(proto::PulledDiagnostics {
-                        changed,
-                        result_id: result_id.map(|id| id.to_string()),
-                        uri: uri.to_string(),
-                        server_id: server_id.to_proto(),
-                        diagnostics: diagnostics
-                            .into_iter()
-                            .filter_map(|diagnostic| {
-                                GetDocumentDiagnostics::serialize_lsp_diagnostic(diagnostic)
-                                    .context("serializing diagnostics")
-                                    .log_err()
-                            })
-                            .collect(),
-                        registration_id: registration_id.as_ref().map(ToString::to_string),
-                    })
-                }
-            })
-            .collect();
-
-        proto::GetDocumentDiagnosticsResponse { pulled_diagnostics }
-    }
-
-    async fn response_from_proto(
-        self,
-        response: proto::GetDocumentDiagnosticsResponse,
-        _: Entity<LspStore>,
-        _: Entity<Buffer>,
-        _: AsyncApp,
-    ) -> Result<Self::Response> {
-        Ok(Self::diagnostics_from_proto(response))
-    }
-
-    fn buffer_id_from_proto(message: &proto::GetDocumentDiagnostics) -> Result<BufferId> {
-        BufferId::new(message.buffer_id)
-    }
-}
-
-#[async_trait(?Send)]
-impl LspCommand for GetDocumentColor {
-    type Response = Vec<DocumentColor>;
-    type LspRequest = lsp::request::DocumentColor;
-    type ProtoRequest = proto::GetDocumentColor;
-
-    fn display_name(&self) -> &str {
-        "Document color"
-    }
-
-    fn check_capabilities(&self, server_capabilities: AdapterServerCapabilities) -> bool {
-        server_capabilities
-            .server_capabilities
-            .color_provider
-            .as_ref()
-            .is_some_and(|capability| match capability {
-                lsp::ColorProviderCapability::Simple(supported) => *supported,
-                lsp::ColorProviderCapability::ColorProvider(..) => true,
-                lsp::ColorProviderCapability::Options(..) => true,
-            })
-    }
-
-    fn to_lsp(
-        &self,
-        path: &Path,
-        _: &Buffer,
-        _: &Arc<LanguageServer>,
-        _: &App,
-    ) -> Result<lsp::DocumentColorParams> {
-        Ok(lsp::DocumentColorParams {
-            text_document: make_text_document_identifier(path)?,
-            work_done_progress_params: Default::default(),
-            partial_result_params: Default::default(),
-        })
-    }
-
-    async fn response_from_lsp(
-        self,
-        message: Vec<lsp::ColorInformation>,
-        _: Entity<LspStore>,
-        _: Entity<Buffer>,
-        _: LanguageServerId,
-        _: AsyncApp,
-    ) -> Result<Self::Response> {
-        Ok(message
-            .into_iter()
-            .map(|color| DocumentColor {
-                lsp_range: color.range,
-                color: color.color,
-                resolved: false,
-                color_presentations: Vec::new(),
-            })
-            .collect())
-    }
-
-    fn to_proto(&self, project_id: u64, buffer: &Buffer) -> Self::ProtoRequest {
-        proto::GetDocumentColor {
-            project_id,
-            buffer_id: buffer.remote_id().to_proto(),
-            version: serialize_version(&buffer.version()),
-        }
-    }
-
-    async fn from_proto(
-        _: Self::ProtoRequest,
-        _: Entity<LspStore>,
-        _: Entity<Buffer>,
-        _: AsyncApp,
-    ) -> Result<Self> {
-        Ok(Self {})
-    }
-
-    fn response_to_proto(
-        response: Self::Response,
-        _: &mut LspStore,
-        _: PeerId,
-        buffer_version: &clock::Global,
-        _: &mut App,
-    ) -> proto::GetDocumentColorResponse {
-        proto::GetDocumentColorResponse {
-            colors: response
-                .into_iter()
-                .map(|color| {
-                    let start = point_from_lsp(color.lsp_range.start).0;
-                    let end = point_from_lsp(color.lsp_range.end).0;
-                    proto::ColorInformation {
-                        red: color.color.red,
-                        green: color.color.green,
-                        blue: color.color.blue,
-                        alpha: color.color.alpha,
-                        lsp_range_start: Some(proto::PointUtf16 {
-                            row: start.row,
-                            column: start.column,
-                        }),
-                        lsp_range_end: Some(proto::PointUtf16 {
-                            row: end.row,
-                            column: end.column,
-                        }),
-                    }
-                })
-                .collect(),
-            version: serialize_version(buffer_version),
-        }
-    }
-
-    async fn response_from_proto(
-        self,
-        message: proto::GetDocumentColorResponse,
-        _: Entity<LspStore>,
-        _: Entity<Buffer>,
-        _: AsyncApp,
-    ) -> Result<Self::Response> {
-        Ok(message
-            .colors
-            .into_iter()
-            .filter_map(|color| {
-                let start = color.lsp_range_start?;
-                let start = PointUtf16::new(start.row, start.column);
-                let end = color.lsp_range_end?;
-                let end = PointUtf16::new(end.row, end.column);
-                Some(DocumentColor {
-                    resolved: false,
-                    color_presentations: Vec::new(),
-                    lsp_range: lsp::Range {
-                        start: point_to_lsp(start),
-                        end: point_to_lsp(end),
-                    },
-                    color: lsp::Color {
-                        red: color.red,
-                        green: color.green,
-                        blue: color.blue,
-                        alpha: color.alpha,
-                    },
-                })
-            })
-            .collect())
-    }
-
-    fn buffer_id_from_proto(message: &Self::ProtoRequest) -> Result<BufferId> {
-        BufferId::new(message.buffer_id)
-    }
-}
-
-fn process_related_documents(
-    diagnostics: &mut HashMap<lsp::Uri, LspPullDiagnostics>,
-    server_id: LanguageServerId,
-    documents: impl IntoIterator<Item = (lsp::Uri, lsp::DocumentDiagnosticReportKind)>,
-    registration_id: Option<SharedString>,
-) {
-    for (url, report_kind) in documents {
-        match report_kind {
-            lsp::DocumentDiagnosticReportKind::Full(report) => process_full_diagnostics_report(
-                diagnostics,
-                server_id,
-                url,
-                report,
-                registration_id.clone(),
-            ),
-            lsp::DocumentDiagnosticReportKind::Unchanged(report) => {
-                process_unchanged_diagnostics_report(
-                    diagnostics,
-                    server_id,
-                    url,
-                    report,
-                    registration_id.clone(),
-                )
-            }
-        }
-    }
-}
-
-fn process_unchanged_diagnostics_report(
-    diagnostics: &mut HashMap<lsp::Uri, LspPullDiagnostics>,
-    server_id: LanguageServerId,
-    uri: lsp::Uri,
-    report: lsp::UnchangedDocumentDiagnosticReport,
-    registration_id: Option<SharedString>,
-) {
-    let result_id = SharedString::new(report.result_id);
-    match diagnostics.entry(uri.clone()) {
-        hash_map::Entry::Occupied(mut o) => match o.get_mut() {
-            LspPullDiagnostics::Default => {
-                o.insert(LspPullDiagnostics::Response {
-                    server_id,
-                    uri,
-                    diagnostics: PulledDiagnostics::Unchanged { result_id },
-                    registration_id,
-                });
-            }
-            LspPullDiagnostics::Response {
-                server_id: existing_server_id,
-                uri: existing_uri,
-                diagnostics: existing_diagnostics,
-                ..
-            } => {
-                if server_id != *existing_server_id || &uri != existing_uri {
-                    debug_panic!(
-                        "Unexpected state: file {uri} has two different sets of diagnostics reported"
-                    );
-                }
-                match existing_diagnostics {
-                    PulledDiagnostics::Unchanged { .. } => {
-                        *existing_diagnostics = PulledDiagnostics::Unchanged { result_id };
-                    }
-                    PulledDiagnostics::Changed { .. } => {}
-                }
-            }
-        },
-        hash_map::Entry::Vacant(v) => {
-            v.insert(LspPullDiagnostics::Response {
-                server_id,
-                uri,
-                diagnostics: PulledDiagnostics::Unchanged { result_id },
-                registration_id,
-            });
-        }
-    }
-}
-
-fn process_full_diagnostics_report(
-    diagnostics: &mut HashMap<lsp::Uri, LspPullDiagnostics>,
-    server_id: LanguageServerId,
-    uri: lsp::Uri,
-    report: lsp::FullDocumentDiagnosticReport,
-    registration_id: Option<SharedString>,
-) {
-    let result_id = report.result_id.map(SharedString::new);
-    match diagnostics.entry(uri.clone()) {
-        hash_map::Entry::Occupied(mut o) => match o.get_mut() {
-            LspPullDiagnostics::Default => {
-                o.insert(LspPullDiagnostics::Response {
-                    server_id,
-                    uri,
-                    diagnostics: PulledDiagnostics::Changed {
-                        result_id,
-                        diagnostics: report.items,
-                    },
-                    registration_id,
-                });
-            }
-            LspPullDiagnostics::Response {
-                server_id: existing_server_id,
-                uri: existing_uri,
-                diagnostics: existing_diagnostics,
-                ..
-            } => {
-                if server_id != *existing_server_id || &uri != existing_uri {
-                    debug_panic!(
-                        "Unexpected state: file {uri} has two different sets of diagnostics reported"
-                    );
-                }
-                match existing_diagnostics {
-                    PulledDiagnostics::Unchanged { .. } => {
-                        *existing_diagnostics = PulledDiagnostics::Changed {
-                            result_id,
-                            diagnostics: report.items,
-                        };
-                    }
-                    PulledDiagnostics::Changed {
-                        result_id: existing_result_id,
-                        diagnostics: existing_diagnostics,
-                    } => {
-                        if result_id.is_some() {
-                            *existing_result_id = result_id;
-                        }
-                        existing_diagnostics.extend(report.items);
-                    }
-                }
-            }
-        },
-        hash_map::Entry::Vacant(v) => {
-            v.insert(LspPullDiagnostics::Response {
-                server_id,
-                uri,
-                diagnostics: PulledDiagnostics::Changed {
-                    result_id,
-                    diagnostics: report.items,
-                },
-                registration_id,
-            });
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use lsp::{DiagnosticSeverity, DiagnosticTag};
-    use serde_json::json;
-
-    #[test]
-    fn test_serialize_lsp_diagnostic() {
-        let lsp_diagnostic = lsp::Diagnostic {
-            range: lsp::Range {
-                start: lsp::Position::new(0, 1),
-                end: lsp::Position::new(2, 3),
-            },
-            severity: Some(DiagnosticSeverity::ERROR),
-            code: Some(lsp::NumberOrString::String("E001".to_string())),
-            source: Some("test-source".to_string()),
-            message: "Test error message".to_string(),
-            related_information: None,
-            tags: Some(vec![DiagnosticTag::DEPRECATED]),
-            code_description: None,
-            data: Some(json!({"detail": "test detail"})),
-        };
-
-        let proto_diagnostic = GetDocumentDiagnostics::serialize_lsp_diagnostic(lsp_diagnostic)
-            .expect("Failed to serialize diagnostic");
-
-        let start = proto_diagnostic.start.unwrap();
-        let end = proto_diagnostic.end.unwrap();
-        assert_eq!(start.row, 0);
-        assert_eq!(start.column, 1);
-        assert_eq!(end.row, 2);
-        assert_eq!(end.column, 3);
-        assert_eq!(
-            proto_diagnostic.severity,
-            proto::lsp_diagnostic::Severity::Error as i32
-        );
-        assert_eq!(proto_diagnostic.code, Some("E001".to_string()));
-        assert_eq!(proto_diagnostic.source, Some("test-source".to_string()));
-        assert_eq!(proto_diagnostic.message, "Test error message");
-    }
-
-    #[test]
-    fn test_deserialize_lsp_diagnostic() {
-        let proto_diagnostic = proto::LspDiagnostic {
-            start: Some(proto::PointUtf16 { row: 0, column: 1 }),
-            end: Some(proto::PointUtf16 { row: 2, column: 3 }),
-            severity: proto::lsp_diagnostic::Severity::Warning as i32,
-            code: Some("ERR".to_string()),
-            source: Some("Prism".to_string()),
-            message: "assigned but unused variable - a".to_string(),
-            related_information: vec![],
-            tags: vec![],
-            code_description: None,
-            data: None,
-        };
-
-        let lsp_diagnostic = GetDocumentDiagnostics::deserialize_lsp_diagnostic(proto_diagnostic)
-            .expect("Failed to deserialize diagnostic");
-
-        assert_eq!(lsp_diagnostic.range.start.line, 0);
-        assert_eq!(lsp_diagnostic.range.start.character, 1);
-        assert_eq!(lsp_diagnostic.range.end.line, 2);
-        assert_eq!(lsp_diagnostic.range.end.character, 3);
-        assert_eq!(lsp_diagnostic.severity, Some(DiagnosticSeverity::WARNING));
-        assert_eq!(
-            lsp_diagnostic.code,
-            Some(lsp::NumberOrString::String("ERR".to_string()))
-        );
-        assert_eq!(lsp_diagnostic.source, Some("Prism".to_string()));
-        assert_eq!(lsp_diagnostic.message, "assigned but unused variable - a");
-    }
-
-    #[test]
-    fn test_related_information() {
-        let related_info = lsp::DiagnosticRelatedInformation {
-            location: lsp::Location {
-                uri: lsp::Uri::from_str("file:///test.rs").unwrap(),
-                range: lsp::Range {
-                    start: lsp::Position::new(1, 1),
-                    end: lsp::Position::new(1, 5),
-                },
-            },
-            message: "Related info message".to_string(),
-        };
-
-        let lsp_diagnostic = lsp::Diagnostic {
-            range: lsp::Range {
-                start: lsp::Position::new(0, 0),
-                end: lsp::Position::new(0, 1),
-            },
-            severity: Some(DiagnosticSeverity::INFORMATION),
-            code: None,
-            source: Some("Prism".to_string()),
-            message: "assigned but unused variable - a".to_string(),
-            related_information: Some(vec![related_info]),
-            tags: None,
-            code_description: None,
-            data: None,
-        };
-
-        let proto_diagnostic = GetDocumentDiagnostics::serialize_lsp_diagnostic(lsp_diagnostic)
-            .expect("Failed to serialize diagnostic");
-
-        assert_eq!(proto_diagnostic.related_information.len(), 1);
-        let related = &proto_diagnostic.related_information[0];
-        assert_eq!(related.location_url, Some("file:///test.rs".to_string()));
-        assert_eq!(related.message, "Related info message");
-    }
-
-    #[test]
-    fn test_invalid_ranges() {
-        let proto_diagnostic = proto::LspDiagnostic {
-            start: None,
-            end: Some(proto::PointUtf16 { row: 2, column: 3 }),
-            severity: proto::lsp_diagnostic::Severity::Error as i32,
-            code: None,
-            source: None,
-            message: "Test message".to_string(),
-            related_information: vec![],
-            tags: vec![],
-            code_description: None,
-            data: None,
-        };
-
-        let result = GetDocumentDiagnostics::deserialize_lsp_diagnostic(proto_diagnostic);
-        assert!(result.is_err());
-    }
-}
diff --git a/crates/project/src/lsp_command/signature_help.rs b/crates/project/src/lsp_command/signature_help.rs
deleted file mode 100644
index 6a49931183..0000000000
--- a/crates/project/src/lsp_command/signature_help.rs
+++ /dev/null
@@ -1,793 +0,0 @@
-use std::{ops::Range, sync::Arc};
-
-use gpui::{App, AppContext, Entity, FontWeight, HighlightStyle, SharedString};
-use language::LanguageRegistry;
-use lsp::LanguageServerId;
-use markdown::Markdown;
-use rpc::proto::{self, documentation};
-use util::maybe;
-
-#[derive(Debug)]
-pub struct SignatureHelp {
-    pub active_signature: usize,
-    pub signatures: Vec<SignatureHelpData>,
-    pub(super) original_data: lsp::SignatureHelp,
-}
-
-#[derive(Debug, Clone)]
-pub struct SignatureHelpData {
-    pub label: SharedString,
-    pub documentation: Option<Entity<Markdown>>,
-    pub highlights: Vec<(Range<usize>, HighlightStyle)>,
-    pub active_parameter: Option<usize>,
-    pub parameters: Vec<ParameterInfo>,
-}
-
-#[derive(Debug, Clone)]
-pub struct ParameterInfo {
-    pub label_range: Option<Range<usize>>,
-    pub documentation: Option<Entity<Markdown>>,
-}
-
-impl SignatureHelp {
-    pub fn new(
-        help: lsp::SignatureHelp,
-        language_registry: Option<Arc<LanguageRegistry>>,
-        lang_server_id: Option<LanguageServerId>,
-        cx: &mut App,
-    ) -> Option<Self> {
-        if help.signatures.is_empty() {
-            return None;
-        }
-        let active_signature = help.active_signature.unwrap_or(0) as usize;
-        let mut signatures = Vec::<SignatureHelpData>::with_capacity(help.signatures.capacity());
-        for signature in &help.signatures {
-            let label = SharedString::from(signature.label.clone());
-            let active_parameter = signature
-                .active_parameter
-                .unwrap_or_else(|| help.active_parameter.unwrap_or(0))
-                as usize;
-            let mut highlights = Vec::new();
-            let mut parameter_infos = Vec::new();
-
-            if let Some(parameters) = &signature.parameters {
-                for (index, parameter) in parameters.iter().enumerate() {
-                    let label_range = match &parameter.label {
-                        &lsp::ParameterLabel::LabelOffsets([offset1, offset2]) => {
-                            maybe!({
-                                let offset1 = offset1 as usize;
-                                let offset2 = offset2 as usize;
-                                if offset1 < offset2 {
-                                    let mut indices = label.char_indices().scan(
-                                        0,
-                                        |utf16_offset_acc, (offset, c)| {
-                                            let utf16_offset = *utf16_offset_acc;
-                                            *utf16_offset_acc += c.len_utf16();
-                                            Some((utf16_offset, offset))
-                                        },
-                                    );
-                                    let (_, offset1) = indices
-                                        .find(|(utf16_offset, _)| *utf16_offset == offset1)?;
-                                    let (_, offset2) = indices
-                                        .find(|(utf16_offset, _)| *utf16_offset == offset2)?;
-                                    Some(offset1..offset2)
-                                } else {
-                                    log::warn!(
-                                        "language server {lang_server_id:?} produced invalid parameter label range: {offset1:?}..{offset2:?}",
-                                    );
-                                    None
-                                }
-                            })
-                        }
-                        lsp::ParameterLabel::Simple(parameter_label) => {
-                            if let Some(start) = signature.label.find(parameter_label) {
-                                Some(start..start + parameter_label.len())
-                            } else {
-                                None
-                            }
-                        }
-                    };
-
-                    if let Some(label_range) = &label_range
-                        && index == active_parameter
-                    {
-                        highlights.push((
-                            label_range.clone(),
-                            HighlightStyle {
-                                font_weight: Some(FontWeight::EXTRA_BOLD),
-                                ..HighlightStyle::default()
-                            },
-                        ));
-                    }
-
-                    let documentation = parameter
-                        .documentation
-                        .as_ref()
-                        .map(|doc| documentation_to_markdown(doc, language_registry.clone(), cx));
-
-                    parameter_infos.push(ParameterInfo {
-                        label_range,
-                        documentation,
-                    });
-                }
-            }
-
-            let documentation = signature
-                .documentation
-                .as_ref()
-                .map(|doc| documentation_to_markdown(doc, language_registry.clone(), cx));
-
-            signatures.push(SignatureHelpData {
-                label,
-                documentation,
-                highlights,
-                active_parameter: Some(active_parameter),
-                parameters: parameter_infos,
-            });
-        }
-        Some(Self {
-            signatures,
-            active_signature,
-            original_data: help,
-        })
-    }
-}
-
-fn documentation_to_markdown(
-    documentation: &lsp::Documentation,
-    language_registry: Option<Arc<LanguageRegistry>>,
-    cx: &mut App,
-) -> Entity<Markdown> {
-    match documentation {
-        lsp::Documentation::String(string) => {
-            cx.new(|cx| Markdown::new_text(SharedString::from(string), cx))
-        }
-        lsp::Documentation::MarkupContent(markup) => match markup.kind {
-            lsp::MarkupKind::PlainText => {
-                cx.new(|cx| Markdown::new_text(SharedString::from(&markup.value), cx))
-            }
-            lsp::MarkupKind::Markdown => cx.new(|cx| {
-                Markdown::new(
-                    SharedString::from(&markup.value),
-                    language_registry,
-                    None,
-                    cx,
-                )
-            }),
-        },
-    }
-}
-
-pub fn lsp_to_proto_signature(lsp_help: lsp::SignatureHelp) -> proto::SignatureHelp {
-    proto::SignatureHelp {
-        signatures: lsp_help
-            .signatures
-            .into_iter()
-            .map(|signature| proto::SignatureInformation {
-                label: signature.label,
-                documentation: signature.documentation.map(lsp_to_proto_documentation),
-                parameters: signature
-                    .parameters
-                    .unwrap_or_default()
-                    .into_iter()
-                    .map(|parameter_info| proto::ParameterInformation {
-                        label: Some(match parameter_info.label {
-                            lsp::ParameterLabel::Simple(label) => {
-                                proto::parameter_information::Label::Simple(label)
-                            }
-                            lsp::ParameterLabel::LabelOffsets(offsets) => {
-                                proto::parameter_information::Label::LabelOffsets(
-                                    proto::LabelOffsets {
-                                        start: offsets[0],
-                                        end: offsets[1],
-                                    },
-                                )
-                            }
-                        }),
-                        documentation: parameter_info.documentation.map(lsp_to_proto_documentation),
-                    })
-                    .collect(),
-                active_parameter: signature.active_parameter,
-            })
-            .collect(),
-        active_signature: lsp_help.active_signature,
-        active_parameter: lsp_help.active_parameter,
-    }
-}
-
-fn lsp_to_proto_documentation(documentation: lsp::Documentation) -> proto::Documentation {
-    proto::Documentation {
-        content: Some(match documentation {
-            lsp::Documentation::String(string) => proto::documentation::Content::Value(string),
-            lsp::Documentation::MarkupContent(content) => {
-                proto::documentation::Content::MarkupContent(proto::MarkupContent {
-                    is_markdown: matches!(content.kind, lsp::MarkupKind::Markdown),
-                    value: content.value,
-                })
-            }
-        }),
-    }
-}
-
-pub fn proto_to_lsp_signature(proto_help: proto::SignatureHelp) -> lsp::SignatureHelp {
-    lsp::SignatureHelp {
-        signatures: proto_help
-            .signatures
-            .into_iter()
-            .map(|signature| lsp::SignatureInformation {
-                label: signature.label,
-                documentation: signature.documentation.and_then(proto_to_lsp_documentation),
-                parameters: Some(
-                    signature
-                        .parameters
-                        .into_iter()
-                        .filter_map(|parameter_info| {
-                            Some(lsp::ParameterInformation {
-                                label: match parameter_info.label? {
-                                    proto::parameter_information::Label::Simple(string) => {
-                                        lsp::ParameterLabel::Simple(string)
-                                    }
-                                    proto::parameter_information::Label::LabelOffsets(offsets) => {
-                                        lsp::ParameterLabel::LabelOffsets([
-                                            offsets.start,
-                                            offsets.end,
-                                        ])
-                                    }
-                                },
-                                documentation: parameter_info
-                                    .documentation
-                                    .and_then(proto_to_lsp_documentation),
-                            })
-                        })
-                        .collect(),
-                ),
-                active_parameter: signature.active_parameter,
-            })
-            .collect(),
-        active_signature: proto_help.active_signature,
-        active_parameter: proto_help.active_parameter,
-    }
-}
-
-fn proto_to_lsp_documentation(documentation: proto::Documentation) -> Option<lsp::Documentation> {
-    {
-        Some(match documentation.content? {
-            documentation::Content::Value(string) => lsp::Documentation::String(string),
-            documentation::Content::MarkupContent(markup) => {
-                lsp::Documentation::MarkupContent(if markup.is_markdown {
-                    lsp::MarkupContent {
-                        kind: lsp::MarkupKind::Markdown,
-                        value: markup.value,
-                    }
-                } else {
-                    lsp::MarkupContent {
-                        kind: lsp::MarkupKind::PlainText,
-                        value: markup.value,
-                    }
-                })
-            }
-        })
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use gpui::{FontWeight, HighlightStyle, SharedString, TestAppContext};
-    use lsp::{Documentation, MarkupContent, MarkupKind};
-
-    use crate::lsp_command::signature_help::SignatureHelp;
-
-    fn current_parameter() -> HighlightStyle {
-        HighlightStyle {
-            font_weight: Some(FontWeight::EXTRA_BOLD),
-            ..Default::default()
-        }
-    }
-
-    #[gpui::test]
-    fn test_create_signature_help_markdown_string_1(cx: &mut TestAppContext) {
-        let signature_help = lsp::SignatureHelp {
-            signatures: vec![lsp::SignatureInformation {
-                label: "fn test(foo: u8, bar: &str)".to_string(),
-                documentation: Some(Documentation::String(
-                    "This is a test documentation".to_string(),
-                )),
-                parameters: Some(vec![
-                    lsp::ParameterInformation {
-                        label: lsp::ParameterLabel::Simple("foo: u8".to_string()),
-                        documentation: None,
-                    },
-                    lsp::ParameterInformation {
-                        label: lsp::ParameterLabel::Simple("bar: &str".to_string()),
-                        documentation: None,
-                    },
-                ]),
-                active_parameter: None,
-            }],
-            active_signature: Some(0),
-            active_parameter: Some(0),
-        };
-        let maybe_markdown = cx.update(|cx| SignatureHelp::new(signature_help, None, None, cx));
-        assert!(maybe_markdown.is_some());
-
-        let markdown = maybe_markdown.unwrap();
-        let signature = markdown.signatures[markdown.active_signature].clone();
-        let markdown = (signature.label, signature.highlights);
-        assert_eq!(
-            markdown,
-            (
-                SharedString::new("fn test(foo: u8, bar: &str)"),
-                vec![(8..15, current_parameter())]
-            )
-        );
-        assert_eq!(
-            signature
-                .documentation
-                .unwrap()
-                .update(cx, |documentation, _| documentation.source().to_owned()),
-            "This is a test documentation",
-        )
-    }
-
-    #[gpui::test]
-    fn test_create_signature_help_markdown_string_2(cx: &mut TestAppContext) {
-        let signature_help = lsp::SignatureHelp {
-            signatures: vec![lsp::SignatureInformation {
-                label: "fn test(foo: u8, bar: &str)".to_string(),
-                documentation: Some(Documentation::MarkupContent(MarkupContent {
-                    kind: MarkupKind::Markdown,
-                    value: "This is a test documentation".to_string(),
-                })),
-                parameters: Some(vec![
-                    lsp::ParameterInformation {
-                        label: lsp::ParameterLabel::Simple("foo: u8".to_string()),
-                        documentation: None,
-                    },
-                    lsp::ParameterInformation {
-                        label: lsp::ParameterLabel::Simple("bar: &str".to_string()),
-                        documentation: None,
-                    },
-                ]),
-                active_parameter: None,
-            }],
-            active_signature: Some(0),
-            active_parameter: Some(1),
-        };
-        let maybe_markdown = cx.update(|cx| SignatureHelp::new(signature_help, None, None, cx));
-        assert!(maybe_markdown.is_some());
-
-        let markdown = maybe_markdown.unwrap();
-        let signature = markdown.signatures[markdown.active_signature].clone();
-        let markdown = (signature.label, signature.highlights);
-        assert_eq!(
-            markdown,
-            (
-                SharedString::new("fn test(foo: u8, bar: &str)"),
-                vec![(17..26, current_parameter())]
-            )
-        );
-        assert_eq!(
-            signature
-                .documentation
-                .unwrap()
-                .update(cx, |documentation, _| documentation.source().to_owned()),
-            "This is a test documentation",
-        )
-    }
-
-    #[gpui::test]
-    fn test_create_signature_help_markdown_string_3(cx: &mut TestAppContext) {
-        let signature_help = lsp::SignatureHelp {
-            signatures: vec![
-                lsp::SignatureInformation {
-                    label: "fn test1(foo: u8, bar: &str)".to_string(),
-                    documentation: None,
-                    parameters: Some(vec![
-                        lsp::ParameterInformation {
-                            label: lsp::ParameterLabel::Simple("foo: u8".to_string()),
-                            documentation: None,
-                        },
-                        lsp::ParameterInformation {
-                            label: lsp::ParameterLabel::Simple("bar: &str".to_string()),
-                            documentation: None,
-                        },
-                    ]),
-                    active_parameter: None,
-                },
-                lsp::SignatureInformation {
-                    label: "fn test2(hoge: String, fuga: bool)".to_string(),
-                    documentation: None,
-                    parameters: Some(vec![
-                        lsp::ParameterInformation {
-                            label: lsp::ParameterLabel::Simple("hoge: String".to_string()),
-                            documentation: None,
-                        },
-                        lsp::ParameterInformation {
-                            label: lsp::ParameterLabel::Simple("fuga: bool".to_string()),
-                            documentation: None,
-                        },
-                    ]),
-                    active_parameter: None,
-                },
-            ],
-            active_signature: Some(0),
-            active_parameter: Some(0),
-        };
-        let maybe_markdown = cx.update(|cx| SignatureHelp::new(signature_help, None, None, cx));
-        assert!(maybe_markdown.is_some());
-
-        let markdown = maybe_markdown.unwrap();
-        let signature = markdown.signatures[markdown.active_signature].clone();
-        let markdown = (signature.label, signature.highlights);
-        assert_eq!(
-            markdown,
-            (
-                SharedString::new("fn test1(foo: u8, bar: &str)"),
-                vec![(9..16, current_parameter())]
-            )
-        );
-    }
-
-    #[gpui::test]
-    fn test_create_signature_help_markdown_string_4(cx: &mut TestAppContext) {
-        let signature_help = lsp::SignatureHelp {
-            signatures: vec![
-                lsp::SignatureInformation {
-                    label: "fn test1(foo: u8, bar: &str)".to_string(),
-                    documentation: None,
-                    parameters: Some(vec![
-                        lsp::ParameterInformation {
-                            label: lsp::ParameterLabel::Simple("foo: u8".to_string()),
-                            documentation: None,
-                        },
-                        lsp::ParameterInformation {
-                            label: lsp::ParameterLabel::Simple("bar: &str".to_string()),
-                            documentation: None,
-                        },
-                    ]),
-                    active_parameter: None,
-                },
-                lsp::SignatureInformation {
-                    label: "fn test2(hoge: String, fuga: bool)".to_string(),
-                    documentation: None,
-                    parameters: Some(vec![
-                        lsp::ParameterInformation {
-                            label: lsp::ParameterLabel::Simple("hoge: String".to_string()),
-                            documentation: None,
-                        },
-                        lsp::ParameterInformation {
-                            label: lsp::ParameterLabel::Simple("fuga: bool".to_string()),
-                            documentation: None,
-                        },
-                    ]),
-                    active_parameter: None,
-                },
-            ],
-            active_signature: Some(1),
-            active_parameter: Some(0),
-        };
-        let maybe_markdown = cx.update(|cx| SignatureHelp::new(signature_help, None, None, cx));
-        assert!(maybe_markdown.is_some());
-
-        let markdown = maybe_markdown.unwrap();
-        let signature = markdown.signatures[markdown.active_signature].clone();
-        let markdown = (signature.label, signature.highlights);
-        assert_eq!(
-            markdown,
-            (
-                SharedString::new("fn test2(hoge: String, fuga: bool)"),
-                vec![(9..21, current_parameter())]
-            )
-        );
-    }
-
-    #[gpui::test]
-    fn test_create_signature_help_markdown_string_5(cx: &mut TestAppContext) {
-        let signature_help = lsp::SignatureHelp {
-            signatures: vec![
-                lsp::SignatureInformation {
-                    label: "fn test1(foo: u8, bar: &str)".to_string(),
-                    documentation: None,
-                    parameters: Some(vec![
-                        lsp::ParameterInformation {
-                            label: lsp::ParameterLabel::Simple("foo: u8".to_string()),
-                            documentation: None,
-                        },
-                        lsp::ParameterInformation {
-                            label: lsp::ParameterLabel::Simple("bar: &str".to_string()),
-                            documentation: None,
-                        },
-                    ]),
-                    active_parameter: None,
-                },
-                lsp::SignatureInformation {
-                    label: "fn test2(hoge: String, fuga: bool)".to_string(),
-                    documentation: None,
-                    parameters: Some(vec![
-                        lsp::ParameterInformation {
-                            label: lsp::ParameterLabel::Simple("hoge: String".to_string()),
-                            documentation: None,
-                        },
-                        lsp::ParameterInformation {
-                            label: lsp::ParameterLabel::Simple("fuga: bool".to_string()),
-                            documentation: None,
-                        },
-                    ]),
-                    active_parameter: None,
-                },
-            ],
-            active_signature: Some(1),
-            active_parameter: Some(1),
-        };
-        let maybe_markdown = cx.update(|cx| SignatureHelp::new(signature_help, None, None, cx));
-        assert!(maybe_markdown.is_some());
-
-        let markdown = maybe_markdown.unwrap();
-        let signature = markdown.signatures[markdown.active_signature].clone();
-        let markdown = (signature.label, signature.highlights);
-        assert_eq!(
-            markdown,
-            (
-                SharedString::new("fn test2(hoge: String, fuga: bool)"),
-                vec![(23..33, current_parameter())]
-            )
-        );
-    }
-
-    #[gpui::test]
-    fn test_create_signature_help_markdown_string_6(cx: &mut TestAppContext) {
-        let signature_help = lsp::SignatureHelp {
-            signatures: vec![
-                lsp::SignatureInformation {
-                    label: "fn test1(foo: u8, bar: &str)".to_string(),
-                    documentation: None,
-                    parameters: Some(vec![
-                        lsp::ParameterInformation {
-                            label: lsp::ParameterLabel::Simple("foo: u8".to_string()),
-                            documentation: None,
-                        },
-                        lsp::ParameterInformation {
-                            label: lsp::ParameterLabel::Simple("bar: &str".to_string()),
-                            documentation: None,
-                        },
-                    ]),
-                    active_parameter: None,
-                },
-                lsp::SignatureInformation {
-                    label: "fn test2(hoge: String, fuga: bool)".to_string(),
-                    documentation: None,
-                    parameters: Some(vec![
-                        lsp::ParameterInformation {
-                            label: lsp::ParameterLabel::Simple("hoge: String".to_string()),
-                            documentation: None,
-                        },
-                        lsp::ParameterInformation {
-                            label: lsp::ParameterLabel::Simple("fuga: bool".to_string()),
-                            documentation: None,
-                        },
-                    ]),
-                    active_parameter: None,
-                },
-            ],
-            active_signature: Some(1),
-            active_parameter: None,
-        };
-        let maybe_markdown = cx.update(|cx| SignatureHelp::new(signature_help, None, None, cx));
-        assert!(maybe_markdown.is_some());
-
-        let markdown = maybe_markdown.unwrap();
-        let signature = markdown.signatures[markdown.active_signature].clone();
-        let markdown = (signature.label, signature.highlights);
-        assert_eq!(
-            markdown,
-            (
-                SharedString::new("fn test2(hoge: String, fuga: bool)"),
-                vec![(9..21, current_parameter())]
-            )
-        );
-    }
-
-    #[gpui::test]
-    fn test_create_signature_help_markdown_string_7(cx: &mut TestAppContext) {
-        let signature_help = lsp::SignatureHelp {
-            signatures: vec![
-                lsp::SignatureInformation {
-                    label: "fn test1(foo: u8, bar: &str)".to_string(),
-                    documentation: None,
-                    parameters: Some(vec![
-                        lsp::ParameterInformation {
-                            label: lsp::ParameterLabel::Simple("foo: u8".to_string()),
-                            documentation: None,
-                        },
-                        lsp::ParameterInformation {
-                            label: lsp::ParameterLabel::Simple("bar: &str".to_string()),
-                            documentation: None,
-                        },
-                    ]),
-                    active_parameter: None,
-                },
-                lsp::SignatureInformation {
-                    label: "fn test2(hoge: String, fuga: bool)".to_string(),
-                    documentation: None,
-                    parameters: Some(vec![
-                        lsp::ParameterInformation {
-                            label: lsp::ParameterLabel::Simple("hoge: String".to_string()),
-                            documentation: None,
-                        },
-                        lsp::ParameterInformation {
-                            label: lsp::ParameterLabel::Simple("fuga: bool".to_string()),
-                            documentation: None,
-                        },
-                    ]),
-                    active_parameter: None,
-                },
-                lsp::SignatureInformation {
-                    label: "fn test3(one: usize, two: u32)".to_string(),
-                    documentation: None,
-                    parameters: Some(vec![
-                        lsp::ParameterInformation {
-                            label: lsp::ParameterLabel::Simple("one: usize".to_string()),
-                            documentation: None,
-                        },
-                        lsp::ParameterInformation {
-                            label: lsp::ParameterLabel::Simple("two: u32".to_string()),
-                            documentation: None,
-                        },
-                    ]),
-                    active_parameter: None,
-                },
-            ],
-            active_signature: Some(2),
-            active_parameter: Some(1),
-        };
-        let maybe_markdown = cx.update(|cx| SignatureHelp::new(signature_help, None, None, cx));
-        assert!(maybe_markdown.is_some());
-
-        let markdown = maybe_markdown.unwrap();
-        let signature = markdown.signatures[markdown.active_signature].clone();
-        let markdown = (signature.label, signature.highlights);
-        assert_eq!(
-            markdown,
-            (
-                SharedString::new("fn test3(one: usize, two: u32)"),
-                vec![(21..29, current_parameter())]
-            )
-        );
-    }
-
-    #[gpui::test]
-    fn test_create_signature_help_markdown_string_8(cx: &mut TestAppContext) {
-        let signature_help = lsp::SignatureHelp {
-            signatures: vec![],
-            active_signature: None,
-            active_parameter: None,
-        };
-        let maybe_markdown = cx.update(|cx| SignatureHelp::new(signature_help, None, None, cx));
-        assert!(maybe_markdown.is_none());
-    }
-
-    #[gpui::test]
-    fn test_create_signature_help_markdown_string_9(cx: &mut TestAppContext) {
-        let signature_help = lsp::SignatureHelp {
-            signatures: vec![lsp::SignatureInformation {
-                label: "fn test(foo: u8, bar: &str)".to_string(),
-                documentation: None,
-                parameters: Some(vec![
-                    lsp::ParameterInformation {
-                        label: lsp::ParameterLabel::LabelOffsets([8, 15]),
-                        documentation: None,
-                    },
-                    lsp::ParameterInformation {
-                        label: lsp::ParameterLabel::LabelOffsets([17, 26]),
-                        documentation: None,
-                    },
-                ]),
-                active_parameter: None,
-            }],
-            active_signature: Some(0),
-            active_parameter: Some(0),
-        };
-        let maybe_markdown = cx.update(|cx| SignatureHelp::new(signature_help, None, None, cx));
-        assert!(maybe_markdown.is_some());
-
-        let markdown = maybe_markdown.unwrap();
-        let signature = markdown.signatures[markdown.active_signature].clone();
-        let markdown = (signature.label, signature.highlights);
-        assert_eq!(
-            markdown,
-            (
-                SharedString::new("fn test(foo: u8, bar: &str)"),
-                vec![(8..15, current_parameter())]
-            )
-        );
-    }
-
-    #[gpui::test]
-    fn test_parameter_documentation(cx: &mut TestAppContext) {
-        let signature_help = lsp::SignatureHelp {
-            signatures: vec![lsp::SignatureInformation {
-                label: "fn test(foo: u8, bar: &str)".to_string(),
-                documentation: Some(Documentation::String(
-                    "This is a test documentation".to_string(),
-                )),
-                parameters: Some(vec![
-                    lsp::ParameterInformation {
-                        label: lsp::ParameterLabel::Simple("foo: u8".to_string()),
-                        documentation: Some(Documentation::String("The foo parameter".to_string())),
-                    },
-                    lsp::ParameterInformation {
-                        label: lsp::ParameterLabel::Simple("bar: &str".to_string()),
-                        documentation: Some(Documentation::String("The bar parameter".to_string())),
-                    },
-                ]),
-                active_parameter: None,
-            }],
-            active_signature: Some(0),
-            active_parameter: Some(0),
-        };
-        let maybe_signature_help =
-            cx.update(|cx| SignatureHelp::new(signature_help, None, None, cx));
-        assert!(maybe_signature_help.is_some());
-
-        let signature_help = maybe_signature_help.unwrap();
-        let signature = &signature_help.signatures[signature_help.active_signature];
-
-        // Check that parameter documentation is extracted
-        assert_eq!(signature.parameters.len(), 2);
-        assert_eq!(
-            signature.parameters[0]
-                .documentation
-                .as_ref()
-                .unwrap()
-                .update(cx, |documentation, _| documentation.source().to_owned()),
-            "The foo parameter",
-        );
-        assert_eq!(
-            signature.parameters[1]
-                .documentation
-                .as_ref()
-                .unwrap()
-                .update(cx, |documentation, _| documentation.source().to_owned()),
-            "The bar parameter",
-        );
-
-        // Check that the active parameter is correct
-        assert_eq!(signature.active_parameter, Some(0));
-    }
-
-    #[gpui::test]
-    fn test_create_signature_help_implements_utf16_spec(cx: &mut TestAppContext) {
-        let signature_help = lsp::SignatureHelp {
-            signatures: vec![lsp::SignatureInformation {
-                label: "fn test(🦀: u8, 🦀: &str)".to_string(),
-                documentation: None,
-                parameters: Some(vec![
-                    lsp::ParameterInformation {
-                        label: lsp::ParameterLabel::LabelOffsets([8, 10]),
-                        documentation: None,
-                    },
-                    lsp::ParameterInformation {
-                        label: lsp::ParameterLabel::LabelOffsets([16, 18]),
-                        documentation: None,
-                    },
-                ]),
-                active_parameter: None,
-            }],
-            active_signature: Some(0),
-            active_parameter: Some(0),
-        };
-        let signature_help = cx.update(|cx| SignatureHelp::new(signature_help, None, None, cx));
-        assert!(signature_help.is_some());
-
-        let markdown = signature_help.unwrap();
-        let signature = markdown.signatures[markdown.active_signature].clone();
-        let markdown = (signature.label, signature.highlights);
-        assert_eq!(
-            markdown,
-            (
-                SharedString::new("fn test(🦀: u8, 🦀: &str)"),
-                vec![(8..12, current_parameter())]
-            )
-        );
-    }
-}
diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs
deleted file mode 100644
index a8c639fe59..0000000000
--- a/crates/project/src/lsp_store.rs
+++ /dev/null
@@ -1,14274 +0,0 @@
-//! LSP store provides unified access to the language server protocol.
-//! The consumers of LSP store can interact with language servers without knowing exactly which language server they're interacting with.
-//!
-//! # Local/Remote LSP Stores
-//! This module is split up into three distinct parts:
-//! - [`LocalLspStore`], which is ran on the host machine (either project host or SSH host), that manages the lifecycle of language servers.
-//! - [`RemoteLspStore`], which is ran on the remote machine (project guests) which is mostly about passing through the requests via RPC.
-//!   The remote stores don't really care about which language server they're running against - they don't usually get to decide which language server is going to responsible for handling their request.
-//! - [`LspStore`], which unifies the two under one consistent interface for interacting with language servers.
-//!
-//! Most of the interesting work happens at the local layer, as bulk of the complexity is with managing the lifecycle of language servers. The actual implementation of the LSP protocol is handled by [`lsp`] crate.
-pub mod clangd_ext;
-pub mod json_language_server_ext;
-pub mod log_store;
-pub mod lsp_ext_command;
-pub mod rust_analyzer_ext;
-pub mod vue_language_server_ext;
-
-mod inlay_hint_cache;
-
-use self::inlay_hint_cache::BufferInlayHints;
-use crate::{
-    CodeAction, ColorPresentation, Completion, CompletionDisplayOptions, CompletionResponse,
-    CompletionSource, CoreCompletion, DocumentColor, Hover, InlayHint, InlayId, LocationLink,
-    LspAction, LspPullDiagnostics, ManifestProvidersStore, Project, ProjectItem, ProjectPath,
-    ProjectTransaction, PulledDiagnostics, ResolveState, Symbol,
-    buffer_store::{BufferStore, BufferStoreEvent},
-    environment::ProjectEnvironment,
-    lsp_command::{self, *},
-    lsp_store::{
-        self,
-        log_store::{GlobalLogStore, LanguageServerKind},
-    },
-    manifest_tree::{
-        LanguageServerTree, LanguageServerTreeNode, LaunchDisposition, ManifestQueryDelegate,
-        ManifestTree,
-    },
-    prettier_store::{self, PrettierStore, PrettierStoreEvent},
-    project_settings::{LspSettings, ProjectSettings},
-    toolchain_store::{LocalToolchainStore, ToolchainStoreEvent},
-    worktree_store::{WorktreeStore, WorktreeStoreEvent},
-    yarn::YarnPathStore,
-};
-use anyhow::{Context as _, Result, anyhow};
-use async_trait::async_trait;
-use client::{TypedEnvelope, proto};
-use clock::Global;
-use collections::{BTreeMap, BTreeSet, HashMap, HashSet, btree_map};
-use futures::{
-    AsyncWriteExt, Future, FutureExt, StreamExt,
-    future::{Either, Shared, join_all, pending, select},
-    select, select_biased,
-    stream::FuturesUnordered,
-};
-use globset::{Glob, GlobBuilder, GlobMatcher, GlobSet, GlobSetBuilder};
-use gpui::{
-    App, AppContext, AsyncApp, Context, Entity, EventEmitter, PromptLevel, SharedString, Task,
-    WeakEntity,
-};
-use http_client::HttpClient;
-use itertools::Itertools as _;
-use language::{
-    Bias, BinaryStatus, Buffer, BufferRow, BufferSnapshot, CachedLspAdapter, CodeLabel, Diagnostic,
-    DiagnosticEntry, DiagnosticSet, DiagnosticSourceKind, Diff, File as _, Language, LanguageName,
-    LanguageRegistry, LocalFile, LspAdapter, LspAdapterDelegate, LspInstaller, ManifestDelegate,
-    ManifestName, Patch, PointUtf16, TextBufferSnapshot, ToOffset, ToPointUtf16, Toolchain,
-    Transaction, Unclipped,
-    language_settings::{FormatOnSave, Formatter, LanguageSettings, language_settings},
-    point_to_lsp,
-    proto::{
-        deserialize_anchor, deserialize_lsp_edit, deserialize_version, serialize_anchor,
-        serialize_lsp_edit, serialize_version,
-    },
-    range_from_lsp, range_to_lsp,
-    row_chunk::RowChunk,
-};
-use lsp::{
-    AdapterServerCapabilities, CodeActionKind, CompletionContext, CompletionOptions,
-    DiagnosticServerCapabilities, DiagnosticSeverity, DiagnosticTag,
-    DidChangeWatchedFilesRegistrationOptions, Edit, FileOperationFilter, FileOperationPatternKind,
-    FileOperationRegistrationOptions, FileRename, FileSystemWatcher, LSP_REQUEST_TIMEOUT,
-    LanguageServer, LanguageServerBinary, LanguageServerBinaryOptions, LanguageServerId,
-    LanguageServerName, LanguageServerSelector, LspRequestFuture, MessageActionItem, MessageType,
-    OneOf, RenameFilesParams, SymbolKind, TextDocumentSyncSaveOptions, TextEdit, Uri,
-    WillRenameFiles, WorkDoneProgressCancelParams, WorkspaceFolder, notification::DidRenameFiles,
-};
-use node_runtime::read_package_installed_version;
-use parking_lot::Mutex;
-use postage::{mpsc, sink::Sink, stream::Stream, watch};
-use rand::prelude::*;
-use rpc::{
-    AnyProtoClient, ErrorCode, ErrorExt as _,
-    proto::{LspRequestId, LspRequestMessage as _},
-};
-use serde::Serialize;
-use serde_json::Value;
-use settings::{Settings, SettingsLocation, SettingsStore};
-use sha2::{Digest, Sha256};
-use smol::channel::Sender;
-use snippet::Snippet;
-use std::{
-    any::TypeId,
-    borrow::Cow,
-    cell::RefCell,
-    cmp::{Ordering, Reverse},
-    convert::TryInto,
-    ffi::OsStr,
-    future::ready,
-    iter, mem,
-    ops::{ControlFlow, Range},
-    path::{self, Path, PathBuf},
-    pin::pin,
-    rc::Rc,
-    sync::{
-        Arc,
-        atomic::{self, AtomicUsize},
-    },
-    time::{Duration, Instant},
-    vec,
-};
-use sum_tree::Dimensions;
-use text::{Anchor, BufferId, LineEnding, OffsetRangeExt, ToPoint as _};
-
-use util::{
-    ConnectionResult, ResultExt as _, debug_panic, defer, maybe, merge_json_value_into,
-    paths::{PathStyle, SanitizedPath},
-    post_inc,
-    rel_path::RelPath,
-};
-
-pub use fs::*;
-pub use language::Location;
-pub use lsp_store::inlay_hint_cache::{CacheInlayHints, InvalidationStrategy};
-#[cfg(any(test, feature = "test-support"))]
-pub use prettier::FORMAT_SUFFIX as TEST_PRETTIER_FORMAT_SUFFIX;
-pub use worktree::{
-    Entry, EntryKind, FS_WATCH_LATENCY, File, LocalWorktree, PathChange, ProjectEntryId,
-    UpdatedEntriesSet, UpdatedGitRepositoriesSet, Worktree, WorktreeId, WorktreeSettings,
-};
-
-const SERVER_LAUNCHING_BEFORE_SHUTDOWN_TIMEOUT: Duration = Duration::from_secs(5);
-pub const SERVER_PROGRESS_THROTTLE_TIMEOUT: Duration = Duration::from_millis(100);
-const WORKSPACE_DIAGNOSTICS_TOKEN_START: &str = "id:";
-const SERVER_DOWNLOAD_TIMEOUT: Duration = Duration::from_secs(10);
-
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize)]
-pub enum ProgressToken {
-    Number(i32),
-    String(SharedString),
-}
-
-impl std::fmt::Display for ProgressToken {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Self::Number(number) => write!(f, "{number}"),
-            Self::String(string) => write!(f, "{string}"),
-        }
-    }
-}
-
-impl ProgressToken {
-    fn from_lsp(value: lsp::NumberOrString) -> Self {
-        match value {
-            lsp::NumberOrString::Number(number) => Self::Number(number),
-            lsp::NumberOrString::String(string) => Self::String(SharedString::new(string)),
-        }
-    }
-
-    fn to_lsp(&self) -> lsp::NumberOrString {
-        match self {
-            Self::Number(number) => lsp::NumberOrString::Number(*number),
-            Self::String(string) => lsp::NumberOrString::String(string.to_string()),
-        }
-    }
-
-    fn from_proto(value: proto::ProgressToken) -> Option<Self> {
-        Some(match value.value? {
-            proto::progress_token::Value::Number(number) => Self::Number(number),
-            proto::progress_token::Value::String(string) => Self::String(SharedString::new(string)),
-        })
-    }
-
-    fn to_proto(&self) -> proto::ProgressToken {
-        proto::ProgressToken {
-            value: Some(match self {
-                Self::Number(number) => proto::progress_token::Value::Number(*number),
-                Self::String(string) => proto::progress_token::Value::String(string.to_string()),
-            }),
-        }
-    }
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum FormatTrigger {
-    Save,
-    Manual,
-}
-
-pub enum LspFormatTarget {
-    Buffers,
-    Ranges(BTreeMap<BufferId, Vec<Range<Anchor>>>),
-}
-
-#[derive(Clone, PartialEq, Eq, Hash)]
-pub struct OpenLspBufferHandle(Entity<OpenLspBuffer>);
-
-struct OpenLspBuffer(Entity<Buffer>);
-
-impl FormatTrigger {
-    fn from_proto(value: i32) -> FormatTrigger {
-        match value {
-            0 => FormatTrigger::Save,
-            1 => FormatTrigger::Manual,
-            _ => FormatTrigger::Save,
-        }
-    }
-}
-
-#[derive(Clone)]
-struct UnifiedLanguageServer {
-    id: LanguageServerId,
-    project_roots: HashSet<Arc<RelPath>>,
-}
-
-#[derive(Clone, Debug, Hash, PartialEq, Eq)]
-struct LanguageServerSeed {
-    worktree_id: WorktreeId,
-    name: LanguageServerName,
-    toolchain: Option<Toolchain>,
-    settings: Arc<LspSettings>,
-}
-
-#[derive(Debug)]
-pub struct DocumentDiagnosticsUpdate<'a, D> {
-    pub diagnostics: D,
-    pub result_id: Option<SharedString>,
-    pub registration_id: Option<SharedString>,
-    pub server_id: LanguageServerId,
-    pub disk_based_sources: Cow<'a, [String]>,
-}
-
-pub struct DocumentDiagnostics {
-    diagnostics: Vec<DiagnosticEntry<Unclipped<PointUtf16>>>,
-    document_abs_path: PathBuf,
-    version: Option<i32>,
-}
-
-#[derive(Default, Debug)]
-struct DynamicRegistrations {
-    did_change_watched_files: HashMap<String, Vec<FileSystemWatcher>>,
-    diagnostics: HashMap<Option<String>, DiagnosticServerCapabilities>,
-}
-
-pub struct LocalLspStore {
-    weak: WeakEntity<LspStore>,
-    worktree_store: Entity<WorktreeStore>,
-    toolchain_store: Entity<LocalToolchainStore>,
-    http_client: Arc<dyn HttpClient>,
-    environment: Entity<ProjectEnvironment>,
-    fs: Arc<dyn Fs>,
-    languages: Arc<LanguageRegistry>,
-    language_server_ids: HashMap<LanguageServerSeed, UnifiedLanguageServer>,
-    yarn: Entity<YarnPathStore>,
-    pub language_servers: HashMap<LanguageServerId, LanguageServerState>,
-    buffers_being_formatted: HashSet<BufferId>,
-    last_workspace_edits_by_language_server: HashMap<LanguageServerId, ProjectTransaction>,
-    language_server_watched_paths: HashMap<LanguageServerId, LanguageServerWatchedPaths>,
-    watched_manifest_filenames: HashSet<ManifestName>,
-    language_server_paths_watched_for_rename:
-        HashMap<LanguageServerId, RenamePathsWatchedForServer>,
-    language_server_dynamic_registrations: HashMap<LanguageServerId, DynamicRegistrations>,
-    supplementary_language_servers:
-        HashMap<LanguageServerId, (LanguageServerName, Arc<LanguageServer>)>,
-    prettier_store: Entity<PrettierStore>,
-    next_diagnostic_group_id: usize,
-    diagnostics: HashMap<
-        WorktreeId,
-        HashMap<
-            Arc<RelPath>,
-            Vec<(
-                LanguageServerId,
-                Vec<DiagnosticEntry<Unclipped<PointUtf16>>>,
-            )>,
-        >,
-    >,
-    buffer_snapshots: HashMap<BufferId, HashMap<LanguageServerId, Vec<LspBufferSnapshot>>>, // buffer_id -> server_id -> vec of snapshots
-    _subscription: gpui::Subscription,
-    lsp_tree: LanguageServerTree,
-    registered_buffers: HashMap<BufferId, usize>,
-    buffers_opened_in_servers: HashMap<BufferId, HashSet<LanguageServerId>>,
-    buffer_pull_diagnostics_result_ids: HashMap<
-        LanguageServerId,
-        HashMap<Option<SharedString>, HashMap<PathBuf, Option<SharedString>>>,
-    >,
-    workspace_pull_diagnostics_result_ids: HashMap<
-        LanguageServerId,
-        HashMap<Option<SharedString>, HashMap<PathBuf, Option<SharedString>>>,
-    >,
-}
-
-impl LocalLspStore {
-    /// Returns the running language server for the given ID. Note if the language server is starting, it will not be returned.
-    pub fn running_language_server_for_id(
-        &self,
-        id: LanguageServerId,
-    ) -> Option<&Arc<LanguageServer>> {
-        let language_server_state = self.language_servers.get(&id)?;
-
-        match language_server_state {
-            LanguageServerState::Running { server, .. } => Some(server),
-            LanguageServerState::Starting { .. } => None,
-        }
-    }
-
-    fn get_or_insert_language_server(
-        &mut self,
-        worktree_handle: &Entity<Worktree>,
-        delegate: Arc<LocalLspAdapterDelegate>,
-        disposition: &Arc<LaunchDisposition>,
-        language_name: &LanguageName,
-        cx: &mut App,
-    ) -> LanguageServerId {
-        let key = LanguageServerSeed {
-            worktree_id: worktree_handle.read(cx).id(),
-            name: disposition.server_name.clone(),
-            settings: disposition.settings.clone(),
-            toolchain: disposition.toolchain.clone(),
-        };
-        if let Some(state) = self.language_server_ids.get_mut(&key) {
-            state.project_roots.insert(disposition.path.path.clone());
-            state.id
-        } else {
-            let adapter = self
-                .languages
-                .lsp_adapters(language_name)
-                .into_iter()
-                .find(|adapter| adapter.name() == disposition.server_name)
-                .expect("To find LSP adapter");
-            let new_language_server_id = self.start_language_server(
-                worktree_handle,
-                delegate,
-                adapter,
-                disposition.settings.clone(),
-                key.clone(),
-                cx,
-            );
-            if let Some(state) = self.language_server_ids.get_mut(&key) {
-                state.project_roots.insert(disposition.path.path.clone());
-            } else {
-                debug_assert!(
-                    false,
-                    "Expected `start_language_server` to ensure that `key` exists in a map"
-                );
-            }
-            new_language_server_id
-        }
-    }
-
-    fn start_language_server(
-        &mut self,
-        worktree_handle: &Entity<Worktree>,
-        delegate: Arc<LocalLspAdapterDelegate>,
-        adapter: Arc<CachedLspAdapter>,
-        settings: Arc<LspSettings>,
-        key: LanguageServerSeed,
-        cx: &mut App,
-    ) -> LanguageServerId {
-        let worktree = worktree_handle.read(cx);
-
-        let root_path = worktree.abs_path();
-        let toolchain = key.toolchain.clone();
-        let override_options = settings.initialization_options.clone();
-
-        let stderr_capture = Arc::new(Mutex::new(Some(String::new())));
-
-        let server_id = self.languages.next_language_server_id();
-        log::trace!(
-            "attempting to start language server {:?}, path: {root_path:?}, id: {server_id}",
-            adapter.name.0
-        );
-
-        let binary = self.get_language_server_binary(
-            adapter.clone(),
-            settings,
-            toolchain.clone(),
-            delegate.clone(),
-            true,
-            cx,
-        );
-        let pending_workspace_folders: Arc<Mutex<BTreeSet<Uri>>> = Default::default();
-
-        let pending_server = cx.spawn({
-            let adapter = adapter.clone();
-            let server_name = adapter.name.clone();
-            let stderr_capture = stderr_capture.clone();
-            #[cfg(any(test, feature = "test-support"))]
-            let lsp_store = self.weak.clone();
-            let pending_workspace_folders = pending_workspace_folders.clone();
-            async move |cx| {
-                let binary = binary.await?;
-                #[cfg(any(test, feature = "test-support"))]
-                if let Some(server) = lsp_store
-                    .update(&mut cx.clone(), |this, cx| {
-                        this.languages.create_fake_language_server(
-                            server_id,
-                            &server_name,
-                            binary.clone(),
-                            &mut cx.to_async(),
-                        )
-                    })
-                    .ok()
-                    .flatten()
-                {
-                    return Ok(server);
-                }
-
-                let code_action_kinds = adapter.code_action_kinds();
-                lsp::LanguageServer::new(
-                    stderr_capture,
-                    server_id,
-                    server_name,
-                    binary,
-                    &root_path,
-                    code_action_kinds,
-                    Some(pending_workspace_folders),
-                    cx,
-                )
-            }
-        });
-
-        let startup = {
-            let server_name = adapter.name.0.clone();
-            let delegate = delegate as Arc<dyn LspAdapterDelegate>;
-            let key = key.clone();
-            let adapter = adapter.clone();
-            let lsp_store = self.weak.clone();
-            let pending_workspace_folders = pending_workspace_folders.clone();
-
-            let pull_diagnostics = ProjectSettings::get_global(cx)
-                .diagnostics
-                .lsp_pull_diagnostics
-                .enabled;
-            cx.spawn(async move |cx| {
-                let result = async {
-                    let language_server = pending_server.await?;
-
-                    let workspace_config = Self::workspace_configuration_for_adapter(
-                        adapter.adapter.clone(),
-                        &delegate,
-                        toolchain,
-                        None,
-                        cx,
-                    )
-                    .await?;
-
-                    let mut initialization_options = Self::initialization_options_for_adapter(
-                        adapter.adapter.clone(),
-                        &delegate,
-                    )
-                    .await?;
-
-                    match (&mut initialization_options, override_options) {
-                        (Some(initialization_options), Some(override_options)) => {
-                            merge_json_value_into(override_options, initialization_options);
-                        }
-                        (None, override_options) => initialization_options = override_options,
-                        _ => {}
-                    }
-
-                    let initialization_params = cx.update(|cx| {
-                        let mut params =
-                            language_server.default_initialize_params(pull_diagnostics, cx);
-                        params.initialization_options = initialization_options;
-                        adapter.adapter.prepare_initialize_params(params, cx)
-                    })??;
-
-                    Self::setup_lsp_messages(
-                        lsp_store.clone(),
-                        &language_server,
-                        delegate.clone(),
-                        adapter.clone(),
-                    );
-
-                    let did_change_configuration_params = lsp::DidChangeConfigurationParams {
-                        settings: workspace_config,
-                    };
-                    let language_server = cx
-                        .update(|cx| {
-                            language_server.initialize(
-                                initialization_params,
-                                Arc::new(did_change_configuration_params.clone()),
-                                cx,
-                            )
-                        })?
-                        .await
-                        .inspect_err(|_| {
-                            if let Some(lsp_store) = lsp_store.upgrade() {
-                                lsp_store
-                                    .update(cx, |lsp_store, cx| {
-                                        lsp_store.cleanup_lsp_data(server_id);
-                                        cx.emit(LspStoreEvent::LanguageServerRemoved(server_id))
-                                    })
-                                    .ok();
-                            }
-                        })?;
-
-                    language_server.notify::<lsp::notification::DidChangeConfiguration>(
-                        did_change_configuration_params,
-                    )?;
-
-                    anyhow::Ok(language_server)
-                }
-                .await;
-
-                match result {
-                    Ok(server) => {
-                        lsp_store
-                            .update(cx, |lsp_store, cx| {
-                                lsp_store.insert_newly_running_language_server(
-                                    adapter,
-                                    server.clone(),
-                                    server_id,
-                                    key,
-                                    pending_workspace_folders,
-                                    cx,
-                                );
-                            })
-                            .ok();
-                        stderr_capture.lock().take();
-                        Some(server)
-                    }
-
-                    Err(err) => {
-                        let log = stderr_capture.lock().take().unwrap_or_default();
-                        delegate.update_status(
-                            adapter.name(),
-                            BinaryStatus::Failed {
-                                error: if log.is_empty() {
-                                    format!("{err:#}")
-                                } else {
-                                    format!("{err:#}\n-- stderr --\n{log}")
-                                },
-                            },
-                        );
-                        log::error!("Failed to start language server {server_name:?}: {err:?}");
-                        if !log.is_empty() {
-                            log::error!("server stderr: {log}");
-                        }
-                        None
-                    }
-                }
-            })
-        };
-        let state = LanguageServerState::Starting {
-            startup,
-            pending_workspace_folders,
-        };
-
-        self.languages
-            .update_lsp_binary_status(adapter.name(), BinaryStatus::Starting);
-
-        self.language_servers.insert(server_id, state);
-        self.language_server_ids
-            .entry(key)
-            .or_insert(UnifiedLanguageServer {
-                id: server_id,
-                project_roots: Default::default(),
-            });
-        server_id
-    }
-
-    fn get_language_server_binary(
-        &self,
-        adapter: Arc<CachedLspAdapter>,
-        settings: Arc<LspSettings>,
-        toolchain: Option<Toolchain>,
-        delegate: Arc<dyn LspAdapterDelegate>,
-        allow_binary_download: bool,
-        cx: &mut App,
-    ) -> Task<Result<LanguageServerBinary>> {
-        if let Some(settings) = &settings.binary
-            && let Some(path) = settings.path.as_ref().map(PathBuf::from)
-        {
-            let settings = settings.clone();
-
-            return cx.background_spawn(async move {
-                let mut env = delegate.shell_env().await;
-                env.extend(settings.env.unwrap_or_default());
-
-                Ok(LanguageServerBinary {
-                    path: delegate.resolve_executable_path(path),
-                    env: Some(env),
-                    arguments: settings
-                        .arguments
-                        .unwrap_or_default()
-                        .iter()
-                        .map(Into::into)
-                        .collect(),
-                })
-            });
-        }
-        let lsp_binary_options = LanguageServerBinaryOptions {
-            allow_path_lookup: !settings
-                .binary
-                .as_ref()
-                .and_then(|b| b.ignore_system_version)
-                .unwrap_or_default(),
-            allow_binary_download,
-            pre_release: settings
-                .fetch
-                .as_ref()
-                .and_then(|f| f.pre_release)
-                .unwrap_or(false),
-        };
-
-        cx.spawn(async move |cx| {
-            let (existing_binary, maybe_download_binary) = adapter
-                .clone()
-                .get_language_server_command(delegate.clone(), toolchain, lsp_binary_options, cx)
-                .await
-                .await;
-
-            delegate.update_status(adapter.name.clone(), BinaryStatus::None);
-
-            let mut binary = match (existing_binary, maybe_download_binary) {
-                (binary, None) => binary?,
-                (Err(_), Some(downloader)) => downloader.await?,
-                (Ok(existing_binary), Some(downloader)) => {
-                    let mut download_timeout = cx
-                        .background_executor()
-                        .timer(SERVER_DOWNLOAD_TIMEOUT)
-                        .fuse();
-                    let mut downloader = downloader.fuse();
-                    futures::select! {
-                        _ = download_timeout => {
-                            // Return existing binary and kick the existing work to the background.
-                            cx.spawn(async move |_| downloader.await).detach();
-                            Ok(existing_binary)
-                        },
-                        downloaded_or_existing_binary = downloader => {
-                            // If download fails, this results in the existing binary.
-                            downloaded_or_existing_binary
-                        }
-                    }?
-                }
-            };
-            let mut shell_env = delegate.shell_env().await;
-
-            shell_env.extend(binary.env.unwrap_or_default());
-
-            if let Some(settings) = settings.binary.as_ref() {
-                if let Some(arguments) = &settings.arguments {
-                    binary.arguments = arguments.iter().map(Into::into).collect();
-                }
-                if let Some(env) = &settings.env {
-                    shell_env.extend(env.iter().map(|(k, v)| (k.clone(), v.clone())));
-                }
-            }
-
-            binary.env = Some(shell_env);
-            Ok(binary)
-        })
-    }
-
-    fn setup_lsp_messages(
-        lsp_store: WeakEntity<LspStore>,
-        language_server: &LanguageServer,
-        delegate: Arc<dyn LspAdapterDelegate>,
-        adapter: Arc<CachedLspAdapter>,
-    ) {
-        let name = language_server.name();
-        let server_id = language_server.server_id();
-        language_server
-            .on_notification::<lsp::notification::PublishDiagnostics, _>({
-                let adapter = adapter.clone();
-                let this = lsp_store.clone();
-                move |mut params, cx| {
-                    let adapter = adapter.clone();
-                    if let Some(this) = this.upgrade() {
-                        this.update(cx, |this, cx| {
-                            {
-                                let buffer = params
-                                    .uri
-                                    .to_file_path()
-                                    .map(|file_path| this.get_buffer(&file_path, cx))
-                                    .ok()
-                                    .flatten();
-                                adapter.process_diagnostics(&mut params, server_id, buffer);
-                            }
-
-                            this.merge_lsp_diagnostics(
-                                DiagnosticSourceKind::Pushed,
-                                vec![DocumentDiagnosticsUpdate {
-                                    server_id,
-                                    diagnostics: params,
-                                    result_id: None,
-                                    disk_based_sources: Cow::Borrowed(
-                                        &adapter.disk_based_diagnostic_sources,
-                                    ),
-                                    registration_id: None,
-                                }],
-                                |_, diagnostic, cx| match diagnostic.source_kind {
-                                    DiagnosticSourceKind::Other | DiagnosticSourceKind::Pushed => {
-                                        adapter.retain_old_diagnostic(diagnostic, cx)
-                                    }
-                                    DiagnosticSourceKind::Pulled => true,
-                                },
-                                cx,
-                            )
-                            .log_err();
-                        })
-                        .ok();
-                    }
-                }
-            })
-            .detach();
-        language_server
-            .on_request::<lsp::request::WorkspaceConfiguration, _, _>({
-                let adapter = adapter.adapter.clone();
-                let delegate = delegate.clone();
-                let this = lsp_store.clone();
-                move |params, cx| {
-                    let adapter = adapter.clone();
-                    let delegate = delegate.clone();
-                    let this = this.clone();
-                    let mut cx = cx.clone();
-                    async move {
-                        let toolchain_for_id = this
-                            .update(&mut cx, |this, _| {
-                                this.as_local()?.language_server_ids.iter().find_map(
-                                    |(seed, value)| {
-                                        (value.id == server_id).then(|| seed.toolchain.clone())
-                                    },
-                                )
-                            })?
-                            .context("Expected the LSP store to be in a local mode")?;
-
-                        let mut scope_uri_to_workspace_config = BTreeMap::new();
-                        for item in &params.items {
-                            let scope_uri = item.scope_uri.clone();
-                            let std::collections::btree_map::Entry::Vacant(new_scope_uri) =
-                                scope_uri_to_workspace_config.entry(scope_uri.clone())
-                            else {
-                                // We've already queried workspace configuration of this URI.
-                                continue;
-                            };
-                            let workspace_config = Self::workspace_configuration_for_adapter(
-                                adapter.clone(),
-                                &delegate,
-                                toolchain_for_id.clone(),
-                                scope_uri,
-                                &mut cx,
-                            )
-                            .await?;
-                            new_scope_uri.insert(workspace_config);
-                        }
-
-                        Ok(params
-                            .items
-                            .into_iter()
-                            .filter_map(|item| {
-                                let workspace_config =
-                                    scope_uri_to_workspace_config.get(&item.scope_uri)?;
-                                if let Some(section) = &item.section {
-                                    Some(
-                                        workspace_config
-                                            .get(section)
-                                            .cloned()
-                                            .unwrap_or(serde_json::Value::Null),
-                                    )
-                                } else {
-                                    Some(workspace_config.clone())
-                                }
-                            })
-                            .collect())
-                    }
-                }
-            })
-            .detach();
-
-        language_server
-            .on_request::<lsp::request::WorkspaceFoldersRequest, _, _>({
-                let this = lsp_store.clone();
-                move |_, cx| {
-                    let this = this.clone();
-                    let cx = cx.clone();
-                    async move {
-                        let Some(server) =
-                            this.read_with(&cx, |this, _| this.language_server_for_id(server_id))?
-                        else {
-                            return Ok(None);
-                        };
-                        let root = server.workspace_folders();
-                        Ok(Some(
-                            root.into_iter()
-                                .map(|uri| WorkspaceFolder {
-                                    uri,
-                                    name: Default::default(),
-                                })
-                                .collect(),
-                        ))
-                    }
-                }
-            })
-            .detach();
-        // Even though we don't have handling for these requests, respond to them to
-        // avoid stalling any language server like `gopls` which waits for a response
-        // to these requests when initializing.
-        language_server
-            .on_request::<lsp::request::WorkDoneProgressCreate, _, _>({
-                let this = lsp_store.clone();
-                move |params, cx| {
-                    let this = this.clone();
-                    let mut cx = cx.clone();
-                    async move {
-                        this.update(&mut cx, |this, _| {
-                            if let Some(status) = this.language_server_statuses.get_mut(&server_id)
-                            {
-                                status
-                                    .progress_tokens
-                                    .insert(ProgressToken::from_lsp(params.token));
-                            }
-                        })?;
-
-                        Ok(())
-                    }
-                }
-            })
-            .detach();
-
-        language_server
-            .on_request::<lsp::request::RegisterCapability, _, _>({
-                let lsp_store = lsp_store.clone();
-                move |params, cx| {
-                    let lsp_store = lsp_store.clone();
-                    let mut cx = cx.clone();
-                    async move {
-                        lsp_store
-                            .update(&mut cx, |lsp_store, cx| {
-                                if lsp_store.as_local().is_some() {
-                                    match lsp_store
-                                        .register_server_capabilities(server_id, params, cx)
-                                    {
-                                        Ok(()) => {}
-                                        Err(e) => {
-                                            log::error!(
-                                                "Failed to register server capabilities: {e:#}"
-                                            );
-                                        }
-                                    };
-                                }
-                            })
-                            .ok();
-                        Ok(())
-                    }
-                }
-            })
-            .detach();
-
-        language_server
-            .on_request::<lsp::request::UnregisterCapability, _, _>({
-                let lsp_store = lsp_store.clone();
-                move |params, cx| {
-                    let lsp_store = lsp_store.clone();
-                    let mut cx = cx.clone();
-                    async move {
-                        lsp_store
-                            .update(&mut cx, |lsp_store, cx| {
-                                if lsp_store.as_local().is_some() {
-                                    match lsp_store
-                                        .unregister_server_capabilities(server_id, params, cx)
-                                    {
-                                        Ok(()) => {}
-                                        Err(e) => {
-                                            log::error!(
-                                                "Failed to unregister server capabilities: {e:#}"
-                                            );
-                                        }
-                                    }
-                                }
-                            })
-                            .ok();
-                        Ok(())
-                    }
-                }
-            })
-            .detach();
-
-        language_server
-            .on_request::<lsp::request::ApplyWorkspaceEdit, _, _>({
-                let this = lsp_store.clone();
-                move |params, cx| {
-                    let mut cx = cx.clone();
-                    let this = this.clone();
-                    async move {
-                        LocalLspStore::on_lsp_workspace_edit(
-                            this.clone(),
-                            params,
-                            server_id,
-                            &mut cx,
-                        )
-                        .await
-                    }
-                }
-            })
-            .detach();
-
-        language_server
-            .on_request::<lsp::request::InlayHintRefreshRequest, _, _>({
-                let lsp_store = lsp_store.clone();
-                let request_id = Arc::new(AtomicUsize::new(0));
-                move |(), cx| {
-                    let lsp_store = lsp_store.clone();
-                    let request_id = request_id.clone();
-                    let mut cx = cx.clone();
-                    async move {
-                        lsp_store
-                            .update(&mut cx, |lsp_store, cx| {
-                                let request_id =
-                                    Some(request_id.fetch_add(1, atomic::Ordering::AcqRel));
-                                cx.emit(LspStoreEvent::RefreshInlayHints {
-                                    server_id,
-                                    request_id,
-                                });
-                                lsp_store
-                                    .downstream_client
-                                    .as_ref()
-                                    .map(|(client, project_id)| {
-                                        client.send(proto::RefreshInlayHints {
-                                            project_id: *project_id,
-                                            server_id: server_id.to_proto(),
-                                            request_id: request_id.map(|id| id as u64),
-                                        })
-                                    })
-                            })?
-                            .transpose()?;
-                        Ok(())
-                    }
-                }
-            })
-            .detach();
-
-        language_server
-            .on_request::<lsp::request::CodeLensRefresh, _, _>({
-                let this = lsp_store.clone();
-                move |(), cx| {
-                    let this = this.clone();
-                    let mut cx = cx.clone();
-                    async move {
-                        this.update(&mut cx, |this, cx| {
-                            cx.emit(LspStoreEvent::RefreshCodeLens);
-                            this.downstream_client.as_ref().map(|(client, project_id)| {
-                                client.send(proto::RefreshCodeLens {
-                                    project_id: *project_id,
-                                })
-                            })
-                        })?
-                        .transpose()?;
-                        Ok(())
-                    }
-                }
-            })
-            .detach();
-
-        language_server
-            .on_request::<lsp::request::WorkspaceDiagnosticRefresh, _, _>({
-                let this = lsp_store.clone();
-                move |(), cx| {
-                    let this = this.clone();
-                    let mut cx = cx.clone();
-                    async move {
-                        this.update(&mut cx, |lsp_store, _| {
-                            lsp_store.pull_workspace_diagnostics(server_id);
-                            lsp_store
-                                .downstream_client
-                                .as_ref()
-                                .map(|(client, project_id)| {
-                                    client.send(proto::PullWorkspaceDiagnostics {
-                                        project_id: *project_id,
-                                        server_id: server_id.to_proto(),
-                                    })
-                                })
-                        })?
-                        .transpose()?;
-                        Ok(())
-                    }
-                }
-            })
-            .detach();
-
-        language_server
-            .on_request::<lsp::request::ShowMessageRequest, _, _>({
-                let this = lsp_store.clone();
-                let name = name.to_string();
-                move |params, cx| {
-                    let this = this.clone();
-                    let name = name.to_string();
-                    let mut cx = cx.clone();
-                    async move {
-                        let actions = params.actions.unwrap_or_default();
-                        let (tx, rx) = smol::channel::bounded(1);
-                        let request = LanguageServerPromptRequest {
-                            level: match params.typ {
-                                lsp::MessageType::ERROR => PromptLevel::Critical,
-                                lsp::MessageType::WARNING => PromptLevel::Warning,
-                                _ => PromptLevel::Info,
-                            },
-                            message: params.message,
-                            actions,
-                            response_channel: tx,
-                            lsp_name: name.clone(),
-                        };
-
-                        let did_update = this
-                            .update(&mut cx, |_, cx| {
-                                cx.emit(LspStoreEvent::LanguageServerPrompt(request));
-                            })
-                            .is_ok();
-                        if did_update {
-                            let response = rx.recv().await.ok();
-                            Ok(response)
-                        } else {
-                            Ok(None)
-                        }
-                    }
-                }
-            })
-            .detach();
-        language_server
-            .on_notification::<lsp::notification::ShowMessage, _>({
-                let this = lsp_store.clone();
-                let name = name.to_string();
-                move |params, cx| {
-                    let this = this.clone();
-                    let name = name.to_string();
-                    let mut cx = cx.clone();
-
-                    let (tx, _) = smol::channel::bounded(1);
-                    let request = LanguageServerPromptRequest {
-                        level: match params.typ {
-                            lsp::MessageType::ERROR => PromptLevel::Critical,
-                            lsp::MessageType::WARNING => PromptLevel::Warning,
-                            _ => PromptLevel::Info,
-                        },
-                        message: params.message,
-                        actions: vec![],
-                        response_channel: tx,
-                        lsp_name: name,
-                    };
-
-                    let _ = this.update(&mut cx, |_, cx| {
-                        cx.emit(LspStoreEvent::LanguageServerPrompt(request));
-                    });
-                }
-            })
-            .detach();
-
-        let disk_based_diagnostics_progress_token =
-            adapter.disk_based_diagnostics_progress_token.clone();
-
-        language_server
-            .on_notification::<lsp::notification::Progress, _>({
-                let this = lsp_store.clone();
-                move |params, cx| {
-                    if let Some(this) = this.upgrade() {
-                        this.update(cx, |this, cx| {
-                            this.on_lsp_progress(
-                                params,
-                                server_id,
-                                disk_based_diagnostics_progress_token.clone(),
-                                cx,
-                            );
-                        })
-                        .ok();
-                    }
-                }
-            })
-            .detach();
-
-        language_server
-            .on_notification::<lsp::notification::LogMessage, _>({
-                let this = lsp_store.clone();
-                move |params, cx| {
-                    if let Some(this) = this.upgrade() {
-                        this.update(cx, |_, cx| {
-                            cx.emit(LspStoreEvent::LanguageServerLog(
-                                server_id,
-                                LanguageServerLogType::Log(params.typ),
-                                params.message,
-                            ));
-                        })
-                        .ok();
-                    }
-                }
-            })
-            .detach();
-
-        language_server
-            .on_notification::<lsp::notification::LogTrace, _>({
-                let this = lsp_store.clone();
-                move |params, cx| {
-                    let mut cx = cx.clone();
-                    if let Some(this) = this.upgrade() {
-                        this.update(&mut cx, |_, cx| {
-                            cx.emit(LspStoreEvent::LanguageServerLog(
-                                server_id,
-                                LanguageServerLogType::Trace {
-                                    verbose_info: params.verbose,
-                                },
-                                params.message,
-                            ));
-                        })
-                        .ok();
-                    }
-                }
-            })
-            .detach();
-
-        vue_language_server_ext::register_requests(lsp_store.clone(), language_server);
-        json_language_server_ext::register_requests(lsp_store.clone(), language_server);
-        rust_analyzer_ext::register_notifications(lsp_store.clone(), language_server);
-        clangd_ext::register_notifications(lsp_store, language_server, adapter);
-    }
-
-    fn shutdown_language_servers_on_quit(
-        &mut self,
-        _: &mut Context<LspStore>,
-    ) -> impl Future<Output = ()> + use<> {
-        let shutdown_futures = self
-            .language_servers
-            .drain()
-            .map(|(_, server_state)| Self::shutdown_server(server_state))
-            .collect::<Vec<_>>();
-
-        async move {
-            join_all(shutdown_futures).await;
-        }
-    }
-
-    async fn shutdown_server(server_state: LanguageServerState) -> anyhow::Result<()> {
-        match server_state {
-            LanguageServerState::Running { server, .. } => {
-                if let Some(shutdown) = server.shutdown() {
-                    shutdown.await;
-                }
-            }
-            LanguageServerState::Starting { startup, .. } => {
-                if let Some(server) = startup.await
-                    && let Some(shutdown) = server.shutdown()
-                {
-                    shutdown.await;
-                }
-            }
-        }
-        Ok(())
-    }
-
-    fn language_servers_for_worktree(
-        &self,
-        worktree_id: WorktreeId,
-    ) -> impl Iterator<Item = &Arc<LanguageServer>> {
-        self.language_server_ids
-            .iter()
-            .filter_map(move |(seed, state)| {
-                if seed.worktree_id != worktree_id {
-                    return None;
-                }
-
-                if let Some(LanguageServerState::Running { server, .. }) =
-                    self.language_servers.get(&state.id)
-                {
-                    Some(server)
-                } else {
-                    None
-                }
-            })
-    }
-
-    fn language_server_ids_for_project_path(
-        &self,
-        project_path: ProjectPath,
-        language: &Language,
-        cx: &mut App,
-    ) -> Vec<LanguageServerId> {
-        let Some(worktree) = self
-            .worktree_store
-            .read(cx)
-            .worktree_for_id(project_path.worktree_id, cx)
-        else {
-            return Vec::new();
-        };
-        let delegate: Arc<dyn ManifestDelegate> =
-            Arc::new(ManifestQueryDelegate::new(worktree.read(cx).snapshot()));
-
-        self.lsp_tree
-            .get(
-                project_path,
-                language.name(),
-                language.manifest(),
-                &delegate,
-                cx,
-            )
-            .collect::<Vec<_>>()
-    }
-
-    fn language_server_ids_for_buffer(
-        &self,
-        buffer: &Buffer,
-        cx: &mut App,
-    ) -> Vec<LanguageServerId> {
-        if let Some((file, language)) = File::from_dyn(buffer.file()).zip(buffer.language()) {
-            let worktree_id = file.worktree_id(cx);
-
-            let path: Arc<RelPath> = file
-                .path()
-                .parent()
-                .map(Arc::from)
-                .unwrap_or_else(|| file.path().clone());
-            let worktree_path = ProjectPath { worktree_id, path };
-            self.language_server_ids_for_project_path(worktree_path, language, cx)
-        } else {
-            Vec::new()
-        }
-    }
-
-    fn language_servers_for_buffer<'a>(
-        &'a self,
-        buffer: &'a Buffer,
-        cx: &'a mut App,
-    ) -> impl Iterator<Item = (&'a Arc<CachedLspAdapter>, &'a Arc<LanguageServer>)> {
-        self.language_server_ids_for_buffer(buffer, cx)
-            .into_iter()
-            .filter_map(|server_id| match self.language_servers.get(&server_id)? {
-                LanguageServerState::Running {
-                    adapter, server, ..
-                } => Some((adapter, server)),
-                _ => None,
-            })
-    }
-
-    async fn execute_code_action_kind_locally(
-        lsp_store: WeakEntity<LspStore>,
-        mut buffers: Vec<Entity<Buffer>>,
-        kind: CodeActionKind,
-        push_to_history: bool,
-        cx: &mut AsyncApp,
-    ) -> anyhow::Result<ProjectTransaction> {
-        // Do not allow multiple concurrent code actions requests for the
-        // same buffer.
-        lsp_store.update(cx, |this, cx| {
-            let this = this.as_local_mut().unwrap();
-            buffers.retain(|buffer| {
-                this.buffers_being_formatted
-                    .insert(buffer.read(cx).remote_id())
-            });
-        })?;
-        let _cleanup = defer({
-            let this = lsp_store.clone();
-            let mut cx = cx.clone();
-            let buffers = &buffers;
-            move || {
-                this.update(&mut cx, |this, cx| {
-                    let this = this.as_local_mut().unwrap();
-                    for buffer in buffers {
-                        this.buffers_being_formatted
-                            .remove(&buffer.read(cx).remote_id());
-                    }
-                })
-                .ok();
-            }
-        });
-        let mut project_transaction = ProjectTransaction::default();
-
-        for buffer in &buffers {
-            let adapters_and_servers = lsp_store.update(cx, |lsp_store, cx| {
-                buffer.update(cx, |buffer, cx| {
-                    lsp_store
-                        .as_local()
-                        .unwrap()
-                        .language_servers_for_buffer(buffer, cx)
-                        .map(|(adapter, lsp)| (adapter.clone(), lsp.clone()))
-                        .collect::<Vec<_>>()
-                })
-            })?;
-            for (_, language_server) in adapters_and_servers.iter() {
-                let actions = Self::get_server_code_actions_from_action_kinds(
-                    &lsp_store,
-                    language_server.server_id(),
-                    vec![kind.clone()],
-                    buffer,
-                    cx,
-                )
-                .await?;
-                Self::execute_code_actions_on_server(
-                    &lsp_store,
-                    language_server,
-                    actions,
-                    push_to_history,
-                    &mut project_transaction,
-                    cx,
-                )
-                .await?;
-            }
-        }
-        Ok(project_transaction)
-    }
-
-    async fn format_locally(
-        lsp_store: WeakEntity<LspStore>,
-        mut buffers: Vec<FormattableBuffer>,
-        push_to_history: bool,
-        trigger: FormatTrigger,
-        logger: zlog::Logger,
-        cx: &mut AsyncApp,
-    ) -> anyhow::Result<ProjectTransaction> {
-        // Do not allow multiple concurrent formatting requests for the
-        // same buffer.
-        lsp_store.update(cx, |this, cx| {
-            let this = this.as_local_mut().unwrap();
-            buffers.retain(|buffer| {
-                this.buffers_being_formatted
-                    .insert(buffer.handle.read(cx).remote_id())
-            });
-        })?;
-
-        let _cleanup = defer({
-            let this = lsp_store.clone();
-            let mut cx = cx.clone();
-            let buffers = &buffers;
-            move || {
-                this.update(&mut cx, |this, cx| {
-                    let this = this.as_local_mut().unwrap();
-                    for buffer in buffers {
-                        this.buffers_being_formatted
-                            .remove(&buffer.handle.read(cx).remote_id());
-                    }
-                })
-                .ok();
-            }
-        });
-
-        let mut project_transaction = ProjectTransaction::default();
-
-        for buffer in &buffers {
-            zlog::debug!(
-                logger =>
-                "formatting buffer '{:?}'",
-                buffer.abs_path.as_ref().unwrap_or(&PathBuf::from("unknown")).display()
-            );
-            // Create an empty transaction to hold all of the formatting edits.
-            let formatting_transaction_id = buffer.handle.update(cx, |buffer, cx| {
-                // ensure no transactions created while formatting are
-                // grouped with the previous transaction in the history
-                // based on the transaction group interval
-                buffer.finalize_last_transaction();
-                buffer
-                    .start_transaction()
-                    .context("transaction already open")?;
-                buffer.end_transaction(cx);
-                let transaction_id = buffer.push_empty_transaction(cx.background_executor().now());
-                buffer.finalize_last_transaction();
-                anyhow::Ok(transaction_id)
-            })??;
-
-            let result = Self::format_buffer_locally(
-                lsp_store.clone(),
-                buffer,
-                formatting_transaction_id,
-                trigger,
-                logger,
-                cx,
-            )
-            .await;
-
-            buffer.handle.update(cx, |buffer, cx| {
-                let Some(formatting_transaction) =
-                    buffer.get_transaction(formatting_transaction_id).cloned()
-                else {
-                    zlog::warn!(logger => "no formatting transaction");
-                    return;
-                };
-                if formatting_transaction.edit_ids.is_empty() {
-                    zlog::debug!(logger => "no changes made while formatting");
-                    buffer.forget_transaction(formatting_transaction_id);
-                    return;
-                }
-                if !push_to_history {
-                    zlog::trace!(logger => "forgetting format transaction");
-                    buffer.forget_transaction(formatting_transaction.id);
-                }
-                project_transaction
-                    .0
-                    .insert(cx.entity(), formatting_transaction);
-            })?;
-
-            result?;
-        }
-
-        Ok(project_transaction)
-    }
-
-    async fn format_buffer_locally(
-        lsp_store: WeakEntity<LspStore>,
-        buffer: &FormattableBuffer,
-        formatting_transaction_id: clock::Lamport,
-        trigger: FormatTrigger,
-        logger: zlog::Logger,
-        cx: &mut AsyncApp,
-    ) -> Result<()> {
-        let (adapters_and_servers, settings) = lsp_store.update(cx, |lsp_store, cx| {
-            buffer.handle.update(cx, |buffer, cx| {
-                let adapters_and_servers = lsp_store
-                    .as_local()
-                    .unwrap()
-                    .language_servers_for_buffer(buffer, cx)
-                    .map(|(adapter, lsp)| (adapter.clone(), lsp.clone()))
-                    .collect::<Vec<_>>();
-                let settings =
-                    language_settings(buffer.language().map(|l| l.name()), buffer.file(), cx)
-                        .into_owned();
-                (adapters_and_servers, settings)
-            })
-        })?;
-
-        /// Apply edits to the buffer that will become part of the formatting transaction.
-        /// Fails if the buffer has been edited since the start of that transaction.
-        fn extend_formatting_transaction(
-            buffer: &FormattableBuffer,
-            formatting_transaction_id: text::TransactionId,
-            cx: &mut AsyncApp,
-            operation: impl FnOnce(&mut Buffer, &mut Context<Buffer>),
-        ) -> anyhow::Result<()> {
-            buffer.handle.update(cx, |buffer, cx| {
-                let last_transaction_id = buffer.peek_undo_stack().map(|t| t.transaction_id());
-                if last_transaction_id != Some(formatting_transaction_id) {
-                    anyhow::bail!("Buffer edited while formatting. Aborting")
-                }
-                buffer.start_transaction();
-                operation(buffer, cx);
-                if let Some(transaction_id) = buffer.end_transaction(cx) {
-                    buffer.merge_transactions(transaction_id, formatting_transaction_id);
-                }
-                Ok(())
-            })?
-        }
-
-        // handle whitespace formatting
-        if settings.remove_trailing_whitespace_on_save {
-            zlog::trace!(logger => "removing trailing whitespace");
-            let diff = buffer
-                .handle
-                .read_with(cx, |buffer, cx| buffer.remove_trailing_whitespace(cx))?
-                .await;
-            extend_formatting_transaction(buffer, formatting_transaction_id, cx, |buffer, cx| {
-                buffer.apply_diff(diff, cx);
-            })?;
-        }
-
-        if settings.ensure_final_newline_on_save {
-            zlog::trace!(logger => "ensuring final newline");
-            extend_formatting_transaction(buffer, formatting_transaction_id, cx, |buffer, cx| {
-                buffer.ensure_final_newline(cx);
-            })?;
-        }
-
-        // Formatter for `code_actions_on_format` that runs before
-        // the rest of the formatters
-        let mut code_actions_on_format_formatters = None;
-        let should_run_code_actions_on_format = !matches!(
-            (trigger, &settings.format_on_save),
-            (FormatTrigger::Save, &FormatOnSave::Off)
-        );
-        if should_run_code_actions_on_format {
-            let have_code_actions_to_run_on_format = settings
-                .code_actions_on_format
-                .values()
-                .any(|enabled| *enabled);
-            if have_code_actions_to_run_on_format {
-                zlog::trace!(logger => "going to run code actions on format");
-                code_actions_on_format_formatters = Some(
-                    settings
-                        .code_actions_on_format
-                        .iter()
-                        .filter_map(|(action, enabled)| enabled.then_some(action))
-                        .cloned()
-                        .map(Formatter::CodeAction)
-                        .collect::<Vec<_>>(),
-                );
-            }
-        }
-
-        let formatters = match (trigger, &settings.format_on_save) {
-            (FormatTrigger::Save, FormatOnSave::Off) => &[],
-            (FormatTrigger::Manual, _) | (FormatTrigger::Save, FormatOnSave::On) => {
-                settings.formatter.as_ref()
-            }
-        };
-
-        let formatters = code_actions_on_format_formatters
-            .iter()
-            .flatten()
-            .chain(formatters);
-
-        for formatter in formatters {
-            let formatter = if formatter == &Formatter::Auto {
-                if settings.prettier.allowed {
-                    zlog::trace!(logger => "Formatter set to auto: defaulting to prettier");
-                    &Formatter::Prettier
-                } else {
-                    zlog::trace!(logger => "Formatter set to auto: defaulting to primary language server");
-                    &Formatter::LanguageServer(settings::LanguageServerFormatterSpecifier::Current)
-                }
-            } else {
-                formatter
-            };
-            match formatter {
-                Formatter::Auto => unreachable!("Auto resolved above"),
-                Formatter::Prettier => {
-                    let logger = zlog::scoped!(logger => "prettier");
-                    zlog::trace!(logger => "formatting");
-                    let _timer = zlog::time!(logger => "Formatting buffer via prettier");
-
-                    let prettier = lsp_store.read_with(cx, |lsp_store, _cx| {
-                        lsp_store.prettier_store().unwrap().downgrade()
-                    })?;
-                    let diff = prettier_store::format_with_prettier(&prettier, &buffer.handle, cx)
-                        .await
-                        .transpose()?;
-                    let Some(diff) = diff else {
-                        zlog::trace!(logger => "No changes");
-                        continue;
-                    };
-
-                    extend_formatting_transaction(
-                        buffer,
-                        formatting_transaction_id,
-                        cx,
-                        |buffer, cx| {
-                            buffer.apply_diff(diff, cx);
-                        },
-                    )?;
-                }
-                Formatter::External { command, arguments } => {
-                    let logger = zlog::scoped!(logger => "command");
-                    zlog::trace!(logger => "formatting");
-                    let _timer = zlog::time!(logger => "Formatting buffer via external command");
-
-                    let diff = Self::format_via_external_command(
-                        buffer,
-                        command.as_ref(),
-                        arguments.as_deref(),
-                        cx,
-                    )
-                    .await
-                    .with_context(|| {
-                        format!("Failed to format buffer via external command: {}", command)
-                    })?;
-                    let Some(diff) = diff else {
-                        zlog::trace!(logger => "No changes");
-                        continue;
-                    };
-
-                    extend_formatting_transaction(
-                        buffer,
-                        formatting_transaction_id,
-                        cx,
-                        |buffer, cx| {
-                            buffer.apply_diff(diff, cx);
-                        },
-                    )?;
-                }
-                Formatter::LanguageServer(specifier) => {
-                    let logger = zlog::scoped!(logger => "language-server");
-                    zlog::trace!(logger => "formatting");
-                    let _timer = zlog::time!(logger => "Formatting buffer using language server");
-
-                    let Some(buffer_path_abs) = buffer.abs_path.as_ref() else {
-                        zlog::warn!(logger => "Cannot format buffer that is not backed by a file on disk using language servers. Skipping");
-                        continue;
-                    };
-
-                    let language_server = match specifier {
-                        settings::LanguageServerFormatterSpecifier::Specific { name } => {
-                            adapters_and_servers.iter().find_map(|(adapter, server)| {
-                                if adapter.name.0.as_ref() == name {
-                                    Some(server.clone())
-                                } else {
-                                    None
-                                }
-                            })
-                        }
-                        settings::LanguageServerFormatterSpecifier::Current => {
-                            adapters_and_servers.first().map(|e| e.1.clone())
-                        }
-                    };
-
-                    let Some(language_server) = language_server else {
-                        log::debug!(
-                            "No language server found to format buffer '{:?}'. Skipping",
-                            buffer_path_abs.as_path().to_string_lossy()
-                        );
-                        continue;
-                    };
-
-                    zlog::trace!(
-                        logger =>
-                        "Formatting buffer '{:?}' using language server '{:?}'",
-                        buffer_path_abs.as_path().to_string_lossy(),
-                        language_server.name()
-                    );
-
-                    let edits = if let Some(ranges) = buffer.ranges.as_ref() {
-                        zlog::trace!(logger => "formatting ranges");
-                        Self::format_ranges_via_lsp(
-                            &lsp_store,
-                            &buffer.handle,
-                            ranges,
-                            buffer_path_abs,
-                            &language_server,
-                            &settings,
-                            cx,
-                        )
-                        .await
-                        .context("Failed to format ranges via language server")?
-                    } else {
-                        zlog::trace!(logger => "formatting full");
-                        Self::format_via_lsp(
-                            &lsp_store,
-                            &buffer.handle,
-                            buffer_path_abs,
-                            &language_server,
-                            &settings,
-                            cx,
-                        )
-                        .await
-                        .context("failed to format via language server")?
-                    };
-
-                    if edits.is_empty() {
-                        zlog::trace!(logger => "No changes");
-                        continue;
-                    }
-                    extend_formatting_transaction(
-                        buffer,
-                        formatting_transaction_id,
-                        cx,
-                        |buffer, cx| {
-                            buffer.edit(edits, None, cx);
-                        },
-                    )?;
-                }
-                Formatter::CodeAction(code_action_name) => {
-                    let logger = zlog::scoped!(logger => "code-actions");
-                    zlog::trace!(logger => "formatting");
-                    let _timer = zlog::time!(logger => "Formatting buffer using code actions");
-
-                    let Some(buffer_path_abs) = buffer.abs_path.as_ref() else {
-                        zlog::warn!(logger => "Cannot format buffer that is not backed by a file on disk using code actions. Skipping");
-                        continue;
-                    };
-
-                    let code_action_kind: CodeActionKind = code_action_name.clone().into();
-                    zlog::trace!(logger => "Attempting to resolve code actions {:?}", &code_action_kind);
-
-                    let mut actions_and_servers = Vec::new();
-
-                    for (index, (_, language_server)) in adapters_and_servers.iter().enumerate() {
-                        let actions_result = Self::get_server_code_actions_from_action_kinds(
-                            &lsp_store,
-                            language_server.server_id(),
-                            vec![code_action_kind.clone()],
-                            &buffer.handle,
-                            cx,
-                        )
-                        .await
-                        .with_context(|| {
-                            format!(
-                                "Failed to resolve code action {:?} with language server {}",
-                                code_action_kind,
-                                language_server.name()
-                            )
-                        });
-                        let Ok(actions) = actions_result else {
-                            // note: it may be better to set result to the error and break formatters here
-                            // but for now we try to execute the actions that we can resolve and skip the rest
-                            zlog::error!(
-                                logger =>
-                                "Failed to resolve code action {:?} with language server {}",
-                                code_action_kind,
-                                language_server.name()
-                            );
-                            continue;
-                        };
-                        for action in actions {
-                            actions_and_servers.push((action, index));
-                        }
-                    }
-
-                    if actions_and_servers.is_empty() {
-                        zlog::warn!(logger => "No code actions were resolved, continuing");
-                        continue;
-                    }
-
-                    'actions: for (mut action, server_index) in actions_and_servers {
-                        let server = &adapters_and_servers[server_index].1;
-
-                        let describe_code_action = |action: &CodeAction| {
-                            format!(
-                                "code action '{}' with title \"{}\" on server {}",
-                                action
-                                    .lsp_action
-                                    .action_kind()
-                                    .unwrap_or("unknown".into())
-                                    .as_str(),
-                                action.lsp_action.title(),
-                                server.name(),
-                            )
-                        };
-
-                        zlog::trace!(logger => "Executing {}", describe_code_action(&action));
-
-                        if let Err(err) = Self::try_resolve_code_action(server, &mut action).await {
-                            zlog::error!(
-                                logger =>
-                                "Failed to resolve {}. Error: {}",
-                                describe_code_action(&action),
-                                err
-                            );
-                            continue;
-                        }
-
-                        if let Some(edit) = action.lsp_action.edit().cloned() {
-                            // NOTE: code below duplicated from `Self::deserialize_workspace_edit`
-                            // but filters out and logs warnings for code actions that require unreasonably
-                            // difficult handling on our part, such as:
-                            // - applying edits that call commands
-                            //   which can result in arbitrary workspace edits being sent from the server that
-                            //   have no way of being tied back to the command that initiated them (i.e. we
-                            //   can't know which edits are part of the format request, or if the server is done sending
-                            //   actions in response to the command)
-                            // - actions that create/delete/modify/rename files other than the one we are formatting
-                            //   as we then would need to handle such changes correctly in the local history as well
-                            //   as the remote history through the ProjectTransaction
-                            // - actions with snippet edits, as these simply don't make sense in the context of a format request
-                            // Supporting these actions is not impossible, but not supported as of yet.
-                            if edit.changes.is_none() && edit.document_changes.is_none() {
-                                zlog::trace!(
-                                    logger =>
-                                    "No changes for code action. Skipping {}",
-                                    describe_code_action(&action),
-                                );
-                                continue;
-                            }
-
-                            let mut operations = Vec::new();
-                            if let Some(document_changes) = edit.document_changes {
-                                match document_changes {
-                                    lsp::DocumentChanges::Edits(edits) => operations.extend(
-                                        edits.into_iter().map(lsp::DocumentChangeOperation::Edit),
-                                    ),
-                                    lsp::DocumentChanges::Operations(ops) => operations = ops,
-                                }
-                            } else if let Some(changes) = edit.changes {
-                                operations.extend(changes.into_iter().map(|(uri, edits)| {
-                                    lsp::DocumentChangeOperation::Edit(lsp::TextDocumentEdit {
-                                        text_document:
-                                            lsp::OptionalVersionedTextDocumentIdentifier {
-                                                uri,
-                                                version: None,
-                                            },
-                                        edits: edits.into_iter().map(Edit::Plain).collect(),
-                                    })
-                                }));
-                            }
-
-                            let mut edits = Vec::with_capacity(operations.len());
-
-                            if operations.is_empty() {
-                                zlog::trace!(
-                                    logger =>
-                                    "No changes for code action. Skipping {}",
-                                    describe_code_action(&action),
-                                );
-                                continue;
-                            }
-                            for operation in operations {
-                                let op = match operation {
-                                    lsp::DocumentChangeOperation::Edit(op) => op,
-                                    lsp::DocumentChangeOperation::Op(_) => {
-                                        zlog::warn!(
-                                            logger =>
-                                            "Code actions which create, delete, or rename files are not supported on format. Skipping {}",
-                                            describe_code_action(&action),
-                                        );
-                                        continue 'actions;
-                                    }
-                                };
-                                let Ok(file_path) = op.text_document.uri.to_file_path() else {
-                                    zlog::warn!(
-                                        logger =>
-                                        "Failed to convert URI '{:?}' to file path. Skipping {}",
-                                        &op.text_document.uri,
-                                        describe_code_action(&action),
-                                    );
-                                    continue 'actions;
-                                };
-                                if &file_path != buffer_path_abs {
-                                    zlog::warn!(
-                                        logger =>
-                                        "File path '{:?}' does not match buffer path '{:?}'. Skipping {}",
-                                        file_path,
-                                        buffer_path_abs,
-                                        describe_code_action(&action),
-                                    );
-                                    continue 'actions;
-                                }
-
-                                let mut lsp_edits = Vec::new();
-                                for edit in op.edits {
-                                    match edit {
-                                        Edit::Plain(edit) => {
-                                            if !lsp_edits.contains(&edit) {
-                                                lsp_edits.push(edit);
-                                            }
-                                        }
-                                        Edit::Annotated(edit) => {
-                                            if !lsp_edits.contains(&edit.text_edit) {
-                                                lsp_edits.push(edit.text_edit);
-                                            }
-                                        }
-                                        Edit::Snippet(_) => {
-                                            zlog::warn!(
-                                                logger =>
-                                                "Code actions which produce snippet edits are not supported during formatting. Skipping {}",
-                                                describe_code_action(&action),
-                                            );
-                                            continue 'actions;
-                                        }
-                                    }
-                                }
-                                let edits_result = lsp_store
-                                    .update(cx, |lsp_store, cx| {
-                                        lsp_store.as_local_mut().unwrap().edits_from_lsp(
-                                            &buffer.handle,
-                                            lsp_edits,
-                                            server.server_id(),
-                                            op.text_document.version,
-                                            cx,
-                                        )
-                                    })?
-                                    .await;
-                                let Ok(resolved_edits) = edits_result else {
-                                    zlog::warn!(
-                                        logger =>
-                                        "Failed to resolve edits from LSP for buffer {:?} while handling {}",
-                                        buffer_path_abs.as_path(),
-                                        describe_code_action(&action),
-                                    );
-                                    continue 'actions;
-                                };
-                                edits.extend(resolved_edits);
-                            }
-
-                            if edits.is_empty() {
-                                zlog::warn!(logger => "No edits resolved from LSP");
-                                continue;
-                            }
-
-                            extend_formatting_transaction(
-                                buffer,
-                                formatting_transaction_id,
-                                cx,
-                                |buffer, cx| {
-                                    zlog::info!(
-                                        "Applying edits {edits:?}. Content: {:?}",
-                                        buffer.text()
-                                    );
-                                    buffer.edit(edits, None, cx);
-                                    zlog::info!("Applied edits. New Content: {:?}", buffer.text());
-                                },
-                            )?;
-                        }
-
-                        if let Some(command) = action.lsp_action.command() {
-                            zlog::warn!(
-                                logger =>
-                                "Executing code action command '{}'. This may cause formatting to abort unnecessarily as well as splitting formatting into two entries in the undo history",
-                                &command.command,
-                            );
-
-                            // bail early if command is invalid
-                            let server_capabilities = server.capabilities();
-                            let available_commands = server_capabilities
-                                .execute_command_provider
-                                .as_ref()
-                                .map(|options| options.commands.as_slice())
-                                .unwrap_or_default();
-                            if !available_commands.contains(&command.command) {
-                                zlog::warn!(
-                                    logger =>
-                                    "Cannot execute a command {} not listed in the language server capabilities of server {}",
-                                    command.command,
-                                    server.name(),
-                                );
-                                continue;
-                            }
-
-                            // noop so we just ensure buffer hasn't been edited since resolving code actions
-                            extend_formatting_transaction(
-                                buffer,
-                                formatting_transaction_id,
-                                cx,
-                                |_, _| {},
-                            )?;
-                            zlog::info!(logger => "Executing command {}", &command.command);
-
-                            lsp_store.update(cx, |this, _| {
-                                this.as_local_mut()
-                                    .unwrap()
-                                    .last_workspace_edits_by_language_server
-                                    .remove(&server.server_id());
-                            })?;
-
-                            let execute_command_result = server
-                                .request::<lsp::request::ExecuteCommand>(
-                                    lsp::ExecuteCommandParams {
-                                        command: command.command.clone(),
-                                        arguments: command.arguments.clone().unwrap_or_default(),
-                                        ..Default::default()
-                                    },
-                                )
-                                .await
-                                .into_response();
-
-                            if execute_command_result.is_err() {
-                                zlog::error!(
-                                    logger =>
-                                    "Failed to execute command '{}' as part of {}",
-                                    &command.command,
-                                    describe_code_action(&action),
-                                );
-                                continue 'actions;
-                            }
-
-                            let mut project_transaction_command =
-                                lsp_store.update(cx, |this, _| {
-                                    this.as_local_mut()
-                                        .unwrap()
-                                        .last_workspace_edits_by_language_server
-                                        .remove(&server.server_id())
-                                        .unwrap_or_default()
-                                })?;
-
-                            if let Some(transaction) =
-                                project_transaction_command.0.remove(&buffer.handle)
-                            {
-                                zlog::trace!(
-                                    logger =>
-                                    "Successfully captured {} edits that resulted from command {}",
-                                    transaction.edit_ids.len(),
-                                    &command.command,
-                                );
-                                let transaction_id_project_transaction = transaction.id;
-                                buffer.handle.update(cx, |buffer, _| {
-                                    // it may have been removed from history if push_to_history was
-                                    // false in deserialize_workspace_edit. If so push it so we
-                                    // can merge it with the format transaction
-                                    // and pop the combined transaction off the history stack
-                                    // later if push_to_history is false
-                                    if buffer.get_transaction(transaction.id).is_none() {
-                                        buffer.push_transaction(transaction, Instant::now());
-                                    }
-                                    buffer.merge_transactions(
-                                        transaction_id_project_transaction,
-                                        formatting_transaction_id,
-                                    );
-                                })?;
-                            }
-
-                            if !project_transaction_command.0.is_empty() {
-                                let mut extra_buffers = String::new();
-                                for buffer in project_transaction_command.0.keys() {
-                                    buffer
-                                        .read_with(cx, |b, cx| {
-                                            if let Some(path) = b.project_path(cx) {
-                                                if !extra_buffers.is_empty() {
-                                                    extra_buffers.push_str(", ");
-                                                }
-                                                extra_buffers.push_str(path.path.as_unix_str());
-                                            }
-                                        })
-                                        .ok();
-                                }
-                                zlog::warn!(
-                                    logger =>
-                                    "Unexpected edits to buffers other than the buffer actively being formatted due to command {}. Impacted buffers: [{}].",
-                                    &command.command,
-                                    extra_buffers,
-                                );
-                                // NOTE: if this case is hit, the proper thing to do is to for each buffer, merge the extra transaction
-                                // into the existing transaction in project_transaction if there is one, and if there isn't one in project_transaction,
-                                // add it so it's included, and merge it into the format transaction when its created later
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        Ok(())
-    }
-
-    pub async fn format_ranges_via_lsp(
-        this: &WeakEntity<LspStore>,
-        buffer_handle: &Entity<Buffer>,
-        ranges: &[Range<Anchor>],
-        abs_path: &Path,
-        language_server: &Arc<LanguageServer>,
-        settings: &LanguageSettings,
-        cx: &mut AsyncApp,
-    ) -> Result<Vec<(Range<Anchor>, Arc<str>)>> {
-        let capabilities = &language_server.capabilities();
-        let range_formatting_provider = capabilities.document_range_formatting_provider.as_ref();
-        if range_formatting_provider == Some(&OneOf::Left(false)) {
-            anyhow::bail!(
-                "{} language server does not support range formatting",
-                language_server.name()
-            );
-        }
-
-        let uri = file_path_to_lsp_url(abs_path)?;
-        let text_document = lsp::TextDocumentIdentifier::new(uri);
-
-        let lsp_edits = {
-            let mut lsp_ranges = Vec::new();
-            this.update(cx, |_this, cx| {
-                // TODO(#22930): In the case of formatting multibuffer selections, this buffer may
-                // not have been sent to the language server. This seems like a fairly systemic
-                // issue, though, the resolution probably is not specific to formatting.
-                //
-                // TODO: Instead of using current snapshot, should use the latest snapshot sent to
-                // LSP.
-                let snapshot = buffer_handle.read(cx).snapshot();
-                for range in ranges {
-                    lsp_ranges.push(range_to_lsp(range.to_point_utf16(&snapshot))?);
-                }
-                anyhow::Ok(())
-            })??;
-
-            let mut edits = None;
-            for range in lsp_ranges {
-                if let Some(mut edit) = language_server
-                    .request::<lsp::request::RangeFormatting>(lsp::DocumentRangeFormattingParams {
-                        text_document: text_document.clone(),
-                        range,
-                        options: lsp_command::lsp_formatting_options(settings),
-                        work_done_progress_params: Default::default(),
-                    })
-                    .await
-                    .into_response()?
-                {
-                    edits.get_or_insert_with(Vec::new).append(&mut edit);
-                }
-            }
-            edits
-        };
-
-        if let Some(lsp_edits) = lsp_edits {
-            this.update(cx, |this, cx| {
-                this.as_local_mut().unwrap().edits_from_lsp(
-                    buffer_handle,
-                    lsp_edits,
-                    language_server.server_id(),
-                    None,
-                    cx,
-                )
-            })?
-            .await
-        } else {
-            Ok(Vec::with_capacity(0))
-        }
-    }
-
-    async fn format_via_lsp(
-        this: &WeakEntity<LspStore>,
-        buffer: &Entity<Buffer>,
-        abs_path: &Path,
-        language_server: &Arc<LanguageServer>,
-        settings: &LanguageSettings,
-        cx: &mut AsyncApp,
-    ) -> Result<Vec<(Range<Anchor>, Arc<str>)>> {
-        let logger = zlog::scoped!("lsp_format");
-        zlog::debug!(logger => "Formatting via LSP");
-
-        let uri = file_path_to_lsp_url(abs_path)?;
-        let text_document = lsp::TextDocumentIdentifier::new(uri);
-        let capabilities = &language_server.capabilities();
-
-        let formatting_provider = capabilities.document_formatting_provider.as_ref();
-        let range_formatting_provider = capabilities.document_range_formatting_provider.as_ref();
-
-        let lsp_edits = if matches!(formatting_provider, Some(p) if *p != OneOf::Left(false)) {
-            let _timer = zlog::time!(logger => "format-full");
-            language_server
-                .request::<lsp::request::Formatting>(lsp::DocumentFormattingParams {
-                    text_document,
-                    options: lsp_command::lsp_formatting_options(settings),
-                    work_done_progress_params: Default::default(),
-                })
-                .await
-                .into_response()?
-        } else if matches!(range_formatting_provider, Some(p) if *p != OneOf::Left(false)) {
-            let _timer = zlog::time!(logger => "format-range");
-            let buffer_start = lsp::Position::new(0, 0);
-            let buffer_end = buffer.read_with(cx, |b, _| point_to_lsp(b.max_point_utf16()))?;
-            language_server
-                .request::<lsp::request::RangeFormatting>(lsp::DocumentRangeFormattingParams {
-                    text_document: text_document.clone(),
-                    range: lsp::Range::new(buffer_start, buffer_end),
-                    options: lsp_command::lsp_formatting_options(settings),
-                    work_done_progress_params: Default::default(),
-                })
-                .await
-                .into_response()?
-        } else {
-            None
-        };
-
-        if let Some(lsp_edits) = lsp_edits {
-            this.update(cx, |this, cx| {
-                this.as_local_mut().unwrap().edits_from_lsp(
-                    buffer,
-                    lsp_edits,
-                    language_server.server_id(),
-                    None,
-                    cx,
-                )
-            })?
-            .await
-        } else {
-            Ok(Vec::with_capacity(0))
-        }
-    }
-
-    async fn format_via_external_command(
-        buffer: &FormattableBuffer,
-        command: &str,
-        arguments: Option<&[String]>,
-        cx: &mut AsyncApp,
-    ) -> Result<Option<Diff>> {
-        let working_dir_path = buffer.handle.update(cx, |buffer, cx| {
-            let file = File::from_dyn(buffer.file())?;
-            let worktree = file.worktree.read(cx);
-            let mut worktree_path = worktree.abs_path().to_path_buf();
-            if worktree.root_entry()?.is_file() {
-                worktree_path.pop();
-            }
-            Some(worktree_path)
-        })?;
-
-        let mut child = util::command::new_smol_command(command);
-
-        if let Some(buffer_env) = buffer.env.as_ref() {
-            child.envs(buffer_env);
-        }
-
-        if let Some(working_dir_path) = working_dir_path {
-            child.current_dir(working_dir_path);
-        }
-
-        if let Some(arguments) = arguments {
-            child.args(arguments.iter().map(|arg| {
-                if let Some(buffer_abs_path) = buffer.abs_path.as_ref() {
-                    arg.replace("{buffer_path}", &buffer_abs_path.to_string_lossy())
-                } else {
-                    arg.replace("{buffer_path}", "Untitled")
-                }
-            }));
-        }
-
-        let mut child = child
-            .stdin(smol::process::Stdio::piped())
-            .stdout(smol::process::Stdio::piped())
-            .stderr(smol::process::Stdio::piped())
-            .spawn()?;
-
-        let stdin = child.stdin.as_mut().context("failed to acquire stdin")?;
-        let text = buffer
-            .handle
-            .read_with(cx, |buffer, _| buffer.as_rope().clone())?;
-        for chunk in text.chunks() {
-            stdin.write_all(chunk.as_bytes()).await?;
-        }
-        stdin.flush().await?;
-
-        let output = child.output().await?;
-        anyhow::ensure!(
-            output.status.success(),
-            "command failed with exit code {:?}:\nstdout: {}\nstderr: {}",
-            output.status.code(),
-            String::from_utf8_lossy(&output.stdout),
-            String::from_utf8_lossy(&output.stderr),
-        );
-
-        let stdout = String::from_utf8(output.stdout)?;
-        Ok(Some(
-            buffer
-                .handle
-                .update(cx, |buffer, cx| buffer.diff(stdout, cx))?
-                .await,
-        ))
-    }
-
-    async fn try_resolve_code_action(
-        lang_server: &LanguageServer,
-        action: &mut CodeAction,
-    ) -> anyhow::Result<()> {
-        match &mut action.lsp_action {
-            LspAction::Action(lsp_action) => {
-                if !action.resolved
-                    && GetCodeActions::can_resolve_actions(&lang_server.capabilities())
-                    && lsp_action.data.is_some()
-                    && (lsp_action.command.is_none() || lsp_action.edit.is_none())
-                {
-                    *lsp_action = Box::new(
-                        lang_server
-                            .request::<lsp::request::CodeActionResolveRequest>(*lsp_action.clone())
-                            .await
-                            .into_response()?,
-                    );
-                }
-            }
-            LspAction::CodeLens(lens) => {
-                if !action.resolved && GetCodeLens::can_resolve_lens(&lang_server.capabilities()) {
-                    *lens = lang_server
-                        .request::<lsp::request::CodeLensResolve>(lens.clone())
-                        .await
-                        .into_response()?;
-                }
-            }
-            LspAction::Command(_) => {}
-        }
-
-        action.resolved = true;
-        anyhow::Ok(())
-    }
-
-    fn initialize_buffer(&mut self, buffer_handle: &Entity<Buffer>, cx: &mut Context<LspStore>) {
-        let buffer = buffer_handle.read(cx);
-
-        let file = buffer.file().cloned();
-
-        let Some(file) = File::from_dyn(file.as_ref()) else {
-            return;
-        };
-        if !file.is_local() {
-            return;
-        }
-        let path = ProjectPath::from_file(file, cx);
-        let worktree_id = file.worktree_id(cx);
-        let language = buffer.language().cloned();
-
-        if let Some(diagnostics) = self.diagnostics.get(&worktree_id) {
-            for (server_id, diagnostics) in
-                diagnostics.get(file.path()).cloned().unwrap_or_default()
-            {
-                self.update_buffer_diagnostics(
-                    buffer_handle,
-                    server_id,
-                    None,
-                    None,
-                    None,
-                    Vec::new(),
-                    diagnostics,
-                    cx,
-                )
-                .log_err();
-            }
-        }
-        let Some(language) = language else {
-            return;
-        };
-        let Some(snapshot) = self
-            .worktree_store
-            .read(cx)
-            .worktree_for_id(worktree_id, cx)
-            .map(|worktree| worktree.read(cx).snapshot())
-        else {
-            return;
-        };
-        let delegate: Arc<dyn ManifestDelegate> = Arc::new(ManifestQueryDelegate::new(snapshot));
-
-        for server_id in
-            self.lsp_tree
-                .get(path, language.name(), language.manifest(), &delegate, cx)
-        {
-            let server = self
-                .language_servers
-                .get(&server_id)
-                .and_then(|server_state| {
-                    if let LanguageServerState::Running { server, .. } = server_state {
-                        Some(server.clone())
-                    } else {
-                        None
-                    }
-                });
-            let server = match server {
-                Some(server) => server,
-                None => continue,
-            };
-
-            buffer_handle.update(cx, |buffer, cx| {
-                buffer.set_completion_triggers(
-                    server.server_id(),
-                    server
-                        .capabilities()
-                        .completion_provider
-                        .as_ref()
-                        .and_then(|provider| {
-                            provider
-                                .trigger_characters
-                                .as_ref()
-                                .map(|characters| characters.iter().cloned().collect())
-                        })
-                        .unwrap_or_default(),
-                    cx,
-                );
-            });
-        }
-    }
-
-    pub(crate) fn reset_buffer(&mut self, buffer: &Entity<Buffer>, old_file: &File, cx: &mut App) {
-        buffer.update(cx, |buffer, cx| {
-            let Some(language) = buffer.language() else {
-                return;
-            };
-            let path = ProjectPath {
-                worktree_id: old_file.worktree_id(cx),
-                path: old_file.path.clone(),
-            };
-            for server_id in self.language_server_ids_for_project_path(path, language, cx) {
-                buffer.update_diagnostics(server_id, DiagnosticSet::new([], buffer), cx);
-                buffer.set_completion_triggers(server_id, Default::default(), cx);
-            }
-        });
-    }
-
-    fn update_buffer_diagnostics(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        server_id: LanguageServerId,
-        registration_id: Option<Option<SharedString>>,
-        result_id: Option<SharedString>,
-        version: Option<i32>,
-        new_diagnostics: Vec<DiagnosticEntry<Unclipped<PointUtf16>>>,
-        reused_diagnostics: Vec<DiagnosticEntry<Unclipped<PointUtf16>>>,
-        cx: &mut Context<LspStore>,
-    ) -> Result<()> {
-        fn compare_diagnostics(a: &Diagnostic, b: &Diagnostic) -> Ordering {
-            Ordering::Equal
-                .then_with(|| b.is_primary.cmp(&a.is_primary))
-                .then_with(|| a.is_disk_based.cmp(&b.is_disk_based))
-                .then_with(|| a.severity.cmp(&b.severity))
-                .then_with(|| a.message.cmp(&b.message))
-        }
-
-        let mut diagnostics = Vec::with_capacity(new_diagnostics.len() + reused_diagnostics.len());
-        diagnostics.extend(new_diagnostics.into_iter().map(|d| (true, d)));
-        diagnostics.extend(reused_diagnostics.into_iter().map(|d| (false, d)));
-
-        diagnostics.sort_unstable_by(|(_, a), (_, b)| {
-            Ordering::Equal
-                .then_with(|| a.range.start.cmp(&b.range.start))
-                .then_with(|| b.range.end.cmp(&a.range.end))
-                .then_with(|| compare_diagnostics(&a.diagnostic, &b.diagnostic))
-        });
-
-        let snapshot = self.buffer_snapshot_for_lsp_version(buffer, server_id, version, cx)?;
-
-        let edits_since_save = std::cell::LazyCell::new(|| {
-            let saved_version = buffer.read(cx).saved_version();
-            Patch::new(snapshot.edits_since::<PointUtf16>(saved_version).collect())
-        });
-
-        let mut sanitized_diagnostics = Vec::with_capacity(diagnostics.len());
-
-        for (new_diagnostic, entry) in diagnostics {
-            let start;
-            let end;
-            if new_diagnostic && entry.diagnostic.is_disk_based {
-                // Some diagnostics are based on files on disk instead of buffers'
-                // current contents. Adjust these diagnostics' ranges to reflect
-                // any unsaved edits.
-                // Do not alter the reused ones though, as their coordinates were stored as anchors
-                // and were properly adjusted on reuse.
-                start = Unclipped((*edits_since_save).old_to_new(entry.range.start.0));
-                end = Unclipped((*edits_since_save).old_to_new(entry.range.end.0));
-            } else {
-                start = entry.range.start;
-                end = entry.range.end;
-            }
-
-            let mut range = snapshot.clip_point_utf16(start, Bias::Left)
-                ..snapshot.clip_point_utf16(end, Bias::Right);
-
-            // Expand empty ranges by one codepoint
-            if range.start == range.end {
-                // This will be go to the next boundary when being clipped
-                range.end.column += 1;
-                range.end = snapshot.clip_point_utf16(Unclipped(range.end), Bias::Right);
-                if range.start == range.end && range.end.column > 0 {
-                    range.start.column -= 1;
-                    range.start = snapshot.clip_point_utf16(Unclipped(range.start), Bias::Left);
-                }
-            }
-
-            sanitized_diagnostics.push(DiagnosticEntry {
-                range,
-                diagnostic: entry.diagnostic,
-            });
-        }
-        drop(edits_since_save);
-
-        let set = DiagnosticSet::new(sanitized_diagnostics, &snapshot);
-        buffer.update(cx, |buffer, cx| {
-            if let Some(registration_id) = registration_id {
-                if let Some(abs_path) = File::from_dyn(buffer.file()).map(|f| f.abs_path(cx)) {
-                    self.buffer_pull_diagnostics_result_ids
-                        .entry(server_id)
-                        .or_default()
-                        .entry(registration_id)
-                        .or_default()
-                        .insert(abs_path, result_id);
-                }
-            }
-
-            buffer.update_diagnostics(server_id, set, cx)
-        });
-
-        Ok(())
-    }
-
-    fn register_language_server_for_invisible_worktree(
-        &mut self,
-        worktree: &Entity<Worktree>,
-        language_server_id: LanguageServerId,
-        cx: &mut App,
-    ) {
-        let worktree = worktree.read(cx);
-        let worktree_id = worktree.id();
-        debug_assert!(!worktree.is_visible());
-        let Some(mut origin_seed) = self
-            .language_server_ids
-            .iter()
-            .find_map(|(seed, state)| (state.id == language_server_id).then(|| seed.clone()))
-        else {
-            return;
-        };
-        origin_seed.worktree_id = worktree_id;
-        self.language_server_ids
-            .entry(origin_seed)
-            .or_insert_with(|| UnifiedLanguageServer {
-                id: language_server_id,
-                project_roots: Default::default(),
-            });
-    }
-
-    fn register_buffer_with_language_servers(
-        &mut self,
-        buffer_handle: &Entity<Buffer>,
-        only_register_servers: HashSet<LanguageServerSelector>,
-        cx: &mut Context<LspStore>,
-    ) {
-        let buffer = buffer_handle.read(cx);
-        let buffer_id = buffer.remote_id();
-
-        let Some(file) = File::from_dyn(buffer.file()) else {
-            return;
-        };
-        if !file.is_local() {
-            return;
-        }
-
-        let abs_path = file.abs_path(cx);
-        let Some(uri) = file_path_to_lsp_url(&abs_path).log_err() else {
-            return;
-        };
-        let initial_snapshot = buffer.text_snapshot();
-        let worktree_id = file.worktree_id(cx);
-
-        let Some(language) = buffer.language().cloned() else {
-            return;
-        };
-        let path: Arc<RelPath> = file
-            .path()
-            .parent()
-            .map(Arc::from)
-            .unwrap_or_else(|| file.path().clone());
-        let Some(worktree) = self
-            .worktree_store
-            .read(cx)
-            .worktree_for_id(worktree_id, cx)
-        else {
-            return;
-        };
-        let language_name = language.name();
-        let (reused, delegate, servers) = self
-            .reuse_existing_language_server(&self.lsp_tree, &worktree, &language_name, cx)
-            .map(|(delegate, apply)| (true, delegate, apply(&mut self.lsp_tree)))
-            .unwrap_or_else(|| {
-                let lsp_delegate = LocalLspAdapterDelegate::from_local_lsp(self, &worktree, cx);
-                let delegate: Arc<dyn ManifestDelegate> =
-                    Arc::new(ManifestQueryDelegate::new(worktree.read(cx).snapshot()));
-
-                let servers = self
-                    .lsp_tree
-                    .walk(
-                        ProjectPath { worktree_id, path },
-                        language.name(),
-                        language.manifest(),
-                        &delegate,
-                        cx,
-                    )
-                    .collect::<Vec<_>>();
-                (false, lsp_delegate, servers)
-            });
-        let servers_and_adapters = servers
-            .into_iter()
-            .filter_map(|server_node| {
-                if reused && server_node.server_id().is_none() {
-                    return None;
-                }
-                if !only_register_servers.is_empty() {
-                    if let Some(server_id) = server_node.server_id()
-                        && !only_register_servers.contains(&LanguageServerSelector::Id(server_id))
-                    {
-                        return None;
-                    }
-                    if let Some(name) = server_node.name()
-                        && !only_register_servers.contains(&LanguageServerSelector::Name(name))
-                    {
-                        return None;
-                    }
-                }
-
-                let server_id = server_node.server_id_or_init(|disposition| {
-                    let path = &disposition.path;
-
-                    {
-                        let uri = Uri::from_file_path(worktree.read(cx).absolutize(&path.path));
-
-                        let server_id = self.get_or_insert_language_server(
-                            &worktree,
-                            delegate.clone(),
-                            disposition,
-                            &language_name,
-                            cx,
-                        );
-
-                        if let Some(state) = self.language_servers.get(&server_id)
-                            && let Ok(uri) = uri
-                        {
-                            state.add_workspace_folder(uri);
-                        };
-                        server_id
-                    }
-                })?;
-                let server_state = self.language_servers.get(&server_id)?;
-                if let LanguageServerState::Running {
-                    server, adapter, ..
-                } = server_state
-                {
-                    Some((server.clone(), adapter.clone()))
-                } else {
-                    None
-                }
-            })
-            .collect::<Vec<_>>();
-        for (server, adapter) in servers_and_adapters {
-            buffer_handle.update(cx, |buffer, cx| {
-                buffer.set_completion_triggers(
-                    server.server_id(),
-                    server
-                        .capabilities()
-                        .completion_provider
-                        .as_ref()
-                        .and_then(|provider| {
-                            provider
-                                .trigger_characters
-                                .as_ref()
-                                .map(|characters| characters.iter().cloned().collect())
-                        })
-                        .unwrap_or_default(),
-                    cx,
-                );
-            });
-
-            let snapshot = LspBufferSnapshot {
-                version: 0,
-                snapshot: initial_snapshot.clone(),
-            };
-
-            let mut registered = false;
-            self.buffer_snapshots
-                .entry(buffer_id)
-                .or_default()
-                .entry(server.server_id())
-                .or_insert_with(|| {
-                    registered = true;
-                    server.register_buffer(
-                        uri.clone(),
-                        adapter.language_id(&language.name()),
-                        0,
-                        initial_snapshot.text(),
-                    );
-
-                    vec![snapshot]
-                });
-
-            self.buffers_opened_in_servers
-                .entry(buffer_id)
-                .or_default()
-                .insert(server.server_id());
-            if registered {
-                cx.emit(LspStoreEvent::LanguageServerUpdate {
-                    language_server_id: server.server_id(),
-                    name: None,
-                    message: proto::update_language_server::Variant::RegisteredForBuffer(
-                        proto::RegisteredForBuffer {
-                            buffer_abs_path: abs_path.to_string_lossy().into_owned(),
-                            buffer_id: buffer_id.to_proto(),
-                        },
-                    ),
-                });
-            }
-        }
-    }
-
-    fn reuse_existing_language_server<'lang_name>(
-        &self,
-        server_tree: &LanguageServerTree,
-        worktree: &Entity<Worktree>,
-        language_name: &'lang_name LanguageName,
-        cx: &mut App,
-    ) -> Option<(
-        Arc<LocalLspAdapterDelegate>,
-        impl FnOnce(&mut LanguageServerTree) -> Vec<LanguageServerTreeNode> + use<'lang_name>,
-    )> {
-        if worktree.read(cx).is_visible() {
-            return None;
-        }
-
-        let worktree_store = self.worktree_store.read(cx);
-        let servers = server_tree
-            .instances
-            .iter()
-            .filter(|(worktree_id, _)| {
-                worktree_store
-                    .worktree_for_id(**worktree_id, cx)
-                    .is_some_and(|worktree| worktree.read(cx).is_visible())
-            })
-            .flat_map(|(worktree_id, servers)| {
-                servers
-                    .roots
-                    .iter()
-                    .flat_map(|(_, language_servers)| language_servers)
-                    .map(move |(_, (server_node, server_languages))| {
-                        (worktree_id, server_node, server_languages)
-                    })
-                    .filter(|(_, _, server_languages)| server_languages.contains(language_name))
-                    .map(|(worktree_id, server_node, _)| {
-                        (
-                            *worktree_id,
-                            LanguageServerTreeNode::from(Arc::downgrade(server_node)),
-                        )
-                    })
-            })
-            .fold(HashMap::default(), |mut acc, (worktree_id, server_node)| {
-                acc.entry(worktree_id)
-                    .or_insert_with(Vec::new)
-                    .push(server_node);
-                acc
-            })
-            .into_values()
-            .max_by_key(|servers| servers.len())?;
-
-        let worktree_id = worktree.read(cx).id();
-        let apply = move |tree: &mut LanguageServerTree| {
-            for server_node in &servers {
-                tree.register_reused(worktree_id, language_name.clone(), server_node.clone());
-            }
-            servers
-        };
-
-        let delegate = LocalLspAdapterDelegate::from_local_lsp(self, worktree, cx);
-        Some((delegate, apply))
-    }
-
-    pub(crate) fn unregister_old_buffer_from_language_servers(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        old_file: &File,
-        cx: &mut App,
-    ) {
-        let old_path = match old_file.as_local() {
-            Some(local) => local.abs_path(cx),
-            None => return,
-        };
-
-        let Ok(file_url) = lsp::Uri::from_file_path(old_path.as_path()) else {
-            debug_panic!("{old_path:?} is not parseable as an URI");
-            return;
-        };
-        self.unregister_buffer_from_language_servers(buffer, &file_url, cx);
-    }
-
-    pub(crate) fn unregister_buffer_from_language_servers(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        file_url: &lsp::Uri,
-        cx: &mut App,
-    ) {
-        buffer.update(cx, |buffer, cx| {
-            let mut snapshots = self.buffer_snapshots.remove(&buffer.remote_id());
-
-            for (_, language_server) in self.language_servers_for_buffer(buffer, cx) {
-                if snapshots
-                    .as_mut()
-                    .is_some_and(|map| map.remove(&language_server.server_id()).is_some())
-                {
-                    language_server.unregister_buffer(file_url.clone());
-                }
-            }
-        });
-    }
-
-    fn buffer_snapshot_for_lsp_version(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        server_id: LanguageServerId,
-        version: Option<i32>,
-        cx: &App,
-    ) -> Result<TextBufferSnapshot> {
-        const OLD_VERSIONS_TO_RETAIN: i32 = 10;
-
-        if let Some(version) = version {
-            let buffer_id = buffer.read(cx).remote_id();
-            let snapshots = if let Some(snapshots) = self
-                .buffer_snapshots
-                .get_mut(&buffer_id)
-                .and_then(|m| m.get_mut(&server_id))
-            {
-                snapshots
-            } else if version == 0 {
-                // Some language servers report version 0 even if the buffer hasn't been opened yet.
-                // We detect this case and treat it as if the version was `None`.
-                return Ok(buffer.read(cx).text_snapshot());
-            } else {
-                anyhow::bail!("no snapshots found for buffer {buffer_id} and server {server_id}");
-            };
-
-            let found_snapshot = snapshots
-                    .binary_search_by_key(&version, |e| e.version)
-                    .map(|ix| snapshots[ix].snapshot.clone())
-                    .map_err(|_| {
-                        anyhow!("snapshot not found for buffer {buffer_id} server {server_id} at version {version}")
-                    })?;
-
-            snapshots.retain(|snapshot| snapshot.version + OLD_VERSIONS_TO_RETAIN >= version);
-            Ok(found_snapshot)
-        } else {
-            Ok((buffer.read(cx)).text_snapshot())
-        }
-    }
-
-    async fn get_server_code_actions_from_action_kinds(
-        lsp_store: &WeakEntity<LspStore>,
-        language_server_id: LanguageServerId,
-        code_action_kinds: Vec<lsp::CodeActionKind>,
-        buffer: &Entity<Buffer>,
-        cx: &mut AsyncApp,
-    ) -> Result<Vec<CodeAction>> {
-        let actions = lsp_store
-            .update(cx, move |this, cx| {
-                let request = GetCodeActions {
-                    range: text::Anchor::min_max_range_for_buffer(buffer.read(cx).remote_id()),
-                    kinds: Some(code_action_kinds),
-                };
-                let server = LanguageServerToQuery::Other(language_server_id);
-                this.request_lsp(buffer.clone(), server, request, cx)
-            })?
-            .await?;
-        Ok(actions)
-    }
-
-    pub async fn execute_code_actions_on_server(
-        lsp_store: &WeakEntity<LspStore>,
-        language_server: &Arc<LanguageServer>,
-
-        actions: Vec<CodeAction>,
-        push_to_history: bool,
-        project_transaction: &mut ProjectTransaction,
-        cx: &mut AsyncApp,
-    ) -> anyhow::Result<()> {
-        for mut action in actions {
-            Self::try_resolve_code_action(language_server, &mut action)
-                .await
-                .context("resolving a formatting code action")?;
-
-            if let Some(edit) = action.lsp_action.edit() {
-                if edit.changes.is_none() && edit.document_changes.is_none() {
-                    continue;
-                }
-
-                let new = Self::deserialize_workspace_edit(
-                    lsp_store.upgrade().context("project dropped")?,
-                    edit.clone(),
-                    push_to_history,
-                    language_server.clone(),
-                    cx,
-                )
-                .await?;
-                project_transaction.0.extend(new.0);
-            }
-
-            if let Some(command) = action.lsp_action.command() {
-                let server_capabilities = language_server.capabilities();
-                let available_commands = server_capabilities
-                    .execute_command_provider
-                    .as_ref()
-                    .map(|options| options.commands.as_slice())
-                    .unwrap_or_default();
-                if available_commands.contains(&command.command) {
-                    lsp_store.update(cx, |lsp_store, _| {
-                        if let LspStoreMode::Local(mode) = &mut lsp_store.mode {
-                            mode.last_workspace_edits_by_language_server
-                                .remove(&language_server.server_id());
-                        }
-                    })?;
-
-                    language_server
-                        .request::<lsp::request::ExecuteCommand>(lsp::ExecuteCommandParams {
-                            command: command.command.clone(),
-                            arguments: command.arguments.clone().unwrap_or_default(),
-                            ..Default::default()
-                        })
-                        .await
-                        .into_response()
-                        .context("execute command")?;
-
-                    lsp_store.update(cx, |this, _| {
-                        if let LspStoreMode::Local(mode) = &mut this.mode {
-                            project_transaction.0.extend(
-                                mode.last_workspace_edits_by_language_server
-                                    .remove(&language_server.server_id())
-                                    .unwrap_or_default()
-                                    .0,
-                            )
-                        }
-                    })?;
-                } else {
-                    log::warn!(
-                        "Cannot execute a command {} not listed in the language server capabilities",
-                        command.command
-                    )
-                }
-            }
-        }
-        Ok(())
-    }
-
-    pub async fn deserialize_text_edits(
-        this: Entity<LspStore>,
-        buffer_to_edit: Entity<Buffer>,
-        edits: Vec<lsp::TextEdit>,
-        push_to_history: bool,
-        _: Arc<CachedLspAdapter>,
-        language_server: Arc<LanguageServer>,
-        cx: &mut AsyncApp,
-    ) -> Result<Option<Transaction>> {
-        let edits = this
-            .update(cx, |this, cx| {
-                this.as_local_mut().unwrap().edits_from_lsp(
-                    &buffer_to_edit,
-                    edits,
-                    language_server.server_id(),
-                    None,
-                    cx,
-                )
-            })?
-            .await?;
-
-        let transaction = buffer_to_edit.update(cx, |buffer, cx| {
-            buffer.finalize_last_transaction();
-            buffer.start_transaction();
-            for (range, text) in edits {
-                buffer.edit([(range, text)], None, cx);
-            }
-
-            if buffer.end_transaction(cx).is_some() {
-                let transaction = buffer.finalize_last_transaction().unwrap().clone();
-                if !push_to_history {
-                    buffer.forget_transaction(transaction.id);
-                }
-                Some(transaction)
-            } else {
-                None
-            }
-        })?;
-
-        Ok(transaction)
-    }
-
-    #[allow(clippy::type_complexity)]
-    pub(crate) fn edits_from_lsp(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        lsp_edits: impl 'static + Send + IntoIterator<Item = lsp::TextEdit>,
-        server_id: LanguageServerId,
-        version: Option<i32>,
-        cx: &mut Context<LspStore>,
-    ) -> Task<Result<Vec<(Range<Anchor>, Arc<str>)>>> {
-        let snapshot = self.buffer_snapshot_for_lsp_version(buffer, server_id, version, cx);
-        cx.background_spawn(async move {
-            let snapshot = snapshot?;
-            let mut lsp_edits = lsp_edits
-                .into_iter()
-                .map(|edit| (range_from_lsp(edit.range), edit.new_text))
-                .collect::<Vec<_>>();
-
-            lsp_edits.sort_by_key(|(range, _)| (range.start, range.end));
-
-            let mut lsp_edits = lsp_edits.into_iter().peekable();
-            let mut edits = Vec::new();
-            while let Some((range, mut new_text)) = lsp_edits.next() {
-                // Clip invalid ranges provided by the language server.
-                let mut range = snapshot.clip_point_utf16(range.start, Bias::Left)
-                    ..snapshot.clip_point_utf16(range.end, Bias::Left);
-
-                // Combine any LSP edits that are adjacent.
-                //
-                // Also, combine LSP edits that are separated from each other by only
-                // a newline. This is important because for some code actions,
-                // Rust-analyzer rewrites the entire buffer via a series of edits that
-                // are separated by unchanged newline characters.
-                //
-                // In order for the diffing logic below to work properly, any edits that
-                // cancel each other out must be combined into one.
-                while let Some((next_range, next_text)) = lsp_edits.peek() {
-                    if next_range.start.0 > range.end {
-                        if next_range.start.0.row > range.end.row + 1
-                            || next_range.start.0.column > 0
-                            || snapshot.clip_point_utf16(
-                                Unclipped(PointUtf16::new(range.end.row, u32::MAX)),
-                                Bias::Left,
-                            ) > range.end
-                        {
-                            break;
-                        }
-                        new_text.push('\n');
-                    }
-                    range.end = snapshot.clip_point_utf16(next_range.end, Bias::Left);
-                    new_text.push_str(next_text);
-                    lsp_edits.next();
-                }
-
-                // For multiline edits, perform a diff of the old and new text so that
-                // we can identify the changes more precisely, preserving the locations
-                // of any anchors positioned in the unchanged regions.
-                if range.end.row > range.start.row {
-                    let offset = range.start.to_offset(&snapshot);
-                    let old_text = snapshot.text_for_range(range).collect::<String>();
-                    let range_edits = language::text_diff(old_text.as_str(), &new_text);
-                    edits.extend(range_edits.into_iter().map(|(range, replacement)| {
-                        (
-                            snapshot.anchor_after(offset + range.start)
-                                ..snapshot.anchor_before(offset + range.end),
-                            replacement,
-                        )
-                    }));
-                } else if range.end == range.start {
-                    let anchor = snapshot.anchor_after(range.start);
-                    edits.push((anchor..anchor, new_text.into()));
-                } else {
-                    let edit_start = snapshot.anchor_after(range.start);
-                    let edit_end = snapshot.anchor_before(range.end);
-                    edits.push((edit_start..edit_end, new_text.into()));
-                }
-            }
-
-            Ok(edits)
-        })
-    }
-
-    pub(crate) async fn deserialize_workspace_edit(
-        this: Entity<LspStore>,
-        edit: lsp::WorkspaceEdit,
-        push_to_history: bool,
-        language_server: Arc<LanguageServer>,
-        cx: &mut AsyncApp,
-    ) -> Result<ProjectTransaction> {
-        let fs = this.read_with(cx, |this, _| this.as_local().unwrap().fs.clone())?;
-
-        let mut operations = Vec::new();
-        if let Some(document_changes) = edit.document_changes {
-            match document_changes {
-                lsp::DocumentChanges::Edits(edits) => {
-                    operations.extend(edits.into_iter().map(lsp::DocumentChangeOperation::Edit))
-                }
-                lsp::DocumentChanges::Operations(ops) => operations = ops,
-            }
-        } else if let Some(changes) = edit.changes {
-            operations.extend(changes.into_iter().map(|(uri, edits)| {
-                lsp::DocumentChangeOperation::Edit(lsp::TextDocumentEdit {
-                    text_document: lsp::OptionalVersionedTextDocumentIdentifier {
-                        uri,
-                        version: None,
-                    },
-                    edits: edits.into_iter().map(Edit::Plain).collect(),
-                })
-            }));
-        }
-
-        let mut project_transaction = ProjectTransaction::default();
-        for operation in operations {
-            match operation {
-                lsp::DocumentChangeOperation::Op(lsp::ResourceOp::Create(op)) => {
-                    let abs_path = op
-                        .uri
-                        .to_file_path()
-                        .map_err(|()| anyhow!("can't convert URI to path"))?;
-
-                    if let Some(parent_path) = abs_path.parent() {
-                        fs.create_dir(parent_path).await?;
-                    }
-                    if abs_path.ends_with("/") {
-                        fs.create_dir(&abs_path).await?;
-                    } else {
-                        fs.create_file(
-                            &abs_path,
-                            op.options
-                                .map(|options| fs::CreateOptions {
-                                    overwrite: options.overwrite.unwrap_or(false),
-                                    ignore_if_exists: options.ignore_if_exists.unwrap_or(false),
-                                })
-                                .unwrap_or_default(),
-                        )
-                        .await?;
-                    }
-                }
-
-                lsp::DocumentChangeOperation::Op(lsp::ResourceOp::Rename(op)) => {
-                    let source_abs_path = op
-                        .old_uri
-                        .to_file_path()
-                        .map_err(|()| anyhow!("can't convert URI to path"))?;
-                    let target_abs_path = op
-                        .new_uri
-                        .to_file_path()
-                        .map_err(|()| anyhow!("can't convert URI to path"))?;
-
-                    let options = fs::RenameOptions {
-                        overwrite: op
-                            .options
-                            .as_ref()
-                            .and_then(|options| options.overwrite)
-                            .unwrap_or(false),
-                        ignore_if_exists: op
-                            .options
-                            .as_ref()
-                            .and_then(|options| options.ignore_if_exists)
-                            .unwrap_or(false),
-                        create_parents: true,
-                    };
-
-                    fs.rename(&source_abs_path, &target_abs_path, options)
-                        .await?;
-                }
-
-                lsp::DocumentChangeOperation::Op(lsp::ResourceOp::Delete(op)) => {
-                    let abs_path = op
-                        .uri
-                        .to_file_path()
-                        .map_err(|()| anyhow!("can't convert URI to path"))?;
-                    let options = op
-                        .options
-                        .map(|options| fs::RemoveOptions {
-                            recursive: options.recursive.unwrap_or(false),
-                            ignore_if_not_exists: options.ignore_if_not_exists.unwrap_or(false),
-                        })
-                        .unwrap_or_default();
-                    if abs_path.ends_with("/") {
-                        fs.remove_dir(&abs_path, options).await?;
-                    } else {
-                        fs.remove_file(&abs_path, options).await?;
-                    }
-                }
-
-                lsp::DocumentChangeOperation::Edit(op) => {
-                    let buffer_to_edit = this
-                        .update(cx, |this, cx| {
-                            this.open_local_buffer_via_lsp(
-                                op.text_document.uri.clone(),
-                                language_server.server_id(),
-                                cx,
-                            )
-                        })?
-                        .await?;
-
-                    let edits = this
-                        .update(cx, |this, cx| {
-                            let path = buffer_to_edit.read(cx).project_path(cx);
-                            let active_entry = this.active_entry;
-                            let is_active_entry = path.is_some_and(|project_path| {
-                                this.worktree_store
-                                    .read(cx)
-                                    .entry_for_path(&project_path, cx)
-                                    .is_some_and(|entry| Some(entry.id) == active_entry)
-                            });
-                            let local = this.as_local_mut().unwrap();
-
-                            let (mut edits, mut snippet_edits) = (vec![], vec![]);
-                            for edit in op.edits {
-                                match edit {
-                                    Edit::Plain(edit) => {
-                                        if !edits.contains(&edit) {
-                                            edits.push(edit)
-                                        }
-                                    }
-                                    Edit::Annotated(edit) => {
-                                        if !edits.contains(&edit.text_edit) {
-                                            edits.push(edit.text_edit)
-                                        }
-                                    }
-                                    Edit::Snippet(edit) => {
-                                        let Ok(snippet) = Snippet::parse(&edit.snippet.value)
-                                        else {
-                                            continue;
-                                        };
-
-                                        if is_active_entry {
-                                            snippet_edits.push((edit.range, snippet));
-                                        } else {
-                                            // Since this buffer is not focused, apply a normal edit.
-                                            let new_edit = TextEdit {
-                                                range: edit.range,
-                                                new_text: snippet.text,
-                                            };
-                                            if !edits.contains(&new_edit) {
-                                                edits.push(new_edit);
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                            if !snippet_edits.is_empty() {
-                                let buffer_id = buffer_to_edit.read(cx).remote_id();
-                                let version = if let Some(buffer_version) = op.text_document.version
-                                {
-                                    local
-                                        .buffer_snapshot_for_lsp_version(
-                                            &buffer_to_edit,
-                                            language_server.server_id(),
-                                            Some(buffer_version),
-                                            cx,
-                                        )
-                                        .ok()
-                                        .map(|snapshot| snapshot.version)
-                                } else {
-                                    Some(buffer_to_edit.read(cx).saved_version().clone())
-                                };
-
-                                let most_recent_edit =
-                                    version.and_then(|version| version.most_recent());
-                                // Check if the edit that triggered that edit has been made by this participant.
-
-                                if let Some(most_recent_edit) = most_recent_edit {
-                                    cx.emit(LspStoreEvent::SnippetEdit {
-                                        buffer_id,
-                                        edits: snippet_edits,
-                                        most_recent_edit,
-                                    });
-                                }
-                            }
-
-                            local.edits_from_lsp(
-                                &buffer_to_edit,
-                                edits,
-                                language_server.server_id(),
-                                op.text_document.version,
-                                cx,
-                            )
-                        })?
-                        .await?;
-
-                    let transaction = buffer_to_edit.update(cx, |buffer, cx| {
-                        buffer.finalize_last_transaction();
-                        buffer.start_transaction();
-                        for (range, text) in edits {
-                            buffer.edit([(range, text)], None, cx);
-                        }
-
-                        buffer.end_transaction(cx).and_then(|transaction_id| {
-                            if push_to_history {
-                                buffer.finalize_last_transaction();
-                                buffer.get_transaction(transaction_id).cloned()
-                            } else {
-                                buffer.forget_transaction(transaction_id)
-                            }
-                        })
-                    })?;
-                    if let Some(transaction) = transaction {
-                        project_transaction.0.insert(buffer_to_edit, transaction);
-                    }
-                }
-            }
-        }
-
-        Ok(project_transaction)
-    }
-
-    async fn on_lsp_workspace_edit(
-        this: WeakEntity<LspStore>,
-        params: lsp::ApplyWorkspaceEditParams,
-        server_id: LanguageServerId,
-        cx: &mut AsyncApp,
-    ) -> Result<lsp::ApplyWorkspaceEditResponse> {
-        let this = this.upgrade().context("project project closed")?;
-        let language_server = this
-            .read_with(cx, |this, _| this.language_server_for_id(server_id))?
-            .context("language server not found")?;
-        let transaction = Self::deserialize_workspace_edit(
-            this.clone(),
-            params.edit,
-            true,
-            language_server.clone(),
-            cx,
-        )
-        .await
-        .log_err();
-        this.update(cx, |this, _| {
-            if let Some(transaction) = transaction {
-                this.as_local_mut()
-                    .unwrap()
-                    .last_workspace_edits_by_language_server
-                    .insert(server_id, transaction);
-            }
-        })?;
-        Ok(lsp::ApplyWorkspaceEditResponse {
-            applied: true,
-            failed_change: None,
-            failure_reason: None,
-        })
-    }
-
-    fn remove_worktree(
-        &mut self,
-        id_to_remove: WorktreeId,
-        cx: &mut Context<LspStore>,
-    ) -> Vec<LanguageServerId> {
-        self.diagnostics.remove(&id_to_remove);
-        self.prettier_store.update(cx, |prettier_store, cx| {
-            prettier_store.remove_worktree(id_to_remove, cx);
-        });
-
-        let mut servers_to_remove = BTreeSet::default();
-        let mut servers_to_preserve = HashSet::default();
-        for (seed, state) in &self.language_server_ids {
-            if seed.worktree_id == id_to_remove {
-                servers_to_remove.insert(state.id);
-            } else {
-                servers_to_preserve.insert(state.id);
-            }
-        }
-        servers_to_remove.retain(|server_id| !servers_to_preserve.contains(server_id));
-        self.language_server_ids
-            .retain(|_, state| !servers_to_remove.contains(&state.id));
-        for server_id_to_remove in &servers_to_remove {
-            self.language_server_watched_paths
-                .remove(server_id_to_remove);
-            self.language_server_paths_watched_for_rename
-                .remove(server_id_to_remove);
-            self.last_workspace_edits_by_language_server
-                .remove(server_id_to_remove);
-            self.language_servers.remove(server_id_to_remove);
-            self.buffer_pull_diagnostics_result_ids
-                .remove(server_id_to_remove);
-            self.workspace_pull_diagnostics_result_ids
-                .remove(server_id_to_remove);
-            for buffer_servers in self.buffers_opened_in_servers.values_mut() {
-                buffer_servers.remove(server_id_to_remove);
-            }
-            cx.emit(LspStoreEvent::LanguageServerRemoved(*server_id_to_remove));
-        }
-        servers_to_remove.into_iter().collect()
-    }
-
-    fn rebuild_watched_paths_inner<'a>(
-        &'a self,
-        language_server_id: LanguageServerId,
-        watchers: impl Iterator<Item = &'a FileSystemWatcher>,
-        cx: &mut Context<LspStore>,
-    ) -> LanguageServerWatchedPathsBuilder {
-        let worktrees = self
-            .worktree_store
-            .read(cx)
-            .worktrees()
-            .filter_map(|worktree| {
-                self.language_servers_for_worktree(worktree.read(cx).id())
-                    .find(|server| server.server_id() == language_server_id)
-                    .map(|_| worktree)
-            })
-            .collect::<Vec<_>>();
-
-        let mut worktree_globs = HashMap::default();
-        let mut abs_globs = HashMap::default();
-        log::trace!(
-            "Processing new watcher paths for language server with id {}",
-            language_server_id
-        );
-
-        for watcher in watchers {
-            if let Some((worktree, literal_prefix, pattern)) =
-                Self::worktree_and_path_for_file_watcher(&worktrees, watcher, cx)
-            {
-                worktree.update(cx, |worktree, _| {
-                    if let Some((tree, glob)) =
-                        worktree.as_local_mut().zip(Glob::new(&pattern).log_err())
-                    {
-                        tree.add_path_prefix_to_scan(literal_prefix);
-                        worktree_globs
-                            .entry(tree.id())
-                            .or_insert_with(GlobSetBuilder::new)
-                            .add(glob);
-                    }
-                });
-            } else {
-                let (path, pattern) = match &watcher.glob_pattern {
-                    lsp::GlobPattern::String(s) => {
-                        let watcher_path = SanitizedPath::new(s);
-                        let path = glob_literal_prefix(watcher_path.as_path());
-                        let pattern = watcher_path
-                            .as_path()
-                            .strip_prefix(&path)
-                            .map(|p| p.to_string_lossy().into_owned())
-                            .unwrap_or_else(|e| {
-                                debug_panic!(
-                                    "Failed to strip prefix for string pattern: {}, with prefix: {}, with error: {}",
-                                    s,
-                                    path.display(),
-                                    e
-                                );
-                                watcher_path.as_path().to_string_lossy().into_owned()
-                            });
-                        (path, pattern)
-                    }
-                    lsp::GlobPattern::Relative(rp) => {
-                        let Ok(mut base_uri) = match &rp.base_uri {
-                            lsp::OneOf::Left(workspace_folder) => &workspace_folder.uri,
-                            lsp::OneOf::Right(base_uri) => base_uri,
-                        }
-                        .to_file_path() else {
-                            continue;
-                        };
-
-                        let path = glob_literal_prefix(Path::new(&rp.pattern));
-                        let pattern = Path::new(&rp.pattern)
-                            .strip_prefix(&path)
-                            .map(|p| p.to_string_lossy().into_owned())
-                            .unwrap_or_else(|e| {
-                                debug_panic!(
-                                    "Failed to strip prefix for relative pattern: {}, with prefix: {}, with error: {}",
-                                    rp.pattern,
-                                    path.display(),
-                                    e
-                                );
-                                rp.pattern.clone()
-                            });
-                        base_uri.push(path);
-                        (base_uri, pattern)
-                    }
-                };
-
-                if let Some(glob) = Glob::new(&pattern).log_err() {
-                    if !path
-                        .components()
-                        .any(|c| matches!(c, path::Component::Normal(_)))
-                    {
-                        // For an unrooted glob like `**/Cargo.toml`, watch it within each worktree,
-                        // rather than adding a new watcher for `/`.
-                        for worktree in &worktrees {
-                            worktree_globs
-                                .entry(worktree.read(cx).id())
-                                .or_insert_with(GlobSetBuilder::new)
-                                .add(glob.clone());
-                        }
-                    } else {
-                        abs_globs
-                            .entry(path.into())
-                            .or_insert_with(GlobSetBuilder::new)
-                            .add(glob);
-                    }
-                }
-            }
-        }
-
-        let mut watch_builder = LanguageServerWatchedPathsBuilder::default();
-        for (worktree_id, builder) in worktree_globs {
-            if let Ok(globset) = builder.build() {
-                watch_builder.watch_worktree(worktree_id, globset);
-            }
-        }
-        for (abs_path, builder) in abs_globs {
-            if let Ok(globset) = builder.build() {
-                watch_builder.watch_abs_path(abs_path, globset);
-            }
-        }
-        watch_builder
-    }
-
-    fn worktree_and_path_for_file_watcher(
-        worktrees: &[Entity<Worktree>],
-        watcher: &FileSystemWatcher,
-        cx: &App,
-    ) -> Option<(Entity<Worktree>, Arc<RelPath>, String)> {
-        worktrees.iter().find_map(|worktree| {
-            let tree = worktree.read(cx);
-            let worktree_root_path = tree.abs_path();
-            let path_style = tree.path_style();
-            match &watcher.glob_pattern {
-                lsp::GlobPattern::String(s) => {
-                    let watcher_path = SanitizedPath::new(s);
-                    let relative = watcher_path
-                        .as_path()
-                        .strip_prefix(&worktree_root_path)
-                        .ok()?;
-                    let literal_prefix = glob_literal_prefix(relative);
-                    Some((
-                        worktree.clone(),
-                        RelPath::new(&literal_prefix, path_style).ok()?.into_arc(),
-                        relative.to_string_lossy().into_owned(),
-                    ))
-                }
-                lsp::GlobPattern::Relative(rp) => {
-                    let base_uri = match &rp.base_uri {
-                        lsp::OneOf::Left(workspace_folder) => &workspace_folder.uri,
-                        lsp::OneOf::Right(base_uri) => base_uri,
-                    }
-                    .to_file_path()
-                    .ok()?;
-                    let relative = base_uri.strip_prefix(&worktree_root_path).ok()?;
-                    let mut literal_prefix = relative.to_owned();
-                    literal_prefix.push(glob_literal_prefix(Path::new(&rp.pattern)));
-                    Some((
-                        worktree.clone(),
-                        RelPath::new(&literal_prefix, path_style).ok()?.into_arc(),
-                        rp.pattern.clone(),
-                    ))
-                }
-            }
-        })
-    }
-
-    fn rebuild_watched_paths(
-        &mut self,
-        language_server_id: LanguageServerId,
-        cx: &mut Context<LspStore>,
-    ) {
-        let Some(registrations) = self
-            .language_server_dynamic_registrations
-            .get(&language_server_id)
-        else {
-            return;
-        };
-
-        let watch_builder = self.rebuild_watched_paths_inner(
-            language_server_id,
-            registrations.did_change_watched_files.values().flatten(),
-            cx,
-        );
-        let watcher = watch_builder.build(self.fs.clone(), language_server_id, cx);
-        self.language_server_watched_paths
-            .insert(language_server_id, watcher);
-
-        cx.notify();
-    }
-
-    fn on_lsp_did_change_watched_files(
-        &mut self,
-        language_server_id: LanguageServerId,
-        registration_id: &str,
-        params: DidChangeWatchedFilesRegistrationOptions,
-        cx: &mut Context<LspStore>,
-    ) {
-        let registrations = self
-            .language_server_dynamic_registrations
-            .entry(language_server_id)
-            .or_default();
-
-        registrations
-            .did_change_watched_files
-            .insert(registration_id.to_string(), params.watchers);
-
-        self.rebuild_watched_paths(language_server_id, cx);
-    }
-
-    fn on_lsp_unregister_did_change_watched_files(
-        &mut self,
-        language_server_id: LanguageServerId,
-        registration_id: &str,
-        cx: &mut Context<LspStore>,
-    ) {
-        let registrations = self
-            .language_server_dynamic_registrations
-            .entry(language_server_id)
-            .or_default();
-
-        if registrations
-            .did_change_watched_files
-            .remove(registration_id)
-            .is_some()
-        {
-            log::info!(
-                "language server {}: unregistered workspace/DidChangeWatchedFiles capability with id {}",
-                language_server_id,
-                registration_id
-            );
-        } else {
-            log::warn!(
-                "language server {}: failed to unregister workspace/DidChangeWatchedFiles capability with id {}. not registered.",
-                language_server_id,
-                registration_id
-            );
-        }
-
-        self.rebuild_watched_paths(language_server_id, cx);
-    }
-
-    async fn initialization_options_for_adapter(
-        adapter: Arc<dyn LspAdapter>,
-        delegate: &Arc<dyn LspAdapterDelegate>,
-    ) -> Result<Option<serde_json::Value>> {
-        let Some(mut initialization_config) =
-            adapter.clone().initialization_options(delegate).await?
-        else {
-            return Ok(None);
-        };
-
-        for other_adapter in delegate.registered_lsp_adapters() {
-            if other_adapter.name() == adapter.name() {
-                continue;
-            }
-            if let Ok(Some(target_config)) = other_adapter
-                .clone()
-                .additional_initialization_options(adapter.name(), delegate)
-                .await
-            {
-                merge_json_value_into(target_config.clone(), &mut initialization_config);
-            }
-        }
-
-        Ok(Some(initialization_config))
-    }
-
-    async fn workspace_configuration_for_adapter(
-        adapter: Arc<dyn LspAdapter>,
-        delegate: &Arc<dyn LspAdapterDelegate>,
-        toolchain: Option<Toolchain>,
-        requested_uri: Option<Uri>,
-        cx: &mut AsyncApp,
-    ) -> Result<serde_json::Value> {
-        let mut workspace_config = adapter
-            .clone()
-            .workspace_configuration(delegate, toolchain, requested_uri, cx)
-            .await?;
-
-        for other_adapter in delegate.registered_lsp_adapters() {
-            if other_adapter.name() == adapter.name() {
-                continue;
-            }
-            if let Ok(Some(target_config)) = other_adapter
-                .clone()
-                .additional_workspace_configuration(adapter.name(), delegate, cx)
-                .await
-            {
-                merge_json_value_into(target_config.clone(), &mut workspace_config);
-            }
-        }
-
-        Ok(workspace_config)
-    }
-
-    fn language_server_for_id(&self, id: LanguageServerId) -> Option<Arc<LanguageServer>> {
-        if let Some(LanguageServerState::Running { server, .. }) = self.language_servers.get(&id) {
-            Some(server.clone())
-        } else if let Some((_, server)) = self.supplementary_language_servers.get(&id) {
-            Some(Arc::clone(server))
-        } else {
-            None
-        }
-    }
-}
-
-fn notify_server_capabilities_updated(server: &LanguageServer, cx: &mut Context<LspStore>) {
-    if let Some(capabilities) = serde_json::to_string(&server.capabilities()).ok() {
-        cx.emit(LspStoreEvent::LanguageServerUpdate {
-            language_server_id: server.server_id(),
-            name: Some(server.name()),
-            message: proto::update_language_server::Variant::MetadataUpdated(
-                proto::ServerMetadataUpdated {
-                    capabilities: Some(capabilities),
-                    binary: Some(proto::LanguageServerBinaryInfo {
-                        path: server.binary().path.to_string_lossy().into_owned(),
-                        arguments: server
-                            .binary()
-                            .arguments
-                            .iter()
-                            .map(|arg| arg.to_string_lossy().into_owned())
-                            .collect(),
-                    }),
-                    configuration: serde_json::to_string(server.configuration()).ok(),
-                    workspace_folders: server
-                        .workspace_folders()
-                        .iter()
-                        .map(|uri| uri.to_string())
-                        .collect(),
-                },
-            ),
-        });
-    }
-}
-
-#[derive(Debug)]
-pub struct FormattableBuffer {
-    handle: Entity<Buffer>,
-    abs_path: Option<PathBuf>,
-    env: Option<HashMap<String, String>>,
-    ranges: Option<Vec<Range<Anchor>>>,
-}
-
-pub struct RemoteLspStore {
-    upstream_client: Option<AnyProtoClient>,
-    upstream_project_id: u64,
-}
-
-pub(crate) enum LspStoreMode {
-    Local(LocalLspStore),   // ssh host and collab host
-    Remote(RemoteLspStore), // collab guest
-}
-
-impl LspStoreMode {
-    fn is_local(&self) -> bool {
-        matches!(self, LspStoreMode::Local(_))
-    }
-}
-
-pub struct LspStore {
-    mode: LspStoreMode,
-    last_formatting_failure: Option<String>,
-    downstream_client: Option<(AnyProtoClient, u64)>,
-    nonce: u128,
-    buffer_store: Entity<BufferStore>,
-    worktree_store: Entity<WorktreeStore>,
-    pub languages: Arc<LanguageRegistry>,
-    pub language_server_statuses: BTreeMap<LanguageServerId, LanguageServerStatus>,
-    active_entry: Option<ProjectEntryId>,
-    _maintain_workspace_config: (Task<Result<()>>, watch::Sender<()>),
-    _maintain_buffer_languages: Task<()>,
-    diagnostic_summaries:
-        HashMap<WorktreeId, HashMap<Arc<RelPath>, HashMap<LanguageServerId, DiagnosticSummary>>>,
-    pub lsp_server_capabilities: HashMap<LanguageServerId, lsp::ServerCapabilities>,
-    lsp_data: HashMap<BufferId, BufferLspData>,
-    next_hint_id: Arc<AtomicUsize>,
-}
-
-#[derive(Debug)]
-pub struct BufferLspData {
-    buffer_version: Global,
-    document_colors: Option<DocumentColorData>,
-    code_lens: Option<CodeLensData>,
-    inlay_hints: BufferInlayHints,
-    lsp_requests: HashMap<LspKey, HashMap<LspRequestId, Task<()>>>,
-    chunk_lsp_requests: HashMap<LspKey, HashMap<RowChunk, LspRequestId>>,
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-struct LspKey {
-    request_type: TypeId,
-    server_queried: Option<LanguageServerId>,
-}
-
-impl BufferLspData {
-    fn new(buffer: &Entity<Buffer>, cx: &mut App) -> Self {
-        Self {
-            buffer_version: buffer.read(cx).version(),
-            document_colors: None,
-            code_lens: None,
-            inlay_hints: BufferInlayHints::new(buffer, cx),
-            lsp_requests: HashMap::default(),
-            chunk_lsp_requests: HashMap::default(),
-        }
-    }
-
-    fn remove_server_data(&mut self, for_server: LanguageServerId) {
-        if let Some(document_colors) = &mut self.document_colors {
-            document_colors.colors.remove(&for_server);
-            document_colors.cache_version += 1;
-        }
-
-        if let Some(code_lens) = &mut self.code_lens {
-            code_lens.lens.remove(&for_server);
-        }
-
-        self.inlay_hints.remove_server_data(for_server);
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn inlay_hints(&self) -> &BufferInlayHints {
-        &self.inlay_hints
-    }
-}
-
-#[derive(Debug, Default, Clone)]
-pub struct DocumentColors {
-    pub colors: HashSet<DocumentColor>,
-    pub cache_version: Option<usize>,
-}
-
-type DocumentColorTask = Shared<Task<std::result::Result<DocumentColors, Arc<anyhow::Error>>>>;
-type CodeLensTask = Shared<Task<std::result::Result<Option<Vec<CodeAction>>, Arc<anyhow::Error>>>>;
-
-#[derive(Debug, Default)]
-struct DocumentColorData {
-    colors: HashMap<LanguageServerId, HashSet<DocumentColor>>,
-    cache_version: usize,
-    colors_update: Option<(Global, DocumentColorTask)>,
-}
-
-#[derive(Debug, Default)]
-struct CodeLensData {
-    lens: HashMap<LanguageServerId, Vec<CodeAction>>,
-    update: Option<(Global, CodeLensTask)>,
-}
-
-#[derive(Debug)]
-pub enum LspStoreEvent {
-    LanguageServerAdded(LanguageServerId, LanguageServerName, Option<WorktreeId>),
-    LanguageServerRemoved(LanguageServerId),
-    LanguageServerUpdate {
-        language_server_id: LanguageServerId,
-        name: Option<LanguageServerName>,
-        message: proto::update_language_server::Variant,
-    },
-    LanguageServerLog(LanguageServerId, LanguageServerLogType, String),
-    LanguageServerPrompt(LanguageServerPromptRequest),
-    LanguageDetected {
-        buffer: Entity<Buffer>,
-        new_language: Option<Arc<Language>>,
-    },
-    Notification(String),
-    RefreshInlayHints {
-        server_id: LanguageServerId,
-        request_id: Option<usize>,
-    },
-    RefreshCodeLens,
-    DiagnosticsUpdated {
-        server_id: LanguageServerId,
-        paths: Vec<ProjectPath>,
-    },
-    DiskBasedDiagnosticsStarted {
-        language_server_id: LanguageServerId,
-    },
-    DiskBasedDiagnosticsFinished {
-        language_server_id: LanguageServerId,
-    },
-    SnippetEdit {
-        buffer_id: BufferId,
-        edits: Vec<(lsp::Range, Snippet)>,
-        most_recent_edit: clock::Lamport,
-    },
-}
-
-#[derive(Clone, Debug, Serialize)]
-pub struct LanguageServerStatus {
-    pub name: LanguageServerName,
-    pub pending_work: BTreeMap<ProgressToken, LanguageServerProgress>,
-    pub has_pending_diagnostic_updates: bool,
-    pub progress_tokens: HashSet<ProgressToken>,
-    pub worktree: Option<WorktreeId>,
-    pub binary: Option<LanguageServerBinary>,
-    pub configuration: Option<Value>,
-    pub workspace_folders: BTreeSet<Uri>,
-}
-
-#[derive(Clone, Debug)]
-struct CoreSymbol {
-    pub language_server_name: LanguageServerName,
-    pub source_worktree_id: WorktreeId,
-    pub source_language_server_id: LanguageServerId,
-    pub path: SymbolLocation,
-    pub name: String,
-    pub kind: lsp::SymbolKind,
-    pub range: Range<Unclipped<PointUtf16>>,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum SymbolLocation {
-    InProject(ProjectPath),
-    OutsideProject {
-        abs_path: Arc<Path>,
-        signature: [u8; 32],
-    },
-}
-
-impl SymbolLocation {
-    fn file_name(&self) -> Option<&str> {
-        match self {
-            Self::InProject(path) => path.path.file_name(),
-            Self::OutsideProject { abs_path, .. } => abs_path.file_name()?.to_str(),
-        }
-    }
-}
-
-impl LspStore {
-    pub fn init(client: &AnyProtoClient) {
-        client.add_entity_request_handler(Self::handle_lsp_query);
-        client.add_entity_message_handler(Self::handle_lsp_query_response);
-        client.add_entity_request_handler(Self::handle_restart_language_servers);
-        client.add_entity_request_handler(Self::handle_stop_language_servers);
-        client.add_entity_request_handler(Self::handle_cancel_language_server_work);
-        client.add_entity_message_handler(Self::handle_start_language_server);
-        client.add_entity_message_handler(Self::handle_update_language_server);
-        client.add_entity_message_handler(Self::handle_language_server_log);
-        client.add_entity_message_handler(Self::handle_update_diagnostic_summary);
-        client.add_entity_request_handler(Self::handle_format_buffers);
-        client.add_entity_request_handler(Self::handle_apply_code_action_kind);
-        client.add_entity_request_handler(Self::handle_resolve_completion_documentation);
-        client.add_entity_request_handler(Self::handle_apply_code_action);
-        client.add_entity_request_handler(Self::handle_get_project_symbols);
-        client.add_entity_request_handler(Self::handle_resolve_inlay_hint);
-        client.add_entity_request_handler(Self::handle_get_color_presentation);
-        client.add_entity_request_handler(Self::handle_open_buffer_for_symbol);
-        client.add_entity_request_handler(Self::handle_refresh_inlay_hints);
-        client.add_entity_request_handler(Self::handle_refresh_code_lens);
-        client.add_entity_request_handler(Self::handle_on_type_formatting);
-        client.add_entity_request_handler(Self::handle_apply_additional_edits_for_completion);
-        client.add_entity_request_handler(Self::handle_register_buffer_with_language_servers);
-        client.add_entity_request_handler(Self::handle_rename_project_entry);
-        client.add_entity_request_handler(Self::handle_pull_workspace_diagnostics);
-        client.add_entity_request_handler(Self::handle_lsp_get_completions);
-        client.add_entity_request_handler(Self::handle_lsp_command::<GetDocumentHighlights>);
-        client.add_entity_request_handler(Self::handle_lsp_command::<GetDocumentSymbols>);
-        client.add_entity_request_handler(Self::handle_lsp_command::<PrepareRename>);
-        client.add_entity_request_handler(Self::handle_lsp_command::<PerformRename>);
-        client.add_entity_request_handler(Self::handle_lsp_command::<LinkedEditingRange>);
-
-        client.add_entity_request_handler(Self::handle_lsp_ext_cancel_flycheck);
-        client.add_entity_request_handler(Self::handle_lsp_ext_run_flycheck);
-        client.add_entity_request_handler(Self::handle_lsp_ext_clear_flycheck);
-        client.add_entity_request_handler(Self::handle_lsp_command::<lsp_ext_command::ExpandMacro>);
-        client.add_entity_request_handler(Self::handle_lsp_command::<lsp_ext_command::OpenDocs>);
-        client.add_entity_request_handler(
-            Self::handle_lsp_command::<lsp_ext_command::GoToParentModule>,
-        );
-        client.add_entity_request_handler(
-            Self::handle_lsp_command::<lsp_ext_command::GetLspRunnables>,
-        );
-        client.add_entity_request_handler(
-            Self::handle_lsp_command::<lsp_ext_command::SwitchSourceHeader>,
-        );
-    }
-
-    pub fn as_remote(&self) -> Option<&RemoteLspStore> {
-        match &self.mode {
-            LspStoreMode::Remote(remote_lsp_store) => Some(remote_lsp_store),
-            _ => None,
-        }
-    }
-
-    pub fn as_local(&self) -> Option<&LocalLspStore> {
-        match &self.mode {
-            LspStoreMode::Local(local_lsp_store) => Some(local_lsp_store),
-            _ => None,
-        }
-    }
-
-    pub fn as_local_mut(&mut self) -> Option<&mut LocalLspStore> {
-        match &mut self.mode {
-            LspStoreMode::Local(local_lsp_store) => Some(local_lsp_store),
-            _ => None,
-        }
-    }
-
-    pub fn upstream_client(&self) -> Option<(AnyProtoClient, u64)> {
-        match &self.mode {
-            LspStoreMode::Remote(RemoteLspStore {
-                upstream_client: Some(upstream_client),
-                upstream_project_id,
-                ..
-            }) => Some((upstream_client.clone(), *upstream_project_id)),
-
-            LspStoreMode::Remote(RemoteLspStore {
-                upstream_client: None,
-                ..
-            }) => None,
-            LspStoreMode::Local(_) => None,
-        }
-    }
-
-    pub fn new_local(
-        buffer_store: Entity<BufferStore>,
-        worktree_store: Entity<WorktreeStore>,
-        prettier_store: Entity<PrettierStore>,
-        toolchain_store: Entity<LocalToolchainStore>,
-        environment: Entity<ProjectEnvironment>,
-        manifest_tree: Entity<ManifestTree>,
-        languages: Arc<LanguageRegistry>,
-        http_client: Arc<dyn HttpClient>,
-        fs: Arc<dyn Fs>,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let yarn = YarnPathStore::new(fs.clone(), cx);
-        cx.subscribe(&buffer_store, Self::on_buffer_store_event)
-            .detach();
-        cx.subscribe(&worktree_store, Self::on_worktree_store_event)
-            .detach();
-        cx.subscribe(&prettier_store, Self::on_prettier_store_event)
-            .detach();
-        cx.subscribe(&toolchain_store, Self::on_toolchain_store_event)
-            .detach();
-        cx.observe_global::<SettingsStore>(Self::on_settings_changed)
-            .detach();
-        subscribe_to_binary_statuses(&languages, cx).detach();
-
-        let _maintain_workspace_config = {
-            let (sender, receiver) = watch::channel();
-            (Self::maintain_workspace_config(receiver, cx), sender)
-        };
-
-        Self {
-            mode: LspStoreMode::Local(LocalLspStore {
-                weak: cx.weak_entity(),
-                worktree_store: worktree_store.clone(),
-
-                supplementary_language_servers: Default::default(),
-                languages: languages.clone(),
-                language_server_ids: Default::default(),
-                language_servers: Default::default(),
-                last_workspace_edits_by_language_server: Default::default(),
-                language_server_watched_paths: Default::default(),
-                language_server_paths_watched_for_rename: Default::default(),
-                language_server_dynamic_registrations: Default::default(),
-                buffers_being_formatted: Default::default(),
-                buffer_snapshots: Default::default(),
-                prettier_store,
-                environment,
-                http_client,
-                fs,
-                yarn,
-                next_diagnostic_group_id: Default::default(),
-                diagnostics: Default::default(),
-                _subscription: cx.on_app_quit(|this, cx| {
-                    this.as_local_mut()
-                        .unwrap()
-                        .shutdown_language_servers_on_quit(cx)
-                }),
-                lsp_tree: LanguageServerTree::new(
-                    manifest_tree,
-                    languages.clone(),
-                    toolchain_store.clone(),
-                ),
-                toolchain_store,
-                registered_buffers: HashMap::default(),
-                buffers_opened_in_servers: HashMap::default(),
-                buffer_pull_diagnostics_result_ids: HashMap::default(),
-                workspace_pull_diagnostics_result_ids: HashMap::default(),
-                watched_manifest_filenames: ManifestProvidersStore::global(cx)
-                    .manifest_file_names(),
-            }),
-            last_formatting_failure: None,
-            downstream_client: None,
-            buffer_store,
-            worktree_store,
-            languages: languages.clone(),
-            language_server_statuses: Default::default(),
-            nonce: StdRng::from_os_rng().random(),
-            diagnostic_summaries: HashMap::default(),
-            lsp_server_capabilities: HashMap::default(),
-            lsp_data: HashMap::default(),
-            next_hint_id: Arc::default(),
-            active_entry: None,
-            _maintain_workspace_config,
-            _maintain_buffer_languages: Self::maintain_buffer_languages(languages, cx),
-        }
-    }
-
-    fn send_lsp_proto_request<R: LspCommand>(
-        &self,
-        buffer: Entity<Buffer>,
-        client: AnyProtoClient,
-        upstream_project_id: u64,
-        request: R,
-        cx: &mut Context<LspStore>,
-    ) -> Task<anyhow::Result<<R as LspCommand>::Response>> {
-        if !self.is_capable_for_proto_request(&buffer, &request, cx) {
-            return Task::ready(Ok(R::Response::default()));
-        }
-        let message = request.to_proto(upstream_project_id, buffer.read(cx));
-        cx.spawn(async move |this, cx| {
-            let response = client.request(message).await?;
-            let this = this.upgrade().context("project dropped")?;
-            request
-                .response_from_proto(response, this, buffer, cx.clone())
-                .await
-        })
-    }
-
-    pub(super) fn new_remote(
-        buffer_store: Entity<BufferStore>,
-        worktree_store: Entity<WorktreeStore>,
-        languages: Arc<LanguageRegistry>,
-        upstream_client: AnyProtoClient,
-        project_id: u64,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        cx.subscribe(&buffer_store, Self::on_buffer_store_event)
-            .detach();
-        cx.subscribe(&worktree_store, Self::on_worktree_store_event)
-            .detach();
-        subscribe_to_binary_statuses(&languages, cx).detach();
-        let _maintain_workspace_config = {
-            let (sender, receiver) = watch::channel();
-            (Self::maintain_workspace_config(receiver, cx), sender)
-        };
-        Self {
-            mode: LspStoreMode::Remote(RemoteLspStore {
-                upstream_client: Some(upstream_client),
-                upstream_project_id: project_id,
-            }),
-            downstream_client: None,
-            last_formatting_failure: None,
-            buffer_store,
-            worktree_store,
-            languages: languages.clone(),
-            language_server_statuses: Default::default(),
-            nonce: StdRng::from_os_rng().random(),
-            diagnostic_summaries: HashMap::default(),
-            lsp_server_capabilities: HashMap::default(),
-            next_hint_id: Arc::default(),
-            lsp_data: HashMap::default(),
-            active_entry: None,
-
-            _maintain_workspace_config,
-            _maintain_buffer_languages: Self::maintain_buffer_languages(languages.clone(), cx),
-        }
-    }
-
-    fn on_buffer_store_event(
-        &mut self,
-        _: Entity<BufferStore>,
-        event: &BufferStoreEvent,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            BufferStoreEvent::BufferAdded(buffer) => {
-                self.on_buffer_added(buffer, cx).log_err();
-            }
-            BufferStoreEvent::BufferChangedFilePath { buffer, old_file } => {
-                let buffer_id = buffer.read(cx).remote_id();
-                if let Some(local) = self.as_local_mut()
-                    && let Some(old_file) = File::from_dyn(old_file.as_ref())
-                {
-                    local.reset_buffer(buffer, old_file, cx);
-
-                    if local.registered_buffers.contains_key(&buffer_id) {
-                        local.unregister_old_buffer_from_language_servers(buffer, old_file, cx);
-                    }
-                }
-
-                self.detect_language_for_buffer(buffer, cx);
-                if let Some(local) = self.as_local_mut() {
-                    local.initialize_buffer(buffer, cx);
-                    if local.registered_buffers.contains_key(&buffer_id) {
-                        local.register_buffer_with_language_servers(buffer, HashSet::default(), cx);
-                    }
-                }
-            }
-            _ => {}
-        }
-    }
-
-    fn on_worktree_store_event(
-        &mut self,
-        _: Entity<WorktreeStore>,
-        event: &WorktreeStoreEvent,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            WorktreeStoreEvent::WorktreeAdded(worktree) => {
-                if !worktree.read(cx).is_local() {
-                    return;
-                }
-                cx.subscribe(worktree, |this, worktree, event, cx| match event {
-                    worktree::Event::UpdatedEntries(changes) => {
-                        this.update_local_worktree_language_servers(&worktree, changes, cx);
-                    }
-                    worktree::Event::UpdatedGitRepositories(_)
-                    | worktree::Event::DeletedEntry(_) => {}
-                })
-                .detach()
-            }
-            WorktreeStoreEvent::WorktreeRemoved(_, id) => self.remove_worktree(*id, cx),
-            WorktreeStoreEvent::WorktreeUpdateSent(worktree) => {
-                worktree.update(cx, |worktree, _cx| self.send_diagnostic_summaries(worktree));
-            }
-            WorktreeStoreEvent::WorktreeReleased(..)
-            | WorktreeStoreEvent::WorktreeOrderChanged
-            | WorktreeStoreEvent::WorktreeUpdatedEntries(..)
-            | WorktreeStoreEvent::WorktreeUpdatedGitRepositories(..)
-            | WorktreeStoreEvent::WorktreeDeletedEntry(..) => {}
-        }
-    }
-
-    fn on_prettier_store_event(
-        &mut self,
-        _: Entity<PrettierStore>,
-        event: &PrettierStoreEvent,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            PrettierStoreEvent::LanguageServerRemoved(prettier_server_id) => {
-                self.unregister_supplementary_language_server(*prettier_server_id, cx);
-            }
-            PrettierStoreEvent::LanguageServerAdded {
-                new_server_id,
-                name,
-                prettier_server,
-            } => {
-                self.register_supplementary_language_server(
-                    *new_server_id,
-                    name.clone(),
-                    prettier_server.clone(),
-                    cx,
-                );
-            }
-        }
-    }
-
-    fn on_toolchain_store_event(
-        &mut self,
-        _: Entity<LocalToolchainStore>,
-        event: &ToolchainStoreEvent,
-        _: &mut Context<Self>,
-    ) {
-        if let ToolchainStoreEvent::ToolchainActivated = event {
-            self.request_workspace_config_refresh()
-        }
-    }
-
-    fn request_workspace_config_refresh(&mut self) {
-        *self._maintain_workspace_config.1.borrow_mut() = ();
-    }
-
-    pub fn prettier_store(&self) -> Option<Entity<PrettierStore>> {
-        self.as_local().map(|local| local.prettier_store.clone())
-    }
-
-    fn on_buffer_event(
-        &mut self,
-        buffer: Entity<Buffer>,
-        event: &language::BufferEvent,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            language::BufferEvent::Edited => {
-                self.on_buffer_edited(buffer, cx);
-            }
-
-            language::BufferEvent::Saved => {
-                self.on_buffer_saved(buffer, cx);
-            }
-
-            _ => {}
-        }
-    }
-
-    fn on_buffer_added(&mut self, buffer: &Entity<Buffer>, cx: &mut Context<Self>) -> Result<()> {
-        buffer
-            .read(cx)
-            .set_language_registry(self.languages.clone());
-
-        cx.subscribe(buffer, |this, buffer, event, cx| {
-            this.on_buffer_event(buffer, event, cx);
-        })
-        .detach();
-
-        self.detect_language_for_buffer(buffer, cx);
-        if let Some(local) = self.as_local_mut() {
-            local.initialize_buffer(buffer, cx);
-        }
-
-        Ok(())
-    }
-
-    pub(crate) fn register_buffer_with_language_servers(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        only_register_servers: HashSet<LanguageServerSelector>,
-        ignore_refcounts: bool,
-        cx: &mut Context<Self>,
-    ) -> OpenLspBufferHandle {
-        let buffer_id = buffer.read(cx).remote_id();
-        let handle = OpenLspBufferHandle(cx.new(|_| OpenLspBuffer(buffer.clone())));
-        if let Some(local) = self.as_local_mut() {
-            let refcount = local.registered_buffers.entry(buffer_id).or_insert(0);
-            if !ignore_refcounts {
-                *refcount += 1;
-            }
-
-            // We run early exits on non-existing buffers AFTER we mark the buffer as registered in order to handle buffer saving.
-            // When a new unnamed buffer is created and saved, we will start loading it's language. Once the language is loaded, we go over all "language-less" buffers and try to fit that new language
-            // with them. However, we do that only for the buffers that we think are open in at least one editor; thus, we need to keep tab of unnamed buffers as well, even though they're not actually registered with any language
-            // servers in practice (we don't support non-file URI schemes in our LSP impl).
-            let Some(file) = File::from_dyn(buffer.read(cx).file()) else {
-                return handle;
-            };
-            if !file.is_local() {
-                return handle;
-            }
-
-            if ignore_refcounts || *refcount == 1 {
-                local.register_buffer_with_language_servers(buffer, only_register_servers, cx);
-            }
-            if !ignore_refcounts {
-                cx.observe_release(&handle.0, move |lsp_store, buffer, cx| {
-                    let refcount = {
-                        let local = lsp_store.as_local_mut().unwrap();
-                        let Some(refcount) = local.registered_buffers.get_mut(&buffer_id) else {
-                            debug_panic!("bad refcounting");
-                            return;
-                        };
-
-                        *refcount -= 1;
-                        *refcount
-                    };
-                    if refcount == 0 {
-                        lsp_store.lsp_data.remove(&buffer_id);
-                        let local = lsp_store.as_local_mut().unwrap();
-                        local.registered_buffers.remove(&buffer_id);
-
-                        local.buffers_opened_in_servers.remove(&buffer_id);
-                        if let Some(file) = File::from_dyn(buffer.0.read(cx).file()).cloned() {
-                            local.unregister_old_buffer_from_language_servers(&buffer.0, &file, cx);
-
-                            let buffer_abs_path = file.abs_path(cx);
-                            for (_, buffer_pull_diagnostics_result_ids) in
-                                &mut local.buffer_pull_diagnostics_result_ids
-                            {
-                                buffer_pull_diagnostics_result_ids.retain(
-                                    |_, buffer_result_ids| {
-                                        buffer_result_ids.remove(&buffer_abs_path);
-                                        !buffer_result_ids.is_empty()
-                                    },
-                                );
-                            }
-
-                            let diagnostic_updates = local
-                                .language_servers
-                                .keys()
-                                .cloned()
-                                .map(|server_id| DocumentDiagnosticsUpdate {
-                                    diagnostics: DocumentDiagnostics {
-                                        document_abs_path: buffer_abs_path.clone(),
-                                        version: None,
-                                        diagnostics: Vec::new(),
-                                    },
-                                    result_id: None,
-                                    registration_id: None,
-                                    server_id: server_id,
-                                    disk_based_sources: Cow::Borrowed(&[]),
-                                })
-                                .collect::<Vec<_>>();
-
-                            lsp_store
-                                .merge_diagnostic_entries(
-                                    diagnostic_updates,
-                                    |_, diagnostic, _| {
-                                        diagnostic.source_kind != DiagnosticSourceKind::Pulled
-                                    },
-                                    cx,
-                                )
-                                .context("Clearing diagnostics for the closed buffer")
-                                .log_err();
-                        }
-                    }
-                })
-                .detach();
-            }
-        } else if let Some((upstream_client, upstream_project_id)) = self.upstream_client() {
-            let buffer_id = buffer.read(cx).remote_id().to_proto();
-            cx.background_spawn(async move {
-                upstream_client
-                    .request(proto::RegisterBufferWithLanguageServers {
-                        project_id: upstream_project_id,
-                        buffer_id,
-                        only_servers: only_register_servers
-                            .into_iter()
-                            .map(|selector| {
-                                let selector = match selector {
-                                    LanguageServerSelector::Id(language_server_id) => {
-                                        proto::language_server_selector::Selector::ServerId(
-                                            language_server_id.to_proto(),
-                                        )
-                                    }
-                                    LanguageServerSelector::Name(language_server_name) => {
-                                        proto::language_server_selector::Selector::Name(
-                                            language_server_name.to_string(),
-                                        )
-                                    }
-                                };
-                                proto::LanguageServerSelector {
-                                    selector: Some(selector),
-                                }
-                            })
-                            .collect(),
-                    })
-                    .await
-            })
-            .detach();
-        } else {
-            // Our remote connection got closed
-        }
-        handle
-    }
-
-    fn maintain_buffer_languages(
-        languages: Arc<LanguageRegistry>,
-        cx: &mut Context<Self>,
-    ) -> Task<()> {
-        let mut subscription = languages.subscribe();
-        let mut prev_reload_count = languages.reload_count();
-        cx.spawn(async move |this, cx| {
-            while let Some(()) = subscription.next().await {
-                if let Some(this) = this.upgrade() {
-                    // If the language registry has been reloaded, then remove and
-                    // re-assign the languages on all open buffers.
-                    let reload_count = languages.reload_count();
-                    if reload_count > prev_reload_count {
-                        prev_reload_count = reload_count;
-                        this.update(cx, |this, cx| {
-                            this.buffer_store.clone().update(cx, |buffer_store, cx| {
-                                for buffer in buffer_store.buffers() {
-                                    if let Some(f) = File::from_dyn(buffer.read(cx).file()).cloned()
-                                    {
-                                        buffer.update(cx, |buffer, cx| {
-                                            buffer.set_language_async(None, cx)
-                                        });
-                                        if let Some(local) = this.as_local_mut() {
-                                            local.reset_buffer(&buffer, &f, cx);
-
-                                            if local
-                                                .registered_buffers
-                                                .contains_key(&buffer.read(cx).remote_id())
-                                                && let Some(file_url) =
-                                                    file_path_to_lsp_url(&f.abs_path(cx)).log_err()
-                                            {
-                                                local.unregister_buffer_from_language_servers(
-                                                    &buffer, &file_url, cx,
-                                                );
-                                            }
-                                        }
-                                    }
-                                }
-                            });
-                        })
-                        .ok();
-                    }
-
-                    this.update(cx, |this, cx| {
-                        let mut plain_text_buffers = Vec::new();
-                        let mut buffers_with_unknown_injections = Vec::new();
-                        for handle in this.buffer_store.read(cx).buffers() {
-                            let buffer = handle.read(cx);
-                            if buffer.language().is_none()
-                                || buffer.language() == Some(&*language::PLAIN_TEXT)
-                            {
-                                plain_text_buffers.push(handle);
-                            } else if buffer.contains_unknown_injections() {
-                                buffers_with_unknown_injections.push(handle);
-                            }
-                        }
-
-                        // Deprioritize the invisible worktrees so main worktrees' language servers can be started first,
-                        // and reused later in the invisible worktrees.
-                        plain_text_buffers.sort_by_key(|buffer| {
-                            Reverse(
-                                File::from_dyn(buffer.read(cx).file())
-                                    .map(|file| file.worktree.read(cx).is_visible()),
-                            )
-                        });
-
-                        for buffer in plain_text_buffers {
-                            this.detect_language_for_buffer(&buffer, cx);
-                            if let Some(local) = this.as_local_mut() {
-                                local.initialize_buffer(&buffer, cx);
-                                if local
-                                    .registered_buffers
-                                    .contains_key(&buffer.read(cx).remote_id())
-                                {
-                                    local.register_buffer_with_language_servers(
-                                        &buffer,
-                                        HashSet::default(),
-                                        cx,
-                                    );
-                                }
-                            }
-                        }
-
-                        for buffer in buffers_with_unknown_injections {
-                            buffer.update(cx, |buffer, cx| buffer.reparse(cx, false));
-                        }
-                    })
-                    .ok();
-                }
-            }
-        })
-    }
-
-    fn detect_language_for_buffer(
-        &mut self,
-        buffer_handle: &Entity<Buffer>,
-        cx: &mut Context<Self>,
-    ) -> Option<language::AvailableLanguage> {
-        // If the buffer has a language, set it and start the language server if we haven't already.
-        let buffer = buffer_handle.read(cx);
-        let file = buffer.file()?;
-
-        let content = buffer.as_rope();
-        let available_language = self.languages.language_for_file(file, Some(content), cx);
-        if let Some(available_language) = &available_language {
-            if let Some(Ok(Ok(new_language))) = self
-                .languages
-                .load_language(available_language)
-                .now_or_never()
-            {
-                self.set_language_for_buffer(buffer_handle, new_language, cx);
-            }
-        } else {
-            cx.emit(LspStoreEvent::LanguageDetected {
-                buffer: buffer_handle.clone(),
-                new_language: None,
-            });
-        }
-
-        available_language
-    }
-
-    pub(crate) fn set_language_for_buffer(
-        &mut self,
-        buffer_entity: &Entity<Buffer>,
-        new_language: Arc<Language>,
-        cx: &mut Context<Self>,
-    ) {
-        let buffer = buffer_entity.read(cx);
-        let buffer_file = buffer.file().cloned();
-        let buffer_id = buffer.remote_id();
-        if let Some(local_store) = self.as_local_mut()
-            && local_store.registered_buffers.contains_key(&buffer_id)
-            && let Some(abs_path) =
-                File::from_dyn(buffer_file.as_ref()).map(|file| file.abs_path(cx))
-            && let Some(file_url) = file_path_to_lsp_url(&abs_path).log_err()
-        {
-            local_store.unregister_buffer_from_language_servers(buffer_entity, &file_url, cx);
-        }
-        buffer_entity.update(cx, |buffer, cx| {
-            if buffer
-                .language()
-                .is_none_or(|old_language| !Arc::ptr_eq(old_language, &new_language))
-            {
-                buffer.set_language_async(Some(new_language.clone()), cx);
-            }
-        });
-
-        let settings =
-            language_settings(Some(new_language.name()), buffer_file.as_ref(), cx).into_owned();
-        let buffer_file = File::from_dyn(buffer_file.as_ref());
-
-        let worktree_id = if let Some(file) = buffer_file {
-            let worktree = file.worktree.clone();
-
-            if let Some(local) = self.as_local_mut()
-                && local.registered_buffers.contains_key(&buffer_id)
-            {
-                local.register_buffer_with_language_servers(buffer_entity, HashSet::default(), cx);
-            }
-            Some(worktree.read(cx).id())
-        } else {
-            None
-        };
-
-        if settings.prettier.allowed
-            && let Some(prettier_plugins) = prettier_store::prettier_plugins_for_language(&settings)
-        {
-            let prettier_store = self.as_local().map(|s| s.prettier_store.clone());
-            if let Some(prettier_store) = prettier_store {
-                prettier_store.update(cx, |prettier_store, cx| {
-                    prettier_store.install_default_prettier(
-                        worktree_id,
-                        prettier_plugins.iter().map(|s| Arc::from(s.as_str())),
-                        cx,
-                    )
-                })
-            }
-        }
-
-        cx.emit(LspStoreEvent::LanguageDetected {
-            buffer: buffer_entity.clone(),
-            new_language: Some(new_language),
-        })
-    }
-
-    pub fn buffer_store(&self) -> Entity<BufferStore> {
-        self.buffer_store.clone()
-    }
-
-    pub fn set_active_entry(&mut self, active_entry: Option<ProjectEntryId>) {
-        self.active_entry = active_entry;
-    }
-
-    pub(crate) fn send_diagnostic_summaries(&self, worktree: &mut Worktree) {
-        if let Some((client, downstream_project_id)) = self.downstream_client.clone()
-            && let Some(diangostic_summaries) = self.diagnostic_summaries.get(&worktree.id())
-        {
-            let mut summaries = diangostic_summaries.iter().flat_map(|(path, summaries)| {
-                summaries
-                    .iter()
-                    .map(|(server_id, summary)| summary.to_proto(*server_id, path.as_ref()))
-            });
-            if let Some(summary) = summaries.next() {
-                client
-                    .send(proto::UpdateDiagnosticSummary {
-                        project_id: downstream_project_id,
-                        worktree_id: worktree.id().to_proto(),
-                        summary: Some(summary),
-                        more_summaries: summaries.collect(),
-                    })
-                    .log_err();
-            }
-        }
-    }
-
-    fn is_capable_for_proto_request<R>(
-        &self,
-        buffer: &Entity<Buffer>,
-        request: &R,
-        cx: &App,
-    ) -> bool
-    where
-        R: LspCommand,
-    {
-        self.check_if_capable_for_proto_request(
-            buffer,
-            |capabilities| {
-                request.check_capabilities(AdapterServerCapabilities {
-                    server_capabilities: capabilities.clone(),
-                    code_action_kinds: None,
-                })
-            },
-            cx,
-        )
-    }
-
-    fn check_if_capable_for_proto_request<F>(
-        &self,
-        buffer: &Entity<Buffer>,
-        check: F,
-        cx: &App,
-    ) -> bool
-    where
-        F: FnMut(&lsp::ServerCapabilities) -> bool,
-    {
-        let Some(language) = buffer.read(cx).language().cloned() else {
-            return false;
-        };
-        let relevant_language_servers = self
-            .languages
-            .lsp_adapters(&language.name())
-            .into_iter()
-            .map(|lsp_adapter| lsp_adapter.name())
-            .collect::<HashSet<_>>();
-        self.language_server_statuses
-            .iter()
-            .filter_map(|(server_id, server_status)| {
-                relevant_language_servers
-                    .contains(&server_status.name)
-                    .then_some(server_id)
-            })
-            .filter_map(|server_id| self.lsp_server_capabilities.get(server_id))
-            .any(check)
-    }
-
-    fn all_capable_for_proto_request<F>(
-        &self,
-        buffer: &Entity<Buffer>,
-        mut check: F,
-        cx: &App,
-    ) -> Vec<lsp::LanguageServerId>
-    where
-        F: FnMut(&lsp::LanguageServerName, &lsp::ServerCapabilities) -> bool,
-    {
-        let Some(language) = buffer.read(cx).language().cloned() else {
-            return Vec::default();
-        };
-        let relevant_language_servers = self
-            .languages
-            .lsp_adapters(&language.name())
-            .into_iter()
-            .map(|lsp_adapter| lsp_adapter.name())
-            .collect::<HashSet<_>>();
-        self.language_server_statuses
-            .iter()
-            .filter_map(|(server_id, server_status)| {
-                relevant_language_servers
-                    .contains(&server_status.name)
-                    .then_some((server_id, &server_status.name))
-            })
-            .filter_map(|(server_id, server_name)| {
-                self.lsp_server_capabilities
-                    .get(server_id)
-                    .map(|c| (server_id, server_name, c))
-            })
-            .filter(|(_, server_name, capabilities)| check(server_name, capabilities))
-            .map(|(server_id, _, _)| *server_id)
-            .collect()
-    }
-
-    pub fn request_lsp<R>(
-        &mut self,
-        buffer: Entity<Buffer>,
-        server: LanguageServerToQuery,
-        request: R,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<R::Response>>
-    where
-        R: LspCommand,
-        <R::LspRequest as lsp::request::Request>::Result: Send,
-        <R::LspRequest as lsp::request::Request>::Params: Send,
-    {
-        if let Some((upstream_client, upstream_project_id)) = self.upstream_client() {
-            return self.send_lsp_proto_request(
-                buffer,
-                upstream_client,
-                upstream_project_id,
-                request,
-                cx,
-            );
-        }
-
-        let Some(language_server) = buffer.update(cx, |buffer, cx| match server {
-            LanguageServerToQuery::FirstCapable => self.as_local().and_then(|local| {
-                local
-                    .language_servers_for_buffer(buffer, cx)
-                    .find(|(_, server)| {
-                        request.check_capabilities(server.adapter_server_capabilities())
-                    })
-                    .map(|(_, server)| server.clone())
-            }),
-            LanguageServerToQuery::Other(id) => self
-                .language_server_for_local_buffer(buffer, id, cx)
-                .and_then(|(_, server)| {
-                    request
-                        .check_capabilities(server.adapter_server_capabilities())
-                        .then(|| Arc::clone(server))
-                }),
-        }) else {
-            return Task::ready(Ok(Default::default()));
-        };
-
-        let file = File::from_dyn(buffer.read(cx).file()).and_then(File::as_local);
-
-        let Some(file) = file else {
-            return Task::ready(Ok(Default::default()));
-        };
-
-        let lsp_params = match request.to_lsp_params_or_response(
-            &file.abs_path(cx),
-            buffer.read(cx),
-            &language_server,
-            cx,
-        ) {
-            Ok(LspParamsOrResponse::Params(lsp_params)) => lsp_params,
-            Ok(LspParamsOrResponse::Response(response)) => return Task::ready(Ok(response)),
-            Err(err) => {
-                let message = format!(
-                    "{} via {} failed: {}",
-                    request.display_name(),
-                    language_server.name(),
-                    err
-                );
-                // rust-analyzer likes to error with this when its still loading up
-                if !message.ends_with("content modified") {
-                    log::warn!("{message}");
-                }
-                return Task::ready(Err(anyhow!(message)));
-            }
-        };
-
-        let status = request.status();
-        if !request.check_capabilities(language_server.adapter_server_capabilities()) {
-            return Task::ready(Ok(Default::default()));
-        }
-        cx.spawn(async move |this, cx| {
-            let lsp_request = language_server.request::<R::LspRequest>(lsp_params);
-
-            let id = lsp_request.id();
-            let _cleanup = if status.is_some() {
-                cx.update(|cx| {
-                    this.update(cx, |this, cx| {
-                        this.on_lsp_work_start(
-                            language_server.server_id(),
-                            ProgressToken::Number(id),
-                            LanguageServerProgress {
-                                is_disk_based_diagnostics_progress: false,
-                                is_cancellable: false,
-                                title: None,
-                                message: status.clone(),
-                                percentage: None,
-                                last_update_at: cx.background_executor().now(),
-                            },
-                            cx,
-                        );
-                    })
-                })
-                .log_err();
-
-                Some(defer(|| {
-                    cx.update(|cx| {
-                        this.update(cx, |this, cx| {
-                            this.on_lsp_work_end(
-                                language_server.server_id(),
-                                ProgressToken::Number(id),
-                                cx,
-                            );
-                        })
-                    })
-                    .log_err();
-                }))
-            } else {
-                None
-            };
-
-            let result = lsp_request.await.into_response();
-
-            let response = result.map_err(|err| {
-                let message = format!(
-                    "{} via {} failed: {}",
-                    request.display_name(),
-                    language_server.name(),
-                    err
-                );
-                // rust-analyzer likes to error with this when its still loading up
-                if !message.ends_with("content modified") {
-                    log::warn!("{message}");
-                }
-                anyhow::anyhow!(message)
-            })?;
-
-            request
-                .response_from_lsp(
-                    response,
-                    this.upgrade().context("no app context")?,
-                    buffer,
-                    language_server.server_id(),
-                    cx.clone(),
-                )
-                .await
-        })
-    }
-
-    fn on_settings_changed(&mut self, cx: &mut Context<Self>) {
-        let mut language_formatters_to_check = Vec::new();
-        for buffer in self.buffer_store.read(cx).buffers() {
-            let buffer = buffer.read(cx);
-            let buffer_file = File::from_dyn(buffer.file());
-            let buffer_language = buffer.language();
-            let settings = language_settings(buffer_language.map(|l| l.name()), buffer.file(), cx);
-            if buffer_language.is_some() {
-                language_formatters_to_check.push((
-                    buffer_file.map(|f| f.worktree_id(cx)),
-                    settings.into_owned(),
-                ));
-            }
-        }
-
-        self.request_workspace_config_refresh();
-
-        if let Some(prettier_store) = self.as_local().map(|s| s.prettier_store.clone()) {
-            prettier_store.update(cx, |prettier_store, cx| {
-                prettier_store.on_settings_changed(language_formatters_to_check, cx)
-            })
-        }
-
-        cx.notify();
-    }
-
-    fn refresh_server_tree(&mut self, cx: &mut Context<Self>) {
-        let buffer_store = self.buffer_store.clone();
-        let Some(local) = self.as_local_mut() else {
-            return;
-        };
-        let mut adapters = BTreeMap::default();
-        let get_adapter = {
-            let languages = local.languages.clone();
-            let environment = local.environment.clone();
-            let weak = local.weak.clone();
-            let worktree_store = local.worktree_store.clone();
-            let http_client = local.http_client.clone();
-            let fs = local.fs.clone();
-            move |worktree_id, cx: &mut App| {
-                let worktree = worktree_store.read(cx).worktree_for_id(worktree_id, cx)?;
-                Some(LocalLspAdapterDelegate::new(
-                    languages.clone(),
-                    &environment,
-                    weak.clone(),
-                    &worktree,
-                    http_client.clone(),
-                    fs.clone(),
-                    cx,
-                ))
-            }
-        };
-
-        let mut messages_to_report = Vec::new();
-        let (new_tree, to_stop) = {
-            let mut rebase = local.lsp_tree.rebase();
-            let buffers = buffer_store
-                .read(cx)
-                .buffers()
-                .filter_map(|buffer| {
-                    let raw_buffer = buffer.read(cx);
-                    if !local
-                        .registered_buffers
-                        .contains_key(&raw_buffer.remote_id())
-                    {
-                        return None;
-                    }
-                    let file = File::from_dyn(raw_buffer.file()).cloned()?;
-                    let language = raw_buffer.language().cloned()?;
-                    Some((file, language, raw_buffer.remote_id()))
-                })
-                .sorted_by_key(|(file, _, _)| Reverse(file.worktree.read(cx).is_visible()));
-            for (file, language, buffer_id) in buffers {
-                let worktree_id = file.worktree_id(cx);
-                let Some(worktree) = local
-                    .worktree_store
-                    .read(cx)
-                    .worktree_for_id(worktree_id, cx)
-                else {
-                    continue;
-                };
-
-                if let Some((_, apply)) = local.reuse_existing_language_server(
-                    rebase.server_tree(),
-                    &worktree,
-                    &language.name(),
-                    cx,
-                ) {
-                    (apply)(rebase.server_tree());
-                } else if let Some(lsp_delegate) = adapters
-                    .entry(worktree_id)
-                    .or_insert_with(|| get_adapter(worktree_id, cx))
-                    .clone()
-                {
-                    let delegate =
-                        Arc::new(ManifestQueryDelegate::new(worktree.read(cx).snapshot()));
-                    let path = file
-                        .path()
-                        .parent()
-                        .map(Arc::from)
-                        .unwrap_or_else(|| file.path().clone());
-                    let worktree_path = ProjectPath { worktree_id, path };
-                    let abs_path = file.abs_path(cx);
-                    let nodes = rebase
-                        .walk(
-                            worktree_path,
-                            language.name(),
-                            language.manifest(),
-                            delegate.clone(),
-                            cx,
-                        )
-                        .collect::<Vec<_>>();
-                    for node in nodes {
-                        let server_id = node.server_id_or_init(|disposition| {
-                            let path = &disposition.path;
-                            let uri = Uri::from_file_path(worktree.read(cx).absolutize(&path.path));
-                            let key = LanguageServerSeed {
-                                worktree_id,
-                                name: disposition.server_name.clone(),
-                                settings: disposition.settings.clone(),
-                                toolchain: local.toolchain_store.read(cx).active_toolchain(
-                                    path.worktree_id,
-                                    &path.path,
-                                    language.name(),
-                                ),
-                            };
-                            local.language_server_ids.remove(&key);
-
-                            let server_id = local.get_or_insert_language_server(
-                                &worktree,
-                                lsp_delegate.clone(),
-                                disposition,
-                                &language.name(),
-                                cx,
-                            );
-                            if let Some(state) = local.language_servers.get(&server_id)
-                                && let Ok(uri) = uri
-                            {
-                                state.add_workspace_folder(uri);
-                            };
-                            server_id
-                        });
-
-                        if let Some(language_server_id) = server_id {
-                            messages_to_report.push(LspStoreEvent::LanguageServerUpdate {
-                                language_server_id,
-                                name: node.name(),
-                                message:
-                                    proto::update_language_server::Variant::RegisteredForBuffer(
-                                        proto::RegisteredForBuffer {
-                                            buffer_abs_path: abs_path
-                                                .to_string_lossy()
-                                                .into_owned(),
-                                            buffer_id: buffer_id.to_proto(),
-                                        },
-                                    ),
-                            });
-                        }
-                    }
-                } else {
-                    continue;
-                }
-            }
-            rebase.finish()
-        };
-        for message in messages_to_report {
-            cx.emit(message);
-        }
-        local.lsp_tree = new_tree;
-        for (id, _) in to_stop {
-            self.stop_local_language_server(id, cx).detach();
-        }
-    }
-
-    pub fn apply_code_action(
-        &self,
-        buffer_handle: Entity<Buffer>,
-        mut action: CodeAction,
-        push_to_history: bool,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<ProjectTransaction>> {
-        if let Some((upstream_client, project_id)) = self.upstream_client() {
-            let request = proto::ApplyCodeAction {
-                project_id,
-                buffer_id: buffer_handle.read(cx).remote_id().into(),
-                action: Some(Self::serialize_code_action(&action)),
-            };
-            let buffer_store = self.buffer_store();
-            cx.spawn(async move |_, cx| {
-                let response = upstream_client
-                    .request(request)
-                    .await?
-                    .transaction
-                    .context("missing transaction")?;
-
-                buffer_store
-                    .update(cx, |buffer_store, cx| {
-                        buffer_store.deserialize_project_transaction(response, push_to_history, cx)
-                    })?
-                    .await
-            })
-        } else if self.mode.is_local() {
-            let Some((_, lang_server)) = buffer_handle.update(cx, |buffer, cx| {
-                self.language_server_for_local_buffer(buffer, action.server_id, cx)
-                    .map(|(adapter, server)| (adapter.clone(), server.clone()))
-            }) else {
-                return Task::ready(Ok(ProjectTransaction::default()));
-            };
-            cx.spawn(async move |this,  cx| {
-                LocalLspStore::try_resolve_code_action(&lang_server, &mut action)
-                    .await
-                    .context("resolving a code action")?;
-                if let Some(edit) = action.lsp_action.edit()
-                    && (edit.changes.is_some() || edit.document_changes.is_some()) {
-                        return LocalLspStore::deserialize_workspace_edit(
-                            this.upgrade().context("no app present")?,
-                            edit.clone(),
-                            push_to_history,
-
-                            lang_server.clone(),
-                            cx,
-                        )
-                        .await;
-                    }
-
-                if let Some(command) = action.lsp_action.command() {
-                    let server_capabilities = lang_server.capabilities();
-                    let available_commands = server_capabilities
-                        .execute_command_provider
-                        .as_ref()
-                        .map(|options| options.commands.as_slice())
-                        .unwrap_or_default();
-                    if available_commands.contains(&command.command) {
-                        this.update(cx, |this, _| {
-                            this.as_local_mut()
-                                .unwrap()
-                                .last_workspace_edits_by_language_server
-                                .remove(&lang_server.server_id());
-                        })?;
-
-                        let _result = lang_server
-                            .request::<lsp::request::ExecuteCommand>(lsp::ExecuteCommandParams {
-                                command: command.command.clone(),
-                                arguments: command.arguments.clone().unwrap_or_default(),
-                                ..lsp::ExecuteCommandParams::default()
-                            })
-                            .await.into_response()
-                            .context("execute command")?;
-
-                        return this.update(cx, |this, _| {
-                            this.as_local_mut()
-                                .unwrap()
-                                .last_workspace_edits_by_language_server
-                                .remove(&lang_server.server_id())
-                                .unwrap_or_default()
-                        });
-                    } else {
-                        log::warn!("Cannot execute a command {} not listed in the language server capabilities", command.command);
-                    }
-                }
-
-                Ok(ProjectTransaction::default())
-            })
-        } else {
-            Task::ready(Err(anyhow!("no upstream client and not local")))
-        }
-    }
-
-    pub fn apply_code_action_kind(
-        &mut self,
-        buffers: HashSet<Entity<Buffer>>,
-        kind: CodeActionKind,
-        push_to_history: bool,
-        cx: &mut Context<Self>,
-    ) -> Task<anyhow::Result<ProjectTransaction>> {
-        if self.as_local().is_some() {
-            cx.spawn(async move |lsp_store, cx| {
-                let buffers = buffers.into_iter().collect::<Vec<_>>();
-                let result = LocalLspStore::execute_code_action_kind_locally(
-                    lsp_store.clone(),
-                    buffers,
-                    kind,
-                    push_to_history,
-                    cx,
-                )
-                .await;
-                lsp_store.update(cx, |lsp_store, _| {
-                    lsp_store.update_last_formatting_failure(&result);
-                })?;
-                result
-            })
-        } else if let Some((client, project_id)) = self.upstream_client() {
-            let buffer_store = self.buffer_store();
-            cx.spawn(async move |lsp_store, cx| {
-                let result = client
-                    .request(proto::ApplyCodeActionKind {
-                        project_id,
-                        kind: kind.as_str().to_owned(),
-                        buffer_ids: buffers
-                            .iter()
-                            .map(|buffer| {
-                                buffer.read_with(cx, |buffer, _| buffer.remote_id().into())
-                            })
-                            .collect::<Result<_>>()?,
-                    })
-                    .await
-                    .and_then(|result| result.transaction.context("missing transaction"));
-                lsp_store.update(cx, |lsp_store, _| {
-                    lsp_store.update_last_formatting_failure(&result);
-                })?;
-
-                let transaction_response = result?;
-                buffer_store
-                    .update(cx, |buffer_store, cx| {
-                        buffer_store.deserialize_project_transaction(
-                            transaction_response,
-                            push_to_history,
-                            cx,
-                        )
-                    })?
-                    .await
-            })
-        } else {
-            Task::ready(Ok(ProjectTransaction::default()))
-        }
-    }
-
-    pub fn resolved_hint(
-        &mut self,
-        buffer_id: BufferId,
-        id: InlayId,
-        cx: &mut Context<Self>,
-    ) -> Option<ResolvedHint> {
-        let buffer = self.buffer_store.read(cx).get(buffer_id)?;
-
-        let lsp_data = self.lsp_data.get_mut(&buffer_id)?;
-        let buffer_lsp_hints = &mut lsp_data.inlay_hints;
-        let hint = buffer_lsp_hints.hint_for_id(id)?.clone();
-        let (server_id, resolve_data) = match &hint.resolve_state {
-            ResolveState::Resolved => return Some(ResolvedHint::Resolved(hint)),
-            ResolveState::Resolving => {
-                return Some(ResolvedHint::Resolving(
-                    buffer_lsp_hints.hint_resolves.get(&id)?.clone(),
-                ));
-            }
-            ResolveState::CanResolve(server_id, resolve_data) => (*server_id, resolve_data.clone()),
-        };
-
-        let resolve_task = self.resolve_inlay_hint(hint, buffer, server_id, cx);
-        let buffer_lsp_hints = &mut self.lsp_data.get_mut(&buffer_id)?.inlay_hints;
-        let previous_task = buffer_lsp_hints.hint_resolves.insert(
-            id,
-            cx.spawn(async move |lsp_store, cx| {
-                let resolved_hint = resolve_task.await;
-                lsp_store
-                    .update(cx, |lsp_store, _| {
-                        if let Some(old_inlay_hint) = lsp_store
-                            .lsp_data
-                            .get_mut(&buffer_id)
-                            .and_then(|buffer_lsp_data| buffer_lsp_data.inlay_hints.hint_for_id(id))
-                        {
-                            match resolved_hint {
-                                Ok(resolved_hint) => {
-                                    *old_inlay_hint = resolved_hint;
-                                }
-                                Err(e) => {
-                                    old_inlay_hint.resolve_state =
-                                        ResolveState::CanResolve(server_id, resolve_data);
-                                    log::error!("Inlay hint resolve failed: {e:#}");
-                                }
-                            }
-                        }
-                    })
-                    .ok();
-            })
-            .shared(),
-        );
-        debug_assert!(
-            previous_task.is_none(),
-            "Did not change hint's resolve state after spawning its resolve"
-        );
-        buffer_lsp_hints.hint_for_id(id)?.resolve_state = ResolveState::Resolving;
-        None
-    }
-
-    fn resolve_inlay_hint(
-        &self,
-        mut hint: InlayHint,
-        buffer: Entity<Buffer>,
-        server_id: LanguageServerId,
-        cx: &mut Context<Self>,
-    ) -> Task<anyhow::Result<InlayHint>> {
-        if let Some((upstream_client, project_id)) = self.upstream_client() {
-            if !self.check_if_capable_for_proto_request(&buffer, InlayHints::can_resolve_inlays, cx)
-            {
-                hint.resolve_state = ResolveState::Resolved;
-                return Task::ready(Ok(hint));
-            }
-            let request = proto::ResolveInlayHint {
-                project_id,
-                buffer_id: buffer.read(cx).remote_id().into(),
-                language_server_id: server_id.0 as u64,
-                hint: Some(InlayHints::project_to_proto_hint(hint.clone())),
-            };
-            cx.background_spawn(async move {
-                let response = upstream_client
-                    .request(request)
-                    .await
-                    .context("inlay hints proto request")?;
-                match response.hint {
-                    Some(resolved_hint) => InlayHints::proto_to_project_hint(resolved_hint)
-                        .context("inlay hints proto resolve response conversion"),
-                    None => Ok(hint),
-                }
-            })
-        } else {
-            let Some(lang_server) = buffer.update(cx, |buffer, cx| {
-                self.language_server_for_local_buffer(buffer, server_id, cx)
-                    .map(|(_, server)| server.clone())
-            }) else {
-                return Task::ready(Ok(hint));
-            };
-            if !InlayHints::can_resolve_inlays(&lang_server.capabilities()) {
-                return Task::ready(Ok(hint));
-            }
-            let buffer_snapshot = buffer.read(cx).snapshot();
-            cx.spawn(async move |_, cx| {
-                let resolve_task = lang_server.request::<lsp::request::InlayHintResolveRequest>(
-                    InlayHints::project_to_lsp_hint(hint, &buffer_snapshot),
-                );
-                let resolved_hint = resolve_task
-                    .await
-                    .into_response()
-                    .context("inlay hint resolve LSP request")?;
-                let resolved_hint = InlayHints::lsp_to_project_hint(
-                    resolved_hint,
-                    &buffer,
-                    server_id,
-                    ResolveState::Resolved,
-                    false,
-                    cx,
-                )
-                .await?;
-                Ok(resolved_hint)
-            })
-        }
-    }
-
-    pub fn resolve_color_presentation(
-        &mut self,
-        mut color: DocumentColor,
-        buffer: Entity<Buffer>,
-        server_id: LanguageServerId,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<DocumentColor>> {
-        if color.resolved {
-            return Task::ready(Ok(color));
-        }
-
-        if let Some((upstream_client, project_id)) = self.upstream_client() {
-            let start = color.lsp_range.start;
-            let end = color.lsp_range.end;
-            let request = proto::GetColorPresentation {
-                project_id,
-                server_id: server_id.to_proto(),
-                buffer_id: buffer.read(cx).remote_id().into(),
-                color: Some(proto::ColorInformation {
-                    red: color.color.red,
-                    green: color.color.green,
-                    blue: color.color.blue,
-                    alpha: color.color.alpha,
-                    lsp_range_start: Some(proto::PointUtf16 {
-                        row: start.line,
-                        column: start.character,
-                    }),
-                    lsp_range_end: Some(proto::PointUtf16 {
-                        row: end.line,
-                        column: end.character,
-                    }),
-                }),
-            };
-            cx.background_spawn(async move {
-                let response = upstream_client
-                    .request(request)
-                    .await
-                    .context("color presentation proto request")?;
-                color.resolved = true;
-                color.color_presentations = response
-                    .presentations
-                    .into_iter()
-                    .map(|presentation| ColorPresentation {
-                        label: SharedString::from(presentation.label),
-                        text_edit: presentation.text_edit.and_then(deserialize_lsp_edit),
-                        additional_text_edits: presentation
-                            .additional_text_edits
-                            .into_iter()
-                            .filter_map(deserialize_lsp_edit)
-                            .collect(),
-                    })
-                    .collect();
-                Ok(color)
-            })
-        } else {
-            let path = match buffer
-                .update(cx, |buffer, cx| {
-                    Some(File::from_dyn(buffer.file())?.abs_path(cx))
-                })
-                .context("buffer with the missing path")
-            {
-                Ok(path) => path,
-                Err(e) => return Task::ready(Err(e)),
-            };
-            let Some(lang_server) = buffer.update(cx, |buffer, cx| {
-                self.language_server_for_local_buffer(buffer, server_id, cx)
-                    .map(|(_, server)| server.clone())
-            }) else {
-                return Task::ready(Ok(color));
-            };
-            cx.background_spawn(async move {
-                let resolve_task = lang_server.request::<lsp::request::ColorPresentationRequest>(
-                    lsp::ColorPresentationParams {
-                        text_document: make_text_document_identifier(&path)?,
-                        color: color.color,
-                        range: color.lsp_range,
-                        work_done_progress_params: Default::default(),
-                        partial_result_params: Default::default(),
-                    },
-                );
-                color.color_presentations = resolve_task
-                    .await
-                    .into_response()
-                    .context("color presentation resolve LSP request")?
-                    .into_iter()
-                    .map(|presentation| ColorPresentation {
-                        label: SharedString::from(presentation.label),
-                        text_edit: presentation.text_edit,
-                        additional_text_edits: presentation
-                            .additional_text_edits
-                            .unwrap_or_default(),
-                    })
-                    .collect();
-                color.resolved = true;
-                Ok(color)
-            })
-        }
-    }
-
-    pub(crate) fn linked_edits(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        position: Anchor,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Vec<Range<Anchor>>>> {
-        let snapshot = buffer.read(cx).snapshot();
-        let scope = snapshot.language_scope_at(position);
-        let Some(server_id) = self
-            .as_local()
-            .and_then(|local| {
-                buffer.update(cx, |buffer, cx| {
-                    local
-                        .language_servers_for_buffer(buffer, cx)
-                        .filter(|(_, server)| {
-                            LinkedEditingRange::check_server_capabilities(server.capabilities())
-                        })
-                        .filter(|(adapter, _)| {
-                            scope
-                                .as_ref()
-                                .map(|scope| scope.language_allowed(&adapter.name))
-                                .unwrap_or(true)
-                        })
-                        .map(|(_, server)| LanguageServerToQuery::Other(server.server_id()))
-                        .next()
-                })
-            })
-            .or_else(|| {
-                self.upstream_client()
-                    .is_some()
-                    .then_some(LanguageServerToQuery::FirstCapable)
-            })
-            .filter(|_| {
-                maybe!({
-                    let language = buffer.read(cx).language_at(position)?;
-                    Some(
-                        language_settings(Some(language.name()), buffer.read(cx).file(), cx)
-                            .linked_edits,
-                    )
-                }) == Some(true)
-            })
-        else {
-            return Task::ready(Ok(Vec::new()));
-        };
-
-        self.request_lsp(
-            buffer.clone(),
-            server_id,
-            LinkedEditingRange { position },
-            cx,
-        )
-    }
-
-    fn apply_on_type_formatting(
-        &mut self,
-        buffer: Entity<Buffer>,
-        position: Anchor,
-        trigger: String,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Option<Transaction>>> {
-        if let Some((client, project_id)) = self.upstream_client() {
-            if !self.check_if_capable_for_proto_request(
-                &buffer,
-                |capabilities| {
-                    OnTypeFormatting::supports_on_type_formatting(&trigger, capabilities)
-                },
-                cx,
-            ) {
-                return Task::ready(Ok(None));
-            }
-            let request = proto::OnTypeFormatting {
-                project_id,
-                buffer_id: buffer.read(cx).remote_id().into(),
-                position: Some(serialize_anchor(&position)),
-                trigger,
-                version: serialize_version(&buffer.read(cx).version()),
-            };
-            cx.background_spawn(async move {
-                client
-                    .request(request)
-                    .await?
-                    .transaction
-                    .map(language::proto::deserialize_transaction)
-                    .transpose()
-            })
-        } else if let Some(local) = self.as_local_mut() {
-            let buffer_id = buffer.read(cx).remote_id();
-            local.buffers_being_formatted.insert(buffer_id);
-            cx.spawn(async move |this, cx| {
-                let _cleanup = defer({
-                    let this = this.clone();
-                    let mut cx = cx.clone();
-                    move || {
-                        this.update(&mut cx, |this, _| {
-                            if let Some(local) = this.as_local_mut() {
-                                local.buffers_being_formatted.remove(&buffer_id);
-                            }
-                        })
-                        .ok();
-                    }
-                });
-
-                buffer
-                    .update(cx, |buffer, _| {
-                        buffer.wait_for_edits(Some(position.timestamp))
-                    })?
-                    .await?;
-                this.update(cx, |this, cx| {
-                    let position = position.to_point_utf16(buffer.read(cx));
-                    this.on_type_format(buffer, position, trigger, false, cx)
-                })?
-                .await
-            })
-        } else {
-            Task::ready(Err(anyhow!("No upstream client or local language server")))
-        }
-    }
-
-    pub fn on_type_format<T: ToPointUtf16>(
-        &mut self,
-        buffer: Entity<Buffer>,
-        position: T,
-        trigger: String,
-        push_to_history: bool,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Option<Transaction>>> {
-        let position = position.to_point_utf16(buffer.read(cx));
-        self.on_type_format_impl(buffer, position, trigger, push_to_history, cx)
-    }
-
-    fn on_type_format_impl(
-        &mut self,
-        buffer: Entity<Buffer>,
-        position: PointUtf16,
-        trigger: String,
-        push_to_history: bool,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Option<Transaction>>> {
-        let options = buffer.update(cx, |buffer, cx| {
-            lsp_command::lsp_formatting_options(
-                language_settings(
-                    buffer.language_at(position).map(|l| l.name()),
-                    buffer.file(),
-                    cx,
-                )
-                .as_ref(),
-            )
-        });
-
-        cx.spawn(async move |this, cx| {
-            if let Some(waiter) =
-                buffer.update(cx, |buffer, _| buffer.wait_for_autoindent_applied())?
-            {
-                waiter.await?;
-            }
-            cx.update(|cx| {
-                this.update(cx, |this, cx| {
-                    this.request_lsp(
-                        buffer.clone(),
-                        LanguageServerToQuery::FirstCapable,
-                        OnTypeFormatting {
-                            position,
-                            trigger,
-                            options,
-                            push_to_history,
-                        },
-                        cx,
-                    )
-                })
-            })??
-            .await
-        })
-    }
-
-    pub fn definitions(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        position: PointUtf16,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Option<Vec<LocationLink>>>> {
-        if let Some((upstream_client, project_id)) = self.upstream_client() {
-            let request = GetDefinitions { position };
-            if !self.is_capable_for_proto_request(buffer, &request, cx) {
-                return Task::ready(Ok(None));
-            }
-            let request_task = upstream_client.request_lsp(
-                project_id,
-                None,
-                LSP_REQUEST_TIMEOUT,
-                cx.background_executor().clone(),
-                request.to_proto(project_id, buffer.read(cx)),
-            );
-            let buffer = buffer.clone();
-            cx.spawn(async move |weak_lsp_store, cx| {
-                let Some(lsp_store) = weak_lsp_store.upgrade() else {
-                    return Ok(None);
-                };
-                let Some(responses) = request_task.await? else {
-                    return Ok(None);
-                };
-                let actions = join_all(responses.payload.into_iter().map(|response| {
-                    GetDefinitions { position }.response_from_proto(
-                        response.response,
-                        lsp_store.clone(),
-                        buffer.clone(),
-                        cx.clone(),
-                    )
-                }))
-                .await;
-
-                Ok(Some(
-                    actions
-                        .into_iter()
-                        .collect::<Result<Vec<Vec<_>>>>()?
-                        .into_iter()
-                        .flatten()
-                        .dedup()
-                        .collect(),
-                ))
-            })
-        } else {
-            let definitions_task = self.request_multiple_lsp_locally(
-                buffer,
-                Some(position),
-                GetDefinitions { position },
-                cx,
-            );
-            cx.background_spawn(async move {
-                Ok(Some(
-                    definitions_task
-                        .await
-                        .into_iter()
-                        .flat_map(|(_, definitions)| definitions)
-                        .dedup()
-                        .collect(),
-                ))
-            })
-        }
-    }
-
-    pub fn declarations(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        position: PointUtf16,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Option<Vec<LocationLink>>>> {
-        if let Some((upstream_client, project_id)) = self.upstream_client() {
-            let request = GetDeclarations { position };
-            if !self.is_capable_for_proto_request(buffer, &request, cx) {
-                return Task::ready(Ok(None));
-            }
-            let request_task = upstream_client.request_lsp(
-                project_id,
-                None,
-                LSP_REQUEST_TIMEOUT,
-                cx.background_executor().clone(),
-                request.to_proto(project_id, buffer.read(cx)),
-            );
-            let buffer = buffer.clone();
-            cx.spawn(async move |weak_lsp_store, cx| {
-                let Some(lsp_store) = weak_lsp_store.upgrade() else {
-                    return Ok(None);
-                };
-                let Some(responses) = request_task.await? else {
-                    return Ok(None);
-                };
-                let actions = join_all(responses.payload.into_iter().map(|response| {
-                    GetDeclarations { position }.response_from_proto(
-                        response.response,
-                        lsp_store.clone(),
-                        buffer.clone(),
-                        cx.clone(),
-                    )
-                }))
-                .await;
-
-                Ok(Some(
-                    actions
-                        .into_iter()
-                        .collect::<Result<Vec<Vec<_>>>>()?
-                        .into_iter()
-                        .flatten()
-                        .dedup()
-                        .collect(),
-                ))
-            })
-        } else {
-            let declarations_task = self.request_multiple_lsp_locally(
-                buffer,
-                Some(position),
-                GetDeclarations { position },
-                cx,
-            );
-            cx.background_spawn(async move {
-                Ok(Some(
-                    declarations_task
-                        .await
-                        .into_iter()
-                        .flat_map(|(_, declarations)| declarations)
-                        .dedup()
-                        .collect(),
-                ))
-            })
-        }
-    }
-
-    pub fn type_definitions(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        position: PointUtf16,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Option<Vec<LocationLink>>>> {
-        if let Some((upstream_client, project_id)) = self.upstream_client() {
-            let request = GetTypeDefinitions { position };
-            if !self.is_capable_for_proto_request(buffer, &request, cx) {
-                return Task::ready(Ok(None));
-            }
-            let request_task = upstream_client.request_lsp(
-                project_id,
-                None,
-                LSP_REQUEST_TIMEOUT,
-                cx.background_executor().clone(),
-                request.to_proto(project_id, buffer.read(cx)),
-            );
-            let buffer = buffer.clone();
-            cx.spawn(async move |weak_lsp_store, cx| {
-                let Some(lsp_store) = weak_lsp_store.upgrade() else {
-                    return Ok(None);
-                };
-                let Some(responses) = request_task.await? else {
-                    return Ok(None);
-                };
-                let actions = join_all(responses.payload.into_iter().map(|response| {
-                    GetTypeDefinitions { position }.response_from_proto(
-                        response.response,
-                        lsp_store.clone(),
-                        buffer.clone(),
-                        cx.clone(),
-                    )
-                }))
-                .await;
-
-                Ok(Some(
-                    actions
-                        .into_iter()
-                        .collect::<Result<Vec<Vec<_>>>>()?
-                        .into_iter()
-                        .flatten()
-                        .dedup()
-                        .collect(),
-                ))
-            })
-        } else {
-            let type_definitions_task = self.request_multiple_lsp_locally(
-                buffer,
-                Some(position),
-                GetTypeDefinitions { position },
-                cx,
-            );
-            cx.background_spawn(async move {
-                Ok(Some(
-                    type_definitions_task
-                        .await
-                        .into_iter()
-                        .flat_map(|(_, type_definitions)| type_definitions)
-                        .dedup()
-                        .collect(),
-                ))
-            })
-        }
-    }
-
-    pub fn implementations(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        position: PointUtf16,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Option<Vec<LocationLink>>>> {
-        if let Some((upstream_client, project_id)) = self.upstream_client() {
-            let request = GetImplementations { position };
-            if !self.is_capable_for_proto_request(buffer, &request, cx) {
-                return Task::ready(Ok(None));
-            }
-            let request_task = upstream_client.request_lsp(
-                project_id,
-                None,
-                LSP_REQUEST_TIMEOUT,
-                cx.background_executor().clone(),
-                request.to_proto(project_id, buffer.read(cx)),
-            );
-            let buffer = buffer.clone();
-            cx.spawn(async move |weak_lsp_store, cx| {
-                let Some(lsp_store) = weak_lsp_store.upgrade() else {
-                    return Ok(None);
-                };
-                let Some(responses) = request_task.await? else {
-                    return Ok(None);
-                };
-                let actions = join_all(responses.payload.into_iter().map(|response| {
-                    GetImplementations { position }.response_from_proto(
-                        response.response,
-                        lsp_store.clone(),
-                        buffer.clone(),
-                        cx.clone(),
-                    )
-                }))
-                .await;
-
-                Ok(Some(
-                    actions
-                        .into_iter()
-                        .collect::<Result<Vec<Vec<_>>>>()?
-                        .into_iter()
-                        .flatten()
-                        .dedup()
-                        .collect(),
-                ))
-            })
-        } else {
-            let implementations_task = self.request_multiple_lsp_locally(
-                buffer,
-                Some(position),
-                GetImplementations { position },
-                cx,
-            );
-            cx.background_spawn(async move {
-                Ok(Some(
-                    implementations_task
-                        .await
-                        .into_iter()
-                        .flat_map(|(_, implementations)| implementations)
-                        .dedup()
-                        .collect(),
-                ))
-            })
-        }
-    }
-
-    pub fn references(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        position: PointUtf16,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Option<Vec<Location>>>> {
-        if let Some((upstream_client, project_id)) = self.upstream_client() {
-            let request = GetReferences { position };
-            if !self.is_capable_for_proto_request(buffer, &request, cx) {
-                return Task::ready(Ok(None));
-            }
-
-            let request_task = upstream_client.request_lsp(
-                project_id,
-                None,
-                LSP_REQUEST_TIMEOUT,
-                cx.background_executor().clone(),
-                request.to_proto(project_id, buffer.read(cx)),
-            );
-            let buffer = buffer.clone();
-            cx.spawn(async move |weak_lsp_store, cx| {
-                let Some(lsp_store) = weak_lsp_store.upgrade() else {
-                    return Ok(None);
-                };
-                let Some(responses) = request_task.await? else {
-                    return Ok(None);
-                };
-
-                let locations = join_all(responses.payload.into_iter().map(|lsp_response| {
-                    GetReferences { position }.response_from_proto(
-                        lsp_response.response,
-                        lsp_store.clone(),
-                        buffer.clone(),
-                        cx.clone(),
-                    )
-                }))
-                .await
-                .into_iter()
-                .collect::<Result<Vec<Vec<_>>>>()?
-                .into_iter()
-                .flatten()
-                .dedup()
-                .collect();
-                Ok(Some(locations))
-            })
-        } else {
-            let references_task = self.request_multiple_lsp_locally(
-                buffer,
-                Some(position),
-                GetReferences { position },
-                cx,
-            );
-            cx.background_spawn(async move {
-                Ok(Some(
-                    references_task
-                        .await
-                        .into_iter()
-                        .flat_map(|(_, references)| references)
-                        .dedup()
-                        .collect(),
-                ))
-            })
-        }
-    }
-
-    pub fn code_actions(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        range: Range<Anchor>,
-        kinds: Option<Vec<CodeActionKind>>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Option<Vec<CodeAction>>>> {
-        if let Some((upstream_client, project_id)) = self.upstream_client() {
-            let request = GetCodeActions {
-                range: range.clone(),
-                kinds: kinds.clone(),
-            };
-            if !self.is_capable_for_proto_request(buffer, &request, cx) {
-                return Task::ready(Ok(None));
-            }
-            let request_task = upstream_client.request_lsp(
-                project_id,
-                None,
-                LSP_REQUEST_TIMEOUT,
-                cx.background_executor().clone(),
-                request.to_proto(project_id, buffer.read(cx)),
-            );
-            let buffer = buffer.clone();
-            cx.spawn(async move |weak_lsp_store, cx| {
-                let Some(lsp_store) = weak_lsp_store.upgrade() else {
-                    return Ok(None);
-                };
-                let Some(responses) = request_task.await? else {
-                    return Ok(None);
-                };
-                let actions = join_all(responses.payload.into_iter().map(|response| {
-                    GetCodeActions {
-                        range: range.clone(),
-                        kinds: kinds.clone(),
-                    }
-                    .response_from_proto(
-                        response.response,
-                        lsp_store.clone(),
-                        buffer.clone(),
-                        cx.clone(),
-                    )
-                }))
-                .await;
-
-                Ok(Some(
-                    actions
-                        .into_iter()
-                        .collect::<Result<Vec<Vec<_>>>>()?
-                        .into_iter()
-                        .flatten()
-                        .collect(),
-                ))
-            })
-        } else {
-            let all_actions_task = self.request_multiple_lsp_locally(
-                buffer,
-                Some(range.start),
-                GetCodeActions { range, kinds },
-                cx,
-            );
-            cx.background_spawn(async move {
-                Ok(Some(
-                    all_actions_task
-                        .await
-                        .into_iter()
-                        .flat_map(|(_, actions)| actions)
-                        .collect(),
-                ))
-            })
-        }
-    }
-
-    pub fn code_lens_actions(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        cx: &mut Context<Self>,
-    ) -> CodeLensTask {
-        let version_queried_for = buffer.read(cx).version();
-        let buffer_id = buffer.read(cx).remote_id();
-        let existing_servers = self.as_local().map(|local| {
-            local
-                .buffers_opened_in_servers
-                .get(&buffer_id)
-                .cloned()
-                .unwrap_or_default()
-        });
-
-        if let Some(lsp_data) = self.current_lsp_data(buffer_id) {
-            if let Some(cached_lens) = &lsp_data.code_lens {
-                if !version_queried_for.changed_since(&lsp_data.buffer_version) {
-                    let has_different_servers = existing_servers.is_some_and(|existing_servers| {
-                        existing_servers != cached_lens.lens.keys().copied().collect()
-                    });
-                    if !has_different_servers {
-                        return Task::ready(Ok(Some(
-                            cached_lens.lens.values().flatten().cloned().collect(),
-                        )))
-                        .shared();
-                    }
-                } else if let Some((updating_for, running_update)) = cached_lens.update.as_ref() {
-                    if !version_queried_for.changed_since(updating_for) {
-                        return running_update.clone();
-                    }
-                }
-            }
-        }
-
-        let lens_lsp_data = self
-            .latest_lsp_data(buffer, cx)
-            .code_lens
-            .get_or_insert_default();
-        let buffer = buffer.clone();
-        let query_version_queried_for = version_queried_for.clone();
-        let new_task = cx
-            .spawn(async move |lsp_store, cx| {
-                cx.background_executor()
-                    .timer(Duration::from_millis(30))
-                    .await;
-                let fetched_lens = lsp_store
-                    .update(cx, |lsp_store, cx| lsp_store.fetch_code_lens(&buffer, cx))
-                    .map_err(Arc::new)?
-                    .await
-                    .context("fetching code lens")
-                    .map_err(Arc::new);
-                let fetched_lens = match fetched_lens {
-                    Ok(fetched_lens) => fetched_lens,
-                    Err(e) => {
-                        lsp_store
-                            .update(cx, |lsp_store, _| {
-                                if let Some(lens_lsp_data) = lsp_store
-                                    .lsp_data
-                                    .get_mut(&buffer_id)
-                                    .and_then(|lsp_data| lsp_data.code_lens.as_mut())
-                                {
-                                    lens_lsp_data.update = None;
-                                }
-                            })
-                            .ok();
-                        return Err(e);
-                    }
-                };
-
-                lsp_store
-                    .update(cx, |lsp_store, _| {
-                        let lsp_data = lsp_store.current_lsp_data(buffer_id)?;
-                        let code_lens = lsp_data.code_lens.as_mut()?;
-                        if let Some(fetched_lens) = fetched_lens {
-                            if lsp_data.buffer_version == query_version_queried_for {
-                                code_lens.lens.extend(fetched_lens);
-                            } else if !lsp_data
-                                .buffer_version
-                                .changed_since(&query_version_queried_for)
-                            {
-                                lsp_data.buffer_version = query_version_queried_for;
-                                code_lens.lens = fetched_lens;
-                            }
-                        }
-                        code_lens.update = None;
-                        Some(code_lens.lens.values().flatten().cloned().collect())
-                    })
-                    .map_err(Arc::new)
-            })
-            .shared();
-        lens_lsp_data.update = Some((version_queried_for, new_task.clone()));
-        new_task
-    }
-
-    fn fetch_code_lens(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Option<HashMap<LanguageServerId, Vec<CodeAction>>>>> {
-        if let Some((upstream_client, project_id)) = self.upstream_client() {
-            let request = GetCodeLens;
-            if !self.is_capable_for_proto_request(buffer, &request, cx) {
-                return Task::ready(Ok(None));
-            }
-            let request_task = upstream_client.request_lsp(
-                project_id,
-                None,
-                LSP_REQUEST_TIMEOUT,
-                cx.background_executor().clone(),
-                request.to_proto(project_id, buffer.read(cx)),
-            );
-            let buffer = buffer.clone();
-            cx.spawn(async move |weak_lsp_store, cx| {
-                let Some(lsp_store) = weak_lsp_store.upgrade() else {
-                    return Ok(None);
-                };
-                let Some(responses) = request_task.await? else {
-                    return Ok(None);
-                };
-
-                let code_lens_actions = join_all(responses.payload.into_iter().map(|response| {
-                    let lsp_store = lsp_store.clone();
-                    let buffer = buffer.clone();
-                    let cx = cx.clone();
-                    async move {
-                        (
-                            LanguageServerId::from_proto(response.server_id),
-                            GetCodeLens
-                                .response_from_proto(response.response, lsp_store, buffer, cx)
-                                .await,
-                        )
-                    }
-                }))
-                .await;
-
-                let mut has_errors = false;
-                let code_lens_actions = code_lens_actions
-                    .into_iter()
-                    .filter_map(|(server_id, code_lens)| match code_lens {
-                        Ok(code_lens) => Some((server_id, code_lens)),
-                        Err(e) => {
-                            has_errors = true;
-                            log::error!("{e:#}");
-                            None
-                        }
-                    })
-                    .collect::<HashMap<_, _>>();
-                anyhow::ensure!(
-                    !has_errors || !code_lens_actions.is_empty(),
-                    "Failed to fetch code lens"
-                );
-                Ok(Some(code_lens_actions))
-            })
-        } else {
-            let code_lens_actions_task =
-                self.request_multiple_lsp_locally(buffer, None::<usize>, GetCodeLens, cx);
-            cx.background_spawn(async move {
-                Ok(Some(code_lens_actions_task.await.into_iter().collect()))
-            })
-        }
-    }
-
-    #[inline(never)]
-    pub fn completions(
-        &self,
-        buffer: &Entity<Buffer>,
-        position: PointUtf16,
-        context: CompletionContext,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Vec<CompletionResponse>>> {
-        let language_registry = self.languages.clone();
-
-        if let Some((upstream_client, project_id)) = self.upstream_client() {
-            let snapshot = buffer.read(cx).snapshot();
-            let offset = position.to_offset(&snapshot);
-            let scope = snapshot.language_scope_at(offset);
-            let capable_lsps = self.all_capable_for_proto_request(
-                buffer,
-                |server_name, capabilities| {
-                    capabilities.completion_provider.is_some()
-                        && scope
-                            .as_ref()
-                            .map(|scope| scope.language_allowed(server_name))
-                            .unwrap_or(true)
-                },
-                cx,
-            );
-            if capable_lsps.is_empty() {
-                return Task::ready(Ok(Vec::new()));
-            }
-
-            let language = buffer.read(cx).language().cloned();
-
-            // In the future, we should provide project guests with the names of LSP adapters,
-            // so that they can use the correct LSP adapter when computing labels. For now,
-            // guests just use the first LSP adapter associated with the buffer's language.
-            let lsp_adapter = language.as_ref().and_then(|language| {
-                language_registry
-                    .lsp_adapters(&language.name())
-                    .first()
-                    .cloned()
-            });
-
-            let buffer = buffer.clone();
-
-            cx.spawn(async move |this, cx| {
-                let requests = join_all(
-                    capable_lsps
-                        .into_iter()
-                        .map(|id| {
-                            let request = GetCompletions {
-                                position,
-                                context: context.clone(),
-                                server_id: Some(id),
-                            };
-                            let buffer = buffer.clone();
-                            let language = language.clone();
-                            let lsp_adapter = lsp_adapter.clone();
-                            let upstream_client = upstream_client.clone();
-                            let response = this
-                                .update(cx, |this, cx| {
-                                    this.send_lsp_proto_request(
-                                        buffer,
-                                        upstream_client,
-                                        project_id,
-                                        request,
-                                        cx,
-                                    )
-                                })
-                                .log_err();
-                            async move {
-                                let response = response?.await.log_err()?;
-
-                                let completions = populate_labels_for_completions(
-                                    response.completions,
-                                    language,
-                                    lsp_adapter,
-                                )
-                                .await;
-
-                                Some(CompletionResponse {
-                                    completions,
-                                    display_options: CompletionDisplayOptions::default(),
-                                    is_incomplete: response.is_incomplete,
-                                })
-                            }
-                        })
-                        .collect::<Vec<_>>(),
-                );
-                Ok(requests.await.into_iter().flatten().collect::<Vec<_>>())
-            })
-        } else if let Some(local) = self.as_local() {
-            let snapshot = buffer.read(cx).snapshot();
-            let offset = position.to_offset(&snapshot);
-            let scope = snapshot.language_scope_at(offset);
-            let language = snapshot.language().cloned();
-            let completion_settings = language_settings(
-                language.as_ref().map(|language| language.name()),
-                buffer.read(cx).file(),
-                cx,
-            )
-            .completions
-            .clone();
-            if !completion_settings.lsp {
-                return Task::ready(Ok(Vec::new()));
-            }
-
-            let server_ids: Vec<_> = buffer.update(cx, |buffer, cx| {
-                local
-                    .language_servers_for_buffer(buffer, cx)
-                    .filter(|(_, server)| server.capabilities().completion_provider.is_some())
-                    .filter(|(adapter, _)| {
-                        scope
-                            .as_ref()
-                            .map(|scope| scope.language_allowed(&adapter.name))
-                            .unwrap_or(true)
-                    })
-                    .map(|(_, server)| server.server_id())
-                    .collect()
-            });
-
-            let buffer = buffer.clone();
-            let lsp_timeout = completion_settings.lsp_fetch_timeout_ms;
-            let lsp_timeout = if lsp_timeout > 0 {
-                Some(Duration::from_millis(lsp_timeout))
-            } else {
-                None
-            };
-            cx.spawn(async move |this,  cx| {
-                let mut tasks = Vec::with_capacity(server_ids.len());
-                this.update(cx, |lsp_store, cx| {
-                    for server_id in server_ids {
-                        let lsp_adapter = lsp_store.language_server_adapter_for_id(server_id);
-                        let lsp_timeout = lsp_timeout
-                            .map(|lsp_timeout| cx.background_executor().timer(lsp_timeout));
-                        let mut timeout = cx.background_spawn(async move {
-                            match lsp_timeout {
-                                Some(lsp_timeout) => {
-                                    lsp_timeout.await;
-                                    true
-                                },
-                                None => false,
-                            }
-                        }).fuse();
-                        let mut lsp_request = lsp_store.request_lsp(
-                            buffer.clone(),
-                            LanguageServerToQuery::Other(server_id),
-                            GetCompletions {
-                                position,
-                                context: context.clone(),
-                                server_id: Some(server_id),
-                            },
-                            cx,
-                        ).fuse();
-                        let new_task = cx.background_spawn(async move {
-                            select_biased! {
-                                response = lsp_request => anyhow::Ok(Some(response?)),
-                                timeout_happened = timeout => {
-                                    if timeout_happened {
-                                        log::warn!("Fetching completions from server {server_id} timed out, timeout ms: {}", completion_settings.lsp_fetch_timeout_ms);
-                                        Ok(None)
-                                    } else {
-                                        let completions = lsp_request.await?;
-                                        Ok(Some(completions))
-                                    }
-                                },
-                            }
-                        });
-                        tasks.push((lsp_adapter, new_task));
-                    }
-                })?;
-
-                let futures = tasks.into_iter().map(async |(lsp_adapter, task)| {
-                    let completion_response = task.await.ok()??;
-                    let completions = populate_labels_for_completions(
-                            completion_response.completions,
-                            language.clone(),
-                            lsp_adapter,
-                        )
-                        .await;
-                    Some(CompletionResponse {
-                        completions,
-                        display_options: CompletionDisplayOptions::default(),
-                        is_incomplete: completion_response.is_incomplete,
-                    })
-                });
-
-                let responses: Vec<Option<CompletionResponse>> = join_all(futures).await;
-
-                Ok(responses.into_iter().flatten().collect())
-            })
-        } else {
-            Task::ready(Err(anyhow!("No upstream client or local language server")))
-        }
-    }
-
-    pub fn resolve_completions(
-        &self,
-        buffer: Entity<Buffer>,
-        completion_indices: Vec<usize>,
-        completions: Rc<RefCell<Box<[Completion]>>>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<bool>> {
-        let client = self.upstream_client();
-        let buffer_id = buffer.read(cx).remote_id();
-        let buffer_snapshot = buffer.read(cx).snapshot();
-
-        if !self.check_if_capable_for_proto_request(
-            &buffer,
-            GetCompletions::can_resolve_completions,
-            cx,
-        ) {
-            return Task::ready(Ok(false));
-        }
-        cx.spawn(async move |lsp_store, cx| {
-            let mut did_resolve = false;
-            if let Some((client, project_id)) = client {
-                for completion_index in completion_indices {
-                    let server_id = {
-                        let completion = &completions.borrow()[completion_index];
-                        completion.source.server_id()
-                    };
-                    if let Some(server_id) = server_id {
-                        if Self::resolve_completion_remote(
-                            project_id,
-                            server_id,
-                            buffer_id,
-                            completions.clone(),
-                            completion_index,
-                            client.clone(),
-                        )
-                        .await
-                        .log_err()
-                        .is_some()
-                        {
-                            did_resolve = true;
-                        }
-                    } else {
-                        resolve_word_completion(
-                            &buffer_snapshot,
-                            &mut completions.borrow_mut()[completion_index],
-                        );
-                    }
-                }
-            } else {
-                for completion_index in completion_indices {
-                    let server_id = {
-                        let completion = &completions.borrow()[completion_index];
-                        completion.source.server_id()
-                    };
-                    if let Some(server_id) = server_id {
-                        let server_and_adapter = lsp_store
-                            .read_with(cx, |lsp_store, _| {
-                                let server = lsp_store.language_server_for_id(server_id)?;
-                                let adapter =
-                                    lsp_store.language_server_adapter_for_id(server.server_id())?;
-                                Some((server, adapter))
-                            })
-                            .ok()
-                            .flatten();
-                        let Some((server, adapter)) = server_and_adapter else {
-                            continue;
-                        };
-
-                        let resolved = Self::resolve_completion_local(
-                            server,
-                            completions.clone(),
-                            completion_index,
-                        )
-                        .await
-                        .log_err()
-                        .is_some();
-                        if resolved {
-                            Self::regenerate_completion_labels(
-                                adapter,
-                                &buffer_snapshot,
-                                completions.clone(),
-                                completion_index,
-                            )
-                            .await
-                            .log_err();
-                            did_resolve = true;
-                        }
-                    } else {
-                        resolve_word_completion(
-                            &buffer_snapshot,
-                            &mut completions.borrow_mut()[completion_index],
-                        );
-                    }
-                }
-            }
-
-            Ok(did_resolve)
-        })
-    }
-
-    async fn resolve_completion_local(
-        server: Arc<lsp::LanguageServer>,
-        completions: Rc<RefCell<Box<[Completion]>>>,
-        completion_index: usize,
-    ) -> Result<()> {
-        let server_id = server.server_id();
-        if !GetCompletions::can_resolve_completions(&server.capabilities()) {
-            return Ok(());
-        }
-
-        let request = {
-            let completion = &completions.borrow()[completion_index];
-            match &completion.source {
-                CompletionSource::Lsp {
-                    lsp_completion,
-                    resolved,
-                    server_id: completion_server_id,
-                    ..
-                } => {
-                    if *resolved {
-                        return Ok(());
-                    }
-                    anyhow::ensure!(
-                        server_id == *completion_server_id,
-                        "server_id mismatch, querying completion resolve for {server_id} but completion server id is {completion_server_id}"
-                    );
-                    server.request::<lsp::request::ResolveCompletionItem>(*lsp_completion.clone())
-                }
-                CompletionSource::BufferWord { .. }
-                | CompletionSource::Dap { .. }
-                | CompletionSource::Custom => {
-                    return Ok(());
-                }
-            }
-        };
-        let resolved_completion = request
-            .await
-            .into_response()
-            .context("resolve completion")?;
-
-        // We must not use any data such as sortText, filterText, insertText and textEdit to edit `Completion` since they are not suppose change during resolve.
-        // Refer: https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_completion
-
-        let mut completions = completions.borrow_mut();
-        let completion = &mut completions[completion_index];
-        if let CompletionSource::Lsp {
-            lsp_completion,
-            resolved,
-            server_id: completion_server_id,
-            ..
-        } = &mut completion.source
-        {
-            if *resolved {
-                return Ok(());
-            }
-            anyhow::ensure!(
-                server_id == *completion_server_id,
-                "server_id mismatch, applying completion resolve for {server_id} but completion server id is {completion_server_id}"
-            );
-            *lsp_completion = Box::new(resolved_completion);
-            *resolved = true;
-        }
-        Ok(())
-    }
-
-    async fn regenerate_completion_labels(
-        adapter: Arc<CachedLspAdapter>,
-        snapshot: &BufferSnapshot,
-        completions: Rc<RefCell<Box<[Completion]>>>,
-        completion_index: usize,
-    ) -> Result<()> {
-        let completion_item = completions.borrow()[completion_index]
-            .source
-            .lsp_completion(true)
-            .map(Cow::into_owned);
-        if let Some(lsp_documentation) = completion_item
-            .as_ref()
-            .and_then(|completion_item| completion_item.documentation.clone())
-        {
-            let mut completions = completions.borrow_mut();
-            let completion = &mut completions[completion_index];
-            completion.documentation = Some(lsp_documentation.into());
-        } else {
-            let mut completions = completions.borrow_mut();
-            let completion = &mut completions[completion_index];
-            completion.documentation = Some(CompletionDocumentation::Undocumented);
-        }
-
-        let mut new_label = match completion_item {
-            Some(completion_item) => {
-                // NB: Zed does not have `details` inside the completion resolve capabilities, but certain language servers violate the spec and do not return `details` immediately, e.g. https://github.com/yioneko/vtsls/issues/213
-                // So we have to update the label here anyway...
-                let language = snapshot.language();
-                match language {
-                    Some(language) => {
-                        adapter
-                            .labels_for_completions(
-                                std::slice::from_ref(&completion_item),
-                                language,
-                            )
-                            .await?
-                    }
-                    None => Vec::new(),
-                }
-                .pop()
-                .flatten()
-                .unwrap_or_else(|| {
-                    CodeLabel::fallback_for_completion(
-                        &completion_item,
-                        language.map(|language| language.as_ref()),
-                    )
-                })
-            }
-            None => CodeLabel::plain(
-                completions.borrow()[completion_index].new_text.clone(),
-                None,
-            ),
-        };
-        ensure_uniform_list_compatible_label(&mut new_label);
-
-        let mut completions = completions.borrow_mut();
-        let completion = &mut completions[completion_index];
-        if completion.label.filter_text() == new_label.filter_text() {
-            completion.label = new_label;
-        } else {
-            log::error!(
-                "Resolved completion changed display label from {} to {}. \
-                 Refusing to apply this because it changes the fuzzy match text from {} to {}",
-                completion.label.text(),
-                new_label.text(),
-                completion.label.filter_text(),
-                new_label.filter_text()
-            );
-        }
-
-        Ok(())
-    }
-
-    async fn resolve_completion_remote(
-        project_id: u64,
-        server_id: LanguageServerId,
-        buffer_id: BufferId,
-        completions: Rc<RefCell<Box<[Completion]>>>,
-        completion_index: usize,
-        client: AnyProtoClient,
-    ) -> Result<()> {
-        let lsp_completion = {
-            let completion = &completions.borrow()[completion_index];
-            match &completion.source {
-                CompletionSource::Lsp {
-                    lsp_completion,
-                    resolved,
-                    server_id: completion_server_id,
-                    ..
-                } => {
-                    anyhow::ensure!(
-                        server_id == *completion_server_id,
-                        "remote server_id mismatch, querying completion resolve for {server_id} but completion server id is {completion_server_id}"
-                    );
-                    if *resolved {
-                        return Ok(());
-                    }
-                    serde_json::to_string(lsp_completion).unwrap().into_bytes()
-                }
-                CompletionSource::Custom
-                | CompletionSource::Dap { .. }
-                | CompletionSource::BufferWord { .. } => {
-                    return Ok(());
-                }
-            }
-        };
-        let request = proto::ResolveCompletionDocumentation {
-            project_id,
-            language_server_id: server_id.0 as u64,
-            lsp_completion,
-            buffer_id: buffer_id.into(),
-        };
-
-        let response = client
-            .request(request)
-            .await
-            .context("completion documentation resolve proto request")?;
-        let resolved_lsp_completion = serde_json::from_slice(&response.lsp_completion)?;
-
-        let documentation = if response.documentation.is_empty() {
-            CompletionDocumentation::Undocumented
-        } else if response.documentation_is_markdown {
-            CompletionDocumentation::MultiLineMarkdown(response.documentation.into())
-        } else if response.documentation.lines().count() <= 1 {
-            CompletionDocumentation::SingleLine(response.documentation.into())
-        } else {
-            CompletionDocumentation::MultiLinePlainText(response.documentation.into())
-        };
-
-        let mut completions = completions.borrow_mut();
-        let completion = &mut completions[completion_index];
-        completion.documentation = Some(documentation);
-        if let CompletionSource::Lsp {
-            insert_range,
-            lsp_completion,
-            resolved,
-            server_id: completion_server_id,
-            lsp_defaults: _,
-        } = &mut completion.source
-        {
-            let completion_insert_range = response
-                .old_insert_start
-                .and_then(deserialize_anchor)
-                .zip(response.old_insert_end.and_then(deserialize_anchor));
-            *insert_range = completion_insert_range.map(|(start, end)| start..end);
-
-            if *resolved {
-                return Ok(());
-            }
-            anyhow::ensure!(
-                server_id == *completion_server_id,
-                "remote server_id mismatch, applying completion resolve for {server_id} but completion server id is {completion_server_id}"
-            );
-            *lsp_completion = Box::new(resolved_lsp_completion);
-            *resolved = true;
-        }
-
-        let replace_range = response
-            .old_replace_start
-            .and_then(deserialize_anchor)
-            .zip(response.old_replace_end.and_then(deserialize_anchor));
-        if let Some((old_replace_start, old_replace_end)) = replace_range
-            && !response.new_text.is_empty()
-        {
-            completion.new_text = response.new_text;
-            completion.replace_range = old_replace_start..old_replace_end;
-        }
-
-        Ok(())
-    }
-
-    pub fn apply_additional_edits_for_completion(
-        &self,
-        buffer_handle: Entity<Buffer>,
-        completions: Rc<RefCell<Box<[Completion]>>>,
-        completion_index: usize,
-        push_to_history: bool,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Option<Transaction>>> {
-        if let Some((client, project_id)) = self.upstream_client() {
-            let buffer = buffer_handle.read(cx);
-            let buffer_id = buffer.remote_id();
-            cx.spawn(async move |_, cx| {
-                let request = {
-                    let completion = completions.borrow()[completion_index].clone();
-                    proto::ApplyCompletionAdditionalEdits {
-                        project_id,
-                        buffer_id: buffer_id.into(),
-                        completion: Some(Self::serialize_completion(&CoreCompletion {
-                            replace_range: completion.replace_range,
-                            new_text: completion.new_text,
-                            source: completion.source,
-                        })),
-                    }
-                };
-
-                if let Some(transaction) = client.request(request).await?.transaction {
-                    let transaction = language::proto::deserialize_transaction(transaction)?;
-                    buffer_handle
-                        .update(cx, |buffer, _| {
-                            buffer.wait_for_edits(transaction.edit_ids.iter().copied())
-                        })?
-                        .await?;
-                    if push_to_history {
-                        buffer_handle.update(cx, |buffer, _| {
-                            buffer.push_transaction(transaction.clone(), Instant::now());
-                            buffer.finalize_last_transaction();
-                        })?;
-                    }
-                    Ok(Some(transaction))
-                } else {
-                    Ok(None)
-                }
-            })
-        } else {
-            let Some(server) = buffer_handle.update(cx, |buffer, cx| {
-                let completion = &completions.borrow()[completion_index];
-                let server_id = completion.source.server_id()?;
-                Some(
-                    self.language_server_for_local_buffer(buffer, server_id, cx)?
-                        .1
-                        .clone(),
-                )
-            }) else {
-                return Task::ready(Ok(None));
-            };
-
-            cx.spawn(async move |this, cx| {
-                Self::resolve_completion_local(
-                    server.clone(),
-                    completions.clone(),
-                    completion_index,
-                )
-                .await
-                .context("resolving completion")?;
-                let completion = completions.borrow()[completion_index].clone();
-                let additional_text_edits = completion
-                    .source
-                    .lsp_completion(true)
-                    .as_ref()
-                    .and_then(|lsp_completion| lsp_completion.additional_text_edits.clone());
-                if let Some(edits) = additional_text_edits {
-                    let edits = this
-                        .update(cx, |this, cx| {
-                            this.as_local_mut().unwrap().edits_from_lsp(
-                                &buffer_handle,
-                                edits,
-                                server.server_id(),
-                                None,
-                                cx,
-                            )
-                        })?
-                        .await?;
-
-                    buffer_handle.update(cx, |buffer, cx| {
-                        buffer.finalize_last_transaction();
-                        buffer.start_transaction();
-
-                        for (range, text) in edits {
-                            let primary = &completion.replace_range;
-
-                            // Special case: if both ranges start at the very beginning of the file (line 0, column 0),
-                            // and the primary completion is just an insertion (empty range), then this is likely
-                            // an auto-import scenario and should not be considered overlapping
-                            // https://github.com/zed-industries/zed/issues/26136
-                            let is_file_start_auto_import = {
-                                let snapshot = buffer.snapshot();
-                                let primary_start_point = primary.start.to_point(&snapshot);
-                                let range_start_point = range.start.to_point(&snapshot);
-
-                                let result = primary_start_point.row == 0
-                                    && primary_start_point.column == 0
-                                    && range_start_point.row == 0
-                                    && range_start_point.column == 0;
-
-                                result
-                            };
-
-                            let has_overlap = if is_file_start_auto_import {
-                                false
-                            } else {
-                                let start_within = primary.start.cmp(&range.start, buffer).is_le()
-                                    && primary.end.cmp(&range.start, buffer).is_ge();
-                                let end_within = range.start.cmp(&primary.end, buffer).is_le()
-                                    && range.end.cmp(&primary.end, buffer).is_ge();
-                                let result = start_within || end_within;
-                                result
-                            };
-
-                            //Skip additional edits which overlap with the primary completion edit
-                            //https://github.com/zed-industries/zed/pull/1871
-                            if !has_overlap {
-                                buffer.edit([(range, text)], None, cx);
-                            }
-                        }
-
-                        let transaction = if buffer.end_transaction(cx).is_some() {
-                            let transaction = buffer.finalize_last_transaction().unwrap().clone();
-                            if !push_to_history {
-                                buffer.forget_transaction(transaction.id);
-                            }
-                            Some(transaction)
-                        } else {
-                            None
-                        };
-                        Ok(transaction)
-                    })?
-                } else {
-                    Ok(None)
-                }
-            })
-        }
-    }
-
-    pub fn pull_diagnostics(
-        &mut self,
-        buffer: Entity<Buffer>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Option<Vec<LspPullDiagnostics>>>> {
-        let buffer_id = buffer.read(cx).remote_id();
-
-        if let Some((client, upstream_project_id)) = self.upstream_client() {
-            let mut suitable_capabilities = None;
-            // Are we capable for proto request?
-            let any_server_has_diagnostics_provider = self.check_if_capable_for_proto_request(
-                &buffer,
-                |capabilities| {
-                    if let Some(caps) = &capabilities.diagnostic_provider {
-                        suitable_capabilities = Some(caps.clone());
-                        true
-                    } else {
-                        false
-                    }
-                },
-                cx,
-            );
-            // We don't really care which caps are passed into the request, as they're ignored by RPC anyways.
-            let Some(dynamic_caps) = suitable_capabilities else {
-                return Task::ready(Ok(None));
-            };
-            assert!(any_server_has_diagnostics_provider);
-
-            let identifier = buffer_diagnostic_identifier(&dynamic_caps);
-            let request = GetDocumentDiagnostics {
-                previous_result_id: None,
-                identifier,
-                registration_id: None,
-            };
-            let request_task = client.request_lsp(
-                upstream_project_id,
-                None,
-                LSP_REQUEST_TIMEOUT,
-                cx.background_executor().clone(),
-                request.to_proto(upstream_project_id, buffer.read(cx)),
-            );
-            cx.background_spawn(async move {
-                // Proto requests cause the diagnostics to be pulled from language server(s) on the local side
-                // and then, buffer state updated with the diagnostics received, which will be later propagated to the client.
-                // Do not attempt to further process the dummy responses here.
-                let _response = request_task.await?;
-                Ok(None)
-            })
-        } else {
-            let servers = buffer.update(cx, |buffer, cx| {
-                self.running_language_servers_for_local_buffer(buffer, cx)
-                    .map(|(_, server)| server.clone())
-                    .collect::<Vec<_>>()
-            });
-
-            let pull_diagnostics = servers
-                .into_iter()
-                .flat_map(|server| {
-                    let result = maybe!({
-                        let local = self.as_local()?;
-                        let server_id = server.server_id();
-                        let providers_with_identifiers = local
-                            .language_server_dynamic_registrations
-                            .get(&server_id)
-                            .into_iter()
-                            .flat_map(|registrations| registrations.diagnostics.clone())
-                            .collect::<Vec<_>>();
-                        Some(
-                            providers_with_identifiers
-                                .into_iter()
-                                .map(|(registration_id, dynamic_caps)| {
-                                    let identifier = buffer_diagnostic_identifier(&dynamic_caps);
-                                    let registration_id = registration_id.map(SharedString::from);
-                                    let result_id = self.result_id_for_buffer_pull(
-                                        server_id,
-                                        buffer_id,
-                                        &registration_id,
-                                        cx,
-                                    );
-                                    self.request_lsp(
-                                        buffer.clone(),
-                                        LanguageServerToQuery::Other(server_id),
-                                        GetDocumentDiagnostics {
-                                            previous_result_id: result_id,
-                                            registration_id,
-                                            identifier,
-                                        },
-                                        cx,
-                                    )
-                                })
-                                .collect::<Vec<_>>(),
-                        )
-                    });
-
-                    result.unwrap_or_default()
-                })
-                .collect::<Vec<_>>();
-
-            cx.background_spawn(async move {
-                let mut responses = Vec::new();
-                for diagnostics in join_all(pull_diagnostics).await {
-                    responses.extend(diagnostics?);
-                }
-                Ok(Some(responses))
-            })
-        }
-    }
-
-    pub fn applicable_inlay_chunks(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        ranges: &[Range<text::Anchor>],
-        cx: &mut Context<Self>,
-    ) -> Vec<Range<BufferRow>> {
-        self.latest_lsp_data(buffer, cx)
-            .inlay_hints
-            .applicable_chunks(ranges)
-            .map(|chunk| chunk.row_range())
-            .collect()
-    }
-
-    pub fn invalidate_inlay_hints<'a>(
-        &'a mut self,
-        for_buffers: impl IntoIterator<Item = &'a BufferId> + 'a,
-    ) {
-        for buffer_id in for_buffers {
-            if let Some(lsp_data) = self.lsp_data.get_mut(buffer_id) {
-                lsp_data.inlay_hints.clear();
-            }
-        }
-    }
-
-    pub fn inlay_hints(
-        &mut self,
-        invalidate: InvalidationStrategy,
-        buffer: Entity<Buffer>,
-        ranges: Vec<Range<text::Anchor>>,
-        known_chunks: Option<(clock::Global, HashSet<Range<BufferRow>>)>,
-        cx: &mut Context<Self>,
-    ) -> HashMap<Range<BufferRow>, Task<Result<CacheInlayHints>>> {
-        let next_hint_id = self.next_hint_id.clone();
-        let lsp_data = self.latest_lsp_data(&buffer, cx);
-        let query_version = lsp_data.buffer_version.clone();
-        let mut lsp_refresh_requested = false;
-        let for_server = if let InvalidationStrategy::RefreshRequested {
-            server_id,
-            request_id,
-        } = invalidate
-        {
-            let invalidated = lsp_data
-                .inlay_hints
-                .invalidate_for_server_refresh(server_id, request_id);
-            lsp_refresh_requested = invalidated;
-            Some(server_id)
-        } else {
-            None
-        };
-        let existing_inlay_hints = &mut lsp_data.inlay_hints;
-        let known_chunks = known_chunks
-            .filter(|(known_version, _)| !lsp_data.buffer_version.changed_since(known_version))
-            .map(|(_, known_chunks)| known_chunks)
-            .unwrap_or_default();
-
-        let mut hint_fetch_tasks = Vec::new();
-        let mut cached_inlay_hints = None;
-        let mut ranges_to_query = None;
-        let applicable_chunks = existing_inlay_hints
-            .applicable_chunks(ranges.as_slice())
-            .filter(|chunk| !known_chunks.contains(&chunk.row_range()))
-            .collect::<Vec<_>>();
-        if applicable_chunks.is_empty() {
-            return HashMap::default();
-        }
-
-        for row_chunk in applicable_chunks {
-            match (
-                existing_inlay_hints
-                    .cached_hints(&row_chunk)
-                    .filter(|_| !lsp_refresh_requested)
-                    .cloned(),
-                existing_inlay_hints
-                    .fetched_hints(&row_chunk)
-                    .as_ref()
-                    .filter(|_| !lsp_refresh_requested)
-                    .cloned(),
-            ) {
-                (None, None) => {
-                    let Some(chunk_range) = existing_inlay_hints.chunk_range(row_chunk) else {
-                        continue;
-                    };
-                    ranges_to_query
-                        .get_or_insert_with(Vec::new)
-                        .push((row_chunk, chunk_range));
-                }
-                (None, Some(fetched_hints)) => hint_fetch_tasks.push((row_chunk, fetched_hints)),
-                (Some(cached_hints), None) => {
-                    for (server_id, cached_hints) in cached_hints {
-                        if for_server.is_none_or(|for_server| for_server == server_id) {
-                            cached_inlay_hints
-                                .get_or_insert_with(HashMap::default)
-                                .entry(row_chunk.row_range())
-                                .or_insert_with(HashMap::default)
-                                .entry(server_id)
-                                .or_insert_with(Vec::new)
-                                .extend(cached_hints);
-                        }
-                    }
-                }
-                (Some(cached_hints), Some(fetched_hints)) => {
-                    hint_fetch_tasks.push((row_chunk, fetched_hints));
-                    for (server_id, cached_hints) in cached_hints {
-                        if for_server.is_none_or(|for_server| for_server == server_id) {
-                            cached_inlay_hints
-                                .get_or_insert_with(HashMap::default)
-                                .entry(row_chunk.row_range())
-                                .or_insert_with(HashMap::default)
-                                .entry(server_id)
-                                .or_insert_with(Vec::new)
-                                .extend(cached_hints);
-                        }
-                    }
-                }
-            }
-        }
-
-        if hint_fetch_tasks.is_empty()
-            && ranges_to_query
-                .as_ref()
-                .is_none_or(|ranges| ranges.is_empty())
-            && let Some(cached_inlay_hints) = cached_inlay_hints
-        {
-            cached_inlay_hints
-                .into_iter()
-                .map(|(row_chunk, hints)| (row_chunk, Task::ready(Ok(hints))))
-                .collect()
-        } else {
-            for (chunk, range_to_query) in ranges_to_query.into_iter().flatten() {
-                let next_hint_id = next_hint_id.clone();
-                let buffer = buffer.clone();
-                let query_version = query_version.clone();
-                let new_inlay_hints = cx
-                    .spawn(async move |lsp_store, cx| {
-                        let new_fetch_task = lsp_store.update(cx, |lsp_store, cx| {
-                            lsp_store.fetch_inlay_hints(for_server, &buffer, range_to_query, cx)
-                        })?;
-                        new_fetch_task
-                            .await
-                            .and_then(|new_hints_by_server| {
-                                lsp_store.update(cx, |lsp_store, cx| {
-                                    let lsp_data = lsp_store.latest_lsp_data(&buffer, cx);
-                                    let update_cache = lsp_data.buffer_version == query_version;
-                                    if new_hints_by_server.is_empty() {
-                                        if update_cache {
-                                            lsp_data.inlay_hints.invalidate_for_chunk(chunk);
-                                        }
-                                        HashMap::default()
-                                    } else {
-                                        new_hints_by_server
-                                            .into_iter()
-                                            .map(|(server_id, new_hints)| {
-                                                let new_hints = new_hints
-                                                    .into_iter()
-                                                    .map(|new_hint| {
-                                                        (
-                                                            InlayId::Hint(next_hint_id.fetch_add(
-                                                                1,
-                                                                atomic::Ordering::AcqRel,
-                                                            )),
-                                                            new_hint,
-                                                        )
-                                                    })
-                                                    .collect::<Vec<_>>();
-                                                if update_cache {
-                                                    lsp_data.inlay_hints.insert_new_hints(
-                                                        chunk,
-                                                        server_id,
-                                                        new_hints.clone(),
-                                                    );
-                                                }
-                                                (server_id, new_hints)
-                                            })
-                                            .collect()
-                                    }
-                                })
-                            })
-                            .map_err(Arc::new)
-                    })
-                    .shared();
-
-                let fetch_task = lsp_data.inlay_hints.fetched_hints(&chunk);
-                *fetch_task = Some(new_inlay_hints.clone());
-                hint_fetch_tasks.push((chunk, new_inlay_hints));
-            }
-
-            cached_inlay_hints
-                .unwrap_or_default()
-                .into_iter()
-                .map(|(row_chunk, hints)| (row_chunk, Task::ready(Ok(hints))))
-                .chain(hint_fetch_tasks.into_iter().map(|(chunk, hints_fetch)| {
-                    (
-                        chunk.row_range(),
-                        cx.spawn(async move |_, _| {
-                            hints_fetch.await.map_err(|e| {
-                                if e.error_code() != ErrorCode::Internal {
-                                    anyhow!(e.error_code())
-                                } else {
-                                    anyhow!("{e:#}")
-                                }
-                            })
-                        }),
-                    )
-                }))
-                .collect()
-        }
-    }
-
-    fn fetch_inlay_hints(
-        &mut self,
-        for_server: Option<LanguageServerId>,
-        buffer: &Entity<Buffer>,
-        range: Range<Anchor>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<HashMap<LanguageServerId, Vec<InlayHint>>>> {
-        let request = InlayHints {
-            range: range.clone(),
-        };
-        if let Some((upstream_client, project_id)) = self.upstream_client() {
-            if !self.is_capable_for_proto_request(buffer, &request, cx) {
-                return Task::ready(Ok(HashMap::default()));
-            }
-            let request_task = upstream_client.request_lsp(
-                project_id,
-                for_server.map(|id| id.to_proto()),
-                LSP_REQUEST_TIMEOUT,
-                cx.background_executor().clone(),
-                request.to_proto(project_id, buffer.read(cx)),
-            );
-            let buffer = buffer.clone();
-            cx.spawn(async move |weak_lsp_store, cx| {
-                let Some(lsp_store) = weak_lsp_store.upgrade() else {
-                    return Ok(HashMap::default());
-                };
-                let Some(responses) = request_task.await? else {
-                    return Ok(HashMap::default());
-                };
-
-                let inlay_hints = join_all(responses.payload.into_iter().map(|response| {
-                    let lsp_store = lsp_store.clone();
-                    let buffer = buffer.clone();
-                    let cx = cx.clone();
-                    let request = request.clone();
-                    async move {
-                        (
-                            LanguageServerId::from_proto(response.server_id),
-                            request
-                                .response_from_proto(response.response, lsp_store, buffer, cx)
-                                .await,
-                        )
-                    }
-                }))
-                .await;
-
-                let buffer_snapshot = buffer.read_with(cx, |buffer, _| buffer.snapshot())?;
-                let mut has_errors = false;
-                let inlay_hints = inlay_hints
-                    .into_iter()
-                    .filter_map(|(server_id, inlay_hints)| match inlay_hints {
-                        Ok(inlay_hints) => Some((server_id, inlay_hints)),
-                        Err(e) => {
-                            has_errors = true;
-                            log::error!("{e:#}");
-                            None
-                        }
-                    })
-                    .map(|(server_id, mut new_hints)| {
-                        new_hints.retain(|hint| {
-                            hint.position.is_valid(&buffer_snapshot)
-                                && range.start.is_valid(&buffer_snapshot)
-                                && range.end.is_valid(&buffer_snapshot)
-                                && hint.position.cmp(&range.start, &buffer_snapshot).is_ge()
-                                && hint.position.cmp(&range.end, &buffer_snapshot).is_lt()
-                        });
-                        (server_id, new_hints)
-                    })
-                    .collect::<HashMap<_, _>>();
-                anyhow::ensure!(
-                    !has_errors || !inlay_hints.is_empty(),
-                    "Failed to fetch inlay hints"
-                );
-                Ok(inlay_hints)
-            })
-        } else {
-            let inlay_hints_task = match for_server {
-                Some(server_id) => {
-                    let server_task = self.request_lsp(
-                        buffer.clone(),
-                        LanguageServerToQuery::Other(server_id),
-                        request,
-                        cx,
-                    );
-                    cx.background_spawn(async move {
-                        let mut responses = Vec::new();
-                        match server_task.await {
-                            Ok(response) => responses.push((server_id, response)),
-                            // rust-analyzer likes to error with this when its still loading up
-                            Err(e) if format!("{e:#}").ends_with("content modified") => (),
-                            Err(e) => log::error!(
-                                "Error handling response for inlay hints request: {e:#}"
-                            ),
-                        }
-                        responses
-                    })
-                }
-                None => self.request_multiple_lsp_locally(buffer, None::<usize>, request, cx),
-            };
-            let buffer_snapshot = buffer.read_with(cx, |buffer, _| buffer.snapshot());
-            cx.background_spawn(async move {
-                Ok(inlay_hints_task
-                    .await
-                    .into_iter()
-                    .map(|(server_id, mut new_hints)| {
-                        new_hints.retain(|hint| {
-                            hint.position.is_valid(&buffer_snapshot)
-                                && range.start.is_valid(&buffer_snapshot)
-                                && range.end.is_valid(&buffer_snapshot)
-                                && hint.position.cmp(&range.start, &buffer_snapshot).is_ge()
-                                && hint.position.cmp(&range.end, &buffer_snapshot).is_lt()
-                        });
-                        (server_id, new_hints)
-                    })
-                    .collect())
-            })
-        }
-    }
-
-    pub fn pull_diagnostics_for_buffer(
-        &mut self,
-        buffer: Entity<Buffer>,
-        cx: &mut Context<Self>,
-    ) -> Task<anyhow::Result<()>> {
-        let diagnostics = self.pull_diagnostics(buffer, cx);
-        cx.spawn(async move |lsp_store, cx| {
-            let Some(diagnostics) = diagnostics.await.context("pulling diagnostics")? else {
-                return Ok(());
-            };
-            lsp_store.update(cx, |lsp_store, cx| {
-                if lsp_store.as_local().is_none() {
-                    return;
-                }
-
-                let mut unchanged_buffers = HashMap::default();
-                let server_diagnostics_updates = diagnostics
-                    .into_iter()
-                    .filter_map(|diagnostics_set| match diagnostics_set {
-                        LspPullDiagnostics::Response {
-                            server_id,
-                            uri,
-                            diagnostics,
-                            registration_id,
-                        } => Some((server_id, uri, diagnostics, registration_id)),
-                        LspPullDiagnostics::Default => None,
-                    })
-                    .fold(
-                        HashMap::default(),
-                        |mut acc, (server_id, uri, diagnostics, new_registration_id)| {
-                            let (result_id, diagnostics) = match diagnostics {
-                                PulledDiagnostics::Unchanged { result_id } => {
-                                    unchanged_buffers
-                                        .entry(new_registration_id.clone())
-                                        .or_insert_with(HashSet::default)
-                                        .insert(uri.clone());
-                                    (Some(result_id), Vec::new())
-                                }
-                                PulledDiagnostics::Changed {
-                                    result_id,
-                                    diagnostics,
-                                } => (result_id, diagnostics),
-                            };
-                            let disk_based_sources = Cow::Owned(
-                                lsp_store
-                                    .language_server_adapter_for_id(server_id)
-                                    .as_ref()
-                                    .map(|adapter| adapter.disk_based_diagnostic_sources.as_slice())
-                                    .unwrap_or(&[])
-                                    .to_vec(),
-                            );
-                            acc.entry(server_id)
-                                .or_insert_with(HashMap::default)
-                                .entry(new_registration_id.clone())
-                                .or_insert_with(Vec::new)
-                                .push(DocumentDiagnosticsUpdate {
-                                    server_id,
-                                    diagnostics: lsp::PublishDiagnosticsParams {
-                                        uri,
-                                        diagnostics,
-                                        version: None,
-                                    },
-                                    result_id,
-                                    disk_based_sources,
-                                    registration_id: new_registration_id,
-                                });
-                            acc
-                        },
-                    );
-
-                for diagnostic_updates in server_diagnostics_updates.into_values() {
-                    for (registration_id, diagnostic_updates) in diagnostic_updates {
-                        lsp_store
-                            .merge_lsp_diagnostics(
-                                DiagnosticSourceKind::Pulled,
-                                diagnostic_updates,
-                                |document_uri, old_diagnostic, _| match old_diagnostic.source_kind {
-                                    DiagnosticSourceKind::Pulled => {
-                                        old_diagnostic.registration_id != registration_id
-                                            || unchanged_buffers
-                                                .get(&old_diagnostic.registration_id)
-                                                .is_some_and(|unchanged_buffers| {
-                                                    unchanged_buffers.contains(&document_uri)
-                                                })
-                                    }
-                                    DiagnosticSourceKind::Other | DiagnosticSourceKind::Pushed => {
-                                        true
-                                    }
-                                },
-                                cx,
-                            )
-                            .log_err();
-                    }
-                }
-            })
-        })
-    }
-
-    pub fn document_colors(
-        &mut self,
-        known_cache_version: Option<usize>,
-        buffer: Entity<Buffer>,
-        cx: &mut Context<Self>,
-    ) -> Option<DocumentColorTask> {
-        let version_queried_for = buffer.read(cx).version();
-        let buffer_id = buffer.read(cx).remote_id();
-
-        let current_language_servers = self.as_local().map(|local| {
-            local
-                .buffers_opened_in_servers
-                .get(&buffer_id)
-                .cloned()
-                .unwrap_or_default()
-        });
-
-        if let Some(lsp_data) = self.current_lsp_data(buffer_id) {
-            if let Some(cached_colors) = &lsp_data.document_colors {
-                if !version_queried_for.changed_since(&lsp_data.buffer_version) {
-                    let has_different_servers =
-                        current_language_servers.is_some_and(|current_language_servers| {
-                            current_language_servers
-                                != cached_colors.colors.keys().copied().collect()
-                        });
-                    if !has_different_servers {
-                        let cache_version = cached_colors.cache_version;
-                        if Some(cache_version) == known_cache_version {
-                            return None;
-                        } else {
-                            return Some(
-                                Task::ready(Ok(DocumentColors {
-                                    colors: cached_colors
-                                        .colors
-                                        .values()
-                                        .flatten()
-                                        .cloned()
-                                        .collect(),
-                                    cache_version: Some(cache_version),
-                                }))
-                                .shared(),
-                            );
-                        }
-                    }
-                }
-            }
-        }
-
-        let color_lsp_data = self
-            .latest_lsp_data(&buffer, cx)
-            .document_colors
-            .get_or_insert_default();
-        if let Some((updating_for, running_update)) = &color_lsp_data.colors_update
-            && !version_queried_for.changed_since(updating_for)
-        {
-            return Some(running_update.clone());
-        }
-        let buffer_version_queried_for = version_queried_for.clone();
-        let new_task = cx
-            .spawn(async move |lsp_store, cx| {
-                cx.background_executor()
-                    .timer(Duration::from_millis(30))
-                    .await;
-                let fetched_colors = lsp_store
-                    .update(cx, |lsp_store, cx| {
-                        lsp_store.fetch_document_colors_for_buffer(&buffer, cx)
-                    })?
-                    .await
-                    .context("fetching document colors")
-                    .map_err(Arc::new);
-                let fetched_colors = match fetched_colors {
-                    Ok(fetched_colors) => {
-                        if Some(true)
-                            == buffer
-                                .update(cx, |buffer, _| {
-                                    buffer.version() != buffer_version_queried_for
-                                })
-                                .ok()
-                        {
-                            return Ok(DocumentColors::default());
-                        }
-                        fetched_colors
-                    }
-                    Err(e) => {
-                        lsp_store
-                            .update(cx, |lsp_store, _| {
-                                if let Some(lsp_data) = lsp_store.lsp_data.get_mut(&buffer_id) {
-                                    if let Some(document_colors) = &mut lsp_data.document_colors {
-                                        document_colors.colors_update = None;
-                                    }
-                                }
-                            })
-                            .ok();
-                        return Err(e);
-                    }
-                };
-
-                lsp_store
-                    .update(cx, |lsp_store, cx| {
-                        let lsp_data = lsp_store.latest_lsp_data(&buffer, cx);
-                        let lsp_colors = lsp_data.document_colors.get_or_insert_default();
-
-                        if let Some(fetched_colors) = fetched_colors {
-                            if lsp_data.buffer_version == buffer_version_queried_for {
-                                lsp_colors.colors.extend(fetched_colors);
-                                lsp_colors.cache_version += 1;
-                            } else if !lsp_data
-                                .buffer_version
-                                .changed_since(&buffer_version_queried_for)
-                            {
-                                lsp_data.buffer_version = buffer_version_queried_for;
-                                lsp_colors.colors = fetched_colors;
-                                lsp_colors.cache_version += 1;
-                            }
-                        }
-                        lsp_colors.colors_update = None;
-                        let colors = lsp_colors
-                            .colors
-                            .values()
-                            .flatten()
-                            .cloned()
-                            .collect::<HashSet<_>>();
-                        DocumentColors {
-                            colors,
-                            cache_version: Some(lsp_colors.cache_version),
-                        }
-                    })
-                    .map_err(Arc::new)
-            })
-            .shared();
-        color_lsp_data.colors_update = Some((version_queried_for, new_task.clone()));
-        Some(new_task)
-    }
-
-    fn fetch_document_colors_for_buffer(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        cx: &mut Context<Self>,
-    ) -> Task<anyhow::Result<Option<HashMap<LanguageServerId, HashSet<DocumentColor>>>>> {
-        if let Some((client, project_id)) = self.upstream_client() {
-            let request = GetDocumentColor {};
-            if !self.is_capable_for_proto_request(buffer, &request, cx) {
-                return Task::ready(Ok(None));
-            }
-
-            let request_task = client.request_lsp(
-                project_id,
-                None,
-                LSP_REQUEST_TIMEOUT,
-                cx.background_executor().clone(),
-                request.to_proto(project_id, buffer.read(cx)),
-            );
-            let buffer = buffer.clone();
-            cx.spawn(async move |lsp_store, cx| {
-                let Some(lsp_store) = lsp_store.upgrade() else {
-                    return Ok(None);
-                };
-                let colors = join_all(
-                    request_task
-                        .await
-                        .log_err()
-                        .flatten()
-                        .map(|response| response.payload)
-                        .unwrap_or_default()
-                        .into_iter()
-                        .map(|color_response| {
-                            let response = request.response_from_proto(
-                                color_response.response,
-                                lsp_store.clone(),
-                                buffer.clone(),
-                                cx.clone(),
-                            );
-                            async move {
-                                (
-                                    LanguageServerId::from_proto(color_response.server_id),
-                                    response.await.log_err().unwrap_or_default(),
-                                )
-                            }
-                        }),
-                )
-                .await
-                .into_iter()
-                .fold(HashMap::default(), |mut acc, (server_id, colors)| {
-                    acc.entry(server_id)
-                        .or_insert_with(HashSet::default)
-                        .extend(colors);
-                    acc
-                });
-                Ok(Some(colors))
-            })
-        } else {
-            let document_colors_task =
-                self.request_multiple_lsp_locally(buffer, None::<usize>, GetDocumentColor, cx);
-            cx.background_spawn(async move {
-                Ok(Some(
-                    document_colors_task
-                        .await
-                        .into_iter()
-                        .fold(HashMap::default(), |mut acc, (server_id, colors)| {
-                            acc.entry(server_id)
-                                .or_insert_with(HashSet::default)
-                                .extend(colors);
-                            acc
-                        })
-                        .into_iter()
-                        .collect(),
-                ))
-            })
-        }
-    }
-
-    pub fn signature_help<T: ToPointUtf16>(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        position: T,
-        cx: &mut Context<Self>,
-    ) -> Task<Option<Vec<SignatureHelp>>> {
-        let position = position.to_point_utf16(buffer.read(cx));
-
-        if let Some((client, upstream_project_id)) = self.upstream_client() {
-            let request = GetSignatureHelp { position };
-            if !self.is_capable_for_proto_request(buffer, &request, cx) {
-                return Task::ready(None);
-            }
-            let request_task = client.request_lsp(
-                upstream_project_id,
-                None,
-                LSP_REQUEST_TIMEOUT,
-                cx.background_executor().clone(),
-                request.to_proto(upstream_project_id, buffer.read(cx)),
-            );
-            let buffer = buffer.clone();
-            cx.spawn(async move |weak_lsp_store, cx| {
-                let lsp_store = weak_lsp_store.upgrade()?;
-                let signatures = join_all(
-                    request_task
-                        .await
-                        .log_err()
-                        .flatten()
-                        .map(|response| response.payload)
-                        .unwrap_or_default()
-                        .into_iter()
-                        .map(|response| {
-                            let response = GetSignatureHelp { position }.response_from_proto(
-                                response.response,
-                                lsp_store.clone(),
-                                buffer.clone(),
-                                cx.clone(),
-                            );
-                            async move { response.await.log_err().flatten() }
-                        }),
-                )
-                .await
-                .into_iter()
-                .flatten()
-                .collect();
-                Some(signatures)
-            })
-        } else {
-            let all_actions_task = self.request_multiple_lsp_locally(
-                buffer,
-                Some(position),
-                GetSignatureHelp { position },
-                cx,
-            );
-            cx.background_spawn(async move {
-                Some(
-                    all_actions_task
-                        .await
-                        .into_iter()
-                        .flat_map(|(_, actions)| actions)
-                        .collect::<Vec<_>>(),
-                )
-            })
-        }
-    }
-
-    pub fn hover(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        position: PointUtf16,
-        cx: &mut Context<Self>,
-    ) -> Task<Option<Vec<Hover>>> {
-        if let Some((client, upstream_project_id)) = self.upstream_client() {
-            let request = GetHover { position };
-            if !self.is_capable_for_proto_request(buffer, &request, cx) {
-                return Task::ready(None);
-            }
-            let request_task = client.request_lsp(
-                upstream_project_id,
-                None,
-                LSP_REQUEST_TIMEOUT,
-                cx.background_executor().clone(),
-                request.to_proto(upstream_project_id, buffer.read(cx)),
-            );
-            let buffer = buffer.clone();
-            cx.spawn(async move |weak_lsp_store, cx| {
-                let lsp_store = weak_lsp_store.upgrade()?;
-                let hovers = join_all(
-                    request_task
-                        .await
-                        .log_err()
-                        .flatten()
-                        .map(|response| response.payload)
-                        .unwrap_or_default()
-                        .into_iter()
-                        .map(|response| {
-                            let response = GetHover { position }.response_from_proto(
-                                response.response,
-                                lsp_store.clone(),
-                                buffer.clone(),
-                                cx.clone(),
-                            );
-                            async move {
-                                response
-                                    .await
-                                    .log_err()
-                                    .flatten()
-                                    .and_then(remove_empty_hover_blocks)
-                            }
-                        }),
-                )
-                .await
-                .into_iter()
-                .flatten()
-                .collect();
-                Some(hovers)
-            })
-        } else {
-            let all_actions_task = self.request_multiple_lsp_locally(
-                buffer,
-                Some(position),
-                GetHover { position },
-                cx,
-            );
-            cx.background_spawn(async move {
-                Some(
-                    all_actions_task
-                        .await
-                        .into_iter()
-                        .filter_map(|(_, hover)| remove_empty_hover_blocks(hover?))
-                        .collect::<Vec<Hover>>(),
-                )
-            })
-        }
-    }
-
-    pub fn symbols(&self, query: &str, cx: &mut Context<Self>) -> Task<Result<Vec<Symbol>>> {
-        let language_registry = self.languages.clone();
-
-        if let Some((upstream_client, project_id)) = self.upstream_client().as_ref() {
-            let request = upstream_client.request(proto::GetProjectSymbols {
-                project_id: *project_id,
-                query: query.to_string(),
-            });
-            cx.foreground_executor().spawn(async move {
-                let response = request.await?;
-                let mut symbols = Vec::new();
-                let core_symbols = response
-                    .symbols
-                    .into_iter()
-                    .filter_map(|symbol| Self::deserialize_symbol(symbol).log_err())
-                    .collect::<Vec<_>>();
-                populate_labels_for_symbols(core_symbols, &language_registry, None, &mut symbols)
-                    .await;
-                Ok(symbols)
-            })
-        } else if let Some(local) = self.as_local() {
-            struct WorkspaceSymbolsResult {
-                server_id: LanguageServerId,
-                lsp_adapter: Arc<CachedLspAdapter>,
-                worktree: WeakEntity<Worktree>,
-                lsp_symbols: Vec<(String, SymbolKind, lsp::Location)>,
-            }
-
-            let mut requests = Vec::new();
-            let mut requested_servers = BTreeSet::new();
-            for (seed, state) in local.language_server_ids.iter() {
-                let Some(worktree_handle) = self
-                    .worktree_store
-                    .read(cx)
-                    .worktree_for_id(seed.worktree_id, cx)
-                else {
-                    continue;
-                };
-                let worktree = worktree_handle.read(cx);
-                if !worktree.is_visible() {
-                    continue;
-                }
-
-                if !requested_servers.insert(state.id) {
-                    continue;
-                }
-
-                let (lsp_adapter, server) = match local.language_servers.get(&state.id) {
-                    Some(LanguageServerState::Running {
-                        adapter, server, ..
-                    }) => (adapter.clone(), server),
-
-                    _ => continue,
-                };
-                let supports_workspace_symbol_request =
-                    match server.capabilities().workspace_symbol_provider {
-                        Some(OneOf::Left(supported)) => supported,
-                        Some(OneOf::Right(_)) => true,
-                        None => false,
-                    };
-                if !supports_workspace_symbol_request {
-                    continue;
-                }
-                let worktree_handle = worktree_handle.clone();
-                let server_id = server.server_id();
-                requests.push(
-                        server
-                            .request::<lsp::request::WorkspaceSymbolRequest>(
-                                lsp::WorkspaceSymbolParams {
-                                    query: query.to_string(),
-                                    ..Default::default()
-                                },
-                            )
-                            .map(move |response| {
-                                let lsp_symbols = response.into_response()
-                                    .context("workspace symbols request")
-                                    .log_err()
-                                    .flatten()
-                                    .map(|symbol_response| match symbol_response {
-                                        lsp::WorkspaceSymbolResponse::Flat(flat_responses) => {
-                                            flat_responses.into_iter().map(|lsp_symbol| {
-                                            (lsp_symbol.name, lsp_symbol.kind, lsp_symbol.location)
-                                            }).collect::<Vec<_>>()
-                                        }
-                                        lsp::WorkspaceSymbolResponse::Nested(nested_responses) => {
-                                            nested_responses.into_iter().filter_map(|lsp_symbol| {
-                                                let location = match lsp_symbol.location {
-                                                    OneOf::Left(location) => location,
-                                                    OneOf::Right(_) => {
-                                                        log::error!("Unexpected: client capabilities forbid symbol resolutions in workspace.symbol.resolveSupport");
-                                                        return None
-                                                    }
-                                                };
-                                                Some((lsp_symbol.name, lsp_symbol.kind, location))
-                                            }).collect::<Vec<_>>()
-                                        }
-                                    }).unwrap_or_default();
-
-                                WorkspaceSymbolsResult {
-                                    server_id,
-                                    lsp_adapter,
-                                    worktree: worktree_handle.downgrade(),
-                                    lsp_symbols,
-                                }
-                            }),
-                    );
-            }
-
-            cx.spawn(async move |this, cx| {
-                let responses = futures::future::join_all(requests).await;
-                let this = match this.upgrade() {
-                    Some(this) => this,
-                    None => return Ok(Vec::new()),
-                };
-
-                let mut symbols = Vec::new();
-                for result in responses {
-                    let core_symbols = this.update(cx, |this, cx| {
-                        result
-                            .lsp_symbols
-                            .into_iter()
-                            .filter_map(|(symbol_name, symbol_kind, symbol_location)| {
-                                let abs_path = symbol_location.uri.to_file_path().ok()?;
-                                let source_worktree = result.worktree.upgrade()?;
-                                let source_worktree_id = source_worktree.read(cx).id();
-
-                                let path = if let Some((tree, rel_path)) =
-                                    this.worktree_store.read(cx).find_worktree(&abs_path, cx)
-                                {
-                                    let worktree_id = tree.read(cx).id();
-                                    SymbolLocation::InProject(ProjectPath {
-                                        worktree_id,
-                                        path: rel_path,
-                                    })
-                                } else {
-                                    SymbolLocation::OutsideProject {
-                                        signature: this.symbol_signature(&abs_path),
-                                        abs_path: abs_path.into(),
-                                    }
-                                };
-
-                                Some(CoreSymbol {
-                                    source_language_server_id: result.server_id,
-                                    language_server_name: result.lsp_adapter.name.clone(),
-                                    source_worktree_id,
-                                    path,
-                                    kind: symbol_kind,
-                                    name: symbol_name,
-                                    range: range_from_lsp(symbol_location.range),
-                                })
-                            })
-                            .collect()
-                    })?;
-
-                    populate_labels_for_symbols(
-                        core_symbols,
-                        &language_registry,
-                        Some(result.lsp_adapter),
-                        &mut symbols,
-                    )
-                    .await;
-                }
-
-                Ok(symbols)
-            })
-        } else {
-            Task::ready(Err(anyhow!("No upstream client or local language server")))
-        }
-    }
-
-    pub fn diagnostic_summary(&self, include_ignored: bool, cx: &App) -> DiagnosticSummary {
-        let mut summary = DiagnosticSummary::default();
-        for (_, _, path_summary) in self.diagnostic_summaries(include_ignored, cx) {
-            summary.error_count += path_summary.error_count;
-            summary.warning_count += path_summary.warning_count;
-        }
-        summary
-    }
-
-    /// Returns the diagnostic summary for a specific project path.
-    pub fn diagnostic_summary_for_path(
-        &self,
-        project_path: &ProjectPath,
-        _: &App,
-    ) -> DiagnosticSummary {
-        if let Some(summaries) = self
-            .diagnostic_summaries
-            .get(&project_path.worktree_id)
-            .and_then(|map| map.get(&project_path.path))
-        {
-            let (error_count, warning_count) = summaries.iter().fold(
-                (0, 0),
-                |(error_count, warning_count), (_language_server_id, summary)| {
-                    (
-                        error_count + summary.error_count,
-                        warning_count + summary.warning_count,
-                    )
-                },
-            );
-
-            DiagnosticSummary {
-                error_count,
-                warning_count,
-            }
-        } else {
-            DiagnosticSummary::default()
-        }
-    }
-
-    pub fn diagnostic_summaries<'a>(
-        &'a self,
-        include_ignored: bool,
-        cx: &'a App,
-    ) -> impl Iterator<Item = (ProjectPath, LanguageServerId, DiagnosticSummary)> + 'a {
-        self.worktree_store
-            .read(cx)
-            .visible_worktrees(cx)
-            .filter_map(|worktree| {
-                let worktree = worktree.read(cx);
-                Some((worktree, self.diagnostic_summaries.get(&worktree.id())?))
-            })
-            .flat_map(move |(worktree, summaries)| {
-                let worktree_id = worktree.id();
-                summaries
-                    .iter()
-                    .filter(move |(path, _)| {
-                        include_ignored
-                            || worktree
-                                .entry_for_path(path.as_ref())
-                                .is_some_and(|entry| !entry.is_ignored)
-                    })
-                    .flat_map(move |(path, summaries)| {
-                        summaries.iter().map(move |(server_id, summary)| {
-                            (
-                                ProjectPath {
-                                    worktree_id,
-                                    path: path.clone(),
-                                },
-                                *server_id,
-                                *summary,
-                            )
-                        })
-                    })
-            })
-    }
-
-    pub fn on_buffer_edited(
-        &mut self,
-        buffer: Entity<Buffer>,
-        cx: &mut Context<Self>,
-    ) -> Option<()> {
-        let language_servers: Vec<_> = buffer.update(cx, |buffer, cx| {
-            Some(
-                self.as_local()?
-                    .language_servers_for_buffer(buffer, cx)
-                    .map(|i| i.1.clone())
-                    .collect(),
-            )
-        })?;
-
-        let buffer = buffer.read(cx);
-        let file = File::from_dyn(buffer.file())?;
-        let abs_path = file.as_local()?.abs_path(cx);
-        let uri = lsp::Uri::from_file_path(&abs_path)
-            .ok()
-            .with_context(|| format!("Failed to convert path to URI: {}", abs_path.display()))
-            .log_err()?;
-        let next_snapshot = buffer.text_snapshot();
-        for language_server in language_servers {
-            let language_server = language_server.clone();
-
-            let buffer_snapshots = self
-                .as_local_mut()?
-                .buffer_snapshots
-                .get_mut(&buffer.remote_id())
-                .and_then(|m| m.get_mut(&language_server.server_id()))?;
-            let previous_snapshot = buffer_snapshots.last()?;
-
-            let build_incremental_change = || {
-                buffer
-                    .edits_since::<Dimensions<PointUtf16, usize>>(
-                        previous_snapshot.snapshot.version(),
-                    )
-                    .map(|edit| {
-                        let edit_start = edit.new.start.0;
-                        let edit_end = edit_start + (edit.old.end.0 - edit.old.start.0);
-                        let new_text = next_snapshot
-                            .text_for_range(edit.new.start.1..edit.new.end.1)
-                            .collect();
-                        lsp::TextDocumentContentChangeEvent {
-                            range: Some(lsp::Range::new(
-                                point_to_lsp(edit_start),
-                                point_to_lsp(edit_end),
-                            )),
-                            range_length: None,
-                            text: new_text,
-                        }
-                    })
-                    .collect()
-            };
-
-            let document_sync_kind = language_server
-                .capabilities()
-                .text_document_sync
-                .as_ref()
-                .and_then(|sync| match sync {
-                    lsp::TextDocumentSyncCapability::Kind(kind) => Some(*kind),
-                    lsp::TextDocumentSyncCapability::Options(options) => options.change,
-                });
-
-            let content_changes: Vec<_> = match document_sync_kind {
-                Some(lsp::TextDocumentSyncKind::FULL) => {
-                    vec![lsp::TextDocumentContentChangeEvent {
-                        range: None,
-                        range_length: None,
-                        text: next_snapshot.text(),
-                    }]
-                }
-                Some(lsp::TextDocumentSyncKind::INCREMENTAL) => build_incremental_change(),
-                _ => {
-                    #[cfg(any(test, feature = "test-support"))]
-                    {
-                        build_incremental_change()
-                    }
-
-                    #[cfg(not(any(test, feature = "test-support")))]
-                    {
-                        continue;
-                    }
-                }
-            };
-
-            let next_version = previous_snapshot.version + 1;
-            buffer_snapshots.push(LspBufferSnapshot {
-                version: next_version,
-                snapshot: next_snapshot.clone(),
-            });
-
-            language_server
-                .notify::<lsp::notification::DidChangeTextDocument>(
-                    lsp::DidChangeTextDocumentParams {
-                        text_document: lsp::VersionedTextDocumentIdentifier::new(
-                            uri.clone(),
-                            next_version,
-                        ),
-                        content_changes,
-                    },
-                )
-                .ok();
-            self.pull_workspace_diagnostics(language_server.server_id());
-        }
-
-        None
-    }
-
-    pub fn on_buffer_saved(
-        &mut self,
-        buffer: Entity<Buffer>,
-        cx: &mut Context<Self>,
-    ) -> Option<()> {
-        let file = File::from_dyn(buffer.read(cx).file())?;
-        let worktree_id = file.worktree_id(cx);
-        let abs_path = file.as_local()?.abs_path(cx);
-        let text_document = lsp::TextDocumentIdentifier {
-            uri: file_path_to_lsp_url(&abs_path).log_err()?,
-        };
-        let local = self.as_local()?;
-
-        for server in local.language_servers_for_worktree(worktree_id) {
-            if let Some(include_text) = include_text(server.as_ref()) {
-                let text = if include_text {
-                    Some(buffer.read(cx).text())
-                } else {
-                    None
-                };
-                server
-                    .notify::<lsp::notification::DidSaveTextDocument>(
-                        lsp::DidSaveTextDocumentParams {
-                            text_document: text_document.clone(),
-                            text,
-                        },
-                    )
-                    .ok();
-            }
-        }
-
-        let language_servers = buffer.update(cx, |buffer, cx| {
-            local.language_server_ids_for_buffer(buffer, cx)
-        });
-        for language_server_id in language_servers {
-            self.simulate_disk_based_diagnostics_events_if_needed(language_server_id, cx);
-        }
-
-        None
-    }
-
-    async fn refresh_workspace_configurations(lsp_store: &WeakEntity<Self>, cx: &mut AsyncApp) {
-        maybe!(async move {
-            let mut refreshed_servers = HashSet::default();
-            let servers = lsp_store
-                .update(cx, |lsp_store, cx| {
-                    let local = lsp_store.as_local()?;
-
-                    let servers = local
-                        .language_server_ids
-                        .iter()
-                        .filter_map(|(seed, state)| {
-                            let worktree = lsp_store
-                                .worktree_store
-                                .read(cx)
-                                .worktree_for_id(seed.worktree_id, cx);
-                            let delegate: Arc<dyn LspAdapterDelegate> =
-                                worktree.map(|worktree| {
-                                    LocalLspAdapterDelegate::new(
-                                        local.languages.clone(),
-                                        &local.environment,
-                                        cx.weak_entity(),
-                                        &worktree,
-                                        local.http_client.clone(),
-                                        local.fs.clone(),
-                                        cx,
-                                    )
-                                })?;
-                            let server_id = state.id;
-
-                            let states = local.language_servers.get(&server_id)?;
-
-                            match states {
-                                LanguageServerState::Starting { .. } => None,
-                                LanguageServerState::Running {
-                                    adapter, server, ..
-                                } => {
-                                    let adapter = adapter.clone();
-                                    let server = server.clone();
-                                    refreshed_servers.insert(server.name());
-                                    let toolchain = seed.toolchain.clone();
-                                    Some(cx.spawn(async move |_, cx| {
-                                        let settings =
-                                            LocalLspStore::workspace_configuration_for_adapter(
-                                                adapter.adapter.clone(),
-                                                &delegate,
-                                                toolchain,
-                                                None,
-                                                cx,
-                                            )
-                                            .await
-                                            .ok()?;
-                                        server
-                                            .notify::<lsp::notification::DidChangeConfiguration>(
-                                                lsp::DidChangeConfigurationParams { settings },
-                                            )
-                                            .ok()?;
-                                        Some(())
-                                    }))
-                                }
-                            }
-                        })
-                        .collect::<Vec<_>>();
-
-                    Some(servers)
-                })
-                .ok()
-                .flatten()?;
-
-            log::debug!("Refreshing workspace configurations for servers {refreshed_servers:?}");
-            // TODO this asynchronous job runs concurrently with extension (de)registration and may take enough time for a certain extension
-            // to stop and unregister its language server wrapper.
-            // This is racy : an extension might have already removed all `local.language_servers` state, but here we `.clone()` and hold onto it anyway.
-            // This now causes errors in the logs, we should find a way to remove such servers from the processing everywhere.
-            let _: Vec<Option<()>> = join_all(servers).await;
-
-            Some(())
-        })
-        .await;
-    }
-
-    fn maintain_workspace_config(
-        external_refresh_requests: watch::Receiver<()>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let (mut settings_changed_tx, mut settings_changed_rx) = watch::channel();
-        let _ = postage::stream::Stream::try_recv(&mut settings_changed_rx);
-
-        let settings_observation = cx.observe_global::<SettingsStore>(move |_, _| {
-            *settings_changed_tx.borrow_mut() = ();
-        });
-
-        let mut joint_future =
-            futures::stream::select(settings_changed_rx, external_refresh_requests);
-        // Multiple things can happen when a workspace environment (selected toolchain + settings) change:
-        // - We might shut down a language server if it's no longer enabled for a given language (and there are no buffers using it otherwise).
-        // - We might also shut it down when the workspace configuration of all of the users of a given language server converges onto that of the other.
-        // - In the same vein, we might also decide to start a new language server if the workspace configuration *diverges* from the other.
-        // - In the easiest case (where we're not wrangling the lifetime of a language server anyhow), if none of the roots of a single language server diverge in their configuration,
-        // but it is still different to what we had before, we're gonna send out a workspace configuration update.
-        cx.spawn(async move |this, cx| {
-            while let Some(()) = joint_future.next().await {
-                this.update(cx, |this, cx| {
-                    this.refresh_server_tree(cx);
-                })
-                .ok();
-
-                Self::refresh_workspace_configurations(&this, cx).await;
-            }
-
-            drop(settings_observation);
-            anyhow::Ok(())
-        })
-    }
-
-    pub fn running_language_servers_for_local_buffer<'a>(
-        &'a self,
-        buffer: &Buffer,
-        cx: &mut App,
-    ) -> impl Iterator<Item = (&'a Arc<CachedLspAdapter>, &'a Arc<LanguageServer>)> {
-        let local = self.as_local();
-        let language_server_ids = local
-            .map(|local| local.language_server_ids_for_buffer(buffer, cx))
-            .unwrap_or_default();
-
-        language_server_ids
-            .into_iter()
-            .filter_map(
-                move |server_id| match local?.language_servers.get(&server_id)? {
-                    LanguageServerState::Running {
-                        adapter, server, ..
-                    } => Some((adapter, server)),
-                    _ => None,
-                },
-            )
-    }
-
-    pub fn language_servers_for_local_buffer(
-        &self,
-        buffer: &Buffer,
-        cx: &mut App,
-    ) -> Vec<LanguageServerId> {
-        let local = self.as_local();
-        local
-            .map(|local| local.language_server_ids_for_buffer(buffer, cx))
-            .unwrap_or_default()
-    }
-
-    pub fn language_server_for_local_buffer<'a>(
-        &'a self,
-        buffer: &'a Buffer,
-        server_id: LanguageServerId,
-        cx: &'a mut App,
-    ) -> Option<(&'a Arc<CachedLspAdapter>, &'a Arc<LanguageServer>)> {
-        self.as_local()?
-            .language_servers_for_buffer(buffer, cx)
-            .find(|(_, s)| s.server_id() == server_id)
-    }
-
-    fn remove_worktree(&mut self, id_to_remove: WorktreeId, cx: &mut Context<Self>) {
-        self.diagnostic_summaries.remove(&id_to_remove);
-        if let Some(local) = self.as_local_mut() {
-            let to_remove = local.remove_worktree(id_to_remove, cx);
-            for server in to_remove {
-                self.language_server_statuses.remove(&server);
-            }
-        }
-    }
-
-    pub fn shared(
-        &mut self,
-        project_id: u64,
-        downstream_client: AnyProtoClient,
-        _: &mut Context<Self>,
-    ) {
-        self.downstream_client = Some((downstream_client.clone(), project_id));
-
-        for (server_id, status) in &self.language_server_statuses {
-            if let Some(server) = self.language_server_for_id(*server_id) {
-                downstream_client
-                    .send(proto::StartLanguageServer {
-                        project_id,
-                        server: Some(proto::LanguageServer {
-                            id: server_id.to_proto(),
-                            name: status.name.to_string(),
-                            worktree_id: status.worktree.map(|id| id.to_proto()),
-                        }),
-                        capabilities: serde_json::to_string(&server.capabilities())
-                            .expect("serializing server LSP capabilities"),
-                    })
-                    .log_err();
-            }
-        }
-    }
-
-    pub fn disconnected_from_host(&mut self) {
-        self.downstream_client.take();
-    }
-
-    pub fn disconnected_from_ssh_remote(&mut self) {
-        if let LspStoreMode::Remote(RemoteLspStore {
-            upstream_client, ..
-        }) = &mut self.mode
-        {
-            upstream_client.take();
-        }
-    }
-
-    pub(crate) fn set_language_server_statuses_from_proto(
-        &mut self,
-        project: WeakEntity<Project>,
-        language_servers: Vec<proto::LanguageServer>,
-        server_capabilities: Vec<String>,
-        cx: &mut Context<Self>,
-    ) {
-        let lsp_logs = cx
-            .try_global::<GlobalLogStore>()
-            .map(|lsp_store| lsp_store.0.clone());
-
-        self.language_server_statuses = language_servers
-            .into_iter()
-            .zip(server_capabilities)
-            .map(|(server, server_capabilities)| {
-                let server_id = LanguageServerId(server.id as usize);
-                if let Ok(server_capabilities) = serde_json::from_str(&server_capabilities) {
-                    self.lsp_server_capabilities
-                        .insert(server_id, server_capabilities);
-                }
-
-                let name = LanguageServerName::from_proto(server.name);
-                let worktree = server.worktree_id.map(WorktreeId::from_proto);
-
-                if let Some(lsp_logs) = &lsp_logs {
-                    lsp_logs.update(cx, |lsp_logs, cx| {
-                        lsp_logs.add_language_server(
-                            // Only remote clients get their language servers set from proto
-                            LanguageServerKind::Remote {
-                                project: project.clone(),
-                            },
-                            server_id,
-                            Some(name.clone()),
-                            worktree,
-                            None,
-                            cx,
-                        );
-                    });
-                }
-
-                (
-                    server_id,
-                    LanguageServerStatus {
-                        name,
-                        pending_work: Default::default(),
-                        has_pending_diagnostic_updates: false,
-                        progress_tokens: Default::default(),
-                        worktree,
-                        binary: None,
-                        configuration: None,
-                        workspace_folders: BTreeSet::new(),
-                    },
-                )
-            })
-            .collect();
-    }
-
-    #[cfg(test)]
-    pub fn update_diagnostic_entries(
-        &mut self,
-        server_id: LanguageServerId,
-        abs_path: PathBuf,
-        result_id: Option<SharedString>,
-        version: Option<i32>,
-        diagnostics: Vec<DiagnosticEntry<Unclipped<PointUtf16>>>,
-        cx: &mut Context<Self>,
-    ) -> anyhow::Result<()> {
-        self.merge_diagnostic_entries(
-            vec![DocumentDiagnosticsUpdate {
-                diagnostics: DocumentDiagnostics {
-                    diagnostics,
-                    document_abs_path: abs_path,
-                    version,
-                },
-                result_id,
-                server_id,
-                disk_based_sources: Cow::Borrowed(&[]),
-                registration_id: None,
-            }],
-            |_, _, _| false,
-            cx,
-        )?;
-        Ok(())
-    }
-
-    pub fn merge_diagnostic_entries<'a>(
-        &mut self,
-        diagnostic_updates: Vec<DocumentDiagnosticsUpdate<'a, DocumentDiagnostics>>,
-        merge: impl Fn(&lsp::Uri, &Diagnostic, &App) -> bool + Clone,
-        cx: &mut Context<Self>,
-    ) -> anyhow::Result<()> {
-        let mut diagnostics_summary = None::<proto::UpdateDiagnosticSummary>;
-        let mut updated_diagnostics_paths = HashMap::default();
-        for mut update in diagnostic_updates {
-            let abs_path = &update.diagnostics.document_abs_path;
-            let server_id = update.server_id;
-            let Some((worktree, relative_path)) =
-                self.worktree_store.read(cx).find_worktree(abs_path, cx)
-            else {
-                log::warn!("skipping diagnostics update, no worktree found for path {abs_path:?}");
-                return Ok(());
-            };
-
-            let worktree_id = worktree.read(cx).id();
-            let project_path = ProjectPath {
-                worktree_id,
-                path: relative_path,
-            };
-
-            let document_uri = lsp::Uri::from_file_path(abs_path)
-                .map_err(|()| anyhow!("Failed to convert buffer path {abs_path:?} to lsp Uri"))?;
-            if let Some(buffer_handle) = self.buffer_store.read(cx).get_by_path(&project_path) {
-                let snapshot = buffer_handle.read(cx).snapshot();
-                let buffer = buffer_handle.read(cx);
-                let reused_diagnostics = buffer
-                    .buffer_diagnostics(Some(server_id))
-                    .iter()
-                    .filter(|v| merge(&document_uri, &v.diagnostic, cx))
-                    .map(|v| {
-                        let start = Unclipped(v.range.start.to_point_utf16(&snapshot));
-                        let end = Unclipped(v.range.end.to_point_utf16(&snapshot));
-                        DiagnosticEntry {
-                            range: start..end,
-                            diagnostic: v.diagnostic.clone(),
-                        }
-                    })
-                    .collect::<Vec<_>>();
-
-                self.as_local_mut()
-                    .context("cannot merge diagnostics on a remote LspStore")?
-                    .update_buffer_diagnostics(
-                        &buffer_handle,
-                        server_id,
-                        Some(update.registration_id),
-                        update.result_id,
-                        update.diagnostics.version,
-                        update.diagnostics.diagnostics.clone(),
-                        reused_diagnostics.clone(),
-                        cx,
-                    )?;
-
-                update.diagnostics.diagnostics.extend(reused_diagnostics);
-            } else if let Some(local) = self.as_local() {
-                let reused_diagnostics = local
-                    .diagnostics
-                    .get(&worktree_id)
-                    .and_then(|diagnostics_for_tree| diagnostics_for_tree.get(&project_path.path))
-                    .and_then(|diagnostics_by_server_id| {
-                        diagnostics_by_server_id
-                            .binary_search_by_key(&server_id, |e| e.0)
-                            .ok()
-                            .map(|ix| &diagnostics_by_server_id[ix].1)
-                    })
-                    .into_iter()
-                    .flatten()
-                    .filter(|v| merge(&document_uri, &v.diagnostic, cx));
-
-                update
-                    .diagnostics
-                    .diagnostics
-                    .extend(reused_diagnostics.cloned());
-            }
-
-            let updated = worktree.update(cx, |worktree, cx| {
-                self.update_worktree_diagnostics(
-                    worktree.id(),
-                    server_id,
-                    project_path.path.clone(),
-                    update.diagnostics.diagnostics,
-                    cx,
-                )
-            })?;
-            match updated {
-                ControlFlow::Continue(new_summary) => {
-                    if let Some((project_id, new_summary)) = new_summary {
-                        match &mut diagnostics_summary {
-                            Some(diagnostics_summary) => {
-                                diagnostics_summary
-                                    .more_summaries
-                                    .push(proto::DiagnosticSummary {
-                                        path: project_path.path.as_ref().to_proto(),
-                                        language_server_id: server_id.0 as u64,
-                                        error_count: new_summary.error_count,
-                                        warning_count: new_summary.warning_count,
-                                    })
-                            }
-                            None => {
-                                diagnostics_summary = Some(proto::UpdateDiagnosticSummary {
-                                    project_id,
-                                    worktree_id: worktree_id.to_proto(),
-                                    summary: Some(proto::DiagnosticSummary {
-                                        path: project_path.path.as_ref().to_proto(),
-                                        language_server_id: server_id.0 as u64,
-                                        error_count: new_summary.error_count,
-                                        warning_count: new_summary.warning_count,
-                                    }),
-                                    more_summaries: Vec::new(),
-                                })
-                            }
-                        }
-                    }
-                    updated_diagnostics_paths
-                        .entry(server_id)
-                        .or_insert_with(Vec::new)
-                        .push(project_path);
-                }
-                ControlFlow::Break(()) => {}
-            }
-        }
-
-        if let Some((diagnostics_summary, (downstream_client, _))) =
-            diagnostics_summary.zip(self.downstream_client.as_ref())
-        {
-            downstream_client.send(diagnostics_summary).log_err();
-        }
-        for (server_id, paths) in updated_diagnostics_paths {
-            cx.emit(LspStoreEvent::DiagnosticsUpdated { server_id, paths });
-        }
-        Ok(())
-    }
-
-    fn update_worktree_diagnostics(
-        &mut self,
-        worktree_id: WorktreeId,
-        server_id: LanguageServerId,
-        path_in_worktree: Arc<RelPath>,
-        diagnostics: Vec<DiagnosticEntry<Unclipped<PointUtf16>>>,
-        _: &mut Context<Worktree>,
-    ) -> Result<ControlFlow<(), Option<(u64, proto::DiagnosticSummary)>>> {
-        let local = match &mut self.mode {
-            LspStoreMode::Local(local_lsp_store) => local_lsp_store,
-            _ => anyhow::bail!("update_worktree_diagnostics called on remote"),
-        };
-
-        let summaries_for_tree = self.diagnostic_summaries.entry(worktree_id).or_default();
-        let diagnostics_for_tree = local.diagnostics.entry(worktree_id).or_default();
-        let summaries_by_server_id = summaries_for_tree
-            .entry(path_in_worktree.clone())
-            .or_default();
-
-        let old_summary = summaries_by_server_id
-            .remove(&server_id)
-            .unwrap_or_default();
-
-        let new_summary = DiagnosticSummary::new(&diagnostics);
-        if diagnostics.is_empty() {
-            if let Some(diagnostics_by_server_id) = diagnostics_for_tree.get_mut(&path_in_worktree)
-            {
-                if let Ok(ix) = diagnostics_by_server_id.binary_search_by_key(&server_id, |e| e.0) {
-                    diagnostics_by_server_id.remove(ix);
-                }
-                if diagnostics_by_server_id.is_empty() {
-                    diagnostics_for_tree.remove(&path_in_worktree);
-                }
-            }
-        } else {
-            summaries_by_server_id.insert(server_id, new_summary);
-            let diagnostics_by_server_id = diagnostics_for_tree
-                .entry(path_in_worktree.clone())
-                .or_default();
-            match diagnostics_by_server_id.binary_search_by_key(&server_id, |e| e.0) {
-                Ok(ix) => {
-                    diagnostics_by_server_id[ix] = (server_id, diagnostics);
-                }
-                Err(ix) => {
-                    diagnostics_by_server_id.insert(ix, (server_id, diagnostics));
-                }
-            }
-        }
-
-        if !old_summary.is_empty() || !new_summary.is_empty() {
-            if let Some((_, project_id)) = &self.downstream_client {
-                Ok(ControlFlow::Continue(Some((
-                    *project_id,
-                    proto::DiagnosticSummary {
-                        path: path_in_worktree.to_proto(),
-                        language_server_id: server_id.0 as u64,
-                        error_count: new_summary.error_count as u32,
-                        warning_count: new_summary.warning_count as u32,
-                    },
-                ))))
-            } else {
-                Ok(ControlFlow::Continue(None))
-            }
-        } else {
-            Ok(ControlFlow::Break(()))
-        }
-    }
-
-    pub fn open_buffer_for_symbol(
-        &mut self,
-        symbol: &Symbol,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Entity<Buffer>>> {
-        if let Some((client, project_id)) = self.upstream_client() {
-            let request = client.request(proto::OpenBufferForSymbol {
-                project_id,
-                symbol: Some(Self::serialize_symbol(symbol)),
-            });
-            cx.spawn(async move |this, cx| {
-                let response = request.await?;
-                let buffer_id = BufferId::new(response.buffer_id)?;
-                this.update(cx, |this, cx| this.wait_for_remote_buffer(buffer_id, cx))?
-                    .await
-            })
-        } else if let Some(local) = self.as_local() {
-            let is_valid = local.language_server_ids.iter().any(|(seed, state)| {
-                seed.worktree_id == symbol.source_worktree_id
-                    && state.id == symbol.source_language_server_id
-                    && symbol.language_server_name == seed.name
-            });
-            if !is_valid {
-                return Task::ready(Err(anyhow!(
-                    "language server for worktree and language not found"
-                )));
-            };
-
-            let symbol_abs_path = match &symbol.path {
-                SymbolLocation::InProject(project_path) => self
-                    .worktree_store
-                    .read(cx)
-                    .absolutize(&project_path, cx)
-                    .context("no such worktree"),
-                SymbolLocation::OutsideProject {
-                    abs_path,
-                    signature: _,
-                } => Ok(abs_path.to_path_buf()),
-            };
-            let symbol_abs_path = match symbol_abs_path {
-                Ok(abs_path) => abs_path,
-                Err(err) => return Task::ready(Err(err)),
-            };
-            let symbol_uri = if let Ok(uri) = lsp::Uri::from_file_path(symbol_abs_path) {
-                uri
-            } else {
-                return Task::ready(Err(anyhow!("invalid symbol path")));
-            };
-
-            self.open_local_buffer_via_lsp(symbol_uri, symbol.source_language_server_id, cx)
-        } else {
-            Task::ready(Err(anyhow!("no upstream client or local store")))
-        }
-    }
-
-    pub(crate) fn open_local_buffer_via_lsp(
-        &mut self,
-        abs_path: lsp::Uri,
-        language_server_id: LanguageServerId,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Entity<Buffer>>> {
-        cx.spawn(async move |lsp_store, cx| {
-            // Escape percent-encoded string.
-            let current_scheme = abs_path.scheme().to_owned();
-            // Uri is immutable, so we can't modify the scheme
-
-            let abs_path = abs_path
-                .to_file_path()
-                .map_err(|()| anyhow!("can't convert URI to path"))?;
-            let p = abs_path.clone();
-            let yarn_worktree = lsp_store
-                .update(cx, move |lsp_store, cx| match lsp_store.as_local() {
-                    Some(local_lsp_store) => local_lsp_store.yarn.update(cx, |_, cx| {
-                        cx.spawn(async move |this, cx| {
-                            let t = this
-                                .update(cx, |this, cx| this.process_path(&p, &current_scheme, cx))
-                                .ok()?;
-                            t.await
-                        })
-                    }),
-                    None => Task::ready(None),
-                })?
-                .await;
-            let (worktree_root_target, known_relative_path) =
-                if let Some((zip_root, relative_path)) = yarn_worktree {
-                    (zip_root, Some(relative_path))
-                } else {
-                    (Arc::<Path>::from(abs_path.as_path()), None)
-                };
-            let (worktree, relative_path) = if let Some(result) =
-                lsp_store.update(cx, |lsp_store, cx| {
-                    lsp_store.worktree_store.update(cx, |worktree_store, cx| {
-                        worktree_store.find_worktree(&worktree_root_target, cx)
-                    })
-                })? {
-                let relative_path = known_relative_path.unwrap_or_else(|| result.1.clone());
-                (result.0, relative_path)
-            } else {
-                let worktree = lsp_store
-                    .update(cx, |lsp_store, cx| {
-                        lsp_store.worktree_store.update(cx, |worktree_store, cx| {
-                            worktree_store.create_worktree(&worktree_root_target, false, cx)
-                        })
-                    })?
-                    .await?;
-                if worktree.read_with(cx, |worktree, _| worktree.is_local())? {
-                    lsp_store
-                        .update(cx, |lsp_store, cx| {
-                            if let Some(local) = lsp_store.as_local_mut() {
-                                local.register_language_server_for_invisible_worktree(
-                                    &worktree,
-                                    language_server_id,
-                                    cx,
-                                )
-                            }
-                        })
-                        .ok();
-                }
-                let worktree_root = worktree.read_with(cx, |worktree, _| worktree.abs_path())?;
-                let relative_path = if let Some(known_path) = known_relative_path {
-                    known_path
-                } else {
-                    RelPath::new(abs_path.strip_prefix(worktree_root)?, PathStyle::local())?
-                        .into_arc()
-                };
-                (worktree, relative_path)
-            };
-            let project_path = ProjectPath {
-                worktree_id: worktree.read_with(cx, |worktree, _| worktree.id())?,
-                path: relative_path,
-            };
-            lsp_store
-                .update(cx, |lsp_store, cx| {
-                    lsp_store.buffer_store().update(cx, |buffer_store, cx| {
-                        buffer_store.open_buffer(project_path, cx)
-                    })
-                })?
-                .await
-        })
-    }
-
-    fn request_multiple_lsp_locally<P, R>(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        position: Option<P>,
-        request: R,
-        cx: &mut Context<Self>,
-    ) -> Task<Vec<(LanguageServerId, R::Response)>>
-    where
-        P: ToOffset,
-        R: LspCommand + Clone,
-        <R::LspRequest as lsp::request::Request>::Result: Send,
-        <R::LspRequest as lsp::request::Request>::Params: Send,
-    {
-        let Some(local) = self.as_local() else {
-            return Task::ready(Vec::new());
-        };
-
-        let snapshot = buffer.read(cx).snapshot();
-        let scope = position.and_then(|position| snapshot.language_scope_at(position));
-
-        let server_ids = buffer.update(cx, |buffer, cx| {
-            local
-                .language_servers_for_buffer(buffer, cx)
-                .filter(|(adapter, _)| {
-                    scope
-                        .as_ref()
-                        .map(|scope| scope.language_allowed(&adapter.name))
-                        .unwrap_or(true)
-                })
-                .map(|(_, server)| server.server_id())
-                .filter(|server_id| {
-                    self.as_local().is_none_or(|local| {
-                        local
-                            .buffers_opened_in_servers
-                            .get(&snapshot.remote_id())
-                            .is_some_and(|servers| servers.contains(server_id))
-                    })
-                })
-                .collect::<Vec<_>>()
-        });
-
-        let mut response_results = server_ids
-            .into_iter()
-            .map(|server_id| {
-                let task = self.request_lsp(
-                    buffer.clone(),
-                    LanguageServerToQuery::Other(server_id),
-                    request.clone(),
-                    cx,
-                );
-                async move { (server_id, task.await) }
-            })
-            .collect::<FuturesUnordered<_>>();
-
-        cx.background_spawn(async move {
-            let mut responses = Vec::with_capacity(response_results.len());
-            while let Some((server_id, response_result)) = response_results.next().await {
-                match response_result {
-                    Ok(response) => responses.push((server_id, response)),
-                    // rust-analyzer likes to error with this when its still loading up
-                    Err(e) if format!("{e:#}").ends_with("content modified") => (),
-                    Err(e) => log::error!("Error handling response for request {request:?}: {e:#}"),
-                }
-            }
-            responses
-        })
-    }
-
-    async fn handle_lsp_get_completions(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::GetCompletions>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::GetCompletionsResponse> {
-        let sender_id = envelope.original_sender_id().unwrap_or_default();
-
-        let buffer_id = GetCompletions::buffer_id_from_proto(&envelope.payload)?;
-        let buffer_handle = this.update(&mut cx, |this, cx| {
-            this.buffer_store.read(cx).get_existing(buffer_id)
-        })??;
-        let request = GetCompletions::from_proto(
-            envelope.payload,
-            this.clone(),
-            buffer_handle.clone(),
-            cx.clone(),
-        )
-        .await?;
-
-        let server_to_query = match request.server_id {
-            Some(server_id) => LanguageServerToQuery::Other(server_id),
-            None => LanguageServerToQuery::FirstCapable,
-        };
-
-        let response = this
-            .update(&mut cx, |this, cx| {
-                this.request_lsp(buffer_handle.clone(), server_to_query, request, cx)
-            })?
-            .await?;
-        this.update(&mut cx, |this, cx| {
-            Ok(GetCompletions::response_to_proto(
-                response,
-                this,
-                sender_id,
-                &buffer_handle.read(cx).version(),
-                cx,
-            ))
-        })?
-    }
-
-    async fn handle_lsp_command<T: LspCommand>(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<T::ProtoRequest>,
-        mut cx: AsyncApp,
-    ) -> Result<<T::ProtoRequest as proto::RequestMessage>::Response>
-    where
-        <T::LspRequest as lsp::request::Request>::Params: Send,
-        <T::LspRequest as lsp::request::Request>::Result: Send,
-    {
-        let sender_id = envelope.original_sender_id().unwrap_or_default();
-        let buffer_id = T::buffer_id_from_proto(&envelope.payload)?;
-        let buffer_handle = this.update(&mut cx, |this, cx| {
-            this.buffer_store.read(cx).get_existing(buffer_id)
-        })??;
-        let request = T::from_proto(
-            envelope.payload,
-            this.clone(),
-            buffer_handle.clone(),
-            cx.clone(),
-        )
-        .await?;
-        let response = this
-            .update(&mut cx, |this, cx| {
-                this.request_lsp(
-                    buffer_handle.clone(),
-                    LanguageServerToQuery::FirstCapable,
-                    request,
-                    cx,
-                )
-            })?
-            .await?;
-        this.update(&mut cx, |this, cx| {
-            Ok(T::response_to_proto(
-                response,
-                this,
-                sender_id,
-                &buffer_handle.read(cx).version(),
-                cx,
-            ))
-        })?
-    }
-
-    async fn handle_lsp_query(
-        lsp_store: Entity<Self>,
-        envelope: TypedEnvelope<proto::LspQuery>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::Ack> {
-        use proto::lsp_query::Request;
-        let sender_id = envelope.original_sender_id().unwrap_or_default();
-        let lsp_query = envelope.payload;
-        let lsp_request_id = LspRequestId(lsp_query.lsp_request_id);
-        let server_id = lsp_query.server_id.map(LanguageServerId::from_proto);
-        match lsp_query.request.context("invalid LSP query request")? {
-            Request::GetReferences(get_references) => {
-                let position = get_references.position.clone().and_then(deserialize_anchor);
-                Self::query_lsp_locally::<GetReferences>(
-                    lsp_store,
-                    server_id,
-                    sender_id,
-                    lsp_request_id,
-                    get_references,
-                    position,
-                    &mut cx,
-                )
-                .await?;
-            }
-            Request::GetDocumentColor(get_document_color) => {
-                Self::query_lsp_locally::<GetDocumentColor>(
-                    lsp_store,
-                    server_id,
-                    sender_id,
-                    lsp_request_id,
-                    get_document_color,
-                    None,
-                    &mut cx,
-                )
-                .await?;
-            }
-            Request::GetHover(get_hover) => {
-                let position = get_hover.position.clone().and_then(deserialize_anchor);
-                Self::query_lsp_locally::<GetHover>(
-                    lsp_store,
-                    server_id,
-                    sender_id,
-                    lsp_request_id,
-                    get_hover,
-                    position,
-                    &mut cx,
-                )
-                .await?;
-            }
-            Request::GetCodeActions(get_code_actions) => {
-                Self::query_lsp_locally::<GetCodeActions>(
-                    lsp_store,
-                    server_id,
-                    sender_id,
-                    lsp_request_id,
-                    get_code_actions,
-                    None,
-                    &mut cx,
-                )
-                .await?;
-            }
-            Request::GetSignatureHelp(get_signature_help) => {
-                let position = get_signature_help
-                    .position
-                    .clone()
-                    .and_then(deserialize_anchor);
-                Self::query_lsp_locally::<GetSignatureHelp>(
-                    lsp_store,
-                    server_id,
-                    sender_id,
-                    lsp_request_id,
-                    get_signature_help,
-                    position,
-                    &mut cx,
-                )
-                .await?;
-            }
-            Request::GetCodeLens(get_code_lens) => {
-                Self::query_lsp_locally::<GetCodeLens>(
-                    lsp_store,
-                    server_id,
-                    sender_id,
-                    lsp_request_id,
-                    get_code_lens,
-                    None,
-                    &mut cx,
-                )
-                .await?;
-            }
-            Request::GetDefinition(get_definition) => {
-                let position = get_definition.position.clone().and_then(deserialize_anchor);
-                Self::query_lsp_locally::<GetDefinitions>(
-                    lsp_store,
-                    server_id,
-                    sender_id,
-                    lsp_request_id,
-                    get_definition,
-                    position,
-                    &mut cx,
-                )
-                .await?;
-            }
-            Request::GetDeclaration(get_declaration) => {
-                let position = get_declaration
-                    .position
-                    .clone()
-                    .and_then(deserialize_anchor);
-                Self::query_lsp_locally::<GetDeclarations>(
-                    lsp_store,
-                    server_id,
-                    sender_id,
-                    lsp_request_id,
-                    get_declaration,
-                    position,
-                    &mut cx,
-                )
-                .await?;
-            }
-            Request::GetTypeDefinition(get_type_definition) => {
-                let position = get_type_definition
-                    .position
-                    .clone()
-                    .and_then(deserialize_anchor);
-                Self::query_lsp_locally::<GetTypeDefinitions>(
-                    lsp_store,
-                    server_id,
-                    sender_id,
-                    lsp_request_id,
-                    get_type_definition,
-                    position,
-                    &mut cx,
-                )
-                .await?;
-            }
-            Request::GetImplementation(get_implementation) => {
-                let position = get_implementation
-                    .position
-                    .clone()
-                    .and_then(deserialize_anchor);
-                Self::query_lsp_locally::<GetImplementations>(
-                    lsp_store,
-                    server_id,
-                    sender_id,
-                    lsp_request_id,
-                    get_implementation,
-                    position,
-                    &mut cx,
-                )
-                .await?;
-            }
-            Request::GetDocumentDiagnostics(get_document_diagnostics) => {
-                let buffer_id = BufferId::new(get_document_diagnostics.buffer_id())?;
-                let version = deserialize_version(get_document_diagnostics.buffer_version());
-                let buffer = lsp_store.update(&mut cx, |this, cx| {
-                    this.buffer_store.read(cx).get_existing(buffer_id)
-                })??;
-                buffer
-                    .update(&mut cx, |buffer, _| {
-                        buffer.wait_for_version(version.clone())
-                    })?
-                    .await?;
-                lsp_store.update(&mut cx, |lsp_store, cx| {
-                    let lsp_data = lsp_store.latest_lsp_data(&buffer, cx);
-                    let key = LspKey {
-                        request_type: TypeId::of::<GetDocumentDiagnostics>(),
-                        server_queried: server_id,
-                    };
-                    if <GetDocumentDiagnostics as LspCommand>::ProtoRequest::stop_previous_requests(
-                    ) {
-                        if let Some(lsp_requests) = lsp_data.lsp_requests.get_mut(&key) {
-                            lsp_requests.clear();
-                        };
-                    }
-
-                    let existing_queries = lsp_data.lsp_requests.entry(key).or_default();
-                    existing_queries.insert(
-                        lsp_request_id,
-                        cx.spawn(async move |lsp_store, cx| {
-                            let diagnostics_pull = lsp_store
-                                .update(cx, |lsp_store, cx| {
-                                    lsp_store.pull_diagnostics_for_buffer(buffer, cx)
-                                })
-                                .ok();
-                            if let Some(diagnostics_pull) = diagnostics_pull {
-                                match diagnostics_pull.await {
-                                    Ok(()) => {}
-                                    Err(e) => log::error!("Failed to pull diagnostics: {e:#}"),
-                                };
-                            }
-                        }),
-                    );
-                })?;
-            }
-            Request::InlayHints(inlay_hints) => {
-                let query_start = inlay_hints
-                    .start
-                    .clone()
-                    .and_then(deserialize_anchor)
-                    .context("invalid inlay hints range start")?;
-                let query_end = inlay_hints
-                    .end
-                    .clone()
-                    .and_then(deserialize_anchor)
-                    .context("invalid inlay hints range end")?;
-                Self::deduplicate_range_based_lsp_requests::<InlayHints>(
-                    &lsp_store,
-                    server_id,
-                    lsp_request_id,
-                    &inlay_hints,
-                    query_start..query_end,
-                    &mut cx,
-                )
-                .await
-                .context("preparing inlay hints request")?;
-                Self::query_lsp_locally::<InlayHints>(
-                    lsp_store,
-                    server_id,
-                    sender_id,
-                    lsp_request_id,
-                    inlay_hints,
-                    None,
-                    &mut cx,
-                )
-                .await
-                .context("querying for inlay hints")?
-            }
-        }
-        Ok(proto::Ack {})
-    }
-
-    async fn handle_lsp_query_response(
-        lsp_store: Entity<Self>,
-        envelope: TypedEnvelope<proto::LspQueryResponse>,
-        cx: AsyncApp,
-    ) -> Result<()> {
-        lsp_store.read_with(&cx, |lsp_store, _| {
-            if let Some((upstream_client, _)) = lsp_store.upstream_client() {
-                upstream_client.handle_lsp_response(envelope.clone());
-            }
-        })?;
-        Ok(())
-    }
-
-    async fn handle_apply_code_action(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::ApplyCodeAction>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::ApplyCodeActionResponse> {
-        let sender_id = envelope.original_sender_id().unwrap_or_default();
-        let action =
-            Self::deserialize_code_action(envelope.payload.action.context("invalid action")?)?;
-        let apply_code_action = this.update(&mut cx, |this, cx| {
-            let buffer_id = BufferId::new(envelope.payload.buffer_id)?;
-            let buffer = this.buffer_store.read(cx).get_existing(buffer_id)?;
-            anyhow::Ok(this.apply_code_action(buffer, action, false, cx))
-        })??;
-
-        let project_transaction = apply_code_action.await?;
-        let project_transaction = this.update(&mut cx, |this, cx| {
-            this.buffer_store.update(cx, |buffer_store, cx| {
-                buffer_store.serialize_project_transaction_for_peer(
-                    project_transaction,
-                    sender_id,
-                    cx,
-                )
-            })
-        })?;
-        Ok(proto::ApplyCodeActionResponse {
-            transaction: Some(project_transaction),
-        })
-    }
-
-    async fn handle_register_buffer_with_language_servers(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::RegisterBufferWithLanguageServers>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::Ack> {
-        let buffer_id = BufferId::new(envelope.payload.buffer_id)?;
-        let peer_id = envelope.original_sender_id.unwrap_or(envelope.sender_id);
-        this.update(&mut cx, |this, cx| {
-            if let Some((upstream_client, upstream_project_id)) = this.upstream_client() {
-                return upstream_client.send(proto::RegisterBufferWithLanguageServers {
-                    project_id: upstream_project_id,
-                    buffer_id: buffer_id.to_proto(),
-                    only_servers: envelope.payload.only_servers,
-                });
-            }
-
-            let Some(buffer) = this.buffer_store().read(cx).get(buffer_id) else {
-                anyhow::bail!("buffer is not open");
-            };
-
-            let handle = this.register_buffer_with_language_servers(
-                &buffer,
-                envelope
-                    .payload
-                    .only_servers
-                    .into_iter()
-                    .filter_map(|selector| {
-                        Some(match selector.selector? {
-                            proto::language_server_selector::Selector::ServerId(server_id) => {
-                                LanguageServerSelector::Id(LanguageServerId::from_proto(server_id))
-                            }
-                            proto::language_server_selector::Selector::Name(name) => {
-                                LanguageServerSelector::Name(LanguageServerName(
-                                    SharedString::from(name),
-                                ))
-                            }
-                        })
-                    })
-                    .collect(),
-                false,
-                cx,
-            );
-            this.buffer_store().update(cx, |buffer_store, _| {
-                buffer_store.register_shared_lsp_handle(peer_id, buffer_id, handle);
-            });
-
-            Ok(())
-        })??;
-        Ok(proto::Ack {})
-    }
-
-    async fn handle_rename_project_entry(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::RenameProjectEntry>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::ProjectEntryResponse> {
-        let entry_id = ProjectEntryId::from_proto(envelope.payload.entry_id);
-        let new_worktree_id = WorktreeId::from_proto(envelope.payload.new_worktree_id);
-        let new_path =
-            RelPath::from_proto(&envelope.payload.new_path).context("invalid relative path")?;
-
-        let (worktree_store, old_worktree, new_worktree, old_entry) = this
-            .update(&mut cx, |this, cx| {
-                let (worktree, entry) = this
-                    .worktree_store
-                    .read(cx)
-                    .worktree_and_entry_for_id(entry_id, cx)?;
-                let new_worktree = this
-                    .worktree_store
-                    .read(cx)
-                    .worktree_for_id(new_worktree_id, cx)?;
-                Some((
-                    this.worktree_store.clone(),
-                    worktree,
-                    new_worktree,
-                    entry.clone(),
-                ))
-            })?
-            .context("worktree not found")?;
-        let (old_abs_path, old_worktree_id) = old_worktree.read_with(&cx, |worktree, _| {
-            (worktree.absolutize(&old_entry.path), worktree.id())
-        })?;
-        let new_abs_path =
-            new_worktree.read_with(&cx, |worktree, _| worktree.absolutize(&new_path))?;
-
-        let _transaction = Self::will_rename_entry(
-            this.downgrade(),
-            old_worktree_id,
-            &old_abs_path,
-            &new_abs_path,
-            old_entry.is_dir(),
-            cx.clone(),
-        )
-        .await;
-        let response = WorktreeStore::handle_rename_project_entry(
-            worktree_store,
-            envelope.payload,
-            cx.clone(),
-        )
-        .await;
-        this.read_with(&cx, |this, _| {
-            this.did_rename_entry(
-                old_worktree_id,
-                &old_abs_path,
-                &new_abs_path,
-                old_entry.is_dir(),
-            );
-        })
-        .ok();
-        response
-    }
-
-    async fn handle_update_diagnostic_summary(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::UpdateDiagnosticSummary>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        this.update(&mut cx, |lsp_store, cx| {
-            let worktree_id = WorktreeId::from_proto(envelope.payload.worktree_id);
-            let mut updated_diagnostics_paths = HashMap::default();
-            let mut diagnostics_summary = None::<proto::UpdateDiagnosticSummary>;
-            for message_summary in envelope
-                .payload
-                .summary
-                .into_iter()
-                .chain(envelope.payload.more_summaries)
-            {
-                let project_path = ProjectPath {
-                    worktree_id,
-                    path: RelPath::from_proto(&message_summary.path).context("invalid path")?,
-                };
-                let path = project_path.path.clone();
-                let server_id = LanguageServerId(message_summary.language_server_id as usize);
-                let summary = DiagnosticSummary {
-                    error_count: message_summary.error_count as usize,
-                    warning_count: message_summary.warning_count as usize,
-                };
-
-                if summary.is_empty() {
-                    if let Some(worktree_summaries) =
-                        lsp_store.diagnostic_summaries.get_mut(&worktree_id)
-                        && let Some(summaries) = worktree_summaries.get_mut(&path)
-                    {
-                        summaries.remove(&server_id);
-                        if summaries.is_empty() {
-                            worktree_summaries.remove(&path);
-                        }
-                    }
-                } else {
-                    lsp_store
-                        .diagnostic_summaries
-                        .entry(worktree_id)
-                        .or_default()
-                        .entry(path)
-                        .or_default()
-                        .insert(server_id, summary);
-                }
-
-                if let Some((_, project_id)) = &lsp_store.downstream_client {
-                    match &mut diagnostics_summary {
-                        Some(diagnostics_summary) => {
-                            diagnostics_summary
-                                .more_summaries
-                                .push(proto::DiagnosticSummary {
-                                    path: project_path.path.as_ref().to_proto(),
-                                    language_server_id: server_id.0 as u64,
-                                    error_count: summary.error_count as u32,
-                                    warning_count: summary.warning_count as u32,
-                                })
-                        }
-                        None => {
-                            diagnostics_summary = Some(proto::UpdateDiagnosticSummary {
-                                project_id: *project_id,
-                                worktree_id: worktree_id.to_proto(),
-                                summary: Some(proto::DiagnosticSummary {
-                                    path: project_path.path.as_ref().to_proto(),
-                                    language_server_id: server_id.0 as u64,
-                                    error_count: summary.error_count as u32,
-                                    warning_count: summary.warning_count as u32,
-                                }),
-                                more_summaries: Vec::new(),
-                            })
-                        }
-                    }
-                }
-                updated_diagnostics_paths
-                    .entry(server_id)
-                    .or_insert_with(Vec::new)
-                    .push(project_path);
-            }
-
-            if let Some((diagnostics_summary, (downstream_client, _))) =
-                diagnostics_summary.zip(lsp_store.downstream_client.as_ref())
-            {
-                downstream_client.send(diagnostics_summary).log_err();
-            }
-            for (server_id, paths) in updated_diagnostics_paths {
-                cx.emit(LspStoreEvent::DiagnosticsUpdated { server_id, paths });
-            }
-            Ok(())
-        })?
-    }
-
-    async fn handle_start_language_server(
-        lsp_store: Entity<Self>,
-        envelope: TypedEnvelope<proto::StartLanguageServer>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        let server = envelope.payload.server.context("invalid server")?;
-        let server_capabilities =
-            serde_json::from_str::<lsp::ServerCapabilities>(&envelope.payload.capabilities)
-                .with_context(|| {
-                    format!(
-                        "incorrect server capabilities {}",
-                        envelope.payload.capabilities
-                    )
-                })?;
-        lsp_store.update(&mut cx, |lsp_store, cx| {
-            let server_id = LanguageServerId(server.id as usize);
-            let server_name = LanguageServerName::from_proto(server.name.clone());
-            lsp_store
-                .lsp_server_capabilities
-                .insert(server_id, server_capabilities);
-            lsp_store.language_server_statuses.insert(
-                server_id,
-                LanguageServerStatus {
-                    name: server_name.clone(),
-                    pending_work: Default::default(),
-                    has_pending_diagnostic_updates: false,
-                    progress_tokens: Default::default(),
-                    worktree: server.worktree_id.map(WorktreeId::from_proto),
-                    binary: None,
-                    configuration: None,
-                    workspace_folders: BTreeSet::new(),
-                },
-            );
-            cx.emit(LspStoreEvent::LanguageServerAdded(
-                server_id,
-                server_name,
-                server.worktree_id.map(WorktreeId::from_proto),
-            ));
-            cx.notify();
-        })?;
-        Ok(())
-    }
-
-    async fn handle_update_language_server(
-        lsp_store: Entity<Self>,
-        envelope: TypedEnvelope<proto::UpdateLanguageServer>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        lsp_store.update(&mut cx, |lsp_store, cx| {
-            let language_server_id = LanguageServerId(envelope.payload.language_server_id as usize);
-
-            match envelope.payload.variant.context("invalid variant")? {
-                proto::update_language_server::Variant::WorkStart(payload) => {
-                    lsp_store.on_lsp_work_start(
-                        language_server_id,
-                        ProgressToken::from_proto(payload.token.context("missing progress token")?)
-                            .context("invalid progress token value")?,
-                        LanguageServerProgress {
-                            title: payload.title,
-                            is_disk_based_diagnostics_progress: false,
-                            is_cancellable: payload.is_cancellable.unwrap_or(false),
-                            message: payload.message,
-                            percentage: payload.percentage.map(|p| p as usize),
-                            last_update_at: cx.background_executor().now(),
-                        },
-                        cx,
-                    );
-                }
-                proto::update_language_server::Variant::WorkProgress(payload) => {
-                    lsp_store.on_lsp_work_progress(
-                        language_server_id,
-                        ProgressToken::from_proto(payload.token.context("missing progress token")?)
-                            .context("invalid progress token value")?,
-                        LanguageServerProgress {
-                            title: None,
-                            is_disk_based_diagnostics_progress: false,
-                            is_cancellable: payload.is_cancellable.unwrap_or(false),
-                            message: payload.message,
-                            percentage: payload.percentage.map(|p| p as usize),
-                            last_update_at: cx.background_executor().now(),
-                        },
-                        cx,
-                    );
-                }
-
-                proto::update_language_server::Variant::WorkEnd(payload) => {
-                    lsp_store.on_lsp_work_end(
-                        language_server_id,
-                        ProgressToken::from_proto(payload.token.context("missing progress token")?)
-                            .context("invalid progress token value")?,
-                        cx,
-                    );
-                }
-
-                proto::update_language_server::Variant::DiskBasedDiagnosticsUpdating(_) => {
-                    lsp_store.disk_based_diagnostics_started(language_server_id, cx);
-                }
-
-                proto::update_language_server::Variant::DiskBasedDiagnosticsUpdated(_) => {
-                    lsp_store.disk_based_diagnostics_finished(language_server_id, cx)
-                }
-
-                non_lsp @ proto::update_language_server::Variant::StatusUpdate(_)
-                | non_lsp @ proto::update_language_server::Variant::RegisteredForBuffer(_)
-                | non_lsp @ proto::update_language_server::Variant::MetadataUpdated(_) => {
-                    cx.emit(LspStoreEvent::LanguageServerUpdate {
-                        language_server_id,
-                        name: envelope
-                            .payload
-                            .server_name
-                            .map(SharedString::new)
-                            .map(LanguageServerName),
-                        message: non_lsp,
-                    });
-                }
-            }
-
-            Ok(())
-        })?
-    }
-
-    async fn handle_language_server_log(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::LanguageServerLog>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        let language_server_id = LanguageServerId(envelope.payload.language_server_id as usize);
-        let log_type = envelope
-            .payload
-            .log_type
-            .map(LanguageServerLogType::from_proto)
-            .context("invalid language server log type")?;
-
-        let message = envelope.payload.message;
-
-        this.update(&mut cx, |_, cx| {
-            cx.emit(LspStoreEvent::LanguageServerLog(
-                language_server_id,
-                log_type,
-                message,
-            ));
-        })
-    }
-
-    async fn handle_lsp_ext_cancel_flycheck(
-        lsp_store: Entity<Self>,
-        envelope: TypedEnvelope<proto::LspExtCancelFlycheck>,
-        cx: AsyncApp,
-    ) -> Result<proto::Ack> {
-        let server_id = LanguageServerId(envelope.payload.language_server_id as usize);
-        let task = lsp_store.read_with(&cx, |lsp_store, _| {
-            if let Some(server) = lsp_store.language_server_for_id(server_id) {
-                Some(server.notify::<lsp_store::lsp_ext_command::LspExtCancelFlycheck>(()))
-            } else {
-                None
-            }
-        })?;
-        if let Some(task) = task {
-            task.context("handling lsp ext cancel flycheck")?;
-        }
-
-        Ok(proto::Ack {})
-    }
-
-    async fn handle_lsp_ext_run_flycheck(
-        lsp_store: Entity<Self>,
-        envelope: TypedEnvelope<proto::LspExtRunFlycheck>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::Ack> {
-        let server_id = LanguageServerId(envelope.payload.language_server_id as usize);
-        lsp_store.update(&mut cx, |lsp_store, cx| {
-            if let Some(server) = lsp_store.language_server_for_id(server_id) {
-                let text_document = if envelope.payload.current_file_only {
-                    let buffer_id = envelope
-                        .payload
-                        .buffer_id
-                        .map(|id| BufferId::new(id))
-                        .transpose()?;
-                    buffer_id
-                        .and_then(|buffer_id| {
-                            lsp_store
-                                .buffer_store()
-                                .read(cx)
-                                .get(buffer_id)
-                                .and_then(|buffer| {
-                                    Some(buffer.read(cx).file()?.as_local()?.abs_path(cx))
-                                })
-                                .map(|path| make_text_document_identifier(&path))
-                        })
-                        .transpose()?
-                } else {
-                    None
-                };
-                server.notify::<lsp_store::lsp_ext_command::LspExtRunFlycheck>(
-                    lsp_store::lsp_ext_command::RunFlycheckParams { text_document },
-                )?;
-            }
-            anyhow::Ok(())
-        })??;
-
-        Ok(proto::Ack {})
-    }
-
-    async fn handle_lsp_ext_clear_flycheck(
-        lsp_store: Entity<Self>,
-        envelope: TypedEnvelope<proto::LspExtClearFlycheck>,
-        cx: AsyncApp,
-    ) -> Result<proto::Ack> {
-        let server_id = LanguageServerId(envelope.payload.language_server_id as usize);
-        lsp_store
-            .read_with(&cx, |lsp_store, _| {
-                if let Some(server) = lsp_store.language_server_for_id(server_id) {
-                    Some(server.notify::<lsp_store::lsp_ext_command::LspExtClearFlycheck>(()))
-                } else {
-                    None
-                }
-            })
-            .context("handling lsp ext clear flycheck")?;
-
-        Ok(proto::Ack {})
-    }
-
-    pub fn disk_based_diagnostics_started(
-        &mut self,
-        language_server_id: LanguageServerId,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(language_server_status) =
-            self.language_server_statuses.get_mut(&language_server_id)
-        {
-            language_server_status.has_pending_diagnostic_updates = true;
-        }
-
-        cx.emit(LspStoreEvent::DiskBasedDiagnosticsStarted { language_server_id });
-        cx.emit(LspStoreEvent::LanguageServerUpdate {
-            language_server_id,
-            name: self
-                .language_server_adapter_for_id(language_server_id)
-                .map(|adapter| adapter.name()),
-            message: proto::update_language_server::Variant::DiskBasedDiagnosticsUpdating(
-                Default::default(),
-            ),
-        })
-    }
-
-    pub fn disk_based_diagnostics_finished(
-        &mut self,
-        language_server_id: LanguageServerId,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(language_server_status) =
-            self.language_server_statuses.get_mut(&language_server_id)
-        {
-            language_server_status.has_pending_diagnostic_updates = false;
-        }
-
-        cx.emit(LspStoreEvent::DiskBasedDiagnosticsFinished { language_server_id });
-        cx.emit(LspStoreEvent::LanguageServerUpdate {
-            language_server_id,
-            name: self
-                .language_server_adapter_for_id(language_server_id)
-                .map(|adapter| adapter.name()),
-            message: proto::update_language_server::Variant::DiskBasedDiagnosticsUpdated(
-                Default::default(),
-            ),
-        })
-    }
-
-    // After saving a buffer using a language server that doesn't provide a disk-based progress token,
-    // kick off a timer that will reset every time the buffer is saved. If the timer eventually fires,
-    // simulate disk-based diagnostics being finished so that other pieces of UI (e.g., project
-    // diagnostics view, diagnostic status bar) can update. We don't emit an event right away because
-    // the language server might take some time to publish diagnostics.
-    fn simulate_disk_based_diagnostics_events_if_needed(
-        &mut self,
-        language_server_id: LanguageServerId,
-        cx: &mut Context<Self>,
-    ) {
-        const DISK_BASED_DIAGNOSTICS_DEBOUNCE: Duration = Duration::from_secs(1);
-
-        let Some(LanguageServerState::Running {
-            simulate_disk_based_diagnostics_completion,
-            adapter,
-            ..
-        }) = self
-            .as_local_mut()
-            .and_then(|local_store| local_store.language_servers.get_mut(&language_server_id))
-        else {
-            return;
-        };
-
-        if adapter.disk_based_diagnostics_progress_token.is_some() {
-            return;
-        }
-
-        let prev_task =
-            simulate_disk_based_diagnostics_completion.replace(cx.spawn(async move |this, cx| {
-                cx.background_executor()
-                    .timer(DISK_BASED_DIAGNOSTICS_DEBOUNCE)
-                    .await;
-
-                this.update(cx, |this, cx| {
-                    this.disk_based_diagnostics_finished(language_server_id, cx);
-
-                    if let Some(LanguageServerState::Running {
-                        simulate_disk_based_diagnostics_completion,
-                        ..
-                    }) = this.as_local_mut().and_then(|local_store| {
-                        local_store.language_servers.get_mut(&language_server_id)
-                    }) {
-                        *simulate_disk_based_diagnostics_completion = None;
-                    }
-                })
-                .ok();
-            }));
-
-        if prev_task.is_none() {
-            self.disk_based_diagnostics_started(language_server_id, cx);
-        }
-    }
-
-    pub fn language_server_statuses(
-        &self,
-    ) -> impl DoubleEndedIterator<Item = (LanguageServerId, &LanguageServerStatus)> {
-        self.language_server_statuses
-            .iter()
-            .map(|(key, value)| (*key, value))
-    }
-
-    pub(super) fn did_rename_entry(
-        &self,
-        worktree_id: WorktreeId,
-        old_path: &Path,
-        new_path: &Path,
-        is_dir: bool,
-    ) {
-        maybe!({
-            let local_store = self.as_local()?;
-
-            let old_uri = lsp::Uri::from_file_path(old_path)
-                .ok()
-                .map(|uri| uri.to_string())?;
-            let new_uri = lsp::Uri::from_file_path(new_path)
-                .ok()
-                .map(|uri| uri.to_string())?;
-
-            for language_server in local_store.language_servers_for_worktree(worktree_id) {
-                let Some(filter) = local_store
-                    .language_server_paths_watched_for_rename
-                    .get(&language_server.server_id())
-                else {
-                    continue;
-                };
-
-                if filter.should_send_did_rename(&old_uri, is_dir) {
-                    language_server
-                        .notify::<DidRenameFiles>(RenameFilesParams {
-                            files: vec![FileRename {
-                                old_uri: old_uri.clone(),
-                                new_uri: new_uri.clone(),
-                            }],
-                        })
-                        .ok();
-                }
-            }
-            Some(())
-        });
-    }
-
-    pub(super) fn will_rename_entry(
-        this: WeakEntity<Self>,
-        worktree_id: WorktreeId,
-        old_path: &Path,
-        new_path: &Path,
-        is_dir: bool,
-        cx: AsyncApp,
-    ) -> Task<ProjectTransaction> {
-        let old_uri = lsp::Uri::from_file_path(old_path)
-            .ok()
-            .map(|uri| uri.to_string());
-        let new_uri = lsp::Uri::from_file_path(new_path)
-            .ok()
-            .map(|uri| uri.to_string());
-        cx.spawn(async move |cx| {
-            let mut tasks = vec![];
-            this.update(cx, |this, cx| {
-                let local_store = this.as_local()?;
-                let old_uri = old_uri?;
-                let new_uri = new_uri?;
-                for language_server in local_store.language_servers_for_worktree(worktree_id) {
-                    let Some(filter) = local_store
-                        .language_server_paths_watched_for_rename
-                        .get(&language_server.server_id())
-                    else {
-                        continue;
-                    };
-
-                    if filter.should_send_will_rename(&old_uri, is_dir) {
-                        let apply_edit = cx.spawn({
-                            let old_uri = old_uri.clone();
-                            let new_uri = new_uri.clone();
-                            let language_server = language_server.clone();
-                            async move |this, cx| {
-                                let edit = language_server
-                                    .request::<WillRenameFiles>(RenameFilesParams {
-                                        files: vec![FileRename { old_uri, new_uri }],
-                                    })
-                                    .await
-                                    .into_response()
-                                    .context("will rename files")
-                                    .log_err()
-                                    .flatten()?;
-
-                                let transaction = LocalLspStore::deserialize_workspace_edit(
-                                    this.upgrade()?,
-                                    edit,
-                                    false,
-                                    language_server.clone(),
-                                    cx,
-                                )
-                                .await
-                                .ok()?;
-                                Some(transaction)
-                            }
-                        });
-                        tasks.push(apply_edit);
-                    }
-                }
-                Some(())
-            })
-            .ok()
-            .flatten();
-            let mut merged_transaction = ProjectTransaction::default();
-            for task in tasks {
-                // Await on tasks sequentially so that the order of application of edits is deterministic
-                // (at least with regards to the order of registration of language servers)
-                if let Some(transaction) = task.await {
-                    for (buffer, buffer_transaction) in transaction.0 {
-                        merged_transaction.0.insert(buffer, buffer_transaction);
-                    }
-                }
-            }
-            merged_transaction
-        })
-    }
-
-    fn lsp_notify_abs_paths_changed(
-        &mut self,
-        server_id: LanguageServerId,
-        changes: Vec<PathEvent>,
-    ) {
-        maybe!({
-            let server = self.language_server_for_id(server_id)?;
-            let changes = changes
-                .into_iter()
-                .filter_map(|event| {
-                    let typ = match event.kind? {
-                        PathEventKind::Created => lsp::FileChangeType::CREATED,
-                        PathEventKind::Removed => lsp::FileChangeType::DELETED,
-                        PathEventKind::Changed => lsp::FileChangeType::CHANGED,
-                    };
-                    Some(lsp::FileEvent {
-                        uri: file_path_to_lsp_url(&event.path).log_err()?,
-                        typ,
-                    })
-                })
-                .collect::<Vec<_>>();
-            if !changes.is_empty() {
-                server
-                    .notify::<lsp::notification::DidChangeWatchedFiles>(
-                        lsp::DidChangeWatchedFilesParams { changes },
-                    )
-                    .ok();
-            }
-            Some(())
-        });
-    }
-
-    pub fn language_server_for_id(&self, id: LanguageServerId) -> Option<Arc<LanguageServer>> {
-        self.as_local()?.language_server_for_id(id)
-    }
-
-    fn on_lsp_progress(
-        &mut self,
-        progress_params: lsp::ProgressParams,
-        language_server_id: LanguageServerId,
-        disk_based_diagnostics_progress_token: Option<String>,
-        cx: &mut Context<Self>,
-    ) {
-        match progress_params.value {
-            lsp::ProgressParamsValue::WorkDone(progress) => {
-                self.handle_work_done_progress(
-                    progress,
-                    language_server_id,
-                    disk_based_diagnostics_progress_token,
-                    ProgressToken::from_lsp(progress_params.token),
-                    cx,
-                );
-            }
-            lsp::ProgressParamsValue::WorkspaceDiagnostic(report) => {
-                let registration_id = match progress_params.token {
-                    lsp::NumberOrString::Number(_) => None,
-                    lsp::NumberOrString::String(token) => token
-                        .split_once(WORKSPACE_DIAGNOSTICS_TOKEN_START)
-                        .map(|(_, id)| id.to_owned()),
-                };
-                if let Some(LanguageServerState::Running {
-                    workspace_diagnostics_refresh_tasks,
-                    ..
-                }) = self
-                    .as_local_mut()
-                    .and_then(|local| local.language_servers.get_mut(&language_server_id))
-                    && let Some(workspace_diagnostics) =
-                        workspace_diagnostics_refresh_tasks.get_mut(&registration_id)
-                {
-                    workspace_diagnostics.progress_tx.try_send(()).ok();
-                    self.apply_workspace_diagnostic_report(
-                        language_server_id,
-                        report,
-                        registration_id.map(SharedString::from),
-                        cx,
-                    )
-                }
-            }
-        }
-    }
-
-    fn handle_work_done_progress(
-        &mut self,
-        progress: lsp::WorkDoneProgress,
-        language_server_id: LanguageServerId,
-        disk_based_diagnostics_progress_token: Option<String>,
-        token: ProgressToken,
-        cx: &mut Context<Self>,
-    ) {
-        let language_server_status =
-            if let Some(status) = self.language_server_statuses.get_mut(&language_server_id) {
-                status
-            } else {
-                return;
-            };
-
-        if !language_server_status.progress_tokens.contains(&token) {
-            return;
-        }
-
-        let is_disk_based_diagnostics_progress =
-            if let (Some(disk_based_token), ProgressToken::String(token)) =
-                (&disk_based_diagnostics_progress_token, &token)
-            {
-                token.starts_with(disk_based_token)
-            } else {
-                false
-            };
-
-        match progress {
-            lsp::WorkDoneProgress::Begin(report) => {
-                if is_disk_based_diagnostics_progress {
-                    self.disk_based_diagnostics_started(language_server_id, cx);
-                }
-                self.on_lsp_work_start(
-                    language_server_id,
-                    token.clone(),
-                    LanguageServerProgress {
-                        title: Some(report.title),
-                        is_disk_based_diagnostics_progress,
-                        is_cancellable: report.cancellable.unwrap_or(false),
-                        message: report.message.clone(),
-                        percentage: report.percentage.map(|p| p as usize),
-                        last_update_at: cx.background_executor().now(),
-                    },
-                    cx,
-                );
-            }
-            lsp::WorkDoneProgress::Report(report) => self.on_lsp_work_progress(
-                language_server_id,
-                token,
-                LanguageServerProgress {
-                    title: None,
-                    is_disk_based_diagnostics_progress,
-                    is_cancellable: report.cancellable.unwrap_or(false),
-                    message: report.message,
-                    percentage: report.percentage.map(|p| p as usize),
-                    last_update_at: cx.background_executor().now(),
-                },
-                cx,
-            ),
-            lsp::WorkDoneProgress::End(_) => {
-                language_server_status.progress_tokens.remove(&token);
-                self.on_lsp_work_end(language_server_id, token.clone(), cx);
-                if is_disk_based_diagnostics_progress {
-                    self.disk_based_diagnostics_finished(language_server_id, cx);
-                }
-            }
-        }
-    }
-
-    fn on_lsp_work_start(
-        &mut self,
-        language_server_id: LanguageServerId,
-        token: ProgressToken,
-        progress: LanguageServerProgress,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(status) = self.language_server_statuses.get_mut(&language_server_id) {
-            status.pending_work.insert(token.clone(), progress.clone());
-            cx.notify();
-        }
-        cx.emit(LspStoreEvent::LanguageServerUpdate {
-            language_server_id,
-            name: self
-                .language_server_adapter_for_id(language_server_id)
-                .map(|adapter| adapter.name()),
-            message: proto::update_language_server::Variant::WorkStart(proto::LspWorkStart {
-                token: Some(token.to_proto()),
-                title: progress.title,
-                message: progress.message,
-                percentage: progress.percentage.map(|p| p as u32),
-                is_cancellable: Some(progress.is_cancellable),
-            }),
-        })
-    }
-
-    fn on_lsp_work_progress(
-        &mut self,
-        language_server_id: LanguageServerId,
-        token: ProgressToken,
-        progress: LanguageServerProgress,
-        cx: &mut Context<Self>,
-    ) {
-        let mut did_update = false;
-        if let Some(status) = self.language_server_statuses.get_mut(&language_server_id) {
-            match status.pending_work.entry(token.clone()) {
-                btree_map::Entry::Vacant(entry) => {
-                    entry.insert(progress.clone());
-                    did_update = true;
-                }
-                btree_map::Entry::Occupied(mut entry) => {
-                    let entry = entry.get_mut();
-                    if (progress.last_update_at - entry.last_update_at)
-                        >= SERVER_PROGRESS_THROTTLE_TIMEOUT
-                    {
-                        entry.last_update_at = progress.last_update_at;
-                        if progress.message.is_some() {
-                            entry.message = progress.message.clone();
-                        }
-                        if progress.percentage.is_some() {
-                            entry.percentage = progress.percentage;
-                        }
-                        if progress.is_cancellable != entry.is_cancellable {
-                            entry.is_cancellable = progress.is_cancellable;
-                        }
-                        did_update = true;
-                    }
-                }
-            }
-        }
-
-        if did_update {
-            cx.emit(LspStoreEvent::LanguageServerUpdate {
-                language_server_id,
-                name: self
-                    .language_server_adapter_for_id(language_server_id)
-                    .map(|adapter| adapter.name()),
-                message: proto::update_language_server::Variant::WorkProgress(
-                    proto::LspWorkProgress {
-                        token: Some(token.to_proto()),
-                        message: progress.message,
-                        percentage: progress.percentage.map(|p| p as u32),
-                        is_cancellable: Some(progress.is_cancellable),
-                    },
-                ),
-            })
-        }
-    }
-
-    fn on_lsp_work_end(
-        &mut self,
-        language_server_id: LanguageServerId,
-        token: ProgressToken,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(status) = self.language_server_statuses.get_mut(&language_server_id) {
-            if let Some(work) = status.pending_work.remove(&token)
-                && !work.is_disk_based_diagnostics_progress
-            {
-                cx.emit(LspStoreEvent::RefreshInlayHints {
-                    server_id: language_server_id,
-                    request_id: None,
-                });
-            }
-            cx.notify();
-        }
-
-        cx.emit(LspStoreEvent::LanguageServerUpdate {
-            language_server_id,
-            name: self
-                .language_server_adapter_for_id(language_server_id)
-                .map(|adapter| adapter.name()),
-            message: proto::update_language_server::Variant::WorkEnd(proto::LspWorkEnd {
-                token: Some(token.to_proto()),
-            }),
-        })
-    }
-
-    pub async fn handle_resolve_completion_documentation(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::ResolveCompletionDocumentation>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::ResolveCompletionDocumentationResponse> {
-        let lsp_completion = serde_json::from_slice(&envelope.payload.lsp_completion)?;
-
-        let completion = this
-            .read_with(&cx, |this, cx| {
-                let id = LanguageServerId(envelope.payload.language_server_id as usize);
-                let server = this
-                    .language_server_for_id(id)
-                    .with_context(|| format!("No language server {id}"))?;
-
-                anyhow::Ok(cx.background_spawn(async move {
-                    let can_resolve = server
-                        .capabilities()
-                        .completion_provider
-                        .as_ref()
-                        .and_then(|options| options.resolve_provider)
-                        .unwrap_or(false);
-                    if can_resolve {
-                        server
-                            .request::<lsp::request::ResolveCompletionItem>(lsp_completion)
-                            .await
-                            .into_response()
-                            .context("resolve completion item")
-                    } else {
-                        anyhow::Ok(lsp_completion)
-                    }
-                }))
-            })??
-            .await?;
-
-        let mut documentation_is_markdown = false;
-        let lsp_completion = serde_json::to_string(&completion)?.into_bytes();
-        let documentation = match completion.documentation {
-            Some(lsp::Documentation::String(text)) => text,
-
-            Some(lsp::Documentation::MarkupContent(lsp::MarkupContent { kind, value })) => {
-                documentation_is_markdown = kind == lsp::MarkupKind::Markdown;
-                value
-            }
-
-            _ => String::new(),
-        };
-
-        // If we have a new buffer_id, that means we're talking to a new client
-        // and want to check for new text_edits in the completion too.
-        let mut old_replace_start = None;
-        let mut old_replace_end = None;
-        let mut old_insert_start = None;
-        let mut old_insert_end = None;
-        let mut new_text = String::default();
-        if let Ok(buffer_id) = BufferId::new(envelope.payload.buffer_id) {
-            let buffer_snapshot = this.update(&mut cx, |this, cx| {
-                let buffer = this.buffer_store.read(cx).get_existing(buffer_id)?;
-                anyhow::Ok(buffer.read(cx).snapshot())
-            })??;
-
-            if let Some(text_edit) = completion.text_edit.as_ref() {
-                let edit = parse_completion_text_edit(text_edit, &buffer_snapshot);
-
-                if let Some(mut edit) = edit {
-                    LineEnding::normalize(&mut edit.new_text);
-
-                    new_text = edit.new_text;
-                    old_replace_start = Some(serialize_anchor(&edit.replace_range.start));
-                    old_replace_end = Some(serialize_anchor(&edit.replace_range.end));
-                    if let Some(insert_range) = edit.insert_range {
-                        old_insert_start = Some(serialize_anchor(&insert_range.start));
-                        old_insert_end = Some(serialize_anchor(&insert_range.end));
-                    }
-                }
-            }
-        }
-
-        Ok(proto::ResolveCompletionDocumentationResponse {
-            documentation,
-            documentation_is_markdown,
-            old_replace_start,
-            old_replace_end,
-            new_text,
-            lsp_completion,
-            old_insert_start,
-            old_insert_end,
-        })
-    }
-
-    async fn handle_on_type_formatting(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::OnTypeFormatting>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::OnTypeFormattingResponse> {
-        let on_type_formatting = this.update(&mut cx, |this, cx| {
-            let buffer_id = BufferId::new(envelope.payload.buffer_id)?;
-            let buffer = this.buffer_store.read(cx).get_existing(buffer_id)?;
-            let position = envelope
-                .payload
-                .position
-                .and_then(deserialize_anchor)
-                .context("invalid position")?;
-            anyhow::Ok(this.apply_on_type_formatting(
-                buffer,
-                position,
-                envelope.payload.trigger.clone(),
-                cx,
-            ))
-        })??;
-
-        let transaction = on_type_formatting
-            .await?
-            .as_ref()
-            .map(language::proto::serialize_transaction);
-        Ok(proto::OnTypeFormattingResponse { transaction })
-    }
-
-    async fn handle_refresh_inlay_hints(
-        lsp_store: Entity<Self>,
-        envelope: TypedEnvelope<proto::RefreshInlayHints>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::Ack> {
-        lsp_store.update(&mut cx, |_, cx| {
-            cx.emit(LspStoreEvent::RefreshInlayHints {
-                server_id: LanguageServerId::from_proto(envelope.payload.server_id),
-                request_id: envelope.payload.request_id.map(|id| id as usize),
-            });
-        })?;
-        Ok(proto::Ack {})
-    }
-
-    async fn handle_pull_workspace_diagnostics(
-        lsp_store: Entity<Self>,
-        envelope: TypedEnvelope<proto::PullWorkspaceDiagnostics>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::Ack> {
-        let server_id = LanguageServerId::from_proto(envelope.payload.server_id);
-        lsp_store.update(&mut cx, |lsp_store, _| {
-            lsp_store.pull_workspace_diagnostics(server_id);
-        })?;
-        Ok(proto::Ack {})
-    }
-
-    async fn handle_get_color_presentation(
-        lsp_store: Entity<Self>,
-        envelope: TypedEnvelope<proto::GetColorPresentation>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::GetColorPresentationResponse> {
-        let buffer_id = BufferId::new(envelope.payload.buffer_id)?;
-        let buffer = lsp_store.update(&mut cx, |lsp_store, cx| {
-            lsp_store.buffer_store.read(cx).get_existing(buffer_id)
-        })??;
-
-        let color = envelope
-            .payload
-            .color
-            .context("invalid color resolve request")?;
-        let start = color
-            .lsp_range_start
-            .context("invalid color resolve request")?;
-        let end = color
-            .lsp_range_end
-            .context("invalid color resolve request")?;
-
-        let color = DocumentColor {
-            lsp_range: lsp::Range {
-                start: point_to_lsp(PointUtf16::new(start.row, start.column)),
-                end: point_to_lsp(PointUtf16::new(end.row, end.column)),
-            },
-            color: lsp::Color {
-                red: color.red,
-                green: color.green,
-                blue: color.blue,
-                alpha: color.alpha,
-            },
-            resolved: false,
-            color_presentations: Vec::new(),
-        };
-        let resolved_color = lsp_store
-            .update(&mut cx, |lsp_store, cx| {
-                lsp_store.resolve_color_presentation(
-                    color,
-                    buffer.clone(),
-                    LanguageServerId(envelope.payload.server_id as usize),
-                    cx,
-                )
-            })?
-            .await
-            .context("resolving color presentation")?;
-
-        Ok(proto::GetColorPresentationResponse {
-            presentations: resolved_color
-                .color_presentations
-                .into_iter()
-                .map(|presentation| proto::ColorPresentation {
-                    label: presentation.label.to_string(),
-                    text_edit: presentation.text_edit.map(serialize_lsp_edit),
-                    additional_text_edits: presentation
-                        .additional_text_edits
-                        .into_iter()
-                        .map(serialize_lsp_edit)
-                        .collect(),
-                })
-                .collect(),
-        })
-    }
-
-    async fn handle_resolve_inlay_hint(
-        lsp_store: Entity<Self>,
-        envelope: TypedEnvelope<proto::ResolveInlayHint>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::ResolveInlayHintResponse> {
-        let proto_hint = envelope
-            .payload
-            .hint
-            .expect("incorrect protobuf resolve inlay hint message: missing the inlay hint");
-        let hint = InlayHints::proto_to_project_hint(proto_hint)
-            .context("resolved proto inlay hint conversion")?;
-        let buffer = lsp_store.update(&mut cx, |lsp_store, cx| {
-            let buffer_id = BufferId::new(envelope.payload.buffer_id)?;
-            lsp_store.buffer_store.read(cx).get_existing(buffer_id)
-        })??;
-        let response_hint = lsp_store
-            .update(&mut cx, |lsp_store, cx| {
-                lsp_store.resolve_inlay_hint(
-                    hint,
-                    buffer,
-                    LanguageServerId(envelope.payload.language_server_id as usize),
-                    cx,
-                )
-            })?
-            .await
-            .context("inlay hints fetch")?;
-        Ok(proto::ResolveInlayHintResponse {
-            hint: Some(InlayHints::project_to_proto_hint(response_hint)),
-        })
-    }
-
-    async fn handle_refresh_code_lens(
-        this: Entity<Self>,
-        _: TypedEnvelope<proto::RefreshCodeLens>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::Ack> {
-        this.update(&mut cx, |_, cx| {
-            cx.emit(LspStoreEvent::RefreshCodeLens);
-        })?;
-        Ok(proto::Ack {})
-    }
-
-    async fn handle_open_buffer_for_symbol(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::OpenBufferForSymbol>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::OpenBufferForSymbolResponse> {
-        let peer_id = envelope.original_sender_id().unwrap_or_default();
-        let symbol = envelope.payload.symbol.context("invalid symbol")?;
-        let symbol = Self::deserialize_symbol(symbol)?;
-        this.read_with(&cx, |this, _| {
-            if let SymbolLocation::OutsideProject {
-                abs_path,
-                signature,
-            } = &symbol.path
-            {
-                let new_signature = this.symbol_signature(&abs_path);
-                anyhow::ensure!(&new_signature == signature, "invalid symbol signature");
-            }
-            Ok(())
-        })??;
-        let buffer = this
-            .update(&mut cx, |this, cx| {
-                this.open_buffer_for_symbol(
-                    &Symbol {
-                        language_server_name: symbol.language_server_name,
-                        source_worktree_id: symbol.source_worktree_id,
-                        source_language_server_id: symbol.source_language_server_id,
-                        path: symbol.path,
-                        name: symbol.name,
-                        kind: symbol.kind,
-                        range: symbol.range,
-                        label: CodeLabel::default(),
-                    },
-                    cx,
-                )
-            })?
-            .await?;
-
-        this.update(&mut cx, |this, cx| {
-            let is_private = buffer
-                .read(cx)
-                .file()
-                .map(|f| f.is_private())
-                .unwrap_or_default();
-            if is_private {
-                Err(anyhow!(rpc::ErrorCode::UnsharedItem))
-            } else {
-                this.buffer_store
-                    .update(cx, |buffer_store, cx| {
-                        buffer_store.create_buffer_for_peer(&buffer, peer_id, cx)
-                    })
-                    .detach_and_log_err(cx);
-                let buffer_id = buffer.read(cx).remote_id().to_proto();
-                Ok(proto::OpenBufferForSymbolResponse { buffer_id })
-            }
-        })?
-    }
-
-    fn symbol_signature(&self, abs_path: &Path) -> [u8; 32] {
-        let mut hasher = Sha256::new();
-        hasher.update(abs_path.to_string_lossy().as_bytes());
-        hasher.update(self.nonce.to_be_bytes());
-        hasher.finalize().as_slice().try_into().unwrap()
-    }
-
-    pub async fn handle_get_project_symbols(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::GetProjectSymbols>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::GetProjectSymbolsResponse> {
-        let symbols = this
-            .update(&mut cx, |this, cx| {
-                this.symbols(&envelope.payload.query, cx)
-            })?
-            .await?;
-
-        Ok(proto::GetProjectSymbolsResponse {
-            symbols: symbols.iter().map(Self::serialize_symbol).collect(),
-        })
-    }
-
-    pub async fn handle_restart_language_servers(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::RestartLanguageServers>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::Ack> {
-        this.update(&mut cx, |lsp_store, cx| {
-            let buffers =
-                lsp_store.buffer_ids_to_buffers(envelope.payload.buffer_ids.into_iter(), cx);
-            lsp_store.restart_language_servers_for_buffers(
-                buffers,
-                envelope
-                    .payload
-                    .only_servers
-                    .into_iter()
-                    .filter_map(|selector| {
-                        Some(match selector.selector? {
-                            proto::language_server_selector::Selector::ServerId(server_id) => {
-                                LanguageServerSelector::Id(LanguageServerId::from_proto(server_id))
-                            }
-                            proto::language_server_selector::Selector::Name(name) => {
-                                LanguageServerSelector::Name(LanguageServerName(
-                                    SharedString::from(name),
-                                ))
-                            }
-                        })
-                    })
-                    .collect(),
-                cx,
-            );
-        })?;
-
-        Ok(proto::Ack {})
-    }
-
-    pub async fn handle_stop_language_servers(
-        lsp_store: Entity<Self>,
-        envelope: TypedEnvelope<proto::StopLanguageServers>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::Ack> {
-        lsp_store.update(&mut cx, |lsp_store, cx| {
-            if envelope.payload.all
-                && envelope.payload.also_servers.is_empty()
-                && envelope.payload.buffer_ids.is_empty()
-            {
-                lsp_store.stop_all_language_servers(cx);
-            } else {
-                let buffers =
-                    lsp_store.buffer_ids_to_buffers(envelope.payload.buffer_ids.into_iter(), cx);
-                lsp_store
-                    .stop_language_servers_for_buffers(
-                        buffers,
-                        envelope
-                            .payload
-                            .also_servers
-                            .into_iter()
-                            .filter_map(|selector| {
-                                Some(match selector.selector? {
-                                    proto::language_server_selector::Selector::ServerId(
-                                        server_id,
-                                    ) => LanguageServerSelector::Id(LanguageServerId::from_proto(
-                                        server_id,
-                                    )),
-                                    proto::language_server_selector::Selector::Name(name) => {
-                                        LanguageServerSelector::Name(LanguageServerName(
-                                            SharedString::from(name),
-                                        ))
-                                    }
-                                })
-                            })
-                            .collect(),
-                        cx,
-                    )
-                    .detach_and_log_err(cx);
-            }
-        })?;
-
-        Ok(proto::Ack {})
-    }
-
-    pub async fn handle_cancel_language_server_work(
-        lsp_store: Entity<Self>,
-        envelope: TypedEnvelope<proto::CancelLanguageServerWork>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::Ack> {
-        lsp_store.update(&mut cx, |lsp_store, cx| {
-            if let Some(work) = envelope.payload.work {
-                match work {
-                    proto::cancel_language_server_work::Work::Buffers(buffers) => {
-                        let buffers =
-                            lsp_store.buffer_ids_to_buffers(buffers.buffer_ids.into_iter(), cx);
-                        lsp_store.cancel_language_server_work_for_buffers(buffers, cx);
-                    }
-                    proto::cancel_language_server_work::Work::LanguageServerWork(work) => {
-                        let server_id = LanguageServerId::from_proto(work.language_server_id);
-                        let token = work
-                            .token
-                            .map(|token| {
-                                ProgressToken::from_proto(token)
-                                    .context("invalid work progress token")
-                            })
-                            .transpose()?;
-                        lsp_store.cancel_language_server_work(server_id, token, cx);
-                    }
-                }
-            }
-            anyhow::Ok(())
-        })??;
-
-        Ok(proto::Ack {})
-    }
-
-    fn buffer_ids_to_buffers(
-        &mut self,
-        buffer_ids: impl Iterator<Item = u64>,
-        cx: &mut Context<Self>,
-    ) -> Vec<Entity<Buffer>> {
-        buffer_ids
-            .into_iter()
-            .flat_map(|buffer_id| {
-                self.buffer_store
-                    .read(cx)
-                    .get(BufferId::new(buffer_id).log_err()?)
-            })
-            .collect::<Vec<_>>()
-    }
-
-    async fn handle_apply_additional_edits_for_completion(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::ApplyCompletionAdditionalEdits>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::ApplyCompletionAdditionalEditsResponse> {
-        let (buffer, completion) = this.update(&mut cx, |this, cx| {
-            let buffer_id = BufferId::new(envelope.payload.buffer_id)?;
-            let buffer = this.buffer_store.read(cx).get_existing(buffer_id)?;
-            let completion = Self::deserialize_completion(
-                envelope.payload.completion.context("invalid completion")?,
-            )?;
-            anyhow::Ok((buffer, completion))
-        })??;
-
-        let apply_additional_edits = this.update(&mut cx, |this, cx| {
-            this.apply_additional_edits_for_completion(
-                buffer,
-                Rc::new(RefCell::new(Box::new([Completion {
-                    replace_range: completion.replace_range,
-                    new_text: completion.new_text,
-                    source: completion.source,
-                    documentation: None,
-                    label: CodeLabel::default(),
-                    match_start: None,
-                    snippet_deduplication_key: None,
-                    insert_text_mode: None,
-                    icon_path: None,
-                    confirm: None,
-                }]))),
-                0,
-                false,
-                cx,
-            )
-        })?;
-
-        Ok(proto::ApplyCompletionAdditionalEditsResponse {
-            transaction: apply_additional_edits
-                .await?
-                .as_ref()
-                .map(language::proto::serialize_transaction),
-        })
-    }
-
-    pub fn last_formatting_failure(&self) -> Option<&str> {
-        self.last_formatting_failure.as_deref()
-    }
-
-    pub fn reset_last_formatting_failure(&mut self) {
-        self.last_formatting_failure = None;
-    }
-
-    pub fn environment_for_buffer(
-        &self,
-        buffer: &Entity<Buffer>,
-        cx: &mut Context<Self>,
-    ) -> Shared<Task<Option<HashMap<String, String>>>> {
-        if let Some(environment) = &self.as_local().map(|local| local.environment.clone()) {
-            environment.update(cx, |env, cx| {
-                env.buffer_environment(buffer, &self.worktree_store, cx)
-            })
-        } else {
-            Task::ready(None).shared()
-        }
-    }
-
-    pub fn format(
-        &mut self,
-        buffers: HashSet<Entity<Buffer>>,
-        target: LspFormatTarget,
-        push_to_history: bool,
-        trigger: FormatTrigger,
-        cx: &mut Context<Self>,
-    ) -> Task<anyhow::Result<ProjectTransaction>> {
-        let logger = zlog::scoped!("format");
-        if self.as_local().is_some() {
-            zlog::trace!(logger => "Formatting locally");
-            let logger = zlog::scoped!(logger => "local");
-            let buffers = buffers
-                .into_iter()
-                .map(|buffer_handle| {
-                    let buffer = buffer_handle.read(cx);
-                    let buffer_abs_path = File::from_dyn(buffer.file())
-                        .and_then(|file| file.as_local().map(|f| f.abs_path(cx)));
-
-                    (buffer_handle, buffer_abs_path, buffer.remote_id())
-                })
-                .collect::<Vec<_>>();
-
-            cx.spawn(async move |lsp_store, cx| {
-                let mut formattable_buffers = Vec::with_capacity(buffers.len());
-
-                for (handle, abs_path, id) in buffers {
-                    let env = lsp_store
-                        .update(cx, |lsp_store, cx| {
-                            lsp_store.environment_for_buffer(&handle, cx)
-                        })?
-                        .await;
-
-                    let ranges = match &target {
-                        LspFormatTarget::Buffers => None,
-                        LspFormatTarget::Ranges(ranges) => {
-                            Some(ranges.get(&id).context("No format ranges provided for buffer")?.clone())
-                        }
-                    };
-
-                    formattable_buffers.push(FormattableBuffer {
-                        handle,
-                        abs_path,
-                        env,
-                        ranges,
-                    });
-                }
-                zlog::trace!(logger => "Formatting {:?} buffers", formattable_buffers.len());
-
-                let format_timer = zlog::time!(logger => "Formatting buffers");
-                let result = LocalLspStore::format_locally(
-                    lsp_store.clone(),
-                    formattable_buffers,
-                    push_to_history,
-                    trigger,
-                    logger,
-                    cx,
-                )
-                .await;
-                format_timer.end();
-
-                zlog::trace!(logger => "Formatting completed with result {:?}", result.as_ref().map(|_| "<project-transaction>"));
-
-                lsp_store.update(cx, |lsp_store, _| {
-                    lsp_store.update_last_formatting_failure(&result);
-                })?;
-
-                result
-            })
-        } else if let Some((client, project_id)) = self.upstream_client() {
-            zlog::trace!(logger => "Formatting remotely");
-            let logger = zlog::scoped!(logger => "remote");
-            // Don't support formatting ranges via remote
-            match target {
-                LspFormatTarget::Buffers => {}
-                LspFormatTarget::Ranges(_) => {
-                    zlog::trace!(logger => "Ignoring unsupported remote range formatting request");
-                    return Task::ready(Ok(ProjectTransaction::default()));
-                }
-            }
-
-            let buffer_store = self.buffer_store();
-            cx.spawn(async move |lsp_store, cx| {
-                zlog::trace!(logger => "Sending remote format request");
-                let request_timer = zlog::time!(logger => "remote format request");
-                let result = client
-                    .request(proto::FormatBuffers {
-                        project_id,
-                        trigger: trigger as i32,
-                        buffer_ids: buffers
-                            .iter()
-                            .map(|buffer| buffer.read_with(cx, |buffer, _| buffer.remote_id().into()))
-                            .collect::<Result<_>>()?,
-                    })
-                    .await
-                    .and_then(|result| result.transaction.context("missing transaction"));
-                request_timer.end();
-
-                zlog::trace!(logger => "Remote format request resolved to {:?}", result.as_ref().map(|_| "<project_transaction>"));
-
-                lsp_store.update(cx, |lsp_store, _| {
-                    lsp_store.update_last_formatting_failure(&result);
-                })?;
-
-                let transaction_response = result?;
-                let _timer = zlog::time!(logger => "deserializing project transaction");
-                buffer_store
-                    .update(cx, |buffer_store, cx| {
-                        buffer_store.deserialize_project_transaction(
-                            transaction_response,
-                            push_to_history,
-                            cx,
-                        )
-                    })?
-                    .await
-            })
-        } else {
-            zlog::trace!(logger => "Not formatting");
-            Task::ready(Ok(ProjectTransaction::default()))
-        }
-    }
-
-    async fn handle_format_buffers(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::FormatBuffers>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::FormatBuffersResponse> {
-        let sender_id = envelope.original_sender_id().unwrap_or_default();
-        let format = this.update(&mut cx, |this, cx| {
-            let mut buffers = HashSet::default();
-            for buffer_id in &envelope.payload.buffer_ids {
-                let buffer_id = BufferId::new(*buffer_id)?;
-                buffers.insert(this.buffer_store.read(cx).get_existing(buffer_id)?);
-            }
-            let trigger = FormatTrigger::from_proto(envelope.payload.trigger);
-            anyhow::Ok(this.format(buffers, LspFormatTarget::Buffers, false, trigger, cx))
-        })??;
-
-        let project_transaction = format.await?;
-        let project_transaction = this.update(&mut cx, |this, cx| {
-            this.buffer_store.update(cx, |buffer_store, cx| {
-                buffer_store.serialize_project_transaction_for_peer(
-                    project_transaction,
-                    sender_id,
-                    cx,
-                )
-            })
-        })?;
-        Ok(proto::FormatBuffersResponse {
-            transaction: Some(project_transaction),
-        })
-    }
-
-    async fn handle_apply_code_action_kind(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::ApplyCodeActionKind>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::ApplyCodeActionKindResponse> {
-        let sender_id = envelope.original_sender_id().unwrap_or_default();
-        let format = this.update(&mut cx, |this, cx| {
-            let mut buffers = HashSet::default();
-            for buffer_id in &envelope.payload.buffer_ids {
-                let buffer_id = BufferId::new(*buffer_id)?;
-                buffers.insert(this.buffer_store.read(cx).get_existing(buffer_id)?);
-            }
-            let kind = match envelope.payload.kind.as_str() {
-                "" => CodeActionKind::EMPTY,
-                "quickfix" => CodeActionKind::QUICKFIX,
-                "refactor" => CodeActionKind::REFACTOR,
-                "refactor.extract" => CodeActionKind::REFACTOR_EXTRACT,
-                "refactor.inline" => CodeActionKind::REFACTOR_INLINE,
-                "refactor.rewrite" => CodeActionKind::REFACTOR_REWRITE,
-                "source" => CodeActionKind::SOURCE,
-                "source.organizeImports" => CodeActionKind::SOURCE_ORGANIZE_IMPORTS,
-                "source.fixAll" => CodeActionKind::SOURCE_FIX_ALL,
-                _ => anyhow::bail!(
-                    "Invalid code action kind {}",
-                    envelope.payload.kind.as_str()
-                ),
-            };
-            anyhow::Ok(this.apply_code_action_kind(buffers, kind, false, cx))
-        })??;
-
-        let project_transaction = format.await?;
-        let project_transaction = this.update(&mut cx, |this, cx| {
-            this.buffer_store.update(cx, |buffer_store, cx| {
-                buffer_store.serialize_project_transaction_for_peer(
-                    project_transaction,
-                    sender_id,
-                    cx,
-                )
-            })
-        })?;
-        Ok(proto::ApplyCodeActionKindResponse {
-            transaction: Some(project_transaction),
-        })
-    }
-
-    async fn shutdown_language_server(
-        server_state: Option<LanguageServerState>,
-        name: LanguageServerName,
-        cx: &mut AsyncApp,
-    ) {
-        let server = match server_state {
-            Some(LanguageServerState::Starting { startup, .. }) => {
-                let mut timer = cx
-                    .background_executor()
-                    .timer(SERVER_LAUNCHING_BEFORE_SHUTDOWN_TIMEOUT)
-                    .fuse();
-
-                select! {
-                    server = startup.fuse() => server,
-                    () = timer => {
-                        log::info!("timeout waiting for language server {name} to finish launching before stopping");
-                        None
-                    },
-                }
-            }
-
-            Some(LanguageServerState::Running { server, .. }) => Some(server),
-
-            None => None,
-        };
-
-        if let Some(server) = server
-            && let Some(shutdown) = server.shutdown()
-        {
-            shutdown.await;
-        }
-    }
-
-    // Returns a list of all of the worktrees which no longer have a language server and the root path
-    // for the stopped server
-    fn stop_local_language_server(
-        &mut self,
-        server_id: LanguageServerId,
-        cx: &mut Context<Self>,
-    ) -> Task<()> {
-        let local = match &mut self.mode {
-            LspStoreMode::Local(local) => local,
-            _ => {
-                return Task::ready(());
-            }
-        };
-
-        // Remove this server ID from all entries in the given worktree.
-        local
-            .language_server_ids
-            .retain(|_, state| state.id != server_id);
-        self.buffer_store.update(cx, |buffer_store, cx| {
-            for buffer in buffer_store.buffers() {
-                buffer.update(cx, |buffer, cx| {
-                    buffer.update_diagnostics(server_id, DiagnosticSet::new([], buffer), cx);
-                    buffer.set_completion_triggers(server_id, Default::default(), cx);
-                });
-            }
-        });
-
-        for (worktree_id, summaries) in self.diagnostic_summaries.iter_mut() {
-            summaries.retain(|path, summaries_by_server_id| {
-                if summaries_by_server_id.remove(&server_id).is_some() {
-                    if let Some((client, project_id)) = self.downstream_client.clone() {
-                        client
-                            .send(proto::UpdateDiagnosticSummary {
-                                project_id,
-                                worktree_id: worktree_id.to_proto(),
-                                summary: Some(proto::DiagnosticSummary {
-                                    path: path.as_ref().to_proto(),
-                                    language_server_id: server_id.0 as u64,
-                                    error_count: 0,
-                                    warning_count: 0,
-                                }),
-                                more_summaries: Vec::new(),
-                            })
-                            .log_err();
-                    }
-                    !summaries_by_server_id.is_empty()
-                } else {
-                    true
-                }
-            });
-        }
-
-        let local = self.as_local_mut().unwrap();
-        for diagnostics in local.diagnostics.values_mut() {
-            diagnostics.retain(|_, diagnostics_by_server_id| {
-                if let Ok(ix) = diagnostics_by_server_id.binary_search_by_key(&server_id, |e| e.0) {
-                    diagnostics_by_server_id.remove(ix);
-                    !diagnostics_by_server_id.is_empty()
-                } else {
-                    true
-                }
-            });
-        }
-        local.language_server_watched_paths.remove(&server_id);
-
-        let server_state = local.language_servers.remove(&server_id);
-        self.cleanup_lsp_data(server_id);
-        let name = self
-            .language_server_statuses
-            .remove(&server_id)
-            .map(|status| status.name)
-            .or_else(|| {
-                if let Some(LanguageServerState::Running { adapter, .. }) = server_state.as_ref() {
-                    Some(adapter.name())
-                } else {
-                    None
-                }
-            });
-
-        if let Some(name) = name {
-            log::info!("stopping language server {name}");
-            self.languages
-                .update_lsp_binary_status(name.clone(), BinaryStatus::Stopping);
-            cx.notify();
-
-            return cx.spawn(async move |lsp_store, cx| {
-                Self::shutdown_language_server(server_state, name.clone(), cx).await;
-                lsp_store
-                    .update(cx, |lsp_store, cx| {
-                        lsp_store
-                            .languages
-                            .update_lsp_binary_status(name, BinaryStatus::Stopped);
-                        cx.emit(LspStoreEvent::LanguageServerRemoved(server_id));
-                        cx.notify();
-                    })
-                    .ok();
-            });
-        }
-
-        if server_state.is_some() {
-            cx.emit(LspStoreEvent::LanguageServerRemoved(server_id));
-        }
-        Task::ready(())
-    }
-
-    pub fn stop_all_language_servers(&mut self, cx: &mut Context<Self>) {
-        if let Some((client, project_id)) = self.upstream_client() {
-            let request = client.request(proto::StopLanguageServers {
-                project_id,
-                buffer_ids: Vec::new(),
-                also_servers: Vec::new(),
-                all: true,
-            });
-            cx.background_spawn(request).detach_and_log_err(cx);
-        } else {
-            let Some(local) = self.as_local_mut() else {
-                return;
-            };
-            let language_servers_to_stop = local
-                .language_server_ids
-                .values()
-                .map(|state| state.id)
-                .collect();
-            local.lsp_tree.remove_nodes(&language_servers_to_stop);
-            let tasks = language_servers_to_stop
-                .into_iter()
-                .map(|server| self.stop_local_language_server(server, cx))
-                .collect::<Vec<_>>();
-            cx.background_spawn(async move {
-                futures::future::join_all(tasks).await;
-            })
-            .detach();
-        }
-    }
-
-    pub fn restart_language_servers_for_buffers(
-        &mut self,
-        buffers: Vec<Entity<Buffer>>,
-        only_restart_servers: HashSet<LanguageServerSelector>,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some((client, project_id)) = self.upstream_client() {
-            let request = client.request(proto::RestartLanguageServers {
-                project_id,
-                buffer_ids: buffers
-                    .into_iter()
-                    .map(|b| b.read(cx).remote_id().to_proto())
-                    .collect(),
-                only_servers: only_restart_servers
-                    .into_iter()
-                    .map(|selector| {
-                        let selector = match selector {
-                            LanguageServerSelector::Id(language_server_id) => {
-                                proto::language_server_selector::Selector::ServerId(
-                                    language_server_id.to_proto(),
-                                )
-                            }
-                            LanguageServerSelector::Name(language_server_name) => {
-                                proto::language_server_selector::Selector::Name(
-                                    language_server_name.to_string(),
-                                )
-                            }
-                        };
-                        proto::LanguageServerSelector {
-                            selector: Some(selector),
-                        }
-                    })
-                    .collect(),
-                all: false,
-            });
-            cx.background_spawn(request).detach_and_log_err(cx);
-        } else {
-            let stop_task = if only_restart_servers.is_empty() {
-                self.stop_local_language_servers_for_buffers(&buffers, HashSet::default(), cx)
-            } else {
-                self.stop_local_language_servers_for_buffers(&[], only_restart_servers.clone(), cx)
-            };
-            cx.spawn(async move |lsp_store, cx| {
-                stop_task.await;
-                lsp_store
-                    .update(cx, |lsp_store, cx| {
-                        for buffer in buffers {
-                            lsp_store.register_buffer_with_language_servers(
-                                &buffer,
-                                only_restart_servers.clone(),
-                                true,
-                                cx,
-                            );
-                        }
-                    })
-                    .ok()
-            })
-            .detach();
-        }
-    }
-
-    pub fn stop_language_servers_for_buffers(
-        &mut self,
-        buffers: Vec<Entity<Buffer>>,
-        also_stop_servers: HashSet<LanguageServerSelector>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        if let Some((client, project_id)) = self.upstream_client() {
-            let request = client.request(proto::StopLanguageServers {
-                project_id,
-                buffer_ids: buffers
-                    .into_iter()
-                    .map(|b| b.read(cx).remote_id().to_proto())
-                    .collect(),
-                also_servers: also_stop_servers
-                    .into_iter()
-                    .map(|selector| {
-                        let selector = match selector {
-                            LanguageServerSelector::Id(language_server_id) => {
-                                proto::language_server_selector::Selector::ServerId(
-                                    language_server_id.to_proto(),
-                                )
-                            }
-                            LanguageServerSelector::Name(language_server_name) => {
-                                proto::language_server_selector::Selector::Name(
-                                    language_server_name.to_string(),
-                                )
-                            }
-                        };
-                        proto::LanguageServerSelector {
-                            selector: Some(selector),
-                        }
-                    })
-                    .collect(),
-                all: false,
-            });
-            cx.background_spawn(async move {
-                let _ = request.await?;
-                Ok(())
-            })
-        } else {
-            let task =
-                self.stop_local_language_servers_for_buffers(&buffers, also_stop_servers, cx);
-            cx.background_spawn(async move {
-                task.await;
-                Ok(())
-            })
-        }
-    }
-
-    fn stop_local_language_servers_for_buffers(
-        &mut self,
-        buffers: &[Entity<Buffer>],
-        also_stop_servers: HashSet<LanguageServerSelector>,
-        cx: &mut Context<Self>,
-    ) -> Task<()> {
-        let Some(local) = self.as_local_mut() else {
-            return Task::ready(());
-        };
-        let mut language_server_names_to_stop = BTreeSet::default();
-        let mut language_servers_to_stop = also_stop_servers
-            .into_iter()
-            .flat_map(|selector| match selector {
-                LanguageServerSelector::Id(id) => Some(id),
-                LanguageServerSelector::Name(name) => {
-                    language_server_names_to_stop.insert(name);
-                    None
-                }
-            })
-            .collect::<BTreeSet<_>>();
-
-        let mut covered_worktrees = HashSet::default();
-        for buffer in buffers {
-            buffer.update(cx, |buffer, cx| {
-                language_servers_to_stop.extend(local.language_server_ids_for_buffer(buffer, cx));
-                if let Some(worktree_id) = buffer.file().map(|f| f.worktree_id(cx))
-                    && covered_worktrees.insert(worktree_id)
-                {
-                    language_server_names_to_stop.retain(|name| {
-                        let old_ids_count = language_servers_to_stop.len();
-                        let all_language_servers_with_this_name = local
-                            .language_server_ids
-                            .iter()
-                            .filter_map(|(seed, state)| seed.name.eq(name).then(|| state.id));
-                        language_servers_to_stop.extend(all_language_servers_with_this_name);
-                        old_ids_count == language_servers_to_stop.len()
-                    });
-                }
-            });
-        }
-        for name in language_server_names_to_stop {
-            language_servers_to_stop.extend(
-                local
-                    .language_server_ids
-                    .iter()
-                    .filter_map(|(seed, v)| seed.name.eq(&name).then(|| v.id)),
-            );
-        }
-
-        local.lsp_tree.remove_nodes(&language_servers_to_stop);
-        let tasks = language_servers_to_stop
-            .into_iter()
-            .map(|server| self.stop_local_language_server(server, cx))
-            .collect::<Vec<_>>();
-
-        cx.background_spawn(futures::future::join_all(tasks).map(|_| ()))
-    }
-
-    fn get_buffer<'a>(&self, abs_path: &Path, cx: &'a App) -> Option<&'a Buffer> {
-        let (worktree, relative_path) =
-            self.worktree_store.read(cx).find_worktree(&abs_path, cx)?;
-
-        let project_path = ProjectPath {
-            worktree_id: worktree.read(cx).id(),
-            path: relative_path,
-        };
-
-        Some(
-            self.buffer_store()
-                .read(cx)
-                .get_by_path(&project_path)?
-                .read(cx),
-        )
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn update_diagnostics(
-        &mut self,
-        server_id: LanguageServerId,
-        diagnostics: lsp::PublishDiagnosticsParams,
-        result_id: Option<SharedString>,
-        source_kind: DiagnosticSourceKind,
-        disk_based_sources: &[String],
-        cx: &mut Context<Self>,
-    ) -> Result<()> {
-        self.merge_lsp_diagnostics(
-            source_kind,
-            vec![DocumentDiagnosticsUpdate {
-                diagnostics,
-                result_id,
-                server_id,
-                disk_based_sources: Cow::Borrowed(disk_based_sources),
-                registration_id: None,
-            }],
-            |_, _, _| false,
-            cx,
-        )
-    }
-
-    pub fn merge_lsp_diagnostics(
-        &mut self,
-        source_kind: DiagnosticSourceKind,
-        lsp_diagnostics: Vec<DocumentDiagnosticsUpdate<lsp::PublishDiagnosticsParams>>,
-        merge: impl Fn(&lsp::Uri, &Diagnostic, &App) -> bool + Clone,
-        cx: &mut Context<Self>,
-    ) -> Result<()> {
-        anyhow::ensure!(self.mode.is_local(), "called update_diagnostics on remote");
-        let updates = lsp_diagnostics
-            .into_iter()
-            .filter_map(|update| {
-                let abs_path = update.diagnostics.uri.to_file_path().ok()?;
-                Some(DocumentDiagnosticsUpdate {
-                    diagnostics: self.lsp_to_document_diagnostics(
-                        abs_path,
-                        source_kind,
-                        update.server_id,
-                        update.diagnostics,
-                        &update.disk_based_sources,
-                        update.registration_id.clone(),
-                    ),
-                    result_id: update.result_id,
-                    server_id: update.server_id,
-                    disk_based_sources: update.disk_based_sources,
-                    registration_id: update.registration_id,
-                })
-            })
-            .collect();
-        self.merge_diagnostic_entries(updates, merge, cx)?;
-        Ok(())
-    }
-
-    fn lsp_to_document_diagnostics(
-        &mut self,
-        document_abs_path: PathBuf,
-        source_kind: DiagnosticSourceKind,
-        server_id: LanguageServerId,
-        mut lsp_diagnostics: lsp::PublishDiagnosticsParams,
-        disk_based_sources: &[String],
-        registration_id: Option<SharedString>,
-    ) -> DocumentDiagnostics {
-        let mut diagnostics = Vec::default();
-        let mut primary_diagnostic_group_ids = HashMap::default();
-        let mut sources_by_group_id = HashMap::default();
-        let mut supporting_diagnostics = HashMap::default();
-
-        let adapter = self.language_server_adapter_for_id(server_id);
-
-        // Ensure that primary diagnostics are always the most severe
-        lsp_diagnostics
-            .diagnostics
-            .sort_by_key(|item| item.severity);
-
-        for diagnostic in &lsp_diagnostics.diagnostics {
-            let source = diagnostic.source.as_ref();
-            let range = range_from_lsp(diagnostic.range);
-            let is_supporting = diagnostic
-                .related_information
-                .as_ref()
-                .is_some_and(|infos| {
-                    infos.iter().any(|info| {
-                        primary_diagnostic_group_ids.contains_key(&(
-                            source,
-                            diagnostic.code.clone(),
-                            range_from_lsp(info.location.range),
-                        ))
-                    })
-                });
-
-            let is_unnecessary = diagnostic
-                .tags
-                .as_ref()
-                .is_some_and(|tags| tags.contains(&DiagnosticTag::UNNECESSARY));
-
-            let underline = self
-                .language_server_adapter_for_id(server_id)
-                .is_none_or(|adapter| adapter.underline_diagnostic(diagnostic));
-
-            if is_supporting {
-                supporting_diagnostics.insert(
-                    (source, diagnostic.code.clone(), range),
-                    (diagnostic.severity, is_unnecessary),
-                );
-            } else {
-                let group_id = post_inc(&mut self.as_local_mut().unwrap().next_diagnostic_group_id);
-                let is_disk_based =
-                    source.is_some_and(|source| disk_based_sources.contains(source));
-
-                sources_by_group_id.insert(group_id, source);
-                primary_diagnostic_group_ids
-                    .insert((source, diagnostic.code.clone(), range.clone()), group_id);
-
-                diagnostics.push(DiagnosticEntry {
-                    range,
-                    diagnostic: Diagnostic {
-                        source: diagnostic.source.clone(),
-                        source_kind,
-                        code: diagnostic.code.clone(),
-                        code_description: diagnostic
-                            .code_description
-                            .as_ref()
-                            .and_then(|d| d.href.clone()),
-                        severity: diagnostic.severity.unwrap_or(DiagnosticSeverity::ERROR),
-                        markdown: adapter.as_ref().and_then(|adapter| {
-                            adapter.diagnostic_message_to_markdown(&diagnostic.message)
-                        }),
-                        message: diagnostic.message.trim().to_string(),
-                        group_id,
-                        is_primary: true,
-                        is_disk_based,
-                        is_unnecessary,
-                        underline,
-                        data: diagnostic.data.clone(),
-                        registration_id: registration_id.clone(),
-                    },
-                });
-                if let Some(infos) = &diagnostic.related_information {
-                    for info in infos {
-                        if info.location.uri == lsp_diagnostics.uri && !info.message.is_empty() {
-                            let range = range_from_lsp(info.location.range);
-                            diagnostics.push(DiagnosticEntry {
-                                range,
-                                diagnostic: Diagnostic {
-                                    source: diagnostic.source.clone(),
-                                    source_kind,
-                                    code: diagnostic.code.clone(),
-                                    code_description: diagnostic
-                                        .code_description
-                                        .as_ref()
-                                        .and_then(|d| d.href.clone()),
-                                    severity: DiagnosticSeverity::INFORMATION,
-                                    markdown: adapter.as_ref().and_then(|adapter| {
-                                        adapter.diagnostic_message_to_markdown(&info.message)
-                                    }),
-                                    message: info.message.trim().to_string(),
-                                    group_id,
-                                    is_primary: false,
-                                    is_disk_based,
-                                    is_unnecessary: false,
-                                    underline,
-                                    data: diagnostic.data.clone(),
-                                    registration_id: registration_id.clone(),
-                                },
-                            });
-                        }
-                    }
-                }
-            }
-        }
-
-        for entry in &mut diagnostics {
-            let diagnostic = &mut entry.diagnostic;
-            if !diagnostic.is_primary {
-                let source = *sources_by_group_id.get(&diagnostic.group_id).unwrap();
-                if let Some(&(severity, is_unnecessary)) = supporting_diagnostics.get(&(
-                    source,
-                    diagnostic.code.clone(),
-                    entry.range.clone(),
-                )) {
-                    if let Some(severity) = severity {
-                        diagnostic.severity = severity;
-                    }
-                    diagnostic.is_unnecessary = is_unnecessary;
-                }
-            }
-        }
-
-        DocumentDiagnostics {
-            diagnostics,
-            document_abs_path,
-            version: lsp_diagnostics.version,
-        }
-    }
-
-    fn insert_newly_running_language_server(
-        &mut self,
-        adapter: Arc<CachedLspAdapter>,
-        language_server: Arc<LanguageServer>,
-        server_id: LanguageServerId,
-        key: LanguageServerSeed,
-        workspace_folders: Arc<Mutex<BTreeSet<Uri>>>,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(local) = self.as_local_mut() else {
-            return;
-        };
-        // If the language server for this key doesn't match the server id, don't store the
-        // server. Which will cause it to be dropped, killing the process
-        if local
-            .language_server_ids
-            .get(&key)
-            .map(|state| state.id != server_id)
-            .unwrap_or(false)
-        {
-            return;
-        }
-
-        // Update language_servers collection with Running variant of LanguageServerState
-        // indicating that the server is up and running and ready
-        let workspace_folders = workspace_folders.lock().clone();
-        language_server.set_workspace_folders(workspace_folders);
-
-        let workspace_diagnostics_refresh_tasks = language_server
-            .capabilities()
-            .diagnostic_provider
-            .and_then(|provider| {
-                local
-                    .language_server_dynamic_registrations
-                    .entry(server_id)
-                    .or_default()
-                    .diagnostics
-                    .entry(None)
-                    .or_insert(provider.clone());
-                let workspace_refresher =
-                    lsp_workspace_diagnostics_refresh(None, provider, language_server.clone(), cx)?;
-
-                Some((None, workspace_refresher))
-            })
-            .into_iter()
-            .collect();
-        local.language_servers.insert(
-            server_id,
-            LanguageServerState::Running {
-                workspace_diagnostics_refresh_tasks,
-                adapter: adapter.clone(),
-                server: language_server.clone(),
-                simulate_disk_based_diagnostics_completion: None,
-            },
-        );
-        local
-            .languages
-            .update_lsp_binary_status(adapter.name(), BinaryStatus::None);
-        if let Some(file_ops_caps) = language_server
-            .capabilities()
-            .workspace
-            .as_ref()
-            .and_then(|ws| ws.file_operations.as_ref())
-        {
-            let did_rename_caps = file_ops_caps.did_rename.as_ref();
-            let will_rename_caps = file_ops_caps.will_rename.as_ref();
-            if did_rename_caps.or(will_rename_caps).is_some() {
-                let watcher = RenamePathsWatchedForServer::default()
-                    .with_did_rename_patterns(did_rename_caps)
-                    .with_will_rename_patterns(will_rename_caps);
-                local
-                    .language_server_paths_watched_for_rename
-                    .insert(server_id, watcher);
-            }
-        }
-
-        self.language_server_statuses.insert(
-            server_id,
-            LanguageServerStatus {
-                name: language_server.name(),
-                pending_work: Default::default(),
-                has_pending_diagnostic_updates: false,
-                progress_tokens: Default::default(),
-                worktree: Some(key.worktree_id),
-                binary: Some(language_server.binary().clone()),
-                configuration: Some(language_server.configuration().clone()),
-                workspace_folders: language_server.workspace_folders(),
-            },
-        );
-
-        cx.emit(LspStoreEvent::LanguageServerAdded(
-            server_id,
-            language_server.name(),
-            Some(key.worktree_id),
-        ));
-
-        let server_capabilities = language_server.capabilities();
-        if let Some((downstream_client, project_id)) = self.downstream_client.as_ref() {
-            downstream_client
-                .send(proto::StartLanguageServer {
-                    project_id: *project_id,
-                    server: Some(proto::LanguageServer {
-                        id: server_id.to_proto(),
-                        name: language_server.name().to_string(),
-                        worktree_id: Some(key.worktree_id.to_proto()),
-                    }),
-                    capabilities: serde_json::to_string(&server_capabilities)
-                        .expect("serializing server LSP capabilities"),
-                })
-                .log_err();
-        }
-        self.lsp_server_capabilities
-            .insert(server_id, server_capabilities);
-
-        // Tell the language server about every open buffer in the worktree that matches the language.
-        // Also check for buffers in worktrees that reused this server
-        let mut worktrees_using_server = vec![key.worktree_id];
-        if let Some(local) = self.as_local() {
-            // Find all worktrees that have this server in their language server tree
-            for (worktree_id, servers) in &local.lsp_tree.instances {
-                if *worktree_id != key.worktree_id {
-                    for server_map in servers.roots.values() {
-                        if server_map
-                            .values()
-                            .any(|(node, _)| node.id() == Some(server_id))
-                        {
-                            worktrees_using_server.push(*worktree_id);
-                        }
-                    }
-                }
-            }
-        }
-
-        let mut buffer_paths_registered = Vec::new();
-        self.buffer_store.clone().update(cx, |buffer_store, cx| {
-            let mut lsp_adapters = HashMap::default();
-            for buffer_handle in buffer_store.buffers() {
-                let buffer = buffer_handle.read(cx);
-                let file = match File::from_dyn(buffer.file()) {
-                    Some(file) => file,
-                    None => continue,
-                };
-                let language = match buffer.language() {
-                    Some(language) => language,
-                    None => continue,
-                };
-
-                if !worktrees_using_server.contains(&file.worktree.read(cx).id())
-                    || !lsp_adapters
-                        .entry(language.name())
-                        .or_insert_with(|| self.languages.lsp_adapters(&language.name()))
-                        .iter()
-                        .any(|a| a.name == key.name)
-                {
-                    continue;
-                }
-                // didOpen
-                let file = match file.as_local() {
-                    Some(file) => file,
-                    None => continue,
-                };
-
-                let local = self.as_local_mut().unwrap();
-
-                let buffer_id = buffer.remote_id();
-                if local.registered_buffers.contains_key(&buffer_id) {
-                    let versions = local
-                        .buffer_snapshots
-                        .entry(buffer_id)
-                        .or_default()
-                        .entry(server_id)
-                        .and_modify(|_| {
-                            assert!(
-                            false,
-                            "There should not be an existing snapshot for a newly inserted buffer"
-                        )
-                        })
-                        .or_insert_with(|| {
-                            vec![LspBufferSnapshot {
-                                version: 0,
-                                snapshot: buffer.text_snapshot(),
-                            }]
-                        });
-
-                    let snapshot = versions.last().unwrap();
-                    let version = snapshot.version;
-                    let initial_snapshot = &snapshot.snapshot;
-                    let uri = lsp::Uri::from_file_path(file.abs_path(cx)).unwrap();
-                    language_server.register_buffer(
-                        uri,
-                        adapter.language_id(&language.name()),
-                        version,
-                        initial_snapshot.text(),
-                    );
-                    buffer_paths_registered.push((buffer_id, file.abs_path(cx)));
-                    local
-                        .buffers_opened_in_servers
-                        .entry(buffer_id)
-                        .or_default()
-                        .insert(server_id);
-                }
-                buffer_handle.update(cx, |buffer, cx| {
-                    buffer.set_completion_triggers(
-                        server_id,
-                        language_server
-                            .capabilities()
-                            .completion_provider
-                            .as_ref()
-                            .and_then(|provider| {
-                                provider
-                                    .trigger_characters
-                                    .as_ref()
-                                    .map(|characters| characters.iter().cloned().collect())
-                            })
-                            .unwrap_or_default(),
-                        cx,
-                    )
-                });
-            }
-        });
-
-        for (buffer_id, abs_path) in buffer_paths_registered {
-            cx.emit(LspStoreEvent::LanguageServerUpdate {
-                language_server_id: server_id,
-                name: Some(adapter.name()),
-                message: proto::update_language_server::Variant::RegisteredForBuffer(
-                    proto::RegisteredForBuffer {
-                        buffer_abs_path: abs_path.to_string_lossy().into_owned(),
-                        buffer_id: buffer_id.to_proto(),
-                    },
-                ),
-            });
-        }
-
-        cx.notify();
-    }
-
-    pub fn language_servers_running_disk_based_diagnostics(
-        &self,
-    ) -> impl Iterator<Item = LanguageServerId> + '_ {
-        self.language_server_statuses
-            .iter()
-            .filter_map(|(id, status)| {
-                if status.has_pending_diagnostic_updates {
-                    Some(*id)
-                } else {
-                    None
-                }
-            })
-    }
-
-    pub(crate) fn cancel_language_server_work_for_buffers(
-        &mut self,
-        buffers: impl IntoIterator<Item = Entity<Buffer>>,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some((client, project_id)) = self.upstream_client() {
-            let request = client.request(proto::CancelLanguageServerWork {
-                project_id,
-                work: Some(proto::cancel_language_server_work::Work::Buffers(
-                    proto::cancel_language_server_work::Buffers {
-                        buffer_ids: buffers
-                            .into_iter()
-                            .map(|b| b.read(cx).remote_id().to_proto())
-                            .collect(),
-                    },
-                )),
-            });
-            cx.background_spawn(request).detach_and_log_err(cx);
-        } else if let Some(local) = self.as_local() {
-            let servers = buffers
-                .into_iter()
-                .flat_map(|buffer| {
-                    buffer.update(cx, |buffer, cx| {
-                        local.language_server_ids_for_buffer(buffer, cx).into_iter()
-                    })
-                })
-                .collect::<HashSet<_>>();
-            for server_id in servers {
-                self.cancel_language_server_work(server_id, None, cx);
-            }
-        }
-    }
-
-    pub(crate) fn cancel_language_server_work(
-        &mut self,
-        server_id: LanguageServerId,
-        token_to_cancel: Option<ProgressToken>,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(local) = self.as_local() {
-            let status = self.language_server_statuses.get(&server_id);
-            let server = local.language_servers.get(&server_id);
-            if let Some((LanguageServerState::Running { server, .. }, status)) = server.zip(status)
-            {
-                for (token, progress) in &status.pending_work {
-                    if let Some(token_to_cancel) = token_to_cancel.as_ref()
-                        && token != token_to_cancel
-                    {
-                        continue;
-                    }
-                    if progress.is_cancellable {
-                        server
-                            .notify::<lsp::notification::WorkDoneProgressCancel>(
-                                WorkDoneProgressCancelParams {
-                                    token: token.to_lsp(),
-                                },
-                            )
-                            .ok();
-                    }
-                }
-            }
-        } else if let Some((client, project_id)) = self.upstream_client() {
-            let request = client.request(proto::CancelLanguageServerWork {
-                project_id,
-                work: Some(
-                    proto::cancel_language_server_work::Work::LanguageServerWork(
-                        proto::cancel_language_server_work::LanguageServerWork {
-                            language_server_id: server_id.to_proto(),
-                            token: token_to_cancel.map(|token| token.to_proto()),
-                        },
-                    ),
-                ),
-            });
-            cx.background_spawn(request).detach_and_log_err(cx);
-        }
-    }
-
-    fn register_supplementary_language_server(
-        &mut self,
-        id: LanguageServerId,
-        name: LanguageServerName,
-        server: Arc<LanguageServer>,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(local) = self.as_local_mut() {
-            local
-                .supplementary_language_servers
-                .insert(id, (name.clone(), server));
-            cx.emit(LspStoreEvent::LanguageServerAdded(id, name, None));
-        }
-    }
-
-    fn unregister_supplementary_language_server(
-        &mut self,
-        id: LanguageServerId,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(local) = self.as_local_mut() {
-            local.supplementary_language_servers.remove(&id);
-            cx.emit(LspStoreEvent::LanguageServerRemoved(id));
-        }
-    }
-
-    pub(crate) fn supplementary_language_servers(
-        &self,
-    ) -> impl '_ + Iterator<Item = (LanguageServerId, LanguageServerName)> {
-        self.as_local().into_iter().flat_map(|local| {
-            local
-                .supplementary_language_servers
-                .iter()
-                .map(|(id, (name, _))| (*id, name.clone()))
-        })
-    }
-
-    pub fn language_server_adapter_for_id(
-        &self,
-        id: LanguageServerId,
-    ) -> Option<Arc<CachedLspAdapter>> {
-        self.as_local()
-            .and_then(|local| local.language_servers.get(&id))
-            .and_then(|language_server_state| match language_server_state {
-                LanguageServerState::Running { adapter, .. } => Some(adapter.clone()),
-                _ => None,
-            })
-    }
-
-    pub(super) fn update_local_worktree_language_servers(
-        &mut self,
-        worktree_handle: &Entity<Worktree>,
-        changes: &[(Arc<RelPath>, ProjectEntryId, PathChange)],
-        cx: &mut Context<Self>,
-    ) {
-        if changes.is_empty() {
-            return;
-        }
-
-        let Some(local) = self.as_local() else { return };
-
-        local.prettier_store.update(cx, |prettier_store, cx| {
-            prettier_store.update_prettier_settings(worktree_handle, changes, cx)
-        });
-
-        let worktree_id = worktree_handle.read(cx).id();
-        let mut language_server_ids = local
-            .language_server_ids
-            .iter()
-            .filter_map(|(seed, v)| seed.worktree_id.eq(&worktree_id).then(|| v.id))
-            .collect::<Vec<_>>();
-        language_server_ids.sort();
-        language_server_ids.dedup();
-
-        // let abs_path = worktree_handle.read(cx).abs_path();
-        for server_id in &language_server_ids {
-            if let Some(LanguageServerState::Running { server, .. }) =
-                local.language_servers.get(server_id)
-                && let Some(watched_paths) = local
-                    .language_server_watched_paths
-                    .get(server_id)
-                    .and_then(|paths| paths.worktree_paths.get(&worktree_id))
-            {
-                let params = lsp::DidChangeWatchedFilesParams {
-                    changes: changes
-                        .iter()
-                        .filter_map(|(path, _, change)| {
-                            if !watched_paths.is_match(path.as_std_path()) {
-                                return None;
-                            }
-                            let typ = match change {
-                                PathChange::Loaded => return None,
-                                PathChange::Added => lsp::FileChangeType::CREATED,
-                                PathChange::Removed => lsp::FileChangeType::DELETED,
-                                PathChange::Updated => lsp::FileChangeType::CHANGED,
-                                PathChange::AddedOrUpdated => lsp::FileChangeType::CHANGED,
-                            };
-                            let uri = lsp::Uri::from_file_path(
-                                worktree_handle.read(cx).absolutize(&path),
-                            )
-                            .ok()?;
-                            Some(lsp::FileEvent { uri, typ })
-                        })
-                        .collect(),
-                };
-                if !params.changes.is_empty() {
-                    server
-                        .notify::<lsp::notification::DidChangeWatchedFiles>(params)
-                        .ok();
-                }
-            }
-        }
-        for (path, _, _) in changes {
-            if let Some(file_name) = path.file_name()
-                && local.watched_manifest_filenames.contains(file_name)
-            {
-                self.request_workspace_config_refresh();
-                break;
-            }
-        }
-    }
-
-    pub fn wait_for_remote_buffer(
-        &mut self,
-        id: BufferId,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Entity<Buffer>>> {
-        self.buffer_store.update(cx, |buffer_store, cx| {
-            buffer_store.wait_for_remote_buffer(id, cx)
-        })
-    }
-
-    fn serialize_symbol(symbol: &Symbol) -> proto::Symbol {
-        let mut result = proto::Symbol {
-            language_server_name: symbol.language_server_name.0.to_string(),
-            source_worktree_id: symbol.source_worktree_id.to_proto(),
-            language_server_id: symbol.source_language_server_id.to_proto(),
-            name: symbol.name.clone(),
-            kind: unsafe { mem::transmute::<lsp::SymbolKind, i32>(symbol.kind) },
-            start: Some(proto::PointUtf16 {
-                row: symbol.range.start.0.row,
-                column: symbol.range.start.0.column,
-            }),
-            end: Some(proto::PointUtf16 {
-                row: symbol.range.end.0.row,
-                column: symbol.range.end.0.column,
-            }),
-            worktree_id: Default::default(),
-            path: Default::default(),
-            signature: Default::default(),
-        };
-        match &symbol.path {
-            SymbolLocation::InProject(path) => {
-                result.worktree_id = path.worktree_id.to_proto();
-                result.path = path.path.to_proto();
-            }
-            SymbolLocation::OutsideProject {
-                abs_path,
-                signature,
-            } => {
-                result.path = abs_path.to_string_lossy().into_owned();
-                result.signature = signature.to_vec();
-            }
-        }
-        result
-    }
-
-    fn deserialize_symbol(serialized_symbol: proto::Symbol) -> Result<CoreSymbol> {
-        let source_worktree_id = WorktreeId::from_proto(serialized_symbol.source_worktree_id);
-        let worktree_id = WorktreeId::from_proto(serialized_symbol.worktree_id);
-        let kind = unsafe { mem::transmute::<i32, lsp::SymbolKind>(serialized_symbol.kind) };
-
-        let path = if serialized_symbol.signature.is_empty() {
-            SymbolLocation::InProject(ProjectPath {
-                worktree_id,
-                path: RelPath::from_proto(&serialized_symbol.path)
-                    .context("invalid symbol path")?,
-            })
-        } else {
-            SymbolLocation::OutsideProject {
-                abs_path: Path::new(&serialized_symbol.path).into(),
-                signature: serialized_symbol
-                    .signature
-                    .try_into()
-                    .map_err(|_| anyhow!("invalid signature"))?,
-            }
-        };
-
-        let start = serialized_symbol.start.context("invalid start")?;
-        let end = serialized_symbol.end.context("invalid end")?;
-        Ok(CoreSymbol {
-            language_server_name: LanguageServerName(serialized_symbol.language_server_name.into()),
-            source_worktree_id,
-            source_language_server_id: LanguageServerId::from_proto(
-                serialized_symbol.language_server_id,
-            ),
-            path,
-            name: serialized_symbol.name,
-            range: Unclipped(PointUtf16::new(start.row, start.column))
-                ..Unclipped(PointUtf16::new(end.row, end.column)),
-            kind,
-        })
-    }
-
-    pub(crate) fn serialize_completion(completion: &CoreCompletion) -> proto::Completion {
-        let mut serialized_completion = proto::Completion {
-            old_replace_start: Some(serialize_anchor(&completion.replace_range.start)),
-            old_replace_end: Some(serialize_anchor(&completion.replace_range.end)),
-            new_text: completion.new_text.clone(),
-            ..proto::Completion::default()
-        };
-        match &completion.source {
-            CompletionSource::Lsp {
-                insert_range,
-                server_id,
-                lsp_completion,
-                lsp_defaults,
-                resolved,
-            } => {
-                let (old_insert_start, old_insert_end) = insert_range
-                    .as_ref()
-                    .map(|range| (serialize_anchor(&range.start), serialize_anchor(&range.end)))
-                    .unzip();
-
-                serialized_completion.old_insert_start = old_insert_start;
-                serialized_completion.old_insert_end = old_insert_end;
-                serialized_completion.source = proto::completion::Source::Lsp as i32;
-                serialized_completion.server_id = server_id.0 as u64;
-                serialized_completion.lsp_completion = serde_json::to_vec(lsp_completion).unwrap();
-                serialized_completion.lsp_defaults = lsp_defaults
-                    .as_deref()
-                    .map(|lsp_defaults| serde_json::to_vec(lsp_defaults).unwrap());
-                serialized_completion.resolved = *resolved;
-            }
-            CompletionSource::BufferWord {
-                word_range,
-                resolved,
-            } => {
-                serialized_completion.source = proto::completion::Source::BufferWord as i32;
-                serialized_completion.buffer_word_start = Some(serialize_anchor(&word_range.start));
-                serialized_completion.buffer_word_end = Some(serialize_anchor(&word_range.end));
-                serialized_completion.resolved = *resolved;
-            }
-            CompletionSource::Custom => {
-                serialized_completion.source = proto::completion::Source::Custom as i32;
-                serialized_completion.resolved = true;
-            }
-            CompletionSource::Dap { sort_text } => {
-                serialized_completion.source = proto::completion::Source::Dap as i32;
-                serialized_completion.sort_text = Some(sort_text.clone());
-            }
-        }
-
-        serialized_completion
-    }
-
-    pub(crate) fn deserialize_completion(completion: proto::Completion) -> Result<CoreCompletion> {
-        let old_replace_start = completion
-            .old_replace_start
-            .and_then(deserialize_anchor)
-            .context("invalid old start")?;
-        let old_replace_end = completion
-            .old_replace_end
-            .and_then(deserialize_anchor)
-            .context("invalid old end")?;
-        let insert_range = {
-            match completion.old_insert_start.zip(completion.old_insert_end) {
-                Some((start, end)) => {
-                    let start = deserialize_anchor(start).context("invalid insert old start")?;
-                    let end = deserialize_anchor(end).context("invalid insert old end")?;
-                    Some(start..end)
-                }
-                None => None,
-            }
-        };
-        Ok(CoreCompletion {
-            replace_range: old_replace_start..old_replace_end,
-            new_text: completion.new_text,
-            source: match proto::completion::Source::from_i32(completion.source) {
-                Some(proto::completion::Source::Custom) => CompletionSource::Custom,
-                Some(proto::completion::Source::Lsp) => CompletionSource::Lsp {
-                    insert_range,
-                    server_id: LanguageServerId::from_proto(completion.server_id),
-                    lsp_completion: serde_json::from_slice(&completion.lsp_completion)?,
-                    lsp_defaults: completion
-                        .lsp_defaults
-                        .as_deref()
-                        .map(serde_json::from_slice)
-                        .transpose()?,
-                    resolved: completion.resolved,
-                },
-                Some(proto::completion::Source::BufferWord) => {
-                    let word_range = completion
-                        .buffer_word_start
-                        .and_then(deserialize_anchor)
-                        .context("invalid buffer word start")?
-                        ..completion
-                            .buffer_word_end
-                            .and_then(deserialize_anchor)
-                            .context("invalid buffer word end")?;
-                    CompletionSource::BufferWord {
-                        word_range,
-                        resolved: completion.resolved,
-                    }
-                }
-                Some(proto::completion::Source::Dap) => CompletionSource::Dap {
-                    sort_text: completion
-                        .sort_text
-                        .context("expected sort text to exist")?,
-                },
-                _ => anyhow::bail!("Unexpected completion source {}", completion.source),
-            },
-        })
-    }
-
-    pub(crate) fn serialize_code_action(action: &CodeAction) -> proto::CodeAction {
-        let (kind, lsp_action) = match &action.lsp_action {
-            LspAction::Action(code_action) => (
-                proto::code_action::Kind::Action as i32,
-                serde_json::to_vec(code_action).unwrap(),
-            ),
-            LspAction::Command(command) => (
-                proto::code_action::Kind::Command as i32,
-                serde_json::to_vec(command).unwrap(),
-            ),
-            LspAction::CodeLens(code_lens) => (
-                proto::code_action::Kind::CodeLens as i32,
-                serde_json::to_vec(code_lens).unwrap(),
-            ),
-        };
-
-        proto::CodeAction {
-            server_id: action.server_id.0 as u64,
-            start: Some(serialize_anchor(&action.range.start)),
-            end: Some(serialize_anchor(&action.range.end)),
-            lsp_action,
-            kind,
-            resolved: action.resolved,
-        }
-    }
-
-    pub(crate) fn deserialize_code_action(action: proto::CodeAction) -> Result<CodeAction> {
-        let start = action
-            .start
-            .and_then(deserialize_anchor)
-            .context("invalid start")?;
-        let end = action
-            .end
-            .and_then(deserialize_anchor)
-            .context("invalid end")?;
-        let lsp_action = match proto::code_action::Kind::from_i32(action.kind) {
-            Some(proto::code_action::Kind::Action) => {
-                LspAction::Action(serde_json::from_slice(&action.lsp_action)?)
-            }
-            Some(proto::code_action::Kind::Command) => {
-                LspAction::Command(serde_json::from_slice(&action.lsp_action)?)
-            }
-            Some(proto::code_action::Kind::CodeLens) => {
-                LspAction::CodeLens(serde_json::from_slice(&action.lsp_action)?)
-            }
-            None => anyhow::bail!("Unknown action kind {}", action.kind),
-        };
-        Ok(CodeAction {
-            server_id: LanguageServerId(action.server_id as usize),
-            range: start..end,
-            resolved: action.resolved,
-            lsp_action,
-        })
-    }
-
-    fn update_last_formatting_failure<T>(&mut self, formatting_result: &anyhow::Result<T>) {
-        match &formatting_result {
-            Ok(_) => self.last_formatting_failure = None,
-            Err(error) => {
-                let error_string = format!("{error:#}");
-                log::error!("Formatting failed: {error_string}");
-                self.last_formatting_failure
-                    .replace(error_string.lines().join(" "));
-            }
-        }
-    }
-
-    fn cleanup_lsp_data(&mut self, for_server: LanguageServerId) {
-        self.lsp_server_capabilities.remove(&for_server);
-        for lsp_data in self.lsp_data.values_mut() {
-            lsp_data.remove_server_data(for_server);
-        }
-        if let Some(local) = self.as_local_mut() {
-            local.buffer_pull_diagnostics_result_ids.remove(&for_server);
-            local
-                .workspace_pull_diagnostics_result_ids
-                .remove(&for_server);
-            for buffer_servers in local.buffers_opened_in_servers.values_mut() {
-                buffer_servers.remove(&for_server);
-            }
-        }
-    }
-
-    pub fn result_id_for_buffer_pull(
-        &self,
-        server_id: LanguageServerId,
-        buffer_id: BufferId,
-        registration_id: &Option<SharedString>,
-        cx: &App,
-    ) -> Option<SharedString> {
-        let abs_path = self
-            .buffer_store
-            .read(cx)
-            .get(buffer_id)
-            .and_then(|b| File::from_dyn(b.read(cx).file()))
-            .map(|f| f.abs_path(cx))?;
-        self.as_local()?
-            .buffer_pull_diagnostics_result_ids
-            .get(&server_id)?
-            .get(registration_id)?
-            .get(&abs_path)?
-            .clone()
-    }
-
-    /// Gets all result_ids for a workspace diagnostics pull request.
-    /// First, it tries to find buffer's result_id retrieved via the diagnostics pull; if it fails, it falls back to the workspace disagnostics pull result_id.
-    /// The latter is supposed to be of lower priority as we keep on pulling diagnostics for open buffers eagerly.
-    pub fn result_ids_for_workspace_refresh(
-        &self,
-        server_id: LanguageServerId,
-        registration_id: &Option<SharedString>,
-    ) -> HashMap<PathBuf, SharedString> {
-        let Some(local) = self.as_local() else {
-            return HashMap::default();
-        };
-        local
-            .workspace_pull_diagnostics_result_ids
-            .get(&server_id)
-            .into_iter()
-            .filter_map(|diagnostics| diagnostics.get(registration_id))
-            .flatten()
-            .filter_map(|(abs_path, result_id)| {
-                let result_id = local
-                    .buffer_pull_diagnostics_result_ids
-                    .get(&server_id)
-                    .and_then(|buffer_ids_result_ids| {
-                        buffer_ids_result_ids.get(registration_id)?.get(abs_path)
-                    })
-                    .cloned()
-                    .flatten()
-                    .or_else(|| result_id.clone())?;
-                Some((abs_path.clone(), result_id))
-            })
-            .collect()
-    }
-
-    pub fn pull_workspace_diagnostics(&mut self, server_id: LanguageServerId) {
-        if let Some(LanguageServerState::Running {
-            workspace_diagnostics_refresh_tasks,
-            ..
-        }) = self
-            .as_local_mut()
-            .and_then(|local| local.language_servers.get_mut(&server_id))
-        {
-            for diagnostics in workspace_diagnostics_refresh_tasks.values_mut() {
-                diagnostics.refresh_tx.try_send(()).ok();
-            }
-        }
-    }
-
-    pub fn pull_workspace_diagnostics_for_buffer(&mut self, buffer_id: BufferId, cx: &mut App) {
-        let Some(buffer) = self.buffer_store().read(cx).get_existing(buffer_id).ok() else {
-            return;
-        };
-        let Some(local) = self.as_local_mut() else {
-            return;
-        };
-
-        for server_id in buffer.update(cx, |buffer, cx| {
-            local.language_server_ids_for_buffer(buffer, cx)
-        }) {
-            if let Some(LanguageServerState::Running {
-                workspace_diagnostics_refresh_tasks,
-                ..
-            }) = local.language_servers.get_mut(&server_id)
-            {
-                for diagnostics in workspace_diagnostics_refresh_tasks.values_mut() {
-                    diagnostics.refresh_tx.try_send(()).ok();
-                }
-            }
-        }
-    }
-
-    fn apply_workspace_diagnostic_report(
-        &mut self,
-        server_id: LanguageServerId,
-        report: lsp::WorkspaceDiagnosticReportResult,
-        registration_id: Option<SharedString>,
-        cx: &mut Context<Self>,
-    ) {
-        let workspace_diagnostics =
-            GetDocumentDiagnostics::deserialize_workspace_diagnostics_report(
-                report,
-                server_id,
-                registration_id,
-            );
-        let mut unchanged_buffers = HashMap::default();
-        let workspace_diagnostics_updates = workspace_diagnostics
-            .into_iter()
-            .filter_map(
-                |workspace_diagnostics| match workspace_diagnostics.diagnostics {
-                    LspPullDiagnostics::Response {
-                        server_id,
-                        uri,
-                        diagnostics,
-                        registration_id,
-                    } => Some((
-                        server_id,
-                        uri,
-                        diagnostics,
-                        workspace_diagnostics.version,
-                        registration_id,
-                    )),
-                    LspPullDiagnostics::Default => None,
-                },
-            )
-            .fold(
-                HashMap::default(),
-                |mut acc, (server_id, uri, diagnostics, version, new_registration_id)| {
-                    let (result_id, diagnostics) = match diagnostics {
-                        PulledDiagnostics::Unchanged { result_id } => {
-                            unchanged_buffers
-                                .entry(new_registration_id.clone())
-                                .or_insert_with(HashSet::default)
-                                .insert(uri.clone());
-                            (Some(result_id), Vec::new())
-                        }
-                        PulledDiagnostics::Changed {
-                            result_id,
-                            diagnostics,
-                        } => (result_id, diagnostics),
-                    };
-                    let disk_based_sources = Cow::Owned(
-                        self.language_server_adapter_for_id(server_id)
-                            .as_ref()
-                            .map(|adapter| adapter.disk_based_diagnostic_sources.as_slice())
-                            .unwrap_or(&[])
-                            .to_vec(),
-                    );
-
-                    let Some(abs_path) = uri.to_file_path().ok() else {
-                        return acc;
-                    };
-                    let Some((worktree, relative_path)) =
-                        self.worktree_store.read(cx).find_worktree(abs_path.clone(), cx)
-                    else {
-                        log::warn!("skipping workspace diagnostics update, no worktree found for path {abs_path:?}");
-                        return acc;
-                    };
-                    let worktree_id = worktree.read(cx).id();
-                    let project_path = ProjectPath {
-                        worktree_id,
-                        path: relative_path,
-                    };
-                    if let Some(local_lsp_store) = self.as_local_mut() {
-                        local_lsp_store.workspace_pull_diagnostics_result_ids.entry(server_id)
-                            .or_default().entry(new_registration_id.clone()).or_default().insert(abs_path, result_id.clone());
-                    }
-                    // The LSP spec recommends that "diagnostics from a document pull should win over diagnostics from a workspace pull."
-                    // Since we actively pull diagnostics for documents with open buffers, we ignore contents of workspace pulls for these documents.
-                    if self.buffer_store.read(cx).get_by_path(&project_path).is_none() {
-                        acc.entry(server_id)
-                            .or_insert_with(HashMap::default)
-                            .entry(new_registration_id.clone())
-                            .or_insert_with(Vec::new)
-                            .push(DocumentDiagnosticsUpdate {
-                                server_id,
-                                diagnostics: lsp::PublishDiagnosticsParams {
-                                    uri,
-                                    diagnostics,
-                                    version,
-                                },
-                                result_id,
-                                disk_based_sources,
-                                registration_id: new_registration_id,
-                            });
-                    }
-                    acc
-                },
-            );
-
-        for diagnostic_updates in workspace_diagnostics_updates.into_values() {
-            for (registration_id, diagnostic_updates) in diagnostic_updates {
-                self.merge_lsp_diagnostics(
-                    DiagnosticSourceKind::Pulled,
-                    diagnostic_updates,
-                    |document_uri, old_diagnostic, _| match old_diagnostic.source_kind {
-                        DiagnosticSourceKind::Pulled => {
-                            old_diagnostic.registration_id != registration_id
-                                || unchanged_buffers
-                                    .get(&old_diagnostic.registration_id)
-                                    .is_some_and(|unchanged_buffers| {
-                                        unchanged_buffers.contains(&document_uri)
-                                    })
-                        }
-                        DiagnosticSourceKind::Other | DiagnosticSourceKind::Pushed => true,
-                    },
-                    cx,
-                )
-                .log_err();
-            }
-        }
-    }
-
-    fn register_server_capabilities(
-        &mut self,
-        server_id: LanguageServerId,
-        params: lsp::RegistrationParams,
-        cx: &mut Context<Self>,
-    ) -> anyhow::Result<()> {
-        let server = self
-            .language_server_for_id(server_id)
-            .with_context(|| format!("no server {server_id} found"))?;
-        for reg in params.registrations {
-            match reg.method.as_str() {
-                "workspace/didChangeWatchedFiles" => {
-                    if let Some(options) = reg.register_options {
-                        let notify = if let Some(local_lsp_store) = self.as_local_mut() {
-                            let caps = serde_json::from_value(options)?;
-                            local_lsp_store
-                                .on_lsp_did_change_watched_files(server_id, &reg.id, caps, cx);
-                            true
-                        } else {
-                            false
-                        };
-                        if notify {
-                            notify_server_capabilities_updated(&server, cx);
-                        }
-                    }
-                }
-                "workspace/didChangeConfiguration" => {
-                    // Ignore payload since we notify clients of setting changes unconditionally, relying on them pulling the latest settings.
-                }
-                "workspace/didChangeWorkspaceFolders" => {
-                    // In this case register options is an empty object, we can ignore it
-                    let caps = lsp::WorkspaceFoldersServerCapabilities {
-                        supported: Some(true),
-                        change_notifications: Some(OneOf::Right(reg.id)),
-                    };
-                    server.update_capabilities(|capabilities| {
-                        capabilities
-                            .workspace
-                            .get_or_insert_default()
-                            .workspace_folders = Some(caps);
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "workspace/symbol" => {
-                    let options = parse_register_capabilities(reg)?;
-                    server.update_capabilities(|capabilities| {
-                        capabilities.workspace_symbol_provider = Some(options);
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "workspace/fileOperations" => {
-                    if let Some(options) = reg.register_options {
-                        let caps = serde_json::from_value(options)?;
-                        server.update_capabilities(|capabilities| {
-                            capabilities
-                                .workspace
-                                .get_or_insert_default()
-                                .file_operations = Some(caps);
-                        });
-                        notify_server_capabilities_updated(&server, cx);
-                    }
-                }
-                "workspace/executeCommand" => {
-                    if let Some(options) = reg.register_options {
-                        let options = serde_json::from_value(options)?;
-                        server.update_capabilities(|capabilities| {
-                            capabilities.execute_command_provider = Some(options);
-                        });
-                        notify_server_capabilities_updated(&server, cx);
-                    }
-                }
-                "textDocument/rangeFormatting" => {
-                    let options = parse_register_capabilities(reg)?;
-                    server.update_capabilities(|capabilities| {
-                        capabilities.document_range_formatting_provider = Some(options);
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/onTypeFormatting" => {
-                    if let Some(options) = reg
-                        .register_options
-                        .map(serde_json::from_value)
-                        .transpose()?
-                    {
-                        server.update_capabilities(|capabilities| {
-                            capabilities.document_on_type_formatting_provider = Some(options);
-                        });
-                        notify_server_capabilities_updated(&server, cx);
-                    }
-                }
-                "textDocument/formatting" => {
-                    let options = parse_register_capabilities(reg)?;
-                    server.update_capabilities(|capabilities| {
-                        capabilities.document_formatting_provider = Some(options);
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/rename" => {
-                    let options = parse_register_capabilities(reg)?;
-                    server.update_capabilities(|capabilities| {
-                        capabilities.rename_provider = Some(options);
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/inlayHint" => {
-                    let options = parse_register_capabilities(reg)?;
-                    server.update_capabilities(|capabilities| {
-                        capabilities.inlay_hint_provider = Some(options);
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/documentSymbol" => {
-                    let options = parse_register_capabilities(reg)?;
-                    server.update_capabilities(|capabilities| {
-                        capabilities.document_symbol_provider = Some(options);
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/codeAction" => {
-                    let options = parse_register_capabilities(reg)?;
-                    let provider = match options {
-                        OneOf::Left(value) => lsp::CodeActionProviderCapability::Simple(value),
-                        OneOf::Right(caps) => caps,
-                    };
-                    server.update_capabilities(|capabilities| {
-                        capabilities.code_action_provider = Some(provider);
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/definition" => {
-                    let options = parse_register_capabilities(reg)?;
-                    server.update_capabilities(|capabilities| {
-                        capabilities.definition_provider = Some(options);
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/completion" => {
-                    if let Some(caps) = reg
-                        .register_options
-                        .map(serde_json::from_value::<CompletionOptions>)
-                        .transpose()?
-                    {
-                        server.update_capabilities(|capabilities| {
-                            capabilities.completion_provider = Some(caps.clone());
-                        });
-
-                        if let Some(local) = self.as_local() {
-                            let mut buffers_with_language_server = Vec::new();
-                            for handle in self.buffer_store.read(cx).buffers() {
-                                let buffer_id = handle.read(cx).remote_id();
-                                if local
-                                    .buffers_opened_in_servers
-                                    .get(&buffer_id)
-                                    .filter(|s| s.contains(&server_id))
-                                    .is_some()
-                                {
-                                    buffers_with_language_server.push(handle);
-                                }
-                            }
-                            let triggers = caps
-                                .trigger_characters
-                                .unwrap_or_default()
-                                .into_iter()
-                                .collect::<BTreeSet<_>>();
-                            for handle in buffers_with_language_server {
-                                let triggers = triggers.clone();
-                                let _ = handle.update(cx, move |buffer, cx| {
-                                    buffer.set_completion_triggers(server_id, triggers, cx);
-                                });
-                            }
-                        }
-                        notify_server_capabilities_updated(&server, cx);
-                    }
-                }
-                "textDocument/hover" => {
-                    let options = parse_register_capabilities(reg)?;
-                    let provider = match options {
-                        OneOf::Left(value) => lsp::HoverProviderCapability::Simple(value),
-                        OneOf::Right(caps) => caps,
-                    };
-                    server.update_capabilities(|capabilities| {
-                        capabilities.hover_provider = Some(provider);
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/signatureHelp" => {
-                    if let Some(caps) = reg
-                        .register_options
-                        .map(serde_json::from_value)
-                        .transpose()?
-                    {
-                        server.update_capabilities(|capabilities| {
-                            capabilities.signature_help_provider = Some(caps);
-                        });
-                        notify_server_capabilities_updated(&server, cx);
-                    }
-                }
-                "textDocument/didChange" => {
-                    if let Some(sync_kind) = reg
-                        .register_options
-                        .and_then(|opts| opts.get("syncKind").cloned())
-                        .map(serde_json::from_value::<lsp::TextDocumentSyncKind>)
-                        .transpose()?
-                    {
-                        server.update_capabilities(|capabilities| {
-                            let mut sync_options =
-                                Self::take_text_document_sync_options(capabilities);
-                            sync_options.change = Some(sync_kind);
-                            capabilities.text_document_sync =
-                                Some(lsp::TextDocumentSyncCapability::Options(sync_options));
-                        });
-                        notify_server_capabilities_updated(&server, cx);
-                    }
-                }
-                "textDocument/didSave" => {
-                    if let Some(include_text) = reg
-                        .register_options
-                        .map(|opts| {
-                            let transpose = opts
-                                .get("includeText")
-                                .cloned()
-                                .map(serde_json::from_value::<Option<bool>>)
-                                .transpose();
-                            match transpose {
-                                Ok(value) => Ok(value.flatten()),
-                                Err(e) => Err(e),
-                            }
-                        })
-                        .transpose()?
-                    {
-                        server.update_capabilities(|capabilities| {
-                            let mut sync_options =
-                                Self::take_text_document_sync_options(capabilities);
-                            sync_options.save =
-                                Some(TextDocumentSyncSaveOptions::SaveOptions(lsp::SaveOptions {
-                                    include_text,
-                                }));
-                            capabilities.text_document_sync =
-                                Some(lsp::TextDocumentSyncCapability::Options(sync_options));
-                        });
-                        notify_server_capabilities_updated(&server, cx);
-                    }
-                }
-                "textDocument/codeLens" => {
-                    if let Some(caps) = reg
-                        .register_options
-                        .map(serde_json::from_value)
-                        .transpose()?
-                    {
-                        server.update_capabilities(|capabilities| {
-                            capabilities.code_lens_provider = Some(caps);
-                        });
-                        notify_server_capabilities_updated(&server, cx);
-                    }
-                }
-                "textDocument/diagnostic" => {
-                    if let Some(caps) = reg
-                        .register_options
-                        .map(serde_json::from_value::<DiagnosticServerCapabilities>)
-                        .transpose()?
-                    {
-                        let local = self
-                            .as_local_mut()
-                            .context("Expected LSP Store to be local")?;
-                        let state = local
-                            .language_servers
-                            .get_mut(&server_id)
-                            .context("Could not obtain Language Servers state")?;
-                        local
-                            .language_server_dynamic_registrations
-                            .entry(server_id)
-                            .or_default()
-                            .diagnostics
-                            .insert(Some(reg.id.clone()), caps.clone());
-
-                        let supports_workspace_diagnostics =
-                            |capabilities: &DiagnosticServerCapabilities| match capabilities {
-                                DiagnosticServerCapabilities::Options(diagnostic_options) => {
-                                    diagnostic_options.workspace_diagnostics
-                                }
-                                DiagnosticServerCapabilities::RegistrationOptions(
-                                    diagnostic_registration_options,
-                                ) => {
-                                    diagnostic_registration_options
-                                        .diagnostic_options
-                                        .workspace_diagnostics
-                                }
-                            };
-
-                        if supports_workspace_diagnostics(&caps) {
-                            if let LanguageServerState::Running {
-                                workspace_diagnostics_refresh_tasks,
-                                ..
-                            } = state
-                                && let Some(task) = lsp_workspace_diagnostics_refresh(
-                                    Some(reg.id.clone()),
-                                    caps.clone(),
-                                    server.clone(),
-                                    cx,
-                                )
-                            {
-                                workspace_diagnostics_refresh_tasks.insert(Some(reg.id), task);
-                            }
-                        }
-
-                        server.update_capabilities(|capabilities| {
-                            capabilities.diagnostic_provider = Some(caps);
-                        });
-
-                        notify_server_capabilities_updated(&server, cx);
-                    }
-                }
-                "textDocument/documentColor" => {
-                    let options = parse_register_capabilities(reg)?;
-                    let provider = match options {
-                        OneOf::Left(value) => lsp::ColorProviderCapability::Simple(value),
-                        OneOf::Right(caps) => caps,
-                    };
-                    server.update_capabilities(|capabilities| {
-                        capabilities.color_provider = Some(provider);
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                _ => log::warn!("unhandled capability registration: {reg:?}"),
-            }
-        }
-
-        Ok(())
-    }
-
-    fn unregister_server_capabilities(
-        &mut self,
-        server_id: LanguageServerId,
-        params: lsp::UnregistrationParams,
-        cx: &mut Context<Self>,
-    ) -> anyhow::Result<()> {
-        let server = self
-            .language_server_for_id(server_id)
-            .with_context(|| format!("no server {server_id} found"))?;
-        for unreg in params.unregisterations.iter() {
-            match unreg.method.as_str() {
-                "workspace/didChangeWatchedFiles" => {
-                    let notify = if let Some(local_lsp_store) = self.as_local_mut() {
-                        local_lsp_store
-                            .on_lsp_unregister_did_change_watched_files(server_id, &unreg.id, cx);
-                        true
-                    } else {
-                        false
-                    };
-                    if notify {
-                        notify_server_capabilities_updated(&server, cx);
-                    }
-                }
-                "workspace/didChangeConfiguration" => {
-                    // Ignore payload since we notify clients of setting changes unconditionally, relying on them pulling the latest settings.
-                }
-                "workspace/didChangeWorkspaceFolders" => {
-                    server.update_capabilities(|capabilities| {
-                        capabilities
-                            .workspace
-                            .get_or_insert_with(|| lsp::WorkspaceServerCapabilities {
-                                workspace_folders: None,
-                                file_operations: None,
-                            })
-                            .workspace_folders = None;
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "workspace/symbol" => {
-                    server.update_capabilities(|capabilities| {
-                        capabilities.workspace_symbol_provider = None
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "workspace/fileOperations" => {
-                    server.update_capabilities(|capabilities| {
-                        capabilities
-                            .workspace
-                            .get_or_insert_with(|| lsp::WorkspaceServerCapabilities {
-                                workspace_folders: None,
-                                file_operations: None,
-                            })
-                            .file_operations = None;
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "workspace/executeCommand" => {
-                    server.update_capabilities(|capabilities| {
-                        capabilities.execute_command_provider = None;
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/rangeFormatting" => {
-                    server.update_capabilities(|capabilities| {
-                        capabilities.document_range_formatting_provider = None
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/onTypeFormatting" => {
-                    server.update_capabilities(|capabilities| {
-                        capabilities.document_on_type_formatting_provider = None;
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/formatting" => {
-                    server.update_capabilities(|capabilities| {
-                        capabilities.document_formatting_provider = None;
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/rename" => {
-                    server.update_capabilities(|capabilities| capabilities.rename_provider = None);
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/codeAction" => {
-                    server.update_capabilities(|capabilities| {
-                        capabilities.code_action_provider = None;
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/definition" => {
-                    server.update_capabilities(|capabilities| {
-                        capabilities.definition_provider = None;
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/completion" => {
-                    server.update_capabilities(|capabilities| {
-                        capabilities.completion_provider = None;
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/hover" => {
-                    server.update_capabilities(|capabilities| {
-                        capabilities.hover_provider = None;
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/signatureHelp" => {
-                    server.update_capabilities(|capabilities| {
-                        capabilities.signature_help_provider = None;
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/didChange" => {
-                    server.update_capabilities(|capabilities| {
-                        let mut sync_options = Self::take_text_document_sync_options(capabilities);
-                        sync_options.change = None;
-                        capabilities.text_document_sync =
-                            Some(lsp::TextDocumentSyncCapability::Options(sync_options));
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/didSave" => {
-                    server.update_capabilities(|capabilities| {
-                        let mut sync_options = Self::take_text_document_sync_options(capabilities);
-                        sync_options.save = None;
-                        capabilities.text_document_sync =
-                            Some(lsp::TextDocumentSyncCapability::Options(sync_options));
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/codeLens" => {
-                    server.update_capabilities(|capabilities| {
-                        capabilities.code_lens_provider = None;
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/diagnostic" => {
-                    let local = self
-                        .as_local_mut()
-                        .context("Expected LSP Store to be local")?;
-
-                    let state = local
-                        .language_servers
-                        .get_mut(&server_id)
-                        .context("Could not obtain Language Servers state")?;
-                    let registrations = local
-                        .language_server_dynamic_registrations
-                        .get_mut(&server_id)
-                        .with_context(|| {
-                            format!("Expected dynamic registration to exist for server {server_id}")
-                        })?;
-                    registrations.diagnostics
-                        .remove(&Some(unreg.id.clone()))
-                        .with_context(|| format!(
-                            "Attempted to unregister non-existent diagnostic registration with ID {}",
-                            unreg.id)
-                        )?;
-                    let removed_last_diagnostic_provider = registrations.diagnostics.is_empty();
-
-                    if let LanguageServerState::Running {
-                        workspace_diagnostics_refresh_tasks,
-                        ..
-                    } = state
-                    {
-                        workspace_diagnostics_refresh_tasks.remove(&Some(unreg.id.clone()));
-                    }
-
-                    if removed_last_diagnostic_provider {
-                        server.update_capabilities(|capabilities| {
-                            debug_assert!(capabilities.diagnostic_provider.is_some());
-                            capabilities.diagnostic_provider = None;
-                        });
-                    }
-
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                "textDocument/documentColor" => {
-                    server.update_capabilities(|capabilities| {
-                        capabilities.color_provider = None;
-                    });
-                    notify_server_capabilities_updated(&server, cx);
-                }
-                _ => log::warn!("unhandled capability unregistration: {unreg:?}"),
-            }
-        }
-
-        Ok(())
-    }
-
-    async fn deduplicate_range_based_lsp_requests<T>(
-        lsp_store: &Entity<Self>,
-        server_id: Option<LanguageServerId>,
-        lsp_request_id: LspRequestId,
-        proto_request: &T::ProtoRequest,
-        range: Range<Anchor>,
-        cx: &mut AsyncApp,
-    ) -> Result<()>
-    where
-        T: LspCommand,
-        T::ProtoRequest: proto::LspRequestMessage,
-    {
-        let buffer_id = BufferId::new(proto_request.buffer_id())?;
-        let version = deserialize_version(proto_request.buffer_version());
-        let buffer = lsp_store.update(cx, |this, cx| {
-            this.buffer_store.read(cx).get_existing(buffer_id)
-        })??;
-        buffer
-            .update(cx, |buffer, _| buffer.wait_for_version(version))?
-            .await?;
-        lsp_store.update(cx, |lsp_store, cx| {
-            let lsp_data = lsp_store.latest_lsp_data(&buffer, cx);
-            let chunks_queried_for = lsp_data
-                .inlay_hints
-                .applicable_chunks(&[range])
-                .collect::<Vec<_>>();
-            match chunks_queried_for.as_slice() {
-                &[chunk] => {
-                    let key = LspKey {
-                        request_type: TypeId::of::<T>(),
-                        server_queried: server_id,
-                    };
-                    let previous_request = lsp_data
-                        .chunk_lsp_requests
-                        .entry(key)
-                        .or_default()
-                        .insert(chunk, lsp_request_id);
-                    if let Some((previous_request, running_requests)) =
-                        previous_request.zip(lsp_data.lsp_requests.get_mut(&key))
-                    {
-                        running_requests.remove(&previous_request);
-                    }
-                }
-                _ambiguous_chunks => {
-                    // Have not found a unique chunk for the query range — be lenient and let the query to be spawned,
-                    // there, a buffer version-based check will be performed and outdated requests discarded.
-                }
-            }
-            anyhow::Ok(())
-        })??;
-
-        Ok(())
-    }
-
-    async fn query_lsp_locally<T>(
-        lsp_store: Entity<Self>,
-        for_server_id: Option<LanguageServerId>,
-        sender_id: proto::PeerId,
-        lsp_request_id: LspRequestId,
-        proto_request: T::ProtoRequest,
-        position: Option<Anchor>,
-        cx: &mut AsyncApp,
-    ) -> Result<()>
-    where
-        T: LspCommand + Clone,
-        T::ProtoRequest: proto::LspRequestMessage,
-        <T::ProtoRequest as proto::RequestMessage>::Response:
-            Into<<T::ProtoRequest as proto::LspRequestMessage>::Response>,
-    {
-        let buffer_id = BufferId::new(proto_request.buffer_id())?;
-        let version = deserialize_version(proto_request.buffer_version());
-        let buffer = lsp_store.update(cx, |this, cx| {
-            this.buffer_store.read(cx).get_existing(buffer_id)
-        })??;
-        buffer
-            .update(cx, |buffer, _| buffer.wait_for_version(version.clone()))?
-            .await?;
-        let buffer_version = buffer.read_with(cx, |buffer, _| buffer.version())?;
-        let request =
-            T::from_proto(proto_request, lsp_store.clone(), buffer.clone(), cx.clone()).await?;
-        let key = LspKey {
-            request_type: TypeId::of::<T>(),
-            server_queried: for_server_id,
-        };
-        lsp_store.update(cx, |lsp_store, cx| {
-            let request_task = match for_server_id {
-                Some(server_id) => {
-                    let server_task = lsp_store.request_lsp(
-                        buffer.clone(),
-                        LanguageServerToQuery::Other(server_id),
-                        request.clone(),
-                        cx,
-                    );
-                    cx.background_spawn(async move {
-                        let mut responses = Vec::new();
-                        match server_task.await {
-                            Ok(response) => responses.push((server_id, response)),
-                            // rust-analyzer likes to error with this when its still loading up
-                            Err(e) if format!("{e:#}").ends_with("content modified") => (),
-                            Err(e) => log::error!(
-                                "Error handling response for request {request:?}: {e:#}"
-                            ),
-                        }
-                        responses
-                    })
-                }
-                None => lsp_store.request_multiple_lsp_locally(&buffer, position, request, cx),
-            };
-            let lsp_data = lsp_store.latest_lsp_data(&buffer, cx);
-            if T::ProtoRequest::stop_previous_requests() {
-                if let Some(lsp_requests) = lsp_data.lsp_requests.get_mut(&key) {
-                    lsp_requests.clear();
-                }
-            }
-            lsp_data.lsp_requests.entry(key).or_default().insert(
-                lsp_request_id,
-                cx.spawn(async move |lsp_store, cx| {
-                    let response = request_task.await;
-                    lsp_store
-                        .update(cx, |lsp_store, cx| {
-                            if let Some((client, project_id)) = lsp_store.downstream_client.clone()
-                            {
-                                let response = response
-                                    .into_iter()
-                                    .map(|(server_id, response)| {
-                                        (
-                                            server_id.to_proto(),
-                                            T::response_to_proto(
-                                                response,
-                                                lsp_store,
-                                                sender_id,
-                                                &buffer_version,
-                                                cx,
-                                            )
-                                            .into(),
-                                        )
-                                    })
-                                    .collect::<HashMap<_, _>>();
-                                match client.send_lsp_response::<T::ProtoRequest>(
-                                    project_id,
-                                    lsp_request_id,
-                                    response,
-                                ) {
-                                    Ok(()) => {}
-                                    Err(e) => {
-                                        log::error!("Failed to send LSP response: {e:#}",)
-                                    }
-                                }
-                            }
-                        })
-                        .ok();
-                }),
-            );
-        })?;
-        Ok(())
-    }
-
-    fn take_text_document_sync_options(
-        capabilities: &mut lsp::ServerCapabilities,
-    ) -> lsp::TextDocumentSyncOptions {
-        match capabilities.text_document_sync.take() {
-            Some(lsp::TextDocumentSyncCapability::Options(sync_options)) => sync_options,
-            Some(lsp::TextDocumentSyncCapability::Kind(sync_kind)) => {
-                let mut sync_options = lsp::TextDocumentSyncOptions::default();
-                sync_options.change = Some(sync_kind);
-                sync_options
-            }
-            None => lsp::TextDocumentSyncOptions::default(),
-        }
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn forget_code_lens_task(&mut self, buffer_id: BufferId) -> Option<CodeLensTask> {
-        Some(
-            self.lsp_data
-                .get_mut(&buffer_id)?
-                .code_lens
-                .take()?
-                .update
-                .take()?
-                .1,
-        )
-    }
-
-    pub fn downstream_client(&self) -> Option<(AnyProtoClient, u64)> {
-        self.downstream_client.clone()
-    }
-
-    pub fn worktree_store(&self) -> Entity<WorktreeStore> {
-        self.worktree_store.clone()
-    }
-
-    /// Gets what's stored in the LSP data for the given buffer.
-    pub fn current_lsp_data(&mut self, buffer_id: BufferId) -> Option<&mut BufferLspData> {
-        self.lsp_data.get_mut(&buffer_id)
-    }
-
-    /// Gets the most recent LSP data for the given buffer: if the data is absent or out of date,
-    /// new [`BufferLspData`] will be created to replace the previous state.
-    pub fn latest_lsp_data(&mut self, buffer: &Entity<Buffer>, cx: &mut App) -> &mut BufferLspData {
-        let (buffer_id, buffer_version) =
-            buffer.read_with(cx, |buffer, _| (buffer.remote_id(), buffer.version()));
-        let lsp_data = self
-            .lsp_data
-            .entry(buffer_id)
-            .or_insert_with(|| BufferLspData::new(buffer, cx));
-        if buffer_version.changed_since(&lsp_data.buffer_version) {
-            *lsp_data = BufferLspData::new(buffer, cx);
-        }
-        lsp_data
-    }
-}
-
-// Registration with registerOptions as null, should fallback to true.
-// https://github.com/microsoft/vscode-languageserver-node/blob/d90a87f9557a0df9142cfb33e251cfa6fe27d970/client/src/common/client.ts#L2133
-fn parse_register_capabilities<T: serde::de::DeserializeOwned>(
-    reg: lsp::Registration,
-) -> Result<OneOf<bool, T>> {
-    Ok(match reg.register_options {
-        Some(options) => OneOf::Right(serde_json::from_value::<T>(options)?),
-        None => OneOf::Left(true),
-    })
-}
-
-fn subscribe_to_binary_statuses(
-    languages: &Arc<LanguageRegistry>,
-    cx: &mut Context<'_, LspStore>,
-) -> Task<()> {
-    let mut server_statuses = languages.language_server_binary_statuses();
-    cx.spawn(async move |lsp_store, cx| {
-        while let Some((server_name, binary_status)) = server_statuses.next().await {
-            if lsp_store
-                .update(cx, |_, cx| {
-                    let mut message = None;
-                    let binary_status = match binary_status {
-                        BinaryStatus::None => proto::ServerBinaryStatus::None,
-                        BinaryStatus::CheckingForUpdate => {
-                            proto::ServerBinaryStatus::CheckingForUpdate
-                        }
-                        BinaryStatus::Downloading => proto::ServerBinaryStatus::Downloading,
-                        BinaryStatus::Starting => proto::ServerBinaryStatus::Starting,
-                        BinaryStatus::Stopping => proto::ServerBinaryStatus::Stopping,
-                        BinaryStatus::Stopped => proto::ServerBinaryStatus::Stopped,
-                        BinaryStatus::Failed { error } => {
-                            message = Some(error);
-                            proto::ServerBinaryStatus::Failed
-                        }
-                    };
-                    cx.emit(LspStoreEvent::LanguageServerUpdate {
-                        // Binary updates are about the binary that might not have any language server id at that point.
-                        // Reuse `LanguageServerUpdate` for them and provide a fake id that won't be used on the receiver side.
-                        language_server_id: LanguageServerId(0),
-                        name: Some(server_name),
-                        message: proto::update_language_server::Variant::StatusUpdate(
-                            proto::StatusUpdate {
-                                message,
-                                status: Some(proto::status_update::Status::Binary(
-                                    binary_status as i32,
-                                )),
-                            },
-                        ),
-                    });
-                })
-                .is_err()
-            {
-                break;
-            }
-        }
-    })
-}
-
-fn lsp_workspace_diagnostics_refresh(
-    registration_id: Option<String>,
-    options: DiagnosticServerCapabilities,
-    server: Arc<LanguageServer>,
-    cx: &mut Context<'_, LspStore>,
-) -> Option<WorkspaceRefreshTask> {
-    let identifier = workspace_diagnostic_identifier(&options)?;
-    let registration_id_shared = registration_id.as_ref().map(SharedString::from);
-
-    let (progress_tx, mut progress_rx) = mpsc::channel(1);
-    let (mut refresh_tx, mut refresh_rx) = mpsc::channel(1);
-    refresh_tx.try_send(()).ok();
-
-    let workspace_query_language_server = cx.spawn(async move |lsp_store, cx| {
-        let mut attempts = 0;
-        let max_attempts = 50;
-        let mut requests = 0;
-
-        loop {
-            let Some(()) = refresh_rx.recv().await else {
-                return;
-            };
-
-            'request: loop {
-                requests += 1;
-                if attempts > max_attempts {
-                    log::error!(
-                        "Failed to pull workspace diagnostics {max_attempts} times, aborting"
-                    );
-                    return;
-                }
-                let backoff_millis = (50 * (1 << attempts)).clamp(30, 1000);
-                cx.background_executor()
-                    .timer(Duration::from_millis(backoff_millis))
-                    .await;
-                attempts += 1;
-
-                let Ok(previous_result_ids) = lsp_store.update(cx, |lsp_store, _| {
-                    lsp_store
-                        .result_ids_for_workspace_refresh(server.server_id(), &registration_id_shared)
-                        .into_iter()
-                        .filter_map(|(abs_path, result_id)| {
-                            let uri = file_path_to_lsp_url(&abs_path).ok()?;
-                            Some(lsp::PreviousResultId {
-                                uri,
-                                value: result_id.to_string(),
-                            })
-                        })
-                        .collect()
-                }) else {
-                    return;
-                };
-
-                let token = if let Some(registration_id) = &registration_id {
-                    format!(
-                        "workspace/diagnostic/{}/{requests}/{WORKSPACE_DIAGNOSTICS_TOKEN_START}{registration_id}",
-                        server.server_id(),
-                    )
-                } else {
-                    format!("workspace/diagnostic/{}/{requests}", server.server_id())
-                };
-
-                progress_rx.try_recv().ok();
-                let timer =
-                    LanguageServer::default_request_timer(cx.background_executor().clone()).fuse();
-                let progress = pin!(progress_rx.recv().fuse());
-                let response_result = server
-                    .request_with_timer::<lsp::WorkspaceDiagnosticRequest, _>(
-                        lsp::WorkspaceDiagnosticParams {
-                            previous_result_ids,
-                            identifier: identifier.clone(),
-                            work_done_progress_params: Default::default(),
-                            partial_result_params: lsp::PartialResultParams {
-                                partial_result_token: Some(lsp::ProgressToken::String(token)),
-                            },
-                        },
-                        select(timer, progress).then(|either| match either {
-                            Either::Left((message, ..)) => ready(message).left_future(),
-                            Either::Right(..) => pending::<String>().right_future(),
-                        }),
-                    )
-                    .await;
-
-                // https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#diagnostic_refresh
-                // >  If a server closes a workspace diagnostic pull request the client should re-trigger the request.
-                match response_result {
-                    ConnectionResult::Timeout => {
-                        log::error!("Timeout during workspace diagnostics pull");
-                        continue 'request;
-                    }
-                    ConnectionResult::ConnectionReset => {
-                        log::error!("Server closed a workspace diagnostics pull request");
-                        continue 'request;
-                    }
-                    ConnectionResult::Result(Err(e)) => {
-                        log::error!("Error during workspace diagnostics pull: {e:#}");
-                        break 'request;
-                    }
-                    ConnectionResult::Result(Ok(pulled_diagnostics)) => {
-                        attempts = 0;
-                        if lsp_store
-                            .update(cx, |lsp_store, cx| {
-                                lsp_store.apply_workspace_diagnostic_report(
-                                    server.server_id(),
-                                    pulled_diagnostics,
-                                    registration_id_shared.clone(),
-                                    cx,
-                                )
-                            })
-                            .is_err()
-                        {
-                            return;
-                        }
-                        break 'request;
-                    }
-                }
-            }
-        }
-    });
-
-    Some(WorkspaceRefreshTask {
-        refresh_tx,
-        progress_tx,
-        task: workspace_query_language_server,
-    })
-}
-
-fn buffer_diagnostic_identifier(options: &DiagnosticServerCapabilities) -> Option<String> {
-    match &options {
-        lsp::DiagnosticServerCapabilities::Options(diagnostic_options) => {
-            diagnostic_options.identifier.clone()
-        }
-        lsp::DiagnosticServerCapabilities::RegistrationOptions(registration_options) => {
-            let diagnostic_options = &registration_options.diagnostic_options;
-            diagnostic_options.identifier.clone()
-        }
-    }
-}
-
-fn workspace_diagnostic_identifier(
-    options: &DiagnosticServerCapabilities,
-) -> Option<Option<String>> {
-    match &options {
-        lsp::DiagnosticServerCapabilities::Options(diagnostic_options) => {
-            if !diagnostic_options.workspace_diagnostics {
-                return None;
-            }
-            Some(diagnostic_options.identifier.clone())
-        }
-        lsp::DiagnosticServerCapabilities::RegistrationOptions(registration_options) => {
-            let diagnostic_options = &registration_options.diagnostic_options;
-            if !diagnostic_options.workspace_diagnostics {
-                return None;
-            }
-            Some(diagnostic_options.identifier.clone())
-        }
-    }
-}
-
-fn resolve_word_completion(snapshot: &BufferSnapshot, completion: &mut Completion) {
-    let CompletionSource::BufferWord {
-        word_range,
-        resolved,
-    } = &mut completion.source
-    else {
-        return;
-    };
-    if *resolved {
-        return;
-    }
-
-    if completion.new_text
-        != snapshot
-            .text_for_range(word_range.clone())
-            .collect::<String>()
-    {
-        return;
-    }
-
-    let mut offset = 0;
-    for chunk in snapshot.chunks(word_range.clone(), true) {
-        let end_offset = offset + chunk.text.len();
-        if let Some(highlight_id) = chunk.syntax_highlight_id {
-            completion
-                .label
-                .runs
-                .push((offset..end_offset, highlight_id));
-        }
-        offset = end_offset;
-    }
-    *resolved = true;
-}
-
-impl EventEmitter<LspStoreEvent> for LspStore {}
-
-fn remove_empty_hover_blocks(mut hover: Hover) -> Option<Hover> {
-    hover
-        .contents
-        .retain(|hover_block| !hover_block.text.trim().is_empty());
-    if hover.contents.is_empty() {
-        None
-    } else {
-        Some(hover)
-    }
-}
-
-async fn populate_labels_for_completions(
-    new_completions: Vec<CoreCompletion>,
-    language: Option<Arc<Language>>,
-    lsp_adapter: Option<Arc<CachedLspAdapter>>,
-) -> Vec<Completion> {
-    let lsp_completions = new_completions
-        .iter()
-        .filter_map(|new_completion| {
-            new_completion
-                .source
-                .lsp_completion(true)
-                .map(|lsp_completion| lsp_completion.into_owned())
-        })
-        .collect::<Vec<_>>();
-
-    let mut labels = if let Some((language, lsp_adapter)) = language.as_ref().zip(lsp_adapter) {
-        lsp_adapter
-            .labels_for_completions(&lsp_completions, language)
-            .await
-            .log_err()
-            .unwrap_or_default()
-    } else {
-        Vec::new()
-    }
-    .into_iter()
-    .fuse();
-
-    let mut completions = Vec::new();
-    for completion in new_completions {
-        match completion.source.lsp_completion(true) {
-            Some(lsp_completion) => {
-                let documentation = lsp_completion.documentation.clone().map(|docs| docs.into());
-
-                let mut label = labels.next().flatten().unwrap_or_else(|| {
-                    CodeLabel::fallback_for_completion(&lsp_completion, language.as_deref())
-                });
-                ensure_uniform_list_compatible_label(&mut label);
-                completions.push(Completion {
-                    label,
-                    documentation,
-                    replace_range: completion.replace_range,
-                    new_text: completion.new_text,
-                    insert_text_mode: lsp_completion.insert_text_mode,
-                    source: completion.source,
-                    icon_path: None,
-                    confirm: None,
-                    match_start: None,
-                    snippet_deduplication_key: None,
-                });
-            }
-            None => {
-                let mut label = CodeLabel::plain(completion.new_text.clone(), None);
-                ensure_uniform_list_compatible_label(&mut label);
-                completions.push(Completion {
-                    label,
-                    documentation: None,
-                    replace_range: completion.replace_range,
-                    new_text: completion.new_text,
-                    source: completion.source,
-                    insert_text_mode: None,
-                    icon_path: None,
-                    confirm: None,
-                    match_start: None,
-                    snippet_deduplication_key: None,
-                });
-            }
-        }
-    }
-    completions
-}
-
-#[derive(Debug)]
-pub enum LanguageServerToQuery {
-    /// Query language servers in order of users preference, up until one capable of handling the request is found.
-    FirstCapable,
-    /// Query a specific language server.
-    Other(LanguageServerId),
-}
-
-#[derive(Default)]
-struct RenamePathsWatchedForServer {
-    did_rename: Vec<RenameActionPredicate>,
-    will_rename: Vec<RenameActionPredicate>,
-}
-
-impl RenamePathsWatchedForServer {
-    fn with_did_rename_patterns(
-        mut self,
-        did_rename: Option<&FileOperationRegistrationOptions>,
-    ) -> Self {
-        if let Some(did_rename) = did_rename {
-            self.did_rename = did_rename
-                .filters
-                .iter()
-                .filter_map(|filter| filter.try_into().log_err())
-                .collect();
-        }
-        self
-    }
-    fn with_will_rename_patterns(
-        mut self,
-        will_rename: Option<&FileOperationRegistrationOptions>,
-    ) -> Self {
-        if let Some(will_rename) = will_rename {
-            self.will_rename = will_rename
-                .filters
-                .iter()
-                .filter_map(|filter| filter.try_into().log_err())
-                .collect();
-        }
-        self
-    }
-
-    fn should_send_did_rename(&self, path: &str, is_dir: bool) -> bool {
-        self.did_rename.iter().any(|pred| pred.eval(path, is_dir))
-    }
-    fn should_send_will_rename(&self, path: &str, is_dir: bool) -> bool {
-        self.will_rename.iter().any(|pred| pred.eval(path, is_dir))
-    }
-}
-
-impl TryFrom<&FileOperationFilter> for RenameActionPredicate {
-    type Error = globset::Error;
-    fn try_from(ops: &FileOperationFilter) -> Result<Self, globset::Error> {
-        Ok(Self {
-            kind: ops.pattern.matches.clone(),
-            glob: GlobBuilder::new(&ops.pattern.glob)
-                .case_insensitive(
-                    ops.pattern
-                        .options
-                        .as_ref()
-                        .is_some_and(|ops| ops.ignore_case.unwrap_or(false)),
-                )
-                .build()?
-                .compile_matcher(),
-        })
-    }
-}
-struct RenameActionPredicate {
-    glob: GlobMatcher,
-    kind: Option<FileOperationPatternKind>,
-}
-
-impl RenameActionPredicate {
-    // Returns true if language server should be notified
-    fn eval(&self, path: &str, is_dir: bool) -> bool {
-        self.kind.as_ref().is_none_or(|kind| {
-            let expected_kind = if is_dir {
-                FileOperationPatternKind::Folder
-            } else {
-                FileOperationPatternKind::File
-            };
-            kind == &expected_kind
-        }) && self.glob.is_match(path)
-    }
-}
-
-#[derive(Default)]
-struct LanguageServerWatchedPaths {
-    worktree_paths: HashMap<WorktreeId, GlobSet>,
-    abs_paths: HashMap<Arc<Path>, (GlobSet, Task<()>)>,
-}
-
-#[derive(Default)]
-struct LanguageServerWatchedPathsBuilder {
-    worktree_paths: HashMap<WorktreeId, GlobSet>,
-    abs_paths: HashMap<Arc<Path>, GlobSet>,
-}
-
-impl LanguageServerWatchedPathsBuilder {
-    fn watch_worktree(&mut self, worktree_id: WorktreeId, glob_set: GlobSet) {
-        self.worktree_paths.insert(worktree_id, glob_set);
-    }
-    fn watch_abs_path(&mut self, path: Arc<Path>, glob_set: GlobSet) {
-        self.abs_paths.insert(path, glob_set);
-    }
-    fn build(
-        self,
-        fs: Arc<dyn Fs>,
-        language_server_id: LanguageServerId,
-        cx: &mut Context<LspStore>,
-    ) -> LanguageServerWatchedPaths {
-        let lsp_store = cx.weak_entity();
-
-        const LSP_ABS_PATH_OBSERVE: Duration = Duration::from_millis(100);
-        let abs_paths = self
-            .abs_paths
-            .into_iter()
-            .map(|(abs_path, globset)| {
-                let task = cx.spawn({
-                    let abs_path = abs_path.clone();
-                    let fs = fs.clone();
-
-                    let lsp_store = lsp_store.clone();
-                    async move |_, cx| {
-                        maybe!(async move {
-                            let mut push_updates = fs.watch(&abs_path, LSP_ABS_PATH_OBSERVE).await;
-                            while let Some(update) = push_updates.0.next().await {
-                                let action = lsp_store
-                                    .update(cx, |this, _| {
-                                        let Some(local) = this.as_local() else {
-                                            return ControlFlow::Break(());
-                                        };
-                                        let Some(watcher) = local
-                                            .language_server_watched_paths
-                                            .get(&language_server_id)
-                                        else {
-                                            return ControlFlow::Break(());
-                                        };
-                                        let (globs, _) = watcher.abs_paths.get(&abs_path).expect(
-                                            "Watched abs path is not registered with a watcher",
-                                        );
-                                        let matching_entries = update
-                                            .into_iter()
-                                            .filter(|event| globs.is_match(&event.path))
-                                            .collect::<Vec<_>>();
-                                        this.lsp_notify_abs_paths_changed(
-                                            language_server_id,
-                                            matching_entries,
-                                        );
-                                        ControlFlow::Continue(())
-                                    })
-                                    .ok()?;
-
-                                if action.is_break() {
-                                    break;
-                                }
-                            }
-                            Some(())
-                        })
-                        .await;
-                    }
-                });
-                (abs_path, (globset, task))
-            })
-            .collect();
-        LanguageServerWatchedPaths {
-            worktree_paths: self.worktree_paths,
-            abs_paths,
-        }
-    }
-}
-
-struct LspBufferSnapshot {
-    version: i32,
-    snapshot: TextBufferSnapshot,
-}
-
-/// A prompt requested by LSP server.
-#[derive(Clone, Debug)]
-pub struct LanguageServerPromptRequest {
-    pub level: PromptLevel,
-    pub message: String,
-    pub actions: Vec<MessageActionItem>,
-    pub lsp_name: String,
-    pub(crate) response_channel: Sender<MessageActionItem>,
-}
-
-impl LanguageServerPromptRequest {
-    pub async fn respond(self, index: usize) -> Option<()> {
-        if let Some(response) = self.actions.into_iter().nth(index) {
-            self.response_channel.send(response).await.ok()
-        } else {
-            None
-        }
-    }
-}
-impl PartialEq for LanguageServerPromptRequest {
-    fn eq(&self, other: &Self) -> bool {
-        self.message == other.message && self.actions == other.actions
-    }
-}
-
-#[derive(Clone, Debug, PartialEq)]
-pub enum LanguageServerLogType {
-    Log(MessageType),
-    Trace { verbose_info: Option<String> },
-    Rpc { received: bool },
-}
-
-impl LanguageServerLogType {
-    pub fn to_proto(&self) -> proto::language_server_log::LogType {
-        match self {
-            Self::Log(log_type) => {
-                use proto::log_message::LogLevel;
-                let level = match *log_type {
-                    MessageType::ERROR => LogLevel::Error,
-                    MessageType::WARNING => LogLevel::Warning,
-                    MessageType::INFO => LogLevel::Info,
-                    MessageType::LOG => LogLevel::Log,
-                    other => {
-                        log::warn!("Unknown lsp log message type: {other:?}");
-                        LogLevel::Log
-                    }
-                };
-                proto::language_server_log::LogType::Log(proto::LogMessage {
-                    level: level as i32,
-                })
-            }
-            Self::Trace { verbose_info } => {
-                proto::language_server_log::LogType::Trace(proto::TraceMessage {
-                    verbose_info: verbose_info.to_owned(),
-                })
-            }
-            Self::Rpc { received } => {
-                let kind = if *received {
-                    proto::rpc_message::Kind::Received
-                } else {
-                    proto::rpc_message::Kind::Sent
-                };
-                let kind = kind as i32;
-                proto::language_server_log::LogType::Rpc(proto::RpcMessage { kind })
-            }
-        }
-    }
-
-    pub fn from_proto(log_type: proto::language_server_log::LogType) -> Self {
-        use proto::log_message::LogLevel;
-        use proto::rpc_message;
-        match log_type {
-            proto::language_server_log::LogType::Log(message_type) => Self::Log(
-                match LogLevel::from_i32(message_type.level).unwrap_or(LogLevel::Log) {
-                    LogLevel::Error => MessageType::ERROR,
-                    LogLevel::Warning => MessageType::WARNING,
-                    LogLevel::Info => MessageType::INFO,
-                    LogLevel::Log => MessageType::LOG,
-                },
-            ),
-            proto::language_server_log::LogType::Trace(trace_message) => Self::Trace {
-                verbose_info: trace_message.verbose_info,
-            },
-            proto::language_server_log::LogType::Rpc(message) => Self::Rpc {
-                received: match rpc_message::Kind::from_i32(message.kind)
-                    .unwrap_or(rpc_message::Kind::Received)
-                {
-                    rpc_message::Kind::Received => true,
-                    rpc_message::Kind::Sent => false,
-                },
-            },
-        }
-    }
-}
-
-pub struct WorkspaceRefreshTask {
-    refresh_tx: mpsc::Sender<()>,
-    progress_tx: mpsc::Sender<()>,
-    #[allow(dead_code)]
-    task: Task<()>,
-}
-
-pub enum LanguageServerState {
-    Starting {
-        startup: Task<Option<Arc<LanguageServer>>>,
-        /// List of language servers that will be added to the workspace once it's initialization completes.
-        pending_workspace_folders: Arc<Mutex<BTreeSet<Uri>>>,
-    },
-
-    Running {
-        adapter: Arc<CachedLspAdapter>,
-        server: Arc<LanguageServer>,
-        simulate_disk_based_diagnostics_completion: Option<Task<()>>,
-        workspace_diagnostics_refresh_tasks: HashMap<Option<String>, WorkspaceRefreshTask>,
-    },
-}
-
-impl LanguageServerState {
-    fn add_workspace_folder(&self, uri: Uri) {
-        match self {
-            LanguageServerState::Starting {
-                pending_workspace_folders,
-                ..
-            } => {
-                pending_workspace_folders.lock().insert(uri);
-            }
-            LanguageServerState::Running { server, .. } => {
-                server.add_workspace_folder(uri);
-            }
-        }
-    }
-    fn _remove_workspace_folder(&self, uri: Uri) {
-        match self {
-            LanguageServerState::Starting {
-                pending_workspace_folders,
-                ..
-            } => {
-                pending_workspace_folders.lock().remove(&uri);
-            }
-            LanguageServerState::Running { server, .. } => server.remove_workspace_folder(uri),
-        }
-    }
-}
-
-impl std::fmt::Debug for LanguageServerState {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            LanguageServerState::Starting { .. } => {
-                f.debug_struct("LanguageServerState::Starting").finish()
-            }
-            LanguageServerState::Running { .. } => {
-                f.debug_struct("LanguageServerState::Running").finish()
-            }
-        }
-    }
-}
-
-#[derive(Clone, Debug, Serialize)]
-pub struct LanguageServerProgress {
-    pub is_disk_based_diagnostics_progress: bool,
-    pub is_cancellable: bool,
-    pub title: Option<String>,
-    pub message: Option<String>,
-    pub percentage: Option<usize>,
-    #[serde(skip_serializing)]
-    pub last_update_at: Instant,
-}
-
-#[derive(Copy, Clone, Debug, Default, PartialEq, Serialize)]
-pub struct DiagnosticSummary {
-    pub error_count: usize,
-    pub warning_count: usize,
-}
-
-impl DiagnosticSummary {
-    pub fn new<'a, T: 'a>(diagnostics: impl IntoIterator<Item = &'a DiagnosticEntry<T>>) -> Self {
-        let mut this = Self {
-            error_count: 0,
-            warning_count: 0,
-        };
-
-        for entry in diagnostics {
-            if entry.diagnostic.is_primary {
-                match entry.diagnostic.severity {
-                    DiagnosticSeverity::ERROR => this.error_count += 1,
-                    DiagnosticSeverity::WARNING => this.warning_count += 1,
-                    _ => {}
-                }
-            }
-        }
-
-        this
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.error_count == 0 && self.warning_count == 0
-    }
-
-    pub fn to_proto(
-        self,
-        language_server_id: LanguageServerId,
-        path: &RelPath,
-    ) -> proto::DiagnosticSummary {
-        proto::DiagnosticSummary {
-            path: path.to_proto(),
-            language_server_id: language_server_id.0 as u64,
-            error_count: self.error_count as u32,
-            warning_count: self.warning_count as u32,
-        }
-    }
-}
-
-#[derive(Clone, Debug)]
-pub enum CompletionDocumentation {
-    /// There is no documentation for this completion.
-    Undocumented,
-    /// A single line of documentation.
-    SingleLine(SharedString),
-    /// Multiple lines of plain text documentation.
-    MultiLinePlainText(SharedString),
-    /// Markdown documentation.
-    MultiLineMarkdown(SharedString),
-    /// Both single line and multiple lines of plain text documentation.
-    SingleLineAndMultiLinePlainText {
-        single_line: SharedString,
-        plain_text: Option<SharedString>,
-    },
-}
-
-impl CompletionDocumentation {
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn text(&self) -> SharedString {
-        match self {
-            CompletionDocumentation::Undocumented => "".into(),
-            CompletionDocumentation::SingleLine(s) => s.clone(),
-            CompletionDocumentation::MultiLinePlainText(s) => s.clone(),
-            CompletionDocumentation::MultiLineMarkdown(s) => s.clone(),
-            CompletionDocumentation::SingleLineAndMultiLinePlainText { single_line, .. } => {
-                single_line.clone()
-            }
-        }
-    }
-}
-
-impl From<lsp::Documentation> for CompletionDocumentation {
-    fn from(docs: lsp::Documentation) -> Self {
-        match docs {
-            lsp::Documentation::String(text) => {
-                if text.lines().count() <= 1 {
-                    CompletionDocumentation::SingleLine(text.into())
-                } else {
-                    CompletionDocumentation::MultiLinePlainText(text.into())
-                }
-            }
-
-            lsp::Documentation::MarkupContent(lsp::MarkupContent { kind, value }) => match kind {
-                lsp::MarkupKind::PlainText => {
-                    if value.lines().count() <= 1 {
-                        CompletionDocumentation::SingleLine(value.into())
-                    } else {
-                        CompletionDocumentation::MultiLinePlainText(value.into())
-                    }
-                }
-
-                lsp::MarkupKind::Markdown => {
-                    CompletionDocumentation::MultiLineMarkdown(value.into())
-                }
-            },
-        }
-    }
-}
-
-pub enum ResolvedHint {
-    Resolved(InlayHint),
-    Resolving(Shared<Task<()>>),
-}
-
-fn glob_literal_prefix(glob: &Path) -> PathBuf {
-    glob.components()
-        .take_while(|component| match component {
-            path::Component::Normal(part) => !part.to_string_lossy().contains(['*', '?', '{', '}']),
-            _ => true,
-        })
-        .collect()
-}
-
-pub struct SshLspAdapter {
-    name: LanguageServerName,
-    binary: LanguageServerBinary,
-    initialization_options: Option<String>,
-    code_action_kinds: Option<Vec<CodeActionKind>>,
-}
-
-impl SshLspAdapter {
-    pub fn new(
-        name: LanguageServerName,
-        binary: LanguageServerBinary,
-        initialization_options: Option<String>,
-        code_action_kinds: Option<String>,
-    ) -> Self {
-        Self {
-            name,
-            binary,
-            initialization_options,
-            code_action_kinds: code_action_kinds
-                .as_ref()
-                .and_then(|c| serde_json::from_str(c).ok()),
-        }
-    }
-}
-
-impl LspInstaller for SshLspAdapter {
-    type BinaryVersion = ();
-    async fn check_if_user_installed(
-        &self,
-        _: &dyn LspAdapterDelegate,
-        _: Option<Toolchain>,
-        _: &AsyncApp,
-    ) -> Option<LanguageServerBinary> {
-        Some(self.binary.clone())
-    }
-
-    async fn cached_server_binary(
-        &self,
-        _: PathBuf,
-        _: &dyn LspAdapterDelegate,
-    ) -> Option<LanguageServerBinary> {
-        None
-    }
-
-    async fn fetch_latest_server_version(
-        &self,
-        _: &dyn LspAdapterDelegate,
-        _: bool,
-        _: &mut AsyncApp,
-    ) -> Result<()> {
-        anyhow::bail!("SshLspAdapter does not support fetch_latest_server_version")
-    }
-
-    async fn fetch_server_binary(
-        &self,
-        _: (),
-        _: PathBuf,
-        _: &dyn LspAdapterDelegate,
-    ) -> Result<LanguageServerBinary> {
-        anyhow::bail!("SshLspAdapter does not support fetch_server_binary")
-    }
-}
-
-#[async_trait(?Send)]
-impl LspAdapter for SshLspAdapter {
-    fn name(&self) -> LanguageServerName {
-        self.name.clone()
-    }
-
-    async fn initialization_options(
-        self: Arc<Self>,
-        _: &Arc<dyn LspAdapterDelegate>,
-    ) -> Result<Option<serde_json::Value>> {
-        let Some(options) = &self.initialization_options else {
-            return Ok(None);
-        };
-        let result = serde_json::from_str(options)?;
-        Ok(result)
-    }
-
-    fn code_action_kinds(&self) -> Option<Vec<CodeActionKind>> {
-        self.code_action_kinds.clone()
-    }
-}
-
-pub fn language_server_settings<'a>(
-    delegate: &'a dyn LspAdapterDelegate,
-    language: &LanguageServerName,
-    cx: &'a App,
-) -> Option<&'a LspSettings> {
-    language_server_settings_for(
-        SettingsLocation {
-            worktree_id: delegate.worktree_id(),
-            path: RelPath::empty(),
-        },
-        language,
-        cx,
-    )
-}
-
-pub fn language_server_settings_for<'a>(
-    location: SettingsLocation<'a>,
-    language: &LanguageServerName,
-    cx: &'a App,
-) -> Option<&'a LspSettings> {
-    ProjectSettings::get(Some(location), cx).lsp.get(language)
-}
-
-pub struct LocalLspAdapterDelegate {
-    lsp_store: WeakEntity<LspStore>,
-    worktree: worktree::Snapshot,
-    fs: Arc<dyn Fs>,
-    http_client: Arc<dyn HttpClient>,
-    language_registry: Arc<LanguageRegistry>,
-    load_shell_env_task: Shared<Task<Option<HashMap<String, String>>>>,
-}
-
-impl LocalLspAdapterDelegate {
-    pub fn new(
-        language_registry: Arc<LanguageRegistry>,
-        environment: &Entity<ProjectEnvironment>,
-        lsp_store: WeakEntity<LspStore>,
-        worktree: &Entity<Worktree>,
-        http_client: Arc<dyn HttpClient>,
-        fs: Arc<dyn Fs>,
-        cx: &mut App,
-    ) -> Arc<Self> {
-        let load_shell_env_task =
-            environment.update(cx, |env, cx| env.worktree_environment(worktree.clone(), cx));
-
-        Arc::new(Self {
-            lsp_store,
-            worktree: worktree.read(cx).snapshot(),
-            fs,
-            http_client,
-            language_registry,
-            load_shell_env_task,
-        })
-    }
-
-    fn from_local_lsp(
-        local: &LocalLspStore,
-        worktree: &Entity<Worktree>,
-        cx: &mut App,
-    ) -> Arc<Self> {
-        Self::new(
-            local.languages.clone(),
-            &local.environment,
-            local.weak.clone(),
-            worktree,
-            local.http_client.clone(),
-            local.fs.clone(),
-            cx,
-        )
-    }
-}
-
-#[async_trait]
-impl LspAdapterDelegate for LocalLspAdapterDelegate {
-    fn show_notification(&self, message: &str, cx: &mut App) {
-        self.lsp_store
-            .update(cx, |_, cx| {
-                cx.emit(LspStoreEvent::Notification(message.to_owned()))
-            })
-            .ok();
-    }
-
-    fn http_client(&self) -> Arc<dyn HttpClient> {
-        self.http_client.clone()
-    }
-
-    fn worktree_id(&self) -> WorktreeId {
-        self.worktree.id()
-    }
-
-    fn worktree_root_path(&self) -> &Path {
-        self.worktree.abs_path().as_ref()
-    }
-
-    fn resolve_executable_path(&self, path: PathBuf) -> PathBuf {
-        self.worktree.resolve_executable_path(path)
-    }
-
-    async fn shell_env(&self) -> HashMap<String, String> {
-        let task = self.load_shell_env_task.clone();
-        task.await.unwrap_or_default()
-    }
-
-    async fn npm_package_installed_version(
-        &self,
-        package_name: &str,
-    ) -> Result<Option<(PathBuf, String)>> {
-        let local_package_directory = self.worktree_root_path();
-        let node_modules_directory = local_package_directory.join("node_modules");
-
-        if let Some(version) =
-            read_package_installed_version(node_modules_directory.clone(), package_name).await?
-        {
-            return Ok(Some((node_modules_directory, version)));
-        }
-        let Some(npm) = self.which("npm".as_ref()).await else {
-            log::warn!(
-                "Failed to find npm executable for {:?}",
-                local_package_directory
-            );
-            return Ok(None);
-        };
-
-        let env = self.shell_env().await;
-        let output = util::command::new_smol_command(&npm)
-            .args(["root", "-g"])
-            .envs(env)
-            .current_dir(local_package_directory)
-            .output()
-            .await?;
-        let global_node_modules =
-            PathBuf::from(String::from_utf8_lossy(&output.stdout).to_string());
-
-        if let Some(version) =
-            read_package_installed_version(global_node_modules.clone(), package_name).await?
-        {
-            return Ok(Some((global_node_modules, version)));
-        }
-        return Ok(None);
-    }
-
-    async fn which(&self, command: &OsStr) -> Option<PathBuf> {
-        let mut worktree_abs_path = self.worktree_root_path().to_path_buf();
-        if self.fs.is_file(&worktree_abs_path).await {
-            worktree_abs_path.pop();
-        }
-
-        let env = self.shell_env().await;
-
-        let shell_path = env.get("PATH").cloned();
-
-        which::which_in(command, shell_path.as_ref(), worktree_abs_path).ok()
-    }
-
-    async fn try_exec(&self, command: LanguageServerBinary) -> Result<()> {
-        let mut working_dir = self.worktree_root_path().to_path_buf();
-        if self.fs.is_file(&working_dir).await {
-            working_dir.pop();
-        }
-        let output = util::command::new_smol_command(&command.path)
-            .args(command.arguments)
-            .envs(command.env.clone().unwrap_or_default())
-            .current_dir(working_dir)
-            .output()
-            .await?;
-
-        anyhow::ensure!(
-            output.status.success(),
-            "{}, stdout: {:?}, stderr: {:?}",
-            output.status,
-            String::from_utf8_lossy(&output.stdout),
-            String::from_utf8_lossy(&output.stderr)
-        );
-        Ok(())
-    }
-
-    fn update_status(&self, server_name: LanguageServerName, status: language::BinaryStatus) {
-        self.language_registry
-            .update_lsp_binary_status(server_name, status);
-    }
-
-    fn registered_lsp_adapters(&self) -> Vec<Arc<dyn LspAdapter>> {
-        self.language_registry
-            .all_lsp_adapters()
-            .into_iter()
-            .map(|adapter| adapter.adapter.clone() as Arc<dyn LspAdapter>)
-            .collect()
-    }
-
-    async fn language_server_download_dir(&self, name: &LanguageServerName) -> Option<Arc<Path>> {
-        let dir = self.language_registry.language_server_download_dir(name)?;
-
-        if !dir.exists() {
-            smol::fs::create_dir_all(&dir)
-                .await
-                .context("failed to create container directory")
-                .log_err()?;
-        }
-
-        Some(dir)
-    }
-
-    async fn read_text_file(&self, path: &RelPath) -> Result<String> {
-        let entry = self
-            .worktree
-            .entry_for_path(path)
-            .with_context(|| format!("no worktree entry for path {path:?}"))?;
-        let abs_path = self.worktree.absolutize(&entry.path);
-        self.fs.load(&abs_path).await
-    }
-}
-
-async fn populate_labels_for_symbols(
-    symbols: Vec<CoreSymbol>,
-    language_registry: &Arc<LanguageRegistry>,
-    lsp_adapter: Option<Arc<CachedLspAdapter>>,
-    output: &mut Vec<Symbol>,
-) {
-    #[allow(clippy::mutable_key_type)]
-    let mut symbols_by_language = HashMap::<Option<Arc<Language>>, Vec<CoreSymbol>>::default();
-
-    let mut unknown_paths = BTreeSet::<Arc<str>>::new();
-    for symbol in symbols {
-        let Some(file_name) = symbol.path.file_name() else {
-            continue;
-        };
-        let language = language_registry
-            .load_language_for_file_path(Path::new(file_name))
-            .await
-            .ok()
-            .or_else(|| {
-                unknown_paths.insert(file_name.into());
-                None
-            });
-        symbols_by_language
-            .entry(language)
-            .or_default()
-            .push(symbol);
-    }
-
-    for unknown_path in unknown_paths {
-        log::info!("no language found for symbol in file {unknown_path:?}");
-    }
-
-    let mut label_params = Vec::new();
-    for (language, mut symbols) in symbols_by_language {
-        label_params.clear();
-        label_params.extend(
-            symbols
-                .iter_mut()
-                .map(|symbol| (mem::take(&mut symbol.name), symbol.kind)),
-        );
-
-        let mut labels = Vec::new();
-        if let Some(language) = language {
-            let lsp_adapter = lsp_adapter.clone().or_else(|| {
-                language_registry
-                    .lsp_adapters(&language.name())
-                    .first()
-                    .cloned()
-            });
-            if let Some(lsp_adapter) = lsp_adapter {
-                labels = lsp_adapter
-                    .labels_for_symbols(&label_params, &language)
-                    .await
-                    .log_err()
-                    .unwrap_or_default();
-            }
-        }
-
-        for ((symbol, (name, _)), label) in symbols
-            .into_iter()
-            .zip(label_params.drain(..))
-            .zip(labels.into_iter().chain(iter::repeat(None)))
-        {
-            output.push(Symbol {
-                language_server_name: symbol.language_server_name,
-                source_worktree_id: symbol.source_worktree_id,
-                source_language_server_id: symbol.source_language_server_id,
-                path: symbol.path,
-                label: label.unwrap_or_else(|| CodeLabel::plain(name.clone(), None)),
-                name,
-                kind: symbol.kind,
-                range: symbol.range,
-            });
-        }
-    }
-}
-
-fn include_text(server: &lsp::LanguageServer) -> Option<bool> {
-    match server.capabilities().text_document_sync.as_ref()? {
-        lsp::TextDocumentSyncCapability::Options(opts) => match opts.save.as_ref()? {
-            // Server wants didSave but didn't specify includeText.
-            lsp::TextDocumentSyncSaveOptions::Supported(true) => Some(false),
-            // Server doesn't want didSave at all.
-            lsp::TextDocumentSyncSaveOptions::Supported(false) => None,
-            // Server provided SaveOptions.
-            lsp::TextDocumentSyncSaveOptions::SaveOptions(save_options) => {
-                Some(save_options.include_text.unwrap_or(false))
-            }
-        },
-        // We do not have any save info. Kind affects didChange only.
-        lsp::TextDocumentSyncCapability::Kind(_) => None,
-    }
-}
-
-/// Completion items are displayed in a `UniformList`.
-/// Usually, those items are single-line strings, but in LSP responses,
-/// completion items `label`, `detail` and `label_details.description` may contain newlines or long spaces.
-/// Many language plugins construct these items by joining these parts together, and we may use `CodeLabel::fallback_for_completion` that uses `label` at least.
-/// All that may lead to a newline being inserted into resulting `CodeLabel.text`, which will force `UniformList` to bloat each entry to occupy more space,
-/// breaking the completions menu presentation.
-///
-/// Sanitize the text to ensure there are no newlines, or, if there are some, remove them and also remove long space sequences if there were newlines.
-fn ensure_uniform_list_compatible_label(label: &mut CodeLabel) {
-    let mut new_text = String::with_capacity(label.text.len());
-    let mut offset_map = vec![0; label.text.len() + 1];
-    let mut last_char_was_space = false;
-    let mut new_idx = 0;
-    let chars = label.text.char_indices().fuse();
-    let mut newlines_removed = false;
-
-    for (idx, c) in chars {
-        offset_map[idx] = new_idx;
-
-        match c {
-            '\n' if last_char_was_space => {
-                newlines_removed = true;
-            }
-            '\t' | ' ' if last_char_was_space => {}
-            '\n' if !last_char_was_space => {
-                new_text.push(' ');
-                new_idx += 1;
-                last_char_was_space = true;
-                newlines_removed = true;
-            }
-            ' ' | '\t' => {
-                new_text.push(' ');
-                new_idx += 1;
-                last_char_was_space = true;
-            }
-            _ => {
-                new_text.push(c);
-                new_idx += c.len_utf8();
-                last_char_was_space = false;
-            }
-        }
-    }
-    offset_map[label.text.len()] = new_idx;
-
-    // Only modify the label if newlines were removed.
-    if !newlines_removed {
-        return;
-    }
-
-    let last_index = new_idx;
-    let mut run_ranges_errors = Vec::new();
-    label.runs.retain_mut(|(range, _)| {
-        match offset_map.get(range.start) {
-            Some(&start) => range.start = start,
-            None => {
-                run_ranges_errors.push(range.clone());
-                return false;
-            }
-        }
-
-        match offset_map.get(range.end) {
-            Some(&end) => range.end = end,
-            None => {
-                run_ranges_errors.push(range.clone());
-                range.end = last_index;
-            }
-        }
-        true
-    });
-    if !run_ranges_errors.is_empty() {
-        log::error!(
-            "Completion label has errors in its run ranges: {run_ranges_errors:?}, label text: {}",
-            label.text
-        );
-    }
-
-    let mut wrong_filter_range = None;
-    if label.filter_range == (0..label.text.len()) {
-        label.filter_range = 0..new_text.len();
-    } else {
-        let mut original_filter_range = Some(label.filter_range.clone());
-        match offset_map.get(label.filter_range.start) {
-            Some(&start) => label.filter_range.start = start,
-            None => {
-                wrong_filter_range = original_filter_range.take();
-                label.filter_range.start = last_index;
-            }
-        }
-
-        match offset_map.get(label.filter_range.end) {
-            Some(&end) => label.filter_range.end = end,
-            None => {
-                wrong_filter_range = original_filter_range.take();
-                label.filter_range.end = last_index;
-            }
-        }
-    }
-    if let Some(wrong_filter_range) = wrong_filter_range {
-        log::error!(
-            "Completion label has an invalid filter range: {wrong_filter_range:?}, label text: {}",
-            label.text
-        );
-    }
-
-    label.text = new_text;
-}
-
-#[cfg(test)]
-mod tests {
-    use language::HighlightId;
-
-    use super::*;
-
-    #[test]
-    fn test_glob_literal_prefix() {
-        assert_eq!(glob_literal_prefix(Path::new("**/*.js")), Path::new(""));
-        assert_eq!(
-            glob_literal_prefix(Path::new("node_modules/**/*.js")),
-            Path::new("node_modules")
-        );
-        assert_eq!(
-            glob_literal_prefix(Path::new("foo/{bar,baz}.js")),
-            Path::new("foo")
-        );
-        assert_eq!(
-            glob_literal_prefix(Path::new("foo/bar/baz.js")),
-            Path::new("foo/bar/baz.js")
-        );
-
-        #[cfg(target_os = "windows")]
-        {
-            assert_eq!(glob_literal_prefix(Path::new("**\\*.js")), Path::new(""));
-            assert_eq!(
-                glob_literal_prefix(Path::new("node_modules\\**/*.js")),
-                Path::new("node_modules")
-            );
-            assert_eq!(
-                glob_literal_prefix(Path::new("foo/{bar,baz}.js")),
-                Path::new("foo")
-            );
-            assert_eq!(
-                glob_literal_prefix(Path::new("foo\\bar\\baz.js")),
-                Path::new("foo/bar/baz.js")
-            );
-        }
-    }
-
-    #[test]
-    fn test_multi_len_chars_normalization() {
-        let mut label = CodeLabel::new(
-            "myElˇ (parameter) myElˇ: {\n    foo: string;\n}".to_string(),
-            0..6,
-            vec![(0..6, HighlightId(1))],
-        );
-        ensure_uniform_list_compatible_label(&mut label);
-        assert_eq!(
-            label,
-            CodeLabel::new(
-                "myElˇ (parameter) myElˇ: { foo: string; }".to_string(),
-                0..6,
-                vec![(0..6, HighlightId(1))],
-            )
-        );
-    }
-}
diff --git a/crates/project/src/lsp_store/clangd_ext.rs b/crates/project/src/lsp_store/clangd_ext.rs
deleted file mode 100644
index 466d0c6e2a..0000000000
--- a/crates/project/src/lsp_store/clangd_ext.rs
+++ /dev/null
@@ -1,104 +0,0 @@
-use std::{borrow::Cow, sync::Arc};
-
-use ::serde::{Deserialize, Serialize};
-use gpui::WeakEntity;
-use language::{CachedLspAdapter, Diagnostic, DiagnosticSourceKind};
-use lsp::{LanguageServer, LanguageServerName};
-use util::ResultExt as _;
-
-use crate::{LspStore, lsp_store::DocumentDiagnosticsUpdate};
-
-pub const CLANGD_SERVER_NAME: LanguageServerName = LanguageServerName::new_static("clangd");
-const INACTIVE_REGION_MESSAGE: &str = "inactive region";
-const INACTIVE_DIAGNOSTIC_SEVERITY: lsp::DiagnosticSeverity = lsp::DiagnosticSeverity::INFORMATION;
-
-#[derive(Debug, Eq, PartialEq, Clone, Deserialize, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct InactiveRegionsParams {
-    pub text_document: lsp::OptionalVersionedTextDocumentIdentifier,
-    pub regions: Vec<lsp::Range>,
-}
-
-/// InactiveRegions is a clangd extension that marks regions of inactive code.
-pub struct InactiveRegions;
-
-impl lsp::notification::Notification for InactiveRegions {
-    type Params = InactiveRegionsParams;
-    const METHOD: &'static str = "textDocument/inactiveRegions";
-}
-
-pub fn is_inactive_region(diag: &Diagnostic) -> bool {
-    diag.is_unnecessary
-        && diag.severity == INACTIVE_DIAGNOSTIC_SEVERITY
-        && diag.message == INACTIVE_REGION_MESSAGE
-        && diag
-            .source
-            .as_ref()
-            .is_some_and(|v| v == &CLANGD_SERVER_NAME.0)
-}
-
-pub fn is_lsp_inactive_region(diag: &lsp::Diagnostic) -> bool {
-    diag.severity == Some(INACTIVE_DIAGNOSTIC_SEVERITY)
-        && diag.message == INACTIVE_REGION_MESSAGE
-        && diag
-            .source
-            .as_ref()
-            .is_some_and(|v| v == &CLANGD_SERVER_NAME.0)
-}
-
-pub fn register_notifications(
-    lsp_store: WeakEntity<LspStore>,
-    language_server: &LanguageServer,
-    adapter: Arc<CachedLspAdapter>,
-) {
-    if language_server.name() != CLANGD_SERVER_NAME {
-        return;
-    }
-    let server_id = language_server.server_id();
-
-    language_server
-        .on_notification::<InactiveRegions, _>({
-            let adapter = adapter;
-            let this = lsp_store;
-
-            move |params: InactiveRegionsParams, cx| {
-                let adapter = adapter.clone();
-                this.update(cx, |this, cx| {
-                    let diagnostics = params
-                        .regions
-                        .into_iter()
-                        .map(|range| lsp::Diagnostic {
-                            range,
-                            severity: Some(INACTIVE_DIAGNOSTIC_SEVERITY),
-                            source: Some(CLANGD_SERVER_NAME.to_string()),
-                            message: INACTIVE_REGION_MESSAGE.to_string(),
-                            tags: Some(vec![lsp::DiagnosticTag::UNNECESSARY]),
-                            ..lsp::Diagnostic::default()
-                        })
-                        .collect();
-                    let mapped_diagnostics = lsp::PublishDiagnosticsParams {
-                        uri: params.text_document.uri,
-                        version: params.text_document.version,
-                        diagnostics,
-                    };
-                    this.merge_lsp_diagnostics(
-                        DiagnosticSourceKind::Pushed,
-                        vec![DocumentDiagnosticsUpdate {
-                            server_id,
-                            diagnostics: mapped_diagnostics,
-                            result_id: None,
-                            disk_based_sources: Cow::Borrowed(
-                                &adapter.disk_based_diagnostic_sources,
-                            ),
-                            registration_id: None,
-                        }],
-                        |_, diag, _| !is_inactive_region(diag),
-                        cx,
-                    )
-                    .log_err();
-                })
-                .ok();
-            }
-        })
-        .detach();
-}
diff --git a/crates/project/src/lsp_store/inlay_hint_cache.rs b/crates/project/src/lsp_store/inlay_hint_cache.rs
deleted file mode 100644
index 804552b52c..0000000000
--- a/crates/project/src/lsp_store/inlay_hint_cache.rs
+++ /dev/null
@@ -1,233 +0,0 @@
-use std::{collections::hash_map, ops::Range, sync::Arc};
-
-use collections::HashMap;
-use futures::future::Shared;
-use gpui::{App, Entity, Task};
-use language::{
-    Buffer,
-    row_chunk::{RowChunk, RowChunks},
-};
-use lsp::LanguageServerId;
-use text::Anchor;
-
-use crate::{InlayHint, InlayId};
-
-pub type CacheInlayHints = HashMap<LanguageServerId, Vec<(InlayId, InlayHint)>>;
-pub type CacheInlayHintsTask = Shared<Task<Result<CacheInlayHints, Arc<anyhow::Error>>>>;
-
-/// A logic to apply when querying for new inlay hints and deciding what to do with the old entries in the cache in case of conflicts.
-#[derive(Debug, Clone, Copy)]
-pub enum InvalidationStrategy {
-    /// Language servers reset hints via <a href="https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#workspace_inlayHint_refresh">request</a>.
-    /// Demands to re-query all inlay hints needed and invalidate all cached entries, but does not require instant update with invalidation.
-    ///
-    /// Despite nothing forbids language server from sending this request on every edit, it is expected to be sent only when certain internal server state update, invisible for the editor otherwise.
-    RefreshRequested {
-        server_id: LanguageServerId,
-        request_id: Option<usize>,
-    },
-    /// Multibuffer excerpt(s) and/or singleton buffer(s) were edited at least on one place.
-    /// Neither editor nor LSP is able to tell which open file hints' are not affected, so all of them have to be invalidated, re-queried and do that fast enough to avoid being slow, but also debounce to avoid loading hints on every fast keystroke sequence.
-    BufferEdited,
-    /// A new file got opened/new excerpt was added to a multibuffer/a [multi]buffer was scrolled to a new position.
-    /// No invalidation should be done at all, all new hints are added to the cache.
-    ///
-    /// A special case is the editor toggles and settings change:
-    /// in addition to LSP capabilities, Zed allows omitting certain hint kinds (defined by the corresponding LSP part: type/parameter/other) and toggling hints.
-    /// This does not lead to cache invalidation, but would require cache usage for determining which hints are not displayed and issuing an update to inlays on the screen.
-    None,
-}
-
-impl InvalidationStrategy {
-    pub fn should_invalidate(&self) -> bool {
-        matches!(
-            self,
-            InvalidationStrategy::RefreshRequested { .. } | InvalidationStrategy::BufferEdited
-        )
-    }
-}
-
-pub struct BufferInlayHints {
-    chunks: RowChunks,
-    hints_by_chunks: Vec<Option<CacheInlayHints>>,
-    fetches_by_chunks: Vec<Option<CacheInlayHintsTask>>,
-    hints_by_id: HashMap<InlayId, HintForId>,
-    latest_invalidation_requests: HashMap<LanguageServerId, Option<usize>>,
-    pub(super) hint_resolves: HashMap<InlayId, Shared<Task<()>>>,
-}
-
-#[derive(Debug, Clone, Copy)]
-struct HintForId {
-    chunk_id: usize,
-    server_id: LanguageServerId,
-    position: usize,
-}
-
-impl std::fmt::Debug for BufferInlayHints {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("BufferInlayHints")
-            .field("buffer_chunks", &self.chunks)
-            .field("hints_by_chunks", &self.hints_by_chunks)
-            .field("fetches_by_chunks", &self.fetches_by_chunks)
-            .field("hints_by_id", &self.hints_by_id)
-            .finish_non_exhaustive()
-    }
-}
-
-const MAX_ROWS_IN_A_CHUNK: u32 = 50;
-
-impl BufferInlayHints {
-    pub fn new(buffer: &Entity<Buffer>, cx: &mut App) -> Self {
-        let chunks = RowChunks::new(buffer.read(cx).text_snapshot(), MAX_ROWS_IN_A_CHUNK);
-
-        Self {
-            hints_by_chunks: vec![None; chunks.len()],
-            fetches_by_chunks: vec![None; chunks.len()],
-            latest_invalidation_requests: HashMap::default(),
-            hints_by_id: HashMap::default(),
-            hint_resolves: HashMap::default(),
-            chunks,
-        }
-    }
-
-    pub fn applicable_chunks(
-        &self,
-        ranges: &[Range<text::Anchor>],
-    ) -> impl Iterator<Item = RowChunk> {
-        self.chunks.applicable_chunks(ranges)
-    }
-
-    pub fn cached_hints(&mut self, chunk: &RowChunk) -> Option<&CacheInlayHints> {
-        self.hints_by_chunks[chunk.id].as_ref()
-    }
-
-    pub fn fetched_hints(&mut self, chunk: &RowChunk) -> &mut Option<CacheInlayHintsTask> {
-        &mut self.fetches_by_chunks[chunk.id]
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn all_cached_hints(&self) -> Vec<InlayHint> {
-        self.hints_by_chunks
-            .iter()
-            .filter_map(|hints| hints.as_ref())
-            .flat_map(|hints| hints.values().cloned())
-            .flatten()
-            .map(|(_, hint)| hint)
-            .collect()
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn all_fetched_hints(&self) -> Vec<CacheInlayHintsTask> {
-        self.fetches_by_chunks
-            .iter()
-            .filter_map(|fetches| fetches.clone())
-            .collect()
-    }
-
-    pub fn remove_server_data(&mut self, for_server: LanguageServerId) {
-        for (chunk_index, hints) in self.hints_by_chunks.iter_mut().enumerate() {
-            if let Some(hints) = hints {
-                if hints.remove(&for_server).is_some() {
-                    self.fetches_by_chunks[chunk_index] = None;
-                }
-            }
-        }
-    }
-
-    pub fn clear(&mut self) {
-        self.hints_by_chunks = vec![None; self.chunks.len()];
-        self.fetches_by_chunks = vec![None; self.chunks.len()];
-        self.hints_by_id.clear();
-        self.hint_resolves.clear();
-        self.latest_invalidation_requests.clear();
-    }
-
-    pub fn insert_new_hints(
-        &mut self,
-        chunk: RowChunk,
-        server_id: LanguageServerId,
-        new_hints: Vec<(InlayId, InlayHint)>,
-    ) {
-        let existing_hints = self.hints_by_chunks[chunk.id]
-            .get_or_insert_default()
-            .entry(server_id)
-            .or_insert_with(Vec::new);
-        let existing_count = existing_hints.len();
-        existing_hints.extend(new_hints.into_iter().enumerate().filter_map(
-            |(i, (id, new_hint))| {
-                let new_hint_for_id = HintForId {
-                    chunk_id: chunk.id,
-                    server_id,
-                    position: existing_count + i,
-                };
-                if let hash_map::Entry::Vacant(vacant_entry) = self.hints_by_id.entry(id) {
-                    vacant_entry.insert(new_hint_for_id);
-                    Some((id, new_hint))
-                } else {
-                    None
-                }
-            },
-        ));
-        *self.fetched_hints(&chunk) = None;
-    }
-
-    pub fn hint_for_id(&mut self, id: InlayId) -> Option<&mut InlayHint> {
-        let hint_for_id = self.hints_by_id.get(&id)?;
-        let (hint_id, hint) = self
-            .hints_by_chunks
-            .get_mut(hint_for_id.chunk_id)?
-            .as_mut()?
-            .get_mut(&hint_for_id.server_id)?
-            .get_mut(hint_for_id.position)?;
-        debug_assert_eq!(*hint_id, id, "Invalid pointer {hint_for_id:?}");
-        Some(hint)
-    }
-
-    pub(crate) fn invalidate_for_server_refresh(
-        &mut self,
-        for_server: LanguageServerId,
-        request_id: Option<usize>,
-    ) -> bool {
-        match self.latest_invalidation_requests.entry(for_server) {
-            hash_map::Entry::Occupied(mut o) => {
-                if request_id > *o.get() {
-                    o.insert(request_id);
-                } else {
-                    return false;
-                }
-            }
-            hash_map::Entry::Vacant(v) => {
-                v.insert(request_id);
-            }
-        }
-
-        for (chunk_id, chunk_data) in self.hints_by_chunks.iter_mut().enumerate() {
-            if let Some(removed_hints) = chunk_data
-                .as_mut()
-                .and_then(|chunk_data| chunk_data.remove(&for_server))
-            {
-                for (id, _) in removed_hints {
-                    self.hints_by_id.remove(&id);
-                    self.hint_resolves.remove(&id);
-                }
-                self.fetches_by_chunks[chunk_id] = None;
-            }
-        }
-
-        true
-    }
-
-    pub(crate) fn invalidate_for_chunk(&mut self, chunk: RowChunk) {
-        self.fetches_by_chunks[chunk.id] = None;
-        if let Some(hints_by_server) = self.hints_by_chunks[chunk.id].take() {
-            for (hint_id, _) in hints_by_server.into_values().flatten() {
-                self.hints_by_id.remove(&hint_id);
-                self.hint_resolves.remove(&hint_id);
-            }
-        }
-    }
-
-    pub fn chunk_range(&self, chunk: RowChunk) -> Option<Range<Anchor>> {
-        self.chunks.chunk_range(chunk)
-    }
-}
diff --git a/crates/project/src/lsp_store/json_language_server_ext.rs b/crates/project/src/lsp_store/json_language_server_ext.rs
deleted file mode 100644
index 78df713273..0000000000
--- a/crates/project/src/lsp_store/json_language_server_ext.rs
+++ /dev/null
@@ -1,98 +0,0 @@
-use anyhow::{Context, Result};
-use gpui::{App, AsyncApp, Entity, Global, WeakEntity};
-use lsp::LanguageServer;
-
-use crate::LspStore;
-
-const LOGGER: zlog::Logger = zlog::scoped!("json-schema");
-
-/// https://github.com/Microsoft/vscode/blob/main/extensions/json-language-features/server/README.md#schema-content-request
-///
-/// Represents a "JSON language server-specific, non-standardized, extension to the LSP" with which the vscode-json-language-server
-/// can request the contents of a schema that is associated with a uri scheme it does not support.
-/// In our case, we provide the uris for actions on server startup under the `zed://schemas/action/{normalize_action_name}` scheme.
-/// We can then respond to this request with the schema content on demand, thereby greatly reducing the total size of the JSON we send to the server on startup
-struct SchemaContentRequest {}
-
-impl lsp::request::Request for SchemaContentRequest {
-    type Params = Vec<String>;
-
-    type Result = String;
-
-    const METHOD: &'static str = "vscode/content";
-}
-
-type SchemaRequestHandler = fn(Entity<LspStore>, String, &mut AsyncApp) -> Result<String>;
-pub struct SchemaHandlingImpl(SchemaRequestHandler);
-
-impl Global for SchemaHandlingImpl {}
-
-pub fn register_schema_handler(handler: SchemaRequestHandler, cx: &mut App) {
-    debug_assert!(
-        !cx.has_global::<SchemaHandlingImpl>(),
-        "SchemaHandlingImpl already registered"
-    );
-    cx.set_global(SchemaHandlingImpl(handler));
-}
-
-struct SchemaContentsChanged {}
-
-impl lsp::notification::Notification for SchemaContentsChanged {
-    const METHOD: &'static str = "json/schemaContent";
-    type Params = String;
-}
-
-pub fn notify_schema_changed(lsp_store: Entity<LspStore>, uri: String, cx: &App) {
-    zlog::trace!(LOGGER => "Notifying schema changed for URI: {:?}", uri);
-    let servers = lsp_store.read_with(cx, |lsp_store, _| {
-        let mut servers = Vec::new();
-        let Some(local) = lsp_store.as_local() else {
-            return servers;
-        };
-
-        for states in local.language_servers.values() {
-            let json_server = match states {
-                super::LanguageServerState::Running {
-                    adapter, server, ..
-                } if adapter.adapter.is_primary_zed_json_schema_adapter() => server.clone(),
-                _ => continue,
-            };
-
-            servers.push(json_server);
-        }
-        servers
-    });
-    for server in servers {
-        zlog::trace!(LOGGER => "Notifying server {:?} of schema change for URI: {:?}", server.server_id(), &uri);
-        // TODO: handle errors
-        server.notify::<SchemaContentsChanged>(uri.clone()).ok();
-    }
-}
-
-pub fn register_requests(lsp_store: WeakEntity<LspStore>, language_server: &LanguageServer) {
-    language_server
-        .on_request::<SchemaContentRequest, _, _>(move |params, cx| {
-            let handler = cx.try_read_global::<SchemaHandlingImpl, _>(|handler, _| {
-                handler.0
-            });
-            let mut cx = cx.clone();
-            let uri = params.clone().pop();
-            let lsp_store = lsp_store.clone();
-            let resolution = async move {
-                let lsp_store = lsp_store.upgrade().context("LSP store has been dropped")?;
-                let uri = uri.context("No URI")?;
-                let handle_schema_request = handler.context("No schema handler registered")?;
-                handle_schema_request(lsp_store, uri, &mut cx)
-            };
-            async move {
-                zlog::trace!(LOGGER => "Handling schema request for {:?}", &params);
-                let result = resolution.await;
-                match &result {
-                    Ok(content) => {zlog::trace!(LOGGER => "Schema request resolved with {}B schema", content.len());},
-                    Err(err) => {zlog::warn!(LOGGER => "Schema request failed: {}", err);},
-                }
-                result
-            }
-        })
-        .detach();
-}
diff --git a/crates/project/src/lsp_store/log_store.rs b/crates/project/src/lsp_store/log_store.rs
deleted file mode 100644
index 92f8fecadd..0000000000
--- a/crates/project/src/lsp_store/log_store.rs
+++ /dev/null
@@ -1,716 +0,0 @@
-use std::{collections::VecDeque, sync::Arc};
-
-use collections::HashMap;
-use futures::{StreamExt, channel::mpsc};
-use gpui::{App, AppContext as _, Context, Entity, EventEmitter, Global, Subscription, WeakEntity};
-use lsp::{
-    IoKind, LanguageServer, LanguageServerId, LanguageServerName, LanguageServerSelector,
-    MessageType, TraceValue,
-};
-use rpc::proto;
-use settings::WorktreeId;
-
-use crate::{LanguageServerLogType, LspStore, Project, ProjectItem as _};
-
-const SEND_LINE: &str = "\n// Send:";
-const RECEIVE_LINE: &str = "\n// Receive:";
-const MAX_STORED_LOG_ENTRIES: usize = 2000;
-
-pub fn init(on_headless_host: bool, cx: &mut App) -> Entity<LogStore> {
-    let log_store = cx.new(|cx| LogStore::new(on_headless_host, cx));
-    cx.set_global(GlobalLogStore(log_store.clone()));
-    log_store
-}
-
-pub struct GlobalLogStore(pub Entity<LogStore>);
-
-impl Global for GlobalLogStore {}
-
-#[derive(Debug)]
-pub enum Event {
-    NewServerLogEntry {
-        id: LanguageServerId,
-        kind: LanguageServerLogType,
-        text: String,
-    },
-}
-
-impl EventEmitter<Event> for LogStore {}
-
-pub struct LogStore {
-    on_headless_host: bool,
-    projects: HashMap<WeakEntity<Project>, ProjectState>,
-    pub copilot_log_subscription: Option<lsp::Subscription>,
-    pub language_servers: HashMap<LanguageServerId, LanguageServerState>,
-    io_tx: mpsc::UnboundedSender<(LanguageServerId, IoKind, String)>,
-}
-
-struct ProjectState {
-    _subscriptions: [Subscription; 2],
-}
-
-pub trait Message: AsRef<str> {
-    type Level: Copy + std::fmt::Debug;
-    fn should_include(&self, _: Self::Level) -> bool {
-        true
-    }
-}
-
-#[derive(Debug)]
-pub struct LogMessage {
-    message: String,
-    typ: MessageType,
-}
-
-impl AsRef<str> for LogMessage {
-    fn as_ref(&self) -> &str {
-        &self.message
-    }
-}
-
-impl Message for LogMessage {
-    type Level = MessageType;
-
-    fn should_include(&self, level: Self::Level) -> bool {
-        match (self.typ, level) {
-            (MessageType::ERROR, _) => true,
-            (_, MessageType::ERROR) => false,
-            (MessageType::WARNING, _) => true,
-            (_, MessageType::WARNING) => false,
-            (MessageType::INFO, _) => true,
-            (_, MessageType::INFO) => false,
-            _ => true,
-        }
-    }
-}
-
-#[derive(Debug)]
-pub struct TraceMessage {
-    message: String,
-    is_verbose: bool,
-}
-
-impl AsRef<str> for TraceMessage {
-    fn as_ref(&self) -> &str {
-        &self.message
-    }
-}
-
-impl Message for TraceMessage {
-    type Level = TraceValue;
-
-    fn should_include(&self, level: Self::Level) -> bool {
-        match level {
-            TraceValue::Off => false,
-            TraceValue::Messages => !self.is_verbose,
-            TraceValue::Verbose => true,
-        }
-    }
-}
-
-#[derive(Debug)]
-pub struct RpcMessage {
-    message: String,
-}
-
-impl AsRef<str> for RpcMessage {
-    fn as_ref(&self) -> &str {
-        &self.message
-    }
-}
-
-impl Message for RpcMessage {
-    type Level = ();
-}
-
-pub struct LanguageServerState {
-    pub name: Option<LanguageServerName>,
-    pub worktree_id: Option<WorktreeId>,
-    pub kind: LanguageServerKind,
-    log_messages: VecDeque<LogMessage>,
-    trace_messages: VecDeque<TraceMessage>,
-    pub rpc_state: Option<LanguageServerRpcState>,
-    pub trace_level: TraceValue,
-    pub log_level: MessageType,
-    io_logs_subscription: Option<lsp::Subscription>,
-    pub toggled_log_kind: Option<LogKind>,
-}
-
-impl std::fmt::Debug for LanguageServerState {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("LanguageServerState")
-            .field("name", &self.name)
-            .field("worktree_id", &self.worktree_id)
-            .field("kind", &self.kind)
-            .field("log_messages", &self.log_messages)
-            .field("trace_messages", &self.trace_messages)
-            .field("rpc_state", &self.rpc_state)
-            .field("trace_level", &self.trace_level)
-            .field("log_level", &self.log_level)
-            .field("toggled_log_kind", &self.toggled_log_kind)
-            .finish_non_exhaustive()
-    }
-}
-
-#[derive(PartialEq, Clone)]
-pub enum LanguageServerKind {
-    Local { project: WeakEntity<Project> },
-    Remote { project: WeakEntity<Project> },
-    LocalSsh { lsp_store: WeakEntity<LspStore> },
-    Global,
-}
-
-impl std::fmt::Debug for LanguageServerKind {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            LanguageServerKind::Local { .. } => write!(f, "LanguageServerKind::Local"),
-            LanguageServerKind::Remote { .. } => write!(f, "LanguageServerKind::Remote"),
-            LanguageServerKind::LocalSsh { .. } => write!(f, "LanguageServerKind::LocalSsh"),
-            LanguageServerKind::Global => write!(f, "LanguageServerKind::Global"),
-        }
-    }
-}
-
-impl LanguageServerKind {
-    pub fn project(&self) -> Option<&WeakEntity<Project>> {
-        match self {
-            Self::Local { project } => Some(project),
-            Self::Remote { project } => Some(project),
-            Self::LocalSsh { .. } => None,
-            Self::Global { .. } => None,
-        }
-    }
-}
-
-#[derive(Debug)]
-pub struct LanguageServerRpcState {
-    pub rpc_messages: VecDeque<RpcMessage>,
-    last_message_kind: Option<MessageKind>,
-}
-
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
-enum MessageKind {
-    Send,
-    Receive,
-}
-
-#[derive(Clone, Copy, Debug, Default, PartialEq)]
-pub enum LogKind {
-    Rpc,
-    Trace,
-    #[default]
-    Logs,
-    ServerInfo,
-}
-
-impl LogKind {
-    pub fn from_server_log_type(log_type: &LanguageServerLogType) -> Self {
-        match log_type {
-            LanguageServerLogType::Log(_) => Self::Logs,
-            LanguageServerLogType::Trace { .. } => Self::Trace,
-            LanguageServerLogType::Rpc { .. } => Self::Rpc,
-        }
-    }
-}
-
-impl LogStore {
-    pub fn new(on_headless_host: bool, cx: &mut Context<Self>) -> Self {
-        let (io_tx, mut io_rx) = mpsc::unbounded();
-
-        let log_store = Self {
-            projects: HashMap::default(),
-            language_servers: HashMap::default(),
-            copilot_log_subscription: None,
-            on_headless_host,
-            io_tx,
-        };
-        cx.spawn(async move |log_store, cx| {
-            while let Some((server_id, io_kind, message)) = io_rx.next().await {
-                if let Some(log_store) = log_store.upgrade() {
-                    log_store.update(cx, |log_store, cx| {
-                        log_store.on_io(server_id, io_kind, &message, cx);
-                    })?;
-                }
-            }
-            anyhow::Ok(())
-        })
-        .detach_and_log_err(cx);
-
-        log_store
-    }
-
-    pub fn add_project(&mut self, project: &Entity<Project>, cx: &mut Context<Self>) {
-        let weak_project = project.downgrade();
-        self.projects.insert(
-            project.downgrade(),
-            ProjectState {
-                _subscriptions: [
-                    cx.observe_release(project, move |this, _, _| {
-                        this.projects.remove(&weak_project);
-                        this.language_servers
-                            .retain(|_, state| state.kind.project() != Some(&weak_project));
-                    }),
-                    cx.subscribe(project, move |log_store, project, event, cx| {
-                        let server_kind = if project.read(cx).is_local() {
-                            LanguageServerKind::Local {
-                                project: project.downgrade(),
-                            }
-                        } else {
-                            LanguageServerKind::Remote {
-                                project: project.downgrade(),
-                            }
-                        };
-                        match event {
-                            crate::Event::LanguageServerAdded(id, name, worktree_id) => {
-                                log_store.add_language_server(
-                                    server_kind,
-                                    *id,
-                                    Some(name.clone()),
-                                    *worktree_id,
-                                    project
-                                        .read(cx)
-                                        .lsp_store()
-                                        .read(cx)
-                                        .language_server_for_id(*id),
-                                    cx,
-                                );
-                            }
-                            crate::Event::LanguageServerBufferRegistered {
-                                server_id,
-                                buffer_id,
-                                name,
-                                ..
-                            } => {
-                                let worktree_id = project
-                                    .read(cx)
-                                    .buffer_for_id(*buffer_id, cx)
-                                    .and_then(|buffer| {
-                                        Some(buffer.read(cx).project_path(cx)?.worktree_id)
-                                    });
-                                let name = name.clone().or_else(|| {
-                                    project
-                                        .read(cx)
-                                        .lsp_store()
-                                        .read(cx)
-                                        .language_server_statuses
-                                        .get(server_id)
-                                        .map(|status| status.name.clone())
-                                });
-                                log_store.add_language_server(
-                                    server_kind,
-                                    *server_id,
-                                    name,
-                                    worktree_id,
-                                    None,
-                                    cx,
-                                );
-                            }
-                            crate::Event::LanguageServerRemoved(id) => {
-                                log_store.remove_language_server(*id, cx);
-                            }
-                            crate::Event::LanguageServerLog(id, typ, message) => {
-                                log_store.add_language_server(
-                                    server_kind,
-                                    *id,
-                                    None,
-                                    None,
-                                    None,
-                                    cx,
-                                );
-                                match typ {
-                                    crate::LanguageServerLogType::Log(typ) => {
-                                        log_store.add_language_server_log(*id, *typ, message, cx);
-                                    }
-                                    crate::LanguageServerLogType::Trace { verbose_info } => {
-                                        log_store.add_language_server_trace(
-                                            *id,
-                                            message,
-                                            verbose_info.clone(),
-                                            cx,
-                                        );
-                                    }
-                                    crate::LanguageServerLogType::Rpc { received } => {
-                                        let kind = if *received {
-                                            MessageKind::Receive
-                                        } else {
-                                            MessageKind::Send
-                                        };
-                                        log_store.add_language_server_rpc(*id, kind, message, cx);
-                                    }
-                                }
-                            }
-                            crate::Event::ToggleLspLogs {
-                                server_id,
-                                enabled,
-                                toggled_log_kind,
-                            } => {
-                                log_store.toggle_lsp_logs(*server_id, *enabled, *toggled_log_kind);
-                            }
-                            _ => {}
-                        }
-                    }),
-                ],
-            },
-        );
-    }
-
-    pub fn get_language_server_state(
-        &mut self,
-        id: LanguageServerId,
-    ) -> Option<&mut LanguageServerState> {
-        self.language_servers.get_mut(&id)
-    }
-
-    pub fn add_language_server(
-        &mut self,
-        kind: LanguageServerKind,
-        server_id: LanguageServerId,
-        name: Option<LanguageServerName>,
-        worktree_id: Option<WorktreeId>,
-        server: Option<Arc<LanguageServer>>,
-        cx: &mut Context<Self>,
-    ) -> Option<&mut LanguageServerState> {
-        let server_state = self.language_servers.entry(server_id).or_insert_with(|| {
-            cx.notify();
-            LanguageServerState {
-                name: None,
-                worktree_id: None,
-                kind,
-                rpc_state: None,
-                log_messages: VecDeque::with_capacity(MAX_STORED_LOG_ENTRIES),
-                trace_messages: VecDeque::with_capacity(MAX_STORED_LOG_ENTRIES),
-                trace_level: TraceValue::Off,
-                log_level: MessageType::LOG,
-                io_logs_subscription: None,
-                toggled_log_kind: None,
-            }
-        });
-
-        if let Some(name) = name {
-            server_state.name = Some(name);
-        }
-        if let Some(worktree_id) = worktree_id {
-            server_state.worktree_id = Some(worktree_id);
-        }
-
-        if let Some(server) = server.filter(|_| server_state.io_logs_subscription.is_none()) {
-            let io_tx = self.io_tx.clone();
-            let server_id = server.server_id();
-            server_state.io_logs_subscription = Some(server.on_io(move |io_kind, message| {
-                io_tx
-                    .unbounded_send((server_id, io_kind, message.to_string()))
-                    .ok();
-            }));
-        }
-
-        Some(server_state)
-    }
-
-    pub fn add_language_server_log(
-        &mut self,
-        id: LanguageServerId,
-        typ: MessageType,
-        message: &str,
-        cx: &mut Context<Self>,
-    ) -> Option<()> {
-        let store_logs = !self.on_headless_host;
-        let language_server_state = self.get_language_server_state(id)?;
-
-        let log_lines = &mut language_server_state.log_messages;
-        let message = message.trim_end().to_string();
-        if !store_logs {
-            // Send all messages regardless of the visibility in case of not storing, to notify the receiver anyway
-            self.emit_event(
-                Event::NewServerLogEntry {
-                    id,
-                    kind: LanguageServerLogType::Log(typ),
-                    text: message,
-                },
-                cx,
-            );
-        } else if let Some(new_message) = Self::push_new_message(
-            log_lines,
-            LogMessage { message, typ },
-            language_server_state.log_level,
-        ) {
-            self.emit_event(
-                Event::NewServerLogEntry {
-                    id,
-                    kind: LanguageServerLogType::Log(typ),
-                    text: new_message,
-                },
-                cx,
-            );
-        }
-        Some(())
-    }
-
-    fn add_language_server_trace(
-        &mut self,
-        id: LanguageServerId,
-        message: &str,
-        verbose_info: Option<String>,
-        cx: &mut Context<Self>,
-    ) -> Option<()> {
-        let store_logs = !self.on_headless_host;
-        let language_server_state = self.get_language_server_state(id)?;
-
-        let log_lines = &mut language_server_state.trace_messages;
-        if !store_logs {
-            // Send all messages regardless of the visibility in case of not storing, to notify the receiver anyway
-            self.emit_event(
-                Event::NewServerLogEntry {
-                    id,
-                    kind: LanguageServerLogType::Trace { verbose_info },
-                    text: message.trim().to_string(),
-                },
-                cx,
-            );
-        } else if let Some(new_message) = Self::push_new_message(
-            log_lines,
-            TraceMessage {
-                message: message.trim().to_string(),
-                is_verbose: false,
-            },
-            TraceValue::Messages,
-        ) {
-            if let Some(verbose_message) = verbose_info.as_ref() {
-                Self::push_new_message(
-                    log_lines,
-                    TraceMessage {
-                        message: verbose_message.clone(),
-                        is_verbose: true,
-                    },
-                    TraceValue::Verbose,
-                );
-            }
-            self.emit_event(
-                Event::NewServerLogEntry {
-                    id,
-                    kind: LanguageServerLogType::Trace { verbose_info },
-                    text: new_message,
-                },
-                cx,
-            );
-        }
-        Some(())
-    }
-
-    fn push_new_message<T: Message>(
-        log_lines: &mut VecDeque<T>,
-        message: T,
-        current_severity: <T as Message>::Level,
-    ) -> Option<String> {
-        while log_lines.len() + 1 >= MAX_STORED_LOG_ENTRIES {
-            log_lines.pop_front();
-        }
-        let visible = message.should_include(current_severity);
-
-        let visible_message = visible.then(|| message.as_ref().to_string());
-        log_lines.push_back(message);
-        visible_message
-    }
-
-    fn add_language_server_rpc(
-        &mut self,
-        language_server_id: LanguageServerId,
-        kind: MessageKind,
-        message: &str,
-        cx: &mut Context<'_, Self>,
-    ) {
-        let store_logs = !self.on_headless_host;
-        let Some(state) = self
-            .get_language_server_state(language_server_id)
-            .and_then(|state| state.rpc_state.as_mut())
-        else {
-            return;
-        };
-
-        let received = kind == MessageKind::Receive;
-        let rpc_log_lines = &mut state.rpc_messages;
-        if state.last_message_kind != Some(kind) {
-            while rpc_log_lines.len() + 1 >= MAX_STORED_LOG_ENTRIES {
-                rpc_log_lines.pop_front();
-            }
-            let line_before_message = match kind {
-                MessageKind::Send => SEND_LINE,
-                MessageKind::Receive => RECEIVE_LINE,
-            };
-            if store_logs {
-                rpc_log_lines.push_back(RpcMessage {
-                    message: line_before_message.to_string(),
-                });
-            }
-            // Do not send a synthetic message over the wire, it will be derived from the actual RPC message
-            cx.emit(Event::NewServerLogEntry {
-                id: language_server_id,
-                kind: LanguageServerLogType::Rpc { received },
-                text: line_before_message.to_string(),
-            });
-        }
-
-        while rpc_log_lines.len() + 1 >= MAX_STORED_LOG_ENTRIES {
-            rpc_log_lines.pop_front();
-        }
-
-        if store_logs {
-            rpc_log_lines.push_back(RpcMessage {
-                message: message.trim().to_owned(),
-            });
-        }
-
-        self.emit_event(
-            Event::NewServerLogEntry {
-                id: language_server_id,
-                kind: LanguageServerLogType::Rpc { received },
-                text: message.to_owned(),
-            },
-            cx,
-        );
-    }
-
-    pub fn remove_language_server(&mut self, id: LanguageServerId, cx: &mut Context<Self>) {
-        self.language_servers.remove(&id);
-        cx.notify();
-    }
-
-    pub fn server_logs(&self, server_id: LanguageServerId) -> Option<&VecDeque<LogMessage>> {
-        Some(&self.language_servers.get(&server_id)?.log_messages)
-    }
-
-    pub fn server_trace(&self, server_id: LanguageServerId) -> Option<&VecDeque<TraceMessage>> {
-        Some(&self.language_servers.get(&server_id)?.trace_messages)
-    }
-
-    pub fn server_ids_for_project<'a>(
-        &'a self,
-        lookup_project: &'a WeakEntity<Project>,
-    ) -> impl Iterator<Item = LanguageServerId> + 'a {
-        self.language_servers
-            .iter()
-            .filter_map(move |(id, state)| match &state.kind {
-                LanguageServerKind::Local { project } | LanguageServerKind::Remote { project } => {
-                    if project == lookup_project {
-                        Some(*id)
-                    } else {
-                        None
-                    }
-                }
-                LanguageServerKind::Global | LanguageServerKind::LocalSsh { .. } => Some(*id),
-            })
-    }
-
-    pub fn enable_rpc_trace_for_language_server(
-        &mut self,
-        server_id: LanguageServerId,
-    ) -> Option<&mut LanguageServerRpcState> {
-        let rpc_state = self
-            .language_servers
-            .get_mut(&server_id)?
-            .rpc_state
-            .get_or_insert_with(|| LanguageServerRpcState {
-                rpc_messages: VecDeque::with_capacity(MAX_STORED_LOG_ENTRIES),
-                last_message_kind: None,
-            });
-        Some(rpc_state)
-    }
-
-    pub fn disable_rpc_trace_for_language_server(
-        &mut self,
-        server_id: LanguageServerId,
-    ) -> Option<()> {
-        self.language_servers.get_mut(&server_id)?.rpc_state.take();
-        Some(())
-    }
-
-    pub fn has_server_logs(&self, server: &LanguageServerSelector) -> bool {
-        match server {
-            LanguageServerSelector::Id(id) => self.language_servers.contains_key(id),
-            LanguageServerSelector::Name(name) => self
-                .language_servers
-                .iter()
-                .any(|(_, state)| state.name.as_ref() == Some(name)),
-        }
-    }
-
-    fn on_io(
-        &mut self,
-        language_server_id: LanguageServerId,
-        io_kind: IoKind,
-        message: &str,
-        cx: &mut Context<Self>,
-    ) -> Option<()> {
-        let is_received = match io_kind {
-            IoKind::StdOut => true,
-            IoKind::StdIn => false,
-            IoKind::StdErr => {
-                self.add_language_server_log(language_server_id, MessageType::LOG, message, cx);
-                return Some(());
-            }
-        };
-
-        let kind = if is_received {
-            MessageKind::Receive
-        } else {
-            MessageKind::Send
-        };
-
-        self.add_language_server_rpc(language_server_id, kind, message, cx);
-        cx.notify();
-        Some(())
-    }
-
-    fn emit_event(&mut self, e: Event, cx: &mut Context<Self>) {
-        match &e {
-            Event::NewServerLogEntry { id, kind, text } => {
-                if let Some(state) = self.get_language_server_state(*id) {
-                    let downstream_client = match &state.kind {
-                        LanguageServerKind::Remote { project }
-                        | LanguageServerKind::Local { project } => project
-                            .upgrade()
-                            .map(|project| project.read(cx).lsp_store()),
-                        LanguageServerKind::LocalSsh { lsp_store } => lsp_store.upgrade(),
-                        LanguageServerKind::Global => None,
-                    }
-                    .and_then(|lsp_store| lsp_store.read(cx).downstream_client());
-                    if let Some((client, project_id)) = downstream_client {
-                        if Some(LogKind::from_server_log_type(kind)) == state.toggled_log_kind {
-                            client
-                                .send(proto::LanguageServerLog {
-                                    project_id,
-                                    language_server_id: id.to_proto(),
-                                    message: text.clone(),
-                                    log_type: Some(kind.to_proto()),
-                                })
-                                .ok();
-                        }
-                    }
-                }
-            }
-        }
-
-        cx.emit(e);
-    }
-
-    pub fn toggle_lsp_logs(
-        &mut self,
-        server_id: LanguageServerId,
-        enabled: bool,
-        toggled_log_kind: LogKind,
-    ) {
-        if let Some(server_state) = self.get_language_server_state(server_id) {
-            if enabled {
-                server_state.toggled_log_kind = Some(toggled_log_kind);
-            } else {
-                server_state.toggled_log_kind = None;
-            }
-        }
-        if LogKind::Rpc == toggled_log_kind {
-            if enabled {
-                self.enable_rpc_trace_for_language_server(server_id);
-            } else {
-                self.disable_rpc_trace_for_language_server(server_id);
-            }
-        }
-    }
-}
diff --git a/crates/project/src/lsp_store/lsp_ext_command.rs b/crates/project/src/lsp_store/lsp_ext_command.rs
deleted file mode 100644
index 5066143244..0000000000
--- a/crates/project/src/lsp_store/lsp_ext_command.rs
+++ /dev/null
@@ -1,806 +0,0 @@
-use crate::{
-    LocationLink,
-    lsp_command::{
-        LspCommand, file_path_to_lsp_url, location_link_from_lsp, location_link_from_proto,
-        location_link_to_proto, location_links_from_lsp, location_links_from_proto,
-        location_links_to_proto,
-    },
-    lsp_store::LspStore,
-    make_lsp_text_document_position, make_text_document_identifier,
-};
-use anyhow::{Context as _, Result};
-use async_trait::async_trait;
-use collections::HashMap;
-use gpui::{App, AsyncApp, Entity};
-use language::{
-    Buffer, point_to_lsp,
-    proto::{deserialize_anchor, serialize_anchor},
-};
-use lsp::{AdapterServerCapabilities, LanguageServer, LanguageServerId};
-use rpc::proto::{self, PeerId};
-use serde::{Deserialize, Serialize};
-use std::{
-    path::{Path, PathBuf},
-    sync::Arc,
-};
-use task::TaskTemplate;
-use text::{BufferId, PointUtf16, ToPointUtf16};
-
-pub enum LspExtExpandMacro {}
-
-impl lsp::request::Request for LspExtExpandMacro {
-    type Params = ExpandMacroParams;
-    type Result = Option<ExpandedMacro>;
-    const METHOD: &'static str = "rust-analyzer/expandMacro";
-}
-
-#[derive(Deserialize, Serialize, Debug)]
-#[serde(rename_all = "camelCase")]
-pub struct ExpandMacroParams {
-    pub text_document: lsp::TextDocumentIdentifier,
-    pub position: lsp::Position,
-}
-
-#[derive(Default, Deserialize, Serialize, Debug)]
-#[serde(rename_all = "camelCase")]
-pub struct ExpandedMacro {
-    pub name: String,
-    pub expansion: String,
-}
-
-impl ExpandedMacro {
-    pub fn is_empty(&self) -> bool {
-        self.name.is_empty() && self.expansion.is_empty()
-    }
-}
-#[derive(Debug)]
-pub struct ExpandMacro {
-    pub position: PointUtf16,
-}
-
-#[async_trait(?Send)]
-impl LspCommand for ExpandMacro {
-    type Response = ExpandedMacro;
-    type LspRequest = LspExtExpandMacro;
-    type ProtoRequest = proto::LspExtExpandMacro;
-
-    fn display_name(&self) -> &str {
-        "Expand macro"
-    }
-
-    fn check_capabilities(&self, _: AdapterServerCapabilities) -> bool {
-        true
-    }
-
-    fn to_lsp(
-        &self,
-        path: &Path,
-        _: &Buffer,
-        _: &Arc<LanguageServer>,
-        _: &App,
-    ) -> Result<ExpandMacroParams> {
-        Ok(ExpandMacroParams {
-            text_document: make_text_document_identifier(path)?,
-            position: point_to_lsp(self.position),
-        })
-    }
-
-    async fn response_from_lsp(
-        self,
-        message: Option<ExpandedMacro>,
-        _: Entity<LspStore>,
-        _: Entity<Buffer>,
-        _: LanguageServerId,
-        _: AsyncApp,
-    ) -> anyhow::Result<ExpandedMacro> {
-        Ok(message
-            .map(|message| ExpandedMacro {
-                name: message.name,
-                expansion: message.expansion,
-            })
-            .unwrap_or_default())
-    }
-
-    fn to_proto(&self, project_id: u64, buffer: &Buffer) -> proto::LspExtExpandMacro {
-        proto::LspExtExpandMacro {
-            project_id,
-            buffer_id: buffer.remote_id().into(),
-            position: Some(language::proto::serialize_anchor(
-                &buffer.anchor_before(self.position),
-            )),
-        }
-    }
-
-    async fn from_proto(
-        message: Self::ProtoRequest,
-        _: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        cx: AsyncApp,
-    ) -> anyhow::Result<Self> {
-        let position = message
-            .position
-            .and_then(deserialize_anchor)
-            .context("invalid position")?;
-        Ok(Self {
-            position: buffer.read_with(&cx, |buffer, _| position.to_point_utf16(buffer))?,
-        })
-    }
-
-    fn response_to_proto(
-        response: ExpandedMacro,
-        _: &mut LspStore,
-        _: PeerId,
-        _: &clock::Global,
-        _: &mut App,
-    ) -> proto::LspExtExpandMacroResponse {
-        proto::LspExtExpandMacroResponse {
-            name: response.name,
-            expansion: response.expansion,
-        }
-    }
-
-    async fn response_from_proto(
-        self,
-        message: proto::LspExtExpandMacroResponse,
-        _: Entity<LspStore>,
-        _: Entity<Buffer>,
-        _: AsyncApp,
-    ) -> anyhow::Result<ExpandedMacro> {
-        Ok(ExpandedMacro {
-            name: message.name,
-            expansion: message.expansion,
-        })
-    }
-
-    fn buffer_id_from_proto(message: &proto::LspExtExpandMacro) -> Result<BufferId> {
-        BufferId::new(message.buffer_id)
-    }
-}
-
-pub enum LspOpenDocs {}
-
-impl lsp::request::Request for LspOpenDocs {
-    type Params = OpenDocsParams;
-    type Result = Option<DocsUrls>;
-    const METHOD: &'static str = "experimental/externalDocs";
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-#[serde(rename_all = "camelCase")]
-pub struct OpenDocsParams {
-    pub text_document: lsp::TextDocumentIdentifier,
-    pub position: lsp::Position,
-}
-
-#[derive(Serialize, Deserialize, Debug, Default)]
-#[serde(rename_all = "camelCase")]
-pub struct DocsUrls {
-    pub web: Option<String>,
-    pub local: Option<String>,
-}
-
-impl DocsUrls {
-    pub fn is_empty(&self) -> bool {
-        self.web.is_none() && self.local.is_none()
-    }
-}
-
-#[derive(Debug)]
-pub struct OpenDocs {
-    pub position: PointUtf16,
-}
-
-#[async_trait(?Send)]
-impl LspCommand for OpenDocs {
-    type Response = DocsUrls;
-    type LspRequest = LspOpenDocs;
-    type ProtoRequest = proto::LspExtOpenDocs;
-
-    fn display_name(&self) -> &str {
-        "Open docs"
-    }
-
-    fn check_capabilities(&self, _: AdapterServerCapabilities) -> bool {
-        true
-    }
-
-    fn to_lsp(
-        &self,
-        path: &Path,
-        _: &Buffer,
-        _: &Arc<LanguageServer>,
-        _: &App,
-    ) -> Result<OpenDocsParams> {
-        Ok(OpenDocsParams {
-            text_document: lsp::TextDocumentIdentifier {
-                uri: lsp::Uri::from_file_path(path).unwrap(),
-            },
-            position: point_to_lsp(self.position),
-        })
-    }
-
-    async fn response_from_lsp(
-        self,
-        message: Option<DocsUrls>,
-        _: Entity<LspStore>,
-        _: Entity<Buffer>,
-        _: LanguageServerId,
-        _: AsyncApp,
-    ) -> anyhow::Result<DocsUrls> {
-        Ok(message
-            .map(|message| DocsUrls {
-                web: message.web,
-                local: message.local,
-            })
-            .unwrap_or_default())
-    }
-
-    fn to_proto(&self, project_id: u64, buffer: &Buffer) -> proto::LspExtOpenDocs {
-        proto::LspExtOpenDocs {
-            project_id,
-            buffer_id: buffer.remote_id().into(),
-            position: Some(language::proto::serialize_anchor(
-                &buffer.anchor_before(self.position),
-            )),
-        }
-    }
-
-    async fn from_proto(
-        message: Self::ProtoRequest,
-        _: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        cx: AsyncApp,
-    ) -> anyhow::Result<Self> {
-        let position = message
-            .position
-            .and_then(deserialize_anchor)
-            .context("invalid position")?;
-        Ok(Self {
-            position: buffer.read_with(&cx, |buffer, _| position.to_point_utf16(buffer))?,
-        })
-    }
-
-    fn response_to_proto(
-        response: DocsUrls,
-        _: &mut LspStore,
-        _: PeerId,
-        _: &clock::Global,
-        _: &mut App,
-    ) -> proto::LspExtOpenDocsResponse {
-        proto::LspExtOpenDocsResponse {
-            web: response.web,
-            local: response.local,
-        }
-    }
-
-    async fn response_from_proto(
-        self,
-        message: proto::LspExtOpenDocsResponse,
-        _: Entity<LspStore>,
-        _: Entity<Buffer>,
-        _: AsyncApp,
-    ) -> anyhow::Result<DocsUrls> {
-        Ok(DocsUrls {
-            web: message.web,
-            local: message.local,
-        })
-    }
-
-    fn buffer_id_from_proto(message: &proto::LspExtOpenDocs) -> Result<BufferId> {
-        BufferId::new(message.buffer_id)
-    }
-}
-
-pub enum LspSwitchSourceHeader {}
-
-impl lsp::request::Request for LspSwitchSourceHeader {
-    type Params = SwitchSourceHeaderParams;
-    type Result = Option<SwitchSourceHeaderResult>;
-    const METHOD: &'static str = "textDocument/switchSourceHeader";
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-#[serde(rename_all = "camelCase")]
-pub struct SwitchSourceHeaderParams(lsp::TextDocumentIdentifier);
-
-#[derive(Serialize, Deserialize, Debug, Default)]
-#[serde(rename_all = "camelCase")]
-pub struct SwitchSourceHeaderResult(pub String);
-
-#[derive(Default, Deserialize, Serialize, Debug)]
-#[serde(rename_all = "camelCase")]
-pub struct SwitchSourceHeader;
-
-#[derive(Debug)]
-pub struct GoToParentModule {
-    pub position: PointUtf16,
-}
-
-pub struct LspGoToParentModule {}
-
-impl lsp::request::Request for LspGoToParentModule {
-    type Params = lsp::TextDocumentPositionParams;
-    type Result = Option<Vec<lsp::LocationLink>>;
-    const METHOD: &'static str = "experimental/parentModule";
-}
-
-#[async_trait(?Send)]
-impl LspCommand for SwitchSourceHeader {
-    type Response = SwitchSourceHeaderResult;
-    type LspRequest = LspSwitchSourceHeader;
-    type ProtoRequest = proto::LspExtSwitchSourceHeader;
-
-    fn display_name(&self) -> &str {
-        "Switch source header"
-    }
-
-    fn check_capabilities(&self, _: AdapterServerCapabilities) -> bool {
-        true
-    }
-
-    fn to_lsp(
-        &self,
-        path: &Path,
-        _: &Buffer,
-        _: &Arc<LanguageServer>,
-        _: &App,
-    ) -> Result<SwitchSourceHeaderParams> {
-        Ok(SwitchSourceHeaderParams(make_text_document_identifier(
-            path,
-        )?))
-    }
-
-    async fn response_from_lsp(
-        self,
-        message: Option<SwitchSourceHeaderResult>,
-        _: Entity<LspStore>,
-        _: Entity<Buffer>,
-        _: LanguageServerId,
-        _: AsyncApp,
-    ) -> anyhow::Result<SwitchSourceHeaderResult> {
-        Ok(message
-            .map(|message| SwitchSourceHeaderResult(message.0))
-            .unwrap_or_default())
-    }
-
-    fn to_proto(&self, project_id: u64, buffer: &Buffer) -> proto::LspExtSwitchSourceHeader {
-        proto::LspExtSwitchSourceHeader {
-            project_id,
-            buffer_id: buffer.remote_id().into(),
-        }
-    }
-
-    async fn from_proto(
-        _: Self::ProtoRequest,
-        _: Entity<LspStore>,
-        _: Entity<Buffer>,
-        _: AsyncApp,
-    ) -> anyhow::Result<Self> {
-        Ok(Self {})
-    }
-
-    fn response_to_proto(
-        response: SwitchSourceHeaderResult,
-        _: &mut LspStore,
-        _: PeerId,
-        _: &clock::Global,
-        _: &mut App,
-    ) -> proto::LspExtSwitchSourceHeaderResponse {
-        proto::LspExtSwitchSourceHeaderResponse {
-            target_file: response.0,
-        }
-    }
-
-    async fn response_from_proto(
-        self,
-        message: proto::LspExtSwitchSourceHeaderResponse,
-        _: Entity<LspStore>,
-        _: Entity<Buffer>,
-        _: AsyncApp,
-    ) -> anyhow::Result<SwitchSourceHeaderResult> {
-        Ok(SwitchSourceHeaderResult(message.target_file))
-    }
-
-    fn buffer_id_from_proto(message: &proto::LspExtSwitchSourceHeader) -> Result<BufferId> {
-        BufferId::new(message.buffer_id)
-    }
-}
-
-#[async_trait(?Send)]
-impl LspCommand for GoToParentModule {
-    type Response = Vec<LocationLink>;
-    type LspRequest = LspGoToParentModule;
-    type ProtoRequest = proto::LspExtGoToParentModule;
-
-    fn display_name(&self) -> &str {
-        "Go to parent module"
-    }
-
-    fn check_capabilities(&self, _: AdapterServerCapabilities) -> bool {
-        true
-    }
-
-    fn to_lsp(
-        &self,
-        path: &Path,
-        _: &Buffer,
-        _: &Arc<LanguageServer>,
-        _: &App,
-    ) -> Result<lsp::TextDocumentPositionParams> {
-        make_lsp_text_document_position(path, self.position)
-    }
-
-    async fn response_from_lsp(
-        self,
-        links: Option<Vec<lsp::LocationLink>>,
-        lsp_store: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        server_id: LanguageServerId,
-        cx: AsyncApp,
-    ) -> anyhow::Result<Vec<LocationLink>> {
-        location_links_from_lsp(
-            links.map(lsp::GotoDefinitionResponse::Link),
-            lsp_store,
-            buffer,
-            server_id,
-            cx,
-        )
-        .await
-    }
-
-    fn to_proto(&self, project_id: u64, buffer: &Buffer) -> proto::LspExtGoToParentModule {
-        proto::LspExtGoToParentModule {
-            project_id,
-            buffer_id: buffer.remote_id().to_proto(),
-            position: Some(language::proto::serialize_anchor(
-                &buffer.anchor_before(self.position),
-            )),
-        }
-    }
-
-    async fn from_proto(
-        request: Self::ProtoRequest,
-        _: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        cx: AsyncApp,
-    ) -> anyhow::Result<Self> {
-        let position = request
-            .position
-            .and_then(deserialize_anchor)
-            .context("bad request with bad position")?;
-        Ok(Self {
-            position: buffer.read_with(&cx, |buffer, _| position.to_point_utf16(buffer))?,
-        })
-    }
-
-    fn response_to_proto(
-        links: Vec<LocationLink>,
-        lsp_store: &mut LspStore,
-        peer_id: PeerId,
-        _: &clock::Global,
-        cx: &mut App,
-    ) -> proto::LspExtGoToParentModuleResponse {
-        proto::LspExtGoToParentModuleResponse {
-            links: location_links_to_proto(links, lsp_store, peer_id, cx),
-        }
-    }
-
-    async fn response_from_proto(
-        self,
-        message: proto::LspExtGoToParentModuleResponse,
-        lsp_store: Entity<LspStore>,
-        _: Entity<Buffer>,
-        cx: AsyncApp,
-    ) -> anyhow::Result<Vec<LocationLink>> {
-        location_links_from_proto(message.links, lsp_store, cx).await
-    }
-
-    fn buffer_id_from_proto(message: &proto::LspExtGoToParentModule) -> Result<BufferId> {
-        BufferId::new(message.buffer_id)
-    }
-}
-
-// https://rust-analyzer.github.io/book/contributing/lsp-extensions.html#runnables
-// Taken from https://github.com/rust-lang/rust-analyzer/blob/a73a37a757a58b43a796d3eb86a1f7dfd0036659/crates/rust-analyzer/src/lsp/ext.rs#L425-L489
-pub enum Runnables {}
-
-impl lsp::request::Request for Runnables {
-    type Params = RunnablesParams;
-    type Result = Vec<Runnable>;
-    const METHOD: &'static str = "experimental/runnables";
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct RunnablesParams {
-    pub text_document: lsp::TextDocumentIdentifier,
-    #[serde(default)]
-    pub position: Option<lsp::Position>,
-}
-
-#[derive(Deserialize, Serialize, Debug, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct Runnable {
-    pub label: String,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub location: Option<lsp::LocationLink>,
-    pub kind: RunnableKind,
-    pub args: RunnableArgs,
-}
-
-#[derive(Deserialize, Serialize, Debug, Clone)]
-#[serde(rename_all = "camelCase")]
-#[serde(untagged)]
-pub enum RunnableArgs {
-    Cargo(CargoRunnableArgs),
-    Shell(ShellRunnableArgs),
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-#[serde(rename_all = "lowercase")]
-pub enum RunnableKind {
-    Cargo,
-    Shell,
-}
-
-#[derive(Deserialize, Serialize, Debug, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct CargoRunnableArgs {
-    #[serde(default, skip_serializing_if = "HashMap::is_empty")]
-    pub environment: HashMap<String, String>,
-    pub cwd: PathBuf,
-    /// Command to be executed instead of cargo
-    #[serde(default)]
-    pub override_cargo: Option<String>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub workspace_root: Option<PathBuf>,
-    // command, --package and --lib stuff
-    #[serde(default)]
-    pub cargo_args: Vec<String>,
-    // stuff after --
-    #[serde(default)]
-    pub executable_args: Vec<String>,
-}
-
-#[derive(Deserialize, Serialize, Debug, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct ShellRunnableArgs {
-    #[serde(default, skip_serializing_if = "HashMap::is_empty")]
-    pub environment: HashMap<String, String>,
-    pub cwd: PathBuf,
-    pub program: String,
-    #[serde(default)]
-    pub args: Vec<String>,
-}
-
-#[derive(Debug)]
-pub struct GetLspRunnables {
-    pub buffer_id: BufferId,
-    pub position: Option<text::Anchor>,
-}
-
-#[derive(Debug, Default)]
-pub struct LspRunnables {
-    pub runnables: Vec<(Option<LocationLink>, TaskTemplate)>,
-}
-
-#[async_trait(?Send)]
-impl LspCommand for GetLspRunnables {
-    type Response = LspRunnables;
-    type LspRequest = Runnables;
-    type ProtoRequest = proto::LspExtRunnables;
-
-    fn display_name(&self) -> &str {
-        "LSP Runnables"
-    }
-
-    fn check_capabilities(&self, _: AdapterServerCapabilities) -> bool {
-        true
-    }
-
-    fn to_lsp(
-        &self,
-        path: &Path,
-        buffer: &Buffer,
-        _: &Arc<LanguageServer>,
-        _: &App,
-    ) -> Result<RunnablesParams> {
-        let url = file_path_to_lsp_url(path)?;
-        Ok(RunnablesParams {
-            text_document: lsp::TextDocumentIdentifier::new(url),
-            position: self
-                .position
-                .map(|anchor| point_to_lsp(anchor.to_point_utf16(&buffer.snapshot()))),
-        })
-    }
-
-    async fn response_from_lsp(
-        self,
-        lsp_runnables: Vec<Runnable>,
-        lsp_store: Entity<LspStore>,
-        buffer: Entity<Buffer>,
-        server_id: LanguageServerId,
-        mut cx: AsyncApp,
-    ) -> Result<LspRunnables> {
-        let mut runnables = Vec::with_capacity(lsp_runnables.len());
-
-        for runnable in lsp_runnables {
-            let location = match runnable.location {
-                Some(location) => Some(
-                    location_link_from_lsp(location, &lsp_store, &buffer, server_id, &mut cx)
-                        .await?,
-                ),
-                None => None,
-            };
-            let mut task_template = TaskTemplate::default();
-            task_template.label = runnable.label;
-            match runnable.args {
-                RunnableArgs::Cargo(cargo) => {
-                    match cargo.override_cargo {
-                        Some(override_cargo) => {
-                            let mut override_parts =
-                                override_cargo.split(" ").map(|s| s.to_string());
-                            task_template.command = override_parts
-                                .next()
-                                .unwrap_or_else(|| override_cargo.clone());
-                            task_template.args.extend(override_parts);
-                        }
-                        None => task_template.command = "cargo".to_string(),
-                    };
-                    task_template.env = cargo.environment;
-                    task_template.cwd = Some(
-                        cargo
-                            .workspace_root
-                            .unwrap_or(cargo.cwd)
-                            .to_string_lossy()
-                            .to_string(),
-                    );
-                    task_template.args.extend(cargo.cargo_args);
-                    if !cargo.executable_args.is_empty() {
-                        let shell_kind = task_template.shell.shell_kind(cfg!(windows));
-                        task_template.args.push("--".to_string());
-                        task_template.args.extend(
-                            cargo
-                                .executable_args
-                                .into_iter()
-                                // rust-analyzer's doctest data may be smth. like
-                                // ```
-                                // command: "cargo",
-                                // args: [
-                                //     "test",
-                                //     "--doc",
-                                //     "--package",
-                                //     "cargo-output-parser",
-                                //     "--",
-                                //     "X<T>::new",
-                                //     "--show-output",
-                                // ],
-                                // ```
-                                // and `X<T>::new` will cause troubles if not escaped properly, as later
-                                // the task runs as `$SHELL -i -c "cargo test ..."`.
-                                //
-                                // We cannot escape all shell arguments unconditionally, as we use this for ssh commands, which may involve paths starting with `~`.
-                                // That bit is not auto-expanded when using single quotes.
-                                // Escape extra cargo args unconditionally as those are unlikely to contain `~`.
-                                .flat_map(|extra_arg| {
-                                    shell_kind.try_quote(&extra_arg).map(|s| s.to_string())
-                                }),
-                        );
-                    }
-                }
-                RunnableArgs::Shell(shell) => {
-                    task_template.command = shell.program;
-                    task_template.args = shell.args;
-                    task_template.env = shell.environment;
-                    task_template.cwd = Some(shell.cwd.to_string_lossy().into_owned());
-                }
-            }
-
-            runnables.push((location, task_template));
-        }
-
-        Ok(LspRunnables { runnables })
-    }
-
-    fn to_proto(&self, project_id: u64, buffer: &Buffer) -> proto::LspExtRunnables {
-        proto::LspExtRunnables {
-            project_id,
-            buffer_id: buffer.remote_id().to_proto(),
-            position: self.position.as_ref().map(serialize_anchor),
-        }
-    }
-
-    async fn from_proto(
-        message: proto::LspExtRunnables,
-        _: Entity<LspStore>,
-        _: Entity<Buffer>,
-        _: AsyncApp,
-    ) -> Result<Self> {
-        let buffer_id = Self::buffer_id_from_proto(&message)?;
-        let position = message.position.and_then(deserialize_anchor);
-        Ok(Self {
-            buffer_id,
-            position,
-        })
-    }
-
-    fn response_to_proto(
-        response: LspRunnables,
-        lsp_store: &mut LspStore,
-        peer_id: PeerId,
-        _: &clock::Global,
-        cx: &mut App,
-    ) -> proto::LspExtRunnablesResponse {
-        proto::LspExtRunnablesResponse {
-            runnables: response
-                .runnables
-                .into_iter()
-                .map(|(location, task_template)| proto::LspRunnable {
-                    location: location
-                        .map(|location| location_link_to_proto(location, lsp_store, peer_id, cx)),
-                    task_template: serde_json::to_vec(&task_template).unwrap(),
-                })
-                .collect(),
-        }
-    }
-
-    async fn response_from_proto(
-        self,
-        message: proto::LspExtRunnablesResponse,
-        lsp_store: Entity<LspStore>,
-        _: Entity<Buffer>,
-        mut cx: AsyncApp,
-    ) -> Result<LspRunnables> {
-        let mut runnables = LspRunnables {
-            runnables: Vec::new(),
-        };
-
-        for lsp_runnable in message.runnables {
-            let location = match lsp_runnable.location {
-                Some(location) => {
-                    Some(location_link_from_proto(location, lsp_store.clone(), &mut cx).await?)
-                }
-                None => None,
-            };
-            let task_template = serde_json::from_slice(&lsp_runnable.task_template)
-                .context("deserializing task template from proto")?;
-            runnables.runnables.push((location, task_template));
-        }
-
-        Ok(runnables)
-    }
-
-    fn buffer_id_from_proto(message: &proto::LspExtRunnables) -> Result<BufferId> {
-        BufferId::new(message.buffer_id)
-    }
-}
-
-#[derive(Debug)]
-pub struct LspExtCancelFlycheck {}
-
-#[derive(Debug)]
-pub struct LspExtRunFlycheck {}
-
-#[derive(Debug)]
-pub struct LspExtClearFlycheck {}
-
-impl lsp::notification::Notification for LspExtCancelFlycheck {
-    type Params = ();
-    const METHOD: &'static str = "rust-analyzer/cancelFlycheck";
-}
-
-impl lsp::notification::Notification for LspExtRunFlycheck {
-    type Params = RunFlycheckParams;
-    const METHOD: &'static str = "rust-analyzer/runFlycheck";
-}
-
-#[derive(Deserialize, Serialize, Debug)]
-#[serde(rename_all = "camelCase")]
-pub struct RunFlycheckParams {
-    pub text_document: Option<lsp::TextDocumentIdentifier>,
-}
-
-impl lsp::notification::Notification for LspExtClearFlycheck {
-    type Params = ();
-    const METHOD: &'static str = "rust-analyzer/clearFlycheck";
-}
diff --git a/crates/project/src/lsp_store/rust_analyzer_ext.rs b/crates/project/src/lsp_store/rust_analyzer_ext.rs
deleted file mode 100644
index 4d5f134e5f..0000000000
--- a/crates/project/src/lsp_store/rust_analyzer_ext.rs
+++ /dev/null
@@ -1,275 +0,0 @@
-use ::serde::{Deserialize, Serialize};
-use anyhow::Context as _;
-use gpui::{App, AsyncApp, Entity, Task, WeakEntity};
-use language::{Buffer, ServerHealth};
-use lsp::{LanguageServer, LanguageServerId, LanguageServerName};
-use rpc::proto;
-
-use crate::{LspStore, LspStoreEvent, Project, ProjectPath, lsp_store};
-
-pub const RUST_ANALYZER_NAME: LanguageServerName = LanguageServerName::new_static("rust-analyzer");
-pub const CARGO_DIAGNOSTICS_SOURCE_NAME: &str = "rustc";
-
-/// Experimental: Informs the end user about the state of the server
-///
-/// [Rust Analyzer Specification](https://rust-analyzer.github.io/book/contributing/lsp-extensions.html#server-status)
-#[derive(Debug)]
-enum ServerStatus {}
-
-#[derive(Debug, PartialEq, Deserialize, Serialize, Clone)]
-#[serde(rename_all = "camelCase")]
-struct ServerStatusParams {
-    pub health: ServerHealth,
-    pub message: Option<String>,
-}
-
-impl lsp::notification::Notification for ServerStatus {
-    type Params = ServerStatusParams;
-    const METHOD: &'static str = "experimental/serverStatus";
-}
-
-pub fn register_notifications(lsp_store: WeakEntity<LspStore>, language_server: &LanguageServer) {
-    let name = language_server.name();
-    let server_id = language_server.server_id();
-
-    language_server
-        .on_notification::<ServerStatus, _>({
-            move |params, cx| {
-                let message = params.message;
-                let log_message = message.as_ref().map(|message| {
-                    format!("Language server {name} (id {server_id}) status update: {message}")
-                });
-                let status = match &params.health {
-                    ServerHealth::Ok => {
-                        if let Some(log_message) = log_message {
-                            log::info!("{log_message}");
-                        }
-                        proto::ServerHealth::Ok
-                    }
-                    ServerHealth::Warning => {
-                        if let Some(log_message) = log_message {
-                            log::warn!("{log_message}");
-                        }
-                        proto::ServerHealth::Warning
-                    }
-                    ServerHealth::Error => {
-                        if let Some(log_message) = log_message {
-                            log::error!("{log_message}");
-                        }
-                        proto::ServerHealth::Error
-                    }
-                };
-
-                lsp_store
-                    .update(cx, |_, cx| {
-                        cx.emit(LspStoreEvent::LanguageServerUpdate {
-                            language_server_id: server_id,
-                            name: Some(name.clone()),
-                            message: proto::update_language_server::Variant::StatusUpdate(
-                                proto::StatusUpdate {
-                                    message,
-                                    status: Some(proto::status_update::Status::Health(
-                                        status as i32,
-                                    )),
-                                },
-                            ),
-                        });
-                    })
-                    .ok();
-            }
-        })
-        .detach();
-}
-
-pub fn cancel_flycheck(
-    project: Entity<Project>,
-    buffer_path: Option<ProjectPath>,
-    cx: &mut App,
-) -> Task<anyhow::Result<()>> {
-    let upstream_client = project.read(cx).lsp_store().read(cx).upstream_client();
-    let lsp_store = project.read(cx).lsp_store();
-    let buffer = buffer_path.map(|buffer_path| {
-        project.update(cx, |project, cx| {
-            project.buffer_store().update(cx, |buffer_store, cx| {
-                buffer_store.open_buffer(buffer_path, cx)
-            })
-        })
-    });
-
-    cx.spawn(async move |cx| {
-        let buffer = match buffer {
-            Some(buffer) => Some(buffer.await?),
-            None => None,
-        };
-        let Some(rust_analyzer_server) = find_rust_analyzer_server(&project, buffer.as_ref(), cx)
-        else {
-            return Ok(());
-        };
-
-        if let Some((client, project_id)) = upstream_client {
-            let request = proto::LspExtCancelFlycheck {
-                project_id,
-                language_server_id: rust_analyzer_server.to_proto(),
-            };
-            client
-                .request(request)
-                .await
-                .context("lsp ext cancel flycheck proto request")?;
-        } else {
-            lsp_store
-                .read_with(cx, |lsp_store, _| {
-                    if let Some(server) = lsp_store.language_server_for_id(rust_analyzer_server) {
-                        server.notify::<lsp_store::lsp_ext_command::LspExtCancelFlycheck>(())
-                    } else {
-                        Ok(())
-                    }
-                })
-                .context("lsp ext cancel flycheck")??;
-        };
-        anyhow::Ok(())
-    })
-}
-
-pub fn run_flycheck(
-    project: Entity<Project>,
-    buffer_path: Option<ProjectPath>,
-    cx: &mut App,
-) -> Task<anyhow::Result<()>> {
-    let upstream_client = project.read(cx).lsp_store().read(cx).upstream_client();
-    let lsp_store = project.read(cx).lsp_store();
-    let buffer = buffer_path.map(|buffer_path| {
-        project.update(cx, |project, cx| {
-            project.buffer_store().update(cx, |buffer_store, cx| {
-                buffer_store.open_buffer(buffer_path, cx)
-            })
-        })
-    });
-
-    cx.spawn(async move |cx| {
-        let buffer = match buffer {
-            Some(buffer) => Some(buffer.await?),
-            None => None,
-        };
-        let Some(rust_analyzer_server) = find_rust_analyzer_server(&project, buffer.as_ref(), cx)
-        else {
-            return Ok(());
-        };
-
-        if let Some((client, project_id)) = upstream_client {
-            let buffer_id = buffer
-                .map(|buffer| buffer.read_with(cx, |buffer, _| buffer.remote_id().to_proto()))
-                .transpose()?;
-            let request = proto::LspExtRunFlycheck {
-                project_id,
-                buffer_id,
-                language_server_id: rust_analyzer_server.to_proto(),
-                current_file_only: false,
-            };
-            client
-                .request(request)
-                .await
-                .context("lsp ext run flycheck proto request")?;
-        } else {
-            lsp_store
-                .read_with(cx, |lsp_store, _| {
-                    if let Some(server) = lsp_store.language_server_for_id(rust_analyzer_server) {
-                        server.notify::<lsp_store::lsp_ext_command::LspExtRunFlycheck>(
-                            lsp_store::lsp_ext_command::RunFlycheckParams {
-                                text_document: None,
-                            },
-                        )
-                    } else {
-                        Ok(())
-                    }
-                })
-                .context("lsp ext run flycheck")??;
-        };
-        anyhow::Ok(())
-    })
-}
-
-pub fn clear_flycheck(
-    project: Entity<Project>,
-    buffer_path: Option<ProjectPath>,
-    cx: &mut App,
-) -> Task<anyhow::Result<()>> {
-    let upstream_client = project.read(cx).lsp_store().read(cx).upstream_client();
-    let lsp_store = project.read(cx).lsp_store();
-    let buffer = buffer_path.map(|buffer_path| {
-        project.update(cx, |project, cx| {
-            project.buffer_store().update(cx, |buffer_store, cx| {
-                buffer_store.open_buffer(buffer_path, cx)
-            })
-        })
-    });
-
-    cx.spawn(async move |cx| {
-        let buffer = match buffer {
-            Some(buffer) => Some(buffer.await?),
-            None => None,
-        };
-        let Some(rust_analyzer_server) = find_rust_analyzer_server(&project, buffer.as_ref(), cx)
-        else {
-            return Ok(());
-        };
-
-        if let Some((client, project_id)) = upstream_client {
-            let request = proto::LspExtClearFlycheck {
-                project_id,
-                language_server_id: rust_analyzer_server.to_proto(),
-            };
-            client
-                .request(request)
-                .await
-                .context("lsp ext clear flycheck proto request")?;
-        } else {
-            lsp_store
-                .read_with(cx, |lsp_store, _| {
-                    if let Some(server) = lsp_store.language_server_for_id(rust_analyzer_server) {
-                        server.notify::<lsp_store::lsp_ext_command::LspExtClearFlycheck>(())
-                    } else {
-                        Ok(())
-                    }
-                })
-                .context("lsp ext clear flycheck")??;
-        };
-        anyhow::Ok(())
-    })
-}
-
-fn find_rust_analyzer_server(
-    project: &Entity<Project>,
-    buffer: Option<&Entity<Buffer>>,
-    cx: &mut AsyncApp,
-) -> Option<LanguageServerId> {
-    project
-        .read_with(cx, |project, cx| {
-            buffer
-                .and_then(|buffer| {
-                    project.language_server_id_for_name(buffer.read(cx), &RUST_ANALYZER_NAME, cx)
-                })
-                // If no rust-analyzer found for the current buffer (e.g. `settings.json`), fall back to the project lookup
-                // and use project's rust-analyzer if it's the only one.
-                .or_else(|| {
-                    let rust_analyzer_servers = project
-                        .lsp_store()
-                        .read(cx)
-                        .language_server_statuses
-                        .iter()
-                        .filter_map(|(server_id, server_status)| {
-                            if server_status.name == RUST_ANALYZER_NAME {
-                                Some(*server_id)
-                            } else {
-                                None
-                            }
-                        })
-                        .collect::<Vec<_>>();
-                    if rust_analyzer_servers.len() == 1 {
-                        rust_analyzer_servers.first().copied()
-                    } else {
-                        None
-                    }
-                })
-        })
-        .ok()?
-}
diff --git a/crates/project/src/lsp_store/vue_language_server_ext.rs b/crates/project/src/lsp_store/vue_language_server_ext.rs
deleted file mode 100644
index 2824974540..0000000000
--- a/crates/project/src/lsp_store/vue_language_server_ext.rs
+++ /dev/null
@@ -1,124 +0,0 @@
-use anyhow::Context as _;
-use gpui::{AppContext, WeakEntity};
-use lsp::{LanguageServer, LanguageServerName};
-use serde_json::Value;
-
-use crate::LspStore;
-
-struct VueServerRequest;
-struct TypescriptServerResponse;
-
-impl lsp::notification::Notification for VueServerRequest {
-    type Params = Vec<(u64, String, serde_json::Value)>;
-
-    const METHOD: &'static str = "tsserver/request";
-}
-
-impl lsp::notification::Notification for TypescriptServerResponse {
-    type Params = Vec<(u64, serde_json::Value)>;
-
-    const METHOD: &'static str = "tsserver/response";
-}
-
-const VUE_SERVER_NAME: LanguageServerName = LanguageServerName::new_static("vue-language-server");
-const VTSLS: LanguageServerName = LanguageServerName::new_static("vtsls");
-const TS_LS: LanguageServerName = LanguageServerName::new_static("typescript-language-server");
-
-pub fn register_requests(lsp_store: WeakEntity<LspStore>, language_server: &LanguageServer) {
-    let language_server_name = language_server.name();
-    if language_server_name == VUE_SERVER_NAME {
-        let vue_server_id = language_server.server_id();
-        language_server
-            .on_notification::<VueServerRequest, _>({
-                move |params, cx| {
-                    let lsp_store = lsp_store.clone();
-                    let Ok(Some(vue_server)) = lsp_store.read_with(cx, |this, _| {
-                        this.language_server_for_id(vue_server_id)
-                    }) else {
-                        return;
-                    };
-
-                    let requests = params;
-                    let target_server = match lsp_store.read_with(cx, |this, _| {
-                        let language_server_id = this
-                            .as_local()
-                            .and_then(|local| {
-                                local.language_server_ids.iter().find_map(|(seed, v)| {
-                                    [VTSLS, TS_LS].contains(&seed.name).then_some(v.id)
-                                })
-                            })
-                            .context("Could not find language server")?;
-
-                        this.language_server_for_id(language_server_id)
-                            .context("language server not found")
-                    }) {
-                        Ok(Ok(server)) => server,
-                        other => {
-                            log::warn!(
-                                "vue-language-server forwarding skipped: {other:?}. \
-                                 Returning null tsserver responses"
-                            );
-                            if !requests.is_empty() {
-                                let null_responses = requests
-                                    .into_iter()
-                                    .map(|(id, _, _)| (id, Value::Null))
-                                    .collect::<Vec<_>>();
-                                let _ = vue_server
-                                    .notify::<TypescriptServerResponse>(null_responses);
-                            }
-                            return;
-                        }
-                    };
-
-                    let cx = cx.clone();
-                    for (request_id, command, payload) in requests.into_iter() {
-                        let target_server = target_server.clone();
-                        let vue_server = vue_server.clone();
-                        cx.background_spawn(async move {
-                            let response = target_server
-                                .request::<lsp::request::ExecuteCommand>(
-                                    lsp::ExecuteCommandParams {
-                                        command: "typescript.tsserverRequest".to_owned(),
-                                        arguments: vec![Value::String(command), payload],
-                                        ..Default::default()
-                                    },
-                                )
-                                .await;
-
-                            let response_body = match response {
-                                util::ConnectionResult::Result(Ok(result)) => match result {
-                                    Some(Value::Object(mut map)) => map
-                                        .remove("body")
-                                        .unwrap_or(Value::Object(map)),
-                                    Some(other) => other,
-                                    None => Value::Null,
-                                },
-                                util::ConnectionResult::Result(Err(error)) => {
-                                    log::warn!(
-                                        "typescript.tsserverRequest failed: {error:?} for request {request_id}"
-                                    );
-                                    Value::Null
-                                }
-                                other => {
-                                    log::warn!(
-                                        "typescript.tsserverRequest did not return a response: {other:?} for request {request_id}"
-                                    );
-                                    Value::Null
-                                }
-                            };
-
-                            if let Err(err) = vue_server
-                                .notify::<TypescriptServerResponse>(vec![(request_id, response_body)])
-                            {
-                                log::warn!(
-                                    "Failed to notify vue-language-server of tsserver response: {err:?}"
-                                );
-                            }
-                        })
-                        .detach();
-                    }
-                }
-            })
-            .detach();
-    }
-}
diff --git a/crates/project/src/manifest_tree.rs b/crates/project/src/manifest_tree.rs
deleted file mode 100644
index ffa4872ca7..0000000000
--- a/crates/project/src/manifest_tree.rs
+++ /dev/null
@@ -1,224 +0,0 @@
-//! This module defines a Manifest Tree.
-//!
-//! A Manifest Tree is responsible for determining where the manifests for subprojects are located in a project.
-//! This then is used to provide those locations to language servers & determine locations eligible for toolchain selection.
-
-mod manifest_store;
-mod path_trie;
-mod server_tree;
-
-use std::{borrow::Borrow, collections::hash_map::Entry, ops::ControlFlow, sync::Arc};
-
-use collections::HashMap;
-use gpui::{App, AppContext as _, Context, Entity, Subscription};
-use language::{ManifestDelegate, ManifestName, ManifestQuery};
-pub use manifest_store::ManifestProvidersStore;
-use path_trie::{LabelPresence, RootPathTrie, TriePath};
-use settings::{SettingsStore, WorktreeId};
-use util::rel_path::RelPath;
-use worktree::{Event as WorktreeEvent, Snapshot, Worktree};
-
-use crate::{
-    ProjectPath,
-    worktree_store::{WorktreeStore, WorktreeStoreEvent},
-};
-
-pub(crate) use server_tree::{LanguageServerTree, LanguageServerTreeNode, LaunchDisposition};
-
-struct WorktreeRoots {
-    roots: RootPathTrie<ManifestName>,
-    worktree_store: Entity<WorktreeStore>,
-    _worktree_subscription: Subscription,
-}
-
-impl WorktreeRoots {
-    fn new(
-        worktree_store: Entity<WorktreeStore>,
-        worktree: Entity<Worktree>,
-        cx: &mut App,
-    ) -> Entity<Self> {
-        cx.new(|cx| Self {
-            roots: RootPathTrie::new(),
-            worktree_store,
-            _worktree_subscription: cx.subscribe(&worktree, |this: &mut Self, _, event, cx| {
-                match event {
-                    WorktreeEvent::UpdatedEntries(changes) => {
-                        for (path, _, kind) in changes.iter() {
-                            if kind == &worktree::PathChange::Removed {
-                                let path = TriePath::from(path.as_ref());
-                                this.roots.remove(&path);
-                            }
-                        }
-                    }
-                    WorktreeEvent::UpdatedGitRepositories(_) => {}
-                    WorktreeEvent::DeletedEntry(entry_id) => {
-                        let Some(entry) = this.worktree_store.read(cx).entry_for_id(*entry_id, cx)
-                        else {
-                            return;
-                        };
-                        let path = TriePath::from(entry.path.as_ref());
-                        this.roots.remove(&path);
-                    }
-                }
-            }),
-        })
-    }
-}
-
-pub struct ManifestTree {
-    root_points: HashMap<WorktreeId, Entity<WorktreeRoots>>,
-    worktree_store: Entity<WorktreeStore>,
-    _subscriptions: [Subscription; 2],
-}
-
-impl ManifestTree {
-    pub fn new(worktree_store: Entity<WorktreeStore>, cx: &mut App) -> Entity<Self> {
-        cx.new(|cx| Self {
-            root_points: Default::default(),
-            _subscriptions: [
-                cx.subscribe(&worktree_store, Self::on_worktree_store_event),
-                cx.observe_global::<SettingsStore>(|this, cx| {
-                    for roots in this.root_points.values_mut() {
-                        roots.update(cx, |worktree_roots, _| {
-                            worktree_roots.roots = RootPathTrie::new();
-                        })
-                    }
-                }),
-            ],
-            worktree_store,
-        })
-    }
-
-    pub(crate) fn root_for_path(
-        &mut self,
-        ProjectPath { worktree_id, path }: &ProjectPath,
-        manifest_name: &ManifestName,
-        delegate: &Arc<dyn ManifestDelegate>,
-        cx: &mut App,
-    ) -> Option<ProjectPath> {
-        debug_assert_eq!(delegate.worktree_id(), *worktree_id);
-        let (mut marked_path, mut current_presence) = (None, LabelPresence::KnownAbsent);
-        let worktree_roots = match self.root_points.entry(*worktree_id) {
-            Entry::Occupied(occupied_entry) => occupied_entry.get().clone(),
-            Entry::Vacant(vacant_entry) => {
-                let Some(worktree) = self
-                    .worktree_store
-                    .read(cx)
-                    .worktree_for_id(*worktree_id, cx)
-                else {
-                    return Default::default();
-                };
-                let roots = WorktreeRoots::new(self.worktree_store.clone(), worktree, cx);
-                vacant_entry.insert(roots).clone()
-            }
-        };
-
-        let key = TriePath::from(&**path);
-        worktree_roots.read_with(cx, |this, _| {
-            this.roots.walk(&key, &mut |path, labels| {
-                for (label, presence) in labels {
-                    if label == manifest_name {
-                        if current_presence > *presence {
-                            debug_assert!(false, "RootPathTrie precondition violation; while walking the tree label presence is only allowed to increase");
-                        }
-                        marked_path = Some(ProjectPath {worktree_id: *worktree_id, path: path.clone()});
-                        current_presence = *presence;
-                    }
-
-                }
-                ControlFlow::Continue(())
-            });
-        });
-
-        if current_presence == LabelPresence::KnownAbsent {
-            // Some part of the path is unexplored.
-            let depth = marked_path
-                .as_ref()
-                .map(|root_path| {
-                    path.strip_prefix(&root_path.path)
-                        .unwrap()
-                        .components()
-                        .count()
-                })
-                .unwrap_or_else(|| path.components().count() + 1);
-
-            if depth > 0
-                && let Some(provider) =
-                    ManifestProvidersStore::global(cx).get(manifest_name.borrow())
-            {
-                let root = provider.search(ManifestQuery {
-                    path: path.clone(),
-                    depth,
-                    delegate: delegate.clone(),
-                });
-                match root {
-                    Some(known_root) => worktree_roots.update(cx, |this, _| {
-                        let root = TriePath::from(&*known_root);
-                        this.roots
-                            .insert(&root, manifest_name.clone(), LabelPresence::Present);
-                        current_presence = LabelPresence::Present;
-                        marked_path = Some(ProjectPath {
-                            worktree_id: *worktree_id,
-                            path: known_root,
-                        });
-                    }),
-                    None => worktree_roots.update(cx, |this, _| {
-                        this.roots
-                            .insert(&key, manifest_name.clone(), LabelPresence::KnownAbsent);
-                    }),
-                }
-            }
-        }
-        marked_path.filter(|_| current_presence.eq(&LabelPresence::Present))
-    }
-
-    pub(crate) fn root_for_path_or_worktree_root(
-        &mut self,
-        project_path: &ProjectPath,
-        manifest_name: Option<&ManifestName>,
-        delegate: &Arc<dyn ManifestDelegate>,
-        cx: &mut App,
-    ) -> ProjectPath {
-        let worktree_id = project_path.worktree_id;
-        // Backwards-compat: Fill in any adapters for which we did not detect the root as having the project root at the root of a worktree.
-        manifest_name
-            .and_then(|manifest_name| self.root_for_path(project_path, manifest_name, delegate, cx))
-            .unwrap_or_else(|| ProjectPath {
-                worktree_id,
-                path: RelPath::empty().into(),
-            })
-    }
-
-    fn on_worktree_store_event(
-        &mut self,
-        _: Entity<WorktreeStore>,
-        evt: &WorktreeStoreEvent,
-        _: &mut Context<Self>,
-    ) {
-        if let WorktreeStoreEvent::WorktreeRemoved(_, worktree_id) = evt {
-            self.root_points.remove(worktree_id);
-        }
-    }
-}
-
-pub(crate) struct ManifestQueryDelegate {
-    worktree: Snapshot,
-}
-
-impl ManifestQueryDelegate {
-    pub fn new(worktree: Snapshot) -> Self {
-        Self { worktree }
-    }
-}
-
-impl ManifestDelegate for ManifestQueryDelegate {
-    fn exists(&self, path: &RelPath, is_dir: Option<bool>) -> bool {
-        self.worktree.entry_for_path(path).is_some_and(|entry| {
-            is_dir.is_none_or(|is_required_to_be_dir| is_required_to_be_dir == entry.is_dir())
-        })
-    }
-
-    fn worktree_id(&self) -> WorktreeId {
-        self.worktree.id()
-    }
-}
diff --git a/crates/project/src/manifest_tree/manifest_store.rs b/crates/project/src/manifest_tree/manifest_store.rs
deleted file mode 100644
index cf9f81aee4..0000000000
--- a/crates/project/src/manifest_tree/manifest_store.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-use collections::{HashMap, HashSet};
-use gpui::{App, Global, SharedString};
-use parking_lot::RwLock;
-use std::{ops::Deref, sync::Arc};
-
-use language::{ManifestName, ManifestProvider};
-
-#[derive(Default)]
-struct ManifestProvidersState {
-    providers: HashMap<ManifestName, Arc<dyn ManifestProvider>>,
-}
-
-#[derive(Clone, Default)]
-pub struct ManifestProvidersStore(Arc<RwLock<ManifestProvidersState>>);
-
-#[derive(Default)]
-struct GlobalManifestProvider(ManifestProvidersStore);
-
-impl Deref for GlobalManifestProvider {
-    type Target = ManifestProvidersStore;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl Global for GlobalManifestProvider {}
-
-impl ManifestProvidersStore {
-    /// Returns the global [`ManifestStore`].
-    ///
-    /// Inserts a default [`ManifestStore`] if one does not yet exist.
-    pub fn global(cx: &mut App) -> Self {
-        cx.default_global::<GlobalManifestProvider>().0.clone()
-    }
-
-    pub fn register(&self, provider: Arc<dyn ManifestProvider>) {
-        self.0.write().providers.insert(provider.name(), provider);
-    }
-
-    pub fn unregister(&self, name: &SharedString) {
-        self.0.write().providers.remove(name);
-    }
-
-    pub(super) fn get(&self, name: &SharedString) -> Option<Arc<dyn ManifestProvider>> {
-        self.0.read().providers.get(name).cloned()
-    }
-    pub(crate) fn manifest_file_names(&self) -> HashSet<ManifestName> {
-        self.0.read().providers.keys().cloned().collect()
-    }
-}
diff --git a/crates/project/src/manifest_tree/path_trie.rs b/crates/project/src/manifest_tree/path_trie.rs
deleted file mode 100644
index 9710bb46d0..0000000000
--- a/crates/project/src/manifest_tree/path_trie.rs
+++ /dev/null
@@ -1,265 +0,0 @@
-use std::{
-    collections::{BTreeMap, btree_map::Entry},
-    ops::ControlFlow,
-    sync::Arc,
-};
-
-use util::rel_path::RelPath;
-
-/// [RootPathTrie] is a workhorse of [super::ManifestTree]. It is responsible for determining the closest known entry for a given path.
-/// It also determines how much of a given path is unexplored, thus letting callers fill in that gap if needed.
-/// Conceptually, it allows one to annotate Worktree entries with arbitrary extra metadata and run closest-ancestor searches.
-///
-/// A path is unexplored when the closest ancestor of a path is not the path itself; that means that we have not yet ran the scan on that path.
-/// For example, if there's a project root at path `python/project` and we query for a path `python/project/subdir/another_subdir/file.py`, there is
-/// a known root at `python/project` and the unexplored part is `subdir/another_subdir` - we need to run a scan on these 2 directories.
-pub(super) struct RootPathTrie<Label> {
-    worktree_relative_path: Arc<RelPath>,
-    labels: BTreeMap<Label, LabelPresence>,
-    children: BTreeMap<Arc<str>, RootPathTrie<Label>>,
-}
-
-/// Label presence is a marker that allows to optimize searches within [RootPathTrie]; node label can be:
-/// - Present; we know there's definitely a project root at this node.
-/// - Known Absent - we know there's definitely no project root at this node and none of it's ancestors are Present (descendants can be present though!).
-///   The distinction is there to optimize searching; when we encounter a node with unknown status, we don't need to look at it's full path
-///   to the root of the worktree; it's sufficient to explore only the path between last node with a KnownAbsent state and the directory of a path, since we run searches
-///   from the leaf up to the root of the worktree.
-///
-/// In practical terms, it means that by storing label presence we don't need to do a project discovery on a given folder more than once
-/// (unless the node is invalidated, which can happen when FS entries are renamed/removed).
-///
-/// Storing absent nodes allows us to recognize which paths have already been scanned for a project root unsuccessfully. This way we don't need to run
-/// such scan more than once.
-#[derive(Clone, Copy, Debug, PartialOrd, PartialEq, Ord, Eq)]
-pub(super) enum LabelPresence {
-    KnownAbsent,
-    Present,
-}
-
-impl<Label: Ord + Clone> RootPathTrie<Label> {
-    pub(super) fn new() -> Self {
-        Self::new_with_key(Arc::from(RelPath::empty()))
-    }
-
-    fn new_with_key(worktree_relative_path: Arc<RelPath>) -> Self {
-        RootPathTrie {
-            worktree_relative_path,
-            labels: Default::default(),
-            children: Default::default(),
-        }
-    }
-
-    // Internal implementation of inner that allows one to visit descendants of insertion point for a node.
-    fn insert_inner(
-        &mut self,
-        path: &TriePath,
-        value: Label,
-        presence: LabelPresence,
-    ) -> &mut Self {
-        let mut current = self;
-
-        let mut path_so_far = <Arc<RelPath>>::from(RelPath::empty());
-        for key in path.0.iter() {
-            path_so_far = path_so_far.join(RelPath::unix(key.as_ref()).unwrap());
-            current = match current.children.entry(key.clone()) {
-                Entry::Vacant(vacant_entry) => {
-                    vacant_entry.insert(RootPathTrie::new_with_key(path_so_far.clone()))
-                }
-                Entry::Occupied(occupied_entry) => occupied_entry.into_mut(),
-            };
-        }
-        let _previous_value = current.labels.insert(value, presence);
-        debug_assert_eq!(_previous_value, None);
-        current
-    }
-
-    pub(super) fn insert(&mut self, path: &TriePath, value: Label, presence: LabelPresence) {
-        self.insert_inner(path, value, presence);
-    }
-
-    pub(super) fn walk<'a>(
-        &'a self,
-        path: &TriePath,
-        callback: &mut dyn for<'b> FnMut(
-            &'b Arc<RelPath>,
-            &'a BTreeMap<Label, LabelPresence>,
-        ) -> ControlFlow<()>,
-    ) {
-        let mut current = self;
-        for key in path.0.iter() {
-            if !current.labels.is_empty()
-                && (callback)(&current.worktree_relative_path, &current.labels).is_break()
-            {
-                return;
-            };
-            current = match current.children.get(key) {
-                Some(child) => child,
-                None => return,
-            };
-        }
-        if !current.labels.is_empty() {
-            let _ = (callback)(&current.worktree_relative_path, &current.labels);
-        }
-    }
-
-    pub(super) fn remove(&mut self, path: &TriePath) {
-        let mut current = self;
-        for path in path.0.iter().take(path.0.len().saturating_sub(1)) {
-            current = match current.children.get_mut(path) {
-                Some(child) => child,
-                None => return,
-            };
-        }
-        if let Some(final_entry_name) = path.0.last() {
-            current.children.remove(final_entry_name);
-        }
-    }
-}
-
-/// [TriePath] is a [Path] preprocessed for amortizing the cost of doing multiple lookups in distinct [RootPathTrie]s.
-#[derive(Clone)]
-pub(super) struct TriePath(Arc<[Arc<str>]>);
-
-impl TriePath {
-    fn new(value: &RelPath) -> Self {
-        TriePath(
-            value
-                .components()
-                .map(|component| component.into())
-                .collect(),
-        )
-    }
-}
-
-impl From<&RelPath> for TriePath {
-    fn from(value: &RelPath) -> Self {
-        Self::new(value)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::collections::BTreeSet;
-
-    use util::rel_path::rel_path;
-
-    use super::*;
-
-    #[test]
-    fn test_insert_and_lookup() {
-        let mut trie = RootPathTrie::<()>::new();
-        trie.insert(
-            &TriePath::new(rel_path("a/b/c")),
-            (),
-            LabelPresence::Present,
-        );
-
-        trie.walk(&TriePath::new(rel_path("a/b/c")), &mut |path, nodes| {
-            assert_eq!(nodes.get(&()), Some(&LabelPresence::Present));
-            assert_eq!(path.as_unix_str(), "a/b/c");
-            ControlFlow::Continue(())
-        });
-        // Now let's annotate a parent with "Known missing" node.
-        trie.insert(
-            &TriePath::new(rel_path("a")),
-            (),
-            LabelPresence::KnownAbsent,
-        );
-
-        // Ensure that we walk from the root to the leaf.
-        let mut visited_paths = BTreeSet::new();
-        trie.walk(&TriePath::new(rel_path("a/b/c")), &mut |path, nodes| {
-            if path.as_unix_str() == "a/b/c" {
-                assert_eq!(visited_paths, BTreeSet::from_iter([rel_path("a").into()]));
-                assert_eq!(nodes.get(&()), Some(&LabelPresence::Present));
-            } else if path.as_unix_str() == "a" {
-                assert!(visited_paths.is_empty());
-                assert_eq!(nodes.get(&()), Some(&LabelPresence::KnownAbsent));
-            } else {
-                panic!("Unknown path");
-            }
-            // Assert that we only ever visit a path once.
-            assert!(visited_paths.insert(path.clone()));
-            ControlFlow::Continue(())
-        });
-
-        // One can also pass a path whose prefix is in the tree, but not that path itself.
-        let mut visited_paths = BTreeSet::new();
-        trie.walk(
-            &TriePath::new(rel_path("a/b/c/d/e/f/g")),
-            &mut |path, nodes| {
-                if path.as_unix_str() == "a/b/c" {
-                    assert_eq!(visited_paths, BTreeSet::from_iter([rel_path("a").into()]));
-                    assert_eq!(nodes.get(&()), Some(&LabelPresence::Present));
-                } else if path.as_unix_str() == "a" {
-                    assert!(visited_paths.is_empty());
-                    assert_eq!(nodes.get(&()), Some(&LabelPresence::KnownAbsent));
-                } else {
-                    panic!("Unknown path");
-                }
-                // Assert that we only ever visit a path once.
-                assert!(visited_paths.insert(path.clone()));
-                ControlFlow::Continue(())
-            },
-        );
-
-        // Test breaking from the tree-walk.
-        let mut visited_paths = BTreeSet::new();
-        trie.walk(&TriePath::new(rel_path("a/b/c")), &mut |path, nodes| {
-            if path.as_unix_str() == "a" {
-                assert!(visited_paths.is_empty());
-                assert_eq!(nodes.get(&()), Some(&LabelPresence::KnownAbsent));
-            } else {
-                panic!("Unknown path");
-            }
-            // Assert that we only ever visit a path once.
-            assert!(visited_paths.insert(path.clone()));
-            ControlFlow::Break(())
-        });
-        assert_eq!(visited_paths.len(), 1);
-
-        // Entry removal.
-        trie.insert(
-            &TriePath::new(rel_path("a/b")),
-            (),
-            LabelPresence::KnownAbsent,
-        );
-        let mut visited_paths = BTreeSet::new();
-        trie.walk(&TriePath::new(rel_path("a/b/c")), &mut |path, _nodes| {
-            // Assert that we only ever visit a path once.
-            assert!(visited_paths.insert(path.clone()));
-            ControlFlow::Continue(())
-        });
-        assert_eq!(visited_paths.len(), 3);
-        trie.remove(&TriePath::new(rel_path("a/b")));
-        let mut visited_paths = BTreeSet::new();
-        trie.walk(&TriePath::new(rel_path("a/b/c")), &mut |path, _nodes| {
-            // Assert that we only ever visit a path once.
-            assert!(visited_paths.insert(path.clone()));
-            ControlFlow::Continue(())
-        });
-        assert_eq!(visited_paths.len(), 1);
-        assert_eq!(
-            visited_paths.into_iter().next().unwrap(),
-            rel_path("a").into()
-        );
-    }
-
-    #[test]
-    fn path_to_a_root_can_contain_multiple_known_nodes() {
-        let mut trie = RootPathTrie::<()>::new();
-        trie.insert(&TriePath::new(rel_path("a/b")), (), LabelPresence::Present);
-        trie.insert(&TriePath::new(rel_path("a")), (), LabelPresence::Present);
-        let mut visited_paths = BTreeSet::new();
-        trie.walk(&TriePath::new(rel_path("a/b/c")), &mut |path, nodes| {
-            assert_eq!(nodes.get(&()), Some(&LabelPresence::Present));
-            if path.as_unix_str() != "a" && path.as_unix_str() != "a/b" {
-                panic!("Unexpected path: {}", path.as_unix_str());
-            }
-            assert!(visited_paths.insert(path.clone()));
-            ControlFlow::Continue(())
-        });
-        assert_eq!(visited_paths.len(), 2);
-    }
-}
diff --git a/crates/project/src/manifest_tree/server_tree.rs b/crates/project/src/manifest_tree/server_tree.rs
deleted file mode 100644
index b6828fdb28..0000000000
--- a/crates/project/src/manifest_tree/server_tree.rs
+++ /dev/null
@@ -1,461 +0,0 @@
-//! This module defines an LSP Tree.
-//!
-//! An LSP Tree is responsible for determining which language servers apply to a given project path.
-//!
-//! ## RPC
-//! LSP Tree is transparent to RPC peers; when clients ask host to spawn a new language server, the host will perform LSP Tree lookup for provided path; it may decide
-//! to reuse existing language server.
-
-use std::{
-    collections::{BTreeMap, BTreeSet},
-    sync::{Arc, Weak},
-};
-
-use collections::IndexMap;
-use gpui::{App, Entity};
-use language::{
-    CachedLspAdapter, LanguageName, LanguageRegistry, ManifestDelegate, ManifestName, Toolchain,
-    language_settings::AllLanguageSettings,
-};
-use lsp::LanguageServerName;
-use settings::{Settings, SettingsLocation, WorktreeId};
-use std::sync::OnceLock;
-use util::rel_path::RelPath;
-
-use crate::{
-    LanguageServerId, ProjectPath, project_settings::LspSettings,
-    toolchain_store::LocalToolchainStore,
-};
-
-use super::ManifestTree;
-
-#[derive(Clone, Debug, Default)]
-pub(crate) struct ServersForWorktree {
-    pub(crate) roots: BTreeMap<
-        Arc<RelPath>,
-        BTreeMap<LanguageServerName, (Arc<InnerTreeNode>, BTreeSet<LanguageName>)>,
-    >,
-}
-
-pub struct LanguageServerTree {
-    manifest_tree: Entity<ManifestTree>,
-    pub(crate) instances: BTreeMap<WorktreeId, ServersForWorktree>,
-    languages: Arc<LanguageRegistry>,
-    toolchains: Entity<LocalToolchainStore>,
-}
-
-/// A node in language server tree represents either:
-/// - A language server that has already been initialized/updated for a given project
-/// - A soon-to-be-initialized language server.
-#[derive(Clone, Debug)]
-pub struct LanguageServerTreeNode(Weak<InnerTreeNode>);
-
-/// Describes a request to launch a language server.
-#[derive(Clone, Debug)]
-pub(crate) struct LaunchDisposition {
-    pub(crate) server_name: LanguageServerName,
-    /// Path to the root directory of a subproject.
-    pub(crate) path: ProjectPath,
-    pub(crate) settings: Arc<LspSettings>,
-    pub(crate) toolchain: Option<Toolchain>,
-}
-
-impl LanguageServerTreeNode {
-    /// Returns a language server ID for this node if there is one.
-    /// Returns None if this node has not been initialized yet or it is no longer in the tree.
-    pub(crate) fn server_id(&self) -> Option<LanguageServerId> {
-        self.0.upgrade()?.id.get().copied()
-    }
-
-    /// Returns a language server ID for this node if it has already been initialized; otherwise runs the provided closure to initialize the language server node in a tree.
-    /// May return None if the node no longer belongs to the server tree it was created in.
-    pub(crate) fn server_id_or_init(
-        &self,
-        init: impl FnOnce(&Arc<LaunchDisposition>) -> LanguageServerId,
-    ) -> Option<LanguageServerId> {
-        let this = self.0.upgrade()?;
-        Some(*this.id.get_or_init(|| init(&this.disposition)))
-    }
-
-    /// Returns a language server name as the language server adapter would return.
-    pub fn name(&self) -> Option<LanguageServerName> {
-        self.0
-            .upgrade()
-            .map(|node| node.disposition.server_name.clone())
-    }
-}
-
-impl From<Weak<InnerTreeNode>> for LanguageServerTreeNode {
-    fn from(weak: Weak<InnerTreeNode>) -> Self {
-        LanguageServerTreeNode(weak)
-    }
-}
-
-#[derive(Debug)]
-pub struct InnerTreeNode {
-    id: OnceLock<LanguageServerId>,
-    disposition: Arc<LaunchDisposition>,
-}
-
-impl InnerTreeNode {
-    fn new(
-        server_name: LanguageServerName,
-        path: ProjectPath,
-        settings: LspSettings,
-        toolchain: Option<Toolchain>,
-    ) -> Self {
-        InnerTreeNode {
-            id: Default::default(),
-            disposition: Arc::new(LaunchDisposition {
-                server_name,
-                path,
-                settings: settings.into(),
-                toolchain,
-            }),
-        }
-    }
-
-    pub(crate) fn id(&self) -> Option<LanguageServerId> {
-        self.id.get().copied()
-    }
-}
-
-impl LanguageServerTree {
-    pub(crate) fn new(
-        manifest_tree: Entity<ManifestTree>,
-        languages: Arc<LanguageRegistry>,
-        toolchains: Entity<LocalToolchainStore>,
-    ) -> Self {
-        Self {
-            manifest_tree,
-            instances: Default::default(),
-            languages,
-            toolchains,
-        }
-    }
-
-    /// Get all initialized language server IDs for a given path.
-    pub(crate) fn get<'a>(
-        &'a self,
-        path: ProjectPath,
-        language_name: LanguageName,
-        manifest_name: Option<&ManifestName>,
-        delegate: &Arc<dyn ManifestDelegate>,
-        cx: &mut App,
-    ) -> impl Iterator<Item = LanguageServerId> + 'a {
-        let manifest_location = self.manifest_location_for_path(&path, manifest_name, delegate, cx);
-        let adapters = self.adapters_for_language(&manifest_location, &language_name, cx);
-        self.get_with_adapters(manifest_location, adapters)
-    }
-
-    /// Get all language server root points for a given path and language; the language servers might already be initialized at a given path.
-    pub(crate) fn walk<'a>(
-        &'a mut self,
-        path: ProjectPath,
-        language_name: LanguageName,
-        manifest_name: Option<&ManifestName>,
-        delegate: &Arc<dyn ManifestDelegate>,
-        cx: &'a mut App,
-    ) -> impl Iterator<Item = LanguageServerTreeNode> + 'a {
-        let manifest_location = self.manifest_location_for_path(&path, manifest_name, delegate, cx);
-        let adapters = self.adapters_for_language(&manifest_location, &language_name, cx);
-        self.init_with_adapters(manifest_location, language_name, adapters, cx)
-    }
-
-    fn init_with_adapters<'a>(
-        &'a mut self,
-        root_path: ProjectPath,
-        language_name: LanguageName,
-        adapters: IndexMap<LanguageServerName, (LspSettings, Arc<CachedLspAdapter>)>,
-        cx: &'a App,
-    ) -> impl Iterator<Item = LanguageServerTreeNode> + 'a {
-        adapters.into_iter().map(move |(_, (settings, adapter))| {
-            let root_path = root_path.clone();
-            let inner_node = self
-                .instances
-                .entry(root_path.worktree_id)
-                .or_default()
-                .roots
-                .entry(root_path.path.clone())
-                .or_default()
-                .entry(adapter.name());
-            let (node, languages) = inner_node.or_insert_with(|| {
-                let toolchain = self.toolchains.read(cx).active_toolchain(
-                    root_path.worktree_id,
-                    &root_path.path,
-                    language_name.clone(),
-                );
-
-                (
-                    Arc::new(InnerTreeNode::new(
-                        adapter.name(),
-                        root_path.clone(),
-                        settings.clone(),
-                        toolchain,
-                    )),
-                    Default::default(),
-                )
-            });
-            languages.insert(language_name.clone());
-            Arc::downgrade(node).into()
-        })
-    }
-
-    fn get_with_adapters<'a>(
-        &'a self,
-        root_path: ProjectPath,
-        adapters: IndexMap<LanguageServerName, (LspSettings, Arc<CachedLspAdapter>)>,
-    ) -> impl Iterator<Item = LanguageServerId> + 'a {
-        adapters.into_iter().filter_map(move |(_, (_, adapter))| {
-            let root_path = root_path.clone();
-            let inner_node = self
-                .instances
-                .get(&root_path.worktree_id)?
-                .roots
-                .get(&root_path.path)?
-                .get(&adapter.name())?;
-            inner_node.0.id.get().copied()
-        })
-    }
-
-    fn manifest_location_for_path(
-        &self,
-        path: &ProjectPath,
-        manifest_name: Option<&ManifestName>,
-        delegate: &Arc<dyn ManifestDelegate>,
-        cx: &mut App,
-    ) -> ProjectPath {
-        // Find out what the root location of our subproject is.
-        // That's where we'll look for language settings (that include a set of language servers).
-        self.manifest_tree.update(cx, |this, cx| {
-            this.root_for_path_or_worktree_root(path, manifest_name, delegate, cx)
-        })
-    }
-
-    fn adapters_for_language(
-        &self,
-        manifest_location: &ProjectPath,
-        language_name: &LanguageName,
-        cx: &App,
-    ) -> IndexMap<LanguageServerName, (LspSettings, Arc<CachedLspAdapter>)> {
-        let settings_location = SettingsLocation {
-            worktree_id: manifest_location.worktree_id,
-            path: &manifest_location.path,
-        };
-        let settings = AllLanguageSettings::get(Some(settings_location), cx).language(
-            Some(settings_location),
-            Some(language_name),
-            cx,
-        );
-        if !settings.enable_language_server {
-            return Default::default();
-        }
-        let available_lsp_adapters = self.languages.lsp_adapters(language_name);
-        let available_language_servers = available_lsp_adapters
-            .iter()
-            .map(|lsp_adapter| lsp_adapter.name.clone())
-            .collect::<Vec<_>>();
-
-        let desired_language_servers =
-            settings.customized_language_servers(&available_language_servers);
-        let adapters_with_settings = desired_language_servers
-            .into_iter()
-            .filter_map(|desired_adapter| {
-                let adapter = if let Some(adapter) = available_lsp_adapters
-                    .iter()
-                    .find(|adapter| adapter.name == desired_adapter)
-                {
-                    Some(adapter.clone())
-                } else if let Some(adapter) =
-                    self.languages.load_available_lsp_adapter(&desired_adapter)
-                {
-                    self.languages
-                        .register_lsp_adapter(language_name.clone(), adapter.adapter.clone());
-                    Some(adapter)
-                } else {
-                    None
-                }?;
-                let adapter_settings = crate::lsp_store::language_server_settings_for(
-                    settings_location,
-                    &adapter.name,
-                    cx,
-                )
-                .cloned()
-                .unwrap_or_default();
-                Some((adapter.name(), (adapter_settings, adapter)))
-            })
-            .collect::<IndexMap<_, _>>();
-        // After starting all the language servers, reorder them to reflect the desired order
-        // based on the settings.
-        //
-        // This is done, in part, to ensure that language servers loaded at different points
-        // (e.g., native vs extension) still end up in the right order at the end, rather than
-        // it being based on which language server happened to be loaded in first.
-        self.languages.reorder_language_servers(
-            language_name,
-            adapters_with_settings
-                .values()
-                .map(|(_, adapter)| adapter.clone())
-                .collect(),
-        );
-
-        adapters_with_settings
-    }
-
-    /// Server Tree is built up incrementally via queries for distinct paths of the worktree.
-    /// Results of these queries have to be invalidated when data used to build the tree changes.
-    ///
-    /// The environment of a server tree is a set of all user settings.
-    /// Rebasing a tree means invalidating it and building up a new one while reusing the old tree where applicable.
-    /// We want to reuse the old tree in order to preserve as many of the running language servers as possible.
-    /// E.g. if the user disables one of their language servers for Python, we don't want to shut down any language servers unaffected by this settings change.
-    ///
-    /// Thus, [`ServerTreeRebase`] mimics the interface of a [`ServerTree`], except that it tries to find a matching language server in the old tree before handing out an uninitialized node.
-    pub(crate) fn rebase(&mut self) -> ServerTreeRebase {
-        ServerTreeRebase::new(self)
-    }
-
-    /// Remove nodes with a given ID from the tree.
-    pub(crate) fn remove_nodes(&mut self, ids: &BTreeSet<LanguageServerId>) {
-        for servers in self.instances.values_mut() {
-            for nodes in &mut servers.roots.values_mut() {
-                nodes.retain(|_, (node, _)| node.id.get().is_none_or(|id| !ids.contains(id)));
-            }
-        }
-    }
-
-    pub(crate) fn register_reused(
-        &mut self,
-        worktree_id: WorktreeId,
-        language_name: LanguageName,
-        reused: LanguageServerTreeNode,
-    ) {
-        let Some(node) = reused.0.upgrade() else {
-            return;
-        };
-
-        self.instances
-            .entry(worktree_id)
-            .or_default()
-            .roots
-            .entry(RelPath::empty().into())
-            .or_default()
-            .entry(node.disposition.server_name.clone())
-            .or_insert_with(|| (node, BTreeSet::new()))
-            .1
-            .insert(language_name);
-    }
-}
-
-pub(crate) struct ServerTreeRebase {
-    old_contents: BTreeMap<WorktreeId, ServersForWorktree>,
-    new_tree: LanguageServerTree,
-    /// All server IDs seen in the old tree.
-    all_server_ids: BTreeMap<LanguageServerId, LanguageServerName>,
-    /// Server IDs we've preserved for a new iteration of the tree. `all_server_ids - rebased_server_ids` is the
-    /// set of server IDs that can be shut down.
-    rebased_server_ids: BTreeSet<LanguageServerId>,
-}
-
-impl ServerTreeRebase {
-    fn new(old_tree: &LanguageServerTree) -> Self {
-        let old_contents = old_tree.instances.clone();
-        let all_server_ids = old_contents
-            .values()
-            .flat_map(|nodes| {
-                nodes.roots.values().flat_map(|servers| {
-                    servers.values().filter_map(|server| {
-                        server
-                            .0
-                            .id
-                            .get()
-                            .copied()
-                            .map(|id| (id, server.0.disposition.server_name.clone()))
-                    })
-                })
-            })
-            .collect();
-        let new_tree = LanguageServerTree::new(
-            old_tree.manifest_tree.clone(),
-            old_tree.languages.clone(),
-            old_tree.toolchains.clone(),
-        );
-        Self {
-            old_contents,
-            all_server_ids,
-            new_tree,
-            rebased_server_ids: BTreeSet::new(),
-        }
-    }
-
-    pub(crate) fn walk<'a>(
-        &'a mut self,
-        path: ProjectPath,
-        language_name: LanguageName,
-        manifest_name: Option<&ManifestName>,
-        delegate: Arc<dyn ManifestDelegate>,
-        cx: &'a mut App,
-    ) -> impl Iterator<Item = LanguageServerTreeNode> + 'a {
-        let manifest =
-            self.new_tree
-                .manifest_location_for_path(&path, manifest_name, &delegate, cx);
-        let adapters = self
-            .new_tree
-            .adapters_for_language(&manifest, &language_name, cx);
-
-        self.new_tree
-            .init_with_adapters(manifest, language_name, adapters, cx)
-            .filter_map(|node| {
-                // Inspect result of the query and initialize it ourselves before
-                // handing it off to the caller.
-                let live_node = node.0.upgrade()?;
-
-                if live_node.id.get().is_some() {
-                    return Some(node);
-                }
-
-                let disposition = &live_node.disposition;
-                let Some((existing_node, _)) = self
-                    .old_contents
-                    .get(&disposition.path.worktree_id)
-                    .and_then(|worktree_nodes| worktree_nodes.roots.get(&disposition.path.path))
-                    .and_then(|roots| roots.get(&disposition.server_name))
-                    .filter(|(old_node, _)| {
-                        (&disposition.toolchain, &disposition.settings)
-                            == (
-                                &old_node.disposition.toolchain,
-                                &old_node.disposition.settings,
-                            )
-                    })
-                else {
-                    return Some(node);
-                };
-                if let Some(existing_id) = existing_node.id.get() {
-                    self.rebased_server_ids.insert(*existing_id);
-                    live_node.id.set(*existing_id).ok();
-                }
-
-                Some(node)
-            })
-    }
-
-    /// Returns IDs of servers that are no longer referenced (and can be shut down).
-    pub(crate) fn finish(
-        self,
-    ) -> (
-        LanguageServerTree,
-        BTreeMap<LanguageServerId, LanguageServerName>,
-    ) {
-        (
-            self.new_tree,
-            self.all_server_ids
-                .into_iter()
-                .filter(|(id, _)| !self.rebased_server_ids.contains(id))
-                .collect(),
-        )
-    }
-
-    pub(crate) fn server_tree(&mut self) -> &mut LanguageServerTree {
-        &mut self.new_tree
-    }
-}
diff --git a/crates/project/src/prettier_store.rs b/crates/project/src/prettier_store.rs
deleted file mode 100644
index 40deac7640..0000000000
--- a/crates/project/src/prettier_store.rs
+++ /dev/null
@@ -1,965 +0,0 @@
-use std::{
-    ops::ControlFlow,
-    path::{Path, PathBuf},
-    sync::Arc,
-    time::Duration,
-};
-
-use anyhow::{Context as _, Result, anyhow};
-use collections::{HashMap, HashSet};
-use fs::Fs;
-use futures::{
-    FutureExt,
-    future::{self, Shared},
-    stream::FuturesUnordered,
-};
-use gpui::{AppContext as _, AsyncApp, Context, Entity, EventEmitter, Task, WeakEntity};
-use language::{
-    Buffer, LanguageRegistry, LocalFile,
-    language_settings::{Formatter, LanguageSettings},
-};
-use lsp::{LanguageServer, LanguageServerId, LanguageServerName};
-use node_runtime::NodeRuntime;
-use paths::default_prettier_dir;
-use prettier::Prettier;
-use smol::stream::StreamExt;
-use util::{ResultExt, TryFutureExt, rel_path::RelPath};
-
-use crate::{
-    File, PathChange, ProjectEntryId, Worktree, lsp_store::WorktreeId,
-    worktree_store::WorktreeStore,
-};
-
-pub struct PrettierStore {
-    node: NodeRuntime,
-    fs: Arc<dyn Fs>,
-    languages: Arc<LanguageRegistry>,
-    worktree_store: Entity<WorktreeStore>,
-    default_prettier: DefaultPrettier,
-    prettiers_per_worktree: HashMap<WorktreeId, HashSet<Option<PathBuf>>>,
-    prettier_ignores_per_worktree: HashMap<WorktreeId, HashSet<PathBuf>>,
-    prettier_instances: HashMap<PathBuf, PrettierInstance>,
-}
-
-pub(crate) enum PrettierStoreEvent {
-    LanguageServerRemoved(LanguageServerId),
-    LanguageServerAdded {
-        new_server_id: LanguageServerId,
-        name: LanguageServerName,
-        prettier_server: Arc<LanguageServer>,
-    },
-}
-
-impl EventEmitter<PrettierStoreEvent> for PrettierStore {}
-
-impl PrettierStore {
-    pub fn new(
-        node: NodeRuntime,
-        fs: Arc<dyn Fs>,
-        languages: Arc<LanguageRegistry>,
-        worktree_store: Entity<WorktreeStore>,
-        _: &mut Context<Self>,
-    ) -> Self {
-        Self {
-            node,
-            fs,
-            languages,
-            worktree_store,
-            default_prettier: DefaultPrettier::default(),
-            prettiers_per_worktree: HashMap::default(),
-            prettier_ignores_per_worktree: HashMap::default(),
-            prettier_instances: HashMap::default(),
-        }
-    }
-
-    pub fn remove_worktree(&mut self, id_to_remove: WorktreeId, cx: &mut Context<Self>) {
-        self.prettier_ignores_per_worktree.remove(&id_to_remove);
-        let mut prettier_instances_to_clean = FuturesUnordered::new();
-        if let Some(prettier_paths) = self.prettiers_per_worktree.remove(&id_to_remove) {
-            for path in prettier_paths.iter().flatten() {
-                if let Some(prettier_instance) = self.prettier_instances.remove(path) {
-                    prettier_instances_to_clean.push(async move {
-                        prettier_instance
-                            .server()
-                            .await
-                            .map(|server| server.server_id())
-                    });
-                }
-            }
-        }
-        cx.spawn(async move |prettier_store, cx| {
-            while let Some(prettier_server_id) = prettier_instances_to_clean.next().await {
-                if let Some(prettier_server_id) = prettier_server_id {
-                    prettier_store
-                        .update(cx, |_, cx| {
-                            cx.emit(PrettierStoreEvent::LanguageServerRemoved(
-                                prettier_server_id,
-                            ));
-                        })
-                        .ok();
-                }
-            }
-        })
-        .detach();
-    }
-
-    fn prettier_instance_for_buffer(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        cx: &mut Context<Self>,
-    ) -> Task<Option<(Option<PathBuf>, PrettierTask)>> {
-        let buffer = buffer.read(cx);
-        let buffer_file = buffer.file();
-        if buffer.language().is_none() {
-            return Task::ready(None);
-        }
-
-        let node = self.node.clone();
-
-        match File::from_dyn(buffer_file).map(|file| (file.worktree_id(cx), file.abs_path(cx))) {
-            Some((worktree_id, buffer_path)) => {
-                let fs = Arc::clone(&self.fs);
-                let installed_prettiers = self.prettier_instances.keys().cloned().collect();
-                cx.spawn(async move |lsp_store, cx| {
-                    match cx
-                        .background_spawn(async move {
-                            Prettier::locate_prettier_installation(
-                                fs.as_ref(),
-                                &installed_prettiers,
-                                &buffer_path,
-                            )
-                            .await
-                        })
-                        .await
-                    {
-                        Ok(ControlFlow::Break(())) => None,
-                        Ok(ControlFlow::Continue(None)) => {
-                            let default_instance = lsp_store
-                                .update(cx, |lsp_store, cx| {
-                                    lsp_store
-                                        .prettiers_per_worktree
-                                        .entry(worktree_id)
-                                        .or_default()
-                                        .insert(None);
-                                    lsp_store.default_prettier.prettier_task(
-                                        &node,
-                                        Some(worktree_id),
-                                        cx,
-                                    )
-                                })
-                                .ok()?;
-                            Some((None, default_instance?.log_err().await?))
-                        }
-                        Ok(ControlFlow::Continue(Some(prettier_dir))) => {
-                            lsp_store
-                                .update(cx, |lsp_store, _| {
-                                    lsp_store
-                                        .prettiers_per_worktree
-                                        .entry(worktree_id)
-                                        .or_default()
-                                        .insert(Some(prettier_dir.clone()))
-                                })
-                                .ok()?;
-                            if let Some(prettier_task) = lsp_store
-                                .update(cx, |lsp_store, cx| {
-                                    lsp_store.prettier_instances.get_mut(&prettier_dir).map(
-                                        |existing_instance| {
-                                            existing_instance.prettier_task(
-                                                &node,
-                                                Some(&prettier_dir),
-                                                Some(worktree_id),
-                                                cx,
-                                            )
-                                        },
-                                    )
-                                })
-                                .ok()?
-                            {
-                                log::debug!("Found already started prettier in {prettier_dir:?}");
-                                return Some((Some(prettier_dir), prettier_task?.await.log_err()?));
-                            }
-
-                            log::info!("Found prettier in {prettier_dir:?}, starting.");
-                            let new_prettier_task = lsp_store
-                                .update(cx, |lsp_store, cx| {
-                                    let new_prettier_task = Self::start_prettier(
-                                        node,
-                                        prettier_dir.clone(),
-                                        Some(worktree_id),
-                                        cx,
-                                    );
-                                    lsp_store.prettier_instances.insert(
-                                        prettier_dir.clone(),
-                                        PrettierInstance {
-                                            attempt: 0,
-                                            prettier: Some(new_prettier_task.clone()),
-                                        },
-                                    );
-                                    new_prettier_task
-                                })
-                                .ok()?;
-                            Some((Some(prettier_dir), new_prettier_task))
-                        }
-                        Err(e) => {
-                            log::error!("Failed to determine prettier path for buffer: {e:#}");
-                            None
-                        }
-                    }
-                })
-            }
-            None => {
-                let new_task = self.default_prettier.prettier_task(&node, None, cx);
-                cx.spawn(async move |_, _| Some((None, new_task?.log_err().await?)))
-            }
-        }
-    }
-
-    fn prettier_ignore_for_buffer(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        cx: &mut Context<Self>,
-    ) -> Task<Option<PathBuf>> {
-        let buffer = buffer.read(cx);
-        let buffer_file = buffer.file();
-        if buffer.language().is_none() {
-            return Task::ready(None);
-        }
-        match File::from_dyn(buffer_file).map(|file| (file.worktree_id(cx), file.abs_path(cx))) {
-            Some((worktree_id, buffer_path)) => {
-                let fs = Arc::clone(&self.fs);
-                let prettier_ignores = self
-                    .prettier_ignores_per_worktree
-                    .get(&worktree_id)
-                    .cloned()
-                    .unwrap_or_default();
-                cx.spawn(async move |lsp_store, cx| {
-                    match cx
-                        .background_spawn(async move {
-                            Prettier::locate_prettier_ignore(
-                                fs.as_ref(),
-                                &prettier_ignores,
-                                &buffer_path,
-                            )
-                            .await
-                        })
-                        .await
-                    {
-                        Ok(ControlFlow::Break(())) => None,
-                        Ok(ControlFlow::Continue(None)) => None,
-                        Ok(ControlFlow::Continue(Some(ignore_dir))) => {
-                            log::debug!("Found prettier ignore in {ignore_dir:?}");
-                            lsp_store
-                                .update(cx, |store, _| {
-                                    store
-                                        .prettier_ignores_per_worktree
-                                        .entry(worktree_id)
-                                        .or_default()
-                                        .insert(ignore_dir.clone());
-                                })
-                                .ok();
-                            Some(ignore_dir)
-                        }
-                        Err(e) => {
-                            log::error!(
-                                "Failed to determine prettier ignore path for buffer: {e:#}"
-                            );
-                            None
-                        }
-                    }
-                })
-            }
-            None => Task::ready(None),
-        }
-    }
-
-    fn start_prettier(
-        node: NodeRuntime,
-        prettier_dir: PathBuf,
-        worktree_id: Option<WorktreeId>,
-        cx: &mut Context<Self>,
-    ) -> PrettierTask {
-        cx.spawn(async move |prettier_store, cx| {
-            log::info!("Starting prettier at path {prettier_dir:?}");
-            let new_server_id = prettier_store.read_with(cx, |prettier_store, _| {
-                prettier_store.languages.next_language_server_id()
-            })?;
-
-            let new_prettier = Prettier::start(new_server_id, prettier_dir, node, cx.clone())
-                .await
-                .context("default prettier spawn")
-                .map(Arc::new)
-                .map_err(Arc::new)?;
-            Self::register_new_prettier(
-                &prettier_store,
-                &new_prettier,
-                worktree_id,
-                new_server_id,
-                cx,
-            );
-            Ok(new_prettier)
-        })
-        .shared()
-    }
-
-    fn start_default_prettier(
-        node: NodeRuntime,
-        worktree_id: Option<WorktreeId>,
-        cx: &mut Context<PrettierStore>,
-    ) -> Task<anyhow::Result<PrettierTask>> {
-        cx.spawn(async move |prettier_store, cx| {
-            let installation_task = prettier_store.read_with(cx, |prettier_store, _| {
-                match &prettier_store.default_prettier.prettier {
-                    PrettierInstallation::NotInstalled {
-                        installation_task, ..
-                    } => ControlFlow::Continue(installation_task.clone()),
-                    PrettierInstallation::Installed(default_prettier) => {
-                        ControlFlow::Break(default_prettier.clone())
-                    }
-                }
-            })?;
-            match installation_task {
-                ControlFlow::Continue(None) => {
-                    anyhow::bail!("Default prettier is not installed and cannot be started")
-                }
-                ControlFlow::Continue(Some(installation_task)) => {
-                    log::info!("Waiting for default prettier to install");
-                    if let Err(e) = installation_task.await {
-                        prettier_store.update(cx, |project, _| {
-                            if let PrettierInstallation::NotInstalled {
-                                installation_task,
-                                attempts,
-                                ..
-                            } = &mut project.default_prettier.prettier
-                            {
-                                *installation_task = None;
-                                *attempts += 1;
-                            }
-                        })?;
-                        anyhow::bail!(
-                            "Cannot start default prettier due to its installation failure: {e:#}"
-                        );
-                    }
-                    let new_default_prettier =
-                        prettier_store.update(cx, |prettier_store, cx| {
-                            let new_default_prettier = Self::start_prettier(
-                                node,
-                                default_prettier_dir().clone(),
-                                worktree_id,
-                                cx,
-                            );
-                            prettier_store.default_prettier.prettier =
-                                PrettierInstallation::Installed(PrettierInstance {
-                                    attempt: 0,
-                                    prettier: Some(new_default_prettier.clone()),
-                                });
-                            new_default_prettier
-                        })?;
-                    Ok(new_default_prettier)
-                }
-                ControlFlow::Break(instance) => match instance.prettier {
-                    Some(instance) => Ok(instance),
-                    None => {
-                        let new_default_prettier =
-                            prettier_store.update(cx, |prettier_store, cx| {
-                                let new_default_prettier = Self::start_prettier(
-                                    node,
-                                    default_prettier_dir().clone(),
-                                    worktree_id,
-                                    cx,
-                                );
-                                prettier_store.default_prettier.prettier =
-                                    PrettierInstallation::Installed(PrettierInstance {
-                                        attempt: instance.attempt + 1,
-                                        prettier: Some(new_default_prettier.clone()),
-                                    });
-                                new_default_prettier
-                            })?;
-                        Ok(new_default_prettier)
-                    }
-                },
-            }
-        })
-    }
-
-    fn register_new_prettier(
-        prettier_store: &WeakEntity<Self>,
-        prettier: &Prettier,
-        worktree_id: Option<WorktreeId>,
-        new_server_id: LanguageServerId,
-        cx: &mut AsyncApp,
-    ) {
-        let prettier_dir = prettier.prettier_dir();
-        let is_default = prettier.is_default();
-        if is_default {
-            log::info!("Started default prettier in {prettier_dir:?}");
-        } else {
-            log::info!("Started prettier in {prettier_dir:?}");
-        }
-        if let Some(prettier_server) = prettier.server() {
-            prettier_store
-                .update(cx, |prettier_store, cx| {
-                    let name = if is_default {
-                        LanguageServerName("prettier (default)".to_string().into())
-                    } else {
-                        let worktree_path = worktree_id
-                            .and_then(|id| {
-                                prettier_store
-                                    .worktree_store
-                                    .read(cx)
-                                    .worktree_for_id(id, cx)
-                            })
-                            .map(|worktree| worktree.read(cx).abs_path());
-                        let name = match worktree_path {
-                            Some(worktree_path) => {
-                                if prettier_dir == worktree_path.as_ref() {
-                                    let name = prettier_dir
-                                        .file_name()
-                                        .and_then(|name| name.to_str())
-                                        .unwrap_or_default();
-                                    format!("prettier ({name})")
-                                } else {
-                                    let dir_to_display = prettier_dir
-                                        .strip_prefix(worktree_path.as_ref())
-                                        .ok()
-                                        .unwrap_or(prettier_dir);
-                                    format!("prettier ({})", dir_to_display.display())
-                                }
-                            }
-                            None => format!("prettier ({})", prettier_dir.display()),
-                        };
-                        LanguageServerName(name.into())
-                    };
-                    cx.emit(PrettierStoreEvent::LanguageServerAdded {
-                        new_server_id,
-                        name,
-                        prettier_server: prettier_server.clone(),
-                    });
-                })
-                .ok();
-        }
-    }
-
-    pub fn update_prettier_settings(
-        &self,
-        worktree: &Entity<Worktree>,
-        changes: &[(Arc<RelPath>, ProjectEntryId, PathChange)],
-        cx: &mut Context<Self>,
-    ) {
-        let prettier_config_files = Prettier::CONFIG_FILE_NAMES
-            .iter()
-            .map(|name| RelPath::unix(name).unwrap())
-            .collect::<HashSet<_>>();
-
-        let prettier_config_file_changed = changes
-            .iter()
-            .filter(|(_, _, change)| !matches!(change, PathChange::Loaded))
-            .filter(|(path, _, _)| {
-                !path
-                    .components()
-                    .any(|component| component == "node_modules")
-            })
-            .find(|(path, _, _)| prettier_config_files.contains(path.as_ref()));
-        let current_worktree_id = worktree.read(cx).id();
-        if let Some((config_path, _, _)) = prettier_config_file_changed {
-            log::info!(
-                "Prettier config file {config_path:?} changed, reloading prettier instances for worktree {current_worktree_id}"
-            );
-            let prettiers_to_reload =
-                self.prettiers_per_worktree
-                    .get(&current_worktree_id)
-                    .iter()
-                    .flat_map(|prettier_paths| prettier_paths.iter())
-                    .flatten()
-                    .filter_map(|prettier_path| {
-                        Some((
-                            current_worktree_id,
-                            Some(prettier_path.clone()),
-                            self.prettier_instances.get(prettier_path)?.clone(),
-                        ))
-                    })
-                    .chain(self.default_prettier.instance().map(|default_prettier| {
-                        (current_worktree_id, None, default_prettier.clone())
-                    }))
-                    .collect::<Vec<_>>();
-
-            cx.background_spawn(async move {
-                let _: Vec<()> = future::join_all(prettiers_to_reload.into_iter().map(|(worktree_id, prettier_path, prettier_instance)| {
-                    async move {
-                        if let Some(instance) = prettier_instance.prettier {
-                            match instance.await {
-                                Ok(prettier) => {
-                                    prettier.clear_cache().log_err().await;
-                                },
-                                Err(e) => {
-                                    match prettier_path {
-                                        Some(prettier_path) => log::error!(
-                                            "Failed to clear prettier {prettier_path:?} cache for worktree {worktree_id:?} on prettier settings update: {e:#}"
-                                        ),
-                                        None => log::error!(
-                                            "Failed to clear default prettier cache for worktree {worktree_id:?} on prettier settings update: {e:#}"
-                                        ),
-                                    }
-                                },
-                            }
-                        }
-                    }
-                }))
-                .await;
-            })
-                .detach();
-        }
-    }
-
-    pub fn install_default_prettier(
-        &mut self,
-        worktree: Option<WorktreeId>,
-        plugins: impl Iterator<Item = Arc<str>>,
-        cx: &mut Context<Self>,
-    ) {
-        if cfg!(any(test, feature = "test-support")) {
-            self.default_prettier.installed_plugins.extend(plugins);
-            self.default_prettier.prettier = PrettierInstallation::Installed(PrettierInstance {
-                attempt: 0,
-                prettier: None,
-            });
-            return;
-        }
-
-        let mut new_plugins = plugins.collect::<HashSet<_>>();
-        let node = self.node.clone();
-
-        new_plugins.retain(|plugin| !self.default_prettier.installed_plugins.contains(plugin));
-        let mut installation_attempt = 0;
-        let previous_installation_task = match &mut self.default_prettier.prettier {
-            PrettierInstallation::NotInstalled {
-                installation_task,
-                attempts,
-                not_installed_plugins,
-            } => {
-                installation_attempt = *attempts;
-                if installation_attempt > prettier::FAIL_THRESHOLD {
-                    *installation_task = None;
-                    log::warn!(
-                        "Default prettier installation had failed {installation_attempt} times, not attempting again",
-                    );
-                    return;
-                }
-                new_plugins.extend(not_installed_plugins.iter().cloned());
-                installation_task.clone()
-            }
-            PrettierInstallation::Installed { .. } => {
-                if new_plugins.is_empty() {
-                    return;
-                }
-                None
-            }
-        };
-
-        let plugins_to_install = new_plugins.clone();
-        let fs = Arc::clone(&self.fs);
-        let new_installation_task = cx
-            .spawn(async move  |prettier_store, cx| {
-                cx.background_executor().timer(Duration::from_millis(30)).await;
-                let location_data = prettier_store.update(cx, |prettier_store, cx| {
-                    worktree.and_then(|worktree_id| {
-                        prettier_store.worktree_store
-                            .read(cx)
-                            .worktree_for_id(worktree_id, cx)
-                            .map(|worktree| worktree.read(cx).abs_path())
-                    }).map(|locate_from| {
-                        let installed_prettiers = prettier_store.prettier_instances.keys().cloned().collect();
-                        (locate_from, installed_prettiers)
-                    })
-                })?;
-                let locate_prettier_installation = match location_data {
-                    Some((locate_from, installed_prettiers)) => Prettier::locate_prettier_installation(
-                        fs.as_ref(),
-                        &installed_prettiers,
-                        locate_from.as_ref(),
-                    )
-                    .await
-                    .context("locate prettier installation").map_err(Arc::new)?,
-                    None => ControlFlow::Continue(None),
-                };
-
-                match locate_prettier_installation
-                {
-                    ControlFlow::Break(()) => return Ok(()),
-                    ControlFlow::Continue(prettier_path) => {
-                        if prettier_path.is_some() {
-                            new_plugins.clear();
-                        }
-                        let mut needs_install = should_write_prettier_server_file(fs.as_ref()).await;
-                        if let Some(previous_installation_task) = previous_installation_task
-                            && let Err(e) = previous_installation_task.await {
-                                log::error!("Failed to install default prettier: {e:#}");
-                                prettier_store.update(cx, |prettier_store, _| {
-                                    if let PrettierInstallation::NotInstalled { attempts, not_installed_plugins, .. } = &mut prettier_store.default_prettier.prettier {
-                                        *attempts += 1;
-                                        new_plugins.extend(not_installed_plugins.iter().cloned());
-                                        installation_attempt = *attempts;
-                                        needs_install = true;
-                                    };
-                                })?;
-                            };
-                        if installation_attempt > prettier::FAIL_THRESHOLD {
-                            prettier_store.update(cx, |prettier_store, _| {
-                                if let PrettierInstallation::NotInstalled { installation_task, .. } = &mut prettier_store.default_prettier.prettier {
-                                    *installation_task = None;
-                                };
-                            })?;
-                            log::warn!(
-                                "Default prettier installation had failed {installation_attempt} times, not attempting again",
-                            );
-                            return Ok(());
-                        }
-                        prettier_store.update(cx, |prettier_store, _| {
-                            new_plugins.retain(|plugin| {
-                                !prettier_store.default_prettier.installed_plugins.contains(plugin)
-                            });
-                            if let PrettierInstallation::NotInstalled { not_installed_plugins, .. } = &mut prettier_store.default_prettier.prettier {
-                                not_installed_plugins.retain(|plugin| {
-                                    !prettier_store.default_prettier.installed_plugins.contains(plugin)
-                                });
-                                not_installed_plugins.extend(new_plugins.iter().cloned());
-                            }
-                            needs_install |= !new_plugins.is_empty();
-                        })?;
-                        if needs_install {
-                            log::info!("Initializing default prettier with plugins {new_plugins:?}");
-                            let installed_plugins = new_plugins.clone();
-                            cx.background_spawn(async move {
-                                install_prettier_packages(fs.as_ref(), new_plugins, node).await?;
-                                // Save the server file last, so the reinstall need could be determined by the absence of the file.
-                                save_prettier_server_file(fs.as_ref()).await?;
-                                anyhow::Ok(())
-                            })
-                                .await
-                                .context("prettier & plugins install")
-                                .map_err(Arc::new)?;
-                            log::info!("Initialized default prettier with plugins: {installed_plugins:?}");
-                            prettier_store.update(cx, |prettier_store, _| {
-                                prettier_store.default_prettier.prettier =
-                                    PrettierInstallation::Installed(PrettierInstance {
-                                        attempt: 0,
-                                        prettier: None,
-                                    });
-                                prettier_store.default_prettier
-                                    .installed_plugins
-                                    .extend(installed_plugins);
-                            })?;
-                        } else {
-                            prettier_store.update(cx, |prettier_store, _| {
-                                if let PrettierInstallation::NotInstalled { .. } = &mut prettier_store.default_prettier.prettier {
-                                    prettier_store.default_prettier.prettier =
-                                        PrettierInstallation::Installed(PrettierInstance {
-                                            attempt: 0,
-                                            prettier: None,
-                                        });
-                                }
-                            })?;
-                        }
-                    }
-                }
-                Ok(())
-            })
-            .shared();
-        self.default_prettier.prettier = PrettierInstallation::NotInstalled {
-            attempts: installation_attempt,
-            installation_task: Some(new_installation_task),
-            not_installed_plugins: plugins_to_install,
-        };
-    }
-
-    pub fn on_settings_changed(
-        &mut self,
-        language_formatters_to_check: Vec<(Option<WorktreeId>, LanguageSettings)>,
-        cx: &mut Context<Self>,
-    ) {
-        let mut prettier_plugins_by_worktree = HashMap::default();
-        for (worktree, language_settings) in language_formatters_to_check {
-            if language_settings.prettier.allowed
-                && let Some(plugins) = prettier_plugins_for_language(&language_settings)
-            {
-                prettier_plugins_by_worktree
-                    .entry(worktree)
-                    .or_insert_with(HashSet::default)
-                    .extend(plugins.iter().cloned());
-            }
-        }
-        for (worktree, prettier_plugins) in prettier_plugins_by_worktree {
-            self.install_default_prettier(
-                worktree,
-                prettier_plugins.into_iter().map(Arc::from),
-                cx,
-            );
-        }
-    }
-}
-
-pub fn prettier_plugins_for_language(
-    language_settings: &LanguageSettings,
-) -> Option<&HashSet<String>> {
-    let formatters = language_settings.formatter.as_ref();
-    if formatters.contains(&Formatter::Prettier) || formatters.contains(&Formatter::Auto) {
-        return Some(&language_settings.prettier.plugins);
-    }
-    None
-}
-
-pub(super) async fn format_with_prettier(
-    prettier_store: &WeakEntity<PrettierStore>,
-    buffer: &Entity<Buffer>,
-    cx: &mut AsyncApp,
-) -> Option<Result<language::Diff>> {
-    let prettier_instance = prettier_store
-        .update(cx, |prettier_store, cx| {
-            prettier_store.prettier_instance_for_buffer(buffer, cx)
-        })
-        .ok()?
-        .await;
-
-    let ignore_dir = prettier_store
-        .update(cx, |prettier_store, cx| {
-            prettier_store.prettier_ignore_for_buffer(buffer, cx)
-        })
-        .ok()?
-        .await;
-
-    let (prettier_path, prettier_task) = prettier_instance?;
-
-    let prettier_description = match prettier_path.as_ref() {
-        Some(path) => format!("prettier at {path:?}"),
-        None => "default prettier instance".to_string(),
-    };
-
-    match prettier_task.await {
-        Ok(prettier) => {
-            let buffer_path = buffer
-                .update(cx, |buffer, cx| {
-                    File::from_dyn(buffer.file()).map(|file| file.abs_path(cx))
-                })
-                .ok()
-                .flatten();
-
-            let format_result = prettier
-                .format(buffer, buffer_path, ignore_dir, cx)
-                .await
-                .with_context(|| format!("{} failed to format buffer", prettier_description));
-
-            Some(format_result)
-        }
-        Err(error) => {
-            prettier_store
-                .update(cx, |project, _| {
-                    let instance_to_update = match prettier_path {
-                        Some(prettier_path) => project.prettier_instances.get_mut(&prettier_path),
-                        None => match &mut project.default_prettier.prettier {
-                            PrettierInstallation::NotInstalled { .. } => None,
-                            PrettierInstallation::Installed(instance) => Some(instance),
-                        },
-                    };
-
-                    if let Some(instance) = instance_to_update {
-                        instance.attempt += 1;
-                        instance.prettier = None;
-                    }
-                })
-                .log_err();
-
-            Some(Err(anyhow!(
-                "{prettier_description} failed to spawn: {error:#}"
-            )))
-        }
-    }
-}
-
-#[derive(Debug)]
-pub struct DefaultPrettier {
-    prettier: PrettierInstallation,
-    installed_plugins: HashSet<Arc<str>>,
-}
-
-#[derive(Debug)]
-pub enum PrettierInstallation {
-    NotInstalled {
-        attempts: usize,
-        installation_task: Option<Shared<Task<Result<(), Arc<anyhow::Error>>>>>,
-        not_installed_plugins: HashSet<Arc<str>>,
-    },
-    Installed(PrettierInstance),
-}
-
-pub type PrettierTask = Shared<Task<Result<Arc<Prettier>, Arc<anyhow::Error>>>>;
-
-#[derive(Debug, Clone)]
-pub struct PrettierInstance {
-    attempt: usize,
-    prettier: Option<PrettierTask>,
-}
-
-impl Default for DefaultPrettier {
-    fn default() -> Self {
-        Self {
-            prettier: PrettierInstallation::NotInstalled {
-                attempts: 0,
-                installation_task: None,
-                not_installed_plugins: HashSet::default(),
-            },
-            installed_plugins: HashSet::default(),
-        }
-    }
-}
-
-impl DefaultPrettier {
-    pub fn instance(&self) -> Option<&PrettierInstance> {
-        if let PrettierInstallation::Installed(instance) = &self.prettier {
-            Some(instance)
-        } else {
-            None
-        }
-    }
-
-    pub fn prettier_task(
-        &mut self,
-        node: &NodeRuntime,
-        worktree_id: Option<WorktreeId>,
-        cx: &mut Context<PrettierStore>,
-    ) -> Option<Task<anyhow::Result<PrettierTask>>> {
-        match &mut self.prettier {
-            PrettierInstallation::NotInstalled { .. } => Some(
-                PrettierStore::start_default_prettier(node.clone(), worktree_id, cx),
-            ),
-            PrettierInstallation::Installed(existing_instance) => {
-                existing_instance.prettier_task(node, None, worktree_id, cx)
-            }
-        }
-    }
-}
-
-impl PrettierInstance {
-    pub fn prettier_task(
-        &mut self,
-        node: &NodeRuntime,
-        prettier_dir: Option<&Path>,
-        worktree_id: Option<WorktreeId>,
-        cx: &mut Context<PrettierStore>,
-    ) -> Option<Task<anyhow::Result<PrettierTask>>> {
-        if self.attempt > prettier::FAIL_THRESHOLD {
-            match prettier_dir {
-                Some(prettier_dir) => log::warn!(
-                    "Prettier from path {prettier_dir:?} exceeded launch threshold, not starting"
-                ),
-                None => log::warn!("Default prettier exceeded launch threshold, not starting"),
-            }
-            return None;
-        }
-        Some(match &self.prettier {
-            Some(prettier_task) => Task::ready(Ok(prettier_task.clone())),
-            None => match prettier_dir {
-                Some(prettier_dir) => {
-                    let new_task = PrettierStore::start_prettier(
-                        node.clone(),
-                        prettier_dir.to_path_buf(),
-                        worktree_id,
-                        cx,
-                    );
-                    self.attempt += 1;
-                    self.prettier = Some(new_task.clone());
-                    Task::ready(Ok(new_task))
-                }
-                None => {
-                    self.attempt += 1;
-                    let node = node.clone();
-                    cx.spawn(async move |prettier_store, cx| {
-                        prettier_store
-                            .update(cx, |_, cx| {
-                                PrettierStore::start_default_prettier(node, worktree_id, cx)
-                            })?
-                            .await
-                    })
-                }
-            },
-        })
-    }
-
-    pub async fn server(&self) -> Option<Arc<LanguageServer>> {
-        self.prettier.clone()?.await.ok()?.server().cloned()
-    }
-}
-
-async fn install_prettier_packages(
-    fs: &dyn Fs,
-    plugins_to_install: HashSet<Arc<str>>,
-    node: NodeRuntime,
-) -> anyhow::Result<()> {
-    let packages_to_versions = future::try_join_all(
-        plugins_to_install
-            .iter()
-            .chain(Some(&"prettier".into()))
-            .map(|package_name| async {
-                let returned_package_name = package_name.to_string();
-                let latest_version = node
-                    .npm_package_latest_version(package_name)
-                    .await
-                    .with_context(|| {
-                        format!("fetching latest npm version for package {returned_package_name}")
-                    })?;
-                anyhow::Ok((returned_package_name, latest_version))
-            }),
-    )
-    .await
-    .context("fetching latest npm versions")?;
-
-    let default_prettier_dir = default_prettier_dir().as_path();
-    match fs.metadata(default_prettier_dir).await.with_context(|| {
-        format!("fetching FS metadata for default prettier dir {default_prettier_dir:?}")
-    })? {
-        Some(prettier_dir_metadata) => anyhow::ensure!(
-            prettier_dir_metadata.is_dir,
-            "default prettier dir {default_prettier_dir:?} is not a directory"
-        ),
-        None => fs
-            .create_dir(default_prettier_dir)
-            .await
-            .with_context(|| format!("creating default prettier dir {default_prettier_dir:?}"))?,
-    }
-
-    log::info!("Installing default prettier and plugins: {packages_to_versions:?}");
-    let borrowed_packages = packages_to_versions
-        .iter()
-        .map(|(package, version)| (package.as_str(), version.as_str()))
-        .collect::<Vec<_>>();
-    node.npm_install_packages(default_prettier_dir, &borrowed_packages)
-        .await
-        .context("fetching formatter packages")?;
-    anyhow::Ok(())
-}
-
-async fn save_prettier_server_file(fs: &dyn Fs) -> anyhow::Result<()> {
-    let prettier_wrapper_path = default_prettier_dir().join(prettier::PRETTIER_SERVER_FILE);
-    fs.save(
-        &prettier_wrapper_path,
-        &text::Rope::from(prettier::PRETTIER_SERVER_JS),
-        text::LineEnding::Unix,
-    )
-    .await
-    .with_context(|| {
-        format!(
-            "writing {} file at {prettier_wrapper_path:?}",
-            prettier::PRETTIER_SERVER_FILE
-        )
-    })?;
-    Ok(())
-}
-
-async fn should_write_prettier_server_file(fs: &dyn Fs) -> bool {
-    let prettier_wrapper_path = default_prettier_dir().join(prettier::PRETTIER_SERVER_FILE);
-    if !fs.is_file(&prettier_wrapper_path).await {
-        return true;
-    }
-    let Ok(prettier_server_file_contents) = fs.load(&prettier_wrapper_path).await else {
-        return true;
-    };
-    prettier_server_file_contents != prettier::PRETTIER_SERVER_JS
-}
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
deleted file mode 100644
index ec44a60d71..0000000000
--- a/crates/project/src/project.rs
+++ /dev/null
@@ -1,5725 +0,0 @@
-pub mod agent_server_store;
-pub mod buffer_store;
-mod color_extractor;
-pub mod connection_manager;
-pub mod context_server_store;
-pub mod debounced_delay;
-pub mod debugger;
-pub mod git_store;
-pub mod image_store;
-pub mod lsp_command;
-pub mod lsp_store;
-mod manifest_tree;
-pub mod prettier_store;
-mod project_search;
-pub mod project_settings;
-pub mod search;
-mod task_inventory;
-pub mod task_store;
-pub mod telemetry_snapshot;
-pub mod terminals;
-pub mod toolchain_store;
-pub mod worktree_store;
-
-#[cfg(test)]
-mod project_tests;
-
-mod environment;
-use buffer_diff::BufferDiff;
-use context_server_store::ContextServerStore;
-pub use environment::ProjectEnvironmentEvent;
-use git::repository::get_git_committer;
-use git_store::{Repository, RepositoryId};
-pub mod search_history;
-mod yarn;
-
-use dap::inline_value::{InlineValueLocation, VariableLookupKind, VariableScope};
-
-use crate::{
-    git_store::GitStore,
-    lsp_store::{SymbolLocation, log_store::LogKind},
-    project_search::SearchResultsHandle,
-};
-pub use agent_server_store::{AgentServerStore, AgentServersUpdated, ExternalAgentServerName};
-pub use git_store::{
-    ConflictRegion, ConflictSet, ConflictSetSnapshot, ConflictSetUpdate,
-    git_traversal::{ChildEntriesGitIter, GitEntry, GitEntryRef, GitTraversal},
-};
-pub use manifest_tree::ManifestTree;
-pub use project_search::Search;
-
-use anyhow::{Context as _, Result, anyhow};
-use buffer_store::{BufferStore, BufferStoreEvent};
-use client::{Client, Collaborator, PendingEntitySubscription, TypedEnvelope, UserStore, proto};
-use clock::ReplicaId;
-
-use dap::client::DebugAdapterClient;
-
-use collections::{BTreeSet, HashMap, HashSet, IndexSet};
-use debounced_delay::DebouncedDelay;
-pub use debugger::breakpoint_store::BreakpointWithPosition;
-use debugger::{
-    breakpoint_store::{ActiveStackFrame, BreakpointStore},
-    dap_store::{DapStore, DapStoreEvent},
-    session::Session,
-};
-pub use environment::ProjectEnvironment;
-#[cfg(test)]
-use futures::future::join_all;
-use futures::{
-    StreamExt,
-    channel::mpsc::{self, UnboundedReceiver},
-    future::try_join_all,
-};
-pub use image_store::{ImageItem, ImageStore};
-use image_store::{ImageItemEvent, ImageStoreEvent};
-
-use ::git::{blame::Blame, status::FileStatus};
-use gpui::{
-    App, AppContext, AsyncApp, BorrowAppContext, Context, Entity, EventEmitter, Hsla, SharedString,
-    Task, WeakEntity, Window,
-};
-use language::{
-    Buffer, BufferEvent, Capability, CodeLabel, CursorShape, Language, LanguageName,
-    LanguageRegistry, PointUtf16, ToOffset, ToPointUtf16, Toolchain, ToolchainMetadata,
-    ToolchainScope, Transaction, Unclipped, language_settings::InlayHintKind,
-    proto::split_operations,
-};
-use lsp::{
-    CodeActionKind, CompletionContext, CompletionItemKind, DocumentHighlightKind, InsertTextMode,
-    LanguageServerBinary, LanguageServerId, LanguageServerName, LanguageServerSelector,
-    MessageActionItem,
-};
-use lsp_command::*;
-use lsp_store::{CompletionDocumentation, LspFormatTarget, OpenLspBufferHandle};
-pub use manifest_tree::ManifestProvidersStore;
-use node_runtime::NodeRuntime;
-use parking_lot::Mutex;
-pub use prettier_store::PrettierStore;
-use project_settings::{ProjectSettings, SettingsObserver, SettingsObserverEvent};
-use remote::{RemoteClient, RemoteConnectionOptions};
-use rpc::{
-    AnyProtoClient, ErrorCode,
-    proto::{LanguageServerPromptResponse, REMOTE_SERVER_PROJECT_ID},
-};
-use search::{SearchInputKind, SearchQuery, SearchResult};
-use search_history::SearchHistory;
-use settings::{InvalidSettingsError, RegisterSetting, Settings, SettingsLocation, SettingsStore};
-use smol::channel::Receiver;
-use snippet::Snippet;
-pub use snippet_provider;
-use snippet_provider::SnippetProvider;
-use std::{
-    borrow::Cow,
-    collections::BTreeMap,
-    ffi::OsString,
-    ops::{Not as _, Range},
-    path::{Path, PathBuf},
-    pin::pin,
-    str::{self, FromStr},
-    sync::Arc,
-    time::Duration,
-};
-
-use task_store::TaskStore;
-use terminals::Terminals;
-use text::{Anchor, BufferId, OffsetRangeExt, Point, Rope};
-use toolchain_store::EmptyToolchainStore;
-use util::{
-    ResultExt as _, maybe,
-    paths::{PathStyle, SanitizedPath, is_absolute},
-    rel_path::RelPath,
-};
-use worktree::{CreatedEntry, Snapshot, Traversal};
-pub use worktree::{
-    Entry, EntryKind, FS_WATCH_LATENCY, File, LocalWorktree, PathChange, ProjectEntryId,
-    UpdatedEntriesSet, UpdatedGitRepositoriesSet, Worktree, WorktreeId, WorktreeSettings,
-};
-use worktree_store::{WorktreeStore, WorktreeStoreEvent};
-
-pub use fs::*;
-pub use language::Location;
-#[cfg(any(test, feature = "test-support"))]
-pub use prettier::FORMAT_SUFFIX as TEST_PRETTIER_FORMAT_SUFFIX;
-pub use task_inventory::{
-    BasicContextProvider, ContextProviderWithTasks, DebugScenarioContext, Inventory, TaskContexts,
-    TaskSourceKind,
-};
-
-pub use buffer_store::ProjectTransaction;
-pub use lsp_store::{
-    DiagnosticSummary, InvalidationStrategy, LanguageServerLogType, LanguageServerProgress,
-    LanguageServerPromptRequest, LanguageServerStatus, LanguageServerToQuery, LspStore,
-    LspStoreEvent, ProgressToken, SERVER_PROGRESS_THROTTLE_TIMEOUT,
-};
-pub use toolchain_store::{ToolchainStore, Toolchains};
-const MAX_PROJECT_SEARCH_HISTORY_SIZE: usize = 500;
-
-pub trait ProjectItem: 'static {
-    fn try_open(
-        project: &Entity<Project>,
-        path: &ProjectPath,
-        cx: &mut App,
-    ) -> Option<Task<Result<Entity<Self>>>>
-    where
-        Self: Sized;
-    fn entry_id(&self, cx: &App) -> Option<ProjectEntryId>;
-    fn project_path(&self, cx: &App) -> Option<ProjectPath>;
-    fn is_dirty(&self) -> bool;
-}
-
-#[derive(Clone)]
-pub enum OpenedBufferEvent {
-    Disconnected,
-    Ok(BufferId),
-    Err(BufferId, Arc<anyhow::Error>),
-}
-
-/// Semantics-aware entity that is relevant to one or more [`Worktree`] with the files.
-/// `Project` is responsible for tasks, LSP and collab queries, synchronizing worktree states accordingly.
-/// Maps [`Worktree`] entries with its own logic using [`ProjectEntryId`] and [`ProjectPath`] structs.
-///
-/// Can be either local (for the project opened on the same host) or remote.(for collab projects, browsed by multiple remote users).
-pub struct Project {
-    active_entry: Option<ProjectEntryId>,
-    buffer_ordered_messages_tx: mpsc::UnboundedSender<BufferOrderedMessage>,
-    languages: Arc<LanguageRegistry>,
-    dap_store: Entity<DapStore>,
-    agent_server_store: Entity<AgentServerStore>,
-
-    breakpoint_store: Entity<BreakpointStore>,
-    collab_client: Arc<client::Client>,
-    join_project_response_message_id: u32,
-    task_store: Entity<TaskStore>,
-    user_store: Entity<UserStore>,
-    fs: Arc<dyn Fs>,
-    remote_client: Option<Entity<RemoteClient>>,
-    client_state: ProjectClientState,
-    git_store: Entity<GitStore>,
-    collaborators: HashMap<proto::PeerId, Collaborator>,
-    client_subscriptions: Vec<client::Subscription>,
-    worktree_store: Entity<WorktreeStore>,
-    buffer_store: Entity<BufferStore>,
-    context_server_store: Entity<ContextServerStore>,
-    image_store: Entity<ImageStore>,
-    lsp_store: Entity<LspStore>,
-    _subscriptions: Vec<gpui::Subscription>,
-    buffers_needing_diff: HashSet<WeakEntity<Buffer>>,
-    git_diff_debouncer: DebouncedDelay<Self>,
-    remotely_created_models: Arc<Mutex<RemotelyCreatedModels>>,
-    terminals: Terminals,
-    node: Option<NodeRuntime>,
-    search_history: SearchHistory,
-    search_included_history: SearchHistory,
-    search_excluded_history: SearchHistory,
-    snippets: Entity<SnippetProvider>,
-    environment: Entity<ProjectEnvironment>,
-    settings_observer: Entity<SettingsObserver>,
-    toolchain_store: Option<Entity<ToolchainStore>>,
-    agent_location: Option<AgentLocation>,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct AgentLocation {
-    pub buffer: WeakEntity<Buffer>,
-    pub position: Anchor,
-}
-
-#[derive(Default)]
-struct RemotelyCreatedModels {
-    worktrees: Vec<Entity<Worktree>>,
-    buffers: Vec<Entity<Buffer>>,
-    retain_count: usize,
-}
-
-struct RemotelyCreatedModelGuard {
-    remote_models: std::sync::Weak<Mutex<RemotelyCreatedModels>>,
-}
-
-impl Drop for RemotelyCreatedModelGuard {
-    fn drop(&mut self) {
-        if let Some(remote_models) = self.remote_models.upgrade() {
-            let mut remote_models = remote_models.lock();
-            assert!(
-                remote_models.retain_count > 0,
-                "RemotelyCreatedModelGuard dropped too many times"
-            );
-            remote_models.retain_count -= 1;
-            if remote_models.retain_count == 0 {
-                remote_models.buffers.clear();
-                remote_models.worktrees.clear();
-            }
-        }
-    }
-}
-/// Message ordered with respect to buffer operations
-#[derive(Debug)]
-enum BufferOrderedMessage {
-    Operation {
-        buffer_id: BufferId,
-        operation: proto::Operation,
-    },
-    LanguageServerUpdate {
-        language_server_id: LanguageServerId,
-        message: proto::update_language_server::Variant,
-        name: Option<LanguageServerName>,
-    },
-    Resync,
-}
-
-#[derive(Debug)]
-enum ProjectClientState {
-    /// Single-player mode.
-    Local,
-    /// Multi-player mode but still a local project.
-    Shared { remote_id: u64 },
-    /// Multi-player mode but working on a remote project.
-    Remote {
-        sharing_has_stopped: bool,
-        capability: Capability,
-        remote_id: u64,
-        replica_id: ReplicaId,
-    },
-}
-
-#[derive(Clone, Debug, PartialEq)]
-pub enum Event {
-    LanguageServerAdded(LanguageServerId, LanguageServerName, Option<WorktreeId>),
-    LanguageServerRemoved(LanguageServerId),
-    LanguageServerLog(LanguageServerId, LanguageServerLogType, String),
-    // [`lsp::notification::DidOpenTextDocument`] was sent to this server using the buffer data.
-    // Zed's buffer-related data is updated accordingly.
-    LanguageServerBufferRegistered {
-        server_id: LanguageServerId,
-        buffer_id: BufferId,
-        buffer_abs_path: PathBuf,
-        name: Option<LanguageServerName>,
-    },
-    ToggleLspLogs {
-        server_id: LanguageServerId,
-        enabled: bool,
-        toggled_log_kind: LogKind,
-    },
-    Toast {
-        notification_id: SharedString,
-        message: String,
-    },
-    HideToast {
-        notification_id: SharedString,
-    },
-    LanguageServerPrompt(LanguageServerPromptRequest),
-    LanguageNotFound(Entity<Buffer>),
-    ActiveEntryChanged(Option<ProjectEntryId>),
-    ActivateProjectPanel,
-    WorktreeAdded(WorktreeId),
-    WorktreeOrderChanged,
-    WorktreeRemoved(WorktreeId),
-    WorktreeUpdatedEntries(WorktreeId, UpdatedEntriesSet),
-    DiskBasedDiagnosticsStarted {
-        language_server_id: LanguageServerId,
-    },
-    DiskBasedDiagnosticsFinished {
-        language_server_id: LanguageServerId,
-    },
-    DiagnosticsUpdated {
-        paths: Vec<ProjectPath>,
-        language_server_id: LanguageServerId,
-    },
-    RemoteIdChanged(Option<u64>),
-    DisconnectedFromHost,
-    DisconnectedFromSshRemote,
-    Closed,
-    DeletedEntry(WorktreeId, ProjectEntryId),
-    CollaboratorUpdated {
-        old_peer_id: proto::PeerId,
-        new_peer_id: proto::PeerId,
-    },
-    CollaboratorJoined(proto::PeerId),
-    CollaboratorLeft(proto::PeerId),
-    HostReshared,
-    Reshared,
-    Rejoined,
-    RefreshInlayHints {
-        server_id: LanguageServerId,
-        request_id: Option<usize>,
-    },
-    RefreshCodeLens,
-    RevealInProjectPanel(ProjectEntryId),
-    SnippetEdit(BufferId, Vec<(lsp::Range, Snippet)>),
-    ExpandedAllForEntry(WorktreeId, ProjectEntryId),
-    EntryRenamed(ProjectTransaction, ProjectPath, PathBuf),
-    AgentLocationChanged,
-}
-
-pub struct AgentLocationChanged;
-
-pub enum DebugAdapterClientState {
-    Starting(Task<Option<Arc<DebugAdapterClient>>>),
-    Running(Arc<DebugAdapterClient>),
-}
-
-#[derive(Clone, Debug, Eq, PartialEq, Hash, PartialOrd, Ord)]
-pub struct ProjectPath {
-    pub worktree_id: WorktreeId,
-    pub path: Arc<RelPath>,
-}
-
-impl ProjectPath {
-    pub fn from_file(value: &dyn language::File, cx: &App) -> Self {
-        ProjectPath {
-            worktree_id: value.worktree_id(cx),
-            path: value.path().clone(),
-        }
-    }
-
-    pub fn from_proto(p: proto::ProjectPath) -> Option<Self> {
-        Some(Self {
-            worktree_id: WorktreeId::from_proto(p.worktree_id),
-            path: RelPath::from_proto(&p.path).log_err()?,
-        })
-    }
-
-    pub fn to_proto(&self) -> proto::ProjectPath {
-        proto::ProjectPath {
-            worktree_id: self.worktree_id.to_proto(),
-            path: self.path.as_ref().to_proto(),
-        }
-    }
-
-    pub fn root_path(worktree_id: WorktreeId) -> Self {
-        Self {
-            worktree_id,
-            path: RelPath::empty().into(),
-        }
-    }
-
-    pub fn starts_with(&self, other: &ProjectPath) -> bool {
-        self.worktree_id == other.worktree_id && self.path.starts_with(&other.path)
-    }
-}
-
-#[derive(Debug, Default)]
-pub enum PrepareRenameResponse {
-    Success(Range<Anchor>),
-    OnlyUnpreparedRenameSupported,
-    #[default]
-    InvalidPosition,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub enum InlayId {
-    EditPrediction(usize),
-    DebuggerValue(usize),
-    // LSP
-    Hint(usize),
-    Color(usize),
-}
-
-impl InlayId {
-    pub fn id(&self) -> usize {
-        match self {
-            Self::EditPrediction(id) => *id,
-            Self::DebuggerValue(id) => *id,
-            Self::Hint(id) => *id,
-            Self::Color(id) => *id,
-        }
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct InlayHint {
-    pub position: language::Anchor,
-    pub label: InlayHintLabel,
-    pub kind: Option<InlayHintKind>,
-    pub padding_left: bool,
-    pub padding_right: bool,
-    pub tooltip: Option<InlayHintTooltip>,
-    pub resolve_state: ResolveState,
-}
-
-/// The user's intent behind a given completion confirmation
-#[derive(PartialEq, Eq, Hash, Debug, Clone, Copy)]
-pub enum CompletionIntent {
-    /// The user intends to 'commit' this result, if possible
-    /// completion confirmations should run side effects.
-    ///
-    /// For LSP completions, will respect the setting `completions.lsp_insert_mode`.
-    Complete,
-    /// Similar to [Self::Complete], but behaves like `lsp_insert_mode` is set to `insert`.
-    CompleteWithInsert,
-    /// Similar to [Self::Complete], but behaves like `lsp_insert_mode` is set to `replace`.
-    CompleteWithReplace,
-    /// The user intends to continue 'composing' this completion
-    /// completion confirmations should not run side effects and
-    /// let the user continue composing their action
-    Compose,
-}
-
-impl CompletionIntent {
-    pub fn is_complete(&self) -> bool {
-        self == &Self::Complete
-    }
-
-    pub fn is_compose(&self) -> bool {
-        self == &Self::Compose
-    }
-}
-
-/// Similar to `CoreCompletion`, but with extra metadata attached.
-#[derive(Clone)]
-pub struct Completion {
-    /// The range of text that will be replaced by this completion.
-    pub replace_range: Range<Anchor>,
-    /// The new text that will be inserted.
-    pub new_text: String,
-    /// A label for this completion that is shown in the menu.
-    pub label: CodeLabel,
-    /// The documentation for this completion.
-    pub documentation: Option<CompletionDocumentation>,
-    /// Completion data source which it was constructed from.
-    pub source: CompletionSource,
-    /// A path to an icon for this completion that is shown in the menu.
-    pub icon_path: Option<SharedString>,
-    /// Text starting here and ending at the cursor will be used as the query for filtering this completion.
-    ///
-    /// If None, the start of the surrounding word is used.
-    pub match_start: Option<text::Anchor>,
-    /// Key used for de-duplicating snippets. If None, always considered unique.
-    pub snippet_deduplication_key: Option<(usize, usize)>,
-    /// Whether to adjust indentation (the default) or not.
-    pub insert_text_mode: Option<InsertTextMode>,
-    /// An optional callback to invoke when this completion is confirmed.
-    /// Returns, whether new completions should be retriggered after the current one.
-    /// If `true` is returned, the editor will show a new completion menu after this completion is confirmed.
-    /// if no confirmation is provided or `false` is returned, the completion will be committed.
-    pub confirm: Option<Arc<dyn Send + Sync + Fn(CompletionIntent, &mut Window, &mut App) -> bool>>,
-}
-
-#[derive(Debug, Clone)]
-pub enum CompletionSource {
-    Lsp {
-        /// The alternate `insert` range, if provided by the LSP server.
-        insert_range: Option<Range<Anchor>>,
-        /// The id of the language server that produced this completion.
-        server_id: LanguageServerId,
-        /// The raw completion provided by the language server.
-        lsp_completion: Box<lsp::CompletionItem>,
-        /// A set of defaults for this completion item.
-        lsp_defaults: Option<Arc<lsp::CompletionListItemDefaults>>,
-        /// Whether this completion has been resolved, to ensure it happens once per completion.
-        resolved: bool,
-    },
-    Dap {
-        /// The sort text for this completion.
-        sort_text: String,
-    },
-    Custom,
-    BufferWord {
-        word_range: Range<Anchor>,
-        resolved: bool,
-    },
-}
-
-impl CompletionSource {
-    pub fn server_id(&self) -> Option<LanguageServerId> {
-        if let CompletionSource::Lsp { server_id, .. } = self {
-            Some(*server_id)
-        } else {
-            None
-        }
-    }
-
-    pub fn lsp_completion(&self, apply_defaults: bool) -> Option<Cow<'_, lsp::CompletionItem>> {
-        if let Self::Lsp {
-            lsp_completion,
-            lsp_defaults,
-            ..
-        } = self
-        {
-            if apply_defaults && let Some(lsp_defaults) = lsp_defaults {
-                let mut completion_with_defaults = *lsp_completion.clone();
-                let default_commit_characters = lsp_defaults.commit_characters.as_ref();
-                let default_edit_range = lsp_defaults.edit_range.as_ref();
-                let default_insert_text_format = lsp_defaults.insert_text_format.as_ref();
-                let default_insert_text_mode = lsp_defaults.insert_text_mode.as_ref();
-
-                if default_commit_characters.is_some()
-                    || default_edit_range.is_some()
-                    || default_insert_text_format.is_some()
-                    || default_insert_text_mode.is_some()
-                {
-                    if completion_with_defaults.commit_characters.is_none()
-                        && default_commit_characters.is_some()
-                    {
-                        completion_with_defaults.commit_characters =
-                            default_commit_characters.cloned()
-                    }
-                    if completion_with_defaults.text_edit.is_none() {
-                        match default_edit_range {
-                            Some(lsp::CompletionListItemDefaultsEditRange::Range(range)) => {
-                                completion_with_defaults.text_edit =
-                                    Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
-                                        range: *range,
-                                        new_text: completion_with_defaults.label.clone(),
-                                    }))
-                            }
-                            Some(lsp::CompletionListItemDefaultsEditRange::InsertAndReplace {
-                                insert,
-                                replace,
-                            }) => {
-                                completion_with_defaults.text_edit =
-                                    Some(lsp::CompletionTextEdit::InsertAndReplace(
-                                        lsp::InsertReplaceEdit {
-                                            new_text: completion_with_defaults.label.clone(),
-                                            insert: *insert,
-                                            replace: *replace,
-                                        },
-                                    ))
-                            }
-                            None => {}
-                        }
-                    }
-                    if completion_with_defaults.insert_text_format.is_none()
-                        && default_insert_text_format.is_some()
-                    {
-                        completion_with_defaults.insert_text_format =
-                            default_insert_text_format.cloned()
-                    }
-                    if completion_with_defaults.insert_text_mode.is_none()
-                        && default_insert_text_mode.is_some()
-                    {
-                        completion_with_defaults.insert_text_mode =
-                            default_insert_text_mode.cloned()
-                    }
-                }
-                return Some(Cow::Owned(completion_with_defaults));
-            }
-            Some(Cow::Borrowed(lsp_completion))
-        } else {
-            None
-        }
-    }
-}
-
-impl std::fmt::Debug for Completion {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("Completion")
-            .field("replace_range", &self.replace_range)
-            .field("new_text", &self.new_text)
-            .field("label", &self.label)
-            .field("documentation", &self.documentation)
-            .field("source", &self.source)
-            .finish()
-    }
-}
-
-/// Response from a source of completions.
-pub struct CompletionResponse {
-    pub completions: Vec<Completion>,
-    pub display_options: CompletionDisplayOptions,
-    /// When false, indicates that the list is complete and so does not need to be re-queried if it
-    /// can be filtered instead.
-    pub is_incomplete: bool,
-}
-
-#[derive(Default)]
-pub struct CompletionDisplayOptions {
-    pub dynamic_width: bool,
-}
-
-impl CompletionDisplayOptions {
-    pub fn merge(&mut self, other: &CompletionDisplayOptions) {
-        self.dynamic_width = self.dynamic_width && other.dynamic_width;
-    }
-}
-
-/// Response from language server completion request.
-#[derive(Clone, Debug, Default)]
-pub(crate) struct CoreCompletionResponse {
-    pub completions: Vec<CoreCompletion>,
-    /// When false, indicates that the list is complete and so does not need to be re-queried if it
-    /// can be filtered instead.
-    pub is_incomplete: bool,
-}
-
-/// A generic completion that can come from different sources.
-#[derive(Clone, Debug)]
-pub(crate) struct CoreCompletion {
-    replace_range: Range<Anchor>,
-    new_text: String,
-    source: CompletionSource,
-}
-
-/// A code action provided by a language server.
-#[derive(Clone, Debug, PartialEq)]
-pub struct CodeAction {
-    /// The id of the language server that produced this code action.
-    pub server_id: LanguageServerId,
-    /// The range of the buffer where this code action is applicable.
-    pub range: Range<Anchor>,
-    /// The raw code action provided by the language server.
-    /// Can be either an action or a command.
-    pub lsp_action: LspAction,
-    /// Whether the action needs to be resolved using the language server.
-    pub resolved: bool,
-}
-
-/// An action sent back by a language server.
-#[derive(Clone, Debug, PartialEq)]
-pub enum LspAction {
-    /// An action with the full data, may have a command or may not.
-    /// May require resolving.
-    Action(Box<lsp::CodeAction>),
-    /// A command data to run as an action.
-    Command(lsp::Command),
-    /// A code lens data to run as an action.
-    CodeLens(lsp::CodeLens),
-}
-
-impl LspAction {
-    pub fn title(&self) -> &str {
-        match self {
-            Self::Action(action) => &action.title,
-            Self::Command(command) => &command.title,
-            Self::CodeLens(lens) => lens
-                .command
-                .as_ref()
-                .map(|command| command.title.as_str())
-                .unwrap_or("Unknown command"),
-        }
-    }
-
-    fn action_kind(&self) -> Option<lsp::CodeActionKind> {
-        match self {
-            Self::Action(action) => action.kind.clone(),
-            Self::Command(_) => Some(lsp::CodeActionKind::new("command")),
-            Self::CodeLens(_) => Some(lsp::CodeActionKind::new("code lens")),
-        }
-    }
-
-    fn edit(&self) -> Option<&lsp::WorkspaceEdit> {
-        match self {
-            Self::Action(action) => action.edit.as_ref(),
-            Self::Command(_) => None,
-            Self::CodeLens(_) => None,
-        }
-    }
-
-    fn command(&self) -> Option<&lsp::Command> {
-        match self {
-            Self::Action(action) => action.command.as_ref(),
-            Self::Command(command) => Some(command),
-            Self::CodeLens(lens) => lens.command.as_ref(),
-        }
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum ResolveState {
-    Resolved,
-    CanResolve(LanguageServerId, Option<lsp::LSPAny>),
-    Resolving,
-}
-impl InlayHint {
-    pub fn text(&self) -> Rope {
-        match &self.label {
-            InlayHintLabel::String(s) => Rope::from(s),
-            InlayHintLabel::LabelParts(parts) => parts.iter().map(|part| &*part.value).collect(),
-        }
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum InlayHintLabel {
-    String(String),
-    LabelParts(Vec<InlayHintLabelPart>),
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct InlayHintLabelPart {
-    pub value: String,
-    pub tooltip: Option<InlayHintLabelPartTooltip>,
-    pub location: Option<(LanguageServerId, lsp::Location)>,
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum InlayHintTooltip {
-    String(String),
-    MarkupContent(MarkupContent),
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum InlayHintLabelPartTooltip {
-    String(String),
-    MarkupContent(MarkupContent),
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct MarkupContent {
-    pub kind: HoverBlockKind,
-    pub value: String,
-}
-
-#[derive(Debug, Clone, PartialEq)]
-pub struct LocationLink {
-    pub origin: Option<Location>,
-    pub target: Location,
-}
-
-#[derive(Debug)]
-pub struct DocumentHighlight {
-    pub range: Range<language::Anchor>,
-    pub kind: DocumentHighlightKind,
-}
-
-#[derive(Clone, Debug)]
-pub struct Symbol {
-    pub language_server_name: LanguageServerName,
-    pub source_worktree_id: WorktreeId,
-    pub source_language_server_id: LanguageServerId,
-    pub path: SymbolLocation,
-    pub label: CodeLabel,
-    pub name: String,
-    pub kind: lsp::SymbolKind,
-    pub range: Range<Unclipped<PointUtf16>>,
-}
-
-#[derive(Clone, Debug)]
-pub struct DocumentSymbol {
-    pub name: String,
-    pub kind: lsp::SymbolKind,
-    pub range: Range<Unclipped<PointUtf16>>,
-    pub selection_range: Range<Unclipped<PointUtf16>>,
-    pub children: Vec<DocumentSymbol>,
-}
-
-#[derive(Clone, Debug, PartialEq)]
-pub struct HoverBlock {
-    pub text: String,
-    pub kind: HoverBlockKind,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum HoverBlockKind {
-    PlainText,
-    Markdown,
-    Code { language: String },
-}
-
-#[derive(Debug, Clone)]
-pub struct Hover {
-    pub contents: Vec<HoverBlock>,
-    pub range: Option<Range<language::Anchor>>,
-    pub language: Option<Arc<Language>>,
-}
-
-impl Hover {
-    pub fn is_empty(&self) -> bool {
-        self.contents.iter().all(|block| block.text.is_empty())
-    }
-}
-
-enum EntitySubscription {
-    Project(PendingEntitySubscription<Project>),
-    BufferStore(PendingEntitySubscription<BufferStore>),
-    GitStore(PendingEntitySubscription<GitStore>),
-    WorktreeStore(PendingEntitySubscription<WorktreeStore>),
-    LspStore(PendingEntitySubscription<LspStore>),
-    SettingsObserver(PendingEntitySubscription<SettingsObserver>),
-    DapStore(PendingEntitySubscription<DapStore>),
-}
-
-#[derive(Debug, Clone)]
-pub struct DirectoryItem {
-    pub path: PathBuf,
-    pub is_dir: bool,
-}
-
-#[derive(Clone, Debug, PartialEq)]
-pub struct DocumentColor {
-    pub lsp_range: lsp::Range,
-    pub color: lsp::Color,
-    pub resolved: bool,
-    pub color_presentations: Vec<ColorPresentation>,
-}
-
-impl Eq for DocumentColor {}
-
-impl std::hash::Hash for DocumentColor {
-    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-        self.lsp_range.hash(state);
-        self.color.red.to_bits().hash(state);
-        self.color.green.to_bits().hash(state);
-        self.color.blue.to_bits().hash(state);
-        self.color.alpha.to_bits().hash(state);
-        self.resolved.hash(state);
-        self.color_presentations.hash(state);
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct ColorPresentation {
-    pub label: SharedString,
-    pub text_edit: Option<lsp::TextEdit>,
-    pub additional_text_edits: Vec<lsp::TextEdit>,
-}
-
-impl std::hash::Hash for ColorPresentation {
-    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-        self.label.hash(state);
-        if let Some(ref edit) = self.text_edit {
-            edit.range.hash(state);
-            edit.new_text.hash(state);
-        }
-        self.additional_text_edits.len().hash(state);
-        for edit in &self.additional_text_edits {
-            edit.range.hash(state);
-            edit.new_text.hash(state);
-        }
-    }
-}
-
-#[derive(Clone)]
-pub enum DirectoryLister {
-    Project(Entity<Project>),
-    Local(Entity<Project>, Arc<dyn Fs>),
-}
-
-impl std::fmt::Debug for DirectoryLister {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            DirectoryLister::Project(project) => {
-                write!(f, "DirectoryLister::Project({project:?})")
-            }
-            DirectoryLister::Local(project, _) => {
-                write!(f, "DirectoryLister::Local({project:?})")
-            }
-        }
-    }
-}
-
-impl DirectoryLister {
-    pub fn is_local(&self, cx: &App) -> bool {
-        match self {
-            DirectoryLister::Local(..) => true,
-            DirectoryLister::Project(project) => project.read(cx).is_local(),
-        }
-    }
-
-    pub fn resolve_tilde<'a>(&self, path: &'a String, cx: &App) -> Cow<'a, str> {
-        if self.is_local(cx) {
-            shellexpand::tilde(path)
-        } else {
-            Cow::from(path)
-        }
-    }
-
-    pub fn default_query(&self, cx: &mut App) -> String {
-        let project = match self {
-            DirectoryLister::Project(project) => project,
-            DirectoryLister::Local(project, _) => project,
-        }
-        .read(cx);
-        let path_style = project.path_style(cx);
-        project
-            .visible_worktrees(cx)
-            .next()
-            .map(|worktree| worktree.read(cx).abs_path().to_string_lossy().into_owned())
-            .or_else(|| std::env::home_dir().map(|dir| dir.to_string_lossy().into_owned()))
-            .map(|mut s| {
-                s.push_str(path_style.primary_separator());
-                s
-            })
-            .unwrap_or_else(|| {
-                if path_style.is_windows() {
-                    "C:\\"
-                } else {
-                    "~/"
-                }
-                .to_string()
-            })
-    }
-
-    pub fn list_directory(&self, path: String, cx: &mut App) -> Task<Result<Vec<DirectoryItem>>> {
-        match self {
-            DirectoryLister::Project(project) => {
-                project.update(cx, |project, cx| project.list_directory(path, cx))
-            }
-            DirectoryLister::Local(_, fs) => {
-                let fs = fs.clone();
-                cx.background_spawn(async move {
-                    let mut results = vec![];
-                    let expanded = shellexpand::tilde(&path);
-                    let query = Path::new(expanded.as_ref());
-                    let mut response = fs.read_dir(query).await?;
-                    while let Some(path) = response.next().await {
-                        let path = path?;
-                        if let Some(file_name) = path.file_name() {
-                            results.push(DirectoryItem {
-                                path: PathBuf::from(file_name.to_os_string()),
-                                is_dir: fs.is_dir(&path).await,
-                            });
-                        }
-                    }
-                    Ok(results)
-                })
-            }
-        }
-    }
-}
-
-#[cfg(any(test, feature = "test-support"))]
-pub const DEFAULT_COMPLETION_CONTEXT: CompletionContext = CompletionContext {
-    trigger_kind: lsp::CompletionTriggerKind::INVOKED,
-    trigger_character: None,
-};
-
-/// An LSP diagnostics associated with a certain language server.
-#[derive(Clone, Debug, Default)]
-pub enum LspPullDiagnostics {
-    #[default]
-    Default,
-    Response {
-        /// The id of the language server that produced diagnostics.
-        server_id: LanguageServerId,
-        /// URI of the resource,
-        uri: lsp::Uri,
-        /// The ID provided by the dynamic registration that produced diagnostics.
-        registration_id: Option<SharedString>,
-        /// The diagnostics produced by this language server.
-        diagnostics: PulledDiagnostics,
-    },
-}
-
-#[derive(Clone, Debug)]
-pub enum PulledDiagnostics {
-    Unchanged {
-        /// An ID the current pulled batch for this file.
-        /// If given, can be used to query workspace diagnostics partially.
-        result_id: SharedString,
-    },
-    Changed {
-        result_id: Option<SharedString>,
-        diagnostics: Vec<lsp::Diagnostic>,
-    },
-}
-
-/// Whether to disable all AI features in Zed.
-///
-/// Default: false
-#[derive(Copy, Clone, Debug, RegisterSetting)]
-pub struct DisableAiSettings {
-    pub disable_ai: bool,
-}
-
-impl settings::Settings for DisableAiSettings {
-    fn from_settings(content: &settings::SettingsContent) -> Self {
-        Self {
-            disable_ai: content.disable_ai.unwrap().0,
-        }
-    }
-}
-
-impl Project {
-    pub fn init(client: &Arc<Client>, cx: &mut App) {
-        connection_manager::init(client.clone(), cx);
-
-        let client: AnyProtoClient = client.clone().into();
-        client.add_entity_message_handler(Self::handle_add_collaborator);
-        client.add_entity_message_handler(Self::handle_update_project_collaborator);
-        client.add_entity_message_handler(Self::handle_remove_collaborator);
-        client.add_entity_message_handler(Self::handle_update_project);
-        client.add_entity_message_handler(Self::handle_unshare_project);
-        client.add_entity_request_handler(Self::handle_update_buffer);
-        client.add_entity_message_handler(Self::handle_update_worktree);
-        client.add_entity_request_handler(Self::handle_synchronize_buffers);
-
-        client.add_entity_request_handler(Self::handle_search_candidate_buffers);
-        client.add_entity_request_handler(Self::handle_open_buffer_by_id);
-        client.add_entity_request_handler(Self::handle_open_buffer_by_path);
-        client.add_entity_request_handler(Self::handle_open_new_buffer);
-        client.add_entity_message_handler(Self::handle_create_buffer_for_peer);
-        client.add_entity_message_handler(Self::handle_toggle_lsp_logs);
-        client.add_entity_message_handler(Self::handle_create_image_for_peer);
-
-        WorktreeStore::init(&client);
-        BufferStore::init(&client);
-        LspStore::init(&client);
-        GitStore::init(&client);
-        SettingsObserver::init(&client);
-        TaskStore::init(Some(&client));
-        ToolchainStore::init(&client);
-        DapStore::init(&client, cx);
-        BreakpointStore::init(&client);
-        context_server_store::init(cx);
-    }
-
-    pub fn local(
-        client: Arc<Client>,
-        node: NodeRuntime,
-        user_store: Entity<UserStore>,
-        languages: Arc<LanguageRegistry>,
-        fs: Arc<dyn Fs>,
-        env: Option<HashMap<String, String>>,
-        cx: &mut App,
-    ) -> Entity<Self> {
-        cx.new(|cx: &mut Context<Self>| {
-            let (tx, rx) = mpsc::unbounded();
-            cx.spawn(async move |this, cx| Self::send_buffer_ordered_messages(this, rx, cx).await)
-                .detach();
-            let snippets = SnippetProvider::new(fs.clone(), BTreeSet::from_iter([]), cx);
-            let worktree_store = cx.new(|_| WorktreeStore::local(false, fs.clone()));
-            cx.subscribe(&worktree_store, Self::on_worktree_store_event)
-                .detach();
-
-            let weak_self = cx.weak_entity();
-            let context_server_store =
-                cx.new(|cx| ContextServerStore::new(worktree_store.clone(), weak_self.clone(), cx));
-
-            let environment = cx.new(|cx| {
-                ProjectEnvironment::new(env, worktree_store.downgrade(), None, false, cx)
-            });
-            let manifest_tree = ManifestTree::new(worktree_store.clone(), cx);
-            let toolchain_store = cx.new(|cx| {
-                ToolchainStore::local(
-                    languages.clone(),
-                    worktree_store.clone(),
-                    environment.clone(),
-                    manifest_tree.clone(),
-                    fs.clone(),
-                    cx,
-                )
-            });
-
-            let buffer_store = cx.new(|cx| BufferStore::local(worktree_store.clone(), cx));
-            cx.subscribe(&buffer_store, Self::on_buffer_store_event)
-                .detach();
-
-            let breakpoint_store =
-                cx.new(|_| BreakpointStore::local(worktree_store.clone(), buffer_store.clone()));
-
-            let dap_store = cx.new(|cx| {
-                DapStore::new_local(
-                    client.http_client(),
-                    node.clone(),
-                    fs.clone(),
-                    environment.clone(),
-                    toolchain_store.read(cx).as_language_toolchain_store(),
-                    worktree_store.clone(),
-                    breakpoint_store.clone(),
-                    false,
-                    cx,
-                )
-            });
-            cx.subscribe(&dap_store, Self::on_dap_store_event).detach();
-
-            let image_store = cx.new(|cx| ImageStore::local(worktree_store.clone(), cx));
-            cx.subscribe(&image_store, Self::on_image_store_event)
-                .detach();
-
-            let prettier_store = cx.new(|cx| {
-                PrettierStore::new(
-                    node.clone(),
-                    fs.clone(),
-                    languages.clone(),
-                    worktree_store.clone(),
-                    cx,
-                )
-            });
-
-            let task_store = cx.new(|cx| {
-                TaskStore::local(
-                    buffer_store.downgrade(),
-                    worktree_store.clone(),
-                    toolchain_store.read(cx).as_language_toolchain_store(),
-                    environment.clone(),
-                    cx,
-                )
-            });
-
-            let settings_observer = cx.new(|cx| {
-                SettingsObserver::new_local(
-                    fs.clone(),
-                    worktree_store.clone(),
-                    task_store.clone(),
-                    cx,
-                )
-            });
-            cx.subscribe(&settings_observer, Self::on_settings_observer_event)
-                .detach();
-
-            let lsp_store = cx.new(|cx| {
-                LspStore::new_local(
-                    buffer_store.clone(),
-                    worktree_store.clone(),
-                    prettier_store.clone(),
-                    toolchain_store
-                        .read(cx)
-                        .as_local_store()
-                        .expect("Toolchain store to be local")
-                        .clone(),
-                    environment.clone(),
-                    manifest_tree,
-                    languages.clone(),
-                    client.http_client(),
-                    fs.clone(),
-                    cx,
-                )
-            });
-
-            let git_store = cx.new(|cx| {
-                GitStore::local(
-                    &worktree_store,
-                    buffer_store.clone(),
-                    environment.clone(),
-                    fs.clone(),
-                    cx,
-                )
-            });
-
-            let agent_server_store = cx.new(|cx| {
-                AgentServerStore::local(
-                    node.clone(),
-                    fs.clone(),
-                    environment.clone(),
-                    client.http_client(),
-                    cx,
-                )
-            });
-
-            cx.subscribe(&lsp_store, Self::on_lsp_store_event).detach();
-
-            Self {
-                buffer_ordered_messages_tx: tx,
-                collaborators: Default::default(),
-                worktree_store,
-                buffer_store,
-                image_store,
-                lsp_store,
-                context_server_store,
-                join_project_response_message_id: 0,
-                client_state: ProjectClientState::Local,
-                git_store,
-                client_subscriptions: Vec::new(),
-                _subscriptions: vec![cx.on_release(Self::release)],
-                active_entry: None,
-                snippets,
-                languages,
-                collab_client: client,
-                task_store,
-                user_store,
-                settings_observer,
-                fs,
-                remote_client: None,
-                breakpoint_store,
-                dap_store,
-                agent_server_store,
-
-                buffers_needing_diff: Default::default(),
-                git_diff_debouncer: DebouncedDelay::new(),
-                terminals: Terminals {
-                    local_handles: Vec::new(),
-                },
-                node: Some(node),
-                search_history: Self::new_search_history(),
-                environment,
-                remotely_created_models: Default::default(),
-
-                search_included_history: Self::new_search_history(),
-                search_excluded_history: Self::new_search_history(),
-
-                toolchain_store: Some(toolchain_store),
-
-                agent_location: None,
-            }
-        })
-    }
-
-    pub fn remote(
-        remote: Entity<RemoteClient>,
-        client: Arc<Client>,
-        node: NodeRuntime,
-        user_store: Entity<UserStore>,
-        languages: Arc<LanguageRegistry>,
-        fs: Arc<dyn Fs>,
-        cx: &mut App,
-    ) -> Entity<Self> {
-        cx.new(|cx: &mut Context<Self>| {
-            let (tx, rx) = mpsc::unbounded();
-            cx.spawn(async move |this, cx| Self::send_buffer_ordered_messages(this, rx, cx).await)
-                .detach();
-            let snippets = SnippetProvider::new(fs.clone(), BTreeSet::from_iter([]), cx);
-
-            let (remote_proto, path_style) =
-                remote.read_with(cx, |remote, _| (remote.proto_client(), remote.path_style()));
-            let worktree_store = cx.new(|_| {
-                WorktreeStore::remote(
-                    false,
-                    remote_proto.clone(),
-                    REMOTE_SERVER_PROJECT_ID,
-                    path_style,
-                )
-            });
-            cx.subscribe(&worktree_store, Self::on_worktree_store_event)
-                .detach();
-
-            let weak_self = cx.weak_entity();
-            let context_server_store =
-                cx.new(|cx| ContextServerStore::new(worktree_store.clone(), weak_self.clone(), cx));
-
-            let buffer_store = cx.new(|cx| {
-                BufferStore::remote(
-                    worktree_store.clone(),
-                    remote.read(cx).proto_client(),
-                    REMOTE_SERVER_PROJECT_ID,
-                    cx,
-                )
-            });
-            let image_store = cx.new(|cx| {
-                ImageStore::remote(
-                    worktree_store.clone(),
-                    remote.read(cx).proto_client(),
-                    REMOTE_SERVER_PROJECT_ID,
-                    cx,
-                )
-            });
-            cx.subscribe(&buffer_store, Self::on_buffer_store_event)
-                .detach();
-            let toolchain_store = cx.new(|cx| {
-                ToolchainStore::remote(REMOTE_SERVER_PROJECT_ID, remote.read(cx).proto_client(), cx)
-            });
-            let task_store = cx.new(|cx| {
-                TaskStore::remote(
-                    buffer_store.downgrade(),
-                    worktree_store.clone(),
-                    toolchain_store.read(cx).as_language_toolchain_store(),
-                    remote.read(cx).proto_client(),
-                    REMOTE_SERVER_PROJECT_ID,
-                    cx,
-                )
-            });
-
-            let settings_observer = cx.new(|cx| {
-                SettingsObserver::new_remote(
-                    fs.clone(),
-                    worktree_store.clone(),
-                    task_store.clone(),
-                    Some(remote_proto.clone()),
-                    cx,
-                )
-            });
-            cx.subscribe(&settings_observer, Self::on_settings_observer_event)
-                .detach();
-
-            let environment = cx.new(|cx| {
-                ProjectEnvironment::new(
-                    None,
-                    worktree_store.downgrade(),
-                    Some(remote.downgrade()),
-                    false,
-                    cx,
-                )
-            });
-
-            let lsp_store = cx.new(|cx| {
-                LspStore::new_remote(
-                    buffer_store.clone(),
-                    worktree_store.clone(),
-                    languages.clone(),
-                    remote_proto.clone(),
-                    REMOTE_SERVER_PROJECT_ID,
-                    cx,
-                )
-            });
-            cx.subscribe(&lsp_store, Self::on_lsp_store_event).detach();
-
-            let breakpoint_store =
-                cx.new(|_| BreakpointStore::remote(REMOTE_SERVER_PROJECT_ID, remote_proto.clone()));
-
-            let dap_store = cx.new(|cx| {
-                DapStore::new_remote(
-                    REMOTE_SERVER_PROJECT_ID,
-                    remote.clone(),
-                    breakpoint_store.clone(),
-                    worktree_store.clone(),
-                    node.clone(),
-                    client.http_client(),
-                    fs.clone(),
-                    cx,
-                )
-            });
-
-            let git_store = cx.new(|cx| {
-                GitStore::remote(
-                    &worktree_store,
-                    buffer_store.clone(),
-                    remote_proto.clone(),
-                    REMOTE_SERVER_PROJECT_ID,
-                    cx,
-                )
-            });
-
-            let agent_server_store =
-                cx.new(|_| AgentServerStore::remote(REMOTE_SERVER_PROJECT_ID, remote.clone()));
-
-            cx.subscribe(&remote, Self::on_remote_client_event).detach();
-
-            let this = Self {
-                buffer_ordered_messages_tx: tx,
-                collaborators: Default::default(),
-                worktree_store,
-                buffer_store,
-                image_store,
-                lsp_store,
-                context_server_store,
-                breakpoint_store,
-                dap_store,
-                join_project_response_message_id: 0,
-                client_state: ProjectClientState::Local,
-                git_store,
-                agent_server_store,
-                client_subscriptions: Vec::new(),
-                _subscriptions: vec![
-                    cx.on_release(Self::release),
-                    cx.on_app_quit(|this, cx| {
-                        let shutdown = this.remote_client.take().and_then(|client| {
-                            client.update(cx, |client, cx| {
-                                client.shutdown_processes(
-                                    Some(proto::ShutdownRemoteServer {}),
-                                    cx.background_executor().clone(),
-                                )
-                            })
-                        });
-
-                        cx.background_executor().spawn(async move {
-                            if let Some(shutdown) = shutdown {
-                                shutdown.await;
-                            }
-                        })
-                    }),
-                ],
-                active_entry: None,
-                snippets,
-                languages,
-                collab_client: client,
-                task_store,
-                user_store,
-                settings_observer,
-                fs,
-                remote_client: Some(remote.clone()),
-                buffers_needing_diff: Default::default(),
-                git_diff_debouncer: DebouncedDelay::new(),
-                terminals: Terminals {
-                    local_handles: Vec::new(),
-                },
-                node: Some(node),
-                search_history: Self::new_search_history(),
-                environment,
-                remotely_created_models: Default::default(),
-
-                search_included_history: Self::new_search_history(),
-                search_excluded_history: Self::new_search_history(),
-
-                toolchain_store: Some(toolchain_store),
-                agent_location: None,
-            };
-
-            // remote server -> local machine handlers
-            remote_proto.subscribe_to_entity(REMOTE_SERVER_PROJECT_ID, &cx.entity());
-            remote_proto.subscribe_to_entity(REMOTE_SERVER_PROJECT_ID, &this.buffer_store);
-            remote_proto.subscribe_to_entity(REMOTE_SERVER_PROJECT_ID, &this.worktree_store);
-            remote_proto.subscribe_to_entity(REMOTE_SERVER_PROJECT_ID, &this.lsp_store);
-            remote_proto.subscribe_to_entity(REMOTE_SERVER_PROJECT_ID, &this.dap_store);
-            remote_proto.subscribe_to_entity(REMOTE_SERVER_PROJECT_ID, &this.settings_observer);
-            remote_proto.subscribe_to_entity(REMOTE_SERVER_PROJECT_ID, &this.git_store);
-            remote_proto.subscribe_to_entity(REMOTE_SERVER_PROJECT_ID, &this.agent_server_store);
-
-            remote_proto.add_entity_message_handler(Self::handle_create_buffer_for_peer);
-            remote_proto.add_entity_message_handler(Self::handle_create_image_for_peer);
-            remote_proto.add_entity_message_handler(Self::handle_update_worktree);
-            remote_proto.add_entity_message_handler(Self::handle_update_project);
-            remote_proto.add_entity_message_handler(Self::handle_toast);
-            remote_proto.add_entity_request_handler(Self::handle_language_server_prompt_request);
-            remote_proto.add_entity_message_handler(Self::handle_hide_toast);
-            remote_proto.add_entity_request_handler(Self::handle_update_buffer_from_remote_server);
-            BufferStore::init(&remote_proto);
-            LspStore::init(&remote_proto);
-            SettingsObserver::init(&remote_proto);
-            TaskStore::init(Some(&remote_proto));
-            ToolchainStore::init(&remote_proto);
-            DapStore::init(&remote_proto, cx);
-            GitStore::init(&remote_proto);
-            AgentServerStore::init_remote(&remote_proto);
-
-            this
-        })
-    }
-
-    pub async fn in_room(
-        remote_id: u64,
-        client: Arc<Client>,
-        user_store: Entity<UserStore>,
-        languages: Arc<LanguageRegistry>,
-        fs: Arc<dyn Fs>,
-        cx: AsyncApp,
-    ) -> Result<Entity<Self>> {
-        client.connect(true, &cx).await.into_response()?;
-
-        let subscriptions = [
-            EntitySubscription::Project(client.subscribe_to_entity::<Self>(remote_id)?),
-            EntitySubscription::BufferStore(client.subscribe_to_entity::<BufferStore>(remote_id)?),
-            EntitySubscription::GitStore(client.subscribe_to_entity::<GitStore>(remote_id)?),
-            EntitySubscription::WorktreeStore(
-                client.subscribe_to_entity::<WorktreeStore>(remote_id)?,
-            ),
-            EntitySubscription::LspStore(client.subscribe_to_entity::<LspStore>(remote_id)?),
-            EntitySubscription::SettingsObserver(
-                client.subscribe_to_entity::<SettingsObserver>(remote_id)?,
-            ),
-            EntitySubscription::DapStore(client.subscribe_to_entity::<DapStore>(remote_id)?),
-        ];
-        let committer = get_git_committer(&cx).await;
-        let response = client
-            .request_envelope(proto::JoinProject {
-                project_id: remote_id,
-                committer_email: committer.email,
-                committer_name: committer.name,
-            })
-            .await?;
-        Self::from_join_project_response(
-            response,
-            subscriptions,
-            client,
-            false,
-            user_store,
-            languages,
-            fs,
-            cx,
-        )
-        .await
-    }
-
-    async fn from_join_project_response(
-        response: TypedEnvelope<proto::JoinProjectResponse>,
-        subscriptions: [EntitySubscription; 7],
-        client: Arc<Client>,
-        run_tasks: bool,
-        user_store: Entity<UserStore>,
-        languages: Arc<LanguageRegistry>,
-        fs: Arc<dyn Fs>,
-        mut cx: AsyncApp,
-    ) -> Result<Entity<Self>> {
-        let remote_id = response.payload.project_id;
-        let role = response.payload.role();
-
-        let path_style = if response.payload.windows_paths {
-            PathStyle::Windows
-        } else {
-            PathStyle::Posix
-        };
-
-        let worktree_store = cx.new(|_| {
-            WorktreeStore::remote(
-                true,
-                client.clone().into(),
-                response.payload.project_id,
-                path_style,
-            )
-        })?;
-        let buffer_store = cx.new(|cx| {
-            BufferStore::remote(worktree_store.clone(), client.clone().into(), remote_id, cx)
-        })?;
-        let image_store = cx.new(|cx| {
-            ImageStore::remote(worktree_store.clone(), client.clone().into(), remote_id, cx)
-        })?;
-
-        let environment =
-            cx.new(|cx| ProjectEnvironment::new(None, worktree_store.downgrade(), None, true, cx))?;
-        let breakpoint_store =
-            cx.new(|_| BreakpointStore::remote(remote_id, client.clone().into()))?;
-        let dap_store = cx.new(|cx| {
-            DapStore::new_collab(
-                remote_id,
-                client.clone().into(),
-                breakpoint_store.clone(),
-                worktree_store.clone(),
-                fs.clone(),
-                cx,
-            )
-        })?;
-
-        let lsp_store = cx.new(|cx| {
-            LspStore::new_remote(
-                buffer_store.clone(),
-                worktree_store.clone(),
-                languages.clone(),
-                client.clone().into(),
-                remote_id,
-                cx,
-            )
-        })?;
-
-        let task_store = cx.new(|cx| {
-            if run_tasks {
-                TaskStore::remote(
-                    buffer_store.downgrade(),
-                    worktree_store.clone(),
-                    Arc::new(EmptyToolchainStore),
-                    client.clone().into(),
-                    remote_id,
-                    cx,
-                )
-            } else {
-                TaskStore::Noop
-            }
-        })?;
-
-        let settings_observer = cx.new(|cx| {
-            SettingsObserver::new_remote(
-                fs.clone(),
-                worktree_store.clone(),
-                task_store.clone(),
-                None,
-                cx,
-            )
-        })?;
-
-        let git_store = cx.new(|cx| {
-            GitStore::remote(
-                // In this remote case we pass None for the environment
-                &worktree_store,
-                buffer_store.clone(),
-                client.clone().into(),
-                remote_id,
-                cx,
-            )
-        })?;
-
-        let agent_server_store = cx.new(|cx| AgentServerStore::collab(cx))?;
-        let replica_id = ReplicaId::new(response.payload.replica_id as u16);
-
-        let project = cx.new(|cx| {
-            let snippets = SnippetProvider::new(fs.clone(), BTreeSet::from_iter([]), cx);
-
-            let weak_self = cx.weak_entity();
-            let context_server_store =
-                cx.new(|cx| ContextServerStore::new(worktree_store.clone(), weak_self, cx));
-
-            let mut worktrees = Vec::new();
-            for worktree in response.payload.worktrees {
-                let worktree = Worktree::remote(
-                    remote_id,
-                    replica_id,
-                    worktree,
-                    client.clone().into(),
-                    path_style,
-                    cx,
-                );
-                worktrees.push(worktree);
-            }
-
-            let (tx, rx) = mpsc::unbounded();
-            cx.spawn(async move |this, cx| Self::send_buffer_ordered_messages(this, rx, cx).await)
-                .detach();
-
-            cx.subscribe(&worktree_store, Self::on_worktree_store_event)
-                .detach();
-
-            cx.subscribe(&buffer_store, Self::on_buffer_store_event)
-                .detach();
-            cx.subscribe(&lsp_store, Self::on_lsp_store_event).detach();
-            cx.subscribe(&settings_observer, Self::on_settings_observer_event)
-                .detach();
-
-            cx.subscribe(&dap_store, Self::on_dap_store_event).detach();
-
-            let mut project = Self {
-                buffer_ordered_messages_tx: tx,
-                buffer_store: buffer_store.clone(),
-                image_store,
-                worktree_store: worktree_store.clone(),
-                lsp_store: lsp_store.clone(),
-                context_server_store,
-                active_entry: None,
-                collaborators: Default::default(),
-                join_project_response_message_id: response.message_id,
-                languages,
-                user_store: user_store.clone(),
-                task_store,
-                snippets,
-                fs,
-                remote_client: None,
-                settings_observer: settings_observer.clone(),
-                client_subscriptions: Default::default(),
-                _subscriptions: vec![cx.on_release(Self::release)],
-                collab_client: client.clone(),
-                client_state: ProjectClientState::Remote {
-                    sharing_has_stopped: false,
-                    capability: Capability::ReadWrite,
-                    remote_id,
-                    replica_id,
-                },
-                breakpoint_store,
-                dap_store: dap_store.clone(),
-                git_store: git_store.clone(),
-                agent_server_store,
-                buffers_needing_diff: Default::default(),
-                git_diff_debouncer: DebouncedDelay::new(),
-                terminals: Terminals {
-                    local_handles: Vec::new(),
-                },
-                node: None,
-                search_history: Self::new_search_history(),
-                search_included_history: Self::new_search_history(),
-                search_excluded_history: Self::new_search_history(),
-                environment,
-                remotely_created_models: Arc::new(Mutex::new(RemotelyCreatedModels::default())),
-                toolchain_store: None,
-                agent_location: None,
-            };
-            project.set_role(role, cx);
-            for worktree in worktrees {
-                project.add_worktree(&worktree, cx);
-            }
-            project
-        })?;
-
-        let weak_project = project.downgrade();
-        lsp_store
-            .update(&mut cx, |lsp_store, cx| {
-                lsp_store.set_language_server_statuses_from_proto(
-                    weak_project,
-                    response.payload.language_servers,
-                    response.payload.language_server_capabilities,
-                    cx,
-                );
-            })
-            .ok();
-
-        let subscriptions = subscriptions
-            .into_iter()
-            .map(|s| match s {
-                EntitySubscription::BufferStore(subscription) => {
-                    subscription.set_entity(&buffer_store, &cx)
-                }
-                EntitySubscription::WorktreeStore(subscription) => {
-                    subscription.set_entity(&worktree_store, &cx)
-                }
-                EntitySubscription::GitStore(subscription) => {
-                    subscription.set_entity(&git_store, &cx)
-                }
-                EntitySubscription::SettingsObserver(subscription) => {
-                    subscription.set_entity(&settings_observer, &cx)
-                }
-                EntitySubscription::Project(subscription) => subscription.set_entity(&project, &cx),
-                EntitySubscription::LspStore(subscription) => {
-                    subscription.set_entity(&lsp_store, &cx)
-                }
-                EntitySubscription::DapStore(subscription) => {
-                    subscription.set_entity(&dap_store, &cx)
-                }
-            })
-            .collect::<Vec<_>>();
-
-        let user_ids = response
-            .payload
-            .collaborators
-            .iter()
-            .map(|peer| peer.user_id)
-            .collect();
-        user_store
-            .update(&mut cx, |user_store, cx| user_store.get_users(user_ids, cx))?
-            .await?;
-
-        project.update(&mut cx, |this, cx| {
-            this.set_collaborators_from_proto(response.payload.collaborators, cx)?;
-            this.client_subscriptions.extend(subscriptions);
-            anyhow::Ok(())
-        })??;
-
-        Ok(project)
-    }
-
-    fn new_search_history() -> SearchHistory {
-        SearchHistory::new(
-            Some(MAX_PROJECT_SEARCH_HISTORY_SIZE),
-            search_history::QueryInsertionBehavior::AlwaysInsert,
-        )
-    }
-
-    fn release(&mut self, cx: &mut App) {
-        if let Some(client) = self.remote_client.take() {
-            let shutdown = client.update(cx, |client, cx| {
-                client.shutdown_processes(
-                    Some(proto::ShutdownRemoteServer {}),
-                    cx.background_executor().clone(),
-                )
-            });
-
-            cx.background_spawn(async move {
-                if let Some(shutdown) = shutdown {
-                    shutdown.await;
-                }
-            })
-            .detach()
-        }
-
-        match &self.client_state {
-            ProjectClientState::Local => {}
-            ProjectClientState::Shared { .. } => {
-                let _ = self.unshare_internal(cx);
-            }
-            ProjectClientState::Remote { remote_id, .. } => {
-                let _ = self.collab_client.send(proto::LeaveProject {
-                    project_id: *remote_id,
-                });
-                self.disconnected_from_host_internal(cx);
-            }
-        }
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub async fn example(
-        root_paths: impl IntoIterator<Item = &Path>,
-        cx: &mut AsyncApp,
-    ) -> Entity<Project> {
-        use clock::FakeSystemClock;
-
-        let fs = Arc::new(RealFs::new(None, cx.background_executor().clone()));
-        let languages = LanguageRegistry::test(cx.background_executor().clone());
-        let clock = Arc::new(FakeSystemClock::new());
-        let http_client = http_client::FakeHttpClient::with_404_response();
-        let client = cx
-            .update(|cx| client::Client::new(clock, http_client.clone(), cx))
-            .unwrap();
-        let user_store = cx.new(|cx| UserStore::new(client.clone(), cx)).unwrap();
-        let project = cx
-            .update(|cx| {
-                Project::local(
-                    client,
-                    node_runtime::NodeRuntime::unavailable(),
-                    user_store,
-                    Arc::new(languages),
-                    fs,
-                    None,
-                    cx,
-                )
-            })
-            .unwrap();
-        for path in root_paths {
-            let (tree, _) = project
-                .update(cx, |project, cx| {
-                    project.find_or_create_worktree(path, true, cx)
-                })
-                .unwrap()
-                .await
-                .unwrap();
-            tree.read_with(cx, |tree, _| tree.as_local().unwrap().scan_complete())
-                .unwrap()
-                .await;
-        }
-        project
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub async fn test(
-        fs: Arc<dyn Fs>,
-        root_paths: impl IntoIterator<Item = &Path>,
-        cx: &mut gpui::TestAppContext,
-    ) -> Entity<Project> {
-        use clock::FakeSystemClock;
-
-        let languages = LanguageRegistry::test(cx.executor());
-        let clock = Arc::new(FakeSystemClock::new());
-        let http_client = http_client::FakeHttpClient::with_404_response();
-        let client = cx.update(|cx| client::Client::new(clock, http_client.clone(), cx));
-        let user_store = cx.new(|cx| UserStore::new(client.clone(), cx));
-        let project = cx.update(|cx| {
-            Project::local(
-                client,
-                node_runtime::NodeRuntime::unavailable(),
-                user_store,
-                Arc::new(languages),
-                fs,
-                None,
-                cx,
-            )
-        });
-        for path in root_paths {
-            let (tree, _) = project
-                .update(cx, |project, cx| {
-                    project.find_or_create_worktree(path, true, cx)
-                })
-                .await
-                .unwrap();
-
-            tree.read_with(cx, |tree, _| tree.as_local().unwrap().scan_complete())
-                .await;
-        }
-        project
-    }
-
-    #[inline]
-    pub fn dap_store(&self) -> Entity<DapStore> {
-        self.dap_store.clone()
-    }
-
-    #[inline]
-    pub fn breakpoint_store(&self) -> Entity<BreakpointStore> {
-        self.breakpoint_store.clone()
-    }
-
-    pub fn active_debug_session(&self, cx: &App) -> Option<(Entity<Session>, ActiveStackFrame)> {
-        let active_position = self.breakpoint_store.read(cx).active_position()?;
-        let session = self
-            .dap_store
-            .read(cx)
-            .session_by_id(active_position.session_id)?;
-        Some((session, active_position.clone()))
-    }
-
-    #[inline]
-    pub fn lsp_store(&self) -> Entity<LspStore> {
-        self.lsp_store.clone()
-    }
-
-    #[inline]
-    pub fn worktree_store(&self) -> Entity<WorktreeStore> {
-        self.worktree_store.clone()
-    }
-
-    #[inline]
-    pub fn context_server_store(&self) -> Entity<ContextServerStore> {
-        self.context_server_store.clone()
-    }
-
-    #[inline]
-    pub fn buffer_for_id(&self, remote_id: BufferId, cx: &App) -> Option<Entity<Buffer>> {
-        self.buffer_store.read(cx).get(remote_id)
-    }
-
-    #[inline]
-    pub fn languages(&self) -> &Arc<LanguageRegistry> {
-        &self.languages
-    }
-
-    #[inline]
-    pub fn client(&self) -> Arc<Client> {
-        self.collab_client.clone()
-    }
-
-    #[inline]
-    pub fn remote_client(&self) -> Option<Entity<RemoteClient>> {
-        self.remote_client.clone()
-    }
-
-    #[inline]
-    pub fn user_store(&self) -> Entity<UserStore> {
-        self.user_store.clone()
-    }
-
-    #[inline]
-    pub fn node_runtime(&self) -> Option<&NodeRuntime> {
-        self.node.as_ref()
-    }
-
-    #[inline]
-    pub fn opened_buffers(&self, cx: &App) -> Vec<Entity<Buffer>> {
-        self.buffer_store.read(cx).buffers().collect()
-    }
-
-    #[inline]
-    pub fn environment(&self) -> &Entity<ProjectEnvironment> {
-        &self.environment
-    }
-
-    #[inline]
-    pub fn cli_environment(&self, cx: &App) -> Option<HashMap<String, String>> {
-        self.environment.read(cx).get_cli_environment()
-    }
-
-    #[inline]
-    pub fn peek_environment_error<'a>(&'a self, cx: &'a App) -> Option<&'a String> {
-        self.environment.read(cx).peek_environment_error()
-    }
-
-    #[inline]
-    pub fn pop_environment_error(&mut self, cx: &mut Context<Self>) {
-        self.environment.update(cx, |environment, _| {
-            environment.pop_environment_error();
-        });
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    #[inline]
-    pub fn has_open_buffer(&self, path: impl Into<ProjectPath>, cx: &App) -> bool {
-        self.buffer_store
-            .read(cx)
-            .get_by_path(&path.into())
-            .is_some()
-    }
-
-    #[inline]
-    pub fn fs(&self) -> &Arc<dyn Fs> {
-        &self.fs
-    }
-
-    #[inline]
-    pub fn remote_id(&self) -> Option<u64> {
-        match self.client_state {
-            ProjectClientState::Local => None,
-            ProjectClientState::Shared { remote_id, .. }
-            | ProjectClientState::Remote { remote_id, .. } => Some(remote_id),
-        }
-    }
-
-    #[inline]
-    pub fn supports_terminal(&self, _cx: &App) -> bool {
-        if self.is_local() {
-            return true;
-        }
-        if self.is_via_remote_server() {
-            return true;
-        }
-
-        false
-    }
-
-    #[inline]
-    pub fn remote_connection_state(&self, cx: &App) -> Option<remote::ConnectionState> {
-        self.remote_client
-            .as_ref()
-            .map(|remote| remote.read(cx).connection_state())
-    }
-
-    #[inline]
-    pub fn remote_connection_options(&self, cx: &App) -> Option<RemoteConnectionOptions> {
-        self.remote_client
-            .as_ref()
-            .map(|remote| remote.read(cx).connection_options())
-    }
-
-    #[inline]
-    pub fn replica_id(&self) -> ReplicaId {
-        match self.client_state {
-            ProjectClientState::Remote { replica_id, .. } => replica_id,
-            _ => {
-                if self.remote_client.is_some() {
-                    ReplicaId::REMOTE_SERVER
-                } else {
-                    ReplicaId::LOCAL
-                }
-            }
-        }
-    }
-
-    #[inline]
-    pub fn task_store(&self) -> &Entity<TaskStore> {
-        &self.task_store
-    }
-
-    #[inline]
-    pub fn snippets(&self) -> &Entity<SnippetProvider> {
-        &self.snippets
-    }
-
-    #[inline]
-    pub fn search_history(&self, kind: SearchInputKind) -> &SearchHistory {
-        match kind {
-            SearchInputKind::Query => &self.search_history,
-            SearchInputKind::Include => &self.search_included_history,
-            SearchInputKind::Exclude => &self.search_excluded_history,
-        }
-    }
-
-    #[inline]
-    pub fn search_history_mut(&mut self, kind: SearchInputKind) -> &mut SearchHistory {
-        match kind {
-            SearchInputKind::Query => &mut self.search_history,
-            SearchInputKind::Include => &mut self.search_included_history,
-            SearchInputKind::Exclude => &mut self.search_excluded_history,
-        }
-    }
-
-    #[inline]
-    pub fn collaborators(&self) -> &HashMap<proto::PeerId, Collaborator> {
-        &self.collaborators
-    }
-
-    #[inline]
-    pub fn host(&self) -> Option<&Collaborator> {
-        self.collaborators.values().find(|c| c.is_host)
-    }
-
-    #[inline]
-    pub fn set_worktrees_reordered(&mut self, worktrees_reordered: bool, cx: &mut App) {
-        self.worktree_store.update(cx, |store, _| {
-            store.set_worktrees_reordered(worktrees_reordered);
-        });
-    }
-
-    /// Collect all worktrees, including ones that don't appear in the project panel
-    #[inline]
-    pub fn worktrees<'a>(
-        &self,
-        cx: &'a App,
-    ) -> impl 'a + DoubleEndedIterator<Item = Entity<Worktree>> {
-        self.worktree_store.read(cx).worktrees()
-    }
-
-    /// Collect all user-visible worktrees, the ones that appear in the project panel.
-    #[inline]
-    pub fn visible_worktrees<'a>(
-        &'a self,
-        cx: &'a App,
-    ) -> impl 'a + DoubleEndedIterator<Item = Entity<Worktree>> {
-        self.worktree_store.read(cx).visible_worktrees(cx)
-    }
-
-    #[inline]
-    pub fn worktree_for_root_name(&self, root_name: &str, cx: &App) -> Option<Entity<Worktree>> {
-        self.visible_worktrees(cx)
-            .find(|tree| tree.read(cx).root_name() == root_name)
-    }
-
-    #[inline]
-    pub fn worktree_root_names<'a>(&'a self, cx: &'a App) -> impl Iterator<Item = &'a str> {
-        self.visible_worktrees(cx)
-            .map(|tree| tree.read(cx).root_name().as_unix_str())
-    }
-
-    #[inline]
-    pub fn worktree_for_id(&self, id: WorktreeId, cx: &App) -> Option<Entity<Worktree>> {
-        self.worktree_store.read(cx).worktree_for_id(id, cx)
-    }
-
-    pub fn worktree_for_entry(
-        &self,
-        entry_id: ProjectEntryId,
-        cx: &App,
-    ) -> Option<Entity<Worktree>> {
-        self.worktree_store
-            .read(cx)
-            .worktree_for_entry(entry_id, cx)
-    }
-
-    #[inline]
-    pub fn worktree_id_for_entry(&self, entry_id: ProjectEntryId, cx: &App) -> Option<WorktreeId> {
-        self.worktree_for_entry(entry_id, cx)
-            .map(|worktree| worktree.read(cx).id())
-    }
-
-    /// Checks if the entry is the root of a worktree.
-    #[inline]
-    pub fn entry_is_worktree_root(&self, entry_id: ProjectEntryId, cx: &App) -> bool {
-        self.worktree_for_entry(entry_id, cx)
-            .map(|worktree| {
-                worktree
-                    .read(cx)
-                    .root_entry()
-                    .is_some_and(|e| e.id == entry_id)
-            })
-            .unwrap_or(false)
-    }
-
-    #[inline]
-    pub fn project_path_git_status(
-        &self,
-        project_path: &ProjectPath,
-        cx: &App,
-    ) -> Option<FileStatus> {
-        self.git_store
-            .read(cx)
-            .project_path_git_status(project_path, cx)
-    }
-
-    #[inline]
-    pub fn visibility_for_paths(
-        &self,
-        paths: &[PathBuf],
-        metadatas: &[Metadata],
-        exclude_sub_dirs: bool,
-        cx: &App,
-    ) -> Option<bool> {
-        paths
-            .iter()
-            .zip(metadatas)
-            .map(|(path, metadata)| self.visibility_for_path(path, metadata, exclude_sub_dirs, cx))
-            .max()
-            .flatten()
-    }
-
-    pub fn visibility_for_path(
-        &self,
-        path: &Path,
-        metadata: &Metadata,
-        exclude_sub_dirs: bool,
-        cx: &App,
-    ) -> Option<bool> {
-        let path = SanitizedPath::new(path).as_path();
-        self.worktrees(cx)
-            .filter_map(|worktree| {
-                let worktree = worktree.read(cx);
-                let abs_path = worktree.as_local()?.abs_path();
-                let contains = path == abs_path.as_ref()
-                    || (path.starts_with(abs_path) && (!exclude_sub_dirs || !metadata.is_dir));
-                contains.then(|| worktree.is_visible())
-            })
-            .max()
-    }
-
-    pub fn create_entry(
-        &mut self,
-        project_path: impl Into<ProjectPath>,
-        is_directory: bool,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<CreatedEntry>> {
-        let project_path = project_path.into();
-        let Some(worktree) = self.worktree_for_id(project_path.worktree_id, cx) else {
-            return Task::ready(Err(anyhow!(format!(
-                "No worktree for path {project_path:?}"
-            ))));
-        };
-        worktree.update(cx, |worktree, cx| {
-            worktree.create_entry(project_path.path, is_directory, None, cx)
-        })
-    }
-
-    #[inline]
-    pub fn copy_entry(
-        &mut self,
-        entry_id: ProjectEntryId,
-        new_project_path: ProjectPath,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Option<Entry>>> {
-        self.worktree_store.update(cx, |worktree_store, cx| {
-            worktree_store.copy_entry(entry_id, new_project_path, cx)
-        })
-    }
-
-    /// Renames the project entry with given `entry_id`.
-    ///
-    /// `new_path` is a relative path to worktree root.
-    /// If root entry is renamed then its new root name is used instead.
-    pub fn rename_entry(
-        &mut self,
-        entry_id: ProjectEntryId,
-        new_path: ProjectPath,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<CreatedEntry>> {
-        let worktree_store = self.worktree_store.clone();
-        let Some((worktree, old_path, is_dir)) = worktree_store
-            .read(cx)
-            .worktree_and_entry_for_id(entry_id, cx)
-            .map(|(worktree, entry)| (worktree, entry.path.clone(), entry.is_dir()))
-        else {
-            return Task::ready(Err(anyhow!(format!("No worktree for entry {entry_id:?}"))));
-        };
-
-        let worktree_id = worktree.read(cx).id();
-        let is_root_entry = self.entry_is_worktree_root(entry_id, cx);
-
-        let lsp_store = self.lsp_store().downgrade();
-        cx.spawn(async move |project, cx| {
-            let (old_abs_path, new_abs_path) = {
-                let root_path = worktree.read_with(cx, |this, _| this.abs_path())?;
-                let new_abs_path = if is_root_entry {
-                    root_path
-                        .parent()
-                        .unwrap()
-                        .join(new_path.path.as_std_path())
-                } else {
-                    root_path.join(&new_path.path.as_std_path())
-                };
-                (root_path.join(old_path.as_std_path()), new_abs_path)
-            };
-            let transaction = LspStore::will_rename_entry(
-                lsp_store.clone(),
-                worktree_id,
-                &old_abs_path,
-                &new_abs_path,
-                is_dir,
-                cx.clone(),
-            )
-            .await;
-
-            let entry = worktree_store
-                .update(cx, |worktree_store, cx| {
-                    worktree_store.rename_entry(entry_id, new_path.clone(), cx)
-                })?
-                .await?;
-
-            project
-                .update(cx, |_, cx| {
-                    cx.emit(Event::EntryRenamed(
-                        transaction,
-                        new_path.clone(),
-                        new_abs_path.clone(),
-                    ));
-                })
-                .ok();
-
-            lsp_store
-                .read_with(cx, |this, _| {
-                    this.did_rename_entry(worktree_id, &old_abs_path, &new_abs_path, is_dir);
-                })
-                .ok();
-            Ok(entry)
-        })
-    }
-
-    #[inline]
-    pub fn delete_file(
-        &mut self,
-        path: ProjectPath,
-        trash: bool,
-        cx: &mut Context<Self>,
-    ) -> Option<Task<Result<()>>> {
-        let entry = self.entry_for_path(&path, cx)?;
-        self.delete_entry(entry.id, trash, cx)
-    }
-
-    #[inline]
-    pub fn delete_entry(
-        &mut self,
-        entry_id: ProjectEntryId,
-        trash: bool,
-        cx: &mut Context<Self>,
-    ) -> Option<Task<Result<()>>> {
-        let worktree = self.worktree_for_entry(entry_id, cx)?;
-        cx.emit(Event::DeletedEntry(worktree.read(cx).id(), entry_id));
-        worktree.update(cx, |worktree, cx| {
-            worktree.delete_entry(entry_id, trash, cx)
-        })
-    }
-
-    #[inline]
-    pub fn expand_entry(
-        &mut self,
-        worktree_id: WorktreeId,
-        entry_id: ProjectEntryId,
-        cx: &mut Context<Self>,
-    ) -> Option<Task<Result<()>>> {
-        let worktree = self.worktree_for_id(worktree_id, cx)?;
-        worktree.update(cx, |worktree, cx| worktree.expand_entry(entry_id, cx))
-    }
-
-    pub fn expand_all_for_entry(
-        &mut self,
-        worktree_id: WorktreeId,
-        entry_id: ProjectEntryId,
-        cx: &mut Context<Self>,
-    ) -> Option<Task<Result<()>>> {
-        let worktree = self.worktree_for_id(worktree_id, cx)?;
-        let task = worktree.update(cx, |worktree, cx| {
-            worktree.expand_all_for_entry(entry_id, cx)
-        });
-        Some(cx.spawn(async move |this, cx| {
-            task.context("no task")?.await?;
-            this.update(cx, |_, cx| {
-                cx.emit(Event::ExpandedAllForEntry(worktree_id, entry_id));
-            })?;
-            Ok(())
-        }))
-    }
-
-    pub fn shared(&mut self, project_id: u64, cx: &mut Context<Self>) -> Result<()> {
-        anyhow::ensure!(
-            matches!(self.client_state, ProjectClientState::Local),
-            "project was already shared"
-        );
-
-        self.client_subscriptions.extend([
-            self.collab_client
-                .subscribe_to_entity(project_id)?
-                .set_entity(&cx.entity(), &cx.to_async()),
-            self.collab_client
-                .subscribe_to_entity(project_id)?
-                .set_entity(&self.worktree_store, &cx.to_async()),
-            self.collab_client
-                .subscribe_to_entity(project_id)?
-                .set_entity(&self.buffer_store, &cx.to_async()),
-            self.collab_client
-                .subscribe_to_entity(project_id)?
-                .set_entity(&self.lsp_store, &cx.to_async()),
-            self.collab_client
-                .subscribe_to_entity(project_id)?
-                .set_entity(&self.settings_observer, &cx.to_async()),
-            self.collab_client
-                .subscribe_to_entity(project_id)?
-                .set_entity(&self.dap_store, &cx.to_async()),
-            self.collab_client
-                .subscribe_to_entity(project_id)?
-                .set_entity(&self.breakpoint_store, &cx.to_async()),
-            self.collab_client
-                .subscribe_to_entity(project_id)?
-                .set_entity(&self.git_store, &cx.to_async()),
-        ]);
-
-        self.buffer_store.update(cx, |buffer_store, cx| {
-            buffer_store.shared(project_id, self.collab_client.clone().into(), cx)
-        });
-        self.worktree_store.update(cx, |worktree_store, cx| {
-            worktree_store.shared(project_id, self.collab_client.clone().into(), cx);
-        });
-        self.lsp_store.update(cx, |lsp_store, cx| {
-            lsp_store.shared(project_id, self.collab_client.clone().into(), cx)
-        });
-        self.breakpoint_store.update(cx, |breakpoint_store, _| {
-            breakpoint_store.shared(project_id, self.collab_client.clone().into())
-        });
-        self.dap_store.update(cx, |dap_store, cx| {
-            dap_store.shared(project_id, self.collab_client.clone().into(), cx);
-        });
-        self.task_store.update(cx, |task_store, cx| {
-            task_store.shared(project_id, self.collab_client.clone().into(), cx);
-        });
-        self.settings_observer.update(cx, |settings_observer, cx| {
-            settings_observer.shared(project_id, self.collab_client.clone().into(), cx)
-        });
-        self.git_store.update(cx, |git_store, cx| {
-            git_store.shared(project_id, self.collab_client.clone().into(), cx)
-        });
-
-        self.client_state = ProjectClientState::Shared {
-            remote_id: project_id,
-        };
-
-        cx.emit(Event::RemoteIdChanged(Some(project_id)));
-        Ok(())
-    }
-
-    pub fn reshared(
-        &mut self,
-        message: proto::ResharedProject,
-        cx: &mut Context<Self>,
-    ) -> Result<()> {
-        self.buffer_store
-            .update(cx, |buffer_store, _| buffer_store.forget_shared_buffers());
-        self.set_collaborators_from_proto(message.collaborators, cx)?;
-
-        self.worktree_store.update(cx, |worktree_store, cx| {
-            worktree_store.send_project_updates(cx);
-        });
-        if let Some(remote_id) = self.remote_id() {
-            self.git_store.update(cx, |git_store, cx| {
-                git_store.shared(remote_id, self.collab_client.clone().into(), cx)
-            });
-        }
-        cx.emit(Event::Reshared);
-        Ok(())
-    }
-
-    pub fn rejoined(
-        &mut self,
-        message: proto::RejoinedProject,
-        message_id: u32,
-        cx: &mut Context<Self>,
-    ) -> Result<()> {
-        cx.update_global::<SettingsStore, _>(|store, cx| {
-            self.worktree_store.update(cx, |worktree_store, cx| {
-                for worktree in worktree_store.worktrees() {
-                    store
-                        .clear_local_settings(worktree.read(cx).id(), cx)
-                        .log_err();
-                }
-            });
-        });
-
-        self.join_project_response_message_id = message_id;
-        self.set_worktrees_from_proto(message.worktrees, cx)?;
-        self.set_collaborators_from_proto(message.collaborators, cx)?;
-
-        let project = cx.weak_entity();
-        self.lsp_store.update(cx, |lsp_store, cx| {
-            lsp_store.set_language_server_statuses_from_proto(
-                project,
-                message.language_servers,
-                message.language_server_capabilities,
-                cx,
-            )
-        });
-        self.enqueue_buffer_ordered_message(BufferOrderedMessage::Resync)
-            .unwrap();
-        cx.emit(Event::Rejoined);
-        Ok(())
-    }
-
-    #[inline]
-    pub fn unshare(&mut self, cx: &mut Context<Self>) -> Result<()> {
-        self.unshare_internal(cx)?;
-        cx.emit(Event::RemoteIdChanged(None));
-        Ok(())
-    }
-
-    fn unshare_internal(&mut self, cx: &mut App) -> Result<()> {
-        anyhow::ensure!(
-            !self.is_via_collab(),
-            "attempted to unshare a remote project"
-        );
-
-        if let ProjectClientState::Shared { remote_id, .. } = self.client_state {
-            self.client_state = ProjectClientState::Local;
-            self.collaborators.clear();
-            self.client_subscriptions.clear();
-            self.worktree_store.update(cx, |store, cx| {
-                store.unshared(cx);
-            });
-            self.buffer_store.update(cx, |buffer_store, cx| {
-                buffer_store.forget_shared_buffers();
-                buffer_store.unshared(cx)
-            });
-            self.task_store.update(cx, |task_store, cx| {
-                task_store.unshared(cx);
-            });
-            self.breakpoint_store.update(cx, |breakpoint_store, cx| {
-                breakpoint_store.unshared(cx);
-            });
-            self.dap_store.update(cx, |dap_store, cx| {
-                dap_store.unshared(cx);
-            });
-            self.settings_observer.update(cx, |settings_observer, cx| {
-                settings_observer.unshared(cx);
-            });
-            self.git_store.update(cx, |git_store, cx| {
-                git_store.unshared(cx);
-            });
-
-            self.collab_client
-                .send(proto::UnshareProject {
-                    project_id: remote_id,
-                })
-                .ok();
-            Ok(())
-        } else {
-            anyhow::bail!("attempted to unshare an unshared project");
-        }
-    }
-
-    pub fn disconnected_from_host(&mut self, cx: &mut Context<Self>) {
-        if self.is_disconnected(cx) {
-            return;
-        }
-        self.disconnected_from_host_internal(cx);
-        cx.emit(Event::DisconnectedFromHost);
-    }
-
-    pub fn set_role(&mut self, role: proto::ChannelRole, cx: &mut Context<Self>) {
-        let new_capability =
-            if role == proto::ChannelRole::Member || role == proto::ChannelRole::Admin {
-                Capability::ReadWrite
-            } else {
-                Capability::ReadOnly
-            };
-        if let ProjectClientState::Remote { capability, .. } = &mut self.client_state {
-            if *capability == new_capability {
-                return;
-            }
-
-            *capability = new_capability;
-            for buffer in self.opened_buffers(cx) {
-                buffer.update(cx, |buffer, cx| buffer.set_capability(new_capability, cx));
-            }
-        }
-    }
-
-    fn disconnected_from_host_internal(&mut self, cx: &mut App) {
-        if let ProjectClientState::Remote {
-            sharing_has_stopped,
-            ..
-        } = &mut self.client_state
-        {
-            *sharing_has_stopped = true;
-            self.collaborators.clear();
-            self.worktree_store.update(cx, |store, cx| {
-                store.disconnected_from_host(cx);
-            });
-            self.buffer_store.update(cx, |buffer_store, cx| {
-                buffer_store.disconnected_from_host(cx)
-            });
-            self.lsp_store
-                .update(cx, |lsp_store, _cx| lsp_store.disconnected_from_host());
-        }
-    }
-
-    #[inline]
-    pub fn close(&mut self, cx: &mut Context<Self>) {
-        cx.emit(Event::Closed);
-    }
-
-    #[inline]
-    pub fn is_disconnected(&self, cx: &App) -> bool {
-        match &self.client_state {
-            ProjectClientState::Remote {
-                sharing_has_stopped,
-                ..
-            } => *sharing_has_stopped,
-            ProjectClientState::Local if self.is_via_remote_server() => {
-                self.remote_client_is_disconnected(cx)
-            }
-            _ => false,
-        }
-    }
-
-    #[inline]
-    fn remote_client_is_disconnected(&self, cx: &App) -> bool {
-        self.remote_client
-            .as_ref()
-            .map(|remote| remote.read(cx).is_disconnected())
-            .unwrap_or(false)
-    }
-
-    #[inline]
-    pub fn capability(&self) -> Capability {
-        match &self.client_state {
-            ProjectClientState::Remote { capability, .. } => *capability,
-            ProjectClientState::Shared { .. } | ProjectClientState::Local => Capability::ReadWrite,
-        }
-    }
-
-    #[inline]
-    pub fn is_read_only(&self, cx: &App) -> bool {
-        self.is_disconnected(cx) || self.capability() == Capability::ReadOnly
-    }
-
-    #[inline]
-    pub fn is_local(&self) -> bool {
-        match &self.client_state {
-            ProjectClientState::Local | ProjectClientState::Shared { .. } => {
-                self.remote_client.is_none()
-            }
-            ProjectClientState::Remote { .. } => false,
-        }
-    }
-
-    /// Whether this project is a remote server (not counting collab).
-    #[inline]
-    pub fn is_via_remote_server(&self) -> bool {
-        match &self.client_state {
-            ProjectClientState::Local | ProjectClientState::Shared { .. } => {
-                self.remote_client.is_some()
-            }
-            ProjectClientState::Remote { .. } => false,
-        }
-    }
-
-    /// Whether this project is from collab (not counting remote servers).
-    #[inline]
-    pub fn is_via_collab(&self) -> bool {
-        match &self.client_state {
-            ProjectClientState::Local | ProjectClientState::Shared { .. } => false,
-            ProjectClientState::Remote { .. } => true,
-        }
-    }
-
-    /// `!self.is_local()`
-    #[inline]
-    pub fn is_remote(&self) -> bool {
-        debug_assert_eq!(
-            !self.is_local(),
-            self.is_via_collab() || self.is_via_remote_server()
-        );
-        !self.is_local()
-    }
-
-    pub fn disable_worktree_scanner(&mut self, cx: &mut Context<Self>) {
-        self.worktree_store.update(cx, |worktree_store, _cx| {
-            worktree_store.disable_scanner();
-        });
-    }
-
-    #[inline]
-    pub fn create_buffer(
-        &mut self,
-        searchable: bool,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Entity<Buffer>>> {
-        self.buffer_store.update(cx, |buffer_store, cx| {
-            buffer_store.create_buffer(searchable, cx)
-        })
-    }
-
-    #[inline]
-    pub fn create_local_buffer(
-        &mut self,
-        text: &str,
-        language: Option<Arc<Language>>,
-        project_searchable: bool,
-        cx: &mut Context<Self>,
-    ) -> Entity<Buffer> {
-        if self.is_remote() {
-            panic!("called create_local_buffer on a remote project")
-        }
-        self.buffer_store.update(cx, |buffer_store, cx| {
-            buffer_store.create_local_buffer(text, language, project_searchable, cx)
-        })
-    }
-
-    pub fn open_path(
-        &mut self,
-        path: ProjectPath,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<(Option<ProjectEntryId>, Entity<Buffer>)>> {
-        let task = self.open_buffer(path, cx);
-        cx.spawn(async move |_project, cx| {
-            let buffer = task.await?;
-            let project_entry_id = buffer.read_with(cx, |buffer, _cx| {
-                File::from_dyn(buffer.file()).and_then(|file| file.project_entry_id())
-            })?;
-
-            Ok((project_entry_id, buffer))
-        })
-    }
-
-    pub fn open_local_buffer(
-        &mut self,
-        abs_path: impl AsRef<Path>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Entity<Buffer>>> {
-        let worktree_task = self.find_or_create_worktree(abs_path.as_ref(), false, cx);
-        cx.spawn(async move |this, cx| {
-            let (worktree, relative_path) = worktree_task.await?;
-            this.update(cx, |this, cx| {
-                this.open_buffer((worktree.read(cx).id(), relative_path), cx)
-            })?
-            .await
-        })
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn open_local_buffer_with_lsp(
-        &mut self,
-        abs_path: impl AsRef<Path>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<(Entity<Buffer>, lsp_store::OpenLspBufferHandle)>> {
-        if let Some((worktree, relative_path)) = self.find_worktree(abs_path.as_ref(), cx) {
-            self.open_buffer_with_lsp((worktree.read(cx).id(), relative_path), cx)
-        } else {
-            Task::ready(Err(anyhow!("no such path")))
-        }
-    }
-
-    pub fn open_buffer(
-        &mut self,
-        path: impl Into<ProjectPath>,
-        cx: &mut App,
-    ) -> Task<Result<Entity<Buffer>>> {
-        if self.is_disconnected(cx) {
-            return Task::ready(Err(anyhow!(ErrorCode::Disconnected)));
-        }
-
-        self.buffer_store.update(cx, |buffer_store, cx| {
-            buffer_store.open_buffer(path.into(), cx)
-        })
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn open_buffer_with_lsp(
-        &mut self,
-        path: impl Into<ProjectPath>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<(Entity<Buffer>, lsp_store::OpenLspBufferHandle)>> {
-        let buffer = self.open_buffer(path, cx);
-        cx.spawn(async move |this, cx| {
-            let buffer = buffer.await?;
-            let handle = this.update(cx, |project, cx| {
-                project.register_buffer_with_language_servers(&buffer, cx)
-            })?;
-            Ok((buffer, handle))
-        })
-    }
-
-    pub fn register_buffer_with_language_servers(
-        &self,
-        buffer: &Entity<Buffer>,
-        cx: &mut App,
-    ) -> OpenLspBufferHandle {
-        self.lsp_store.update(cx, |lsp_store, cx| {
-            lsp_store.register_buffer_with_language_servers(buffer, HashSet::default(), false, cx)
-        })
-    }
-
-    pub fn open_unstaged_diff(
-        &mut self,
-        buffer: Entity<Buffer>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Entity<BufferDiff>>> {
-        if self.is_disconnected(cx) {
-            return Task::ready(Err(anyhow!(ErrorCode::Disconnected)));
-        }
-        self.git_store
-            .update(cx, |git_store, cx| git_store.open_unstaged_diff(buffer, cx))
-    }
-
-    pub fn open_uncommitted_diff(
-        &mut self,
-        buffer: Entity<Buffer>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Entity<BufferDiff>>> {
-        if self.is_disconnected(cx) {
-            return Task::ready(Err(anyhow!(ErrorCode::Disconnected)));
-        }
-        self.git_store.update(cx, |git_store, cx| {
-            git_store.open_uncommitted_diff(buffer, cx)
-        })
-    }
-
-    pub fn open_buffer_by_id(
-        &mut self,
-        id: BufferId,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Entity<Buffer>>> {
-        if let Some(buffer) = self.buffer_for_id(id, cx) {
-            Task::ready(Ok(buffer))
-        } else if self.is_local() || self.is_via_remote_server() {
-            Task::ready(Err(anyhow!("buffer {id} does not exist")))
-        } else if let Some(project_id) = self.remote_id() {
-            let request = self.collab_client.request(proto::OpenBufferById {
-                project_id,
-                id: id.into(),
-            });
-            cx.spawn(async move |project, cx| {
-                let buffer_id = BufferId::new(request.await?.buffer_id)?;
-                project
-                    .update(cx, |project, cx| {
-                        project.buffer_store.update(cx, |buffer_store, cx| {
-                            buffer_store.wait_for_remote_buffer(buffer_id, cx)
-                        })
-                    })?
-                    .await
-            })
-        } else {
-            Task::ready(Err(anyhow!("cannot open buffer while disconnected")))
-        }
-    }
-
-    pub fn save_buffers(
-        &self,
-        buffers: HashSet<Entity<Buffer>>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        cx.spawn(async move |this, cx| {
-            let save_tasks = buffers.into_iter().filter_map(|buffer| {
-                this.update(cx, |this, cx| this.save_buffer(buffer, cx))
-                    .ok()
-            });
-            try_join_all(save_tasks).await?;
-            Ok(())
-        })
-    }
-
-    pub fn save_buffer(&self, buffer: Entity<Buffer>, cx: &mut Context<Self>) -> Task<Result<()>> {
-        self.buffer_store
-            .update(cx, |buffer_store, cx| buffer_store.save_buffer(buffer, cx))
-    }
-
-    pub fn save_buffer_as(
-        &mut self,
-        buffer: Entity<Buffer>,
-        path: ProjectPath,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        self.buffer_store.update(cx, |buffer_store, cx| {
-            buffer_store.save_buffer_as(buffer.clone(), path, cx)
-        })
-    }
-
-    pub fn get_open_buffer(&self, path: &ProjectPath, cx: &App) -> Option<Entity<Buffer>> {
-        self.buffer_store.read(cx).get_by_path(path)
-    }
-
-    fn register_buffer(&mut self, buffer: &Entity<Buffer>, cx: &mut Context<Self>) -> Result<()> {
-        {
-            let mut remotely_created_models = self.remotely_created_models.lock();
-            if remotely_created_models.retain_count > 0 {
-                remotely_created_models.buffers.push(buffer.clone())
-            }
-        }
-
-        self.request_buffer_diff_recalculation(buffer, cx);
-
-        cx.subscribe(buffer, |this, buffer, event, cx| {
-            this.on_buffer_event(buffer, event, cx);
-        })
-        .detach();
-
-        Ok(())
-    }
-
-    pub fn open_image(
-        &mut self,
-        path: impl Into<ProjectPath>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Entity<ImageItem>>> {
-        if self.is_disconnected(cx) {
-            return Task::ready(Err(anyhow!(ErrorCode::Disconnected)));
-        }
-
-        let open_image_task = self.image_store.update(cx, |image_store, cx| {
-            image_store.open_image(path.into(), cx)
-        });
-
-        let weak_project = cx.entity().downgrade();
-        cx.spawn(async move |_, cx| {
-            let image_item = open_image_task.await?;
-
-            // Check if metadata already exists (e.g., for remote images)
-            let needs_metadata =
-                cx.read_entity(&image_item, |item, _| item.image_metadata.is_none())?;
-
-            if needs_metadata {
-                let project = weak_project.upgrade().context("Project dropped")?;
-                let metadata =
-                    ImageItem::load_image_metadata(image_item.clone(), project, cx).await?;
-                image_item.update(cx, |image_item, cx| {
-                    image_item.image_metadata = Some(metadata);
-                    cx.emit(ImageItemEvent::MetadataUpdated);
-                })?;
-            }
-
-            Ok(image_item)
-        })
-    }
-
-    async fn send_buffer_ordered_messages(
-        project: WeakEntity<Self>,
-        rx: UnboundedReceiver<BufferOrderedMessage>,
-        cx: &mut AsyncApp,
-    ) -> Result<()> {
-        const MAX_BATCH_SIZE: usize = 128;
-
-        let mut operations_by_buffer_id = HashMap::default();
-        async fn flush_operations(
-            this: &WeakEntity<Project>,
-            operations_by_buffer_id: &mut HashMap<BufferId, Vec<proto::Operation>>,
-            needs_resync_with_host: &mut bool,
-            is_local: bool,
-            cx: &mut AsyncApp,
-        ) -> Result<()> {
-            for (buffer_id, operations) in operations_by_buffer_id.drain() {
-                let request = this.read_with(cx, |this, _| {
-                    let project_id = this.remote_id()?;
-                    Some(this.collab_client.request(proto::UpdateBuffer {
-                        buffer_id: buffer_id.into(),
-                        project_id,
-                        operations,
-                    }))
-                })?;
-                if let Some(request) = request
-                    && request.await.is_err()
-                    && !is_local
-                {
-                    *needs_resync_with_host = true;
-                    break;
-                }
-            }
-            Ok(())
-        }
-
-        let mut needs_resync_with_host = false;
-        let mut changes = rx.ready_chunks(MAX_BATCH_SIZE);
-
-        while let Some(changes) = changes.next().await {
-            let is_local = project.read_with(cx, |this, _| this.is_local())?;
-
-            for change in changes {
-                match change {
-                    BufferOrderedMessage::Operation {
-                        buffer_id,
-                        operation,
-                    } => {
-                        if needs_resync_with_host {
-                            continue;
-                        }
-
-                        operations_by_buffer_id
-                            .entry(buffer_id)
-                            .or_insert(Vec::new())
-                            .push(operation);
-                    }
-
-                    BufferOrderedMessage::Resync => {
-                        operations_by_buffer_id.clear();
-                        if project
-                            .update(cx, |this, cx| this.synchronize_remote_buffers(cx))?
-                            .await
-                            .is_ok()
-                        {
-                            needs_resync_with_host = false;
-                        }
-                    }
-
-                    BufferOrderedMessage::LanguageServerUpdate {
-                        language_server_id,
-                        message,
-                        name,
-                    } => {
-                        flush_operations(
-                            &project,
-                            &mut operations_by_buffer_id,
-                            &mut needs_resync_with_host,
-                            is_local,
-                            cx,
-                        )
-                        .await?;
-
-                        project.read_with(cx, |project, _| {
-                            if let Some(project_id) = project.remote_id() {
-                                project
-                                    .collab_client
-                                    .send(proto::UpdateLanguageServer {
-                                        project_id,
-                                        server_name: name.map(|name| String::from(name.0)),
-                                        language_server_id: language_server_id.to_proto(),
-                                        variant: Some(message),
-                                    })
-                                    .log_err();
-                            }
-                        })?;
-                    }
-                }
-            }
-
-            flush_operations(
-                &project,
-                &mut operations_by_buffer_id,
-                &mut needs_resync_with_host,
-                is_local,
-                cx,
-            )
-            .await?;
-        }
-
-        Ok(())
-    }
-
-    fn on_buffer_store_event(
-        &mut self,
-        _: Entity<BufferStore>,
-        event: &BufferStoreEvent,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            BufferStoreEvent::BufferAdded(buffer) => {
-                self.register_buffer(buffer, cx).log_err();
-            }
-            BufferStoreEvent::BufferDropped(buffer_id) => {
-                if let Some(ref remote_client) = self.remote_client {
-                    remote_client
-                        .read(cx)
-                        .proto_client()
-                        .send(proto::CloseBuffer {
-                            project_id: 0,
-                            buffer_id: buffer_id.to_proto(),
-                        })
-                        .log_err();
-                }
-            }
-            _ => {}
-        }
-    }
-
-    fn on_image_store_event(
-        &mut self,
-        _: Entity<ImageStore>,
-        event: &ImageStoreEvent,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            ImageStoreEvent::ImageAdded(image) => {
-                cx.subscribe(image, |this, image, event, cx| {
-                    this.on_image_event(image, event, cx);
-                })
-                .detach();
-            }
-        }
-    }
-
-    fn on_dap_store_event(
-        &mut self,
-        _: Entity<DapStore>,
-        event: &DapStoreEvent,
-        cx: &mut Context<Self>,
-    ) {
-        if let DapStoreEvent::Notification(message) = event {
-            cx.emit(Event::Toast {
-                notification_id: "dap".into(),
-                message: message.clone(),
-            });
-        }
-    }
-
-    fn on_lsp_store_event(
-        &mut self,
-        _: Entity<LspStore>,
-        event: &LspStoreEvent,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            LspStoreEvent::DiagnosticsUpdated { server_id, paths } => {
-                cx.emit(Event::DiagnosticsUpdated {
-                    paths: paths.clone(),
-                    language_server_id: *server_id,
-                })
-            }
-            LspStoreEvent::LanguageServerAdded(server_id, name, worktree_id) => cx.emit(
-                Event::LanguageServerAdded(*server_id, name.clone(), *worktree_id),
-            ),
-            LspStoreEvent::LanguageServerRemoved(server_id) => {
-                cx.emit(Event::LanguageServerRemoved(*server_id))
-            }
-            LspStoreEvent::LanguageServerLog(server_id, log_type, string) => cx.emit(
-                Event::LanguageServerLog(*server_id, log_type.clone(), string.clone()),
-            ),
-            LspStoreEvent::LanguageDetected {
-                buffer,
-                new_language,
-            } => {
-                let Some(_) = new_language else {
-                    cx.emit(Event::LanguageNotFound(buffer.clone()));
-                    return;
-                };
-            }
-            LspStoreEvent::RefreshInlayHints {
-                server_id,
-                request_id,
-            } => cx.emit(Event::RefreshInlayHints {
-                server_id: *server_id,
-                request_id: *request_id,
-            }),
-            LspStoreEvent::RefreshCodeLens => cx.emit(Event::RefreshCodeLens),
-            LspStoreEvent::LanguageServerPrompt(prompt) => {
-                cx.emit(Event::LanguageServerPrompt(prompt.clone()))
-            }
-            LspStoreEvent::DiskBasedDiagnosticsStarted { language_server_id } => {
-                cx.emit(Event::DiskBasedDiagnosticsStarted {
-                    language_server_id: *language_server_id,
-                });
-            }
-            LspStoreEvent::DiskBasedDiagnosticsFinished { language_server_id } => {
-                cx.emit(Event::DiskBasedDiagnosticsFinished {
-                    language_server_id: *language_server_id,
-                });
-            }
-            LspStoreEvent::LanguageServerUpdate {
-                language_server_id,
-                name,
-                message,
-            } => {
-                if self.is_local() {
-                    self.enqueue_buffer_ordered_message(
-                        BufferOrderedMessage::LanguageServerUpdate {
-                            language_server_id: *language_server_id,
-                            message: message.clone(),
-                            name: name.clone(),
-                        },
-                    )
-                    .ok();
-                }
-
-                match message {
-                    proto::update_language_server::Variant::MetadataUpdated(update) => {
-                        self.lsp_store.update(cx, |lsp_store, _| {
-                            if let Some(capabilities) = update
-                                .capabilities
-                                .as_ref()
-                                .and_then(|capabilities| serde_json::from_str(capabilities).ok())
-                            {
-                                lsp_store
-                                    .lsp_server_capabilities
-                                    .insert(*language_server_id, capabilities);
-                            }
-
-                            if let Some(language_server_status) = lsp_store
-                                .language_server_statuses
-                                .get_mut(language_server_id)
-                            {
-                                if let Some(binary) = &update.binary {
-                                    language_server_status.binary = Some(LanguageServerBinary {
-                                        path: PathBuf::from(&binary.path),
-                                        arguments: binary
-                                            .arguments
-                                            .iter()
-                                            .map(OsString::from)
-                                            .collect(),
-                                        env: None,
-                                    });
-                                }
-
-                                language_server_status.configuration = update
-                                    .configuration
-                                    .as_ref()
-                                    .and_then(|config_str| serde_json::from_str(config_str).ok());
-
-                                language_server_status.workspace_folders = update
-                                    .workspace_folders
-                                    .iter()
-                                    .filter_map(|uri_str| lsp::Uri::from_str(uri_str).ok())
-                                    .collect();
-                            }
-                        });
-                    }
-                    proto::update_language_server::Variant::RegisteredForBuffer(update) => {
-                        if let Some(buffer_id) = BufferId::new(update.buffer_id).ok() {
-                            cx.emit(Event::LanguageServerBufferRegistered {
-                                buffer_id,
-                                server_id: *language_server_id,
-                                buffer_abs_path: PathBuf::from(&update.buffer_abs_path),
-                                name: name.clone(),
-                            });
-                        }
-                    }
-                    _ => (),
-                }
-            }
-            LspStoreEvent::Notification(message) => cx.emit(Event::Toast {
-                notification_id: "lsp".into(),
-                message: message.clone(),
-            }),
-            LspStoreEvent::SnippetEdit {
-                buffer_id,
-                edits,
-                most_recent_edit,
-            } => {
-                if most_recent_edit.replica_id == self.replica_id() {
-                    cx.emit(Event::SnippetEdit(*buffer_id, edits.clone()))
-                }
-            }
-        }
-    }
-
-    fn on_remote_client_event(
-        &mut self,
-        _: Entity<RemoteClient>,
-        event: &remote::RemoteClientEvent,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            remote::RemoteClientEvent::Disconnected => {
-                self.worktree_store.update(cx, |store, cx| {
-                    store.disconnected_from_host(cx);
-                });
-                self.buffer_store.update(cx, |buffer_store, cx| {
-                    buffer_store.disconnected_from_host(cx)
-                });
-                self.lsp_store.update(cx, |lsp_store, _cx| {
-                    lsp_store.disconnected_from_ssh_remote()
-                });
-                cx.emit(Event::DisconnectedFromSshRemote);
-            }
-        }
-    }
-
-    fn on_settings_observer_event(
-        &mut self,
-        _: Entity<SettingsObserver>,
-        event: &SettingsObserverEvent,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            SettingsObserverEvent::LocalSettingsUpdated(result) => match result {
-                Err(InvalidSettingsError::LocalSettings { message, path }) => {
-                    let message = format!("Failed to set local settings in {path:?}:\n{message}");
-                    cx.emit(Event::Toast {
-                        notification_id: format!("local-settings-{path:?}").into(),
-                        message,
-                    });
-                }
-                Ok(path) => cx.emit(Event::HideToast {
-                    notification_id: format!("local-settings-{path:?}").into(),
-                }),
-                Err(_) => {}
-            },
-            SettingsObserverEvent::LocalTasksUpdated(result) => match result {
-                Err(InvalidSettingsError::Tasks { message, path }) => {
-                    let message = format!("Failed to set local tasks in {path:?}:\n{message}");
-                    cx.emit(Event::Toast {
-                        notification_id: format!("local-tasks-{path:?}").into(),
-                        message,
-                    });
-                }
-                Ok(path) => cx.emit(Event::HideToast {
-                    notification_id: format!("local-tasks-{path:?}").into(),
-                }),
-                Err(_) => {}
-            },
-            SettingsObserverEvent::LocalDebugScenariosUpdated(result) => match result {
-                Err(InvalidSettingsError::Debug { message, path }) => {
-                    let message =
-                        format!("Failed to set local debug scenarios in {path:?}:\n{message}");
-                    cx.emit(Event::Toast {
-                        notification_id: format!("local-debug-scenarios-{path:?}").into(),
-                        message,
-                    });
-                }
-                Ok(path) => cx.emit(Event::HideToast {
-                    notification_id: format!("local-debug-scenarios-{path:?}").into(),
-                }),
-                Err(_) => {}
-            },
-        }
-    }
-
-    fn on_worktree_store_event(
-        &mut self,
-        _: Entity<WorktreeStore>,
-        event: &WorktreeStoreEvent,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            WorktreeStoreEvent::WorktreeAdded(worktree) => {
-                self.on_worktree_added(worktree, cx);
-                cx.emit(Event::WorktreeAdded(worktree.read(cx).id()));
-            }
-            WorktreeStoreEvent::WorktreeRemoved(_, id) => {
-                cx.emit(Event::WorktreeRemoved(*id));
-            }
-            WorktreeStoreEvent::WorktreeReleased(_, id) => {
-                self.on_worktree_released(*id, cx);
-            }
-            WorktreeStoreEvent::WorktreeOrderChanged => cx.emit(Event::WorktreeOrderChanged),
-            WorktreeStoreEvent::WorktreeUpdateSent(_) => {}
-            WorktreeStoreEvent::WorktreeUpdatedEntries(worktree_id, changes) => {
-                self.client()
-                    .telemetry()
-                    .report_discovered_project_type_events(*worktree_id, changes);
-                cx.emit(Event::WorktreeUpdatedEntries(*worktree_id, changes.clone()))
-            }
-            WorktreeStoreEvent::WorktreeDeletedEntry(worktree_id, id) => {
-                cx.emit(Event::DeletedEntry(*worktree_id, *id))
-            }
-            // Listen to the GitStore instead.
-            WorktreeStoreEvent::WorktreeUpdatedGitRepositories(_, _) => {}
-        }
-    }
-
-    fn on_worktree_added(&mut self, worktree: &Entity<Worktree>, _: &mut Context<Self>) {
-        let mut remotely_created_models = self.remotely_created_models.lock();
-        if remotely_created_models.retain_count > 0 {
-            remotely_created_models.worktrees.push(worktree.clone())
-        }
-    }
-
-    fn on_worktree_released(&mut self, id_to_remove: WorktreeId, cx: &mut Context<Self>) {
-        if let Some(remote) = &self.remote_client {
-            remote
-                .read(cx)
-                .proto_client()
-                .send(proto::RemoveWorktree {
-                    worktree_id: id_to_remove.to_proto(),
-                })
-                .log_err();
-        }
-    }
-
-    fn on_buffer_event(
-        &mut self,
-        buffer: Entity<Buffer>,
-        event: &BufferEvent,
-        cx: &mut Context<Self>,
-    ) -> Option<()> {
-        if matches!(event, BufferEvent::Edited | BufferEvent::Reloaded) {
-            self.request_buffer_diff_recalculation(&buffer, cx);
-        }
-
-        let buffer_id = buffer.read(cx).remote_id();
-        match event {
-            BufferEvent::ReloadNeeded => {
-                if !self.is_via_collab() {
-                    self.reload_buffers([buffer.clone()].into_iter().collect(), true, cx)
-                        .detach_and_log_err(cx);
-                }
-            }
-            BufferEvent::Operation {
-                operation,
-                is_local: true,
-            } => {
-                let operation = language::proto::serialize_operation(operation);
-
-                if let Some(remote) = &self.remote_client {
-                    remote
-                        .read(cx)
-                        .proto_client()
-                        .send(proto::UpdateBuffer {
-                            project_id: 0,
-                            buffer_id: buffer_id.to_proto(),
-                            operations: vec![operation.clone()],
-                        })
-                        .ok();
-                }
-
-                self.enqueue_buffer_ordered_message(BufferOrderedMessage::Operation {
-                    buffer_id,
-                    operation,
-                })
-                .ok();
-            }
-
-            _ => {}
-        }
-
-        None
-    }
-
-    fn on_image_event(
-        &mut self,
-        image: Entity<ImageItem>,
-        event: &ImageItemEvent,
-        cx: &mut Context<Self>,
-    ) -> Option<()> {
-        // TODO: handle image events from remote
-        if let ImageItemEvent::ReloadNeeded = event
-            && !self.is_via_collab()
-        {
-            self.reload_images([image].into_iter().collect(), cx)
-                .detach_and_log_err(cx);
-        }
-
-        None
-    }
-
-    fn request_buffer_diff_recalculation(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        cx: &mut Context<Self>,
-    ) {
-        self.buffers_needing_diff.insert(buffer.downgrade());
-        let first_insertion = self.buffers_needing_diff.len() == 1;
-        let settings = ProjectSettings::get_global(cx);
-        let delay = settings.git.gutter_debounce;
-
-        if delay == 0 {
-            if first_insertion {
-                let this = cx.weak_entity();
-                cx.defer(move |cx| {
-                    if let Some(this) = this.upgrade() {
-                        this.update(cx, |this, cx| {
-                            this.recalculate_buffer_diffs(cx).detach();
-                        });
-                    }
-                });
-            }
-            return;
-        }
-
-        const MIN_DELAY: u64 = 50;
-        let delay = delay.max(MIN_DELAY);
-        let duration = Duration::from_millis(delay);
-
-        self.git_diff_debouncer
-            .fire_new(duration, cx, move |this, cx| {
-                this.recalculate_buffer_diffs(cx)
-            });
-    }
-
-    fn recalculate_buffer_diffs(&mut self, cx: &mut Context<Self>) -> Task<()> {
-        cx.spawn(async move |this, cx| {
-            loop {
-                let task = this
-                    .update(cx, |this, cx| {
-                        let buffers = this
-                            .buffers_needing_diff
-                            .drain()
-                            .filter_map(|buffer| buffer.upgrade())
-                            .collect::<Vec<_>>();
-                        if buffers.is_empty() {
-                            None
-                        } else {
-                            Some(this.git_store.update(cx, |git_store, cx| {
-                                git_store.recalculate_buffer_diffs(buffers, cx)
-                            }))
-                        }
-                    })
-                    .ok()
-                    .flatten();
-
-                if let Some(task) = task {
-                    task.await;
-                } else {
-                    break;
-                }
-            }
-        })
-    }
-
-    pub fn set_language_for_buffer(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        new_language: Arc<Language>,
-        cx: &mut Context<Self>,
-    ) {
-        self.lsp_store.update(cx, |lsp_store, cx| {
-            lsp_store.set_language_for_buffer(buffer, new_language, cx)
-        })
-    }
-
-    pub fn restart_language_servers_for_buffers(
-        &mut self,
-        buffers: Vec<Entity<Buffer>>,
-        only_restart_servers: HashSet<LanguageServerSelector>,
-        cx: &mut Context<Self>,
-    ) {
-        self.lsp_store.update(cx, |lsp_store, cx| {
-            lsp_store.restart_language_servers_for_buffers(buffers, only_restart_servers, cx)
-        })
-    }
-
-    pub fn stop_language_servers_for_buffers(
-        &mut self,
-        buffers: Vec<Entity<Buffer>>,
-        also_restart_servers: HashSet<LanguageServerSelector>,
-        cx: &mut Context<Self>,
-    ) {
-        self.lsp_store
-            .update(cx, |lsp_store, cx| {
-                lsp_store.stop_language_servers_for_buffers(buffers, also_restart_servers, cx)
-            })
-            .detach_and_log_err(cx);
-    }
-
-    pub fn cancel_language_server_work_for_buffers(
-        &mut self,
-        buffers: impl IntoIterator<Item = Entity<Buffer>>,
-        cx: &mut Context<Self>,
-    ) {
-        self.lsp_store.update(cx, |lsp_store, cx| {
-            lsp_store.cancel_language_server_work_for_buffers(buffers, cx)
-        })
-    }
-
-    pub fn cancel_language_server_work(
-        &mut self,
-        server_id: LanguageServerId,
-        token_to_cancel: Option<ProgressToken>,
-        cx: &mut Context<Self>,
-    ) {
-        self.lsp_store.update(cx, |lsp_store, cx| {
-            lsp_store.cancel_language_server_work(server_id, token_to_cancel, cx)
-        })
-    }
-
-    fn enqueue_buffer_ordered_message(&mut self, message: BufferOrderedMessage) -> Result<()> {
-        self.buffer_ordered_messages_tx
-            .unbounded_send(message)
-            .map_err(|e| anyhow!(e))
-    }
-
-    pub fn available_toolchains(
-        &self,
-        path: ProjectPath,
-        language_name: LanguageName,
-        cx: &App,
-    ) -> Task<Option<Toolchains>> {
-        if let Some(toolchain_store) = self.toolchain_store.as_ref().map(Entity::downgrade) {
-            cx.spawn(async move |cx| {
-                toolchain_store
-                    .update(cx, |this, cx| this.list_toolchains(path, language_name, cx))
-                    .ok()?
-                    .await
-            })
-        } else {
-            Task::ready(None)
-        }
-    }
-
-    pub async fn toolchain_metadata(
-        languages: Arc<LanguageRegistry>,
-        language_name: LanguageName,
-    ) -> Option<ToolchainMetadata> {
-        languages
-            .language_for_name(language_name.as_ref())
-            .await
-            .ok()?
-            .toolchain_lister()
-            .map(|lister| lister.meta())
-    }
-
-    pub fn add_toolchain(
-        &self,
-        toolchain: Toolchain,
-        scope: ToolchainScope,
-        cx: &mut Context<Self>,
-    ) {
-        maybe!({
-            self.toolchain_store.as_ref()?.update(cx, |this, cx| {
-                this.add_toolchain(toolchain, scope, cx);
-            });
-            Some(())
-        });
-    }
-
-    pub fn remove_toolchain(
-        &self,
-        toolchain: Toolchain,
-        scope: ToolchainScope,
-        cx: &mut Context<Self>,
-    ) {
-        maybe!({
-            self.toolchain_store.as_ref()?.update(cx, |this, cx| {
-                this.remove_toolchain(toolchain, scope, cx);
-            });
-            Some(())
-        });
-    }
-
-    pub fn user_toolchains(
-        &self,
-        cx: &App,
-    ) -> Option<BTreeMap<ToolchainScope, IndexSet<Toolchain>>> {
-        Some(self.toolchain_store.as_ref()?.read(cx).user_toolchains())
-    }
-
-    pub fn resolve_toolchain(
-        &self,
-        path: PathBuf,
-        language_name: LanguageName,
-        cx: &App,
-    ) -> Task<Result<Toolchain>> {
-        if let Some(toolchain_store) = self.toolchain_store.as_ref().map(Entity::downgrade) {
-            cx.spawn(async move |cx| {
-                toolchain_store
-                    .update(cx, |this, cx| {
-                        this.resolve_toolchain(path, language_name, cx)
-                    })?
-                    .await
-            })
-        } else {
-            Task::ready(Err(anyhow!("This project does not support toolchains")))
-        }
-    }
-
-    pub fn toolchain_store(&self) -> Option<Entity<ToolchainStore>> {
-        self.toolchain_store.clone()
-    }
-    pub fn activate_toolchain(
-        &self,
-        path: ProjectPath,
-        toolchain: Toolchain,
-        cx: &mut App,
-    ) -> Task<Option<()>> {
-        let Some(toolchain_store) = self.toolchain_store.clone() else {
-            return Task::ready(None);
-        };
-        toolchain_store.update(cx, |this, cx| this.activate_toolchain(path, toolchain, cx))
-    }
-    pub fn active_toolchain(
-        &self,
-        path: ProjectPath,
-        language_name: LanguageName,
-        cx: &App,
-    ) -> Task<Option<Toolchain>> {
-        let Some(toolchain_store) = self.toolchain_store.clone() else {
-            return Task::ready(None);
-        };
-        toolchain_store
-            .read(cx)
-            .active_toolchain(path, language_name, cx)
-    }
-    pub fn language_server_statuses<'a>(
-        &'a self,
-        cx: &'a App,
-    ) -> impl DoubleEndedIterator<Item = (LanguageServerId, &'a LanguageServerStatus)> {
-        self.lsp_store.read(cx).language_server_statuses()
-    }
-
-    pub fn last_formatting_failure<'a>(&self, cx: &'a App) -> Option<&'a str> {
-        self.lsp_store.read(cx).last_formatting_failure()
-    }
-
-    pub fn reset_last_formatting_failure(&self, cx: &mut App) {
-        self.lsp_store
-            .update(cx, |store, _| store.reset_last_formatting_failure());
-    }
-
-    pub fn reload_buffers(
-        &self,
-        buffers: HashSet<Entity<Buffer>>,
-        push_to_history: bool,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<ProjectTransaction>> {
-        self.buffer_store.update(cx, |buffer_store, cx| {
-            buffer_store.reload_buffers(buffers, push_to_history, cx)
-        })
-    }
-
-    pub fn reload_images(
-        &self,
-        images: HashSet<Entity<ImageItem>>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        self.image_store
-            .update(cx, |image_store, cx| image_store.reload_images(images, cx))
-    }
-
-    pub fn format(
-        &mut self,
-        buffers: HashSet<Entity<Buffer>>,
-        target: LspFormatTarget,
-        push_to_history: bool,
-        trigger: lsp_store::FormatTrigger,
-        cx: &mut Context<Project>,
-    ) -> Task<anyhow::Result<ProjectTransaction>> {
-        self.lsp_store.update(cx, |lsp_store, cx| {
-            lsp_store.format(buffers, target, push_to_history, trigger, cx)
-        })
-    }
-
-    pub fn definitions<T: ToPointUtf16>(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        position: T,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Option<Vec<LocationLink>>>> {
-        let position = position.to_point_utf16(buffer.read(cx));
-        let guard = self.retain_remotely_created_models(cx);
-        let task = self.lsp_store.update(cx, |lsp_store, cx| {
-            lsp_store.definitions(buffer, position, cx)
-        });
-        cx.background_spawn(async move {
-            let result = task.await;
-            drop(guard);
-            result
-        })
-    }
-
-    pub fn declarations<T: ToPointUtf16>(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        position: T,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Option<Vec<LocationLink>>>> {
-        let position = position.to_point_utf16(buffer.read(cx));
-        let guard = self.retain_remotely_created_models(cx);
-        let task = self.lsp_store.update(cx, |lsp_store, cx| {
-            lsp_store.declarations(buffer, position, cx)
-        });
-        cx.background_spawn(async move {
-            let result = task.await;
-            drop(guard);
-            result
-        })
-    }
-
-    pub fn type_definitions<T: ToPointUtf16>(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        position: T,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Option<Vec<LocationLink>>>> {
-        let position = position.to_point_utf16(buffer.read(cx));
-        let guard = self.retain_remotely_created_models(cx);
-        let task = self.lsp_store.update(cx, |lsp_store, cx| {
-            lsp_store.type_definitions(buffer, position, cx)
-        });
-        cx.background_spawn(async move {
-            let result = task.await;
-            drop(guard);
-            result
-        })
-    }
-
-    pub fn implementations<T: ToPointUtf16>(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        position: T,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Option<Vec<LocationLink>>>> {
-        let position = position.to_point_utf16(buffer.read(cx));
-        let guard = self.retain_remotely_created_models(cx);
-        let task = self.lsp_store.update(cx, |lsp_store, cx| {
-            lsp_store.implementations(buffer, position, cx)
-        });
-        cx.background_spawn(async move {
-            let result = task.await;
-            drop(guard);
-            result
-        })
-    }
-
-    pub fn references<T: ToPointUtf16>(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        position: T,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Option<Vec<Location>>>> {
-        let position = position.to_point_utf16(buffer.read(cx));
-        let guard = self.retain_remotely_created_models(cx);
-        let task = self.lsp_store.update(cx, |lsp_store, cx| {
-            lsp_store.references(buffer, position, cx)
-        });
-        cx.background_spawn(async move {
-            let result = task.await;
-            drop(guard);
-            result
-        })
-    }
-
-    pub fn document_highlights<T: ToPointUtf16>(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        position: T,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Vec<DocumentHighlight>>> {
-        let position = position.to_point_utf16(buffer.read(cx));
-        self.request_lsp(
-            buffer.clone(),
-            LanguageServerToQuery::FirstCapable,
-            GetDocumentHighlights { position },
-            cx,
-        )
-    }
-
-    pub fn document_symbols(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Vec<DocumentSymbol>>> {
-        self.request_lsp(
-            buffer.clone(),
-            LanguageServerToQuery::FirstCapable,
-            GetDocumentSymbols,
-            cx,
-        )
-    }
-
-    pub fn symbols(&self, query: &str, cx: &mut Context<Self>) -> Task<Result<Vec<Symbol>>> {
-        self.lsp_store
-            .update(cx, |lsp_store, cx| lsp_store.symbols(query, cx))
-    }
-
-    pub fn open_buffer_for_symbol(
-        &mut self,
-        symbol: &Symbol,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Entity<Buffer>>> {
-        self.lsp_store.update(cx, |lsp_store, cx| {
-            lsp_store.open_buffer_for_symbol(symbol, cx)
-        })
-    }
-
-    pub fn open_server_settings(&mut self, cx: &mut Context<Self>) -> Task<Result<Entity<Buffer>>> {
-        let guard = self.retain_remotely_created_models(cx);
-        let Some(remote) = self.remote_client.as_ref() else {
-            return Task::ready(Err(anyhow!("not an ssh project")));
-        };
-
-        let proto_client = remote.read(cx).proto_client();
-
-        cx.spawn(async move |project, cx| {
-            let buffer = proto_client
-                .request(proto::OpenServerSettings {
-                    project_id: REMOTE_SERVER_PROJECT_ID,
-                })
-                .await?;
-
-            let buffer = project
-                .update(cx, |project, cx| {
-                    project.buffer_store.update(cx, |buffer_store, cx| {
-                        anyhow::Ok(
-                            buffer_store
-                                .wait_for_remote_buffer(BufferId::new(buffer.buffer_id)?, cx),
-                        )
-                    })
-                })??
-                .await;
-
-            drop(guard);
-            buffer
-        })
-    }
-
-    pub fn open_local_buffer_via_lsp(
-        &mut self,
-        abs_path: lsp::Uri,
-        language_server_id: LanguageServerId,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Entity<Buffer>>> {
-        self.lsp_store.update(cx, |lsp_store, cx| {
-            lsp_store.open_local_buffer_via_lsp(abs_path, language_server_id, cx)
-        })
-    }
-
-    pub fn hover<T: ToPointUtf16>(
-        &self,
-        buffer: &Entity<Buffer>,
-        position: T,
-        cx: &mut Context<Self>,
-    ) -> Task<Option<Vec<Hover>>> {
-        let position = position.to_point_utf16(buffer.read(cx));
-        self.lsp_store
-            .update(cx, |lsp_store, cx| lsp_store.hover(buffer, position, cx))
-    }
-
-    pub fn linked_edits(
-        &self,
-        buffer: &Entity<Buffer>,
-        position: Anchor,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Vec<Range<Anchor>>>> {
-        self.lsp_store.update(cx, |lsp_store, cx| {
-            lsp_store.linked_edits(buffer, position, cx)
-        })
-    }
-
-    pub fn completions<T: ToOffset + ToPointUtf16>(
-        &self,
-        buffer: &Entity<Buffer>,
-        position: T,
-        context: CompletionContext,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Vec<CompletionResponse>>> {
-        let position = position.to_point_utf16(buffer.read(cx));
-        self.lsp_store.update(cx, |lsp_store, cx| {
-            lsp_store.completions(buffer, position, context, cx)
-        })
-    }
-
-    pub fn code_actions<T: Clone + ToOffset>(
-        &mut self,
-        buffer_handle: &Entity<Buffer>,
-        range: Range<T>,
-        kinds: Option<Vec<CodeActionKind>>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Option<Vec<CodeAction>>>> {
-        let buffer = buffer_handle.read(cx);
-        let range = buffer.anchor_before(range.start)..buffer.anchor_before(range.end);
-        self.lsp_store.update(cx, |lsp_store, cx| {
-            lsp_store.code_actions(buffer_handle, range, kinds, cx)
-        })
-    }
-
-    pub fn code_lens_actions<T: Clone + ToOffset>(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        range: Range<T>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Option<Vec<CodeAction>>>> {
-        let snapshot = buffer.read(cx).snapshot();
-        let range = range.to_point(&snapshot);
-        let range_start = snapshot.anchor_before(range.start);
-        let range_end = if range.start == range.end {
-            range_start
-        } else {
-            snapshot.anchor_after(range.end)
-        };
-        let range = range_start..range_end;
-        let code_lens_actions = self
-            .lsp_store
-            .update(cx, |lsp_store, cx| lsp_store.code_lens_actions(buffer, cx));
-
-        cx.background_spawn(async move {
-            let mut code_lens_actions = code_lens_actions
-                .await
-                .map_err(|e| anyhow!("code lens fetch failed: {e:#}"))?;
-            if let Some(code_lens_actions) = &mut code_lens_actions {
-                code_lens_actions.retain(|code_lens_action| {
-                    range
-                        .start
-                        .cmp(&code_lens_action.range.start, &snapshot)
-                        .is_ge()
-                        && range
-                            .end
-                            .cmp(&code_lens_action.range.end, &snapshot)
-                            .is_le()
-                });
-            }
-            Ok(code_lens_actions)
-        })
-    }
-
-    pub fn apply_code_action(
-        &self,
-        buffer_handle: Entity<Buffer>,
-        action: CodeAction,
-        push_to_history: bool,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<ProjectTransaction>> {
-        self.lsp_store.update(cx, |lsp_store, cx| {
-            lsp_store.apply_code_action(buffer_handle, action, push_to_history, cx)
-        })
-    }
-
-    pub fn apply_code_action_kind(
-        &self,
-        buffers: HashSet<Entity<Buffer>>,
-        kind: CodeActionKind,
-        push_to_history: bool,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<ProjectTransaction>> {
-        self.lsp_store.update(cx, |lsp_store, cx| {
-            lsp_store.apply_code_action_kind(buffers, kind, push_to_history, cx)
-        })
-    }
-
-    pub fn prepare_rename<T: ToPointUtf16>(
-        &mut self,
-        buffer: Entity<Buffer>,
-        position: T,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<PrepareRenameResponse>> {
-        let position = position.to_point_utf16(buffer.read(cx));
-        self.request_lsp(
-            buffer,
-            LanguageServerToQuery::FirstCapable,
-            PrepareRename { position },
-            cx,
-        )
-    }
-
-    pub fn perform_rename<T: ToPointUtf16>(
-        &mut self,
-        buffer: Entity<Buffer>,
-        position: T,
-        new_name: String,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<ProjectTransaction>> {
-        let push_to_history = true;
-        let position = position.to_point_utf16(buffer.read(cx));
-        self.request_lsp(
-            buffer,
-            LanguageServerToQuery::FirstCapable,
-            PerformRename {
-                position,
-                new_name,
-                push_to_history,
-            },
-            cx,
-        )
-    }
-
-    pub fn on_type_format<T: ToPointUtf16>(
-        &mut self,
-        buffer: Entity<Buffer>,
-        position: T,
-        trigger: String,
-        push_to_history: bool,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Option<Transaction>>> {
-        self.lsp_store.update(cx, |lsp_store, cx| {
-            lsp_store.on_type_format(buffer, position, trigger, push_to_history, cx)
-        })
-    }
-
-    pub fn inline_values(
-        &mut self,
-        session: Entity<Session>,
-        active_stack_frame: ActiveStackFrame,
-        buffer_handle: Entity<Buffer>,
-        range: Range<text::Anchor>,
-        cx: &mut Context<Self>,
-    ) -> Task<anyhow::Result<Vec<InlayHint>>> {
-        let snapshot = buffer_handle.read(cx).snapshot();
-
-        let captures =
-            snapshot.debug_variables_query(Anchor::min_for_buffer(snapshot.remote_id())..range.end);
-
-        let row = snapshot
-            .summary_for_anchor::<text::PointUtf16>(&range.end)
-            .row as usize;
-
-        let inline_value_locations = provide_inline_values(captures, &snapshot, row);
-
-        let stack_frame_id = active_stack_frame.stack_frame_id;
-        cx.spawn(async move |this, cx| {
-            this.update(cx, |project, cx| {
-                project.dap_store().update(cx, |dap_store, cx| {
-                    dap_store.resolve_inline_value_locations(
-                        session,
-                        stack_frame_id,
-                        buffer_handle,
-                        inline_value_locations,
-                        cx,
-                    )
-                })
-            })?
-            .await
-        })
-    }
-
-    fn search_impl(&mut self, query: SearchQuery, cx: &mut Context<Self>) -> SearchResultsHandle {
-        let client: Option<(AnyProtoClient, _)> = if let Some(ssh_client) = &self.remote_client {
-            Some((ssh_client.read(cx).proto_client(), 0))
-        } else if let Some(remote_id) = self.remote_id() {
-            self.is_local()
-                .not()
-                .then(|| (self.collab_client.clone().into(), remote_id))
-        } else {
-            None
-        };
-        let searcher = if query.is_opened_only() {
-            project_search::Search::open_buffers_only(
-                self.buffer_store.clone(),
-                self.worktree_store.clone(),
-                project_search::Search::MAX_SEARCH_RESULT_FILES + 1,
-            )
-        } else {
-            match client {
-                Some((client, remote_id)) => project_search::Search::remote(
-                    self.buffer_store.clone(),
-                    self.worktree_store.clone(),
-                    project_search::Search::MAX_SEARCH_RESULT_FILES + 1,
-                    (client, remote_id, self.remotely_created_models.clone()),
-                ),
-                None => project_search::Search::local(
-                    self.fs.clone(),
-                    self.buffer_store.clone(),
-                    self.worktree_store.clone(),
-                    project_search::Search::MAX_SEARCH_RESULT_FILES + 1,
-                    cx,
-                ),
-            }
-        };
-        searcher.into_handle(query, cx)
-    }
-
-    pub fn search(&mut self, query: SearchQuery, cx: &mut Context<Self>) -> Receiver<SearchResult> {
-        self.search_impl(query, cx).results(cx)
-    }
-
-    pub fn request_lsp<R: LspCommand>(
-        &mut self,
-        buffer_handle: Entity<Buffer>,
-        server: LanguageServerToQuery,
-        request: R,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<R::Response>>
-    where
-        <R::LspRequest as lsp::request::Request>::Result: Send,
-        <R::LspRequest as lsp::request::Request>::Params: Send,
-    {
-        let guard = self.retain_remotely_created_models(cx);
-        let task = self.lsp_store.update(cx, |lsp_store, cx| {
-            lsp_store.request_lsp(buffer_handle, server, request, cx)
-        });
-        cx.background_spawn(async move {
-            let result = task.await;
-            drop(guard);
-            result
-        })
-    }
-
-    /// Move a worktree to a new position in the worktree order.
-    ///
-    /// The worktree will moved to the opposite side of the destination worktree.
-    ///
-    /// # Example
-    ///
-    /// Given the worktree order `[11, 22, 33]` and a call to move worktree `22` to `33`,
-    /// worktree_order will be updated to produce the indexes `[11, 33, 22]`.
-    ///
-    /// Given the worktree order `[11, 22, 33]` and a call to move worktree `22` to `11`,
-    /// worktree_order will be updated to produce the indexes `[22, 11, 33]`.
-    ///
-    /// # Errors
-    ///
-    /// An error will be returned if the worktree or destination worktree are not found.
-    pub fn move_worktree(
-        &mut self,
-        source: WorktreeId,
-        destination: WorktreeId,
-        cx: &mut Context<Self>,
-    ) -> Result<()> {
-        self.worktree_store.update(cx, |worktree_store, cx| {
-            worktree_store.move_worktree(source, destination, cx)
-        })
-    }
-
-    pub fn find_or_create_worktree(
-        &mut self,
-        abs_path: impl AsRef<Path>,
-        visible: bool,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<(Entity<Worktree>, Arc<RelPath>)>> {
-        self.worktree_store.update(cx, |worktree_store, cx| {
-            worktree_store.find_or_create_worktree(abs_path, visible, cx)
-        })
-    }
-
-    pub fn find_worktree(
-        &self,
-        abs_path: &Path,
-        cx: &App,
-    ) -> Option<(Entity<Worktree>, Arc<RelPath>)> {
-        self.worktree_store.read(cx).find_worktree(abs_path, cx)
-    }
-
-    pub fn is_shared(&self) -> bool {
-        match &self.client_state {
-            ProjectClientState::Shared { .. } => true,
-            ProjectClientState::Local => false,
-            ProjectClientState::Remote { .. } => true,
-        }
-    }
-
-    /// Returns the resolved version of `path`, that was found in `buffer`, if it exists.
-    pub fn resolve_path_in_buffer(
-        &self,
-        path: &str,
-        buffer: &Entity<Buffer>,
-        cx: &mut Context<Self>,
-    ) -> Task<Option<ResolvedPath>> {
-        if util::paths::is_absolute(path, self.path_style(cx)) || path.starts_with("~") {
-            self.resolve_abs_path(path, cx)
-        } else {
-            self.resolve_path_in_worktrees(path, buffer, cx)
-        }
-    }
-
-    pub fn resolve_abs_file_path(
-        &self,
-        path: &str,
-        cx: &mut Context<Self>,
-    ) -> Task<Option<ResolvedPath>> {
-        let resolve_task = self.resolve_abs_path(path, cx);
-        cx.background_spawn(async move {
-            let resolved_path = resolve_task.await;
-            resolved_path.filter(|path| path.is_file())
-        })
-    }
-
-    pub fn resolve_abs_path(&self, path: &str, cx: &App) -> Task<Option<ResolvedPath>> {
-        if self.is_local() {
-            let expanded = PathBuf::from(shellexpand::tilde(&path).into_owned());
-            let fs = self.fs.clone();
-            cx.background_spawn(async move {
-                let metadata = fs.metadata(&expanded).await.ok().flatten();
-
-                metadata.map(|metadata| ResolvedPath::AbsPath {
-                    path: expanded.to_string_lossy().into_owned(),
-                    is_dir: metadata.is_dir,
-                })
-            })
-        } else if let Some(ssh_client) = self.remote_client.as_ref() {
-            let request = ssh_client
-                .read(cx)
-                .proto_client()
-                .request(proto::GetPathMetadata {
-                    project_id: REMOTE_SERVER_PROJECT_ID,
-                    path: path.into(),
-                });
-            cx.background_spawn(async move {
-                let response = request.await.log_err()?;
-                if response.exists {
-                    Some(ResolvedPath::AbsPath {
-                        path: response.path,
-                        is_dir: response.is_dir,
-                    })
-                } else {
-                    None
-                }
-            })
-        } else {
-            Task::ready(None)
-        }
-    }
-
-    fn resolve_path_in_worktrees(
-        &self,
-        path: &str,
-        buffer: &Entity<Buffer>,
-        cx: &mut Context<Self>,
-    ) -> Task<Option<ResolvedPath>> {
-        let mut candidates = vec![];
-        let path_style = self.path_style(cx);
-        if let Ok(path) = RelPath::new(path.as_ref(), path_style) {
-            candidates.push(path.into_arc());
-        }
-
-        if let Some(file) = buffer.read(cx).file()
-            && let Some(dir) = file.path().parent()
-        {
-            if let Some(joined) = path_style.join(&*dir.display(path_style), path)
-                && let Some(joined) = RelPath::new(joined.as_ref(), path_style).ok()
-            {
-                candidates.push(joined.into_arc());
-            }
-        }
-
-        let buffer_worktree_id = buffer.read(cx).file().map(|file| file.worktree_id(cx));
-        let worktrees_with_ids: Vec<_> = self
-            .worktrees(cx)
-            .map(|worktree| {
-                let id = worktree.read(cx).id();
-                (worktree, id)
-            })
-            .collect();
-
-        cx.spawn(async move |_, cx| {
-            if let Some(buffer_worktree_id) = buffer_worktree_id
-                && let Some((worktree, _)) = worktrees_with_ids
-                    .iter()
-                    .find(|(_, id)| *id == buffer_worktree_id)
-            {
-                for candidate in candidates.iter() {
-                    if let Some(path) = Self::resolve_path_in_worktree(worktree, candidate, cx) {
-                        return Some(path);
-                    }
-                }
-            }
-            for (worktree, id) in worktrees_with_ids {
-                if Some(id) == buffer_worktree_id {
-                    continue;
-                }
-                for candidate in candidates.iter() {
-                    if let Some(path) = Self::resolve_path_in_worktree(&worktree, candidate, cx) {
-                        return Some(path);
-                    }
-                }
-            }
-            None
-        })
-    }
-
-    fn resolve_path_in_worktree(
-        worktree: &Entity<Worktree>,
-        path: &RelPath,
-        cx: &mut AsyncApp,
-    ) -> Option<ResolvedPath> {
-        worktree
-            .read_with(cx, |worktree, _| {
-                worktree.entry_for_path(path).map(|entry| {
-                    let project_path = ProjectPath {
-                        worktree_id: worktree.id(),
-                        path: entry.path.clone(),
-                    };
-                    ResolvedPath::ProjectPath {
-                        project_path,
-                        is_dir: entry.is_dir(),
-                    }
-                })
-            })
-            .ok()?
-    }
-
-    pub fn list_directory(
-        &self,
-        query: String,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Vec<DirectoryItem>>> {
-        if self.is_local() {
-            DirectoryLister::Local(cx.entity(), self.fs.clone()).list_directory(query, cx)
-        } else if let Some(session) = self.remote_client.as_ref() {
-            let request = proto::ListRemoteDirectory {
-                dev_server_id: REMOTE_SERVER_PROJECT_ID,
-                path: query,
-                config: Some(proto::ListRemoteDirectoryConfig { is_dir: true }),
-            };
-
-            let response = session.read(cx).proto_client().request(request);
-            cx.background_spawn(async move {
-                let proto::ListRemoteDirectoryResponse {
-                    entries,
-                    entry_info,
-                } = response.await?;
-                Ok(entries
-                    .into_iter()
-                    .zip(entry_info)
-                    .map(|(entry, info)| DirectoryItem {
-                        path: PathBuf::from(entry),
-                        is_dir: info.is_dir,
-                    })
-                    .collect())
-            })
-        } else {
-            Task::ready(Err(anyhow!("cannot list directory in remote project")))
-        }
-    }
-
-    pub fn create_worktree(
-        &mut self,
-        abs_path: impl AsRef<Path>,
-        visible: bool,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Entity<Worktree>>> {
-        self.worktree_store.update(cx, |worktree_store, cx| {
-            worktree_store.create_worktree(abs_path, visible, cx)
-        })
-    }
-
-    pub fn remove_worktree(&mut self, id_to_remove: WorktreeId, cx: &mut Context<Self>) {
-        self.worktree_store.update(cx, |worktree_store, cx| {
-            worktree_store.remove_worktree(id_to_remove, cx);
-        });
-    }
-
-    fn add_worktree(&mut self, worktree: &Entity<Worktree>, cx: &mut Context<Self>) {
-        self.worktree_store.update(cx, |worktree_store, cx| {
-            worktree_store.add(worktree, cx);
-        });
-    }
-
-    pub fn set_active_path(&mut self, entry: Option<ProjectPath>, cx: &mut Context<Self>) {
-        let new_active_entry = entry.and_then(|project_path| {
-            let worktree = self.worktree_for_id(project_path.worktree_id, cx)?;
-            let entry = worktree.read(cx).entry_for_path(&project_path.path)?;
-            Some(entry.id)
-        });
-        if new_active_entry != self.active_entry {
-            self.active_entry = new_active_entry;
-            self.lsp_store.update(cx, |lsp_store, _| {
-                lsp_store.set_active_entry(new_active_entry);
-            });
-            cx.emit(Event::ActiveEntryChanged(new_active_entry));
-        }
-    }
-
-    pub fn language_servers_running_disk_based_diagnostics<'a>(
-        &'a self,
-        cx: &'a App,
-    ) -> impl Iterator<Item = LanguageServerId> + 'a {
-        self.lsp_store
-            .read(cx)
-            .language_servers_running_disk_based_diagnostics()
-    }
-
-    pub fn diagnostic_summary(&self, include_ignored: bool, cx: &App) -> DiagnosticSummary {
-        self.lsp_store
-            .read(cx)
-            .diagnostic_summary(include_ignored, cx)
-    }
-
-    /// Returns a summary of the diagnostics for the provided project path only.
-    pub fn diagnostic_summary_for_path(&self, path: &ProjectPath, cx: &App) -> DiagnosticSummary {
-        self.lsp_store
-            .read(cx)
-            .diagnostic_summary_for_path(path, cx)
-    }
-
-    pub fn diagnostic_summaries<'a>(
-        &'a self,
-        include_ignored: bool,
-        cx: &'a App,
-    ) -> impl Iterator<Item = (ProjectPath, LanguageServerId, DiagnosticSummary)> + 'a {
-        self.lsp_store
-            .read(cx)
-            .diagnostic_summaries(include_ignored, cx)
-    }
-
-    pub fn active_entry(&self) -> Option<ProjectEntryId> {
-        self.active_entry
-    }
-
-    pub fn entry_for_path<'a>(&'a self, path: &ProjectPath, cx: &'a App) -> Option<&'a Entry> {
-        self.worktree_store.read(cx).entry_for_path(path, cx)
-    }
-
-    pub fn path_for_entry(&self, entry_id: ProjectEntryId, cx: &App) -> Option<ProjectPath> {
-        let worktree = self.worktree_for_entry(entry_id, cx)?;
-        let worktree = worktree.read(cx);
-        let worktree_id = worktree.id();
-        let path = worktree.entry_for_id(entry_id)?.path.clone();
-        Some(ProjectPath { worktree_id, path })
-    }
-
-    pub fn absolute_path(&self, project_path: &ProjectPath, cx: &App) -> Option<PathBuf> {
-        Some(
-            self.worktree_for_id(project_path.worktree_id, cx)?
-                .read(cx)
-                .absolutize(&project_path.path),
-        )
-    }
-
-    /// Attempts to find a `ProjectPath` corresponding to the given path. If the path
-    /// is a *full path*, meaning it starts with the root name of a worktree, we'll locate
-    /// it in that worktree. Otherwise, we'll attempt to find it as a relative path in
-    /// the first visible worktree that has an entry for that relative path.
-    ///
-    /// We use this to resolve edit steps, when there's a chance an LLM may omit the workree
-    /// root name from paths.
-    ///
-    /// # Arguments
-    ///
-    /// * `path` - An absolute path, or a full path that starts with a worktree root name, or a
-    ///   relative path within a visible worktree.
-    /// * `cx` - A reference to the `AppContext`.
-    ///
-    /// # Returns
-    ///
-    /// Returns `Some(ProjectPath)` if a matching worktree is found, otherwise `None`.
-    pub fn find_project_path(&self, path: impl AsRef<Path>, cx: &App) -> Option<ProjectPath> {
-        let path_style = self.path_style(cx);
-        let path = path.as_ref();
-        let worktree_store = self.worktree_store.read(cx);
-
-        if is_absolute(&path.to_string_lossy(), path_style) {
-            for worktree in worktree_store.visible_worktrees(cx) {
-                let worktree_abs_path = worktree.read(cx).abs_path();
-
-                if let Ok(relative_path) = path.strip_prefix(worktree_abs_path)
-                    && let Ok(path) = RelPath::new(relative_path, path_style)
-                {
-                    return Some(ProjectPath {
-                        worktree_id: worktree.read(cx).id(),
-                        path: path.into_arc(),
-                    });
-                }
-            }
-        } else {
-            for worktree in worktree_store.visible_worktrees(cx) {
-                let worktree_root_name = worktree.read(cx).root_name();
-                if let Ok(relative_path) = path.strip_prefix(worktree_root_name.as_std_path())
-                    && let Ok(path) = RelPath::new(relative_path, path_style)
-                {
-                    return Some(ProjectPath {
-                        worktree_id: worktree.read(cx).id(),
-                        path: path.into_arc(),
-                    });
-                }
-            }
-
-            for worktree in worktree_store.visible_worktrees(cx) {
-                let worktree = worktree.read(cx);
-                if let Ok(path) = RelPath::new(path, path_style)
-                    && let Some(entry) = worktree.entry_for_path(&path)
-                {
-                    return Some(ProjectPath {
-                        worktree_id: worktree.id(),
-                        path: entry.path.clone(),
-                    });
-                }
-            }
-        }
-
-        None
-    }
-
-    /// If there's only one visible worktree, returns the given worktree-relative path with no prefix.
-    ///
-    /// Otherwise, returns the full path for the project path (obtained by prefixing the worktree-relative path with the name of the worktree).
-    pub fn short_full_path_for_project_path(
-        &self,
-        project_path: &ProjectPath,
-        cx: &App,
-    ) -> Option<String> {
-        let path_style = self.path_style(cx);
-        if self.visible_worktrees(cx).take(2).count() < 2 {
-            return Some(project_path.path.display(path_style).to_string());
-        }
-        self.worktree_for_id(project_path.worktree_id, cx)
-            .map(|worktree| {
-                let worktree_name = worktree.read(cx).root_name();
-                worktree_name
-                    .join(&project_path.path)
-                    .display(path_style)
-                    .to_string()
-            })
-    }
-
-    pub fn project_path_for_absolute_path(&self, abs_path: &Path, cx: &App) -> Option<ProjectPath> {
-        self.find_worktree(abs_path, cx)
-            .map(|(worktree, relative_path)| ProjectPath {
-                worktree_id: worktree.read(cx).id(),
-                path: relative_path,
-            })
-    }
-
-    pub fn get_workspace_root(&self, project_path: &ProjectPath, cx: &App) -> Option<PathBuf> {
-        Some(
-            self.worktree_for_id(project_path.worktree_id, cx)?
-                .read(cx)
-                .abs_path()
-                .to_path_buf(),
-        )
-    }
-
-    pub fn blame_buffer(
-        &self,
-        buffer: &Entity<Buffer>,
-        version: Option<clock::Global>,
-        cx: &mut App,
-    ) -> Task<Result<Option<Blame>>> {
-        self.git_store.update(cx, |git_store, cx| {
-            git_store.blame_buffer(buffer, version, cx)
-        })
-    }
-
-    pub fn get_permalink_to_line(
-        &self,
-        buffer: &Entity<Buffer>,
-        selection: Range<u32>,
-        cx: &mut App,
-    ) -> Task<Result<url::Url>> {
-        self.git_store.update(cx, |git_store, cx| {
-            git_store.get_permalink_to_line(buffer, selection, cx)
-        })
-    }
-
-    // RPC message handlers
-
-    async fn handle_unshare_project(
-        this: Entity<Self>,
-        _: TypedEnvelope<proto::UnshareProject>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        this.update(&mut cx, |this, cx| {
-            if this.is_local() || this.is_via_remote_server() {
-                this.unshare(cx)?;
-            } else {
-                this.disconnected_from_host(cx);
-            }
-            Ok(())
-        })?
-    }
-
-    async fn handle_add_collaborator(
-        this: Entity<Self>,
-        mut envelope: TypedEnvelope<proto::AddProjectCollaborator>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        let collaborator = envelope
-            .payload
-            .collaborator
-            .take()
-            .context("empty collaborator")?;
-
-        let collaborator = Collaborator::from_proto(collaborator)?;
-        this.update(&mut cx, |this, cx| {
-            this.buffer_store.update(cx, |buffer_store, _| {
-                buffer_store.forget_shared_buffers_for(&collaborator.peer_id);
-            });
-            this.breakpoint_store.read(cx).broadcast();
-            cx.emit(Event::CollaboratorJoined(collaborator.peer_id));
-            this.collaborators
-                .insert(collaborator.peer_id, collaborator);
-        })?;
-
-        Ok(())
-    }
-
-    async fn handle_update_project_collaborator(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::UpdateProjectCollaborator>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        let old_peer_id = envelope
-            .payload
-            .old_peer_id
-            .context("missing old peer id")?;
-        let new_peer_id = envelope
-            .payload
-            .new_peer_id
-            .context("missing new peer id")?;
-        this.update(&mut cx, |this, cx| {
-            let collaborator = this
-                .collaborators
-                .remove(&old_peer_id)
-                .context("received UpdateProjectCollaborator for unknown peer")?;
-            let is_host = collaborator.is_host;
-            this.collaborators.insert(new_peer_id, collaborator);
-
-            log::info!("peer {} became {}", old_peer_id, new_peer_id,);
-            this.buffer_store.update(cx, |buffer_store, _| {
-                buffer_store.update_peer_id(&old_peer_id, new_peer_id)
-            });
-
-            if is_host {
-                this.buffer_store
-                    .update(cx, |buffer_store, _| buffer_store.discard_incomplete());
-                this.enqueue_buffer_ordered_message(BufferOrderedMessage::Resync)
-                    .unwrap();
-                cx.emit(Event::HostReshared);
-            }
-
-            cx.emit(Event::CollaboratorUpdated {
-                old_peer_id,
-                new_peer_id,
-            });
-            Ok(())
-        })?
-    }
-
-    async fn handle_remove_collaborator(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::RemoveProjectCollaborator>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        this.update(&mut cx, |this, cx| {
-            let peer_id = envelope.payload.peer_id.context("invalid peer id")?;
-            let replica_id = this
-                .collaborators
-                .remove(&peer_id)
-                .with_context(|| format!("unknown peer {peer_id:?}"))?
-                .replica_id;
-            this.buffer_store.update(cx, |buffer_store, cx| {
-                buffer_store.forget_shared_buffers_for(&peer_id);
-                for buffer in buffer_store.buffers() {
-                    buffer.update(cx, |buffer, cx| buffer.remove_peer(replica_id, cx));
-                }
-            });
-            this.git_store.update(cx, |git_store, _| {
-                git_store.forget_shared_diffs_for(&peer_id);
-            });
-
-            cx.emit(Event::CollaboratorLeft(peer_id));
-            Ok(())
-        })?
-    }
-
-    async fn handle_update_project(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::UpdateProject>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        this.update(&mut cx, |this, cx| {
-            // Don't handle messages that were sent before the response to us joining the project
-            if envelope.message_id > this.join_project_response_message_id {
-                this.set_worktrees_from_proto(envelope.payload.worktrees, cx)?;
-            }
-            Ok(())
-        })?
-    }
-
-    async fn handle_toast(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::Toast>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        this.update(&mut cx, |_, cx| {
-            cx.emit(Event::Toast {
-                notification_id: envelope.payload.notification_id.into(),
-                message: envelope.payload.message,
-            });
-            Ok(())
-        })?
-    }
-
-    async fn handle_language_server_prompt_request(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::LanguageServerPromptRequest>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::LanguageServerPromptResponse> {
-        let (tx, rx) = smol::channel::bounded(1);
-        let actions: Vec<_> = envelope
-            .payload
-            .actions
-            .into_iter()
-            .map(|action| MessageActionItem {
-                title: action,
-                properties: Default::default(),
-            })
-            .collect();
-        this.update(&mut cx, |_, cx| {
-            cx.emit(Event::LanguageServerPrompt(LanguageServerPromptRequest {
-                level: proto_to_prompt(envelope.payload.level.context("Invalid prompt level")?),
-                message: envelope.payload.message,
-                actions: actions.clone(),
-                lsp_name: envelope.payload.lsp_name,
-                response_channel: tx,
-            }));
-
-            anyhow::Ok(())
-        })??;
-
-        // We drop `this` to avoid holding a reference in this future for too
-        // long.
-        // If we keep the reference, we might not drop the `Project` early
-        // enough when closing a window and it will only get releases on the
-        // next `flush_effects()` call.
-        drop(this);
-
-        let mut rx = pin!(rx);
-        let answer = rx.next().await;
-
-        Ok(LanguageServerPromptResponse {
-            action_response: answer.and_then(|answer| {
-                actions
-                    .iter()
-                    .position(|action| *action == answer)
-                    .map(|index| index as u64)
-            }),
-        })
-    }
-
-    async fn handle_hide_toast(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::HideToast>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        this.update(&mut cx, |_, cx| {
-            cx.emit(Event::HideToast {
-                notification_id: envelope.payload.notification_id.into(),
-            });
-            Ok(())
-        })?
-    }
-
-    // Collab sends UpdateWorktree protos as messages
-    async fn handle_update_worktree(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::UpdateWorktree>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        this.update(&mut cx, |this, cx| {
-            let worktree_id = WorktreeId::from_proto(envelope.payload.worktree_id);
-            if let Some(worktree) = this.worktree_for_id(worktree_id, cx) {
-                worktree.update(cx, |worktree, _| {
-                    let worktree = worktree.as_remote_mut().unwrap();
-                    worktree.update_from_remote(envelope.payload);
-                });
-            }
-            Ok(())
-        })?
-    }
-
-    async fn handle_update_buffer_from_remote_server(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::UpdateBuffer>,
-        cx: AsyncApp,
-    ) -> Result<proto::Ack> {
-        let buffer_store = this.read_with(&cx, |this, cx| {
-            if let Some(remote_id) = this.remote_id() {
-                let mut payload = envelope.payload.clone();
-                payload.project_id = remote_id;
-                cx.background_spawn(this.collab_client.request(payload))
-                    .detach_and_log_err(cx);
-            }
-            this.buffer_store.clone()
-        })?;
-        BufferStore::handle_update_buffer(buffer_store, envelope, cx).await
-    }
-
-    async fn handle_update_buffer(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::UpdateBuffer>,
-        cx: AsyncApp,
-    ) -> Result<proto::Ack> {
-        let buffer_store = this.read_with(&cx, |this, cx| {
-            if let Some(ssh) = &this.remote_client {
-                let mut payload = envelope.payload.clone();
-                payload.project_id = REMOTE_SERVER_PROJECT_ID;
-                cx.background_spawn(ssh.read(cx).proto_client().request(payload))
-                    .detach_and_log_err(cx);
-            }
-            this.buffer_store.clone()
-        })?;
-        BufferStore::handle_update_buffer(buffer_store, envelope, cx).await
-    }
-
-    fn retain_remotely_created_models(
-        &mut self,
-        cx: &mut Context<Self>,
-    ) -> RemotelyCreatedModelGuard {
-        Self::retain_remotely_created_models_impl(
-            &self.remotely_created_models,
-            &self.buffer_store,
-            &self.worktree_store,
-            cx,
-        )
-    }
-
-    fn retain_remotely_created_models_impl(
-        models: &Arc<Mutex<RemotelyCreatedModels>>,
-        buffer_store: &Entity<BufferStore>,
-        worktree_store: &Entity<WorktreeStore>,
-        cx: &mut App,
-    ) -> RemotelyCreatedModelGuard {
-        {
-            let mut remotely_create_models = models.lock();
-            if remotely_create_models.retain_count == 0 {
-                remotely_create_models.buffers = buffer_store.read(cx).buffers().collect();
-                remotely_create_models.worktrees = worktree_store.read(cx).worktrees().collect();
-            }
-            remotely_create_models.retain_count += 1;
-        }
-        RemotelyCreatedModelGuard {
-            remote_models: Arc::downgrade(&models),
-        }
-    }
-
-    async fn handle_create_buffer_for_peer(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::CreateBufferForPeer>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        this.update(&mut cx, |this, cx| {
-            this.buffer_store.update(cx, |buffer_store, cx| {
-                buffer_store.handle_create_buffer_for_peer(
-                    envelope,
-                    this.replica_id(),
-                    this.capability(),
-                    cx,
-                )
-            })
-        })?
-    }
-
-    async fn handle_toggle_lsp_logs(
-        project: Entity<Self>,
-        envelope: TypedEnvelope<proto::ToggleLspLogs>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        let toggled_log_kind =
-            match proto::toggle_lsp_logs::LogType::from_i32(envelope.payload.log_type)
-                .context("invalid log type")?
-            {
-                proto::toggle_lsp_logs::LogType::Log => LogKind::Logs,
-                proto::toggle_lsp_logs::LogType::Trace => LogKind::Trace,
-                proto::toggle_lsp_logs::LogType::Rpc => LogKind::Rpc,
-            };
-        project.update(&mut cx, |_, cx| {
-            cx.emit(Event::ToggleLspLogs {
-                server_id: LanguageServerId::from_proto(envelope.payload.server_id),
-                enabled: envelope.payload.enabled,
-                toggled_log_kind,
-            })
-        })?;
-        Ok(())
-    }
-
-    async fn handle_synchronize_buffers(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::SynchronizeBuffers>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::SynchronizeBuffersResponse> {
-        let response = this.update(&mut cx, |this, cx| {
-            let client = this.collab_client.clone();
-            this.buffer_store.update(cx, |this, cx| {
-                this.handle_synchronize_buffers(envelope, cx, client)
-            })
-        })??;
-
-        Ok(response)
-    }
-
-    async fn handle_search_candidate_buffers(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::FindSearchCandidates>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::FindSearchCandidatesResponse> {
-        let peer_id = envelope.original_sender_id()?;
-        let message = envelope.payload;
-        let path_style = this.read_with(&cx, |this, cx| this.path_style(cx))?;
-        let query =
-            SearchQuery::from_proto(message.query.context("missing query field")?, path_style)?;
-        let results = this.update(&mut cx, |this, cx| {
-            this.search_impl(query, cx).matching_buffers(cx)
-        })?;
-
-        let mut response = proto::FindSearchCandidatesResponse {
-            buffer_ids: Vec::new(),
-        };
-
-        while let Ok(buffer) = results.recv().await {
-            this.update(&mut cx, |this, cx| {
-                let buffer_id = this.create_buffer_for_peer(&buffer, peer_id, cx);
-                response.buffer_ids.push(buffer_id.to_proto());
-            })?;
-        }
-
-        Ok(response)
-    }
-
-    async fn handle_open_buffer_by_id(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::OpenBufferById>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::OpenBufferResponse> {
-        let peer_id = envelope.original_sender_id()?;
-        let buffer_id = BufferId::new(envelope.payload.id)?;
-        let buffer = this
-            .update(&mut cx, |this, cx| this.open_buffer_by_id(buffer_id, cx))?
-            .await?;
-        Project::respond_to_open_buffer_request(this, buffer, peer_id, &mut cx)
-    }
-
-    async fn handle_open_buffer_by_path(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::OpenBufferByPath>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::OpenBufferResponse> {
-        let peer_id = envelope.original_sender_id()?;
-        let worktree_id = WorktreeId::from_proto(envelope.payload.worktree_id);
-        let path = RelPath::from_proto(&envelope.payload.path)?;
-        let open_buffer = this
-            .update(&mut cx, |this, cx| {
-                this.open_buffer(ProjectPath { worktree_id, path }, cx)
-            })?
-            .await?;
-        Project::respond_to_open_buffer_request(this, open_buffer, peer_id, &mut cx)
-    }
-
-    async fn handle_open_new_buffer(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::OpenNewBuffer>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::OpenBufferResponse> {
-        let buffer = this
-            .update(&mut cx, |this, cx| this.create_buffer(true, cx))?
-            .await?;
-        let peer_id = envelope.original_sender_id()?;
-
-        Project::respond_to_open_buffer_request(this, buffer, peer_id, &mut cx)
-    }
-
-    fn respond_to_open_buffer_request(
-        this: Entity<Self>,
-        buffer: Entity<Buffer>,
-        peer_id: proto::PeerId,
-        cx: &mut AsyncApp,
-    ) -> Result<proto::OpenBufferResponse> {
-        this.update(cx, |this, cx| {
-            let is_private = buffer
-                .read(cx)
-                .file()
-                .map(|f| f.is_private())
-                .unwrap_or_default();
-            anyhow::ensure!(!is_private, ErrorCode::UnsharedItem);
-            Ok(proto::OpenBufferResponse {
-                buffer_id: this.create_buffer_for_peer(&buffer, peer_id, cx).into(),
-            })
-        })?
-    }
-
-    fn create_buffer_for_peer(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        peer_id: proto::PeerId,
-        cx: &mut App,
-    ) -> BufferId {
-        self.buffer_store
-            .update(cx, |buffer_store, cx| {
-                buffer_store.create_buffer_for_peer(buffer, peer_id, cx)
-            })
-            .detach_and_log_err(cx);
-        buffer.read(cx).remote_id()
-    }
-
-    async fn handle_create_image_for_peer(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::CreateImageForPeer>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        this.update(&mut cx, |this, cx| {
-            this.image_store.update(cx, |image_store, cx| {
-                image_store.handle_create_image_for_peer(envelope, cx)
-            })
-        })?
-        .log_err();
-        Ok(())
-    }
-
-    fn synchronize_remote_buffers(&mut self, cx: &mut Context<Self>) -> Task<Result<()>> {
-        let project_id = match self.client_state {
-            ProjectClientState::Remote {
-                sharing_has_stopped,
-                remote_id,
-                ..
-            } => {
-                if sharing_has_stopped {
-                    return Task::ready(Err(anyhow!(
-                        "can't synchronize remote buffers on a readonly project"
-                    )));
-                } else {
-                    remote_id
-                }
-            }
-            ProjectClientState::Shared { .. } | ProjectClientState::Local => {
-                return Task::ready(Err(anyhow!(
-                    "can't synchronize remote buffers on a local project"
-                )));
-            }
-        };
-
-        let client = self.collab_client.clone();
-        cx.spawn(async move |this, cx| {
-            let (buffers, incomplete_buffer_ids) = this.update(cx, |this, cx| {
-                this.buffer_store.read(cx).buffer_version_info(cx)
-            })?;
-            let response = client
-                .request(proto::SynchronizeBuffers {
-                    project_id,
-                    buffers,
-                })
-                .await?;
-
-            let send_updates_for_buffers = this.update(cx, |this, cx| {
-                response
-                    .buffers
-                    .into_iter()
-                    .map(|buffer| {
-                        let client = client.clone();
-                        let buffer_id = match BufferId::new(buffer.id) {
-                            Ok(id) => id,
-                            Err(e) => {
-                                return Task::ready(Err(e));
-                            }
-                        };
-                        let remote_version = language::proto::deserialize_version(&buffer.version);
-                        if let Some(buffer) = this.buffer_for_id(buffer_id, cx) {
-                            let operations =
-                                buffer.read(cx).serialize_ops(Some(remote_version), cx);
-                            cx.background_spawn(async move {
-                                let operations = operations.await;
-                                for chunk in split_operations(operations) {
-                                    client
-                                        .request(proto::UpdateBuffer {
-                                            project_id,
-                                            buffer_id: buffer_id.into(),
-                                            operations: chunk,
-                                        })
-                                        .await?;
-                                }
-                                anyhow::Ok(())
-                            })
-                        } else {
-                            Task::ready(Ok(()))
-                        }
-                    })
-                    .collect::<Vec<_>>()
-            })?;
-
-            // Any incomplete buffers have open requests waiting. Request that the host sends
-            // creates these buffers for us again to unblock any waiting futures.
-            for id in incomplete_buffer_ids {
-                cx.background_spawn(client.request(proto::OpenBufferById {
-                    project_id,
-                    id: id.into(),
-                }))
-                .detach();
-            }
-
-            futures::future::join_all(send_updates_for_buffers)
-                .await
-                .into_iter()
-                .collect()
-        })
-    }
-
-    pub fn worktree_metadata_protos(&self, cx: &App) -> Vec<proto::WorktreeMetadata> {
-        self.worktree_store.read(cx).worktree_metadata_protos(cx)
-    }
-
-    /// Iterator of all open buffers that have unsaved changes
-    pub fn dirty_buffers<'a>(&'a self, cx: &'a App) -> impl Iterator<Item = ProjectPath> + 'a {
-        self.buffer_store.read(cx).buffers().filter_map(|buf| {
-            let buf = buf.read(cx);
-            if buf.is_dirty() {
-                buf.project_path(cx)
-            } else {
-                None
-            }
-        })
-    }
-
-    fn set_worktrees_from_proto(
-        &mut self,
-        worktrees: Vec<proto::WorktreeMetadata>,
-        cx: &mut Context<Project>,
-    ) -> Result<()> {
-        self.worktree_store.update(cx, |worktree_store, cx| {
-            worktree_store.set_worktrees_from_proto(worktrees, self.replica_id(), cx)
-        })
-    }
-
-    fn set_collaborators_from_proto(
-        &mut self,
-        messages: Vec<proto::Collaborator>,
-        cx: &mut Context<Self>,
-    ) -> Result<()> {
-        let mut collaborators = HashMap::default();
-        for message in messages {
-            let collaborator = Collaborator::from_proto(message)?;
-            collaborators.insert(collaborator.peer_id, collaborator);
-        }
-        for old_peer_id in self.collaborators.keys() {
-            if !collaborators.contains_key(old_peer_id) {
-                cx.emit(Event::CollaboratorLeft(*old_peer_id));
-            }
-        }
-        self.collaborators = collaborators;
-        Ok(())
-    }
-
-    pub fn supplementary_language_servers<'a>(
-        &'a self,
-        cx: &'a App,
-    ) -> impl 'a + Iterator<Item = (LanguageServerId, LanguageServerName)> {
-        self.lsp_store.read(cx).supplementary_language_servers()
-    }
-
-    pub fn any_language_server_supports_inlay_hints(&self, buffer: &Buffer, cx: &mut App) -> bool {
-        let Some(language) = buffer.language().cloned() else {
-            return false;
-        };
-        self.lsp_store.update(cx, |lsp_store, _| {
-            let relevant_language_servers = lsp_store
-                .languages
-                .lsp_adapters(&language.name())
-                .into_iter()
-                .map(|lsp_adapter| lsp_adapter.name())
-                .collect::<HashSet<_>>();
-            lsp_store
-                .language_server_statuses()
-                .filter_map(|(server_id, server_status)| {
-                    relevant_language_servers
-                        .contains(&server_status.name)
-                        .then_some(server_id)
-                })
-                .filter_map(|server_id| lsp_store.lsp_server_capabilities.get(&server_id))
-                .any(InlayHints::check_capabilities)
-        })
-    }
-
-    pub fn language_server_id_for_name(
-        &self,
-        buffer: &Buffer,
-        name: &LanguageServerName,
-        cx: &App,
-    ) -> Option<LanguageServerId> {
-        let language = buffer.language()?;
-        let relevant_language_servers = self
-            .languages
-            .lsp_adapters(&language.name())
-            .into_iter()
-            .map(|lsp_adapter| lsp_adapter.name())
-            .collect::<HashSet<_>>();
-        if !relevant_language_servers.contains(name) {
-            return None;
-        }
-        self.language_server_statuses(cx)
-            .filter(|(_, server_status)| relevant_language_servers.contains(&server_status.name))
-            .find_map(|(server_id, server_status)| {
-                if &server_status.name == name {
-                    Some(server_id)
-                } else {
-                    None
-                }
-            })
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn has_language_servers_for(&self, buffer: &Buffer, cx: &mut App) -> bool {
-        self.lsp_store.update(cx, |this, cx| {
-            this.running_language_servers_for_local_buffer(buffer, cx)
-                .next()
-                .is_some()
-        })
-    }
-
-    pub fn git_init(
-        &self,
-        path: Arc<Path>,
-        fallback_branch_name: String,
-        cx: &App,
-    ) -> Task<Result<()>> {
-        self.git_store
-            .read(cx)
-            .git_init(path, fallback_branch_name, cx)
-    }
-
-    pub fn buffer_store(&self) -> &Entity<BufferStore> {
-        &self.buffer_store
-    }
-
-    pub fn git_store(&self) -> &Entity<GitStore> {
-        &self.git_store
-    }
-
-    pub fn agent_server_store(&self) -> &Entity<AgentServerStore> {
-        &self.agent_server_store
-    }
-
-    #[cfg(test)]
-    fn git_scans_complete(&self, cx: &Context<Self>) -> Task<()> {
-        cx.spawn(async move |this, cx| {
-            let scans_complete = this
-                .read_with(cx, |this, cx| {
-                    this.worktrees(cx)
-                        .filter_map(|worktree| Some(worktree.read(cx).as_local()?.scan_complete()))
-                        .collect::<Vec<_>>()
-                })
-                .unwrap();
-            join_all(scans_complete).await;
-            let barriers = this
-                .update(cx, |this, cx| {
-                    let repos = this.repositories(cx).values().cloned().collect::<Vec<_>>();
-                    repos
-                        .into_iter()
-                        .map(|repo| repo.update(cx, |repo, _| repo.barrier()))
-                        .collect::<Vec<_>>()
-                })
-                .unwrap();
-            join_all(barriers).await;
-        })
-    }
-
-    pub fn active_repository(&self, cx: &App) -> Option<Entity<Repository>> {
-        self.git_store.read(cx).active_repository()
-    }
-
-    pub fn repositories<'a>(&self, cx: &'a App) -> &'a HashMap<RepositoryId, Entity<Repository>> {
-        self.git_store.read(cx).repositories()
-    }
-
-    pub fn status_for_buffer_id(&self, buffer_id: BufferId, cx: &App) -> Option<FileStatus> {
-        self.git_store.read(cx).status_for_buffer_id(buffer_id, cx)
-    }
-
-    pub fn set_agent_location(
-        &mut self,
-        new_location: Option<AgentLocation>,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(old_location) = self.agent_location.as_ref() {
-            old_location
-                .buffer
-                .update(cx, |buffer, cx| buffer.remove_agent_selections(cx))
-                .ok();
-        }
-
-        if let Some(location) = new_location.as_ref() {
-            location
-                .buffer
-                .update(cx, |buffer, cx| {
-                    buffer.set_agent_selections(
-                        Arc::from([language::Selection {
-                            id: 0,
-                            start: location.position,
-                            end: location.position,
-                            reversed: false,
-                            goal: language::SelectionGoal::None,
-                        }]),
-                        false,
-                        CursorShape::Hollow,
-                        cx,
-                    )
-                })
-                .ok();
-        }
-
-        self.agent_location = new_location;
-        cx.emit(Event::AgentLocationChanged);
-    }
-
-    pub fn agent_location(&self) -> Option<AgentLocation> {
-        self.agent_location.clone()
-    }
-
-    pub fn path_style(&self, cx: &App) -> PathStyle {
-        self.worktree_store.read(cx).path_style()
-    }
-
-    pub fn contains_local_settings_file(
-        &self,
-        worktree_id: WorktreeId,
-        rel_path: &RelPath,
-        cx: &App,
-    ) -> bool {
-        self.worktree_for_id(worktree_id, cx)
-            .map_or(false, |worktree| {
-                worktree.read(cx).entry_for_path(rel_path).is_some()
-            })
-    }
-
-    pub fn update_local_settings_file(
-        &self,
-        worktree_id: WorktreeId,
-        rel_path: Arc<RelPath>,
-        cx: &mut App,
-        update: impl 'static + Send + FnOnce(&mut settings::SettingsContent, &App),
-    ) {
-        let Some(worktree) = self.worktree_for_id(worktree_id, cx) else {
-            // todo(settings_ui) error?
-            return;
-        };
-        cx.spawn(async move |cx| {
-            let file = worktree
-                .update(cx, |worktree, cx| worktree.load_file(&rel_path, cx))?
-                .await
-                .context("Failed to load settings file")?;
-
-            let new_text = cx.read_global::<SettingsStore, _>(|store, cx| {
-                store.new_text_for_update(file.text, move |settings| update(settings, cx))
-            })?;
-            worktree
-                .update(cx, |worktree, cx| {
-                    let line_ending = text::LineEnding::detect(&new_text);
-                    worktree.write_file(rel_path.clone(), new_text.into(), line_ending, cx)
-                })?
-                .await
-                .context("Failed to write settings file")?;
-
-            anyhow::Ok(())
-        })
-        .detach_and_log_err(cx);
-    }
-}
-
-pub struct PathMatchCandidateSet {
-    pub snapshot: Snapshot,
-    pub include_ignored: bool,
-    pub include_root_name: bool,
-    pub candidates: Candidates,
-}
-
-pub enum Candidates {
-    /// Only consider directories.
-    Directories,
-    /// Only consider files.
-    Files,
-    /// Consider directories and files.
-    Entries,
-}
-
-impl<'a> fuzzy::PathMatchCandidateSet<'a> for PathMatchCandidateSet {
-    type Candidates = PathMatchCandidateSetIter<'a>;
-
-    fn id(&self) -> usize {
-        self.snapshot.id().to_usize()
-    }
-
-    fn len(&self) -> usize {
-        match self.candidates {
-            Candidates::Files => {
-                if self.include_ignored {
-                    self.snapshot.file_count()
-                } else {
-                    self.snapshot.visible_file_count()
-                }
-            }
-
-            Candidates::Directories => {
-                if self.include_ignored {
-                    self.snapshot.dir_count()
-                } else {
-                    self.snapshot.visible_dir_count()
-                }
-            }
-
-            Candidates::Entries => {
-                if self.include_ignored {
-                    self.snapshot.entry_count()
-                } else {
-                    self.snapshot.visible_entry_count()
-                }
-            }
-        }
-    }
-
-    fn prefix(&self) -> Arc<RelPath> {
-        if self.snapshot.root_entry().is_some_and(|e| e.is_file()) || self.include_root_name {
-            self.snapshot.root_name().into()
-        } else {
-            RelPath::empty().into()
-        }
-    }
-
-    fn root_is_file(&self) -> bool {
-        self.snapshot.root_entry().is_some_and(|f| f.is_file())
-    }
-
-    fn path_style(&self) -> PathStyle {
-        self.snapshot.path_style()
-    }
-
-    fn candidates(&'a self, start: usize) -> Self::Candidates {
-        PathMatchCandidateSetIter {
-            traversal: match self.candidates {
-                Candidates::Directories => self.snapshot.directories(self.include_ignored, start),
-                Candidates::Files => self.snapshot.files(self.include_ignored, start),
-                Candidates::Entries => self.snapshot.entries(self.include_ignored, start),
-            },
-        }
-    }
-}
-
-pub struct PathMatchCandidateSetIter<'a> {
-    traversal: Traversal<'a>,
-}
-
-impl<'a> Iterator for PathMatchCandidateSetIter<'a> {
-    type Item = fuzzy::PathMatchCandidate<'a>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.traversal
-            .next()
-            .map(|entry| fuzzy::PathMatchCandidate {
-                is_dir: entry.kind.is_dir(),
-                path: &entry.path,
-                char_bag: entry.char_bag,
-            })
-    }
-}
-
-impl EventEmitter<Event> for Project {}
-
-impl<'a> From<&'a ProjectPath> for SettingsLocation<'a> {
-    fn from(val: &'a ProjectPath) -> Self {
-        SettingsLocation {
-            worktree_id: val.worktree_id,
-            path: val.path.as_ref(),
-        }
-    }
-}
-
-impl<P: Into<Arc<RelPath>>> From<(WorktreeId, P)> for ProjectPath {
-    fn from((worktree_id, path): (WorktreeId, P)) -> Self {
-        Self {
-            worktree_id,
-            path: path.into(),
-        }
-    }
-}
-
-/// ResolvedPath is a path that has been resolved to either a ProjectPath
-/// or an AbsPath and that *exists*.
-#[derive(Debug, Clone)]
-pub enum ResolvedPath {
-    ProjectPath {
-        project_path: ProjectPath,
-        is_dir: bool,
-    },
-    AbsPath {
-        path: String,
-        is_dir: bool,
-    },
-}
-
-impl ResolvedPath {
-    pub fn abs_path(&self) -> Option<&str> {
-        match self {
-            Self::AbsPath { path, .. } => Some(path),
-            _ => None,
-        }
-    }
-
-    pub fn into_abs_path(self) -> Option<String> {
-        match self {
-            Self::AbsPath { path, .. } => Some(path),
-            _ => None,
-        }
-    }
-
-    pub fn project_path(&self) -> Option<&ProjectPath> {
-        match self {
-            Self::ProjectPath { project_path, .. } => Some(project_path),
-            _ => None,
-        }
-    }
-
-    pub fn is_file(&self) -> bool {
-        !self.is_dir()
-    }
-
-    pub fn is_dir(&self) -> bool {
-        match self {
-            Self::ProjectPath { is_dir, .. } => *is_dir,
-            Self::AbsPath { is_dir, .. } => *is_dir,
-        }
-    }
-}
-
-impl ProjectItem for Buffer {
-    fn try_open(
-        project: &Entity<Project>,
-        path: &ProjectPath,
-        cx: &mut App,
-    ) -> Option<Task<Result<Entity<Self>>>> {
-        Some(project.update(cx, |project, cx| project.open_buffer(path.clone(), cx)))
-    }
-
-    fn entry_id(&self, _cx: &App) -> Option<ProjectEntryId> {
-        File::from_dyn(self.file()).and_then(|file| file.project_entry_id())
-    }
-
-    fn project_path(&self, cx: &App) -> Option<ProjectPath> {
-        self.file().map(|file| ProjectPath {
-            worktree_id: file.worktree_id(cx),
-            path: file.path().clone(),
-        })
-    }
-
-    fn is_dirty(&self) -> bool {
-        self.is_dirty()
-    }
-}
-
-impl Completion {
-    pub fn kind(&self) -> Option<CompletionItemKind> {
-        self.source
-            // `lsp::CompletionListItemDefaults` has no `kind` field
-            .lsp_completion(false)
-            .and_then(|lsp_completion| lsp_completion.kind)
-    }
-
-    pub fn label(&self) -> Option<String> {
-        self.source
-            .lsp_completion(false)
-            .map(|lsp_completion| lsp_completion.label.clone())
-    }
-
-    /// A key that can be used to sort completions when displaying
-    /// them to the user.
-    pub fn sort_key(&self) -> (usize, &str) {
-        const DEFAULT_KIND_KEY: usize = 4;
-        let kind_key = self
-            .kind()
-            .and_then(|lsp_completion_kind| match lsp_completion_kind {
-                lsp::CompletionItemKind::KEYWORD => Some(0),
-                lsp::CompletionItemKind::VARIABLE => Some(1),
-                lsp::CompletionItemKind::CONSTANT => Some(2),
-                lsp::CompletionItemKind::PROPERTY => Some(3),
-                _ => None,
-            })
-            .unwrap_or(DEFAULT_KIND_KEY);
-        (kind_key, self.label.filter_text())
-    }
-
-    /// Whether this completion is a snippet.
-    pub fn is_snippet_kind(&self) -> bool {
-        matches!(
-            &self.source,
-            CompletionSource::Lsp { lsp_completion, .. }
-            if lsp_completion.kind == Some(CompletionItemKind::SNIPPET)
-        )
-    }
-
-    /// Whether this completion is a snippet or snippet-style LSP completion.
-    pub fn is_snippet(&self) -> bool {
-        self.source
-            // `lsp::CompletionListItemDefaults` has `insert_text_format` field
-            .lsp_completion(true)
-            .is_some_and(|lsp_completion| {
-                lsp_completion.insert_text_format == Some(lsp::InsertTextFormat::SNIPPET)
-            })
-    }
-
-    /// Returns the corresponding color for this completion.
-    ///
-    /// Will return `None` if this completion's kind is not [`CompletionItemKind::COLOR`].
-    pub fn color(&self) -> Option<Hsla> {
-        // `lsp::CompletionListItemDefaults` has no `kind` field
-        let lsp_completion = self.source.lsp_completion(false)?;
-        if lsp_completion.kind? == CompletionItemKind::COLOR {
-            return color_extractor::extract_color(&lsp_completion);
-        }
-        None
-    }
-}
-
-fn proto_to_prompt(level: proto::language_server_prompt_request::Level) -> gpui::PromptLevel {
-    match level {
-        proto::language_server_prompt_request::Level::Info(_) => gpui::PromptLevel::Info,
-        proto::language_server_prompt_request::Level::Warning(_) => gpui::PromptLevel::Warning,
-        proto::language_server_prompt_request::Level::Critical(_) => gpui::PromptLevel::Critical,
-    }
-}
-
-fn provide_inline_values(
-    captures: impl Iterator<Item = (Range<usize>, language::DebuggerTextObject)>,
-    snapshot: &language::BufferSnapshot,
-    max_row: usize,
-) -> Vec<InlineValueLocation> {
-    let mut variables = Vec::new();
-    let mut variable_position = HashSet::default();
-    let mut scopes = Vec::new();
-
-    let active_debug_line_offset = snapshot.point_to_offset(Point::new(max_row as u32, 0));
-
-    for (capture_range, capture_kind) in captures {
-        match capture_kind {
-            language::DebuggerTextObject::Variable => {
-                let variable_name = snapshot
-                    .text_for_range(capture_range.clone())
-                    .collect::<String>();
-                let point = snapshot.offset_to_point(capture_range.end);
-
-                while scopes
-                    .last()
-                    .is_some_and(|scope: &Range<_>| !scope.contains(&capture_range.start))
-                {
-                    scopes.pop();
-                }
-
-                if point.row as usize > max_row {
-                    break;
-                }
-
-                let scope = if scopes
-                    .last()
-                    .is_none_or(|scope| !scope.contains(&active_debug_line_offset))
-                {
-                    VariableScope::Global
-                } else {
-                    VariableScope::Local
-                };
-
-                if variable_position.insert(capture_range.end) {
-                    variables.push(InlineValueLocation {
-                        variable_name,
-                        scope,
-                        lookup: VariableLookupKind::Variable,
-                        row: point.row as usize,
-                        column: point.column as usize,
-                    });
-                }
-            }
-            language::DebuggerTextObject::Scope => {
-                while scopes.last().map_or_else(
-                    || false,
-                    |scope: &Range<usize>| {
-                        !(scope.contains(&capture_range.start)
-                            && scope.contains(&capture_range.end))
-                    },
-                ) {
-                    scopes.pop();
-                }
-                scopes.push(capture_range);
-            }
-        }
-    }
-
-    variables
-}
-
-#[cfg(test)]
-mod disable_ai_settings_tests {
-    use super::*;
-    use gpui::TestAppContext;
-    use settings::Settings;
-
-    #[gpui::test]
-    async fn test_disable_ai_settings_security(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            settings::init(cx);
-
-            // Test 1: Default is false (AI enabled)
-            assert!(
-                !DisableAiSettings::get_global(cx).disable_ai,
-                "Default should allow AI"
-            );
-        });
-
-        let disable_true = serde_json::json!({
-            "disable_ai": true
-        })
-        .to_string();
-        let disable_false = serde_json::json!({
-            "disable_ai": false
-        })
-        .to_string();
-
-        cx.update_global::<SettingsStore, _>(|store, cx| {
-            store.set_user_settings(&disable_false, cx).unwrap();
-            store.set_global_settings(&disable_true, cx).unwrap();
-        });
-        cx.update(|cx| {
-            assert!(
-                DisableAiSettings::get_global(cx).disable_ai,
-                "Local false cannot override global true"
-            );
-        });
-
-        cx.update_global::<SettingsStore, _>(|store, cx| {
-            store.set_global_settings(&disable_false, cx).unwrap();
-            store.set_user_settings(&disable_true, cx).unwrap();
-        });
-
-        cx.update(|cx| {
-            assert!(
-                DisableAiSettings::get_global(cx).disable_ai,
-                "Local false cannot override global true"
-            );
-        });
-    }
-}
diff --git a/crates/project/src/project_search.rs b/crates/project/src/project_search.rs
deleted file mode 100644
index 90687f2473..0000000000
--- a/crates/project/src/project_search.rs
+++ /dev/null
@@ -1,1002 +0,0 @@
-use std::{
-    cell::LazyCell,
-    collections::BTreeSet,
-    io::{BufRead, BufReader},
-    ops::Range,
-    path::{Path, PathBuf},
-    pin::pin,
-    sync::Arc,
-};
-
-use anyhow::Context;
-use collections::HashSet;
-use fs::Fs;
-use futures::{SinkExt, StreamExt, select_biased, stream::FuturesOrdered};
-use gpui::{App, AppContext, AsyncApp, Entity, Task};
-use language::{Buffer, BufferSnapshot};
-use parking_lot::Mutex;
-use postage::oneshot;
-use rpc::{AnyProtoClient, proto};
-use smol::{
-    channel::{Receiver, Sender, bounded, unbounded},
-    future::FutureExt,
-};
-
-use text::BufferId;
-use util::{ResultExt, maybe, paths::compare_rel_paths, rel_path::RelPath};
-use worktree::{Entry, ProjectEntryId, Snapshot, Worktree, WorktreeSettings};
-
-use crate::{
-    Project, ProjectItem, ProjectPath, RemotelyCreatedModels,
-    buffer_store::BufferStore,
-    search::{SearchQuery, SearchResult},
-    worktree_store::WorktreeStore,
-};
-
-pub struct Search {
-    buffer_store: Entity<BufferStore>,
-    worktree_store: Entity<WorktreeStore>,
-    limit: usize,
-    kind: SearchKind,
-}
-
-/// Represents search setup, before it is actually kicked off with Search::into_results
-enum SearchKind {
-    /// Search for candidates by inspecting file contents on file system, avoiding loading the buffer unless we know that a given file contains a match.
-    Local {
-        fs: Arc<dyn Fs>,
-        worktrees: Vec<Entity<Worktree>>,
-    },
-    /// Query remote host for candidates. As of writing, the host runs a local search in "buffers with matches only" mode.
-    Remote {
-        client: AnyProtoClient,
-        remote_id: u64,
-        models: Arc<Mutex<RemotelyCreatedModels>>,
-    },
-    /// Run search against a known set of candidates. Even when working with a remote host, this won't round-trip to host.
-    OpenBuffersOnly,
-}
-
-/// Represents results of project search and allows one to either obtain match positions OR
-/// just the handles to buffers that may match the search. Grabbing the handles is cheaper than obtaining full match positions, because in that case we'll look for
-/// at most one match in each file.
-#[must_use]
-pub struct SearchResultsHandle {
-    results: Receiver<SearchResult>,
-    matching_buffers: Receiver<Entity<Buffer>>,
-    trigger_search: Box<dyn FnOnce(&mut App) -> Task<()> + Send + Sync>,
-}
-
-impl SearchResultsHandle {
-    pub fn results(self, cx: &mut App) -> Receiver<SearchResult> {
-        (self.trigger_search)(cx).detach();
-        self.results
-    }
-    pub fn matching_buffers(self, cx: &mut App) -> Receiver<Entity<Buffer>> {
-        (self.trigger_search)(cx).detach();
-        self.matching_buffers
-    }
-}
-
-#[derive(Clone)]
-enum FindSearchCandidates {
-    Local {
-        fs: Arc<dyn Fs>,
-        /// Start off with all paths in project and filter them based on:
-        /// - Include filters
-        /// - Exclude filters
-        /// - Only open buffers
-        /// - Scan ignored files
-        /// Put another way: filter out files that can't match (without looking at file contents)
-        input_paths_rx: Receiver<InputPath>,
-        /// After that, if the buffer is not yet loaded, we'll figure out if it contains at least one match
-        /// based on disk contents of a buffer. This step is not performed for buffers we already have in memory.
-        confirm_contents_will_match_tx: Sender<MatchingEntry>,
-        confirm_contents_will_match_rx: Receiver<MatchingEntry>,
-    },
-    Remote,
-    OpenBuffersOnly,
-}
-
-impl Search {
-    pub fn local(
-        fs: Arc<dyn Fs>,
-        buffer_store: Entity<BufferStore>,
-        worktree_store: Entity<WorktreeStore>,
-        limit: usize,
-        cx: &mut App,
-    ) -> Self {
-        let worktrees = worktree_store.read(cx).visible_worktrees(cx).collect();
-        Self {
-            kind: SearchKind::Local { fs, worktrees },
-            buffer_store,
-            worktree_store,
-            limit,
-        }
-    }
-
-    pub(crate) fn remote(
-        buffer_store: Entity<BufferStore>,
-        worktree_store: Entity<WorktreeStore>,
-        limit: usize,
-        client_state: (AnyProtoClient, u64, Arc<Mutex<RemotelyCreatedModels>>),
-    ) -> Self {
-        Self {
-            kind: SearchKind::Remote {
-                client: client_state.0,
-                remote_id: client_state.1,
-                models: client_state.2,
-            },
-            buffer_store,
-            worktree_store,
-            limit,
-        }
-    }
-    pub(crate) fn open_buffers_only(
-        buffer_store: Entity<BufferStore>,
-        worktree_store: Entity<WorktreeStore>,
-        limit: usize,
-    ) -> Self {
-        Self {
-            kind: SearchKind::OpenBuffersOnly,
-            buffer_store,
-            worktree_store,
-            limit,
-        }
-    }
-
-    pub(crate) const MAX_SEARCH_RESULT_FILES: usize = 5_000;
-    pub(crate) const MAX_SEARCH_RESULT_RANGES: usize = 10_000;
-    /// Prepares a project search run. The resulting [`SearchResultsHandle`] has to be used to specify whether you're interested in matching buffers
-    /// or full search results.
-    pub fn into_handle(mut self, query: SearchQuery, cx: &mut App) -> SearchResultsHandle {
-        let mut open_buffers = HashSet::default();
-        let mut unnamed_buffers = Vec::new();
-        const MAX_CONCURRENT_BUFFER_OPENS: usize = 64;
-        let buffers = self.buffer_store.read(cx);
-        for handle in buffers.buffers() {
-            let buffer = handle.read(cx);
-            if !buffers.is_searchable(&buffer.remote_id()) {
-                continue;
-            } else if let Some(entry_id) = buffer.entry_id(cx) {
-                open_buffers.insert(entry_id);
-            } else {
-                self.limit = self.limit.saturating_sub(1);
-                unnamed_buffers.push(handle)
-            };
-        }
-        let executor = cx.background_executor().clone();
-        let (tx, rx) = unbounded();
-        let (grab_buffer_snapshot_tx, grab_buffer_snapshot_rx) = unbounded();
-        let matching_buffers = grab_buffer_snapshot_rx.clone();
-        let trigger_search = Box::new(move |cx: &mut App| {
-            cx.spawn(async move |cx| {
-                for buffer in unnamed_buffers {
-                    _ = grab_buffer_snapshot_tx.send(buffer).await;
-                }
-
-                let (find_all_matches_tx, find_all_matches_rx) =
-                    bounded(MAX_CONCURRENT_BUFFER_OPENS);
-                let query = Arc::new(query);
-                let (candidate_searcher, tasks) = match self.kind {
-                    SearchKind::OpenBuffersOnly => {
-                        let Ok(open_buffers) = cx.update(|cx| self.all_loaded_buffers(&query, cx))
-                        else {
-                            return;
-                        };
-                        let fill_requests = cx
-                            .background_spawn(async move {
-                                for buffer in open_buffers {
-                                    if let Err(_) = grab_buffer_snapshot_tx.send(buffer).await {
-                                        return;
-                                    }
-                                }
-                            })
-                            .boxed_local();
-                        (FindSearchCandidates::OpenBuffersOnly, vec![fill_requests])
-                    }
-                    SearchKind::Local {
-                        fs,
-                        ref mut worktrees,
-                    } => {
-                        let (get_buffer_for_full_scan_tx, get_buffer_for_full_scan_rx) =
-                            unbounded();
-                        let (confirm_contents_will_match_tx, confirm_contents_will_match_rx) =
-                            bounded(64);
-                        let (sorted_search_results_tx, sorted_search_results_rx) = unbounded();
-
-                        let (input_paths_tx, input_paths_rx) = unbounded();
-                        let tasks = vec![
-                            cx.spawn(Self::provide_search_paths(
-                                std::mem::take(worktrees),
-                                query.clone(),
-                                input_paths_tx,
-                                sorted_search_results_tx,
-                            ))
-                            .boxed_local(),
-                            Self::open_buffers(
-                                &self.buffer_store,
-                                get_buffer_for_full_scan_rx,
-                                grab_buffer_snapshot_tx,
-                                cx.clone(),
-                            )
-                            .boxed_local(),
-                            cx.background_spawn(Self::maintain_sorted_search_results(
-                                sorted_search_results_rx,
-                                get_buffer_for_full_scan_tx,
-                                self.limit,
-                            ))
-                            .boxed_local(),
-                        ];
-                        (
-                            FindSearchCandidates::Local {
-                                fs,
-                                confirm_contents_will_match_tx,
-                                confirm_contents_will_match_rx,
-                                input_paths_rx,
-                            },
-                            tasks,
-                        )
-                    }
-                    SearchKind::Remote {
-                        client,
-                        remote_id,
-                        models,
-                    } => {
-                        let request = client.request(proto::FindSearchCandidates {
-                            project_id: remote_id,
-                            query: Some(query.to_proto()),
-                            limit: self.limit as _,
-                        });
-                        let Ok(guard) = cx.update(|cx| {
-                            Project::retain_remotely_created_models_impl(
-                                &models,
-                                &self.buffer_store,
-                                &self.worktree_store,
-                                cx,
-                            )
-                        }) else {
-                            return;
-                        };
-                        let buffer_store = self.buffer_store.downgrade();
-                        let issue_remote_buffers_request = cx
-                            .spawn(async move |cx| {
-                                let _ = maybe!(async move {
-                                    let response = request.await?;
-                                    for buffer_id in response.buffer_ids {
-                                        let buffer_id = BufferId::new(buffer_id)?;
-                                        let buffer = buffer_store
-                                            .update(cx, |buffer_store, cx| {
-                                                buffer_store.wait_for_remote_buffer(buffer_id, cx)
-                                            })?
-                                            .await?;
-                                        let _ = grab_buffer_snapshot_tx.send(buffer).await;
-                                    }
-
-                                    drop(guard);
-                                    anyhow::Ok(())
-                                })
-                                .await
-                                .log_err();
-                            })
-                            .boxed_local();
-                        (
-                            FindSearchCandidates::Remote,
-                            vec![issue_remote_buffers_request],
-                        )
-                    }
-                };
-
-                let should_find_all_matches = !tx.is_closed();
-
-                let worker_pool = executor.scoped(|scope| {
-                    let num_cpus = executor.num_cpus();
-
-                    assert!(num_cpus > 0);
-                    for _ in 0..executor.num_cpus() - 1 {
-                        let worker = Worker {
-                            query: &query,
-                            open_buffers: &open_buffers,
-                            candidates: candidate_searcher.clone(),
-                            find_all_matches_rx: find_all_matches_rx.clone(),
-                        };
-                        scope.spawn(worker.run());
-                    }
-
-                    drop(find_all_matches_rx);
-                    drop(candidate_searcher);
-                });
-
-                let (sorted_matches_tx, sorted_matches_rx) = unbounded();
-                // The caller of `into_handle` decides whether they're interested in all matches (files that matched + all matching ranges) or
-                // just the files. *They are using the same stream as the guts of the project search do*.
-                // This means that we cannot grab values off of that stream unless it's strictly needed for making a progress in project search.
-                //
-                // Grabbing buffer snapshots is only necessary when we're looking for all matches. If the caller decided that they're not interested
-                // in all matches, running that task unconditionally would hinder caller's ability to observe all matching file paths.
-                let buffer_snapshots = if should_find_all_matches {
-                    Some(
-                        Self::grab_buffer_snapshots(
-                            grab_buffer_snapshot_rx,
-                            find_all_matches_tx,
-                            sorted_matches_tx,
-                            cx.clone(),
-                        )
-                        .boxed_local(),
-                    )
-                } else {
-                    drop(find_all_matches_tx);
-
-                    None
-                };
-                let ensure_matches_are_reported_in_order = if should_find_all_matches {
-                    Some(
-                        Self::ensure_matched_ranges_are_reported_in_order(sorted_matches_rx, tx)
-                            .boxed_local(),
-                    )
-                } else {
-                    drop(tx);
-                    None
-                };
-
-                futures::future::join_all(
-                    [worker_pool.boxed_local()]
-                        .into_iter()
-                        .chain(buffer_snapshots)
-                        .chain(ensure_matches_are_reported_in_order)
-                        .chain(tasks),
-                )
-                .await;
-            })
-        });
-
-        SearchResultsHandle {
-            results: rx,
-            matching_buffers,
-            trigger_search,
-        }
-    }
-
-    fn provide_search_paths(
-        worktrees: Vec<Entity<Worktree>>,
-        query: Arc<SearchQuery>,
-        tx: Sender<InputPath>,
-        results: Sender<oneshot::Receiver<ProjectPath>>,
-    ) -> impl AsyncFnOnce(&mut AsyncApp) {
-        async move |cx| {
-            _ = maybe!(async move {
-                let gitignored_tracker = PathInclusionMatcher::new(query.clone());
-                for worktree in worktrees {
-                    let (mut snapshot, worktree_settings) = worktree
-                        .read_with(cx, |this, _| {
-                            Some((this.snapshot(), this.as_local()?.settings()))
-                        })?
-                        .context("The worktree is not local")?;
-                    if query.include_ignored() {
-                        // Pre-fetch all of the ignored directories as they're going to be searched.
-                        let mut entries_to_refresh = vec![];
-
-                        for entry in snapshot.entries(query.include_ignored(), 0) {
-                            if gitignored_tracker.should_scan_gitignored_dir(
-                                entry,
-                                &snapshot,
-                                &worktree_settings,
-                            ) {
-                                entries_to_refresh.push(entry.path.clone());
-                            }
-                        }
-                        let barrier = worktree.update(cx, |this, _| {
-                            let local = this.as_local_mut()?;
-                            let barrier = entries_to_refresh
-                                .into_iter()
-                                .map(|path| local.add_path_prefix_to_scan(path).into_future())
-                                .collect::<Vec<_>>();
-                            Some(barrier)
-                        })?;
-                        if let Some(barriers) = barrier {
-                            futures::future::join_all(barriers).await;
-                        }
-                        snapshot = worktree.read_with(cx, |this, _| this.snapshot())?;
-                    }
-                    cx.background_executor()
-                        .scoped(|scope| {
-                            scope.spawn(async {
-                                for entry in snapshot.files(query.include_ignored(), 0) {
-                                    let (should_scan_tx, should_scan_rx) = oneshot::channel();
-
-                                    let Ok(_) = tx
-                                        .send(InputPath {
-                                            entry: entry.clone(),
-                                            snapshot: snapshot.clone(),
-                                            should_scan_tx,
-                                        })
-                                        .await
-                                    else {
-                                        return;
-                                    };
-                                    if results.send(should_scan_rx).await.is_err() {
-                                        return;
-                                    };
-                                }
-                            })
-                        })
-                        .await;
-                }
-                anyhow::Ok(())
-            })
-            .await;
-        }
-    }
-
-    async fn maintain_sorted_search_results(
-        rx: Receiver<oneshot::Receiver<ProjectPath>>,
-        paths_for_full_scan: Sender<ProjectPath>,
-        limit: usize,
-    ) {
-        let mut rx = pin!(rx);
-        let mut matched = 0;
-        while let Some(mut next_path_result) = rx.next().await {
-            let Some(successful_path) = next_path_result.next().await else {
-                // This file did not produce a match, hence skip it.
-                continue;
-            };
-            if paths_for_full_scan.send(successful_path).await.is_err() {
-                return;
-            };
-            matched += 1;
-            if matched >= limit {
-                break;
-            }
-        }
-    }
-
-    /// Background workers cannot open buffers by themselves, hence main thread will do it on their behalf.
-    async fn open_buffers(
-        buffer_store: &Entity<BufferStore>,
-        rx: Receiver<ProjectPath>,
-        find_all_matches_tx: Sender<Entity<Buffer>>,
-        mut cx: AsyncApp,
-    ) {
-        let mut rx = pin!(rx.ready_chunks(64));
-        _ = maybe!(async move {
-            while let Some(requested_paths) = rx.next().await {
-                let mut buffers = buffer_store.update(&mut cx, |this, cx| {
-                    requested_paths
-                        .into_iter()
-                        .map(|path| this.open_buffer(path, cx))
-                        .collect::<FuturesOrdered<_>>()
-                })?;
-
-                while let Some(buffer) = buffers.next().await {
-                    if let Some(buffer) = buffer.log_err() {
-                        find_all_matches_tx.send(buffer).await?;
-                    }
-                }
-            }
-            Result::<_, anyhow::Error>::Ok(())
-        })
-        .await;
-    }
-
-    async fn grab_buffer_snapshots(
-        rx: Receiver<Entity<Buffer>>,
-        find_all_matches_tx: Sender<(
-            Entity<Buffer>,
-            BufferSnapshot,
-            oneshot::Sender<(Entity<Buffer>, Vec<Range<language::Anchor>>)>,
-        )>,
-        results: Sender<oneshot::Receiver<(Entity<Buffer>, Vec<Range<language::Anchor>>)>>,
-        mut cx: AsyncApp,
-    ) {
-        _ = maybe!(async move {
-            while let Ok(buffer) = rx.recv().await {
-                let snapshot = buffer.read_with(&mut cx, |this, _| this.snapshot())?;
-                let (tx, rx) = oneshot::channel();
-                find_all_matches_tx.send((buffer, snapshot, tx)).await?;
-                results.send(rx).await?;
-            }
-            debug_assert!(rx.is_empty());
-            Result::<_, anyhow::Error>::Ok(())
-        })
-        .await;
-    }
-
-    async fn ensure_matched_ranges_are_reported_in_order(
-        rx: Receiver<oneshot::Receiver<(Entity<Buffer>, Vec<Range<language::Anchor>>)>>,
-        tx: Sender<SearchResult>,
-    ) {
-        use postage::stream::Stream;
-        _ = maybe!(async move {
-            let mut matched_buffers = 0;
-            let mut matches = 0;
-            while let Ok(mut next_buffer_matches) = rx.recv().await {
-                let Some((buffer, ranges)) = next_buffer_matches.recv().await else {
-                    continue;
-                };
-
-                if matched_buffers > Search::MAX_SEARCH_RESULT_FILES
-                    || matches > Search::MAX_SEARCH_RESULT_RANGES
-                {
-                    _ = tx.send(SearchResult::LimitReached).await;
-                    break;
-                }
-                matched_buffers += 1;
-                matches += ranges.len();
-
-                _ = tx.send(SearchResult::Buffer { buffer, ranges }).await?;
-            }
-            anyhow::Ok(())
-        })
-        .await;
-    }
-
-    fn all_loaded_buffers(&self, search_query: &SearchQuery, cx: &App) -> Vec<Entity<Buffer>> {
-        let worktree_store = self.worktree_store.read(cx);
-        let mut buffers = search_query
-            .buffers()
-            .into_iter()
-            .flatten()
-            .filter(|buffer| {
-                let b = buffer.read(cx);
-                if let Some(file) = b.file() {
-                    if !search_query.match_path(file.path()) {
-                        return false;
-                    }
-                    if !search_query.include_ignored()
-                        && let Some(entry) = b
-                            .entry_id(cx)
-                            .and_then(|entry_id| worktree_store.entry_for_id(entry_id, cx))
-                        && entry.is_ignored
-                    {
-                        return false;
-                    }
-                }
-                true
-            })
-            .cloned()
-            .collect::<Vec<_>>();
-        buffers.sort_by(|a, b| {
-            let a = a.read(cx);
-            let b = b.read(cx);
-            match (a.file(), b.file()) {
-                (None, None) => a.remote_id().cmp(&b.remote_id()),
-                (None, Some(_)) => std::cmp::Ordering::Less,
-                (Some(_), None) => std::cmp::Ordering::Greater,
-                (Some(a), Some(b)) => compare_rel_paths((a.path(), true), (b.path(), true)),
-            }
-        });
-
-        buffers
-    }
-}
-
-struct Worker<'search> {
-    query: &'search SearchQuery,
-    open_buffers: &'search HashSet<ProjectEntryId>,
-    candidates: FindSearchCandidates,
-    /// Ok, we're back in background: run full scan & find all matches in a given buffer snapshot.
-    /// Then, when you're done, share them via the channel you were given.
-    find_all_matches_rx: Receiver<(
-        Entity<Buffer>,
-        BufferSnapshot,
-        oneshot::Sender<(Entity<Buffer>, Vec<Range<language::Anchor>>)>,
-    )>,
-}
-
-impl Worker<'_> {
-    async fn run(self) {
-        let (
-            input_paths_rx,
-            confirm_contents_will_match_rx,
-            mut confirm_contents_will_match_tx,
-            fs,
-        ) = match self.candidates {
-            FindSearchCandidates::Local {
-                fs,
-                input_paths_rx,
-                confirm_contents_will_match_rx,
-                confirm_contents_will_match_tx,
-            } => (
-                input_paths_rx,
-                confirm_contents_will_match_rx,
-                confirm_contents_will_match_tx,
-                Some(fs),
-            ),
-            FindSearchCandidates::Remote | FindSearchCandidates::OpenBuffersOnly => {
-                (unbounded().1, unbounded().1, unbounded().0, None)
-            }
-        };
-        // WorkerA: grabs a request for "find all matches in file/a" <- takes 5 minutes
-        // right after: WorkerB: grabs a request for "find all matches in file/b" <- takes 5 seconds
-        let mut find_all_matches = pin!(self.find_all_matches_rx.fuse());
-        let mut find_first_match = pin!(confirm_contents_will_match_rx.fuse());
-        let mut scan_path = pin!(input_paths_rx.fuse());
-
-        loop {
-            let handler = RequestHandler {
-                query: self.query,
-                open_entries: &self.open_buffers,
-                fs: fs.as_deref(),
-                confirm_contents_will_match_tx: &confirm_contents_will_match_tx,
-            };
-            // Whenever we notice that some step of a pipeline is closed, we don't want to close subsequent
-            // steps straight away. Another worker might be about to produce a value that will
-            // be pushed there, thus we'll replace current worker's pipe with a dummy one.
-            // That way, we'll only ever close a next-stage channel when ALL workers do so.
-            select_biased! {
-                find_all_matches = find_all_matches.next() => {
-                    let Some(matches) = find_all_matches else {
-                        continue;
-                    };
-                    handler.handle_find_all_matches(matches).await;
-                },
-                find_first_match = find_first_match.next() => {
-                    if let Some(buffer_with_at_least_one_match) = find_first_match {
-                        handler.handle_find_first_match(buffer_with_at_least_one_match).await;
-                    }
-                },
-                scan_path = scan_path.next() => {
-                    if let Some(path_to_scan) = scan_path {
-                        handler.handle_scan_path(path_to_scan).await;
-                    } else {
-                        // If we're the last worker to notice that this is not producing values, close the upstream.
-                        confirm_contents_will_match_tx = bounded(1).0;
-                    }
-
-                 }
-                 complete => {
-                     break
-                },
-
-            }
-        }
-    }
-}
-
-struct RequestHandler<'worker> {
-    query: &'worker SearchQuery,
-    fs: Option<&'worker dyn Fs>,
-    open_entries: &'worker HashSet<ProjectEntryId>,
-    confirm_contents_will_match_tx: &'worker Sender<MatchingEntry>,
-}
-
-impl RequestHandler<'_> {
-    async fn handle_find_all_matches(
-        &self,
-        (buffer, snapshot, mut report_matches): (
-            Entity<Buffer>,
-            BufferSnapshot,
-            oneshot::Sender<(Entity<Buffer>, Vec<Range<language::Anchor>>)>,
-        ),
-    ) {
-        let ranges = self
-            .query
-            .search(&snapshot, None)
-            .await
-            .iter()
-            .map(|range| snapshot.anchor_before(range.start)..snapshot.anchor_after(range.end))
-            .collect::<Vec<_>>();
-
-        _ = report_matches.send((buffer, ranges)).await;
-    }
-
-    async fn handle_find_first_match(&self, mut entry: MatchingEntry) {
-        _=maybe!(async move {
-            let abs_path = entry.worktree_root.join(entry.path.path.as_std_path());
-            let Some(file) = self.fs.context("Trying to query filesystem in remote project search")?.open_sync(&abs_path).await.log_err() else {
-                return anyhow::Ok(());
-            };
-
-            let mut file = BufReader::new(file);
-            let file_start = file.fill_buf()?;
-
-            if let Err(Some(starting_position)) =
-            std::str::from_utf8(file_start).map_err(|e| e.error_len())
-            {
-                // Before attempting to match the file content, throw away files that have invalid UTF-8 sequences early on;
-                // That way we can still match files in a streaming fashion without having look at "obviously binary" files.
-                log::debug!(
-                    "Invalid UTF-8 sequence in file {abs_path:?} at byte position {starting_position}"
-                );
-                return Ok(());
-            }
-
-            if self.query.detect(file).unwrap_or(false) {
-                // Yes, we should scan the whole file.
-                entry.should_scan_tx.send(entry.path).await?;
-            }
-            Ok(())
-        }).await;
-    }
-
-    async fn handle_scan_path(&self, req: InputPath) {
-        _ = maybe!(async move {
-            let InputPath {
-                entry,
-                snapshot,
-                mut should_scan_tx,
-            } = req;
-
-            if entry.is_fifo || !entry.is_file() {
-                return Ok(());
-            }
-
-            if self.query.filters_path() {
-                let matched_path = if self.query.match_full_paths() {
-                    let mut full_path = snapshot.root_name().to_owned();
-                    full_path.push(&entry.path);
-                    self.query.match_path(&full_path)
-                } else {
-                    self.query.match_path(&entry.path)
-                };
-                if !matched_path {
-                    return Ok(());
-                }
-            }
-
-            if self.open_entries.contains(&entry.id) {
-                // The buffer is already in memory and that's the version we want to scan;
-                // hence skip the dilly-dally and look for all matches straight away.
-                should_scan_tx
-                    .send(ProjectPath {
-                        worktree_id: snapshot.id(),
-                        path: entry.path.clone(),
-                    })
-                    .await?;
-            } else {
-                self.confirm_contents_will_match_tx
-                    .send(MatchingEntry {
-                        should_scan_tx: should_scan_tx,
-                        worktree_root: snapshot.abs_path().clone(),
-                        path: ProjectPath {
-                            worktree_id: snapshot.id(),
-                            path: entry.path.clone(),
-                        },
-                    })
-                    .await?;
-            }
-
-            anyhow::Ok(())
-        })
-        .await;
-    }
-}
-
-struct InputPath {
-    entry: Entry,
-    snapshot: Snapshot,
-    should_scan_tx: oneshot::Sender<ProjectPath>,
-}
-
-struct MatchingEntry {
-    worktree_root: Arc<Path>,
-    path: ProjectPath,
-    should_scan_tx: oneshot::Sender<ProjectPath>,
-}
-
-/// This struct encapsulates the logic to decide whether a given gitignored directory should be
-/// scanned based on include/exclude patterns of a search query (as include/exclude parameters may match paths inside it).
-/// It is kind-of doing an inverse of glob. Given a glob pattern like `src/**/` and a parent path like `src`, we need to decide whether the parent
-/// may contain glob hits.
-struct PathInclusionMatcher {
-    included: BTreeSet<PathBuf>,
-    query: Arc<SearchQuery>,
-}
-
-impl PathInclusionMatcher {
-    fn new(query: Arc<SearchQuery>) -> Self {
-        let mut included = BTreeSet::new();
-        // To do an inverse glob match, we split each glob into it's prefix and the glob part.
-        // For example, `src/**/*.rs` becomes `src/` and `**/*.rs`. The glob part gets dropped.
-        // Then, when checking whether a given directory should be scanned, we check whether it is a non-empty substring of any glob prefix.
-        if query.filters_path() {
-            included.extend(
-                query
-                    .files_to_include()
-                    .sources()
-                    .flat_map(|glob| Some(wax::Glob::new(glob).ok()?.partition().0)),
-            );
-        }
-        Self { included, query }
-    }
-
-    fn should_scan_gitignored_dir(
-        &self,
-        entry: &Entry,
-        snapshot: &Snapshot,
-        worktree_settings: &WorktreeSettings,
-    ) -> bool {
-        if !entry.is_ignored || !entry.kind.is_unloaded() {
-            return false;
-        }
-        if !self.query.include_ignored() {
-            return false;
-        }
-        if worktree_settings.is_path_excluded(&entry.path) {
-            return false;
-        }
-        if !self.query.filters_path() {
-            return true;
-        }
-
-        let as_abs_path = LazyCell::new(move || snapshot.absolutize(&entry.path));
-        let entry_path = &entry.path;
-        // 3. Check Exclusions (Pruning)
-        // If the current path is a child of an excluded path, we stop.
-        let is_excluded = self.path_is_definitely_excluded(&entry_path, snapshot);
-
-        if is_excluded {
-            return false;
-        }
-
-        // 4. Check Inclusions (Traversal)
-        if self.included.is_empty() {
-            return true;
-        }
-
-        // We scan if the current path is a descendant of an include prefix
-        // OR if the current path is an ancestor of an include prefix (we need to go deeper to find it).
-        let is_included = self.included.iter().any(|prefix| {
-            let (prefix_matches_entry, entry_matches_prefix) = if prefix.is_absolute() {
-                (
-                    prefix.starts_with(&**as_abs_path),
-                    as_abs_path.starts_with(prefix),
-                )
-            } else {
-                RelPath::new(prefix, snapshot.path_style()).map_or((false, false), |prefix| {
-                    (
-                        prefix.starts_with(entry_path),
-                        entry_path.starts_with(&prefix),
-                    )
-                })
-            };
-
-            // Logic:
-            // 1. entry_matches_prefix: We are inside the target zone (e.g. glob: src/, current: src/lib/). Keep scanning.
-            // 2. prefix_matches_entry: We are above the target zone (e.g. glob: src/foo/, current: src/). Keep scanning to reach foo.
-            prefix_matches_entry || entry_matches_prefix
-        });
-
-        is_included
-    }
-    fn path_is_definitely_excluded(&self, path: &RelPath, snapshot: &Snapshot) -> bool {
-        if !self.query.files_to_exclude().sources().next().is_none() {
-            let mut path = if self.query.match_full_paths() {
-                let mut full_path = snapshot.root_name().to_owned();
-                full_path.push(path);
-                full_path
-            } else {
-                path.to_owned()
-            };
-            loop {
-                if self.query.files_to_exclude().is_match(&path) {
-                    return true;
-                } else if !path.pop() {
-                    return false;
-                }
-            }
-        } else {
-            false
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use fs::FakeFs;
-    use serde_json::json;
-    use settings::Settings;
-    use util::{
-        path,
-        paths::{PathMatcher, PathStyle},
-        rel_path::RelPath,
-    };
-    use worktree::{Entry, EntryKind, WorktreeSettings};
-
-    use crate::{
-        Project, project_search::PathInclusionMatcher, project_tests::init_test,
-        search::SearchQuery,
-    };
-
-    #[gpui::test]
-    async fn test_path_inclusion_matcher(cx: &mut gpui::TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(
-            "/root",
-            json!({
-                ".gitignore": "src/data/\n",
-                "src": {
-                    "data": {
-                        "main.csv": "field_1,field_2,field_3",
-                    },
-                    "lib": {
-                        "main.txt": "Are you familiar with fields?",
-                    },
-                },
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-        let worktree = project.update(cx, |project, cx| project.worktrees(cx).next().unwrap());
-        let (worktree_settings, worktree_snapshot) = worktree.update(cx, |worktree, cx| {
-            let settings_location = worktree.settings_location(cx);
-            return (
-                WorktreeSettings::get(Some(settings_location), cx).clone(),
-                worktree.snapshot(),
-            );
-        });
-
-        // Manually create a test entry for the gitignored directory since it won't
-        // be loaded by the worktree
-        let entry = Entry {
-            id: ProjectEntryId::from_proto(1),
-            kind: EntryKind::UnloadedDir,
-            path: Arc::from(RelPath::unix(Path::new("src/data")).unwrap()),
-            inode: 0,
-            mtime: None,
-            canonical_path: None,
-            is_ignored: true,
-            is_hidden: false,
-            is_always_included: false,
-            is_external: false,
-            is_private: false,
-            size: 0,
-            char_bag: Default::default(),
-            is_fifo: false,
-        };
-
-        // 1. Test searching for `field`, including ignored files without any
-        // inclusion and exclusion filters.
-        let include_ignored = true;
-        let files_to_include = PathMatcher::default();
-        let files_to_exclude = PathMatcher::default();
-        let match_full_paths = false;
-        let search_query = SearchQuery::text(
-            "field",
-            false,
-            false,
-            include_ignored,
-            files_to_include,
-            files_to_exclude,
-            match_full_paths,
-            None,
-        )
-        .unwrap();
-
-        let path_matcher = PathInclusionMatcher::new(Arc::new(search_query));
-        assert!(path_matcher.should_scan_gitignored_dir(
-            &entry,
-            &worktree_snapshot,
-            &worktree_settings
-        ));
-
-        // 2. Test searching for `field`, including ignored files but updating
-        // `files_to_include` to only include files under `src/lib`.
-        let include_ignored = true;
-        let files_to_include = PathMatcher::new(vec!["src/lib"], PathStyle::Posix).unwrap();
-        let files_to_exclude = PathMatcher::default();
-        let match_full_paths = false;
-        let search_query = SearchQuery::text(
-            "field",
-            false,
-            false,
-            include_ignored,
-            files_to_include,
-            files_to_exclude,
-            match_full_paths,
-            None,
-        )
-        .unwrap();
-
-        let path_matcher = PathInclusionMatcher::new(Arc::new(search_query));
-        assert!(!path_matcher.should_scan_gitignored_dir(
-            &entry,
-            &worktree_snapshot,
-            &worktree_settings
-        ));
-    }
-}
diff --git a/crates/project/src/project_settings.rs b/crates/project/src/project_settings.rs
deleted file mode 100644
index b7dadc52f7..0000000000
--- a/crates/project/src/project_settings.rs
+++ /dev/null
@@ -1,1230 +0,0 @@
-use anyhow::Context as _;
-use collections::HashMap;
-use context_server::ContextServerCommand;
-use dap::adapters::DebugAdapterName;
-use fs::Fs;
-use futures::StreamExt as _;
-use gpui::{AsyncApp, BorrowAppContext, Context, Entity, EventEmitter, Subscription, Task};
-use lsp::LanguageServerName;
-use paths::{
-    EDITORCONFIG_NAME, local_debug_file_relative_path, local_settings_file_relative_path,
-    local_tasks_file_relative_path, local_vscode_launch_file_relative_path,
-    local_vscode_tasks_file_relative_path, task_file_name,
-};
-use rpc::{
-    AnyProtoClient, TypedEnvelope,
-    proto::{self, REMOTE_SERVER_PROJECT_ID},
-};
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-pub use settings::DirenvSettings;
-pub use settings::LspSettings;
-use settings::{
-    DapSettingsContent, InvalidSettingsError, LocalSettingsKind, RegisterSetting, Settings,
-    SettingsLocation, SettingsStore, parse_json_with_comments, watch_config_file,
-};
-use std::{path::PathBuf, sync::Arc, time::Duration};
-use task::{DebugTaskFile, TaskTemplates, VsCodeDebugTaskFile, VsCodeTaskFile};
-use util::{ResultExt, rel_path::RelPath, serde::default_true};
-use worktree::{PathChange, UpdatedEntriesSet, Worktree, WorktreeId};
-
-use crate::{
-    task_store::{TaskSettingsLocation, TaskStore},
-    worktree_store::{WorktreeStore, WorktreeStoreEvent},
-};
-
-#[derive(Debug, Clone, RegisterSetting)]
-pub struct ProjectSettings {
-    /// Configuration for language servers.
-    ///
-    /// The following settings can be overridden for specific language servers:
-    /// - initialization_options
-    ///
-    /// To override settings for a language, add an entry for that language server's
-    /// name to the lsp value.
-    /// Default: null
-    // todo(settings-follow-up)
-    // We should change to use a non content type (settings::LspSettings is a content type)
-    // Note: Will either require merging with defaults, which also requires deciding where the defaults come from,
-    //       or case by case deciding which fields are optional and which are actually required.
-    pub lsp: HashMap<LanguageServerName, settings::LspSettings>,
-
-    /// Common language server settings.
-    pub global_lsp_settings: GlobalLspSettings,
-
-    /// Configuration for Debugger-related features
-    pub dap: HashMap<DebugAdapterName, DapSettings>,
-
-    /// Settings for context servers used for AI-related features.
-    pub context_servers: HashMap<Arc<str>, ContextServerSettings>,
-
-    /// Configuration for Diagnostics-related features.
-    pub diagnostics: DiagnosticsSettings,
-
-    /// Configuration for Git-related features
-    pub git: GitSettings,
-
-    /// Configuration for Node-related features
-    pub node: NodeBinarySettings,
-
-    /// Configuration for how direnv configuration should be loaded
-    pub load_direnv: DirenvSettings,
-
-    /// Configuration for session-related features
-    pub session: SessionSettings,
-}
-
-#[derive(Copy, Clone, Debug)]
-pub struct SessionSettings {
-    /// Whether or not to restore unsaved buffers on restart.
-    ///
-    /// If this is true, user won't be prompted whether to save/discard
-    /// dirty files when closing the application.
-    ///
-    /// Default: true
-    pub restore_unsaved_buffers: bool,
-}
-
-#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize, JsonSchema)]
-pub struct NodeBinarySettings {
-    /// The path to the Node binary.
-    pub path: Option<String>,
-    /// The path to the npm binary Zed should use (defaults to `.path/../npm`).
-    pub npm_path: Option<String>,
-    /// If enabled, Zed will download its own copy of Node.
-    pub ignore_system_version: bool,
-}
-
-impl From<settings::NodeBinarySettings> for NodeBinarySettings {
-    fn from(settings: settings::NodeBinarySettings) -> Self {
-        Self {
-            path: settings.path,
-            npm_path: settings.npm_path,
-            ignore_system_version: settings.ignore_system_version.unwrap_or(false),
-        }
-    }
-}
-
-/// Common language server settings.
-#[derive(Debug, Clone, PartialEq)]
-pub struct GlobalLspSettings {
-    /// Whether to show the LSP servers button in the status bar.
-    ///
-    /// Default: `true`
-    pub button: bool,
-}
-
-#[derive(Deserialize, Serialize, Clone, PartialEq, Eq, JsonSchema, Debug)]
-#[serde(tag = "source", rename_all = "snake_case")]
-pub enum ContextServerSettings {
-    Stdio {
-        /// Whether the context server is enabled.
-        #[serde(default = "default_true")]
-        enabled: bool,
-
-        #[serde(flatten)]
-        command: ContextServerCommand,
-    },
-    Http {
-        /// Whether the context server is enabled.
-        #[serde(default = "default_true")]
-        enabled: bool,
-        /// The URL of the remote context server.
-        url: String,
-        /// Optional authentication configuration for the remote server.
-        #[serde(skip_serializing_if = "HashMap::is_empty", default)]
-        headers: HashMap<String, String>,
-    },
-    Extension {
-        /// Whether the context server is enabled.
-        #[serde(default = "default_true")]
-        enabled: bool,
-        /// The settings for this context server specified by the extension.
-        ///
-        /// Consult the documentation for the context server to see what settings
-        /// are supported.
-        settings: serde_json::Value,
-    },
-}
-
-impl From<settings::ContextServerSettingsContent> for ContextServerSettings {
-    fn from(value: settings::ContextServerSettingsContent) -> Self {
-        match value {
-            settings::ContextServerSettingsContent::Stdio { enabled, command } => {
-                ContextServerSettings::Stdio { enabled, command }
-            }
-            settings::ContextServerSettingsContent::Extension { enabled, settings } => {
-                ContextServerSettings::Extension { enabled, settings }
-            }
-            settings::ContextServerSettingsContent::Http {
-                enabled,
-                url,
-                headers,
-            } => ContextServerSettings::Http {
-                enabled,
-                url,
-                headers,
-            },
-        }
-    }
-}
-impl Into<settings::ContextServerSettingsContent> for ContextServerSettings {
-    fn into(self) -> settings::ContextServerSettingsContent {
-        match self {
-            ContextServerSettings::Stdio { enabled, command } => {
-                settings::ContextServerSettingsContent::Stdio { enabled, command }
-            }
-            ContextServerSettings::Extension { enabled, settings } => {
-                settings::ContextServerSettingsContent::Extension { enabled, settings }
-            }
-            ContextServerSettings::Http {
-                enabled,
-                url,
-                headers,
-            } => settings::ContextServerSettingsContent::Http {
-                enabled,
-                url,
-                headers,
-            },
-        }
-    }
-}
-
-impl ContextServerSettings {
-    pub fn default_extension() -> Self {
-        Self::Extension {
-            enabled: true,
-            settings: serde_json::json!({}),
-        }
-    }
-
-    pub fn enabled(&self) -> bool {
-        match self {
-            ContextServerSettings::Stdio { enabled, .. } => *enabled,
-            ContextServerSettings::Http { enabled, .. } => *enabled,
-            ContextServerSettings::Extension { enabled, .. } => *enabled,
-        }
-    }
-
-    pub fn set_enabled(&mut self, enabled: bool) {
-        match self {
-            ContextServerSettings::Stdio { enabled: e, .. } => *e = enabled,
-            ContextServerSettings::Http { enabled: e, .. } => *e = enabled,
-            ContextServerSettings::Extension { enabled: e, .. } => *e = enabled,
-        }
-    }
-}
-
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd)]
-pub enum DiagnosticSeverity {
-    // No diagnostics are shown.
-    Off,
-    Error,
-    Warning,
-    Info,
-    Hint,
-}
-
-impl DiagnosticSeverity {
-    pub fn into_lsp(self) -> Option<lsp::DiagnosticSeverity> {
-        match self {
-            DiagnosticSeverity::Off => None,
-            DiagnosticSeverity::Error => Some(lsp::DiagnosticSeverity::ERROR),
-            DiagnosticSeverity::Warning => Some(lsp::DiagnosticSeverity::WARNING),
-            DiagnosticSeverity::Info => Some(lsp::DiagnosticSeverity::INFORMATION),
-            DiagnosticSeverity::Hint => Some(lsp::DiagnosticSeverity::HINT),
-        }
-    }
-}
-
-impl From<settings::DiagnosticSeverityContent> for DiagnosticSeverity {
-    fn from(severity: settings::DiagnosticSeverityContent) -> Self {
-        match severity {
-            settings::DiagnosticSeverityContent::Off => DiagnosticSeverity::Off,
-            settings::DiagnosticSeverityContent::Error => DiagnosticSeverity::Error,
-            settings::DiagnosticSeverityContent::Warning => DiagnosticSeverity::Warning,
-            settings::DiagnosticSeverityContent::Info => DiagnosticSeverity::Info,
-            settings::DiagnosticSeverityContent::Hint => DiagnosticSeverity::Hint,
-            settings::DiagnosticSeverityContent::All => DiagnosticSeverity::Hint,
-        }
-    }
-}
-
-/// Determines the severity of the diagnostic that should be moved to.
-#[derive(PartialEq, PartialOrd, Clone, Copy, Debug, Eq, Deserialize, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum GoToDiagnosticSeverity {
-    /// Errors
-    Error = 3,
-    /// Warnings
-    Warning = 2,
-    /// Information
-    Information = 1,
-    /// Hints
-    Hint = 0,
-}
-
-impl From<lsp::DiagnosticSeverity> for GoToDiagnosticSeverity {
-    fn from(severity: lsp::DiagnosticSeverity) -> Self {
-        match severity {
-            lsp::DiagnosticSeverity::ERROR => Self::Error,
-            lsp::DiagnosticSeverity::WARNING => Self::Warning,
-            lsp::DiagnosticSeverity::INFORMATION => Self::Information,
-            lsp::DiagnosticSeverity::HINT => Self::Hint,
-            _ => Self::Error,
-        }
-    }
-}
-
-impl GoToDiagnosticSeverity {
-    pub fn min() -> Self {
-        Self::Hint
-    }
-
-    pub fn max() -> Self {
-        Self::Error
-    }
-}
-
-/// Allows filtering diagnostics that should be moved to.
-#[derive(PartialEq, Clone, Copy, Debug, Deserialize, JsonSchema)]
-#[serde(untagged)]
-pub enum GoToDiagnosticSeverityFilter {
-    /// Move to diagnostics of a specific severity.
-    Only(GoToDiagnosticSeverity),
-
-    /// Specify a range of severities to include.
-    Range {
-        /// Minimum severity to move to. Defaults no "error".
-        #[serde(default = "GoToDiagnosticSeverity::min")]
-        min: GoToDiagnosticSeverity,
-        /// Maximum severity to move to. Defaults to "hint".
-        #[serde(default = "GoToDiagnosticSeverity::max")]
-        max: GoToDiagnosticSeverity,
-    },
-}
-
-impl Default for GoToDiagnosticSeverityFilter {
-    fn default() -> Self {
-        Self::Range {
-            min: GoToDiagnosticSeverity::min(),
-            max: GoToDiagnosticSeverity::max(),
-        }
-    }
-}
-
-impl GoToDiagnosticSeverityFilter {
-    pub fn matches(&self, severity: lsp::DiagnosticSeverity) -> bool {
-        let severity: GoToDiagnosticSeverity = severity.into();
-        match self {
-            Self::Only(target) => *target == severity,
-            Self::Range { min, max } => severity >= *min && severity <= *max,
-        }
-    }
-}
-
-#[derive(Copy, Clone, Debug)]
-pub struct GitSettings {
-    /// Whether or not to show the git gutter.
-    ///
-    /// Default: tracked_files
-    pub git_gutter: settings::GitGutterSetting,
-    /// Sets the debounce threshold (in milliseconds) after which changes are reflected in the git gutter.
-    ///
-    /// Default: 0
-    pub gutter_debounce: u64,
-    /// Whether or not to show git blame data inline in
-    /// the currently focused line.
-    ///
-    /// Default: on
-    pub inline_blame: InlineBlameSettings,
-    /// Git blame settings.
-    pub blame: BlameSettings,
-    /// Which information to show in the branch picker.
-    ///
-    /// Default: on
-    pub branch_picker: BranchPickerSettings,
-    /// How hunks are displayed visually in the editor.
-    ///
-    /// Default: staged_hollow
-    pub hunk_style: settings::GitHunkStyleSetting,
-    /// How file paths are displayed in the git gutter.
-    ///
-    /// Default: file_name_first
-    pub path_style: GitPathStyle,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Default)]
-pub enum GitPathStyle {
-    #[default]
-    FileNameFirst,
-    FilePathFirst,
-}
-
-impl From<settings::GitPathStyle> for GitPathStyle {
-    fn from(style: settings::GitPathStyle) -> Self {
-        match style {
-            settings::GitPathStyle::FileNameFirst => GitPathStyle::FileNameFirst,
-            settings::GitPathStyle::FilePathFirst => GitPathStyle::FilePathFirst,
-        }
-    }
-}
-
-#[derive(Clone, Copy, Debug)]
-pub struct InlineBlameSettings {
-    /// Whether or not to show git blame data inline in
-    /// the currently focused line.
-    ///
-    /// Default: true
-    pub enabled: bool,
-    /// Whether to only show the inline blame information
-    /// after a delay once the cursor stops moving.
-    ///
-    /// Default: 0
-    pub delay_ms: settings::DelayMs,
-    /// The amount of padding between the end of the source line and the start
-    /// of the inline blame in units of columns.
-    ///
-    /// Default: 7
-    pub padding: u32,
-    /// The minimum column number to show the inline blame information at
-    ///
-    /// Default: 0
-    pub min_column: u32,
-    /// Whether to show commit summary as part of the inline blame.
-    ///
-    /// Default: false
-    pub show_commit_summary: bool,
-}
-
-#[derive(Clone, Copy, Debug)]
-pub struct BlameSettings {
-    /// Whether to show the avatar of the author of the commit.
-    ///
-    /// Default: true
-    pub show_avatar: bool,
-}
-
-impl GitSettings {
-    pub fn inline_blame_delay(&self) -> Option<Duration> {
-        if self.inline_blame.delay_ms.0 > 0 {
-            Some(Duration::from_millis(self.inline_blame.delay_ms.0))
-        } else {
-            None
-        }
-    }
-}
-
-#[derive(Clone, Copy, Debug, Serialize, Deserialize, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub struct BranchPickerSettings {
-    /// Whether to show author name as part of the commit information.
-    ///
-    /// Default: false
-    #[serde(default)]
-    pub show_author_name: bool,
-}
-
-impl Default for BranchPickerSettings {
-    fn default() -> Self {
-        Self {
-            show_author_name: true,
-        }
-    }
-}
-
-#[derive(Clone, Debug)]
-pub struct DiagnosticsSettings {
-    /// Whether to show the project diagnostics button in the status bar.
-    pub button: bool,
-
-    /// Whether or not to include warning diagnostics.
-    pub include_warnings: bool,
-
-    /// Settings for using LSP pull diagnostics mechanism in Zed.
-    pub lsp_pull_diagnostics: LspPullDiagnosticsSettings,
-
-    /// Settings for showing inline diagnostics.
-    pub inline: InlineDiagnosticsSettings,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct InlineDiagnosticsSettings {
-    /// Whether or not to show inline diagnostics
-    ///
-    /// Default: false
-    pub enabled: bool,
-    /// Whether to only show the inline diagnostics after a delay after the
-    /// last editor event.
-    ///
-    /// Default: 150
-    pub update_debounce_ms: u64,
-    /// The amount of padding between the end of the source line and the start
-    /// of the inline diagnostic in units of columns.
-    ///
-    /// Default: 4
-    pub padding: u32,
-    /// The minimum column to display inline diagnostics. This setting can be
-    /// used to horizontally align inline diagnostics at some position. Lines
-    /// longer than this value will still push diagnostics further to the right.
-    ///
-    /// Default: 0
-    pub min_column: u32,
-
-    pub max_severity: Option<DiagnosticSeverity>,
-}
-
-#[derive(Clone, Copy, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
-pub struct LspPullDiagnosticsSettings {
-    /// Whether to pull for diagnostics or not.
-    ///
-    /// Default: true
-    pub enabled: bool,
-    /// Minimum time to wait before pulling diagnostics from the language server(s).
-    /// 0 turns the debounce off.
-    ///
-    /// Default: 50
-    pub debounce_ms: u64,
-}
-
-impl Settings for ProjectSettings {
-    fn from_settings(content: &settings::SettingsContent) -> Self {
-        let project = &content.project.clone();
-        let diagnostics = content.diagnostics.as_ref().unwrap();
-        let lsp_pull_diagnostics = diagnostics.lsp_pull_diagnostics.as_ref().unwrap();
-        let inline_diagnostics = diagnostics.inline.as_ref().unwrap();
-
-        let git = content.git.as_ref().unwrap();
-        let git_settings = GitSettings {
-            git_gutter: git.git_gutter.unwrap(),
-            gutter_debounce: git.gutter_debounce.unwrap_or_default(),
-            inline_blame: {
-                let inline = git.inline_blame.unwrap();
-                InlineBlameSettings {
-                    enabled: inline.enabled.unwrap(),
-                    delay_ms: inline.delay_ms.unwrap(),
-                    padding: inline.padding.unwrap(),
-                    min_column: inline.min_column.unwrap(),
-                    show_commit_summary: inline.show_commit_summary.unwrap(),
-                }
-            },
-            blame: {
-                let blame = git.blame.unwrap();
-                BlameSettings {
-                    show_avatar: blame.show_avatar.unwrap(),
-                }
-            },
-            branch_picker: {
-                let branch_picker = git.branch_picker.unwrap();
-                BranchPickerSettings {
-                    show_author_name: branch_picker.show_author_name.unwrap(),
-                }
-            },
-            hunk_style: git.hunk_style.unwrap(),
-            path_style: git.path_style.unwrap().into(),
-        };
-        Self {
-            context_servers: project
-                .context_servers
-                .clone()
-                .into_iter()
-                .map(|(key, value)| (key, value.into()))
-                .collect(),
-            lsp: project
-                .lsp
-                .clone()
-                .into_iter()
-                .map(|(key, value)| (LanguageServerName(key.into()), value))
-                .collect(),
-            global_lsp_settings: GlobalLspSettings {
-                button: content
-                    .global_lsp_settings
-                    .as_ref()
-                    .unwrap()
-                    .button
-                    .unwrap(),
-            },
-            dap: project
-                .dap
-                .clone()
-                .into_iter()
-                .map(|(key, value)| (DebugAdapterName(key.into()), DapSettings::from(value)))
-                .collect(),
-            diagnostics: DiagnosticsSettings {
-                button: diagnostics.button.unwrap(),
-                include_warnings: diagnostics.include_warnings.unwrap(),
-                lsp_pull_diagnostics: LspPullDiagnosticsSettings {
-                    enabled: lsp_pull_diagnostics.enabled.unwrap(),
-                    debounce_ms: lsp_pull_diagnostics.debounce_ms.unwrap().0,
-                },
-                inline: InlineDiagnosticsSettings {
-                    enabled: inline_diagnostics.enabled.unwrap(),
-                    update_debounce_ms: inline_diagnostics.update_debounce_ms.unwrap().0,
-                    padding: inline_diagnostics.padding.unwrap(),
-                    min_column: inline_diagnostics.min_column.unwrap(),
-                    max_severity: inline_diagnostics.max_severity.map(Into::into),
-                },
-            },
-            git: git_settings,
-            node: content.node.clone().unwrap().into(),
-            load_direnv: project.load_direnv.clone().unwrap(),
-            session: SessionSettings {
-                restore_unsaved_buffers: content.session.unwrap().restore_unsaved_buffers.unwrap(),
-            },
-        }
-    }
-}
-
-pub enum SettingsObserverMode {
-    Local(Arc<dyn Fs>),
-    Remote,
-}
-
-#[derive(Clone, Debug, PartialEq)]
-pub enum SettingsObserverEvent {
-    LocalSettingsUpdated(Result<PathBuf, InvalidSettingsError>),
-    LocalTasksUpdated(Result<PathBuf, InvalidSettingsError>),
-    LocalDebugScenariosUpdated(Result<PathBuf, InvalidSettingsError>),
-}
-
-impl EventEmitter<SettingsObserverEvent> for SettingsObserver {}
-
-pub struct SettingsObserver {
-    mode: SettingsObserverMode,
-    downstream_client: Option<AnyProtoClient>,
-    worktree_store: Entity<WorktreeStore>,
-    project_id: u64,
-    task_store: Entity<TaskStore>,
-    _user_settings_watcher: Option<Subscription>,
-    _global_task_config_watcher: Task<()>,
-    _global_debug_config_watcher: Task<()>,
-}
-
-/// SettingsObserver observers changes to .zed/{settings, task}.json files in local worktrees
-/// (or the equivalent protobuf messages from upstream) and updates local settings
-/// and sends notifications downstream.
-/// In ssh mode it also monitors ~/.config/zed/{settings, task}.json and sends the content
-/// upstream.
-impl SettingsObserver {
-    pub fn init(client: &AnyProtoClient) {
-        client.add_entity_message_handler(Self::handle_update_worktree_settings);
-        client.add_entity_message_handler(Self::handle_update_user_settings);
-    }
-
-    pub fn new_local(
-        fs: Arc<dyn Fs>,
-        worktree_store: Entity<WorktreeStore>,
-        task_store: Entity<TaskStore>,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        cx.subscribe(&worktree_store, Self::on_worktree_store_event)
-            .detach();
-
-        Self {
-            worktree_store,
-            task_store,
-            mode: SettingsObserverMode::Local(fs.clone()),
-            downstream_client: None,
-            _user_settings_watcher: None,
-            project_id: REMOTE_SERVER_PROJECT_ID,
-            _global_task_config_watcher: Self::subscribe_to_global_task_file_changes(
-                fs.clone(),
-                paths::tasks_file().clone(),
-                cx,
-            ),
-            _global_debug_config_watcher: Self::subscribe_to_global_debug_scenarios_changes(
-                fs.clone(),
-                paths::debug_scenarios_file().clone(),
-                cx,
-            ),
-        }
-    }
-
-    pub fn new_remote(
-        fs: Arc<dyn Fs>,
-        worktree_store: Entity<WorktreeStore>,
-        task_store: Entity<TaskStore>,
-        upstream_client: Option<AnyProtoClient>,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let mut user_settings_watcher = None;
-        if cx.try_global::<SettingsStore>().is_some() {
-            if let Some(upstream_client) = upstream_client {
-                let mut user_settings = None;
-                user_settings_watcher = Some(cx.observe_global::<SettingsStore>(move |_, cx| {
-                    if let Some(new_settings) = cx.global::<SettingsStore>().raw_user_settings() {
-                        if Some(new_settings) != user_settings.as_ref() {
-                            if let Some(new_settings_string) =
-                                serde_json::to_string(new_settings).ok()
-                            {
-                                user_settings = Some(new_settings.clone());
-                                upstream_client
-                                    .send(proto::UpdateUserSettings {
-                                        project_id: REMOTE_SERVER_PROJECT_ID,
-                                        contents: new_settings_string,
-                                    })
-                                    .log_err();
-                            }
-                        }
-                    }
-                }));
-            }
-        };
-
-        Self {
-            worktree_store,
-            task_store,
-            mode: SettingsObserverMode::Remote,
-            downstream_client: None,
-            project_id: REMOTE_SERVER_PROJECT_ID,
-            _user_settings_watcher: user_settings_watcher,
-            _global_task_config_watcher: Self::subscribe_to_global_task_file_changes(
-                fs.clone(),
-                paths::tasks_file().clone(),
-                cx,
-            ),
-            _global_debug_config_watcher: Self::subscribe_to_global_debug_scenarios_changes(
-                fs.clone(),
-                paths::debug_scenarios_file().clone(),
-                cx,
-            ),
-        }
-    }
-
-    pub fn shared(
-        &mut self,
-        project_id: u64,
-        downstream_client: AnyProtoClient,
-        cx: &mut Context<Self>,
-    ) {
-        self.project_id = project_id;
-        self.downstream_client = Some(downstream_client.clone());
-
-        let store = cx.global::<SettingsStore>();
-        for worktree in self.worktree_store.read(cx).worktrees() {
-            let worktree_id = worktree.read(cx).id().to_proto();
-            for (path, content) in store.local_settings(worktree.read(cx).id()) {
-                let content = serde_json::to_string(&content).unwrap();
-                downstream_client
-                    .send(proto::UpdateWorktreeSettings {
-                        project_id,
-                        worktree_id,
-                        path: path.to_proto(),
-                        content: Some(content),
-                        kind: Some(
-                            local_settings_kind_to_proto(LocalSettingsKind::Settings).into(),
-                        ),
-                    })
-                    .log_err();
-            }
-            for (path, content, _) in store.local_editorconfig_settings(worktree.read(cx).id()) {
-                downstream_client
-                    .send(proto::UpdateWorktreeSettings {
-                        project_id,
-                        worktree_id,
-                        path: path.to_proto(),
-                        content: Some(content),
-                        kind: Some(
-                            local_settings_kind_to_proto(LocalSettingsKind::Editorconfig).into(),
-                        ),
-                    })
-                    .log_err();
-            }
-        }
-    }
-
-    pub fn unshared(&mut self, _: &mut Context<Self>) {
-        self.downstream_client = None;
-    }
-
-    async fn handle_update_worktree_settings(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::UpdateWorktreeSettings>,
-        mut cx: AsyncApp,
-    ) -> anyhow::Result<()> {
-        let kind = match envelope.payload.kind {
-            Some(kind) => proto::LocalSettingsKind::from_i32(kind)
-                .with_context(|| format!("unknown kind {kind}"))?,
-            None => proto::LocalSettingsKind::Settings,
-        };
-        let path = RelPath::from_proto(&envelope.payload.path)?;
-        this.update(&mut cx, |this, cx| {
-            let worktree_id = WorktreeId::from_proto(envelope.payload.worktree_id);
-            let Some(worktree) = this
-                .worktree_store
-                .read(cx)
-                .worktree_for_id(worktree_id, cx)
-            else {
-                return;
-            };
-
-            this.update_settings(
-                worktree,
-                [(
-                    path,
-                    local_settings_kind_from_proto(kind),
-                    envelope.payload.content,
-                )],
-                cx,
-            );
-        })?;
-        Ok(())
-    }
-
-    async fn handle_update_user_settings(
-        _: Entity<Self>,
-        envelope: TypedEnvelope<proto::UpdateUserSettings>,
-        cx: AsyncApp,
-    ) -> anyhow::Result<()> {
-        cx.update_global(|settings_store: &mut SettingsStore, cx| {
-            settings_store
-                .set_user_settings(&envelope.payload.contents, cx)
-                .result()
-                .context("setting new user settings")?;
-            anyhow::Ok(())
-        })??;
-        Ok(())
-    }
-
-    fn on_worktree_store_event(
-        &mut self,
-        _: Entity<WorktreeStore>,
-        event: &WorktreeStoreEvent,
-        cx: &mut Context<Self>,
-    ) {
-        if let WorktreeStoreEvent::WorktreeAdded(worktree) = event {
-            cx.subscribe(worktree, |this, worktree, event, cx| {
-                if let worktree::Event::UpdatedEntries(changes) = event {
-                    this.update_local_worktree_settings(&worktree, changes, cx)
-                }
-            })
-            .detach()
-        }
-    }
-
-    fn update_local_worktree_settings(
-        &mut self,
-        worktree: &Entity<Worktree>,
-        changes: &UpdatedEntriesSet,
-        cx: &mut Context<Self>,
-    ) {
-        let SettingsObserverMode::Local(fs) = &self.mode else {
-            return;
-        };
-
-        let mut settings_contents = Vec::new();
-        for (path, _, change) in changes.iter() {
-            let (settings_dir, kind) = if path.ends_with(local_settings_file_relative_path()) {
-                let settings_dir = path
-                    .ancestors()
-                    .nth(local_settings_file_relative_path().components().count())
-                    .unwrap()
-                    .into();
-                (settings_dir, LocalSettingsKind::Settings)
-            } else if path.ends_with(local_tasks_file_relative_path()) {
-                let settings_dir = path
-                    .ancestors()
-                    .nth(
-                        local_tasks_file_relative_path()
-                            .components()
-                            .count()
-                            .saturating_sub(1),
-                    )
-                    .unwrap()
-                    .into();
-                (settings_dir, LocalSettingsKind::Tasks)
-            } else if path.ends_with(local_vscode_tasks_file_relative_path()) {
-                let settings_dir = path
-                    .ancestors()
-                    .nth(
-                        local_vscode_tasks_file_relative_path()
-                            .components()
-                            .count()
-                            .saturating_sub(1),
-                    )
-                    .unwrap()
-                    .into();
-                (settings_dir, LocalSettingsKind::Tasks)
-            } else if path.ends_with(local_debug_file_relative_path()) {
-                let settings_dir = path
-                    .ancestors()
-                    .nth(
-                        local_debug_file_relative_path()
-                            .components()
-                            .count()
-                            .saturating_sub(1),
-                    )
-                    .unwrap()
-                    .into();
-                (settings_dir, LocalSettingsKind::Debug)
-            } else if path.ends_with(local_vscode_launch_file_relative_path()) {
-                let settings_dir = path
-                    .ancestors()
-                    .nth(
-                        local_vscode_tasks_file_relative_path()
-                            .components()
-                            .count()
-                            .saturating_sub(1),
-                    )
-                    .unwrap()
-                    .into();
-                (settings_dir, LocalSettingsKind::Debug)
-            } else if path.ends_with(RelPath::unix(EDITORCONFIG_NAME).unwrap()) {
-                let Some(settings_dir) = path.parent().map(Arc::from) else {
-                    continue;
-                };
-                (settings_dir, LocalSettingsKind::Editorconfig)
-            } else {
-                continue;
-            };
-
-            let removed = change == &PathChange::Removed;
-            let fs = fs.clone();
-            let abs_path = worktree.read(cx).absolutize(path);
-            settings_contents.push(async move {
-                (
-                    settings_dir,
-                    kind,
-                    if removed {
-                        None
-                    } else {
-                        Some(
-                            async move {
-                                let content = fs.load(&abs_path).await?;
-                                if abs_path.ends_with(local_vscode_tasks_file_relative_path().as_std_path()) {
-                                    let vscode_tasks =
-                                        parse_json_with_comments::<VsCodeTaskFile>(&content)
-                                            .with_context(|| {
-                                                format!("parsing VSCode tasks, file {abs_path:?}")
-                                            })?;
-                                    let zed_tasks = TaskTemplates::try_from(vscode_tasks)
-                                        .with_context(|| {
-                                            format!(
-                                        "converting VSCode tasks into Zed ones, file {abs_path:?}"
-                                    )
-                                        })?;
-                                    serde_json::to_string(&zed_tasks).with_context(|| {
-                                        format!(
-                                            "serializing Zed tasks into JSON, file {abs_path:?}"
-                                        )
-                                    })
-                                } else if abs_path.ends_with(local_vscode_launch_file_relative_path().as_std_path()) {
-                                    let vscode_tasks =
-                                        parse_json_with_comments::<VsCodeDebugTaskFile>(&content)
-                                            .with_context(|| {
-                                                format!("parsing VSCode debug tasks, file {abs_path:?}")
-                                            })?;
-                                    let zed_tasks = DebugTaskFile::try_from(vscode_tasks)
-                                        .with_context(|| {
-                                            format!(
-                                        "converting VSCode debug tasks into Zed ones, file {abs_path:?}"
-                                    )
-                                        })?;
-                                    serde_json::to_string(&zed_tasks).with_context(|| {
-                                        format!(
-                                            "serializing Zed tasks into JSON, file {abs_path:?}"
-                                        )
-                                    })
-                                } else {
-                                    Ok(content)
-                                }
-                            }
-                            .await,
-                        )
-                    },
-                )
-            });
-        }
-
-        if settings_contents.is_empty() {
-            return;
-        }
-
-        let worktree = worktree.clone();
-        cx.spawn(async move |this, cx| {
-            let settings_contents: Vec<(Arc<RelPath>, _, _)> =
-                futures::future::join_all(settings_contents).await;
-            cx.update(|cx| {
-                this.update(cx, |this, cx| {
-                    this.update_settings(
-                        worktree,
-                        settings_contents.into_iter().map(|(path, kind, content)| {
-                            (path, kind, content.and_then(|c| c.log_err()))
-                        }),
-                        cx,
-                    )
-                })
-            })
-        })
-        .detach();
-    }
-
-    fn update_settings(
-        &mut self,
-        worktree: Entity<Worktree>,
-        settings_contents: impl IntoIterator<Item = (Arc<RelPath>, LocalSettingsKind, Option<String>)>,
-        cx: &mut Context<Self>,
-    ) {
-        let worktree_id = worktree.read(cx).id();
-        let remote_worktree_id = worktree.read(cx).id();
-        let task_store = self.task_store.clone();
-
-        for (directory, kind, file_content) in settings_contents {
-            match kind {
-                LocalSettingsKind::Settings | LocalSettingsKind::Editorconfig => cx
-                    .update_global::<SettingsStore, _>(|store, cx| {
-                        let result = store.set_local_settings(
-                            worktree_id,
-                            directory.clone(),
-                            kind,
-                            file_content.as_deref(),
-                            cx,
-                        );
-
-                        match result {
-                            Err(InvalidSettingsError::LocalSettings { path, message }) => {
-                                log::error!("Failed to set local settings in {path:?}: {message}");
-                                cx.emit(SettingsObserverEvent::LocalSettingsUpdated(Err(
-                                    InvalidSettingsError::LocalSettings { path, message },
-                                )));
-                            }
-                            Err(e) => {
-                                log::error!("Failed to set local settings: {e}");
-                            }
-                            Ok(()) => {
-                                cx.emit(SettingsObserverEvent::LocalSettingsUpdated(Ok(directory
-                                    .as_std_path()
-                                    .join(local_settings_file_relative_path().as_std_path()))));
-                            }
-                        }
-                    }),
-                LocalSettingsKind::Tasks => {
-                    let result = task_store.update(cx, |task_store, cx| {
-                        task_store.update_user_tasks(
-                            TaskSettingsLocation::Worktree(SettingsLocation {
-                                worktree_id,
-                                path: directory.as_ref(),
-                            }),
-                            file_content.as_deref(),
-                            cx,
-                        )
-                    });
-
-                    match result {
-                        Err(InvalidSettingsError::Tasks { path, message }) => {
-                            log::error!("Failed to set local tasks in {path:?}: {message:?}");
-                            cx.emit(SettingsObserverEvent::LocalTasksUpdated(Err(
-                                InvalidSettingsError::Tasks { path, message },
-                            )));
-                        }
-                        Err(e) => {
-                            log::error!("Failed to set local tasks: {e}");
-                        }
-                        Ok(()) => {
-                            cx.emit(SettingsObserverEvent::LocalTasksUpdated(Ok(directory
-                                .as_std_path()
-                                .join(task_file_name()))));
-                        }
-                    }
-                }
-                LocalSettingsKind::Debug => {
-                    let result = task_store.update(cx, |task_store, cx| {
-                        task_store.update_user_debug_scenarios(
-                            TaskSettingsLocation::Worktree(SettingsLocation {
-                                worktree_id,
-                                path: directory.as_ref(),
-                            }),
-                            file_content.as_deref(),
-                            cx,
-                        )
-                    });
-
-                    match result {
-                        Err(InvalidSettingsError::Debug { path, message }) => {
-                            log::error!(
-                                "Failed to set local debug scenarios in {path:?}: {message:?}"
-                            );
-                            cx.emit(SettingsObserverEvent::LocalTasksUpdated(Err(
-                                InvalidSettingsError::Debug { path, message },
-                            )));
-                        }
-                        Err(e) => {
-                            log::error!("Failed to set local tasks: {e}");
-                        }
-                        Ok(()) => {
-                            cx.emit(SettingsObserverEvent::LocalTasksUpdated(Ok(directory
-                                .as_std_path()
-                                .join(task_file_name()))));
-                        }
-                    }
-                }
-            };
-
-            if let Some(downstream_client) = &self.downstream_client {
-                downstream_client
-                    .send(proto::UpdateWorktreeSettings {
-                        project_id: self.project_id,
-                        worktree_id: remote_worktree_id.to_proto(),
-                        path: directory.to_proto(),
-                        content: file_content.clone(),
-                        kind: Some(local_settings_kind_to_proto(kind).into()),
-                    })
-                    .log_err();
-            }
-        }
-    }
-
-    fn subscribe_to_global_task_file_changes(
-        fs: Arc<dyn Fs>,
-        file_path: PathBuf,
-        cx: &mut Context<Self>,
-    ) -> Task<()> {
-        let mut user_tasks_file_rx =
-            watch_config_file(cx.background_executor(), fs, file_path.clone());
-        let user_tasks_content = cx.background_executor().block(user_tasks_file_rx.next());
-        let weak_entry = cx.weak_entity();
-        cx.spawn(async move |settings_observer, cx| {
-            let Ok(task_store) = settings_observer.read_with(cx, |settings_observer, _| {
-                settings_observer.task_store.clone()
-            }) else {
-                return;
-            };
-            if let Some(user_tasks_content) = user_tasks_content {
-                let Ok(()) = task_store.update(cx, |task_store, cx| {
-                    task_store
-                        .update_user_tasks(
-                            TaskSettingsLocation::Global(&file_path),
-                            Some(&user_tasks_content),
-                            cx,
-                        )
-                        .log_err();
-                }) else {
-                    return;
-                };
-            }
-            while let Some(user_tasks_content) = user_tasks_file_rx.next().await {
-                let Ok(result) = task_store.update(cx, |task_store, cx| {
-                    task_store.update_user_tasks(
-                        TaskSettingsLocation::Global(&file_path),
-                        Some(&user_tasks_content),
-                        cx,
-                    )
-                }) else {
-                    break;
-                };
-
-                weak_entry
-                    .update(cx, |_, cx| match result {
-                        Ok(()) => cx.emit(SettingsObserverEvent::LocalTasksUpdated(Ok(
-                            file_path.clone()
-                        ))),
-                        Err(err) => cx.emit(SettingsObserverEvent::LocalTasksUpdated(Err(
-                            InvalidSettingsError::Tasks {
-                                path: file_path.clone(),
-                                message: err.to_string(),
-                            },
-                        ))),
-                    })
-                    .ok();
-            }
-        })
-    }
-    fn subscribe_to_global_debug_scenarios_changes(
-        fs: Arc<dyn Fs>,
-        file_path: PathBuf,
-        cx: &mut Context<Self>,
-    ) -> Task<()> {
-        let mut user_tasks_file_rx =
-            watch_config_file(cx.background_executor(), fs, file_path.clone());
-        let user_tasks_content = cx.background_executor().block(user_tasks_file_rx.next());
-        let weak_entry = cx.weak_entity();
-        cx.spawn(async move |settings_observer, cx| {
-            let Ok(task_store) = settings_observer.read_with(cx, |settings_observer, _| {
-                settings_observer.task_store.clone()
-            }) else {
-                return;
-            };
-            if let Some(user_tasks_content) = user_tasks_content {
-                let Ok(()) = task_store.update(cx, |task_store, cx| {
-                    task_store
-                        .update_user_debug_scenarios(
-                            TaskSettingsLocation::Global(&file_path),
-                            Some(&user_tasks_content),
-                            cx,
-                        )
-                        .log_err();
-                }) else {
-                    return;
-                };
-            }
-            while let Some(user_tasks_content) = user_tasks_file_rx.next().await {
-                let Ok(result) = task_store.update(cx, |task_store, cx| {
-                    task_store.update_user_debug_scenarios(
-                        TaskSettingsLocation::Global(&file_path),
-                        Some(&user_tasks_content),
-                        cx,
-                    )
-                }) else {
-                    break;
-                };
-
-                weak_entry
-                    .update(cx, |_, cx| match result {
-                        Ok(()) => cx.emit(SettingsObserverEvent::LocalDebugScenariosUpdated(Ok(
-                            file_path.clone(),
-                        ))),
-                        Err(err) => cx.emit(SettingsObserverEvent::LocalDebugScenariosUpdated(
-                            Err(InvalidSettingsError::Tasks {
-                                path: file_path.clone(),
-                                message: err.to_string(),
-                            }),
-                        )),
-                    })
-                    .ok();
-            }
-        })
-    }
-}
-
-pub fn local_settings_kind_from_proto(kind: proto::LocalSettingsKind) -> LocalSettingsKind {
-    match kind {
-        proto::LocalSettingsKind::Settings => LocalSettingsKind::Settings,
-        proto::LocalSettingsKind::Tasks => LocalSettingsKind::Tasks,
-        proto::LocalSettingsKind::Editorconfig => LocalSettingsKind::Editorconfig,
-        proto::LocalSettingsKind::Debug => LocalSettingsKind::Debug,
-    }
-}
-
-pub fn local_settings_kind_to_proto(kind: LocalSettingsKind) -> proto::LocalSettingsKind {
-    match kind {
-        LocalSettingsKind::Settings => proto::LocalSettingsKind::Settings,
-        LocalSettingsKind::Tasks => proto::LocalSettingsKind::Tasks,
-        LocalSettingsKind::Editorconfig => proto::LocalSettingsKind::Editorconfig,
-        LocalSettingsKind::Debug => proto::LocalSettingsKind::Debug,
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct DapSettings {
-    pub binary: DapBinary,
-    pub args: Vec<String>,
-    pub env: HashMap<String, String>,
-}
-
-impl From<DapSettingsContent> for DapSettings {
-    fn from(content: DapSettingsContent) -> Self {
-        DapSettings {
-            binary: content
-                .binary
-                .map_or_else(|| DapBinary::Default, |binary| DapBinary::Custom(binary)),
-            args: content.args.unwrap_or_default(),
-            env: content.env.unwrap_or_default(),
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub enum DapBinary {
-    Default,
-    Custom(String),
-}
diff --git a/crates/project/src/project_tests.rs b/crates/project/src/project_tests.rs
deleted file mode 100644
index 4cebc72073..0000000000
--- a/crates/project/src/project_tests.rs
+++ /dev/null
@@ -1,10924 +0,0 @@
-#![allow(clippy::format_collect)]
-
-use crate::{
-    Event,
-    git_store::{GitStoreEvent, RepositoryEvent, StatusEntry, pending_op},
-    task_inventory::TaskContexts,
-    task_store::TaskSettingsLocation,
-    *,
-};
-use async_trait::async_trait;
-use buffer_diff::{
-    BufferDiffEvent, CALCULATE_DIFF_TASK, DiffHunkSecondaryStatus, DiffHunkStatus,
-    DiffHunkStatusKind, assert_hunks,
-};
-use fs::FakeFs;
-use futures::{StreamExt, future};
-use git::{
-    GitHostingProviderRegistry,
-    repository::{RepoPath, repo_path},
-    status::{StatusCode, TrackedStatus},
-};
-use git2::RepositoryInitOptions;
-use gpui::{App, BackgroundExecutor, FutureExt, UpdateGlobal};
-use itertools::Itertools;
-use language::{
-    Diagnostic, DiagnosticEntry, DiagnosticEntryRef, DiagnosticSet, DiagnosticSourceKind,
-    DiskState, FakeLspAdapter, LanguageConfig, LanguageMatcher, LanguageName, LineEnding,
-    ManifestName, ManifestProvider, ManifestQuery, OffsetRangeExt, Point, ToPoint, ToolchainList,
-    ToolchainLister,
-    language_settings::{LanguageSettingsContent, language_settings},
-    rust_lang, tree_sitter_typescript,
-};
-use lsp::{
-    DiagnosticSeverity, DocumentChanges, FileOperationFilter, NumberOrString, TextDocumentEdit,
-    Uri, WillRenameFiles, notification::DidRenameFiles,
-};
-use parking_lot::Mutex;
-use paths::{config_dir, global_gitignore_path, tasks_file};
-use postage::stream::Stream as _;
-use pretty_assertions::{assert_eq, assert_matches};
-use rand::{Rng as _, rngs::StdRng};
-use serde_json::json;
-#[cfg(not(windows))]
-use std::os;
-use std::{
-    env, mem,
-    num::NonZeroU32,
-    ops::Range,
-    str::FromStr,
-    sync::{Arc, OnceLock},
-    task::Poll,
-};
-use sum_tree::SumTree;
-use task::{ResolvedTask, ShellKind, TaskContext};
-use unindent::Unindent as _;
-use util::{
-    TryFutureExt as _, assert_set_eq, maybe, path,
-    paths::PathMatcher,
-    rel_path::rel_path,
-    test::{TempTree, marked_text_offsets},
-    uri,
-};
-use worktree::WorktreeModelHandle as _;
-
-#[gpui::test]
-async fn test_block_via_channel(cx: &mut gpui::TestAppContext) {
-    cx.executor().allow_parking();
-
-    let (tx, mut rx) = futures::channel::mpsc::unbounded();
-    let _thread = std::thread::spawn(move || {
-        #[cfg(not(target_os = "windows"))]
-        std::fs::metadata("/tmp").unwrap();
-        #[cfg(target_os = "windows")]
-        std::fs::metadata("C:/Windows").unwrap();
-        std::thread::sleep(Duration::from_millis(1000));
-        tx.unbounded_send(1).unwrap();
-    });
-    rx.next().await.unwrap();
-}
-
-#[gpui::test]
-async fn test_block_via_smol(cx: &mut gpui::TestAppContext) {
-    cx.executor().allow_parking();
-
-    let io_task = smol::unblock(move || {
-        println!("sleeping on thread {:?}", std::thread::current().id());
-        std::thread::sleep(Duration::from_millis(10));
-        1
-    });
-
-    let task = cx.foreground_executor().spawn(async move {
-        io_task.await;
-    });
-
-    task.await;
-}
-
-// NOTE:
-// While POSIX symbolic links are somewhat supported on Windows, they are an opt in by the user, and thus
-// we assume that they are not supported out of the box.
-#[cfg(not(windows))]
-#[gpui::test]
-async fn test_symlinks(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-    cx.executor().allow_parking();
-
-    let dir = TempTree::new(json!({
-        "root": {
-            "apple": "",
-            "banana": {
-                "carrot": {
-                    "date": "",
-                    "endive": "",
-                }
-            },
-            "fennel": {
-                "grape": "",
-            }
-        }
-    }));
-
-    let root_link_path = dir.path().join("root_link");
-    os::unix::fs::symlink(dir.path().join("root"), &root_link_path).unwrap();
-    os::unix::fs::symlink(
-        dir.path().join("root/fennel"),
-        dir.path().join("root/finnochio"),
-    )
-    .unwrap();
-
-    let project = Project::test(
-        Arc::new(RealFs::new(None, cx.executor())),
-        [root_link_path.as_ref()],
-        cx,
-    )
-    .await;
-
-    project.update(cx, |project, cx| {
-        let tree = project.worktrees(cx).next().unwrap().read(cx);
-        assert_eq!(tree.file_count(), 5);
-        assert_eq!(
-            tree.entry_for_path(rel_path("fennel/grape")).unwrap().inode,
-            tree.entry_for_path(rel_path("finnochio/grape"))
-                .unwrap()
-                .inode
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_editorconfig_support(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let dir = TempTree::new(json!({
-        ".editorconfig": r#"
-        root = true
-        [*.rs]
-            indent_style = tab
-            indent_size = 3
-            end_of_line = lf
-            insert_final_newline = true
-            trim_trailing_whitespace = true
-            max_line_length = 120
-        [*.js]
-            tab_width = 10
-            max_line_length = off
-        "#,
-        ".zed": {
-            "settings.json": r#"{
-                "tab_size": 8,
-                "hard_tabs": false,
-                "ensure_final_newline_on_save": false,
-                "remove_trailing_whitespace_on_save": false,
-                "preferred_line_length": 64,
-                "soft_wrap": "editor_width",
-            }"#,
-        },
-        "a.rs": "fn a() {\n    A\n}",
-        "b": {
-            ".editorconfig": r#"
-            [*.rs]
-                indent_size = 2
-                max_line_length = off,
-            "#,
-            "b.rs": "fn b() {\n    B\n}",
-        },
-        "c.js": "def c\n  C\nend",
-        "README.json": "tabs are better\n",
-    }));
-
-    let path = dir.path();
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree_from_real_fs(path, path).await;
-    let project = Project::test(fs, [path], cx).await;
-
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-    language_registry.add(js_lang());
-    language_registry.add(json_lang());
-    language_registry.add(rust_lang());
-
-    let worktree = project.update(cx, |project, cx| project.worktrees(cx).next().unwrap());
-
-    cx.executor().run_until_parked();
-
-    cx.update(|cx| {
-        let tree = worktree.read(cx);
-        let settings_for = |path: &str| {
-            let file_entry = tree.entry_for_path(rel_path(path)).unwrap().clone();
-            let file = File::for_entry(file_entry, worktree.clone());
-            let file_language = project
-                .read(cx)
-                .languages()
-                .load_language_for_file_path(file.path.as_std_path());
-            let file_language = cx
-                .background_executor()
-                .block(file_language)
-                .expect("Failed to get file language");
-            let file = file as _;
-            language_settings(Some(file_language.name()), Some(&file), cx).into_owned()
-        };
-
-        let settings_a = settings_for("a.rs");
-        let settings_b = settings_for("b/b.rs");
-        let settings_c = settings_for("c.js");
-        let settings_readme = settings_for("README.json");
-
-        // .editorconfig overrides .zed/settings
-        assert_eq!(Some(settings_a.tab_size), NonZeroU32::new(3));
-        assert_eq!(settings_a.hard_tabs, true);
-        assert_eq!(settings_a.ensure_final_newline_on_save, true);
-        assert_eq!(settings_a.remove_trailing_whitespace_on_save, true);
-        assert_eq!(settings_a.preferred_line_length, 120);
-
-        // .editorconfig in b/ overrides .editorconfig in root
-        assert_eq!(Some(settings_b.tab_size), NonZeroU32::new(2));
-
-        // "indent_size" is not set, so "tab_width" is used
-        assert_eq!(Some(settings_c.tab_size), NonZeroU32::new(10));
-
-        // When max_line_length is "off", default to .zed/settings.json
-        assert_eq!(settings_b.preferred_line_length, 64);
-        assert_eq!(settings_c.preferred_line_length, 64);
-
-        // README.md should not be affected by .editorconfig's globe "*.rs"
-        assert_eq!(Some(settings_readme.tab_size), NonZeroU32::new(8));
-    });
-}
-
-#[gpui::test]
-async fn test_git_provider_project_setting(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-    cx.update(|cx| {
-        GitHostingProviderRegistry::default_global(cx);
-        git_hosting_providers::init(cx);
-    });
-
-    let fs = FakeFs::new(cx.executor());
-    let str_path = path!("/dir");
-    let path = Path::new(str_path);
-
-    fs.insert_tree(
-        path!("/dir"),
-        json!({
-            ".zed": {
-                "settings.json": r#"{
-                    "git_hosting_providers": [
-                        {
-                            "provider": "gitlab",
-                            "base_url": "https://google.com",
-                            "name": "foo"
-                        }
-                    ]
-                }"#
-            },
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-    let (_worktree, _) =
-        project.read_with(cx, |project, cx| project.find_worktree(path, cx).unwrap());
-    cx.executor().run_until_parked();
-
-    cx.update(|cx| {
-        let provider = GitHostingProviderRegistry::global(cx);
-        assert!(
-            provider
-                .list_hosting_providers()
-                .into_iter()
-                .any(|provider| provider.name() == "foo")
-        );
-    });
-
-    fs.atomic_write(
-        Path::new(path!("/dir/.zed/settings.json")).to_owned(),
-        "{}".into(),
-    )
-    .await
-    .unwrap();
-
-    cx.run_until_parked();
-
-    cx.update(|cx| {
-        let provider = GitHostingProviderRegistry::global(cx);
-        assert!(
-            !provider
-                .list_hosting_providers()
-                .into_iter()
-                .any(|provider| provider.name() == "foo")
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_managing_project_specific_settings(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-    TaskStore::init(None);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/dir"),
-        json!({
-            ".zed": {
-                "settings.json": r#"{ "tab_size": 8 }"#,
-                "tasks.json": r#"[{
-                    "label": "cargo check all",
-                    "command": "cargo",
-                    "args": ["check", "--all"]
-                },]"#,
-            },
-            "a": {
-                "a.rs": "fn a() {\n    A\n}"
-            },
-            "b": {
-                ".zed": {
-                    "settings.json": r#"{ "tab_size": 2 }"#,
-                    "tasks.json": r#"[{
-                        "label": "cargo check",
-                        "command": "cargo",
-                        "args": ["check"]
-                    },]"#,
-                },
-                "b.rs": "fn b() {\n  B\n}"
-            }
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-    let worktree = project.update(cx, |project, cx| project.worktrees(cx).next().unwrap());
-
-    cx.executor().run_until_parked();
-    let worktree_id = cx.update(|cx| {
-        project.update(cx, |project, cx| {
-            project.worktrees(cx).next().unwrap().read(cx).id()
-        })
-    });
-
-    let mut task_contexts = TaskContexts::default();
-    task_contexts.active_worktree_context = Some((worktree_id, TaskContext::default()));
-    let task_contexts = Arc::new(task_contexts);
-
-    let topmost_local_task_source_kind = TaskSourceKind::Worktree {
-        id: worktree_id,
-        directory_in_worktree: rel_path(".zed").into(),
-        id_base: "local worktree tasks from directory \".zed\"".into(),
-    };
-
-    let all_tasks = cx
-        .update(|cx| {
-            let tree = worktree.read(cx);
-
-            let file_a = File::for_entry(
-                tree.entry_for_path(rel_path("a/a.rs")).unwrap().clone(),
-                worktree.clone(),
-            ) as _;
-            let settings_a = language_settings(None, Some(&file_a), cx);
-            let file_b = File::for_entry(
-                tree.entry_for_path(rel_path("b/b.rs")).unwrap().clone(),
-                worktree.clone(),
-            ) as _;
-            let settings_b = language_settings(None, Some(&file_b), cx);
-
-            assert_eq!(settings_a.tab_size.get(), 8);
-            assert_eq!(settings_b.tab_size.get(), 2);
-
-            get_all_tasks(&project, task_contexts.clone(), cx)
-        })
-        .await
-        .into_iter()
-        .map(|(source_kind, task)| {
-            let resolved = task.resolved;
-            (
-                source_kind,
-                task.resolved_label,
-                resolved.args,
-                resolved.env,
-            )
-        })
-        .collect::<Vec<_>>();
-    assert_eq!(
-        all_tasks,
-        vec![
-            (
-                TaskSourceKind::Worktree {
-                    id: worktree_id,
-                    directory_in_worktree: rel_path("b/.zed").into(),
-                    id_base: "local worktree tasks from directory \"b/.zed\"".into()
-                },
-                "cargo check".to_string(),
-                vec!["check".to_string()],
-                HashMap::default(),
-            ),
-            (
-                topmost_local_task_source_kind.clone(),
-                "cargo check all".to_string(),
-                vec!["check".to_string(), "--all".to_string()],
-                HashMap::default(),
-            ),
-        ]
-    );
-
-    let (_, resolved_task) = cx
-        .update(|cx| get_all_tasks(&project, task_contexts.clone(), cx))
-        .await
-        .into_iter()
-        .find(|(source_kind, _)| source_kind == &topmost_local_task_source_kind)
-        .expect("should have one global task");
-    project.update(cx, |project, cx| {
-        let task_inventory = project
-            .task_store
-            .read(cx)
-            .task_inventory()
-            .cloned()
-            .unwrap();
-        task_inventory.update(cx, |inventory, _| {
-            inventory.task_scheduled(topmost_local_task_source_kind.clone(), resolved_task);
-            inventory
-                .update_file_based_tasks(
-                    TaskSettingsLocation::Global(tasks_file()),
-                    Some(
-                        &json!([{
-                            "label": "cargo check unstable",
-                            "command": "cargo",
-                            "args": [
-                                "check",
-                                "--all",
-                                "--all-targets"
-                            ],
-                            "env": {
-                                "RUSTFLAGS": "-Zunstable-options"
-                            }
-                        }])
-                        .to_string(),
-                    ),
-                )
-                .unwrap();
-        });
-    });
-    cx.run_until_parked();
-
-    let all_tasks = cx
-        .update(|cx| get_all_tasks(&project, task_contexts.clone(), cx))
-        .await
-        .into_iter()
-        .map(|(source_kind, task)| {
-            let resolved = task.resolved;
-            (
-                source_kind,
-                task.resolved_label,
-                resolved.args,
-                resolved.env,
-            )
-        })
-        .collect::<Vec<_>>();
-    assert_eq!(
-        all_tasks,
-        vec![
-            (
-                topmost_local_task_source_kind.clone(),
-                "cargo check all".to_string(),
-                vec!["check".to_string(), "--all".to_string()],
-                HashMap::default(),
-            ),
-            (
-                TaskSourceKind::Worktree {
-                    id: worktree_id,
-                    directory_in_worktree: rel_path("b/.zed").into(),
-                    id_base: "local worktree tasks from directory \"b/.zed\"".into()
-                },
-                "cargo check".to_string(),
-                vec!["check".to_string()],
-                HashMap::default(),
-            ),
-            (
-                TaskSourceKind::AbsPath {
-                    abs_path: paths::tasks_file().clone(),
-                    id_base: "global tasks.json".into(),
-                },
-                "cargo check unstable".to_string(),
-                vec![
-                    "check".to_string(),
-                    "--all".to_string(),
-                    "--all-targets".to_string(),
-                ],
-                HashMap::from_iter(Some((
-                    "RUSTFLAGS".to_string(),
-                    "-Zunstable-options".to_string()
-                ))),
-            ),
-        ]
-    );
-}
-
-#[gpui::test]
-async fn test_fallback_to_single_worktree_tasks(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-    TaskStore::init(None);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/dir"),
-        json!({
-            ".zed": {
-                "tasks.json": r#"[{
-                    "label": "test worktree root",
-                    "command": "echo $ZED_WORKTREE_ROOT"
-                }]"#,
-            },
-            "a": {
-                "a.rs": "fn a() {\n    A\n}"
-            },
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-    let _worktree = project.update(cx, |project, cx| project.worktrees(cx).next().unwrap());
-
-    cx.executor().run_until_parked();
-    let worktree_id = cx.update(|cx| {
-        project.update(cx, |project, cx| {
-            project.worktrees(cx).next().unwrap().read(cx).id()
-        })
-    });
-
-    let active_non_worktree_item_tasks = cx
-        .update(|cx| {
-            get_all_tasks(
-                &project,
-                Arc::new(TaskContexts {
-                    active_item_context: Some((Some(worktree_id), None, TaskContext::default())),
-                    active_worktree_context: None,
-                    other_worktree_contexts: Vec::new(),
-                    lsp_task_sources: HashMap::default(),
-                    latest_selection: None,
-                }),
-                cx,
-            )
-        })
-        .await;
-    assert!(
-        active_non_worktree_item_tasks.is_empty(),
-        "A task can not be resolved with context with no ZED_WORKTREE_ROOT data"
-    );
-
-    let active_worktree_tasks = cx
-        .update(|cx| {
-            get_all_tasks(
-                &project,
-                Arc::new(TaskContexts {
-                    active_item_context: Some((Some(worktree_id), None, TaskContext::default())),
-                    active_worktree_context: Some((worktree_id, {
-                        let mut worktree_context = TaskContext::default();
-                        worktree_context
-                            .task_variables
-                            .insert(task::VariableName::WorktreeRoot, "/dir".to_string());
-                        worktree_context
-                    })),
-                    other_worktree_contexts: Vec::new(),
-                    lsp_task_sources: HashMap::default(),
-                    latest_selection: None,
-                }),
-                cx,
-            )
-        })
-        .await;
-    assert_eq!(
-        active_worktree_tasks
-            .into_iter()
-            .map(|(source_kind, task)| {
-                let resolved = task.resolved;
-                (source_kind, resolved.command.unwrap())
-            })
-            .collect::<Vec<_>>(),
-        vec![(
-            TaskSourceKind::Worktree {
-                id: worktree_id,
-                directory_in_worktree: rel_path(".zed").into(),
-                id_base: "local worktree tasks from directory \".zed\"".into(),
-            },
-            "echo /dir".to_string(),
-        )]
-    );
-}
-
-#[gpui::test]
-async fn test_running_multiple_instances_of_a_single_server_in_one_worktree(
-    cx: &mut gpui::TestAppContext,
-) {
-    pub(crate) struct PyprojectTomlManifestProvider;
-
-    impl ManifestProvider for PyprojectTomlManifestProvider {
-        fn name(&self) -> ManifestName {
-            SharedString::new_static("pyproject.toml").into()
-        }
-
-        fn search(
-            &self,
-            ManifestQuery {
-                path,
-                depth,
-                delegate,
-            }: ManifestQuery,
-        ) -> Option<Arc<RelPath>> {
-            for path in path.ancestors().take(depth) {
-                let p = path.join(rel_path("pyproject.toml"));
-                if delegate.exists(&p, Some(false)) {
-                    return Some(path.into());
-                }
-            }
-
-            None
-        }
-    }
-
-    init_test(cx);
-    let fs = FakeFs::new(cx.executor());
-
-    fs.insert_tree(
-        path!("/the-root"),
-        json!({
-            ".zed": {
-                "settings.json": r#"
-                {
-                    "languages": {
-                        "Python": {
-                            "language_servers": ["ty"]
-                        }
-                    }
-                }"#
-            },
-            "project-a": {
-                ".venv": {},
-                "file.py": "",
-                "pyproject.toml": ""
-            },
-            "project-b": {
-                ".venv": {},
-                "source_file.py":"",
-                "another_file.py": "",
-                "pyproject.toml": ""
-            }
-        }),
-    )
-    .await;
-    cx.update(|cx| {
-        ManifestProvidersStore::global(cx).register(Arc::new(PyprojectTomlManifestProvider))
-    });
-
-    let project = Project::test(fs.clone(), [path!("/the-root").as_ref()], cx).await;
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-    let _fake_python_server = language_registry.register_fake_lsp(
-        "Python",
-        FakeLspAdapter {
-            name: "ty",
-            capabilities: lsp::ServerCapabilities {
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-    );
-
-    language_registry.add(python_lang(fs.clone()));
-    let (first_buffer, _handle) = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer_with_lsp(path!("/the-root/project-a/file.py"), cx)
-        })
-        .await
-        .unwrap();
-    cx.executor().run_until_parked();
-    let servers = project.update(cx, |project, cx| {
-        project.lsp_store.update(cx, |this, cx| {
-            first_buffer.update(cx, |buffer, cx| {
-                this.running_language_servers_for_local_buffer(buffer, cx)
-                    .map(|(adapter, server)| (adapter.clone(), server.clone()))
-                    .collect::<Vec<_>>()
-            })
-        })
-    });
-    cx.executor().run_until_parked();
-    assert_eq!(servers.len(), 1);
-    let (adapter, server) = servers.into_iter().next().unwrap();
-    assert_eq!(adapter.name(), LanguageServerName::new_static("ty"));
-    assert_eq!(server.server_id(), LanguageServerId(0));
-    // `workspace_folders` are set to the rooting point.
-    assert_eq!(
-        server.workspace_folders(),
-        BTreeSet::from_iter(
-            [Uri::from_file_path(path!("/the-root/project-a")).unwrap()].into_iter()
-        )
-    );
-
-    let (second_project_buffer, _other_handle) = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer_with_lsp(path!("/the-root/project-b/source_file.py"), cx)
-        })
-        .await
-        .unwrap();
-    cx.executor().run_until_parked();
-    let servers = project.update(cx, |project, cx| {
-        project.lsp_store.update(cx, |this, cx| {
-            second_project_buffer.update(cx, |buffer, cx| {
-                this.running_language_servers_for_local_buffer(buffer, cx)
-                    .map(|(adapter, server)| (adapter.clone(), server.clone()))
-                    .collect::<Vec<_>>()
-            })
-        })
-    });
-    cx.executor().run_until_parked();
-    assert_eq!(servers.len(), 1);
-    let (adapter, server) = servers.into_iter().next().unwrap();
-    assert_eq!(adapter.name(), LanguageServerName::new_static("ty"));
-    // We're not using venvs at all here, so both folders should fall under the same root.
-    assert_eq!(server.server_id(), LanguageServerId(0));
-    // Now, let's select a different toolchain for one of subprojects.
-
-    let Toolchains {
-        toolchains: available_toolchains_for_b,
-        root_path,
-        ..
-    } = project
-        .update(cx, |this, cx| {
-            let worktree_id = this.worktrees(cx).next().unwrap().read(cx).id();
-            this.available_toolchains(
-                ProjectPath {
-                    worktree_id,
-                    path: rel_path("project-b/source_file.py").into(),
-                },
-                LanguageName::new_static("Python"),
-                cx,
-            )
-        })
-        .await
-        .expect("A toolchain to be discovered");
-    assert_eq!(root_path.as_ref(), rel_path("project-b"));
-    assert_eq!(available_toolchains_for_b.toolchains().len(), 1);
-    let currently_active_toolchain = project
-        .update(cx, |this, cx| {
-            let worktree_id = this.worktrees(cx).next().unwrap().read(cx).id();
-            this.active_toolchain(
-                ProjectPath {
-                    worktree_id,
-                    path: rel_path("project-b/source_file.py").into(),
-                },
-                LanguageName::new_static("Python"),
-                cx,
-            )
-        })
-        .await;
-
-    assert!(currently_active_toolchain.is_none());
-    let _ = project
-        .update(cx, |this, cx| {
-            let worktree_id = this.worktrees(cx).next().unwrap().read(cx).id();
-            this.activate_toolchain(
-                ProjectPath {
-                    worktree_id,
-                    path: root_path,
-                },
-                available_toolchains_for_b
-                    .toolchains
-                    .into_iter()
-                    .next()
-                    .unwrap(),
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-    cx.run_until_parked();
-    let servers = project.update(cx, |project, cx| {
-        project.lsp_store.update(cx, |this, cx| {
-            second_project_buffer.update(cx, |buffer, cx| {
-                this.running_language_servers_for_local_buffer(buffer, cx)
-                    .map(|(adapter, server)| (adapter.clone(), server.clone()))
-                    .collect::<Vec<_>>()
-            })
-        })
-    });
-    cx.executor().run_until_parked();
-    assert_eq!(servers.len(), 1);
-    let (adapter, server) = servers.into_iter().next().unwrap();
-    assert_eq!(adapter.name(), LanguageServerName::new_static("ty"));
-    // There's a new language server in town.
-    assert_eq!(server.server_id(), LanguageServerId(1));
-}
-
-#[gpui::test]
-async fn test_managing_language_servers(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/dir"),
-        json!({
-            "test.rs": "const A: i32 = 1;",
-            "test2.rs": "",
-            "Cargo.toml": "a = 1",
-            "package.json": "{\"a\": 1}",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-
-    let mut fake_rust_servers = language_registry.register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            name: "the-rust-language-server",
-            capabilities: lsp::ServerCapabilities {
-                completion_provider: Some(lsp::CompletionOptions {
-                    trigger_characters: Some(vec![".".to_string(), "::".to_string()]),
-                    ..Default::default()
-                }),
-                text_document_sync: Some(lsp::TextDocumentSyncCapability::Options(
-                    lsp::TextDocumentSyncOptions {
-                        save: Some(lsp::TextDocumentSyncSaveOptions::Supported(true)),
-                        ..Default::default()
-                    },
-                )),
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-    );
-    let mut fake_json_servers = language_registry.register_fake_lsp(
-        "JSON",
-        FakeLspAdapter {
-            name: "the-json-language-server",
-            capabilities: lsp::ServerCapabilities {
-                completion_provider: Some(lsp::CompletionOptions {
-                    trigger_characters: Some(vec![":".to_string()]),
-                    ..Default::default()
-                }),
-                text_document_sync: Some(lsp::TextDocumentSyncCapability::Options(
-                    lsp::TextDocumentSyncOptions {
-                        save: Some(lsp::TextDocumentSyncSaveOptions::Supported(true)),
-                        ..Default::default()
-                    },
-                )),
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-    );
-
-    // Open a buffer without an associated language server.
-    let (toml_buffer, _handle) = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer_with_lsp(path!("/dir/Cargo.toml"), cx)
-        })
-        .await
-        .unwrap();
-
-    // Open a buffer with an associated language server before the language for it has been loaded.
-    let (rust_buffer, _handle2) = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer_with_lsp(path!("/dir/test.rs"), cx)
-        })
-        .await
-        .unwrap();
-    rust_buffer.update(cx, |buffer, _| {
-        assert_eq!(buffer.language().map(|l| l.name()), None);
-    });
-
-    // Now we add the languages to the project, and ensure they get assigned to all
-    // the relevant open buffers.
-    language_registry.add(json_lang());
-    language_registry.add(rust_lang());
-    cx.executor().run_until_parked();
-    rust_buffer.update(cx, |buffer, _| {
-        assert_eq!(buffer.language().map(|l| l.name()), Some("Rust".into()));
-    });
-
-    // A server is started up, and it is notified about Rust files.
-    let mut fake_rust_server = fake_rust_servers.next().await.unwrap();
-    assert_eq!(
-        fake_rust_server
-            .receive_notification::<lsp::notification::DidOpenTextDocument>()
-            .await
-            .text_document,
-        lsp::TextDocumentItem {
-            uri: lsp::Uri::from_file_path(path!("/dir/test.rs")).unwrap(),
-            version: 0,
-            text: "const A: i32 = 1;".to_string(),
-            language_id: "rust".to_string(),
-        }
-    );
-
-    // The buffer is configured based on the language server's capabilities.
-    rust_buffer.update(cx, |buffer, _| {
-        assert_eq!(
-            buffer
-                .completion_triggers()
-                .iter()
-                .cloned()
-                .collect::<Vec<_>>(),
-            &[".".to_string(), "::".to_string()]
-        );
-    });
-    toml_buffer.update(cx, |buffer, _| {
-        assert!(buffer.completion_triggers().is_empty());
-    });
-
-    // Edit a buffer. The changes are reported to the language server.
-    rust_buffer.update(cx, |buffer, cx| buffer.edit([(16..16, "2")], None, cx));
-    assert_eq!(
-        fake_rust_server
-            .receive_notification::<lsp::notification::DidChangeTextDocument>()
-            .await
-            .text_document,
-        lsp::VersionedTextDocumentIdentifier::new(
-            lsp::Uri::from_file_path(path!("/dir/test.rs")).unwrap(),
-            1
-        )
-    );
-
-    // Open a third buffer with a different associated language server.
-    let (json_buffer, _json_handle) = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer_with_lsp(path!("/dir/package.json"), cx)
-        })
-        .await
-        .unwrap();
-
-    // A json language server is started up and is only notified about the json buffer.
-    let mut fake_json_server = fake_json_servers.next().await.unwrap();
-    assert_eq!(
-        fake_json_server
-            .receive_notification::<lsp::notification::DidOpenTextDocument>()
-            .await
-            .text_document,
-        lsp::TextDocumentItem {
-            uri: lsp::Uri::from_file_path(path!("/dir/package.json")).unwrap(),
-            version: 0,
-            text: "{\"a\": 1}".to_string(),
-            language_id: "json".to_string(),
-        }
-    );
-
-    // This buffer is configured based on the second language server's
-    // capabilities.
-    json_buffer.update(cx, |buffer, _| {
-        assert_eq!(
-            buffer
-                .completion_triggers()
-                .iter()
-                .cloned()
-                .collect::<Vec<_>>(),
-            &[":".to_string()]
-        );
-    });
-
-    // When opening another buffer whose language server is already running,
-    // it is also configured based on the existing language server's capabilities.
-    let (rust_buffer2, _handle4) = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer_with_lsp(path!("/dir/test2.rs"), cx)
-        })
-        .await
-        .unwrap();
-    rust_buffer2.update(cx, |buffer, _| {
-        assert_eq!(
-            buffer
-                .completion_triggers()
-                .iter()
-                .cloned()
-                .collect::<Vec<_>>(),
-            &[".".to_string(), "::".to_string()]
-        );
-    });
-
-    // Changes are reported only to servers matching the buffer's language.
-    toml_buffer.update(cx, |buffer, cx| buffer.edit([(5..5, "23")], None, cx));
-    rust_buffer2.update(cx, |buffer, cx| {
-        buffer.edit([(0..0, "let x = 1;")], None, cx)
-    });
-    assert_eq!(
-        fake_rust_server
-            .receive_notification::<lsp::notification::DidChangeTextDocument>()
-            .await
-            .text_document,
-        lsp::VersionedTextDocumentIdentifier::new(
-            lsp::Uri::from_file_path(path!("/dir/test2.rs")).unwrap(),
-            1
-        )
-    );
-
-    // Save notifications are reported to all servers.
-    project
-        .update(cx, |project, cx| project.save_buffer(toml_buffer, cx))
-        .await
-        .unwrap();
-    assert_eq!(
-        fake_rust_server
-            .receive_notification::<lsp::notification::DidSaveTextDocument>()
-            .await
-            .text_document,
-        lsp::TextDocumentIdentifier::new(
-            lsp::Uri::from_file_path(path!("/dir/Cargo.toml")).unwrap()
-        )
-    );
-    assert_eq!(
-        fake_json_server
-            .receive_notification::<lsp::notification::DidSaveTextDocument>()
-            .await
-            .text_document,
-        lsp::TextDocumentIdentifier::new(
-            lsp::Uri::from_file_path(path!("/dir/Cargo.toml")).unwrap()
-        )
-    );
-
-    // Renames are reported only to servers matching the buffer's language.
-    fs.rename(
-        Path::new(path!("/dir/test2.rs")),
-        Path::new(path!("/dir/test3.rs")),
-        Default::default(),
-    )
-    .await
-    .unwrap();
-    assert_eq!(
-        fake_rust_server
-            .receive_notification::<lsp::notification::DidCloseTextDocument>()
-            .await
-            .text_document,
-        lsp::TextDocumentIdentifier::new(lsp::Uri::from_file_path(path!("/dir/test2.rs")).unwrap()),
-    );
-    assert_eq!(
-        fake_rust_server
-            .receive_notification::<lsp::notification::DidOpenTextDocument>()
-            .await
-            .text_document,
-        lsp::TextDocumentItem {
-            uri: lsp::Uri::from_file_path(path!("/dir/test3.rs")).unwrap(),
-            version: 0,
-            text: rust_buffer2.update(cx, |buffer, _| buffer.text()),
-            language_id: "rust".to_string(),
-        },
-    );
-
-    rust_buffer2.update(cx, |buffer, cx| {
-        buffer.update_diagnostics(
-            LanguageServerId(0),
-            DiagnosticSet::from_sorted_entries(
-                vec![DiagnosticEntry {
-                    diagnostic: Default::default(),
-                    range: Anchor::MIN..Anchor::MAX,
-                }],
-                &buffer.snapshot(),
-            ),
-            cx,
-        );
-        assert_eq!(
-            buffer
-                .snapshot()
-                .diagnostics_in_range::<_, usize>(0..buffer.len(), false)
-                .count(),
-            1
-        );
-    });
-
-    // When the rename changes the extension of the file, the buffer gets closed on the old
-    // language server and gets opened on the new one.
-    fs.rename(
-        Path::new(path!("/dir/test3.rs")),
-        Path::new(path!("/dir/test3.json")),
-        Default::default(),
-    )
-    .await
-    .unwrap();
-    assert_eq!(
-        fake_rust_server
-            .receive_notification::<lsp::notification::DidCloseTextDocument>()
-            .await
-            .text_document,
-        lsp::TextDocumentIdentifier::new(lsp::Uri::from_file_path(path!("/dir/test3.rs")).unwrap()),
-    );
-    assert_eq!(
-        fake_json_server
-            .receive_notification::<lsp::notification::DidOpenTextDocument>()
-            .await
-            .text_document,
-        lsp::TextDocumentItem {
-            uri: lsp::Uri::from_file_path(path!("/dir/test3.json")).unwrap(),
-            version: 0,
-            text: rust_buffer2.update(cx, |buffer, _| buffer.text()),
-            language_id: "json".to_string(),
-        },
-    );
-
-    // We clear the diagnostics, since the language has changed.
-    rust_buffer2.update(cx, |buffer, _| {
-        assert_eq!(
-            buffer
-                .snapshot()
-                .diagnostics_in_range::<_, usize>(0..buffer.len(), false)
-                .count(),
-            0
-        );
-    });
-
-    // The renamed file's version resets after changing language server.
-    rust_buffer2.update(cx, |buffer, cx| buffer.edit([(0..0, "// ")], None, cx));
-    assert_eq!(
-        fake_json_server
-            .receive_notification::<lsp::notification::DidChangeTextDocument>()
-            .await
-            .text_document,
-        lsp::VersionedTextDocumentIdentifier::new(
-            lsp::Uri::from_file_path(path!("/dir/test3.json")).unwrap(),
-            1
-        )
-    );
-
-    // Restart language servers
-    project.update(cx, |project, cx| {
-        project.restart_language_servers_for_buffers(
-            vec![rust_buffer.clone(), json_buffer.clone()],
-            HashSet::default(),
-            cx,
-        );
-    });
-
-    let mut rust_shutdown_requests = fake_rust_server
-        .set_request_handler::<lsp::request::Shutdown, _, _>(|_, _| future::ready(Ok(())));
-    let mut json_shutdown_requests = fake_json_server
-        .set_request_handler::<lsp::request::Shutdown, _, _>(|_, _| future::ready(Ok(())));
-    futures::join!(rust_shutdown_requests.next(), json_shutdown_requests.next());
-
-    let mut fake_rust_server = fake_rust_servers.next().await.unwrap();
-    let mut fake_json_server = fake_json_servers.next().await.unwrap();
-
-    // Ensure rust document is reopened in new rust language server
-    assert_eq!(
-        fake_rust_server
-            .receive_notification::<lsp::notification::DidOpenTextDocument>()
-            .await
-            .text_document,
-        lsp::TextDocumentItem {
-            uri: lsp::Uri::from_file_path(path!("/dir/test.rs")).unwrap(),
-            version: 0,
-            text: rust_buffer.update(cx, |buffer, _| buffer.text()),
-            language_id: "rust".to_string(),
-        }
-    );
-
-    // Ensure json documents are reopened in new json language server
-    assert_set_eq!(
-        [
-            fake_json_server
-                .receive_notification::<lsp::notification::DidOpenTextDocument>()
-                .await
-                .text_document,
-            fake_json_server
-                .receive_notification::<lsp::notification::DidOpenTextDocument>()
-                .await
-                .text_document,
-        ],
-        [
-            lsp::TextDocumentItem {
-                uri: lsp::Uri::from_file_path(path!("/dir/package.json")).unwrap(),
-                version: 0,
-                text: json_buffer.update(cx, |buffer, _| buffer.text()),
-                language_id: "json".to_string(),
-            },
-            lsp::TextDocumentItem {
-                uri: lsp::Uri::from_file_path(path!("/dir/test3.json")).unwrap(),
-                version: 0,
-                text: rust_buffer2.update(cx, |buffer, _| buffer.text()),
-                language_id: "json".to_string(),
-            }
-        ]
-    );
-
-    // Close notifications are reported only to servers matching the buffer's language.
-    cx.update(|_| drop(_json_handle));
-    let close_message = lsp::DidCloseTextDocumentParams {
-        text_document: lsp::TextDocumentIdentifier::new(
-            lsp::Uri::from_file_path(path!("/dir/package.json")).unwrap(),
-        ),
-    };
-    assert_eq!(
-        fake_json_server
-            .receive_notification::<lsp::notification::DidCloseTextDocument>()
-            .await,
-        close_message,
-    );
-}
-
-#[gpui::test]
-async fn test_language_server_relative_path(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let settings_json_contents = json!({
-        "languages": {
-            "Rust": {
-                "language_servers": ["my_fake_lsp", "lsp_on_path"]
-            }
-        },
-        "lsp": {
-            "my_fake_lsp": {
-                "binary": {
-                    // file exists, so this is treated as a relative path
-                    "path": path!(".relative_path/to/my_fake_lsp_binary.exe").to_string(),
-                }
-            },
-            "lsp_on_path": {
-                "binary": {
-                    // file doesn't exist, so it will fall back on PATH env var
-                    "path": path!("lsp_on_path.exe").to_string(),
-                }
-            }
-        },
-    });
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/the-root"),
-        json!({
-            ".zed": {
-                "settings.json": settings_json_contents.to_string(),
-            },
-            ".relative_path": {
-                "to": {
-                    "my_fake_lsp.exe": "",
-                },
-            },
-            "src": {
-                "main.rs": "",
-            }
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), [path!("/the-root").as_ref()], cx).await;
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-    language_registry.add(rust_lang());
-
-    let mut my_fake_lsp = language_registry.register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            name: "my_fake_lsp",
-            ..Default::default()
-        },
-    );
-    let mut lsp_on_path = language_registry.register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            name: "lsp_on_path",
-            ..Default::default()
-        },
-    );
-
-    cx.run_until_parked();
-
-    // Start the language server by opening a buffer with a compatible file extension.
-    project
-        .update(cx, |project, cx| {
-            project.open_local_buffer_with_lsp(path!("/the-root/src/main.rs"), cx)
-        })
-        .await
-        .unwrap();
-
-    let lsp_path = my_fake_lsp.next().await.unwrap().binary.path;
-    assert_eq!(
-        lsp_path.to_string_lossy(),
-        path!("/the-root/.relative_path/to/my_fake_lsp_binary.exe"),
-    );
-
-    let lsp_path = lsp_on_path.next().await.unwrap().binary.path;
-    assert_eq!(lsp_path.to_string_lossy(), path!("lsp_on_path.exe"));
-}
-
-#[gpui::test]
-async fn test_language_server_tilde_path(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let settings_json_contents = json!({
-        "languages": {
-            "Rust": {
-                "language_servers": ["tilde_lsp"]
-            }
-        },
-        "lsp": {
-            "tilde_lsp": {
-                "binary": {
-                    "path": "~/.local/bin/rust-analyzer",
-                }
-            }
-        },
-    });
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/root"),
-        json!({
-            ".zed": {
-                "settings.json": settings_json_contents.to_string(),
-            },
-            "src": {
-                "main.rs": "fn main() {}",
-            }
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-    language_registry.add(rust_lang());
-
-    let mut tilde_lsp = language_registry.register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            name: "tilde_lsp",
-            ..Default::default()
-        },
-    );
-    cx.run_until_parked();
-
-    project
-        .update(cx, |project, cx| {
-            project.open_local_buffer_with_lsp(path!("/root/src/main.rs"), cx)
-        })
-        .await
-        .unwrap();
-
-    let lsp_path = tilde_lsp.next().await.unwrap().binary.path;
-    let expected_path = paths::home_dir().join(".local/bin/rust-analyzer");
-    assert_eq!(
-        lsp_path, expected_path,
-        "Tilde path should expand to home directory"
-    );
-}
-
-#[gpui::test]
-async fn test_reporting_fs_changes_to_language_servers(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/the-root"),
-        json!({
-            ".gitignore": "target\n",
-            "Cargo.lock": "",
-            "src": {
-                "a.rs": "",
-                "b.rs": "",
-            },
-            "target": {
-                "x": {
-                    "out": {
-                        "x.rs": ""
-                    }
-                },
-                "y": {
-                    "out": {
-                        "y.rs": "",
-                    }
-                },
-                "z": {
-                    "out": {
-                        "z.rs": ""
-                    }
-                }
-            }
-        }),
-    )
-    .await;
-    fs.insert_tree(
-        path!("/the-registry"),
-        json!({
-            "dep1": {
-                "src": {
-                    "dep1.rs": "",
-                }
-            },
-            "dep2": {
-                "src": {
-                    "dep2.rs": "",
-                }
-            },
-        }),
-    )
-    .await;
-    fs.insert_tree(
-        path!("/the/stdlib"),
-        json!({
-            "LICENSE": "",
-            "src": {
-                "string.rs": "",
-            }
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), [path!("/the-root").as_ref()], cx).await;
-    let (language_registry, lsp_store) = project.read_with(cx, |project, _| {
-        (project.languages().clone(), project.lsp_store())
-    });
-    language_registry.add(rust_lang());
-    let mut fake_servers = language_registry.register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            name: "the-language-server",
-            ..Default::default()
-        },
-    );
-
-    cx.executor().run_until_parked();
-
-    // Start the language server by opening a buffer with a compatible file extension.
-    project
-        .update(cx, |project, cx| {
-            project.open_local_buffer_with_lsp(path!("/the-root/src/a.rs"), cx)
-        })
-        .await
-        .unwrap();
-
-    // Initially, we don't load ignored files because the language server has not explicitly asked us to watch them.
-    project.update(cx, |project, cx| {
-        let worktree = project.worktrees(cx).next().unwrap();
-        assert_eq!(
-            worktree
-                .read(cx)
-                .snapshot()
-                .entries(true, 0)
-                .map(|entry| (entry.path.as_unix_str(), entry.is_ignored))
-                .collect::<Vec<_>>(),
-            &[
-                ("", false),
-                (".gitignore", false),
-                ("Cargo.lock", false),
-                ("src", false),
-                ("src/a.rs", false),
-                ("src/b.rs", false),
-                ("target", true),
-            ]
-        );
-    });
-
-    let prev_read_dir_count = fs.read_dir_call_count();
-
-    let fake_server = fake_servers.next().await.unwrap();
-    let server_id = lsp_store.read_with(cx, |lsp_store, _| {
-        let (id, _) = lsp_store.language_server_statuses().next().unwrap();
-        id
-    });
-
-    // Simulate jumping to a definition in a dependency outside of the worktree.
-    let _out_of_worktree_buffer = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer_via_lsp(
-                lsp::Uri::from_file_path(path!("/the-registry/dep1/src/dep1.rs")).unwrap(),
-                server_id,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-
-    // Keep track of the FS events reported to the language server.
-    let file_changes = Arc::new(Mutex::new(Vec::new()));
-    fake_server
-        .request::<lsp::request::RegisterCapability>(lsp::RegistrationParams {
-            registrations: vec![lsp::Registration {
-                id: Default::default(),
-                method: "workspace/didChangeWatchedFiles".to_string(),
-                register_options: serde_json::to_value(
-                    lsp::DidChangeWatchedFilesRegistrationOptions {
-                        watchers: vec![
-                            lsp::FileSystemWatcher {
-                                glob_pattern: lsp::GlobPattern::String(
-                                    path!("/the-root/Cargo.toml").to_string(),
-                                ),
-                                kind: None,
-                            },
-                            lsp::FileSystemWatcher {
-                                glob_pattern: lsp::GlobPattern::String(
-                                    path!("/the-root/src/*.{rs,c}").to_string(),
-                                ),
-                                kind: None,
-                            },
-                            lsp::FileSystemWatcher {
-                                glob_pattern: lsp::GlobPattern::String(
-                                    path!("/the-root/target/y/**/*.rs").to_string(),
-                                ),
-                                kind: None,
-                            },
-                            lsp::FileSystemWatcher {
-                                glob_pattern: lsp::GlobPattern::String(
-                                    path!("/the/stdlib/src/**/*.rs").to_string(),
-                                ),
-                                kind: None,
-                            },
-                            lsp::FileSystemWatcher {
-                                glob_pattern: lsp::GlobPattern::String(
-                                    path!("**/Cargo.lock").to_string(),
-                                ),
-                                kind: None,
-                            },
-                        ],
-                    },
-                )
-                .ok(),
-            }],
-        })
-        .await
-        .into_response()
-        .unwrap();
-    fake_server.handle_notification::<lsp::notification::DidChangeWatchedFiles, _>({
-        let file_changes = file_changes.clone();
-        move |params, _| {
-            let mut file_changes = file_changes.lock();
-            file_changes.extend(params.changes);
-            file_changes.sort_by(|a, b| a.uri.cmp(&b.uri));
-        }
-    });
-
-    cx.executor().run_until_parked();
-    assert_eq!(mem::take(&mut *file_changes.lock()), &[]);
-    assert_eq!(fs.read_dir_call_count() - prev_read_dir_count, 4);
-
-    let mut new_watched_paths = fs.watched_paths();
-    new_watched_paths.retain(|path| {
-        !path.starts_with(config_dir()) && !path.starts_with(global_gitignore_path().unwrap())
-    });
-    assert_eq!(
-        &new_watched_paths,
-        &[
-            Path::new(path!("/the-root")),
-            Path::new(path!("/the-registry/dep1/src/dep1.rs")),
-            Path::new(path!("/the/stdlib/src"))
-        ]
-    );
-
-    // Now the language server has asked us to watch an ignored directory path,
-    // so we recursively load it.
-    project.update(cx, |project, cx| {
-        let worktree = project.visible_worktrees(cx).next().unwrap();
-        assert_eq!(
-            worktree
-                .read(cx)
-                .snapshot()
-                .entries(true, 0)
-                .map(|entry| (entry.path.as_unix_str(), entry.is_ignored))
-                .collect::<Vec<_>>(),
-            &[
-                ("", false),
-                (".gitignore", false),
-                ("Cargo.lock", false),
-                ("src", false),
-                ("src/a.rs", false),
-                ("src/b.rs", false),
-                ("target", true),
-                ("target/x", true),
-                ("target/y", true),
-                ("target/y/out", true),
-                ("target/y/out/y.rs", true),
-                ("target/z", true),
-            ]
-        );
-    });
-
-    // Perform some file system mutations, two of which match the watched patterns,
-    // and one of which does not.
-    fs.create_file(path!("/the-root/src/c.rs").as_ref(), Default::default())
-        .await
-        .unwrap();
-    fs.create_file(path!("/the-root/src/d.txt").as_ref(), Default::default())
-        .await
-        .unwrap();
-    fs.remove_file(path!("/the-root/src/b.rs").as_ref(), Default::default())
-        .await
-        .unwrap();
-    fs.create_file(
-        path!("/the-root/target/x/out/x2.rs").as_ref(),
-        Default::default(),
-    )
-    .await
-    .unwrap();
-    fs.create_file(
-        path!("/the-root/target/y/out/y2.rs").as_ref(),
-        Default::default(),
-    )
-    .await
-    .unwrap();
-    fs.save(
-        path!("/the-root/Cargo.lock").as_ref(),
-        &"".into(),
-        Default::default(),
-    )
-    .await
-    .unwrap();
-    fs.save(
-        path!("/the-stdlib/LICENSE").as_ref(),
-        &"".into(),
-        Default::default(),
-    )
-    .await
-    .unwrap();
-    fs.save(
-        path!("/the/stdlib/src/string.rs").as_ref(),
-        &"".into(),
-        Default::default(),
-    )
-    .await
-    .unwrap();
-
-    // The language server receives events for the FS mutations that match its watch patterns.
-    cx.executor().run_until_parked();
-    assert_eq!(
-        &*file_changes.lock(),
-        &[
-            lsp::FileEvent {
-                uri: lsp::Uri::from_file_path(path!("/the-root/Cargo.lock")).unwrap(),
-                typ: lsp::FileChangeType::CHANGED,
-            },
-            lsp::FileEvent {
-                uri: lsp::Uri::from_file_path(path!("/the-root/src/b.rs")).unwrap(),
-                typ: lsp::FileChangeType::DELETED,
-            },
-            lsp::FileEvent {
-                uri: lsp::Uri::from_file_path(path!("/the-root/src/c.rs")).unwrap(),
-                typ: lsp::FileChangeType::CREATED,
-            },
-            lsp::FileEvent {
-                uri: lsp::Uri::from_file_path(path!("/the-root/target/y/out/y2.rs")).unwrap(),
-                typ: lsp::FileChangeType::CREATED,
-            },
-            lsp::FileEvent {
-                uri: lsp::Uri::from_file_path(path!("/the/stdlib/src/string.rs")).unwrap(),
-                typ: lsp::FileChangeType::CHANGED,
-            },
-        ]
-    );
-}
-
-#[gpui::test]
-async fn test_single_file_worktrees_diagnostics(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/dir"),
-        json!({
-            "a.rs": "let a = 1;",
-            "b.rs": "let b = 2;"
-        }),
-    )
-    .await;
-
-    let project = Project::test(
-        fs,
-        [path!("/dir/a.rs").as_ref(), path!("/dir/b.rs").as_ref()],
-        cx,
-    )
-    .await;
-    let lsp_store = project.read_with(cx, |project, _| project.lsp_store());
-
-    let buffer_a = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer(path!("/dir/a.rs"), cx)
-        })
-        .await
-        .unwrap();
-    let buffer_b = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer(path!("/dir/b.rs"), cx)
-        })
-        .await
-        .unwrap();
-
-    lsp_store.update(cx, |lsp_store, cx| {
-        lsp_store
-            .update_diagnostics(
-                LanguageServerId(0),
-                lsp::PublishDiagnosticsParams {
-                    uri: Uri::from_file_path(path!("/dir/a.rs")).unwrap(),
-                    version: None,
-                    diagnostics: vec![lsp::Diagnostic {
-                        range: lsp::Range::new(lsp::Position::new(0, 4), lsp::Position::new(0, 5)),
-                        severity: Some(lsp::DiagnosticSeverity::ERROR),
-                        message: "error 1".to_string(),
-                        ..Default::default()
-                    }],
-                },
-                None,
-                DiagnosticSourceKind::Pushed,
-                &[],
-                cx,
-            )
-            .unwrap();
-        lsp_store
-            .update_diagnostics(
-                LanguageServerId(0),
-                lsp::PublishDiagnosticsParams {
-                    uri: Uri::from_file_path(path!("/dir/b.rs")).unwrap(),
-                    version: None,
-                    diagnostics: vec![lsp::Diagnostic {
-                        range: lsp::Range::new(lsp::Position::new(0, 4), lsp::Position::new(0, 5)),
-                        severity: Some(DiagnosticSeverity::WARNING),
-                        message: "error 2".to_string(),
-                        ..Default::default()
-                    }],
-                },
-                None,
-                DiagnosticSourceKind::Pushed,
-                &[],
-                cx,
-            )
-            .unwrap();
-    });
-
-    buffer_a.update(cx, |buffer, _| {
-        let chunks = chunks_with_diagnostics(buffer, 0..buffer.len());
-        assert_eq!(
-            chunks
-                .iter()
-                .map(|(s, d)| (s.as_str(), *d))
-                .collect::<Vec<_>>(),
-            &[
-                ("let ", None),
-                ("a", Some(DiagnosticSeverity::ERROR)),
-                (" = 1;", None),
-            ]
-        );
-    });
-    buffer_b.update(cx, |buffer, _| {
-        let chunks = chunks_with_diagnostics(buffer, 0..buffer.len());
-        assert_eq!(
-            chunks
-                .iter()
-                .map(|(s, d)| (s.as_str(), *d))
-                .collect::<Vec<_>>(),
-            &[
-                ("let ", None),
-                ("b", Some(DiagnosticSeverity::WARNING)),
-                (" = 2;", None),
-            ]
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_omitted_diagnostics(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/root"),
-        json!({
-            "dir": {
-                ".git": {
-                    "HEAD": "ref: refs/heads/main",
-                },
-                ".gitignore": "b.rs",
-                "a.rs": "let a = 1;",
-                "b.rs": "let b = 2;",
-            },
-            "other.rs": "let b = c;"
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/root/dir").as_ref()], cx).await;
-    let lsp_store = project.read_with(cx, |project, _| project.lsp_store());
-    let (worktree, _) = project
-        .update(cx, |project, cx| {
-            project.find_or_create_worktree(path!("/root/dir"), true, cx)
-        })
-        .await
-        .unwrap();
-    let main_worktree_id = worktree.read_with(cx, |tree, _| tree.id());
-
-    let (worktree, _) = project
-        .update(cx, |project, cx| {
-            project.find_or_create_worktree(path!("/root/other.rs"), false, cx)
-        })
-        .await
-        .unwrap();
-    let other_worktree_id = worktree.update(cx, |tree, _| tree.id());
-
-    let server_id = LanguageServerId(0);
-    lsp_store.update(cx, |lsp_store, cx| {
-        lsp_store
-            .update_diagnostics(
-                server_id,
-                lsp::PublishDiagnosticsParams {
-                    uri: Uri::from_file_path(path!("/root/dir/b.rs")).unwrap(),
-                    version: None,
-                    diagnostics: vec![lsp::Diagnostic {
-                        range: lsp::Range::new(lsp::Position::new(0, 4), lsp::Position::new(0, 5)),
-                        severity: Some(lsp::DiagnosticSeverity::ERROR),
-                        message: "unused variable 'b'".to_string(),
-                        ..Default::default()
-                    }],
-                },
-                None,
-                DiagnosticSourceKind::Pushed,
-                &[],
-                cx,
-            )
-            .unwrap();
-        lsp_store
-            .update_diagnostics(
-                server_id,
-                lsp::PublishDiagnosticsParams {
-                    uri: Uri::from_file_path(path!("/root/other.rs")).unwrap(),
-                    version: None,
-                    diagnostics: vec![lsp::Diagnostic {
-                        range: lsp::Range::new(lsp::Position::new(0, 8), lsp::Position::new(0, 9)),
-                        severity: Some(lsp::DiagnosticSeverity::ERROR),
-                        message: "unknown variable 'c'".to_string(),
-                        ..Default::default()
-                    }],
-                },
-                None,
-                DiagnosticSourceKind::Pushed,
-                &[],
-                cx,
-            )
-            .unwrap();
-    });
-
-    let main_ignored_buffer = project
-        .update(cx, |project, cx| {
-            project.open_buffer((main_worktree_id, rel_path("b.rs")), cx)
-        })
-        .await
-        .unwrap();
-    main_ignored_buffer.update(cx, |buffer, _| {
-        let chunks = chunks_with_diagnostics(buffer, 0..buffer.len());
-        assert_eq!(
-            chunks
-                .iter()
-                .map(|(s, d)| (s.as_str(), *d))
-                .collect::<Vec<_>>(),
-            &[
-                ("let ", None),
-                ("b", Some(DiagnosticSeverity::ERROR)),
-                (" = 2;", None),
-            ],
-            "Gigitnored buffers should still get in-buffer diagnostics",
-        );
-    });
-    let other_buffer = project
-        .update(cx, |project, cx| {
-            project.open_buffer((other_worktree_id, rel_path("")), cx)
-        })
-        .await
-        .unwrap();
-    other_buffer.update(cx, |buffer, _| {
-        let chunks = chunks_with_diagnostics(buffer, 0..buffer.len());
-        assert_eq!(
-            chunks
-                .iter()
-                .map(|(s, d)| (s.as_str(), *d))
-                .collect::<Vec<_>>(),
-            &[
-                ("let b = ", None),
-                ("c", Some(DiagnosticSeverity::ERROR)),
-                (";", None),
-            ],
-            "Buffers from hidden projects should still get in-buffer diagnostics"
-        );
-    });
-
-    project.update(cx, |project, cx| {
-        assert_eq!(project.diagnostic_summaries(false, cx).next(), None);
-        assert_eq!(
-            project.diagnostic_summaries(true, cx).collect::<Vec<_>>(),
-            vec![(
-                ProjectPath {
-                    worktree_id: main_worktree_id,
-                    path: rel_path("b.rs").into(),
-                },
-                server_id,
-                DiagnosticSummary {
-                    error_count: 1,
-                    warning_count: 0,
-                }
-            )]
-        );
-        assert_eq!(project.diagnostic_summary(false, cx).error_count, 0);
-        assert_eq!(project.diagnostic_summary(true, cx).error_count, 1);
-    });
-}
-
-#[gpui::test]
-async fn test_disk_based_diagnostics_progress(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let progress_token = "the-progress-token";
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/dir"),
-        json!({
-            "a.rs": "fn a() { A }",
-            "b.rs": "const y: i32 = 1",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-
-    language_registry.add(rust_lang());
-    let mut fake_servers = language_registry.register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            disk_based_diagnostics_progress_token: Some(progress_token.into()),
-            disk_based_diagnostics_sources: vec!["disk".into()],
-            ..Default::default()
-        },
-    );
-
-    let worktree_id = project.update(cx, |p, cx| p.worktrees(cx).next().unwrap().read(cx).id());
-
-    // Cause worktree to start the fake language server
-    let _ = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer_with_lsp(path!("/dir/b.rs"), cx)
-        })
-        .await
-        .unwrap();
-
-    let mut events = cx.events(&project);
-
-    let fake_server = fake_servers.next().await.unwrap();
-    assert_eq!(
-        events.next().await.unwrap(),
-        Event::LanguageServerAdded(
-            LanguageServerId(0),
-            fake_server.server.name(),
-            Some(worktree_id)
-        ),
-    );
-
-    fake_server
-        .start_progress(format!("{}/0", progress_token))
-        .await;
-    assert_eq!(
-        events.next().await.unwrap(),
-        Event::DiskBasedDiagnosticsStarted {
-            language_server_id: LanguageServerId(0),
-        }
-    );
-
-    fake_server.notify::<lsp::notification::PublishDiagnostics>(lsp::PublishDiagnosticsParams {
-        uri: Uri::from_file_path(path!("/dir/a.rs")).unwrap(),
-        version: None,
-        diagnostics: vec![lsp::Diagnostic {
-            range: lsp::Range::new(lsp::Position::new(0, 9), lsp::Position::new(0, 10)),
-            severity: Some(lsp::DiagnosticSeverity::ERROR),
-            message: "undefined variable 'A'".to_string(),
-            ..Default::default()
-        }],
-    });
-    assert_eq!(
-        events.next().await.unwrap(),
-        Event::DiagnosticsUpdated {
-            language_server_id: LanguageServerId(0),
-            paths: vec![(worktree_id, rel_path("a.rs")).into()],
-        }
-    );
-
-    fake_server.end_progress(format!("{}/0", progress_token));
-    assert_eq!(
-        events.next().await.unwrap(),
-        Event::DiskBasedDiagnosticsFinished {
-            language_server_id: LanguageServerId(0)
-        }
-    );
-
-    let buffer = project
-        .update(cx, |p, cx| p.open_local_buffer(path!("/dir/a.rs"), cx))
-        .await
-        .unwrap();
-
-    buffer.update(cx, |buffer, _| {
-        let snapshot = buffer.snapshot();
-        let diagnostics = snapshot
-            .diagnostics_in_range::<_, Point>(0..buffer.len(), false)
-            .collect::<Vec<_>>();
-        assert_eq!(
-            diagnostics,
-            &[DiagnosticEntryRef {
-                range: Point::new(0, 9)..Point::new(0, 10),
-                diagnostic: &Diagnostic {
-                    severity: lsp::DiagnosticSeverity::ERROR,
-                    message: "undefined variable 'A'".to_string(),
-                    group_id: 0,
-                    is_primary: true,
-                    source_kind: DiagnosticSourceKind::Pushed,
-                    ..Diagnostic::default()
-                }
-            }]
-        )
-    });
-
-    // Ensure publishing empty diagnostics twice only results in one update event.
-    fake_server.notify::<lsp::notification::PublishDiagnostics>(lsp::PublishDiagnosticsParams {
-        uri: Uri::from_file_path(path!("/dir/a.rs")).unwrap(),
-        version: None,
-        diagnostics: Default::default(),
-    });
-    assert_eq!(
-        events.next().await.unwrap(),
-        Event::DiagnosticsUpdated {
-            language_server_id: LanguageServerId(0),
-            paths: vec![(worktree_id, rel_path("a.rs")).into()],
-        }
-    );
-
-    fake_server.notify::<lsp::notification::PublishDiagnostics>(lsp::PublishDiagnosticsParams {
-        uri: Uri::from_file_path(path!("/dir/a.rs")).unwrap(),
-        version: None,
-        diagnostics: Default::default(),
-    });
-    cx.executor().run_until_parked();
-    assert_eq!(futures::poll!(events.next()), Poll::Pending);
-}
-
-#[gpui::test]
-async fn test_restarting_server_with_diagnostics_running(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let progress_token = "the-progress-token";
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(path!("/dir"), json!({ "a.rs": "" })).await;
-
-    let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
-
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-    language_registry.add(rust_lang());
-    let mut fake_servers = language_registry.register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            name: "the-language-server",
-            disk_based_diagnostics_sources: vec!["disk".into()],
-            disk_based_diagnostics_progress_token: Some(progress_token.into()),
-            ..FakeLspAdapter::default()
-        },
-    );
-
-    let worktree_id = project.update(cx, |p, cx| p.worktrees(cx).next().unwrap().read(cx).id());
-
-    let (buffer, _handle) = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer_with_lsp(path!("/dir/a.rs"), cx)
-        })
-        .await
-        .unwrap();
-    let buffer_id = buffer.read_with(cx, |buffer, _| buffer.remote_id());
-    // Simulate diagnostics starting to update.
-    let fake_server = fake_servers.next().await.unwrap();
-    fake_server.start_progress(progress_token).await;
-
-    // Restart the server before the diagnostics finish updating.
-    project.update(cx, |project, cx| {
-        project.restart_language_servers_for_buffers(vec![buffer], HashSet::default(), cx);
-    });
-    let mut events = cx.events(&project);
-
-    // Simulate the newly started server sending more diagnostics.
-    let fake_server = fake_servers.next().await.unwrap();
-    assert_eq!(
-        events.next().await.unwrap(),
-        Event::LanguageServerRemoved(LanguageServerId(0))
-    );
-    assert_eq!(
-        events.next().await.unwrap(),
-        Event::LanguageServerAdded(
-            LanguageServerId(1),
-            fake_server.server.name(),
-            Some(worktree_id)
-        )
-    );
-    fake_server.start_progress(progress_token).await;
-    assert_eq!(
-        events.next().await.unwrap(),
-        Event::LanguageServerBufferRegistered {
-            server_id: LanguageServerId(1),
-            buffer_id,
-            buffer_abs_path: PathBuf::from(path!("/dir/a.rs")),
-            name: Some(fake_server.server.name())
-        }
-    );
-    assert_eq!(
-        events.next().await.unwrap(),
-        Event::DiskBasedDiagnosticsStarted {
-            language_server_id: LanguageServerId(1)
-        }
-    );
-    project.update(cx, |project, cx| {
-        assert_eq!(
-            project
-                .language_servers_running_disk_based_diagnostics(cx)
-                .collect::<Vec<_>>(),
-            [LanguageServerId(1)]
-        );
-    });
-
-    // All diagnostics are considered done, despite the old server's diagnostic
-    // task never completing.
-    fake_server.end_progress(progress_token);
-    assert_eq!(
-        events.next().await.unwrap(),
-        Event::DiskBasedDiagnosticsFinished {
-            language_server_id: LanguageServerId(1)
-        }
-    );
-    project.update(cx, |project, cx| {
-        assert_eq!(
-            project
-                .language_servers_running_disk_based_diagnostics(cx)
-                .collect::<Vec<_>>(),
-            [] as [language::LanguageServerId; 0]
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_restarting_server_with_diagnostics_published(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(path!("/dir"), json!({ "a.rs": "x" })).await;
-
-    let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
-
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-    language_registry.add(rust_lang());
-    let mut fake_servers = language_registry.register_fake_lsp("Rust", FakeLspAdapter::default());
-
-    let (buffer, _) = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer_with_lsp(path!("/dir/a.rs"), cx)
-        })
-        .await
-        .unwrap();
-
-    // Publish diagnostics
-    let fake_server = fake_servers.next().await.unwrap();
-    fake_server.notify::<lsp::notification::PublishDiagnostics>(lsp::PublishDiagnosticsParams {
-        uri: Uri::from_file_path(path!("/dir/a.rs")).unwrap(),
-        version: None,
-        diagnostics: vec![lsp::Diagnostic {
-            range: lsp::Range::new(lsp::Position::new(0, 0), lsp::Position::new(0, 0)),
-            severity: Some(lsp::DiagnosticSeverity::ERROR),
-            message: "the message".to_string(),
-            ..Default::default()
-        }],
-    });
-
-    cx.executor().run_until_parked();
-    buffer.update(cx, |buffer, _| {
-        assert_eq!(
-            buffer
-                .snapshot()
-                .diagnostics_in_range::<_, usize>(0..1, false)
-                .map(|entry| entry.diagnostic.message.clone())
-                .collect::<Vec<_>>(),
-            ["the message".to_string()]
-        );
-    });
-    project.update(cx, |project, cx| {
-        assert_eq!(
-            project.diagnostic_summary(false, cx),
-            DiagnosticSummary {
-                error_count: 1,
-                warning_count: 0,
-            }
-        );
-    });
-
-    project.update(cx, |project, cx| {
-        project.restart_language_servers_for_buffers(vec![buffer.clone()], HashSet::default(), cx);
-    });
-
-    // The diagnostics are cleared.
-    cx.executor().run_until_parked();
-    buffer.update(cx, |buffer, _| {
-        assert_eq!(
-            buffer
-                .snapshot()
-                .diagnostics_in_range::<_, usize>(0..1, false)
-                .map(|entry| entry.diagnostic.message.clone())
-                .collect::<Vec<_>>(),
-            Vec::<String>::new(),
-        );
-    });
-    project.update(cx, |project, cx| {
-        assert_eq!(
-            project.diagnostic_summary(false, cx),
-            DiagnosticSummary {
-                error_count: 0,
-                warning_count: 0,
-            }
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_restarted_server_reporting_invalid_buffer_version(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(path!("/dir"), json!({ "a.rs": "" })).await;
-
-    let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-
-    language_registry.add(rust_lang());
-    let mut fake_servers = language_registry.register_fake_lsp("Rust", FakeLspAdapter::default());
-
-    let (buffer, _handle) = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer_with_lsp(path!("/dir/a.rs"), cx)
-        })
-        .await
-        .unwrap();
-
-    // Before restarting the server, report diagnostics with an unknown buffer version.
-    let fake_server = fake_servers.next().await.unwrap();
-    fake_server.notify::<lsp::notification::PublishDiagnostics>(lsp::PublishDiagnosticsParams {
-        uri: lsp::Uri::from_file_path(path!("/dir/a.rs")).unwrap(),
-        version: Some(10000),
-        diagnostics: Vec::new(),
-    });
-    cx.executor().run_until_parked();
-    project.update(cx, |project, cx| {
-        project.restart_language_servers_for_buffers(vec![buffer.clone()], HashSet::default(), cx);
-    });
-
-    let mut fake_server = fake_servers.next().await.unwrap();
-    let notification = fake_server
-        .receive_notification::<lsp::notification::DidOpenTextDocument>()
-        .await
-        .text_document;
-    assert_eq!(notification.version, 0);
-}
-
-#[gpui::test]
-async fn test_cancel_language_server_work(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let progress_token = "the-progress-token";
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(path!("/dir"), json!({ "a.rs": "" })).await;
-
-    let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
-
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-    language_registry.add(rust_lang());
-    let mut fake_servers = language_registry.register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            name: "the-language-server",
-            disk_based_diagnostics_sources: vec!["disk".into()],
-            disk_based_diagnostics_progress_token: Some(progress_token.into()),
-            ..Default::default()
-        },
-    );
-
-    let (buffer, _handle) = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer_with_lsp(path!("/dir/a.rs"), cx)
-        })
-        .await
-        .unwrap();
-
-    // Simulate diagnostics starting to update.
-    let mut fake_server = fake_servers.next().await.unwrap();
-    fake_server
-        .start_progress_with(
-            "another-token",
-            lsp::WorkDoneProgressBegin {
-                cancellable: Some(false),
-                ..Default::default()
-            },
-        )
-        .await;
-    fake_server
-        .start_progress_with(
-            progress_token,
-            lsp::WorkDoneProgressBegin {
-                cancellable: Some(true),
-                ..Default::default()
-            },
-        )
-        .await;
-    cx.executor().run_until_parked();
-
-    project.update(cx, |project, cx| {
-        project.cancel_language_server_work_for_buffers([buffer.clone()], cx)
-    });
-
-    let cancel_notification = fake_server
-        .receive_notification::<lsp::notification::WorkDoneProgressCancel>()
-        .await;
-    assert_eq!(
-        cancel_notification.token,
-        NumberOrString::String(progress_token.into())
-    );
-}
-
-#[gpui::test]
-async fn test_toggling_enable_language_server(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(path!("/dir"), json!({ "a.rs": "", "b.js": "" }))
-        .await;
-
-    let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-
-    let mut fake_rust_servers = language_registry.register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            name: "rust-lsp",
-            ..Default::default()
-        },
-    );
-    let mut fake_js_servers = language_registry.register_fake_lsp(
-        "JavaScript",
-        FakeLspAdapter {
-            name: "js-lsp",
-            ..Default::default()
-        },
-    );
-    language_registry.add(rust_lang());
-    language_registry.add(js_lang());
-
-    let _rs_buffer = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer_with_lsp(path!("/dir/a.rs"), cx)
-        })
-        .await
-        .unwrap();
-    let _js_buffer = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer_with_lsp(path!("/dir/b.js"), cx)
-        })
-        .await
-        .unwrap();
-
-    let mut fake_rust_server_1 = fake_rust_servers.next().await.unwrap();
-    assert_eq!(
-        fake_rust_server_1
-            .receive_notification::<lsp::notification::DidOpenTextDocument>()
-            .await
-            .text_document
-            .uri
-            .as_str(),
-        uri!("file:///dir/a.rs")
-    );
-
-    let mut fake_js_server = fake_js_servers.next().await.unwrap();
-    assert_eq!(
-        fake_js_server
-            .receive_notification::<lsp::notification::DidOpenTextDocument>()
-            .await
-            .text_document
-            .uri
-            .as_str(),
-        uri!("file:///dir/b.js")
-    );
-
-    // Disable Rust language server, ensuring only that server gets stopped.
-    cx.update(|cx| {
-        SettingsStore::update_global(cx, |settings, cx| {
-            settings.update_user_settings(cx, |settings| {
-                settings.languages_mut().insert(
-                    "Rust".into(),
-                    LanguageSettingsContent {
-                        enable_language_server: Some(false),
-                        ..Default::default()
-                    },
-                );
-            });
-        })
-    });
-    fake_rust_server_1
-        .receive_notification::<lsp::notification::Exit>()
-        .await;
-
-    // Enable Rust and disable JavaScript language servers, ensuring that the
-    // former gets started again and that the latter stops.
-    cx.update(|cx| {
-        SettingsStore::update_global(cx, |settings, cx| {
-            settings.update_user_settings(cx, |settings| {
-                settings.languages_mut().insert(
-                    "Rust".into(),
-                    LanguageSettingsContent {
-                        enable_language_server: Some(true),
-                        ..Default::default()
-                    },
-                );
-                settings.languages_mut().insert(
-                    "JavaScript".into(),
-                    LanguageSettingsContent {
-                        enable_language_server: Some(false),
-                        ..Default::default()
-                    },
-                );
-            });
-        })
-    });
-    let mut fake_rust_server_2 = fake_rust_servers.next().await.unwrap();
-    assert_eq!(
-        fake_rust_server_2
-            .receive_notification::<lsp::notification::DidOpenTextDocument>()
-            .await
-            .text_document
-            .uri
-            .as_str(),
-        uri!("file:///dir/a.rs")
-    );
-    fake_js_server
-        .receive_notification::<lsp::notification::Exit>()
-        .await;
-}
-
-#[gpui::test(iterations = 3)]
-async fn test_transforming_diagnostics(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let text = "
-        fn a() { A }
-        fn b() { BB }
-        fn c() { CCC }
-    "
-    .unindent();
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(path!("/dir"), json!({ "a.rs": text })).await;
-
-    let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-
-    language_registry.add(rust_lang());
-    let mut fake_servers = language_registry.register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            disk_based_diagnostics_sources: vec!["disk".into()],
-            ..Default::default()
-        },
-    );
-
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer(path!("/dir/a.rs"), cx)
-        })
-        .await
-        .unwrap();
-
-    let _handle = project.update(cx, |project, cx| {
-        project.register_buffer_with_language_servers(&buffer, cx)
-    });
-
-    let mut fake_server = fake_servers.next().await.unwrap();
-    let open_notification = fake_server
-        .receive_notification::<lsp::notification::DidOpenTextDocument>()
-        .await;
-
-    // Edit the buffer, moving the content down
-    buffer.update(cx, |buffer, cx| buffer.edit([(0..0, "\n\n")], None, cx));
-    let change_notification_1 = fake_server
-        .receive_notification::<lsp::notification::DidChangeTextDocument>()
-        .await;
-    assert!(change_notification_1.text_document.version > open_notification.text_document.version);
-
-    // Report some diagnostics for the initial version of the buffer
-    fake_server.notify::<lsp::notification::PublishDiagnostics>(lsp::PublishDiagnosticsParams {
-        uri: lsp::Uri::from_file_path(path!("/dir/a.rs")).unwrap(),
-        version: Some(open_notification.text_document.version),
-        diagnostics: vec![
-            lsp::Diagnostic {
-                range: lsp::Range::new(lsp::Position::new(0, 9), lsp::Position::new(0, 10)),
-                severity: Some(DiagnosticSeverity::ERROR),
-                message: "undefined variable 'A'".to_string(),
-                source: Some("disk".to_string()),
-                ..Default::default()
-            },
-            lsp::Diagnostic {
-                range: lsp::Range::new(lsp::Position::new(1, 9), lsp::Position::new(1, 11)),
-                severity: Some(DiagnosticSeverity::ERROR),
-                message: "undefined variable 'BB'".to_string(),
-                source: Some("disk".to_string()),
-                ..Default::default()
-            },
-            lsp::Diagnostic {
-                range: lsp::Range::new(lsp::Position::new(2, 9), lsp::Position::new(2, 12)),
-                severity: Some(DiagnosticSeverity::ERROR),
-                source: Some("disk".to_string()),
-                message: "undefined variable 'CCC'".to_string(),
-                ..Default::default()
-            },
-        ],
-    });
-
-    // The diagnostics have moved down since they were created.
-    cx.executor().run_until_parked();
-    buffer.update(cx, |buffer, _| {
-        assert_eq!(
-            buffer
-                .snapshot()
-                .diagnostics_in_range::<_, Point>(Point::new(3, 0)..Point::new(5, 0), false)
-                .collect::<Vec<_>>(),
-            &[
-                DiagnosticEntry {
-                    range: Point::new(3, 9)..Point::new(3, 11),
-                    diagnostic: Diagnostic {
-                        source: Some("disk".into()),
-                        severity: DiagnosticSeverity::ERROR,
-                        message: "undefined variable 'BB'".to_string(),
-                        is_disk_based: true,
-                        group_id: 1,
-                        is_primary: true,
-                        source_kind: DiagnosticSourceKind::Pushed,
-                        ..Diagnostic::default()
-                    },
-                },
-                DiagnosticEntry {
-                    range: Point::new(4, 9)..Point::new(4, 12),
-                    diagnostic: Diagnostic {
-                        source: Some("disk".into()),
-                        severity: DiagnosticSeverity::ERROR,
-                        message: "undefined variable 'CCC'".to_string(),
-                        is_disk_based: true,
-                        group_id: 2,
-                        is_primary: true,
-                        source_kind: DiagnosticSourceKind::Pushed,
-                        ..Diagnostic::default()
-                    }
-                }
-            ]
-        );
-        assert_eq!(
-            chunks_with_diagnostics(buffer, 0..buffer.len()),
-            [
-                ("\n\nfn a() { ".to_string(), None),
-                ("A".to_string(), Some(DiagnosticSeverity::ERROR)),
-                (" }\nfn b() { ".to_string(), None),
-                ("BB".to_string(), Some(DiagnosticSeverity::ERROR)),
-                (" }\nfn c() { ".to_string(), None),
-                ("CCC".to_string(), Some(DiagnosticSeverity::ERROR)),
-                (" }\n".to_string(), None),
-            ]
-        );
-        assert_eq!(
-            chunks_with_diagnostics(buffer, Point::new(3, 10)..Point::new(4, 11)),
-            [
-                ("B".to_string(), Some(DiagnosticSeverity::ERROR)),
-                (" }\nfn c() { ".to_string(), None),
-                ("CC".to_string(), Some(DiagnosticSeverity::ERROR)),
-            ]
-        );
-    });
-
-    // Ensure overlapping diagnostics are highlighted correctly.
-    fake_server.notify::<lsp::notification::PublishDiagnostics>(lsp::PublishDiagnosticsParams {
-        uri: lsp::Uri::from_file_path(path!("/dir/a.rs")).unwrap(),
-        version: Some(open_notification.text_document.version),
-        diagnostics: vec![
-            lsp::Diagnostic {
-                range: lsp::Range::new(lsp::Position::new(0, 9), lsp::Position::new(0, 10)),
-                severity: Some(DiagnosticSeverity::ERROR),
-                message: "undefined variable 'A'".to_string(),
-                source: Some("disk".to_string()),
-                ..Default::default()
-            },
-            lsp::Diagnostic {
-                range: lsp::Range::new(lsp::Position::new(0, 9), lsp::Position::new(0, 12)),
-                severity: Some(DiagnosticSeverity::WARNING),
-                message: "unreachable statement".to_string(),
-                source: Some("disk".to_string()),
-                ..Default::default()
-            },
-        ],
-    });
-
-    cx.executor().run_until_parked();
-    buffer.update(cx, |buffer, _| {
-        assert_eq!(
-            buffer
-                .snapshot()
-                .diagnostics_in_range::<_, Point>(Point::new(2, 0)..Point::new(3, 0), false)
-                .collect::<Vec<_>>(),
-            &[
-                DiagnosticEntry {
-                    range: Point::new(2, 9)..Point::new(2, 12),
-                    diagnostic: Diagnostic {
-                        source: Some("disk".into()),
-                        severity: DiagnosticSeverity::WARNING,
-                        message: "unreachable statement".to_string(),
-                        is_disk_based: true,
-                        group_id: 4,
-                        is_primary: true,
-                        source_kind: DiagnosticSourceKind::Pushed,
-                        ..Diagnostic::default()
-                    }
-                },
-                DiagnosticEntry {
-                    range: Point::new(2, 9)..Point::new(2, 10),
-                    diagnostic: Diagnostic {
-                        source: Some("disk".into()),
-                        severity: DiagnosticSeverity::ERROR,
-                        message: "undefined variable 'A'".to_string(),
-                        is_disk_based: true,
-                        group_id: 3,
-                        is_primary: true,
-                        source_kind: DiagnosticSourceKind::Pushed,
-                        ..Diagnostic::default()
-                    },
-                }
-            ]
-        );
-        assert_eq!(
-            chunks_with_diagnostics(buffer, Point::new(2, 0)..Point::new(3, 0)),
-            [
-                ("fn a() { ".to_string(), None),
-                ("A".to_string(), Some(DiagnosticSeverity::ERROR)),
-                (" }".to_string(), Some(DiagnosticSeverity::WARNING)),
-                ("\n".to_string(), None),
-            ]
-        );
-        assert_eq!(
-            chunks_with_diagnostics(buffer, Point::new(2, 10)..Point::new(3, 0)),
-            [
-                (" }".to_string(), Some(DiagnosticSeverity::WARNING)),
-                ("\n".to_string(), None),
-            ]
-        );
-    });
-
-    // Keep editing the buffer and ensure disk-based diagnostics get translated according to the
-    // changes since the last save.
-    buffer.update(cx, |buffer, cx| {
-        buffer.edit([(Point::new(2, 0)..Point::new(2, 0), "    ")], None, cx);
-        buffer.edit(
-            [(Point::new(2, 8)..Point::new(2, 10), "(x: usize)")],
-            None,
-            cx,
-        );
-        buffer.edit([(Point::new(3, 10)..Point::new(3, 10), "xxx")], None, cx);
-    });
-    let change_notification_2 = fake_server
-        .receive_notification::<lsp::notification::DidChangeTextDocument>()
-        .await;
-    assert!(
-        change_notification_2.text_document.version > change_notification_1.text_document.version
-    );
-
-    // Handle out-of-order diagnostics
-    fake_server.notify::<lsp::notification::PublishDiagnostics>(lsp::PublishDiagnosticsParams {
-        uri: lsp::Uri::from_file_path(path!("/dir/a.rs")).unwrap(),
-        version: Some(change_notification_2.text_document.version),
-        diagnostics: vec![
-            lsp::Diagnostic {
-                range: lsp::Range::new(lsp::Position::new(1, 9), lsp::Position::new(1, 11)),
-                severity: Some(DiagnosticSeverity::ERROR),
-                message: "undefined variable 'BB'".to_string(),
-                source: Some("disk".to_string()),
-                ..Default::default()
-            },
-            lsp::Diagnostic {
-                range: lsp::Range::new(lsp::Position::new(0, 9), lsp::Position::new(0, 10)),
-                severity: Some(DiagnosticSeverity::WARNING),
-                message: "undefined variable 'A'".to_string(),
-                source: Some("disk".to_string()),
-                ..Default::default()
-            },
-        ],
-    });
-
-    cx.executor().run_until_parked();
-    buffer.update(cx, |buffer, _| {
-        assert_eq!(
-            buffer
-                .snapshot()
-                .diagnostics_in_range::<_, Point>(0..buffer.len(), false)
-                .collect::<Vec<_>>(),
-            &[
-                DiagnosticEntry {
-                    range: Point::new(2, 21)..Point::new(2, 22),
-                    diagnostic: Diagnostic {
-                        source: Some("disk".into()),
-                        severity: DiagnosticSeverity::WARNING,
-                        message: "undefined variable 'A'".to_string(),
-                        is_disk_based: true,
-                        group_id: 6,
-                        is_primary: true,
-                        source_kind: DiagnosticSourceKind::Pushed,
-                        ..Diagnostic::default()
-                    }
-                },
-                DiagnosticEntry {
-                    range: Point::new(3, 9)..Point::new(3, 14),
-                    diagnostic: Diagnostic {
-                        source: Some("disk".into()),
-                        severity: DiagnosticSeverity::ERROR,
-                        message: "undefined variable 'BB'".to_string(),
-                        is_disk_based: true,
-                        group_id: 5,
-                        is_primary: true,
-                        source_kind: DiagnosticSourceKind::Pushed,
-                        ..Diagnostic::default()
-                    },
-                }
-            ]
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_empty_diagnostic_ranges(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let text = concat!(
-        "let one = ;\n", //
-        "let two = \n",
-        "let three = 3;\n",
-    );
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(path!("/dir"), json!({ "a.rs": text })).await;
-
-    let project = Project::test(fs, [Path::new(path!("/dir"))], cx).await;
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer(path!("/dir/a.rs"), cx)
-        })
-        .await
-        .unwrap();
-
-    project.update(cx, |project, cx| {
-        project.lsp_store.update(cx, |lsp_store, cx| {
-            lsp_store
-                .update_diagnostic_entries(
-                    LanguageServerId(0),
-                    PathBuf::from(path!("/dir/a.rs")),
-                    None,
-                    None,
-                    vec![
-                        DiagnosticEntry {
-                            range: Unclipped(PointUtf16::new(0, 10))
-                                ..Unclipped(PointUtf16::new(0, 10)),
-                            diagnostic: Diagnostic {
-                                severity: DiagnosticSeverity::ERROR,
-                                message: "syntax error 1".to_string(),
-                                source_kind: DiagnosticSourceKind::Pushed,
-                                ..Diagnostic::default()
-                            },
-                        },
-                        DiagnosticEntry {
-                            range: Unclipped(PointUtf16::new(1, 10))
-                                ..Unclipped(PointUtf16::new(1, 10)),
-                            diagnostic: Diagnostic {
-                                severity: DiagnosticSeverity::ERROR,
-                                message: "syntax error 2".to_string(),
-                                source_kind: DiagnosticSourceKind::Pushed,
-                                ..Diagnostic::default()
-                            },
-                        },
-                    ],
-                    cx,
-                )
-                .unwrap();
-        })
-    });
-
-    // An empty range is extended forward to include the following character.
-    // At the end of a line, an empty range is extended backward to include
-    // the preceding character.
-    buffer.update(cx, |buffer, _| {
-        let chunks = chunks_with_diagnostics(buffer, 0..buffer.len());
-        assert_eq!(
-            chunks
-                .iter()
-                .map(|(s, d)| (s.as_str(), *d))
-                .collect::<Vec<_>>(),
-            &[
-                ("let one = ", None),
-                (";", Some(DiagnosticSeverity::ERROR)),
-                ("\nlet two =", None),
-                (" ", Some(DiagnosticSeverity::ERROR)),
-                ("\nlet three = 3;\n", None)
-            ]
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_diagnostics_from_multiple_language_servers(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(path!("/dir"), json!({ "a.rs": "one two three" }))
-        .await;
-
-    let project = Project::test(fs, [Path::new(path!("/dir"))], cx).await;
-    let lsp_store = project.read_with(cx, |project, _| project.lsp_store.clone());
-
-    lsp_store.update(cx, |lsp_store, cx| {
-        lsp_store
-            .update_diagnostic_entries(
-                LanguageServerId(0),
-                Path::new(path!("/dir/a.rs")).to_owned(),
-                None,
-                None,
-                vec![DiagnosticEntry {
-                    range: Unclipped(PointUtf16::new(0, 0))..Unclipped(PointUtf16::new(0, 3)),
-                    diagnostic: Diagnostic {
-                        severity: DiagnosticSeverity::ERROR,
-                        is_primary: true,
-                        message: "syntax error a1".to_string(),
-                        source_kind: DiagnosticSourceKind::Pushed,
-                        ..Diagnostic::default()
-                    },
-                }],
-                cx,
-            )
-            .unwrap();
-        lsp_store
-            .update_diagnostic_entries(
-                LanguageServerId(1),
-                Path::new(path!("/dir/a.rs")).to_owned(),
-                None,
-                None,
-                vec![DiagnosticEntry {
-                    range: Unclipped(PointUtf16::new(0, 0))..Unclipped(PointUtf16::new(0, 3)),
-                    diagnostic: Diagnostic {
-                        severity: DiagnosticSeverity::ERROR,
-                        is_primary: true,
-                        message: "syntax error b1".to_string(),
-                        source_kind: DiagnosticSourceKind::Pushed,
-                        ..Diagnostic::default()
-                    },
-                }],
-                cx,
-            )
-            .unwrap();
-
-        assert_eq!(
-            lsp_store.diagnostic_summary(false, cx),
-            DiagnosticSummary {
-                error_count: 2,
-                warning_count: 0,
-            }
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_edits_from_lsp2_with_past_version(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let text = "
-        fn a() {
-            f1();
-        }
-        fn b() {
-            f2();
-        }
-        fn c() {
-            f3();
-        }
-    "
-    .unindent();
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/dir"),
-        json!({
-            "a.rs": text.clone(),
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
-    let lsp_store = project.read_with(cx, |project, _| project.lsp_store());
-
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-    language_registry.add(rust_lang());
-    let mut fake_servers = language_registry.register_fake_lsp("Rust", FakeLspAdapter::default());
-
-    let (buffer, _handle) = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer_with_lsp(path!("/dir/a.rs"), cx)
-        })
-        .await
-        .unwrap();
-
-    let mut fake_server = fake_servers.next().await.unwrap();
-    let lsp_document_version = fake_server
-        .receive_notification::<lsp::notification::DidOpenTextDocument>()
-        .await
-        .text_document
-        .version;
-
-    // Simulate editing the buffer after the language server computes some edits.
-    buffer.update(cx, |buffer, cx| {
-        buffer.edit(
-            [(
-                Point::new(0, 0)..Point::new(0, 0),
-                "// above first function\n",
-            )],
-            None,
-            cx,
-        );
-        buffer.edit(
-            [(
-                Point::new(2, 0)..Point::new(2, 0),
-                "    // inside first function\n",
-            )],
-            None,
-            cx,
-        );
-        buffer.edit(
-            [(
-                Point::new(6, 4)..Point::new(6, 4),
-                "// inside second function ",
-            )],
-            None,
-            cx,
-        );
-
-        assert_eq!(
-            buffer.text(),
-            "
-                // above first function
-                fn a() {
-                    // inside first function
-                    f1();
-                }
-                fn b() {
-                    // inside second function f2();
-                }
-                fn c() {
-                    f3();
-                }
-            "
-            .unindent()
-        );
-    });
-
-    let edits = lsp_store
-        .update(cx, |lsp_store, cx| {
-            lsp_store.as_local_mut().unwrap().edits_from_lsp(
-                &buffer,
-                vec![
-                    // replace body of first function
-                    lsp::TextEdit {
-                        range: lsp::Range::new(lsp::Position::new(0, 0), lsp::Position::new(3, 0)),
-                        new_text: "
-                            fn a() {
-                                f10();
-                            }
-                            "
-                        .unindent(),
-                    },
-                    // edit inside second function
-                    lsp::TextEdit {
-                        range: lsp::Range::new(lsp::Position::new(4, 6), lsp::Position::new(4, 6)),
-                        new_text: "00".into(),
-                    },
-                    // edit inside third function via two distinct edits
-                    lsp::TextEdit {
-                        range: lsp::Range::new(lsp::Position::new(7, 5), lsp::Position::new(7, 5)),
-                        new_text: "4000".into(),
-                    },
-                    lsp::TextEdit {
-                        range: lsp::Range::new(lsp::Position::new(7, 5), lsp::Position::new(7, 6)),
-                        new_text: "".into(),
-                    },
-                ],
-                LanguageServerId(0),
-                Some(lsp_document_version),
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-
-    buffer.update(cx, |buffer, cx| {
-        for (range, new_text) in edits {
-            buffer.edit([(range, new_text)], None, cx);
-        }
-        assert_eq!(
-            buffer.text(),
-            "
-                // above first function
-                fn a() {
-                    // inside first function
-                    f10();
-                }
-                fn b() {
-                    // inside second function f200();
-                }
-                fn c() {
-                    f4000();
-                }
-                "
-            .unindent()
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_edits_from_lsp2_with_edits_on_adjacent_lines(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let text = "
-        use a::b;
-        use a::c;
-
-        fn f() {
-            b();
-            c();
-        }
-    "
-    .unindent();
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/dir"),
-        json!({
-            "a.rs": text.clone(),
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
-    let lsp_store = project.read_with(cx, |project, _| project.lsp_store());
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer(path!("/dir/a.rs"), cx)
-        })
-        .await
-        .unwrap();
-
-    // Simulate the language server sending us a small edit in the form of a very large diff.
-    // Rust-analyzer does this when performing a merge-imports code action.
-    let edits = lsp_store
-        .update(cx, |lsp_store, cx| {
-            lsp_store.as_local_mut().unwrap().edits_from_lsp(
-                &buffer,
-                [
-                    // Replace the first use statement without editing the semicolon.
-                    lsp::TextEdit {
-                        range: lsp::Range::new(lsp::Position::new(0, 4), lsp::Position::new(0, 8)),
-                        new_text: "a::{b, c}".into(),
-                    },
-                    // Reinsert the remainder of the file between the semicolon and the final
-                    // newline of the file.
-                    lsp::TextEdit {
-                        range: lsp::Range::new(lsp::Position::new(0, 9), lsp::Position::new(0, 9)),
-                        new_text: "\n\n".into(),
-                    },
-                    lsp::TextEdit {
-                        range: lsp::Range::new(lsp::Position::new(0, 9), lsp::Position::new(0, 9)),
-                        new_text: "
-                            fn f() {
-                                b();
-                                c();
-                            }"
-                        .unindent(),
-                    },
-                    // Delete everything after the first newline of the file.
-                    lsp::TextEdit {
-                        range: lsp::Range::new(lsp::Position::new(1, 0), lsp::Position::new(7, 0)),
-                        new_text: "".into(),
-                    },
-                ],
-                LanguageServerId(0),
-                None,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-
-    buffer.update(cx, |buffer, cx| {
-        let edits = edits
-            .into_iter()
-            .map(|(range, text)| {
-                (
-                    range.start.to_point(buffer)..range.end.to_point(buffer),
-                    text,
-                )
-            })
-            .collect::<Vec<_>>();
-
-        assert_eq!(
-            edits,
-            [
-                (Point::new(0, 4)..Point::new(0, 8), "a::{b, c}".into()),
-                (Point::new(1, 0)..Point::new(2, 0), "".into())
-            ]
-        );
-
-        for (range, new_text) in edits {
-            buffer.edit([(range, new_text)], None, cx);
-        }
-        assert_eq!(
-            buffer.text(),
-            "
-                use a::{b, c};
-
-                fn f() {
-                    b();
-                    c();
-                }
-            "
-            .unindent()
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_edits_from_lsp_with_replacement_followed_by_adjacent_insertion(
-    cx: &mut gpui::TestAppContext,
-) {
-    init_test(cx);
-
-    let text = "Path()";
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/dir"),
-        json!({
-            "a.rs": text
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
-    let lsp_store = project.read_with(cx, |project, _| project.lsp_store());
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer(path!("/dir/a.rs"), cx)
-        })
-        .await
-        .unwrap();
-
-    // Simulate the language server sending us a pair of edits at the same location,
-    // with an insertion following a replacement (which violates the LSP spec).
-    let edits = lsp_store
-        .update(cx, |lsp_store, cx| {
-            lsp_store.as_local_mut().unwrap().edits_from_lsp(
-                &buffer,
-                [
-                    lsp::TextEdit {
-                        range: lsp::Range::new(lsp::Position::new(0, 0), lsp::Position::new(0, 4)),
-                        new_text: "Path".into(),
-                    },
-                    lsp::TextEdit {
-                        range: lsp::Range::new(lsp::Position::new(0, 0), lsp::Position::new(0, 0)),
-                        new_text: "from path import Path\n\n\n".into(),
-                    },
-                ],
-                LanguageServerId(0),
-                None,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-
-    buffer.update(cx, |buffer, cx| {
-        buffer.edit(edits, None, cx);
-        assert_eq!(buffer.text(), "from path import Path\n\n\nPath()")
-    });
-}
-
-#[gpui::test]
-async fn test_invalid_edits_from_lsp2(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let text = "
-        use a::b;
-        use a::c;
-
-        fn f() {
-            b();
-            c();
-        }
-    "
-    .unindent();
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/dir"),
-        json!({
-            "a.rs": text.clone(),
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
-    let lsp_store = project.read_with(cx, |project, _| project.lsp_store());
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer(path!("/dir/a.rs"), cx)
-        })
-        .await
-        .unwrap();
-
-    // Simulate the language server sending us edits in a non-ordered fashion,
-    // with ranges sometimes being inverted or pointing to invalid locations.
-    let edits = lsp_store
-        .update(cx, |lsp_store, cx| {
-            lsp_store.as_local_mut().unwrap().edits_from_lsp(
-                &buffer,
-                [
-                    lsp::TextEdit {
-                        range: lsp::Range::new(lsp::Position::new(0, 9), lsp::Position::new(0, 9)),
-                        new_text: "\n\n".into(),
-                    },
-                    lsp::TextEdit {
-                        range: lsp::Range::new(lsp::Position::new(0, 8), lsp::Position::new(0, 4)),
-                        new_text: "a::{b, c}".into(),
-                    },
-                    lsp::TextEdit {
-                        range: lsp::Range::new(lsp::Position::new(1, 0), lsp::Position::new(99, 0)),
-                        new_text: "".into(),
-                    },
-                    lsp::TextEdit {
-                        range: lsp::Range::new(lsp::Position::new(0, 9), lsp::Position::new(0, 9)),
-                        new_text: "
-                            fn f() {
-                                b();
-                                c();
-                            }"
-                        .unindent(),
-                    },
-                ],
-                LanguageServerId(0),
-                None,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-
-    buffer.update(cx, |buffer, cx| {
-        let edits = edits
-            .into_iter()
-            .map(|(range, text)| {
-                (
-                    range.start.to_point(buffer)..range.end.to_point(buffer),
-                    text,
-                )
-            })
-            .collect::<Vec<_>>();
-
-        assert_eq!(
-            edits,
-            [
-                (Point::new(0, 4)..Point::new(0, 8), "a::{b, c}".into()),
-                (Point::new(1, 0)..Point::new(2, 0), "".into())
-            ]
-        );
-
-        for (range, new_text) in edits {
-            buffer.edit([(range, new_text)], None, cx);
-        }
-        assert_eq!(
-            buffer.text(),
-            "
-                use a::{b, c};
-
-                fn f() {
-                    b();
-                    c();
-                }
-            "
-            .unindent()
-        );
-    });
-}
-
-fn chunks_with_diagnostics<T: ToOffset + ToPoint>(
-    buffer: &Buffer,
-    range: Range<T>,
-) -> Vec<(String, Option<DiagnosticSeverity>)> {
-    let mut chunks: Vec<(String, Option<DiagnosticSeverity>)> = Vec::new();
-    for chunk in buffer.snapshot().chunks(range, true) {
-        if chunks
-            .last()
-            .is_some_and(|prev_chunk| prev_chunk.1 == chunk.diagnostic_severity)
-        {
-            chunks.last_mut().unwrap().0.push_str(chunk.text);
-        } else {
-            chunks.push((chunk.text.to_string(), chunk.diagnostic_severity));
-        }
-    }
-    chunks
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_definition(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/dir"),
-        json!({
-            "a.rs": "const fn a() { A }",
-            "b.rs": "const y: i32 = crate::a()",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/dir/b.rs").as_ref()], cx).await;
-
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-    language_registry.add(rust_lang());
-    let mut fake_servers = language_registry.register_fake_lsp("Rust", FakeLspAdapter::default());
-
-    let (buffer, _handle) = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer_with_lsp(path!("/dir/b.rs"), cx)
-        })
-        .await
-        .unwrap();
-
-    let fake_server = fake_servers.next().await.unwrap();
-    fake_server.set_request_handler::<lsp::request::GotoDefinition, _, _>(|params, _| async move {
-        let params = params.text_document_position_params;
-        assert_eq!(
-            params.text_document.uri.to_file_path().unwrap(),
-            Path::new(path!("/dir/b.rs")),
-        );
-        assert_eq!(params.position, lsp::Position::new(0, 22));
-
-        Ok(Some(lsp::GotoDefinitionResponse::Scalar(
-            lsp::Location::new(
-                lsp::Uri::from_file_path(path!("/dir/a.rs")).unwrap(),
-                lsp::Range::new(lsp::Position::new(0, 9), lsp::Position::new(0, 10)),
-            ),
-        )))
-    });
-    let mut definitions = project
-        .update(cx, |project, cx| project.definitions(&buffer, 22, cx))
-        .await
-        .unwrap()
-        .unwrap();
-
-    // Assert no new language server started
-    cx.executor().run_until_parked();
-    assert!(fake_servers.try_next().is_err());
-
-    assert_eq!(definitions.len(), 1);
-    let definition = definitions.pop().unwrap();
-    cx.update(|cx| {
-        let target_buffer = definition.target.buffer.read(cx);
-        assert_eq!(
-            target_buffer
-                .file()
-                .unwrap()
-                .as_local()
-                .unwrap()
-                .abs_path(cx),
-            Path::new(path!("/dir/a.rs")),
-        );
-        assert_eq!(definition.target.range.to_offset(target_buffer), 9..10);
-        assert_eq!(
-            list_worktrees(&project, cx),
-            [
-                (path!("/dir/a.rs").as_ref(), false),
-                (path!("/dir/b.rs").as_ref(), true)
-            ],
-        );
-
-        drop(definition);
-    });
-    cx.update(|cx| {
-        assert_eq!(
-            list_worktrees(&project, cx),
-            [(path!("/dir/b.rs").as_ref(), true)]
-        );
-    });
-
-    fn list_worktrees<'a>(project: &'a Entity<Project>, cx: &'a App) -> Vec<(&'a Path, bool)> {
-        project
-            .read(cx)
-            .worktrees(cx)
-            .map(|worktree| {
-                let worktree = worktree.read(cx);
-                (
-                    worktree.as_local().unwrap().abs_path().as_ref(),
-                    worktree.is_visible(),
-                )
-            })
-            .collect::<Vec<_>>()
-    }
-}
-
-#[gpui::test]
-async fn test_completions_with_text_edit(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/dir"),
-        json!({
-            "a.ts": "",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
-
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-    language_registry.add(typescript_lang());
-    let mut fake_language_servers = language_registry.register_fake_lsp(
-        "TypeScript",
-        FakeLspAdapter {
-            capabilities: lsp::ServerCapabilities {
-                completion_provider: Some(lsp::CompletionOptions {
-                    trigger_characters: Some(vec![".".to_string()]),
-                    ..Default::default()
-                }),
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-    );
-
-    let (buffer, _handle) = project
-        .update(cx, |p, cx| {
-            p.open_local_buffer_with_lsp(path!("/dir/a.ts"), cx)
-        })
-        .await
-        .unwrap();
-
-    let fake_server = fake_language_servers.next().await.unwrap();
-
-    // When text_edit exists, it takes precedence over insert_text and label
-    let text = "let a = obj.fqn";
-    buffer.update(cx, |buffer, cx| buffer.set_text(text, cx));
-    let completions = project.update(cx, |project, cx| {
-        project.completions(&buffer, text.len(), DEFAULT_COMPLETION_CONTEXT, cx)
-    });
-
-    fake_server
-        .set_request_handler::<lsp::request::Completion, _, _>(|_, _| async {
-            Ok(Some(lsp::CompletionResponse::Array(vec![
-                lsp::CompletionItem {
-                    label: "labelText".into(),
-                    insert_text: Some("insertText".into()),
-                    text_edit: Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
-                        range: lsp::Range::new(
-                            lsp::Position::new(0, text.len() as u32 - 3),
-                            lsp::Position::new(0, text.len() as u32),
-                        ),
-                        new_text: "textEditText".into(),
-                    })),
-                    ..Default::default()
-                },
-            ])))
-        })
-        .next()
-        .await;
-
-    let completions = completions
-        .await
-        .unwrap()
-        .into_iter()
-        .flat_map(|response| response.completions)
-        .collect::<Vec<_>>();
-    let snapshot = buffer.update(cx, |buffer, _| buffer.snapshot());
-
-    assert_eq!(completions.len(), 1);
-    assert_eq!(completions[0].new_text, "textEditText");
-    assert_eq!(
-        completions[0].replace_range.to_offset(&snapshot),
-        text.len() - 3..text.len()
-    );
-}
-
-#[gpui::test]
-async fn test_completions_with_edit_ranges(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/dir"),
-        json!({
-            "a.ts": "",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
-
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-    language_registry.add(typescript_lang());
-    let mut fake_language_servers = language_registry.register_fake_lsp(
-        "TypeScript",
-        FakeLspAdapter {
-            capabilities: lsp::ServerCapabilities {
-                completion_provider: Some(lsp::CompletionOptions {
-                    trigger_characters: Some(vec![".".to_string()]),
-                    ..Default::default()
-                }),
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-    );
-
-    let (buffer, _handle) = project
-        .update(cx, |p, cx| {
-            p.open_local_buffer_with_lsp(path!("/dir/a.ts"), cx)
-        })
-        .await
-        .unwrap();
-
-    let fake_server = fake_language_servers.next().await.unwrap();
-    let text = "let a = obj.fqn";
-
-    // Test 1: When text_edit is None but text_edit_text exists with default edit_range
-    {
-        buffer.update(cx, |buffer, cx| buffer.set_text(text, cx));
-        let completions = project.update(cx, |project, cx| {
-            project.completions(&buffer, text.len(), DEFAULT_COMPLETION_CONTEXT, cx)
-        });
-
-        fake_server
-            .set_request_handler::<lsp::request::Completion, _, _>(|_, _| async {
-                Ok(Some(lsp::CompletionResponse::List(lsp::CompletionList {
-                    is_incomplete: false,
-                    item_defaults: Some(lsp::CompletionListItemDefaults {
-                        edit_range: Some(lsp::CompletionListItemDefaultsEditRange::Range(
-                            lsp::Range::new(
-                                lsp::Position::new(0, text.len() as u32 - 3),
-                                lsp::Position::new(0, text.len() as u32),
-                            ),
-                        )),
-                        ..Default::default()
-                    }),
-                    items: vec![lsp::CompletionItem {
-                        label: "labelText".into(),
-                        text_edit_text: Some("textEditText".into()),
-                        text_edit: None,
-                        ..Default::default()
-                    }],
-                })))
-            })
-            .next()
-            .await;
-
-        let completions = completions
-            .await
-            .unwrap()
-            .into_iter()
-            .flat_map(|response| response.completions)
-            .collect::<Vec<_>>();
-        let snapshot = buffer.update(cx, |buffer, _| buffer.snapshot());
-
-        assert_eq!(completions.len(), 1);
-        assert_eq!(completions[0].new_text, "textEditText");
-        assert_eq!(
-            completions[0].replace_range.to_offset(&snapshot),
-            text.len() - 3..text.len()
-        );
-    }
-
-    // Test 2: When both text_edit and text_edit_text are None with default edit_range
-    {
-        buffer.update(cx, |buffer, cx| buffer.set_text(text, cx));
-        let completions = project.update(cx, |project, cx| {
-            project.completions(&buffer, text.len(), DEFAULT_COMPLETION_CONTEXT, cx)
-        });
-
-        fake_server
-            .set_request_handler::<lsp::request::Completion, _, _>(|_, _| async {
-                Ok(Some(lsp::CompletionResponse::List(lsp::CompletionList {
-                    is_incomplete: false,
-                    item_defaults: Some(lsp::CompletionListItemDefaults {
-                        edit_range: Some(lsp::CompletionListItemDefaultsEditRange::Range(
-                            lsp::Range::new(
-                                lsp::Position::new(0, text.len() as u32 - 3),
-                                lsp::Position::new(0, text.len() as u32),
-                            ),
-                        )),
-                        ..Default::default()
-                    }),
-                    items: vec![lsp::CompletionItem {
-                        label: "labelText".into(),
-                        text_edit_text: None,
-                        insert_text: Some("irrelevant".into()),
-                        text_edit: None,
-                        ..Default::default()
-                    }],
-                })))
-            })
-            .next()
-            .await;
-
-        let completions = completions
-            .await
-            .unwrap()
-            .into_iter()
-            .flat_map(|response| response.completions)
-            .collect::<Vec<_>>();
-        let snapshot = buffer.update(cx, |buffer, _| buffer.snapshot());
-
-        assert_eq!(completions.len(), 1);
-        assert_eq!(completions[0].new_text, "labelText");
-        assert_eq!(
-            completions[0].replace_range.to_offset(&snapshot),
-            text.len() - 3..text.len()
-        );
-    }
-}
-
-#[gpui::test]
-async fn test_completions_without_edit_ranges(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/dir"),
-        json!({
-            "a.ts": "",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
-
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-    language_registry.add(typescript_lang());
-    let mut fake_language_servers = language_registry.register_fake_lsp(
-        "TypeScript",
-        FakeLspAdapter {
-            capabilities: lsp::ServerCapabilities {
-                completion_provider: Some(lsp::CompletionOptions {
-                    trigger_characters: Some(vec![":".to_string()]),
-                    ..Default::default()
-                }),
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-    );
-
-    let (buffer, _handle) = project
-        .update(cx, |p, cx| {
-            p.open_local_buffer_with_lsp(path!("/dir/a.ts"), cx)
-        })
-        .await
-        .unwrap();
-
-    let fake_server = fake_language_servers.next().await.unwrap();
-
-    // Test 1: When text_edit is None but insert_text exists (no edit_range in defaults)
-    let text = "let a = b.fqn";
-    buffer.update(cx, |buffer, cx| buffer.set_text(text, cx));
-    let completions = project.update(cx, |project, cx| {
-        project.completions(&buffer, text.len(), DEFAULT_COMPLETION_CONTEXT, cx)
-    });
-
-    fake_server
-        .set_request_handler::<lsp::request::Completion, _, _>(|_, _| async move {
-            Ok(Some(lsp::CompletionResponse::Array(vec![
-                lsp::CompletionItem {
-                    label: "fullyQualifiedName?".into(),
-                    insert_text: Some("fullyQualifiedName".into()),
-                    ..Default::default()
-                },
-            ])))
-        })
-        .next()
-        .await;
-    let completions = completions
-        .await
-        .unwrap()
-        .into_iter()
-        .flat_map(|response| response.completions)
-        .collect::<Vec<_>>();
-    let snapshot = buffer.update(cx, |buffer, _| buffer.snapshot());
-    assert_eq!(completions.len(), 1);
-    assert_eq!(completions[0].new_text, "fullyQualifiedName");
-    assert_eq!(
-        completions[0].replace_range.to_offset(&snapshot),
-        text.len() - 3..text.len()
-    );
-
-    // Test 2: When both text_edit and insert_text are None (no edit_range in defaults)
-    let text = "let a = \"atoms/cmp\"";
-    buffer.update(cx, |buffer, cx| buffer.set_text(text, cx));
-    let completions = project.update(cx, |project, cx| {
-        project.completions(&buffer, text.len() - 1, DEFAULT_COMPLETION_CONTEXT, cx)
-    });
-
-    fake_server
-        .set_request_handler::<lsp::request::Completion, _, _>(|_, _| async move {
-            Ok(Some(lsp::CompletionResponse::Array(vec![
-                lsp::CompletionItem {
-                    label: "component".into(),
-                    ..Default::default()
-                },
-            ])))
-        })
-        .next()
-        .await;
-    let completions = completions
-        .await
-        .unwrap()
-        .into_iter()
-        .flat_map(|response| response.completions)
-        .collect::<Vec<_>>();
-    let snapshot = buffer.update(cx, |buffer, _| buffer.snapshot());
-    assert_eq!(completions.len(), 1);
-    assert_eq!(completions[0].new_text, "component");
-    assert_eq!(
-        completions[0].replace_range.to_offset(&snapshot),
-        text.len() - 4..text.len() - 1
-    );
-}
-
-#[gpui::test]
-async fn test_completions_with_carriage_returns(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/dir"),
-        json!({
-            "a.ts": "",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
-
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-    language_registry.add(typescript_lang());
-    let mut fake_language_servers = language_registry.register_fake_lsp(
-        "TypeScript",
-        FakeLspAdapter {
-            capabilities: lsp::ServerCapabilities {
-                completion_provider: Some(lsp::CompletionOptions {
-                    trigger_characters: Some(vec![":".to_string()]),
-                    ..Default::default()
-                }),
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-    );
-
-    let (buffer, _handle) = project
-        .update(cx, |p, cx| {
-            p.open_local_buffer_with_lsp(path!("/dir/a.ts"), cx)
-        })
-        .await
-        .unwrap();
-
-    let fake_server = fake_language_servers.next().await.unwrap();
-
-    let text = "let a = b.fqn";
-    buffer.update(cx, |buffer, cx| buffer.set_text(text, cx));
-    let completions = project.update(cx, |project, cx| {
-        project.completions(&buffer, text.len(), DEFAULT_COMPLETION_CONTEXT, cx)
-    });
-
-    fake_server
-        .set_request_handler::<lsp::request::Completion, _, _>(|_, _| async move {
-            Ok(Some(lsp::CompletionResponse::Array(vec![
-                lsp::CompletionItem {
-                    label: "fullyQualifiedName?".into(),
-                    insert_text: Some("fully\rQualified\r\nName".into()),
-                    ..Default::default()
-                },
-            ])))
-        })
-        .next()
-        .await;
-    let completions = completions
-        .await
-        .unwrap()
-        .into_iter()
-        .flat_map(|response| response.completions)
-        .collect::<Vec<_>>();
-    assert_eq!(completions.len(), 1);
-    assert_eq!(completions[0].new_text, "fully\nQualified\nName");
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_apply_code_actions_with_commands(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/dir"),
-        json!({
-            "a.ts": "a",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
-
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-    language_registry.add(typescript_lang());
-    let mut fake_language_servers = language_registry.register_fake_lsp(
-        "TypeScript",
-        FakeLspAdapter {
-            capabilities: lsp::ServerCapabilities {
-                code_action_provider: Some(lsp::CodeActionProviderCapability::Options(
-                    lsp::CodeActionOptions {
-                        resolve_provider: Some(true),
-                        ..lsp::CodeActionOptions::default()
-                    },
-                )),
-                execute_command_provider: Some(lsp::ExecuteCommandOptions {
-                    commands: vec!["_the/command".to_string()],
-                    ..lsp::ExecuteCommandOptions::default()
-                }),
-                ..lsp::ServerCapabilities::default()
-            },
-            ..FakeLspAdapter::default()
-        },
-    );
-
-    let (buffer, _handle) = project
-        .update(cx, |p, cx| {
-            p.open_local_buffer_with_lsp(path!("/dir/a.ts"), cx)
-        })
-        .await
-        .unwrap();
-
-    let fake_server = fake_language_servers.next().await.unwrap();
-
-    // Language server returns code actions that contain commands, and not edits.
-    let actions = project.update(cx, |project, cx| {
-        project.code_actions(&buffer, 0..0, None, cx)
-    });
-    fake_server
-        .set_request_handler::<lsp::request::CodeActionRequest, _, _>(|_, _| async move {
-            Ok(Some(vec![
-                lsp::CodeActionOrCommand::CodeAction(lsp::CodeAction {
-                    title: "The code action".into(),
-                    data: Some(serde_json::json!({
-                        "command": "_the/command",
-                    })),
-                    ..lsp::CodeAction::default()
-                }),
-                lsp::CodeActionOrCommand::CodeAction(lsp::CodeAction {
-                    title: "two".into(),
-                    ..lsp::CodeAction::default()
-                }),
-            ]))
-        })
-        .next()
-        .await;
-
-    let action = actions.await.unwrap().unwrap()[0].clone();
-    let apply = project.update(cx, |project, cx| {
-        project.apply_code_action(buffer.clone(), action, true, cx)
-    });
-
-    // Resolving the code action does not populate its edits. In absence of
-    // edits, we must execute the given command.
-    fake_server.set_request_handler::<lsp::request::CodeActionResolveRequest, _, _>(
-        |mut action, _| async move {
-            if action.data.is_some() {
-                action.command = Some(lsp::Command {
-                    title: "The command".into(),
-                    command: "_the/command".into(),
-                    arguments: Some(vec![json!("the-argument")]),
-                });
-            }
-            Ok(action)
-        },
-    );
-
-    // While executing the command, the language server sends the editor
-    // a `workspaceEdit` request.
-    fake_server
-        .set_request_handler::<lsp::request::ExecuteCommand, _, _>({
-            let fake = fake_server.clone();
-            move |params, _| {
-                assert_eq!(params.command, "_the/command");
-                let fake = fake.clone();
-                async move {
-                    fake.server
-                        .request::<lsp::request::ApplyWorkspaceEdit>(
-                            lsp::ApplyWorkspaceEditParams {
-                                label: None,
-                                edit: lsp::WorkspaceEdit {
-                                    changes: Some(
-                                        [(
-                                            lsp::Uri::from_file_path(path!("/dir/a.ts")).unwrap(),
-                                            vec![lsp::TextEdit {
-                                                range: lsp::Range::new(
-                                                    lsp::Position::new(0, 0),
-                                                    lsp::Position::new(0, 0),
-                                                ),
-                                                new_text: "X".into(),
-                                            }],
-                                        )]
-                                        .into_iter()
-                                        .collect(),
-                                    ),
-                                    ..Default::default()
-                                },
-                            },
-                        )
-                        .await
-                        .into_response()
-                        .unwrap();
-                    Ok(Some(json!(null)))
-                }
-            }
-        })
-        .next()
-        .await;
-
-    // Applying the code action returns a project transaction containing the edits
-    // sent by the language server in its `workspaceEdit` request.
-    let transaction = apply.await.unwrap();
-    assert!(transaction.0.contains_key(&buffer));
-    buffer.update(cx, |buffer, cx| {
-        assert_eq!(buffer.text(), "Xa");
-        buffer.undo(cx);
-        assert_eq!(buffer.text(), "a");
-    });
-}
-
-#[gpui::test]
-async fn test_rename_file_to_new_directory(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-    let fs = FakeFs::new(cx.background_executor.clone());
-    let expected_contents = "content";
-    fs.as_fake()
-        .insert_tree(
-            "/root",
-            json!({
-                "test.txt": expected_contents
-            }),
-        )
-        .await;
-
-    let project = Project::test(fs, [path!("/root").as_ref()], cx).await;
-
-    let (worktree, entry_id) = project.read_with(cx, |project, cx| {
-        let worktree = project.worktrees(cx).next().unwrap();
-        let entry_id = worktree
-            .read(cx)
-            .entry_for_path(rel_path("test.txt"))
-            .unwrap()
-            .id;
-        (worktree, entry_id)
-    });
-    let worktree_id = worktree.read_with(cx, |worktree, _| worktree.id());
-    let _result = project
-        .update(cx, |project, cx| {
-            project.rename_entry(
-                entry_id,
-                (worktree_id, rel_path("dir1/dir2/dir3/test.txt")).into(),
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-    worktree.read_with(cx, |worktree, _| {
-        assert!(
-            worktree.entry_for_path(rel_path("test.txt")).is_none(),
-            "Old file should have been removed"
-        );
-        assert!(
-            worktree
-                .entry_for_path(rel_path("dir1/dir2/dir3/test.txt"))
-                .is_some(),
-            "Whole directory hierarchy and the new file should have been created"
-        );
-    });
-    assert_eq!(
-        worktree
-            .update(cx, |worktree, cx| {
-                worktree.load_file(rel_path("dir1/dir2/dir3/test.txt"), cx)
-            })
-            .await
-            .unwrap()
-            .text,
-        expected_contents,
-        "Moved file's contents should be preserved"
-    );
-
-    let entry_id = worktree.read_with(cx, |worktree, _| {
-        worktree
-            .entry_for_path(rel_path("dir1/dir2/dir3/test.txt"))
-            .unwrap()
-            .id
-    });
-
-    let _result = project
-        .update(cx, |project, cx| {
-            project.rename_entry(
-                entry_id,
-                (worktree_id, rel_path("dir1/dir2/test.txt")).into(),
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-    worktree.read_with(cx, |worktree, _| {
-        assert!(
-            worktree.entry_for_path(rel_path("test.txt")).is_none(),
-            "First file should not reappear"
-        );
-        assert!(
-            worktree
-                .entry_for_path(rel_path("dir1/dir2/dir3/test.txt"))
-                .is_none(),
-            "Old file should have been removed"
-        );
-        assert!(
-            worktree
-                .entry_for_path(rel_path("dir1/dir2/test.txt"))
-                .is_some(),
-            "No error should have occurred after moving into existing directory"
-        );
-    });
-    assert_eq!(
-        worktree
-            .update(cx, |worktree, cx| {
-                worktree.load_file(rel_path("dir1/dir2/test.txt"), cx)
-            })
-            .await
-            .unwrap()
-            .text,
-        expected_contents,
-        "Moved file's contents should be preserved"
-    );
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_save_file(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/dir"),
-        json!({
-            "file1": "the old contents",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-    let buffer = project
-        .update(cx, |p, cx| p.open_local_buffer(path!("/dir/file1"), cx))
-        .await
-        .unwrap();
-    buffer.update(cx, |buffer, cx| {
-        assert_eq!(buffer.text(), "the old contents");
-        buffer.edit([(0..0, "a line of text.\n".repeat(10 * 1024))], None, cx);
-    });
-
-    project
-        .update(cx, |project, cx| project.save_buffer(buffer.clone(), cx))
-        .await
-        .unwrap();
-
-    let new_text = fs
-        .load(Path::new(path!("/dir/file1")))
-        .await
-        .unwrap()
-        .replace("\r\n", "\n");
-    assert_eq!(new_text, buffer.update(cx, |buffer, _| buffer.text()));
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_save_file_spawns_language_server(cx: &mut gpui::TestAppContext) {
-    // Issue: #24349
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(path!("/dir"), json!({})).await;
-
-    let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-
-    language_registry.add(rust_lang());
-    let mut fake_rust_servers = language_registry.register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            name: "the-rust-language-server",
-            capabilities: lsp::ServerCapabilities {
-                completion_provider: Some(lsp::CompletionOptions {
-                    trigger_characters: Some(vec![".".to_string(), "::".to_string()]),
-                    ..Default::default()
-                }),
-                text_document_sync: Some(lsp::TextDocumentSyncCapability::Options(
-                    lsp::TextDocumentSyncOptions {
-                        save: Some(lsp::TextDocumentSyncSaveOptions::Supported(true)),
-                        ..Default::default()
-                    },
-                )),
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-    );
-
-    let buffer = project
-        .update(cx, |this, cx| this.create_buffer(false, cx))
-        .unwrap()
-        .await;
-    project.update(cx, |this, cx| {
-        this.register_buffer_with_language_servers(&buffer, cx);
-        buffer.update(cx, |buffer, cx| {
-            assert!(!this.has_language_servers_for(buffer, cx));
-        })
-    });
-
-    project
-        .update(cx, |this, cx| {
-            let worktree_id = this.worktrees(cx).next().unwrap().read(cx).id();
-            this.save_buffer_as(
-                buffer.clone(),
-                ProjectPath {
-                    worktree_id,
-                    path: rel_path("file.rs").into(),
-                },
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-    // A server is started up, and it is notified about Rust files.
-    let mut fake_rust_server = fake_rust_servers.next().await.unwrap();
-    assert_eq!(
-        fake_rust_server
-            .receive_notification::<lsp::notification::DidOpenTextDocument>()
-            .await
-            .text_document,
-        lsp::TextDocumentItem {
-            uri: lsp::Uri::from_file_path(path!("/dir/file.rs")).unwrap(),
-            version: 0,
-            text: "".to_string(),
-            language_id: "rust".to_string(),
-        }
-    );
-
-    project.update(cx, |this, cx| {
-        buffer.update(cx, |buffer, cx| {
-            assert!(this.has_language_servers_for(buffer, cx));
-        })
-    });
-}
-
-#[gpui::test(iterations = 30)]
-async fn test_file_changes_multiple_times_on_disk(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/dir"),
-        json!({
-            "file1": "the original contents",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-    let worktree = project.read_with(cx, |project, cx| project.worktrees(cx).next().unwrap());
-    let buffer = project
-        .update(cx, |p, cx| p.open_local_buffer(path!("/dir/file1"), cx))
-        .await
-        .unwrap();
-
-    // Simulate buffer diffs being slow, so that they don't complete before
-    // the next file change occurs.
-    cx.executor().deprioritize(*language::BUFFER_DIFF_TASK);
-
-    // Change the buffer's file on disk, and then wait for the file change
-    // to be detected by the worktree, so that the buffer starts reloading.
-    fs.save(
-        path!("/dir/file1").as_ref(),
-        &"the first contents".into(),
-        Default::default(),
-    )
-    .await
-    .unwrap();
-    worktree.next_event(cx).await;
-
-    // Change the buffer's file again. Depending on the random seed, the
-    // previous file change may still be in progress.
-    fs.save(
-        path!("/dir/file1").as_ref(),
-        &"the second contents".into(),
-        Default::default(),
-    )
-    .await
-    .unwrap();
-    worktree.next_event(cx).await;
-
-    cx.executor().run_until_parked();
-    let on_disk_text = fs.load(Path::new(path!("/dir/file1"))).await.unwrap();
-    buffer.read_with(cx, |buffer, _| {
-        assert_eq!(buffer.text(), on_disk_text);
-        assert!(!buffer.is_dirty(), "buffer should not be dirty");
-        assert!(!buffer.has_conflict(), "buffer should not be dirty");
-    });
-}
-
-#[gpui::test(iterations = 30)]
-async fn test_edit_buffer_while_it_reloads(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/dir"),
-        json!({
-            "file1": "the original contents",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-    let worktree = project.read_with(cx, |project, cx| project.worktrees(cx).next().unwrap());
-    let buffer = project
-        .update(cx, |p, cx| p.open_local_buffer(path!("/dir/file1"), cx))
-        .await
-        .unwrap();
-
-    // Simulate buffer diffs being slow, so that they don't complete before
-    // the next file change occurs.
-    cx.executor().deprioritize(*language::BUFFER_DIFF_TASK);
-
-    // Change the buffer's file on disk, and then wait for the file change
-    // to be detected by the worktree, so that the buffer starts reloading.
-    fs.save(
-        path!("/dir/file1").as_ref(),
-        &"the first contents".into(),
-        Default::default(),
-    )
-    .await
-    .unwrap();
-    worktree.next_event(cx).await;
-
-    cx.executor()
-        .spawn(cx.executor().simulate_random_delay())
-        .await;
-
-    // Perform a noop edit, causing the buffer's version to increase.
-    buffer.update(cx, |buffer, cx| {
-        buffer.edit([(0..0, " ")], None, cx);
-        buffer.undo(cx);
-    });
-
-    cx.executor().run_until_parked();
-    let on_disk_text = fs.load(Path::new(path!("/dir/file1"))).await.unwrap();
-    buffer.read_with(cx, |buffer, _| {
-        let buffer_text = buffer.text();
-        if buffer_text == on_disk_text {
-            assert!(
-                !buffer.is_dirty() && !buffer.has_conflict(),
-                "buffer shouldn't be dirty. text: {buffer_text:?}, disk text: {on_disk_text:?}",
-            );
-        }
-        // If the file change occurred while the buffer was processing the first
-        // change, the buffer will be in a conflicting state.
-        else {
-            assert!(buffer.is_dirty(), "buffer should report that it is dirty. text: {buffer_text:?}, disk text: {on_disk_text:?}");
-            assert!(buffer.has_conflict(), "buffer should report that it is dirty. text: {buffer_text:?}, disk text: {on_disk_text:?}");
-        }
-    });
-}
-
-#[gpui::test]
-async fn test_save_in_single_file_worktree(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/dir"),
-        json!({
-            "file1": "the old contents",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), [path!("/dir/file1").as_ref()], cx).await;
-    let buffer = project
-        .update(cx, |p, cx| p.open_local_buffer(path!("/dir/file1"), cx))
-        .await
-        .unwrap();
-    buffer.update(cx, |buffer, cx| {
-        buffer.edit([(0..0, "a line of text.\n".repeat(10 * 1024))], None, cx);
-    });
-
-    project
-        .update(cx, |project, cx| project.save_buffer(buffer.clone(), cx))
-        .await
-        .unwrap();
-
-    let new_text = fs
-        .load(Path::new(path!("/dir/file1")))
-        .await
-        .unwrap()
-        .replace("\r\n", "\n");
-    assert_eq!(new_text, buffer.update(cx, |buffer, _| buffer.text()));
-}
-
-#[gpui::test]
-async fn test_save_as(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree("/dir", json!({})).await;
-
-    let project = Project::test(fs.clone(), ["/dir".as_ref()], cx).await;
-
-    let languages = project.update(cx, |project, _| project.languages().clone());
-    languages.add(rust_lang());
-
-    let buffer = project.update(cx, |project, cx| {
-        project.create_local_buffer("", None, false, cx)
-    });
-    buffer.update(cx, |buffer, cx| {
-        buffer.edit([(0..0, "abc")], None, cx);
-        assert!(buffer.is_dirty());
-        assert!(!buffer.has_conflict());
-        assert_eq!(buffer.language().unwrap().name(), "Plain Text".into());
-    });
-    project
-        .update(cx, |project, cx| {
-            let worktree_id = project.worktrees(cx).next().unwrap().read(cx).id();
-            let path = ProjectPath {
-                worktree_id,
-                path: rel_path("file1.rs").into(),
-            };
-            project.save_buffer_as(buffer.clone(), path, cx)
-        })
-        .await
-        .unwrap();
-    assert_eq!(fs.load(Path::new("/dir/file1.rs")).await.unwrap(), "abc");
-
-    cx.executor().run_until_parked();
-    buffer.update(cx, |buffer, cx| {
-        assert_eq!(
-            buffer.file().unwrap().full_path(cx),
-            Path::new("dir/file1.rs")
-        );
-        assert!(!buffer.is_dirty());
-        assert!(!buffer.has_conflict());
-        assert_eq!(buffer.language().unwrap().name(), "Rust".into());
-    });
-
-    let opened_buffer = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer("/dir/file1.rs", cx)
-        })
-        .await
-        .unwrap();
-    assert_eq!(opened_buffer, buffer);
-}
-
-#[gpui::test]
-async fn test_save_as_existing_file(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-
-    fs.insert_tree(
-        path!("/dir"),
-        json!({
-                "data_a.txt": "data about a"
-        }),
-    )
-    .await;
-
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer(path!("/dir/data_a.txt"), cx)
-        })
-        .await
-        .unwrap();
-
-    buffer.update(cx, |buffer, cx| {
-        buffer.edit([(11..12, "b")], None, cx);
-    });
-
-    // Save buffer's contents as a new file and confirm that the buffer's now
-    // associated with `data_b.txt` instead of `data_a.txt`, confirming that the
-    // file associated with the buffer has now been updated to `data_b.txt`
-    project
-        .update(cx, |project, cx| {
-            let worktree_id = project.worktrees(cx).next().unwrap().read(cx).id();
-            let new_path = ProjectPath {
-                worktree_id,
-                path: rel_path("data_b.txt").into(),
-            };
-
-            project.save_buffer_as(buffer.clone(), new_path, cx)
-        })
-        .await
-        .unwrap();
-
-    buffer.update(cx, |buffer, cx| {
-        assert_eq!(
-            buffer.file().unwrap().full_path(cx),
-            Path::new("dir/data_b.txt")
-        )
-    });
-
-    // Open the original `data_a.txt` file, confirming that its contents are
-    // unchanged and the resulting buffer's associated file is `data_a.txt`.
-    let original_buffer = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer(path!("/dir/data_a.txt"), cx)
-        })
-        .await
-        .unwrap();
-
-    original_buffer.update(cx, |buffer, cx| {
-        assert_eq!(buffer.text(), "data about a");
-        assert_eq!(
-            buffer.file().unwrap().full_path(cx),
-            Path::new("dir/data_a.txt")
-        )
-    });
-}
-
-#[gpui::test(retries = 5)]
-async fn test_rescan_and_remote_updates(cx: &mut gpui::TestAppContext) {
-    use worktree::WorktreeModelHandle as _;
-
-    init_test(cx);
-    cx.executor().allow_parking();
-
-    let dir = TempTree::new(json!({
-        "a": {
-            "file1": "",
-            "file2": "",
-            "file3": "",
-        },
-        "b": {
-            "c": {
-                "file4": "",
-                "file5": "",
-            }
-        }
-    }));
-
-    let project = Project::test(Arc::new(RealFs::new(None, cx.executor())), [dir.path()], cx).await;
-
-    let buffer_for_path = |path: &'static str, cx: &mut gpui::TestAppContext| {
-        let buffer = project.update(cx, |p, cx| p.open_local_buffer(dir.path().join(path), cx));
-        async move { buffer.await.unwrap() }
-    };
-    let id_for_path = |path: &'static str, cx: &mut gpui::TestAppContext| {
-        project.update(cx, |project, cx| {
-            let tree = project.worktrees(cx).next().unwrap();
-            tree.read(cx)
-                .entry_for_path(rel_path(path))
-                .unwrap_or_else(|| panic!("no entry for path {}", path))
-                .id
-        })
-    };
-
-    let buffer2 = buffer_for_path("a/file2", cx).await;
-    let buffer3 = buffer_for_path("a/file3", cx).await;
-    let buffer4 = buffer_for_path("b/c/file4", cx).await;
-    let buffer5 = buffer_for_path("b/c/file5", cx).await;
-
-    let file2_id = id_for_path("a/file2", cx);
-    let file3_id = id_for_path("a/file3", cx);
-    let file4_id = id_for_path("b/c/file4", cx);
-
-    // Create a remote copy of this worktree.
-    let tree = project.update(cx, |project, cx| project.worktrees(cx).next().unwrap());
-    let metadata = tree.update(cx, |tree, _| tree.metadata_proto());
-
-    let updates = Arc::new(Mutex::new(Vec::new()));
-    tree.update(cx, |tree, cx| {
-        let updates = updates.clone();
-        tree.observe_updates(0, cx, move |update| {
-            updates.lock().push(update);
-            async { true }
-        });
-    });
-
-    let remote = cx.update(|cx| {
-        Worktree::remote(
-            0,
-            ReplicaId::REMOTE_SERVER,
-            metadata,
-            project.read(cx).client().into(),
-            project.read(cx).path_style(cx),
-            cx,
-        )
-    });
-
-    cx.executor().run_until_parked();
-
-    cx.update(|cx| {
-        assert!(!buffer2.read(cx).is_dirty());
-        assert!(!buffer3.read(cx).is_dirty());
-        assert!(!buffer4.read(cx).is_dirty());
-        assert!(!buffer5.read(cx).is_dirty());
-    });
-
-    // Rename and delete files and directories.
-    tree.flush_fs_events(cx).await;
-    std::fs::rename(dir.path().join("a/file3"), dir.path().join("b/c/file3")).unwrap();
-    std::fs::remove_file(dir.path().join("b/c/file5")).unwrap();
-    std::fs::rename(dir.path().join("b/c"), dir.path().join("d")).unwrap();
-    std::fs::rename(dir.path().join("a/file2"), dir.path().join("a/file2.new")).unwrap();
-    tree.flush_fs_events(cx).await;
-
-    cx.update(|app| {
-        assert_eq!(
-            tree.read(app).paths().collect::<Vec<_>>(),
-            vec![
-                rel_path("a"),
-                rel_path("a/file1"),
-                rel_path("a/file2.new"),
-                rel_path("b"),
-                rel_path("d"),
-                rel_path("d/file3"),
-                rel_path("d/file4"),
-            ]
-        );
-    });
-
-    assert_eq!(id_for_path("a/file2.new", cx), file2_id);
-    assert_eq!(id_for_path("d/file3", cx), file3_id);
-    assert_eq!(id_for_path("d/file4", cx), file4_id);
-
-    cx.update(|cx| {
-        assert_eq!(
-            buffer2.read(cx).file().unwrap().path().as_ref(),
-            rel_path("a/file2.new")
-        );
-        assert_eq!(
-            buffer3.read(cx).file().unwrap().path().as_ref(),
-            rel_path("d/file3")
-        );
-        assert_eq!(
-            buffer4.read(cx).file().unwrap().path().as_ref(),
-            rel_path("d/file4")
-        );
-        assert_eq!(
-            buffer5.read(cx).file().unwrap().path().as_ref(),
-            rel_path("b/c/file5")
-        );
-
-        assert_matches!(
-            buffer2.read(cx).file().unwrap().disk_state(),
-            DiskState::Present { .. }
-        );
-        assert_matches!(
-            buffer3.read(cx).file().unwrap().disk_state(),
-            DiskState::Present { .. }
-        );
-        assert_matches!(
-            buffer4.read(cx).file().unwrap().disk_state(),
-            DiskState::Present { .. }
-        );
-        assert_eq!(
-            buffer5.read(cx).file().unwrap().disk_state(),
-            DiskState::Deleted
-        );
-    });
-
-    // Update the remote worktree. Check that it becomes consistent with the
-    // local worktree.
-    cx.executor().run_until_parked();
-
-    remote.update(cx, |remote, _| {
-        for update in updates.lock().drain(..) {
-            remote.as_remote_mut().unwrap().update_from_remote(update);
-        }
-    });
-    cx.executor().run_until_parked();
-    remote.update(cx, |remote, _| {
-        assert_eq!(
-            remote.paths().collect::<Vec<_>>(),
-            vec![
-                rel_path("a"),
-                rel_path("a/file1"),
-                rel_path("a/file2.new"),
-                rel_path("b"),
-                rel_path("d"),
-                rel_path("d/file3"),
-                rel_path("d/file4"),
-            ]
-        );
-    });
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_buffer_identity_across_renames(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/dir"),
-        json!({
-            "a": {
-                "file1": "",
-            }
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [Path::new(path!("/dir"))], cx).await;
-    let tree = project.update(cx, |project, cx| project.worktrees(cx).next().unwrap());
-    let tree_id = tree.update(cx, |tree, _| tree.id());
-
-    let id_for_path = |path: &'static str, cx: &mut gpui::TestAppContext| {
-        project.update(cx, |project, cx| {
-            let tree = project.worktrees(cx).next().unwrap();
-            tree.read(cx)
-                .entry_for_path(rel_path(path))
-                .unwrap_or_else(|| panic!("no entry for path {}", path))
-                .id
-        })
-    };
-
-    let dir_id = id_for_path("a", cx);
-    let file_id = id_for_path("a/file1", cx);
-    let buffer = project
-        .update(cx, |p, cx| {
-            p.open_buffer((tree_id, rel_path("a/file1")), cx)
-        })
-        .await
-        .unwrap();
-    buffer.update(cx, |buffer, _| assert!(!buffer.is_dirty()));
-
-    project
-        .update(cx, |project, cx| {
-            project.rename_entry(dir_id, (tree_id, rel_path("b")).into(), cx)
-        })
-        .unwrap()
-        .await
-        .into_included()
-        .unwrap();
-    cx.executor().run_until_parked();
-
-    assert_eq!(id_for_path("b", cx), dir_id);
-    assert_eq!(id_for_path("b/file1", cx), file_id);
-    buffer.update(cx, |buffer, _| assert!(!buffer.is_dirty()));
-}
-
-#[gpui::test]
-async fn test_buffer_deduping(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/dir",
-        json!({
-            "a.txt": "a-contents",
-            "b.txt": "b-contents",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/dir".as_ref()], cx).await;
-
-    // Spawn multiple tasks to open paths, repeating some paths.
-    let (buffer_a_1, buffer_b, buffer_a_2) = project.update(cx, |p, cx| {
-        (
-            p.open_local_buffer("/dir/a.txt", cx),
-            p.open_local_buffer("/dir/b.txt", cx),
-            p.open_local_buffer("/dir/a.txt", cx),
-        )
-    });
-
-    let buffer_a_1 = buffer_a_1.await.unwrap();
-    let buffer_a_2 = buffer_a_2.await.unwrap();
-    let buffer_b = buffer_b.await.unwrap();
-    assert_eq!(buffer_a_1.update(cx, |b, _| b.text()), "a-contents");
-    assert_eq!(buffer_b.update(cx, |b, _| b.text()), "b-contents");
-
-    // There is only one buffer per path.
-    let buffer_a_id = buffer_a_1.entity_id();
-    assert_eq!(buffer_a_2.entity_id(), buffer_a_id);
-
-    // Open the same path again while it is still open.
-    drop(buffer_a_1);
-    let buffer_a_3 = project
-        .update(cx, |p, cx| p.open_local_buffer("/dir/a.txt", cx))
-        .await
-        .unwrap();
-
-    // There's still only one buffer per path.
-    assert_eq!(buffer_a_3.entity_id(), buffer_a_id);
-}
-
-#[gpui::test]
-async fn test_buffer_is_dirty(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/dir"),
-        json!({
-            "file1": "abc",
-            "file2": "def",
-            "file3": "ghi",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-
-    let buffer1 = project
-        .update(cx, |p, cx| p.open_local_buffer(path!("/dir/file1"), cx))
-        .await
-        .unwrap();
-    let events = Arc::new(Mutex::new(Vec::new()));
-
-    // initially, the buffer isn't dirty.
-    buffer1.update(cx, |buffer, cx| {
-        cx.subscribe(&buffer1, {
-            let events = events.clone();
-            move |_, _, event, _| match event {
-                BufferEvent::Operation { .. } => {}
-                _ => events.lock().push(event.clone()),
-            }
-        })
-        .detach();
-
-        assert!(!buffer.is_dirty());
-        assert!(events.lock().is_empty());
-
-        buffer.edit([(1..2, "")], None, cx);
-    });
-
-    // after the first edit, the buffer is dirty, and emits a dirtied event.
-    buffer1.update(cx, |buffer, cx| {
-        assert!(buffer.text() == "ac");
-        assert!(buffer.is_dirty());
-        assert_eq!(
-            *events.lock(),
-            &[
-                language::BufferEvent::Edited,
-                language::BufferEvent::DirtyChanged
-            ]
-        );
-        events.lock().clear();
-        buffer.did_save(
-            buffer.version(),
-            buffer.file().unwrap().disk_state().mtime(),
-            cx,
-        );
-    });
-
-    // after saving, the buffer is not dirty, and emits a saved event.
-    buffer1.update(cx, |buffer, cx| {
-        assert!(!buffer.is_dirty());
-        assert_eq!(*events.lock(), &[language::BufferEvent::Saved]);
-        events.lock().clear();
-
-        buffer.edit([(1..1, "B")], None, cx);
-        buffer.edit([(2..2, "D")], None, cx);
-    });
-
-    // after editing again, the buffer is dirty, and emits another dirty event.
-    buffer1.update(cx, |buffer, cx| {
-        assert!(buffer.text() == "aBDc");
-        assert!(buffer.is_dirty());
-        assert_eq!(
-            *events.lock(),
-            &[
-                language::BufferEvent::Edited,
-                language::BufferEvent::DirtyChanged,
-                language::BufferEvent::Edited,
-            ],
-        );
-        events.lock().clear();
-
-        // After restoring the buffer to its previously-saved state,
-        // the buffer is not considered dirty anymore.
-        buffer.edit([(1..3, "")], None, cx);
-        assert!(buffer.text() == "ac");
-        assert!(!buffer.is_dirty());
-    });
-
-    assert_eq!(
-        *events.lock(),
-        &[
-            language::BufferEvent::Edited,
-            language::BufferEvent::DirtyChanged
-        ]
-    );
-
-    // When a file is deleted, it is not considered dirty.
-    let events = Arc::new(Mutex::new(Vec::new()));
-    let buffer2 = project
-        .update(cx, |p, cx| p.open_local_buffer(path!("/dir/file2"), cx))
-        .await
-        .unwrap();
-    buffer2.update(cx, |_, cx| {
-        cx.subscribe(&buffer2, {
-            let events = events.clone();
-            move |_, _, event, _| match event {
-                BufferEvent::Operation { .. } => {}
-                _ => events.lock().push(event.clone()),
-            }
-        })
-        .detach();
-    });
-
-    fs.remove_file(path!("/dir/file2").as_ref(), Default::default())
-        .await
-        .unwrap();
-    cx.executor().run_until_parked();
-    buffer2.update(cx, |buffer, _| assert!(!buffer.is_dirty()));
-    assert_eq!(
-        mem::take(&mut *events.lock()),
-        &[language::BufferEvent::FileHandleChanged]
-    );
-
-    // Buffer becomes dirty when edited.
-    buffer2.update(cx, |buffer, cx| {
-        buffer.edit([(2..3, "")], None, cx);
-        assert_eq!(buffer.is_dirty(), true);
-    });
-    assert_eq!(
-        mem::take(&mut *events.lock()),
-        &[
-            language::BufferEvent::Edited,
-            language::BufferEvent::DirtyChanged
-        ]
-    );
-
-    // Buffer becomes clean again when all of its content is removed, because
-    // the file was deleted.
-    buffer2.update(cx, |buffer, cx| {
-        buffer.edit([(0..2, "")], None, cx);
-        assert_eq!(buffer.is_empty(), true);
-        assert_eq!(buffer.is_dirty(), false);
-    });
-    assert_eq!(
-        *events.lock(),
-        &[
-            language::BufferEvent::Edited,
-            language::BufferEvent::DirtyChanged
-        ]
-    );
-
-    // When a file is already dirty when deleted, we don't emit a Dirtied event.
-    let events = Arc::new(Mutex::new(Vec::new()));
-    let buffer3 = project
-        .update(cx, |p, cx| p.open_local_buffer(path!("/dir/file3"), cx))
-        .await
-        .unwrap();
-    buffer3.update(cx, |_, cx| {
-        cx.subscribe(&buffer3, {
-            let events = events.clone();
-            move |_, _, event, _| match event {
-                BufferEvent::Operation { .. } => {}
-                _ => events.lock().push(event.clone()),
-            }
-        })
-        .detach();
-    });
-
-    buffer3.update(cx, |buffer, cx| {
-        buffer.edit([(0..0, "x")], None, cx);
-    });
-    events.lock().clear();
-    fs.remove_file(path!("/dir/file3").as_ref(), Default::default())
-        .await
-        .unwrap();
-    cx.executor().run_until_parked();
-    assert_eq!(*events.lock(), &[language::BufferEvent::FileHandleChanged]);
-    cx.update(|cx| assert!(buffer3.read(cx).is_dirty()));
-}
-
-#[gpui::test]
-async fn test_buffer_file_changes_on_disk(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let (initial_contents, initial_offsets) =
-        marked_text_offsets("one twoˇ\nthree ˇfourˇ five\nsixˇ seven\n");
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/dir"),
-        json!({
-            "the-file": initial_contents,
-        }),
-    )
-    .await;
-    let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-    let buffer = project
-        .update(cx, |p, cx| p.open_local_buffer(path!("/dir/the-file"), cx))
-        .await
-        .unwrap();
-
-    let anchors = initial_offsets
-        .iter()
-        .map(|offset| buffer.update(cx, |b, _| b.anchor_before(offset)))
-        .collect::<Vec<_>>();
-
-    // Change the file on disk, adding two new lines of text, and removing
-    // one line.
-    buffer.update(cx, |buffer, _| {
-        assert!(!buffer.is_dirty());
-        assert!(!buffer.has_conflict());
-    });
-
-    let (new_contents, new_offsets) =
-        marked_text_offsets("oneˇ\nthree ˇFOURˇ five\nsixtyˇ seven\n");
-    fs.save(
-        path!("/dir/the-file").as_ref(),
-        &new_contents.as_str().into(),
-        LineEnding::Unix,
-    )
-    .await
-    .unwrap();
-
-    // Because the buffer was not modified, it is reloaded from disk. Its
-    // contents are edited according to the diff between the old and new
-    // file contents.
-    cx.executor().run_until_parked();
-    buffer.update(cx, |buffer, _| {
-        assert_eq!(buffer.text(), new_contents);
-        assert!(!buffer.is_dirty());
-        assert!(!buffer.has_conflict());
-
-        let anchor_offsets = anchors
-            .iter()
-            .map(|anchor| anchor.to_offset(&*buffer))
-            .collect::<Vec<_>>();
-        assert_eq!(anchor_offsets, new_offsets);
-    });
-
-    // Modify the buffer
-    buffer.update(cx, |buffer, cx| {
-        buffer.edit([(0..0, " ")], None, cx);
-        assert!(buffer.is_dirty());
-        assert!(!buffer.has_conflict());
-    });
-
-    // Change the file on disk again, adding blank lines to the beginning.
-    fs.save(
-        path!("/dir/the-file").as_ref(),
-        &"\n\n\nAAAA\naaa\nBB\nbbbbb\n".into(),
-        LineEnding::Unix,
-    )
-    .await
-    .unwrap();
-
-    // Because the buffer is modified, it doesn't reload from disk, but is
-    // marked as having a conflict.
-    cx.executor().run_until_parked();
-    buffer.update(cx, |buffer, _| {
-        assert_eq!(buffer.text(), " ".to_string() + &new_contents);
-        assert!(buffer.has_conflict());
-    });
-}
-
-#[gpui::test]
-async fn test_buffer_line_endings(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/dir"),
-        json!({
-            "file1": "a\nb\nc\n",
-            "file2": "one\r\ntwo\r\nthree\r\n",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-    let buffer1 = project
-        .update(cx, |p, cx| p.open_local_buffer(path!("/dir/file1"), cx))
-        .await
-        .unwrap();
-    let buffer2 = project
-        .update(cx, |p, cx| p.open_local_buffer(path!("/dir/file2"), cx))
-        .await
-        .unwrap();
-
-    buffer1.update(cx, |buffer, _| {
-        assert_eq!(buffer.text(), "a\nb\nc\n");
-        assert_eq!(buffer.line_ending(), LineEnding::Unix);
-    });
-    buffer2.update(cx, |buffer, _| {
-        assert_eq!(buffer.text(), "one\ntwo\nthree\n");
-        assert_eq!(buffer.line_ending(), LineEnding::Windows);
-    });
-
-    // Change a file's line endings on disk from unix to windows. The buffer's
-    // state updates correctly.
-    fs.save(
-        path!("/dir/file1").as_ref(),
-        &"aaa\nb\nc\n".into(),
-        LineEnding::Windows,
-    )
-    .await
-    .unwrap();
-    cx.executor().run_until_parked();
-    buffer1.update(cx, |buffer, _| {
-        assert_eq!(buffer.text(), "aaa\nb\nc\n");
-        assert_eq!(buffer.line_ending(), LineEnding::Windows);
-    });
-
-    // Save a file with windows line endings. The file is written correctly.
-    buffer2.update(cx, |buffer, cx| {
-        buffer.set_text("one\ntwo\nthree\nfour\n", cx);
-    });
-    project
-        .update(cx, |project, cx| project.save_buffer(buffer2, cx))
-        .await
-        .unwrap();
-    assert_eq!(
-        fs.load(path!("/dir/file2").as_ref()).await.unwrap(),
-        "one\r\ntwo\r\nthree\r\nfour\r\n",
-    );
-}
-
-#[gpui::test]
-async fn test_grouped_diagnostics(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/dir"),
-        json!({
-            "a.rs": "
-                fn foo(mut v: Vec<usize>) {
-                    for x in &v {
-                        v.push(1);
-                    }
-                }
-            "
-            .unindent(),
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-    let lsp_store = project.read_with(cx, |project, _| project.lsp_store());
-    let buffer = project
-        .update(cx, |p, cx| p.open_local_buffer(path!("/dir/a.rs"), cx))
-        .await
-        .unwrap();
-
-    let buffer_uri = Uri::from_file_path(path!("/dir/a.rs")).unwrap();
-    let message = lsp::PublishDiagnosticsParams {
-        uri: buffer_uri.clone(),
-        diagnostics: vec![
-            lsp::Diagnostic {
-                range: lsp::Range::new(lsp::Position::new(1, 8), lsp::Position::new(1, 9)),
-                severity: Some(DiagnosticSeverity::WARNING),
-                message: "error 1".to_string(),
-                related_information: Some(vec![lsp::DiagnosticRelatedInformation {
-                    location: lsp::Location {
-                        uri: buffer_uri.clone(),
-                        range: lsp::Range::new(lsp::Position::new(1, 8), lsp::Position::new(1, 9)),
-                    },
-                    message: "error 1 hint 1".to_string(),
-                }]),
-                ..Default::default()
-            },
-            lsp::Diagnostic {
-                range: lsp::Range::new(lsp::Position::new(1, 8), lsp::Position::new(1, 9)),
-                severity: Some(DiagnosticSeverity::HINT),
-                message: "error 1 hint 1".to_string(),
-                related_information: Some(vec![lsp::DiagnosticRelatedInformation {
-                    location: lsp::Location {
-                        uri: buffer_uri.clone(),
-                        range: lsp::Range::new(lsp::Position::new(1, 8), lsp::Position::new(1, 9)),
-                    },
-                    message: "original diagnostic".to_string(),
-                }]),
-                ..Default::default()
-            },
-            lsp::Diagnostic {
-                range: lsp::Range::new(lsp::Position::new(2, 8), lsp::Position::new(2, 17)),
-                severity: Some(DiagnosticSeverity::ERROR),
-                message: "error 2".to_string(),
-                related_information: Some(vec![
-                    lsp::DiagnosticRelatedInformation {
-                        location: lsp::Location {
-                            uri: buffer_uri.clone(),
-                            range: lsp::Range::new(
-                                lsp::Position::new(1, 13),
-                                lsp::Position::new(1, 15),
-                            ),
-                        },
-                        message: "error 2 hint 1".to_string(),
-                    },
-                    lsp::DiagnosticRelatedInformation {
-                        location: lsp::Location {
-                            uri: buffer_uri.clone(),
-                            range: lsp::Range::new(
-                                lsp::Position::new(1, 13),
-                                lsp::Position::new(1, 15),
-                            ),
-                        },
-                        message: "error 2 hint 2".to_string(),
-                    },
-                ]),
-                ..Default::default()
-            },
-            lsp::Diagnostic {
-                range: lsp::Range::new(lsp::Position::new(1, 13), lsp::Position::new(1, 15)),
-                severity: Some(DiagnosticSeverity::HINT),
-                message: "error 2 hint 1".to_string(),
-                related_information: Some(vec![lsp::DiagnosticRelatedInformation {
-                    location: lsp::Location {
-                        uri: buffer_uri.clone(),
-                        range: lsp::Range::new(lsp::Position::new(2, 8), lsp::Position::new(2, 17)),
-                    },
-                    message: "original diagnostic".to_string(),
-                }]),
-                ..Default::default()
-            },
-            lsp::Diagnostic {
-                range: lsp::Range::new(lsp::Position::new(1, 13), lsp::Position::new(1, 15)),
-                severity: Some(DiagnosticSeverity::HINT),
-                message: "error 2 hint 2".to_string(),
-                related_information: Some(vec![lsp::DiagnosticRelatedInformation {
-                    location: lsp::Location {
-                        uri: buffer_uri,
-                        range: lsp::Range::new(lsp::Position::new(2, 8), lsp::Position::new(2, 17)),
-                    },
-                    message: "original diagnostic".to_string(),
-                }]),
-                ..Default::default()
-            },
-        ],
-        version: None,
-    };
-
-    lsp_store
-        .update(cx, |lsp_store, cx| {
-            lsp_store.update_diagnostics(
-                LanguageServerId(0),
-                message,
-                None,
-                DiagnosticSourceKind::Pushed,
-                &[],
-                cx,
-            )
-        })
-        .unwrap();
-    let buffer = buffer.update(cx, |buffer, _| buffer.snapshot());
-
-    assert_eq!(
-        buffer
-            .diagnostics_in_range::<_, Point>(0..buffer.len(), false)
-            .collect::<Vec<_>>(),
-        &[
-            DiagnosticEntry {
-                range: Point::new(1, 8)..Point::new(1, 9),
-                diagnostic: Diagnostic {
-                    severity: DiagnosticSeverity::WARNING,
-                    message: "error 1".to_string(),
-                    group_id: 1,
-                    is_primary: true,
-                    source_kind: DiagnosticSourceKind::Pushed,
-                    ..Diagnostic::default()
-                }
-            },
-            DiagnosticEntry {
-                range: Point::new(1, 8)..Point::new(1, 9),
-                diagnostic: Diagnostic {
-                    severity: DiagnosticSeverity::HINT,
-                    message: "error 1 hint 1".to_string(),
-                    group_id: 1,
-                    is_primary: false,
-                    source_kind: DiagnosticSourceKind::Pushed,
-                    ..Diagnostic::default()
-                }
-            },
-            DiagnosticEntry {
-                range: Point::new(1, 13)..Point::new(1, 15),
-                diagnostic: Diagnostic {
-                    severity: DiagnosticSeverity::HINT,
-                    message: "error 2 hint 1".to_string(),
-                    group_id: 0,
-                    is_primary: false,
-                    source_kind: DiagnosticSourceKind::Pushed,
-                    ..Diagnostic::default()
-                }
-            },
-            DiagnosticEntry {
-                range: Point::new(1, 13)..Point::new(1, 15),
-                diagnostic: Diagnostic {
-                    severity: DiagnosticSeverity::HINT,
-                    message: "error 2 hint 2".to_string(),
-                    group_id: 0,
-                    is_primary: false,
-                    source_kind: DiagnosticSourceKind::Pushed,
-                    ..Diagnostic::default()
-                }
-            },
-            DiagnosticEntry {
-                range: Point::new(2, 8)..Point::new(2, 17),
-                diagnostic: Diagnostic {
-                    severity: DiagnosticSeverity::ERROR,
-                    message: "error 2".to_string(),
-                    group_id: 0,
-                    is_primary: true,
-                    source_kind: DiagnosticSourceKind::Pushed,
-                    ..Diagnostic::default()
-                }
-            }
-        ]
-    );
-
-    assert_eq!(
-        buffer.diagnostic_group::<Point>(0).collect::<Vec<_>>(),
-        &[
-            DiagnosticEntry {
-                range: Point::new(1, 13)..Point::new(1, 15),
-                diagnostic: Diagnostic {
-                    severity: DiagnosticSeverity::HINT,
-                    message: "error 2 hint 1".to_string(),
-                    group_id: 0,
-                    is_primary: false,
-                    source_kind: DiagnosticSourceKind::Pushed,
-                    ..Diagnostic::default()
-                }
-            },
-            DiagnosticEntry {
-                range: Point::new(1, 13)..Point::new(1, 15),
-                diagnostic: Diagnostic {
-                    severity: DiagnosticSeverity::HINT,
-                    message: "error 2 hint 2".to_string(),
-                    group_id: 0,
-                    is_primary: false,
-                    source_kind: DiagnosticSourceKind::Pushed,
-                    ..Diagnostic::default()
-                }
-            },
-            DiagnosticEntry {
-                range: Point::new(2, 8)..Point::new(2, 17),
-                diagnostic: Diagnostic {
-                    severity: DiagnosticSeverity::ERROR,
-                    message: "error 2".to_string(),
-                    group_id: 0,
-                    is_primary: true,
-                    source_kind: DiagnosticSourceKind::Pushed,
-                    ..Diagnostic::default()
-                }
-            }
-        ]
-    );
-
-    assert_eq!(
-        buffer.diagnostic_group::<Point>(1).collect::<Vec<_>>(),
-        &[
-            DiagnosticEntry {
-                range: Point::new(1, 8)..Point::new(1, 9),
-                diagnostic: Diagnostic {
-                    severity: DiagnosticSeverity::WARNING,
-                    message: "error 1".to_string(),
-                    group_id: 1,
-                    is_primary: true,
-                    source_kind: DiagnosticSourceKind::Pushed,
-                    ..Diagnostic::default()
-                }
-            },
-            DiagnosticEntry {
-                range: Point::new(1, 8)..Point::new(1, 9),
-                diagnostic: Diagnostic {
-                    severity: DiagnosticSeverity::HINT,
-                    message: "error 1 hint 1".to_string(),
-                    group_id: 1,
-                    is_primary: false,
-                    source_kind: DiagnosticSourceKind::Pushed,
-                    ..Diagnostic::default()
-                }
-            },
-        ]
-    );
-}
-
-#[gpui::test]
-async fn test_lsp_rename_notifications(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/dir"),
-        json!({
-            "one.rs": "const ONE: usize = 1;",
-            "two": {
-                "two.rs": "const TWO: usize = one::ONE + one::ONE;"
-            }
-
-        }),
-    )
-    .await;
-    let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-    language_registry.add(rust_lang());
-    let watched_paths = lsp::FileOperationRegistrationOptions {
-        filters: vec![
-            FileOperationFilter {
-                scheme: Some("file".to_owned()),
-                pattern: lsp::FileOperationPattern {
-                    glob: "**/*.rs".to_owned(),
-                    matches: Some(lsp::FileOperationPatternKind::File),
-                    options: None,
-                },
-            },
-            FileOperationFilter {
-                scheme: Some("file".to_owned()),
-                pattern: lsp::FileOperationPattern {
-                    glob: "**/**".to_owned(),
-                    matches: Some(lsp::FileOperationPatternKind::Folder),
-                    options: None,
-                },
-            },
-        ],
-    };
-    let mut fake_servers = language_registry.register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            capabilities: lsp::ServerCapabilities {
-                workspace: Some(lsp::WorkspaceServerCapabilities {
-                    workspace_folders: None,
-                    file_operations: Some(lsp::WorkspaceFileOperationsServerCapabilities {
-                        did_rename: Some(watched_paths.clone()),
-                        will_rename: Some(watched_paths),
-                        ..Default::default()
-                    }),
-                }),
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-    );
-
-    let _ = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer_with_lsp(path!("/dir/one.rs"), cx)
-        })
-        .await
-        .unwrap();
-
-    let fake_server = fake_servers.next().await.unwrap();
-    let response = project.update(cx, |project, cx| {
-        let worktree = project.worktrees(cx).next().unwrap();
-        let entry = worktree
-            .read(cx)
-            .entry_for_path(rel_path("one.rs"))
-            .unwrap();
-        project.rename_entry(
-            entry.id,
-            (worktree.read(cx).id(), rel_path("three.rs")).into(),
-            cx,
-        )
-    });
-    let expected_edit = lsp::WorkspaceEdit {
-        changes: None,
-        document_changes: Some(DocumentChanges::Edits({
-            vec![TextDocumentEdit {
-                edits: vec![lsp::Edit::Plain(lsp::TextEdit {
-                    range: lsp::Range {
-                        start: lsp::Position {
-                            line: 0,
-                            character: 1,
-                        },
-                        end: lsp::Position {
-                            line: 0,
-                            character: 3,
-                        },
-                    },
-                    new_text: "This is not a drill".to_owned(),
-                })],
-                text_document: lsp::OptionalVersionedTextDocumentIdentifier {
-                    uri: Uri::from_str(uri!("file:///dir/two/two.rs")).unwrap(),
-                    version: Some(1337),
-                },
-            }]
-        })),
-        change_annotations: None,
-    };
-    let resolved_workspace_edit = Arc::new(OnceLock::new());
-    fake_server
-        .set_request_handler::<WillRenameFiles, _, _>({
-            let resolved_workspace_edit = resolved_workspace_edit.clone();
-            let expected_edit = expected_edit.clone();
-            move |params, _| {
-                let resolved_workspace_edit = resolved_workspace_edit.clone();
-                let expected_edit = expected_edit.clone();
-                async move {
-                    assert_eq!(params.files.len(), 1);
-                    assert_eq!(params.files[0].old_uri, uri!("file:///dir/one.rs"));
-                    assert_eq!(params.files[0].new_uri, uri!("file:///dir/three.rs"));
-                    resolved_workspace_edit.set(expected_edit.clone()).unwrap();
-                    Ok(Some(expected_edit))
-                }
-            }
-        })
-        .next()
-        .await
-        .unwrap();
-    let _ = response.await.unwrap();
-    fake_server
-        .handle_notification::<DidRenameFiles, _>(|params, _| {
-            assert_eq!(params.files.len(), 1);
-            assert_eq!(params.files[0].old_uri, uri!("file:///dir/one.rs"));
-            assert_eq!(params.files[0].new_uri, uri!("file:///dir/three.rs"));
-        })
-        .next()
-        .await
-        .unwrap();
-    assert_eq!(resolved_workspace_edit.get(), Some(&expected_edit));
-}
-
-#[gpui::test]
-async fn test_rename(cx: &mut gpui::TestAppContext) {
-    // hi
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/dir"),
-        json!({
-            "one.rs": "const ONE: usize = 1;",
-            "two.rs": "const TWO: usize = one::ONE + one::ONE;"
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-    language_registry.add(rust_lang());
-    let mut fake_servers = language_registry.register_fake_lsp(
-        "Rust",
-        FakeLspAdapter {
-            capabilities: lsp::ServerCapabilities {
-                rename_provider: Some(lsp::OneOf::Right(lsp::RenameOptions {
-                    prepare_provider: Some(true),
-                    work_done_progress_options: Default::default(),
-                })),
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-    );
-
-    let (buffer, _handle) = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer_with_lsp(path!("/dir/one.rs"), cx)
-        })
-        .await
-        .unwrap();
-
-    let fake_server = fake_servers.next().await.unwrap();
-
-    let response = project.update(cx, |project, cx| {
-        project.prepare_rename(buffer.clone(), 7, cx)
-    });
-    fake_server
-        .set_request_handler::<lsp::request::PrepareRenameRequest, _, _>(|params, _| async move {
-            assert_eq!(
-                params.text_document.uri.as_str(),
-                uri!("file:///dir/one.rs")
-            );
-            assert_eq!(params.position, lsp::Position::new(0, 7));
-            Ok(Some(lsp::PrepareRenameResponse::Range(lsp::Range::new(
-                lsp::Position::new(0, 6),
-                lsp::Position::new(0, 9),
-            ))))
-        })
-        .next()
-        .await
-        .unwrap();
-    let response = response.await.unwrap();
-    let PrepareRenameResponse::Success(range) = response else {
-        panic!("{:?}", response);
-    };
-    let range = buffer.update(cx, |buffer, _| range.to_offset(buffer));
-    assert_eq!(range, 6..9);
-
-    let response = project.update(cx, |project, cx| {
-        project.perform_rename(buffer.clone(), 7, "THREE".to_string(), cx)
-    });
-    fake_server
-        .set_request_handler::<lsp::request::Rename, _, _>(|params, _| async move {
-            assert_eq!(
-                params.text_document_position.text_document.uri.as_str(),
-                uri!("file:///dir/one.rs")
-            );
-            assert_eq!(
-                params.text_document_position.position,
-                lsp::Position::new(0, 7)
-            );
-            assert_eq!(params.new_name, "THREE");
-            Ok(Some(lsp::WorkspaceEdit {
-                changes: Some(
-                    [
-                        (
-                            lsp::Uri::from_file_path(path!("/dir/one.rs")).unwrap(),
-                            vec![lsp::TextEdit::new(
-                                lsp::Range::new(lsp::Position::new(0, 6), lsp::Position::new(0, 9)),
-                                "THREE".to_string(),
-                            )],
-                        ),
-                        (
-                            lsp::Uri::from_file_path(path!("/dir/two.rs")).unwrap(),
-                            vec![
-                                lsp::TextEdit::new(
-                                    lsp::Range::new(
-                                        lsp::Position::new(0, 24),
-                                        lsp::Position::new(0, 27),
-                                    ),
-                                    "THREE".to_string(),
-                                ),
-                                lsp::TextEdit::new(
-                                    lsp::Range::new(
-                                        lsp::Position::new(0, 35),
-                                        lsp::Position::new(0, 38),
-                                    ),
-                                    "THREE".to_string(),
-                                ),
-                            ],
-                        ),
-                    ]
-                    .into_iter()
-                    .collect(),
-                ),
-                ..Default::default()
-            }))
-        })
-        .next()
-        .await
-        .unwrap();
-    let mut transaction = response.await.unwrap().0;
-    assert_eq!(transaction.len(), 2);
-    assert_eq!(
-        transaction
-            .remove_entry(&buffer)
-            .unwrap()
-            .0
-            .update(cx, |buffer, _| buffer.text()),
-        "const THREE: usize = 1;"
-    );
-    assert_eq!(
-        transaction
-            .into_keys()
-            .next()
-            .unwrap()
-            .update(cx, |buffer, _| buffer.text()),
-        "const TWO: usize = one::THREE + one::THREE;"
-    );
-}
-
-#[gpui::test]
-async fn test_search(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/dir"),
-        json!({
-            "one.rs": "const ONE: usize = 1;",
-            "two.rs": "const TWO: usize = one::ONE + one::ONE;",
-            "three.rs": "const THREE: usize = one::ONE + two::TWO;",
-            "four.rs": "const FOUR: usize = one::ONE + three::THREE;",
-        }),
-    )
-    .await;
-    let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-    assert_eq!(
-        search(
-            &project,
-            SearchQuery::text(
-                "TWO",
-                false,
-                true,
-                false,
-                Default::default(),
-                Default::default(),
-                false,
-                None
-            )
-            .unwrap(),
-            cx
-        )
-        .await
-        .unwrap(),
-        HashMap::from_iter([
-            (path!("dir/two.rs").to_string(), vec![6..9]),
-            (path!("dir/three.rs").to_string(), vec![37..40])
-        ])
-    );
-
-    let buffer_4 = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer(path!("/dir/four.rs"), cx)
-        })
-        .await
-        .unwrap();
-    buffer_4.update(cx, |buffer, cx| {
-        let text = "two::TWO";
-        buffer.edit([(20..28, text), (31..43, text)], None, cx);
-    });
-
-    assert_eq!(
-        search(
-            &project,
-            SearchQuery::text(
-                "TWO",
-                false,
-                true,
-                false,
-                Default::default(),
-                Default::default(),
-                false,
-                None,
-            )
-            .unwrap(),
-            cx
-        )
-        .await
-        .unwrap(),
-        HashMap::from_iter([
-            (path!("dir/two.rs").to_string(), vec![6..9]),
-            (path!("dir/three.rs").to_string(), vec![37..40]),
-            (path!("dir/four.rs").to_string(), vec![25..28, 36..39])
-        ])
-    );
-}
-
-#[gpui::test]
-async fn test_search_with_inclusions(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let search_query = "file";
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/dir"),
-        json!({
-            "one.rs": r#"// Rust file one"#,
-            "one.ts": r#"// TypeScript file one"#,
-            "two.rs": r#"// Rust file two"#,
-            "two.ts": r#"// TypeScript file two"#,
-        }),
-    )
-    .await;
-    let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-
-    assert!(
-        search(
-            &project,
-            SearchQuery::text(
-                search_query,
-                false,
-                true,
-                false,
-                PathMatcher::new(&["*.odd".to_owned()], PathStyle::local()).unwrap(),
-                Default::default(),
-                false,
-                None
-            )
-            .unwrap(),
-            cx
-        )
-        .await
-        .unwrap()
-        .is_empty(),
-        "If no inclusions match, no files should be returned"
-    );
-
-    assert_eq!(
-        search(
-            &project,
-            SearchQuery::text(
-                search_query,
-                false,
-                true,
-                false,
-                PathMatcher::new(&["*.rs".to_owned()], PathStyle::local()).unwrap(),
-                Default::default(),
-                false,
-                None
-            )
-            .unwrap(),
-            cx
-        )
-        .await
-        .unwrap(),
-        HashMap::from_iter([
-            (path!("dir/one.rs").to_string(), vec![8..12]),
-            (path!("dir/two.rs").to_string(), vec![8..12]),
-        ]),
-        "Rust only search should give only Rust files"
-    );
-
-    assert_eq!(
-        search(
-            &project,
-            SearchQuery::text(
-                search_query,
-                false,
-                true,
-                false,
-                PathMatcher::new(&["*.ts".to_owned(), "*.odd".to_owned()], PathStyle::local())
-                    .unwrap(),
-                Default::default(),
-                false,
-                None,
-            )
-            .unwrap(),
-            cx
-        )
-        .await
-        .unwrap(),
-        HashMap::from_iter([
-            (path!("dir/one.ts").to_string(), vec![14..18]),
-            (path!("dir/two.ts").to_string(), vec![14..18]),
-        ]),
-        "TypeScript only search should give only TypeScript files, even if other inclusions don't match anything"
-    );
-
-    assert_eq!(
-        search(
-            &project,
-            SearchQuery::text(
-                search_query,
-                false,
-                true,
-                false,
-                PathMatcher::new(
-                    &["*.rs".to_owned(), "*.ts".to_owned(), "*.odd".to_owned()],
-                    PathStyle::local()
-                )
-                .unwrap(),
-                Default::default(),
-                false,
-                None,
-            )
-            .unwrap(),
-            cx
-        )
-        .await
-        .unwrap(),
-        HashMap::from_iter([
-            (path!("dir/two.ts").to_string(), vec![14..18]),
-            (path!("dir/one.rs").to_string(), vec![8..12]),
-            (path!("dir/one.ts").to_string(), vec![14..18]),
-            (path!("dir/two.rs").to_string(), vec![8..12]),
-        ]),
-        "Rust and typescript search should give both Rust and TypeScript files, even if other inclusions don't match anything"
-    );
-}
-
-#[gpui::test]
-async fn test_search_with_exclusions(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let search_query = "file";
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/dir"),
-        json!({
-            "one.rs": r#"// Rust file one"#,
-            "one.ts": r#"// TypeScript file one"#,
-            "two.rs": r#"// Rust file two"#,
-            "two.ts": r#"// TypeScript file two"#,
-        }),
-    )
-    .await;
-    let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-
-    assert_eq!(
-        search(
-            &project,
-            SearchQuery::text(
-                search_query,
-                false,
-                true,
-                false,
-                Default::default(),
-                PathMatcher::new(&["*.odd".to_owned()], PathStyle::local()).unwrap(),
-                false,
-                None,
-            )
-            .unwrap(),
-            cx
-        )
-        .await
-        .unwrap(),
-        HashMap::from_iter([
-            (path!("dir/one.rs").to_string(), vec![8..12]),
-            (path!("dir/one.ts").to_string(), vec![14..18]),
-            (path!("dir/two.rs").to_string(), vec![8..12]),
-            (path!("dir/two.ts").to_string(), vec![14..18]),
-        ]),
-        "If no exclusions match, all files should be returned"
-    );
-
-    assert_eq!(
-        search(
-            &project,
-            SearchQuery::text(
-                search_query,
-                false,
-                true,
-                false,
-                Default::default(),
-                PathMatcher::new(&["*.rs".to_owned()], PathStyle::local()).unwrap(),
-                false,
-                None,
-            )
-            .unwrap(),
-            cx
-        )
-        .await
-        .unwrap(),
-        HashMap::from_iter([
-            (path!("dir/one.ts").to_string(), vec![14..18]),
-            (path!("dir/two.ts").to_string(), vec![14..18]),
-        ]),
-        "Rust exclusion search should give only TypeScript files"
-    );
-
-    assert_eq!(
-        search(
-            &project,
-            SearchQuery::text(
-                search_query,
-                false,
-                true,
-                false,
-                Default::default(),
-                PathMatcher::new(&["*.ts".to_owned(), "*.odd".to_owned()], PathStyle::local())
-                    .unwrap(),
-                false,
-                None,
-            )
-            .unwrap(),
-            cx
-        )
-        .await
-        .unwrap(),
-        HashMap::from_iter([
-            (path!("dir/one.rs").to_string(), vec![8..12]),
-            (path!("dir/two.rs").to_string(), vec![8..12]),
-        ]),
-        "TypeScript exclusion search should give only Rust files, even if other exclusions don't match anything"
-    );
-
-    assert!(
-        search(
-            &project,
-            SearchQuery::text(
-                search_query,
-                false,
-                true,
-                false,
-                Default::default(),
-                PathMatcher::new(
-                    &["*.rs".to_owned(), "*.ts".to_owned(), "*.odd".to_owned()],
-                    PathStyle::local(),
-                )
-                .unwrap(),
-                false,
-                None,
-            )
-            .unwrap(),
-            cx
-        )
-        .await
-        .unwrap()
-        .is_empty(),
-        "Rust and typescript exclusion should give no files, even if other exclusions don't match anything"
-    );
-}
-
-#[gpui::test]
-async fn test_search_with_buffer_exclusions(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let search_query = "file";
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/dir"),
-        json!({
-            "one.rs": r#"// Rust file one"#,
-            "one.ts": r#"// TypeScript file one"#,
-            "two.rs": r#"// Rust file two"#,
-            "two.ts": r#"// TypeScript file two"#,
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-    let path_style = PathStyle::local();
-    let _buffer = project.update(cx, |project, cx| {
-        project.create_local_buffer("file", None, false, cx)
-    });
-
-    assert_eq!(
-        search(
-            &project,
-            SearchQuery::text(
-                search_query,
-                false,
-                true,
-                false,
-                Default::default(),
-                PathMatcher::new(&["*.odd".to_owned()], path_style).unwrap(),
-                false,
-                None,
-            )
-            .unwrap(),
-            cx
-        )
-        .await
-        .unwrap(),
-        HashMap::from_iter([
-            (path!("dir/one.rs").to_string(), vec![8..12]),
-            (path!("dir/one.ts").to_string(), vec![14..18]),
-            (path!("dir/two.rs").to_string(), vec![8..12]),
-            (path!("dir/two.ts").to_string(), vec![14..18]),
-        ]),
-        "If no exclusions match, all files should be returned"
-    );
-
-    assert_eq!(
-        search(
-            &project,
-            SearchQuery::text(
-                search_query,
-                false,
-                true,
-                false,
-                Default::default(),
-                PathMatcher::new(&["*.rs".to_owned()], path_style).unwrap(),
-                false,
-                None,
-            )
-            .unwrap(),
-            cx
-        )
-        .await
-        .unwrap(),
-        HashMap::from_iter([
-            (path!("dir/one.ts").to_string(), vec![14..18]),
-            (path!("dir/two.ts").to_string(), vec![14..18]),
-        ]),
-        "Rust exclusion search should give only TypeScript files"
-    );
-
-    assert_eq!(
-        search(
-            &project,
-            SearchQuery::text(
-                search_query,
-                false,
-                true,
-                false,
-                Default::default(),
-                PathMatcher::new(&["*.ts".to_owned(), "*.odd".to_owned()], path_style).unwrap(),
-                false,
-                None,
-            )
-            .unwrap(),
-            cx
-        )
-        .await
-        .unwrap(),
-        HashMap::from_iter([
-            (path!("dir/one.rs").to_string(), vec![8..12]),
-            (path!("dir/two.rs").to_string(), vec![8..12]),
-        ]),
-        "TypeScript exclusion search should give only Rust files, even if other exclusions don't match anything"
-    );
-
-    assert!(
-        search(
-            &project,
-            SearchQuery::text(
-                search_query,
-                false,
-                true,
-                false,
-                Default::default(),
-                PathMatcher::new(
-                    &["*.rs".to_owned(), "*.ts".to_owned(), "*.odd".to_owned()],
-                    PathStyle::local(),
-                )
-                .unwrap(),
-                false,
-                None,
-            )
-            .unwrap(),
-            cx
-        )
-        .await
-        .unwrap()
-        .is_empty(),
-        "Rust and typescript exclusion should give no files, even if other exclusions don't match anything"
-    );
-}
-
-#[gpui::test]
-async fn test_search_with_exclusions_and_inclusions(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let search_query = "file";
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/dir"),
-        json!({
-            "one.rs": r#"// Rust file one"#,
-            "one.ts": r#"// TypeScript file one"#,
-            "two.rs": r#"// Rust file two"#,
-            "two.ts": r#"// TypeScript file two"#,
-        }),
-    )
-    .await;
-    let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-    assert!(
-        search(
-            &project,
-            SearchQuery::text(
-                search_query,
-                false,
-                true,
-                false,
-                PathMatcher::new(&["*.odd".to_owned()], PathStyle::local()).unwrap(),
-                PathMatcher::new(&["*.odd".to_owned()], PathStyle::local()).unwrap(),
-                false,
-                None,
-            )
-            .unwrap(),
-            cx
-        )
-        .await
-        .unwrap()
-        .is_empty(),
-        "If both no exclusions and inclusions match, exclusions should win and return nothing"
-    );
-
-    assert!(
-        search(
-            &project,
-            SearchQuery::text(
-                search_query,
-                false,
-                true,
-                false,
-                PathMatcher::new(&["*.ts".to_owned()], PathStyle::local()).unwrap(),
-                PathMatcher::new(&["*.ts".to_owned()], PathStyle::local()).unwrap(),
-                false,
-                None,
-            )
-            .unwrap(),
-            cx
-        )
-        .await
-        .unwrap()
-        .is_empty(),
-        "If both TypeScript exclusions and inclusions match, exclusions should win and return nothing files."
-    );
-
-    assert!(
-        search(
-            &project,
-            SearchQuery::text(
-                search_query,
-                false,
-                true,
-                false,
-                PathMatcher::new(&["*.ts".to_owned(), "*.odd".to_owned()], PathStyle::local())
-                    .unwrap(),
-                PathMatcher::new(&["*.ts".to_owned(), "*.odd".to_owned()], PathStyle::local())
-                    .unwrap(),
-                false,
-                None,
-            )
-            .unwrap(),
-            cx
-        )
-        .await
-        .unwrap()
-        .is_empty(),
-        "Non-matching inclusions and exclusions should not change that."
-    );
-
-    assert_eq!(
-        search(
-            &project,
-            SearchQuery::text(
-                search_query,
-                false,
-                true,
-                false,
-                PathMatcher::new(&["*.ts".to_owned(), "*.odd".to_owned()], PathStyle::local())
-                    .unwrap(),
-                PathMatcher::new(&["*.rs".to_owned(), "*.odd".to_owned()], PathStyle::local())
-                    .unwrap(),
-                false,
-                None,
-            )
-            .unwrap(),
-            cx
-        )
-        .await
-        .unwrap(),
-        HashMap::from_iter([
-            (path!("dir/one.ts").to_string(), vec![14..18]),
-            (path!("dir/two.ts").to_string(), vec![14..18]),
-        ]),
-        "Non-intersecting TypeScript inclusions and Rust exclusions should return TypeScript files"
-    );
-}
-
-#[gpui::test]
-async fn test_search_multiple_worktrees_with_inclusions(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/worktree-a"),
-        json!({
-            "haystack.rs": r#"// NEEDLE"#,
-            "haystack.ts": r#"// NEEDLE"#,
-        }),
-    )
-    .await;
-    fs.insert_tree(
-        path!("/worktree-b"),
-        json!({
-            "haystack.rs": r#"// NEEDLE"#,
-            "haystack.ts": r#"// NEEDLE"#,
-        }),
-    )
-    .await;
-
-    let path_style = PathStyle::local();
-    let project = Project::test(
-        fs.clone(),
-        [path!("/worktree-a").as_ref(), path!("/worktree-b").as_ref()],
-        cx,
-    )
-    .await;
-
-    assert_eq!(
-        search(
-            &project,
-            SearchQuery::text(
-                "NEEDLE",
-                false,
-                true,
-                false,
-                PathMatcher::new(&["worktree-a/*.rs".to_owned()], path_style).unwrap(),
-                Default::default(),
-                true,
-                None,
-            )
-            .unwrap(),
-            cx
-        )
-        .await
-        .unwrap(),
-        HashMap::from_iter([(path!("worktree-a/haystack.rs").to_string(), vec![3..9])]),
-        "should only return results from included worktree"
-    );
-    assert_eq!(
-        search(
-            &project,
-            SearchQuery::text(
-                "NEEDLE",
-                false,
-                true,
-                false,
-                PathMatcher::new(&["worktree-b/*.rs".to_owned()], path_style).unwrap(),
-                Default::default(),
-                true,
-                None,
-            )
-            .unwrap(),
-            cx
-        )
-        .await
-        .unwrap(),
-        HashMap::from_iter([(path!("worktree-b/haystack.rs").to_string(), vec![3..9])]),
-        "should only return results from included worktree"
-    );
-
-    assert_eq!(
-        search(
-            &project,
-            SearchQuery::text(
-                "NEEDLE",
-                false,
-                true,
-                false,
-                PathMatcher::new(&["*.ts".to_owned()], path_style).unwrap(),
-                Default::default(),
-                false,
-                None,
-            )
-            .unwrap(),
-            cx
-        )
-        .await
-        .unwrap(),
-        HashMap::from_iter([
-            (path!("worktree-a/haystack.ts").to_string(), vec![3..9]),
-            (path!("worktree-b/haystack.ts").to_string(), vec![3..9])
-        ]),
-        "should return results from both worktrees"
-    );
-}
-
-#[gpui::test]
-async fn test_search_in_gitignored_dirs(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.background_executor.clone());
-    fs.insert_tree(
-        path!("/dir"),
-        json!({
-            ".git": {},
-            ".gitignore": "**/target\n/node_modules\n",
-            "target": {
-                "index.txt": "index_key:index_value"
-            },
-            "node_modules": {
-                "eslint": {
-                    "index.ts": "const eslint_key = 'eslint value'",
-                    "package.json": r#"{ "some_key": "some value" }"#,
-                },
-                "prettier": {
-                    "index.ts": "const prettier_key = 'prettier value'",
-                    "package.json": r#"{ "other_key": "other value" }"#,
-                },
-            },
-            "package.json": r#"{ "main_key": "main value" }"#,
-        }),
-    )
-    .await;
-    let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-
-    let query = "key";
-    assert_eq!(
-        search(
-            &project,
-            SearchQuery::text(
-                query,
-                false,
-                false,
-                false,
-                Default::default(),
-                Default::default(),
-                false,
-                None,
-            )
-            .unwrap(),
-            cx
-        )
-        .await
-        .unwrap(),
-        HashMap::from_iter([(path!("dir/package.json").to_string(), vec![8..11])]),
-        "Only one non-ignored file should have the query"
-    );
-
-    let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-    let path_style = PathStyle::local();
-    assert_eq!(
-        search(
-            &project,
-            SearchQuery::text(
-                query,
-                false,
-                false,
-                true,
-                Default::default(),
-                Default::default(),
-                false,
-                None,
-            )
-            .unwrap(),
-            cx
-        )
-        .await
-        .unwrap(),
-        HashMap::from_iter([
-            (path!("dir/package.json").to_string(), vec![8..11]),
-            (path!("dir/target/index.txt").to_string(), vec![6..9]),
-            (
-                path!("dir/node_modules/prettier/package.json").to_string(),
-                vec![9..12]
-            ),
-            (
-                path!("dir/node_modules/prettier/index.ts").to_string(),
-                vec![15..18]
-            ),
-            (
-                path!("dir/node_modules/eslint/index.ts").to_string(),
-                vec![13..16]
-            ),
-            (
-                path!("dir/node_modules/eslint/package.json").to_string(),
-                vec![8..11]
-            ),
-        ]),
-        "Unrestricted search with ignored directories should find every file with the query"
-    );
-
-    let files_to_include =
-        PathMatcher::new(&["node_modules/prettier/**".to_owned()], path_style).unwrap();
-    let files_to_exclude = PathMatcher::new(&["*.ts".to_owned()], path_style).unwrap();
-    let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-    assert_eq!(
-        search(
-            &project,
-            SearchQuery::text(
-                query,
-                false,
-                false,
-                true,
-                files_to_include,
-                files_to_exclude,
-                false,
-                None,
-            )
-            .unwrap(),
-            cx
-        )
-        .await
-        .unwrap(),
-        HashMap::from_iter([(
-            path!("dir/node_modules/prettier/package.json").to_string(),
-            vec![9..12]
-        )]),
-        "With search including ignored prettier directory and excluding TS files, only one file should be found"
-    );
-}
-
-#[gpui::test]
-async fn test_search_with_unicode(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/dir"),
-        json!({
-            "one.rs": "// ПРИВЕТ? привет!",
-            "two.rs": "// ПРИВЕТ.",
-            "three.rs": "// привет",
-        }),
-    )
-    .await;
-    let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-    let unicode_case_sensitive_query = SearchQuery::text(
-        "привет",
-        false,
-        true,
-        false,
-        Default::default(),
-        Default::default(),
-        false,
-        None,
-    );
-    assert_matches!(unicode_case_sensitive_query, Ok(SearchQuery::Text { .. }));
-    assert_eq!(
-        search(&project, unicode_case_sensitive_query.unwrap(), cx)
-            .await
-            .unwrap(),
-        HashMap::from_iter([
-            (path!("dir/one.rs").to_string(), vec![17..29]),
-            (path!("dir/three.rs").to_string(), vec![3..15]),
-        ])
-    );
-
-    let unicode_case_insensitive_query = SearchQuery::text(
-        "привет",
-        false,
-        false,
-        false,
-        Default::default(),
-        Default::default(),
-        false,
-        None,
-    );
-    assert_matches!(
-        unicode_case_insensitive_query,
-        Ok(SearchQuery::Regex { .. })
-    );
-    assert_eq!(
-        search(&project, unicode_case_insensitive_query.unwrap(), cx)
-            .await
-            .unwrap(),
-        HashMap::from_iter([
-            (path!("dir/one.rs").to_string(), vec![3..15, 17..29]),
-            (path!("dir/two.rs").to_string(), vec![3..15]),
-            (path!("dir/three.rs").to_string(), vec![3..15]),
-        ])
-    );
-
-    assert_eq!(
-        search(
-            &project,
-            SearchQuery::text(
-                "привет.",
-                false,
-                false,
-                false,
-                Default::default(),
-                Default::default(),
-                false,
-                None,
-            )
-            .unwrap(),
-            cx
-        )
-        .await
-        .unwrap(),
-        HashMap::from_iter([(path!("dir/two.rs").to_string(), vec![3..16]),])
-    );
-}
-
-#[gpui::test]
-async fn test_create_entry(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/one/two",
-        json!({
-            "three": {
-                "a.txt": "",
-                "four": {}
-            },
-            "c.rs": ""
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/one/two/three".as_ref()], cx).await;
-    project
-        .update(cx, |project, cx| {
-            let id = project.worktrees(cx).next().unwrap().read(cx).id();
-            project.create_entry((id, rel_path("b..")), true, cx)
-        })
-        .await
-        .unwrap()
-        .into_included()
-        .unwrap();
-
-    assert_eq!(
-        fs.paths(true),
-        vec![
-            PathBuf::from(path!("/")),
-            PathBuf::from(path!("/one")),
-            PathBuf::from(path!("/one/two")),
-            PathBuf::from(path!("/one/two/c.rs")),
-            PathBuf::from(path!("/one/two/three")),
-            PathBuf::from(path!("/one/two/three/a.txt")),
-            PathBuf::from(path!("/one/two/three/b..")),
-            PathBuf::from(path!("/one/two/three/four")),
-        ]
-    );
-}
-
-#[gpui::test]
-async fn test_multiple_language_server_hovers(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/dir"),
-        json!({
-            "a.tsx": "a",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
-
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-    language_registry.add(tsx_lang());
-    let language_server_names = [
-        "TypeScriptServer",
-        "TailwindServer",
-        "ESLintServer",
-        "NoHoverCapabilitiesServer",
-    ];
-    let mut language_servers = [
-        language_registry.register_fake_lsp(
-            "tsx",
-            FakeLspAdapter {
-                name: language_server_names[0],
-                capabilities: lsp::ServerCapabilities {
-                    hover_provider: Some(lsp::HoverProviderCapability::Simple(true)),
-                    ..lsp::ServerCapabilities::default()
-                },
-                ..FakeLspAdapter::default()
-            },
-        ),
-        language_registry.register_fake_lsp(
-            "tsx",
-            FakeLspAdapter {
-                name: language_server_names[1],
-                capabilities: lsp::ServerCapabilities {
-                    hover_provider: Some(lsp::HoverProviderCapability::Simple(true)),
-                    ..lsp::ServerCapabilities::default()
-                },
-                ..FakeLspAdapter::default()
-            },
-        ),
-        language_registry.register_fake_lsp(
-            "tsx",
-            FakeLspAdapter {
-                name: language_server_names[2],
-                capabilities: lsp::ServerCapabilities {
-                    hover_provider: Some(lsp::HoverProviderCapability::Simple(true)),
-                    ..lsp::ServerCapabilities::default()
-                },
-                ..FakeLspAdapter::default()
-            },
-        ),
-        language_registry.register_fake_lsp(
-            "tsx",
-            FakeLspAdapter {
-                name: language_server_names[3],
-                capabilities: lsp::ServerCapabilities {
-                    hover_provider: None,
-                    ..lsp::ServerCapabilities::default()
-                },
-                ..FakeLspAdapter::default()
-            },
-        ),
-    ];
-
-    let (buffer, _handle) = project
-        .update(cx, |p, cx| {
-            p.open_local_buffer_with_lsp(path!("/dir/a.tsx"), cx)
-        })
-        .await
-        .unwrap();
-    cx.executor().run_until_parked();
-
-    let mut servers_with_hover_requests = HashMap::default();
-    for i in 0..language_server_names.len() {
-        let new_server = language_servers[i].next().await.unwrap_or_else(|| {
-            panic!(
-                "Failed to get language server #{i} with name {}",
-                &language_server_names[i]
-            )
-        });
-        let new_server_name = new_server.server.name();
-        assert!(
-            !servers_with_hover_requests.contains_key(&new_server_name),
-            "Unexpected: initialized server with the same name twice. Name: `{new_server_name}`"
-        );
-        match new_server_name.as_ref() {
-            "TailwindServer" | "TypeScriptServer" => {
-                servers_with_hover_requests.insert(
-                    new_server_name.clone(),
-                    new_server.set_request_handler::<lsp::request::HoverRequest, _, _>(
-                        move |_, _| {
-                            let name = new_server_name.clone();
-                            async move {
-                                Ok(Some(lsp::Hover {
-                                    contents: lsp::HoverContents::Scalar(
-                                        lsp::MarkedString::String(format!("{name} hover")),
-                                    ),
-                                    range: None,
-                                }))
-                            }
-                        },
-                    ),
-                );
-            }
-            "ESLintServer" => {
-                servers_with_hover_requests.insert(
-                    new_server_name,
-                    new_server.set_request_handler::<lsp::request::HoverRequest, _, _>(
-                        |_, _| async move { Ok(None) },
-                    ),
-                );
-            }
-            "NoHoverCapabilitiesServer" => {
-                let _never_handled = new_server
-                    .set_request_handler::<lsp::request::HoverRequest, _, _>(|_, _| async move {
-                        panic!(
-                            "Should not call for hovers server with no corresponding capabilities"
-                        )
-                    });
-            }
-            unexpected => panic!("Unexpected server name: {unexpected}"),
-        }
-    }
-
-    let hover_task = project.update(cx, |project, cx| {
-        project.hover(&buffer, Point::new(0, 0), cx)
-    });
-    let _: Vec<()> = futures::future::join_all(servers_with_hover_requests.into_values().map(
-        |mut hover_request| async move {
-            hover_request
-                .next()
-                .await
-                .expect("All hover requests should have been triggered")
-        },
-    ))
-    .await;
-    assert_eq!(
-        vec!["TailwindServer hover", "TypeScriptServer hover"],
-        hover_task
-            .await
-            .into_iter()
-            .flatten()
-            .map(|hover| hover.contents.iter().map(|block| &block.text).join("|"))
-            .sorted()
-            .collect::<Vec<_>>(),
-        "Should receive hover responses from all related servers with hover capabilities"
-    );
-}
-
-#[gpui::test]
-async fn test_hovers_with_empty_parts(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/dir"),
-        json!({
-            "a.ts": "a",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
-
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-    language_registry.add(typescript_lang());
-    let mut fake_language_servers = language_registry.register_fake_lsp(
-        "TypeScript",
-        FakeLspAdapter {
-            capabilities: lsp::ServerCapabilities {
-                hover_provider: Some(lsp::HoverProviderCapability::Simple(true)),
-                ..lsp::ServerCapabilities::default()
-            },
-            ..FakeLspAdapter::default()
-        },
-    );
-
-    let (buffer, _handle) = project
-        .update(cx, |p, cx| {
-            p.open_local_buffer_with_lsp(path!("/dir/a.ts"), cx)
-        })
-        .await
-        .unwrap();
-    cx.executor().run_until_parked();
-
-    let fake_server = fake_language_servers
-        .next()
-        .await
-        .expect("failed to get the language server");
-
-    let mut request_handled = fake_server.set_request_handler::<lsp::request::HoverRequest, _, _>(
-        move |_, _| async move {
-            Ok(Some(lsp::Hover {
-                contents: lsp::HoverContents::Array(vec![
-                    lsp::MarkedString::String("".to_string()),
-                    lsp::MarkedString::String("      ".to_string()),
-                    lsp::MarkedString::String("\n\n\n".to_string()),
-                ]),
-                range: None,
-            }))
-        },
-    );
-
-    let hover_task = project.update(cx, |project, cx| {
-        project.hover(&buffer, Point::new(0, 0), cx)
-    });
-    let () = request_handled
-        .next()
-        .await
-        .expect("All hover requests should have been triggered");
-    assert_eq!(
-        Vec::<String>::new(),
-        hover_task
-            .await
-            .into_iter()
-            .flatten()
-            .map(|hover| hover.contents.iter().map(|block| &block.text).join("|"))
-            .sorted()
-            .collect::<Vec<_>>(),
-        "Empty hover parts should be ignored"
-    );
-}
-
-#[gpui::test]
-async fn test_code_actions_only_kinds(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/dir"),
-        json!({
-            "a.ts": "a",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
-
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-    language_registry.add(typescript_lang());
-    let mut fake_language_servers = language_registry.register_fake_lsp(
-        "TypeScript",
-        FakeLspAdapter {
-            capabilities: lsp::ServerCapabilities {
-                code_action_provider: Some(lsp::CodeActionProviderCapability::Simple(true)),
-                ..lsp::ServerCapabilities::default()
-            },
-            ..FakeLspAdapter::default()
-        },
-    );
-
-    let (buffer, _handle) = project
-        .update(cx, |p, cx| {
-            p.open_local_buffer_with_lsp(path!("/dir/a.ts"), cx)
-        })
-        .await
-        .unwrap();
-    cx.executor().run_until_parked();
-
-    let fake_server = fake_language_servers
-        .next()
-        .await
-        .expect("failed to get the language server");
-
-    let mut request_handled = fake_server
-        .set_request_handler::<lsp::request::CodeActionRequest, _, _>(move |_, _| async move {
-            Ok(Some(vec![
-                lsp::CodeActionOrCommand::CodeAction(lsp::CodeAction {
-                    title: "organize imports".to_string(),
-                    kind: Some(CodeActionKind::SOURCE_ORGANIZE_IMPORTS),
-                    ..lsp::CodeAction::default()
-                }),
-                lsp::CodeActionOrCommand::CodeAction(lsp::CodeAction {
-                    title: "fix code".to_string(),
-                    kind: Some(CodeActionKind::SOURCE_FIX_ALL),
-                    ..lsp::CodeAction::default()
-                }),
-            ]))
-        });
-
-    let code_actions_task = project.update(cx, |project, cx| {
-        project.code_actions(
-            &buffer,
-            0..buffer.read(cx).len(),
-            Some(vec![CodeActionKind::SOURCE_ORGANIZE_IMPORTS]),
-            cx,
-        )
-    });
-
-    let () = request_handled
-        .next()
-        .await
-        .expect("The code action request should have been triggered");
-
-    let code_actions = code_actions_task.await.unwrap().unwrap();
-    assert_eq!(code_actions.len(), 1);
-    assert_eq!(
-        code_actions[0].lsp_action.action_kind(),
-        Some(CodeActionKind::SOURCE_ORGANIZE_IMPORTS)
-    );
-}
-
-#[gpui::test]
-async fn test_multiple_language_server_actions(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/dir"),
-        json!({
-            "a.tsx": "a",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
-
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-    language_registry.add(tsx_lang());
-    let language_server_names = [
-        "TypeScriptServer",
-        "TailwindServer",
-        "ESLintServer",
-        "NoActionsCapabilitiesServer",
-    ];
-
-    let mut language_server_rxs = [
-        language_registry.register_fake_lsp(
-            "tsx",
-            FakeLspAdapter {
-                name: language_server_names[0],
-                capabilities: lsp::ServerCapabilities {
-                    code_action_provider: Some(lsp::CodeActionProviderCapability::Simple(true)),
-                    ..lsp::ServerCapabilities::default()
-                },
-                ..FakeLspAdapter::default()
-            },
-        ),
-        language_registry.register_fake_lsp(
-            "tsx",
-            FakeLspAdapter {
-                name: language_server_names[1],
-                capabilities: lsp::ServerCapabilities {
-                    code_action_provider: Some(lsp::CodeActionProviderCapability::Simple(true)),
-                    ..lsp::ServerCapabilities::default()
-                },
-                ..FakeLspAdapter::default()
-            },
-        ),
-        language_registry.register_fake_lsp(
-            "tsx",
-            FakeLspAdapter {
-                name: language_server_names[2],
-                capabilities: lsp::ServerCapabilities {
-                    code_action_provider: Some(lsp::CodeActionProviderCapability::Simple(true)),
-                    ..lsp::ServerCapabilities::default()
-                },
-                ..FakeLspAdapter::default()
-            },
-        ),
-        language_registry.register_fake_lsp(
-            "tsx",
-            FakeLspAdapter {
-                name: language_server_names[3],
-                capabilities: lsp::ServerCapabilities {
-                    code_action_provider: None,
-                    ..lsp::ServerCapabilities::default()
-                },
-                ..FakeLspAdapter::default()
-            },
-        ),
-    ];
-
-    let (buffer, _handle) = project
-        .update(cx, |p, cx| {
-            p.open_local_buffer_with_lsp(path!("/dir/a.tsx"), cx)
-        })
-        .await
-        .unwrap();
-    cx.executor().run_until_parked();
-
-    let mut servers_with_actions_requests = HashMap::default();
-    for i in 0..language_server_names.len() {
-        let new_server = language_server_rxs[i].next().await.unwrap_or_else(|| {
-            panic!(
-                "Failed to get language server #{i} with name {}",
-                &language_server_names[i]
-            )
-        });
-        let new_server_name = new_server.server.name();
-
-        assert!(
-            !servers_with_actions_requests.contains_key(&new_server_name),
-            "Unexpected: initialized server with the same name twice. Name: `{new_server_name}`"
-        );
-        match new_server_name.0.as_ref() {
-            "TailwindServer" | "TypeScriptServer" => {
-                servers_with_actions_requests.insert(
-                    new_server_name.clone(),
-                    new_server.set_request_handler::<lsp::request::CodeActionRequest, _, _>(
-                        move |_, _| {
-                            let name = new_server_name.clone();
-                            async move {
-                                Ok(Some(vec![lsp::CodeActionOrCommand::CodeAction(
-                                    lsp::CodeAction {
-                                        title: format!("{name} code action"),
-                                        ..lsp::CodeAction::default()
-                                    },
-                                )]))
-                            }
-                        },
-                    ),
-                );
-            }
-            "ESLintServer" => {
-                servers_with_actions_requests.insert(
-                    new_server_name,
-                    new_server.set_request_handler::<lsp::request::CodeActionRequest, _, _>(
-                        |_, _| async move { Ok(None) },
-                    ),
-                );
-            }
-            "NoActionsCapabilitiesServer" => {
-                let _never_handled = new_server
-                    .set_request_handler::<lsp::request::CodeActionRequest, _, _>(|_, _| async move {
-                        panic!(
-                            "Should not call for code actions server with no corresponding capabilities"
-                        )
-                    });
-            }
-            unexpected => panic!("Unexpected server name: {unexpected}"),
-        }
-    }
-
-    let code_actions_task = project.update(cx, |project, cx| {
-        project.code_actions(&buffer, 0..buffer.read(cx).len(), None, cx)
-    });
-
-    // cx.run_until_parked();
-    let _: Vec<()> = futures::future::join_all(servers_with_actions_requests.into_values().map(
-        |mut code_actions_request| async move {
-            code_actions_request
-                .next()
-                .await
-                .expect("All code actions requests should have been triggered")
-        },
-    ))
-    .await;
-    assert_eq!(
-        vec!["TailwindServer code action", "TypeScriptServer code action"],
-        code_actions_task
-            .await
-            .unwrap()
-            .unwrap()
-            .into_iter()
-            .map(|code_action| code_action.lsp_action.title().to_owned())
-            .sorted()
-            .collect::<Vec<_>>(),
-        "Should receive code actions responses from all related servers with hover capabilities"
-    );
-}
-
-#[gpui::test]
-async fn test_reordering_worktrees(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/dir",
-        json!({
-            "a.rs": "let a = 1;",
-            "b.rs": "let b = 2;",
-            "c.rs": "let c = 2;",
-        }),
-    )
-    .await;
-
-    let project = Project::test(
-        fs,
-        [
-            "/dir/a.rs".as_ref(),
-            "/dir/b.rs".as_ref(),
-            "/dir/c.rs".as_ref(),
-        ],
-        cx,
-    )
-    .await;
-
-    // check the initial state and get the worktrees
-    let (worktree_a, worktree_b, worktree_c) = project.update(cx, |project, cx| {
-        let worktrees = project.visible_worktrees(cx).collect::<Vec<_>>();
-        assert_eq!(worktrees.len(), 3);
-
-        let worktree_a = worktrees[0].read(cx);
-        let worktree_b = worktrees[1].read(cx);
-        let worktree_c = worktrees[2].read(cx);
-
-        // check they start in the right order
-        assert_eq!(worktree_a.abs_path().to_str().unwrap(), "/dir/a.rs");
-        assert_eq!(worktree_b.abs_path().to_str().unwrap(), "/dir/b.rs");
-        assert_eq!(worktree_c.abs_path().to_str().unwrap(), "/dir/c.rs");
-
-        (
-            worktrees[0].clone(),
-            worktrees[1].clone(),
-            worktrees[2].clone(),
-        )
-    });
-
-    // move first worktree to after the second
-    // [a, b, c] -> [b, a, c]
-    project
-        .update(cx, |project, cx| {
-            let first = worktree_a.read(cx);
-            let second = worktree_b.read(cx);
-            project.move_worktree(first.id(), second.id(), cx)
-        })
-        .expect("moving first after second");
-
-    // check the state after moving
-    project.update(cx, |project, cx| {
-        let worktrees = project.visible_worktrees(cx).collect::<Vec<_>>();
-        assert_eq!(worktrees.len(), 3);
-
-        let first = worktrees[0].read(cx);
-        let second = worktrees[1].read(cx);
-        let third = worktrees[2].read(cx);
-
-        // check they are now in the right order
-        assert_eq!(first.abs_path().to_str().unwrap(), "/dir/b.rs");
-        assert_eq!(second.abs_path().to_str().unwrap(), "/dir/a.rs");
-        assert_eq!(third.abs_path().to_str().unwrap(), "/dir/c.rs");
-    });
-
-    // move the second worktree to before the first
-    // [b, a, c] -> [a, b, c]
-    project
-        .update(cx, |project, cx| {
-            let second = worktree_a.read(cx);
-            let first = worktree_b.read(cx);
-            project.move_worktree(first.id(), second.id(), cx)
-        })
-        .expect("moving second before first");
-
-    // check the state after moving
-    project.update(cx, |project, cx| {
-        let worktrees = project.visible_worktrees(cx).collect::<Vec<_>>();
-        assert_eq!(worktrees.len(), 3);
-
-        let first = worktrees[0].read(cx);
-        let second = worktrees[1].read(cx);
-        let third = worktrees[2].read(cx);
-
-        // check they are now in the right order
-        assert_eq!(first.abs_path().to_str().unwrap(), "/dir/a.rs");
-        assert_eq!(second.abs_path().to_str().unwrap(), "/dir/b.rs");
-        assert_eq!(third.abs_path().to_str().unwrap(), "/dir/c.rs");
-    });
-
-    // move the second worktree to after the third
-    // [a, b, c] -> [a, c, b]
-    project
-        .update(cx, |project, cx| {
-            let second = worktree_b.read(cx);
-            let third = worktree_c.read(cx);
-            project.move_worktree(second.id(), third.id(), cx)
-        })
-        .expect("moving second after third");
-
-    // check the state after moving
-    project.update(cx, |project, cx| {
-        let worktrees = project.visible_worktrees(cx).collect::<Vec<_>>();
-        assert_eq!(worktrees.len(), 3);
-
-        let first = worktrees[0].read(cx);
-        let second = worktrees[1].read(cx);
-        let third = worktrees[2].read(cx);
-
-        // check they are now in the right order
-        assert_eq!(first.abs_path().to_str().unwrap(), "/dir/a.rs");
-        assert_eq!(second.abs_path().to_str().unwrap(), "/dir/c.rs");
-        assert_eq!(third.abs_path().to_str().unwrap(), "/dir/b.rs");
-    });
-
-    // move the third worktree to before the second
-    // [a, c, b] -> [a, b, c]
-    project
-        .update(cx, |project, cx| {
-            let third = worktree_c.read(cx);
-            let second = worktree_b.read(cx);
-            project.move_worktree(third.id(), second.id(), cx)
-        })
-        .expect("moving third before second");
-
-    // check the state after moving
-    project.update(cx, |project, cx| {
-        let worktrees = project.visible_worktrees(cx).collect::<Vec<_>>();
-        assert_eq!(worktrees.len(), 3);
-
-        let first = worktrees[0].read(cx);
-        let second = worktrees[1].read(cx);
-        let third = worktrees[2].read(cx);
-
-        // check they are now in the right order
-        assert_eq!(first.abs_path().to_str().unwrap(), "/dir/a.rs");
-        assert_eq!(second.abs_path().to_str().unwrap(), "/dir/b.rs");
-        assert_eq!(third.abs_path().to_str().unwrap(), "/dir/c.rs");
-    });
-
-    // move the first worktree to after the third
-    // [a, b, c] -> [b, c, a]
-    project
-        .update(cx, |project, cx| {
-            let first = worktree_a.read(cx);
-            let third = worktree_c.read(cx);
-            project.move_worktree(first.id(), third.id(), cx)
-        })
-        .expect("moving first after third");
-
-    // check the state after moving
-    project.update(cx, |project, cx| {
-        let worktrees = project.visible_worktrees(cx).collect::<Vec<_>>();
-        assert_eq!(worktrees.len(), 3);
-
-        let first = worktrees[0].read(cx);
-        let second = worktrees[1].read(cx);
-        let third = worktrees[2].read(cx);
-
-        // check they are now in the right order
-        assert_eq!(first.abs_path().to_str().unwrap(), "/dir/b.rs");
-        assert_eq!(second.abs_path().to_str().unwrap(), "/dir/c.rs");
-        assert_eq!(third.abs_path().to_str().unwrap(), "/dir/a.rs");
-    });
-
-    // move the third worktree to before the first
-    // [b, c, a] -> [a, b, c]
-    project
-        .update(cx, |project, cx| {
-            let third = worktree_a.read(cx);
-            let first = worktree_b.read(cx);
-            project.move_worktree(third.id(), first.id(), cx)
-        })
-        .expect("moving third before first");
-
-    // check the state after moving
-    project.update(cx, |project, cx| {
-        let worktrees = project.visible_worktrees(cx).collect::<Vec<_>>();
-        assert_eq!(worktrees.len(), 3);
-
-        let first = worktrees[0].read(cx);
-        let second = worktrees[1].read(cx);
-        let third = worktrees[2].read(cx);
-
-        // check they are now in the right order
-        assert_eq!(first.abs_path().to_str().unwrap(), "/dir/a.rs");
-        assert_eq!(second.abs_path().to_str().unwrap(), "/dir/b.rs");
-        assert_eq!(third.abs_path().to_str().unwrap(), "/dir/c.rs");
-    });
-}
-
-#[gpui::test]
-async fn test_unstaged_diff_for_buffer(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let staged_contents = r#"
-        fn main() {
-            println!("hello world");
-        }
-    "#
-    .unindent();
-    let file_contents = r#"
-        // print goodbye
-        fn main() {
-            println!("goodbye world");
-        }
-    "#
-    .unindent();
-
-    let fs = FakeFs::new(cx.background_executor.clone());
-    fs.insert_tree(
-        "/dir",
-        json!({
-            ".git": {},
-           "src": {
-               "main.rs": file_contents,
-           }
-        }),
-    )
-    .await;
-
-    fs.set_index_for_repo(Path::new("/dir/.git"), &[("src/main.rs", staged_contents)]);
-
-    let project = Project::test(fs.clone(), ["/dir".as_ref()], cx).await;
-
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer("/dir/src/main.rs", cx)
-        })
-        .await
-        .unwrap();
-    let unstaged_diff = project
-        .update(cx, |project, cx| {
-            project.open_unstaged_diff(buffer.clone(), cx)
-        })
-        .await
-        .unwrap();
-
-    cx.run_until_parked();
-    unstaged_diff.update(cx, |unstaged_diff, cx| {
-        let snapshot = buffer.read(cx).snapshot();
-        assert_hunks(
-            unstaged_diff.hunks(&snapshot, cx),
-            &snapshot,
-            &unstaged_diff.base_text_string().unwrap(),
-            &[
-                (0..1, "", "// print goodbye\n", DiffHunkStatus::added_none()),
-                (
-                    2..3,
-                    "    println!(\"hello world\");\n",
-                    "    println!(\"goodbye world\");\n",
-                    DiffHunkStatus::modified_none(),
-                ),
-            ],
-        );
-    });
-
-    let staged_contents = r#"
-        // print goodbye
-        fn main() {
-        }
-    "#
-    .unindent();
-
-    fs.set_index_for_repo(Path::new("/dir/.git"), &[("src/main.rs", staged_contents)]);
-
-    cx.run_until_parked();
-    unstaged_diff.update(cx, |unstaged_diff, cx| {
-        let snapshot = buffer.read(cx).snapshot();
-        assert_hunks(
-            unstaged_diff.hunks_intersecting_range(Anchor::MIN..Anchor::MAX, &snapshot, cx),
-            &snapshot,
-            &unstaged_diff.base_text().text(),
-            &[(
-                2..3,
-                "",
-                "    println!(\"goodbye world\");\n",
-                DiffHunkStatus::added_none(),
-            )],
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_uncommitted_diff_for_buffer(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let committed_contents = r#"
-        fn main() {
-            println!("hello world");
-        }
-    "#
-    .unindent();
-    let staged_contents = r#"
-        fn main() {
-            println!("goodbye world");
-        }
-    "#
-    .unindent();
-    let file_contents = r#"
-        // print goodbye
-        fn main() {
-            println!("goodbye world");
-        }
-    "#
-    .unindent();
-
-    let fs = FakeFs::new(cx.background_executor.clone());
-    fs.insert_tree(
-        "/dir",
-        json!({
-            ".git": {},
-           "src": {
-               "modification.rs": file_contents,
-           }
-        }),
-    )
-    .await;
-
-    fs.set_head_for_repo(
-        Path::new("/dir/.git"),
-        &[
-            ("src/modification.rs", committed_contents),
-            ("src/deletion.rs", "// the-deleted-contents\n".into()),
-        ],
-        "deadbeef",
-    );
-    fs.set_index_for_repo(
-        Path::new("/dir/.git"),
-        &[
-            ("src/modification.rs", staged_contents),
-            ("src/deletion.rs", "// the-deleted-contents\n".into()),
-        ],
-    );
-
-    let project = Project::test(fs.clone(), ["/dir".as_ref()], cx).await;
-    let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-    let language = rust_lang();
-    language_registry.add(language.clone());
-
-    let buffer_1 = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer("/dir/src/modification.rs", cx)
-        })
-        .await
-        .unwrap();
-    let diff_1 = project
-        .update(cx, |project, cx| {
-            project.open_uncommitted_diff(buffer_1.clone(), cx)
-        })
-        .await
-        .unwrap();
-    diff_1.read_with(cx, |diff, _| {
-        assert_eq!(diff.base_text().language().cloned(), Some(language))
-    });
-    cx.run_until_parked();
-    diff_1.update(cx, |diff, cx| {
-        let snapshot = buffer_1.read(cx).snapshot();
-        assert_hunks(
-            diff.hunks_intersecting_range(Anchor::MIN..Anchor::MAX, &snapshot, cx),
-            &snapshot,
-            &diff.base_text_string().unwrap(),
-            &[
-                (
-                    0..1,
-                    "",
-                    "// print goodbye\n",
-                    DiffHunkStatus::added(DiffHunkSecondaryStatus::HasSecondaryHunk),
-                ),
-                (
-                    2..3,
-                    "    println!(\"hello world\");\n",
-                    "    println!(\"goodbye world\");\n",
-                    DiffHunkStatus::modified_none(),
-                ),
-            ],
-        );
-    });
-
-    // Reset HEAD to a version that differs from both the buffer and the index.
-    let committed_contents = r#"
-        // print goodbye
-        fn main() {
-        }
-    "#
-    .unindent();
-    fs.set_head_for_repo(
-        Path::new("/dir/.git"),
-        &[
-            ("src/modification.rs", committed_contents.clone()),
-            ("src/deletion.rs", "// the-deleted-contents\n".into()),
-        ],
-        "deadbeef",
-    );
-
-    // Buffer now has an unstaged hunk.
-    cx.run_until_parked();
-    diff_1.update(cx, |diff, cx| {
-        let snapshot = buffer_1.read(cx).snapshot();
-        assert_hunks(
-            diff.hunks_intersecting_range(Anchor::MIN..Anchor::MAX, &snapshot, cx),
-            &snapshot,
-            &diff.base_text().text(),
-            &[(
-                2..3,
-                "",
-                "    println!(\"goodbye world\");\n",
-                DiffHunkStatus::added_none(),
-            )],
-        );
-    });
-
-    // Open a buffer for a file that's been deleted.
-    let buffer_2 = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer("/dir/src/deletion.rs", cx)
-        })
-        .await
-        .unwrap();
-    let diff_2 = project
-        .update(cx, |project, cx| {
-            project.open_uncommitted_diff(buffer_2.clone(), cx)
-        })
-        .await
-        .unwrap();
-    cx.run_until_parked();
-    diff_2.update(cx, |diff, cx| {
-        let snapshot = buffer_2.read(cx).snapshot();
-        assert_hunks(
-            diff.hunks_intersecting_range(Anchor::MIN..Anchor::MAX, &snapshot, cx),
-            &snapshot,
-            &diff.base_text_string().unwrap(),
-            &[(
-                0..0,
-                "// the-deleted-contents\n",
-                "",
-                DiffHunkStatus::deleted(DiffHunkSecondaryStatus::HasSecondaryHunk),
-            )],
-        );
-    });
-
-    // Stage the deletion of this file
-    fs.set_index_for_repo(
-        Path::new("/dir/.git"),
-        &[("src/modification.rs", committed_contents.clone())],
-    );
-    cx.run_until_parked();
-    diff_2.update(cx, |diff, cx| {
-        let snapshot = buffer_2.read(cx).snapshot();
-        assert_hunks(
-            diff.hunks_intersecting_range(Anchor::MIN..Anchor::MAX, &snapshot, cx),
-            &snapshot,
-            &diff.base_text_string().unwrap(),
-            &[(
-                0..0,
-                "// the-deleted-contents\n",
-                "",
-                DiffHunkStatus::deleted(DiffHunkSecondaryStatus::NoSecondaryHunk),
-            )],
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_staging_hunks(cx: &mut gpui::TestAppContext) {
-    use DiffHunkSecondaryStatus::*;
-    init_test(cx);
-
-    let committed_contents = r#"
-        zero
-        one
-        two
-        three
-        four
-        five
-    "#
-    .unindent();
-    let file_contents = r#"
-        one
-        TWO
-        three
-        FOUR
-        five
-    "#
-    .unindent();
-
-    let fs = FakeFs::new(cx.background_executor.clone());
-    fs.insert_tree(
-        "/dir",
-        json!({
-            ".git": {},
-            "file.txt": file_contents.clone()
-        }),
-    )
-    .await;
-
-    fs.set_head_and_index_for_repo(
-        path!("/dir/.git").as_ref(),
-        &[("file.txt", committed_contents.clone())],
-    );
-
-    let project = Project::test(fs.clone(), ["/dir".as_ref()], cx).await;
-
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer("/dir/file.txt", cx)
-        })
-        .await
-        .unwrap();
-    let snapshot = buffer.read_with(cx, |buffer, _| buffer.snapshot());
-    let uncommitted_diff = project
-        .update(cx, |project, cx| {
-            project.open_uncommitted_diff(buffer.clone(), cx)
-        })
-        .await
-        .unwrap();
-    let mut diff_events = cx.events(&uncommitted_diff);
-
-    // The hunks are initially unstaged.
-    uncommitted_diff.read_with(cx, |diff, cx| {
-        assert_hunks(
-            diff.hunks(&snapshot, cx),
-            &snapshot,
-            &diff.base_text_string().unwrap(),
-            &[
-                (
-                    0..0,
-                    "zero\n",
-                    "",
-                    DiffHunkStatus::deleted(HasSecondaryHunk),
-                ),
-                (
-                    1..2,
-                    "two\n",
-                    "TWO\n",
-                    DiffHunkStatus::modified(HasSecondaryHunk),
-                ),
-                (
-                    3..4,
-                    "four\n",
-                    "FOUR\n",
-                    DiffHunkStatus::modified(HasSecondaryHunk),
-                ),
-            ],
-        );
-    });
-
-    // Stage a hunk. It appears as optimistically staged.
-    uncommitted_diff.update(cx, |diff, cx| {
-        let range =
-            snapshot.anchor_before(Point::new(1, 0))..snapshot.anchor_before(Point::new(2, 0));
-        let hunks = diff
-            .hunks_intersecting_range(range, &snapshot, cx)
-            .collect::<Vec<_>>();
-        diff.stage_or_unstage_hunks(true, &hunks, &snapshot, true, cx);
-
-        assert_hunks(
-            diff.hunks(&snapshot, cx),
-            &snapshot,
-            &diff.base_text_string().unwrap(),
-            &[
-                (
-                    0..0,
-                    "zero\n",
-                    "",
-                    DiffHunkStatus::deleted(HasSecondaryHunk),
-                ),
-                (
-                    1..2,
-                    "two\n",
-                    "TWO\n",
-                    DiffHunkStatus::modified(SecondaryHunkRemovalPending),
-                ),
-                (
-                    3..4,
-                    "four\n",
-                    "FOUR\n",
-                    DiffHunkStatus::modified(HasSecondaryHunk),
-                ),
-            ],
-        );
-    });
-
-    // The diff emits a change event for the range of the staged hunk.
-    assert!(matches!(
-        diff_events.next().await.unwrap(),
-        BufferDiffEvent::HunksStagedOrUnstaged(_)
-    ));
-    let event = diff_events.next().await.unwrap();
-    if let BufferDiffEvent::DiffChanged {
-        changed_range: Some(changed_range),
-    } = event
-    {
-        let changed_range = changed_range.to_point(&snapshot);
-        assert_eq!(changed_range, Point::new(1, 0)..Point::new(2, 0));
-    } else {
-        panic!("Unexpected event {event:?}");
-    }
-
-    // When the write to the index completes, it appears as staged.
-    cx.run_until_parked();
-    uncommitted_diff.update(cx, |diff, cx| {
-        assert_hunks(
-            diff.hunks(&snapshot, cx),
-            &snapshot,
-            &diff.base_text_string().unwrap(),
-            &[
-                (
-                    0..0,
-                    "zero\n",
-                    "",
-                    DiffHunkStatus::deleted(HasSecondaryHunk),
-                ),
-                (
-                    1..2,
-                    "two\n",
-                    "TWO\n",
-                    DiffHunkStatus::modified(NoSecondaryHunk),
-                ),
-                (
-                    3..4,
-                    "four\n",
-                    "FOUR\n",
-                    DiffHunkStatus::modified(HasSecondaryHunk),
-                ),
-            ],
-        );
-    });
-
-    // The diff emits a change event for the changed index text.
-    let event = diff_events.next().await.unwrap();
-    if let BufferDiffEvent::DiffChanged {
-        changed_range: Some(changed_range),
-    } = event
-    {
-        let changed_range = changed_range.to_point(&snapshot);
-        assert_eq!(changed_range, Point::new(0, 0)..Point::new(4, 0));
-    } else {
-        panic!("Unexpected event {event:?}");
-    }
-
-    // Simulate a problem writing to the git index.
-    fs.set_error_message_for_index_write(
-        "/dir/.git".as_ref(),
-        Some("failed to write git index".into()),
-    );
-
-    // Stage another hunk.
-    uncommitted_diff.update(cx, |diff, cx| {
-        let range =
-            snapshot.anchor_before(Point::new(3, 0))..snapshot.anchor_before(Point::new(4, 0));
-        let hunks = diff
-            .hunks_intersecting_range(range, &snapshot, cx)
-            .collect::<Vec<_>>();
-        diff.stage_or_unstage_hunks(true, &hunks, &snapshot, true, cx);
-
-        assert_hunks(
-            diff.hunks(&snapshot, cx),
-            &snapshot,
-            &diff.base_text_string().unwrap(),
-            &[
-                (
-                    0..0,
-                    "zero\n",
-                    "",
-                    DiffHunkStatus::deleted(HasSecondaryHunk),
-                ),
-                (
-                    1..2,
-                    "two\n",
-                    "TWO\n",
-                    DiffHunkStatus::modified(NoSecondaryHunk),
-                ),
-                (
-                    3..4,
-                    "four\n",
-                    "FOUR\n",
-                    DiffHunkStatus::modified(SecondaryHunkRemovalPending),
-                ),
-            ],
-        );
-    });
-    assert!(matches!(
-        diff_events.next().await.unwrap(),
-        BufferDiffEvent::HunksStagedOrUnstaged(_)
-    ));
-    let event = diff_events.next().await.unwrap();
-    if let BufferDiffEvent::DiffChanged {
-        changed_range: Some(changed_range),
-    } = event
-    {
-        let changed_range = changed_range.to_point(&snapshot);
-        assert_eq!(changed_range, Point::new(3, 0)..Point::new(4, 0));
-    } else {
-        panic!("Unexpected event {event:?}");
-    }
-
-    // When the write fails, the hunk returns to being unstaged.
-    cx.run_until_parked();
-    uncommitted_diff.update(cx, |diff, cx| {
-        assert_hunks(
-            diff.hunks(&snapshot, cx),
-            &snapshot,
-            &diff.base_text_string().unwrap(),
-            &[
-                (
-                    0..0,
-                    "zero\n",
-                    "",
-                    DiffHunkStatus::deleted(HasSecondaryHunk),
-                ),
-                (
-                    1..2,
-                    "two\n",
-                    "TWO\n",
-                    DiffHunkStatus::modified(NoSecondaryHunk),
-                ),
-                (
-                    3..4,
-                    "four\n",
-                    "FOUR\n",
-                    DiffHunkStatus::modified(HasSecondaryHunk),
-                ),
-            ],
-        );
-    });
-
-    let event = diff_events.next().await.unwrap();
-    if let BufferDiffEvent::DiffChanged {
-        changed_range: Some(changed_range),
-    } = event
-    {
-        let changed_range = changed_range.to_point(&snapshot);
-        assert_eq!(changed_range, Point::new(0, 0)..Point::new(5, 0));
-    } else {
-        panic!("Unexpected event {event:?}");
-    }
-
-    // Allow writing to the git index to succeed again.
-    fs.set_error_message_for_index_write("/dir/.git".as_ref(), None);
-
-    // Stage two hunks with separate operations.
-    uncommitted_diff.update(cx, |diff, cx| {
-        let hunks = diff.hunks(&snapshot, cx).collect::<Vec<_>>();
-        diff.stage_or_unstage_hunks(true, &hunks[0..1], &snapshot, true, cx);
-        diff.stage_or_unstage_hunks(true, &hunks[2..3], &snapshot, true, cx);
-    });
-
-    // Both staged hunks appear as pending.
-    uncommitted_diff.update(cx, |diff, cx| {
-        assert_hunks(
-            diff.hunks(&snapshot, cx),
-            &snapshot,
-            &diff.base_text_string().unwrap(),
-            &[
-                (
-                    0..0,
-                    "zero\n",
-                    "",
-                    DiffHunkStatus::deleted(SecondaryHunkRemovalPending),
-                ),
-                (
-                    1..2,
-                    "two\n",
-                    "TWO\n",
-                    DiffHunkStatus::modified(NoSecondaryHunk),
-                ),
-                (
-                    3..4,
-                    "four\n",
-                    "FOUR\n",
-                    DiffHunkStatus::modified(SecondaryHunkRemovalPending),
-                ),
-            ],
-        );
-    });
-
-    // Both staging operations take effect.
-    cx.run_until_parked();
-    uncommitted_diff.update(cx, |diff, cx| {
-        assert_hunks(
-            diff.hunks(&snapshot, cx),
-            &snapshot,
-            &diff.base_text_string().unwrap(),
-            &[
-                (0..0, "zero\n", "", DiffHunkStatus::deleted(NoSecondaryHunk)),
-                (
-                    1..2,
-                    "two\n",
-                    "TWO\n",
-                    DiffHunkStatus::modified(NoSecondaryHunk),
-                ),
-                (
-                    3..4,
-                    "four\n",
-                    "FOUR\n",
-                    DiffHunkStatus::modified(NoSecondaryHunk),
-                ),
-            ],
-        );
-    });
-}
-
-#[gpui::test(seeds(340, 472))]
-async fn test_staging_hunks_with_delayed_fs_event(cx: &mut gpui::TestAppContext) {
-    use DiffHunkSecondaryStatus::*;
-    init_test(cx);
-
-    let committed_contents = r#"
-        zero
-        one
-        two
-        three
-        four
-        five
-    "#
-    .unindent();
-    let file_contents = r#"
-        one
-        TWO
-        three
-        FOUR
-        five
-    "#
-    .unindent();
-
-    let fs = FakeFs::new(cx.background_executor.clone());
-    fs.insert_tree(
-        "/dir",
-        json!({
-            ".git": {},
-            "file.txt": file_contents.clone()
-        }),
-    )
-    .await;
-
-    fs.set_head_for_repo(
-        "/dir/.git".as_ref(),
-        &[("file.txt", committed_contents.clone())],
-        "deadbeef",
-    );
-    fs.set_index_for_repo(
-        "/dir/.git".as_ref(),
-        &[("file.txt", committed_contents.clone())],
-    );
-
-    let project = Project::test(fs.clone(), ["/dir".as_ref()], cx).await;
-
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer("/dir/file.txt", cx)
-        })
-        .await
-        .unwrap();
-    let snapshot = buffer.read_with(cx, |buffer, _| buffer.snapshot());
-    let uncommitted_diff = project
-        .update(cx, |project, cx| {
-            project.open_uncommitted_diff(buffer.clone(), cx)
-        })
-        .await
-        .unwrap();
-
-    // The hunks are initially unstaged.
-    uncommitted_diff.read_with(cx, |diff, cx| {
-        assert_hunks(
-            diff.hunks(&snapshot, cx),
-            &snapshot,
-            &diff.base_text_string().unwrap(),
-            &[
-                (
-                    0..0,
-                    "zero\n",
-                    "",
-                    DiffHunkStatus::deleted(HasSecondaryHunk),
-                ),
-                (
-                    1..2,
-                    "two\n",
-                    "TWO\n",
-                    DiffHunkStatus::modified(HasSecondaryHunk),
-                ),
-                (
-                    3..4,
-                    "four\n",
-                    "FOUR\n",
-                    DiffHunkStatus::modified(HasSecondaryHunk),
-                ),
-            ],
-        );
-    });
-
-    // Pause IO events
-    fs.pause_events();
-
-    // Stage the first hunk.
-    uncommitted_diff.update(cx, |diff, cx| {
-        let hunk = diff.hunks(&snapshot, cx).next().unwrap();
-        diff.stage_or_unstage_hunks(true, &[hunk], &snapshot, true, cx);
-        assert_hunks(
-            diff.hunks(&snapshot, cx),
-            &snapshot,
-            &diff.base_text_string().unwrap(),
-            &[
-                (
-                    0..0,
-                    "zero\n",
-                    "",
-                    DiffHunkStatus::deleted(SecondaryHunkRemovalPending),
-                ),
-                (
-                    1..2,
-                    "two\n",
-                    "TWO\n",
-                    DiffHunkStatus::modified(HasSecondaryHunk),
-                ),
-                (
-                    3..4,
-                    "four\n",
-                    "FOUR\n",
-                    DiffHunkStatus::modified(HasSecondaryHunk),
-                ),
-            ],
-        );
-    });
-
-    // Stage the second hunk *before* receiving the FS event for the first hunk.
-    cx.run_until_parked();
-    uncommitted_diff.update(cx, |diff, cx| {
-        let hunk = diff.hunks(&snapshot, cx).nth(1).unwrap();
-        diff.stage_or_unstage_hunks(true, &[hunk], &snapshot, true, cx);
-        assert_hunks(
-            diff.hunks(&snapshot, cx),
-            &snapshot,
-            &diff.base_text_string().unwrap(),
-            &[
-                (
-                    0..0,
-                    "zero\n",
-                    "",
-                    DiffHunkStatus::deleted(SecondaryHunkRemovalPending),
-                ),
-                (
-                    1..2,
-                    "two\n",
-                    "TWO\n",
-                    DiffHunkStatus::modified(SecondaryHunkRemovalPending),
-                ),
-                (
-                    3..4,
-                    "four\n",
-                    "FOUR\n",
-                    DiffHunkStatus::modified(HasSecondaryHunk),
-                ),
-            ],
-        );
-    });
-
-    // Process the FS event for staging the first hunk (second event is still pending).
-    fs.flush_events(1);
-    cx.run_until_parked();
-
-    // Stage the third hunk before receiving the second FS event.
-    uncommitted_diff.update(cx, |diff, cx| {
-        let hunk = diff.hunks(&snapshot, cx).nth(2).unwrap();
-        diff.stage_or_unstage_hunks(true, &[hunk], &snapshot, true, cx);
-    });
-
-    // Wait for all remaining IO.
-    cx.run_until_parked();
-    fs.flush_events(fs.buffered_event_count());
-
-    // Now all hunks are staged.
-    cx.run_until_parked();
-    uncommitted_diff.update(cx, |diff, cx| {
-        assert_hunks(
-            diff.hunks(&snapshot, cx),
-            &snapshot,
-            &diff.base_text_string().unwrap(),
-            &[
-                (0..0, "zero\n", "", DiffHunkStatus::deleted(NoSecondaryHunk)),
-                (
-                    1..2,
-                    "two\n",
-                    "TWO\n",
-                    DiffHunkStatus::modified(NoSecondaryHunk),
-                ),
-                (
-                    3..4,
-                    "four\n",
-                    "FOUR\n",
-                    DiffHunkStatus::modified(NoSecondaryHunk),
-                ),
-            ],
-        );
-    });
-}
-
-#[gpui::test(iterations = 25)]
-async fn test_staging_random_hunks(
-    mut rng: StdRng,
-    executor: BackgroundExecutor,
-    cx: &mut gpui::TestAppContext,
-) {
-    let operations = env::var("OPERATIONS")
-        .map(|i| i.parse().expect("invalid `OPERATIONS` variable"))
-        .unwrap_or(20);
-
-    // Try to induce races between diff recalculation and index writes.
-    if rng.random_bool(0.5) {
-        executor.deprioritize(*CALCULATE_DIFF_TASK);
-    }
-
-    use DiffHunkSecondaryStatus::*;
-    init_test(cx);
-
-    let committed_text = (0..30).map(|i| format!("line {i}\n")).collect::<String>();
-    let index_text = committed_text.clone();
-    let buffer_text = (0..30)
-        .map(|i| match i % 5 {
-            0 => format!("line {i} (modified)\n"),
-            _ => format!("line {i}\n"),
-        })
-        .collect::<String>();
-
-    let fs = FakeFs::new(cx.background_executor.clone());
-    fs.insert_tree(
-        path!("/dir"),
-        json!({
-            ".git": {},
-            "file.txt": buffer_text.clone()
-        }),
-    )
-    .await;
-    fs.set_head_for_repo(
-        path!("/dir/.git").as_ref(),
-        &[("file.txt", committed_text.clone())],
-        "deadbeef",
-    );
-    fs.set_index_for_repo(
-        path!("/dir/.git").as_ref(),
-        &[("file.txt", index_text.clone())],
-    );
-    let repo = fs
-        .open_repo(path!("/dir/.git").as_ref(), Some("git".as_ref()))
-        .unwrap();
-
-    let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer(path!("/dir/file.txt"), cx)
-        })
-        .await
-        .unwrap();
-    let snapshot = buffer.read_with(cx, |buffer, _| buffer.snapshot());
-    let uncommitted_diff = project
-        .update(cx, |project, cx| {
-            project.open_uncommitted_diff(buffer.clone(), cx)
-        })
-        .await
-        .unwrap();
-
-    let mut hunks =
-        uncommitted_diff.update(cx, |diff, cx| diff.hunks(&snapshot, cx).collect::<Vec<_>>());
-    assert_eq!(hunks.len(), 6);
-
-    for _i in 0..operations {
-        let hunk_ix = rng.random_range(0..hunks.len());
-        let hunk = &mut hunks[hunk_ix];
-        let row = hunk.range.start.row;
-
-        if hunk.status().has_secondary_hunk() {
-            log::info!("staging hunk at {row}");
-            uncommitted_diff.update(cx, |diff, cx| {
-                diff.stage_or_unstage_hunks(true, std::slice::from_ref(hunk), &snapshot, true, cx);
-            });
-            hunk.secondary_status = SecondaryHunkRemovalPending;
-        } else {
-            log::info!("unstaging hunk at {row}");
-            uncommitted_diff.update(cx, |diff, cx| {
-                diff.stage_or_unstage_hunks(false, std::slice::from_ref(hunk), &snapshot, true, cx);
-            });
-            hunk.secondary_status = SecondaryHunkAdditionPending;
-        }
-
-        for _ in 0..rng.random_range(0..10) {
-            log::info!("yielding");
-            cx.executor().simulate_random_delay().await;
-        }
-    }
-
-    cx.executor().run_until_parked();
-
-    for hunk in &mut hunks {
-        if hunk.secondary_status == SecondaryHunkRemovalPending {
-            hunk.secondary_status = NoSecondaryHunk;
-        } else if hunk.secondary_status == SecondaryHunkAdditionPending {
-            hunk.secondary_status = HasSecondaryHunk;
-        }
-    }
-
-    log::info!(
-        "index text:\n{}",
-        repo.load_index_text(RepoPath::from_rel_path(rel_path("file.txt")))
-            .await
-            .unwrap()
-    );
-
-    uncommitted_diff.update(cx, |diff, cx| {
-        let expected_hunks = hunks
-            .iter()
-            .map(|hunk| (hunk.range.start.row, hunk.secondary_status))
-            .collect::<Vec<_>>();
-        let actual_hunks = diff
-            .hunks(&snapshot, cx)
-            .map(|hunk| (hunk.range.start.row, hunk.secondary_status))
-            .collect::<Vec<_>>();
-        assert_eq!(actual_hunks, expected_hunks);
-    });
-}
-
-#[gpui::test]
-async fn test_single_file_diffs(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let committed_contents = r#"
-        fn main() {
-            println!("hello from HEAD");
-        }
-    "#
-    .unindent();
-    let file_contents = r#"
-        fn main() {
-            println!("hello from the working copy");
-        }
-    "#
-    .unindent();
-
-    let fs = FakeFs::new(cx.background_executor.clone());
-    fs.insert_tree(
-        "/dir",
-        json!({
-            ".git": {},
-           "src": {
-               "main.rs": file_contents,
-           }
-        }),
-    )
-    .await;
-
-    fs.set_head_for_repo(
-        Path::new("/dir/.git"),
-        &[("src/main.rs", committed_contents.clone())],
-        "deadbeef",
-    );
-    fs.set_index_for_repo(
-        Path::new("/dir/.git"),
-        &[("src/main.rs", committed_contents.clone())],
-    );
-
-    let project = Project::test(fs.clone(), ["/dir/src/main.rs".as_ref()], cx).await;
-
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer("/dir/src/main.rs", cx)
-        })
-        .await
-        .unwrap();
-    let uncommitted_diff = project
-        .update(cx, |project, cx| {
-            project.open_uncommitted_diff(buffer.clone(), cx)
-        })
-        .await
-        .unwrap();
-
-    cx.run_until_parked();
-    uncommitted_diff.update(cx, |uncommitted_diff, cx| {
-        let snapshot = buffer.read(cx).snapshot();
-        assert_hunks(
-            uncommitted_diff.hunks(&snapshot, cx),
-            &snapshot,
-            &uncommitted_diff.base_text_string().unwrap(),
-            &[(
-                1..2,
-                "    println!(\"hello from HEAD\");\n",
-                "    println!(\"hello from the working copy\");\n",
-                DiffHunkStatus {
-                    kind: DiffHunkStatusKind::Modified,
-                    secondary: DiffHunkSecondaryStatus::HasSecondaryHunk,
-                },
-            )],
-        );
-    });
-}
-
-// TODO: Should we test this on Windows also?
-#[gpui::test]
-#[cfg(not(windows))]
-async fn test_staging_hunk_preserve_executable_permission(cx: &mut gpui::TestAppContext) {
-    use std::os::unix::fs::PermissionsExt;
-    init_test(cx);
-    cx.executor().allow_parking();
-    let committed_contents = "bar\n";
-    let file_contents = "baz\n";
-    let root = TempTree::new(json!({
-        "project": {
-            "foo": committed_contents
-        },
-    }));
-
-    let work_dir = root.path().join("project");
-    let file_path = work_dir.join("foo");
-    let repo = git_init(work_dir.as_path());
-    let mut perms = std::fs::metadata(&file_path).unwrap().permissions();
-    perms.set_mode(0o755);
-    std::fs::set_permissions(&file_path, perms).unwrap();
-    git_add("foo", &repo);
-    git_commit("Initial commit", &repo);
-    std::fs::write(&file_path, file_contents).unwrap();
-
-    let project = Project::test(
-        Arc::new(RealFs::new(None, cx.executor())),
-        [root.path()],
-        cx,
-    )
-    .await;
-
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer(file_path.as_path(), cx)
-        })
-        .await
-        .unwrap();
-
-    let snapshot = buffer.read_with(cx, |buffer, _| buffer.snapshot());
-
-    let uncommitted_diff = project
-        .update(cx, |project, cx| {
-            project.open_uncommitted_diff(buffer.clone(), cx)
-        })
-        .await
-        .unwrap();
-
-    uncommitted_diff.update(cx, |diff, cx| {
-        let hunks = diff.hunks(&snapshot, cx).collect::<Vec<_>>();
-        diff.stage_or_unstage_hunks(true, &hunks, &snapshot, true, cx);
-    });
-
-    cx.run_until_parked();
-
-    let output = smol::process::Command::new("git")
-        .current_dir(&work_dir)
-        .args(["diff", "--staged"])
-        .output()
-        .await
-        .unwrap();
-
-    let staged_diff = String::from_utf8_lossy(&output.stdout);
-
-    assert!(
-        !staged_diff.contains("new mode 100644"),
-        "Staging should not change file mode from 755 to 644.\ngit diff --staged:\n{}",
-        staged_diff
-    );
-
-    let output = smol::process::Command::new("git")
-        .current_dir(&work_dir)
-        .args(["ls-files", "-s"])
-        .output()
-        .await
-        .unwrap();
-    let index_contents = String::from_utf8_lossy(&output.stdout);
-
-    assert!(
-        index_contents.contains("100755"),
-        "Index should show file as executable (100755).\ngit ls-files -s:\n{}",
-        index_contents
-    );
-}
-
-#[gpui::test]
-async fn test_repository_and_path_for_project_path(
-    background_executor: BackgroundExecutor,
-    cx: &mut gpui::TestAppContext,
-) {
-    init_test(cx);
-    let fs = FakeFs::new(background_executor);
-    fs.insert_tree(
-        path!("/root"),
-        json!({
-            "c.txt": "",
-            "dir1": {
-                ".git": {},
-                "deps": {
-                    "dep1": {
-                        ".git": {},
-                        "src": {
-                            "a.txt": ""
-                        }
-                    }
-                },
-                "src": {
-                    "b.txt": ""
-                }
-            },
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-    let tree = project.read_with(cx, |project, cx| project.worktrees(cx).next().unwrap());
-    let tree_id = tree.read_with(cx, |tree, _| tree.id());
-    project
-        .update(cx, |project, cx| project.git_scans_complete(cx))
-        .await;
-    cx.run_until_parked();
-
-    project.read_with(cx, |project, cx| {
-        let git_store = project.git_store().read(cx);
-        let pairs = [
-            ("c.txt", None),
-            ("dir1/src/b.txt", Some((path!("/root/dir1"), "src/b.txt"))),
-            (
-                "dir1/deps/dep1/src/a.txt",
-                Some((path!("/root/dir1/deps/dep1"), "src/a.txt")),
-            ),
-        ];
-        let expected = pairs
-            .iter()
-            .map(|(path, result)| {
-                (
-                    path,
-                    result.map(|(repo, repo_path)| {
-                        (Path::new(repo).into(), RepoPath::new(repo_path).unwrap())
-                    }),
-                )
-            })
-            .collect::<Vec<_>>();
-        let actual = pairs
-            .iter()
-            .map(|(path, _)| {
-                let project_path = (tree_id, rel_path(path)).into();
-                let result = maybe!({
-                    let (repo, repo_path) =
-                        git_store.repository_and_path_for_project_path(&project_path, cx)?;
-                    Some((repo.read(cx).work_directory_abs_path.clone(), repo_path))
-                });
-                (path, result)
-            })
-            .collect::<Vec<_>>();
-        pretty_assertions::assert_eq!(expected, actual);
-    });
-
-    fs.remove_dir(path!("/root/dir1/.git").as_ref(), RemoveOptions::default())
-        .await
-        .unwrap();
-    cx.run_until_parked();
-
-    project.read_with(cx, |project, cx| {
-        let git_store = project.git_store().read(cx);
-        assert_eq!(
-            git_store.repository_and_path_for_project_path(
-                &(tree_id, rel_path("dir1/src/b.txt")).into(),
-                cx
-            ),
-            None
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_home_dir_as_git_repository(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-    let fs = FakeFs::new(cx.background_executor.clone());
-    let home = paths::home_dir();
-    fs.insert_tree(
-        home,
-        json!({
-            ".git": {},
-            "project": {
-                "a.txt": "A"
-            },
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), [home.join("project").as_ref()], cx).await;
-    let tree = project.read_with(cx, |project, cx| project.worktrees(cx).next().unwrap());
-    let tree_id = tree.read_with(cx, |tree, _| tree.id());
-
-    project
-        .update(cx, |project, cx| project.git_scans_complete(cx))
-        .await;
-    tree.flush_fs_events(cx).await;
-
-    project.read_with(cx, |project, cx| {
-        let containing = project
-            .git_store()
-            .read(cx)
-            .repository_and_path_for_project_path(&(tree_id, rel_path("a.txt")).into(), cx);
-        assert!(containing.is_none());
-    });
-
-    let project = Project::test(fs.clone(), [home.as_ref()], cx).await;
-    let tree = project.read_with(cx, |project, cx| project.worktrees(cx).next().unwrap());
-    let tree_id = tree.read_with(cx, |tree, _| tree.id());
-    project
-        .update(cx, |project, cx| project.git_scans_complete(cx))
-        .await;
-    tree.flush_fs_events(cx).await;
-
-    project.read_with(cx, |project, cx| {
-        let containing = project
-            .git_store()
-            .read(cx)
-            .repository_and_path_for_project_path(&(tree_id, rel_path("project/a.txt")).into(), cx);
-        assert_eq!(
-            containing
-                .unwrap()
-                .0
-                .read(cx)
-                .work_directory_abs_path
-                .as_ref(),
-            home,
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_git_repository_status(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-    cx.executor().allow_parking();
-
-    let root = TempTree::new(json!({
-        "project": {
-            "a.txt": "a",    // Modified
-            "b.txt": "bb",   // Added
-            "c.txt": "ccc",  // Unchanged
-            "d.txt": "dddd", // Deleted
-        },
-    }));
-
-    // Set up git repository before creating the project.
-    let work_dir = root.path().join("project");
-    let repo = git_init(work_dir.as_path());
-    git_add("a.txt", &repo);
-    git_add("c.txt", &repo);
-    git_add("d.txt", &repo);
-    git_commit("Initial commit", &repo);
-    std::fs::remove_file(work_dir.join("d.txt")).unwrap();
-    std::fs::write(work_dir.join("a.txt"), "aa").unwrap();
-
-    let project = Project::test(
-        Arc::new(RealFs::new(None, cx.executor())),
-        [root.path()],
-        cx,
-    )
-    .await;
-
-    let tree = project.read_with(cx, |project, cx| project.worktrees(cx).next().unwrap());
-    tree.flush_fs_events(cx).await;
-    project
-        .update(cx, |project, cx| project.git_scans_complete(cx))
-        .await;
-    cx.executor().run_until_parked();
-
-    let repository = project.read_with(cx, |project, cx| {
-        project.repositories(cx).values().next().unwrap().clone()
-    });
-
-    // Check that the right git state is observed on startup
-    repository.read_with(cx, |repository, _| {
-        let entries = repository.cached_status().collect::<Vec<_>>();
-        assert_eq!(
-            entries,
-            [
-                StatusEntry {
-                    repo_path: repo_path("a.txt"),
-                    status: StatusCode::Modified.worktree(),
-                },
-                StatusEntry {
-                    repo_path: repo_path("b.txt"),
-                    status: FileStatus::Untracked,
-                },
-                StatusEntry {
-                    repo_path: repo_path("d.txt"),
-                    status: StatusCode::Deleted.worktree(),
-                },
-            ]
-        );
-    });
-
-    std::fs::write(work_dir.join("c.txt"), "some changes").unwrap();
-
-    tree.flush_fs_events(cx).await;
-    project
-        .update(cx, |project, cx| project.git_scans_complete(cx))
-        .await;
-    cx.executor().run_until_parked();
-
-    repository.read_with(cx, |repository, _| {
-        let entries = repository.cached_status().collect::<Vec<_>>();
-        assert_eq!(
-            entries,
-            [
-                StatusEntry {
-                    repo_path: repo_path("a.txt"),
-                    status: StatusCode::Modified.worktree(),
-                },
-                StatusEntry {
-                    repo_path: repo_path("b.txt"),
-                    status: FileStatus::Untracked,
-                },
-                StatusEntry {
-                    repo_path: repo_path("c.txt"),
-                    status: StatusCode::Modified.worktree(),
-                },
-                StatusEntry {
-                    repo_path: repo_path("d.txt"),
-                    status: StatusCode::Deleted.worktree(),
-                },
-            ]
-        );
-    });
-
-    git_add("a.txt", &repo);
-    git_add("c.txt", &repo);
-    git_remove_index(Path::new("d.txt"), &repo);
-    git_commit("Another commit", &repo);
-    tree.flush_fs_events(cx).await;
-    project
-        .update(cx, |project, cx| project.git_scans_complete(cx))
-        .await;
-    cx.executor().run_until_parked();
-
-    std::fs::remove_file(work_dir.join("a.txt")).unwrap();
-    std::fs::remove_file(work_dir.join("b.txt")).unwrap();
-    tree.flush_fs_events(cx).await;
-    project
-        .update(cx, |project, cx| project.git_scans_complete(cx))
-        .await;
-    cx.executor().run_until_parked();
-
-    repository.read_with(cx, |repository, _cx| {
-        let entries = repository.cached_status().collect::<Vec<_>>();
-
-        // Deleting an untracked entry, b.txt, should leave no status
-        // a.txt was tracked, and so should have a status
-        assert_eq!(
-            entries,
-            [StatusEntry {
-                repo_path: repo_path("a.txt"),
-                status: StatusCode::Deleted.worktree(),
-            }]
-        );
-    });
-}
-
-#[gpui::test]
-#[ignore]
-async fn test_git_status_postprocessing(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-    cx.executor().allow_parking();
-
-    let root = TempTree::new(json!({
-        "project": {
-            "sub": {},
-            "a.txt": "",
-        },
-    }));
-
-    let work_dir = root.path().join("project");
-    let repo = git_init(work_dir.as_path());
-    // a.txt exists in HEAD and the working copy but is deleted in the index.
-    git_add("a.txt", &repo);
-    git_commit("Initial commit", &repo);
-    git_remove_index("a.txt".as_ref(), &repo);
-    // `sub` is a nested git repository.
-    let _sub = git_init(&work_dir.join("sub"));
-
-    let project = Project::test(
-        Arc::new(RealFs::new(None, cx.executor())),
-        [root.path()],
-        cx,
-    )
-    .await;
-
-    let tree = project.read_with(cx, |project, cx| project.worktrees(cx).next().unwrap());
-    tree.flush_fs_events(cx).await;
-    project
-        .update(cx, |project, cx| project.git_scans_complete(cx))
-        .await;
-    cx.executor().run_until_parked();
-
-    let repository = project.read_with(cx, |project, cx| {
-        project
-            .repositories(cx)
-            .values()
-            .find(|repo| repo.read(cx).work_directory_abs_path.ends_with("project"))
-            .unwrap()
-            .clone()
-    });
-
-    repository.read_with(cx, |repository, _cx| {
-        let entries = repository.cached_status().collect::<Vec<_>>();
-
-        // `sub` doesn't appear in our computed statuses.
-        // a.txt appears with a combined `DA` status.
-        assert_eq!(
-            entries,
-            [StatusEntry {
-                repo_path: repo_path("a.txt"),
-                status: TrackedStatus {
-                    index_status: StatusCode::Deleted,
-                    worktree_status: StatusCode::Added
-                }
-                .into(),
-            }]
-        )
-    });
-}
-
-#[track_caller]
-/// We merge lhs into rhs.
-fn merge_pending_ops_snapshots(
-    source: Vec<pending_op::PendingOps>,
-    mut target: Vec<pending_op::PendingOps>,
-) -> Vec<pending_op::PendingOps> {
-    for s_ops in source {
-        if let Some(idx) = target.iter().zip(0..).find_map(|(ops, idx)| {
-            if ops.repo_path == s_ops.repo_path {
-                Some(idx)
-            } else {
-                None
-            }
-        }) {
-            let t_ops = &mut target[idx];
-            for s_op in s_ops.ops {
-                if let Some(op_idx) = t_ops
-                    .ops
-                    .iter()
-                    .zip(0..)
-                    .find_map(|(op, idx)| if op.id == s_op.id { Some(idx) } else { None })
-                {
-                    let t_op = &mut t_ops.ops[op_idx];
-                    match (s_op.job_status, t_op.job_status) {
-                        (pending_op::JobStatus::Running, _) => {}
-                        (s_st, pending_op::JobStatus::Running) => t_op.job_status = s_st,
-                        (s_st, t_st) if s_st == t_st => {}
-                        _ => unreachable!(),
-                    }
-                } else {
-                    t_ops.ops.push(s_op);
-                }
-            }
-            t_ops.ops.sort_by(|l, r| l.id.cmp(&r.id));
-        } else {
-            target.push(s_ops);
-        }
-    }
-    target
-}
-
-#[gpui::test]
-async fn test_repository_pending_ops_staging(
-    executor: gpui::BackgroundExecutor,
-    cx: &mut gpui::TestAppContext,
-) {
-    init_test(cx);
-
-    let fs = FakeFs::new(executor);
-    fs.insert_tree(
-        path!("/root"),
-        json!({
-            "my-repo": {
-                ".git": {},
-                "a.txt": "a",
-            }
-
-        }),
-    )
-    .await;
-
-    fs.set_status_for_repo(
-        path!("/root/my-repo/.git").as_ref(),
-        &[("a.txt", FileStatus::Untracked)],
-    );
-
-    let project = Project::test(fs.clone(), [path!("/root/my-repo").as_ref()], cx).await;
-    let pending_ops_all = Arc::new(Mutex::new(SumTree::default()));
-    project.update(cx, |project, cx| {
-        let pending_ops_all = pending_ops_all.clone();
-        cx.subscribe(project.git_store(), move |_, _, e, _| {
-            if let GitStoreEvent::RepositoryUpdated(
-                _,
-                RepositoryEvent::PendingOpsChanged { pending_ops },
-                _,
-            ) = e
-            {
-                let merged = merge_pending_ops_snapshots(
-                    pending_ops.items(()),
-                    pending_ops_all.lock().items(()),
-                );
-                *pending_ops_all.lock() = SumTree::from_iter(merged.into_iter(), ());
-            }
-        })
-        .detach();
-    });
-    project
-        .update(cx, |project, cx| project.git_scans_complete(cx))
-        .await;
-
-    let repo = project.read_with(cx, |project, cx| {
-        project.repositories(cx).values().next().unwrap().clone()
-    });
-
-    // Ensure we have no pending ops for any of the untracked files
-    repo.read_with(cx, |repo, _cx| {
-        assert!(repo.pending_ops().next().is_none());
-    });
-
-    let mut id = 1u16;
-
-    let mut assert_stage = async |path: RepoPath, stage| {
-        let git_status = if stage {
-            pending_op::GitStatus::Staged
-        } else {
-            pending_op::GitStatus::Unstaged
-        };
-        repo.update(cx, |repo, cx| {
-            let task = if stage {
-                repo.stage_entries(vec![path.clone()], cx)
-            } else {
-                repo.unstage_entries(vec![path.clone()], cx)
-            };
-            let ops = repo.pending_ops_for_path(&path).unwrap();
-            assert_eq!(
-                ops.ops.last(),
-                Some(&pending_op::PendingOp {
-                    id: id.into(),
-                    git_status,
-                    job_status: pending_op::JobStatus::Running
-                })
-            );
-            task
-        })
-        .await
-        .unwrap();
-
-        repo.read_with(cx, |repo, _cx| {
-            let ops = repo.pending_ops_for_path(&path).unwrap();
-            assert_eq!(
-                ops.ops.last(),
-                Some(&pending_op::PendingOp {
-                    id: id.into(),
-                    git_status,
-                    job_status: pending_op::JobStatus::Finished
-                })
-            );
-        });
-
-        id += 1;
-    };
-
-    assert_stage(repo_path("a.txt"), true).await;
-    assert_stage(repo_path("a.txt"), false).await;
-    assert_stage(repo_path("a.txt"), true).await;
-    assert_stage(repo_path("a.txt"), false).await;
-    assert_stage(repo_path("a.txt"), true).await;
-
-    cx.run_until_parked();
-
-    assert_eq!(
-        pending_ops_all
-            .lock()
-            .get(&worktree::PathKey(repo_path("a.txt").as_ref().clone()), ())
-            .unwrap()
-            .ops,
-        vec![
-            pending_op::PendingOp {
-                id: 1u16.into(),
-                git_status: pending_op::GitStatus::Staged,
-                job_status: pending_op::JobStatus::Finished
-            },
-            pending_op::PendingOp {
-                id: 2u16.into(),
-                git_status: pending_op::GitStatus::Unstaged,
-                job_status: pending_op::JobStatus::Finished
-            },
-            pending_op::PendingOp {
-                id: 3u16.into(),
-                git_status: pending_op::GitStatus::Staged,
-                job_status: pending_op::JobStatus::Finished
-            },
-            pending_op::PendingOp {
-                id: 4u16.into(),
-                git_status: pending_op::GitStatus::Unstaged,
-                job_status: pending_op::JobStatus::Finished
-            },
-            pending_op::PendingOp {
-                id: 5u16.into(),
-                git_status: pending_op::GitStatus::Staged,
-                job_status: pending_op::JobStatus::Finished
-            }
-        ],
-    );
-
-    repo.update(cx, |repo, _cx| {
-        let git_statuses = repo.cached_status().collect::<Vec<_>>();
-
-        assert_eq!(
-            git_statuses,
-            [StatusEntry {
-                repo_path: repo_path("a.txt"),
-                status: TrackedStatus {
-                    index_status: StatusCode::Added,
-                    worktree_status: StatusCode::Unmodified
-                }
-                .into(),
-            }]
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_repository_pending_ops_long_running_staging(
-    executor: gpui::BackgroundExecutor,
-    cx: &mut gpui::TestAppContext,
-) {
-    init_test(cx);
-
-    let fs = FakeFs::new(executor);
-    fs.insert_tree(
-        path!("/root"),
-        json!({
-            "my-repo": {
-                ".git": {},
-                "a.txt": "a",
-            }
-
-        }),
-    )
-    .await;
-
-    fs.set_status_for_repo(
-        path!("/root/my-repo/.git").as_ref(),
-        &[("a.txt", FileStatus::Untracked)],
-    );
-
-    let project = Project::test(fs.clone(), [path!("/root/my-repo").as_ref()], cx).await;
-    let pending_ops_all = Arc::new(Mutex::new(SumTree::default()));
-    project.update(cx, |project, cx| {
-        let pending_ops_all = pending_ops_all.clone();
-        cx.subscribe(project.git_store(), move |_, _, e, _| {
-            if let GitStoreEvent::RepositoryUpdated(
-                _,
-                RepositoryEvent::PendingOpsChanged { pending_ops },
-                _,
-            ) = e
-            {
-                let merged = merge_pending_ops_snapshots(
-                    pending_ops.items(()),
-                    pending_ops_all.lock().items(()),
-                );
-                *pending_ops_all.lock() = SumTree::from_iter(merged.into_iter(), ());
-            }
-        })
-        .detach();
-    });
-
-    project
-        .update(cx, |project, cx| project.git_scans_complete(cx))
-        .await;
-
-    let repo = project.read_with(cx, |project, cx| {
-        project.repositories(cx).values().next().unwrap().clone()
-    });
-
-    repo.update(cx, |repo, cx| {
-        repo.stage_entries(vec![repo_path("a.txt")], cx)
-    })
-    .detach();
-
-    repo.update(cx, |repo, cx| {
-        repo.stage_entries(vec![repo_path("a.txt")], cx)
-    })
-    .unwrap()
-    .with_timeout(Duration::from_secs(1), &cx.executor())
-    .await
-    .unwrap();
-
-    cx.run_until_parked();
-
-    assert_eq!(
-        pending_ops_all
-            .lock()
-            .get(&worktree::PathKey(repo_path("a.txt").as_ref().clone()), ())
-            .unwrap()
-            .ops,
-        vec![
-            pending_op::PendingOp {
-                id: 1u16.into(),
-                git_status: pending_op::GitStatus::Staged,
-                job_status: pending_op::JobStatus::Skipped
-            },
-            pending_op::PendingOp {
-                id: 2u16.into(),
-                git_status: pending_op::GitStatus::Staged,
-                job_status: pending_op::JobStatus::Finished
-            }
-        ],
-    );
-
-    repo.update(cx, |repo, _cx| {
-        let git_statuses = repo.cached_status().collect::<Vec<_>>();
-
-        assert_eq!(
-            git_statuses,
-            [StatusEntry {
-                repo_path: repo_path("a.txt"),
-                status: TrackedStatus {
-                    index_status: StatusCode::Added,
-                    worktree_status: StatusCode::Unmodified
-                }
-                .into(),
-            }]
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_repository_pending_ops_stage_all(
-    executor: gpui::BackgroundExecutor,
-    cx: &mut gpui::TestAppContext,
-) {
-    init_test(cx);
-
-    let fs = FakeFs::new(executor);
-    fs.insert_tree(
-        path!("/root"),
-        json!({
-            "my-repo": {
-                ".git": {},
-                "a.txt": "a",
-                "b.txt": "b"
-            }
-
-        }),
-    )
-    .await;
-
-    fs.set_status_for_repo(
-        path!("/root/my-repo/.git").as_ref(),
-        &[
-            ("a.txt", FileStatus::Untracked),
-            ("b.txt", FileStatus::Untracked),
-        ],
-    );
-
-    let project = Project::test(fs.clone(), [path!("/root/my-repo").as_ref()], cx).await;
-    let pending_ops_all = Arc::new(Mutex::new(SumTree::default()));
-    project.update(cx, |project, cx| {
-        let pending_ops_all = pending_ops_all.clone();
-        cx.subscribe(project.git_store(), move |_, _, e, _| {
-            if let GitStoreEvent::RepositoryUpdated(
-                _,
-                RepositoryEvent::PendingOpsChanged { pending_ops },
-                _,
-            ) = e
-            {
-                let merged = merge_pending_ops_snapshots(
-                    pending_ops.items(()),
-                    pending_ops_all.lock().items(()),
-                );
-                *pending_ops_all.lock() = SumTree::from_iter(merged.into_iter(), ());
-            }
-        })
-        .detach();
-    });
-    project
-        .update(cx, |project, cx| project.git_scans_complete(cx))
-        .await;
-
-    let repo = project.read_with(cx, |project, cx| {
-        project.repositories(cx).values().next().unwrap().clone()
-    });
-
-    repo.update(cx, |repo, cx| {
-        repo.stage_entries(vec![repo_path("a.txt")], cx)
-    })
-    .await
-    .unwrap();
-    repo.update(cx, |repo, cx| repo.stage_all(cx))
-        .await
-        .unwrap();
-    repo.update(cx, |repo, cx| repo.unstage_all(cx))
-        .await
-        .unwrap();
-
-    cx.run_until_parked();
-
-    assert_eq!(
-        pending_ops_all
-            .lock()
-            .get(&worktree::PathKey(repo_path("a.txt").as_ref().clone()), ())
-            .unwrap()
-            .ops,
-        vec![
-            pending_op::PendingOp {
-                id: 1u16.into(),
-                git_status: pending_op::GitStatus::Staged,
-                job_status: pending_op::JobStatus::Finished
-            },
-            pending_op::PendingOp {
-                id: 2u16.into(),
-                git_status: pending_op::GitStatus::Unstaged,
-                job_status: pending_op::JobStatus::Finished
-            },
-        ],
-    );
-    assert_eq!(
-        pending_ops_all
-            .lock()
-            .get(&worktree::PathKey(repo_path("b.txt").as_ref().clone()), ())
-            .unwrap()
-            .ops,
-        vec![
-            pending_op::PendingOp {
-                id: 1u16.into(),
-                git_status: pending_op::GitStatus::Staged,
-                job_status: pending_op::JobStatus::Finished
-            },
-            pending_op::PendingOp {
-                id: 2u16.into(),
-                git_status: pending_op::GitStatus::Unstaged,
-                job_status: pending_op::JobStatus::Finished
-            },
-        ],
-    );
-
-    repo.update(cx, |repo, _cx| {
-        let git_statuses = repo.cached_status().collect::<Vec<_>>();
-
-        assert_eq!(
-            git_statuses,
-            [
-                StatusEntry {
-                    repo_path: repo_path("a.txt"),
-                    status: FileStatus::Untracked,
-                },
-                StatusEntry {
-                    repo_path: repo_path("b.txt"),
-                    status: FileStatus::Untracked,
-                },
-            ]
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_repository_subfolder_git_status(
-    executor: gpui::BackgroundExecutor,
-    cx: &mut gpui::TestAppContext,
-) {
-    init_test(cx);
-
-    let fs = FakeFs::new(executor);
-    fs.insert_tree(
-        path!("/root"),
-        json!({
-            "my-repo": {
-                ".git": {},
-                "a.txt": "a",
-                "sub-folder-1": {
-                    "sub-folder-2": {
-                        "c.txt": "cc",
-                        "d": {
-                            "e.txt": "eee"
-                        }
-                    },
-                }
-            },
-        }),
-    )
-    .await;
-
-    const C_TXT: &str = "sub-folder-1/sub-folder-2/c.txt";
-    const E_TXT: &str = "sub-folder-1/sub-folder-2/d/e.txt";
-
-    fs.set_status_for_repo(
-        path!("/root/my-repo/.git").as_ref(),
-        &[(E_TXT, FileStatus::Untracked)],
-    );
-
-    let project = Project::test(
-        fs.clone(),
-        [path!("/root/my-repo/sub-folder-1/sub-folder-2").as_ref()],
-        cx,
-    )
-    .await;
-
-    project
-        .update(cx, |project, cx| project.git_scans_complete(cx))
-        .await;
-    cx.run_until_parked();
-
-    let repository = project.read_with(cx, |project, cx| {
-        project.repositories(cx).values().next().unwrap().clone()
-    });
-
-    // Ensure that the git status is loaded correctly
-    repository.read_with(cx, |repository, _cx| {
-        assert_eq!(
-            repository.work_directory_abs_path,
-            Path::new(path!("/root/my-repo")).into()
-        );
-
-        assert_eq!(repository.status_for_path(&repo_path(C_TXT)), None);
-        assert_eq!(
-            repository
-                .status_for_path(&repo_path(E_TXT))
-                .unwrap()
-                .status,
-            FileStatus::Untracked
-        );
-    });
-
-    fs.set_status_for_repo(path!("/root/my-repo/.git").as_ref(), &[]);
-    project
-        .update(cx, |project, cx| project.git_scans_complete(cx))
-        .await;
-    cx.run_until_parked();
-
-    repository.read_with(cx, |repository, _cx| {
-        assert_eq!(repository.status_for_path(&repo_path(C_TXT)), None);
-        assert_eq!(repository.status_for_path(&repo_path(E_TXT)), None);
-    });
-}
-
-// TODO: this test is flaky (especially on Windows but at least sometimes on all platforms).
-#[cfg(any())]
-#[gpui::test]
-async fn test_conflicted_cherry_pick(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-    cx.executor().allow_parking();
-
-    let root = TempTree::new(json!({
-        "project": {
-            "a.txt": "a",
-        },
-    }));
-    let root_path = root.path();
-
-    let repo = git_init(&root_path.join("project"));
-    git_add("a.txt", &repo);
-    git_commit("init", &repo);
-
-    let project = Project::test(Arc::new(RealFs::new(None, cx.executor())), [root_path], cx).await;
-
-    let tree = project.read_with(cx, |project, cx| project.worktrees(cx).next().unwrap());
-    tree.flush_fs_events(cx).await;
-    project
-        .update(cx, |project, cx| project.git_scans_complete(cx))
-        .await;
-    cx.executor().run_until_parked();
-
-    let repository = project.read_with(cx, |project, cx| {
-        project.repositories(cx).values().next().unwrap().clone()
-    });
-
-    git_branch("other-branch", &repo);
-    git_checkout("refs/heads/other-branch", &repo);
-    std::fs::write(root_path.join("project/a.txt"), "A").unwrap();
-    git_add("a.txt", &repo);
-    git_commit("capitalize", &repo);
-    let commit = repo
-        .head()
-        .expect("Failed to get HEAD")
-        .peel_to_commit()
-        .expect("HEAD is not a commit");
-    git_checkout("refs/heads/main", &repo);
-    std::fs::write(root_path.join("project/a.txt"), "b").unwrap();
-    git_add("a.txt", &repo);
-    git_commit("improve letter", &repo);
-    git_cherry_pick(&commit, &repo);
-    std::fs::read_to_string(root_path.join("project/.git/CHERRY_PICK_HEAD"))
-        .expect("No CHERRY_PICK_HEAD");
-    pretty_assertions::assert_eq!(
-        git_status(&repo),
-        collections::HashMap::from_iter([("a.txt".to_owned(), git2::Status::CONFLICTED)])
-    );
-    tree.flush_fs_events(cx).await;
-    project
-        .update(cx, |project, cx| project.git_scans_complete(cx))
-        .await;
-    cx.executor().run_until_parked();
-    let conflicts = repository.update(cx, |repository, _| {
-        repository
-            .merge_conflicts
-            .iter()
-            .cloned()
-            .collect::<Vec<_>>()
-    });
-    pretty_assertions::assert_eq!(conflicts, [RepoPath::from("a.txt")]);
-
-    git_add("a.txt", &repo);
-    // Attempt to manually simulate what `git cherry-pick --continue` would do.
-    git_commit("whatevs", &repo);
-    std::fs::remove_file(root.path().join("project/.git/CHERRY_PICK_HEAD"))
-        .expect("Failed to remove CHERRY_PICK_HEAD");
-    pretty_assertions::assert_eq!(git_status(&repo), collections::HashMap::default());
-    tree.flush_fs_events(cx).await;
-    let conflicts = repository.update(cx, |repository, _| {
-        repository
-            .merge_conflicts
-            .iter()
-            .cloned()
-            .collect::<Vec<_>>()
-    });
-    pretty_assertions::assert_eq!(conflicts, []);
-}
-
-#[gpui::test]
-async fn test_update_gitignore(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-    let fs = FakeFs::new(cx.background_executor.clone());
-    fs.insert_tree(
-        path!("/root"),
-        json!({
-            ".git": {},
-            ".gitignore": "*.txt\n",
-            "a.xml": "<a></a>",
-            "b.txt": "Some text"
-        }),
-    )
-    .await;
-
-    fs.set_head_and_index_for_repo(
-        path!("/root/.git").as_ref(),
-        &[
-            (".gitignore", "*.txt\n".into()),
-            ("a.xml", "<a></a>".into()),
-        ],
-    );
-
-    let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-
-    let tree = project.read_with(cx, |project, cx| project.worktrees(cx).next().unwrap());
-    tree.flush_fs_events(cx).await;
-    project
-        .update(cx, |project, cx| project.git_scans_complete(cx))
-        .await;
-    cx.executor().run_until_parked();
-
-    let repository = project.read_with(cx, |project, cx| {
-        project.repositories(cx).values().next().unwrap().clone()
-    });
-
-    // One file is unmodified, the other is ignored.
-    cx.read(|cx| {
-        assert_entry_git_state(tree.read(cx), repository.read(cx), "a.xml", None, false);
-        assert_entry_git_state(tree.read(cx), repository.read(cx), "b.txt", None, true);
-    });
-
-    // Change the gitignore, and stage the newly non-ignored file.
-    fs.atomic_write(path!("/root/.gitignore").into(), "*.xml\n".into())
-        .await
-        .unwrap();
-    fs.set_index_for_repo(
-        Path::new(path!("/root/.git")),
-        &[
-            (".gitignore", "*.txt\n".into()),
-            ("a.xml", "<a></a>".into()),
-            ("b.txt", "Some text".into()),
-        ],
-    );
-
-    cx.executor().run_until_parked();
-    cx.read(|cx| {
-        assert_entry_git_state(tree.read(cx), repository.read(cx), "a.xml", None, true);
-        assert_entry_git_state(
-            tree.read(cx),
-            repository.read(cx),
-            "b.txt",
-            Some(StatusCode::Added),
-            false,
-        );
-    });
-}
-
-// NOTE:
-// This test always fails on Windows, because on Windows, unlike on Unix, you can't rename
-// a directory which some program has already open.
-// This is a limitation of the Windows.
-// See: https://stackoverflow.com/questions/41365318/access-is-denied-when-renaming-folder
-// See: https://learn.microsoft.com/en-us/windows-hardware/drivers/ddi/ntifs/ns-ntifs-_file_rename_information
-#[gpui::test]
-#[cfg_attr(target_os = "windows", ignore)]
-async fn test_rename_work_directory(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-    cx.executor().allow_parking();
-    let root = TempTree::new(json!({
-        "projects": {
-            "project1": {
-                "a": "",
-                "b": "",
-            }
-        },
-
-    }));
-    let root_path = root.path();
-
-    let repo = git_init(&root_path.join("projects/project1"));
-    git_add("a", &repo);
-    git_commit("init", &repo);
-    std::fs::write(root_path.join("projects/project1/a"), "aa").unwrap();
-
-    let project = Project::test(Arc::new(RealFs::new(None, cx.executor())), [root_path], cx).await;
-
-    let tree = project.read_with(cx, |project, cx| project.worktrees(cx).next().unwrap());
-    tree.flush_fs_events(cx).await;
-    project
-        .update(cx, |project, cx| project.git_scans_complete(cx))
-        .await;
-    cx.executor().run_until_parked();
-
-    let repository = project.read_with(cx, |project, cx| {
-        project.repositories(cx).values().next().unwrap().clone()
-    });
-
-    repository.read_with(cx, |repository, _| {
-        assert_eq!(
-            repository.work_directory_abs_path.as_ref(),
-            root_path.join("projects/project1").as_path()
-        );
-        assert_eq!(
-            repository
-                .status_for_path(&repo_path("a"))
-                .map(|entry| entry.status),
-            Some(StatusCode::Modified.worktree()),
-        );
-        assert_eq!(
-            repository
-                .status_for_path(&repo_path("b"))
-                .map(|entry| entry.status),
-            Some(FileStatus::Untracked),
-        );
-    });
-
-    std::fs::rename(
-        root_path.join("projects/project1"),
-        root_path.join("projects/project2"),
-    )
-    .unwrap();
-    tree.flush_fs_events(cx).await;
-
-    repository.read_with(cx, |repository, _| {
-        assert_eq!(
-            repository.work_directory_abs_path.as_ref(),
-            root_path.join("projects/project2").as_path()
-        );
-        assert_eq!(
-            repository.status_for_path(&repo_path("a")).unwrap().status,
-            StatusCode::Modified.worktree(),
-        );
-        assert_eq!(
-            repository.status_for_path(&repo_path("b")).unwrap().status,
-            FileStatus::Untracked,
-        );
-    });
-}
-
-// NOTE: This test always fails on Windows, because on Windows, unlike on Unix,
-// you can't rename a directory which some program has already open. This is a
-// limitation of the Windows. See:
-// See: https://stackoverflow.com/questions/41365318/access-is-denied-when-renaming-folder
-// See: https://learn.microsoft.com/en-us/windows-hardware/drivers/ddi/ntifs/ns-ntifs-_file_rename_information
-#[gpui::test]
-#[cfg_attr(target_os = "windows", ignore)]
-async fn test_file_status(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-    cx.executor().allow_parking();
-    const IGNORE_RULE: &str = "**/target";
-
-    let root = TempTree::new(json!({
-        "project": {
-            "a.txt": "a",
-            "b.txt": "bb",
-            "c": {
-                "d": {
-                    "e.txt": "eee"
-                }
-            },
-            "f.txt": "ffff",
-            "target": {
-                "build_file": "???"
-            },
-            ".gitignore": IGNORE_RULE
-        },
-
-    }));
-    let root_path = root.path();
-
-    const A_TXT: &str = "a.txt";
-    const B_TXT: &str = "b.txt";
-    const E_TXT: &str = "c/d/e.txt";
-    const F_TXT: &str = "f.txt";
-    const DOTGITIGNORE: &str = ".gitignore";
-    const BUILD_FILE: &str = "target/build_file";
-
-    // Set up git repository before creating the worktree.
-    let work_dir = root.path().join("project");
-    let mut repo = git_init(work_dir.as_path());
-    repo.add_ignore_rule(IGNORE_RULE).unwrap();
-    git_add(A_TXT, &repo);
-    git_add(E_TXT, &repo);
-    git_add(DOTGITIGNORE, &repo);
-    git_commit("Initial commit", &repo);
-
-    let project = Project::test(Arc::new(RealFs::new(None, cx.executor())), [root_path], cx).await;
-
-    let tree = project.read_with(cx, |project, cx| project.worktrees(cx).next().unwrap());
-    tree.flush_fs_events(cx).await;
-    project
-        .update(cx, |project, cx| project.git_scans_complete(cx))
-        .await;
-    cx.executor().run_until_parked();
-
-    let repository = project.read_with(cx, |project, cx| {
-        project.repositories(cx).values().next().unwrap().clone()
-    });
-
-    // Check that the right git state is observed on startup
-    repository.read_with(cx, |repository, _cx| {
-        assert_eq!(
-            repository.work_directory_abs_path.as_ref(),
-            root_path.join("project").as_path()
-        );
-
-        assert_eq!(
-            repository
-                .status_for_path(&repo_path(B_TXT))
-                .unwrap()
-                .status,
-            FileStatus::Untracked,
-        );
-        assert_eq!(
-            repository
-                .status_for_path(&repo_path(F_TXT))
-                .unwrap()
-                .status,
-            FileStatus::Untracked,
-        );
-    });
-
-    // Modify a file in the working copy.
-    std::fs::write(work_dir.join(A_TXT), "aa").unwrap();
-    tree.flush_fs_events(cx).await;
-    project
-        .update(cx, |project, cx| project.git_scans_complete(cx))
-        .await;
-    cx.executor().run_until_parked();
-
-    // The worktree detects that the file's git status has changed.
-    repository.read_with(cx, |repository, _| {
-        assert_eq!(
-            repository
-                .status_for_path(&repo_path(A_TXT))
-                .unwrap()
-                .status,
-            StatusCode::Modified.worktree(),
-        );
-    });
-
-    // Create a commit in the git repository.
-    git_add(A_TXT, &repo);
-    git_add(B_TXT, &repo);
-    git_commit("Committing modified and added", &repo);
-    tree.flush_fs_events(cx).await;
-    project
-        .update(cx, |project, cx| project.git_scans_complete(cx))
-        .await;
-    cx.executor().run_until_parked();
-
-    // The worktree detects that the files' git status have changed.
-    repository.read_with(cx, |repository, _cx| {
-        assert_eq!(
-            repository
-                .status_for_path(&repo_path(F_TXT))
-                .unwrap()
-                .status,
-            FileStatus::Untracked,
-        );
-        assert_eq!(repository.status_for_path(&repo_path(B_TXT)), None);
-        assert_eq!(repository.status_for_path(&repo_path(A_TXT)), None);
-    });
-
-    // Modify files in the working copy and perform git operations on other files.
-    git_reset(0, &repo);
-    git_remove_index(Path::new(B_TXT), &repo);
-    git_stash(&mut repo);
-    std::fs::write(work_dir.join(E_TXT), "eeee").unwrap();
-    std::fs::write(work_dir.join(BUILD_FILE), "this should be ignored").unwrap();
-    tree.flush_fs_events(cx).await;
-    project
-        .update(cx, |project, cx| project.git_scans_complete(cx))
-        .await;
-    cx.executor().run_until_parked();
-
-    // Check that more complex repo changes are tracked
-    repository.read_with(cx, |repository, _cx| {
-        assert_eq!(repository.status_for_path(&repo_path(A_TXT)), None);
-        assert_eq!(
-            repository
-                .status_for_path(&repo_path(B_TXT))
-                .unwrap()
-                .status,
-            FileStatus::Untracked,
-        );
-        assert_eq!(
-            repository
-                .status_for_path(&repo_path(E_TXT))
-                .unwrap()
-                .status,
-            StatusCode::Modified.worktree(),
-        );
-    });
-
-    std::fs::remove_file(work_dir.join(B_TXT)).unwrap();
-    std::fs::remove_dir_all(work_dir.join("c")).unwrap();
-    std::fs::write(
-        work_dir.join(DOTGITIGNORE),
-        [IGNORE_RULE, "f.txt"].join("\n"),
-    )
-    .unwrap();
-
-    git_add(Path::new(DOTGITIGNORE), &repo);
-    git_commit("Committing modified git ignore", &repo);
-
-    tree.flush_fs_events(cx).await;
-    cx.executor().run_until_parked();
-
-    let mut renamed_dir_name = "first_directory/second_directory";
-    const RENAMED_FILE: &str = "rf.txt";
-
-    std::fs::create_dir_all(work_dir.join(renamed_dir_name)).unwrap();
-    std::fs::write(
-        work_dir.join(renamed_dir_name).join(RENAMED_FILE),
-        "new-contents",
-    )
-    .unwrap();
-
-    tree.flush_fs_events(cx).await;
-    project
-        .update(cx, |project, cx| project.git_scans_complete(cx))
-        .await;
-    cx.executor().run_until_parked();
-
-    repository.read_with(cx, |repository, _cx| {
-        assert_eq!(
-            repository
-                .status_for_path(&RepoPath::from_rel_path(
-                    &rel_path(renamed_dir_name).join(rel_path(RENAMED_FILE))
-                ))
-                .unwrap()
-                .status,
-            FileStatus::Untracked,
-        );
-    });
-
-    renamed_dir_name = "new_first_directory/second_directory";
-
-    std::fs::rename(
-        work_dir.join("first_directory"),
-        work_dir.join("new_first_directory"),
-    )
-    .unwrap();
-
-    tree.flush_fs_events(cx).await;
-    project
-        .update(cx, |project, cx| project.git_scans_complete(cx))
-        .await;
-    cx.executor().run_until_parked();
-
-    repository.read_with(cx, |repository, _cx| {
-        assert_eq!(
-            repository
-                .status_for_path(&RepoPath::from_rel_path(
-                    &rel_path(renamed_dir_name).join(rel_path(RENAMED_FILE))
-                ))
-                .unwrap()
-                .status,
-            FileStatus::Untracked,
-        );
-    });
-}
-
-#[gpui::test]
-#[ignore]
-async fn test_ignored_dirs_events(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-    cx.executor().allow_parking();
-
-    const IGNORE_RULE: &str = "**/target";
-
-    let root = TempTree::new(json!({
-        "project": {
-            "src": {
-                "main.rs": "fn main() {}"
-            },
-            "target": {
-                "debug": {
-                    "important_text.txt": "important text",
-                },
-            },
-            ".gitignore": IGNORE_RULE
-        },
-
-    }));
-    let root_path = root.path();
-
-    // Set up git repository before creating the worktree.
-    let work_dir = root.path().join("project");
-    let repo = git_init(work_dir.as_path());
-    repo.add_ignore_rule(IGNORE_RULE).unwrap();
-    git_add("src/main.rs", &repo);
-    git_add(".gitignore", &repo);
-    git_commit("Initial commit", &repo);
-
-    let project = Project::test(Arc::new(RealFs::new(None, cx.executor())), [root_path], cx).await;
-    let repository_updates = Arc::new(Mutex::new(Vec::new()));
-    let project_events = Arc::new(Mutex::new(Vec::new()));
-    project.update(cx, |project, cx| {
-        let repo_events = repository_updates.clone();
-        cx.subscribe(project.git_store(), move |_, _, e, _| {
-            if let GitStoreEvent::RepositoryUpdated(_, e, _) = e {
-                repo_events.lock().push(e.clone());
-            }
-        })
-        .detach();
-        let project_events = project_events.clone();
-        cx.subscribe_self(move |_, e, _| {
-            if let Event::WorktreeUpdatedEntries(_, updates) = e {
-                project_events.lock().extend(
-                    updates
-                        .iter()
-                        .map(|(path, _, change)| (path.as_unix_str().to_string(), *change))
-                        .filter(|(path, _)| path != "fs-event-sentinel"),
-                );
-            }
-        })
-        .detach();
-    });
-
-    let tree = project.read_with(cx, |project, cx| project.worktrees(cx).next().unwrap());
-    tree.flush_fs_events(cx).await;
-    tree.update(cx, |tree, cx| {
-        tree.load_file(rel_path("project/target/debug/important_text.txt"), cx)
-    })
-    .await
-    .unwrap();
-    tree.update(cx, |tree, _| {
-        assert_eq!(
-            tree.entries(true, 0)
-                .map(|entry| (entry.path.as_ref(), entry.is_ignored))
-                .collect::<Vec<_>>(),
-            vec![
-                (rel_path(""), false),
-                (rel_path("project/"), false),
-                (rel_path("project/.gitignore"), false),
-                (rel_path("project/src"), false),
-                (rel_path("project/src/main.rs"), false),
-                (rel_path("project/target"), true),
-                (rel_path("project/target/debug"), true),
-                (rel_path("project/target/debug/important_text.txt"), true),
-            ]
-        );
-    });
-
-    assert_eq!(
-        repository_updates.lock().drain(..).collect::<Vec<_>>(),
-        vec![
-            RepositoryEvent::StatusesChanged,
-            RepositoryEvent::MergeHeadsChanged,
-        ],
-        "Initial worktree scan should produce a repo update event"
-    );
-    assert_eq!(
-        project_events.lock().drain(..).collect::<Vec<_>>(),
-        vec![
-            ("project/target".to_string(), PathChange::Loaded),
-            ("project/target/debug".to_string(), PathChange::Loaded),
-            (
-                "project/target/debug/important_text.txt".to_string(),
-                PathChange::Loaded
-            ),
-        ],
-        "Initial project changes should show that all not-ignored and all opened files are loaded"
-    );
-
-    let deps_dir = work_dir.join("target").join("debug").join("deps");
-    std::fs::create_dir_all(&deps_dir).unwrap();
-    tree.flush_fs_events(cx).await;
-    project
-        .update(cx, |project, cx| project.git_scans_complete(cx))
-        .await;
-    cx.executor().run_until_parked();
-    std::fs::write(deps_dir.join("aa.tmp"), "something tmp").unwrap();
-    tree.flush_fs_events(cx).await;
-    project
-        .update(cx, |project, cx| project.git_scans_complete(cx))
-        .await;
-    cx.executor().run_until_parked();
-    std::fs::remove_dir_all(&deps_dir).unwrap();
-    tree.flush_fs_events(cx).await;
-    project
-        .update(cx, |project, cx| project.git_scans_complete(cx))
-        .await;
-    cx.executor().run_until_parked();
-
-    tree.update(cx, |tree, _| {
-        assert_eq!(
-            tree.entries(true, 0)
-                .map(|entry| (entry.path.as_ref(), entry.is_ignored))
-                .collect::<Vec<_>>(),
-            vec![
-                (rel_path(""), false),
-                (rel_path("project/"), false),
-                (rel_path("project/.gitignore"), false),
-                (rel_path("project/src"), false),
-                (rel_path("project/src/main.rs"), false),
-                (rel_path("project/target"), true),
-                (rel_path("project/target/debug"), true),
-                (rel_path("project/target/debug/important_text.txt"), true),
-            ],
-            "No stray temp files should be left after the flycheck changes"
-        );
-    });
-
-    assert_eq!(
-        repository_updates
-            .lock()
-            .iter()
-            .cloned()
-            .collect::<Vec<_>>(),
-        Vec::new(),
-        "No further RepositoryUpdated events should happen, as only ignored dirs' contents was changed",
-    );
-    assert_eq!(
-        project_events.lock().as_slice(),
-        vec![
-            ("project/target/debug/deps".to_string(), PathChange::Added),
-            ("project/target/debug/deps".to_string(), PathChange::Removed),
-        ],
-        "Due to `debug` directory being tracked, it should get updates for entries inside it.
-        No updates for more nested directories should happen as those are ignored",
-    );
-}
-
-// todo(jk): turning this test off until we rework it in such a way so that it is not so susceptible
-// to different timings/ordering of events.
-#[ignore]
-#[gpui::test]
-async fn test_odd_events_for_ignored_dirs(
-    executor: BackgroundExecutor,
-    cx: &mut gpui::TestAppContext,
-) {
-    init_test(cx);
-    let fs = FakeFs::new(executor);
-    fs.insert_tree(
-        path!("/root"),
-        json!({
-            ".git": {},
-            ".gitignore": "**/target/",
-            "src": {
-                "main.rs": "fn main() {}",
-            },
-            "target": {
-                "debug": {
-                    "foo.txt": "foo",
-                    "deps": {}
-                }
-            }
-        }),
-    )
-    .await;
-    fs.set_head_and_index_for_repo(
-        path!("/root/.git").as_ref(),
-        &[
-            (".gitignore", "**/target/".into()),
-            ("src/main.rs", "fn main() {}".into()),
-        ],
-    );
-
-    let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-    let repository_updates = Arc::new(Mutex::new(Vec::new()));
-    let project_events = Arc::new(Mutex::new(Vec::new()));
-    project.update(cx, |project, cx| {
-        let repository_updates = repository_updates.clone();
-        cx.subscribe(project.git_store(), move |_, _, e, _| {
-            if let GitStoreEvent::RepositoryUpdated(_, e, _) = e {
-                repository_updates.lock().push(e.clone());
-            }
-        })
-        .detach();
-        let project_events = project_events.clone();
-        cx.subscribe_self(move |_, e, _| {
-            if let Event::WorktreeUpdatedEntries(_, updates) = e {
-                project_events.lock().extend(
-                    updates
-                        .iter()
-                        .map(|(path, _, change)| (path.as_unix_str().to_string(), *change))
-                        .filter(|(path, _)| path != "fs-event-sentinel"),
-                );
-            }
-        })
-        .detach();
-    });
-
-    let tree = project.read_with(cx, |project, cx| project.worktrees(cx).next().unwrap());
-    tree.update(cx, |tree, cx| {
-        tree.load_file(rel_path("target/debug/foo.txt"), cx)
-    })
-    .await
-    .unwrap();
-    tree.flush_fs_events(cx).await;
-    project
-        .update(cx, |project, cx| project.git_scans_complete(cx))
-        .await;
-    cx.run_until_parked();
-    tree.update(cx, |tree, _| {
-        assert_eq!(
-            tree.entries(true, 0)
-                .map(|entry| (entry.path.as_ref(), entry.is_ignored))
-                .collect::<Vec<_>>(),
-            vec![
-                (rel_path(""), false),
-                (rel_path(".gitignore"), false),
-                (rel_path("src"), false),
-                (rel_path("src/main.rs"), false),
-                (rel_path("target"), true),
-                (rel_path("target/debug"), true),
-                (rel_path("target/debug/deps"), true),
-                (rel_path("target/debug/foo.txt"), true),
-            ]
-        );
-    });
-
-    assert_eq!(
-        repository_updates.lock().drain(..).collect::<Vec<_>>(),
-        vec![
-            RepositoryEvent::MergeHeadsChanged,
-            RepositoryEvent::BranchChanged,
-            RepositoryEvent::StatusesChanged,
-            RepositoryEvent::StatusesChanged,
-        ],
-        "Initial worktree scan should produce a repo update event"
-    );
-    assert_eq!(
-        project_events.lock().drain(..).collect::<Vec<_>>(),
-        vec![
-            ("target".to_string(), PathChange::Loaded),
-            ("target/debug".to_string(), PathChange::Loaded),
-            ("target/debug/deps".to_string(), PathChange::Loaded),
-            ("target/debug/foo.txt".to_string(), PathChange::Loaded),
-        ],
-        "All non-ignored entries and all opened firs should be getting a project event",
-    );
-
-    // Emulate a flycheck spawn: it emits a `INODE_META_MOD`-flagged FS event on target/debug/deps, then creates and removes temp files inside.
-    // This may happen multiple times during a single flycheck, but once is enough for testing.
-    fs.emit_fs_event("/root/target/debug/deps", None);
-    tree.flush_fs_events(cx).await;
-    project
-        .update(cx, |project, cx| project.git_scans_complete(cx))
-        .await;
-    cx.executor().run_until_parked();
-
-    assert_eq!(
-        repository_updates
-            .lock()
-            .iter()
-            .cloned()
-            .collect::<Vec<_>>(),
-        Vec::new(),
-        "No further RepositoryUpdated events should happen, as only ignored dirs received FS events",
-    );
-    assert_eq!(
-        project_events.lock().as_slice(),
-        Vec::new(),
-        "No further project events should happen, as only ignored dirs received FS events",
-    );
-}
-
-#[gpui::test]
-async fn test_repos_in_invisible_worktrees(
-    executor: BackgroundExecutor,
-    cx: &mut gpui::TestAppContext,
-) {
-    init_test(cx);
-    let fs = FakeFs::new(executor);
-    fs.insert_tree(
-        path!("/root"),
-        json!({
-            "dir1": {
-                ".git": {},
-                "dep1": {
-                    ".git": {},
-                    "src": {
-                        "a.txt": "",
-                    },
-                },
-                "b.txt": "",
-            },
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), [path!("/root/dir1/dep1").as_ref()], cx).await;
-    let _visible_worktree =
-        project.read_with(cx, |project, cx| project.worktrees(cx).next().unwrap());
-    project
-        .update(cx, |project, cx| project.git_scans_complete(cx))
-        .await;
-
-    let repos = project.read_with(cx, |project, cx| {
-        project
-            .repositories(cx)
-            .values()
-            .map(|repo| repo.read(cx).work_directory_abs_path.clone())
-            .collect::<Vec<_>>()
-    });
-    pretty_assertions::assert_eq!(repos, [Path::new(path!("/root/dir1/dep1")).into()]);
-
-    let (_invisible_worktree, _) = project
-        .update(cx, |project, cx| {
-            project.worktree_store.update(cx, |worktree_store, cx| {
-                worktree_store.find_or_create_worktree(path!("/root/dir1/b.txt"), false, cx)
-            })
-        })
-        .await
-        .expect("failed to create worktree");
-    project
-        .update(cx, |project, cx| project.git_scans_complete(cx))
-        .await;
-
-    let repos = project.read_with(cx, |project, cx| {
-        project
-            .repositories(cx)
-            .values()
-            .map(|repo| repo.read(cx).work_directory_abs_path.clone())
-            .collect::<Vec<_>>()
-    });
-    pretty_assertions::assert_eq!(repos, [Path::new(path!("/root/dir1/dep1")).into()]);
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_rescan_with_gitignore(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-    cx.update(|cx| {
-        cx.update_global::<SettingsStore, _>(|store, cx| {
-            store.update_user_settings(cx, |settings| {
-                settings.project.worktree.file_scan_exclusions = Some(Vec::new());
-            });
-        });
-    });
-    let fs = FakeFs::new(cx.background_executor.clone());
-    fs.insert_tree(
-        path!("/root"),
-        json!({
-            ".gitignore": "ancestor-ignored-file1\nancestor-ignored-file2\n",
-            "tree": {
-                ".git": {},
-                ".gitignore": "ignored-dir\n",
-                "tracked-dir": {
-                    "tracked-file1": "",
-                    "ancestor-ignored-file1": "",
-                },
-                "ignored-dir": {
-                    "ignored-file1": ""
-                }
-            }
-        }),
-    )
-    .await;
-    fs.set_head_and_index_for_repo(
-        path!("/root/tree/.git").as_ref(),
-        &[
-            (".gitignore", "ignored-dir\n".into()),
-            ("tracked-dir/tracked-file1", "".into()),
-        ],
-    );
-
-    let project = Project::test(fs.clone(), [path!("/root/tree").as_ref()], cx).await;
-
-    let tree = project.read_with(cx, |project, cx| project.worktrees(cx).next().unwrap());
-    tree.flush_fs_events(cx).await;
-    project
-        .update(cx, |project, cx| project.git_scans_complete(cx))
-        .await;
-    cx.executor().run_until_parked();
-
-    let repository = project.read_with(cx, |project, cx| {
-        project.repositories(cx).values().next().unwrap().clone()
-    });
-
-    tree.read_with(cx, |tree, _| {
-        tree.as_local()
-            .unwrap()
-            .manually_refresh_entries_for_paths(vec![rel_path("ignored-dir").into()])
-    })
-    .recv()
-    .await;
-
-    cx.read(|cx| {
-        assert_entry_git_state(
-            tree.read(cx),
-            repository.read(cx),
-            "tracked-dir/tracked-file1",
-            None,
-            false,
-        );
-        assert_entry_git_state(
-            tree.read(cx),
-            repository.read(cx),
-            "tracked-dir/ancestor-ignored-file1",
-            None,
-            false,
-        );
-        assert_entry_git_state(
-            tree.read(cx),
-            repository.read(cx),
-            "ignored-dir/ignored-file1",
-            None,
-            true,
-        );
-    });
-
-    fs.create_file(
-        path!("/root/tree/tracked-dir/tracked-file2").as_ref(),
-        Default::default(),
-    )
-    .await
-    .unwrap();
-    fs.set_index_for_repo(
-        path!("/root/tree/.git").as_ref(),
-        &[
-            (".gitignore", "ignored-dir\n".into()),
-            ("tracked-dir/tracked-file1", "".into()),
-            ("tracked-dir/tracked-file2", "".into()),
-        ],
-    );
-    fs.create_file(
-        path!("/root/tree/tracked-dir/ancestor-ignored-file2").as_ref(),
-        Default::default(),
-    )
-    .await
-    .unwrap();
-    fs.create_file(
-        path!("/root/tree/ignored-dir/ignored-file2").as_ref(),
-        Default::default(),
-    )
-    .await
-    .unwrap();
-
-    cx.executor().run_until_parked();
-    cx.read(|cx| {
-        assert_entry_git_state(
-            tree.read(cx),
-            repository.read(cx),
-            "tracked-dir/tracked-file2",
-            Some(StatusCode::Added),
-            false,
-        );
-        assert_entry_git_state(
-            tree.read(cx),
-            repository.read(cx),
-            "tracked-dir/ancestor-ignored-file2",
-            None,
-            false,
-        );
-        assert_entry_git_state(
-            tree.read(cx),
-            repository.read(cx),
-            "ignored-dir/ignored-file2",
-            None,
-            true,
-        );
-        assert!(
-            tree.read(cx)
-                .entry_for_path(&rel_path(".git"))
-                .unwrap()
-                .is_ignored
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_git_worktrees_and_submodules(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/project"),
-        json!({
-            ".git": {
-                "worktrees": {
-                    "some-worktree": {
-                        "commondir": "../..\n",
-                        // For is_git_dir
-                        "HEAD": "",
-                        "config": ""
-                    }
-                },
-                "modules": {
-                    "subdir": {
-                        "some-submodule": {
-                            // For is_git_dir
-                            "HEAD": "",
-                            "config": "",
-                        }
-                    }
-                }
-            },
-            "src": {
-                "a.txt": "A",
-            },
-            "some-worktree": {
-                ".git": "gitdir: ../.git/worktrees/some-worktree\n",
-                "src": {
-                    "b.txt": "B",
-                }
-            },
-            "subdir": {
-                "some-submodule": {
-                    ".git": "gitdir: ../../.git/modules/subdir/some-submodule\n",
-                    "c.txt": "C",
-                }
-            }
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
-    let scan_complete = project.update(cx, |project, cx| project.git_scans_complete(cx));
-    scan_complete.await;
-
-    let mut repositories = project.update(cx, |project, cx| {
-        project
-            .repositories(cx)
-            .values()
-            .map(|repo| repo.read(cx).work_directory_abs_path.clone())
-            .collect::<Vec<_>>()
-    });
-    repositories.sort();
-    pretty_assertions::assert_eq!(
-        repositories,
-        [
-            Path::new(path!("/project")).into(),
-            Path::new(path!("/project/some-worktree")).into(),
-            Path::new(path!("/project/subdir/some-submodule")).into(),
-        ]
-    );
-
-    // Generate a git-related event for the worktree and check that it's refreshed.
-    fs.with_git_state(
-        path!("/project/some-worktree/.git").as_ref(),
-        true,
-        |state| {
-            state
-                .head_contents
-                .insert(repo_path("src/b.txt"), "b".to_owned());
-            state
-                .index_contents
-                .insert(repo_path("src/b.txt"), "b".to_owned());
-        },
-    )
-    .unwrap();
-    cx.run_until_parked();
-
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer(path!("/project/some-worktree/src/b.txt"), cx)
-        })
-        .await
-        .unwrap();
-    let (worktree_repo, barrier) = project.update(cx, |project, cx| {
-        let (repo, _) = project
-            .git_store()
-            .read(cx)
-            .repository_and_path_for_buffer_id(buffer.read(cx).remote_id(), cx)
-            .unwrap();
-        pretty_assertions::assert_eq!(
-            repo.read(cx).work_directory_abs_path,
-            Path::new(path!("/project/some-worktree")).into(),
-        );
-        let barrier = repo.update(cx, |repo, _| repo.barrier());
-        (repo.clone(), barrier)
-    });
-    barrier.await.unwrap();
-    worktree_repo.update(cx, |repo, _| {
-        pretty_assertions::assert_eq!(
-            repo.status_for_path(&repo_path("src/b.txt"))
-                .unwrap()
-                .status,
-            StatusCode::Modified.worktree(),
-        );
-    });
-
-    // The same for the submodule.
-    fs.with_git_state(
-        path!("/project/subdir/some-submodule/.git").as_ref(),
-        true,
-        |state| {
-            state
-                .head_contents
-                .insert(repo_path("c.txt"), "c".to_owned());
-            state
-                .index_contents
-                .insert(repo_path("c.txt"), "c".to_owned());
-        },
-    )
-    .unwrap();
-    cx.run_until_parked();
-
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer(path!("/project/subdir/some-submodule/c.txt"), cx)
-        })
-        .await
-        .unwrap();
-    let (submodule_repo, barrier) = project.update(cx, |project, cx| {
-        let (repo, _) = project
-            .git_store()
-            .read(cx)
-            .repository_and_path_for_buffer_id(buffer.read(cx).remote_id(), cx)
-            .unwrap();
-        pretty_assertions::assert_eq!(
-            repo.read(cx).work_directory_abs_path,
-            Path::new(path!("/project/subdir/some-submodule")).into(),
-        );
-        let barrier = repo.update(cx, |repo, _| repo.barrier());
-        (repo.clone(), barrier)
-    });
-    barrier.await.unwrap();
-    submodule_repo.update(cx, |repo, _| {
-        pretty_assertions::assert_eq!(
-            repo.status_for_path(&repo_path("c.txt")).unwrap().status,
-            StatusCode::Modified.worktree(),
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_repository_deduplication(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-    let fs = FakeFs::new(cx.background_executor.clone());
-    fs.insert_tree(
-        path!("/root"),
-        json!({
-            "project": {
-                ".git": {},
-                "child1": {
-                    "a.txt": "A",
-                },
-                "child2": {
-                    "b.txt": "B",
-                }
-            }
-        }),
-    )
-    .await;
-
-    let project = Project::test(
-        fs.clone(),
-        [
-            path!("/root/project/child1").as_ref(),
-            path!("/root/project/child2").as_ref(),
-        ],
-        cx,
-    )
-    .await;
-
-    let tree = project.read_with(cx, |project, cx| project.worktrees(cx).next().unwrap());
-    tree.flush_fs_events(cx).await;
-    project
-        .update(cx, |project, cx| project.git_scans_complete(cx))
-        .await;
-    cx.executor().run_until_parked();
-
-    let repos = project.read_with(cx, |project, cx| {
-        project
-            .repositories(cx)
-            .values()
-            .map(|repo| repo.read(cx).work_directory_abs_path.clone())
-            .collect::<Vec<_>>()
-    });
-    pretty_assertions::assert_eq!(repos, [Path::new(path!("/root/project")).into()]);
-}
-
-#[gpui::test]
-async fn test_buffer_changed_file_path_updates_git_diff(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let file_1_committed = String::from(r#"file_1_committed"#);
-    let file_1_staged = String::from(r#"file_1_staged"#);
-    let file_2_committed = String::from(r#"file_2_committed"#);
-    let file_2_staged = String::from(r#"file_2_staged"#);
-    let buffer_contents = String::from(r#"buffer"#);
-
-    let fs = FakeFs::new(cx.background_executor.clone());
-    fs.insert_tree(
-        path!("/dir"),
-        json!({
-            ".git": {},
-           "src": {
-               "file_1.rs": file_1_committed.clone(),
-               "file_2.rs": file_2_committed.clone(),
-           }
-        }),
-    )
-    .await;
-
-    fs.set_head_for_repo(
-        path!("/dir/.git").as_ref(),
-        &[
-            ("src/file_1.rs", file_1_committed.clone()),
-            ("src/file_2.rs", file_2_committed.clone()),
-        ],
-        "deadbeef",
-    );
-    fs.set_index_for_repo(
-        path!("/dir/.git").as_ref(),
-        &[
-            ("src/file_1.rs", file_1_staged.clone()),
-            ("src/file_2.rs", file_2_staged.clone()),
-        ],
-    );
-
-    let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_local_buffer(path!("/dir/src/file_1.rs"), cx)
-        })
-        .await
-        .unwrap();
-
-    buffer.update(cx, |buffer, cx| {
-        buffer.edit([(0..buffer.len(), buffer_contents.as_str())], None, cx);
-    });
-
-    let unstaged_diff = project
-        .update(cx, |project, cx| {
-            project.open_unstaged_diff(buffer.clone(), cx)
-        })
-        .await
-        .unwrap();
-
-    cx.run_until_parked();
-
-    unstaged_diff.update(cx, |unstaged_diff, _cx| {
-        let base_text = unstaged_diff.base_text_string().unwrap();
-        assert_eq!(base_text, file_1_staged, "Should start with file_1 staged");
-    });
-
-    // Save the buffer as `file_2.rs`, which should trigger the
-    // `BufferChangedFilePath` event.
-    project
-        .update(cx, |project, cx| {
-            let worktree_id = project.worktrees(cx).next().unwrap().read(cx).id();
-            let path = ProjectPath {
-                worktree_id,
-                path: rel_path("src/file_2.rs").into(),
-            };
-            project.save_buffer_as(buffer.clone(), path, cx)
-        })
-        .await
-        .unwrap();
-
-    cx.run_until_parked();
-
-    // Verify that the diff bases have been updated to file_2's contents due to
-    // the `BufferChangedFilePath` event being handled.
-    unstaged_diff.update(cx, |unstaged_diff, cx| {
-        let snapshot = buffer.read(cx).snapshot();
-        let base_text = unstaged_diff.base_text_string().unwrap();
-        assert_eq!(
-            base_text, file_2_staged,
-            "Diff bases should be automatically updated to file_2 staged content"
-        );
-
-        let hunks: Vec<_> = unstaged_diff.hunks(&snapshot, cx).collect();
-        assert!(!hunks.is_empty(), "Should have diff hunks for file_2");
-    });
-
-    let uncommitted_diff = project
-        .update(cx, |project, cx| {
-            project.open_uncommitted_diff(buffer.clone(), cx)
-        })
-        .await
-        .unwrap();
-
-    cx.run_until_parked();
-
-    uncommitted_diff.update(cx, |uncommitted_diff, _cx| {
-        let base_text = uncommitted_diff.base_text_string().unwrap();
-        assert_eq!(
-            base_text, file_2_committed,
-            "Uncommitted diff should compare against file_2 committed content"
-        );
-    });
-}
-
-async fn search(
-    project: &Entity<Project>,
-    query: SearchQuery,
-    cx: &mut gpui::TestAppContext,
-) -> Result<HashMap<String, Vec<Range<usize>>>> {
-    let search_rx = project.update(cx, |project, cx| project.search(query, cx));
-    let mut results = HashMap::default();
-    while let Ok(search_result) = search_rx.recv().await {
-        match search_result {
-            SearchResult::Buffer { buffer, ranges } => {
-                results.entry(buffer).or_insert(ranges);
-            }
-            SearchResult::LimitReached => {}
-        }
-    }
-    Ok(results
-        .into_iter()
-        .map(|(buffer, ranges)| {
-            buffer.update(cx, |buffer, cx| {
-                let path = buffer
-                    .file()
-                    .unwrap()
-                    .full_path(cx)
-                    .to_string_lossy()
-                    .to_string();
-                let ranges = ranges
-                    .into_iter()
-                    .map(|range| range.to_offset(buffer))
-                    .collect::<Vec<_>>();
-                (path, ranges)
-            })
-        })
-        .collect())
-}
-
-pub fn init_test(cx: &mut gpui::TestAppContext) {
-    zlog::init_test();
-
-    cx.update(|cx| {
-        let settings_store = SettingsStore::test(cx);
-        cx.set_global(settings_store);
-        release_channel::init(semver::Version::new(0, 0, 0), cx);
-    });
-}
-
-fn json_lang() -> Arc<Language> {
-    Arc::new(Language::new(
-        LanguageConfig {
-            name: "JSON".into(),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["json".to_string()],
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-        None,
-    ))
-}
-
-fn js_lang() -> Arc<Language> {
-    Arc::new(Language::new(
-        LanguageConfig {
-            name: "JavaScript".into(),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["js".to_string()],
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-        None,
-    ))
-}
-
-fn python_lang(fs: Arc<FakeFs>) -> Arc<Language> {
-    struct PythonMootToolchainLister(Arc<FakeFs>);
-    #[async_trait]
-    impl ToolchainLister for PythonMootToolchainLister {
-        async fn list(
-            &self,
-            worktree_root: PathBuf,
-            subroot_relative_path: Arc<RelPath>,
-            _: Option<HashMap<String, String>>,
-            _: &dyn Fs,
-        ) -> ToolchainList {
-            // This lister will always return a path .venv directories within ancestors
-            let ancestors = subroot_relative_path.ancestors().collect::<Vec<_>>();
-            let mut toolchains = vec![];
-            for ancestor in ancestors {
-                let venv_path = worktree_root.join(ancestor.as_std_path()).join(".venv");
-                if self.0.is_dir(&venv_path).await {
-                    toolchains.push(Toolchain {
-                        name: SharedString::new("Python Venv"),
-                        path: venv_path.to_string_lossy().into_owned().into(),
-                        language_name: LanguageName(SharedString::new_static("Python")),
-                        as_json: serde_json::Value::Null,
-                    })
-                }
-            }
-            ToolchainList {
-                toolchains,
-                ..Default::default()
-            }
-        }
-        async fn resolve(
-            &self,
-            _: PathBuf,
-            _: Option<HashMap<String, String>>,
-            _: &dyn Fs,
-        ) -> anyhow::Result<Toolchain> {
-            Err(anyhow::anyhow!("Not implemented"))
-        }
-        fn meta(&self) -> ToolchainMetadata {
-            ToolchainMetadata {
-                term: SharedString::new_static("Virtual Environment"),
-                new_toolchain_placeholder: SharedString::new_static(
-                    "A path to the python3 executable within a virtual environment, or path to virtual environment itself",
-                ),
-                manifest_name: ManifestName::from(SharedString::new_static("pyproject.toml")),
-            }
-        }
-        fn activation_script(&self, _: &Toolchain, _: ShellKind, _: &gpui::App) -> Vec<String> {
-            vec![]
-        }
-    }
-    Arc::new(
-        Language::new(
-            LanguageConfig {
-                name: "Python".into(),
-                matcher: LanguageMatcher {
-                    path_suffixes: vec!["py".to_string()],
-                    ..Default::default()
-                },
-                ..Default::default()
-            },
-            None, // We're not testing Python parsing with this language.
-        )
-        .with_manifest(Some(ManifestName::from(SharedString::new_static(
-            "pyproject.toml",
-        ))))
-        .with_toolchain_lister(Some(Arc::new(PythonMootToolchainLister(fs)))),
-    )
-}
-
-fn typescript_lang() -> Arc<Language> {
-    Arc::new(Language::new(
-        LanguageConfig {
-            name: "TypeScript".into(),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["ts".to_string()],
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-        Some(tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into()),
-    ))
-}
-
-fn tsx_lang() -> Arc<Language> {
-    Arc::new(Language::new(
-        LanguageConfig {
-            name: "tsx".into(),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["tsx".to_string()],
-                ..Default::default()
-            },
-            ..Default::default()
-        },
-        Some(tree_sitter_typescript::LANGUAGE_TSX.into()),
-    ))
-}
-
-fn get_all_tasks(
-    project: &Entity<Project>,
-    task_contexts: Arc<TaskContexts>,
-    cx: &mut App,
-) -> Task<Vec<(TaskSourceKind, ResolvedTask)>> {
-    let new_tasks = project.update(cx, |project, cx| {
-        project.task_store.update(cx, |task_store, cx| {
-            task_store.task_inventory().unwrap().update(cx, |this, cx| {
-                this.used_and_current_resolved_tasks(task_contexts, cx)
-            })
-        })
-    });
-
-    cx.background_spawn(async move {
-        let (mut old, new) = new_tasks.await;
-        old.extend(new);
-        old
-    })
-}
-
-#[track_caller]
-fn assert_entry_git_state(
-    tree: &Worktree,
-    repository: &Repository,
-    path: &str,
-    index_status: Option<StatusCode>,
-    is_ignored: bool,
-) {
-    assert_eq!(tree.abs_path(), repository.work_directory_abs_path);
-    let entry = tree
-        .entry_for_path(&rel_path(path))
-        .unwrap_or_else(|| panic!("entry {path} not found"));
-    let status = repository
-        .status_for_path(&repo_path(path))
-        .map(|entry| entry.status);
-    let expected = index_status.map(|index_status| {
-        TrackedStatus {
-            index_status,
-            worktree_status: StatusCode::Unmodified,
-        }
-        .into()
-    });
-    assert_eq!(
-        status, expected,
-        "expected {path} to have git status: {expected:?}"
-    );
-    assert_eq!(
-        entry.is_ignored, is_ignored,
-        "expected {path} to have is_ignored: {is_ignored}"
-    );
-}
-
-#[track_caller]
-fn git_init(path: &Path) -> git2::Repository {
-    let mut init_opts = RepositoryInitOptions::new();
-    init_opts.initial_head("main");
-    git2::Repository::init_opts(path, &init_opts).expect("Failed to initialize git repository")
-}
-
-#[track_caller]
-fn git_add<P: AsRef<Path>>(path: P, repo: &git2::Repository) {
-    let path = path.as_ref();
-    let mut index = repo.index().expect("Failed to get index");
-    index.add_path(path).expect("Failed to add file");
-    index.write().expect("Failed to write index");
-}
-
-#[track_caller]
-fn git_remove_index(path: &Path, repo: &git2::Repository) {
-    let mut index = repo.index().expect("Failed to get index");
-    index.remove_path(path).expect("Failed to add file");
-    index.write().expect("Failed to write index");
-}
-
-#[track_caller]
-fn git_commit(msg: &'static str, repo: &git2::Repository) {
-    use git2::Signature;
-
-    let signature = Signature::now("test", "test@zed.dev").unwrap();
-    let oid = repo.index().unwrap().write_tree().unwrap();
-    let tree = repo.find_tree(oid).unwrap();
-    if let Ok(head) = repo.head() {
-        let parent_obj = head.peel(git2::ObjectType::Commit).unwrap();
-
-        let parent_commit = parent_obj.as_commit().unwrap();
-
-        repo.commit(
-            Some("HEAD"),
-            &signature,
-            &signature,
-            msg,
-            &tree,
-            &[parent_commit],
-        )
-        .expect("Failed to commit with parent");
-    } else {
-        repo.commit(Some("HEAD"), &signature, &signature, msg, &tree, &[])
-            .expect("Failed to commit");
-    }
-}
-
-#[cfg(any())]
-#[track_caller]
-fn git_cherry_pick(commit: &git2::Commit<'_>, repo: &git2::Repository) {
-    repo.cherrypick(commit, None).expect("Failed to cherrypick");
-}
-
-#[track_caller]
-fn git_stash(repo: &mut git2::Repository) {
-    use git2::Signature;
-
-    let signature = Signature::now("test", "test@zed.dev").unwrap();
-    repo.stash_save(&signature, "N/A", None)
-        .expect("Failed to stash");
-}
-
-#[track_caller]
-fn git_reset(offset: usize, repo: &git2::Repository) {
-    let head = repo.head().expect("Couldn't get repo head");
-    let object = head.peel(git2::ObjectType::Commit).unwrap();
-    let commit = object.as_commit().unwrap();
-    let new_head = commit
-        .parents()
-        .inspect(|parnet| {
-            parnet.message();
-        })
-        .nth(offset)
-        .expect("Not enough history");
-    repo.reset(new_head.as_object(), git2::ResetType::Soft, None)
-        .expect("Could not reset");
-}
-
-#[cfg(any())]
-#[track_caller]
-fn git_branch(name: &str, repo: &git2::Repository) {
-    let head = repo
-        .head()
-        .expect("Couldn't get repo head")
-        .peel_to_commit()
-        .expect("HEAD is not a commit");
-    repo.branch(name, &head, false).expect("Failed to commit");
-}
-
-#[cfg(any())]
-#[track_caller]
-fn git_checkout(name: &str, repo: &git2::Repository) {
-    repo.set_head(name).expect("Failed to set head");
-    repo.checkout_head(None).expect("Failed to check out head");
-}
-
-#[cfg(any())]
-#[track_caller]
-fn git_status(repo: &git2::Repository) -> collections::HashMap<String, git2::Status> {
-    repo.statuses(None)
-        .unwrap()
-        .iter()
-        .map(|status| (status.path().unwrap().to_string(), status.status()))
-        .collect()
-}
-
-#[gpui::test]
-async fn test_find_project_path_abs(
-    background_executor: BackgroundExecutor,
-    cx: &mut gpui::TestAppContext,
-) {
-    // find_project_path should work with absolute paths
-    init_test(cx);
-
-    let fs = FakeFs::new(background_executor);
-    fs.insert_tree(
-        path!("/root"),
-        json!({
-            "project1": {
-                "file1.txt": "content1",
-                "subdir": {
-                    "file2.txt": "content2"
-                }
-            },
-            "project2": {
-                "file3.txt": "content3"
-            }
-        }),
-    )
-    .await;
-
-    let project = Project::test(
-        fs.clone(),
-        [
-            path!("/root/project1").as_ref(),
-            path!("/root/project2").as_ref(),
-        ],
-        cx,
-    )
-    .await;
-
-    // Make sure the worktrees are fully initialized
-    project
-        .update(cx, |project, cx| project.git_scans_complete(cx))
-        .await;
-    cx.run_until_parked();
-
-    let (project1_abs_path, project1_id, project2_abs_path, project2_id) =
-        project.read_with(cx, |project, cx| {
-            let worktrees: Vec<_> = project.worktrees(cx).collect();
-            let abs_path1 = worktrees[0].read(cx).abs_path().to_path_buf();
-            let id1 = worktrees[0].read(cx).id();
-            let abs_path2 = worktrees[1].read(cx).abs_path().to_path_buf();
-            let id2 = worktrees[1].read(cx).id();
-            (abs_path1, id1, abs_path2, id2)
-        });
-
-    project.update(cx, |project, cx| {
-        let abs_path = project1_abs_path.join("file1.txt");
-        let found_path = project.find_project_path(abs_path, cx).unwrap();
-        assert_eq!(found_path.worktree_id, project1_id);
-        assert_eq!(&*found_path.path, rel_path("file1.txt"));
-
-        let abs_path = project1_abs_path.join("subdir").join("file2.txt");
-        let found_path = project.find_project_path(abs_path, cx).unwrap();
-        assert_eq!(found_path.worktree_id, project1_id);
-        assert_eq!(&*found_path.path, rel_path("subdir/file2.txt"));
-
-        let abs_path = project2_abs_path.join("file3.txt");
-        let found_path = project.find_project_path(abs_path, cx).unwrap();
-        assert_eq!(found_path.worktree_id, project2_id);
-        assert_eq!(&*found_path.path, rel_path("file3.txt"));
-
-        let abs_path = project1_abs_path.join("nonexistent.txt");
-        let found_path = project.find_project_path(abs_path, cx);
-        assert!(
-            found_path.is_some(),
-            "Should find project path for nonexistent file in worktree"
-        );
-
-        // Test with an absolute path outside any worktree
-        let abs_path = Path::new("/some/other/path");
-        let found_path = project.find_project_path(abs_path, cx);
-        assert!(
-            found_path.is_none(),
-            "Should not find project path for path outside any worktree"
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_git_worktree_remove(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/root"),
-        json!({
-            "a": {
-                ".git": {},
-                "src": {
-                    "main.rs": "fn main() {}",
-                }
-            },
-            "b": {
-                ".git": {},
-                "src": {
-                    "main.rs": "fn main() {}",
-                },
-                "script": {
-                    "run.sh": "#!/bin/bash"
-                }
-            }
-        }),
-    )
-    .await;
-
-    let project = Project::test(
-        fs.clone(),
-        [
-            path!("/root/a").as_ref(),
-            path!("/root/b/script").as_ref(),
-            path!("/root/b").as_ref(),
-        ],
-        cx,
-    )
-    .await;
-    let scan_complete = project.update(cx, |project, cx| project.git_scans_complete(cx));
-    scan_complete.await;
-
-    let worktrees = project.update(cx, |project, cx| project.worktrees(cx).collect::<Vec<_>>());
-    assert_eq!(worktrees.len(), 3);
-
-    let worktree_id_by_abs_path = worktrees
-        .into_iter()
-        .map(|worktree| worktree.read_with(cx, |w, _| (w.abs_path(), w.id())))
-        .collect::<HashMap<_, _>>();
-    let worktree_id = worktree_id_by_abs_path
-        .get(Path::new(path!("/root/b/script")))
-        .unwrap();
-
-    let repos = project.update(cx, |p, cx| p.git_store().read(cx).repositories().clone());
-    assert_eq!(repos.len(), 2);
-
-    project.update(cx, |project, cx| {
-        project.remove_worktree(*worktree_id, cx);
-    });
-    cx.run_until_parked();
-
-    let mut repo_paths = project
-        .update(cx, |p, cx| p.git_store().read(cx).repositories().clone())
-        .values()
-        .map(|repo| repo.read_with(cx, |r, _| r.work_directory_abs_path.clone()))
-        .collect::<Vec<_>>();
-    repo_paths.sort();
-
-    pretty_assertions::assert_eq!(
-        repo_paths,
-        [
-            Path::new(path!("/root/a")).into(),
-            Path::new(path!("/root/b")).into(),
-        ]
-    );
-
-    let active_repo_path = project
-        .read_with(cx, |p, cx| {
-            p.active_repository(cx)
-                .map(|r| r.read(cx).work_directory_abs_path.clone())
-        })
-        .unwrap();
-    assert_eq!(active_repo_path.as_ref(), Path::new(path!("/root/a")));
-
-    let worktree_id = worktree_id_by_abs_path
-        .get(Path::new(path!("/root/a")))
-        .unwrap();
-    project.update(cx, |project, cx| {
-        project.remove_worktree(*worktree_id, cx);
-    });
-    cx.run_until_parked();
-
-    let active_repo_path = project
-        .read_with(cx, |p, cx| {
-            p.active_repository(cx)
-                .map(|r| r.read(cx).work_directory_abs_path.clone())
-        })
-        .unwrap();
-    assert_eq!(active_repo_path.as_ref(), Path::new(path!("/root/b")));
-
-    let worktree_id = worktree_id_by_abs_path
-        .get(Path::new(path!("/root/b")))
-        .unwrap();
-    project.update(cx, |project, cx| {
-        project.remove_worktree(*worktree_id, cx);
-    });
-    cx.run_until_parked();
-
-    let active_repo_path = project.read_with(cx, |p, cx| {
-        p.active_repository(cx)
-            .map(|r| r.read(cx).work_directory_abs_path.clone())
-    });
-    assert!(active_repo_path.is_none());
-}
diff --git a/crates/project/src/search.rs b/crates/project/src/search.rs
deleted file mode 100644
index bb37ba2111..0000000000
--- a/crates/project/src/search.rs
+++ /dev/null
@@ -1,732 +0,0 @@
-use aho_corasick::{AhoCorasick, AhoCorasickBuilder};
-use anyhow::Result;
-use client::proto;
-use fancy_regex::{Captures, Regex, RegexBuilder};
-use gpui::Entity;
-use itertools::Itertools as _;
-use language::{Buffer, BufferSnapshot, CharKind};
-use smol::future::yield_now;
-use std::{
-    borrow::Cow,
-    io::{BufRead, BufReader, Read},
-    ops::Range,
-    sync::{Arc, LazyLock},
-};
-use text::Anchor;
-use util::{
-    paths::{PathMatcher, PathStyle},
-    rel_path::RelPath,
-};
-
-#[derive(Debug)]
-pub enum SearchResult {
-    Buffer {
-        buffer: Entity<Buffer>,
-        ranges: Vec<Range<Anchor>>,
-    },
-    LimitReached,
-}
-
-#[derive(Clone, Copy, PartialEq)]
-pub enum SearchInputKind {
-    Query,
-    Include,
-    Exclude,
-}
-
-#[derive(Clone, Debug)]
-pub struct SearchInputs {
-    query: Arc<str>,
-    files_to_include: PathMatcher,
-    files_to_exclude: PathMatcher,
-    match_full_paths: bool,
-    buffers: Option<Vec<Entity<Buffer>>>,
-}
-
-impl SearchInputs {
-    pub fn as_str(&self) -> &str {
-        self.query.as_ref()
-    }
-    pub fn files_to_include(&self) -> &PathMatcher {
-        &self.files_to_include
-    }
-    pub fn files_to_exclude(&self) -> &PathMatcher {
-        &self.files_to_exclude
-    }
-    pub fn buffers(&self) -> &Option<Vec<Entity<Buffer>>> {
-        &self.buffers
-    }
-}
-#[derive(Clone, Debug)]
-pub enum SearchQuery {
-    Text {
-        search: AhoCorasick,
-        replacement: Option<String>,
-        whole_word: bool,
-        case_sensitive: bool,
-        include_ignored: bool,
-        inner: SearchInputs,
-    },
-    Regex {
-        regex: Regex,
-        replacement: Option<String>,
-        multiline: bool,
-        whole_word: bool,
-        case_sensitive: bool,
-        include_ignored: bool,
-        one_match_per_line: bool,
-        inner: SearchInputs,
-    },
-}
-
-static WORD_MATCH_TEST: LazyLock<Regex> = LazyLock::new(|| {
-    RegexBuilder::new(r"\B")
-        .build()
-        .expect("Failed to create WORD_MATCH_TEST")
-});
-
-impl SearchQuery {
-    /// Create a text query
-    ///
-    /// If `match_full_paths` is true, include/exclude patterns will always be matched against fully qualified project paths beginning with a project root.
-    /// If `match_full_paths` is false, patterns will be matched against full paths only when the project has multiple roots.
-    pub fn text(
-        query: impl ToString,
-        whole_word: bool,
-        case_sensitive: bool,
-        include_ignored: bool,
-        files_to_include: PathMatcher,
-        files_to_exclude: PathMatcher,
-        match_full_paths: bool,
-        buffers: Option<Vec<Entity<Buffer>>>,
-    ) -> Result<Self> {
-        let query = query.to_string();
-        if !case_sensitive && !query.is_ascii() {
-            // AhoCorasickBuilder doesn't support case-insensitive search with unicode characters
-            // Fallback to regex search as recommended by
-            // https://docs.rs/aho-corasick/1.1/aho_corasick/struct.AhoCorasickBuilder.html#method.ascii_case_insensitive
-            return Self::regex(
-                regex::escape(&query),
-                whole_word,
-                case_sensitive,
-                include_ignored,
-                false,
-                files_to_include,
-                files_to_exclude,
-                false,
-                buffers,
-            );
-        }
-        let search = AhoCorasickBuilder::new()
-            .ascii_case_insensitive(!case_sensitive)
-            .build([&query])?;
-        let inner = SearchInputs {
-            query: query.into(),
-            files_to_exclude,
-            files_to_include,
-            match_full_paths,
-            buffers,
-        };
-        Ok(Self::Text {
-            search,
-            replacement: None,
-            whole_word,
-            case_sensitive,
-            include_ignored,
-            inner,
-        })
-    }
-
-    /// Create a regex query
-    ///
-    /// If `match_full_paths` is true, include/exclude patterns will be matched against fully qualified project paths
-    /// beginning with a project root name. If false, they will be matched against project-relative paths (which don't start
-    /// with their respective project root).
-    pub fn regex(
-        query: impl ToString,
-        whole_word: bool,
-        mut case_sensitive: bool,
-        include_ignored: bool,
-        one_match_per_line: bool,
-        files_to_include: PathMatcher,
-        files_to_exclude: PathMatcher,
-        match_full_paths: bool,
-        buffers: Option<Vec<Entity<Buffer>>>,
-    ) -> Result<Self> {
-        let mut query = query.to_string();
-        let initial_query = Arc::from(query.as_str());
-
-        if let Some((case_sensitive_from_pattern, new_query)) =
-            Self::case_sensitive_from_pattern(&query)
-        {
-            case_sensitive = case_sensitive_from_pattern;
-            query = new_query
-        }
-
-        if whole_word {
-            let mut word_query = String::new();
-            if let Some(first) = query.get(0..1)
-                && WORD_MATCH_TEST.is_match(first).is_ok_and(|x| !x)
-            {
-                word_query.push_str("\\b");
-            }
-            word_query.push_str(&query);
-            if let Some(last) = query.get(query.len() - 1..)
-                && WORD_MATCH_TEST.is_match(last).is_ok_and(|x| !x)
-            {
-                word_query.push_str("\\b");
-            }
-            query = word_query
-        }
-
-        let multiline = query.contains('\n') || query.contains("\\n");
-        let regex = RegexBuilder::new(&query)
-            .case_insensitive(!case_sensitive)
-            .build()?;
-        let inner = SearchInputs {
-            query: initial_query,
-            files_to_exclude,
-            files_to_include,
-            match_full_paths,
-            buffers,
-        };
-        Ok(Self::Regex {
-            regex,
-            replacement: None,
-            multiline,
-            whole_word,
-            case_sensitive,
-            include_ignored,
-            inner,
-            one_match_per_line,
-        })
-    }
-
-    /// Extracts case sensitivity settings from pattern items in the provided
-    /// query and returns the same query, with the pattern items removed.
-    ///
-    /// The following pattern modifiers are supported:
-    ///
-    /// - `\c` (case_sensitive: false)
-    /// - `\C` (case_sensitive: true)
-    ///
-    /// If no pattern item were found, `None` will be returned.
-    fn case_sensitive_from_pattern(query: &str) -> Option<(bool, String)> {
-        if !(query.contains("\\c") || query.contains("\\C")) {
-            return None;
-        }
-
-        let mut was_escaped = false;
-        let mut new_query = String::new();
-        let mut is_case_sensitive = None;
-
-        for c in query.chars() {
-            if was_escaped {
-                if c == 'c' {
-                    is_case_sensitive = Some(false);
-                } else if c == 'C' {
-                    is_case_sensitive = Some(true);
-                } else {
-                    new_query.push('\\');
-                    new_query.push(c);
-                }
-                was_escaped = false
-            } else if c == '\\' {
-                was_escaped = true
-            } else {
-                new_query.push(c);
-            }
-        }
-
-        is_case_sensitive.map(|c| (c, new_query))
-    }
-
-    pub fn from_proto(message: proto::SearchQuery, path_style: PathStyle) -> Result<Self> {
-        let files_to_include = if message.files_to_include.is_empty() {
-            message
-                .files_to_include_legacy
-                .split(',')
-                .map(str::trim)
-                .filter(|&glob_str| !glob_str.is_empty())
-                .map(|s| s.to_string())
-                .collect()
-        } else {
-            message.files_to_include
-        };
-
-        let files_to_exclude = if message.files_to_exclude.is_empty() {
-            message
-                .files_to_exclude_legacy
-                .split(',')
-                .map(str::trim)
-                .filter(|&glob_str| !glob_str.is_empty())
-                .map(|s| s.to_string())
-                .collect()
-        } else {
-            message.files_to_exclude
-        };
-
-        if message.regex {
-            Self::regex(
-                message.query,
-                message.whole_word,
-                message.case_sensitive,
-                message.include_ignored,
-                false,
-                PathMatcher::new(files_to_include, path_style)?,
-                PathMatcher::new(files_to_exclude, path_style)?,
-                message.match_full_paths,
-                None, // search opened only don't need search remote
-            )
-        } else {
-            Self::text(
-                message.query,
-                message.whole_word,
-                message.case_sensitive,
-                message.include_ignored,
-                PathMatcher::new(files_to_include, path_style)?,
-                PathMatcher::new(files_to_exclude, path_style)?,
-                false,
-                None, // search opened only don't need search remote
-            )
-        }
-    }
-
-    pub fn with_replacement(mut self, new_replacement: String) -> Self {
-        match self {
-            Self::Text {
-                ref mut replacement,
-                ..
-            }
-            | Self::Regex {
-                ref mut replacement,
-                ..
-            } => {
-                *replacement = Some(new_replacement);
-                self
-            }
-        }
-    }
-
-    pub fn to_proto(&self) -> proto::SearchQuery {
-        let mut files_to_include = self.files_to_include().sources();
-        let mut files_to_exclude = self.files_to_exclude().sources();
-        proto::SearchQuery {
-            query: self.as_str().to_string(),
-            regex: self.is_regex(),
-            whole_word: self.whole_word(),
-            case_sensitive: self.case_sensitive(),
-            include_ignored: self.include_ignored(),
-            files_to_include: files_to_include.clone().map(ToOwned::to_owned).collect(),
-            files_to_exclude: files_to_exclude.clone().map(ToOwned::to_owned).collect(),
-            match_full_paths: self.match_full_paths(),
-            // Populate legacy fields for backwards compatibility
-            files_to_include_legacy: files_to_include.join(","),
-            files_to_exclude_legacy: files_to_exclude.join(","),
-        }
-    }
-
-    pub(crate) fn detect(
-        &self,
-        mut reader: BufReader<Box<dyn Read + Send + Sync>>,
-    ) -> Result<bool> {
-        if self.as_str().is_empty() {
-            return Ok(false);
-        }
-
-        match self {
-            Self::Text { search, .. } => {
-                let mat = search.stream_find_iter(reader).next();
-                match mat {
-                    Some(Ok(_)) => Ok(true),
-                    Some(Err(err)) => Err(err.into()),
-                    None => Ok(false),
-                }
-            }
-            Self::Regex {
-                regex, multiline, ..
-            } => {
-                if *multiline {
-                    let mut text = String::new();
-                    if let Err(err) = reader.read_to_string(&mut text) {
-                        Err(err.into())
-                    } else {
-                        Ok(regex.find(&text)?.is_some())
-                    }
-                } else {
-                    for line in reader.lines() {
-                        let line = line?;
-                        if regex.find(&line)?.is_some() {
-                            return Ok(true);
-                        }
-                    }
-                    Ok(false)
-                }
-            }
-        }
-    }
-    /// Returns the replacement text for this `SearchQuery`.
-    pub fn replacement(&self) -> Option<&str> {
-        match self {
-            SearchQuery::Text { replacement, .. } | SearchQuery::Regex { replacement, .. } => {
-                replacement.as_deref()
-            }
-        }
-    }
-    /// Replaces search hits if replacement is set. `text` is assumed to be a string that matches this `SearchQuery` exactly, without any leftovers on either side.
-    pub fn replacement_for<'a>(&self, text: &'a str) -> Option<Cow<'a, str>> {
-        match self {
-            SearchQuery::Text { replacement, .. } => replacement.clone().map(Cow::from),
-            SearchQuery::Regex {
-                regex, replacement, ..
-            } => {
-                if let Some(replacement) = replacement {
-                    static TEXT_REPLACEMENT_SPECIAL_CHARACTERS_REGEX: LazyLock<Regex> =
-                        LazyLock::new(|| Regex::new(r"\\\\|\\n|\\t").unwrap());
-                    let replacement = TEXT_REPLACEMENT_SPECIAL_CHARACTERS_REGEX.replace_all(
-                        replacement,
-                        |c: &Captures| match c.get(0).unwrap().as_str() {
-                            r"\\" => "\\",
-                            r"\n" => "\n",
-                            r"\t" => "\t",
-                            x => unreachable!("Unexpected escape sequence: {}", x),
-                        },
-                    );
-                    Some(regex.replace(text, replacement))
-                } else {
-                    None
-                }
-            }
-        }
-    }
-
-    pub async fn search(
-        &self,
-        buffer: &BufferSnapshot,
-        subrange: Option<Range<usize>>,
-    ) -> Vec<Range<usize>> {
-        const YIELD_INTERVAL: usize = 20000;
-
-        if self.as_str().is_empty() {
-            return Default::default();
-        }
-
-        let range_offset = subrange.as_ref().map(|r| r.start).unwrap_or(0);
-        let rope = if let Some(range) = subrange {
-            buffer.as_rope().slice(range)
-        } else {
-            buffer.as_rope().clone()
-        };
-
-        let mut matches = Vec::new();
-        match self {
-            Self::Text {
-                search, whole_word, ..
-            } => {
-                for (ix, mat) in search
-                    .stream_find_iter(rope.bytes_in_range(0..rope.len()))
-                    .enumerate()
-                {
-                    if (ix + 1) % YIELD_INTERVAL == 0 {
-                        yield_now().await;
-                    }
-
-                    let mat = mat.unwrap();
-                    if *whole_word {
-                        let classifier = buffer.char_classifier_at(range_offset + mat.start());
-
-                        let prev_kind = rope
-                            .reversed_chars_at(mat.start())
-                            .next()
-                            .map(|c| classifier.kind(c));
-                        let start_kind =
-                            classifier.kind(rope.chars_at(mat.start()).next().unwrap());
-                        let end_kind =
-                            classifier.kind(rope.reversed_chars_at(mat.end()).next().unwrap());
-                        let next_kind = rope.chars_at(mat.end()).next().map(|c| classifier.kind(c));
-                        if (Some(start_kind) == prev_kind && start_kind == CharKind::Word)
-                            || (Some(end_kind) == next_kind && end_kind == CharKind::Word)
-                        {
-                            continue;
-                        }
-                    }
-                    matches.push(mat.start()..mat.end())
-                }
-            }
-
-            Self::Regex {
-                regex, multiline, ..
-            } => {
-                if *multiline {
-                    let text = rope.to_string();
-                    for (ix, mat) in regex.find_iter(&text).enumerate() {
-                        if (ix + 1) % YIELD_INTERVAL == 0 {
-                            yield_now().await;
-                        }
-
-                        if let Ok(mat) = mat {
-                            matches.push(mat.start()..mat.end());
-                        }
-                    }
-                } else {
-                    let mut line = String::new();
-                    let mut line_offset = 0;
-                    for (chunk_ix, chunk) in rope.chunks().chain(["\n"]).enumerate() {
-                        if (chunk_ix + 1) % YIELD_INTERVAL == 0 {
-                            yield_now().await;
-                        }
-
-                        for (newline_ix, text) in chunk.split('\n').enumerate() {
-                            if newline_ix > 0 {
-                                for mat in regex.find_iter(&line).flatten() {
-                                    let start = line_offset + mat.start();
-                                    let end = line_offset + mat.end();
-                                    matches.push(start..end);
-                                    if self.one_match_per_line() == Some(true) {
-                                        break;
-                                    }
-                                }
-
-                                line_offset += line.len() + 1;
-                                line.clear();
-                            }
-                            line.push_str(text);
-                        }
-                    }
-                }
-            }
-        }
-
-        matches
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.as_str().is_empty()
-    }
-
-    pub fn as_str(&self) -> &str {
-        self.as_inner().as_str()
-    }
-
-    pub fn whole_word(&self) -> bool {
-        match self {
-            Self::Text { whole_word, .. } => *whole_word,
-            Self::Regex { whole_word, .. } => *whole_word,
-        }
-    }
-
-    pub fn case_sensitive(&self) -> bool {
-        match self {
-            Self::Text { case_sensitive, .. } => *case_sensitive,
-            Self::Regex { case_sensitive, .. } => *case_sensitive,
-        }
-    }
-
-    pub fn include_ignored(&self) -> bool {
-        match self {
-            Self::Text {
-                include_ignored, ..
-            } => *include_ignored,
-            Self::Regex {
-                include_ignored, ..
-            } => *include_ignored,
-        }
-    }
-
-    pub fn is_regex(&self) -> bool {
-        matches!(self, Self::Regex { .. })
-    }
-
-    pub fn files_to_include(&self) -> &PathMatcher {
-        self.as_inner().files_to_include()
-    }
-
-    pub fn files_to_exclude(&self) -> &PathMatcher {
-        self.as_inner().files_to_exclude()
-    }
-
-    pub fn buffers(&self) -> Option<&Vec<Entity<Buffer>>> {
-        self.as_inner().buffers.as_ref()
-    }
-
-    pub fn is_opened_only(&self) -> bool {
-        self.as_inner().buffers.is_some()
-    }
-
-    pub fn filters_path(&self) -> bool {
-        !(self.files_to_exclude().sources().next().is_none()
-            && self.files_to_include().sources().next().is_none())
-    }
-
-    pub fn match_full_paths(&self) -> bool {
-        self.as_inner().match_full_paths
-    }
-
-    /// Check match full paths to determine whether you're required to pass a fully qualified
-    /// project path (starts with a project root).
-    pub fn match_path(&self, file_path: &RelPath) -> bool {
-        let mut path = file_path.to_rel_path_buf();
-        loop {
-            if self.files_to_exclude().is_match(&path) {
-                return false;
-            } else if self.files_to_include().sources().next().is_none()
-                || self.files_to_include().is_match(&path)
-            {
-                return true;
-            } else if !path.pop() {
-                return false;
-            }
-        }
-    }
-    pub fn as_inner(&self) -> &SearchInputs {
-        match self {
-            Self::Regex { inner, .. } | Self::Text { inner, .. } => inner,
-        }
-    }
-
-    /// Whether this search should replace only one match per line, instead of
-    /// all matches.
-    /// Returns `None` for text searches, as only regex searches support this
-    /// option.
-    pub fn one_match_per_line(&self) -> Option<bool> {
-        match self {
-            Self::Regex {
-                one_match_per_line, ..
-            } => Some(*one_match_per_line),
-            Self::Text { .. } => None,
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn path_matcher_creation_for_valid_paths() {
-        for valid_path in [
-            "file",
-            "Cargo.toml",
-            ".DS_Store",
-            "~/dir/another_dir/",
-            "./dir/file",
-            "dir/[a-z].txt",
-        ] {
-            let path_matcher = PathMatcher::new(&[valid_path.to_owned()], PathStyle::local())
-                .unwrap_or_else(|e| {
-                    panic!("Valid path {valid_path} should be accepted, but got: {e}")
-                });
-            assert!(
-                path_matcher
-                    .is_match(&RelPath::new(valid_path.as_ref(), PathStyle::local()).unwrap()),
-                "Path matcher for valid path {valid_path} should match itself"
-            )
-        }
-    }
-
-    #[test]
-    fn path_matcher_creation_for_globs() {
-        for invalid_glob in ["dir/[].txt", "dir/[a-z.txt", "dir/{file"] {
-            match PathMatcher::new(&[invalid_glob.to_owned()], PathStyle::local()) {
-                Ok(_) => panic!("Invalid glob {invalid_glob} should not be accepted"),
-                Err(_expected) => {}
-            }
-        }
-
-        for valid_glob in [
-            "dir/?ile",
-            "dir/*.txt",
-            "dir/**/file",
-            "dir/[a-z].txt",
-            "{dir,file}",
-        ] {
-            match PathMatcher::new(&[valid_glob.to_owned()], PathStyle::local()) {
-                Ok(_expected) => {}
-                Err(e) => panic!("Valid glob should be accepted, but got: {e}"),
-            }
-        }
-    }
-
-    #[test]
-    fn test_case_sensitive_pattern_items() {
-        let case_sensitive = false;
-        let search_query = SearchQuery::regex(
-            "test\\C",
-            false,
-            case_sensitive,
-            false,
-            false,
-            Default::default(),
-            Default::default(),
-            false,
-            None,
-        )
-        .expect("Should be able to create a regex SearchQuery");
-
-        assert_eq!(
-            search_query.case_sensitive(),
-            true,
-            "Case sensitivity should be enabled when \\C pattern item is present in the query."
-        );
-
-        let case_sensitive = true;
-        let search_query = SearchQuery::regex(
-            "test\\c",
-            true,
-            case_sensitive,
-            false,
-            false,
-            Default::default(),
-            Default::default(),
-            false,
-            None,
-        )
-        .expect("Should be able to create a regex SearchQuery");
-
-        assert_eq!(
-            search_query.case_sensitive(),
-            false,
-            "Case sensitivity should be disabled when \\c pattern item is present, even if initially set to true."
-        );
-
-        let case_sensitive = false;
-        let search_query = SearchQuery::regex(
-            "test\\c\\C",
-            false,
-            case_sensitive,
-            false,
-            false,
-            Default::default(),
-            Default::default(),
-            false,
-            None,
-        )
-        .expect("Should be able to create a regex SearchQuery");
-
-        assert_eq!(
-            search_query.case_sensitive(),
-            true,
-            "Case sensitivity should be enabled when \\C is the last pattern item, even after a \\c."
-        );
-
-        let case_sensitive = false;
-        let search_query = SearchQuery::regex(
-            "tests\\\\C",
-            false,
-            case_sensitive,
-            false,
-            false,
-            Default::default(),
-            Default::default(),
-            false,
-            None,
-        )
-        .expect("Should be able to create a regex SearchQuery");
-
-        assert_eq!(
-            search_query.case_sensitive(),
-            false,
-            "Case sensitivity should not be enabled when \\C pattern item is preceded by a backslash."
-        );
-    }
-}
diff --git a/crates/project/src/search_history.rs b/crates/project/src/search_history.rs
deleted file mode 100644
index 4b2a7a065b..0000000000
--- a/crates/project/src/search_history.rs
+++ /dev/null
@@ -1,250 +0,0 @@
-use std::collections::VecDeque;
-
-/// Determines the behavior to use when inserting a new query into the search history.
-#[derive(Default, Debug, Clone, PartialEq)]
-pub enum QueryInsertionBehavior {
-    #[default]
-    /// Always insert the query to the search history.
-    AlwaysInsert,
-    /// Replace the previous query in the search history, if the new query contains the previous query.
-    ReplacePreviousIfContains,
-}
-
-/// A cursor that stores an index to the currently selected query in the search history.
-/// This can be passed to the search history to update the selection accordingly,
-/// e.g. when using the up and down arrow keys to navigate the search history.
-///
-/// Note: The cursor can point to the wrong query, if the maximum length of the history is exceeded
-/// and the old query is overwritten.
-#[derive(Default, Debug, Clone, PartialEq, Eq, Hash)]
-pub struct SearchHistoryCursor {
-    selection: Option<usize>,
-}
-
-impl SearchHistoryCursor {
-    /// Resets the selection to `None`.
-    pub fn reset(&mut self) {
-        self.selection = None;
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct SearchHistory {
-    history: VecDeque<String>,
-    max_history_len: Option<usize>,
-    insertion_behavior: QueryInsertionBehavior,
-}
-
-impl SearchHistory {
-    pub fn new(max_history_len: Option<usize>, insertion_behavior: QueryInsertionBehavior) -> Self {
-        SearchHistory {
-            max_history_len,
-            insertion_behavior,
-            history: VecDeque::new(),
-        }
-    }
-
-    pub fn add(&mut self, cursor: &mut SearchHistoryCursor, search_string: String) {
-        if self.insertion_behavior == QueryInsertionBehavior::ReplacePreviousIfContains
-            && let Some(previously_searched) = self.history.back_mut()
-            && search_string.contains(previously_searched.as_str())
-        {
-            *previously_searched = search_string;
-            cursor.selection = Some(self.history.len() - 1);
-            return;
-        }
-
-        if let Some(max_history_len) = self.max_history_len
-            && self.history.len() >= max_history_len
-        {
-            self.history.pop_front();
-        }
-        self.history.push_back(search_string);
-
-        cursor.selection = Some(self.history.len() - 1);
-    }
-
-    pub fn next(&mut self, cursor: &mut SearchHistoryCursor) -> Option<&str> {
-        let selected = cursor.selection?;
-        let next_index = selected + 1;
-
-        let next = self.history.get(next_index)?;
-        cursor.selection = Some(next_index);
-        Some(next)
-    }
-
-    pub fn current(&self, cursor: &SearchHistoryCursor) -> Option<&str> {
-        cursor
-            .selection
-            .and_then(|selected_ix| self.history.get(selected_ix).map(|s| s.as_str()))
-    }
-
-    /// Get the previous history entry using the given `SearchHistoryCursor`.
-    /// Uses the last element in the history when there is no cursor.
-    pub fn previous(&mut self, cursor: &mut SearchHistoryCursor) -> Option<&str> {
-        let prev_index = match cursor.selection {
-            Some(index) => index.checked_sub(1)?,
-            None => self.history.len().checked_sub(1)?,
-        };
-
-        let previous = self.history.get(prev_index)?;
-        cursor.selection = Some(prev_index);
-        Some(previous)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_add() {
-        const MAX_HISTORY_LEN: usize = 20;
-        let mut search_history = SearchHistory::new(
-            Some(MAX_HISTORY_LEN),
-            QueryInsertionBehavior::ReplacePreviousIfContains,
-        );
-        let mut cursor = SearchHistoryCursor::default();
-
-        assert_eq!(
-            search_history.current(&cursor),
-            None,
-            "No current selection should be set for the default search history"
-        );
-
-        search_history.add(&mut cursor, "rust".to_string());
-        assert_eq!(
-            search_history.current(&cursor),
-            Some("rust"),
-            "Newly added item should be selected"
-        );
-
-        // check if duplicates are not added
-        search_history.add(&mut cursor, "rust".to_string());
-        assert_eq!(
-            search_history.history.len(),
-            1,
-            "Should not add a duplicate"
-        );
-        assert_eq!(search_history.current(&cursor), Some("rust"));
-
-        // check if new string containing the previous string replaces it
-        search_history.add(&mut cursor, "rustlang".to_string());
-        assert_eq!(
-            search_history.history.len(),
-            1,
-            "Should replace previous item if it's a substring"
-        );
-        assert_eq!(search_history.current(&cursor), Some("rustlang"));
-
-        // add item when it equals to current item if it's not the last one
-        search_history.add(&mut cursor, "php".to_string());
-        search_history.previous(&mut cursor);
-        assert_eq!(search_history.current(&cursor), Some("rustlang"));
-        search_history.add(&mut cursor, "rustlang".to_string());
-        assert_eq!(search_history.history.len(), 3, "Should add item");
-        assert_eq!(search_history.current(&cursor), Some("rustlang"));
-
-        // push enough items to test SEARCH_HISTORY_LIMIT
-        for i in 0..MAX_HISTORY_LEN * 2 {
-            search_history.add(&mut cursor, format!("item{i}"));
-        }
-        assert!(search_history.history.len() <= MAX_HISTORY_LEN);
-    }
-
-    #[test]
-    fn test_next_and_previous() {
-        let mut search_history = SearchHistory::new(None, QueryInsertionBehavior::AlwaysInsert);
-        let mut cursor = SearchHistoryCursor::default();
-
-        assert_eq!(
-            search_history.next(&mut cursor),
-            None,
-            "Default search history should not have a next item"
-        );
-
-        search_history.add(&mut cursor, "Rust".to_string());
-        assert_eq!(search_history.next(&mut cursor), None);
-        search_history.add(&mut cursor, "JavaScript".to_string());
-        assert_eq!(search_history.next(&mut cursor), None);
-        search_history.add(&mut cursor, "TypeScript".to_string());
-        assert_eq!(search_history.next(&mut cursor), None);
-
-        assert_eq!(search_history.current(&cursor), Some("TypeScript"));
-
-        assert_eq!(search_history.previous(&mut cursor), Some("JavaScript"));
-        assert_eq!(search_history.current(&cursor), Some("JavaScript"));
-
-        assert_eq!(search_history.previous(&mut cursor), Some("Rust"));
-        assert_eq!(search_history.current(&cursor), Some("Rust"));
-
-        assert_eq!(search_history.previous(&mut cursor), None);
-        assert_eq!(search_history.current(&cursor), Some("Rust"));
-
-        assert_eq!(search_history.next(&mut cursor), Some("JavaScript"));
-        assert_eq!(search_history.current(&cursor), Some("JavaScript"));
-
-        assert_eq!(search_history.next(&mut cursor), Some("TypeScript"));
-        assert_eq!(search_history.current(&cursor), Some("TypeScript"));
-
-        assert_eq!(search_history.next(&mut cursor), None);
-        assert_eq!(search_history.current(&cursor), Some("TypeScript"));
-    }
-
-    #[test]
-    fn test_reset_selection() {
-        let mut search_history = SearchHistory::new(None, QueryInsertionBehavior::AlwaysInsert);
-        let mut cursor = SearchHistoryCursor::default();
-
-        search_history.add(&mut cursor, "Rust".to_string());
-        search_history.add(&mut cursor, "JavaScript".to_string());
-        search_history.add(&mut cursor, "TypeScript".to_string());
-
-        assert_eq!(search_history.current(&cursor), Some("TypeScript"));
-        cursor.reset();
-        assert_eq!(search_history.current(&cursor), None);
-        assert_eq!(
-            search_history.previous(&mut cursor),
-            Some("TypeScript"),
-            "Should start from the end after reset on previous item query"
-        );
-
-        search_history.previous(&mut cursor);
-        assert_eq!(search_history.current(&cursor), Some("JavaScript"));
-        search_history.previous(&mut cursor);
-        assert_eq!(search_history.current(&cursor), Some("Rust"));
-
-        cursor.reset();
-        assert_eq!(search_history.current(&cursor), None);
-    }
-
-    #[test]
-    fn test_multiple_cursors() {
-        let mut search_history = SearchHistory::new(None, QueryInsertionBehavior::AlwaysInsert);
-        let mut cursor1 = SearchHistoryCursor::default();
-        let mut cursor2 = SearchHistoryCursor::default();
-
-        search_history.add(&mut cursor1, "Rust".to_string());
-        search_history.add(&mut cursor1, "JavaScript".to_string());
-        search_history.add(&mut cursor1, "TypeScript".to_string());
-
-        search_history.add(&mut cursor2, "Python".to_string());
-        search_history.add(&mut cursor2, "Java".to_string());
-        search_history.add(&mut cursor2, "C++".to_string());
-
-        assert_eq!(search_history.current(&cursor1), Some("TypeScript"));
-        assert_eq!(search_history.current(&cursor2), Some("C++"));
-
-        assert_eq!(search_history.previous(&mut cursor1), Some("JavaScript"));
-        assert_eq!(search_history.previous(&mut cursor2), Some("Java"));
-
-        assert_eq!(search_history.next(&mut cursor1), Some("TypeScript"));
-        assert_eq!(search_history.next(&mut cursor1), Some("Python"));
-
-        cursor1.reset();
-        cursor2.reset();
-
-        assert_eq!(search_history.current(&cursor1), None);
-        assert_eq!(search_history.current(&cursor2), None);
-    }
-}
diff --git a/crates/project/src/task_inventory.rs b/crates/project/src/task_inventory.rs
deleted file mode 100644
index 4f4939491f..0000000000
--- a/crates/project/src/task_inventory.rs
+++ /dev/null
@@ -1,1610 +0,0 @@
-//! Project-wide storage of the tasks available, capable of updating itself from the sources set.
-
-use std::{
-    borrow::Cow,
-    cmp::{self, Reverse},
-    collections::hash_map,
-    path::PathBuf,
-    sync::Arc,
-};
-
-use anyhow::Result;
-use collections::{HashMap, HashSet, VecDeque};
-use dap::DapRegistry;
-use gpui::{App, AppContext as _, Context, Entity, SharedString, Task, WeakEntity};
-use itertools::Itertools;
-use language::{
-    Buffer, ContextLocation, ContextProvider, File, Language, LanguageToolchainStore, Location,
-    language_settings::language_settings,
-};
-use lsp::{LanguageServerId, LanguageServerName};
-use paths::{debug_task_file_name, task_file_name};
-use settings::{InvalidSettingsError, parse_json_with_comments};
-use task::{
-    DebugScenario, ResolvedTask, TaskContext, TaskId, TaskTemplate, TaskTemplates, TaskVariables,
-    VariableName,
-};
-use text::{BufferId, Point, ToPoint};
-use util::{NumericPrefixWithSuffix, ResultExt as _, post_inc, rel_path::RelPath};
-use worktree::WorktreeId;
-
-use crate::{task_store::TaskSettingsLocation, worktree_store::WorktreeStore};
-
-#[derive(Clone, Debug, Default)]
-pub struct DebugScenarioContext {
-    pub task_context: TaskContext,
-    pub worktree_id: Option<WorktreeId>,
-    pub active_buffer: Option<WeakEntity<Buffer>>,
-}
-
-/// Inventory tracks available tasks for a given project.
-pub struct Inventory {
-    last_scheduled_tasks: VecDeque<(TaskSourceKind, ResolvedTask)>,
-    last_scheduled_scenarios: VecDeque<(DebugScenario, DebugScenarioContext)>,
-    templates_from_settings: InventoryFor<TaskTemplate>,
-    scenarios_from_settings: InventoryFor<DebugScenario>,
-}
-
-impl std::fmt::Debug for Inventory {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("Inventory")
-            .field("last_scheduled_tasks", &self.last_scheduled_tasks)
-            .field("last_scheduled_scenarios", &self.last_scheduled_scenarios)
-            .field("templates_from_settings", &self.templates_from_settings)
-            .field("scenarios_from_settings", &self.scenarios_from_settings)
-            .finish()
-    }
-}
-
-// Helper trait for better error messages in [InventoryFor]
-trait InventoryContents: Clone {
-    const GLOBAL_SOURCE_FILE: &'static str;
-    const LABEL: &'static str;
-}
-
-impl InventoryContents for TaskTemplate {
-    const GLOBAL_SOURCE_FILE: &'static str = "tasks.json";
-    const LABEL: &'static str = "tasks";
-}
-
-impl InventoryContents for DebugScenario {
-    const GLOBAL_SOURCE_FILE: &'static str = "debug.json";
-
-    const LABEL: &'static str = "debug scenarios";
-}
-
-#[derive(Debug)]
-struct InventoryFor<T> {
-    global: HashMap<PathBuf, Vec<T>>,
-    worktree: HashMap<WorktreeId, HashMap<Arc<RelPath>, Vec<T>>>,
-}
-
-impl<T: InventoryContents> InventoryFor<T> {
-    fn worktree_scenarios(
-        &self,
-        worktree: WorktreeId,
-    ) -> impl '_ + Iterator<Item = (TaskSourceKind, T)> {
-        self.worktree
-            .get(&worktree)
-            .into_iter()
-            .flatten()
-            .flat_map(|(directory, templates)| {
-                templates.iter().map(move |template| (directory, template))
-            })
-            .map(move |(directory, template)| {
-                (
-                    TaskSourceKind::Worktree {
-                        id: worktree,
-                        directory_in_worktree: directory.clone(),
-                        id_base: Cow::Owned(format!(
-                            "local worktree {} from directory {directory:?}",
-                            T::LABEL
-                        )),
-                    },
-                    template.clone(),
-                )
-            })
-    }
-
-    fn global_scenarios(&self) -> impl '_ + Iterator<Item = (TaskSourceKind, T)> {
-        self.global.iter().flat_map(|(file_path, templates)| {
-            templates.iter().map(|template| {
-                (
-                    TaskSourceKind::AbsPath {
-                        id_base: Cow::Owned(format!("global {}", T::GLOBAL_SOURCE_FILE)),
-                        abs_path: file_path.clone(),
-                    },
-                    template.clone(),
-                )
-            })
-        })
-    }
-}
-
-impl<T> Default for InventoryFor<T> {
-    fn default() -> Self {
-        Self {
-            global: HashMap::default(),
-            worktree: HashMap::default(),
-        }
-    }
-}
-
-/// Kind of a source the tasks are fetched from, used to display more source information in the UI.
-#[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)]
-pub enum TaskSourceKind {
-    /// bash-like commands spawned by users, not associated with any path
-    UserInput,
-    /// Tasks from the worktree's .zed/task.json
-    Worktree {
-        id: WorktreeId,
-        directory_in_worktree: Arc<RelPath>,
-        id_base: Cow<'static, str>,
-    },
-    /// ~/.config/zed/task.json - like global files with task definitions, applicable to any path
-    AbsPath {
-        id_base: Cow<'static, str>,
-        abs_path: PathBuf,
-    },
-    /// Languages-specific tasks coming from extensions.
-    Language { name: SharedString },
-    /// Language-specific tasks coming from LSP servers.
-    Lsp {
-        language_name: SharedString,
-        server: LanguageServerId,
-    },
-}
-
-/// A collection of task contexts, derived from the current state of the workspace.
-/// Only contains worktrees that are visible and with their root being a directory.
-#[derive(Debug, Default)]
-pub struct TaskContexts {
-    /// A context, related to the currently opened item.
-    /// Item can be opened from an invisible worktree, or any other, not necessarily active worktree.
-    pub active_item_context: Option<(Option<WorktreeId>, Option<Location>, TaskContext)>,
-    /// A worktree that corresponds to the active item, or the only worktree in the workspace.
-    pub active_worktree_context: Option<(WorktreeId, TaskContext)>,
-    /// If there are multiple worktrees in the workspace, all non-active ones are included here.
-    pub other_worktree_contexts: Vec<(WorktreeId, TaskContext)>,
-    pub lsp_task_sources: HashMap<LanguageServerName, Vec<BufferId>>,
-    pub latest_selection: Option<text::Anchor>,
-}
-
-impl TaskContexts {
-    pub fn active_context(&self) -> Option<&TaskContext> {
-        self.active_item_context
-            .as_ref()
-            .map(|(_, _, context)| context)
-            .or_else(|| {
-                self.active_worktree_context
-                    .as_ref()
-                    .map(|(_, context)| context)
-            })
-    }
-
-    pub fn location(&self) -> Option<&Location> {
-        self.active_item_context
-            .as_ref()
-            .and_then(|(_, location, _)| location.as_ref())
-    }
-
-    pub fn file(&self, cx: &App) -> Option<Arc<dyn File>> {
-        self.active_item_context
-            .as_ref()
-            .and_then(|(_, location, _)| location.as_ref())
-            .and_then(|location| location.buffer.read(cx).file().cloned())
-    }
-
-    pub fn worktree(&self) -> Option<WorktreeId> {
-        self.active_item_context
-            .as_ref()
-            .and_then(|(worktree_id, _, _)| worktree_id.as_ref())
-            .or_else(|| {
-                self.active_worktree_context
-                    .as_ref()
-                    .map(|(worktree_id, _)| worktree_id)
-            })
-            .copied()
-    }
-
-    pub fn task_context_for_worktree_id(&self, worktree_id: WorktreeId) -> Option<&TaskContext> {
-        self.active_worktree_context
-            .iter()
-            .chain(self.other_worktree_contexts.iter())
-            .find(|(id, _)| *id == worktree_id)
-            .map(|(_, context)| context)
-    }
-}
-
-impl TaskSourceKind {
-    pub fn to_id_base(&self) -> String {
-        match self {
-            Self::UserInput => "oneshot".to_string(),
-            Self::AbsPath { id_base, abs_path } => {
-                format!("{id_base}_{}", abs_path.display())
-            }
-            Self::Worktree {
-                id,
-                id_base,
-                directory_in_worktree,
-            } => {
-                format!("{id_base}_{id}_{}", directory_in_worktree.as_unix_str())
-            }
-            Self::Language { name } => format!("language_{name}"),
-            Self::Lsp {
-                server,
-                language_name,
-            } => format!("lsp_{language_name}_{server}"),
-        }
-    }
-}
-
-impl Inventory {
-    pub fn new(cx: &mut App) -> Entity<Self> {
-        cx.new(|_| Self {
-            last_scheduled_tasks: VecDeque::default(),
-            last_scheduled_scenarios: VecDeque::default(),
-            templates_from_settings: InventoryFor::default(),
-            scenarios_from_settings: InventoryFor::default(),
-        })
-    }
-
-    pub fn scenario_scheduled(
-        &mut self,
-        scenario: DebugScenario,
-        task_context: TaskContext,
-        worktree_id: Option<WorktreeId>,
-        active_buffer: Option<WeakEntity<Buffer>>,
-    ) {
-        self.last_scheduled_scenarios
-            .retain(|(s, _)| s.label != scenario.label);
-        self.last_scheduled_scenarios.push_front((
-            scenario,
-            DebugScenarioContext {
-                task_context,
-                worktree_id,
-                active_buffer,
-            },
-        ));
-        if self.last_scheduled_scenarios.len() > 5_000 {
-            self.last_scheduled_scenarios.pop_front();
-        }
-    }
-
-    pub fn last_scheduled_scenario(&self) -> Option<&(DebugScenario, DebugScenarioContext)> {
-        self.last_scheduled_scenarios.back()
-    }
-
-    pub fn list_debug_scenarios(
-        &self,
-        task_contexts: &TaskContexts,
-        lsp_tasks: Vec<(TaskSourceKind, task::ResolvedTask)>,
-        current_resolved_tasks: Vec<(TaskSourceKind, task::ResolvedTask)>,
-        add_current_language_tasks: bool,
-        cx: &mut App,
-    ) -> Task<(
-        Vec<(DebugScenario, DebugScenarioContext)>,
-        Vec<(TaskSourceKind, DebugScenario)>,
-    )> {
-        let mut scenarios = Vec::new();
-
-        if let Some(worktree_id) = task_contexts
-            .active_worktree_context
-            .iter()
-            .chain(task_contexts.other_worktree_contexts.iter())
-            .map(|context| context.0)
-            .next()
-        {
-            scenarios.extend(self.worktree_scenarios_from_settings(worktree_id));
-        }
-        scenarios.extend(self.global_debug_scenarios_from_settings());
-
-        let last_scheduled_scenarios = self.last_scheduled_scenarios.iter().cloned().collect();
-
-        let adapter = task_contexts.location().and_then(|location| {
-            let (file, language) = {
-                let buffer = location.buffer.read(cx);
-                (buffer.file(), buffer.language())
-            };
-            let language_name = language.as_ref().map(|l| l.name());
-            let adapter = language_settings(language_name, file, cx)
-                .debuggers
-                .first()
-                .map(SharedString::from)
-                .or_else(|| {
-                    language.and_then(|l| l.config().debuggers.first().map(SharedString::from))
-                });
-            adapter.map(|adapter| (adapter, DapRegistry::global(cx).locators()))
-        });
-        cx.background_spawn(async move {
-            if let Some((adapter, locators)) = adapter {
-                for (kind, task) in
-                    lsp_tasks
-                        .into_iter()
-                        .chain(current_resolved_tasks.into_iter().filter(|(kind, _)| {
-                            add_current_language_tasks
-                                || !matches!(kind, TaskSourceKind::Language { .. })
-                        }))
-                {
-                    let adapter = adapter.clone().into();
-
-                    for locator in locators.values() {
-                        if let Some(scenario) = locator
-                            .create_scenario(task.original_task(), task.display_label(), &adapter)
-                            .await
-                        {
-                            scenarios.push((kind, scenario));
-                            break;
-                        }
-                    }
-                }
-            }
-            (last_scheduled_scenarios, scenarios)
-        })
-    }
-
-    pub fn task_template_by_label(
-        &self,
-        buffer: Option<Entity<Buffer>>,
-        worktree_id: Option<WorktreeId>,
-        label: &str,
-        cx: &App,
-    ) -> Task<Option<TaskTemplate>> {
-        let (buffer_worktree_id, file, language) = buffer
-            .map(|buffer| {
-                let buffer = buffer.read(cx);
-                let file = buffer.file().cloned();
-                (
-                    file.as_ref().map(|file| file.worktree_id(cx)),
-                    file,
-                    buffer.language().cloned(),
-                )
-            })
-            .unwrap_or((None, None, None));
-
-        let tasks = self.list_tasks(file, language, worktree_id.or(buffer_worktree_id), cx);
-        let label = label.to_owned();
-        cx.background_spawn(async move {
-            tasks
-                .await
-                .into_iter()
-                .find(|(_, template)| template.label == label)
-                .map(|val| val.1)
-        })
-    }
-
-    /// Pulls its task sources relevant to the worktree and the language given,
-    /// returns all task templates with their source kinds, worktree tasks first, language tasks second
-    /// and global tasks last. No specific order inside source kinds groups.
-    pub fn list_tasks(
-        &self,
-        file: Option<Arc<dyn File>>,
-        language: Option<Arc<Language>>,
-        worktree: Option<WorktreeId>,
-        cx: &App,
-    ) -> Task<Vec<(TaskSourceKind, TaskTemplate)>> {
-        let global_tasks = self.global_templates_from_settings().collect::<Vec<_>>();
-        let mut worktree_tasks = worktree
-            .into_iter()
-            .flat_map(|worktree| self.worktree_templates_from_settings(worktree))
-            .collect::<Vec<_>>();
-
-        let task_source_kind = language.as_ref().map(|language| TaskSourceKind::Language {
-            name: language.name().into(),
-        });
-        let language_tasks = language
-            .filter(|language| {
-                language_settings(Some(language.name()), file.as_ref(), cx)
-                    .tasks
-                    .enabled
-            })
-            .and_then(|language| {
-                language
-                    .context_provider()
-                    .map(|provider| provider.associated_tasks(file, cx))
-            });
-        cx.background_spawn(async move {
-            if let Some(t) = language_tasks {
-                worktree_tasks.extend(t.await.into_iter().flat_map(|tasks| {
-                    tasks
-                        .0
-                        .into_iter()
-                        .filter_map(|task| Some((task_source_kind.clone()?, task)))
-                }));
-            }
-            worktree_tasks.extend(global_tasks);
-            worktree_tasks
-        })
-    }
-
-    /// Pulls its task sources relevant to the worktree and the language given and resolves them with the [`TaskContexts`] given.
-    /// Joins the new resolutions with the resolved tasks that were used (spawned) before,
-    /// orders them so that the most recently used come first, all equally used ones are ordered so that the most specific tasks come first.
-    /// Deduplicates the tasks by their labels and context and splits the ordered list into two: used tasks and the rest, newly resolved tasks.
-    pub fn used_and_current_resolved_tasks(
-        &self,
-        task_contexts: Arc<TaskContexts>,
-        cx: &mut Context<Self>,
-    ) -> Task<(
-        Vec<(TaskSourceKind, ResolvedTask)>,
-        Vec<(TaskSourceKind, ResolvedTask)>,
-    )> {
-        let worktree = task_contexts.worktree();
-        let location = task_contexts.location();
-        let language = location.and_then(|location| location.buffer.read(cx).language());
-        let task_source_kind = language.as_ref().map(|language| TaskSourceKind::Language {
-            name: language.name().into(),
-        });
-        let file = location.and_then(|location| location.buffer.read(cx).file().cloned());
-
-        let mut task_labels_to_ids = HashMap::<String, HashSet<TaskId>>::default();
-        let mut lru_score = 0_u32;
-        let previously_spawned_tasks = self
-            .last_scheduled_tasks
-            .iter()
-            .rev()
-            .filter(|(task_kind, _)| {
-                if matches!(task_kind, TaskSourceKind::Language { .. }) {
-                    Some(task_kind) == task_source_kind.as_ref()
-                } else {
-                    true
-                }
-            })
-            .filter(|(_, resolved_task)| {
-                match task_labels_to_ids.entry(resolved_task.resolved_label.clone()) {
-                    hash_map::Entry::Occupied(mut o) => {
-                        o.get_mut().insert(resolved_task.id.clone());
-                        // Neber allow duplicate reused tasks with the same labels
-                        false
-                    }
-                    hash_map::Entry::Vacant(v) => {
-                        v.insert(HashSet::from_iter(Some(resolved_task.id.clone())));
-                        true
-                    }
-                }
-            })
-            .map(|(task_source_kind, resolved_task)| {
-                (
-                    task_source_kind.clone(),
-                    resolved_task.clone(),
-                    post_inc(&mut lru_score),
-                )
-            })
-            .sorted_unstable_by(task_lru_comparator)
-            .map(|(kind, task, _)| (kind, task))
-            .collect::<Vec<_>>();
-
-        let not_used_score = post_inc(&mut lru_score);
-        let global_tasks = self.global_templates_from_settings().collect::<Vec<_>>();
-        let associated_tasks = language
-            .filter(|language| {
-                language_settings(Some(language.name()), file.as_ref(), cx)
-                    .tasks
-                    .enabled
-            })
-            .and_then(|language| {
-                language
-                    .context_provider()
-                    .map(|provider| provider.associated_tasks(file, cx))
-            });
-        let worktree_tasks = worktree
-            .into_iter()
-            .flat_map(|worktree| self.worktree_templates_from_settings(worktree))
-            .collect::<Vec<_>>();
-        let task_contexts = task_contexts.clone();
-        cx.background_spawn(async move {
-            let language_tasks = if let Some(task) = associated_tasks {
-                task.await.map(|templates| {
-                    templates
-                        .0
-                        .into_iter()
-                        .flat_map(|task| Some((task_source_kind.clone()?, task)))
-                })
-            } else {
-                None
-            };
-
-            let worktree_tasks = worktree_tasks
-                .into_iter()
-                .chain(language_tasks.into_iter().flatten())
-                .chain(global_tasks);
-
-            let new_resolved_tasks = worktree_tasks
-                .flat_map(|(kind, task)| {
-                    let id_base = kind.to_id_base();
-                    if let TaskSourceKind::Worktree { id, .. } = &kind {
-                        None.or_else(|| {
-                            let (_, _, item_context) =
-                                task_contexts.active_item_context.as_ref().filter(
-                                    |(worktree_id, _, _)| Some(id) == worktree_id.as_ref(),
-                                )?;
-                            task.resolve_task(&id_base, item_context)
-                        })
-                        .or_else(|| {
-                            let (_, worktree_context) = task_contexts
-                                .active_worktree_context
-                                .as_ref()
-                                .filter(|(worktree_id, _)| id == worktree_id)?;
-                            task.resolve_task(&id_base, worktree_context)
-                        })
-                        .or_else(|| {
-                            if let TaskSourceKind::Worktree { id, .. } = &kind {
-                                let worktree_context = task_contexts
-                                    .other_worktree_contexts
-                                    .iter()
-                                    .find(|(worktree_id, _)| worktree_id == id)
-                                    .map(|(_, context)| context)?;
-                                task.resolve_task(&id_base, worktree_context)
-                            } else {
-                                None
-                            }
-                        })
-                    } else {
-                        None.or_else(|| {
-                            let (_, _, item_context) =
-                                task_contexts.active_item_context.as_ref()?;
-                            task.resolve_task(&id_base, item_context)
-                        })
-                        .or_else(|| {
-                            let (_, worktree_context) =
-                                task_contexts.active_worktree_context.as_ref()?;
-                            task.resolve_task(&id_base, worktree_context)
-                        })
-                    }
-                    .or_else(|| task.resolve_task(&id_base, &TaskContext::default()))
-                    .map(move |resolved_task| (kind.clone(), resolved_task, not_used_score))
-                })
-                .filter(|(_, resolved_task, _)| {
-                    match task_labels_to_ids.entry(resolved_task.resolved_label.clone()) {
-                        hash_map::Entry::Occupied(mut o) => {
-                            // Allow new tasks with the same label, if their context is different
-                            o.get_mut().insert(resolved_task.id.clone())
-                        }
-                        hash_map::Entry::Vacant(v) => {
-                            v.insert(HashSet::from_iter(Some(resolved_task.id.clone())));
-                            true
-                        }
-                    }
-                })
-                .sorted_unstable_by(task_lru_comparator)
-                .map(|(kind, task, _)| (kind, task))
-                .collect::<Vec<_>>();
-
-            (previously_spawned_tasks, new_resolved_tasks)
-        })
-    }
-
-    /// Returns the last scheduled task by task_id if provided.
-    /// Otherwise, returns the last scheduled task.
-    pub fn last_scheduled_task(
-        &self,
-        task_id: Option<&TaskId>,
-    ) -> Option<(TaskSourceKind, ResolvedTask)> {
-        if let Some(task_id) = task_id {
-            self.last_scheduled_tasks
-                .iter()
-                .find(|(_, task)| &task.id == task_id)
-                .cloned()
-        } else {
-            self.last_scheduled_tasks.back().cloned()
-        }
-    }
-
-    /// Registers task "usage" as being scheduled – to be used for LRU sorting when listing all tasks.
-    pub fn task_scheduled(
-        &mut self,
-        task_source_kind: TaskSourceKind,
-        resolved_task: ResolvedTask,
-    ) {
-        self.last_scheduled_tasks
-            .push_back((task_source_kind, resolved_task));
-        if self.last_scheduled_tasks.len() > 5_000 {
-            self.last_scheduled_tasks.pop_front();
-        }
-    }
-
-    /// Deletes a resolved task from history, using its id.
-    /// A similar may still resurface in `used_and_current_resolved_tasks` when its [`TaskTemplate`] is resolved again.
-    pub fn delete_previously_used(&mut self, id: &TaskId) {
-        self.last_scheduled_tasks.retain(|(_, task)| &task.id != id);
-    }
-
-    fn global_templates_from_settings(
-        &self,
-    ) -> impl '_ + Iterator<Item = (TaskSourceKind, TaskTemplate)> {
-        self.templates_from_settings.global_scenarios()
-    }
-
-    fn global_debug_scenarios_from_settings(
-        &self,
-    ) -> impl '_ + Iterator<Item = (TaskSourceKind, DebugScenario)> {
-        self.scenarios_from_settings.global_scenarios()
-    }
-
-    fn worktree_scenarios_from_settings(
-        &self,
-        worktree: WorktreeId,
-    ) -> impl '_ + Iterator<Item = (TaskSourceKind, DebugScenario)> {
-        self.scenarios_from_settings.worktree_scenarios(worktree)
-    }
-
-    fn worktree_templates_from_settings(
-        &self,
-        worktree: WorktreeId,
-    ) -> impl '_ + Iterator<Item = (TaskSourceKind, TaskTemplate)> {
-        self.templates_from_settings.worktree_scenarios(worktree)
-    }
-
-    /// Updates in-memory task metadata from the JSON string given.
-    /// Will fail if the JSON is not a valid array of objects, but will continue if any object will not parse into a [`TaskTemplate`].
-    ///
-    /// Global tasks are updated for no worktree provided, otherwise the worktree metadata for a given path will be updated.
-    pub(crate) fn update_file_based_tasks(
-        &mut self,
-        location: TaskSettingsLocation<'_>,
-        raw_tasks_json: Option<&str>,
-    ) -> Result<(), InvalidSettingsError> {
-        let raw_tasks = match parse_json_with_comments::<Vec<serde_json::Value>>(
-            raw_tasks_json.unwrap_or("[]"),
-        ) {
-            Ok(tasks) => tasks,
-            Err(e) => {
-                return Err(InvalidSettingsError::Tasks {
-                    path: match location {
-                        TaskSettingsLocation::Global(path) => path.to_owned(),
-                        TaskSettingsLocation::Worktree(settings_location) => {
-                            settings_location.path.as_std_path().join(task_file_name())
-                        }
-                    },
-                    message: format!("Failed to parse tasks file content as a JSON array: {e}"),
-                });
-            }
-        };
-        let new_templates = raw_tasks.into_iter().filter_map(|raw_template| {
-            serde_json::from_value::<TaskTemplate>(raw_template).log_err()
-        });
-
-        let parsed_templates = &mut self.templates_from_settings;
-        match location {
-            TaskSettingsLocation::Global(path) => {
-                parsed_templates
-                    .global
-                    .entry(path.to_owned())
-                    .insert_entry(new_templates.collect());
-                self.last_scheduled_tasks.retain(|(kind, _)| {
-                    if let TaskSourceKind::AbsPath { abs_path, .. } = kind {
-                        abs_path != path
-                    } else {
-                        true
-                    }
-                });
-            }
-            TaskSettingsLocation::Worktree(location) => {
-                let new_templates = new_templates.collect::<Vec<_>>();
-                if new_templates.is_empty() {
-                    if let Some(worktree_tasks) =
-                        parsed_templates.worktree.get_mut(&location.worktree_id)
-                    {
-                        worktree_tasks.remove(location.path);
-                    }
-                } else {
-                    parsed_templates
-                        .worktree
-                        .entry(location.worktree_id)
-                        .or_default()
-                        .insert(Arc::from(location.path), new_templates);
-                }
-                self.last_scheduled_tasks.retain(|(kind, _)| {
-                    if let TaskSourceKind::Worktree {
-                        directory_in_worktree,
-                        id,
-                        ..
-                    } = kind
-                    {
-                        *id != location.worktree_id
-                            || directory_in_worktree.as_ref() != location.path
-                    } else {
-                        true
-                    }
-                });
-            }
-        }
-
-        Ok(())
-    }
-
-    /// Updates in-memory task metadata from the JSON string given.
-    /// Will fail if the JSON is not a valid array of objects, but will continue if any object will not parse into a [`TaskTemplate`].
-    ///
-    /// Global tasks are updated for no worktree provided, otherwise the worktree metadata for a given path will be updated.
-    pub(crate) fn update_file_based_scenarios(
-        &mut self,
-        location: TaskSettingsLocation<'_>,
-        raw_tasks_json: Option<&str>,
-    ) -> Result<(), InvalidSettingsError> {
-        let raw_tasks = match parse_json_with_comments::<Vec<serde_json::Value>>(
-            raw_tasks_json.unwrap_or("[]"),
-        ) {
-            Ok(tasks) => tasks,
-            Err(e) => {
-                return Err(InvalidSettingsError::Debug {
-                    path: match location {
-                        TaskSettingsLocation::Global(path) => path.to_owned(),
-                        TaskSettingsLocation::Worktree(settings_location) => settings_location
-                            .path
-                            .as_std_path()
-                            .join(debug_task_file_name()),
-                    },
-                    message: format!("Failed to parse tasks file content as a JSON array: {e}"),
-                });
-            }
-        };
-
-        let new_templates = raw_tasks
-            .into_iter()
-            .filter_map(|raw_template| {
-                serde_json::from_value::<DebugScenario>(raw_template).log_err()
-            })
-            .collect::<Vec<_>>();
-
-        let parsed_scenarios = &mut self.scenarios_from_settings;
-        let mut new_definitions: HashMap<_, _> = new_templates
-            .iter()
-            .map(|template| (template.label.clone(), template.clone()))
-            .collect();
-        let previously_existing_scenarios;
-
-        match location {
-            TaskSettingsLocation::Global(path) => {
-                previously_existing_scenarios = parsed_scenarios
-                    .global_scenarios()
-                    .map(|(_, scenario)| scenario.label)
-                    .collect::<HashSet<_>>();
-                parsed_scenarios
-                    .global
-                    .entry(path.to_owned())
-                    .insert_entry(new_templates);
-            }
-            TaskSettingsLocation::Worktree(location) => {
-                previously_existing_scenarios = parsed_scenarios
-                    .worktree_scenarios(location.worktree_id)
-                    .map(|(_, scenario)| scenario.label)
-                    .collect::<HashSet<_>>();
-
-                if new_templates.is_empty() {
-                    if let Some(worktree_tasks) =
-                        parsed_scenarios.worktree.get_mut(&location.worktree_id)
-                    {
-                        worktree_tasks.remove(location.path);
-                    }
-                } else {
-                    parsed_scenarios
-                        .worktree
-                        .entry(location.worktree_id)
-                        .or_default()
-                        .insert(Arc::from(location.path), new_templates);
-                }
-            }
-        }
-        self.last_scheduled_scenarios.retain_mut(|(scenario, _)| {
-            if !previously_existing_scenarios.contains(&scenario.label) {
-                return true;
-            }
-            if let Some(new_definition) = new_definitions.remove(&scenario.label) {
-                *scenario = new_definition;
-                true
-            } else {
-                false
-            }
-        });
-
-        Ok(())
-    }
-}
-
-fn task_lru_comparator(
-    (kind_a, task_a, lru_score_a): &(TaskSourceKind, ResolvedTask, u32),
-    (kind_b, task_b, lru_score_b): &(TaskSourceKind, ResolvedTask, u32),
-) -> cmp::Ordering {
-    lru_score_a
-        // First, display recently used templates above all.
-        .cmp(lru_score_b)
-        // Then, ensure more specific sources are displayed first.
-        .then(task_source_kind_preference(kind_a).cmp(&task_source_kind_preference(kind_b)))
-        // After that, display first more specific tasks, using more template variables.
-        // Bonus points for tasks with symbol variables.
-        .then(task_variables_preference(task_a).cmp(&task_variables_preference(task_b)))
-        // Finally, sort by the resolved label, but a bit more specifically, to avoid mixing letters and digits.
-        .then({
-            NumericPrefixWithSuffix::from_numeric_prefixed_str(&task_a.resolved_label)
-                .cmp(&NumericPrefixWithSuffix::from_numeric_prefixed_str(
-                    &task_b.resolved_label,
-                ))
-                .then(task_a.resolved_label.cmp(&task_b.resolved_label))
-                .then(kind_a.cmp(kind_b))
-        })
-}
-
-fn task_source_kind_preference(kind: &TaskSourceKind) -> u32 {
-    match kind {
-        TaskSourceKind::Lsp { .. } => 0,
-        TaskSourceKind::Language { .. } => 1,
-        TaskSourceKind::UserInput => 2,
-        TaskSourceKind::Worktree { .. } => 3,
-        TaskSourceKind::AbsPath { .. } => 4,
-    }
-}
-
-fn task_variables_preference(task: &ResolvedTask) -> Reverse<usize> {
-    let task_variables = task.substituted_variables();
-    Reverse(if task_variables.contains(&VariableName::Symbol) {
-        task_variables.len() + 1
-    } else {
-        task_variables.len()
-    })
-}
-
-#[cfg(test)]
-mod test_inventory {
-    use gpui::{AppContext as _, Entity, Task, TestAppContext};
-    use itertools::Itertools;
-    use task::TaskContext;
-    use worktree::WorktreeId;
-
-    use crate::Inventory;
-
-    use super::TaskSourceKind;
-
-    pub(super) fn task_template_names(
-        inventory: &Entity<Inventory>,
-        worktree: Option<WorktreeId>,
-        cx: &mut TestAppContext,
-    ) -> Task<Vec<String>> {
-        let new_tasks = inventory.update(cx, |inventory, cx| {
-            inventory.list_tasks(None, None, worktree, cx)
-        });
-        cx.background_spawn(async move {
-            new_tasks
-                .await
-                .into_iter()
-                .map(|(_, task)| task.label)
-                .sorted()
-                .collect()
-        })
-    }
-
-    pub(super) fn register_task_used(
-        inventory: &Entity<Inventory>,
-        task_name: &str,
-        cx: &mut TestAppContext,
-    ) -> Task<()> {
-        let tasks = inventory.update(cx, |inventory, cx| {
-            inventory.list_tasks(None, None, None, cx)
-        });
-
-        let task_name = task_name.to_owned();
-        let inventory = inventory.clone();
-        cx.spawn(|mut cx| async move {
-            let (task_source_kind, task) = tasks
-                .await
-                .into_iter()
-                .find(|(_, task)| task.label == task_name)
-                .unwrap_or_else(|| panic!("Failed to find task with name {task_name}"));
-
-            let id_base = task_source_kind.to_id_base();
-            inventory
-                .update(&mut cx, |inventory, _| {
-                    inventory.task_scheduled(
-                        task_source_kind.clone(),
-                        task.resolve_task(&id_base, &TaskContext::default())
-                            .unwrap_or_else(|| {
-                                panic!("Failed to resolve task with name {task_name}")
-                            }),
-                    )
-                })
-                .unwrap();
-        })
-    }
-
-    pub(super) fn register_worktree_task_used(
-        inventory: &Entity<Inventory>,
-        worktree_id: WorktreeId,
-        task_name: &str,
-        cx: &mut TestAppContext,
-    ) -> Task<()> {
-        let tasks = inventory.update(cx, |inventory, cx| {
-            inventory.list_tasks(None, None, Some(worktree_id), cx)
-        });
-
-        let inventory = inventory.clone();
-        let task_name = task_name.to_owned();
-        cx.spawn(|mut cx| async move {
-            let (task_source_kind, task) = tasks
-                .await
-                .into_iter()
-                .find(|(_, task)| task.label == task_name)
-                .unwrap_or_else(|| panic!("Failed to find task with name {task_name}"));
-            let id_base = task_source_kind.to_id_base();
-            inventory
-                .update(&mut cx, |inventory, _| {
-                    inventory.task_scheduled(
-                        task_source_kind.clone(),
-                        task.resolve_task(&id_base, &TaskContext::default())
-                            .unwrap_or_else(|| {
-                                panic!("Failed to resolve task with name {task_name}")
-                            }),
-                    );
-                })
-                .unwrap();
-        })
-    }
-
-    pub(super) async fn list_tasks(
-        inventory: &Entity<Inventory>,
-        worktree: Option<WorktreeId>,
-        cx: &mut TestAppContext,
-    ) -> Vec<(TaskSourceKind, String)> {
-        let task_context = &TaskContext::default();
-        inventory
-            .update(cx, |inventory, cx| {
-                inventory.list_tasks(None, None, worktree, cx)
-            })
-            .await
-            .into_iter()
-            .filter_map(|(source_kind, task)| {
-                let id_base = source_kind.to_id_base();
-                Some((source_kind, task.resolve_task(&id_base, task_context)?))
-            })
-            .map(|(source_kind, resolved_task)| (source_kind, resolved_task.resolved_label))
-            .collect()
-    }
-}
-
-/// A context provided that tries to provide values for all non-custom [`VariableName`] variants for a currently opened file.
-/// Applied as a base for every custom [`ContextProvider`] unless explicitly oped out.
-pub struct BasicContextProvider {
-    worktree_store: Entity<WorktreeStore>,
-}
-
-impl BasicContextProvider {
-    pub fn new(worktree_store: Entity<WorktreeStore>) -> Self {
-        Self { worktree_store }
-    }
-}
-
-impl ContextProvider for BasicContextProvider {
-    fn build_context(
-        &self,
-        _: &TaskVariables,
-        location: ContextLocation<'_>,
-        _: Option<HashMap<String, String>>,
-        _: Arc<dyn LanguageToolchainStore>,
-        cx: &mut App,
-    ) -> Task<Result<TaskVariables>> {
-        let location = location.file_location;
-        let buffer = location.buffer.read(cx);
-        let buffer_snapshot = buffer.snapshot();
-        let symbols = buffer_snapshot.symbols_containing(location.range.start, None);
-        let symbol = symbols.last().map(|symbol| {
-            let range = symbol
-                .name_ranges
-                .last()
-                .cloned()
-                .unwrap_or(0..symbol.text.len());
-            symbol.text[range].to_string()
-        });
-
-        let current_file = buffer.file().and_then(|file| file.as_local());
-        let Point { row, column } = location.range.start.to_point(&buffer_snapshot);
-        let row = row + 1;
-        let column = column + 1;
-        let selected_text = buffer
-            .chars_for_range(location.range.clone())
-            .collect::<String>();
-
-        let mut task_variables = TaskVariables::from_iter([
-            (VariableName::Row, row.to_string()),
-            (VariableName::Column, column.to_string()),
-        ]);
-
-        if let Some(symbol) = symbol {
-            task_variables.insert(VariableName::Symbol, symbol);
-        }
-        if !selected_text.trim().is_empty() {
-            task_variables.insert(VariableName::SelectedText, selected_text);
-        }
-        let worktree = buffer
-            .file()
-            .map(|file| file.worktree_id(cx))
-            .and_then(|worktree_id| {
-                self.worktree_store
-                    .read(cx)
-                    .worktree_for_id(worktree_id, cx)
-            });
-
-        if let Some(worktree) = worktree {
-            let worktree = worktree.read(cx);
-            let path_style = worktree.path_style();
-            task_variables.insert(
-                VariableName::WorktreeRoot,
-                worktree.abs_path().to_string_lossy().into_owned(),
-            );
-            if let Some(current_file) = current_file.as_ref() {
-                let relative_path = current_file.path();
-                task_variables.insert(
-                    VariableName::RelativeFile,
-                    relative_path.display(path_style).to_string(),
-                );
-                if let Some(relative_dir) = relative_path.parent() {
-                    task_variables.insert(
-                        VariableName::RelativeDir,
-                        if relative_dir.is_empty() {
-                            String::from(".")
-                        } else {
-                            relative_dir.display(path_style).to_string()
-                        },
-                    );
-                }
-            }
-        }
-
-        if let Some(current_file) = current_file {
-            let path = current_file.abs_path(cx);
-            if let Some(filename) = path.file_name().and_then(|f| f.to_str()) {
-                task_variables.insert(VariableName::Filename, String::from(filename));
-            }
-
-            if let Some(stem) = path.file_stem().and_then(|s| s.to_str()) {
-                task_variables.insert(VariableName::Stem, stem.into());
-            }
-
-            if let Some(dirname) = path.parent().and_then(|s| s.to_str()) {
-                task_variables.insert(VariableName::Dirname, dirname.into());
-            }
-
-            task_variables.insert(VariableName::File, path.to_string_lossy().into_owned());
-        }
-
-        Task::ready(Ok(task_variables))
-    }
-}
-
-/// A ContextProvider that doesn't provide any task variables on it's own, though it has some associated tasks.
-pub struct ContextProviderWithTasks {
-    templates: TaskTemplates,
-}
-
-impl ContextProviderWithTasks {
-    pub fn new(definitions: TaskTemplates) -> Self {
-        Self {
-            templates: definitions,
-        }
-    }
-}
-
-impl ContextProvider for ContextProviderWithTasks {
-    fn associated_tasks(&self, _: Option<Arc<dyn File>>, _: &App) -> Task<Option<TaskTemplates>> {
-        Task::ready(Some(self.templates.clone()))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use gpui::TestAppContext;
-    use paths::tasks_file;
-    use pretty_assertions::assert_eq;
-    use serde_json::json;
-    use settings::SettingsLocation;
-    use std::path::Path;
-    use util::rel_path::rel_path;
-
-    use crate::task_store::TaskStore;
-
-    use super::test_inventory::*;
-    use super::*;
-
-    #[gpui::test]
-    async fn test_task_list_sorting(cx: &mut TestAppContext) {
-        init_test(cx);
-        let inventory = cx.update(|cx| Inventory::new(cx));
-        let initial_tasks = resolved_task_names(&inventory, None, cx).await;
-        assert!(
-            initial_tasks.is_empty(),
-            "No tasks expected for empty inventory, but got {initial_tasks:?}"
-        );
-        let initial_tasks = task_template_names(&inventory, None, cx).await;
-        assert!(
-            initial_tasks.is_empty(),
-            "No tasks expected for empty inventory, but got {initial_tasks:?}"
-        );
-        cx.run_until_parked();
-        let expected_initial_state = [
-            "1_a_task".to_string(),
-            "1_task".to_string(),
-            "2_task".to_string(),
-            "3_task".to_string(),
-        ];
-
-        inventory.update(cx, |inventory, _| {
-            inventory
-                .update_file_based_tasks(
-                    TaskSettingsLocation::Global(tasks_file()),
-                    Some(&mock_tasks_from_names(
-                        expected_initial_state.iter().map(|name| name.as_str()),
-                    )),
-                )
-                .unwrap();
-        });
-        assert_eq!(
-            task_template_names(&inventory, None, cx).await,
-            &expected_initial_state,
-        );
-        assert_eq!(
-            resolved_task_names(&inventory, None, cx).await,
-            &expected_initial_state,
-            "Tasks with equal amount of usages should be sorted alphanumerically"
-        );
-
-        register_task_used(&inventory, "2_task", cx).await;
-        assert_eq!(
-            task_template_names(&inventory, None, cx).await,
-            &expected_initial_state,
-        );
-        assert_eq!(
-            resolved_task_names(&inventory, None, cx).await,
-            vec![
-                "2_task".to_string(),
-                "1_a_task".to_string(),
-                "1_task".to_string(),
-                "3_task".to_string()
-            ],
-        );
-
-        register_task_used(&inventory, "1_task", cx).await;
-        register_task_used(&inventory, "1_task", cx).await;
-        register_task_used(&inventory, "1_task", cx).await;
-        register_task_used(&inventory, "3_task", cx).await;
-        assert_eq!(
-            task_template_names(&inventory, None, cx).await,
-            &expected_initial_state,
-        );
-        assert_eq!(
-            resolved_task_names(&inventory, None, cx).await,
-            vec![
-                "3_task".to_string(),
-                "1_task".to_string(),
-                "2_task".to_string(),
-                "1_a_task".to_string(),
-            ],
-            "Most recently used task should be at the top"
-        );
-
-        let worktree_id = WorktreeId::from_usize(0);
-        let local_worktree_location = SettingsLocation {
-            worktree_id,
-            path: rel_path("foo"),
-        };
-        inventory.update(cx, |inventory, _| {
-            inventory
-                .update_file_based_tasks(
-                    TaskSettingsLocation::Worktree(local_worktree_location),
-                    Some(&mock_tasks_from_names(["worktree_task_1"])),
-                )
-                .unwrap();
-        });
-        assert_eq!(
-            resolved_task_names(&inventory, None, cx).await,
-            vec![
-                "3_task".to_string(),
-                "1_task".to_string(),
-                "2_task".to_string(),
-                "1_a_task".to_string(),
-            ],
-            "Most recently used task should be at the top"
-        );
-        assert_eq!(
-            resolved_task_names(&inventory, Some(worktree_id), cx).await,
-            vec![
-                "3_task".to_string(),
-                "1_task".to_string(),
-                "2_task".to_string(),
-                "worktree_task_1".to_string(),
-                "1_a_task".to_string(),
-            ],
-        );
-        register_worktree_task_used(&inventory, worktree_id, "worktree_task_1", cx).await;
-        assert_eq!(
-            resolved_task_names(&inventory, Some(worktree_id), cx).await,
-            vec![
-                "worktree_task_1".to_string(),
-                "3_task".to_string(),
-                "1_task".to_string(),
-                "2_task".to_string(),
-                "1_a_task".to_string(),
-            ],
-            "Most recently used worktree task should be at the top"
-        );
-
-        inventory.update(cx, |inventory, _| {
-            inventory
-                .update_file_based_tasks(
-                    TaskSettingsLocation::Global(tasks_file()),
-                    Some(&mock_tasks_from_names(
-                        ["10_hello", "11_hello"]
-                            .into_iter()
-                            .chain(expected_initial_state.iter().map(|name| name.as_str())),
-                    )),
-                )
-                .unwrap();
-        });
-        cx.run_until_parked();
-        let expected_updated_state = [
-            "10_hello".to_string(),
-            "11_hello".to_string(),
-            "1_a_task".to_string(),
-            "1_task".to_string(),
-            "2_task".to_string(),
-            "3_task".to_string(),
-        ];
-        assert_eq!(
-            task_template_names(&inventory, None, cx).await,
-            &expected_updated_state,
-        );
-        assert_eq!(
-            resolved_task_names(&inventory, None, cx).await,
-            vec![
-                "worktree_task_1".to_string(),
-                "1_a_task".to_string(),
-                "1_task".to_string(),
-                "2_task".to_string(),
-                "3_task".to_string(),
-                "10_hello".to_string(),
-                "11_hello".to_string(),
-            ],
-            "After global tasks update, worktree task usage is not erased and it's the first still; global task is back to regular order as its file was updated"
-        );
-
-        register_task_used(&inventory, "11_hello", cx).await;
-        assert_eq!(
-            task_template_names(&inventory, None, cx).await,
-            &expected_updated_state,
-        );
-        assert_eq!(
-            resolved_task_names(&inventory, None, cx).await,
-            vec![
-                "11_hello".to_string(),
-                "worktree_task_1".to_string(),
-                "1_a_task".to_string(),
-                "1_task".to_string(),
-                "2_task".to_string(),
-                "3_task".to_string(),
-                "10_hello".to_string(),
-            ],
-        );
-    }
-
-    #[gpui::test]
-    async fn test_reloading_debug_scenarios(cx: &mut TestAppContext) {
-        init_test(cx);
-        let inventory = cx.update(|cx| Inventory::new(cx));
-        inventory.update(cx, |inventory, _| {
-            inventory
-                .update_file_based_scenarios(
-                    TaskSettingsLocation::Global(Path::new("")),
-                    Some(
-                        r#"
-                        [{
-                            "label": "test scenario",
-                            "adapter": "CodeLLDB",
-                            "request": "launch",
-                            "program": "wowzer",
-                        }]
-                        "#,
-                    ),
-                )
-                .unwrap();
-        });
-
-        let (_, scenario) = inventory
-            .update(cx, |this, cx| {
-                this.list_debug_scenarios(&TaskContexts::default(), vec![], vec![], false, cx)
-            })
-            .await
-            .1
-            .first()
-            .unwrap()
-            .clone();
-
-        inventory.update(cx, |this, _| {
-            this.scenario_scheduled(scenario.clone(), TaskContext::default(), None, None);
-        });
-
-        assert_eq!(
-            inventory
-                .update(cx, |this, cx| {
-                    this.list_debug_scenarios(&TaskContexts::default(), vec![], vec![], false, cx)
-                })
-                .await
-                .0
-                .first()
-                .unwrap()
-                .clone()
-                .0,
-            scenario
-        );
-
-        inventory.update(cx, |this, _| {
-            this.update_file_based_scenarios(
-                TaskSettingsLocation::Global(Path::new("")),
-                Some(
-                    r#"
-                        [{
-                            "label": "test scenario",
-                            "adapter": "Delve",
-                            "request": "launch",
-                            "program": "wowzer",
-                        }]
-                        "#,
-                ),
-            )
-            .unwrap();
-        });
-
-        assert_eq!(
-            inventory
-                .update(cx, |this, cx| {
-                    this.list_debug_scenarios(&TaskContexts::default(), vec![], vec![], false, cx)
-                })
-                .await
-                .0
-                .first()
-                .unwrap()
-                .0
-                .adapter,
-            "Delve",
-        );
-
-        inventory.update(cx, |this, _| {
-            this.update_file_based_scenarios(
-                TaskSettingsLocation::Global(Path::new("")),
-                Some(
-                    r#"
-                        [{
-                            "label": "testing scenario",
-                            "adapter": "Delve",
-                            "request": "launch",
-                            "program": "wowzer",
-                        }]
-                        "#,
-                ),
-            )
-            .unwrap();
-        });
-
-        assert!(
-            inventory
-                .update(cx, |this, cx| {
-                    this.list_debug_scenarios(&TaskContexts::default(), vec![], vec![], false, cx)
-                })
-                .await
-                .0
-                .is_empty(),
-        );
-    }
-
-    #[gpui::test]
-    async fn test_inventory_static_task_filters(cx: &mut TestAppContext) {
-        init_test(cx);
-        let inventory = cx.update(|cx| Inventory::new(cx));
-        let common_name = "common_task_name";
-        let worktree_1 = WorktreeId::from_usize(1);
-        let worktree_2 = WorktreeId::from_usize(2);
-
-        cx.run_until_parked();
-        let worktree_independent_tasks = vec![
-            (
-                TaskSourceKind::AbsPath {
-                    id_base: "global tasks.json".into(),
-                    abs_path: paths::tasks_file().clone(),
-                },
-                common_name.to_string(),
-            ),
-            (
-                TaskSourceKind::AbsPath {
-                    id_base: "global tasks.json".into(),
-                    abs_path: paths::tasks_file().clone(),
-                },
-                "static_source_1".to_string(),
-            ),
-            (
-                TaskSourceKind::AbsPath {
-                    id_base: "global tasks.json".into(),
-                    abs_path: paths::tasks_file().clone(),
-                },
-                "static_source_2".to_string(),
-            ),
-        ];
-        let worktree_1_tasks = [
-            (
-                TaskSourceKind::Worktree {
-                    id: worktree_1,
-                    directory_in_worktree: rel_path(".zed").into(),
-                    id_base: "local worktree tasks from directory \".zed\"".into(),
-                },
-                common_name.to_string(),
-            ),
-            (
-                TaskSourceKind::Worktree {
-                    id: worktree_1,
-                    directory_in_worktree: rel_path(".zed").into(),
-                    id_base: "local worktree tasks from directory \".zed\"".into(),
-                },
-                "worktree_1".to_string(),
-            ),
-        ];
-        let worktree_2_tasks = [
-            (
-                TaskSourceKind::Worktree {
-                    id: worktree_2,
-                    directory_in_worktree: rel_path(".zed").into(),
-                    id_base: "local worktree tasks from directory \".zed\"".into(),
-                },
-                common_name.to_string(),
-            ),
-            (
-                TaskSourceKind::Worktree {
-                    id: worktree_2,
-                    directory_in_worktree: rel_path(".zed").into(),
-                    id_base: "local worktree tasks from directory \".zed\"".into(),
-                },
-                "worktree_2".to_string(),
-            ),
-        ];
-
-        inventory.update(cx, |inventory, _| {
-            inventory
-                .update_file_based_tasks(
-                    TaskSettingsLocation::Global(tasks_file()),
-                    Some(&mock_tasks_from_names(
-                        worktree_independent_tasks
-                            .iter()
-                            .map(|(_, name)| name.as_str()),
-                    )),
-                )
-                .unwrap();
-            inventory
-                .update_file_based_tasks(
-                    TaskSettingsLocation::Worktree(SettingsLocation {
-                        worktree_id: worktree_1,
-                        path: rel_path(".zed"),
-                    }),
-                    Some(&mock_tasks_from_names(
-                        worktree_1_tasks.iter().map(|(_, name)| name.as_str()),
-                    )),
-                )
-                .unwrap();
-            inventory
-                .update_file_based_tasks(
-                    TaskSettingsLocation::Worktree(SettingsLocation {
-                        worktree_id: worktree_2,
-                        path: rel_path(".zed"),
-                    }),
-                    Some(&mock_tasks_from_names(
-                        worktree_2_tasks.iter().map(|(_, name)| name.as_str()),
-                    )),
-                )
-                .unwrap();
-        });
-
-        assert_eq!(
-            list_tasks_sorted_by_last_used(&inventory, None, cx).await,
-            worktree_independent_tasks,
-            "Without a worktree, only worktree-independent tasks should be listed"
-        );
-        assert_eq!(
-            list_tasks_sorted_by_last_used(&inventory, Some(worktree_1), cx).await,
-            worktree_1_tasks
-                .iter()
-                .chain(worktree_independent_tasks.iter())
-                .cloned()
-                .sorted_by_key(|(kind, label)| (task_source_kind_preference(kind), label.clone()))
-                .collect::<Vec<_>>(),
-        );
-        assert_eq!(
-            list_tasks_sorted_by_last_used(&inventory, Some(worktree_2), cx).await,
-            worktree_2_tasks
-                .iter()
-                .chain(worktree_independent_tasks.iter())
-                .cloned()
-                .sorted_by_key(|(kind, label)| (task_source_kind_preference(kind), label.clone()))
-                .collect::<Vec<_>>(),
-        );
-
-        assert_eq!(
-            list_tasks(&inventory, None, cx).await,
-            worktree_independent_tasks,
-            "Without a worktree, only worktree-independent tasks should be listed"
-        );
-        assert_eq!(
-            list_tasks(&inventory, Some(worktree_1), cx).await,
-            worktree_1_tasks
-                .iter()
-                .chain(worktree_independent_tasks.iter())
-                .cloned()
-                .collect::<Vec<_>>(),
-        );
-        assert_eq!(
-            list_tasks(&inventory, Some(worktree_2), cx).await,
-            worktree_2_tasks
-                .iter()
-                .chain(worktree_independent_tasks.iter())
-                .cloned()
-                .collect::<Vec<_>>(),
-        );
-    }
-
-    fn init_test(_cx: &mut TestAppContext) {
-        zlog::init_test();
-        TaskStore::init(None);
-    }
-
-    fn resolved_task_names(
-        inventory: &Entity<Inventory>,
-        worktree: Option<WorktreeId>,
-        cx: &mut TestAppContext,
-    ) -> Task<Vec<String>> {
-        let tasks = inventory.update(cx, |inventory, cx| {
-            let mut task_contexts = TaskContexts::default();
-            task_contexts.active_worktree_context =
-                worktree.map(|worktree| (worktree, TaskContext::default()));
-
-            inventory.used_and_current_resolved_tasks(Arc::new(task_contexts), cx)
-        });
-
-        cx.background_spawn(async move {
-            let (used, current) = tasks.await;
-            used.into_iter()
-                .chain(current)
-                .map(|(_, task)| task.original_task().label.clone())
-                .collect()
-        })
-    }
-
-    fn mock_tasks_from_names<'a>(task_names: impl IntoIterator<Item = &'a str> + 'a) -> String {
-        serde_json::to_string(&serde_json::Value::Array(
-            task_names
-                .into_iter()
-                .map(|task_name| {
-                    json!({
-                        "label": task_name,
-                        "command": "echo",
-                        "args": vec![task_name],
-                    })
-                })
-                .collect::<Vec<_>>(),
-        ))
-        .unwrap()
-    }
-
-    async fn list_tasks_sorted_by_last_used(
-        inventory: &Entity<Inventory>,
-        worktree: Option<WorktreeId>,
-        cx: &mut TestAppContext,
-    ) -> Vec<(TaskSourceKind, String)> {
-        let (used, current) = inventory
-            .update(cx, |inventory, cx| {
-                let mut task_contexts = TaskContexts::default();
-                task_contexts.active_worktree_context =
-                    worktree.map(|worktree| (worktree, TaskContext::default()));
-
-                inventory.used_and_current_resolved_tasks(Arc::new(task_contexts), cx)
-            })
-            .await;
-        let mut all = used;
-        all.extend(current);
-        all.into_iter()
-            .map(|(source_kind, task)| (source_kind, task.resolved_label))
-            .sorted_by_key(|(kind, label)| (task_source_kind_preference(kind), label.clone()))
-            .collect()
-    }
-}
diff --git a/crates/project/src/task_store.rs b/crates/project/src/task_store.rs
deleted file mode 100644
index 462b164e83..0000000000
--- a/crates/project/src/task_store.rs
+++ /dev/null
@@ -1,501 +0,0 @@
-use std::{
-    path::{Path, PathBuf},
-    sync::Arc,
-};
-
-use anyhow::Context as _;
-use collections::HashMap;
-use fs::Fs;
-use gpui::{App, AsyncApp, Context, Entity, EventEmitter, Task, WeakEntity};
-use language::{
-    ContextLocation, ContextProvider as _, LanguageToolchainStore, Location,
-    proto::{deserialize_anchor, serialize_anchor},
-};
-use rpc::{AnyProtoClient, TypedEnvelope, proto};
-use settings::{InvalidSettingsError, SettingsLocation};
-use task::{TaskContext, TaskVariables, VariableName};
-use text::{BufferId, OffsetRangeExt};
-use util::ResultExt;
-
-use crate::{
-    BasicContextProvider, Inventory, ProjectEnvironment, buffer_store::BufferStore,
-    worktree_store::WorktreeStore,
-};
-
-// platform-dependent warning
-pub enum TaskStore {
-    Functional(StoreState),
-    Noop,
-}
-
-pub struct StoreState {
-    mode: StoreMode,
-    task_inventory: Entity<Inventory>,
-    buffer_store: WeakEntity<BufferStore>,
-    worktree_store: Entity<WorktreeStore>,
-    toolchain_store: Arc<dyn LanguageToolchainStore>,
-}
-
-enum StoreMode {
-    Local {
-        downstream_client: Option<(AnyProtoClient, u64)>,
-        environment: Entity<ProjectEnvironment>,
-    },
-    Remote {
-        upstream_client: AnyProtoClient,
-        project_id: u64,
-    },
-}
-
-impl EventEmitter<crate::Event> for TaskStore {}
-
-#[derive(Debug)]
-pub enum TaskSettingsLocation<'a> {
-    Global(&'a Path),
-    Worktree(SettingsLocation<'a>),
-}
-
-impl TaskStore {
-    pub fn init(client: Option<&AnyProtoClient>) {
-        if let Some(client) = client {
-            client.add_entity_request_handler(Self::handle_task_context_for_location);
-        }
-    }
-
-    async fn handle_task_context_for_location(
-        store: Entity<Self>,
-        envelope: TypedEnvelope<proto::TaskContextForLocation>,
-        mut cx: AsyncApp,
-    ) -> anyhow::Result<proto::TaskContext> {
-        let location = envelope
-            .payload
-            .location
-            .context("no location given for task context handling")?;
-        let (buffer_store, is_remote) = store.read_with(&cx, |store, _| {
-            Ok(match store {
-                TaskStore::Functional(state) => (
-                    state.buffer_store.clone(),
-                    match &state.mode {
-                        StoreMode::Local { .. } => false,
-                        StoreMode::Remote { .. } => true,
-                    },
-                ),
-                TaskStore::Noop => {
-                    anyhow::bail!("empty task store cannot handle task context requests")
-                }
-            })
-        })??;
-        let buffer_store = buffer_store
-            .upgrade()
-            .context("no buffer store when handling task context request")?;
-
-        let buffer_id = BufferId::new(location.buffer_id).with_context(|| {
-            format!(
-                "cannot handle task context request for invalid buffer id: {}",
-                location.buffer_id
-            )
-        })?;
-
-        let start = location
-            .start
-            .and_then(deserialize_anchor)
-            .context("missing task context location start")?;
-        let end = location
-            .end
-            .and_then(deserialize_anchor)
-            .context("missing task context location end")?;
-        let buffer = buffer_store
-            .update(&mut cx, |buffer_store, cx| {
-                if is_remote {
-                    buffer_store.wait_for_remote_buffer(buffer_id, cx)
-                } else {
-                    Task::ready(
-                        buffer_store
-                            .get(buffer_id)
-                            .with_context(|| format!("no local buffer with id {buffer_id}")),
-                    )
-                }
-            })?
-            .await?;
-
-        let location = Location {
-            buffer,
-            range: start..end,
-        };
-        let context_task = store.update(&mut cx, |store, cx| {
-            let captured_variables = {
-                let mut variables = TaskVariables::from_iter(
-                    envelope
-                        .payload
-                        .task_variables
-                        .into_iter()
-                        .filter_map(|(k, v)| Some((k.parse().log_err()?, v))),
-                );
-
-                let snapshot = location.buffer.read(cx).snapshot();
-                let range = location.range.to_offset(&snapshot);
-
-                for range in snapshot.runnable_ranges(range) {
-                    for (capture_name, value) in range.extra_captures {
-                        variables.insert(VariableName::Custom(capture_name.into()), value);
-                    }
-                }
-                variables
-            };
-            store.task_context_for_location(captured_variables, location, cx)
-        })?;
-        let task_context = context_task.await.unwrap_or_default();
-        Ok(proto::TaskContext {
-            project_env: task_context.project_env.into_iter().collect(),
-            cwd: task_context
-                .cwd
-                .map(|cwd| cwd.to_string_lossy().into_owned()),
-            task_variables: task_context
-                .task_variables
-                .into_iter()
-                .map(|(variable_name, variable_value)| (variable_name.to_string(), variable_value))
-                .collect(),
-        })
-    }
-
-    pub fn local(
-        buffer_store: WeakEntity<BufferStore>,
-        worktree_store: Entity<WorktreeStore>,
-        toolchain_store: Arc<dyn LanguageToolchainStore>,
-        environment: Entity<ProjectEnvironment>,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        Self::Functional(StoreState {
-            mode: StoreMode::Local {
-                downstream_client: None,
-                environment,
-            },
-            task_inventory: Inventory::new(cx),
-            buffer_store,
-            toolchain_store,
-            worktree_store,
-        })
-    }
-
-    pub fn remote(
-        buffer_store: WeakEntity<BufferStore>,
-        worktree_store: Entity<WorktreeStore>,
-        toolchain_store: Arc<dyn LanguageToolchainStore>,
-        upstream_client: AnyProtoClient,
-        project_id: u64,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        Self::Functional(StoreState {
-            mode: StoreMode::Remote {
-                upstream_client,
-                project_id,
-            },
-            task_inventory: Inventory::new(cx),
-            buffer_store,
-            toolchain_store,
-            worktree_store,
-        })
-    }
-
-    pub fn task_context_for_location(
-        &self,
-        captured_variables: TaskVariables,
-        location: Location,
-        cx: &mut App,
-    ) -> Task<Option<TaskContext>> {
-        match self {
-            TaskStore::Functional(state) => match &state.mode {
-                StoreMode::Local { environment, .. } => local_task_context_for_location(
-                    state.worktree_store.clone(),
-                    state.toolchain_store.clone(),
-                    environment.clone(),
-                    captured_variables,
-                    location,
-                    cx,
-                ),
-                StoreMode::Remote {
-                    upstream_client,
-                    project_id,
-                } => remote_task_context_for_location(
-                    *project_id,
-                    upstream_client.clone(),
-                    state.worktree_store.clone(),
-                    captured_variables,
-                    location,
-                    state.toolchain_store.clone(),
-                    cx,
-                ),
-            },
-            TaskStore::Noop => Task::ready(None),
-        }
-    }
-
-    pub fn task_inventory(&self) -> Option<&Entity<Inventory>> {
-        match self {
-            TaskStore::Functional(state) => Some(&state.task_inventory),
-            TaskStore::Noop => None,
-        }
-    }
-
-    pub fn shared(&mut self, remote_id: u64, new_downstream_client: AnyProtoClient, _cx: &mut App) {
-        if let Self::Functional(StoreState {
-            mode: StoreMode::Local {
-                downstream_client, ..
-            },
-            ..
-        }) = self
-        {
-            *downstream_client = Some((new_downstream_client, remote_id));
-        }
-    }
-
-    pub fn unshared(&mut self, _: &mut Context<Self>) {
-        if let Self::Functional(StoreState {
-            mode: StoreMode::Local {
-                downstream_client, ..
-            },
-            ..
-        }) = self
-        {
-            *downstream_client = None;
-        }
-    }
-
-    pub(super) fn update_user_tasks(
-        &self,
-        location: TaskSettingsLocation<'_>,
-        raw_tasks_json: Option<&str>,
-        cx: &mut Context<Self>,
-    ) -> Result<(), InvalidSettingsError> {
-        let task_inventory = match self {
-            TaskStore::Functional(state) => &state.task_inventory,
-            TaskStore::Noop => return Ok(()),
-        };
-        let raw_tasks_json = raw_tasks_json
-            .map(|json| json.trim())
-            .filter(|json| !json.is_empty());
-
-        task_inventory.update(cx, |inventory, _| {
-            inventory.update_file_based_tasks(location, raw_tasks_json)
-        })
-    }
-
-    pub(super) fn update_user_debug_scenarios(
-        &self,
-        location: TaskSettingsLocation<'_>,
-        raw_tasks_json: Option<&str>,
-        cx: &mut Context<Self>,
-    ) -> Result<(), InvalidSettingsError> {
-        let task_inventory = match self {
-            TaskStore::Functional(state) => &state.task_inventory,
-            TaskStore::Noop => return Ok(()),
-        };
-        let raw_tasks_json = raw_tasks_json
-            .map(|json| json.trim())
-            .filter(|json| !json.is_empty());
-
-        task_inventory.update(cx, |inventory, _| {
-            inventory.update_file_based_scenarios(location, raw_tasks_json)
-        })
-    }
-}
-
-fn local_task_context_for_location(
-    worktree_store: Entity<WorktreeStore>,
-    toolchain_store: Arc<dyn LanguageToolchainStore>,
-    environment: Entity<ProjectEnvironment>,
-    captured_variables: TaskVariables,
-    location: Location,
-    cx: &App,
-) -> Task<Option<TaskContext>> {
-    let worktree_id = location.buffer.read(cx).file().map(|f| f.worktree_id(cx));
-    let worktree_abs_path = worktree_id
-        .and_then(|worktree_id| worktree_store.read(cx).worktree_for_id(worktree_id, cx))
-        .and_then(|worktree| worktree.read(cx).root_dir());
-    let fs = worktree_store.read(cx).fs();
-
-    cx.spawn(async move |cx| {
-        let project_env = environment
-            .update(cx, |environment, cx| {
-                environment.buffer_environment(&location.buffer, &worktree_store, cx)
-            })
-            .ok()?
-            .await;
-
-        let mut task_variables = cx
-            .update(|cx| {
-                combine_task_variables(
-                    captured_variables,
-                    fs,
-                    worktree_store.clone(),
-                    location,
-                    project_env.clone(),
-                    BasicContextProvider::new(worktree_store),
-                    toolchain_store,
-                    cx,
-                )
-            })
-            .ok()?
-            .await
-            .log_err()?;
-        // Remove all custom entries starting with _, as they're not intended for use by the end user.
-        task_variables.sweep();
-
-        Some(TaskContext {
-            project_env: project_env.unwrap_or_default(),
-            cwd: worktree_abs_path.map(|p| p.to_path_buf()),
-            task_variables,
-        })
-    })
-}
-
-fn remote_task_context_for_location(
-    project_id: u64,
-    upstream_client: AnyProtoClient,
-    worktree_store: Entity<WorktreeStore>,
-    captured_variables: TaskVariables,
-    location: Location,
-    toolchain_store: Arc<dyn LanguageToolchainStore>,
-    cx: &mut App,
-) -> Task<Option<TaskContext>> {
-    cx.spawn(async move |cx| {
-        // We need to gather a client context, as the headless one may lack certain information (e.g. tree-sitter parsing is disabled there, so symbols are not available).
-        let mut remote_context = cx
-            .update(|cx| {
-                let worktree_root = worktree_root(&worktree_store, &location, cx);
-
-                BasicContextProvider::new(worktree_store).build_context(
-                    &TaskVariables::default(),
-                    ContextLocation {
-                        fs: None,
-                        worktree_root,
-                        file_location: &location,
-                    },
-                    None,
-                    toolchain_store,
-                    cx,
-                )
-            })
-            .ok()?
-            .await
-            .log_err()
-            .unwrap_or_default();
-        remote_context.extend(captured_variables);
-
-        let buffer_id = cx
-            .update(|cx| location.buffer.read(cx).remote_id().to_proto())
-            .ok()?;
-        let context_task = upstream_client.request(proto::TaskContextForLocation {
-            project_id,
-            location: Some(proto::Location {
-                buffer_id,
-                start: Some(serialize_anchor(&location.range.start)),
-                end: Some(serialize_anchor(&location.range.end)),
-            }),
-            task_variables: remote_context
-                .into_iter()
-                .map(|(k, v)| (k.to_string(), v))
-                .collect(),
-        });
-        let task_context = context_task.await.log_err()?;
-        Some(TaskContext {
-            cwd: task_context.cwd.map(PathBuf::from),
-            task_variables: task_context
-                .task_variables
-                .into_iter()
-                .filter_map(
-                    |(variable_name, variable_value)| match variable_name.parse() {
-                        Ok(variable_name) => Some((variable_name, variable_value)),
-                        Err(()) => {
-                            log::error!("Unknown variable name: {variable_name}");
-                            None
-                        }
-                    },
-                )
-                .collect(),
-            project_env: task_context.project_env.into_iter().collect(),
-        })
-    })
-}
-
-fn worktree_root(
-    worktree_store: &Entity<WorktreeStore>,
-    location: &Location,
-    cx: &mut App,
-) -> Option<PathBuf> {
-    location
-        .buffer
-        .read(cx)
-        .file()
-        .map(|f| f.worktree_id(cx))
-        .and_then(|worktree_id| worktree_store.read(cx).worktree_for_id(worktree_id, cx))
-        .and_then(|worktree| {
-            let worktree = worktree.read(cx);
-            if !worktree.is_visible() {
-                return None;
-            }
-            let root_entry = worktree.root_entry()?;
-            if !root_entry.is_dir() {
-                return None;
-            }
-            Some(worktree.absolutize(&root_entry.path))
-        })
-}
-
-fn combine_task_variables(
-    mut captured_variables: TaskVariables,
-    fs: Option<Arc<dyn Fs>>,
-    worktree_store: Entity<WorktreeStore>,
-    location: Location,
-    project_env: Option<HashMap<String, String>>,
-    baseline: BasicContextProvider,
-    toolchain_store: Arc<dyn LanguageToolchainStore>,
-    cx: &mut App,
-) -> Task<anyhow::Result<TaskVariables>> {
-    let language_context_provider = location
-        .buffer
-        .read(cx)
-        .language()
-        .and_then(|language| language.context_provider());
-    cx.spawn(async move |cx| {
-        let baseline = cx
-            .update(|cx| {
-                let worktree_root = worktree_root(&worktree_store, &location, cx);
-                baseline.build_context(
-                    &captured_variables,
-                    ContextLocation {
-                        fs: fs.clone(),
-                        worktree_root,
-                        file_location: &location,
-                    },
-                    project_env.clone(),
-                    toolchain_store.clone(),
-                    cx,
-                )
-            })?
-            .await
-            .context("building basic default context")?;
-        captured_variables.extend(baseline);
-        if let Some(provider) = language_context_provider {
-            captured_variables.extend(
-                cx.update(|cx| {
-                    let worktree_root = worktree_root(&worktree_store, &location, cx);
-                    provider.build_context(
-                        &captured_variables,
-                        ContextLocation {
-                            fs,
-                            worktree_root,
-                            file_location: &location,
-                        },
-                        project_env,
-                        toolchain_store,
-                        cx,
-                    )
-                })?
-                .await
-                .context("building provider context")?,
-            );
-        }
-        Ok(captured_variables)
-    })
-}
diff --git a/crates/project/src/telemetry_snapshot.rs b/crates/project/src/telemetry_snapshot.rs
deleted file mode 100644
index 5f9155371d..0000000000
--- a/crates/project/src/telemetry_snapshot.rs
+++ /dev/null
@@ -1,127 +0,0 @@
-use git::repository::DiffType;
-use gpui::{App, Entity, Task};
-use serde::{Deserialize, Serialize};
-use worktree::Worktree;
-
-use crate::{
-    Project,
-    git_store::{GitStore, LocalRepositoryState, RepositoryState},
-};
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-pub struct TelemetrySnapshot {
-    pub worktree_snapshots: Vec<TelemetryWorktreeSnapshot>,
-}
-
-impl TelemetrySnapshot {
-    pub fn new(project: &Entity<Project>, cx: &mut App) -> Task<TelemetrySnapshot> {
-        let git_store = project.read(cx).git_store().clone();
-        let worktree_snapshots: Vec<_> = project
-            .read(cx)
-            .visible_worktrees(cx)
-            .map(|worktree| TelemetryWorktreeSnapshot::new(worktree, git_store.clone(), cx))
-            .collect();
-
-        cx.spawn(async move |_| {
-            let worktree_snapshots = futures::future::join_all(worktree_snapshots).await;
-
-            Self { worktree_snapshots }
-        })
-    }
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-pub struct TelemetryWorktreeSnapshot {
-    pub worktree_path: String,
-    pub git_state: Option<GitState>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-pub struct GitState {
-    pub remote_url: Option<String>,
-    pub head_sha: Option<String>,
-    pub current_branch: Option<String>,
-    pub diff: Option<String>,
-}
-
-impl TelemetryWorktreeSnapshot {
-    fn new(
-        worktree: Entity<Worktree>,
-        git_store: Entity<GitStore>,
-        cx: &App,
-    ) -> Task<TelemetryWorktreeSnapshot> {
-        cx.spawn(async move |cx| {
-            // Get worktree path and snapshot
-            let worktree_info = cx.update(|app_cx| {
-                let worktree = worktree.read(app_cx);
-                let path = worktree.abs_path().to_string_lossy().into_owned();
-                let snapshot = worktree.snapshot();
-                (path, snapshot)
-            });
-
-            let Ok((worktree_path, _snapshot)) = worktree_info else {
-                return TelemetryWorktreeSnapshot {
-                    worktree_path: String::new(),
-                    git_state: None,
-                };
-            };
-
-            let git_state = git_store
-                .update(cx, |git_store, cx| {
-                    git_store
-                        .repositories()
-                        .values()
-                        .find(|repo| {
-                            repo.read(cx)
-                                .abs_path_to_repo_path(&worktree.read(cx).abs_path())
-                                .is_some()
-                        })
-                        .cloned()
-                })
-                .ok()
-                .flatten()
-                .map(|repo| {
-                    repo.update(cx, |repo, _| {
-                        let current_branch =
-                            repo.branch.as_ref().map(|branch| branch.name().to_owned());
-                        repo.send_job(None, |state, _| async move {
-                            let RepositoryState::Local(LocalRepositoryState { backend, .. }) =
-                                state
-                            else {
-                                return GitState {
-                                    remote_url: None,
-                                    head_sha: None,
-                                    current_branch,
-                                    diff: None,
-                                };
-                            };
-
-                            let remote_url = backend.remote_url("origin").await;
-                            let head_sha = backend.head_sha().await;
-                            let diff = backend.diff(DiffType::HeadToWorktree).await.ok();
-
-                            GitState {
-                                remote_url,
-                                head_sha,
-                                current_branch,
-                                diff,
-                            }
-                        })
-                    })
-                });
-
-            let git_state = match git_state {
-                Some(git_state) => match git_state.ok() {
-                    Some(git_state) => git_state.await.ok(),
-                    None => None,
-                },
-                None => None,
-            };
-
-            TelemetryWorktreeSnapshot {
-                worktree_path,
-                git_state,
-            }
-        })
-    }
-}
diff --git a/crates/project/src/terminals.rs b/crates/project/src/terminals.rs
deleted file mode 100644
index 9e9c9fe423..0000000000
--- a/crates/project/src/terminals.rs
+++ /dev/null
@@ -1,598 +0,0 @@
-use anyhow::Result;
-use collections::HashMap;
-use gpui::{App, AppContext as _, Context, Entity, Task, WeakEntity};
-
-use futures::{FutureExt, future::Shared};
-use itertools::Itertools as _;
-use language::LanguageName;
-use remote::RemoteClient;
-use settings::{Settings, SettingsLocation};
-use smol::channel::bounded;
-use std::{
-    path::{Path, PathBuf},
-    sync::Arc,
-};
-use task::{Shell, ShellBuilder, ShellKind, SpawnInTerminal};
-use terminal::{
-    TaskState, TaskStatus, Terminal, TerminalBuilder, terminal_settings::TerminalSettings,
-};
-use util::{command::new_std_command, get_default_system_shell, maybe, rel_path::RelPath};
-
-use crate::{Project, ProjectPath};
-
-pub struct Terminals {
-    pub(crate) local_handles: Vec<WeakEntity<terminal::Terminal>>,
-}
-
-impl Project {
-    pub fn active_project_directory(&self, cx: &App) -> Option<Arc<Path>> {
-        self.active_entry()
-            .and_then(|entry_id| self.worktree_for_entry(entry_id, cx))
-            .into_iter()
-            .chain(self.worktrees(cx))
-            .find_map(|tree| tree.read(cx).root_dir())
-    }
-
-    pub fn first_project_directory(&self, cx: &App) -> Option<PathBuf> {
-        let worktree = self.worktrees(cx).next()?;
-        let worktree = worktree.read(cx);
-        if worktree.root_entry()?.is_dir() {
-            Some(worktree.abs_path().to_path_buf())
-        } else {
-            None
-        }
-    }
-
-    pub fn create_terminal_task(
-        &mut self,
-        spawn_task: SpawnInTerminal,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Entity<Terminal>>> {
-        let is_via_remote = self.remote_client.is_some();
-
-        let path: Option<Arc<Path>> = if let Some(cwd) = &spawn_task.cwd {
-            if is_via_remote {
-                Some(Arc::from(cwd.as_ref()))
-            } else {
-                let cwd = cwd.to_string_lossy();
-                let tilde_substituted = shellexpand::tilde(&cwd);
-                Some(Arc::from(Path::new(tilde_substituted.as_ref())))
-            }
-        } else {
-            self.active_project_directory(cx)
-        };
-
-        let mut settings_location = None;
-        if let Some(path) = path.as_ref()
-            && let Some((worktree, _)) = self.find_worktree(path, cx)
-        {
-            settings_location = Some(SettingsLocation {
-                worktree_id: worktree.read(cx).id(),
-                path: RelPath::empty(),
-            });
-        }
-        let settings = TerminalSettings::get(settings_location, cx).clone();
-        let detect_venv = settings.detect_venv.as_option().is_some();
-
-        let (completion_tx, completion_rx) = bounded(1);
-
-        let local_path = if is_via_remote { None } else { path.clone() };
-        let task_state = Some(TaskState {
-            spawned_task: spawn_task.clone(),
-            status: TaskStatus::Running,
-            completion_rx,
-        });
-        let remote_client = self.remote_client.clone();
-        let shell = match &remote_client {
-            Some(remote_client) => remote_client
-                .read(cx)
-                .shell()
-                .unwrap_or_else(get_default_system_shell),
-            None => settings.shell.program(),
-        };
-        let is_windows = self.path_style(cx).is_windows();
-        let shell_kind = ShellKind::new(&shell, is_windows);
-
-        // Prepare a task for resolving the environment
-        let env_task =
-            self.resolve_directory_environment(&shell, path.clone(), remote_client.clone(), cx);
-
-        let project_path_contexts = self
-            .active_entry()
-            .and_then(|entry_id| self.path_for_entry(entry_id, cx))
-            .into_iter()
-            .chain(
-                self.visible_worktrees(cx)
-                    .map(|wt| wt.read(cx).id())
-                    .map(|worktree_id| ProjectPath {
-                        worktree_id,
-                        path: Arc::from(RelPath::empty()),
-                    }),
-            );
-        let toolchains = project_path_contexts
-            .filter(|_| detect_venv)
-            .map(|p| self.active_toolchain(p, LanguageName::new_static("Python"), cx))
-            .collect::<Vec<_>>();
-        let lang_registry = self.languages.clone();
-        cx.spawn(async move |project, cx| {
-            let mut env = env_task.await.unwrap_or_default();
-            env.extend(settings.env);
-
-            let activation_script = maybe!(async {
-                for toolchain in toolchains {
-                    let Some(toolchain) = toolchain.await else {
-                        continue;
-                    };
-                    let language = lang_registry
-                        .language_for_name(&toolchain.language_name.0)
-                        .await
-                        .ok();
-                    let lister = language?.toolchain_lister()?;
-                    return cx
-                        .update(|cx| lister.activation_script(&toolchain, shell_kind, cx))
-                        .ok();
-                }
-                None
-            })
-            .await
-            .unwrap_or_default();
-
-            let builder = project
-                .update(cx, move |_, cx| {
-                    let format_to_run = || {
-                        if let Some(command) = &spawn_task.command {
-                            let command = shell_kind.prepend_command_prefix(command);
-                            let command = shell_kind.try_quote_prefix_aware(&command);
-                            let args = spawn_task
-                                .args
-                                .iter()
-                                .filter_map(|arg| shell_kind.try_quote(&arg));
-
-                            command.into_iter().chain(args).join(" ")
-                        } else {
-                            // todo: this breaks for remotes to windows
-                            format!("exec {shell} -l")
-                        }
-                    };
-
-                    let (shell, env) = {
-                        env.extend(spawn_task.env);
-                        match remote_client {
-                            Some(remote_client) => match activation_script.clone() {
-                                activation_script if !activation_script.is_empty() => {
-                                    let separator = shell_kind.sequential_commands_separator();
-                                    let activation_script =
-                                        activation_script.join(&format!("{separator} "));
-                                    let to_run = format_to_run();
-
-                                    let arg = format!("{activation_script}{separator} {to_run}");
-                                    let args = shell_kind.args_for_shell(false, arg);
-                                    let shell = remote_client
-                                        .read(cx)
-                                        .shell()
-                                        .unwrap_or_else(get_default_system_shell);
-
-                                    create_remote_shell(
-                                        Some((&shell, &args)),
-                                        env,
-                                        path,
-                                        remote_client,
-                                        cx,
-                                    )?
-                                }
-                                _ => create_remote_shell(
-                                    spawn_task
-                                        .command
-                                        .as_ref()
-                                        .map(|command| (command, &spawn_task.args)),
-                                    env,
-                                    path,
-                                    remote_client,
-                                    cx,
-                                )?,
-                            },
-                            None => match activation_script.clone() {
-                                activation_script if !activation_script.is_empty() => {
-                                    let separator = shell_kind.sequential_commands_separator();
-                                    let activation_script =
-                                        activation_script.join(&format!("{separator} "));
-                                    let to_run = format_to_run();
-
-                                    let mut arg =
-                                        format!("{activation_script}{separator} {to_run}");
-                                    if shell_kind == ShellKind::Cmd {
-                                        // We need to put the entire command in quotes since otherwise CMD tries to execute them
-                                        // as separate commands rather than chaining one after another.
-                                        arg = format!("\"{arg}\"");
-                                    }
-
-                                    let args = shell_kind.args_for_shell(false, arg);
-
-                                    (
-                                        Shell::WithArguments {
-                                            program: shell,
-                                            args,
-                                            title_override: None,
-                                        },
-                                        env,
-                                    )
-                                }
-                                _ => (
-                                    if let Some(program) = spawn_task.command {
-                                        Shell::WithArguments {
-                                            program,
-                                            args: spawn_task.args,
-                                            title_override: None,
-                                        }
-                                    } else {
-                                        Shell::System
-                                    },
-                                    env,
-                                ),
-                            },
-                        }
-                    };
-                    anyhow::Ok(TerminalBuilder::new(
-                        local_path.map(|path| path.to_path_buf()),
-                        task_state,
-                        shell,
-                        env,
-                        settings.cursor_shape,
-                        settings.alternate_scroll,
-                        settings.max_scroll_history_lines,
-                        settings.path_hyperlink_regexes,
-                        settings.path_hyperlink_timeout_ms,
-                        is_via_remote,
-                        cx.entity_id().as_u64(),
-                        Some(completion_tx),
-                        cx,
-                        activation_script,
-                    ))
-                })??
-                .await?;
-            project.update(cx, move |this, cx| {
-                let terminal_handle = cx.new(|cx| builder.subscribe(cx));
-
-                this.terminals
-                    .local_handles
-                    .push(terminal_handle.downgrade());
-
-                let id = terminal_handle.entity_id();
-                cx.observe_release(&terminal_handle, move |project, _terminal, cx| {
-                    let handles = &mut project.terminals.local_handles;
-
-                    if let Some(index) = handles
-                        .iter()
-                        .position(|terminal| terminal.entity_id() == id)
-                    {
-                        handles.remove(index);
-                        cx.notify();
-                    }
-                })
-                .detach();
-
-                terminal_handle
-            })
-        })
-    }
-
-    pub fn create_terminal_shell(
-        &mut self,
-        cwd: Option<PathBuf>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Entity<Terminal>>> {
-        let path = cwd.map(|p| Arc::from(&*p));
-        let is_via_remote = self.remote_client.is_some();
-
-        let mut settings_location = None;
-        if let Some(path) = path.as_ref()
-            && let Some((worktree, _)) = self.find_worktree(path, cx)
-        {
-            settings_location = Some(SettingsLocation {
-                worktree_id: worktree.read(cx).id(),
-                path: RelPath::empty(),
-            });
-        }
-        let settings = TerminalSettings::get(settings_location, cx).clone();
-        let detect_venv = settings.detect_venv.as_option().is_some();
-        let local_path = if is_via_remote { None } else { path.clone() };
-
-        let project_path_contexts = self
-            .active_entry()
-            .and_then(|entry_id| self.path_for_entry(entry_id, cx))
-            .into_iter()
-            .chain(
-                self.visible_worktrees(cx)
-                    .map(|wt| wt.read(cx).id())
-                    .map(|worktree_id| ProjectPath {
-                        worktree_id,
-                        path: RelPath::empty().into(),
-                    }),
-            );
-        let toolchains = project_path_contexts
-            .filter(|_| detect_venv)
-            .map(|p| self.active_toolchain(p, LanguageName::new_static("Python"), cx))
-            .collect::<Vec<_>>();
-        let remote_client = self.remote_client.clone();
-        let shell = match &remote_client {
-            Some(remote_client) => remote_client
-                .read(cx)
-                .shell()
-                .unwrap_or_else(get_default_system_shell),
-            None => settings.shell.program(),
-        };
-
-        let is_windows = self.path_style(cx).is_windows();
-
-        // Prepare a task for resolving the environment
-        let env_task =
-            self.resolve_directory_environment(&shell, path.clone(), remote_client.clone(), cx);
-
-        let lang_registry = self.languages.clone();
-        cx.spawn(async move |project, cx| {
-            let shell_kind = ShellKind::new(&shell, is_windows);
-            let mut env = env_task.await.unwrap_or_default();
-            env.extend(settings.env);
-
-            let activation_script = maybe!(async {
-                for toolchain in toolchains {
-                    let Some(toolchain) = toolchain.await else {
-                        continue;
-                    };
-                    let language = lang_registry
-                        .language_for_name(&toolchain.language_name.0)
-                        .await
-                        .ok();
-                    let lister = language?.toolchain_lister()?;
-                    return cx
-                        .update(|cx| lister.activation_script(&toolchain, shell_kind, cx))
-                        .ok();
-                }
-                None
-            })
-            .await
-            .unwrap_or_default();
-
-            let builder = project
-                .update(cx, move |_, cx| {
-                    let (shell, env) = {
-                        match remote_client {
-                            Some(remote_client) => {
-                                create_remote_shell(None, env, path, remote_client, cx)?
-                            }
-                            None => (settings.shell, env),
-                        }
-                    };
-                    anyhow::Ok(TerminalBuilder::new(
-                        local_path.map(|path| path.to_path_buf()),
-                        None,
-                        shell,
-                        env,
-                        settings.cursor_shape,
-                        settings.alternate_scroll,
-                        settings.max_scroll_history_lines,
-                        settings.path_hyperlink_regexes,
-                        settings.path_hyperlink_timeout_ms,
-                        is_via_remote,
-                        cx.entity_id().as_u64(),
-                        None,
-                        cx,
-                        activation_script,
-                    ))
-                })??
-                .await?;
-            project.update(cx, move |this, cx| {
-                let terminal_handle = cx.new(|cx| builder.subscribe(cx));
-
-                this.terminals
-                    .local_handles
-                    .push(terminal_handle.downgrade());
-
-                let id = terminal_handle.entity_id();
-                cx.observe_release(&terminal_handle, move |project, _terminal, cx| {
-                    let handles = &mut project.terminals.local_handles;
-
-                    if let Some(index) = handles
-                        .iter()
-                        .position(|terminal| terminal.entity_id() == id)
-                    {
-                        handles.remove(index);
-                        cx.notify();
-                    }
-                })
-                .detach();
-
-                terminal_handle
-            })
-        })
-    }
-
-    pub fn clone_terminal(
-        &mut self,
-        terminal: &Entity<Terminal>,
-        cx: &mut Context<'_, Project>,
-        cwd: Option<PathBuf>,
-    ) -> Task<Result<Entity<Terminal>>> {
-        // We cannot clone the task's terminal, as it will effectively re-spawn the task, which might not be desirable.
-        // For now, create a new shell instead.
-        if terminal.read(cx).task().is_some() {
-            return self.create_terminal_shell(cwd, cx);
-        }
-        let local_path = if self.is_via_remote_server() {
-            None
-        } else {
-            cwd
-        };
-
-        let builder = terminal.read(cx).clone_builder(cx, local_path);
-        cx.spawn(async |project, cx| {
-            let terminal = builder.await?;
-            project.update(cx, |project, cx| {
-                let terminal_handle = cx.new(|cx| terminal.subscribe(cx));
-
-                project
-                    .terminals
-                    .local_handles
-                    .push(terminal_handle.downgrade());
-
-                let id = terminal_handle.entity_id();
-                cx.observe_release(&terminal_handle, move |project, _terminal, cx| {
-                    let handles = &mut project.terminals.local_handles;
-
-                    if let Some(index) = handles
-                        .iter()
-                        .position(|terminal| terminal.entity_id() == id)
-                    {
-                        handles.remove(index);
-                        cx.notify();
-                    }
-                })
-                .detach();
-
-                terminal_handle
-            })
-        })
-    }
-
-    pub fn terminal_settings<'a>(
-        &'a self,
-        path: &'a Option<PathBuf>,
-        cx: &'a App,
-    ) -> &'a TerminalSettings {
-        let mut settings_location = None;
-        if let Some(path) = path.as_ref()
-            && let Some((worktree, _)) = self.find_worktree(path, cx)
-        {
-            settings_location = Some(SettingsLocation {
-                worktree_id: worktree.read(cx).id(),
-                path: RelPath::empty(),
-            });
-        }
-        TerminalSettings::get(settings_location, cx)
-    }
-
-    pub fn exec_in_shell(
-        &self,
-        command: String,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<smol::process::Command>> {
-        let path = self.first_project_directory(cx);
-        let remote_client = self.remote_client.clone();
-        let settings = self.terminal_settings(&path, cx).clone();
-        let shell = remote_client
-            .as_ref()
-            .and_then(|remote_client| remote_client.read(cx).shell())
-            .map(Shell::Program)
-            .unwrap_or_else(|| settings.shell.clone());
-        let is_windows = self.path_style(cx).is_windows();
-        let builder = ShellBuilder::new(&shell, is_windows).non_interactive();
-        let (command, args) = builder.build(Some(command), &Vec::new());
-
-        let env_task = self.resolve_directory_environment(
-            &shell.program(),
-            path.as_ref().map(|p| Arc::from(&**p)),
-            remote_client.clone(),
-            cx,
-        );
-
-        cx.spawn(async move |project, cx| {
-            let mut env = env_task.await.unwrap_or_default();
-            env.extend(settings.env);
-
-            project.update(cx, move |_, cx| {
-                match remote_client {
-                    Some(remote_client) => {
-                        let command_template = remote_client.read(cx).build_command(
-                            Some(command),
-                            &args,
-                            &env,
-                            None,
-                            None,
-                        )?;
-                        let mut command = new_std_command(command_template.program);
-                        command.args(command_template.args);
-                        command.envs(command_template.env);
-                        Ok(command)
-                    }
-                    None => {
-                        let mut command = new_std_command(command);
-                        command.args(args);
-                        command.envs(env);
-                        if let Some(path) = path {
-                            command.current_dir(path);
-                        }
-                        Ok(command)
-                    }
-                }
-                .map(|mut process| {
-                    util::set_pre_exec_to_start_new_session(&mut process);
-                    smol::process::Command::from(process)
-                })
-            })?
-        })
-    }
-
-    pub fn local_terminal_handles(&self) -> &Vec<WeakEntity<terminal::Terminal>> {
-        &self.terminals.local_handles
-    }
-
-    fn resolve_directory_environment(
-        &self,
-        shell: &str,
-        path: Option<Arc<Path>>,
-        remote_client: Option<Entity<RemoteClient>>,
-        cx: &mut App,
-    ) -> Shared<Task<Option<HashMap<String, String>>>> {
-        if let Some(path) = &path {
-            let shell = Shell::Program(shell.to_string());
-            self.environment
-                .update(cx, |project_env, cx| match &remote_client {
-                    Some(remote_client) => project_env.remote_directory_environment(
-                        &shell,
-                        path.clone(),
-                        remote_client.clone(),
-                        cx,
-                    ),
-                    None => project_env.local_directory_environment(&shell, path.clone(), cx),
-                })
-        } else {
-            Task::ready(None).shared()
-        }
-    }
-}
-
-fn create_remote_shell(
-    spawn_command: Option<(&String, &Vec<String>)>,
-    mut env: HashMap<String, String>,
-    working_directory: Option<Arc<Path>>,
-    remote_client: Entity<RemoteClient>,
-    cx: &mut App,
-) -> Result<(Shell, HashMap<String, String>)> {
-    // Set default terminfo that does not break the highlighting via ssh.
-    env.insert("TERM".to_string(), "xterm-256color".to_string());
-
-    let (program, args) = match spawn_command {
-        Some((program, args)) => (Some(program.clone()), args),
-        None => (None, &Vec::new()),
-    };
-
-    let command = remote_client.read(cx).build_command(
-        program,
-        args.as_slice(),
-        &env,
-        working_directory.map(|path| path.display().to_string()),
-        None,
-    )?;
-
-    log::debug!("Connecting to a remote server: {:?}", command.program);
-    let host = remote_client.read(cx).connection_options().display_name();
-
-    Ok((
-        Shell::WithArguments {
-            program: command.program,
-            args: command.args,
-            title_override: Some(format!("{} — Terminal", host)),
-        },
-        command.env,
-    ))
-}
diff --git a/crates/project/src/toolchain_store.rs b/crates/project/src/toolchain_store.rs
deleted file mode 100644
index 21b74bd784..0000000000
--- a/crates/project/src/toolchain_store.rs
+++ /dev/null
@@ -1,777 +0,0 @@
-use std::{path::PathBuf, str::FromStr, sync::Arc};
-
-use anyhow::{Context as _, Result, bail};
-
-use async_trait::async_trait;
-use collections::{BTreeMap, IndexSet};
-use fs::Fs;
-use gpui::{
-    App, AppContext as _, AsyncApp, Context, Entity, EventEmitter, Subscription, Task, WeakEntity,
-};
-use language::{
-    LanguageName, LanguageRegistry, LanguageToolchainStore, ManifestDelegate, Toolchain,
-    ToolchainList, ToolchainScope,
-};
-use rpc::{
-    AnyProtoClient, TypedEnvelope,
-    proto::{
-        self, ResolveToolchainResponse,
-        resolve_toolchain_response::Response as ResolveResponsePayload,
-    },
-};
-use settings::WorktreeId;
-use task::Shell;
-use util::{ResultExt as _, rel_path::RelPath};
-
-use crate::{
-    ProjectEnvironment, ProjectPath,
-    manifest_tree::{ManifestQueryDelegate, ManifestTree},
-    worktree_store::WorktreeStore,
-};
-
-pub struct ToolchainStore {
-    mode: ToolchainStoreInner,
-    user_toolchains: BTreeMap<ToolchainScope, IndexSet<Toolchain>>,
-    _sub: Subscription,
-}
-
-enum ToolchainStoreInner {
-    Local(Entity<LocalToolchainStore>),
-    Remote(Entity<RemoteToolchainStore>),
-}
-
-pub struct Toolchains {
-    /// Auto-detected toolchains.
-    pub toolchains: ToolchainList,
-    /// Path of the project root at which we ran the automatic toolchain detection.
-    pub root_path: Arc<RelPath>,
-    pub user_toolchains: BTreeMap<ToolchainScope, IndexSet<Toolchain>>,
-}
-impl EventEmitter<ToolchainStoreEvent> for ToolchainStore {}
-impl ToolchainStore {
-    pub fn init(client: &AnyProtoClient) {
-        client.add_entity_request_handler(Self::handle_activate_toolchain);
-        client.add_entity_request_handler(Self::handle_list_toolchains);
-        client.add_entity_request_handler(Self::handle_active_toolchain);
-        client.add_entity_request_handler(Self::handle_resolve_toolchain);
-    }
-
-    pub fn local(
-        languages: Arc<LanguageRegistry>,
-        worktree_store: Entity<WorktreeStore>,
-        project_environment: Entity<ProjectEnvironment>,
-        manifest_tree: Entity<ManifestTree>,
-        fs: Arc<dyn Fs>,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let entity = cx.new(|_| LocalToolchainStore {
-            languages,
-            worktree_store,
-            project_environment,
-            active_toolchains: Default::default(),
-            manifest_tree,
-            fs,
-        });
-        let _sub = cx.subscribe(&entity, |_, _, e: &ToolchainStoreEvent, cx| {
-            cx.emit(e.clone())
-        });
-        Self {
-            mode: ToolchainStoreInner::Local(entity),
-            user_toolchains: Default::default(),
-            _sub,
-        }
-    }
-
-    pub(super) fn remote(project_id: u64, client: AnyProtoClient, cx: &mut Context<Self>) -> Self {
-        let entity = cx.new(|_| RemoteToolchainStore { client, project_id });
-        let _sub = cx.subscribe(&entity, |_, _, e: &ToolchainStoreEvent, cx| {
-            cx.emit(e.clone())
-        });
-        Self {
-            mode: ToolchainStoreInner::Remote(entity),
-            user_toolchains: Default::default(),
-            _sub,
-        }
-    }
-    pub(crate) fn activate_toolchain(
-        &self,
-        path: ProjectPath,
-        toolchain: Toolchain,
-        cx: &mut App,
-    ) -> Task<Option<()>> {
-        match &self.mode {
-            ToolchainStoreInner::Local(local) => {
-                local.update(cx, |this, cx| this.activate_toolchain(path, toolchain, cx))
-            }
-            ToolchainStoreInner::Remote(remote) => {
-                remote.update(cx, |this, cx| this.activate_toolchain(path, toolchain, cx))
-            }
-        }
-    }
-
-    pub(crate) fn user_toolchains(&self) -> BTreeMap<ToolchainScope, IndexSet<Toolchain>> {
-        self.user_toolchains.clone()
-    }
-    pub(crate) fn add_toolchain(
-        &mut self,
-        toolchain: Toolchain,
-        scope: ToolchainScope,
-        cx: &mut Context<Self>,
-    ) {
-        let did_insert = self
-            .user_toolchains
-            .entry(scope)
-            .or_default()
-            .insert(toolchain);
-        if did_insert {
-            cx.emit(ToolchainStoreEvent::CustomToolchainsModified);
-        }
-    }
-
-    pub(crate) fn remove_toolchain(
-        &mut self,
-        toolchain: Toolchain,
-        scope: ToolchainScope,
-        cx: &mut Context<Self>,
-    ) {
-        let mut did_remove = false;
-        self.user_toolchains
-            .entry(scope)
-            .and_modify(|toolchains| did_remove = toolchains.shift_remove(&toolchain));
-        if did_remove {
-            cx.emit(ToolchainStoreEvent::CustomToolchainsModified);
-        }
-    }
-
-    pub(crate) fn resolve_toolchain(
-        &self,
-        abs_path: PathBuf,
-        language_name: LanguageName,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Toolchain>> {
-        debug_assert!(abs_path.is_absolute());
-        match &self.mode {
-            ToolchainStoreInner::Local(local) => local.update(cx, |this, cx| {
-                this.resolve_toolchain(abs_path, language_name, cx)
-            }),
-            ToolchainStoreInner::Remote(remote) => remote.update(cx, |this, cx| {
-                this.resolve_toolchain(abs_path, language_name, cx)
-            }),
-        }
-    }
-    pub(crate) fn list_toolchains(
-        &self,
-        path: ProjectPath,
-        language_name: LanguageName,
-        cx: &mut Context<Self>,
-    ) -> Task<Option<Toolchains>> {
-        let user_toolchains = self
-            .user_toolchains
-            .iter()
-            .filter(|(scope, _)| {
-                if let ToolchainScope::Subproject(worktree_id, relative_path) = scope {
-                    path.worktree_id == *worktree_id && relative_path.starts_with(&path.path)
-                } else {
-                    true
-                }
-            })
-            .map(|(scope, toolchains)| {
-                (
-                    scope.clone(),
-                    toolchains
-                        .iter()
-                        .filter(|toolchain| toolchain.language_name == language_name)
-                        .cloned()
-                        .collect::<IndexSet<_>>(),
-                )
-            })
-            .collect::<BTreeMap<_, _>>();
-        let task = match &self.mode {
-            ToolchainStoreInner::Local(local) => {
-                local.update(cx, |this, cx| this.list_toolchains(path, language_name, cx))
-            }
-            ToolchainStoreInner::Remote(remote) => {
-                remote.read(cx).list_toolchains(path, language_name, cx)
-            }
-        };
-        cx.spawn(async move |_, _| {
-            let (mut toolchains, root_path) = task.await?;
-            toolchains.toolchains.retain(|toolchain| {
-                !user_toolchains
-                    .values()
-                    .any(|toolchains| toolchains.contains(toolchain))
-            });
-
-            Some(Toolchains {
-                toolchains,
-                root_path,
-                user_toolchains,
-            })
-        })
-    }
-
-    pub(crate) fn active_toolchain(
-        &self,
-        path: ProjectPath,
-        language_name: LanguageName,
-        cx: &App,
-    ) -> Task<Option<Toolchain>> {
-        match &self.mode {
-            ToolchainStoreInner::Local(local) => Task::ready(local.read(cx).active_toolchain(
-                path.worktree_id,
-                &path.path,
-                language_name,
-            )),
-            ToolchainStoreInner::Remote(remote) => {
-                remote.read(cx).active_toolchain(path, language_name, cx)
-            }
-        }
-    }
-    async fn handle_activate_toolchain(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::ActivateToolchain>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::Ack> {
-        this.update(&mut cx, |this, cx| {
-            let language_name = LanguageName::from_proto(envelope.payload.language_name);
-            let Some(toolchain) = envelope.payload.toolchain else {
-                bail!("Missing `toolchain` in payload");
-            };
-            let toolchain = Toolchain {
-                name: toolchain.name.into(),
-                // todo(windows)
-                // Do we need to convert path to native string?
-                path: toolchain.path.into(),
-                as_json: serde_json::Value::from_str(&toolchain.raw_json)?,
-                language_name,
-            };
-            let worktree_id = WorktreeId::from_proto(envelope.payload.worktree_id);
-            let path = if let Some(path) = envelope.payload.path {
-                RelPath::from_proto(&path)?
-            } else {
-                RelPath::empty().into()
-            };
-            Ok(this.activate_toolchain(ProjectPath { worktree_id, path }, toolchain, cx))
-        })??
-        .await;
-        Ok(proto::Ack {})
-    }
-    async fn handle_active_toolchain(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::ActiveToolchain>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::ActiveToolchainResponse> {
-        let path = RelPath::unix(envelope.payload.path.as_deref().unwrap_or(""))?;
-        let toolchain = this
-            .update(&mut cx, |this, cx| {
-                let language_name = LanguageName::from_proto(envelope.payload.language_name);
-                let worktree_id = WorktreeId::from_proto(envelope.payload.worktree_id);
-                this.active_toolchain(
-                    ProjectPath {
-                        worktree_id,
-                        path: Arc::from(path),
-                    },
-                    language_name,
-                    cx,
-                )
-            })?
-            .await;
-
-        Ok(proto::ActiveToolchainResponse {
-            toolchain: toolchain.map(|toolchain| {
-                let path = PathBuf::from(toolchain.path.to_string());
-                proto::Toolchain {
-                    name: toolchain.name.into(),
-                    path: path.to_string_lossy().into_owned(),
-                    raw_json: toolchain.as_json.to_string(),
-                }
-            }),
-        })
-    }
-
-    async fn handle_list_toolchains(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::ListToolchains>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::ListToolchainsResponse> {
-        let toolchains = this
-            .update(&mut cx, |this, cx| {
-                let language_name = LanguageName::from_proto(envelope.payload.language_name);
-                let worktree_id = WorktreeId::from_proto(envelope.payload.worktree_id);
-                let path = RelPath::from_proto(envelope.payload.path.as_deref().unwrap_or(""))?;
-                anyhow::Ok(this.list_toolchains(
-                    ProjectPath { worktree_id, path },
-                    language_name,
-                    cx,
-                ))
-            })??
-            .await;
-        let has_values = toolchains.is_some();
-        let groups = if let Some(Toolchains { toolchains, .. }) = &toolchains {
-            toolchains
-                .groups
-                .iter()
-                .filter_map(|group| {
-                    Some(proto::ToolchainGroup {
-                        start_index: u64::try_from(group.0).ok()?,
-                        name: String::from(group.1.as_ref()),
-                    })
-                })
-                .collect()
-        } else {
-            vec![]
-        };
-        let (toolchains, relative_path) = if let Some(Toolchains {
-            toolchains,
-            root_path: relative_path,
-            ..
-        }) = toolchains
-        {
-            let toolchains = toolchains
-                .toolchains
-                .into_iter()
-                .map(|toolchain| {
-                    let path = PathBuf::from(toolchain.path.to_string());
-                    proto::Toolchain {
-                        name: toolchain.name.to_string(),
-                        path: path.to_string_lossy().into_owned(),
-                        raw_json: toolchain.as_json.to_string(),
-                    }
-                })
-                .collect::<Vec<_>>();
-            (toolchains, relative_path)
-        } else {
-            (vec![], Arc::from(RelPath::empty()))
-        };
-
-        Ok(proto::ListToolchainsResponse {
-            has_values,
-            toolchains,
-            groups,
-            relative_worktree_path: Some(relative_path.to_proto()),
-        })
-    }
-
-    async fn handle_resolve_toolchain(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::ResolveToolchain>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::ResolveToolchainResponse> {
-        let toolchain = this
-            .update(&mut cx, |this, cx| {
-                let language_name = LanguageName::from_proto(envelope.payload.language_name);
-                let path = PathBuf::from(envelope.payload.abs_path);
-                this.resolve_toolchain(path, language_name, cx)
-            })?
-            .await;
-        let response = match toolchain {
-            Ok(toolchain) => {
-                let toolchain = proto::Toolchain {
-                    name: toolchain.name.to_string(),
-                    path: toolchain.path.to_string(),
-                    raw_json: toolchain.as_json.to_string(),
-                };
-                ResolveResponsePayload::Toolchain(toolchain)
-            }
-            Err(e) => ResolveResponsePayload::Error(e.to_string()),
-        };
-        Ok(ResolveToolchainResponse {
-            response: Some(response),
-        })
-    }
-
-    pub fn as_language_toolchain_store(&self) -> Arc<dyn LanguageToolchainStore> {
-        match &self.mode {
-            ToolchainStoreInner::Local(local) => Arc::new(LocalStore(local.downgrade())),
-            ToolchainStoreInner::Remote(remote) => Arc::new(RemoteStore(remote.downgrade())),
-        }
-    }
-    pub fn as_local_store(&self) -> Option<&Entity<LocalToolchainStore>> {
-        match &self.mode {
-            ToolchainStoreInner::Local(local) => Some(local),
-            ToolchainStoreInner::Remote(_) => None,
-        }
-    }
-}
-
-pub struct LocalToolchainStore {
-    languages: Arc<LanguageRegistry>,
-    worktree_store: Entity<WorktreeStore>,
-    project_environment: Entity<ProjectEnvironment>,
-    active_toolchains: BTreeMap<(WorktreeId, LanguageName), BTreeMap<Arc<RelPath>, Toolchain>>,
-    manifest_tree: Entity<ManifestTree>,
-    fs: Arc<dyn Fs>,
-}
-
-#[async_trait(?Send)]
-impl language::LocalLanguageToolchainStore for LocalStore {
-    fn active_toolchain(
-        self: Arc<Self>,
-        worktree_id: WorktreeId,
-        path: &Arc<RelPath>,
-        language_name: LanguageName,
-        cx: &mut AsyncApp,
-    ) -> Option<Toolchain> {
-        self.0
-            .update(cx, |this, _| {
-                this.active_toolchain(worktree_id, path, language_name)
-            })
-            .ok()?
-    }
-}
-
-#[async_trait(?Send)]
-impl language::LanguageToolchainStore for RemoteStore {
-    async fn active_toolchain(
-        self: Arc<Self>,
-        worktree_id: WorktreeId,
-        path: Arc<RelPath>,
-        language_name: LanguageName,
-        cx: &mut AsyncApp,
-    ) -> Option<Toolchain> {
-        self.0
-            .update(cx, |this, cx| {
-                this.active_toolchain(ProjectPath { worktree_id, path }, language_name, cx)
-            })
-            .ok()?
-            .await
-    }
-}
-
-pub struct EmptyToolchainStore;
-impl language::LocalLanguageToolchainStore for EmptyToolchainStore {
-    fn active_toolchain(
-        self: Arc<Self>,
-        _: WorktreeId,
-        _: &Arc<RelPath>,
-        _: LanguageName,
-        _: &mut AsyncApp,
-    ) -> Option<Toolchain> {
-        None
-    }
-}
-pub(crate) struct LocalStore(WeakEntity<LocalToolchainStore>);
-struct RemoteStore(WeakEntity<RemoteToolchainStore>);
-
-#[derive(Clone)]
-pub enum ToolchainStoreEvent {
-    ToolchainActivated,
-    CustomToolchainsModified,
-}
-
-impl EventEmitter<ToolchainStoreEvent> for LocalToolchainStore {}
-
-impl LocalToolchainStore {
-    pub(crate) fn activate_toolchain(
-        &self,
-        path: ProjectPath,
-        toolchain: Toolchain,
-        cx: &mut Context<Self>,
-    ) -> Task<Option<()>> {
-        cx.spawn(async move |this, cx| {
-            this.update(cx, |this, cx| {
-                this.active_toolchains
-                    .entry((path.worktree_id, toolchain.language_name.clone()))
-                    .or_default()
-                    .insert(path.path, toolchain.clone());
-                cx.emit(ToolchainStoreEvent::ToolchainActivated);
-            })
-            .ok();
-            Some(())
-        })
-    }
-    pub(crate) fn list_toolchains(
-        &mut self,
-        path: ProjectPath,
-        language_name: LanguageName,
-        cx: &mut Context<Self>,
-    ) -> Task<Option<(ToolchainList, Arc<RelPath>)>> {
-        let registry = self.languages.clone();
-
-        let manifest_tree = self.manifest_tree.downgrade();
-        let fs = self.fs.clone();
-
-        let environment = self.project_environment.clone();
-        cx.spawn(async move |this, cx| {
-            let language = cx
-                .background_spawn(registry.language_for_name(language_name.as_ref()))
-                .await
-                .ok()?;
-            let toolchains = language.toolchain_lister()?;
-            let manifest_name = toolchains.meta().manifest_name;
-            let (snapshot, worktree) = this
-                .update(cx, |this, cx| {
-                    this.worktree_store
-                        .read(cx)
-                        .worktree_for_id(path.worktree_id, cx)
-                        .map(|worktree| (worktree.read(cx).snapshot(), worktree))
-                })
-                .ok()
-                .flatten()?;
-            let worktree_id = snapshot.id();
-            let worktree_root = snapshot.abs_path().to_path_buf();
-            let delegate =
-                Arc::from(ManifestQueryDelegate::new(snapshot)) as Arc<dyn ManifestDelegate>;
-            let relative_path = manifest_tree
-                .update(cx, |this, cx| {
-                    this.root_for_path(&path, &manifest_name, &delegate, cx)
-                })
-                .ok()?
-                .unwrap_or_else(|| ProjectPath {
-                    path: Arc::from(RelPath::empty()),
-                    worktree_id,
-                });
-            let abs_path = worktree
-                .update(cx, |this, _| this.absolutize(&relative_path.path))
-                .ok()?;
-
-            let project_env = environment
-                .update(cx, |environment, cx| {
-                    environment.local_directory_environment(
-                        &Shell::System,
-                        abs_path.as_path().into(),
-                        cx,
-                    )
-                })
-                .ok()?
-                .await;
-
-            cx.background_spawn(async move {
-                Some((
-                    toolchains
-                        .list(
-                            worktree_root,
-                            relative_path.path.clone(),
-                            project_env,
-                            fs.as_ref(),
-                        )
-                        .await,
-                    relative_path.path,
-                ))
-            })
-            .await
-        })
-    }
-    pub(crate) fn active_toolchain(
-        &self,
-        worktree_id: WorktreeId,
-        relative_path: &Arc<RelPath>,
-        language_name: LanguageName,
-    ) -> Option<Toolchain> {
-        let ancestors = relative_path.ancestors();
-
-        self.active_toolchains
-            .get(&(worktree_id, language_name))
-            .and_then(|paths| {
-                ancestors
-                    .into_iter()
-                    .find_map(|root_path| paths.get(root_path))
-            })
-            .cloned()
-    }
-
-    fn resolve_toolchain(
-        &self,
-        path: PathBuf,
-        language_name: LanguageName,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Toolchain>> {
-        let registry = self.languages.clone();
-        let environment = self.project_environment.clone();
-        let fs = self.fs.clone();
-        cx.spawn(async move |_, cx| {
-            let language = cx
-                .background_spawn(registry.language_for_name(&language_name.0))
-                .await
-                .with_context(|| format!("Language {} not found", language_name.0))?;
-            let toolchain_lister = language.toolchain_lister().with_context(|| {
-                format!("Language {} does not support toolchains", language_name.0)
-            })?;
-
-            let project_env = environment
-                .update(cx, |environment, cx| {
-                    environment.local_directory_environment(
-                        &Shell::System,
-                        path.as_path().into(),
-                        cx,
-                    )
-                })?
-                .await;
-            cx.background_spawn(async move {
-                toolchain_lister
-                    .resolve(path, project_env, fs.as_ref())
-                    .await
-            })
-            .await
-        })
-    }
-}
-
-impl EventEmitter<ToolchainStoreEvent> for RemoteToolchainStore {}
-struct RemoteToolchainStore {
-    client: AnyProtoClient,
-    project_id: u64,
-}
-
-impl RemoteToolchainStore {
-    pub(crate) fn activate_toolchain(
-        &self,
-        project_path: ProjectPath,
-        toolchain: Toolchain,
-        cx: &mut Context<Self>,
-    ) -> Task<Option<()>> {
-        let project_id = self.project_id;
-        let client = self.client.clone();
-        cx.spawn(async move |this, cx| {
-            let did_activate = cx
-                .background_spawn(async move {
-                    let path = PathBuf::from(toolchain.path.to_string());
-                    let _ = client
-                        .request(proto::ActivateToolchain {
-                            project_id,
-                            worktree_id: project_path.worktree_id.to_proto(),
-                            language_name: toolchain.language_name.into(),
-                            toolchain: Some(proto::Toolchain {
-                                name: toolchain.name.into(),
-                                path: path.to_string_lossy().into_owned(),
-                                raw_json: toolchain.as_json.to_string(),
-                            }),
-                            path: Some(project_path.path.to_proto()),
-                        })
-                        .await
-                        .log_err()?;
-                    Some(())
-                })
-                .await;
-            did_activate.and_then(|_| {
-                this.update(cx, |_, cx| {
-                    cx.emit(ToolchainStoreEvent::ToolchainActivated);
-                })
-                .ok()
-            })
-        })
-    }
-
-    pub(crate) fn list_toolchains(
-        &self,
-        path: ProjectPath,
-        language_name: LanguageName,
-        cx: &App,
-    ) -> Task<Option<(ToolchainList, Arc<RelPath>)>> {
-        let project_id = self.project_id;
-        let client = self.client.clone();
-        cx.background_spawn(async move {
-            let response = client
-                .request(proto::ListToolchains {
-                    project_id,
-                    worktree_id: path.worktree_id.to_proto(),
-                    language_name: language_name.clone().into(),
-                    path: Some(path.path.to_proto()),
-                })
-                .await
-                .log_err()?;
-            if !response.has_values {
-                return None;
-            }
-            let toolchains = response
-                .toolchains
-                .into_iter()
-                .filter_map(|toolchain| {
-                    Some(Toolchain {
-                        language_name: language_name.clone(),
-                        name: toolchain.name.into(),
-                        path: toolchain.path.into(),
-                        as_json: serde_json::Value::from_str(&toolchain.raw_json).ok()?,
-                    })
-                })
-                .collect();
-            let groups = response
-                .groups
-                .into_iter()
-                .filter_map(|group| {
-                    Some((usize::try_from(group.start_index).ok()?, group.name.into()))
-                })
-                .collect();
-            let relative_path = RelPath::from_proto(
-                response
-                    .relative_worktree_path
-                    .as_deref()
-                    .unwrap_or_default(),
-            )
-            .log_err()?;
-            Some((
-                ToolchainList {
-                    toolchains,
-                    default: None,
-                    groups,
-                },
-                relative_path,
-            ))
-        })
-    }
-    pub(crate) fn active_toolchain(
-        &self,
-        path: ProjectPath,
-        language_name: LanguageName,
-        cx: &App,
-    ) -> Task<Option<Toolchain>> {
-        let project_id = self.project_id;
-        let client = self.client.clone();
-        cx.background_spawn(async move {
-            let response = client
-                .request(proto::ActiveToolchain {
-                    project_id,
-                    worktree_id: path.worktree_id.to_proto(),
-                    language_name: language_name.clone().into(),
-                    path: Some(path.path.to_proto()),
-                })
-                .await
-                .log_err()?;
-
-            response.toolchain.and_then(|toolchain| {
-                Some(Toolchain {
-                    language_name: language_name.clone(),
-                    name: toolchain.name.into(),
-                    path: toolchain.path.into(),
-                    as_json: serde_json::Value::from_str(&toolchain.raw_json).ok()?,
-                })
-            })
-        })
-    }
-
-    fn resolve_toolchain(
-        &self,
-        abs_path: PathBuf,
-        language_name: LanguageName,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Toolchain>> {
-        let project_id = self.project_id;
-        let client = self.client.clone();
-        cx.background_spawn(async move {
-            let response: proto::ResolveToolchainResponse = client
-                .request(proto::ResolveToolchain {
-                    project_id,
-                    language_name: language_name.clone().into(),
-                    abs_path: abs_path.to_string_lossy().into_owned(),
-                })
-                .await?;
-
-            let response = response
-                .response
-                .context("Failed to resolve toolchain via RPC")?;
-            use proto::resolve_toolchain_response::Response;
-            match response {
-                Response::Toolchain(toolchain) => Ok(Toolchain {
-                    language_name: language_name.clone(),
-                    name: toolchain.name.into(),
-                    path: toolchain.path.into(),
-                    as_json: serde_json::Value::from_str(&toolchain.raw_json)
-                        .context("Deserializing ResolveToolchain LSP response")?,
-                }),
-                Response::Error(error) => {
-                    anyhow::bail!("{error}");
-                }
-            }
-        })
-    }
-}
diff --git a/crates/project/src/worktree_store.rs b/crates/project/src/worktree_store.rs
deleted file mode 100644
index 7c3eabd609..0000000000
--- a/crates/project/src/worktree_store.rs
+++ /dev/null
@@ -1,1212 +0,0 @@
-use std::{
-    io::{BufRead, BufReader},
-    path::{Path, PathBuf},
-    pin::pin,
-    sync::{Arc, atomic::AtomicUsize},
-};
-
-use anyhow::{Context as _, Result, anyhow, bail};
-use collections::{HashMap, HashSet};
-use fs::{Fs, copy_recursive};
-use futures::{FutureExt, SinkExt, future::Shared};
-use gpui::{
-    App, AppContext as _, AsyncApp, Context, Entity, EntityId, EventEmitter, Task, WeakEntity,
-};
-use postage::oneshot;
-use rpc::{
-    AnyProtoClient, ErrorExt, TypedEnvelope,
-    proto::{self, REMOTE_SERVER_PROJECT_ID},
-};
-use smol::{
-    channel::{Receiver, Sender},
-    stream::StreamExt,
-};
-use text::ReplicaId;
-use util::{
-    ResultExt,
-    paths::{PathStyle, RemotePathBuf, SanitizedPath},
-    rel_path::RelPath,
-};
-use worktree::{
-    CreatedEntry, Entry, ProjectEntryId, UpdatedEntriesSet, UpdatedGitRepositoriesSet, Worktree,
-    WorktreeId, WorktreeSettings,
-};
-
-use crate::{ProjectPath, search::SearchQuery};
-
-struct MatchingEntry {
-    worktree_root: Arc<Path>,
-    path: ProjectPath,
-    respond: oneshot::Sender<ProjectPath>,
-}
-
-enum WorktreeStoreState {
-    Local {
-        fs: Arc<dyn Fs>,
-    },
-    Remote {
-        upstream_client: AnyProtoClient,
-        upstream_project_id: u64,
-        path_style: PathStyle,
-    },
-}
-
-pub struct WorktreeStore {
-    next_entry_id: Arc<AtomicUsize>,
-    downstream_client: Option<(AnyProtoClient, u64)>,
-    retain_worktrees: bool,
-    worktrees: Vec<WorktreeHandle>,
-    worktrees_reordered: bool,
-    scanning_enabled: bool,
-    #[allow(clippy::type_complexity)]
-    loading_worktrees:
-        HashMap<Arc<SanitizedPath>, Shared<Task<Result<Entity<Worktree>, Arc<anyhow::Error>>>>>,
-    state: WorktreeStoreState,
-}
-
-#[derive(Debug)]
-pub enum WorktreeStoreEvent {
-    WorktreeAdded(Entity<Worktree>),
-    WorktreeRemoved(EntityId, WorktreeId),
-    WorktreeReleased(EntityId, WorktreeId),
-    WorktreeOrderChanged,
-    WorktreeUpdateSent(Entity<Worktree>),
-    WorktreeUpdatedEntries(WorktreeId, UpdatedEntriesSet),
-    WorktreeUpdatedGitRepositories(WorktreeId, UpdatedGitRepositoriesSet),
-    WorktreeDeletedEntry(WorktreeId, ProjectEntryId),
-}
-
-impl EventEmitter<WorktreeStoreEvent> for WorktreeStore {}
-
-impl WorktreeStore {
-    pub fn init(client: &AnyProtoClient) {
-        client.add_entity_request_handler(Self::handle_create_project_entry);
-        client.add_entity_request_handler(Self::handle_copy_project_entry);
-        client.add_entity_request_handler(Self::handle_delete_project_entry);
-        client.add_entity_request_handler(Self::handle_expand_project_entry);
-        client.add_entity_request_handler(Self::handle_expand_all_for_project_entry);
-    }
-
-    pub fn local(retain_worktrees: bool, fs: Arc<dyn Fs>) -> Self {
-        Self {
-            next_entry_id: Default::default(),
-            loading_worktrees: Default::default(),
-            downstream_client: None,
-            worktrees: Vec::new(),
-            worktrees_reordered: false,
-            scanning_enabled: true,
-            retain_worktrees,
-            state: WorktreeStoreState::Local { fs },
-        }
-    }
-
-    pub fn remote(
-        retain_worktrees: bool,
-        upstream_client: AnyProtoClient,
-        upstream_project_id: u64,
-        path_style: PathStyle,
-    ) -> Self {
-        Self {
-            next_entry_id: Default::default(),
-            loading_worktrees: Default::default(),
-            downstream_client: None,
-            worktrees: Vec::new(),
-            worktrees_reordered: false,
-            scanning_enabled: true,
-            retain_worktrees,
-            state: WorktreeStoreState::Remote {
-                upstream_client,
-                upstream_project_id,
-                path_style,
-            },
-        }
-    }
-
-    pub fn disable_scanner(&mut self) {
-        self.scanning_enabled = false;
-    }
-
-    /// Iterates through all worktrees, including ones that don't appear in the project panel
-    pub fn worktrees(&self) -> impl '_ + DoubleEndedIterator<Item = Entity<Worktree>> {
-        self.worktrees
-            .iter()
-            .filter_map(move |worktree| worktree.upgrade())
-    }
-
-    /// Iterates through all user-visible worktrees, the ones that appear in the project panel.
-    pub fn visible_worktrees<'a>(
-        &'a self,
-        cx: &'a App,
-    ) -> impl 'a + DoubleEndedIterator<Item = Entity<Worktree>> {
-        self.worktrees()
-            .filter(|worktree| worktree.read(cx).is_visible())
-    }
-
-    /// Iterates through all user-visible worktrees (directories and files that appear in the project panel) and other, invisible single files that could appear e.g. due to drag and drop.
-    pub fn visible_worktrees_and_single_files<'a>(
-        &'a self,
-        cx: &'a App,
-    ) -> impl 'a + DoubleEndedIterator<Item = Entity<Worktree>> {
-        self.worktrees()
-            .filter(|worktree| worktree.read(cx).is_visible() || worktree.read(cx).is_single_file())
-    }
-
-    pub fn worktree_for_id(&self, id: WorktreeId, cx: &App) -> Option<Entity<Worktree>> {
-        self.worktrees()
-            .find(|worktree| worktree.read(cx).id() == id)
-    }
-
-    pub fn worktree_for_entry(
-        &self,
-        entry_id: ProjectEntryId,
-        cx: &App,
-    ) -> Option<Entity<Worktree>> {
-        self.worktrees()
-            .find(|worktree| worktree.read(cx).contains_entry(entry_id))
-    }
-
-    pub fn find_worktree(
-        &self,
-        abs_path: impl AsRef<Path>,
-        cx: &App,
-    ) -> Option<(Entity<Worktree>, Arc<RelPath>)> {
-        let abs_path = SanitizedPath::new(abs_path.as_ref());
-        for tree in self.worktrees() {
-            let path_style = tree.read(cx).path_style();
-            if let Ok(relative_path) = abs_path.as_ref().strip_prefix(tree.read(cx).abs_path())
-                && let Ok(relative_path) = RelPath::new(relative_path, path_style)
-            {
-                return Some((tree.clone(), relative_path.into_arc()));
-            }
-        }
-        None
-    }
-
-    pub fn absolutize(&self, project_path: &ProjectPath, cx: &App) -> Option<PathBuf> {
-        let worktree = self.worktree_for_id(project_path.worktree_id, cx)?;
-        Some(worktree.read(cx).absolutize(&project_path.path))
-    }
-
-    pub fn path_style(&self) -> PathStyle {
-        match &self.state {
-            WorktreeStoreState::Local { .. } => PathStyle::local(),
-            WorktreeStoreState::Remote { path_style, .. } => *path_style,
-        }
-    }
-
-    pub fn find_or_create_worktree(
-        &mut self,
-        abs_path: impl AsRef<Path>,
-        visible: bool,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<(Entity<Worktree>, Arc<RelPath>)>> {
-        let abs_path = abs_path.as_ref();
-        if let Some((tree, relative_path)) = self.find_worktree(abs_path, cx) {
-            Task::ready(Ok((tree, relative_path)))
-        } else {
-            let worktree = self.create_worktree(abs_path, visible, cx);
-            cx.background_spawn(async move { Ok((worktree.await?, RelPath::empty().into())) })
-        }
-    }
-
-    pub fn entry_for_id<'a>(&'a self, entry_id: ProjectEntryId, cx: &'a App) -> Option<&'a Entry> {
-        self.worktrees()
-            .find_map(|worktree| worktree.read(cx).entry_for_id(entry_id))
-    }
-
-    pub fn worktree_and_entry_for_id<'a>(
-        &'a self,
-        entry_id: ProjectEntryId,
-        cx: &'a App,
-    ) -> Option<(Entity<Worktree>, &'a Entry)> {
-        self.worktrees().find_map(|worktree| {
-            worktree
-                .read(cx)
-                .entry_for_id(entry_id)
-                .map(|e| (worktree.clone(), e))
-        })
-    }
-
-    pub fn entry_for_path<'a>(&'a self, path: &ProjectPath, cx: &'a App) -> Option<&'a Entry> {
-        self.worktree_for_id(path.worktree_id, cx)?
-            .read(cx)
-            .entry_for_path(&path.path)
-    }
-
-    pub fn copy_entry(
-        &mut self,
-        entry_id: ProjectEntryId,
-        new_project_path: ProjectPath,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Option<Entry>>> {
-        let Some(old_worktree) = self.worktree_for_entry(entry_id, cx) else {
-            return Task::ready(Err(anyhow!("no such worktree")));
-        };
-        let Some(old_entry) = old_worktree.read(cx).entry_for_id(entry_id) else {
-            return Task::ready(Err(anyhow!("no such entry")));
-        };
-        let Some(new_worktree) = self.worktree_for_id(new_project_path.worktree_id, cx) else {
-            return Task::ready(Err(anyhow!("no such worktree")));
-        };
-
-        match &self.state {
-            WorktreeStoreState::Local { fs } => {
-                let old_abs_path = old_worktree.read(cx).absolutize(&old_entry.path);
-                let new_abs_path = new_worktree.read(cx).absolutize(&new_project_path.path);
-                let fs = fs.clone();
-                let copy = cx.background_spawn(async move {
-                    copy_recursive(
-                        fs.as_ref(),
-                        &old_abs_path,
-                        &new_abs_path,
-                        Default::default(),
-                    )
-                    .await
-                });
-
-                cx.spawn(async move |_, cx| {
-                    copy.await?;
-                    new_worktree
-                        .update(cx, |this, cx| {
-                            this.as_local_mut().unwrap().refresh_entry(
-                                new_project_path.path,
-                                None,
-                                cx,
-                            )
-                        })?
-                        .await
-                })
-            }
-            WorktreeStoreState::Remote {
-                upstream_client,
-                upstream_project_id,
-                ..
-            } => {
-                let response = upstream_client.request(proto::CopyProjectEntry {
-                    project_id: *upstream_project_id,
-                    entry_id: entry_id.to_proto(),
-                    new_path: new_project_path.path.to_proto(),
-                    new_worktree_id: new_project_path.worktree_id.to_proto(),
-                });
-                cx.spawn(async move |_, cx| {
-                    let response = response.await?;
-                    match response.entry {
-                        Some(entry) => new_worktree
-                            .update(cx, |worktree, cx| {
-                                worktree.as_remote_mut().unwrap().insert_entry(
-                                    entry,
-                                    response.worktree_scan_id as usize,
-                                    cx,
-                                )
-                            })?
-                            .await
-                            .map(Some),
-                        None => Ok(None),
-                    }
-                })
-            }
-        }
-    }
-
-    pub fn rename_entry(
-        &mut self,
-        entry_id: ProjectEntryId,
-        new_project_path: ProjectPath,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<CreatedEntry>> {
-        let Some(old_worktree) = self.worktree_for_entry(entry_id, cx) else {
-            return Task::ready(Err(anyhow!("no such worktree")));
-        };
-        let Some(old_entry) = old_worktree.read(cx).entry_for_id(entry_id).cloned() else {
-            return Task::ready(Err(anyhow!("no such entry")));
-        };
-        let Some(new_worktree) = self.worktree_for_id(new_project_path.worktree_id, cx) else {
-            return Task::ready(Err(anyhow!("no such worktree")));
-        };
-
-        match &self.state {
-            WorktreeStoreState::Local { fs } => {
-                let abs_old_path = old_worktree.read(cx).absolutize(&old_entry.path);
-                let new_worktree_ref = new_worktree.read(cx);
-                let is_root_entry = new_worktree_ref
-                    .root_entry()
-                    .is_some_and(|e| e.id == entry_id);
-                let abs_new_path = if is_root_entry {
-                    let abs_path = new_worktree_ref.abs_path();
-                    let Some(root_parent_path) = abs_path.parent() else {
-                        return Task::ready(Err(anyhow!("no parent for path {:?}", abs_path)));
-                    };
-                    root_parent_path.join(new_project_path.path.as_std_path())
-                } else {
-                    new_worktree_ref.absolutize(&new_project_path.path)
-                };
-
-                let fs = fs.clone();
-                let case_sensitive = new_worktree
-                    .read(cx)
-                    .as_local()
-                    .unwrap()
-                    .fs_is_case_sensitive();
-
-                let do_rename =
-                    async move |fs: &dyn Fs, old_path: &Path, new_path: &Path, overwrite| {
-                        fs.rename(
-                            &old_path,
-                            &new_path,
-                            fs::RenameOptions {
-                                overwrite,
-                                ..fs::RenameOptions::default()
-                            },
-                        )
-                        .await
-                        .with_context(|| format!("renaming {old_path:?} into {new_path:?}"))
-                    };
-
-                let rename = cx.background_spawn({
-                    let abs_new_path = abs_new_path.clone();
-                    async move {
-                        // If we're on a case-insensitive FS and we're doing a case-only rename (i.e. `foobar` to `FOOBAR`)
-                        // we want to overwrite, because otherwise we run into a file-already-exists error.
-                        let overwrite = !case_sensitive
-                            && abs_old_path != abs_new_path
-                            && abs_old_path.to_str().map(|p| p.to_lowercase())
-                                == abs_new_path.to_str().map(|p| p.to_lowercase());
-
-                        // The directory we're renaming into might not exist yet
-                        if let Err(e) =
-                            do_rename(fs.as_ref(), &abs_old_path, &abs_new_path, overwrite).await
-                        {
-                            if let Some(err) = e.downcast_ref::<std::io::Error>()
-                                && err.kind() == std::io::ErrorKind::NotFound
-                            {
-                                if let Some(parent) = abs_new_path.parent() {
-                                    fs.create_dir(parent).await.with_context(|| {
-                                        format!("creating parent directory {parent:?}")
-                                    })?;
-                                    return do_rename(
-                                        fs.as_ref(),
-                                        &abs_old_path,
-                                        &abs_new_path,
-                                        overwrite,
-                                    )
-                                    .await;
-                                }
-                            }
-                            return Err(e);
-                        }
-                        Ok(())
-                    }
-                });
-
-                cx.spawn(async move |_, cx| {
-                    rename.await?;
-                    Ok(new_worktree
-                        .update(cx, |this, cx| {
-                            let local = this.as_local_mut().unwrap();
-                            if is_root_entry {
-                                // We eagerly update `abs_path` and refresh this worktree.
-                                // Otherwise, the FS watcher would do it on the `RootUpdated` event,
-                                // but with a noticeable delay, so we handle it proactively.
-                                local.update_abs_path_and_refresh(
-                                    SanitizedPath::new_arc(&abs_new_path),
-                                    cx,
-                                );
-                                Task::ready(Ok(this.root_entry().cloned()))
-                            } else {
-                                // First refresh the parent directory (in case it was newly created)
-                                if let Some(parent) = new_project_path.path.parent() {
-                                    let _ = local.refresh_entries_for_paths(vec![parent.into()]);
-                                }
-                                // Then refresh the new path
-                                local.refresh_entry(
-                                    new_project_path.path.clone(),
-                                    Some(old_entry.path),
-                                    cx,
-                                )
-                            }
-                        })?
-                        .await?
-                        .map(CreatedEntry::Included)
-                        .unwrap_or_else(|| CreatedEntry::Excluded {
-                            abs_path: abs_new_path,
-                        }))
-                })
-            }
-            WorktreeStoreState::Remote {
-                upstream_client,
-                upstream_project_id,
-                ..
-            } => {
-                let response = upstream_client.request(proto::RenameProjectEntry {
-                    project_id: *upstream_project_id,
-                    entry_id: entry_id.to_proto(),
-                    new_path: new_project_path.path.to_proto(),
-                    new_worktree_id: new_project_path.worktree_id.to_proto(),
-                });
-                cx.spawn(async move |_, cx| {
-                    let response = response.await?;
-                    match response.entry {
-                        Some(entry) => new_worktree
-                            .update(cx, |worktree, cx| {
-                                worktree.as_remote_mut().unwrap().insert_entry(
-                                    entry,
-                                    response.worktree_scan_id as usize,
-                                    cx,
-                                )
-                            })?
-                            .await
-                            .map(CreatedEntry::Included),
-                        None => {
-                            let abs_path = new_worktree.read_with(cx, |worktree, _| {
-                                worktree.absolutize(&new_project_path.path)
-                            })?;
-                            Ok(CreatedEntry::Excluded { abs_path })
-                        }
-                    }
-                })
-            }
-        }
-    }
-    pub fn create_worktree(
-        &mut self,
-        abs_path: impl AsRef<Path>,
-        visible: bool,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Entity<Worktree>>> {
-        let abs_path: Arc<SanitizedPath> = SanitizedPath::new_arc(&abs_path);
-        if !self.loading_worktrees.contains_key(&abs_path) {
-            let task = match &self.state {
-                WorktreeStoreState::Remote {
-                    upstream_client,
-                    path_style,
-                    ..
-                } => {
-                    if upstream_client.is_via_collab() {
-                        Task::ready(Err(Arc::new(anyhow!("cannot create worktrees via collab"))))
-                    } else {
-                        let abs_path = RemotePathBuf::new(abs_path.to_string(), *path_style);
-                        self.create_remote_worktree(upstream_client.clone(), abs_path, visible, cx)
-                    }
-                }
-                WorktreeStoreState::Local { fs } => {
-                    self.create_local_worktree(fs.clone(), abs_path.clone(), visible, cx)
-                }
-            };
-
-            self.loading_worktrees
-                .insert(abs_path.clone(), task.shared());
-        }
-        let task = self.loading_worktrees.get(&abs_path).unwrap().clone();
-        cx.spawn(async move |this, cx| {
-            let result = task.await;
-            this.update(cx, |this, _| this.loading_worktrees.remove(&abs_path))
-                .ok();
-            match result {
-                Ok(worktree) => Ok(worktree),
-                Err(err) => Err((*err).cloned()),
-            }
-        })
-    }
-
-    fn create_remote_worktree(
-        &mut self,
-        client: AnyProtoClient,
-        abs_path: RemotePathBuf,
-        visible: bool,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Entity<Worktree>, Arc<anyhow::Error>>> {
-        let path_style = abs_path.path_style();
-        let mut abs_path = abs_path.to_string();
-        // If we start with `/~` that means the ssh path was something like `ssh://user@host/~/home-dir-folder/`
-        // in which case want to strip the leading the `/`.
-        // On the host-side, the `~` will get expanded.
-        // That's what git does too: https://github.com/libgit2/libgit2/issues/3345#issuecomment-127050850
-        if abs_path.starts_with("/~") {
-            abs_path = abs_path[1..].to_string();
-        }
-        if abs_path.is_empty() {
-            abs_path = "~/".to_string();
-        }
-
-        cx.spawn(async move |this, cx| {
-            let this = this.upgrade().context("Dropped worktree store")?;
-
-            let path = RemotePathBuf::new(abs_path, path_style);
-            let response = client
-                .request(proto::AddWorktree {
-                    project_id: REMOTE_SERVER_PROJECT_ID,
-                    path: path.to_proto(),
-                    visible,
-                })
-                .await?;
-
-            if let Some(existing_worktree) = this.read_with(cx, |this, cx| {
-                this.worktree_for_id(WorktreeId::from_proto(response.worktree_id), cx)
-            })? {
-                return Ok(existing_worktree);
-            }
-
-            let root_path_buf = PathBuf::from(response.canonicalized_path.clone());
-            let root_name = root_path_buf
-                .file_name()
-                .map(|n| n.to_string_lossy().into_owned())
-                .unwrap_or(root_path_buf.to_string_lossy().into_owned());
-
-            let worktree = cx.update(|cx| {
-                Worktree::remote(
-                    REMOTE_SERVER_PROJECT_ID,
-                    ReplicaId::REMOTE_SERVER,
-                    proto::WorktreeMetadata {
-                        id: response.worktree_id,
-                        root_name,
-                        visible,
-                        abs_path: response.canonicalized_path,
-                    },
-                    client,
-                    path_style,
-                    cx,
-                )
-            })?;
-
-            this.update(cx, |this, cx| {
-                this.add(&worktree, cx);
-            })?;
-            Ok(worktree)
-        })
-    }
-
-    fn create_local_worktree(
-        &mut self,
-        fs: Arc<dyn Fs>,
-        abs_path: Arc<SanitizedPath>,
-        visible: bool,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<Entity<Worktree>, Arc<anyhow::Error>>> {
-        let next_entry_id = self.next_entry_id.clone();
-        let scanning_enabled = self.scanning_enabled;
-
-        cx.spawn(async move |this, cx| {
-            let worktree = Worktree::local(
-                SanitizedPath::cast_arc(abs_path.clone()),
-                visible,
-                fs,
-                next_entry_id,
-                scanning_enabled,
-                cx,
-            )
-            .await;
-
-            let worktree = worktree?;
-
-            this.update(cx, |this, cx| this.add(&worktree, cx))?;
-
-            if visible {
-                cx.update(|cx| {
-                    cx.add_recent_document(abs_path.as_path());
-                })
-                .log_err();
-            }
-
-            Ok(worktree)
-        })
-    }
-
-    pub fn add(&mut self, worktree: &Entity<Worktree>, cx: &mut Context<Self>) {
-        let worktree_id = worktree.read(cx).id();
-        debug_assert!(self.worktrees().all(|w| w.read(cx).id() != worktree_id));
-
-        let push_strong_handle = self.retain_worktrees || worktree.read(cx).is_visible();
-        let handle = if push_strong_handle {
-            WorktreeHandle::Strong(worktree.clone())
-        } else {
-            WorktreeHandle::Weak(worktree.downgrade())
-        };
-        if self.worktrees_reordered {
-            self.worktrees.push(handle);
-        } else {
-            let i = match self
-                .worktrees
-                .binary_search_by_key(&Some(worktree.read(cx).abs_path()), |other| {
-                    other.upgrade().map(|worktree| worktree.read(cx).abs_path())
-                }) {
-                Ok(i) | Err(i) => i,
-            };
-            self.worktrees.insert(i, handle);
-        }
-
-        cx.emit(WorktreeStoreEvent::WorktreeAdded(worktree.clone()));
-        self.send_project_updates(cx);
-
-        let handle_id = worktree.entity_id();
-        cx.subscribe(worktree, |_, worktree, event, cx| {
-            let worktree_id = worktree.read(cx).id();
-            match event {
-                worktree::Event::UpdatedEntries(changes) => {
-                    cx.emit(WorktreeStoreEvent::WorktreeUpdatedEntries(
-                        worktree_id,
-                        changes.clone(),
-                    ));
-                }
-                worktree::Event::UpdatedGitRepositories(set) => {
-                    cx.emit(WorktreeStoreEvent::WorktreeUpdatedGitRepositories(
-                        worktree_id,
-                        set.clone(),
-                    ));
-                }
-                worktree::Event::DeletedEntry(id) => {
-                    cx.emit(WorktreeStoreEvent::WorktreeDeletedEntry(worktree_id, *id))
-                }
-            }
-        })
-        .detach();
-        cx.observe_release(worktree, move |this, worktree, cx| {
-            cx.emit(WorktreeStoreEvent::WorktreeReleased(
-                handle_id,
-                worktree.id(),
-            ));
-            cx.emit(WorktreeStoreEvent::WorktreeRemoved(
-                handle_id,
-                worktree.id(),
-            ));
-            this.send_project_updates(cx);
-        })
-        .detach();
-    }
-
-    pub fn remove_worktree(&mut self, id_to_remove: WorktreeId, cx: &mut Context<Self>) {
-        self.worktrees.retain(|worktree| {
-            if let Some(worktree) = worktree.upgrade() {
-                if worktree.read(cx).id() == id_to_remove {
-                    cx.emit(WorktreeStoreEvent::WorktreeRemoved(
-                        worktree.entity_id(),
-                        id_to_remove,
-                    ));
-                    false
-                } else {
-                    true
-                }
-            } else {
-                false
-            }
-        });
-        self.send_project_updates(cx);
-    }
-
-    pub fn set_worktrees_reordered(&mut self, worktrees_reordered: bool) {
-        self.worktrees_reordered = worktrees_reordered;
-    }
-
-    fn upstream_client(&self) -> Option<(AnyProtoClient, u64)> {
-        match &self.state {
-            WorktreeStoreState::Remote {
-                upstream_client,
-                upstream_project_id,
-                ..
-            } => Some((upstream_client.clone(), *upstream_project_id)),
-            WorktreeStoreState::Local { .. } => None,
-        }
-    }
-
-    pub fn set_worktrees_from_proto(
-        &mut self,
-        worktrees: Vec<proto::WorktreeMetadata>,
-        replica_id: ReplicaId,
-        cx: &mut Context<Self>,
-    ) -> Result<()> {
-        let mut old_worktrees_by_id = self
-            .worktrees
-            .drain(..)
-            .filter_map(|worktree| {
-                let worktree = worktree.upgrade()?;
-                Some((worktree.read(cx).id(), worktree))
-            })
-            .collect::<HashMap<_, _>>();
-
-        let (client, project_id) = self.upstream_client().context("invalid project")?;
-
-        for worktree in worktrees {
-            if let Some(old_worktree) =
-                old_worktrees_by_id.remove(&WorktreeId::from_proto(worktree.id))
-            {
-                let push_strong_handle =
-                    self.retain_worktrees || old_worktree.read(cx).is_visible();
-                let handle = if push_strong_handle {
-                    WorktreeHandle::Strong(old_worktree.clone())
-                } else {
-                    WorktreeHandle::Weak(old_worktree.downgrade())
-                };
-                self.worktrees.push(handle);
-            } else {
-                self.add(
-                    &Worktree::remote(
-                        project_id,
-                        replica_id,
-                        worktree,
-                        client.clone(),
-                        self.path_style(),
-                        cx,
-                    ),
-                    cx,
-                );
-            }
-        }
-        self.send_project_updates(cx);
-
-        Ok(())
-    }
-
-    pub fn move_worktree(
-        &mut self,
-        source: WorktreeId,
-        destination: WorktreeId,
-        cx: &mut Context<Self>,
-    ) -> Result<()> {
-        if source == destination {
-            return Ok(());
-        }
-
-        let mut source_index = None;
-        let mut destination_index = None;
-        for (i, worktree) in self.worktrees.iter().enumerate() {
-            if let Some(worktree) = worktree.upgrade() {
-                let worktree_id = worktree.read(cx).id();
-                if worktree_id == source {
-                    source_index = Some(i);
-                    if destination_index.is_some() {
-                        break;
-                    }
-                } else if worktree_id == destination {
-                    destination_index = Some(i);
-                    if source_index.is_some() {
-                        break;
-                    }
-                }
-            }
-        }
-
-        let source_index =
-            source_index.with_context(|| format!("Missing worktree for id {source}"))?;
-        let destination_index =
-            destination_index.with_context(|| format!("Missing worktree for id {destination}"))?;
-
-        if source_index == destination_index {
-            return Ok(());
-        }
-
-        let worktree_to_move = self.worktrees.remove(source_index);
-        self.worktrees.insert(destination_index, worktree_to_move);
-        self.worktrees_reordered = true;
-        cx.emit(WorktreeStoreEvent::WorktreeOrderChanged);
-        cx.notify();
-        Ok(())
-    }
-
-    pub fn disconnected_from_host(&mut self, cx: &mut App) {
-        for worktree in &self.worktrees {
-            if let Some(worktree) = worktree.upgrade() {
-                worktree.update(cx, |worktree, _| {
-                    if let Some(worktree) = worktree.as_remote_mut() {
-                        worktree.disconnected_from_host();
-                    }
-                });
-            }
-        }
-    }
-
-    pub fn send_project_updates(&mut self, cx: &mut Context<Self>) {
-        let Some((downstream_client, project_id)) = self.downstream_client.clone() else {
-            return;
-        };
-
-        let update = proto::UpdateProject {
-            project_id,
-            worktrees: self.worktree_metadata_protos(cx),
-        };
-
-        // collab has bad concurrency guarantees, so we send requests in serial.
-        let update_project = if downstream_client.is_via_collab() {
-            Some(downstream_client.request(update))
-        } else {
-            downstream_client.send(update).log_err();
-            None
-        };
-        cx.spawn(async move |this, cx| {
-            if let Some(update_project) = update_project {
-                update_project.await?;
-            }
-
-            this.update(cx, |this, cx| {
-                let worktrees = this.worktrees().collect::<Vec<_>>();
-
-                for worktree in worktrees {
-                    worktree.update(cx, |worktree, cx| {
-                        let client = downstream_client.clone();
-                        worktree.observe_updates(project_id, cx, {
-                            move |update| {
-                                let client = client.clone();
-                                async move {
-                                    if client.is_via_collab() {
-                                        client
-                                            .request(update)
-                                            .map(|result| result.log_err().is_some())
-                                            .await
-                                    } else {
-                                        client.send(update).log_err().is_some()
-                                    }
-                                }
-                            }
-                        });
-                    });
-
-                    cx.emit(WorktreeStoreEvent::WorktreeUpdateSent(worktree.clone()))
-                }
-
-                anyhow::Ok(())
-            })
-        })
-        .detach_and_log_err(cx);
-    }
-
-    pub fn worktree_metadata_protos(&self, cx: &App) -> Vec<proto::WorktreeMetadata> {
-        self.worktrees()
-            .map(|worktree| {
-                let worktree = worktree.read(cx);
-                proto::WorktreeMetadata {
-                    id: worktree.id().to_proto(),
-                    root_name: worktree.root_name_str().to_owned(),
-                    visible: worktree.is_visible(),
-                    abs_path: worktree.abs_path().to_string_lossy().into_owned(),
-                }
-            })
-            .collect()
-    }
-
-    pub fn shared(
-        &mut self,
-        remote_id: u64,
-        downstream_client: AnyProtoClient,
-        cx: &mut Context<Self>,
-    ) {
-        self.retain_worktrees = true;
-        self.downstream_client = Some((downstream_client, remote_id));
-
-        // When shared, retain all worktrees
-        for worktree_handle in self.worktrees.iter_mut() {
-            match worktree_handle {
-                WorktreeHandle::Strong(_) => {}
-                WorktreeHandle::Weak(worktree) => {
-                    if let Some(worktree) = worktree.upgrade() {
-                        *worktree_handle = WorktreeHandle::Strong(worktree);
-                    }
-                }
-            }
-        }
-        self.send_project_updates(cx);
-    }
-
-    pub fn unshared(&mut self, cx: &mut Context<Self>) {
-        self.retain_worktrees = false;
-        self.downstream_client.take();
-
-        // When not shared, only retain the visible worktrees
-        for worktree_handle in self.worktrees.iter_mut() {
-            if let WorktreeHandle::Strong(worktree) = worktree_handle {
-                let is_visible = worktree.update(cx, |worktree, _| {
-                    worktree.stop_observing_updates();
-                    worktree.is_visible()
-                });
-                if !is_visible {
-                    *worktree_handle = WorktreeHandle::Weak(worktree.downgrade());
-                }
-            }
-        }
-    }
-
-    /// search over all worktrees and return buffers that *might* match the search.
-    pub fn find_search_candidates(
-        &self,
-        query: SearchQuery,
-        limit: usize,
-        open_entries: HashSet<ProjectEntryId>,
-        fs: Arc<dyn Fs>,
-        cx: &Context<Self>,
-    ) -> Receiver<ProjectPath> {
-        let snapshots = self
-            .visible_worktrees(cx)
-            .filter_map(|tree| {
-                let tree = tree.read(cx);
-                Some((tree.snapshot(), tree.as_local()?.settings()))
-            })
-            .collect::<Vec<_>>();
-
-        let executor = cx.background_executor().clone();
-
-        // We want to return entries in the order they are in the worktrees, so we have one
-        // thread that iterates over the worktrees (and ignored directories) as necessary,
-        // and pushes a oneshot::Receiver to the output channel and a oneshot::Sender to the filter
-        // channel.
-        // We spawn a number of workers that take items from the filter channel and check the query
-        // against the version of the file on disk.
-        let (filter_tx, filter_rx) = smol::channel::bounded(64);
-        let (output_tx, output_rx) = smol::channel::bounded(64);
-        let (matching_paths_tx, matching_paths_rx) = smol::channel::unbounded();
-
-        let input = cx.background_spawn({
-            let fs = fs.clone();
-            let query = query.clone();
-            async move {
-                Self::find_candidate_paths(
-                    fs,
-                    snapshots,
-                    open_entries,
-                    query,
-                    filter_tx,
-                    output_tx,
-                )
-                .await
-                .log_err();
-            }
-        });
-        const MAX_CONCURRENT_FILE_SCANS: usize = 64;
-        let filters = cx.background_spawn(async move {
-            let fs = &fs;
-            let query = &query;
-            executor
-                .scoped(move |scope| {
-                    for _ in 0..MAX_CONCURRENT_FILE_SCANS {
-                        let filter_rx = filter_rx.clone();
-                        scope.spawn(async move {
-                            Self::filter_paths(fs, filter_rx, query)
-                                .await
-                                .log_with_level(log::Level::Debug);
-                        })
-                    }
-                })
-                .await;
-        });
-        cx.background_spawn(async move {
-            let mut matched = 0;
-            while let Ok(mut receiver) = output_rx.recv().await {
-                let Some(path) = receiver.next().await else {
-                    continue;
-                };
-                let Ok(_) = matching_paths_tx.send(path).await else {
-                    break;
-                };
-                matched += 1;
-                if matched == limit {
-                    break;
-                }
-            }
-            drop(input);
-            drop(filters);
-        })
-        .detach();
-        matching_paths_rx
-    }
-
-    async fn find_candidate_paths(
-        _: Arc<dyn Fs>,
-        _: Vec<(worktree::Snapshot, WorktreeSettings)>,
-        _: HashSet<ProjectEntryId>,
-        _: SearchQuery,
-        _: Sender<MatchingEntry>,
-        _: Sender<oneshot::Receiver<ProjectPath>>,
-    ) -> Result<()> {
-        Ok(())
-    }
-
-    async fn filter_paths(
-        fs: &Arc<dyn Fs>,
-        input: Receiver<MatchingEntry>,
-        query: &SearchQuery,
-    ) -> Result<()> {
-        let mut input = pin!(input);
-        while let Some(mut entry) = input.next().await {
-            let abs_path = entry.worktree_root.join(entry.path.path.as_std_path());
-            let Some(file) = fs.open_sync(&abs_path).await.log_err() else {
-                continue;
-            };
-
-            let mut file = BufReader::new(file);
-            let file_start = file.fill_buf()?;
-
-            if let Err(Some(starting_position)) =
-                std::str::from_utf8(file_start).map_err(|e| e.error_len())
-            {
-                // Before attempting to match the file content, throw away files that have invalid UTF-8 sequences early on;
-                // That way we can still match files in a streaming fashion without having look at "obviously binary" files.
-                log::debug!(
-                    "Invalid UTF-8 sequence in file {abs_path:?} at byte position {starting_position}"
-                );
-                continue;
-            }
-
-            if query.detect(file).unwrap_or(false) {
-                entry.respond.send(entry.path).await?
-            }
-        }
-
-        Ok(())
-    }
-
-    pub async fn handle_create_project_entry(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::CreateProjectEntry>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::ProjectEntryResponse> {
-        let worktree = this.update(&mut cx, |this, cx| {
-            let worktree_id = WorktreeId::from_proto(envelope.payload.worktree_id);
-            this.worktree_for_id(worktree_id, cx)
-                .context("worktree not found")
-        })??;
-        Worktree::handle_create_entry(worktree, envelope.payload, cx).await
-    }
-
-    pub async fn handle_copy_project_entry(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::CopyProjectEntry>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::ProjectEntryResponse> {
-        let entry_id = ProjectEntryId::from_proto(envelope.payload.entry_id);
-        let new_worktree_id = WorktreeId::from_proto(envelope.payload.new_worktree_id);
-        let new_project_path = (
-            new_worktree_id,
-            RelPath::from_proto(&envelope.payload.new_path)?,
-        );
-        let (scan_id, entry) = this.update(&mut cx, |this, cx| {
-            let Some((_, project_id)) = this.downstream_client else {
-                bail!("no downstream client")
-            };
-            let Some(entry) = this.entry_for_id(entry_id, cx) else {
-                bail!("no such entry");
-            };
-            if entry.is_private && project_id != REMOTE_SERVER_PROJECT_ID {
-                bail!("entry is private")
-            }
-
-            let new_worktree = this
-                .worktree_for_id(new_worktree_id, cx)
-                .context("no such worktree")?;
-            let scan_id = new_worktree.read(cx).scan_id();
-            anyhow::Ok((
-                scan_id,
-                this.copy_entry(entry_id, new_project_path.into(), cx),
-            ))
-        })??;
-        let entry = entry.await?;
-        Ok(proto::ProjectEntryResponse {
-            entry: entry.as_ref().map(|entry| entry.into()),
-            worktree_scan_id: scan_id as u64,
-        })
-    }
-
-    pub async fn handle_delete_project_entry(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::DeleteProjectEntry>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::ProjectEntryResponse> {
-        let entry_id = ProjectEntryId::from_proto(envelope.payload.entry_id);
-        let worktree = this.update(&mut cx, |this, cx| {
-            let Some((_, project_id)) = this.downstream_client else {
-                bail!("no downstream client")
-            };
-            let Some(entry) = this.entry_for_id(entry_id, cx) else {
-                bail!("no entry")
-            };
-            if entry.is_private && project_id != REMOTE_SERVER_PROJECT_ID {
-                bail!("entry is private")
-            }
-            this.worktree_for_entry(entry_id, cx)
-                .context("worktree not found")
-        })??;
-        Worktree::handle_delete_entry(worktree, envelope.payload, cx).await
-    }
-
-    pub async fn handle_rename_project_entry(
-        this: Entity<Self>,
-        request: proto::RenameProjectEntry,
-        mut cx: AsyncApp,
-    ) -> Result<proto::ProjectEntryResponse> {
-        let entry_id = ProjectEntryId::from_proto(request.entry_id);
-        let new_worktree_id = WorktreeId::from_proto(request.new_worktree_id);
-        let rel_path = RelPath::from_proto(&request.new_path)
-            .with_context(|| format!("received invalid relative path {:?}", &request.new_path))?;
-
-        let (scan_id, task) = this.update(&mut cx, |this, cx| {
-            let worktree = this
-                .worktree_for_entry(entry_id, cx)
-                .context("no such worktree")?;
-
-            let Some((_, project_id)) = this.downstream_client else {
-                bail!("no downstream client")
-            };
-            let entry = worktree
-                .read(cx)
-                .entry_for_id(entry_id)
-                .ok_or_else(|| anyhow!("missing entry"))?;
-            if entry.is_private && project_id != REMOTE_SERVER_PROJECT_ID {
-                bail!("entry is private")
-            }
-
-            let scan_id = worktree.read(cx).scan_id();
-            anyhow::Ok((
-                scan_id,
-                this.rename_entry(entry_id, (new_worktree_id, rel_path).into(), cx),
-            ))
-        })??;
-        Ok(proto::ProjectEntryResponse {
-            entry: match &task.await? {
-                CreatedEntry::Included(entry) => Some(entry.into()),
-                CreatedEntry::Excluded { .. } => None,
-            },
-            worktree_scan_id: scan_id as u64,
-        })
-    }
-
-    pub async fn handle_expand_project_entry(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::ExpandProjectEntry>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::ExpandProjectEntryResponse> {
-        let entry_id = ProjectEntryId::from_proto(envelope.payload.entry_id);
-        let worktree = this
-            .update(&mut cx, |this, cx| this.worktree_for_entry(entry_id, cx))?
-            .context("invalid request")?;
-        Worktree::handle_expand_entry(worktree, envelope.payload, cx).await
-    }
-
-    pub async fn handle_expand_all_for_project_entry(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::ExpandAllForProjectEntry>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::ExpandAllForProjectEntryResponse> {
-        let entry_id = ProjectEntryId::from_proto(envelope.payload.entry_id);
-        let worktree = this
-            .update(&mut cx, |this, cx| this.worktree_for_entry(entry_id, cx))?
-            .context("invalid request")?;
-        Worktree::handle_expand_all_for_entry(worktree, envelope.payload, cx).await
-    }
-
-    pub fn fs(&self) -> Option<Arc<dyn Fs>> {
-        match &self.state {
-            WorktreeStoreState::Local { fs } => Some(fs.clone()),
-            WorktreeStoreState::Remote { .. } => None,
-        }
-    }
-}
-
-#[derive(Clone, Debug)]
-enum WorktreeHandle {
-    Strong(Entity<Worktree>),
-    Weak(WeakEntity<Worktree>),
-}
-
-impl WorktreeHandle {
-    fn upgrade(&self) -> Option<Entity<Worktree>> {
-        match self {
-            WorktreeHandle::Strong(handle) => Some(handle.clone()),
-            WorktreeHandle::Weak(handle) => handle.upgrade(),
-        }
-    }
-}
diff --git a/crates/project/src/yarn.rs b/crates/project/src/yarn.rs
deleted file mode 100644
index b270fe2df3..0000000000
--- a/crates/project/src/yarn.rs
+++ /dev/null
@@ -1,179 +0,0 @@
-//! This module deals with everything related to path handling for Yarn, the package manager for Web ecosystem.
-//! Yarn is a bit peculiar, because it references paths within .zip files, which we obviously can't handle.
-//! It also uses virtual paths for peer dependencies.
-//!
-//! Long story short, before we attempt to resolve a path as a "real" path, we try to treat is as a yarn path;
-//! for .zip handling, we unpack the contents into the temp directory (yes, this is bad, against the spirit of Yarn and what-not)
-
-use std::{
-    ffi::OsStr,
-    path::{Path, PathBuf},
-    sync::Arc,
-};
-
-use anyhow::Result;
-use collections::HashMap;
-use fs::Fs;
-use gpui::{App, AppContext as _, Context, Entity, Task};
-use util::{ResultExt, archive::extract_zip, paths::PathStyle, rel_path::RelPath};
-
-pub(crate) struct YarnPathStore {
-    temp_dirs: HashMap<Arc<Path>, tempfile::TempDir>,
-    fs: Arc<dyn Fs>,
-}
-
-/// Returns `None` when passed path is a malformed virtual path or it's not a virtual path at all.
-fn resolve_virtual(path: &Path) -> Option<Arc<Path>> {
-    let components: Vec<_> = path.components().collect();
-    let mut non_virtual_path = PathBuf::new();
-
-    let mut i = 0;
-    let mut is_virtual = false;
-    while i < components.len() {
-        if let Some(os_str) = components[i].as_os_str().to_str() {
-            // Detect the __virtual__ segment
-            if os_str == "__virtual__" {
-                let pop_count = components
-                    .get(i + 2)?
-                    .as_os_str()
-                    .to_str()?
-                    .parse::<usize>()
-                    .ok()?;
-
-                // Apply dirname operation pop_count times
-                for _ in 0..pop_count {
-                    non_virtual_path.pop();
-                }
-                i += 3; // Skip hash and pop_count components
-                is_virtual = true;
-                continue;
-            }
-        }
-        non_virtual_path.push(components[i]);
-        i += 1;
-    }
-
-    is_virtual.then(|| Arc::from(non_virtual_path))
-}
-
-impl YarnPathStore {
-    pub(crate) fn new(fs: Arc<dyn Fs>, cx: &mut App) -> Entity<Self> {
-        cx.new(|_| Self {
-            temp_dirs: Default::default(),
-            fs,
-        })
-    }
-
-    pub(crate) fn process_path(
-        &mut self,
-        path: &Path,
-        protocol: &str,
-        cx: &Context<Self>,
-    ) -> Task<Option<(Arc<Path>, Arc<RelPath>)>> {
-        let mut is_zip = protocol.eq("zip");
-
-        let path: &Path = if let Some(non_zip_part) = path
-            .as_os_str()
-            .as_encoded_bytes()
-            .strip_prefix("/zip:".as_bytes())
-        {
-            // typescript-language-server prepends the paths with zip:, which is messy.
-            is_zip = true;
-            Path::new(OsStr::new(
-                std::str::from_utf8(non_zip_part).expect("Invalid UTF-8"),
-            ))
-        } else {
-            path
-        };
-
-        let as_virtual = resolve_virtual(path);
-        let Some(path) = as_virtual.or_else(|| is_zip.then(|| Arc::from(path))) else {
-            return Task::ready(None);
-        };
-        if let Some(zip_file) = zip_path(&path) {
-            let zip_file: Arc<Path> = Arc::from(zip_file);
-            cx.spawn(async move |this, cx| {
-                let dir = this
-                    .read_with(cx, |this, _| {
-                        this.temp_dirs
-                            .get(&zip_file)
-                            .map(|temp| temp.path().to_owned())
-                    })
-                    .ok()?;
-                let zip_root = if let Some(dir) = dir {
-                    dir
-                } else {
-                    let fs = this.update(cx, |this, _| this.fs.clone()).ok()?;
-                    let tempdir = dump_zip(zip_file.clone(), fs).await.log_err()?;
-                    let new_path = tempdir.path().to_owned();
-                    this.update(cx, |this, _| {
-                        this.temp_dirs.insert(zip_file.clone(), tempdir);
-                    })
-                    .ok()?;
-                    new_path
-                };
-                // Rebase zip-path onto new temp path.
-                let as_relative =
-                    RelPath::new(path.strip_prefix(zip_file).ok()?, PathStyle::local()).ok()?;
-                Some((zip_root.into(), as_relative.into_arc()))
-            })
-        } else {
-            Task::ready(None)
-        }
-    }
-}
-
-fn zip_path(path: &Path) -> Option<&Path> {
-    let path_str = path.to_str()?;
-    let zip_end = path_str.find(".zip/")?;
-    let zip_path = &path_str[..zip_end + 4]; // ".zip" is 4 characters long
-    Some(Path::new(zip_path))
-}
-
-async fn dump_zip(path: Arc<Path>, fs: Arc<dyn Fs>) -> Result<tempfile::TempDir> {
-    let dir = tempfile::tempdir()?;
-    let contents = fs.load_bytes(&path).await?;
-    extract_zip(dir.path(), futures::io::Cursor::new(contents)).await?;
-    Ok(dir)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use std::path::Path;
-
-    #[test]
-    fn test_resolve_virtual() {
-        let test_cases = vec![
-            (
-                "/path/to/some/folder/__virtual__/a0b1c2d3/0/subpath/to/file.dat",
-                Some(Path::new("/path/to/some/folder/subpath/to/file.dat")),
-            ),
-            (
-                "/path/to/some/folder/__virtual__/e4f5a0b1/0/subpath/to/file.dat",
-                Some(Path::new("/path/to/some/folder/subpath/to/file.dat")),
-            ),
-            (
-                "/path/to/some/folder/__virtual__/a0b1c2d3/1/subpath/to/file.dat",
-                Some(Path::new("/path/to/some/subpath/to/file.dat")),
-            ),
-            (
-                "/path/to/some/folder/__virtual__/a0b1c2d3/3/subpath/to/file.dat",
-                Some(Path::new("/path/subpath/to/file.dat")),
-            ),
-            ("/path/to/nonvirtual/", None),
-            ("/path/to/malformed/__virtual__", None),
-            ("/path/to/malformed/__virtual__/a0b1c2d3", None),
-            (
-                "/path/to/malformed/__virtual__/a0b1c2d3/this-should-be-a-number",
-                None,
-            ),
-        ];
-
-        for (input, expected) in test_cases {
-            let input_path = Path::new(input);
-            let resolved_path = resolve_virtual(input_path);
-            assert_eq!(resolved_path.as_deref(), expected);
-        }
-    }
-}
diff --git a/crates/project_benchmarks/Cargo.toml b/crates/project_benchmarks/Cargo.toml
deleted file mode 100644
index 1171d468c6..0000000000
--- a/crates/project_benchmarks/Cargo.toml
+++ /dev/null
@@ -1,21 +0,0 @@
-[package]
-name = "project_benchmarks"
-version = "0.1.0"
-publish.workspace = true
-edition.workspace = true
-
-[dependencies]
-anyhow.workspace = true
-clap.workspace = true
-client.workspace = true
-futures.workspace = true
-gpui = { workspace = true, features = ["windows-manifest"] }
-http_client = { workspace = true, features = ["test-support"]}
-language.workspace = true
-node_runtime.workspace = true
-project.workspace = true
-settings.workspace = true
-watch.workspace = true
-
-[lints]
-workspace = true
diff --git a/crates/project_benchmarks/LICENSE-GPL b/crates/project_benchmarks/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/project_benchmarks/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/project_benchmarks/src/main.rs b/crates/project_benchmarks/src/main.rs
deleted file mode 100644
index 738d0d0f22..0000000000
--- a/crates/project_benchmarks/src/main.rs
+++ /dev/null
@@ -1,135 +0,0 @@
-use std::sync::Arc;
-
-use clap::Parser;
-use client::{Client, UserStore};
-use gpui::{AppContext as _, Application};
-use http_client::FakeHttpClient;
-use language::LanguageRegistry;
-use node_runtime::NodeRuntime;
-use project::{
-    Project, RealFs,
-    search::{SearchQuery, SearchResult},
-};
-
-#[derive(Parser)]
-struct Args {
-    /// List of worktrees to run the search against.
-    worktrees: Vec<String>,
-    #[clap(short)]
-    query: String,
-    /// Treat query as a regex.
-    #[clap(short, long)]
-    regex: bool,
-    /// Matches have to be standalone words.
-    #[clap(long)]
-    whole_word: bool,
-    /// Make matching case-sensitive.
-    #[clap(long, default_value_t = false)]
-    case_sensitive: bool,
-    /// Include gitignored files in the search.
-    #[clap(long)]
-    include_ignored: bool,
-}
-
-fn main() -> Result<(), anyhow::Error> {
-    let args = Args::parse();
-    let query = if args.regex {
-        SearchQuery::regex(
-            args.query,
-            args.whole_word,
-            args.case_sensitive,
-            args.include_ignored,
-            false,
-            Default::default(),
-            Default::default(),
-            false,
-            None,
-        )
-    } else {
-        SearchQuery::text(
-            args.query,
-            args.whole_word,
-            args.case_sensitive,
-            args.include_ignored,
-            Default::default(),
-            Default::default(),
-            false,
-            None,
-        )
-    }?;
-    Application::headless().run(|cx| {
-        settings::init(cx);
-        let client = Client::production(cx);
-        let http_client = FakeHttpClient::with_200_response();
-        let (_, rx) = watch::channel(None);
-        let node = NodeRuntime::new(http_client, None, rx);
-        let user_store = cx.new(|cx| UserStore::new(client.clone(), cx));
-        let registry = Arc::new(LanguageRegistry::new(cx.background_executor().clone()));
-        let fs = Arc::new(RealFs::new(None, cx.background_executor().clone()));
-        let project = Project::local(
-            client,
-            node,
-            user_store,
-            registry,
-            fs,
-            Some(Default::default()),
-            cx,
-        );
-
-        project.clone().update(cx, move |_, cx| {
-            cx.spawn(async move |_, cx| {
-                println!("Loading worktrees");
-                let worktrees = project.update(cx, |this, cx| {
-                    args.worktrees
-                        .into_iter()
-                        .map(|worktree| this.find_or_create_worktree(worktree, true, cx))
-                        .collect::<Vec<_>>()
-                })?;
-
-                let worktrees = futures::future::join_all(worktrees)
-                    .await
-                    .into_iter()
-                    .collect::<Result<Vec<_>, anyhow::Error>>()?;
-
-                for (worktree, _) in &worktrees {
-                    worktree
-                        .update(cx, |this, _| this.as_local().unwrap().scan_complete())?
-                        .await;
-                }
-                println!("Worktrees loaded");
-
-                println!("Starting a project search");
-                let timer = std::time::Instant::now();
-                let mut first_match = None;
-                let matches = project
-                    .update(cx, |this, cx| this.search(query, cx))
-                    .unwrap();
-                let mut matched_files = 0;
-                let mut matched_chunks = 0;
-                while let Ok(match_result) = matches.recv().await {
-                    if first_match.is_none() {
-                        let time = timer.elapsed();
-                        first_match = Some(time);
-                        println!("First match found after {time:?}");
-                    }
-                    if let SearchResult::Buffer { ranges, .. } = match_result {
-                        matched_files += 1;
-                        matched_chunks += ranges.len();
-                    } else {
-                        break;
-                    }
-                }
-                let elapsed = timer.elapsed();
-                println!(
-                    "Finished project search after {elapsed:?}. Matched {matched_files} files and {matched_chunks} excerpts"
-                );
-                drop(project);
-                cx.update(|cx| cx.quit())?;
-
-                anyhow::Ok(())
-            })
-            .detach();
-        });
-    });
-    Ok(())
-}
diff --git a/crates/project_panel/Cargo.toml b/crates/project_panel/Cargo.toml
deleted file mode 100644
index 2c47efd0b0..0000000000
--- a/crates/project_panel/Cargo.toml
+++ /dev/null
@@ -1,57 +0,0 @@
-[package]
-name = "project_panel"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[[bench]]
-name = "sorting"
-harness = false
-
-[lib]
-path = "src/project_panel.rs"
-doctest = false
-
-[dependencies]
-anyhow.workspace = true
-collections.workspace = true
-command_palette_hooks.workspace = true
-db.workspace = true
-editor.workspace = true
-file_icons.workspace = true
-git_ui.workspace = true
-git.workspace = true
-gpui.workspace = true
-menu.workspace = true
-pretty_assertions.workspace = true
-project.workspace = true
-schemars.workspace = true
-search.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-smallvec.workspace = true
-theme.workspace = true
-rayon.workspace = true
-ui.workspace = true
-util.workspace = true
-client.workspace = true
-worktree.workspace = true
-workspace.workspace = true
-language.workspace = true
-zed_actions.workspace = true
-telemetry.workspace = true
-
-[dev-dependencies]
-client = { workspace = true, features = ["test-support"] }
-criterion.workspace = true
-editor = { workspace = true, features = ["test-support"] }
-gpui = { workspace = true, features = ["test-support"] }
-language = { workspace = true, features = ["test-support"] }
-serde_json.workspace = true
-tempfile.workspace = true
-workspace = { workspace = true, features = ["test-support"] }
diff --git a/crates/project_panel/LICENSE-GPL b/crates/project_panel/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/project_panel/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/project_panel/benches/linux_repo_snapshot.txt b/crates/project_panel/benches/linux_repo_snapshot.txt
deleted file mode 100644
index 98a525af8d..0000000000
--- a/crates/project_panel/benches/linux_repo_snapshot.txt
+++ /dev/null
@@ -1,96349 +0,0 @@
-d:
-d:.git
-d:.git/hooks
-d:.git/info
-d:.git/logs
-d:.git/logs/refs
-d:.git/logs/refs/heads
-d:.git/logs/refs/remotes
-d:.git/logs/refs/remotes/origin
-d:.git/objects
-d:.git/objects/info
-d:.git/objects/pack
-d:.git/refs
-d:.git/refs/heads
-d:.git/refs/remotes
-d:.git/refs/remotes/origin
-d:.git/refs/tags
-d:Documentation
-d:Documentation/ABI
-d:Documentation/ABI/obsolete
-d:Documentation/ABI/removed
-d:Documentation/ABI/stable
-d:Documentation/ABI/testing
-d:Documentation/PCI
-d:Documentation/PCI/controller
-d:Documentation/PCI/endpoint
-d:Documentation/PCI/endpoint/function
-d:Documentation/PCI/endpoint/function/binding
-d:Documentation/RCU
-d:Documentation/RCU/Design
-d:Documentation/RCU/Design/Data-Structures
-d:Documentation/RCU/Design/Expedited-Grace-Periods
-d:Documentation/RCU/Design/Memory-Ordering
-d:Documentation/RCU/Design/Requirements
-d:Documentation/accel
-d:Documentation/accel/amdxdna
-d:Documentation/accel/qaic
-d:Documentation/accounting
-d:Documentation/admin-guide
-d:Documentation/admin-guide/LSM
-d:Documentation/admin-guide/RAS
-d:Documentation/admin-guide/acpi
-d:Documentation/admin-guide/aoe
-d:Documentation/admin-guide/auxdisplay
-d:Documentation/admin-guide/blockdev
-d:Documentation/admin-guide/blockdev/drbd
-d:Documentation/admin-guide/cgroup-v1
-d:Documentation/admin-guide/cifs
-d:Documentation/admin-guide/device-mapper
-d:Documentation/admin-guide/gpio
-d:Documentation/admin-guide/hw-vuln
-d:Documentation/admin-guide/kdump
-d:Documentation/admin-guide/laptops
-d:Documentation/admin-guide/media
-d:Documentation/admin-guide/mm
-d:Documentation/admin-guide/mm/damon
-d:Documentation/admin-guide/namespaces
-d:Documentation/admin-guide/nfs
-d:Documentation/admin-guide/perf
-d:Documentation/admin-guide/pm
-d:Documentation/admin-guide/sysctl
-d:Documentation/admin-guide/thermal
-d:Documentation/arch
-d:Documentation/arch/arc
-d:Documentation/arch/arm
-d:Documentation/arch/arm/google
-d:Documentation/arch/arm/keystone
-d:Documentation/arch/arm/nwfpe
-d:Documentation/arch/arm/omap
-d:Documentation/arch/arm/pxa
-d:Documentation/arch/arm/sa1100
-d:Documentation/arch/arm/samsung
-d:Documentation/arch/arm/spear
-d:Documentation/arch/arm/sti
-d:Documentation/arch/arm/stm32
-d:Documentation/arch/arm/sunxi
-d:Documentation/arch/arm/vfp
-d:Documentation/arch/arm64
-d:Documentation/arch/loongarch
-d:Documentation/arch/m68k
-d:Documentation/arch/mips
-d:Documentation/arch/nios2
-d:Documentation/arch/openrisc
-d:Documentation/arch/parisc
-d:Documentation/arch/powerpc
-d:Documentation/arch/riscv
-d:Documentation/arch/s390
-d:Documentation/arch/sh
-d:Documentation/arch/sparc
-d:Documentation/arch/sparc/oradax
-d:Documentation/arch/x86
-d:Documentation/arch/x86/i386
-d:Documentation/arch/x86/x86_64
-d:Documentation/arch/xtensa
-d:Documentation/block
-d:Documentation/bpf
-d:Documentation/bpf/libbpf
-d:Documentation/bpf/standardization
-d:Documentation/cdrom
-d:Documentation/core-api
-d:Documentation/core-api/irq
-d:Documentation/core-api/kho
-d:Documentation/core-api/kho/bindings
-d:Documentation/core-api/kho/bindings/memblock
-d:Documentation/core-api/wrappers
-d:Documentation/cpu-freq
-d:Documentation/crypto
-d:Documentation/crypto/device_drivers
-d:Documentation/dev-tools
-d:Documentation/dev-tools/kunit
-d:Documentation/dev-tools/kunit/api
-d:Documentation/devicetree
-d:Documentation/devicetree/bindings
-d:Documentation/devicetree/bindings/access-controllers
-d:Documentation/devicetree/bindings/arc
-d:Documentation/devicetree/bindings/arm
-d:Documentation/devicetree/bindings/arm/altera
-d:Documentation/devicetree/bindings/arm/amlogic
-d:Documentation/devicetree/bindings/arm/apple
-d:Documentation/devicetree/bindings/arm/aspeed
-d:Documentation/devicetree/bindings/arm/bcm
-d:Documentation/devicetree/bindings/arm/calxeda
-d:Documentation/devicetree/bindings/arm/cirrus
-d:Documentation/devicetree/bindings/arm/cpu-enable-method
-d:Documentation/devicetree/bindings/arm/firmware
-d:Documentation/devicetree/bindings/arm/freescale
-d:Documentation/devicetree/bindings/arm/hisilicon
-d:Documentation/devicetree/bindings/arm/hisilicon/controller
-d:Documentation/devicetree/bindings/arm/keystone
-d:Documentation/devicetree/bindings/arm/marvell
-d:Documentation/devicetree/bindings/arm/mediatek
-d:Documentation/devicetree/bindings/arm/mrvl
-d:Documentation/devicetree/bindings/arm/mstar
-d:Documentation/devicetree/bindings/arm/nuvoton
-d:Documentation/devicetree/bindings/arm/nxp
-d:Documentation/devicetree/bindings/arm/omap
-d:Documentation/devicetree/bindings/arm/rockchip
-d:Documentation/devicetree/bindings/arm/samsung
-d:Documentation/devicetree/bindings/arm/socionext
-d:Documentation/devicetree/bindings/arm/sprd
-d:Documentation/devicetree/bindings/arm/stm32
-d:Documentation/devicetree/bindings/arm/sunxi
-d:Documentation/devicetree/bindings/arm/tegra
-d:Documentation/devicetree/bindings/arm/ti
-d:Documentation/devicetree/bindings/arm/ux500
-d:Documentation/devicetree/bindings/arm/vt8500
-d:Documentation/devicetree/bindings/ata
-d:Documentation/devicetree/bindings/auxdisplay
-d:Documentation/devicetree/bindings/board
-d:Documentation/devicetree/bindings/bus
-d:Documentation/devicetree/bindings/cache
-d:Documentation/devicetree/bindings/chrome
-d:Documentation/devicetree/bindings/clock
-d:Documentation/devicetree/bindings/clock/sifive
-d:Documentation/devicetree/bindings/clock/st
-d:Documentation/devicetree/bindings/clock/ti
-d:Documentation/devicetree/bindings/clock/ti/davinci
-d:Documentation/devicetree/bindings/connector
-d:Documentation/devicetree/bindings/counter
-d:Documentation/devicetree/bindings/cpu
-d:Documentation/devicetree/bindings/cpufreq
-d:Documentation/devicetree/bindings/crypto
-d:Documentation/devicetree/bindings/csky
-d:Documentation/devicetree/bindings/devfreq
-d:Documentation/devicetree/bindings/devfreq/event
-d:Documentation/devicetree/bindings/display
-d:Documentation/devicetree/bindings/display/armada
-d:Documentation/devicetree/bindings/display/atmel
-d:Documentation/devicetree/bindings/display/bridge
-d:Documentation/devicetree/bindings/display/connector
-d:Documentation/devicetree/bindings/display/hisilicon
-d:Documentation/devicetree/bindings/display/imx
-d:Documentation/devicetree/bindings/display/mediatek
-d:Documentation/devicetree/bindings/display/msm
-d:Documentation/devicetree/bindings/display/panel
-d:Documentation/devicetree/bindings/display/rockchip
-d:Documentation/devicetree/bindings/display/samsung
-d:Documentation/devicetree/bindings/display/sprd
-d:Documentation/devicetree/bindings/display/tegra
-d:Documentation/devicetree/bindings/display/ti
-d:Documentation/devicetree/bindings/display/tilcdc
-d:Documentation/devicetree/bindings/display/xlnx
-d:Documentation/devicetree/bindings/dma
-d:Documentation/devicetree/bindings/dma/stm32
-d:Documentation/devicetree/bindings/dma/ti
-d:Documentation/devicetree/bindings/dma/xilinx
-d:Documentation/devicetree/bindings/dpll
-d:Documentation/devicetree/bindings/dsp
-d:Documentation/devicetree/bindings/dvfs
-d:Documentation/devicetree/bindings/edac
-d:Documentation/devicetree/bindings/eeprom
-d:Documentation/devicetree/bindings/extcon
-d:Documentation/devicetree/bindings/firmware
-d:Documentation/devicetree/bindings/firmware/xilinx
-d:Documentation/devicetree/bindings/fpga
-d:Documentation/devicetree/bindings/fsi
-d:Documentation/devicetree/bindings/fuse
-d:Documentation/devicetree/bindings/gnss
-d:Documentation/devicetree/bindings/goldfish
-d:Documentation/devicetree/bindings/gpio
-d:Documentation/devicetree/bindings/gpu
-d:Documentation/devicetree/bindings/gpu/host1x
-d:Documentation/devicetree/bindings/hsi
-d:Documentation/devicetree/bindings/hwinfo
-d:Documentation/devicetree/bindings/hwlock
-d:Documentation/devicetree/bindings/hwmon
-d:Documentation/devicetree/bindings/hwmon/pmbus
-d:Documentation/devicetree/bindings/i2c
-d:Documentation/devicetree/bindings/i3c
-d:Documentation/devicetree/bindings/iio
-d:Documentation/devicetree/bindings/iio/accel
-d:Documentation/devicetree/bindings/iio/adc
-d:Documentation/devicetree/bindings/iio/addac
-d:Documentation/devicetree/bindings/iio/afe
-d:Documentation/devicetree/bindings/iio/amplifiers
-d:Documentation/devicetree/bindings/iio/cdc
-d:Documentation/devicetree/bindings/iio/chemical
-d:Documentation/devicetree/bindings/iio/dac
-d:Documentation/devicetree/bindings/iio/filter
-d:Documentation/devicetree/bindings/iio/frequency
-d:Documentation/devicetree/bindings/iio/gyroscope
-d:Documentation/devicetree/bindings/iio/health
-d:Documentation/devicetree/bindings/iio/humidity
-d:Documentation/devicetree/bindings/iio/impedance-analyzer
-d:Documentation/devicetree/bindings/iio/imu
-d:Documentation/devicetree/bindings/iio/light
-d:Documentation/devicetree/bindings/iio/magnetometer
-d:Documentation/devicetree/bindings/iio/multiplexer
-d:Documentation/devicetree/bindings/iio/potentiometer
-d:Documentation/devicetree/bindings/iio/potentiostat
-d:Documentation/devicetree/bindings/iio/pressure
-d:Documentation/devicetree/bindings/iio/proximity
-d:Documentation/devicetree/bindings/iio/resolver
-d:Documentation/devicetree/bindings/iio/temperature
-d:Documentation/devicetree/bindings/infiniband
-d:Documentation/devicetree/bindings/input
-d:Documentation/devicetree/bindings/input/touchscreen
-d:Documentation/devicetree/bindings/interconnect
-d:Documentation/devicetree/bindings/interrupt-controller
-d:Documentation/devicetree/bindings/iommu
-d:Documentation/devicetree/bindings/ipmi
-d:Documentation/devicetree/bindings/leds
-d:Documentation/devicetree/bindings/leds/backlight
-d:Documentation/devicetree/bindings/leds/irled
-d:Documentation/devicetree/bindings/loongarch
-d:Documentation/devicetree/bindings/mailbox
-d:Documentation/devicetree/bindings/media
-d:Documentation/devicetree/bindings/media/cec
-d:Documentation/devicetree/bindings/media/i2c
-d:Documentation/devicetree/bindings/media/spi
-d:Documentation/devicetree/bindings/media/xilinx
-d:Documentation/devicetree/bindings/memory-controllers
-d:Documentation/devicetree/bindings/memory-controllers/ddr
-d:Documentation/devicetree/bindings/memory-controllers/fsl
-d:Documentation/devicetree/bindings/memory-controllers/ti
-d:Documentation/devicetree/bindings/mfd
-d:Documentation/devicetree/bindings/mips
-d:Documentation/devicetree/bindings/mips/brcm
-d:Documentation/devicetree/bindings/mips/cavium
-d:Documentation/devicetree/bindings/mips/img
-d:Documentation/devicetree/bindings/mips/ingenic
-d:Documentation/devicetree/bindings/mips/lantiq
-d:Documentation/devicetree/bindings/mips/loongson
-d:Documentation/devicetree/bindings/mips/pic32
-d:Documentation/devicetree/bindings/misc
-d:Documentation/devicetree/bindings/mmc
-d:Documentation/devicetree/bindings/mtd
-d:Documentation/devicetree/bindings/mtd/partitions
-d:Documentation/devicetree/bindings/mux
-d:Documentation/devicetree/bindings/net
-d:Documentation/devicetree/bindings/net/bluetooth
-d:Documentation/devicetree/bindings/net/can
-d:Documentation/devicetree/bindings/net/dsa
-d:Documentation/devicetree/bindings/net/ieee802154
-d:Documentation/devicetree/bindings/net/nfc
-d:Documentation/devicetree/bindings/net/pcs
-d:Documentation/devicetree/bindings/net/pse-pd
-d:Documentation/devicetree/bindings/net/wireless
-d:Documentation/devicetree/bindings/nios2
-d:Documentation/devicetree/bindings/nvme
-d:Documentation/devicetree/bindings/nvmem
-d:Documentation/devicetree/bindings/nvmem/layouts
-d:Documentation/devicetree/bindings/openrisc
-d:Documentation/devicetree/bindings/openrisc/opencores
-d:Documentation/devicetree/bindings/opp
-d:Documentation/devicetree/bindings/pci
-d:Documentation/devicetree/bindings/peci
-d:Documentation/devicetree/bindings/perf
-d:Documentation/devicetree/bindings/phy
-d:Documentation/devicetree/bindings/pinctrl
-d:Documentation/devicetree/bindings/platform
-d:Documentation/devicetree/bindings/pmem
-d:Documentation/devicetree/bindings/power
-d:Documentation/devicetree/bindings/power/avs
-d:Documentation/devicetree/bindings/power/reset
-d:Documentation/devicetree/bindings/power/supply
-d:Documentation/devicetree/bindings/powerpc
-d:Documentation/devicetree/bindings/powerpc/4xx
-d:Documentation/devicetree/bindings/powerpc/fsl
-d:Documentation/devicetree/bindings/powerpc/nintendo
-d:Documentation/devicetree/bindings/powerpc/opal
-d:Documentation/devicetree/bindings/pps
-d:Documentation/devicetree/bindings/ptp
-d:Documentation/devicetree/bindings/pwm
-d:Documentation/devicetree/bindings/regmap
-d:Documentation/devicetree/bindings/regulator
-d:Documentation/devicetree/bindings/remoteproc
-d:Documentation/devicetree/bindings/reserved-memory
-d:Documentation/devicetree/bindings/reset
-d:Documentation/devicetree/bindings/riscv
-d:Documentation/devicetree/bindings/rng
-d:Documentation/devicetree/bindings/rtc
-d:Documentation/devicetree/bindings/scsi
-d:Documentation/devicetree/bindings/serial
-d:Documentation/devicetree/bindings/serio
-d:Documentation/devicetree/bindings/sifive
-d:Documentation/devicetree/bindings/siox
-d:Documentation/devicetree/bindings/slimbus
-d:Documentation/devicetree/bindings/soc
-d:Documentation/devicetree/bindings/soc/altera
-d:Documentation/devicetree/bindings/soc/amlogic
-d:Documentation/devicetree/bindings/soc/aspeed
-d:Documentation/devicetree/bindings/soc/bcm
-d:Documentation/devicetree/bindings/soc/cirrus
-d:Documentation/devicetree/bindings/soc/dove
-d:Documentation/devicetree/bindings/soc/fsl
-d:Documentation/devicetree/bindings/soc/fsl/cpm_qe
-d:Documentation/devicetree/bindings/soc/fsl/cpm_qe/cpm
-d:Documentation/devicetree/bindings/soc/fsl/cpm_qe/qe
-d:Documentation/devicetree/bindings/soc/google
-d:Documentation/devicetree/bindings/soc/hisilicon
-d:Documentation/devicetree/bindings/soc/imx
-d:Documentation/devicetree/bindings/soc/intel
-d:Documentation/devicetree/bindings/soc/litex
-d:Documentation/devicetree/bindings/soc/loongson
-d:Documentation/devicetree/bindings/soc/mediatek
-d:Documentation/devicetree/bindings/soc/microchip
-d:Documentation/devicetree/bindings/soc/mobileye
-d:Documentation/devicetree/bindings/soc/nuvoton
-d:Documentation/devicetree/bindings/soc/qcom
-d:Documentation/devicetree/bindings/soc/renesas
-d:Documentation/devicetree/bindings/soc/rockchip
-d:Documentation/devicetree/bindings/soc/samsung
-d:Documentation/devicetree/bindings/soc/socionext
-d:Documentation/devicetree/bindings/soc/sophgo
-d:Documentation/devicetree/bindings/soc/spacemit
-d:Documentation/devicetree/bindings/soc/sprd
-d:Documentation/devicetree/bindings/soc/starfive
-d:Documentation/devicetree/bindings/soc/sti
-d:Documentation/devicetree/bindings/soc/tegra
-d:Documentation/devicetree/bindings/soc/ti
-d:Documentation/devicetree/bindings/soc/xilinx
-d:Documentation/devicetree/bindings/sound
-d:Documentation/devicetree/bindings/soundwire
-d:Documentation/devicetree/bindings/spi
-d:Documentation/devicetree/bindings/spmi
-d:Documentation/devicetree/bindings/sram
-d:Documentation/devicetree/bindings/thermal
-d:Documentation/devicetree/bindings/timer
-d:Documentation/devicetree/bindings/timestamp
-d:Documentation/devicetree/bindings/tpm
-d:Documentation/devicetree/bindings/trigger-source
-d:Documentation/devicetree/bindings/ufs
-d:Documentation/devicetree/bindings/usb
-d:Documentation/devicetree/bindings/virtio
-d:Documentation/devicetree/bindings/w1
-d:Documentation/devicetree/bindings/watchdog
-d:Documentation/devicetree/bindings/x86
-d:Documentation/devicetree/bindings/xillybus
-d:Documentation/doc-guide
-d:Documentation/driver-api
-d:Documentation/driver-api/80211
-d:Documentation/driver-api/acpi
-d:Documentation/driver-api/backlight
-d:Documentation/driver-api/coco
-d:Documentation/driver-api/crypto
-d:Documentation/driver-api/crypto/iaa
-d:Documentation/driver-api/cxl
-d:Documentation/driver-api/cxl/allocation
-d:Documentation/driver-api/cxl/devices
-d:Documentation/driver-api/cxl/linux
-d:Documentation/driver-api/cxl/linux/example-configurations
-d:Documentation/driver-api/cxl/platform
-d:Documentation/driver-api/cxl/platform/acpi
-d:Documentation/driver-api/cxl/platform/example-configurations
-d:Documentation/driver-api/dmaengine
-d:Documentation/driver-api/driver-model
-d:Documentation/driver-api/early-userspace
-d:Documentation/driver-api/firmware
-d:Documentation/driver-api/firmware/efi
-d:Documentation/driver-api/fpga
-d:Documentation/driver-api/gpio
-d:Documentation/driver-api/hte
-d:Documentation/driver-api/i3c
-d:Documentation/driver-api/iio
-d:Documentation/driver-api/md
-d:Documentation/driver-api/media
-d:Documentation/driver-api/media/drivers
-d:Documentation/driver-api/media/drivers/ccs
-d:Documentation/driver-api/mei
-d:Documentation/driver-api/memory-devices
-d:Documentation/driver-api/mmc
-d:Documentation/driver-api/mtd
-d:Documentation/driver-api/nfc
-d:Documentation/driver-api/nvdimm
-d:Documentation/driver-api/pci
-d:Documentation/driver-api/phy
-d:Documentation/driver-api/pldmfw
-d:Documentation/driver-api/pm
-d:Documentation/driver-api/rapidio
-d:Documentation/driver-api/serial
-d:Documentation/driver-api/soundwire
-d:Documentation/driver-api/surface_aggregator
-d:Documentation/driver-api/surface_aggregator/clients
-d:Documentation/driver-api/thermal
-d:Documentation/driver-api/tty
-d:Documentation/driver-api/usb
-d:Documentation/driver-api/virtio
-d:Documentation/driver-api/xilinx
-d:Documentation/edac
-d:Documentation/fault-injection
-d:Documentation/fb
-d:Documentation/features
-d:Documentation/features/core
-d:Documentation/features/core/cBPF-JIT
-d:Documentation/features/core/eBPF-JIT
-d:Documentation/features/core/generic-idle-thread
-d:Documentation/features/core/jump-labels
-d:Documentation/features/core/mseal_sys_mappings
-d:Documentation/features/core/thread-info-in-task
-d:Documentation/features/core/tracehook
-d:Documentation/features/debug
-d:Documentation/features/debug/KASAN
-d:Documentation/features/debug/debug-vm-pgtable
-d:Documentation/features/debug/gcov-profile-all
-d:Documentation/features/debug/kcov
-d:Documentation/features/debug/kgdb
-d:Documentation/features/debug/kmemleak
-d:Documentation/features/debug/kprobes
-d:Documentation/features/debug/kprobes-on-ftrace
-d:Documentation/features/debug/kretprobes
-d:Documentation/features/debug/optprobes
-d:Documentation/features/debug/stackprotector
-d:Documentation/features/debug/uprobes
-d:Documentation/features/debug/user-ret-profiler
-d:Documentation/features/io
-d:Documentation/features/io/dma-contiguous
-d:Documentation/features/locking
-d:Documentation/features/locking/cmpxchg-local
-d:Documentation/features/locking/lockdep
-d:Documentation/features/locking/queued-rwlocks
-d:Documentation/features/locking/queued-spinlocks
-d:Documentation/features/perf
-d:Documentation/features/perf/kprobes-event
-d:Documentation/features/perf/perf-regs
-d:Documentation/features/perf/perf-stackdump
-d:Documentation/features/sched
-d:Documentation/features/sched/membarrier-sync-core
-d:Documentation/features/sched/numa-balancing
-d:Documentation/features/scripts
-d:Documentation/features/seccomp
-d:Documentation/features/seccomp/seccomp-filter
-d:Documentation/features/time
-d:Documentation/features/time/arch-tick-broadcast
-d:Documentation/features/time/clockevents
-d:Documentation/features/time/context-tracking
-d:Documentation/features/time/irq-time-acct
-d:Documentation/features/time/virt-cpuacct
-d:Documentation/features/vm
-d:Documentation/features/vm/ELF-ASLR
-d:Documentation/features/vm/THP
-d:Documentation/features/vm/TLB
-d:Documentation/features/vm/huge-vmap
-d:Documentation/features/vm/ioremap_prot
-d:Documentation/features/vm/pte_special
-d:Documentation/filesystems
-d:Documentation/filesystems/bcachefs
-d:Documentation/filesystems/bcachefs/future
-d:Documentation/filesystems/caching
-d:Documentation/filesystems/ext4
-d:Documentation/filesystems/iomap
-d:Documentation/filesystems/nfs
-d:Documentation/filesystems/smb
-d:Documentation/filesystems/spufs
-d:Documentation/filesystems/xfs
-d:Documentation/firmware-guide
-d:Documentation/firmware-guide/acpi
-d:Documentation/firmware-guide/acpi/apei
-d:Documentation/firmware-guide/acpi/dsd
-d:Documentation/firmware_class
-d:Documentation/fpga
-d:Documentation/gpu
-d:Documentation/gpu/amdgpu
-d:Documentation/gpu/amdgpu/display
-d:Documentation/gpu/amdgpu/gc
-d:Documentation/gpu/bridge
-d:Documentation/gpu/dp-mst
-d:Documentation/gpu/imagination
-d:Documentation/gpu/nova
-d:Documentation/gpu/nova/core
-d:Documentation/gpu/rfc
-d:Documentation/gpu/xe
-d:Documentation/hid
-d:Documentation/hwmon
-d:Documentation/i2c
-d:Documentation/i2c/busses
-d:Documentation/i2c/muxes
-d:Documentation/iio
-d:Documentation/images
-d:Documentation/infiniband
-d:Documentation/input
-d:Documentation/input/devices
-d:Documentation/input/joydev
-d:Documentation/isdn
-d:Documentation/kbuild
-d:Documentation/kernel-hacking
-d:Documentation/leds
-d:Documentation/litmus-tests
-d:Documentation/litmus-tests/atomic
-d:Documentation/litmus-tests/locking
-d:Documentation/litmus-tests/rcu
-d:Documentation/livepatch
-d:Documentation/locking
-d:Documentation/maintainer
-d:Documentation/mhi
-d:Documentation/misc-devices
-d:Documentation/mm
-d:Documentation/mm/damon
-d:Documentation/netlabel
-d:Documentation/netlink
-d:Documentation/netlink/specs
-d:Documentation/networking
-d:Documentation/networking/caif
-d:Documentation/networking/device_drivers
-d:Documentation/networking/device_drivers/atm
-d:Documentation/networking/device_drivers/can
-d:Documentation/networking/device_drivers/can/ctu
-d:Documentation/networking/device_drivers/can/freescale
-d:Documentation/networking/device_drivers/cellular
-d:Documentation/networking/device_drivers/cellular/qualcomm
-d:Documentation/networking/device_drivers/ethernet
-d:Documentation/networking/device_drivers/ethernet/3com
-d:Documentation/networking/device_drivers/ethernet/altera
-d:Documentation/networking/device_drivers/ethernet/amazon
-d:Documentation/networking/device_drivers/ethernet/amd
-d:Documentation/networking/device_drivers/ethernet/aquantia
-d:Documentation/networking/device_drivers/ethernet/chelsio
-d:Documentation/networking/device_drivers/ethernet/cirrus
-d:Documentation/networking/device_drivers/ethernet/davicom
-d:Documentation/networking/device_drivers/ethernet/dec
-d:Documentation/networking/device_drivers/ethernet/dlink
-d:Documentation/networking/device_drivers/ethernet/freescale
-d:Documentation/networking/device_drivers/ethernet/freescale/dpaa2
-d:Documentation/networking/device_drivers/ethernet/google
-d:Documentation/networking/device_drivers/ethernet/huawei
-d:Documentation/networking/device_drivers/ethernet/intel
-d:Documentation/networking/device_drivers/ethernet/marvell
-d:Documentation/networking/device_drivers/ethernet/mellanox
-d:Documentation/networking/device_drivers/ethernet/mellanox/mlx5
-d:Documentation/networking/device_drivers/ethernet/meta
-d:Documentation/networking/device_drivers/ethernet/microsoft
-d:Documentation/networking/device_drivers/ethernet/neterion
-d:Documentation/networking/device_drivers/ethernet/netronome
-d:Documentation/networking/device_drivers/ethernet/pensando
-d:Documentation/networking/device_drivers/ethernet/smsc
-d:Documentation/networking/device_drivers/ethernet/stmicro
-d:Documentation/networking/device_drivers/ethernet/ti
-d:Documentation/networking/device_drivers/ethernet/wangxun
-d:Documentation/networking/device_drivers/fddi
-d:Documentation/networking/device_drivers/hamradio
-d:Documentation/networking/device_drivers/wifi
-d:Documentation/networking/device_drivers/wifi/intel
-d:Documentation/networking/device_drivers/wwan
-d:Documentation/networking/devlink
-d:Documentation/networking/diagnostic
-d:Documentation/networking/dsa
-d:Documentation/networking/mac80211_hwsim
-d:Documentation/networking/net_cachelines
-d:Documentation/networking/netlink_spec
-d:Documentation/networking/pse-pd
-d:Documentation/nvdimm
-d:Documentation/nvme
-d:Documentation/pcmcia
-d:Documentation/peci
-d:Documentation/power
-d:Documentation/power/powercap
-d:Documentation/power/regulator
-d:Documentation/process
-d:Documentation/process/debugging
-d:Documentation/rust
-d:Documentation/scheduler
-d:Documentation/scsi
-d:Documentation/scsi/scsi_transport_srp
-d:Documentation/security
-d:Documentation/security/keys
-d:Documentation/security/secrets
-d:Documentation/security/tpm
-d:Documentation/sound
-d:Documentation/sound/cards
-d:Documentation/sound/codecs
-d:Documentation/sound/designs
-d:Documentation/sound/hd-audio
-d:Documentation/sound/kernel-api
-d:Documentation/sound/soc
-d:Documentation/sphinx
-d:Documentation/sphinx-static
-d:Documentation/sphinx/templates
-d:Documentation/spi
-d:Documentation/staging
-d:Documentation/sunrpc
-d:Documentation/sunrpc/xdr
-d:Documentation/target
-d:Documentation/tee
-d:Documentation/timers
-d:Documentation/tools
-d:Documentation/tools/rtla
-d:Documentation/tools/rv
-d:Documentation/trace
-d:Documentation/trace/coresight
-d:Documentation/trace/postprocess
-d:Documentation/trace/rv
-d:Documentation/translations
-d:Documentation/translations/it_IT
-d:Documentation/translations/it_IT/RCU
-d:Documentation/translations/it_IT/admin-guide
-d:Documentation/translations/it_IT/arch
-d:Documentation/translations/it_IT/arch/riscv
-d:Documentation/translations/it_IT/core-api
-d:Documentation/translations/it_IT/dev-tools
-d:Documentation/translations/it_IT/devicetree
-d:Documentation/translations/it_IT/devicetree/bindings
-d:Documentation/translations/it_IT/doc-guide
-d:Documentation/translations/it_IT/i2c
-d:Documentation/translations/it_IT/kernel-hacking
-d:Documentation/translations/it_IT/locking
-d:Documentation/translations/it_IT/maintainer
-d:Documentation/translations/it_IT/process
-d:Documentation/translations/it_IT/staging
-d:Documentation/translations/ja_JP
-d:Documentation/translations/ja_JP/process
-d:Documentation/translations/ko_KR
-d:Documentation/translations/ko_KR/core-api
-d:Documentation/translations/ko_KR/core-api/wrappers
-d:Documentation/translations/ko_KR/process
-d:Documentation/translations/sp_SP
-d:Documentation/translations/sp_SP/process
-d:Documentation/translations/sp_SP/scheduler
-d:Documentation/translations/sp_SP/wrappers
-d:Documentation/translations/zh_CN
-d:Documentation/translations/zh_CN/PCI
-d:Documentation/translations/zh_CN/accounting
-d:Documentation/translations/zh_CN/admin-guide
-d:Documentation/translations/zh_CN/admin-guide/mm
-d:Documentation/translations/zh_CN/admin-guide/mm/damon
-d:Documentation/translations/zh_CN/arch
-d:Documentation/translations/zh_CN/arch/arm
-d:Documentation/translations/zh_CN/arch/arm64
-d:Documentation/translations/zh_CN/arch/loongarch
-d:Documentation/translations/zh_CN/arch/mips
-d:Documentation/translations/zh_CN/arch/openrisc
-d:Documentation/translations/zh_CN/arch/parisc
-d:Documentation/translations/zh_CN/arch/riscv
-d:Documentation/translations/zh_CN/core-api
-d:Documentation/translations/zh_CN/core-api/irq
-d:Documentation/translations/zh_CN/cpu-freq
-d:Documentation/translations/zh_CN/dev-tools
-d:Documentation/translations/zh_CN/devicetree
-d:Documentation/translations/zh_CN/doc-guide
-d:Documentation/translations/zh_CN/driver-api
-d:Documentation/translations/zh_CN/driver-api/gpio
-d:Documentation/translations/zh_CN/driver-api/phy
-d:Documentation/translations/zh_CN/filesystems
-d:Documentation/translations/zh_CN/iio
-d:Documentation/translations/zh_CN/infiniband
-d:Documentation/translations/zh_CN/kbuild
-d:Documentation/translations/zh_CN/kernel-hacking
-d:Documentation/translations/zh_CN/locking
-d:Documentation/translations/zh_CN/maintainer
-d:Documentation/translations/zh_CN/mm
-d:Documentation/translations/zh_CN/mm/damon
-d:Documentation/translations/zh_CN/networking
-d:Documentation/translations/zh_CN/peci
-d:Documentation/translations/zh_CN/power
-d:Documentation/translations/zh_CN/process
-d:Documentation/translations/zh_CN/rust
-d:Documentation/translations/zh_CN/scheduler
-d:Documentation/translations/zh_CN/security
-d:Documentation/translations/zh_CN/security/keys
-d:Documentation/translations/zh_CN/security/secrets
-d:Documentation/translations/zh_CN/security/tpm
-d:Documentation/translations/zh_CN/sound
-d:Documentation/translations/zh_CN/sound/hd-audio
-d:Documentation/translations/zh_CN/staging
-d:Documentation/translations/zh_CN/userspace-api
-d:Documentation/translations/zh_CN/userspace-api/accelerators
-d:Documentation/translations/zh_CN/userspace-api/ebpf
-d:Documentation/translations/zh_CN/video4linux
-d:Documentation/translations/zh_CN/virt
-d:Documentation/translations/zh_CN/virt/acrn
-d:Documentation/translations/zh_TW
-d:Documentation/translations/zh_TW/admin-guide
-d:Documentation/translations/zh_TW/admin-guide/mm
-d:Documentation/translations/zh_TW/admin-guide/mm/damon
-d:Documentation/translations/zh_TW/arch
-d:Documentation/translations/zh_TW/arch/arm
-d:Documentation/translations/zh_TW/arch/arm64
-d:Documentation/translations/zh_TW/arch/loongarch
-d:Documentation/translations/zh_TW/arch/mips
-d:Documentation/translations/zh_TW/arch/openrisc
-d:Documentation/translations/zh_TW/arch/parisc
-d:Documentation/translations/zh_TW/cpu-freq
-d:Documentation/translations/zh_TW/dev-tools
-d:Documentation/translations/zh_TW/filesystems
-d:Documentation/translations/zh_TW/process
-d:Documentation/usb
-d:Documentation/userspace-api
-d:Documentation/userspace-api/accelerators
-d:Documentation/userspace-api/ebpf
-d:Documentation/userspace-api/fwctl
-d:Documentation/userspace-api/gpio
-d:Documentation/userspace-api/ioctl
-d:Documentation/userspace-api/media
-d:Documentation/userspace-api/media/cec
-d:Documentation/userspace-api/media/drivers
-d:Documentation/userspace-api/media/dvb
-d:Documentation/userspace-api/media/mediactl
-d:Documentation/userspace-api/media/rc
-d:Documentation/userspace-api/media/v4l
-d:Documentation/userspace-api/netlink
-d:Documentation/virt
-d:Documentation/virt/acrn
-d:Documentation/virt/coco
-d:Documentation/virt/hyperv
-d:Documentation/virt/kvm
-d:Documentation/virt/kvm/arm
-d:Documentation/virt/kvm/devices
-d:Documentation/virt/kvm/loongarch
-d:Documentation/virt/kvm/s390
-d:Documentation/virt/kvm/x86
-d:Documentation/virt/uml
-d:Documentation/w1
-d:Documentation/w1/masters
-d:Documentation/w1/slaves
-d:Documentation/watchdog
-d:Documentation/wmi
-d:Documentation/wmi/devices
-d:LICENSES
-d:LICENSES/deprecated
-d:LICENSES/dual
-d:LICENSES/exceptions
-d:LICENSES/preferred
-d:arch
-d:arch/alpha
-d:arch/alpha/boot
-d:arch/alpha/boot/tools
-d:arch/alpha/configs
-d:arch/alpha/include
-d:arch/alpha/include/asm
-d:arch/alpha/include/uapi
-d:arch/alpha/include/uapi/asm
-d:arch/alpha/kernel
-d:arch/alpha/kernel/syscalls
-d:arch/alpha/lib
-d:arch/alpha/math-emu
-d:arch/alpha/mm
-d:arch/arc
-d:arch/arc/boot
-d:arch/arc/boot/dts
-d:arch/arc/configs
-d:arch/arc/include
-d:arch/arc/include/asm
-d:arch/arc/include/uapi
-d:arch/arc/include/uapi/asm
-d:arch/arc/kernel
-d:arch/arc/lib
-d:arch/arc/mm
-d:arch/arc/net
-d:arch/arc/plat-axs10x
-d:arch/arc/plat-hsdk
-d:arch/arc/plat-sim
-d:arch/arc/plat-tb10x
-d:arch/arm
-d:arch/arm/boot
-d:arch/arm/boot/bootp
-d:arch/arm/boot/compressed
-d:arch/arm/boot/dts
-d:arch/arm/boot/dts/actions
-d:arch/arm/boot/dts/airoha
-d:arch/arm/boot/dts/allwinner
-d:arch/arm/boot/dts/alphascale
-d:arch/arm/boot/dts/amazon
-d:arch/arm/boot/dts/amlogic
-d:arch/arm/boot/dts/arm
-d:arch/arm/boot/dts/aspeed
-d:arch/arm/boot/dts/axis
-d:arch/arm/boot/dts/broadcom
-d:arch/arm/boot/dts/calxeda
-d:arch/arm/boot/dts/cirrus
-d:arch/arm/boot/dts/cnxt
-d:arch/arm/boot/dts/gemini
-d:arch/arm/boot/dts/hisilicon
-d:arch/arm/boot/dts/hpe
-d:arch/arm/boot/dts/intel
-d:arch/arm/boot/dts/intel/axm
-d:arch/arm/boot/dts/intel/ixp
-d:arch/arm/boot/dts/intel/pxa
-d:arch/arm/boot/dts/intel/socfpga
-d:arch/arm/boot/dts/marvell
-d:arch/arm/boot/dts/mediatek
-d:arch/arm/boot/dts/microchip
-d:arch/arm/boot/dts/moxa
-d:arch/arm/boot/dts/nspire
-d:arch/arm/boot/dts/nuvoton
-d:arch/arm/boot/dts/nvidia
-d:arch/arm/boot/dts/nxp
-d:arch/arm/boot/dts/nxp/imx
-d:arch/arm/boot/dts/nxp/lpc
-d:arch/arm/boot/dts/nxp/ls
-d:arch/arm/boot/dts/nxp/mxs
-d:arch/arm/boot/dts/nxp/vf
-d:arch/arm/boot/dts/qcom
-d:arch/arm/boot/dts/realtek
-d:arch/arm/boot/dts/renesas
-d:arch/arm/boot/dts/rockchip
-d:arch/arm/boot/dts/samsung
-d:arch/arm/boot/dts/sigmastar
-d:arch/arm/boot/dts/socionext
-d:arch/arm/boot/dts/st
-d:arch/arm/boot/dts/sunplus
-d:arch/arm/boot/dts/synaptics
-d:arch/arm/boot/dts/ti
-d:arch/arm/boot/dts/ti/davinci
-d:arch/arm/boot/dts/ti/keystone
-d:arch/arm/boot/dts/ti/omap
-d:arch/arm/boot/dts/unisoc
-d:arch/arm/boot/dts/vt8500
-d:arch/arm/boot/dts/xen
-d:arch/arm/boot/dts/xilinx
-d:arch/arm/common
-d:arch/arm/configs
-d:arch/arm/crypto
-d:arch/arm/include
-d:arch/arm/include/asm
-d:arch/arm/include/asm/hardware
-d:arch/arm/include/asm/mach
-d:arch/arm/include/asm/vdso
-d:arch/arm/include/asm/xen
-d:arch/arm/include/debug
-d:arch/arm/include/uapi
-d:arch/arm/include/uapi/asm
-d:arch/arm/kernel
-d:arch/arm/lib
-d:arch/arm/mach-actions
-d:arch/arm/mach-alpine
-d:arch/arm/mach-artpec
-d:arch/arm/mach-aspeed
-d:arch/arm/mach-at91
-d:arch/arm/mach-axxia
-d:arch/arm/mach-bcm
-d:arch/arm/mach-berlin
-d:arch/arm/mach-clps711x
-d:arch/arm/mach-davinci
-d:arch/arm/mach-digicolor
-d:arch/arm/mach-dove
-d:arch/arm/mach-ep93xx
-d:arch/arm/mach-exynos
-d:arch/arm/mach-footbridge
-d:arch/arm/mach-footbridge/include
-d:arch/arm/mach-footbridge/include/mach
-d:arch/arm/mach-gemini
-d:arch/arm/mach-highbank
-d:arch/arm/mach-hisi
-d:arch/arm/mach-hpe
-d:arch/arm/mach-imx
-d:arch/arm/mach-ixp4xx
-d:arch/arm/mach-keystone
-d:arch/arm/mach-lpc18xx
-d:arch/arm/mach-lpc32xx
-d:arch/arm/mach-mediatek
-d:arch/arm/mach-meson
-d:arch/arm/mach-milbeaut
-d:arch/arm/mach-mmp
-d:arch/arm/mach-mstar
-d:arch/arm/mach-mv78xx0
-d:arch/arm/mach-mvebu
-d:arch/arm/mach-mxs
-d:arch/arm/mach-nomadik
-d:arch/arm/mach-npcm
-d:arch/arm/mach-omap1
-d:arch/arm/mach-omap2
-d:arch/arm/mach-orion5x
-d:arch/arm/mach-pxa
-d:arch/arm/mach-qcom
-d:arch/arm/mach-realtek
-d:arch/arm/mach-rockchip
-d:arch/arm/mach-rpc
-d:arch/arm/mach-rpc/include
-d:arch/arm/mach-rpc/include/mach
-d:arch/arm/mach-s3c
-d:arch/arm/mach-s5pv210
-d:arch/arm/mach-sa1100
-d:arch/arm/mach-sa1100/include
-d:arch/arm/mach-sa1100/include/mach
-d:arch/arm/mach-shmobile
-d:arch/arm/mach-socfpga
-d:arch/arm/mach-spear
-d:arch/arm/mach-sti
-d:arch/arm/mach-stm32
-d:arch/arm/mach-sunxi
-d:arch/arm/mach-tegra
-d:arch/arm/mach-ux500
-d:arch/arm/mach-versatile
-d:arch/arm/mach-vt8500
-d:arch/arm/mach-zynq
-d:arch/arm/mm
-d:arch/arm/net
-d:arch/arm/nwfpe
-d:arch/arm/plat-orion
-d:arch/arm/plat-orion/include
-d:arch/arm/plat-orion/include/plat
-d:arch/arm/probes
-d:arch/arm/probes/kprobes
-d:arch/arm/probes/uprobes
-d:arch/arm/tools
-d:arch/arm/vdso
-d:arch/arm/vfp
-d:arch/arm/xen
-d:arch/arm64
-d:arch/arm64/boot
-d:arch/arm64/boot/dts
-d:arch/arm64/boot/dts/actions
-d:arch/arm64/boot/dts/airoha
-d:arch/arm64/boot/dts/allwinner
-d:arch/arm64/boot/dts/altera
-d:arch/arm64/boot/dts/amazon
-d:arch/arm64/boot/dts/amd
-d:arch/arm64/boot/dts/amlogic
-d:arch/arm64/boot/dts/apm
-d:arch/arm64/boot/dts/apple
-d:arch/arm64/boot/dts/arm
-d:arch/arm64/boot/dts/axiado
-d:arch/arm64/boot/dts/bitmain
-d:arch/arm64/boot/dts/blaize
-d:arch/arm64/boot/dts/broadcom
-d:arch/arm64/boot/dts/broadcom/bcmbca
-d:arch/arm64/boot/dts/broadcom/northstar2
-d:arch/arm64/boot/dts/broadcom/stingray
-d:arch/arm64/boot/dts/cavium
-d:arch/arm64/boot/dts/cix
-d:arch/arm64/boot/dts/exynos
-d:arch/arm64/boot/dts/exynos/google
-d:arch/arm64/boot/dts/freescale
-d:arch/arm64/boot/dts/hisilicon
-d:arch/arm64/boot/dts/intel
-d:arch/arm64/boot/dts/lg
-d:arch/arm64/boot/dts/marvell
-d:arch/arm64/boot/dts/marvell/mmp
-d:arch/arm64/boot/dts/mediatek
-d:arch/arm64/boot/dts/microchip
-d:arch/arm64/boot/dts/nuvoton
-d:arch/arm64/boot/dts/nvidia
-d:arch/arm64/boot/dts/qcom
-d:arch/arm64/boot/dts/realtek
-d:arch/arm64/boot/dts/renesas
-d:arch/arm64/boot/dts/rockchip
-d:arch/arm64/boot/dts/socionext
-d:arch/arm64/boot/dts/sophgo
-d:arch/arm64/boot/dts/sprd
-d:arch/arm64/boot/dts/st
-d:arch/arm64/boot/dts/synaptics
-d:arch/arm64/boot/dts/tesla
-d:arch/arm64/boot/dts/ti
-d:arch/arm64/boot/dts/toshiba
-d:arch/arm64/boot/dts/xilinx
-d:arch/arm64/configs
-d:arch/arm64/crypto
-d:arch/arm64/hyperv
-d:arch/arm64/include
-d:arch/arm64/include/asm
-d:arch/arm64/include/asm/stacktrace
-d:arch/arm64/include/asm/vdso
-d:arch/arm64/include/asm/xen
-d:arch/arm64/include/uapi
-d:arch/arm64/include/uapi/asm
-d:arch/arm64/kernel
-d:arch/arm64/kernel/pi
-d:arch/arm64/kernel/probes
-d:arch/arm64/kernel/vdso
-d:arch/arm64/kernel/vdso32
-d:arch/arm64/kvm
-d:arch/arm64/kvm/hyp
-d:arch/arm64/kvm/hyp/include
-d:arch/arm64/kvm/hyp/include/hyp
-d:arch/arm64/kvm/hyp/include/nvhe
-d:arch/arm64/kvm/hyp/nvhe
-d:arch/arm64/kvm/hyp/vhe
-d:arch/arm64/kvm/vgic
-d:arch/arm64/lib
-d:arch/arm64/mm
-d:arch/arm64/net
-d:arch/arm64/tools
-d:arch/arm64/xen
-d:arch/csky
-d:arch/csky/abiv1
-d:arch/csky/abiv1/inc
-d:arch/csky/abiv1/inc/abi
-d:arch/csky/abiv2
-d:arch/csky/abiv2/inc
-d:arch/csky/abiv2/inc/abi
-d:arch/csky/boot
-d:arch/csky/boot/dts
-d:arch/csky/configs
-d:arch/csky/include
-d:arch/csky/include/asm
-d:arch/csky/include/uapi
-d:arch/csky/include/uapi/asm
-d:arch/csky/kernel
-d:arch/csky/kernel/probes
-d:arch/csky/kernel/vdso
-d:arch/csky/lib
-d:arch/csky/mm
-d:arch/hexagon
-d:arch/hexagon/configs
-d:arch/hexagon/include
-d:arch/hexagon/include/asm
-d:arch/hexagon/include/uapi
-d:arch/hexagon/include/uapi/asm
-d:arch/hexagon/kernel
-d:arch/hexagon/lib
-d:arch/hexagon/mm
-d:arch/loongarch
-d:arch/loongarch/boot
-d:arch/loongarch/boot/dts
-d:arch/loongarch/configs
-d:arch/loongarch/crypto
-d:arch/loongarch/include
-d:arch/loongarch/include/asm
-d:arch/loongarch/include/asm/vdso
-d:arch/loongarch/include/uapi
-d:arch/loongarch/include/uapi/asm
-d:arch/loongarch/kernel
-d:arch/loongarch/kvm
-d:arch/loongarch/kvm/intc
-d:arch/loongarch/lib
-d:arch/loongarch/mm
-d:arch/loongarch/net
-d:arch/loongarch/pci
-d:arch/loongarch/power
-d:arch/loongarch/vdso
-d:arch/m68k
-d:arch/m68k/68000
-d:arch/m68k/amiga
-d:arch/m68k/apollo
-d:arch/m68k/atari
-d:arch/m68k/bvme6000
-d:arch/m68k/coldfire
-d:arch/m68k/configs
-d:arch/m68k/emu
-d:arch/m68k/fpsp040
-d:arch/m68k/hp300
-d:arch/m68k/ifpsp060
-d:arch/m68k/ifpsp060/src
-d:arch/m68k/include
-d:arch/m68k/include/asm
-d:arch/m68k/include/uapi
-d:arch/m68k/include/uapi/asm
-d:arch/m68k/kernel
-d:arch/m68k/kernel/syscalls
-d:arch/m68k/lib
-d:arch/m68k/mac
-d:arch/m68k/math-emu
-d:arch/m68k/mm
-d:arch/m68k/mvme147
-d:arch/m68k/mvme16x
-d:arch/m68k/q40
-d:arch/m68k/sun3
-d:arch/m68k/sun3/prom
-d:arch/m68k/sun3x
-d:arch/m68k/tools
-d:arch/m68k/tools/amiga
-d:arch/m68k/virt
-d:arch/microblaze
-d:arch/microblaze/boot
-d:arch/microblaze/boot/dts
-d:arch/microblaze/configs
-d:arch/microblaze/include
-d:arch/microblaze/include/asm
-d:arch/microblaze/include/uapi
-d:arch/microblaze/include/uapi/asm
-d:arch/microblaze/kernel
-d:arch/microblaze/kernel/cpu
-d:arch/microblaze/kernel/syscalls
-d:arch/microblaze/lib
-d:arch/microblaze/mm
-d:arch/microblaze/pci
-d:arch/mips
-d:arch/mips/alchemy
-d:arch/mips/alchemy/common
-d:arch/mips/alchemy/devboards
-d:arch/mips/ath25
-d:arch/mips/ath79
-d:arch/mips/bcm47xx
-d:arch/mips/bcm63xx
-d:arch/mips/bcm63xx/boards
-d:arch/mips/bmips
-d:arch/mips/boot
-d:arch/mips/boot/compressed
-d:arch/mips/boot/dts
-d:arch/mips/boot/dts/brcm
-d:arch/mips/boot/dts/cavium-octeon
-d:arch/mips/boot/dts/econet
-d:arch/mips/boot/dts/img
-d:arch/mips/boot/dts/ingenic
-d:arch/mips/boot/dts/lantiq
-d:arch/mips/boot/dts/loongson
-d:arch/mips/boot/dts/mobileye
-d:arch/mips/boot/dts/mscc
-d:arch/mips/boot/dts/mti
-d:arch/mips/boot/dts/ni
-d:arch/mips/boot/dts/pic32
-d:arch/mips/boot/dts/qca
-d:arch/mips/boot/dts/ralink
-d:arch/mips/boot/dts/realtek
-d:arch/mips/boot/dts/xilfpga
-d:arch/mips/boot/tools
-d:arch/mips/cavium-octeon
-d:arch/mips/cavium-octeon/crypto
-d:arch/mips/cavium-octeon/executive
-d:arch/mips/cobalt
-d:arch/mips/configs
-d:arch/mips/configs/generic
-d:arch/mips/crypto
-d:arch/mips/dec
-d:arch/mips/dec/prom
-d:arch/mips/econet
-d:arch/mips/fw
-d:arch/mips/fw/arc
-d:arch/mips/fw/cfe
-d:arch/mips/fw/lib
-d:arch/mips/fw/sni
-d:arch/mips/generic
-d:arch/mips/include
-d:arch/mips/include/asm
-d:arch/mips/include/asm/dec
-d:arch/mips/include/asm/fw
-d:arch/mips/include/asm/fw/arc
-d:arch/mips/include/asm/fw/cfe
-d:arch/mips/include/asm/ip32
-d:arch/mips/include/asm/mach-ath25
-d:arch/mips/include/asm/mach-ath79
-d:arch/mips/include/asm/mach-au1x00
-d:arch/mips/include/asm/mach-bcm47xx
-d:arch/mips/include/asm/mach-bcm63xx
-d:arch/mips/include/asm/mach-bmips
-d:arch/mips/include/asm/mach-cavium-octeon
-d:arch/mips/include/asm/mach-cobalt
-d:arch/mips/include/asm/mach-db1x00
-d:arch/mips/include/asm/mach-dec
-d:arch/mips/include/asm/mach-generic
-d:arch/mips/include/asm/mach-ingenic
-d:arch/mips/include/asm/mach-ip22
-d:arch/mips/include/asm/mach-ip27
-d:arch/mips/include/asm/mach-ip28
-d:arch/mips/include/asm/mach-ip30
-d:arch/mips/include/asm/mach-ip32
-d:arch/mips/include/asm/mach-jazz
-d:arch/mips/include/asm/mach-lantiq
-d:arch/mips/include/asm/mach-lantiq/falcon
-d:arch/mips/include/asm/mach-lantiq/xway
-d:arch/mips/include/asm/mach-loongson2ef
-d:arch/mips/include/asm/mach-loongson2ef/cs5536
-d:arch/mips/include/asm/mach-loongson32
-d:arch/mips/include/asm/mach-loongson64
-d:arch/mips/include/asm/mach-malta
-d:arch/mips/include/asm/mach-n64
-d:arch/mips/include/asm/mach-pic32
-d:arch/mips/include/asm/mach-ralink
-d:arch/mips/include/asm/mach-ralink/mt7620
-d:arch/mips/include/asm/mach-ralink/mt7621
-d:arch/mips/include/asm/mach-ralink/rt288x
-d:arch/mips/include/asm/mach-ralink/rt305x
-d:arch/mips/include/asm/mach-ralink/rt3883
-d:arch/mips/include/asm/mach-rc32434
-d:arch/mips/include/asm/mach-rm
-d:arch/mips/include/asm/mach-sibyte
-d:arch/mips/include/asm/mach-tx49xx
-d:arch/mips/include/asm/mips-boards
-d:arch/mips/include/asm/octeon
-d:arch/mips/include/asm/pci
-d:arch/mips/include/asm/sgi
-d:arch/mips/include/asm/sibyte
-d:arch/mips/include/asm/sn
-d:arch/mips/include/asm/sn/sn0
-d:arch/mips/include/asm/txx9
-d:arch/mips/include/asm/vdso
-d:arch/mips/include/asm/xtalk
-d:arch/mips/include/uapi
-d:arch/mips/include/uapi/asm
-d:arch/mips/ingenic
-d:arch/mips/jazz
-d:arch/mips/kernel
-d:arch/mips/kernel/syscalls
-d:arch/mips/kvm
-d:arch/mips/lantiq
-d:arch/mips/lantiq/falcon
-d:arch/mips/lantiq/xway
-d:arch/mips/lib
-d:arch/mips/loongson2ef
-d:arch/mips/loongson2ef/common
-d:arch/mips/loongson2ef/common/cs5536
-d:arch/mips/loongson2ef/fuloong-2e
-d:arch/mips/loongson2ef/lemote-2f
-d:arch/mips/loongson32
-d:arch/mips/loongson32/common
-d:arch/mips/loongson32/ls1b
-d:arch/mips/loongson32/ls1c
-d:arch/mips/loongson64
-d:arch/mips/math-emu
-d:arch/mips/mm
-d:arch/mips/mobileye
-d:arch/mips/mti-malta
-d:arch/mips/n64
-d:arch/mips/net
-d:arch/mips/pci
-d:arch/mips/pic32
-d:arch/mips/pic32/common
-d:arch/mips/pic32/pic32mzda
-d:arch/mips/power
-d:arch/mips/ralink
-d:arch/mips/rb532
-d:arch/mips/sgi-ip22
-d:arch/mips/sgi-ip27
-d:arch/mips/sgi-ip30
-d:arch/mips/sgi-ip32
-d:arch/mips/sibyte
-d:arch/mips/sibyte/bcm1480
-d:arch/mips/sibyte/common
-d:arch/mips/sibyte/sb1250
-d:arch/mips/sibyte/swarm
-d:arch/mips/sni
-d:arch/mips/tools
-d:arch/mips/txx9
-d:arch/mips/txx9/generic
-d:arch/mips/txx9/rbtx4927
-d:arch/mips/vdso
-d:arch/nios2
-d:arch/nios2/boot
-d:arch/nios2/boot/compressed
-d:arch/nios2/boot/dts
-d:arch/nios2/configs
-d:arch/nios2/include
-d:arch/nios2/include/asm
-d:arch/nios2/include/uapi
-d:arch/nios2/include/uapi/asm
-d:arch/nios2/kernel
-d:arch/nios2/lib
-d:arch/nios2/mm
-d:arch/nios2/platform
-d:arch/openrisc
-d:arch/openrisc/boot
-d:arch/openrisc/boot/dts
-d:arch/openrisc/configs
-d:arch/openrisc/include
-d:arch/openrisc/include/asm
-d:arch/openrisc/include/asm/bitops
-d:arch/openrisc/include/uapi
-d:arch/openrisc/include/uapi/asm
-d:arch/openrisc/kernel
-d:arch/openrisc/lib
-d:arch/openrisc/mm
-d:arch/parisc
-d:arch/parisc/boot
-d:arch/parisc/boot/compressed
-d:arch/parisc/configs
-d:arch/parisc/include
-d:arch/parisc/include/asm
-d:arch/parisc/include/uapi
-d:arch/parisc/include/uapi/asm
-d:arch/parisc/kernel
-d:arch/parisc/kernel/syscalls
-d:arch/parisc/kernel/vdso32
-d:arch/parisc/kernel/vdso64
-d:arch/parisc/lib
-d:arch/parisc/math-emu
-d:arch/parisc/mm
-d:arch/parisc/net
-d:arch/parisc/video
-d:arch/powerpc
-d:arch/powerpc/boot
-d:arch/powerpc/boot/dts
-d:arch/powerpc/boot/dts/fsl
-d:arch/powerpc/configs
-d:arch/powerpc/configs/44x
-d:arch/powerpc/configs/52xx
-d:arch/powerpc/configs/83xx
-d:arch/powerpc/configs/85xx
-d:arch/powerpc/crypto
-d:arch/powerpc/include
-d:arch/powerpc/include/asm
-d:arch/powerpc/include/asm/book3s
-d:arch/powerpc/include/asm/book3s/32
-d:arch/powerpc/include/asm/book3s/64
-d:arch/powerpc/include/asm/nohash
-d:arch/powerpc/include/asm/nohash/32
-d:arch/powerpc/include/asm/nohash/64
-d:arch/powerpc/include/asm/vdso
-d:arch/powerpc/include/uapi
-d:arch/powerpc/include/uapi/asm
-d:arch/powerpc/kernel
-d:arch/powerpc/kernel/ptrace
-d:arch/powerpc/kernel/syscalls
-d:arch/powerpc/kernel/trace
-d:arch/powerpc/kernel/vdso
-d:arch/powerpc/kexec
-d:arch/powerpc/kvm
-d:arch/powerpc/lib
-d:arch/powerpc/math-emu
-d:arch/powerpc/mm
-d:arch/powerpc/mm/book3s32
-d:arch/powerpc/mm/book3s64
-d:arch/powerpc/mm/kasan
-d:arch/powerpc/mm/nohash
-d:arch/powerpc/mm/ptdump
-d:arch/powerpc/net
-d:arch/powerpc/perf
-d:arch/powerpc/perf/req-gen
-d:arch/powerpc/platforms
-d:arch/powerpc/platforms/44x
-d:arch/powerpc/platforms/512x
-d:arch/powerpc/platforms/52xx
-d:arch/powerpc/platforms/82xx
-d:arch/powerpc/platforms/83xx
-d:arch/powerpc/platforms/85xx
-d:arch/powerpc/platforms/86xx
-d:arch/powerpc/platforms/8xx
-d:arch/powerpc/platforms/amigaone
-d:arch/powerpc/platforms/book3s
-d:arch/powerpc/platforms/cell
-d:arch/powerpc/platforms/cell/spufs
-d:arch/powerpc/platforms/chrp
-d:arch/powerpc/platforms/embedded6xx
-d:arch/powerpc/platforms/microwatt
-d:arch/powerpc/platforms/pasemi
-d:arch/powerpc/platforms/powermac
-d:arch/powerpc/platforms/powernv
-d:arch/powerpc/platforms/ps3
-d:arch/powerpc/platforms/pseries
-d:arch/powerpc/purgatory
-d:arch/powerpc/sysdev
-d:arch/powerpc/sysdev/ge
-d:arch/powerpc/sysdev/xics
-d:arch/powerpc/sysdev/xive
-d:arch/powerpc/tools
-d:arch/powerpc/xmon
-d:arch/riscv
-d:arch/riscv/boot
-d:arch/riscv/boot/dts
-d:arch/riscv/boot/dts/allwinner
-d:arch/riscv/boot/dts/andes
-d:arch/riscv/boot/dts/canaan
-d:arch/riscv/boot/dts/microchip
-d:arch/riscv/boot/dts/renesas
-d:arch/riscv/boot/dts/sifive
-d:arch/riscv/boot/dts/sophgo
-d:arch/riscv/boot/dts/spacemit
-d:arch/riscv/boot/dts/starfive
-d:arch/riscv/boot/dts/thead
-d:arch/riscv/configs
-d:arch/riscv/crypto
-d:arch/riscv/errata
-d:arch/riscv/errata/andes
-d:arch/riscv/errata/sifive
-d:arch/riscv/errata/thead
-d:arch/riscv/include
-d:arch/riscv/include/asm
-d:arch/riscv/include/asm/vdso
-d:arch/riscv/include/asm/vendor_extensions
-d:arch/riscv/include/uapi
-d:arch/riscv/include/uapi/asm
-d:arch/riscv/include/uapi/asm/vendor
-d:arch/riscv/kernel
-d:arch/riscv/kernel/compat_vdso
-d:arch/riscv/kernel/pi
-d:arch/riscv/kernel/probes
-d:arch/riscv/kernel/tests
-d:arch/riscv/kernel/tests/module_test
-d:arch/riscv/kernel/vdso
-d:arch/riscv/kernel/vendor_extensions
-d:arch/riscv/kvm
-d:arch/riscv/lib
-d:arch/riscv/mm
-d:arch/riscv/net
-d:arch/riscv/purgatory
-d:arch/riscv/tools
-d:arch/s390
-d:arch/s390/appldata
-d:arch/s390/boot
-d:arch/s390/configs
-d:arch/s390/crypto
-d:arch/s390/hypfs
-d:arch/s390/include
-d:arch/s390/include/asm
-d:arch/s390/include/asm/trace
-d:arch/s390/include/asm/vdso
-d:arch/s390/include/uapi
-d:arch/s390/include/uapi/asm
-d:arch/s390/kernel
-d:arch/s390/kernel/diag
-d:arch/s390/kernel/syscalls
-d:arch/s390/kernel/vdso32
-d:arch/s390/kernel/vdso64
-d:arch/s390/kvm
-d:arch/s390/lib
-d:arch/s390/mm
-d:arch/s390/net
-d:arch/s390/pci
-d:arch/s390/purgatory
-d:arch/s390/tools
-d:arch/sh
-d:arch/sh/boards
-d:arch/sh/boards/mach-ap325rxa
-d:arch/sh/boards/mach-dreamcast
-d:arch/sh/boards/mach-ecovec24
-d:arch/sh/boards/mach-highlander
-d:arch/sh/boards/mach-hp6xx
-d:arch/sh/boards/mach-kfr2r09
-d:arch/sh/boards/mach-landisk
-d:arch/sh/boards/mach-lboxre2
-d:arch/sh/boards/mach-migor
-d:arch/sh/boards/mach-r2d
-d:arch/sh/boards/mach-rsk
-d:arch/sh/boards/mach-sdk7780
-d:arch/sh/boards/mach-sdk7786
-d:arch/sh/boards/mach-se
-d:arch/sh/boards/mach-se/7206
-d:arch/sh/boards/mach-se/7343
-d:arch/sh/boards/mach-se/770x
-d:arch/sh/boards/mach-se/7721
-d:arch/sh/boards/mach-se/7722
-d:arch/sh/boards/mach-se/7724
-d:arch/sh/boards/mach-se/7751
-d:arch/sh/boards/mach-se/7780
-d:arch/sh/boards/mach-sh03
-d:arch/sh/boards/mach-sh7763rdp
-d:arch/sh/boards/mach-x3proto
-d:arch/sh/boot
-d:arch/sh/boot/compressed
-d:arch/sh/boot/dts
-d:arch/sh/boot/romimage
-d:arch/sh/cchips
-d:arch/sh/cchips/hd6446x
-d:arch/sh/configs
-d:arch/sh/drivers
-d:arch/sh/drivers/dma
-d:arch/sh/drivers/pci
-d:arch/sh/include
-d:arch/sh/include/asm
-d:arch/sh/include/cpu-common
-d:arch/sh/include/cpu-common/cpu
-d:arch/sh/include/cpu-sh2
-d:arch/sh/include/cpu-sh2/cpu
-d:arch/sh/include/cpu-sh2a
-d:arch/sh/include/cpu-sh2a/cpu
-d:arch/sh/include/cpu-sh3
-d:arch/sh/include/cpu-sh3/cpu
-d:arch/sh/include/cpu-sh4
-d:arch/sh/include/cpu-sh4/cpu
-d:arch/sh/include/cpu-sh4a
-d:arch/sh/include/cpu-sh4a/cpu
-d:arch/sh/include/mach-common
-d:arch/sh/include/mach-common/mach
-d:arch/sh/include/mach-dreamcast
-d:arch/sh/include/mach-dreamcast/mach
-d:arch/sh/include/mach-ecovec24
-d:arch/sh/include/mach-ecovec24/mach
-d:arch/sh/include/mach-kfr2r09
-d:arch/sh/include/mach-kfr2r09/mach
-d:arch/sh/include/mach-landisk
-d:arch/sh/include/mach-landisk/mach
-d:arch/sh/include/mach-migor
-d:arch/sh/include/mach-migor/mach
-d:arch/sh/include/mach-sdk7786
-d:arch/sh/include/mach-sdk7786/mach
-d:arch/sh/include/mach-se
-d:arch/sh/include/mach-se/mach
-d:arch/sh/include/mach-sh03
-d:arch/sh/include/mach-sh03/mach
-d:arch/sh/include/mach-x3proto
-d:arch/sh/include/mach-x3proto/mach
-d:arch/sh/include/uapi
-d:arch/sh/include/uapi/asm
-d:arch/sh/kernel
-d:arch/sh/kernel/cpu
-d:arch/sh/kernel/cpu/irq
-d:arch/sh/kernel/cpu/sh2
-d:arch/sh/kernel/cpu/sh2a
-d:arch/sh/kernel/cpu/sh3
-d:arch/sh/kernel/cpu/sh4
-d:arch/sh/kernel/cpu/sh4a
-d:arch/sh/kernel/cpu/shmobile
-d:arch/sh/kernel/syscalls
-d:arch/sh/kernel/vsyscall
-d:arch/sh/lib
-d:arch/sh/math-emu
-d:arch/sh/mm
-d:arch/sh/tools
-d:arch/sparc
-d:arch/sparc/boot
-d:arch/sparc/configs
-d:arch/sparc/crypto
-d:arch/sparc/include
-d:arch/sparc/include/asm
-d:arch/sparc/include/uapi
-d:arch/sparc/include/uapi/asm
-d:arch/sparc/kernel
-d:arch/sparc/kernel/syscalls
-d:arch/sparc/lib
-d:arch/sparc/math-emu
-d:arch/sparc/mm
-d:arch/sparc/net
-d:arch/sparc/power
-d:arch/sparc/prom
-d:arch/sparc/vdso
-d:arch/sparc/vdso/vdso32
-d:arch/sparc/video
-d:arch/um
-d:arch/um/configs
-d:arch/um/drivers
-d:arch/um/include
-d:arch/um/include/asm
-d:arch/um/include/asm/fpu
-d:arch/um/include/linux
-d:arch/um/include/shared
-d:arch/um/include/shared/skas
-d:arch/um/include/uapi
-d:arch/um/include/uapi/asm
-d:arch/um/kernel
-d:arch/um/kernel/skas
-d:arch/um/os-Linux
-d:arch/um/os-Linux/skas
-d:arch/um/scripts
-d:arch/x86
-d:arch/x86/boot
-d:arch/x86/boot/compressed
-d:arch/x86/boot/startup
-d:arch/x86/coco
-d:arch/x86/coco/sev
-d:arch/x86/coco/tdx
-d:arch/x86/configs
-d:arch/x86/crypto
-d:arch/x86/entry
-d:arch/x86/entry/syscalls
-d:arch/x86/entry/vdso
-d:arch/x86/entry/vdso/vdso32
-d:arch/x86/entry/vsyscall
-d:arch/x86/events
-d:arch/x86/events/amd
-d:arch/x86/events/intel
-d:arch/x86/events/zhaoxin
-d:arch/x86/hyperv
-d:arch/x86/ia32
-d:arch/x86/include
-d:arch/x86/include/asm
-d:arch/x86/include/asm/amd
-d:arch/x86/include/asm/cpuid
-d:arch/x86/include/asm/e820
-d:arch/x86/include/asm/fpu
-d:arch/x86/include/asm/numachip
-d:arch/x86/include/asm/shared
-d:arch/x86/include/asm/trace
-d:arch/x86/include/asm/uv
-d:arch/x86/include/asm/vdso
-d:arch/x86/include/asm/xen
-d:arch/x86/include/uapi
-d:arch/x86/include/uapi/asm
-d:arch/x86/kernel
-d:arch/x86/kernel/acpi
-d:arch/x86/kernel/apic
-d:arch/x86/kernel/cpu
-d:arch/x86/kernel/cpu/mce
-d:arch/x86/kernel/cpu/microcode
-d:arch/x86/kernel/cpu/mtrr
-d:arch/x86/kernel/cpu/resctrl
-d:arch/x86/kernel/cpu/sgx
-d:arch/x86/kernel/fpu
-d:arch/x86/kernel/kprobes
-d:arch/x86/kvm
-d:arch/x86/kvm/mmu
-d:arch/x86/kvm/svm
-d:arch/x86/kvm/vmx
-d:arch/x86/lib
-d:arch/x86/math-emu
-d:arch/x86/mm
-d:arch/x86/mm/pat
-d:arch/x86/net
-d:arch/x86/pci
-d:arch/x86/platform
-d:arch/x86/platform/atom
-d:arch/x86/platform/ce4100
-d:arch/x86/platform/efi
-d:arch/x86/platform/geode
-d:arch/x86/platform/intel
-d:arch/x86/platform/intel-mid
-d:arch/x86/platform/intel-quark
-d:arch/x86/platform/iris
-d:arch/x86/platform/olpc
-d:arch/x86/platform/pvh
-d:arch/x86/platform/scx200
-d:arch/x86/platform/ts5500
-d:arch/x86/platform/uv
-d:arch/x86/power
-d:arch/x86/purgatory
-d:arch/x86/ras
-d:arch/x86/realmode
-d:arch/x86/realmode/rm
-d:arch/x86/tools
-d:arch/x86/um
-d:arch/x86/um/asm
-d:arch/x86/um/os-Linux
-d:arch/x86/um/shared
-d:arch/x86/um/shared/sysdep
-d:arch/x86/um/vdso
-d:arch/x86/video
-d:arch/x86/virt
-d:arch/x86/virt/svm
-d:arch/x86/virt/vmx
-d:arch/x86/virt/vmx/tdx
-d:arch/x86/xen
-d:arch/xtensa
-d:arch/xtensa/boot
-d:arch/xtensa/boot/boot-elf
-d:arch/xtensa/boot/boot-redboot
-d:arch/xtensa/boot/dts
-d:arch/xtensa/boot/lib
-d:arch/xtensa/configs
-d:arch/xtensa/include
-d:arch/xtensa/include/asm
-d:arch/xtensa/include/uapi
-d:arch/xtensa/include/uapi/asm
-d:arch/xtensa/kernel
-d:arch/xtensa/kernel/syscalls
-d:arch/xtensa/lib
-d:arch/xtensa/mm
-d:arch/xtensa/platforms
-d:arch/xtensa/platforms/iss
-d:arch/xtensa/platforms/iss/include
-d:arch/xtensa/platforms/iss/include/platform
-d:arch/xtensa/platforms/xt2000
-d:arch/xtensa/platforms/xt2000/include
-d:arch/xtensa/platforms/xt2000/include/platform
-d:arch/xtensa/platforms/xtfpga
-d:arch/xtensa/platforms/xtfpga/include
-d:arch/xtensa/platforms/xtfpga/include/platform
-d:arch/xtensa/variants
-d:arch/xtensa/variants/csp
-d:arch/xtensa/variants/csp/include
-d:arch/xtensa/variants/csp/include/variant
-d:arch/xtensa/variants/dc232b
-d:arch/xtensa/variants/dc232b/include
-d:arch/xtensa/variants/dc232b/include/variant
-d:arch/xtensa/variants/dc233c
-d:arch/xtensa/variants/dc233c/include
-d:arch/xtensa/variants/dc233c/include/variant
-d:arch/xtensa/variants/de212
-d:arch/xtensa/variants/de212/include
-d:arch/xtensa/variants/de212/include/variant
-d:arch/xtensa/variants/fsf
-d:arch/xtensa/variants/fsf/include
-d:arch/xtensa/variants/fsf/include/variant
-d:arch/xtensa/variants/test_kc705_be
-d:arch/xtensa/variants/test_kc705_be/include
-d:arch/xtensa/variants/test_kc705_be/include/variant
-d:arch/xtensa/variants/test_kc705_hifi
-d:arch/xtensa/variants/test_kc705_hifi/include
-d:arch/xtensa/variants/test_kc705_hifi/include/variant
-d:arch/xtensa/variants/test_mmuhifi_c3
-d:arch/xtensa/variants/test_mmuhifi_c3/include
-d:arch/xtensa/variants/test_mmuhifi_c3/include/variant
-d:block
-d:block/partitions
-d:certs
-d:crypto
-d:crypto/asymmetric_keys
-d:crypto/async_tx
-d:crypto/krb5
-d:drivers
-d:drivers/accel
-d:drivers/accel/amdxdna
-d:drivers/accel/habanalabs
-d:drivers/accel/habanalabs/common
-d:drivers/accel/habanalabs/common/mmu
-d:drivers/accel/habanalabs/common/pci
-d:drivers/accel/habanalabs/gaudi
-d:drivers/accel/habanalabs/gaudi2
-d:drivers/accel/habanalabs/goya
-d:drivers/accel/habanalabs/include
-d:drivers/accel/habanalabs/include/common
-d:drivers/accel/habanalabs/include/gaudi
-d:drivers/accel/habanalabs/include/gaudi/asic_reg
-d:drivers/accel/habanalabs/include/gaudi2
-d:drivers/accel/habanalabs/include/gaudi2/arc
-d:drivers/accel/habanalabs/include/gaudi2/asic_reg
-d:drivers/accel/habanalabs/include/goya
-d:drivers/accel/habanalabs/include/goya/asic_reg
-d:drivers/accel/habanalabs/include/hw_ip
-d:drivers/accel/habanalabs/include/hw_ip/mmu
-d:drivers/accel/habanalabs/include/hw_ip/pci
-d:drivers/accel/ivpu
-d:drivers/accel/qaic
-d:drivers/accessibility
-d:drivers/accessibility/braille
-d:drivers/accessibility/speakup
-d:drivers/acpi
-d:drivers/acpi/acpica
-d:drivers/acpi/apei
-d:drivers/acpi/arm64
-d:drivers/acpi/dptf
-d:drivers/acpi/nfit
-d:drivers/acpi/numa
-d:drivers/acpi/pmic
-d:drivers/acpi/riscv
-d:drivers/acpi/x86
-d:drivers/amba
-d:drivers/android
-d:drivers/android/tests
-d:drivers/ata
-d:drivers/ata/pata_parport
-d:drivers/atm
-d:drivers/auxdisplay
-d:drivers/base
-d:drivers/base/firmware_loader
-d:drivers/base/firmware_loader/builtin
-d:drivers/base/power
-d:drivers/base/regmap
-d:drivers/base/test
-d:drivers/bcma
-d:drivers/block
-d:drivers/block/aoe
-d:drivers/block/drbd
-d:drivers/block/mtip32xx
-d:drivers/block/null_blk
-d:drivers/block/rnbd
-d:drivers/block/xen-blkback
-d:drivers/block/zram
-d:drivers/bluetooth
-d:drivers/bus
-d:drivers/bus/fsl-mc
-d:drivers/bus/mhi
-d:drivers/bus/mhi/ep
-d:drivers/bus/mhi/host
-d:drivers/cache
-d:drivers/cdrom
-d:drivers/cdx
-d:drivers/cdx/controller
-d:drivers/char
-d:drivers/char/agp
-d:drivers/char/hw_random
-d:drivers/char/ipmi
-d:drivers/char/mwave
-d:drivers/char/tpm
-d:drivers/char/tpm/eventlog
-d:drivers/char/tpm/st33zp24
-d:drivers/char/xilinx_hwicap
-d:drivers/char/xillybus
-d:drivers/clk
-d:drivers/clk/actions
-d:drivers/clk/analogbits
-d:drivers/clk/at91
-d:drivers/clk/axis
-d:drivers/clk/axs10x
-d:drivers/clk/baikal-t1
-d:drivers/clk/bcm
-d:drivers/clk/berlin
-d:drivers/clk/davinci
-d:drivers/clk/hisilicon
-d:drivers/clk/imgtec
-d:drivers/clk/imx
-d:drivers/clk/ingenic
-d:drivers/clk/keystone
-d:drivers/clk/mediatek
-d:drivers/clk/meson
-d:drivers/clk/microchip
-d:drivers/clk/mmp
-d:drivers/clk/mstar
-d:drivers/clk/mvebu
-d:drivers/clk/mxs
-d:drivers/clk/nuvoton
-d:drivers/clk/nxp
-d:drivers/clk/pistachio
-d:drivers/clk/pxa
-d:drivers/clk/qcom
-d:drivers/clk/ralink
-d:drivers/clk/renesas
-d:drivers/clk/rockchip
-d:drivers/clk/samsung
-d:drivers/clk/sifive
-d:drivers/clk/socfpga
-d:drivers/clk/sophgo
-d:drivers/clk/spacemit
-d:drivers/clk/spear
-d:drivers/clk/sprd
-d:drivers/clk/st
-d:drivers/clk/starfive
-d:drivers/clk/stm32
-d:drivers/clk/sunxi
-d:drivers/clk/sunxi-ng
-d:drivers/clk/tegra
-d:drivers/clk/thead
-d:drivers/clk/ti
-d:drivers/clk/uniphier
-d:drivers/clk/ux500
-d:drivers/clk/versatile
-d:drivers/clk/visconti
-d:drivers/clk/x86
-d:drivers/clk/xilinx
-d:drivers/clk/zynq
-d:drivers/clk/zynqmp
-d:drivers/clocksource
-d:drivers/comedi
-d:drivers/comedi/drivers
-d:drivers/comedi/drivers/ni_routing
-d:drivers/comedi/drivers/ni_routing/ni_device_routes
-d:drivers/comedi/drivers/ni_routing/ni_route_values
-d:drivers/comedi/drivers/ni_routing/tools
-d:drivers/comedi/drivers/tests
-d:drivers/comedi/kcomedilib
-d:drivers/connector
-d:drivers/counter
-d:drivers/cpufreq
-d:drivers/cpuidle
-d:drivers/cpuidle/governors
-d:drivers/crypto
-d:drivers/crypto/allwinner
-d:drivers/crypto/allwinner/sun4i-ss
-d:drivers/crypto/allwinner/sun8i-ce
-d:drivers/crypto/allwinner/sun8i-ss
-d:drivers/crypto/amcc
-d:drivers/crypto/amlogic
-d:drivers/crypto/aspeed
-d:drivers/crypto/axis
-d:drivers/crypto/bcm
-d:drivers/crypto/caam
-d:drivers/crypto/cavium
-d:drivers/crypto/cavium/cpt
-d:drivers/crypto/cavium/nitrox
-d:drivers/crypto/ccp
-d:drivers/crypto/ccree
-d:drivers/crypto/chelsio
-d:drivers/crypto/gemini
-d:drivers/crypto/hisilicon
-d:drivers/crypto/hisilicon/hpre
-d:drivers/crypto/hisilicon/sec
-d:drivers/crypto/hisilicon/sec2
-d:drivers/crypto/hisilicon/trng
-d:drivers/crypto/hisilicon/zip
-d:drivers/crypto/inside-secure
-d:drivers/crypto/inside-secure/eip93
-d:drivers/crypto/intel
-d:drivers/crypto/intel/iaa
-d:drivers/crypto/intel/ixp4xx
-d:drivers/crypto/intel/keembay
-d:drivers/crypto/intel/qat
-d:drivers/crypto/intel/qat/qat_420xx
-d:drivers/crypto/intel/qat/qat_4xxx
-d:drivers/crypto/intel/qat/qat_6xxx
-d:drivers/crypto/intel/qat/qat_c3xxx
-d:drivers/crypto/intel/qat/qat_c3xxxvf
-d:drivers/crypto/intel/qat/qat_c62x
-d:drivers/crypto/intel/qat/qat_c62xvf
-d:drivers/crypto/intel/qat/qat_common
-d:drivers/crypto/intel/qat/qat_dh895xcc
-d:drivers/crypto/intel/qat/qat_dh895xccvf
-d:drivers/crypto/marvell
-d:drivers/crypto/marvell/cesa
-d:drivers/crypto/marvell/octeontx
-d:drivers/crypto/marvell/octeontx2
-d:drivers/crypto/nx
-d:drivers/crypto/qce
-d:drivers/crypto/rockchip
-d:drivers/crypto/starfive
-d:drivers/crypto/stm32
-d:drivers/crypto/tegra
-d:drivers/crypto/virtio
-d:drivers/crypto/xilinx
-d:drivers/cxl
-d:drivers/cxl/core
-d:drivers/dax
-d:drivers/dax/hmem
-d:drivers/dca
-d:drivers/devfreq
-d:drivers/devfreq/event
-d:drivers/dio
-d:drivers/dma
-d:drivers/dma-buf
-d:drivers/dma-buf/heaps
-d:drivers/dma/amd
-d:drivers/dma/amd/ae4dma
-d:drivers/dma/amd/ptdma
-d:drivers/dma/amd/qdma
-d:drivers/dma/bestcomm
-d:drivers/dma/dw
-d:drivers/dma/dw-axi-dmac
-d:drivers/dma/dw-edma
-d:drivers/dma/fsl-dpaa2-qdma
-d:drivers/dma/hsu
-d:drivers/dma/idxd
-d:drivers/dma/ioat
-d:drivers/dma/lgm
-d:drivers/dma/mediatek
-d:drivers/dma/ppc4xx
-d:drivers/dma/qcom
-d:drivers/dma/sf-pdma
-d:drivers/dma/sh
-d:drivers/dma/stm32
-d:drivers/dma/ti
-d:drivers/dma/xilinx
-d:drivers/dpll
-d:drivers/dpll/zl3073x
-d:drivers/edac
-d:drivers/eisa
-d:drivers/extcon
-d:drivers/firewire
-d:drivers/firmware
-d:drivers/firmware/arm_ffa
-d:drivers/firmware/arm_scmi
-d:drivers/firmware/arm_scmi/transports
-d:drivers/firmware/arm_scmi/vendors
-d:drivers/firmware/arm_scmi/vendors/imx
-d:drivers/firmware/broadcom
-d:drivers/firmware/cirrus
-d:drivers/firmware/cirrus/test
-d:drivers/firmware/efi
-d:drivers/firmware/efi/libstub
-d:drivers/firmware/efi/stmm
-d:drivers/firmware/efi/test
-d:drivers/firmware/google
-d:drivers/firmware/imx
-d:drivers/firmware/meson
-d:drivers/firmware/microchip
-d:drivers/firmware/psci
-d:drivers/firmware/qcom
-d:drivers/firmware/samsung
-d:drivers/firmware/smccc
-d:drivers/firmware/tegra
-d:drivers/firmware/xilinx
-d:drivers/fpga
-d:drivers/fpga/tests
-d:drivers/fsi
-d:drivers/fwctl
-d:drivers/fwctl/mlx5
-d:drivers/fwctl/pds
-d:drivers/gnss
-d:drivers/gpio
-d:drivers/gpu
-d:drivers/gpu/drm
-d:drivers/gpu/drm/adp
-d:drivers/gpu/drm/amd
-d:drivers/gpu/drm/amd/acp
-d:drivers/gpu/drm/amd/acp/include
-d:drivers/gpu/drm/amd/amdgpu
-d:drivers/gpu/drm/amd/amdkfd
-d:drivers/gpu/drm/amd/amdxcp
-d:drivers/gpu/drm/amd/display
-d:drivers/gpu/drm/amd/display/amdgpu_dm
-d:drivers/gpu/drm/amd/display/dc
-d:drivers/gpu/drm/amd/display/dc/basics
-d:drivers/gpu/drm/amd/display/dc/bios
-d:drivers/gpu/drm/amd/display/dc/bios/dce110
-d:drivers/gpu/drm/amd/display/dc/bios/dce112
-d:drivers/gpu/drm/amd/display/dc/bios/dce60
-d:drivers/gpu/drm/amd/display/dc/bios/dce80
-d:drivers/gpu/drm/amd/display/dc/clk_mgr
-d:drivers/gpu/drm/amd/display/dc/clk_mgr/dce100
-d:drivers/gpu/drm/amd/display/dc/clk_mgr/dce110
-d:drivers/gpu/drm/amd/display/dc/clk_mgr/dce112
-d:drivers/gpu/drm/amd/display/dc/clk_mgr/dce120
-d:drivers/gpu/drm/amd/display/dc/clk_mgr/dce60
-d:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10
-d:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn20
-d:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn201
-d:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21
-d:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30
-d:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301
-d:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31
-d:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn314
-d:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn315
-d:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn316
-d:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32
-d:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35
-d:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn401
-d:drivers/gpu/drm/amd/display/dc/core
-d:drivers/gpu/drm/amd/display/dc/dccg
-d:drivers/gpu/drm/amd/display/dc/dccg/dcn20
-d:drivers/gpu/drm/amd/display/dc/dccg/dcn201
-d:drivers/gpu/drm/amd/display/dc/dccg/dcn21
-d:drivers/gpu/drm/amd/display/dc/dccg/dcn30
-d:drivers/gpu/drm/amd/display/dc/dccg/dcn301
-d:drivers/gpu/drm/amd/display/dc/dccg/dcn302
-d:drivers/gpu/drm/amd/display/dc/dccg/dcn303
-d:drivers/gpu/drm/amd/display/dc/dccg/dcn31
-d:drivers/gpu/drm/amd/display/dc/dccg/dcn314
-d:drivers/gpu/drm/amd/display/dc/dccg/dcn32
-d:drivers/gpu/drm/amd/display/dc/dccg/dcn35
-d:drivers/gpu/drm/amd/display/dc/dccg/dcn401
-d:drivers/gpu/drm/amd/display/dc/dce
-d:drivers/gpu/drm/amd/display/dc/dce110
-d:drivers/gpu/drm/amd/display/dc/dce112
-d:drivers/gpu/drm/amd/display/dc/dce120
-d:drivers/gpu/drm/amd/display/dc/dce60
-d:drivers/gpu/drm/amd/display/dc/dce80
-d:drivers/gpu/drm/amd/display/dc/dcn10
-d:drivers/gpu/drm/amd/display/dc/dcn20
-d:drivers/gpu/drm/amd/display/dc/dcn201
-d:drivers/gpu/drm/amd/display/dc/dcn21
-d:drivers/gpu/drm/amd/display/dc/dcn30
-d:drivers/gpu/drm/amd/display/dc/dcn301
-d:drivers/gpu/drm/amd/display/dc/dcn31
-d:drivers/gpu/drm/amd/display/dc/dio
-d:drivers/gpu/drm/amd/display/dc/dio/dcn10
-d:drivers/gpu/drm/amd/display/dc/dio/dcn20
-d:drivers/gpu/drm/amd/display/dc/dio/dcn30
-d:drivers/gpu/drm/amd/display/dc/dio/dcn301
-d:drivers/gpu/drm/amd/display/dc/dio/dcn31
-d:drivers/gpu/drm/amd/display/dc/dio/dcn314
-d:drivers/gpu/drm/amd/display/dc/dio/dcn32
-d:drivers/gpu/drm/amd/display/dc/dio/dcn321
-d:drivers/gpu/drm/amd/display/dc/dio/dcn35
-d:drivers/gpu/drm/amd/display/dc/dio/dcn401
-d:drivers/gpu/drm/amd/display/dc/dml
-d:drivers/gpu/drm/amd/display/dc/dml/calcs
-d:drivers/gpu/drm/amd/display/dc/dml/dcn10
-d:drivers/gpu/drm/amd/display/dc/dml/dcn20
-d:drivers/gpu/drm/amd/display/dc/dml/dcn21
-d:drivers/gpu/drm/amd/display/dc/dml/dcn30
-d:drivers/gpu/drm/amd/display/dc/dml/dcn301
-d:drivers/gpu/drm/amd/display/dc/dml/dcn302
-d:drivers/gpu/drm/amd/display/dc/dml/dcn303
-d:drivers/gpu/drm/amd/display/dc/dml/dcn31
-d:drivers/gpu/drm/amd/display/dc/dml/dcn314
-d:drivers/gpu/drm/amd/display/dc/dml/dcn32
-d:drivers/gpu/drm/amd/display/dc/dml/dcn321
-d:drivers/gpu/drm/amd/display/dc/dml/dcn35
-d:drivers/gpu/drm/amd/display/dc/dml/dcn351
-d:drivers/gpu/drm/amd/display/dc/dml/dsc
-d:drivers/gpu/drm/amd/display/dc/dml2
-d:drivers/gpu/drm/amd/display/dc/dml2/dml21
-d:drivers/gpu/drm/amd/display/dc/dml2/dml21/inc
-d:drivers/gpu/drm/amd/display/dc/dml2/dml21/inc/bounding_boxes
-d:drivers/gpu/drm/amd/display/dc/dml2/dml21/src
-d:drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core
-d:drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_dpmm
-d:drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_mcg
-d:drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo
-d:drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_standalone_libraries
-d:drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top
-d:drivers/gpu/drm/amd/display/dc/dml2/dml21/src/inc
-d:drivers/gpu/drm/amd/display/dc/dpp
-d:drivers/gpu/drm/amd/display/dc/dpp/dcn10
-d:drivers/gpu/drm/amd/display/dc/dpp/dcn20
-d:drivers/gpu/drm/amd/display/dc/dpp/dcn201
-d:drivers/gpu/drm/amd/display/dc/dpp/dcn30
-d:drivers/gpu/drm/amd/display/dc/dpp/dcn32
-d:drivers/gpu/drm/amd/display/dc/dpp/dcn35
-d:drivers/gpu/drm/amd/display/dc/dpp/dcn401
-d:drivers/gpu/drm/amd/display/dc/dsc
-d:drivers/gpu/drm/amd/display/dc/dsc/dcn20
-d:drivers/gpu/drm/amd/display/dc/dsc/dcn35
-d:drivers/gpu/drm/amd/display/dc/dsc/dcn401
-d:drivers/gpu/drm/amd/display/dc/dwb
-d:drivers/gpu/drm/amd/display/dc/dwb/dcn30
-d:drivers/gpu/drm/amd/display/dc/dwb/dcn35
-d:drivers/gpu/drm/amd/display/dc/gpio
-d:drivers/gpu/drm/amd/display/dc/gpio/dce110
-d:drivers/gpu/drm/amd/display/dc/gpio/dce120
-d:drivers/gpu/drm/amd/display/dc/gpio/dce60
-d:drivers/gpu/drm/amd/display/dc/gpio/dce80
-d:drivers/gpu/drm/amd/display/dc/gpio/dcn10
-d:drivers/gpu/drm/amd/display/dc/gpio/dcn20
-d:drivers/gpu/drm/amd/display/dc/gpio/dcn21
-d:drivers/gpu/drm/amd/display/dc/gpio/dcn30
-d:drivers/gpu/drm/amd/display/dc/gpio/dcn315
-d:drivers/gpu/drm/amd/display/dc/gpio/dcn32
-d:drivers/gpu/drm/amd/display/dc/gpio/dcn401
-d:drivers/gpu/drm/amd/display/dc/hdcp
-d:drivers/gpu/drm/amd/display/dc/hpo
-d:drivers/gpu/drm/amd/display/dc/hpo/dcn31
-d:drivers/gpu/drm/amd/display/dc/hpo/dcn32
-d:drivers/gpu/drm/amd/display/dc/hubbub
-d:drivers/gpu/drm/amd/display/dc/hubbub/dcn10
-d:drivers/gpu/drm/amd/display/dc/hubbub/dcn20
-d:drivers/gpu/drm/amd/display/dc/hubbub/dcn201
-d:drivers/gpu/drm/amd/display/dc/hubbub/dcn21
-d:drivers/gpu/drm/amd/display/dc/hubbub/dcn30
-d:drivers/gpu/drm/amd/display/dc/hubbub/dcn301
-d:drivers/gpu/drm/amd/display/dc/hubbub/dcn31
-d:drivers/gpu/drm/amd/display/dc/hubbub/dcn32
-d:drivers/gpu/drm/amd/display/dc/hubbub/dcn35
-d:drivers/gpu/drm/amd/display/dc/hubbub/dcn401
-d:drivers/gpu/drm/amd/display/dc/hubp
-d:drivers/gpu/drm/amd/display/dc/hubp/dcn10
-d:drivers/gpu/drm/amd/display/dc/hubp/dcn20
-d:drivers/gpu/drm/amd/display/dc/hubp/dcn201
-d:drivers/gpu/drm/amd/display/dc/hubp/dcn21
-d:drivers/gpu/drm/amd/display/dc/hubp/dcn30
-d:drivers/gpu/drm/amd/display/dc/hubp/dcn31
-d:drivers/gpu/drm/amd/display/dc/hubp/dcn32
-d:drivers/gpu/drm/amd/display/dc/hubp/dcn35
-d:drivers/gpu/drm/amd/display/dc/hubp/dcn401
-d:drivers/gpu/drm/amd/display/dc/hwss
-d:drivers/gpu/drm/amd/display/dc/hwss/dce
-d:drivers/gpu/drm/amd/display/dc/hwss/dce100
-d:drivers/gpu/drm/amd/display/dc/hwss/dce110
-d:drivers/gpu/drm/amd/display/dc/hwss/dce112
-d:drivers/gpu/drm/amd/display/dc/hwss/dce120
-d:drivers/gpu/drm/amd/display/dc/hwss/dce60
-d:drivers/gpu/drm/amd/display/dc/hwss/dce80
-d:drivers/gpu/drm/amd/display/dc/hwss/dcn10
-d:drivers/gpu/drm/amd/display/dc/hwss/dcn20
-d:drivers/gpu/drm/amd/display/dc/hwss/dcn201
-d:drivers/gpu/drm/amd/display/dc/hwss/dcn21
-d:drivers/gpu/drm/amd/display/dc/hwss/dcn30
-d:drivers/gpu/drm/amd/display/dc/hwss/dcn301
-d:drivers/gpu/drm/amd/display/dc/hwss/dcn302
-d:drivers/gpu/drm/amd/display/dc/hwss/dcn303
-d:drivers/gpu/drm/amd/display/dc/hwss/dcn31
-d:drivers/gpu/drm/amd/display/dc/hwss/dcn314
-d:drivers/gpu/drm/amd/display/dc/hwss/dcn32
-d:drivers/gpu/drm/amd/display/dc/hwss/dcn35
-d:drivers/gpu/drm/amd/display/dc/hwss/dcn351
-d:drivers/gpu/drm/amd/display/dc/hwss/dcn401
-d:drivers/gpu/drm/amd/display/dc/inc
-d:drivers/gpu/drm/amd/display/dc/inc/hw
-d:drivers/gpu/drm/amd/display/dc/irq
-d:drivers/gpu/drm/amd/display/dc/irq/dce110
-d:drivers/gpu/drm/amd/display/dc/irq/dce120
-d:drivers/gpu/drm/amd/display/dc/irq/dce60
-d:drivers/gpu/drm/amd/display/dc/irq/dce80
-d:drivers/gpu/drm/amd/display/dc/irq/dcn10
-d:drivers/gpu/drm/amd/display/dc/irq/dcn20
-d:drivers/gpu/drm/amd/display/dc/irq/dcn201
-d:drivers/gpu/drm/amd/display/dc/irq/dcn21
-d:drivers/gpu/drm/amd/display/dc/irq/dcn30
-d:drivers/gpu/drm/amd/display/dc/irq/dcn302
-d:drivers/gpu/drm/amd/display/dc/irq/dcn303
-d:drivers/gpu/drm/amd/display/dc/irq/dcn31
-d:drivers/gpu/drm/amd/display/dc/irq/dcn314
-d:drivers/gpu/drm/amd/display/dc/irq/dcn315
-d:drivers/gpu/drm/amd/display/dc/irq/dcn32
-d:drivers/gpu/drm/amd/display/dc/irq/dcn35
-d:drivers/gpu/drm/amd/display/dc/irq/dcn351
-d:drivers/gpu/drm/amd/display/dc/irq/dcn36
-d:drivers/gpu/drm/amd/display/dc/irq/dcn401
-d:drivers/gpu/drm/amd/display/dc/link
-d:drivers/gpu/drm/amd/display/dc/link/accessories
-d:drivers/gpu/drm/amd/display/dc/link/hwss
-d:drivers/gpu/drm/amd/display/dc/link/protocols
-d:drivers/gpu/drm/amd/display/dc/mmhubbub
-d:drivers/gpu/drm/amd/display/dc/mmhubbub/dcn20
-d:drivers/gpu/drm/amd/display/dc/mmhubbub/dcn32
-d:drivers/gpu/drm/amd/display/dc/mmhubbub/dcn35
-d:drivers/gpu/drm/amd/display/dc/mpc
-d:drivers/gpu/drm/amd/display/dc/mpc/dcn10
-d:drivers/gpu/drm/amd/display/dc/mpc/dcn20
-d:drivers/gpu/drm/amd/display/dc/mpc/dcn30
-d:drivers/gpu/drm/amd/display/dc/mpc/dcn32
-d:drivers/gpu/drm/amd/display/dc/mpc/dcn401
-d:drivers/gpu/drm/amd/display/dc/opp
-d:drivers/gpu/drm/amd/display/dc/opp/dcn10
-d:drivers/gpu/drm/amd/display/dc/opp/dcn20
-d:drivers/gpu/drm/amd/display/dc/opp/dcn35
-d:drivers/gpu/drm/amd/display/dc/optc
-d:drivers/gpu/drm/amd/display/dc/optc/dcn10
-d:drivers/gpu/drm/amd/display/dc/optc/dcn20
-d:drivers/gpu/drm/amd/display/dc/optc/dcn201
-d:drivers/gpu/drm/amd/display/dc/optc/dcn30
-d:drivers/gpu/drm/amd/display/dc/optc/dcn301
-d:drivers/gpu/drm/amd/display/dc/optc/dcn31
-d:drivers/gpu/drm/amd/display/dc/optc/dcn314
-d:drivers/gpu/drm/amd/display/dc/optc/dcn32
-d:drivers/gpu/drm/amd/display/dc/optc/dcn35
-d:drivers/gpu/drm/amd/display/dc/optc/dcn401
-d:drivers/gpu/drm/amd/display/dc/pg
-d:drivers/gpu/drm/amd/display/dc/pg/dcn35
-d:drivers/gpu/drm/amd/display/dc/resource
-d:drivers/gpu/drm/amd/display/dc/resource/dce100
-d:drivers/gpu/drm/amd/display/dc/resource/dce110
-d:drivers/gpu/drm/amd/display/dc/resource/dce112
-d:drivers/gpu/drm/amd/display/dc/resource/dce120
-d:drivers/gpu/drm/amd/display/dc/resource/dce60
-d:drivers/gpu/drm/amd/display/dc/resource/dce80
-d:drivers/gpu/drm/amd/display/dc/resource/dcn10
-d:drivers/gpu/drm/amd/display/dc/resource/dcn20
-d:drivers/gpu/drm/amd/display/dc/resource/dcn201
-d:drivers/gpu/drm/amd/display/dc/resource/dcn21
-d:drivers/gpu/drm/amd/display/dc/resource/dcn30
-d:drivers/gpu/drm/amd/display/dc/resource/dcn301
-d:drivers/gpu/drm/amd/display/dc/resource/dcn302
-d:drivers/gpu/drm/amd/display/dc/resource/dcn303
-d:drivers/gpu/drm/amd/display/dc/resource/dcn31
-d:drivers/gpu/drm/amd/display/dc/resource/dcn314
-d:drivers/gpu/drm/amd/display/dc/resource/dcn315
-d:drivers/gpu/drm/amd/display/dc/resource/dcn316
-d:drivers/gpu/drm/amd/display/dc/resource/dcn32
-d:drivers/gpu/drm/amd/display/dc/resource/dcn321
-d:drivers/gpu/drm/amd/display/dc/resource/dcn35
-d:drivers/gpu/drm/amd/display/dc/resource/dcn351
-d:drivers/gpu/drm/amd/display/dc/resource/dcn36
-d:drivers/gpu/drm/amd/display/dc/resource/dcn401
-d:drivers/gpu/drm/amd/display/dc/sspl
-d:drivers/gpu/drm/amd/display/dc/virtual
-d:drivers/gpu/drm/amd/display/dmub
-d:drivers/gpu/drm/amd/display/dmub/inc
-d:drivers/gpu/drm/amd/display/dmub/src
-d:drivers/gpu/drm/amd/display/include
-d:drivers/gpu/drm/amd/display/modules
-d:drivers/gpu/drm/amd/display/modules/color
-d:drivers/gpu/drm/amd/display/modules/freesync
-d:drivers/gpu/drm/amd/display/modules/hdcp
-d:drivers/gpu/drm/amd/display/modules/inc
-d:drivers/gpu/drm/amd/display/modules/info_packet
-d:drivers/gpu/drm/amd/display/modules/power
-d:drivers/gpu/drm/amd/display/modules/vmid
-d:drivers/gpu/drm/amd/include
-d:drivers/gpu/drm/amd/include/asic_reg
-d:drivers/gpu/drm/amd/include/asic_reg/athub
-d:drivers/gpu/drm/amd/include/asic_reg/bif
-d:drivers/gpu/drm/amd/include/asic_reg/clk
-d:drivers/gpu/drm/amd/include/asic_reg/dce
-d:drivers/gpu/drm/amd/include/asic_reg/dcn
-d:drivers/gpu/drm/amd/include/asic_reg/df
-d:drivers/gpu/drm/amd/include/asic_reg/dpcs
-d:drivers/gpu/drm/amd/include/asic_reg/gc
-d:drivers/gpu/drm/amd/include/asic_reg/gca
-d:drivers/gpu/drm/amd/include/asic_reg/gmc
-d:drivers/gpu/drm/amd/include/asic_reg/hdp
-d:drivers/gpu/drm/amd/include/asic_reg/lsdma
-d:drivers/gpu/drm/amd/include/asic_reg/mmhub
-d:drivers/gpu/drm/amd/include/asic_reg/mp
-d:drivers/gpu/drm/amd/include/asic_reg/nbif
-d:drivers/gpu/drm/amd/include/asic_reg/nbio
-d:drivers/gpu/drm/amd/include/asic_reg/oss
-d:drivers/gpu/drm/amd/include/asic_reg/pcie
-d:drivers/gpu/drm/amd/include/asic_reg/pwr
-d:drivers/gpu/drm/amd/include/asic_reg/rsmu
-d:drivers/gpu/drm/amd/include/asic_reg/sdma
-d:drivers/gpu/drm/amd/include/asic_reg/sdma0
-d:drivers/gpu/drm/amd/include/asic_reg/sdma1
-d:drivers/gpu/drm/amd/include/asic_reg/sdma2
-d:drivers/gpu/drm/amd/include/asic_reg/sdma3
-d:drivers/gpu/drm/amd/include/asic_reg/sdma4
-d:drivers/gpu/drm/amd/include/asic_reg/sdma5
-d:drivers/gpu/drm/amd/include/asic_reg/sdma6
-d:drivers/gpu/drm/amd/include/asic_reg/sdma7
-d:drivers/gpu/drm/amd/include/asic_reg/smu
-d:drivers/gpu/drm/amd/include/asic_reg/smuio
-d:drivers/gpu/drm/amd/include/asic_reg/thm
-d:drivers/gpu/drm/amd/include/asic_reg/umc
-d:drivers/gpu/drm/amd/include/asic_reg/uvd
-d:drivers/gpu/drm/amd/include/asic_reg/vce
-d:drivers/gpu/drm/amd/include/asic_reg/vcn
-d:drivers/gpu/drm/amd/include/asic_reg/vpe
-d:drivers/gpu/drm/amd/include/asic_reg/wafl
-d:drivers/gpu/drm/amd/include/asic_reg/xgmi
-d:drivers/gpu/drm/amd/include/ivsrcid
-d:drivers/gpu/drm/amd/include/ivsrcid/dcn
-d:drivers/gpu/drm/amd/include/ivsrcid/gfx
-d:drivers/gpu/drm/amd/include/ivsrcid/isp
-d:drivers/gpu/drm/amd/include/ivsrcid/nbio
-d:drivers/gpu/drm/amd/include/ivsrcid/sdma0
-d:drivers/gpu/drm/amd/include/ivsrcid/sdma1
-d:drivers/gpu/drm/amd/include/ivsrcid/sdma2
-d:drivers/gpu/drm/amd/include/ivsrcid/sdma3
-d:drivers/gpu/drm/amd/include/ivsrcid/smuio
-d:drivers/gpu/drm/amd/include/ivsrcid/thm
-d:drivers/gpu/drm/amd/include/ivsrcid/uvd
-d:drivers/gpu/drm/amd/include/ivsrcid/vce
-d:drivers/gpu/drm/amd/include/ivsrcid/vcn
-d:drivers/gpu/drm/amd/include/ivsrcid/vmc
-d:drivers/gpu/drm/amd/include/ivsrcid/vpe
-d:drivers/gpu/drm/amd/pm
-d:drivers/gpu/drm/amd/pm/inc
-d:drivers/gpu/drm/amd/pm/legacy-dpm
-d:drivers/gpu/drm/amd/pm/powerplay
-d:drivers/gpu/drm/amd/pm/powerplay/hwmgr
-d:drivers/gpu/drm/amd/pm/powerplay/inc
-d:drivers/gpu/drm/amd/pm/powerplay/inc/vega12
-d:drivers/gpu/drm/amd/pm/powerplay/smumgr
-d:drivers/gpu/drm/amd/pm/swsmu
-d:drivers/gpu/drm/amd/pm/swsmu/inc
-d:drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if
-d:drivers/gpu/drm/amd/pm/swsmu/smu11
-d:drivers/gpu/drm/amd/pm/swsmu/smu12
-d:drivers/gpu/drm/amd/pm/swsmu/smu13
-d:drivers/gpu/drm/amd/pm/swsmu/smu14
-d:drivers/gpu/drm/arm
-d:drivers/gpu/drm/arm/display
-d:drivers/gpu/drm/arm/display/include
-d:drivers/gpu/drm/arm/display/komeda
-d:drivers/gpu/drm/arm/display/komeda/d71
-d:drivers/gpu/drm/armada
-d:drivers/gpu/drm/aspeed
-d:drivers/gpu/drm/ast
-d:drivers/gpu/drm/atmel-hlcdc
-d:drivers/gpu/drm/bridge
-d:drivers/gpu/drm/bridge/adv7511
-d:drivers/gpu/drm/bridge/analogix
-d:drivers/gpu/drm/bridge/cadence
-d:drivers/gpu/drm/bridge/imx
-d:drivers/gpu/drm/bridge/synopsys
-d:drivers/gpu/drm/ci
-d:drivers/gpu/drm/ci/xfails
-d:drivers/gpu/drm/clients
-d:drivers/gpu/drm/display
-d:drivers/gpu/drm/etnaviv
-d:drivers/gpu/drm/exynos
-d:drivers/gpu/drm/fsl-dcu
-d:drivers/gpu/drm/gma500
-d:drivers/gpu/drm/gud
-d:drivers/gpu/drm/hisilicon
-d:drivers/gpu/drm/hisilicon/hibmc
-d:drivers/gpu/drm/hisilicon/hibmc/dp
-d:drivers/gpu/drm/hisilicon/kirin
-d:drivers/gpu/drm/hyperv
-d:drivers/gpu/drm/i915
-d:drivers/gpu/drm/i915/display
-d:drivers/gpu/drm/i915/gem
-d:drivers/gpu/drm/i915/gem/selftests
-d:drivers/gpu/drm/i915/gt
-d:drivers/gpu/drm/i915/gt/selftests
-d:drivers/gpu/drm/i915/gt/shaders
-d:drivers/gpu/drm/i915/gt/shaders/clear_kernel
-d:drivers/gpu/drm/i915/gt/uc
-d:drivers/gpu/drm/i915/gt/uc/abi
-d:drivers/gpu/drm/i915/gvt
-d:drivers/gpu/drm/i915/pxp
-d:drivers/gpu/drm/i915/selftests
-d:drivers/gpu/drm/i915/soc
-d:drivers/gpu/drm/imagination
-d:drivers/gpu/drm/imx
-d:drivers/gpu/drm/imx/dc
-d:drivers/gpu/drm/imx/dcss
-d:drivers/gpu/drm/imx/ipuv3
-d:drivers/gpu/drm/imx/lcdc
-d:drivers/gpu/drm/ingenic
-d:drivers/gpu/drm/kmb
-d:drivers/gpu/drm/lib
-d:drivers/gpu/drm/lima
-d:drivers/gpu/drm/logicvc
-d:drivers/gpu/drm/loongson
-d:drivers/gpu/drm/mcde
-d:drivers/gpu/drm/mediatek
-d:drivers/gpu/drm/meson
-d:drivers/gpu/drm/mgag200
-d:drivers/gpu/drm/msm
-d:drivers/gpu/drm/msm/adreno
-d:drivers/gpu/drm/msm/disp
-d:drivers/gpu/drm/msm/disp/dpu1
-d:drivers/gpu/drm/msm/disp/dpu1/catalog
-d:drivers/gpu/drm/msm/disp/mdp4
-d:drivers/gpu/drm/msm/disp/mdp5
-d:drivers/gpu/drm/msm/dp
-d:drivers/gpu/drm/msm/dsi
-d:drivers/gpu/drm/msm/dsi/phy
-d:drivers/gpu/drm/msm/hdmi
-d:drivers/gpu/drm/msm/registers
-d:drivers/gpu/drm/msm/registers/adreno
-d:drivers/gpu/drm/msm/registers/display
-d:drivers/gpu/drm/mxsfb
-d:drivers/gpu/drm/nouveau
-d:drivers/gpu/drm/nouveau/dispnv04
-d:drivers/gpu/drm/nouveau/dispnv04/i2c
-d:drivers/gpu/drm/nouveau/dispnv50
-d:drivers/gpu/drm/nouveau/include
-d:drivers/gpu/drm/nouveau/include/dispnv04
-d:drivers/gpu/drm/nouveau/include/dispnv04/i2c
-d:drivers/gpu/drm/nouveau/include/nvfw
-d:drivers/gpu/drm/nouveau/include/nvhw
-d:drivers/gpu/drm/nouveau/include/nvhw/class
-d:drivers/gpu/drm/nouveau/include/nvhw/ref
-d:drivers/gpu/drm/nouveau/include/nvhw/ref/gb100
-d:drivers/gpu/drm/nouveau/include/nvhw/ref/gb10b
-d:drivers/gpu/drm/nouveau/include/nvhw/ref/gb202
-d:drivers/gpu/drm/nouveau/include/nvhw/ref/gh100
-d:drivers/gpu/drm/nouveau/include/nvif
-d:drivers/gpu/drm/nouveau/include/nvkm
-d:drivers/gpu/drm/nouveau/include/nvkm/core
-d:drivers/gpu/drm/nouveau/include/nvkm/engine
-d:drivers/gpu/drm/nouveau/include/nvkm/subdev
-d:drivers/gpu/drm/nouveau/include/nvkm/subdev/bios
-d:drivers/gpu/drm/nouveau/include/nvrm
-d:drivers/gpu/drm/nouveau/nvif
-d:drivers/gpu/drm/nouveau/nvkm
-d:drivers/gpu/drm/nouveau/nvkm/core
-d:drivers/gpu/drm/nouveau/nvkm/engine
-d:drivers/gpu/drm/nouveau/nvkm/engine/bsp
-d:drivers/gpu/drm/nouveau/nvkm/engine/ce
-d:drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc
-d:drivers/gpu/drm/nouveau/nvkm/engine/cipher
-d:drivers/gpu/drm/nouveau/nvkm/engine/device
-d:drivers/gpu/drm/nouveau/nvkm/engine/disp
-d:drivers/gpu/drm/nouveau/nvkm/engine/dma
-d:drivers/gpu/drm/nouveau/nvkm/engine/fifo
-d:drivers/gpu/drm/nouveau/nvkm/engine/gr
-d:drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc
-d:drivers/gpu/drm/nouveau/nvkm/engine/mpeg
-d:drivers/gpu/drm/nouveau/nvkm/engine/msenc
-d:drivers/gpu/drm/nouveau/nvkm/engine/mspdec
-d:drivers/gpu/drm/nouveau/nvkm/engine/msppp
-d:drivers/gpu/drm/nouveau/nvkm/engine/msvld
-d:drivers/gpu/drm/nouveau/nvkm/engine/nvdec
-d:drivers/gpu/drm/nouveau/nvkm/engine/nvenc
-d:drivers/gpu/drm/nouveau/nvkm/engine/sec
-d:drivers/gpu/drm/nouveau/nvkm/engine/sec/fuc
-d:drivers/gpu/drm/nouveau/nvkm/engine/sec2
-d:drivers/gpu/drm/nouveau/nvkm/engine/sw
-d:drivers/gpu/drm/nouveau/nvkm/engine/vic
-d:drivers/gpu/drm/nouveau/nvkm/engine/vp
-d:drivers/gpu/drm/nouveau/nvkm/falcon
-d:drivers/gpu/drm/nouveau/nvkm/nvfw
-d:drivers/gpu/drm/nouveau/nvkm/subdev
-d:drivers/gpu/drm/nouveau/nvkm/subdev/acr
-d:drivers/gpu/drm/nouveau/nvkm/subdev/bar
-d:drivers/gpu/drm/nouveau/nvkm/subdev/bios
-d:drivers/gpu/drm/nouveau/nvkm/subdev/bus
-d:drivers/gpu/drm/nouveau/nvkm/subdev/clk
-d:drivers/gpu/drm/nouveau/nvkm/subdev/devinit
-d:drivers/gpu/drm/nouveau/nvkm/subdev/fault
-d:drivers/gpu/drm/nouveau/nvkm/subdev/fb
-d:drivers/gpu/drm/nouveau/nvkm/subdev/fsp
-d:drivers/gpu/drm/nouveau/nvkm/subdev/fuse
-d:drivers/gpu/drm/nouveau/nvkm/subdev/gpio
-d:drivers/gpu/drm/nouveau/nvkm/subdev/gsp
-d:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm
-d:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535
-d:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm
-d:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570
-d:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/nvrm
-d:drivers/gpu/drm/nouveau/nvkm/subdev/i2c
-d:drivers/gpu/drm/nouveau/nvkm/subdev/iccsense
-d:drivers/gpu/drm/nouveau/nvkm/subdev/instmem
-d:drivers/gpu/drm/nouveau/nvkm/subdev/ltc
-d:drivers/gpu/drm/nouveau/nvkm/subdev/mc
-d:drivers/gpu/drm/nouveau/nvkm/subdev/mmu
-d:drivers/gpu/drm/nouveau/nvkm/subdev/mxm
-d:drivers/gpu/drm/nouveau/nvkm/subdev/pci
-d:drivers/gpu/drm/nouveau/nvkm/subdev/pmu
-d:drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc
-d:drivers/gpu/drm/nouveau/nvkm/subdev/privring
-d:drivers/gpu/drm/nouveau/nvkm/subdev/therm
-d:drivers/gpu/drm/nouveau/nvkm/subdev/timer
-d:drivers/gpu/drm/nouveau/nvkm/subdev/top
-d:drivers/gpu/drm/nouveau/nvkm/subdev/vfn
-d:drivers/gpu/drm/nouveau/nvkm/subdev/volt
-d:drivers/gpu/drm/nova
-d:drivers/gpu/drm/omapdrm
-d:drivers/gpu/drm/omapdrm/dss
-d:drivers/gpu/drm/panel
-d:drivers/gpu/drm/panfrost
-d:drivers/gpu/drm/panthor
-d:drivers/gpu/drm/pl111
-d:drivers/gpu/drm/qxl
-d:drivers/gpu/drm/radeon
-d:drivers/gpu/drm/radeon/reg_srcs
-d:drivers/gpu/drm/renesas
-d:drivers/gpu/drm/renesas/rcar-du
-d:drivers/gpu/drm/renesas/rz-du
-d:drivers/gpu/drm/renesas/shmobile
-d:drivers/gpu/drm/rockchip
-d:drivers/gpu/drm/scheduler
-d:drivers/gpu/drm/scheduler/tests
-d:drivers/gpu/drm/sitronix
-d:drivers/gpu/drm/solomon
-d:drivers/gpu/drm/sprd
-d:drivers/gpu/drm/sti
-d:drivers/gpu/drm/stm
-d:drivers/gpu/drm/sun4i
-d:drivers/gpu/drm/sysfb
-d:drivers/gpu/drm/tegra
-d:drivers/gpu/drm/tests
-d:drivers/gpu/drm/tidss
-d:drivers/gpu/drm/tilcdc
-d:drivers/gpu/drm/tiny
-d:drivers/gpu/drm/ttm
-d:drivers/gpu/drm/ttm/tests
-d:drivers/gpu/drm/tve200
-d:drivers/gpu/drm/udl
-d:drivers/gpu/drm/v3d
-d:drivers/gpu/drm/vboxvideo
-d:drivers/gpu/drm/vc4
-d:drivers/gpu/drm/vc4/tests
-d:drivers/gpu/drm/vgem
-d:drivers/gpu/drm/virtio
-d:drivers/gpu/drm/vkms
-d:drivers/gpu/drm/vkms/tests
-d:drivers/gpu/drm/vmwgfx
-d:drivers/gpu/drm/vmwgfx/device_include
-d:drivers/gpu/drm/xe
-d:drivers/gpu/drm/xe/abi
-d:drivers/gpu/drm/xe/compat-i915-headers
-d:drivers/gpu/drm/xe/compat-i915-headers/gem
-d:drivers/gpu/drm/xe/compat-i915-headers/gt
-d:drivers/gpu/drm/xe/compat-i915-headers/pxp
-d:drivers/gpu/drm/xe/compat-i915-headers/soc
-d:drivers/gpu/drm/xe/display
-d:drivers/gpu/drm/xe/display/ext
-d:drivers/gpu/drm/xe/instructions
-d:drivers/gpu/drm/xe/regs
-d:drivers/gpu/drm/xe/tests
-d:drivers/gpu/drm/xen
-d:drivers/gpu/drm/xlnx
-d:drivers/gpu/host1x
-d:drivers/gpu/host1x/hw
-d:drivers/gpu/ipu-v3
-d:drivers/gpu/nova-core
-d:drivers/gpu/nova-core/falcon
-d:drivers/gpu/nova-core/falcon/hal
-d:drivers/gpu/nova-core/fb
-d:drivers/gpu/nova-core/fb/hal
-d:drivers/gpu/nova-core/firmware
-d:drivers/gpu/nova-core/regs
-d:drivers/gpu/trace
-d:drivers/gpu/vga
-d:drivers/greybus
-d:drivers/hid
-d:drivers/hid/amd-sfh-hid
-d:drivers/hid/amd-sfh-hid/hid_descriptor
-d:drivers/hid/amd-sfh-hid/sfh1_1
-d:drivers/hid/bpf
-d:drivers/hid/bpf/progs
-d:drivers/hid/i2c-hid
-d:drivers/hid/intel-ish-hid
-d:drivers/hid/intel-ish-hid/ipc
-d:drivers/hid/intel-ish-hid/ishtp
-d:drivers/hid/intel-thc-hid
-d:drivers/hid/intel-thc-hid/intel-quicki2c
-d:drivers/hid/intel-thc-hid/intel-quickspi
-d:drivers/hid/intel-thc-hid/intel-thc
-d:drivers/hid/surface-hid
-d:drivers/hid/usbhid
-d:drivers/hsi
-d:drivers/hsi/clients
-d:drivers/hsi/controllers
-d:drivers/hte
-d:drivers/hv
-d:drivers/hwmon
-d:drivers/hwmon/occ
-d:drivers/hwmon/peci
-d:drivers/hwmon/pmbus
-d:drivers/hwspinlock
-d:drivers/hwtracing
-d:drivers/hwtracing/coresight
-d:drivers/hwtracing/intel_th
-d:drivers/hwtracing/ptt
-d:drivers/hwtracing/stm
-d:drivers/i2c
-d:drivers/i2c/algos
-d:drivers/i2c/busses
-d:drivers/i2c/muxes
-d:drivers/i3c
-d:drivers/i3c/master
-d:drivers/i3c/master/mipi-i3c-hci
-d:drivers/idle
-d:drivers/iio
-d:drivers/iio/accel
-d:drivers/iio/adc
-d:drivers/iio/addac
-d:drivers/iio/afe
-d:drivers/iio/amplifiers
-d:drivers/iio/buffer
-d:drivers/iio/cdc
-d:drivers/iio/chemical
-d:drivers/iio/common
-d:drivers/iio/common/cros_ec_sensors
-d:drivers/iio/common/hid-sensors
-d:drivers/iio/common/inv_sensors
-d:drivers/iio/common/ms_sensors
-d:drivers/iio/common/scmi_sensors
-d:drivers/iio/common/ssp_sensors
-d:drivers/iio/common/st_sensors
-d:drivers/iio/dac
-d:drivers/iio/dummy
-d:drivers/iio/filter
-d:drivers/iio/frequency
-d:drivers/iio/gyro
-d:drivers/iio/health
-d:drivers/iio/humidity
-d:drivers/iio/imu
-d:drivers/iio/imu/bmi160
-d:drivers/iio/imu/bmi270
-d:drivers/iio/imu/bmi323
-d:drivers/iio/imu/bno055
-d:drivers/iio/imu/inv_icm42600
-d:drivers/iio/imu/inv_mpu6050
-d:drivers/iio/imu/st_lsm6dsx
-d:drivers/iio/imu/st_lsm9ds0
-d:drivers/iio/light
-d:drivers/iio/magnetometer
-d:drivers/iio/multiplexer
-d:drivers/iio/orientation
-d:drivers/iio/position
-d:drivers/iio/potentiometer
-d:drivers/iio/potentiostat
-d:drivers/iio/pressure
-d:drivers/iio/proximity
-d:drivers/iio/resolver
-d:drivers/iio/temperature
-d:drivers/iio/test
-d:drivers/iio/trigger
-d:drivers/infiniband
-d:drivers/infiniband/core
-d:drivers/infiniband/hw
-d:drivers/infiniband/hw/bnxt_re
-d:drivers/infiniband/hw/cxgb4
-d:drivers/infiniband/hw/efa
-d:drivers/infiniband/hw/erdma
-d:drivers/infiniband/hw/hfi1
-d:drivers/infiniband/hw/hns
-d:drivers/infiniband/hw/irdma
-d:drivers/infiniband/hw/mana
-d:drivers/infiniband/hw/mlx4
-d:drivers/infiniband/hw/mlx5
-d:drivers/infiniband/hw/mthca
-d:drivers/infiniband/hw/ocrdma
-d:drivers/infiniband/hw/qedr
-d:drivers/infiniband/hw/usnic
-d:drivers/infiniband/hw/vmw_pvrdma
-d:drivers/infiniband/sw
-d:drivers/infiniband/sw/rdmavt
-d:drivers/infiniband/sw/rxe
-d:drivers/infiniband/sw/siw
-d:drivers/infiniband/ulp
-d:drivers/infiniband/ulp/ipoib
-d:drivers/infiniband/ulp/iser
-d:drivers/infiniband/ulp/isert
-d:drivers/infiniband/ulp/opa_vnic
-d:drivers/infiniband/ulp/rtrs
-d:drivers/infiniband/ulp/srp
-d:drivers/infiniband/ulp/srpt
-d:drivers/input
-d:drivers/input/gameport
-d:drivers/input/joystick
-d:drivers/input/joystick/iforce
-d:drivers/input/keyboard
-d:drivers/input/misc
-d:drivers/input/mouse
-d:drivers/input/rmi4
-d:drivers/input/serio
-d:drivers/input/tablet
-d:drivers/input/tests
-d:drivers/input/touchscreen
-d:drivers/interconnect
-d:drivers/interconnect/imx
-d:drivers/interconnect/mediatek
-d:drivers/interconnect/qcom
-d:drivers/interconnect/samsung
-d:drivers/iommu
-d:drivers/iommu/amd
-d:drivers/iommu/arm
-d:drivers/iommu/arm/arm-smmu
-d:drivers/iommu/arm/arm-smmu-v3
-d:drivers/iommu/intel
-d:drivers/iommu/iommufd
-d:drivers/iommu/riscv
-d:drivers/ipack
-d:drivers/ipack/carriers
-d:drivers/ipack/devices
-d:drivers/irqchip
-d:drivers/isdn
-d:drivers/isdn/capi
-d:drivers/isdn/hardware
-d:drivers/isdn/hardware/mISDN
-d:drivers/isdn/mISDN
-d:drivers/leds
-d:drivers/leds/blink
-d:drivers/leds/flash
-d:drivers/leds/rgb
-d:drivers/leds/simatic
-d:drivers/leds/trigger
-d:drivers/macintosh
-d:drivers/macintosh/ams
-d:drivers/mailbox
-d:drivers/mcb
-d:drivers/md
-d:drivers/md/bcache
-d:drivers/md/dm-vdo
-d:drivers/md/dm-vdo/indexer
-d:drivers/md/persistent-data
-d:drivers/media
-d:drivers/media/cec
-d:drivers/media/cec/core
-d:drivers/media/cec/i2c
-d:drivers/media/cec/platform
-d:drivers/media/cec/platform/cec-gpio
-d:drivers/media/cec/platform/cros-ec
-d:drivers/media/cec/platform/meson
-d:drivers/media/cec/platform/s5p
-d:drivers/media/cec/platform/seco
-d:drivers/media/cec/platform/sti
-d:drivers/media/cec/platform/stm32
-d:drivers/media/cec/platform/tegra
-d:drivers/media/cec/usb
-d:drivers/media/cec/usb/extron-da-hd-4k-plus
-d:drivers/media/cec/usb/pulse8
-d:drivers/media/cec/usb/rainshadow
-d:drivers/media/common
-d:drivers/media/common/b2c2
-d:drivers/media/common/saa7146
-d:drivers/media/common/siano
-d:drivers/media/common/v4l2-tpg
-d:drivers/media/common/videobuf2
-d:drivers/media/dvb-core
-d:drivers/media/dvb-frontends
-d:drivers/media/dvb-frontends/cxd2880
-d:drivers/media/dvb-frontends/drx39xyj
-d:drivers/media/firewire
-d:drivers/media/i2c
-d:drivers/media/i2c/adv748x
-d:drivers/media/i2c/ccs
-d:drivers/media/i2c/cx25840
-d:drivers/media/i2c/et8ek8
-d:drivers/media/i2c/s5c73m3
-d:drivers/media/mc
-d:drivers/media/mmc
-d:drivers/media/mmc/siano
-d:drivers/media/pci
-d:drivers/media/pci/b2c2
-d:drivers/media/pci/bt8xx
-d:drivers/media/pci/cobalt
-d:drivers/media/pci/cx18
-d:drivers/media/pci/cx23885
-d:drivers/media/pci/cx25821
-d:drivers/media/pci/cx88
-d:drivers/media/pci/ddbridge
-d:drivers/media/pci/dm1105
-d:drivers/media/pci/dt3155
-d:drivers/media/pci/intel
-d:drivers/media/pci/intel/ipu3
-d:drivers/media/pci/intel/ipu6
-d:drivers/media/pci/intel/ivsc
-d:drivers/media/pci/ivtv
-d:drivers/media/pci/mantis
-d:drivers/media/pci/mgb4
-d:drivers/media/pci/netup_unidvb
-d:drivers/media/pci/ngene
-d:drivers/media/pci/pluto2
-d:drivers/media/pci/pt1
-d:drivers/media/pci/pt3
-d:drivers/media/pci/saa7134
-d:drivers/media/pci/saa7146
-d:drivers/media/pci/saa7164
-d:drivers/media/pci/smipcie
-d:drivers/media/pci/solo6x10
-d:drivers/media/pci/ttpci
-d:drivers/media/pci/tw5864
-d:drivers/media/pci/tw68
-d:drivers/media/pci/tw686x
-d:drivers/media/pci/zoran
-d:drivers/media/platform
-d:drivers/media/platform/allegro-dvt
-d:drivers/media/platform/amlogic
-d:drivers/media/platform/amlogic/c3
-d:drivers/media/platform/amlogic/c3/isp
-d:drivers/media/platform/amlogic/c3/mipi-adapter
-d:drivers/media/platform/amlogic/c3/mipi-csi2
-d:drivers/media/platform/amlogic/meson-ge2d
-d:drivers/media/platform/amphion
-d:drivers/media/platform/aspeed
-d:drivers/media/platform/atmel
-d:drivers/media/platform/broadcom
-d:drivers/media/platform/cadence
-d:drivers/media/platform/chips-media
-d:drivers/media/platform/chips-media/coda
-d:drivers/media/platform/chips-media/wave5
-d:drivers/media/platform/imagination
-d:drivers/media/platform/intel
-d:drivers/media/platform/marvell
-d:drivers/media/platform/mediatek
-d:drivers/media/platform/mediatek/jpeg
-d:drivers/media/platform/mediatek/mdp
-d:drivers/media/platform/mediatek/mdp3
-d:drivers/media/platform/mediatek/vcodec
-d:drivers/media/platform/mediatek/vcodec/common
-d:drivers/media/platform/mediatek/vcodec/decoder
-d:drivers/media/platform/mediatek/vcodec/decoder/vdec
-d:drivers/media/platform/mediatek/vcodec/encoder
-d:drivers/media/platform/mediatek/vcodec/encoder/venc
-d:drivers/media/platform/mediatek/vpu
-d:drivers/media/platform/microchip
-d:drivers/media/platform/nuvoton
-d:drivers/media/platform/nvidia
-d:drivers/media/platform/nvidia/tegra-vde
-d:drivers/media/platform/nxp
-d:drivers/media/platform/nxp/dw100
-d:drivers/media/platform/nxp/imx-jpeg
-d:drivers/media/platform/nxp/imx8-isi
-d:drivers/media/platform/qcom
-d:drivers/media/platform/qcom/camss
-d:drivers/media/platform/qcom/iris
-d:drivers/media/platform/qcom/venus
-d:drivers/media/platform/raspberrypi
-d:drivers/media/platform/raspberrypi/pisp_be
-d:drivers/media/platform/raspberrypi/rp1-cfe
-d:drivers/media/platform/renesas
-d:drivers/media/platform/renesas/rcar-isp
-d:drivers/media/platform/renesas/rcar-vin
-d:drivers/media/platform/renesas/rzg2l-cru
-d:drivers/media/platform/renesas/vsp1
-d:drivers/media/platform/rockchip
-d:drivers/media/platform/rockchip/rga
-d:drivers/media/platform/rockchip/rkisp1
-d:drivers/media/platform/rockchip/rkvdec
-d:drivers/media/platform/samsung
-d:drivers/media/platform/samsung/exynos-gsc
-d:drivers/media/platform/samsung/exynos4-is
-d:drivers/media/platform/samsung/s3c-camif
-d:drivers/media/platform/samsung/s5p-g2d
-d:drivers/media/platform/samsung/s5p-jpeg
-d:drivers/media/platform/samsung/s5p-mfc
-d:drivers/media/platform/st
-d:drivers/media/platform/st/sti
-d:drivers/media/platform/st/sti/bdisp
-d:drivers/media/platform/st/sti/c8sectpfe
-d:drivers/media/platform/st/sti/delta
-d:drivers/media/platform/st/sti/hva
-d:drivers/media/platform/st/stm32
-d:drivers/media/platform/st/stm32/dma2d
-d:drivers/media/platform/st/stm32/stm32-dcmipp
-d:drivers/media/platform/sunxi
-d:drivers/media/platform/sunxi/sun4i-csi
-d:drivers/media/platform/sunxi/sun6i-csi
-d:drivers/media/platform/sunxi/sun6i-mipi-csi2
-d:drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2
-d:drivers/media/platform/sunxi/sun8i-di
-d:drivers/media/platform/sunxi/sun8i-rotate
-d:drivers/media/platform/synopsys
-d:drivers/media/platform/synopsys/hdmirx
-d:drivers/media/platform/ti
-d:drivers/media/platform/ti/am437x
-d:drivers/media/platform/ti/cal
-d:drivers/media/platform/ti/davinci
-d:drivers/media/platform/ti/j721e-csi2rx
-d:drivers/media/platform/ti/omap
-d:drivers/media/platform/ti/omap3isp
-d:drivers/media/platform/ti/vpe
-d:drivers/media/platform/verisilicon
-d:drivers/media/platform/via
-d:drivers/media/platform/xilinx
-d:drivers/media/radio
-d:drivers/media/radio/si470x
-d:drivers/media/radio/si4713
-d:drivers/media/rc
-d:drivers/media/rc/img-ir
-d:drivers/media/rc/keymaps
-d:drivers/media/spi
-d:drivers/media/test-drivers
-d:drivers/media/test-drivers/vicodec
-d:drivers/media/test-drivers/vidtv
-d:drivers/media/test-drivers/vimc
-d:drivers/media/test-drivers/visl
-d:drivers/media/test-drivers/vivid
-d:drivers/media/tuners
-d:drivers/media/usb
-d:drivers/media/usb/airspy
-d:drivers/media/usb/as102
-d:drivers/media/usb/au0828
-d:drivers/media/usb/b2c2
-d:drivers/media/usb/cx231xx
-d:drivers/media/usb/dvb-usb
-d:drivers/media/usb/dvb-usb-v2
-d:drivers/media/usb/em28xx
-d:drivers/media/usb/go7007
-d:drivers/media/usb/gspca
-d:drivers/media/usb/gspca/gl860
-d:drivers/media/usb/gspca/m5602
-d:drivers/media/usb/gspca/stv06xx
-d:drivers/media/usb/hackrf
-d:drivers/media/usb/hdpvr
-d:drivers/media/usb/msi2500
-d:drivers/media/usb/pvrusb2
-d:drivers/media/usb/pwc
-d:drivers/media/usb/s2255
-d:drivers/media/usb/siano
-d:drivers/media/usb/stk1160
-d:drivers/media/usb/ttusb-budget
-d:drivers/media/usb/ttusb-dec
-d:drivers/media/usb/usbtv
-d:drivers/media/usb/uvc
-d:drivers/media/v4l2-core
-d:drivers/memory
-d:drivers/memory/samsung
-d:drivers/memory/tegra
-d:drivers/memstick
-d:drivers/memstick/core
-d:drivers/memstick/host
-d:drivers/message
-d:drivers/message/fusion
-d:drivers/message/fusion/lsi
-d:drivers/mfd
-d:drivers/misc
-d:drivers/misc/altera-stapl
-d:drivers/misc/amd-sbi
-d:drivers/misc/bcm-vk
-d:drivers/misc/c2port
-d:drivers/misc/cardreader
-d:drivers/misc/cb710
-d:drivers/misc/eeprom
-d:drivers/misc/genwqe
-d:drivers/misc/ibmasm
-d:drivers/misc/keba
-d:drivers/misc/lis3lv02d
-d:drivers/misc/lkdtm
-d:drivers/misc/mchp_pci1xxxx
-d:drivers/misc/mei
-d:drivers/misc/mei/gsc_proxy
-d:drivers/misc/mei/hdcp
-d:drivers/misc/mei/pxp
-d:drivers/misc/ocxl
-d:drivers/misc/pvpanic
-d:drivers/misc/rp1
-d:drivers/misc/sgi-gru
-d:drivers/misc/sgi-xp
-d:drivers/misc/uacce
-d:drivers/misc/vmw_vmci
-d:drivers/mmc
-d:drivers/mmc/core
-d:drivers/mmc/host
-d:drivers/most
-d:drivers/mtd
-d:drivers/mtd/chips
-d:drivers/mtd/devices
-d:drivers/mtd/hyperbus
-d:drivers/mtd/lpddr
-d:drivers/mtd/maps
-d:drivers/mtd/nand
-d:drivers/mtd/nand/onenand
-d:drivers/mtd/nand/raw
-d:drivers/mtd/nand/raw/atmel
-d:drivers/mtd/nand/raw/bcm47xxnflash
-d:drivers/mtd/nand/raw/brcmnand
-d:drivers/mtd/nand/raw/gpmi-nand
-d:drivers/mtd/nand/raw/ingenic
-d:drivers/mtd/nand/spi
-d:drivers/mtd/parsers
-d:drivers/mtd/spi-nor
-d:drivers/mtd/spi-nor/controllers
-d:drivers/mtd/tests
-d:drivers/mtd/ubi
-d:drivers/mux
-d:drivers/net
-d:drivers/net/arcnet
-d:drivers/net/bonding
-d:drivers/net/caif
-d:drivers/net/can
-d:drivers/net/can/c_can
-d:drivers/net/can/cc770
-d:drivers/net/can/ctucanfd
-d:drivers/net/can/dev
-d:drivers/net/can/esd
-d:drivers/net/can/flexcan
-d:drivers/net/can/ifi_canfd
-d:drivers/net/can/kvaser_pciefd
-d:drivers/net/can/m_can
-d:drivers/net/can/mscan
-d:drivers/net/can/peak_canfd
-d:drivers/net/can/rcar
-d:drivers/net/can/rockchip
-d:drivers/net/can/sja1000
-d:drivers/net/can/slcan
-d:drivers/net/can/softing
-d:drivers/net/can/spi
-d:drivers/net/can/spi/mcp251xfd
-d:drivers/net/can/usb
-d:drivers/net/can/usb/etas_es58x
-d:drivers/net/can/usb/kvaser_usb
-d:drivers/net/can/usb/peak_usb
-d:drivers/net/dsa
-d:drivers/net/dsa/b53
-d:drivers/net/dsa/hirschmann
-d:drivers/net/dsa/microchip
-d:drivers/net/dsa/mv88e6xxx
-d:drivers/net/dsa/ocelot
-d:drivers/net/dsa/qca
-d:drivers/net/dsa/realtek
-d:drivers/net/dsa/sja1105
-d:drivers/net/dsa/xrs700x
-d:drivers/net/ethernet
-d:drivers/net/ethernet/3com
-d:drivers/net/ethernet/8390
-d:drivers/net/ethernet/actions
-d:drivers/net/ethernet/adaptec
-d:drivers/net/ethernet/adi
-d:drivers/net/ethernet/aeroflex
-d:drivers/net/ethernet/agere
-d:drivers/net/ethernet/airoha
-d:drivers/net/ethernet/alacritech
-d:drivers/net/ethernet/allwinner
-d:drivers/net/ethernet/alteon
-d:drivers/net/ethernet/altera
-d:drivers/net/ethernet/amazon
-d:drivers/net/ethernet/amazon/ena
-d:drivers/net/ethernet/amd
-d:drivers/net/ethernet/amd/pds_core
-d:drivers/net/ethernet/amd/xgbe
-d:drivers/net/ethernet/apm
-d:drivers/net/ethernet/apm/xgene
-d:drivers/net/ethernet/apm/xgene-v2
-d:drivers/net/ethernet/apple
-d:drivers/net/ethernet/aquantia
-d:drivers/net/ethernet/aquantia/atlantic
-d:drivers/net/ethernet/aquantia/atlantic/hw_atl
-d:drivers/net/ethernet/aquantia/atlantic/hw_atl2
-d:drivers/net/ethernet/aquantia/atlantic/macsec
-d:drivers/net/ethernet/arc
-d:drivers/net/ethernet/asix
-d:drivers/net/ethernet/atheros
-d:drivers/net/ethernet/atheros/alx
-d:drivers/net/ethernet/atheros/atl1c
-d:drivers/net/ethernet/atheros/atl1e
-d:drivers/net/ethernet/atheros/atlx
-d:drivers/net/ethernet/broadcom
-d:drivers/net/ethernet/broadcom/asp2
-d:drivers/net/ethernet/broadcom/bnge
-d:drivers/net/ethernet/broadcom/bnx2x
-d:drivers/net/ethernet/broadcom/bnxt
-d:drivers/net/ethernet/broadcom/genet
-d:drivers/net/ethernet/brocade
-d:drivers/net/ethernet/brocade/bna
-d:drivers/net/ethernet/cadence
-d:drivers/net/ethernet/calxeda
-d:drivers/net/ethernet/cavium
-d:drivers/net/ethernet/cavium/common
-d:drivers/net/ethernet/cavium/liquidio
-d:drivers/net/ethernet/cavium/octeon
-d:drivers/net/ethernet/cavium/thunder
-d:drivers/net/ethernet/chelsio
-d:drivers/net/ethernet/chelsio/cxgb
-d:drivers/net/ethernet/chelsio/cxgb3
-d:drivers/net/ethernet/chelsio/cxgb4
-d:drivers/net/ethernet/chelsio/cxgb4vf
-d:drivers/net/ethernet/chelsio/inline_crypto
-d:drivers/net/ethernet/chelsio/inline_crypto/ch_ipsec
-d:drivers/net/ethernet/chelsio/inline_crypto/ch_ktls
-d:drivers/net/ethernet/chelsio/inline_crypto/chtls
-d:drivers/net/ethernet/chelsio/libcxgb
-d:drivers/net/ethernet/cirrus
-d:drivers/net/ethernet/cisco
-d:drivers/net/ethernet/cisco/enic
-d:drivers/net/ethernet/cortina
-d:drivers/net/ethernet/davicom
-d:drivers/net/ethernet/dec
-d:drivers/net/ethernet/dec/tulip
-d:drivers/net/ethernet/dlink
-d:drivers/net/ethernet/emulex
-d:drivers/net/ethernet/emulex/benet
-d:drivers/net/ethernet/engleder
-d:drivers/net/ethernet/ezchip
-d:drivers/net/ethernet/faraday
-d:drivers/net/ethernet/freescale
-d:drivers/net/ethernet/freescale/dpaa
-d:drivers/net/ethernet/freescale/dpaa2
-d:drivers/net/ethernet/freescale/enetc
-d:drivers/net/ethernet/freescale/fman
-d:drivers/net/ethernet/freescale/fs_enet
-d:drivers/net/ethernet/fujitsu
-d:drivers/net/ethernet/fungible
-d:drivers/net/ethernet/fungible/funcore
-d:drivers/net/ethernet/fungible/funeth
-d:drivers/net/ethernet/google
-d:drivers/net/ethernet/google/gve
-d:drivers/net/ethernet/hisilicon
-d:drivers/net/ethernet/hisilicon/hibmcge
-d:drivers/net/ethernet/hisilicon/hns
-d:drivers/net/ethernet/hisilicon/hns3
-d:drivers/net/ethernet/hisilicon/hns3/hns3_common
-d:drivers/net/ethernet/hisilicon/hns3/hns3pf
-d:drivers/net/ethernet/hisilicon/hns3/hns3vf
-d:drivers/net/ethernet/huawei
-d:drivers/net/ethernet/huawei/hinic
-d:drivers/net/ethernet/huawei/hinic3
-d:drivers/net/ethernet/i825xx
-d:drivers/net/ethernet/ibm
-d:drivers/net/ethernet/ibm/ehea
-d:drivers/net/ethernet/ibm/emac
-d:drivers/net/ethernet/intel
-d:drivers/net/ethernet/intel/e1000
-d:drivers/net/ethernet/intel/e1000e
-d:drivers/net/ethernet/intel/fm10k
-d:drivers/net/ethernet/intel/i40e
-d:drivers/net/ethernet/intel/iavf
-d:drivers/net/ethernet/intel/ice
-d:drivers/net/ethernet/intel/ice/devlink
-d:drivers/net/ethernet/intel/idpf
-d:drivers/net/ethernet/intel/igb
-d:drivers/net/ethernet/intel/igbvf
-d:drivers/net/ethernet/intel/igc
-d:drivers/net/ethernet/intel/ixgbe
-d:drivers/net/ethernet/intel/ixgbe/devlink
-d:drivers/net/ethernet/intel/ixgbevf
-d:drivers/net/ethernet/intel/libeth
-d:drivers/net/ethernet/intel/libie
-d:drivers/net/ethernet/litex
-d:drivers/net/ethernet/marvell
-d:drivers/net/ethernet/marvell/mvpp2
-d:drivers/net/ethernet/marvell/octeon_ep
-d:drivers/net/ethernet/marvell/octeon_ep_vf
-d:drivers/net/ethernet/marvell/octeontx2
-d:drivers/net/ethernet/marvell/octeontx2/af
-d:drivers/net/ethernet/marvell/octeontx2/af/cn20k
-d:drivers/net/ethernet/marvell/octeontx2/nic
-d:drivers/net/ethernet/marvell/prestera
-d:drivers/net/ethernet/mediatek
-d:drivers/net/ethernet/mellanox
-d:drivers/net/ethernet/mellanox/mlx4
-d:drivers/net/ethernet/mellanox/mlx5
-d:drivers/net/ethernet/mellanox/mlx5/core
-d:drivers/net/ethernet/mellanox/mlx5/core/diag
-d:drivers/net/ethernet/mellanox/mlx5/core/en
-d:drivers/net/ethernet/mellanox/mlx5/core/en/rep
-d:drivers/net/ethernet/mellanox/mlx5/core/en/tc
-d:drivers/net/ethernet/mellanox/mlx5/core/en/tc/act
-d:drivers/net/ethernet/mellanox/mlx5/core/en/xsk
-d:drivers/net/ethernet/mellanox/mlx5/core/en_accel
-d:drivers/net/ethernet/mellanox/mlx5/core/esw
-d:drivers/net/ethernet/mellanox/mlx5/core/esw/acl
-d:drivers/net/ethernet/mellanox/mlx5/core/esw/diag
-d:drivers/net/ethernet/mellanox/mlx5/core/fpga
-d:drivers/net/ethernet/mellanox/mlx5/core/ipoib
-d:drivers/net/ethernet/mellanox/mlx5/core/lag
-d:drivers/net/ethernet/mellanox/mlx5/core/lib
-d:drivers/net/ethernet/mellanox/mlx5/core/sf
-d:drivers/net/ethernet/mellanox/mlx5/core/sf/dev
-d:drivers/net/ethernet/mellanox/mlx5/core/sf/dev/diag
-d:drivers/net/ethernet/mellanox/mlx5/core/sf/diag
-d:drivers/net/ethernet/mellanox/mlx5/core/steering
-d:drivers/net/ethernet/mellanox/mlx5/core/steering/hws
-d:drivers/net/ethernet/mellanox/mlx5/core/steering/sws
-d:drivers/net/ethernet/mellanox/mlxbf_gige
-d:drivers/net/ethernet/mellanox/mlxfw
-d:drivers/net/ethernet/mellanox/mlxsw
-d:drivers/net/ethernet/meta
-d:drivers/net/ethernet/meta/fbnic
-d:drivers/net/ethernet/micrel
-d:drivers/net/ethernet/microchip
-d:drivers/net/ethernet/microchip/fdma
-d:drivers/net/ethernet/microchip/lan865x
-d:drivers/net/ethernet/microchip/lan966x
-d:drivers/net/ethernet/microchip/sparx5
-d:drivers/net/ethernet/microchip/sparx5/lan969x
-d:drivers/net/ethernet/microchip/vcap
-d:drivers/net/ethernet/microsoft
-d:drivers/net/ethernet/microsoft/mana
-d:drivers/net/ethernet/moxa
-d:drivers/net/ethernet/mscc
-d:drivers/net/ethernet/myricom
-d:drivers/net/ethernet/myricom/myri10ge
-d:drivers/net/ethernet/natsemi
-d:drivers/net/ethernet/neterion
-d:drivers/net/ethernet/netronome
-d:drivers/net/ethernet/netronome/nfp
-d:drivers/net/ethernet/netronome/nfp/abm
-d:drivers/net/ethernet/netronome/nfp/bpf
-d:drivers/net/ethernet/netronome/nfp/crypto
-d:drivers/net/ethernet/netronome/nfp/flower
-d:drivers/net/ethernet/netronome/nfp/nfd3
-d:drivers/net/ethernet/netronome/nfp/nfdk
-d:drivers/net/ethernet/netronome/nfp/nfpcore
-d:drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000
-d:drivers/net/ethernet/netronome/nfp/nic
-d:drivers/net/ethernet/ni
-d:drivers/net/ethernet/nvidia
-d:drivers/net/ethernet/nxp
-d:drivers/net/ethernet/oki-semi
-d:drivers/net/ethernet/oki-semi/pch_gbe
-d:drivers/net/ethernet/packetengines
-d:drivers/net/ethernet/pasemi
-d:drivers/net/ethernet/pensando
-d:drivers/net/ethernet/pensando/ionic
-d:drivers/net/ethernet/qlogic
-d:drivers/net/ethernet/qlogic/netxen
-d:drivers/net/ethernet/qlogic/qed
-d:drivers/net/ethernet/qlogic/qede
-d:drivers/net/ethernet/qlogic/qlcnic
-d:drivers/net/ethernet/qualcomm
-d:drivers/net/ethernet/qualcomm/emac
-d:drivers/net/ethernet/qualcomm/rmnet
-d:drivers/net/ethernet/rdc
-d:drivers/net/ethernet/realtek
-d:drivers/net/ethernet/realtek/rtase
-d:drivers/net/ethernet/renesas
-d:drivers/net/ethernet/rocker
-d:drivers/net/ethernet/samsung
-d:drivers/net/ethernet/samsung/sxgbe
-d:drivers/net/ethernet/seeq
-d:drivers/net/ethernet/sfc
-d:drivers/net/ethernet/sfc/falcon
-d:drivers/net/ethernet/sfc/siena
-d:drivers/net/ethernet/sgi
-d:drivers/net/ethernet/silan
-d:drivers/net/ethernet/sis
-d:drivers/net/ethernet/smsc
-d:drivers/net/ethernet/socionext
-d:drivers/net/ethernet/stmicro
-d:drivers/net/ethernet/stmicro/stmmac
-d:drivers/net/ethernet/sun
-d:drivers/net/ethernet/sunplus
-d:drivers/net/ethernet/synopsys
-d:drivers/net/ethernet/tehuti
-d:drivers/net/ethernet/ti
-d:drivers/net/ethernet/ti/icssg
-d:drivers/net/ethernet/toshiba
-d:drivers/net/ethernet/tundra
-d:drivers/net/ethernet/vertexcom
-d:drivers/net/ethernet/via
-d:drivers/net/ethernet/wangxun
-d:drivers/net/ethernet/wangxun/libwx
-d:drivers/net/ethernet/wangxun/ngbe
-d:drivers/net/ethernet/wangxun/ngbevf
-d:drivers/net/ethernet/wangxun/txgbe
-d:drivers/net/ethernet/wangxun/txgbevf
-d:drivers/net/ethernet/wiznet
-d:drivers/net/ethernet/xilinx
-d:drivers/net/ethernet/xircom
-d:drivers/net/ethernet/xscale
-d:drivers/net/fddi
-d:drivers/net/fddi/skfp
-d:drivers/net/fddi/skfp/h
-d:drivers/net/fjes
-d:drivers/net/hamradio
-d:drivers/net/hippi
-d:drivers/net/hyperv
-d:drivers/net/ieee802154
-d:drivers/net/ipa
-d:drivers/net/ipa/data
-d:drivers/net/ipa/reg
-d:drivers/net/ipvlan
-d:drivers/net/mctp
-d:drivers/net/mdio
-d:drivers/net/netdevsim
-d:drivers/net/ovpn
-d:drivers/net/pcs
-d:drivers/net/phy
-d:drivers/net/phy/aquantia
-d:drivers/net/phy/mediatek
-d:drivers/net/phy/mscc
-d:drivers/net/phy/qcom
-d:drivers/net/phy/realtek
-d:drivers/net/plip
-d:drivers/net/ppp
-d:drivers/net/pse-pd
-d:drivers/net/slip
-d:drivers/net/team
-d:drivers/net/thunderbolt
-d:drivers/net/usb
-d:drivers/net/vmxnet3
-d:drivers/net/vxlan
-d:drivers/net/wan
-d:drivers/net/wan/framer
-d:drivers/net/wan/framer/pef2256
-d:drivers/net/wireguard
-d:drivers/net/wireguard/selftest
-d:drivers/net/wireless
-d:drivers/net/wireless/admtek
-d:drivers/net/wireless/ath
-d:drivers/net/wireless/ath/ar5523
-d:drivers/net/wireless/ath/ath10k
-d:drivers/net/wireless/ath/ath11k
-d:drivers/net/wireless/ath/ath12k
-d:drivers/net/wireless/ath/ath5k
-d:drivers/net/wireless/ath/ath6kl
-d:drivers/net/wireless/ath/ath9k
-d:drivers/net/wireless/ath/carl9170
-d:drivers/net/wireless/ath/wcn36xx
-d:drivers/net/wireless/ath/wil6210
-d:drivers/net/wireless/atmel
-d:drivers/net/wireless/broadcom
-d:drivers/net/wireless/broadcom/b43
-d:drivers/net/wireless/broadcom/b43legacy
-d:drivers/net/wireless/broadcom/brcm80211
-d:drivers/net/wireless/broadcom/brcm80211/brcmfmac
-d:drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca
-d:drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw
-d:drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc
-d:drivers/net/wireless/broadcom/brcm80211/brcmsmac
-d:drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy
-d:drivers/net/wireless/broadcom/brcm80211/brcmutil
-d:drivers/net/wireless/broadcom/brcm80211/include
-d:drivers/net/wireless/intel
-d:drivers/net/wireless/intel/ipw2x00
-d:drivers/net/wireless/intel/iwlegacy
-d:drivers/net/wireless/intel/iwlwifi
-d:drivers/net/wireless/intel/iwlwifi/cfg
-d:drivers/net/wireless/intel/iwlwifi/dvm
-d:drivers/net/wireless/intel/iwlwifi/fw
-d:drivers/net/wireless/intel/iwlwifi/fw/api
-d:drivers/net/wireless/intel/iwlwifi/mei
-d:drivers/net/wireless/intel/iwlwifi/mld
-d:drivers/net/wireless/intel/iwlwifi/mld/tests
-d:drivers/net/wireless/intel/iwlwifi/mvm
-d:drivers/net/wireless/intel/iwlwifi/mvm/tests
-d:drivers/net/wireless/intel/iwlwifi/pcie
-d:drivers/net/wireless/intel/iwlwifi/pcie/gen1_2
-d:drivers/net/wireless/intel/iwlwifi/tests
-d:drivers/net/wireless/intersil
-d:drivers/net/wireless/intersil/p54
-d:drivers/net/wireless/marvell
-d:drivers/net/wireless/marvell/libertas
-d:drivers/net/wireless/marvell/libertas_tf
-d:drivers/net/wireless/marvell/mwifiex
-d:drivers/net/wireless/mediatek
-d:drivers/net/wireless/mediatek/mt76
-d:drivers/net/wireless/mediatek/mt76/mt7603
-d:drivers/net/wireless/mediatek/mt76/mt7615
-d:drivers/net/wireless/mediatek/mt76/mt76x0
-d:drivers/net/wireless/mediatek/mt76/mt76x2
-d:drivers/net/wireless/mediatek/mt76/mt7915
-d:drivers/net/wireless/mediatek/mt76/mt7921
-d:drivers/net/wireless/mediatek/mt76/mt7925
-d:drivers/net/wireless/mediatek/mt76/mt7996
-d:drivers/net/wireless/mediatek/mt7601u
-d:drivers/net/wireless/microchip
-d:drivers/net/wireless/microchip/wilc1000
-d:drivers/net/wireless/purelifi
-d:drivers/net/wireless/purelifi/plfxlc
-d:drivers/net/wireless/quantenna
-d:drivers/net/wireless/quantenna/qtnfmac
-d:drivers/net/wireless/quantenna/qtnfmac/pcie
-d:drivers/net/wireless/ralink
-d:drivers/net/wireless/ralink/rt2x00
-d:drivers/net/wireless/realtek
-d:drivers/net/wireless/realtek/rtl818x
-d:drivers/net/wireless/realtek/rtl818x/rtl8180
-d:drivers/net/wireless/realtek/rtl818x/rtl8187
-d:drivers/net/wireless/realtek/rtl8xxxu
-d:drivers/net/wireless/realtek/rtlwifi
-d:drivers/net/wireless/realtek/rtlwifi/btcoexist
-d:drivers/net/wireless/realtek/rtlwifi/rtl8188ee
-d:drivers/net/wireless/realtek/rtlwifi/rtl8192c
-d:drivers/net/wireless/realtek/rtlwifi/rtl8192ce
-d:drivers/net/wireless/realtek/rtlwifi/rtl8192cu
-d:drivers/net/wireless/realtek/rtlwifi/rtl8192d
-d:drivers/net/wireless/realtek/rtlwifi/rtl8192de
-d:drivers/net/wireless/realtek/rtlwifi/rtl8192du
-d:drivers/net/wireless/realtek/rtlwifi/rtl8192ee
-d:drivers/net/wireless/realtek/rtlwifi/rtl8192se
-d:drivers/net/wireless/realtek/rtlwifi/rtl8723ae
-d:drivers/net/wireless/realtek/rtlwifi/rtl8723be
-d:drivers/net/wireless/realtek/rtlwifi/rtl8723com
-d:drivers/net/wireless/realtek/rtlwifi/rtl8821ae
-d:drivers/net/wireless/realtek/rtw88
-d:drivers/net/wireless/realtek/rtw89
-d:drivers/net/wireless/rsi
-d:drivers/net/wireless/silabs
-d:drivers/net/wireless/silabs/wfx
-d:drivers/net/wireless/st
-d:drivers/net/wireless/st/cw1200
-d:drivers/net/wireless/ti
-d:drivers/net/wireless/ti/wl1251
-d:drivers/net/wireless/ti/wl12xx
-d:drivers/net/wireless/ti/wl18xx
-d:drivers/net/wireless/ti/wlcore
-d:drivers/net/wireless/virtual
-d:drivers/net/wireless/zydas
-d:drivers/net/wireless/zydas/zd1211rw
-d:drivers/net/wwan
-d:drivers/net/wwan/iosm
-d:drivers/net/wwan/t7xx
-d:drivers/net/xen-netback
-d:drivers/nfc
-d:drivers/nfc/fdp
-d:drivers/nfc/microread
-d:drivers/nfc/nfcmrvl
-d:drivers/nfc/nxp-nci
-d:drivers/nfc/pn533
-d:drivers/nfc/pn544
-d:drivers/nfc/s3fwrn5
-d:drivers/nfc/st-nci
-d:drivers/nfc/st21nfca
-d:drivers/nfc/st95hf
-d:drivers/ntb
-d:drivers/ntb/hw
-d:drivers/ntb/hw/amd
-d:drivers/ntb/hw/epf
-d:drivers/ntb/hw/idt
-d:drivers/ntb/hw/intel
-d:drivers/ntb/hw/mscc
-d:drivers/ntb/test
-d:drivers/nubus
-d:drivers/nvdimm
-d:drivers/nvme
-d:drivers/nvme/common
-d:drivers/nvme/host
-d:drivers/nvme/target
-d:drivers/nvmem
-d:drivers/nvmem/layouts
-d:drivers/of
-d:drivers/of/unittest-data
-d:drivers/opp
-d:drivers/parisc
-d:drivers/parport
-d:drivers/pci
-d:drivers/pci/controller
-d:drivers/pci/controller/cadence
-d:drivers/pci/controller/dwc
-d:drivers/pci/controller/mobiveil
-d:drivers/pci/controller/plda
-d:drivers/pci/endpoint
-d:drivers/pci/endpoint/functions
-d:drivers/pci/hotplug
-d:drivers/pci/msi
-d:drivers/pci/pcie
-d:drivers/pci/pwrctrl
-d:drivers/pci/switch
-d:drivers/pcmcia
-d:drivers/peci
-d:drivers/peci/controller
-d:drivers/perf
-d:drivers/perf/amlogic
-d:drivers/perf/arm_cspmu
-d:drivers/perf/hisilicon
-d:drivers/phy
-d:drivers/phy/allwinner
-d:drivers/phy/amlogic
-d:drivers/phy/broadcom
-d:drivers/phy/cadence
-d:drivers/phy/freescale
-d:drivers/phy/hisilicon
-d:drivers/phy/ingenic
-d:drivers/phy/intel
-d:drivers/phy/lantiq
-d:drivers/phy/marvell
-d:drivers/phy/mediatek
-d:drivers/phy/microchip
-d:drivers/phy/motorola
-d:drivers/phy/mscc
-d:drivers/phy/nuvoton
-d:drivers/phy/qualcomm
-d:drivers/phy/ralink
-d:drivers/phy/realtek
-d:drivers/phy/renesas
-d:drivers/phy/rockchip
-d:drivers/phy/samsung
-d:drivers/phy/socionext
-d:drivers/phy/st
-d:drivers/phy/starfive
-d:drivers/phy/sunplus
-d:drivers/phy/tegra
-d:drivers/phy/ti
-d:drivers/phy/xilinx
-d:drivers/pinctrl
-d:drivers/pinctrl/actions
-d:drivers/pinctrl/aspeed
-d:drivers/pinctrl/bcm
-d:drivers/pinctrl/berlin
-d:drivers/pinctrl/cirrus
-d:drivers/pinctrl/freescale
-d:drivers/pinctrl/intel
-d:drivers/pinctrl/mediatek
-d:drivers/pinctrl/meson
-d:drivers/pinctrl/mvebu
-d:drivers/pinctrl/nomadik
-d:drivers/pinctrl/nuvoton
-d:drivers/pinctrl/nxp
-d:drivers/pinctrl/pxa
-d:drivers/pinctrl/qcom
-d:drivers/pinctrl/realtek
-d:drivers/pinctrl/renesas
-d:drivers/pinctrl/samsung
-d:drivers/pinctrl/sophgo
-d:drivers/pinctrl/spacemit
-d:drivers/pinctrl/spear
-d:drivers/pinctrl/sprd
-d:drivers/pinctrl/starfive
-d:drivers/pinctrl/stm32
-d:drivers/pinctrl/sunplus
-d:drivers/pinctrl/sunxi
-d:drivers/pinctrl/tegra
-d:drivers/pinctrl/ti
-d:drivers/pinctrl/uniphier
-d:drivers/pinctrl/visconti
-d:drivers/pinctrl/vt8500
-d:drivers/platform
-d:drivers/platform/arm64
-d:drivers/platform/chrome
-d:drivers/platform/chrome/wilco_ec
-d:drivers/platform/cznic
-d:drivers/platform/goldfish
-d:drivers/platform/loongarch
-d:drivers/platform/mellanox
-d:drivers/platform/mips
-d:drivers/platform/olpc
-d:drivers/platform/surface
-d:drivers/platform/surface/aggregator
-d:drivers/platform/x86
-d:drivers/platform/x86/amd
-d:drivers/platform/x86/amd/hfi
-d:drivers/platform/x86/amd/hsmp
-d:drivers/platform/x86/amd/pmc
-d:drivers/platform/x86/amd/pmf
-d:drivers/platform/x86/dell
-d:drivers/platform/x86/dell/dell-wmi-sysman
-d:drivers/platform/x86/hp
-d:drivers/platform/x86/hp/hp-bioscfg
-d:drivers/platform/x86/intel
-d:drivers/platform/x86/intel/atomisp2
-d:drivers/platform/x86/intel/ifs
-d:drivers/platform/x86/intel/int1092
-d:drivers/platform/x86/intel/int3472
-d:drivers/platform/x86/intel/pmc
-d:drivers/platform/x86/intel/pmt
-d:drivers/platform/x86/intel/speed_select_if
-d:drivers/platform/x86/intel/telemetry
-d:drivers/platform/x86/intel/uncore-frequency
-d:drivers/platform/x86/intel/wmi
-d:drivers/platform/x86/lenovo
-d:drivers/platform/x86/siemens
-d:drivers/platform/x86/tuxedo
-d:drivers/platform/x86/tuxedo/nb04
-d:drivers/platform/x86/x86-android-tablets
-d:drivers/pmdomain
-d:drivers/pmdomain/actions
-d:drivers/pmdomain/amlogic
-d:drivers/pmdomain/apple
-d:drivers/pmdomain/arm
-d:drivers/pmdomain/bcm
-d:drivers/pmdomain/imx
-d:drivers/pmdomain/mediatek
-d:drivers/pmdomain/qcom
-d:drivers/pmdomain/renesas
-d:drivers/pmdomain/rockchip
-d:drivers/pmdomain/samsung
-d:drivers/pmdomain/st
-d:drivers/pmdomain/starfive
-d:drivers/pmdomain/sunxi
-d:drivers/pmdomain/tegra
-d:drivers/pmdomain/thead
-d:drivers/pmdomain/ti
-d:drivers/pmdomain/xilinx
-d:drivers/pnp
-d:drivers/pnp/isapnp
-d:drivers/pnp/pnpacpi
-d:drivers/pnp/pnpbios
-d:drivers/power
-d:drivers/power/reset
-d:drivers/power/sequencing
-d:drivers/power/supply
-d:drivers/powercap
-d:drivers/pps
-d:drivers/pps/clients
-d:drivers/pps/generators
-d:drivers/ps3
-d:drivers/ptp
-d:drivers/pwm
-d:drivers/rapidio
-d:drivers/rapidio/devices
-d:drivers/rapidio/switches
-d:drivers/ras
-d:drivers/ras/amd
-d:drivers/ras/amd/atl
-d:drivers/regulator
-d:drivers/remoteproc
-d:drivers/reset
-d:drivers/reset/amlogic
-d:drivers/reset/hisilicon
-d:drivers/reset/starfive
-d:drivers/reset/sti
-d:drivers/reset/tegra
-d:drivers/rpmsg
-d:drivers/rtc
-d:drivers/s390
-d:drivers/s390/block
-d:drivers/s390/char
-d:drivers/s390/cio
-d:drivers/s390/crypto
-d:drivers/s390/net
-d:drivers/s390/scsi
-d:drivers/s390/virtio
-d:drivers/sbus
-d:drivers/sbus/char
-d:drivers/scsi
-d:drivers/scsi/aacraid
-d:drivers/scsi/aic7xxx
-d:drivers/scsi/aic7xxx/aicasm
-d:drivers/scsi/aic94xx
-d:drivers/scsi/arcmsr
-d:drivers/scsi/arm
-d:drivers/scsi/be2iscsi
-d:drivers/scsi/bfa
-d:drivers/scsi/bnx2fc
-d:drivers/scsi/bnx2i
-d:drivers/scsi/csiostor
-d:drivers/scsi/cxgbi
-d:drivers/scsi/cxgbi/cxgb3i
-d:drivers/scsi/cxgbi/cxgb4i
-d:drivers/scsi/device_handler
-d:drivers/scsi/elx
-d:drivers/scsi/elx/efct
-d:drivers/scsi/elx/include
-d:drivers/scsi/elx/libefc
-d:drivers/scsi/elx/libefc_sli
-d:drivers/scsi/esas2r
-d:drivers/scsi/fcoe
-d:drivers/scsi/fnic
-d:drivers/scsi/hisi_sas
-d:drivers/scsi/ibmvscsi
-d:drivers/scsi/ibmvscsi_tgt
-d:drivers/scsi/isci
-d:drivers/scsi/libfc
-d:drivers/scsi/libsas
-d:drivers/scsi/lpfc
-d:drivers/scsi/megaraid
-d:drivers/scsi/mpi3mr
-d:drivers/scsi/mpi3mr/mpi
-d:drivers/scsi/mpt3sas
-d:drivers/scsi/mpt3sas/mpi
-d:drivers/scsi/mvsas
-d:drivers/scsi/pcmcia
-d:drivers/scsi/pm8001
-d:drivers/scsi/qedf
-d:drivers/scsi/qedi
-d:drivers/scsi/qla2xxx
-d:drivers/scsi/qla4xxx
-d:drivers/scsi/smartpqi
-d:drivers/scsi/snic
-d:drivers/scsi/sym53c8xx_2
-d:drivers/sh
-d:drivers/sh/clk
-d:drivers/sh/intc
-d:drivers/sh/maple
-d:drivers/siox
-d:drivers/slimbus
-d:drivers/soc
-d:drivers/soc/amlogic
-d:drivers/soc/apple
-d:drivers/soc/aspeed
-d:drivers/soc/atmel
-d:drivers/soc/bcm
-d:drivers/soc/bcm/brcmstb
-d:drivers/soc/bcm/brcmstb/pm
-d:drivers/soc/canaan
-d:drivers/soc/cirrus
-d:drivers/soc/dove
-d:drivers/soc/fsl
-d:drivers/soc/fsl/dpio
-d:drivers/soc/fsl/qbman
-d:drivers/soc/fsl/qe
-d:drivers/soc/fujitsu
-d:drivers/soc/gemini
-d:drivers/soc/hisilicon
-d:drivers/soc/imx
-d:drivers/soc/ixp4xx
-d:drivers/soc/lantiq
-d:drivers/soc/litex
-d:drivers/soc/loongson
-d:drivers/soc/mediatek
-d:drivers/soc/microchip
-d:drivers/soc/nuvoton
-d:drivers/soc/pxa
-d:drivers/soc/qcom
-d:drivers/soc/renesas
-d:drivers/soc/rockchip
-d:drivers/soc/samsung
-d:drivers/soc/sophgo
-d:drivers/soc/sunxi
-d:drivers/soc/tegra
-d:drivers/soc/tegra/cbb
-d:drivers/soc/tegra/fuse
-d:drivers/soc/ti
-d:drivers/soc/ux500
-d:drivers/soc/versatile
-d:drivers/soc/vt8500
-d:drivers/soc/xilinx
-d:drivers/soundwire
-d:drivers/spi
-d:drivers/spmi
-d:drivers/ssb
-d:drivers/staging
-d:drivers/staging/axis-fifo
-d:drivers/staging/fbtft
-d:drivers/staging/gpib
-d:drivers/staging/gpib/agilent_82350b
-d:drivers/staging/gpib/agilent_82357a
-d:drivers/staging/gpib/cb7210
-d:drivers/staging/gpib/cec
-d:drivers/staging/gpib/common
-d:drivers/staging/gpib/eastwood
-d:drivers/staging/gpib/fmh_gpib
-d:drivers/staging/gpib/gpio
-d:drivers/staging/gpib/hp_82335
-d:drivers/staging/gpib/hp_82341
-d:drivers/staging/gpib/include
-d:drivers/staging/gpib/ines
-d:drivers/staging/gpib/lpvo_usb_gpib
-d:drivers/staging/gpib/nec7210
-d:drivers/staging/gpib/ni_usb
-d:drivers/staging/gpib/pc2
-d:drivers/staging/gpib/tms9914
-d:drivers/staging/gpib/tnt4882
-d:drivers/staging/gpib/uapi
-d:drivers/staging/greybus
-d:drivers/staging/greybus/Documentation
-d:drivers/staging/greybus/Documentation/firmware
-d:drivers/staging/iio
-d:drivers/staging/iio/Documentation
-d:drivers/staging/iio/accel
-d:drivers/staging/iio/adc
-d:drivers/staging/iio/addac
-d:drivers/staging/iio/frequency
-d:drivers/staging/iio/impedance-analyzer
-d:drivers/staging/media
-d:drivers/staging/media/atomisp
-d:drivers/staging/media/atomisp/i2c
-d:drivers/staging/media/atomisp/include
-d:drivers/staging/media/atomisp/include/hmm
-d:drivers/staging/media/atomisp/include/linux
-d:drivers/staging/media/atomisp/include/mmu
-d:drivers/staging/media/atomisp/pci
-d:drivers/staging/media/atomisp/pci/base
-d:drivers/staging/media/atomisp/pci/base/circbuf
-d:drivers/staging/media/atomisp/pci/base/circbuf/interface
-d:drivers/staging/media/atomisp/pci/base/circbuf/src
-d:drivers/staging/media/atomisp/pci/base/refcount
-d:drivers/staging/media/atomisp/pci/base/refcount/interface
-d:drivers/staging/media/atomisp/pci/base/refcount/src
-d:drivers/staging/media/atomisp/pci/camera
-d:drivers/staging/media/atomisp/pci/camera/pipe
-d:drivers/staging/media/atomisp/pci/camera/pipe/interface
-d:drivers/staging/media/atomisp/pci/camera/pipe/src
-d:drivers/staging/media/atomisp/pci/camera/util
-d:drivers/staging/media/atomisp/pci/camera/util/interface
-d:drivers/staging/media/atomisp/pci/camera/util/src
-d:drivers/staging/media/atomisp/pci/css_2401_system
-d:drivers/staging/media/atomisp/pci/css_2401_system/host
-d:drivers/staging/media/atomisp/pci/css_2401_system/hrt
-d:drivers/staging/media/atomisp/pci/hive_isp_css_common
-d:drivers/staging/media/atomisp/pci/hive_isp_css_common/host
-d:drivers/staging/media/atomisp/pci/hive_isp_css_include
-d:drivers/staging/media/atomisp/pci/hive_isp_css_include/device_access
-d:drivers/staging/media/atomisp/pci/hive_isp_css_include/host
-d:drivers/staging/media/atomisp/pci/hive_isp_css_shared
-d:drivers/staging/media/atomisp/pci/hive_isp_css_shared/host
-d:drivers/staging/media/atomisp/pci/hmm
-d:drivers/staging/media/atomisp/pci/isp
-d:drivers/staging/media/atomisp/pci/isp/kernels
-d:drivers/staging/media/atomisp/pci/isp/kernels/aa
-d:drivers/staging/media/atomisp/pci/isp/kernels/aa/aa_2
-d:drivers/staging/media/atomisp/pci/isp/kernels/anr
-d:drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_1.0
-d:drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_2
-d:drivers/staging/media/atomisp/pci/isp/kernels/bh
-d:drivers/staging/media/atomisp/pci/isp/kernels/bh/bh_2
-d:drivers/staging/media/atomisp/pci/isp/kernels/bnlm
-d:drivers/staging/media/atomisp/pci/isp/kernels/bnr
-d:drivers/staging/media/atomisp/pci/isp/kernels/bnr/bnr2_2
-d:drivers/staging/media/atomisp/pci/isp/kernels/bnr/bnr_1.0
-d:drivers/staging/media/atomisp/pci/isp/kernels/cnr
-d:drivers/staging/media/atomisp/pci/isp/kernels/cnr/cnr_1.0
-d:drivers/staging/media/atomisp/pci/isp/kernels/cnr/cnr_2
-d:drivers/staging/media/atomisp/pci/isp/kernels/conversion
-d:drivers/staging/media/atomisp/pci/isp/kernels/conversion/conversion_1.0
-d:drivers/staging/media/atomisp/pci/isp/kernels/copy_output
-d:drivers/staging/media/atomisp/pci/isp/kernels/copy_output/copy_output_1.0
-d:drivers/staging/media/atomisp/pci/isp/kernels/crop
-d:drivers/staging/media/atomisp/pci/isp/kernels/crop/crop_1.0
-d:drivers/staging/media/atomisp/pci/isp/kernels/csc
-d:drivers/staging/media/atomisp/pci/isp/kernels/csc/csc_1.0
-d:drivers/staging/media/atomisp/pci/isp/kernels/ctc
-d:drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc1_5
-d:drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc2
-d:drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc_1.0
-d:drivers/staging/media/atomisp/pci/isp/kernels/de
-d:drivers/staging/media/atomisp/pci/isp/kernels/de/de_1.0
-d:drivers/staging/media/atomisp/pci/isp/kernels/de/de_2
-d:drivers/staging/media/atomisp/pci/isp/kernels/dp
-d:drivers/staging/media/atomisp/pci/isp/kernels/dp/dp_1.0
-d:drivers/staging/media/atomisp/pci/isp/kernels/dpc2
-d:drivers/staging/media/atomisp/pci/isp/kernels/dvs
-d:drivers/staging/media/atomisp/pci/isp/kernels/dvs/dvs_1.0
-d:drivers/staging/media/atomisp/pci/isp/kernels/eed1_8
-d:drivers/staging/media/atomisp/pci/isp/kernels/fc
-d:drivers/staging/media/atomisp/pci/isp/kernels/fc/fc_1.0
-d:drivers/staging/media/atomisp/pci/isp/kernels/fixedbds
-d:drivers/staging/media/atomisp/pci/isp/kernels/fixedbds/fixedbds_1.0
-d:drivers/staging/media/atomisp/pci/isp/kernels/fpn
-d:drivers/staging/media/atomisp/pci/isp/kernels/fpn/fpn_1.0
-d:drivers/staging/media/atomisp/pci/isp/kernels/gc
-d:drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_1.0
-d:drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_2
-d:drivers/staging/media/atomisp/pci/isp/kernels/hdr
-d:drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls
-d:drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/bayer_io_ls
-d:drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/common
-d:drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/yuv444_io_ls
-d:drivers/staging/media/atomisp/pci/isp/kernels/iterator
-d:drivers/staging/media/atomisp/pci/isp/kernels/iterator/iterator_1.0
-d:drivers/staging/media/atomisp/pci/isp/kernels/macc
-d:drivers/staging/media/atomisp/pci/isp/kernels/macc/macc1_5
-d:drivers/staging/media/atomisp/pci/isp/kernels/macc/macc_1.0
-d:drivers/staging/media/atomisp/pci/isp/kernels/norm
-d:drivers/staging/media/atomisp/pci/isp/kernels/norm/norm_1.0
-d:drivers/staging/media/atomisp/pci/isp/kernels/ob
-d:drivers/staging/media/atomisp/pci/isp/kernels/ob/ob2
-d:drivers/staging/media/atomisp/pci/isp/kernels/ob/ob_1.0
-d:drivers/staging/media/atomisp/pci/isp/kernels/output
-d:drivers/staging/media/atomisp/pci/isp/kernels/output/output_1.0
-d:drivers/staging/media/atomisp/pci/isp/kernels/qplane
-d:drivers/staging/media/atomisp/pci/isp/kernels/qplane/qplane_2
-d:drivers/staging/media/atomisp/pci/isp/kernels/raw
-d:drivers/staging/media/atomisp/pci/isp/kernels/raw/raw_1.0
-d:drivers/staging/media/atomisp/pci/isp/kernels/raw_aa_binning
-d:drivers/staging/media/atomisp/pci/isp/kernels/raw_aa_binning/raw_aa_binning_1.0
-d:drivers/staging/media/atomisp/pci/isp/kernels/ref
-d:drivers/staging/media/atomisp/pci/isp/kernels/ref/ref_1.0
-d:drivers/staging/media/atomisp/pci/isp/kernels/s3a
-d:drivers/staging/media/atomisp/pci/isp/kernels/s3a/s3a_1.0
-d:drivers/staging/media/atomisp/pci/isp/kernels/sc
-d:drivers/staging/media/atomisp/pci/isp/kernels/sc/sc_1.0
-d:drivers/staging/media/atomisp/pci/isp/kernels/sdis
-d:drivers/staging/media/atomisp/pci/isp/kernels/sdis/common
-d:drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_1.0
-d:drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_2
-d:drivers/staging/media/atomisp/pci/isp/kernels/tdf
-d:drivers/staging/media/atomisp/pci/isp/kernels/tdf/tdf_1.0
-d:drivers/staging/media/atomisp/pci/isp/kernels/tnr
-d:drivers/staging/media/atomisp/pci/isp/kernels/tnr/tnr3
-d:drivers/staging/media/atomisp/pci/isp/kernels/tnr/tnr_1.0
-d:drivers/staging/media/atomisp/pci/isp/kernels/uds
-d:drivers/staging/media/atomisp/pci/isp/kernels/uds/uds_1.0
-d:drivers/staging/media/atomisp/pci/isp/kernels/vf
-d:drivers/staging/media/atomisp/pci/isp/kernels/vf/vf_1.0
-d:drivers/staging/media/atomisp/pci/isp/kernels/wb
-d:drivers/staging/media/atomisp/pci/isp/kernels/wb/wb_1.0
-d:drivers/staging/media/atomisp/pci/isp/kernels/xnr
-d:drivers/staging/media/atomisp/pci/isp/kernels/xnr/xnr_1.0
-d:drivers/staging/media/atomisp/pci/isp/kernels/xnr/xnr_3.0
-d:drivers/staging/media/atomisp/pci/isp/kernels/ynr
-d:drivers/staging/media/atomisp/pci/isp/kernels/ynr/ynr_1.0
-d:drivers/staging/media/atomisp/pci/isp/kernels/ynr/ynr_2
-d:drivers/staging/media/atomisp/pci/isp/modes
-d:drivers/staging/media/atomisp/pci/isp/modes/interface
-d:drivers/staging/media/atomisp/pci/mmu
-d:drivers/staging/media/atomisp/pci/runtime
-d:drivers/staging/media/atomisp/pci/runtime/binary
-d:drivers/staging/media/atomisp/pci/runtime/binary/interface
-d:drivers/staging/media/atomisp/pci/runtime/binary/src
-d:drivers/staging/media/atomisp/pci/runtime/bufq
-d:drivers/staging/media/atomisp/pci/runtime/bufq/interface
-d:drivers/staging/media/atomisp/pci/runtime/bufq/src
-d:drivers/staging/media/atomisp/pci/runtime/debug
-d:drivers/staging/media/atomisp/pci/runtime/debug/interface
-d:drivers/staging/media/atomisp/pci/runtime/debug/src
-d:drivers/staging/media/atomisp/pci/runtime/event
-d:drivers/staging/media/atomisp/pci/runtime/event/interface
-d:drivers/staging/media/atomisp/pci/runtime/event/src
-d:drivers/staging/media/atomisp/pci/runtime/eventq
-d:drivers/staging/media/atomisp/pci/runtime/eventq/interface
-d:drivers/staging/media/atomisp/pci/runtime/eventq/src
-d:drivers/staging/media/atomisp/pci/runtime/frame
-d:drivers/staging/media/atomisp/pci/runtime/frame/interface
-d:drivers/staging/media/atomisp/pci/runtime/frame/src
-d:drivers/staging/media/atomisp/pci/runtime/ifmtr
-d:drivers/staging/media/atomisp/pci/runtime/ifmtr/interface
-d:drivers/staging/media/atomisp/pci/runtime/ifmtr/src
-d:drivers/staging/media/atomisp/pci/runtime/inputfifo
-d:drivers/staging/media/atomisp/pci/runtime/inputfifo/interface
-d:drivers/staging/media/atomisp/pci/runtime/inputfifo/src
-d:drivers/staging/media/atomisp/pci/runtime/isp_param
-d:drivers/staging/media/atomisp/pci/runtime/isp_param/interface
-d:drivers/staging/media/atomisp/pci/runtime/isp_param/src
-d:drivers/staging/media/atomisp/pci/runtime/isys
-d:drivers/staging/media/atomisp/pci/runtime/isys/interface
-d:drivers/staging/media/atomisp/pci/runtime/isys/src
-d:drivers/staging/media/atomisp/pci/runtime/pipeline
-d:drivers/staging/media/atomisp/pci/runtime/pipeline/interface
-d:drivers/staging/media/atomisp/pci/runtime/pipeline/src
-d:drivers/staging/media/atomisp/pci/runtime/queue
-d:drivers/staging/media/atomisp/pci/runtime/queue/interface
-d:drivers/staging/media/atomisp/pci/runtime/queue/src
-d:drivers/staging/media/atomisp/pci/runtime/rmgr
-d:drivers/staging/media/atomisp/pci/runtime/rmgr/interface
-d:drivers/staging/media/atomisp/pci/runtime/rmgr/src
-d:drivers/staging/media/atomisp/pci/runtime/spctrl
-d:drivers/staging/media/atomisp/pci/runtime/spctrl/interface
-d:drivers/staging/media/atomisp/pci/runtime/spctrl/src
-d:drivers/staging/media/atomisp/pci/runtime/tagger
-d:drivers/staging/media/atomisp/pci/runtime/tagger/interface
-d:drivers/staging/media/atomisp/pci/runtime/timer
-d:drivers/staging/media/atomisp/pci/runtime/timer/src
-d:drivers/staging/media/av7110
-d:drivers/staging/media/deprecated
-d:drivers/staging/media/deprecated/atmel
-d:drivers/staging/media/imx
-d:drivers/staging/media/ipu3
-d:drivers/staging/media/ipu3/include
-d:drivers/staging/media/ipu3/include/uapi
-d:drivers/staging/media/ipu7
-d:drivers/staging/media/ipu7/abi
-d:drivers/staging/media/max96712
-d:drivers/staging/media/meson
-d:drivers/staging/media/meson/vdec
-d:drivers/staging/media/starfive
-d:drivers/staging/media/starfive/camss
-d:drivers/staging/media/sunxi
-d:drivers/staging/media/sunxi/cedrus
-d:drivers/staging/media/sunxi/sun6i-isp
-d:drivers/staging/media/sunxi/sun6i-isp/uapi
-d:drivers/staging/media/tegra-video
-d:drivers/staging/most
-d:drivers/staging/most/Documentation
-d:drivers/staging/most/Documentation/ABI
-d:drivers/staging/most/dim2
-d:drivers/staging/most/i2c
-d:drivers/staging/most/net
-d:drivers/staging/most/video
-d:drivers/staging/nvec
-d:drivers/staging/octeon
-d:drivers/staging/rtl8723bs
-d:drivers/staging/rtl8723bs/core
-d:drivers/staging/rtl8723bs/hal
-d:drivers/staging/rtl8723bs/include
-d:drivers/staging/rtl8723bs/os_dep
-d:drivers/staging/sm750fb
-d:drivers/staging/vc04_services
-d:drivers/staging/vc04_services/bcm2835-audio
-d:drivers/staging/vc04_services/bcm2835-camera
-d:drivers/staging/vc04_services/include
-d:drivers/staging/vc04_services/include/linux
-d:drivers/staging/vc04_services/include/linux/raspberrypi
-d:drivers/staging/vc04_services/interface
-d:drivers/staging/vc04_services/interface/vchiq_arm
-d:drivers/staging/vc04_services/vchiq-mmal
-d:drivers/staging/vme_user
-d:drivers/target
-d:drivers/target/iscsi
-d:drivers/target/iscsi/cxgbit
-d:drivers/target/loopback
-d:drivers/target/sbp
-d:drivers/target/tcm_fc
-d:drivers/target/tcm_remote
-d:drivers/tc
-d:drivers/tee
-d:drivers/tee/amdtee
-d:drivers/tee/optee
-d:drivers/tee/tstee
-d:drivers/thermal
-d:drivers/thermal/broadcom
-d:drivers/thermal/intel
-d:drivers/thermal/intel/int340x_thermal
-d:drivers/thermal/mediatek
-d:drivers/thermal/qcom
-d:drivers/thermal/renesas
-d:drivers/thermal/samsung
-d:drivers/thermal/st
-d:drivers/thermal/tegra
-d:drivers/thermal/testing
-d:drivers/thermal/ti-soc-thermal
-d:drivers/thunderbolt
-d:drivers/tty
-d:drivers/tty/hvc
-d:drivers/tty/ipwireless
-d:drivers/tty/serdev
-d:drivers/tty/serial
-d:drivers/tty/serial/8250
-d:drivers/tty/serial/jsm
-d:drivers/tty/vt
-d:drivers/ufs
-d:drivers/ufs/core
-d:drivers/ufs/host
-d:drivers/uio
-d:drivers/usb
-d:drivers/usb/atm
-d:drivers/usb/c67x00
-d:drivers/usb/cdns3
-d:drivers/usb/chipidea
-d:drivers/usb/class
-d:drivers/usb/common
-d:drivers/usb/core
-d:drivers/usb/dwc2
-d:drivers/usb/dwc3
-d:drivers/usb/early
-d:drivers/usb/fotg210
-d:drivers/usb/gadget
-d:drivers/usb/gadget/function
-d:drivers/usb/gadget/legacy
-d:drivers/usb/gadget/udc
-d:drivers/usb/gadget/udc/aspeed-vhub
-d:drivers/usb/gadget/udc/bdc
-d:drivers/usb/gadget/udc/cdns2
-d:drivers/usb/host
-d:drivers/usb/image
-d:drivers/usb/isp1760
-d:drivers/usb/misc
-d:drivers/usb/misc/sisusbvga
-d:drivers/usb/mon
-d:drivers/usb/mtu3
-d:drivers/usb/musb
-d:drivers/usb/phy
-d:drivers/usb/renesas_usbhs
-d:drivers/usb/roles
-d:drivers/usb/serial
-d:drivers/usb/storage
-d:drivers/usb/typec
-d:drivers/usb/typec/altmodes
-d:drivers/usb/typec/mux
-d:drivers/usb/typec/tcpm
-d:drivers/usb/typec/tcpm/qcom
-d:drivers/usb/typec/tipd
-d:drivers/usb/typec/ucsi
-d:drivers/usb/usbip
-d:drivers/vdpa
-d:drivers/vdpa/alibaba
-d:drivers/vdpa/ifcvf
-d:drivers/vdpa/mlx5
-d:drivers/vdpa/mlx5/core
-d:drivers/vdpa/mlx5/net
-d:drivers/vdpa/octeon_ep
-d:drivers/vdpa/pds
-d:drivers/vdpa/solidrun
-d:drivers/vdpa/vdpa_sim
-d:drivers/vdpa/vdpa_user
-d:drivers/vdpa/virtio_pci
-d:drivers/vfio
-d:drivers/vfio/cdx
-d:drivers/vfio/fsl-mc
-d:drivers/vfio/mdev
-d:drivers/vfio/pci
-d:drivers/vfio/pci/hisilicon
-d:drivers/vfio/pci/mlx5
-d:drivers/vfio/pci/nvgrace-gpu
-d:drivers/vfio/pci/pds
-d:drivers/vfio/pci/qat
-d:drivers/vfio/pci/virtio
-d:drivers/vfio/platform
-d:drivers/vfio/platform/reset
-d:drivers/vhost
-d:drivers/video
-d:drivers/video/backlight
-d:drivers/video/console
-d:drivers/video/fbdev
-d:drivers/video/fbdev/aty
-d:drivers/video/fbdev/core
-d:drivers/video/fbdev/geode
-d:drivers/video/fbdev/i810
-d:drivers/video/fbdev/kyro
-d:drivers/video/fbdev/matrox
-d:drivers/video/fbdev/mb862xx
-d:drivers/video/fbdev/mmp
-d:drivers/video/fbdev/mmp/fb
-d:drivers/video/fbdev/mmp/hw
-d:drivers/video/fbdev/mmp/panel
-d:drivers/video/fbdev/nvidia
-d:drivers/video/fbdev/omap
-d:drivers/video/fbdev/omap2
-d:drivers/video/fbdev/omap2/omapfb
-d:drivers/video/fbdev/omap2/omapfb/displays
-d:drivers/video/fbdev/omap2/omapfb/dss
-d:drivers/video/fbdev/riva
-d:drivers/video/fbdev/savage
-d:drivers/video/fbdev/sis
-d:drivers/video/fbdev/via
-d:drivers/video/logo
-d:drivers/virt
-d:drivers/virt/acrn
-d:drivers/virt/coco
-d:drivers/virt/coco/arm-cca-guest
-d:drivers/virt/coco/efi_secret
-d:drivers/virt/coco/guest
-d:drivers/virt/coco/pkvm-guest
-d:drivers/virt/coco/sev-guest
-d:drivers/virt/coco/tdx-guest
-d:drivers/virt/nitro_enclaves
-d:drivers/virt/vboxguest
-d:drivers/virtio
-d:drivers/w1
-d:drivers/w1/masters
-d:drivers/w1/slaves
-d:drivers/watchdog
-d:drivers/xen
-d:drivers/xen/events
-d:drivers/xen/xen-pciback
-d:drivers/xen/xenbus
-d:drivers/xen/xenfs
-d:drivers/zorro
-d:fs
-d:fs/9p
-d:fs/adfs
-d:fs/affs
-d:fs/afs
-d:fs/autofs
-d:fs/bcachefs
-d:fs/befs
-d:fs/bfs
-d:fs/btrfs
-d:fs/btrfs/tests
-d:fs/cachefiles
-d:fs/ceph
-d:fs/coda
-d:fs/configfs
-d:fs/cramfs
-d:fs/crypto
-d:fs/debugfs
-d:fs/devpts
-d:fs/dlm
-d:fs/ecryptfs
-d:fs/efivarfs
-d:fs/efs
-d:fs/erofs
-d:fs/exfat
-d:fs/exportfs
-d:fs/ext2
-d:fs/ext4
-d:fs/f2fs
-d:fs/fat
-d:fs/freevxfs
-d:fs/fuse
-d:fs/gfs2
-d:fs/hfs
-d:fs/hfsplus
-d:fs/hostfs
-d:fs/hpfs
-d:fs/hugetlbfs
-d:fs/iomap
-d:fs/isofs
-d:fs/jbd2
-d:fs/jffs2
-d:fs/jfs
-d:fs/kernfs
-d:fs/lockd
-d:fs/minix
-d:fs/netfs
-d:fs/nfs
-d:fs/nfs/blocklayout
-d:fs/nfs/filelayout
-d:fs/nfs/flexfilelayout
-d:fs/nfs_common
-d:fs/nfsd
-d:fs/nilfs2
-d:fs/nls
-d:fs/notify
-d:fs/notify/dnotify
-d:fs/notify/fanotify
-d:fs/notify/inotify
-d:fs/ntfs3
-d:fs/ntfs3/lib
-d:fs/ocfs2
-d:fs/ocfs2/cluster
-d:fs/ocfs2/dlm
-d:fs/ocfs2/dlmfs
-d:fs/omfs
-d:fs/openpromfs
-d:fs/orangefs
-d:fs/overlayfs
-d:fs/proc
-d:fs/pstore
-d:fs/qnx4
-d:fs/qnx6
-d:fs/quota
-d:fs/ramfs
-d:fs/resctrl
-d:fs/romfs
-d:fs/smb
-d:fs/smb/client
-d:fs/smb/client/compress
-d:fs/smb/common
-d:fs/smb/common/smbdirect
-d:fs/smb/server
-d:fs/smb/server/mgmt
-d:fs/squashfs
-d:fs/sysfs
-d:fs/tests
-d:fs/tracefs
-d:fs/ubifs
-d:fs/udf
-d:fs/ufs
-d:fs/unicode
-d:fs/unicode/tests
-d:fs/vboxsf
-d:fs/verity
-d:fs/xfs
-d:fs/xfs/libxfs
-d:fs/xfs/scrub
-d:fs/zonefs
-d:include
-d:include/acpi
-d:include/acpi/platform
-d:include/asm-generic
-d:include/asm-generic/bitops
-d:include/asm-generic/vdso
-d:include/clocksource
-d:include/crypto
-d:include/crypto/internal
-d:include/cxl
-d:include/drm
-d:include/drm/amd
-d:include/drm/bridge
-d:include/drm/clients
-d:include/drm/display
-d:include/drm/intel
-d:include/drm/ttm
-d:include/dt-bindings
-d:include/dt-bindings/arm
-d:include/dt-bindings/ata
-d:include/dt-bindings/bus
-d:include/dt-bindings/clock
-d:include/dt-bindings/display
-d:include/dt-bindings/dma
-d:include/dt-bindings/firmware
-d:include/dt-bindings/firmware/imx
-d:include/dt-bindings/gce
-d:include/dt-bindings/gpio
-d:include/dt-bindings/i2c
-d:include/dt-bindings/i3c
-d:include/dt-bindings/iio
-d:include/dt-bindings/iio/adc
-d:include/dt-bindings/iio/addac
-d:include/dt-bindings/iio/temperature
-d:include/dt-bindings/input
-d:include/dt-bindings/interconnect
-d:include/dt-bindings/interrupt-controller
-d:include/dt-bindings/leds
-d:include/dt-bindings/mailbox
-d:include/dt-bindings/media
-d:include/dt-bindings/memory
-d:include/dt-bindings/mfd
-d:include/dt-bindings/mips
-d:include/dt-bindings/mux
-d:include/dt-bindings/net
-d:include/dt-bindings/nvmem
-d:include/dt-bindings/phy
-d:include/dt-bindings/pinctrl
-d:include/dt-bindings/pmu
-d:include/dt-bindings/power
-d:include/dt-bindings/pwm
-d:include/dt-bindings/regulator
-d:include/dt-bindings/reset
-d:include/dt-bindings/soc
-d:include/dt-bindings/sound
-d:include/dt-bindings/spmi
-d:include/dt-bindings/thermal
-d:include/dt-bindings/usb
-d:include/dt-bindings/watchdog
-d:include/hyperv
-d:include/keys
-d:include/kunit
-d:include/kvm
-d:include/linux
-d:include/linux/amba
-d:include/linux/atomic
-d:include/linux/avf
-d:include/linux/bcma
-d:include/linux/bnxt
-d:include/linux/bus
-d:include/linux/byteorder
-d:include/linux/can
-d:include/linux/can/dev
-d:include/linux/can/platform
-d:include/linux/cdx
-d:include/linux/ceph
-d:include/linux/clk
-d:include/linux/comedi
-d:include/linux/crush
-d:include/linux/decompress
-d:include/linux/device
-d:include/linux/dma
-d:include/linux/dsa
-d:include/linux/extcon
-d:include/linux/firmware
-d:include/linux/firmware/broadcom
-d:include/linux/firmware/cirrus
-d:include/linux/firmware/imx
-d:include/linux/firmware/imx/svc
-d:include/linux/firmware/intel
-d:include/linux/firmware/mediatek
-d:include/linux/firmware/meson
-d:include/linux/firmware/qcom
-d:include/linux/firmware/samsung
-d:include/linux/firmware/thead
-d:include/linux/fpga
-d:include/linux/framer
-d:include/linux/fsl
-d:include/linux/fsl/bestcomm
-d:include/linux/gpio
-d:include/linux/greybus
-d:include/linux/habanalabs
-d:include/linux/hsi
-d:include/linux/i3c
-d:include/linux/iio
-d:include/linux/iio/accel
-d:include/linux/iio/adc
-d:include/linux/iio/afe
-d:include/linux/iio/common
-d:include/linux/iio/dac
-d:include/linux/iio/frequency
-d:include/linux/iio/gyro
-d:include/linux/iio/imu
-d:include/linux/iio/timer
-d:include/linux/input
-d:include/linux/io_uring
-d:include/linux/irqchip
-d:include/linux/isdn
-d:include/linux/lockd
-d:include/linux/lsm
-d:include/linux/mailbox
-d:include/linux/mdio
-d:include/linux/memory
-d:include/linux/mfd
-d:include/linux/mfd/abx500
-d:include/linux/mfd/arizona
-d:include/linux/mfd/atc260x
-d:include/linux/mfd/da9052
-d:include/linux/mfd/da9055
-d:include/linux/mfd/da9062
-d:include/linux/mfd/da9063
-d:include/linux/mfd/da9150
-d:include/linux/mfd/madera
-d:include/linux/mfd/mt6323
-d:include/linux/mfd/mt6328
-d:include/linux/mfd/mt6331
-d:include/linux/mfd/mt6332
-d:include/linux/mfd/mt6357
-d:include/linux/mfd/mt6358
-d:include/linux/mfd/mt6359
-d:include/linux/mfd/mt6359p
-d:include/linux/mfd/mt6397
-d:include/linux/mfd/samsung
-d:include/linux/mfd/syscon
-d:include/linux/mfd/wcd934x
-d:include/linux/mfd/wm831x
-d:include/linux/mfd/wm8350
-d:include/linux/mfd/wm8994
-d:include/linux/misc
-d:include/linux/mlx4
-d:include/linux/mlx5
-d:include/linux/mmc
-d:include/linux/mtd
-d:include/linux/mux
-d:include/linux/net
-d:include/linux/net/intel
-d:include/linux/net/intel/libie
-d:include/linux/netfilter
-d:include/linux/netfilter/ipset
-d:include/linux/netfilter_arp
-d:include/linux/netfilter_bridge
-d:include/linux/netfilter_ipv4
-d:include/linux/netfilter_ipv6
-d:include/linux/pcs
-d:include/linux/pds
-d:include/linux/perf
-d:include/linux/phy
-d:include/linux/phy/tegra
-d:include/linux/pinctrl
-d:include/linux/platform_data
-d:include/linux/platform_data/gpio
-d:include/linux/platform_data/media
-d:include/linux/platform_data/txx9
-d:include/linux/platform_data/x86
-d:include/linux/power
-d:include/linux/pse-pd
-d:include/linux/pwrseq
-d:include/linux/qat
-d:include/linux/qed
-d:include/linux/raid
-d:include/linux/regulator
-d:include/linux/remoteproc
-d:include/linux/reset
-d:include/linux/rpmsg
-d:include/linux/rtc
-d:include/linux/sched
-d:include/linux/soc
-d:include/linux/soc/actions
-d:include/linux/soc/amd
-d:include/linux/soc/amlogic
-d:include/linux/soc/andes
-d:include/linux/soc/apple
-d:include/linux/soc/brcmstb
-d:include/linux/soc/cirrus
-d:include/linux/soc/dove
-d:include/linux/soc/ixp4xx
-d:include/linux/soc/marvell
-d:include/linux/soc/marvell/octeontx2
-d:include/linux/soc/mediatek
-d:include/linux/soc/mmp
-d:include/linux/soc/nxp
-d:include/linux/soc/pxa
-d:include/linux/soc/qcom
-d:include/linux/soc/renesas
-d:include/linux/soc/samsung
-d:include/linux/soc/sunxi
-d:include/linux/soc/ti
-d:include/linux/soundwire
-d:include/linux/spi
-d:include/linux/spi/offload
-d:include/linux/ssb
-d:include/linux/sunrpc
-d:include/linux/sunrpc/xdrgen
-d:include/linux/surface_aggregator
-d:include/linux/ulpi
-d:include/linux/unaligned
-d:include/linux/usb
-d:include/math-emu
-d:include/media
-d:include/media/davinci
-d:include/media/drv-intf
-d:include/media/i2c
-d:include/media/tpg
-d:include/memory
-d:include/misc
-d:include/net
-d:include/net/9p
-d:include/net/bluetooth
-d:include/net/caif
-d:include/net/iucv
-d:include/net/libeth
-d:include/net/mana
-d:include/net/netfilter
-d:include/net/netfilter/ipv4
-d:include/net/netfilter/ipv6
-d:include/net/netns
-d:include/net/nfc
-d:include/net/page_pool
-d:include/net/phonet
-d:include/net/sctp
-d:include/net/tc_act
-d:include/pcmcia
-d:include/ras
-d:include/rdma
-d:include/rv
-d:include/scsi
-d:include/scsi/fc
-d:include/soc
-d:include/soc/amlogic
-d:include/soc/arc
-d:include/soc/at91
-d:include/soc/bcm2835
-d:include/soc/canaan
-d:include/soc/fsl
-d:include/soc/fsl/qe
-d:include/soc/imx
-d:include/soc/mediatek
-d:include/soc/microchip
-d:include/soc/mscc
-d:include/soc/nuvoton
-d:include/soc/qcom
-d:include/soc/rockchip
-d:include/soc/sa1100
-d:include/soc/sifive
-d:include/soc/spacemit
-d:include/soc/starfive
-d:include/soc/tegra
-d:include/sound
-d:include/sound/ac97
-d:include/sound/sof
-d:include/sound/sof/ipc4
-d:include/target
-d:include/target/iscsi
-d:include/trace
-d:include/trace/events
-d:include/trace/misc
-d:include/trace/stages
-d:include/uapi
-d:include/uapi/asm-generic
-d:include/uapi/cxl
-d:include/uapi/drm
-d:include/uapi/fwctl
-d:include/uapi/linux
-d:include/uapi/linux/android
-d:include/uapi/linux/byteorder
-d:include/uapi/linux/caif
-d:include/uapi/linux/can
-d:include/uapi/linux/cifs
-d:include/uapi/linux/counter
-d:include/uapi/linux/dvb
-d:include/uapi/linux/genwqe
-d:include/uapi/linux/hdlc
-d:include/uapi/linux/hsi
-d:include/uapi/linux/iio
-d:include/uapi/linux/io_uring
-d:include/uapi/linux/isdn
-d:include/uapi/linux/media
-d:include/uapi/linux/media/amlogic
-d:include/uapi/linux/media/raspberrypi
-d:include/uapi/linux/misc
-d:include/uapi/linux/mmc
-d:include/uapi/linux/netfilter
-d:include/uapi/linux/netfilter/ipset
-d:include/uapi/linux/netfilter_arp
-d:include/uapi/linux/netfilter_bridge
-d:include/uapi/linux/netfilter_ipv4
-d:include/uapi/linux/netfilter_ipv6
-d:include/uapi/linux/nfsd
-d:include/uapi/linux/raid
-d:include/uapi/linux/sched
-d:include/uapi/linux/spi
-d:include/uapi/linux/sunrpc
-d:include/uapi/linux/surface_aggregator
-d:include/uapi/linux/tc_act
-d:include/uapi/linux/tc_ematch
-d:include/uapi/linux/usb
-d:include/uapi/misc
-d:include/uapi/misc/uacce
-d:include/uapi/mtd
-d:include/uapi/rdma
-d:include/uapi/rdma/hfi
-d:include/uapi/regulator
-d:include/uapi/scsi
-d:include/uapi/scsi/fc
-d:include/uapi/sound
-d:include/uapi/sound/intel
-d:include/uapi/sound/intel/avs
-d:include/uapi/sound/sof
-d:include/uapi/video
-d:include/uapi/xen
-d:include/ufs
-d:include/vdso
-d:include/video
-d:include/xen
-d:include/xen/arm
-d:include/xen/interface
-d:include/xen/interface/hvm
-d:include/xen/interface/io
-d:init
-d:io_uring
-d:ipc
-d:kernel
-d:kernel/bpf
-d:kernel/bpf/preload
-d:kernel/bpf/preload/iterators
-d:kernel/cgroup
-d:kernel/configs
-d:kernel/debug
-d:kernel/debug/kdb
-d:kernel/dma
-d:kernel/entry
-d:kernel/events
-d:kernel/futex
-d:kernel/gcov
-d:kernel/irq
-d:kernel/kcsan
-d:kernel/livepatch
-d:kernel/locking
-d:kernel/module
-d:kernel/power
-d:kernel/printk
-d:kernel/rcu
-d:kernel/sched
-d:kernel/time
-d:kernel/trace
-d:kernel/trace/rv
-d:kernel/trace/rv/monitors
-d:kernel/trace/rv/monitors/nrp
-d:kernel/trace/rv/monitors/opid
-d:kernel/trace/rv/monitors/pagefault
-d:kernel/trace/rv/monitors/rtapp
-d:kernel/trace/rv/monitors/sched
-d:kernel/trace/rv/monitors/sco
-d:kernel/trace/rv/monitors/scpd
-d:kernel/trace/rv/monitors/sleep
-d:kernel/trace/rv/monitors/snep
-d:kernel/trace/rv/monitors/snroc
-d:kernel/trace/rv/monitors/sssw
-d:kernel/trace/rv/monitors/sts
-d:kernel/trace/rv/monitors/wip
-d:kernel/trace/rv/monitors/wwnr
-d:lib
-d:lib/842
-d:lib/crc
-d:lib/crc/arm
-d:lib/crc/arm64
-d:lib/crc/loongarch
-d:lib/crc/mips
-d:lib/crc/powerpc
-d:lib/crc/riscv
-d:lib/crc/s390
-d:lib/crc/sparc
-d:lib/crc/tests
-d:lib/crc/x86
-d:lib/crypto
-d:lib/crypto/arm
-d:lib/crypto/arm64
-d:lib/crypto/mips
-d:lib/crypto/mpi
-d:lib/crypto/powerpc
-d:lib/crypto/riscv
-d:lib/crypto/s390
-d:lib/crypto/sparc
-d:lib/crypto/tests
-d:lib/crypto/x86
-d:lib/dim
-d:lib/fonts
-d:lib/kunit
-d:lib/lz4
-d:lib/lzo
-d:lib/math
-d:lib/math/tests
-d:lib/pldmfw
-d:lib/raid6
-d:lib/raid6/test
-d:lib/reed_solomon
-d:lib/test_fortify
-d:lib/tests
-d:lib/tests/module
-d:lib/vdso
-d:lib/xz
-d:lib/zlib_deflate
-d:lib/zlib_dfltcc
-d:lib/zlib_inflate
-d:lib/zstd
-d:lib/zstd/common
-d:lib/zstd/compress
-d:lib/zstd/decompress
-d:mm
-d:mm/damon
-d:mm/damon/tests
-d:mm/kasan
-d:mm/kfence
-d:mm/kmsan
-d:net
-d:net/6lowpan
-d:net/802
-d:net/8021q
-d:net/9p
-d:net/appletalk
-d:net/atm
-d:net/ax25
-d:net/batman-adv
-d:net/bluetooth
-d:net/bluetooth/bnep
-d:net/bluetooth/cmtp
-d:net/bluetooth/hidp
-d:net/bluetooth/rfcomm
-d:net/bpf
-d:net/bridge
-d:net/bridge/netfilter
-d:net/caif
-d:net/can
-d:net/can/j1939
-d:net/ceph
-d:net/ceph/crush
-d:net/core
-d:net/dcb
-d:net/devlink
-d:net/dns_resolver
-d:net/dsa
-d:net/ethernet
-d:net/ethtool
-d:net/handshake
-d:net/hsr
-d:net/ieee802154
-d:net/ieee802154/6lowpan
-d:net/ife
-d:net/ipv4
-d:net/ipv4/netfilter
-d:net/ipv6
-d:net/ipv6/ila
-d:net/ipv6/netfilter
-d:net/iucv
-d:net/kcm
-d:net/key
-d:net/l2tp
-d:net/l3mdev
-d:net/lapb
-d:net/llc
-d:net/mac80211
-d:net/mac80211/tests
-d:net/mac802154
-d:net/mctp
-d:net/mctp/test
-d:net/mpls
-d:net/mptcp
-d:net/ncsi
-d:net/netfilter
-d:net/netfilter/ipset
-d:net/netfilter/ipvs
-d:net/netlabel
-d:net/netlink
-d:net/netrom
-d:net/nfc
-d:net/nfc/hci
-d:net/nfc/nci
-d:net/nsh
-d:net/openvswitch
-d:net/packet
-d:net/phonet
-d:net/psample
-d:net/qrtr
-d:net/rds
-d:net/rfkill
-d:net/rose
-d:net/rxrpc
-d:net/sched
-d:net/sctp
-d:net/shaper
-d:net/smc
-d:net/strparser
-d:net/sunrpc
-d:net/sunrpc/auth_gss
-d:net/sunrpc/xprtrdma
-d:net/switchdev
-d:net/tipc
-d:net/tls
-d:net/unix
-d:net/vmw_vsock
-d:net/wireless
-d:net/wireless/certs
-d:net/wireless/tests
-d:net/x25
-d:net/xdp
-d:net/xfrm
-d:rust
-d:rust/bindings
-d:rust/helpers
-d:rust/kernel
-d:rust/kernel/alloc
-d:rust/kernel/alloc/kvec
-d:rust/kernel/block
-d:rust/kernel/block/mq
-d:rust/kernel/device
-d:rust/kernel/drm
-d:rust/kernel/drm/gem
-d:rust/kernel/fs
-d:rust/kernel/io
-d:rust/kernel/list
-d:rust/kernel/mm
-d:rust/kernel/net
-d:rust/kernel/net/phy
-d:rust/kernel/sync
-d:rust/kernel/sync/arc
-d:rust/kernel/sync/lock
-d:rust/kernel/time
-d:rust/kernel/time/hrtimer
-d:rust/macros
-d:rust/pin-init
-d:rust/pin-init/examples
-d:rust/pin-init/internal
-d:rust/pin-init/internal/src
-d:rust/pin-init/src
-d:rust/uapi
-d:samples
-d:samples/acrn
-d:samples/auxdisplay
-d:samples/binderfs
-d:samples/bpf
-d:samples/bpf/gnu
-d:samples/cgroup
-d:samples/check-exec
-d:samples/configfs
-d:samples/connector
-d:samples/coresight
-d:samples/damon
-d:samples/fanotify
-d:samples/fprobe
-d:samples/ftrace
-d:samples/hid
-d:samples/hidraw
-d:samples/hung_task
-d:samples/hw_breakpoint
-d:samples/kdb
-d:samples/kfifo
-d:samples/kmemleak
-d:samples/kobject
-d:samples/kprobes
-d:samples/landlock
-d:samples/livepatch
-d:samples/mei
-d:samples/nitro_enclaves
-d:samples/pfsm
-d:samples/pidfd
-d:samples/pktgen
-d:samples/qmi
-d:samples/rpmsg
-d:samples/rust
-d:samples/rust/hostprogs
-d:samples/seccomp
-d:samples/timers
-d:samples/trace_events
-d:samples/trace_printk
-d:samples/tsm-mr
-d:samples/uhid
-d:samples/user_events
-d:samples/v4l
-d:samples/vfio-mdev
-d:samples/vfs
-d:samples/watch_queue
-d:samples/watchdog
-d:scripts
-d:scripts/atomic
-d:scripts/atomic/fallbacks
-d:scripts/atomic/kerneldoc
-d:scripts/bash-completion
-d:scripts/basic
-d:scripts/clang-tools
-d:scripts/coccinelle
-d:scripts/coccinelle/api
-d:scripts/coccinelle/api/alloc
-d:scripts/coccinelle/free
-d:scripts/coccinelle/iterators
-d:scripts/coccinelle/locks
-d:scripts/coccinelle/misc
-d:scripts/coccinelle/null
-d:scripts/coccinelle/tests
-d:scripts/crypto
-d:scripts/dtc
-d:scripts/dtc/include-prefixes
-d:scripts/dtc/libfdt
-d:scripts/dummy-tools
-d:scripts/dummy-tools/dummy-plugin-dir
-d:scripts/dummy-tools/dummy-plugin-dir/include
-d:scripts/gcc-plugins
-d:scripts/gdb
-d:scripts/gdb/linux
-d:scripts/gendwarfksyms
-d:scripts/gendwarfksyms/examples
-d:scripts/genksyms
-d:scripts/include
-d:scripts/ipe
-d:scripts/ipe/polgen
-d:scripts/kconfig
-d:scripts/kconfig/lxdialog
-d:scripts/kconfig/tests
-d:scripts/kconfig/tests/auto_submenu
-d:scripts/kconfig/tests/choice
-d:scripts/kconfig/tests/choice_randomize
-d:scripts/kconfig/tests/choice_randomize2
-d:scripts/kconfig/tests/err_recursive_dep
-d:scripts/kconfig/tests/err_recursive_inc
-d:scripts/kconfig/tests/new_choice_with_dep
-d:scripts/kconfig/tests/no_write_if_dep_unmet
-d:scripts/kconfig/tests/preprocess
-d:scripts/kconfig/tests/preprocess/builtin_func
-d:scripts/kconfig/tests/preprocess/circular_expansion
-d:scripts/kconfig/tests/preprocess/escape
-d:scripts/kconfig/tests/preprocess/variable
-d:scripts/ksymoops
-d:scripts/lib
-d:scripts/lib/abi
-d:scripts/lib/kdoc
-d:scripts/mod
-d:scripts/package
-d:scripts/package/debian
-d:scripts/selinux
-d:scripts/selinux/mdp
-d:scripts/tracing
-d:security
-d:security/apparmor
-d:security/apparmor/include
-d:security/bpf
-d:security/integrity
-d:security/integrity/evm
-d:security/integrity/ima
-d:security/integrity/platform_certs
-d:security/ipe
-d:security/keys
-d:security/keys/encrypted-keys
-d:security/keys/trusted-keys
-d:security/landlock
-d:security/landlock/errata
-d:security/loadpin
-d:security/lockdown
-d:security/safesetid
-d:security/selinux
-d:security/selinux/include
-d:security/selinux/ss
-d:security/smack
-d:security/tomoyo
-d:security/tomoyo/policy
-d:security/yama
-d:sound
-d:sound/ac97
-d:sound/aoa
-d:sound/aoa/codecs
-d:sound/aoa/core
-d:sound/aoa/fabrics
-d:sound/aoa/soundbus
-d:sound/aoa/soundbus/i2sbus
-d:sound/arm
-d:sound/atmel
-d:sound/core
-d:sound/core/oss
-d:sound/core/seq
-d:sound/core/seq/oss
-d:sound/drivers
-d:sound/drivers/mpu401
-d:sound/drivers/opl3
-d:sound/drivers/opl4
-d:sound/drivers/pcsp
-d:sound/drivers/vx
-d:sound/firewire
-d:sound/firewire/bebob
-d:sound/firewire/dice
-d:sound/firewire/digi00x
-d:sound/firewire/fireface
-d:sound/firewire/fireworks
-d:sound/firewire/motu
-d:sound/firewire/oxfw
-d:sound/firewire/tascam
-d:sound/hda
-d:sound/hda/codecs
-d:sound/hda/codecs/cirrus
-d:sound/hda/codecs/hdmi
-d:sound/hda/codecs/helpers
-d:sound/hda/codecs/realtek
-d:sound/hda/codecs/side-codecs
-d:sound/hda/common
-d:sound/hda/controllers
-d:sound/hda/core
-d:sound/hda/core/ext
-d:sound/i2c
-d:sound/i2c/other
-d:sound/isa
-d:sound/isa/ad1816a
-d:sound/isa/ad1848
-d:sound/isa/cs423x
-d:sound/isa/es1688
-d:sound/isa/galaxy
-d:sound/isa/gus
-d:sound/isa/msnd
-d:sound/isa/opti9xx
-d:sound/isa/sb
-d:sound/isa/wavefront
-d:sound/isa/wss
-d:sound/mips
-d:sound/oss
-d:sound/oss/dmasound
-d:sound/parisc
-d:sound/pci
-d:sound/pci/ac97
-d:sound/pci/ali5451
-d:sound/pci/asihpi
-d:sound/pci/au88x0
-d:sound/pci/aw2
-d:sound/pci/ca0106
-d:sound/pci/cs46xx
-d:sound/pci/cs5535audio
-d:sound/pci/ctxfi
-d:sound/pci/echoaudio
-d:sound/pci/emu10k1
-d:sound/pci/ice1712
-d:sound/pci/korg1212
-d:sound/pci/lola
-d:sound/pci/lx6464es
-d:sound/pci/mixart
-d:sound/pci/nm256
-d:sound/pci/oxygen
-d:sound/pci/pcxhr
-d:sound/pci/riptide
-d:sound/pci/rme9652
-d:sound/pci/trident
-d:sound/pci/vx222
-d:sound/pci/ymfpci
-d:sound/pcmcia
-d:sound/pcmcia/pdaudiocf
-d:sound/pcmcia/vx
-d:sound/ppc
-d:sound/sh
-d:sound/soc
-d:sound/soc/adi
-d:sound/soc/amd
-d:sound/soc/amd/acp
-d:sound/soc/amd/acp/acp3x-es83xx
-d:sound/soc/amd/include
-d:sound/soc/amd/ps
-d:sound/soc/amd/raven
-d:sound/soc/amd/renoir
-d:sound/soc/amd/rpl
-d:sound/soc/amd/vangogh
-d:sound/soc/amd/yc
-d:sound/soc/apple
-d:sound/soc/atmel
-d:sound/soc/au1x
-d:sound/soc/bcm
-d:sound/soc/cirrus
-d:sound/soc/codecs
-d:sound/soc/codecs/aw88395
-d:sound/soc/dwc
-d:sound/soc/fsl
-d:sound/soc/generic
-d:sound/soc/google
-d:sound/soc/hisilicon
-d:sound/soc/img
-d:sound/soc/intel
-d:sound/soc/intel/atom
-d:sound/soc/intel/atom/sst
-d:sound/soc/intel/avs
-d:sound/soc/intel/avs/boards
-d:sound/soc/intel/boards
-d:sound/soc/intel/catpt
-d:sound/soc/intel/common
-d:sound/soc/intel/keembay
-d:sound/soc/jz4740
-d:sound/soc/kirkwood
-d:sound/soc/loongson
-d:sound/soc/mediatek
-d:sound/soc/mediatek/common
-d:sound/soc/mediatek/mt2701
-d:sound/soc/mediatek/mt6797
-d:sound/soc/mediatek/mt7986
-d:sound/soc/mediatek/mt8173
-d:sound/soc/mediatek/mt8183
-d:sound/soc/mediatek/mt8186
-d:sound/soc/mediatek/mt8188
-d:sound/soc/mediatek/mt8192
-d:sound/soc/mediatek/mt8195
-d:sound/soc/mediatek/mt8365
-d:sound/soc/meson
-d:sound/soc/mxs
-d:sound/soc/pxa
-d:sound/soc/qcom
-d:sound/soc/qcom/qdsp6
-d:sound/soc/renesas
-d:sound/soc/renesas/rcar
-d:sound/soc/rockchip
-d:sound/soc/samsung
-d:sound/soc/sdca
-d:sound/soc/sdw_utils
-d:sound/soc/sof
-d:sound/soc/sof/amd
-d:sound/soc/sof/imx
-d:sound/soc/sof/intel
-d:sound/soc/sof/mediatek
-d:sound/soc/sof/mediatek/mt8186
-d:sound/soc/sof/mediatek/mt8195
-d:sound/soc/sof/xtensa
-d:sound/soc/spear
-d:sound/soc/sprd
-d:sound/soc/starfive
-d:sound/soc/sti
-d:sound/soc/stm
-d:sound/soc/sunxi
-d:sound/soc/tegra
-d:sound/soc/ti
-d:sound/soc/uniphier
-d:sound/soc/ux500
-d:sound/soc/xilinx
-d:sound/soc/xtensa
-d:sound/sparc
-d:sound/spi
-d:sound/synth
-d:sound/synth/emux
-d:sound/usb
-d:sound/usb/6fire
-d:sound/usb/bcd2000
-d:sound/usb/caiaq
-d:sound/usb/hiface
-d:sound/usb/line6
-d:sound/usb/misc
-d:sound/usb/qcom
-d:sound/usb/usx2y
-d:sound/virtio
-d:sound/x86
-d:sound/xen
-d:tools
-d:tools/accounting
-d:tools/arch
-d:tools/arch/alpha
-d:tools/arch/alpha/include
-d:tools/arch/alpha/include/asm
-d:tools/arch/alpha/include/uapi
-d:tools/arch/alpha/include/uapi/asm
-d:tools/arch/arc
-d:tools/arch/arc/include
-d:tools/arch/arc/include/uapi
-d:tools/arch/arc/include/uapi/asm
-d:tools/arch/arm
-d:tools/arch/arm/include
-d:tools/arch/arm/include/asm
-d:tools/arch/arm/include/uapi
-d:tools/arch/arm/include/uapi/asm
-d:tools/arch/arm64
-d:tools/arch/arm64/include
-d:tools/arch/arm64/include/asm
-d:tools/arch/arm64/include/uapi
-d:tools/arch/arm64/include/uapi/asm
-d:tools/arch/arm64/tools
-d:tools/arch/csky
-d:tools/arch/csky/include
-d:tools/arch/csky/include/uapi
-d:tools/arch/csky/include/uapi/asm
-d:tools/arch/hexagon
-d:tools/arch/hexagon/include
-d:tools/arch/hexagon/include/uapi
-d:tools/arch/hexagon/include/uapi/asm
-d:tools/arch/loongarch
-d:tools/arch/loongarch/include
-d:tools/arch/loongarch/include/asm
-d:tools/arch/loongarch/include/uapi
-d:tools/arch/loongarch/include/uapi/asm
-d:tools/arch/microblaze
-d:tools/arch/microblaze/include
-d:tools/arch/microblaze/include/uapi
-d:tools/arch/microblaze/include/uapi/asm
-d:tools/arch/mips
-d:tools/arch/mips/include
-d:tools/arch/mips/include/asm
-d:tools/arch/mips/include/uapi
-d:tools/arch/mips/include/uapi/asm
-d:tools/arch/parisc
-d:tools/arch/parisc/include
-d:tools/arch/parisc/include/uapi
-d:tools/arch/parisc/include/uapi/asm
-d:tools/arch/powerpc
-d:tools/arch/powerpc/include
-d:tools/arch/powerpc/include/asm
-d:tools/arch/powerpc/include/uapi
-d:tools/arch/powerpc/include/uapi/asm
-d:tools/arch/riscv
-d:tools/arch/riscv/include
-d:tools/arch/riscv/include/asm
-d:tools/arch/riscv/include/asm/vdso
-d:tools/arch/riscv/include/uapi
-d:tools/arch/riscv/include/uapi/asm
-d:tools/arch/s390
-d:tools/arch/s390/include
-d:tools/arch/s390/include/asm
-d:tools/arch/s390/include/uapi
-d:tools/arch/s390/include/uapi/asm
-d:tools/arch/sh
-d:tools/arch/sh/include
-d:tools/arch/sh/include/asm
-d:tools/arch/sh/include/uapi
-d:tools/arch/sh/include/uapi/asm
-d:tools/arch/sparc
-d:tools/arch/sparc/include
-d:tools/arch/sparc/include/asm
-d:tools/arch/sparc/include/uapi
-d:tools/arch/sparc/include/uapi/asm
-d:tools/arch/x86
-d:tools/arch/x86/dell-uart-backlight-emulator
-d:tools/arch/x86/include
-d:tools/arch/x86/include/asm
-d:tools/arch/x86/include/asm/amd
-d:tools/arch/x86/include/uapi
-d:tools/arch/x86/include/uapi/asm
-d:tools/arch/x86/intel_sdsi
-d:tools/arch/x86/kcpuid
-d:tools/arch/x86/lib
-d:tools/arch/x86/tools
-d:tools/arch/xtensa
-d:tools/arch/xtensa/include
-d:tools/arch/xtensa/include/asm
-d:tools/arch/xtensa/include/uapi
-d:tools/arch/xtensa/include/uapi/asm
-d:tools/bootconfig
-d:tools/bootconfig/include
-d:tools/bootconfig/include/linux
-d:tools/bootconfig/samples
-d:tools/bootconfig/scripts
-d:tools/bpf
-d:tools/bpf/bpftool
-d:tools/bpf/bpftool/Documentation
-d:tools/bpf/bpftool/bash-completion
-d:tools/bpf/bpftool/skeleton
-d:tools/bpf/resolve_btfids
-d:tools/bpf/runqslower
-d:tools/build
-d:tools/build/Documentation
-d:tools/build/feature
-d:tools/build/tests
-d:tools/build/tests/ex
-d:tools/build/tests/ex/arch
-d:tools/build/tests/ex/empty
-d:tools/build/tests/ex/empty2
-d:tools/certs
-d:tools/cgroup
-d:tools/counter
-d:tools/crypto
-d:tools/crypto/ccp
-d:tools/crypto/tcrypt
-d:tools/debugging
-d:tools/firewire
-d:tools/firmware
-d:tools/gpio
-d:tools/hv
-d:tools/iio
-d:tools/include
-d:tools/include/asm
-d:tools/include/asm-generic
-d:tools/include/asm-generic/bitops
-d:tools/include/generated
-d:tools/include/generated/asm
-d:tools/include/io_uring
-d:tools/include/linux
-d:tools/include/linux/sched
-d:tools/include/linux/unaligned
-d:tools/include/nolibc
-d:tools/include/nolibc/sys
-d:tools/include/perf
-d:tools/include/tools
-d:tools/include/trace
-d:tools/include/trace/events
-d:tools/include/uapi
-d:tools/include/uapi/asm
-d:tools/include/uapi/asm-generic
-d:tools/include/uapi/drm
-d:tools/include/uapi/linux
-d:tools/include/uapi/linux/tc_act
-d:tools/include/vdso
-d:tools/kvm
-d:tools/kvm/kvm_stat
-d:tools/laptop
-d:tools/laptop/dslm
-d:tools/laptop/freefall
-d:tools/leds
-d:tools/lib
-d:tools/lib/api
-d:tools/lib/api/fd
-d:tools/lib/api/fs
-d:tools/lib/bpf
-d:tools/lib/perf
-d:tools/lib/perf/Documentation
-d:tools/lib/perf/Documentation/examples
-d:tools/lib/perf/include
-d:tools/lib/perf/include/internal
-d:tools/lib/perf/include/perf
-d:tools/lib/perf/tests
-d:tools/lib/subcmd
-d:tools/lib/symbol
-d:tools/lib/thermal
-d:tools/lib/thermal/include
-d:tools/memory-model
-d:tools/memory-model/Documentation
-d:tools/memory-model/litmus-tests
-d:tools/memory-model/scripts
-d:tools/mm
-d:tools/net
-d:tools/net/sunrpc
-d:tools/net/sunrpc/xdrgen
-d:tools/net/sunrpc/xdrgen/generators
-d:tools/net/sunrpc/xdrgen/grammars
-d:tools/net/sunrpc/xdrgen/subcmds
-d:tools/net/sunrpc/xdrgen/templates
-d:tools/net/sunrpc/xdrgen/templates/C
-d:tools/net/sunrpc/xdrgen/templates/C/constants
-d:tools/net/sunrpc/xdrgen/templates/C/enum
-d:tools/net/sunrpc/xdrgen/templates/C/enum/declaration
-d:tools/net/sunrpc/xdrgen/templates/C/enum/decoder
-d:tools/net/sunrpc/xdrgen/templates/C/enum/definition
-d:tools/net/sunrpc/xdrgen/templates/C/enum/encoder
-d:tools/net/sunrpc/xdrgen/templates/C/enum/maxsize
-d:tools/net/sunrpc/xdrgen/templates/C/header_bottom
-d:tools/net/sunrpc/xdrgen/templates/C/header_bottom/declaration
-d:tools/net/sunrpc/xdrgen/templates/C/header_bottom/definition
-d:tools/net/sunrpc/xdrgen/templates/C/header_top
-d:tools/net/sunrpc/xdrgen/templates/C/header_top/declaration
-d:tools/net/sunrpc/xdrgen/templates/C/header_top/definition
-d:tools/net/sunrpc/xdrgen/templates/C/pointer
-d:tools/net/sunrpc/xdrgen/templates/C/pointer/declaration
-d:tools/net/sunrpc/xdrgen/templates/C/pointer/decoder
-d:tools/net/sunrpc/xdrgen/templates/C/pointer/definition
-d:tools/net/sunrpc/xdrgen/templates/C/pointer/encoder
-d:tools/net/sunrpc/xdrgen/templates/C/pointer/maxsize
-d:tools/net/sunrpc/xdrgen/templates/C/program
-d:tools/net/sunrpc/xdrgen/templates/C/program/declaration
-d:tools/net/sunrpc/xdrgen/templates/C/program/decoder
-d:tools/net/sunrpc/xdrgen/templates/C/program/definition
-d:tools/net/sunrpc/xdrgen/templates/C/program/encoder
-d:tools/net/sunrpc/xdrgen/templates/C/source_top
-d:tools/net/sunrpc/xdrgen/templates/C/struct
-d:tools/net/sunrpc/xdrgen/templates/C/struct/declaration
-d:tools/net/sunrpc/xdrgen/templates/C/struct/decoder
-d:tools/net/sunrpc/xdrgen/templates/C/struct/definition
-d:tools/net/sunrpc/xdrgen/templates/C/struct/encoder
-d:tools/net/sunrpc/xdrgen/templates/C/struct/maxsize
-d:tools/net/sunrpc/xdrgen/templates/C/typedef
-d:tools/net/sunrpc/xdrgen/templates/C/typedef/declaration
-d:tools/net/sunrpc/xdrgen/templates/C/typedef/decoder
-d:tools/net/sunrpc/xdrgen/templates/C/typedef/definition
-d:tools/net/sunrpc/xdrgen/templates/C/typedef/encoder
-d:tools/net/sunrpc/xdrgen/templates/C/typedef/maxsize
-d:tools/net/sunrpc/xdrgen/templates/C/union
-d:tools/net/sunrpc/xdrgen/templates/C/union/decoder
-d:tools/net/sunrpc/xdrgen/templates/C/union/definition
-d:tools/net/sunrpc/xdrgen/templates/C/union/encoder
-d:tools/net/sunrpc/xdrgen/templates/C/union/maxsize
-d:tools/net/sunrpc/xdrgen/tests
-d:tools/net/ynl
-d:tools/net/ynl/generated
-d:tools/net/ynl/lib
-d:tools/net/ynl/pyynl
-d:tools/net/ynl/pyynl/lib
-d:tools/net/ynl/samples
-d:tools/objtool
-d:tools/objtool/Documentation
-d:tools/objtool/arch
-d:tools/objtool/arch/loongarch
-d:tools/objtool/arch/loongarch/include
-d:tools/objtool/arch/loongarch/include/arch
-d:tools/objtool/arch/powerpc
-d:tools/objtool/arch/powerpc/include
-d:tools/objtool/arch/powerpc/include/arch
-d:tools/objtool/arch/x86
-d:tools/objtool/arch/x86/include
-d:tools/objtool/arch/x86/include/arch
-d:tools/objtool/include
-d:tools/objtool/include/objtool
-d:tools/pcmcia
-d:tools/perf
-d:tools/perf/Documentation
-d:tools/perf/arch
-d:tools/perf/arch/alpha
-d:tools/perf/arch/alpha/entry
-d:tools/perf/arch/alpha/entry/syscalls
-d:tools/perf/arch/arc
-d:tools/perf/arch/arc/annotate
-d:tools/perf/arch/arm
-d:tools/perf/arch/arm/annotate
-d:tools/perf/arch/arm/entry
-d:tools/perf/arch/arm/entry/syscalls
-d:tools/perf/arch/arm/include
-d:tools/perf/arch/arm/tests
-d:tools/perf/arch/arm/util
-d:tools/perf/arch/arm64
-d:tools/perf/arch/arm64/annotate
-d:tools/perf/arch/arm64/entry
-d:tools/perf/arch/arm64/entry/syscalls
-d:tools/perf/arch/arm64/include
-d:tools/perf/arch/arm64/tests
-d:tools/perf/arch/arm64/util
-d:tools/perf/arch/csky
-d:tools/perf/arch/csky/annotate
-d:tools/perf/arch/csky/include
-d:tools/perf/arch/csky/util
-d:tools/perf/arch/loongarch
-d:tools/perf/arch/loongarch/annotate
-d:tools/perf/arch/loongarch/include
-d:tools/perf/arch/loongarch/util
-d:tools/perf/arch/mips
-d:tools/perf/arch/mips/annotate
-d:tools/perf/arch/mips/entry
-d:tools/perf/arch/mips/entry/syscalls
-d:tools/perf/arch/mips/include
-d:tools/perf/arch/mips/util
-d:tools/perf/arch/parisc
-d:tools/perf/arch/parisc/entry
-d:tools/perf/arch/parisc/entry/syscalls
-d:tools/perf/arch/powerpc
-d:tools/perf/arch/powerpc/annotate
-d:tools/perf/arch/powerpc/entry
-d:tools/perf/arch/powerpc/entry/syscalls
-d:tools/perf/arch/powerpc/include
-d:tools/perf/arch/powerpc/tests
-d:tools/perf/arch/powerpc/util
-d:tools/perf/arch/riscv
-d:tools/perf/arch/riscv/include
-d:tools/perf/arch/riscv/util
-d:tools/perf/arch/riscv64
-d:tools/perf/arch/riscv64/annotate
-d:tools/perf/arch/s390
-d:tools/perf/arch/s390/annotate
-d:tools/perf/arch/s390/entry
-d:tools/perf/arch/s390/entry/syscalls
-d:tools/perf/arch/s390/include
-d:tools/perf/arch/s390/util
-d:tools/perf/arch/sh
-d:tools/perf/arch/sh/entry
-d:tools/perf/arch/sh/entry/syscalls
-d:tools/perf/arch/sh/include
-d:tools/perf/arch/sparc
-d:tools/perf/arch/sparc/annotate
-d:tools/perf/arch/sparc/entry
-d:tools/perf/arch/sparc/entry/syscalls
-d:tools/perf/arch/sparc/include
-d:tools/perf/arch/x86
-d:tools/perf/arch/x86/annotate
-d:tools/perf/arch/x86/entry
-d:tools/perf/arch/x86/entry/syscalls
-d:tools/perf/arch/x86/include
-d:tools/perf/arch/x86/tests
-d:tools/perf/arch/x86/util
-d:tools/perf/arch/xtensa
-d:tools/perf/arch/xtensa/entry
-d:tools/perf/arch/xtensa/entry/syscalls
-d:tools/perf/arch/xtensa/include
-d:tools/perf/bench
-d:tools/perf/check-header_ignore_hunks
-d:tools/perf/check-header_ignore_hunks/lib
-d:tools/perf/dlfilters
-d:tools/perf/include
-d:tools/perf/include/perf
-d:tools/perf/jvmti
-d:tools/perf/pmu-events
-d:tools/perf/pmu-events/arch
-d:tools/perf/pmu-events/arch/arm64
-d:tools/perf/pmu-events/arch/arm64/ampere
-d:tools/perf/pmu-events/arch/arm64/ampere/ampereone
-d:tools/perf/pmu-events/arch/arm64/ampere/ampereonex
-d:tools/perf/pmu-events/arch/arm64/ampere/emag
-d:tools/perf/pmu-events/arch/arm64/arm
-d:tools/perf/pmu-events/arch/arm64/arm/cmn
-d:tools/perf/pmu-events/arch/arm64/arm/cmn/sys
-d:tools/perf/pmu-events/arch/arm64/arm/cortex-a34
-d:tools/perf/pmu-events/arch/arm64/arm/cortex-a35
-d:tools/perf/pmu-events/arch/arm64/arm/cortex-a510
-d:tools/perf/pmu-events/arch/arm64/arm/cortex-a53
-d:tools/perf/pmu-events/arch/arm64/arm/cortex-a55
-d:tools/perf/pmu-events/arch/arm64/arm/cortex-a57-a72
-d:tools/perf/pmu-events/arch/arm64/arm/cortex-a65-e1
-d:tools/perf/pmu-events/arch/arm64/arm/cortex-a710
-d:tools/perf/pmu-events/arch/arm64/arm/cortex-a73
-d:tools/perf/pmu-events/arch/arm64/arm/cortex-a75
-d:tools/perf/pmu-events/arch/arm64/arm/cortex-a76
-d:tools/perf/pmu-events/arch/arm64/arm/cortex-a77
-d:tools/perf/pmu-events/arch/arm64/arm/cortex-a78
-d:tools/perf/pmu-events/arch/arm64/arm/cortex-x1
-d:tools/perf/pmu-events/arch/arm64/arm/cortex-x2
-d:tools/perf/pmu-events/arch/arm64/arm/neoverse-n1
-d:tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2
-d:tools/perf/pmu-events/arch/arm64/arm/neoverse-n3
-d:tools/perf/pmu-events/arch/arm64/arm/neoverse-v1
-d:tools/perf/pmu-events/arch/arm64/arm/neoverse-v3
-d:tools/perf/pmu-events/arch/arm64/cavium
-d:tools/perf/pmu-events/arch/arm64/cavium/thunderx2
-d:tools/perf/pmu-events/arch/arm64/freescale
-d:tools/perf/pmu-events/arch/arm64/freescale/imx8mm
-d:tools/perf/pmu-events/arch/arm64/freescale/imx8mm/sys
-d:tools/perf/pmu-events/arch/arm64/freescale/imx8mn
-d:tools/perf/pmu-events/arch/arm64/freescale/imx8mn/sys
-d:tools/perf/pmu-events/arch/arm64/freescale/imx8mp
-d:tools/perf/pmu-events/arch/arm64/freescale/imx8mp/sys
-d:tools/perf/pmu-events/arch/arm64/freescale/imx8mq
-d:tools/perf/pmu-events/arch/arm64/freescale/imx8mq/sys
-d:tools/perf/pmu-events/arch/arm64/freescale/imx91
-d:tools/perf/pmu-events/arch/arm64/freescale/imx91/sys
-d:tools/perf/pmu-events/arch/arm64/freescale/imx93
-d:tools/perf/pmu-events/arch/arm64/freescale/imx93/sys
-d:tools/perf/pmu-events/arch/arm64/freescale/imx95
-d:tools/perf/pmu-events/arch/arm64/freescale/imx95/sys
-d:tools/perf/pmu-events/arch/arm64/fujitsu
-d:tools/perf/pmu-events/arch/arm64/fujitsu/a64fx
-d:tools/perf/pmu-events/arch/arm64/fujitsu/monaka
-d:tools/perf/pmu-events/arch/arm64/hisilicon
-d:tools/perf/pmu-events/arch/arm64/hisilicon/hip08
-d:tools/perf/pmu-events/arch/arm64/hisilicon/hip09
-d:tools/perf/pmu-events/arch/arm64/hisilicon/hip09/sys
-d:tools/perf/pmu-events/arch/arm64/thead
-d:tools/perf/pmu-events/arch/arm64/thead/yitian710
-d:tools/perf/pmu-events/arch/arm64/thead/yitian710/sys
-d:tools/perf/pmu-events/arch/common
-d:tools/perf/pmu-events/arch/common/common
-d:tools/perf/pmu-events/arch/nds32
-d:tools/perf/pmu-events/arch/nds32/n13
-d:tools/perf/pmu-events/arch/powerpc
-d:tools/perf/pmu-events/arch/powerpc/compat
-d:tools/perf/pmu-events/arch/powerpc/power10
-d:tools/perf/pmu-events/arch/powerpc/power8
-d:tools/perf/pmu-events/arch/powerpc/power9
-d:tools/perf/pmu-events/arch/riscv
-d:tools/perf/pmu-events/arch/riscv/andes
-d:tools/perf/pmu-events/arch/riscv/andes/ax45
-d:tools/perf/pmu-events/arch/riscv/sifive
-d:tools/perf/pmu-events/arch/riscv/sifive/bullet
-d:tools/perf/pmu-events/arch/riscv/sifive/bullet-07
-d:tools/perf/pmu-events/arch/riscv/sifive/bullet-0d
-d:tools/perf/pmu-events/arch/riscv/sifive/p550
-d:tools/perf/pmu-events/arch/riscv/sifive/p650
-d:tools/perf/pmu-events/arch/riscv/starfive
-d:tools/perf/pmu-events/arch/riscv/starfive/dubhe-80
-d:tools/perf/pmu-events/arch/riscv/thead
-d:tools/perf/pmu-events/arch/riscv/thead/c900-legacy
-d:tools/perf/pmu-events/arch/s390
-d:tools/perf/pmu-events/arch/s390/cf_z10
-d:tools/perf/pmu-events/arch/s390/cf_z13
-d:tools/perf/pmu-events/arch/s390/cf_z14
-d:tools/perf/pmu-events/arch/s390/cf_z15
-d:tools/perf/pmu-events/arch/s390/cf_z16
-d:tools/perf/pmu-events/arch/s390/cf_z196
-d:tools/perf/pmu-events/arch/s390/cf_zec12
-d:tools/perf/pmu-events/arch/test
-d:tools/perf/pmu-events/arch/test/test_soc
-d:tools/perf/pmu-events/arch/test/test_soc/cpu
-d:tools/perf/pmu-events/arch/test/test_soc/sys
-d:tools/perf/pmu-events/arch/x86
-d:tools/perf/pmu-events/arch/x86/alderlake
-d:tools/perf/pmu-events/arch/x86/alderlaken
-d:tools/perf/pmu-events/arch/x86/amdzen1
-d:tools/perf/pmu-events/arch/x86/amdzen2
-d:tools/perf/pmu-events/arch/x86/amdzen3
-d:tools/perf/pmu-events/arch/x86/amdzen4
-d:tools/perf/pmu-events/arch/x86/amdzen5
-d:tools/perf/pmu-events/arch/x86/arrowlake
-d:tools/perf/pmu-events/arch/x86/bonnell
-d:tools/perf/pmu-events/arch/x86/broadwell
-d:tools/perf/pmu-events/arch/x86/broadwellde
-d:tools/perf/pmu-events/arch/x86/broadwellx
-d:tools/perf/pmu-events/arch/x86/cascadelakex
-d:tools/perf/pmu-events/arch/x86/clearwaterforest
-d:tools/perf/pmu-events/arch/x86/elkhartlake
-d:tools/perf/pmu-events/arch/x86/emeraldrapids
-d:tools/perf/pmu-events/arch/x86/goldmont
-d:tools/perf/pmu-events/arch/x86/goldmontplus
-d:tools/perf/pmu-events/arch/x86/grandridge
-d:tools/perf/pmu-events/arch/x86/graniterapids
-d:tools/perf/pmu-events/arch/x86/haswell
-d:tools/perf/pmu-events/arch/x86/haswellx
-d:tools/perf/pmu-events/arch/x86/icelake
-d:tools/perf/pmu-events/arch/x86/icelakex
-d:tools/perf/pmu-events/arch/x86/ivybridge
-d:tools/perf/pmu-events/arch/x86/ivytown
-d:tools/perf/pmu-events/arch/x86/jaketown
-d:tools/perf/pmu-events/arch/x86/knightslanding
-d:tools/perf/pmu-events/arch/x86/lunarlake
-d:tools/perf/pmu-events/arch/x86/meteorlake
-d:tools/perf/pmu-events/arch/x86/nehalemep
-d:tools/perf/pmu-events/arch/x86/nehalemex
-d:tools/perf/pmu-events/arch/x86/rocketlake
-d:tools/perf/pmu-events/arch/x86/sandybridge
-d:tools/perf/pmu-events/arch/x86/sapphirerapids
-d:tools/perf/pmu-events/arch/x86/sierraforest
-d:tools/perf/pmu-events/arch/x86/silvermont
-d:tools/perf/pmu-events/arch/x86/skylake
-d:tools/perf/pmu-events/arch/x86/skylakex
-d:tools/perf/pmu-events/arch/x86/snowridgex
-d:tools/perf/pmu-events/arch/x86/tigerlake
-d:tools/perf/pmu-events/arch/x86/westmereep-dp
-d:tools/perf/pmu-events/arch/x86/westmereep-sp
-d:tools/perf/pmu-events/arch/x86/westmereex
-d:tools/perf/python
-d:tools/perf/scripts
-d:tools/perf/scripts/perl
-d:tools/perf/scripts/perl/Perf-Trace-Util
-d:tools/perf/scripts/perl/Perf-Trace-Util/lib
-d:tools/perf/scripts/perl/Perf-Trace-Util/lib/Perf
-d:tools/perf/scripts/perl/Perf-Trace-Util/lib/Perf/Trace
-d:tools/perf/scripts/perl/bin
-d:tools/perf/scripts/python
-d:tools/perf/scripts/python/Perf-Trace-Util
-d:tools/perf/scripts/python/Perf-Trace-Util/lib
-d:tools/perf/scripts/python/Perf-Trace-Util/lib/Perf
-d:tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace
-d:tools/perf/scripts/python/bin
-d:tools/perf/tests
-d:tools/perf/tests/config-fragments
-d:tools/perf/tests/shell
-d:tools/perf/tests/shell/attr
-d:tools/perf/tests/shell/base_probe
-d:tools/perf/tests/shell/base_report
-d:tools/perf/tests/shell/common
-d:tools/perf/tests/shell/coresight
-d:tools/perf/tests/shell/coresight/asm_pure_loop
-d:tools/perf/tests/shell/coresight/memcpy_thread
-d:tools/perf/tests/shell/coresight/thread_loop
-d:tools/perf/tests/shell/coresight/unroll_loop_thread
-d:tools/perf/tests/shell/lib
-d:tools/perf/tests/workloads
-d:tools/perf/trace
-d:tools/perf/trace/beauty
-d:tools/perf/trace/beauty/arch
-d:tools/perf/trace/beauty/arch/x86
-d:tools/perf/trace/beauty/arch/x86/include
-d:tools/perf/trace/beauty/arch/x86/include/asm
-d:tools/perf/trace/beauty/arch/x86/include/uapi
-d:tools/perf/trace/beauty/arch/x86/include/uapi/asm
-d:tools/perf/trace/beauty/include
-d:tools/perf/trace/beauty/include/linux
-d:tools/perf/trace/beauty/include/uapi
-d:tools/perf/trace/beauty/include/uapi/linux
-d:tools/perf/trace/beauty/include/uapi/sound
-d:tools/perf/trace/beauty/tracepoints
-d:tools/perf/trace/strace
-d:tools/perf/trace/strace/groups
-d:tools/perf/ui
-d:tools/perf/ui/browsers
-d:tools/perf/ui/gtk
-d:tools/perf/ui/stdio
-d:tools/perf/ui/tui
-d:tools/perf/util
-d:tools/perf/util/arm-spe-decoder
-d:tools/perf/util/bpf_skel
-d:tools/perf/util/bpf_skel/vmlinux
-d:tools/perf/util/cs-etm-decoder
-d:tools/perf/util/hisi-ptt-decoder
-d:tools/perf/util/include
-d:tools/perf/util/include/asm
-d:tools/perf/util/include/linux
-d:tools/perf/util/intel-pt-decoder
-d:tools/perf/util/libunwind
-d:tools/perf/util/perf-regs-arch
-d:tools/perf/util/scripting-engines
-d:tools/power
-d:tools/power/acpi
-d:tools/power/acpi/common
-d:tools/power/acpi/man
-d:tools/power/acpi/os_specific
-d:tools/power/acpi/os_specific/service_layers
-d:tools/power/acpi/tools
-d:tools/power/acpi/tools/acpidbg
-d:tools/power/acpi/tools/acpidump
-d:tools/power/acpi/tools/ec
-d:tools/power/acpi/tools/pfrut
-d:tools/power/cpupower
-d:tools/power/cpupower/bench
-d:tools/power/cpupower/bindings
-d:tools/power/cpupower/bindings/python
-d:tools/power/cpupower/debug
-d:tools/power/cpupower/debug/i386
-d:tools/power/cpupower/debug/kernel
-d:tools/power/cpupower/debug/x86_64
-d:tools/power/cpupower/lib
-d:tools/power/cpupower/man
-d:tools/power/cpupower/po
-d:tools/power/cpupower/utils
-d:tools/power/cpupower/utils/helpers
-d:tools/power/cpupower/utils/idle_monitor
-d:tools/power/pm-graph
-d:tools/power/pm-graph/config
-d:tools/power/x86
-d:tools/power/x86/amd_pstate_tracer
-d:tools/power/x86/intel-speed-select
-d:tools/power/x86/intel_pstate_tracer
-d:tools/power/x86/turbostat
-d:tools/power/x86/x86_energy_perf_policy
-d:tools/rcu
-d:tools/sched
-d:tools/sched_ext
-d:tools/sched_ext/include
-d:tools/sched_ext/include/bpf-compat
-d:tools/sched_ext/include/bpf-compat/gnu
-d:tools/sched_ext/include/scx
-d:tools/scripts
-d:tools/sound
-d:tools/spi
-d:tools/testing
-d:tools/testing/crypto
-d:tools/testing/crypto/chacha20-s390
-d:tools/testing/cxl
-d:tools/testing/cxl/test
-d:tools/testing/fault-injection
-d:tools/testing/ktest
-d:tools/testing/ktest/examples
-d:tools/testing/ktest/examples/bootconfigs
-d:tools/testing/ktest/examples/include
-d:tools/testing/kunit
-d:tools/testing/kunit/configs
-d:tools/testing/kunit/qemu_configs
-d:tools/testing/kunit/test_data
-d:tools/testing/memblock
-d:tools/testing/memblock/asm
-d:tools/testing/memblock/lib
-d:tools/testing/memblock/linux
-d:tools/testing/memblock/scripts
-d:tools/testing/memblock/tests
-d:tools/testing/nvdimm
-d:tools/testing/nvdimm/test
-d:tools/testing/radix-tree
-d:tools/testing/rbtree
-d:tools/testing/scatterlist
-d:tools/testing/scatterlist/linux
-d:tools/testing/selftests
-d:tools/testing/selftests/acct
-d:tools/testing/selftests/alsa
-d:tools/testing/selftests/alsa/conf.d
-d:tools/testing/selftests/amd-pstate
-d:tools/testing/selftests/arm64
-d:tools/testing/selftests/arm64/abi
-d:tools/testing/selftests/arm64/bti
-d:tools/testing/selftests/arm64/fp
-d:tools/testing/selftests/arm64/gcs
-d:tools/testing/selftests/arm64/mte
-d:tools/testing/selftests/arm64/pauth
-d:tools/testing/selftests/arm64/signal
-d:tools/testing/selftests/arm64/signal/testcases
-d:tools/testing/selftests/arm64/tags
-d:tools/testing/selftests/bpf
-d:tools/testing/selftests/bpf/benchs
-d:tools/testing/selftests/bpf/gnu
-d:tools/testing/selftests/bpf/map_tests
-d:tools/testing/selftests/bpf/prog_tests
-d:tools/testing/selftests/bpf/progs
-d:tools/testing/selftests/bpf/test_kmods
-d:tools/testing/selftests/bpf/verifier
-d:tools/testing/selftests/breakpoints
-d:tools/testing/selftests/cachestat
-d:tools/testing/selftests/capabilities
-d:tools/testing/selftests/cgroup
-d:tools/testing/selftests/cgroup/lib
-d:tools/testing/selftests/cgroup/lib/include
-d:tools/testing/selftests/clone3
-d:tools/testing/selftests/connector
-d:tools/testing/selftests/core
-d:tools/testing/selftests/coredump
-d:tools/testing/selftests/cpu-hotplug
-d:tools/testing/selftests/cpufreq
-d:tools/testing/selftests/damon
-d:tools/testing/selftests/devices
-d:tools/testing/selftests/devices/error_logs
-d:tools/testing/selftests/devices/probe
-d:tools/testing/selftests/devices/probe/boards
-d:tools/testing/selftests/dma
-d:tools/testing/selftests/dmabuf-heaps
-d:tools/testing/selftests/drivers
-d:tools/testing/selftests/drivers/dma-buf
-d:tools/testing/selftests/drivers/gpu
-d:tools/testing/selftests/drivers/net
-d:tools/testing/selftests/drivers/net/bonding
-d:tools/testing/selftests/drivers/net/dsa
-d:tools/testing/selftests/drivers/net/hw
-d:tools/testing/selftests/drivers/net/hw/lib
-d:tools/testing/selftests/drivers/net/hw/lib/py
-d:tools/testing/selftests/drivers/net/lib
-d:tools/testing/selftests/drivers/net/lib/py
-d:tools/testing/selftests/drivers/net/lib/sh
-d:tools/testing/selftests/drivers/net/microchip
-d:tools/testing/selftests/drivers/net/mlxsw
-d:tools/testing/selftests/drivers/net/mlxsw/spectrum
-d:tools/testing/selftests/drivers/net/mlxsw/spectrum-2
-d:tools/testing/selftests/drivers/net/netdevsim
-d:tools/testing/selftests/drivers/net/ocelot
-d:tools/testing/selftests/drivers/net/team
-d:tools/testing/selftests/drivers/net/virtio_net
-d:tools/testing/selftests/drivers/ntsync
-d:tools/testing/selftests/drivers/platform
-d:tools/testing/selftests/drivers/platform/x86
-d:tools/testing/selftests/drivers/platform/x86/intel
-d:tools/testing/selftests/drivers/platform/x86/intel/ifs
-d:tools/testing/selftests/drivers/s390x
-d:tools/testing/selftests/drivers/s390x/uvdevice
-d:tools/testing/selftests/drivers/sdsi
-d:tools/testing/selftests/drivers/usb
-d:tools/testing/selftests/drivers/usb/usbip
-d:tools/testing/selftests/dt
-d:tools/testing/selftests/efivarfs
-d:tools/testing/selftests/exec
-d:tools/testing/selftests/fchmodat2
-d:tools/testing/selftests/filelock
-d:tools/testing/selftests/filesystems
-d:tools/testing/selftests/filesystems/binderfs
-d:tools/testing/selftests/filesystems/epoll
-d:tools/testing/selftests/filesystems/eventfd
-d:tools/testing/selftests/filesystems/fat
-d:tools/testing/selftests/filesystems/mount-notify
-d:tools/testing/selftests/filesystems/nsfs
-d:tools/testing/selftests/filesystems/overlayfs
-d:tools/testing/selftests/filesystems/statmount
-d:tools/testing/selftests/firmware
-d:tools/testing/selftests/fpu
-d:tools/testing/selftests/ftrace
-d:tools/testing/selftests/ftrace/samples
-d:tools/testing/selftests/ftrace/test.d
-d:tools/testing/selftests/ftrace/test.d/00basic
-d:tools/testing/selftests/ftrace/test.d/direct
-d:tools/testing/selftests/ftrace/test.d/dynevent
-d:tools/testing/selftests/ftrace/test.d/event
-d:tools/testing/selftests/ftrace/test.d/filter
-d:tools/testing/selftests/ftrace/test.d/ftrace
-d:tools/testing/selftests/ftrace/test.d/instances
-d:tools/testing/selftests/ftrace/test.d/kprobe
-d:tools/testing/selftests/ftrace/test.d/preemptirq
-d:tools/testing/selftests/ftrace/test.d/selftest
-d:tools/testing/selftests/ftrace/test.d/tracer
-d:tools/testing/selftests/ftrace/test.d/trigger
-d:tools/testing/selftests/ftrace/test.d/trigger/inter-event
-d:tools/testing/selftests/futex
-d:tools/testing/selftests/futex/functional
-d:tools/testing/selftests/futex/include
-d:tools/testing/selftests/gpio
-d:tools/testing/selftests/hid
-d:tools/testing/selftests/hid/progs
-d:tools/testing/selftests/hid/tests
-d:tools/testing/selftests/ia64
-d:tools/testing/selftests/intel_pstate
-d:tools/testing/selftests/iommu
-d:tools/testing/selftests/ipc
-d:tools/testing/selftests/ir
-d:tools/testing/selftests/kcmp
-d:tools/testing/selftests/kexec
-d:tools/testing/selftests/kmod
-d:tools/testing/selftests/kselftest
-d:tools/testing/selftests/kselftest_harness
-d:tools/testing/selftests/kvm
-d:tools/testing/selftests/kvm/arm64
-d:tools/testing/selftests/kvm/include
-d:tools/testing/selftests/kvm/include/arm64
-d:tools/testing/selftests/kvm/include/loongarch
-d:tools/testing/selftests/kvm/include/riscv
-d:tools/testing/selftests/kvm/include/s390
-d:tools/testing/selftests/kvm/include/x86
-d:tools/testing/selftests/kvm/lib
-d:tools/testing/selftests/kvm/lib/arm64
-d:tools/testing/selftests/kvm/lib/loongarch
-d:tools/testing/selftests/kvm/lib/riscv
-d:tools/testing/selftests/kvm/lib/s390
-d:tools/testing/selftests/kvm/lib/x86
-d:tools/testing/selftests/kvm/riscv
-d:tools/testing/selftests/kvm/s390
-d:tools/testing/selftests/kvm/x86
-d:tools/testing/selftests/landlock
-d:tools/testing/selftests/lib
-d:tools/testing/selftests/livepatch
-d:tools/testing/selftests/livepatch/test_modules
-d:tools/testing/selftests/lkdtm
-d:tools/testing/selftests/locking
-d:tools/testing/selftests/lsm
-d:tools/testing/selftests/media_tests
-d:tools/testing/selftests/membarrier
-d:tools/testing/selftests/memfd
-d:tools/testing/selftests/memory-hotplug
-d:tools/testing/selftests/mincore
-d:tools/testing/selftests/mm
-d:tools/testing/selftests/mm/page_frag
-d:tools/testing/selftests/module
-d:tools/testing/selftests/mount
-d:tools/testing/selftests/mount_setattr
-d:tools/testing/selftests/move_mount_set_group
-d:tools/testing/selftests/mqueue
-d:tools/testing/selftests/mseal_system_mappings
-d:tools/testing/selftests/nci
-d:tools/testing/selftests/net
-d:tools/testing/selftests/net/af_unix
-d:tools/testing/selftests/net/bench
-d:tools/testing/selftests/net/bench/page_pool
-d:tools/testing/selftests/net/can
-d:tools/testing/selftests/net/forwarding
-d:tools/testing/selftests/net/hsr
-d:tools/testing/selftests/net/lib
-d:tools/testing/selftests/net/lib/py
-d:tools/testing/selftests/net/lib/sh
-d:tools/testing/selftests/net/mptcp
-d:tools/testing/selftests/net/netfilter
-d:tools/testing/selftests/net/netfilter/packetdrill
-d:tools/testing/selftests/net/openvswitch
-d:tools/testing/selftests/net/ovpn
-d:tools/testing/selftests/net/packetdrill
-d:tools/testing/selftests/net/rds
-d:tools/testing/selftests/net/tcp_ao
-d:tools/testing/selftests/net/tcp_ao/lib
-d:tools/testing/selftests/nolibc
-d:tools/testing/selftests/ntb
-d:tools/testing/selftests/openat2
-d:tools/testing/selftests/pci_endpoint
-d:tools/testing/selftests/pcie_bwctrl
-d:tools/testing/selftests/perf_events
-d:tools/testing/selftests/pid_namespace
-d:tools/testing/selftests/pidfd
-d:tools/testing/selftests/power_supply
-d:tools/testing/selftests/powerpc
-d:tools/testing/selftests/powerpc/alignment
-d:tools/testing/selftests/powerpc/benchmarks
-d:tools/testing/selftests/powerpc/cache_shape
-d:tools/testing/selftests/powerpc/copyloops
-d:tools/testing/selftests/powerpc/copyloops/asm
-d:tools/testing/selftests/powerpc/copyloops/linux
-d:tools/testing/selftests/powerpc/dexcr
-d:tools/testing/selftests/powerpc/dscr
-d:tools/testing/selftests/powerpc/eeh
-d:tools/testing/selftests/powerpc/include
-d:tools/testing/selftests/powerpc/lib
-d:tools/testing/selftests/powerpc/math
-d:tools/testing/selftests/powerpc/mce
-d:tools/testing/selftests/powerpc/mm
-d:tools/testing/selftests/powerpc/nx-gzip
-d:tools/testing/selftests/powerpc/nx-gzip/include
-d:tools/testing/selftests/powerpc/papr_attributes
-d:tools/testing/selftests/powerpc/papr_sysparm
-d:tools/testing/selftests/powerpc/papr_vpd
-d:tools/testing/selftests/powerpc/pmu
-d:tools/testing/selftests/powerpc/pmu/ebb
-d:tools/testing/selftests/powerpc/pmu/event_code_tests
-d:tools/testing/selftests/powerpc/pmu/sampling_tests
-d:tools/testing/selftests/powerpc/primitives
-d:tools/testing/selftests/powerpc/primitives/asm
-d:tools/testing/selftests/powerpc/primitives/linux
-d:tools/testing/selftests/powerpc/ptrace
-d:tools/testing/selftests/powerpc/scripts
-d:tools/testing/selftests/powerpc/security
-d:tools/testing/selftests/powerpc/signal
-d:tools/testing/selftests/powerpc/stringloops
-d:tools/testing/selftests/powerpc/stringloops/asm
-d:tools/testing/selftests/powerpc/stringloops/linux
-d:tools/testing/selftests/powerpc/switch_endian
-d:tools/testing/selftests/powerpc/syscalls
-d:tools/testing/selftests/powerpc/tm
-d:tools/testing/selftests/powerpc/vphn
-d:tools/testing/selftests/powerpc/vphn/asm
-d:tools/testing/selftests/prctl
-d:tools/testing/selftests/proc
-d:tools/testing/selftests/pstore
-d:tools/testing/selftests/ptp
-d:tools/testing/selftests/ptrace
-d:tools/testing/selftests/rcutorture
-d:tools/testing/selftests/rcutorture/bin
-d:tools/testing/selftests/rcutorture/configs
-d:tools/testing/selftests/rcutorture/configs/lock
-d:tools/testing/selftests/rcutorture/configs/rcu
-d:tools/testing/selftests/rcutorture/configs/rcuscale
-d:tools/testing/selftests/rcutorture/configs/refscale
-d:tools/testing/selftests/rcutorture/configs/scf
-d:tools/testing/selftests/rcutorture/doc
-d:tools/testing/selftests/resctrl
-d:tools/testing/selftests/ring-buffer
-d:tools/testing/selftests/riscv
-d:tools/testing/selftests/riscv/abi
-d:tools/testing/selftests/riscv/hwprobe
-d:tools/testing/selftests/riscv/mm
-d:tools/testing/selftests/riscv/sigreturn
-d:tools/testing/selftests/riscv/vector
-d:tools/testing/selftests/rlimits
-d:tools/testing/selftests/rseq
-d:tools/testing/selftests/rtc
-d:tools/testing/selftests/rust
-d:tools/testing/selftests/safesetid
-d:tools/testing/selftests/sched
-d:tools/testing/selftests/sched_ext
-d:tools/testing/selftests/seccomp
-d:tools/testing/selftests/sgx
-d:tools/testing/selftests/signal
-d:tools/testing/selftests/size
-d:tools/testing/selftests/sparc64
-d:tools/testing/selftests/sparc64/drivers
-d:tools/testing/selftests/splice
-d:tools/testing/selftests/static_keys
-d:tools/testing/selftests/sync
-d:tools/testing/selftests/syscall_user_dispatch
-d:tools/testing/selftests/sysctl
-d:tools/testing/selftests/tc-testing
-d:tools/testing/selftests/tc-testing/creating-plugins
-d:tools/testing/selftests/tc-testing/creating-testcases
-d:tools/testing/selftests/tc-testing/plugin-lib
-d:tools/testing/selftests/tc-testing/plugins
-d:tools/testing/selftests/tc-testing/scripts
-d:tools/testing/selftests/tc-testing/tc-tests
-d:tools/testing/selftests/tc-testing/tc-tests/actions
-d:tools/testing/selftests/tc-testing/tc-tests/filters
-d:tools/testing/selftests/tc-testing/tc-tests/infra
-d:tools/testing/selftests/tc-testing/tc-tests/qdiscs
-d:tools/testing/selftests/tdx
-d:tools/testing/selftests/thermal
-d:tools/testing/selftests/thermal/intel
-d:tools/testing/selftests/thermal/intel/power_floor
-d:tools/testing/selftests/thermal/intel/workload_hint
-d:tools/testing/selftests/timens
-d:tools/testing/selftests/timers
-d:tools/testing/selftests/tmpfs
-d:tools/testing/selftests/tpm2
-d:tools/testing/selftests/tty
-d:tools/testing/selftests/turbostat
-d:tools/testing/selftests/ublk
-d:tools/testing/selftests/ublk/trace
-d:tools/testing/selftests/uevent
-d:tools/testing/selftests/user_events
-d:tools/testing/selftests/vDSO
-d:tools/testing/selftests/vsock
-d:tools/testing/selftests/watchdog
-d:tools/testing/selftests/wireguard
-d:tools/testing/selftests/wireguard/qemu
-d:tools/testing/selftests/wireguard/qemu/arch
-d:tools/testing/selftests/x86
-d:tools/testing/selftests/x86/bugs
-d:tools/testing/selftests/zram
-d:tools/testing/shared
-d:tools/testing/shared/linux
-d:tools/testing/shared/trace
-d:tools/testing/shared/trace/events
-d:tools/testing/vma
-d:tools/testing/vma/linux
-d:tools/testing/vsock
-d:tools/thermal
-d:tools/thermal/lib
-d:tools/thermal/thermal-engine
-d:tools/thermal/thermometer
-d:tools/thermal/tmon
-d:tools/time
-d:tools/tracing
-d:tools/tracing/latency
-d:tools/tracing/rtla
-d:tools/tracing/rtla/sample
-d:tools/tracing/rtla/src
-d:tools/tracing/rtla/tests
-d:tools/usb
-d:tools/usb/ffs-aio-example
-d:tools/usb/ffs-aio-example/multibuff
-d:tools/usb/ffs-aio-example/multibuff/device_app
-d:tools/usb/ffs-aio-example/multibuff/host_app
-d:tools/usb/ffs-aio-example/simple
-d:tools/usb/ffs-aio-example/simple/device_app
-d:tools/usb/ffs-aio-example/simple/host_app
-d:tools/usb/usbip
-d:tools/usb/usbip/doc
-d:tools/usb/usbip/libsrc
-d:tools/usb/usbip/src
-d:tools/usb/usbip/vudc
-d:tools/verification
-d:tools/verification/models
-d:tools/verification/models/rtapp
-d:tools/verification/models/sched
-d:tools/verification/rv
-d:tools/verification/rv/include
-d:tools/verification/rv/src
-d:tools/verification/rvgen
-d:tools/verification/rvgen/rvgen
-d:tools/verification/rvgen/rvgen/templates
-d:tools/verification/rvgen/rvgen/templates/container
-d:tools/verification/rvgen/rvgen/templates/dot2k
-d:tools/verification/rvgen/rvgen/templates/ltl2k
-d:tools/virtio
-d:tools/virtio/asm
-d:tools/virtio/crypto
-d:tools/virtio/generated
-d:tools/virtio/linux
-d:tools/virtio/ringtest
-d:tools/virtio/uapi
-d:tools/virtio/uapi/linux
-d:tools/virtio/vhost_test
-d:tools/virtio/virtio-trace
-d:tools/virtio/xen
-d:tools/wmi
-d:tools/workqueue
-d:tools/writeback
-d:usr
-d:usr/dummy-include
-d:usr/include
-d:virt
-d:virt/kvm
-d:virt/lib
-f:.clang-format
-f:.clippy.toml
-f:.cocciconfig
-f:.editorconfig
-f:.get_maintainer.ignore
-f:.git/HEAD
-f:.git/config
-f:.git/description
-f:.git/hooks/applypatch-msg.sample
-f:.git/hooks/commit-msg.sample
-f:.git/hooks/fsmonitor-watchman.sample
-f:.git/hooks/post-update.sample
-f:.git/hooks/pre-applypatch.sample
-f:.git/hooks/pre-commit.sample
-f:.git/hooks/pre-merge-commit.sample
-f:.git/hooks/pre-push.sample
-f:.git/hooks/pre-rebase.sample
-f:.git/hooks/pre-receive.sample
-f:.git/hooks/prepare-commit-msg.sample
-f:.git/hooks/push-to-checkout.sample
-f:.git/hooks/sendemail-validate.sample
-f:.git/hooks/update.sample
-f:.git/index
-f:.git/info/exclude
-f:.git/logs/HEAD
-f:.git/logs/refs/heads/master
-f:.git/logs/refs/remotes/origin/HEAD
-f:.git/objects/pack/pack-9486f8e061e64de743019326996d98b7eb6d597d.idx
-f:.git/objects/pack/pack-9486f8e061e64de743019326996d98b7eb6d597d.pack
-f:.git/objects/pack/pack-9486f8e061e64de743019326996d98b7eb6d597d.rev
-f:.git/packed-refs
-f:.git/refs/heads/master
-f:.git/refs/remotes/origin/HEAD
-f:.gitattributes
-f:.gitignore
-f:.mailmap
-f:.pylintrc
-f:.rustfmt.toml
-f:COPYING
-f:CREDITS
-f:Documentation/.gitignore
-f:Documentation/ABI/README
-f:Documentation/ABI/obsolete/o2cb
-f:Documentation/ABI/obsolete/procfs-i8k
-f:Documentation/ABI/obsolete/sysfs-bus-iio
-f:Documentation/ABI/obsolete/sysfs-bus-usb
-f:Documentation/ABI/obsolete/sysfs-class-typec
-f:Documentation/ABI/obsolete/sysfs-cpuidle
-f:Documentation/ABI/obsolete/sysfs-driver-hid-roccat-arvo
-f:Documentation/ABI/obsolete/sysfs-driver-hid-roccat-isku
-f:Documentation/ABI/obsolete/sysfs-driver-hid-roccat-koneplus
-f:Documentation/ABI/obsolete/sysfs-driver-hid-roccat-konepure
-f:Documentation/ABI/obsolete/sysfs-driver-hid-roccat-kovaplus
-f:Documentation/ABI/obsolete/sysfs-driver-hid-roccat-lua
-f:Documentation/ABI/obsolete/sysfs-driver-hid-roccat-pyra
-f:Documentation/ABI/obsolete/sysfs-driver-hid-roccat-ryos
-f:Documentation/ABI/obsolete/sysfs-driver-hid-roccat-savu
-f:Documentation/ABI/obsolete/sysfs-driver-intel_pmc_bxt
-f:Documentation/ABI/obsolete/sysfs-driver-samsung-laptop
-f:Documentation/ABI/obsolete/sysfs-firmware-acpi
-f:Documentation/ABI/obsolete/sysfs-gpio
-f:Documentation/ABI/obsolete/sysfs-kernel-fadump_enabled
-f:Documentation/ABI/obsolete/sysfs-kernel-fadump_registered
-f:Documentation/ABI/obsolete/sysfs-kernel-fadump_release_mem
-f:Documentation/ABI/obsolete/sysfs-platform-ideapad-laptop
-f:Documentation/ABI/obsolete/sysfs-selinux-user
-f:Documentation/ABI/removed/devfs
-f:Documentation/ABI/removed/dv1394
-f:Documentation/ABI/removed/ip_queue
-f:Documentation/ABI/removed/net_dma
-f:Documentation/ABI/removed/o2cb
-f:Documentation/ABI/removed/raw1394
-f:Documentation/ABI/removed/sysfs-bus-nfit
-f:Documentation/ABI/removed/sysfs-class-cxl
-f:Documentation/ABI/removed/sysfs-class-rfkill
-f:Documentation/ABI/removed/sysfs-firmware-efi-vars
-f:Documentation/ABI/removed/sysfs-kernel-fadump_release_opalcore
-f:Documentation/ABI/removed/sysfs-kernel-uids
-f:Documentation/ABI/removed/sysfs-mce
-f:Documentation/ABI/removed/sysfs-selinux-checkreqprot
-f:Documentation/ABI/removed/sysfs-selinux-disable
-f:Documentation/ABI/removed/video1394
-f:Documentation/ABI/stable/firewire-cdev
-f:Documentation/ABI/stable/o2cb
-f:Documentation/ABI/stable/procfs-audit_loginuid
-f:Documentation/ABI/stable/syscalls
-f:Documentation/ABI/stable/sysfs-acpi-pmprofile
-f:Documentation/ABI/stable/sysfs-block
-f:Documentation/ABI/stable/sysfs-bus-firewire
-f:Documentation/ABI/stable/sysfs-bus-fsl-mc
-f:Documentation/ABI/stable/sysfs-bus-mhi
-f:Documentation/ABI/stable/sysfs-bus-nvmem
-f:Documentation/ABI/stable/sysfs-bus-usb
-f:Documentation/ABI/stable/sysfs-bus-vmbus
-f:Documentation/ABI/stable/sysfs-bus-w1
-f:Documentation/ABI/stable/sysfs-bus-xen-backend
-f:Documentation/ABI/stable/sysfs-class-backlight
-f:Documentation/ABI/stable/sysfs-class-bluetooth
-f:Documentation/ABI/stable/sysfs-class-infiniband
-f:Documentation/ABI/stable/sysfs-class-rfkill
-f:Documentation/ABI/stable/sysfs-class-tpm
-f:Documentation/ABI/stable/sysfs-class-ubi
-f:Documentation/ABI/stable/sysfs-class-udc
-f:Documentation/ABI/stable/sysfs-devices
-f:Documentation/ABI/stable/sysfs-devices-node
-f:Documentation/ABI/stable/sysfs-devices-system-cpu
-f:Documentation/ABI/stable/sysfs-devices-system-xen_memory
-f:Documentation/ABI/stable/sysfs-driver-aspeed-vuart
-f:Documentation/ABI/stable/sysfs-driver-dma-idxd
-f:Documentation/ABI/stable/sysfs-driver-dma-ioatdma
-f:Documentation/ABI/stable/sysfs-driver-firmware-zynqmp
-f:Documentation/ABI/stable/sysfs-driver-ib_srp
-f:Documentation/ABI/stable/sysfs-driver-misc-cp500
-f:Documentation/ABI/stable/sysfs-driver-mlxreg-io
-f:Documentation/ABI/stable/sysfs-driver-qla2xxx
-f:Documentation/ABI/stable/sysfs-driver-speakup
-f:Documentation/ABI/stable/sysfs-driver-usb-usbtmc
-f:Documentation/ABI/stable/sysfs-driver-w1_ds2438
-f:Documentation/ABI/stable/sysfs-driver-w1_ds28e04
-f:Documentation/ABI/stable/sysfs-driver-w1_ds28ea00
-f:Documentation/ABI/stable/sysfs-firmware-opal-dump
-f:Documentation/ABI/stable/sysfs-firmware-opal-elog
-f:Documentation/ABI/stable/sysfs-fs-orangefs
-f:Documentation/ABI/stable/sysfs-hypervisor-xen
-f:Documentation/ABI/stable/sysfs-kernel-notes
-f:Documentation/ABI/stable/sysfs-kernel-time-aux-clocks
-f:Documentation/ABI/stable/sysfs-module
-f:Documentation/ABI/stable/sysfs-platform-wmi-bmof
-f:Documentation/ABI/stable/sysfs-transport-srp
-f:Documentation/ABI/stable/thermal-notification
-f:Documentation/ABI/stable/vdso
-f:Documentation/ABI/testing/configfs-acpi
-f:Documentation/ABI/testing/configfs-iio
-f:Documentation/ABI/testing/configfs-most
-f:Documentation/ABI/testing/configfs-rdma_cm
-f:Documentation/ABI/testing/configfs-spear-pcie-gadget
-f:Documentation/ABI/testing/configfs-stp-policy
-f:Documentation/ABI/testing/configfs-stp-policy-p_sys-t
-f:Documentation/ABI/testing/configfs-tsm-report
-f:Documentation/ABI/testing/configfs-usb-gadget
-f:Documentation/ABI/testing/configfs-usb-gadget-acm
-f:Documentation/ABI/testing/configfs-usb-gadget-ecm
-f:Documentation/ABI/testing/configfs-usb-gadget-eem
-f:Documentation/ABI/testing/configfs-usb-gadget-ffs
-f:Documentation/ABI/testing/configfs-usb-gadget-hid
-f:Documentation/ABI/testing/configfs-usb-gadget-loopback
-f:Documentation/ABI/testing/configfs-usb-gadget-mass-storage
-f:Documentation/ABI/testing/configfs-usb-gadget-midi
-f:Documentation/ABI/testing/configfs-usb-gadget-midi2
-f:Documentation/ABI/testing/configfs-usb-gadget-ncm
-f:Documentation/ABI/testing/configfs-usb-gadget-obex
-f:Documentation/ABI/testing/configfs-usb-gadget-phonet
-f:Documentation/ABI/testing/configfs-usb-gadget-printer
-f:Documentation/ABI/testing/configfs-usb-gadget-rndis
-f:Documentation/ABI/testing/configfs-usb-gadget-serial
-f:Documentation/ABI/testing/configfs-usb-gadget-sourcesink
-f:Documentation/ABI/testing/configfs-usb-gadget-subset
-f:Documentation/ABI/testing/configfs-usb-gadget-tcm
-f:Documentation/ABI/testing/configfs-usb-gadget-uac1
-f:Documentation/ABI/testing/configfs-usb-gadget-uac1_legacy
-f:Documentation/ABI/testing/configfs-usb-gadget-uac2
-f:Documentation/ABI/testing/configfs-usb-gadget-uvc
-f:Documentation/ABI/testing/debugfs-alienware-wmi
-f:Documentation/ABI/testing/debugfs-amd-iommu
-f:Documentation/ABI/testing/debugfs-cec-error-inj
-f:Documentation/ABI/testing/debugfs-cros-ec
-f:Documentation/ABI/testing/debugfs-cxl
-f:Documentation/ABI/testing/debugfs-dell-wmi-ddv
-f:Documentation/ABI/testing/debugfs-driver-dcc
-f:Documentation/ABI/testing/debugfs-driver-genwqe
-f:Documentation/ABI/testing/debugfs-driver-habanalabs
-f:Documentation/ABI/testing/debugfs-driver-qat
-f:Documentation/ABI/testing/debugfs-driver-qat_telemetry
-f:Documentation/ABI/testing/debugfs-dwc-pcie
-f:Documentation/ABI/testing/debugfs-ec
-f:Documentation/ABI/testing/debugfs-hisi-hpre
-f:Documentation/ABI/testing/debugfs-hisi-migration
-f:Documentation/ABI/testing/debugfs-hisi-sec
-f:Documentation/ABI/testing/debugfs-hisi-zip
-f:Documentation/ABI/testing/debugfs-hyperv
-f:Documentation/ABI/testing/debugfs-ideapad
-f:Documentation/ABI/testing/debugfs-iio-ad9467
-f:Documentation/ABI/testing/debugfs-iio-backend
-f:Documentation/ABI/testing/debugfs-intel-iommu
-f:Documentation/ABI/testing/debugfs-moxtet
-f:Documentation/ABI/testing/debugfs-msi-wmi-platform
-f:Documentation/ABI/testing/debugfs-olpc
-f:Documentation/ABI/testing/debugfs-pcie-ptm
-f:Documentation/ABI/testing/debugfs-pfo-nx-crypto
-f:Documentation/ABI/testing/debugfs-scmi
-f:Documentation/ABI/testing/debugfs-scmi-raw
-f:Documentation/ABI/testing/debugfs-tpmi
-f:Documentation/ABI/testing/debugfs-vfio
-f:Documentation/ABI/testing/debugfs-wilco-ec
-f:Documentation/ABI/testing/dell-smbios-wmi
-f:Documentation/ABI/testing/dev-kmsg
-f:Documentation/ABI/testing/devlink-resource-mlxsw
-f:Documentation/ABI/testing/evm
-f:Documentation/ABI/testing/gpio-cdev
-f:Documentation/ABI/testing/ima_policy
-f:Documentation/ABI/testing/ppc-memtrace
-f:Documentation/ABI/testing/procfs-attr-current
-f:Documentation/ABI/testing/procfs-attr-exec
-f:Documentation/ABI/testing/procfs-attr-prev
-f:Documentation/ABI/testing/procfs-diskstats
-f:Documentation/ABI/testing/procfs-smaps_rollup
-f:Documentation/ABI/testing/pstore
-f:Documentation/ABI/testing/rtc-cdev
-f:Documentation/ABI/testing/securityfs-secrets-coco
-f:Documentation/ABI/testing/sysfs-amd-pmc
-f:Documentation/ABI/testing/sysfs-amd-pmf
-f:Documentation/ABI/testing/sysfs-ata
-f:Documentation/ABI/testing/sysfs-block-aoe
-f:Documentation/ABI/testing/sysfs-block-bcache
-f:Documentation/ABI/testing/sysfs-block-device
-f:Documentation/ABI/testing/sysfs-block-dm
-f:Documentation/ABI/testing/sysfs-block-loop
-f:Documentation/ABI/testing/sysfs-block-rnbd
-f:Documentation/ABI/testing/sysfs-block-rssd
-f:Documentation/ABI/testing/sysfs-block-zram
-f:Documentation/ABI/testing/sysfs-bus-acpi
-f:Documentation/ABI/testing/sysfs-bus-amba
-f:Documentation/ABI/testing/sysfs-bus-auxiliary
-f:Documentation/ABI/testing/sysfs-bus-bcma
-f:Documentation/ABI/testing/sysfs-bus-cdx
-f:Documentation/ABI/testing/sysfs-bus-coreboot
-f:Documentation/ABI/testing/sysfs-bus-coresight-devices-cti
-f:Documentation/ABI/testing/sysfs-bus-coresight-devices-dummy-source
-f:Documentation/ABI/testing/sysfs-bus-coresight-devices-etb10
-f:Documentation/ABI/testing/sysfs-bus-coresight-devices-etm3x
-f:Documentation/ABI/testing/sysfs-bus-coresight-devices-etm4x
-f:Documentation/ABI/testing/sysfs-bus-coresight-devices-funnel
-f:Documentation/ABI/testing/sysfs-bus-coresight-devices-stm
-f:Documentation/ABI/testing/sysfs-bus-coresight-devices-tmc
-f:Documentation/ABI/testing/sysfs-bus-coresight-devices-tpdm
-f:Documentation/ABI/testing/sysfs-bus-coresight-devices-trbe
-f:Documentation/ABI/testing/sysfs-bus-coresight-devices-ultra_smb
-f:Documentation/ABI/testing/sysfs-bus-counter
-f:Documentation/ABI/testing/sysfs-bus-css
-f:Documentation/ABI/testing/sysfs-bus-cxl
-f:Documentation/ABI/testing/sysfs-bus-dax
-f:Documentation/ABI/testing/sysfs-bus-dfl
-f:Documentation/ABI/testing/sysfs-bus-dfl-devices-emif
-f:Documentation/ABI/testing/sysfs-bus-dfl-devices-n3000-nios
-f:Documentation/ABI/testing/sysfs-bus-event_source-devices
-f:Documentation/ABI/testing/sysfs-bus-event_source-devices-caps
-f:Documentation/ABI/testing/sysfs-bus-event_source-devices-dfl_fme
-f:Documentation/ABI/testing/sysfs-bus-event_source-devices-dsa
-f:Documentation/ABI/testing/sysfs-bus-event_source-devices-events
-f:Documentation/ABI/testing/sysfs-bus-event_source-devices-format
-f:Documentation/ABI/testing/sysfs-bus-event_source-devices-hisi_ptt
-f:Documentation/ABI/testing/sysfs-bus-event_source-devices-hv_24x7
-f:Documentation/ABI/testing/sysfs-bus-event_source-devices-hv_gpci
-f:Documentation/ABI/testing/sysfs-bus-event_source-devices-iommu
-f:Documentation/ABI/testing/sysfs-bus-event_source-devices-uncore
-f:Documentation/ABI/testing/sysfs-bus-event_source-devices-vpa-pmu
-f:Documentation/ABI/testing/sysfs-bus-fcoe
-f:Documentation/ABI/testing/sysfs-bus-fsi
-f:Documentation/ABI/testing/sysfs-bus-fsi-devices-sbefifo
-f:Documentation/ABI/testing/sysfs-bus-fsl-mc
-f:Documentation/ABI/testing/sysfs-bus-hsi
-f:Documentation/ABI/testing/sysfs-bus-i2c-devices-bq32k
-f:Documentation/ABI/testing/sysfs-bus-i2c-devices-fsa9480
-f:Documentation/ABI/testing/sysfs-bus-i2c-devices-hm6352
-f:Documentation/ABI/testing/sysfs-bus-i2c-devices-lm3533
-f:Documentation/ABI/testing/sysfs-bus-i2c-devices-pca954x
-f:Documentation/ABI/testing/sysfs-bus-i2c-devices-turris-omnia-mcu
-f:Documentation/ABI/testing/sysfs-bus-i3c
-f:Documentation/ABI/testing/sysfs-bus-iio
-f:Documentation/ABI/testing/sysfs-bus-iio-accel-adxl372
-f:Documentation/ABI/testing/sysfs-bus-iio-accel-bmc150
-f:Documentation/ABI/testing/sysfs-bus-iio-ad9739a
-f:Documentation/ABI/testing/sysfs-bus-iio-adc-ad-sigma-delta
-f:Documentation/ABI/testing/sysfs-bus-iio-adc-ad4130
-f:Documentation/ABI/testing/sysfs-bus-iio-adc-ad7192
-f:Documentation/ABI/testing/sysfs-bus-iio-adc-ad7280a
-f:Documentation/ABI/testing/sysfs-bus-iio-adc-envelope-detector
-f:Documentation/ABI/testing/sysfs-bus-iio-adc-hi8435
-f:Documentation/ABI/testing/sysfs-bus-iio-adc-max11410
-f:Documentation/ABI/testing/sysfs-bus-iio-adc-mcp3564
-f:Documentation/ABI/testing/sysfs-bus-iio-adc-mt6360
-f:Documentation/ABI/testing/sysfs-bus-iio-adc-pac1934
-f:Documentation/ABI/testing/sysfs-bus-iio-adc-stm32
-f:Documentation/ABI/testing/sysfs-bus-iio-bno055
-f:Documentation/ABI/testing/sysfs-bus-iio-cdc-ad7746
-f:Documentation/ABI/testing/sysfs-bus-iio-chemical-sgp40
-f:Documentation/ABI/testing/sysfs-bus-iio-chemical-sunrise-co2
-f:Documentation/ABI/testing/sysfs-bus-iio-chemical-vz89x
-f:Documentation/ABI/testing/sysfs-bus-iio-cros-ec
-f:Documentation/ABI/testing/sysfs-bus-iio-dac
-f:Documentation/ABI/testing/sysfs-bus-iio-dac-ad5766
-f:Documentation/ABI/testing/sysfs-bus-iio-dac-dpot-dac
-f:Documentation/ABI/testing/sysfs-bus-iio-dac-ltc2688
-f:Documentation/ABI/testing/sysfs-bus-iio-dfsdm-adc-stm32
-f:Documentation/ABI/testing/sysfs-bus-iio-distance-srf08
-f:Documentation/ABI/testing/sysfs-bus-iio-dma-buffer
-f:Documentation/ABI/testing/sysfs-bus-iio-filter-admv8818
-f:Documentation/ABI/testing/sysfs-bus-iio-frequency-ad9523
-f:Documentation/ABI/testing/sysfs-bus-iio-frequency-adf4350
-f:Documentation/ABI/testing/sysfs-bus-iio-frequency-adf4371
-f:Documentation/ABI/testing/sysfs-bus-iio-frequency-admv1013
-f:Documentation/ABI/testing/sysfs-bus-iio-frequency-admv1014
-f:Documentation/ABI/testing/sysfs-bus-iio-gyro-bmg160
-f:Documentation/ABI/testing/sysfs-bus-iio-health-afe440x
-f:Documentation/ABI/testing/sysfs-bus-iio-humidity
-f:Documentation/ABI/testing/sysfs-bus-iio-impedance-analyzer-ad5933
-f:Documentation/ABI/testing/sysfs-bus-iio-ina2xx-adc
-f:Documentation/ABI/testing/sysfs-bus-iio-inv_icm42600
-f:Documentation/ABI/testing/sysfs-bus-iio-isl29501
-f:Documentation/ABI/testing/sysfs-bus-iio-light-isl29018
-f:Documentation/ABI/testing/sysfs-bus-iio-light-lm3533-als
-f:Documentation/ABI/testing/sysfs-bus-iio-light-si1133
-f:Documentation/ABI/testing/sysfs-bus-iio-light-tsl2583
-f:Documentation/ABI/testing/sysfs-bus-iio-light-tsl2772
-f:Documentation/ABI/testing/sysfs-bus-iio-magnetometer-hmc5843
-f:Documentation/ABI/testing/sysfs-bus-iio-meas-spec
-f:Documentation/ABI/testing/sysfs-bus-iio-mpu6050
-f:Documentation/ABI/testing/sysfs-bus-iio-potentiometer-mcp4531
-f:Documentation/ABI/testing/sysfs-bus-iio-proximity
-f:Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935
-f:Documentation/ABI/testing/sysfs-bus-iio-resolver-ad2s1210
-f:Documentation/ABI/testing/sysfs-bus-iio-sps30
-f:Documentation/ABI/testing/sysfs-bus-iio-sx9310
-f:Documentation/ABI/testing/sysfs-bus-iio-sx9324
-f:Documentation/ABI/testing/sysfs-bus-iio-thermocouple
-f:Documentation/ABI/testing/sysfs-bus-iio-timer-stm32
-f:Documentation/ABI/testing/sysfs-bus-iio-trigger-sysfs
-f:Documentation/ABI/testing/sysfs-bus-iio-vf610
-f:Documentation/ABI/testing/sysfs-bus-intel_th-devices-gth
-f:Documentation/ABI/testing/sysfs-bus-intel_th-devices-msc
-f:Documentation/ABI/testing/sysfs-bus-intel_th-devices-pti
-f:Documentation/ABI/testing/sysfs-bus-intel_th-output-devices
-f:Documentation/ABI/testing/sysfs-bus-mcb
-f:Documentation/ABI/testing/sysfs-bus-mdio
-f:Documentation/ABI/testing/sysfs-bus-media
-f:Documentation/ABI/testing/sysfs-bus-mei
-f:Documentation/ABI/testing/sysfs-bus-mmc
-f:Documentation/ABI/testing/sysfs-bus-most
-f:Documentation/ABI/testing/sysfs-bus-moxtet-devices
-f:Documentation/ABI/testing/sysfs-bus-nfit
-f:Documentation/ABI/testing/sysfs-bus-nvdimm
-f:Documentation/ABI/testing/sysfs-bus-optee-devices
-f:Documentation/ABI/testing/sysfs-bus-papr-pmem
-f:Documentation/ABI/testing/sysfs-bus-pci
-f:Documentation/ABI/testing/sysfs-bus-pci-devices-aer
-f:Documentation/ABI/testing/sysfs-bus-pci-devices-avs
-f:Documentation/ABI/testing/sysfs-bus-pci-devices-catpt
-f:Documentation/ABI/testing/sysfs-bus-pci-devices-cciss
-f:Documentation/ABI/testing/sysfs-bus-pci-devices-pvpanic
-f:Documentation/ABI/testing/sysfs-bus-pci-drivers-ehci_hcd
-f:Documentation/ABI/testing/sysfs-bus-pci-drivers-janz-cmodio
-f:Documentation/ABI/testing/sysfs-bus-pci-drivers-xhci_hcd
-f:Documentation/ABI/testing/sysfs-bus-peci
-f:Documentation/ABI/testing/sysfs-bus-platform
-f:Documentation/ABI/testing/sysfs-bus-platform-devices-ampere-smpro
-f:Documentation/ABI/testing/sysfs-bus-platform-devices-occ-hwmon
-f:Documentation/ABI/testing/sysfs-bus-platform-drivers-amd_x3d_vcache
-f:Documentation/ABI/testing/sysfs-bus-platform-onboard-usb-dev
-f:Documentation/ABI/testing/sysfs-bus-rapidio
-f:Documentation/ABI/testing/sysfs-bus-rbd
-f:Documentation/ABI/testing/sysfs-bus-rpmsg
-f:Documentation/ABI/testing/sysfs-bus-siox
-f:Documentation/ABI/testing/sysfs-bus-soundwire-master
-f:Documentation/ABI/testing/sysfs-bus-soundwire-slave
-f:Documentation/ABI/testing/sysfs-bus-spi-devices-spi-nor
-f:Documentation/ABI/testing/sysfs-bus-surface_aggregator-tabletsw
-f:Documentation/ABI/testing/sysfs-bus-thunderbolt
-f:Documentation/ABI/testing/sysfs-bus-typec
-f:Documentation/ABI/testing/sysfs-bus-usb
-f:Documentation/ABI/testing/sysfs-bus-usb-devices-usbsevseg
-f:Documentation/ABI/testing/sysfs-bus-usb-lvstest
-f:Documentation/ABI/testing/sysfs-bus-vdpa
-f:Documentation/ABI/testing/sysfs-bus-vfio-mdev
-f:Documentation/ABI/testing/sysfs-bus-vmbus
-f:Documentation/ABI/testing/sysfs-bus-wmi
-f:Documentation/ABI/testing/sysfs-c2port
-f:Documentation/ABI/testing/sysfs-cfq-target-latency
-f:Documentation/ABI/testing/sysfs-class
-f:Documentation/ABI/testing/sysfs-class-backlight
-f:Documentation/ABI/testing/sysfs-class-backlight-driver-lm3533
-f:Documentation/ABI/testing/sysfs-class-backlight-lm3639
-f:Documentation/ABI/testing/sysfs-class-bdi
-f:Documentation/ABI/testing/sysfs-class-bsr
-f:Documentation/ABI/testing/sysfs-class-chromeos
-f:Documentation/ABI/testing/sysfs-class-chromeos-driver-cros-ec-lightbar
-f:Documentation/ABI/testing/sysfs-class-chromeos-driver-cros-ec-vbc
-f:Documentation/ABI/testing/sysfs-class-devfreq
-f:Documentation/ABI/testing/sysfs-class-devfreq-event
-f:Documentation/ABI/testing/sysfs-class-devlink
-f:Documentation/ABI/testing/sysfs-class-extcon
-f:Documentation/ABI/testing/sysfs-class-fc
-f:Documentation/ABI/testing/sysfs-class-fc_host
-f:Documentation/ABI/testing/sysfs-class-fc_remote_ports
-f:Documentation/ABI/testing/sysfs-class-firmware
-f:Documentation/ABI/testing/sysfs-class-firmware-attributes
-f:Documentation/ABI/testing/sysfs-class-fpga-bridge
-f:Documentation/ABI/testing/sysfs-class-fpga-manager
-f:Documentation/ABI/testing/sysfs-class-fpga-region
-f:Documentation/ABI/testing/sysfs-class-gnss
-f:Documentation/ABI/testing/sysfs-class-hwmon
-f:Documentation/ABI/testing/sysfs-class-intel_pmt
-f:Documentation/ABI/testing/sysfs-class-intel_pmt-features
-f:Documentation/ABI/testing/sysfs-class-iommu
-f:Documentation/ABI/testing/sysfs-class-iommu-amd-iommu
-f:Documentation/ABI/testing/sysfs-class-iommu-intel-iommu
-f:Documentation/ABI/testing/sysfs-class-lcd
-f:Documentation/ABI/testing/sysfs-class-led
-f:Documentation/ABI/testing/sysfs-class-led-driver-aw200xx
-f:Documentation/ABI/testing/sysfs-class-led-driver-lm3533
-f:Documentation/ABI/testing/sysfs-class-led-driver-turris-omnia
-f:Documentation/ABI/testing/sysfs-class-led-flash
-f:Documentation/ABI/testing/sysfs-class-led-multicolor
-f:Documentation/ABI/testing/sysfs-class-led-trigger-netdev
-f:Documentation/ABI/testing/sysfs-class-led-trigger-oneshot
-f:Documentation/ABI/testing/sysfs-class-led-trigger-pattern
-f:Documentation/ABI/testing/sysfs-class-led-trigger-tty
-f:Documentation/ABI/testing/sysfs-class-led-trigger-usbport
-f:Documentation/ABI/testing/sysfs-class-leds-gt683r
-f:Documentation/ABI/testing/sysfs-class-mei
-f:Documentation/ABI/testing/sysfs-class-mic
-f:Documentation/ABI/testing/sysfs-class-mtd
-f:Documentation/ABI/testing/sysfs-class-mux
-f:Documentation/ABI/testing/sysfs-class-net
-f:Documentation/ABI/testing/sysfs-class-net-cdc_ncm
-f:Documentation/ABI/testing/sysfs-class-net-dsa
-f:Documentation/ABI/testing/sysfs-class-net-grcan
-f:Documentation/ABI/testing/sysfs-class-net-janz-ican3
-f:Documentation/ABI/testing/sysfs-class-net-peak_usb
-f:Documentation/ABI/testing/sysfs-class-net-phydev
-f:Documentation/ABI/testing/sysfs-class-net-qmi
-f:Documentation/ABI/testing/sysfs-class-net-queues
-f:Documentation/ABI/testing/sysfs-class-net-statistics
-f:Documentation/ABI/testing/sysfs-class-ocxl
-f:Documentation/ABI/testing/sysfs-class-platform-profile
-f:Documentation/ABI/testing/sysfs-class-power
-f:Documentation/ABI/testing/sysfs-class-power-gaokun
-f:Documentation/ABI/testing/sysfs-class-power-ltc4162l
-f:Documentation/ABI/testing/sysfs-class-power-max1720x
-f:Documentation/ABI/testing/sysfs-class-power-mp2629
-f:Documentation/ABI/testing/sysfs-class-power-rt9467
-f:Documentation/ABI/testing/sysfs-class-power-rt9471
-f:Documentation/ABI/testing/sysfs-class-power-surface
-f:Documentation/ABI/testing/sysfs-class-power-twl4030
-f:Documentation/ABI/testing/sysfs-class-power-wilco
-f:Documentation/ABI/testing/sysfs-class-powercap
-f:Documentation/ABI/testing/sysfs-class-pwm
-f:Documentation/ABI/testing/sysfs-class-rapidio
-f:Documentation/ABI/testing/sysfs-class-rc
-f:Documentation/ABI/testing/sysfs-class-rc-nuvoton
-f:Documentation/ABI/testing/sysfs-class-regulator
-f:Documentation/ABI/testing/sysfs-class-remoteproc
-f:Documentation/ABI/testing/sysfs-class-rnbd-client
-f:Documentation/ABI/testing/sysfs-class-rnbd-server
-f:Documentation/ABI/testing/sysfs-class-rtc
-f:Documentation/ABI/testing/sysfs-class-rtc-rtc0-device-rtc_calibration
-f:Documentation/ABI/testing/sysfs-class-rtrs-client
-f:Documentation/ABI/testing/sysfs-class-rtrs-server
-f:Documentation/ABI/testing/sysfs-class-scsi_host
-f:Documentation/ABI/testing/sysfs-class-scsi_tape
-f:Documentation/ABI/testing/sysfs-class-spi-eeprom
-f:Documentation/ABI/testing/sysfs-class-stm
-f:Documentation/ABI/testing/sysfs-class-stm_source
-f:Documentation/ABI/testing/sysfs-class-switchtec
-f:Documentation/ABI/testing/sysfs-class-tee
-f:Documentation/ABI/testing/sysfs-class-thermal
-f:Documentation/ABI/testing/sysfs-class-typec
-f:Documentation/ABI/testing/sysfs-class-usb_power_delivery
-f:Documentation/ABI/testing/sysfs-class-usb_role
-f:Documentation/ABI/testing/sysfs-class-vduse
-f:Documentation/ABI/testing/sysfs-class-wakeup
-f:Documentation/ABI/testing/sysfs-class-watchdog
-f:Documentation/ABI/testing/sysfs-class-zram
-f:Documentation/ABI/testing/sysfs-dev
-f:Documentation/ABI/testing/sysfs-devices
-f:Documentation/ABI/testing/sysfs-devices-consumer
-f:Documentation/ABI/testing/sysfs-devices-coredump
-f:Documentation/ABI/testing/sysfs-devices-edac
-f:Documentation/ABI/testing/sysfs-devices-firmware_node
-f:Documentation/ABI/testing/sysfs-devices-lpss_ltr
-f:Documentation/ABI/testing/sysfs-devices-mapping
-f:Documentation/ABI/testing/sysfs-devices-memory
-f:Documentation/ABI/testing/sysfs-devices-mmc
-f:Documentation/ABI/testing/sysfs-devices-online
-f:Documentation/ABI/testing/sysfs-devices-physical_location
-f:Documentation/ABI/testing/sysfs-devices-platform-ACPI-TAD
-f:Documentation/ABI/testing/sysfs-devices-platform-_UDC_-gadget
-f:Documentation/ABI/testing/sysfs-devices-platform-docg3
-f:Documentation/ABI/testing/sysfs-devices-platform-dock
-f:Documentation/ABI/testing/sysfs-devices-platform-ipmi
-f:Documentation/ABI/testing/sysfs-devices-platform-kunpeng_hccs
-f:Documentation/ABI/testing/sysfs-devices-platform-sh_mobile_lcdc_fb
-f:Documentation/ABI/testing/sysfs-devices-platform-soc-ipa
-f:Documentation/ABI/testing/sysfs-devices-platform-stratix10-rsu
-f:Documentation/ABI/testing/sysfs-devices-platform-trackpoint
-f:Documentation/ABI/testing/sysfs-devices-power
-f:Documentation/ABI/testing/sysfs-devices-power_resources_D0
-f:Documentation/ABI/testing/sysfs-devices-power_resources_D1
-f:Documentation/ABI/testing/sysfs-devices-power_resources_D2
-f:Documentation/ABI/testing/sysfs-devices-power_resources_D3hot
-f:Documentation/ABI/testing/sysfs-devices-power_resources_wakeup
-f:Documentation/ABI/testing/sysfs-devices-power_state
-f:Documentation/ABI/testing/sysfs-devices-real_power_state
-f:Documentation/ABI/testing/sysfs-devices-removable
-f:Documentation/ABI/testing/sysfs-devices-resource_in_use
-f:Documentation/ABI/testing/sysfs-devices-soc
-f:Documentation/ABI/testing/sysfs-devices-software_node
-f:Documentation/ABI/testing/sysfs-devices-state_synced
-f:Documentation/ABI/testing/sysfs-devices-sun
-f:Documentation/ABI/testing/sysfs-devices-supplier
-f:Documentation/ABI/testing/sysfs-devices-system-cpu
-f:Documentation/ABI/testing/sysfs-devices-system-ibm-rtl
-f:Documentation/ABI/testing/sysfs-devices-system-xen_cpu
-f:Documentation/ABI/testing/sysfs-devices-vfio-dev
-f:Documentation/ABI/testing/sysfs-devices-virtual-misc-tdx_guest
-f:Documentation/ABI/testing/sysfs-devices-waiting_for_supplier
-f:Documentation/ABI/testing/sysfs-devices-xenbus
-f:Documentation/ABI/testing/sysfs-driver-altera-cvp
-f:Documentation/ABI/testing/sysfs-driver-amd-sfh
-f:Documentation/ABI/testing/sysfs-driver-aspeed-uart-routing
-f:Documentation/ABI/testing/sysfs-driver-bd9571mwv-regulator
-f:Documentation/ABI/testing/sysfs-driver-ccp
-f:Documentation/ABI/testing/sysfs-driver-chromeos-acpi
-f:Documentation/ABI/testing/sysfs-driver-eud
-f:Documentation/ABI/testing/sysfs-driver-fsi-master-gpio
-f:Documentation/ABI/testing/sysfs-driver-ge-achc
-f:Documentation/ABI/testing/sysfs-driver-genwqe
-f:Documentation/ABI/testing/sysfs-driver-habanalabs
-f:Documentation/ABI/testing/sysfs-driver-hid
-f:Documentation/ABI/testing/sysfs-driver-hid-appletb-kbd
-f:Documentation/ABI/testing/sysfs-driver-hid-corsair
-f:Documentation/ABI/testing/sysfs-driver-hid-corsair-void
-f:Documentation/ABI/testing/sysfs-driver-hid-lenovo
-f:Documentation/ABI/testing/sysfs-driver-hid-logitech-hidpp
-f:Documentation/ABI/testing/sysfs-driver-hid-logitech-lg4ff
-f:Documentation/ABI/testing/sysfs-driver-hid-multitouch
-f:Documentation/ABI/testing/sysfs-driver-hid-ntrig
-f:Documentation/ABI/testing/sysfs-driver-hid-picolcd
-f:Documentation/ABI/testing/sysfs-driver-hid-prodikeys
-f:Documentation/ABI/testing/sysfs-driver-hid-roccat-kone
-f:Documentation/ABI/testing/sysfs-driver-hid-srws1
-f:Documentation/ABI/testing/sysfs-driver-hid-wiimote
-f:Documentation/ABI/testing/sysfs-driver-input-axp-pek
-f:Documentation/ABI/testing/sysfs-driver-input-cros-ec-keyb
-f:Documentation/ABI/testing/sysfs-driver-input-exc3000
-f:Documentation/ABI/testing/sysfs-driver-intc_sar
-f:Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon
-f:Documentation/ABI/testing/sysfs-driver-intel-m10-bmc
-f:Documentation/ABI/testing/sysfs-driver-intel-m10-bmc-sec-update
-f:Documentation/ABI/testing/sysfs-driver-intel-rapid-start
-f:Documentation/ABI/testing/sysfs-driver-intel-xe-hwmon
-f:Documentation/ABI/testing/sysfs-driver-intel_sdsi
-f:Documentation/ABI/testing/sysfs-driver-jz4780-efuse
-f:Documentation/ABI/testing/sysfs-driver-panfrost-profiling
-f:Documentation/ABI/testing/sysfs-driver-panthor-profiling
-f:Documentation/ABI/testing/sysfs-driver-pciback
-f:Documentation/ABI/testing/sysfs-driver-ppi
-f:Documentation/ABI/testing/sysfs-driver-qaic
-f:Documentation/ABI/testing/sysfs-driver-qat
-f:Documentation/ABI/testing/sysfs-driver-qat_ras
-f:Documentation/ABI/testing/sysfs-driver-qat_rl
-f:Documentation/ABI/testing/sysfs-driver-samsung-laptop
-f:Documentation/ABI/testing/sysfs-driver-spi-intel
-f:Documentation/ABI/testing/sysfs-driver-st
-f:Documentation/ABI/testing/sysfs-driver-tegra-fuse
-f:Documentation/ABI/testing/sysfs-driver-toshiba_acpi
-f:Documentation/ABI/testing/sysfs-driver-toshiba_haps
-f:Documentation/ABI/testing/sysfs-driver-typec-displayport
-f:Documentation/ABI/testing/sysfs-driver-uacce
-f:Documentation/ABI/testing/sysfs-driver-ucsi-ccg
-f:Documentation/ABI/testing/sysfs-driver-ufs
-f:Documentation/ABI/testing/sysfs-driver-w1_ds28e17
-f:Documentation/ABI/testing/sysfs-driver-w1_therm
-f:Documentation/ABI/testing/sysfs-driver-wacom
-f:Documentation/ABI/testing/sysfs-driver-xdata
-f:Documentation/ABI/testing/sysfs-driver-xen-blkback
-f:Documentation/ABI/testing/sysfs-driver-xen-blkfront
-f:Documentation/ABI/testing/sysfs-driver-xilinx-tmr-manager
-f:Documentation/ABI/testing/sysfs-driver-zynqmp-fpga
-f:Documentation/ABI/testing/sysfs-edac-ecs
-f:Documentation/ABI/testing/sysfs-edac-memory-repair
-f:Documentation/ABI/testing/sysfs-edac-scrub
-f:Documentation/ABI/testing/sysfs-firmware-acpi
-f:Documentation/ABI/testing/sysfs-firmware-dmi-entries
-f:Documentation/ABI/testing/sysfs-firmware-dmi-tables
-f:Documentation/ABI/testing/sysfs-firmware-efi
-f:Documentation/ABI/testing/sysfs-firmware-efi-esrt
-f:Documentation/ABI/testing/sysfs-firmware-efi-runtime-map
-f:Documentation/ABI/testing/sysfs-firmware-gsmi
-f:Documentation/ABI/testing/sysfs-firmware-initrd
-f:Documentation/ABI/testing/sysfs-firmware-lefi-boardinfo
-f:Documentation/ABI/testing/sysfs-firmware-log
-f:Documentation/ABI/testing/sysfs-firmware-memmap
-f:Documentation/ABI/testing/sysfs-firmware-ofw
-f:Documentation/ABI/testing/sysfs-firmware-opal-powercap
-f:Documentation/ABI/testing/sysfs-firmware-opal-psr
-f:Documentation/ABI/testing/sysfs-firmware-opal-sensor-groups
-f:Documentation/ABI/testing/sysfs-firmware-papr-energy-scale-info
-f:Documentation/ABI/testing/sysfs-firmware-qemu_fw_cfg
-f:Documentation/ABI/testing/sysfs-firmware-sgi_uv
-f:Documentation/ABI/testing/sysfs-firmware-turris-mox-rwtm
-f:Documentation/ABI/testing/sysfs-fs-erofs
-f:Documentation/ABI/testing/sysfs-fs-ext4
-f:Documentation/ABI/testing/sysfs-fs-f2fs
-f:Documentation/ABI/testing/sysfs-fs-nilfs2
-f:Documentation/ABI/testing/sysfs-fs-ubifs
-f:Documentation/ABI/testing/sysfs-fs-virtiofs
-f:Documentation/ABI/testing/sysfs-fs-xfs
-f:Documentation/ABI/testing/sysfs-hypervisor-xen
-f:Documentation/ABI/testing/sysfs-ibft
-f:Documentation/ABI/testing/sysfs-kernel-address_bits
-f:Documentation/ABI/testing/sysfs-kernel-boot_params
-f:Documentation/ABI/testing/sysfs-kernel-btf
-f:Documentation/ABI/testing/sysfs-kernel-cpu_byteorder
-f:Documentation/ABI/testing/sysfs-kernel-dmabuf-buffers
-f:Documentation/ABI/testing/sysfs-kernel-fadump
-f:Documentation/ABI/testing/sysfs-kernel-fscaps
-f:Documentation/ABI/testing/sysfs-kernel-hardlockup_count
-f:Documentation/ABI/testing/sysfs-kernel-iommu_groups
-f:Documentation/ABI/testing/sysfs-kernel-irq
-f:Documentation/ABI/testing/sysfs-kernel-livepatch
-f:Documentation/ABI/testing/sysfs-kernel-mm
-f:Documentation/ABI/testing/sysfs-kernel-mm-cma
-f:Documentation/ABI/testing/sysfs-kernel-mm-damon
-f:Documentation/ABI/testing/sysfs-kernel-mm-hugepages
-f:Documentation/ABI/testing/sysfs-kernel-mm-ksm
-f:Documentation/ABI/testing/sysfs-kernel-mm-memory-tiers
-f:Documentation/ABI/testing/sysfs-kernel-mm-mempolicy
-f:Documentation/ABI/testing/sysfs-kernel-mm-mempolicy-weighted-interleave
-f:Documentation/ABI/testing/sysfs-kernel-mm-numa
-f:Documentation/ABI/testing/sysfs-kernel-mm-swap
-f:Documentation/ABI/testing/sysfs-kernel-mm-transparent-hugepage
-f:Documentation/ABI/testing/sysfs-kernel-oops_count
-f:Documentation/ABI/testing/sysfs-kernel-rcu_stall_count
-f:Documentation/ABI/testing/sysfs-kernel-reboot
-f:Documentation/ABI/testing/sysfs-kernel-slab
-f:Documentation/ABI/testing/sysfs-kernel-softlockup_count
-f:Documentation/ABI/testing/sysfs-kernel-vmcoreinfo
-f:Documentation/ABI/testing/sysfs-kernel-warn_count
-f:Documentation/ABI/testing/sysfs-mce
-f:Documentation/ABI/testing/sysfs-memory-page-offline
-f:Documentation/ABI/testing/sysfs-module
-f:Documentation/ABI/testing/sysfs-nvmem-cells
-f:Documentation/ABI/testing/sysfs-ocfs2
-f:Documentation/ABI/testing/sysfs-platform-alienware-wmi
-f:Documentation/ABI/testing/sysfs-platform-asus-laptop
-f:Documentation/ABI/testing/sysfs-platform-asus-wmi
-f:Documentation/ABI/testing/sysfs-platform-at91
-f:Documentation/ABI/testing/sysfs-platform-brcmstb-gisb-arb
-f:Documentation/ABI/testing/sysfs-platform-brcmstb-memc
-f:Documentation/ABI/testing/sysfs-platform-chipidea-usb-otg
-f:Documentation/ABI/testing/sysfs-platform-chipidea-usb2
-f:Documentation/ABI/testing/sysfs-platform-dell-laptop
-f:Documentation/ABI/testing/sysfs-platform-dell-privacy-wmi
-f:Documentation/ABI/testing/sysfs-platform-dell-smbios
-f:Documentation/ABI/testing/sysfs-platform-dell-wmi-ddv
-f:Documentation/ABI/testing/sysfs-platform-dfl-fme
-f:Documentation/ABI/testing/sysfs-platform-dfl-port
-f:Documentation/ABI/testing/sysfs-platform-dptf
-f:Documentation/ABI/testing/sysfs-platform-eeepc-laptop
-f:Documentation/ABI/testing/sysfs-platform-hidma
-f:Documentation/ABI/testing/sysfs-platform-hidma-mgmt
-f:Documentation/ABI/testing/sysfs-platform-i2c-demux-pinctrl
-f:Documentation/ABI/testing/sysfs-platform-ideapad-laptop
-f:Documentation/ABI/testing/sysfs-platform-intel-ifs
-f:Documentation/ABI/testing/sysfs-platform-intel-pmc
-f:Documentation/ABI/testing/sysfs-platform-intel-wmi-sbl-fw-update
-f:Documentation/ABI/testing/sysfs-platform-intel-wmi-thunderbolt
-f:Documentation/ABI/testing/sysfs-platform-kim
-f:Documentation/ABI/testing/sysfs-platform-lg-laptop
-f:Documentation/ABI/testing/sysfs-platform-mellanox-bootctl
-f:Documentation/ABI/testing/sysfs-platform-mellanox-pmc
-f:Documentation/ABI/testing/sysfs-platform-msi-laptop
-f:Documentation/ABI/testing/sysfs-platform-oxp
-f:Documentation/ABI/testing/sysfs-platform-phy-rcar-gen3-usb2
-f:Documentation/ABI/testing/sysfs-platform-power-on-reason
-f:Documentation/ABI/testing/sysfs-platform-renesas_usb3
-f:Documentation/ABI/testing/sysfs-platform-silicom
-f:Documentation/ABI/testing/sysfs-platform-sst-atom
-f:Documentation/ABI/testing/sysfs-platform-tahvo-usb
-f:Documentation/ABI/testing/sysfs-platform-ts5500
-f:Documentation/ABI/testing/sysfs-platform-twl4030-usb
-f:Documentation/ABI/testing/sysfs-platform-usbip-vudc
-f:Documentation/ABI/testing/sysfs-platform-wilco-ec
-f:Documentation/ABI/testing/sysfs-platform_profile
-f:Documentation/ABI/testing/sysfs-power
-f:Documentation/ABI/testing/sysfs-pps
-f:Documentation/ABI/testing/sysfs-pps-gen
-f:Documentation/ABI/testing/sysfs-pps-gen-tio
-f:Documentation/ABI/testing/sysfs-profiling
-f:Documentation/ABI/testing/sysfs-ptp
-f:Documentation/ABI/testing/sysfs-secvar
-f:Documentation/ABI/testing/sysfs-timecard
-f:Documentation/ABI/testing/sysfs-tty
-f:Documentation/ABI/testing/sysfs-uevent
-f:Documentation/ABI/testing/usb-charger-uevent
-f:Documentation/ABI/testing/usb-uevent
-f:Documentation/CodingStyle
-f:Documentation/Kconfig
-f:Documentation/Makefile
-f:Documentation/PCI/acpi-info.rst
-f:Documentation/PCI/boot-interrupts.rst
-f:Documentation/PCI/controller/index.rst
-f:Documentation/PCI/controller/rcar-pcie-firmware.rst
-f:Documentation/PCI/endpoint/function/binding/pci-ntb.rst
-f:Documentation/PCI/endpoint/function/binding/pci-test.rst
-f:Documentation/PCI/endpoint/index.rst
-f:Documentation/PCI/endpoint/pci-endpoint-cfs.rst
-f:Documentation/PCI/endpoint/pci-endpoint.rst
-f:Documentation/PCI/endpoint/pci-ntb-function.rst
-f:Documentation/PCI/endpoint/pci-ntb-howto.rst
-f:Documentation/PCI/endpoint/pci-nvme-function.rst
-f:Documentation/PCI/endpoint/pci-test-function.rst
-f:Documentation/PCI/endpoint/pci-test-howto.rst
-f:Documentation/PCI/endpoint/pci-vntb-function.rst
-f:Documentation/PCI/endpoint/pci-vntb-howto.rst
-f:Documentation/PCI/index.rst
-f:Documentation/PCI/msi-howto.rst
-f:Documentation/PCI/pci-error-recovery.rst
-f:Documentation/PCI/pci-iov-howto.rst
-f:Documentation/PCI/pci.rst
-f:Documentation/PCI/pcieaer-howto.rst
-f:Documentation/PCI/pciebus-howto.rst
-f:Documentation/PCI/sysfs-pci.rst
-f:Documentation/PCI/tph.rst
-f:Documentation/RCU/Design/Data-Structures/BigTreeClassicRCU.svg
-f:Documentation/RCU/Design/Data-Structures/BigTreePreemptRCUBHdyntickCB.svg
-f:Documentation/RCU/Design/Data-Structures/Data-Structures.rst
-f:Documentation/RCU/Design/Data-Structures/HugeTreeClassicRCU.svg
-f:Documentation/RCU/Design/Data-Structures/TreeLevel.svg
-f:Documentation/RCU/Design/Data-Structures/TreeMapping.svg
-f:Documentation/RCU/Design/Data-Structures/TreeMappingLevel.svg
-f:Documentation/RCU/Design/Data-Structures/blkd_task.svg
-f:Documentation/RCU/Design/Data-Structures/nxtlist.svg
-f:Documentation/RCU/Design/Expedited-Grace-Periods/ExpRCUFlow.svg
-f:Documentation/RCU/Design/Expedited-Grace-Periods/ExpSchedFlow.svg
-f:Documentation/RCU/Design/Expedited-Grace-Periods/Expedited-Grace-Periods.rst
-f:Documentation/RCU/Design/Expedited-Grace-Periods/Funnel0.svg
-f:Documentation/RCU/Design/Expedited-Grace-Periods/Funnel1.svg
-f:Documentation/RCU/Design/Expedited-Grace-Periods/Funnel2.svg
-f:Documentation/RCU/Design/Expedited-Grace-Periods/Funnel3.svg
-f:Documentation/RCU/Design/Expedited-Grace-Periods/Funnel4.svg
-f:Documentation/RCU/Design/Expedited-Grace-Periods/Funnel5.svg
-f:Documentation/RCU/Design/Expedited-Grace-Periods/Funnel6.svg
-f:Documentation/RCU/Design/Expedited-Grace-Periods/Funnel7.svg
-f:Documentation/RCU/Design/Expedited-Grace-Periods/Funnel8.svg
-f:Documentation/RCU/Design/Memory-Ordering/Tree-RCU-Memory-Ordering.rst
-f:Documentation/RCU/Design/Memory-Ordering/TreeRCU-callback-invocation.svg
-f:Documentation/RCU/Design/Memory-Ordering/TreeRCU-callback-registry.svg
-f:Documentation/RCU/Design/Memory-Ordering/TreeRCU-dyntick.svg
-f:Documentation/RCU/Design/Memory-Ordering/TreeRCU-gp-cleanup.svg
-f:Documentation/RCU/Design/Memory-Ordering/TreeRCU-gp-fqs.svg
-f:Documentation/RCU/Design/Memory-Ordering/TreeRCU-gp-init-1.svg
-f:Documentation/RCU/Design/Memory-Ordering/TreeRCU-gp-init-2.svg
-f:Documentation/RCU/Design/Memory-Ordering/TreeRCU-gp-init-3.svg
-f:Documentation/RCU/Design/Memory-Ordering/TreeRCU-gp.svg
-f:Documentation/RCU/Design/Memory-Ordering/TreeRCU-hotplug.svg
-f:Documentation/RCU/Design/Memory-Ordering/TreeRCU-qs.svg
-f:Documentation/RCU/Design/Memory-Ordering/rcu_node-lock.svg
-f:Documentation/RCU/Design/Requirements/GPpartitionReaders1.svg
-f:Documentation/RCU/Design/Requirements/ReadersPartitionGP1.svg
-f:Documentation/RCU/Design/Requirements/Requirements.rst
-f:Documentation/RCU/NMI-RCU.rst
-f:Documentation/RCU/RTFP.txt
-f:Documentation/RCU/UP.rst
-f:Documentation/RCU/checklist.rst
-f:Documentation/RCU/index.rst
-f:Documentation/RCU/listRCU.rst
-f:Documentation/RCU/lockdep-splat.rst
-f:Documentation/RCU/lockdep.rst
-f:Documentation/RCU/rcu.rst
-f:Documentation/RCU/rcu_dereference.rst
-f:Documentation/RCU/rcubarrier.rst
-f:Documentation/RCU/rculist_nulls.rst
-f:Documentation/RCU/rcuref.rst
-f:Documentation/RCU/stallwarn.rst
-f:Documentation/RCU/torture.rst
-f:Documentation/RCU/whatisRCU.rst
-f:Documentation/SubmittingPatches
-f:Documentation/accel/amdxdna/amdnpu.rst
-f:Documentation/accel/amdxdna/index.rst
-f:Documentation/accel/index.rst
-f:Documentation/accel/introduction.rst
-f:Documentation/accel/qaic/aic080.rst
-f:Documentation/accel/qaic/aic100.rst
-f:Documentation/accel/qaic/index.rst
-f:Documentation/accel/qaic/qaic.rst
-f:Documentation/accounting/cgroupstats.rst
-f:Documentation/accounting/delay-accounting.rst
-f:Documentation/accounting/index.rst
-f:Documentation/accounting/psi.rst
-f:Documentation/accounting/taskstats-struct.rst
-f:Documentation/accounting/taskstats.rst
-f:Documentation/admin-guide/LSM/LoadPin.rst
-f:Documentation/admin-guide/LSM/SELinux.rst
-f:Documentation/admin-guide/LSM/SafeSetID.rst
-f:Documentation/admin-guide/LSM/Smack.rst
-f:Documentation/admin-guide/LSM/Yama.rst
-f:Documentation/admin-guide/LSM/apparmor.rst
-f:Documentation/admin-guide/LSM/index.rst
-f:Documentation/admin-guide/LSM/ipe.rst
-f:Documentation/admin-guide/LSM/landlock.rst
-f:Documentation/admin-guide/LSM/tomoyo.rst
-f:Documentation/admin-guide/RAS/address-translation.rst
-f:Documentation/admin-guide/RAS/error-decoding.rst
-f:Documentation/admin-guide/RAS/index.rst
-f:Documentation/admin-guide/RAS/main.rst
-f:Documentation/admin-guide/README.rst
-f:Documentation/admin-guide/abi-obsolete-files.rst
-f:Documentation/admin-guide/abi-obsolete.rst
-f:Documentation/admin-guide/abi-removed-files.rst
-f:Documentation/admin-guide/abi-removed.rst
-f:Documentation/admin-guide/abi-stable-files.rst
-f:Documentation/admin-guide/abi-stable.rst
-f:Documentation/admin-guide/abi-testing-files.rst
-f:Documentation/admin-guide/abi-testing.rst
-f:Documentation/admin-guide/abi.rst
-f:Documentation/admin-guide/acpi/cppc_sysfs.rst
-f:Documentation/admin-guide/acpi/fan_performance_states.rst
-f:Documentation/admin-guide/acpi/index.rst
-f:Documentation/admin-guide/acpi/initrd_table_override.rst
-f:Documentation/admin-guide/acpi/ssdt-overlays.rst
-f:Documentation/admin-guide/aoe/aoe.rst
-f:Documentation/admin-guide/aoe/autoload.sh
-f:Documentation/admin-guide/aoe/examples.rst
-f:Documentation/admin-guide/aoe/index.rst
-f:Documentation/admin-guide/aoe/status.sh
-f:Documentation/admin-guide/aoe/todo.rst
-f:Documentation/admin-guide/aoe/udev-install.sh
-f:Documentation/admin-guide/aoe/udev.txt
-f:Documentation/admin-guide/auxdisplay/cfag12864b.rst
-f:Documentation/admin-guide/auxdisplay/index.rst
-f:Documentation/admin-guide/auxdisplay/ks0108.rst
-f:Documentation/admin-guide/bcache.rst
-f:Documentation/admin-guide/binderfs.rst
-f:Documentation/admin-guide/binfmt-misc.rst
-f:Documentation/admin-guide/blockdev/drbd/DRBD-8.3-data-packets.svg
-f:Documentation/admin-guide/blockdev/drbd/DRBD-data-packets.svg
-f:Documentation/admin-guide/blockdev/drbd/conn-states-8.dot
-f:Documentation/admin-guide/blockdev/drbd/data-structure-v9.rst
-f:Documentation/admin-guide/blockdev/drbd/disk-states-8.dot
-f:Documentation/admin-guide/blockdev/drbd/drbd-connection-state-overview.dot
-f:Documentation/admin-guide/blockdev/drbd/figures.rst
-f:Documentation/admin-guide/blockdev/drbd/index.rst
-f:Documentation/admin-guide/blockdev/drbd/peer-states-8.dot
-f:Documentation/admin-guide/blockdev/floppy.rst
-f:Documentation/admin-guide/blockdev/index.rst
-f:Documentation/admin-guide/blockdev/nbd.rst
-f:Documentation/admin-guide/blockdev/paride.rst
-f:Documentation/admin-guide/blockdev/ramdisk.rst
-f:Documentation/admin-guide/blockdev/zoned_loop.rst
-f:Documentation/admin-guide/blockdev/zram.rst
-f:Documentation/admin-guide/bootconfig.rst
-f:Documentation/admin-guide/braille-console.rst
-f:Documentation/admin-guide/btmrvl.rst
-f:Documentation/admin-guide/bug-bisect.rst
-f:Documentation/admin-guide/bug-hunting.rst
-f:Documentation/admin-guide/cgroup-v1/blkio-controller.rst
-f:Documentation/admin-guide/cgroup-v1/cgroups.rst
-f:Documentation/admin-guide/cgroup-v1/cpuacct.rst
-f:Documentation/admin-guide/cgroup-v1/cpusets.rst
-f:Documentation/admin-guide/cgroup-v1/devices.rst
-f:Documentation/admin-guide/cgroup-v1/freezer-subsystem.rst
-f:Documentation/admin-guide/cgroup-v1/hugetlb.rst
-f:Documentation/admin-guide/cgroup-v1/index.rst
-f:Documentation/admin-guide/cgroup-v1/memcg_test.rst
-f:Documentation/admin-guide/cgroup-v1/memory.rst
-f:Documentation/admin-guide/cgroup-v1/misc.rst
-f:Documentation/admin-guide/cgroup-v1/net_cls.rst
-f:Documentation/admin-guide/cgroup-v1/net_prio.rst
-f:Documentation/admin-guide/cgroup-v1/pids.rst
-f:Documentation/admin-guide/cgroup-v1/rdma.rst
-f:Documentation/admin-guide/cgroup-v2.rst
-f:Documentation/admin-guide/cifs/authors.rst
-f:Documentation/admin-guide/cifs/changes.rst
-f:Documentation/admin-guide/cifs/index.rst
-f:Documentation/admin-guide/cifs/introduction.rst
-f:Documentation/admin-guide/cifs/todo.rst
-f:Documentation/admin-guide/cifs/usage.rst
-f:Documentation/admin-guide/cifs/winucase_convert.pl
-f:Documentation/admin-guide/clearing-warn-once.rst
-f:Documentation/admin-guide/cpu-load.rst
-f:Documentation/admin-guide/cputopology.rst
-f:Documentation/admin-guide/dell_rbu.rst
-f:Documentation/admin-guide/device-mapper/cache-policies.rst
-f:Documentation/admin-guide/device-mapper/cache.rst
-f:Documentation/admin-guide/device-mapper/delay.rst
-f:Documentation/admin-guide/device-mapper/dm-clone.rst
-f:Documentation/admin-guide/device-mapper/dm-crypt.rst
-f:Documentation/admin-guide/device-mapper/dm-dust.rst
-f:Documentation/admin-guide/device-mapper/dm-ebs.rst
-f:Documentation/admin-guide/device-mapper/dm-flakey.rst
-f:Documentation/admin-guide/device-mapper/dm-ima.rst
-f:Documentation/admin-guide/device-mapper/dm-init.rst
-f:Documentation/admin-guide/device-mapper/dm-integrity.rst
-f:Documentation/admin-guide/device-mapper/dm-io.rst
-f:Documentation/admin-guide/device-mapper/dm-log.rst
-f:Documentation/admin-guide/device-mapper/dm-queue-length.rst
-f:Documentation/admin-guide/device-mapper/dm-raid.rst
-f:Documentation/admin-guide/device-mapper/dm-service-time.rst
-f:Documentation/admin-guide/device-mapper/dm-uevent.rst
-f:Documentation/admin-guide/device-mapper/dm-zoned.rst
-f:Documentation/admin-guide/device-mapper/era.rst
-f:Documentation/admin-guide/device-mapper/index.rst
-f:Documentation/admin-guide/device-mapper/kcopyd.rst
-f:Documentation/admin-guide/device-mapper/linear.rst
-f:Documentation/admin-guide/device-mapper/log-writes.rst
-f:Documentation/admin-guide/device-mapper/persistent-data.rst
-f:Documentation/admin-guide/device-mapper/snapshot.rst
-f:Documentation/admin-guide/device-mapper/statistics.rst
-f:Documentation/admin-guide/device-mapper/striped.rst
-f:Documentation/admin-guide/device-mapper/switch.rst
-f:Documentation/admin-guide/device-mapper/thin-provisioning.rst
-f:Documentation/admin-guide/device-mapper/unstriped.rst
-f:Documentation/admin-guide/device-mapper/vdo-design.rst
-f:Documentation/admin-guide/device-mapper/vdo.rst
-f:Documentation/admin-guide/device-mapper/verity.rst
-f:Documentation/admin-guide/device-mapper/writecache.rst
-f:Documentation/admin-guide/device-mapper/zero.rst
-f:Documentation/admin-guide/devices.rst
-f:Documentation/admin-guide/devices.txt
-f:Documentation/admin-guide/dynamic-debug-howto.rst
-f:Documentation/admin-guide/edid.rst
-f:Documentation/admin-guide/efi-stub.rst
-f:Documentation/admin-guide/ext4.rst
-f:Documentation/admin-guide/features.rst
-f:Documentation/admin-guide/filesystem-monitoring.rst
-f:Documentation/admin-guide/gpio/gpio-aggregator.rst
-f:Documentation/admin-guide/gpio/gpio-mockup.rst
-f:Documentation/admin-guide/gpio/gpio-sim.rst
-f:Documentation/admin-guide/gpio/gpio-virtuser.rst
-f:Documentation/admin-guide/gpio/index.rst
-f:Documentation/admin-guide/gpio/obsolete.rst
-f:Documentation/admin-guide/hw-vuln/attack_vector_controls.rst
-f:Documentation/admin-guide/hw-vuln/core-scheduling.rst
-f:Documentation/admin-guide/hw-vuln/cross-thread-rsb.rst
-f:Documentation/admin-guide/hw-vuln/gather_data_sampling.rst
-f:Documentation/admin-guide/hw-vuln/index.rst
-f:Documentation/admin-guide/hw-vuln/indirect-target-selection.rst
-f:Documentation/admin-guide/hw-vuln/l1d_flush.rst
-f:Documentation/admin-guide/hw-vuln/l1tf.rst
-f:Documentation/admin-guide/hw-vuln/mds.rst
-f:Documentation/admin-guide/hw-vuln/multihit.rst
-f:Documentation/admin-guide/hw-vuln/old_microcode.rst
-f:Documentation/admin-guide/hw-vuln/processor_mmio_stale_data.rst
-f:Documentation/admin-guide/hw-vuln/reg-file-data-sampling.rst
-f:Documentation/admin-guide/hw-vuln/rsb.rst
-f:Documentation/admin-guide/hw-vuln/special-register-buffer-data-sampling.rst
-f:Documentation/admin-guide/hw-vuln/spectre.rst
-f:Documentation/admin-guide/hw-vuln/srso.rst
-f:Documentation/admin-guide/hw-vuln/tsx_async_abort.rst
-f:Documentation/admin-guide/hw_random.rst
-f:Documentation/admin-guide/index.rst
-f:Documentation/admin-guide/init.rst
-f:Documentation/admin-guide/initrd.rst
-f:Documentation/admin-guide/iostats.rst
-f:Documentation/admin-guide/java.rst
-f:Documentation/admin-guide/jfs.rst
-f:Documentation/admin-guide/kdump/gdbmacros.txt
-f:Documentation/admin-guide/kdump/index.rst
-f:Documentation/admin-guide/kdump/kdump.rst
-f:Documentation/admin-guide/kdump/vmcoreinfo.rst
-f:Documentation/admin-guide/kernel-parameters.rst
-f:Documentation/admin-guide/kernel-parameters.txt
-f:Documentation/admin-guide/kernel-per-CPU-kthreads.rst
-f:Documentation/admin-guide/laptops/alienware-wmi.rst
-f:Documentation/admin-guide/laptops/asus-laptop.rst
-f:Documentation/admin-guide/laptops/disk-shock-protection.rst
-f:Documentation/admin-guide/laptops/index.rst
-f:Documentation/admin-guide/laptops/laptop-mode.rst
-f:Documentation/admin-guide/laptops/lg-laptop.rst
-f:Documentation/admin-guide/laptops/samsung-galaxybook.rst
-f:Documentation/admin-guide/laptops/sony-laptop.rst
-f:Documentation/admin-guide/laptops/sonypi.rst
-f:Documentation/admin-guide/laptops/thinkpad-acpi.rst
-f:Documentation/admin-guide/laptops/toshiba_haps.rst
-f:Documentation/admin-guide/lcd-panel-cgram.rst
-f:Documentation/admin-guide/ldm.rst
-f:Documentation/admin-guide/lockup-watchdogs.rst
-f:Documentation/admin-guide/md.rst
-f:Documentation/admin-guide/media/au0828-cardlist.rst
-f:Documentation/admin-guide/media/avermedia.rst
-f:Documentation/admin-guide/media/bt8xx.rst
-f:Documentation/admin-guide/media/bttv-cardlist.rst
-f:Documentation/admin-guide/media/bttv.rst
-f:Documentation/admin-guide/media/building.rst
-f:Documentation/admin-guide/media/c3-isp.dot
-f:Documentation/admin-guide/media/c3-isp.rst
-f:Documentation/admin-guide/media/cafe_ccic.rst
-f:Documentation/admin-guide/media/cardlist.rst
-f:Documentation/admin-guide/media/cec.rst
-f:Documentation/admin-guide/media/ci.rst
-f:Documentation/admin-guide/media/cx18-cardlist.rst
-f:Documentation/admin-guide/media/cx231xx-cardlist.rst
-f:Documentation/admin-guide/media/cx23885-cardlist.rst
-f:Documentation/admin-guide/media/cx88-cardlist.rst
-f:Documentation/admin-guide/media/cx88.rst
-f:Documentation/admin-guide/media/dvb-drivers.rst
-f:Documentation/admin-guide/media/dvb-usb-a800-cardlist.rst
-f:Documentation/admin-guide/media/dvb-usb-af9005-cardlist.rst
-f:Documentation/admin-guide/media/dvb-usb-af9015-cardlist.rst
-f:Documentation/admin-guide/media/dvb-usb-af9035-cardlist.rst
-f:Documentation/admin-guide/media/dvb-usb-anysee-cardlist.rst
-f:Documentation/admin-guide/media/dvb-usb-au6610-cardlist.rst
-f:Documentation/admin-guide/media/dvb-usb-az6007-cardlist.rst
-f:Documentation/admin-guide/media/dvb-usb-az6027-cardlist.rst
-f:Documentation/admin-guide/media/dvb-usb-ce6230-cardlist.rst
-f:Documentation/admin-guide/media/dvb-usb-cinergyT2-cardlist.rst
-f:Documentation/admin-guide/media/dvb-usb-cxusb-cardlist.rst
-f:Documentation/admin-guide/media/dvb-usb-dib0700-cardlist.rst
-f:Documentation/admin-guide/media/dvb-usb-dibusb-mb-cardlist.rst
-f:Documentation/admin-guide/media/dvb-usb-dibusb-mc-cardlist.rst
-f:Documentation/admin-guide/media/dvb-usb-digitv-cardlist.rst
-f:Documentation/admin-guide/media/dvb-usb-dtt200u-cardlist.rst
-f:Documentation/admin-guide/media/dvb-usb-dtv5100-cardlist.rst
-f:Documentation/admin-guide/media/dvb-usb-dvbsky-cardlist.rst
-f:Documentation/admin-guide/media/dvb-usb-dw2102-cardlist.rst
-f:Documentation/admin-guide/media/dvb-usb-ec168-cardlist.rst
-f:Documentation/admin-guide/media/dvb-usb-gl861-cardlist.rst
-f:Documentation/admin-guide/media/dvb-usb-gp8psk-cardlist.rst
-f:Documentation/admin-guide/media/dvb-usb-lmedm04-cardlist.rst
-f:Documentation/admin-guide/media/dvb-usb-m920x-cardlist.rst
-f:Documentation/admin-guide/media/dvb-usb-mxl111sf-cardlist.rst
-f:Documentation/admin-guide/media/dvb-usb-nova-t-usb2-cardlist.rst
-f:Documentation/admin-guide/media/dvb-usb-opera1-cardlist.rst
-f:Documentation/admin-guide/media/dvb-usb-pctv452e-cardlist.rst
-f:Documentation/admin-guide/media/dvb-usb-rtl28xxu-cardlist.rst
-f:Documentation/admin-guide/media/dvb-usb-technisat-usb2-cardlist.rst
-f:Documentation/admin-guide/media/dvb-usb-ttusb2-cardlist.rst
-f:Documentation/admin-guide/media/dvb-usb-umt-010-cardlist.rst
-f:Documentation/admin-guide/media/dvb-usb-vp702x-cardlist.rst
-f:Documentation/admin-guide/media/dvb-usb-vp7045-cardlist.rst
-f:Documentation/admin-guide/media/dvb-usb-zd1301-cardlist.rst
-f:Documentation/admin-guide/media/dvb.rst
-f:Documentation/admin-guide/media/dvb_intro.rst
-f:Documentation/admin-guide/media/dvb_references.rst
-f:Documentation/admin-guide/media/em28xx-cardlist.rst
-f:Documentation/admin-guide/media/faq.rst
-f:Documentation/admin-guide/media/fimc.rst
-f:Documentation/admin-guide/media/frontend-cardlist.rst
-f:Documentation/admin-guide/media/gspca-cardlist.rst
-f:Documentation/admin-guide/media/i2c-cardlist.rst
-f:Documentation/admin-guide/media/imx.rst
-f:Documentation/admin-guide/media/imx6q-sabreauto.dot
-f:Documentation/admin-guide/media/imx6q-sabresd.dot
-f:Documentation/admin-guide/media/imx7.rst
-f:Documentation/admin-guide/media/index.rst
-f:Documentation/admin-guide/media/intro.rst
-f:Documentation/admin-guide/media/ipu3.rst
-f:Documentation/admin-guide/media/ipu3_rcb.svg
-f:Documentation/admin-guide/media/ipu6-isys.rst
-f:Documentation/admin-guide/media/ipu6_isys_graph.svg
-f:Documentation/admin-guide/media/ivtv-cardlist.rst
-f:Documentation/admin-guide/media/ivtv.rst
-f:Documentation/admin-guide/media/lmedm04.rst
-f:Documentation/admin-guide/media/mgb4.rst
-f:Documentation/admin-guide/media/misc-cardlist.rst
-f:Documentation/admin-guide/media/omap3isp.rst
-f:Documentation/admin-guide/media/opera-firmware.rst
-f:Documentation/admin-guide/media/other-usb-cardlist.rst
-f:Documentation/admin-guide/media/pci-cardlist.rst
-f:Documentation/admin-guide/media/philips.rst
-f:Documentation/admin-guide/media/platform-cardlist.rst
-f:Documentation/admin-guide/media/qcom_camss.rst
-f:Documentation/admin-guide/media/qcom_camss_8x96_graph.dot
-f:Documentation/admin-guide/media/qcom_camss_graph.dot
-f:Documentation/admin-guide/media/radio-cardlist.rst
-f:Documentation/admin-guide/media/raspberrypi-pisp-be.dot
-f:Documentation/admin-guide/media/raspberrypi-pisp-be.rst
-f:Documentation/admin-guide/media/raspberrypi-rp1-cfe.dot
-f:Documentation/admin-guide/media/raspberrypi-rp1-cfe.rst
-f:Documentation/admin-guide/media/rcar-fdp1.rst
-f:Documentation/admin-guide/media/remote-controller.rst
-f:Documentation/admin-guide/media/rkisp1.dot
-f:Documentation/admin-guide/media/rkisp1.rst
-f:Documentation/admin-guide/media/saa7134-cardlist.rst
-f:Documentation/admin-guide/media/saa7134.rst
-f:Documentation/admin-guide/media/saa7164-cardlist.rst
-f:Documentation/admin-guide/media/si470x.rst
-f:Documentation/admin-guide/media/si4713.rst
-f:Documentation/admin-guide/media/si476x.rst
-f:Documentation/admin-guide/media/siano-cardlist.rst
-f:Documentation/admin-guide/media/starfive_camss.rst
-f:Documentation/admin-guide/media/starfive_camss_graph.dot
-f:Documentation/admin-guide/media/technisat.rst
-f:Documentation/admin-guide/media/ttusb-dec.rst
-f:Documentation/admin-guide/media/tuner-cardlist.rst
-f:Documentation/admin-guide/media/usb-cardlist.rst
-f:Documentation/admin-guide/media/v4l-drivers.rst
-f:Documentation/admin-guide/media/vimc.dot
-f:Documentation/admin-guide/media/vimc.rst
-f:Documentation/admin-guide/media/visl.rst
-f:Documentation/admin-guide/media/vivid.rst
-f:Documentation/admin-guide/media/zoran-cardlist.rst
-f:Documentation/admin-guide/mm/cma_debugfs.rst
-f:Documentation/admin-guide/mm/concepts.rst
-f:Documentation/admin-guide/mm/damon/index.rst
-f:Documentation/admin-guide/mm/damon/lru_sort.rst
-f:Documentation/admin-guide/mm/damon/reclaim.rst
-f:Documentation/admin-guide/mm/damon/start.rst
-f:Documentation/admin-guide/mm/damon/stat.rst
-f:Documentation/admin-guide/mm/damon/usage.rst
-f:Documentation/admin-guide/mm/hugetlbpage.rst
-f:Documentation/admin-guide/mm/idle_page_tracking.rst
-f:Documentation/admin-guide/mm/index.rst
-f:Documentation/admin-guide/mm/kho.rst
-f:Documentation/admin-guide/mm/ksm.rst
-f:Documentation/admin-guide/mm/memory-hotplug.rst
-f:Documentation/admin-guide/mm/multigen_lru.rst
-f:Documentation/admin-guide/mm/nommu-mmap.rst
-f:Documentation/admin-guide/mm/numa_memory_policy.rst
-f:Documentation/admin-guide/mm/numaperf.rst
-f:Documentation/admin-guide/mm/pagemap.rst
-f:Documentation/admin-guide/mm/shrinker_debugfs.rst
-f:Documentation/admin-guide/mm/slab.rst
-f:Documentation/admin-guide/mm/soft-dirty.rst
-f:Documentation/admin-guide/mm/swap_numa.rst
-f:Documentation/admin-guide/mm/transhuge.rst
-f:Documentation/admin-guide/mm/userfaultfd.rst
-f:Documentation/admin-guide/mm/zswap.rst
-f:Documentation/admin-guide/module-signing.rst
-f:Documentation/admin-guide/mono.rst
-f:Documentation/admin-guide/namespaces/compatibility-list.rst
-f:Documentation/admin-guide/namespaces/index.rst
-f:Documentation/admin-guide/namespaces/resource-control.rst
-f:Documentation/admin-guide/nfs/index.rst
-f:Documentation/admin-guide/nfs/nfs-client.rst
-f:Documentation/admin-guide/nfs/nfs-idmapper.rst
-f:Documentation/admin-guide/nfs/nfs-rdma.rst
-f:Documentation/admin-guide/nfs/nfsd-admin-interfaces.rst
-f:Documentation/admin-guide/nfs/nfsroot.rst
-f:Documentation/admin-guide/nfs/pnfs-block-server.rst
-f:Documentation/admin-guide/nfs/pnfs-scsi-server.rst
-f:Documentation/admin-guide/numastat.rst
-f:Documentation/admin-guide/nvme-multipath.rst
-f:Documentation/admin-guide/parport.rst
-f:Documentation/admin-guide/perf-security.rst
-f:Documentation/admin-guide/perf/alibaba_pmu.rst
-f:Documentation/admin-guide/perf/ampere_cspmu.rst
-f:Documentation/admin-guide/perf/arm-ccn.rst
-f:Documentation/admin-guide/perf/arm-cmn.rst
-f:Documentation/admin-guide/perf/arm-ni.rst
-f:Documentation/admin-guide/perf/arm_dsu_pmu.rst
-f:Documentation/admin-guide/perf/cxl.rst
-f:Documentation/admin-guide/perf/dwc_pcie_pmu.rst
-f:Documentation/admin-guide/perf/hisi-pcie-pmu.rst
-f:Documentation/admin-guide/perf/hisi-pmu.rst
-f:Documentation/admin-guide/perf/hns3-pmu.rst
-f:Documentation/admin-guide/perf/imx-ddr.rst
-f:Documentation/admin-guide/perf/index.rst
-f:Documentation/admin-guide/perf/meson-ddr-pmu.rst
-f:Documentation/admin-guide/perf/mrvl-odyssey-ddr-pmu.rst
-f:Documentation/admin-guide/perf/mrvl-odyssey-tad-pmu.rst
-f:Documentation/admin-guide/perf/mrvl-pem-pmu.rst
-f:Documentation/admin-guide/perf/nvidia-pmu.rst
-f:Documentation/admin-guide/perf/qcom_l2_pmu.rst
-f:Documentation/admin-guide/perf/qcom_l3_pmu.rst
-f:Documentation/admin-guide/perf/starfive_starlink_pmu.rst
-f:Documentation/admin-guide/perf/thunderx2-pmu.rst
-f:Documentation/admin-guide/perf/xgene-pmu.rst
-f:Documentation/admin-guide/pm/amd-pstate.rst
-f:Documentation/admin-guide/pm/cpufreq.rst
-f:Documentation/admin-guide/pm/cpufreq_drivers.rst
-f:Documentation/admin-guide/pm/cpuidle.rst
-f:Documentation/admin-guide/pm/index.rst
-f:Documentation/admin-guide/pm/intel-speed-select.rst
-f:Documentation/admin-guide/pm/intel_epb.rst
-f:Documentation/admin-guide/pm/intel_idle.rst
-f:Documentation/admin-guide/pm/intel_pstate.rst
-f:Documentation/admin-guide/pm/intel_uncore_frequency_scaling.rst
-f:Documentation/admin-guide/pm/sleep-states.rst
-f:Documentation/admin-guide/pm/strategies.rst
-f:Documentation/admin-guide/pm/suspend-flows.rst
-f:Documentation/admin-guide/pm/system-wide.rst
-f:Documentation/admin-guide/pm/working-state.rst
-f:Documentation/admin-guide/pnp.rst
-f:Documentation/admin-guide/pstore-blk.rst
-f:Documentation/admin-guide/quickly-build-trimmed-linux.rst
-f:Documentation/admin-guide/ramoops.rst
-f:Documentation/admin-guide/rapidio.rst
-f:Documentation/admin-guide/reporting-issues.rst
-f:Documentation/admin-guide/reporting-regressions.rst
-f:Documentation/admin-guide/rtc.rst
-f:Documentation/admin-guide/serial-console.rst
-f:Documentation/admin-guide/spkguide.txt
-f:Documentation/admin-guide/svga.rst
-f:Documentation/admin-guide/syscall-user-dispatch.rst
-f:Documentation/admin-guide/sysctl/abi.rst
-f:Documentation/admin-guide/sysctl/fs.rst
-f:Documentation/admin-guide/sysctl/index.rst
-f:Documentation/admin-guide/sysctl/kernel.rst
-f:Documentation/admin-guide/sysctl/net.rst
-f:Documentation/admin-guide/sysctl/sunrpc.rst
-f:Documentation/admin-guide/sysctl/user.rst
-f:Documentation/admin-guide/sysctl/vm.rst
-f:Documentation/admin-guide/sysfs-rules.rst
-f:Documentation/admin-guide/sysrq.rst
-f:Documentation/admin-guide/tainted-kernels.rst
-f:Documentation/admin-guide/thermal/index.rst
-f:Documentation/admin-guide/thermal/intel_powerclamp.rst
-f:Documentation/admin-guide/thunderbolt.rst
-f:Documentation/admin-guide/ufs.rst
-f:Documentation/admin-guide/unicode.rst
-f:Documentation/admin-guide/verify-bugs-and-bisect-regressions.rst
-f:Documentation/admin-guide/vga-softcursor.rst
-f:Documentation/admin-guide/video-output.rst
-f:Documentation/admin-guide/workload-tracing.rst
-f:Documentation/admin-guide/xfs.rst
-f:Documentation/arch/arc/arc.rst
-f:Documentation/arch/arc/features.rst
-f:Documentation/arch/arc/index.rst
-f:Documentation/arch/arm/arm.rst
-f:Documentation/arch/arm/booting.rst
-f:Documentation/arch/arm/cluster-pm-race-avoidance.rst
-f:Documentation/arch/arm/features.rst
-f:Documentation/arch/arm/firmware.rst
-f:Documentation/arch/arm/google/chromebook-boot-flow.rst
-f:Documentation/arch/arm/index.rst
-f:Documentation/arch/arm/interrupts.rst
-f:Documentation/arch/arm/ixp4xx.rst
-f:Documentation/arch/arm/kernel_mode_neon.rst
-f:Documentation/arch/arm/kernel_user_helpers.rst
-f:Documentation/arch/arm/keystone/knav-qmss.rst
-f:Documentation/arch/arm/keystone/overview.rst
-f:Documentation/arch/arm/marvell.rst
-f:Documentation/arch/arm/mem_alignment.rst
-f:Documentation/arch/arm/memory.rst
-f:Documentation/arch/arm/microchip.rst
-f:Documentation/arch/arm/netwinder.rst
-f:Documentation/arch/arm/nwfpe/index.rst
-f:Documentation/arch/arm/nwfpe/netwinder-fpe.rst
-f:Documentation/arch/arm/nwfpe/notes.rst
-f:Documentation/arch/arm/nwfpe/nwfpe.rst
-f:Documentation/arch/arm/nwfpe/todo.rst
-f:Documentation/arch/arm/omap/dss.rst
-f:Documentation/arch/arm/omap/index.rst
-f:Documentation/arch/arm/omap/omap.rst
-f:Documentation/arch/arm/omap/omap_pm.rst
-f:Documentation/arch/arm/porting.rst
-f:Documentation/arch/arm/pxa/mfp.rst
-f:Documentation/arch/arm/sa1100/assabet.rst
-f:Documentation/arch/arm/sa1100/cerf.rst
-f:Documentation/arch/arm/sa1100/index.rst
-f:Documentation/arch/arm/sa1100/lart.rst
-f:Documentation/arch/arm/sa1100/serial_uart.rst
-f:Documentation/arch/arm/samsung/bootloader-interface.rst
-f:Documentation/arch/arm/samsung/clksrc-change-registers.awk
-f:Documentation/arch/arm/samsung/gpio.rst
-f:Documentation/arch/arm/samsung/index.rst
-f:Documentation/arch/arm/samsung/overview.rst
-f:Documentation/arch/arm/setup.rst
-f:Documentation/arch/arm/spear/overview.rst
-f:Documentation/arch/arm/sti/overview.rst
-f:Documentation/arch/arm/sti/stih407-overview.rst
-f:Documentation/arch/arm/sti/stih418-overview.rst
-f:Documentation/arch/arm/stm32/overview.rst
-f:Documentation/arch/arm/stm32/stm32-dma-mdma-chaining.rst
-f:Documentation/arch/arm/stm32/stm32f429-overview.rst
-f:Documentation/arch/arm/stm32/stm32f746-overview.rst
-f:Documentation/arch/arm/stm32/stm32f769-overview.rst
-f:Documentation/arch/arm/stm32/stm32h743-overview.rst
-f:Documentation/arch/arm/stm32/stm32h750-overview.rst
-f:Documentation/arch/arm/stm32/stm32mp13-overview.rst
-f:Documentation/arch/arm/stm32/stm32mp151-overview.rst
-f:Documentation/arch/arm/stm32/stm32mp157-overview.rst
-f:Documentation/arch/arm/sunxi.rst
-f:Documentation/arch/arm/sunxi/clocks.rst
-f:Documentation/arch/arm/swp_emulation.rst
-f:Documentation/arch/arm/tcm.rst
-f:Documentation/arch/arm/uefi.rst
-f:Documentation/arch/arm/vfp/release-notes.rst
-f:Documentation/arch/arm/vlocks.rst
-f:Documentation/arch/arm64/acpi_object_usage.rst
-f:Documentation/arch/arm64/amu.rst
-f:Documentation/arch/arm64/arm-acpi.rst
-f:Documentation/arch/arm64/arm-cca.rst
-f:Documentation/arch/arm64/asymmetric-32bit.rst
-f:Documentation/arch/arm64/booting.rst
-f:Documentation/arch/arm64/cpu-feature-registers.rst
-f:Documentation/arch/arm64/cpu-hotplug.rst
-f:Documentation/arch/arm64/elf_hwcaps.rst
-f:Documentation/arch/arm64/features.rst
-f:Documentation/arch/arm64/gcs.rst
-f:Documentation/arch/arm64/hugetlbpage.rst
-f:Documentation/arch/arm64/index.rst
-f:Documentation/arch/arm64/kasan-offsets.sh
-f:Documentation/arch/arm64/kdump.rst
-f:Documentation/arch/arm64/legacy_instructions.rst
-f:Documentation/arch/arm64/memory-tagging-extension.rst
-f:Documentation/arch/arm64/memory.rst
-f:Documentation/arch/arm64/mops.rst
-f:Documentation/arch/arm64/perf.rst
-f:Documentation/arch/arm64/pointer-authentication.rst
-f:Documentation/arch/arm64/ptdump.rst
-f:Documentation/arch/arm64/silicon-errata.rst
-f:Documentation/arch/arm64/sme.rst
-f:Documentation/arch/arm64/sve.rst
-f:Documentation/arch/arm64/tagged-address-abi.rst
-f:Documentation/arch/arm64/tagged-pointers.rst
-f:Documentation/arch/index.rst
-f:Documentation/arch/loongarch/booting.rst
-f:Documentation/arch/loongarch/features.rst
-f:Documentation/arch/loongarch/index.rst
-f:Documentation/arch/loongarch/introduction.rst
-f:Documentation/arch/loongarch/irq-chip-model.rst
-f:Documentation/arch/m68k/buddha-driver.rst
-f:Documentation/arch/m68k/features.rst
-f:Documentation/arch/m68k/index.rst
-f:Documentation/arch/m68k/kernel-options.rst
-f:Documentation/arch/mips/booting.rst
-f:Documentation/arch/mips/features.rst
-f:Documentation/arch/mips/index.rst
-f:Documentation/arch/mips/ingenic-tcu.rst
-f:Documentation/arch/nios2/features.rst
-f:Documentation/arch/nios2/index.rst
-f:Documentation/arch/nios2/nios2.rst
-f:Documentation/arch/openrisc/features.rst
-f:Documentation/arch/openrisc/index.rst
-f:Documentation/arch/openrisc/openrisc_port.rst
-f:Documentation/arch/openrisc/todo.rst
-f:Documentation/arch/parisc/debugging.rst
-f:Documentation/arch/parisc/features.rst
-f:Documentation/arch/parisc/index.rst
-f:Documentation/arch/parisc/registers.rst
-f:Documentation/arch/powerpc/associativity.rst
-f:Documentation/arch/powerpc/booting.rst
-f:Documentation/arch/powerpc/bootwrapper.rst
-f:Documentation/arch/powerpc/cpu_families.rst
-f:Documentation/arch/powerpc/cpu_features.rst
-f:Documentation/arch/powerpc/dawr-power9.rst
-f:Documentation/arch/powerpc/dexcr.rst
-f:Documentation/arch/powerpc/dscr.rst
-f:Documentation/arch/powerpc/eeh-pci-error-recovery.rst
-f:Documentation/arch/powerpc/elf_hwcaps.rst
-f:Documentation/arch/powerpc/elfnote.rst
-f:Documentation/arch/powerpc/features.rst
-f:Documentation/arch/powerpc/firmware-assisted-dump.rst
-f:Documentation/arch/powerpc/htm.rst
-f:Documentation/arch/powerpc/hvcs.rst
-f:Documentation/arch/powerpc/imc.rst
-f:Documentation/arch/powerpc/index.rst
-f:Documentation/arch/powerpc/isa-versions.rst
-f:Documentation/arch/powerpc/kasan.txt
-f:Documentation/arch/powerpc/kaslr-booke32.rst
-f:Documentation/arch/powerpc/kvm-nested.rst
-f:Documentation/arch/powerpc/mpc52xx.rst
-f:Documentation/arch/powerpc/papr_hcalls.rst
-f:Documentation/arch/powerpc/pci_iov_resource_on_powernv.rst
-f:Documentation/arch/powerpc/pmu-ebb.rst
-f:Documentation/arch/powerpc/ptrace.rst
-f:Documentation/arch/powerpc/qe_firmware.rst
-f:Documentation/arch/powerpc/syscall64-abi.rst
-f:Documentation/arch/powerpc/transactional_memory.rst
-f:Documentation/arch/powerpc/ultravisor.rst
-f:Documentation/arch/powerpc/vas-api.rst
-f:Documentation/arch/powerpc/vcpudispatch_stats.rst
-f:Documentation/arch/powerpc/vmemmap_dedup.rst
-f:Documentation/arch/riscv/acpi.rst
-f:Documentation/arch/riscv/boot-image-header.rst
-f:Documentation/arch/riscv/boot.rst
-f:Documentation/arch/riscv/cmodx.rst
-f:Documentation/arch/riscv/features.rst
-f:Documentation/arch/riscv/hwprobe.rst
-f:Documentation/arch/riscv/index.rst
-f:Documentation/arch/riscv/patch-acceptance.rst
-f:Documentation/arch/riscv/uabi.rst
-f:Documentation/arch/riscv/vector.rst
-f:Documentation/arch/riscv/vm-layout.rst
-f:Documentation/arch/s390/3270.ChangeLog
-f:Documentation/arch/s390/3270.rst
-f:Documentation/arch/s390/cds.rst
-f:Documentation/arch/s390/common_io.rst
-f:Documentation/arch/s390/config3270.sh
-f:Documentation/arch/s390/driver-model.rst
-f:Documentation/arch/s390/features.rst
-f:Documentation/arch/s390/index.rst
-f:Documentation/arch/s390/mm.rst
-f:Documentation/arch/s390/monreader.rst
-f:Documentation/arch/s390/pci.rst
-f:Documentation/arch/s390/qeth.rst
-f:Documentation/arch/s390/s390dbf.rst
-f:Documentation/arch/s390/text_files.rst
-f:Documentation/arch/s390/vfio-ap-locking.rst
-f:Documentation/arch/s390/vfio-ap.rst
-f:Documentation/arch/s390/vfio-ccw.rst
-f:Documentation/arch/s390/zfcpdump.rst
-f:Documentation/arch/sh/booting.rst
-f:Documentation/arch/sh/features.rst
-f:Documentation/arch/sh/index.rst
-f:Documentation/arch/sh/new-machine.rst
-f:Documentation/arch/sh/register-banks.rst
-f:Documentation/arch/sparc/adi.rst
-f:Documentation/arch/sparc/console.rst
-f:Documentation/arch/sparc/features.rst
-f:Documentation/arch/sparc/index.rst
-f:Documentation/arch/sparc/oradax/dax-hv-api.txt
-f:Documentation/arch/sparc/oradax/oracle-dax.rst
-f:Documentation/arch/x86/amd-debugging.rst
-f:Documentation/arch/x86/amd-hfi.rst
-f:Documentation/arch/x86/amd-memory-encryption.rst
-f:Documentation/arch/x86/amd_hsmp.rst
-f:Documentation/arch/x86/boot.rst
-f:Documentation/arch/x86/booting-dt.rst
-f:Documentation/arch/x86/buslock.rst
-f:Documentation/arch/x86/cpuinfo.rst
-f:Documentation/arch/x86/earlyprintk.rst
-f:Documentation/arch/x86/elf_auxvec.rst
-f:Documentation/arch/x86/entry_64.rst
-f:Documentation/arch/x86/exception-tables.rst
-f:Documentation/arch/x86/features.rst
-f:Documentation/arch/x86/i386/IO-APIC.rst
-f:Documentation/arch/x86/i386/index.rst
-f:Documentation/arch/x86/ifs.rst
-f:Documentation/arch/x86/index.rst
-f:Documentation/arch/x86/intel-hfi.rst
-f:Documentation/arch/x86/intel_txt.rst
-f:Documentation/arch/x86/iommu.rst
-f:Documentation/arch/x86/kernel-stacks.rst
-f:Documentation/arch/x86/mds.rst
-f:Documentation/arch/x86/microcode.rst
-f:Documentation/arch/x86/mtrr.rst
-f:Documentation/arch/x86/orc-unwinder.rst
-f:Documentation/arch/x86/pat.rst
-f:Documentation/arch/x86/pti.rst
-f:Documentation/arch/x86/resume.svg
-f:Documentation/arch/x86/sgx.rst
-f:Documentation/arch/x86/shstk.rst
-f:Documentation/arch/x86/suspend.svg
-f:Documentation/arch/x86/sva.rst
-f:Documentation/arch/x86/tdx.rst
-f:Documentation/arch/x86/tlb.rst
-f:Documentation/arch/x86/topology.rst
-f:Documentation/arch/x86/tsx_async_abort.rst
-f:Documentation/arch/x86/usb-legacy-support.rst
-f:Documentation/arch/x86/x86_64/5level-paging.rst
-f:Documentation/arch/x86/x86_64/cpu-hotplug-spec.rst
-f:Documentation/arch/x86/x86_64/fake-numa-for-cpusets.rst
-f:Documentation/arch/x86/x86_64/fred.rst
-f:Documentation/arch/x86/x86_64/fsgs.rst
-f:Documentation/arch/x86/x86_64/index.rst
-f:Documentation/arch/x86/x86_64/machinecheck.rst
-f:Documentation/arch/x86/x86_64/mm.rst
-f:Documentation/arch/x86/x86_64/uefi.rst
-f:Documentation/arch/x86/xstate.rst
-f:Documentation/arch/x86/zero-page.rst
-f:Documentation/arch/xtensa/atomctl.rst
-f:Documentation/arch/xtensa/booting.rst
-f:Documentation/arch/xtensa/features.rst
-f:Documentation/arch/xtensa/index.rst
-f:Documentation/arch/xtensa/mmu.rst
-f:Documentation/atomic_bitops.txt
-f:Documentation/atomic_t.txt
-f:Documentation/block/bfq-iosched.rst
-f:Documentation/block/biovecs.rst
-f:Documentation/block/blk-mq.rst
-f:Documentation/block/cmdline-partition.rst
-f:Documentation/block/data-integrity.rst
-f:Documentation/block/deadline-iosched.rst
-f:Documentation/block/index.rst
-f:Documentation/block/inline-encryption.rst
-f:Documentation/block/ioprio.rst
-f:Documentation/block/kyber-iosched.rst
-f:Documentation/block/null_blk.rst
-f:Documentation/block/pr.rst
-f:Documentation/block/stat.rst
-f:Documentation/block/switching-sched.rst
-f:Documentation/block/ublk.rst
-f:Documentation/block/writeback_cache_control.rst
-f:Documentation/bpf/bpf_design_QA.rst
-f:Documentation/bpf/bpf_devel_QA.rst
-f:Documentation/bpf/bpf_iterators.rst
-f:Documentation/bpf/bpf_licensing.rst
-f:Documentation/bpf/bpf_prog_run.rst
-f:Documentation/bpf/btf.rst
-f:Documentation/bpf/clang-notes.rst
-f:Documentation/bpf/classic_vs_extended.rst
-f:Documentation/bpf/cpumasks.rst
-f:Documentation/bpf/drgn.rst
-f:Documentation/bpf/faq.rst
-f:Documentation/bpf/fs_kfuncs.rst
-f:Documentation/bpf/graph_ds_impl.rst
-f:Documentation/bpf/helpers.rst
-f:Documentation/bpf/index.rst
-f:Documentation/bpf/kfuncs.rst
-f:Documentation/bpf/libbpf/index.rst
-f:Documentation/bpf/libbpf/libbpf_build.rst
-f:Documentation/bpf/libbpf/libbpf_naming_convention.rst
-f:Documentation/bpf/libbpf/libbpf_overview.rst
-f:Documentation/bpf/libbpf/program_types.rst
-f:Documentation/bpf/linux-notes.rst
-f:Documentation/bpf/llvm_reloc.rst
-f:Documentation/bpf/map_array.rst
-f:Documentation/bpf/map_bloom_filter.rst
-f:Documentation/bpf/map_cgroup_storage.rst
-f:Documentation/bpf/map_cgrp_storage.rst
-f:Documentation/bpf/map_cpumap.rst
-f:Documentation/bpf/map_devmap.rst
-f:Documentation/bpf/map_hash.rst
-f:Documentation/bpf/map_lpm_trie.rst
-f:Documentation/bpf/map_lru_hash_update.dot
-f:Documentation/bpf/map_of_maps.rst
-f:Documentation/bpf/map_queue_stack.rst
-f:Documentation/bpf/map_sk_storage.rst
-f:Documentation/bpf/map_sockmap.rst
-f:Documentation/bpf/map_xskmap.rst
-f:Documentation/bpf/maps.rst
-f:Documentation/bpf/other.rst
-f:Documentation/bpf/prog_cgroup_sockopt.rst
-f:Documentation/bpf/prog_cgroup_sysctl.rst
-f:Documentation/bpf/prog_flow_dissector.rst
-f:Documentation/bpf/prog_lsm.rst
-f:Documentation/bpf/prog_sk_lookup.rst
-f:Documentation/bpf/programs.rst
-f:Documentation/bpf/redirect.rst
-f:Documentation/bpf/ringbuf.rst
-f:Documentation/bpf/s390.rst
-f:Documentation/bpf/standardization/abi.rst
-f:Documentation/bpf/standardization/index.rst
-f:Documentation/bpf/standardization/instruction-set.rst
-f:Documentation/bpf/syscall_api.rst
-f:Documentation/bpf/test_debug.rst
-f:Documentation/bpf/verifier.rst
-f:Documentation/cdrom/cdrom-standard.rst
-f:Documentation/cdrom/index.rst
-f:Documentation/conf.py
-f:Documentation/core-api/asm-annotations.rst
-f:Documentation/core-api/assoc_array.rst
-f:Documentation/core-api/boot-time-mm.rst
-f:Documentation/core-api/cachetlb.rst
-f:Documentation/core-api/cgroup.rst
-f:Documentation/core-api/circular-buffers.rst
-f:Documentation/core-api/cleanup.rst
-f:Documentation/core-api/cpu_hotplug.rst
-f:Documentation/core-api/debug-objects.rst
-f:Documentation/core-api/debugging-via-ohci1394.rst
-f:Documentation/core-api/dma-api-howto.rst
-f:Documentation/core-api/dma-api.rst
-f:Documentation/core-api/dma-attributes.rst
-f:Documentation/core-api/dma-isa-lpc.rst
-f:Documentation/core-api/entry.rst
-f:Documentation/core-api/errseq.rst
-f:Documentation/core-api/floating-point.rst
-f:Documentation/core-api/folio_queue.rst
-f:Documentation/core-api/genalloc.rst
-f:Documentation/core-api/generic-radix-tree.rst
-f:Documentation/core-api/genericirq.rst
-f:Documentation/core-api/gfp_mask-from-fs-io.rst
-f:Documentation/core-api/idr.rst
-f:Documentation/core-api/index.rst
-f:Documentation/core-api/irq/concepts.rst
-f:Documentation/core-api/irq/index.rst
-f:Documentation/core-api/irq/irq-affinity.rst
-f:Documentation/core-api/irq/irq-domain.rst
-f:Documentation/core-api/irq/irqflags-tracing.rst
-f:Documentation/core-api/kernel-api.rst
-f:Documentation/core-api/kho/bindings/kho.yaml
-f:Documentation/core-api/kho/bindings/memblock/memblock.yaml
-f:Documentation/core-api/kho/bindings/memblock/reserve-mem.yaml
-f:Documentation/core-api/kho/bindings/sub-fdt.yaml
-f:Documentation/core-api/kho/concepts.rst
-f:Documentation/core-api/kho/fdt.rst
-f:Documentation/core-api/kho/index.rst
-f:Documentation/core-api/kobject.rst
-f:Documentation/core-api/kref.rst
-f:Documentation/core-api/librs.rst
-f:Documentation/core-api/list.rst
-f:Documentation/core-api/local_ops.rst
-f:Documentation/core-api/maple_tree.rst
-f:Documentation/core-api/memory-allocation.rst
-f:Documentation/core-api/memory-hotplug.rst
-f:Documentation/core-api/min_heap.rst
-f:Documentation/core-api/mm-api.rst
-f:Documentation/core-api/netlink.rst
-f:Documentation/core-api/packing.rst
-f:Documentation/core-api/padata.rst
-f:Documentation/core-api/parser.rst
-f:Documentation/core-api/pin_user_pages.rst
-f:Documentation/core-api/printk-basics.rst
-f:Documentation/core-api/printk-formats.rst
-f:Documentation/core-api/printk-index.rst
-f:Documentation/core-api/protection-keys.rst
-f:Documentation/core-api/rbtree.rst
-f:Documentation/core-api/refcount-vs-atomic.rst
-f:Documentation/core-api/swiotlb.rst
-f:Documentation/core-api/symbol-namespaces.rst
-f:Documentation/core-api/this_cpu_ops.rst
-f:Documentation/core-api/timekeeping.rst
-f:Documentation/core-api/tracepoint.rst
-f:Documentation/core-api/unaligned-memory-access.rst
-f:Documentation/core-api/union_find.rst
-f:Documentation/core-api/watch_queue.rst
-f:Documentation/core-api/workqueue.rst
-f:Documentation/core-api/wrappers/atomic_bitops.rst
-f:Documentation/core-api/wrappers/atomic_t.rst
-f:Documentation/core-api/wrappers/memory-barriers.rst
-f:Documentation/core-api/xarray.rst
-f:Documentation/cpu-freq/core.rst
-f:Documentation/cpu-freq/cpu-drivers.rst
-f:Documentation/cpu-freq/cpufreq-stats.rst
-f:Documentation/cpu-freq/index.rst
-f:Documentation/crypto/api-aead.rst
-f:Documentation/crypto/api-akcipher.rst
-f:Documentation/crypto/api-digest.rst
-f:Documentation/crypto/api-intro.rst
-f:Documentation/crypto/api-kpp.rst
-f:Documentation/crypto/api-rng.rst
-f:Documentation/crypto/api-samples.rst
-f:Documentation/crypto/api-sig.rst
-f:Documentation/crypto/api-skcipher.rst
-f:Documentation/crypto/api.rst
-f:Documentation/crypto/architecture.rst
-f:Documentation/crypto/asymmetric-keys.rst
-f:Documentation/crypto/async-tx-api.rst
-f:Documentation/crypto/crypto_engine.rst
-f:Documentation/crypto/descore-readme.rst
-f:Documentation/crypto/devel-algos.rst
-f:Documentation/crypto/device_drivers/index.rst
-f:Documentation/crypto/device_drivers/octeontx2.rst
-f:Documentation/crypto/index.rst
-f:Documentation/crypto/intro.rst
-f:Documentation/crypto/krb5.rst
-f:Documentation/crypto/userspace-if.rst
-f:Documentation/dev-tools/autofdo.rst
-f:Documentation/dev-tools/checkpatch.rst
-f:Documentation/dev-tools/checkuapi.rst
-f:Documentation/dev-tools/clang-format.rst
-f:Documentation/dev-tools/coccinelle.rst
-f:Documentation/dev-tools/gcov.rst
-f:Documentation/dev-tools/gpio-sloppy-logic-analyzer.rst
-f:Documentation/dev-tools/index.rst
-f:Documentation/dev-tools/kasan.rst
-f:Documentation/dev-tools/kcov.rst
-f:Documentation/dev-tools/kcsan.rst
-f:Documentation/dev-tools/kfence.rst
-f:Documentation/dev-tools/kmemleak.rst
-f:Documentation/dev-tools/kmsan.rst
-f:Documentation/dev-tools/kselftest.rst
-f:Documentation/dev-tools/ktap.rst
-f:Documentation/dev-tools/kunit/api/clk.rst
-f:Documentation/dev-tools/kunit/api/functionredirection.rst
-f:Documentation/dev-tools/kunit/api/index.rst
-f:Documentation/dev-tools/kunit/api/of.rst
-f:Documentation/dev-tools/kunit/api/platformdevice.rst
-f:Documentation/dev-tools/kunit/api/resource.rst
-f:Documentation/dev-tools/kunit/api/test.rst
-f:Documentation/dev-tools/kunit/architecture.rst
-f:Documentation/dev-tools/kunit/faq.rst
-f:Documentation/dev-tools/kunit/index.rst
-f:Documentation/dev-tools/kunit/kunit_suitememorydiagram.svg
-f:Documentation/dev-tools/kunit/run_manual.rst
-f:Documentation/dev-tools/kunit/run_wrapper.rst
-f:Documentation/dev-tools/kunit/running_tips.rst
-f:Documentation/dev-tools/kunit/start.rst
-f:Documentation/dev-tools/kunit/style.rst
-f:Documentation/dev-tools/kunit/usage.rst
-f:Documentation/dev-tools/propeller.rst
-f:Documentation/dev-tools/sparse.rst
-f:Documentation/dev-tools/testing-devices.rst
-f:Documentation/dev-tools/testing-overview.rst
-f:Documentation/dev-tools/ubsan.rst
-f:Documentation/devicetree/bindings/.gitignore
-f:Documentation/devicetree/bindings/.yamllint
-f:Documentation/devicetree/bindings/ABI.rst
-f:Documentation/devicetree/bindings/Makefile
-f:Documentation/devicetree/bindings/access-controllers/access-controllers.yaml
-f:Documentation/devicetree/bindings/arc/axs101.txt
-f:Documentation/devicetree/bindings/arc/axs103.txt
-f:Documentation/devicetree/bindings/arc/eznps.txt
-f:Documentation/devicetree/bindings/arc/hsdk.txt
-f:Documentation/devicetree/bindings/arc/pct.txt
-f:Documentation/devicetree/bindings/arc/snps,archs-pct.yaml
-f:Documentation/devicetree/bindings/arm/actions.yaml
-f:Documentation/devicetree/bindings/arm/airoha,en7581-chip-scu.yaml
-f:Documentation/devicetree/bindings/arm/airoha.yaml
-f:Documentation/devicetree/bindings/arm/altera.yaml
-f:Documentation/devicetree/bindings/arm/altera/socfpga-clk-manager.yaml
-f:Documentation/devicetree/bindings/arm/altera/socfpga-sdram-edac.txt
-f:Documentation/devicetree/bindings/arm/amazon,al.yaml
-f:Documentation/devicetree/bindings/arm/amd,pensando.yaml
-f:Documentation/devicetree/bindings/arm/amlogic.yaml
-f:Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.yaml
-f:Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-mx-secbus2.yaml
-f:Documentation/devicetree/bindings/arm/apple.yaml
-f:Documentation/devicetree/bindings/arm/apple/apple,pmgr.yaml
-f:Documentation/devicetree/bindings/arm/arm,cci-400.yaml
-f:Documentation/devicetree/bindings/arm/arm,coresight-catu.yaml
-f:Documentation/devicetree/bindings/arm/arm,coresight-cpu-debug.yaml
-f:Documentation/devicetree/bindings/arm/arm,coresight-cti.yaml
-f:Documentation/devicetree/bindings/arm/arm,coresight-dummy-sink.yaml
-f:Documentation/devicetree/bindings/arm/arm,coresight-dummy-source.yaml
-f:Documentation/devicetree/bindings/arm/arm,coresight-dynamic-funnel.yaml
-f:Documentation/devicetree/bindings/arm/arm,coresight-dynamic-replicator.yaml
-f:Documentation/devicetree/bindings/arm/arm,coresight-etb10.yaml
-f:Documentation/devicetree/bindings/arm/arm,coresight-etm.yaml
-f:Documentation/devicetree/bindings/arm/arm,coresight-static-funnel.yaml
-f:Documentation/devicetree/bindings/arm/arm,coresight-static-replicator.yaml
-f:Documentation/devicetree/bindings/arm/arm,coresight-stm.yaml
-f:Documentation/devicetree/bindings/arm/arm,coresight-tmc.yaml
-f:Documentation/devicetree/bindings/arm/arm,coresight-tpiu.yaml
-f:Documentation/devicetree/bindings/arm/arm,corstone1000.yaml
-f:Documentation/devicetree/bindings/arm/arm,embedded-trace-extension.yaml
-f:Documentation/devicetree/bindings/arm/arm,integrator.yaml
-f:Documentation/devicetree/bindings/arm/arm,juno-fpga-apb-regs.yaml
-f:Documentation/devicetree/bindings/arm/arm,morello.yaml
-f:Documentation/devicetree/bindings/arm/arm,realview.yaml
-f:Documentation/devicetree/bindings/arm/arm,scu.yaml
-f:Documentation/devicetree/bindings/arm/arm,trace-buffer-extension.yaml
-f:Documentation/devicetree/bindings/arm/arm,versatile-sysreg.yaml
-f:Documentation/devicetree/bindings/arm/arm,versatile.yaml
-f:Documentation/devicetree/bindings/arm/arm,vexpress-juno.yaml
-f:Documentation/devicetree/bindings/arm/aspeed/aspeed,sbc.yaml
-f:Documentation/devicetree/bindings/arm/aspeed/aspeed.yaml
-f:Documentation/devicetree/bindings/arm/atmel,sama5d2-secumod.yaml
-f:Documentation/devicetree/bindings/arm/atmel-at91.yaml
-f:Documentation/devicetree/bindings/arm/atmel-sysregs.txt
-f:Documentation/devicetree/bindings/arm/axiado.yaml
-f:Documentation/devicetree/bindings/arm/axis.txt
-f:Documentation/devicetree/bindings/arm/axxia.yaml
-f:Documentation/devicetree/bindings/arm/bcm/bcm2835.yaml
-f:Documentation/devicetree/bindings/arm/bcm/brcm,bcm11351.yaml
-f:Documentation/devicetree/bindings/arm/bcm/brcm,bcm21664.yaml
-f:Documentation/devicetree/bindings/arm/bcm/brcm,bcm23550.yaml
-f:Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.yaml
-f:Documentation/devicetree/bindings/arm/bcm/brcm,bcm53573.yaml
-f:Documentation/devicetree/bindings/arm/bcm/brcm,bcm63138.txt
-f:Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml
-f:Documentation/devicetree/bindings/arm/bcm/brcm,brcmstb.txt
-f:Documentation/devicetree/bindings/arm/bcm/brcm,cygnus.yaml
-f:Documentation/devicetree/bindings/arm/bcm/brcm,hr2.yaml
-f:Documentation/devicetree/bindings/arm/bcm/brcm,ns2.yaml
-f:Documentation/devicetree/bindings/arm/bcm/brcm,nsp.yaml
-f:Documentation/devicetree/bindings/arm/bcm/brcm,stingray.yaml
-f:Documentation/devicetree/bindings/arm/bcm/brcm,vulcan-soc.yaml
-f:Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml
-f:Documentation/devicetree/bindings/arm/bitmain.yaml
-f:Documentation/devicetree/bindings/arm/blaize.yaml
-f:Documentation/devicetree/bindings/arm/calxeda.yaml
-f:Documentation/devicetree/bindings/arm/calxeda/hb-sregs.yaml
-f:Documentation/devicetree/bindings/arm/calxeda/l2ecc.yaml
-f:Documentation/devicetree/bindings/arm/cavium-thunder.txt
-f:Documentation/devicetree/bindings/arm/cavium-thunder2.txt
-f:Documentation/devicetree/bindings/arm/cci-control-port.yaml
-f:Documentation/devicetree/bindings/arm/cirrus/cirrus,ep9301.yaml
-f:Documentation/devicetree/bindings/arm/cix.yaml
-f:Documentation/devicetree/bindings/arm/cpu-enable-method/al,alpine-smp
-f:Documentation/devicetree/bindings/arm/cpu-enable-method/marvell,berlin-smp
-f:Documentation/devicetree/bindings/arm/cpu-enable-method/nuvoton,npcm750-smp
-f:Documentation/devicetree/bindings/arm/cpus.yaml
-f:Documentation/devicetree/bindings/arm/digicolor.yaml
-f:Documentation/devicetree/bindings/arm/firmware/linaro,optee-tz.yaml
-f:Documentation/devicetree/bindings/arm/firmware/sdei.txt
-f:Documentation/devicetree/bindings/arm/firmware/tlm,trusted-foundations.yaml
-f:Documentation/devicetree/bindings/arm/freescale/fsl,imx51-m4if.yaml
-f:Documentation/devicetree/bindings/arm/freescale/fsl,imx7ulp-pm.yaml
-f:Documentation/devicetree/bindings/arm/freescale/fsl,imx7ulp-sim.yaml
-f:Documentation/devicetree/bindings/arm/fsl.yaml
-f:Documentation/devicetree/bindings/arm/gemini.yaml
-f:Documentation/devicetree/bindings/arm/google.yaml
-f:Documentation/devicetree/bindings/arm/hisilicon/controller/cpuctrl.yaml
-f:Documentation/devicetree/bindings/arm/hisilicon/controller/hi3798cv200-perictrl.yaml
-f:Documentation/devicetree/bindings/arm/hisilicon/controller/hi6220-domain-ctrl.yaml
-f:Documentation/devicetree/bindings/arm/hisilicon/controller/hip04-bootwrapper.yaml
-f:Documentation/devicetree/bindings/arm/hisilicon/controller/hip04-fabric.yaml
-f:Documentation/devicetree/bindings/arm/hisilicon/controller/pctrl.yaml
-f:Documentation/devicetree/bindings/arm/hisilicon/controller/sysctrl.yaml
-f:Documentation/devicetree/bindings/arm/hisilicon/hisilicon.yaml
-f:Documentation/devicetree/bindings/arm/hisilicon/low-pin-count.yaml
-f:Documentation/devicetree/bindings/arm/hpe,gxp.yaml
-f:Documentation/devicetree/bindings/arm/intel,keembay.yaml
-f:Documentation/devicetree/bindings/arm/intel,socfpga.yaml
-f:Documentation/devicetree/bindings/arm/intel-ixp4xx.yaml
-f:Documentation/devicetree/bindings/arm/keystone/keystone.txt
-f:Documentation/devicetree/bindings/arm/keystone/ti,k3-sci-common.yaml
-f:Documentation/devicetree/bindings/arm/keystone/ti,sci.yaml
-f:Documentation/devicetree/bindings/arm/linux,dummy-virt.yaml
-f:Documentation/devicetree/bindings/arm/marvell/98dx3236-resume-ctrl.txt
-f:Documentation/devicetree/bindings/arm/marvell/98dx3236.txt
-f:Documentation/devicetree/bindings/arm/marvell/ap80x-system-controller.txt
-f:Documentation/devicetree/bindings/arm/marvell/armada-370-xp-pmsu.txt
-f:Documentation/devicetree/bindings/arm/marvell/armada-370-xp.txt
-f:Documentation/devicetree/bindings/arm/marvell/armada-375.txt
-f:Documentation/devicetree/bindings/arm/marvell/armada-37xx.yaml
-f:Documentation/devicetree/bindings/arm/marvell/armada-380-mpcore-soc-ctrl.txt
-f:Documentation/devicetree/bindings/arm/marvell/armada-38x.yaml
-f:Documentation/devicetree/bindings/arm/marvell/armada-39x.txt
-f:Documentation/devicetree/bindings/arm/marvell/armada-7k-8k.yaml
-f:Documentation/devicetree/bindings/arm/marvell/armada-cpu-reset.txt
-f:Documentation/devicetree/bindings/arm/marvell/coherency-fabric.txt
-f:Documentation/devicetree/bindings/arm/marvell/cp110-system-controller.txt
-f:Documentation/devicetree/bindings/arm/marvell/kirkwood.txt
-f:Documentation/devicetree/bindings/arm/marvell/marvell,ac5.yaml
-f:Documentation/devicetree/bindings/arm/marvell/marvell,dove.txt
-f:Documentation/devicetree/bindings/arm/marvell/marvell,kirkwood.txt
-f:Documentation/devicetree/bindings/arm/marvell/marvell,orion5x.txt
-f:Documentation/devicetree/bindings/arm/marvell/mvebu-cpu-config.txt
-f:Documentation/devicetree/bindings/arm/marvell/mvebu-system-controller.txt
-f:Documentation/devicetree/bindings/arm/mediatek.yaml
-f:Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.yaml
-f:Documentation/devicetree/bindings/arm/mediatek/mediatek,g3dsys.txt
-f:Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml
-f:Documentation/devicetree/bindings/arm/mediatek/mediatek,mt7622-pcie-mirror.yaml
-f:Documentation/devicetree/bindings/arm/mediatek/mediatek,mt7622-wed.yaml
-f:Documentation/devicetree/bindings/arm/mediatek/mediatek,mt7986-wed-pcie.yaml
-f:Documentation/devicetree/bindings/arm/microchip,sparx5.yaml
-f:Documentation/devicetree/bindings/arm/moxart.yaml
-f:Documentation/devicetree/bindings/arm/mrvl/mrvl.yaml
-f:Documentation/devicetree/bindings/arm/mstar/mstar,l3bridge.yaml
-f:Documentation/devicetree/bindings/arm/mstar/mstar,smpctrl.yaml
-f:Documentation/devicetree/bindings/arm/mstar/mstar.yaml
-f:Documentation/devicetree/bindings/arm/nuvoton/nuvoton,ma35d1.yaml
-f:Documentation/devicetree/bindings/arm/nuvoton/nuvoton,npcm.yaml
-f:Documentation/devicetree/bindings/arm/nvidia,tegra194-ccplex.yaml
-f:Documentation/devicetree/bindings/arm/nxp/lpc32xx.yaml
-f:Documentation/devicetree/bindings/arm/omap/counter.txt
-f:Documentation/devicetree/bindings/arm/omap/crossbar.txt
-f:Documentation/devicetree/bindings/arm/omap/ctrl.txt
-f:Documentation/devicetree/bindings/arm/omap/dmm.txt
-f:Documentation/devicetree/bindings/arm/omap/dsp.txt
-f:Documentation/devicetree/bindings/arm/omap/iva.txt
-f:Documentation/devicetree/bindings/arm/omap/l3-noc.txt
-f:Documentation/devicetree/bindings/arm/omap/l4.txt
-f:Documentation/devicetree/bindings/arm/omap/mpu.txt
-f:Documentation/devicetree/bindings/arm/omap/omap.txt
-f:Documentation/devicetree/bindings/arm/omap/prcm.txt
-f:Documentation/devicetree/bindings/arm/omap/prm-inst.txt
-f:Documentation/devicetree/bindings/arm/pmu.yaml
-f:Documentation/devicetree/bindings/arm/primecell.yaml
-f:Documentation/devicetree/bindings/arm/psci.yaml
-f:Documentation/devicetree/bindings/arm/qcom,coresight-ctcu.yaml
-f:Documentation/devicetree/bindings/arm/qcom,coresight-remote-etm.yaml
-f:Documentation/devicetree/bindings/arm/qcom,coresight-tpda.yaml
-f:Documentation/devicetree/bindings/arm/qcom,coresight-tpdm.yaml
-f:Documentation/devicetree/bindings/arm/qcom-soc.yaml
-f:Documentation/devicetree/bindings/arm/qcom.yaml
-f:Documentation/devicetree/bindings/arm/rda.yaml
-f:Documentation/devicetree/bindings/arm/realtek.yaml
-f:Documentation/devicetree/bindings/arm/rockchip.yaml
-f:Documentation/devicetree/bindings/arm/rockchip/pmu.yaml
-f:Documentation/devicetree/bindings/arm/samsung/samsung-boards.yaml
-f:Documentation/devicetree/bindings/arm/samsung/samsung-secure-firmware.yaml
-f:Documentation/devicetree/bindings/arm/samsung/samsung-soc.yaml
-f:Documentation/devicetree/bindings/arm/secure.txt
-f:Documentation/devicetree/bindings/arm/socionext/milbeaut.yaml
-f:Documentation/devicetree/bindings/arm/socionext/synquacer.yaml
-f:Documentation/devicetree/bindings/arm/socionext/uniphier.yaml
-f:Documentation/devicetree/bindings/arm/sp810.yaml
-f:Documentation/devicetree/bindings/arm/spear.yaml
-f:Documentation/devicetree/bindings/arm/sprd/sprd.yaml
-f:Documentation/devicetree/bindings/arm/ste-nomadik.txt
-f:Documentation/devicetree/bindings/arm/sti.yaml
-f:Documentation/devicetree/bindings/arm/stm32/st,mlahb.yaml
-f:Documentation/devicetree/bindings/arm/stm32/st,stm32-syscon.yaml
-f:Documentation/devicetree/bindings/arm/stm32/stm32.yaml
-f:Documentation/devicetree/bindings/arm/sunplus,sp7021.yaml
-f:Documentation/devicetree/bindings/arm/sunxi.yaml
-f:Documentation/devicetree/bindings/arm/sunxi/allwinner,sun4i-a10-mbus.yaml
-f:Documentation/devicetree/bindings/arm/sunxi/allwinner,sun6i-a31-cpuconfig.yaml
-f:Documentation/devicetree/bindings/arm/sunxi/allwinner,sun9i-a80-prcm.yaml
-f:Documentation/devicetree/bindings/arm/syna.txt
-f:Documentation/devicetree/bindings/arm/tegra.yaml
-f:Documentation/devicetree/bindings/arm/tegra/nvidia,tegra-ccplex-cluster.yaml
-f:Documentation/devicetree/bindings/arm/tegra/nvidia,tegra186-pmc.yaml
-f:Documentation/devicetree/bindings/arm/tegra/nvidia,tegra194-axi2apb.yaml
-f:Documentation/devicetree/bindings/arm/tegra/nvidia,tegra194-cbb.yaml
-f:Documentation/devicetree/bindings/arm/tegra/nvidia,tegra234-cbb.yaml
-f:Documentation/devicetree/bindings/arm/tesla.yaml
-f:Documentation/devicetree/bindings/arm/ti/k3.yaml
-f:Documentation/devicetree/bindings/arm/ti/nspire.yaml
-f:Documentation/devicetree/bindings/arm/ti/omap.yaml
-f:Documentation/devicetree/bindings/arm/ti/ti,davinci.yaml
-f:Documentation/devicetree/bindings/arm/toshiba.yaml
-f:Documentation/devicetree/bindings/arm/ux500.yaml
-f:Documentation/devicetree/bindings/arm/ux500/boards.txt
-f:Documentation/devicetree/bindings/arm/ux500/power_domain.txt
-f:Documentation/devicetree/bindings/arm/vexpress-config.yaml
-f:Documentation/devicetree/bindings/arm/vexpress-scc.txt
-f:Documentation/devicetree/bindings/arm/vexpress-sysreg.yaml
-f:Documentation/devicetree/bindings/arm/vt8500.yaml
-f:Documentation/devicetree/bindings/arm/vt8500/via,vt8500-pmc.txt
-f:Documentation/devicetree/bindings/arm/xen.txt
-f:Documentation/devicetree/bindings/ata/ahci-common.yaml
-f:Documentation/devicetree/bindings/ata/ahci-platform.yaml
-f:Documentation/devicetree/bindings/ata/allwinner,sun4i-a10-ahci.yaml
-f:Documentation/devicetree/bindings/ata/allwinner,sun8i-r40-ahci.yaml
-f:Documentation/devicetree/bindings/ata/apm,xgene-ahci.yaml
-f:Documentation/devicetree/bindings/ata/arasan,cf-spear1340.yaml
-f:Documentation/devicetree/bindings/ata/ata-generic.yaml
-f:Documentation/devicetree/bindings/ata/baikal,bt1-ahci.yaml
-f:Documentation/devicetree/bindings/ata/brcm,sata-brcm.yaml
-f:Documentation/devicetree/bindings/ata/cavium,ebt3000-compact-flash.yaml
-f:Documentation/devicetree/bindings/ata/ceva,ahci-1v84.yaml
-f:Documentation/devicetree/bindings/ata/cirrus,ep9312-pata.yaml
-f:Documentation/devicetree/bindings/ata/cortina,gemini-sata-bridge.yaml
-f:Documentation/devicetree/bindings/ata/faraday,ftide010.yaml
-f:Documentation/devicetree/bindings/ata/fsl,ahci.yaml
-f:Documentation/devicetree/bindings/ata/fsl,imx-pata.yaml
-f:Documentation/devicetree/bindings/ata/fsl,pq-sata.yaml
-f:Documentation/devicetree/bindings/ata/imx-sata.yaml
-f:Documentation/devicetree/bindings/ata/intel,ixp4xx-compact-flash.yaml
-f:Documentation/devicetree/bindings/ata/marvell,orion-sata.yaml
-f:Documentation/devicetree/bindings/ata/mediatek,mtk-ahci.yaml
-f:Documentation/devicetree/bindings/ata/nvidia,tegra-ahci.yaml
-f:Documentation/devicetree/bindings/ata/pata-common.yaml
-f:Documentation/devicetree/bindings/ata/renesas,rcar-sata.yaml
-f:Documentation/devicetree/bindings/ata/rockchip,dwc-ahci.yaml
-f:Documentation/devicetree/bindings/ata/sata-common.yaml
-f:Documentation/devicetree/bindings/ata/sata_highbank.yaml
-f:Documentation/devicetree/bindings/ata/snps,dwc-ahci-common.yaml
-f:Documentation/devicetree/bindings/ata/snps,dwc-ahci.yaml
-f:Documentation/devicetree/bindings/ata/st,ahci.yaml
-f:Documentation/devicetree/bindings/ata/ti,da850-ahci.yaml
-f:Documentation/devicetree/bindings/ata/ti,dm816-ahci.yaml
-f:Documentation/devicetree/bindings/auxdisplay/arm,versatile-lcd.yaml
-f:Documentation/devicetree/bindings/auxdisplay/gpio-7-segment.yaml
-f:Documentation/devicetree/bindings/auxdisplay/hit,hd44780.yaml
-f:Documentation/devicetree/bindings/auxdisplay/holtek,ht16k33.yaml
-f:Documentation/devicetree/bindings/auxdisplay/img,ascii-lcd.yaml
-f:Documentation/devicetree/bindings/auxdisplay/maxim,max6959.yaml
-f:Documentation/devicetree/bindings/auxdisplay/modtronix,lcd2s.yaml
-f:Documentation/devicetree/bindings/board/fsl,bcsr.yaml
-f:Documentation/devicetree/bindings/board/fsl,fpga-qixis-i2c.yaml
-f:Documentation/devicetree/bindings/board/fsl,fpga-qixis.yaml
-f:Documentation/devicetree/bindings/bus/allwinner,sun50i-a64-de2.yaml
-f:Documentation/devicetree/bindings/bus/allwinner,sun8i-a23-rsb.yaml
-f:Documentation/devicetree/bindings/bus/arm,integrator-ap-lm.yaml
-f:Documentation/devicetree/bindings/bus/aspeed,ast2600-ahbc.yaml
-f:Documentation/devicetree/bindings/bus/baikal,bt1-apb.yaml
-f:Documentation/devicetree/bindings/bus/baikal,bt1-axi.yaml
-f:Documentation/devicetree/bindings/bus/brcm,bus-axi.txt
-f:Documentation/devicetree/bindings/bus/brcm,gisb-arb.yaml
-f:Documentation/devicetree/bindings/bus/fsl,imx8mp-aipstz.yaml
-f:Documentation/devicetree/bindings/bus/fsl,imx8qxp-pixel-link-msi-bus.yaml
-f:Documentation/devicetree/bindings/bus/fsl,spba-bus.yaml
-f:Documentation/devicetree/bindings/bus/microsoft,vmbus.yaml
-f:Documentation/devicetree/bindings/bus/moxtet.txt
-f:Documentation/devicetree/bindings/bus/mti,mips-cdmm.yaml
-f:Documentation/devicetree/bindings/bus/mvebu-mbus.txt
-f:Documentation/devicetree/bindings/bus/nvidia,tegra20-gmi.txt
-f:Documentation/devicetree/bindings/bus/nvidia,tegra210-aconnect.yaml
-f:Documentation/devicetree/bindings/bus/omap-ocp2scp.txt
-f:Documentation/devicetree/bindings/bus/palmbus.yaml
-f:Documentation/devicetree/bindings/bus/qcom,ssbi.yaml
-f:Documentation/devicetree/bindings/bus/qcom,ssc-block-bus.yaml
-f:Documentation/devicetree/bindings/bus/renesas,bsc.yaml
-f:Documentation/devicetree/bindings/bus/simple-pm-bus.yaml
-f:Documentation/devicetree/bindings/bus/socionext,uniphier-system-bus.yaml
-f:Documentation/devicetree/bindings/bus/st,stm32-etzpc.yaml
-f:Documentation/devicetree/bindings/bus/st,stm32mp25-rifsc.yaml
-f:Documentation/devicetree/bindings/bus/ti,da850-mstpri.txt
-f:Documentation/devicetree/bindings/bus/ti-sysc.yaml
-f:Documentation/devicetree/bindings/bus/ts-nbus.txt
-f:Documentation/devicetree/bindings/bus/xlnx,versal-net-cdx.yaml
-f:Documentation/devicetree/bindings/cache/andestech,ax45mp-cache.yaml
-f:Documentation/devicetree/bindings/cache/baikal,bt1-l2-ctl.yaml
-f:Documentation/devicetree/bindings/cache/freescale-l2cache.txt
-f:Documentation/devicetree/bindings/cache/l2c2x0.yaml
-f:Documentation/devicetree/bindings/cache/marvell,kirkwood-cache.yaml
-f:Documentation/devicetree/bindings/cache/marvell,tauros2-cache.yaml
-f:Documentation/devicetree/bindings/cache/qcom,llcc.yaml
-f:Documentation/devicetree/bindings/cache/sifive,ccache0.yaml
-f:Documentation/devicetree/bindings/cache/socionext,uniphier-system-cache.yaml
-f:Documentation/devicetree/bindings/cache/starfive,jh8100-starlink-cache.yaml
-f:Documentation/devicetree/bindings/chrome/google,cros-ec-typec.yaml
-f:Documentation/devicetree/bindings/clock/actions,owl-cmu.yaml
-f:Documentation/devicetree/bindings/clock/adi,axi-clkgen.yaml
-f:Documentation/devicetree/bindings/clock/airoha,en7523-scu.yaml
-f:Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-ahb-clk.yaml
-f:Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-apb0-clk.yaml
-f:Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-apb1-clk.yaml
-f:Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-axi-clk.yaml
-f:Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-ccu.yaml
-f:Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-cpu-clk.yaml
-f:Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-display-clk.yaml
-f:Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-gates-clk.yaml
-f:Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-mbus-clk.yaml
-f:Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-mmc-clk.yaml
-f:Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-mod0-clk.yaml
-f:Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-mod1-clk.yaml
-f:Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-osc-clk.yaml
-f:Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-pll1-clk.yaml
-f:Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-pll3-clk.yaml
-f:Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-pll5-clk.yaml
-f:Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-pll6-clk.yaml
-f:Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-tcon-ch0-clk.yaml
-f:Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-usb-clk.yaml
-f:Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-ve-clk.yaml
-f:Documentation/devicetree/bindings/clock/allwinner,sun55i-a523-ccu.yaml
-f:Documentation/devicetree/bindings/clock/allwinner,sun5i-a13-ahb-clk.yaml
-f:Documentation/devicetree/bindings/clock/allwinner,sun6i-a31-pll6-clk.yaml
-f:Documentation/devicetree/bindings/clock/allwinner,sun7i-a20-gmac-clk.yaml
-f:Documentation/devicetree/bindings/clock/allwinner,sun7i-a20-out-clk.yaml
-f:Documentation/devicetree/bindings/clock/allwinner,sun8i-a83t-de2-clk.yaml
-f:Documentation/devicetree/bindings/clock/allwinner,sun8i-h3-bus-gates-clk.yaml
-f:Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-ahb-clk.yaml
-f:Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-apb0-clk.yaml
-f:Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-cpus-clk.yaml
-f:Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-de-clks.yaml
-f:Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-gt-clk.yaml
-f:Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-mmc-config-clk.yaml
-f:Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-pll4-clk.yaml
-f:Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-usb-clks.yaml
-f:Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-usb-mod-clk.yaml
-f:Documentation/devicetree/bindings/clock/allwinner,sun9i-a80-usb-phy-clk.yaml
-f:Documentation/devicetree/bindings/clock/alphascale,asm9260-clock-controller.yaml
-f:Documentation/devicetree/bindings/clock/amlogic,a1-peripherals-clkc.yaml
-f:Documentation/devicetree/bindings/clock/amlogic,a1-pll-clkc.yaml
-f:Documentation/devicetree/bindings/clock/amlogic,axg-audio-clkc.yaml
-f:Documentation/devicetree/bindings/clock/amlogic,c3-peripherals-clkc.yaml
-f:Documentation/devicetree/bindings/clock/amlogic,c3-pll-clkc.yaml
-f:Documentation/devicetree/bindings/clock/amlogic,gxbb-aoclkc.yaml
-f:Documentation/devicetree/bindings/clock/amlogic,gxbb-clkc.yaml
-f:Documentation/devicetree/bindings/clock/amlogic,meson8-clkc.yaml
-f:Documentation/devicetree/bindings/clock/amlogic,meson8-ddr-clkc.yaml
-f:Documentation/devicetree/bindings/clock/amlogic,s4-peripherals-clkc.yaml
-f:Documentation/devicetree/bindings/clock/amlogic,s4-pll-clkc.yaml
-f:Documentation/devicetree/bindings/clock/apm,xgene-device-clock.yaml
-f:Documentation/devicetree/bindings/clock/apm,xgene-socpll-clock.yaml
-f:Documentation/devicetree/bindings/clock/apple,nco.yaml
-f:Documentation/devicetree/bindings/clock/arm,syscon-icst.yaml
-f:Documentation/devicetree/bindings/clock/armada3700-xtal-clock.txt
-f:Documentation/devicetree/bindings/clock/atmel,at91rm9200-pmc.yaml
-f:Documentation/devicetree/bindings/clock/atmel,at91sam9x5-sckc.yaml
-f:Documentation/devicetree/bindings/clock/axis,artpec6-clkctrl.yaml
-f:Documentation/devicetree/bindings/clock/axs10x-i2s-pll-clock.txt
-f:Documentation/devicetree/bindings/clock/baikal,bt1-ccu-div.yaml
-f:Documentation/devicetree/bindings/clock/baikal,bt1-ccu-pll.yaml
-f:Documentation/devicetree/bindings/clock/bitmain,bm1880-clk.yaml
-f:Documentation/devicetree/bindings/clock/brcm,bcm2711-dvp.yaml
-f:Documentation/devicetree/bindings/clock/brcm,bcm2835-aux-clock.yaml
-f:Documentation/devicetree/bindings/clock/brcm,bcm2835-cprman.yaml
-f:Documentation/devicetree/bindings/clock/brcm,bcm53573-ilp.yaml
-f:Documentation/devicetree/bindings/clock/brcm,bcm63268-timer-clocks.yaml
-f:Documentation/devicetree/bindings/clock/brcm,bcm63xx-clocks.yaml
-f:Documentation/devicetree/bindings/clock/brcm,iproc-clocks.yaml
-f:Documentation/devicetree/bindings/clock/brcm,kona-ccu.yaml
-f:Documentation/devicetree/bindings/clock/calxeda.yaml
-f:Documentation/devicetree/bindings/clock/canaan,k210-clk.yaml
-f:Documentation/devicetree/bindings/clock/cirrus,cs2000-cp.yaml
-f:Documentation/devicetree/bindings/clock/cirrus,ep7209-clk.yaml
-f:Documentation/devicetree/bindings/clock/cirrus,lochnagar.yaml
-f:Documentation/devicetree/bindings/clock/clk-palmas-clk32kg-clocks.txt
-f:Documentation/devicetree/bindings/clock/clock-bindings.txt
-f:Documentation/devicetree/bindings/clock/fixed-clock.yaml
-f:Documentation/devicetree/bindings/clock/fixed-factor-clock.yaml
-f:Documentation/devicetree/bindings/clock/fixed-mmio-clock.yaml
-f:Documentation/devicetree/bindings/clock/fsl,flexspi-clock.yaml
-f:Documentation/devicetree/bindings/clock/fsl,imx8-acm.yaml
-f:Documentation/devicetree/bindings/clock/fsl,imx8m-anatop.yaml
-f:Documentation/devicetree/bindings/clock/fsl,imx93-anatop.yaml
-f:Documentation/devicetree/bindings/clock/fsl,plldig.yaml
-f:Documentation/devicetree/bindings/clock/fsl,qoriq-clock-legacy.yaml
-f:Documentation/devicetree/bindings/clock/fsl,qoriq-clock.yaml
-f:Documentation/devicetree/bindings/clock/fsl,sai-clock.yaml
-f:Documentation/devicetree/bindings/clock/fsl,scu-clk.yaml
-f:Documentation/devicetree/bindings/clock/fsl,vf610-ccm.yaml
-f:Documentation/devicetree/bindings/clock/fujitsu,mb86s70-crg11.txt
-f:Documentation/devicetree/bindings/clock/gated-fixed-clock.yaml
-f:Documentation/devicetree/bindings/clock/google,gs101-clock.yaml
-f:Documentation/devicetree/bindings/clock/gpio-gate-clock.yaml
-f:Documentation/devicetree/bindings/clock/gpio-mux-clock.yaml
-f:Documentation/devicetree/bindings/clock/hi3660-clock.txt
-f:Documentation/devicetree/bindings/clock/hi3670-clock.txt
-f:Documentation/devicetree/bindings/clock/hi6220-clock.txt
-f:Documentation/devicetree/bindings/clock/hisi-crg.txt
-f:Documentation/devicetree/bindings/clock/hisilicon,hi3559av100-clock.yaml
-f:Documentation/devicetree/bindings/clock/idt,versaclock5.yaml
-f:Documentation/devicetree/bindings/clock/img,boston-clock.txt
-f:Documentation/devicetree/bindings/clock/img,pistachio-clk.yaml
-f:Documentation/devicetree/bindings/clock/imx1-clock.yaml
-f:Documentation/devicetree/bindings/clock/imx21-clock.yaml
-f:Documentation/devicetree/bindings/clock/imx23-clock.yaml
-f:Documentation/devicetree/bindings/clock/imx25-clock.yaml
-f:Documentation/devicetree/bindings/clock/imx27-clock.yaml
-f:Documentation/devicetree/bindings/clock/imx28-clock.yaml
-f:Documentation/devicetree/bindings/clock/imx31-clock.yaml
-f:Documentation/devicetree/bindings/clock/imx35-clock.yaml
-f:Documentation/devicetree/bindings/clock/imx5-clock.yaml
-f:Documentation/devicetree/bindings/clock/imx6q-clock.yaml
-f:Documentation/devicetree/bindings/clock/imx6sl-clock.yaml
-f:Documentation/devicetree/bindings/clock/imx6sll-clock.yaml
-f:Documentation/devicetree/bindings/clock/imx6sx-clock.yaml
-f:Documentation/devicetree/bindings/clock/imx6ul-clock.yaml
-f:Documentation/devicetree/bindings/clock/imx7d-clock.yaml
-f:Documentation/devicetree/bindings/clock/imx7ulp-pcc-clock.yaml
-f:Documentation/devicetree/bindings/clock/imx7ulp-scg-clock.yaml
-f:Documentation/devicetree/bindings/clock/imx8m-clock.yaml
-f:Documentation/devicetree/bindings/clock/imx8mp-audiomix.yaml
-f:Documentation/devicetree/bindings/clock/imx8qxp-lpcg.yaml
-f:Documentation/devicetree/bindings/clock/imx8ulp-cgc-clock.yaml
-f:Documentation/devicetree/bindings/clock/imx8ulp-pcc-clock.yaml
-f:Documentation/devicetree/bindings/clock/imx93-clock.yaml
-f:Documentation/devicetree/bindings/clock/imxrt1050-clock.yaml
-f:Documentation/devicetree/bindings/clock/ingenic,cgu.yaml
-f:Documentation/devicetree/bindings/clock/intel,agilex.yaml
-f:Documentation/devicetree/bindings/clock/intel,agilex5-clkmgr.yaml
-f:Documentation/devicetree/bindings/clock/intel,cgu-lgm.yaml
-f:Documentation/devicetree/bindings/clock/intel,easic-n5x.yaml
-f:Documentation/devicetree/bindings/clock/intel,stratix10.yaml
-f:Documentation/devicetree/bindings/clock/keystone-gate.txt
-f:Documentation/devicetree/bindings/clock/keystone-pll.txt
-f:Documentation/devicetree/bindings/clock/loongson,ls1x-clk.yaml
-f:Documentation/devicetree/bindings/clock/loongson,ls2k-clk.yaml
-f:Documentation/devicetree/bindings/clock/lsi,axm5516-clks.yaml
-f:Documentation/devicetree/bindings/clock/lsi,nspire-cx-clock.yaml
-f:Documentation/devicetree/bindings/clock/marvell,armada-370-corediv-clock.yaml
-f:Documentation/devicetree/bindings/clock/marvell,armada-3700-periph-clock.yaml
-f:Documentation/devicetree/bindings/clock/marvell,armada-3700-tbg-clock.yaml
-f:Documentation/devicetree/bindings/clock/marvell,armada-3700-uart-clock.yaml
-f:Documentation/devicetree/bindings/clock/marvell,armada-xp-cpu-clock.yaml
-f:Documentation/devicetree/bindings/clock/marvell,berlin2-clk.yaml
-f:Documentation/devicetree/bindings/clock/marvell,dove-divider-clock.yaml
-f:Documentation/devicetree/bindings/clock/marvell,mmp2-audio-clock.yaml
-f:Documentation/devicetree/bindings/clock/marvell,mmp2-clock.yaml
-f:Documentation/devicetree/bindings/clock/marvell,mvebu-core-clock.yaml
-f:Documentation/devicetree/bindings/clock/marvell,pxa168.txt
-f:Documentation/devicetree/bindings/clock/marvell,pxa1908.yaml
-f:Documentation/devicetree/bindings/clock/marvell,pxa1928.txt
-f:Documentation/devicetree/bindings/clock/marvell,pxa910.txt
-f:Documentation/devicetree/bindings/clock/marvell-armada-370-gating-clock.yaml
-f:Documentation/devicetree/bindings/clock/maxim,max9485.yaml
-f:Documentation/devicetree/bindings/clock/mediatek,apmixedsys.yaml
-f:Documentation/devicetree/bindings/clock/mediatek,ethsys.yaml
-f:Documentation/devicetree/bindings/clock/mediatek,infracfg.yaml
-f:Documentation/devicetree/bindings/clock/mediatek,mt2701-hifsys.yaml
-f:Documentation/devicetree/bindings/clock/mediatek,mt6795-clock.yaml
-f:Documentation/devicetree/bindings/clock/mediatek,mt7621-sysc.yaml
-f:Documentation/devicetree/bindings/clock/mediatek,mt7622-pciesys.yaml
-f:Documentation/devicetree/bindings/clock/mediatek,mt7622-ssusbsys.yaml
-f:Documentation/devicetree/bindings/clock/mediatek,mt7988-ethwarp.yaml
-f:Documentation/devicetree/bindings/clock/mediatek,mt7988-xfi-pll.yaml
-f:Documentation/devicetree/bindings/clock/mediatek,mt8186-clock.yaml
-f:Documentation/devicetree/bindings/clock/mediatek,mt8186-fhctl.yaml
-f:Documentation/devicetree/bindings/clock/mediatek,mt8186-sys-clock.yaml
-f:Documentation/devicetree/bindings/clock/mediatek,mt8188-clock.yaml
-f:Documentation/devicetree/bindings/clock/mediatek,mt8188-sys-clock.yaml
-f:Documentation/devicetree/bindings/clock/mediatek,mt8192-clock.yaml
-f:Documentation/devicetree/bindings/clock/mediatek,mt8192-sys-clock.yaml
-f:Documentation/devicetree/bindings/clock/mediatek,mt8195-clock.yaml
-f:Documentation/devicetree/bindings/clock/mediatek,mt8195-sys-clock.yaml
-f:Documentation/devicetree/bindings/clock/mediatek,mt8365-clock.yaml
-f:Documentation/devicetree/bindings/clock/mediatek,mt8365-sys-clock.yaml
-f:Documentation/devicetree/bindings/clock/mediatek,mtmips-sysc.yaml
-f:Documentation/devicetree/bindings/clock/mediatek,pericfg.yaml
-f:Documentation/devicetree/bindings/clock/mediatek,syscon.yaml
-f:Documentation/devicetree/bindings/clock/mediatek,topckgen.yaml
-f:Documentation/devicetree/bindings/clock/microchip,lan966x-gck.yaml
-f:Documentation/devicetree/bindings/clock/microchip,mpfs-ccc.yaml
-f:Documentation/devicetree/bindings/clock/microchip,mpfs-clkcfg.yaml
-f:Documentation/devicetree/bindings/clock/microchip,pic32mzda-clk.yaml
-f:Documentation/devicetree/bindings/clock/microchip,sparx5-dpll.yaml
-f:Documentation/devicetree/bindings/clock/milbeaut-clock.yaml
-f:Documentation/devicetree/bindings/clock/moxa,moxart-clock.yaml
-f:Documentation/devicetree/bindings/clock/mstar,msc313-cpupll.yaml
-f:Documentation/devicetree/bindings/clock/mstar,msc313-mpll.yaml
-f:Documentation/devicetree/bindings/clock/nuvoton,ma35d1-clk.yaml
-f:Documentation/devicetree/bindings/clock/nuvoton,npcm750-clk.yaml
-f:Documentation/devicetree/bindings/clock/nuvoton,npcm845-clk.yaml
-f:Documentation/devicetree/bindings/clock/nvidia,tegra124-car.yaml
-f:Documentation/devicetree/bindings/clock/nvidia,tegra124-dfll.txt
-f:Documentation/devicetree/bindings/clock/nvidia,tegra20-car.yaml
-f:Documentation/devicetree/bindings/clock/nxp,imx95-blk-ctl.yaml
-f:Documentation/devicetree/bindings/clock/nxp,imx95-display-master-csr.yaml
-f:Documentation/devicetree/bindings/clock/nxp,lpc1850-ccu.yaml
-f:Documentation/devicetree/bindings/clock/nxp,lpc1850-cgu.yaml
-f:Documentation/devicetree/bindings/clock/nxp,lpc3220-clk.yaml
-f:Documentation/devicetree/bindings/clock/nxp,lpc3220-usb-clk.yaml
-f:Documentation/devicetree/bindings/clock/pwm-clock.yaml
-f:Documentation/devicetree/bindings/clock/pxa-clock.txt
-f:Documentation/devicetree/bindings/clock/qca,ath79-pll.yaml
-f:Documentation/devicetree/bindings/clock/qcom,a53pll.yaml
-f:Documentation/devicetree/bindings/clock/qcom,a7pll.yaml
-f:Documentation/devicetree/bindings/clock/qcom,aoncc-sm8250.yaml
-f:Documentation/devicetree/bindings/clock/qcom,audiocc-sm8250.yaml
-f:Documentation/devicetree/bindings/clock/qcom,camcc-sm8250.yaml
-f:Documentation/devicetree/bindings/clock/qcom,dispcc-sc8280xp.yaml
-f:Documentation/devicetree/bindings/clock/qcom,dispcc-sm6125.yaml
-f:Documentation/devicetree/bindings/clock/qcom,dispcc-sm6350.yaml
-f:Documentation/devicetree/bindings/clock/qcom,dispcc-sm8x50.yaml
-f:Documentation/devicetree/bindings/clock/qcom,gcc-apq8064.yaml
-f:Documentation/devicetree/bindings/clock/qcom,gcc-apq8084.yaml
-f:Documentation/devicetree/bindings/clock/qcom,gcc-ipq4019.yaml
-f:Documentation/devicetree/bindings/clock/qcom,gcc-ipq6018.yaml
-f:Documentation/devicetree/bindings/clock/qcom,gcc-ipq8064.yaml
-f:Documentation/devicetree/bindings/clock/qcom,gcc-ipq8074.yaml
-f:Documentation/devicetree/bindings/clock/qcom,gcc-mdm9607.yaml
-f:Documentation/devicetree/bindings/clock/qcom,gcc-mdm9615.yaml
-f:Documentation/devicetree/bindings/clock/qcom,gcc-msm8660.yaml
-f:Documentation/devicetree/bindings/clock/qcom,gcc-msm8909.yaml
-f:Documentation/devicetree/bindings/clock/qcom,gcc-msm8916.yaml
-f:Documentation/devicetree/bindings/clock/qcom,gcc-msm8953.yaml
-f:Documentation/devicetree/bindings/clock/qcom,gcc-msm8974.yaml
-f:Documentation/devicetree/bindings/clock/qcom,gcc-msm8976.yaml
-f:Documentation/devicetree/bindings/clock/qcom,gcc-msm8994.yaml
-f:Documentation/devicetree/bindings/clock/qcom,gcc-msm8996.yaml
-f:Documentation/devicetree/bindings/clock/qcom,gcc-msm8998.yaml
-f:Documentation/devicetree/bindings/clock/qcom,gcc-qcm2290.yaml
-f:Documentation/devicetree/bindings/clock/qcom,gcc-qcs404.yaml
-f:Documentation/devicetree/bindings/clock/qcom,gcc-sc7180.yaml
-f:Documentation/devicetree/bindings/clock/qcom,gcc-sc7280.yaml
-f:Documentation/devicetree/bindings/clock/qcom,gcc-sc8180x.yaml
-f:Documentation/devicetree/bindings/clock/qcom,gcc-sc8280xp.yaml
-f:Documentation/devicetree/bindings/clock/qcom,gcc-sdm660.yaml
-f:Documentation/devicetree/bindings/clock/qcom,gcc-sdm845.yaml
-f:Documentation/devicetree/bindings/clock/qcom,gcc-sdx55.yaml
-f:Documentation/devicetree/bindings/clock/qcom,gcc-sdx65.yaml
-f:Documentation/devicetree/bindings/clock/qcom,gcc-sm6115.yaml
-f:Documentation/devicetree/bindings/clock/qcom,gcc-sm6125.yaml
-f:Documentation/devicetree/bindings/clock/qcom,gcc-sm6350.yaml
-f:Documentation/devicetree/bindings/clock/qcom,gcc-sm8150.yaml
-f:Documentation/devicetree/bindings/clock/qcom,gcc-sm8250.yaml
-f:Documentation/devicetree/bindings/clock/qcom,gcc-sm8350.yaml
-f:Documentation/devicetree/bindings/clock/qcom,gcc-sm8450.yaml
-f:Documentation/devicetree/bindings/clock/qcom,gcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,gpucc-sdm660.yaml
-f:Documentation/devicetree/bindings/clock/qcom,gpucc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,hfpll.yaml
-f:Documentation/devicetree/bindings/clock/qcom,ipq5018-gcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,ipq5332-gcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,ipq9574-cmn-pll.yaml
-f:Documentation/devicetree/bindings/clock/qcom,ipq9574-gcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,ipq9574-nsscc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,kpss-acc-v1.yaml
-f:Documentation/devicetree/bindings/clock/qcom,kpss-gcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,krait-cc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,lcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,milos-camcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,milos-dispcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,milos-gcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,milos-videocc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,mmcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,msm8996-apcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,msm8996-cbf.yaml
-f:Documentation/devicetree/bindings/clock/qcom,msm8998-gpucc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,q6sstopcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,qca8k-nsscc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,qcm2290-dispcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,qcm2290-gpucc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,qcs404-turingcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,qcs615-dispcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,qcs615-gcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,qcs615-gpucc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,qcs615-videocc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,qcs8300-gcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,qdu1000-ecpricc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,qdu1000-gcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,rpmcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,rpmhcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,sa8775p-camcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,sa8775p-dispcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,sa8775p-gcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,sa8775p-videocc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,sar2130p-gcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,sc7180-camcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,sc7180-dispcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,sc7180-lpasscorecc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,sc7280-camcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,sc7280-dispcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,sc7280-lpasscc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,sc7280-lpasscorecc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,sc8180x-camcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,sc8280xp-lpasscc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,sdm845-camcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,sdm845-dispcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,sdm845-lpasscc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,sdx75-gcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,sm4450-camcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,sm4450-dispcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,sm4450-gcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,sm6115-dispcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,sm6115-gpucc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,sm6115-lpasscc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,sm6125-gpucc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,sm6350-camcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,sm6375-dispcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,sm6375-gcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,sm6375-gpucc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,sm7150-camcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,sm7150-dispcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,sm7150-gcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,sm7150-videocc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,sm8150-camcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,sm8350-videocc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,sm8450-camcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,sm8450-dispcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,sm8450-gpucc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,sm8450-videocc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,sm8550-dispcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,sm8550-gcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,sm8550-tcsr.yaml
-f:Documentation/devicetree/bindings/clock/qcom,sm8650-gcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,sm8750-gcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,spmi-clkdiv.yaml
-f:Documentation/devicetree/bindings/clock/qcom,videocc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,x1e80100-camcc.yaml
-f:Documentation/devicetree/bindings/clock/qcom,x1e80100-gcc.yaml
-f:Documentation/devicetree/bindings/clock/raspberrypi,rp1-clocks.yaml
-f:Documentation/devicetree/bindings/clock/renesas,5p35023.yaml
-f:Documentation/devicetree/bindings/clock/renesas,9series.yaml
-f:Documentation/devicetree/bindings/clock/renesas,cpg-clocks.yaml
-f:Documentation/devicetree/bindings/clock/renesas,cpg-div6-clock.yaml
-f:Documentation/devicetree/bindings/clock/renesas,cpg-mssr.yaml
-f:Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.yaml
-f:Documentation/devicetree/bindings/clock/renesas,emev2-smu.yaml
-f:Documentation/devicetree/bindings/clock/renesas,r9a06g032-sysctrl.yaml
-f:Documentation/devicetree/bindings/clock/renesas,r9a08g045-vbattb.yaml
-f:Documentation/devicetree/bindings/clock/renesas,rcar-usb2-clock-sel.yaml
-f:Documentation/devicetree/bindings/clock/renesas,rzg2l-cpg.yaml
-f:Documentation/devicetree/bindings/clock/renesas,rzv2h-cpg.yaml
-f:Documentation/devicetree/bindings/clock/renesas,versaclock7.yaml
-f:Documentation/devicetree/bindings/clock/rockchip,px30-cru.yaml
-f:Documentation/devicetree/bindings/clock/rockchip,rk3036-cru.yaml
-f:Documentation/devicetree/bindings/clock/rockchip,rk3128-cru.yaml
-f:Documentation/devicetree/bindings/clock/rockchip,rk3188-cru.yaml
-f:Documentation/devicetree/bindings/clock/rockchip,rk3228-cru.yaml
-f:Documentation/devicetree/bindings/clock/rockchip,rk3288-cru.yaml
-f:Documentation/devicetree/bindings/clock/rockchip,rk3308-cru.yaml
-f:Documentation/devicetree/bindings/clock/rockchip,rk3328-cru.yaml
-f:Documentation/devicetree/bindings/clock/rockchip,rk3368-cru.yaml
-f:Documentation/devicetree/bindings/clock/rockchip,rk3399-cru.yaml
-f:Documentation/devicetree/bindings/clock/rockchip,rk3528-cru.yaml
-f:Documentation/devicetree/bindings/clock/rockchip,rk3562-cru.yaml
-f:Documentation/devicetree/bindings/clock/rockchip,rk3568-cru.yaml
-f:Documentation/devicetree/bindings/clock/rockchip,rk3576-cru.yaml
-f:Documentation/devicetree/bindings/clock/rockchip,rk3588-cru.yaml
-f:Documentation/devicetree/bindings/clock/rockchip,rv1108-cru.yaml
-f:Documentation/devicetree/bindings/clock/rockchip,rv1126-cru.yaml
-f:Documentation/devicetree/bindings/clock/samsung,exynos-audss-clock.yaml
-f:Documentation/devicetree/bindings/clock/samsung,exynos-clock.yaml
-f:Documentation/devicetree/bindings/clock/samsung,exynos-ext-clock.yaml
-f:Documentation/devicetree/bindings/clock/samsung,exynos2200-cmu.yaml
-f:Documentation/devicetree/bindings/clock/samsung,exynos4412-isp-clock.yaml
-f:Documentation/devicetree/bindings/clock/samsung,exynos5260-clock.yaml
-f:Documentation/devicetree/bindings/clock/samsung,exynos5410-clock.yaml
-f:Documentation/devicetree/bindings/clock/samsung,exynos5433-clock.yaml
-f:Documentation/devicetree/bindings/clock/samsung,exynos7-clock.yaml
-f:Documentation/devicetree/bindings/clock/samsung,exynos7870-cmu.yaml
-f:Documentation/devicetree/bindings/clock/samsung,exynos7885-clock.yaml
-f:Documentation/devicetree/bindings/clock/samsung,exynos850-clock.yaml
-f:Documentation/devicetree/bindings/clock/samsung,exynos8895-clock.yaml
-f:Documentation/devicetree/bindings/clock/samsung,exynos990-clock.yaml
-f:Documentation/devicetree/bindings/clock/samsung,exynosautov9-clock.yaml
-f:Documentation/devicetree/bindings/clock/samsung,exynosautov920-clock.yaml
-f:Documentation/devicetree/bindings/clock/samsung,s2mps11.yaml
-f:Documentation/devicetree/bindings/clock/samsung,s3c6400-clock.yaml
-f:Documentation/devicetree/bindings/clock/samsung,s5pv210-audss-clock.yaml
-f:Documentation/devicetree/bindings/clock/samsung,s5pv210-clock.yaml
-f:Documentation/devicetree/bindings/clock/sifive/fu540-prci.yaml
-f:Documentation/devicetree/bindings/clock/sifive/fu740-prci.yaml
-f:Documentation/devicetree/bindings/clock/silabs,si514.txt
-f:Documentation/devicetree/bindings/clock/silabs,si5341.txt
-f:Documentation/devicetree/bindings/clock/silabs,si5351.yaml
-f:Documentation/devicetree/bindings/clock/silabs,si544.txt
-f:Documentation/devicetree/bindings/clock/silabs,si570.txt
-f:Documentation/devicetree/bindings/clock/skyworks,si521xx.yaml
-f:Documentation/devicetree/bindings/clock/snps,hsdk-pll-clock.txt
-f:Documentation/devicetree/bindings/clock/snps,pll-clock.txt
-f:Documentation/devicetree/bindings/clock/socionext,uniphier-clock.yaml
-f:Documentation/devicetree/bindings/clock/sophgo,cv1800-clk.yaml
-f:Documentation/devicetree/bindings/clock/sophgo,sg2042-clkgen.yaml
-f:Documentation/devicetree/bindings/clock/sophgo,sg2042-pll.yaml
-f:Documentation/devicetree/bindings/clock/sophgo,sg2042-rpgate.yaml
-f:Documentation/devicetree/bindings/clock/sophgo,sg2044-clk.yaml
-f:Documentation/devicetree/bindings/clock/spacemit,k1-pll.yaml
-f:Documentation/devicetree/bindings/clock/sprd,sc9860-clk.yaml
-f:Documentation/devicetree/bindings/clock/sprd,sc9863a-clk.yaml
-f:Documentation/devicetree/bindings/clock/sprd,ums512-clk.yaml
-f:Documentation/devicetree/bindings/clock/st,nomadik.txt
-f:Documentation/devicetree/bindings/clock/st,stm32-rcc.yaml
-f:Documentation/devicetree/bindings/clock/st,stm32mp1-rcc.yaml
-f:Documentation/devicetree/bindings/clock/st,stm32mp25-rcc.yaml
-f:Documentation/devicetree/bindings/clock/st/st,clkgen-mux.txt
-f:Documentation/devicetree/bindings/clock/st/st,clkgen-pll.txt
-f:Documentation/devicetree/bindings/clock/st/st,clkgen.txt
-f:Documentation/devicetree/bindings/clock/st/st,flexgen.txt
-f:Documentation/devicetree/bindings/clock/st/st,quadfs.txt
-f:Documentation/devicetree/bindings/clock/starfive,jh7100-audclk.yaml
-f:Documentation/devicetree/bindings/clock/starfive,jh7100-clkgen.yaml
-f:Documentation/devicetree/bindings/clock/starfive,jh7110-aoncrg.yaml
-f:Documentation/devicetree/bindings/clock/starfive,jh7110-ispcrg.yaml
-f:Documentation/devicetree/bindings/clock/starfive,jh7110-pll.yaml
-f:Documentation/devicetree/bindings/clock/starfive,jh7110-stgcrg.yaml
-f:Documentation/devicetree/bindings/clock/starfive,jh7110-syscrg.yaml
-f:Documentation/devicetree/bindings/clock/starfive,jh7110-voutcrg.yaml
-f:Documentation/devicetree/bindings/clock/stericsson,u8500-clks.yaml
-f:Documentation/devicetree/bindings/clock/sunplus,sp7021-clkc.yaml
-f:Documentation/devicetree/bindings/clock/tesla,fsd-clock.yaml
-f:Documentation/devicetree/bindings/clock/thead,th1520-clk-ap.yaml
-f:Documentation/devicetree/bindings/clock/ti,am62-audio-refclk.yaml
-f:Documentation/devicetree/bindings/clock/ti,am654-ehrpwm-tbclk.yaml
-f:Documentation/devicetree/bindings/clock/ti,cdce706.txt
-f:Documentation/devicetree/bindings/clock/ti,cdce925.yaml
-f:Documentation/devicetree/bindings/clock/ti,clkctrl.yaml
-f:Documentation/devicetree/bindings/clock/ti,lmk04832.yaml
-f:Documentation/devicetree/bindings/clock/ti,sci-clk.yaml
-f:Documentation/devicetree/bindings/clock/ti/adpll.txt
-f:Documentation/devicetree/bindings/clock/ti/apll.txt
-f:Documentation/devicetree/bindings/clock/ti/clockdomain.txt
-f:Documentation/devicetree/bindings/clock/ti/davinci/da8xx-cfgchip.txt
-f:Documentation/devicetree/bindings/clock/ti/davinci/pll.txt
-f:Documentation/devicetree/bindings/clock/ti/davinci/psc.txt
-f:Documentation/devicetree/bindings/clock/ti/dpll.txt
-f:Documentation/devicetree/bindings/clock/ti/dra7-atl.txt
-f:Documentation/devicetree/bindings/clock/ti/fapll.txt
-f:Documentation/devicetree/bindings/clock/ti/ti,autoidle.yaml
-f:Documentation/devicetree/bindings/clock/ti/ti,clksel.yaml
-f:Documentation/devicetree/bindings/clock/ti/ti,composite-clock.yaml
-f:Documentation/devicetree/bindings/clock/ti/ti,divider-clock.yaml
-f:Documentation/devicetree/bindings/clock/ti/ti,fixed-factor-clock.yaml
-f:Documentation/devicetree/bindings/clock/ti/ti,gate-clock.yaml
-f:Documentation/devicetree/bindings/clock/ti/ti,interface-clock.yaml
-f:Documentation/devicetree/bindings/clock/ti/ti,mux-clock.yaml
-f:Documentation/devicetree/bindings/clock/toshiba,tmpv770x-pipllct.yaml
-f:Documentation/devicetree/bindings/clock/toshiba,tmpv770x-pismu.yaml
-f:Documentation/devicetree/bindings/clock/vt8500.txt
-f:Documentation/devicetree/bindings/clock/xlnx,clocking-wizard.yaml
-f:Documentation/devicetree/bindings/clock/xlnx,vcu.yaml
-f:Documentation/devicetree/bindings/clock/xlnx,versal-clk.yaml
-f:Documentation/devicetree/bindings/clock/zynq-7000.txt
-f:Documentation/devicetree/bindings/common-properties.txt
-f:Documentation/devicetree/bindings/connector/gocontroll,moduline-module-slot.yaml
-f:Documentation/devicetree/bindings/connector/usb-connector.yaml
-f:Documentation/devicetree/bindings/counter/fsl,ftm-quaddec.yaml
-f:Documentation/devicetree/bindings/counter/interrupt-counter.yaml
-f:Documentation/devicetree/bindings/counter/ti,am62-ecap-capture.yaml
-f:Documentation/devicetree/bindings/counter/ti-eqep.yaml
-f:Documentation/devicetree/bindings/cpu/cpu-capacity.txt
-f:Documentation/devicetree/bindings/cpu/idle-states.yaml
-f:Documentation/devicetree/bindings/cpufreq/airoha,en7581-cpufreq.yaml
-f:Documentation/devicetree/bindings/cpufreq/apple,cluster-cpufreq.yaml
-f:Documentation/devicetree/bindings/cpufreq/brcm,stb-avs-cpu-freq.txt
-f:Documentation/devicetree/bindings/cpufreq/cpufreq-dt.txt
-f:Documentation/devicetree/bindings/cpufreq/cpufreq-mediatek-hw.yaml
-f:Documentation/devicetree/bindings/cpufreq/cpufreq-qcom-hw.yaml
-f:Documentation/devicetree/bindings/cpufreq/cpufreq-spear.txt
-f:Documentation/devicetree/bindings/cpufreq/cpufreq-st.txt
-f:Documentation/devicetree/bindings/cpufreq/imx-cpufreq-dt.txt
-f:Documentation/devicetree/bindings/cpufreq/nvidia,tegra124-cpufreq.txt
-f:Documentation/devicetree/bindings/cpufreq/nvidia,tegra20-cpufreq.txt
-f:Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml
-f:Documentation/devicetree/bindings/cpufreq/qemu,virtual-cpufreq.yaml
-f:Documentation/devicetree/bindings/crypto/allwinner,sun4i-a10-crypto.yaml
-f:Documentation/devicetree/bindings/crypto/allwinner,sun8i-ce.yaml
-f:Documentation/devicetree/bindings/crypto/allwinner,sun8i-ss.yaml
-f:Documentation/devicetree/bindings/crypto/amd,ccp-seattle-v1a.yaml
-f:Documentation/devicetree/bindings/crypto/amlogic,gxl-crypto.yaml
-f:Documentation/devicetree/bindings/crypto/arm,cryptocell.yaml
-f:Documentation/devicetree/bindings/crypto/aspeed,ast2500-hace.yaml
-f:Documentation/devicetree/bindings/crypto/aspeed,ast2600-acry.yaml
-f:Documentation/devicetree/bindings/crypto/atmel,at91sam9g46-aes.yaml
-f:Documentation/devicetree/bindings/crypto/atmel,at91sam9g46-sha.yaml
-f:Documentation/devicetree/bindings/crypto/atmel,at91sam9g46-tdes.yaml
-f:Documentation/devicetree/bindings/crypto/axis,artpec6-crypto.yaml
-f:Documentation/devicetree/bindings/crypto/brcm,spum-crypto.yaml
-f:Documentation/devicetree/bindings/crypto/cortina,sl3516-crypto.yaml
-f:Documentation/devicetree/bindings/crypto/fsl,sec-v4.0-mon.yaml
-f:Documentation/devicetree/bindings/crypto/fsl,sec-v4.0.yaml
-f:Documentation/devicetree/bindings/crypto/fsl,sec2.0.yaml
-f:Documentation/devicetree/bindings/crypto/fsl-dcp.yaml
-f:Documentation/devicetree/bindings/crypto/fsl-imx-sahara.yaml
-f:Documentation/devicetree/bindings/crypto/fsl-imx-scc.yaml
-f:Documentation/devicetree/bindings/crypto/hisilicon,hip06-sec.yaml
-f:Documentation/devicetree/bindings/crypto/img,hash-accelerator.yaml
-f:Documentation/devicetree/bindings/crypto/inside-secure,safexcel-eip93.yaml
-f:Documentation/devicetree/bindings/crypto/inside-secure,safexcel.yaml
-f:Documentation/devicetree/bindings/crypto/intel,ixp4xx-crypto.yaml
-f:Documentation/devicetree/bindings/crypto/intel,keembay-ocs-aes.yaml
-f:Documentation/devicetree/bindings/crypto/intel,keembay-ocs-ecc.yaml
-f:Documentation/devicetree/bindings/crypto/intel,keembay-ocs-hcu.yaml
-f:Documentation/devicetree/bindings/crypto/marvell,orion-crypto.yaml
-f:Documentation/devicetree/bindings/crypto/nvidia,tegra234-se-aes.yaml
-f:Documentation/devicetree/bindings/crypto/nvidia,tegra234-se-hash.yaml
-f:Documentation/devicetree/bindings/crypto/qcom,inline-crypto-engine.yaml
-f:Documentation/devicetree/bindings/crypto/qcom,prng.yaml
-f:Documentation/devicetree/bindings/crypto/qcom-qce.yaml
-f:Documentation/devicetree/bindings/crypto/rockchip,rk3288-crypto.yaml
-f:Documentation/devicetree/bindings/crypto/samsung-slimsss.yaml
-f:Documentation/devicetree/bindings/crypto/samsung-sss.yaml
-f:Documentation/devicetree/bindings/crypto/st,stm32-crc.yaml
-f:Documentation/devicetree/bindings/crypto/st,stm32-cryp.yaml
-f:Documentation/devicetree/bindings/crypto/st,stm32-hash.yaml
-f:Documentation/devicetree/bindings/crypto/starfive,jh7110-crypto.yaml
-f:Documentation/devicetree/bindings/crypto/ti,omap-sham.yaml
-f:Documentation/devicetree/bindings/crypto/ti,omap2-aes.yaml
-f:Documentation/devicetree/bindings/crypto/ti,omap4-des.yaml
-f:Documentation/devicetree/bindings/crypto/ti,sa2ul.yaml
-f:Documentation/devicetree/bindings/crypto/xlnx,zynqmp-aes.yaml
-f:Documentation/devicetree/bindings/csky/cpus.txt
-f:Documentation/devicetree/bindings/csky/pmu.txt
-f:Documentation/devicetree/bindings/devfreq/event/rockchip,dfi.yaml
-f:Documentation/devicetree/bindings/devfreq/event/samsung,exynos-nocp.yaml
-f:Documentation/devicetree/bindings/devfreq/event/samsung,exynos-ppmu.yaml
-f:Documentation/devicetree/bindings/devfreq/nvidia,tegra30-actmon.yaml
-f:Documentation/devicetree/bindings/display/allwinner,sun4i-a10-display-backend.yaml
-f:Documentation/devicetree/bindings/display/allwinner,sun4i-a10-display-engine.yaml
-f:Documentation/devicetree/bindings/display/allwinner,sun4i-a10-display-frontend.yaml
-f:Documentation/devicetree/bindings/display/allwinner,sun4i-a10-hdmi.yaml
-f:Documentation/devicetree/bindings/display/allwinner,sun4i-a10-tcon.yaml
-f:Documentation/devicetree/bindings/display/allwinner,sun4i-a10-tv-encoder.yaml
-f:Documentation/devicetree/bindings/display/allwinner,sun6i-a31-drc.yaml
-f:Documentation/devicetree/bindings/display/allwinner,sun6i-a31-mipi-dsi.yaml
-f:Documentation/devicetree/bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml
-f:Documentation/devicetree/bindings/display/allwinner,sun8i-a83t-dw-hdmi.yaml
-f:Documentation/devicetree/bindings/display/allwinner,sun8i-a83t-hdmi-phy.yaml
-f:Documentation/devicetree/bindings/display/allwinner,sun8i-r40-tcon-top.yaml
-f:Documentation/devicetree/bindings/display/allwinner,sun9i-a80-deu.yaml
-f:Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.yaml
-f:Documentation/devicetree/bindings/display/amlogic,meson-g12a-dw-mipi-dsi.yaml
-f:Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml
-f:Documentation/devicetree/bindings/display/apple,h7-display-pipe-mipi.yaml
-f:Documentation/devicetree/bindings/display/apple,h7-display-pipe.yaml
-f:Documentation/devicetree/bindings/display/arm,hdlcd.yaml
-f:Documentation/devicetree/bindings/display/arm,komeda.yaml
-f:Documentation/devicetree/bindings/display/arm,malidp.yaml
-f:Documentation/devicetree/bindings/display/arm,pl11x.yaml
-f:Documentation/devicetree/bindings/display/armada/marvell,dove-lcd.txt
-f:Documentation/devicetree/bindings/display/atmel,lcdc-display.yaml
-f:Documentation/devicetree/bindings/display/atmel,lcdc.yaml
-f:Documentation/devicetree/bindings/display/atmel/atmel,hlcdc-display-controller.yaml
-f:Documentation/devicetree/bindings/display/brcm,bcm2711-hdmi.yaml
-f:Documentation/devicetree/bindings/display/brcm,bcm2835-dpi.yaml
-f:Documentation/devicetree/bindings/display/brcm,bcm2835-dsi0.yaml
-f:Documentation/devicetree/bindings/display/brcm,bcm2835-hdmi.yaml
-f:Documentation/devicetree/bindings/display/brcm,bcm2835-hvs.yaml
-f:Documentation/devicetree/bindings/display/brcm,bcm2835-pixelvalve0.yaml
-f:Documentation/devicetree/bindings/display/brcm,bcm2835-txp.yaml
-f:Documentation/devicetree/bindings/display/brcm,bcm2835-v3d.yaml
-f:Documentation/devicetree/bindings/display/brcm,bcm2835-vc4.yaml
-f:Documentation/devicetree/bindings/display/brcm,bcm2835-vec.yaml
-f:Documentation/devicetree/bindings/display/bridge/adi,adv7511.yaml
-f:Documentation/devicetree/bindings/display/bridge/adi,adv7533.yaml
-f:Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml
-f:Documentation/devicetree/bindings/display/bridge/analogix,anx7814.yaml
-f:Documentation/devicetree/bindings/display/bridge/analogix,dp.yaml
-f:Documentation/devicetree/bindings/display/bridge/anx6345.yaml
-f:Documentation/devicetree/bindings/display/bridge/cdns,dsi.yaml
-f:Documentation/devicetree/bindings/display/bridge/cdns,mhdp8546.yaml
-f:Documentation/devicetree/bindings/display/bridge/chipone,icn6211.yaml
-f:Documentation/devicetree/bindings/display/bridge/chrontel,ch7033.yaml
-f:Documentation/devicetree/bindings/display/bridge/fsl,imx8mp-hdmi-tx.yaml
-f:Documentation/devicetree/bindings/display/bridge/fsl,imx8qxp-ldb.yaml
-f:Documentation/devicetree/bindings/display/bridge/fsl,imx8qxp-pixel-combiner.yaml
-f:Documentation/devicetree/bindings/display/bridge/fsl,imx8qxp-pixel-link.yaml
-f:Documentation/devicetree/bindings/display/bridge/fsl,imx8qxp-pxl2dpi.yaml
-f:Documentation/devicetree/bindings/display/bridge/fsl,imx93-mipi-dsi.yaml
-f:Documentation/devicetree/bindings/display/bridge/fsl,ldb.yaml
-f:Documentation/devicetree/bindings/display/bridge/google,cros-ec-anx7688.yaml
-f:Documentation/devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yaml
-f:Documentation/devicetree/bindings/display/bridge/intel,keembay-dsi.yaml
-f:Documentation/devicetree/bindings/display/bridge/ite,it6263.yaml
-f:Documentation/devicetree/bindings/display/bridge/ite,it6505.yaml
-f:Documentation/devicetree/bindings/display/bridge/ite,it66121.yaml
-f:Documentation/devicetree/bindings/display/bridge/lontium,lt8912b.yaml
-f:Documentation/devicetree/bindings/display/bridge/lontium,lt9211.yaml
-f:Documentation/devicetree/bindings/display/bridge/lontium,lt9611.yaml
-f:Documentation/devicetree/bindings/display/bridge/lvds-codec.yaml
-f:Documentation/devicetree/bindings/display/bridge/megachips-stdpxxxx-ge-b850v3-fw.txt
-f:Documentation/devicetree/bindings/display/bridge/microchip,sam9x75-lvds.yaml
-f:Documentation/devicetree/bindings/display/bridge/nwl-dsi.yaml
-f:Documentation/devicetree/bindings/display/bridge/nxp,ptn3460.yaml
-f:Documentation/devicetree/bindings/display/bridge/nxp,tda998x.yaml
-f:Documentation/devicetree/bindings/display/bridge/parade,ps8622.yaml
-f:Documentation/devicetree/bindings/display/bridge/ps8640.yaml
-f:Documentation/devicetree/bindings/display/bridge/renesas,dsi-csi2-tx.yaml
-f:Documentation/devicetree/bindings/display/bridge/renesas,dsi.yaml
-f:Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.yaml
-f:Documentation/devicetree/bindings/display/bridge/renesas,lvds.yaml
-f:Documentation/devicetree/bindings/display/bridge/samsung,mipi-dsim.yaml
-f:Documentation/devicetree/bindings/display/bridge/sil,sii8620.yaml
-f:Documentation/devicetree/bindings/display/bridge/sil,sii9022.yaml
-f:Documentation/devicetree/bindings/display/bridge/sil,sii9234.yaml
-f:Documentation/devicetree/bindings/display/bridge/simple-bridge.yaml
-f:Documentation/devicetree/bindings/display/bridge/snps,dw-mipi-dsi.yaml
-f:Documentation/devicetree/bindings/display/bridge/synopsys,dw-hdmi.yaml
-f:Documentation/devicetree/bindings/display/bridge/thine,thc63lvd1024.yaml
-f:Documentation/devicetree/bindings/display/bridge/ti,dlpc3433.yaml
-f:Documentation/devicetree/bindings/display/bridge/ti,sn65dsi83.yaml
-f:Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.yaml
-f:Documentation/devicetree/bindings/display/bridge/ti,tdp158.yaml
-f:Documentation/devicetree/bindings/display/bridge/ti,tfp410.yaml
-f:Documentation/devicetree/bindings/display/bridge/toshiba,tc358762.yaml
-f:Documentation/devicetree/bindings/display/bridge/toshiba,tc358764.yaml
-f:Documentation/devicetree/bindings/display/bridge/toshiba,tc358767.yaml
-f:Documentation/devicetree/bindings/display/bridge/toshiba,tc358768.yaml
-f:Documentation/devicetree/bindings/display/bridge/toshiba,tc358775.yaml
-f:Documentation/devicetree/bindings/display/cirrus,clps711x-fb.txt
-f:Documentation/devicetree/bindings/display/connector/analog-tv-connector.yaml
-f:Documentation/devicetree/bindings/display/connector/dp-connector.yaml
-f:Documentation/devicetree/bindings/display/connector/dvi-connector.yaml
-f:Documentation/devicetree/bindings/display/connector/hdmi-connector.yaml
-f:Documentation/devicetree/bindings/display/connector/vga-connector.yaml
-f:Documentation/devicetree/bindings/display/dp-aux-bus.yaml
-f:Documentation/devicetree/bindings/display/dsi-controller.yaml
-f:Documentation/devicetree/bindings/display/elgin,jg10309-01.yaml
-f:Documentation/devicetree/bindings/display/faraday,tve200.yaml
-f:Documentation/devicetree/bindings/display/fsl,lcdif.yaml
-f:Documentation/devicetree/bindings/display/fsl,ls1021a-dcu.yaml
-f:Documentation/devicetree/bindings/display/fsl,vf610-tcon.yaml
-f:Documentation/devicetree/bindings/display/google,goldfish-fb.txt
-f:Documentation/devicetree/bindings/display/himax,hx8357.yaml
-f:Documentation/devicetree/bindings/display/hisilicon/dw-dsi.txt
-f:Documentation/devicetree/bindings/display/hisilicon/hisi-ade.txt
-f:Documentation/devicetree/bindings/display/ilitek,ili9225.txt
-f:Documentation/devicetree/bindings/display/ilitek,ili9486.yaml
-f:Documentation/devicetree/bindings/display/imx/fsl,imx-display-subsystem.yaml
-f:Documentation/devicetree/bindings/display/imx/fsl,imx-lcdc.yaml
-f:Documentation/devicetree/bindings/display/imx/fsl,imx-parallel-display.yaml
-f:Documentation/devicetree/bindings/display/imx/fsl,imx6-hdmi.yaml
-f:Documentation/devicetree/bindings/display/imx/fsl,imx6q-ipu.yaml
-f:Documentation/devicetree/bindings/display/imx/fsl,imx6q-ldb.yaml
-f:Documentation/devicetree/bindings/display/imx/fsl,imx6qp-pre.yaml
-f:Documentation/devicetree/bindings/display/imx/fsl,imx6qp-prg.yaml
-f:Documentation/devicetree/bindings/display/imx/fsl,imx8mp-hdmi-pvi.yaml
-f:Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-axi-performance-counter.yaml
-f:Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-blit-engine.yaml
-f:Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-blitblend.yaml
-f:Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-clut.yaml
-f:Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-command-sequencer.yaml
-f:Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-constframe.yaml
-f:Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-display-engine.yaml
-f:Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-dither.yaml
-f:Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-extdst.yaml
-f:Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-fetchunit.yaml
-f:Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-filter.yaml
-f:Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-framegen.yaml
-f:Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-gammacor.yaml
-f:Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-layerblend.yaml
-f:Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-matrix.yaml
-f:Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-pixel-engine.yaml
-f:Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-rop.yaml
-f:Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-safety.yaml
-f:Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-scaling-engine.yaml
-f:Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-signature.yaml
-f:Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-store.yaml
-f:Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-tcon.yaml
-f:Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc.yaml
-f:Documentation/devicetree/bindings/display/imx/nxp,imx8mq-dcss.yaml
-f:Documentation/devicetree/bindings/display/ingenic,ipu.yaml
-f:Documentation/devicetree/bindings/display/ingenic,lcd.yaml
-f:Documentation/devicetree/bindings/display/intel,keembay-display.yaml
-f:Documentation/devicetree/bindings/display/intel,keembay-msscam.yaml
-f:Documentation/devicetree/bindings/display/lvds-data-mapping.yaml
-f:Documentation/devicetree/bindings/display/lvds-dual-ports.yaml
-f:Documentation/devicetree/bindings/display/lvds.yaml
-f:Documentation/devicetree/bindings/display/marvell,pxa2xx-lcdc.txt
-f:Documentation/devicetree/bindings/display/marvell,pxa300-gcu.txt
-f:Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yaml
-f:Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.yaml
-f:Documentation/devicetree/bindings/display/mediatek/mediatek,cec.yaml
-f:Documentation/devicetree/bindings/display/mediatek/mediatek,color.yaml
-f:Documentation/devicetree/bindings/display/mediatek/mediatek,dither.yaml
-f:Documentation/devicetree/bindings/display/mediatek/mediatek,dp.yaml
-f:Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.yaml
-f:Documentation/devicetree/bindings/display/mediatek/mediatek,dsc.yaml
-f:Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.yaml
-f:Documentation/devicetree/bindings/display/mediatek/mediatek,ethdr.yaml
-f:Documentation/devicetree/bindings/display/mediatek/mediatek,gamma.yaml
-f:Documentation/devicetree/bindings/display/mediatek/mediatek,hdmi-ddc.yaml
-f:Documentation/devicetree/bindings/display/mediatek/mediatek,hdmi.yaml
-f:Documentation/devicetree/bindings/display/mediatek/mediatek,merge.yaml
-f:Documentation/devicetree/bindings/display/mediatek/mediatek,mt8195-hdmi-ddc.yaml
-f:Documentation/devicetree/bindings/display/mediatek/mediatek,mt8195-hdmi.yaml
-f:Documentation/devicetree/bindings/display/mediatek/mediatek,od.yaml
-f:Documentation/devicetree/bindings/display/mediatek/mediatek,ovl-2l.yaml
-f:Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.yaml
-f:Documentation/devicetree/bindings/display/mediatek/mediatek,padding.yaml
-f:Documentation/devicetree/bindings/display/mediatek/mediatek,postmask.yaml
-f:Documentation/devicetree/bindings/display/mediatek/mediatek,rdma.yaml
-f:Documentation/devicetree/bindings/display/mediatek/mediatek,split.yaml
-f:Documentation/devicetree/bindings/display/mediatek/mediatek,ufoe.yaml
-f:Documentation/devicetree/bindings/display/mediatek/mediatek,wdma.yaml
-f:Documentation/devicetree/bindings/display/mipi-dsi-bus.txt
-f:Documentation/devicetree/bindings/display/msm/dp-controller.yaml
-f:Documentation/devicetree/bindings/display/msm/dpu-common.yaml
-f:Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml
-f:Documentation/devicetree/bindings/display/msm/dsi-phy-10nm.yaml
-f:Documentation/devicetree/bindings/display/msm/dsi-phy-14nm.yaml
-f:Documentation/devicetree/bindings/display/msm/dsi-phy-20nm.yaml
-f:Documentation/devicetree/bindings/display/msm/dsi-phy-28nm.yaml
-f:Documentation/devicetree/bindings/display/msm/dsi-phy-7nm.yaml
-f:Documentation/devicetree/bindings/display/msm/dsi-phy-common.yaml
-f:Documentation/devicetree/bindings/display/msm/gmu.yaml
-f:Documentation/devicetree/bindings/display/msm/gpu.yaml
-f:Documentation/devicetree/bindings/display/msm/hdmi.yaml
-f:Documentation/devicetree/bindings/display/msm/mdp4.yaml
-f:Documentation/devicetree/bindings/display/msm/mdss-common.yaml
-f:Documentation/devicetree/bindings/display/msm/qcom,mdp5.yaml
-f:Documentation/devicetree/bindings/display/msm/qcom,mdss.yaml
-f:Documentation/devicetree/bindings/display/msm/qcom,msm8998-dpu.yaml
-f:Documentation/devicetree/bindings/display/msm/qcom,msm8998-mdss.yaml
-f:Documentation/devicetree/bindings/display/msm/qcom,qcm2290-dpu.yaml
-f:Documentation/devicetree/bindings/display/msm/qcom,qcm2290-mdss.yaml
-f:Documentation/devicetree/bindings/display/msm/qcom,sa8775p-mdss.yaml
-f:Documentation/devicetree/bindings/display/msm/qcom,sar2130p-mdss.yaml
-f:Documentation/devicetree/bindings/display/msm/qcom,sc7180-dpu.yaml
-f:Documentation/devicetree/bindings/display/msm/qcom,sc7180-mdss.yaml
-f:Documentation/devicetree/bindings/display/msm/qcom,sc7280-dpu.yaml
-f:Documentation/devicetree/bindings/display/msm/qcom,sc7280-mdss.yaml
-f:Documentation/devicetree/bindings/display/msm/qcom,sc8280xp-mdss.yaml
-f:Documentation/devicetree/bindings/display/msm/qcom,sdm670-mdss.yaml
-f:Documentation/devicetree/bindings/display/msm/qcom,sdm845-dpu.yaml
-f:Documentation/devicetree/bindings/display/msm/qcom,sdm845-mdss.yaml
-f:Documentation/devicetree/bindings/display/msm/qcom,sm6115-dpu.yaml
-f:Documentation/devicetree/bindings/display/msm/qcom,sm6115-mdss.yaml
-f:Documentation/devicetree/bindings/display/msm/qcom,sm6125-mdss.yaml
-f:Documentation/devicetree/bindings/display/msm/qcom,sm6150-dpu.yaml
-f:Documentation/devicetree/bindings/display/msm/qcom,sm6150-mdss.yaml
-f:Documentation/devicetree/bindings/display/msm/qcom,sm6350-mdss.yaml
-f:Documentation/devicetree/bindings/display/msm/qcom,sm6375-mdss.yaml
-f:Documentation/devicetree/bindings/display/msm/qcom,sm7150-dpu.yaml
-f:Documentation/devicetree/bindings/display/msm/qcom,sm7150-mdss.yaml
-f:Documentation/devicetree/bindings/display/msm/qcom,sm8150-dpu.yaml
-f:Documentation/devicetree/bindings/display/msm/qcom,sm8150-mdss.yaml
-f:Documentation/devicetree/bindings/display/msm/qcom,sm8250-mdss.yaml
-f:Documentation/devicetree/bindings/display/msm/qcom,sm8350-mdss.yaml
-f:Documentation/devicetree/bindings/display/msm/qcom,sm8450-mdss.yaml
-f:Documentation/devicetree/bindings/display/msm/qcom,sm8550-mdss.yaml
-f:Documentation/devicetree/bindings/display/msm/qcom,sm8650-dpu.yaml
-f:Documentation/devicetree/bindings/display/msm/qcom,sm8650-mdss.yaml
-f:Documentation/devicetree/bindings/display/msm/qcom,sm8750-mdss.yaml
-f:Documentation/devicetree/bindings/display/msm/qcom,x1e80100-mdss.yaml
-f:Documentation/devicetree/bindings/display/multi-inno,mi0283qt.txt
-f:Documentation/devicetree/bindings/display/panel/abt,y030xx067a.yaml
-f:Documentation/devicetree/bindings/display/panel/advantech,idk-1110wr.yaml
-f:Documentation/devicetree/bindings/display/panel/advantech,idk-2121wr.yaml
-f:Documentation/devicetree/bindings/display/panel/anbernic,rg35xx-plus-panel.yaml
-f:Documentation/devicetree/bindings/display/panel/apple,summit.yaml
-f:Documentation/devicetree/bindings/display/panel/arm,rtsm-display.yaml
-f:Documentation/devicetree/bindings/display/panel/arm,versatile-tft-panel.yaml
-f:Documentation/devicetree/bindings/display/panel/armadeus,st0700-adapt.yaml
-f:Documentation/devicetree/bindings/display/panel/asus,z00t-tm5p5-nt35596.yaml
-f:Documentation/devicetree/bindings/display/panel/auo,a030jtn01.yaml
-f:Documentation/devicetree/bindings/display/panel/bananapi,s070wv20-ct16.yaml
-f:Documentation/devicetree/bindings/display/panel/boe,bf060y8m-aj0.yaml
-f:Documentation/devicetree/bindings/display/panel/boe,himax8279d.yaml
-f:Documentation/devicetree/bindings/display/panel/boe,td4320.yaml
-f:Documentation/devicetree/bindings/display/panel/boe,th101mb31ig002-28a.yaml
-f:Documentation/devicetree/bindings/display/panel/boe,tv101wum-ll2.yaml
-f:Documentation/devicetree/bindings/display/panel/boe,tv101wum-nl6.yaml
-f:Documentation/devicetree/bindings/display/panel/display-timing.txt
-f:Documentation/devicetree/bindings/display/panel/display-timings.yaml
-f:Documentation/devicetree/bindings/display/panel/dlc,dlc0700yzg-1.yaml
-f:Documentation/devicetree/bindings/display/panel/ebbg,ft8719.yaml
-f:Documentation/devicetree/bindings/display/panel/elida,kd35t133.yaml
-f:Documentation/devicetree/bindings/display/panel/fascontek,fs035vg158.yaml
-f:Documentation/devicetree/bindings/display/panel/feixin,k101-im2ba02.yaml
-f:Documentation/devicetree/bindings/display/panel/feiyang,fy07024di26a30d.yaml
-f:Documentation/devicetree/bindings/display/panel/focaltech,gpt3.yaml
-f:Documentation/devicetree/bindings/display/panel/himax,hx8279.yaml
-f:Documentation/devicetree/bindings/display/panel/himax,hx83102.yaml
-f:Documentation/devicetree/bindings/display/panel/himax,hx83112a.yaml
-f:Documentation/devicetree/bindings/display/panel/himax,hx83112b.yaml
-f:Documentation/devicetree/bindings/display/panel/himax,hx8394.yaml
-f:Documentation/devicetree/bindings/display/panel/ilitek,ili9163.yaml
-f:Documentation/devicetree/bindings/display/panel/ilitek,ili9322.yaml
-f:Documentation/devicetree/bindings/display/panel/ilitek,ili9341.yaml
-f:Documentation/devicetree/bindings/display/panel/ilitek,ili9805.yaml
-f:Documentation/devicetree/bindings/display/panel/ilitek,ili9806e.yaml
-f:Documentation/devicetree/bindings/display/panel/ilitek,ili9881c.yaml
-f:Documentation/devicetree/bindings/display/panel/innolux,ee101ia-01d.yaml
-f:Documentation/devicetree/bindings/display/panel/innolux,ej030na.yaml
-f:Documentation/devicetree/bindings/display/panel/innolux,p097pfg.yaml
-f:Documentation/devicetree/bindings/display/panel/jadard,jd9365da-h3.yaml
-f:Documentation/devicetree/bindings/display/panel/jdi,lpm102a188a.yaml
-f:Documentation/devicetree/bindings/display/panel/jdi,lt070me05000.yaml
-f:Documentation/devicetree/bindings/display/panel/kingdisplay,kd035g6-54nt.yaml
-f:Documentation/devicetree/bindings/display/panel/leadtek,ltk035c5444t.yaml
-f:Documentation/devicetree/bindings/display/panel/leadtek,ltk050h3146w.yaml
-f:Documentation/devicetree/bindings/display/panel/leadtek,ltk500hd1829.yaml
-f:Documentation/devicetree/bindings/display/panel/lg,lg4573.yaml
-f:Documentation/devicetree/bindings/display/panel/lg,sw43408.yaml
-f:Documentation/devicetree/bindings/display/panel/lgphilips,lb035q02.yaml
-f:Documentation/devicetree/bindings/display/panel/logicpd,type28.yaml
-f:Documentation/devicetree/bindings/display/panel/mantix,mlaf057we51-x.yaml
-f:Documentation/devicetree/bindings/display/panel/mitsubishi,aa104xd12.yaml
-f:Documentation/devicetree/bindings/display/panel/mitsubishi,aa121td01.yaml
-f:Documentation/devicetree/bindings/display/panel/nec,nl8048hl11.yaml
-f:Documentation/devicetree/bindings/display/panel/newvision,nv3051d.yaml
-f:Documentation/devicetree/bindings/display/panel/novatek,nt35510.yaml
-f:Documentation/devicetree/bindings/display/panel/novatek,nt35950.yaml
-f:Documentation/devicetree/bindings/display/panel/novatek,nt36523.yaml
-f:Documentation/devicetree/bindings/display/panel/novatek,nt36672a.yaml
-f:Documentation/devicetree/bindings/display/panel/novatek,nt36672e.yaml
-f:Documentation/devicetree/bindings/display/panel/novatek,nt37801.yaml
-f:Documentation/devicetree/bindings/display/panel/olimex,lcd-olinuxino.yaml
-f:Documentation/devicetree/bindings/display/panel/orisetech,otm8009a.yaml
-f:Documentation/devicetree/bindings/display/panel/panel-common-dual.yaml
-f:Documentation/devicetree/bindings/display/panel/panel-common.yaml
-f:Documentation/devicetree/bindings/display/panel/panel-dpi.yaml
-f:Documentation/devicetree/bindings/display/panel/panel-dsi-cm.yaml
-f:Documentation/devicetree/bindings/display/panel/panel-edp-legacy.yaml
-f:Documentation/devicetree/bindings/display/panel/panel-edp.yaml
-f:Documentation/devicetree/bindings/display/panel/panel-lvds.yaml
-f:Documentation/devicetree/bindings/display/panel/panel-mipi-dbi-spi.yaml
-f:Documentation/devicetree/bindings/display/panel/panel-simple-dsi.yaml
-f:Documentation/devicetree/bindings/display/panel/panel-simple-lvds-dual-ports.yaml
-f:Documentation/devicetree/bindings/display/panel/panel-simple.yaml
-f:Documentation/devicetree/bindings/display/panel/panel-timing.yaml
-f:Documentation/devicetree/bindings/display/panel/pda,91-00156-a0.yaml
-f:Documentation/devicetree/bindings/display/panel/powertip,hx8238a.yaml
-f:Documentation/devicetree/bindings/display/panel/powertip,st7272.yaml
-f:Documentation/devicetree/bindings/display/panel/raspberrypi,7inch-touchscreen.yaml
-f:Documentation/devicetree/bindings/display/panel/raydium,rm67191.yaml
-f:Documentation/devicetree/bindings/display/panel/raydium,rm67200.yaml
-f:Documentation/devicetree/bindings/display/panel/raydium,rm68200.yaml
-f:Documentation/devicetree/bindings/display/panel/raydium,rm692e5.yaml
-f:Documentation/devicetree/bindings/display/panel/raydium,rm69380.yaml
-f:Documentation/devicetree/bindings/display/panel/renesas,r61307.yaml
-f:Documentation/devicetree/bindings/display/panel/renesas,r69328.yaml
-f:Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.yaml
-f:Documentation/devicetree/bindings/display/panel/ronbo,rb070d30.yaml
-f:Documentation/devicetree/bindings/display/panel/samsung,amoled-mipi-dsi.yaml
-f:Documentation/devicetree/bindings/display/panel/samsung,ams495qa01.yaml
-f:Documentation/devicetree/bindings/display/panel/samsung,ams581vf01.yaml
-f:Documentation/devicetree/bindings/display/panel/samsung,ams639rq08.yaml
-f:Documentation/devicetree/bindings/display/panel/samsung,atna33xc20.yaml
-f:Documentation/devicetree/bindings/display/panel/samsung,ld9040.yaml
-f:Documentation/devicetree/bindings/display/panel/samsung,lms380kf01.yaml
-f:Documentation/devicetree/bindings/display/panel/samsung,lms397kf04.yaml
-f:Documentation/devicetree/bindings/display/panel/samsung,s6d16d0.yaml
-f:Documentation/devicetree/bindings/display/panel/samsung,s6d27a1.yaml
-f:Documentation/devicetree/bindings/display/panel/samsung,s6d7aa0.yaml
-f:Documentation/devicetree/bindings/display/panel/samsung,s6e3ha8.yaml
-f:Documentation/devicetree/bindings/display/panel/samsung,s6e63m0.yaml
-f:Documentation/devicetree/bindings/display/panel/samsung,s6e88a0-ams427ap24.yaml
-f:Documentation/devicetree/bindings/display/panel/samsung,s6e88a0-ams452ef01.yaml
-f:Documentation/devicetree/bindings/display/panel/samsung,s6e8aa0.yaml
-f:Documentation/devicetree/bindings/display/panel/seiko,43wvf1g.yaml
-f:Documentation/devicetree/bindings/display/panel/sgd,gktw70sdae4se.yaml
-f:Documentation/devicetree/bindings/display/panel/sharp,lq101r1sx01.yaml
-f:Documentation/devicetree/bindings/display/panel/sharp,lq150x1lg11.yaml
-f:Documentation/devicetree/bindings/display/panel/sharp,ls037v7dw01.yaml
-f:Documentation/devicetree/bindings/display/panel/sharp,ls043t1le01.yaml
-f:Documentation/devicetree/bindings/display/panel/sharp,ls060t1sx01.yaml
-f:Documentation/devicetree/bindings/display/panel/sitronix,st7701.yaml
-f:Documentation/devicetree/bindings/display/panel/sitronix,st7789v.yaml
-f:Documentation/devicetree/bindings/display/panel/sony,acx424akp.yaml
-f:Documentation/devicetree/bindings/display/panel/sony,acx565akm.yaml
-f:Documentation/devicetree/bindings/display/panel/sony,td4353-jdi.yaml
-f:Documentation/devicetree/bindings/display/panel/sony,tulip-truly-nt35521.yaml
-f:Documentation/devicetree/bindings/display/panel/startek,kd070fhfid015.yaml
-f:Documentation/devicetree/bindings/display/panel/startek,startek-kd050c.yaml
-f:Documentation/devicetree/bindings/display/panel/synaptics,r63353.yaml
-f:Documentation/devicetree/bindings/display/panel/tfc,s9700rtwv43tr-01b.yaml
-f:Documentation/devicetree/bindings/display/panel/ti,nspire.yaml
-f:Documentation/devicetree/bindings/display/panel/tpo,td.yaml
-f:Documentation/devicetree/bindings/display/panel/tpo,tpg110.yaml
-f:Documentation/devicetree/bindings/display/panel/truly,nt35597-2K-display.yaml
-f:Documentation/devicetree/bindings/display/panel/visionox,g2647fb105.yaml
-f:Documentation/devicetree/bindings/display/panel/visionox,r66451.yaml
-f:Documentation/devicetree/bindings/display/panel/visionox,rm69299.yaml
-f:Documentation/devicetree/bindings/display/panel/visionox,rm692e5.yaml
-f:Documentation/devicetree/bindings/display/panel/visionox,vtdr6130.yaml
-f:Documentation/devicetree/bindings/display/panel/xinpeng,xpp055c272.yaml
-f:Documentation/devicetree/bindings/display/renesas,cmm.yaml
-f:Documentation/devicetree/bindings/display/renesas,du.yaml
-f:Documentation/devicetree/bindings/display/renesas,rzg2l-du.yaml
-f:Documentation/devicetree/bindings/display/renesas,shmobile-lcdc.yaml
-f:Documentation/devicetree/bindings/display/repaper.txt
-f:Documentation/devicetree/bindings/display/rockchip/rockchip,analogix-dp.yaml
-f:Documentation/devicetree/bindings/display/rockchip/rockchip,dw-hdmi.yaml
-f:Documentation/devicetree/bindings/display/rockchip/rockchip,dw-mipi-dsi.yaml
-f:Documentation/devicetree/bindings/display/rockchip/rockchip,inno-hdmi.yaml
-f:Documentation/devicetree/bindings/display/rockchip/rockchip,lvds.yaml
-f:Documentation/devicetree/bindings/display/rockchip/rockchip,rk3066-hdmi.yaml
-f:Documentation/devicetree/bindings/display/rockchip/rockchip,rk3399-cdn-dp.yaml
-f:Documentation/devicetree/bindings/display/rockchip/rockchip,rk3588-dw-hdmi-qp.yaml
-f:Documentation/devicetree/bindings/display/rockchip/rockchip,rk3588-mipi-dsi2.yaml
-f:Documentation/devicetree/bindings/display/rockchip/rockchip-drm.yaml
-f:Documentation/devicetree/bindings/display/rockchip/rockchip-vop.yaml
-f:Documentation/devicetree/bindings/display/rockchip/rockchip-vop2.yaml
-f:Documentation/devicetree/bindings/display/samsung/samsung,exynos-hdmi-ddc.yaml
-f:Documentation/devicetree/bindings/display/samsung/samsung,exynos-hdmi.yaml
-f:Documentation/devicetree/bindings/display/samsung/samsung,exynos-mixer.yaml
-f:Documentation/devicetree/bindings/display/samsung/samsung,exynos5-dp.yaml
-f:Documentation/devicetree/bindings/display/samsung/samsung,exynos5433-decon.yaml
-f:Documentation/devicetree/bindings/display/samsung/samsung,exynos5433-mic.yaml
-f:Documentation/devicetree/bindings/display/samsung/samsung,exynos7-decon.yaml
-f:Documentation/devicetree/bindings/display/samsung/samsung,fimd.yaml
-f:Documentation/devicetree/bindings/display/sharp,ls010b7dh04.yaml
-f:Documentation/devicetree/bindings/display/simple-framebuffer.yaml
-f:Documentation/devicetree/bindings/display/sitronix,st7567.yaml
-f:Documentation/devicetree/bindings/display/sitronix,st7571.yaml
-f:Documentation/devicetree/bindings/display/sitronix,st7586.yaml
-f:Documentation/devicetree/bindings/display/sitronix,st7735r.yaml
-f:Documentation/devicetree/bindings/display/sm501fb.txt
-f:Documentation/devicetree/bindings/display/snps,arcpgu.txt
-f:Documentation/devicetree/bindings/display/solomon,ssd-common.yaml
-f:Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml
-f:Documentation/devicetree/bindings/display/solomon,ssd132x.yaml
-f:Documentation/devicetree/bindings/display/solomon,ssd133x.yaml
-f:Documentation/devicetree/bindings/display/sprd/sprd,display-subsystem.yaml
-f:Documentation/devicetree/bindings/display/sprd/sprd,sharkl3-dpu.yaml
-f:Documentation/devicetree/bindings/display/sprd/sprd,sharkl3-dsi-host.yaml
-f:Documentation/devicetree/bindings/display/ssd1289fb.txt
-f:Documentation/devicetree/bindings/display/st,stih4xx.txt
-f:Documentation/devicetree/bindings/display/st,stm32-dsi.yaml
-f:Documentation/devicetree/bindings/display/st,stm32-ltdc.yaml
-f:Documentation/devicetree/bindings/display/st,stm32mp25-lvds.yaml
-f:Documentation/devicetree/bindings/display/ste,mcde.yaml
-f:Documentation/devicetree/bindings/display/tegra/nvidia,tegra114-mipi.yaml
-f:Documentation/devicetree/bindings/display/tegra/nvidia,tegra124-dpaux.yaml
-f:Documentation/devicetree/bindings/display/tegra/nvidia,tegra124-sor.yaml
-f:Documentation/devicetree/bindings/display/tegra/nvidia,tegra124-vic.yaml
-f:Documentation/devicetree/bindings/display/tegra/nvidia,tegra186-dc.yaml
-f:Documentation/devicetree/bindings/display/tegra/nvidia,tegra186-display.yaml
-f:Documentation/devicetree/bindings/display/tegra/nvidia,tegra186-dsi-padctl.yaml
-f:Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-dc.yaml
-f:Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-dsi.yaml
-f:Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-epp.yaml
-f:Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-gr2d.yaml
-f:Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-gr3d.yaml
-f:Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-hdmi.yaml
-f:Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.yaml
-f:Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-isp.yaml
-f:Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-mpe.yaml
-f:Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-tvo.yaml
-f:Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-vi.yaml
-f:Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-vip.yaml
-f:Documentation/devicetree/bindings/display/tegra/nvidia,tegra210-csi.yaml
-f:Documentation/devicetree/bindings/display/ti/ti,am625-oldi.yaml
-f:Documentation/devicetree/bindings/display/ti/ti,am65x-dss.yaml
-f:Documentation/devicetree/bindings/display/ti/ti,dra7-dss.txt
-f:Documentation/devicetree/bindings/display/ti/ti,j721e-dss.yaml
-f:Documentation/devicetree/bindings/display/ti/ti,k2g-dss.yaml
-f:Documentation/devicetree/bindings/display/ti/ti,omap-dss.txt
-f:Documentation/devicetree/bindings/display/ti/ti,omap2-dss.txt
-f:Documentation/devicetree/bindings/display/ti/ti,omap3-dss.txt
-f:Documentation/devicetree/bindings/display/ti/ti,omap4-dss.txt
-f:Documentation/devicetree/bindings/display/ti/ti,omap5-dss.txt
-f:Documentation/devicetree/bindings/display/ti/ti,opa362.txt
-f:Documentation/devicetree/bindings/display/ti/ti,tpd12s015.txt
-f:Documentation/devicetree/bindings/display/tilcdc/panel.txt
-f:Documentation/devicetree/bindings/display/tilcdc/tilcdc.txt
-f:Documentation/devicetree/bindings/display/via,vt8500-fb.txt
-f:Documentation/devicetree/bindings/display/wm,prizm-ge-rops.txt
-f:Documentation/devicetree/bindings/display/wm,wm8505-fb.txt
-f:Documentation/devicetree/bindings/display/xlnx/xlnx,zynqmp-dpsub.yaml
-f:Documentation/devicetree/bindings/display/xylon,logicvc-display.yaml
-f:Documentation/devicetree/bindings/dma/adi,axi-dmac.yaml
-f:Documentation/devicetree/bindings/dma/allwinner,sun4i-a10-dma.yaml
-f:Documentation/devicetree/bindings/dma/allwinner,sun50i-a64-dma.yaml
-f:Documentation/devicetree/bindings/dma/allwinner,sun6i-a31-dma.yaml
-f:Documentation/devicetree/bindings/dma/altr,msgdma.yaml
-f:Documentation/devicetree/bindings/dma/apm-xgene-dma.txt
-f:Documentation/devicetree/bindings/dma/apple,admac.yaml
-f:Documentation/devicetree/bindings/dma/arm,dma-350.yaml
-f:Documentation/devicetree/bindings/dma/arm,pl330.yaml
-f:Documentation/devicetree/bindings/dma/arm-pl08x.yaml
-f:Documentation/devicetree/bindings/dma/atmel,at91sam9g45-dma.yaml
-f:Documentation/devicetree/bindings/dma/atmel,sama5d4-dma.yaml
-f:Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.yaml
-f:Documentation/devicetree/bindings/dma/brcm,iproc-sba.txt
-f:Documentation/devicetree/bindings/dma/cirrus,ep9301-dma-m2m.yaml
-f:Documentation/devicetree/bindings/dma/cirrus,ep9301-dma-m2p.yaml
-f:Documentation/devicetree/bindings/dma/dma-common.yaml
-f:Documentation/devicetree/bindings/dma/dma-controller.yaml
-f:Documentation/devicetree/bindings/dma/dma-router.yaml
-f:Documentation/devicetree/bindings/dma/dma.txt
-f:Documentation/devicetree/bindings/dma/fsl,edma.yaml
-f:Documentation/devicetree/bindings/dma/fsl,elo-dma.yaml
-f:Documentation/devicetree/bindings/dma/fsl,elo3-dma.yaml
-f:Documentation/devicetree/bindings/dma/fsl,eloplus-dma.yaml
-f:Documentation/devicetree/bindings/dma/fsl,imx-dma.yaml
-f:Documentation/devicetree/bindings/dma/fsl,imx-sdma.yaml
-f:Documentation/devicetree/bindings/dma/fsl,mxs-dma.yaml
-f:Documentation/devicetree/bindings/dma/fsl-qdma.yaml
-f:Documentation/devicetree/bindings/dma/img-mdc-dma.txt
-f:Documentation/devicetree/bindings/dma/ingenic,dma.yaml
-f:Documentation/devicetree/bindings/dma/intel,ldma.yaml
-f:Documentation/devicetree/bindings/dma/k3dma.txt
-f:Documentation/devicetree/bindings/dma/loongson,ls1b-apbdma.yaml
-f:Documentation/devicetree/bindings/dma/loongson,ls2x-apbdma.yaml
-f:Documentation/devicetree/bindings/dma/marvell,mmp-dma.yaml
-f:Documentation/devicetree/bindings/dma/marvell,xor-v2.yaml
-f:Documentation/devicetree/bindings/dma/mediatek,mt7622-hsdma.yaml
-f:Documentation/devicetree/bindings/dma/mediatek,uart-dma.yaml
-f:Documentation/devicetree/bindings/dma/milbeaut-m10v-hdmac.txt
-f:Documentation/devicetree/bindings/dma/milbeaut-m10v-xdmac.txt
-f:Documentation/devicetree/bindings/dma/moxa,moxart-dma.txt
-f:Documentation/devicetree/bindings/dma/mpc512x-dma.txt
-f:Documentation/devicetree/bindings/dma/mv-xor.txt
-f:Documentation/devicetree/bindings/dma/nvidia,tegra186-gpc-dma.yaml
-f:Documentation/devicetree/bindings/dma/nvidia,tegra20-apbdma.yaml
-f:Documentation/devicetree/bindings/dma/nvidia,tegra210-adma.yaml
-f:Documentation/devicetree/bindings/dma/nxp,lpc3220-dmamux.yaml
-f:Documentation/devicetree/bindings/dma/owl-dma.yaml
-f:Documentation/devicetree/bindings/dma/qcom,adm.yaml
-f:Documentation/devicetree/bindings/dma/qcom,bam-dma.yaml
-f:Documentation/devicetree/bindings/dma/qcom,gpi.yaml
-f:Documentation/devicetree/bindings/dma/renesas,nbpfaxi.txt
-f:Documentation/devicetree/bindings/dma/renesas,rcar-dmac.yaml
-f:Documentation/devicetree/bindings/dma/renesas,rz-dmac.yaml
-f:Documentation/devicetree/bindings/dma/renesas,rzn1-dmamux.yaml
-f:Documentation/devicetree/bindings/dma/renesas,usb-dmac.yaml
-f:Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml
-f:Documentation/devicetree/bindings/dma/snps,dma-spear1340.yaml
-f:Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml
-f:Documentation/devicetree/bindings/dma/socionext,uniphier-mio-dmac.yaml
-f:Documentation/devicetree/bindings/dma/socionext,uniphier-xdmac.yaml
-f:Documentation/devicetree/bindings/dma/sprd,sc9860-dma.yaml
-f:Documentation/devicetree/bindings/dma/st_fdma.txt
-f:Documentation/devicetree/bindings/dma/stericsson,dma40.yaml
-f:Documentation/devicetree/bindings/dma/stm32/st,stm32-dma.yaml
-f:Documentation/devicetree/bindings/dma/stm32/st,stm32-dma3.yaml
-f:Documentation/devicetree/bindings/dma/stm32/st,stm32-dmamux.yaml
-f:Documentation/devicetree/bindings/dma/stm32/st,stm32-mdma.yaml
-f:Documentation/devicetree/bindings/dma/ti-dma-crossbar.txt
-f:Documentation/devicetree/bindings/dma/ti-edma.txt
-f:Documentation/devicetree/bindings/dma/ti/k3-bcdma.yaml
-f:Documentation/devicetree/bindings/dma/ti/k3-pktdma.yaml
-f:Documentation/devicetree/bindings/dma/ti/k3-udma.yaml
-f:Documentation/devicetree/bindings/dma/xilinx/xilinx_dma.txt
-f:Documentation/devicetree/bindings/dma/xilinx/xlnx,zynqmp-dma-1.0.yaml
-f:Documentation/devicetree/bindings/dma/xilinx/xlnx,zynqmp-dpdma.yaml
-f:Documentation/devicetree/bindings/dpll/dpll-device.yaml
-f:Documentation/devicetree/bindings/dpll/dpll-pin.yaml
-f:Documentation/devicetree/bindings/dpll/microchip,zl30731.yaml
-f:Documentation/devicetree/bindings/dsp/fsl,dsp.yaml
-f:Documentation/devicetree/bindings/dsp/mediatek,mt8186-dsp.yaml
-f:Documentation/devicetree/bindings/dsp/mediatek,mt8195-dsp.yaml
-f:Documentation/devicetree/bindings/dts-coding-style.rst
-f:Documentation/devicetree/bindings/dvfs/performance-domain.yaml
-f:Documentation/devicetree/bindings/edac/altr,socfpga-ecc-manager.yaml
-f:Documentation/devicetree/bindings/edac/amazon,al-mc-edac.yaml
-f:Documentation/devicetree/bindings/edac/apm-xgene-edac.txt
-f:Documentation/devicetree/bindings/edac/aspeed-sdram-edac.txt
-f:Documentation/devicetree/bindings/edac/dmc-520.yaml
-f:Documentation/devicetree/bindings/eeprom/at24.yaml
-f:Documentation/devicetree/bindings/eeprom/at25.yaml
-f:Documentation/devicetree/bindings/eeprom/microchip,93lc46b.yaml
-f:Documentation/devicetree/bindings/example-schema.yaml
-f:Documentation/devicetree/bindings/extcon/extcon-max3355.txt
-f:Documentation/devicetree/bindings/extcon/extcon-palmas.txt
-f:Documentation/devicetree/bindings/extcon/extcon-ptn5150.yaml
-f:Documentation/devicetree/bindings/extcon/extcon-rt8973a.txt
-f:Documentation/devicetree/bindings/extcon/extcon-usbc-cros-ec.yaml
-f:Documentation/devicetree/bindings/extcon/extcon-usbc-tusb320.yaml
-f:Documentation/devicetree/bindings/extcon/fcs,fsa880.yaml
-f:Documentation/devicetree/bindings/extcon/linux,extcon-usb-gpio.yaml
-f:Documentation/devicetree/bindings/extcon/maxim,max77843.yaml
-f:Documentation/devicetree/bindings/extcon/qcom,pm8941-misc.yaml
-f:Documentation/devicetree/bindings/extcon/siliconmitus,sm5502-muic.yaml
-f:Documentation/devicetree/bindings/extcon/wlf,arizona.yaml
-f:Documentation/devicetree/bindings/firmware/amlogic,meson-gxbb-sm.yaml
-f:Documentation/devicetree/bindings/firmware/arm,scmi.yaml
-f:Documentation/devicetree/bindings/firmware/arm,scpi.yaml
-f:Documentation/devicetree/bindings/firmware/brcm,kona-smc.yaml
-f:Documentation/devicetree/bindings/firmware/coreboot.txt
-f:Documentation/devicetree/bindings/firmware/cznic,turris-mox-rwtm.txt
-f:Documentation/devicetree/bindings/firmware/cznic,turris-omnia-mcu.yaml
-f:Documentation/devicetree/bindings/firmware/fsl,scu.yaml
-f:Documentation/devicetree/bindings/firmware/google,gs101-acpm-ipc.yaml
-f:Documentation/devicetree/bindings/firmware/intel,ixp4xx-network-processing-engine.yaml
-f:Documentation/devicetree/bindings/firmware/intel,stratix10-svc.yaml
-f:Documentation/devicetree/bindings/firmware/nvidia,tegra186-bpmp.yaml
-f:Documentation/devicetree/bindings/firmware/nvidia,tegra210-bpmp.txt
-f:Documentation/devicetree/bindings/firmware/nxp,imx95-scmi-pinctrl.yaml
-f:Documentation/devicetree/bindings/firmware/nxp,imx95-scmi.yaml
-f:Documentation/devicetree/bindings/firmware/qcom,scm.yaml
-f:Documentation/devicetree/bindings/firmware/qemu,fw-cfg-mmio.yaml
-f:Documentation/devicetree/bindings/firmware/thead,th1520-aon.yaml
-f:Documentation/devicetree/bindings/firmware/xilinx/xlnx,zynqmp-firmware.yaml
-f:Documentation/devicetree/bindings/fpga/altera-pr-ip.txt
-f:Documentation/devicetree/bindings/fpga/altera-socfpga-a10-fpga-mgr.txt
-f:Documentation/devicetree/bindings/fpga/altera-socfpga-fpga-mgr.txt
-f:Documentation/devicetree/bindings/fpga/altr,fpga-passive-serial.yaml
-f:Documentation/devicetree/bindings/fpga/altr,freeze-bridge-controller.yaml
-f:Documentation/devicetree/bindings/fpga/altr,socfpga-fpga2sdram-bridge.yaml
-f:Documentation/devicetree/bindings/fpga/altr,socfpga-hps2fpga-bridge.yaml
-f:Documentation/devicetree/bindings/fpga/fpga-bridge.yaml
-f:Documentation/devicetree/bindings/fpga/fpga-region.yaml
-f:Documentation/devicetree/bindings/fpga/intel,stratix10-soc-fpga-mgr.yaml
-f:Documentation/devicetree/bindings/fpga/lattice,sysconfig.yaml
-f:Documentation/devicetree/bindings/fpga/lattice-ice40-fpga-mgr.txt
-f:Documentation/devicetree/bindings/fpga/lattice-machxo2-spi.txt
-f:Documentation/devicetree/bindings/fpga/microchip,mpf-spi-fpga-mgr.yaml
-f:Documentation/devicetree/bindings/fpga/xilinx-zynq-fpga-mgr.yaml
-f:Documentation/devicetree/bindings/fpga/xlnx,fpga-selectmap.yaml
-f:Documentation/devicetree/bindings/fpga/xlnx,fpga-slave-serial.yaml
-f:Documentation/devicetree/bindings/fpga/xlnx,pr-decoupler.yaml
-f:Documentation/devicetree/bindings/fpga/xlnx,versal-fpga.yaml
-f:Documentation/devicetree/bindings/fpga/xlnx,zynqmp-pcap-fpga.yaml
-f:Documentation/devicetree/bindings/fsi/aspeed,ast2600-fsi-master.yaml
-f:Documentation/devicetree/bindings/fsi/fsi-controller.yaml
-f:Documentation/devicetree/bindings/fsi/fsi-master-ast-cf.txt
-f:Documentation/devicetree/bindings/fsi/fsi-master-gpio.txt
-f:Documentation/devicetree/bindings/fsi/fsi.txt
-f:Documentation/devicetree/bindings/fsi/ibm,fsi2spi.yaml
-f:Documentation/devicetree/bindings/fsi/ibm,i2cr-fsi-master.yaml
-f:Documentation/devicetree/bindings/fsi/ibm,p9-fsi-controller.yaml
-f:Documentation/devicetree/bindings/fsi/ibm,p9-occ.yaml
-f:Documentation/devicetree/bindings/fsi/ibm,p9-sbefifo.yaml
-f:Documentation/devicetree/bindings/fsi/ibm,p9-scom.yaml
-f:Documentation/devicetree/bindings/fuse/nvidia,tegra20-fuse.yaml
-f:Documentation/devicetree/bindings/gnss/brcm,bcm4751.yaml
-f:Documentation/devicetree/bindings/gnss/gnss-common.yaml
-f:Documentation/devicetree/bindings/gnss/mediatek.yaml
-f:Documentation/devicetree/bindings/gnss/sirfstar.yaml
-f:Documentation/devicetree/bindings/gnss/u-blox,neo-6m.yaml
-f:Documentation/devicetree/bindings/goldfish/audio.txt
-f:Documentation/devicetree/bindings/goldfish/battery.txt
-f:Documentation/devicetree/bindings/goldfish/events.txt
-f:Documentation/devicetree/bindings/goldfish/pipe.txt
-f:Documentation/devicetree/bindings/goldfish/tty.txt
-f:Documentation/devicetree/bindings/gpio/abilis,tb10x-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/adi,ds4520-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/airoha,en7523-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/altr-pio-1.0.yaml
-f:Documentation/devicetree/bindings/gpio/apm,xgene-gpio-sb.yaml
-f:Documentation/devicetree/bindings/gpio/apple,smc-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/aspeed,ast2400-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/aspeed,sgpio.yaml
-f:Documentation/devicetree/bindings/gpio/atmel,at91rm9200-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/blaize,blzp1600-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/brcm,bcm63xx-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/brcm,kona-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/brcm,xgs-iproc-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/cavium,octeon-3860-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/cdns,gpio.yaml
-f:Documentation/devicetree/bindings/gpio/cirrus,clps711x-mctrl-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/delta,tn48m-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/exar,xra1403.yaml
-f:Documentation/devicetree/bindings/gpio/fairchild,74hc595.yaml
-f:Documentation/devicetree/bindings/gpio/faraday,ftgpio010.yaml
-f:Documentation/devicetree/bindings/gpio/fsl,imx8qxp-sc-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/fsl,qoriq-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/fsl-imx-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/fujitsu,mb86s70-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/gpio-adnp.txt
-f:Documentation/devicetree/bindings/gpio/gpio-consumer-common.yaml
-f:Documentation/devicetree/bindings/gpio/gpio-davinci.yaml
-f:Documentation/devicetree/bindings/gpio/gpio-delay.yaml
-f:Documentation/devicetree/bindings/gpio/gpio-ep9301.yaml
-f:Documentation/devicetree/bindings/gpio/gpio-exar.txt
-f:Documentation/devicetree/bindings/gpio/gpio-grgpio.txt
-f:Documentation/devicetree/bindings/gpio/gpio-latch.yaml
-f:Documentation/devicetree/bindings/gpio/gpio-mmio.yaml
-f:Documentation/devicetree/bindings/gpio/gpio-mvebu.yaml
-f:Documentation/devicetree/bindings/gpio/gpio-mxs.yaml
-f:Documentation/devicetree/bindings/gpio/gpio-pca95xx.yaml
-f:Documentation/devicetree/bindings/gpio/gpio-rda.yaml
-f:Documentation/devicetree/bindings/gpio/gpio-stp-xway.yaml
-f:Documentation/devicetree/bindings/gpio/gpio-thunderx.txt
-f:Documentation/devicetree/bindings/gpio/gpio-vf610.yaml
-f:Documentation/devicetree/bindings/gpio/gpio-virtio.yaml
-f:Documentation/devicetree/bindings/gpio/gpio-zynq.yaml
-f:Documentation/devicetree/bindings/gpio/gpio.txt
-f:Documentation/devicetree/bindings/gpio/hisilicon,ascend910-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/idt,32434-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/intel,ixp4xx-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/kontron,sl28cpld-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/lacie,netxbig-gpio-ext.yaml
-f:Documentation/devicetree/bindings/gpio/lantiq,gpio-mm-lantiq.yaml
-f:Documentation/devicetree/bindings/gpio/loongson,ls-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/lsi,zevio-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/maxim,max31910.yaml
-f:Documentation/devicetree/bindings/gpio/maxim,max77759-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/mediatek,mt7621-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/microchip,mpfs-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/microchip,pic32mzda-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/mrvl-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/mstar,msc313-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/nuvoton,sgpio.yaml
-f:Documentation/devicetree/bindings/gpio/nvidia,tegra186-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/nvidia,tegra20-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/nxp,lpc1850-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/nxp,lpc3220-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/nxp,pcf8575.yaml
-f:Documentation/devicetree/bindings/gpio/pisosr-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/pl061-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/qca,ar7100-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/qcom,wcd934x-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/realtek,otto-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/realtek,rtd-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/renesas,em-gio.yaml
-f:Documentation/devicetree/bindings/gpio/renesas,rcar-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/rockchip,gpio-bank.yaml
-f:Documentation/devicetree/bindings/gpio/sifive,gpio.yaml
-f:Documentation/devicetree/bindings/gpio/snps,dw-apb-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/socionext,uniphier-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/sodaville.txt
-f:Documentation/devicetree/bindings/gpio/spacemit,k1-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/sprd,gpio-eic.yaml
-f:Documentation/devicetree/bindings/gpio/sprd,gpio.yaml
-f:Documentation/devicetree/bindings/gpio/st,nomadik-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/st,spear-spics-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/st,stmpe-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/ti,keystone-dsp-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/ti,omap-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/ti,twl4030-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/toshiba,gpio-visconti.yaml
-f:Documentation/devicetree/bindings/gpio/trivial-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/x-powers,axp209-gpio.yaml
-f:Documentation/devicetree/bindings/gpio/xlnx,gpio-xilinx.yaml
-f:Documentation/devicetree/bindings/gpio/xlnx,zynqmp-gpio-modepin.yaml
-f:Documentation/devicetree/bindings/gpio/xylon,logicvc-gpio.yaml
-f:Documentation/devicetree/bindings/gpu/apple,agx.yaml
-f:Documentation/devicetree/bindings/gpu/arm,mali-bifrost.yaml
-f:Documentation/devicetree/bindings/gpu/arm,mali-midgard.yaml
-f:Documentation/devicetree/bindings/gpu/arm,mali-utgard.yaml
-f:Documentation/devicetree/bindings/gpu/arm,mali-valhall-csf.yaml
-f:Documentation/devicetree/bindings/gpu/aspeed-gfx.txt
-f:Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml
-f:Documentation/devicetree/bindings/gpu/host1x/nvidia,tegra210-nvdec.yaml
-f:Documentation/devicetree/bindings/gpu/host1x/nvidia,tegra210-nvenc.yaml
-f:Documentation/devicetree/bindings/gpu/host1x/nvidia,tegra210-nvjpg.yaml
-f:Documentation/devicetree/bindings/gpu/host1x/nvidia,tegra234-nvdec.yaml
-f:Documentation/devicetree/bindings/gpu/img,powervr-rogue.yaml
-f:Documentation/devicetree/bindings/gpu/img,powervr-sgx.yaml
-f:Documentation/devicetree/bindings/gpu/nvidia,gk20a.txt
-f:Documentation/devicetree/bindings/gpu/samsung-g2d.yaml
-f:Documentation/devicetree/bindings/gpu/samsung-rotator.yaml
-f:Documentation/devicetree/bindings/gpu/samsung-scaler.yaml
-f:Documentation/devicetree/bindings/gpu/vivante,gc.yaml
-f:Documentation/devicetree/bindings/graph.txt
-f:Documentation/devicetree/bindings/hsi/client-devices.txt
-f:Documentation/devicetree/bindings/hsi/nokia-modem.txt
-f:Documentation/devicetree/bindings/hsi/omap-ssi.txt
-f:Documentation/devicetree/bindings/hwinfo/loongson,ls2k-chipid.yaml
-f:Documentation/devicetree/bindings/hwinfo/renesas,prr.yaml
-f:Documentation/devicetree/bindings/hwinfo/samsung,exynos-chipid.yaml
-f:Documentation/devicetree/bindings/hwinfo/samsung,s5pv210-chipid.yaml
-f:Documentation/devicetree/bindings/hwinfo/ti,k3-socinfo.yaml
-f:Documentation/devicetree/bindings/hwinfo/via,vt8500-scc-id.yaml
-f:Documentation/devicetree/bindings/hwlock/allwinner,sun6i-a31-hwspinlock.yaml
-f:Documentation/devicetree/bindings/hwlock/hwlock.txt
-f:Documentation/devicetree/bindings/hwlock/qcom-hwspinlock.yaml
-f:Documentation/devicetree/bindings/hwlock/sprd,hwspinlock-r3p0.yaml
-f:Documentation/devicetree/bindings/hwlock/st,stm32-hwspinlock.yaml
-f:Documentation/devicetree/bindings/hwlock/ti,omap-hwspinlock.yaml
-f:Documentation/devicetree/bindings/hwmon/adi,ad741x.yaml
-f:Documentation/devicetree/bindings/hwmon/adi,adm1177.yaml
-f:Documentation/devicetree/bindings/hwmon/adi,adm1266.yaml
-f:Documentation/devicetree/bindings/hwmon/adi,adm1275.yaml
-f:Documentation/devicetree/bindings/hwmon/adi,axi-fan-control.yaml
-f:Documentation/devicetree/bindings/hwmon/adi,ltc2945.yaml
-f:Documentation/devicetree/bindings/hwmon/adi,ltc2947.yaml
-f:Documentation/devicetree/bindings/hwmon/adi,ltc2991.yaml
-f:Documentation/devicetree/bindings/hwmon/adi,ltc2992.yaml
-f:Documentation/devicetree/bindings/hwmon/adi,ltc4282.yaml
-f:Documentation/devicetree/bindings/hwmon/adi,max31760.yaml
-f:Documentation/devicetree/bindings/hwmon/adi,max31827.yaml
-f:Documentation/devicetree/bindings/hwmon/adt7475.yaml
-f:Documentation/devicetree/bindings/hwmon/amd,sbrmi.yaml
-f:Documentation/devicetree/bindings/hwmon/amd,sbtsi.yaml
-f:Documentation/devicetree/bindings/hwmon/amphenol,chipcap2.yaml
-f:Documentation/devicetree/bindings/hwmon/apm-xgene-hwmon.txt
-f:Documentation/devicetree/bindings/hwmon/aspeed,g6-pwm-tach.yaml
-f:Documentation/devicetree/bindings/hwmon/aspeed-pwm-tacho.txt
-f:Documentation/devicetree/bindings/hwmon/baikal,bt1-pvt.yaml
-f:Documentation/devicetree/bindings/hwmon/cirrus,lochnagar.yaml
-f:Documentation/devicetree/bindings/hwmon/fan-common.yaml
-f:Documentation/devicetree/bindings/hwmon/gmt,g762.yaml
-f:Documentation/devicetree/bindings/hwmon/gpio-fan.yaml
-f:Documentation/devicetree/bindings/hwmon/hpe,gxp-fan-ctrl.yaml
-f:Documentation/devicetree/bindings/hwmon/hwmon-common.yaml
-f:Documentation/devicetree/bindings/hwmon/ibm,occ-hwmon.yaml
-f:Documentation/devicetree/bindings/hwmon/ibm,opal-sensor.yaml
-f:Documentation/devicetree/bindings/hwmon/iio-hwmon.yaml
-f:Documentation/devicetree/bindings/hwmon/jedec,jc42.yaml
-f:Documentation/devicetree/bindings/hwmon/kontron,sl28cpld-hwmon.yaml
-f:Documentation/devicetree/bindings/hwmon/lltc,ltc2978.yaml
-f:Documentation/devicetree/bindings/hwmon/lltc,ltc4151.yaml
-f:Documentation/devicetree/bindings/hwmon/lltc,ltc4286.yaml
-f:Documentation/devicetree/bindings/hwmon/lm75.yaml
-f:Documentation/devicetree/bindings/hwmon/ltc2990.txt
-f:Documentation/devicetree/bindings/hwmon/ltq-cputemp.txt
-f:Documentation/devicetree/bindings/hwmon/max31785.txt
-f:Documentation/devicetree/bindings/hwmon/max6697.txt
-f:Documentation/devicetree/bindings/hwmon/maxim,max20730.yaml
-f:Documentation/devicetree/bindings/hwmon/maxim,max31790.yaml
-f:Documentation/devicetree/bindings/hwmon/maxim,max6639.yaml
-f:Documentation/devicetree/bindings/hwmon/maxim,max6650.yaml
-f:Documentation/devicetree/bindings/hwmon/microchip,emc2305.yaml
-f:Documentation/devicetree/bindings/hwmon/microchip,lan966x.yaml
-f:Documentation/devicetree/bindings/hwmon/microchip,mcp3021.yaml
-f:Documentation/devicetree/bindings/hwmon/microchip,sparx5-temp.yaml
-f:Documentation/devicetree/bindings/hwmon/moortec,mr75203.yaml
-f:Documentation/devicetree/bindings/hwmon/national,lm90.yaml
-f:Documentation/devicetree/bindings/hwmon/npcm750-pwm-fan.txt
-f:Documentation/devicetree/bindings/hwmon/nsa320-mcu.txt
-f:Documentation/devicetree/bindings/hwmon/ntc-thermistor.yaml
-f:Documentation/devicetree/bindings/hwmon/nuvoton,nct6775.yaml
-f:Documentation/devicetree/bindings/hwmon/nuvoton,nct7363.yaml
-f:Documentation/devicetree/bindings/hwmon/nuvoton,nct7802.yaml
-f:Documentation/devicetree/bindings/hwmon/nxp,mc34vr500.yaml
-f:Documentation/devicetree/bindings/hwmon/pmbus/adi,adp1050.yaml
-f:Documentation/devicetree/bindings/hwmon/pmbus/adi,lt3074.yaml
-f:Documentation/devicetree/bindings/hwmon/pmbus/infineon,tda38640.yaml
-f:Documentation/devicetree/bindings/hwmon/pmbus/isil,isl68137.yaml
-f:Documentation/devicetree/bindings/hwmon/pmbus/mps,mp2975.yaml
-f:Documentation/devicetree/bindings/hwmon/pmbus/mps,mpq8785.yaml
-f:Documentation/devicetree/bindings/hwmon/pmbus/ti,lm25066.yaml
-f:Documentation/devicetree/bindings/hwmon/pmbus/ti,tps25990.yaml
-f:Documentation/devicetree/bindings/hwmon/pmbus/ti,ucd90320.yaml
-f:Documentation/devicetree/bindings/hwmon/pmbus/vicor,pli1209bc.yaml
-f:Documentation/devicetree/bindings/hwmon/pwm-fan.yaml
-f:Documentation/devicetree/bindings/hwmon/renesas,isl28022.yaml
-f:Documentation/devicetree/bindings/hwmon/sensirion,sht15.yaml
-f:Documentation/devicetree/bindings/hwmon/sensirion,shtc1.yaml
-f:Documentation/devicetree/bindings/hwmon/sophgo,sg2042-hwmon-mcu.yaml
-f:Documentation/devicetree/bindings/hwmon/st,stts751.yaml
-f:Documentation/devicetree/bindings/hwmon/starfive,jh71x0-temp.yaml
-f:Documentation/devicetree/bindings/hwmon/syna,as370.yaml
-f:Documentation/devicetree/bindings/hwmon/ti,adc128d818.yaml
-f:Documentation/devicetree/bindings/hwmon/ti,ads7828.yaml
-f:Documentation/devicetree/bindings/hwmon/ti,amc6821.yaml
-f:Documentation/devicetree/bindings/hwmon/ti,ina2xx.yaml
-f:Documentation/devicetree/bindings/hwmon/ti,ina3221.yaml
-f:Documentation/devicetree/bindings/hwmon/ti,lm87.yaml
-f:Documentation/devicetree/bindings/hwmon/ti,tmp102.yaml
-f:Documentation/devicetree/bindings/hwmon/ti,tmp108.yaml
-f:Documentation/devicetree/bindings/hwmon/ti,tmp401.yaml
-f:Documentation/devicetree/bindings/hwmon/ti,tmp421.yaml
-f:Documentation/devicetree/bindings/hwmon/ti,tmp464.yaml
-f:Documentation/devicetree/bindings/hwmon/ti,tmp513.yaml
-f:Documentation/devicetree/bindings/hwmon/ti,tps23861.yaml
-f:Documentation/devicetree/bindings/hwmon/vexpress.txt
-f:Documentation/devicetree/bindings/hwmon/winbond,w83781d.yaml
-f:Documentation/devicetree/bindings/i2c/allwinner,sun6i-a31-p2wi.yaml
-f:Documentation/devicetree/bindings/i2c/amlogic,meson6-i2c.yaml
-f:Documentation/devicetree/bindings/i2c/apple,i2c.yaml
-f:Documentation/devicetree/bindings/i2c/arm,i2c-versatile.yaml
-f:Documentation/devicetree/bindings/i2c/aspeed,i2c.yaml
-f:Documentation/devicetree/bindings/i2c/atmel,at91sam-i2c.yaml
-f:Documentation/devicetree/bindings/i2c/brcm,bcm2835-i2c.yaml
-f:Documentation/devicetree/bindings/i2c/brcm,brcmstb-i2c.yaml
-f:Documentation/devicetree/bindings/i2c/brcm,iproc-i2c.yaml
-f:Documentation/devicetree/bindings/i2c/brcm,kona-i2c.yaml
-f:Documentation/devicetree/bindings/i2c/cdns,i2c-r1p10.yaml
-f:Documentation/devicetree/bindings/i2c/google,cros-ec-i2c-tunnel.yaml
-f:Documentation/devicetree/bindings/i2c/hisilicon,ascend910-i2c.yaml
-f:Documentation/devicetree/bindings/i2c/hpe,gxp-i2c.yaml
-f:Documentation/devicetree/bindings/i2c/i2c-altera.txt
-f:Documentation/devicetree/bindings/i2c/i2c-arb-gpio-challenge.yaml
-f:Documentation/devicetree/bindings/i2c/i2c-atr.yaml
-f:Documentation/devicetree/bindings/i2c/i2c-axxia.txt
-f:Documentation/devicetree/bindings/i2c/i2c-cbus-gpio.txt
-f:Documentation/devicetree/bindings/i2c/i2c-davinci.txt
-f:Documentation/devicetree/bindings/i2c/i2c-demux-pinctrl.yaml
-f:Documentation/devicetree/bindings/i2c/i2c-digicolor.txt
-f:Documentation/devicetree/bindings/i2c/i2c-exynos5.yaml
-f:Documentation/devicetree/bindings/i2c/i2c-gate.yaml
-f:Documentation/devicetree/bindings/i2c/i2c-gpio.yaml
-f:Documentation/devicetree/bindings/i2c/i2c-hix5hd2.txt
-f:Documentation/devicetree/bindings/i2c/i2c-img-scb.txt
-f:Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml
-f:Documentation/devicetree/bindings/i2c/i2c-imx.yaml
-f:Documentation/devicetree/bindings/i2c/i2c-iop3xx.txt
-f:Documentation/devicetree/bindings/i2c/i2c-mpc.yaml
-f:Documentation/devicetree/bindings/i2c/i2c-mt65xx.yaml
-f:Documentation/devicetree/bindings/i2c/i2c-mux-gpio.yaml
-f:Documentation/devicetree/bindings/i2c/i2c-mux-gpmux.yaml
-f:Documentation/devicetree/bindings/i2c/i2c-mux-ltc4306.txt
-f:Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.yaml
-f:Documentation/devicetree/bindings/i2c/i2c-mux-pinctrl.yaml
-f:Documentation/devicetree/bindings/i2c/i2c-mux-reg.txt
-f:Documentation/devicetree/bindings/i2c/i2c-mux.yaml
-f:Documentation/devicetree/bindings/i2c/i2c-mxs.yaml
-f:Documentation/devicetree/bindings/i2c/i2c-octeon.txt
-f:Documentation/devicetree/bindings/i2c/i2c-opal.txt
-f:Documentation/devicetree/bindings/i2c/i2c-owl.yaml
-f:Documentation/devicetree/bindings/i2c/i2c-pca-platform.txt
-f:Documentation/devicetree/bindings/i2c/i2c-pxa-pci-ce4100.txt
-f:Documentation/devicetree/bindings/i2c/i2c-pxa.yaml
-f:Documentation/devicetree/bindings/i2c/i2c-rk3x.yaml
-f:Documentation/devicetree/bindings/i2c/i2c-virtio.yaml
-f:Documentation/devicetree/bindings/i2c/i2c-xgene-slimpro.txt
-f:Documentation/devicetree/bindings/i2c/ibm,i2c-fsi.yaml
-f:Documentation/devicetree/bindings/i2c/ingenic,i2c.yaml
-f:Documentation/devicetree/bindings/i2c/loongson,ls2x-i2c.yaml
-f:Documentation/devicetree/bindings/i2c/marvell,mv64xxx-i2c.yaml
-f:Documentation/devicetree/bindings/i2c/mediatek,mt7621-i2c.yaml
-f:Documentation/devicetree/bindings/i2c/microchip,corei2c.yaml
-f:Documentation/devicetree/bindings/i2c/nuvoton,npcm7xx-i2c.yaml
-f:Documentation/devicetree/bindings/i2c/nvidia,tegra186-bpmp-i2c.yaml
-f:Documentation/devicetree/bindings/i2c/nvidia,tegra20-i2c.yaml
-f:Documentation/devicetree/bindings/i2c/nxp,lpc1788-i2c.yaml
-f:Documentation/devicetree/bindings/i2c/nxp,pca9541.yaml
-f:Documentation/devicetree/bindings/i2c/nxp,pnx-i2c.yaml
-f:Documentation/devicetree/bindings/i2c/opencores,i2c-ocores.yaml
-f:Documentation/devicetree/bindings/i2c/qcom,i2c-cci.yaml
-f:Documentation/devicetree/bindings/i2c/qcom,i2c-geni-qcom.yaml
-f:Documentation/devicetree/bindings/i2c/qcom,i2c-qup.yaml
-f:Documentation/devicetree/bindings/i2c/realtek,rtl9301-i2c.yaml
-f:Documentation/devicetree/bindings/i2c/renesas,iic-emev2.yaml
-f:Documentation/devicetree/bindings/i2c/renesas,rcar-i2c.yaml
-f:Documentation/devicetree/bindings/i2c/renesas,riic.yaml
-f:Documentation/devicetree/bindings/i2c/renesas,rmobile-iic.yaml
-f:Documentation/devicetree/bindings/i2c/renesas,rzv2m.yaml
-f:Documentation/devicetree/bindings/i2c/samsung,s3c2410-i2c.yaml
-f:Documentation/devicetree/bindings/i2c/snps,designware-i2c.yaml
-f:Documentation/devicetree/bindings/i2c/socionext,synquacer-i2c.yaml
-f:Documentation/devicetree/bindings/i2c/socionext,uniphier-fi2c.yaml
-f:Documentation/devicetree/bindings/i2c/socionext,uniphier-i2c.yaml
-f:Documentation/devicetree/bindings/i2c/spacemit,k1-i2c.yaml
-f:Documentation/devicetree/bindings/i2c/sprd,sc9860-i2c.yaml
-f:Documentation/devicetree/bindings/i2c/st,nomadik-i2c.yaml
-f:Documentation/devicetree/bindings/i2c/st,sti-i2c.yaml
-f:Documentation/devicetree/bindings/i2c/st,stm32-i2c.yaml
-f:Documentation/devicetree/bindings/i2c/ti,omap4-i2c.yaml
-f:Documentation/devicetree/bindings/i2c/tsd,mule-i2c-mux.yaml
-f:Documentation/devicetree/bindings/i2c/wm,wm8505-i2c.yaml
-f:Documentation/devicetree/bindings/i2c/xlnx,xps-iic-2.00.a.yaml
-f:Documentation/devicetree/bindings/i3c/aspeed,ast2600-i3c.yaml
-f:Documentation/devicetree/bindings/i3c/cdns,i3c-master.yaml
-f:Documentation/devicetree/bindings/i3c/i3c.yaml
-f:Documentation/devicetree/bindings/i3c/mipi-i3c-hci.yaml
-f:Documentation/devicetree/bindings/i3c/silvaco,i3c-master.yaml
-f:Documentation/devicetree/bindings/i3c/snps,dw-i3c-master.yaml
-f:Documentation/devicetree/bindings/iio/accel/adi,adis16201.yaml
-f:Documentation/devicetree/bindings/iio/accel/adi,adis16240.yaml
-f:Documentation/devicetree/bindings/iio/accel/adi,adxl313.yaml
-f:Documentation/devicetree/bindings/iio/accel/adi,adxl345.yaml
-f:Documentation/devicetree/bindings/iio/accel/adi,adxl355.yaml
-f:Documentation/devicetree/bindings/iio/accel/adi,adxl367.yaml
-f:Documentation/devicetree/bindings/iio/accel/adi,adxl372.yaml
-f:Documentation/devicetree/bindings/iio/accel/adi,adxl380.yaml
-f:Documentation/devicetree/bindings/iio/accel/bosch,bma220.yaml
-f:Documentation/devicetree/bindings/iio/accel/bosch,bma255.yaml
-f:Documentation/devicetree/bindings/iio/accel/bosch,bma400.yaml
-f:Documentation/devicetree/bindings/iio/accel/bosch,bmi088.yaml
-f:Documentation/devicetree/bindings/iio/accel/fsl,mma7455.yaml
-f:Documentation/devicetree/bindings/iio/accel/fsl,mma8452.yaml
-f:Documentation/devicetree/bindings/iio/accel/kionix,kx022a.yaml
-f:Documentation/devicetree/bindings/iio/accel/kionix,kxcjk1013.yaml
-f:Documentation/devicetree/bindings/iio/accel/kionix,kxsd9.yaml
-f:Documentation/devicetree/bindings/iio/accel/lis302.txt
-f:Documentation/devicetree/bindings/iio/accel/memsensing,msa311.yaml
-f:Documentation/devicetree/bindings/iio/accel/murata,sca3300.yaml
-f:Documentation/devicetree/bindings/iio/accel/nxp,fxls8962af.yaml
-f:Documentation/devicetree/bindings/iio/adc/adc.yaml
-f:Documentation/devicetree/bindings/iio/adc/adi,ad4000.yaml
-f:Documentation/devicetree/bindings/iio/adc/adi,ad4030.yaml
-f:Documentation/devicetree/bindings/iio/adc/adi,ad4080.yaml
-f:Documentation/devicetree/bindings/iio/adc/adi,ad4130.yaml
-f:Documentation/devicetree/bindings/iio/adc/adi,ad4170-4.yaml
-f:Documentation/devicetree/bindings/iio/adc/adi,ad4695.yaml
-f:Documentation/devicetree/bindings/iio/adc/adi,ad4851.yaml
-f:Documentation/devicetree/bindings/iio/adc/adi,ad7091r5.yaml
-f:Documentation/devicetree/bindings/iio/adc/adi,ad7124.yaml
-f:Documentation/devicetree/bindings/iio/adc/adi,ad7173.yaml
-f:Documentation/devicetree/bindings/iio/adc/adi,ad7191.yaml
-f:Documentation/devicetree/bindings/iio/adc/adi,ad7192.yaml
-f:Documentation/devicetree/bindings/iio/adc/adi,ad7280a.yaml
-f:Documentation/devicetree/bindings/iio/adc/adi,ad7291.yaml
-f:Documentation/devicetree/bindings/iio/adc/adi,ad7292.yaml
-f:Documentation/devicetree/bindings/iio/adc/adi,ad7298.yaml
-f:Documentation/devicetree/bindings/iio/adc/adi,ad7380.yaml
-f:Documentation/devicetree/bindings/iio/adc/adi,ad7405.yaml
-f:Documentation/devicetree/bindings/iio/adc/adi,ad7476.yaml
-f:Documentation/devicetree/bindings/iio/adc/adi,ad7606.yaml
-f:Documentation/devicetree/bindings/iio/adc/adi,ad7625.yaml
-f:Documentation/devicetree/bindings/iio/adc/adi,ad7768-1.yaml
-f:Documentation/devicetree/bindings/iio/adc/adi,ad7779.yaml
-f:Documentation/devicetree/bindings/iio/adc/adi,ad7780.yaml
-f:Documentation/devicetree/bindings/iio/adc/adi,ad7923.yaml
-f:Documentation/devicetree/bindings/iio/adc/adi,ad7944.yaml
-f:Documentation/devicetree/bindings/iio/adc/adi,ad7949.yaml
-f:Documentation/devicetree/bindings/iio/adc/adi,ad799x.yaml
-f:Documentation/devicetree/bindings/iio/adc/adi,ad9467.yaml
-f:Documentation/devicetree/bindings/iio/adc/adi,axi-adc.yaml
-f:Documentation/devicetree/bindings/iio/adc/adi,max11410.yaml
-f:Documentation/devicetree/bindings/iio/adc/allwinner,sun20i-d1-gpadc.yaml
-f:Documentation/devicetree/bindings/iio/adc/allwinner,sun8i-a33-ths.yaml
-f:Documentation/devicetree/bindings/iio/adc/amlogic,meson-saradc.yaml
-f:Documentation/devicetree/bindings/iio/adc/aspeed,ast2400-adc.yaml
-f:Documentation/devicetree/bindings/iio/adc/aspeed,ast2600-adc.yaml
-f:Documentation/devicetree/bindings/iio/adc/atmel,sama5d2-adc.yaml
-f:Documentation/devicetree/bindings/iio/adc/atmel,sama9260-adc.yaml
-f:Documentation/devicetree/bindings/iio/adc/avia-hx711.yaml
-f:Documentation/devicetree/bindings/iio/adc/brcm,iproc-static-adc.yaml
-f:Documentation/devicetree/bindings/iio/adc/cirrus,ep9301-adc.yaml
-f:Documentation/devicetree/bindings/iio/adc/cosmic,10001-adc.yaml
-f:Documentation/devicetree/bindings/iio/adc/dlg,da9150-gpadc.yaml
-f:Documentation/devicetree/bindings/iio/adc/envelope-detector.yaml
-f:Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.yaml
-f:Documentation/devicetree/bindings/iio/adc/fsl,imx7d-adc.yaml
-f:Documentation/devicetree/bindings/iio/adc/fsl,vf610-adc.yaml
-f:Documentation/devicetree/bindings/iio/adc/gehc,pmc-adc.yaml
-f:Documentation/devicetree/bindings/iio/adc/holt,hi8435.yaml
-f:Documentation/devicetree/bindings/iio/adc/ingenic,adc.yaml
-f:Documentation/devicetree/bindings/iio/adc/lltc,ltc2496.yaml
-f:Documentation/devicetree/bindings/iio/adc/lltc,ltc2497.yaml
-f:Documentation/devicetree/bindings/iio/adc/marvell,berlin2-adc.yaml
-f:Documentation/devicetree/bindings/iio/adc/maxim,max1027.yaml
-f:Documentation/devicetree/bindings/iio/adc/maxim,max11100.yaml
-f:Documentation/devicetree/bindings/iio/adc/maxim,max1118.yaml
-f:Documentation/devicetree/bindings/iio/adc/maxim,max11205.yaml
-f:Documentation/devicetree/bindings/iio/adc/maxim,max1238.yaml
-f:Documentation/devicetree/bindings/iio/adc/maxim,max1241.yaml
-f:Documentation/devicetree/bindings/iio/adc/maxim,max1363.yaml
-f:Documentation/devicetree/bindings/iio/adc/maxim,max34408.yaml
-f:Documentation/devicetree/bindings/iio/adc/maxim,max9611.yaml
-f:Documentation/devicetree/bindings/iio/adc/mediatek,mt2701-auxadc.yaml
-f:Documentation/devicetree/bindings/iio/adc/mediatek,mt6359-auxadc.yaml
-f:Documentation/devicetree/bindings/iio/adc/mediatek,mt6360-adc.yaml
-f:Documentation/devicetree/bindings/iio/adc/microchip,mcp3201.yaml
-f:Documentation/devicetree/bindings/iio/adc/microchip,mcp3564.yaml
-f:Documentation/devicetree/bindings/iio/adc/microchip,mcp3911.yaml
-f:Documentation/devicetree/bindings/iio/adc/microchip,pac1921.yaml
-f:Documentation/devicetree/bindings/iio/adc/microchip,pac1934.yaml
-f:Documentation/devicetree/bindings/iio/adc/motorola,cpcap-adc.yaml
-f:Documentation/devicetree/bindings/iio/adc/nuvoton,nau7802.yaml
-f:Documentation/devicetree/bindings/iio/adc/nuvoton,nct7201.yaml
-f:Documentation/devicetree/bindings/iio/adc/nuvoton,npcm750-adc.yaml
-f:Documentation/devicetree/bindings/iio/adc/nxp,imx8qxp-adc.yaml
-f:Documentation/devicetree/bindings/iio/adc/nxp,imx93-adc.yaml
-f:Documentation/devicetree/bindings/iio/adc/nxp,lpc1850-adc.yaml
-f:Documentation/devicetree/bindings/iio/adc/nxp,lpc3220-adc.yaml
-f:Documentation/devicetree/bindings/iio/adc/qcom,pm8018-adc.yaml
-f:Documentation/devicetree/bindings/iio/adc/qcom,spmi-iadc.yaml
-f:Documentation/devicetree/bindings/iio/adc/qcom,spmi-rradc.yaml
-f:Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.yaml
-f:Documentation/devicetree/bindings/iio/adc/renesas,rcar-gyroadc.yaml
-f:Documentation/devicetree/bindings/iio/adc/renesas,rzg2l-adc.yaml
-f:Documentation/devicetree/bindings/iio/adc/richtek,rtq6056.yaml
-f:Documentation/devicetree/bindings/iio/adc/rockchip-saradc.yaml
-f:Documentation/devicetree/bindings/iio/adc/rohm,bd79104.yaml
-f:Documentation/devicetree/bindings/iio/adc/rohm,bd79124.yaml
-f:Documentation/devicetree/bindings/iio/adc/samsung,exynos-adc.yaml
-f:Documentation/devicetree/bindings/iio/adc/sigma-delta-modulator.yaml
-f:Documentation/devicetree/bindings/iio/adc/sophgo,cv1800b-saradc.yaml
-f:Documentation/devicetree/bindings/iio/adc/sprd,sc2720-adc.yaml
-f:Documentation/devicetree/bindings/iio/adc/st,spear600-adc.yaml
-f:Documentation/devicetree/bindings/iio/adc/st,stm32-adc.yaml
-f:Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml
-f:Documentation/devicetree/bindings/iio/adc/st,stmpe-adc.yaml
-f:Documentation/devicetree/bindings/iio/adc/ti,adc081c.yaml
-f:Documentation/devicetree/bindings/iio/adc/ti,adc0832.yaml
-f:Documentation/devicetree/bindings/iio/adc/ti,adc084s021.yaml
-f:Documentation/devicetree/bindings/iio/adc/ti,adc108s102.yaml
-f:Documentation/devicetree/bindings/iio/adc/ti,adc12138.yaml
-f:Documentation/devicetree/bindings/iio/adc/ti,adc128s052.yaml
-f:Documentation/devicetree/bindings/iio/adc/ti,adc161s626.yaml
-f:Documentation/devicetree/bindings/iio/adc/ti,ads1015.yaml
-f:Documentation/devicetree/bindings/iio/adc/ti,ads1100.yaml
-f:Documentation/devicetree/bindings/iio/adc/ti,ads1119.yaml
-f:Documentation/devicetree/bindings/iio/adc/ti,ads124s08.yaml
-f:Documentation/devicetree/bindings/iio/adc/ti,ads1298.yaml
-f:Documentation/devicetree/bindings/iio/adc/ti,ads131e08.yaml
-f:Documentation/devicetree/bindings/iio/adc/ti,ads7138.yaml
-f:Documentation/devicetree/bindings/iio/adc/ti,ads7924.yaml
-f:Documentation/devicetree/bindings/iio/adc/ti,ads7950.yaml
-f:Documentation/devicetree/bindings/iio/adc/ti,ads8344.yaml
-f:Documentation/devicetree/bindings/iio/adc/ti,ads8688.yaml
-f:Documentation/devicetree/bindings/iio/adc/ti,am3359-adc.yaml
-f:Documentation/devicetree/bindings/iio/adc/ti,lmp92064.yaml
-f:Documentation/devicetree/bindings/iio/adc/ti,palmas-gpadc.yaml
-f:Documentation/devicetree/bindings/iio/adc/ti,tlc4541.yaml
-f:Documentation/devicetree/bindings/iio/adc/ti,tsc2046.yaml
-f:Documentation/devicetree/bindings/iio/adc/ti,twl4030-madc.yaml
-f:Documentation/devicetree/bindings/iio/adc/ti,twl6030-gpadc.yaml
-f:Documentation/devicetree/bindings/iio/adc/x-powers,axp209-adc.yaml
-f:Documentation/devicetree/bindings/iio/adc/xilinx-xadc.txt
-f:Documentation/devicetree/bindings/iio/adc/xlnx,zynqmp-ams.yaml
-f:Documentation/devicetree/bindings/iio/addac/adi,ad74115.yaml
-f:Documentation/devicetree/bindings/iio/addac/adi,ad74413r.yaml
-f:Documentation/devicetree/bindings/iio/afe/current-sense-amplifier.yaml
-f:Documentation/devicetree/bindings/iio/afe/current-sense-shunt.yaml
-f:Documentation/devicetree/bindings/iio/afe/temperature-sense-rtd.yaml
-f:Documentation/devicetree/bindings/iio/afe/temperature-transducer.yaml
-f:Documentation/devicetree/bindings/iio/afe/voltage-divider.yaml
-f:Documentation/devicetree/bindings/iio/amplifiers/adi,ada4250.yaml
-f:Documentation/devicetree/bindings/iio/amplifiers/adi,hmc425a.yaml
-f:Documentation/devicetree/bindings/iio/cdc/adi,ad7150.yaml
-f:Documentation/devicetree/bindings/iio/cdc/adi,ad7746.yaml
-f:Documentation/devicetree/bindings/iio/chemical/ams,ccs811.yaml
-f:Documentation/devicetree/bindings/iio/chemical/aosong,ags02ma.yaml
-f:Documentation/devicetree/bindings/iio/chemical/atlas,sensor.yaml
-f:Documentation/devicetree/bindings/iio/chemical/bosch,bme680.yaml
-f:Documentation/devicetree/bindings/iio/chemical/plantower,pms7003.yaml
-f:Documentation/devicetree/bindings/iio/chemical/sciosense,ens160.yaml
-f:Documentation/devicetree/bindings/iio/chemical/senseair,sunrise.yaml
-f:Documentation/devicetree/bindings/iio/chemical/sensirion,scd30.yaml
-f:Documentation/devicetree/bindings/iio/chemical/sensirion,scd4x.yaml
-f:Documentation/devicetree/bindings/iio/chemical/sensirion,sps30.yaml
-f:Documentation/devicetree/bindings/iio/chemical/winsen,mhz19b.yaml
-f:Documentation/devicetree/bindings/iio/common.yaml
-f:Documentation/devicetree/bindings/iio/dac/adi,ad3530r.yaml
-f:Documentation/devicetree/bindings/iio/dac/adi,ad3552r.yaml
-f:Documentation/devicetree/bindings/iio/dac/adi,ad5064.yaml
-f:Documentation/devicetree/bindings/iio/dac/adi,ad5360.yaml
-f:Documentation/devicetree/bindings/iio/dac/adi,ad5380.yaml
-f:Documentation/devicetree/bindings/iio/dac/adi,ad5421.yaml
-f:Documentation/devicetree/bindings/iio/dac/adi,ad5449.yaml
-f:Documentation/devicetree/bindings/iio/dac/adi,ad5504.yaml
-f:Documentation/devicetree/bindings/iio/dac/adi,ad5592r.yaml
-f:Documentation/devicetree/bindings/iio/dac/adi,ad5624r.yaml
-f:Documentation/devicetree/bindings/iio/dac/adi,ad5686.yaml
-f:Documentation/devicetree/bindings/iio/dac/adi,ad5696.yaml
-f:Documentation/devicetree/bindings/iio/dac/adi,ad5755.yaml
-f:Documentation/devicetree/bindings/iio/dac/adi,ad5758.yaml
-f:Documentation/devicetree/bindings/iio/dac/adi,ad5761.yaml
-f:Documentation/devicetree/bindings/iio/dac/adi,ad5764.yaml
-f:Documentation/devicetree/bindings/iio/dac/adi,ad5766.yaml
-f:Documentation/devicetree/bindings/iio/dac/adi,ad5770r.yaml
-f:Documentation/devicetree/bindings/iio/dac/adi,ad5791.yaml
-f:Documentation/devicetree/bindings/iio/dac/adi,ad7293.yaml
-f:Documentation/devicetree/bindings/iio/dac/adi,ad7303.yaml
-f:Documentation/devicetree/bindings/iio/dac/adi,ad8460.yaml
-f:Documentation/devicetree/bindings/iio/dac/adi,ad8801.yaml
-f:Documentation/devicetree/bindings/iio/dac/adi,ad9739a.yaml
-f:Documentation/devicetree/bindings/iio/dac/adi,axi-dac.yaml
-f:Documentation/devicetree/bindings/iio/dac/adi,ltc2664.yaml
-f:Documentation/devicetree/bindings/iio/dac/adi,ltc2672.yaml
-f:Documentation/devicetree/bindings/iio/dac/adi,ltc2688.yaml
-f:Documentation/devicetree/bindings/iio/dac/dac.yaml
-f:Documentation/devicetree/bindings/iio/dac/dpot-dac.yaml
-f:Documentation/devicetree/bindings/iio/dac/fsl,vf610-dac.yaml
-f:Documentation/devicetree/bindings/iio/dac/lltc,ltc1660.yaml
-f:Documentation/devicetree/bindings/iio/dac/lltc,ltc2632.yaml
-f:Documentation/devicetree/bindings/iio/dac/maxim,ds4424.yaml
-f:Documentation/devicetree/bindings/iio/dac/maxim,max5522.yaml
-f:Documentation/devicetree/bindings/iio/dac/maxim,max5821.yaml
-f:Documentation/devicetree/bindings/iio/dac/microchip,mcp4725.yaml
-f:Documentation/devicetree/bindings/iio/dac/microchip,mcp4728.yaml
-f:Documentation/devicetree/bindings/iio/dac/microchip,mcp4821.yaml
-f:Documentation/devicetree/bindings/iio/dac/microchip,mcp4922.yaml
-f:Documentation/devicetree/bindings/iio/dac/nxp,lpc1850-dac.yaml
-f:Documentation/devicetree/bindings/iio/dac/rohm,bd79703.yaml
-f:Documentation/devicetree/bindings/iio/dac/st,stm32-dac.yaml
-f:Documentation/devicetree/bindings/iio/dac/ti,dac082s085.yaml
-f:Documentation/devicetree/bindings/iio/dac/ti,dac5571.yaml
-f:Documentation/devicetree/bindings/iio/dac/ti,dac7311.yaml
-f:Documentation/devicetree/bindings/iio/dac/ti,dac7512.yaml
-f:Documentation/devicetree/bindings/iio/dac/ti,dac7612.yaml
-f:Documentation/devicetree/bindings/iio/filter/adi,admv8818.yaml
-f:Documentation/devicetree/bindings/iio/frequency/adf4371.yaml
-f:Documentation/devicetree/bindings/iio/frequency/adi,adf4350.yaml
-f:Documentation/devicetree/bindings/iio/frequency/adi,adf4377.yaml
-f:Documentation/devicetree/bindings/iio/frequency/adi,admfm2000.yaml
-f:Documentation/devicetree/bindings/iio/frequency/adi,admv1013.yaml
-f:Documentation/devicetree/bindings/iio/frequency/adi,admv1014.yaml
-f:Documentation/devicetree/bindings/iio/frequency/adi,admv4420.yaml
-f:Documentation/devicetree/bindings/iio/frequency/adi,adrf6780.yaml
-f:Documentation/devicetree/bindings/iio/gyroscope/adi,adxrs290.yaml
-f:Documentation/devicetree/bindings/iio/gyroscope/bosch,bmg160.yaml
-f:Documentation/devicetree/bindings/iio/gyroscope/invensense,itg3200.yaml
-f:Documentation/devicetree/bindings/iio/gyroscope/invensense,mpu3050.yaml
-f:Documentation/devicetree/bindings/iio/gyroscope/nxp,fxas21002c.yaml
-f:Documentation/devicetree/bindings/iio/health/maxim,max30100.yaml
-f:Documentation/devicetree/bindings/iio/health/maxim,max30102.yaml
-f:Documentation/devicetree/bindings/iio/health/ti,afe4403.yaml
-f:Documentation/devicetree/bindings/iio/health/ti,afe4404.yaml
-f:Documentation/devicetree/bindings/iio/humidity/dht11.yaml
-f:Documentation/devicetree/bindings/iio/humidity/sciosense,ens210.yaml
-f:Documentation/devicetree/bindings/iio/humidity/st,hts221.yaml
-f:Documentation/devicetree/bindings/iio/humidity/ti,hdc2010.yaml
-f:Documentation/devicetree/bindings/iio/humidity/ti,hdc3020.yaml
-f:Documentation/devicetree/bindings/iio/impedance-analyzer/adi,ad5933.yaml
-f:Documentation/devicetree/bindings/iio/imu/adi,adis16460.yaml
-f:Documentation/devicetree/bindings/iio/imu/adi,adis16475.yaml
-f:Documentation/devicetree/bindings/iio/imu/adi,adis16480.yaml
-f:Documentation/devicetree/bindings/iio/imu/adi,adis16550.yaml
-f:Documentation/devicetree/bindings/iio/imu/bosch,bmi160.yaml
-f:Documentation/devicetree/bindings/iio/imu/bosch,bmi270.yaml
-f:Documentation/devicetree/bindings/iio/imu/bosch,bmi323.yaml
-f:Documentation/devicetree/bindings/iio/imu/bosch,bno055.yaml
-f:Documentation/devicetree/bindings/iio/imu/bosch,smi240.yaml
-f:Documentation/devicetree/bindings/iio/imu/invensense,icm42600.yaml
-f:Documentation/devicetree/bindings/iio/imu/invensense,mpu6050.yaml
-f:Documentation/devicetree/bindings/iio/imu/nxp,fxos8700.yaml
-f:Documentation/devicetree/bindings/iio/imu/st,lsm6dsx.yaml
-f:Documentation/devicetree/bindings/iio/light/adux1020.yaml
-f:Documentation/devicetree/bindings/iio/light/ams,as73211.yaml
-f:Documentation/devicetree/bindings/iio/light/amstaos,tsl2563.yaml
-f:Documentation/devicetree/bindings/iio/light/amstaos,tsl2591.yaml
-f:Documentation/devicetree/bindings/iio/light/avago,apds9300.yaml
-f:Documentation/devicetree/bindings/iio/light/bh1750.yaml
-f:Documentation/devicetree/bindings/iio/light/brcm,apds9160.yaml
-f:Documentation/devicetree/bindings/iio/light/capella,cm3605.yaml
-f:Documentation/devicetree/bindings/iio/light/capella,cm36651.yaml
-f:Documentation/devicetree/bindings/iio/light/dynaimage,al3010.yaml
-f:Documentation/devicetree/bindings/iio/light/dynaimage,al3320a.yaml
-f:Documentation/devicetree/bindings/iio/light/isl29018.yaml
-f:Documentation/devicetree/bindings/iio/light/liteon,ltr390.yaml
-f:Documentation/devicetree/bindings/iio/light/liteon,ltr501.yaml
-f:Documentation/devicetree/bindings/iio/light/liteon,ltrf216a.yaml
-f:Documentation/devicetree/bindings/iio/light/maxim,max44009.yaml
-f:Documentation/devicetree/bindings/iio/light/noa1305.yaml
-f:Documentation/devicetree/bindings/iio/light/rohm,bh1745.yaml
-f:Documentation/devicetree/bindings/iio/light/rohm,bu27034anuc.yaml
-f:Documentation/devicetree/bindings/iio/light/sharp,gp2ap002.yaml
-f:Documentation/devicetree/bindings/iio/light/sharp,gp2ap020a00f.yaml
-f:Documentation/devicetree/bindings/iio/light/st,uvis25.yaml
-f:Documentation/devicetree/bindings/iio/light/st,vl6180.yaml
-f:Documentation/devicetree/bindings/iio/light/stk33xx.yaml
-f:Documentation/devicetree/bindings/iio/light/ti,opt3001.yaml
-f:Documentation/devicetree/bindings/iio/light/ti,opt4001.yaml
-f:Documentation/devicetree/bindings/iio/light/ti,opt4060.yaml
-f:Documentation/devicetree/bindings/iio/light/tsl2583.yaml
-f:Documentation/devicetree/bindings/iio/light/tsl2772.yaml
-f:Documentation/devicetree/bindings/iio/light/upisemi,us5182.yaml
-f:Documentation/devicetree/bindings/iio/light/vishay,vcnl4000.yaml
-f:Documentation/devicetree/bindings/iio/light/vishay,vcnl4035.yaml
-f:Documentation/devicetree/bindings/iio/light/vishay,veml6030.yaml
-f:Documentation/devicetree/bindings/iio/light/vishay,veml6075.yaml
-f:Documentation/devicetree/bindings/iio/magnetometer/allegromicro,als31300.yaml
-f:Documentation/devicetree/bindings/iio/magnetometer/asahi-kasei,ak8974.yaml
-f:Documentation/devicetree/bindings/iio/magnetometer/asahi-kasei,ak8975.yaml
-f:Documentation/devicetree/bindings/iio/magnetometer/bosch,bmc150_magn.yaml
-f:Documentation/devicetree/bindings/iio/magnetometer/fsl,mag3110.yaml
-f:Documentation/devicetree/bindings/iio/magnetometer/honeywell,hmc5843.yaml
-f:Documentation/devicetree/bindings/iio/magnetometer/pni,rm3100.yaml
-f:Documentation/devicetree/bindings/iio/magnetometer/silabs,si7210.yaml
-f:Documentation/devicetree/bindings/iio/magnetometer/ti,tmag5273.yaml
-f:Documentation/devicetree/bindings/iio/magnetometer/voltafield,af8133j.yaml
-f:Documentation/devicetree/bindings/iio/magnetometer/yamaha,yas530.yaml
-f:Documentation/devicetree/bindings/iio/mount-matrix.txt
-f:Documentation/devicetree/bindings/iio/multiplexer/io-channel-mux.yaml
-f:Documentation/devicetree/bindings/iio/potentiometer/adi,ad5272.yaml
-f:Documentation/devicetree/bindings/iio/potentiometer/max5432.yaml
-f:Documentation/devicetree/bindings/iio/potentiometer/microchip,mcp41010.yaml
-f:Documentation/devicetree/bindings/iio/potentiometer/microchip,mcp4131.yaml
-f:Documentation/devicetree/bindings/iio/potentiometer/microchip,mcp4531.yaml
-f:Documentation/devicetree/bindings/iio/potentiometer/renesas,x9250.yaml
-f:Documentation/devicetree/bindings/iio/potentiostat/ti,lmp91000.yaml
-f:Documentation/devicetree/bindings/iio/pressure/asc,dlhl60d.yaml
-f:Documentation/devicetree/bindings/iio/pressure/bmp085.yaml
-f:Documentation/devicetree/bindings/iio/pressure/honeywell,hsc030pa.yaml
-f:Documentation/devicetree/bindings/iio/pressure/honeywell,mprls0025pa.yaml
-f:Documentation/devicetree/bindings/iio/pressure/hoperf,hp03.yaml
-f:Documentation/devicetree/bindings/iio/pressure/meas,ms5611.yaml
-f:Documentation/devicetree/bindings/iio/pressure/murata,zpa2326.yaml
-f:Documentation/devicetree/bindings/iio/pressure/rohm,bm1390.yaml
-f:Documentation/devicetree/bindings/iio/pressure/sensirion,sdp500.yaml
-f:Documentation/devicetree/bindings/iio/proximity/ams,as3935.yaml
-f:Documentation/devicetree/bindings/iio/proximity/awinic,aw96103.yaml
-f:Documentation/devicetree/bindings/iio/proximity/devantech-srf04.yaml
-f:Documentation/devicetree/bindings/iio/proximity/google,cros-ec-mkbp-proximity.yaml
-f:Documentation/devicetree/bindings/iio/proximity/maxbotix,mb1232.yaml
-f:Documentation/devicetree/bindings/iio/proximity/murata,irsd200.yaml
-f:Documentation/devicetree/bindings/iio/proximity/nicera,d3323aa.yaml
-f:Documentation/devicetree/bindings/iio/proximity/parallax-ping.yaml
-f:Documentation/devicetree/bindings/iio/proximity/semtech,sx9310.yaml
-f:Documentation/devicetree/bindings/iio/proximity/semtech,sx9324.yaml
-f:Documentation/devicetree/bindings/iio/proximity/semtech,sx9360.yaml
-f:Documentation/devicetree/bindings/iio/proximity/semtech,sx9500.yaml
-f:Documentation/devicetree/bindings/iio/proximity/st,vl53l0x.yaml
-f:Documentation/devicetree/bindings/iio/proximity/tyhx,hx9023s.yaml
-f:Documentation/devicetree/bindings/iio/proximity/vishay,vcnl3020.yaml
-f:Documentation/devicetree/bindings/iio/resolver/adi,ad2s1210.yaml
-f:Documentation/devicetree/bindings/iio/resolver/adi,ad2s90.yaml
-f:Documentation/devicetree/bindings/iio/samsung,sensorhub-rinato.yaml
-f:Documentation/devicetree/bindings/iio/st,st-sensors.yaml
-f:Documentation/devicetree/bindings/iio/temperature/adi,ltc2983.yaml
-f:Documentation/devicetree/bindings/iio/temperature/maxim,max31855k.yaml
-f:Documentation/devicetree/bindings/iio/temperature/maxim,max31856.yaml
-f:Documentation/devicetree/bindings/iio/temperature/maxim,max31865.yaml
-f:Documentation/devicetree/bindings/iio/temperature/melexis,mlx90614.yaml
-f:Documentation/devicetree/bindings/iio/temperature/melexis,mlx90632.yaml
-f:Documentation/devicetree/bindings/iio/temperature/microchip,mcp9600.yaml
-f:Documentation/devicetree/bindings/iio/temperature/ti,tmp006.yaml
-f:Documentation/devicetree/bindings/iio/temperature/ti,tmp007.yaml
-f:Documentation/devicetree/bindings/iio/temperature/ti,tmp117.yaml
-f:Documentation/devicetree/bindings/incomplete-devices.yaml
-f:Documentation/devicetree/bindings/index.rst
-f:Documentation/devicetree/bindings/infiniband/hisilicon-hns-roce.txt
-f:Documentation/devicetree/bindings/input/adafruit,seesaw-gamepad.yaml
-f:Documentation/devicetree/bindings/input/adc-joystick.yaml
-f:Documentation/devicetree/bindings/input/adc-keys.yaml
-f:Documentation/devicetree/bindings/input/adi,adp5588.yaml
-f:Documentation/devicetree/bindings/input/allwinner,sun4i-a10-lradc-keys.yaml
-f:Documentation/devicetree/bindings/input/ariel-pwrbutton.yaml
-f:Documentation/devicetree/bindings/input/atmel,captouch.yaml
-f:Documentation/devicetree/bindings/input/atmel,maxtouch.yaml
-f:Documentation/devicetree/bindings/input/azoteq,iqs7222.yaml
-f:Documentation/devicetree/bindings/input/brcm,bcm-keypad.txt
-f:Documentation/devicetree/bindings/input/cirrus,cs40l50.yaml
-f:Documentation/devicetree/bindings/input/cirrus,ep9307-keypad.yaml
-f:Documentation/devicetree/bindings/input/clps711x-keypad.txt
-f:Documentation/devicetree/bindings/input/cpcap-pwrbutton.txt
-f:Documentation/devicetree/bindings/input/cypress,cyapa.yaml
-f:Documentation/devicetree/bindings/input/cypress,tm2-touchkey.yaml
-f:Documentation/devicetree/bindings/input/cypress-sf.yaml
-f:Documentation/devicetree/bindings/input/dlg,da7280.yaml
-f:Documentation/devicetree/bindings/input/dlg,da9062-onkey.yaml
-f:Documentation/devicetree/bindings/input/dlink,dir685-touchkeys.txt
-f:Documentation/devicetree/bindings/input/e3x0-button.txt
-f:Documentation/devicetree/bindings/input/elan,ekth3000.yaml
-f:Documentation/devicetree/bindings/input/elan,ekth6915.yaml
-f:Documentation/devicetree/bindings/input/fsl,mpr121-touchkey.yaml
-f:Documentation/devicetree/bindings/input/fsl,scu-key.yaml
-f:Documentation/devicetree/bindings/input/goodix,gt7375p.yaml
-f:Documentation/devicetree/bindings/input/goodix,gt7986u-spifw.yaml
-f:Documentation/devicetree/bindings/input/google,cros-ec-keyb.yaml
-f:Documentation/devicetree/bindings/input/gpio-beeper.yaml
-f:Documentation/devicetree/bindings/input/gpio-decoder.txt
-f:Documentation/devicetree/bindings/input/gpio-keys.yaml
-f:Documentation/devicetree/bindings/input/gpio-matrix-keypad.yaml
-f:Documentation/devicetree/bindings/input/gpio-mouse.yaml
-f:Documentation/devicetree/bindings/input/gpio-vibrator.yaml
-f:Documentation/devicetree/bindings/input/hid-over-i2c.yaml
-f:Documentation/devicetree/bindings/input/ibm,op-panel.yaml
-f:Documentation/devicetree/bindings/input/ilitek,ili2901.yaml
-f:Documentation/devicetree/bindings/input/ilitek,ili9882t.yaml
-f:Documentation/devicetree/bindings/input/imx-keypad.yaml
-f:Documentation/devicetree/bindings/input/input-reset.txt
-f:Documentation/devicetree/bindings/input/input.yaml
-f:Documentation/devicetree/bindings/input/iqs269a.yaml
-f:Documentation/devicetree/bindings/input/iqs626a.yaml
-f:Documentation/devicetree/bindings/input/iqs62x-keys.yaml
-f:Documentation/devicetree/bindings/input/lpc32xx-key.txt
-f:Documentation/devicetree/bindings/input/matrix-keymap.txt
-f:Documentation/devicetree/bindings/input/matrix-keymap.yaml
-f:Documentation/devicetree/bindings/input/max77650-onkey.yaml
-f:Documentation/devicetree/bindings/input/mediatek,mt6779-keypad.yaml
-f:Documentation/devicetree/bindings/input/mediatek,pmic-keys.yaml
-f:Documentation/devicetree/bindings/input/microchip,cap11xx.yaml
-f:Documentation/devicetree/bindings/input/microchip,qt1050.txt
-f:Documentation/devicetree/bindings/input/nvidia,tegra20-kbc.txt
-f:Documentation/devicetree/bindings/input/omap-keypad.txt
-f:Documentation/devicetree/bindings/input/pine64,pinephone-keyboard.yaml
-f:Documentation/devicetree/bindings/input/ps2keyb-mouse-apbps2.txt
-f:Documentation/devicetree/bindings/input/pwm-beeper.yaml
-f:Documentation/devicetree/bindings/input/pwm-vibrator.yaml
-f:Documentation/devicetree/bindings/input/pxa27x-keypad.txt
-f:Documentation/devicetree/bindings/input/qcom,pm8921-keypad.yaml
-f:Documentation/devicetree/bindings/input/qcom,pm8921-pwrkey.yaml
-f:Documentation/devicetree/bindings/input/qcom,pm8941-pwrkey.yaml
-f:Documentation/devicetree/bindings/input/qcom,pm8xxx-vib.yaml
-f:Documentation/devicetree/bindings/input/raydium_i2c_ts.txt
-f:Documentation/devicetree/bindings/input/regulator-haptic.yaml
-f:Documentation/devicetree/bindings/input/rotary-encoder.yaml
-f:Documentation/devicetree/bindings/input/samsung,s3c6410-keypad.yaml
-f:Documentation/devicetree/bindings/input/spear-keyboard.txt
-f:Documentation/devicetree/bindings/input/sprd,sc27xx-vibrator.yaml
-f:Documentation/devicetree/bindings/input/st-keyscan.txt
-f:Documentation/devicetree/bindings/input/syna,rmi4.yaml
-f:Documentation/devicetree/bindings/input/tca8418_keypad.txt
-f:Documentation/devicetree/bindings/input/ti,drv260x.yaml
-f:Documentation/devicetree/bindings/input/ti,drv266x.yaml
-f:Documentation/devicetree/bindings/input/ti,nspire-keypad.yaml
-f:Documentation/devicetree/bindings/input/ti,palmas-pwrbutton.txt
-f:Documentation/devicetree/bindings/input/touchscreen/adi,ad7879.yaml
-f:Documentation/devicetree/bindings/input/touchscreen/apple,z2-multitouch.yaml
-f:Documentation/devicetree/bindings/input/touchscreen/ar1021.txt
-f:Documentation/devicetree/bindings/input/touchscreen/auo_pixcir_ts.txt
-f:Documentation/devicetree/bindings/input/touchscreen/azoteq,iqs5xx.yaml
-f:Documentation/devicetree/bindings/input/touchscreen/azoteq,iqs7211.yaml
-f:Documentation/devicetree/bindings/input/touchscreen/brcm,iproc-touchscreen.txt
-f:Documentation/devicetree/bindings/input/touchscreen/bu21013.txt
-f:Documentation/devicetree/bindings/input/touchscreen/bu21029.txt
-f:Documentation/devicetree/bindings/input/touchscreen/chipone,icn8318.yaml
-f:Documentation/devicetree/bindings/input/touchscreen/cypress,cy8ctma140.yaml
-f:Documentation/devicetree/bindings/input/touchscreen/cypress,cy8ctma340.yaml
-f:Documentation/devicetree/bindings/input/touchscreen/cypress,tt21000.yaml
-f:Documentation/devicetree/bindings/input/touchscreen/edt-ft5x06.yaml
-f:Documentation/devicetree/bindings/input/touchscreen/eeti,exc3000.yaml
-f:Documentation/devicetree/bindings/input/touchscreen/eeti.txt
-f:Documentation/devicetree/bindings/input/touchscreen/egalax-ts.txt
-f:Documentation/devicetree/bindings/input/touchscreen/elan,ektf2127.yaml
-f:Documentation/devicetree/bindings/input/touchscreen/elan,elants_i2c.yaml
-f:Documentation/devicetree/bindings/input/touchscreen/fsl,imx6ul-tsc.yaml
-f:Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt
-f:Documentation/devicetree/bindings/input/touchscreen/goodix,gt9916.yaml
-f:Documentation/devicetree/bindings/input/touchscreen/goodix.yaml
-f:Documentation/devicetree/bindings/input/touchscreen/hideep.txt
-f:Documentation/devicetree/bindings/input/touchscreen/himax,hx83112b.yaml
-f:Documentation/devicetree/bindings/input/touchscreen/hycon,hy46xx.yaml
-f:Documentation/devicetree/bindings/input/touchscreen/hynitron,cstxxx.yaml
-f:Documentation/devicetree/bindings/input/touchscreen/ilitek_ts_i2c.yaml
-f:Documentation/devicetree/bindings/input/touchscreen/imagis,ist3038c.yaml
-f:Documentation/devicetree/bindings/input/touchscreen/lpc32xx-tsc.txt
-f:Documentation/devicetree/bindings/input/touchscreen/max11801-ts.txt
-f:Documentation/devicetree/bindings/input/touchscreen/melfas,mms114.yaml
-f:Documentation/devicetree/bindings/input/touchscreen/melfas_mip4.txt
-f:Documentation/devicetree/bindings/input/touchscreen/mstar,msg2638.yaml
-f:Documentation/devicetree/bindings/input/touchscreen/neonode,zforce.yaml
-f:Documentation/devicetree/bindings/input/touchscreen/novatek,nvt-ts.yaml
-f:Documentation/devicetree/bindings/input/touchscreen/pixcir,pixcir_ts.yaml
-f:Documentation/devicetree/bindings/input/touchscreen/raspberrypi,firmware-ts.txt
-f:Documentation/devicetree/bindings/input/touchscreen/resistive-adc-touch.yaml
-f:Documentation/devicetree/bindings/input/touchscreen/samsung,s6sy761.yaml
-f:Documentation/devicetree/bindings/input/touchscreen/silead,gsl1680.yaml
-f:Documentation/devicetree/bindings/input/touchscreen/sis_i2c.txt
-f:Documentation/devicetree/bindings/input/touchscreen/sitronix,st1232.yaml
-f:Documentation/devicetree/bindings/input/touchscreen/st,stmfts.yaml
-f:Documentation/devicetree/bindings/input/touchscreen/sx8654.txt
-f:Documentation/devicetree/bindings/input/touchscreen/ti,ads7843.yaml
-f:Documentation/devicetree/bindings/input/touchscreen/ti,am3359-tsc.yaml
-f:Documentation/devicetree/bindings/input/touchscreen/ti,tsc2005.yaml
-f:Documentation/devicetree/bindings/input/touchscreen/toradex,vf50-touchscreen.yaml
-f:Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt
-f:Documentation/devicetree/bindings/input/touchscreen/touchscreen.yaml
-f:Documentation/devicetree/bindings/input/touchscreen/ts4800-ts.txt
-f:Documentation/devicetree/bindings/input/touchscreen/tsc2007.txt
-f:Documentation/devicetree/bindings/input/touchscreen/zet6223.txt
-f:Documentation/devicetree/bindings/input/touchscreen/zinitix,bt400.yaml
-f:Documentation/devicetree/bindings/input/tps65218-pwrbutton.txt
-f:Documentation/devicetree/bindings/input/twl4030-keypad.txt
-f:Documentation/devicetree/bindings/input/zii,rave-sp-pwrbutton.yaml
-f:Documentation/devicetree/bindings/interconnect/fsl,imx8m-noc.yaml
-f:Documentation/devicetree/bindings/interconnect/interconnect.txt
-f:Documentation/devicetree/bindings/interconnect/mediatek,cci.yaml
-f:Documentation/devicetree/bindings/interconnect/mediatek,mt8183-emi.yaml
-f:Documentation/devicetree/bindings/interconnect/qcom,bcm-voter.yaml
-f:Documentation/devicetree/bindings/interconnect/qcom,milos-rpmh.yaml
-f:Documentation/devicetree/bindings/interconnect/qcom,msm8939.yaml
-f:Documentation/devicetree/bindings/interconnect/qcom,msm8953.yaml
-f:Documentation/devicetree/bindings/interconnect/qcom,msm8974.yaml
-f:Documentation/devicetree/bindings/interconnect/qcom,msm8996.yaml
-f:Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml
-f:Documentation/devicetree/bindings/interconnect/qcom,osm-l3.yaml
-f:Documentation/devicetree/bindings/interconnect/qcom,qcm2290.yaml
-f:Documentation/devicetree/bindings/interconnect/qcom,qcs615-rpmh.yaml
-f:Documentation/devicetree/bindings/interconnect/qcom,qcs8300-rpmh.yaml
-f:Documentation/devicetree/bindings/interconnect/qcom,qdu1000-rpmh.yaml
-f:Documentation/devicetree/bindings/interconnect/qcom,rpm-common.yaml
-f:Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml
-f:Documentation/devicetree/bindings/interconnect/qcom,rpmh-common.yaml
-f:Documentation/devicetree/bindings/interconnect/qcom,rpmh.yaml
-f:Documentation/devicetree/bindings/interconnect/qcom,sa8775p-rpmh.yaml
-f:Documentation/devicetree/bindings/interconnect/qcom,sar2130p-rpmh.yaml
-f:Documentation/devicetree/bindings/interconnect/qcom,sc7280-rpmh.yaml
-f:Documentation/devicetree/bindings/interconnect/qcom,sc8280xp-rpmh.yaml
-f:Documentation/devicetree/bindings/interconnect/qcom,sdm660.yaml
-f:Documentation/devicetree/bindings/interconnect/qcom,sdx75-rpmh.yaml
-f:Documentation/devicetree/bindings/interconnect/qcom,sm6115.yaml
-f:Documentation/devicetree/bindings/interconnect/qcom,sm6350-rpmh.yaml
-f:Documentation/devicetree/bindings/interconnect/qcom,sm7150-rpmh.yaml
-f:Documentation/devicetree/bindings/interconnect/qcom,sm8450-rpmh.yaml
-f:Documentation/devicetree/bindings/interconnect/qcom,sm8550-rpmh.yaml
-f:Documentation/devicetree/bindings/interconnect/qcom,sm8650-rpmh.yaml
-f:Documentation/devicetree/bindings/interconnect/qcom,sm8750-rpmh.yaml
-f:Documentation/devicetree/bindings/interconnect/qcom,x1e80100-rpmh.yaml
-f:Documentation/devicetree/bindings/interconnect/samsung,exynos-bus.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/abilis,tb10x-ictl.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/actions,owl-sirq.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/al,alpine-msix.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/allwinner,sun4i-a10-ic.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/allwinner,sun6i-a31-r-intc.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/allwinner,sun7i-a20-sc-nmi.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/altr,msi-controller.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/amazon,al-fic.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/andestech,plicsw.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/apm,xgene1-msi.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/apple,aic.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/apple,aic2.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/arm,gic-v5-iwb.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/arm,gic-v5.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/arm,gic.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/arm,nvic.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/arm,versatile-fpga-irq.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/arm,vic.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2400-i2c-ic.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2400-vic.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2500-scu-ic.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2700-intc.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/atmel,aic.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2712-msix.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2836-l1-intc.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/brcm,bcm6345-l1-intc.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/brcm,bcm7038-l1-intc.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/brcm,bcm7120-l2-intc.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/brcm,l2-intc.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/cdns,xtensa-pic.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/chrp,open-pic.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/cirrus,ep7209-intc.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/cnxt,cx92755-ic.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/csky,apb-intc.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/csky,mpintc.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/econet,en751221-intc.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/ezchip,nps400-ic.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/faraday,ftintc010.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/fsl,icoll.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/fsl,imx8qxp-dc-intc.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/fsl,intmux.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/fsl,irqsteer.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/fsl,ls-extirq.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/fsl,ls-msi.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/fsl,mpic-msi.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/fsl,mu-msi.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/fsl,tzic.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/fsl,vf610-mscm-ir.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/google,goldfish-pic.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/hisilicon,mbigen-v2.txt
-f:Documentation/devicetree/bindings/interrupt-controller/idt,32434-pic.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/img,pdc-intc.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/ingenic,intc.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/intel,ce4100-ioapic.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/intel,ce4100-lapic.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/intel,ixp4xx-interrupt.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/interrupts.txt
-f:Documentation/devicetree/bindings/interrupt-controller/jcore,aic.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/kontron,sl28cpld-intc.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/loongson,cpu-interrupt-controller.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/loongson,eiointc.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/loongson,htpic.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/loongson,htvec.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/loongson,liointc.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/loongson,ls1x-intc.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/loongson,pch-msi.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/loongson,pch-pic.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/lsi,zevio-intc.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/marvell,ap806-gicp.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/marvell,ap806-sei.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/marvell,armada-8k-pic.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/marvell,cp110-icu.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/marvell,mpic.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/marvell,odmi-controller.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/marvell,orion-bridge-intc.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/mediatek,mt6577-sysirq.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/mediatek,mtk-cirq.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/microchip,lan966x-oic.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/microchip,pic32mzda-evic.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/microchip,sama7g5-eic.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/mrvl,intc.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/mscc,ocelot-icpu-intr.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/msi-controller.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/msi.txt
-f:Documentation/devicetree/bindings/interrupt-controller/mstar,mst-intc.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/mti,cpu-interrupt-controller.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/mti,gic.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/nuvoton,wpcm450-aic.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/nvidia,tegra20-ictlr.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/nxp,lpc3220-mic.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/opencores,or1k-pic.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/openrisc,ompic.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/qca,ar7100-cpu-intc.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/qca,ar7100-misc-intc.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/qcom,mpm.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/qcom,pdc.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/ralink,rt2880-intc.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/rda,8810pl-intc.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/realtek,rtl-intc.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/renesas,intc-irqpin.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/renesas,rza1-irqc.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/renesas,rzg2l-irqc.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/renesas,rzv2h-icu.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/riscv,aplic.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/riscv,cpu-intc.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/riscv,imsics.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/samsung,exynos4210-combiner.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/sifive,plic-1.0.0.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/snps,arc700-intc.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/snps,archs-idu-intc.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/snps,archs-intc.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/snps,dw-apb-ictl.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/socionext,synquacer-exiu.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/socionext,uniphier-aidet.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/sophgo,sg2042-msi.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/st,spear300-shirq.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/st,stih407-irq-syscfg.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/st,stm32-exti.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/starfive,jh8100-intc.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/sunplus,sp7021-intc.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/technologic,ts4800-irqc.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/thead,c900-aclint-mswi.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/thead,c900-aclint-sswi.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/ti,cp-intc.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/ti,keystone-irq.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/ti,omap-intc-irq.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/ti,omap4-wugen-mpu.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/ti,pruss-intc.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/via,vt8500-intc.yaml
-f:Documentation/devicetree/bindings/interrupt-controller/xlnx,intc.yaml
-f:Documentation/devicetree/bindings/iommu/allwinner,sun50i-h6-iommu.yaml
-f:Documentation/devicetree/bindings/iommu/apple,dart.yaml
-f:Documentation/devicetree/bindings/iommu/apple,sart.yaml
-f:Documentation/devicetree/bindings/iommu/arm,smmu-v3.yaml
-f:Documentation/devicetree/bindings/iommu/arm,smmu.yaml
-f:Documentation/devicetree/bindings/iommu/iommu.txt
-f:Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml
-f:Documentation/devicetree/bindings/iommu/nvidia,tegra30-smmu.txt
-f:Documentation/devicetree/bindings/iommu/qcom,apq8064-iommu.yaml
-f:Documentation/devicetree/bindings/iommu/qcom,iommu.yaml
-f:Documentation/devicetree/bindings/iommu/qcom,tbu.yaml
-f:Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.yaml
-f:Documentation/devicetree/bindings/iommu/riscv,iommu.yaml
-f:Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml
-f:Documentation/devicetree/bindings/iommu/samsung,sysmmu.yaml
-f:Documentation/devicetree/bindings/iommu/sprd,iommu.yaml
-f:Documentation/devicetree/bindings/iommu/ti,omap-iommu.txt
-f:Documentation/devicetree/bindings/iommu/xen,grant-dma.yaml
-f:Documentation/devicetree/bindings/ipmi/aspeed,ast2400-ibt-bmc.txt
-f:Documentation/devicetree/bindings/ipmi/aspeed,ast2400-kcs-bmc.yaml
-f:Documentation/devicetree/bindings/ipmi/ipmb-dev.yaml
-f:Documentation/devicetree/bindings/ipmi/ipmi-ipmb.yaml
-f:Documentation/devicetree/bindings/ipmi/ipmi-smic.yaml
-f:Documentation/devicetree/bindings/ipmi/npcm7xx-kcs-bmc.txt
-f:Documentation/devicetree/bindings/ipmi/ssif-bmc.yaml
-f:Documentation/devicetree/bindings/jailhouse.txt
-f:Documentation/devicetree/bindings/leds/allwinner,sun50i-a100-ledc.yaml
-f:Documentation/devicetree/bindings/leds/ams,as3645a.txt
-f:Documentation/devicetree/bindings/leds/awinic,aw200xx.yaml
-f:Documentation/devicetree/bindings/leds/backlight/88pm860x.txt
-f:Documentation/devicetree/bindings/leds/backlight/apple,dwi-bl.yaml
-f:Documentation/devicetree/bindings/leds/backlight/arcxcnn_bl.txt
-f:Documentation/devicetree/bindings/leds/backlight/common.yaml
-f:Documentation/devicetree/bindings/leds/backlight/gpio-backlight.yaml
-f:Documentation/devicetree/bindings/leds/backlight/kinetic,ktd253.yaml
-f:Documentation/devicetree/bindings/leds/backlight/kinetic,ktd2801.yaml
-f:Documentation/devicetree/bindings/leds/backlight/kinetic,ktz8866.yaml
-f:Documentation/devicetree/bindings/leds/backlight/led-backlight.yaml
-f:Documentation/devicetree/bindings/leds/backlight/lm3630a-backlight.yaml
-f:Documentation/devicetree/bindings/leds/backlight/lp855x-backlight.yaml
-f:Documentation/devicetree/bindings/leds/backlight/mediatek,mt6370-backlight.yaml
-f:Documentation/devicetree/bindings/leds/backlight/mps,mp3309c.yaml
-f:Documentation/devicetree/bindings/leds/backlight/pwm-backlight.yaml
-f:Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml
-f:Documentation/devicetree/bindings/leds/backlight/richtek,rt4831-backlight.yaml
-f:Documentation/devicetree/bindings/leds/backlight/sky81452-backlight.txt
-f:Documentation/devicetree/bindings/leds/backlight/ti,lm3509.yaml
-f:Documentation/devicetree/bindings/leds/backlight/ti,lp8864.yaml
-f:Documentation/devicetree/bindings/leds/backlight/tps65217-backlight.txt
-f:Documentation/devicetree/bindings/leds/backlight/zii,rave-sp-backlight.yaml
-f:Documentation/devicetree/bindings/leds/common.txt
-f:Documentation/devicetree/bindings/leds/common.yaml
-f:Documentation/devicetree/bindings/leds/cznic,turris-omnia-leds.yaml
-f:Documentation/devicetree/bindings/leds/irled/gpio-ir-tx.yaml
-f:Documentation/devicetree/bindings/leds/irled/ir-spi-led.yaml
-f:Documentation/devicetree/bindings/leds/irled/pwm-ir-tx.yaml
-f:Documentation/devicetree/bindings/leds/issi,is31fl319x.yaml
-f:Documentation/devicetree/bindings/leds/kinetic,ktd202x.yaml
-f:Documentation/devicetree/bindings/leds/kinetic,ktd2692.yaml
-f:Documentation/devicetree/bindings/leds/leds-aw2013.yaml
-f:Documentation/devicetree/bindings/leds/leds-bcm63138.yaml
-f:Documentation/devicetree/bindings/leds/leds-bcm6328.yaml
-f:Documentation/devicetree/bindings/leds/leds-bcm6358.txt
-f:Documentation/devicetree/bindings/leds/leds-class-multicolor.yaml
-f:Documentation/devicetree/bindings/leds/leds-cpcap.txt
-f:Documentation/devicetree/bindings/leds/leds-cr0014114.txt
-f:Documentation/devicetree/bindings/leds/leds-el15203000.txt
-f:Documentation/devicetree/bindings/leds/leds-gpio.yaml
-f:Documentation/devicetree/bindings/leds/leds-group-multicolor.yaml
-f:Documentation/devicetree/bindings/leds/leds-is31fl32xx.txt
-f:Documentation/devicetree/bindings/leds/leds-lgm.yaml
-f:Documentation/devicetree/bindings/leds/leds-lm3532.txt
-f:Documentation/devicetree/bindings/leds/leds-lm3601x.txt
-f:Documentation/devicetree/bindings/leds/leds-lm36274.txt
-f:Documentation/devicetree/bindings/leds/leds-lm3697.txt
-f:Documentation/devicetree/bindings/leds/leds-lp50xx.yaml
-f:Documentation/devicetree/bindings/leds/leds-lp55xx.yaml
-f:Documentation/devicetree/bindings/leds/leds-lt3593.txt
-f:Documentation/devicetree/bindings/leds/leds-max77650.yaml
-f:Documentation/devicetree/bindings/leds/leds-mt6360.yaml
-f:Documentation/devicetree/bindings/leds/leds-netxbig.txt
-f:Documentation/devicetree/bindings/leds/leds-ns2.txt
-f:Documentation/devicetree/bindings/leds/leds-powernv.txt
-f:Documentation/devicetree/bindings/leds/leds-pwm-multicolor.yaml
-f:Documentation/devicetree/bindings/leds/leds-pwm.yaml
-f:Documentation/devicetree/bindings/leds/leds-qcom-lpg.yaml
-f:Documentation/devicetree/bindings/leds/leds-rt4505.yaml
-f:Documentation/devicetree/bindings/leds/leds-sgm3140.yaml
-f:Documentation/devicetree/bindings/leds/leds-spi-byte.txt
-f:Documentation/devicetree/bindings/leds/leds-trigger-pattern.txt
-f:Documentation/devicetree/bindings/leds/maxim,max77693.yaml
-f:Documentation/devicetree/bindings/leds/mediatek,mt6370-flashlight.yaml
-f:Documentation/devicetree/bindings/leds/mediatek,mt6370-indicator.yaml
-f:Documentation/devicetree/bindings/leds/nxp,pca953x.yaml
-f:Documentation/devicetree/bindings/leds/nxp,pca955x.yaml
-f:Documentation/devicetree/bindings/leds/nxp,pca963x.yaml
-f:Documentation/devicetree/bindings/leds/nxp,pca995x.yaml
-f:Documentation/devicetree/bindings/leds/onnn,ncp5623.yaml
-f:Documentation/devicetree/bindings/leds/panasonic,an30259a.yaml
-f:Documentation/devicetree/bindings/leds/qcom,pm8058-led.yaml
-f:Documentation/devicetree/bindings/leds/qcom,spmi-flash-led.yaml
-f:Documentation/devicetree/bindings/leds/register-bit-led.yaml
-f:Documentation/devicetree/bindings/leds/regulator-led.yaml
-f:Documentation/devicetree/bindings/leds/richtek,rt8515.yaml
-f:Documentation/devicetree/bindings/leds/rohm,bd2606mvv.yaml
-f:Documentation/devicetree/bindings/leds/rohm,bd71828-leds.yaml
-f:Documentation/devicetree/bindings/leds/silergy,sy7802.yaml
-f:Documentation/devicetree/bindings/leds/skyworks,aat1290.yaml
-f:Documentation/devicetree/bindings/leds/sprd,sc2731-bltc.yaml
-f:Documentation/devicetree/bindings/leds/st,led1202.yaml
-f:Documentation/devicetree/bindings/leds/ti,lp8860.yaml
-f:Documentation/devicetree/bindings/leds/ti,tca6507.yaml
-f:Documentation/devicetree/bindings/leds/ti,tlc59116.yaml
-f:Documentation/devicetree/bindings/leds/ti,tps61310.yaml
-f:Documentation/devicetree/bindings/leds/ti.lm36922.yaml
-f:Documentation/devicetree/bindings/leds/trigger-source.yaml
-f:Documentation/devicetree/bindings/loongarch/cpus.yaml
-f:Documentation/devicetree/bindings/loongarch/loongson.yaml
-f:Documentation/devicetree/bindings/mailbox/allwinner,sun6i-a31-msgbox.yaml
-f:Documentation/devicetree/bindings/mailbox/altera-mailbox.txt
-f:Documentation/devicetree/bindings/mailbox/amlogic,meson-gxbb-mhu.yaml
-f:Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml
-f:Documentation/devicetree/bindings/mailbox/arm,mhu.yaml
-f:Documentation/devicetree/bindings/mailbox/arm,mhuv2.yaml
-f:Documentation/devicetree/bindings/mailbox/arm,mhuv3.yaml
-f:Documentation/devicetree/bindings/mailbox/brcm,bcm2835-mbox.yaml
-f:Documentation/devicetree/bindings/mailbox/brcm,iproc-flexrm-mbox.txt
-f:Documentation/devicetree/bindings/mailbox/brcm,iproc-pdc-mbox.txt
-f:Documentation/devicetree/bindings/mailbox/cix,sky1-mbox.yaml
-f:Documentation/devicetree/bindings/mailbox/fsl,mu.yaml
-f:Documentation/devicetree/bindings/mailbox/google,gs101-mbox.yaml
-f:Documentation/devicetree/bindings/mailbox/hisilicon,hi3660-mailbox.txt
-f:Documentation/devicetree/bindings/mailbox/hisilicon,hi6220-mailbox.txt
-f:Documentation/devicetree/bindings/mailbox/mailbox.txt
-f:Documentation/devicetree/bindings/mailbox/marvell,armada-3700-rwtm-mailbox.txt
-f:Documentation/devicetree/bindings/mailbox/mediatek,gce-mailbox.yaml
-f:Documentation/devicetree/bindings/mailbox/mediatek,gce-props.yaml
-f:Documentation/devicetree/bindings/mailbox/microchip,mpfs-mailbox.yaml
-f:Documentation/devicetree/bindings/mailbox/microchip,sbi-ipc.yaml
-f:Documentation/devicetree/bindings/mailbox/mtk,adsp-mbox.yaml
-f:Documentation/devicetree/bindings/mailbox/nvidia,tegra186-hsp.yaml
-f:Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml
-f:Documentation/devicetree/bindings/mailbox/qcom,cpucp-mbox.yaml
-f:Documentation/devicetree/bindings/mailbox/qcom-ipcc.yaml
-f:Documentation/devicetree/bindings/mailbox/rockchip-mailbox.txt
-f:Documentation/devicetree/bindings/mailbox/sophgo,cv1800b-mailbox.yaml
-f:Documentation/devicetree/bindings/mailbox/sprd-mailbox.yaml
-f:Documentation/devicetree/bindings/mailbox/st,sti-mailbox.yaml
-f:Documentation/devicetree/bindings/mailbox/st,stm32-ipcc.yaml
-f:Documentation/devicetree/bindings/mailbox/thead,th1520-mbox.yaml
-f:Documentation/devicetree/bindings/mailbox/ti,message-manager.txt
-f:Documentation/devicetree/bindings/mailbox/ti,omap-mailbox.yaml
-f:Documentation/devicetree/bindings/mailbox/ti,secure-proxy.yaml
-f:Documentation/devicetree/bindings/mailbox/xgene-slimpro-mailbox.txt
-f:Documentation/devicetree/bindings/mailbox/xlnx,zynqmp-ipi-mailbox.yaml
-f:Documentation/devicetree/bindings/media/allegro,al5e.yaml
-f:Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml
-f:Documentation/devicetree/bindings/media/allwinner,sun4i-a10-ir.yaml
-f:Documentation/devicetree/bindings/media/allwinner,sun4i-a10-video-engine.yaml
-f:Documentation/devicetree/bindings/media/allwinner,sun50i-h6-vpu-g2.yaml
-f:Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml
-f:Documentation/devicetree/bindings/media/allwinner,sun6i-a31-isp.yaml
-f:Documentation/devicetree/bindings/media/allwinner,sun6i-a31-mipi-csi2.yaml
-f:Documentation/devicetree/bindings/media/allwinner,sun8i-a83t-de2-rotate.yaml
-f:Documentation/devicetree/bindings/media/allwinner,sun8i-a83t-mipi-csi2.yaml
-f:Documentation/devicetree/bindings/media/allwinner,sun8i-h3-deinterlace.yaml
-f:Documentation/devicetree/bindings/media/amlogic,axg-ge2d.yaml
-f:Documentation/devicetree/bindings/media/amlogic,c3-isp.yaml
-f:Documentation/devicetree/bindings/media/amlogic,c3-mipi-adapter.yaml
-f:Documentation/devicetree/bindings/media/amlogic,c3-mipi-csi2.yaml
-f:Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml
-f:Documentation/devicetree/bindings/media/amlogic,meson-ir-tx.yaml
-f:Documentation/devicetree/bindings/media/amlogic,meson6-ir.yaml
-f:Documentation/devicetree/bindings/media/amphion,vpu.yaml
-f:Documentation/devicetree/bindings/media/aspeed,video-engine.yaml
-f:Documentation/devicetree/bindings/media/atmel,isc.yaml
-f:Documentation/devicetree/bindings/media/atmel-isi.txt
-f:Documentation/devicetree/bindings/media/brcm,bcm2835-unicam.yaml
-f:Documentation/devicetree/bindings/media/cdns,csi2rx.yaml
-f:Documentation/devicetree/bindings/media/cdns,csi2tx.txt
-f:Documentation/devicetree/bindings/media/cec/amlogic,meson-gx-ao-cec.yaml
-f:Documentation/devicetree/bindings/media/cec/cec-common.yaml
-f:Documentation/devicetree/bindings/media/cec/cec-gpio.yaml
-f:Documentation/devicetree/bindings/media/cec/nvidia,tegra114-cec.yaml
-f:Documentation/devicetree/bindings/media/cec/samsung,s5p-cec.yaml
-f:Documentation/devicetree/bindings/media/cec/st,stih-cec.yaml
-f:Documentation/devicetree/bindings/media/cec/st,stm32-cec.yaml
-f:Documentation/devicetree/bindings/media/cnm,wave521c.yaml
-f:Documentation/devicetree/bindings/media/coda.yaml
-f:Documentation/devicetree/bindings/media/fsl,imx-capture-subsystem.yaml
-f:Documentation/devicetree/bindings/media/fsl,imx6-mipi-csi2.yaml
-f:Documentation/devicetree/bindings/media/fsl,imx6q-vdoa.yaml
-f:Documentation/devicetree/bindings/media/fsl,imx6ull-pxp.yaml
-f:Documentation/devicetree/bindings/media/fsl,imx8qm-isi.yaml
-f:Documentation/devicetree/bindings/media/fsl,imx8qxp-isi.yaml
-f:Documentation/devicetree/bindings/media/gpio-ir-receiver.yaml
-f:Documentation/devicetree/bindings/media/hix5hd2-ir.txt
-f:Documentation/devicetree/bindings/media/i2c/adi,ad5820.yaml
-f:Documentation/devicetree/bindings/media/i2c/adi,adp1653.txt
-f:Documentation/devicetree/bindings/media/i2c/adi,adv7180.yaml
-f:Documentation/devicetree/bindings/media/i2c/adi,adv7343.txt
-f:Documentation/devicetree/bindings/media/i2c/adi,adv748x.yaml
-f:Documentation/devicetree/bindings/media/i2c/adi,adv7604.yaml
-f:Documentation/devicetree/bindings/media/i2c/alliedvision,alvium-csi2.yaml
-f:Documentation/devicetree/bindings/media/i2c/aptina,mt9p031.yaml
-f:Documentation/devicetree/bindings/media/i2c/aptina,mt9v032.txt
-f:Documentation/devicetree/bindings/media/i2c/aptina,mt9v111.yaml
-f:Documentation/devicetree/bindings/media/i2c/asahi-kasei,ak7375.yaml
-f:Documentation/devicetree/bindings/media/i2c/chrontel,ch7322.yaml
-f:Documentation/devicetree/bindings/media/i2c/dongwoon,dw9714.yaml
-f:Documentation/devicetree/bindings/media/i2c/dongwoon,dw9768.yaml
-f:Documentation/devicetree/bindings/media/i2c/dongwoon,dw9807-vcm.yaml
-f:Documentation/devicetree/bindings/media/i2c/galaxycore,gc0308.yaml
-f:Documentation/devicetree/bindings/media/i2c/galaxycore,gc05a2.yaml
-f:Documentation/devicetree/bindings/media/i2c/galaxycore,gc08a3.yaml
-f:Documentation/devicetree/bindings/media/i2c/galaxycore,gc2145.yaml
-f:Documentation/devicetree/bindings/media/i2c/hynix,hi846.yaml
-f:Documentation/devicetree/bindings/media/i2c/imi,rdacm2x-gmsl.yaml
-f:Documentation/devicetree/bindings/media/i2c/isil,isl79987.yaml
-f:Documentation/devicetree/bindings/media/i2c/maxim,max2175.txt
-f:Documentation/devicetree/bindings/media/i2c/maxim,max9286.yaml
-f:Documentation/devicetree/bindings/media/i2c/maxim,max96712.yaml
-f:Documentation/devicetree/bindings/media/i2c/maxim,max96714.yaml
-f:Documentation/devicetree/bindings/media/i2c/maxim,max96717.yaml
-f:Documentation/devicetree/bindings/media/i2c/melexis,mlx90640.txt
-f:Documentation/devicetree/bindings/media/i2c/micron,mt9m111.txt
-f:Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml
-f:Documentation/devicetree/bindings/media/i2c/nxp,tda1997x.txt
-f:Documentation/devicetree/bindings/media/i2c/onnn,ar0521.yaml
-f:Documentation/devicetree/bindings/media/i2c/onnn,mt9m001.txt
-f:Documentation/devicetree/bindings/media/i2c/onnn,mt9m114.yaml
-f:Documentation/devicetree/bindings/media/i2c/ovti,og01a1b.yaml
-f:Documentation/devicetree/bindings/media/i2c/ovti,ov02a10.yaml
-f:Documentation/devicetree/bindings/media/i2c/ovti,ov02e10.yaml
-f:Documentation/devicetree/bindings/media/i2c/ovti,ov08x40.yaml
-f:Documentation/devicetree/bindings/media/i2c/ovti,ov2640.txt
-f:Documentation/devicetree/bindings/media/i2c/ovti,ov2659.txt
-f:Documentation/devicetree/bindings/media/i2c/ovti,ov2680.yaml
-f:Documentation/devicetree/bindings/media/i2c/ovti,ov2685.yaml
-f:Documentation/devicetree/bindings/media/i2c/ovti,ov4689.yaml
-f:Documentation/devicetree/bindings/media/i2c/ovti,ov5640.yaml
-f:Documentation/devicetree/bindings/media/i2c/ovti,ov5642.yaml
-f:Documentation/devicetree/bindings/media/i2c/ovti,ov5645.yaml
-f:Documentation/devicetree/bindings/media/i2c/ovti,ov5647.yaml
-f:Documentation/devicetree/bindings/media/i2c/ovti,ov5648.yaml
-f:Documentation/devicetree/bindings/media/i2c/ovti,ov5670.yaml
-f:Documentation/devicetree/bindings/media/i2c/ovti,ov5675.yaml
-f:Documentation/devicetree/bindings/media/i2c/ovti,ov5693.yaml
-f:Documentation/devicetree/bindings/media/i2c/ovti,ov64a40.yaml
-f:Documentation/devicetree/bindings/media/i2c/ovti,ov7251.yaml
-f:Documentation/devicetree/bindings/media/i2c/ovti,ov7670.txt
-f:Documentation/devicetree/bindings/media/i2c/ovti,ov772x.yaml
-f:Documentation/devicetree/bindings/media/i2c/ovti,ov7740.txt
-f:Documentation/devicetree/bindings/media/i2c/ovti,ov8856.yaml
-f:Documentation/devicetree/bindings/media/i2c/ovti,ov8858.yaml
-f:Documentation/devicetree/bindings/media/i2c/ovti,ov8865.yaml
-f:Documentation/devicetree/bindings/media/i2c/ovti,ov9282.yaml
-f:Documentation/devicetree/bindings/media/i2c/ovti,ov9650.txt
-f:Documentation/devicetree/bindings/media/i2c/panasonic,amg88xx.txt
-f:Documentation/devicetree/bindings/media/i2c/rda,rda5807.yaml
-f:Documentation/devicetree/bindings/media/i2c/samsung,s5k5baf.yaml
-f:Documentation/devicetree/bindings/media/i2c/samsung,s5k6a3.yaml
-f:Documentation/devicetree/bindings/media/i2c/sony,imx214.yaml
-f:Documentation/devicetree/bindings/media/i2c/sony,imx219.yaml
-f:Documentation/devicetree/bindings/media/i2c/sony,imx258.yaml
-f:Documentation/devicetree/bindings/media/i2c/sony,imx274.yaml
-f:Documentation/devicetree/bindings/media/i2c/sony,imx283.yaml
-f:Documentation/devicetree/bindings/media/i2c/sony,imx290.yaml
-f:Documentation/devicetree/bindings/media/i2c/sony,imx296.yaml
-f:Documentation/devicetree/bindings/media/i2c/sony,imx334.yaml
-f:Documentation/devicetree/bindings/media/i2c/sony,imx335.yaml
-f:Documentation/devicetree/bindings/media/i2c/sony,imx412.yaml
-f:Documentation/devicetree/bindings/media/i2c/sony,imx415.yaml
-f:Documentation/devicetree/bindings/media/i2c/st,st-mipid02.yaml
-f:Documentation/devicetree/bindings/media/i2c/st,st-vgxy61.yaml
-f:Documentation/devicetree/bindings/media/i2c/st,vd55g1.yaml
-f:Documentation/devicetree/bindings/media/i2c/st,vd56g3.yaml
-f:Documentation/devicetree/bindings/media/i2c/techwell,tw9900.yaml
-f:Documentation/devicetree/bindings/media/i2c/thine,thp7312.yaml
-f:Documentation/devicetree/bindings/media/i2c/ti,ds90ub913.yaml
-f:Documentation/devicetree/bindings/media/i2c/ti,ds90ub953.yaml
-f:Documentation/devicetree/bindings/media/i2c/ti,ds90ub960.yaml
-f:Documentation/devicetree/bindings/media/i2c/ti,ths8200.txt
-f:Documentation/devicetree/bindings/media/i2c/ti,tvp514x.txt
-f:Documentation/devicetree/bindings/media/i2c/ti,tvp5150.txt
-f:Documentation/devicetree/bindings/media/i2c/ti,tvp7002.txt
-f:Documentation/devicetree/bindings/media/i2c/toshiba,et8ek8.txt
-f:Documentation/devicetree/bindings/media/i2c/toshiba,tc358743.txt
-f:Documentation/devicetree/bindings/media/i2c/toshiba,tc358746.yaml
-f:Documentation/devicetree/bindings/media/img,e5010-jpeg-enc.yaml
-f:Documentation/devicetree/bindings/media/img-ir-rev1.txt
-f:Documentation/devicetree/bindings/media/marvell,mmp2-ccic.yaml
-f:Documentation/devicetree/bindings/media/mediatek,mdp3-fg.yaml
-f:Documentation/devicetree/bindings/media/mediatek,mdp3-hdr.yaml
-f:Documentation/devicetree/bindings/media/mediatek,mdp3-rdma.yaml
-f:Documentation/devicetree/bindings/media/mediatek,mdp3-rsz.yaml
-f:Documentation/devicetree/bindings/media/mediatek,mdp3-stitch.yaml
-f:Documentation/devicetree/bindings/media/mediatek,mdp3-tcc.yaml
-f:Documentation/devicetree/bindings/media/mediatek,mdp3-tdshp.yaml
-f:Documentation/devicetree/bindings/media/mediatek,mdp3-wrot.yaml
-f:Documentation/devicetree/bindings/media/mediatek,mt7622-cir.yaml
-f:Documentation/devicetree/bindings/media/mediatek,mt8195-jpegdec.yaml
-f:Documentation/devicetree/bindings/media/mediatek,mt8195-jpegenc.yaml
-f:Documentation/devicetree/bindings/media/mediatek,vcodec-decoder.yaml
-f:Documentation/devicetree/bindings/media/mediatek,vcodec-encoder.yaml
-f:Documentation/devicetree/bindings/media/mediatek,vcodec-subdev-decoder.yaml
-f:Documentation/devicetree/bindings/media/mediatek-jpeg-decoder.yaml
-f:Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.yaml
-f:Documentation/devicetree/bindings/media/mediatek-mdp.txt
-f:Documentation/devicetree/bindings/media/mediatek-vpu.txt
-f:Documentation/devicetree/bindings/media/microchip,csi2dc.yaml
-f:Documentation/devicetree/bindings/media/microchip,sama5d4-vdec.yaml
-f:Documentation/devicetree/bindings/media/microchip,xisc.yaml
-f:Documentation/devicetree/bindings/media/nuvoton,npcm-ece.yaml
-f:Documentation/devicetree/bindings/media/nuvoton,npcm-vcd.yaml
-f:Documentation/devicetree/bindings/media/nvidia,tegra-vde.yaml
-f:Documentation/devicetree/bindings/media/nxp,dw100.yaml
-f:Documentation/devicetree/bindings/media/nxp,imx-mipi-csi2.yaml
-f:Documentation/devicetree/bindings/media/nxp,imx7-csi.yaml
-f:Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml
-f:Documentation/devicetree/bindings/media/nxp,imx8-jpeg.yaml
-f:Documentation/devicetree/bindings/media/nxp,imx8mq-mipi-csi2.yaml
-f:Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml
-f:Documentation/devicetree/bindings/media/pxa-camera.txt
-f:Documentation/devicetree/bindings/media/qcom,msm8916-camss.yaml
-f:Documentation/devicetree/bindings/media/qcom,msm8916-venus.yaml
-f:Documentation/devicetree/bindings/media/qcom,msm8953-camss.yaml
-f:Documentation/devicetree/bindings/media/qcom,msm8996-camss.yaml
-f:Documentation/devicetree/bindings/media/qcom,msm8996-venus.yaml
-f:Documentation/devicetree/bindings/media/qcom,sc7180-venus.yaml
-f:Documentation/devicetree/bindings/media/qcom,sc7280-camss.yaml
-f:Documentation/devicetree/bindings/media/qcom,sc7280-venus.yaml
-f:Documentation/devicetree/bindings/media/qcom,sc8280xp-camss.yaml
-f:Documentation/devicetree/bindings/media/qcom,sdm660-camss.yaml
-f:Documentation/devicetree/bindings/media/qcom,sdm660-venus.yaml
-f:Documentation/devicetree/bindings/media/qcom,sdm670-camss.yaml
-f:Documentation/devicetree/bindings/media/qcom,sdm845-camss.yaml
-f:Documentation/devicetree/bindings/media/qcom,sdm845-venus-v2.yaml
-f:Documentation/devicetree/bindings/media/qcom,sdm845-venus.yaml
-f:Documentation/devicetree/bindings/media/qcom,sm8250-camss.yaml
-f:Documentation/devicetree/bindings/media/qcom,sm8250-venus.yaml
-f:Documentation/devicetree/bindings/media/qcom,sm8550-camss.yaml
-f:Documentation/devicetree/bindings/media/qcom,sm8550-iris.yaml
-f:Documentation/devicetree/bindings/media/qcom,venus-common.yaml
-f:Documentation/devicetree/bindings/media/qcom,x1e80100-camss.yaml
-f:Documentation/devicetree/bindings/media/raspberrypi,pispbe.yaml
-f:Documentation/devicetree/bindings/media/raspberrypi,rp1-cfe.yaml
-f:Documentation/devicetree/bindings/media/rc.txt
-f:Documentation/devicetree/bindings/media/rc.yaml
-f:Documentation/devicetree/bindings/media/renesas,ceu.yaml
-f:Documentation/devicetree/bindings/media/renesas,csi2.yaml
-f:Documentation/devicetree/bindings/media/renesas,drif.yaml
-f:Documentation/devicetree/bindings/media/renesas,fcp.yaml
-f:Documentation/devicetree/bindings/media/renesas,fdp1.yaml
-f:Documentation/devicetree/bindings/media/renesas,imr.yaml
-f:Documentation/devicetree/bindings/media/renesas,isp.yaml
-f:Documentation/devicetree/bindings/media/renesas,jpu.yaml
-f:Documentation/devicetree/bindings/media/renesas,rzg2l-cru.yaml
-f:Documentation/devicetree/bindings/media/renesas,rzg2l-csi2.yaml
-f:Documentation/devicetree/bindings/media/renesas,vin.yaml
-f:Documentation/devicetree/bindings/media/renesas,vsp1.yaml
-f:Documentation/devicetree/bindings/media/rockchip,rk3568-vepu.yaml
-f:Documentation/devicetree/bindings/media/rockchip,vdec.yaml
-f:Documentation/devicetree/bindings/media/rockchip-isp1.yaml
-f:Documentation/devicetree/bindings/media/rockchip-rga.yaml
-f:Documentation/devicetree/bindings/media/rockchip-vpu.yaml
-f:Documentation/devicetree/bindings/media/samsung,exynos4210-csis.yaml
-f:Documentation/devicetree/bindings/media/samsung,exynos4210-fimc.yaml
-f:Documentation/devicetree/bindings/media/samsung,exynos4212-fimc-is.yaml
-f:Documentation/devicetree/bindings/media/samsung,exynos4212-fimc-lite.yaml
-f:Documentation/devicetree/bindings/media/samsung,exynos5250-gsc.yaml
-f:Documentation/devicetree/bindings/media/samsung,fimc.yaml
-f:Documentation/devicetree/bindings/media/samsung,s5c73m3.yaml
-f:Documentation/devicetree/bindings/media/samsung,s5p-mfc.yaml
-f:Documentation/devicetree/bindings/media/samsung,s5pv210-jpeg.yaml
-f:Documentation/devicetree/bindings/media/si4713.txt
-f:Documentation/devicetree/bindings/media/silabs,si470x.yaml
-f:Documentation/devicetree/bindings/media/snps,dw-hdmi-rx.yaml
-f:Documentation/devicetree/bindings/media/spi/sony-cxd2880.txt
-f:Documentation/devicetree/bindings/media/st,st-delta.txt
-f:Documentation/devicetree/bindings/media/st,st-hva.txt
-f:Documentation/devicetree/bindings/media/st,stih4xx.txt
-f:Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml
-f:Documentation/devicetree/bindings/media/st,stm32-dcmipp.yaml
-f:Documentation/devicetree/bindings/media/st,stm32-dma2d.yaml
-f:Documentation/devicetree/bindings/media/st,stm32mp25-csi.yaml
-f:Documentation/devicetree/bindings/media/st,stm32mp25-video-codec.yaml
-f:Documentation/devicetree/bindings/media/st-rc.txt
-f:Documentation/devicetree/bindings/media/starfive,jh7110-camss.yaml
-f:Documentation/devicetree/bindings/media/stih407-c8sectpfe.txt
-f:Documentation/devicetree/bindings/media/ti,cal.yaml
-f:Documentation/devicetree/bindings/media/ti,da850-vpif.txt
-f:Documentation/devicetree/bindings/media/ti,j721e-csi2rx-shim.yaml
-f:Documentation/devicetree/bindings/media/ti,omap3isp.txt
-f:Documentation/devicetree/bindings/media/ti,vpe.yaml
-f:Documentation/devicetree/bindings/media/ti-am437x-vpfe.txt
-f:Documentation/devicetree/bindings/media/video-interface-devices.yaml
-f:Documentation/devicetree/bindings/media/video-interfaces.txt
-f:Documentation/devicetree/bindings/media/video-interfaces.yaml
-f:Documentation/devicetree/bindings/media/video-mux.yaml
-f:Documentation/devicetree/bindings/media/xilinx/video.txt
-f:Documentation/devicetree/bindings/media/xilinx/xlnx,csi2rxss.yaml
-f:Documentation/devicetree/bindings/media/xilinx/xlnx,v-tc.txt
-f:Documentation/devicetree/bindings/media/xilinx/xlnx,v-tpg.txt
-f:Documentation/devicetree/bindings/media/xilinx/xlnx,video.txt
-f:Documentation/devicetree/bindings/memory-controllers/arm,pl172.yaml
-f:Documentation/devicetree/bindings/memory-controllers/arm,pl35x-smc.yaml
-f:Documentation/devicetree/bindings/memory-controllers/atmel,ebi.txt
-f:Documentation/devicetree/bindings/memory-controllers/brcm,brcmstb-memc-ddr.yaml
-f:Documentation/devicetree/bindings/memory-controllers/brcm,dpfe-cpu.yaml
-f:Documentation/devicetree/bindings/memory-controllers/calxeda-ddr-ctrlr.yaml
-f:Documentation/devicetree/bindings/memory-controllers/canaan,k210-sram.yaml
-f:Documentation/devicetree/bindings/memory-controllers/ddr/jedec,lpddr-channel.yaml
-f:Documentation/devicetree/bindings/memory-controllers/ddr/jedec,lpddr-props.yaml
-f:Documentation/devicetree/bindings/memory-controllers/ddr/jedec,lpddr2-timings.yaml
-f:Documentation/devicetree/bindings/memory-controllers/ddr/jedec,lpddr2.yaml
-f:Documentation/devicetree/bindings/memory-controllers/ddr/jedec,lpddr3-timings.yaml
-f:Documentation/devicetree/bindings/memory-controllers/ddr/jedec,lpddr3.yaml
-f:Documentation/devicetree/bindings/memory-controllers/ddr/jedec,lpddr4.yaml
-f:Documentation/devicetree/bindings/memory-controllers/ddr/jedec,lpddr5.yaml
-f:Documentation/devicetree/bindings/memory-controllers/exynos-srom.yaml
-f:Documentation/devicetree/bindings/memory-controllers/fsl/fsl,ddr.yaml
-f:Documentation/devicetree/bindings/memory-controllers/fsl/fsl,ifc.yaml
-f:Documentation/devicetree/bindings/memory-controllers/fsl/fsl,imx-weim-peripherals.yaml
-f:Documentation/devicetree/bindings/memory-controllers/fsl/fsl,imx-weim.yaml
-f:Documentation/devicetree/bindings/memory-controllers/fsl/imx8m-ddrc.yaml
-f:Documentation/devicetree/bindings/memory-controllers/fsl/mmdc.yaml
-f:Documentation/devicetree/bindings/memory-controllers/ingenic,nemc-peripherals.yaml
-f:Documentation/devicetree/bindings/memory-controllers/ingenic,nemc.yaml
-f:Documentation/devicetree/bindings/memory-controllers/intel,ixp4xx-expansion-bus-controller.yaml
-f:Documentation/devicetree/bindings/memory-controllers/intel,ixp4xx-expansion-peripheral-props.yaml
-f:Documentation/devicetree/bindings/memory-controllers/marvell,mvebu-sdram-controller.yaml
-f:Documentation/devicetree/bindings/memory-controllers/mc-peripheral-props.yaml
-f:Documentation/devicetree/bindings/memory-controllers/mediatek,mt7621-memc.yaml
-f:Documentation/devicetree/bindings/memory-controllers/mediatek,smi-common.yaml
-f:Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml
-f:Documentation/devicetree/bindings/memory-controllers/mvebu-devbus.txt
-f:Documentation/devicetree/bindings/memory-controllers/nuvoton,npcm-memory-controller.yaml
-f:Documentation/devicetree/bindings/memory-controllers/nvidia,tegra124-emc.yaml
-f:Documentation/devicetree/bindings/memory-controllers/nvidia,tegra124-mc.yaml
-f:Documentation/devicetree/bindings/memory-controllers/nvidia,tegra186-mc.yaml
-f:Documentation/devicetree/bindings/memory-controllers/nvidia,tegra20-emc.yaml
-f:Documentation/devicetree/bindings/memory-controllers/nvidia,tegra20-mc.yaml
-f:Documentation/devicetree/bindings/memory-controllers/nvidia,tegra210-emc.yaml
-f:Documentation/devicetree/bindings/memory-controllers/nvidia,tegra30-emc.yaml
-f:Documentation/devicetree/bindings/memory-controllers/nvidia,tegra30-mc.yaml
-f:Documentation/devicetree/bindings/memory-controllers/qca,ath79-ddr-controller.yaml
-f:Documentation/devicetree/bindings/memory-controllers/qcom,ebi2-peripheral-props.yaml
-f:Documentation/devicetree/bindings/memory-controllers/qcom,ebi2.yaml
-f:Documentation/devicetree/bindings/memory-controllers/renesas,dbsc.yaml
-f:Documentation/devicetree/bindings/memory-controllers/renesas,rpc-if.yaml
-f:Documentation/devicetree/bindings/memory-controllers/renesas,rzg3e-xspi.yaml
-f:Documentation/devicetree/bindings/memory-controllers/rockchip,rk3399-dmc.yaml
-f:Documentation/devicetree/bindings/memory-controllers/samsung,exynos4210-srom-peripheral-props.yaml
-f:Documentation/devicetree/bindings/memory-controllers/samsung,exynos5422-dmc.yaml
-f:Documentation/devicetree/bindings/memory-controllers/samsung,s5pv210-dmc.yaml
-f:Documentation/devicetree/bindings/memory-controllers/snps,dw-umctl2-ddrc.yaml
-f:Documentation/devicetree/bindings/memory-controllers/st,stm32-fmc2-ebi-props.yaml
-f:Documentation/devicetree/bindings/memory-controllers/st,stm32-fmc2-ebi.yaml
-f:Documentation/devicetree/bindings/memory-controllers/st,stm32mp25-omm.yaml
-f:Documentation/devicetree/bindings/memory-controllers/ti,da8xx-ddrctl.yaml
-f:Documentation/devicetree/bindings/memory-controllers/ti,gpmc-child.yaml
-f:Documentation/devicetree/bindings/memory-controllers/ti,gpmc.yaml
-f:Documentation/devicetree/bindings/memory-controllers/ti-aemif.txt
-f:Documentation/devicetree/bindings/memory-controllers/ti/emif.txt
-f:Documentation/devicetree/bindings/memory-controllers/xlnx,versal-ddrmc-edac.yaml
-f:Documentation/devicetree/bindings/memory-controllers/xlnx,zynq-ddrc-a05.yaml
-f:Documentation/devicetree/bindings/memory-controllers/xlnx,zynqmp-ocmc-1.0.yaml
-f:Documentation/devicetree/bindings/mfd/88pm860x.txt
-f:Documentation/devicetree/bindings/mfd/act8945a.txt
-f:Documentation/devicetree/bindings/mfd/actions,atc260x.yaml
-f:Documentation/devicetree/bindings/mfd/adi,adp5585.yaml
-f:Documentation/devicetree/bindings/mfd/adi,max77541.yaml
-f:Documentation/devicetree/bindings/mfd/airoha,en7581-gpio-sysctl.yaml
-f:Documentation/devicetree/bindings/mfd/allwinner,sun4i-a10-ts.yaml
-f:Documentation/devicetree/bindings/mfd/allwinner,sun6i-a31-prcm.yaml
-f:Documentation/devicetree/bindings/mfd/allwinner,sun8i-a23-prcm.yaml
-f:Documentation/devicetree/bindings/mfd/altera-a10sr.txt
-f:Documentation/devicetree/bindings/mfd/ampere,smpro.yaml
-f:Documentation/devicetree/bindings/mfd/ams,as3711.yaml
-f:Documentation/devicetree/bindings/mfd/apple,smc.yaml
-f:Documentation/devicetree/bindings/mfd/arm,dev-platforms-syscon.yaml
-f:Documentation/devicetree/bindings/mfd/as3722.txt
-f:Documentation/devicetree/bindings/mfd/aspeed,ast2x00-scu.yaml
-f:Documentation/devicetree/bindings/mfd/aspeed-gfx.txt
-f:Documentation/devicetree/bindings/mfd/aspeed-lpc.yaml
-f:Documentation/devicetree/bindings/mfd/atmel,at91sam9260-gpbr.yaml
-f:Documentation/devicetree/bindings/mfd/atmel,at91sam9260-matrix.yaml
-f:Documentation/devicetree/bindings/mfd/atmel,hlcdc.yaml
-f:Documentation/devicetree/bindings/mfd/atmel,sama5d2-flexcom.yaml
-f:Documentation/devicetree/bindings/mfd/atmel-smc.txt
-f:Documentation/devicetree/bindings/mfd/bfticu.txt
-f:Documentation/devicetree/bindings/mfd/brcm,bcm59056.yaml
-f:Documentation/devicetree/bindings/mfd/brcm,bcm6318-gpio-sysctl.yaml
-f:Documentation/devicetree/bindings/mfd/brcm,bcm63268-gpio-sysctl.yaml
-f:Documentation/devicetree/bindings/mfd/brcm,bcm6328-gpio-sysctl.yaml
-f:Documentation/devicetree/bindings/mfd/brcm,bcm6358-gpio-sysctl.yaml
-f:Documentation/devicetree/bindings/mfd/brcm,bcm6362-gpio-sysctl.yaml
-f:Documentation/devicetree/bindings/mfd/brcm,bcm6368-gpio-sysctl.yaml
-f:Documentation/devicetree/bindings/mfd/brcm,cru.yaml
-f:Documentation/devicetree/bindings/mfd/brcm,misc.yaml
-f:Documentation/devicetree/bindings/mfd/brcm,twd.yaml
-f:Documentation/devicetree/bindings/mfd/canaan,k210-sysctl.yaml
-f:Documentation/devicetree/bindings/mfd/cirrus,lochnagar.yaml
-f:Documentation/devicetree/bindings/mfd/cirrus,madera.yaml
-f:Documentation/devicetree/bindings/mfd/da9052-i2c.txt
-f:Documentation/devicetree/bindings/mfd/da9055.txt
-f:Documentation/devicetree/bindings/mfd/da9150.txt
-f:Documentation/devicetree/bindings/mfd/delta,tn48m-cpld.yaml
-f:Documentation/devicetree/bindings/mfd/dlg,da9063.yaml
-f:Documentation/devicetree/bindings/mfd/ene-kb3930.yaml
-f:Documentation/devicetree/bindings/mfd/ene-kb930.yaml
-f:Documentation/devicetree/bindings/mfd/fsl,mcu-mpc8349emitx.yaml
-f:Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt
-f:Documentation/devicetree/bindings/mfd/gateworks-gsc.yaml
-f:Documentation/devicetree/bindings/mfd/google,cros-ec.yaml
-f:Documentation/devicetree/bindings/mfd/hi6421.txt
-f:Documentation/devicetree/bindings/mfd/hisilicon,hi6421-spmi-pmic.yaml
-f:Documentation/devicetree/bindings/mfd/hisilicon,hi655x.txt
-f:Documentation/devicetree/bindings/mfd/iqs62x.yaml
-f:Documentation/devicetree/bindings/mfd/khadas,mcu.yaml
-f:Documentation/devicetree/bindings/mfd/kontron,sl28cpld.yaml
-f:Documentation/devicetree/bindings/mfd/lp3943.txt
-f:Documentation/devicetree/bindings/mfd/marvell,88pm886-a1.yaml
-f:Documentation/devicetree/bindings/mfd/max77620.txt
-f:Documentation/devicetree/bindings/mfd/max77650.yaml
-f:Documentation/devicetree/bindings/mfd/maxim,max14577.yaml
-f:Documentation/devicetree/bindings/mfd/maxim,max5970.yaml
-f:Documentation/devicetree/bindings/mfd/maxim,max77686.yaml
-f:Documentation/devicetree/bindings/mfd/maxim,max77693.yaml
-f:Documentation/devicetree/bindings/mfd/maxim,max77705.yaml
-f:Documentation/devicetree/bindings/mfd/maxim,max77714.yaml
-f:Documentation/devicetree/bindings/mfd/maxim,max77759.yaml
-f:Documentation/devicetree/bindings/mfd/maxim,max77802.yaml
-f:Documentation/devicetree/bindings/mfd/maxim,max77843.yaml
-f:Documentation/devicetree/bindings/mfd/maxim,max8925.yaml
-f:Documentation/devicetree/bindings/mfd/maxim,max8998.yaml
-f:Documentation/devicetree/bindings/mfd/mc13xxx.txt
-f:Documentation/devicetree/bindings/mfd/mediatek,mt6357.yaml
-f:Documentation/devicetree/bindings/mfd/mediatek,mt6360.yaml
-f:Documentation/devicetree/bindings/mfd/mediatek,mt6370.yaml
-f:Documentation/devicetree/bindings/mfd/mediatek,mt6397.yaml
-f:Documentation/devicetree/bindings/mfd/mediatek,mt8195-scpsys.yaml
-f:Documentation/devicetree/bindings/mfd/mfd.txt
-f:Documentation/devicetree/bindings/mfd/motorola-cpcap.txt
-f:Documentation/devicetree/bindings/mfd/mps,mp2629.yaml
-f:Documentation/devicetree/bindings/mfd/mscc,ocelot.yaml
-f:Documentation/devicetree/bindings/mfd/mxs-lradc.yaml
-f:Documentation/devicetree/bindings/mfd/netronix,ntxec.yaml
-f:Documentation/devicetree/bindings/mfd/nxp,bbnsm.yaml
-f:Documentation/devicetree/bindings/mfd/nxp,lpc1850-creg.yaml
-f:Documentation/devicetree/bindings/mfd/omap-usb-host.txt
-f:Documentation/devicetree/bindings/mfd/omap-usb-tll.txt
-f:Documentation/devicetree/bindings/mfd/palmas.txt
-f:Documentation/devicetree/bindings/mfd/qcom,pm8008.yaml
-f:Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
-f:Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml
-f:Documentation/devicetree/bindings/mfd/qcom-pm8xxx.yaml
-f:Documentation/devicetree/bindings/mfd/qnap,ts433-mcu.yaml
-f:Documentation/devicetree/bindings/mfd/qriox.txt
-f:Documentation/devicetree/bindings/mfd/retu.txt
-f:Documentation/devicetree/bindings/mfd/richtek,rt4831.yaml
-f:Documentation/devicetree/bindings/mfd/richtek,rt5033.yaml
-f:Documentation/devicetree/bindings/mfd/richtek,rt5120.yaml
-f:Documentation/devicetree/bindings/mfd/ricoh,rn5t618.yaml
-f:Documentation/devicetree/bindings/mfd/rockchip,rk805.yaml
-f:Documentation/devicetree/bindings/mfd/rockchip,rk806.yaml
-f:Documentation/devicetree/bindings/mfd/rockchip,rk808.yaml
-f:Documentation/devicetree/bindings/mfd/rockchip,rk816.yaml
-f:Documentation/devicetree/bindings/mfd/rockchip,rk817.yaml
-f:Documentation/devicetree/bindings/mfd/rockchip,rk818.yaml
-f:Documentation/devicetree/bindings/mfd/rohm,bd71815-pmic.yaml
-f:Documentation/devicetree/bindings/mfd/rohm,bd71828-pmic.yaml
-f:Documentation/devicetree/bindings/mfd/rohm,bd71837-pmic.yaml
-f:Documentation/devicetree/bindings/mfd/rohm,bd71847-pmic.yaml
-f:Documentation/devicetree/bindings/mfd/rohm,bd9571mwv.yaml
-f:Documentation/devicetree/bindings/mfd/rohm,bd9576-pmic.yaml
-f:Documentation/devicetree/bindings/mfd/rohm,bd96801-pmic.yaml
-f:Documentation/devicetree/bindings/mfd/rohm,bd96802-pmic.yaml
-f:Documentation/devicetree/bindings/mfd/samsung,exynos5433-lpass.yaml
-f:Documentation/devicetree/bindings/mfd/samsung,s2dos05.yaml
-f:Documentation/devicetree/bindings/mfd/samsung,s2mpa01.yaml
-f:Documentation/devicetree/bindings/mfd/samsung,s2mps11.yaml
-f:Documentation/devicetree/bindings/mfd/samsung,s5m8767.yaml
-f:Documentation/devicetree/bindings/mfd/silergy,sy7636a.yaml
-f:Documentation/devicetree/bindings/mfd/sky81452.txt
-f:Documentation/devicetree/bindings/mfd/sprd,sc2731.yaml
-f:Documentation/devicetree/bindings/mfd/sprd,ums512-glbreg.yaml
-f:Documentation/devicetree/bindings/mfd/st,stm32-lptimer.yaml
-f:Documentation/devicetree/bindings/mfd/st,stm32-timers.yaml
-f:Documentation/devicetree/bindings/mfd/st,stmfx.yaml
-f:Documentation/devicetree/bindings/mfd/st,stmpe.yaml
-f:Documentation/devicetree/bindings/mfd/st,stpmic1.yaml
-f:Documentation/devicetree/bindings/mfd/stericsson,ab8500.yaml
-f:Documentation/devicetree/bindings/mfd/stericsson,db8500-prcmu.yaml
-f:Documentation/devicetree/bindings/mfd/syscon-common.yaml
-f:Documentation/devicetree/bindings/mfd/syscon.yaml
-f:Documentation/devicetree/bindings/mfd/tc3589x.txt
-f:Documentation/devicetree/bindings/mfd/ti,am3359-tscadc.yaml
-f:Documentation/devicetree/bindings/mfd/ti,lp8732.yaml
-f:Documentation/devicetree/bindings/mfd/ti,lp87524-q1.yaml
-f:Documentation/devicetree/bindings/mfd/ti,lp87561-q1.yaml
-f:Documentation/devicetree/bindings/mfd/ti,lp87565-q1.yaml
-f:Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml
-f:Documentation/devicetree/bindings/mfd/ti,tps65086.yaml
-f:Documentation/devicetree/bindings/mfd/ti,tps65910.yaml
-f:Documentation/devicetree/bindings/mfd/ti,tps6594.yaml
-f:Documentation/devicetree/bindings/mfd/ti,twl.yaml
-f:Documentation/devicetree/bindings/mfd/ti-keystone-devctrl.txt
-f:Documentation/devicetree/bindings/mfd/ti-lmu.txt
-f:Documentation/devicetree/bindings/mfd/tps6105x.txt
-f:Documentation/devicetree/bindings/mfd/tps6507x.txt
-f:Documentation/devicetree/bindings/mfd/tps65912.txt
-f:Documentation/devicetree/bindings/mfd/twl4030-audio.txt
-f:Documentation/devicetree/bindings/mfd/twl4030-power.txt
-f:Documentation/devicetree/bindings/mfd/twl6040.txt
-f:Documentation/devicetree/bindings/mfd/wlf,arizona.yaml
-f:Documentation/devicetree/bindings/mfd/wm831x.txt
-f:Documentation/devicetree/bindings/mfd/x-powers,ac100.yaml
-f:Documentation/devicetree/bindings/mfd/x-powers,axp152.yaml
-f:Documentation/devicetree/bindings/mfd/xylon,logicvc.yaml
-f:Documentation/devicetree/bindings/mfd/zii,rave-sp.yaml
-f:Documentation/devicetree/bindings/mips/ath79-soc.txt
-f:Documentation/devicetree/bindings/mips/brcm/soc.txt
-f:Documentation/devicetree/bindings/mips/brcm/soc.yaml
-f:Documentation/devicetree/bindings/mips/cavium/bootbus.txt
-f:Documentation/devicetree/bindings/mips/cavium/cib.txt
-f:Documentation/devicetree/bindings/mips/cavium/ciu.txt
-f:Documentation/devicetree/bindings/mips/cavium/ciu2.txt
-f:Documentation/devicetree/bindings/mips/cavium/ciu3.txt
-f:Documentation/devicetree/bindings/mips/cavium/dma-engine.txt
-f:Documentation/devicetree/bindings/mips/cavium/sata-uctl.txt
-f:Documentation/devicetree/bindings/mips/cavium/uctl.txt
-f:Documentation/devicetree/bindings/mips/cpus.yaml
-f:Documentation/devicetree/bindings/mips/econet.yaml
-f:Documentation/devicetree/bindings/mips/img/pistachio-marduk.txt
-f:Documentation/devicetree/bindings/mips/img/pistachio.txt
-f:Documentation/devicetree/bindings/mips/img/xilfpga.txt
-f:Documentation/devicetree/bindings/mips/ingenic/devices.yaml
-f:Documentation/devicetree/bindings/mips/lantiq/fpi-bus.txt
-f:Documentation/devicetree/bindings/mips/lantiq/lantiq,cgu.yaml
-f:Documentation/devicetree/bindings/mips/lantiq/lantiq,dma-xway.yaml
-f:Documentation/devicetree/bindings/mips/lantiq/lantiq,ebu.yaml
-f:Documentation/devicetree/bindings/mips/lantiq/lantiq,pmu.yaml
-f:Documentation/devicetree/bindings/mips/lantiq/rcu.txt
-f:Documentation/devicetree/bindings/mips/loongson/devices.yaml
-f:Documentation/devicetree/bindings/mips/loongson/ls2k-reset.yaml
-f:Documentation/devicetree/bindings/mips/loongson/rs780e-acpi.yaml
-f:Documentation/devicetree/bindings/mips/mobileye.yaml
-f:Documentation/devicetree/bindings/mips/mscc.txt
-f:Documentation/devicetree/bindings/mips/mti,mips-cm.yaml
-f:Documentation/devicetree/bindings/mips/ni.txt
-f:Documentation/devicetree/bindings/mips/pic32/microchip,pic32mzda.txt
-f:Documentation/devicetree/bindings/mips/ralink.yaml
-f:Documentation/devicetree/bindings/mips/realtek-rtl.yaml
-f:Documentation/devicetree/bindings/misc/aspeed,ast2400-cvic.yaml
-f:Documentation/devicetree/bindings/misc/aspeed-p2a-ctrl.txt
-f:Documentation/devicetree/bindings/misc/fsl,dpaa2-console.yaml
-f:Documentation/devicetree/bindings/misc/fsl,qoriq-mc.yaml
-f:Documentation/devicetree/bindings/misc/ge-achc.yaml
-f:Documentation/devicetree/bindings/misc/idt,89hpesx.yaml
-f:Documentation/devicetree/bindings/misc/ifm-csi.txt
-f:Documentation/devicetree/bindings/misc/intel,ixp4xx-ahb-queue-manager.yaml
-f:Documentation/devicetree/bindings/misc/lwn,bk4-spi.yaml
-f:Documentation/devicetree/bindings/misc/nvidia,tegra186-misc.yaml
-f:Documentation/devicetree/bindings/misc/nvidia,tegra20-apbmisc.yaml
-f:Documentation/devicetree/bindings/misc/olpc,xo1.75-ec.yaml
-f:Documentation/devicetree/bindings/misc/pci1de4,1.yaml
-f:Documentation/devicetree/bindings/misc/pvpanic-mmio.txt
-f:Documentation/devicetree/bindings/misc/qcom,fastrpc.yaml
-f:Documentation/devicetree/bindings/misc/qemu,vcpu-stall-detector.yaml
-f:Documentation/devicetree/bindings/misc/ti,fpc202.yaml
-f:Documentation/devicetree/bindings/misc/ti,j721e-esm.yaml
-f:Documentation/devicetree/bindings/misc/xlnx,sd-fec.yaml
-f:Documentation/devicetree/bindings/misc/xlnx,tmr-inject.yaml
-f:Documentation/devicetree/bindings/misc/xlnx,tmr-manager.yaml
-f:Documentation/devicetree/bindings/mmc/allwinner,sun4i-a10-mmc.yaml
-f:Documentation/devicetree/bindings/mmc/amlogic,meson-gx-mmc.yaml
-f:Documentation/devicetree/bindings/mmc/amlogic,meson-mx-sdhc.yaml
-f:Documentation/devicetree/bindings/mmc/amlogic,meson-mx-sdio.yaml
-f:Documentation/devicetree/bindings/mmc/arasan,sdhci.yaml
-f:Documentation/devicetree/bindings/mmc/arm,pl18x.yaml
-f:Documentation/devicetree/bindings/mmc/aspeed,sdhci.yaml
-f:Documentation/devicetree/bindings/mmc/atmel,hsmci.yaml
-f:Documentation/devicetree/bindings/mmc/atmel,sama5d2-sdhci.yaml
-f:Documentation/devicetree/bindings/mmc/bluefield-dw-mshc.txt
-f:Documentation/devicetree/bindings/mmc/brcm,bcm2835-sdhost.yaml
-f:Documentation/devicetree/bindings/mmc/brcm,iproc-sdhci.yaml
-f:Documentation/devicetree/bindings/mmc/brcm,kona-sdhci.yaml
-f:Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml
-f:Documentation/devicetree/bindings/mmc/cavium-mmc.txt
-f:Documentation/devicetree/bindings/mmc/cdns,sdhci.yaml
-f:Documentation/devicetree/bindings/mmc/davinci_mmc.txt
-f:Documentation/devicetree/bindings/mmc/fsl,esdhc.yaml
-f:Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml
-f:Documentation/devicetree/bindings/mmc/fsl-imx-mmc.yaml
-f:Documentation/devicetree/bindings/mmc/fujitsu,sdhci-fujitsu.yaml
-f:Documentation/devicetree/bindings/mmc/hisilicon,hi3798cv200-dw-mshc.yaml
-f:Documentation/devicetree/bindings/mmc/ingenic,mmc.yaml
-f:Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt
-f:Documentation/devicetree/bindings/mmc/litex,mmc.yaml
-f:Documentation/devicetree/bindings/mmc/loongson,ls2k0500-mmc.yaml
-f:Documentation/devicetree/bindings/mmc/marvell,dove-sdhci.yaml
-f:Documentation/devicetree/bindings/mmc/marvell,orion-sdio.yaml
-f:Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml
-f:Documentation/devicetree/bindings/mmc/microchip,dw-sparx5-sdhci.yaml
-f:Documentation/devicetree/bindings/mmc/microchip,sdhci-pic32.yaml
-f:Documentation/devicetree/bindings/mmc/mmc-card.yaml
-f:Documentation/devicetree/bindings/mmc/mmc-controller-common.yaml
-f:Documentation/devicetree/bindings/mmc/mmc-controller.yaml
-f:Documentation/devicetree/bindings/mmc/mmc-pwrseq-emmc.yaml
-f:Documentation/devicetree/bindings/mmc/mmc-pwrseq-sd8787.yaml
-f:Documentation/devicetree/bindings/mmc/mmc-pwrseq-simple.yaml
-f:Documentation/devicetree/bindings/mmc/mmc-slot.yaml
-f:Documentation/devicetree/bindings/mmc/mmc-spi-slot.yaml
-f:Documentation/devicetree/bindings/mmc/mmc.txt
-f:Documentation/devicetree/bindings/mmc/moxa,moxart-mmc.txt
-f:Documentation/devicetree/bindings/mmc/mtk-sd.yaml
-f:Documentation/devicetree/bindings/mmc/mxs-mmc.yaml
-f:Documentation/devicetree/bindings/mmc/npcm,sdhci.yaml
-f:Documentation/devicetree/bindings/mmc/nuvoton,ma35d1-sdhci.yaml
-f:Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.yaml
-f:Documentation/devicetree/bindings/mmc/owl-mmc.yaml
-f:Documentation/devicetree/bindings/mmc/pxa-mmc.txt
-f:Documentation/devicetree/bindings/mmc/renesas,mmcif.yaml
-f:Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml
-f:Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.yaml
-f:Documentation/devicetree/bindings/mmc/samsung,exynos-dw-mshc.yaml
-f:Documentation/devicetree/bindings/mmc/samsung,s3c6410-sdhci.yaml
-f:Documentation/devicetree/bindings/mmc/sdhci-am654.yaml
-f:Documentation/devicetree/bindings/mmc/sdhci-common.yaml
-f:Documentation/devicetree/bindings/mmc/sdhci-milbeaut.txt
-f:Documentation/devicetree/bindings/mmc/sdhci-msm.yaml
-f:Documentation/devicetree/bindings/mmc/sdhci-omap.txt
-f:Documentation/devicetree/bindings/mmc/sdhci-pxa.yaml
-f:Documentation/devicetree/bindings/mmc/sdhci-spear.txt
-f:Documentation/devicetree/bindings/mmc/sdhci-st.txt
-f:Documentation/devicetree/bindings/mmc/snps,dwcmshc-sdhci.yaml
-f:Documentation/devicetree/bindings/mmc/socionext,uniphier-sd.yaml
-f:Documentation/devicetree/bindings/mmc/spacemit,sdhci.yaml
-f:Documentation/devicetree/bindings/mmc/sprd,sdhci-r11.yaml
-f:Documentation/devicetree/bindings/mmc/starfive,jh7110-mmc.yaml
-f:Documentation/devicetree/bindings/mmc/sunplus,mmc.yaml
-f:Documentation/devicetree/bindings/mmc/synopsys-dw-mshc-common.yaml
-f:Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.yaml
-f:Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
-f:Documentation/devicetree/bindings/mmc/ti-omap.txt
-f:Documentation/devicetree/bindings/mmc/usdhi6rol0.txt
-f:Documentation/devicetree/bindings/mmc/wm,wm8505-sdhc.yaml
-f:Documentation/devicetree/bindings/mtd/allwinner,sun4i-a10-nand.yaml
-f:Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml
-f:Documentation/devicetree/bindings/mtd/arasan,nand-controller.yaml
-f:Documentation/devicetree/bindings/mtd/arm,pl353-nand-r2p1.yaml
-f:Documentation/devicetree/bindings/mtd/atmel,dataflash.yaml
-f:Documentation/devicetree/bindings/mtd/atmel-nand.txt
-f:Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml
-f:Documentation/devicetree/bindings/mtd/cdns,hp-nfc.yaml
-f:Documentation/devicetree/bindings/mtd/denali,nand.yaml
-f:Documentation/devicetree/bindings/mtd/diskonchip.txt
-f:Documentation/devicetree/bindings/mtd/flctl-nand.txt
-f:Documentation/devicetree/bindings/mtd/fsl,vf610-nfc.yaml
-f:Documentation/devicetree/bindings/mtd/fsl-upm-nand.txt
-f:Documentation/devicetree/bindings/mtd/fsmc-nand.txt
-f:Documentation/devicetree/bindings/mtd/gpio-control-nand.txt
-f:Documentation/devicetree/bindings/mtd/gpmi-nand.yaml
-f:Documentation/devicetree/bindings/mtd/hisi504-nand.txt
-f:Documentation/devicetree/bindings/mtd/hisilicon,fmc-spi-nor.txt
-f:Documentation/devicetree/bindings/mtd/ibm,ndfc.txt
-f:Documentation/devicetree/bindings/mtd/ingenic,nand.yaml
-f:Documentation/devicetree/bindings/mtd/intel,lgm-ebunand.yaml
-f:Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml
-f:Documentation/devicetree/bindings/mtd/loongson,ls1b-nand-controller.yaml
-f:Documentation/devicetree/bindings/mtd/lpc32xx-mlc.txt
-f:Documentation/devicetree/bindings/mtd/lpc32xx-slc.txt
-f:Documentation/devicetree/bindings/mtd/marvell,nand-controller.yaml
-f:Documentation/devicetree/bindings/mtd/mediatek,mtk-nfc.yaml
-f:Documentation/devicetree/bindings/mtd/mediatek,nand-ecc-engine.yaml
-f:Documentation/devicetree/bindings/mtd/microchip,mchp23k256.txt
-f:Documentation/devicetree/bindings/mtd/microchip,mchp48l640.yaml
-f:Documentation/devicetree/bindings/mtd/mtd-physmap.yaml
-f:Documentation/devicetree/bindings/mtd/mtd.yaml
-f:Documentation/devicetree/bindings/mtd/mxc-nand.yaml
-f:Documentation/devicetree/bindings/mtd/mxic-nand.txt
-f:Documentation/devicetree/bindings/mtd/mxicy,nand-ecc-engine.yaml
-f:Documentation/devicetree/bindings/mtd/nand-chip.yaml
-f:Documentation/devicetree/bindings/mtd/nand-controller.yaml
-f:Documentation/devicetree/bindings/mtd/nand-macronix.txt
-f:Documentation/devicetree/bindings/mtd/nuvoton,ma35d1-nand.yaml
-f:Documentation/devicetree/bindings/mtd/nvidia-tegra20-nand.txt
-f:Documentation/devicetree/bindings/mtd/nxp,lpc1773-spifi.yaml
-f:Documentation/devicetree/bindings/mtd/orion-nand.txt
-f:Documentation/devicetree/bindings/mtd/partitions/arm,arm-firmware-suite.yaml
-f:Documentation/devicetree/bindings/mtd/partitions/binman.yaml
-f:Documentation/devicetree/bindings/mtd/partitions/brcm,bcm4908-partitions.yaml
-f:Documentation/devicetree/bindings/mtd/partitions/brcm,bcm947xx-cfe-partitions.yaml
-f:Documentation/devicetree/bindings/mtd/partitions/brcm,bcm963xx-cfe-nor-partitions.txt
-f:Documentation/devicetree/bindings/mtd/partitions/brcm,bcm963xx-imagetag.txt
-f:Documentation/devicetree/bindings/mtd/partitions/brcm,trx.txt
-f:Documentation/devicetree/bindings/mtd/partitions/fixed-partitions.yaml
-f:Documentation/devicetree/bindings/mtd/partitions/linksys,ns-partitions.yaml
-f:Documentation/devicetree/bindings/mtd/partitions/linux,ubi.yaml
-f:Documentation/devicetree/bindings/mtd/partitions/nvmem-cells.yaml
-f:Documentation/devicetree/bindings/mtd/partitions/partition.yaml
-f:Documentation/devicetree/bindings/mtd/partitions/partitions.yaml
-f:Documentation/devicetree/bindings/mtd/partitions/qcom,smem-part.yaml
-f:Documentation/devicetree/bindings/mtd/partitions/redboot-fis.yaml
-f:Documentation/devicetree/bindings/mtd/partitions/seama.yaml
-f:Documentation/devicetree/bindings/mtd/partitions/tplink,safeloader-partitions.yaml
-f:Documentation/devicetree/bindings/mtd/partitions/u-boot.yaml
-f:Documentation/devicetree/bindings/mtd/partitions/ubi-volume.yaml
-f:Documentation/devicetree/bindings/mtd/qcom,nandc.yaml
-f:Documentation/devicetree/bindings/mtd/raw-nand-chip.yaml
-f:Documentation/devicetree/bindings/mtd/renesas-nandc.yaml
-f:Documentation/devicetree/bindings/mtd/rockchip,nand-controller.yaml
-f:Documentation/devicetree/bindings/mtd/samsung,s5pv210-onenand.yaml
-f:Documentation/devicetree/bindings/mtd/samsung-s3c2410.txt
-f:Documentation/devicetree/bindings/mtd/spear_smi.txt
-f:Documentation/devicetree/bindings/mtd/spi-nand.yaml
-f:Documentation/devicetree/bindings/mtd/st,stm32-fmc2-nand.yaml
-f:Documentation/devicetree/bindings/mtd/st-fsm.txt
-f:Documentation/devicetree/bindings/mtd/technologic,nand.yaml
-f:Documentation/devicetree/bindings/mtd/ti,am654-hbmc.yaml
-f:Documentation/devicetree/bindings/mtd/ti,davinci-nand.yaml
-f:Documentation/devicetree/bindings/mtd/ti,elm.yaml
-f:Documentation/devicetree/bindings/mtd/ti,gpmc-nand.yaml
-f:Documentation/devicetree/bindings/mtd/ti,gpmc-onenand.yaml
-f:Documentation/devicetree/bindings/mux/adi,adg792a.txt
-f:Documentation/devicetree/bindings/mux/adi,adgs1408.txt
-f:Documentation/devicetree/bindings/mux/gpio-mux.yaml
-f:Documentation/devicetree/bindings/mux/mux-consumer.yaml
-f:Documentation/devicetree/bindings/mux/mux-controller.yaml
-f:Documentation/devicetree/bindings/mux/reg-mux.yaml
-f:Documentation/devicetree/bindings/net/actions,owl-emac.yaml
-f:Documentation/devicetree/bindings/net/adi,adin.yaml
-f:Documentation/devicetree/bindings/net/adi,adin1110.yaml
-f:Documentation/devicetree/bindings/net/aeonsemi,as21xxx.yaml
-f:Documentation/devicetree/bindings/net/airoha,an7583-mdio.yaml
-f:Documentation/devicetree/bindings/net/airoha,en7581-eth.yaml
-f:Documentation/devicetree/bindings/net/airoha,en7581-npu.yaml
-f:Documentation/devicetree/bindings/net/airoha,en8811h.yaml
-f:Documentation/devicetree/bindings/net/allwinner,sun4i-a10-emac.yaml
-f:Documentation/devicetree/bindings/net/allwinner,sun4i-a10-mdio.yaml
-f:Documentation/devicetree/bindings/net/allwinner,sun7i-a20-gmac.yaml
-f:Documentation/devicetree/bindings/net/allwinner,sun8i-a83t-emac.yaml
-f:Documentation/devicetree/bindings/net/altr,gmii-to-sgmii-2.0.yaml
-f:Documentation/devicetree/bindings/net/altr,socfpga-stmmac.yaml
-f:Documentation/devicetree/bindings/net/altr,tse.yaml
-f:Documentation/devicetree/bindings/net/amd-xgbe.txt
-f:Documentation/devicetree/bindings/net/amlogic,g12a-mdio-mux.yaml
-f:Documentation/devicetree/bindings/net/amlogic,gxl-mdio-mux.yaml
-f:Documentation/devicetree/bindings/net/amlogic,meson-dwmac.yaml
-f:Documentation/devicetree/bindings/net/anarion-gmac.txt
-f:Documentation/devicetree/bindings/net/apm-xgene-enet.txt
-f:Documentation/devicetree/bindings/net/apm-xgene-mdio.txt
-f:Documentation/devicetree/bindings/net/asix,ax88178.yaml
-f:Documentation/devicetree/bindings/net/asix,ax88796c.yaml
-f:Documentation/devicetree/bindings/net/aspeed,ast2600-mdio.yaml
-f:Documentation/devicetree/bindings/net/bluetooth/amlogic,w155s2-bt.yaml
-f:Documentation/devicetree/bindings/net/bluetooth/bluetooth-controller.yaml
-f:Documentation/devicetree/bindings/net/bluetooth/brcm,bcm4377-bluetooth.yaml
-f:Documentation/devicetree/bindings/net/bluetooth/brcm,bluetooth.yaml
-f:Documentation/devicetree/bindings/net/bluetooth/marvell,88w8897.yaml
-f:Documentation/devicetree/bindings/net/bluetooth/mediatek,bluetooth.txt
-f:Documentation/devicetree/bindings/net/bluetooth/mediatek,mt7622-bluetooth.yaml
-f:Documentation/devicetree/bindings/net/bluetooth/mediatek,mt7921s-bluetooth.yaml
-f:Documentation/devicetree/bindings/net/bluetooth/nokia,h4p-bluetooth.txt
-f:Documentation/devicetree/bindings/net/bluetooth/nxp,88w8987-bt.yaml
-f:Documentation/devicetree/bindings/net/bluetooth/qualcomm-bluetooth.yaml
-f:Documentation/devicetree/bindings/net/bluetooth/realtek,bluetooth.yaml
-f:Documentation/devicetree/bindings/net/bluetooth/ti,bluetooth.yaml
-f:Documentation/devicetree/bindings/net/brcm,amac.yaml
-f:Documentation/devicetree/bindings/net/brcm,asp-v2.0.yaml
-f:Documentation/devicetree/bindings/net/brcm,bcm4908-enet.yaml
-f:Documentation/devicetree/bindings/net/brcm,bcm6368-mdio-mux.yaml
-f:Documentation/devicetree/bindings/net/brcm,bcm7445-switch-v4.0.txt
-f:Documentation/devicetree/bindings/net/brcm,bcmgenet.yaml
-f:Documentation/devicetree/bindings/net/brcm,iproc-mdio.yaml
-f:Documentation/devicetree/bindings/net/brcm,mdio-mux-iproc.yaml
-f:Documentation/devicetree/bindings/net/brcm,systemport.yaml
-f:Documentation/devicetree/bindings/net/brcm,unimac-mdio.yaml
-f:Documentation/devicetree/bindings/net/broadcom-bcm87xx.txt
-f:Documentation/devicetree/bindings/net/btusb.txt
-f:Documentation/devicetree/bindings/net/calxeda-xgmac.yaml
-f:Documentation/devicetree/bindings/net/can/allwinner,sun4i-a10-can.yaml
-f:Documentation/devicetree/bindings/net/can/atmel,at91sam9263-can.yaml
-f:Documentation/devicetree/bindings/net/can/bosch,c_can.yaml
-f:Documentation/devicetree/bindings/net/can/bosch,m_can.yaml
-f:Documentation/devicetree/bindings/net/can/can-controller.yaml
-f:Documentation/devicetree/bindings/net/can/can-transceiver.yaml
-f:Documentation/devicetree/bindings/net/can/cc770.txt
-f:Documentation/devicetree/bindings/net/can/ctu,ctucanfd.yaml
-f:Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml
-f:Documentation/devicetree/bindings/net/can/grcan.txt
-f:Documentation/devicetree/bindings/net/can/holt_hi311x.txt
-f:Documentation/devicetree/bindings/net/can/ifi_canfd.txt
-f:Documentation/devicetree/bindings/net/can/microchip,mcp2510.yaml
-f:Documentation/devicetree/bindings/net/can/microchip,mcp251xfd.yaml
-f:Documentation/devicetree/bindings/net/can/microchip,mpfs-can.yaml
-f:Documentation/devicetree/bindings/net/can/mpc5xxx-mscan.txt
-f:Documentation/devicetree/bindings/net/can/nxp,sja1000.yaml
-f:Documentation/devicetree/bindings/net/can/renesas,rcar-can.yaml
-f:Documentation/devicetree/bindings/net/can/renesas,rcar-canfd.yaml
-f:Documentation/devicetree/bindings/net/can/rockchip,rk3568v2-canfd.yaml
-f:Documentation/devicetree/bindings/net/can/st,stm32-bxcan.yaml
-f:Documentation/devicetree/bindings/net/can/ti,tcan4x5x.yaml
-f:Documentation/devicetree/bindings/net/can/ti_hecc.txt
-f:Documentation/devicetree/bindings/net/can/xilinx,can.yaml
-f:Documentation/devicetree/bindings/net/cavium-mdio.txt
-f:Documentation/devicetree/bindings/net/cavium-mix.txt
-f:Documentation/devicetree/bindings/net/cavium-pip.txt
-f:Documentation/devicetree/bindings/net/cdns,macb.yaml
-f:Documentation/devicetree/bindings/net/cirrus,cs89x0.txt
-f:Documentation/devicetree/bindings/net/cirrus,ep9301-eth.yaml
-f:Documentation/devicetree/bindings/net/cortina,gemini-ethernet.yaml
-f:Documentation/devicetree/bindings/net/cortina.txt
-f:Documentation/devicetree/bindings/net/cpsw-phy-sel.txt
-f:Documentation/devicetree/bindings/net/cpsw.txt
-f:Documentation/devicetree/bindings/net/davicom,dm9000.yaml
-f:Documentation/devicetree/bindings/net/davicom,dm9051.yaml
-f:Documentation/devicetree/bindings/net/davinci_emac.txt
-f:Documentation/devicetree/bindings/net/dsa/arrow,xrs700x.yaml
-f:Documentation/devicetree/bindings/net/dsa/brcm,b53.yaml
-f:Documentation/devicetree/bindings/net/dsa/brcm,sf2.yaml
-f:Documentation/devicetree/bindings/net/dsa/dsa-port.yaml
-f:Documentation/devicetree/bindings/net/dsa/dsa.txt
-f:Documentation/devicetree/bindings/net/dsa/dsa.yaml
-f:Documentation/devicetree/bindings/net/dsa/hirschmann,hellcreek.yaml
-f:Documentation/devicetree/bindings/net/dsa/lan9303.txt
-f:Documentation/devicetree/bindings/net/dsa/lantiq,gswip.yaml
-f:Documentation/devicetree/bindings/net/dsa/marvell,mv88e6060.yaml
-f:Documentation/devicetree/bindings/net/dsa/marvell,mv88e6xxx.yaml
-f:Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml
-f:Documentation/devicetree/bindings/net/dsa/micrel,ks8995.yaml
-f:Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml
-f:Documentation/devicetree/bindings/net/dsa/microchip,lan937x.yaml
-f:Documentation/devicetree/bindings/net/dsa/mscc,ocelot.yaml
-f:Documentation/devicetree/bindings/net/dsa/nxp,sja1105.yaml
-f:Documentation/devicetree/bindings/net/dsa/qca,ar9331.yaml
-f:Documentation/devicetree/bindings/net/dsa/qca8k.yaml
-f:Documentation/devicetree/bindings/net/dsa/realtek.yaml
-f:Documentation/devicetree/bindings/net/dsa/renesas,rzn1-a5psw.yaml
-f:Documentation/devicetree/bindings/net/dsa/vitesse,vsc73xx.yaml
-f:Documentation/devicetree/bindings/net/engleder,tsnep.yaml
-f:Documentation/devicetree/bindings/net/ethernet-controller.yaml
-f:Documentation/devicetree/bindings/net/ethernet-phy-package.yaml
-f:Documentation/devicetree/bindings/net/ethernet-phy.yaml
-f:Documentation/devicetree/bindings/net/ethernet-switch-port.yaml
-f:Documentation/devicetree/bindings/net/ethernet-switch.yaml
-f:Documentation/devicetree/bindings/net/ethernet.txt
-f:Documentation/devicetree/bindings/net/ezchip_enet.txt
-f:Documentation/devicetree/bindings/net/faraday,ftgmac100.yaml
-f:Documentation/devicetree/bindings/net/faraday,ftmac.txt
-f:Documentation/devicetree/bindings/net/fixed-link.txt
-f:Documentation/devicetree/bindings/net/fsl,cpm-enet.yaml
-f:Documentation/devicetree/bindings/net/fsl,cpm-mdio.yaml
-f:Documentation/devicetree/bindings/net/fsl,enetc-ierb.yaml
-f:Documentation/devicetree/bindings/net/fsl,enetc-mdio.yaml
-f:Documentation/devicetree/bindings/net/fsl,enetc.yaml
-f:Documentation/devicetree/bindings/net/fsl,fec.yaml
-f:Documentation/devicetree/bindings/net/fsl,fman-dtsec.yaml
-f:Documentation/devicetree/bindings/net/fsl,fman-mdio.yaml
-f:Documentation/devicetree/bindings/net/fsl,fman-muram.yaml
-f:Documentation/devicetree/bindings/net/fsl,fman-port.yaml
-f:Documentation/devicetree/bindings/net/fsl,fman.yaml
-f:Documentation/devicetree/bindings/net/fsl,gianfar-mdio.yaml
-f:Documentation/devicetree/bindings/net/fsl,gianfar.yaml
-f:Documentation/devicetree/bindings/net/fsl,qoriq-mc-dpmac.yaml
-f:Documentation/devicetree/bindings/net/fsl-tsec-phy.txt
-f:Documentation/devicetree/bindings/net/hisilicon-femac-mdio.txt
-f:Documentation/devicetree/bindings/net/hisilicon-femac.txt
-f:Documentation/devicetree/bindings/net/hisilicon-hip04-net.txt
-f:Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt
-f:Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt
-f:Documentation/devicetree/bindings/net/hisilicon-hns-mdio.txt
-f:Documentation/devicetree/bindings/net/hisilicon-hns-nic.txt
-f:Documentation/devicetree/bindings/net/ibm,emac.txt
-f:Documentation/devicetree/bindings/net/icplus-ip101ag.txt
-f:Documentation/devicetree/bindings/net/idt,3243x-emac.yaml
-f:Documentation/devicetree/bindings/net/ieee802154/adf7242.txt
-f:Documentation/devicetree/bindings/net/ieee802154/atmel,at86rf233.yaml
-f:Documentation/devicetree/bindings/net/ieee802154/ca8210.txt
-f:Documentation/devicetree/bindings/net/ieee802154/cc2520.txt
-f:Documentation/devicetree/bindings/net/ieee802154/mcr20a.txt
-f:Documentation/devicetree/bindings/net/ieee802154/mrf24j40.txt
-f:Documentation/devicetree/bindings/net/ingenic,mac.yaml
-f:Documentation/devicetree/bindings/net/intel,dwmac-plat.yaml
-f:Documentation/devicetree/bindings/net/intel,ixp46x-ptp-timer.yaml
-f:Documentation/devicetree/bindings/net/intel,ixp4xx-ethernet.yaml
-f:Documentation/devicetree/bindings/net/intel,ixp4xx-hss.yaml
-f:Documentation/devicetree/bindings/net/ipq806x-dwmac.txt
-f:Documentation/devicetree/bindings/net/keystone-netcp.txt
-f:Documentation/devicetree/bindings/net/lantiq,etop-xway.yaml
-f:Documentation/devicetree/bindings/net/lantiq,pef2256.yaml
-f:Documentation/devicetree/bindings/net/lantiq,xrx200-net.yaml
-f:Documentation/devicetree/bindings/net/litex,liteeth.yaml
-f:Documentation/devicetree/bindings/net/loongson,ls1b-gmac.yaml
-f:Documentation/devicetree/bindings/net/loongson,ls1c-emac.yaml
-f:Documentation/devicetree/bindings/net/marvell,aquantia.yaml
-f:Documentation/devicetree/bindings/net/marvell,armada-370-neta.yaml
-f:Documentation/devicetree/bindings/net/marvell,armada-380-neta-bm.yaml
-f:Documentation/devicetree/bindings/net/marvell,dfx-server.yaml
-f:Documentation/devicetree/bindings/net/marvell,mvusb.yaml
-f:Documentation/devicetree/bindings/net/marvell,orion-mdio.yaml
-f:Documentation/devicetree/bindings/net/marvell,pp2.yaml
-f:Documentation/devicetree/bindings/net/marvell,prestera.yaml
-f:Documentation/devicetree/bindings/net/marvell-bt-8xxx.txt
-f:Documentation/devicetree/bindings/net/marvell-orion-net.txt
-f:Documentation/devicetree/bindings/net/marvell-pxa168.txt
-f:Documentation/devicetree/bindings/net/maxim,ds26522.yaml
-f:Documentation/devicetree/bindings/net/maxlinear,gpy2xx.yaml
-f:Documentation/devicetree/bindings/net/mctp-i2c-controller.yaml
-f:Documentation/devicetree/bindings/net/mdio-gpio.yaml
-f:Documentation/devicetree/bindings/net/mdio-mux-gpio.yaml
-f:Documentation/devicetree/bindings/net/mdio-mux-mmioreg.yaml
-f:Documentation/devicetree/bindings/net/mdio-mux-multiplexer.yaml
-f:Documentation/devicetree/bindings/net/mdio-mux.yaml
-f:Documentation/devicetree/bindings/net/mdio.txt
-f:Documentation/devicetree/bindings/net/mdio.yaml
-f:Documentation/devicetree/bindings/net/mediatek,net.yaml
-f:Documentation/devicetree/bindings/net/mediatek,star-emac.yaml
-f:Documentation/devicetree/bindings/net/mediatek-dwmac.yaml
-f:Documentation/devicetree/bindings/net/micrel,ks8851.yaml
-f:Documentation/devicetree/bindings/net/micrel-ksz90x1.txt
-f:Documentation/devicetree/bindings/net/micrel.txt
-f:Documentation/devicetree/bindings/net/microchip,enc28j60.txt
-f:Documentation/devicetree/bindings/net/microchip,lan78xx.txt
-f:Documentation/devicetree/bindings/net/microchip,lan8650.yaml
-f:Documentation/devicetree/bindings/net/microchip,lan95xx.yaml
-f:Documentation/devicetree/bindings/net/microchip,lan966x-switch.yaml
-f:Documentation/devicetree/bindings/net/microchip,sparx5-switch.yaml
-f:Documentation/devicetree/bindings/net/motorcomm,yt8xxx.yaml
-f:Documentation/devicetree/bindings/net/mscc,miim.yaml
-f:Documentation/devicetree/bindings/net/mscc,vsc7514-switch.yaml
-f:Documentation/devicetree/bindings/net/mscc-phy-vsc8531.txt
-f:Documentation/devicetree/bindings/net/network-class.yaml
-f:Documentation/devicetree/bindings/net/nfc/marvell,nci.yaml
-f:Documentation/devicetree/bindings/net/nfc/nxp,nci.yaml
-f:Documentation/devicetree/bindings/net/nfc/nxp,pn532.yaml
-f:Documentation/devicetree/bindings/net/nfc/nxp,pn544.yaml
-f:Documentation/devicetree/bindings/net/nfc/samsung,s3fwrn5.yaml
-f:Documentation/devicetree/bindings/net/nfc/st,st-nci.yaml
-f:Documentation/devicetree/bindings/net/nfc/st,st21nfca.yaml
-f:Documentation/devicetree/bindings/net/nfc/st,st95hf.yaml
-f:Documentation/devicetree/bindings/net/nfc/ti,trf7970a.yaml
-f:Documentation/devicetree/bindings/net/nixge.txt
-f:Documentation/devicetree/bindings/net/nvidia,tegra234-mgbe.yaml
-f:Documentation/devicetree/bindings/net/nxp,dwmac-imx.yaml
-f:Documentation/devicetree/bindings/net/nxp,lpc-eth.yaml
-f:Documentation/devicetree/bindings/net/nxp,lpc1850-dwmac.yaml
-f:Documentation/devicetree/bindings/net/nxp,netc-blk-ctrl.yaml
-f:Documentation/devicetree/bindings/net/nxp,s32-dwmac.yaml
-f:Documentation/devicetree/bindings/net/nxp,tja11xx.yaml
-f:Documentation/devicetree/bindings/net/opencores-ethoc.txt
-f:Documentation/devicetree/bindings/net/pcs/fsl,lynx-pcs.yaml
-f:Documentation/devicetree/bindings/net/pcs/mediatek,sgmiisys.yaml
-f:Documentation/devicetree/bindings/net/pcs/renesas,rzn1-miic.yaml
-f:Documentation/devicetree/bindings/net/pcs/snps,dw-xpcs.yaml
-f:Documentation/devicetree/bindings/net/phy.txt
-f:Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml
-f:Documentation/devicetree/bindings/net/pse-pd/podl-pse-regulator.yaml
-f:Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml
-f:Documentation/devicetree/bindings/net/pse-pd/ti,tps23881.yaml
-f:Documentation/devicetree/bindings/net/qca,ar71xx.yaml
-f:Documentation/devicetree/bindings/net/qca,ar803x.yaml
-f:Documentation/devicetree/bindings/net/qca,qca7000.yaml
-f:Documentation/devicetree/bindings/net/qca,qca808x.yaml
-f:Documentation/devicetree/bindings/net/qcom,bam-dmux.yaml
-f:Documentation/devicetree/bindings/net/qcom,ethqos.yaml
-f:Documentation/devicetree/bindings/net/qcom,ipa.yaml
-f:Documentation/devicetree/bindings/net/qcom,ipq4019-mdio.yaml
-f:Documentation/devicetree/bindings/net/qcom,ipq8064-mdio.yaml
-f:Documentation/devicetree/bindings/net/qcom,qca807x.yaml
-f:Documentation/devicetree/bindings/net/qcom-emac.txt
-f:Documentation/devicetree/bindings/net/realtek,rtl82xx.yaml
-f:Documentation/devicetree/bindings/net/realtek,rtl9301-mdio.yaml
-f:Documentation/devicetree/bindings/net/realtek,rtl9301-switch.yaml
-f:Documentation/devicetree/bindings/net/renesas,ether.yaml
-f:Documentation/devicetree/bindings/net/renesas,etheravb.yaml
-f:Documentation/devicetree/bindings/net/renesas,ethertsn.yaml
-f:Documentation/devicetree/bindings/net/renesas,r8a779f0-ether-switch.yaml
-f:Documentation/devicetree/bindings/net/renesas,rzn1-gmac.yaml
-f:Documentation/devicetree/bindings/net/renesas,rzv2h-gbeth.yaml
-f:Documentation/devicetree/bindings/net/rfkill-gpio.yaml
-f:Documentation/devicetree/bindings/net/rockchip,emac.yaml
-f:Documentation/devicetree/bindings/net/rockchip-dwmac.yaml
-f:Documentation/devicetree/bindings/net/samsung-sxgbe.txt
-f:Documentation/devicetree/bindings/net/sff,sfp.yaml
-f:Documentation/devicetree/bindings/net/smsc,lan9115.yaml
-f:Documentation/devicetree/bindings/net/smsc,lan91c111.yaml
-f:Documentation/devicetree/bindings/net/smsc-lan87xx.txt
-f:Documentation/devicetree/bindings/net/snps,dwc-qos-ethernet.txt
-f:Documentation/devicetree/bindings/net/snps,dwmac.yaml
-f:Documentation/devicetree/bindings/net/socionext,synquacer-netsec.yaml
-f:Documentation/devicetree/bindings/net/socionext,uniphier-ave4.yaml
-f:Documentation/devicetree/bindings/net/sophgo,cv1800b-dwmac.yaml
-f:Documentation/devicetree/bindings/net/sophgo,sg2044-dwmac.yaml
-f:Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml
-f:Documentation/devicetree/bindings/net/sti-dwmac.txt
-f:Documentation/devicetree/bindings/net/stm32-dwmac.yaml
-f:Documentation/devicetree/bindings/net/stmmac.txt
-f:Documentation/devicetree/bindings/net/sunplus,sp7021-emac.yaml
-f:Documentation/devicetree/bindings/net/tesla,fsd-ethqos.yaml
-f:Documentation/devicetree/bindings/net/thead,th1520-gmac.yaml
-f:Documentation/devicetree/bindings/net/ti,cc1352p7.yaml
-f:Documentation/devicetree/bindings/net/ti,cpsw-switch.yaml
-f:Documentation/devicetree/bindings/net/ti,davinci-mdio.yaml
-f:Documentation/devicetree/bindings/net/ti,dp83822.yaml
-f:Documentation/devicetree/bindings/net/ti,dp83867.yaml
-f:Documentation/devicetree/bindings/net/ti,dp83869.yaml
-f:Documentation/devicetree/bindings/net/ti,icss-iep.yaml
-f:Documentation/devicetree/bindings/net/ti,icssg-prueth.yaml
-f:Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml
-f:Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml
-f:Documentation/devicetree/bindings/net/toshiba,visconti-dwmac.yaml
-f:Documentation/devicetree/bindings/net/vertexcom-mse102x.yaml
-f:Documentation/devicetree/bindings/net/via,vt8500-rhine.yaml
-f:Documentation/devicetree/bindings/net/via-velocity.txt
-f:Documentation/devicetree/bindings/net/wireless/brcm,bcm4329-fmac.yaml
-f:Documentation/devicetree/bindings/net/wireless/esp,esp8089.yaml
-f:Documentation/devicetree/bindings/net/wireless/ieee80211.yaml
-f:Documentation/devicetree/bindings/net/wireless/marvell,sd8787.yaml
-f:Documentation/devicetree/bindings/net/wireless/mediatek,mt76.yaml
-f:Documentation/devicetree/bindings/net/wireless/microchip,wilc1000.yaml
-f:Documentation/devicetree/bindings/net/wireless/qca,ath9k.yaml
-f:Documentation/devicetree/bindings/net/wireless/qcom,ath10k.yaml
-f:Documentation/devicetree/bindings/net/wireless/qcom,ath11k-pci.yaml
-f:Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml
-f:Documentation/devicetree/bindings/net/wireless/qcom,ath12k-wsi.yaml
-f:Documentation/devicetree/bindings/net/wireless/qcom,ath12k.yaml
-f:Documentation/devicetree/bindings/net/wireless/qcom,ipq5332-wifi.yaml
-f:Documentation/devicetree/bindings/net/wireless/ralink,rt2880.yaml
-f:Documentation/devicetree/bindings/net/wireless/realtek,rtl8188e.yaml
-f:Documentation/devicetree/bindings/net/wireless/silabs,wfx.yaml
-f:Documentation/devicetree/bindings/net/wireless/ti,wl1251.txt
-f:Documentation/devicetree/bindings/net/wireless/ti,wlcore.yaml
-f:Documentation/devicetree/bindings/net/wireless/wireless-controller.yaml
-f:Documentation/devicetree/bindings/net/wiznet,w5x00.txt
-f:Documentation/devicetree/bindings/net/xlnx,axi-ethernet.yaml
-f:Documentation/devicetree/bindings/net/xlnx,emaclite.yaml
-f:Documentation/devicetree/bindings/net/xlnx,gmii-to-rgmii.yaml
-f:Documentation/devicetree/bindings/nios2/nios2.txt
-f:Documentation/devicetree/bindings/nvme/apple,nvme-ans.yaml
-f:Documentation/devicetree/bindings/nvmem/allwinner,sun4i-a10-sid.yaml
-f:Documentation/devicetree/bindings/nvmem/amlogic,meson-gxbb-efuse.yaml
-f:Documentation/devicetree/bindings/nvmem/amlogic,meson6-efuse.yaml
-f:Documentation/devicetree/bindings/nvmem/apple,efuses.yaml
-f:Documentation/devicetree/bindings/nvmem/apple,spmi-nvmem.yaml
-f:Documentation/devicetree/bindings/nvmem/brcm,nvram.yaml
-f:Documentation/devicetree/bindings/nvmem/brcm,ocotp.txt
-f:Documentation/devicetree/bindings/nvmem/fsl,layerscape-sfp.yaml
-f:Documentation/devicetree/bindings/nvmem/fsl,scu-ocotp.yaml
-f:Documentation/devicetree/bindings/nvmem/fsl,t1023-sfp.yaml
-f:Documentation/devicetree/bindings/nvmem/fsl,vf610-ocotp.yaml
-f:Documentation/devicetree/bindings/nvmem/imx-iim.yaml
-f:Documentation/devicetree/bindings/nvmem/imx-ocotp.yaml
-f:Documentation/devicetree/bindings/nvmem/ingenic,jz4780-efuse.yaml
-f:Documentation/devicetree/bindings/nvmem/layouts/fixed-cell.yaml
-f:Documentation/devicetree/bindings/nvmem/layouts/fixed-layout.yaml
-f:Documentation/devicetree/bindings/nvmem/layouts/kontron,sl28-vpd.yaml
-f:Documentation/devicetree/bindings/nvmem/layouts/nvmem-layout.yaml
-f:Documentation/devicetree/bindings/nvmem/layouts/onie,tlv-layout.yaml
-f:Documentation/devicetree/bindings/nvmem/layouts/u-boot,env.yaml
-f:Documentation/devicetree/bindings/nvmem/lpc1850-otp.txt
-f:Documentation/devicetree/bindings/nvmem/maxim,max77759-nvmem.yaml
-f:Documentation/devicetree/bindings/nvmem/mediatek,efuse.yaml
-f:Documentation/devicetree/bindings/nvmem/microchip,lan9662-otpc.yaml
-f:Documentation/devicetree/bindings/nvmem/microchip,sama7g5-otpc.yaml
-f:Documentation/devicetree/bindings/nvmem/mxs-ocotp.yaml
-f:Documentation/devicetree/bindings/nvmem/nintendo-otp.yaml
-f:Documentation/devicetree/bindings/nvmem/nvmem-consumer.yaml
-f:Documentation/devicetree/bindings/nvmem/nvmem-deprecated-cells.yaml
-f:Documentation/devicetree/bindings/nvmem/nvmem-provider.yaml
-f:Documentation/devicetree/bindings/nvmem/nvmem.txt
-f:Documentation/devicetree/bindings/nvmem/nvmem.yaml
-f:Documentation/devicetree/bindings/nvmem/nxp,lpc1857-eeprom.yaml
-f:Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml
-f:Documentation/devicetree/bindings/nvmem/qcom,sec-qfprom.yaml
-f:Documentation/devicetree/bindings/nvmem/qcom,spmi-sdam.yaml
-f:Documentation/devicetree/bindings/nvmem/renesas,rcar-efuse.yaml
-f:Documentation/devicetree/bindings/nvmem/renesas,rcar-otp.yaml
-f:Documentation/devicetree/bindings/nvmem/rmem.yaml
-f:Documentation/devicetree/bindings/nvmem/rockchip,otp.yaml
-f:Documentation/devicetree/bindings/nvmem/rockchip-efuse.yaml
-f:Documentation/devicetree/bindings/nvmem/snvs-lpgpr.yaml
-f:Documentation/devicetree/bindings/nvmem/socionext,uniphier-efuse.yaml
-f:Documentation/devicetree/bindings/nvmem/sprd,sc2731-efuse.yaml
-f:Documentation/devicetree/bindings/nvmem/sprd,ums312-efuse.yaml
-f:Documentation/devicetree/bindings/nvmem/st,stm32-romem.yaml
-f:Documentation/devicetree/bindings/nvmem/sunplus,sp7021-ocotp.yaml
-f:Documentation/devicetree/bindings/nvmem/xlnx,zynqmp-nvmem.yaml
-f:Documentation/devicetree/bindings/nvmem/zii,rave-sp-eeprom.yaml
-f:Documentation/devicetree/bindings/openrisc/opencores/or1ksim.txt
-f:Documentation/devicetree/bindings/opp/allwinner,sun50i-h6-operating-points.yaml
-f:Documentation/devicetree/bindings/opp/operating-points-v2-ti-cpu.yaml
-f:Documentation/devicetree/bindings/opp/opp-v1.yaml
-f:Documentation/devicetree/bindings/opp/opp-v2-base.yaml
-f:Documentation/devicetree/bindings/opp/opp-v2-kryo-cpu.yaml
-f:Documentation/devicetree/bindings/opp/opp-v2-qcom-adreno.yaml
-f:Documentation/devicetree/bindings/opp/opp-v2-qcom-level.yaml
-f:Documentation/devicetree/bindings/opp/opp-v2.yaml
-f:Documentation/devicetree/bindings/opp/ti,omap-opp-supply.yaml
-f:Documentation/devicetree/bindings/pci/83xx-512x-pci.txt
-f:Documentation/devicetree/bindings/pci/aardvark-pci.txt
-f:Documentation/devicetree/bindings/pci/altr,pcie-root-port.yaml
-f:Documentation/devicetree/bindings/pci/amd,versal2-mdb-host.yaml
-f:Documentation/devicetree/bindings/pci/amlogic,axg-pcie.yaml
-f:Documentation/devicetree/bindings/pci/apple,pcie.yaml
-f:Documentation/devicetree/bindings/pci/axis,artpec6-pcie.txt
-f:Documentation/devicetree/bindings/pci/baikal,bt1-pcie.yaml
-f:Documentation/devicetree/bindings/pci/brcm,iproc-pcie.yaml
-f:Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
-f:Documentation/devicetree/bindings/pci/cdns,cdns-pcie-ep.yaml
-f:Documentation/devicetree/bindings/pci/cdns,cdns-pcie-host.yaml
-f:Documentation/devicetree/bindings/pci/cdns-pcie-ep.yaml
-f:Documentation/devicetree/bindings/pci/cdns-pcie-host.yaml
-f:Documentation/devicetree/bindings/pci/cdns-pcie.yaml
-f:Documentation/devicetree/bindings/pci/faraday,ftpci100.yaml
-f:Documentation/devicetree/bindings/pci/fsl,imx6q-pcie-common.yaml
-f:Documentation/devicetree/bindings/pci/fsl,imx6q-pcie-ep.yaml
-f:Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.yaml
-f:Documentation/devicetree/bindings/pci/fsl,layerscape-pcie-ep.yaml
-f:Documentation/devicetree/bindings/pci/fsl,layerscape-pcie.yaml
-f:Documentation/devicetree/bindings/pci/fsl,mpc8xxx-pci.yaml
-f:Documentation/devicetree/bindings/pci/hisilicon,kirin-pcie.yaml
-f:Documentation/devicetree/bindings/pci/hisilicon-histb-pcie.txt
-f:Documentation/devicetree/bindings/pci/host-generic-pci.yaml
-f:Documentation/devicetree/bindings/pci/intel,ixp4xx-pci.yaml
-f:Documentation/devicetree/bindings/pci/intel,keembay-pcie-ep.yaml
-f:Documentation/devicetree/bindings/pci/intel,keembay-pcie.yaml
-f:Documentation/devicetree/bindings/pci/intel-gw-pcie.yaml
-f:Documentation/devicetree/bindings/pci/loongson.yaml
-f:Documentation/devicetree/bindings/pci/marvell,armada8k-pcie.yaml
-f:Documentation/devicetree/bindings/pci/marvell,kirkwood-pcie.yaml
-f:Documentation/devicetree/bindings/pci/mbvl,gpex40-pcie.yaml
-f:Documentation/devicetree/bindings/pci/mediatek,mt7621-pcie.yaml
-f:Documentation/devicetree/bindings/pci/mediatek-pcie-cfg.yaml
-f:Documentation/devicetree/bindings/pci/mediatek-pcie-gen3.yaml
-f:Documentation/devicetree/bindings/pci/mediatek-pcie.txt
-f:Documentation/devicetree/bindings/pci/microchip,pcie-host.yaml
-f:Documentation/devicetree/bindings/pci/nvidia,tegra194-pcie-ep.yaml
-f:Documentation/devicetree/bindings/pci/nvidia,tegra194-pcie.yaml
-f:Documentation/devicetree/bindings/pci/nvidia,tegra20-pcie.txt
-f:Documentation/devicetree/bindings/pci/pci-ep-bus.yaml
-f:Documentation/devicetree/bindings/pci/pci-ep.yaml
-f:Documentation/devicetree/bindings/pci/pcie-al.txt
-f:Documentation/devicetree/bindings/pci/plda,xpressrich3-axi-common.yaml
-f:Documentation/devicetree/bindings/pci/qcom,pcie-common.yaml
-f:Documentation/devicetree/bindings/pci/qcom,pcie-ep.yaml
-f:Documentation/devicetree/bindings/pci/qcom,pcie-sa8775p.yaml
-f:Documentation/devicetree/bindings/pci/qcom,pcie-sc7280.yaml
-f:Documentation/devicetree/bindings/pci/qcom,pcie-sc8180x.yaml
-f:Documentation/devicetree/bindings/pci/qcom,pcie-sc8280xp.yaml
-f:Documentation/devicetree/bindings/pci/qcom,pcie-sm8150.yaml
-f:Documentation/devicetree/bindings/pci/qcom,pcie-sm8250.yaml
-f:Documentation/devicetree/bindings/pci/qcom,pcie-sm8350.yaml
-f:Documentation/devicetree/bindings/pci/qcom,pcie-sm8450.yaml
-f:Documentation/devicetree/bindings/pci/qcom,pcie-sm8550.yaml
-f:Documentation/devicetree/bindings/pci/qcom,pcie-x1e80100.yaml
-f:Documentation/devicetree/bindings/pci/qcom,pcie.yaml
-f:Documentation/devicetree/bindings/pci/ralink,rt3883-pci.txt
-f:Documentation/devicetree/bindings/pci/rcar-gen4-pci-ep.yaml
-f:Documentation/devicetree/bindings/pci/rcar-gen4-pci-host.yaml
-f:Documentation/devicetree/bindings/pci/rcar-pci-ep.yaml
-f:Documentation/devicetree/bindings/pci/rcar-pci-host.yaml
-f:Documentation/devicetree/bindings/pci/renesas,pci-rcar-gen2.yaml
-f:Documentation/devicetree/bindings/pci/rockchip,rk3399-pcie-common.yaml
-f:Documentation/devicetree/bindings/pci/rockchip,rk3399-pcie-ep.yaml
-f:Documentation/devicetree/bindings/pci/rockchip,rk3399-pcie.yaml
-f:Documentation/devicetree/bindings/pci/rockchip-dw-pcie-common.yaml
-f:Documentation/devicetree/bindings/pci/rockchip-dw-pcie-ep.yaml
-f:Documentation/devicetree/bindings/pci/rockchip-dw-pcie.yaml
-f:Documentation/devicetree/bindings/pci/samsung,exynos-pcie.yaml
-f:Documentation/devicetree/bindings/pci/sifive,fu740-pcie.yaml
-f:Documentation/devicetree/bindings/pci/snps,dw-pcie-common.yaml
-f:Documentation/devicetree/bindings/pci/snps,dw-pcie-ep.yaml
-f:Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml
-f:Documentation/devicetree/bindings/pci/socionext,uniphier-pcie-ep.yaml
-f:Documentation/devicetree/bindings/pci/socionext,uniphier-pcie.yaml
-f:Documentation/devicetree/bindings/pci/spear13xx-pcie.txt
-f:Documentation/devicetree/bindings/pci/starfive,jh7110-pcie.yaml
-f:Documentation/devicetree/bindings/pci/ti,am65-pci-ep.yaml
-f:Documentation/devicetree/bindings/pci/ti,am65-pci-host.yaml
-f:Documentation/devicetree/bindings/pci/ti,j721e-pci-ep.yaml
-f:Documentation/devicetree/bindings/pci/ti,j721e-pci-host.yaml
-f:Documentation/devicetree/bindings/pci/ti-pci.txt
-f:Documentation/devicetree/bindings/pci/toshiba,visconti-pcie.yaml
-f:Documentation/devicetree/bindings/pci/v3,v360epc-pci.yaml
-f:Documentation/devicetree/bindings/pci/versatile.yaml
-f:Documentation/devicetree/bindings/pci/xgene-pci.txt
-f:Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml
-f:Documentation/devicetree/bindings/pci/xlnx,axi-pcie-host.yaml
-f:Documentation/devicetree/bindings/pci/xlnx,nwl-pcie.yaml
-f:Documentation/devicetree/bindings/pci/xlnx,xdma-host.yaml
-f:Documentation/devicetree/bindings/peci/nuvoton,npcm-peci.yaml
-f:Documentation/devicetree/bindings/peci/peci-aspeed.yaml
-f:Documentation/devicetree/bindings/peci/peci-controller.yaml
-f:Documentation/devicetree/bindings/perf/amlogic,g12-ddr-pmu.yaml
-f:Documentation/devicetree/bindings/perf/apm-xgene-pmu.txt
-f:Documentation/devicetree/bindings/perf/arm,ccn.yaml
-f:Documentation/devicetree/bindings/perf/arm,cmn.yaml
-f:Documentation/devicetree/bindings/perf/arm,coresight-pmu.yaml
-f:Documentation/devicetree/bindings/perf/arm,dsu-pmu.yaml
-f:Documentation/devicetree/bindings/perf/arm,ni.yaml
-f:Documentation/devicetree/bindings/perf/arm,smmu-v3-pmcg.yaml
-f:Documentation/devicetree/bindings/perf/fsl-imx-ddr.yaml
-f:Documentation/devicetree/bindings/perf/marvell-cn10k-ddr.yaml
-f:Documentation/devicetree/bindings/perf/marvell-cn10k-tad.yaml
-f:Documentation/devicetree/bindings/perf/riscv,pmu.yaml
-f:Documentation/devicetree/bindings/perf/spe-pmu.yaml
-f:Documentation/devicetree/bindings/perf/starfive,jh8100-starlink-pmu.yaml
-f:Documentation/devicetree/bindings/phy/airoha,en7581-pcie-phy.yaml
-f:Documentation/devicetree/bindings/phy/allwinner,sun4i-a10-usb-phy.yaml
-f:Documentation/devicetree/bindings/phy/allwinner,sun50i-a64-usb-phy.yaml
-f:Documentation/devicetree/bindings/phy/allwinner,sun50i-h6-usb-phy.yaml
-f:Documentation/devicetree/bindings/phy/allwinner,sun50i-h6-usb3-phy.yaml
-f:Documentation/devicetree/bindings/phy/allwinner,sun5i-a13-usb-phy.yaml
-f:Documentation/devicetree/bindings/phy/allwinner,sun6i-a31-mipi-dphy.yaml
-f:Documentation/devicetree/bindings/phy/allwinner,sun6i-a31-usb-phy.yaml
-f:Documentation/devicetree/bindings/phy/allwinner,sun8i-a23-usb-phy.yaml
-f:Documentation/devicetree/bindings/phy/allwinner,sun8i-a83t-usb-phy.yaml
-f:Documentation/devicetree/bindings/phy/allwinner,sun8i-h3-usb-phy.yaml
-f:Documentation/devicetree/bindings/phy/allwinner,sun8i-r40-usb-phy.yaml
-f:Documentation/devicetree/bindings/phy/allwinner,sun8i-v3s-usb-phy.yaml
-f:Documentation/devicetree/bindings/phy/allwinner,sun9i-a80-usb-phy.yaml
-f:Documentation/devicetree/bindings/phy/allwinner,suniv-f1c100s-usb-phy.yaml
-f:Documentation/devicetree/bindings/phy/amlogic,axg-mipi-dphy.yaml
-f:Documentation/devicetree/bindings/phy/amlogic,g12a-mipi-dphy-analog.yaml
-f:Documentation/devicetree/bindings/phy/amlogic,g12a-usb2-phy.yaml
-f:Documentation/devicetree/bindings/phy/amlogic,g12a-usb3-pcie-phy.yaml
-f:Documentation/devicetree/bindings/phy/amlogic,meson-axg-mipi-pcie-analog.yaml
-f:Documentation/devicetree/bindings/phy/amlogic,meson-axg-pcie.yaml
-f:Documentation/devicetree/bindings/phy/amlogic,meson-gxl-usb2-phy.yaml
-f:Documentation/devicetree/bindings/phy/amlogic,meson8-hdmi-tx-phy.yaml
-f:Documentation/devicetree/bindings/phy/amlogic,meson8b-usb2-phy.yaml
-f:Documentation/devicetree/bindings/phy/apm-xgene-phy.txt
-f:Documentation/devicetree/bindings/phy/bcm-ns-usb2-phy.yaml
-f:Documentation/devicetree/bindings/phy/bcm-ns-usb3-phy.yaml
-f:Documentation/devicetree/bindings/phy/berlin-sata-phy.txt
-f:Documentation/devicetree/bindings/phy/berlin-usb-phy.txt
-f:Documentation/devicetree/bindings/phy/brcm,bcm63xx-usbh-phy.yaml
-f:Documentation/devicetree/bindings/phy/brcm,brcmstb-usb-phy.yaml
-f:Documentation/devicetree/bindings/phy/brcm,cygnus-pcie-phy.yaml
-f:Documentation/devicetree/bindings/phy/brcm,kona-usb2-phy.yaml
-f:Documentation/devicetree/bindings/phy/brcm,ns2-drd-phy.txt
-f:Documentation/devicetree/bindings/phy/brcm,ns2-pcie-phy.yaml
-f:Documentation/devicetree/bindings/phy/brcm,sata-phy.yaml
-f:Documentation/devicetree/bindings/phy/brcm,sr-pcie-phy.txt
-f:Documentation/devicetree/bindings/phy/brcm,stingray-usb-phy.txt
-f:Documentation/devicetree/bindings/phy/calxeda-combophy.yaml
-f:Documentation/devicetree/bindings/phy/cdns,dphy-rx.yaml
-f:Documentation/devicetree/bindings/phy/cdns,dphy.yaml
-f:Documentation/devicetree/bindings/phy/cdns,salvo-phy.yaml
-f:Documentation/devicetree/bindings/phy/dm816x-phy.txt
-f:Documentation/devicetree/bindings/phy/fsl,imx8-pcie-phy.yaml
-f:Documentation/devicetree/bindings/phy/fsl,imx8mp-hdmi-phy.yaml
-f:Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.yaml
-f:Documentation/devicetree/bindings/phy/fsl,imx8qm-hsio.yaml
-f:Documentation/devicetree/bindings/phy/fsl,imx8qm-lvds-phy.yaml
-f:Documentation/devicetree/bindings/phy/fsl,lynx-28g.yaml
-f:Documentation/devicetree/bindings/phy/fsl,mxs-usbphy.yaml
-f:Documentation/devicetree/bindings/phy/hisilicon,hi3660-usb3.yaml
-f:Documentation/devicetree/bindings/phy/hisilicon,hi3670-usb3.yaml
-f:Documentation/devicetree/bindings/phy/hisilicon,hi3798cv200-combphy.yaml
-f:Documentation/devicetree/bindings/phy/hisilicon,phy-hi3670-pcie.yaml
-f:Documentation/devicetree/bindings/phy/hix5hd2-phy.txt
-f:Documentation/devicetree/bindings/phy/ingenic,phy-usb.yaml
-f:Documentation/devicetree/bindings/phy/intel,combo-phy.yaml
-f:Documentation/devicetree/bindings/phy/intel,keembay-phy-usb.yaml
-f:Documentation/devicetree/bindings/phy/intel,lgm-emmc-phy.yaml
-f:Documentation/devicetree/bindings/phy/intel,lgm-usb-phy.yaml
-f:Documentation/devicetree/bindings/phy/keystone-usb-phy.txt
-f:Documentation/devicetree/bindings/phy/lantiq,vrx200-pcie-phy.yaml
-f:Documentation/devicetree/bindings/phy/marvell,armada-3700-utmi-phy.yaml
-f:Documentation/devicetree/bindings/phy/marvell,armada-cp110-utmi-phy.yaml
-f:Documentation/devicetree/bindings/phy/marvell,mmp3-hsic-phy.yaml
-f:Documentation/devicetree/bindings/phy/marvell,mmp3-usb-phy.yaml
-f:Documentation/devicetree/bindings/phy/marvell,pxa1928-usb-phy.yaml
-f:Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml
-f:Documentation/devicetree/bindings/phy/mediatek,hdmi-phy.yaml
-f:Documentation/devicetree/bindings/phy/mediatek,mt7621-pci-phy.yaml
-f:Documentation/devicetree/bindings/phy/mediatek,mt7628-usbphy.yaml
-f:Documentation/devicetree/bindings/phy/mediatek,mt7988-xfi-tphy.yaml
-f:Documentation/devicetree/bindings/phy/mediatek,mt8365-csi-rx.yaml
-f:Documentation/devicetree/bindings/phy/mediatek,pcie-phy.yaml
-f:Documentation/devicetree/bindings/phy/mediatek,tphy.yaml
-f:Documentation/devicetree/bindings/phy/mediatek,ufs-phy.yaml
-f:Documentation/devicetree/bindings/phy/mediatek,xsphy.yaml
-f:Documentation/devicetree/bindings/phy/microchip,lan966x-serdes.yaml
-f:Documentation/devicetree/bindings/phy/microchip,sparx5-serdes.yaml
-f:Documentation/devicetree/bindings/phy/mixel,mipi-dsi-phy.yaml
-f:Documentation/devicetree/bindings/phy/mscc,vsc7514-serdes.yaml
-f:Documentation/devicetree/bindings/phy/nuvoton,ma35d1-usb2-phy.yaml
-f:Documentation/devicetree/bindings/phy/nvidia,tegra124-xusb-padctl.yaml
-f:Documentation/devicetree/bindings/phy/nvidia,tegra186-xusb-padctl.yaml
-f:Documentation/devicetree/bindings/phy/nvidia,tegra194-xusb-padctl.yaml
-f:Documentation/devicetree/bindings/phy/nvidia,tegra20-usb-phy.yaml
-f:Documentation/devicetree/bindings/phy/nvidia,tegra210-xusb-padctl.yaml
-f:Documentation/devicetree/bindings/phy/nxp,ptn3222.yaml
-f:Documentation/devicetree/bindings/phy/phy-armada38x-comphy.txt
-f:Documentation/devicetree/bindings/phy/phy-ath79-usb.txt
-f:Documentation/devicetree/bindings/phy/phy-bindings.txt
-f:Documentation/devicetree/bindings/phy/phy-cadence-sierra.yaml
-f:Documentation/devicetree/bindings/phy/phy-cadence-torrent.yaml
-f:Documentation/devicetree/bindings/phy/phy-cpcap-usb.txt
-f:Documentation/devicetree/bindings/phy/phy-da8xx-usb.txt
-f:Documentation/devicetree/bindings/phy/phy-hi6220-usb.txt
-f:Documentation/devicetree/bindings/phy/phy-hisi-inno-usb2.txt
-f:Documentation/devicetree/bindings/phy/phy-lantiq-rcu-usb2.txt
-f:Documentation/devicetree/bindings/phy/phy-mapphone-mdm6600.txt
-f:Documentation/devicetree/bindings/phy/phy-miphy28lp.txt
-f:Documentation/devicetree/bindings/phy/phy-miphy365x.txt
-f:Documentation/devicetree/bindings/phy/phy-mvebu-comphy.txt
-f:Documentation/devicetree/bindings/phy/phy-mvebu.txt
-f:Documentation/devicetree/bindings/phy/phy-pxa-usb.txt
-f:Documentation/devicetree/bindings/phy/phy-rockchip-naneng-combphy.yaml
-f:Documentation/devicetree/bindings/phy/phy-rockchip-usbdp.yaml
-f:Documentation/devicetree/bindings/phy/phy-stm32-usbphyc.yaml
-f:Documentation/devicetree/bindings/phy/phy-tegra194-p2u.yaml
-f:Documentation/devicetree/bindings/phy/pistachio-usb-phy.txt
-f:Documentation/devicetree/bindings/phy/qcom,edp-phy.yaml
-f:Documentation/devicetree/bindings/phy/qcom,hdmi-phy-other.yaml
-f:Documentation/devicetree/bindings/phy/qcom,hdmi-phy-qmp.yaml
-f:Documentation/devicetree/bindings/phy/qcom,ipq5332-uniphy-pcie-phy.yaml
-f:Documentation/devicetree/bindings/phy/qcom,ipq5332-usb-hsphy.yaml
-f:Documentation/devicetree/bindings/phy/qcom,ipq806x-usb-phy-hs.yaml
-f:Documentation/devicetree/bindings/phy/qcom,ipq806x-usb-phy-ss.yaml
-f:Documentation/devicetree/bindings/phy/qcom,ipq8074-qmp-pcie-phy.yaml
-f:Documentation/devicetree/bindings/phy/qcom,msm8996-qmp-pcie-phy.yaml
-f:Documentation/devicetree/bindings/phy/qcom,msm8998-qmp-pcie-phy.yaml
-f:Documentation/devicetree/bindings/phy/qcom,msm8998-qmp-usb3-phy.yaml
-f:Documentation/devicetree/bindings/phy/qcom,pcie2-phy.yaml
-f:Documentation/devicetree/bindings/phy/qcom,qusb2-phy.yaml
-f:Documentation/devicetree/bindings/phy/qcom,sa8775p-dwmac-sgmii-phy.yaml
-f:Documentation/devicetree/bindings/phy/qcom,sata-phy.yaml
-f:Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml
-f:Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml
-f:Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml
-f:Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb43dp-phy.yaml
-f:Documentation/devicetree/bindings/phy/qcom,snps-eusb2-phy.yaml
-f:Documentation/devicetree/bindings/phy/qcom,snps-eusb2-repeater.yaml
-f:Documentation/devicetree/bindings/phy/qcom,usb-hs-28nm.yaml
-f:Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml
-f:Documentation/devicetree/bindings/phy/qcom,usb-hsic-phy.yaml
-f:Documentation/devicetree/bindings/phy/qcom,usb-snps-femto-v2.yaml
-f:Documentation/devicetree/bindings/phy/qcom,usb-ss.yaml
-f:Documentation/devicetree/bindings/phy/qcom-usb-ipq4019-phy.yaml
-f:Documentation/devicetree/bindings/phy/realtek,usb2phy.yaml
-f:Documentation/devicetree/bindings/phy/realtek,usb3phy.yaml
-f:Documentation/devicetree/bindings/phy/renesas,r8a779f0-ether-serdes.yaml
-f:Documentation/devicetree/bindings/phy/renesas,rcar-gen2-usb-phy.yaml
-f:Documentation/devicetree/bindings/phy/renesas,rcar-gen3-pcie-phy.yaml
-f:Documentation/devicetree/bindings/phy/renesas,usb2-phy.yaml
-f:Documentation/devicetree/bindings/phy/renesas,usb3-phy.yaml
-f:Documentation/devicetree/bindings/phy/rockchip,inno-usb2phy.yaml
-f:Documentation/devicetree/bindings/phy/rockchip,pcie3-phy.yaml
-f:Documentation/devicetree/bindings/phy/rockchip,px30-dsi-dphy.yaml
-f:Documentation/devicetree/bindings/phy/rockchip,rk3228-hdmi-phy.yaml
-f:Documentation/devicetree/bindings/phy/rockchip,rk3288-dp-phy.yaml
-f:Documentation/devicetree/bindings/phy/rockchip,rk3399-emmc-phy.yaml
-f:Documentation/devicetree/bindings/phy/rockchip,rk3399-pcie-phy.yaml
-f:Documentation/devicetree/bindings/phy/rockchip,rk3399-typec-phy.yaml
-f:Documentation/devicetree/bindings/phy/rockchip,rk3588-hdptx-phy.yaml
-f:Documentation/devicetree/bindings/phy/rockchip,rk3588-mipi-dcphy.yaml
-f:Documentation/devicetree/bindings/phy/rockchip-inno-csi-dphy.yaml
-f:Documentation/devicetree/bindings/phy/rockchip-mipi-dphy-rx0.yaml
-f:Documentation/devicetree/bindings/phy/rockchip-usb-phy.yaml
-f:Documentation/devicetree/bindings/phy/samsung,dp-video-phy.yaml
-f:Documentation/devicetree/bindings/phy/samsung,exynos-hdmi-phy.yaml
-f:Documentation/devicetree/bindings/phy/samsung,exynos-pcie-phy.yaml
-f:Documentation/devicetree/bindings/phy/samsung,exynos2200-eusb2-phy.yaml
-f:Documentation/devicetree/bindings/phy/samsung,exynos5250-sata-phy.yaml
-f:Documentation/devicetree/bindings/phy/samsung,mipi-video-phy.yaml
-f:Documentation/devicetree/bindings/phy/samsung,ufs-phy.yaml
-f:Documentation/devicetree/bindings/phy/samsung,usb2-phy.yaml
-f:Documentation/devicetree/bindings/phy/samsung,usb3-drd-phy.yaml
-f:Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml
-f:Documentation/devicetree/bindings/phy/socionext,uniphier-pcie-phy.yaml
-f:Documentation/devicetree/bindings/phy/socionext,uniphier-usb2-phy.yaml
-f:Documentation/devicetree/bindings/phy/socionext,uniphier-usb3hs-phy.yaml
-f:Documentation/devicetree/bindings/phy/socionext,uniphier-usb3ss-phy.yaml
-f:Documentation/devicetree/bindings/phy/st,stih407-usb2-phy.yaml
-f:Documentation/devicetree/bindings/phy/st,stm32mp25-combophy.yaml
-f:Documentation/devicetree/bindings/phy/st-spear-miphy.txt
-f:Documentation/devicetree/bindings/phy/starfive,jh7110-dphy-rx.yaml
-f:Documentation/devicetree/bindings/phy/starfive,jh7110-dphy-tx.yaml
-f:Documentation/devicetree/bindings/phy/starfive,jh7110-pcie-phy.yaml
-f:Documentation/devicetree/bindings/phy/starfive,jh7110-usb-phy.yaml
-f:Documentation/devicetree/bindings/phy/sunplus,sp7021-usb2-phy.yaml
-f:Documentation/devicetree/bindings/phy/ti,omap-usb2.yaml
-f:Documentation/devicetree/bindings/phy/ti,phy-am654-serdes.yaml
-f:Documentation/devicetree/bindings/phy/ti,phy-gmii-sel.yaml
-f:Documentation/devicetree/bindings/phy/ti,phy-j721e-wiz.yaml
-f:Documentation/devicetree/bindings/phy/ti,tcan104x-can.yaml
-f:Documentation/devicetree/bindings/phy/ti-phy.txt
-f:Documentation/devicetree/bindings/phy/transmit-amplitude.yaml
-f:Documentation/devicetree/bindings/phy/xlnx,zynqmp-psgtr.yaml
-f:Documentation/devicetree/bindings/pinctrl/abilis,tb10x-iomux.txt
-f:Documentation/devicetree/bindings/pinctrl/actions,s500-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/actions,s700-pinctrl.txt
-f:Documentation/devicetree/bindings/pinctrl/actions,s900-pinctrl.txt
-f:Documentation/devicetree/bindings/pinctrl/airoha,en7581-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/allwinner,sun4i-a10-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/allwinner,sun55i-a523-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl-a1.yaml
-f:Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl-common.yaml
-f:Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl-g12a-aobus.yaml
-f:Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl-g12a-periphs.yaml
-f:Documentation/devicetree/bindings/pinctrl/amlogic,meson8-pinctrl-aobus.yaml
-f:Documentation/devicetree/bindings/pinctrl/amlogic,meson8-pinctrl-cbus.yaml
-f:Documentation/devicetree/bindings/pinctrl/amlogic,pinctrl-a4.yaml
-f:Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/aspeed,ast2600-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/atmel,at91-pio4-pinctrl.txt
-f:Documentation/devicetree/bindings/pinctrl/atmel,at91rm9200-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/awinic,aw9523-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/axis,artpec6-pinctrl.txt
-f:Documentation/devicetree/bindings/pinctrl/berlin,pinctrl.txt
-f:Documentation/devicetree/bindings/pinctrl/bitmain,bm1880-pinctrl.txt
-f:Documentation/devicetree/bindings/pinctrl/brcm,bcm11351-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/brcm,bcm21664-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/brcm,bcm2835-gpio.txt
-f:Documentation/devicetree/bindings/pinctrl/brcm,bcm4908-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/brcm,bcm6318-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/brcm,bcm63268-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/brcm,bcm6328-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/brcm,bcm6358-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/brcm,bcm6362-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/brcm,bcm6368-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/brcm,cygnus-pinmux.txt
-f:Documentation/devicetree/bindings/pinctrl/brcm,iproc-gpio.txt
-f:Documentation/devicetree/bindings/pinctrl/brcm,ns-pinmux.yaml
-f:Documentation/devicetree/bindings/pinctrl/brcm,ns2-pinmux.txt
-f:Documentation/devicetree/bindings/pinctrl/brcm,nsp-gpio.txt
-f:Documentation/devicetree/bindings/pinctrl/brcm,nsp-pinmux.txt
-f:Documentation/devicetree/bindings/pinctrl/canaan,k210-fpioa.yaml
-f:Documentation/devicetree/bindings/pinctrl/canaan,k230-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/cirrus,lochnagar.yaml
-f:Documentation/devicetree/bindings/pinctrl/cirrus,madera.yaml
-f:Documentation/devicetree/bindings/pinctrl/cnxt,cx92755-pinctrl.txt
-f:Documentation/devicetree/bindings/pinctrl/cortina,gemini-pinctrl.txt
-f:Documentation/devicetree/bindings/pinctrl/cypress,cy8c95x0.yaml
-f:Documentation/devicetree/bindings/pinctrl/fsl,imx-pinctrl.txt
-f:Documentation/devicetree/bindings/pinctrl/fsl,imx25-pinctrl.txt
-f:Documentation/devicetree/bindings/pinctrl/fsl,imx27-pinctrl.txt
-f:Documentation/devicetree/bindings/pinctrl/fsl,imx35-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/fsl,imx7d-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/fsl,imx7ulp-iomuxc1.yaml
-f:Documentation/devicetree/bindings/pinctrl/fsl,imx8m-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/fsl,imx8ulp-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/fsl,imx9-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/fsl,imxrt1050.yaml
-f:Documentation/devicetree/bindings/pinctrl/fsl,imxrt1170.yaml
-f:Documentation/devicetree/bindings/pinctrl/fsl,mxs-pinctrl.txt
-f:Documentation/devicetree/bindings/pinctrl/fsl,scu-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/fsl,vf610-iomuxc.yaml
-f:Documentation/devicetree/bindings/pinctrl/img,pistachio-pinctrl.txt
-f:Documentation/devicetree/bindings/pinctrl/ingenic,pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/intel,lgm-io.yaml
-f:Documentation/devicetree/bindings/pinctrl/intel,pinctrl-keembay.yaml
-f:Documentation/devicetree/bindings/pinctrl/lantiq,pinctrl-falcon.txt
-f:Documentation/devicetree/bindings/pinctrl/lantiq,pinctrl-xway.txt
-f:Documentation/devicetree/bindings/pinctrl/loongson,ls2k-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/marvell,ac5-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt
-f:Documentation/devicetree/bindings/pinctrl/marvell,armada-375-pinctrl.txt
-f:Documentation/devicetree/bindings/pinctrl/marvell,armada-37xx-pinctrl.txt
-f:Documentation/devicetree/bindings/pinctrl/marvell,armada-38x-pinctrl.txt
-f:Documentation/devicetree/bindings/pinctrl/marvell,armada-39x-pinctrl.txt
-f:Documentation/devicetree/bindings/pinctrl/marvell,armada-98dx3236-pinctrl.txt
-f:Documentation/devicetree/bindings/pinctrl/marvell,armada-xp-pinctrl.txt
-f:Documentation/devicetree/bindings/pinctrl/marvell,dove-pinctrl.txt
-f:Documentation/devicetree/bindings/pinctrl/marvell,kirkwood-pinctrl.txt
-f:Documentation/devicetree/bindings/pinctrl/marvell,mvebu-pinctrl.txt
-f:Documentation/devicetree/bindings/pinctrl/marvell,orion-pinctrl.txt
-f:Documentation/devicetree/bindings/pinctrl/mediatek,mt65xx-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/mediatek,mt6779-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/mediatek,mt6795-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/mediatek,mt6893-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/mediatek,mt7620-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/mediatek,mt7621-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/mediatek,mt7622-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/mediatek,mt76x8-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/mediatek,mt7981-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/mediatek,mt7986-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/mediatek,mt7988-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/mediatek,mt8183-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/mediatek,mt8186-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/mediatek,mt8188-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/mediatek,mt8192-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/mediatek,mt8195-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/mediatek,mt8196-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/mediatek,mt8365-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/microchip,mcp23s08.yaml
-f:Documentation/devicetree/bindings/pinctrl/microchip,pic32-pinctrl.txt
-f:Documentation/devicetree/bindings/pinctrl/microchip,sparx5-sgpio.yaml
-f:Documentation/devicetree/bindings/pinctrl/mscc,ocelot-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/nuvoton,ma35d1-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/nuvoton,npcm7xx-pinctrl.txt
-f:Documentation/devicetree/bindings/pinctrl/nuvoton,npcm845-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/nuvoton,wpcm450-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/nvidia,tegra-pinmux-common.yaml
-f:Documentation/devicetree/bindings/pinctrl/nvidia,tegra114-pinmux.yaml
-f:Documentation/devicetree/bindings/pinctrl/nvidia,tegra124-pinmux.yaml
-f:Documentation/devicetree/bindings/pinctrl/nvidia,tegra124-xusb-padctl.txt
-f:Documentation/devicetree/bindings/pinctrl/nvidia,tegra194-pinmux.yaml
-f:Documentation/devicetree/bindings/pinctrl/nvidia,tegra20-pinmux.yaml
-f:Documentation/devicetree/bindings/pinctrl/nvidia,tegra210-pinmux.yaml
-f:Documentation/devicetree/bindings/pinctrl/nvidia,tegra234-pinmux-aon.yaml
-f:Documentation/devicetree/bindings/pinctrl/nvidia,tegra234-pinmux-common.yaml
-f:Documentation/devicetree/bindings/pinctrl/nvidia,tegra234-pinmux.yaml
-f:Documentation/devicetree/bindings/pinctrl/nvidia,tegra30-pinmux.yaml
-f:Documentation/devicetree/bindings/pinctrl/nxp,lpc1850-scu.txt
-f:Documentation/devicetree/bindings/pinctrl/nxp,s32g2-siul2-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/pincfg-node.yaml
-f:Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt
-f:Documentation/devicetree/bindings/pinctrl/pinctrl-max77620.txt
-f:Documentation/devicetree/bindings/pinctrl/pinctrl-palmas.txt
-f:Documentation/devicetree/bindings/pinctrl/pinctrl-rk805.txt
-f:Documentation/devicetree/bindings/pinctrl/pinctrl-single.yaml
-f:Documentation/devicetree/bindings/pinctrl/pinctrl-sirf.txt
-f:Documentation/devicetree/bindings/pinctrl/pinctrl-st.txt
-f:Documentation/devicetree/bindings/pinctrl/pinctrl-vt8500.txt
-f:Documentation/devicetree/bindings/pinctrl/pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/pinctrl_spear.txt
-f:Documentation/devicetree/bindings/pinctrl/pinmux-node.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,apq8064-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,apq8084-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,ipq4019-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,ipq5018-tlmm.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,ipq5332-tlmm.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,ipq5424-tlmm.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,ipq6018-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,ipq8064-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,ipq8074-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,ipq9574-tlmm.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,lpass-lpi-common.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,mdm9607-tlmm.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,mdm9615-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,msm8226-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,msm8660-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,msm8909-tlmm.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,msm8916-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,msm8917-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,msm8953-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,msm8960-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,msm8974-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,msm8976-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,msm8994-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,msm8996-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,msm8998-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,pmic-gpio.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,pmic-mpp.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,qcm2290-tlmm.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,qcs404-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,qcs615-tlmm.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,qcs8300-tlmm.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,qdu1000-tlmm.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,sa8775p-tlmm.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,sar2130p-tlmm.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,sc7180-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,sc7280-lpass-lpi-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,sc7280-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,sc8180x-tlmm.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,sc8280xp-lpass-lpi-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,sc8280xp-tlmm.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,sdm630-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,sdm670-tlmm.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,sdm845-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,sdx55-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,sdx65-tlmm.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,sdx75-tlmm.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,sm4250-lpass-lpi-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,sm4450-tlmm.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,sm6115-lpass-lpi-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,sm6115-tlmm.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,sm6125-tlmm.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,sm6350-tlmm.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,sm6375-tlmm.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,sm7150-tlmm.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,sm8150-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,sm8250-lpass-lpi-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,sm8250-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,sm8350-lpass-lpi-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,sm8350-tlmm.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,sm8450-lpass-lpi-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,sm8450-tlmm.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,sm8550-lpass-lpi-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,sm8550-tlmm.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,sm8650-lpass-lpi-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,sm8650-tlmm.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,sm8750-tlmm.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,tlmm-common.yaml
-f:Documentation/devicetree/bindings/pinctrl/qcom,x1e80100-tlmm.yaml
-f:Documentation/devicetree/bindings/pinctrl/ralink,rt2880-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/ralink,rt305x-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/ralink,rt3352-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/ralink,rt3883-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/ralink,rt5350-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/raspberrypi,rp1-gpio.yaml
-f:Documentation/devicetree/bindings/pinctrl/realtek,rtd1315e-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/realtek,rtd1319d-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/realtek,rtd1619b-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/renesas,pfc.yaml
-f:Documentation/devicetree/bindings/pinctrl/renesas,rza1-ports.yaml
-f:Documentation/devicetree/bindings/pinctrl/renesas,rza2-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/renesas,rzg2l-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/renesas,rzg2l-poeg.yaml
-f:Documentation/devicetree/bindings/pinctrl/renesas,rzn1-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/renesas,rzv2m-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/samsung,pinctrl-gpio-bank.yaml
-f:Documentation/devicetree/bindings/pinctrl/samsung,pinctrl-pins-cfg.yaml
-f:Documentation/devicetree/bindings/pinctrl/samsung,pinctrl-wakeup-interrupt.yaml
-f:Documentation/devicetree/bindings/pinctrl/samsung,pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/semtech,sx1501q.yaml
-f:Documentation/devicetree/bindings/pinctrl/socionext,uniphier-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/sophgo,cv1800-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/sophgo,sg2042-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/spacemit,k1-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/sprd,pinctrl.txt
-f:Documentation/devicetree/bindings/pinctrl/sprd,sc9860-pinctrl.txt
-f:Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/starfive,jh7100-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/starfive,jh7110-aon-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/starfive,jh7110-sys-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/ste,abx500.txt
-f:Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt
-f:Documentation/devicetree/bindings/pinctrl/sunplus,sp7021-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/thead,th1520-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/ti,da850-pupd.txt
-f:Documentation/devicetree/bindings/pinctrl/ti,iodelay.txt
-f:Documentation/devicetree/bindings/pinctrl/toshiba,visconti-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/xlnx,pinctrl-zynq.yaml
-f:Documentation/devicetree/bindings/pinctrl/xlnx,versal-pinctrl.yaml
-f:Documentation/devicetree/bindings/pinctrl/xlnx,zynqmp-pinctrl.yaml
-f:Documentation/devicetree/bindings/platform/acer,aspire1-ec.yaml
-f:Documentation/devicetree/bindings/platform/huawei,gaokun-ec.yaml
-f:Documentation/devicetree/bindings/platform/lenovo,yoga-c630-ec.yaml
-f:Documentation/devicetree/bindings/platform/microsoft,surface-sam.yaml
-f:Documentation/devicetree/bindings/pmem/pmem-region.yaml
-f:Documentation/devicetree/bindings/power/actions,owl-sps.txt
-f:Documentation/devicetree/bindings/power/allwinner,sun20i-d1-ppu.yaml
-f:Documentation/devicetree/bindings/power/allwinner,sun50i-h6-prcm-ppu.yaml
-f:Documentation/devicetree/bindings/power/amlogic,meson-ee-pwrc.yaml
-f:Documentation/devicetree/bindings/power/amlogic,meson-gx-pwrc.txt
-f:Documentation/devicetree/bindings/power/amlogic,meson-sec-pwrc.yaml
-f:Documentation/devicetree/bindings/power/apple,pmgr-pwrstate.yaml
-f:Documentation/devicetree/bindings/power/avs/qcom,cpr.yaml
-f:Documentation/devicetree/bindings/power/brcm,bcm-pmb.yaml
-f:Documentation/devicetree/bindings/power/brcm,bcm63xx-power.yaml
-f:Documentation/devicetree/bindings/power/domain-idle-state.yaml
-f:Documentation/devicetree/bindings/power/fsl,imx-gpc.yaml
-f:Documentation/devicetree/bindings/power/fsl,imx-gpcv2.yaml
-f:Documentation/devicetree/bindings/power/fsl,scu-pd.yaml
-f:Documentation/devicetree/bindings/power/mediatek,power-controller.yaml
-f:Documentation/devicetree/bindings/power/mti,mips-cpc.yaml
-f:Documentation/devicetree/bindings/power/pd-samsung.yaml
-f:Documentation/devicetree/bindings/power/power-controller.txt
-f:Documentation/devicetree/bindings/power/power-domain.yaml
-f:Documentation/devicetree/bindings/power/power_domain.txt
-f:Documentation/devicetree/bindings/power/qcom,kpss-acc-v2.yaml
-f:Documentation/devicetree/bindings/power/qcom,rpmpd.yaml
-f:Documentation/devicetree/bindings/power/raspberrypi,bcm2835-power.yaml
-f:Documentation/devicetree/bindings/power/renesas,apmu.yaml
-f:Documentation/devicetree/bindings/power/renesas,rcar-sysc.yaml
-f:Documentation/devicetree/bindings/power/renesas,sysc-rmobile.yaml
-f:Documentation/devicetree/bindings/power/reset/apple,smc-reboot.yaml
-f:Documentation/devicetree/bindings/power/reset/atmel,at91sam9260-shdwc.yaml
-f:Documentation/devicetree/bindings/power/reset/atmel,sama5d2-shdwc.yaml
-f:Documentation/devicetree/bindings/power/reset/axxia-reset.txt
-f:Documentation/devicetree/bindings/power/reset/brcm,bcm21664-resetmgr.yaml
-f:Documentation/devicetree/bindings/power/reset/gemini-poweroff.txt
-f:Documentation/devicetree/bindings/power/reset/gpio-poweroff.yaml
-f:Documentation/devicetree/bindings/power/reset/gpio-restart.yaml
-f:Documentation/devicetree/bindings/power/reset/keystone-reset.txt
-f:Documentation/devicetree/bindings/power/reset/ltc2952-poweroff.txt
-f:Documentation/devicetree/bindings/power/reset/nvmem-reboot-mode.yaml
-f:Documentation/devicetree/bindings/power/reset/ocelot-reset.txt
-f:Documentation/devicetree/bindings/power/reset/qcom,pon.yaml
-f:Documentation/devicetree/bindings/power/reset/qcom,pshold.yaml
-f:Documentation/devicetree/bindings/power/reset/qnap-poweroff.txt
-f:Documentation/devicetree/bindings/power/reset/reboot-mode.yaml
-f:Documentation/devicetree/bindings/power/reset/regulator-poweroff.yaml
-f:Documentation/devicetree/bindings/power/reset/restart-handler.yaml
-f:Documentation/devicetree/bindings/power/reset/restart-poweroff.txt
-f:Documentation/devicetree/bindings/power/reset/st-reset.txt
-f:Documentation/devicetree/bindings/power/reset/syscon-poweroff.yaml
-f:Documentation/devicetree/bindings/power/reset/syscon-reboot-mode.yaml
-f:Documentation/devicetree/bindings/power/reset/syscon-reboot.yaml
-f:Documentation/devicetree/bindings/power/reset/toradex,smarc-ec.yaml
-f:Documentation/devicetree/bindings/power/reset/xlnx,zynqmp-power.yaml
-f:Documentation/devicetree/bindings/power/rockchip,power-controller.yaml
-f:Documentation/devicetree/bindings/power/rockchip-io-domain.yaml
-f:Documentation/devicetree/bindings/power/starfive,jh7110-pmu.yaml
-f:Documentation/devicetree/bindings/power/supply/active-semi,act8945a-charger.yaml
-f:Documentation/devicetree/bindings/power/supply/adc-battery.yaml
-f:Documentation/devicetree/bindings/power/supply/battery.yaml
-f:Documentation/devicetree/bindings/power/supply/bq2415x.yaml
-f:Documentation/devicetree/bindings/power/supply/bq24190.yaml
-f:Documentation/devicetree/bindings/power/supply/bq24257.yaml
-f:Documentation/devicetree/bindings/power/supply/bq24735.yaml
-f:Documentation/devicetree/bindings/power/supply/bq2515x.yaml
-f:Documentation/devicetree/bindings/power/supply/bq256xx.yaml
-f:Documentation/devicetree/bindings/power/supply/bq25890.yaml
-f:Documentation/devicetree/bindings/power/supply/bq25980.yaml
-f:Documentation/devicetree/bindings/power/supply/bq27xxx.yaml
-f:Documentation/devicetree/bindings/power/supply/charger-manager.yaml
-f:Documentation/devicetree/bindings/power/supply/cpcap-battery.yaml
-f:Documentation/devicetree/bindings/power/supply/cpcap-charger.yaml
-f:Documentation/devicetree/bindings/power/supply/cw2015_battery.yaml
-f:Documentation/devicetree/bindings/power/supply/dlg,da9150-charger.yaml
-f:Documentation/devicetree/bindings/power/supply/dlg,da9150-fuel-gauge.yaml
-f:Documentation/devicetree/bindings/power/supply/gpio-charger.yaml
-f:Documentation/devicetree/bindings/power/supply/ingenic,battery.yaml
-f:Documentation/devicetree/bindings/power/supply/isp1704.yaml
-f:Documentation/devicetree/bindings/power/supply/lego,ev3-battery.yaml
-f:Documentation/devicetree/bindings/power/supply/lltc,lt3651-charger.yaml
-f:Documentation/devicetree/bindings/power/supply/lltc,ltc294x.yaml
-f:Documentation/devicetree/bindings/power/supply/ltc4162-l.yaml
-f:Documentation/devicetree/bindings/power/supply/max77650-charger.yaml
-f:Documentation/devicetree/bindings/power/supply/maxim,ds2760.yaml
-f:Documentation/devicetree/bindings/power/supply/maxim,max14577.yaml
-f:Documentation/devicetree/bindings/power/supply/maxim,max14656.yaml
-f:Documentation/devicetree/bindings/power/supply/maxim,max17040.yaml
-f:Documentation/devicetree/bindings/power/supply/maxim,max17042.yaml
-f:Documentation/devicetree/bindings/power/supply/maxim,max17201.yaml
-f:Documentation/devicetree/bindings/power/supply/maxim,max77693.yaml
-f:Documentation/devicetree/bindings/power/supply/maxim,max77705.yaml
-f:Documentation/devicetree/bindings/power/supply/maxim,max77976.yaml
-f:Documentation/devicetree/bindings/power/supply/maxim,max8903.yaml
-f:Documentation/devicetree/bindings/power/supply/maxim,max8971.yaml
-f:Documentation/devicetree/bindings/power/supply/mediatek,mt6370-charger.yaml
-f:Documentation/devicetree/bindings/power/supply/microchip,ucs1002.yaml
-f:Documentation/devicetree/bindings/power/supply/mitsumi,mm8013.yaml
-f:Documentation/devicetree/bindings/power/supply/mt6360_charger.yaml
-f:Documentation/devicetree/bindings/power/supply/nokia,n900-battery.yaml
-f:Documentation/devicetree/bindings/power/supply/olpc-battery.yaml
-f:Documentation/devicetree/bindings/power/supply/pegatron,chagall-ec.yaml
-f:Documentation/devicetree/bindings/power/supply/power-supply.yaml
-f:Documentation/devicetree/bindings/power/supply/qcom,pm8916-bms-vm.yaml
-f:Documentation/devicetree/bindings/power/supply/qcom,pm8916-lbc.yaml
-f:Documentation/devicetree/bindings/power/supply/qcom,pm8941-charger.yaml
-f:Documentation/devicetree/bindings/power/supply/qcom,pm8941-coincell.yaml
-f:Documentation/devicetree/bindings/power/supply/qcom,pmi8998-charger.yaml
-f:Documentation/devicetree/bindings/power/supply/richtek,rt5033-battery.yaml
-f:Documentation/devicetree/bindings/power/supply/richtek,rt5033-charger.yaml
-f:Documentation/devicetree/bindings/power/supply/richtek,rt9455.yaml
-f:Documentation/devicetree/bindings/power/supply/richtek,rt9467.yaml
-f:Documentation/devicetree/bindings/power/supply/richtek,rt9471.yaml
-f:Documentation/devicetree/bindings/power/supply/rohm,bd99954.yaml
-f:Documentation/devicetree/bindings/power/supply/samsung,battery.yaml
-f:Documentation/devicetree/bindings/power/supply/sbs,sbs-battery.yaml
-f:Documentation/devicetree/bindings/power/supply/sbs,sbs-charger.yaml
-f:Documentation/devicetree/bindings/power/supply/sbs,sbs-manager.yaml
-f:Documentation/devicetree/bindings/power/supply/sc2731-charger.yaml
-f:Documentation/devicetree/bindings/power/supply/sc27xx-fg.yaml
-f:Documentation/devicetree/bindings/power/supply/st,stc3117.yaml
-f:Documentation/devicetree/bindings/power/supply/stericsson,ab8500-btemp.yaml
-f:Documentation/devicetree/bindings/power/supply/stericsson,ab8500-chargalg.yaml
-f:Documentation/devicetree/bindings/power/supply/stericsson,ab8500-charger.yaml
-f:Documentation/devicetree/bindings/power/supply/stericsson,ab8500-fg.yaml
-f:Documentation/devicetree/bindings/power/supply/summit,smb347-charger.yaml
-f:Documentation/devicetree/bindings/power/supply/ti,lp8727.yaml
-f:Documentation/devicetree/bindings/power/supply/ti,twl6030-charger.yaml
-f:Documentation/devicetree/bindings/power/supply/tps65090-charger.yaml
-f:Documentation/devicetree/bindings/power/supply/tps65217-charger.yaml
-f:Documentation/devicetree/bindings/power/supply/twl4030-charger.yaml
-f:Documentation/devicetree/bindings/power/supply/x-powers,axp20x-ac-power-supply.yaml
-f:Documentation/devicetree/bindings/power/supply/x-powers,axp20x-battery-power-supply.yaml
-f:Documentation/devicetree/bindings/power/supply/x-powers,axp20x-usb-power-supply.yaml
-f:Documentation/devicetree/bindings/power/ti-smartreflex.txt
-f:Documentation/devicetree/bindings/power/wakeup-source.txt
-f:Documentation/devicetree/bindings/powerpc/4xx/akebono.txt
-f:Documentation/devicetree/bindings/powerpc/4xx/cpm.txt
-f:Documentation/devicetree/bindings/powerpc/4xx/hsta.txt
-f:Documentation/devicetree/bindings/powerpc/4xx/ppc440spe-adma.txt
-f:Documentation/devicetree/bindings/powerpc/4xx/reboot.txt
-f:Documentation/devicetree/bindings/powerpc/fsl/ccf.txt
-f:Documentation/devicetree/bindings/powerpc/fsl/cpus.txt
-f:Documentation/devicetree/bindings/powerpc/fsl/dcsr.txt
-f:Documentation/devicetree/bindings/powerpc/fsl/diu.txt
-f:Documentation/devicetree/bindings/powerpc/fsl/ecm.txt
-f:Documentation/devicetree/bindings/powerpc/fsl/interlaken-lac.txt
-f:Documentation/devicetree/bindings/powerpc/fsl/lbc.txt
-f:Documentation/devicetree/bindings/powerpc/fsl/mcm.txt
-f:Documentation/devicetree/bindings/powerpc/fsl/mpc5121-psc.txt
-f:Documentation/devicetree/bindings/powerpc/fsl/mpc512x_lpbfifo.txt
-f:Documentation/devicetree/bindings/powerpc/fsl/mpc5200.txt
-f:Documentation/devicetree/bindings/powerpc/fsl/mpic-msgr.txt
-f:Documentation/devicetree/bindings/powerpc/fsl/mpic-timer.txt
-f:Documentation/devicetree/bindings/powerpc/fsl/mpic.txt
-f:Documentation/devicetree/bindings/powerpc/fsl/pamu.txt
-f:Documentation/devicetree/bindings/powerpc/fsl/pmc.yaml
-f:Documentation/devicetree/bindings/powerpc/fsl/raideng.txt
-f:Documentation/devicetree/bindings/powerpc/fsl/scfg.txt
-f:Documentation/devicetree/bindings/powerpc/fsl/srio-rmu.txt
-f:Documentation/devicetree/bindings/powerpc/fsl/srio.txt
-f:Documentation/devicetree/bindings/powerpc/ibm,powerpc-cpu-features.txt
-f:Documentation/devicetree/bindings/powerpc/ibm,vas.txt
-f:Documentation/devicetree/bindings/powerpc/nintendo/gamecube.txt
-f:Documentation/devicetree/bindings/powerpc/nintendo/wii.txt
-f:Documentation/devicetree/bindings/powerpc/opal/oppanel-opal.txt
-f:Documentation/devicetree/bindings/powerpc/opal/power-mgt.txt
-f:Documentation/devicetree/bindings/powerpc/opal/sensor-groups.txt
-f:Documentation/devicetree/bindings/powerpc/sleep.yaml
-f:Documentation/devicetree/bindings/pps/pps-gpio.yaml
-f:Documentation/devicetree/bindings/ptp/brcm,ptp-dte.txt
-f:Documentation/devicetree/bindings/ptp/fsl,ptp.yaml
-f:Documentation/devicetree/bindings/ptp/ptp-idt82p33.yaml
-f:Documentation/devicetree/bindings/ptp/ptp-idtcm.yaml
-f:Documentation/devicetree/bindings/ptp/ptp-ines.txt
-f:Documentation/devicetree/bindings/ptp/timestamper.txt
-f:Documentation/devicetree/bindings/pwm/adi,axi-pwmgen.yaml
-f:Documentation/devicetree/bindings/pwm/airoha,en7581-pwm.yaml
-f:Documentation/devicetree/bindings/pwm/allwinner,sun4i-a10-pwm.yaml
-f:Documentation/devicetree/bindings/pwm/apple,s5l-fpwm.yaml
-f:Documentation/devicetree/bindings/pwm/argon40,fan-hat.yaml
-f:Documentation/devicetree/bindings/pwm/atmel,at91sam-pwm.yaml
-f:Documentation/devicetree/bindings/pwm/atmel,hlcdc-pwm.yaml
-f:Documentation/devicetree/bindings/pwm/brcm,bcm7038-pwm.yaml
-f:Documentation/devicetree/bindings/pwm/brcm,iproc-pwm.yaml
-f:Documentation/devicetree/bindings/pwm/brcm,kona-pwm.yaml
-f:Documentation/devicetree/bindings/pwm/cirrus,clps711x-pwm.txt
-f:Documentation/devicetree/bindings/pwm/cirrus,ep9301-pwm.yaml
-f:Documentation/devicetree/bindings/pwm/clk-pwm.yaml
-f:Documentation/devicetree/bindings/pwm/fsl,vf610-ftm-pwm.yaml
-f:Documentation/devicetree/bindings/pwm/google,cros-ec-pwm.yaml
-f:Documentation/devicetree/bindings/pwm/img-pwm.txt
-f:Documentation/devicetree/bindings/pwm/imx-pwm.yaml
-f:Documentation/devicetree/bindings/pwm/imx-tpm-pwm.yaml
-f:Documentation/devicetree/bindings/pwm/intel,keembay-pwm.yaml
-f:Documentation/devicetree/bindings/pwm/intel,lgm-pwm.yaml
-f:Documentation/devicetree/bindings/pwm/iqs620a-pwm.yaml
-f:Documentation/devicetree/bindings/pwm/kontron,sl28cpld-pwm.yaml
-f:Documentation/devicetree/bindings/pwm/loongson,ls7a-pwm.yaml
-f:Documentation/devicetree/bindings/pwm/marvell,berlin-pwm.yaml
-f:Documentation/devicetree/bindings/pwm/marvell,pxa-pwm.yaml
-f:Documentation/devicetree/bindings/pwm/mediatek,mt2712-pwm.yaml
-f:Documentation/devicetree/bindings/pwm/mediatek,pwm-disp.yaml
-f:Documentation/devicetree/bindings/pwm/microchip,corepwm.yaml
-f:Documentation/devicetree/bindings/pwm/mxs-pwm.yaml
-f:Documentation/devicetree/bindings/pwm/nvidia,tegra20-pwm.yaml
-f:Documentation/devicetree/bindings/pwm/nxp,lpc1850-sct-pwm.yaml
-f:Documentation/devicetree/bindings/pwm/nxp,lpc3220-pwm.yaml
-f:Documentation/devicetree/bindings/pwm/nxp,mc33xs2410.yaml
-f:Documentation/devicetree/bindings/pwm/nxp,pca9685-pwm.txt
-f:Documentation/devicetree/bindings/pwm/opencores,pwm.yaml
-f:Documentation/devicetree/bindings/pwm/pwm-amlogic.yaml
-f:Documentation/devicetree/bindings/pwm/pwm-bcm2835.yaml
-f:Documentation/devicetree/bindings/pwm/pwm-gpio.yaml
-f:Documentation/devicetree/bindings/pwm/pwm-hibvt.txt
-f:Documentation/devicetree/bindings/pwm/pwm-lp3943.txt
-f:Documentation/devicetree/bindings/pwm/pwm-nexus-node.yaml
-f:Documentation/devicetree/bindings/pwm/pwm-rockchip.yaml
-f:Documentation/devicetree/bindings/pwm/pwm-samsung.yaml
-f:Documentation/devicetree/bindings/pwm/pwm-sifive.yaml
-f:Documentation/devicetree/bindings/pwm/pwm-st.txt
-f:Documentation/devicetree/bindings/pwm/pwm-tiecap.yaml
-f:Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.yaml
-f:Documentation/devicetree/bindings/pwm/pwm-tipwmss.txt
-f:Documentation/devicetree/bindings/pwm/pwm.txt
-f:Documentation/devicetree/bindings/pwm/pwm.yaml
-f:Documentation/devicetree/bindings/pwm/renesas,pwm-rcar.yaml
-f:Documentation/devicetree/bindings/pwm/renesas,rzg2l-gpt.yaml
-f:Documentation/devicetree/bindings/pwm/renesas,tpu-pwm.yaml
-f:Documentation/devicetree/bindings/pwm/snps,dw-apb-timers-pwm2.yaml
-f:Documentation/devicetree/bindings/pwm/sophgo,sg2042-pwm.yaml
-f:Documentation/devicetree/bindings/pwm/spear-pwm.txt
-f:Documentation/devicetree/bindings/pwm/sprd,ums512-pwm.yaml
-f:Documentation/devicetree/bindings/pwm/st,stmpe-pwm.txt
-f:Documentation/devicetree/bindings/pwm/sunplus,sp7021-pwm.yaml
-f:Documentation/devicetree/bindings/pwm/ti,omap-dmtimer-pwm.yaml
-f:Documentation/devicetree/bindings/pwm/ti,twl-pwm.txt
-f:Documentation/devicetree/bindings/pwm/ti,twl-pwmled.txt
-f:Documentation/devicetree/bindings/pwm/toshiba,pwm-visconti.yaml
-f:Documentation/devicetree/bindings/pwm/via,vt8500-pwm.yaml
-f:Documentation/devicetree/bindings/regmap/regmap.txt
-f:Documentation/devicetree/bindings/regulator/88pg86x.txt
-f:Documentation/devicetree/bindings/regulator/88pm800.txt
-f:Documentation/devicetree/bindings/regulator/88pm860x.txt
-f:Documentation/devicetree/bindings/regulator/active-semi,act8600.yaml
-f:Documentation/devicetree/bindings/regulator/active-semi,act8846.yaml
-f:Documentation/devicetree/bindings/regulator/active-semi,act8865.yaml
-f:Documentation/devicetree/bindings/regulator/active-semi,act8945a.yaml
-f:Documentation/devicetree/bindings/regulator/adi,adp5055-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/adi,max77503-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/adi,max77541-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/adi,max77857.yaml
-f:Documentation/devicetree/bindings/regulator/allwinner,sun20i-d1-system-ldos.yaml
-f:Documentation/devicetree/bindings/regulator/anatop-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/as3722-regulator.txt
-f:Documentation/devicetree/bindings/regulator/awinic,aw37503.yaml
-f:Documentation/devicetree/bindings/regulator/brcm,bcm59054.yaml
-f:Documentation/devicetree/bindings/regulator/brcm,bcm59056.yaml
-f:Documentation/devicetree/bindings/regulator/cpcap-regulator.txt
-f:Documentation/devicetree/bindings/regulator/da9211.txt
-f:Documentation/devicetree/bindings/regulator/dlg,da9121.yaml
-f:Documentation/devicetree/bindings/regulator/dlg,da9210.yaml
-f:Documentation/devicetree/bindings/regulator/dlg,slg51000.yaml
-f:Documentation/devicetree/bindings/regulator/fcs,fan53555.yaml
-f:Documentation/devicetree/bindings/regulator/fixed-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/google,cros-ec-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/gpio-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/hisilicon,hi655x-regulator.txt
-f:Documentation/devicetree/bindings/regulator/infineon,ir38060.yaml
-f:Documentation/devicetree/bindings/regulator/isl9305.txt
-f:Documentation/devicetree/bindings/regulator/lltc,ltc3676.yaml
-f:Documentation/devicetree/bindings/regulator/lm363x-regulator.txt
-f:Documentation/devicetree/bindings/regulator/lp872x.txt
-f:Documentation/devicetree/bindings/regulator/ltc3589.txt
-f:Documentation/devicetree/bindings/regulator/max1586-regulator.txt
-f:Documentation/devicetree/bindings/regulator/max77650-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/max8660.yaml
-f:Documentation/devicetree/bindings/regulator/max8893.yaml
-f:Documentation/devicetree/bindings/regulator/max8907.txt
-f:Documentation/devicetree/bindings/regulator/max8925-regulator.txt
-f:Documentation/devicetree/bindings/regulator/maxim,max14577.yaml
-f:Documentation/devicetree/bindings/regulator/maxim,max20086.yaml
-f:Documentation/devicetree/bindings/regulator/maxim,max20411.yaml
-f:Documentation/devicetree/bindings/regulator/maxim,max77686.yaml
-f:Documentation/devicetree/bindings/regulator/maxim,max77693.yaml
-f:Documentation/devicetree/bindings/regulator/maxim,max77802.yaml
-f:Documentation/devicetree/bindings/regulator/maxim,max77826.yaml
-f:Documentation/devicetree/bindings/regulator/maxim,max77843.yaml
-f:Documentation/devicetree/bindings/regulator/maxim,max8952.yaml
-f:Documentation/devicetree/bindings/regulator/maxim,max8973.yaml
-f:Documentation/devicetree/bindings/regulator/maxim,max8997.yaml
-f:Documentation/devicetree/bindings/regulator/mediatek,mt6331-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/mediatek,mt6332-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/mediatek,mt6357-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/mediatek,mt6358-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/mediatek,mt6397-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/mediatek,mt6873-dvfsrc-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/microchip,mcp16502.yaml
-f:Documentation/devicetree/bindings/regulator/mp8859.txt
-f:Documentation/devicetree/bindings/regulator/mps,mp5416.yaml
-f:Documentation/devicetree/bindings/regulator/mps,mp886x.yaml
-f:Documentation/devicetree/bindings/regulator/mps,mpq2286.yaml
-f:Documentation/devicetree/bindings/regulator/mps,mpq7920.yaml
-f:Documentation/devicetree/bindings/regulator/mps,mpq7932.yaml
-f:Documentation/devicetree/bindings/regulator/mt6311-regulator.txt
-f:Documentation/devicetree/bindings/regulator/mt6315-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/mt6323-regulator.txt
-f:Documentation/devicetree/bindings/regulator/mt6359-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/mt6360-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/mt6380-regulator.txt
-f:Documentation/devicetree/bindings/regulator/nvidia,tegra-regulators-coupling.txt
-f:Documentation/devicetree/bindings/regulator/nxp,pca9450-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/nxp,pf8x00-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/onnn,fan53880.yaml
-f:Documentation/devicetree/bindings/regulator/palmas-pmic.txt
-f:Documentation/devicetree/bindings/regulator/pbias-regulator.txt
-f:Documentation/devicetree/bindings/regulator/pfuze100.yaml
-f:Documentation/devicetree/bindings/regulator/pv88060.txt
-f:Documentation/devicetree/bindings/regulator/pv88080.txt
-f:Documentation/devicetree/bindings/regulator/pv88090.txt
-f:Documentation/devicetree/bindings/regulator/pwm-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/qcom,qca6390-pmu.yaml
-f:Documentation/devicetree/bindings/regulator/qcom,rpm-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/qcom,sdm845-refgen-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/qcom,smd-rpm-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/qcom,usb-vbus-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/qcom-labibb-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/raspberrypi,7inch-touchscreen-panel-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/regulator-max77620.txt
-f:Documentation/devicetree/bindings/regulator/regulator-output.yaml
-f:Documentation/devicetree/bindings/regulator/regulator.txt
-f:Documentation/devicetree/bindings/regulator/regulator.yaml
-f:Documentation/devicetree/bindings/regulator/renesas,raa215300.yaml
-f:Documentation/devicetree/bindings/regulator/richtek,rt4801-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/richtek,rt4803.yaml
-f:Documentation/devicetree/bindings/regulator/richtek,rt4831-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/richtek,rt5190a-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/richtek,rt5739.yaml
-f:Documentation/devicetree/bindings/regulator/richtek,rt5759-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/richtek,rt6160-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/richtek,rt6190.yaml
-f:Documentation/devicetree/bindings/regulator/richtek,rt6245-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/richtek,rtmv20-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/richtek,rtq2134-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/richtek,rtq2208.yaml
-f:Documentation/devicetree/bindings/regulator/richtek,rtq6752-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/rohm,bd71815-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/rohm,bd71828-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/rohm,bd71837-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/rohm,bd71847-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/rohm,bd9576-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/rohm,bd96801-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/rohm,bd96802-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/samsung,s2mpa01.yaml
-f:Documentation/devicetree/bindings/regulator/samsung,s2mps11.yaml
-f:Documentation/devicetree/bindings/regulator/samsung,s2mps13.yaml
-f:Documentation/devicetree/bindings/regulator/samsung,s2mps14.yaml
-f:Documentation/devicetree/bindings/regulator/samsung,s2mps15.yaml
-f:Documentation/devicetree/bindings/regulator/samsung,s2mpu02.yaml
-f:Documentation/devicetree/bindings/regulator/samsung,s2mpu05.yaml
-f:Documentation/devicetree/bindings/regulator/samsung,s5m8767.yaml
-f:Documentation/devicetree/bindings/regulator/silergy,sy8106a.yaml
-f:Documentation/devicetree/bindings/regulator/silergy,sy8824x.yaml
-f:Documentation/devicetree/bindings/regulator/silergy,sy8827n.yaml
-f:Documentation/devicetree/bindings/regulator/siliconmitus,sm5703-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/sky81452-regulator.txt
-f:Documentation/devicetree/bindings/regulator/socionext,uniphier-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/sprd,sc2731-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/st,stm32-booster.yaml
-f:Documentation/devicetree/bindings/regulator/st,stm32-vrefbuf.yaml
-f:Documentation/devicetree/bindings/regulator/st,stm32mp1-pwr-reg.yaml
-f:Documentation/devicetree/bindings/regulator/ti,tps62360.yaml
-f:Documentation/devicetree/bindings/regulator/ti,tps62864.yaml
-f:Documentation/devicetree/bindings/regulator/ti,tps62870.yaml
-f:Documentation/devicetree/bindings/regulator/ti,tps65132.yaml
-f:Documentation/devicetree/bindings/regulator/ti,tps65219.yaml
-f:Documentation/devicetree/bindings/regulator/ti-abb-regulator.txt
-f:Documentation/devicetree/bindings/regulator/tps51632-regulator.txt
-f:Documentation/devicetree/bindings/regulator/tps65023.txt
-f:Documentation/devicetree/bindings/regulator/tps65090.txt
-f:Documentation/devicetree/bindings/regulator/tps65217.txt
-f:Documentation/devicetree/bindings/regulator/tps65218.txt
-f:Documentation/devicetree/bindings/regulator/tps6586x.txt
-f:Documentation/devicetree/bindings/regulator/vctrl-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/vexpress.txt
-f:Documentation/devicetree/bindings/regulator/vqmmc-ipq4019-regulator.yaml
-f:Documentation/devicetree/bindings/regulator/wlf,arizona.yaml
-f:Documentation/devicetree/bindings/remoteproc/amlogic,meson-mx-ao-arc.yaml
-f:Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml
-f:Documentation/devicetree/bindings/remoteproc/ingenic,vpu.yaml
-f:Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml
-f:Documentation/devicetree/bindings/remoteproc/qcom,adsp.yaml
-f:Documentation/devicetree/bindings/remoteproc/qcom,glink-edge.yaml
-f:Documentation/devicetree/bindings/remoteproc/qcom,glink-rpm-edge.yaml
-f:Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml
-f:Documentation/devicetree/bindings/remoteproc/qcom,msm8996-mss-pil.yaml
-f:Documentation/devicetree/bindings/remoteproc/qcom,pas-common.yaml
-f:Documentation/devicetree/bindings/remoteproc/qcom,pil-info.yaml
-f:Documentation/devicetree/bindings/remoteproc/qcom,q6v5.txt
-f:Documentation/devicetree/bindings/remoteproc/qcom,qcs404-cdsp-pil.yaml
-f:Documentation/devicetree/bindings/remoteproc/qcom,qcs404-pas.yaml
-f:Documentation/devicetree/bindings/remoteproc/qcom,rpm-proc.yaml
-f:Documentation/devicetree/bindings/remoteproc/qcom,sa8775p-pas.yaml
-f:Documentation/devicetree/bindings/remoteproc/qcom,sc7180-mss-pil.yaml
-f:Documentation/devicetree/bindings/remoteproc/qcom,sc7180-pas.yaml
-f:Documentation/devicetree/bindings/remoteproc/qcom,sc7280-adsp-pil.yaml
-f:Documentation/devicetree/bindings/remoteproc/qcom,sc7280-mss-pil.yaml
-f:Documentation/devicetree/bindings/remoteproc/qcom,sc7280-wpss-pil.yaml
-f:Documentation/devicetree/bindings/remoteproc/qcom,sc8280xp-pas.yaml
-f:Documentation/devicetree/bindings/remoteproc/qcom,sdm845-adsp-pil.yaml
-f:Documentation/devicetree/bindings/remoteproc/qcom,sdx55-pas.yaml
-f:Documentation/devicetree/bindings/remoteproc/qcom,sm6115-pas.yaml
-f:Documentation/devicetree/bindings/remoteproc/qcom,sm6350-pas.yaml
-f:Documentation/devicetree/bindings/remoteproc/qcom,sm6375-pas.yaml
-f:Documentation/devicetree/bindings/remoteproc/qcom,sm8150-pas.yaml
-f:Documentation/devicetree/bindings/remoteproc/qcom,sm8350-pas.yaml
-f:Documentation/devicetree/bindings/remoteproc/qcom,sm8550-pas.yaml
-f:Documentation/devicetree/bindings/remoteproc/qcom,smd-edge.yaml
-f:Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.yaml
-f:Documentation/devicetree/bindings/remoteproc/renesas,rcar-rproc.yaml
-f:Documentation/devicetree/bindings/remoteproc/st,stm32-rproc.yaml
-f:Documentation/devicetree/bindings/remoteproc/st-rproc.txt
-f:Documentation/devicetree/bindings/remoteproc/ti,davinci-rproc.txt
-f:Documentation/devicetree/bindings/remoteproc/ti,k3-dsp-rproc.yaml
-f:Documentation/devicetree/bindings/remoteproc/ti,k3-m4f-rproc.yaml
-f:Documentation/devicetree/bindings/remoteproc/ti,k3-r5f-rproc.yaml
-f:Documentation/devicetree/bindings/remoteproc/ti,keystone-rproc.txt
-f:Documentation/devicetree/bindings/remoteproc/ti,omap-remoteproc.yaml
-f:Documentation/devicetree/bindings/remoteproc/ti,pru-consumer.yaml
-f:Documentation/devicetree/bindings/remoteproc/ti,pru-rproc.yaml
-f:Documentation/devicetree/bindings/remoteproc/wkup_m3_rproc.txt
-f:Documentation/devicetree/bindings/remoteproc/xlnx,zynqmp-r5fss.yaml
-f:Documentation/devicetree/bindings/reserved-memory/google,open-dice.yaml
-f:Documentation/devicetree/bindings/reserved-memory/nvidia,tegra210-emc-table.yaml
-f:Documentation/devicetree/bindings/reserved-memory/nvidia,tegra264-bpmp-shmem.yaml
-f:Documentation/devicetree/bindings/reserved-memory/phram.yaml
-f:Documentation/devicetree/bindings/reserved-memory/qcom,cmd-db.yaml
-f:Documentation/devicetree/bindings/reserved-memory/qcom,rmtfs-mem.yaml
-f:Documentation/devicetree/bindings/reserved-memory/ramoops.yaml
-f:Documentation/devicetree/bindings/reserved-memory/reserved-memory.txt
-f:Documentation/devicetree/bindings/reserved-memory/xen,shared-memory.txt
-f:Documentation/devicetree/bindings/reset/allwinner,sun6i-a31-clock-reset.yaml
-f:Documentation/devicetree/bindings/reset/altr,rst-mgr.yaml
-f:Documentation/devicetree/bindings/reset/amlogic,meson-axg-audio-arb.yaml
-f:Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml
-f:Documentation/devicetree/bindings/reset/atmel,at91sam9260-reset.yaml
-f:Documentation/devicetree/bindings/reset/bitmain,bm1880-reset.yaml
-f:Documentation/devicetree/bindings/reset/brcm,bcm4908-misc-pcie-reset.yaml
-f:Documentation/devicetree/bindings/reset/brcm,bcm63138-pmb.txt
-f:Documentation/devicetree/bindings/reset/brcm,bcm6345-reset.yaml
-f:Documentation/devicetree/bindings/reset/brcm,bcm7216-pcie-sata-rescal.yaml
-f:Documentation/devicetree/bindings/reset/brcm,brcmstb-reset.yaml
-f:Documentation/devicetree/bindings/reset/canaan,k210-rst.yaml
-f:Documentation/devicetree/bindings/reset/canaan,k230-rst.yaml
-f:Documentation/devicetree/bindings/reset/delta,tn48m-reset.yaml
-f:Documentation/devicetree/bindings/reset/fsl,imx-src.yaml
-f:Documentation/devicetree/bindings/reset/fsl,imx7-src.yaml
-f:Documentation/devicetree/bindings/reset/hisilicon,hi3660-reset.yaml
-f:Documentation/devicetree/bindings/reset/img,pistachio-reset.txt
-f:Documentation/devicetree/bindings/reset/intel,rcu-gw.yaml
-f:Documentation/devicetree/bindings/reset/lantiq,reset.yaml
-f:Documentation/devicetree/bindings/reset/marvell,berlin2-reset.yaml
-f:Documentation/devicetree/bindings/reset/microchip,rst.yaml
-f:Documentation/devicetree/bindings/reset/nuvoton,ma35d1-reset.yaml
-f:Documentation/devicetree/bindings/reset/nuvoton,npcm750-reset.yaml
-f:Documentation/devicetree/bindings/reset/nxp,lpc1850-rgu.yaml
-f:Documentation/devicetree/bindings/reset/qca,ar7100-reset.yaml
-f:Documentation/devicetree/bindings/reset/qcom,aoss-reset.yaml
-f:Documentation/devicetree/bindings/reset/qcom,pdc-global.yaml
-f:Documentation/devicetree/bindings/reset/renesas,rst.yaml
-f:Documentation/devicetree/bindings/reset/renesas,rzg2l-usbphy-ctrl.yaml
-f:Documentation/devicetree/bindings/reset/renesas,rzv2h-usb2phy-reset.yaml
-f:Documentation/devicetree/bindings/reset/reset.txt
-f:Documentation/devicetree/bindings/reset/snps,axs10x-reset.yaml
-f:Documentation/devicetree/bindings/reset/snps,dw-reset.yaml
-f:Documentation/devicetree/bindings/reset/snps,hsdk-reset.txt
-f:Documentation/devicetree/bindings/reset/socionext,uniphier-glue-reset.yaml
-f:Documentation/devicetree/bindings/reset/socionext,uniphier-reset.yaml
-f:Documentation/devicetree/bindings/reset/sophgo,sg2042-reset.yaml
-f:Documentation/devicetree/bindings/reset/st,sti-softreset.txt
-f:Documentation/devicetree/bindings/reset/st,stih407-picophyreset.yaml
-f:Documentation/devicetree/bindings/reset/st,stih407-powerdown.yaml
-f:Documentation/devicetree/bindings/reset/st,stm32-rcc.txt
-f:Documentation/devicetree/bindings/reset/st,stm32mp1-rcc.txt
-f:Documentation/devicetree/bindings/reset/starfive,jh7100-reset.yaml
-f:Documentation/devicetree/bindings/reset/sunplus,reset.yaml
-f:Documentation/devicetree/bindings/reset/thead,th1520-reset.yaml
-f:Documentation/devicetree/bindings/reset/ti,sci-reset.yaml
-f:Documentation/devicetree/bindings/reset/ti,tps380x-reset.yaml
-f:Documentation/devicetree/bindings/reset/ti-syscon-reset.txt
-f:Documentation/devicetree/bindings/reset/xlnx,zynqmp-reset.yaml
-f:Documentation/devicetree/bindings/reset/zynq-reset.txt
-f:Documentation/devicetree/bindings/resource-names.txt
-f:Documentation/devicetree/bindings/riscv/andes.yaml
-f:Documentation/devicetree/bindings/riscv/canaan.yaml
-f:Documentation/devicetree/bindings/riscv/cpus.yaml
-f:Documentation/devicetree/bindings/riscv/extensions.yaml
-f:Documentation/devicetree/bindings/riscv/microchip.yaml
-f:Documentation/devicetree/bindings/riscv/sifive.yaml
-f:Documentation/devicetree/bindings/riscv/spacemit.yaml
-f:Documentation/devicetree/bindings/riscv/starfive.yaml
-f:Documentation/devicetree/bindings/riscv/sunxi.yaml
-f:Documentation/devicetree/bindings/riscv/thead.yaml
-f:Documentation/devicetree/bindings/rng/airoha,en7581-trng.yaml
-f:Documentation/devicetree/bindings/rng/amlogic,meson-rng.yaml
-f:Documentation/devicetree/bindings/rng/apm,x-gene-rng.yaml
-f:Documentation/devicetree/bindings/rng/arm-cctrng.yaml
-f:Documentation/devicetree/bindings/rng/atmel,at91-trng.yaml
-f:Documentation/devicetree/bindings/rng/brcm,bcm2835.yaml
-f:Documentation/devicetree/bindings/rng/brcm,bcm74110-rng.yaml
-f:Documentation/devicetree/bindings/rng/brcm,iproc-rng200.yaml
-f:Documentation/devicetree/bindings/rng/hisi-rng.txt
-f:Documentation/devicetree/bindings/rng/imx-rng.yaml
-f:Documentation/devicetree/bindings/rng/ingenic,rng.yaml
-f:Documentation/devicetree/bindings/rng/ingenic,trng.yaml
-f:Documentation/devicetree/bindings/rng/inside-secure,safexcel-eip76.yaml
-f:Documentation/devicetree/bindings/rng/intel,ixp46x-rng.yaml
-f:Documentation/devicetree/bindings/rng/microchip,pic32-rng.txt
-f:Documentation/devicetree/bindings/rng/microsoft,vmgenid.yaml
-f:Documentation/devicetree/bindings/rng/mtk-rng.yaml
-f:Documentation/devicetree/bindings/rng/nuvoton,npcm-rng.yaml
-f:Documentation/devicetree/bindings/rng/rockchip,rk3568-rng.yaml
-f:Documentation/devicetree/bindings/rng/rockchip,rk3588-rng.yaml
-f:Documentation/devicetree/bindings/rng/samsung,exynos4-rng.yaml
-f:Documentation/devicetree/bindings/rng/samsung,exynos5250-trng.yaml
-f:Documentation/devicetree/bindings/rng/silex-insight,ba431-rng.yaml
-f:Documentation/devicetree/bindings/rng/sparc_sun_oracle_rng.txt
-f:Documentation/devicetree/bindings/rng/st,rng.yaml
-f:Documentation/devicetree/bindings/rng/st,stm32-rng.yaml
-f:Documentation/devicetree/bindings/rng/starfive,jh7110-trng.yaml
-f:Documentation/devicetree/bindings/rng/ti,keystone-rng.yaml
-f:Documentation/devicetree/bindings/rng/ti,omap-rom-rng.yaml
-f:Documentation/devicetree/bindings/rng/timeriomem_rng.yaml
-f:Documentation/devicetree/bindings/rng/xiphera,xip8001b-trng.yaml
-f:Documentation/devicetree/bindings/rtc/abracon,abx80x.yaml
-f:Documentation/devicetree/bindings/rtc/adi,max31335.yaml
-f:Documentation/devicetree/bindings/rtc/allwinner,sun4i-a10-rtc.yaml
-f:Documentation/devicetree/bindings/rtc/allwinner,sun6i-a31-rtc.yaml
-f:Documentation/devicetree/bindings/rtc/alphascale,asm9260-rtc.yaml
-f:Documentation/devicetree/bindings/rtc/amlogic,a4-rtc.yaml
-f:Documentation/devicetree/bindings/rtc/amlogic,meson-vrtc.yaml
-f:Documentation/devicetree/bindings/rtc/amlogic,meson6-rtc.yaml
-f:Documentation/devicetree/bindings/rtc/arm,pl031.yaml
-f:Documentation/devicetree/bindings/rtc/atmel,at91rm9200-rtc.yaml
-f:Documentation/devicetree/bindings/rtc/atmel,at91sam9260-rtt.yaml
-f:Documentation/devicetree/bindings/rtc/brcm,brcmstb-waketimer.yaml
-f:Documentation/devicetree/bindings/rtc/cdns,rtc.txt
-f:Documentation/devicetree/bindings/rtc/cirrus,ep9301-rtc.yaml
-f:Documentation/devicetree/bindings/rtc/cpcap-rtc.txt
-f:Documentation/devicetree/bindings/rtc/dallas,ds1390.txt
-f:Documentation/devicetree/bindings/rtc/epson,rtc7301.yaml
-f:Documentation/devicetree/bindings/rtc/epson,rx6110.txt
-f:Documentation/devicetree/bindings/rtc/epson,rx8900.yaml
-f:Documentation/devicetree/bindings/rtc/faraday,ftrtc010.yaml
-f:Documentation/devicetree/bindings/rtc/fsl,ls-ftm-alarm.yaml
-f:Documentation/devicetree/bindings/rtc/fsl,scu-rtc.yaml
-f:Documentation/devicetree/bindings/rtc/fsl,stmp3xxx-rtc.yaml
-f:Documentation/devicetree/bindings/rtc/haoyu,hym8563.yaml
-f:Documentation/devicetree/bindings/rtc/imxdi-rtc.yaml
-f:Documentation/devicetree/bindings/rtc/ingenic,rtc.yaml
-f:Documentation/devicetree/bindings/rtc/intersil,isl12022.yaml
-f:Documentation/devicetree/bindings/rtc/isil,isl12026.txt
-f:Documentation/devicetree/bindings/rtc/isil,isl12057.txt
-f:Documentation/devicetree/bindings/rtc/isil,isl1208.yaml
-f:Documentation/devicetree/bindings/rtc/loongson,rtc.yaml
-f:Documentation/devicetree/bindings/rtc/marvell,armada-380-rtc.yaml
-f:Documentation/devicetree/bindings/rtc/marvell,pxa-rtc.yaml
-f:Documentation/devicetree/bindings/rtc/maxim-ds1302.txt
-f:Documentation/devicetree/bindings/rtc/mediatek,mt2712-rtc.yaml
-f:Documentation/devicetree/bindings/rtc/mediatek,mt7622-rtc.yaml
-f:Documentation/devicetree/bindings/rtc/microchip,mpfs-rtc.yaml
-f:Documentation/devicetree/bindings/rtc/microchip,pic32-rtc.txt
-f:Documentation/devicetree/bindings/rtc/microcrystal,rv3028.yaml
-f:Documentation/devicetree/bindings/rtc/microcrystal,rv3032.yaml
-f:Documentation/devicetree/bindings/rtc/moxa,moxart-rtc.txt
-f:Documentation/devicetree/bindings/rtc/mstar,msc313-rtc.yaml
-f:Documentation/devicetree/bindings/rtc/mstar,ssd202d-rtc.yaml
-f:Documentation/devicetree/bindings/rtc/nuvoton,ma35d1-rtc.yaml
-f:Documentation/devicetree/bindings/rtc/nuvoton,nct3018y.yaml
-f:Documentation/devicetree/bindings/rtc/nvidia,tegra20-rtc.yaml
-f:Documentation/devicetree/bindings/rtc/nxp,lpc1788-rtc.yaml
-f:Documentation/devicetree/bindings/rtc/nxp,pcf2123.yaml
-f:Documentation/devicetree/bindings/rtc/nxp,pcf2127.yaml
-f:Documentation/devicetree/bindings/rtc/nxp,pcf85063.yaml
-f:Documentation/devicetree/bindings/rtc/nxp,pcf8523.yaml
-f:Documentation/devicetree/bindings/rtc/nxp,pcf85363.yaml
-f:Documentation/devicetree/bindings/rtc/nxp,pcf8563.yaml
-f:Documentation/devicetree/bindings/rtc/nxp,s32g-rtc.yaml
-f:Documentation/devicetree/bindings/rtc/olpc-xo1-rtc.txt
-f:Documentation/devicetree/bindings/rtc/qcom-pm8xxx-rtc.yaml
-f:Documentation/devicetree/bindings/rtc/realtek,rtd119x.txt
-f:Documentation/devicetree/bindings/rtc/renesas,rz-rtca3.yaml
-f:Documentation/devicetree/bindings/rtc/renesas,rzn1-rtc.yaml
-f:Documentation/devicetree/bindings/rtc/renesas,sh-rtc.yaml
-f:Documentation/devicetree/bindings/rtc/rtc-cmos.txt
-f:Documentation/devicetree/bindings/rtc/rtc-ds1307.yaml
-f:Documentation/devicetree/bindings/rtc/rtc-mxc.yaml
-f:Documentation/devicetree/bindings/rtc/rtc-mxc_v2.yaml
-f:Documentation/devicetree/bindings/rtc/rtc-omap.txt
-f:Documentation/devicetree/bindings/rtc/rtc-opal.txt
-f:Documentation/devicetree/bindings/rtc/rtc-palmas.txt
-f:Documentation/devicetree/bindings/rtc/rtc-st-lpc.txt
-f:Documentation/devicetree/bindings/rtc/rtc.yaml
-f:Documentation/devicetree/bindings/rtc/s3c-rtc.yaml
-f:Documentation/devicetree/bindings/rtc/sa1100-rtc.yaml
-f:Documentation/devicetree/bindings/rtc/sprd,sc2731-rtc.yaml
-f:Documentation/devicetree/bindings/rtc/st,m41t80.yaml
-f:Documentation/devicetree/bindings/rtc/st,m48t86.yaml
-f:Documentation/devicetree/bindings/rtc/st,stm32-rtc.yaml
-f:Documentation/devicetree/bindings/rtc/sunplus,sp7021-rtc.yaml
-f:Documentation/devicetree/bindings/rtc/ti,bq32000.yaml
-f:Documentation/devicetree/bindings/rtc/ti,k3-rtc.yaml
-f:Documentation/devicetree/bindings/rtc/trivial-rtc.yaml
-f:Documentation/devicetree/bindings/rtc/xgene-rtc.txt
-f:Documentation/devicetree/bindings/rtc/xlnx,zynqmp-rtc.yaml
-f:Documentation/devicetree/bindings/scsi/hisilicon-sas.txt
-f:Documentation/devicetree/bindings/serial/8250.yaml
-f:Documentation/devicetree/bindings/serial/8250_omap.yaml
-f:Documentation/devicetree/bindings/serial/actions,owl-uart.yaml
-f:Documentation/devicetree/bindings/serial/altr,juart-1.0.yaml
-f:Documentation/devicetree/bindings/serial/altr,uart-1.0.yaml
-f:Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml
-f:Documentation/devicetree/bindings/serial/arm,dcc.yaml
-f:Documentation/devicetree/bindings/serial/arm,mps2-uart.yaml
-f:Documentation/devicetree/bindings/serial/arm,sbsa-uart.yaml
-f:Documentation/devicetree/bindings/serial/atmel,at91-usart.yaml
-f:Documentation/devicetree/bindings/serial/brcm,bcm2835-aux-uart.yaml
-f:Documentation/devicetree/bindings/serial/brcm,bcm6345-uart.yaml
-f:Documentation/devicetree/bindings/serial/brcm,bcm7271-uart.yaml
-f:Documentation/devicetree/bindings/serial/cdns,uart.yaml
-f:Documentation/devicetree/bindings/serial/cirrus,ep7209-uart.yaml
-f:Documentation/devicetree/bindings/serial/cnxt,cx92755-usart.yaml
-f:Documentation/devicetree/bindings/serial/esp,esp32-acm.yaml
-f:Documentation/devicetree/bindings/serial/esp,esp32-uart.yaml
-f:Documentation/devicetree/bindings/serial/fsl,s32-linflexuart.yaml
-f:Documentation/devicetree/bindings/serial/fsl-imx-uart.yaml
-f:Documentation/devicetree/bindings/serial/fsl-lpuart.yaml
-f:Documentation/devicetree/bindings/serial/fsl-mxs-auart.yaml
-f:Documentation/devicetree/bindings/serial/ingenic,uart.yaml
-f:Documentation/devicetree/bindings/serial/lantiq,asc.yaml
-f:Documentation/devicetree/bindings/serial/litex,liteuart.yaml
-f:Documentation/devicetree/bindings/serial/marvell,armada-3700-uart.yaml
-f:Documentation/devicetree/bindings/serial/maxim,max310x.yaml
-f:Documentation/devicetree/bindings/serial/mediatek,uart.yaml
-f:Documentation/devicetree/bindings/serial/microchip,pic32mzda-uart.yaml
-f:Documentation/devicetree/bindings/serial/nuvoton,ma35d1-serial.yaml
-f:Documentation/devicetree/bindings/serial/nvidia,tegra194-tcu.yaml
-f:Documentation/devicetree/bindings/serial/nvidia,tegra20-hsuart.yaml
-f:Documentation/devicetree/bindings/serial/nvidia,tegra264-utc.yaml
-f:Documentation/devicetree/bindings/serial/nxp,lpc3220-hsuart.yaml
-f:Documentation/devicetree/bindings/serial/nxp,sc16is7xx.yaml
-f:Documentation/devicetree/bindings/serial/pl011.yaml
-f:Documentation/devicetree/bindings/serial/qca,ar9330-uart.yaml
-f:Documentation/devicetree/bindings/serial/qcom,msm-uart.yaml
-f:Documentation/devicetree/bindings/serial/qcom,msm-uartdm.yaml
-f:Documentation/devicetree/bindings/serial/qcom,sa8255p-geni-uart.yaml
-f:Documentation/devicetree/bindings/serial/qcom,serial-geni-qcom.yaml
-f:Documentation/devicetree/bindings/serial/rda,8810pl-uart.yaml
-f:Documentation/devicetree/bindings/serial/renesas,em-uart.yaml
-f:Documentation/devicetree/bindings/serial/renesas,hscif.yaml
-f:Documentation/devicetree/bindings/serial/renesas,rsci.yaml
-f:Documentation/devicetree/bindings/serial/renesas,sci.yaml
-f:Documentation/devicetree/bindings/serial/renesas,scif.yaml
-f:Documentation/devicetree/bindings/serial/renesas,scifa.yaml
-f:Documentation/devicetree/bindings/serial/renesas,scifb.yaml
-f:Documentation/devicetree/bindings/serial/rs485.txt
-f:Documentation/devicetree/bindings/serial/rs485.yaml
-f:Documentation/devicetree/bindings/serial/samsung_uart.yaml
-f:Documentation/devicetree/bindings/serial/serial-peripheral-props.yaml
-f:Documentation/devicetree/bindings/serial/serial.yaml
-f:Documentation/devicetree/bindings/serial/sifive-serial.yaml
-f:Documentation/devicetree/bindings/serial/snps,arc-uart.yaml
-f:Documentation/devicetree/bindings/serial/snps-dw-apb-uart.yaml
-f:Documentation/devicetree/bindings/serial/socionext,milbeaut-usio-uart.yaml
-f:Documentation/devicetree/bindings/serial/socionext,uniphier-uart.yaml
-f:Documentation/devicetree/bindings/serial/sprd-uart.yaml
-f:Documentation/devicetree/bindings/serial/st,asc.yaml
-f:Documentation/devicetree/bindings/serial/st,stm32-uart.yaml
-f:Documentation/devicetree/bindings/serial/sunplus,sp7021-uart.yaml
-f:Documentation/devicetree/bindings/serial/via,vt8500-uart.yaml
-f:Documentation/devicetree/bindings/serial/xlnx,opb-uartlite.yaml
-f:Documentation/devicetree/bindings/serio/allwinner,sun4i-a10-ps2.yaml
-f:Documentation/devicetree/bindings/serio/altera_ps2.txt
-f:Documentation/devicetree/bindings/serio/arm,pl050.yaml
-f:Documentation/devicetree/bindings/serio/olpc,ap-sp.txt
-f:Documentation/devicetree/bindings/serio/ps2-gpio.yaml
-f:Documentation/devicetree/bindings/serio/snps-arc_ps2.txt
-f:Documentation/devicetree/bindings/sifive/sifive-blocks-ip-versioning.txt
-f:Documentation/devicetree/bindings/siox/eckelmann,siox-gpio.txt
-f:Documentation/devicetree/bindings/slimbus/qcom,slim-ngd.yaml
-f:Documentation/devicetree/bindings/slimbus/qcom,slim.yaml
-f:Documentation/devicetree/bindings/slimbus/slimbus.yaml
-f:Documentation/devicetree/bindings/soc/altera/altr,sys-mgr.yaml
-f:Documentation/devicetree/bindings/soc/amlogic/amlogic,canvas.yaml
-f:Documentation/devicetree/bindings/soc/amlogic/amlogic,meson-gx-clk-measure.yaml
-f:Documentation/devicetree/bindings/soc/amlogic/amlogic,meson-gx-hhi-sysctrl.yaml
-f:Documentation/devicetree/bindings/soc/aspeed/uart-routing.yaml
-f:Documentation/devicetree/bindings/soc/bcm/brcm,bcm23550-cdc.yaml
-f:Documentation/devicetree/bindings/soc/bcm/brcm,bcm2711-avs-monitor.yaml
-f:Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-pm.yaml
-f:Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.yaml
-f:Documentation/devicetree/bindings/soc/cirrus/cirrus,ep9301-syscon.yaml
-f:Documentation/devicetree/bindings/soc/dove/pmu.txt
-f:Documentation/devicetree/bindings/soc/fsl/cpm_qe/cpm.txt
-f:Documentation/devicetree/bindings/soc/fsl/cpm_qe/cpm/brg.txt
-f:Documentation/devicetree/bindings/soc/fsl/cpm_qe/cpm/i2c.txt
-f:Documentation/devicetree/bindings/soc/fsl/cpm_qe/cpm/pic.txt
-f:Documentation/devicetree/bindings/soc/fsl/cpm_qe/cpm/usb.txt
-f:Documentation/devicetree/bindings/soc/fsl/cpm_qe/fsl,cpm1-scc-qmc.yaml
-f:Documentation/devicetree/bindings/soc/fsl/cpm_qe/fsl,cpm1-tsa.yaml
-f:Documentation/devicetree/bindings/soc/fsl/cpm_qe/fsl,qe-firmware.yaml
-f:Documentation/devicetree/bindings/soc/fsl/cpm_qe/fsl,qe-ic.yaml
-f:Documentation/devicetree/bindings/soc/fsl/cpm_qe/fsl,qe-muram.yaml
-f:Documentation/devicetree/bindings/soc/fsl/cpm_qe/fsl,qe-si.yaml
-f:Documentation/devicetree/bindings/soc/fsl/cpm_qe/fsl,qe-siram.yaml
-f:Documentation/devicetree/bindings/soc/fsl/cpm_qe/fsl,qe-tsa.yaml
-f:Documentation/devicetree/bindings/soc/fsl/cpm_qe/fsl,qe-ucc-qmc.yaml
-f:Documentation/devicetree/bindings/soc/fsl/cpm_qe/fsl,qe.yaml
-f:Documentation/devicetree/bindings/soc/fsl/cpm_qe/fsl,ucc-hdlc.yaml
-f:Documentation/devicetree/bindings/soc/fsl/cpm_qe/gpio.txt
-f:Documentation/devicetree/bindings/soc/fsl/cpm_qe/qe/firmware.txt
-f:Documentation/devicetree/bindings/soc/fsl/cpm_qe/qe/par_io.txt
-f:Documentation/devicetree/bindings/soc/fsl/cpm_qe/qe/pincfg.txt
-f:Documentation/devicetree/bindings/soc/fsl/cpm_qe/qe/ucc.txt
-f:Documentation/devicetree/bindings/soc/fsl/cpm_qe/qe/usb.txt
-f:Documentation/devicetree/bindings/soc/fsl/cpm_qe/serial.txt
-f:Documentation/devicetree/bindings/soc/fsl/cpm_qe/uqe_serial.txt
-f:Documentation/devicetree/bindings/soc/fsl/fsl,bman-portal.yaml
-f:Documentation/devicetree/bindings/soc/fsl/fsl,bman.yaml
-f:Documentation/devicetree/bindings/soc/fsl/fsl,imx23-digctl.yaml
-f:Documentation/devicetree/bindings/soc/fsl/fsl,layerscape-dcfg.yaml
-f:Documentation/devicetree/bindings/soc/fsl/fsl,layerscape-scfg.yaml
-f:Documentation/devicetree/bindings/soc/fsl/fsl,ls1028a-reset.yaml
-f:Documentation/devicetree/bindings/soc/fsl/fsl,qman-fqd.yaml
-f:Documentation/devicetree/bindings/soc/fsl/fsl,qman-portal.yaml
-f:Documentation/devicetree/bindings/soc/fsl/fsl,qman.yaml
-f:Documentation/devicetree/bindings/soc/fsl/fsl,rcpm.yaml
-f:Documentation/devicetree/bindings/soc/fsl/guts.txt
-f:Documentation/devicetree/bindings/soc/google/google,gs101-pmu-intr-gen.yaml
-f:Documentation/devicetree/bindings/soc/hisilicon/hisilicon,hi3660-usb3-otg-bc.yaml
-f:Documentation/devicetree/bindings/soc/imx/fsl,aips-bus.yaml
-f:Documentation/devicetree/bindings/soc/imx/fsl,imx-anatop.yaml
-f:Documentation/devicetree/bindings/soc/imx/fsl,imx-iomuxc-gpr.yaml
-f:Documentation/devicetree/bindings/soc/imx/fsl,imx8mm-disp-blk-ctrl.yaml
-f:Documentation/devicetree/bindings/soc/imx/fsl,imx8mm-vpu-blk-ctrl.yaml
-f:Documentation/devicetree/bindings/soc/imx/fsl,imx8mn-disp-blk-ctrl.yaml
-f:Documentation/devicetree/bindings/soc/imx/fsl,imx8mp-hdmi-blk-ctrl.yaml
-f:Documentation/devicetree/bindings/soc/imx/fsl,imx8mp-hsio-blk-ctrl.yaml
-f:Documentation/devicetree/bindings/soc/imx/fsl,imx8mp-media-blk-ctrl.yaml
-f:Documentation/devicetree/bindings/soc/imx/fsl,imx8mq-vpu-blk-ctrl.yaml
-f:Documentation/devicetree/bindings/soc/imx/fsl,imx93-media-blk-ctrl.yaml
-f:Documentation/devicetree/bindings/soc/imx/fsl,imx93-src.yaml
-f:Documentation/devicetree/bindings/soc/imx/imx8m-soc.yaml
-f:Documentation/devicetree/bindings/soc/intel/intel,hps-copy-engine.yaml
-f:Documentation/devicetree/bindings/soc/intel/intel,lgm-syscon.yaml
-f:Documentation/devicetree/bindings/soc/litex/litex,soc-controller.yaml
-f:Documentation/devicetree/bindings/soc/loongson/loongson,ls2k-pmc.yaml
-f:Documentation/devicetree/bindings/soc/mediatek/devapc.yaml
-f:Documentation/devicetree/bindings/soc/mediatek/mediatek,ccorr.yaml
-f:Documentation/devicetree/bindings/soc/mediatek/mediatek,mt7986-wo-ccif.yaml
-f:Documentation/devicetree/bindings/soc/mediatek/mediatek,mt8183-dvfsrc.yaml
-f:Documentation/devicetree/bindings/soc/mediatek/mediatek,mutex.yaml
-f:Documentation/devicetree/bindings/soc/mediatek/mediatek,pwrap.yaml
-f:Documentation/devicetree/bindings/soc/mediatek/mediatek,wdma.yaml
-f:Documentation/devicetree/bindings/soc/mediatek/mtk-svs.yaml
-f:Documentation/devicetree/bindings/soc/mediatek/scpsys.txt
-f:Documentation/devicetree/bindings/soc/microchip/atmel,at91rm9200-tcb.yaml
-f:Documentation/devicetree/bindings/soc/microchip/microchip,mpfs-sys-controller.yaml
-f:Documentation/devicetree/bindings/soc/microchip/microchip,sparx5-cpu-syscon.yaml
-f:Documentation/devicetree/bindings/soc/mobileye/mobileye,eyeq5-olb.yaml
-f:Documentation/devicetree/bindings/soc/nuvoton/nuvoton,gfxi.yaml
-f:Documentation/devicetree/bindings/soc/nuvoton/nuvoton,npcm-gcr.yaml
-f:Documentation/devicetree/bindings/soc/qcom/qcom,aoss-qmp.yaml
-f:Documentation/devicetree/bindings/soc/qcom/qcom,apr-services.yaml
-f:Documentation/devicetree/bindings/soc/qcom/qcom,apr.yaml
-f:Documentation/devicetree/bindings/soc/qcom/qcom,dcc.yaml
-f:Documentation/devicetree/bindings/soc/qcom/qcom,eud.yaml
-f:Documentation/devicetree/bindings/soc/qcom/qcom,geni-se.yaml
-f:Documentation/devicetree/bindings/soc/qcom/qcom,gsbi.yaml
-f:Documentation/devicetree/bindings/soc/qcom/qcom,msm8976-ramp-controller.yaml
-f:Documentation/devicetree/bindings/soc/qcom/qcom,pbs.yaml
-f:Documentation/devicetree/bindings/soc/qcom/qcom,pmic-glink.yaml
-f:Documentation/devicetree/bindings/soc/qcom/qcom,rpm-master-stats.yaml
-f:Documentation/devicetree/bindings/soc/qcom/qcom,rpm.yaml
-f:Documentation/devicetree/bindings/soc/qcom/qcom,rpmh-rsc.yaml
-f:Documentation/devicetree/bindings/soc/qcom/qcom,sa8255p-geni-se-qup.yaml
-f:Documentation/devicetree/bindings/soc/qcom/qcom,saw2.yaml
-f:Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml
-f:Documentation/devicetree/bindings/soc/qcom/qcom,smd.yaml
-f:Documentation/devicetree/bindings/soc/qcom/qcom,smem.yaml
-f:Documentation/devicetree/bindings/soc/qcom/qcom,smp2p.yaml
-f:Documentation/devicetree/bindings/soc/qcom/qcom,smsm.yaml
-f:Documentation/devicetree/bindings/soc/qcom/qcom,wcnss.yaml
-f:Documentation/devicetree/bindings/soc/qcom/qcom-stats.yaml
-f:Documentation/devicetree/bindings/soc/renesas/renesas,r9a09g011-sys.yaml
-f:Documentation/devicetree/bindings/soc/renesas/renesas,r9a09g057-sys.yaml
-f:Documentation/devicetree/bindings/soc/renesas/renesas,rzg2l-sysc.yaml
-f:Documentation/devicetree/bindings/soc/renesas/renesas,rzv2m-pwc.yaml
-f:Documentation/devicetree/bindings/soc/renesas/renesas-soc.yaml
-f:Documentation/devicetree/bindings/soc/renesas/renesas.yaml
-f:Documentation/devicetree/bindings/soc/rockchip/grf.yaml
-f:Documentation/devicetree/bindings/soc/samsung/exynos-pmu.yaml
-f:Documentation/devicetree/bindings/soc/samsung/exynos-usi.yaml
-f:Documentation/devicetree/bindings/soc/samsung/samsung,exynos-sysreg.yaml
-f:Documentation/devicetree/bindings/soc/socionext/socionext,uniphier-adamv.yaml
-f:Documentation/devicetree/bindings/soc/socionext/socionext,uniphier-ahci-glue.yaml
-f:Documentation/devicetree/bindings/soc/socionext/socionext,uniphier-dwc3-glue.yaml
-f:Documentation/devicetree/bindings/soc/socionext/socionext,uniphier-mioctrl.yaml
-f:Documentation/devicetree/bindings/soc/socionext/socionext,uniphier-perictrl.yaml
-f:Documentation/devicetree/bindings/soc/socionext/socionext,uniphier-sdctrl.yaml
-f:Documentation/devicetree/bindings/soc/socionext/socionext,uniphier-soc-glue-debug.yaml
-f:Documentation/devicetree/bindings/soc/socionext/socionext,uniphier-soc-glue.yaml
-f:Documentation/devicetree/bindings/soc/socionext/socionext,uniphier-sysctrl.yaml
-f:Documentation/devicetree/bindings/soc/sophgo/sophgo,cv1800b-rtc.yaml
-f:Documentation/devicetree/bindings/soc/sophgo/sophgo,sg2044-top-syscon.yaml
-f:Documentation/devicetree/bindings/soc/sophgo/sophgo.yaml
-f:Documentation/devicetree/bindings/soc/spacemit/spacemit,k1-syscon.yaml
-f:Documentation/devicetree/bindings/soc/sprd/sprd,sc9863a-glbregs.yaml
-f:Documentation/devicetree/bindings/soc/starfive/starfive,jh7110-syscon.yaml
-f:Documentation/devicetree/bindings/soc/sti/st,sti-syscon.yaml
-f:Documentation/devicetree/bindings/soc/tegra/nvidia,nvec.yaml
-f:Documentation/devicetree/bindings/soc/tegra/nvidia,tegra20-ahb.yaml
-f:Documentation/devicetree/bindings/soc/tegra/nvidia,tegra20-flowctrl.yaml
-f:Documentation/devicetree/bindings/soc/tegra/nvidia,tegra20-pmc.yaml
-f:Documentation/devicetree/bindings/soc/ti/k3-ringacc.yaml
-f:Documentation/devicetree/bindings/soc/ti/keystone-navigator-dma.txt
-f:Documentation/devicetree/bindings/soc/ti/keystone-navigator-qmss.txt
-f:Documentation/devicetree/bindings/soc/ti/sci-pm-domain.yaml
-f:Documentation/devicetree/bindings/soc/ti/ti,am654-serdes-ctrl.yaml
-f:Documentation/devicetree/bindings/soc/ti/ti,j721e-system-controller.yaml
-f:Documentation/devicetree/bindings/soc/ti/ti,j784s4-bist.yaml
-f:Documentation/devicetree/bindings/soc/ti/ti,pruss.yaml
-f:Documentation/devicetree/bindings/soc/ti/wkup-m3-ipc.yaml
-f:Documentation/devicetree/bindings/soc/xilinx/xilinx.yaml
-f:Documentation/devicetree/bindings/soc/xilinx/xlnx,vcu-settings.yaml
-f:Documentation/devicetree/bindings/sound/ac97-bus.txt
-f:Documentation/devicetree/bindings/sound/adi,adau1372.yaml
-f:Documentation/devicetree/bindings/sound/adi,adau1373.yaml
-f:Documentation/devicetree/bindings/sound/adi,adau1701.txt
-f:Documentation/devicetree/bindings/sound/adi,adau17x1.yaml
-f:Documentation/devicetree/bindings/sound/adi,adau1977.yaml
-f:Documentation/devicetree/bindings/sound/adi,adau7002.yaml
-f:Documentation/devicetree/bindings/sound/adi,adau7118.yaml
-f:Documentation/devicetree/bindings/sound/adi,axi-i2s.txt
-f:Documentation/devicetree/bindings/sound/adi,axi-spdif-tx.txt
-f:Documentation/devicetree/bindings/sound/adi,max98363.yaml
-f:Documentation/devicetree/bindings/sound/adi,max98388.yaml
-f:Documentation/devicetree/bindings/sound/adi,max98396.yaml
-f:Documentation/devicetree/bindings/sound/adi,ssm2305.txt
-f:Documentation/devicetree/bindings/sound/adi,ssm2518.yaml
-f:Documentation/devicetree/bindings/sound/adi,ssm2602.txt
-f:Documentation/devicetree/bindings/sound/adi,ssm3515.yaml
-f:Documentation/devicetree/bindings/sound/ak4118.txt
-f:Documentation/devicetree/bindings/sound/ak5386.txt
-f:Documentation/devicetree/bindings/sound/alc5623.txt
-f:Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-codec.yaml
-f:Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-i2s.yaml
-f:Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-spdif.yaml
-f:Documentation/devicetree/bindings/sound/allwinner,sun50i-a64-codec-analog.yaml
-f:Documentation/devicetree/bindings/sound/allwinner,sun50i-h6-dmic.yaml
-f:Documentation/devicetree/bindings/sound/allwinner,sun8i-a23-codec-analog.yaml
-f:Documentation/devicetree/bindings/sound/allwinner,sun8i-a33-codec.yaml
-f:Documentation/devicetree/bindings/sound/amlogic,aiu.yaml
-f:Documentation/devicetree/bindings/sound/amlogic,axg-fifo.yaml
-f:Documentation/devicetree/bindings/sound/amlogic,axg-pdm.yaml
-f:Documentation/devicetree/bindings/sound/amlogic,axg-sound-card.yaml
-f:Documentation/devicetree/bindings/sound/amlogic,axg-spdifin.yaml
-f:Documentation/devicetree/bindings/sound/amlogic,axg-spdifout.yaml
-f:Documentation/devicetree/bindings/sound/amlogic,axg-tdm-formatters.yaml
-f:Documentation/devicetree/bindings/sound/amlogic,axg-tdm-iface.yaml
-f:Documentation/devicetree/bindings/sound/amlogic,g12a-toacodec.yaml
-f:Documentation/devicetree/bindings/sound/amlogic,g12a-tohdmitx.yaml
-f:Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml
-f:Documentation/devicetree/bindings/sound/amlogic,t9015.yaml
-f:Documentation/devicetree/bindings/sound/apple,mca.yaml
-f:Documentation/devicetree/bindings/sound/arm,pl041.yaml
-f:Documentation/devicetree/bindings/sound/armada-370db-audio.txt
-f:Documentation/devicetree/bindings/sound/asahi-kasei,ak4104.yaml
-f:Documentation/devicetree/bindings/sound/asahi-kasei,ak4375.yaml
-f:Documentation/devicetree/bindings/sound/asahi-kasei,ak4458.yaml
-f:Documentation/devicetree/bindings/sound/asahi-kasei,ak4554.yaml
-f:Documentation/devicetree/bindings/sound/asahi-kasei,ak4613.yaml
-f:Documentation/devicetree/bindings/sound/asahi-kasei,ak4619.yaml
-f:Documentation/devicetree/bindings/sound/asahi-kasei,ak4642.yaml
-f:Documentation/devicetree/bindings/sound/asahi-kasei,ak5558.yaml
-f:Documentation/devicetree/bindings/sound/atmel,asoc-wm8904.yaml
-f:Documentation/devicetree/bindings/sound/atmel,at91-ssc.yaml
-f:Documentation/devicetree/bindings/sound/atmel,at91sam9g20ek-wm8731.yaml
-f:Documentation/devicetree/bindings/sound/atmel,sam9x5-wm8731-audio.yaml
-f:Documentation/devicetree/bindings/sound/atmel,sama5d2-classd.yaml
-f:Documentation/devicetree/bindings/sound/atmel,sama5d2-i2s.yaml
-f:Documentation/devicetree/bindings/sound/atmel,sama5d2-pdmic.yaml
-f:Documentation/devicetree/bindings/sound/atmel_ac97c.txt
-f:Documentation/devicetree/bindings/sound/audio-graph-card.yaml
-f:Documentation/devicetree/bindings/sound/audio-graph-card2.yaml
-f:Documentation/devicetree/bindings/sound/audio-graph-port.yaml
-f:Documentation/devicetree/bindings/sound/audio-graph.yaml
-f:Documentation/devicetree/bindings/sound/audio-iio-aux.yaml
-f:Documentation/devicetree/bindings/sound/awinic,aw8738.yaml
-f:Documentation/devicetree/bindings/sound/awinic,aw87390.yaml
-f:Documentation/devicetree/bindings/sound/awinic,aw88395.yaml
-f:Documentation/devicetree/bindings/sound/axentia,tse850-pcm5142.txt
-f:Documentation/devicetree/bindings/sound/brcm,bcm2835-i2s.txt
-f:Documentation/devicetree/bindings/sound/brcm,bcm63xx-audio.txt
-f:Documentation/devicetree/bindings/sound/brcm,cygnus-audio.txt
-f:Documentation/devicetree/bindings/sound/cdns,xtfpga-i2s.txt
-f:Documentation/devicetree/bindings/sound/cirrus,cs35l41.yaml
-f:Documentation/devicetree/bindings/sound/cirrus,cs35l45.yaml
-f:Documentation/devicetree/bindings/sound/cirrus,cs4234.yaml
-f:Documentation/devicetree/bindings/sound/cirrus,cs4270.yaml
-f:Documentation/devicetree/bindings/sound/cirrus,cs4271.yaml
-f:Documentation/devicetree/bindings/sound/cirrus,cs42l42.yaml
-f:Documentation/devicetree/bindings/sound/cirrus,cs42l43.yaml
-f:Documentation/devicetree/bindings/sound/cirrus,cs42l51.yaml
-f:Documentation/devicetree/bindings/sound/cirrus,cs42l84.yaml
-f:Documentation/devicetree/bindings/sound/cirrus,cs42xx8.yaml
-f:Documentation/devicetree/bindings/sound/cirrus,cs48l32.yaml
-f:Documentation/devicetree/bindings/sound/cirrus,cs530x.yaml
-f:Documentation/devicetree/bindings/sound/cirrus,ep9301-i2s.yaml
-f:Documentation/devicetree/bindings/sound/cirrus,lochnagar.yaml
-f:Documentation/devicetree/bindings/sound/cirrus,madera.yaml
-f:Documentation/devicetree/bindings/sound/component-common.yaml
-f:Documentation/devicetree/bindings/sound/cs35l32.txt
-f:Documentation/devicetree/bindings/sound/cs35l33.txt
-f:Documentation/devicetree/bindings/sound/cs35l34.txt
-f:Documentation/devicetree/bindings/sound/cs35l35.txt
-f:Documentation/devicetree/bindings/sound/cs35l36.txt
-f:Documentation/devicetree/bindings/sound/cs4265.txt
-f:Documentation/devicetree/bindings/sound/cs42l52.txt
-f:Documentation/devicetree/bindings/sound/cs42l56.txt
-f:Documentation/devicetree/bindings/sound/cs42l73.txt
-f:Documentation/devicetree/bindings/sound/cs43130.txt
-f:Documentation/devicetree/bindings/sound/cs4341.txt
-f:Documentation/devicetree/bindings/sound/cs4349.txt
-f:Documentation/devicetree/bindings/sound/cs53l30.txt
-f:Documentation/devicetree/bindings/sound/da7218.txt
-f:Documentation/devicetree/bindings/sound/da9055.txt
-f:Documentation/devicetree/bindings/sound/dai-common.yaml
-f:Documentation/devicetree/bindings/sound/dai-params.yaml
-f:Documentation/devicetree/bindings/sound/davinci-evm-audio.txt
-f:Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml
-f:Documentation/devicetree/bindings/sound/davinci-mcbsp.yaml
-f:Documentation/devicetree/bindings/sound/dialog,da7219.yaml
-f:Documentation/devicetree/bindings/sound/dlg,da7213.yaml
-f:Documentation/devicetree/bindings/sound/dmic-codec.yaml
-f:Documentation/devicetree/bindings/sound/eukrea-tlv320.txt
-f:Documentation/devicetree/bindings/sound/everest,es71x4.yaml
-f:Documentation/devicetree/bindings/sound/everest,es7241.yaml
-f:Documentation/devicetree/bindings/sound/everest,es8316.yaml
-f:Documentation/devicetree/bindings/sound/everest,es8326.yaml
-f:Documentation/devicetree/bindings/sound/everest,es8328.yaml
-f:Documentation/devicetree/bindings/sound/everest,es8375.yaml
-f:Documentation/devicetree/bindings/sound/everest,es8389.yaml
-f:Documentation/devicetree/bindings/sound/fsl,aud2htx.yaml
-f:Documentation/devicetree/bindings/sound/fsl,audmix.yaml
-f:Documentation/devicetree/bindings/sound/fsl,easrc.yaml
-f:Documentation/devicetree/bindings/sound/fsl,esai.yaml
-f:Documentation/devicetree/bindings/sound/fsl,imx-asrc.yaml
-f:Documentation/devicetree/bindings/sound/fsl,imx-audio-es8328.yaml
-f:Documentation/devicetree/bindings/sound/fsl,imx95-cm7-sof.yaml
-f:Documentation/devicetree/bindings/sound/fsl,micfil.yaml
-f:Documentation/devicetree/bindings/sound/fsl,mqs.yaml
-f:Documentation/devicetree/bindings/sound/fsl,mxs-audio-sgtl5000.yaml
-f:Documentation/devicetree/bindings/sound/fsl,qmc-audio.yaml
-f:Documentation/devicetree/bindings/sound/fsl,rpmsg.yaml
-f:Documentation/devicetree/bindings/sound/fsl,sai.yaml
-f:Documentation/devicetree/bindings/sound/fsl,saif.yaml
-f:Documentation/devicetree/bindings/sound/fsl,sgtl5000.yaml
-f:Documentation/devicetree/bindings/sound/fsl,sof-cpu.yaml
-f:Documentation/devicetree/bindings/sound/fsl,spdif.yaml
-f:Documentation/devicetree/bindings/sound/fsl,ssi.yaml
-f:Documentation/devicetree/bindings/sound/fsl,xcvr.yaml
-f:Documentation/devicetree/bindings/sound/fsl-asoc-card.yaml
-f:Documentation/devicetree/bindings/sound/google,chv3-codec.yaml
-f:Documentation/devicetree/bindings/sound/google,chv3-i2s.yaml
-f:Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml
-f:Documentation/devicetree/bindings/sound/google,sc7180-trogdor.yaml
-f:Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml
-f:Documentation/devicetree/bindings/sound/hisilicon,hi6210-i2s.txt
-f:Documentation/devicetree/bindings/sound/img,i2s-in.txt
-f:Documentation/devicetree/bindings/sound/img,i2s-out.txt
-f:Documentation/devicetree/bindings/sound/img,parallel-out.txt
-f:Documentation/devicetree/bindings/sound/img,pistachio-internal-dac.txt
-f:Documentation/devicetree/bindings/sound/img,spdif-in.txt
-f:Documentation/devicetree/bindings/sound/img,spdif-out.txt
-f:Documentation/devicetree/bindings/sound/imx-audio-card.yaml
-f:Documentation/devicetree/bindings/sound/imx-audio-hdmi.yaml
-f:Documentation/devicetree/bindings/sound/imx-audio-sgtl5000.txt
-f:Documentation/devicetree/bindings/sound/imx-audmux.yaml
-f:Documentation/devicetree/bindings/sound/infineon,peb2466.yaml
-f:Documentation/devicetree/bindings/sound/ingenic,aic.yaml
-f:Documentation/devicetree/bindings/sound/ingenic,codec.yaml
-f:Documentation/devicetree/bindings/sound/intel,keembay-i2s.yaml
-f:Documentation/devicetree/bindings/sound/invensense,ics43432.yaml
-f:Documentation/devicetree/bindings/sound/irondevice,sma1303.yaml
-f:Documentation/devicetree/bindings/sound/irondevice,sma1307.yaml
-f:Documentation/devicetree/bindings/sound/linux,bt-sco.yaml
-f:Documentation/devicetree/bindings/sound/linux,spdif.yaml
-f:Documentation/devicetree/bindings/sound/loongson,ls-audio-card.yaml
-f:Documentation/devicetree/bindings/sound/loongson,ls1b-ac97.yaml
-f:Documentation/devicetree/bindings/sound/loongson,ls2k1000-i2s.yaml
-f:Documentation/devicetree/bindings/sound/marvell,mmp-sspa.yaml
-f:Documentation/devicetree/bindings/sound/marvell,pxa2xx-ac97.txt
-f:Documentation/devicetree/bindings/sound/max98373.txt
-f:Documentation/devicetree/bindings/sound/max9860.txt
-f:Documentation/devicetree/bindings/sound/maxim,max9759.yaml
-f:Documentation/devicetree/bindings/sound/maxim,max98088.yaml
-f:Documentation/devicetree/bindings/sound/maxim,max98090.yaml
-f:Documentation/devicetree/bindings/sound/maxim,max98095.yaml
-f:Documentation/devicetree/bindings/sound/maxim,max98357a.yaml
-f:Documentation/devicetree/bindings/sound/maxim,max98371.yaml
-f:Documentation/devicetree/bindings/sound/maxim,max98390.yaml
-f:Documentation/devicetree/bindings/sound/maxim,max98504.yaml
-f:Documentation/devicetree/bindings/sound/maxim,max98520.yaml
-f:Documentation/devicetree/bindings/sound/maxim,max9867.yaml
-f:Documentation/devicetree/bindings/sound/maxim,max98925.yaml
-f:Documentation/devicetree/bindings/sound/mediatek,mt2701-audio.yaml
-f:Documentation/devicetree/bindings/sound/mediatek,mt2701-wm8960.yaml
-f:Documentation/devicetree/bindings/sound/mediatek,mt7986-afe.yaml
-f:Documentation/devicetree/bindings/sound/mediatek,mt7986-wm8960.yaml
-f:Documentation/devicetree/bindings/sound/mediatek,mt8173-afe-pcm.yaml
-f:Documentation/devicetree/bindings/sound/mediatek,mt8188-afe.yaml
-f:Documentation/devicetree/bindings/sound/mediatek,mt8188-mt6359.yaml
-f:Documentation/devicetree/bindings/sound/mediatek,mt8365-afe.yaml
-f:Documentation/devicetree/bindings/sound/mediatek,mt8365-mt6357.yaml
-f:Documentation/devicetree/bindings/sound/microchip,sama7g5-i2smcc.yaml
-f:Documentation/devicetree/bindings/sound/microchip,sama7g5-pdmc.yaml
-f:Documentation/devicetree/bindings/sound/microchip,sama7g5-spdifrx.yaml
-f:Documentation/devicetree/bindings/sound/microchip,sama7g5-spdiftx.yaml
-f:Documentation/devicetree/bindings/sound/mikroe,mikroe-proto.txt
-f:Documentation/devicetree/bindings/sound/mrvl,pxa-ssp.txt
-f:Documentation/devicetree/bindings/sound/mscc,zl38060.yaml
-f:Documentation/devicetree/bindings/sound/mt2701-cs42448.txt
-f:Documentation/devicetree/bindings/sound/mt6351.txt
-f:Documentation/devicetree/bindings/sound/mt6358.txt
-f:Documentation/devicetree/bindings/sound/mt6359.yaml
-f:Documentation/devicetree/bindings/sound/mt6797-afe-pcm.txt
-f:Documentation/devicetree/bindings/sound/mt6797-mt6351.txt
-f:Documentation/devicetree/bindings/sound/mt8173-max98090.txt
-f:Documentation/devicetree/bindings/sound/mt8173-rt5650-rt5514.txt
-f:Documentation/devicetree/bindings/sound/mt8173-rt5650-rt5676.txt
-f:Documentation/devicetree/bindings/sound/mt8173-rt5650.txt
-f:Documentation/devicetree/bindings/sound/mt8183-afe-pcm.txt
-f:Documentation/devicetree/bindings/sound/mt8183-da7219-max98357.txt
-f:Documentation/devicetree/bindings/sound/mt8183-mt6358-ts3a227-max98357.txt
-f:Documentation/devicetree/bindings/sound/mt8186-afe-pcm.yaml
-f:Documentation/devicetree/bindings/sound/mt8186-mt6366-da7219-max98357.yaml
-f:Documentation/devicetree/bindings/sound/mt8186-mt6366-rt1019-rt5682s.yaml
-f:Documentation/devicetree/bindings/sound/mt8192-afe-pcm.yaml
-f:Documentation/devicetree/bindings/sound/mt8192-mt6359-rt1015-rt5682.yaml
-f:Documentation/devicetree/bindings/sound/mt8195-afe-pcm.yaml
-f:Documentation/devicetree/bindings/sound/mt8195-mt6359.yaml
-f:Documentation/devicetree/bindings/sound/mtk-btcvsd-snd.txt
-f:Documentation/devicetree/bindings/sound/mvebu-audio.txt
-f:Documentation/devicetree/bindings/sound/neofidelity,ntp8835.yaml
-f:Documentation/devicetree/bindings/sound/neofidelity,ntp8918.yaml
-f:Documentation/devicetree/bindings/sound/nokia,rx51.txt
-f:Documentation/devicetree/bindings/sound/nuvoton,nau8315.yaml
-f:Documentation/devicetree/bindings/sound/nuvoton,nau8325.yaml
-f:Documentation/devicetree/bindings/sound/nuvoton,nau8540.yaml
-f:Documentation/devicetree/bindings/sound/nuvoton,nau8810.yaml
-f:Documentation/devicetree/bindings/sound/nuvoton,nau8821.yaml
-f:Documentation/devicetree/bindings/sound/nuvoton,nau8822.yaml
-f:Documentation/devicetree/bindings/sound/nuvoton,nau8824.yaml
-f:Documentation/devicetree/bindings/sound/nuvoton,nau8825.yaml
-f:Documentation/devicetree/bindings/sound/nvidia,tegra-audio-alc5632.yaml
-f:Documentation/devicetree/bindings/sound/nvidia,tegra-audio-common.yaml
-f:Documentation/devicetree/bindings/sound/nvidia,tegra-audio-graph-card.yaml
-f:Documentation/devicetree/bindings/sound/nvidia,tegra-audio-max9808x.yaml
-f:Documentation/devicetree/bindings/sound/nvidia,tegra-audio-max98090.yaml
-f:Documentation/devicetree/bindings/sound/nvidia,tegra-audio-rt5631.yaml
-f:Documentation/devicetree/bindings/sound/nvidia,tegra-audio-rt5640.yaml
-f:Documentation/devicetree/bindings/sound/nvidia,tegra-audio-rt5677.yaml
-f:Documentation/devicetree/bindings/sound/nvidia,tegra-audio-sgtl5000.yaml
-f:Documentation/devicetree/bindings/sound/nvidia,tegra-audio-trimslice.yaml
-f:Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8753.yaml
-f:Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8903.yaml
-f:Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm9712.yaml
-f:Documentation/devicetree/bindings/sound/nvidia,tegra186-asrc.yaml
-f:Documentation/devicetree/bindings/sound/nvidia,tegra186-dspk.yaml
-f:Documentation/devicetree/bindings/sound/nvidia,tegra20-ac97.yaml
-f:Documentation/devicetree/bindings/sound/nvidia,tegra20-das.yaml
-f:Documentation/devicetree/bindings/sound/nvidia,tegra20-i2s.yaml
-f:Documentation/devicetree/bindings/sound/nvidia,tegra20-spdif.yaml
-f:Documentation/devicetree/bindings/sound/nvidia,tegra210-admaif.yaml
-f:Documentation/devicetree/bindings/sound/nvidia,tegra210-adx.yaml
-f:Documentation/devicetree/bindings/sound/nvidia,tegra210-ahub.yaml
-f:Documentation/devicetree/bindings/sound/nvidia,tegra210-amx.yaml
-f:Documentation/devicetree/bindings/sound/nvidia,tegra210-dmic.yaml
-f:Documentation/devicetree/bindings/sound/nvidia,tegra210-i2s.yaml
-f:Documentation/devicetree/bindings/sound/nvidia,tegra210-mbdrc.yaml
-f:Documentation/devicetree/bindings/sound/nvidia,tegra210-mixer.yaml
-f:Documentation/devicetree/bindings/sound/nvidia,tegra210-mvc.yaml
-f:Documentation/devicetree/bindings/sound/nvidia,tegra210-ope.yaml
-f:Documentation/devicetree/bindings/sound/nvidia,tegra210-peq.yaml
-f:Documentation/devicetree/bindings/sound/nvidia,tegra210-sfc.yaml
-f:Documentation/devicetree/bindings/sound/nvidia,tegra30-ahub.txt
-f:Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.yaml
-f:Documentation/devicetree/bindings/sound/nvidia,tegra30-i2s.yaml
-f:Documentation/devicetree/bindings/sound/nxp,lpc3220-i2s.yaml
-f:Documentation/devicetree/bindings/sound/nxp,tfa9879.yaml
-f:Documentation/devicetree/bindings/sound/nxp,tfa989x.yaml
-f:Documentation/devicetree/bindings/sound/nxp,uda1342.yaml
-f:Documentation/devicetree/bindings/sound/omap-abe-twl6040.txt
-f:Documentation/devicetree/bindings/sound/omap-dmic.txt
-f:Documentation/devicetree/bindings/sound/omap-mcbsp.txt
-f:Documentation/devicetree/bindings/sound/omap-twl4030.txt
-f:Documentation/devicetree/bindings/sound/option,gtm601.yaml
-f:Documentation/devicetree/bindings/sound/pcm1789.txt
-f:Documentation/devicetree/bindings/sound/pcm179x.txt
-f:Documentation/devicetree/bindings/sound/pcm186x.txt
-f:Documentation/devicetree/bindings/sound/pcm3060.txt
-f:Documentation/devicetree/bindings/sound/pcm5102a.txt
-f:Documentation/devicetree/bindings/sound/qcom,apq8016-sbc-sndcard.yaml
-f:Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml
-f:Documentation/devicetree/bindings/sound/qcom,lpass-rx-macro.yaml
-f:Documentation/devicetree/bindings/sound/qcom,lpass-tx-macro.yaml
-f:Documentation/devicetree/bindings/sound/qcom,lpass-va-macro.yaml
-f:Documentation/devicetree/bindings/sound/qcom,lpass-wsa-macro.yaml
-f:Documentation/devicetree/bindings/sound/qcom,msm8916-wcd-digital-codec.yaml
-f:Documentation/devicetree/bindings/sound/qcom,pm8916-wcd-analog-codec.yaml
-f:Documentation/devicetree/bindings/sound/qcom,q6adm-routing.yaml
-f:Documentation/devicetree/bindings/sound/qcom,q6adm.yaml
-f:Documentation/devicetree/bindings/sound/qcom,q6afe.yaml
-f:Documentation/devicetree/bindings/sound/qcom,q6apm-dai.yaml
-f:Documentation/devicetree/bindings/sound/qcom,q6apm-lpass-dais.yaml
-f:Documentation/devicetree/bindings/sound/qcom,q6apm.yaml
-f:Documentation/devicetree/bindings/sound/qcom,q6asm-dais.yaml
-f:Documentation/devicetree/bindings/sound/qcom,q6asm.yaml
-f:Documentation/devicetree/bindings/sound/qcom,q6core.yaml
-f:Documentation/devicetree/bindings/sound/qcom,q6dsp-lpass-clocks.yaml
-f:Documentation/devicetree/bindings/sound/qcom,q6dsp-lpass-ports.yaml
-f:Documentation/devicetree/bindings/sound/qcom,q6prm.yaml
-f:Documentation/devicetree/bindings/sound/qcom,q6usb.yaml
-f:Documentation/devicetree/bindings/sound/qcom,sm8250.yaml
-f:Documentation/devicetree/bindings/sound/qcom,wcd9335.yaml
-f:Documentation/devicetree/bindings/sound/qcom,wcd934x.yaml
-f:Documentation/devicetree/bindings/sound/qcom,wcd937x-sdw.yaml
-f:Documentation/devicetree/bindings/sound/qcom,wcd937x.yaml
-f:Documentation/devicetree/bindings/sound/qcom,wcd938x-sdw.yaml
-f:Documentation/devicetree/bindings/sound/qcom,wcd938x.yaml
-f:Documentation/devicetree/bindings/sound/qcom,wcd939x-sdw.yaml
-f:Documentation/devicetree/bindings/sound/qcom,wcd939x.yaml
-f:Documentation/devicetree/bindings/sound/qcom,wcd93xx-common.yaml
-f:Documentation/devicetree/bindings/sound/qcom,wsa881x.yaml
-f:Documentation/devicetree/bindings/sound/qcom,wsa883x.yaml
-f:Documentation/devicetree/bindings/sound/qcom,wsa8840.yaml
-f:Documentation/devicetree/bindings/sound/realtek,alc203.yaml
-f:Documentation/devicetree/bindings/sound/realtek,alc5632.yaml
-f:Documentation/devicetree/bindings/sound/realtek,rt1015.yaml
-f:Documentation/devicetree/bindings/sound/realtek,rt1015p.yaml
-f:Documentation/devicetree/bindings/sound/realtek,rt1016.yaml
-f:Documentation/devicetree/bindings/sound/realtek,rt1019.yaml
-f:Documentation/devicetree/bindings/sound/realtek,rt5514.yaml
-f:Documentation/devicetree/bindings/sound/realtek,rt5616.yaml
-f:Documentation/devicetree/bindings/sound/realtek,rt5631.yaml
-f:Documentation/devicetree/bindings/sound/realtek,rt5640.yaml
-f:Documentation/devicetree/bindings/sound/realtek,rt5645.yaml
-f:Documentation/devicetree/bindings/sound/realtek,rt5659.yaml
-f:Documentation/devicetree/bindings/sound/realtek,rt5677.yaml
-f:Documentation/devicetree/bindings/sound/realtek,rt5682.yaml
-f:Documentation/devicetree/bindings/sound/realtek,rt5682s.yaml
-f:Documentation/devicetree/bindings/sound/renesas,fsi.yaml
-f:Documentation/devicetree/bindings/sound/renesas,idt821034.yaml
-f:Documentation/devicetree/bindings/sound/renesas,rsnd.txt
-f:Documentation/devicetree/bindings/sound/renesas,rsnd.yaml
-f:Documentation/devicetree/bindings/sound/renesas,rz-ssi.yaml
-f:Documentation/devicetree/bindings/sound/richtek,rt9120.yaml
-f:Documentation/devicetree/bindings/sound/richtek,rt9123.yaml
-f:Documentation/devicetree/bindings/sound/richtek,rt9123p.yaml
-f:Documentation/devicetree/bindings/sound/richtek,rtq9128.yaml
-f:Documentation/devicetree/bindings/sound/rockchip,i2s-tdm.yaml
-f:Documentation/devicetree/bindings/sound/rockchip,pdm.yaml
-f:Documentation/devicetree/bindings/sound/rockchip,rk3036-codec.yaml
-f:Documentation/devicetree/bindings/sound/rockchip,rk3288-hdmi-analog.txt
-f:Documentation/devicetree/bindings/sound/rockchip,rk3308-codec.yaml
-f:Documentation/devicetree/bindings/sound/rockchip,rk3328-codec.yaml
-f:Documentation/devicetree/bindings/sound/rockchip,rk3399-gru-sound.txt
-f:Documentation/devicetree/bindings/sound/rockchip,rk3576-sai.yaml
-f:Documentation/devicetree/bindings/sound/rockchip-i2s.yaml
-f:Documentation/devicetree/bindings/sound/rockchip-max98090.txt
-f:Documentation/devicetree/bindings/sound/rockchip-rt5645.txt
-f:Documentation/devicetree/bindings/sound/rockchip-spdif.yaml
-f:Documentation/devicetree/bindings/sound/rohm,bd28623.yaml
-f:Documentation/devicetree/bindings/sound/rt1011.txt
-f:Documentation/devicetree/bindings/sound/rt1308.txt
-f:Documentation/devicetree/bindings/sound/rt274.txt
-f:Documentation/devicetree/bindings/sound/rt5651.txt
-f:Documentation/devicetree/bindings/sound/rt5660.txt
-f:Documentation/devicetree/bindings/sound/rt5663.txt
-f:Documentation/devicetree/bindings/sound/rt5665.txt
-f:Documentation/devicetree/bindings/sound/rt5668.txt
-f:Documentation/devicetree/bindings/sound/samsung,aries-wm8994.yaml
-f:Documentation/devicetree/bindings/sound/samsung,arndale.yaml
-f:Documentation/devicetree/bindings/sound/samsung,midas-audio.yaml
-f:Documentation/devicetree/bindings/sound/samsung,odroid.yaml
-f:Documentation/devicetree/bindings/sound/samsung,smdk5250.yaml
-f:Documentation/devicetree/bindings/sound/samsung,snow.yaml
-f:Documentation/devicetree/bindings/sound/samsung,tm2.yaml
-f:Documentation/devicetree/bindings/sound/samsung-i2s.yaml
-f:Documentation/devicetree/bindings/sound/serial-midi.yaml
-f:Documentation/devicetree/bindings/sound/simple-audio-amplifier.yaml
-f:Documentation/devicetree/bindings/sound/simple-audio-mux.yaml
-f:Documentation/devicetree/bindings/sound/simple-card.yaml
-f:Documentation/devicetree/bindings/sound/sirf-audio-port.txt
-f:Documentation/devicetree/bindings/sound/sirf-audio.txt
-f:Documentation/devicetree/bindings/sound/snps,designware-i2s.yaml
-f:Documentation/devicetree/bindings/sound/soc-ac97link.txt
-f:Documentation/devicetree/bindings/sound/socionext,uniphier-aio.yaml
-f:Documentation/devicetree/bindings/sound/socionext,uniphier-evea.yaml
-f:Documentation/devicetree/bindings/sound/sound-card-common.yaml
-f:Documentation/devicetree/bindings/sound/sound-dai.yaml
-f:Documentation/devicetree/bindings/sound/sprd,pcm-platform.yaml
-f:Documentation/devicetree/bindings/sound/sprd,sc9860-mcdt.yaml
-f:Documentation/devicetree/bindings/sound/ssm4567.txt
-f:Documentation/devicetree/bindings/sound/st,sta32x.txt
-f:Documentation/devicetree/bindings/sound/st,sta350.txt
-f:Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt
-f:Documentation/devicetree/bindings/sound/st,stm32-i2s.yaml
-f:Documentation/devicetree/bindings/sound/st,stm32-sai.yaml
-f:Documentation/devicetree/bindings/sound/st,stm32-spdifrx.yaml
-f:Documentation/devicetree/bindings/sound/starfive,jh7110-pwmdac.yaml
-f:Documentation/devicetree/bindings/sound/starfive,jh7110-tdm.yaml
-f:Documentation/devicetree/bindings/sound/storm.txt
-f:Documentation/devicetree/bindings/sound/tas2552.txt
-f:Documentation/devicetree/bindings/sound/tas5720.txt
-f:Documentation/devicetree/bindings/sound/tda7419.txt
-f:Documentation/devicetree/bindings/sound/tdm-slot.txt
-f:Documentation/devicetree/bindings/sound/test-component.yaml
-f:Documentation/devicetree/bindings/sound/ti,ads117x.txt
-f:Documentation/devicetree/bindings/sound/ti,j721e-cpb-audio.yaml
-f:Documentation/devicetree/bindings/sound/ti,j721e-cpb-ivi-audio.yaml
-f:Documentation/devicetree/bindings/sound/ti,omap4-mcpdm.yaml
-f:Documentation/devicetree/bindings/sound/ti,pcm1681.yaml
-f:Documentation/devicetree/bindings/sound/ti,pcm3168a.yaml
-f:Documentation/devicetree/bindings/sound/ti,pcm512x.yaml
-f:Documentation/devicetree/bindings/sound/ti,pcm6240.yaml
-f:Documentation/devicetree/bindings/sound/ti,src4xxx.yaml
-f:Documentation/devicetree/bindings/sound/ti,tas2562.yaml
-f:Documentation/devicetree/bindings/sound/ti,tas2770.yaml
-f:Documentation/devicetree/bindings/sound/ti,tas2781.yaml
-f:Documentation/devicetree/bindings/sound/ti,tas27xx.yaml
-f:Documentation/devicetree/bindings/sound/ti,tas5086.txt
-f:Documentation/devicetree/bindings/sound/ti,tas57xx.yaml
-f:Documentation/devicetree/bindings/sound/ti,tas5805m.yaml
-f:Documentation/devicetree/bindings/sound/ti,tas6424.txt
-f:Documentation/devicetree/bindings/sound/ti,tlv320adc3xxx.yaml
-f:Documentation/devicetree/bindings/sound/ti,tlv320adcx140.yaml
-f:Documentation/devicetree/bindings/sound/ti,tlv320aic32x4.yaml
-f:Documentation/devicetree/bindings/sound/ti,tlv320aic3x.yaml
-f:Documentation/devicetree/bindings/sound/ti,tlv320dac3100.yaml
-f:Documentation/devicetree/bindings/sound/ti,tpa6130a2.yaml
-f:Documentation/devicetree/bindings/sound/ti,ts3a227e.yaml
-f:Documentation/devicetree/bindings/sound/tscs42xx.txt
-f:Documentation/devicetree/bindings/sound/tscs454.txt
-f:Documentation/devicetree/bindings/sound/uda1334.txt
-f:Documentation/devicetree/bindings/sound/ux500-mop500.txt
-f:Documentation/devicetree/bindings/sound/ux500-msp.txt
-f:Documentation/devicetree/bindings/sound/widgets.txt
-f:Documentation/devicetree/bindings/sound/wlf,arizona.yaml
-f:Documentation/devicetree/bindings/sound/wlf,wm8510.yaml
-f:Documentation/devicetree/bindings/sound/wlf,wm8523.yaml
-f:Documentation/devicetree/bindings/sound/wlf,wm8524.yaml
-f:Documentation/devicetree/bindings/sound/wlf,wm8580.yaml
-f:Documentation/devicetree/bindings/sound/wlf,wm8711.yaml
-f:Documentation/devicetree/bindings/sound/wlf,wm8728.yaml
-f:Documentation/devicetree/bindings/sound/wlf,wm8731.yaml
-f:Documentation/devicetree/bindings/sound/wlf,wm8737.yaml
-f:Documentation/devicetree/bindings/sound/wlf,wm8750.yaml
-f:Documentation/devicetree/bindings/sound/wlf,wm8753.yaml
-f:Documentation/devicetree/bindings/sound/wlf,wm8776.yaml
-f:Documentation/devicetree/bindings/sound/wlf,wm8782.yaml
-f:Documentation/devicetree/bindings/sound/wlf,wm8804.yaml
-f:Documentation/devicetree/bindings/sound/wlf,wm8903.yaml
-f:Documentation/devicetree/bindings/sound/wlf,wm8904.yaml
-f:Documentation/devicetree/bindings/sound/wlf,wm8940.yaml
-f:Documentation/devicetree/bindings/sound/wlf,wm8960.yaml
-f:Documentation/devicetree/bindings/sound/wlf,wm8961.yaml
-f:Documentation/devicetree/bindings/sound/wlf,wm8962.yaml
-f:Documentation/devicetree/bindings/sound/wlf,wm8974.yaml
-f:Documentation/devicetree/bindings/sound/wlf,wm8978.yaml
-f:Documentation/devicetree/bindings/sound/wlf,wm8994.yaml
-f:Documentation/devicetree/bindings/sound/wm8741.txt
-f:Documentation/devicetree/bindings/sound/wm8770.txt
-f:Documentation/devicetree/bindings/sound/xlnx,audio-formatter.yaml
-f:Documentation/devicetree/bindings/sound/xlnx,i2s.yaml
-f:Documentation/devicetree/bindings/sound/xlnx,spdif.yaml
-f:Documentation/devicetree/bindings/sound/xmos,xvf3500.yaml
-f:Documentation/devicetree/bindings/soundwire/qcom,soundwire.yaml
-f:Documentation/devicetree/bindings/soundwire/soundwire-controller.yaml
-f:Documentation/devicetree/bindings/spi/adi,axi-spi-engine.yaml
-f:Documentation/devicetree/bindings/spi/airoha,en7581-snand.yaml
-f:Documentation/devicetree/bindings/spi/allwinner,sun4i-a10-spi.yaml
-f:Documentation/devicetree/bindings/spi/allwinner,sun6i-a31-spi.yaml
-f:Documentation/devicetree/bindings/spi/amlogic,a1-spifc.yaml
-f:Documentation/devicetree/bindings/spi/amlogic,a4-spisg.yaml
-f:Documentation/devicetree/bindings/spi/amlogic,meson-gx-spicc.yaml
-f:Documentation/devicetree/bindings/spi/amlogic,meson6-spifc.yaml
-f:Documentation/devicetree/bindings/spi/apple,spi.yaml
-f:Documentation/devicetree/bindings/spi/arm,pl022-peripheral-props.yaml
-f:Documentation/devicetree/bindings/spi/aspeed,ast2600-fmc.yaml
-f:Documentation/devicetree/bindings/spi/atmel,at91rm9200-spi.yaml
-f:Documentation/devicetree/bindings/spi/atmel,quadspi.yaml
-f:Documentation/devicetree/bindings/spi/brcm,bcm2835-aux-spi.yaml
-f:Documentation/devicetree/bindings/spi/brcm,bcm2835-spi.yaml
-f:Documentation/devicetree/bindings/spi/brcm,bcm63xx-hsspi.yaml
-f:Documentation/devicetree/bindings/spi/brcm,bcm63xx-spi.yaml
-f:Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.yaml
-f:Documentation/devicetree/bindings/spi/cdns,qspi-nor-peripheral-props.yaml
-f:Documentation/devicetree/bindings/spi/cdns,qspi-nor.yaml
-f:Documentation/devicetree/bindings/spi/cdns,xspi.yaml
-f:Documentation/devicetree/bindings/spi/cirrus,ep9301-spi.yaml
-f:Documentation/devicetree/bindings/spi/fsl,dspi-peripheral-props.yaml
-f:Documentation/devicetree/bindings/spi/fsl,dspi.yaml
-f:Documentation/devicetree/bindings/spi/fsl,espi.yaml
-f:Documentation/devicetree/bindings/spi/fsl,spi-fsl-qspi.yaml
-f:Documentation/devicetree/bindings/spi/fsl,spi.yaml
-f:Documentation/devicetree/bindings/spi/fsl-imx-cspi.yaml
-f:Documentation/devicetree/bindings/spi/hpe,gxp-spifi.yaml
-f:Documentation/devicetree/bindings/spi/ibm,spi-fsi.yaml
-f:Documentation/devicetree/bindings/spi/icpdas-lp8841-spi-rtc.txt
-f:Documentation/devicetree/bindings/spi/ingenic,spi.yaml
-f:Documentation/devicetree/bindings/spi/jcore,spi.txt
-f:Documentation/devicetree/bindings/spi/loongson,ls2k-spi.yaml
-f:Documentation/devicetree/bindings/spi/marvell,armada-3700-spi.yaml
-f:Documentation/devicetree/bindings/spi/marvell,mmp2-ssp.yaml
-f:Documentation/devicetree/bindings/spi/marvell,orion-spi.yaml
-f:Documentation/devicetree/bindings/spi/mediatek,spi-mt65xx.yaml
-f:Documentation/devicetree/bindings/spi/mediatek,spi-mtk-nor.yaml
-f:Documentation/devicetree/bindings/spi/mediatek,spi-mtk-snfi.yaml
-f:Documentation/devicetree/bindings/spi/mediatek,spi-slave-mt27xx.yaml
-f:Documentation/devicetree/bindings/spi/microchip,mpfs-spi.yaml
-f:Documentation/devicetree/bindings/spi/microchip,spi-pic32.txt
-f:Documentation/devicetree/bindings/spi/mikrotik,rb4xx-spi.yaml
-f:Documentation/devicetree/bindings/spi/mxicy,mx25f0a-spi.yaml
-f:Documentation/devicetree/bindings/spi/mxs-spi.yaml
-f:Documentation/devicetree/bindings/spi/nuvoton,npcm-fiu.txt
-f:Documentation/devicetree/bindings/spi/nuvoton,npcm-pspi.txt
-f:Documentation/devicetree/bindings/spi/nuvoton,wpcm450-fiu.yaml
-f:Documentation/devicetree/bindings/spi/nvidia,tegra114-spi.yaml
-f:Documentation/devicetree/bindings/spi/nvidia,tegra20-sflash.yaml
-f:Documentation/devicetree/bindings/spi/nvidia,tegra20-slink.yaml
-f:Documentation/devicetree/bindings/spi/nvidia,tegra210-quad-peripheral-props.yaml
-f:Documentation/devicetree/bindings/spi/nvidia,tegra210-quad.yaml
-f:Documentation/devicetree/bindings/spi/nxp,lpc3220-spi.yaml
-f:Documentation/devicetree/bindings/spi/nxp,sc18is.yaml
-f:Documentation/devicetree/bindings/spi/omap-spi.yaml
-f:Documentation/devicetree/bindings/spi/qca,ar934x-spi.yaml
-f:Documentation/devicetree/bindings/spi/qcom,spi-geni-qcom.yaml
-f:Documentation/devicetree/bindings/spi/qcom,spi-qcom-qspi.yaml
-f:Documentation/devicetree/bindings/spi/qcom,spi-qpic-snand.yaml
-f:Documentation/devicetree/bindings/spi/qcom,spi-qup.yaml
-f:Documentation/devicetree/bindings/spi/ralink,mt7621-spi.yaml
-f:Documentation/devicetree/bindings/spi/realtek,rtl-spi.yaml
-f:Documentation/devicetree/bindings/spi/realtek,rtl9301-snand.yaml
-f:Documentation/devicetree/bindings/spi/renesas,hspi.yaml
-f:Documentation/devicetree/bindings/spi/renesas,rspi.yaml
-f:Documentation/devicetree/bindings/spi/renesas,rzv2h-rspi.yaml
-f:Documentation/devicetree/bindings/spi/renesas,rzv2m-csi.yaml
-f:Documentation/devicetree/bindings/spi/renesas,sh-msiof.yaml
-f:Documentation/devicetree/bindings/spi/rockchip-sfc.yaml
-f:Documentation/devicetree/bindings/spi/samsung,spi-peripheral-props.yaml
-f:Documentation/devicetree/bindings/spi/samsung,spi.yaml
-f:Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml
-f:Documentation/devicetree/bindings/spi/socionext,f-ospi.yaml
-f:Documentation/devicetree/bindings/spi/socionext,synquacer-spi.yaml
-f:Documentation/devicetree/bindings/spi/socionext,uniphier-spi.yaml
-f:Documentation/devicetree/bindings/spi/spi-ath79.txt
-f:Documentation/devicetree/bindings/spi/spi-bus.txt
-f:Documentation/devicetree/bindings/spi/spi-cadence.yaml
-f:Documentation/devicetree/bindings/spi/spi-clps711x.txt
-f:Documentation/devicetree/bindings/spi/spi-controller.yaml
-f:Documentation/devicetree/bindings/spi/spi-davinci.txt
-f:Documentation/devicetree/bindings/spi/spi-fsl-lpspi.yaml
-f:Documentation/devicetree/bindings/spi/spi-gpio.yaml
-f:Documentation/devicetree/bindings/spi/spi-img-spfi.txt
-f:Documentation/devicetree/bindings/spi/spi-lantiq-ssc.txt
-f:Documentation/devicetree/bindings/spi/spi-mux.yaml
-f:Documentation/devicetree/bindings/spi/spi-nxp-fspi.yaml
-f:Documentation/devicetree/bindings/spi/spi-octeon.txt
-f:Documentation/devicetree/bindings/spi/spi-peripheral-props.yaml
-f:Documentation/devicetree/bindings/spi/spi-pl022.yaml
-f:Documentation/devicetree/bindings/spi/spi-rockchip.yaml
-f:Documentation/devicetree/bindings/spi/spi-sg2044-nor.yaml
-f:Documentation/devicetree/bindings/spi/spi-sifive.yaml
-f:Documentation/devicetree/bindings/spi/spi-sunplus-sp7021.yaml
-f:Documentation/devicetree/bindings/spi/spi-xilinx.yaml
-f:Documentation/devicetree/bindings/spi/spi-xtensa-xtfpga.txt
-f:Documentation/devicetree/bindings/spi/spi-zynqmp-qspi.yaml
-f:Documentation/devicetree/bindings/spi/spi_altera.txt
-f:Documentation/devicetree/bindings/spi/spi_oc_tiny.txt
-f:Documentation/devicetree/bindings/spi/sprd,sc9860-spi.yaml
-f:Documentation/devicetree/bindings/spi/sprd,spi-adi.yaml
-f:Documentation/devicetree/bindings/spi/sqi-pic32.txt
-f:Documentation/devicetree/bindings/spi/st,ssc-spi.yaml
-f:Documentation/devicetree/bindings/spi/st,stm32-qspi.yaml
-f:Documentation/devicetree/bindings/spi/st,stm32-spi.yaml
-f:Documentation/devicetree/bindings/spi/st,stm32mp25-ospi.yaml
-f:Documentation/devicetree/bindings/spi/ti,qspi.yaml
-f:Documentation/devicetree/bindings/spi/xlnx,zynq-qspi.yaml
-f:Documentation/devicetree/bindings/spmi/apple,spmi.yaml
-f:Documentation/devicetree/bindings/spmi/hisilicon,hisi-spmi-controller.yaml
-f:Documentation/devicetree/bindings/spmi/mtk,spmi-mtk-pmif.yaml
-f:Documentation/devicetree/bindings/spmi/qcom,spmi-pmic-arb.yaml
-f:Documentation/devicetree/bindings/spmi/qcom,x1e80100-spmi-pmic-arb.yaml
-f:Documentation/devicetree/bindings/spmi/spmi.yaml
-f:Documentation/devicetree/bindings/sram/allwinner,sun4i-a10-system-control.yaml
-f:Documentation/devicetree/bindings/sram/qcom,imem.yaml
-f:Documentation/devicetree/bindings/sram/qcom,ocmem.yaml
-f:Documentation/devicetree/bindings/sram/sram.yaml
-f:Documentation/devicetree/bindings/submitting-patches.rst
-f:Documentation/devicetree/bindings/thermal/airoha,en7581-thermal.yaml
-f:Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml
-f:Documentation/devicetree/bindings/thermal/amazon,al-thermal.txt
-f:Documentation/devicetree/bindings/thermal/amlogic,thermal.yaml
-f:Documentation/devicetree/bindings/thermal/armada-thermal.txt
-f:Documentation/devicetree/bindings/thermal/brcm,avs-ro-thermal.yaml
-f:Documentation/devicetree/bindings/thermal/brcm,avs-tmon.yaml
-f:Documentation/devicetree/bindings/thermal/brcm,bcm2835-thermal.yaml
-f:Documentation/devicetree/bindings/thermal/brcm,ns-thermal.yaml
-f:Documentation/devicetree/bindings/thermal/brcm,sr-thermal.txt
-f:Documentation/devicetree/bindings/thermal/db8500-thermal.txt
-f:Documentation/devicetree/bindings/thermal/dlg,da9062-thermal.yaml
-f:Documentation/devicetree/bindings/thermal/dove-thermal.txt
-f:Documentation/devicetree/bindings/thermal/fsl,scu-thermal.yaml
-f:Documentation/devicetree/bindings/thermal/generic-adc-thermal.yaml
-f:Documentation/devicetree/bindings/thermal/hisilicon,tsensor.yaml
-f:Documentation/devicetree/bindings/thermal/imx-thermal.yaml
-f:Documentation/devicetree/bindings/thermal/imx8mm-thermal.yaml
-f:Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt
-f:Documentation/devicetree/bindings/thermal/loongson,ls2k-thermal.yaml
-f:Documentation/devicetree/bindings/thermal/max77620_thermal.txt
-f:Documentation/devicetree/bindings/thermal/mediatek,lvts-thermal.yaml
-f:Documentation/devicetree/bindings/thermal/mediatek,thermal.yaml
-f:Documentation/devicetree/bindings/thermal/nvidia,tegra124-soctherm.yaml
-f:Documentation/devicetree/bindings/thermal/nvidia,tegra186-bpmp-thermal.yaml
-f:Documentation/devicetree/bindings/thermal/nvidia,tegra30-tsensor.yaml
-f:Documentation/devicetree/bindings/thermal/qcom,spmi-temp-alarm.yaml
-f:Documentation/devicetree/bindings/thermal/qcom-lmh.yaml
-f:Documentation/devicetree/bindings/thermal/qcom-spmi-adc-tm-hc.yaml
-f:Documentation/devicetree/bindings/thermal/qcom-spmi-adc-tm5.yaml
-f:Documentation/devicetree/bindings/thermal/qcom-tsens.yaml
-f:Documentation/devicetree/bindings/thermal/qoriq-thermal.yaml
-f:Documentation/devicetree/bindings/thermal/rcar-gen3-thermal.yaml
-f:Documentation/devicetree/bindings/thermal/rcar-thermal.yaml
-f:Documentation/devicetree/bindings/thermal/rockchip-thermal.yaml
-f:Documentation/devicetree/bindings/thermal/rzg2l-thermal.yaml
-f:Documentation/devicetree/bindings/thermal/samsung,exynos-thermal.yaml
-f:Documentation/devicetree/bindings/thermal/socionext,uniphier-thermal.yaml
-f:Documentation/devicetree/bindings/thermal/spear-thermal.txt
-f:Documentation/devicetree/bindings/thermal/sprd-thermal.yaml
-f:Documentation/devicetree/bindings/thermal/st,stih407-thermal.yaml
-f:Documentation/devicetree/bindings/thermal/st,stm32-thermal.yaml
-f:Documentation/devicetree/bindings/thermal/thermal-cooling-devices.yaml
-f:Documentation/devicetree/bindings/thermal/thermal-idle.yaml
-f:Documentation/devicetree/bindings/thermal/thermal-sensor.yaml
-f:Documentation/devicetree/bindings/thermal/thermal-zones.yaml
-f:Documentation/devicetree/bindings/thermal/ti,am654-thermal.yaml
-f:Documentation/devicetree/bindings/thermal/ti,j72xx-thermal.yaml
-f:Documentation/devicetree/bindings/thermal/ti_soc_thermal.txt
-f:Documentation/devicetree/bindings/timer/actions,owl-timer.yaml
-f:Documentation/devicetree/bindings/timer/allwinner,sun4i-a10-timer.yaml
-f:Documentation/devicetree/bindings/timer/allwinner,sun5i-a13-hstimer.yaml
-f:Documentation/devicetree/bindings/timer/altr,timer-1.0.yaml
-f:Documentation/devicetree/bindings/timer/amlogic,meson6-timer.yaml
-f:Documentation/devicetree/bindings/timer/andestech,plmt0.yaml
-f:Documentation/devicetree/bindings/timer/arm,arch_timer.yaml
-f:Documentation/devicetree/bindings/timer/arm,arch_timer_mmio.yaml
-f:Documentation/devicetree/bindings/timer/arm,armv7m-systick.yaml
-f:Documentation/devicetree/bindings/timer/arm,global_timer.yaml
-f:Documentation/devicetree/bindings/timer/arm,mps2-timer.yaml
-f:Documentation/devicetree/bindings/timer/arm,sp804.yaml
-f:Documentation/devicetree/bindings/timer/arm,twd-timer.yaml
-f:Documentation/devicetree/bindings/timer/brcm,bcm2835-system-timer.yaml
-f:Documentation/devicetree/bindings/timer/brcm,bcmbca-timer.yaml
-f:Documentation/devicetree/bindings/timer/brcm,kona-timer.yaml
-f:Documentation/devicetree/bindings/timer/cdns,ttc.yaml
-f:Documentation/devicetree/bindings/timer/cirrus,clps711x-timer.yaml
-f:Documentation/devicetree/bindings/timer/cirrus,ep9301-timer.yaml
-f:Documentation/devicetree/bindings/timer/cnxt,cx92755-timer.yaml
-f:Documentation/devicetree/bindings/timer/csky,gx6605s-timer.yaml
-f:Documentation/devicetree/bindings/timer/csky,mptimer.yaml
-f:Documentation/devicetree/bindings/timer/econet,en751221-timer.yaml
-f:Documentation/devicetree/bindings/timer/ezchip,nps400-timer.yaml
-f:Documentation/devicetree/bindings/timer/faraday,fttmr010.txt
-f:Documentation/devicetree/bindings/timer/fsl,ftm-timer.yaml
-f:Documentation/devicetree/bindings/timer/fsl,gtm.yaml
-f:Documentation/devicetree/bindings/timer/fsl,imxgpt.yaml
-f:Documentation/devicetree/bindings/timer/fsl,vf610-pit.yaml
-f:Documentation/devicetree/bindings/timer/hpe,gxp-timer.yaml
-f:Documentation/devicetree/bindings/timer/img,pistachio-gptimer.yaml
-f:Documentation/devicetree/bindings/timer/ingenic,sysost.yaml
-f:Documentation/devicetree/bindings/timer/ingenic,tcu.yaml
-f:Documentation/devicetree/bindings/timer/intel,ixp4xx-timer.yaml
-f:Documentation/devicetree/bindings/timer/jcore,pit.yaml
-f:Documentation/devicetree/bindings/timer/loongson,ls1x-pwmtimer.yaml
-f:Documentation/devicetree/bindings/timer/lsi,zevio-timer.yaml
-f:Documentation/devicetree/bindings/timer/marvell,armada-370-timer.yaml
-f:Documentation/devicetree/bindings/timer/marvell,orion-timer.yaml
-f:Documentation/devicetree/bindings/timer/mediatek,timer.yaml
-f:Documentation/devicetree/bindings/timer/mrvl,mmp-timer.yaml
-f:Documentation/devicetree/bindings/timer/mstar,msc313e-timer.yaml
-f:Documentation/devicetree/bindings/timer/nuvoton,npcm7xx-timer.yaml
-f:Documentation/devicetree/bindings/timer/nvidia,tegra-timer.yaml
-f:Documentation/devicetree/bindings/timer/nvidia,tegra186-timer.yaml
-f:Documentation/devicetree/bindings/timer/nxp,lpc3220-timer.yaml
-f:Documentation/devicetree/bindings/timer/nxp,s32g2-stm.yaml
-f:Documentation/devicetree/bindings/timer/nxp,sysctr-timer.yaml
-f:Documentation/devicetree/bindings/timer/nxp,tpm-timer.yaml
-f:Documentation/devicetree/bindings/timer/ralink,cevt-systick.yaml
-f:Documentation/devicetree/bindings/timer/ralink,rt2880-timer.yaml
-f:Documentation/devicetree/bindings/timer/rda,8810pl-timer.yaml
-f:Documentation/devicetree/bindings/timer/realtek,otto-timer.yaml
-f:Documentation/devicetree/bindings/timer/renesas,cmt.yaml
-f:Documentation/devicetree/bindings/timer/renesas,em-sti.yaml
-f:Documentation/devicetree/bindings/timer/renesas,mtu2.yaml
-f:Documentation/devicetree/bindings/timer/renesas,ostm.yaml
-f:Documentation/devicetree/bindings/timer/renesas,rz-mtu3.yaml
-f:Documentation/devicetree/bindings/timer/renesas,tmu.yaml
-f:Documentation/devicetree/bindings/timer/riscv,timer.yaml
-f:Documentation/devicetree/bindings/timer/rockchip,rk-timer.yaml
-f:Documentation/devicetree/bindings/timer/samsung,exynos4210-mct.yaml
-f:Documentation/devicetree/bindings/timer/sifive,clint.yaml
-f:Documentation/devicetree/bindings/timer/snps,arc-timer.yaml
-f:Documentation/devicetree/bindings/timer/snps,archs-gfrc.yaml
-f:Documentation/devicetree/bindings/timer/snps,archs-rtc.yaml
-f:Documentation/devicetree/bindings/timer/snps,dw-apb-timer.yaml
-f:Documentation/devicetree/bindings/timer/socionext,milbeaut-timer.yaml
-f:Documentation/devicetree/bindings/timer/sprd,sc9860-timer.yaml
-f:Documentation/devicetree/bindings/timer/st,nomadik-mtu.yaml
-f:Documentation/devicetree/bindings/timer/st,spear-timer.yaml
-f:Documentation/devicetree/bindings/timer/st,stih407-lpc
-f:Documentation/devicetree/bindings/timer/st,stm32-timer.yaml
-f:Documentation/devicetree/bindings/timer/thead,c900-aclint-mtimer.yaml
-f:Documentation/devicetree/bindings/timer/ti,da830-timer.yaml
-f:Documentation/devicetree/bindings/timer/ti,keystone-timer.yaml
-f:Documentation/devicetree/bindings/timer/ti,timer-dm.yaml
-f:Documentation/devicetree/bindings/timer/via,vt8500-timer.yaml
-f:Documentation/devicetree/bindings/timer/xlnx,xps-timer.yaml
-f:Documentation/devicetree/bindings/timestamp/hardware-timestamps-common.yaml
-f:Documentation/devicetree/bindings/timestamp/hte-consumer.yaml
-f:Documentation/devicetree/bindings/timestamp/nvidia,tegra194-hte.yaml
-f:Documentation/devicetree/bindings/tpm/google,cr50.yaml
-f:Documentation/devicetree/bindings/tpm/ibm,vtpm.yaml
-f:Documentation/devicetree/bindings/tpm/microsoft,ftpm.yaml
-f:Documentation/devicetree/bindings/tpm/tcg,tpm-tis-i2c.yaml
-f:Documentation/devicetree/bindings/tpm/tcg,tpm-tis-mmio.yaml
-f:Documentation/devicetree/bindings/tpm/tcg,tpm_tis-spi.yaml
-f:Documentation/devicetree/bindings/tpm/tpm-common.yaml
-f:Documentation/devicetree/bindings/trigger-source/adi,util-sigma-delta-spi.yaml
-f:Documentation/devicetree/bindings/trigger-source/gpio-trigger.yaml
-f:Documentation/devicetree/bindings/trigger-source/pwm-trigger.yaml
-f:Documentation/devicetree/bindings/trivial-devices.yaml
-f:Documentation/devicetree/bindings/ufs/cdns,ufshc.yaml
-f:Documentation/devicetree/bindings/ufs/hisilicon,ufs.yaml
-f:Documentation/devicetree/bindings/ufs/mediatek,ufs.yaml
-f:Documentation/devicetree/bindings/ufs/qcom,ufs.yaml
-f:Documentation/devicetree/bindings/ufs/renesas,ufs.yaml
-f:Documentation/devicetree/bindings/ufs/rockchip,rk3576-ufshc.yaml
-f:Documentation/devicetree/bindings/ufs/samsung,exynos-ufs.yaml
-f:Documentation/devicetree/bindings/ufs/snps,tc-dwc-g210.yaml
-f:Documentation/devicetree/bindings/ufs/sprd,ums9620-ufs.yaml
-f:Documentation/devicetree/bindings/ufs/ti,j721e-ufs.yaml
-f:Documentation/devicetree/bindings/ufs/ufs-common.yaml
-f:Documentation/devicetree/bindings/unittest.txt
-f:Documentation/devicetree/bindings/usb/allwinner,sun4i-a10-musb.yaml
-f:Documentation/devicetree/bindings/usb/am33xx-usb.txt
-f:Documentation/devicetree/bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml
-f:Documentation/devicetree/bindings/usb/analogix,anx7411.yaml
-f:Documentation/devicetree/bindings/usb/aspeed,ast2600-udc.yaml
-f:Documentation/devicetree/bindings/usb/aspeed,usb-vhub.yaml
-f:Documentation/devicetree/bindings/usb/atmel-usb.txt
-f:Documentation/devicetree/bindings/usb/brcm,bcm7445-ehci.yaml
-f:Documentation/devicetree/bindings/usb/brcm,bdc.yaml
-f:Documentation/devicetree/bindings/usb/brcm,usb-pinmap.yaml
-f:Documentation/devicetree/bindings/usb/cdns,usb3.yaml
-f:Documentation/devicetree/bindings/usb/chipidea,usb2-common.yaml
-f:Documentation/devicetree/bindings/usb/chipidea,usb2-imx.yaml
-f:Documentation/devicetree/bindings/usb/ci-hdrc-usb2.yaml
-f:Documentation/devicetree/bindings/usb/cypress,cypd4226.yaml
-f:Documentation/devicetree/bindings/usb/cypress,hx3.yaml
-f:Documentation/devicetree/bindings/usb/da8xx-usb.txt
-f:Documentation/devicetree/bindings/usb/dwc2.yaml
-f:Documentation/devicetree/bindings/usb/dwc3-cavium.txt
-f:Documentation/devicetree/bindings/usb/dwc3-st.txt
-f:Documentation/devicetree/bindings/usb/dwc3-xilinx.yaml
-f:Documentation/devicetree/bindings/usb/ehci-st.txt
-f:Documentation/devicetree/bindings/usb/faraday,fotg210.yaml
-f:Documentation/devicetree/bindings/usb/fcs,fsa4480.yaml
-f:Documentation/devicetree/bindings/usb/fcs,fusb302.yaml
-f:Documentation/devicetree/bindings/usb/fsl,imx8mp-dwc3.yaml
-f:Documentation/devicetree/bindings/usb/fsl,imx8mq-dwc3.yaml
-f:Documentation/devicetree/bindings/usb/fsl,imx8qm-cdns3.yaml
-f:Documentation/devicetree/bindings/usb/fsl,ls1028a.yaml
-f:Documentation/devicetree/bindings/usb/fsl,usb2.yaml
-f:Documentation/devicetree/bindings/usb/fsl,usbmisc.yaml
-f:Documentation/devicetree/bindings/usb/generic-ehci.yaml
-f:Documentation/devicetree/bindings/usb/generic-ohci.yaml
-f:Documentation/devicetree/bindings/usb/generic-xhci.yaml
-f:Documentation/devicetree/bindings/usb/genesys,gl850g.yaml
-f:Documentation/devicetree/bindings/usb/gpio-sbu-mux.yaml
-f:Documentation/devicetree/bindings/usb/gr-udc.txt
-f:Documentation/devicetree/bindings/usb/hisilicon,hi3798mv200-dwc3.yaml
-f:Documentation/devicetree/bindings/usb/hisilicon,histb-xhci.txt
-f:Documentation/devicetree/bindings/usb/ingenic,musb.yaml
-f:Documentation/devicetree/bindings/usb/intel,keembay-dwc3.yaml
-f:Documentation/devicetree/bindings/usb/iproc-udc.txt
-f:Documentation/devicetree/bindings/usb/ite,it5205.yaml
-f:Documentation/devicetree/bindings/usb/marvell,pxau2o-ehci.yaml
-f:Documentation/devicetree/bindings/usb/maxim,max33359.yaml
-f:Documentation/devicetree/bindings/usb/maxim,max3420-udc.yaml
-f:Documentation/devicetree/bindings/usb/maxim,max3421.txt
-f:Documentation/devicetree/bindings/usb/mediatek,mt6360-tcpc.yaml
-f:Documentation/devicetree/bindings/usb/mediatek,mt6370-tcpc.yaml
-f:Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml
-f:Documentation/devicetree/bindings/usb/mediatek,mtu3.yaml
-f:Documentation/devicetree/bindings/usb/mediatek,musb.yaml
-f:Documentation/devicetree/bindings/usb/microchip,mpfs-musb.yaml
-f:Documentation/devicetree/bindings/usb/microchip,usb2514.yaml
-f:Documentation/devicetree/bindings/usb/microchip,usb5744.yaml
-f:Documentation/devicetree/bindings/usb/nvidia,tegra-xudc.yaml
-f:Documentation/devicetree/bindings/usb/nvidia,tegra124-xusb.yaml
-f:Documentation/devicetree/bindings/usb/nvidia,tegra186-xusb.yaml
-f:Documentation/devicetree/bindings/usb/nvidia,tegra194-xusb.yaml
-f:Documentation/devicetree/bindings/usb/nvidia,tegra20-ehci.txt
-f:Documentation/devicetree/bindings/usb/nvidia,tegra210-xusb.yaml
-f:Documentation/devicetree/bindings/usb/nvidia,tegra234-xusb.yaml
-f:Documentation/devicetree/bindings/usb/nxp,isp1760.yaml
-f:Documentation/devicetree/bindings/usb/nxp,lpc3220-udc.yaml
-f:Documentation/devicetree/bindings/usb/nxp,ptn36502.yaml
-f:Documentation/devicetree/bindings/usb/nxp,ptn5110.yaml
-f:Documentation/devicetree/bindings/usb/octeon-usb.txt
-f:Documentation/devicetree/bindings/usb/ohci-da8xx.txt
-f:Documentation/devicetree/bindings/usb/ohci-st.txt
-f:Documentation/devicetree/bindings/usb/omap-usb.txt
-f:Documentation/devicetree/bindings/usb/onnn,nb7vpq904m.yaml
-f:Documentation/devicetree/bindings/usb/parade,ps5511.yaml
-f:Documentation/devicetree/bindings/usb/parade,ps8830.yaml
-f:Documentation/devicetree/bindings/usb/pxa-usb.txt
-f:Documentation/devicetree/bindings/usb/qcom,dwc3.yaml
-f:Documentation/devicetree/bindings/usb/qcom,pmic-typec.yaml
-f:Documentation/devicetree/bindings/usb/qcom,snps-dwc3.yaml
-f:Documentation/devicetree/bindings/usb/qcom,wcd939x-usbss.yaml
-f:Documentation/devicetree/bindings/usb/realtek,rtd-dwc3.yaml
-f:Documentation/devicetree/bindings/usb/realtek,rtd-type-c.yaml
-f:Documentation/devicetree/bindings/usb/realtek,rts5411.yaml
-f:Documentation/devicetree/bindings/usb/renesas,rzn1-usbf.yaml
-f:Documentation/devicetree/bindings/usb/renesas,rzv2m-usb3drd.yaml
-f:Documentation/devicetree/bindings/usb/renesas,usb-xhci.yaml
-f:Documentation/devicetree/bindings/usb/renesas,usb3-peri.yaml
-f:Documentation/devicetree/bindings/usb/renesas,usbhs.yaml
-f:Documentation/devicetree/bindings/usb/richtek,rt1711h.txt
-f:Documentation/devicetree/bindings/usb/richtek,rt1711h.yaml
-f:Documentation/devicetree/bindings/usb/richtek,rt1719.yaml
-f:Documentation/devicetree/bindings/usb/rockchip,dwc3.yaml
-f:Documentation/devicetree/bindings/usb/rockchip,rk3399-dwc3.yaml
-f:Documentation/devicetree/bindings/usb/s3c2410-usb.txt
-f:Documentation/devicetree/bindings/usb/samsung,exynos-dwc3.yaml
-f:Documentation/devicetree/bindings/usb/samsung,exynos-usb2.yaml
-f:Documentation/devicetree/bindings/usb/smsc,usb3503.yaml
-f:Documentation/devicetree/bindings/usb/snps,dwc3-common.yaml
-f:Documentation/devicetree/bindings/usb/snps,dwc3.yaml
-f:Documentation/devicetree/bindings/usb/st,stusb160x.yaml
-f:Documentation/devicetree/bindings/usb/st,typec-stm32g0.yaml
-f:Documentation/devicetree/bindings/usb/starfive,jh7110-usb.yaml
-f:Documentation/devicetree/bindings/usb/ti,am62-usb.yaml
-f:Documentation/devicetree/bindings/usb/ti,hd3ss3220.yaml
-f:Documentation/devicetree/bindings/usb/ti,j721e-usb.yaml
-f:Documentation/devicetree/bindings/usb/ti,keystone-dwc3.yaml
-f:Documentation/devicetree/bindings/usb/ti,tps6598x.yaml
-f:Documentation/devicetree/bindings/usb/ti,tusb1046.yaml
-f:Documentation/devicetree/bindings/usb/ti,tusb73x0-pci.yaml
-f:Documentation/devicetree/bindings/usb/ti,usb8020b.yaml
-f:Documentation/devicetree/bindings/usb/ti,usb8041.yaml
-f:Documentation/devicetree/bindings/usb/twlxxxx-usb.txt
-f:Documentation/devicetree/bindings/usb/ulpi.txt
-f:Documentation/devicetree/bindings/usb/usb-device.yaml
-f:Documentation/devicetree/bindings/usb/usb-drd.yaml
-f:Documentation/devicetree/bindings/usb/usb-hcd.yaml
-f:Documentation/devicetree/bindings/usb/usb-hub.yaml
-f:Documentation/devicetree/bindings/usb/usb-nop-xceiv.yaml
-f:Documentation/devicetree/bindings/usb/usb-switch.yaml
-f:Documentation/devicetree/bindings/usb/usb-uhci.yaml
-f:Documentation/devicetree/bindings/usb/usb-xhci.yaml
-f:Documentation/devicetree/bindings/usb/usb.yaml
-f:Documentation/devicetree/bindings/usb/usb251xb.yaml
-f:Documentation/devicetree/bindings/usb/usb4604.txt
-f:Documentation/devicetree/bindings/usb/ux500-usb.txt
-f:Documentation/devicetree/bindings/usb/vialab,vl817.yaml
-f:Documentation/devicetree/bindings/usb/willsemi,wusb3801.yaml
-f:Documentation/devicetree/bindings/usb/xlnx,usb2.yaml
-f:Documentation/devicetree/bindings/vendor-prefixes.yaml
-f:Documentation/devicetree/bindings/virtio/mmio.yaml
-f:Documentation/devicetree/bindings/virtio/pci-iommu.yaml
-f:Documentation/devicetree/bindings/virtio/virtio-device.yaml
-f:Documentation/devicetree/bindings/w1/amd,axi-1wire-host.yaml
-f:Documentation/devicetree/bindings/w1/fsl-imx-owire.yaml
-f:Documentation/devicetree/bindings/w1/maxim,ds2482.yaml
-f:Documentation/devicetree/bindings/w1/omap-hdq.txt
-f:Documentation/devicetree/bindings/w1/w1-gpio.yaml
-f:Documentation/devicetree/bindings/w1/w1-uart.yaml
-f:Documentation/devicetree/bindings/w1/w1.txt
-f:Documentation/devicetree/bindings/watchdog/airoha,en7581-wdt.yaml
-f:Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml
-f:Documentation/devicetree/bindings/watchdog/alphascale,asm9260-wdt.yaml
-f:Documentation/devicetree/bindings/watchdog/amlogic,meson-gxbb-wdt.yaml
-f:Documentation/devicetree/bindings/watchdog/amlogic,meson6-wdt.yaml
-f:Documentation/devicetree/bindings/watchdog/apple,wdt.yaml
-f:Documentation/devicetree/bindings/watchdog/arm,sbsa-gwdt.yaml
-f:Documentation/devicetree/bindings/watchdog/arm,sp805.yaml
-f:Documentation/devicetree/bindings/watchdog/arm,twd-wdt.yaml
-f:Documentation/devicetree/bindings/watchdog/arm-smc-wdt.yaml
-f:Documentation/devicetree/bindings/watchdog/armada-37xx-wdt.txt
-f:Documentation/devicetree/bindings/watchdog/aspeed,ast2400-wdt.yaml
-f:Documentation/devicetree/bindings/watchdog/atmel,at91rm9200-wdt.yaml
-f:Documentation/devicetree/bindings/watchdog/atmel,at91sam9-wdt.yaml
-f:Documentation/devicetree/bindings/watchdog/atmel,sama5d4-wdt.yaml
-f:Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.yaml
-f:Documentation/devicetree/bindings/watchdog/brcm,kona-wdt.yaml
-f:Documentation/devicetree/bindings/watchdog/cdns,wdt-r1p2.yaml
-f:Documentation/devicetree/bindings/watchdog/cirrus,ep9301-wdt.yaml
-f:Documentation/devicetree/bindings/watchdog/cnxt,cx92755-wdt.yaml
-f:Documentation/devicetree/bindings/watchdog/dlg,da9062-watchdog.yaml
-f:Documentation/devicetree/bindings/watchdog/faraday,ftwdt010.yaml
-f:Documentation/devicetree/bindings/watchdog/fsl,scu-wdt.yaml
-f:Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml
-f:Documentation/devicetree/bindings/watchdog/fsl-imx7ulp-wdt.yaml
-f:Documentation/devicetree/bindings/watchdog/img,pdc-wdt.yaml
-f:Documentation/devicetree/bindings/watchdog/intel,keembay-wdt.yaml
-f:Documentation/devicetree/bindings/watchdog/kontron,sl28cpld-wdt.yaml
-f:Documentation/devicetree/bindings/watchdog/lantiq-wdt.txt
-f:Documentation/devicetree/bindings/watchdog/linux,wdt-gpio.yaml
-f:Documentation/devicetree/bindings/watchdog/loongson,ls1x-wdt.yaml
-f:Documentation/devicetree/bindings/watchdog/marvel.txt
-f:Documentation/devicetree/bindings/watchdog/marvell,cn10624-wdt.yaml
-f:Documentation/devicetree/bindings/watchdog/maxim,max63xx.yaml
-f:Documentation/devicetree/bindings/watchdog/mediatek,mt7621-wdt.yaml
-f:Documentation/devicetree/bindings/watchdog/mediatek,mtk-wdt.yaml
-f:Documentation/devicetree/bindings/watchdog/men-a021-wdt.txt
-f:Documentation/devicetree/bindings/watchdog/microchip,pic32-dmt.txt
-f:Documentation/devicetree/bindings/watchdog/microchip,pic32-wdt.txt
-f:Documentation/devicetree/bindings/watchdog/moxa,moxart-watchdog.txt
-f:Documentation/devicetree/bindings/watchdog/mpc8xxx-wdt.txt
-f:Documentation/devicetree/bindings/watchdog/mstar,msc313e-wdt.yaml
-f:Documentation/devicetree/bindings/watchdog/nuvoton,npcm-wdt.txt
-f:Documentation/devicetree/bindings/watchdog/nxp,lpc1850-wwdt.yaml
-f:Documentation/devicetree/bindings/watchdog/nxp,pnx4008-wdt.yaml
-f:Documentation/devicetree/bindings/watchdog/nxp,s32g2-swt.yaml
-f:Documentation/devicetree/bindings/watchdog/omap-wdt.txt
-f:Documentation/devicetree/bindings/watchdog/qca,ar7130-wdt.yaml
-f:Documentation/devicetree/bindings/watchdog/qcom,pm8916-wdt.yaml
-f:Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
-f:Documentation/devicetree/bindings/watchdog/ralink,rt2880-wdt.yaml
-f:Documentation/devicetree/bindings/watchdog/realtek,otto-wdt.yaml
-f:Documentation/devicetree/bindings/watchdog/realtek,rtd1295-watchdog.yaml
-f:Documentation/devicetree/bindings/watchdog/renesas,wdt.yaml
-f:Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml
-f:Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml
-f:Documentation/devicetree/bindings/watchdog/socionext,uniphier-wdt.yaml
-f:Documentation/devicetree/bindings/watchdog/sprd,sp9860-wdt.yaml
-f:Documentation/devicetree/bindings/watchdog/st,stm32-iwdg.yaml
-f:Documentation/devicetree/bindings/watchdog/st_lpc_wdt.txt
-f:Documentation/devicetree/bindings/watchdog/starfive,jh7100-wdt.yaml
-f:Documentation/devicetree/bindings/watchdog/sunplus,sp7021-wdt.yaml
-f:Documentation/devicetree/bindings/watchdog/technologic,ts7200-wdt.yaml
-f:Documentation/devicetree/bindings/watchdog/ti,davinci-wdt.yaml
-f:Documentation/devicetree/bindings/watchdog/ti,rti-wdt.yaml
-f:Documentation/devicetree/bindings/watchdog/toshiba,visconti-wdt.yaml
-f:Documentation/devicetree/bindings/watchdog/ts4800-wdt.txt
-f:Documentation/devicetree/bindings/watchdog/watchdog.yaml
-f:Documentation/devicetree/bindings/watchdog/xlnx,versal-wwdt.yaml
-f:Documentation/devicetree/bindings/watchdog/xlnx,xps-timebase-wdt.yaml
-f:Documentation/devicetree/bindings/watchdog/zii,rave-sp-wdt.yaml
-f:Documentation/devicetree/bindings/watchdog/zii,rave-wdt.yaml
-f:Documentation/devicetree/bindings/writing-bindings.rst
-f:Documentation/devicetree/bindings/writing-schema.rst
-f:Documentation/devicetree/bindings/x86/ce4100.txt
-f:Documentation/devicetree/bindings/x86/timer.txt
-f:Documentation/devicetree/bindings/xilinx.txt
-f:Documentation/devicetree/bindings/xillybus/xillybus.txt
-f:Documentation/devicetree/changesets.rst
-f:Documentation/devicetree/dynamic-resolution-notes.rst
-f:Documentation/devicetree/index.rst
-f:Documentation/devicetree/kernel-api.rst
-f:Documentation/devicetree/of_unittest.rst
-f:Documentation/devicetree/overlay-notes.rst
-f:Documentation/devicetree/usage-model.rst
-f:Documentation/doc-guide/checktransupdate.rst
-f:Documentation/doc-guide/contributing.rst
-f:Documentation/doc-guide/hello.dot
-f:Documentation/doc-guide/index.rst
-f:Documentation/doc-guide/kernel-doc.rst
-f:Documentation/doc-guide/maintainer-profile.rst
-f:Documentation/doc-guide/parse-headers.rst
-f:Documentation/doc-guide/sphinx.rst
-f:Documentation/doc-guide/svg_image.svg
-f:Documentation/docutils.conf
-f:Documentation/driver-api/80211/cfg80211.rst
-f:Documentation/driver-api/80211/index.rst
-f:Documentation/driver-api/80211/introduction.rst
-f:Documentation/driver-api/80211/mac80211-advanced.rst
-f:Documentation/driver-api/80211/mac80211.rst
-f:Documentation/driver-api/acpi/index.rst
-f:Documentation/driver-api/acpi/linuxized-acpica.rst
-f:Documentation/driver-api/acpi/scan_handlers.rst
-f:Documentation/driver-api/aperture.rst
-f:Documentation/driver-api/auxiliary_bus.rst
-f:Documentation/driver-api/backlight/lp855x-driver.rst
-f:Documentation/driver-api/basics.rst
-f:Documentation/driver-api/clk.rst
-f:Documentation/driver-api/coco/index.rst
-f:Documentation/driver-api/coco/measurement-registers.rst
-f:Documentation/driver-api/component.rst
-f:Documentation/driver-api/connector.rst
-f:Documentation/driver-api/console.rst
-f:Documentation/driver-api/crypto/iaa/iaa-crypto.rst
-f:Documentation/driver-api/crypto/iaa/index.rst
-f:Documentation/driver-api/crypto/index.rst
-f:Documentation/driver-api/cxl/allocation/dax.rst
-f:Documentation/driver-api/cxl/allocation/hugepages.rst
-f:Documentation/driver-api/cxl/allocation/page-allocator.rst
-f:Documentation/driver-api/cxl/allocation/reclaim.rst
-f:Documentation/driver-api/cxl/devices/device-types.rst
-f:Documentation/driver-api/cxl/index.rst
-f:Documentation/driver-api/cxl/linux/access-coordinates.rst
-f:Documentation/driver-api/cxl/linux/cxl-driver.rst
-f:Documentation/driver-api/cxl/linux/dax-driver.rst
-f:Documentation/driver-api/cxl/linux/early-boot.rst
-f:Documentation/driver-api/cxl/linux/example-configurations/hb-interleave.rst
-f:Documentation/driver-api/cxl/linux/example-configurations/intra-hb-interleave.rst
-f:Documentation/driver-api/cxl/linux/example-configurations/multi-interleave.rst
-f:Documentation/driver-api/cxl/linux/example-configurations/single-device.rst
-f:Documentation/driver-api/cxl/linux/memory-hotplug.rst
-f:Documentation/driver-api/cxl/linux/overview.rst
-f:Documentation/driver-api/cxl/maturity-map.rst
-f:Documentation/driver-api/cxl/platform/acpi.rst
-f:Documentation/driver-api/cxl/platform/acpi/cedt.rst
-f:Documentation/driver-api/cxl/platform/acpi/dsdt.rst
-f:Documentation/driver-api/cxl/platform/acpi/hmat.rst
-f:Documentation/driver-api/cxl/platform/acpi/slit.rst
-f:Documentation/driver-api/cxl/platform/acpi/srat.rst
-f:Documentation/driver-api/cxl/platform/bios-and-efi.rst
-f:Documentation/driver-api/cxl/platform/cdat.rst
-f:Documentation/driver-api/cxl/platform/example-configs.rst
-f:Documentation/driver-api/cxl/platform/example-configurations/flexible.rst
-f:Documentation/driver-api/cxl/platform/example-configurations/hb-interleave.rst
-f:Documentation/driver-api/cxl/platform/example-configurations/multi-dev-per-hb.rst
-f:Documentation/driver-api/cxl/platform/example-configurations/one-dev-per-hb.rst
-f:Documentation/driver-api/cxl/theory-of-operation.rst
-f:Documentation/driver-api/devfreq.rst
-f:Documentation/driver-api/device-io.rst
-f:Documentation/driver-api/device_link.rst
-f:Documentation/driver-api/dma-buf.rst
-f:Documentation/driver-api/dmaengine/client.rst
-f:Documentation/driver-api/dmaengine/dmatest.rst
-f:Documentation/driver-api/dmaengine/index.rst
-f:Documentation/driver-api/dmaengine/provider.rst
-f:Documentation/driver-api/dmaengine/pxa_dma.rst
-f:Documentation/driver-api/dpll.rst
-f:Documentation/driver-api/driver-model/binding.rst
-f:Documentation/driver-api/driver-model/bus.rst
-f:Documentation/driver-api/driver-model/design-patterns.rst
-f:Documentation/driver-api/driver-model/device.rst
-f:Documentation/driver-api/driver-model/devres.rst
-f:Documentation/driver-api/driver-model/driver.rst
-f:Documentation/driver-api/driver-model/index.rst
-f:Documentation/driver-api/driver-model/overview.rst
-f:Documentation/driver-api/driver-model/platform.rst
-f:Documentation/driver-api/driver-model/porting.rst
-f:Documentation/driver-api/early-userspace/buffer-format.rst
-f:Documentation/driver-api/early-userspace/early_userspace_support.rst
-f:Documentation/driver-api/early-userspace/index.rst
-f:Documentation/driver-api/edac.rst
-f:Documentation/driver-api/eisa.rst
-f:Documentation/driver-api/extcon.rst
-f:Documentation/driver-api/firewire.rst
-f:Documentation/driver-api/firmware/built-in-fw.rst
-f:Documentation/driver-api/firmware/core.rst
-f:Documentation/driver-api/firmware/direct-fs-lookup.rst
-f:Documentation/driver-api/firmware/efi/index.rst
-f:Documentation/driver-api/firmware/fallback-mechanisms.rst
-f:Documentation/driver-api/firmware/firmware-usage-guidelines.rst
-f:Documentation/driver-api/firmware/firmware_cache.rst
-f:Documentation/driver-api/firmware/fw_search_path.rst
-f:Documentation/driver-api/firmware/fw_upload.rst
-f:Documentation/driver-api/firmware/index.rst
-f:Documentation/driver-api/firmware/introduction.rst
-f:Documentation/driver-api/firmware/lookup-order.rst
-f:Documentation/driver-api/firmware/other_interfaces.rst
-f:Documentation/driver-api/firmware/request_firmware.rst
-f:Documentation/driver-api/fpga/fpga-bridge.rst
-f:Documentation/driver-api/fpga/fpga-mgr.rst
-f:Documentation/driver-api/fpga/fpga-programming.rst
-f:Documentation/driver-api/fpga/fpga-region.rst
-f:Documentation/driver-api/fpga/index.rst
-f:Documentation/driver-api/fpga/intro.rst
-f:Documentation/driver-api/frame-buffer.rst
-f:Documentation/driver-api/generic-counter.rst
-f:Documentation/driver-api/gpio/board.rst
-f:Documentation/driver-api/gpio/bt8xxgpio.rst
-f:Documentation/driver-api/gpio/consumer.rst
-f:Documentation/driver-api/gpio/driver.rst
-f:Documentation/driver-api/gpio/drivers-on-gpio.rst
-f:Documentation/driver-api/gpio/index.rst
-f:Documentation/driver-api/gpio/intro.rst
-f:Documentation/driver-api/gpio/using-gpio.rst
-f:Documentation/driver-api/hsi.rst
-f:Documentation/driver-api/hte/hte.rst
-f:Documentation/driver-api/hte/index.rst
-f:Documentation/driver-api/hte/tegra-hte.rst
-f:Documentation/driver-api/i2c.rst
-f:Documentation/driver-api/i3c/device-driver-api.rst
-f:Documentation/driver-api/i3c/index.rst
-f:Documentation/driver-api/i3c/master-driver-api.rst
-f:Documentation/driver-api/i3c/protocol.rst
-f:Documentation/driver-api/iio/buffers.rst
-f:Documentation/driver-api/iio/core.rst
-f:Documentation/driver-api/iio/hw-consumer.rst
-f:Documentation/driver-api/iio/index.rst
-f:Documentation/driver-api/iio/intro.rst
-f:Documentation/driver-api/iio/triggered-buffers.rst
-f:Documentation/driver-api/iio/triggers.rst
-f:Documentation/driver-api/index.rst
-f:Documentation/driver-api/infiniband.rst
-f:Documentation/driver-api/infrastructure.rst
-f:Documentation/driver-api/input.rst
-f:Documentation/driver-api/interconnect.rst
-f:Documentation/driver-api/io-mapping.rst
-f:Documentation/driver-api/io_ordering.rst
-f:Documentation/driver-api/ioctl.rst
-f:Documentation/driver-api/ipmb.rst
-f:Documentation/driver-api/ipmi.rst
-f:Documentation/driver-api/isa.rst
-f:Documentation/driver-api/libata.rst
-f:Documentation/driver-api/mailbox.rst
-f:Documentation/driver-api/md/index.rst
-f:Documentation/driver-api/md/md-cluster.rst
-f:Documentation/driver-api/md/raid5-cache.rst
-f:Documentation/driver-api/md/raid5-ppl.rst
-f:Documentation/driver-api/media/camera-sensor.rst
-f:Documentation/driver-api/media/cec-core.rst
-f:Documentation/driver-api/media/drivers/bttv-devel.rst
-f:Documentation/driver-api/media/drivers/ccs/ccs-regs.asc
-f:Documentation/driver-api/media/drivers/ccs/ccs.rst
-f:Documentation/driver-api/media/drivers/ccs/mk-ccs-regs
-f:Documentation/driver-api/media/drivers/contributors.rst
-f:Documentation/driver-api/media/drivers/cx2341x-devel.rst
-f:Documentation/driver-api/media/drivers/cx88-devel.rst
-f:Documentation/driver-api/media/drivers/dvb-usb.rst
-f:Documentation/driver-api/media/drivers/fimc-devel.rst
-f:Documentation/driver-api/media/drivers/frontends.rst
-f:Documentation/driver-api/media/drivers/index.rst
-f:Documentation/driver-api/media/drivers/ipu6.rst
-f:Documentation/driver-api/media/drivers/pvrusb2.rst
-f:Documentation/driver-api/media/drivers/pxa_camera.rst
-f:Documentation/driver-api/media/drivers/radiotrack.rst
-f:Documentation/driver-api/media/drivers/rkisp1.rst
-f:Documentation/driver-api/media/drivers/saa7134-devel.rst
-f:Documentation/driver-api/media/drivers/sh_mobile_ceu_camera.rst
-f:Documentation/driver-api/media/drivers/tuners.rst
-f:Documentation/driver-api/media/drivers/vidtv.rst
-f:Documentation/driver-api/media/drivers/vimc-devel.rst
-f:Documentation/driver-api/media/drivers/zoran.rst
-f:Documentation/driver-api/media/dtv-ca.rst
-f:Documentation/driver-api/media/dtv-common.rst
-f:Documentation/driver-api/media/dtv-core.rst
-f:Documentation/driver-api/media/dtv-demux.rst
-f:Documentation/driver-api/media/dtv-frontend.rst
-f:Documentation/driver-api/media/dtv-net.rst
-f:Documentation/driver-api/media/index.rst
-f:Documentation/driver-api/media/maintainer-entry-profile.rst
-f:Documentation/driver-api/media/mc-core.rst
-f:Documentation/driver-api/media/rc-core.rst
-f:Documentation/driver-api/media/tx-rx.rst
-f:Documentation/driver-api/media/v4l2-async.rst
-f:Documentation/driver-api/media/v4l2-cci.rst
-f:Documentation/driver-api/media/v4l2-common.rst
-f:Documentation/driver-api/media/v4l2-controls.rst
-f:Documentation/driver-api/media/v4l2-core.rst
-f:Documentation/driver-api/media/v4l2-dev.rst
-f:Documentation/driver-api/media/v4l2-device.rst
-f:Documentation/driver-api/media/v4l2-dv-timings.rst
-f:Documentation/driver-api/media/v4l2-event.rst
-f:Documentation/driver-api/media/v4l2-fh.rst
-f:Documentation/driver-api/media/v4l2-flash-led-class.rst
-f:Documentation/driver-api/media/v4l2-fwnode.rst
-f:Documentation/driver-api/media/v4l2-intro.rst
-f:Documentation/driver-api/media/v4l2-jpeg.rst
-f:Documentation/driver-api/media/v4l2-mc.rst
-f:Documentation/driver-api/media/v4l2-mediabus.rst
-f:Documentation/driver-api/media/v4l2-mem2mem.rst
-f:Documentation/driver-api/media/v4l2-rect.rst
-f:Documentation/driver-api/media/v4l2-subdev.rst
-f:Documentation/driver-api/media/v4l2-tuner.rst
-f:Documentation/driver-api/media/v4l2-tveeprom.rst
-f:Documentation/driver-api/media/v4l2-videobuf2.rst
-f:Documentation/driver-api/mei/hdcp.rst
-f:Documentation/driver-api/mei/iamt.rst
-f:Documentation/driver-api/mei/index.rst
-f:Documentation/driver-api/mei/mei-client-bus.rst
-f:Documentation/driver-api/mei/mei.rst
-f:Documentation/driver-api/mei/nfc.rst
-f:Documentation/driver-api/memory-devices/index.rst
-f:Documentation/driver-api/memory-devices/ti-emif.rst
-f:Documentation/driver-api/memory-devices/ti-gpmc.rst
-f:Documentation/driver-api/men-chameleon-bus.rst
-f:Documentation/driver-api/message-based.rst
-f:Documentation/driver-api/misc_devices.rst
-f:Documentation/driver-api/miscellaneous.rst
-f:Documentation/driver-api/mmc/index.rst
-f:Documentation/driver-api/mmc/mmc-async-req.rst
-f:Documentation/driver-api/mmc/mmc-dev-attrs.rst
-f:Documentation/driver-api/mmc/mmc-dev-parts.rst
-f:Documentation/driver-api/mmc/mmc-test.rst
-f:Documentation/driver-api/mmc/mmc-tools.rst
-f:Documentation/driver-api/mtd/index.rst
-f:Documentation/driver-api/mtd/nand_ecc.rst
-f:Documentation/driver-api/mtd/spi-intel.rst
-f:Documentation/driver-api/mtd/spi-nor.rst
-f:Documentation/driver-api/mtdnand.rst
-f:Documentation/driver-api/nfc/index.rst
-f:Documentation/driver-api/nfc/nfc-hci.rst
-f:Documentation/driver-api/nfc/nfc-pn544.rst
-f:Documentation/driver-api/ntb.rst
-f:Documentation/driver-api/nvdimm/btt.rst
-f:Documentation/driver-api/nvdimm/firmware-activate.rst
-f:Documentation/driver-api/nvdimm/index.rst
-f:Documentation/driver-api/nvdimm/nvdimm.rst
-f:Documentation/driver-api/nvdimm/security.rst
-f:Documentation/driver-api/nvmem.rst
-f:Documentation/driver-api/parport-lowlevel.rst
-f:Documentation/driver-api/pci/index.rst
-f:Documentation/driver-api/pci/p2pdma.rst
-f:Documentation/driver-api/pci/pci.rst
-f:Documentation/driver-api/phy/index.rst
-f:Documentation/driver-api/phy/phy.rst
-f:Documentation/driver-api/phy/samsung-usb2.rst
-f:Documentation/driver-api/pin-control.rst
-f:Documentation/driver-api/pldmfw/driver-ops.rst
-f:Documentation/driver-api/pldmfw/file-format.rst
-f:Documentation/driver-api/pldmfw/index.rst
-f:Documentation/driver-api/pm/cpuidle.rst
-f:Documentation/driver-api/pm/devices.rst
-f:Documentation/driver-api/pm/index.rst
-f:Documentation/driver-api/pm/notifiers.rst
-f:Documentation/driver-api/pm/types.rst
-f:Documentation/driver-api/pps.rst
-f:Documentation/driver-api/ptp.rst
-f:Documentation/driver-api/pwm.rst
-f:Documentation/driver-api/pwrseq.rst
-f:Documentation/driver-api/rapidio/index.rst
-f:Documentation/driver-api/rapidio/mport_cdev.rst
-f:Documentation/driver-api/rapidio/rapidio.rst
-f:Documentation/driver-api/rapidio/rio_cm.rst
-f:Documentation/driver-api/rapidio/sysfs.rst
-f:Documentation/driver-api/rapidio/tsi721.rst
-f:Documentation/driver-api/regulator.rst
-f:Documentation/driver-api/reset.rst
-f:Documentation/driver-api/rfkill.rst
-f:Documentation/driver-api/s390-drivers.rst
-f:Documentation/driver-api/scsi.rst
-f:Documentation/driver-api/serial/driver.rst
-f:Documentation/driver-api/serial/index.rst
-f:Documentation/driver-api/serial/serial-iso7816.rst
-f:Documentation/driver-api/serial/serial-rs485.rst
-f:Documentation/driver-api/slimbus.rst
-f:Documentation/driver-api/sm501.rst
-f:Documentation/driver-api/soundwire/bra.rst
-f:Documentation/driver-api/soundwire/bra_cadence.rst
-f:Documentation/driver-api/soundwire/error_handling.rst
-f:Documentation/driver-api/soundwire/index.rst
-f:Documentation/driver-api/soundwire/locking.rst
-f:Documentation/driver-api/soundwire/stream.rst
-f:Documentation/driver-api/soundwire/summary.rst
-f:Documentation/driver-api/spi.rst
-f:Documentation/driver-api/surface_aggregator/client-api.rst
-f:Documentation/driver-api/surface_aggregator/client.rst
-f:Documentation/driver-api/surface_aggregator/clients/cdev.rst
-f:Documentation/driver-api/surface_aggregator/clients/dtx.rst
-f:Documentation/driver-api/surface_aggregator/clients/index.rst
-f:Documentation/driver-api/surface_aggregator/clients/san.rst
-f:Documentation/driver-api/surface_aggregator/index.rst
-f:Documentation/driver-api/surface_aggregator/internal-api.rst
-f:Documentation/driver-api/surface_aggregator/internal.rst
-f:Documentation/driver-api/surface_aggregator/overview.rst
-f:Documentation/driver-api/surface_aggregator/ssh.rst
-f:Documentation/driver-api/switchtec.rst
-f:Documentation/driver-api/sync_file.rst
-f:Documentation/driver-api/target.rst
-f:Documentation/driver-api/tee.rst
-f:Documentation/driver-api/thermal/cpu-cooling-api.rst
-f:Documentation/driver-api/thermal/cpu-idle-cooling.rst
-f:Documentation/driver-api/thermal/exynos_thermal.rst
-f:Documentation/driver-api/thermal/exynos_thermal_emulation.rst
-f:Documentation/driver-api/thermal/index.rst
-f:Documentation/driver-api/thermal/intel_dptf.rst
-f:Documentation/driver-api/thermal/nouveau_thermal.rst
-f:Documentation/driver-api/thermal/power_allocator.rst
-f:Documentation/driver-api/thermal/sysfs-api.rst
-f:Documentation/driver-api/thermal/x86_pkg_temperature_thermal.rst
-f:Documentation/driver-api/tty/console.rst
-f:Documentation/driver-api/tty/index.rst
-f:Documentation/driver-api/tty/moxa-smartio.rst
-f:Documentation/driver-api/tty/n_gsm.rst
-f:Documentation/driver-api/tty/n_tty.rst
-f:Documentation/driver-api/tty/tty_buffer.rst
-f:Documentation/driver-api/tty/tty_driver.rst
-f:Documentation/driver-api/tty/tty_internals.rst
-f:Documentation/driver-api/tty/tty_ioctl.rst
-f:Documentation/driver-api/tty/tty_ldisc.rst
-f:Documentation/driver-api/tty/tty_port.rst
-f:Documentation/driver-api/tty/tty_struct.rst
-f:Documentation/driver-api/uio-howto.rst
-f:Documentation/driver-api/usb/URB.rst
-f:Documentation/driver-api/usb/anchors.rst
-f:Documentation/driver-api/usb/bulk-streams.rst
-f:Documentation/driver-api/usb/callbacks.rst
-f:Documentation/driver-api/usb/dma.rst
-f:Documentation/driver-api/usb/dwc3.rst
-f:Documentation/driver-api/usb/error-codes.rst
-f:Documentation/driver-api/usb/gadget.rst
-f:Documentation/driver-api/usb/hotplug.rst
-f:Documentation/driver-api/usb/index.rst
-f:Documentation/driver-api/usb/persist.rst
-f:Documentation/driver-api/usb/power-management.rst
-f:Documentation/driver-api/usb/typec.rst
-f:Documentation/driver-api/usb/typec_bus.rst
-f:Documentation/driver-api/usb/usb.rst
-f:Documentation/driver-api/usb/usb3-debug-port.rst
-f:Documentation/driver-api/usb/writing_musb_glue_layer.rst
-f:Documentation/driver-api/usb/writing_usb_driver.rst
-f:Documentation/driver-api/vfio-mediated-device.rst
-f:Documentation/driver-api/vfio-pci-device-specific-driver-acceptance.rst
-f:Documentation/driver-api/vfio.rst
-f:Documentation/driver-api/virtio/index.rst
-f:Documentation/driver-api/virtio/virtio.rst
-f:Documentation/driver-api/virtio/writing_virtio_drivers.rst
-f:Documentation/driver-api/vme.rst
-f:Documentation/driver-api/w1.rst
-f:Documentation/driver-api/wbrf.rst
-f:Documentation/driver-api/wmi.rst
-f:Documentation/driver-api/xilinx/eemi.rst
-f:Documentation/driver-api/xilinx/index.rst
-f:Documentation/driver-api/xillybus.rst
-f:Documentation/driver-api/zorro.rst
-f:Documentation/edac/features.rst
-f:Documentation/edac/index.rst
-f:Documentation/edac/memory_repair.rst
-f:Documentation/edac/scrub.rst
-f:Documentation/fault-injection/fault-injection.rst
-f:Documentation/fault-injection/index.rst
-f:Documentation/fault-injection/notifier-error-inject.rst
-f:Documentation/fault-injection/nvme-fault-injection.rst
-f:Documentation/fault-injection/provoke-crashes.rst
-f:Documentation/fb/api.rst
-f:Documentation/fb/arkfb.rst
-f:Documentation/fb/aty128fb.rst
-f:Documentation/fb/cirrusfb.rst
-f:Documentation/fb/cmap_xfbdev.rst
-f:Documentation/fb/deferred_io.rst
-f:Documentation/fb/efifb.rst
-f:Documentation/fb/ep93xx-fb.rst
-f:Documentation/fb/fbcon.rst
-f:Documentation/fb/framebuffer.rst
-f:Documentation/fb/gxfb.rst
-f:Documentation/fb/index.rst
-f:Documentation/fb/intel810.rst
-f:Documentation/fb/internals.rst
-f:Documentation/fb/lxfb.rst
-f:Documentation/fb/matroxfb.rst
-f:Documentation/fb/metronomefb.rst
-f:Documentation/fb/modedb.rst
-f:Documentation/fb/pvr2fb.rst
-f:Documentation/fb/pxafb.rst
-f:Documentation/fb/s3fb.rst
-f:Documentation/fb/sa1100fb.rst
-f:Documentation/fb/sh7760fb.rst
-f:Documentation/fb/sisfb.rst
-f:Documentation/fb/sm501.rst
-f:Documentation/fb/sm712fb.rst
-f:Documentation/fb/sstfb.rst
-f:Documentation/fb/tgafb.rst
-f:Documentation/fb/tridentfb.rst
-f:Documentation/fb/udlfb.rst
-f:Documentation/fb/uvesafb.rst
-f:Documentation/fb/vesafb.rst
-f:Documentation/fb/viafb.modes
-f:Documentation/fb/viafb.rst
-f:Documentation/fb/vt8623fb.rst
-f:Documentation/features/arch-support.txt
-f:Documentation/features/core/cBPF-JIT/arch-support.txt
-f:Documentation/features/core/eBPF-JIT/arch-support.txt
-f:Documentation/features/core/generic-idle-thread/arch-support.txt
-f:Documentation/features/core/jump-labels/arch-support.txt
-f:Documentation/features/core/mseal_sys_mappings/arch-support.txt
-f:Documentation/features/core/thread-info-in-task/arch-support.txt
-f:Documentation/features/core/tracehook/arch-support.txt
-f:Documentation/features/debug/KASAN/arch-support.txt
-f:Documentation/features/debug/debug-vm-pgtable/arch-support.txt
-f:Documentation/features/debug/gcov-profile-all/arch-support.txt
-f:Documentation/features/debug/kcov/arch-support.txt
-f:Documentation/features/debug/kgdb/arch-support.txt
-f:Documentation/features/debug/kmemleak/arch-support.txt
-f:Documentation/features/debug/kprobes-on-ftrace/arch-support.txt
-f:Documentation/features/debug/kprobes/arch-support.txt
-f:Documentation/features/debug/kretprobes/arch-support.txt
-f:Documentation/features/debug/optprobes/arch-support.txt
-f:Documentation/features/debug/stackprotector/arch-support.txt
-f:Documentation/features/debug/uprobes/arch-support.txt
-f:Documentation/features/debug/user-ret-profiler/arch-support.txt
-f:Documentation/features/io/dma-contiguous/arch-support.txt
-f:Documentation/features/list-arch.sh
-f:Documentation/features/locking/cmpxchg-local/arch-support.txt
-f:Documentation/features/locking/lockdep/arch-support.txt
-f:Documentation/features/locking/queued-rwlocks/arch-support.txt
-f:Documentation/features/locking/queued-spinlocks/arch-support.txt
-f:Documentation/features/perf/kprobes-event/arch-support.txt
-f:Documentation/features/perf/perf-regs/arch-support.txt
-f:Documentation/features/perf/perf-stackdump/arch-support.txt
-f:Documentation/features/sched/membarrier-sync-core/arch-support.txt
-f:Documentation/features/sched/numa-balancing/arch-support.txt
-f:Documentation/features/scripts/features-refresh.sh
-f:Documentation/features/seccomp/seccomp-filter/arch-support.txt
-f:Documentation/features/time/arch-tick-broadcast/arch-support.txt
-f:Documentation/features/time/clockevents/arch-support.txt
-f:Documentation/features/time/context-tracking/arch-support.txt
-f:Documentation/features/time/irq-time-acct/arch-support.txt
-f:Documentation/features/time/virt-cpuacct/arch-support.txt
-f:Documentation/features/vm/ELF-ASLR/arch-support.txt
-f:Documentation/features/vm/THP/arch-support.txt
-f:Documentation/features/vm/TLB/arch-support.txt
-f:Documentation/features/vm/huge-vmap/arch-support.txt
-f:Documentation/features/vm/ioremap_prot/arch-support.txt
-f:Documentation/features/vm/pte_special/arch-support.txt
-f:Documentation/filesystems/9p.rst
-f:Documentation/filesystems/adfs.rst
-f:Documentation/filesystems/affs.rst
-f:Documentation/filesystems/afs.rst
-f:Documentation/filesystems/api-summary.rst
-f:Documentation/filesystems/autofs-mount-control.rst
-f:Documentation/filesystems/autofs.rst
-f:Documentation/filesystems/automount-support.rst
-f:Documentation/filesystems/bcachefs/CodingStyle.rst
-f:Documentation/filesystems/bcachefs/SubmittingPatches.rst
-f:Documentation/filesystems/bcachefs/casefolding.rst
-f:Documentation/filesystems/bcachefs/errorcodes.rst
-f:Documentation/filesystems/bcachefs/future/idle_work.rst
-f:Documentation/filesystems/bcachefs/index.rst
-f:Documentation/filesystems/befs.rst
-f:Documentation/filesystems/bfs.rst
-f:Documentation/filesystems/btrfs.rst
-f:Documentation/filesystems/buffer.rst
-f:Documentation/filesystems/caching/backend-api.rst
-f:Documentation/filesystems/caching/cachefiles.rst
-f:Documentation/filesystems/caching/fscache.rst
-f:Documentation/filesystems/caching/index.rst
-f:Documentation/filesystems/caching/netfs-api.rst
-f:Documentation/filesystems/ceph.rst
-f:Documentation/filesystems/coda.rst
-f:Documentation/filesystems/configfs.rst
-f:Documentation/filesystems/cramfs.rst
-f:Documentation/filesystems/dax.rst
-f:Documentation/filesystems/debugfs.rst
-f:Documentation/filesystems/devpts.rst
-f:Documentation/filesystems/directory-locking.rst
-f:Documentation/filesystems/dlmfs.rst
-f:Documentation/filesystems/dnotify.rst
-f:Documentation/filesystems/ecryptfs.rst
-f:Documentation/filesystems/efivarfs.rst
-f:Documentation/filesystems/erofs.rst
-f:Documentation/filesystems/ext2.rst
-f:Documentation/filesystems/ext3.rst
-f:Documentation/filesystems/ext4/about.rst
-f:Documentation/filesystems/ext4/allocators.rst
-f:Documentation/filesystems/ext4/atomic_writes.rst
-f:Documentation/filesystems/ext4/attributes.rst
-f:Documentation/filesystems/ext4/bigalloc.rst
-f:Documentation/filesystems/ext4/bitmaps.rst
-f:Documentation/filesystems/ext4/blockgroup.rst
-f:Documentation/filesystems/ext4/blockmap.rst
-f:Documentation/filesystems/ext4/blocks.rst
-f:Documentation/filesystems/ext4/checksums.rst
-f:Documentation/filesystems/ext4/directory.rst
-f:Documentation/filesystems/ext4/dynamic.rst
-f:Documentation/filesystems/ext4/eainode.rst
-f:Documentation/filesystems/ext4/globals.rst
-f:Documentation/filesystems/ext4/group_descr.rst
-f:Documentation/filesystems/ext4/ifork.rst
-f:Documentation/filesystems/ext4/index.rst
-f:Documentation/filesystems/ext4/inlinedata.rst
-f:Documentation/filesystems/ext4/inode_table.rst
-f:Documentation/filesystems/ext4/inodes.rst
-f:Documentation/filesystems/ext4/journal.rst
-f:Documentation/filesystems/ext4/mmp.rst
-f:Documentation/filesystems/ext4/orphan.rst
-f:Documentation/filesystems/ext4/overview.rst
-f:Documentation/filesystems/ext4/special_inodes.rst
-f:Documentation/filesystems/ext4/super.rst
-f:Documentation/filesystems/ext4/verity.rst
-f:Documentation/filesystems/f2fs.rst
-f:Documentation/filesystems/fiemap.rst
-f:Documentation/filesystems/files.rst
-f:Documentation/filesystems/fscrypt.rst
-f:Documentation/filesystems/fsverity.rst
-f:Documentation/filesystems/fuse-io-uring.rst
-f:Documentation/filesystems/fuse-io.rst
-f:Documentation/filesystems/fuse-passthrough.rst
-f:Documentation/filesystems/fuse.rst
-f:Documentation/filesystems/gfs2-glocks.rst
-f:Documentation/filesystems/gfs2-uevents.rst
-f:Documentation/filesystems/gfs2.rst
-f:Documentation/filesystems/hfs.rst
-f:Documentation/filesystems/hfsplus.rst
-f:Documentation/filesystems/hpfs.rst
-f:Documentation/filesystems/idmappings.rst
-f:Documentation/filesystems/index.rst
-f:Documentation/filesystems/inotify.rst
-f:Documentation/filesystems/iomap/design.rst
-f:Documentation/filesystems/iomap/index.rst
-f:Documentation/filesystems/iomap/operations.rst
-f:Documentation/filesystems/iomap/porting.rst
-f:Documentation/filesystems/isofs.rst
-f:Documentation/filesystems/journalling.rst
-f:Documentation/filesystems/locking.rst
-f:Documentation/filesystems/locks.rst
-f:Documentation/filesystems/mount_api.rst
-f:Documentation/filesystems/multigrain-ts.rst
-f:Documentation/filesystems/netfs_library.rst
-f:Documentation/filesystems/nfs/client-identifier.rst
-f:Documentation/filesystems/nfs/exporting.rst
-f:Documentation/filesystems/nfs/index.rst
-f:Documentation/filesystems/nfs/knfsd-stats.rst
-f:Documentation/filesystems/nfs/localio.rst
-f:Documentation/filesystems/nfs/nfs41-server.rst
-f:Documentation/filesystems/nfs/pnfs.rst
-f:Documentation/filesystems/nfs/reexport.rst
-f:Documentation/filesystems/nfs/rpc-cache.rst
-f:Documentation/filesystems/nfs/rpc-server-gss.rst
-f:Documentation/filesystems/nilfs2.rst
-f:Documentation/filesystems/ntfs3.rst
-f:Documentation/filesystems/ocfs2-online-filecheck.rst
-f:Documentation/filesystems/ocfs2.rst
-f:Documentation/filesystems/omfs.rst
-f:Documentation/filesystems/orangefs.rst
-f:Documentation/filesystems/overlayfs.rst
-f:Documentation/filesystems/path-lookup.rst
-f:Documentation/filesystems/path-lookup.txt
-f:Documentation/filesystems/porting.rst
-f:Documentation/filesystems/proc.rst
-f:Documentation/filesystems/propagate_umount.txt
-f:Documentation/filesystems/qnx6.rst
-f:Documentation/filesystems/quota.rst
-f:Documentation/filesystems/ramfs-rootfs-initramfs.rst
-f:Documentation/filesystems/relay.rst
-f:Documentation/filesystems/resctrl.rst
-f:Documentation/filesystems/romfs.rst
-f:Documentation/filesystems/seq_file.rst
-f:Documentation/filesystems/sharedsubtree.rst
-f:Documentation/filesystems/smb/cifsroot.rst
-f:Documentation/filesystems/smb/index.rst
-f:Documentation/filesystems/smb/ksmbd.rst
-f:Documentation/filesystems/smb/smbdirect.rst
-f:Documentation/filesystems/splice.rst
-f:Documentation/filesystems/spufs/index.rst
-f:Documentation/filesystems/spufs/spu_create.rst
-f:Documentation/filesystems/spufs/spu_run.rst
-f:Documentation/filesystems/spufs/spufs.rst
-f:Documentation/filesystems/squashfs.rst
-f:Documentation/filesystems/sysfs.rst
-f:Documentation/filesystems/tmpfs.rst
-f:Documentation/filesystems/ubifs-authentication.rst
-f:Documentation/filesystems/ubifs.rst
-f:Documentation/filesystems/udf.rst
-f:Documentation/filesystems/vfat.rst
-f:Documentation/filesystems/vfs.rst
-f:Documentation/filesystems/virtiofs.rst
-f:Documentation/filesystems/xfs/index.rst
-f:Documentation/filesystems/xfs/xfs-delayed-logging-design.rst
-f:Documentation/filesystems/xfs/xfs-maintainer-entry-profile.rst
-f:Documentation/filesystems/xfs/xfs-online-fsck-design.rst
-f:Documentation/filesystems/xfs/xfs-self-describing-metadata.rst
-f:Documentation/filesystems/zonefs.rst
-f:Documentation/firmware-guide/acpi/DSD-properties-rules.rst
-f:Documentation/firmware-guide/acpi/acpi-lid.rst
-f:Documentation/firmware-guide/acpi/aml-debugger.rst
-f:Documentation/firmware-guide/acpi/apei/einj.rst
-f:Documentation/firmware-guide/acpi/apei/output_format.rst
-f:Documentation/firmware-guide/acpi/chromeos-acpi-device.rst
-f:Documentation/firmware-guide/acpi/debug.rst
-f:Documentation/firmware-guide/acpi/dsd/data-node-references.rst
-f:Documentation/firmware-guide/acpi/dsd/graph.rst
-f:Documentation/firmware-guide/acpi/dsd/leds.rst
-f:Documentation/firmware-guide/acpi/dsd/phy.rst
-f:Documentation/firmware-guide/acpi/enumeration.rst
-f:Documentation/firmware-guide/acpi/extcon-intel-int3496.rst
-f:Documentation/firmware-guide/acpi/gpio-properties.rst
-f:Documentation/firmware-guide/acpi/i2c-muxes.rst
-f:Documentation/firmware-guide/acpi/index.rst
-f:Documentation/firmware-guide/acpi/intel-pmc-mux.rst
-f:Documentation/firmware-guide/acpi/lpit.rst
-f:Documentation/firmware-guide/acpi/method-tracing.rst
-f:Documentation/firmware-guide/acpi/namespace.rst
-f:Documentation/firmware-guide/acpi/non-d0-probe.rst
-f:Documentation/firmware-guide/acpi/osi.rst
-f:Documentation/firmware-guide/acpi/video_extension.rst
-f:Documentation/firmware-guide/index.rst
-f:Documentation/firmware_class/hotplug-script
-f:Documentation/fpga/dfl.rst
-f:Documentation/fpga/index.rst
-f:Documentation/gpu/afbc.rst
-f:Documentation/gpu/amdgpu/amd-hardware-list-info.rst
-f:Documentation/gpu/amdgpu/amdgpu-glossary.rst
-f:Documentation/gpu/amdgpu/apu-asic-info-table.csv
-f:Documentation/gpu/amdgpu/debugfs.rst
-f:Documentation/gpu/amdgpu/debugging.rst
-f:Documentation/gpu/amdgpu/dgpu-asic-info-table.csv
-f:Documentation/gpu/amdgpu/display/config_example.svg
-f:Documentation/gpu/amdgpu/display/dc-arch-overview.svg
-f:Documentation/gpu/amdgpu/display/dc-components.svg
-f:Documentation/gpu/amdgpu/display/dc-debug.rst
-f:Documentation/gpu/amdgpu/display/dc-glossary.rst
-f:Documentation/gpu/amdgpu/display/dc_pipeline_overview.svg
-f:Documentation/gpu/amdgpu/display/dcn-blocks.rst
-f:Documentation/gpu/amdgpu/display/dcn-overview.rst
-f:Documentation/gpu/amdgpu/display/dcn2_cm_drm_current.svg
-f:Documentation/gpu/amdgpu/display/dcn3_cm_drm_current.svg
-f:Documentation/gpu/amdgpu/display/display-contributing.rst
-f:Documentation/gpu/amdgpu/display/display-manager.rst
-f:Documentation/gpu/amdgpu/display/global_sync_vblank.svg
-f:Documentation/gpu/amdgpu/display/index.rst
-f:Documentation/gpu/amdgpu/display/mpo-cursor.svg
-f:Documentation/gpu/amdgpu/display/mpo-overview.rst
-f:Documentation/gpu/amdgpu/display/multi-display-hdcp-mpo-less-pipe-ex.svg
-f:Documentation/gpu/amdgpu/display/multi-display-hdcp-mpo.svg
-f:Documentation/gpu/amdgpu/display/pipeline_4k_no_split.svg
-f:Documentation/gpu/amdgpu/display/pipeline_4k_split.svg
-f:Documentation/gpu/amdgpu/display/programming-model-dcn.rst
-f:Documentation/gpu/amdgpu/display/single-display-mpo-multi-video.svg
-f:Documentation/gpu/amdgpu/display/single-display-mpo.svg
-f:Documentation/gpu/amdgpu/display/trace-groups-table.csv
-f:Documentation/gpu/amdgpu/driver-core.rst
-f:Documentation/gpu/amdgpu/driver-misc.rst
-f:Documentation/gpu/amdgpu/flashing.rst
-f:Documentation/gpu/amdgpu/gc/index.rst
-f:Documentation/gpu/amdgpu/gc/mes.rst
-f:Documentation/gpu/amdgpu/index.rst
-f:Documentation/gpu/amdgpu/module-parameters.rst
-f:Documentation/gpu/amdgpu/pipe_and_queue_abstraction.svg
-f:Documentation/gpu/amdgpu/process-isolation.rst
-f:Documentation/gpu/amdgpu/ras.rst
-f:Documentation/gpu/amdgpu/thermal.rst
-f:Documentation/gpu/amdgpu/xgmi.rst
-f:Documentation/gpu/automated_testing.rst
-f:Documentation/gpu/backlight.rst
-f:Documentation/gpu/bridge/dw-hdmi.rst
-f:Documentation/gpu/dp-mst/topology-figure-1.dot
-f:Documentation/gpu/dp-mst/topology-figure-2.dot
-f:Documentation/gpu/dp-mst/topology-figure-3.dot
-f:Documentation/gpu/driver-uapi.rst
-f:Documentation/gpu/drivers.rst
-f:Documentation/gpu/drm-client.rst
-f:Documentation/gpu/drm-compute.rst
-f:Documentation/gpu/drm-internals.rst
-f:Documentation/gpu/drm-kms-helpers.rst
-f:Documentation/gpu/drm-kms.rst
-f:Documentation/gpu/drm-mm.rst
-f:Documentation/gpu/drm-uapi.rst
-f:Documentation/gpu/drm-usage-stats.rst
-f:Documentation/gpu/drm-vm-bind-async.rst
-f:Documentation/gpu/drm-vm-bind-locking.rst
-f:Documentation/gpu/i915.rst
-f:Documentation/gpu/imagination/index.rst
-f:Documentation/gpu/imagination/uapi.rst
-f:Documentation/gpu/implementation_guidelines.rst
-f:Documentation/gpu/index.rst
-f:Documentation/gpu/introduction.rst
-f:Documentation/gpu/kms-properties.csv
-f:Documentation/gpu/komeda-kms.rst
-f:Documentation/gpu/mcde.rst
-f:Documentation/gpu/meson.rst
-f:Documentation/gpu/msm-crash-dump.rst
-f:Documentation/gpu/msm-preemption.rst
-f:Documentation/gpu/nouveau.rst
-f:Documentation/gpu/nova/core/devinit.rst
-f:Documentation/gpu/nova/core/falcon.rst
-f:Documentation/gpu/nova/core/fwsec.rst
-f:Documentation/gpu/nova/core/guidelines.rst
-f:Documentation/gpu/nova/core/todo.rst
-f:Documentation/gpu/nova/core/vbios.rst
-f:Documentation/gpu/nova/guidelines.rst
-f:Documentation/gpu/nova/index.rst
-f:Documentation/gpu/panfrost.rst
-f:Documentation/gpu/panthor.rst
-f:Documentation/gpu/pl111.rst
-f:Documentation/gpu/rfc/gpusvm.rst
-f:Documentation/gpu/rfc/i915_gem_lmem.rst
-f:Documentation/gpu/rfc/i915_scheduler.rst
-f:Documentation/gpu/rfc/i915_small_bar.h
-f:Documentation/gpu/rfc/i915_small_bar.rst
-f:Documentation/gpu/rfc/i915_vm_bind.h
-f:Documentation/gpu/rfc/i915_vm_bind.rst
-f:Documentation/gpu/rfc/index.rst
-f:Documentation/gpu/tegra.rst
-f:Documentation/gpu/todo.rst
-f:Documentation/gpu/tve200.rst
-f:Documentation/gpu/v3d.rst
-f:Documentation/gpu/vc4.rst
-f:Documentation/gpu/vga-switcheroo.rst
-f:Documentation/gpu/vgaarbiter.rst
-f:Documentation/gpu/vkms.rst
-f:Documentation/gpu/xe/index.rst
-f:Documentation/gpu/xe/xe-drm-usage-stats.rst
-f:Documentation/gpu/xe/xe_configfs.rst
-f:Documentation/gpu/xe/xe_cs.rst
-f:Documentation/gpu/xe/xe_debugging.rst
-f:Documentation/gpu/xe/xe_devcoredump.rst
-f:Documentation/gpu/xe/xe_firmware.rst
-f:Documentation/gpu/xe/xe_gt_freq.rst
-f:Documentation/gpu/xe/xe_gt_mcr.rst
-f:Documentation/gpu/xe/xe_map.rst
-f:Documentation/gpu/xe/xe_migrate.rst
-f:Documentation/gpu/xe/xe_mm.rst
-f:Documentation/gpu/xe/xe_pcode.rst
-f:Documentation/gpu/xe/xe_pm.rst
-f:Documentation/gpu/xe/xe_rtp.rst
-f:Documentation/gpu/xe/xe_tile.rst
-f:Documentation/gpu/xe/xe_wa.rst
-f:Documentation/gpu/xen-front.rst
-f:Documentation/gpu/zynqmp.rst
-f:Documentation/hid/amd-sfh-hid.rst
-f:Documentation/hid/hid-alps.rst
-f:Documentation/hid/hid-bpf.rst
-f:Documentation/hid/hid-sensor.rst
-f:Documentation/hid/hid-transport.rst
-f:Documentation/hid/hiddev.rst
-f:Documentation/hid/hidintro.rst
-f:Documentation/hid/hidraw.rst
-f:Documentation/hid/hidreport-parsing.rst
-f:Documentation/hid/index.rst
-f:Documentation/hid/intel-ish-hid.rst
-f:Documentation/hid/intel-thc-hid.rst
-f:Documentation/hid/uhid.rst
-f:Documentation/hwmon/abituguru-datasheet.rst
-f:Documentation/hwmon/abituguru.rst
-f:Documentation/hwmon/abituguru3.rst
-f:Documentation/hwmon/acbel-fsg032.rst
-f:Documentation/hwmon/acpi_power_meter.rst
-f:Documentation/hwmon/ad7314.rst
-f:Documentation/hwmon/adc128d818.rst
-f:Documentation/hwmon/adm1025.rst
-f:Documentation/hwmon/adm1026.rst
-f:Documentation/hwmon/adm1031.rst
-f:Documentation/hwmon/adm1177.rst
-f:Documentation/hwmon/adm1266.rst
-f:Documentation/hwmon/adm1275.rst
-f:Documentation/hwmon/adm9240.rst
-f:Documentation/hwmon/adp1050.rst
-f:Documentation/hwmon/ads7828.rst
-f:Documentation/hwmon/adt7410.rst
-f:Documentation/hwmon/adt7411.rst
-f:Documentation/hwmon/adt7462.rst
-f:Documentation/hwmon/adt7470.rst
-f:Documentation/hwmon/adt7475.rst
-f:Documentation/hwmon/aht10.rst
-f:Documentation/hwmon/amc6821.rst
-f:Documentation/hwmon/aquacomputer_d5next.rst
-f:Documentation/hwmon/asb100.rst
-f:Documentation/hwmon/asc7621.rst
-f:Documentation/hwmon/aspeed-g6-pwm-tach.rst
-f:Documentation/hwmon/aspeed-pwm-tacho.rst
-f:Documentation/hwmon/asus_ec_sensors.rst
-f:Documentation/hwmon/asus_rog_ryujin.rst
-f:Documentation/hwmon/asus_wmi_sensors.rst
-f:Documentation/hwmon/bcm54140.rst
-f:Documentation/hwmon/bel-pfe.rst
-f:Documentation/hwmon/bpa-rs600.rst
-f:Documentation/hwmon/bt1-pvt.rst
-f:Documentation/hwmon/cgbc-hwmon.rst
-f:Documentation/hwmon/chipcap2.rst
-f:Documentation/hwmon/coretemp.rst
-f:Documentation/hwmon/corsair-cpro.rst
-f:Documentation/hwmon/corsair-psu.rst
-f:Documentation/hwmon/cros_ec_hwmon.rst
-f:Documentation/hwmon/crps.rst
-f:Documentation/hwmon/da9052.rst
-f:Documentation/hwmon/da9055.rst
-f:Documentation/hwmon/dell-smm-hwmon.rst
-f:Documentation/hwmon/dme1737.rst
-f:Documentation/hwmon/dps920ab.rst
-f:Documentation/hwmon/drivetemp.rst
-f:Documentation/hwmon/ds1621.rst
-f:Documentation/hwmon/ds620.rst
-f:Documentation/hwmon/emc1403.rst
-f:Documentation/hwmon/emc2103.rst
-f:Documentation/hwmon/emc2305.rst
-f:Documentation/hwmon/emc6w201.rst
-f:Documentation/hwmon/f71805f.rst
-f:Documentation/hwmon/f71882fg.rst
-f:Documentation/hwmon/fam15h_power.rst
-f:Documentation/hwmon/fsp-3y.rst
-f:Documentation/hwmon/ftsteutates.rst
-f:Documentation/hwmon/g760a.rst
-f:Documentation/hwmon/g762.rst
-f:Documentation/hwmon/gigabyte_waterforce.rst
-f:Documentation/hwmon/gl518sm.rst
-f:Documentation/hwmon/gsc-hwmon.rst
-f:Documentation/hwmon/gxp-fan-ctrl.rst
-f:Documentation/hwmon/hih6130.rst
-f:Documentation/hwmon/hp-wmi-sensors.rst
-f:Documentation/hwmon/hs3001.rst
-f:Documentation/hwmon/htu31.rst
-f:Documentation/hwmon/hwmon-kernel-api.rst
-f:Documentation/hwmon/ibm-cffps.rst
-f:Documentation/hwmon/ibmaem.rst
-f:Documentation/hwmon/ibmpowernv.rst
-f:Documentation/hwmon/ina209.rst
-f:Documentation/hwmon/ina233.rst
-f:Documentation/hwmon/ina238.rst
-f:Documentation/hwmon/ina2xx.rst
-f:Documentation/hwmon/ina3221.rst
-f:Documentation/hwmon/index.rst
-f:Documentation/hwmon/inspur-ipsps1.rst
-f:Documentation/hwmon/intel-m10-bmc-hwmon.rst
-f:Documentation/hwmon/ir35221.rst
-f:Documentation/hwmon/ir36021.rst
-f:Documentation/hwmon/ir38064.rst
-f:Documentation/hwmon/isl28022.rst
-f:Documentation/hwmon/isl68137.rst
-f:Documentation/hwmon/it87.rst
-f:Documentation/hwmon/jc42.rst
-f:Documentation/hwmon/k10temp.rst
-f:Documentation/hwmon/k8temp.rst
-f:Documentation/hwmon/kbatt.rst
-f:Documentation/hwmon/kfan.rst
-f:Documentation/hwmon/lan966x.rst
-f:Documentation/hwmon/lineage-pem.rst
-f:Documentation/hwmon/lm25066.rst
-f:Documentation/hwmon/lm63.rst
-f:Documentation/hwmon/lm70.rst
-f:Documentation/hwmon/lm73.rst
-f:Documentation/hwmon/lm75.rst
-f:Documentation/hwmon/lm77.rst
-f:Documentation/hwmon/lm78.rst
-f:Documentation/hwmon/lm80.rst
-f:Documentation/hwmon/lm83.rst
-f:Documentation/hwmon/lm85.rst
-f:Documentation/hwmon/lm87.rst
-f:Documentation/hwmon/lm90.rst
-f:Documentation/hwmon/lm92.rst
-f:Documentation/hwmon/lm93.rst
-f:Documentation/hwmon/lm95234.rst
-f:Documentation/hwmon/lm95245.rst
-f:Documentation/hwmon/lochnagar.rst
-f:Documentation/hwmon/lt3074.rst
-f:Documentation/hwmon/lt7182s.rst
-f:Documentation/hwmon/ltc2945.rst
-f:Documentation/hwmon/ltc2947.rst
-f:Documentation/hwmon/ltc2978.rst
-f:Documentation/hwmon/ltc2990.rst
-f:Documentation/hwmon/ltc2991.rst
-f:Documentation/hwmon/ltc2992.rst
-f:Documentation/hwmon/ltc3815.rst
-f:Documentation/hwmon/ltc4151.rst
-f:Documentation/hwmon/ltc4215.rst
-f:Documentation/hwmon/ltc4245.rst
-f:Documentation/hwmon/ltc4260.rst
-f:Documentation/hwmon/ltc4261.rst
-f:Documentation/hwmon/ltc4282.rst
-f:Documentation/hwmon/ltc4286.rst
-f:Documentation/hwmon/max127.rst
-f:Documentation/hwmon/max15301.rst
-f:Documentation/hwmon/max16064.rst
-f:Documentation/hwmon/max16065.rst
-f:Documentation/hwmon/max1619.rst
-f:Documentation/hwmon/max16601.rst
-f:Documentation/hwmon/max1668.rst
-f:Documentation/hwmon/max197.rst
-f:Documentation/hwmon/max20730.rst
-f:Documentation/hwmon/max20751.rst
-f:Documentation/hwmon/max31722.rst
-f:Documentation/hwmon/max31730.rst
-f:Documentation/hwmon/max31760.rst
-f:Documentation/hwmon/max31785.rst
-f:Documentation/hwmon/max31790.rst
-f:Documentation/hwmon/max31827.rst
-f:Documentation/hwmon/max34440.rst
-f:Documentation/hwmon/max6620.rst
-f:Documentation/hwmon/max6639.rst
-f:Documentation/hwmon/max6650.rst
-f:Documentation/hwmon/max6697.rst
-f:Documentation/hwmon/max77705.rst
-f:Documentation/hwmon/max8688.rst
-f:Documentation/hwmon/mc13783-adc.rst
-f:Documentation/hwmon/mc33xs2410_hwmon.rst
-f:Documentation/hwmon/mc34vr500.rst
-f:Documentation/hwmon/mcp3021.rst
-f:Documentation/hwmon/menf21bmc.rst
-f:Documentation/hwmon/mlxreg-fan.rst
-f:Documentation/hwmon/mp2856.rst
-f:Documentation/hwmon/mp2888.rst
-f:Documentation/hwmon/mp2891.rst
-f:Documentation/hwmon/mp2975.rst
-f:Documentation/hwmon/mp2993.rst
-f:Documentation/hwmon/mp5023.rst
-f:Documentation/hwmon/mp5920.rst
-f:Documentation/hwmon/mp5990.rst
-f:Documentation/hwmon/mp9941.rst
-f:Documentation/hwmon/mpq8785.rst
-f:Documentation/hwmon/nct6683.rst
-f:Documentation/hwmon/nct6775.rst
-f:Documentation/hwmon/nct7363.rst
-f:Documentation/hwmon/nct7802.rst
-f:Documentation/hwmon/nct7904.rst
-f:Documentation/hwmon/npcm750-pwm-fan.rst
-f:Documentation/hwmon/nsa320.rst
-f:Documentation/hwmon/ntc_thermistor.rst
-f:Documentation/hwmon/nzxt-kraken2.rst
-f:Documentation/hwmon/nzxt-kraken3.rst
-f:Documentation/hwmon/nzxt-smart2.rst
-f:Documentation/hwmon/occ.rst
-f:Documentation/hwmon/pc87360.rst
-f:Documentation/hwmon/pc87427.rst
-f:Documentation/hwmon/pcf8591.rst
-f:Documentation/hwmon/peci-cputemp.rst
-f:Documentation/hwmon/peci-dimmtemp.rst
-f:Documentation/hwmon/pim4328.rst
-f:Documentation/hwmon/pli1209bc.rst
-f:Documentation/hwmon/pm6764tr.rst
-f:Documentation/hwmon/pmbus-core.rst
-f:Documentation/hwmon/pmbus.rst
-f:Documentation/hwmon/powerz.rst
-f:Documentation/hwmon/powr1220.rst
-f:Documentation/hwmon/pt5161l.rst
-f:Documentation/hwmon/pwm-fan.rst
-f:Documentation/hwmon/pxe1610.rst
-f:Documentation/hwmon/q54sj108a2.rst
-f:Documentation/hwmon/qnap-mcu-hwmon.rst
-f:Documentation/hwmon/raspberrypi-hwmon.rst
-f:Documentation/hwmon/sbrmi.rst
-f:Documentation/hwmon/sbtsi_temp.rst
-f:Documentation/hwmon/sch5627.rst
-f:Documentation/hwmon/sch5636.rst
-f:Documentation/hwmon/scpi-hwmon.rst
-f:Documentation/hwmon/sfctemp.rst
-f:Documentation/hwmon/sg2042-mcu.rst
-f:Documentation/hwmon/sht15.rst
-f:Documentation/hwmon/sht21.rst
-f:Documentation/hwmon/sht3x.rst
-f:Documentation/hwmon/sht4x.rst
-f:Documentation/hwmon/shtc1.rst
-f:Documentation/hwmon/sis5595.rst
-f:Documentation/hwmon/sl28cpld.rst
-f:Documentation/hwmon/smpro-hwmon.rst
-f:Documentation/hwmon/smsc47b397.rst
-f:Documentation/hwmon/smsc47m1.rst
-f:Documentation/hwmon/smsc47m192.rst
-f:Documentation/hwmon/sparx5-temp.rst
-f:Documentation/hwmon/spd5118.rst
-f:Documentation/hwmon/stpddc60.rst
-f:Documentation/hwmon/submitting-patches.rst
-f:Documentation/hwmon/surface_fan.rst
-f:Documentation/hwmon/sy7636a-hwmon.rst
-f:Documentation/hwmon/sysfs-interface.rst
-f:Documentation/hwmon/tc654.rst
-f:Documentation/hwmon/tc74.rst
-f:Documentation/hwmon/thmc50.rst
-f:Documentation/hwmon/tmp102.rst
-f:Documentation/hwmon/tmp103.rst
-f:Documentation/hwmon/tmp108.rst
-f:Documentation/hwmon/tmp401.rst
-f:Documentation/hwmon/tmp421.rst
-f:Documentation/hwmon/tmp464.rst
-f:Documentation/hwmon/tmp513.rst
-f:Documentation/hwmon/tps23861.rst
-f:Documentation/hwmon/tps25990.rst
-f:Documentation/hwmon/tps40422.rst
-f:Documentation/hwmon/tps53679.rst
-f:Documentation/hwmon/tps546d24.rst
-f:Documentation/hwmon/twl4030-madc-hwmon.rst
-f:Documentation/hwmon/ucd9000.rst
-f:Documentation/hwmon/ucd9200.rst
-f:Documentation/hwmon/userspace-tools.rst
-f:Documentation/hwmon/vexpress.rst
-f:Documentation/hwmon/via686a.rst
-f:Documentation/hwmon/vt1211.rst
-f:Documentation/hwmon/w83627ehf.rst
-f:Documentation/hwmon/w83627hf.rst
-f:Documentation/hwmon/w83773g.rst
-f:Documentation/hwmon/w83781d.rst
-f:Documentation/hwmon/w83791d.rst
-f:Documentation/hwmon/w83792d.rst
-f:Documentation/hwmon/w83793.rst
-f:Documentation/hwmon/w83795.rst
-f:Documentation/hwmon/w83l785ts.rst
-f:Documentation/hwmon/w83l786ng.rst
-f:Documentation/hwmon/wm831x.rst
-f:Documentation/hwmon/wm8350.rst
-f:Documentation/hwmon/xdp710.rst
-f:Documentation/hwmon/xdpe12284.rst
-f:Documentation/hwmon/xdpe152c4.rst
-f:Documentation/hwmon/xgene-hwmon.rst
-f:Documentation/hwmon/zl6100.rst
-f:Documentation/i2c/busses/i2c-ali1535.rst
-f:Documentation/i2c/busses/i2c-ali1563.rst
-f:Documentation/i2c/busses/i2c-ali15x3.rst
-f:Documentation/i2c/busses/i2c-amd-mp2.rst
-f:Documentation/i2c/busses/i2c-amd756.rst
-f:Documentation/i2c/busses/i2c-amd8111.rst
-f:Documentation/i2c/busses/i2c-diolan-u2c.rst
-f:Documentation/i2c/busses/i2c-i801.rst
-f:Documentation/i2c/busses/i2c-ismt.rst
-f:Documentation/i2c/busses/i2c-mlxcpld.rst
-f:Documentation/i2c/busses/i2c-nforce2.rst
-f:Documentation/i2c/busses/i2c-nvidia-gpu.rst
-f:Documentation/i2c/busses/i2c-ocores.rst
-f:Documentation/i2c/busses/i2c-parport.rst
-f:Documentation/i2c/busses/i2c-pca-isa.rst
-f:Documentation/i2c/busses/i2c-piix4.rst
-f:Documentation/i2c/busses/i2c-sis5595.rst
-f:Documentation/i2c/busses/i2c-sis630.rst
-f:Documentation/i2c/busses/i2c-sis96x.rst
-f:Documentation/i2c/busses/i2c-taos-evm.rst
-f:Documentation/i2c/busses/i2c-via.rst
-f:Documentation/i2c/busses/i2c-viapro.rst
-f:Documentation/i2c/busses/index.rst
-f:Documentation/i2c/busses/scx200_acb.rst
-f:Documentation/i2c/dev-interface.rst
-f:Documentation/i2c/dma-considerations.rst
-f:Documentation/i2c/fault-codes.rst
-f:Documentation/i2c/functionality.rst
-f:Documentation/i2c/gpio-fault-injection.rst
-f:Documentation/i2c/i2c-address-translators.rst
-f:Documentation/i2c/i2c-protocol.rst
-f:Documentation/i2c/i2c-stub.rst
-f:Documentation/i2c/i2c-sysfs.rst
-f:Documentation/i2c/i2c-topology.rst
-f:Documentation/i2c/i2c_bus.svg
-f:Documentation/i2c/index.rst
-f:Documentation/i2c/instantiating-devices.rst
-f:Documentation/i2c/muxes/i2c-mux-gpio.rst
-f:Documentation/i2c/old-module-parameters.rst
-f:Documentation/i2c/slave-eeprom-backend.rst
-f:Documentation/i2c/slave-interface.rst
-f:Documentation/i2c/slave-testunit-backend.rst
-f:Documentation/i2c/smbus-protocol.rst
-f:Documentation/i2c/summary.rst
-f:Documentation/i2c/ten-bit-addresses.rst
-f:Documentation/i2c/writing-clients.rst
-f:Documentation/iio/ad3552r.rst
-f:Documentation/iio/ad4000.rst
-f:Documentation/iio/ad4030.rst
-f:Documentation/iio/ad4695.rst
-f:Documentation/iio/ad7191.rst
-f:Documentation/iio/ad7380.rst
-f:Documentation/iio/ad7606.rst
-f:Documentation/iio/ad7625.rst
-f:Documentation/iio/ad7944.rst
-f:Documentation/iio/adis16475.rst
-f:Documentation/iio/adis16480.rst
-f:Documentation/iio/adis16550.rst
-f:Documentation/iio/adxl313.rst
-f:Documentation/iio/adxl380.rst
-f:Documentation/iio/bno055.rst
-f:Documentation/iio/ep93xx_adc.rst
-f:Documentation/iio/iio_adc.rst
-f:Documentation/iio/iio_configfs.rst
-f:Documentation/iio/iio_devbuf.rst
-f:Documentation/iio/iio_dmabuf_api.rst
-f:Documentation/iio/iio_tools.rst
-f:Documentation/iio/index.rst
-f:Documentation/iio/opt4060.rst
-f:Documentation/images/COPYING-logo
-f:Documentation/images/logo.gif
-f:Documentation/images/logo.svg
-f:Documentation/index.rst
-f:Documentation/infiniband/core_locking.rst
-f:Documentation/infiniband/index.rst
-f:Documentation/infiniband/ipoib.rst
-f:Documentation/infiniband/opa_vnic.rst
-f:Documentation/infiniband/sysfs.rst
-f:Documentation/infiniband/tag_matching.rst
-f:Documentation/infiniband/ucaps.rst
-f:Documentation/infiniband/user_mad.rst
-f:Documentation/infiniband/user_verbs.rst
-f:Documentation/input/devices/alps.rst
-f:Documentation/input/devices/amijoy.rst
-f:Documentation/input/devices/appletouch.rst
-f:Documentation/input/devices/atarikbd.rst
-f:Documentation/input/devices/bcm5974.rst
-f:Documentation/input/devices/cma3000_d0x.rst
-f:Documentation/input/devices/cs461x.rst
-f:Documentation/input/devices/edt-ft5x06.rst
-f:Documentation/input/devices/elantech.rst
-f:Documentation/input/devices/iforce-protocol.rst
-f:Documentation/input/devices/index.rst
-f:Documentation/input/devices/joystick-parport.rst
-f:Documentation/input/devices/ntrig.rst
-f:Documentation/input/devices/pxrc.rst
-f:Documentation/input/devices/rotary-encoder.rst
-f:Documentation/input/devices/sentelic.rst
-f:Documentation/input/devices/walkera0701.rst
-f:Documentation/input/devices/xpad.rst
-f:Documentation/input/devices/yealink.rst
-f:Documentation/input/event-codes.rst
-f:Documentation/input/ff.rst
-f:Documentation/input/gamepad.rst
-f:Documentation/input/gameport-programming.rst
-f:Documentation/input/index.rst
-f:Documentation/input/input-programming.rst
-f:Documentation/input/input.rst
-f:Documentation/input/input_kapi.rst
-f:Documentation/input/input_uapi.rst
-f:Documentation/input/interactive.svg
-f:Documentation/input/joydev/index.rst
-f:Documentation/input/joydev/joystick-api.rst
-f:Documentation/input/joydev/joystick.rst
-f:Documentation/input/multi-touch-protocol.rst
-f:Documentation/input/notifier.rst
-f:Documentation/input/shape.svg
-f:Documentation/input/uinput.rst
-f:Documentation/input/userio.rst
-f:Documentation/isdn/credits.rst
-f:Documentation/isdn/index.rst
-f:Documentation/isdn/interface_capi.rst
-f:Documentation/isdn/m_isdn.rst
-f:Documentation/kbuild/Kconfig.recursion-issue-01
-f:Documentation/kbuild/Kconfig.recursion-issue-02
-f:Documentation/kbuild/Kconfig.select-break
-f:Documentation/kbuild/bash-completion.rst
-f:Documentation/kbuild/gcc-plugins.rst
-f:Documentation/kbuild/gendwarfksyms.rst
-f:Documentation/kbuild/headers_install.rst
-f:Documentation/kbuild/index.rst
-f:Documentation/kbuild/issues.rst
-f:Documentation/kbuild/kbuild.rst
-f:Documentation/kbuild/kconfig-language.rst
-f:Documentation/kbuild/kconfig-macro-language.rst
-f:Documentation/kbuild/kconfig.rst
-f:Documentation/kbuild/llvm.rst
-f:Documentation/kbuild/makefiles.rst
-f:Documentation/kbuild/modules.rst
-f:Documentation/kbuild/reproducible-builds.rst
-f:Documentation/kernel-hacking/false-sharing.rst
-f:Documentation/kernel-hacking/hacking.rst
-f:Documentation/kernel-hacking/index.rst
-f:Documentation/kernel-hacking/locking.rst
-f:Documentation/leds/index.rst
-f:Documentation/leds/leds-blinkm.rst
-f:Documentation/leds/leds-cht-wcove.rst
-f:Documentation/leds/leds-class-flash.rst
-f:Documentation/leds/leds-class-multicolor.rst
-f:Documentation/leds/leds-class.rst
-f:Documentation/leds/leds-el15203000.rst
-f:Documentation/leds/leds-lm3556.rst
-f:Documentation/leds/leds-lp3944.rst
-f:Documentation/leds/leds-lp5521.rst
-f:Documentation/leds/leds-lp5523.rst
-f:Documentation/leds/leds-lp5562.rst
-f:Documentation/leds/leds-lp55xx.rst
-f:Documentation/leds/leds-mlxcpld.rst
-f:Documentation/leds/leds-mt6370-rgb.rst
-f:Documentation/leds/leds-qcom-lpg.rst
-f:Documentation/leds/leds-sc27xx.rst
-f:Documentation/leds/leds-st1202.rst
-f:Documentation/leds/ledtrig-oneshot.rst
-f:Documentation/leds/ledtrig-transient.rst
-f:Documentation/leds/ledtrig-usbport.rst
-f:Documentation/leds/uleds.rst
-f:Documentation/leds/well-known-leds.txt
-f:Documentation/litmus-tests/README
-f:Documentation/litmus-tests/atomic/Atomic-RMW+mb__after_atomic-is-stronger-than-acquire.litmus
-f:Documentation/litmus-tests/atomic/Atomic-RMW-ops-are-atomic-WRT-atomic_set.litmus
-f:Documentation/litmus-tests/atomic/cmpxchg-fail-ordered-1.litmus
-f:Documentation/litmus-tests/atomic/cmpxchg-fail-ordered-2.litmus
-f:Documentation/litmus-tests/atomic/cmpxchg-fail-unordered-1.litmus
-f:Documentation/litmus-tests/atomic/cmpxchg-fail-unordered-2.litmus
-f:Documentation/litmus-tests/locking/DCL-broken.litmus
-f:Documentation/litmus-tests/locking/DCL-fixed.litmus
-f:Documentation/litmus-tests/locking/RM-broken.litmus
-f:Documentation/litmus-tests/locking/RM-fixed.litmus
-f:Documentation/litmus-tests/rcu/RCU+sync+free.litmus
-f:Documentation/litmus-tests/rcu/RCU+sync+read.litmus
-f:Documentation/livepatch/api.rst
-f:Documentation/livepatch/callbacks.rst
-f:Documentation/livepatch/cumulative-patches.rst
-f:Documentation/livepatch/index.rst
-f:Documentation/livepatch/livepatch.rst
-f:Documentation/livepatch/module-elf-format.rst
-f:Documentation/livepatch/reliable-stacktrace.rst
-f:Documentation/livepatch/shadow-vars.rst
-f:Documentation/livepatch/system-state.rst
-f:Documentation/locking/futex-requeue-pi.rst
-f:Documentation/locking/hwspinlock.rst
-f:Documentation/locking/index.rst
-f:Documentation/locking/lockdep-design.rst
-f:Documentation/locking/lockstat.rst
-f:Documentation/locking/locktorture.rst
-f:Documentation/locking/locktypes.rst
-f:Documentation/locking/mutex-design.rst
-f:Documentation/locking/percpu-rw-semaphore.rst
-f:Documentation/locking/pi-futex.rst
-f:Documentation/locking/preempt-locking.rst
-f:Documentation/locking/robust-futex-ABI.rst
-f:Documentation/locking/robust-futexes.rst
-f:Documentation/locking/rt-mutex-design.rst
-f:Documentation/locking/rt-mutex.rst
-f:Documentation/locking/seqlock.rst
-f:Documentation/locking/spinlocks.rst
-f:Documentation/locking/ww-mutex-design.rst
-f:Documentation/maintainer/configure-git.rst
-f:Documentation/maintainer/feature-and-driver-maintainers.rst
-f:Documentation/maintainer/index.rst
-f:Documentation/maintainer/maintainer-entry-profile.rst
-f:Documentation/maintainer/messy-diffstat.rst
-f:Documentation/maintainer/modifying-patches.rst
-f:Documentation/maintainer/pull-requests.rst
-f:Documentation/maintainer/rebasing-and-merging.rst
-f:Documentation/memory-barriers.txt
-f:Documentation/mhi/index.rst
-f:Documentation/mhi/mhi.rst
-f:Documentation/mhi/topology.rst
-f:Documentation/misc-devices/ad525x_dpot.rst
-f:Documentation/misc-devices/amd-sbi.rst
-f:Documentation/misc-devices/apds990x.rst
-f:Documentation/misc-devices/bh1770glc.rst
-f:Documentation/misc-devices/c2port.rst
-f:Documentation/misc-devices/dw-xdata-pcie.rst
-f:Documentation/misc-devices/ibmvmc.rst
-f:Documentation/misc-devices/ics932s401.rst
-f:Documentation/misc-devices/index.rst
-f:Documentation/misc-devices/isl29003.rst
-f:Documentation/misc-devices/lis3lv02d.rst
-f:Documentation/misc-devices/max6875.rst
-f:Documentation/misc-devices/mrvl_cn10k_dpi.rst
-f:Documentation/misc-devices/oxsemi-tornado.rst
-f:Documentation/misc-devices/pci-endpoint-test.rst
-f:Documentation/misc-devices/spear-pcie-gadget.rst
-f:Documentation/misc-devices/tps6594-pfsm.rst
-f:Documentation/misc-devices/uacce.rst
-f:Documentation/misc-devices/xilinx_sdfec.rst
-f:Documentation/mm/active_mm.rst
-f:Documentation/mm/allocation-profiling.rst
-f:Documentation/mm/arch_pgtable_helpers.rst
-f:Documentation/mm/balance.rst
-f:Documentation/mm/bootmem.rst
-f:Documentation/mm/damon/api.rst
-f:Documentation/mm/damon/design.rst
-f:Documentation/mm/damon/faq.rst
-f:Documentation/mm/damon/index.rst
-f:Documentation/mm/damon/maintainer-profile.rst
-f:Documentation/mm/damon/monitoring_intervals_tuning_example.rst
-f:Documentation/mm/free_page_reporting.rst
-f:Documentation/mm/highmem.rst
-f:Documentation/mm/hmm.rst
-f:Documentation/mm/hugetlbfs_reserv.rst
-f:Documentation/mm/hwpoison.rst
-f:Documentation/mm/index.rst
-f:Documentation/mm/ksm.rst
-f:Documentation/mm/memory-model.rst
-f:Documentation/mm/mmu_notifier.rst
-f:Documentation/mm/multigen_lru.rst
-f:Documentation/mm/numa.rst
-f:Documentation/mm/oom.rst
-f:Documentation/mm/overcommit-accounting.rst
-f:Documentation/mm/page_allocation.rst
-f:Documentation/mm/page_cache.rst
-f:Documentation/mm/page_frags.rst
-f:Documentation/mm/page_migration.rst
-f:Documentation/mm/page_owner.rst
-f:Documentation/mm/page_reclaim.rst
-f:Documentation/mm/page_table_check.rst
-f:Documentation/mm/page_tables.rst
-f:Documentation/mm/physical_memory.rst
-f:Documentation/mm/process_addrs.rst
-f:Documentation/mm/remap_file_pages.rst
-f:Documentation/mm/shmfs.rst
-f:Documentation/mm/slab.rst
-f:Documentation/mm/split_page_table_lock.rst
-f:Documentation/mm/swap.rst
-f:Documentation/mm/transhuge.rst
-f:Documentation/mm/unevictable-lru.rst
-f:Documentation/mm/vmalloc.rst
-f:Documentation/mm/vmalloced-kernel-stacks.rst
-f:Documentation/mm/vmemmap_dedup.rst
-f:Documentation/mm/zsmalloc.rst
-f:Documentation/netlabel/cipso_ipv4.rst
-f:Documentation/netlabel/draft-ietf-cipso-ipsecurity-01.txt
-f:Documentation/netlabel/draft_ietf.rst
-f:Documentation/netlabel/index.rst
-f:Documentation/netlabel/introduction.rst
-f:Documentation/netlabel/lsm_interface.rst
-f:Documentation/netlink/genetlink-c.yaml
-f:Documentation/netlink/genetlink-legacy.yaml
-f:Documentation/netlink/genetlink.yaml
-f:Documentation/netlink/netlink-raw.yaml
-f:Documentation/netlink/specs/conntrack.yaml
-f:Documentation/netlink/specs/devlink.yaml
-f:Documentation/netlink/specs/dpll.yaml
-f:Documentation/netlink/specs/ethtool.yaml
-f:Documentation/netlink/specs/fou.yaml
-f:Documentation/netlink/specs/handshake.yaml
-f:Documentation/netlink/specs/lockd.yaml
-f:Documentation/netlink/specs/mptcp_pm.yaml
-f:Documentation/netlink/specs/net_shaper.yaml
-f:Documentation/netlink/specs/netdev.yaml
-f:Documentation/netlink/specs/nfsd.yaml
-f:Documentation/netlink/specs/nftables.yaml
-f:Documentation/netlink/specs/nl80211.yaml
-f:Documentation/netlink/specs/nlctrl.yaml
-f:Documentation/netlink/specs/ovpn.yaml
-f:Documentation/netlink/specs/ovs_datapath.yaml
-f:Documentation/netlink/specs/ovs_flow.yaml
-f:Documentation/netlink/specs/ovs_vport.yaml
-f:Documentation/netlink/specs/rt-addr.yaml
-f:Documentation/netlink/specs/rt-link.yaml
-f:Documentation/netlink/specs/rt-neigh.yaml
-f:Documentation/netlink/specs/rt-route.yaml
-f:Documentation/netlink/specs/rt-rule.yaml
-f:Documentation/netlink/specs/tc.yaml
-f:Documentation/netlink/specs/tcp_metrics.yaml
-f:Documentation/netlink/specs/team.yaml
-f:Documentation/networking/6lowpan.rst
-f:Documentation/networking/6pack.rst
-f:Documentation/networking/af_xdp.rst
-f:Documentation/networking/alias.rst
-f:Documentation/networking/arcnet-hardware.rst
-f:Documentation/networking/arcnet.rst
-f:Documentation/networking/atm.rst
-f:Documentation/networking/ax25.rst
-f:Documentation/networking/bareudp.rst
-f:Documentation/networking/batman-adv.rst
-f:Documentation/networking/bonding.rst
-f:Documentation/networking/bridge.rst
-f:Documentation/networking/caif/caif.rst
-f:Documentation/networking/caif/index.rst
-f:Documentation/networking/caif/linux_caif.rst
-f:Documentation/networking/can.rst
-f:Documentation/networking/can_ucan_protocol.rst
-f:Documentation/networking/cdc_mbim.rst
-f:Documentation/networking/checksum-offloads.rst
-f:Documentation/networking/dctcp.rst
-f:Documentation/networking/device_drivers/atm/cxacru-cf.py
-f:Documentation/networking/device_drivers/atm/cxacru.rst
-f:Documentation/networking/device_drivers/atm/fore200e.rst
-f:Documentation/networking/device_drivers/atm/index.rst
-f:Documentation/networking/device_drivers/atm/iphase.rst
-f:Documentation/networking/device_drivers/can/can327.rst
-f:Documentation/networking/device_drivers/can/ctu/ctucanfd-driver.rst
-f:Documentation/networking/device_drivers/can/ctu/fsm_txt_buffer_user.svg
-f:Documentation/networking/device_drivers/can/freescale/flexcan.rst
-f:Documentation/networking/device_drivers/can/index.rst
-f:Documentation/networking/device_drivers/cellular/index.rst
-f:Documentation/networking/device_drivers/cellular/qualcomm/rmnet.rst
-f:Documentation/networking/device_drivers/ethernet/3com/3c509.rst
-f:Documentation/networking/device_drivers/ethernet/3com/vortex.rst
-f:Documentation/networking/device_drivers/ethernet/altera/altera_tse.rst
-f:Documentation/networking/device_drivers/ethernet/amazon/ena.rst
-f:Documentation/networking/device_drivers/ethernet/amd/pds_core.rst
-f:Documentation/networking/device_drivers/ethernet/amd/pds_vdpa.rst
-f:Documentation/networking/device_drivers/ethernet/amd/pds_vfio_pci.rst
-f:Documentation/networking/device_drivers/ethernet/aquantia/atlantic.rst
-f:Documentation/networking/device_drivers/ethernet/chelsio/cxgb.rst
-f:Documentation/networking/device_drivers/ethernet/cirrus/cs89x0.rst
-f:Documentation/networking/device_drivers/ethernet/davicom/dm9000.rst
-f:Documentation/networking/device_drivers/ethernet/dec/dmfe.rst
-f:Documentation/networking/device_drivers/ethernet/dlink/dl2k.rst
-f:Documentation/networking/device_drivers/ethernet/freescale/dpaa.rst
-f:Documentation/networking/device_drivers/ethernet/freescale/dpaa2/dpio-driver.rst
-f:Documentation/networking/device_drivers/ethernet/freescale/dpaa2/ethernet-driver.rst
-f:Documentation/networking/device_drivers/ethernet/freescale/dpaa2/index.rst
-f:Documentation/networking/device_drivers/ethernet/freescale/dpaa2/mac-phy-support.rst
-f:Documentation/networking/device_drivers/ethernet/freescale/dpaa2/overview.rst
-f:Documentation/networking/device_drivers/ethernet/freescale/dpaa2/switch-driver.rst
-f:Documentation/networking/device_drivers/ethernet/freescale/gianfar.rst
-f:Documentation/networking/device_drivers/ethernet/google/gve.rst
-f:Documentation/networking/device_drivers/ethernet/huawei/hinic.rst
-f:Documentation/networking/device_drivers/ethernet/huawei/hinic3.rst
-f:Documentation/networking/device_drivers/ethernet/index.rst
-f:Documentation/networking/device_drivers/ethernet/intel/e100.rst
-f:Documentation/networking/device_drivers/ethernet/intel/e1000.rst
-f:Documentation/networking/device_drivers/ethernet/intel/e1000e.rst
-f:Documentation/networking/device_drivers/ethernet/intel/fm10k.rst
-f:Documentation/networking/device_drivers/ethernet/intel/i40e.rst
-f:Documentation/networking/device_drivers/ethernet/intel/iavf.rst
-f:Documentation/networking/device_drivers/ethernet/intel/ice.rst
-f:Documentation/networking/device_drivers/ethernet/intel/idpf.rst
-f:Documentation/networking/device_drivers/ethernet/intel/igb.rst
-f:Documentation/networking/device_drivers/ethernet/intel/igbvf.rst
-f:Documentation/networking/device_drivers/ethernet/intel/ixgbe.rst
-f:Documentation/networking/device_drivers/ethernet/intel/ixgbevf.rst
-f:Documentation/networking/device_drivers/ethernet/marvell/octeon_ep.rst
-f:Documentation/networking/device_drivers/ethernet/marvell/octeon_ep_vf.rst
-f:Documentation/networking/device_drivers/ethernet/marvell/octeontx2.rst
-f:Documentation/networking/device_drivers/ethernet/mellanox/mlx5/counters.rst
-f:Documentation/networking/device_drivers/ethernet/mellanox/mlx5/index.rst
-f:Documentation/networking/device_drivers/ethernet/mellanox/mlx5/kconfig.rst
-f:Documentation/networking/device_drivers/ethernet/mellanox/mlx5/switchdev.rst
-f:Documentation/networking/device_drivers/ethernet/mellanox/mlx5/tracepoints.rst
-f:Documentation/networking/device_drivers/ethernet/meta/fbnic.rst
-f:Documentation/networking/device_drivers/ethernet/microsoft/netvsc.rst
-f:Documentation/networking/device_drivers/ethernet/neterion/s2io.rst
-f:Documentation/networking/device_drivers/ethernet/netronome/nfp.rst
-f:Documentation/networking/device_drivers/ethernet/pensando/ionic.rst
-f:Documentation/networking/device_drivers/ethernet/smsc/smc9.rst
-f:Documentation/networking/device_drivers/ethernet/stmicro/stmmac.rst
-f:Documentation/networking/device_drivers/ethernet/ti/am65_nuss_cpsw_switchdev.rst
-f:Documentation/networking/device_drivers/ethernet/ti/cpsw.rst
-f:Documentation/networking/device_drivers/ethernet/ti/cpsw_switchdev.rst
-f:Documentation/networking/device_drivers/ethernet/ti/icssg_prueth.rst
-f:Documentation/networking/device_drivers/ethernet/ti/tlan.rst
-f:Documentation/networking/device_drivers/ethernet/wangxun/ngbe.rst
-f:Documentation/networking/device_drivers/ethernet/wangxun/ngbevf.rst
-f:Documentation/networking/device_drivers/ethernet/wangxun/txgbe.rst
-f:Documentation/networking/device_drivers/ethernet/wangxun/txgbevf.rst
-f:Documentation/networking/device_drivers/fddi/defza.rst
-f:Documentation/networking/device_drivers/fddi/index.rst
-f:Documentation/networking/device_drivers/fddi/skfp.rst
-f:Documentation/networking/device_drivers/hamradio/baycom.rst
-f:Documentation/networking/device_drivers/hamradio/index.rst
-f:Documentation/networking/device_drivers/hamradio/z8530drv.rst
-f:Documentation/networking/device_drivers/index.rst
-f:Documentation/networking/device_drivers/wifi/index.rst
-f:Documentation/networking/device_drivers/wifi/intel/ipw2100.rst
-f:Documentation/networking/device_drivers/wifi/intel/ipw2200.rst
-f:Documentation/networking/device_drivers/wwan/index.rst
-f:Documentation/networking/device_drivers/wwan/iosm.rst
-f:Documentation/networking/device_drivers/wwan/t7xx.rst
-f:Documentation/networking/devlink/am65-nuss-cpsw-switch.rst
-f:Documentation/networking/devlink/bnxt.rst
-f:Documentation/networking/devlink/devlink-dpipe.rst
-f:Documentation/networking/devlink/devlink-eswitch-attr.rst
-f:Documentation/networking/devlink/devlink-flash.rst
-f:Documentation/networking/devlink/devlink-health.rst
-f:Documentation/networking/devlink/devlink-info.rst
-f:Documentation/networking/devlink/devlink-linecard.rst
-f:Documentation/networking/devlink/devlink-params.rst
-f:Documentation/networking/devlink/devlink-port.rst
-f:Documentation/networking/devlink/devlink-region.rst
-f:Documentation/networking/devlink/devlink-reload.rst
-f:Documentation/networking/devlink/devlink-resource.rst
-f:Documentation/networking/devlink/devlink-selftests.rst
-f:Documentation/networking/devlink/devlink-trap.rst
-f:Documentation/networking/devlink/etas_es58x.rst
-f:Documentation/networking/devlink/hns3.rst
-f:Documentation/networking/devlink/i40e.rst
-f:Documentation/networking/devlink/ice.rst
-f:Documentation/networking/devlink/index.rst
-f:Documentation/networking/devlink/ionic.rst
-f:Documentation/networking/devlink/iosm.rst
-f:Documentation/networking/devlink/ixgbe.rst
-f:Documentation/networking/devlink/kvaser_pciefd.rst
-f:Documentation/networking/devlink/kvaser_usb.rst
-f:Documentation/networking/devlink/mlx4.rst
-f:Documentation/networking/devlink/mlx5.rst
-f:Documentation/networking/devlink/mlxsw.rst
-f:Documentation/networking/devlink/mv88e6xxx.rst
-f:Documentation/networking/devlink/netdevsim.rst
-f:Documentation/networking/devlink/nfp.rst
-f:Documentation/networking/devlink/octeontx2.rst
-f:Documentation/networking/devlink/prestera.rst
-f:Documentation/networking/devlink/qed.rst
-f:Documentation/networking/devlink/sfc.rst
-f:Documentation/networking/devlink/ti-cpsw-switch.rst
-f:Documentation/networking/devlink/zl3073x.rst
-f:Documentation/networking/devmem.rst
-f:Documentation/networking/diagnostic/index.rst
-f:Documentation/networking/diagnostic/twisted_pair_layer1_diagnostics.rst
-f:Documentation/networking/dns_resolver.rst
-f:Documentation/networking/driver.rst
-f:Documentation/networking/dsa/b53.rst
-f:Documentation/networking/dsa/bcm_sf2.rst
-f:Documentation/networking/dsa/configuration.rst
-f:Documentation/networking/dsa/dsa.rst
-f:Documentation/networking/dsa/index.rst
-f:Documentation/networking/dsa/lan9303.rst
-f:Documentation/networking/dsa/sja1105.rst
-f:Documentation/networking/eql.rst
-f:Documentation/networking/ethtool-netlink.rst
-f:Documentation/networking/failover.rst
-f:Documentation/networking/fib_trie.rst
-f:Documentation/networking/filter.rst
-f:Documentation/networking/gen_stats.rst
-f:Documentation/networking/generic-hdlc.rst
-f:Documentation/networking/generic_netlink.rst
-f:Documentation/networking/gtp.rst
-f:Documentation/networking/ieee802154.rst
-f:Documentation/networking/ila.rst
-f:Documentation/networking/index.rst
-f:Documentation/networking/ioam6-sysctl.rst
-f:Documentation/networking/iou-zcrx.rst
-f:Documentation/networking/ip-sysctl.rst
-f:Documentation/networking/ip_dynaddr.rst
-f:Documentation/networking/ipsec.rst
-f:Documentation/networking/ipv6.rst
-f:Documentation/networking/ipvlan.rst
-f:Documentation/networking/ipvs-sysctl.rst
-f:Documentation/networking/iso15765-2.rst
-f:Documentation/networking/j1939.rst
-f:Documentation/networking/kapi.rst
-f:Documentation/networking/kcm.rst
-f:Documentation/networking/l2tp.rst
-f:Documentation/networking/lapb-module.rst
-f:Documentation/networking/mac80211-auth-assoc-deauth.txt
-f:Documentation/networking/mac80211-injection.rst
-f:Documentation/networking/mac80211_hwsim/hostapd.conf
-f:Documentation/networking/mac80211_hwsim/mac80211_hwsim.rst
-f:Documentation/networking/mac80211_hwsim/wpa_supplicant.conf
-f:Documentation/networking/mctp.rst
-f:Documentation/networking/mpls-sysctl.rst
-f:Documentation/networking/mptcp-sysctl.rst
-f:Documentation/networking/mptcp.rst
-f:Documentation/networking/msg_zerocopy.rst
-f:Documentation/networking/multi-pf-netdev.rst
-f:Documentation/networking/multiqueue.rst
-f:Documentation/networking/napi.rst
-f:Documentation/networking/net_cachelines/index.rst
-f:Documentation/networking/net_cachelines/inet_connection_sock.rst
-f:Documentation/networking/net_cachelines/inet_sock.rst
-f:Documentation/networking/net_cachelines/net_device.rst
-f:Documentation/networking/net_cachelines/netns_ipv4_sysctl.rst
-f:Documentation/networking/net_cachelines/snmp.rst
-f:Documentation/networking/net_cachelines/tcp_sock.rst
-f:Documentation/networking/net_dim.rst
-f:Documentation/networking/net_failover.rst
-f:Documentation/networking/netconsole.rst
-f:Documentation/networking/netdev-features.rst
-f:Documentation/networking/netdevices.rst
-f:Documentation/networking/netfilter-sysctl.rst
-f:Documentation/networking/netif-msg.rst
-f:Documentation/networking/netlink_spec/.gitignore
-f:Documentation/networking/netlink_spec/readme.txt
-f:Documentation/networking/netmem.rst
-f:Documentation/networking/nexthop-group-resilient.rst
-f:Documentation/networking/nf_conntrack-sysctl.rst
-f:Documentation/networking/nf_flowtable.rst
-f:Documentation/networking/nfc.rst
-f:Documentation/networking/oa-tc6-framework.rst
-f:Documentation/networking/openvswitch.rst
-f:Documentation/networking/operstates.rst
-f:Documentation/networking/packet_mmap.rst
-f:Documentation/networking/page_pool.rst
-f:Documentation/networking/phonet.rst
-f:Documentation/networking/phy-link-topology.rst
-f:Documentation/networking/phy.rst
-f:Documentation/networking/pktgen.rst
-f:Documentation/networking/plip.rst
-f:Documentation/networking/ppp_generic.rst
-f:Documentation/networking/proc_net_tcp.rst
-f:Documentation/networking/pse-pd/index.rst
-f:Documentation/networking/pse-pd/introduction.rst
-f:Documentation/networking/pse-pd/pse-pi.rst
-f:Documentation/networking/radiotap-headers.rst
-f:Documentation/networking/rds.rst
-f:Documentation/networking/regulatory.rst
-f:Documentation/networking/representors.rst
-f:Documentation/networking/rxrpc.rst
-f:Documentation/networking/scaling.rst
-f:Documentation/networking/sctp.rst
-f:Documentation/networking/secid.rst
-f:Documentation/networking/seg6-sysctl.rst
-f:Documentation/networking/segmentation-offloads.rst
-f:Documentation/networking/sfp-phylink.rst
-f:Documentation/networking/skbuff.rst
-f:Documentation/networking/smc-sysctl.rst
-f:Documentation/networking/snmp_counter.rst
-f:Documentation/networking/sriov.rst
-f:Documentation/networking/statistics.rst
-f:Documentation/networking/strparser.rst
-f:Documentation/networking/switchdev.rst
-f:Documentation/networking/sysfs-tagging.rst
-f:Documentation/networking/tc-actions-env-rules.rst
-f:Documentation/networking/tc-queue-filters.rst
-f:Documentation/networking/tcp-thin.rst
-f:Documentation/networking/tcp_ao.rst
-f:Documentation/networking/team.rst
-f:Documentation/networking/timestamping.rst
-f:Documentation/networking/tipc.rst
-f:Documentation/networking/tls-handshake.rst
-f:Documentation/networking/tls-offload-layers.svg
-f:Documentation/networking/tls-offload-reorder-bad.svg
-f:Documentation/networking/tls-offload-reorder-good.svg
-f:Documentation/networking/tls-offload.rst
-f:Documentation/networking/tls.rst
-f:Documentation/networking/tproxy.rst
-f:Documentation/networking/tuntap.rst
-f:Documentation/networking/udplite.rst
-f:Documentation/networking/vrf.rst
-f:Documentation/networking/vxlan.rst
-f:Documentation/networking/x25-iface.rst
-f:Documentation/networking/x25.rst
-f:Documentation/networking/xdp-rx-metadata.rst
-f:Documentation/networking/xfrm_device.rst
-f:Documentation/networking/xfrm_proc.rst
-f:Documentation/networking/xfrm_sync.rst
-f:Documentation/networking/xfrm_sysctl.rst
-f:Documentation/networking/xsk-tx-metadata.rst
-f:Documentation/nvdimm/maintainer-entry-profile.rst
-f:Documentation/nvme/feature-and-quirk-policy.rst
-f:Documentation/nvme/index.rst
-f:Documentation/nvme/nvme-pci-endpoint-target.rst
-f:Documentation/pcmcia/devicetable.rst
-f:Documentation/pcmcia/driver-changes.rst
-f:Documentation/pcmcia/driver.rst
-f:Documentation/pcmcia/index.rst
-f:Documentation/pcmcia/locking.rst
-f:Documentation/peci/index.rst
-f:Documentation/peci/peci.rst
-f:Documentation/power/apm-acpi.rst
-f:Documentation/power/basic-pm-debugging.rst
-f:Documentation/power/charger-manager.rst
-f:Documentation/power/drivers-testing.rst
-f:Documentation/power/energy-model.rst
-f:Documentation/power/freezing-of-tasks.rst
-f:Documentation/power/index.rst
-f:Documentation/power/opp.rst
-f:Documentation/power/pci.rst
-f:Documentation/power/pm_qos_interface.rst
-f:Documentation/power/power_supply_class.rst
-f:Documentation/power/powercap/dtpm.rst
-f:Documentation/power/powercap/powercap.rst
-f:Documentation/power/regulator/consumer.rst
-f:Documentation/power/regulator/design.rst
-f:Documentation/power/regulator/machine.rst
-f:Documentation/power/regulator/overview.rst
-f:Documentation/power/regulator/regulator.rst
-f:Documentation/power/runtime_pm.rst
-f:Documentation/power/s2ram.rst
-f:Documentation/power/suspend-and-cpuhotplug.rst
-f:Documentation/power/suspend-and-interrupts.rst
-f:Documentation/power/swsusp-and-swap-files.rst
-f:Documentation/power/swsusp-dmcrypt.rst
-f:Documentation/power/swsusp.rst
-f:Documentation/power/tricks.rst
-f:Documentation/power/userland-swsusp.rst
-f:Documentation/power/video.rst
-f:Documentation/process/1.Intro.rst
-f:Documentation/process/2.Process.rst
-f:Documentation/process/3.Early-stage.rst
-f:Documentation/process/4.Coding.rst
-f:Documentation/process/5.Posting.rst
-f:Documentation/process/6.Followthrough.rst
-f:Documentation/process/7.AdvancedTopics.rst
-f:Documentation/process/8.Conclusion.rst
-f:Documentation/process/adding-syscalls.rst
-f:Documentation/process/applying-patches.rst
-f:Documentation/process/backporting.rst
-f:Documentation/process/botching-up-ioctls.rst
-f:Documentation/process/changes.rst
-f:Documentation/process/code-of-conduct-interpretation.rst
-f:Documentation/process/code-of-conduct.rst
-f:Documentation/process/coding-style.rst
-f:Documentation/process/contribution-maturity-model.rst
-f:Documentation/process/cve.rst
-f:Documentation/process/debugging/driver_development_debugging_guide.rst
-f:Documentation/process/debugging/gdb-kernel-debugging.rst
-f:Documentation/process/debugging/index.rst
-f:Documentation/process/debugging/kgdb.rst
-f:Documentation/process/debugging/media_specific_debugging_guide.rst
-f:Documentation/process/debugging/userspace_debugging_guide.rst
-f:Documentation/process/deprecated.rst
-f:Documentation/process/development-process.rst
-f:Documentation/process/email-clients.rst
-f:Documentation/process/embargoed-hardware-issues.rst
-f:Documentation/process/handling-regressions.rst
-f:Documentation/process/howto.rst
-f:Documentation/process/index.rst
-f:Documentation/process/kernel-docs.rst
-f:Documentation/process/kernel-driver-statement.rst
-f:Documentation/process/kernel-enforcement-statement.rst
-f:Documentation/process/license-rules.rst
-f:Documentation/process/maintainer-handbooks.rst
-f:Documentation/process/maintainer-kvm-x86.rst
-f:Documentation/process/maintainer-netdev.rst
-f:Documentation/process/maintainer-pgp-guide.rst
-f:Documentation/process/maintainer-soc-clean-dts.rst
-f:Documentation/process/maintainer-soc.rst
-f:Documentation/process/maintainer-tip.rst
-f:Documentation/process/maintainers.rst
-f:Documentation/process/management-style.rst
-f:Documentation/process/programming-language.rst
-f:Documentation/process/researcher-guidelines.rst
-f:Documentation/process/security-bugs.rst
-f:Documentation/process/stable-api-nonsense.rst
-f:Documentation/process/stable-kernel-rules.rst
-f:Documentation/process/submit-checklist.rst
-f:Documentation/process/submitting-patches.rst
-f:Documentation/process/volatile-considered-harmful.rst
-f:Documentation/rust/arch-support.rst
-f:Documentation/rust/coding-guidelines.rst
-f:Documentation/rust/general-information.rst
-f:Documentation/rust/index.rst
-f:Documentation/rust/quick-start.rst
-f:Documentation/rust/testing.rst
-f:Documentation/scheduler/completion.rst
-f:Documentation/scheduler/index.rst
-f:Documentation/scheduler/membarrier.rst
-f:Documentation/scheduler/sched-arch.rst
-f:Documentation/scheduler/sched-bwc.rst
-f:Documentation/scheduler/sched-capacity.rst
-f:Documentation/scheduler/sched-deadline.rst
-f:Documentation/scheduler/sched-debug.rst
-f:Documentation/scheduler/sched-design-CFS.rst
-f:Documentation/scheduler/sched-domains.rst
-f:Documentation/scheduler/sched-eevdf.rst
-f:Documentation/scheduler/sched-energy.rst
-f:Documentation/scheduler/sched-ext.rst
-f:Documentation/scheduler/sched-nice-design.rst
-f:Documentation/scheduler/sched-pelt.c
-f:Documentation/scheduler/sched-rt-group.rst
-f:Documentation/scheduler/sched-stats.rst
-f:Documentation/scheduler/sched-util-clamp.rst
-f:Documentation/scheduler/schedutil.rst
-f:Documentation/scheduler/text_files.rst
-f:Documentation/scsi/53c700.rst
-f:Documentation/scsi/BusLogic.rst
-f:Documentation/scsi/ChangeLog.arcmsr
-f:Documentation/scsi/ChangeLog.ips
-f:Documentation/scsi/ChangeLog.lpfc
-f:Documentation/scsi/ChangeLog.megaraid
-f:Documentation/scsi/ChangeLog.megaraid_sas
-f:Documentation/scsi/ChangeLog.ncr53c8xx
-f:Documentation/scsi/ChangeLog.sym53c8xx
-f:Documentation/scsi/ChangeLog.sym53c8xx_2
-f:Documentation/scsi/FlashPoint.rst
-f:Documentation/scsi/LICENSE.FlashPoint
-f:Documentation/scsi/NinjaSCSI.rst
-f:Documentation/scsi/aacraid.rst
-f:Documentation/scsi/advansys.rst
-f:Documentation/scsi/aha152x.rst
-f:Documentation/scsi/aic79xx.rst
-f:Documentation/scsi/aic7xxx.rst
-f:Documentation/scsi/arcmsr_spec.rst
-f:Documentation/scsi/bfa.rst
-f:Documentation/scsi/bnx2fc.rst
-f:Documentation/scsi/cxgb3i.rst
-f:Documentation/scsi/dc395x.rst
-f:Documentation/scsi/dpti.rst
-f:Documentation/scsi/g_NCR5380.rst
-f:Documentation/scsi/hpsa.rst
-f:Documentation/scsi/hptiop.rst
-f:Documentation/scsi/index.rst
-f:Documentation/scsi/libsas.rst
-f:Documentation/scsi/link_power_management_policy.rst
-f:Documentation/scsi/lpfc.rst
-f:Documentation/scsi/megaraid.rst
-f:Documentation/scsi/ncr53c8xx.rst
-f:Documentation/scsi/ppa.rst
-f:Documentation/scsi/qlogicfas.rst
-f:Documentation/scsi/scsi-changer.rst
-f:Documentation/scsi/scsi-generic.rst
-f:Documentation/scsi/scsi-parameters.rst
-f:Documentation/scsi/scsi.rst
-f:Documentation/scsi/scsi_eh.rst
-f:Documentation/scsi/scsi_fc_transport.rst
-f:Documentation/scsi/scsi_mid_low_api.rst
-f:Documentation/scsi/scsi_transport_srp/figures.rst
-f:Documentation/scsi/scsi_transport_srp/rport_state_diagram.dot
-f:Documentation/scsi/sd-parameters.rst
-f:Documentation/scsi/smartpqi.rst
-f:Documentation/scsi/st.rst
-f:Documentation/scsi/sym53c500_cs.rst
-f:Documentation/scsi/sym53c8xx_2.rst
-f:Documentation/scsi/tcm_qla2xxx.rst
-f:Documentation/scsi/ufs.rst
-f:Documentation/scsi/wd719x.rst
-f:Documentation/security/IMA-templates.rst
-f:Documentation/security/SCTP.rst
-f:Documentation/security/credentials.rst
-f:Documentation/security/digsig.rst
-f:Documentation/security/index.rst
-f:Documentation/security/ipe.rst
-f:Documentation/security/keys/core.rst
-f:Documentation/security/keys/ecryptfs.rst
-f:Documentation/security/keys/index.rst
-f:Documentation/security/keys/request-key.rst
-f:Documentation/security/keys/trusted-encrypted.rst
-f:Documentation/security/landlock.rst
-f:Documentation/security/lsm-development.rst
-f:Documentation/security/lsm.rst
-f:Documentation/security/sak.rst
-f:Documentation/security/secrets/coco.rst
-f:Documentation/security/secrets/index.rst
-f:Documentation/security/self-protection.rst
-f:Documentation/security/siphash.rst
-f:Documentation/security/snp-tdx-threat-model.rst
-f:Documentation/security/tpm/index.rst
-f:Documentation/security/tpm/tpm-security.rst
-f:Documentation/security/tpm/tpm_event_log.rst
-f:Documentation/security/tpm/tpm_ffa_crb.rst
-f:Documentation/security/tpm/tpm_ftpm_tee.rst
-f:Documentation/security/tpm/tpm_tis.rst
-f:Documentation/security/tpm/tpm_vtpm_proxy.rst
-f:Documentation/security/tpm/xen-tpmfront.rst
-f:Documentation/sound/alsa-configuration.rst
-f:Documentation/sound/cards/audigy-mixer.rst
-f:Documentation/sound/cards/audiophile-usb.rst
-f:Documentation/sound/cards/bt87x.rst
-f:Documentation/sound/cards/cmipci.rst
-f:Documentation/sound/cards/emu-mixer.rst
-f:Documentation/sound/cards/emu10k1-jack.rst
-f:Documentation/sound/cards/hdspm.rst
-f:Documentation/sound/cards/img-spdif-in.rst
-f:Documentation/sound/cards/index.rst
-f:Documentation/sound/cards/joystick.rst
-f:Documentation/sound/cards/maya44.rst
-f:Documentation/sound/cards/mixart.rst
-f:Documentation/sound/cards/multisound.sh
-f:Documentation/sound/cards/pcmtest.rst
-f:Documentation/sound/cards/sb-live-mixer.rst
-f:Documentation/sound/cards/serial-u16550.rst
-f:Documentation/sound/cards/via82xx-mixer.rst
-f:Documentation/sound/codecs/cs35l56.rst
-f:Documentation/sound/codecs/index.rst
-f:Documentation/sound/designs/channel-mapping-api.rst
-f:Documentation/sound/designs/compress-accel.rst
-f:Documentation/sound/designs/compress-offload.rst
-f:Documentation/sound/designs/control-names.rst
-f:Documentation/sound/designs/index.rst
-f:Documentation/sound/designs/jack-controls.rst
-f:Documentation/sound/designs/jack-injection.rst
-f:Documentation/sound/designs/midi-2.0.rst
-f:Documentation/sound/designs/oss-emulation.rst
-f:Documentation/sound/designs/powersave.rst
-f:Documentation/sound/designs/procfile.rst
-f:Documentation/sound/designs/seq-oss.rst
-f:Documentation/sound/designs/timestamping.rst
-f:Documentation/sound/designs/tracepoints.rst
-f:Documentation/sound/hd-audio/controls.rst
-f:Documentation/sound/hd-audio/dp-mst.rst
-f:Documentation/sound/hd-audio/index.rst
-f:Documentation/sound/hd-audio/intel-multi-link.rst
-f:Documentation/sound/hd-audio/models.rst
-f:Documentation/sound/hd-audio/notes.rst
-f:Documentation/sound/hd-audio/realtek-pc-beep.rst
-f:Documentation/sound/index.rst
-f:Documentation/sound/kernel-api/alsa-driver-api.rst
-f:Documentation/sound/kernel-api/index.rst
-f:Documentation/sound/kernel-api/writing-an-alsa-driver.rst
-f:Documentation/sound/soc/clocking.rst
-f:Documentation/sound/soc/codec-to-codec.rst
-f:Documentation/sound/soc/codec.rst
-f:Documentation/sound/soc/dai.rst
-f:Documentation/sound/soc/dapm-graph.svg
-f:Documentation/sound/soc/dapm.rst
-f:Documentation/sound/soc/dpcm.rst
-f:Documentation/sound/soc/index.rst
-f:Documentation/sound/soc/jack.rst
-f:Documentation/sound/soc/machine.rst
-f:Documentation/sound/soc/overview.rst
-f:Documentation/sound/soc/platform.rst
-f:Documentation/sound/soc/pops-clicks.rst
-f:Documentation/sound/soc/usb.rst
-f:Documentation/sound/utimers.rst
-f:Documentation/sphinx-static/custom.css
-f:Documentation/sphinx-static/theme_overrides.css
-f:Documentation/sphinx-static/theme_rtd_colors.css
-f:Documentation/sphinx/automarkup.py
-f:Documentation/sphinx/cdomain.py
-f:Documentation/sphinx/kernel_abi.py
-f:Documentation/sphinx/kernel_feat.py
-f:Documentation/sphinx/kernel_include.py
-f:Documentation/sphinx/kerneldoc-preamble.sty
-f:Documentation/sphinx/kerneldoc.py
-f:Documentation/sphinx/kfigure.py
-f:Documentation/sphinx/load_config.py
-f:Documentation/sphinx/maintainers_include.py
-f:Documentation/sphinx/min_requirements.txt
-f:Documentation/sphinx/parallel-wrapper.sh
-f:Documentation/sphinx/parse-headers.pl
-f:Documentation/sphinx/requirements.txt
-f:Documentation/sphinx/rstFlatTable.py
-f:Documentation/sphinx/templates/kernel-toc.html
-f:Documentation/sphinx/templates/translations.html
-f:Documentation/sphinx/translations.py
-f:Documentation/spi/butterfly.rst
-f:Documentation/spi/index.rst
-f:Documentation/spi/spi-lm70llp.rst
-f:Documentation/spi/spi-sc18is602.rst
-f:Documentation/spi/spi-summary.rst
-f:Documentation/spi/spidev.rst
-f:Documentation/staging/crc32.rst
-f:Documentation/staging/index.rst
-f:Documentation/staging/lzo.rst
-f:Documentation/staging/magic-number.rst
-f:Documentation/staging/remoteproc.rst
-f:Documentation/staging/rpmsg.rst
-f:Documentation/staging/speculation.rst
-f:Documentation/staging/static-keys.rst
-f:Documentation/staging/xz.rst
-f:Documentation/subsystem-apis.rst
-f:Documentation/sunrpc/xdr/nfs4_1.x
-f:Documentation/target/index.rst
-f:Documentation/target/scripts.rst
-f:Documentation/target/target-export-device
-f:Documentation/target/tcm_mod_builder.rst
-f:Documentation/target/tcmu-design.rst
-f:Documentation/tee/amd-tee.rst
-f:Documentation/tee/index.rst
-f:Documentation/tee/op-tee.rst
-f:Documentation/tee/tee.rst
-f:Documentation/tee/ts-tee.rst
-f:Documentation/timers/delay_sleep_functions.rst
-f:Documentation/timers/highres.rst
-f:Documentation/timers/hpet.rst
-f:Documentation/timers/hrtimers.rst
-f:Documentation/timers/index.rst
-f:Documentation/timers/no_hz.rst
-f:Documentation/timers/timekeeping.rst
-f:Documentation/tools/index.rst
-f:Documentation/tools/rtla/Makefile
-f:Documentation/tools/rtla/common_appendix.rst
-f:Documentation/tools/rtla/common_hist_options.rst
-f:Documentation/tools/rtla/common_options.rst
-f:Documentation/tools/rtla/common_osnoise_description.rst
-f:Documentation/tools/rtla/common_osnoise_options.rst
-f:Documentation/tools/rtla/common_timerlat_aa.rst
-f:Documentation/tools/rtla/common_timerlat_description.rst
-f:Documentation/tools/rtla/common_timerlat_options.rst
-f:Documentation/tools/rtla/common_top_options.rst
-f:Documentation/tools/rtla/index.rst
-f:Documentation/tools/rtla/rtla-hwnoise.rst
-f:Documentation/tools/rtla/rtla-osnoise-hist.rst
-f:Documentation/tools/rtla/rtla-osnoise-top.rst
-f:Documentation/tools/rtla/rtla-osnoise.rst
-f:Documentation/tools/rtla/rtla-timerlat-hist.rst
-f:Documentation/tools/rtla/rtla-timerlat-top.rst
-f:Documentation/tools/rtla/rtla-timerlat.rst
-f:Documentation/tools/rtla/rtla.rst
-f:Documentation/tools/rv/Makefile
-f:Documentation/tools/rv/common_appendix.rst
-f:Documentation/tools/rv/common_ikm.rst
-f:Documentation/tools/rv/index.rst
-f:Documentation/tools/rv/rv-list.rst
-f:Documentation/tools/rv/rv-mon-sched.rst
-f:Documentation/tools/rv/rv-mon-wip.rst
-f:Documentation/tools/rv/rv-mon-wwnr.rst
-f:Documentation/tools/rv/rv-mon.rst
-f:Documentation/tools/rv/rv.rst
-f:Documentation/trace/boottime-trace.rst
-f:Documentation/trace/coresight/coresight-config.rst
-f:Documentation/trace/coresight/coresight-cpu-debug.rst
-f:Documentation/trace/coresight/coresight-dummy.rst
-f:Documentation/trace/coresight/coresight-ect.rst
-f:Documentation/trace/coresight/coresight-etm4x-reference.rst
-f:Documentation/trace/coresight/coresight-perf.rst
-f:Documentation/trace/coresight/coresight-tpda.rst
-f:Documentation/trace/coresight/coresight-tpdm.rst
-f:Documentation/trace/coresight/coresight-trbe.rst
-f:Documentation/trace/coresight/coresight.rst
-f:Documentation/trace/coresight/index.rst
-f:Documentation/trace/coresight/panic.rst
-f:Documentation/trace/coresight/ultrasoc-smb.rst
-f:Documentation/trace/debugging.rst
-f:Documentation/trace/events-kmem.rst
-f:Documentation/trace/events-msr.rst
-f:Documentation/trace/events-nmi.rst
-f:Documentation/trace/events-power.rst
-f:Documentation/trace/events.rst
-f:Documentation/trace/fprobe.rst
-f:Documentation/trace/fprobetrace.rst
-f:Documentation/trace/ftrace-design.rst
-f:Documentation/trace/ftrace-uses.rst
-f:Documentation/trace/ftrace.rst
-f:Documentation/trace/function-graph-fold.vim
-f:Documentation/trace/hisi-ptt.rst
-f:Documentation/trace/histogram-design.rst
-f:Documentation/trace/histogram.rst
-f:Documentation/trace/hwlat_detector.rst
-f:Documentation/trace/index.rst
-f:Documentation/trace/intel_th.rst
-f:Documentation/trace/kprobes.rst
-f:Documentation/trace/kprobetrace.rst
-f:Documentation/trace/mmiotrace.rst
-f:Documentation/trace/osnoise-tracer.rst
-f:Documentation/trace/postprocess/decode_msr.py
-f:Documentation/trace/postprocess/trace-pagealloc-postprocess.pl
-f:Documentation/trace/postprocess/trace-vmscan-postprocess.pl
-f:Documentation/trace/ring-buffer-design.rst
-f:Documentation/trace/ring-buffer-map.rst
-f:Documentation/trace/rv/da_monitor_instrumentation.rst
-f:Documentation/trace/rv/deterministic_automata.rst
-f:Documentation/trace/rv/index.rst
-f:Documentation/trace/rv/linear_temporal_logic.rst
-f:Documentation/trace/rv/monitor_rtapp.rst
-f:Documentation/trace/rv/monitor_sched.rst
-f:Documentation/trace/rv/monitor_synthesis.rst
-f:Documentation/trace/rv/monitor_wip.rst
-f:Documentation/trace/rv/monitor_wwnr.rst
-f:Documentation/trace/rv/runtime-verification.rst
-f:Documentation/trace/stm.rst
-f:Documentation/trace/sys-t.rst
-f:Documentation/trace/timerlat-tracer.rst
-f:Documentation/trace/tracepoint-analysis.rst
-f:Documentation/trace/tracepoints.rst
-f:Documentation/trace/uprobetracer.rst
-f:Documentation/trace/user_events.rst
-f:Documentation/translations/index.rst
-f:Documentation/translations/it_IT/RCU/index.rst
-f:Documentation/translations/it_IT/RCU/torture.rst
-f:Documentation/translations/it_IT/admin-guide/README.rst
-f:Documentation/translations/it_IT/admin-guide/kernel-parameters.rst
-f:Documentation/translations/it_IT/arch/riscv/patch-acceptance.rst
-f:Documentation/translations/it_IT/core-api/index.rst
-f:Documentation/translations/it_IT/core-api/memory-allocation.rst
-f:Documentation/translations/it_IT/core-api/symbol-namespaces.rst
-f:Documentation/translations/it_IT/dev-tools/clang-format.rst
-f:Documentation/translations/it_IT/dev-tools/index.rst
-f:Documentation/translations/it_IT/devicetree/bindings/submitting-patches.rst
-f:Documentation/translations/it_IT/disclaimer-ita.rst
-f:Documentation/translations/it_IT/doc-guide/index.rst
-f:Documentation/translations/it_IT/doc-guide/kernel-doc.rst
-f:Documentation/translations/it_IT/doc-guide/parse-headers.rst
-f:Documentation/translations/it_IT/doc-guide/sphinx.rst
-f:Documentation/translations/it_IT/i2c/i2c-protocol.rst
-f:Documentation/translations/it_IT/i2c/index.rst
-f:Documentation/translations/it_IT/i2c/summary.rst
-f:Documentation/translations/it_IT/index.rst
-f:Documentation/translations/it_IT/kernel-hacking/hacking.rst
-f:Documentation/translations/it_IT/kernel-hacking/index.rst
-f:Documentation/translations/it_IT/kernel-hacking/locking.rst
-f:Documentation/translations/it_IT/locking/index.rst
-f:Documentation/translations/it_IT/locking/lockdep-design.rst
-f:Documentation/translations/it_IT/locking/lockstat.rst
-f:Documentation/translations/it_IT/locking/locktorture.rst
-f:Documentation/translations/it_IT/locking/locktypes.rst
-f:Documentation/translations/it_IT/maintainer/configure-git.rst
-f:Documentation/translations/it_IT/process/1.Intro.rst
-f:Documentation/translations/it_IT/process/2.Process.rst
-f:Documentation/translations/it_IT/process/3.Early-stage.rst
-f:Documentation/translations/it_IT/process/4.Coding.rst
-f:Documentation/translations/it_IT/process/5.Posting.rst
-f:Documentation/translations/it_IT/process/6.Followthrough.rst
-f:Documentation/translations/it_IT/process/7.AdvancedTopics.rst
-f:Documentation/translations/it_IT/process/8.Conclusion.rst
-f:Documentation/translations/it_IT/process/adding-syscalls.rst
-f:Documentation/translations/it_IT/process/applying-patches.rst
-f:Documentation/translations/it_IT/process/botching-up-ioctls.rst
-f:Documentation/translations/it_IT/process/changes.rst
-f:Documentation/translations/it_IT/process/code-of-conduct.rst
-f:Documentation/translations/it_IT/process/coding-style.rst
-f:Documentation/translations/it_IT/process/deprecated.rst
-f:Documentation/translations/it_IT/process/development-process.rst
-f:Documentation/translations/it_IT/process/email-clients.rst
-f:Documentation/translations/it_IT/process/howto.rst
-f:Documentation/translations/it_IT/process/index.rst
-f:Documentation/translations/it_IT/process/kernel-docs.rst
-f:Documentation/translations/it_IT/process/kernel-driver-statement.rst
-f:Documentation/translations/it_IT/process/kernel-enforcement-statement.rst
-f:Documentation/translations/it_IT/process/license-rules.rst
-f:Documentation/translations/it_IT/process/maintainer-handbooks.rst
-f:Documentation/translations/it_IT/process/maintainer-pgp-guide.rst
-f:Documentation/translations/it_IT/process/maintainer-tip.rst
-f:Documentation/translations/it_IT/process/maintainers.rst
-f:Documentation/translations/it_IT/process/management-style.rst
-f:Documentation/translations/it_IT/process/programming-language.rst
-f:Documentation/translations/it_IT/process/security-bugs.rst
-f:Documentation/translations/it_IT/process/stable-api-nonsense.rst
-f:Documentation/translations/it_IT/process/stable-kernel-rules.rst
-f:Documentation/translations/it_IT/process/submit-checklist.rst
-f:Documentation/translations/it_IT/process/submitting-patches.rst
-f:Documentation/translations/it_IT/process/volatile-considered-harmful.rst
-f:Documentation/translations/it_IT/staging/index.rst
-f:Documentation/translations/it_IT/staging/magic-number.rst
-f:Documentation/translations/it_IT/subsystem-apis.rst
-f:Documentation/translations/ja_JP/SubmittingPatches
-f:Documentation/translations/ja_JP/disclaimer-ja_JP.rst
-f:Documentation/translations/ja_JP/index.rst
-f:Documentation/translations/ja_JP/process/howto.rst
-f:Documentation/translations/ja_JP/process/submit-checklist.rst
-f:Documentation/translations/ja_JP/stable_api_nonsense.txt
-f:Documentation/translations/ja_JP/stable_kernel_rules.txt
-f:Documentation/translations/ko_KR/core-api/wrappers/memory-barriers.rst
-f:Documentation/translations/ko_KR/index.rst
-f:Documentation/translations/ko_KR/memory-barriers.txt
-f:Documentation/translations/ko_KR/process/howto.rst
-f:Documentation/translations/ko_KR/stable_api_nonsense.txt
-f:Documentation/translations/sp_SP/disclaimer-sp.rst
-f:Documentation/translations/sp_SP/index.rst
-f:Documentation/translations/sp_SP/memory-barriers.txt
-f:Documentation/translations/sp_SP/process/1.Intro.rst
-f:Documentation/translations/sp_SP/process/2.Process.rst
-f:Documentation/translations/sp_SP/process/3.Early-stage.rst
-f:Documentation/translations/sp_SP/process/4.Coding.rst
-f:Documentation/translations/sp_SP/process/5.Posting.rst
-f:Documentation/translations/sp_SP/process/6.Followthrough.rst
-f:Documentation/translations/sp_SP/process/7.AdvancedTopics.rst
-f:Documentation/translations/sp_SP/process/8.Conclusion.rst
-f:Documentation/translations/sp_SP/process/adding-syscalls.rst
-f:Documentation/translations/sp_SP/process/code-of-conduct.rst
-f:Documentation/translations/sp_SP/process/coding-style.rst
-f:Documentation/translations/sp_SP/process/contribution-maturity-model.rst
-f:Documentation/translations/sp_SP/process/deprecated.rst
-f:Documentation/translations/sp_SP/process/development-process.rst
-f:Documentation/translations/sp_SP/process/email-clients.rst
-f:Documentation/translations/sp_SP/process/embargoed-hardware-issues.rst
-f:Documentation/translations/sp_SP/process/handling-regressions.rst
-f:Documentation/translations/sp_SP/process/howto.rst
-f:Documentation/translations/sp_SP/process/index.rst
-f:Documentation/translations/sp_SP/process/kernel-docs.rst
-f:Documentation/translations/sp_SP/process/kernel-enforcement-statement.rst
-f:Documentation/translations/sp_SP/process/magic-number.rst
-f:Documentation/translations/sp_SP/process/maintainer-kvm-x86.rst
-f:Documentation/translations/sp_SP/process/management-style.rst
-f:Documentation/translations/sp_SP/process/programming-language.rst
-f:Documentation/translations/sp_SP/process/researcher-guidelines.rst
-f:Documentation/translations/sp_SP/process/security-bugs.rst
-f:Documentation/translations/sp_SP/process/submit-checklist.rst
-f:Documentation/translations/sp_SP/process/submitting-patches.rst
-f:Documentation/translations/sp_SP/scheduler/index.rst
-f:Documentation/translations/sp_SP/scheduler/sched-bwc.rst
-f:Documentation/translations/sp_SP/scheduler/sched-design-CFS.rst
-f:Documentation/translations/sp_SP/scheduler/sched-eevdf.rst
-f:Documentation/translations/sp_SP/wrappers/memory-barriers.rst
-f:Documentation/translations/zh_CN/PCI/acpi-info.rst
-f:Documentation/translations/zh_CN/PCI/index.rst
-f:Documentation/translations/zh_CN/PCI/msi-howto.rst
-f:Documentation/translations/zh_CN/PCI/pci-iov-howto.rst
-f:Documentation/translations/zh_CN/PCI/pci.rst
-f:Documentation/translations/zh_CN/PCI/pciebus-howto.rst
-f:Documentation/translations/zh_CN/PCI/sysfs-pci.rst
-f:Documentation/translations/zh_CN/accounting/delay-accounting.rst
-f:Documentation/translations/zh_CN/accounting/index.rst
-f:Documentation/translations/zh_CN/accounting/psi.rst
-f:Documentation/translations/zh_CN/accounting/taskstats.rst
-f:Documentation/translations/zh_CN/admin-guide/README.rst
-f:Documentation/translations/zh_CN/admin-guide/bootconfig.rst
-f:Documentation/translations/zh_CN/admin-guide/bug-bisect.rst
-f:Documentation/translations/zh_CN/admin-guide/bug-hunting.rst
-f:Documentation/translations/zh_CN/admin-guide/clearing-warn-once.rst
-f:Documentation/translations/zh_CN/admin-guide/cpu-load.rst
-f:Documentation/translations/zh_CN/admin-guide/cputopology.rst
-f:Documentation/translations/zh_CN/admin-guide/index.rst
-f:Documentation/translations/zh_CN/admin-guide/init.rst
-f:Documentation/translations/zh_CN/admin-guide/lockup-watchdogs.rst
-f:Documentation/translations/zh_CN/admin-guide/mm/damon/index.rst
-f:Documentation/translations/zh_CN/admin-guide/mm/damon/lru_sort.rst
-f:Documentation/translations/zh_CN/admin-guide/mm/damon/reclaim.rst
-f:Documentation/translations/zh_CN/admin-guide/mm/damon/start.rst
-f:Documentation/translations/zh_CN/admin-guide/mm/damon/usage.rst
-f:Documentation/translations/zh_CN/admin-guide/mm/index.rst
-f:Documentation/translations/zh_CN/admin-guide/mm/ksm.rst
-f:Documentation/translations/zh_CN/admin-guide/numastat.rst
-f:Documentation/translations/zh_CN/admin-guide/reporting-issues.rst
-f:Documentation/translations/zh_CN/admin-guide/reporting-regressions.rst
-f:Documentation/translations/zh_CN/admin-guide/sysrq.rst
-f:Documentation/translations/zh_CN/admin-guide/tainted-kernels.rst
-f:Documentation/translations/zh_CN/admin-guide/unicode.rst
-f:Documentation/translations/zh_CN/arch/arm/Booting
-f:Documentation/translations/zh_CN/arch/arm/kernel_user_helpers.txt
-f:Documentation/translations/zh_CN/arch/arm64/amu.rst
-f:Documentation/translations/zh_CN/arch/arm64/booting.txt
-f:Documentation/translations/zh_CN/arch/arm64/elf_hwcaps.rst
-f:Documentation/translations/zh_CN/arch/arm64/hugetlbpage.rst
-f:Documentation/translations/zh_CN/arch/arm64/index.rst
-f:Documentation/translations/zh_CN/arch/arm64/legacy_instructions.txt
-f:Documentation/translations/zh_CN/arch/arm64/memory.txt
-f:Documentation/translations/zh_CN/arch/arm64/perf.rst
-f:Documentation/translations/zh_CN/arch/arm64/silicon-errata.txt
-f:Documentation/translations/zh_CN/arch/arm64/tagged-pointers.txt
-f:Documentation/translations/zh_CN/arch/index.rst
-f:Documentation/translations/zh_CN/arch/loongarch/booting.rst
-f:Documentation/translations/zh_CN/arch/loongarch/features.rst
-f:Documentation/translations/zh_CN/arch/loongarch/index.rst
-f:Documentation/translations/zh_CN/arch/loongarch/introduction.rst
-f:Documentation/translations/zh_CN/arch/loongarch/irq-chip-model.rst
-f:Documentation/translations/zh_CN/arch/mips/booting.rst
-f:Documentation/translations/zh_CN/arch/mips/features.rst
-f:Documentation/translations/zh_CN/arch/mips/index.rst
-f:Documentation/translations/zh_CN/arch/mips/ingenic-tcu.rst
-f:Documentation/translations/zh_CN/arch/openrisc/index.rst
-f:Documentation/translations/zh_CN/arch/openrisc/openrisc_port.rst
-f:Documentation/translations/zh_CN/arch/openrisc/todo.rst
-f:Documentation/translations/zh_CN/arch/parisc/debugging.rst
-f:Documentation/translations/zh_CN/arch/parisc/index.rst
-f:Documentation/translations/zh_CN/arch/parisc/registers.rst
-f:Documentation/translations/zh_CN/arch/riscv/boot-image-header.rst
-f:Documentation/translations/zh_CN/arch/riscv/boot.rst
-f:Documentation/translations/zh_CN/arch/riscv/index.rst
-f:Documentation/translations/zh_CN/arch/riscv/patch-acceptance.rst
-f:Documentation/translations/zh_CN/arch/riscv/vm-layout.rst
-f:Documentation/translations/zh_CN/core-api/assoc_array.rst
-f:Documentation/translations/zh_CN/core-api/boot-time-mm.rst
-f:Documentation/translations/zh_CN/core-api/cachetlb.rst
-f:Documentation/translations/zh_CN/core-api/circular-buffers.rst
-f:Documentation/translations/zh_CN/core-api/cpu_hotplug.rst
-f:Documentation/translations/zh_CN/core-api/errseq.rst
-f:Documentation/translations/zh_CN/core-api/genalloc.rst
-f:Documentation/translations/zh_CN/core-api/generic-radix-tree.rst
-f:Documentation/translations/zh_CN/core-api/genericirq.rst
-f:Documentation/translations/zh_CN/core-api/gfp_mask-from-fs-io.rst
-f:Documentation/translations/zh_CN/core-api/idr.rst
-f:Documentation/translations/zh_CN/core-api/index.rst
-f:Documentation/translations/zh_CN/core-api/irq/concepts.rst
-f:Documentation/translations/zh_CN/core-api/irq/index.rst
-f:Documentation/translations/zh_CN/core-api/irq/irq-affinity.rst
-f:Documentation/translations/zh_CN/core-api/irq/irq-domain.rst
-f:Documentation/translations/zh_CN/core-api/irq/irqflags-tracing.rst
-f:Documentation/translations/zh_CN/core-api/kernel-api.rst
-f:Documentation/translations/zh_CN/core-api/kobject.rst
-f:Documentation/translations/zh_CN/core-api/kref.rst
-f:Documentation/translations/zh_CN/core-api/local_ops.rst
-f:Documentation/translations/zh_CN/core-api/memory-allocation.rst
-f:Documentation/translations/zh_CN/core-api/memory-hotplug.rst
-f:Documentation/translations/zh_CN/core-api/mm-api.rst
-f:Documentation/translations/zh_CN/core-api/packing.rst
-f:Documentation/translations/zh_CN/core-api/padata.rst
-f:Documentation/translations/zh_CN/core-api/printk-basics.rst
-f:Documentation/translations/zh_CN/core-api/printk-formats.rst
-f:Documentation/translations/zh_CN/core-api/protection-keys.rst
-f:Documentation/translations/zh_CN/core-api/rbtree.rst
-f:Documentation/translations/zh_CN/core-api/refcount-vs-atomic.rst
-f:Documentation/translations/zh_CN/core-api/symbol-namespaces.rst
-f:Documentation/translations/zh_CN/core-api/this_cpu_ops.rst
-f:Documentation/translations/zh_CN/core-api/unaligned-memory-access.rst
-f:Documentation/translations/zh_CN/core-api/union_find.rst
-f:Documentation/translations/zh_CN/core-api/watch_queue.rst
-f:Documentation/translations/zh_CN/core-api/workqueue.rst
-f:Documentation/translations/zh_CN/core-api/xarray.rst
-f:Documentation/translations/zh_CN/cpu-freq/core.rst
-f:Documentation/translations/zh_CN/cpu-freq/cpu-drivers.rst
-f:Documentation/translations/zh_CN/cpu-freq/cpufreq-stats.rst
-f:Documentation/translations/zh_CN/cpu-freq/index.rst
-f:Documentation/translations/zh_CN/dev-tools/gcov.rst
-f:Documentation/translations/zh_CN/dev-tools/gdb-kernel-debugging.rst
-f:Documentation/translations/zh_CN/dev-tools/index.rst
-f:Documentation/translations/zh_CN/dev-tools/kasan.rst
-f:Documentation/translations/zh_CN/dev-tools/kcov.rst
-f:Documentation/translations/zh_CN/dev-tools/kcsan.rst
-f:Documentation/translations/zh_CN/dev-tools/kmemleak.rst
-f:Documentation/translations/zh_CN/dev-tools/kmsan.rst
-f:Documentation/translations/zh_CN/dev-tools/sparse.rst
-f:Documentation/translations/zh_CN/dev-tools/testing-overview.rst
-f:Documentation/translations/zh_CN/dev-tools/ubsan.rst
-f:Documentation/translations/zh_CN/devicetree/changesets.rst
-f:Documentation/translations/zh_CN/devicetree/dynamic-resolution-notes.rst
-f:Documentation/translations/zh_CN/devicetree/index.rst
-f:Documentation/translations/zh_CN/devicetree/kernel-api.rst
-f:Documentation/translations/zh_CN/devicetree/of_unittest.rst
-f:Documentation/translations/zh_CN/devicetree/overlay-notes.rst
-f:Documentation/translations/zh_CN/devicetree/usage-model.rst
-f:Documentation/translations/zh_CN/disclaimer-zh_CN.rst
-f:Documentation/translations/zh_CN/doc-guide/checktransupdate.rst
-f:Documentation/translations/zh_CN/doc-guide/contributing.rst
-f:Documentation/translations/zh_CN/doc-guide/index.rst
-f:Documentation/translations/zh_CN/doc-guide/kernel-doc.rst
-f:Documentation/translations/zh_CN/doc-guide/maintainer-profile.rst
-f:Documentation/translations/zh_CN/doc-guide/parse-headers.rst
-f:Documentation/translations/zh_CN/doc-guide/sphinx.rst
-f:Documentation/translations/zh_CN/driver-api/gpio/index.rst
-f:Documentation/translations/zh_CN/driver-api/index.rst
-f:Documentation/translations/zh_CN/driver-api/io_ordering.rst
-f:Documentation/translations/zh_CN/driver-api/phy/index.rst
-f:Documentation/translations/zh_CN/driver-api/phy/phy.rst
-f:Documentation/translations/zh_CN/filesystems/debugfs.rst
-f:Documentation/translations/zh_CN/filesystems/index.rst
-f:Documentation/translations/zh_CN/filesystems/sysfs.txt
-f:Documentation/translations/zh_CN/filesystems/tmpfs.rst
-f:Documentation/translations/zh_CN/filesystems/virtiofs.rst
-f:Documentation/translations/zh_CN/glossary.rst
-f:Documentation/translations/zh_CN/how-to.rst
-f:Documentation/translations/zh_CN/iio/ep93xx_adc.rst
-f:Documentation/translations/zh_CN/iio/iio_configfs.rst
-f:Documentation/translations/zh_CN/iio/index.rst
-f:Documentation/translations/zh_CN/index.rst
-f:Documentation/translations/zh_CN/infiniband/core_locking.rst
-f:Documentation/translations/zh_CN/infiniband/index.rst
-f:Documentation/translations/zh_CN/infiniband/ipoib.rst
-f:Documentation/translations/zh_CN/infiniband/opa_vnic.rst
-f:Documentation/translations/zh_CN/infiniband/sysfs.rst
-f:Documentation/translations/zh_CN/infiniband/tag_matching.rst
-f:Documentation/translations/zh_CN/infiniband/user_mad.rst
-f:Documentation/translations/zh_CN/infiniband/user_verbs.rst
-f:Documentation/translations/zh_CN/kbuild/gcc-plugins.rst
-f:Documentation/translations/zh_CN/kbuild/headers_install.rst
-f:Documentation/translations/zh_CN/kbuild/index.rst
-f:Documentation/translations/zh_CN/kbuild/kbuild.rst
-f:Documentation/translations/zh_CN/kbuild/kconfig.rst
-f:Documentation/translations/zh_CN/kbuild/llvm.rst
-f:Documentation/translations/zh_CN/kbuild/reproducible-builds.rst
-f:Documentation/translations/zh_CN/kernel-hacking/hacking.rst
-f:Documentation/translations/zh_CN/kernel-hacking/index.rst
-f:Documentation/translations/zh_CN/locking/index.rst
-f:Documentation/translations/zh_CN/locking/mutex-design.rst
-f:Documentation/translations/zh_CN/locking/spinlocks.rst
-f:Documentation/translations/zh_CN/maintainer/configure-git.rst
-f:Documentation/translations/zh_CN/maintainer/index.rst
-f:Documentation/translations/zh_CN/maintainer/maintainer-entry-profile.rst
-f:Documentation/translations/zh_CN/maintainer/modifying-patches.rst
-f:Documentation/translations/zh_CN/maintainer/pull-requests.rst
-f:Documentation/translations/zh_CN/maintainer/rebasing-and-merging.rst
-f:Documentation/translations/zh_CN/mm/active_mm.rst
-f:Documentation/translations/zh_CN/mm/balance.rst
-f:Documentation/translations/zh_CN/mm/damon/api.rst
-f:Documentation/translations/zh_CN/mm/damon/design.rst
-f:Documentation/translations/zh_CN/mm/damon/faq.rst
-f:Documentation/translations/zh_CN/mm/damon/index.rst
-f:Documentation/translations/zh_CN/mm/free_page_reporting.rst
-f:Documentation/translations/zh_CN/mm/highmem.rst
-f:Documentation/translations/zh_CN/mm/hmm.rst
-f:Documentation/translations/zh_CN/mm/hugetlbfs_reserv.rst
-f:Documentation/translations/zh_CN/mm/hwpoison.rst
-f:Documentation/translations/zh_CN/mm/index.rst
-f:Documentation/translations/zh_CN/mm/ksm.rst
-f:Documentation/translations/zh_CN/mm/memory-model.rst
-f:Documentation/translations/zh_CN/mm/mmu_notifier.rst
-f:Documentation/translations/zh_CN/mm/numa.rst
-f:Documentation/translations/zh_CN/mm/overcommit-accounting.rst
-f:Documentation/translations/zh_CN/mm/page_frags.rst
-f:Documentation/translations/zh_CN/mm/page_migration.rst
-f:Documentation/translations/zh_CN/mm/page_owner.rst
-f:Documentation/translations/zh_CN/mm/page_table_check.rst
-f:Documentation/translations/zh_CN/mm/page_tables.rst
-f:Documentation/translations/zh_CN/mm/physical_memory.rst
-f:Documentation/translations/zh_CN/mm/remap_file_pages.rst
-f:Documentation/translations/zh_CN/mm/split_page_table_lock.rst
-f:Documentation/translations/zh_CN/mm/vmalloced-kernel-stacks.rst
-f:Documentation/translations/zh_CN/mm/zsmalloc.rst
-f:Documentation/translations/zh_CN/networking/alias.rst
-f:Documentation/translations/zh_CN/networking/index.rst
-f:Documentation/translations/zh_CN/networking/msg_zerocopy.rst
-f:Documentation/translations/zh_CN/networking/napi.rst
-f:Documentation/translations/zh_CN/networking/netif-msg.rst
-f:Documentation/translations/zh_CN/networking/netmem.rst
-f:Documentation/translations/zh_CN/networking/vxlan.rst
-f:Documentation/translations/zh_CN/networking/xfrm_proc.rst
-f:Documentation/translations/zh_CN/peci/index.rst
-f:Documentation/translations/zh_CN/peci/peci.rst
-f:Documentation/translations/zh_CN/power/energy-model.rst
-f:Documentation/translations/zh_CN/power/index.rst
-f:Documentation/translations/zh_CN/power/opp.rst
-f:Documentation/translations/zh_CN/process/1.Intro.rst
-f:Documentation/translations/zh_CN/process/2.Process.rst
-f:Documentation/translations/zh_CN/process/3.Early-stage.rst
-f:Documentation/translations/zh_CN/process/4.Coding.rst
-f:Documentation/translations/zh_CN/process/5.Posting.rst
-f:Documentation/translations/zh_CN/process/6.Followthrough.rst
-f:Documentation/translations/zh_CN/process/7.AdvancedTopics.rst
-f:Documentation/translations/zh_CN/process/8.Conclusion.rst
-f:Documentation/translations/zh_CN/process/code-of-conduct-interpretation.rst
-f:Documentation/translations/zh_CN/process/code-of-conduct.rst
-f:Documentation/translations/zh_CN/process/coding-style.rst
-f:Documentation/translations/zh_CN/process/cve.rst
-f:Documentation/translations/zh_CN/process/development-process.rst
-f:Documentation/translations/zh_CN/process/email-clients.rst
-f:Documentation/translations/zh_CN/process/embargoed-hardware-issues.rst
-f:Documentation/translations/zh_CN/process/howto.rst
-f:Documentation/translations/zh_CN/process/index.rst
-f:Documentation/translations/zh_CN/process/kernel-driver-statement.rst
-f:Documentation/translations/zh_CN/process/kernel-enforcement-statement.rst
-f:Documentation/translations/zh_CN/process/license-rules.rst
-f:Documentation/translations/zh_CN/process/magic-number.rst
-f:Documentation/translations/zh_CN/process/maintainer-pgp-guide.rst
-f:Documentation/translations/zh_CN/process/management-style.rst
-f:Documentation/translations/zh_CN/process/programming-language.rst
-f:Documentation/translations/zh_CN/process/researcher-guidelines.rst
-f:Documentation/translations/zh_CN/process/security-bugs.rst
-f:Documentation/translations/zh_CN/process/stable-api-nonsense.rst
-f:Documentation/translations/zh_CN/process/stable-kernel-rules.rst
-f:Documentation/translations/zh_CN/process/submit-checklist.rst
-f:Documentation/translations/zh_CN/process/submitting-patches.rst
-f:Documentation/translations/zh_CN/process/volatile-considered-harmful.rst
-f:Documentation/translations/zh_CN/rust/arch-support.rst
-f:Documentation/translations/zh_CN/rust/coding-guidelines.rst
-f:Documentation/translations/zh_CN/rust/general-information.rst
-f:Documentation/translations/zh_CN/rust/index.rst
-f:Documentation/translations/zh_CN/rust/quick-start.rst
-f:Documentation/translations/zh_CN/scheduler/completion.rst
-f:Documentation/translations/zh_CN/scheduler/index.rst
-f:Documentation/translations/zh_CN/scheduler/sched-arch.rst
-f:Documentation/translations/zh_CN/scheduler/sched-bwc.rst
-f:Documentation/translations/zh_CN/scheduler/sched-capacity.rst
-f:Documentation/translations/zh_CN/scheduler/sched-debug.rst
-f:Documentation/translations/zh_CN/scheduler/sched-design-CFS.rst
-f:Documentation/translations/zh_CN/scheduler/sched-domains.rst
-f:Documentation/translations/zh_CN/scheduler/sched-energy.rst
-f:Documentation/translations/zh_CN/scheduler/sched-nice-design.rst
-f:Documentation/translations/zh_CN/scheduler/sched-stats.rst
-f:Documentation/translations/zh_CN/scheduler/schedutil.rst
-f:Documentation/translations/zh_CN/security/IMA-templates.rst
-f:Documentation/translations/zh_CN/security/credentials.rst
-f:Documentation/translations/zh_CN/security/digsig.rst
-f:Documentation/translations/zh_CN/security/index.rst
-f:Documentation/translations/zh_CN/security/keys/index.rst
-f:Documentation/translations/zh_CN/security/landlock.rst
-f:Documentation/translations/zh_CN/security/lsm.rst
-f:Documentation/translations/zh_CN/security/sak.rst
-f:Documentation/translations/zh_CN/security/secrets/index.rst
-f:Documentation/translations/zh_CN/security/self-protection.rst
-f:Documentation/translations/zh_CN/security/siphash.rst
-f:Documentation/translations/zh_CN/security/snp-tdx-threat-model.rst
-f:Documentation/translations/zh_CN/security/tpm/index.rst
-f:Documentation/translations/zh_CN/security/tpm/tpm-security.rst
-f:Documentation/translations/zh_CN/security/tpm/tpm_event_log.rst
-f:Documentation/translations/zh_CN/security/tpm/tpm_ftpm_tee.rst
-f:Documentation/translations/zh_CN/security/tpm/tpm_tis.rst
-f:Documentation/translations/zh_CN/security/tpm/tpm_vtpm_proxy.rst
-f:Documentation/translations/zh_CN/security/tpm/xen-tpmfront.rst
-f:Documentation/translations/zh_CN/sound/hd-audio/controls.rst
-f:Documentation/translations/zh_CN/sound/hd-audio/index.rst
-f:Documentation/translations/zh_CN/sound/index.rst
-f:Documentation/translations/zh_CN/staging/index.rst
-f:Documentation/translations/zh_CN/staging/speculation.rst
-f:Documentation/translations/zh_CN/staging/xz.rst
-f:Documentation/translations/zh_CN/subsystem-apis.rst
-f:Documentation/translations/zh_CN/userspace-api/accelerators/ocxl.rst
-f:Documentation/translations/zh_CN/userspace-api/ebpf/index.rst
-f:Documentation/translations/zh_CN/userspace-api/ebpf/syscall.rst
-f:Documentation/translations/zh_CN/userspace-api/futex2.rst
-f:Documentation/translations/zh_CN/userspace-api/index.rst
-f:Documentation/translations/zh_CN/userspace-api/no_new_privs.rst
-f:Documentation/translations/zh_CN/userspace-api/seccomp_filter.rst
-f:Documentation/translations/zh_CN/userspace-api/sysfs-platform_profile.rst
-f:Documentation/translations/zh_CN/video4linux/omap3isp.txt
-f:Documentation/translations/zh_CN/video4linux/v4l2-framework.txt
-f:Documentation/translations/zh_CN/virt/acrn/cpuid.rst
-f:Documentation/translations/zh_CN/virt/acrn/index.rst
-f:Documentation/translations/zh_CN/virt/acrn/introduction.rst
-f:Documentation/translations/zh_CN/virt/acrn/io-request.rst
-f:Documentation/translations/zh_CN/virt/guest-halt-polling.rst
-f:Documentation/translations/zh_CN/virt/index.rst
-f:Documentation/translations/zh_CN/virt/ne_overview.rst
-f:Documentation/translations/zh_CN/virt/paravirt_ops.rst
-f:Documentation/translations/zh_TW/IRQ.txt
-f:Documentation/translations/zh_TW/admin-guide/README.rst
-f:Documentation/translations/zh_TW/admin-guide/bootconfig.rst
-f:Documentation/translations/zh_TW/admin-guide/bug-bisect.rst
-f:Documentation/translations/zh_TW/admin-guide/bug-hunting.rst
-f:Documentation/translations/zh_TW/admin-guide/clearing-warn-once.rst
-f:Documentation/translations/zh_TW/admin-guide/cpu-load.rst
-f:Documentation/translations/zh_TW/admin-guide/cputopology.rst
-f:Documentation/translations/zh_TW/admin-guide/index.rst
-f:Documentation/translations/zh_TW/admin-guide/init.rst
-f:Documentation/translations/zh_TW/admin-guide/lockup-watchdogs.rst
-f:Documentation/translations/zh_TW/admin-guide/mm/damon/index.rst
-f:Documentation/translations/zh_TW/admin-guide/mm/damon/lru_sort.rst
-f:Documentation/translations/zh_TW/admin-guide/mm/damon/reclaim.rst
-f:Documentation/translations/zh_TW/admin-guide/mm/damon/start.rst
-f:Documentation/translations/zh_TW/admin-guide/mm/damon/usage.rst
-f:Documentation/translations/zh_TW/admin-guide/mm/index.rst
-f:Documentation/translations/zh_TW/admin-guide/mm/ksm.rst
-f:Documentation/translations/zh_TW/admin-guide/reporting-issues.rst
-f:Documentation/translations/zh_TW/admin-guide/reporting-regressions.rst
-f:Documentation/translations/zh_TW/admin-guide/security-bugs.rst
-f:Documentation/translations/zh_TW/admin-guide/sysrq.rst
-f:Documentation/translations/zh_TW/admin-guide/tainted-kernels.rst
-f:Documentation/translations/zh_TW/admin-guide/unicode.rst
-f:Documentation/translations/zh_TW/arch/arm/Booting
-f:Documentation/translations/zh_TW/arch/arm/kernel_user_helpers.txt
-f:Documentation/translations/zh_TW/arch/arm64/amu.rst
-f:Documentation/translations/zh_TW/arch/arm64/booting.txt
-f:Documentation/translations/zh_TW/arch/arm64/elf_hwcaps.rst
-f:Documentation/translations/zh_TW/arch/arm64/hugetlbpage.rst
-f:Documentation/translations/zh_TW/arch/arm64/index.rst
-f:Documentation/translations/zh_TW/arch/arm64/legacy_instructions.txt
-f:Documentation/translations/zh_TW/arch/arm64/memory.txt
-f:Documentation/translations/zh_TW/arch/arm64/perf.rst
-f:Documentation/translations/zh_TW/arch/arm64/silicon-errata.txt
-f:Documentation/translations/zh_TW/arch/arm64/tagged-pointers.txt
-f:Documentation/translations/zh_TW/arch/index.rst
-f:Documentation/translations/zh_TW/arch/loongarch/booting.rst
-f:Documentation/translations/zh_TW/arch/loongarch/features.rst
-f:Documentation/translations/zh_TW/arch/loongarch/index.rst
-f:Documentation/translations/zh_TW/arch/loongarch/introduction.rst
-f:Documentation/translations/zh_TW/arch/loongarch/irq-chip-model.rst
-f:Documentation/translations/zh_TW/arch/mips/booting.rst
-f:Documentation/translations/zh_TW/arch/mips/features.rst
-f:Documentation/translations/zh_TW/arch/mips/index.rst
-f:Documentation/translations/zh_TW/arch/mips/ingenic-tcu.rst
-f:Documentation/translations/zh_TW/arch/openrisc/index.rst
-f:Documentation/translations/zh_TW/arch/openrisc/openrisc_port.rst
-f:Documentation/translations/zh_TW/arch/openrisc/todo.rst
-f:Documentation/translations/zh_TW/arch/parisc/debugging.rst
-f:Documentation/translations/zh_TW/arch/parisc/index.rst
-f:Documentation/translations/zh_TW/arch/parisc/registers.rst
-f:Documentation/translations/zh_TW/cpu-freq/core.rst
-f:Documentation/translations/zh_TW/cpu-freq/cpu-drivers.rst
-f:Documentation/translations/zh_TW/cpu-freq/cpufreq-stats.rst
-f:Documentation/translations/zh_TW/cpu-freq/index.rst
-f:Documentation/translations/zh_TW/dev-tools/gcov.rst
-f:Documentation/translations/zh_TW/dev-tools/gdb-kernel-debugging.rst
-f:Documentation/translations/zh_TW/dev-tools/index.rst
-f:Documentation/translations/zh_TW/dev-tools/kasan.rst
-f:Documentation/translations/zh_TW/dev-tools/sparse.rst
-f:Documentation/translations/zh_TW/dev-tools/testing-overview.rst
-f:Documentation/translations/zh_TW/disclaimer-zh_TW.rst
-f:Documentation/translations/zh_TW/filesystems/debugfs.rst
-f:Documentation/translations/zh_TW/filesystems/index.rst
-f:Documentation/translations/zh_TW/filesystems/sysfs.txt
-f:Documentation/translations/zh_TW/filesystems/tmpfs.rst
-f:Documentation/translations/zh_TW/filesystems/virtiofs.rst
-f:Documentation/translations/zh_TW/index.rst
-f:Documentation/translations/zh_TW/io_ordering.txt
-f:Documentation/translations/zh_TW/process/1.Intro.rst
-f:Documentation/translations/zh_TW/process/2.Process.rst
-f:Documentation/translations/zh_TW/process/3.Early-stage.rst
-f:Documentation/translations/zh_TW/process/4.Coding.rst
-f:Documentation/translations/zh_TW/process/5.Posting.rst
-f:Documentation/translations/zh_TW/process/6.Followthrough.rst
-f:Documentation/translations/zh_TW/process/7.AdvancedTopics.rst
-f:Documentation/translations/zh_TW/process/8.Conclusion.rst
-f:Documentation/translations/zh_TW/process/code-of-conduct-interpretation.rst
-f:Documentation/translations/zh_TW/process/code-of-conduct.rst
-f:Documentation/translations/zh_TW/process/coding-style.rst
-f:Documentation/translations/zh_TW/process/development-process.rst
-f:Documentation/translations/zh_TW/process/email-clients.rst
-f:Documentation/translations/zh_TW/process/embargoed-hardware-issues.rst
-f:Documentation/translations/zh_TW/process/howto.rst
-f:Documentation/translations/zh_TW/process/index.rst
-f:Documentation/translations/zh_TW/process/kernel-driver-statement.rst
-f:Documentation/translations/zh_TW/process/kernel-enforcement-statement.rst
-f:Documentation/translations/zh_TW/process/license-rules.rst
-f:Documentation/translations/zh_TW/process/magic-number.rst
-f:Documentation/translations/zh_TW/process/management-style.rst
-f:Documentation/translations/zh_TW/process/programming-language.rst
-f:Documentation/translations/zh_TW/process/stable-api-nonsense.rst
-f:Documentation/translations/zh_TW/process/stable-kernel-rules.rst
-f:Documentation/translations/zh_TW/process/submit-checklist.rst
-f:Documentation/translations/zh_TW/process/submitting-patches.rst
-f:Documentation/translations/zh_TW/process/volatile-considered-harmful.rst
-f:Documentation/usb/CREDITS
-f:Documentation/usb/acm.rst
-f:Documentation/usb/authorization.rst
-f:Documentation/usb/chipidea.rst
-f:Documentation/usb/dwc3.rst
-f:Documentation/usb/ehci.rst
-f:Documentation/usb/functionfs-desc.rst
-f:Documentation/usb/functionfs.rst
-f:Documentation/usb/gadget-testing.rst
-f:Documentation/usb/gadget_configfs.rst
-f:Documentation/usb/gadget_hid.rst
-f:Documentation/usb/gadget_multi.rst
-f:Documentation/usb/gadget_printer.rst
-f:Documentation/usb/gadget_serial.rst
-f:Documentation/usb/gadget_uvc.rst
-f:Documentation/usb/index.rst
-f:Documentation/usb/iuu_phoenix.rst
-f:Documentation/usb/linux-cdc-acm.inf
-f:Documentation/usb/linux.inf
-f:Documentation/usb/mass-storage.rst
-f:Documentation/usb/misc_usbsevseg.rst
-f:Documentation/usb/mtouchusb.rst
-f:Documentation/usb/ohci.rst
-f:Documentation/usb/raw-gadget.rst
-f:Documentation/usb/text_files.rst
-f:Documentation/usb/usb-help.rst
-f:Documentation/usb/usb-serial.rst
-f:Documentation/usb/usbdevfs-drop-permissions.c
-f:Documentation/usb/usbip_protocol.rst
-f:Documentation/usb/usbmon.rst
-f:Documentation/userspace-api/ELF.rst
-f:Documentation/userspace-api/accelerators/ocxl.rst
-f:Documentation/userspace-api/check_exec.rst
-f:Documentation/userspace-api/dcdbas.rst
-f:Documentation/userspace-api/dma-buf-alloc-exchange.rst
-f:Documentation/userspace-api/dma-buf-heaps.rst
-f:Documentation/userspace-api/ebpf/index.rst
-f:Documentation/userspace-api/ebpf/syscall.rst
-f:Documentation/userspace-api/futex2.rst
-f:Documentation/userspace-api/fwctl/fwctl-cxl.rst
-f:Documentation/userspace-api/fwctl/fwctl.rst
-f:Documentation/userspace-api/fwctl/index.rst
-f:Documentation/userspace-api/fwctl/pds_fwctl.rst
-f:Documentation/userspace-api/gpio/chardev.rst
-f:Documentation/userspace-api/gpio/chardev_v1.rst
-f:Documentation/userspace-api/gpio/error-codes.rst
-f:Documentation/userspace-api/gpio/gpio-get-chipinfo-ioctl.rst
-f:Documentation/userspace-api/gpio/gpio-get-lineevent-ioctl.rst
-f:Documentation/userspace-api/gpio/gpio-get-linehandle-ioctl.rst
-f:Documentation/userspace-api/gpio/gpio-get-lineinfo-ioctl.rst
-f:Documentation/userspace-api/gpio/gpio-get-lineinfo-unwatch-ioctl.rst
-f:Documentation/userspace-api/gpio/gpio-get-lineinfo-watch-ioctl.rst
-f:Documentation/userspace-api/gpio/gpio-handle-get-line-values-ioctl.rst
-f:Documentation/userspace-api/gpio/gpio-handle-set-config-ioctl.rst
-f:Documentation/userspace-api/gpio/gpio-handle-set-line-values-ioctl.rst
-f:Documentation/userspace-api/gpio/gpio-lineevent-data-read.rst
-f:Documentation/userspace-api/gpio/gpio-lineinfo-changed-read.rst
-f:Documentation/userspace-api/gpio/gpio-v2-get-line-ioctl.rst
-f:Documentation/userspace-api/gpio/gpio-v2-get-lineinfo-ioctl.rst
-f:Documentation/userspace-api/gpio/gpio-v2-get-lineinfo-watch-ioctl.rst
-f:Documentation/userspace-api/gpio/gpio-v2-line-event-read.rst
-f:Documentation/userspace-api/gpio/gpio-v2-line-get-values-ioctl.rst
-f:Documentation/userspace-api/gpio/gpio-v2-line-set-config-ioctl.rst
-f:Documentation/userspace-api/gpio/gpio-v2-line-set-values-ioctl.rst
-f:Documentation/userspace-api/gpio/gpio-v2-lineinfo-changed-read.rst
-f:Documentation/userspace-api/gpio/index.rst
-f:Documentation/userspace-api/gpio/obsolete.rst
-f:Documentation/userspace-api/gpio/sysfs.rst
-f:Documentation/userspace-api/index.rst
-f:Documentation/userspace-api/ioctl/cdrom.rst
-f:Documentation/userspace-api/ioctl/hdio.rst
-f:Documentation/userspace-api/ioctl/index.rst
-f:Documentation/userspace-api/ioctl/ioctl-decoding.rst
-f:Documentation/userspace-api/ioctl/ioctl-number.rst
-f:Documentation/userspace-api/iommufd.rst
-f:Documentation/userspace-api/isapnp.rst
-f:Documentation/userspace-api/landlock.rst
-f:Documentation/userspace-api/lsm.rst
-f:Documentation/userspace-api/media/Makefile
-f:Documentation/userspace-api/media/ca.h.rst.exceptions
-f:Documentation/userspace-api/media/cec.h.rst.exceptions
-f:Documentation/userspace-api/media/cec/cec-api.rst
-f:Documentation/userspace-api/media/cec/cec-func-close.rst
-f:Documentation/userspace-api/media/cec/cec-func-ioctl.rst
-f:Documentation/userspace-api/media/cec/cec-func-open.rst
-f:Documentation/userspace-api/media/cec/cec-func-poll.rst
-f:Documentation/userspace-api/media/cec/cec-funcs.rst
-f:Documentation/userspace-api/media/cec/cec-header.rst
-f:Documentation/userspace-api/media/cec/cec-intro.rst
-f:Documentation/userspace-api/media/cec/cec-ioc-adap-g-caps.rst
-f:Documentation/userspace-api/media/cec/cec-ioc-adap-g-conn-info.rst
-f:Documentation/userspace-api/media/cec/cec-ioc-adap-g-log-addrs.rst
-f:Documentation/userspace-api/media/cec/cec-ioc-adap-g-phys-addr.rst
-f:Documentation/userspace-api/media/cec/cec-ioc-dqevent.rst
-f:Documentation/userspace-api/media/cec/cec-ioc-g-mode.rst
-f:Documentation/userspace-api/media/cec/cec-ioc-receive.rst
-f:Documentation/userspace-api/media/cec/cec-pin-error-inj.rst
-f:Documentation/userspace-api/media/conf_nitpick.py
-f:Documentation/userspace-api/media/dmx.h.rst.exceptions
-f:Documentation/userspace-api/media/drivers/aspeed-video.rst
-f:Documentation/userspace-api/media/drivers/camera-sensor.rst
-f:Documentation/userspace-api/media/drivers/ccs.rst
-f:Documentation/userspace-api/media/drivers/cx2341x-uapi.rst
-f:Documentation/userspace-api/media/drivers/dw100.rst
-f:Documentation/userspace-api/media/drivers/imx-uapi.rst
-f:Documentation/userspace-api/media/drivers/index.rst
-f:Documentation/userspace-api/media/drivers/max2175.rst
-f:Documentation/userspace-api/media/drivers/npcm-video.rst
-f:Documentation/userspace-api/media/drivers/omap3isp-uapi.rst
-f:Documentation/userspace-api/media/drivers/thp7312.rst
-f:Documentation/userspace-api/media/drivers/uvcvideo.rst
-f:Documentation/userspace-api/media/drivers/vgxy61.rst
-f:Documentation/userspace-api/media/dvb/ca-fclose.rst
-f:Documentation/userspace-api/media/dvb/ca-fopen.rst
-f:Documentation/userspace-api/media/dvb/ca-get-cap.rst
-f:Documentation/userspace-api/media/dvb/ca-get-descr-info.rst
-f:Documentation/userspace-api/media/dvb/ca-get-msg.rst
-f:Documentation/userspace-api/media/dvb/ca-get-slot-info.rst
-f:Documentation/userspace-api/media/dvb/ca-reset.rst
-f:Documentation/userspace-api/media/dvb/ca-send-msg.rst
-f:Documentation/userspace-api/media/dvb/ca-set-descr.rst
-f:Documentation/userspace-api/media/dvb/ca.rst
-f:Documentation/userspace-api/media/dvb/ca_data_types.rst
-f:Documentation/userspace-api/media/dvb/ca_function_calls.rst
-f:Documentation/userspace-api/media/dvb/ca_high_level.rst
-f:Documentation/userspace-api/media/dvb/demux.rst
-f:Documentation/userspace-api/media/dvb/dmx-add-pid.rst
-f:Documentation/userspace-api/media/dvb/dmx-expbuf.rst
-f:Documentation/userspace-api/media/dvb/dmx-fclose.rst
-f:Documentation/userspace-api/media/dvb/dmx-fopen.rst
-f:Documentation/userspace-api/media/dvb/dmx-fread.rst
-f:Documentation/userspace-api/media/dvb/dmx-fwrite.rst
-f:Documentation/userspace-api/media/dvb/dmx-get-pes-pids.rst
-f:Documentation/userspace-api/media/dvb/dmx-get-stc.rst
-f:Documentation/userspace-api/media/dvb/dmx-mmap.rst
-f:Documentation/userspace-api/media/dvb/dmx-munmap.rst
-f:Documentation/userspace-api/media/dvb/dmx-qbuf.rst
-f:Documentation/userspace-api/media/dvb/dmx-querybuf.rst
-f:Documentation/userspace-api/media/dvb/dmx-remove-pid.rst
-f:Documentation/userspace-api/media/dvb/dmx-reqbufs.rst
-f:Documentation/userspace-api/media/dvb/dmx-set-buffer-size.rst
-f:Documentation/userspace-api/media/dvb/dmx-set-filter.rst
-f:Documentation/userspace-api/media/dvb/dmx-set-pes-filter.rst
-f:Documentation/userspace-api/media/dvb/dmx-start.rst
-f:Documentation/userspace-api/media/dvb/dmx-stop.rst
-f:Documentation/userspace-api/media/dvb/dmx_fcalls.rst
-f:Documentation/userspace-api/media/dvb/dmx_types.rst
-f:Documentation/userspace-api/media/dvb/dvb-fe-read-status.rst
-f:Documentation/userspace-api/media/dvb/dvb-frontend-event.rst
-f:Documentation/userspace-api/media/dvb/dvb-frontend-parameters.rst
-f:Documentation/userspace-api/media/dvb/dvbapi.rst
-f:Documentation/userspace-api/media/dvb/dvbproperty.rst
-f:Documentation/userspace-api/media/dvb/dvbstb.svg
-f:Documentation/userspace-api/media/dvb/examples.rst
-f:Documentation/userspace-api/media/dvb/fe-bandwidth-t.rst
-f:Documentation/userspace-api/media/dvb/fe-diseqc-recv-slave-reply.rst
-f:Documentation/userspace-api/media/dvb/fe-diseqc-reset-overload.rst
-f:Documentation/userspace-api/media/dvb/fe-diseqc-send-burst.rst
-f:Documentation/userspace-api/media/dvb/fe-diseqc-send-master-cmd.rst
-f:Documentation/userspace-api/media/dvb/fe-dishnetwork-send-legacy-cmd.rst
-f:Documentation/userspace-api/media/dvb/fe-enable-high-lnb-voltage.rst
-f:Documentation/userspace-api/media/dvb/fe-get-event.rst
-f:Documentation/userspace-api/media/dvb/fe-get-frontend.rst
-f:Documentation/userspace-api/media/dvb/fe-get-info.rst
-f:Documentation/userspace-api/media/dvb/fe-get-property.rst
-f:Documentation/userspace-api/media/dvb/fe-read-ber.rst
-f:Documentation/userspace-api/media/dvb/fe-read-signal-strength.rst
-f:Documentation/userspace-api/media/dvb/fe-read-snr.rst
-f:Documentation/userspace-api/media/dvb/fe-read-status.rst
-f:Documentation/userspace-api/media/dvb/fe-read-uncorrected-blocks.rst
-f:Documentation/userspace-api/media/dvb/fe-set-frontend-tune-mode.rst
-f:Documentation/userspace-api/media/dvb/fe-set-frontend.rst
-f:Documentation/userspace-api/media/dvb/fe-set-tone.rst
-f:Documentation/userspace-api/media/dvb/fe-set-voltage.rst
-f:Documentation/userspace-api/media/dvb/fe-type-t.rst
-f:Documentation/userspace-api/media/dvb/fe_property_parameters.rst
-f:Documentation/userspace-api/media/dvb/frontend-header.rst
-f:Documentation/userspace-api/media/dvb/frontend-property-cable-systems.rst
-f:Documentation/userspace-api/media/dvb/frontend-property-satellite-systems.rst
-f:Documentation/userspace-api/media/dvb/frontend-property-terrestrial-systems.rst
-f:Documentation/userspace-api/media/dvb/frontend-stat-properties.rst
-f:Documentation/userspace-api/media/dvb/frontend.rst
-f:Documentation/userspace-api/media/dvb/frontend_f_close.rst
-f:Documentation/userspace-api/media/dvb/frontend_f_open.rst
-f:Documentation/userspace-api/media/dvb/frontend_fcalls.rst
-f:Documentation/userspace-api/media/dvb/frontend_legacy_api.rst
-f:Documentation/userspace-api/media/dvb/frontend_legacy_dvbv3_api.rst
-f:Documentation/userspace-api/media/dvb/headers.rst
-f:Documentation/userspace-api/media/dvb/intro.rst
-f:Documentation/userspace-api/media/dvb/legacy_dvb_apis.rst
-f:Documentation/userspace-api/media/dvb/legacy_dvb_audio.rst
-f:Documentation/userspace-api/media/dvb/legacy_dvb_decoder_api.rst
-f:Documentation/userspace-api/media/dvb/legacy_dvb_osd.rst
-f:Documentation/userspace-api/media/dvb/legacy_dvb_video.rst
-f:Documentation/userspace-api/media/dvb/net-add-if.rst
-f:Documentation/userspace-api/media/dvb/net-get-if.rst
-f:Documentation/userspace-api/media/dvb/net-remove-if.rst
-f:Documentation/userspace-api/media/dvb/net-types.rst
-f:Documentation/userspace-api/media/dvb/net.rst
-f:Documentation/userspace-api/media/dvb/query-dvb-frontend-info.rst
-f:Documentation/userspace-api/media/fdl-appendix.rst
-f:Documentation/userspace-api/media/frontend.h.rst.exceptions
-f:Documentation/userspace-api/media/gen-errors.rst
-f:Documentation/userspace-api/media/glossary.rst
-f:Documentation/userspace-api/media/index.rst
-f:Documentation/userspace-api/media/intro.rst
-f:Documentation/userspace-api/media/lirc.h.rst.exceptions
-f:Documentation/userspace-api/media/media.h.rst.exceptions
-f:Documentation/userspace-api/media/mediactl/media-controller-intro.rst
-f:Documentation/userspace-api/media/mediactl/media-controller-model.rst
-f:Documentation/userspace-api/media/mediactl/media-controller.rst
-f:Documentation/userspace-api/media/mediactl/media-func-close.rst
-f:Documentation/userspace-api/media/mediactl/media-func-ioctl.rst
-f:Documentation/userspace-api/media/mediactl/media-func-open.rst
-f:Documentation/userspace-api/media/mediactl/media-funcs.rst
-f:Documentation/userspace-api/media/mediactl/media-header.rst
-f:Documentation/userspace-api/media/mediactl/media-ioc-device-info.rst
-f:Documentation/userspace-api/media/mediactl/media-ioc-enum-entities.rst
-f:Documentation/userspace-api/media/mediactl/media-ioc-enum-links.rst
-f:Documentation/userspace-api/media/mediactl/media-ioc-g-topology.rst
-f:Documentation/userspace-api/media/mediactl/media-ioc-request-alloc.rst
-f:Documentation/userspace-api/media/mediactl/media-ioc-setup-link.rst
-f:Documentation/userspace-api/media/mediactl/media-request-ioc-queue.rst
-f:Documentation/userspace-api/media/mediactl/media-request-ioc-reinit.rst
-f:Documentation/userspace-api/media/mediactl/media-types.rst
-f:Documentation/userspace-api/media/mediactl/request-api.rst
-f:Documentation/userspace-api/media/mediactl/request-func-close.rst
-f:Documentation/userspace-api/media/mediactl/request-func-ioctl.rst
-f:Documentation/userspace-api/media/mediactl/request-func-poll.rst
-f:Documentation/userspace-api/media/net.h.rst.exceptions
-f:Documentation/userspace-api/media/rc/keytable.c.rst
-f:Documentation/userspace-api/media/rc/lirc-dev-intro.rst
-f:Documentation/userspace-api/media/rc/lirc-dev.rst
-f:Documentation/userspace-api/media/rc/lirc-func.rst
-f:Documentation/userspace-api/media/rc/lirc-get-features.rst
-f:Documentation/userspace-api/media/rc/lirc-get-rec-mode.rst
-f:Documentation/userspace-api/media/rc/lirc-get-rec-resolution.rst
-f:Documentation/userspace-api/media/rc/lirc-get-send-mode.rst
-f:Documentation/userspace-api/media/rc/lirc-get-timeout.rst
-f:Documentation/userspace-api/media/rc/lirc-header.rst
-f:Documentation/userspace-api/media/rc/lirc-read.rst
-f:Documentation/userspace-api/media/rc/lirc-set-measure-carrier-mode.rst
-f:Documentation/userspace-api/media/rc/lirc-set-rec-carrier-range.rst
-f:Documentation/userspace-api/media/rc/lirc-set-rec-carrier.rst
-f:Documentation/userspace-api/media/rc/lirc-set-rec-timeout.rst
-f:Documentation/userspace-api/media/rc/lirc-set-send-carrier.rst
-f:Documentation/userspace-api/media/rc/lirc-set-send-duty-cycle.rst
-f:Documentation/userspace-api/media/rc/lirc-set-transmitter-mask.rst
-f:Documentation/userspace-api/media/rc/lirc-set-wideband-receiver.rst
-f:Documentation/userspace-api/media/rc/lirc-write.rst
-f:Documentation/userspace-api/media/rc/rc-intro.rst
-f:Documentation/userspace-api/media/rc/rc-protos.rst
-f:Documentation/userspace-api/media/rc/rc-sysfs-nodes.rst
-f:Documentation/userspace-api/media/rc/rc-table-change.rst
-f:Documentation/userspace-api/media/rc/rc-tables.rst
-f:Documentation/userspace-api/media/rc/remote_controllers.rst
-f:Documentation/userspace-api/media/typical_media_device.svg
-f:Documentation/userspace-api/media/v4l/app-pri.rst
-f:Documentation/userspace-api/media/v4l/audio.rst
-f:Documentation/userspace-api/media/v4l/bayer.svg
-f:Documentation/userspace-api/media/v4l/biblio.rst
-f:Documentation/userspace-api/media/v4l/buffer.rst
-f:Documentation/userspace-api/media/v4l/capture-example.rst
-f:Documentation/userspace-api/media/v4l/capture.c.rst
-f:Documentation/userspace-api/media/v4l/colorspaces-defs.rst
-f:Documentation/userspace-api/media/v4l/colorspaces-details.rst
-f:Documentation/userspace-api/media/v4l/colorspaces.rst
-f:Documentation/userspace-api/media/v4l/common-defs.rst
-f:Documentation/userspace-api/media/v4l/common.rst
-f:Documentation/userspace-api/media/v4l/compat.rst
-f:Documentation/userspace-api/media/v4l/constraints.svg
-f:Documentation/userspace-api/media/v4l/control.rst
-f:Documentation/userspace-api/media/v4l/crop.rst
-f:Documentation/userspace-api/media/v4l/crop.svg
-f:Documentation/userspace-api/media/v4l/depth-formats.rst
-f:Documentation/userspace-api/media/v4l/dev-capture.rst
-f:Documentation/userspace-api/media/v4l/dev-decoder.rst
-f:Documentation/userspace-api/media/v4l/dev-encoder.rst
-f:Documentation/userspace-api/media/v4l/dev-event.rst
-f:Documentation/userspace-api/media/v4l/dev-mem2mem.rst
-f:Documentation/userspace-api/media/v4l/dev-meta.rst
-f:Documentation/userspace-api/media/v4l/dev-osd.rst
-f:Documentation/userspace-api/media/v4l/dev-output.rst
-f:Documentation/userspace-api/media/v4l/dev-overlay.rst
-f:Documentation/userspace-api/media/v4l/dev-radio.rst
-f:Documentation/userspace-api/media/v4l/dev-raw-vbi.rst
-f:Documentation/userspace-api/media/v4l/dev-rds.rst
-f:Documentation/userspace-api/media/v4l/dev-sdr.rst
-f:Documentation/userspace-api/media/v4l/dev-sliced-vbi.rst
-f:Documentation/userspace-api/media/v4l/dev-stateless-decoder.rst
-f:Documentation/userspace-api/media/v4l/dev-subdev.rst
-f:Documentation/userspace-api/media/v4l/dev-touch.rst
-f:Documentation/userspace-api/media/v4l/devices.rst
-f:Documentation/userspace-api/media/v4l/diff-v4l.rst
-f:Documentation/userspace-api/media/v4l/dmabuf.rst
-f:Documentation/userspace-api/media/v4l/dv-timings.rst
-f:Documentation/userspace-api/media/v4l/ext-ctrls-camera.rst
-f:Documentation/userspace-api/media/v4l/ext-ctrls-codec-stateless.rst
-f:Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst
-f:Documentation/userspace-api/media/v4l/ext-ctrls-colorimetry.rst
-f:Documentation/userspace-api/media/v4l/ext-ctrls-detect.rst
-f:Documentation/userspace-api/media/v4l/ext-ctrls-dv.rst
-f:Documentation/userspace-api/media/v4l/ext-ctrls-flash.rst
-f:Documentation/userspace-api/media/v4l/ext-ctrls-fm-rx.rst
-f:Documentation/userspace-api/media/v4l/ext-ctrls-fm-tx.rst
-f:Documentation/userspace-api/media/v4l/ext-ctrls-image-process.rst
-f:Documentation/userspace-api/media/v4l/ext-ctrls-image-source.rst
-f:Documentation/userspace-api/media/v4l/ext-ctrls-jpeg.rst
-f:Documentation/userspace-api/media/v4l/ext-ctrls-rf-tuner.rst
-f:Documentation/userspace-api/media/v4l/extended-controls.rst
-f:Documentation/userspace-api/media/v4l/field-order.rst
-f:Documentation/userspace-api/media/v4l/fieldseq_bt.svg
-f:Documentation/userspace-api/media/v4l/fieldseq_tb.svg
-f:Documentation/userspace-api/media/v4l/format.rst
-f:Documentation/userspace-api/media/v4l/fourcc.rst
-f:Documentation/userspace-api/media/v4l/func-close.rst
-f:Documentation/userspace-api/media/v4l/func-ioctl.rst
-f:Documentation/userspace-api/media/v4l/func-mmap.rst
-f:Documentation/userspace-api/media/v4l/func-munmap.rst
-f:Documentation/userspace-api/media/v4l/func-open.rst
-f:Documentation/userspace-api/media/v4l/func-poll.rst
-f:Documentation/userspace-api/media/v4l/func-read.rst
-f:Documentation/userspace-api/media/v4l/func-select.rst
-f:Documentation/userspace-api/media/v4l/func-write.rst
-f:Documentation/userspace-api/media/v4l/hist-v4l2.rst
-f:Documentation/userspace-api/media/v4l/hsv-formats.rst
-f:Documentation/userspace-api/media/v4l/io.rst
-f:Documentation/userspace-api/media/v4l/libv4l-introduction.rst
-f:Documentation/userspace-api/media/v4l/libv4l.rst
-f:Documentation/userspace-api/media/v4l/meta-formats.rst
-f:Documentation/userspace-api/media/v4l/metafmt-c3-isp.rst
-f:Documentation/userspace-api/media/v4l/metafmt-d4xx.rst
-f:Documentation/userspace-api/media/v4l/metafmt-generic.rst
-f:Documentation/userspace-api/media/v4l/metafmt-intel-ipu3.rst
-f:Documentation/userspace-api/media/v4l/metafmt-pisp-be.rst
-f:Documentation/userspace-api/media/v4l/metafmt-pisp-fe.rst
-f:Documentation/userspace-api/media/v4l/metafmt-rkisp1.rst
-f:Documentation/userspace-api/media/v4l/metafmt-uvc-msxu-1-5.rst
-f:Documentation/userspace-api/media/v4l/metafmt-uvc.rst
-f:Documentation/userspace-api/media/v4l/metafmt-vivid.rst
-f:Documentation/userspace-api/media/v4l/metafmt-vsp1-hgo.rst
-f:Documentation/userspace-api/media/v4l/metafmt-vsp1-hgt.rst
-f:Documentation/userspace-api/media/v4l/mmap.rst
-f:Documentation/userspace-api/media/v4l/mt2110t.svg
-f:Documentation/userspace-api/media/v4l/nv12mt.svg
-f:Documentation/userspace-api/media/v4l/nv12mt_example.svg
-f:Documentation/userspace-api/media/v4l/open.rst
-f:Documentation/userspace-api/media/v4l/pipeline.dot
-f:Documentation/userspace-api/media/v4l/pixfmt-bayer.rst
-f:Documentation/userspace-api/media/v4l/pixfmt-cnf4.rst
-f:Documentation/userspace-api/media/v4l/pixfmt-compressed.rst
-f:Documentation/userspace-api/media/v4l/pixfmt-indexed.rst
-f:Documentation/userspace-api/media/v4l/pixfmt-intro.rst
-f:Documentation/userspace-api/media/v4l/pixfmt-inzi.rst
-f:Documentation/userspace-api/media/v4l/pixfmt-m420.rst
-f:Documentation/userspace-api/media/v4l/pixfmt-packed-hsv.rst
-f:Documentation/userspace-api/media/v4l/pixfmt-packed-yuv.rst
-f:Documentation/userspace-api/media/v4l/pixfmt-rawnn-cru.rst
-f:Documentation/userspace-api/media/v4l/pixfmt-reserved.rst
-f:Documentation/userspace-api/media/v4l/pixfmt-rgb.rst
-f:Documentation/userspace-api/media/v4l/pixfmt-sdr-cs08.rst
-f:Documentation/userspace-api/media/v4l/pixfmt-sdr-cs14le.rst
-f:Documentation/userspace-api/media/v4l/pixfmt-sdr-cu08.rst
-f:Documentation/userspace-api/media/v4l/pixfmt-sdr-cu16le.rst
-f:Documentation/userspace-api/media/v4l/pixfmt-sdr-pcu16be.rst
-f:Documentation/userspace-api/media/v4l/pixfmt-sdr-pcu18be.rst
-f:Documentation/userspace-api/media/v4l/pixfmt-sdr-pcu20be.rst
-f:Documentation/userspace-api/media/v4l/pixfmt-sdr-ru12le.rst
-f:Documentation/userspace-api/media/v4l/pixfmt-srggb10-ipu3.rst
-f:Documentation/userspace-api/media/v4l/pixfmt-srggb10.rst
-f:Documentation/userspace-api/media/v4l/pixfmt-srggb10alaw8.rst
-f:Documentation/userspace-api/media/v4l/pixfmt-srggb10dpcm8.rst
-f:Documentation/userspace-api/media/v4l/pixfmt-srggb10p.rst
-f:Documentation/userspace-api/media/v4l/pixfmt-srggb12.rst
-f:Documentation/userspace-api/media/v4l/pixfmt-srggb12p.rst
-f:Documentation/userspace-api/media/v4l/pixfmt-srggb14.rst
-f:Documentation/userspace-api/media/v4l/pixfmt-srggb14p.rst
-f:Documentation/userspace-api/media/v4l/pixfmt-srggb16.rst
-f:Documentation/userspace-api/media/v4l/pixfmt-srggb8-pisp-comp.rst
-f:Documentation/userspace-api/media/v4l/pixfmt-srggb8.rst
-f:Documentation/userspace-api/media/v4l/pixfmt-tch-td08.rst
-f:Documentation/userspace-api/media/v4l/pixfmt-tch-td16.rst
-f:Documentation/userspace-api/media/v4l/pixfmt-tch-tu08.rst
-f:Documentation/userspace-api/media/v4l/pixfmt-tch-tu16.rst
-f:Documentation/userspace-api/media/v4l/pixfmt-uv8.rst
-f:Documentation/userspace-api/media/v4l/pixfmt-v4l2-mplane.rst
-f:Documentation/userspace-api/media/v4l/pixfmt-v4l2.rst
-f:Documentation/userspace-api/media/v4l/pixfmt-y12i.rst
-f:Documentation/userspace-api/media/v4l/pixfmt-y16i.rst
-f:Documentation/userspace-api/media/v4l/pixfmt-y8i.rst
-f:Documentation/userspace-api/media/v4l/pixfmt-yuv-luma.rst
-f:Documentation/userspace-api/media/v4l/pixfmt-yuv-planar.rst
-f:Documentation/userspace-api/media/v4l/pixfmt-z16.rst
-f:Documentation/userspace-api/media/v4l/pixfmt.rst
-f:Documentation/userspace-api/media/v4l/planar-apis.rst
-f:Documentation/userspace-api/media/v4l/querycap.rst
-f:Documentation/userspace-api/media/v4l/rw.rst
-f:Documentation/userspace-api/media/v4l/sdr-formats.rst
-f:Documentation/userspace-api/media/v4l/selection-api-configuration.rst
-f:Documentation/userspace-api/media/v4l/selection-api-examples.rst
-f:Documentation/userspace-api/media/v4l/selection-api-intro.rst
-f:Documentation/userspace-api/media/v4l/selection-api-targets.rst
-f:Documentation/userspace-api/media/v4l/selection-api-vs-crop-api.rst
-f:Documentation/userspace-api/media/v4l/selection-api.rst
-f:Documentation/userspace-api/media/v4l/selection.svg
-f:Documentation/userspace-api/media/v4l/selections-common.rst
-f:Documentation/userspace-api/media/v4l/standard.rst
-f:Documentation/userspace-api/media/v4l/streaming-par.rst
-f:Documentation/userspace-api/media/v4l/subdev-formats.rst
-f:Documentation/userspace-api/media/v4l/subdev-image-processing-crop.svg
-f:Documentation/userspace-api/media/v4l/subdev-image-processing-full.svg
-f:Documentation/userspace-api/media/v4l/subdev-image-processing-scaling-multi-source.svg
-f:Documentation/userspace-api/media/v4l/tch-formats.rst
-f:Documentation/userspace-api/media/v4l/tuner.rst
-f:Documentation/userspace-api/media/v4l/user-func.rst
-f:Documentation/userspace-api/media/v4l/userp.rst
-f:Documentation/userspace-api/media/v4l/v4l2-selection-flags.rst
-f:Documentation/userspace-api/media/v4l/v4l2-selection-targets.rst
-f:Documentation/userspace-api/media/v4l/v4l2.rst
-f:Documentation/userspace-api/media/v4l/v4l2grab-example.rst
-f:Documentation/userspace-api/media/v4l/v4l2grab.c.rst
-f:Documentation/userspace-api/media/v4l/vbi_525.svg
-f:Documentation/userspace-api/media/v4l/vbi_625.svg
-f:Documentation/userspace-api/media/v4l/vbi_hsync.svg
-f:Documentation/userspace-api/media/v4l/video.rst
-f:Documentation/userspace-api/media/v4l/videodev.rst
-f:Documentation/userspace-api/media/v4l/vidioc-create-bufs.rst
-f:Documentation/userspace-api/media/v4l/vidioc-cropcap.rst
-f:Documentation/userspace-api/media/v4l/vidioc-dbg-g-chip-info.rst
-f:Documentation/userspace-api/media/v4l/vidioc-dbg-g-register.rst
-f:Documentation/userspace-api/media/v4l/vidioc-decoder-cmd.rst
-f:Documentation/userspace-api/media/v4l/vidioc-dqevent.rst
-f:Documentation/userspace-api/media/v4l/vidioc-dv-timings-cap.rst
-f:Documentation/userspace-api/media/v4l/vidioc-encoder-cmd.rst
-f:Documentation/userspace-api/media/v4l/vidioc-enum-dv-timings.rst
-f:Documentation/userspace-api/media/v4l/vidioc-enum-fmt.rst
-f:Documentation/userspace-api/media/v4l/vidioc-enum-frameintervals.rst
-f:Documentation/userspace-api/media/v4l/vidioc-enum-framesizes.rst
-f:Documentation/userspace-api/media/v4l/vidioc-enum-freq-bands.rst
-f:Documentation/userspace-api/media/v4l/vidioc-enumaudio.rst
-f:Documentation/userspace-api/media/v4l/vidioc-enumaudioout.rst
-f:Documentation/userspace-api/media/v4l/vidioc-enuminput.rst
-f:Documentation/userspace-api/media/v4l/vidioc-enumoutput.rst
-f:Documentation/userspace-api/media/v4l/vidioc-enumstd.rst
-f:Documentation/userspace-api/media/v4l/vidioc-expbuf.rst
-f:Documentation/userspace-api/media/v4l/vidioc-g-audio.rst
-f:Documentation/userspace-api/media/v4l/vidioc-g-audioout.rst
-f:Documentation/userspace-api/media/v4l/vidioc-g-crop.rst
-f:Documentation/userspace-api/media/v4l/vidioc-g-ctrl.rst
-f:Documentation/userspace-api/media/v4l/vidioc-g-dv-timings.rst
-f:Documentation/userspace-api/media/v4l/vidioc-g-edid.rst
-f:Documentation/userspace-api/media/v4l/vidioc-g-enc-index.rst
-f:Documentation/userspace-api/media/v4l/vidioc-g-ext-ctrls.rst
-f:Documentation/userspace-api/media/v4l/vidioc-g-fbuf.rst
-f:Documentation/userspace-api/media/v4l/vidioc-g-fmt.rst
-f:Documentation/userspace-api/media/v4l/vidioc-g-frequency.rst
-f:Documentation/userspace-api/media/v4l/vidioc-g-input.rst
-f:Documentation/userspace-api/media/v4l/vidioc-g-jpegcomp.rst
-f:Documentation/userspace-api/media/v4l/vidioc-g-modulator.rst
-f:Documentation/userspace-api/media/v4l/vidioc-g-output.rst
-f:Documentation/userspace-api/media/v4l/vidioc-g-parm.rst
-f:Documentation/userspace-api/media/v4l/vidioc-g-priority.rst
-f:Documentation/userspace-api/media/v4l/vidioc-g-selection.rst
-f:Documentation/userspace-api/media/v4l/vidioc-g-sliced-vbi-cap.rst
-f:Documentation/userspace-api/media/v4l/vidioc-g-std.rst
-f:Documentation/userspace-api/media/v4l/vidioc-g-tuner.rst
-f:Documentation/userspace-api/media/v4l/vidioc-log-status.rst
-f:Documentation/userspace-api/media/v4l/vidioc-overlay.rst
-f:Documentation/userspace-api/media/v4l/vidioc-prepare-buf.rst
-f:Documentation/userspace-api/media/v4l/vidioc-qbuf.rst
-f:Documentation/userspace-api/media/v4l/vidioc-query-dv-timings.rst
-f:Documentation/userspace-api/media/v4l/vidioc-querybuf.rst
-f:Documentation/userspace-api/media/v4l/vidioc-querycap.rst
-f:Documentation/userspace-api/media/v4l/vidioc-queryctrl.rst
-f:Documentation/userspace-api/media/v4l/vidioc-querystd.rst
-f:Documentation/userspace-api/media/v4l/vidioc-remove-bufs.rst
-f:Documentation/userspace-api/media/v4l/vidioc-reqbufs.rst
-f:Documentation/userspace-api/media/v4l/vidioc-s-hw-freq-seek.rst
-f:Documentation/userspace-api/media/v4l/vidioc-streamon.rst
-f:Documentation/userspace-api/media/v4l/vidioc-subdev-enum-frame-interval.rst
-f:Documentation/userspace-api/media/v4l/vidioc-subdev-enum-frame-size.rst
-f:Documentation/userspace-api/media/v4l/vidioc-subdev-enum-mbus-code.rst
-f:Documentation/userspace-api/media/v4l/vidioc-subdev-g-client-cap.rst
-f:Documentation/userspace-api/media/v4l/vidioc-subdev-g-crop.rst
-f:Documentation/userspace-api/media/v4l/vidioc-subdev-g-fmt.rst
-f:Documentation/userspace-api/media/v4l/vidioc-subdev-g-frame-interval.rst
-f:Documentation/userspace-api/media/v4l/vidioc-subdev-g-routing.rst
-f:Documentation/userspace-api/media/v4l/vidioc-subdev-g-selection.rst
-f:Documentation/userspace-api/media/v4l/vidioc-subdev-querycap.rst
-f:Documentation/userspace-api/media/v4l/vidioc-subscribe-event.rst
-f:Documentation/userspace-api/media/v4l/yuv-formats.rst
-f:Documentation/userspace-api/media/videodev2.h.rst.exceptions
-f:Documentation/userspace-api/mfd_noexec.rst
-f:Documentation/userspace-api/mseal.rst
-f:Documentation/userspace-api/netlink/c-code-gen.rst
-f:Documentation/userspace-api/netlink/genetlink-legacy.rst
-f:Documentation/userspace-api/netlink/index.rst
-f:Documentation/userspace-api/netlink/intro-specs.rst
-f:Documentation/userspace-api/netlink/intro.rst
-f:Documentation/userspace-api/netlink/netlink-raw.rst
-f:Documentation/userspace-api/netlink/specs.rst
-f:Documentation/userspace-api/no_new_privs.rst
-f:Documentation/userspace-api/ntsync.rst
-f:Documentation/userspace-api/perf_ring_buffer.rst
-f:Documentation/userspace-api/seccomp_filter.rst
-f:Documentation/userspace-api/spec_ctrl.rst
-f:Documentation/userspace-api/sysfs-platform_profile.rst
-f:Documentation/userspace-api/tee.rst
-f:Documentation/userspace-api/unshare.rst
-f:Documentation/userspace-api/vduse.rst
-f:Documentation/virt/acrn/cpuid.rst
-f:Documentation/virt/acrn/index.rst
-f:Documentation/virt/acrn/introduction.rst
-f:Documentation/virt/acrn/io-request.rst
-f:Documentation/virt/coco/sev-guest.rst
-f:Documentation/virt/coco/tdx-guest.rst
-f:Documentation/virt/guest-halt-polling.rst
-f:Documentation/virt/hyperv/clocks.rst
-f:Documentation/virt/hyperv/coco.rst
-f:Documentation/virt/hyperv/hibernation.rst
-f:Documentation/virt/hyperv/index.rst
-f:Documentation/virt/hyperv/overview.rst
-f:Documentation/virt/hyperv/vmbus.rst
-f:Documentation/virt/hyperv/vpci.rst
-f:Documentation/virt/index.rst
-f:Documentation/virt/kvm/api.rst
-f:Documentation/virt/kvm/arm/fw-pseudo-registers.rst
-f:Documentation/virt/kvm/arm/hyp-abi.rst
-f:Documentation/virt/kvm/arm/hypercalls.rst
-f:Documentation/virt/kvm/arm/index.rst
-f:Documentation/virt/kvm/arm/ptp_kvm.rst
-f:Documentation/virt/kvm/arm/pvtime.rst
-f:Documentation/virt/kvm/arm/vcpu-features.rst
-f:Documentation/virt/kvm/devices/README
-f:Documentation/virt/kvm/devices/arm-vgic-its.rst
-f:Documentation/virt/kvm/devices/arm-vgic-v3.rst
-f:Documentation/virt/kvm/devices/arm-vgic.rst
-f:Documentation/virt/kvm/devices/index.rst
-f:Documentation/virt/kvm/devices/mpic.rst
-f:Documentation/virt/kvm/devices/s390_flic.rst
-f:Documentation/virt/kvm/devices/vcpu.rst
-f:Documentation/virt/kvm/devices/vfio.rst
-f:Documentation/virt/kvm/devices/vm.rst
-f:Documentation/virt/kvm/devices/xics.rst
-f:Documentation/virt/kvm/devices/xive.rst
-f:Documentation/virt/kvm/halt-polling.rst
-f:Documentation/virt/kvm/index.rst
-f:Documentation/virt/kvm/locking.rst
-f:Documentation/virt/kvm/loongarch/hypercalls.rst
-f:Documentation/virt/kvm/loongarch/index.rst
-f:Documentation/virt/kvm/ppc-pv.rst
-f:Documentation/virt/kvm/review-checklist.rst
-f:Documentation/virt/kvm/s390/index.rst
-f:Documentation/virt/kvm/s390/s390-diag.rst
-f:Documentation/virt/kvm/s390/s390-pv-boot.rst
-f:Documentation/virt/kvm/s390/s390-pv-dump.rst
-f:Documentation/virt/kvm/s390/s390-pv.rst
-f:Documentation/virt/kvm/vcpu-requests.rst
-f:Documentation/virt/kvm/x86/amd-memory-encryption.rst
-f:Documentation/virt/kvm/x86/cpuid.rst
-f:Documentation/virt/kvm/x86/errata.rst
-f:Documentation/virt/kvm/x86/hypercalls.rst
-f:Documentation/virt/kvm/x86/index.rst
-f:Documentation/virt/kvm/x86/intel-tdx.rst
-f:Documentation/virt/kvm/x86/mmu.rst
-f:Documentation/virt/kvm/x86/msr.rst
-f:Documentation/virt/kvm/x86/nested-vmx.rst
-f:Documentation/virt/kvm/x86/running-nested-guests.rst
-f:Documentation/virt/kvm/x86/timekeeping.rst
-f:Documentation/virt/ne_overview.rst
-f:Documentation/virt/paravirt_ops.rst
-f:Documentation/virt/uml/user_mode_linux_howto_v2.rst
-f:Documentation/w1/index.rst
-f:Documentation/w1/masters/ds2482.rst
-f:Documentation/w1/masters/ds2490.rst
-f:Documentation/w1/masters/index.rst
-f:Documentation/w1/masters/mxc-w1.rst
-f:Documentation/w1/masters/omap-hdq.rst
-f:Documentation/w1/masters/w1-gpio.rst
-f:Documentation/w1/masters/w1-uart.rst
-f:Documentation/w1/slaves/index.rst
-f:Documentation/w1/slaves/w1_ds2406.rst
-f:Documentation/w1/slaves/w1_ds2413.rst
-f:Documentation/w1/slaves/w1_ds2423.rst
-f:Documentation/w1/slaves/w1_ds2438.rst
-f:Documentation/w1/slaves/w1_ds28e04.rst
-f:Documentation/w1/slaves/w1_ds28e17.rst
-f:Documentation/w1/slaves/w1_therm.rst
-f:Documentation/w1/w1-generic.rst
-f:Documentation/w1/w1-netlink.rst
-f:Documentation/watchdog/convert_drivers_to_kernel_api.rst
-f:Documentation/watchdog/hpwdt.rst
-f:Documentation/watchdog/index.rst
-f:Documentation/watchdog/mlx-wdt.rst
-f:Documentation/watchdog/pcwd-watchdog.rst
-f:Documentation/watchdog/watchdog-api.rst
-f:Documentation/watchdog/watchdog-kernel-api.rst
-f:Documentation/watchdog/watchdog-parameters.rst
-f:Documentation/watchdog/watchdog-pm.rst
-f:Documentation/watchdog/wdt.rst
-f:Documentation/wmi/acpi-interface.rst
-f:Documentation/wmi/devices/alienware-wmi.rst
-f:Documentation/wmi/devices/dell-wmi-ddv.rst
-f:Documentation/wmi/devices/index.rst
-f:Documentation/wmi/devices/lenovo-wmi-gamezone.rst
-f:Documentation/wmi/devices/lenovo-wmi-other.rst
-f:Documentation/wmi/devices/msi-wmi-platform.rst
-f:Documentation/wmi/devices/wmi-bmof.rst
-f:Documentation/wmi/driver-development-guide.rst
-f:Documentation/wmi/index.rst
-f:Kbuild
-f:Kconfig
-f:LICENSES/deprecated/0BSD
-f:LICENSES/deprecated/CC0-1.0
-f:LICENSES/deprecated/GFDL-1.1
-f:LICENSES/deprecated/GFDL-1.2
-f:LICENSES/deprecated/GPL-1.0
-f:LICENSES/deprecated/ISC
-f:LICENSES/deprecated/Linux-OpenIB
-f:LICENSES/deprecated/X11
-f:LICENSES/deprecated/Zlib
-f:LICENSES/dual/Apache-2.0
-f:LICENSES/dual/CC-BY-4.0
-f:LICENSES/dual/CDDL-1.0
-f:LICENSES/dual/MPL-1.1
-f:LICENSES/dual/copyleft-next-0.3.1
-f:LICENSES/exceptions/GCC-exception-2.0
-f:LICENSES/exceptions/Linux-syscall-note
-f:LICENSES/preferred/BSD-2-Clause
-f:LICENSES/preferred/BSD-3-Clause
-f:LICENSES/preferred/BSD-3-Clause-Clear
-f:LICENSES/preferred/GPL-2.0
-f:LICENSES/preferred/LGPL-2.0
-f:LICENSES/preferred/LGPL-2.1
-f:LICENSES/preferred/MIT
-f:MAINTAINERS
-f:Makefile
-f:README
-f:arch/.gitignore
-f:arch/Kconfig
-f:arch/alpha/Kbuild
-f:arch/alpha/Kconfig
-f:arch/alpha/Kconfig.debug
-f:arch/alpha/Makefile
-f:arch/alpha/boot/Makefile
-f:arch/alpha/boot/bootloader.lds
-f:arch/alpha/boot/bootp.c
-f:arch/alpha/boot/bootpz.c
-f:arch/alpha/boot/head.S
-f:arch/alpha/boot/main.c
-f:arch/alpha/boot/misc.c
-f:arch/alpha/boot/stdio.c
-f:arch/alpha/boot/tools/mkbb.c
-f:arch/alpha/boot/tools/objstrip.c
-f:arch/alpha/configs/defconfig
-f:arch/alpha/include/asm/Kbuild
-f:arch/alpha/include/asm/agp_backend.h
-f:arch/alpha/include/asm/asm-prototypes.h
-f:arch/alpha/include/asm/atomic.h
-f:arch/alpha/include/asm/barrier.h
-f:arch/alpha/include/asm/bitops.h
-f:arch/alpha/include/asm/bug.h
-f:arch/alpha/include/asm/cache.h
-f:arch/alpha/include/asm/cacheflush.h
-f:arch/alpha/include/asm/checksum.h
-f:arch/alpha/include/asm/cmpxchg.h
-f:arch/alpha/include/asm/compiler.h
-f:arch/alpha/include/asm/console.h
-f:arch/alpha/include/asm/core_cia.h
-f:arch/alpha/include/asm/core_irongate.h
-f:arch/alpha/include/asm/core_marvel.h
-f:arch/alpha/include/asm/core_mcpcia.h
-f:arch/alpha/include/asm/core_polaris.h
-f:arch/alpha/include/asm/core_t2.h
-f:arch/alpha/include/asm/core_titan.h
-f:arch/alpha/include/asm/core_tsunami.h
-f:arch/alpha/include/asm/core_wildfire.h
-f:arch/alpha/include/asm/delay.h
-f:arch/alpha/include/asm/device.h
-f:arch/alpha/include/asm/dma-mapping.h
-f:arch/alpha/include/asm/dma.h
-f:arch/alpha/include/asm/elf.h
-f:arch/alpha/include/asm/emergency-restart.h
-f:arch/alpha/include/asm/err_common.h
-f:arch/alpha/include/asm/err_ev6.h
-f:arch/alpha/include/asm/err_ev7.h
-f:arch/alpha/include/asm/extable.h
-f:arch/alpha/include/asm/floppy.h
-f:arch/alpha/include/asm/fpu.h
-f:arch/alpha/include/asm/ftrace.h
-f:arch/alpha/include/asm/futex.h
-f:arch/alpha/include/asm/gct.h
-f:arch/alpha/include/asm/hardirq.h
-f:arch/alpha/include/asm/hw_irq.h
-f:arch/alpha/include/asm/hwrpb.h
-f:arch/alpha/include/asm/io.h
-f:arch/alpha/include/asm/io_trivial.h
-f:arch/alpha/include/asm/irq.h
-f:arch/alpha/include/asm/irqflags.h
-f:arch/alpha/include/asm/linkage.h
-f:arch/alpha/include/asm/local.h
-f:arch/alpha/include/asm/machvec.h
-f:arch/alpha/include/asm/mc146818rtc.h
-f:arch/alpha/include/asm/mce.h
-f:arch/alpha/include/asm/mmu.h
-f:arch/alpha/include/asm/mmu_context.h
-f:arch/alpha/include/asm/module.h
-f:arch/alpha/include/asm/page.h
-f:arch/alpha/include/asm/pal.h
-f:arch/alpha/include/asm/parport.h
-f:arch/alpha/include/asm/pci.h
-f:arch/alpha/include/asm/percpu.h
-f:arch/alpha/include/asm/perf_event.h
-f:arch/alpha/include/asm/pgalloc.h
-f:arch/alpha/include/asm/pgtable.h
-f:arch/alpha/include/asm/processor.h
-f:arch/alpha/include/asm/ptrace.h
-f:arch/alpha/include/asm/rwonce.h
-f:arch/alpha/include/asm/serial.h
-f:arch/alpha/include/asm/setup.h
-f:arch/alpha/include/asm/sfp-machine.h
-f:arch/alpha/include/asm/shmparam.h
-f:arch/alpha/include/asm/signal.h
-f:arch/alpha/include/asm/smp.h
-f:arch/alpha/include/asm/socket.h
-f:arch/alpha/include/asm/sparsemem.h
-f:arch/alpha/include/asm/special_insns.h
-f:arch/alpha/include/asm/spinlock.h
-f:arch/alpha/include/asm/spinlock_types.h
-f:arch/alpha/include/asm/string.h
-f:arch/alpha/include/asm/switch_to.h
-f:arch/alpha/include/asm/syscall.h
-f:arch/alpha/include/asm/thread_info.h
-f:arch/alpha/include/asm/timex.h
-f:arch/alpha/include/asm/tlb.h
-f:arch/alpha/include/asm/tlbflush.h
-f:arch/alpha/include/asm/topology.h
-f:arch/alpha/include/asm/types.h
-f:arch/alpha/include/asm/uaccess.h
-f:arch/alpha/include/asm/ucontext.h
-f:arch/alpha/include/asm/unistd.h
-f:arch/alpha/include/asm/user.h
-f:arch/alpha/include/asm/vga.h
-f:arch/alpha/include/asm/vmalloc.h
-f:arch/alpha/include/asm/word-at-a-time.h
-f:arch/alpha/include/asm/wrperfmon.h
-f:arch/alpha/include/asm/xor.h
-f:arch/alpha/include/uapi/asm/Kbuild
-f:arch/alpha/include/uapi/asm/a.out.h
-f:arch/alpha/include/uapi/asm/auxvec.h
-f:arch/alpha/include/uapi/asm/bitsperlong.h
-f:arch/alpha/include/uapi/asm/byteorder.h
-f:arch/alpha/include/uapi/asm/compiler.h
-f:arch/alpha/include/uapi/asm/console.h
-f:arch/alpha/include/uapi/asm/errno.h
-f:arch/alpha/include/uapi/asm/fcntl.h
-f:arch/alpha/include/uapi/asm/fpu.h
-f:arch/alpha/include/uapi/asm/gentrap.h
-f:arch/alpha/include/uapi/asm/ioctl.h
-f:arch/alpha/include/uapi/asm/ioctls.h
-f:arch/alpha/include/uapi/asm/mman.h
-f:arch/alpha/include/uapi/asm/pal.h
-f:arch/alpha/include/uapi/asm/param.h
-f:arch/alpha/include/uapi/asm/posix_types.h
-f:arch/alpha/include/uapi/asm/ptrace.h
-f:arch/alpha/include/uapi/asm/reg.h
-f:arch/alpha/include/uapi/asm/regdef.h
-f:arch/alpha/include/uapi/asm/resource.h
-f:arch/alpha/include/uapi/asm/setup.h
-f:arch/alpha/include/uapi/asm/sigcontext.h
-f:arch/alpha/include/uapi/asm/siginfo.h
-f:arch/alpha/include/uapi/asm/signal.h
-f:arch/alpha/include/uapi/asm/socket.h
-f:arch/alpha/include/uapi/asm/sockios.h
-f:arch/alpha/include/uapi/asm/stat.h
-f:arch/alpha/include/uapi/asm/statfs.h
-f:arch/alpha/include/uapi/asm/swab.h
-f:arch/alpha/include/uapi/asm/sysinfo.h
-f:arch/alpha/include/uapi/asm/termbits.h
-f:arch/alpha/include/uapi/asm/termios.h
-f:arch/alpha/include/uapi/asm/types.h
-f:arch/alpha/include/uapi/asm/unistd.h
-f:arch/alpha/kernel/.gitignore
-f:arch/alpha/kernel/Makefile
-f:arch/alpha/kernel/asm-offsets.c
-f:arch/alpha/kernel/audit.c
-f:arch/alpha/kernel/bugs.c
-f:arch/alpha/kernel/console.c
-f:arch/alpha/kernel/core_cia.c
-f:arch/alpha/kernel/core_irongate.c
-f:arch/alpha/kernel/core_marvel.c
-f:arch/alpha/kernel/core_mcpcia.c
-f:arch/alpha/kernel/core_polaris.c
-f:arch/alpha/kernel/core_t2.c
-f:arch/alpha/kernel/core_titan.c
-f:arch/alpha/kernel/core_tsunami.c
-f:arch/alpha/kernel/core_wildfire.c
-f:arch/alpha/kernel/entry.S
-f:arch/alpha/kernel/err_common.c
-f:arch/alpha/kernel/err_ev6.c
-f:arch/alpha/kernel/err_ev7.c
-f:arch/alpha/kernel/err_impl.h
-f:arch/alpha/kernel/err_marvel.c
-f:arch/alpha/kernel/err_titan.c
-f:arch/alpha/kernel/es1888.c
-f:arch/alpha/kernel/gct.c
-f:arch/alpha/kernel/head.S
-f:arch/alpha/kernel/io.c
-f:arch/alpha/kernel/irq.c
-f:arch/alpha/kernel/irq_alpha.c
-f:arch/alpha/kernel/irq_i8259.c
-f:arch/alpha/kernel/irq_impl.h
-f:arch/alpha/kernel/irq_pyxis.c
-f:arch/alpha/kernel/irq_srm.c
-f:arch/alpha/kernel/machvec_impl.h
-f:arch/alpha/kernel/module.c
-f:arch/alpha/kernel/osf_sys.c
-f:arch/alpha/kernel/pc873xx.c
-f:arch/alpha/kernel/pc873xx.h
-f:arch/alpha/kernel/pci-sysfs.c
-f:arch/alpha/kernel/pci.c
-f:arch/alpha/kernel/pci_impl.h
-f:arch/alpha/kernel/pci_iommu.c
-f:arch/alpha/kernel/perf_event.c
-f:arch/alpha/kernel/process.c
-f:arch/alpha/kernel/proto.h
-f:arch/alpha/kernel/ptrace.c
-f:arch/alpha/kernel/rtc.c
-f:arch/alpha/kernel/setup.c
-f:arch/alpha/kernel/signal.c
-f:arch/alpha/kernel/smc37c669.c
-f:arch/alpha/kernel/smc37c93x.c
-f:arch/alpha/kernel/smp.c
-f:arch/alpha/kernel/srm_env.c
-f:arch/alpha/kernel/srmcons.c
-f:arch/alpha/kernel/sys_alcor.c
-f:arch/alpha/kernel/sys_cabriolet.c
-f:arch/alpha/kernel/sys_dp264.c
-f:arch/alpha/kernel/sys_eiger.c
-f:arch/alpha/kernel/sys_marvel.c
-f:arch/alpha/kernel/sys_miata.c
-f:arch/alpha/kernel/sys_mikasa.c
-f:arch/alpha/kernel/sys_nautilus.c
-f:arch/alpha/kernel/sys_noritake.c
-f:arch/alpha/kernel/sys_rawhide.c
-f:arch/alpha/kernel/sys_ruffian.c
-f:arch/alpha/kernel/sys_rx164.c
-f:arch/alpha/kernel/sys_sable.c
-f:arch/alpha/kernel/sys_sx164.c
-f:arch/alpha/kernel/sys_takara.c
-f:arch/alpha/kernel/sys_titan.c
-f:arch/alpha/kernel/sys_wildfire.c
-f:arch/alpha/kernel/syscalls/Makefile
-f:arch/alpha/kernel/syscalls/syscall.tbl
-f:arch/alpha/kernel/systbls.S
-f:arch/alpha/kernel/termios.c
-f:arch/alpha/kernel/time.c
-f:arch/alpha/kernel/traps.c
-f:arch/alpha/kernel/vmlinux.lds.S
-f:arch/alpha/lib/Makefile
-f:arch/alpha/lib/callback_srm.S
-f:arch/alpha/lib/checksum.c
-f:arch/alpha/lib/clear_page.S
-f:arch/alpha/lib/clear_user.S
-f:arch/alpha/lib/copy_page.S
-f:arch/alpha/lib/copy_user.S
-f:arch/alpha/lib/csum_ipv6_magic.S
-f:arch/alpha/lib/csum_partial_copy.c
-f:arch/alpha/lib/dbg_current.S
-f:arch/alpha/lib/dbg_stackcheck.S
-f:arch/alpha/lib/dbg_stackkill.S
-f:arch/alpha/lib/divide.S
-f:arch/alpha/lib/ev6-clear_page.S
-f:arch/alpha/lib/ev6-clear_user.S
-f:arch/alpha/lib/ev6-copy_page.S
-f:arch/alpha/lib/ev6-copy_user.S
-f:arch/alpha/lib/ev6-csum_ipv6_magic.S
-f:arch/alpha/lib/ev6-divide.S
-f:arch/alpha/lib/ev6-memchr.S
-f:arch/alpha/lib/ev6-memcpy.S
-f:arch/alpha/lib/ev6-memset.S
-f:arch/alpha/lib/ev6-stxcpy.S
-f:arch/alpha/lib/ev6-stxncpy.S
-f:arch/alpha/lib/ev67-strcat.S
-f:arch/alpha/lib/ev67-strchr.S
-f:arch/alpha/lib/ev67-strlen.S
-f:arch/alpha/lib/ev67-strncat.S
-f:arch/alpha/lib/ev67-strrchr.S
-f:arch/alpha/lib/fls.c
-f:arch/alpha/lib/fpreg.c
-f:arch/alpha/lib/memchr.S
-f:arch/alpha/lib/memcpy.c
-f:arch/alpha/lib/memmove.S
-f:arch/alpha/lib/memset.S
-f:arch/alpha/lib/srm_printk.c
-f:arch/alpha/lib/srm_puts.c
-f:arch/alpha/lib/stacktrace.c
-f:arch/alpha/lib/strcat.S
-f:arch/alpha/lib/strchr.S
-f:arch/alpha/lib/strcpy.S
-f:arch/alpha/lib/strlen.S
-f:arch/alpha/lib/strncat.S
-f:arch/alpha/lib/strncpy.S
-f:arch/alpha/lib/strrchr.S
-f:arch/alpha/lib/stxcpy.S
-f:arch/alpha/lib/stxncpy.S
-f:arch/alpha/lib/stycpy.S
-f:arch/alpha/lib/styncpy.S
-f:arch/alpha/lib/udelay.c
-f:arch/alpha/lib/udiv-qrnnd.S
-f:arch/alpha/math-emu/Makefile
-f:arch/alpha/math-emu/math.c
-f:arch/alpha/math-emu/sfp-util.h
-f:arch/alpha/mm/Makefile
-f:arch/alpha/mm/fault.c
-f:arch/alpha/mm/init.c
-f:arch/arc/Kbuild
-f:arch/arc/Kconfig
-f:arch/arc/Kconfig.debug
-f:arch/arc/Makefile
-f:arch/arc/boot/.gitignore
-f:arch/arc/boot/Makefile
-f:arch/arc/boot/dts/Makefile
-f:arch/arc/boot/dts/abilis_tb100.dtsi
-f:arch/arc/boot/dts/abilis_tb100_dvk.dts
-f:arch/arc/boot/dts/abilis_tb101.dtsi
-f:arch/arc/boot/dts/abilis_tb101_dvk.dts
-f:arch/arc/boot/dts/abilis_tb10x.dtsi
-f:arch/arc/boot/dts/axc001.dtsi
-f:arch/arc/boot/dts/axc003.dtsi
-f:arch/arc/boot/dts/axc003_idu.dtsi
-f:arch/arc/boot/dts/axs101.dts
-f:arch/arc/boot/dts/axs103.dts
-f:arch/arc/boot/dts/axs103_idu.dts
-f:arch/arc/boot/dts/axs10x_mb.dtsi
-f:arch/arc/boot/dts/haps_hs.dts
-f:arch/arc/boot/dts/haps_hs_idu.dts
-f:arch/arc/boot/dts/hsdk.dts
-f:arch/arc/boot/dts/nsim_700.dts
-f:arch/arc/boot/dts/nsimosci.dts
-f:arch/arc/boot/dts/nsimosci_hs.dts
-f:arch/arc/boot/dts/nsimosci_hs_idu.dts
-f:arch/arc/boot/dts/skeleton.dtsi
-f:arch/arc/boot/dts/skeleton_hs.dtsi
-f:arch/arc/boot/dts/skeleton_hs_idu.dtsi
-f:arch/arc/boot/dts/vdk_axc003.dtsi
-f:arch/arc/boot/dts/vdk_axc003_idu.dtsi
-f:arch/arc/boot/dts/vdk_axs10x_mb.dtsi
-f:arch/arc/boot/dts/vdk_hs38.dts
-f:arch/arc/boot/dts/vdk_hs38_smp.dts
-f:arch/arc/configs/axs101_defconfig
-f:arch/arc/configs/axs103_defconfig
-f:arch/arc/configs/axs103_smp_defconfig
-f:arch/arc/configs/haps_hs_defconfig
-f:arch/arc/configs/haps_hs_smp_defconfig
-f:arch/arc/configs/hsdk_defconfig
-f:arch/arc/configs/nsim_700_defconfig
-f:arch/arc/configs/nsimosci_defconfig
-f:arch/arc/configs/nsimosci_hs_defconfig
-f:arch/arc/configs/nsimosci_hs_smp_defconfig
-f:arch/arc/configs/tb10x_defconfig
-f:arch/arc/configs/vdk_hs38_defconfig
-f:arch/arc/configs/vdk_hs38_smp_defconfig
-f:arch/arc/include/asm/Kbuild
-f:arch/arc/include/asm/arcregs.h
-f:arch/arc/include/asm/asm-offsets.h
-f:arch/arc/include/asm/asserts.h
-f:arch/arc/include/asm/atomic-llsc.h
-f:arch/arc/include/asm/atomic-spinlock.h
-f:arch/arc/include/asm/atomic.h
-f:arch/arc/include/asm/atomic64-arcv2.h
-f:arch/arc/include/asm/barrier.h
-f:arch/arc/include/asm/bitops.h
-f:arch/arc/include/asm/bug.h
-f:arch/arc/include/asm/cache.h
-f:arch/arc/include/asm/cacheflush.h
-f:arch/arc/include/asm/cachetype.h
-f:arch/arc/include/asm/checksum.h
-f:arch/arc/include/asm/cmpxchg.h
-f:arch/arc/include/asm/current.h
-f:arch/arc/include/asm/delay.h
-f:arch/arc/include/asm/disasm.h
-f:arch/arc/include/asm/dma.h
-f:arch/arc/include/asm/dsp-impl.h
-f:arch/arc/include/asm/dsp.h
-f:arch/arc/include/asm/dwarf.h
-f:arch/arc/include/asm/elf.h
-f:arch/arc/include/asm/entry-arcv2.h
-f:arch/arc/include/asm/entry-compact.h
-f:arch/arc/include/asm/entry.h
-f:arch/arc/include/asm/exec.h
-f:arch/arc/include/asm/fpu.h
-f:arch/arc/include/asm/futex.h
-f:arch/arc/include/asm/highmem.h
-f:arch/arc/include/asm/hugepage.h
-f:arch/arc/include/asm/io.h
-f:arch/arc/include/asm/irq.h
-f:arch/arc/include/asm/irqflags-arcv2.h
-f:arch/arc/include/asm/irqflags-compact.h
-f:arch/arc/include/asm/irqflags.h
-f:arch/arc/include/asm/jump_label.h
-f:arch/arc/include/asm/kdebug.h
-f:arch/arc/include/asm/kgdb.h
-f:arch/arc/include/asm/kprobes.h
-f:arch/arc/include/asm/linkage.h
-f:arch/arc/include/asm/mach_desc.h
-f:arch/arc/include/asm/mmu-arcv2.h
-f:arch/arc/include/asm/mmu.h
-f:arch/arc/include/asm/mmu_context.h
-f:arch/arc/include/asm/module.h
-f:arch/arc/include/asm/page.h
-f:arch/arc/include/asm/pci.h
-f:arch/arc/include/asm/perf_event.h
-f:arch/arc/include/asm/pgalloc.h
-f:arch/arc/include/asm/pgtable-bits-arcv2.h
-f:arch/arc/include/asm/pgtable-levels.h
-f:arch/arc/include/asm/pgtable.h
-f:arch/arc/include/asm/processor.h
-f:arch/arc/include/asm/ptrace.h
-f:arch/arc/include/asm/sections.h
-f:arch/arc/include/asm/serial.h
-f:arch/arc/include/asm/setup.h
-f:arch/arc/include/asm/shmparam.h
-f:arch/arc/include/asm/smp.h
-f:arch/arc/include/asm/spinlock.h
-f:arch/arc/include/asm/spinlock_types.h
-f:arch/arc/include/asm/stacktrace.h
-f:arch/arc/include/asm/string.h
-f:arch/arc/include/asm/switch_to.h
-f:arch/arc/include/asm/syscall.h
-f:arch/arc/include/asm/syscalls.h
-f:arch/arc/include/asm/thread_info.h
-f:arch/arc/include/asm/timex.h
-f:arch/arc/include/asm/tlb.h
-f:arch/arc/include/asm/tlbflush.h
-f:arch/arc/include/asm/uaccess.h
-f:arch/arc/include/asm/unistd.h
-f:arch/arc/include/asm/unwind.h
-f:arch/arc/include/asm/vermagic.h
-f:arch/arc/include/asm/vmalloc.h
-f:arch/arc/include/uapi/asm/Kbuild
-f:arch/arc/include/uapi/asm/bpf_perf_event.h
-f:arch/arc/include/uapi/asm/byteorder.h
-f:arch/arc/include/uapi/asm/cachectl.h
-f:arch/arc/include/uapi/asm/elf.h
-f:arch/arc/include/uapi/asm/page.h
-f:arch/arc/include/uapi/asm/ptrace.h
-f:arch/arc/include/uapi/asm/setup.h
-f:arch/arc/include/uapi/asm/sigcontext.h
-f:arch/arc/include/uapi/asm/signal.h
-f:arch/arc/include/uapi/asm/swab.h
-f:arch/arc/include/uapi/asm/unistd.h
-f:arch/arc/kernel/.gitignore
-f:arch/arc/kernel/Makefile
-f:arch/arc/kernel/Makefile.syscalls
-f:arch/arc/kernel/arc_hostlink.c
-f:arch/arc/kernel/arcksyms.c
-f:arch/arc/kernel/asm-offsets.c
-f:arch/arc/kernel/ctx_sw_asm.S
-f:arch/arc/kernel/devtree.c
-f:arch/arc/kernel/disasm.c
-f:arch/arc/kernel/entry-arcv2.S
-f:arch/arc/kernel/entry-compact.S
-f:arch/arc/kernel/entry.S
-f:arch/arc/kernel/fpu.c
-f:arch/arc/kernel/head.S
-f:arch/arc/kernel/intc-arcv2.c
-f:arch/arc/kernel/intc-compact.c
-f:arch/arc/kernel/irq.c
-f:arch/arc/kernel/jump_label.c
-f:arch/arc/kernel/kgdb.c
-f:arch/arc/kernel/kprobes.c
-f:arch/arc/kernel/mcip.c
-f:arch/arc/kernel/module.c
-f:arch/arc/kernel/perf_event.c
-f:arch/arc/kernel/process.c
-f:arch/arc/kernel/ptrace.c
-f:arch/arc/kernel/reset.c
-f:arch/arc/kernel/setup.c
-f:arch/arc/kernel/signal.c
-f:arch/arc/kernel/smp.c
-f:arch/arc/kernel/stacktrace.c
-f:arch/arc/kernel/sys.c
-f:arch/arc/kernel/traps.c
-f:arch/arc/kernel/troubleshoot.c
-f:arch/arc/kernel/unaligned.c
-f:arch/arc/kernel/unaligned.h
-f:arch/arc/kernel/unwind.c
-f:arch/arc/kernel/vmlinux.lds.S
-f:arch/arc/lib/Makefile
-f:arch/arc/lib/memcmp.S
-f:arch/arc/lib/memcpy-700.S
-f:arch/arc/lib/memcpy-archs-unaligned.S
-f:arch/arc/lib/memcpy-archs.S
-f:arch/arc/lib/memset-archs.S
-f:arch/arc/lib/memset.S
-f:arch/arc/lib/strchr-700.S
-f:arch/arc/lib/strcmp-archs.S
-f:arch/arc/lib/strcmp.S
-f:arch/arc/lib/strcpy-700.S
-f:arch/arc/lib/strlen.S
-f:arch/arc/mm/Makefile
-f:arch/arc/mm/cache.c
-f:arch/arc/mm/dma.c
-f:arch/arc/mm/extable.c
-f:arch/arc/mm/fault.c
-f:arch/arc/mm/highmem.c
-f:arch/arc/mm/init.c
-f:arch/arc/mm/ioremap.c
-f:arch/arc/mm/mmap.c
-f:arch/arc/mm/tlb.c
-f:arch/arc/mm/tlbex.S
-f:arch/arc/net/Makefile
-f:arch/arc/net/bpf_jit.h
-f:arch/arc/net/bpf_jit_arcv2.c
-f:arch/arc/net/bpf_jit_core.c
-f:arch/arc/plat-axs10x/Kconfig
-f:arch/arc/plat-axs10x/Makefile
-f:arch/arc/plat-axs10x/axs10x.c
-f:arch/arc/plat-hsdk/Kconfig
-f:arch/arc/plat-hsdk/Makefile
-f:arch/arc/plat-hsdk/platform.c
-f:arch/arc/plat-sim/Makefile
-f:arch/arc/plat-sim/platform.c
-f:arch/arc/plat-tb10x/Kconfig
-f:arch/arc/plat-tb10x/Makefile
-f:arch/arc/plat-tb10x/tb10x.c
-f:arch/arm/Kbuild
-f:arch/arm/Kconfig
-f:arch/arm/Kconfig-nommu
-f:arch/arm/Kconfig.debug
-f:arch/arm/Kconfig.platforms
-f:arch/arm/Makefile
-f:arch/arm/boot/.gitignore
-f:arch/arm/boot/Makefile
-f:arch/arm/boot/bootp/Makefile
-f:arch/arm/boot/bootp/bootp.lds
-f:arch/arm/boot/bootp/init.S
-f:arch/arm/boot/bootp/initrd.S
-f:arch/arm/boot/bootp/kernel.S
-f:arch/arm/boot/compressed/.gitignore
-f:arch/arm/boot/compressed/Makefile
-f:arch/arm/boot/compressed/ashldi3.S
-f:arch/arm/boot/compressed/atags_to_fdt.c
-f:arch/arm/boot/compressed/big-endian.S
-f:arch/arm/boot/compressed/bswapsdi2.S
-f:arch/arm/boot/compressed/debug.S
-f:arch/arm/boot/compressed/decompress.c
-f:arch/arm/boot/compressed/efi-header.S
-f:arch/arm/boot/compressed/fdt.c
-f:arch/arm/boot/compressed/fdt_check_mem_start.c
-f:arch/arm/boot/compressed/fdt_ro.c
-f:arch/arm/boot/compressed/fdt_rw.c
-f:arch/arm/boot/compressed/fdt_wip.c
-f:arch/arm/boot/compressed/font.c
-f:arch/arm/boot/compressed/head-sa1100.S
-f:arch/arm/boot/compressed/head-sharpsl.S
-f:arch/arm/boot/compressed/head-xscale.S
-f:arch/arm/boot/compressed/head.S
-f:arch/arm/boot/compressed/hyp-stub.S
-f:arch/arm/boot/compressed/lib1funcs.S
-f:arch/arm/boot/compressed/ll_char_wr.S
-f:arch/arm/boot/compressed/misc-ep93xx.h
-f:arch/arm/boot/compressed/misc.c
-f:arch/arm/boot/compressed/misc.h
-f:arch/arm/boot/compressed/piggy.S
-f:arch/arm/boot/compressed/string.c
-f:arch/arm/boot/compressed/vmlinux.lds.S
-f:arch/arm/boot/deflate_xip_data.sh
-f:arch/arm/boot/dts/Makefile
-f:arch/arm/boot/dts/actions/Makefile
-f:arch/arm/boot/dts/actions/owl-s500-cubieboard6.dts
-f:arch/arm/boot/dts/actions/owl-s500-guitar-bb-rev-b.dts
-f:arch/arm/boot/dts/actions/owl-s500-guitar.dtsi
-f:arch/arm/boot/dts/actions/owl-s500-labrador-base-m.dts
-f:arch/arm/boot/dts/actions/owl-s500-labrador-v2.dtsi
-f:arch/arm/boot/dts/actions/owl-s500-roseapplepi.dts
-f:arch/arm/boot/dts/actions/owl-s500-sparky.dts
-f:arch/arm/boot/dts/actions/owl-s500.dtsi
-f:arch/arm/boot/dts/airoha/Makefile
-f:arch/arm/boot/dts/airoha/en7523-evb.dts
-f:arch/arm/boot/dts/airoha/en7523.dtsi
-f:arch/arm/boot/dts/allwinner/Makefile
-f:arch/arm/boot/dts/allwinner/axp152.dtsi
-f:arch/arm/boot/dts/allwinner/axp209.dtsi
-f:arch/arm/boot/dts/allwinner/axp223.dtsi
-f:arch/arm/boot/dts/allwinner/axp22x.dtsi
-f:arch/arm/boot/dts/allwinner/axp809.dtsi
-f:arch/arm/boot/dts/allwinner/axp81x.dtsi
-f:arch/arm/boot/dts/allwinner/sun4i-a10-a1000.dts
-f:arch/arm/boot/dts/allwinner/sun4i-a10-ba10-tvbox.dts
-f:arch/arm/boot/dts/allwinner/sun4i-a10-chuwi-v7-cw0825.dts
-f:arch/arm/boot/dts/allwinner/sun4i-a10-cubieboard.dts
-f:arch/arm/boot/dts/allwinner/sun4i-a10-dserve-dsrv9703c.dts
-f:arch/arm/boot/dts/allwinner/sun4i-a10-gemei-g9.dts
-f:arch/arm/boot/dts/allwinner/sun4i-a10-hackberry.dts
-f:arch/arm/boot/dts/allwinner/sun4i-a10-hyundai-a7hd.dts
-f:arch/arm/boot/dts/allwinner/sun4i-a10-inet1.dts
-f:arch/arm/boot/dts/allwinner/sun4i-a10-inet97fv2.dts
-f:arch/arm/boot/dts/allwinner/sun4i-a10-inet9f-rev03.dts
-f:arch/arm/boot/dts/allwinner/sun4i-a10-itead-iteaduino-plus.dts
-f:arch/arm/boot/dts/allwinner/sun4i-a10-jesurun-q5.dts
-f:arch/arm/boot/dts/allwinner/sun4i-a10-marsboard.dts
-f:arch/arm/boot/dts/allwinner/sun4i-a10-mini-xplus.dts
-f:arch/arm/boot/dts/allwinner/sun4i-a10-mk802.dts
-f:arch/arm/boot/dts/allwinner/sun4i-a10-mk802ii.dts
-f:arch/arm/boot/dts/allwinner/sun4i-a10-olinuxino-lime.dts
-f:arch/arm/boot/dts/allwinner/sun4i-a10-pcduino.dts
-f:arch/arm/boot/dts/allwinner/sun4i-a10-pcduino2.dts
-f:arch/arm/boot/dts/allwinner/sun4i-a10-pov-protab2-ips9.dts
-f:arch/arm/boot/dts/allwinner/sun4i-a10-topwise-a721.dts
-f:arch/arm/boot/dts/allwinner/sun4i-a10.dtsi
-f:arch/arm/boot/dts/allwinner/sun5i-a10s-auxtek-t003.dts
-f:arch/arm/boot/dts/allwinner/sun5i-a10s-auxtek-t004.dts
-f:arch/arm/boot/dts/allwinner/sun5i-a10s-mk802.dts
-f:arch/arm/boot/dts/allwinner/sun5i-a10s-olinuxino-micro.dts
-f:arch/arm/boot/dts/allwinner/sun5i-a10s-r7-tv-dongle.dts
-f:arch/arm/boot/dts/allwinner/sun5i-a10s-wobo-i5.dts
-f:arch/arm/boot/dts/allwinner/sun5i-a10s.dtsi
-f:arch/arm/boot/dts/allwinner/sun5i-a13-difrnce-dit4350.dts
-f:arch/arm/boot/dts/allwinner/sun5i-a13-empire-electronix-d709.dts
-f:arch/arm/boot/dts/allwinner/sun5i-a13-empire-electronix-m712.dts
-f:arch/arm/boot/dts/allwinner/sun5i-a13-hsg-h702.dts
-f:arch/arm/boot/dts/allwinner/sun5i-a13-inet-98v-rev2.dts
-f:arch/arm/boot/dts/allwinner/sun5i-a13-licheepi-one.dts
-f:arch/arm/boot/dts/allwinner/sun5i-a13-olinuxino-micro.dts
-f:arch/arm/boot/dts/allwinner/sun5i-a13-olinuxino.dts
-f:arch/arm/boot/dts/allwinner/sun5i-a13-pocketbook-614-plus.dts
-f:arch/arm/boot/dts/allwinner/sun5i-a13-pocketbook-touch-lux-3.dts
-f:arch/arm/boot/dts/allwinner/sun5i-a13-q8-tablet.dts
-f:arch/arm/boot/dts/allwinner/sun5i-a13-utoo-p66.dts
-f:arch/arm/boot/dts/allwinner/sun5i-a13.dtsi
-f:arch/arm/boot/dts/allwinner/sun5i-gr8-chip-pro.dts
-f:arch/arm/boot/dts/allwinner/sun5i-gr8-evb.dts
-f:arch/arm/boot/dts/allwinner/sun5i-gr8.dtsi
-f:arch/arm/boot/dts/allwinner/sun5i-r8-chip.dts
-f:arch/arm/boot/dts/allwinner/sun5i-r8.dtsi
-f:arch/arm/boot/dts/allwinner/sun5i-reference-design-tablet.dtsi
-f:arch/arm/boot/dts/allwinner/sun5i.dtsi
-f:arch/arm/boot/dts/allwinner/sun6i-a31-app4-evb1.dts
-f:arch/arm/boot/dts/allwinner/sun6i-a31-colombus.dts
-f:arch/arm/boot/dts/allwinner/sun6i-a31-hummingbird.dts
-f:arch/arm/boot/dts/allwinner/sun6i-a31-i7.dts
-f:arch/arm/boot/dts/allwinner/sun6i-a31-m9.dts
-f:arch/arm/boot/dts/allwinner/sun6i-a31-mele-a1000g-quad.dts
-f:arch/arm/boot/dts/allwinner/sun6i-a31.dtsi
-f:arch/arm/boot/dts/allwinner/sun6i-a31s-colorfly-e708-q1.dts
-f:arch/arm/boot/dts/allwinner/sun6i-a31s-cs908.dts
-f:arch/arm/boot/dts/allwinner/sun6i-a31s-inet-q972.dts
-f:arch/arm/boot/dts/allwinner/sun6i-a31s-primo81.dts
-f:arch/arm/boot/dts/allwinner/sun6i-a31s-sina31s-core.dtsi
-f:arch/arm/boot/dts/allwinner/sun6i-a31s-sina31s.dts
-f:arch/arm/boot/dts/allwinner/sun6i-a31s-sinovoip-bpi-m2.dts
-f:arch/arm/boot/dts/allwinner/sun6i-a31s-yones-toptech-bs1078-v2.dts
-f:arch/arm/boot/dts/allwinner/sun6i-a31s.dtsi
-f:arch/arm/boot/dts/allwinner/sun6i-reference-design-tablet.dtsi
-f:arch/arm/boot/dts/allwinner/sun7i-a20-bananapi-m1-plus.dts
-f:arch/arm/boot/dts/allwinner/sun7i-a20-bananapi.dts
-f:arch/arm/boot/dts/allwinner/sun7i-a20-bananapro.dts
-f:arch/arm/boot/dts/allwinner/sun7i-a20-cubieboard2.dts
-f:arch/arm/boot/dts/allwinner/sun7i-a20-cubietruck.dts
-f:arch/arm/boot/dts/allwinner/sun7i-a20-haoyu-marsboard.dts
-f:arch/arm/boot/dts/allwinner/sun7i-a20-hummingbird.dts
-f:arch/arm/boot/dts/allwinner/sun7i-a20-i12-tvbox.dts
-f:arch/arm/boot/dts/allwinner/sun7i-a20-icnova-a20-adb4006.dts
-f:arch/arm/boot/dts/allwinner/sun7i-a20-icnova-a20.dtsi
-f:arch/arm/boot/dts/allwinner/sun7i-a20-icnova-swac.dts
-f:arch/arm/boot/dts/allwinner/sun7i-a20-itead-ibox.dts
-f:arch/arm/boot/dts/allwinner/sun7i-a20-lamobo-r1.dts
-f:arch/arm/boot/dts/allwinner/sun7i-a20-linutronix-testbox-v2.dts
-f:arch/arm/boot/dts/allwinner/sun7i-a20-m3.dts
-f:arch/arm/boot/dts/allwinner/sun7i-a20-mk808c.dts
-f:arch/arm/boot/dts/allwinner/sun7i-a20-olimex-som-evb-emmc.dts
-f:arch/arm/boot/dts/allwinner/sun7i-a20-olimex-som-evb.dts
-f:arch/arm/boot/dts/allwinner/sun7i-a20-olimex-som204-evb-emmc.dts
-f:arch/arm/boot/dts/allwinner/sun7i-a20-olimex-som204-evb.dts
-f:arch/arm/boot/dts/allwinner/sun7i-a20-olinuxino-lime-emmc.dts
-f:arch/arm/boot/dts/allwinner/sun7i-a20-olinuxino-lime.dts
-f:arch/arm/boot/dts/allwinner/sun7i-a20-olinuxino-lime2-emmc.dts
-f:arch/arm/boot/dts/allwinner/sun7i-a20-olinuxino-lime2.dts
-f:arch/arm/boot/dts/allwinner/sun7i-a20-olinuxino-micro-emmc.dts
-f:arch/arm/boot/dts/allwinner/sun7i-a20-olinuxino-micro.dts
-f:arch/arm/boot/dts/allwinner/sun7i-a20-orangepi-mini.dts
-f:arch/arm/boot/dts/allwinner/sun7i-a20-orangepi.dts
-f:arch/arm/boot/dts/allwinner/sun7i-a20-pcduino3-nano.dts
-f:arch/arm/boot/dts/allwinner/sun7i-a20-pcduino3.dts
-f:arch/arm/boot/dts/allwinner/sun7i-a20-wexler-tab7200.dts
-f:arch/arm/boot/dts/allwinner/sun7i-a20-wits-pro-a20-dkt.dts
-f:arch/arm/boot/dts/allwinner/sun7i-a20.dtsi
-f:arch/arm/boot/dts/allwinner/sun8i-a23-a33.dtsi
-f:arch/arm/boot/dts/allwinner/sun8i-a23-evb.dts
-f:arch/arm/boot/dts/allwinner/sun8i-a23-gt90h-v4.dts
-f:arch/arm/boot/dts/allwinner/sun8i-a23-inet86dz.dts
-f:arch/arm/boot/dts/allwinner/sun8i-a23-polaroid-mid2407pxe03.dts
-f:arch/arm/boot/dts/allwinner/sun8i-a23-polaroid-mid2809pxe04.dts
-f:arch/arm/boot/dts/allwinner/sun8i-a23-q8-tablet.dts
-f:arch/arm/boot/dts/allwinner/sun8i-a23.dtsi
-f:arch/arm/boot/dts/allwinner/sun8i-a33-ga10h-v1.1.dts
-f:arch/arm/boot/dts/allwinner/sun8i-a33-inet-d978-rev2.dts
-f:arch/arm/boot/dts/allwinner/sun8i-a33-olinuxino.dts
-f:arch/arm/boot/dts/allwinner/sun8i-a33-q8-tablet.dts
-f:arch/arm/boot/dts/allwinner/sun8i-a33-sinlinx-sina33.dts
-f:arch/arm/boot/dts/allwinner/sun8i-a33-vstar-core1.dtsi
-f:arch/arm/boot/dts/allwinner/sun8i-a33-vstar.dts
-f:arch/arm/boot/dts/allwinner/sun8i-a33.dtsi
-f:arch/arm/boot/dts/allwinner/sun8i-a83t-allwinner-h8homlet-v2.dts
-f:arch/arm/boot/dts/allwinner/sun8i-a83t-bananapi-m3.dts
-f:arch/arm/boot/dts/allwinner/sun8i-a83t-cubietruck-plus.dts
-f:arch/arm/boot/dts/allwinner/sun8i-a83t-tbs-a711.dts
-f:arch/arm/boot/dts/allwinner/sun8i-a83t.dtsi
-f:arch/arm/boot/dts/allwinner/sun8i-h2-plus-bananapi-m2-zero.dts
-f:arch/arm/boot/dts/allwinner/sun8i-h2-plus-libretech-all-h3-cc.dts
-f:arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-r1.dts
-f:arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts
-f:arch/arm/boot/dts/allwinner/sun8i-h3-bananapi-m2-plus-v1.2.dts
-f:arch/arm/boot/dts/allwinner/sun8i-h3-bananapi-m2-plus.dts
-f:arch/arm/boot/dts/allwinner/sun8i-h3-beelink-x2.dts
-f:arch/arm/boot/dts/allwinner/sun8i-h3-emlid-neutis-n5h3-devboard.dts
-f:arch/arm/boot/dts/allwinner/sun8i-h3-emlid-neutis-n5h3.dtsi
-f:arch/arm/boot/dts/allwinner/sun8i-h3-libretech-all-h3-cc.dts
-f:arch/arm/boot/dts/allwinner/sun8i-h3-mapleboard-mp130.dts
-f:arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-duo2.dts
-f:arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-m1-plus.dts
-f:arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-m1.dts
-f:arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-neo-air.dts
-f:arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-neo.dts
-f:arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-r1.dts
-f:arch/arm/boot/dts/allwinner/sun8i-h3-nanopi.dtsi
-f:arch/arm/boot/dts/allwinner/sun8i-h3-orangepi-2.dts
-f:arch/arm/boot/dts/allwinner/sun8i-h3-orangepi-lite.dts
-f:arch/arm/boot/dts/allwinner/sun8i-h3-orangepi-one.dts
-f:arch/arm/boot/dts/allwinner/sun8i-h3-orangepi-pc-plus.dts
-f:arch/arm/boot/dts/allwinner/sun8i-h3-orangepi-pc.dts
-f:arch/arm/boot/dts/allwinner/sun8i-h3-orangepi-plus.dts
-f:arch/arm/boot/dts/allwinner/sun8i-h3-orangepi-plus2e.dts
-f:arch/arm/boot/dts/allwinner/sun8i-h3-orangepi-zero-plus2.dts
-f:arch/arm/boot/dts/allwinner/sun8i-h3-rervision-dvk.dts
-f:arch/arm/boot/dts/allwinner/sun8i-h3-zeropi.dts
-f:arch/arm/boot/dts/allwinner/sun8i-h3.dtsi
-f:arch/arm/boot/dts/allwinner/sun8i-q8-common.dtsi
-f:arch/arm/boot/dts/allwinner/sun8i-r16-bananapi-m2m.dts
-f:arch/arm/boot/dts/allwinner/sun8i-r16-nintendo-nes-classic.dts
-f:arch/arm/boot/dts/allwinner/sun8i-r16-nintendo-super-nes-classic.dts
-f:arch/arm/boot/dts/allwinner/sun8i-r16-parrot.dts
-f:arch/arm/boot/dts/allwinner/sun8i-r40-bananapi-m2-ultra.dts
-f:arch/arm/boot/dts/allwinner/sun8i-r40-cpu-opp.dtsi
-f:arch/arm/boot/dts/allwinner/sun8i-r40-feta40i.dtsi
-f:arch/arm/boot/dts/allwinner/sun8i-r40-oka40i-c.dts
-f:arch/arm/boot/dts/allwinner/sun8i-r40.dtsi
-f:arch/arm/boot/dts/allwinner/sun8i-reference-design-tablet.dtsi
-f:arch/arm/boot/dts/allwinner/sun8i-s3-elimo-impetus.dtsi
-f:arch/arm/boot/dts/allwinner/sun8i-s3-elimo-initium.dts
-f:arch/arm/boot/dts/allwinner/sun8i-s3-lichee-zero-plus.dts
-f:arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts
-f:arch/arm/boot/dts/allwinner/sun8i-t113s-mangopi-mq-r-t113.dts
-f:arch/arm/boot/dts/allwinner/sun8i-t113s.dtsi
-f:arch/arm/boot/dts/allwinner/sun8i-t3-cqa3t-bv3.dts
-f:arch/arm/boot/dts/allwinner/sun8i-v3-sl631-imx179.dts
-f:arch/arm/boot/dts/allwinner/sun8i-v3-sl631.dtsi
-f:arch/arm/boot/dts/allwinner/sun8i-v3.dtsi
-f:arch/arm/boot/dts/allwinner/sun8i-v3s-anbernic-rg-nano.dts
-f:arch/arm/boot/dts/allwinner/sun8i-v3s-licheepi-zero-dock.dts
-f:arch/arm/boot/dts/allwinner/sun8i-v3s-licheepi-zero.dts
-f:arch/arm/boot/dts/allwinner/sun8i-v3s-netcube-kumquat.dts
-f:arch/arm/boot/dts/allwinner/sun8i-v3s.dtsi
-f:arch/arm/boot/dts/allwinner/sun8i-v40-bananapi-m2-berry.dts
-f:arch/arm/boot/dts/allwinner/sun9i-a80-cubieboard4.dts
-f:arch/arm/boot/dts/allwinner/sun9i-a80-optimus.dts
-f:arch/arm/boot/dts/allwinner/sun9i-a80.dtsi
-f:arch/arm/boot/dts/allwinner/suniv-f1c100s-licheepi-nano.dts
-f:arch/arm/boot/dts/allwinner/suniv-f1c100s.dtsi
-f:arch/arm/boot/dts/allwinner/suniv-f1c200s-lctech-pi.dts
-f:arch/arm/boot/dts/allwinner/suniv-f1c200s-popstick-v1.1.dts
-f:arch/arm/boot/dts/allwinner/sunxi-bananapi-m2-plus-v1.2.dtsi
-f:arch/arm/boot/dts/allwinner/sunxi-bananapi-m2-plus.dtsi
-f:arch/arm/boot/dts/allwinner/sunxi-common-regulators.dtsi
-f:arch/arm/boot/dts/allwinner/sunxi-d1s-t113-mangopi-mq-r.dtsi
-f:arch/arm/boot/dts/allwinner/sunxi-h3-h5-emlid-neutis.dtsi
-f:arch/arm/boot/dts/allwinner/sunxi-h3-h5.dtsi
-f:arch/arm/boot/dts/allwinner/sunxi-itead-core-common.dtsi
-f:arch/arm/boot/dts/allwinner/sunxi-libretech-all-h3-cc.dtsi
-f:arch/arm/boot/dts/allwinner/sunxi-libretech-all-h3-it.dtsi
-f:arch/arm/boot/dts/allwinner/sunxi-reference-design-tablet.dtsi
-f:arch/arm/boot/dts/alphascale/Makefile
-f:arch/arm/boot/dts/alphascale/alphascale-asm9260-devkit.dts
-f:arch/arm/boot/dts/alphascale/alphascale-asm9260.dtsi
-f:arch/arm/boot/dts/amazon/Makefile
-f:arch/arm/boot/dts/amazon/alpine-db.dts
-f:arch/arm/boot/dts/amazon/alpine.dtsi
-f:arch/arm/boot/dts/amlogic/Makefile
-f:arch/arm/boot/dts/amlogic/meson.dtsi
-f:arch/arm/boot/dts/amlogic/meson8-fernsehfee3.dts
-f:arch/arm/boot/dts/amlogic/meson8-minix-neo-x8.dts
-f:arch/arm/boot/dts/amlogic/meson8.dtsi
-f:arch/arm/boot/dts/amlogic/meson8b-ec100.dts
-f:arch/arm/boot/dts/amlogic/meson8b-mxq.dts
-f:arch/arm/boot/dts/amlogic/meson8b-odroidc1.dts
-f:arch/arm/boot/dts/amlogic/meson8b.dtsi
-f:arch/arm/boot/dts/amlogic/meson8m2-mxiii-plus.dts
-f:arch/arm/boot/dts/amlogic/meson8m2.dtsi
-f:arch/arm/boot/dts/arm/Makefile
-f:arch/arm/boot/dts/arm/arm-realview-eb-11mp-bbrevd-ctrevb.dts
-f:arch/arm/boot/dts/arm/arm-realview-eb-11mp-bbrevd.dts
-f:arch/arm/boot/dts/arm/arm-realview-eb-11mp-ctrevb.dts
-f:arch/arm/boot/dts/arm/arm-realview-eb-11mp.dts
-f:arch/arm/boot/dts/arm/arm-realview-eb-a9mp-bbrevd.dts
-f:arch/arm/boot/dts/arm/arm-realview-eb-a9mp.dts
-f:arch/arm/boot/dts/arm/arm-realview-eb-bbrevd.dts
-f:arch/arm/boot/dts/arm/arm-realview-eb-bbrevd.dtsi
-f:arch/arm/boot/dts/arm/arm-realview-eb-mp.dtsi
-f:arch/arm/boot/dts/arm/arm-realview-eb.dts
-f:arch/arm/boot/dts/arm/arm-realview-eb.dtsi
-f:arch/arm/boot/dts/arm/arm-realview-pb1176.dts
-f:arch/arm/boot/dts/arm/arm-realview-pb11mp.dts
-f:arch/arm/boot/dts/arm/arm-realview-pba8.dts
-f:arch/arm/boot/dts/arm/arm-realview-pbx-a9.dts
-f:arch/arm/boot/dts/arm/arm-realview-pbx.dtsi
-f:arch/arm/boot/dts/arm/integrator.dtsi
-f:arch/arm/boot/dts/arm/integratorap-im-pd1.dts
-f:arch/arm/boot/dts/arm/integratorap.dts
-f:arch/arm/boot/dts/arm/integratorcp.dts
-f:arch/arm/boot/dts/arm/mps2-an385.dts
-f:arch/arm/boot/dts/arm/mps2-an399.dts
-f:arch/arm/boot/dts/arm/mps2.dtsi
-f:arch/arm/boot/dts/arm/versatile-ab-ib2.dts
-f:arch/arm/boot/dts/arm/versatile-ab.dts
-f:arch/arm/boot/dts/arm/versatile-pb.dts
-f:arch/arm/boot/dts/arm/vexpress-v2m-rs1.dtsi
-f:arch/arm/boot/dts/arm/vexpress-v2m.dtsi
-f:arch/arm/boot/dts/arm/vexpress-v2p-ca15-tc1.dts
-f:arch/arm/boot/dts/arm/vexpress-v2p-ca15_a7.dts
-f:arch/arm/boot/dts/arm/vexpress-v2p-ca5s.dts
-f:arch/arm/boot/dts/arm/vexpress-v2p-ca9.dts
-f:arch/arm/boot/dts/armv7-m.dtsi
-f:arch/arm/boot/dts/aspeed/Makefile
-f:arch/arm/boot/dts/aspeed/aspeed-ast2500-evb.dts
-f:arch/arm/boot/dts/aspeed/aspeed-ast2600-evb-a1.dts
-f:arch/arm/boot/dts/aspeed/aspeed-ast2600-evb.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-amd-daytonax.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-amd-ethanolx.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-ampere-mtjade.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-ampere-mtjefferson.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-ampere-mtmitchell.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-arm-stardragon4800-rep2.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-e3c246d4i.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-e3c256d4i.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-romed8hm3.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-spc621d8hm3.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-asus-x4tf.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-bytedance-g220a.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-delta-ahe50dc.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-bletchley.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-catalina.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-cmm.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-elbert.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-fuji.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-galaxy100.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-greatlakes.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minipack.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-santabarbara.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-tiogapass.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-wedge100.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-wedge40.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-wedge400.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yamp.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemitev2.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-blueridge-4u.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-blueridge.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-bonnell.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-fuji.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-rainier-1s4u.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-rainier-4u.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-rainier.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-sbp1.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-system1.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-inspur-fp5280g2.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-inspur-nf5280m6.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-inspur-on5263m5.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-intel-s2600wf.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-inventec-starscream.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-inventec-transformers.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-lenovo-hr630.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-lenovo-hr855xg2.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-microsoft-olympus.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-nvidia-gb200nvl-bmc.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-opp-lanyang.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-opp-mowgli.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-opp-nicole.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-opp-palmetto.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-opp-romulus.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-opp-tacoma.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-opp-vesnin.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-opp-witherspoon.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-opp-zaius.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-portwell-neptune.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-qcom-dc-scm-v1.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-quanta-q71l.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-quanta-s6q.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-supermicro-x11spi.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-tyan-s7106.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-tyan-s8036.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-ufispace-ncplite.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-vegman-n110.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-vegman-rx20.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-vegman-sx20.dts
-f:arch/arm/boot/dts/aspeed/aspeed-bmc-vegman.dtsi
-f:arch/arm/boot/dts/aspeed/aspeed-g4.dtsi
-f:arch/arm/boot/dts/aspeed/aspeed-g5.dtsi
-f:arch/arm/boot/dts/aspeed/aspeed-g6-pinctrl.dtsi
-f:arch/arm/boot/dts/aspeed/aspeed-g6.dtsi
-f:arch/arm/boot/dts/aspeed/ast2400-facebook-netbmc-common.dtsi
-f:arch/arm/boot/dts/aspeed/ast2500-facebook-netbmc-common.dtsi
-f:arch/arm/boot/dts/aspeed/ast2600-facebook-netbmc-common.dtsi
-f:arch/arm/boot/dts/aspeed/facebook-bmc-flash-layout-128.dtsi
-f:arch/arm/boot/dts/aspeed/facebook-bmc-flash-layout.dtsi
-f:arch/arm/boot/dts/aspeed/ibm-power10-dual.dtsi
-f:arch/arm/boot/dts/aspeed/ibm-power10-quad.dtsi
-f:arch/arm/boot/dts/aspeed/ibm-power11-quad.dtsi
-f:arch/arm/boot/dts/aspeed/ibm-power9-dual.dtsi
-f:arch/arm/boot/dts/aspeed/openbmc-flash-layout-128.dtsi
-f:arch/arm/boot/dts/aspeed/openbmc-flash-layout-64-alt.dtsi
-f:arch/arm/boot/dts/aspeed/openbmc-flash-layout-64.dtsi
-f:arch/arm/boot/dts/aspeed/openbmc-flash-layout.dtsi
-f:arch/arm/boot/dts/axis/Makefile
-f:arch/arm/boot/dts/axis/artpec6-devboard.dts
-f:arch/arm/boot/dts/axis/artpec6.dtsi
-f:arch/arm/boot/dts/broadcom/Makefile
-f:arch/arm/boot/dts/broadcom/bcm-cygnus-clock.dtsi
-f:arch/arm/boot/dts/broadcom/bcm-cygnus.dtsi
-f:arch/arm/boot/dts/broadcom/bcm-hr2.dtsi
-f:arch/arm/boot/dts/broadcom/bcm-ns.dtsi
-f:arch/arm/boot/dts/broadcom/bcm-nsp-ax.dtsi
-f:arch/arm/boot/dts/broadcom/bcm-nsp.dtsi
-f:arch/arm/boot/dts/broadcom/bcm11351.dtsi
-f:arch/arm/boot/dts/broadcom/bcm21664-garnet.dts
-f:arch/arm/boot/dts/broadcom/bcm21664.dtsi
-f:arch/arm/boot/dts/broadcom/bcm2166x-common.dtsi
-f:arch/arm/boot/dts/broadcom/bcm2166x-pinctrl.dtsi
-f:arch/arm/boot/dts/broadcom/bcm23550-sparrow.dts
-f:arch/arm/boot/dts/broadcom/bcm23550.dtsi
-f:arch/arm/boot/dts/broadcom/bcm2711-rpi-4-b.dts
-f:arch/arm/boot/dts/broadcom/bcm2711-rpi-400.dts
-f:arch/arm/boot/dts/broadcom/bcm2711-rpi-cm4-io.dts
-f:arch/arm/boot/dts/broadcom/bcm2711-rpi-cm4.dtsi
-f:arch/arm/boot/dts/broadcom/bcm2711-rpi.dtsi
-f:arch/arm/boot/dts/broadcom/bcm2711.dtsi
-f:arch/arm/boot/dts/broadcom/bcm28155-ap.dts
-f:arch/arm/boot/dts/broadcom/bcm2835-common.dtsi
-f:arch/arm/boot/dts/broadcom/bcm2835-rpi-a-plus.dts
-f:arch/arm/boot/dts/broadcom/bcm2835-rpi-a.dts
-f:arch/arm/boot/dts/broadcom/bcm2835-rpi-b-plus.dts
-f:arch/arm/boot/dts/broadcom/bcm2835-rpi-b-rev2.dts
-f:arch/arm/boot/dts/broadcom/bcm2835-rpi-b.dts
-f:arch/arm/boot/dts/broadcom/bcm2835-rpi-cm1-io1.dts
-f:arch/arm/boot/dts/broadcom/bcm2835-rpi-cm1.dtsi
-f:arch/arm/boot/dts/broadcom/bcm2835-rpi-common.dtsi
-f:arch/arm/boot/dts/broadcom/bcm2835-rpi-zero-w.dts
-f:arch/arm/boot/dts/broadcom/bcm2835-rpi-zero.dts
-f:arch/arm/boot/dts/broadcom/bcm2835-rpi.dtsi
-f:arch/arm/boot/dts/broadcom/bcm2835.dtsi
-f:arch/arm/boot/dts/broadcom/bcm2836-rpi-2-b.dts
-f:arch/arm/boot/dts/broadcom/bcm2836-rpi.dtsi
-f:arch/arm/boot/dts/broadcom/bcm2836.dtsi
-f:arch/arm/boot/dts/broadcom/bcm2837-rpi-2-b.dts
-f:arch/arm/boot/dts/broadcom/bcm2837-rpi-3-a-plus.dts
-f:arch/arm/boot/dts/broadcom/bcm2837-rpi-3-b-plus.dts
-f:arch/arm/boot/dts/broadcom/bcm2837-rpi-3-b.dts
-f:arch/arm/boot/dts/broadcom/bcm2837-rpi-cm3-io3.dts
-f:arch/arm/boot/dts/broadcom/bcm2837-rpi-cm3.dtsi
-f:arch/arm/boot/dts/broadcom/bcm2837-rpi-zero-2-w.dts
-f:arch/arm/boot/dts/broadcom/bcm2837.dtsi
-f:arch/arm/boot/dts/broadcom/bcm283x-rpi-lan7515.dtsi
-f:arch/arm/boot/dts/broadcom/bcm283x-rpi-led-deprecated.dtsi
-f:arch/arm/boot/dts/broadcom/bcm283x-rpi-smsc9512.dtsi
-f:arch/arm/boot/dts/broadcom/bcm283x-rpi-smsc9514.dtsi
-f:arch/arm/boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi
-f:arch/arm/boot/dts/broadcom/bcm283x-rpi-usb-otg.dtsi
-f:arch/arm/boot/dts/broadcom/bcm283x-rpi-usb-peripheral.dtsi
-f:arch/arm/boot/dts/broadcom/bcm283x-rpi-wifi-bt.dtsi
-f:arch/arm/boot/dts/broadcom/bcm283x.dtsi
-f:arch/arm/boot/dts/broadcom/bcm4708-asus-rt-ac56u.dts
-f:arch/arm/boot/dts/broadcom/bcm4708-asus-rt-ac68u.dts
-f:arch/arm/boot/dts/broadcom/bcm4708-buffalo-wzr-1166dhp-common.dtsi
-f:arch/arm/boot/dts/broadcom/bcm4708-buffalo-wzr-1166dhp.dts
-f:arch/arm/boot/dts/broadcom/bcm4708-buffalo-wzr-1166dhp2.dts
-f:arch/arm/boot/dts/broadcom/bcm4708-buffalo-wzr-1750dhp.dts
-f:arch/arm/boot/dts/broadcom/bcm4708-linksys-ea6300-v1.dts
-f:arch/arm/boot/dts/broadcom/bcm4708-linksys-ea6500-v2.dts
-f:arch/arm/boot/dts/broadcom/bcm4708-luxul-xap-1510.dts
-f:arch/arm/boot/dts/broadcom/bcm4708-luxul-xwc-1000.dts
-f:arch/arm/boot/dts/broadcom/bcm4708-netgear-r6250.dts
-f:arch/arm/boot/dts/broadcom/bcm4708-netgear-r6300-v2.dts
-f:arch/arm/boot/dts/broadcom/bcm4708-smartrg-sr400ac.dts
-f:arch/arm/boot/dts/broadcom/bcm4708.dtsi
-f:arch/arm/boot/dts/broadcom/bcm47081-asus-rt-n18u.dts
-f:arch/arm/boot/dts/broadcom/bcm47081-buffalo-wzr-600dhp2.dts
-f:arch/arm/boot/dts/broadcom/bcm47081-buffalo-wzr-900dhp.dts
-f:arch/arm/boot/dts/broadcom/bcm47081-luxul-xap-1410.dts
-f:arch/arm/boot/dts/broadcom/bcm47081-luxul-xwr-1200.dts
-f:arch/arm/boot/dts/broadcom/bcm47081-tplink-archer-c5-v2.dts
-f:arch/arm/boot/dts/broadcom/bcm47081.dtsi
-f:arch/arm/boot/dts/broadcom/bcm4709-asus-rt-ac3200.dts
-f:arch/arm/boot/dts/broadcom/bcm4709-asus-rt-ac87u.dts
-f:arch/arm/boot/dts/broadcom/bcm4709-buffalo-wxr-1900dhp.dts
-f:arch/arm/boot/dts/broadcom/bcm4709-linksys-ea9200.dts
-f:arch/arm/boot/dts/broadcom/bcm4709-netgear-r7000.dts
-f:arch/arm/boot/dts/broadcom/bcm4709-netgear-r8000.dts
-f:arch/arm/boot/dts/broadcom/bcm4709-tplink-archer-c9-v1.dts
-f:arch/arm/boot/dts/broadcom/bcm4709.dtsi
-f:arch/arm/boot/dts/broadcom/bcm47094-asus-rt-ac3100.dts
-f:arch/arm/boot/dts/broadcom/bcm47094-asus-rt-ac3100.dtsi
-f:arch/arm/boot/dts/broadcom/bcm47094-asus-rt-ac5300.dts
-f:arch/arm/boot/dts/broadcom/bcm47094-asus-rt-ac88u.dts
-f:arch/arm/boot/dts/broadcom/bcm47094-dlink-dir-885l.dts
-f:arch/arm/boot/dts/broadcom/bcm47094-dlink-dir-890l.dts
-f:arch/arm/boot/dts/broadcom/bcm47094-linksys-panamera.dts
-f:arch/arm/boot/dts/broadcom/bcm47094-luxul-abr-4500.dts
-f:arch/arm/boot/dts/broadcom/bcm47094-luxul-xap-1610.dts
-f:arch/arm/boot/dts/broadcom/bcm47094-luxul-xbr-4500.dts
-f:arch/arm/boot/dts/broadcom/bcm47094-luxul-xwc-2000.dts
-f:arch/arm/boot/dts/broadcom/bcm47094-luxul-xwr-3100.dts
-f:arch/arm/boot/dts/broadcom/bcm47094-luxul-xwr-3150-v1.dts
-f:arch/arm/boot/dts/broadcom/bcm47094-netgear-r8500.dts
-f:arch/arm/boot/dts/broadcom/bcm47094-phicomm-k3.dts
-f:arch/arm/boot/dts/broadcom/bcm47094.dtsi
-f:arch/arm/boot/dts/broadcom/bcm47189-luxul-xap-1440.dts
-f:arch/arm/boot/dts/broadcom/bcm47189-luxul-xap-810.dts
-f:arch/arm/boot/dts/broadcom/bcm47189-tenda-ac9.dts
-f:arch/arm/boot/dts/broadcom/bcm47622.dtsi
-f:arch/arm/boot/dts/broadcom/bcm53015-meraki-mr26.dts
-f:arch/arm/boot/dts/broadcom/bcm53016-dlink-dwl-8610ap.dts
-f:arch/arm/boot/dts/broadcom/bcm53016-meraki-mr32.dts
-f:arch/arm/boot/dts/broadcom/bcm5301x-nand-cs0-bch1.dtsi
-f:arch/arm/boot/dts/broadcom/bcm5301x-nand-cs0-bch4.dtsi
-f:arch/arm/boot/dts/broadcom/bcm5301x-nand-cs0-bch8.dtsi
-f:arch/arm/boot/dts/broadcom/bcm5301x-nand-cs0.dtsi
-f:arch/arm/boot/dts/broadcom/bcm5301x.dtsi
-f:arch/arm/boot/dts/broadcom/bcm53340-ubnt-unifi-switch8.dts
-f:arch/arm/boot/dts/broadcom/bcm53573.dtsi
-f:arch/arm/boot/dts/broadcom/bcm63138.dtsi
-f:arch/arm/boot/dts/broadcom/bcm63148.dtsi
-f:arch/arm/boot/dts/broadcom/bcm63178.dtsi
-f:arch/arm/boot/dts/broadcom/bcm6756.dtsi
-f:arch/arm/boot/dts/broadcom/bcm6846-genexis-xg6846b.dts
-f:arch/arm/boot/dts/broadcom/bcm6846.dtsi
-f:arch/arm/boot/dts/broadcom/bcm6855.dtsi
-f:arch/arm/boot/dts/broadcom/bcm6878.dtsi
-f:arch/arm/boot/dts/broadcom/bcm7445-bcm97445svmb.dts
-f:arch/arm/boot/dts/broadcom/bcm7445.dtsi
-f:arch/arm/boot/dts/broadcom/bcm911360_entphn.dts
-f:arch/arm/boot/dts/broadcom/bcm911360k.dts
-f:arch/arm/boot/dts/broadcom/bcm94708.dts
-f:arch/arm/boot/dts/broadcom/bcm94709.dts
-f:arch/arm/boot/dts/broadcom/bcm947189acdbmr.dts
-f:arch/arm/boot/dts/broadcom/bcm947622.dts
-f:arch/arm/boot/dts/broadcom/bcm953012er.dts
-f:arch/arm/boot/dts/broadcom/bcm953012hr.dts
-f:arch/arm/boot/dts/broadcom/bcm953012k.dts
-f:arch/arm/boot/dts/broadcom/bcm958300k.dts
-f:arch/arm/boot/dts/broadcom/bcm958305k.dts
-f:arch/arm/boot/dts/broadcom/bcm958522er.dts
-f:arch/arm/boot/dts/broadcom/bcm958525er.dts
-f:arch/arm/boot/dts/broadcom/bcm958525xmc.dts
-f:arch/arm/boot/dts/broadcom/bcm958622hr.dts
-f:arch/arm/boot/dts/broadcom/bcm958623hr.dts
-f:arch/arm/boot/dts/broadcom/bcm958625-meraki-alamo.dtsi
-f:arch/arm/boot/dts/broadcom/bcm958625-meraki-kingpin.dtsi
-f:arch/arm/boot/dts/broadcom/bcm958625-meraki-mx64-a0.dts
-f:arch/arm/boot/dts/broadcom/bcm958625-meraki-mx64.dts
-f:arch/arm/boot/dts/broadcom/bcm958625-meraki-mx64w-a0.dts
-f:arch/arm/boot/dts/broadcom/bcm958625-meraki-mx64w.dts
-f:arch/arm/boot/dts/broadcom/bcm958625-meraki-mx65.dts
-f:arch/arm/boot/dts/broadcom/bcm958625-meraki-mx65w.dts
-f:arch/arm/boot/dts/broadcom/bcm958625-meraki-mx6x-common.dtsi
-f:arch/arm/boot/dts/broadcom/bcm958625hr.dts
-f:arch/arm/boot/dts/broadcom/bcm958625k.dts
-f:arch/arm/boot/dts/broadcom/bcm963138.dts
-f:arch/arm/boot/dts/broadcom/bcm963138dvt.dts
-f:arch/arm/boot/dts/broadcom/bcm963148.dts
-f:arch/arm/boot/dts/broadcom/bcm963178.dts
-f:arch/arm/boot/dts/broadcom/bcm96756.dts
-f:arch/arm/boot/dts/broadcom/bcm96846.dts
-f:arch/arm/boot/dts/broadcom/bcm96855.dts
-f:arch/arm/boot/dts/broadcom/bcm96878.dts
-f:arch/arm/boot/dts/broadcom/bcm988312hr.dts
-f:arch/arm/boot/dts/broadcom/bcm9hmidc.dtsi
-f:arch/arm/boot/dts/calxeda/Makefile
-f:arch/arm/boot/dts/calxeda/ecx-2000.dts
-f:arch/arm/boot/dts/calxeda/ecx-common.dtsi
-f:arch/arm/boot/dts/calxeda/highbank.dts
-f:arch/arm/boot/dts/cirrus/Makefile
-f:arch/arm/boot/dts/cirrus/ep7209.dtsi
-f:arch/arm/boot/dts/cirrus/ep7211-edb7211.dts
-f:arch/arm/boot/dts/cirrus/ep7211.dtsi
-f:arch/arm/boot/dts/cirrus/ep93xx-bk3.dts
-f:arch/arm/boot/dts/cirrus/ep93xx-edb9302.dts
-f:arch/arm/boot/dts/cirrus/ep93xx-ts7250.dts
-f:arch/arm/boot/dts/cirrus/ep93xx.dtsi
-f:arch/arm/boot/dts/cnxt/Makefile
-f:arch/arm/boot/dts/cnxt/cx92755.dtsi
-f:arch/arm/boot/dts/cnxt/cx92755_equinox.dts
-f:arch/arm/boot/dts/cros-adc-thermistors.dtsi
-f:arch/arm/boot/dts/cros-ec-keyboard.dtsi
-f:arch/arm/boot/dts/cros-ec-sbs.dtsi
-f:arch/arm/boot/dts/gemini/Makefile
-f:arch/arm/boot/dts/gemini/gemini-dlink-dir-685.dts
-f:arch/arm/boot/dts/gemini/gemini-dlink-dns-313.dts
-f:arch/arm/boot/dts/gemini/gemini-nas4220b.dts
-f:arch/arm/boot/dts/gemini/gemini-ns2502.dts
-f:arch/arm/boot/dts/gemini/gemini-rut1xx.dts
-f:arch/arm/boot/dts/gemini/gemini-sl93512r.dts
-f:arch/arm/boot/dts/gemini/gemini-sq201.dts
-f:arch/arm/boot/dts/gemini/gemini-ssi1328.dts
-f:arch/arm/boot/dts/gemini/gemini-wbd111.dts
-f:arch/arm/boot/dts/gemini/gemini-wbd222.dts
-f:arch/arm/boot/dts/gemini/gemini.dtsi
-f:arch/arm/boot/dts/hisilicon/Makefile
-f:arch/arm/boot/dts/hisilicon/hi3519-demb.dts
-f:arch/arm/boot/dts/hisilicon/hi3519.dtsi
-f:arch/arm/boot/dts/hisilicon/hi3620-hi4511.dts
-f:arch/arm/boot/dts/hisilicon/hi3620.dtsi
-f:arch/arm/boot/dts/hisilicon/hip01-ca9x2.dts
-f:arch/arm/boot/dts/hisilicon/hip01.dtsi
-f:arch/arm/boot/dts/hisilicon/hip04-d01.dts
-f:arch/arm/boot/dts/hisilicon/hip04.dtsi
-f:arch/arm/boot/dts/hisilicon/hisi-x5hd2-dkb.dts
-f:arch/arm/boot/dts/hisilicon/hisi-x5hd2.dtsi
-f:arch/arm/boot/dts/hisilicon/sd5203.dts
-f:arch/arm/boot/dts/hpe/Makefile
-f:arch/arm/boot/dts/hpe/hpe-bmc-dl360gen10.dts
-f:arch/arm/boot/dts/hpe/hpe-gxp.dtsi
-f:arch/arm/boot/dts/intel/Makefile
-f:arch/arm/boot/dts/intel/axm/Makefile
-f:arch/arm/boot/dts/intel/axm/axm5516-amarillo.dts
-f:arch/arm/boot/dts/intel/axm/axm5516-cpus.dtsi
-f:arch/arm/boot/dts/intel/axm/axm55xx.dtsi
-f:arch/arm/boot/dts/intel/ixp/Makefile
-f:arch/arm/boot/dts/intel/ixp/intel-ixp42x-adi-coyote.dts
-f:arch/arm/boot/dts/intel/ixp/intel-ixp42x-arcom-vulcan.dts
-f:arch/arm/boot/dts/intel/ixp/intel-ixp42x-dlink-dsm-g600.dts
-f:arch/arm/boot/dts/intel/ixp/intel-ixp42x-freecom-fsg-3.dts
-f:arch/arm/boot/dts/intel/ixp/intel-ixp42x-gateway-7001.dts
-f:arch/arm/boot/dts/intel/ixp/intel-ixp42x-gateworks-gw2348.dts
-f:arch/arm/boot/dts/intel/ixp/intel-ixp42x-goramo-multilink.dts
-f:arch/arm/boot/dts/intel/ixp/intel-ixp42x-iomega-nas100d.dts
-f:arch/arm/boot/dts/intel/ixp/intel-ixp42x-ixdp425.dts
-f:arch/arm/boot/dts/intel/ixp/intel-ixp42x-ixdpg425.dts
-f:arch/arm/boot/dts/intel/ixp/intel-ixp42x-linksys-nslu2.dts
-f:arch/arm/boot/dts/intel/ixp/intel-ixp42x-linksys-wrv54g.dts
-f:arch/arm/boot/dts/intel/ixp/intel-ixp42x-netgear-wg302v1.dts
-f:arch/arm/boot/dts/intel/ixp/intel-ixp42x-usrobotics-usr8200.dts
-f:arch/arm/boot/dts/intel/ixp/intel-ixp42x-welltech-epbx100.dts
-f:arch/arm/boot/dts/intel/ixp/intel-ixp42x.dtsi
-f:arch/arm/boot/dts/intel/ixp/intel-ixp43x-gateworks-gw2358.dts
-f:arch/arm/boot/dts/intel/ixp/intel-ixp43x-kixrp435.dts
-f:arch/arm/boot/dts/intel/ixp/intel-ixp43x.dtsi
-f:arch/arm/boot/dts/intel/ixp/intel-ixp45x-ixp46x.dtsi
-f:arch/arm/boot/dts/intel/ixp/intel-ixp46x-ixdp465.dts
-f:arch/arm/boot/dts/intel/ixp/intel-ixp4xx-reference-design.dtsi
-f:arch/arm/boot/dts/intel/ixp/intel-ixp4xx.dtsi
-f:arch/arm/boot/dts/intel/pxa/Makefile
-f:arch/arm/boot/dts/intel/pxa/pxa25x.dtsi
-f:arch/arm/boot/dts/intel/pxa/pxa27x.dtsi
-f:arch/arm/boot/dts/intel/pxa/pxa2xx.dtsi
-f:arch/arm/boot/dts/intel/pxa/pxa300-raumfeld-common.dtsi
-f:arch/arm/boot/dts/intel/pxa/pxa300-raumfeld-connector.dts
-f:arch/arm/boot/dts/intel/pxa/pxa300-raumfeld-controller.dts
-f:arch/arm/boot/dts/intel/pxa/pxa300-raumfeld-speaker-l.dts
-f:arch/arm/boot/dts/intel/pxa/pxa300-raumfeld-speaker-m.dts
-f:arch/arm/boot/dts/intel/pxa/pxa300-raumfeld-speaker-one.dts
-f:arch/arm/boot/dts/intel/pxa/pxa300-raumfeld-speaker-s.dts
-f:arch/arm/boot/dts/intel/pxa/pxa300-raumfeld-tuneable-clock.dtsi
-f:arch/arm/boot/dts/intel/pxa/pxa3xx.dtsi
-f:arch/arm/boot/dts/intel/socfpga/Makefile
-f:arch/arm/boot/dts/intel/socfpga/socfpga.dtsi
-f:arch/arm/boot/dts/intel/socfpga/socfpga_arria10.dtsi
-f:arch/arm/boot/dts/intel/socfpga/socfpga_arria10_chameleonv3.dts
-f:arch/arm/boot/dts/intel/socfpga/socfpga_arria10_mercury_aa1.dtsi
-f:arch/arm/boot/dts/intel/socfpga/socfpga_arria10_mercury_pe1.dts
-f:arch/arm/boot/dts/intel/socfpga/socfpga_arria10_socdk.dtsi
-f:arch/arm/boot/dts/intel/socfpga/socfpga_arria10_socdk_nand.dts
-f:arch/arm/boot/dts/intel/socfpga/socfpga_arria10_socdk_qspi.dts
-f:arch/arm/boot/dts/intel/socfpga/socfpga_arria10_socdk_sdmmc.dts
-f:arch/arm/boot/dts/intel/socfpga/socfpga_arria5.dtsi
-f:arch/arm/boot/dts/intel/socfpga/socfpga_arria5_socdk.dts
-f:arch/arm/boot/dts/intel/socfpga/socfpga_cyclone5.dtsi
-f:arch/arm/boot/dts/intel/socfpga/socfpga_cyclone5_chameleon96.dts
-f:arch/arm/boot/dts/intel/socfpga/socfpga_cyclone5_de0_nano_soc.dts
-f:arch/arm/boot/dts/intel/socfpga/socfpga_cyclone5_de10nano.dts
-f:arch/arm/boot/dts/intel/socfpga/socfpga_cyclone5_mcv.dtsi
-f:arch/arm/boot/dts/intel/socfpga/socfpga_cyclone5_mcvevk.dts
-f:arch/arm/boot/dts/intel/socfpga/socfpga_cyclone5_socdk.dts
-f:arch/arm/boot/dts/intel/socfpga/socfpga_cyclone5_sockit.dts
-f:arch/arm/boot/dts/intel/socfpga/socfpga_cyclone5_socrates.dts
-f:arch/arm/boot/dts/intel/socfpga/socfpga_cyclone5_sodia.dts
-f:arch/arm/boot/dts/intel/socfpga/socfpga_cyclone5_vining_fpga.dts
-f:arch/arm/boot/dts/intel/socfpga/socfpga_vt.dts
-f:arch/arm/boot/dts/marvell/Makefile
-f:arch/arm/boot/dts/marvell/armada-370-c200-v2.dts
-f:arch/arm/boot/dts/marvell/armada-370-db.dts
-f:arch/arm/boot/dts/marvell/armada-370-dlink-dns327l.dts
-f:arch/arm/boot/dts/marvell/armada-370-mirabox.dts
-f:arch/arm/boot/dts/marvell/armada-370-netgear-rn102.dts
-f:arch/arm/boot/dts/marvell/armada-370-netgear-rn104.dts
-f:arch/arm/boot/dts/marvell/armada-370-rd.dts
-f:arch/arm/boot/dts/marvell/armada-370-seagate-nas-2bay.dts
-f:arch/arm/boot/dts/marvell/armada-370-seagate-nas-4bay.dts
-f:arch/arm/boot/dts/marvell/armada-370-seagate-nas-xbay.dtsi
-f:arch/arm/boot/dts/marvell/armada-370-seagate-personal-cloud-2bay.dts
-f:arch/arm/boot/dts/marvell/armada-370-seagate-personal-cloud.dts
-f:arch/arm/boot/dts/marvell/armada-370-seagate-personal-cloud.dtsi
-f:arch/arm/boot/dts/marvell/armada-370-synology-ds213j.dts
-f:arch/arm/boot/dts/marvell/armada-370-xp.dtsi
-f:arch/arm/boot/dts/marvell/armada-370.dtsi
-f:arch/arm/boot/dts/marvell/armada-375-db.dts
-f:arch/arm/boot/dts/marvell/armada-375.dtsi
-f:arch/arm/boot/dts/marvell/armada-380.dtsi
-f:arch/arm/boot/dts/marvell/armada-381-netgear-gs110emx.dts
-f:arch/arm/boot/dts/marvell/armada-382-rd-ac3x-48g4x2xl.dts
-f:arch/arm/boot/dts/marvell/armada-385-atl-x530.dts
-f:arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-l8.dts
-f:arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-s4.dts
-f:arch/arm/boot/dts/marvell/armada-385-clearfog-gtr.dtsi
-f:arch/arm/boot/dts/marvell/armada-385-db-88f6820-amc.dts
-f:arch/arm/boot/dts/marvell/armada-385-db-ap.dts
-f:arch/arm/boot/dts/marvell/armada-385-linksys-caiman.dts
-f:arch/arm/boot/dts/marvell/armada-385-linksys-cobra.dts
-f:arch/arm/boot/dts/marvell/armada-385-linksys-rango.dts
-f:arch/arm/boot/dts/marvell/armada-385-linksys-shelby.dts
-f:arch/arm/boot/dts/marvell/armada-385-linksys.dtsi
-f:arch/arm/boot/dts/marvell/armada-385-synology-ds116.dts
-f:arch/arm/boot/dts/marvell/armada-385-turris-omnia.dts
-f:arch/arm/boot/dts/marvell/armada-385.dtsi
-f:arch/arm/boot/dts/marvell/armada-388-clearfog-base.dts
-f:arch/arm/boot/dts/marvell/armada-388-clearfog-pro.dts
-f:arch/arm/boot/dts/marvell/armada-388-clearfog.dts
-f:arch/arm/boot/dts/marvell/armada-388-clearfog.dtsi
-f:arch/arm/boot/dts/marvell/armada-388-db.dts
-f:arch/arm/boot/dts/marvell/armada-388-gp.dts
-f:arch/arm/boot/dts/marvell/armada-388-helios4.dts
-f:arch/arm/boot/dts/marvell/armada-388-rd.dts
-f:arch/arm/boot/dts/marvell/armada-388.dtsi
-f:arch/arm/boot/dts/marvell/armada-38x-solidrun-microsom.dtsi
-f:arch/arm/boot/dts/marvell/armada-38x.dtsi
-f:arch/arm/boot/dts/marvell/armada-390-db.dts
-f:arch/arm/boot/dts/marvell/armada-390.dtsi
-f:arch/arm/boot/dts/marvell/armada-395-gp.dts
-f:arch/arm/boot/dts/marvell/armada-395.dtsi
-f:arch/arm/boot/dts/marvell/armada-398-db.dts
-f:arch/arm/boot/dts/marvell/armada-398.dtsi
-f:arch/arm/boot/dts/marvell/armada-39x.dtsi
-f:arch/arm/boot/dts/marvell/armada-xp-98dx3236.dtsi
-f:arch/arm/boot/dts/marvell/armada-xp-98dx3336.dtsi
-f:arch/arm/boot/dts/marvell/armada-xp-98dx4251.dtsi
-f:arch/arm/boot/dts/marvell/armada-xp-axpwifiap.dts
-f:arch/arm/boot/dts/marvell/armada-xp-crs305-1g-4s-bit.dts
-f:arch/arm/boot/dts/marvell/armada-xp-crs305-1g-4s.dts
-f:arch/arm/boot/dts/marvell/armada-xp-crs305-1g-4s.dtsi
-f:arch/arm/boot/dts/marvell/armada-xp-crs326-24g-2s-bit.dts
-f:arch/arm/boot/dts/marvell/armada-xp-crs326-24g-2s.dts
-f:arch/arm/boot/dts/marvell/armada-xp-crs326-24g-2s.dtsi
-f:arch/arm/boot/dts/marvell/armada-xp-crs328-4c-20s-4s-bit.dts
-f:arch/arm/boot/dts/marvell/armada-xp-crs328-4c-20s-4s.dts
-f:arch/arm/boot/dts/marvell/armada-xp-crs328-4c-20s-4s.dtsi
-f:arch/arm/boot/dts/marvell/armada-xp-db-dxbc2.dts
-f:arch/arm/boot/dts/marvell/armada-xp-db-xc3-24g4xg.dts
-f:arch/arm/boot/dts/marvell/armada-xp-db.dts
-f:arch/arm/boot/dts/marvell/armada-xp-gp.dts
-f:arch/arm/boot/dts/marvell/armada-xp-lenovo-ix4-300d.dts
-f:arch/arm/boot/dts/marvell/armada-xp-linksys-mamba.dts
-f:arch/arm/boot/dts/marvell/armada-xp-matrix.dts
-f:arch/arm/boot/dts/marvell/armada-xp-mv78230.dtsi
-f:arch/arm/boot/dts/marvell/armada-xp-mv78260.dtsi
-f:arch/arm/boot/dts/marvell/armada-xp-mv78460.dtsi
-f:arch/arm/boot/dts/marvell/armada-xp-netgear-rn2120.dts
-f:arch/arm/boot/dts/marvell/armada-xp-openblocks-ax3-4.dts
-f:arch/arm/boot/dts/marvell/armada-xp-synology-ds414.dts
-f:arch/arm/boot/dts/marvell/armada-xp.dtsi
-f:arch/arm/boot/dts/marvell/dove-cm-a510.dtsi
-f:arch/arm/boot/dts/marvell/dove-cubox-es.dts
-f:arch/arm/boot/dts/marvell/dove-cubox.dts
-f:arch/arm/boot/dts/marvell/dove-d2plug.dts
-f:arch/arm/boot/dts/marvell/dove-d3plug.dts
-f:arch/arm/boot/dts/marvell/dove-dove-db.dts
-f:arch/arm/boot/dts/marvell/dove-sbc-a510.dts
-f:arch/arm/boot/dts/marvell/dove.dtsi
-f:arch/arm/boot/dts/marvell/kirkwood-4i-edge-200.dts
-f:arch/arm/boot/dts/marvell/kirkwood-6192.dtsi
-f:arch/arm/boot/dts/marvell/kirkwood-6281.dtsi
-f:arch/arm/boot/dts/marvell/kirkwood-6282.dtsi
-f:arch/arm/boot/dts/marvell/kirkwood-98dx4122.dtsi
-f:arch/arm/boot/dts/marvell/kirkwood-b3.dts
-f:arch/arm/boot/dts/marvell/kirkwood-blackarmor-nas220.dts
-f:arch/arm/boot/dts/marvell/kirkwood-c200-v1.dts
-f:arch/arm/boot/dts/marvell/kirkwood-cloudbox.dts
-f:arch/arm/boot/dts/marvell/kirkwood-d2net.dts
-f:arch/arm/boot/dts/marvell/kirkwood-db-88f6281.dts
-f:arch/arm/boot/dts/marvell/kirkwood-db-88f6282.dts
-f:arch/arm/boot/dts/marvell/kirkwood-db.dtsi
-f:arch/arm/boot/dts/marvell/kirkwood-dir665.dts
-f:arch/arm/boot/dts/marvell/kirkwood-dns320.dts
-f:arch/arm/boot/dts/marvell/kirkwood-dns325.dts
-f:arch/arm/boot/dts/marvell/kirkwood-dnskw.dtsi
-f:arch/arm/boot/dts/marvell/kirkwood-dockstar.dts
-f:arch/arm/boot/dts/marvell/kirkwood-dreamplug.dts
-f:arch/arm/boot/dts/marvell/kirkwood-ds109.dts
-f:arch/arm/boot/dts/marvell/kirkwood-ds110jv10.dts
-f:arch/arm/boot/dts/marvell/kirkwood-ds111.dts
-f:arch/arm/boot/dts/marvell/kirkwood-ds112.dts
-f:arch/arm/boot/dts/marvell/kirkwood-ds209.dts
-f:arch/arm/boot/dts/marvell/kirkwood-ds210.dts
-f:arch/arm/boot/dts/marvell/kirkwood-ds212.dts
-f:arch/arm/boot/dts/marvell/kirkwood-ds212j.dts
-f:arch/arm/boot/dts/marvell/kirkwood-ds409.dts
-f:arch/arm/boot/dts/marvell/kirkwood-ds409slim.dts
-f:arch/arm/boot/dts/marvell/kirkwood-ds411.dts
-f:arch/arm/boot/dts/marvell/kirkwood-ds411j.dts
-f:arch/arm/boot/dts/marvell/kirkwood-ds411slim.dts
-f:arch/arm/boot/dts/marvell/kirkwood-goflexnet.dts
-f:arch/arm/boot/dts/marvell/kirkwood-guruplug-server-plus.dts
-f:arch/arm/boot/dts/marvell/kirkwood-ib62x0.dts
-f:arch/arm/boot/dts/marvell/kirkwood-iconnect.dts
-f:arch/arm/boot/dts/marvell/kirkwood-iomega_ix2_200.dts
-f:arch/arm/boot/dts/marvell/kirkwood-is2.dts
-f:arch/arm/boot/dts/marvell/kirkwood-km_common.dtsi
-f:arch/arm/boot/dts/marvell/kirkwood-km_fixedeth.dts
-f:arch/arm/boot/dts/marvell/kirkwood-km_kirkwood.dts
-f:arch/arm/boot/dts/marvell/kirkwood-l-50.dts
-f:arch/arm/boot/dts/marvell/kirkwood-laplug.dts
-f:arch/arm/boot/dts/marvell/kirkwood-linkstation-6282.dtsi
-f:arch/arm/boot/dts/marvell/kirkwood-linkstation-duo-6281.dtsi
-f:arch/arm/boot/dts/marvell/kirkwood-linkstation-lsqvl.dts
-f:arch/arm/boot/dts/marvell/kirkwood-linkstation-lsvl.dts
-f:arch/arm/boot/dts/marvell/kirkwood-linkstation-lswsxl.dts
-f:arch/arm/boot/dts/marvell/kirkwood-linkstation-lswvl.dts
-f:arch/arm/boot/dts/marvell/kirkwood-linkstation-lswxl.dts
-f:arch/arm/boot/dts/marvell/kirkwood-linkstation.dtsi
-f:arch/arm/boot/dts/marvell/kirkwood-linksys-viper.dts
-f:arch/arm/boot/dts/marvell/kirkwood-lschlv2.dts
-f:arch/arm/boot/dts/marvell/kirkwood-lsxhl.dts
-f:arch/arm/boot/dts/marvell/kirkwood-lsxl.dtsi
-f:arch/arm/boot/dts/marvell/kirkwood-mplcec4.dts
-f:arch/arm/boot/dts/marvell/kirkwood-mv88f6281gtw-ge.dts
-f:arch/arm/boot/dts/marvell/kirkwood-nas2big.dts
-f:arch/arm/boot/dts/marvell/kirkwood-net2big.dts
-f:arch/arm/boot/dts/marvell/kirkwood-net5big.dts
-f:arch/arm/boot/dts/marvell/kirkwood-netgear_readynas_duo_v2.dts
-f:arch/arm/boot/dts/marvell/kirkwood-netgear_readynas_nv+_v2.dts
-f:arch/arm/boot/dts/marvell/kirkwood-netxbig.dtsi
-f:arch/arm/boot/dts/marvell/kirkwood-ns2-common.dtsi
-f:arch/arm/boot/dts/marvell/kirkwood-ns2.dts
-f:arch/arm/boot/dts/marvell/kirkwood-ns2lite.dts
-f:arch/arm/boot/dts/marvell/kirkwood-ns2max.dts
-f:arch/arm/boot/dts/marvell/kirkwood-ns2mini.dts
-f:arch/arm/boot/dts/marvell/kirkwood-nsa310.dts
-f:arch/arm/boot/dts/marvell/kirkwood-nsa310a.dts
-f:arch/arm/boot/dts/marvell/kirkwood-nsa310s.dts
-f:arch/arm/boot/dts/marvell/kirkwood-nsa320.dts
-f:arch/arm/boot/dts/marvell/kirkwood-nsa325.dts
-f:arch/arm/boot/dts/marvell/kirkwood-nsa3x0-common.dtsi
-f:arch/arm/boot/dts/marvell/kirkwood-openblocks_a6.dts
-f:arch/arm/boot/dts/marvell/kirkwood-openblocks_a7.dts
-f:arch/arm/boot/dts/marvell/kirkwood-openrd-base.dts
-f:arch/arm/boot/dts/marvell/kirkwood-openrd-client.dts
-f:arch/arm/boot/dts/marvell/kirkwood-openrd-ultimate.dts
-f:arch/arm/boot/dts/marvell/kirkwood-openrd.dtsi
-f:arch/arm/boot/dts/marvell/kirkwood-pogo_e02.dts
-f:arch/arm/boot/dts/marvell/kirkwood-pogoplug-series-4.dts
-f:arch/arm/boot/dts/marvell/kirkwood-rd88f6192.dts
-f:arch/arm/boot/dts/marvell/kirkwood-rd88f6281-a.dts
-f:arch/arm/boot/dts/marvell/kirkwood-rd88f6281-z0.dts
-f:arch/arm/boot/dts/marvell/kirkwood-rd88f6281.dtsi
-f:arch/arm/boot/dts/marvell/kirkwood-rs212.dts
-f:arch/arm/boot/dts/marvell/kirkwood-rs409.dts
-f:arch/arm/boot/dts/marvell/kirkwood-rs411.dts
-f:arch/arm/boot/dts/marvell/kirkwood-sheevaplug-common.dtsi
-f:arch/arm/boot/dts/marvell/kirkwood-sheevaplug-esata.dts
-f:arch/arm/boot/dts/marvell/kirkwood-sheevaplug.dts
-f:arch/arm/boot/dts/marvell/kirkwood-synology.dtsi
-f:arch/arm/boot/dts/marvell/kirkwood-t5325.dts
-f:arch/arm/boot/dts/marvell/kirkwood-topkick.dts
-f:arch/arm/boot/dts/marvell/kirkwood-ts219-6281.dts
-f:arch/arm/boot/dts/marvell/kirkwood-ts219-6282.dts
-f:arch/arm/boot/dts/marvell/kirkwood-ts219.dtsi
-f:arch/arm/boot/dts/marvell/kirkwood-ts419-6281.dts
-f:arch/arm/boot/dts/marvell/kirkwood-ts419-6282.dts
-f:arch/arm/boot/dts/marvell/kirkwood-ts419.dtsi
-f:arch/arm/boot/dts/marvell/kirkwood.dtsi
-f:arch/arm/boot/dts/marvell/mmp2-brownstone.dts
-f:arch/arm/boot/dts/marvell/mmp2-olpc-xo-1-75.dts
-f:arch/arm/boot/dts/marvell/mmp2.dtsi
-f:arch/arm/boot/dts/marvell/mmp3-dell-ariel.dts
-f:arch/arm/boot/dts/marvell/mmp3.dtsi
-f:arch/arm/boot/dts/marvell/mvebu-linkstation-fan.dtsi
-f:arch/arm/boot/dts/marvell/mvebu-linkstation-gpio-simple.dtsi
-f:arch/arm/boot/dts/marvell/orion5x-kuroboxpro.dts
-f:arch/arm/boot/dts/marvell/orion5x-lacie-d2-network.dts
-f:arch/arm/boot/dts/marvell/orion5x-lacie-ethernet-disk-mini-v2.dts
-f:arch/arm/boot/dts/marvell/orion5x-linkstation-lschl.dts
-f:arch/arm/boot/dts/marvell/orion5x-linkstation-lsgl.dts
-f:arch/arm/boot/dts/marvell/orion5x-linkstation-lswtgl.dts
-f:arch/arm/boot/dts/marvell/orion5x-linkstation.dtsi
-f:arch/arm/boot/dts/marvell/orion5x-lswsgl.dts
-f:arch/arm/boot/dts/marvell/orion5x-maxtor-shared-storage-2.dts
-f:arch/arm/boot/dts/marvell/orion5x-mv88f5181.dtsi
-f:arch/arm/boot/dts/marvell/orion5x-mv88f5182.dtsi
-f:arch/arm/boot/dts/marvell/orion5x-netgear-wnr854t.dts
-f:arch/arm/boot/dts/marvell/orion5x-rd88f5182-nas.dts
-f:arch/arm/boot/dts/marvell/orion5x.dtsi
-f:arch/arm/boot/dts/marvell/pxa168-aspenite.dts
-f:arch/arm/boot/dts/marvell/pxa168.dtsi
-f:arch/arm/boot/dts/marvell/pxa910-dkb.dts
-f:arch/arm/boot/dts/marvell/pxa910.dtsi
-f:arch/arm/boot/dts/mediatek/Makefile
-f:arch/arm/boot/dts/mediatek/mt2701-evb.dts
-f:arch/arm/boot/dts/mediatek/mt2701-pinfunc.h
-f:arch/arm/boot/dts/mediatek/mt2701.dtsi
-f:arch/arm/boot/dts/mediatek/mt6323.dtsi
-f:arch/arm/boot/dts/mediatek/mt6572-jty-d101.dts
-f:arch/arm/boot/dts/mediatek/mt6572-lenovo-a369i.dts
-f:arch/arm/boot/dts/mediatek/mt6572.dtsi
-f:arch/arm/boot/dts/mediatek/mt6580-evbp1.dts
-f:arch/arm/boot/dts/mediatek/mt6580.dtsi
-f:arch/arm/boot/dts/mediatek/mt6582-prestigio-pmt5008-3g.dts
-f:arch/arm/boot/dts/mediatek/mt6582.dtsi
-f:arch/arm/boot/dts/mediatek/mt6589-aquaris5.dts
-f:arch/arm/boot/dts/mediatek/mt6589-fairphone-fp1.dts
-f:arch/arm/boot/dts/mediatek/mt6589.dtsi
-f:arch/arm/boot/dts/mediatek/mt6592-evb.dts
-f:arch/arm/boot/dts/mediatek/mt6592.dtsi
-f:arch/arm/boot/dts/mediatek/mt7623.dtsi
-f:arch/arm/boot/dts/mediatek/mt7623a-rfb-emmc.dts
-f:arch/arm/boot/dts/mediatek/mt7623a-rfb-nand.dts
-f:arch/arm/boot/dts/mediatek/mt7623a.dtsi
-f:arch/arm/boot/dts/mediatek/mt7623n-bananapi-bpi-r2.dts
-f:arch/arm/boot/dts/mediatek/mt7623n-rfb-emmc.dts
-f:arch/arm/boot/dts/mediatek/mt7623n.dtsi
-f:arch/arm/boot/dts/mediatek/mt7629-rfb.dts
-f:arch/arm/boot/dts/mediatek/mt7629.dtsi
-f:arch/arm/boot/dts/mediatek/mt8127-moose.dts
-f:arch/arm/boot/dts/mediatek/mt8127.dtsi
-f:arch/arm/boot/dts/mediatek/mt8135-evbp1.dts
-f:arch/arm/boot/dts/mediatek/mt8135.dtsi
-f:arch/arm/boot/dts/microchip/Makefile
-f:arch/arm/boot/dts/microchip/aks-cdu.dts
-f:arch/arm/boot/dts/microchip/animeo_ip.dts
-f:arch/arm/boot/dts/microchip/at91-ariag25.dts
-f:arch/arm/boot/dts/microchip/at91-ariettag25.dts
-f:arch/arm/boot/dts/microchip/at91-cosino.dtsi
-f:arch/arm/boot/dts/microchip/at91-cosino_mega2560.dts
-f:arch/arm/boot/dts/microchip/at91-dvk_som60.dts
-f:arch/arm/boot/dts/microchip/at91-dvk_su60_somc.dtsi
-f:arch/arm/boot/dts/microchip/at91-dvk_su60_somc_lcm.dtsi
-f:arch/arm/boot/dts/microchip/at91-foxg20.dts
-f:arch/arm/boot/dts/microchip/at91-gatwick.dts
-f:arch/arm/boot/dts/microchip/at91-kizbox.dts
-f:arch/arm/boot/dts/microchip/at91-kizbox2-2.dts
-f:arch/arm/boot/dts/microchip/at91-kizbox2-common.dtsi
-f:arch/arm/boot/dts/microchip/at91-kizbox3-hs.dts
-f:arch/arm/boot/dts/microchip/at91-kizbox3_common.dtsi
-f:arch/arm/boot/dts/microchip/at91-kizboxmini-base.dts
-f:arch/arm/boot/dts/microchip/at91-kizboxmini-common.dtsi
-f:arch/arm/boot/dts/microchip/at91-kizboxmini-mb.dts
-f:arch/arm/boot/dts/microchip/at91-kizboxmini-rd.dts
-f:arch/arm/boot/dts/microchip/at91-linea.dtsi
-f:arch/arm/boot/dts/microchip/at91-lmu5000.dts
-f:arch/arm/boot/dts/microchip/at91-natte.dtsi
-f:arch/arm/boot/dts/microchip/at91-nattis-2-natte-2.dts
-f:arch/arm/boot/dts/microchip/at91-q5xr5.dts
-f:arch/arm/boot/dts/microchip/at91-qil_a9260.dts
-f:arch/arm/boot/dts/microchip/at91-sam9_l9260.dts
-f:arch/arm/boot/dts/microchip/at91-sam9x60_curiosity.dts
-f:arch/arm/boot/dts/microchip/at91-sam9x60ek.dts
-f:arch/arm/boot/dts/microchip/at91-sam9x75_curiosity.dts
-f:arch/arm/boot/dts/microchip/at91-sama5d27_som1.dtsi
-f:arch/arm/boot/dts/microchip/at91-sama5d27_som1_ek.dts
-f:arch/arm/boot/dts/microchip/at91-sama5d27_wlsom1.dtsi
-f:arch/arm/boot/dts/microchip/at91-sama5d27_wlsom1_ek.dts
-f:arch/arm/boot/dts/microchip/at91-sama5d29_curiosity.dts
-f:arch/arm/boot/dts/microchip/at91-sama5d2_icp.dts
-f:arch/arm/boot/dts/microchip/at91-sama5d2_ptc_ek.dts
-f:arch/arm/boot/dts/microchip/at91-sama5d2_xplained.dts
-f:arch/arm/boot/dts/microchip/at91-sama5d3_eds.dts
-f:arch/arm/boot/dts/microchip/at91-sama5d3_ksz9477_evb.dts
-f:arch/arm/boot/dts/microchip/at91-sama5d3_xplained.dts
-f:arch/arm/boot/dts/microchip/at91-sama5d4_ma5d4.dtsi
-f:arch/arm/boot/dts/microchip/at91-sama5d4_ma5d4evk.dts
-f:arch/arm/boot/dts/microchip/at91-sama5d4_xplained.dts
-f:arch/arm/boot/dts/microchip/at91-sama5d4ek.dts
-f:arch/arm/boot/dts/microchip/at91-sama7d65_curiosity.dts
-f:arch/arm/boot/dts/microchip/at91-sama7g54_curiosity.dts
-f:arch/arm/boot/dts/microchip/at91-sama7g5ek.dts
-f:arch/arm/boot/dts/microchip/at91-smartkiz.dts
-f:arch/arm/boot/dts/microchip/at91-som60.dtsi
-f:arch/arm/boot/dts/microchip/at91-tse850-3.dts
-f:arch/arm/boot/dts/microchip/at91-vinco.dts
-f:arch/arm/boot/dts/microchip/at91-wb45n.dts
-f:arch/arm/boot/dts/microchip/at91-wb45n.dtsi
-f:arch/arm/boot/dts/microchip/at91-wb50n.dts
-f:arch/arm/boot/dts/microchip/at91-wb50n.dtsi
-f:arch/arm/boot/dts/microchip/at91rm9200.dtsi
-f:arch/arm/boot/dts/microchip/at91rm9200_pqfp.dtsi
-f:arch/arm/boot/dts/microchip/at91rm9200ek.dts
-f:arch/arm/boot/dts/microchip/at91sam9260.dtsi
-f:arch/arm/boot/dts/microchip/at91sam9260ek.dts
-f:arch/arm/boot/dts/microchip/at91sam9261.dtsi
-f:arch/arm/boot/dts/microchip/at91sam9261ek.dts
-f:arch/arm/boot/dts/microchip/at91sam9263.dtsi
-f:arch/arm/boot/dts/microchip/at91sam9263ek.dts
-f:arch/arm/boot/dts/microchip/at91sam9g15.dtsi
-f:arch/arm/boot/dts/microchip/at91sam9g15ek.dts
-f:arch/arm/boot/dts/microchip/at91sam9g20.dtsi
-f:arch/arm/boot/dts/microchip/at91sam9g20ek.dts
-f:arch/arm/boot/dts/microchip/at91sam9g20ek_2mmc.dts
-f:arch/arm/boot/dts/microchip/at91sam9g20ek_common.dtsi
-f:arch/arm/boot/dts/microchip/at91sam9g25-gardena-smart-gateway.dts
-f:arch/arm/boot/dts/microchip/at91sam9g25.dtsi
-f:arch/arm/boot/dts/microchip/at91sam9g25ek.dts
-f:arch/arm/boot/dts/microchip/at91sam9g35.dtsi
-f:arch/arm/boot/dts/microchip/at91sam9g35ek.dts
-f:arch/arm/boot/dts/microchip/at91sam9g45.dtsi
-f:arch/arm/boot/dts/microchip/at91sam9m10g45ek.dts
-f:arch/arm/boot/dts/microchip/at91sam9n12.dtsi
-f:arch/arm/boot/dts/microchip/at91sam9n12ek.dts
-f:arch/arm/boot/dts/microchip/at91sam9rl.dtsi
-f:arch/arm/boot/dts/microchip/at91sam9rlek.dts
-f:arch/arm/boot/dts/microchip/at91sam9x25.dtsi
-f:arch/arm/boot/dts/microchip/at91sam9x25ek.dts
-f:arch/arm/boot/dts/microchip/at91sam9x35.dtsi
-f:arch/arm/boot/dts/microchip/at91sam9x35ek.dts
-f:arch/arm/boot/dts/microchip/at91sam9x5.dtsi
-f:arch/arm/boot/dts/microchip/at91sam9x5_can.dtsi
-f:arch/arm/boot/dts/microchip/at91sam9x5_isi.dtsi
-f:arch/arm/boot/dts/microchip/at91sam9x5_lcd.dtsi
-f:arch/arm/boot/dts/microchip/at91sam9x5_macb0.dtsi
-f:arch/arm/boot/dts/microchip/at91sam9x5_macb1.dtsi
-f:arch/arm/boot/dts/microchip/at91sam9x5_usart3.dtsi
-f:arch/arm/boot/dts/microchip/at91sam9x5cm.dtsi
-f:arch/arm/boot/dts/microchip/at91sam9x5dm.dtsi
-f:arch/arm/boot/dts/microchip/at91sam9x5ek.dtsi
-f:arch/arm/boot/dts/microchip/at91sam9xe.dtsi
-f:arch/arm/boot/dts/microchip/ethernut5.dts
-f:arch/arm/boot/dts/microchip/evk-pro3.dts
-f:arch/arm/boot/dts/microchip/ge863-pro3.dtsi
-f:arch/arm/boot/dts/microchip/lan966x-kontron-kswitch-d10-mmt-6g-2gs.dts
-f:arch/arm/boot/dts/microchip/lan966x-kontron-kswitch-d10-mmt-8g.dts
-f:arch/arm/boot/dts/microchip/lan966x-kontron-kswitch-d10-mmt.dtsi
-f:arch/arm/boot/dts/microchip/lan966x-pcb8290.dts
-f:arch/arm/boot/dts/microchip/lan966x-pcb8291.dts
-f:arch/arm/boot/dts/microchip/lan966x-pcb8309.dts
-f:arch/arm/boot/dts/microchip/lan966x.dtsi
-f:arch/arm/boot/dts/microchip/mpa1600.dts
-f:arch/arm/boot/dts/microchip/pm9g45.dts
-f:arch/arm/boot/dts/microchip/sam9x60.dtsi
-f:arch/arm/boot/dts/microchip/sam9x7.dtsi
-f:arch/arm/boot/dts/microchip/sama5d2-pinfunc.h
-f:arch/arm/boot/dts/microchip/sama5d2.dtsi
-f:arch/arm/boot/dts/microchip/sama5d29.dtsi
-f:arch/arm/boot/dts/microchip/sama5d3.dtsi
-f:arch/arm/boot/dts/microchip/sama5d31.dtsi
-f:arch/arm/boot/dts/microchip/sama5d31ek.dts
-f:arch/arm/boot/dts/microchip/sama5d33.dtsi
-f:arch/arm/boot/dts/microchip/sama5d33ek.dts
-f:arch/arm/boot/dts/microchip/sama5d34.dtsi
-f:arch/arm/boot/dts/microchip/sama5d34ek.dts
-f:arch/arm/boot/dts/microchip/sama5d35.dtsi
-f:arch/arm/boot/dts/microchip/sama5d35ek.dts
-f:arch/arm/boot/dts/microchip/sama5d36.dtsi
-f:arch/arm/boot/dts/microchip/sama5d36ek.dts
-f:arch/arm/boot/dts/microchip/sama5d36ek_cmp.dts
-f:arch/arm/boot/dts/microchip/sama5d3_can.dtsi
-f:arch/arm/boot/dts/microchip/sama5d3_emac.dtsi
-f:arch/arm/boot/dts/microchip/sama5d3_gmac.dtsi
-f:arch/arm/boot/dts/microchip/sama5d3_lcd.dtsi
-f:arch/arm/boot/dts/microchip/sama5d3_mci2.dtsi
-f:arch/arm/boot/dts/microchip/sama5d3_tcb1.dtsi
-f:arch/arm/boot/dts/microchip/sama5d3_uart.dtsi
-f:arch/arm/boot/dts/microchip/sama5d3xcm.dtsi
-f:arch/arm/boot/dts/microchip/sama5d3xcm_cmp.dtsi
-f:arch/arm/boot/dts/microchip/sama5d3xdm.dtsi
-f:arch/arm/boot/dts/microchip/sama5d3xmb.dtsi
-f:arch/arm/boot/dts/microchip/sama5d3xmb_cmp.dtsi
-f:arch/arm/boot/dts/microchip/sama5d3xmb_emac.dtsi
-f:arch/arm/boot/dts/microchip/sama5d3xmb_gmac.dtsi
-f:arch/arm/boot/dts/microchip/sama5d4.dtsi
-f:arch/arm/boot/dts/microchip/sama7d65-pinfunc.h
-f:arch/arm/boot/dts/microchip/sama7d65.dtsi
-f:arch/arm/boot/dts/microchip/sama7g5-pinfunc.h
-f:arch/arm/boot/dts/microchip/sama7g5.dtsi
-f:arch/arm/boot/dts/microchip/tny_a9260.dts
-f:arch/arm/boot/dts/microchip/tny_a9260_common.dtsi
-f:arch/arm/boot/dts/microchip/tny_a9263.dts
-f:arch/arm/boot/dts/microchip/tny_a9g20.dts
-f:arch/arm/boot/dts/microchip/usb_a9260.dts
-f:arch/arm/boot/dts/microchip/usb_a9260_common.dtsi
-f:arch/arm/boot/dts/microchip/usb_a9263.dts
-f:arch/arm/boot/dts/microchip/usb_a9g20-dab-mmx.dtsi
-f:arch/arm/boot/dts/microchip/usb_a9g20.dts
-f:arch/arm/boot/dts/microchip/usb_a9g20_lpw.dts
-f:arch/arm/boot/dts/moxa/Makefile
-f:arch/arm/boot/dts/moxa/moxart-uc7112lx.dts
-f:arch/arm/boot/dts/moxa/moxart.dtsi
-f:arch/arm/boot/dts/nspire/Makefile
-f:arch/arm/boot/dts/nspire/nspire-classic.dtsi
-f:arch/arm/boot/dts/nspire/nspire-clp.dts
-f:arch/arm/boot/dts/nspire/nspire-cx.dts
-f:arch/arm/boot/dts/nspire/nspire-tp.dts
-f:arch/arm/boot/dts/nspire/nspire.dtsi
-f:arch/arm/boot/dts/nuvoton/Makefile
-f:arch/arm/boot/dts/nuvoton/nuvoton-common-npcm7xx.dtsi
-f:arch/arm/boot/dts/nuvoton/nuvoton-npcm730-gbs.dts
-f:arch/arm/boot/dts/nuvoton/nuvoton-npcm730-gsj-gpio.dtsi
-f:arch/arm/boot/dts/nuvoton/nuvoton-npcm730-gsj.dts
-f:arch/arm/boot/dts/nuvoton/nuvoton-npcm730-kudo.dts
-f:arch/arm/boot/dts/nuvoton/nuvoton-npcm730.dtsi
-f:arch/arm/boot/dts/nuvoton/nuvoton-npcm750-evb.dts
-f:arch/arm/boot/dts/nuvoton/nuvoton-npcm750-pincfg-evb.dtsi
-f:arch/arm/boot/dts/nuvoton/nuvoton-npcm750-runbmc-olympus-pincfg.dtsi
-f:arch/arm/boot/dts/nuvoton/nuvoton-npcm750-runbmc-olympus.dts
-f:arch/arm/boot/dts/nuvoton/nuvoton-npcm750.dtsi
-f:arch/arm/boot/dts/nuvoton/nuvoton-wpcm450-supermicro-x9sci-ln4f.dts
-f:arch/arm/boot/dts/nuvoton/nuvoton-wpcm450.dtsi
-f:arch/arm/boot/dts/nvidia/Makefile
-f:arch/arm/boot/dts/nvidia/tegra114-asus-tf701t.dts
-f:arch/arm/boot/dts/nvidia/tegra114-dalmore.dts
-f:arch/arm/boot/dts/nvidia/tegra114-roth.dts
-f:arch/arm/boot/dts/nvidia/tegra114-tn7.dts
-f:arch/arm/boot/dts/nvidia/tegra114.dtsi
-f:arch/arm/boot/dts/nvidia/tegra124-apalis-emc.dtsi
-f:arch/arm/boot/dts/nvidia/tegra124-apalis-eval.dts
-f:arch/arm/boot/dts/nvidia/tegra124-apalis-v1.2-eval.dts
-f:arch/arm/boot/dts/nvidia/tegra124-apalis-v1.2.dtsi
-f:arch/arm/boot/dts/nvidia/tegra124-apalis.dtsi
-f:arch/arm/boot/dts/nvidia/tegra124-jetson-tk1-emc.dtsi
-f:arch/arm/boot/dts/nvidia/tegra124-jetson-tk1.dts
-f:arch/arm/boot/dts/nvidia/tegra124-nyan-big-emc.dtsi
-f:arch/arm/boot/dts/nvidia/tegra124-nyan-big-fhd.dts
-f:arch/arm/boot/dts/nvidia/tegra124-nyan-big.dts
-f:arch/arm/boot/dts/nvidia/tegra124-nyan-blaze-emc.dtsi
-f:arch/arm/boot/dts/nvidia/tegra124-nyan-blaze.dts
-f:arch/arm/boot/dts/nvidia/tegra124-nyan.dtsi
-f:arch/arm/boot/dts/nvidia/tegra124-peripherals-opp.dtsi
-f:arch/arm/boot/dts/nvidia/tegra124-venice2.dts
-f:arch/arm/boot/dts/nvidia/tegra124.dtsi
-f:arch/arm/boot/dts/nvidia/tegra20-acer-a500-picasso.dts
-f:arch/arm/boot/dts/nvidia/tegra20-asus-tf101.dts
-f:arch/arm/boot/dts/nvidia/tegra20-colibri-eval-v3.dts
-f:arch/arm/boot/dts/nvidia/tegra20-colibri-iris.dts
-f:arch/arm/boot/dts/nvidia/tegra20-colibri.dtsi
-f:arch/arm/boot/dts/nvidia/tegra20-cpu-opp-microvolt.dtsi
-f:arch/arm/boot/dts/nvidia/tegra20-cpu-opp.dtsi
-f:arch/arm/boot/dts/nvidia/tegra20-harmony.dts
-f:arch/arm/boot/dts/nvidia/tegra20-medcom-wide.dts
-f:arch/arm/boot/dts/nvidia/tegra20-paz00.dts
-f:arch/arm/boot/dts/nvidia/tegra20-peripherals-opp.dtsi
-f:arch/arm/boot/dts/nvidia/tegra20-plutux.dts
-f:arch/arm/boot/dts/nvidia/tegra20-seaboard.dts
-f:arch/arm/boot/dts/nvidia/tegra20-tamonten.dtsi
-f:arch/arm/boot/dts/nvidia/tegra20-tec.dts
-f:arch/arm/boot/dts/nvidia/tegra20-trimslice.dts
-f:arch/arm/boot/dts/nvidia/tegra20-ventana.dts
-f:arch/arm/boot/dts/nvidia/tegra20.dtsi
-f:arch/arm/boot/dts/nvidia/tegra30-apalis-eval.dts
-f:arch/arm/boot/dts/nvidia/tegra30-apalis-v1.1-eval.dts
-f:arch/arm/boot/dts/nvidia/tegra30-apalis-v1.1.dtsi
-f:arch/arm/boot/dts/nvidia/tegra30-apalis.dtsi
-f:arch/arm/boot/dts/nvidia/tegra30-asus-lvds-display.dtsi
-f:arch/arm/boot/dts/nvidia/tegra30-asus-nexus7-grouper-E1565.dts
-f:arch/arm/boot/dts/nvidia/tegra30-asus-nexus7-grouper-PM269.dts
-f:arch/arm/boot/dts/nvidia/tegra30-asus-nexus7-grouper-common.dtsi
-f:arch/arm/boot/dts/nvidia/tegra30-asus-nexus7-grouper-maxim-pmic.dtsi
-f:arch/arm/boot/dts/nvidia/tegra30-asus-nexus7-grouper-memory-timings.dtsi
-f:arch/arm/boot/dts/nvidia/tegra30-asus-nexus7-grouper-ti-pmic.dtsi
-f:arch/arm/boot/dts/nvidia/tegra30-asus-nexus7-grouper.dtsi
-f:arch/arm/boot/dts/nvidia/tegra30-asus-nexus7-tilapia-E1565.dts
-f:arch/arm/boot/dts/nvidia/tegra30-asus-nexus7-tilapia-memory-timings.dtsi
-f:arch/arm/boot/dts/nvidia/tegra30-asus-nexus7-tilapia.dtsi
-f:arch/arm/boot/dts/nvidia/tegra30-asus-p1801-t.dts
-f:arch/arm/boot/dts/nvidia/tegra30-asus-tf201.dts
-f:arch/arm/boot/dts/nvidia/tegra30-asus-tf300t.dts
-f:arch/arm/boot/dts/nvidia/tegra30-asus-tf300tg.dts
-f:arch/arm/boot/dts/nvidia/tegra30-asus-tf300tl.dts
-f:arch/arm/boot/dts/nvidia/tegra30-asus-tf600t.dts
-f:arch/arm/boot/dts/nvidia/tegra30-asus-tf700t.dts
-f:arch/arm/boot/dts/nvidia/tegra30-asus-transformer-common.dtsi
-f:arch/arm/boot/dts/nvidia/tegra30-beaver.dts
-f:arch/arm/boot/dts/nvidia/tegra30-cardhu-a02.dts
-f:arch/arm/boot/dts/nvidia/tegra30-cardhu-a04.dts
-f:arch/arm/boot/dts/nvidia/tegra30-cardhu.dtsi
-f:arch/arm/boot/dts/nvidia/tegra30-colibri-eval-v3.dts
-f:arch/arm/boot/dts/nvidia/tegra30-colibri.dtsi
-f:arch/arm/boot/dts/nvidia/tegra30-cpu-opp-microvolt.dtsi
-f:arch/arm/boot/dts/nvidia/tegra30-cpu-opp.dtsi
-f:arch/arm/boot/dts/nvidia/tegra30-lg-p880.dts
-f:arch/arm/boot/dts/nvidia/tegra30-lg-p895.dts
-f:arch/arm/boot/dts/nvidia/tegra30-lg-x3.dtsi
-f:arch/arm/boot/dts/nvidia/tegra30-ouya.dts
-f:arch/arm/boot/dts/nvidia/tegra30-pegatron-chagall.dts
-f:arch/arm/boot/dts/nvidia/tegra30-peripherals-opp.dtsi
-f:arch/arm/boot/dts/nvidia/tegra30.dtsi
-f:arch/arm/boot/dts/nxp/Makefile
-f:arch/arm/boot/dts/nxp/imx/Makefile
-f:arch/arm/boot/dts/nxp/imx/e60k02.dtsi
-f:arch/arm/boot/dts/nxp/imx/e70k02.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx1-ads.dts
-f:arch/arm/boot/dts/nxp/imx/imx1-apf9328.dts
-f:arch/arm/boot/dts/nxp/imx/imx1-pinfunc.h
-f:arch/arm/boot/dts/nxp/imx/imx1.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx25-eukrea-cpuimx25.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts
-f:arch/arm/boot/dts/nxp/imx/imx25-eukrea-mbimxsd25-baseboard-dvi-svga.dts
-f:arch/arm/boot/dts/nxp/imx/imx25-eukrea-mbimxsd25-baseboard-dvi-vga.dts
-f:arch/arm/boot/dts/nxp/imx/imx25-eukrea-mbimxsd25-baseboard.dts
-f:arch/arm/boot/dts/nxp/imx/imx25-karo-tx25.dts
-f:arch/arm/boot/dts/nxp/imx/imx25-pdk.dts
-f:arch/arm/boot/dts/nxp/imx/imx25-pinfunc.h
-f:arch/arm/boot/dts/nxp/imx/imx25.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx27-apf27.dts
-f:arch/arm/boot/dts/nxp/imx/imx27-apf27dev.dts
-f:arch/arm/boot/dts/nxp/imx/imx27-eukrea-cpuimx27.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx27-eukrea-mbimxsd27-baseboard.dts
-f:arch/arm/boot/dts/nxp/imx/imx27-pdk.dts
-f:arch/arm/boot/dts/nxp/imx/imx27-phytec-phycard-s-rdk.dts
-f:arch/arm/boot/dts/nxp/imx/imx27-phytec-phycard-s-som.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx27-phytec-phycore-rdk.dts
-f:arch/arm/boot/dts/nxp/imx/imx27-phytec-phycore-som.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx27-pinfunc.h
-f:arch/arm/boot/dts/nxp/imx/imx27.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx31-bug.dts
-f:arch/arm/boot/dts/nxp/imx/imx31-lite.dts
-f:arch/arm/boot/dts/nxp/imx/imx31.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx35-eukrea-cpuimx35.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx35-eukrea-mbimxsd35-baseboard.dts
-f:arch/arm/boot/dts/nxp/imx/imx35-pdk.dts
-f:arch/arm/boot/dts/nxp/imx/imx35-pinfunc.h
-f:arch/arm/boot/dts/nxp/imx/imx35.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx50-evk.dts
-f:arch/arm/boot/dts/nxp/imx/imx50-kobo-aura.dts
-f:arch/arm/boot/dts/nxp/imx/imx50-pinfunc.h
-f:arch/arm/boot/dts/nxp/imx/imx50.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx51-apf51.dts
-f:arch/arm/boot/dts/nxp/imx/imx51-apf51dev.dts
-f:arch/arm/boot/dts/nxp/imx/imx51-babbage.dts
-f:arch/arm/boot/dts/nxp/imx/imx51-digi-connectcore-jsk.dts
-f:arch/arm/boot/dts/nxp/imx/imx51-digi-connectcore-som.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx51-eukrea-cpuimx51.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx51-eukrea-mbimxsd51-baseboard.dts
-f:arch/arm/boot/dts/nxp/imx/imx51-pinfunc.h
-f:arch/arm/boot/dts/nxp/imx/imx51-ts4800.dts
-f:arch/arm/boot/dts/nxp/imx/imx51-zii-rdu1.dts
-f:arch/arm/boot/dts/nxp/imx/imx51-zii-scu2-mezz.dts
-f:arch/arm/boot/dts/nxp/imx/imx51-zii-scu3-esb.dts
-f:arch/arm/boot/dts/nxp/imx/imx51.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx53-ard.dts
-f:arch/arm/boot/dts/nxp/imx/imx53-cx9020.dts
-f:arch/arm/boot/dts/nxp/imx/imx53-kp-ddc.dts
-f:arch/arm/boot/dts/nxp/imx/imx53-kp-hsc.dts
-f:arch/arm/boot/dts/nxp/imx/imx53-kp.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx53-m53.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx53-m53evk.dts
-f:arch/arm/boot/dts/nxp/imx/imx53-m53menlo.dts
-f:arch/arm/boot/dts/nxp/imx/imx53-mba53.dts
-f:arch/arm/boot/dts/nxp/imx/imx53-pinfunc.h
-f:arch/arm/boot/dts/nxp/imx/imx53-ppd.dts
-f:arch/arm/boot/dts/nxp/imx/imx53-qsb-common.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx53-qsb-hdmi.dtso
-f:arch/arm/boot/dts/nxp/imx/imx53-qsb.dts
-f:arch/arm/boot/dts/nxp/imx/imx53-qsrb.dts
-f:arch/arm/boot/dts/nxp/imx/imx53-sk-imx53-atm0700d4-lvds.dts
-f:arch/arm/boot/dts/nxp/imx/imx53-sk-imx53-atm0700d4-rgb.dts
-f:arch/arm/boot/dts/nxp/imx/imx53-sk-imx53-atm0700d4.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx53-sk-imx53.dts
-f:arch/arm/boot/dts/nxp/imx/imx53-smd.dts
-f:arch/arm/boot/dts/nxp/imx/imx53-tqma53.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx53-tx53-x03x.dts
-f:arch/arm/boot/dts/nxp/imx/imx53-tx53-x13x.dts
-f:arch/arm/boot/dts/nxp/imx/imx53-tx53.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx53-usbarmory.dts
-f:arch/arm/boot/dts/nxp/imx/imx53-voipac-bsb.dts
-f:arch/arm/boot/dts/nxp/imx/imx53-voipac-dmm-668.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx53.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6-logicpd-baseboard.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6-logicpd-som.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6dl-alti6p.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-apf6dev.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-aristainetos2_4.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-aristainetos2_7.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-aristainetos_4.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-aristainetos_7.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-b105pv2.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-b105v2.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-b125pv2.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-b125v2.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-b155v2.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-b1x5pv2.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6dl-b1x5v2.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6dl-colibri-aster.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-colibri-eval-v3.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-colibri-iris-v2.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-colibri-iris.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-colibri-v1.2-aster.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-colibri-v1.2-eval-v3.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-colibri-v1.2-iris-v2.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-colibri-v1.2-iris.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-cubox-i-emmc-som-v15.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-cubox-i-som-v15.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-cubox-i.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-dfi-fs700-m60.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-dhcom-pdk2.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-dhcom-picoitx.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-eckelmann-ci4x10.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-emcon-avari.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-gw51xx.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-gw52xx.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-gw53xx.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-gw54xx.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-gw551x.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-gw552x.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-gw553x.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-gw560x.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-gw5903.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-gw5904.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-gw5907.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-gw5910.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-gw5912.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-gw5913.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-hummingboard-emmc-som-v15.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-hummingboard-som-v15.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-hummingboard.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-hummingboard2-emmc-som-v15.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-hummingboard2-som-v15.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-hummingboard2.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-icore-mipi.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-icore-rqs.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-icore.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-kontron-samx6i-ads2.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-kontron-samx6i.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6dl-lanmcu.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-mamoj.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-mba6.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6dl-mba6a.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-mba6b.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-nit6xlite.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-nitrogen6x.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-phytec-mira-rdk-nand.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-phytec-pbab01.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-phytec-pfla02.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6dl-pico-dwarf.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-pico-hobbit.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-pico-nymph.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-pico-pi.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-pinfunc.h
-f:arch/arm/boot/dts/nxp/imx/imx6dl-plybas.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-plym2m.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-prtmvt.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-prtrvt.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-prtvt7.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-qmx6.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6dl-rex-basic.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-riotboard.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-sabreauto.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-sabrelite.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-sabresd.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-savageboard.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-sielaff.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-skov-revc-lt2.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-skov-revc-lt6.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-solidsense.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-tqma6a.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6dl-tqma6b.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6dl-ts4900.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-ts7970.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-tx6dl-comtft.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-tx6s-8034-mb7.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-tx6s-8034.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-tx6s-8035-mb7.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-tx6s-8035.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-tx6u-801x.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-tx6u-8033-mb7.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-tx6u-8033.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-tx6u-80xx-mb7.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-tx6u-811x.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-tx6u-81xx-mb7.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-udoo.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-victgo.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-vicut1.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-wandboard-revb1.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-wandboard-revd1.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-wandboard.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-yapp4-common.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6dl-yapp4-draco.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-yapp4-hydra.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-yapp4-lynx.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-yapp4-orion.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-yapp4-phoenix.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-yapp4-ursa.dts
-f:arch/arm/boot/dts/nxp/imx/imx6dl-yapp43-common.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6dl.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6q-apalis-eval-v1.2.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-apalis-eval.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-apalis-eval.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6q-apalis-ixora-v1.1.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-apalis-ixora-v1.2.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-apalis-ixora.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-apalis-v1.2-eval-v1.2.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-apalis-v1.2-eval.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-apalis-v1.2-ixora-v1.1.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-apalis-v1.2-ixora-v1.2.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-apalis-v1.2-ixora.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-apf6dev.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-arm2.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-b450v3.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-b650v3.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-b850v3.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-ba16.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6q-bosch-acc.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-bx50v3.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6q-cm-fx6.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-cubox-i-emmc-som-v15.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-cubox-i-som-v15.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-cubox-i.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-dfi-fs700-m60.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-dhcom-pdk2.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-display5-tianma-tm070-1280x768.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-display5.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6q-dmo-edmqmx6.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-dms-ba16.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-ds.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-emcon-avari.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-evi.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-gk802.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-gw51xx.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-gw52xx.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-gw53xx.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-gw5400-a.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-gw54xx.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-gw551x.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-gw552x.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-gw553x.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-gw560x.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-gw5903.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-gw5904.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-gw5907.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-gw5910.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-gw5912.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-gw5913.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-h100.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-hummingboard-emmc-som-v15.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-hummingboard-som-v15.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-hummingboard.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-hummingboard2-emmc-som-v15.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-hummingboard2-som-v15.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-hummingboard2.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-icore-mipi.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-icore-ofcap10.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-icore-ofcap12.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-icore-rqs.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-icore.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-kontron-samx6i-ads2.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-kontron-samx6i.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6q-kp-tpc.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-kp.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6q-logicpd.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-lxr.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-marsboard.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-mba6.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6q-mba6a.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-mba6b.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-mccmon6.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-nitrogen6_max.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-nitrogen6_som2.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-nitrogen6x.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-novena.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-phytec-mira-rdk-emmc.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-phytec-mira-rdk-nand.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-phytec-pbab01.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-phytec-pfla02.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6q-pico-dwarf.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-pico-hobbit.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-pico-nymph.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-pico-pi.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-pinfunc.h
-f:arch/arm/boot/dts/nxp/imx/imx6q-pistachio.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-prti6q.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-prtwd2.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-rex-pro.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-sabreauto.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-sabrelite.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-sabresd.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-savageboard.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-sbc6x.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-skov-revc-lt2.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-skov-revc-lt6.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-skov-reve-mi1010ait-1cp1.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-solidsense.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-tbs2910.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-tqma6a.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6q-tqma6b.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6q-ts4900.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-ts7970.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-tx6q-1010-comtft.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-tx6q-1010.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-tx6q-1020-comtft.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-tx6q-1020.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-tx6q-1036-mb7.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-tx6q-1036.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-tx6q-10x0-mb7.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-tx6q-1110.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-tx6q-11x0-mb7.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-udoo.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-utilite-pro.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-var-dt6customboard.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-var-mx6customboard.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-vicut1.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-wandboard-revb1.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-wandboard-revd1.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-wandboard.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-yapp4-crux.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-yapp4-pegasus.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q-zii-rdu2.dts
-f:arch/arm/boot/dts/nxp/imx/imx6q.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-apalis-v1.2.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-apf6.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-apf6dev.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-aristainetos.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-aristainetos2.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-colibri-v1.2.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-colibri.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-cubox-i.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-dfi-fs700-m60.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-dhcom-drc02.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-dhcom-pdk2.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-dhcom-picoitx.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-dhcom-som.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-ds.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-emcon-avari.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-emcon.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-gw51xx.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-gw52xx.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-gw53xx.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-gw54xx.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-gw551x.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-gw552x.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-gw553x.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-gw560x.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-gw5903.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-gw5904.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-gw5907.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-gw5910.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-gw5912.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-gw5913.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-hummingboard.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-hummingboard2-emmc.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-hummingboard2.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-icore-1.5.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-icore-rqs.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-icore.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i-ads2.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-mba6.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-mba6a.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-mba6b.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-nit6xlite.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-nitrogen6_max.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-nitrogen6_som2.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-nitrogen6x.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-phytec-mira-peb-av-02.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-phytec-mira-peb-eval-01.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-phytec-mira-peb-wlbt-05.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-phytec-mira.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-phytec-pbab01.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-phytec-pfla02.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-phytec-phycore-som.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-pico-dwarf.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-pico-hobbit.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-pico-nymph.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-pico-pi.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-pico.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-prti6q.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-rex.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-sabreauto.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-sabrelite.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-sabresd.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-savageboard.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-skov-cpu-revc.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-skov-cpu.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-skov-revc-lt2.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-solidsense.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-sr-som-brcm.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-sr-som-emmc.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-sr-som-ti.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-sr-som.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6a.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6b.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-ts4900.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-ts7970.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-tx6-lcd.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-tx6-lvds.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-tx6-mb7.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-tx6.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-udoo.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-var-dart.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-var-som.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-vicut1-12inch.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-vicut1.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-wandboard-revb1.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-wandboard-revc1.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-wandboard-revd1.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-wandboard.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl-zii-rdu2.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qdl.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qp-mba6b.dts
-f:arch/arm/boot/dts/nxp/imx/imx6qp-nitrogen6_max.dts
-f:arch/arm/boot/dts/nxp/imx/imx6qp-nitrogen6_som2.dts
-f:arch/arm/boot/dts/nxp/imx/imx6qp-phytec-mira-rdk-nand.dts
-f:arch/arm/boot/dts/nxp/imx/imx6qp-prtwd3.dts
-f:arch/arm/boot/dts/nxp/imx/imx6qp-sabreauto.dts
-f:arch/arm/boot/dts/nxp/imx/imx6qp-sabresd.dts
-f:arch/arm/boot/dts/nxp/imx/imx6qp-tqma6b.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6qp-tx6qp-8037-mb7.dts
-f:arch/arm/boot/dts/nxp/imx/imx6qp-tx6qp-8037.dts
-f:arch/arm/boot/dts/nxp/imx/imx6qp-tx6qp-8137-mb7.dts
-f:arch/arm/boot/dts/nxp/imx/imx6qp-tx6qp-8137.dts
-f:arch/arm/boot/dts/nxp/imx/imx6qp-vicutp.dts
-f:arch/arm/boot/dts/nxp/imx/imx6qp-wandboard-revd1.dts
-f:arch/arm/boot/dts/nxp/imx/imx6qp-yapp4-crux-plus.dts
-f:arch/arm/boot/dts/nxp/imx/imx6qp-yapp4-pegasus-plus.dts
-f:arch/arm/boot/dts/nxp/imx/imx6qp-zii-rdu2.dts
-f:arch/arm/boot/dts/nxp/imx/imx6qp.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6s-dhcom-drc02.dts
-f:arch/arm/boot/dts/nxp/imx/imx6sl-evk.dts
-f:arch/arm/boot/dts/nxp/imx/imx6sl-kobo-aura2.dts
-f:arch/arm/boot/dts/nxp/imx/imx6sl-pinfunc.h
-f:arch/arm/boot/dts/nxp/imx/imx6sl-tolino-shine2hd.dts
-f:arch/arm/boot/dts/nxp/imx/imx6sl-tolino-shine3.dts
-f:arch/arm/boot/dts/nxp/imx/imx6sl-tolino-vision.dts
-f:arch/arm/boot/dts/nxp/imx/imx6sl-tolino-vision5.dts
-f:arch/arm/boot/dts/nxp/imx/imx6sl-warp.dts
-f:arch/arm/boot/dts/nxp/imx/imx6sl.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6sll-evk.dts
-f:arch/arm/boot/dts/nxp/imx/imx6sll-kobo-clara2e-a.dts
-f:arch/arm/boot/dts/nxp/imx/imx6sll-kobo-clara2e-b.dts
-f:arch/arm/boot/dts/nxp/imx/imx6sll-kobo-clara2e-common.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6sll-kobo-clarahd.dts
-f:arch/arm/boot/dts/nxp/imx/imx6sll-kobo-librah2o.dts
-f:arch/arm/boot/dts/nxp/imx/imx6sll-pinfunc.h
-f:arch/arm/boot/dts/nxp/imx/imx6sll.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6sx-nitrogen6sx.dts
-f:arch/arm/boot/dts/nxp/imx/imx6sx-pinfunc.h
-f:arch/arm/boot/dts/nxp/imx/imx6sx-sabreauto.dts
-f:arch/arm/boot/dts/nxp/imx/imx6sx-sdb-mqs.dts
-f:arch/arm/boot/dts/nxp/imx/imx6sx-sdb-reva.dts
-f:arch/arm/boot/dts/nxp/imx/imx6sx-sdb-sai.dts
-f:arch/arm/boot/dts/nxp/imx/imx6sx-sdb.dts
-f:arch/arm/boot/dts/nxp/imx/imx6sx-sdb.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6sx-softing-vining-2000.dts
-f:arch/arm/boot/dts/nxp/imx/imx6sx-udoo-neo-basic.dts
-f:arch/arm/boot/dts/nxp/imx/imx6sx-udoo-neo-extended.dts
-f:arch/arm/boot/dts/nxp/imx/imx6sx-udoo-neo-full.dts
-f:arch/arm/boot/dts/nxp/imx/imx6sx-udoo-neo.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6sx.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ul-14x14-evk.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ul-14x14-evk.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ul-ccimx6ulsbcexpress.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ul-ccimx6ulsbcpro.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ul-ccimx6ulsom.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ul-geam.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ul-imx6ull-opos6ul.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ul-imx6ull-opos6uldev.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ul-isiot-emmc.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ul-isiot-nand.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ul-isiot.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ul-kontron-bl-43.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ul-kontron-bl-common.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ul-kontron-bl.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ul-kontron-sl-common.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ul-kontron-sl.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ul-liteboard.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ul-litesom.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ul-opos6ul.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ul-opos6uldev.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ul-phytec-phycore-som.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ul-phytec-segin-ff-rdk-emmc.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ul-phytec-segin-ff-rdk-nand.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ul-phytec-segin-peb-av-02.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ul-phytec-segin-peb-eval-01.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ul-phytec-segin-peb-wlbt-05.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ul-phytec-segin.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ul-pico-dwarf.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ul-pico-hobbit.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ul-pico-pi.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ul-pico.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ul-pinfunc.h
-f:arch/arm/boot/dts/nxp/imx/imx6ul-prti6g.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul-common.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul1-mba6ulx.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul1.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul2-mba6ulx.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul2.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul2l-mba6ulx.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul2l.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ulx-common.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ulxl-common.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ul-tx6ul-0010.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ul-tx6ul-0011.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ul-tx6ul-mainboard.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ul-tx6ul.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ul-var-som-concerto.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ul-var-som.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ul.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ull-14x14-evk.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ull-colibri-aster.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ull-colibri-aster.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ull-colibri-emmc-aster.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ull-colibri-emmc-eval-v3.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ull-colibri-emmc-iris-v2.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ull-colibri-emmc-iris.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ull-colibri-emmc-nonwifi.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ull-colibri-eval-v3.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ull-colibri-eval-v3.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ull-colibri-iris-v2.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ull-colibri-iris-v2.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ull-colibri-iris.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ull-colibri-iris.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ull-colibri-nonwifi.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ull-colibri-wifi-aster.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ull-colibri-wifi-eval-v3.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ull-colibri-wifi-iris-v2.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ull-colibri-wifi-iris.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ull-colibri-wifi.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ull-colibri.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ull-dhcom-drc02.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ull-dhcom-pdk2.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ull-dhcom-picoitx.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ull-dhcom-som-cfg-sdcard.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ull-dhcom-som.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ull-dhcor-maveo-box.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ull-dhcor-som.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ull-engicam-microgea-bmm.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ull-engicam-microgea-gtw.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ull-engicam-microgea-rmm.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ull-engicam-microgea.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ull-jozacp.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ull-kontron-bl.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ull-kontron-sl.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ull-myir-mys-6ulx-eval.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ull-myir-mys-6ulx.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ull-opos6ul.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ull-opos6uldev.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ull-phytec-phycore-som.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ull-phytec-segin-ff-rdk-emmc.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ull-phytec-segin-ff-rdk-nand.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ull-phytec-segin-lc-rdk-nand.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ull-phytec-segin-peb-av-02.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ull-phytec-segin-peb-eval-01.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ull-phytec-segin-peb-wlbt-05.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ull-phytec-segin.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ull-phytec-tauri-emmc.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ull-phytec-tauri-nand.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ull-phytec-tauri.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ull-pinfunc-snvs.h
-f:arch/arm/boot/dts/nxp/imx/imx6ull-pinfunc.h
-f:arch/arm/boot/dts/nxp/imx/imx6ull-seeed-npi-dev-board-emmc.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ull-seeed-npi-dev-board-nand.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ull-seeed-npi-dev-board.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ull-seeed-npi.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ull-tarragon-common.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ull-tarragon-master.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ull-tarragon-micro.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ull-tarragon-slave.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ull-tarragon-slavext.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2-mba6ulx.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2l-mba6ulx.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2l.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ull-uti260b.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ull.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx6ulz-14x14-evk.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ulz-bsh-smm-m2.dts
-f:arch/arm/boot/dts/nxp/imx/imx6ulz.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx7-colibri-aster.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx7-colibri-eval-v3.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx7-colibri-iris-v2.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx7-colibri-iris.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx7-colibri.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx7-mba7.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx7-tqma7.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx7d-cl-som-imx7.dts
-f:arch/arm/boot/dts/nxp/imx/imx7d-colibri-aster.dts
-f:arch/arm/boot/dts/nxp/imx/imx7d-colibri-emmc-aster.dts
-f:arch/arm/boot/dts/nxp/imx/imx7d-colibri-emmc-eval-v3.dts
-f:arch/arm/boot/dts/nxp/imx/imx7d-colibri-emmc-iris-v2.dts
-f:arch/arm/boot/dts/nxp/imx/imx7d-colibri-emmc-iris.dts
-f:arch/arm/boot/dts/nxp/imx/imx7d-colibri-emmc.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx7d-colibri-eval-v3.dts
-f:arch/arm/boot/dts/nxp/imx/imx7d-colibri-iris-v2.dts
-f:arch/arm/boot/dts/nxp/imx/imx7d-colibri-iris.dts
-f:arch/arm/boot/dts/nxp/imx/imx7d-colibri.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx7d-flex-concentrator-mfg.dts
-f:arch/arm/boot/dts/nxp/imx/imx7d-flex-concentrator.dts
-f:arch/arm/boot/dts/nxp/imx/imx7d-mba7.dts
-f:arch/arm/boot/dts/nxp/imx/imx7d-meerkat96.dts
-f:arch/arm/boot/dts/nxp/imx/imx7d-nitrogen7.dts
-f:arch/arm/boot/dts/nxp/imx/imx7d-pico-dwarf.dts
-f:arch/arm/boot/dts/nxp/imx/imx7d-pico-hobbit.dts
-f:arch/arm/boot/dts/nxp/imx/imx7d-pico-nymph.dts
-f:arch/arm/boot/dts/nxp/imx/imx7d-pico-pi.dts
-f:arch/arm/boot/dts/nxp/imx/imx7d-pico.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx7d-pinfunc.h
-f:arch/arm/boot/dts/nxp/imx/imx7d-remarkable2.dts
-f:arch/arm/boot/dts/nxp/imx/imx7d-sbc-imx7.dts
-f:arch/arm/boot/dts/nxp/imx/imx7d-sdb-reva.dts
-f:arch/arm/boot/dts/nxp/imx/imx7d-sdb-sht11.dts
-f:arch/arm/boot/dts/nxp/imx/imx7d-sdb.dts
-f:arch/arm/boot/dts/nxp/imx/imx7d-smegw01.dts
-f:arch/arm/boot/dts/nxp/imx/imx7d-tqma7.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx7d-zii-rmu2.dts
-f:arch/arm/boot/dts/nxp/imx/imx7d-zii-rpu2.dts
-f:arch/arm/boot/dts/nxp/imx/imx7d.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx7s-colibri-aster.dts
-f:arch/arm/boot/dts/nxp/imx/imx7s-colibri-eval-v3.dts
-f:arch/arm/boot/dts/nxp/imx/imx7s-colibri-iris-v2.dts
-f:arch/arm/boot/dts/nxp/imx/imx7s-colibri-iris.dts
-f:arch/arm/boot/dts/nxp/imx/imx7s-colibri.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx7s-mba7.dts
-f:arch/arm/boot/dts/nxp/imx/imx7s-tqma7.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx7s-warp.dts
-f:arch/arm/boot/dts/nxp/imx/imx7s.dtsi
-f:arch/arm/boot/dts/nxp/imx/imx7ulp-com.dts
-f:arch/arm/boot/dts/nxp/imx/imx7ulp-evk.dts
-f:arch/arm/boot/dts/nxp/imx/imx7ulp-pinfunc.h
-f:arch/arm/boot/dts/nxp/imx/imx7ulp.dtsi
-f:arch/arm/boot/dts/nxp/imx/imxrt1050-evk.dts
-f:arch/arm/boot/dts/nxp/imx/imxrt1050-pinfunc.h
-f:arch/arm/boot/dts/nxp/imx/imxrt1050.dtsi
-f:arch/arm/boot/dts/nxp/imx/imxrt1170-pinfunc.h
-f:arch/arm/boot/dts/nxp/imx/mba6ulx.dtsi
-f:arch/arm/boot/dts/nxp/lpc/Makefile
-f:arch/arm/boot/dts/nxp/lpc/lpc18xx.dtsi
-f:arch/arm/boot/dts/nxp/lpc/lpc3250-ea3250.dts
-f:arch/arm/boot/dts/nxp/lpc/lpc3250-phy3250.dts
-f:arch/arm/boot/dts/nxp/lpc/lpc32xx.dtsi
-f:arch/arm/boot/dts/nxp/lpc/lpc4337-ciaa.dts
-f:arch/arm/boot/dts/nxp/lpc/lpc4350-hitex-eval.dts
-f:arch/arm/boot/dts/nxp/lpc/lpc4350.dtsi
-f:arch/arm/boot/dts/nxp/lpc/lpc4357-ea4357-devkit.dts
-f:arch/arm/boot/dts/nxp/lpc/lpc4357-myd-lpc4357.dts
-f:arch/arm/boot/dts/nxp/lpc/lpc4357.dtsi
-f:arch/arm/boot/dts/nxp/ls/Makefile
-f:arch/arm/boot/dts/nxp/ls/ls1021a-iot.dts
-f:arch/arm/boot/dts/nxp/ls/ls1021a-moxa-uc-8410a.dts
-f:arch/arm/boot/dts/nxp/ls/ls1021a-qds.dts
-f:arch/arm/boot/dts/nxp/ls/ls1021a-tqmls1021a-mbls1021a-hdmi.dtso
-f:arch/arm/boot/dts/nxp/ls/ls1021a-tqmls1021a-mbls1021a-lvds-tm070jvhg33.dtso
-f:arch/arm/boot/dts/nxp/ls/ls1021a-tqmls1021a-mbls1021a-rgb-cdtech-dc44.dtso
-f:arch/arm/boot/dts/nxp/ls/ls1021a-tqmls1021a-mbls1021a-rgb-cdtech-fc21.dtso
-f:arch/arm/boot/dts/nxp/ls/ls1021a-tqmls1021a-mbls1021a.dts
-f:arch/arm/boot/dts/nxp/ls/ls1021a-tqmls1021a.dtsi
-f:arch/arm/boot/dts/nxp/ls/ls1021a-tsn.dts
-f:arch/arm/boot/dts/nxp/ls/ls1021a-twr.dts
-f:arch/arm/boot/dts/nxp/ls/ls1021a.dtsi
-f:arch/arm/boot/dts/nxp/mxs/Makefile
-f:arch/arm/boot/dts/nxp/mxs/imx23-evk.dts
-f:arch/arm/boot/dts/nxp/mxs/imx23-olinuxino.dts
-f:arch/arm/boot/dts/nxp/mxs/imx23-pinfunc.h
-f:arch/arm/boot/dts/nxp/mxs/imx23-sansa.dts
-f:arch/arm/boot/dts/nxp/mxs/imx23-stmp378x_devb.dts
-f:arch/arm/boot/dts/nxp/mxs/imx23-xfi3.dts
-f:arch/arm/boot/dts/nxp/mxs/imx23.dtsi
-f:arch/arm/boot/dts/nxp/mxs/imx28-amarula-rmm.dts
-f:arch/arm/boot/dts/nxp/mxs/imx28-apf28.dts
-f:arch/arm/boot/dts/nxp/mxs/imx28-apf28dev.dts
-f:arch/arm/boot/dts/nxp/mxs/imx28-apx4devkit.dts
-f:arch/arm/boot/dts/nxp/mxs/imx28-btt3-0.dts
-f:arch/arm/boot/dts/nxp/mxs/imx28-btt3-1.dts
-f:arch/arm/boot/dts/nxp/mxs/imx28-btt3-2.dts
-f:arch/arm/boot/dts/nxp/mxs/imx28-btt3.dtsi
-f:arch/arm/boot/dts/nxp/mxs/imx28-cfa10036.dts
-f:arch/arm/boot/dts/nxp/mxs/imx28-cfa10037.dts
-f:arch/arm/boot/dts/nxp/mxs/imx28-cfa10049.dts
-f:arch/arm/boot/dts/nxp/mxs/imx28-cfa10055.dts
-f:arch/arm/boot/dts/nxp/mxs/imx28-cfa10056.dts
-f:arch/arm/boot/dts/nxp/mxs/imx28-cfa10057.dts
-f:arch/arm/boot/dts/nxp/mxs/imx28-cfa10058.dts
-f:arch/arm/boot/dts/nxp/mxs/imx28-duckbill-2-485.dts
-f:arch/arm/boot/dts/nxp/mxs/imx28-duckbill-2-enocean.dts
-f:arch/arm/boot/dts/nxp/mxs/imx28-duckbill-2-spi.dts
-f:arch/arm/boot/dts/nxp/mxs/imx28-duckbill-2.dts
-f:arch/arm/boot/dts/nxp/mxs/imx28-duckbill.dts
-f:arch/arm/boot/dts/nxp/mxs/imx28-eukrea-mbmx283lc.dts
-f:arch/arm/boot/dts/nxp/mxs/imx28-eukrea-mbmx287lc.dts
-f:arch/arm/boot/dts/nxp/mxs/imx28-eukrea-mbmx28lc.dtsi
-f:arch/arm/boot/dts/nxp/mxs/imx28-evk.dts
-f:arch/arm/boot/dts/nxp/mxs/imx28-lwe.dtsi
-f:arch/arm/boot/dts/nxp/mxs/imx28-m28.dtsi
-f:arch/arm/boot/dts/nxp/mxs/imx28-m28cu3.dts
-f:arch/arm/boot/dts/nxp/mxs/imx28-m28evk.dts
-f:arch/arm/boot/dts/nxp/mxs/imx28-pinfunc.h
-f:arch/arm/boot/dts/nxp/mxs/imx28-sps1.dts
-f:arch/arm/boot/dts/nxp/mxs/imx28-ts4600.dts
-f:arch/arm/boot/dts/nxp/mxs/imx28-tx28.dts
-f:arch/arm/boot/dts/nxp/mxs/imx28-xea.dts
-f:arch/arm/boot/dts/nxp/mxs/imx28.dtsi
-f:arch/arm/boot/dts/nxp/mxs/mxs-pinfunc.h
-f:arch/arm/boot/dts/nxp/vf/Makefile
-f:arch/arm/boot/dts/nxp/vf/vf-colibri-eval-v3.dtsi
-f:arch/arm/boot/dts/nxp/vf/vf-colibri.dtsi
-f:arch/arm/boot/dts/nxp/vf/vf500-colibri-eval-v3.dts
-f:arch/arm/boot/dts/nxp/vf/vf500-colibri.dtsi
-f:arch/arm/boot/dts/nxp/vf/vf500.dtsi
-f:arch/arm/boot/dts/nxp/vf/vf610-bk4.dts
-f:arch/arm/boot/dts/nxp/vf/vf610-colibri-eval-v3.dts
-f:arch/arm/boot/dts/nxp/vf/vf610-colibri.dtsi
-f:arch/arm/boot/dts/nxp/vf/vf610-cosmic.dts
-f:arch/arm/boot/dts/nxp/vf/vf610-pinfunc.h
-f:arch/arm/boot/dts/nxp/vf/vf610-twr.dts
-f:arch/arm/boot/dts/nxp/vf/vf610-zii-cfu1.dts
-f:arch/arm/boot/dts/nxp/vf/vf610-zii-dev-rev-b.dts
-f:arch/arm/boot/dts/nxp/vf/vf610-zii-dev-rev-c.dts
-f:arch/arm/boot/dts/nxp/vf/vf610-zii-dev.dtsi
-f:arch/arm/boot/dts/nxp/vf/vf610-zii-scu4-aib.dts
-f:arch/arm/boot/dts/nxp/vf/vf610-zii-spb4.dts
-f:arch/arm/boot/dts/nxp/vf/vf610-zii-ssmb-dtu.dts
-f:arch/arm/boot/dts/nxp/vf/vf610-zii-ssmb-spu3.dts
-f:arch/arm/boot/dts/nxp/vf/vf610.dtsi
-f:arch/arm/boot/dts/nxp/vf/vf610m4-colibri.dts
-f:arch/arm/boot/dts/nxp/vf/vf610m4-cosmic.dts
-f:arch/arm/boot/dts/nxp/vf/vf610m4.dtsi
-f:arch/arm/boot/dts/nxp/vf/vfxxx.dtsi
-f:arch/arm/boot/dts/qcom/Makefile
-f:arch/arm/boot/dts/qcom/msm8226-motorola-falcon.dts
-f:arch/arm/boot/dts/qcom/msm8926.dtsi
-f:arch/arm/boot/dts/qcom/pm8018.dtsi
-f:arch/arm/boot/dts/qcom/pm8058.dtsi
-f:arch/arm/boot/dts/qcom/pm8226.dtsi
-f:arch/arm/boot/dts/qcom/pm8821.dtsi
-f:arch/arm/boot/dts/qcom/pm8841.dtsi
-f:arch/arm/boot/dts/qcom/pm8921.dtsi
-f:arch/arm/boot/dts/qcom/pm8941.dtsi
-f:arch/arm/boot/dts/qcom/pma8084.dtsi
-f:arch/arm/boot/dts/qcom/pmx55.dtsi
-f:arch/arm/boot/dts/qcom/pmx65.dtsi
-f:arch/arm/boot/dts/qcom/qcom-apq8016-sbc.dts
-f:arch/arm/boot/dts/qcom/qcom-apq8026-asus-sparrow.dts
-f:arch/arm/boot/dts/qcom/qcom-apq8026-huawei-sturgeon.dts
-f:arch/arm/boot/dts/qcom/qcom-apq8026-lg-lenok.dts
-f:arch/arm/boot/dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts
-f:arch/arm/boot/dts/qcom/qcom-apq8026-samsung-milletwifi.dts
-f:arch/arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts
-f:arch/arm/boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts
-f:arch/arm/boot/dts/qcom/qcom-apq8064-cm-qs600.dts
-f:arch/arm/boot/dts/qcom/qcom-apq8064-ifc6410.dts
-f:arch/arm/boot/dts/qcom/qcom-apq8064-lg-nexus4-mako.dts
-f:arch/arm/boot/dts/qcom/qcom-apq8064-pins.dtsi
-f:arch/arm/boot/dts/qcom/qcom-apq8064-sony-xperia-lagan-yuga.dts
-f:arch/arm/boot/dts/qcom/qcom-apq8064-v2.0.dtsi
-f:arch/arm/boot/dts/qcom/qcom-apq8064.dtsi
-f:arch/arm/boot/dts/qcom/qcom-apq8074-dragonboard.dts
-f:arch/arm/boot/dts/qcom/qcom-apq8084-ifc6540.dts
-f:arch/arm/boot/dts/qcom/qcom-apq8084-mtp.dts
-f:arch/arm/boot/dts/qcom/qcom-apq8084.dtsi
-f:arch/arm/boot/dts/qcom/qcom-ipq4018-ap120c-ac-bit.dts
-f:arch/arm/boot/dts/qcom/qcom-ipq4018-ap120c-ac.dts
-f:arch/arm/boot/dts/qcom/qcom-ipq4018-ap120c-ac.dtsi
-f:arch/arm/boot/dts/qcom/qcom-ipq4018-jalapeno.dts
-f:arch/arm/boot/dts/qcom/qcom-ipq4019-ap.dk01.1-c1.dts
-f:arch/arm/boot/dts/qcom/qcom-ipq4019-ap.dk01.1.dtsi
-f:arch/arm/boot/dts/qcom/qcom-ipq4019-ap.dk04.1-c1.dts
-f:arch/arm/boot/dts/qcom/qcom-ipq4019-ap.dk04.1-c3.dts
-f:arch/arm/boot/dts/qcom/qcom-ipq4019-ap.dk04.1.dtsi
-f:arch/arm/boot/dts/qcom/qcom-ipq4019-ap.dk07.1-c1.dts
-f:arch/arm/boot/dts/qcom/qcom-ipq4019-ap.dk07.1-c2.dts
-f:arch/arm/boot/dts/qcom/qcom-ipq4019-ap.dk07.1.dtsi
-f:arch/arm/boot/dts/qcom/qcom-ipq4019.dtsi
-f:arch/arm/boot/dts/qcom/qcom-ipq8062-smb208.dtsi
-f:arch/arm/boot/dts/qcom/qcom-ipq8062.dtsi
-f:arch/arm/boot/dts/qcom/qcom-ipq8064-ap148.dts
-f:arch/arm/boot/dts/qcom/qcom-ipq8064-rb3011.dts
-f:arch/arm/boot/dts/qcom/qcom-ipq8064-smb208.dtsi
-f:arch/arm/boot/dts/qcom/qcom-ipq8064-v1.0.dtsi
-f:arch/arm/boot/dts/qcom/qcom-ipq8064-v2.0-smb208.dtsi
-f:arch/arm/boot/dts/qcom/qcom-ipq8064-v2.0.dtsi
-f:arch/arm/boot/dts/qcom/qcom-ipq8064.dtsi
-f:arch/arm/boot/dts/qcom/qcom-ipq8065-smb208.dtsi
-f:arch/arm/boot/dts/qcom/qcom-ipq8065.dtsi
-f:arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548-mangoh-green.dts
-f:arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi
-f:arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi
-f:arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-common.dtsi
-f:arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-dempsey.dts
-f:arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-makepeace.dts
-f:arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-moneypenny.dts
-f:arch/arm/boot/dts/qcom/qcom-msm8226-samsung-matisse-common.dtsi
-f:arch/arm/boot/dts/qcom/qcom-msm8226-samsung-ms013g.dts
-f:arch/arm/boot/dts/qcom/qcom-msm8226-samsung-s3ve3g.dts
-f:arch/arm/boot/dts/qcom/qcom-msm8226.dtsi
-f:arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts
-f:arch/arm/boot/dts/qcom/qcom-msm8660.dtsi
-f:arch/arm/boot/dts/qcom/qcom-msm8916-samsung-e5.dts
-f:arch/arm/boot/dts/qcom/qcom-msm8916-samsung-e7.dts
-f:arch/arm/boot/dts/qcom/qcom-msm8916-samsung-grandmax.dts
-f:arch/arm/boot/dts/qcom/qcom-msm8916-samsung-serranove.dts
-f:arch/arm/boot/dts/qcom/qcom-msm8916-smp.dtsi
-f:arch/arm/boot/dts/qcom/qcom-msm8926-htc-memul.dts
-f:arch/arm/boot/dts/qcom/qcom-msm8926-microsoft-superman-lte.dts
-f:arch/arm/boot/dts/qcom/qcom-msm8926-microsoft-tesla.dts
-f:arch/arm/boot/dts/qcom/qcom-msm8926-motorola-peregrine.dts
-f:arch/arm/boot/dts/qcom/qcom-msm8926-samsung-matisselte.dts
-f:arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts
-f:arch/arm/boot/dts/qcom/qcom-msm8960-pins.dtsi
-f:arch/arm/boot/dts/qcom/qcom-msm8960-samsung-expressatt.dts
-f:arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
-f:arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts
-f:arch/arm/boot/dts/qcom/qcom-msm8974-samsung-hlte.dts
-f:arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine-amami.dts
-f:arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine-honami.dts
-f:arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine-togari.dts
-f:arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi
-f:arch/arm/boot/dts/qcom/qcom-msm8974.dtsi
-f:arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts
-f:arch/arm/boot/dts/qcom/qcom-msm8974pro-htc-m8.dts
-f:arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts
-f:arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte-common.dtsi
-f:arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte.dts
-f:arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-kltechn.dts
-f:arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-aries.dts
-f:arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts
-f:arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-common.dtsi
-f:arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-leo.dts
-f:arch/arm/boot/dts/qcom/qcom-msm8974pro.dtsi
-f:arch/arm/boot/dts/qcom/qcom-sdx55-mtp.dts
-f:arch/arm/boot/dts/qcom/qcom-sdx55-t55.dts
-f:arch/arm/boot/dts/qcom/qcom-sdx55-telit-fn980-tlb.dts
-f:arch/arm/boot/dts/qcom/qcom-sdx55.dtsi
-f:arch/arm/boot/dts/qcom/qcom-sdx65-mtp.dts
-f:arch/arm/boot/dts/qcom/qcom-sdx65.dtsi
-f:arch/arm/boot/dts/realtek/Makefile
-f:arch/arm/boot/dts/realtek/rtd1195-horseradish.dts
-f:arch/arm/boot/dts/realtek/rtd1195-mele-x1000.dts
-f:arch/arm/boot/dts/realtek/rtd1195.dtsi
-f:arch/arm/boot/dts/renesas/Makefile
-f:arch/arm/boot/dts/renesas/emev2-kzm9d.dts
-f:arch/arm/boot/dts/renesas/emev2.dtsi
-f:arch/arm/boot/dts/renesas/gr-peach-audiocamerashield.dtsi
-f:arch/arm/boot/dts/renesas/iwg20d-q7-common.dtsi
-f:arch/arm/boot/dts/renesas/iwg20d-q7-dbcm-ca.dtsi
-f:arch/arm/boot/dts/renesas/r7s72100-genmai.dts
-f:arch/arm/boot/dts/renesas/r7s72100-gr-peach.dts
-f:arch/arm/boot/dts/renesas/r7s72100-rskrza1.dts
-f:arch/arm/boot/dts/renesas/r7s72100.dtsi
-f:arch/arm/boot/dts/renesas/r7s9210-rza2mevb.dts
-f:arch/arm/boot/dts/renesas/r7s9210.dtsi
-f:arch/arm/boot/dts/renesas/r8a73a4-ape6evm.dts
-f:arch/arm/boot/dts/renesas/r8a73a4.dtsi
-f:arch/arm/boot/dts/renesas/r8a7740-armadillo800eva.dts
-f:arch/arm/boot/dts/renesas/r8a7740.dtsi
-f:arch/arm/boot/dts/renesas/r8a7742-iwg21d-q7-dbcm-ca.dts
-f:arch/arm/boot/dts/renesas/r8a7742-iwg21d-q7-dbcm-ov5640-single.dtsi
-f:arch/arm/boot/dts/renesas/r8a7742-iwg21d-q7-dbcm-ov7725-single.dtsi
-f:arch/arm/boot/dts/renesas/r8a7742-iwg21d-q7.dts
-f:arch/arm/boot/dts/renesas/r8a7742-iwg21m.dtsi
-f:arch/arm/boot/dts/renesas/r8a7742.dtsi
-f:arch/arm/boot/dts/renesas/r8a7743-iwg20d-q7-dbcm-ca.dts
-f:arch/arm/boot/dts/renesas/r8a7743-iwg20d-q7.dts
-f:arch/arm/boot/dts/renesas/r8a7743-iwg20m.dtsi
-f:arch/arm/boot/dts/renesas/r8a7743-sk-rzg1m.dts
-f:arch/arm/boot/dts/renesas/r8a7743.dtsi
-f:arch/arm/boot/dts/renesas/r8a7744-iwg20d-q7-dbcm-ca.dts
-f:arch/arm/boot/dts/renesas/r8a7744-iwg20d-q7.dts
-f:arch/arm/boot/dts/renesas/r8a7744-iwg20m.dtsi
-f:arch/arm/boot/dts/renesas/r8a7744.dtsi
-f:arch/arm/boot/dts/renesas/r8a7745-iwg22d-sodimm-dbhd-ca.dts
-f:arch/arm/boot/dts/renesas/r8a7745-iwg22d-sodimm.dts
-f:arch/arm/boot/dts/renesas/r8a7745-iwg22m.dtsi
-f:arch/arm/boot/dts/renesas/r8a7745-sk-rzg1e.dts
-f:arch/arm/boot/dts/renesas/r8a7745.dtsi
-f:arch/arm/boot/dts/renesas/r8a77470-iwg23s-sbc.dts
-f:arch/arm/boot/dts/renesas/r8a77470.dtsi
-f:arch/arm/boot/dts/renesas/r8a7778-bockw.dts
-f:arch/arm/boot/dts/renesas/r8a7778.dtsi
-f:arch/arm/boot/dts/renesas/r8a7779-marzen.dts
-f:arch/arm/boot/dts/renesas/r8a7779.dtsi
-f:arch/arm/boot/dts/renesas/r8a7790-lager.dts
-f:arch/arm/boot/dts/renesas/r8a7790-stout.dts
-f:arch/arm/boot/dts/renesas/r8a7790.dtsi
-f:arch/arm/boot/dts/renesas/r8a7791-koelsch.dts
-f:arch/arm/boot/dts/renesas/r8a7791-porter.dts
-f:arch/arm/boot/dts/renesas/r8a7791.dtsi
-f:arch/arm/boot/dts/renesas/r8a7792-blanche.dts
-f:arch/arm/boot/dts/renesas/r8a7792-wheat.dts
-f:arch/arm/boot/dts/renesas/r8a7792.dtsi
-f:arch/arm/boot/dts/renesas/r8a7793-gose.dts
-f:arch/arm/boot/dts/renesas/r8a7793.dtsi
-f:arch/arm/boot/dts/renesas/r8a7794-alt.dts
-f:arch/arm/boot/dts/renesas/r8a7794-silk.dts
-f:arch/arm/boot/dts/renesas/r8a7794.dtsi
-f:arch/arm/boot/dts/renesas/r8a77xx-aa121td01-panel.dtsi
-f:arch/arm/boot/dts/renesas/r9a06g032-rzn1d400-db.dts
-f:arch/arm/boot/dts/renesas/r9a06g032-rzn1d400-eb.dts
-f:arch/arm/boot/dts/renesas/r9a06g032.dtsi
-f:arch/arm/boot/dts/renesas/sh73a0-kzm9g.dts
-f:arch/arm/boot/dts/renesas/sh73a0.dtsi
-f:arch/arm/boot/dts/rockchip/Makefile
-f:arch/arm/boot/dts/rockchip/rk3036-evb.dts
-f:arch/arm/boot/dts/rockchip/rk3036-kylin.dts
-f:arch/arm/boot/dts/rockchip/rk3036.dtsi
-f:arch/arm/boot/dts/rockchip/rk3066a-bqcurie2.dts
-f:arch/arm/boot/dts/rockchip/rk3066a-marsboard.dts
-f:arch/arm/boot/dts/rockchip/rk3066a-mk808.dts
-f:arch/arm/boot/dts/rockchip/rk3066a-rayeager.dts
-f:arch/arm/boot/dts/rockchip/rk3066a.dtsi
-f:arch/arm/boot/dts/rockchip/rk3128-evb.dts
-f:arch/arm/boot/dts/rockchip/rk3128-xpi-3128.dts
-f:arch/arm/boot/dts/rockchip/rk3128.dtsi
-f:arch/arm/boot/dts/rockchip/rk3188-bqedison2qc.dts
-f:arch/arm/boot/dts/rockchip/rk3188-px3-evb.dts
-f:arch/arm/boot/dts/rockchip/rk3188-radxarock.dts
-f:arch/arm/boot/dts/rockchip/rk3188.dtsi
-f:arch/arm/boot/dts/rockchip/rk3228-evb.dts
-f:arch/arm/boot/dts/rockchip/rk3229-evb.dts
-f:arch/arm/boot/dts/rockchip/rk3229-xms6.dts
-f:arch/arm/boot/dts/rockchip/rk3229.dtsi
-f:arch/arm/boot/dts/rockchip/rk322x.dtsi
-f:arch/arm/boot/dts/rockchip/rk3288-evb-act8846.dts
-f:arch/arm/boot/dts/rockchip/rk3288-evb-rk808.dts
-f:arch/arm/boot/dts/rockchip/rk3288-evb.dtsi
-f:arch/arm/boot/dts/rockchip/rk3288-firefly-beta.dts
-f:arch/arm/boot/dts/rockchip/rk3288-firefly-reload-core.dtsi
-f:arch/arm/boot/dts/rockchip/rk3288-firefly-reload.dts
-f:arch/arm/boot/dts/rockchip/rk3288-firefly.dts
-f:arch/arm/boot/dts/rockchip/rk3288-firefly.dtsi
-f:arch/arm/boot/dts/rockchip/rk3288-miqi.dts
-f:arch/arm/boot/dts/rockchip/rk3288-phycore-rdk.dts
-f:arch/arm/boot/dts/rockchip/rk3288-phycore-som.dtsi
-f:arch/arm/boot/dts/rockchip/rk3288-popmetal.dts
-f:arch/arm/boot/dts/rockchip/rk3288-r89.dts
-f:arch/arm/boot/dts/rockchip/rk3288-rock-pi-n8.dts
-f:arch/arm/boot/dts/rockchip/rk3288-rock2-som.dtsi
-f:arch/arm/boot/dts/rockchip/rk3288-rock2-square.dts
-f:arch/arm/boot/dts/rockchip/rk3288-tinker-s.dts
-f:arch/arm/boot/dts/rockchip/rk3288-tinker.dts
-f:arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
-f:arch/arm/boot/dts/rockchip/rk3288-veyron-analog-audio.dtsi
-f:arch/arm/boot/dts/rockchip/rk3288-veyron-brain.dts
-f:arch/arm/boot/dts/rockchip/rk3288-veyron-broadcom-bluetooth.dtsi
-f:arch/arm/boot/dts/rockchip/rk3288-veyron-chromebook.dtsi
-f:arch/arm/boot/dts/rockchip/rk3288-veyron-edp.dtsi
-f:arch/arm/boot/dts/rockchip/rk3288-veyron-fievel.dts
-f:arch/arm/boot/dts/rockchip/rk3288-veyron-jaq.dts
-f:arch/arm/boot/dts/rockchip/rk3288-veyron-jerry.dts
-f:arch/arm/boot/dts/rockchip/rk3288-veyron-mickey.dts
-f:arch/arm/boot/dts/rockchip/rk3288-veyron-mighty.dts
-f:arch/arm/boot/dts/rockchip/rk3288-veyron-minnie.dts
-f:arch/arm/boot/dts/rockchip/rk3288-veyron-pinky.dts
-f:arch/arm/boot/dts/rockchip/rk3288-veyron-sdmmc.dtsi
-f:arch/arm/boot/dts/rockchip/rk3288-veyron-speedy.dts
-f:arch/arm/boot/dts/rockchip/rk3288-veyron-tiger.dts
-f:arch/arm/boot/dts/rockchip/rk3288-veyron.dtsi
-f:arch/arm/boot/dts/rockchip/rk3288-vmarc-som.dtsi
-f:arch/arm/boot/dts/rockchip/rk3288-vyasa.dts
-f:arch/arm/boot/dts/rockchip/rk3288.dtsi
-f:arch/arm/boot/dts/rockchip/rk3xxx.dtsi
-f:arch/arm/boot/dts/rockchip/rockchip-radxa-dalang-carrier.dtsi
-f:arch/arm/boot/dts/rockchip/rv1108-elgin-r1.dts
-f:arch/arm/boot/dts/rockchip/rv1108-evb.dts
-f:arch/arm/boot/dts/rockchip/rv1108.dtsi
-f:arch/arm/boot/dts/rockchip/rv1109-relfor-saib.dts
-f:arch/arm/boot/dts/rockchip/rv1109-sonoff-ihost.dts
-f:arch/arm/boot/dts/rockchip/rv1109.dtsi
-f:arch/arm/boot/dts/rockchip/rv1126-edgeble-neu2-io.dts
-f:arch/arm/boot/dts/rockchip/rv1126-edgeble-neu2.dtsi
-f:arch/arm/boot/dts/rockchip/rv1126-pinctrl.dtsi
-f:arch/arm/boot/dts/rockchip/rv1126-sonoff-ihost.dts
-f:arch/arm/boot/dts/rockchip/rv1126-sonoff-ihost.dtsi
-f:arch/arm/boot/dts/rockchip/rv1126.dtsi
-f:arch/arm/boot/dts/samsung/Makefile
-f:arch/arm/boot/dts/samsung/exynos-mfc-reserved-memory.dtsi
-f:arch/arm/boot/dts/samsung/exynos-pinctrl.h
-f:arch/arm/boot/dts/samsung/exynos-syscon-restart.dtsi
-f:arch/arm/boot/dts/samsung/exynos3250-artik5-eval.dts
-f:arch/arm/boot/dts/samsung/exynos3250-artik5.dtsi
-f:arch/arm/boot/dts/samsung/exynos3250-monk.dts
-f:arch/arm/boot/dts/samsung/exynos3250-pinctrl.dtsi
-f:arch/arm/boot/dts/samsung/exynos3250-rinato.dts
-f:arch/arm/boot/dts/samsung/exynos3250.dtsi
-f:arch/arm/boot/dts/samsung/exynos4-cpu-thermal.dtsi
-f:arch/arm/boot/dts/samsung/exynos4.dtsi
-f:arch/arm/boot/dts/samsung/exynos4210-i9100.dts
-f:arch/arm/boot/dts/samsung/exynos4210-origen.dts
-f:arch/arm/boot/dts/samsung/exynos4210-pinctrl.dtsi
-f:arch/arm/boot/dts/samsung/exynos4210-smdkv310.dts
-f:arch/arm/boot/dts/samsung/exynos4210-trats.dts
-f:arch/arm/boot/dts/samsung/exynos4210-universal_c210.dts
-f:arch/arm/boot/dts/samsung/exynos4210.dtsi
-f:arch/arm/boot/dts/samsung/exynos4212-tab3-3g8.dts
-f:arch/arm/boot/dts/samsung/exynos4212-tab3-lte8.dts
-f:arch/arm/boot/dts/samsung/exynos4212-tab3-wifi8.dts
-f:arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi
-f:arch/arm/boot/dts/samsung/exynos4212.dtsi
-f:arch/arm/boot/dts/samsung/exynos4412-galaxy-s3.dtsi
-f:arch/arm/boot/dts/samsung/exynos4412-i9300.dts
-f:arch/arm/boot/dts/samsung/exynos4412-i9305.dts
-f:arch/arm/boot/dts/samsung/exynos4412-itop-elite.dts
-f:arch/arm/boot/dts/samsung/exynos4412-itop-scp-core.dtsi
-f:arch/arm/boot/dts/samsung/exynos4412-midas.dtsi
-f:arch/arm/boot/dts/samsung/exynos4412-n710x.dts
-f:arch/arm/boot/dts/samsung/exynos4412-odroid-common.dtsi
-f:arch/arm/boot/dts/samsung/exynos4412-odroidu3.dts
-f:arch/arm/boot/dts/samsung/exynos4412-odroidx.dts
-f:arch/arm/boot/dts/samsung/exynos4412-odroidx2.dts
-f:arch/arm/boot/dts/samsung/exynos4412-origen.dts
-f:arch/arm/boot/dts/samsung/exynos4412-p4note-n8010.dts
-f:arch/arm/boot/dts/samsung/exynos4412-p4note.dtsi
-f:arch/arm/boot/dts/samsung/exynos4412-ppmu-common.dtsi
-f:arch/arm/boot/dts/samsung/exynos4412-prime.dtsi
-f:arch/arm/boot/dts/samsung/exynos4412-smdk4412.dts
-f:arch/arm/boot/dts/samsung/exynos4412-tiny4412.dts
-f:arch/arm/boot/dts/samsung/exynos4412-trats2.dts
-f:arch/arm/boot/dts/samsung/exynos4412.dtsi
-f:arch/arm/boot/dts/samsung/exynos4x12-pinctrl.dtsi
-f:arch/arm/boot/dts/samsung/exynos4x12.dtsi
-f:arch/arm/boot/dts/samsung/exynos5.dtsi
-f:arch/arm/boot/dts/samsung/exynos5250-arndale.dts
-f:arch/arm/boot/dts/samsung/exynos5250-pinctrl.dtsi
-f:arch/arm/boot/dts/samsung/exynos5250-smdk5250.dts
-f:arch/arm/boot/dts/samsung/exynos5250-snow-common.dtsi
-f:arch/arm/boot/dts/samsung/exynos5250-snow-rev5.dts
-f:arch/arm/boot/dts/samsung/exynos5250-snow.dts
-f:arch/arm/boot/dts/samsung/exynos5250-spring.dts
-f:arch/arm/boot/dts/samsung/exynos5250.dtsi
-f:arch/arm/boot/dts/samsung/exynos5260-pinctrl.dtsi
-f:arch/arm/boot/dts/samsung/exynos5260-xyref5260.dts
-f:arch/arm/boot/dts/samsung/exynos5260.dtsi
-f:arch/arm/boot/dts/samsung/exynos5410-odroidxu.dts
-f:arch/arm/boot/dts/samsung/exynos5410-pinctrl.dtsi
-f:arch/arm/boot/dts/samsung/exynos5410-smdk5410.dts
-f:arch/arm/boot/dts/samsung/exynos5410.dtsi
-f:arch/arm/boot/dts/samsung/exynos5420-arndale-octa.dts
-f:arch/arm/boot/dts/samsung/exynos5420-chagall-wifi.dts
-f:arch/arm/boot/dts/samsung/exynos5420-cpus.dtsi
-f:arch/arm/boot/dts/samsung/exynos5420-galaxy-tab-common.dtsi
-f:arch/arm/boot/dts/samsung/exynos5420-klimt-wifi.dts
-f:arch/arm/boot/dts/samsung/exynos5420-peach-pit.dts
-f:arch/arm/boot/dts/samsung/exynos5420-pinctrl.dtsi
-f:arch/arm/boot/dts/samsung/exynos5420-smdk5420.dts
-f:arch/arm/boot/dts/samsung/exynos5420-trip-points.dtsi
-f:arch/arm/boot/dts/samsung/exynos5420.dtsi
-f:arch/arm/boot/dts/samsung/exynos5422-cpus.dtsi
-f:arch/arm/boot/dts/samsung/exynos5422-odroid-core.dtsi
-f:arch/arm/boot/dts/samsung/exynos5422-odroidhc1.dts
-f:arch/arm/boot/dts/samsung/exynos5422-odroidxu3-audio.dtsi
-f:arch/arm/boot/dts/samsung/exynos5422-odroidxu3-common.dtsi
-f:arch/arm/boot/dts/samsung/exynos5422-odroidxu3-lite.dts
-f:arch/arm/boot/dts/samsung/exynos5422-odroidxu3.dts
-f:arch/arm/boot/dts/samsung/exynos5422-odroidxu4.dts
-f:arch/arm/boot/dts/samsung/exynos5422-samsung-k3g.dts
-f:arch/arm/boot/dts/samsung/exynos54xx-odroidxu-leds.dtsi
-f:arch/arm/boot/dts/samsung/exynos54xx.dtsi
-f:arch/arm/boot/dts/samsung/exynos5800-peach-pi.dts
-f:arch/arm/boot/dts/samsung/exynos5800.dtsi
-f:arch/arm/boot/dts/samsung/s3c6400.dtsi
-f:arch/arm/boot/dts/samsung/s3c6410-mini6410.dts
-f:arch/arm/boot/dts/samsung/s3c6410-smdk6410.dts
-f:arch/arm/boot/dts/samsung/s3c6410.dtsi
-f:arch/arm/boot/dts/samsung/s3c64xx-pinctrl.dtsi
-f:arch/arm/boot/dts/samsung/s3c64xx-pinctrl.h
-f:arch/arm/boot/dts/samsung/s3c64xx.dtsi
-f:arch/arm/boot/dts/samsung/s5pv210-aquila.dts
-f:arch/arm/boot/dts/samsung/s5pv210-aries.dtsi
-f:arch/arm/boot/dts/samsung/s5pv210-fascinate4g.dts
-f:arch/arm/boot/dts/samsung/s5pv210-galaxys.dts
-f:arch/arm/boot/dts/samsung/s5pv210-goni.dts
-f:arch/arm/boot/dts/samsung/s5pv210-pinctrl.dtsi
-f:arch/arm/boot/dts/samsung/s5pv210-pinctrl.h
-f:arch/arm/boot/dts/samsung/s5pv210-smdkc110.dts
-f:arch/arm/boot/dts/samsung/s5pv210-smdkv210.dts
-f:arch/arm/boot/dts/samsung/s5pv210-torbreck.dts
-f:arch/arm/boot/dts/samsung/s5pv210.dtsi
-f:arch/arm/boot/dts/sigmastar/Makefile
-f:arch/arm/boot/dts/sigmastar/mstar-infinity-breadbee-common.dtsi
-f:arch/arm/boot/dts/sigmastar/mstar-infinity-msc313-breadbee_crust.dts
-f:arch/arm/boot/dts/sigmastar/mstar-infinity-msc313.dtsi
-f:arch/arm/boot/dts/sigmastar/mstar-infinity.dtsi
-f:arch/arm/boot/dts/sigmastar/mstar-infinity2m-ssd201-som2d01.dtsi
-f:arch/arm/boot/dts/sigmastar/mstar-infinity2m-ssd202d-100ask-dongshanpione.dts
-f:arch/arm/boot/dts/sigmastar/mstar-infinity2m-ssd202d-miyoo-mini.dts
-f:arch/arm/boot/dts/sigmastar/mstar-infinity2m-ssd202d-ssd201htv2.dts
-f:arch/arm/boot/dts/sigmastar/mstar-infinity2m-ssd202d-unitv2.dts
-f:arch/arm/boot/dts/sigmastar/mstar-infinity2m-ssd202d-wirelesstag-ido-sbc2d06-v1b-22w.dts
-f:arch/arm/boot/dts/sigmastar/mstar-infinity2m-ssd202d-wirelesstag-ido-som2d01.dtsi
-f:arch/arm/boot/dts/sigmastar/mstar-infinity2m-ssd202d.dtsi
-f:arch/arm/boot/dts/sigmastar/mstar-infinity2m-ssd20xd.dtsi
-f:arch/arm/boot/dts/sigmastar/mstar-infinity2m.dtsi
-f:arch/arm/boot/dts/sigmastar/mstar-infinity3-msc313e-breadbee.dts
-f:arch/arm/boot/dts/sigmastar/mstar-infinity3-msc313e.dtsi
-f:arch/arm/boot/dts/sigmastar/mstar-infinity3.dtsi
-f:arch/arm/boot/dts/sigmastar/mstar-mercury5-ssc8336n-midrived08.dts
-f:arch/arm/boot/dts/sigmastar/mstar-mercury5-ssc8336n.dtsi
-f:arch/arm/boot/dts/sigmastar/mstar-mercury5.dtsi
-f:arch/arm/boot/dts/sigmastar/mstar-v7.dtsi
-f:arch/arm/boot/dts/socionext/Makefile
-f:arch/arm/boot/dts/socionext/milbeaut-m10v-evb.dts
-f:arch/arm/boot/dts/socionext/milbeaut-m10v.dtsi
-f:arch/arm/boot/dts/socionext/uniphier-ld4-ref.dts
-f:arch/arm/boot/dts/socionext/uniphier-ld4.dtsi
-f:arch/arm/boot/dts/socionext/uniphier-ld6b-ref.dts
-f:arch/arm/boot/dts/socionext/uniphier-ld6b.dtsi
-f:arch/arm/boot/dts/socionext/uniphier-pinctrl.dtsi
-f:arch/arm/boot/dts/socionext/uniphier-pro4-ace.dts
-f:arch/arm/boot/dts/socionext/uniphier-pro4-ref.dts
-f:arch/arm/boot/dts/socionext/uniphier-pro4-sanji.dts
-f:arch/arm/boot/dts/socionext/uniphier-pro4.dtsi
-f:arch/arm/boot/dts/socionext/uniphier-pro5-epcore.dts
-f:arch/arm/boot/dts/socionext/uniphier-pro5-proex.dts
-f:arch/arm/boot/dts/socionext/uniphier-pro5.dtsi
-f:arch/arm/boot/dts/socionext/uniphier-pxs2-gentil.dts
-f:arch/arm/boot/dts/socionext/uniphier-pxs2-vodka.dts
-f:arch/arm/boot/dts/socionext/uniphier-pxs2.dtsi
-f:arch/arm/boot/dts/socionext/uniphier-ref-daughter.dtsi
-f:arch/arm/boot/dts/socionext/uniphier-sld8-ref.dts
-f:arch/arm/boot/dts/socionext/uniphier-sld8.dtsi
-f:arch/arm/boot/dts/socionext/uniphier-support-card.dtsi
-f:arch/arm/boot/dts/st/Makefile
-f:arch/arm/boot/dts/st/spear1310-evb.dts
-f:arch/arm/boot/dts/st/spear1310.dtsi
-f:arch/arm/boot/dts/st/spear1340-evb.dts
-f:arch/arm/boot/dts/st/spear1340.dtsi
-f:arch/arm/boot/dts/st/spear13xx.dtsi
-f:arch/arm/boot/dts/st/spear300-evb.dts
-f:arch/arm/boot/dts/st/spear300.dtsi
-f:arch/arm/boot/dts/st/spear310-evb.dts
-f:arch/arm/boot/dts/st/spear310.dtsi
-f:arch/arm/boot/dts/st/spear320-evb.dts
-f:arch/arm/boot/dts/st/spear320-hmi.dts
-f:arch/arm/boot/dts/st/spear320.dtsi
-f:arch/arm/boot/dts/st/spear320s.dtsi
-f:arch/arm/boot/dts/st/spear3xx.dtsi
-f:arch/arm/boot/dts/st/spear600-evb.dts
-f:arch/arm/boot/dts/st/spear600.dtsi
-f:arch/arm/boot/dts/st/st-pincfg.h
-f:arch/arm/boot/dts/st/ste-ab8500.dtsi
-f:arch/arm/boot/dts/st/ste-ab8505.dtsi
-f:arch/arm/boot/dts/st/ste-db8500.dtsi
-f:arch/arm/boot/dts/st/ste-db8520.dtsi
-f:arch/arm/boot/dts/st/ste-db9500.dtsi
-f:arch/arm/boot/dts/st/ste-dbx5x0-pinctrl.dtsi
-f:arch/arm/boot/dts/st/ste-dbx5x0.dtsi
-f:arch/arm/boot/dts/st/ste-href-ab8500.dtsi
-f:arch/arm/boot/dts/st/ste-href-ab8505.dtsi
-f:arch/arm/boot/dts/st/ste-href-family-pinctrl.dtsi
-f:arch/arm/boot/dts/st/ste-href-stuib.dtsi
-f:arch/arm/boot/dts/st/ste-href-tvk1281618-r2.dtsi
-f:arch/arm/boot/dts/st/ste-href-tvk1281618-r3.dtsi
-f:arch/arm/boot/dts/st/ste-href.dtsi
-f:arch/arm/boot/dts/st/ste-href520-tvk.dts
-f:arch/arm/boot/dts/st/ste-hrefprev60-stuib.dts
-f:arch/arm/boot/dts/st/ste-hrefprev60-tvk.dts
-f:arch/arm/boot/dts/st/ste-hrefprev60.dtsi
-f:arch/arm/boot/dts/st/ste-hrefv60plus-stuib.dts
-f:arch/arm/boot/dts/st/ste-hrefv60plus-tvk.dts
-f:arch/arm/boot/dts/st/ste-hrefv60plus.dtsi
-f:arch/arm/boot/dts/st/ste-nomadik-nhk15.dts
-f:arch/arm/boot/dts/st/ste-nomadik-pinctrl.dtsi
-f:arch/arm/boot/dts/st/ste-nomadik-s8815.dts
-f:arch/arm/boot/dts/st/ste-nomadik-stn8815.dtsi
-f:arch/arm/boot/dts/st/ste-snowball.dts
-f:arch/arm/boot/dts/st/ste-ux500-samsung-codina-tmo.dts
-f:arch/arm/boot/dts/st/ste-ux500-samsung-codina.dts
-f:arch/arm/boot/dts/st/ste-ux500-samsung-gavini.dts
-f:arch/arm/boot/dts/st/ste-ux500-samsung-golden.dts
-f:arch/arm/boot/dts/st/ste-ux500-samsung-janice.dts
-f:arch/arm/boot/dts/st/ste-ux500-samsung-kyle.dts
-f:arch/arm/boot/dts/st/ste-ux500-samsung-skomer.dts
-f:arch/arm/boot/dts/st/stih407-b2120.dts
-f:arch/arm/boot/dts/st/stih407-clock.dtsi
-f:arch/arm/boot/dts/st/stih407-family.dtsi
-f:arch/arm/boot/dts/st/stih407-pinctrl.dtsi
-f:arch/arm/boot/dts/st/stih407.dtsi
-f:arch/arm/boot/dts/st/stih410-b2120.dts
-f:arch/arm/boot/dts/st/stih410-b2260.dts
-f:arch/arm/boot/dts/st/stih410-clock.dtsi
-f:arch/arm/boot/dts/st/stih410-pinctrl.dtsi
-f:arch/arm/boot/dts/st/stih410.dtsi
-f:arch/arm/boot/dts/st/stih418-b2199.dts
-f:arch/arm/boot/dts/st/stih418-b2264.dts
-f:arch/arm/boot/dts/st/stih418-clock.dtsi
-f:arch/arm/boot/dts/st/stih418.dtsi
-f:arch/arm/boot/dts/st/stihxxx-b2120.dtsi
-f:arch/arm/boot/dts/st/stm32429i-eval.dts
-f:arch/arm/boot/dts/st/stm32746g-eval.dts
-f:arch/arm/boot/dts/st/stm32f4-pinctrl.dtsi
-f:arch/arm/boot/dts/st/stm32f429-disco.dts
-f:arch/arm/boot/dts/st/stm32f429-pinctrl.dtsi
-f:arch/arm/boot/dts/st/stm32f429.dtsi
-f:arch/arm/boot/dts/st/stm32f469-disco.dts
-f:arch/arm/boot/dts/st/stm32f469-pinctrl.dtsi
-f:arch/arm/boot/dts/st/stm32f469.dtsi
-f:arch/arm/boot/dts/st/stm32f7-pinctrl.dtsi
-f:arch/arm/boot/dts/st/stm32f746-disco.dts
-f:arch/arm/boot/dts/st/stm32f746-pinctrl.dtsi
-f:arch/arm/boot/dts/st/stm32f746.dtsi
-f:arch/arm/boot/dts/st/stm32f769-disco-mb1166-reva09.dts
-f:arch/arm/boot/dts/st/stm32f769-disco.dts
-f:arch/arm/boot/dts/st/stm32f769-pinctrl.dtsi
-f:arch/arm/boot/dts/st/stm32f769.dtsi
-f:arch/arm/boot/dts/st/stm32h7-pinctrl.dtsi
-f:arch/arm/boot/dts/st/stm32h743.dtsi
-f:arch/arm/boot/dts/st/stm32h743i-disco.dts
-f:arch/arm/boot/dts/st/stm32h743i-eval.dts
-f:arch/arm/boot/dts/st/stm32h747i-disco.dts
-f:arch/arm/boot/dts/st/stm32h750.dtsi
-f:arch/arm/boot/dts/st/stm32h750i-art-pi.dts
-f:arch/arm/boot/dts/st/stm32mp13-pinctrl.dtsi
-f:arch/arm/boot/dts/st/stm32mp131.dtsi
-f:arch/arm/boot/dts/st/stm32mp133.dtsi
-f:arch/arm/boot/dts/st/stm32mp133c-prihmb.dts
-f:arch/arm/boot/dts/st/stm32mp135.dtsi
-f:arch/arm/boot/dts/st/stm32mp135f-dhcor-dhsbc.dts
-f:arch/arm/boot/dts/st/stm32mp135f-dk.dts
-f:arch/arm/boot/dts/st/stm32mp13xc.dtsi
-f:arch/arm/boot/dts/st/stm32mp13xf.dtsi
-f:arch/arm/boot/dts/st/stm32mp13xx-dhcor-som.dtsi
-f:arch/arm/boot/dts/st/stm32mp15-pinctrl.dtsi
-f:arch/arm/boot/dts/st/stm32mp15-scmi.dtsi
-f:arch/arm/boot/dts/st/stm32mp151.dtsi
-f:arch/arm/boot/dts/st/stm32mp151a-dhcor-testbench.dts
-f:arch/arm/boot/dts/st/stm32mp151a-prtt1a.dts
-f:arch/arm/boot/dts/st/stm32mp151a-prtt1c.dts
-f:arch/arm/boot/dts/st/stm32mp151a-prtt1l.dtsi
-f:arch/arm/boot/dts/st/stm32mp151a-prtt1s.dts
-f:arch/arm/boot/dts/st/stm32mp151c-mecio1r0.dts
-f:arch/arm/boot/dts/st/stm32mp151c-mect1s.dts
-f:arch/arm/boot/dts/st/stm32mp151c-plyaqm.dts
-f:arch/arm/boot/dts/st/stm32mp153.dtsi
-f:arch/arm/boot/dts/st/stm32mp153c-dhcom-drc02.dts
-f:arch/arm/boot/dts/st/stm32mp153c-dhcor-drc-compact.dts
-f:arch/arm/boot/dts/st/stm32mp153c-lxa-fairytux2-gen1.dts
-f:arch/arm/boot/dts/st/stm32mp153c-lxa-fairytux2-gen2.dts
-f:arch/arm/boot/dts/st/stm32mp153c-lxa-fairytux2.dtsi
-f:arch/arm/boot/dts/st/stm32mp153c-lxa-tac-gen3.dts
-f:arch/arm/boot/dts/st/stm32mp153c-mecio1r1.dts
-f:arch/arm/boot/dts/st/stm32mp157.dtsi
-f:arch/arm/boot/dts/st/stm32mp157a-avenger96.dts
-f:arch/arm/boot/dts/st/stm32mp157a-dhcor-avenger96.dts
-f:arch/arm/boot/dts/st/stm32mp157a-dk1-scmi.dts
-f:arch/arm/boot/dts/st/stm32mp157a-dk1.dts
-f:arch/arm/boot/dts/st/stm32mp157a-icore-stm32mp1-ctouch2-of10.dts
-f:arch/arm/boot/dts/st/stm32mp157a-icore-stm32mp1-ctouch2.dts
-f:arch/arm/boot/dts/st/stm32mp157a-icore-stm32mp1-edimm2.2.dts
-f:arch/arm/boot/dts/st/stm32mp157a-icore-stm32mp1.dtsi
-f:arch/arm/boot/dts/st/stm32mp157a-iot-box.dts
-f:arch/arm/boot/dts/st/stm32mp157a-microgea-stm32mp1-microdev2.0-of7.dts
-f:arch/arm/boot/dts/st/stm32mp157a-microgea-stm32mp1-microdev2.0.dts
-f:arch/arm/boot/dts/st/stm32mp157a-microgea-stm32mp1.dtsi
-f:arch/arm/boot/dts/st/stm32mp157a-stinger96.dts
-f:arch/arm/boot/dts/st/stm32mp157a-stinger96.dtsi
-f:arch/arm/boot/dts/st/stm32mp157c-dhcom-pdk2.dts
-f:arch/arm/boot/dts/st/stm32mp157c-dhcom-picoitx.dts
-f:arch/arm/boot/dts/st/stm32mp157c-dk2-scmi.dts
-f:arch/arm/boot/dts/st/stm32mp157c-dk2.dts
-f:arch/arm/boot/dts/st/stm32mp157c-ed1-scmi.dts
-f:arch/arm/boot/dts/st/stm32mp157c-ed1.dts
-f:arch/arm/boot/dts/st/stm32mp157c-emsbc-argon.dts
-f:arch/arm/boot/dts/st/stm32mp157c-emstamp-argon.dtsi
-f:arch/arm/boot/dts/st/stm32mp157c-ev1-scmi.dts
-f:arch/arm/boot/dts/st/stm32mp157c-ev1.dts
-f:arch/arm/boot/dts/st/stm32mp157c-lxa-mc1.dts
-f:arch/arm/boot/dts/st/stm32mp157c-lxa-tac-gen1.dts
-f:arch/arm/boot/dts/st/stm32mp157c-lxa-tac-gen2.dts
-f:arch/arm/boot/dts/st/stm32mp157c-odyssey-som.dtsi
-f:arch/arm/boot/dts/st/stm32mp157c-odyssey.dts
-f:arch/arm/boot/dts/st/stm32mp157c-osd32mp1-red.dts
-f:arch/arm/boot/dts/st/stm32mp157c-phycore-stm32mp1-3.dts
-f:arch/arm/boot/dts/st/stm32mp157c-phycore-stm32mp15-som.dtsi
-f:arch/arm/boot/dts/st/stm32mp157c-ultra-fly-sbc.dts
-f:arch/arm/boot/dts/st/stm32mp157f-dk2-scmi.dtsi
-f:arch/arm/boot/dts/st/stm32mp157f-dk2.dts
-f:arch/arm/boot/dts/st/stm32mp15x-mecio1-io.dtsi
-f:arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi
-f:arch/arm/boot/dts/st/stm32mp15xc.dtsi
-f:arch/arm/boot/dts/st/stm32mp15xf.dtsi
-f:arch/arm/boot/dts/st/stm32mp15xx-dhcom-drc02.dtsi
-f:arch/arm/boot/dts/st/stm32mp15xx-dhcom-pdk2.dtsi
-f:arch/arm/boot/dts/st/stm32mp15xx-dhcom-picoitx.dtsi
-f:arch/arm/boot/dts/st/stm32mp15xx-dhcom-som.dtsi
-f:arch/arm/boot/dts/st/stm32mp15xx-dhcor-avenger96.dtsi
-f:arch/arm/boot/dts/st/stm32mp15xx-dhcor-drc-compact.dtsi
-f:arch/arm/boot/dts/st/stm32mp15xx-dhcor-io1v8.dtsi
-f:arch/arm/boot/dts/st/stm32mp15xx-dhcor-som.dtsi
-f:arch/arm/boot/dts/st/stm32mp15xx-dhcor-testbench.dtsi
-f:arch/arm/boot/dts/st/stm32mp15xx-dkx.dtsi
-f:arch/arm/boot/dts/st/stm32mp15xx-osd32.dtsi
-f:arch/arm/boot/dts/st/stm32mp15xxaa-pinctrl.dtsi
-f:arch/arm/boot/dts/st/stm32mp15xxab-pinctrl.dtsi
-f:arch/arm/boot/dts/st/stm32mp15xxac-pinctrl.dtsi
-f:arch/arm/boot/dts/st/stm32mp15xxad-pinctrl.dtsi
-f:arch/arm/boot/dts/sunplus/Makefile
-f:arch/arm/boot/dts/sunplus/sunplus-sp7021-achip.dtsi
-f:arch/arm/boot/dts/sunplus/sunplus-sp7021-demo-v3.dts
-f:arch/arm/boot/dts/sunplus/sunplus-sp7021.dtsi
-f:arch/arm/boot/dts/synaptics/Makefile
-f:arch/arm/boot/dts/synaptics/berlin2-sony-nsz-gs7.dts
-f:arch/arm/boot/dts/synaptics/berlin2.dtsi
-f:arch/arm/boot/dts/synaptics/berlin2cd-google-chromecast.dts
-f:arch/arm/boot/dts/synaptics/berlin2cd-valve-steamlink.dts
-f:arch/arm/boot/dts/synaptics/berlin2cd.dtsi
-f:arch/arm/boot/dts/synaptics/berlin2q-marvell-dmp.dts
-f:arch/arm/boot/dts/synaptics/berlin2q.dtsi
-f:arch/arm/boot/dts/ti/Makefile
-f:arch/arm/boot/dts/ti/davinci/Makefile
-f:arch/arm/boot/dts/ti/davinci/da850-enbw-cmc.dts
-f:arch/arm/boot/dts/ti/davinci/da850-evm.dts
-f:arch/arm/boot/dts/ti/davinci/da850-lcdk.dts
-f:arch/arm/boot/dts/ti/davinci/da850-lego-ev3.dts
-f:arch/arm/boot/dts/ti/davinci/da850.dtsi
-f:arch/arm/boot/dts/ti/keystone/Makefile
-f:arch/arm/boot/dts/ti/keystone/keystone-clocks.dtsi
-f:arch/arm/boot/dts/ti/keystone/keystone-k2e-clocks.dtsi
-f:arch/arm/boot/dts/ti/keystone/keystone-k2e-evm.dts
-f:arch/arm/boot/dts/ti/keystone/keystone-k2e-netcp.dtsi
-f:arch/arm/boot/dts/ti/keystone/keystone-k2e.dtsi
-f:arch/arm/boot/dts/ti/keystone/keystone-k2g-evm.dts
-f:arch/arm/boot/dts/ti/keystone/keystone-k2g-ice.dts
-f:arch/arm/boot/dts/ti/keystone/keystone-k2g-netcp.dtsi
-f:arch/arm/boot/dts/ti/keystone/keystone-k2g.dtsi
-f:arch/arm/boot/dts/ti/keystone/keystone-k2hk-clocks.dtsi
-f:arch/arm/boot/dts/ti/keystone/keystone-k2hk-evm.dts
-f:arch/arm/boot/dts/ti/keystone/keystone-k2hk-netcp.dtsi
-f:arch/arm/boot/dts/ti/keystone/keystone-k2hk.dtsi
-f:arch/arm/boot/dts/ti/keystone/keystone-k2l-clocks.dtsi
-f:arch/arm/boot/dts/ti/keystone/keystone-k2l-evm.dts
-f:arch/arm/boot/dts/ti/keystone/keystone-k2l-netcp.dtsi
-f:arch/arm/boot/dts/ti/keystone/keystone-k2l.dtsi
-f:arch/arm/boot/dts/ti/keystone/keystone.dtsi
-f:arch/arm/boot/dts/ti/omap/Makefile
-f:arch/arm/boot/dts/ti/omap/am335x-baltos-ir2110.dts
-f:arch/arm/boot/dts/ti/omap/am335x-baltos-ir3220.dts
-f:arch/arm/boot/dts/ti/omap/am335x-baltos-ir5221.dts
-f:arch/arm/boot/dts/ti/omap/am335x-baltos-leds.dtsi
-f:arch/arm/boot/dts/ti/omap/am335x-baltos.dtsi
-f:arch/arm/boot/dts/ti/omap/am335x-base0033.dts
-f:arch/arm/boot/dts/ti/omap/am335x-bone-common.dtsi
-f:arch/arm/boot/dts/ti/omap/am335x-bone.dts
-f:arch/arm/boot/dts/ti/omap/am335x-boneblack-common.dtsi
-f:arch/arm/boot/dts/ti/omap/am335x-boneblack-hdmi.dtsi
-f:arch/arm/boot/dts/ti/omap/am335x-boneblack-wireless.dts
-f:arch/arm/boot/dts/ti/omap/am335x-boneblack.dts
-f:arch/arm/boot/dts/ti/omap/am335x-boneblue.dts
-f:arch/arm/boot/dts/ti/omap/am335x-bonegreen-common.dtsi
-f:arch/arm/boot/dts/ti/omap/am335x-bonegreen-eco.dts
-f:arch/arm/boot/dts/ti/omap/am335x-bonegreen-wireless.dts
-f:arch/arm/boot/dts/ti/omap/am335x-bonegreen.dts
-f:arch/arm/boot/dts/ti/omap/am335x-chiliboard.dts
-f:arch/arm/boot/dts/ti/omap/am335x-chilisom.dtsi
-f:arch/arm/boot/dts/ti/omap/am335x-cm-t335.dts
-f:arch/arm/boot/dts/ti/omap/am335x-evm.dts
-f:arch/arm/boot/dts/ti/omap/am335x-evmsk.dts
-f:arch/arm/boot/dts/ti/omap/am335x-guardian.dts
-f:arch/arm/boot/dts/ti/omap/am335x-icev2.dts
-f:arch/arm/boot/dts/ti/omap/am335x-igep0033.dtsi
-f:arch/arm/boot/dts/ti/omap/am335x-lxm.dts
-f:arch/arm/boot/dts/ti/omap/am335x-moxa-uc-2100-common.dtsi
-f:arch/arm/boot/dts/ti/omap/am335x-moxa-uc-2101.dts
-f:arch/arm/boot/dts/ti/omap/am335x-moxa-uc-8100-common.dtsi
-f:arch/arm/boot/dts/ti/omap/am335x-moxa-uc-8100-me-t.dts
-f:arch/arm/boot/dts/ti/omap/am335x-myirtech-myc.dtsi
-f:arch/arm/boot/dts/ti/omap/am335x-myirtech-myd.dts
-f:arch/arm/boot/dts/ti/omap/am335x-nano.dts
-f:arch/arm/boot/dts/ti/omap/am335x-netcan-plus-1xx.dts
-f:arch/arm/boot/dts/ti/omap/am335x-netcom-plus-2xx.dts
-f:arch/arm/boot/dts/ti/omap/am335x-netcom-plus-8xx.dts
-f:arch/arm/boot/dts/ti/omap/am335x-osd3358-sm-red.dts
-f:arch/arm/boot/dts/ti/omap/am335x-osd335x-common.dtsi
-f:arch/arm/boot/dts/ti/omap/am335x-pcm-953.dtsi
-f:arch/arm/boot/dts/ti/omap/am335x-pdu001.dts
-f:arch/arm/boot/dts/ti/omap/am335x-pepper.dts
-f:arch/arm/boot/dts/ti/omap/am335x-phycore-rdk.dts
-f:arch/arm/boot/dts/ti/omap/am335x-phycore-som.dtsi
-f:arch/arm/boot/dts/ti/omap/am335x-pocketbeagle.dts
-f:arch/arm/boot/dts/ti/omap/am335x-regor-rdk.dts
-f:arch/arm/boot/dts/ti/omap/am335x-regor.dtsi
-f:arch/arm/boot/dts/ti/omap/am335x-sancloud-bbe-common.dtsi
-f:arch/arm/boot/dts/ti/omap/am335x-sancloud-bbe-extended-wifi.dts
-f:arch/arm/boot/dts/ti/omap/am335x-sancloud-bbe-lite.dts
-f:arch/arm/boot/dts/ti/omap/am335x-sancloud-bbe.dts
-f:arch/arm/boot/dts/ti/omap/am335x-sbc-t335.dts
-f:arch/arm/boot/dts/ti/omap/am335x-shc.dts
-f:arch/arm/boot/dts/ti/omap/am335x-sl50.dts
-f:arch/arm/boot/dts/ti/omap/am335x-wega-rdk.dts
-f:arch/arm/boot/dts/ti/omap/am335x-wega.dtsi
-f:arch/arm/boot/dts/ti/omap/am33xx-clocks.dtsi
-f:arch/arm/boot/dts/ti/omap/am33xx-l4.dtsi
-f:arch/arm/boot/dts/ti/omap/am33xx.dtsi
-f:arch/arm/boot/dts/ti/omap/am3517-craneboard.dts
-f:arch/arm/boot/dts/ti/omap/am3517-evm-ui.dtsi
-f:arch/arm/boot/dts/ti/omap/am3517-evm.dts
-f:arch/arm/boot/dts/ti/omap/am3517-som.dtsi
-f:arch/arm/boot/dts/ti/omap/am3517.dtsi
-f:arch/arm/boot/dts/ti/omap/am3517_mt_ventoux.dts
-f:arch/arm/boot/dts/ti/omap/am35xx-clocks.dtsi
-f:arch/arm/boot/dts/ti/omap/am3703.dtsi
-f:arch/arm/boot/dts/ti/omap/am3715.dtsi
-f:arch/arm/boot/dts/ti/omap/am3874-iceboard.dts
-f:arch/arm/boot/dts/ti/omap/am4372.dtsi
-f:arch/arm/boot/dts/ti/omap/am437x-cm-t43.dts
-f:arch/arm/boot/dts/ti/omap/am437x-gp-evm.dts
-f:arch/arm/boot/dts/ti/omap/am437x-idk-evm.dts
-f:arch/arm/boot/dts/ti/omap/am437x-l4.dtsi
-f:arch/arm/boot/dts/ti/omap/am437x-sbc-t43.dts
-f:arch/arm/boot/dts/ti/omap/am437x-sk-evm.dts
-f:arch/arm/boot/dts/ti/omap/am43x-epos-evm.dts
-f:arch/arm/boot/dts/ti/omap/am43xx-clocks.dtsi
-f:arch/arm/boot/dts/ti/omap/am57-pruss.dtsi
-f:arch/arm/boot/dts/ti/omap/am5718.dtsi
-f:arch/arm/boot/dts/ti/omap/am571x-idk-touchscreen.dtso
-f:arch/arm/boot/dts/ti/omap/am571x-idk.dts
-f:arch/arm/boot/dts/ti/omap/am5728.dtsi
-f:arch/arm/boot/dts/ti/omap/am5729-beagleboneai.dts
-f:arch/arm/boot/dts/ti/omap/am572x-idk-common.dtsi
-f:arch/arm/boot/dts/ti/omap/am572x-idk-touchscreen.dtso
-f:arch/arm/boot/dts/ti/omap/am572x-idk.dts
-f:arch/arm/boot/dts/ti/omap/am5748.dtsi
-f:arch/arm/boot/dts/ti/omap/am574x-idk.dts
-f:arch/arm/boot/dts/ti/omap/am57xx-beagle-x15-common.dtsi
-f:arch/arm/boot/dts/ti/omap/am57xx-beagle-x15-revb1.dts
-f:arch/arm/boot/dts/ti/omap/am57xx-beagle-x15-revc.dts
-f:arch/arm/boot/dts/ti/omap/am57xx-beagle-x15.dts
-f:arch/arm/boot/dts/ti/omap/am57xx-cl-som-am57x.dts
-f:arch/arm/boot/dts/ti/omap/am57xx-commercial-grade.dtsi
-f:arch/arm/boot/dts/ti/omap/am57xx-evm.dtso
-f:arch/arm/boot/dts/ti/omap/am57xx-idk-common.dtsi
-f:arch/arm/boot/dts/ti/omap/am57xx-idk-lcd-osd101t2045.dtso
-f:arch/arm/boot/dts/ti/omap/am57xx-idk-lcd-osd101t2587.dtso
-f:arch/arm/boot/dts/ti/omap/am57xx-industrial-grade.dtsi
-f:arch/arm/boot/dts/ti/omap/am57xx-sbc-am57x.dts
-f:arch/arm/boot/dts/ti/omap/compulab-sb-som.dtsi
-f:arch/arm/boot/dts/ti/omap/dm3725.dtsi
-f:arch/arm/boot/dts/ti/omap/dm8148-evm.dts
-f:arch/arm/boot/dts/ti/omap/dm8148-t410.dts
-f:arch/arm/boot/dts/ti/omap/dm814x-clocks.dtsi
-f:arch/arm/boot/dts/ti/omap/dm814x.dtsi
-f:arch/arm/boot/dts/ti/omap/dm8168-evm.dts
-f:arch/arm/boot/dts/ti/omap/dm816x-clocks.dtsi
-f:arch/arm/boot/dts/ti/omap/dm816x.dtsi
-f:arch/arm/boot/dts/ti/omap/dra62x-clocks.dtsi
-f:arch/arm/boot/dts/ti/omap/dra62x-j5eco-evm.dts
-f:arch/arm/boot/dts/ti/omap/dra62x.dtsi
-f:arch/arm/boot/dts/ti/omap/dra7-dspeve-thermal.dtsi
-f:arch/arm/boot/dts/ti/omap/dra7-evm-common.dtsi
-f:arch/arm/boot/dts/ti/omap/dra7-evm.dts
-f:arch/arm/boot/dts/ti/omap/dra7-ipu-dsp-common.dtsi
-f:arch/arm/boot/dts/ti/omap/dra7-iva-thermal.dtsi
-f:arch/arm/boot/dts/ti/omap/dra7-l4.dtsi
-f:arch/arm/boot/dts/ti/omap/dra7-mmc-iodelay.dtsi
-f:arch/arm/boot/dts/ti/omap/dra7.dtsi
-f:arch/arm/boot/dts/ti/omap/dra71-evm.dts
-f:arch/arm/boot/dts/ti/omap/dra71x.dtsi
-f:arch/arm/boot/dts/ti/omap/dra72-evm-common.dtsi
-f:arch/arm/boot/dts/ti/omap/dra72-evm-revc.dts
-f:arch/arm/boot/dts/ti/omap/dra72-evm-tps65917.dtsi
-f:arch/arm/boot/dts/ti/omap/dra72-evm.dts
-f:arch/arm/boot/dts/ti/omap/dra72x-mmc-iodelay.dtsi
-f:arch/arm/boot/dts/ti/omap/dra72x.dtsi
-f:arch/arm/boot/dts/ti/omap/dra74-ipu-dsp-common.dtsi
-f:arch/arm/boot/dts/ti/omap/dra74x-mmc-iodelay.dtsi
-f:arch/arm/boot/dts/ti/omap/dra74x-p.dtsi
-f:arch/arm/boot/dts/ti/omap/dra74x.dtsi
-f:arch/arm/boot/dts/ti/omap/dra76-evm.dts
-f:arch/arm/boot/dts/ti/omap/dra76x-mmc-iodelay.dtsi
-f:arch/arm/boot/dts/ti/omap/dra76x.dtsi
-f:arch/arm/boot/dts/ti/omap/dra7xx-clocks.dtsi
-f:arch/arm/boot/dts/ti/omap/elpida_ecb240abacn.dtsi
-f:arch/arm/boot/dts/ti/omap/logicpd-som-lv-35xx-devkit.dts
-f:arch/arm/boot/dts/ti/omap/logicpd-som-lv-37xx-devkit.dts
-f:arch/arm/boot/dts/ti/omap/logicpd-som-lv-baseboard.dtsi
-f:arch/arm/boot/dts/ti/omap/logicpd-som-lv.dtsi
-f:arch/arm/boot/dts/ti/omap/logicpd-torpedo-35xx-devkit.dts
-f:arch/arm/boot/dts/ti/omap/logicpd-torpedo-37xx-devkit-28.dts
-f:arch/arm/boot/dts/ti/omap/logicpd-torpedo-37xx-devkit.dts
-f:arch/arm/boot/dts/ti/omap/logicpd-torpedo-baseboard.dtsi
-f:arch/arm/boot/dts/ti/omap/logicpd-torpedo-som.dtsi
-f:arch/arm/boot/dts/ti/omap/motorola-cpcap-mapphone.dtsi
-f:arch/arm/boot/dts/ti/omap/motorola-mapphone-common.dtsi
-f:arch/arm/boot/dts/ti/omap/motorola-mapphone-handset.dtsi
-f:arch/arm/boot/dts/ti/omap/motorola-mapphone-mz607-mz617.dtsi
-f:arch/arm/boot/dts/ti/omap/motorola-mapphone-xt8xx.dtsi
-f:arch/arm/boot/dts/ti/omap/omap-gpmc-smsc911x.dtsi
-f:arch/arm/boot/dts/ti/omap/omap-gpmc-smsc9221.dtsi
-f:arch/arm/boot/dts/ti/omap/omap-zoom-common.dtsi
-f:arch/arm/boot/dts/ti/omap/omap2.dtsi
-f:arch/arm/boot/dts/ti/omap/omap2420-clocks.dtsi
-f:arch/arm/boot/dts/ti/omap/omap2420-h4.dts
-f:arch/arm/boot/dts/ti/omap/omap2420-n800.dts
-f:arch/arm/boot/dts/ti/omap/omap2420-n810-wimax.dts
-f:arch/arm/boot/dts/ti/omap/omap2420-n810.dts
-f:arch/arm/boot/dts/ti/omap/omap2420-n8x0-common.dtsi
-f:arch/arm/boot/dts/ti/omap/omap2420.dtsi
-f:arch/arm/boot/dts/ti/omap/omap2430-clocks.dtsi
-f:arch/arm/boot/dts/ti/omap/omap2430-sdp.dts
-f:arch/arm/boot/dts/ti/omap/omap2430.dtsi
-f:arch/arm/boot/dts/ti/omap/omap24xx-clocks.dtsi
-f:arch/arm/boot/dts/ti/omap/omap3-beagle-ab4.dts
-f:arch/arm/boot/dts/ti/omap/omap3-beagle-xm-ab.dts
-f:arch/arm/boot/dts/ti/omap/omap3-beagle-xm.dts
-f:arch/arm/boot/dts/ti/omap/omap3-beagle.dts
-f:arch/arm/boot/dts/ti/omap/omap3-cm-t3517.dts
-f:arch/arm/boot/dts/ti/omap/omap3-cm-t3530.dts
-f:arch/arm/boot/dts/ti/omap/omap3-cm-t3730.dts
-f:arch/arm/boot/dts/ti/omap/omap3-cm-t3x.dtsi
-f:arch/arm/boot/dts/ti/omap/omap3-cm-t3x30.dtsi
-f:arch/arm/boot/dts/ti/omap/omap3-cpu-thermal.dtsi
-f:arch/arm/boot/dts/ti/omap/omap3-devkit8000-common.dtsi
-f:arch/arm/boot/dts/ti/omap/omap3-devkit8000-lcd-common.dtsi
-f:arch/arm/boot/dts/ti/omap/omap3-devkit8000-lcd43.dts
-f:arch/arm/boot/dts/ti/omap/omap3-devkit8000-lcd70.dts
-f:arch/arm/boot/dts/ti/omap/omap3-devkit8000.dts
-f:arch/arm/boot/dts/ti/omap/omap3-echo.dts
-f:arch/arm/boot/dts/ti/omap/omap3-evm-37xx.dts
-f:arch/arm/boot/dts/ti/omap/omap3-evm-common.dtsi
-f:arch/arm/boot/dts/ti/omap/omap3-evm-processor-common.dtsi
-f:arch/arm/boot/dts/ti/omap/omap3-evm.dts
-f:arch/arm/boot/dts/ti/omap/omap3-gta04.dtsi
-f:arch/arm/boot/dts/ti/omap/omap3-gta04a3.dts
-f:arch/arm/boot/dts/ti/omap/omap3-gta04a4.dts
-f:arch/arm/boot/dts/ti/omap/omap3-gta04a5.dts
-f:arch/arm/boot/dts/ti/omap/omap3-gta04a5one.dts
-f:arch/arm/boot/dts/ti/omap/omap3-ha-common.dtsi
-f:arch/arm/boot/dts/ti/omap/omap3-ha-lcd.dts
-f:arch/arm/boot/dts/ti/omap/omap3-ha.dts
-f:arch/arm/boot/dts/ti/omap/omap3-igep.dtsi
-f:arch/arm/boot/dts/ti/omap/omap3-igep0020-common.dtsi
-f:arch/arm/boot/dts/ti/omap/omap3-igep0020-rev-f.dts
-f:arch/arm/boot/dts/ti/omap/omap3-igep0020.dts
-f:arch/arm/boot/dts/ti/omap/omap3-igep0030-common.dtsi
-f:arch/arm/boot/dts/ti/omap/omap3-igep0030-rev-g.dts
-f:arch/arm/boot/dts/ti/omap/omap3-igep0030.dts
-f:arch/arm/boot/dts/ti/omap/omap3-ldp.dts
-f:arch/arm/boot/dts/ti/omap/omap3-lilly-a83x.dtsi
-f:arch/arm/boot/dts/ti/omap/omap3-lilly-dbb056.dts
-f:arch/arm/boot/dts/ti/omap/omap3-n9.dts
-f:arch/arm/boot/dts/ti/omap/omap3-n900.dts
-f:arch/arm/boot/dts/ti/omap/omap3-n950-n9.dtsi
-f:arch/arm/boot/dts/ti/omap/omap3-n950.dts
-f:arch/arm/boot/dts/ti/omap/omap3-overo-alto35-common.dtsi
-f:arch/arm/boot/dts/ti/omap/omap3-overo-alto35.dts
-f:arch/arm/boot/dts/ti/omap/omap3-overo-base.dtsi
-f:arch/arm/boot/dts/ti/omap/omap3-overo-chestnut43-common.dtsi
-f:arch/arm/boot/dts/ti/omap/omap3-overo-chestnut43.dts
-f:arch/arm/boot/dts/ti/omap/omap3-overo-common-dvi.dtsi
-f:arch/arm/boot/dts/ti/omap/omap3-overo-common-lcd35.dtsi
-f:arch/arm/boot/dts/ti/omap/omap3-overo-common-lcd43.dtsi
-f:arch/arm/boot/dts/ti/omap/omap3-overo-common-peripherals.dtsi
-f:arch/arm/boot/dts/ti/omap/omap3-overo-gallop43-common.dtsi
-f:arch/arm/boot/dts/ti/omap/omap3-overo-gallop43.dts
-f:arch/arm/boot/dts/ti/omap/omap3-overo-palo35-common.dtsi
-f:arch/arm/boot/dts/ti/omap/omap3-overo-palo35.dts
-f:arch/arm/boot/dts/ti/omap/omap3-overo-palo43-common.dtsi
-f:arch/arm/boot/dts/ti/omap/omap3-overo-palo43.dts
-f:arch/arm/boot/dts/ti/omap/omap3-overo-storm-alto35.dts
-f:arch/arm/boot/dts/ti/omap/omap3-overo-storm-chestnut43.dts
-f:arch/arm/boot/dts/ti/omap/omap3-overo-storm-gallop43.dts
-f:arch/arm/boot/dts/ti/omap/omap3-overo-storm-palo35.dts
-f:arch/arm/boot/dts/ti/omap/omap3-overo-storm-palo43.dts
-f:arch/arm/boot/dts/ti/omap/omap3-overo-storm-summit.dts
-f:arch/arm/boot/dts/ti/omap/omap3-overo-storm-tobi.dts
-f:arch/arm/boot/dts/ti/omap/omap3-overo-storm-tobiduo.dts
-f:arch/arm/boot/dts/ti/omap/omap3-overo-storm.dtsi
-f:arch/arm/boot/dts/ti/omap/omap3-overo-summit-common.dtsi
-f:arch/arm/boot/dts/ti/omap/omap3-overo-summit.dts
-f:arch/arm/boot/dts/ti/omap/omap3-overo-tobi-common.dtsi
-f:arch/arm/boot/dts/ti/omap/omap3-overo-tobi.dts
-f:arch/arm/boot/dts/ti/omap/omap3-overo-tobiduo-common.dtsi
-f:arch/arm/boot/dts/ti/omap/omap3-overo-tobiduo.dts
-f:arch/arm/boot/dts/ti/omap/omap3-overo.dtsi
-f:arch/arm/boot/dts/ti/omap/omap3-pandora-1ghz.dts
-f:arch/arm/boot/dts/ti/omap/omap3-pandora-600mhz.dts
-f:arch/arm/boot/dts/ti/omap/omap3-pandora-common.dtsi
-f:arch/arm/boot/dts/ti/omap/omap3-panel-sharp-ls037v7dw01.dtsi
-f:arch/arm/boot/dts/ti/omap/omap3-sb-t35.dtsi
-f:arch/arm/boot/dts/ti/omap/omap3-sbc-t3517.dts
-f:arch/arm/boot/dts/ti/omap/omap3-sbc-t3530.dts
-f:arch/arm/boot/dts/ti/omap/omap3-sbc-t3730.dts
-f:arch/arm/boot/dts/ti/omap/omap3-sniper.dts
-f:arch/arm/boot/dts/ti/omap/omap3-tao3530.dtsi
-f:arch/arm/boot/dts/ti/omap/omap3-thunder.dts
-f:arch/arm/boot/dts/ti/omap/omap3-zoom3.dts
-f:arch/arm/boot/dts/ti/omap/omap3.dtsi
-f:arch/arm/boot/dts/ti/omap/omap3430-sdp.dts
-f:arch/arm/boot/dts/ti/omap/omap3430es1-clocks.dtsi
-f:arch/arm/boot/dts/ti/omap/omap34xx-omap36xx-clocks.dtsi
-f:arch/arm/boot/dts/ti/omap/omap34xx.dtsi
-f:arch/arm/boot/dts/ti/omap/omap36xx-am35xx-omap3430es2plus-clocks.dtsi
-f:arch/arm/boot/dts/ti/omap/omap36xx-clocks.dtsi
-f:arch/arm/boot/dts/ti/omap/omap36xx-omap3430es2plus-clocks.dtsi
-f:arch/arm/boot/dts/ti/omap/omap36xx.dtsi
-f:arch/arm/boot/dts/ti/omap/omap3xxx-clocks.dtsi
-f:arch/arm/boot/dts/ti/omap/omap4-cpu-thermal.dtsi
-f:arch/arm/boot/dts/ti/omap/omap4-droid-bionic-xt875.dts
-f:arch/arm/boot/dts/ti/omap/omap4-droid4-xt894.dts
-f:arch/arm/boot/dts/ti/omap/omap4-duovero-parlor.dts
-f:arch/arm/boot/dts/ti/omap/omap4-duovero.dtsi
-f:arch/arm/boot/dts/ti/omap/omap4-epson-embt2ws.dts
-f:arch/arm/boot/dts/ti/omap/omap4-kc1.dts
-f:arch/arm/boot/dts/ti/omap/omap4-l4-abe.dtsi
-f:arch/arm/boot/dts/ti/omap/omap4-l4.dtsi
-f:arch/arm/boot/dts/ti/omap/omap4-mcpdm.dtsi
-f:arch/arm/boot/dts/ti/omap/omap4-panda-a4.dts
-f:arch/arm/boot/dts/ti/omap/omap4-panda-common.dtsi
-f:arch/arm/boot/dts/ti/omap/omap4-panda-es.dts
-f:arch/arm/boot/dts/ti/omap/omap4-panda.dts
-f:arch/arm/boot/dts/ti/omap/omap4-sdp-es23plus.dts
-f:arch/arm/boot/dts/ti/omap/omap4-sdp.dts
-f:arch/arm/boot/dts/ti/omap/omap4-var-dvk-om44.dts
-f:arch/arm/boot/dts/ti/omap/omap4-var-om44customboard.dtsi
-f:arch/arm/boot/dts/ti/omap/omap4-var-som-om44-wlan.dtsi
-f:arch/arm/boot/dts/ti/omap/omap4-var-som-om44.dtsi
-f:arch/arm/boot/dts/ti/omap/omap4-var-stk-om44.dts
-f:arch/arm/boot/dts/ti/omap/omap4-xyboard-mz609.dts
-f:arch/arm/boot/dts/ti/omap/omap4-xyboard-mz617.dts
-f:arch/arm/boot/dts/ti/omap/omap4.dtsi
-f:arch/arm/boot/dts/ti/omap/omap443x-clocks.dtsi
-f:arch/arm/boot/dts/ti/omap/omap443x.dtsi
-f:arch/arm/boot/dts/ti/omap/omap4460.dtsi
-f:arch/arm/boot/dts/ti/omap/omap446x-clocks.dtsi
-f:arch/arm/boot/dts/ti/omap/omap44xx-clocks.dtsi
-f:arch/arm/boot/dts/ti/omap/omap5-board-common.dtsi
-f:arch/arm/boot/dts/ti/omap/omap5-cm-t54.dts
-f:arch/arm/boot/dts/ti/omap/omap5-core-thermal.dtsi
-f:arch/arm/boot/dts/ti/omap/omap5-gpu-thermal.dtsi
-f:arch/arm/boot/dts/ti/omap/omap5-igep0050.dts
-f:arch/arm/boot/dts/ti/omap/omap5-l4-abe.dtsi
-f:arch/arm/boot/dts/ti/omap/omap5-l4.dtsi
-f:arch/arm/boot/dts/ti/omap/omap5-sbc-t54.dts
-f:arch/arm/boot/dts/ti/omap/omap5-uevm.dts
-f:arch/arm/boot/dts/ti/omap/omap5.dtsi
-f:arch/arm/boot/dts/ti/omap/omap54xx-clocks.dtsi
-f:arch/arm/boot/dts/ti/omap/twl4030.dtsi
-f:arch/arm/boot/dts/ti/omap/twl4030_omap3.dtsi
-f:arch/arm/boot/dts/ti/omap/twl6030.dtsi
-f:arch/arm/boot/dts/ti/omap/twl6030_omap4.dtsi
-f:arch/arm/boot/dts/tps6507x.dtsi
-f:arch/arm/boot/dts/tps65217.dtsi
-f:arch/arm/boot/dts/tps65910.dtsi
-f:arch/arm/boot/dts/unisoc/Makefile
-f:arch/arm/boot/dts/unisoc/rda8810pl-orangepi-2g-iot.dts
-f:arch/arm/boot/dts/unisoc/rda8810pl-orangepi-i96.dts
-f:arch/arm/boot/dts/unisoc/rda8810pl.dtsi
-f:arch/arm/boot/dts/vt8500/Makefile
-f:arch/arm/boot/dts/vt8500/vt8500-bv07.dts
-f:arch/arm/boot/dts/vt8500/vt8500.dtsi
-f:arch/arm/boot/dts/vt8500/wm8505-ref.dts
-f:arch/arm/boot/dts/vt8500/wm8505.dtsi
-f:arch/arm/boot/dts/vt8500/wm8650-mid.dts
-f:arch/arm/boot/dts/vt8500/wm8650.dtsi
-f:arch/arm/boot/dts/vt8500/wm8750-apc8750.dts
-f:arch/arm/boot/dts/vt8500/wm8750.dtsi
-f:arch/arm/boot/dts/vt8500/wm8850-w70v2.dts
-f:arch/arm/boot/dts/vt8500/wm8850.dtsi
-f:arch/arm/boot/dts/vt8500/wm8950-apc-rock.dts
-f:arch/arm/boot/dts/vt8500/wm8950.dtsi
-f:arch/arm/boot/dts/xen/Makefile
-f:arch/arm/boot/dts/xen/xenvm-4.2.dts
-f:arch/arm/boot/dts/xilinx/Makefile
-f:arch/arm/boot/dts/xilinx/zynq-7000.dtsi
-f:arch/arm/boot/dts/xilinx/zynq-cc108.dts
-f:arch/arm/boot/dts/xilinx/zynq-ebaz4205.dts
-f:arch/arm/boot/dts/xilinx/zynq-microzed.dts
-f:arch/arm/boot/dts/xilinx/zynq-parallella.dts
-f:arch/arm/boot/dts/xilinx/zynq-zc702.dts
-f:arch/arm/boot/dts/xilinx/zynq-zc706.dts
-f:arch/arm/boot/dts/xilinx/zynq-zc770-xm010.dts
-f:arch/arm/boot/dts/xilinx/zynq-zc770-xm011.dts
-f:arch/arm/boot/dts/xilinx/zynq-zc770-xm012.dts
-f:arch/arm/boot/dts/xilinx/zynq-zc770-xm013.dts
-f:arch/arm/boot/dts/xilinx/zynq-zed.dts
-f:arch/arm/boot/dts/xilinx/zynq-zturn-common.dtsi
-f:arch/arm/boot/dts/xilinx/zynq-zturn-v5.dts
-f:arch/arm/boot/dts/xilinx/zynq-zturn.dts
-f:arch/arm/boot/dts/xilinx/zynq-zybo-z7.dts
-f:arch/arm/boot/dts/xilinx/zynq-zybo.dts
-f:arch/arm/boot/install.sh
-f:arch/arm/common/Kconfig
-f:arch/arm/common/Makefile
-f:arch/arm/common/bL_switcher.c
-f:arch/arm/common/bL_switcher_dummy_if.c
-f:arch/arm/common/firmware.c
-f:arch/arm/common/krait-l2-accessors.c
-f:arch/arm/common/locomo.c
-f:arch/arm/common/mcpm_entry.c
-f:arch/arm/common/mcpm_head.S
-f:arch/arm/common/mcpm_platsmp.c
-f:arch/arm/common/sa1111.c
-f:arch/arm/common/scoop.c
-f:arch/arm/common/secure_cntvoff.S
-f:arch/arm/common/sharpsl_param.c
-f:arch/arm/common/vlock.S
-f:arch/arm/common/vlock.h
-f:arch/arm/configs/am200epdkit_defconfig
-f:arch/arm/configs/aspeed_g4_defconfig
-f:arch/arm/configs/aspeed_g5_defconfig
-f:arch/arm/configs/assabet_defconfig
-f:arch/arm/configs/at91_dt_defconfig
-f:arch/arm/configs/axm55xx_defconfig
-f:arch/arm/configs/bcm2835_defconfig
-f:arch/arm/configs/clps711x_defconfig
-f:arch/arm/configs/collie_defconfig
-f:arch/arm/configs/davinci_all_defconfig
-f:arch/arm/configs/dove_defconfig
-f:arch/arm/configs/dram_0x00000000.config
-f:arch/arm/configs/dram_0xc0000000.config
-f:arch/arm/configs/dram_0xd0000000.config
-f:arch/arm/configs/ep93xx_defconfig
-f:arch/arm/configs/exynos_defconfig
-f:arch/arm/configs/footbridge_defconfig
-f:arch/arm/configs/gemini_defconfig
-f:arch/arm/configs/h3600_defconfig
-f:arch/arm/configs/hardening.config
-f:arch/arm/configs/hisi_defconfig
-f:arch/arm/configs/imx_v4_v5_defconfig
-f:arch/arm/configs/imx_v6_v7_defconfig
-f:arch/arm/configs/imxrt_defconfig
-f:arch/arm/configs/integrator_defconfig
-f:arch/arm/configs/ixp4xx_defconfig
-f:arch/arm/configs/jornada720_defconfig
-f:arch/arm/configs/keystone_defconfig
-f:arch/arm/configs/lpae.config
-f:arch/arm/configs/lpc18xx_defconfig
-f:arch/arm/configs/lpc32xx_defconfig
-f:arch/arm/configs/milbeaut_m10v_defconfig
-f:arch/arm/configs/mmp2_defconfig
-f:arch/arm/configs/moxart_defconfig
-f:arch/arm/configs/mps2_defconfig
-f:arch/arm/configs/multi_v4t_defconfig
-f:arch/arm/configs/multi_v5_defconfig
-f:arch/arm/configs/multi_v7_defconfig
-f:arch/arm/configs/mv78xx0_defconfig
-f:arch/arm/configs/mvebu_v5_defconfig
-f:arch/arm/configs/mvebu_v7_defconfig
-f:arch/arm/configs/mxs_defconfig
-f:arch/arm/configs/neponset_defconfig
-f:arch/arm/configs/netwinder_defconfig
-f:arch/arm/configs/nhk8815_defconfig
-f:arch/arm/configs/omap1_defconfig
-f:arch/arm/configs/omap2plus_defconfig
-f:arch/arm/configs/orion5x_defconfig
-f:arch/arm/configs/pxa168_defconfig
-f:arch/arm/configs/pxa3xx_defconfig
-f:arch/arm/configs/pxa910_defconfig
-f:arch/arm/configs/pxa_defconfig
-f:arch/arm/configs/qcom_defconfig
-f:arch/arm/configs/realview_defconfig
-f:arch/arm/configs/rpc_defconfig
-f:arch/arm/configs/s3c6400_defconfig
-f:arch/arm/configs/s5pv210_defconfig
-f:arch/arm/configs/sama5_defconfig
-f:arch/arm/configs/sama7_defconfig
-f:arch/arm/configs/shmobile_defconfig
-f:arch/arm/configs/socfpga_defconfig
-f:arch/arm/configs/sp7021_defconfig
-f:arch/arm/configs/spear13xx_defconfig
-f:arch/arm/configs/spear3xx_defconfig
-f:arch/arm/configs/spear6xx_defconfig
-f:arch/arm/configs/spitz_defconfig
-f:arch/arm/configs/stm32_defconfig
-f:arch/arm/configs/sunxi_defconfig
-f:arch/arm/configs/tegra_defconfig
-f:arch/arm/configs/u8500_defconfig
-f:arch/arm/configs/versatile_defconfig
-f:arch/arm/configs/vexpress_defconfig
-f:arch/arm/configs/vf610m4_defconfig
-f:arch/arm/configs/vt8500_v6_v7_defconfig
-f:arch/arm/configs/wpcm450_defconfig
-f:arch/arm/crypto/.gitignore
-f:arch/arm/crypto/Kconfig
-f:arch/arm/crypto/Makefile
-f:arch/arm/crypto/aes-ce-core.S
-f:arch/arm/crypto/aes-ce-glue.c
-f:arch/arm/crypto/aes-cipher-core.S
-f:arch/arm/crypto/aes-cipher-glue.c
-f:arch/arm/crypto/aes-cipher.h
-f:arch/arm/crypto/aes-neonbs-core.S
-f:arch/arm/crypto/aes-neonbs-glue.c
-f:arch/arm/crypto/blake2b-neon-core.S
-f:arch/arm/crypto/blake2b-neon-glue.c
-f:arch/arm/crypto/curve25519-core.S
-f:arch/arm/crypto/curve25519-glue.c
-f:arch/arm/crypto/ghash-ce-core.S
-f:arch/arm/crypto/ghash-ce-glue.c
-f:arch/arm/crypto/nh-neon-core.S
-f:arch/arm/crypto/nhpoly1305-neon-glue.c
-f:arch/arm/include/asm/Kbuild
-f:arch/arm/include/asm/arch_gicv3.h
-f:arch/arm/include/asm/arch_timer.h
-f:arch/arm/include/asm/archrandom.h
-f:arch/arm/include/asm/arm-cci.h
-f:arch/arm/include/asm/arm_pmuv3.h
-f:arch/arm/include/asm/asm-offsets.h
-f:arch/arm/include/asm/assembler.h
-f:arch/arm/include/asm/atomic.h
-f:arch/arm/include/asm/auxvec.h
-f:arch/arm/include/asm/bL_switcher.h
-f:arch/arm/include/asm/barrier.h
-f:arch/arm/include/asm/bitops.h
-f:arch/arm/include/asm/bitrev.h
-f:arch/arm/include/asm/bug.h
-f:arch/arm/include/asm/bugs.h
-f:arch/arm/include/asm/cache.h
-f:arch/arm/include/asm/cacheflush.h
-f:arch/arm/include/asm/cachetype.h
-f:arch/arm/include/asm/checksum.h
-f:arch/arm/include/asm/clocksource.h
-f:arch/arm/include/asm/cmpxchg.h
-f:arch/arm/include/asm/compiler.h
-f:arch/arm/include/asm/cp15.h
-f:arch/arm/include/asm/cpu.h
-f:arch/arm/include/asm/cpufeature.h
-f:arch/arm/include/asm/cpuidle.h
-f:arch/arm/include/asm/cputype.h
-f:arch/arm/include/asm/cti.h
-f:arch/arm/include/asm/current.h
-f:arch/arm/include/asm/dcc.h
-f:arch/arm/include/asm/delay.h
-f:arch/arm/include/asm/device.h
-f:arch/arm/include/asm/div64.h
-f:arch/arm/include/asm/dma-iommu.h
-f:arch/arm/include/asm/dma.h
-f:arch/arm/include/asm/dmi.h
-f:arch/arm/include/asm/domain.h
-f:arch/arm/include/asm/ecard.h
-f:arch/arm/include/asm/edac.h
-f:arch/arm/include/asm/efi.h
-f:arch/arm/include/asm/elf.h
-f:arch/arm/include/asm/exception.h
-f:arch/arm/include/asm/fiq.h
-f:arch/arm/include/asm/firmware.h
-f:arch/arm/include/asm/fixmap.h
-f:arch/arm/include/asm/floppy.h
-f:arch/arm/include/asm/fncpy.h
-f:arch/arm/include/asm/fpstate.h
-f:arch/arm/include/asm/fpu.h
-f:arch/arm/include/asm/ftrace.h
-f:arch/arm/include/asm/futex.h
-f:arch/arm/include/asm/glue-cache.h
-f:arch/arm/include/asm/glue-df.h
-f:arch/arm/include/asm/glue-pf.h
-f:arch/arm/include/asm/glue-proc.h
-f:arch/arm/include/asm/glue.h
-f:arch/arm/include/asm/hardirq.h
-f:arch/arm/include/asm/hardware/cache-aurora-l2.h
-f:arch/arm/include/asm/hardware/cache-b15-rac.h
-f:arch/arm/include/asm/hardware/cache-feroceon-l2.h
-f:arch/arm/include/asm/hardware/cache-l2x0.h
-f:arch/arm/include/asm/hardware/cache-tauros2.h
-f:arch/arm/include/asm/hardware/cache-uniphier.h
-f:arch/arm/include/asm/hardware/cp14.h
-f:arch/arm/include/asm/hardware/dec21285.h
-f:arch/arm/include/asm/hardware/ioc.h
-f:arch/arm/include/asm/hardware/iomd.h
-f:arch/arm/include/asm/hardware/locomo.h
-f:arch/arm/include/asm/hardware/memc.h
-f:arch/arm/include/asm/hardware/sa1111.h
-f:arch/arm/include/asm/hardware/scoop.h
-f:arch/arm/include/asm/hardware/ssp.h
-f:arch/arm/include/asm/highmem.h
-f:arch/arm/include/asm/hugetlb-3level.h
-f:arch/arm/include/asm/hugetlb.h
-f:arch/arm/include/asm/hw_breakpoint.h
-f:arch/arm/include/asm/hw_irq.h
-f:arch/arm/include/asm/hwcap.h
-f:arch/arm/include/asm/hypervisor.h
-f:arch/arm/include/asm/idmap.h
-f:arch/arm/include/asm/insn.h
-f:arch/arm/include/asm/io.h
-f:arch/arm/include/asm/irq.h
-f:arch/arm/include/asm/irq_work.h
-f:arch/arm/include/asm/irqflags.h
-f:arch/arm/include/asm/jump_label.h
-f:arch/arm/include/asm/kasan.h
-f:arch/arm/include/asm/kasan_def.h
-f:arch/arm/include/asm/kexec-internal.h
-f:arch/arm/include/asm/kexec.h
-f:arch/arm/include/asm/kfence.h
-f:arch/arm/include/asm/kgdb.h
-f:arch/arm/include/asm/kprobes.h
-f:arch/arm/include/asm/krait-l2-accessors.h
-f:arch/arm/include/asm/linkage.h
-f:arch/arm/include/asm/mach/arch.h
-f:arch/arm/include/asm/mach/dma.h
-f:arch/arm/include/asm/mach/flash.h
-f:arch/arm/include/asm/mach/irq.h
-f:arch/arm/include/asm/mach/map.h
-f:arch/arm/include/asm/mach/pci.h
-f:arch/arm/include/asm/mach/sharpsl_param.h
-f:arch/arm/include/asm/mach/time.h
-f:arch/arm/include/asm/mc146818rtc.h
-f:arch/arm/include/asm/mcpm.h
-f:arch/arm/include/asm/mcs_spinlock.h
-f:arch/arm/include/asm/memblock.h
-f:arch/arm/include/asm/memory.h
-f:arch/arm/include/asm/mman.h
-f:arch/arm/include/asm/mmu.h
-f:arch/arm/include/asm/mmu_context.h
-f:arch/arm/include/asm/module.h
-f:arch/arm/include/asm/module.lds.h
-f:arch/arm/include/asm/mpu.h
-f:arch/arm/include/asm/mtd-xip.h
-f:arch/arm/include/asm/neon.h
-f:arch/arm/include/asm/nwflash.h
-f:arch/arm/include/asm/opcodes-sec.h
-f:arch/arm/include/asm/opcodes-virt.h
-f:arch/arm/include/asm/opcodes.h
-f:arch/arm/include/asm/outercache.h
-f:arch/arm/include/asm/page-nommu.h
-f:arch/arm/include/asm/page.h
-f:arch/arm/include/asm/paravirt.h
-f:arch/arm/include/asm/paravirt_api_clock.h
-f:arch/arm/include/asm/pci.h
-f:arch/arm/include/asm/percpu.h
-f:arch/arm/include/asm/perf_event.h
-f:arch/arm/include/asm/pgalloc.h
-f:arch/arm/include/asm/pgtable-2level-hwdef.h
-f:arch/arm/include/asm/pgtable-2level-types.h
-f:arch/arm/include/asm/pgtable-2level.h
-f:arch/arm/include/asm/pgtable-3level-hwdef.h
-f:arch/arm/include/asm/pgtable-3level-types.h
-f:arch/arm/include/asm/pgtable-3level.h
-f:arch/arm/include/asm/pgtable-hwdef.h
-f:arch/arm/include/asm/pgtable-nommu.h
-f:arch/arm/include/asm/pgtable.h
-f:arch/arm/include/asm/probes.h
-f:arch/arm/include/asm/proc-fns.h
-f:arch/arm/include/asm/processor.h
-f:arch/arm/include/asm/procinfo.h
-f:arch/arm/include/asm/prom.h
-f:arch/arm/include/asm/psci.h
-f:arch/arm/include/asm/ptdump.h
-f:arch/arm/include/asm/ptrace.h
-f:arch/arm/include/asm/seccomp.h
-f:arch/arm/include/asm/sections.h
-f:arch/arm/include/asm/secure_cntvoff.h
-f:arch/arm/include/asm/semihost.h
-f:arch/arm/include/asm/set_memory.h
-f:arch/arm/include/asm/setup.h
-f:arch/arm/include/asm/shmparam.h
-f:arch/arm/include/asm/signal.h
-f:arch/arm/include/asm/simd.h
-f:arch/arm/include/asm/smp.h
-f:arch/arm/include/asm/smp_plat.h
-f:arch/arm/include/asm/smp_scu.h
-f:arch/arm/include/asm/smp_twd.h
-f:arch/arm/include/asm/sparsemem.h
-f:arch/arm/include/asm/spectre.h
-f:arch/arm/include/asm/spinlock.h
-f:arch/arm/include/asm/spinlock_types.h
-f:arch/arm/include/asm/stackprotector.h
-f:arch/arm/include/asm/stacktrace.h
-f:arch/arm/include/asm/string.h
-f:arch/arm/include/asm/suspend.h
-f:arch/arm/include/asm/swab.h
-f:arch/arm/include/asm/switch_to.h
-f:arch/arm/include/asm/sync_bitops.h
-f:arch/arm/include/asm/syscall.h
-f:arch/arm/include/asm/syscalls.h
-f:arch/arm/include/asm/system_info.h
-f:arch/arm/include/asm/system_misc.h
-f:arch/arm/include/asm/tcm.h
-f:arch/arm/include/asm/text-patching.h
-f:arch/arm/include/asm/therm.h
-f:arch/arm/include/asm/thread_info.h
-f:arch/arm/include/asm/thread_notify.h
-f:arch/arm/include/asm/timex.h
-f:arch/arm/include/asm/tlb.h
-f:arch/arm/include/asm/tlbflush.h
-f:arch/arm/include/asm/tls.h
-f:arch/arm/include/asm/topology.h
-f:arch/arm/include/asm/traps.h
-f:arch/arm/include/asm/uaccess-asm.h
-f:arch/arm/include/asm/uaccess.h
-f:arch/arm/include/asm/ucontext.h
-f:arch/arm/include/asm/unified.h
-f:arch/arm/include/asm/unistd.h
-f:arch/arm/include/asm/unwind.h
-f:arch/arm/include/asm/uprobes.h
-f:arch/arm/include/asm/user.h
-f:arch/arm/include/asm/v7m.h
-f:arch/arm/include/asm/vdso.h
-f:arch/arm/include/asm/vdso/clocksource.h
-f:arch/arm/include/asm/vdso/cp15.h
-f:arch/arm/include/asm/vdso/gettimeofday.h
-f:arch/arm/include/asm/vdso/processor.h
-f:arch/arm/include/asm/vdso/vsyscall.h
-f:arch/arm/include/asm/vermagic.h
-f:arch/arm/include/asm/vfp.h
-f:arch/arm/include/asm/vfpmacros.h
-f:arch/arm/include/asm/vga.h
-f:arch/arm/include/asm/virt.h
-f:arch/arm/include/asm/vmalloc.h
-f:arch/arm/include/asm/vmlinux.lds.h
-f:arch/arm/include/asm/word-at-a-time.h
-f:arch/arm/include/asm/xen/events.h
-f:arch/arm/include/asm/xen/hypercall.h
-f:arch/arm/include/asm/xen/hypervisor.h
-f:arch/arm/include/asm/xen/interface.h
-f:arch/arm/include/asm/xen/page.h
-f:arch/arm/include/asm/xen/swiotlb-xen.h
-f:arch/arm/include/asm/xen/xen-ops.h
-f:arch/arm/include/asm/xor.h
-f:arch/arm/include/debug/8250.S
-f:arch/arm/include/debug/asm9260.S
-f:arch/arm/include/debug/at91.S
-f:arch/arm/include/debug/bcm63xx.S
-f:arch/arm/include/debug/brcmstb.S
-f:arch/arm/include/debug/clps711x.S
-f:arch/arm/include/debug/dc21285.S
-f:arch/arm/include/debug/digicolor.S
-f:arch/arm/include/debug/exynos.S
-f:arch/arm/include/debug/icedcc.S
-f:arch/arm/include/debug/imx-uart.h
-f:arch/arm/include/debug/imx.S
-f:arch/arm/include/debug/meson.S
-f:arch/arm/include/debug/msm.S
-f:arch/arm/include/debug/omap2plus.S
-f:arch/arm/include/debug/palmchip.S
-f:arch/arm/include/debug/pl01x.S
-f:arch/arm/include/debug/renesas-scif.S
-f:arch/arm/include/debug/s3c24xx.S
-f:arch/arm/include/debug/s5pv210.S
-f:arch/arm/include/debug/sa1100.S
-f:arch/arm/include/debug/samsung.S
-f:arch/arm/include/debug/sti.S
-f:arch/arm/include/debug/stm32.S
-f:arch/arm/include/debug/tegra.S
-f:arch/arm/include/debug/uncompress.h
-f:arch/arm/include/debug/ux500.S
-f:arch/arm/include/debug/vexpress.S
-f:arch/arm/include/debug/vf.S
-f:arch/arm/include/debug/vt8500.S
-f:arch/arm/include/debug/zynq.S
-f:arch/arm/include/uapi/asm/Kbuild
-f:arch/arm/include/uapi/asm/auxvec.h
-f:arch/arm/include/uapi/asm/byteorder.h
-f:arch/arm/include/uapi/asm/fcntl.h
-f:arch/arm/include/uapi/asm/hwcap.h
-f:arch/arm/include/uapi/asm/ioctls.h
-f:arch/arm/include/uapi/asm/mman.h
-f:arch/arm/include/uapi/asm/perf_regs.h
-f:arch/arm/include/uapi/asm/posix_types.h
-f:arch/arm/include/uapi/asm/ptrace.h
-f:arch/arm/include/uapi/asm/setup.h
-f:arch/arm/include/uapi/asm/sigcontext.h
-f:arch/arm/include/uapi/asm/signal.h
-f:arch/arm/include/uapi/asm/stat.h
-f:arch/arm/include/uapi/asm/statfs.h
-f:arch/arm/include/uapi/asm/swab.h
-f:arch/arm/include/uapi/asm/types.h
-f:arch/arm/include/uapi/asm/unistd.h
-f:arch/arm/kernel/.gitignore
-f:arch/arm/kernel/Makefile
-f:arch/arm/kernel/arch_timer.c
-f:arch/arm/kernel/armksyms.c
-f:arch/arm/kernel/asm-offsets.c
-f:arch/arm/kernel/atags.h
-f:arch/arm/kernel/atags_compat.c
-f:arch/arm/kernel/atags_parse.c
-f:arch/arm/kernel/atags_proc.c
-f:arch/arm/kernel/bios32.c
-f:arch/arm/kernel/bugs.c
-f:arch/arm/kernel/cacheinfo.c
-f:arch/arm/kernel/cpuidle.c
-f:arch/arm/kernel/crash_dump.c
-f:arch/arm/kernel/debug.S
-f:arch/arm/kernel/devtree.c
-f:arch/arm/kernel/dma.c
-f:arch/arm/kernel/early_printk.c
-f:arch/arm/kernel/efi.c
-f:arch/arm/kernel/elf.c
-f:arch/arm/kernel/entry-armv.S
-f:arch/arm/kernel/entry-common.S
-f:arch/arm/kernel/entry-ftrace.S
-f:arch/arm/kernel/entry-header.S
-f:arch/arm/kernel/entry-v7m.S
-f:arch/arm/kernel/fiq.c
-f:arch/arm/kernel/fiqasm.S
-f:arch/arm/kernel/ftrace.c
-f:arch/arm/kernel/head-common.S
-f:arch/arm/kernel/head-inflate-data.c
-f:arch/arm/kernel/head-nommu.S
-f:arch/arm/kernel/head.S
-f:arch/arm/kernel/head.h
-f:arch/arm/kernel/hibernate.c
-f:arch/arm/kernel/hw_breakpoint.c
-f:arch/arm/kernel/hyp-stub.S
-f:arch/arm/kernel/insn.c
-f:arch/arm/kernel/io.c
-f:arch/arm/kernel/irq.c
-f:arch/arm/kernel/isa.c
-f:arch/arm/kernel/iwmmxt.S
-f:arch/arm/kernel/iwmmxt.h
-f:arch/arm/kernel/jump_label.c
-f:arch/arm/kernel/kgdb.c
-f:arch/arm/kernel/machine_kexec.c
-f:arch/arm/kernel/module-plts.c
-f:arch/arm/kernel/module.c
-f:arch/arm/kernel/opcodes.c
-f:arch/arm/kernel/paravirt.c
-f:arch/arm/kernel/patch.c
-f:arch/arm/kernel/perf_callchain.c
-f:arch/arm/kernel/perf_regs.c
-f:arch/arm/kernel/phys2virt.S
-f:arch/arm/kernel/process.c
-f:arch/arm/kernel/psci_smp.c
-f:arch/arm/kernel/ptrace.c
-f:arch/arm/kernel/reboot.c
-f:arch/arm/kernel/reboot.h
-f:arch/arm/kernel/relocate_kernel.S
-f:arch/arm/kernel/return_address.c
-f:arch/arm/kernel/setup.c
-f:arch/arm/kernel/signal.c
-f:arch/arm/kernel/signal.h
-f:arch/arm/kernel/sigreturn_codes.S
-f:arch/arm/kernel/sleep.S
-f:arch/arm/kernel/smccc-call.S
-f:arch/arm/kernel/smp.c
-f:arch/arm/kernel/smp_scu.c
-f:arch/arm/kernel/smp_tlb.c
-f:arch/arm/kernel/smp_twd.c
-f:arch/arm/kernel/spectre.c
-f:arch/arm/kernel/stacktrace.c
-f:arch/arm/kernel/suspend.c
-f:arch/arm/kernel/swp_emulate.c
-f:arch/arm/kernel/sys_arm.c
-f:arch/arm/kernel/sys_oabi-compat.c
-f:arch/arm/kernel/tcm.c
-f:arch/arm/kernel/thumbee.c
-f:arch/arm/kernel/time.c
-f:arch/arm/kernel/topology.c
-f:arch/arm/kernel/traps.c
-f:arch/arm/kernel/unwind.c
-f:arch/arm/kernel/v7m.c
-f:arch/arm/kernel/vdso.c
-f:arch/arm/kernel/vmcore_info.c
-f:arch/arm/kernel/vmlinux-xip.lds.S
-f:arch/arm/kernel/vmlinux.lds.S
-f:arch/arm/kernel/xscale-cp0.c
-f:arch/arm/lib/.gitignore
-f:arch/arm/lib/Makefile
-f:arch/arm/lib/ashldi3.S
-f:arch/arm/lib/ashrdi3.S
-f:arch/arm/lib/backtrace-clang.S
-f:arch/arm/lib/backtrace.S
-f:arch/arm/lib/bitops.h
-f:arch/arm/lib/bswapsdi2.S
-f:arch/arm/lib/call_with_stack.S
-f:arch/arm/lib/changebit.S
-f:arch/arm/lib/clear_user.S
-f:arch/arm/lib/clearbit.S
-f:arch/arm/lib/copy_from_user.S
-f:arch/arm/lib/copy_page.S
-f:arch/arm/lib/copy_template.S
-f:arch/arm/lib/copy_to_user.S
-f:arch/arm/lib/csumipv6.S
-f:arch/arm/lib/csumpartial.S
-f:arch/arm/lib/csumpartialcopy.S
-f:arch/arm/lib/csumpartialcopygeneric.S
-f:arch/arm/lib/csumpartialcopyuser.S
-f:arch/arm/lib/delay-loop.S
-f:arch/arm/lib/delay.c
-f:arch/arm/lib/div64.S
-f:arch/arm/lib/error-inject.c
-f:arch/arm/lib/findbit.S
-f:arch/arm/lib/getuser.S
-f:arch/arm/lib/io-readsb.S
-f:arch/arm/lib/io-readsl.S
-f:arch/arm/lib/io-readsw-armv3.S
-f:arch/arm/lib/io-readsw-armv4.S
-f:arch/arm/lib/io-writesb.S
-f:arch/arm/lib/io-writesl.S
-f:arch/arm/lib/io-writesw-armv3.S
-f:arch/arm/lib/io-writesw-armv4.S
-f:arch/arm/lib/lib1funcs.S
-f:arch/arm/lib/lshrdi3.S
-f:arch/arm/lib/memchr.S
-f:arch/arm/lib/memcpy.S
-f:arch/arm/lib/memmove.S
-f:arch/arm/lib/memset.S
-f:arch/arm/lib/muldi3.S
-f:arch/arm/lib/putuser.S
-f:arch/arm/lib/setbit.S
-f:arch/arm/lib/strchr.S
-f:arch/arm/lib/strrchr.S
-f:arch/arm/lib/testchangebit.S
-f:arch/arm/lib/testclearbit.S
-f:arch/arm/lib/testsetbit.S
-f:arch/arm/lib/uaccess_with_memcpy.c
-f:arch/arm/lib/ucmpdi2.S
-f:arch/arm/lib/xor-neon.c
-f:arch/arm/mach-actions/Kconfig
-f:arch/arm/mach-actions/Makefile
-f:arch/arm/mach-actions/platsmp.c
-f:arch/arm/mach-alpine/Kconfig
-f:arch/arm/mach-alpine/Makefile
-f:arch/arm/mach-alpine/alpine_cpu_pm.c
-f:arch/arm/mach-alpine/alpine_cpu_pm.h
-f:arch/arm/mach-alpine/alpine_cpu_resume.h
-f:arch/arm/mach-alpine/alpine_machine.c
-f:arch/arm/mach-alpine/platsmp.c
-f:arch/arm/mach-artpec/Kconfig
-f:arch/arm/mach-artpec/Makefile
-f:arch/arm/mach-artpec/board-artpec6.c
-f:arch/arm/mach-aspeed/Kconfig
-f:arch/arm/mach-aspeed/Makefile
-f:arch/arm/mach-aspeed/platsmp.c
-f:arch/arm/mach-at91/.gitignore
-f:arch/arm/mach-at91/Kconfig
-f:arch/arm/mach-at91/Makefile
-f:arch/arm/mach-at91/at91rm9200.c
-f:arch/arm/mach-at91/at91sam9.c
-f:arch/arm/mach-at91/generic.h
-f:arch/arm/mach-at91/pm.c
-f:arch/arm/mach-at91/pm.h
-f:arch/arm/mach-at91/pm_data-offsets.c
-f:arch/arm/mach-at91/pm_suspend.S
-f:arch/arm/mach-at91/sam9x60.c
-f:arch/arm/mach-at91/sam9x7.c
-f:arch/arm/mach-at91/sam_secure.c
-f:arch/arm/mach-at91/sam_secure.h
-f:arch/arm/mach-at91/sama5.c
-f:arch/arm/mach-at91/sama7.c
-f:arch/arm/mach-at91/samv7.c
-f:arch/arm/mach-axxia/Kconfig
-f:arch/arm/mach-axxia/Makefile
-f:arch/arm/mach-axxia/axxia.c
-f:arch/arm/mach-axxia/platsmp.c
-f:arch/arm/mach-bcm/Kconfig
-f:arch/arm/mach-bcm/Makefile
-f:arch/arm/mach-bcm/bcm2711.c
-f:arch/arm/mach-bcm/bcm63xx_pmb.c
-f:arch/arm/mach-bcm/bcm63xx_smp.c
-f:arch/arm/mach-bcm/bcm63xx_smp.h
-f:arch/arm/mach-bcm/bcm_5301x.c
-f:arch/arm/mach-bcm/bcm_cygnus.c
-f:arch/arm/mach-bcm/bcm_hr2.c
-f:arch/arm/mach-bcm/bcm_kona_smc.c
-f:arch/arm/mach-bcm/bcm_kona_smc.h
-f:arch/arm/mach-bcm/bcm_nsp.c
-f:arch/arm/mach-bcm/board_bcm21664.c
-f:arch/arm/mach-bcm/board_bcm23550.c
-f:arch/arm/mach-bcm/board_bcm281xx.c
-f:arch/arm/mach-bcm/board_bcm2835.c
-f:arch/arm/mach-bcm/board_bcmbca.c
-f:arch/arm/mach-bcm/brcmstb.c
-f:arch/arm/mach-bcm/kona_l2_cache.c
-f:arch/arm/mach-bcm/kona_l2_cache.h
-f:arch/arm/mach-bcm/platsmp-brcmstb.c
-f:arch/arm/mach-bcm/platsmp.c
-f:arch/arm/mach-bcm/platsmp.h
-f:arch/arm/mach-berlin/Kconfig
-f:arch/arm/mach-berlin/Makefile
-f:arch/arm/mach-berlin/berlin.c
-f:arch/arm/mach-berlin/headsmp.S
-f:arch/arm/mach-berlin/platsmp.c
-f:arch/arm/mach-clps711x/Kconfig
-f:arch/arm/mach-clps711x/Makefile
-f:arch/arm/mach-clps711x/board-dt.c
-f:arch/arm/mach-davinci/Kconfig
-f:arch/arm/mach-davinci/Makefile
-f:arch/arm/mach-davinci/clock.h
-f:arch/arm/mach-davinci/common.c
-f:arch/arm/mach-davinci/common.h
-f:arch/arm/mach-davinci/cputype.h
-f:arch/arm/mach-davinci/da850.c
-f:arch/arm/mach-davinci/da8xx-dt.c
-f:arch/arm/mach-davinci/da8xx.h
-f:arch/arm/mach-davinci/ddr2.h
-f:arch/arm/mach-davinci/devices-da8xx.c
-f:arch/arm/mach-davinci/hardware.h
-f:arch/arm/mach-davinci/irqs.h
-f:arch/arm/mach-davinci/mux.c
-f:arch/arm/mach-davinci/mux.h
-f:arch/arm/mach-davinci/pdata-quirks.c
-f:arch/arm/mach-davinci/pm.c
-f:arch/arm/mach-davinci/pm.h
-f:arch/arm/mach-davinci/pm_domain.c
-f:arch/arm/mach-davinci/psc.h
-f:arch/arm/mach-davinci/sleep.S
-f:arch/arm/mach-davinci/sram.c
-f:arch/arm/mach-davinci/sram.h
-f:arch/arm/mach-digicolor/Kconfig
-f:arch/arm/mach-digicolor/Makefile
-f:arch/arm/mach-digicolor/digicolor.c
-f:arch/arm/mach-dove/Kconfig
-f:arch/arm/mach-dove/Makefile
-f:arch/arm/mach-dove/bridge-regs.h
-f:arch/arm/mach-dove/cm-a510.c
-f:arch/arm/mach-dove/common.c
-f:arch/arm/mach-dove/common.h
-f:arch/arm/mach-dove/dove.h
-f:arch/arm/mach-dove/irq.c
-f:arch/arm/mach-dove/irqs.h
-f:arch/arm/mach-dove/mpp.c
-f:arch/arm/mach-dove/mpp.h
-f:arch/arm/mach-dove/pcie.c
-f:arch/arm/mach-dove/pm.h
-f:arch/arm/mach-ep93xx/Kconfig
-f:arch/arm/mach-exynos/Kconfig
-f:arch/arm/mach-exynos/Makefile
-f:arch/arm/mach-exynos/common.h
-f:arch/arm/mach-exynos/exynos-smc.S
-f:arch/arm/mach-exynos/exynos.c
-f:arch/arm/mach-exynos/firmware.c
-f:arch/arm/mach-exynos/headsmp.S
-f:arch/arm/mach-exynos/mcpm-exynos.c
-f:arch/arm/mach-exynos/platsmp.c
-f:arch/arm/mach-exynos/pm.c
-f:arch/arm/mach-exynos/sleep.S
-f:arch/arm/mach-exynos/smc.h
-f:arch/arm/mach-exynos/suspend.c
-f:arch/arm/mach-footbridge/Kconfig
-f:arch/arm/mach-footbridge/Makefile
-f:arch/arm/mach-footbridge/common.c
-f:arch/arm/mach-footbridge/common.h
-f:arch/arm/mach-footbridge/dc21285-timer.c
-f:arch/arm/mach-footbridge/dc21285.c
-f:arch/arm/mach-footbridge/dma-isa.c
-f:arch/arm/mach-footbridge/ebsa285-pci.c
-f:arch/arm/mach-footbridge/ebsa285.c
-f:arch/arm/mach-footbridge/include/mach/hardware.h
-f:arch/arm/mach-footbridge/include/mach/irqs.h
-f:arch/arm/mach-footbridge/include/mach/isa-dma.h
-f:arch/arm/mach-footbridge/include/mach/memory.h
-f:arch/arm/mach-footbridge/include/mach/uncompress.h
-f:arch/arm/mach-footbridge/isa-irq.c
-f:arch/arm/mach-footbridge/isa-rtc.c
-f:arch/arm/mach-footbridge/isa-timer.c
-f:arch/arm/mach-footbridge/isa.c
-f:arch/arm/mach-footbridge/netwinder-hw.c
-f:arch/arm/mach-footbridge/netwinder-pci.c
-f:arch/arm/mach-gemini/Kconfig
-f:arch/arm/mach-gemini/Makefile
-f:arch/arm/mach-gemini/board-dt.c
-f:arch/arm/mach-highbank/Kconfig
-f:arch/arm/mach-highbank/Makefile
-f:arch/arm/mach-highbank/core.h
-f:arch/arm/mach-highbank/highbank.c
-f:arch/arm/mach-highbank/pm.c
-f:arch/arm/mach-highbank/smc.S
-f:arch/arm/mach-highbank/sysregs.h
-f:arch/arm/mach-highbank/system.c
-f:arch/arm/mach-hisi/Kconfig
-f:arch/arm/mach-hisi/Makefile
-f:arch/arm/mach-hisi/core.h
-f:arch/arm/mach-hisi/hisilicon.c
-f:arch/arm/mach-hisi/hotplug.c
-f:arch/arm/mach-hisi/platmcpm.c
-f:arch/arm/mach-hisi/platsmp.c
-f:arch/arm/mach-hpe/Kconfig
-f:arch/arm/mach-hpe/Makefile
-f:arch/arm/mach-hpe/gxp.c
-f:arch/arm/mach-imx/Kconfig
-f:arch/arm/mach-imx/Makefile
-f:arch/arm/mach-imx/anatop.c
-f:arch/arm/mach-imx/avic.c
-f:arch/arm/mach-imx/common.h
-f:arch/arm/mach-imx/cpu-imx25.c
-f:arch/arm/mach-imx/cpu-imx27.c
-f:arch/arm/mach-imx/cpu-imx31.c
-f:arch/arm/mach-imx/cpu-imx35.c
-f:arch/arm/mach-imx/cpu-imx5.c
-f:arch/arm/mach-imx/cpu.c
-f:arch/arm/mach-imx/cpuidle-imx5.c
-f:arch/arm/mach-imx/cpuidle-imx6q.c
-f:arch/arm/mach-imx/cpuidle-imx6sl.c
-f:arch/arm/mach-imx/cpuidle-imx6sx.c
-f:arch/arm/mach-imx/cpuidle-imx7ulp.c
-f:arch/arm/mach-imx/cpuidle.h
-f:arch/arm/mach-imx/crmregs-imx3.h
-f:arch/arm/mach-imx/gpc.c
-f:arch/arm/mach-imx/hardware.h
-f:arch/arm/mach-imx/headsmp.S
-f:arch/arm/mach-imx/hotplug.c
-f:arch/arm/mach-imx/iim.h
-f:arch/arm/mach-imx/irq-common.c
-f:arch/arm/mach-imx/irq-common.h
-f:arch/arm/mach-imx/mach-imx1.c
-f:arch/arm/mach-imx/mach-imx25.c
-f:arch/arm/mach-imx/mach-imx27.c
-f:arch/arm/mach-imx/mach-imx31.c
-f:arch/arm/mach-imx/mach-imx35.c
-f:arch/arm/mach-imx/mach-imx50.c
-f:arch/arm/mach-imx/mach-imx51.c
-f:arch/arm/mach-imx/mach-imx53.c
-f:arch/arm/mach-imx/mach-imx6q.c
-f:arch/arm/mach-imx/mach-imx6sl.c
-f:arch/arm/mach-imx/mach-imx6sx.c
-f:arch/arm/mach-imx/mach-imx6ul.c
-f:arch/arm/mach-imx/mach-imx7d-cm4.c
-f:arch/arm/mach-imx/mach-imx7d.c
-f:arch/arm/mach-imx/mach-imx7ulp.c
-f:arch/arm/mach-imx/mach-imxrt.c
-f:arch/arm/mach-imx/mach-ls1021a.c
-f:arch/arm/mach-imx/mach-vf610.c
-f:arch/arm/mach-imx/mm-imx3.c
-f:arch/arm/mach-imx/mmdc.c
-f:arch/arm/mach-imx/mx27.h
-f:arch/arm/mach-imx/mx2x.h
-f:arch/arm/mach-imx/mx31.h
-f:arch/arm/mach-imx/mx35.h
-f:arch/arm/mach-imx/mx3x.h
-f:arch/arm/mach-imx/mxc.h
-f:arch/arm/mach-imx/platsmp.c
-f:arch/arm/mach-imx/pm-imx25.c
-f:arch/arm/mach-imx/pm-imx27.c
-f:arch/arm/mach-imx/pm-imx5.c
-f:arch/arm/mach-imx/pm-imx6.c
-f:arch/arm/mach-imx/pm-imx7ulp.c
-f:arch/arm/mach-imx/resume-imx6.S
-f:arch/arm/mach-imx/src.c
-f:arch/arm/mach-imx/ssi-fiq-ksym.c
-f:arch/arm/mach-imx/ssi-fiq.S
-f:arch/arm/mach-imx/suspend-imx53.S
-f:arch/arm/mach-imx/suspend-imx6.S
-f:arch/arm/mach-imx/system.c
-f:arch/arm/mach-imx/tzic.c
-f:arch/arm/mach-ixp4xx/Kconfig
-f:arch/arm/mach-ixp4xx/Makefile
-f:arch/arm/mach-ixp4xx/ixp4xx-of.c
-f:arch/arm/mach-keystone/Kconfig
-f:arch/arm/mach-keystone/Makefile
-f:arch/arm/mach-keystone/keystone.c
-f:arch/arm/mach-lpc18xx/Makefile
-f:arch/arm/mach-lpc18xx/board-dt.c
-f:arch/arm/mach-lpc32xx/Kconfig
-f:arch/arm/mach-lpc32xx/Makefile
-f:arch/arm/mach-lpc32xx/common.c
-f:arch/arm/mach-lpc32xx/common.h
-f:arch/arm/mach-lpc32xx/lpc32xx.h
-f:arch/arm/mach-lpc32xx/phy3250.c
-f:arch/arm/mach-lpc32xx/pm.c
-f:arch/arm/mach-lpc32xx/serial.c
-f:arch/arm/mach-lpc32xx/suspend.S
-f:arch/arm/mach-mediatek/Kconfig
-f:arch/arm/mach-mediatek/Makefile
-f:arch/arm/mach-mediatek/mediatek.c
-f:arch/arm/mach-mediatek/platsmp.c
-f:arch/arm/mach-meson/Kconfig
-f:arch/arm/mach-meson/Makefile
-f:arch/arm/mach-meson/meson.c
-f:arch/arm/mach-meson/platsmp.c
-f:arch/arm/mach-milbeaut/Kconfig
-f:arch/arm/mach-milbeaut/Makefile
-f:arch/arm/mach-milbeaut/platsmp.c
-f:arch/arm/mach-mmp/Kconfig
-f:arch/arm/mach-mmp/Makefile
-f:arch/arm/mach-mmp/addr-map.h
-f:arch/arm/mach-mmp/common.c
-f:arch/arm/mach-mmp/common.h
-f:arch/arm/mach-mmp/mmp-dt.c
-f:arch/arm/mach-mmp/mmp2-dt.c
-f:arch/arm/mach-mmp/mmp3.c
-f:arch/arm/mach-mmp/platsmp.c
-f:arch/arm/mach-mmp/regs-timers.h
-f:arch/arm/mach-mmp/time.c
-f:arch/arm/mach-mstar/Kconfig
-f:arch/arm/mach-mstar/Makefile
-f:arch/arm/mach-mstar/mstarv7.c
-f:arch/arm/mach-mv78xx0/Kconfig
-f:arch/arm/mach-mv78xx0/Makefile
-f:arch/arm/mach-mv78xx0/bridge-regs.h
-f:arch/arm/mach-mv78xx0/buffalo-wxl-setup.c
-f:arch/arm/mach-mv78xx0/common.c
-f:arch/arm/mach-mv78xx0/common.h
-f:arch/arm/mach-mv78xx0/irq.c
-f:arch/arm/mach-mv78xx0/irqs.h
-f:arch/arm/mach-mv78xx0/mpp.c
-f:arch/arm/mach-mv78xx0/mpp.h
-f:arch/arm/mach-mv78xx0/mv78xx0.h
-f:arch/arm/mach-mv78xx0/pcie.c
-f:arch/arm/mach-mvebu/Kconfig
-f:arch/arm/mach-mvebu/Makefile
-f:arch/arm/mach-mvebu/armada-370-xp.h
-f:arch/arm/mach-mvebu/board-v7.c
-f:arch/arm/mach-mvebu/coherency.c
-f:arch/arm/mach-mvebu/coherency.h
-f:arch/arm/mach-mvebu/coherency_ll.S
-f:arch/arm/mach-mvebu/common.h
-f:arch/arm/mach-mvebu/cpu-reset.c
-f:arch/arm/mach-mvebu/dove.c
-f:arch/arm/mach-mvebu/headsmp-a9.S
-f:arch/arm/mach-mvebu/headsmp.S
-f:arch/arm/mach-mvebu/kirkwood-pm.c
-f:arch/arm/mach-mvebu/kirkwood-pm.h
-f:arch/arm/mach-mvebu/kirkwood.c
-f:arch/arm/mach-mvebu/kirkwood.h
-f:arch/arm/mach-mvebu/mvebu-soc-id.c
-f:arch/arm/mach-mvebu/mvebu-soc-id.h
-f:arch/arm/mach-mvebu/platsmp-a9.c
-f:arch/arm/mach-mvebu/platsmp.c
-f:arch/arm/mach-mvebu/pm-board.c
-f:arch/arm/mach-mvebu/pm.c
-f:arch/arm/mach-mvebu/pmsu.c
-f:arch/arm/mach-mvebu/pmsu.h
-f:arch/arm/mach-mvebu/pmsu_ll.S
-f:arch/arm/mach-mvebu/system-controller.c
-f:arch/arm/mach-mxs/Kconfig
-f:arch/arm/mach-mxs/Makefile
-f:arch/arm/mach-mxs/mach-mxs.c
-f:arch/arm/mach-mxs/pm.c
-f:arch/arm/mach-mxs/pm.h
-f:arch/arm/mach-nomadik/Kconfig
-f:arch/arm/mach-nomadik/Makefile
-f:arch/arm/mach-nomadik/cpu-8815.c
-f:arch/arm/mach-npcm/Kconfig
-f:arch/arm/mach-npcm/Makefile
-f:arch/arm/mach-npcm/headsmp.S
-f:arch/arm/mach-npcm/npcm7xx.c
-f:arch/arm/mach-npcm/platsmp.c
-f:arch/arm/mach-npcm/wpcm450.c
-f:arch/arm/mach-omap1/Kconfig
-f:arch/arm/mach-omap1/Makefile
-f:arch/arm/mach-omap1/ams-delta-fiq-handler.S
-f:arch/arm/mach-omap1/ams-delta-fiq.c
-f:arch/arm/mach-omap1/ams-delta-fiq.h
-f:arch/arm/mach-omap1/board-ams-delta.c
-f:arch/arm/mach-omap1/board-ams-delta.h
-f:arch/arm/mach-omap1/board-nokia770.c
-f:arch/arm/mach-omap1/board-osk.c
-f:arch/arm/mach-omap1/board-palmte.c
-f:arch/arm/mach-omap1/board-sx1-mmc.c
-f:arch/arm/mach-omap1/board-sx1.c
-f:arch/arm/mach-omap1/board-sx1.h
-f:arch/arm/mach-omap1/clock.c
-f:arch/arm/mach-omap1/clock.h
-f:arch/arm/mach-omap1/clock_data.c
-f:arch/arm/mach-omap1/common.h
-f:arch/arm/mach-omap1/devices.c
-f:arch/arm/mach-omap1/dma.c
-f:arch/arm/mach-omap1/fb.c
-f:arch/arm/mach-omap1/flash.c
-f:arch/arm/mach-omap1/flash.h
-f:arch/arm/mach-omap1/gpio15xx.c
-f:arch/arm/mach-omap1/gpio16xx.c
-f:arch/arm/mach-omap1/hardware.h
-f:arch/arm/mach-omap1/i2c.c
-f:arch/arm/mach-omap1/i2c.h
-f:arch/arm/mach-omap1/id.c
-f:arch/arm/mach-omap1/io.c
-f:arch/arm/mach-omap1/iomap.h
-f:arch/arm/mach-omap1/irq.c
-f:arch/arm/mach-omap1/irqs.h
-f:arch/arm/mach-omap1/mcbsp.c
-f:arch/arm/mach-omap1/mmc.h
-f:arch/arm/mach-omap1/mtd-xip.h
-f:arch/arm/mach-omap1/mux.c
-f:arch/arm/mach-omap1/mux.h
-f:arch/arm/mach-omap1/ocpi.c
-f:arch/arm/mach-omap1/omap-dma.c
-f:arch/arm/mach-omap1/opp.h
-f:arch/arm/mach-omap1/opp_data.c
-f:arch/arm/mach-omap1/pm.c
-f:arch/arm/mach-omap1/pm.h
-f:arch/arm/mach-omap1/pm_bus.c
-f:arch/arm/mach-omap1/reset.c
-f:arch/arm/mach-omap1/serial.c
-f:arch/arm/mach-omap1/serial.h
-f:arch/arm/mach-omap1/sleep.S
-f:arch/arm/mach-omap1/soc.h
-f:arch/arm/mach-omap1/sram-init.c
-f:arch/arm/mach-omap1/sram.S
-f:arch/arm/mach-omap1/sram.h
-f:arch/arm/mach-omap1/tc.h
-f:arch/arm/mach-omap1/time.c
-f:arch/arm/mach-omap1/timer.c
-f:arch/arm/mach-omap1/timer32k.c
-f:arch/arm/mach-omap1/usb.c
-f:arch/arm/mach-omap1/usb.h
-f:arch/arm/mach-omap2/.gitignore
-f:arch/arm/mach-omap2/Kconfig
-f:arch/arm/mach-omap2/Makefile
-f:arch/arm/mach-omap2/am33xx-restart.c
-f:arch/arm/mach-omap2/am33xx.h
-f:arch/arm/mach-omap2/board-generic.c
-f:arch/arm/mach-omap2/board-n8x0.c
-f:arch/arm/mach-omap2/clkt2xxx_dpll.c
-f:arch/arm/mach-omap2/clkt2xxx_dpllcore.c
-f:arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c
-f:arch/arm/mach-omap2/clock.c
-f:arch/arm/mach-omap2/clock.h
-f:arch/arm/mach-omap2/clock2xxx.h
-f:arch/arm/mach-omap2/clockdomain.c
-f:arch/arm/mach-omap2/clockdomain.h
-f:arch/arm/mach-omap2/clockdomains2420_data.c
-f:arch/arm/mach-omap2/clockdomains2430_data.c
-f:arch/arm/mach-omap2/clockdomains2xxx_3xxx_data.c
-f:arch/arm/mach-omap2/clockdomains33xx_data.c
-f:arch/arm/mach-omap2/clockdomains3xxx_data.c
-f:arch/arm/mach-omap2/clockdomains43xx_data.c
-f:arch/arm/mach-omap2/clockdomains44xx_data.c
-f:arch/arm/mach-omap2/clockdomains54xx_data.c
-f:arch/arm/mach-omap2/clockdomains7xx_data.c
-f:arch/arm/mach-omap2/clockdomains81xx_data.c
-f:arch/arm/mach-omap2/cm-regbits-24xx.h
-f:arch/arm/mach-omap2/cm-regbits-33xx.h
-f:arch/arm/mach-omap2/cm-regbits-34xx.h
-f:arch/arm/mach-omap2/cm-regbits-44xx.h
-f:arch/arm/mach-omap2/cm-regbits-54xx.h
-f:arch/arm/mach-omap2/cm-regbits-7xx.h
-f:arch/arm/mach-omap2/cm.h
-f:arch/arm/mach-omap2/cm1_44xx.h
-f:arch/arm/mach-omap2/cm1_54xx.h
-f:arch/arm/mach-omap2/cm1_7xx.h
-f:arch/arm/mach-omap2/cm2_44xx.h
-f:arch/arm/mach-omap2/cm2_54xx.h
-f:arch/arm/mach-omap2/cm2_7xx.h
-f:arch/arm/mach-omap2/cm2xxx.c
-f:arch/arm/mach-omap2/cm2xxx.h
-f:arch/arm/mach-omap2/cm2xxx_3xxx.h
-f:arch/arm/mach-omap2/cm33xx.c
-f:arch/arm/mach-omap2/cm33xx.h
-f:arch/arm/mach-omap2/cm3xxx.c
-f:arch/arm/mach-omap2/cm3xxx.h
-f:arch/arm/mach-omap2/cm44xx.h
-f:arch/arm/mach-omap2/cm81xx.h
-f:arch/arm/mach-omap2/cm_common.c
-f:arch/arm/mach-omap2/cminst44xx.c
-f:arch/arm/mach-omap2/common-board-devices.h
-f:arch/arm/mach-omap2/common.c
-f:arch/arm/mach-omap2/common.h
-f:arch/arm/mach-omap2/control.c
-f:arch/arm/mach-omap2/control.h
-f:arch/arm/mach-omap2/cpuidle34xx.c
-f:arch/arm/mach-omap2/cpuidle44xx.c
-f:arch/arm/mach-omap2/ctrl_module_wkup_44xx.h
-f:arch/arm/mach-omap2/devices.c
-f:arch/arm/mach-omap2/display.c
-f:arch/arm/mach-omap2/display.h
-f:arch/arm/mach-omap2/dma.c
-f:arch/arm/mach-omap2/fb.c
-f:arch/arm/mach-omap2/gpmc.h
-f:arch/arm/mach-omap2/hdq1w.c
-f:arch/arm/mach-omap2/hdq1w.h
-f:arch/arm/mach-omap2/i2c.c
-f:arch/arm/mach-omap2/i2c.h
-f:arch/arm/mach-omap2/id.c
-f:arch/arm/mach-omap2/id.h
-f:arch/arm/mach-omap2/io.c
-f:arch/arm/mach-omap2/iomap.h
-f:arch/arm/mach-omap2/l3_2xxx.h
-f:arch/arm/mach-omap2/l3_3xxx.h
-f:arch/arm/mach-omap2/l4_2xxx.h
-f:arch/arm/mach-omap2/l4_3xxx.h
-f:arch/arm/mach-omap2/mcbsp.c
-f:arch/arm/mach-omap2/mmc.h
-f:arch/arm/mach-omap2/msdi.c
-f:arch/arm/mach-omap2/omap-headsmp.S
-f:arch/arm/mach-omap2/omap-hotplug.c
-f:arch/arm/mach-omap2/omap-iommu.c
-f:arch/arm/mach-omap2/omap-mpuss-lowpower.c
-f:arch/arm/mach-omap2/omap-secure.c
-f:arch/arm/mach-omap2/omap-secure.h
-f:arch/arm/mach-omap2/omap-smc.S
-f:arch/arm/mach-omap2/omap-smp.c
-f:arch/arm/mach-omap2/omap-wakeupgen.c
-f:arch/arm/mach-omap2/omap-wakeupgen.h
-f:arch/arm/mach-omap2/omap2-restart.c
-f:arch/arm/mach-omap2/omap24xx.h
-f:arch/arm/mach-omap2/omap3-restart.c
-f:arch/arm/mach-omap2/omap34xx.h
-f:arch/arm/mach-omap2/omap4-common.c
-f:arch/arm/mach-omap2/omap4-restart.c
-f:arch/arm/mach-omap2/omap4-sar-layout.h
-f:arch/arm/mach-omap2/omap44xx.h
-f:arch/arm/mach-omap2/omap54xx.h
-f:arch/arm/mach-omap2/omap_device.c
-f:arch/arm/mach-omap2/omap_device.h
-f:arch/arm/mach-omap2/omap_hwmod.c
-f:arch/arm/mach-omap2/omap_hwmod.h
-f:arch/arm/mach-omap2/omap_hwmod_2420_data.c
-f:arch/arm/mach-omap2/omap_hwmod_2430_data.c
-f:arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
-f:arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c
-f:arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
-f:arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
-f:arch/arm/mach-omap2/omap_hwmod_81xx_data.c
-f:arch/arm/mach-omap2/omap_hwmod_common_data.c
-f:arch/arm/mach-omap2/omap_hwmod_common_data.h
-f:arch/arm/mach-omap2/omap_hwmod_common_ipblock_data.c
-f:arch/arm/mach-omap2/omap_opp_data.h
-f:arch/arm/mach-omap2/omap_phy_internal.c
-f:arch/arm/mach-omap2/omap_twl.c
-f:arch/arm/mach-omap2/opp2420_data.c
-f:arch/arm/mach-omap2/opp2430_data.c
-f:arch/arm/mach-omap2/opp2xxx.h
-f:arch/arm/mach-omap2/opp3xxx_data.c
-f:arch/arm/mach-omap2/opp4xxx_data.c
-f:arch/arm/mach-omap2/pdata-quirks.c
-f:arch/arm/mach-omap2/pm-asm-offsets.c
-f:arch/arm/mach-omap2/pm-debug.c
-f:arch/arm/mach-omap2/pm.c
-f:arch/arm/mach-omap2/pm.h
-f:arch/arm/mach-omap2/pm33xx-core.c
-f:arch/arm/mach-omap2/pm34xx.c
-f:arch/arm/mach-omap2/pm44xx.c
-f:arch/arm/mach-omap2/pmic-cpcap.c
-f:arch/arm/mach-omap2/powerdomain-common.c
-f:arch/arm/mach-omap2/powerdomain.c
-f:arch/arm/mach-omap2/powerdomain.h
-f:arch/arm/mach-omap2/powerdomains2xxx_3xxx_data.c
-f:arch/arm/mach-omap2/powerdomains2xxx_3xxx_data.h
-f:arch/arm/mach-omap2/powerdomains2xxx_data.c
-f:arch/arm/mach-omap2/powerdomains33xx_data.c
-f:arch/arm/mach-omap2/powerdomains3xxx_data.c
-f:arch/arm/mach-omap2/powerdomains43xx_data.c
-f:arch/arm/mach-omap2/powerdomains44xx_data.c
-f:arch/arm/mach-omap2/powerdomains54xx_data.c
-f:arch/arm/mach-omap2/powerdomains7xx_data.c
-f:arch/arm/mach-omap2/prcm-common.h
-f:arch/arm/mach-omap2/prcm43xx.h
-f:arch/arm/mach-omap2/prcm44xx.h
-f:arch/arm/mach-omap2/prcm_mpu44xx.c
-f:arch/arm/mach-omap2/prcm_mpu44xx.h
-f:arch/arm/mach-omap2/prcm_mpu54xx.h
-f:arch/arm/mach-omap2/prcm_mpu7xx.h
-f:arch/arm/mach-omap2/prcm_mpu_44xx_54xx.h
-f:arch/arm/mach-omap2/prm-regbits-24xx.h
-f:arch/arm/mach-omap2/prm-regbits-33xx.h
-f:arch/arm/mach-omap2/prm-regbits-34xx.h
-f:arch/arm/mach-omap2/prm-regbits-44xx.h
-f:arch/arm/mach-omap2/prm.h
-f:arch/arm/mach-omap2/prm2xxx.c
-f:arch/arm/mach-omap2/prm2xxx.h
-f:arch/arm/mach-omap2/prm2xxx_3xxx.c
-f:arch/arm/mach-omap2/prm2xxx_3xxx.h
-f:arch/arm/mach-omap2/prm33xx.c
-f:arch/arm/mach-omap2/prm33xx.h
-f:arch/arm/mach-omap2/prm3xxx.c
-f:arch/arm/mach-omap2/prm3xxx.h
-f:arch/arm/mach-omap2/prm44xx.c
-f:arch/arm/mach-omap2/prm44xx.h
-f:arch/arm/mach-omap2/prm44xx_54xx.h
-f:arch/arm/mach-omap2/prm54xx.h
-f:arch/arm/mach-omap2/prm7xx.h
-f:arch/arm/mach-omap2/prm_common.c
-f:arch/arm/mach-omap2/prminst44xx.c
-f:arch/arm/mach-omap2/prminst44xx.h
-f:arch/arm/mach-omap2/scrm44xx.h
-f:arch/arm/mach-omap2/sdrc.c
-f:arch/arm/mach-omap2/sdrc.h
-f:arch/arm/mach-omap2/sdrc2xxx.c
-f:arch/arm/mach-omap2/sleep24xx.S
-f:arch/arm/mach-omap2/sleep33xx.S
-f:arch/arm/mach-omap2/sleep34xx.S
-f:arch/arm/mach-omap2/sleep43xx.S
-f:arch/arm/mach-omap2/sleep44xx.S
-f:arch/arm/mach-omap2/smartreflex-class3.c
-f:arch/arm/mach-omap2/soc.h
-f:arch/arm/mach-omap2/sr_device.c
-f:arch/arm/mach-omap2/sram.c
-f:arch/arm/mach-omap2/sram.h
-f:arch/arm/mach-omap2/sram242x.S
-f:arch/arm/mach-omap2/sram243x.S
-f:arch/arm/mach-omap2/ti81xx-restart.c
-f:arch/arm/mach-omap2/ti81xx.h
-f:arch/arm/mach-omap2/timer.c
-f:arch/arm/mach-omap2/usb-tusb6010.c
-f:arch/arm/mach-omap2/usb-tusb6010.h
-f:arch/arm/mach-omap2/vc.c
-f:arch/arm/mach-omap2/vc.h
-f:arch/arm/mach-omap2/vc3xxx_data.c
-f:arch/arm/mach-omap2/vc44xx_data.c
-f:arch/arm/mach-omap2/voltage.c
-f:arch/arm/mach-omap2/voltage.h
-f:arch/arm/mach-omap2/voltagedomains2xxx_data.c
-f:arch/arm/mach-omap2/voltagedomains3xxx_data.c
-f:arch/arm/mach-omap2/voltagedomains44xx_data.c
-f:arch/arm/mach-omap2/voltagedomains54xx_data.c
-f:arch/arm/mach-omap2/vp.c
-f:arch/arm/mach-omap2/vp.h
-f:arch/arm/mach-omap2/vp3xxx_data.c
-f:arch/arm/mach-omap2/vp44xx_data.c
-f:arch/arm/mach-omap2/wd_timer.c
-f:arch/arm/mach-omap2/wd_timer.h
-f:arch/arm/mach-orion5x/Kconfig
-f:arch/arm/mach-orion5x/Makefile
-f:arch/arm/mach-orion5x/board-d2net.c
-f:arch/arm/mach-orion5x/board-dt.c
-f:arch/arm/mach-orion5x/board-mss2.c
-f:arch/arm/mach-orion5x/board-rd88f5182.c
-f:arch/arm/mach-orion5x/bridge-regs.h
-f:arch/arm/mach-orion5x/common.c
-f:arch/arm/mach-orion5x/common.h
-f:arch/arm/mach-orion5x/dns323-setup.c
-f:arch/arm/mach-orion5x/irq.c
-f:arch/arm/mach-orion5x/irqs.h
-f:arch/arm/mach-orion5x/kurobox_pro-setup.c
-f:arch/arm/mach-orion5x/mpp.c
-f:arch/arm/mach-orion5x/mpp.h
-f:arch/arm/mach-orion5x/mv2120-setup.c
-f:arch/arm/mach-orion5x/net2big-setup.c
-f:arch/arm/mach-orion5x/orion5x.h
-f:arch/arm/mach-orion5x/pci.c
-f:arch/arm/mach-orion5x/terastation_pro2-setup.c
-f:arch/arm/mach-orion5x/ts209-setup.c
-f:arch/arm/mach-orion5x/ts409-setup.c
-f:arch/arm/mach-orion5x/ts78xx-fpga.h
-f:arch/arm/mach-orion5x/ts78xx-setup.c
-f:arch/arm/mach-orion5x/tsx09-common.c
-f:arch/arm/mach-orion5x/tsx09-common.h
-f:arch/arm/mach-pxa/Kconfig
-f:arch/arm/mach-pxa/Makefile
-f:arch/arm/mach-pxa/addr-map.h
-f:arch/arm/mach-pxa/am200epd.c
-f:arch/arm/mach-pxa/am300epd.c
-f:arch/arm/mach-pxa/devices.c
-f:arch/arm/mach-pxa/devices.h
-f:arch/arm/mach-pxa/generic.c
-f:arch/arm/mach-pxa/generic.h
-f:arch/arm/mach-pxa/gumstix.c
-f:arch/arm/mach-pxa/gumstix.h
-f:arch/arm/mach-pxa/irq.c
-f:arch/arm/mach-pxa/irqs.h
-f:arch/arm/mach-pxa/mfp-pxa25x.h
-f:arch/arm/mach-pxa/mfp-pxa27x.h
-f:arch/arm/mach-pxa/mfp-pxa2xx.c
-f:arch/arm/mach-pxa/mfp-pxa2xx.h
-f:arch/arm/mach-pxa/mfp-pxa300.h
-f:arch/arm/mach-pxa/mfp-pxa320.h
-f:arch/arm/mach-pxa/mfp-pxa3xx.c
-f:arch/arm/mach-pxa/mfp-pxa3xx.h
-f:arch/arm/mach-pxa/mfp.h
-f:arch/arm/mach-pxa/pm.c
-f:arch/arm/mach-pxa/pm.h
-f:arch/arm/mach-pxa/pxa-dt.c
-f:arch/arm/mach-pxa/pxa-regs.h
-f:arch/arm/mach-pxa/pxa25x.c
-f:arch/arm/mach-pxa/pxa25x.h
-f:arch/arm/mach-pxa/pxa27x-udc.h
-f:arch/arm/mach-pxa/pxa27x.c
-f:arch/arm/mach-pxa/pxa27x.h
-f:arch/arm/mach-pxa/pxa2xx-regs.h
-f:arch/arm/mach-pxa/pxa2xx.c
-f:arch/arm/mach-pxa/pxa300.c
-f:arch/arm/mach-pxa/pxa300.h
-f:arch/arm/mach-pxa/pxa320.c
-f:arch/arm/mach-pxa/pxa320.h
-f:arch/arm/mach-pxa/pxa3xx-regs.h
-f:arch/arm/mach-pxa/pxa3xx.c
-f:arch/arm/mach-pxa/pxa3xx.h
-f:arch/arm/mach-pxa/regs-ost.h
-f:arch/arm/mach-pxa/regs-rtc.h
-f:arch/arm/mach-pxa/reset.c
-f:arch/arm/mach-pxa/reset.h
-f:arch/arm/mach-pxa/sharpsl_pm.c
-f:arch/arm/mach-pxa/sharpsl_pm.h
-f:arch/arm/mach-pxa/sleep.S
-f:arch/arm/mach-pxa/smemc.c
-f:arch/arm/mach-pxa/smemc.h
-f:arch/arm/mach-pxa/spitz.c
-f:arch/arm/mach-pxa/spitz.h
-f:arch/arm/mach-pxa/spitz_pm.c
-f:arch/arm/mach-pxa/standby.S
-f:arch/arm/mach-pxa/udc.h
-f:arch/arm/mach-qcom/Kconfig
-f:arch/arm/mach-qcom/Makefile
-f:arch/arm/mach-qcom/platsmp.c
-f:arch/arm/mach-realtek/Kconfig
-f:arch/arm/mach-realtek/Makefile
-f:arch/arm/mach-realtek/rtd1195.c
-f:arch/arm/mach-rockchip/Kconfig
-f:arch/arm/mach-rockchip/Makefile
-f:arch/arm/mach-rockchip/core.h
-f:arch/arm/mach-rockchip/headsmp.S
-f:arch/arm/mach-rockchip/platsmp.c
-f:arch/arm/mach-rockchip/pm.c
-f:arch/arm/mach-rockchip/pm.h
-f:arch/arm/mach-rockchip/rockchip.c
-f:arch/arm/mach-rockchip/sleep.S
-f:arch/arm/mach-rpc/Kconfig
-f:arch/arm/mach-rpc/Makefile
-f:arch/arm/mach-rpc/dma.c
-f:arch/arm/mach-rpc/ecard-loader.S
-f:arch/arm/mach-rpc/ecard.c
-f:arch/arm/mach-rpc/ecard.h
-f:arch/arm/mach-rpc/fiq.S
-f:arch/arm/mach-rpc/floppydma.S
-f:arch/arm/mach-rpc/include/mach/acornfb.h
-f:arch/arm/mach-rpc/include/mach/hardware.h
-f:arch/arm/mach-rpc/include/mach/io.h
-f:arch/arm/mach-rpc/include/mach/irqs.h
-f:arch/arm/mach-rpc/include/mach/isa-dma.h
-f:arch/arm/mach-rpc/include/mach/memory.h
-f:arch/arm/mach-rpc/include/mach/uncompress.h
-f:arch/arm/mach-rpc/io-acorn.S
-f:arch/arm/mach-rpc/irq.c
-f:arch/arm/mach-rpc/riscpc.c
-f:arch/arm/mach-rpc/time.c
-f:arch/arm/mach-s3c/Kconfig
-f:arch/arm/mach-s3c/Kconfig.s3c64xx
-f:arch/arm/mach-s3c/Makefile
-f:arch/arm/mach-s3c/Makefile.s3c64xx
-f:arch/arm/mach-s3c/cpu.c
-f:arch/arm/mach-s3c/cpu.h
-f:arch/arm/mach-s3c/cpuidle-s3c64xx.c
-f:arch/arm/mach-s3c/crag6410.h
-f:arch/arm/mach-s3c/dev-audio-s3c64xx.c
-f:arch/arm/mach-s3c/dev-uart-s3c64xx.c
-f:arch/arm/mach-s3c/dev-uart.c
-f:arch/arm/mach-s3c/devs.c
-f:arch/arm/mach-s3c/devs.h
-f:arch/arm/mach-s3c/fb.h
-f:arch/arm/mach-s3c/gpio-cfg-helpers.h
-f:arch/arm/mach-s3c/gpio-cfg.h
-f:arch/arm/mach-s3c/gpio-core.h
-f:arch/arm/mach-s3c/gpio-samsung-s3c64xx.h
-f:arch/arm/mach-s3c/gpio-samsung.c
-f:arch/arm/mach-s3c/gpio-samsung.h
-f:arch/arm/mach-s3c/iic-core.h
-f:arch/arm/mach-s3c/init.c
-f:arch/arm/mach-s3c/irq-pm-s3c64xx.c
-f:arch/arm/mach-s3c/irq-uart-s3c64xx.h
-f:arch/arm/mach-s3c/irqs-s3c64xx.h
-f:arch/arm/mach-s3c/irqs.h
-f:arch/arm/mach-s3c/keypad.h
-f:arch/arm/mach-s3c/mach-crag6410-module.c
-f:arch/arm/mach-s3c/mach-crag6410.c
-f:arch/arm/mach-s3c/mach-s3c64xx-dt.c
-f:arch/arm/mach-s3c/map-base.h
-f:arch/arm/mach-s3c/map-s3c.h
-f:arch/arm/mach-s3c/map-s3c64xx.h
-f:arch/arm/mach-s3c/map-s5p.h
-f:arch/arm/mach-s3c/map.h
-f:arch/arm/mach-s3c/pl080.c
-f:arch/arm/mach-s3c/platformdata.c
-f:arch/arm/mach-s3c/pm-common.c
-f:arch/arm/mach-s3c/pm-common.h
-f:arch/arm/mach-s3c/pm-core-s3c64xx.h
-f:arch/arm/mach-s3c/pm-core.h
-f:arch/arm/mach-s3c/pm-gpio.c
-f:arch/arm/mach-s3c/pm-s3c64xx.c
-f:arch/arm/mach-s3c/pm.c
-f:arch/arm/mach-s3c/pm.h
-f:arch/arm/mach-s3c/pwm-core.h
-f:arch/arm/mach-s3c/regs-clock-s3c64xx.h
-f:arch/arm/mach-s3c/regs-clock.h
-f:arch/arm/mach-s3c/regs-gpio-memport-s3c64xx.h
-f:arch/arm/mach-s3c/regs-gpio-s3c64xx.h
-f:arch/arm/mach-s3c/regs-gpio.h
-f:arch/arm/mach-s3c/regs-irq-s3c64xx.h
-f:arch/arm/mach-s3c/regs-irq.h
-f:arch/arm/mach-s3c/regs-irqtype.h
-f:arch/arm/mach-s3c/regs-modem-s3c64xx.h
-f:arch/arm/mach-s3c/regs-sys-s3c64xx.h
-f:arch/arm/mach-s3c/regs-syscon-power-s3c64xx.h
-f:arch/arm/mach-s3c/regs-usb-hsotg-phy-s3c64xx.h
-f:arch/arm/mach-s3c/s3c6410.c
-f:arch/arm/mach-s3c/s3c64xx.c
-f:arch/arm/mach-s3c/s3c64xx.h
-f:arch/arm/mach-s3c/sdhci.h
-f:arch/arm/mach-s3c/setup-fb-24bpp-s3c64xx.c
-f:arch/arm/mach-s3c/setup-i2c0-s3c64xx.c
-f:arch/arm/mach-s3c/setup-i2c1-s3c64xx.c
-f:arch/arm/mach-s3c/setup-keypad-s3c64xx.c
-f:arch/arm/mach-s3c/setup-sdhci-gpio-s3c64xx.c
-f:arch/arm/mach-s3c/setup-spi-s3c64xx.c
-f:arch/arm/mach-s3c/setup-usb-phy-s3c64xx.c
-f:arch/arm/mach-s3c/sleep-s3c64xx.S
-f:arch/arm/mach-s3c/usb-phy.h
-f:arch/arm/mach-s3c/wakeup-mask.c
-f:arch/arm/mach-s3c/wakeup-mask.h
-f:arch/arm/mach-s5pv210/Kconfig
-f:arch/arm/mach-s5pv210/Makefile
-f:arch/arm/mach-s5pv210/common.h
-f:arch/arm/mach-s5pv210/pm.c
-f:arch/arm/mach-s5pv210/regs-clock.h
-f:arch/arm/mach-s5pv210/s5pv210.c
-f:arch/arm/mach-s5pv210/sleep.S
-f:arch/arm/mach-sa1100/Kconfig
-f:arch/arm/mach-sa1100/Makefile
-f:arch/arm/mach-sa1100/assabet.c
-f:arch/arm/mach-sa1100/clock.c
-f:arch/arm/mach-sa1100/collie.c
-f:arch/arm/mach-sa1100/generic.c
-f:arch/arm/mach-sa1100/generic.h
-f:arch/arm/mach-sa1100/h3600.c
-f:arch/arm/mach-sa1100/h3xxx.c
-f:arch/arm/mach-sa1100/include/mach/SA-1100.h
-f:arch/arm/mach-sa1100/include/mach/assabet.h
-f:arch/arm/mach-sa1100/include/mach/bitfield.h
-f:arch/arm/mach-sa1100/include/mach/collie.h
-f:arch/arm/mach-sa1100/include/mach/generic.h
-f:arch/arm/mach-sa1100/include/mach/h3xxx.h
-f:arch/arm/mach-sa1100/include/mach/hardware.h
-f:arch/arm/mach-sa1100/include/mach/irqs.h
-f:arch/arm/mach-sa1100/include/mach/jornada720.h
-f:arch/arm/mach-sa1100/include/mach/memory.h
-f:arch/arm/mach-sa1100/include/mach/mtd-xip.h
-f:arch/arm/mach-sa1100/include/mach/neponset.h
-f:arch/arm/mach-sa1100/include/mach/reset.h
-f:arch/arm/mach-sa1100/include/mach/uncompress.h
-f:arch/arm/mach-sa1100/jornada720.c
-f:arch/arm/mach-sa1100/jornada720_ssp.c
-f:arch/arm/mach-sa1100/neponset.c
-f:arch/arm/mach-sa1100/pm.c
-f:arch/arm/mach-sa1100/sleep.S
-f:arch/arm/mach-sa1100/ssp.c
-f:arch/arm/mach-shmobile/Kconfig
-f:arch/arm/mach-shmobile/Makefile
-f:arch/arm/mach-shmobile/common.h
-f:arch/arm/mach-shmobile/emev2.h
-f:arch/arm/mach-shmobile/headsmp-apmu.S
-f:arch/arm/mach-shmobile/headsmp-scu.S
-f:arch/arm/mach-shmobile/headsmp.S
-f:arch/arm/mach-shmobile/platsmp-apmu.c
-f:arch/arm/mach-shmobile/platsmp-scu.c
-f:arch/arm/mach-shmobile/platsmp.c
-f:arch/arm/mach-shmobile/pm-rcar-gen2.c
-f:arch/arm/mach-shmobile/r8a7779.h
-f:arch/arm/mach-shmobile/rcar-gen2.h
-f:arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c
-f:arch/arm/mach-shmobile/setup-emev2.c
-f:arch/arm/mach-shmobile/setup-r7s72100.c
-f:arch/arm/mach-shmobile/setup-r7s9210.c
-f:arch/arm/mach-shmobile/setup-r8a73a4.c
-f:arch/arm/mach-shmobile/setup-r8a7740.c
-f:arch/arm/mach-shmobile/setup-r8a7778.c
-f:arch/arm/mach-shmobile/setup-r8a7779.c
-f:arch/arm/mach-shmobile/setup-rcar-gen2.c
-f:arch/arm/mach-shmobile/setup-sh73a0.c
-f:arch/arm/mach-shmobile/sh73a0.h
-f:arch/arm/mach-shmobile/smp-emev2.c
-f:arch/arm/mach-shmobile/smp-r8a7779.c
-f:arch/arm/mach-shmobile/smp-sh73a0.c
-f:arch/arm/mach-shmobile/suspend.c
-f:arch/arm/mach-shmobile/timer.c
-f:arch/arm/mach-socfpga/Kconfig
-f:arch/arm/mach-socfpga/Makefile
-f:arch/arm/mach-socfpga/core.h
-f:arch/arm/mach-socfpga/headsmp.S
-f:arch/arm/mach-socfpga/l2_cache.c
-f:arch/arm/mach-socfpga/ocram.c
-f:arch/arm/mach-socfpga/platsmp.c
-f:arch/arm/mach-socfpga/pm.c
-f:arch/arm/mach-socfpga/self-refresh.S
-f:arch/arm/mach-socfpga/socfpga.c
-f:arch/arm/mach-spear/Kconfig
-f:arch/arm/mach-spear/Makefile
-f:arch/arm/mach-spear/generic.h
-f:arch/arm/mach-spear/headsmp.S
-f:arch/arm/mach-spear/hotplug.c
-f:arch/arm/mach-spear/misc_regs.h
-f:arch/arm/mach-spear/pl080.c
-f:arch/arm/mach-spear/pl080.h
-f:arch/arm/mach-spear/platsmp.c
-f:arch/arm/mach-spear/restart.c
-f:arch/arm/mach-spear/spear.h
-f:arch/arm/mach-spear/spear1310.c
-f:arch/arm/mach-spear/spear1340.c
-f:arch/arm/mach-spear/spear13xx.c
-f:arch/arm/mach-spear/spear300.c
-f:arch/arm/mach-spear/spear310.c
-f:arch/arm/mach-spear/spear320.c
-f:arch/arm/mach-spear/spear3xx.c
-f:arch/arm/mach-spear/spear6xx.c
-f:arch/arm/mach-spear/time.c
-f:arch/arm/mach-sti/Kconfig
-f:arch/arm/mach-sti/Makefile
-f:arch/arm/mach-sti/board-dt.c
-f:arch/arm/mach-sti/platsmp.c
-f:arch/arm/mach-sti/smp.h
-f:arch/arm/mach-stm32/Kconfig
-f:arch/arm/mach-stm32/Makefile
-f:arch/arm/mach-stm32/board-dt.c
-f:arch/arm/mach-sunxi/Kconfig
-f:arch/arm/mach-sunxi/Makefile
-f:arch/arm/mach-sunxi/headsmp.S
-f:arch/arm/mach-sunxi/mc_smp.c
-f:arch/arm/mach-sunxi/platsmp.c
-f:arch/arm/mach-sunxi/sunxi.c
-f:arch/arm/mach-tegra/Kconfig
-f:arch/arm/mach-tegra/Makefile
-f:arch/arm/mach-tegra/board-paz00.c
-f:arch/arm/mach-tegra/board.h
-f:arch/arm/mach-tegra/common.h
-f:arch/arm/mach-tegra/hotplug.c
-f:arch/arm/mach-tegra/io.c
-f:arch/arm/mach-tegra/iomap.h
-f:arch/arm/mach-tegra/irammap.h
-f:arch/arm/mach-tegra/irq.c
-f:arch/arm/mach-tegra/platsmp.c
-f:arch/arm/mach-tegra/pm-tegra20.c
-f:arch/arm/mach-tegra/pm-tegra30.c
-f:arch/arm/mach-tegra/pm.c
-f:arch/arm/mach-tegra/pm.h
-f:arch/arm/mach-tegra/reset-handler.S
-f:arch/arm/mach-tegra/reset.c
-f:arch/arm/mach-tegra/reset.h
-f:arch/arm/mach-tegra/sleep-tegra20.S
-f:arch/arm/mach-tegra/sleep-tegra30.S
-f:arch/arm/mach-tegra/sleep.S
-f:arch/arm/mach-tegra/sleep.h
-f:arch/arm/mach-tegra/tegra.c
-f:arch/arm/mach-ux500/Kconfig
-f:arch/arm/mach-ux500/Makefile
-f:arch/arm/mach-ux500/cpu-db8500.c
-f:arch/arm/mach-ux500/platsmp.c
-f:arch/arm/mach-ux500/pm.c
-f:arch/arm/mach-versatile/Kconfig
-f:arch/arm/mach-versatile/Makefile
-f:arch/arm/mach-versatile/headsmp.S
-f:arch/arm/mach-versatile/hotplug.c
-f:arch/arm/mach-versatile/integrator-cm.h
-f:arch/arm/mach-versatile/integrator-hardware.h
-f:arch/arm/mach-versatile/integrator.c
-f:arch/arm/mach-versatile/integrator.h
-f:arch/arm/mach-versatile/integrator_ap.c
-f:arch/arm/mach-versatile/integrator_cp.c
-f:arch/arm/mach-versatile/platsmp-realview.c
-f:arch/arm/mach-versatile/platsmp-vexpress.c
-f:arch/arm/mach-versatile/platsmp.c
-f:arch/arm/mach-versatile/platsmp.h
-f:arch/arm/mach-versatile/realview.c
-f:arch/arm/mach-versatile/spc.c
-f:arch/arm/mach-versatile/spc.h
-f:arch/arm/mach-versatile/tc2_pm.c
-f:arch/arm/mach-versatile/v2m-mps2.c
-f:arch/arm/mach-versatile/v2m.c
-f:arch/arm/mach-versatile/versatile.c
-f:arch/arm/mach-versatile/vexpress.h
-f:arch/arm/mach-vt8500/Kconfig
-f:arch/arm/mach-vt8500/Makefile
-f:arch/arm/mach-vt8500/vt8500.c
-f:arch/arm/mach-zynq/Kconfig
-f:arch/arm/mach-zynq/Makefile
-f:arch/arm/mach-zynq/common.c
-f:arch/arm/mach-zynq/common.h
-f:arch/arm/mach-zynq/headsmp.S
-f:arch/arm/mach-zynq/platsmp.c
-f:arch/arm/mach-zynq/pm.c
-f:arch/arm/mach-zynq/slcr.c
-f:arch/arm/mm/Kconfig
-f:arch/arm/mm/Makefile
-f:arch/arm/mm/abort-ev4.S
-f:arch/arm/mm/abort-ev4t.S
-f:arch/arm/mm/abort-ev5t.S
-f:arch/arm/mm/abort-ev5tj.S
-f:arch/arm/mm/abort-ev6.S
-f:arch/arm/mm/abort-ev7.S
-f:arch/arm/mm/abort-lv4t.S
-f:arch/arm/mm/abort-macro.S
-f:arch/arm/mm/abort-nommu.S
-f:arch/arm/mm/alignment.c
-f:arch/arm/mm/cache-b15-rac.c
-f:arch/arm/mm/cache-fa.S
-f:arch/arm/mm/cache-feroceon-l2.c
-f:arch/arm/mm/cache-l2x0-pmu.c
-f:arch/arm/mm/cache-l2x0.c
-f:arch/arm/mm/cache-nop.S
-f:arch/arm/mm/cache-tauros2.c
-f:arch/arm/mm/cache-tauros3.h
-f:arch/arm/mm/cache-uniphier.c
-f:arch/arm/mm/cache-v4.S
-f:arch/arm/mm/cache-v4wb.S
-f:arch/arm/mm/cache-v4wt.S
-f:arch/arm/mm/cache-v6.S
-f:arch/arm/mm/cache-v7.S
-f:arch/arm/mm/cache-v7m.S
-f:arch/arm/mm/cache-xsc3l2.c
-f:arch/arm/mm/cache.c
-f:arch/arm/mm/context.c
-f:arch/arm/mm/copypage-fa.c
-f:arch/arm/mm/copypage-feroceon.c
-f:arch/arm/mm/copypage-v4mc.c
-f:arch/arm/mm/copypage-v4wb.c
-f:arch/arm/mm/copypage-v4wt.c
-f:arch/arm/mm/copypage-v6.c
-f:arch/arm/mm/copypage-xsc3.c
-f:arch/arm/mm/copypage-xscale.c
-f:arch/arm/mm/dma-mapping-nommu.c
-f:arch/arm/mm/dma-mapping.c
-f:arch/arm/mm/dma.h
-f:arch/arm/mm/dump.c
-f:arch/arm/mm/extable.c
-f:arch/arm/mm/fault-armv.c
-f:arch/arm/mm/fault.c
-f:arch/arm/mm/fault.h
-f:arch/arm/mm/flush.c
-f:arch/arm/mm/fsr-2level.c
-f:arch/arm/mm/fsr-3level.c
-f:arch/arm/mm/idmap.c
-f:arch/arm/mm/init.c
-f:arch/arm/mm/iomap.c
-f:arch/arm/mm/ioremap.c
-f:arch/arm/mm/kasan_init.c
-f:arch/arm/mm/l2c-common.c
-f:arch/arm/mm/l2c-l2x0-resume.S
-f:arch/arm/mm/mm.h
-f:arch/arm/mm/mmap.c
-f:arch/arm/mm/mmu.c
-f:arch/arm/mm/nommu.c
-f:arch/arm/mm/pabort-legacy.S
-f:arch/arm/mm/pabort-v6.S
-f:arch/arm/mm/pabort-v7.S
-f:arch/arm/mm/pageattr.c
-f:arch/arm/mm/pgd.c
-f:arch/arm/mm/physaddr.c
-f:arch/arm/mm/pmsa-v7.c
-f:arch/arm/mm/pmsa-v8.c
-f:arch/arm/mm/proc-arm1020.S
-f:arch/arm/mm/proc-arm1020e.S
-f:arch/arm/mm/proc-arm1022.S
-f:arch/arm/mm/proc-arm1026.S
-f:arch/arm/mm/proc-arm720.S
-f:arch/arm/mm/proc-arm740.S
-f:arch/arm/mm/proc-arm7tdmi.S
-f:arch/arm/mm/proc-arm920.S
-f:arch/arm/mm/proc-arm922.S
-f:arch/arm/mm/proc-arm925.S
-f:arch/arm/mm/proc-arm926.S
-f:arch/arm/mm/proc-arm940.S
-f:arch/arm/mm/proc-arm946.S
-f:arch/arm/mm/proc-arm9tdmi.S
-f:arch/arm/mm/proc-fa526.S
-f:arch/arm/mm/proc-feroceon.S
-f:arch/arm/mm/proc-macros.S
-f:arch/arm/mm/proc-mohawk.S
-f:arch/arm/mm/proc-sa110.S
-f:arch/arm/mm/proc-sa1100.S
-f:arch/arm/mm/proc-syms.c
-f:arch/arm/mm/proc-v6.S
-f:arch/arm/mm/proc-v7-2level.S
-f:arch/arm/mm/proc-v7-3level.S
-f:arch/arm/mm/proc-v7-bugs.c
-f:arch/arm/mm/proc-v7.S
-f:arch/arm/mm/proc-v7m.S
-f:arch/arm/mm/proc-xsc3.S
-f:arch/arm/mm/proc-xscale.S
-f:arch/arm/mm/proc.c
-f:arch/arm/mm/ptdump_debugfs.c
-f:arch/arm/mm/pv-fixup-asm.S
-f:arch/arm/mm/tlb-fa.S
-f:arch/arm/mm/tlb-v4.S
-f:arch/arm/mm/tlb-v4wb.S
-f:arch/arm/mm/tlb-v4wbi.S
-f:arch/arm/mm/tlb-v6.S
-f:arch/arm/mm/tlb-v7.S
-f:arch/arm/mm/tlb.c
-f:arch/arm/net/Makefile
-f:arch/arm/net/bpf_jit_32.c
-f:arch/arm/net/bpf_jit_32.h
-f:arch/arm/nwfpe/ARM-gcc.h
-f:arch/arm/nwfpe/ChangeLog
-f:arch/arm/nwfpe/Makefile
-f:arch/arm/nwfpe/double_cpdo.c
-f:arch/arm/nwfpe/entry.S
-f:arch/arm/nwfpe/extended_cpdo.c
-f:arch/arm/nwfpe/fpa11.c
-f:arch/arm/nwfpe/fpa11.h
-f:arch/arm/nwfpe/fpa11.inl
-f:arch/arm/nwfpe/fpa11_cpdo.c
-f:arch/arm/nwfpe/fpa11_cpdt.c
-f:arch/arm/nwfpe/fpa11_cprt.c
-f:arch/arm/nwfpe/fpmodule.c
-f:arch/arm/nwfpe/fpmodule.h
-f:arch/arm/nwfpe/fpmodule.inl
-f:arch/arm/nwfpe/fpopcode.c
-f:arch/arm/nwfpe/fpopcode.h
-f:arch/arm/nwfpe/fpsr.h
-f:arch/arm/nwfpe/milieu.h
-f:arch/arm/nwfpe/single_cpdo.c
-f:arch/arm/nwfpe/softfloat-macros
-f:arch/arm/nwfpe/softfloat-specialize
-f:arch/arm/nwfpe/softfloat.c
-f:arch/arm/nwfpe/softfloat.h
-f:arch/arm/plat-orion/Makefile
-f:arch/arm/plat-orion/common.c
-f:arch/arm/plat-orion/gpio.c
-f:arch/arm/plat-orion/include/plat/addr-map.h
-f:arch/arm/plat-orion/include/plat/common.h
-f:arch/arm/plat-orion/include/plat/irq.h
-f:arch/arm/plat-orion/include/plat/mpp.h
-f:arch/arm/plat-orion/include/plat/orion-gpio.h
-f:arch/arm/plat-orion/include/plat/pcie.h
-f:arch/arm/plat-orion/include/plat/time.h
-f:arch/arm/plat-orion/irq.c
-f:arch/arm/plat-orion/mpp.c
-f:arch/arm/plat-orion/pcie.c
-f:arch/arm/plat-orion/time.c
-f:arch/arm/probes/Makefile
-f:arch/arm/probes/decode-arm.c
-f:arch/arm/probes/decode-arm.h
-f:arch/arm/probes/decode-thumb.c
-f:arch/arm/probes/decode-thumb.h
-f:arch/arm/probes/decode.c
-f:arch/arm/probes/decode.h
-f:arch/arm/probes/kprobes/Makefile
-f:arch/arm/probes/kprobes/actions-arm.c
-f:arch/arm/probes/kprobes/actions-common.c
-f:arch/arm/probes/kprobes/actions-thumb.c
-f:arch/arm/probes/kprobes/checkers-arm.c
-f:arch/arm/probes/kprobes/checkers-common.c
-f:arch/arm/probes/kprobes/checkers-thumb.c
-f:arch/arm/probes/kprobes/checkers.h
-f:arch/arm/probes/kprobes/core.c
-f:arch/arm/probes/kprobes/core.h
-f:arch/arm/probes/kprobes/opt-arm.c
-f:arch/arm/probes/kprobes/test-arm.c
-f:arch/arm/probes/kprobes/test-core.c
-f:arch/arm/probes/kprobes/test-core.h
-f:arch/arm/probes/kprobes/test-thumb.c
-f:arch/arm/probes/uprobes/Makefile
-f:arch/arm/probes/uprobes/actions-arm.c
-f:arch/arm/probes/uprobes/core.c
-f:arch/arm/probes/uprobes/core.h
-f:arch/arm/tools/Makefile
-f:arch/arm/tools/gen-mach-types
-f:arch/arm/tools/mach-types
-f:arch/arm/tools/syscall.tbl
-f:arch/arm/tools/syscallnr.sh
-f:arch/arm/vdso/.gitignore
-f:arch/arm/vdso/Makefile
-f:arch/arm/vdso/note.c
-f:arch/arm/vdso/vdso.S
-f:arch/arm/vdso/vdso.lds.S
-f:arch/arm/vdso/vdsomunge.c
-f:arch/arm/vdso/vgettimeofday.c
-f:arch/arm/vfp/Makefile
-f:arch/arm/vfp/vfp.h
-f:arch/arm/vfp/vfpdouble.c
-f:arch/arm/vfp/vfphw.S
-f:arch/arm/vfp/vfpinstr.h
-f:arch/arm/vfp/vfpmodule.c
-f:arch/arm/vfp/vfpsingle.c
-f:arch/arm/xen/Makefile
-f:arch/arm/xen/enlighten.c
-f:arch/arm/xen/grant-table.c
-f:arch/arm/xen/hypercall.S
-f:arch/arm/xen/mm.c
-f:arch/arm/xen/p2m.c
-f:arch/arm64/Kbuild
-f:arch/arm64/Kconfig
-f:arch/arm64/Kconfig.debug
-f:arch/arm64/Kconfig.platforms
-f:arch/arm64/Makefile
-f:arch/arm64/boot/.gitignore
-f:arch/arm64/boot/Makefile
-f:arch/arm64/boot/dts/Makefile
-f:arch/arm64/boot/dts/actions/Makefile
-f:arch/arm64/boot/dts/actions/s700-cubieboard7.dts
-f:arch/arm64/boot/dts/actions/s700.dtsi
-f:arch/arm64/boot/dts/actions/s900-bubblegum-96.dts
-f:arch/arm64/boot/dts/actions/s900.dtsi
-f:arch/arm64/boot/dts/airoha/Makefile
-f:arch/arm64/boot/dts/airoha/en7581-evb.dts
-f:arch/arm64/boot/dts/airoha/en7581.dtsi
-f:arch/arm64/boot/dts/allwinner/Makefile
-f:arch/arm64/boot/dts/allwinner/axp803.dtsi
-f:arch/arm64/boot/dts/allwinner/sun50i-a100-allwinner-perf1.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-a100-cpu-opp.dtsi
-f:arch/arm64/boot/dts/allwinner/sun50i-a100.dtsi
-f:arch/arm64/boot/dts/allwinner/sun50i-a133-liontron-h-a133l.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-a64-cpu-opp.dtsi
-f:arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-a64-oceanic-5205-5inmfd.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino-emmc.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
-f:arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab-early-adopter.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi
-f:arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
-f:arch/arm64/boot/dts/allwinner/sun50i-h313-tanix-tx1.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-h5-bananapi-m2-plus-v1.2.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-h5-bananapi-m2-plus.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-h5-cpu-opp.dtsi
-f:arch/arm64/boot/dts/allwinner/sun50i-h5-emlid-neutis-n5-devboard.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-h5-emlid-neutis-n5.dtsi
-f:arch/arm64/boot/dts/allwinner/sun50i-h5-libretech-all-h3-cc.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-h5-libretech-all-h3-it.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-h5-libretech-all-h5-cc.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi
-f:arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-h6-cpu-opp.dtsi
-f:arch/arm64/boot/dts/allwinner/sun50i-h6-gpu-opp.dtsi
-f:arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-lite2.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-one-plus.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi
-f:arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-model-b.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-h6-tanix-tx6-mini.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-h6-tanix-tx6.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-h6-tanix.dtsi
-f:arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
-f:arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1-manta.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi
-f:arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-pi.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-h616-cpu-opp.dtsi
-f:arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi
-f:arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-h616-x96-mate.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
-f:arch/arm64/boot/dts/allwinner/sun50i-h618-longan-module-3h.dtsi
-f:arch/arm64/boot/dts/allwinner/sun50i-h618-longanpi-3h.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero2w.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero3.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-h618-transpeed-8k618-t.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-h618-yuzukihd-chameleon.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-h64-remix-mini-pc.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-h700-anbernic-rg35xx-2024.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-h700-anbernic-rg35xx-h.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-h700-anbernic-rg35xx-plus.dts
-f:arch/arm64/boot/dts/allwinner/sun50i-h700-anbernic-rg35xx-sp.dts
-f:arch/arm64/boot/dts/allwinner/sun55i-a523.dtsi
-f:arch/arm64/boot/dts/allwinner/sun55i-a527-cubie-a5e.dts
-f:arch/arm64/boot/dts/allwinner/sun55i-h728-x96qpro+.dts
-f:arch/arm64/boot/dts/allwinner/sun55i-t527-avaota-a1.dts
-f:arch/arm64/boot/dts/allwinner/sun55i-t527-orangepi-4a.dts
-f:arch/arm64/boot/dts/altera/Makefile
-f:arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
-f:arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts
-f:arch/arm64/boot/dts/altera/socfpga_stratix10_socdk_nand.dts
-f:arch/arm64/boot/dts/altera/socfpga_stratix10_swvp.dts
-f:arch/arm64/boot/dts/amazon/Makefile
-f:arch/arm64/boot/dts/amazon/alpine-v2-evp.dts
-f:arch/arm64/boot/dts/amazon/alpine-v2.dtsi
-f:arch/arm64/boot/dts/amazon/alpine-v3-evp.dts
-f:arch/arm64/boot/dts/amazon/alpine-v3.dtsi
-f:arch/arm64/boot/dts/amd/Makefile
-f:arch/arm64/boot/dts/amd/amd-overdrive-rev-b0.dts
-f:arch/arm64/boot/dts/amd/amd-overdrive-rev-b1.dts
-f:arch/arm64/boot/dts/amd/amd-seattle-clks.dtsi
-f:arch/arm64/boot/dts/amd/amd-seattle-cpus.dtsi
-f:arch/arm64/boot/dts/amd/amd-seattle-soc.dtsi
-f:arch/arm64/boot/dts/amd/amd-seattle-xgbe-b.dtsi
-f:arch/arm64/boot/dts/amd/elba-16core.dtsi
-f:arch/arm64/boot/dts/amd/elba-asic-common.dtsi
-f:arch/arm64/boot/dts/amd/elba-asic.dts
-f:arch/arm64/boot/dts/amd/elba-flash-parts.dtsi
-f:arch/arm64/boot/dts/amd/elba.dtsi
-f:arch/arm64/boot/dts/amlogic/Makefile
-f:arch/arm64/boot/dts/amlogic/amlogic-a4-a113l2-ba400.dts
-f:arch/arm64/boot/dts/amlogic/amlogic-a4-common.dtsi
-f:arch/arm64/boot/dts/amlogic/amlogic-a4-reset.h
-f:arch/arm64/boot/dts/amlogic/amlogic-a4.dtsi
-f:arch/arm64/boot/dts/amlogic/amlogic-a5-a113x2-av400.dts
-f:arch/arm64/boot/dts/amlogic/amlogic-a5-reset.h
-f:arch/arm64/boot/dts/amlogic/amlogic-a5.dtsi
-f:arch/arm64/boot/dts/amlogic/amlogic-c3-c302x-aw409.dts
-f:arch/arm64/boot/dts/amlogic/amlogic-c3-c308l-aw419.dts
-f:arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi
-f:arch/arm64/boot/dts/amlogic/amlogic-s6-s905x5-bl209.dts
-f:arch/arm64/boot/dts/amlogic/amlogic-s6.dtsi
-f:arch/arm64/boot/dts/amlogic/amlogic-s7-s805x3-bp201.dts
-f:arch/arm64/boot/dts/amlogic/amlogic-s7.dtsi
-f:arch/arm64/boot/dts/amlogic/amlogic-s7d-s905x5m-bm202.dts
-f:arch/arm64/boot/dts/amlogic/amlogic-s7d.dtsi
-f:arch/arm64/boot/dts/amlogic/amlogic-t7-a311d2-an400.dts
-f:arch/arm64/boot/dts/amlogic/amlogic-t7-a311d2-khadas-vim4.dts
-f:arch/arm64/boot/dts/amlogic/amlogic-t7-reset.h
-f:arch/arm64/boot/dts/amlogic/amlogic-t7.dtsi
-f:arch/arm64/boot/dts/amlogic/meson-a1-ad401.dts
-f:arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts
-f:arch/arm64/boot/dts/amlogic/meson-a1.dtsi
-f:arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j100.dts
-f:arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-2.dts
-f:arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-3.dts
-f:arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j1xx.dtsi
-f:arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
-f:arch/arm64/boot/dts/amlogic/meson-axg.dtsi
-f:arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
-f:arch/arm64/boot/dts/amlogic/meson-g12.dtsi
-f:arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am-brcm.dtso
-f:arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am-realtek.dtso
-f:arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am.dts
-f:arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
-f:arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts
-f:arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts
-f:arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts
-f:arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
-f:arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts
-f:arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3.dts
-f:arch/arm64/boot/dts/amlogic/meson-g12b-a311d-libretech-cc.dts
-f:arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi
-f:arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts
-f:arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-mnt-reform2.dts
-f:arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi
-f:arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi
-f:arch/arm64/boot/dts/amlogic/meson-g12b-dreambox-one.dts
-f:arch/arm64/boot/dts/amlogic/meson-g12b-dreambox-two.dts
-f:arch/arm64/boot/dts/amlogic/meson-g12b-dreambox.dtsi
-f:arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts
-f:arch/arm64/boot/dts/amlogic/meson-g12b-gtking-pro.dts
-f:arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dts
-f:arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi
-f:arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts
-f:arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dts
-f:arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
-f:arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
-f:arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2l.dts
-f:arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi
-f:arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts
-f:arch/arm64/boot/dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts
-f:arch/arm64/boot/dts/amlogic/meson-g12b-s922x-khadas-vim3.dts
-f:arch/arm64/boot/dts/amlogic/meson-g12b-s922x.dtsi
-f:arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts
-f:arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi
-f:arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
-f:arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi
-f:arch/arm64/boot/dts/amlogic/meson-gx-mali450.dtsi
-f:arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
-f:arch/arm64/boot/dts/amlogic/meson-gx.dtsi
-f:arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts
-f:arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
-f:arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts
-f:arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
-f:arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts
-f:arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts
-f:arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
-f:arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-meta.dts
-f:arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-pro.dts
-f:arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-telos.dts
-f:arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
-f:arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts
-f:arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts
-f:arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
-f:arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
-f:arch/arm64/boot/dts/amlogic/meson-gxl-mali.dtsi
-f:arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dts
-f:arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts
-f:arch/arm64/boot/dts/amlogic/meson-gxl-s805x.dtsi
-f:arch/arm64/boot/dts/amlogic/meson-gxl-s805y-xiaomi-aquaman.dts
-f:arch/arm64/boot/dts/amlogic/meson-gxl-s805y.dtsi
-f:arch/arm64/boot/dts/amlogic/meson-gxl-s905d-libretech-pc.dts
-f:arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-kii-pro.dts
-f:arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts
-f:arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dts
-f:arch/arm64/boot/dts/amlogic/meson-gxl-s905d-phicomm-n1.dts
-f:arch/arm64/boot/dts/amlogic/meson-gxl-s905d-sml5442tw.dts
-f:arch/arm64/boot/dts/amlogic/meson-gxl-s905d-vero4k-plus.dts
-f:arch/arm64/boot/dts/amlogic/meson-gxl-s905d.dtsi
-f:arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts
-f:arch/arm64/boot/dts/amlogic/meson-gxl-s905w-p281.dts
-f:arch/arm64/boot/dts/amlogic/meson-gxl-s905w-tx3-mini.dts
-f:arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts
-f:arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
-f:arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dts
-f:arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
-f:arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts
-f:arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts
-f:arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi
-f:arch/arm64/boot/dts/amlogic/meson-gxl-s905x-vero4k.dts
-f:arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi
-f:arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
-f:arch/arm64/boot/dts/amlogic/meson-gxlx-s905l-p271.dts
-f:arch/arm64/boot/dts/amlogic/meson-gxm-gt1-ultimate.dts
-f:arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
-f:arch/arm64/boot/dts/amlogic/meson-gxm-mecool-kiii-pro.dts
-f:arch/arm64/boot/dts/amlogic/meson-gxm-minix-neo-u9h.dts
-f:arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
-f:arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts
-f:arch/arm64/boot/dts/amlogic/meson-gxm-q201.dts
-f:arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts
-f:arch/arm64/boot/dts/amlogic/meson-gxm-s912-libretech-pc.dts
-f:arch/arm64/boot/dts/amlogic/meson-gxm-ugoos-am3.dts
-f:arch/arm64/boot/dts/amlogic/meson-gxm-vega-s96.dts
-f:arch/arm64/boot/dts/amlogic/meson-gxm-wetek-core2.dts
-f:arch/arm64/boot/dts/amlogic/meson-gxm.dtsi
-f:arch/arm64/boot/dts/amlogic/meson-khadas-vim3-ts050.dtso
-f:arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi
-f:arch/arm64/boot/dts/amlogic/meson-libretech-cottonwood.dtsi
-f:arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dts
-f:arch/arm64/boot/dts/amlogic/meson-s4.dtsi
-f:arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dts
-f:arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air.dts
-f:arch/arm64/boot/dts/amlogic/meson-sm1-ac2xx.dtsi
-f:arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m2-pro.dts
-f:arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts
-f:arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi
-f:arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts
-f:arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts
-f:arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts
-f:arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts
-f:arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
-f:arch/arm64/boot/dts/amlogic/meson-sm1-s905d3-libretech-cc.dts
-f:arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts
-f:arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts
-f:arch/arm64/boot/dts/amlogic/meson-sm1-x96-air.dts
-f:arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
-f:arch/arm64/boot/dts/apm/Makefile
-f:arch/arm64/boot/dts/apm/apm-merlin.dts
-f:arch/arm64/boot/dts/apm/apm-mustang.dts
-f:arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
-f:arch/arm64/boot/dts/apm/apm-storm.dtsi
-f:arch/arm64/boot/dts/apple/Makefile
-f:arch/arm64/boot/dts/apple/multi-die-cpp.h
-f:arch/arm64/boot/dts/apple/s5l8960x-5s.dtsi
-f:arch/arm64/boot/dts/apple/s5l8960x-air1.dtsi
-f:arch/arm64/boot/dts/apple/s5l8960x-common.dtsi
-f:arch/arm64/boot/dts/apple/s5l8960x-j71.dts
-f:arch/arm64/boot/dts/apple/s5l8960x-j72.dts
-f:arch/arm64/boot/dts/apple/s5l8960x-j73.dts
-f:arch/arm64/boot/dts/apple/s5l8960x-j85.dts
-f:arch/arm64/boot/dts/apple/s5l8960x-j85m.dts
-f:arch/arm64/boot/dts/apple/s5l8960x-j86.dts
-f:arch/arm64/boot/dts/apple/s5l8960x-j86m.dts
-f:arch/arm64/boot/dts/apple/s5l8960x-j87.dts
-f:arch/arm64/boot/dts/apple/s5l8960x-j87m.dts
-f:arch/arm64/boot/dts/apple/s5l8960x-mini2.dtsi
-f:arch/arm64/boot/dts/apple/s5l8960x-mini3.dtsi
-f:arch/arm64/boot/dts/apple/s5l8960x-n51.dts
-f:arch/arm64/boot/dts/apple/s5l8960x-n53.dts
-f:arch/arm64/boot/dts/apple/s5l8960x-opp.dtsi
-f:arch/arm64/boot/dts/apple/s5l8960x-pmgr.dtsi
-f:arch/arm64/boot/dts/apple/s5l8960x.dtsi
-f:arch/arm64/boot/dts/apple/s5l8965x-opp.dtsi
-f:arch/arm64/boot/dts/apple/s800-0-3-common.dtsi
-f:arch/arm64/boot/dts/apple/s800-0-3-pmgr.dtsi
-f:arch/arm64/boot/dts/apple/s800-0-3.dtsi
-f:arch/arm64/boot/dts/apple/s8000-j71s.dts
-f:arch/arm64/boot/dts/apple/s8000-j72s.dts
-f:arch/arm64/boot/dts/apple/s8000-n66.dts
-f:arch/arm64/boot/dts/apple/s8000-n69u.dts
-f:arch/arm64/boot/dts/apple/s8000-n71.dts
-f:arch/arm64/boot/dts/apple/s8000.dtsi
-f:arch/arm64/boot/dts/apple/s8001-common.dtsi
-f:arch/arm64/boot/dts/apple/s8001-j127.dts
-f:arch/arm64/boot/dts/apple/s8001-j128.dts
-f:arch/arm64/boot/dts/apple/s8001-j98a-j99a.dtsi
-f:arch/arm64/boot/dts/apple/s8001-j98a.dts
-f:arch/arm64/boot/dts/apple/s8001-j99a.dts
-f:arch/arm64/boot/dts/apple/s8001-pmgr.dtsi
-f:arch/arm64/boot/dts/apple/s8001-pro.dtsi
-f:arch/arm64/boot/dts/apple/s8001.dtsi
-f:arch/arm64/boot/dts/apple/s8003-j71t.dts
-f:arch/arm64/boot/dts/apple/s8003-j72t.dts
-f:arch/arm64/boot/dts/apple/s8003-n66m.dts
-f:arch/arm64/boot/dts/apple/s8003-n69.dts
-f:arch/arm64/boot/dts/apple/s8003-n71m.dts
-f:arch/arm64/boot/dts/apple/s8003.dtsi
-f:arch/arm64/boot/dts/apple/s800x-6s.dtsi
-f:arch/arm64/boot/dts/apple/s800x-ipad5.dtsi
-f:arch/arm64/boot/dts/apple/s800x-se.dtsi
-f:arch/arm64/boot/dts/apple/spi1-nvram.dtsi
-f:arch/arm64/boot/dts/apple/t6000-j314s.dts
-f:arch/arm64/boot/dts/apple/t6000-j316s.dts
-f:arch/arm64/boot/dts/apple/t6000.dtsi
-f:arch/arm64/boot/dts/apple/t6001-j314c.dts
-f:arch/arm64/boot/dts/apple/t6001-j316c.dts
-f:arch/arm64/boot/dts/apple/t6001-j375c.dts
-f:arch/arm64/boot/dts/apple/t6001.dtsi
-f:arch/arm64/boot/dts/apple/t6002-j375d.dts
-f:arch/arm64/boot/dts/apple/t6002.dtsi
-f:arch/arm64/boot/dts/apple/t600x-common.dtsi
-f:arch/arm64/boot/dts/apple/t600x-die0.dtsi
-f:arch/arm64/boot/dts/apple/t600x-dieX.dtsi
-f:arch/arm64/boot/dts/apple/t600x-gpio-pins.dtsi
-f:arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi
-f:arch/arm64/boot/dts/apple/t600x-j375.dtsi
-f:arch/arm64/boot/dts/apple/t600x-nvme.dtsi
-f:arch/arm64/boot/dts/apple/t600x-pmgr.dtsi
-f:arch/arm64/boot/dts/apple/t7000-6.dtsi
-f:arch/arm64/boot/dts/apple/t7000-common.dtsi
-f:arch/arm64/boot/dts/apple/t7000-handheld.dtsi
-f:arch/arm64/boot/dts/apple/t7000-j42d.dts
-f:arch/arm64/boot/dts/apple/t7000-j96.dts
-f:arch/arm64/boot/dts/apple/t7000-j97.dts
-f:arch/arm64/boot/dts/apple/t7000-mini4.dtsi
-f:arch/arm64/boot/dts/apple/t7000-n102.dts
-f:arch/arm64/boot/dts/apple/t7000-n56.dts
-f:arch/arm64/boot/dts/apple/t7000-n61.dts
-f:arch/arm64/boot/dts/apple/t7000-pmgr.dtsi
-f:arch/arm64/boot/dts/apple/t7000.dtsi
-f:arch/arm64/boot/dts/apple/t7001-air2.dtsi
-f:arch/arm64/boot/dts/apple/t7001-j81.dts
-f:arch/arm64/boot/dts/apple/t7001-j82.dts
-f:arch/arm64/boot/dts/apple/t7001-pmgr.dtsi
-f:arch/arm64/boot/dts/apple/t7001.dtsi
-f:arch/arm64/boot/dts/apple/t8010-7.dtsi
-f:arch/arm64/boot/dts/apple/t8010-common.dtsi
-f:arch/arm64/boot/dts/apple/t8010-d10.dts
-f:arch/arm64/boot/dts/apple/t8010-d101.dts
-f:arch/arm64/boot/dts/apple/t8010-d11.dts
-f:arch/arm64/boot/dts/apple/t8010-d111.dts
-f:arch/arm64/boot/dts/apple/t8010-ipad6.dtsi
-f:arch/arm64/boot/dts/apple/t8010-ipad7.dtsi
-f:arch/arm64/boot/dts/apple/t8010-j171.dts
-f:arch/arm64/boot/dts/apple/t8010-j172.dts
-f:arch/arm64/boot/dts/apple/t8010-j71b.dts
-f:arch/arm64/boot/dts/apple/t8010-j72b.dts
-f:arch/arm64/boot/dts/apple/t8010-n112.dts
-f:arch/arm64/boot/dts/apple/t8010-pmgr.dtsi
-f:arch/arm64/boot/dts/apple/t8010.dtsi
-f:arch/arm64/boot/dts/apple/t8011-common.dtsi
-f:arch/arm64/boot/dts/apple/t8011-j105a.dts
-f:arch/arm64/boot/dts/apple/t8011-j120.dts
-f:arch/arm64/boot/dts/apple/t8011-j121.dts
-f:arch/arm64/boot/dts/apple/t8011-j207.dts
-f:arch/arm64/boot/dts/apple/t8011-j208.dts
-f:arch/arm64/boot/dts/apple/t8011-pmgr.dtsi
-f:arch/arm64/boot/dts/apple/t8011-pro2.dtsi
-f:arch/arm64/boot/dts/apple/t8011.dtsi
-f:arch/arm64/boot/dts/apple/t8012-j132.dts
-f:arch/arm64/boot/dts/apple/t8012-j137.dts
-f:arch/arm64/boot/dts/apple/t8012-j140a.dts
-f:arch/arm64/boot/dts/apple/t8012-j140k.dts
-f:arch/arm64/boot/dts/apple/t8012-j152f.dts
-f:arch/arm64/boot/dts/apple/t8012-j160.dts
-f:arch/arm64/boot/dts/apple/t8012-j174.dts
-f:arch/arm64/boot/dts/apple/t8012-j185.dts
-f:arch/arm64/boot/dts/apple/t8012-j185f.dts
-f:arch/arm64/boot/dts/apple/t8012-j213.dts
-f:arch/arm64/boot/dts/apple/t8012-j214k.dts
-f:arch/arm64/boot/dts/apple/t8012-j215.dts
-f:arch/arm64/boot/dts/apple/t8012-j223.dts
-f:arch/arm64/boot/dts/apple/t8012-j230k.dts
-f:arch/arm64/boot/dts/apple/t8012-j680.dts
-f:arch/arm64/boot/dts/apple/t8012-j780.dts
-f:arch/arm64/boot/dts/apple/t8012-jxxx.dtsi
-f:arch/arm64/boot/dts/apple/t8012-pmgr.dtsi
-f:arch/arm64/boot/dts/apple/t8012-touchbar.dtsi
-f:arch/arm64/boot/dts/apple/t8012.dtsi
-f:arch/arm64/boot/dts/apple/t8015-8.dtsi
-f:arch/arm64/boot/dts/apple/t8015-8plus.dtsi
-f:arch/arm64/boot/dts/apple/t8015-common.dtsi
-f:arch/arm64/boot/dts/apple/t8015-d20.dts
-f:arch/arm64/boot/dts/apple/t8015-d201.dts
-f:arch/arm64/boot/dts/apple/t8015-d21.dts
-f:arch/arm64/boot/dts/apple/t8015-d211.dts
-f:arch/arm64/boot/dts/apple/t8015-d22.dts
-f:arch/arm64/boot/dts/apple/t8015-d221.dts
-f:arch/arm64/boot/dts/apple/t8015-pmgr.dtsi
-f:arch/arm64/boot/dts/apple/t8015-x.dtsi
-f:arch/arm64/boot/dts/apple/t8015.dtsi
-f:arch/arm64/boot/dts/apple/t8103-j274.dts
-f:arch/arm64/boot/dts/apple/t8103-j293.dts
-f:arch/arm64/boot/dts/apple/t8103-j313.dts
-f:arch/arm64/boot/dts/apple/t8103-j456.dts
-f:arch/arm64/boot/dts/apple/t8103-j457.dts
-f:arch/arm64/boot/dts/apple/t8103-jxxx.dtsi
-f:arch/arm64/boot/dts/apple/t8103-pmgr.dtsi
-f:arch/arm64/boot/dts/apple/t8103.dtsi
-f:arch/arm64/boot/dts/apple/t8112-j413.dts
-f:arch/arm64/boot/dts/apple/t8112-j473.dts
-f:arch/arm64/boot/dts/apple/t8112-j493.dts
-f:arch/arm64/boot/dts/apple/t8112-jxxx.dtsi
-f:arch/arm64/boot/dts/apple/t8112-pmgr.dtsi
-f:arch/arm64/boot/dts/apple/t8112.dtsi
-f:arch/arm64/boot/dts/arm/Makefile
-f:arch/arm64/boot/dts/arm/corstone1000-fvp.dts
-f:arch/arm64/boot/dts/arm/corstone1000-mps3.dts
-f:arch/arm64/boot/dts/arm/corstone1000.dtsi
-f:arch/arm64/boot/dts/arm/foundation-v8-gicv2.dtsi
-f:arch/arm64/boot/dts/arm/foundation-v8-gicv3-psci.dts
-f:arch/arm64/boot/dts/arm/foundation-v8-gicv3.dts
-f:arch/arm64/boot/dts/arm/foundation-v8-gicv3.dtsi
-f:arch/arm64/boot/dts/arm/foundation-v8-psci.dts
-f:arch/arm64/boot/dts/arm/foundation-v8-psci.dtsi
-f:arch/arm64/boot/dts/arm/foundation-v8-spin-table.dtsi
-f:arch/arm64/boot/dts/arm/foundation-v8.dts
-f:arch/arm64/boot/dts/arm/foundation-v8.dtsi
-f:arch/arm64/boot/dts/arm/fvp-base-revc.dts
-f:arch/arm64/boot/dts/arm/juno-base.dtsi
-f:arch/arm64/boot/dts/arm/juno-clocks.dtsi
-f:arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi
-f:arch/arm64/boot/dts/arm/juno-motherboard.dtsi
-f:arch/arm64/boot/dts/arm/juno-r1-scmi.dts
-f:arch/arm64/boot/dts/arm/juno-r1.dts
-f:arch/arm64/boot/dts/arm/juno-r2-scmi.dts
-f:arch/arm64/boot/dts/arm/juno-r2.dts
-f:arch/arm64/boot/dts/arm/juno-scmi.dts
-f:arch/arm64/boot/dts/arm/juno-scmi.dtsi
-f:arch/arm64/boot/dts/arm/juno.dts
-f:arch/arm64/boot/dts/arm/morello-fvp.dts
-f:arch/arm64/boot/dts/arm/morello-sdp.dts
-f:arch/arm64/boot/dts/arm/morello.dtsi
-f:arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts
-f:arch/arm64/boot/dts/arm/rtsm_ve-motherboard-rs2.dtsi
-f:arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
-f:arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts
-f:arch/arm64/boot/dts/axiado/Makefile
-f:arch/arm64/boot/dts/axiado/ax3000-evk.dts
-f:arch/arm64/boot/dts/axiado/ax3000.dtsi
-f:arch/arm64/boot/dts/bitmain/Makefile
-f:arch/arm64/boot/dts/bitmain/bm1880-sophon-edge.dts
-f:arch/arm64/boot/dts/bitmain/bm1880.dtsi
-f:arch/arm64/boot/dts/blaize/Makefile
-f:arch/arm64/boot/dts/blaize/blaize-blzp1600-cb2.dts
-f:arch/arm64/boot/dts/blaize/blaize-blzp1600-som.dtsi
-f:arch/arm64/boot/dts/blaize/blaize-blzp1600.dtsi
-f:arch/arm64/boot/dts/broadcom/Makefile
-f:arch/arm64/boot/dts/broadcom/bcm2711-rpi-4-b.dts
-f:arch/arm64/boot/dts/broadcom/bcm2711-rpi-400.dts
-f:arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4-io.dts
-f:arch/arm64/boot/dts/broadcom/bcm2712-d-rpi-5-b.dts
-f:arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b-ovl-rp1.dts
-f:arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts
-f:arch/arm64/boot/dts/broadcom/bcm2712.dtsi
-f:arch/arm64/boot/dts/broadcom/bcm2837-rpi-2-b.dts
-f:arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-a-plus.dts
-f:arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b-plus.dts
-f:arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts
-f:arch/arm64/boot/dts/broadcom/bcm2837-rpi-cm3-io3.dts
-f:arch/arm64/boot/dts/broadcom/bcm2837-rpi-zero-2-w.dts
-f:arch/arm64/boot/dts/broadcom/bcmbca/Makefile
-f:arch/arm64/boot/dts/broadcom/bcmbca/bcm4906-netgear-r8000p.dts
-f:arch/arm64/boot/dts/broadcom/bcmbca/bcm4906-tplink-archer-c2300-v1.dts
-f:arch/arm64/boot/dts/broadcom/bcmbca/bcm4906-zyxel-ex3510b.dts
-f:arch/arm64/boot/dts/broadcom/bcmbca/bcm4906.dtsi
-f:arch/arm64/boot/dts/broadcom/bcmbca/bcm4908-asus-gt-ac5300.dts
-f:arch/arm64/boot/dts/broadcom/bcmbca/bcm4908-netgear-raxe500.dts
-f:arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi
-f:arch/arm64/boot/dts/broadcom/bcmbca/bcm4912-asus-gt-ax6000.dts
-f:arch/arm64/boot/dts/broadcom/bcmbca/bcm4912.dtsi
-f:arch/arm64/boot/dts/broadcom/bcmbca/bcm63146.dtsi
-f:arch/arm64/boot/dts/broadcom/bcmbca/bcm63158.dtsi
-f:arch/arm64/boot/dts/broadcom/bcmbca/bcm6813.dtsi
-f:arch/arm64/boot/dts/broadcom/bcmbca/bcm6856.dtsi
-f:arch/arm64/boot/dts/broadcom/bcmbca/bcm6858.dtsi
-f:arch/arm64/boot/dts/broadcom/bcmbca/bcm94908.dts
-f:arch/arm64/boot/dts/broadcom/bcmbca/bcm94912.dts
-f:arch/arm64/boot/dts/broadcom/bcmbca/bcm963146.dts
-f:arch/arm64/boot/dts/broadcom/bcmbca/bcm963158.dts
-f:arch/arm64/boot/dts/broadcom/bcmbca/bcm96813.dts
-f:arch/arm64/boot/dts/broadcom/bcmbca/bcm96856.dts
-f:arch/arm64/boot/dts/broadcom/bcmbca/bcm96858.dts
-f:arch/arm64/boot/dts/broadcom/northstar2/Makefile
-f:arch/arm64/boot/dts/broadcom/northstar2/ns2-clock.dtsi
-f:arch/arm64/boot/dts/broadcom/northstar2/ns2-svk.dts
-f:arch/arm64/boot/dts/broadcom/northstar2/ns2-xmc.dts
-f:arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi
-f:arch/arm64/boot/dts/broadcom/rp1-common.dtsi
-f:arch/arm64/boot/dts/broadcom/rp1-nexus.dtsi
-f:arch/arm64/boot/dts/broadcom/rp1.dtso
-f:arch/arm64/boot/dts/broadcom/stingray/Makefile
-f:arch/arm64/boot/dts/broadcom/stingray/bcm958742-base.dtsi
-f:arch/arm64/boot/dts/broadcom/stingray/bcm958742k.dts
-f:arch/arm64/boot/dts/broadcom/stingray/bcm958742t.dts
-f:arch/arm64/boot/dts/broadcom/stingray/bcm958802a802x.dts
-f:arch/arm64/boot/dts/broadcom/stingray/stingray-board-base.dtsi
-f:arch/arm64/boot/dts/broadcom/stingray/stingray-clock.dtsi
-f:arch/arm64/boot/dts/broadcom/stingray/stingray-fs4.dtsi
-f:arch/arm64/boot/dts/broadcom/stingray/stingray-pcie.dtsi
-f:arch/arm64/boot/dts/broadcom/stingray/stingray-pinctrl.dtsi
-f:arch/arm64/boot/dts/broadcom/stingray/stingray-usb.dtsi
-f:arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi
-f:arch/arm64/boot/dts/cavium/Makefile
-f:arch/arm64/boot/dts/cavium/thunder-88xx.dts
-f:arch/arm64/boot/dts/cavium/thunder-88xx.dtsi
-f:arch/arm64/boot/dts/cavium/thunder2-99xx.dts
-f:arch/arm64/boot/dts/cavium/thunder2-99xx.dtsi
-f:arch/arm64/boot/dts/cix/Makefile
-f:arch/arm64/boot/dts/cix/sky1-orion-o6.dts
-f:arch/arm64/boot/dts/cix/sky1.dtsi
-f:arch/arm64/boot/dts/exynos/Makefile
-f:arch/arm64/boot/dts/exynos/exynos-pinctrl.h
-f:arch/arm64/boot/dts/exynos/exynos2200-g0s.dts
-f:arch/arm64/boot/dts/exynos/exynos2200-pinctrl.dtsi
-f:arch/arm64/boot/dts/exynos/exynos2200.dtsi
-f:arch/arm64/boot/dts/exynos/exynos5433-bus.dtsi
-f:arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi
-f:arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
-f:arch/arm64/boot/dts/exynos/exynos5433-tm2.dts
-f:arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts
-f:arch/arm64/boot/dts/exynos/exynos5433-tmu.dtsi
-f:arch/arm64/boot/dts/exynos/exynos5433.dtsi
-f:arch/arm64/boot/dts/exynos/exynos7-espresso.dts
-f:arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi
-f:arch/arm64/boot/dts/exynos/exynos7-trip-points.dtsi
-f:arch/arm64/boot/dts/exynos/exynos7.dtsi
-f:arch/arm64/boot/dts/exynos/exynos7870-a2corelte.dts
-f:arch/arm64/boot/dts/exynos/exynos7870-j6lte.dts
-f:arch/arm64/boot/dts/exynos/exynos7870-on7xelte.dts
-f:arch/arm64/boot/dts/exynos/exynos7870-pinctrl.dtsi
-f:arch/arm64/boot/dts/exynos/exynos7870.dtsi
-f:arch/arm64/boot/dts/exynos/exynos7885-jackpotlte.dts
-f:arch/arm64/boot/dts/exynos/exynos7885-pinctrl.dtsi
-f:arch/arm64/boot/dts/exynos/exynos7885.dtsi
-f:arch/arm64/boot/dts/exynos/exynos850-e850-96.dts
-f:arch/arm64/boot/dts/exynos/exynos850-pinctrl.dtsi
-f:arch/arm64/boot/dts/exynos/exynos850.dtsi
-f:arch/arm64/boot/dts/exynos/exynos8895-dreamlte.dts
-f:arch/arm64/boot/dts/exynos/exynos8895-pinctrl.dtsi
-f:arch/arm64/boot/dts/exynos/exynos8895.dtsi
-f:arch/arm64/boot/dts/exynos/exynos9810-pinctrl.dtsi
-f:arch/arm64/boot/dts/exynos/exynos9810-starlte.dts
-f:arch/arm64/boot/dts/exynos/exynos9810.dtsi
-f:arch/arm64/boot/dts/exynos/exynos990-c1s.dts
-f:arch/arm64/boot/dts/exynos/exynos990-pinctrl.dtsi
-f:arch/arm64/boot/dts/exynos/exynos990-r8s.dts
-f:arch/arm64/boot/dts/exynos/exynos990-x1s-common.dtsi
-f:arch/arm64/boot/dts/exynos/exynos990-x1s.dts
-f:arch/arm64/boot/dts/exynos/exynos990-x1slte.dts
-f:arch/arm64/boot/dts/exynos/exynos990.dtsi
-f:arch/arm64/boot/dts/exynos/exynosautov9-pinctrl.dtsi
-f:arch/arm64/boot/dts/exynos/exynosautov9-sadk.dts
-f:arch/arm64/boot/dts/exynos/exynosautov9.dtsi
-f:arch/arm64/boot/dts/exynos/exynosautov920-pinctrl.dtsi
-f:arch/arm64/boot/dts/exynos/exynosautov920-sadk.dts
-f:arch/arm64/boot/dts/exynos/exynosautov920.dtsi
-f:arch/arm64/boot/dts/exynos/google/Makefile
-f:arch/arm64/boot/dts/exynos/google/gs101-oriole.dts
-f:arch/arm64/boot/dts/exynos/google/gs101-pinctrl.dtsi
-f:arch/arm64/boot/dts/exynos/google/gs101-pinctrl.h
-f:arch/arm64/boot/dts/exynos/google/gs101-pixel-common.dtsi
-f:arch/arm64/boot/dts/exynos/google/gs101-raven.dts
-f:arch/arm64/boot/dts/exynos/google/gs101.dtsi
-f:arch/arm64/boot/dts/freescale/Makefile
-f:arch/arm64/boot/dts/freescale/fsl-ls1012a-frdm.dts
-f:arch/arm64/boot/dts/freescale/fsl-ls1012a-frwy.dts
-f:arch/arm64/boot/dts/freescale/fsl-ls1012a-oxalis.dts
-f:arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts
-f:arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts
-f:arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
-f:arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts
-f:arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var1.dts
-f:arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts
-f:arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var3-ads2.dts
-f:arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var3.dts
-f:arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var4.dts
-f:arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts
-f:arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-13bb.dtso
-f:arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-65bb.dtso
-f:arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-7777.dtso
-f:arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-85bb.dtso
-f:arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-899b.dtso
-f:arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-9999.dtso
-f:arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
-f:arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts
-f:arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
-f:arch/arm64/boot/dts/freescale/fsl-ls1043-post.dtsi
-f:arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts
-f:arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts
-f:arch/arm64/boot/dts/freescale/fsl-ls1043a-tqmls1043a-mbls10xxa.dts
-f:arch/arm64/boot/dts/freescale/fsl-ls1043a-tqmls1043a.dtsi
-f:arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
-f:arch/arm64/boot/dts/freescale/fsl-ls1046-post.dtsi
-f:arch/arm64/boot/dts/freescale/fsl-ls1046a-frwy.dts
-f:arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts
-f:arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts
-f:arch/arm64/boot/dts/freescale/fsl-ls1046a-tqmls1046a-mbls10xxa.dts
-f:arch/arm64/boot/dts/freescale/fsl-ls1046a-tqmls1046a.dtsi
-f:arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
-f:arch/arm64/boot/dts/freescale/fsl-ls1088a-qds.dts
-f:arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts
-f:arch/arm64/boot/dts/freescale/fsl-ls1088a-ten64.dts
-f:arch/arm64/boot/dts/freescale/fsl-ls1088a-tqmls1088a-mbls10xxa.dts
-f:arch/arm64/boot/dts/freescale/fsl-ls1088a-tqmls1088a.dtsi
-f:arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
-f:arch/arm64/boot/dts/freescale/fsl-ls2080a-qds.dts
-f:arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts
-f:arch/arm64/boot/dts/freescale/fsl-ls2080a-simu.dts
-f:arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi
-f:arch/arm64/boot/dts/freescale/fsl-ls2081a-rdb.dts
-f:arch/arm64/boot/dts/freescale/fsl-ls2088a-qds.dts
-f:arch/arm64/boot/dts/freescale/fsl-ls2088a-rdb.dts
-f:arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi
-f:arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi
-f:arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi
-f:arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
-f:arch/arm64/boot/dts/freescale/fsl-lx2160a-bluebox3-rev-a.dts
-f:arch/arm64/boot/dts/freescale/fsl-lx2160a-bluebox3.dts
-f:arch/arm64/boot/dts/freescale/fsl-lx2160a-cex7.dtsi
-f:arch/arm64/boot/dts/freescale/fsl-lx2160a-clearfog-cx.dts
-f:arch/arm64/boot/dts/freescale/fsl-lx2160a-clearfog-itx.dtsi
-f:arch/arm64/boot/dts/freescale/fsl-lx2160a-honeycomb.dts
-f:arch/arm64/boot/dts/freescale/fsl-lx2160a-qds.dts
-f:arch/arm64/boot/dts/freescale/fsl-lx2160a-rdb.dts
-f:arch/arm64/boot/dts/freescale/fsl-lx2160a-rev2.dtsi
-f:arch/arm64/boot/dts/freescale/fsl-lx2160a-tqmlx2160a-mblx2160a.dts
-f:arch/arm64/boot/dts/freescale/fsl-lx2160a-tqmlx2160a-mblx2160a_12_x_x.dtso
-f:arch/arm64/boot/dts/freescale/fsl-lx2160a-tqmlx2160a-mblx2160a_14_x_x.dtso
-f:arch/arm64/boot/dts/freescale/fsl-lx2160a-tqmlx2160a-mblx2160a_x_11_x.dtso
-f:arch/arm64/boot/dts/freescale/fsl-lx2160a-tqmlx2160a-mblx2160a_x_7_x.dtso
-f:arch/arm64/boot/dts/freescale/fsl-lx2160a-tqmlx2160a-mblx2160a_x_8_x.dtso
-f:arch/arm64/boot/dts/freescale/fsl-lx2160a-tqmlx2160a.dtsi
-f:arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi
-f:arch/arm64/boot/dts/freescale/fsl-lx2162a-clearfog.dts
-f:arch/arm64/boot/dts/freescale/fsl-lx2162a-qds.dts
-f:arch/arm64/boot/dts/freescale/fsl-lx2162a-sr-som.dtsi
-f:arch/arm64/boot/dts/freescale/imx-pcie0-ep.dtso
-f:arch/arm64/boot/dts/freescale/imx-pcie1-ep.dtso
-f:arch/arm64/boot/dts/freescale/imx8-apalis-eval-v1.1.dtsi
-f:arch/arm64/boot/dts/freescale/imx8-apalis-eval-v1.2.dtsi
-f:arch/arm64/boot/dts/freescale/imx8-apalis-eval.dtsi
-f:arch/arm64/boot/dts/freescale/imx8-apalis-ixora-v1.1.dtsi
-f:arch/arm64/boot/dts/freescale/imx8-apalis-ixora-v1.2.dtsi
-f:arch/arm64/boot/dts/freescale/imx8-apalis-v1.1.dtsi
-f:arch/arm64/boot/dts/freescale/imx8-ss-adma.dtsi
-f:arch/arm64/boot/dts/freescale/imx8-ss-audio.dtsi
-f:arch/arm64/boot/dts/freescale/imx8-ss-cm40.dtsi
-f:arch/arm64/boot/dts/freescale/imx8-ss-cm41.dtsi
-f:arch/arm64/boot/dts/freescale/imx8-ss-conn.dtsi
-f:arch/arm64/boot/dts/freescale/imx8-ss-ddr.dtsi
-f:arch/arm64/boot/dts/freescale/imx8-ss-dma.dtsi
-f:arch/arm64/boot/dts/freescale/imx8-ss-gpu0.dtsi
-f:arch/arm64/boot/dts/freescale/imx8-ss-hsio.dtsi
-f:arch/arm64/boot/dts/freescale/imx8-ss-img.dtsi
-f:arch/arm64/boot/dts/freescale/imx8-ss-lsio.dtsi
-f:arch/arm64/boot/dts/freescale/imx8-ss-lvds0.dtsi
-f:arch/arm64/boot/dts/freescale/imx8-ss-lvds1.dtsi
-f:arch/arm64/boot/dts/freescale/imx8-ss-mipi0.dtsi
-f:arch/arm64/boot/dts/freescale/imx8-ss-mipi1.dtsi
-f:arch/arm64/boot/dts/freescale/imx8-ss-security.dtsi
-f:arch/arm64/boot/dts/freescale/imx8-ss-vpu.dtsi
-f:arch/arm64/boot/dts/freescale/imx8dx-colibri-aster.dts
-f:arch/arm64/boot/dts/freescale/imx8dx-colibri-eval-v3.dts
-f:arch/arm64/boot/dts/freescale/imx8dx-colibri-iris-v2.dts
-f:arch/arm64/boot/dts/freescale/imx8dx-colibri-iris.dts
-f:arch/arm64/boot/dts/freescale/imx8dx-colibri.dtsi
-f:arch/arm64/boot/dts/freescale/imx8dx.dtsi
-f:arch/arm64/boot/dts/freescale/imx8dxl-evk.dts
-f:arch/arm64/boot/dts/freescale/imx8dxl-ss-adma.dtsi
-f:arch/arm64/boot/dts/freescale/imx8dxl-ss-conn.dtsi
-f:arch/arm64/boot/dts/freescale/imx8dxl-ss-ddr.dtsi
-f:arch/arm64/boot/dts/freescale/imx8dxl-ss-hsio.dtsi
-f:arch/arm64/boot/dts/freescale/imx8dxl-ss-lsio.dtsi
-f:arch/arm64/boot/dts/freescale/imx8dxl.dtsi
-f:arch/arm64/boot/dts/freescale/imx8dxp-tqma8xdp-mba8xx.dts
-f:arch/arm64/boot/dts/freescale/imx8dxp-tqma8xdp.dtsi
-f:arch/arm64/boot/dts/freescale/imx8dxp-tqma8xdps-mb-smarc-2.dts
-f:arch/arm64/boot/dts/freescale/imx8dxp-tqma8xdps.dtsi
-f:arch/arm64/boot/dts/freescale/imx8dxp.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mm-beacon-baseboard.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mm-beacon-kit.dts
-f:arch/arm64/boot/dts/freescale/imx8mm-beacon-som.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc.dts
-f:arch/arm64/boot/dts/freescale/imx8mm-ddr4-evk.dts
-f:arch/arm64/boot/dts/freescale/imx8mm-emcon-avari.dts
-f:arch/arm64/boot/dts/freescale/imx8mm-emcon-avari.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mm-emcon.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mm-emtop-baseboard.dts
-f:arch/arm64/boot/dts/freescale/imx8mm-emtop-som.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mm-evk.dts
-f:arch/arm64/boot/dts/freescale/imx8mm-evk.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mm-evkb.dts
-f:arch/arm64/boot/dts/freescale/imx8mm-icore-mx8mm-ctouch2.dts
-f:arch/arm64/boot/dts/freescale/imx8mm-icore-mx8mm-edimm2.2.dts
-f:arch/arm64/boot/dts/freescale/imx8mm-icore-mx8mm.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mm-innocomm-wb15-evk.dts
-f:arch/arm64/boot/dts/freescale/imx8mm-innocomm-wb15.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mm-iot-gateway.dts
-f:arch/arm64/boot/dts/freescale/imx8mm-kontron-bl-osm-s.dts
-f:arch/arm64/boot/dts/freescale/imx8mm-kontron-bl.dts
-f:arch/arm64/boot/dts/freescale/imx8mm-kontron-dl.dtso
-f:arch/arm64/boot/dts/freescale/imx8mm-kontron-osm-s.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mm-kontron-sl.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mm-mx8menlo.dts
-f:arch/arm64/boot/dts/freescale/imx8mm-nitrogen-r2.dts
-f:arch/arm64/boot/dts/freescale/imx8mm-overdrive.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mm-phg.dts
-f:arch/arm64/boot/dts/freescale/imx8mm-phyboard-polis-peb-av-10.dtso
-f:arch/arm64/boot/dts/freescale/imx8mm-phyboard-polis-peb-eval-01.dtso
-f:arch/arm64/boot/dts/freescale/imx8mm-phyboard-polis-rdk.dts
-f:arch/arm64/boot/dts/freescale/imx8mm-phycore-no-eth.dtso
-f:arch/arm64/boot/dts/freescale/imx8mm-phycore-no-spiflash.dtso
-f:arch/arm64/boot/dts/freescale/imx8mm-phycore-rpmsg.dtso
-f:arch/arm64/boot/dts/freescale/imx8mm-phycore-som.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mm-phygate-tauri-l-rs232-rs232.dtso
-f:arch/arm64/boot/dts/freescale/imx8mm-phygate-tauri-l-rs232-rs485.dtso
-f:arch/arm64/boot/dts/freescale/imx8mm-phygate-tauri-l-rs232-rts-cts.dtso
-f:arch/arm64/boot/dts/freescale/imx8mm-phygate-tauri-l.dts
-f:arch/arm64/boot/dts/freescale/imx8mm-pinfunc.h
-f:arch/arm64/boot/dts/freescale/imx8mm-prt8mm.dts
-f:arch/arm64/boot/dts/freescale/imx8mm-tqma8mqml-mba8mx-lvds-tm070jvhg33.dtso
-f:arch/arm64/boot/dts/freescale/imx8mm-tqma8mqml-mba8mx.dts
-f:arch/arm64/boot/dts/freescale/imx8mm-tqma8mqml.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mm-ucm-som.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mm-var-som-symphony.dts
-f:arch/arm64/boot/dts/freescale/imx8mm-var-som.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mm-venice-gw700x.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mm-venice-gw71xx-0x.dts
-f:arch/arm64/boot/dts/freescale/imx8mm-venice-gw71xx.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mm-venice-gw72xx-0x-imx219.dtso
-f:arch/arm64/boot/dts/freescale/imx8mm-venice-gw72xx-0x-rpidsi.dtso
-f:arch/arm64/boot/dts/freescale/imx8mm-venice-gw72xx-0x-rs232-rts.dtso
-f:arch/arm64/boot/dts/freescale/imx8mm-venice-gw72xx-0x-rs422.dtso
-f:arch/arm64/boot/dts/freescale/imx8mm-venice-gw72xx-0x-rs485.dtso
-f:arch/arm64/boot/dts/freescale/imx8mm-venice-gw72xx-0x.dts
-f:arch/arm64/boot/dts/freescale/imx8mm-venice-gw72xx.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-imx219.dtso
-f:arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-rpidsi.dtso
-f:arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-rs232-rts.dtso
-f:arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-rs422.dtso
-f:arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-rs485.dtso
-f:arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x.dts
-f:arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mm-venice-gw75xx-0x.dts
-f:arch/arm64/boot/dts/freescale/imx8mm-venice-gw75xx.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mm-venice-gw7901.dts
-f:arch/arm64/boot/dts/freescale/imx8mm-venice-gw7902.dts
-f:arch/arm64/boot/dts/freescale/imx8mm-venice-gw7903.dts
-f:arch/arm64/boot/dts/freescale/imx8mm-venice-gw7904.dts
-f:arch/arm64/boot/dts/freescale/imx8mm-verdin-dahlia.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mm-verdin-dev.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mm-verdin-ivy.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mm-verdin-mallow.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mm-verdin-nonwifi-dahlia.dts
-f:arch/arm64/boot/dts/freescale/imx8mm-verdin-nonwifi-dev.dts
-f:arch/arm64/boot/dts/freescale/imx8mm-verdin-nonwifi-ivy.dts
-f:arch/arm64/boot/dts/freescale/imx8mm-verdin-nonwifi-mallow.dts
-f:arch/arm64/boot/dts/freescale/imx8mm-verdin-nonwifi-yavia.dts
-f:arch/arm64/boot/dts/freescale/imx8mm-verdin-nonwifi.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mm-verdin-wifi-dahlia.dts
-f:arch/arm64/boot/dts/freescale/imx8mm-verdin-wifi-dev.dts
-f:arch/arm64/boot/dts/freescale/imx8mm-verdin-wifi-ivy.dts
-f:arch/arm64/boot/dts/freescale/imx8mm-verdin-wifi-mallow.dts
-f:arch/arm64/boot/dts/freescale/imx8mm-verdin-wifi-yavia.dts
-f:arch/arm64/boot/dts/freescale/imx8mm-verdin-wifi.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mm-verdin-yavia.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mm.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mn-beacon-baseboard.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mn-beacon-kit.dts
-f:arch/arm64/boot/dts/freescale/imx8mn-beacon-som.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mn-bsh-smm-s2-common.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mn-bsh-smm-s2-display.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mn-bsh-smm-s2.dts
-f:arch/arm64/boot/dts/freescale/imx8mn-bsh-smm-s2pro.dts
-f:arch/arm64/boot/dts/freescale/imx8mn-ddr3l-evk.dts
-f:arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk.dts
-f:arch/arm64/boot/dts/freescale/imx8mn-dimonoff-gateway-evk.dts
-f:arch/arm64/boot/dts/freescale/imx8mn-evk.dts
-f:arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mn-overdrive.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mn-pinfunc.h
-f:arch/arm64/boot/dts/freescale/imx8mn-rve-gateway.dts
-f:arch/arm64/boot/dts/freescale/imx8mn-tqma8mqnl-mba8mx-lvds-tm070jvhg33.dtso
-f:arch/arm64/boot/dts/freescale/imx8mn-tqma8mqnl-mba8mx-usbotg.dtso
-f:arch/arm64/boot/dts/freescale/imx8mn-tqma8mqnl-mba8mx.dts
-f:arch/arm64/boot/dts/freescale/imx8mn-tqma8mqnl.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mn-var-som-symphony.dts
-f:arch/arm64/boot/dts/freescale/imx8mn-var-som.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mn-venice-gw7902.dts
-f:arch/arm64/boot/dts/freescale/imx8mn.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mp-aristainetos3-adpismarc.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-aristainetos3-helios-lvds.dtso
-f:arch/arm64/boot/dts/freescale/imx8mp-aristainetos3-helios.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-aristainetos3-proton2s.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-aristainetos3a-som-v1.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mp-beacon-kit.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-beacon-som.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-debix-model-a.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-debix-som-a-bmb-08.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-debix-som-a.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mp-dhcom-drc02.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-dhcom-pdk2.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-dhcom-pdk3.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-dhcom-picoitx.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-dhcom-som.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mp-evk-imx-lvds-hdmi-common.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mp-evk-lvds0-imx-dlvds-hdmi-channel0.dtso
-f:arch/arm64/boot/dts/freescale/imx8mp-evk-lvds0-imx-lvds-hdmi-common.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mp-evk-lvds0-imx-lvds-hdmi.dtso
-f:arch/arm64/boot/dts/freescale/imx8mp-evk-lvds1-imx-dlvds-hdmi-channel0.dtso
-f:arch/arm64/boot/dts/freescale/imx8mp-evk-lvds1-imx-lvds-hdmi-common.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mp-evk-lvds1-imx-lvds-hdmi.dtso
-f:arch/arm64/boot/dts/freescale/imx8mp-evk-mx8-dlvds-lcd1.dtso
-f:arch/arm64/boot/dts/freescale/imx8mp-evk.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-icore-mx8mp-edimm2.2.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-icore-mx8mp.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mp-iota2-lumpy.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-kontron-bl-osm-s.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-kontron-dl.dtso
-f:arch/arm64/boot/dts/freescale/imx8mp-kontron-osm-s.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mp-kontron-smarc-eval-carrier.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-kontron-smarc.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mp-libra-rdk-fpsc-lvds-etml1010g3dra.dtso
-f:arch/arm64/boot/dts/freescale/imx8mp-libra-rdk-fpsc.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-msc-sm2s-14N0600E.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mp-msc-sm2s-ep1.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-msc-sm2s.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mp-navqp.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-nitrogen-enc-carrier-board.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-nitrogen-smarc-som.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mp-nitrogen-smarc-universal-board.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-nitrogen-som.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mp-nominal.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mp-phyboard-pollux-rdk.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-phycore-fpsc.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mp-phycore-no-eth.dtso
-f:arch/arm64/boot/dts/freescale/imx8mp-phycore-som.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mp-pinfunc.h
-f:arch/arm64/boot/dts/freescale/imx8mp-skov-basic.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-skov-reva.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mp-skov-revb-hdmi.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-skov-revb-lt6.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-skov-revb-mi1010ait-1cp1.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-skov-revc-bd500.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-skov-revc-tian-g07017.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-toradex-smarc-dev.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-toradex-smarc.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mp-ras314-imx219.dtso
-f:arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mp-ras314.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mpxl-lvds-g133han01.dtso
-f:arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mpxl-lvds-tm070jvhg33.dtso
-f:arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mp-tx8p-ml81-moduline-display-106-av101hdt-a10.dtso
-f:arch/arm64/boot/dts/freescale/imx8mp-tx8p-ml81-moduline-display-106-av123z7m-n17.dtso
-f:arch/arm64/boot/dts/freescale/imx8mp-tx8p-ml81-moduline-display-106.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-tx8p-ml81.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mp-var-som-symphony.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-var-som.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mp-venice-gw702x.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mp-venice-gw71xx-2x.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-venice-gw71xx.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mp-venice-gw72xx-2x.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-venice-gw72xx.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mp-venice-gw73xx-2x.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-venice-gw73xx.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mp-venice-gw74xx-imx219.dtso
-f:arch/arm64/boot/dts/freescale/imx8mp-venice-gw74xx-rpidsi.dtso
-f:arch/arm64/boot/dts/freescale/imx8mp-venice-gw74xx.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-venice-gw75xx-2x.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-venice-gw75xx.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mp-venice-gw82xx-2x.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-venice-gw82xx.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mp-verdin-dahlia.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mp-verdin-dev.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mp-verdin-ivy.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mp-verdin-mallow.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mp-verdin-nonwifi-dahlia.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-verdin-nonwifi-dev.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-verdin-nonwifi-ivy.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-verdin-nonwifi-mallow.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-verdin-nonwifi-yavia.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-verdin-nonwifi.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mp-verdin-wifi-dahlia.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-verdin-wifi-dev.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-verdin-wifi-ivy.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-verdin-wifi-mallow.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-verdin-wifi-yavia.dts
-f:arch/arm64/boot/dts/freescale/imx8mp-verdin-wifi.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mp-verdin-yavia.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mp.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mq-evk.dts
-f:arch/arm64/boot/dts/freescale/imx8mq-hummingboard-pulse.dts
-f:arch/arm64/boot/dts/freescale/imx8mq-kontron-pitx-imx8m.dts
-f:arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts
-f:arch/arm64/boot/dts/freescale/imx8mq-librem5-r2.dts
-f:arch/arm64/boot/dts/freescale/imx8mq-librem5-r3.dts
-f:arch/arm64/boot/dts/freescale/imx8mq-librem5-r3.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mq-librem5-r4.dts
-f:arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mq-mnt-reform2.dts
-f:arch/arm64/boot/dts/freescale/imx8mq-nitrogen-som.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mq-nitrogen.dts
-f:arch/arm64/boot/dts/freescale/imx8mq-phanbell.dts
-f:arch/arm64/boot/dts/freescale/imx8mq-pico-pi.dts
-f:arch/arm64/boot/dts/freescale/imx8mq-pinfunc.h
-f:arch/arm64/boot/dts/freescale/imx8mq-sr-som.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mq-thor96.dts
-f:arch/arm64/boot/dts/freescale/imx8mq-tqma8mq-mba8mx-lvds-tm070jvhg33.dtso
-f:arch/arm64/boot/dts/freescale/imx8mq-tqma8mq-mba8mx.dts
-f:arch/arm64/boot/dts/freescale/imx8mq-tqma8mq.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mq-zii-ultra-rmb3.dts
-f:arch/arm64/boot/dts/freescale/imx8mq-zii-ultra-zest.dts
-f:arch/arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi
-f:arch/arm64/boot/dts/freescale/imx8mq.dtsi
-f:arch/arm64/boot/dts/freescale/imx8qm-apalis-eval-v1.2.dts
-f:arch/arm64/boot/dts/freescale/imx8qm-apalis-eval.dts
-f:arch/arm64/boot/dts/freescale/imx8qm-apalis-ixora-v1.1.dts
-f:arch/arm64/boot/dts/freescale/imx8qm-apalis-v1.1-eval-v1.2.dts
-f:arch/arm64/boot/dts/freescale/imx8qm-apalis-v1.1-eval.dts
-f:arch/arm64/boot/dts/freescale/imx8qm-apalis-v1.1-ixora-v1.1.dts
-f:arch/arm64/boot/dts/freescale/imx8qm-apalis-v1.1-ixora-v1.2.dts
-f:arch/arm64/boot/dts/freescale/imx8qm-apalis-v1.1.dtsi
-f:arch/arm64/boot/dts/freescale/imx8qm-apalis.dtsi
-f:arch/arm64/boot/dts/freescale/imx8qm-mek-ov5640-csi0.dtso
-f:arch/arm64/boot/dts/freescale/imx8qm-mek-ov5640-csi1.dtso
-f:arch/arm64/boot/dts/freescale/imx8qm-mek.dts
-f:arch/arm64/boot/dts/freescale/imx8qm-ss-audio.dtsi
-f:arch/arm64/boot/dts/freescale/imx8qm-ss-conn.dtsi
-f:arch/arm64/boot/dts/freescale/imx8qm-ss-dma.dtsi
-f:arch/arm64/boot/dts/freescale/imx8qm-ss-hsio.dtsi
-f:arch/arm64/boot/dts/freescale/imx8qm-ss-img.dtsi
-f:arch/arm64/boot/dts/freescale/imx8qm-ss-lsio.dtsi
-f:arch/arm64/boot/dts/freescale/imx8qm-ss-lvds.dtsi
-f:arch/arm64/boot/dts/freescale/imx8qm-ss-mipi.dtsi
-f:arch/arm64/boot/dts/freescale/imx8qm.dtsi
-f:arch/arm64/boot/dts/freescale/imx8qxp-ai_ml.dts
-f:arch/arm64/boot/dts/freescale/imx8qxp-colibri-aster.dts
-f:arch/arm64/boot/dts/freescale/imx8qxp-colibri-eval-v3.dts
-f:arch/arm64/boot/dts/freescale/imx8qxp-colibri-iris-v2.dts
-f:arch/arm64/boot/dts/freescale/imx8qxp-colibri-iris.dts
-f:arch/arm64/boot/dts/freescale/imx8qxp-colibri.dtsi
-f:arch/arm64/boot/dts/freescale/imx8qxp-mek-ov5640-csi.dtso
-f:arch/arm64/boot/dts/freescale/imx8qxp-mek.dts
-f:arch/arm64/boot/dts/freescale/imx8qxp-ss-adma.dtsi
-f:arch/arm64/boot/dts/freescale/imx8qxp-ss-conn.dtsi
-f:arch/arm64/boot/dts/freescale/imx8qxp-ss-hsio.dtsi
-f:arch/arm64/boot/dts/freescale/imx8qxp-ss-img.dtsi
-f:arch/arm64/boot/dts/freescale/imx8qxp-ss-lsio.dtsi
-f:arch/arm64/boot/dts/freescale/imx8qxp-ss-security.dtsi
-f:arch/arm64/boot/dts/freescale/imx8qxp-ss-vpu.dtsi
-f:arch/arm64/boot/dts/freescale/imx8qxp-tqma8xqp-mba8xx.dts
-f:arch/arm64/boot/dts/freescale/imx8qxp-tqma8xqp.dtsi
-f:arch/arm64/boot/dts/freescale/imx8qxp-tqma8xqps-mb-smarc-2.dts
-f:arch/arm64/boot/dts/freescale/imx8qxp-tqma8xqps.dtsi
-f:arch/arm64/boot/dts/freescale/imx8qxp.dtsi
-f:arch/arm64/boot/dts/freescale/imx8ulp-evk.dts
-f:arch/arm64/boot/dts/freescale/imx8ulp-pinfunc.h
-f:arch/arm64/boot/dts/freescale/imx8ulp.dtsi
-f:arch/arm64/boot/dts/freescale/imx8x-colibri-aster.dtsi
-f:arch/arm64/boot/dts/freescale/imx8x-colibri-eval-v3.dtsi
-f:arch/arm64/boot/dts/freescale/imx8x-colibri-iris-v2.dtsi
-f:arch/arm64/boot/dts/freescale/imx8x-colibri-iris.dtsi
-f:arch/arm64/boot/dts/freescale/imx8x-colibri.dtsi
-f:arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts
-f:arch/arm64/boot/dts/freescale/imx93-14x14-evk.dts
-f:arch/arm64/boot/dts/freescale/imx93-9x9-qsb-i3c.dtso
-f:arch/arm64/boot/dts/freescale/imx93-9x9-qsb.dts
-f:arch/arm64/boot/dts/freescale/imx93-kontron-bl-osm-s.dts
-f:arch/arm64/boot/dts/freescale/imx93-kontron-osm-s.dtsi
-f:arch/arm64/boot/dts/freescale/imx93-phyboard-nash-peb-wlbt-07.dtso
-f:arch/arm64/boot/dts/freescale/imx93-phyboard-nash.dts
-f:arch/arm64/boot/dts/freescale/imx93-phyboard-segin-peb-eval-01.dtso
-f:arch/arm64/boot/dts/freescale/imx93-phyboard-segin-peb-wlbt-05.dtso
-f:arch/arm64/boot/dts/freescale/imx93-phyboard-segin.dts
-f:arch/arm64/boot/dts/freescale/imx93-phycore-rpmsg.dtso
-f:arch/arm64/boot/dts/freescale/imx93-phycore-som.dtsi
-f:arch/arm64/boot/dts/freescale/imx93-pinfunc.h
-f:arch/arm64/boot/dts/freescale/imx93-tqma9352-mba91xxca.dts
-f:arch/arm64/boot/dts/freescale/imx93-tqma9352-mba93xxca.dts
-f:arch/arm64/boot/dts/freescale/imx93-tqma9352-mba93xxla.dts
-f:arch/arm64/boot/dts/freescale/imx93-tqma9352.dtsi
-f:arch/arm64/boot/dts/freescale/imx93-var-som-symphony.dts
-f:arch/arm64/boot/dts/freescale/imx93-var-som.dtsi
-f:arch/arm64/boot/dts/freescale/imx93.dtsi
-f:arch/arm64/boot/dts/freescale/imx94-clock.h
-f:arch/arm64/boot/dts/freescale/imx94-pinfunc.h
-f:arch/arm64/boot/dts/freescale/imx94-power.h
-f:arch/arm64/boot/dts/freescale/imx94.dtsi
-f:arch/arm64/boot/dts/freescale/imx943-evk.dts
-f:arch/arm64/boot/dts/freescale/imx943.dtsi
-f:arch/arm64/boot/dts/freescale/imx95-15x15-evk.dts
-f:arch/arm64/boot/dts/freescale/imx95-19x19-evk-sof.dts
-f:arch/arm64/boot/dts/freescale/imx95-19x19-evk.dts
-f:arch/arm64/boot/dts/freescale/imx95-clock.h
-f:arch/arm64/boot/dts/freescale/imx95-libra-rdk-fpsc.dts
-f:arch/arm64/boot/dts/freescale/imx95-phycore-fpsc.dtsi
-f:arch/arm64/boot/dts/freescale/imx95-pinfunc.h
-f:arch/arm64/boot/dts/freescale/imx95-power.h
-f:arch/arm64/boot/dts/freescale/imx95-tqma9596sa-mb-smarc-2.dts
-f:arch/arm64/boot/dts/freescale/imx95-tqma9596sa.dtsi
-f:arch/arm64/boot/dts/freescale/imx95.dtsi
-f:arch/arm64/boot/dts/freescale/mba8mx.dtsi
-f:arch/arm64/boot/dts/freescale/mba8xx.dtsi
-f:arch/arm64/boot/dts/freescale/qoriq-bman-portals.dtsi
-f:arch/arm64/boot/dts/freescale/qoriq-fman3-0-10g-0.dtsi
-f:arch/arm64/boot/dts/freescale/qoriq-fman3-0-10g-1.dtsi
-f:arch/arm64/boot/dts/freescale/qoriq-fman3-0-1g-0.dtsi
-f:arch/arm64/boot/dts/freescale/qoriq-fman3-0-1g-1.dtsi
-f:arch/arm64/boot/dts/freescale/qoriq-fman3-0-1g-2.dtsi
-f:arch/arm64/boot/dts/freescale/qoriq-fman3-0-1g-3.dtsi
-f:arch/arm64/boot/dts/freescale/qoriq-fman3-0-1g-4.dtsi
-f:arch/arm64/boot/dts/freescale/qoriq-fman3-0-1g-5.dtsi
-f:arch/arm64/boot/dts/freescale/qoriq-fman3-0.dtsi
-f:arch/arm64/boot/dts/freescale/qoriq-qman-portals.dtsi
-f:arch/arm64/boot/dts/freescale/s32g2.dtsi
-f:arch/arm64/boot/dts/freescale/s32g274a-evb.dts
-f:arch/arm64/boot/dts/freescale/s32g274a-rdb2.dts
-f:arch/arm64/boot/dts/freescale/s32g3.dtsi
-f:arch/arm64/boot/dts/freescale/s32g399a-rdb3.dts
-f:arch/arm64/boot/dts/freescale/s32gxxxa-evb.dtsi
-f:arch/arm64/boot/dts/freescale/s32gxxxa-rdb.dtsi
-f:arch/arm64/boot/dts/freescale/s32v234-evb.dts
-f:arch/arm64/boot/dts/freescale/s32v234.dtsi
-f:arch/arm64/boot/dts/freescale/tqma8xx.dtsi
-f:arch/arm64/boot/dts/freescale/tqma8xxs-mb-smarc-2.dtsi
-f:arch/arm64/boot/dts/freescale/tqma8xxs.dtsi
-f:arch/arm64/boot/dts/freescale/tqmls104xa-mbls10xxa-fman.dtsi
-f:arch/arm64/boot/dts/freescale/tqmls1088a-mbls10xxa-mc.dtsi
-f:arch/arm64/boot/dts/freescale/tqmls10xxa-mbls10xxa.dtsi
-f:arch/arm64/boot/dts/freescale/tqmls10xxa.dtsi
-f:arch/arm64/boot/dts/hisilicon/Makefile
-f:arch/arm64/boot/dts/hisilicon/hi3660-coresight.dtsi
-f:arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
-f:arch/arm64/boot/dts/hisilicon/hi3660.dtsi
-f:arch/arm64/boot/dts/hisilicon/hi3670-hikey970.dts
-f:arch/arm64/boot/dts/hisilicon/hi3670.dtsi
-f:arch/arm64/boot/dts/hisilicon/hi3798cv200-poplar.dts
-f:arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi
-f:arch/arm64/boot/dts/hisilicon/hi6220-coresight.dtsi
-f:arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
-f:arch/arm64/boot/dts/hisilicon/hi6220.dtsi
-f:arch/arm64/boot/dts/hisilicon/hikey-pinctrl.dtsi
-f:arch/arm64/boot/dts/hisilicon/hikey960-pinctrl.dtsi
-f:arch/arm64/boot/dts/hisilicon/hikey970-pinctrl.dtsi
-f:arch/arm64/boot/dts/hisilicon/hikey970-pmic.dtsi
-f:arch/arm64/boot/dts/hisilicon/hip05-d02.dts
-f:arch/arm64/boot/dts/hisilicon/hip05.dtsi
-f:arch/arm64/boot/dts/hisilicon/hip06-d03.dts
-f:arch/arm64/boot/dts/hisilicon/hip06.dtsi
-f:arch/arm64/boot/dts/hisilicon/hip07-d05.dts
-f:arch/arm64/boot/dts/hisilicon/hip07.dtsi
-f:arch/arm64/boot/dts/hisilicon/poplar-pinctrl.dtsi
-f:arch/arm64/boot/dts/intel/Makefile
-f:arch/arm64/boot/dts/intel/keembay-evm.dts
-f:arch/arm64/boot/dts/intel/keembay-soc.dtsi
-f:arch/arm64/boot/dts/intel/socfpga_agilex.dtsi
-f:arch/arm64/boot/dts/intel/socfpga_agilex5.dtsi
-f:arch/arm64/boot/dts/intel/socfpga_agilex5_socdk.dts
-f:arch/arm64/boot/dts/intel/socfpga_agilex5_socdk_nand.dts
-f:arch/arm64/boot/dts/intel/socfpga_agilex_n6000.dts
-f:arch/arm64/boot/dts/intel/socfpga_agilex_socdk.dts
-f:arch/arm64/boot/dts/intel/socfpga_agilex_socdk_nand.dts
-f:arch/arm64/boot/dts/intel/socfpga_n5x_socdk.dts
-f:arch/arm64/boot/dts/lg/Makefile
-f:arch/arm64/boot/dts/lg/lg1312-ref.dts
-f:arch/arm64/boot/dts/lg/lg1312.dtsi
-f:arch/arm64/boot/dts/lg/lg1313-ref.dts
-f:arch/arm64/boot/dts/lg/lg1313.dtsi
-f:arch/arm64/boot/dts/lg/lg131x.dtsi
-f:arch/arm64/boot/dts/marvell/Makefile
-f:arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi
-f:arch/arm64/boot/dts/marvell/ac5-98dx35xx-rd.dts
-f:arch/arm64/boot/dts/marvell/ac5-98dx35xx.dtsi
-f:arch/arm64/boot/dts/marvell/ac5x-rd-carrier-cn9131.dts
-f:arch/arm64/boot/dts/marvell/ac5x-rd-carrier.dtsi
-f:arch/arm64/boot/dts/marvell/armada-3720-db.dts
-f:arch/arm64/boot/dts/marvell/armada-3720-eDPU.dts
-f:arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts
-f:arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts
-f:arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts
-f:arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts
-f:arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
-f:arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
-f:arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts
-f:arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
-f:arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
-f:arch/arm64/boot/dts/marvell/armada-3720-uDPU.dtsi
-f:arch/arm64/boot/dts/marvell/armada-372x.dtsi
-f:arch/arm64/boot/dts/marvell/armada-37xx.dtsi
-f:arch/arm64/boot/dts/marvell/armada-7020.dtsi
-f:arch/arm64/boot/dts/marvell/armada-7040-db.dts
-f:arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts
-f:arch/arm64/boot/dts/marvell/armada-7040.dtsi
-f:arch/arm64/boot/dts/marvell/armada-70x0.dtsi
-f:arch/arm64/boot/dts/marvell/armada-8020.dtsi
-f:arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts
-f:arch/arm64/boot/dts/marvell/armada-8040-db.dts
-f:arch/arm64/boot/dts/marvell/armada-8040-mcbin-singleshot.dts
-f:arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
-f:arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi
-f:arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts
-f:arch/arm64/boot/dts/marvell/armada-8040.dtsi
-f:arch/arm64/boot/dts/marvell/armada-8080-db.dts
-f:arch/arm64/boot/dts/marvell/armada-8080.dtsi
-f:arch/arm64/boot/dts/marvell/armada-80x0.dtsi
-f:arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi
-f:arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi
-f:arch/arm64/boot/dts/marvell/armada-ap806.dtsi
-f:arch/arm64/boot/dts/marvell/armada-ap807-quad.dtsi
-f:arch/arm64/boot/dts/marvell/armada-ap807.dtsi
-f:arch/arm64/boot/dts/marvell/armada-ap80x.dtsi
-f:arch/arm64/boot/dts/marvell/armada-ap810-ap0-octa-core.dtsi
-f:arch/arm64/boot/dts/marvell/armada-ap810-ap0.dtsi
-f:arch/arm64/boot/dts/marvell/armada-common.dtsi
-f:arch/arm64/boot/dts/marvell/armada-cp110.dtsi
-f:arch/arm64/boot/dts/marvell/armada-cp115.dtsi
-f:arch/arm64/boot/dts/marvell/armada-cp11x.dtsi
-f:arch/arm64/boot/dts/marvell/cn9130-cf-base.dts
-f:arch/arm64/boot/dts/marvell/cn9130-cf-pro.dts
-f:arch/arm64/boot/dts/marvell/cn9130-cf.dtsi
-f:arch/arm64/boot/dts/marvell/cn9130-crb-A.dts
-f:arch/arm64/boot/dts/marvell/cn9130-crb-B.dts
-f:arch/arm64/boot/dts/marvell/cn9130-crb.dtsi
-f:arch/arm64/boot/dts/marvell/cn9130-db-B.dts
-f:arch/arm64/boot/dts/marvell/cn9130-db-comexpress.dtsi
-f:arch/arm64/boot/dts/marvell/cn9130-db.dts
-f:arch/arm64/boot/dts/marvell/cn9130-db.dtsi
-f:arch/arm64/boot/dts/marvell/cn9130-sr-som.dtsi
-f:arch/arm64/boot/dts/marvell/cn9130.dtsi
-f:arch/arm64/boot/dts/marvell/cn9131-cf-solidwan.dts
-f:arch/arm64/boot/dts/marvell/cn9131-db-B.dts
-f:arch/arm64/boot/dts/marvell/cn9131-db-comexpress.dtsi
-f:arch/arm64/boot/dts/marvell/cn9131-db.dts
-f:arch/arm64/boot/dts/marvell/cn9131-db.dtsi
-f:arch/arm64/boot/dts/marvell/cn9132-clearfog.dts
-f:arch/arm64/boot/dts/marvell/cn9132-db-B.dts
-f:arch/arm64/boot/dts/marvell/cn9132-db.dts
-f:arch/arm64/boot/dts/marvell/cn9132-db.dtsi
-f:arch/arm64/boot/dts/marvell/cn9132-sr-cex7.dtsi
-f:arch/arm64/boot/dts/marvell/mmp/Makefile
-f:arch/arm64/boot/dts/marvell/mmp/pxa1908-samsung-coreprimevelte.dts
-f:arch/arm64/boot/dts/marvell/mmp/pxa1908.dtsi
-f:arch/arm64/boot/dts/mediatek/Makefile
-f:arch/arm64/boot/dts/mediatek/mt2712-evb.dts
-f:arch/arm64/boot/dts/mediatek/mt2712-pinfunc.h
-f:arch/arm64/boot/dts/mediatek/mt2712e.dtsi
-f:arch/arm64/boot/dts/mediatek/mt6331.dtsi
-f:arch/arm64/boot/dts/mediatek/mt6357.dtsi
-f:arch/arm64/boot/dts/mediatek/mt6358.dtsi
-f:arch/arm64/boot/dts/mediatek/mt6359.dtsi
-f:arch/arm64/boot/dts/mediatek/mt6380.dtsi
-f:arch/arm64/boot/dts/mediatek/mt6755-evb.dts
-f:arch/arm64/boot/dts/mediatek/mt6755.dtsi
-f:arch/arm64/boot/dts/mediatek/mt6779-evb.dts
-f:arch/arm64/boot/dts/mediatek/mt6779.dtsi
-f:arch/arm64/boot/dts/mediatek/mt6795-evb.dts
-f:arch/arm64/boot/dts/mediatek/mt6795-sony-xperia-m5.dts
-f:arch/arm64/boot/dts/mediatek/mt6795.dtsi
-f:arch/arm64/boot/dts/mediatek/mt6797-evb.dts
-f:arch/arm64/boot/dts/mediatek/mt6797-x20-dev.dts
-f:arch/arm64/boot/dts/mediatek/mt6797.dtsi
-f:arch/arm64/boot/dts/mediatek/mt6893-pinfunc.h
-f:arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
-f:arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
-f:arch/arm64/boot/dts/mediatek/mt7622.dtsi
-f:arch/arm64/boot/dts/mediatek/mt7981b-cudy-wr3000-v1.dts
-f:arch/arm64/boot/dts/mediatek/mt7981b-openwrt-one.dts
-f:arch/arm64/boot/dts/mediatek/mt7981b-xiaomi-ax3000t.dts
-f:arch/arm64/boot/dts/mediatek/mt7981b.dtsi
-f:arch/arm64/boot/dts/mediatek/mt7986a-acelink-ew-7886cax.dts
-f:arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-emmc.dtso
-f:arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-mini.dts
-f:arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nand.dtso
-f:arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dtso
-f:arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-sata.dtso
-f:arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-sd.dtso
-f:arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dts
-f:arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts
-f:arch/arm64/boot/dts/mediatek/mt7986a.dtsi
-f:arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts
-f:arch/arm64/boot/dts/mediatek/mt7986b.dtsi
-f:arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-2g5.dts
-f:arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-emmc.dtso
-f:arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-sd.dtso
-f:arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dts
-f:arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi
-f:arch/arm64/boot/dts/mediatek/mt7988a.dtsi
-f:arch/arm64/boot/dts/mediatek/mt8167-pinfunc.h
-f:arch/arm64/boot/dts/mediatek/mt8167-pumpkin.dts
-f:arch/arm64/boot/dts/mediatek/mt8167.dtsi
-f:arch/arm64/boot/dts/mediatek/mt8173-elm-hana-rev7.dts
-f:arch/arm64/boot/dts/mediatek/mt8173-elm-hana.dts
-f:arch/arm64/boot/dts/mediatek/mt8173-elm-hana.dtsi
-f:arch/arm64/boot/dts/mediatek/mt8173-elm.dts
-f:arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi
-f:arch/arm64/boot/dts/mediatek/mt8173-evb.dts
-f:arch/arm64/boot/dts/mediatek/mt8173-pinfunc.h
-f:arch/arm64/boot/dts/mediatek/mt8173.dtsi
-f:arch/arm64/boot/dts/mediatek/mt8183-evb.dts
-f:arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-da7219-max98357a.dtsi
-f:arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-da7219-rt1015p.dtsi
-f:arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-da7219.dtsi
-f:arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-max98357a.dtsi
-f:arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-rt1015p.dtsi
-f:arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-ts3a227e-max98357a.dtsi
-f:arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-ts3a227e-rt1015p.dtsi
-f:arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-ts3a227e.dtsi
-f:arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-burnet.dts
-f:arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-cozmo.dts
-f:arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-damu.dts
-f:arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku1.dts
-f:arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku6.dts
-f:arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku7.dts
-f:arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel.dtsi
-f:arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel14-sku2.dts
-f:arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel14.dts
-f:arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-juniper-sku16.dts
-f:arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-juniper.dtsi
-f:arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-kappa.dts
-f:arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-kenzo.dts
-f:arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-makomo-sku0.dts
-f:arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-makomo-sku1.dts
-f:arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico.dts
-f:arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts
-f:arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-willow-sku0.dts
-f:arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-willow-sku1.dts
-f:arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-willow.dtsi
-f:arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi
-f:arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu-sku22.dts
-f:arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dts
-f:arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dtsi
-f:arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku32.dts
-f:arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku38.dts
-f:arch/arm64/boot/dts/mediatek/mt8183-kukui-kodama-sku16.dts
-f:arch/arm64/boot/dts/mediatek/mt8183-kukui-kodama-sku272.dts
-f:arch/arm64/boot/dts/mediatek/mt8183-kukui-kodama-sku288.dts
-f:arch/arm64/boot/dts/mediatek/mt8183-kukui-kodama-sku32.dts
-f:arch/arm64/boot/dts/mediatek/mt8183-kukui-kodama.dtsi
-f:arch/arm64/boot/dts/mediatek/mt8183-kukui-krane-sku0.dts
-f:arch/arm64/boot/dts/mediatek/mt8183-kukui-krane-sku176.dts
-f:arch/arm64/boot/dts/mediatek/mt8183-kukui-krane.dtsi
-f:arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi
-f:arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts
-f:arch/arm64/boot/dts/mediatek/mt8183.dtsi
-f:arch/arm64/boot/dts/mediatek/mt8186-corsola-chinchou-sku0.dts
-f:arch/arm64/boot/dts/mediatek/mt8186-corsola-chinchou-sku1.dts
-f:arch/arm64/boot/dts/mediatek/mt8186-corsola-chinchou-sku16.dts
-f:arch/arm64/boot/dts/mediatek/mt8186-corsola-chinchou.dtsi
-f:arch/arm64/boot/dts/mediatek/mt8186-corsola-krabby.dtsi
-f:arch/arm64/boot/dts/mediatek/mt8186-corsola-magneton-sku393216.dts
-f:arch/arm64/boot/dts/mediatek/mt8186-corsola-magneton-sku393217.dts
-f:arch/arm64/boot/dts/mediatek/mt8186-corsola-magneton-sku393218.dts
-f:arch/arm64/boot/dts/mediatek/mt8186-corsola-ponyta-sku0.dts
-f:arch/arm64/boot/dts/mediatek/mt8186-corsola-ponyta-sku1.dts
-f:arch/arm64/boot/dts/mediatek/mt8186-corsola-ponyta.dtsi
-f:arch/arm64/boot/dts/mediatek/mt8186-corsola-rusty-sku196608.dts
-f:arch/arm64/boot/dts/mediatek/mt8186-corsola-squirtle.dts
-f:arch/arm64/boot/dts/mediatek/mt8186-corsola-starmie-sku0.dts
-f:arch/arm64/boot/dts/mediatek/mt8186-corsola-starmie-sku1.dts
-f:arch/arm64/boot/dts/mediatek/mt8186-corsola-starmie.dtsi
-f:arch/arm64/boot/dts/mediatek/mt8186-corsola-steelix-sku131072.dts
-f:arch/arm64/boot/dts/mediatek/mt8186-corsola-steelix-sku131073.dts
-f:arch/arm64/boot/dts/mediatek/mt8186-corsola-steelix.dtsi
-f:arch/arm64/boot/dts/mediatek/mt8186-corsola-tentacool-sku327681.dts
-f:arch/arm64/boot/dts/mediatek/mt8186-corsola-tentacool-sku327683.dts
-f:arch/arm64/boot/dts/mediatek/mt8186-corsola-tentacruel-sku262144.dts
-f:arch/arm64/boot/dts/mediatek/mt8186-corsola-tentacruel-sku262148.dts
-f:arch/arm64/boot/dts/mediatek/mt8186-corsola-voltorb.dts
-f:arch/arm64/boot/dts/mediatek/mt8186-corsola-voltorb.dtsi
-f:arch/arm64/boot/dts/mediatek/mt8186-corsola.dtsi
-f:arch/arm64/boot/dts/mediatek/mt8186-evb.dts
-f:arch/arm64/boot/dts/mediatek/mt8186.dtsi
-f:arch/arm64/boot/dts/mediatek/mt8188-evb.dts
-f:arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku0.dts
-f:arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku1.dts
-f:arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku2.dts
-f:arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku3.dts
-f:arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku4.dts
-f:arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku5.dts
-f:arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku6.dts
-f:arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku7.dts
-f:arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri.dtsi
-f:arch/arm64/boot/dts/mediatek/mt8188-geralt.dtsi
-f:arch/arm64/boot/dts/mediatek/mt8188.dtsi
-f:arch/arm64/boot/dts/mediatek/mt8192-asurada-hayato-r1.dts
-f:arch/arm64/boot/dts/mediatek/mt8192-asurada-spherion-r0.dts
-f:arch/arm64/boot/dts/mediatek/mt8192-asurada.dtsi
-f:arch/arm64/boot/dts/mediatek/mt8192-evb.dts
-f:arch/arm64/boot/dts/mediatek/mt8192.dtsi
-f:arch/arm64/boot/dts/mediatek/mt8195-cherry-dojo-r1.dts
-f:arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r1.dts
-f:arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r2.dts
-f:arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r3.dts
-f:arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi
-f:arch/arm64/boot/dts/mediatek/mt8195-demo.dts
-f:arch/arm64/boot/dts/mediatek/mt8195-evb.dts
-f:arch/arm64/boot/dts/mediatek/mt8195.dtsi
-f:arch/arm64/boot/dts/mediatek/mt8196-pinfunc.h
-f:arch/arm64/boot/dts/mediatek/mt8365-evk.dts
-f:arch/arm64/boot/dts/mediatek/mt8365.dtsi
-f:arch/arm64/boot/dts/mediatek/mt8370-genio-510-evk.dts
-f:arch/arm64/boot/dts/mediatek/mt8370.dtsi
-f:arch/arm64/boot/dts/mediatek/mt8390-genio-700-evk.dts
-f:arch/arm64/boot/dts/mediatek/mt8390-genio-common.dtsi
-f:arch/arm64/boot/dts/mediatek/mt8395-genio-1200-evk.dts
-f:arch/arm64/boot/dts/mediatek/mt8395-kontron-3-5-sbc-i1200.dts
-f:arch/arm64/boot/dts/mediatek/mt8395-radxa-nio-12l-8-hd-panel.dtso
-f:arch/arm64/boot/dts/mediatek/mt8395-radxa-nio-12l.dts
-f:arch/arm64/boot/dts/mediatek/mt8516-pinfunc.h
-f:arch/arm64/boot/dts/mediatek/mt8516-pumpkin.dts
-f:arch/arm64/boot/dts/mediatek/mt8516.dtsi
-f:arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi
-f:arch/arm64/boot/dts/microchip/Makefile
-f:arch/arm64/boot/dts/microchip/sparx5.dtsi
-f:arch/arm64/boot/dts/microchip/sparx5_nand.dtsi
-f:arch/arm64/boot/dts/microchip/sparx5_pcb125.dts
-f:arch/arm64/boot/dts/microchip/sparx5_pcb134.dts
-f:arch/arm64/boot/dts/microchip/sparx5_pcb134_board.dtsi
-f:arch/arm64/boot/dts/microchip/sparx5_pcb134_emmc.dts
-f:arch/arm64/boot/dts/microchip/sparx5_pcb135.dts
-f:arch/arm64/boot/dts/microchip/sparx5_pcb135_board.dtsi
-f:arch/arm64/boot/dts/microchip/sparx5_pcb135_emmc.dts
-f:arch/arm64/boot/dts/microchip/sparx5_pcb_common.dtsi
-f:arch/arm64/boot/dts/nuvoton/Makefile
-f:arch/arm64/boot/dts/nuvoton/ma35d1-iot-512m.dts
-f:arch/arm64/boot/dts/nuvoton/ma35d1-som-256m.dts
-f:arch/arm64/boot/dts/nuvoton/ma35d1.dtsi
-f:arch/arm64/boot/dts/nuvoton/nuvoton-common-npcm8xx.dtsi
-f:arch/arm64/boot/dts/nuvoton/nuvoton-npcm845-evb.dts
-f:arch/arm64/boot/dts/nuvoton/nuvoton-npcm845.dtsi
-f:arch/arm64/boot/dts/nvidia/Makefile
-f:arch/arm64/boot/dts/nvidia/tegra132-norrin.dts
-f:arch/arm64/boot/dts/nvidia/tegra132-peripherals-opp.dtsi
-f:arch/arm64/boot/dts/nvidia/tegra132.dtsi
-f:arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts
-f:arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi
-f:arch/arm64/boot/dts/nvidia/tegra186-p3509-0000+p3636-0001.dts
-f:arch/arm64/boot/dts/nvidia/tegra186.dtsi
-f:arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi
-f:arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts
-f:arch/arm64/boot/dts/nvidia/tegra194-p3509-0000+p3668-0000.dts
-f:arch/arm64/boot/dts/nvidia/tegra194-p3509-0000+p3668-0001.dts
-f:arch/arm64/boot/dts/nvidia/tegra194-p3509-0000.dtsi
-f:arch/arm64/boot/dts/nvidia/tegra194-p3668-0000.dtsi
-f:arch/arm64/boot/dts/nvidia/tegra194-p3668-0001.dtsi
-f:arch/arm64/boot/dts/nvidia/tegra194-p3668.dtsi
-f:arch/arm64/boot/dts/nvidia/tegra194.dtsi
-f:arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi
-f:arch/arm64/boot/dts/nvidia/tegra210-p2371-0000.dts
-f:arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts
-f:arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi
-f:arch/arm64/boot/dts/nvidia/tegra210-p2571.dts
-f:arch/arm64/boot/dts/nvidia/tegra210-p2595.dtsi
-f:arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi
-f:arch/arm64/boot/dts/nvidia/tegra210-p2894-0050-a08.dts
-f:arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi
-f:arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts
-f:arch/arm64/boot/dts/nvidia/tegra210-smaug.dts
-f:arch/arm64/boot/dts/nvidia/tegra210.dtsi
-f:arch/arm64/boot/dts/nvidia/tegra234-p3701-0000.dtsi
-f:arch/arm64/boot/dts/nvidia/tegra234-p3701-0008.dtsi
-f:arch/arm64/boot/dts/nvidia/tegra234-p3701.dtsi
-f:arch/arm64/boot/dts/nvidia/tegra234-p3737-0000+p3701-0000.dts
-f:arch/arm64/boot/dts/nvidia/tegra234-p3737-0000+p3701-0008.dts
-f:arch/arm64/boot/dts/nvidia/tegra234-p3737-0000+p3701.dtsi
-f:arch/arm64/boot/dts/nvidia/tegra234-p3740-0002+p3701-0008.dts
-f:arch/arm64/boot/dts/nvidia/tegra234-p3767.dtsi
-f:arch/arm64/boot/dts/nvidia/tegra234-p3768-0000+p3767-0000.dts
-f:arch/arm64/boot/dts/nvidia/tegra234-p3768-0000+p3767-0005.dts
-f:arch/arm64/boot/dts/nvidia/tegra234-p3768-0000+p3767.dtsi
-f:arch/arm64/boot/dts/nvidia/tegra234-sim-vdk.dts
-f:arch/arm64/boot/dts/nvidia/tegra234.dtsi
-f:arch/arm64/boot/dts/nvidia/tegra264-p3834-0008.dtsi
-f:arch/arm64/boot/dts/nvidia/tegra264-p3834.dtsi
-f:arch/arm64/boot/dts/nvidia/tegra264-p3971-0089+p3834-0008.dts
-f:arch/arm64/boot/dts/nvidia/tegra264-p3971-0089+p3834.dtsi
-f:arch/arm64/boot/dts/nvidia/tegra264-p3971-0089.dtsi
-f:arch/arm64/boot/dts/nvidia/tegra264-p3971.dtsi
-f:arch/arm64/boot/dts/nvidia/tegra264.dtsi
-f:arch/arm64/boot/dts/qcom/Makefile
-f:arch/arm64/boot/dts/qcom/apq8016-sbc-d3-camera-mezzanine.dtso
-f:arch/arm64/boot/dts/qcom/apq8016-sbc-usb-host.dtso
-f:arch/arm64/boot/dts/qcom/apq8016-sbc.dts
-f:arch/arm64/boot/dts/qcom/apq8016-schneider-hmibsc.dts
-f:arch/arm64/boot/dts/qcom/apq8039-t2.dts
-f:arch/arm64/boot/dts/qcom/apq8094-sony-xperia-kitakami-karin_windy.dts
-f:arch/arm64/boot/dts/qcom/apq8096-db820c.dts
-f:arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts
-f:arch/arm64/boot/dts/qcom/ipq5018-rdp432-c2.dts
-f:arch/arm64/boot/dts/qcom/ipq5018-tplink-archer-ax55-v1.dts
-f:arch/arm64/boot/dts/qcom/ipq5018.dtsi
-f:arch/arm64/boot/dts/qcom/ipq5332-rdp-common.dtsi
-f:arch/arm64/boot/dts/qcom/ipq5332-rdp441.dts
-f:arch/arm64/boot/dts/qcom/ipq5332-rdp442.dts
-f:arch/arm64/boot/dts/qcom/ipq5332-rdp468.dts
-f:arch/arm64/boot/dts/qcom/ipq5332-rdp474.dts
-f:arch/arm64/boot/dts/qcom/ipq5332.dtsi
-f:arch/arm64/boot/dts/qcom/ipq5424-rdp466.dts
-f:arch/arm64/boot/dts/qcom/ipq5424.dtsi
-f:arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts
-f:arch/arm64/boot/dts/qcom/ipq6018-mp5496.dtsi
-f:arch/arm64/boot/dts/qcom/ipq6018.dtsi
-f:arch/arm64/boot/dts/qcom/ipq8074-hk01.dts
-f:arch/arm64/boot/dts/qcom/ipq8074-hk10-c1.dts
-f:arch/arm64/boot/dts/qcom/ipq8074-hk10-c2.dts
-f:arch/arm64/boot/dts/qcom/ipq8074-hk10.dtsi
-f:arch/arm64/boot/dts/qcom/ipq8074.dtsi
-f:arch/arm64/boot/dts/qcom/ipq9574-rdp-common.dtsi
-f:arch/arm64/boot/dts/qcom/ipq9574-rdp418.dts
-f:arch/arm64/boot/dts/qcom/ipq9574-rdp433.dts
-f:arch/arm64/boot/dts/qcom/ipq9574-rdp449.dts
-f:arch/arm64/boot/dts/qcom/ipq9574-rdp453.dts
-f:arch/arm64/boot/dts/qcom/ipq9574-rdp454.dts
-f:arch/arm64/boot/dts/qcom/ipq9574.dtsi
-f:arch/arm64/boot/dts/qcom/msm8216-samsung-fortuna3g.dts
-f:arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts
-f:arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
-f:arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
-f:arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts
-f:arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
-f:arch/arm64/boot/dts/qcom/msm8916-lg-c50.dts
-f:arch/arm64/boot/dts/qcom/msm8916-lg-m216.dts
-f:arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
-f:arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
-f:arch/arm64/boot/dts/qcom/msm8916-modem-qdsp6.dtsi
-f:arch/arm64/boot/dts/qcom/msm8916-motorola-common.dtsi
-f:arch/arm64/boot/dts/qcom/msm8916-motorola-harpia.dts
-f:arch/arm64/boot/dts/qcom/msm8916-motorola-osprey.dts
-f:arch/arm64/boot/dts/qcom/msm8916-motorola-surnia.dts
-f:arch/arm64/boot/dts/qcom/msm8916-mtp.dts
-f:arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi
-f:arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
-f:arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts
-f:arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts
-f:arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi
-f:arch/arm64/boot/dts/qcom/msm8916-samsung-e5.dts
-f:arch/arm64/boot/dts/qcom/msm8916-samsung-e7.dts
-f:arch/arm64/boot/dts/qcom/msm8916-samsung-fortuna-common.dtsi
-f:arch/arm64/boot/dts/qcom/msm8916-samsung-gprimeltecan.dts
-f:arch/arm64/boot/dts/qcom/msm8916-samsung-grandmax.dts
-f:arch/arm64/boot/dts/qcom/msm8916-samsung-grandprimelte.dts
-f:arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi
-f:arch/arm64/boot/dts/qcom/msm8916-samsung-gt510.dts
-f:arch/arm64/boot/dts/qcom/msm8916-samsung-gt58.dts
-f:arch/arm64/boot/dts/qcom/msm8916-samsung-j3-common.dtsi
-f:arch/arm64/boot/dts/qcom/msm8916-samsung-j3ltetw.dts
-f:arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi
-f:arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts
-f:arch/arm64/boot/dts/qcom/msm8916-samsung-j5x.dts
-f:arch/arm64/boot/dts/qcom/msm8916-samsung-rossa-common.dtsi
-f:arch/arm64/boot/dts/qcom/msm8916-samsung-rossa.dts
-f:arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts
-f:arch/arm64/boot/dts/qcom/msm8916-thwc-uf896.dts
-f:arch/arm64/boot/dts/qcom/msm8916-thwc-ufi001c.dts
-f:arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi
-f:arch/arm64/boot/dts/qcom/msm8916-wingtech-wt86518.dts
-f:arch/arm64/boot/dts/qcom/msm8916-wingtech-wt86528.dts
-f:arch/arm64/boot/dts/qcom/msm8916-wingtech-wt865x8.dtsi
-f:arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
-f:arch/arm64/boot/dts/qcom/msm8916-yiming-uz801v3.dts
-f:arch/arm64/boot/dts/qcom/msm8916.dtsi
-f:arch/arm64/boot/dts/qcom/msm8917-xiaomi-riva.dts
-f:arch/arm64/boot/dts/qcom/msm8917.dtsi
-f:arch/arm64/boot/dts/qcom/msm8929-pm8916.dtsi
-f:arch/arm64/boot/dts/qcom/msm8929-wingtech-wt82918hd.dts
-f:arch/arm64/boot/dts/qcom/msm8929.dtsi
-f:arch/arm64/boot/dts/qcom/msm8939-huawei-kiwi.dts
-f:arch/arm64/boot/dts/qcom/msm8939-longcheer-l9100.dts
-f:arch/arm64/boot/dts/qcom/msm8939-pm8916.dtsi
-f:arch/arm64/boot/dts/qcom/msm8939-samsung-a7.dts
-f:arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts
-f:arch/arm64/boot/dts/qcom/msm8939-wingtech-wt82918.dts
-f:arch/arm64/boot/dts/qcom/msm8939-wingtech-wt82918.dtsi
-f:arch/arm64/boot/dts/qcom/msm8939-wingtech-wt82918hd.dts
-f:arch/arm64/boot/dts/qcom/msm8939.dtsi
-f:arch/arm64/boot/dts/qcom/msm8953-motorola-potter.dts
-f:arch/arm64/boot/dts/qcom/msm8953-xiaomi-daisy.dts
-f:arch/arm64/boot/dts/qcom/msm8953-xiaomi-mido.dts
-f:arch/arm64/boot/dts/qcom/msm8953-xiaomi-tissot.dts
-f:arch/arm64/boot/dts/qcom/msm8953-xiaomi-vince.dts
-f:arch/arm64/boot/dts/qcom/msm8953.dtsi
-f:arch/arm64/boot/dts/qcom/msm8956-sony-xperia-loire-kugo.dts
-f:arch/arm64/boot/dts/qcom/msm8956-sony-xperia-loire-suzu.dts
-f:arch/arm64/boot/dts/qcom/msm8956-sony-xperia-loire.dtsi
-f:arch/arm64/boot/dts/qcom/msm8956.dtsi
-f:arch/arm64/boot/dts/qcom/msm8976-longcheer-l9360.dts
-f:arch/arm64/boot/dts/qcom/msm8976.dtsi
-f:arch/arm64/boot/dts/qcom/msm8992-lg-bullhead-rev-10.dts
-f:arch/arm64/boot/dts/qcom/msm8992-lg-bullhead-rev-101.dts
-f:arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi
-f:arch/arm64/boot/dts/qcom/msm8992-lg-h815.dts
-f:arch/arm64/boot/dts/qcom/msm8992-msft-lumia-octagon-talkman.dts
-f:arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts
-f:arch/arm64/boot/dts/qcom/msm8992.dtsi
-f:arch/arm64/boot/dts/qcom/msm8994-huawei-angler-rev-101.dts
-f:arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon-cityman.dts
-f:arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi
-f:arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-ivy.dts
-f:arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-karin.dts
-f:arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-satsuki.dts
-f:arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-sumire.dts
-f:arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-suzuran.dts
-f:arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi
-f:arch/arm64/boot/dts/qcom/msm8994.dtsi
-f:arch/arm64/boot/dts/qcom/msm8996-mtp.dts
-f:arch/arm64/boot/dts/qcom/msm8996-oneplus-common.dtsi
-f:arch/arm64/boot/dts/qcom/msm8996-oneplus3.dts
-f:arch/arm64/boot/dts/qcom/msm8996-oneplus3t.dts
-f:arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone-dora.dts
-f:arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone-kagura.dts
-f:arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone-keyaki.dts
-f:arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi
-f:arch/arm64/boot/dts/qcom/msm8996-v3.0.dtsi
-f:arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi
-f:arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts
-f:arch/arm64/boot/dts/qcom/msm8996.dtsi
-f:arch/arm64/boot/dts/qcom/msm8996pro-xiaomi-natrium.dts
-f:arch/arm64/boot/dts/qcom/msm8996pro-xiaomi-scorpio.dts
-f:arch/arm64/boot/dts/qcom/msm8996pro.dtsi
-f:arch/arm64/boot/dts/qcom/msm8998-asus-novago-tp370ql.dts
-f:arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi
-f:arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts
-f:arch/arm64/boot/dts/qcom/msm8998-hp-envy-x2.dts
-f:arch/arm64/boot/dts/qcom/msm8998-lenovo-miix-630.dts
-f:arch/arm64/boot/dts/qcom/msm8998-mtp.dts
-f:arch/arm64/boot/dts/qcom/msm8998-oneplus-cheeseburger.dts
-f:arch/arm64/boot/dts/qcom/msm8998-oneplus-common.dtsi
-f:arch/arm64/boot/dts/qcom/msm8998-oneplus-dumpling.dts
-f:arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino-lilac.dts
-f:arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino-maple.dts
-f:arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino-poplar.dts
-f:arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi
-f:arch/arm64/boot/dts/qcom/msm8998-xiaomi-sagit.dts
-f:arch/arm64/boot/dts/qcom/msm8998.dtsi
-f:arch/arm64/boot/dts/qcom/pm4125.dtsi
-f:arch/arm64/boot/dts/qcom/pm6125.dtsi
-f:arch/arm64/boot/dts/qcom/pm6150.dtsi
-f:arch/arm64/boot/dts/qcom/pm6150l.dtsi
-f:arch/arm64/boot/dts/qcom/pm6350.dtsi
-f:arch/arm64/boot/dts/qcom/pm660.dtsi
-f:arch/arm64/boot/dts/qcom/pm660l.dtsi
-f:arch/arm64/boot/dts/qcom/pm7250b.dtsi
-f:arch/arm64/boot/dts/qcom/pm7325.dtsi
-f:arch/arm64/boot/dts/qcom/pm7550ba.dtsi
-f:arch/arm64/boot/dts/qcom/pm8004.dtsi
-f:arch/arm64/boot/dts/qcom/pm8005.dtsi
-f:arch/arm64/boot/dts/qcom/pm8009.dtsi
-f:arch/arm64/boot/dts/qcom/pm8010.dtsi
-f:arch/arm64/boot/dts/qcom/pm8150.dtsi
-f:arch/arm64/boot/dts/qcom/pm8150b.dtsi
-f:arch/arm64/boot/dts/qcom/pm8150l.dtsi
-f:arch/arm64/boot/dts/qcom/pm8350.dtsi
-f:arch/arm64/boot/dts/qcom/pm8350b.dtsi
-f:arch/arm64/boot/dts/qcom/pm8350c.dtsi
-f:arch/arm64/boot/dts/qcom/pm8450.dtsi
-f:arch/arm64/boot/dts/qcom/pm8550.dtsi
-f:arch/arm64/boot/dts/qcom/pm8550b.dtsi
-f:arch/arm64/boot/dts/qcom/pm8550ve.dtsi
-f:arch/arm64/boot/dts/qcom/pm8550vs.dtsi
-f:arch/arm64/boot/dts/qcom/pm8916.dtsi
-f:arch/arm64/boot/dts/qcom/pm8937.dtsi
-f:arch/arm64/boot/dts/qcom/pm8950.dtsi
-f:arch/arm64/boot/dts/qcom/pm8953.dtsi
-f:arch/arm64/boot/dts/qcom/pm8994.dtsi
-f:arch/arm64/boot/dts/qcom/pm8998.dtsi
-f:arch/arm64/boot/dts/qcom/pmd8028.dtsi
-f:arch/arm64/boot/dts/qcom/pmi632.dtsi
-f:arch/arm64/boot/dts/qcom/pmi8950.dtsi
-f:arch/arm64/boot/dts/qcom/pmi8994.dtsi
-f:arch/arm64/boot/dts/qcom/pmi8996.dtsi
-f:arch/arm64/boot/dts/qcom/pmi8998.dtsi
-f:arch/arm64/boot/dts/qcom/pmih0108.dtsi
-f:arch/arm64/boot/dts/qcom/pmk8350.dtsi
-f:arch/arm64/boot/dts/qcom/pmk8550.dtsi
-f:arch/arm64/boot/dts/qcom/pmm8155au_1.dtsi
-f:arch/arm64/boot/dts/qcom/pmm8155au_2.dtsi
-f:arch/arm64/boot/dts/qcom/pmp8074.dtsi
-f:arch/arm64/boot/dts/qcom/pmr735a.dtsi
-f:arch/arm64/boot/dts/qcom/pmr735b.dtsi
-f:arch/arm64/boot/dts/qcom/pmr735d_a.dtsi
-f:arch/arm64/boot/dts/qcom/pmr735d_b.dtsi
-f:arch/arm64/boot/dts/qcom/pms405.dtsi
-f:arch/arm64/boot/dts/qcom/pmx75.dtsi
-f:arch/arm64/boot/dts/qcom/qcm2290.dtsi
-f:arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts
-f:arch/arm64/boot/dts/qcom/qcm6490-idp.dts
-f:arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts
-f:arch/arm64/boot/dts/qcom/qcs404-evb-1000.dts
-f:arch/arm64/boot/dts/qcom/qcs404-evb-4000.dts
-f:arch/arm64/boot/dts/qcom/qcs404-evb.dtsi
-f:arch/arm64/boot/dts/qcom/qcs404.dtsi
-f:arch/arm64/boot/dts/qcom/qcs615-ride.dts
-f:arch/arm64/boot/dts/qcom/qcs615.dtsi
-f:arch/arm64/boot/dts/qcom/qcs6490-rb3gen2-industrial-mezzanine.dtso
-f:arch/arm64/boot/dts/qcom/qcs6490-rb3gen2-vision-mezzanine.dtso
-f:arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
-f:arch/arm64/boot/dts/qcom/qcs8300-pmics.dtsi
-f:arch/arm64/boot/dts/qcom/qcs8300-ride.dts
-f:arch/arm64/boot/dts/qcom/qcs8300.dtsi
-f:arch/arm64/boot/dts/qcom/qcs8550-aim300-aiot.dts
-f:arch/arm64/boot/dts/qcom/qcs8550-aim300.dtsi
-f:arch/arm64/boot/dts/qcom/qcs8550.dtsi
-f:arch/arm64/boot/dts/qcom/qcs9100-ride-r3.dts
-f:arch/arm64/boot/dts/qcom/qcs9100-ride.dts
-f:arch/arm64/boot/dts/qcom/qdu1000-idp.dts
-f:arch/arm64/boot/dts/qcom/qdu1000.dtsi
-f:arch/arm64/boot/dts/qcom/qrb2210-rb1.dts
-f:arch/arm64/boot/dts/qcom/qrb4210-rb2.dts
-f:arch/arm64/boot/dts/qcom/qrb5165-rb5-vision-mezzanine.dtso
-f:arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
-f:arch/arm64/boot/dts/qcom/qru1000-idp.dts
-f:arch/arm64/boot/dts/qcom/qru1000.dtsi
-f:arch/arm64/boot/dts/qcom/sa8155p-adp.dts
-f:arch/arm64/boot/dts/qcom/sa8155p.dtsi
-f:arch/arm64/boot/dts/qcom/sa8295p-adp.dts
-f:arch/arm64/boot/dts/qcom/sa8540p-pmics.dtsi
-f:arch/arm64/boot/dts/qcom/sa8540p-ride.dts
-f:arch/arm64/boot/dts/qcom/sa8540p.dtsi
-f:arch/arm64/boot/dts/qcom/sa8775p-pmics.dtsi
-f:arch/arm64/boot/dts/qcom/sa8775p-ride-r3.dts
-f:arch/arm64/boot/dts/qcom/sa8775p-ride.dts
-f:arch/arm64/boot/dts/qcom/sa8775p-ride.dtsi
-f:arch/arm64/boot/dts/qcom/sa8775p.dtsi
-f:arch/arm64/boot/dts/qcom/sar2130p-qar2130p.dts
-f:arch/arm64/boot/dts/qcom/sar2130p.dtsi
-f:arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts
-f:arch/arm64/boot/dts/qcom/sc7180-el2.dtso
-f:arch/arm64/boot/dts/qcom/sc7180-firmware-tfa.dtsi
-f:arch/arm64/boot/dts/qcom/sc7180-idp.dts
-f:arch/arm64/boot/dts/qcom/sc7180-lite.dtsi
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-clamshell.dtsi
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1-lte.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r3-lte.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r3.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-detachable.dtsi
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r2.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r3.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r4.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r10.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r4.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r5.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r9.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r10.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r4.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r9.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1-kb.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1-lte.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r10-kb.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r10-lte.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r10.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-kb.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-kb.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-lte.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-lte-sku.dtsi
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-parade-ps8640.dtsi
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel-lte-parade.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel-lte-ti.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel-parade.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel-ti.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel.dtsi
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel360-lte.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel360-wifi.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel360.dtsi
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1-lte.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2-lte.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r3-lte.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r3.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick-r0-lte.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick-r0.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-r1-lte.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-rt5682i-sku.dtsi
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-rt5682s-sku.dtsi
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev1-boe-rt5682s.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev1-boe.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev1-inx-rt5682s.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev1-inx.dts
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi
-f:arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
-f:arch/arm64/boot/dts/qcom/sc7180.dtsi
-f:arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi
-f:arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts
-f:arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682-3mic.dtsi
-f:arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682.dtsi
-f:arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-wcd9385.dtsi
-f:arch/arm64/boot/dts/qcom/sc7280-herobrine-crd-pro.dts
-f:arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts
-f:arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker-lte.dts
-f:arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dts
-f:arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dtsi
-f:arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts
-f:arch/arm64/boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi
-f:arch/arm64/boot/dts/qcom/sc7280-herobrine-nvme-sku.dtsi
-f:arch/arm64/boot/dts/qcom/sc7280-herobrine-pro-sku.dtsi
-f:arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r0.dts
-f:arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r1-lte.dts
-f:arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r1.dts
-f:arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r1.dtsi
-f:arch/arm64/boot/dts/qcom/sc7280-herobrine-villager.dtsi
-f:arch/arm64/boot/dts/qcom/sc7280-herobrine-wifi-sku.dtsi
-f:arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie-lte.dts
-f:arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie-nvme-lte.dts
-f:arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie-nvme.dts
-f:arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie.dts
-f:arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie.dtsi
-f:arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi
-f:arch/arm64/boot/dts/qcom/sc7280-idp-ec-h1.dtsi
-f:arch/arm64/boot/dts/qcom/sc7280-idp.dts
-f:arch/arm64/boot/dts/qcom/sc7280-idp.dtsi
-f:arch/arm64/boot/dts/qcom/sc7280-idp2.dts
-f:arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi
-f:arch/arm64/boot/dts/qcom/sc7280.dtsi
-f:arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts
-f:arch/arm64/boot/dts/qcom/sc8180x-pmics.dtsi
-f:arch/arm64/boot/dts/qcom/sc8180x-primus.dts
-f:arch/arm64/boot/dts/qcom/sc8180x.dtsi
-f:arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
-f:arch/arm64/boot/dts/qcom/sc8280xp-el2.dtso
-f:arch/arm64/boot/dts/qcom/sc8280xp-huawei-gaokun3.dts
-f:arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
-f:arch/arm64/boot/dts/qcom/sc8280xp-microsoft-arcata.dts
-f:arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts
-f:arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi
-f:arch/arm64/boot/dts/qcom/sc8280xp.dtsi
-f:arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts
-f:arch/arm64/boot/dts/qcom/sdm450-lenovo-tbx605f.dts
-f:arch/arm64/boot/dts/qcom/sdm450-motorola-ali.dts
-f:arch/arm64/boot/dts/qcom/sdm450.dtsi
-f:arch/arm64/boot/dts/qcom/sdm630-sony-xperia-ganges-kirin.dts
-f:arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile-discovery.dts
-f:arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile-pioneer.dts
-f:arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile-voyager.dts
-f:arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi
-f:arch/arm64/boot/dts/qcom/sdm630.dtsi
-f:arch/arm64/boot/dts/qcom/sdm632-fairphone-fp3.dts
-f:arch/arm64/boot/dts/qcom/sdm632-motorola-ocean.dts
-f:arch/arm64/boot/dts/qcom/sdm632.dtsi
-f:arch/arm64/boot/dts/qcom/sdm636-sony-xperia-ganges-mermaid.dts
-f:arch/arm64/boot/dts/qcom/sdm636.dtsi
-f:arch/arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dts
-f:arch/arm64/boot/dts/qcom/sdm660.dtsi
-f:arch/arm64/boot/dts/qcom/sdm670-google-sargo.dts
-f:arch/arm64/boot/dts/qcom/sdm670.dtsi
-f:arch/arm64/boot/dts/qcom/sdm845-cheza-r1.dts
-f:arch/arm64/boot/dts/qcom/sdm845-cheza-r2.dts
-f:arch/arm64/boot/dts/qcom/sdm845-cheza-r3.dts
-f:arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
-f:arch/arm64/boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dtso
-f:arch/arm64/boot/dts/qcom/sdm845-db845c.dts
-f:arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi
-f:arch/arm64/boot/dts/qcom/sdm845-lg-judyln.dts
-f:arch/arm64/boot/dts/qcom/sdm845-lg-judyp.dts
-f:arch/arm64/boot/dts/qcom/sdm845-mtp.dts
-f:arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
-f:arch/arm64/boot/dts/qcom/sdm845-oneplus-enchilada.dts
-f:arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts
-f:arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts
-f:arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
-f:arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akari.dts
-f:arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akatsuki.dts
-f:arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-apollo.dts
-f:arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
-f:arch/arm64/boot/dts/qcom/sdm845-wcd9340.dtsi
-f:arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
-f:arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-ebbg.dts
-f:arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-tianma.dts
-f:arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
-f:arch/arm64/boot/dts/qcom/sdm845.dtsi
-f:arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
-f:arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts
-f:arch/arm64/boot/dts/qcom/sdm850.dtsi
-f:arch/arm64/boot/dts/qcom/sdx75-idp.dts
-f:arch/arm64/boot/dts/qcom/sdx75.dtsi
-f:arch/arm64/boot/dts/qcom/sm4250-oneplus-billie2.dts
-f:arch/arm64/boot/dts/qcom/sm4250.dtsi
-f:arch/arm64/boot/dts/qcom/sm4450-qrd.dts
-f:arch/arm64/boot/dts/qcom/sm4450.dtsi
-f:arch/arm64/boot/dts/qcom/sm6115-fxtec-pro1x.dts
-f:arch/arm64/boot/dts/qcom/sm6115.dtsi
-f:arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts
-f:arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts
-f:arch/arm64/boot/dts/qcom/sm6125-xiaomi-ginkgo.dts
-f:arch/arm64/boot/dts/qcom/sm6125-xiaomi-laurel-sprout.dts
-f:arch/arm64/boot/dts/qcom/sm6125.dtsi
-f:arch/arm64/boot/dts/qcom/sm6350-sony-xperia-lena-pdx213.dts
-f:arch/arm64/boot/dts/qcom/sm6350.dtsi
-f:arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx225.dts
-f:arch/arm64/boot/dts/qcom/sm6375.dtsi
-f:arch/arm64/boot/dts/qcom/sm7125-xiaomi-common.dtsi
-f:arch/arm64/boot/dts/qcom/sm7125-xiaomi-curtana.dts
-f:arch/arm64/boot/dts/qcom/sm7125-xiaomi-joyeuse.dts
-f:arch/arm64/boot/dts/qcom/sm7125.dtsi
-f:arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts
-f:arch/arm64/boot/dts/qcom/sm7225.dtsi
-f:arch/arm64/boot/dts/qcom/sm7325-nothing-spacewar.dts
-f:arch/arm64/boot/dts/qcom/sm7325.dtsi
-f:arch/arm64/boot/dts/qcom/sm8150-hdk.dts
-f:arch/arm64/boot/dts/qcom/sm8150-microsoft-surface-duo.dts
-f:arch/arm64/boot/dts/qcom/sm8150-mtp.dts
-f:arch/arm64/boot/dts/qcom/sm8150-sony-xperia-kumano-bahamut.dts
-f:arch/arm64/boot/dts/qcom/sm8150-sony-xperia-kumano-griffin.dts
-f:arch/arm64/boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi
-f:arch/arm64/boot/dts/qcom/sm8150.dtsi
-f:arch/arm64/boot/dts/qcom/sm8250-hdk.dts
-f:arch/arm64/boot/dts/qcom/sm8250-mtp.dts
-f:arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo-pdx203.dts
-f:arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo-pdx206.dts
-f:arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi
-f:arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-boe.dts
-f:arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
-f:arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-csot.dts
-f:arch/arm64/boot/dts/qcom/sm8250-xiaomi-pipa.dts
-f:arch/arm64/boot/dts/qcom/sm8250.dtsi
-f:arch/arm64/boot/dts/qcom/sm8350-hdk.dts
-f:arch/arm64/boot/dts/qcom/sm8350-microsoft-surface-duo2.dts
-f:arch/arm64/boot/dts/qcom/sm8350-mtp.dts
-f:arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami-pdx214.dts
-f:arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami-pdx215.dts
-f:arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi
-f:arch/arm64/boot/dts/qcom/sm8350.dtsi
-f:arch/arm64/boot/dts/qcom/sm8450-hdk.dts
-f:arch/arm64/boot/dts/qcom/sm8450-qrd.dts
-f:arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara-pdx223.dts
-f:arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara-pdx224.dts
-f:arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara.dtsi
-f:arch/arm64/boot/dts/qcom/sm8450.dtsi
-f:arch/arm64/boot/dts/qcom/sm8550-hdk.dts
-f:arch/arm64/boot/dts/qcom/sm8550-mtp.dts
-f:arch/arm64/boot/dts/qcom/sm8550-qrd.dts
-f:arch/arm64/boot/dts/qcom/sm8550-samsung-q5q.dts
-f:arch/arm64/boot/dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts
-f:arch/arm64/boot/dts/qcom/sm8550.dtsi
-f:arch/arm64/boot/dts/qcom/sm8650-hdk-display-card.dtso
-f:arch/arm64/boot/dts/qcom/sm8650-hdk.dts
-f:arch/arm64/boot/dts/qcom/sm8650-mtp.dts
-f:arch/arm64/boot/dts/qcom/sm8650-qrd.dts
-f:arch/arm64/boot/dts/qcom/sm8650.dtsi
-f:arch/arm64/boot/dts/qcom/sm8750-mtp.dts
-f:arch/arm64/boot/dts/qcom/sm8750-pmics.dtsi
-f:arch/arm64/boot/dts/qcom/sm8750-qrd.dts
-f:arch/arm64/boot/dts/qcom/sm8750.dtsi
-f:arch/arm64/boot/dts/qcom/x1-asus-zenbook-a14.dtsi
-f:arch/arm64/boot/dts/qcom/x1-crd.dtsi
-f:arch/arm64/boot/dts/qcom/x1-el2.dtso
-f:arch/arm64/boot/dts/qcom/x1e001de-devkit.dts
-f:arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s-oled.dts
-f:arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dts
-f:arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi
-f:arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts
-f:arch/arm64/boot/dts/qcom/x1e80100-asus-zenbook-a14.dts
-f:arch/arm64/boot/dts/qcom/x1e80100-crd.dts
-f:arch/arm64/boot/dts/qcom/x1e80100-dell-xps13-9345.dts
-f:arch/arm64/boot/dts/qcom/x1e80100-hp-elitebook-ultra-g1q.dts
-f:arch/arm64/boot/dts/qcom/x1e80100-hp-omnibook-x14.dts
-f:arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts
-f:arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi
-f:arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus13.dts
-f:arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus15.dts
-f:arch/arm64/boot/dts/qcom/x1e80100-pmics.dtsi
-f:arch/arm64/boot/dts/qcom/x1e80100-qcp.dts
-f:arch/arm64/boot/dts/qcom/x1e80100.dtsi
-f:arch/arm64/boot/dts/qcom/x1p42100-asus-zenbook-a14.dts
-f:arch/arm64/boot/dts/qcom/x1p42100-crd.dts
-f:arch/arm64/boot/dts/qcom/x1p42100.dtsi
-f:arch/arm64/boot/dts/realtek/Makefile
-f:arch/arm64/boot/dts/realtek/rtd1293-ds418j.dts
-f:arch/arm64/boot/dts/realtek/rtd1293.dtsi
-f:arch/arm64/boot/dts/realtek/rtd1295-mele-v9.dts
-f:arch/arm64/boot/dts/realtek/rtd1295-probox2-ava.dts
-f:arch/arm64/boot/dts/realtek/rtd1295-xnano-x5.dts
-f:arch/arm64/boot/dts/realtek/rtd1295-zidoo-x9s.dts
-f:arch/arm64/boot/dts/realtek/rtd1295.dtsi
-f:arch/arm64/boot/dts/realtek/rtd1296-ds418.dts
-f:arch/arm64/boot/dts/realtek/rtd1296.dtsi
-f:arch/arm64/boot/dts/realtek/rtd129x.dtsi
-f:arch/arm64/boot/dts/realtek/rtd1395-bpi-m4.dts
-f:arch/arm64/boot/dts/realtek/rtd1395-lionskin.dts
-f:arch/arm64/boot/dts/realtek/rtd1395.dtsi
-f:arch/arm64/boot/dts/realtek/rtd139x.dtsi
-f:arch/arm64/boot/dts/realtek/rtd1619-mjolnir.dts
-f:arch/arm64/boot/dts/realtek/rtd1619.dtsi
-f:arch/arm64/boot/dts/realtek/rtd16xx.dtsi
-f:arch/arm64/boot/dts/renesas/Makefile
-f:arch/arm64/boot/dts/renesas/aistarvision-mipi-adapter-2.1.dtsi
-f:arch/arm64/boot/dts/renesas/beacon-renesom-baseboard.dtsi
-f:arch/arm64/boot/dts/renesas/beacon-renesom-som.dtsi
-f:arch/arm64/boot/dts/renesas/cat875.dtsi
-f:arch/arm64/boot/dts/renesas/condor-common.dtsi
-f:arch/arm64/boot/dts/renesas/draak-ebisu-panel-aa104xd12.dtso
-f:arch/arm64/boot/dts/renesas/draak.dtsi
-f:arch/arm64/boot/dts/renesas/ebisu.dtsi
-f:arch/arm64/boot/dts/renesas/gmsl-cameras.dtsi
-f:arch/arm64/boot/dts/renesas/gray-hawk-single.dtsi
-f:arch/arm64/boot/dts/renesas/hihope-common.dtsi
-f:arch/arm64/boot/dts/renesas/hihope-rev2.dtsi
-f:arch/arm64/boot/dts/renesas/hihope-rev4.dtsi
-f:arch/arm64/boot/dts/renesas/hihope-rzg2-ex-aistarvision-mipi-adapter-2.1.dtsi
-f:arch/arm64/boot/dts/renesas/hihope-rzg2-ex-lvds.dtsi
-f:arch/arm64/boot/dts/renesas/hihope-rzg2-ex.dtsi
-f:arch/arm64/boot/dts/renesas/panel-aa104xd12.dtsi
-f:arch/arm64/boot/dts/renesas/r8a774a1-beacon-rzg2m-kit.dts
-f:arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-ex-idk-1110wr.dts
-f:arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-ex-mipi-2.1.dts
-f:arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-ex.dts
-f:arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-rev2-ex-idk-1110wr.dts
-f:arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-rev2-ex.dts
-f:arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m-rev2.dts
-f:arch/arm64/boot/dts/renesas/r8a774a1-hihope-rzg2m.dts
-f:arch/arm64/boot/dts/renesas/r8a774a1.dtsi
-f:arch/arm64/boot/dts/renesas/r8a774b1-beacon-rzg2n-kit.dts
-f:arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n-ex-idk-1110wr.dts
-f:arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n-ex-mipi-2.1.dts
-f:arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n-ex.dts
-f:arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n-rev2-ex-idk-1110wr.dts
-f:arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n-rev2-ex.dts
-f:arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n-rev2.dts
-f:arch/arm64/boot/dts/renesas/r8a774b1-hihope-rzg2n.dts
-f:arch/arm64/boot/dts/renesas/r8a774b1.dtsi
-f:arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts
-f:arch/arm64/boot/dts/renesas/r8a774c0-ek874-idk-2121wr.dts
-f:arch/arm64/boot/dts/renesas/r8a774c0-ek874-mipi-2.1.dts
-f:arch/arm64/boot/dts/renesas/r8a774c0-ek874.dts
-f:arch/arm64/boot/dts/renesas/r8a774c0.dtsi
-f:arch/arm64/boot/dts/renesas/r8a774e1-beacon-rzg2h-kit.dts
-f:arch/arm64/boot/dts/renesas/r8a774e1-hihope-rzg2h-ex-idk-1110wr.dts
-f:arch/arm64/boot/dts/renesas/r8a774e1-hihope-rzg2h-ex-mipi-2.1.dts
-f:arch/arm64/boot/dts/renesas/r8a774e1-hihope-rzg2h-ex.dts
-f:arch/arm64/boot/dts/renesas/r8a774e1-hihope-rzg2h.dts
-f:arch/arm64/boot/dts/renesas/r8a774e1.dtsi
-f:arch/arm64/boot/dts/renesas/r8a77951-salvator-x.dts
-f:arch/arm64/boot/dts/renesas/r8a77951-salvator-xs.dts
-f:arch/arm64/boot/dts/renesas/r8a77951-ulcb-kf.dts
-f:arch/arm64/boot/dts/renesas/r8a77951-ulcb.dts
-f:arch/arm64/boot/dts/renesas/r8a77951.dtsi
-f:arch/arm64/boot/dts/renesas/r8a77960-salvator-x.dts
-f:arch/arm64/boot/dts/renesas/r8a77960-salvator-xs.dts
-f:arch/arm64/boot/dts/renesas/r8a77960-ulcb-kf.dts
-f:arch/arm64/boot/dts/renesas/r8a77960-ulcb.dts
-f:arch/arm64/boot/dts/renesas/r8a77960.dtsi
-f:arch/arm64/boot/dts/renesas/r8a77961-salvator-xs.dts
-f:arch/arm64/boot/dts/renesas/r8a77961-ulcb-kf.dts
-f:arch/arm64/boot/dts/renesas/r8a77961-ulcb.dts
-f:arch/arm64/boot/dts/renesas/r8a77961.dtsi
-f:arch/arm64/boot/dts/renesas/r8a77965-salvator-x.dts
-f:arch/arm64/boot/dts/renesas/r8a77965-salvator-xs.dts
-f:arch/arm64/boot/dts/renesas/r8a77965-ulcb-kf.dts
-f:arch/arm64/boot/dts/renesas/r8a77965-ulcb.dts
-f:arch/arm64/boot/dts/renesas/r8a77965.dtsi
-f:arch/arm64/boot/dts/renesas/r8a77970-eagle-function-expansion.dtso
-f:arch/arm64/boot/dts/renesas/r8a77970-eagle.dts
-f:arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts
-f:arch/arm64/boot/dts/renesas/r8a77970.dtsi
-f:arch/arm64/boot/dts/renesas/r8a77980-condor.dts
-f:arch/arm64/boot/dts/renesas/r8a77980-v3hsk.dts
-f:arch/arm64/boot/dts/renesas/r8a77980.dtsi
-f:arch/arm64/boot/dts/renesas/r8a77980a-condor-i.dts
-f:arch/arm64/boot/dts/renesas/r8a77980a.dtsi
-f:arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts
-f:arch/arm64/boot/dts/renesas/r8a77990.dtsi
-f:arch/arm64/boot/dts/renesas/r8a77995-draak.dts
-f:arch/arm64/boot/dts/renesas/r8a77995.dtsi
-f:arch/arm64/boot/dts/renesas/r8a779a0-falcon-cpu.dtsi
-f:arch/arm64/boot/dts/renesas/r8a779a0-falcon-csi-dsi.dtsi
-f:arch/arm64/boot/dts/renesas/r8a779a0-falcon-ethernet.dtsi
-f:arch/arm64/boot/dts/renesas/r8a779a0-falcon.dts
-f:arch/arm64/boot/dts/renesas/r8a779a0.dtsi
-f:arch/arm64/boot/dts/renesas/r8a779f0-spider-cpu.dtsi
-f:arch/arm64/boot/dts/renesas/r8a779f0-spider-ethernet.dtsi
-f:arch/arm64/boot/dts/renesas/r8a779f0-spider.dts
-f:arch/arm64/boot/dts/renesas/r8a779f0.dtsi
-f:arch/arm64/boot/dts/renesas/r8a779f4-s4sk.dts
-f:arch/arm64/boot/dts/renesas/r8a779f4.dtsi
-f:arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-cpu.dts
-f:arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-cpu.dtsi
-f:arch/arm64/boot/dts/renesas/r8a779g0-white-hawk.dts
-f:arch/arm64/boot/dts/renesas/r8a779g0.dtsi
-f:arch/arm64/boot/dts/renesas/r8a779g2-white-hawk-single.dts
-f:arch/arm64/boot/dts/renesas/r8a779g2.dtsi
-f:arch/arm64/boot/dts/renesas/r8a779g3-sparrow-hawk-fan-pwm.dtso
-f:arch/arm64/boot/dts/renesas/r8a779g3-sparrow-hawk.dts
-f:arch/arm64/boot/dts/renesas/r8a779g3-white-hawk-single.dts
-f:arch/arm64/boot/dts/renesas/r8a779g3.dtsi
-f:arch/arm64/boot/dts/renesas/r8a779h0-gray-hawk-single.dts
-f:arch/arm64/boot/dts/renesas/r8a779h0.dtsi
-f:arch/arm64/boot/dts/renesas/r8a779h2-gray-hawk-single.dts
-f:arch/arm64/boot/dts/renesas/r8a779h2.dtsi
-f:arch/arm64/boot/dts/renesas/r8a779m0.dtsi
-f:arch/arm64/boot/dts/renesas/r8a779m1-salvator-xs.dts
-f:arch/arm64/boot/dts/renesas/r8a779m1-ulcb-kf.dts
-f:arch/arm64/boot/dts/renesas/r8a779m1-ulcb.dts
-f:arch/arm64/boot/dts/renesas/r8a779m1.dtsi
-f:arch/arm64/boot/dts/renesas/r8a779m2.dtsi
-f:arch/arm64/boot/dts/renesas/r8a779m3-salvator-xs.dts
-f:arch/arm64/boot/dts/renesas/r8a779m3-ulcb-kf.dts
-f:arch/arm64/boot/dts/renesas/r8a779m3-ulcb.dts
-f:arch/arm64/boot/dts/renesas/r8a779m3.dtsi
-f:arch/arm64/boot/dts/renesas/r8a779m4.dtsi
-f:arch/arm64/boot/dts/renesas/r8a779m5-salvator-xs.dts
-f:arch/arm64/boot/dts/renesas/r8a779m5.dtsi
-f:arch/arm64/boot/dts/renesas/r8a779m6.dtsi
-f:arch/arm64/boot/dts/renesas/r8a779m7.dtsi
-f:arch/arm64/boot/dts/renesas/r8a779m8.dtsi
-f:arch/arm64/boot/dts/renesas/r8a779mb.dtsi
-f:arch/arm64/boot/dts/renesas/r9a07g043-smarc-pmod.dtso
-f:arch/arm64/boot/dts/renesas/r9a07g043.dtsi
-f:arch/arm64/boot/dts/renesas/r9a07g043u.dtsi
-f:arch/arm64/boot/dts/renesas/r9a07g043u11-smarc-cru-csi-ov5645.dtso
-f:arch/arm64/boot/dts/renesas/r9a07g043u11-smarc-du-adv7513.dtso
-f:arch/arm64/boot/dts/renesas/r9a07g043u11-smarc.dts
-f:arch/arm64/boot/dts/renesas/r9a07g044.dtsi
-f:arch/arm64/boot/dts/renesas/r9a07g044c1.dtsi
-f:arch/arm64/boot/dts/renesas/r9a07g044c2-smarc-cru-csi-ov5645.dtso
-f:arch/arm64/boot/dts/renesas/r9a07g044c2-smarc.dts
-f:arch/arm64/boot/dts/renesas/r9a07g044c2.dtsi
-f:arch/arm64/boot/dts/renesas/r9a07g044l1.dtsi
-f:arch/arm64/boot/dts/renesas/r9a07g044l2-remi-pi.dts
-f:arch/arm64/boot/dts/renesas/r9a07g044l2-smarc-cru-csi-ov5645.dtso
-f:arch/arm64/boot/dts/renesas/r9a07g044l2-smarc.dts
-f:arch/arm64/boot/dts/renesas/r9a07g044l2.dtsi
-f:arch/arm64/boot/dts/renesas/r9a07g054.dtsi
-f:arch/arm64/boot/dts/renesas/r9a07g054l1.dtsi
-f:arch/arm64/boot/dts/renesas/r9a07g054l2-smarc.dts
-f:arch/arm64/boot/dts/renesas/r9a07g054l2.dtsi
-f:arch/arm64/boot/dts/renesas/r9a08g045.dtsi
-f:arch/arm64/boot/dts/renesas/r9a08g045s33-smarc-pmod1-type-3a.dtso
-f:arch/arm64/boot/dts/renesas/r9a08g045s33-smarc.dts
-f:arch/arm64/boot/dts/renesas/r9a08g045s33.dtsi
-f:arch/arm64/boot/dts/renesas/r9a09g011-v2mevk2.dts
-f:arch/arm64/boot/dts/renesas/r9a09g011.dtsi
-f:arch/arm64/boot/dts/renesas/r9a09g047.dtsi
-f:arch/arm64/boot/dts/renesas/r9a09g047e37.dtsi
-f:arch/arm64/boot/dts/renesas/r9a09g047e57-smarc-cru-csi-ov5645.dtso
-f:arch/arm64/boot/dts/renesas/r9a09g047e57-smarc.dts
-f:arch/arm64/boot/dts/renesas/r9a09g047e57.dtsi
-f:arch/arm64/boot/dts/renesas/r9a09g056.dtsi
-f:arch/arm64/boot/dts/renesas/r9a09g056n48-rzv2n-evk.dts
-f:arch/arm64/boot/dts/renesas/r9a09g057.dtsi
-f:arch/arm64/boot/dts/renesas/r9a09g057h44-rzv2h-evk.dts
-f:arch/arm64/boot/dts/renesas/r9a09g057h48-kakip.dts
-f:arch/arm64/boot/dts/renesas/renesas-smarc2.dtsi
-f:arch/arm64/boot/dts/renesas/rz-smarc-common.dtsi
-f:arch/arm64/boot/dts/renesas/rz-smarc-cru-csi-ov5645.dtsi
-f:arch/arm64/boot/dts/renesas/rz-smarc-du-adv7513.dtsi
-f:arch/arm64/boot/dts/renesas/rzg2-advantech-idk-1110wr-panel.dtsi
-f:arch/arm64/boot/dts/renesas/rzg2l-smarc-pinfunction.dtsi
-f:arch/arm64/boot/dts/renesas/rzg2l-smarc-som.dtsi
-f:arch/arm64/boot/dts/renesas/rzg2l-smarc.dtsi
-f:arch/arm64/boot/dts/renesas/rzg2lc-smarc-pinfunction.dtsi
-f:arch/arm64/boot/dts/renesas/rzg2lc-smarc-som.dtsi
-f:arch/arm64/boot/dts/renesas/rzg2lc-smarc.dtsi
-f:arch/arm64/boot/dts/renesas/rzg2ul-smarc-pinfunction.dtsi
-f:arch/arm64/boot/dts/renesas/rzg2ul-smarc-som.dtsi
-f:arch/arm64/boot/dts/renesas/rzg2ul-smarc.dtsi
-f:arch/arm64/boot/dts/renesas/rzg3e-smarc-som.dtsi
-f:arch/arm64/boot/dts/renesas/rzg3s-smarc-som.dtsi
-f:arch/arm64/boot/dts/renesas/rzg3s-smarc-switches.h
-f:arch/arm64/boot/dts/renesas/rzg3s-smarc.dtsi
-f:arch/arm64/boot/dts/renesas/rzv2-evk-cn15-emmc.dtso
-f:arch/arm64/boot/dts/renesas/rzv2-evk-cn15-sd.dtso
-f:arch/arm64/boot/dts/renesas/salvator-common.dtsi
-f:arch/arm64/boot/dts/renesas/salvator-panel-aa104xd12.dtso
-f:arch/arm64/boot/dts/renesas/salvator-x.dtsi
-f:arch/arm64/boot/dts/renesas/salvator-xs.dtsi
-f:arch/arm64/boot/dts/renesas/ulcb-audio-graph-card-mix+split.dtsi
-f:arch/arm64/boot/dts/renesas/ulcb-audio-graph-card.dtsi
-f:arch/arm64/boot/dts/renesas/ulcb-audio-graph-card2-mix+split.dtsi
-f:arch/arm64/boot/dts/renesas/ulcb-audio-graph-card2.dtsi
-f:arch/arm64/boot/dts/renesas/ulcb-kf-audio-graph-card-mix+split.dtsi
-f:arch/arm64/boot/dts/renesas/ulcb-kf-audio-graph-card.dtsi
-f:arch/arm64/boot/dts/renesas/ulcb-kf-audio-graph-card2-mix+split.dtsi
-f:arch/arm64/boot/dts/renesas/ulcb-kf-audio-graph-card2.dtsi
-f:arch/arm64/boot/dts/renesas/ulcb-kf-simple-audio-card-mix+split.dtsi
-f:arch/arm64/boot/dts/renesas/ulcb-kf-simple-audio-card.dtsi
-f:arch/arm64/boot/dts/renesas/ulcb-kf.dtsi
-f:arch/arm64/boot/dts/renesas/ulcb-simple-audio-card-mix+split.dtsi
-f:arch/arm64/boot/dts/renesas/ulcb-simple-audio-card.dtsi
-f:arch/arm64/boot/dts/renesas/ulcb.dtsi
-f:arch/arm64/boot/dts/renesas/white-hawk-ard-audio-da7212.dtso
-f:arch/arm64/boot/dts/renesas/white-hawk-common.dtsi
-f:arch/arm64/boot/dts/renesas/white-hawk-cpu-common.dtsi
-f:arch/arm64/boot/dts/renesas/white-hawk-csi-dsi.dtsi
-f:arch/arm64/boot/dts/renesas/white-hawk-ethernet.dtsi
-f:arch/arm64/boot/dts/renesas/white-hawk-single.dtsi
-f:arch/arm64/boot/dts/rockchip/Makefile
-f:arch/arm64/boot/dts/rockchip/px30-cobra-ltk050h3146w-a2.dts
-f:arch/arm64/boot/dts/rockchip/px30-cobra-ltk050h3146w.dts
-f:arch/arm64/boot/dts/rockchip/px30-cobra-ltk050h3148w.dts
-f:arch/arm64/boot/dts/rockchip/px30-cobra-ltk500hd1829.dts
-f:arch/arm64/boot/dts/rockchip/px30-cobra.dtsi
-f:arch/arm64/boot/dts/rockchip/px30-engicam-common.dtsi
-f:arch/arm64/boot/dts/rockchip/px30-engicam-ctouch2.dtsi
-f:arch/arm64/boot/dts/rockchip/px30-engicam-edimm2.2.dtsi
-f:arch/arm64/boot/dts/rockchip/px30-engicam-px30-core-ctouch2-of10.dts
-f:arch/arm64/boot/dts/rockchip/px30-engicam-px30-core-ctouch2.dts
-f:arch/arm64/boot/dts/rockchip/px30-engicam-px30-core-edimm2.2.dts
-f:arch/arm64/boot/dts/rockchip/px30-engicam-px30-core.dtsi
-f:arch/arm64/boot/dts/rockchip/px30-evb.dts
-f:arch/arm64/boot/dts/rockchip/px30-firefly-jd4-core-mb.dts
-f:arch/arm64/boot/dts/rockchip/px30-firefly-jd4-core.dtsi
-f:arch/arm64/boot/dts/rockchip/px30-pp1516-ltk050h3146w-a2.dts
-f:arch/arm64/boot/dts/rockchip/px30-pp1516-ltk050h3148w.dts
-f:arch/arm64/boot/dts/rockchip/px30-pp1516.dtsi
-f:arch/arm64/boot/dts/rockchip/px30-ringneck-haikou-lvds-9904379.dtso
-f:arch/arm64/boot/dts/rockchip/px30-ringneck-haikou-video-demo.dtso
-f:arch/arm64/boot/dts/rockchip/px30-ringneck-haikou.dts
-f:arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi
-f:arch/arm64/boot/dts/rockchip/px30.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3308-bpi-p2-pro.dts
-f:arch/arm64/boot/dts/rockchip/rk3308-evb.dts
-f:arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts
-f:arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
-f:arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts
-f:arch/arm64/boot/dts/rockchip/rk3308-sakurapi-rk3308b.dts
-f:arch/arm64/boot/dts/rockchip/rk3308.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3318-a95x-z2.dts
-f:arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351m.dts
-f:arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351m.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3326-anbernic-rg351v.dts
-f:arch/arm64/boot/dts/rockchip/rk3326-gameforce-chi.dts
-f:arch/arm64/boot/dts/rockchip/rk3326-odroid-go.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3326-odroid-go2-v11.dts
-f:arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts
-f:arch/arm64/boot/dts/rockchip/rk3326-odroid-go3.dts
-f:arch/arm64/boot/dts/rockchip/rk3326.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3328-a1.dts
-f:arch/arm64/boot/dts/rockchip/rk3328-evb.dts
-f:arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2c-plus.dts
-f:arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2c.dts
-f:arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2c.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s-plus.dts
-f:arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
-f:arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-lts.dts
-f:arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts
-f:arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
-f:arch/arm64/boot/dts/rockchip/rk3328-roc-pc.dts
-f:arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts
-f:arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
-f:arch/arm64/boot/dts/rockchip/rk3328.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3368-evb-act8846.dts
-f:arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts
-f:arch/arm64/boot/dts/rockchip/rk3368-lba3368.dts
-f:arch/arm64/boot/dts/rockchip/rk3368-lion-haikou.dts
-f:arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts
-f:arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts
-f:arch/arm64/boot/dts/rockchip/rk3368-r88.dts
-f:arch/arm64/boot/dts/rockchip/rk3368.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3399-base.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3399-eaidk-610.dts
-f:arch/arm64/boot/dts/rockchip/rk3399-evb-ind.dts
-f:arch/arm64/boot/dts/rockchip/rk3399-evb.dts
-f:arch/arm64/boot/dts/rockchip/rk3399-ficus.dts
-f:arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
-f:arch/arm64/boot/dts/rockchip/rk3399-gru-bob.dts
-f:arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts
-f:arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-dumo.dts
-f:arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-inx.dts
-f:arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-kd.dts
-f:arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts
-f:arch/arm64/boot/dts/rockchip/rk3399-khadas-edge-captain.dts
-f:arch/arm64/boot/dts/rockchip/rk3399-khadas-edge-v.dts
-f:arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dts
-f:arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
-f:arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts
-f:arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts
-f:arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4.dts
-f:arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4b.dts
-f:arch/arm64/boot/dts/rockchip/rk3399-nanopi-neo4.dts
-f:arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s-enterprise.dts
-f:arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
-f:arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3399-op1.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts
-f:arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
-f:arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts
-f:arch/arm64/boot/dts/rockchip/rk3399-puma-haikou-video-demo.dtso
-f:arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts
-f:arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts
-f:arch/arm64/boot/dts/rockchip/rk3399-roc-pc-plus.dts
-f:arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts
-f:arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts
-f:arch/arm64/boot/dts/rockchip/rk3399-rock-4se.dts
-f:arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts
-f:arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts
-f:arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts
-f:arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts
-f:arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts
-f:arch/arm64/boot/dts/rockchip/rk3399-rock960.dts
-f:arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3399-rockpro64-screen.dtso
-f:arch/arm64/boot/dts/rockchip/rk3399-rockpro64-v2.dts
-f:arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
-f:arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3399-s.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts
-f:arch/arm64/boot/dts/rockchip/rk3399-sapphire.dts
-f:arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3399-t.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3399.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3399pro-rock-pi-n10.dts
-f:arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3528-pinctrl.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3528-radxa-e20c.dts
-f:arch/arm64/boot/dts/rockchip/rk3528.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3562-evb2-v10.dts
-f:arch/arm64/boot/dts/rockchip/rk3562-pinctrl.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3562.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg-arc-d.dts
-f:arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg-arc-s.dts
-f:arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg-arc.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353p.dts
-f:arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353ps.dts
-f:arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353v.dts
-f:arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353vs.dts
-f:arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353x.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg503.dts
-f:arch/arm64/boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3566-base.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3566-bigtreetech-cb2-manta.dts
-f:arch/arm64/boot/dts/rockchip/rk3566-bigtreetech-cb2.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3566-bigtreetech-pi2.dts
-f:arch/arm64/boot/dts/rockchip/rk3566-box-demo.dts
-f:arch/arm64/boot/dts/rockchip/rk3566-lckfb-tspi.dts
-f:arch/arm64/boot/dts/rockchip/rk3566-lubancat-1.dts
-f:arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts
-f:arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts
-f:arch/arm64/boot/dts/rockchip/rk3566-orangepi-3b-v1.1.dts
-f:arch/arm64/boot/dts/rockchip/rk3566-orangepi-3b-v2.1.dts
-f:arch/arm64/boot/dts/rockchip/rk3566-orangepi-3b.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3566-pinenote-v1.1.dts
-f:arch/arm64/boot/dts/rockchip/rk3566-pinenote-v1.2.dts
-f:arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3566-pinetab2-v0.1.dts
-f:arch/arm64/boot/dts/rockchip/rk3566-pinetab2-v2.0.dts
-f:arch/arm64/boot/dts/rockchip/rk3566-pinetab2.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3566-powkiddy-rgb10max3.dts
-f:arch/arm64/boot/dts/rockchip/rk3566-powkiddy-rgb20sx.dts
-f:arch/arm64/boot/dts/rockchip/rk3566-powkiddy-rgb30.dts
-f:arch/arm64/boot/dts/rockchip/rk3566-powkiddy-rk2023.dts
-f:arch/arm64/boot/dts/rockchip/rk3566-powkiddy-rk2023.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3566-powkiddy-x55.dts
-f:arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
-f:arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts
-f:arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3-io.dts
-f:arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3e.dts
-f:arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3w.dts
-f:arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts
-f:arch/arm64/boot/dts/rockchip/rk3566-rock-3c.dts
-f:arch/arm64/boot/dts/rockchip/rk3566-soquartz-blade.dts
-f:arch/arm64/boot/dts/rockchip/rk3566-soquartz-cm4.dts
-f:arch/arm64/boot/dts/rockchip/rk3566-soquartz-model-a.dts
-f:arch/arm64/boot/dts/rockchip/rk3566-soquartz.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3566.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3566t.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
-f:arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts
-f:arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dts
-f:arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r68s.dts
-f:arch/arm64/boot/dts/rockchip/rk3568-lubancat-2.dts
-f:arch/arm64/boot/dts/rockchip/rk3568-mecsbc.dts
-f:arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5c.dts
-f:arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts
-f:arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
-f:arch/arm64/boot/dts/rockchip/rk3568-photonicat.dts
-f:arch/arm64/boot/dts/rockchip/rk3568-pinctrl.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts
-f:arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
-f:arch/arm64/boot/dts/rockchip/rk3568-roc-pc.dts
-f:arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
-f:arch/arm64/boot/dts/rockchip/rk3568-rock-3b.dts
-f:arch/arm64/boot/dts/rockchip/rk3568-wolfvision-pf5-display-vz.dtso
-f:arch/arm64/boot/dts/rockchip/rk3568-wolfvision-pf5-display.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3568-wolfvision-pf5-io-expander.dtso
-f:arch/arm64/boot/dts/rockchip/rk3568-wolfvision-pf5.dts
-f:arch/arm64/boot/dts/rockchip/rk3568.dtsi
-f:arch/arm64/boot/dts/rockchip/rk356x-base.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3576-armsom-sige5-v1.2-wifibt.dtso
-f:arch/arm64/boot/dts/rockchip/rk3576-armsom-sige5.dts
-f:arch/arm64/boot/dts/rockchip/rk3576-evb1-v10.dts
-f:arch/arm64/boot/dts/rockchip/rk3576-luckfox-core3576.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3576-luckfox-omni3576.dts
-f:arch/arm64/boot/dts/rockchip/rk3576-nanopi-m5.dts
-f:arch/arm64/boot/dts/rockchip/rk3576-pinctrl.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3576-roc-pc.dts
-f:arch/arm64/boot/dts/rockchip/rk3576-rock-4d.dts
-f:arch/arm64/boot/dts/rockchip/rk3576.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3582-radxa-e52c.dts
-f:arch/arm64/boot/dts/rockchip/rk3588-armsom-lm7.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts
-f:arch/arm64/boot/dts/rockchip/rk3588-armsom-w3.dts
-f:arch/arm64/boot/dts/rockchip/rk3588-base-pinctrl.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts
-f:arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-genbook.dts
-f:arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-common.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-io.dts
-f:arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-io.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-wifi.dtso
-f:arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6b-io.dts
-f:arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6b.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts
-f:arch/arm64/boot/dts/rockchip/rk3588-evb2-v10.dts
-f:arch/arm64/boot/dts/rockchip/rk3588-extra-pinctrl.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3588-fet3588-c.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3588-firefly-core-3588j.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3588-firefly-icore-3588q.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3588-firefly-itx-3588j.dts
-f:arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts
-f:arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3588-h96-max-v58.dts
-f:arch/arm64/boot/dts/rockchip/rk3588-jaguar-ethernet-switch.dtso
-f:arch/arm64/boot/dts/rockchip/rk3588-jaguar-pre-ict-tester.dtso
-f:arch/arm64/boot/dts/rockchip/rk3588-jaguar.dts
-f:arch/arm64/boot/dts/rockchip/rk3588-mnt-reform2.dts
-f:arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6-lts.dts
-f:arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
-f:arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3588-ok3588-c.dts
-f:arch/arm64/boot/dts/rockchip/rk3588-opp.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-compact.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-max.dts
-f:arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts
-f:arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-ultra.dts
-f:arch/arm64/boot/dts/rockchip/rk3588-orangepi-5.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3588-quartzpro64.dts
-f:arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts
-f:arch/arm64/boot/dts/rockchip/rk3588-rock-5b-5bp-5t.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3588-rock-5b-pcie-ep.dtso
-f:arch/arm64/boot/dts/rockchip/rk3588-rock-5b-pcie-srns.dtso
-f:arch/arm64/boot/dts/rockchip/rk3588-rock-5b-plus.dts
-f:arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
-f:arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3588-rock-5t.dts
-f:arch/arm64/boot/dts/rockchip/rk3588-tiger-haikou-video-demo.dtso
-f:arch/arm64/boot/dts/rockchip/rk3588-tiger-haikou.dts
-f:arch/arm64/boot/dts/rockchip/rk3588-tiger.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3588-toybrick-x0.dts
-f:arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dts
-f:arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3588.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3588j.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts
-f:arch/arm64/boot/dts/rockchip/rk3588s-evb1-v10.dts
-f:arch/arm64/boot/dts/rockchip/rk3588s-gameforce-ace.dts
-f:arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts
-f:arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts
-f:arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6c.dts
-f:arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6s.dts
-f:arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts
-f:arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts
-f:arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dtsi
-f:arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5b.dts
-f:arch/arm64/boot/dts/rockchip/rk3588s-roc-pc.dts
-f:arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
-f:arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts
-f:arch/arm64/boot/dts/rockchip/rk3588s.dtsi
-f:arch/arm64/boot/dts/rockchip/rk8xx.h
-f:arch/arm64/boot/dts/rockchip/rockchip-pinconf.dtsi
-f:arch/arm64/boot/dts/socionext/Makefile
-f:arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts
-f:arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts
-f:arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi
-f:arch/arm64/boot/dts/socionext/uniphier-ld20-akebi96.dts
-f:arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts
-f:arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts
-f:arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
-f:arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi
-f:arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget0.dts
-f:arch/arm64/boot/dts/socionext/uniphier-pxs3-ref-gadget1.dts
-f:arch/arm64/boot/dts/socionext/uniphier-pxs3-ref.dts
-f:arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi
-f:arch/arm64/boot/dts/socionext/uniphier-ref-daughter.dtsi
-f:arch/arm64/boot/dts/socionext/uniphier-support-card.dtsi
-f:arch/arm64/boot/dts/sophgo/Makefile
-f:arch/arm64/boot/dts/sophgo/sg2000-milkv-duo-module-01-evb.dts
-f:arch/arm64/boot/dts/sophgo/sg2000-milkv-duo-module-01.dtsi
-f:arch/arm64/boot/dts/sophgo/sg2000.dtsi
-f:arch/arm64/boot/dts/sprd/Makefile
-f:arch/arm64/boot/dts/sprd/sc2731.dtsi
-f:arch/arm64/boot/dts/sprd/sc9836-openphone.dts
-f:arch/arm64/boot/dts/sprd/sc9836.dtsi
-f:arch/arm64/boot/dts/sprd/sc9860.dtsi
-f:arch/arm64/boot/dts/sprd/sc9863a.dtsi
-f:arch/arm64/boot/dts/sprd/sharkl3.dtsi
-f:arch/arm64/boot/dts/sprd/sharkl64.dtsi
-f:arch/arm64/boot/dts/sprd/sp9860g-1h10.dts
-f:arch/arm64/boot/dts/sprd/sp9863a-1h10.dts
-f:arch/arm64/boot/dts/sprd/ums512-1h10.dts
-f:arch/arm64/boot/dts/sprd/ums512.dtsi
-f:arch/arm64/boot/dts/sprd/ums9620-2h10.dts
-f:arch/arm64/boot/dts/sprd/ums9620.dtsi
-f:arch/arm64/boot/dts/sprd/whale2.dtsi
-f:arch/arm64/boot/dts/st/Makefile
-f:arch/arm64/boot/dts/st/stm32mp211.dtsi
-f:arch/arm64/boot/dts/st/stm32mp213.dtsi
-f:arch/arm64/boot/dts/st/stm32mp215.dtsi
-f:arch/arm64/boot/dts/st/stm32mp215f-dk.dts
-f:arch/arm64/boot/dts/st/stm32mp21xc.dtsi
-f:arch/arm64/boot/dts/st/stm32mp21xf.dtsi
-f:arch/arm64/boot/dts/st/stm32mp231.dtsi
-f:arch/arm64/boot/dts/st/stm32mp233.dtsi
-f:arch/arm64/boot/dts/st/stm32mp235.dtsi
-f:arch/arm64/boot/dts/st/stm32mp235f-dk.dts
-f:arch/arm64/boot/dts/st/stm32mp23xc.dtsi
-f:arch/arm64/boot/dts/st/stm32mp23xf.dtsi
-f:arch/arm64/boot/dts/st/stm32mp25-pinctrl.dtsi
-f:arch/arm64/boot/dts/st/stm32mp251.dtsi
-f:arch/arm64/boot/dts/st/stm32mp253.dtsi
-f:arch/arm64/boot/dts/st/stm32mp255.dtsi
-f:arch/arm64/boot/dts/st/stm32mp257.dtsi
-f:arch/arm64/boot/dts/st/stm32mp257f-dk.dts
-f:arch/arm64/boot/dts/st/stm32mp257f-ev1.dts
-f:arch/arm64/boot/dts/st/stm32mp25xc.dtsi
-f:arch/arm64/boot/dts/st/stm32mp25xf.dtsi
-f:arch/arm64/boot/dts/st/stm32mp25xxai-pinctrl.dtsi
-f:arch/arm64/boot/dts/st/stm32mp25xxak-pinctrl.dtsi
-f:arch/arm64/boot/dts/st/stm32mp25xxal-pinctrl.dtsi
-f:arch/arm64/boot/dts/synaptics/Makefile
-f:arch/arm64/boot/dts/synaptics/berlin4ct-dmp.dts
-f:arch/arm64/boot/dts/synaptics/berlin4ct-stb.dts
-f:arch/arm64/boot/dts/synaptics/berlin4ct.dtsi
-f:arch/arm64/boot/dts/tesla/Makefile
-f:arch/arm64/boot/dts/tesla/fsd-evb.dts
-f:arch/arm64/boot/dts/tesla/fsd-pinctrl.dtsi
-f:arch/arm64/boot/dts/tesla/fsd-pinctrl.h
-f:arch/arm64/boot/dts/tesla/fsd.dtsi
-f:arch/arm64/boot/dts/ti/Makefile
-f:arch/arm64/boot/dts/ti/k3-am62-lp-sk-nand.dtso
-f:arch/arm64/boot/dts/ti/k3-am62-lp-sk.dts
-f:arch/arm64/boot/dts/ti/k3-am62-main.dtsi
-f:arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi
-f:arch/arm64/boot/dts/ti/k3-am62-phycore-som.dtsi
-f:arch/arm64/boot/dts/ti/k3-am62-pocketbeagle2.dts
-f:arch/arm64/boot/dts/ti/k3-am62-thermal.dtsi
-f:arch/arm64/boot/dts/ti/k3-am62-verdin-dahlia.dtsi
-f:arch/arm64/boot/dts/ti/k3-am62-verdin-dev.dtsi
-f:arch/arm64/boot/dts/ti/k3-am62-verdin-ivy.dtsi
-f:arch/arm64/boot/dts/ti/k3-am62-verdin-mallow.dtsi
-f:arch/arm64/boot/dts/ti/k3-am62-verdin-nonwifi.dtsi
-f:arch/arm64/boot/dts/ti/k3-am62-verdin-wifi.dtsi
-f:arch/arm64/boot/dts/ti/k3-am62-verdin-yavia.dtsi
-f:arch/arm64/boot/dts/ti/k3-am62-verdin.dtsi
-f:arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi
-f:arch/arm64/boot/dts/ti/k3-am62.dtsi
-f:arch/arm64/boot/dts/ti/k3-am625-beagleplay-csi2-ov5640.dtso
-f:arch/arm64/boot/dts/ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtso
-f:arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts
-f:arch/arm64/boot/dts/ti/k3-am625-phyboard-lyra-rdk.dts
-f:arch/arm64/boot/dts/ti/k3-am625-sk.dts
-f:arch/arm64/boot/dts/ti/k3-am625-verdin-nonwifi-dahlia.dts
-f:arch/arm64/boot/dts/ti/k3-am625-verdin-nonwifi-dev.dts
-f:arch/arm64/boot/dts/ti/k3-am625-verdin-nonwifi-ivy.dts
-f:arch/arm64/boot/dts/ti/k3-am625-verdin-nonwifi-mallow.dts
-f:arch/arm64/boot/dts/ti/k3-am625-verdin-nonwifi-yavia.dts
-f:arch/arm64/boot/dts/ti/k3-am625-verdin-wifi-dahlia.dts
-f:arch/arm64/boot/dts/ti/k3-am625-verdin-wifi-dev.dts
-f:arch/arm64/boot/dts/ti/k3-am625-verdin-wifi-ivy.dts
-f:arch/arm64/boot/dts/ti/k3-am625-verdin-wifi-mallow.dts
-f:arch/arm64/boot/dts/ti/k3-am625-verdin-wifi-yavia.dts
-f:arch/arm64/boot/dts/ti/k3-am625.dtsi
-f:arch/arm64/boot/dts/ti/k3-am62a-main.dtsi
-f:arch/arm64/boot/dts/ti/k3-am62a-mcu.dtsi
-f:arch/arm64/boot/dts/ti/k3-am62a-phycore-som.dtsi
-f:arch/arm64/boot/dts/ti/k3-am62a-thermal.dtsi
-f:arch/arm64/boot/dts/ti/k3-am62a-wakeup.dtsi
-f:arch/arm64/boot/dts/ti/k3-am62a.dtsi
-f:arch/arm64/boot/dts/ti/k3-am62a7-phyboard-lyra-rdk.dts
-f:arch/arm64/boot/dts/ti/k3-am62a7-sk.dts
-f:arch/arm64/boot/dts/ti/k3-am62a7.dtsi
-f:arch/arm64/boot/dts/ti/k3-am62d2-evm.dts
-f:arch/arm64/boot/dts/ti/k3-am62d2.dtsi
-f:arch/arm64/boot/dts/ti/k3-am62p-j722s-common-main.dtsi
-f:arch/arm64/boot/dts/ti/k3-am62p-j722s-common-mcu.dtsi
-f:arch/arm64/boot/dts/ti/k3-am62p-j722s-common-thermal.dtsi
-f:arch/arm64/boot/dts/ti/k3-am62p-j722s-common-wakeup.dtsi
-f:arch/arm64/boot/dts/ti/k3-am62p-main.dtsi
-f:arch/arm64/boot/dts/ti/k3-am62p-verdin-dahlia.dtsi
-f:arch/arm64/boot/dts/ti/k3-am62p-verdin-dev.dtsi
-f:arch/arm64/boot/dts/ti/k3-am62p-verdin-ivy.dtsi
-f:arch/arm64/boot/dts/ti/k3-am62p-verdin-mallow.dtsi
-f:arch/arm64/boot/dts/ti/k3-am62p-verdin-nonwifi.dtsi
-f:arch/arm64/boot/dts/ti/k3-am62p-verdin-wifi.dtsi
-f:arch/arm64/boot/dts/ti/k3-am62p-verdin-yavia.dtsi
-f:arch/arm64/boot/dts/ti/k3-am62p-verdin.dtsi
-f:arch/arm64/boot/dts/ti/k3-am62p.dtsi
-f:arch/arm64/boot/dts/ti/k3-am62p5-sk.dts
-f:arch/arm64/boot/dts/ti/k3-am62p5-verdin-nonwifi-dahlia.dts
-f:arch/arm64/boot/dts/ti/k3-am62p5-verdin-nonwifi-dev.dts
-f:arch/arm64/boot/dts/ti/k3-am62p5-verdin-nonwifi-ivy.dts
-f:arch/arm64/boot/dts/ti/k3-am62p5-verdin-nonwifi-mallow.dts
-f:arch/arm64/boot/dts/ti/k3-am62p5-verdin-nonwifi-yavia.dts
-f:arch/arm64/boot/dts/ti/k3-am62p5-verdin-wifi-dahlia.dts
-f:arch/arm64/boot/dts/ti/k3-am62p5-verdin-wifi-dev.dts
-f:arch/arm64/boot/dts/ti/k3-am62p5-verdin-wifi-ivy.dts
-f:arch/arm64/boot/dts/ti/k3-am62p5-verdin-wifi-mallow.dts
-f:arch/arm64/boot/dts/ti/k3-am62p5-verdin-wifi-yavia.dts
-f:arch/arm64/boot/dts/ti/k3-am62p5.dtsi
-f:arch/arm64/boot/dts/ti/k3-am62x-phyboard-lyra-gpio-fan.dtso
-f:arch/arm64/boot/dts/ti/k3-am62x-phyboard-lyra.dtsi
-f:arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi
-f:arch/arm64/boot/dts/ti/k3-am62x-sk-csi2-imx219.dtso
-f:arch/arm64/boot/dts/ti/k3-am62x-sk-csi2-ov5640.dtso
-f:arch/arm64/boot/dts/ti/k3-am62x-sk-csi2-tevi-ov5640.dtso
-f:arch/arm64/boot/dts/ti/k3-am62x-sk-hdmi-audio.dtso
-f:arch/arm64/boot/dts/ti/k3-am64-main.dtsi
-f:arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi
-f:arch/arm64/boot/dts/ti/k3-am64-phycore-som.dtsi
-f:arch/arm64/boot/dts/ti/k3-am64-thermal.dtsi
-f:arch/arm64/boot/dts/ti/k3-am64-tqma64xxl-mbax4xxl-sdcard.dtso
-f:arch/arm64/boot/dts/ti/k3-am64-tqma64xxl-mbax4xxl-wlan.dtso
-f:arch/arm64/boot/dts/ti/k3-am64.dtsi
-f:arch/arm64/boot/dts/ti/k3-am642-evm-icssg1-dualemac-mii.dtso
-f:arch/arm64/boot/dts/ti/k3-am642-evm-icssg1-dualemac.dtso
-f:arch/arm64/boot/dts/ti/k3-am642-evm-nand.dtso
-f:arch/arm64/boot/dts/ti/k3-am642-evm-pcie0-ep.dtso
-f:arch/arm64/boot/dts/ti/k3-am642-evm.dts
-f:arch/arm64/boot/dts/ti/k3-am642-hummingboard-t-pcie.dts
-f:arch/arm64/boot/dts/ti/k3-am642-hummingboard-t-usb3.dts
-f:arch/arm64/boot/dts/ti/k3-am642-hummingboard-t.dts
-f:arch/arm64/boot/dts/ti/k3-am642-phyboard-electra-gpio-fan.dtso
-f:arch/arm64/boot/dts/ti/k3-am642-phyboard-electra-pcie-usb2.dtso
-f:arch/arm64/boot/dts/ti/k3-am642-phyboard-electra-rdk.dts
-f:arch/arm64/boot/dts/ti/k3-am642-phyboard-electra-x27-gpio1-spi1-uart3.dtso
-f:arch/arm64/boot/dts/ti/k3-am642-sk.dts
-f:arch/arm64/boot/dts/ti/k3-am642-sr-som.dtsi
-f:arch/arm64/boot/dts/ti/k3-am642-tqma64xxl-mbax4xxl.dts
-f:arch/arm64/boot/dts/ti/k3-am642-tqma64xxl.dtsi
-f:arch/arm64/boot/dts/ti/k3-am642.dtsi
-f:arch/arm64/boot/dts/ti/k3-am65-iot2050-arduino-connector.dtsi
-f:arch/arm64/boot/dts/ti/k3-am65-iot2050-common-pg1.dtsi
-f:arch/arm64/boot/dts/ti/k3-am65-iot2050-common-pg2.dtsi
-f:arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi
-f:arch/arm64/boot/dts/ti/k3-am65-iot2050-dp.dtsi
-f:arch/arm64/boot/dts/ti/k3-am65-iot2050-usb3.dtsi
-f:arch/arm64/boot/dts/ti/k3-am65-main.dtsi
-f:arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi
-f:arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
-f:arch/arm64/boot/dts/ti/k3-am65.dtsi
-f:arch/arm64/boot/dts/ti/k3-am652.dtsi
-f:arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic-common.dtsi
-f:arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic-pg2.dts
-f:arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic.dts
-f:arch/arm64/boot/dts/ti/k3-am654-base-board-rocktech-rk101-panel.dtso
-f:arch/arm64/boot/dts/ti/k3-am654-base-board.dts
-f:arch/arm64/boot/dts/ti/k3-am654-icssg2.dtso
-f:arch/arm64/boot/dts/ti/k3-am654-idk.dtso
-f:arch/arm64/boot/dts/ti/k3-am654-industrial-thermal.dtsi
-f:arch/arm64/boot/dts/ti/k3-am654-pcie-usb2.dtso
-f:arch/arm64/boot/dts/ti/k3-am654-pcie-usb3.dtso
-f:arch/arm64/boot/dts/ti/k3-am654.dtsi
-f:arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-common.dtsi
-f:arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-m2-bkey-ekey-pcie.dtso
-f:arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-m2-bkey-usb3.dtso
-f:arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-m2.dts
-f:arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-pg2.dts
-f:arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-sm.dts
-f:arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced.dts
-f:arch/arm64/boot/dts/ti/k3-am67a-beagley-ai.dts
-f:arch/arm64/boot/dts/ti/k3-am68-phyboard-izar.dts
-f:arch/arm64/boot/dts/ti/k3-am68-phycore-som.dtsi
-f:arch/arm64/boot/dts/ti/k3-am68-sk-base-board-pcie1-ep.dtso
-f:arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts
-f:arch/arm64/boot/dts/ti/k3-am68-sk-som.dtsi
-f:arch/arm64/boot/dts/ti/k3-am69-sk-pcie0-ep.dtso
-f:arch/arm64/boot/dts/ti/k3-am69-sk.dts
-f:arch/arm64/boot/dts/ti/k3-am6xx-phycore-disable-eth-phy.dtso
-f:arch/arm64/boot/dts/ti/k3-am6xx-phycore-disable-rtc.dtso
-f:arch/arm64/boot/dts/ti/k3-am6xx-phycore-disable-spi-nor.dtso
-f:arch/arm64/boot/dts/ti/k3-am6xx-phycore-qspi-nor.dtso
-f:arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts
-f:arch/arm64/boot/dts/ti/k3-j7200-evm-pcie1-ep.dtso
-f:arch/arm64/boot/dts/ti/k3-j7200-evm-quad-port-eth-exp.dtso
-f:arch/arm64/boot/dts/ti/k3-j7200-main.dtsi
-f:arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi
-f:arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi
-f:arch/arm64/boot/dts/ti/k3-j7200-thermal.dtsi
-f:arch/arm64/boot/dts/ti/k3-j7200.dtsi
-f:arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts
-f:arch/arm64/boot/dts/ti/k3-j721e-common-proc-board-infotainment.dtso
-f:arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
-f:arch/arm64/boot/dts/ti/k3-j721e-evm-gesi-exp-board.dtso
-f:arch/arm64/boot/dts/ti/k3-j721e-evm-pcie0-ep.dtso
-f:arch/arm64/boot/dts/ti/k3-j721e-evm-pcie1-ep.dtso
-f:arch/arm64/boot/dts/ti/k3-j721e-evm-quad-port-eth-exp.dtso
-f:arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
-f:arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
-f:arch/arm64/boot/dts/ti/k3-j721e-sk-csi2-dual-imx219.dtso
-f:arch/arm64/boot/dts/ti/k3-j721e-sk.dts
-f:arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi
-f:arch/arm64/boot/dts/ti/k3-j721e-thermal.dtsi
-f:arch/arm64/boot/dts/ti/k3-j721e.dtsi
-f:arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts
-f:arch/arm64/boot/dts/ti/k3-j721s2-evm-gesi-exp-board.dtso
-f:arch/arm64/boot/dts/ti/k3-j721s2-evm-pcie1-ep.dtso
-f:arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi
-f:arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi
-f:arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi
-f:arch/arm64/boot/dts/ti/k3-j721s2-thermal.dtsi
-f:arch/arm64/boot/dts/ti/k3-j721s2.dtsi
-f:arch/arm64/boot/dts/ti/k3-j722s-evm-csi2-quad-rpi-cam-imx219.dtso
-f:arch/arm64/boot/dts/ti/k3-j722s-evm-csi2-quad-tevi-ov5640.dtso
-f:arch/arm64/boot/dts/ti/k3-j722s-evm.dts
-f:arch/arm64/boot/dts/ti/k3-j722s-main.dtsi
-f:arch/arm64/boot/dts/ti/k3-j722s.dtsi
-f:arch/arm64/boot/dts/ti/k3-j742s2-evm.dts
-f:arch/arm64/boot/dts/ti/k3-j742s2-main.dtsi
-f:arch/arm64/boot/dts/ti/k3-j742s2.dtsi
-f:arch/arm64/boot/dts/ti/k3-j784s4-evm-pcie0-pcie1-ep.dtso
-f:arch/arm64/boot/dts/ti/k3-j784s4-evm-quad-port-eth-exp1.dtso
-f:arch/arm64/boot/dts/ti/k3-j784s4-evm-usxgmii-exp1-exp2.dtso
-f:arch/arm64/boot/dts/ti/k3-j784s4-evm.dts
-f:arch/arm64/boot/dts/ti/k3-j784s4-j742s2-common.dtsi
-f:arch/arm64/boot/dts/ti/k3-j784s4-j742s2-evm-common.dtsi
-f:arch/arm64/boot/dts/ti/k3-j784s4-j742s2-evm-usb0-type-a.dtso
-f:arch/arm64/boot/dts/ti/k3-j784s4-j742s2-main-common.dtsi
-f:arch/arm64/boot/dts/ti/k3-j784s4-j742s2-mcu-wakeup-common.dtsi
-f:arch/arm64/boot/dts/ti/k3-j784s4-j742s2-thermal-common.dtsi
-f:arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi
-f:arch/arm64/boot/dts/ti/k3-j784s4.dtsi
-f:arch/arm64/boot/dts/ti/k3-pinctrl.h
-f:arch/arm64/boot/dts/ti/k3-serdes.h
-f:arch/arm64/boot/dts/toshiba/Makefile
-f:arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
-f:arch/arm64/boot/dts/toshiba/tmpv7708-visrobo-vrb.dts
-f:arch/arm64/boot/dts/toshiba/tmpv7708-visrobo-vrc.dtsi
-f:arch/arm64/boot/dts/toshiba/tmpv7708.dtsi
-f:arch/arm64/boot/dts/toshiba/tmpv7708_pins.dtsi
-f:arch/arm64/boot/dts/xilinx/Makefile
-f:arch/arm64/boot/dts/xilinx/avnet-ultra96-rev1.dts
-f:arch/arm64/boot/dts/xilinx/versal-net-clk.dtsi
-f:arch/arm64/boot/dts/xilinx/versal-net-vn-x-b2197-01-revA.dts
-f:arch/arm64/boot/dts/xilinx/versal-net.dtsi
-f:arch/arm64/boot/dts/xilinx/xlnx-zynqmp-clk.h
-f:arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi
-f:arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revA.dtso
-f:arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revB.dtso
-f:arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts
-f:arch/arm64/boot/dts/xilinx/zynqmp-smk-k26-revA.dts
-f:arch/arm64/boot/dts/xilinx/zynqmp-zc1232-revA.dts
-f:arch/arm64/boot/dts/xilinx/zynqmp-zc1254-revA.dts
-f:arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts
-f:arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts
-f:arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm017-dc3.dts
-f:arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm018-dc4.dts
-f:arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm019-dc5.dts
-f:arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts
-f:arch/arm64/boot/dts/xilinx/zynqmp-zcu102-rev1.0.dts
-f:arch/arm64/boot/dts/xilinx/zynqmp-zcu102-rev1.1.dts
-f:arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts
-f:arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revB.dts
-f:arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts
-f:arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts
-f:arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts
-f:arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts
-f:arch/arm64/boot/dts/xilinx/zynqmp-zcu1275-revA.dts
-f:arch/arm64/boot/dts/xilinx/zynqmp.dtsi
-f:arch/arm64/boot/install.sh
-f:arch/arm64/configs/defconfig
-f:arch/arm64/configs/hardening.config
-f:arch/arm64/configs/virt.config
-f:arch/arm64/crypto/.gitignore
-f:arch/arm64/crypto/Kconfig
-f:arch/arm64/crypto/Makefile
-f:arch/arm64/crypto/aes-ce-ccm-core.S
-f:arch/arm64/crypto/aes-ce-ccm-glue.c
-f:arch/arm64/crypto/aes-ce-core.S
-f:arch/arm64/crypto/aes-ce-glue.c
-f:arch/arm64/crypto/aes-ce-setkey.h
-f:arch/arm64/crypto/aes-ce.S
-f:arch/arm64/crypto/aes-cipher-core.S
-f:arch/arm64/crypto/aes-cipher-glue.c
-f:arch/arm64/crypto/aes-glue-ce.c
-f:arch/arm64/crypto/aes-glue-neon.c
-f:arch/arm64/crypto/aes-glue.c
-f:arch/arm64/crypto/aes-modes.S
-f:arch/arm64/crypto/aes-neon.S
-f:arch/arm64/crypto/aes-neonbs-core.S
-f:arch/arm64/crypto/aes-neonbs-glue.c
-f:arch/arm64/crypto/ghash-ce-core.S
-f:arch/arm64/crypto/ghash-ce-glue.c
-f:arch/arm64/crypto/nh-neon-core.S
-f:arch/arm64/crypto/nhpoly1305-neon-glue.c
-f:arch/arm64/crypto/polyval-ce-core.S
-f:arch/arm64/crypto/polyval-ce-glue.c
-f:arch/arm64/crypto/sha3-ce-core.S
-f:arch/arm64/crypto/sha3-ce-glue.c
-f:arch/arm64/crypto/sm3-ce-core.S
-f:arch/arm64/crypto/sm3-ce-glue.c
-f:arch/arm64/crypto/sm3-neon-core.S
-f:arch/arm64/crypto/sm3-neon-glue.c
-f:arch/arm64/crypto/sm4-ce-asm.h
-f:arch/arm64/crypto/sm4-ce-ccm-core.S
-f:arch/arm64/crypto/sm4-ce-ccm-glue.c
-f:arch/arm64/crypto/sm4-ce-cipher-core.S
-f:arch/arm64/crypto/sm4-ce-cipher-glue.c
-f:arch/arm64/crypto/sm4-ce-core.S
-f:arch/arm64/crypto/sm4-ce-gcm-core.S
-f:arch/arm64/crypto/sm4-ce-gcm-glue.c
-f:arch/arm64/crypto/sm4-ce-glue.c
-f:arch/arm64/crypto/sm4-ce.h
-f:arch/arm64/crypto/sm4-neon-core.S
-f:arch/arm64/crypto/sm4-neon-glue.c
-f:arch/arm64/hyperv/Makefile
-f:arch/arm64/hyperv/hv_core.c
-f:arch/arm64/hyperv/mshyperv.c
-f:arch/arm64/include/asm/Kbuild
-f:arch/arm64/include/asm/acenv.h
-f:arch/arm64/include/asm/acpi.h
-f:arch/arm64/include/asm/alternative-macros.h
-f:arch/arm64/include/asm/alternative.h
-f:arch/arm64/include/asm/apple_m1_pmu.h
-f:arch/arm64/include/asm/arch_gicv3.h
-f:arch/arm64/include/asm/arch_timer.h
-f:arch/arm64/include/asm/archrandom.h
-f:arch/arm64/include/asm/arm-cci.h
-f:arch/arm64/include/asm/arm_dsu_pmu.h
-f:arch/arm64/include/asm/arm_pmuv3.h
-f:arch/arm64/include/asm/asm-bug.h
-f:arch/arm64/include/asm/asm-extable.h
-f:arch/arm64/include/asm/asm-offsets.h
-f:arch/arm64/include/asm/asm-prototypes.h
-f:arch/arm64/include/asm/asm-uaccess.h
-f:arch/arm64/include/asm/asm_pointer_auth.h
-f:arch/arm64/include/asm/assembler.h
-f:arch/arm64/include/asm/atomic.h
-f:arch/arm64/include/asm/atomic_ll_sc.h
-f:arch/arm64/include/asm/atomic_lse.h
-f:arch/arm64/include/asm/barrier.h
-f:arch/arm64/include/asm/bitops.h
-f:arch/arm64/include/asm/bitrev.h
-f:arch/arm64/include/asm/boot.h
-f:arch/arm64/include/asm/brk-imm.h
-f:arch/arm64/include/asm/bug.h
-f:arch/arm64/include/asm/cache.h
-f:arch/arm64/include/asm/cacheflush.h
-f:arch/arm64/include/asm/checksum.h
-f:arch/arm64/include/asm/clocksource.h
-f:arch/arm64/include/asm/cmpxchg.h
-f:arch/arm64/include/asm/compat.h
-f:arch/arm64/include/asm/compiler.h
-f:arch/arm64/include/asm/cpu.h
-f:arch/arm64/include/asm/cpu_ops.h
-f:arch/arm64/include/asm/cpucaps.h
-f:arch/arm64/include/asm/cpufeature.h
-f:arch/arm64/include/asm/cpuidle.h
-f:arch/arm64/include/asm/cputype.h
-f:arch/arm64/include/asm/crash_reserve.h
-f:arch/arm64/include/asm/current.h
-f:arch/arm64/include/asm/daifflags.h
-f:arch/arm64/include/asm/dcc.h
-f:arch/arm64/include/asm/debug-monitors.h
-f:arch/arm64/include/asm/device.h
-f:arch/arm64/include/asm/dmi.h
-f:arch/arm64/include/asm/efi.h
-f:arch/arm64/include/asm/el2_setup.h
-f:arch/arm64/include/asm/elf.h
-f:arch/arm64/include/asm/esr.h
-f:arch/arm64/include/asm/exception.h
-f:arch/arm64/include/asm/exec.h
-f:arch/arm64/include/asm/extable.h
-f:arch/arm64/include/asm/fixmap.h
-f:arch/arm64/include/asm/fpsimd.h
-f:arch/arm64/include/asm/fpsimdmacros.h
-f:arch/arm64/include/asm/fpu.h
-f:arch/arm64/include/asm/ftrace.h
-f:arch/arm64/include/asm/futex.h
-f:arch/arm64/include/asm/gcs.h
-f:arch/arm64/include/asm/gpr-num.h
-f:arch/arm64/include/asm/hardirq.h
-f:arch/arm64/include/asm/hugetlb.h
-f:arch/arm64/include/asm/hw_breakpoint.h
-f:arch/arm64/include/asm/hwcap.h
-f:arch/arm64/include/asm/hyp_image.h
-f:arch/arm64/include/asm/hypervisor.h
-f:arch/arm64/include/asm/image.h
-f:arch/arm64/include/asm/insn-def.h
-f:arch/arm64/include/asm/insn.h
-f:arch/arm64/include/asm/io.h
-f:arch/arm64/include/asm/irq.h
-f:arch/arm64/include/asm/irq_work.h
-f:arch/arm64/include/asm/irqflags.h
-f:arch/arm64/include/asm/jump_label.h
-f:arch/arm64/include/asm/kasan.h
-f:arch/arm64/include/asm/kernel-pgtable.h
-f:arch/arm64/include/asm/kexec.h
-f:arch/arm64/include/asm/kfence.h
-f:arch/arm64/include/asm/kgdb.h
-f:arch/arm64/include/asm/kprobes.h
-f:arch/arm64/include/asm/kvm_arm.h
-f:arch/arm64/include/asm/kvm_asm.h
-f:arch/arm64/include/asm/kvm_emulate.h
-f:arch/arm64/include/asm/kvm_host.h
-f:arch/arm64/include/asm/kvm_hyp.h
-f:arch/arm64/include/asm/kvm_mmu.h
-f:arch/arm64/include/asm/kvm_mte.h
-f:arch/arm64/include/asm/kvm_nested.h
-f:arch/arm64/include/asm/kvm_pgtable.h
-f:arch/arm64/include/asm/kvm_pkvm.h
-f:arch/arm64/include/asm/kvm_ptrauth.h
-f:arch/arm64/include/asm/kvm_ras.h
-f:arch/arm64/include/asm/kvm_types.h
-f:arch/arm64/include/asm/linkage.h
-f:arch/arm64/include/asm/lse.h
-f:arch/arm64/include/asm/mem_encrypt.h
-f:arch/arm64/include/asm/memory.h
-f:arch/arm64/include/asm/mman.h
-f:arch/arm64/include/asm/mmu.h
-f:arch/arm64/include/asm/mmu_context.h
-f:arch/arm64/include/asm/module.h
-f:arch/arm64/include/asm/module.lds.h
-f:arch/arm64/include/asm/mshyperv.h
-f:arch/arm64/include/asm/mte-def.h
-f:arch/arm64/include/asm/mte-kasan.h
-f:arch/arm64/include/asm/mte.h
-f:arch/arm64/include/asm/neon-intrinsics.h
-f:arch/arm64/include/asm/neon.h
-f:arch/arm64/include/asm/numa.h
-f:arch/arm64/include/asm/page-def.h
-f:arch/arm64/include/asm/page.h
-f:arch/arm64/include/asm/paravirt.h
-f:arch/arm64/include/asm/paravirt_api_clock.h
-f:arch/arm64/include/asm/pci.h
-f:arch/arm64/include/asm/percpu.h
-f:arch/arm64/include/asm/perf_event.h
-f:arch/arm64/include/asm/pgalloc.h
-f:arch/arm64/include/asm/pgtable-hwdef.h
-f:arch/arm64/include/asm/pgtable-prot.h
-f:arch/arm64/include/asm/pgtable-types.h
-f:arch/arm64/include/asm/pgtable.h
-f:arch/arm64/include/asm/pkeys.h
-f:arch/arm64/include/asm/pointer_auth.h
-f:arch/arm64/include/asm/por.h
-f:arch/arm64/include/asm/preempt.h
-f:arch/arm64/include/asm/probes.h
-f:arch/arm64/include/asm/proc-fns.h
-f:arch/arm64/include/asm/processor.h
-f:arch/arm64/include/asm/ptdump.h
-f:arch/arm64/include/asm/ptrace.h
-f:arch/arm64/include/asm/pvclock-abi.h
-f:arch/arm64/include/asm/rqspinlock.h
-f:arch/arm64/include/asm/rsi.h
-f:arch/arm64/include/asm/rsi_cmds.h
-f:arch/arm64/include/asm/rsi_smc.h
-f:arch/arm64/include/asm/runtime-const.h
-f:arch/arm64/include/asm/rwonce.h
-f:arch/arm64/include/asm/scs.h
-f:arch/arm64/include/asm/sdei.h
-f:arch/arm64/include/asm/seccomp.h
-f:arch/arm64/include/asm/sections.h
-f:arch/arm64/include/asm/semihost.h
-f:arch/arm64/include/asm/set_memory.h
-f:arch/arm64/include/asm/setup.h
-f:arch/arm64/include/asm/shmparam.h
-f:arch/arm64/include/asm/signal.h
-f:arch/arm64/include/asm/signal32.h
-f:arch/arm64/include/asm/simd.h
-f:arch/arm64/include/asm/smp.h
-f:arch/arm64/include/asm/smp_plat.h
-f:arch/arm64/include/asm/sparsemem.h
-f:arch/arm64/include/asm/spectre.h
-f:arch/arm64/include/asm/spinlock.h
-f:arch/arm64/include/asm/spinlock_types.h
-f:arch/arm64/include/asm/stack_pointer.h
-f:arch/arm64/include/asm/stackprotector.h
-f:arch/arm64/include/asm/stacktrace.h
-f:arch/arm64/include/asm/stacktrace/common.h
-f:arch/arm64/include/asm/stacktrace/frame.h
-f:arch/arm64/include/asm/stacktrace/nvhe.h
-f:arch/arm64/include/asm/stage2_pgtable.h
-f:arch/arm64/include/asm/stat.h
-f:arch/arm64/include/asm/string.h
-f:arch/arm64/include/asm/suspend.h
-f:arch/arm64/include/asm/sync_bitops.h
-f:arch/arm64/include/asm/syscall.h
-f:arch/arm64/include/asm/syscall_wrapper.h
-f:arch/arm64/include/asm/sysreg.h
-f:arch/arm64/include/asm/system_misc.h
-f:arch/arm64/include/asm/text-patching.h
-f:arch/arm64/include/asm/thread_info.h
-f:arch/arm64/include/asm/timex.h
-f:arch/arm64/include/asm/tlb.h
-f:arch/arm64/include/asm/tlbbatch.h
-f:arch/arm64/include/asm/tlbflush.h
-f:arch/arm64/include/asm/topology.h
-f:arch/arm64/include/asm/trans_pgd.h
-f:arch/arm64/include/asm/traps.h
-f:arch/arm64/include/asm/uaccess.h
-f:arch/arm64/include/asm/unistd.h
-f:arch/arm64/include/asm/unistd32.h
-f:arch/arm64/include/asm/uprobes.h
-f:arch/arm64/include/asm/vdso.h
-f:arch/arm64/include/asm/vdso/clocksource.h
-f:arch/arm64/include/asm/vdso/compat_barrier.h
-f:arch/arm64/include/asm/vdso/compat_gettimeofday.h
-f:arch/arm64/include/asm/vdso/getrandom.h
-f:arch/arm64/include/asm/vdso/gettimeofday.h
-f:arch/arm64/include/asm/vdso/processor.h
-f:arch/arm64/include/asm/vdso/vsyscall.h
-f:arch/arm64/include/asm/vectors.h
-f:arch/arm64/include/asm/vermagic.h
-f:arch/arm64/include/asm/virt.h
-f:arch/arm64/include/asm/vmalloc.h
-f:arch/arm64/include/asm/vmap_stack.h
-f:arch/arm64/include/asm/vncr_mapping.h
-f:arch/arm64/include/asm/word-at-a-time.h
-f:arch/arm64/include/asm/xen/events.h
-f:arch/arm64/include/asm/xen/hypercall.h
-f:arch/arm64/include/asm/xen/hypervisor.h
-f:arch/arm64/include/asm/xen/interface.h
-f:arch/arm64/include/asm/xen/page.h
-f:arch/arm64/include/asm/xen/swiotlb-xen.h
-f:arch/arm64/include/asm/xen/xen-ops.h
-f:arch/arm64/include/asm/xor.h
-f:arch/arm64/include/uapi/asm/Kbuild
-f:arch/arm64/include/uapi/asm/auxvec.h
-f:arch/arm64/include/uapi/asm/bitsperlong.h
-f:arch/arm64/include/uapi/asm/bpf_perf_event.h
-f:arch/arm64/include/uapi/asm/byteorder.h
-f:arch/arm64/include/uapi/asm/fcntl.h
-f:arch/arm64/include/uapi/asm/hwcap.h
-f:arch/arm64/include/uapi/asm/kvm.h
-f:arch/arm64/include/uapi/asm/mman.h
-f:arch/arm64/include/uapi/asm/param.h
-f:arch/arm64/include/uapi/asm/perf_regs.h
-f:arch/arm64/include/uapi/asm/posix_types.h
-f:arch/arm64/include/uapi/asm/ptrace.h
-f:arch/arm64/include/uapi/asm/setup.h
-f:arch/arm64/include/uapi/asm/sigcontext.h
-f:arch/arm64/include/uapi/asm/signal.h
-f:arch/arm64/include/uapi/asm/statfs.h
-f:arch/arm64/include/uapi/asm/sve_context.h
-f:arch/arm64/include/uapi/asm/ucontext.h
-f:arch/arm64/include/uapi/asm/unistd.h
-f:arch/arm64/kernel/.gitignore
-f:arch/arm64/kernel/Makefile
-f:arch/arm64/kernel/Makefile.syscalls
-f:arch/arm64/kernel/acpi.c
-f:arch/arm64/kernel/acpi_numa.c
-f:arch/arm64/kernel/acpi_parking_protocol.c
-f:arch/arm64/kernel/alternative.c
-f:arch/arm64/kernel/armv8_deprecated.c
-f:arch/arm64/kernel/asm-offsets.c
-f:arch/arm64/kernel/cacheinfo.c
-f:arch/arm64/kernel/compat_alignment.c
-f:arch/arm64/kernel/cpu-reset.S
-f:arch/arm64/kernel/cpu_errata.c
-f:arch/arm64/kernel/cpu_ops.c
-f:arch/arm64/kernel/cpufeature.c
-f:arch/arm64/kernel/cpuinfo.c
-f:arch/arm64/kernel/crash_dump.c
-f:arch/arm64/kernel/debug-monitors.c
-f:arch/arm64/kernel/efi-header.S
-f:arch/arm64/kernel/efi-rt-wrapper.S
-f:arch/arm64/kernel/efi.c
-f:arch/arm64/kernel/elfcore.c
-f:arch/arm64/kernel/entry-common.c
-f:arch/arm64/kernel/entry-fpsimd.S
-f:arch/arm64/kernel/entry-ftrace.S
-f:arch/arm64/kernel/entry.S
-f:arch/arm64/kernel/fpsimd.c
-f:arch/arm64/kernel/ftrace.c
-f:arch/arm64/kernel/head.S
-f:arch/arm64/kernel/hibernate-asm.S
-f:arch/arm64/kernel/hibernate.c
-f:arch/arm64/kernel/hw_breakpoint.c
-f:arch/arm64/kernel/hyp-stub.S
-f:arch/arm64/kernel/idle.c
-f:arch/arm64/kernel/image-vars.h
-f:arch/arm64/kernel/image.h
-f:arch/arm64/kernel/io.c
-f:arch/arm64/kernel/irq.c
-f:arch/arm64/kernel/jump_label.c
-f:arch/arm64/kernel/kaslr.c
-f:arch/arm64/kernel/kexec_image.c
-f:arch/arm64/kernel/kgdb.c
-f:arch/arm64/kernel/kuser32.S
-f:arch/arm64/kernel/machine_kexec.c
-f:arch/arm64/kernel/machine_kexec_file.c
-f:arch/arm64/kernel/module-plts.c
-f:arch/arm64/kernel/module.c
-f:arch/arm64/kernel/mte.c
-f:arch/arm64/kernel/paravirt.c
-f:arch/arm64/kernel/patching.c
-f:arch/arm64/kernel/pci.c
-f:arch/arm64/kernel/perf_callchain.c
-f:arch/arm64/kernel/perf_regs.c
-f:arch/arm64/kernel/pi/.gitignore
-f:arch/arm64/kernel/pi/Makefile
-f:arch/arm64/kernel/pi/idreg-override.c
-f:arch/arm64/kernel/pi/kaslr_early.c
-f:arch/arm64/kernel/pi/map_kernel.c
-f:arch/arm64/kernel/pi/map_range.c
-f:arch/arm64/kernel/pi/patch-scs.c
-f:arch/arm64/kernel/pi/pi.h
-f:arch/arm64/kernel/pi/relacheck.c
-f:arch/arm64/kernel/pi/relocate.c
-f:arch/arm64/kernel/pointer_auth.c
-f:arch/arm64/kernel/probes/Makefile
-f:arch/arm64/kernel/probes/decode-insn.c
-f:arch/arm64/kernel/probes/decode-insn.h
-f:arch/arm64/kernel/probes/kprobes.c
-f:arch/arm64/kernel/probes/kprobes_trampoline.S
-f:arch/arm64/kernel/probes/simulate-insn.c
-f:arch/arm64/kernel/probes/simulate-insn.h
-f:arch/arm64/kernel/probes/uprobes.c
-f:arch/arm64/kernel/process.c
-f:arch/arm64/kernel/proton-pack.c
-f:arch/arm64/kernel/psci.c
-f:arch/arm64/kernel/ptrace.c
-f:arch/arm64/kernel/reloc_test_core.c
-f:arch/arm64/kernel/reloc_test_syms.S
-f:arch/arm64/kernel/relocate_kernel.S
-f:arch/arm64/kernel/return_address.c
-f:arch/arm64/kernel/rsi.c
-f:arch/arm64/kernel/sdei.c
-f:arch/arm64/kernel/setup.c
-f:arch/arm64/kernel/signal.c
-f:arch/arm64/kernel/signal32.c
-f:arch/arm64/kernel/sigreturn32.S
-f:arch/arm64/kernel/sleep.S
-f:arch/arm64/kernel/smccc-call.S
-f:arch/arm64/kernel/smp.c
-f:arch/arm64/kernel/smp_spin_table.c
-f:arch/arm64/kernel/stacktrace.c
-f:arch/arm64/kernel/suspend.c
-f:arch/arm64/kernel/sys.c
-f:arch/arm64/kernel/sys32.c
-f:arch/arm64/kernel/sys_compat.c
-f:arch/arm64/kernel/syscall.c
-f:arch/arm64/kernel/time.c
-f:arch/arm64/kernel/topology.c
-f:arch/arm64/kernel/trace-events-emulation.h
-f:arch/arm64/kernel/traps.c
-f:arch/arm64/kernel/vdso-wrap.S
-f:arch/arm64/kernel/vdso.c
-f:arch/arm64/kernel/vdso/.gitignore
-f:arch/arm64/kernel/vdso/Makefile
-f:arch/arm64/kernel/vdso/gen_vdso_offsets.sh
-f:arch/arm64/kernel/vdso/note.S
-f:arch/arm64/kernel/vdso/sigreturn.S
-f:arch/arm64/kernel/vdso/vdso.lds.S
-f:arch/arm64/kernel/vdso/vgetrandom-chacha.S
-f:arch/arm64/kernel/vdso/vgetrandom.c
-f:arch/arm64/kernel/vdso/vgettimeofday.c
-f:arch/arm64/kernel/vdso32-wrap.S
-f:arch/arm64/kernel/vdso32/.gitignore
-f:arch/arm64/kernel/vdso32/Makefile
-f:arch/arm64/kernel/vdso32/note.c
-f:arch/arm64/kernel/vdso32/vdso.lds.S
-f:arch/arm64/kernel/vdso32/vgettimeofday.c
-f:arch/arm64/kernel/vmcore_info.c
-f:arch/arm64/kernel/vmlinux.lds.S
-f:arch/arm64/kernel/watchdog_hld.c
-f:arch/arm64/kvm/.gitignore
-f:arch/arm64/kvm/Kconfig
-f:arch/arm64/kvm/Makefile
-f:arch/arm64/kvm/arch_timer.c
-f:arch/arm64/kvm/arm.c
-f:arch/arm64/kvm/at.c
-f:arch/arm64/kvm/config.c
-f:arch/arm64/kvm/debug.c
-f:arch/arm64/kvm/emulate-nested.c
-f:arch/arm64/kvm/fpsimd.c
-f:arch/arm64/kvm/guest.c
-f:arch/arm64/kvm/handle_exit.c
-f:arch/arm64/kvm/hyp/Makefile
-f:arch/arm64/kvm/hyp/aarch32.c
-f:arch/arm64/kvm/hyp/entry.S
-f:arch/arm64/kvm/hyp/exception.c
-f:arch/arm64/kvm/hyp/fpsimd.S
-f:arch/arm64/kvm/hyp/hyp-constants.c
-f:arch/arm64/kvm/hyp/hyp-entry.S
-f:arch/arm64/kvm/hyp/include/hyp/adjust_pc.h
-f:arch/arm64/kvm/hyp/include/hyp/debug-sr.h
-f:arch/arm64/kvm/hyp/include/hyp/fault.h
-f:arch/arm64/kvm/hyp/include/hyp/switch.h
-f:arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h
-f:arch/arm64/kvm/hyp/include/nvhe/early_alloc.h
-f:arch/arm64/kvm/hyp/include/nvhe/ffa.h
-f:arch/arm64/kvm/hyp/include/nvhe/gfp.h
-f:arch/arm64/kvm/hyp/include/nvhe/mem_protect.h
-f:arch/arm64/kvm/hyp/include/nvhe/memory.h
-f:arch/arm64/kvm/hyp/include/nvhe/mm.h
-f:arch/arm64/kvm/hyp/include/nvhe/pkvm.h
-f:arch/arm64/kvm/hyp/include/nvhe/spinlock.h
-f:arch/arm64/kvm/hyp/include/nvhe/trap_handler.h
-f:arch/arm64/kvm/hyp/nvhe/.gitignore
-f:arch/arm64/kvm/hyp/nvhe/Makefile
-f:arch/arm64/kvm/hyp/nvhe/cache.S
-f:arch/arm64/kvm/hyp/nvhe/debug-sr.c
-f:arch/arm64/kvm/hyp/nvhe/early_alloc.c
-f:arch/arm64/kvm/hyp/nvhe/ffa.c
-f:arch/arm64/kvm/hyp/nvhe/gen-hyprel.c
-f:arch/arm64/kvm/hyp/nvhe/host.S
-f:arch/arm64/kvm/hyp/nvhe/hyp-init.S
-f:arch/arm64/kvm/hyp/nvhe/hyp-main.c
-f:arch/arm64/kvm/hyp/nvhe/hyp-smp.c
-f:arch/arm64/kvm/hyp/nvhe/hyp.lds.S
-f:arch/arm64/kvm/hyp/nvhe/list_debug.c
-f:arch/arm64/kvm/hyp/nvhe/mem_protect.c
-f:arch/arm64/kvm/hyp/nvhe/mm.c
-f:arch/arm64/kvm/hyp/nvhe/page_alloc.c
-f:arch/arm64/kvm/hyp/nvhe/pkvm.c
-f:arch/arm64/kvm/hyp/nvhe/psci-relay.c
-f:arch/arm64/kvm/hyp/nvhe/setup.c
-f:arch/arm64/kvm/hyp/nvhe/stacktrace.c
-f:arch/arm64/kvm/hyp/nvhe/switch.c
-f:arch/arm64/kvm/hyp/nvhe/sys_regs.c
-f:arch/arm64/kvm/hyp/nvhe/sysreg-sr.c
-f:arch/arm64/kvm/hyp/nvhe/timer-sr.c
-f:arch/arm64/kvm/hyp/nvhe/tlb.c
-f:arch/arm64/kvm/hyp/pgtable.c
-f:arch/arm64/kvm/hyp/vgic-v2-cpuif-proxy.c
-f:arch/arm64/kvm/hyp/vgic-v3-sr.c
-f:arch/arm64/kvm/hyp/vhe/Makefile
-f:arch/arm64/kvm/hyp/vhe/debug-sr.c
-f:arch/arm64/kvm/hyp/vhe/switch.c
-f:arch/arm64/kvm/hyp/vhe/sysreg-sr.c
-f:arch/arm64/kvm/hyp/vhe/timer-sr.c
-f:arch/arm64/kvm/hyp/vhe/tlb.c
-f:arch/arm64/kvm/hypercalls.c
-f:arch/arm64/kvm/inject_fault.c
-f:arch/arm64/kvm/mmio.c
-f:arch/arm64/kvm/mmu.c
-f:arch/arm64/kvm/nested.c
-f:arch/arm64/kvm/pauth.c
-f:arch/arm64/kvm/pkvm.c
-f:arch/arm64/kvm/pmu-emul.c
-f:arch/arm64/kvm/pmu.c
-f:arch/arm64/kvm/psci.c
-f:arch/arm64/kvm/ptdump.c
-f:arch/arm64/kvm/pvtime.c
-f:arch/arm64/kvm/reset.c
-f:arch/arm64/kvm/stacktrace.c
-f:arch/arm64/kvm/sys_regs.c
-f:arch/arm64/kvm/sys_regs.h
-f:arch/arm64/kvm/trace.h
-f:arch/arm64/kvm/trace_arm.h
-f:arch/arm64/kvm/trace_handle_exit.h
-f:arch/arm64/kvm/trng.c
-f:arch/arm64/kvm/va_layout.c
-f:arch/arm64/kvm/vgic-sys-reg-v3.c
-f:arch/arm64/kvm/vgic/trace.h
-f:arch/arm64/kvm/vgic/vgic-debug.c
-f:arch/arm64/kvm/vgic/vgic-init.c
-f:arch/arm64/kvm/vgic/vgic-irqfd.c
-f:arch/arm64/kvm/vgic/vgic-its.c
-f:arch/arm64/kvm/vgic/vgic-kvm-device.c
-f:arch/arm64/kvm/vgic/vgic-mmio-v2.c
-f:arch/arm64/kvm/vgic/vgic-mmio-v3.c
-f:arch/arm64/kvm/vgic/vgic-mmio.c
-f:arch/arm64/kvm/vgic/vgic-mmio.h
-f:arch/arm64/kvm/vgic/vgic-v2.c
-f:arch/arm64/kvm/vgic/vgic-v3-nested.c
-f:arch/arm64/kvm/vgic/vgic-v3.c
-f:arch/arm64/kvm/vgic/vgic-v4.c
-f:arch/arm64/kvm/vgic/vgic-v5.c
-f:arch/arm64/kvm/vgic/vgic.c
-f:arch/arm64/kvm/vgic/vgic.h
-f:arch/arm64/kvm/vmid.c
-f:arch/arm64/lib/.gitignore
-f:arch/arm64/lib/Makefile
-f:arch/arm64/lib/clear_page.S
-f:arch/arm64/lib/clear_user.S
-f:arch/arm64/lib/copy_from_user.S
-f:arch/arm64/lib/copy_page.S
-f:arch/arm64/lib/copy_template.S
-f:arch/arm64/lib/copy_to_user.S
-f:arch/arm64/lib/csum.c
-f:arch/arm64/lib/delay.c
-f:arch/arm64/lib/error-inject.c
-f:arch/arm64/lib/insn.c
-f:arch/arm64/lib/kasan_sw_tags.S
-f:arch/arm64/lib/memchr.S
-f:arch/arm64/lib/memcmp.S
-f:arch/arm64/lib/memcpy.S
-f:arch/arm64/lib/memset.S
-f:arch/arm64/lib/mte.S
-f:arch/arm64/lib/strchr.S
-f:arch/arm64/lib/strcmp.S
-f:arch/arm64/lib/strlen.S
-f:arch/arm64/lib/strncmp.S
-f:arch/arm64/lib/strnlen.S
-f:arch/arm64/lib/strrchr.S
-f:arch/arm64/lib/tishift.S
-f:arch/arm64/lib/uaccess_flushcache.c
-f:arch/arm64/lib/xor-neon.c
-f:arch/arm64/mm/Makefile
-f:arch/arm64/mm/cache.S
-f:arch/arm64/mm/context.c
-f:arch/arm64/mm/contpte.c
-f:arch/arm64/mm/copypage.c
-f:arch/arm64/mm/dma-mapping.c
-f:arch/arm64/mm/extable.c
-f:arch/arm64/mm/fault.c
-f:arch/arm64/mm/fixmap.c
-f:arch/arm64/mm/flush.c
-f:arch/arm64/mm/gcs.c
-f:arch/arm64/mm/hugetlbpage.c
-f:arch/arm64/mm/init.c
-f:arch/arm64/mm/ioremap.c
-f:arch/arm64/mm/kasan_init.c
-f:arch/arm64/mm/mem_encrypt.c
-f:arch/arm64/mm/mmap.c
-f:arch/arm64/mm/mmu.c
-f:arch/arm64/mm/mteswap.c
-f:arch/arm64/mm/pageattr.c
-f:arch/arm64/mm/pgd.c
-f:arch/arm64/mm/physaddr.c
-f:arch/arm64/mm/proc.S
-f:arch/arm64/mm/ptdump.c
-f:arch/arm64/mm/ptdump_debugfs.c
-f:arch/arm64/mm/trans_pgd-asm.S
-f:arch/arm64/mm/trans_pgd.c
-f:arch/arm64/net/Makefile
-f:arch/arm64/net/bpf_jit.h
-f:arch/arm64/net/bpf_jit_comp.c
-f:arch/arm64/tools/Makefile
-f:arch/arm64/tools/cpucaps
-f:arch/arm64/tools/gen-cpucaps.awk
-f:arch/arm64/tools/gen-sysreg.awk
-f:arch/arm64/tools/syscall_32.tbl
-f:arch/arm64/tools/sysreg
-f:arch/arm64/xen/Makefile
-f:arch/arm64/xen/hypercall.S
-f:arch/csky/Kbuild
-f:arch/csky/Kconfig
-f:arch/csky/Kconfig.debug
-f:arch/csky/Kconfig.platforms
-f:arch/csky/Makefile
-f:arch/csky/abiv1/Makefile
-f:arch/csky/abiv1/alignment.c
-f:arch/csky/abiv1/bswapdi.c
-f:arch/csky/abiv1/bswapsi.c
-f:arch/csky/abiv1/cacheflush.c
-f:arch/csky/abiv1/inc/abi/cacheflush.h
-f:arch/csky/abiv1/inc/abi/ckmmu.h
-f:arch/csky/abiv1/inc/abi/elf.h
-f:arch/csky/abiv1/inc/abi/entry.h
-f:arch/csky/abiv1/inc/abi/page.h
-f:arch/csky/abiv1/inc/abi/pgtable-bits.h
-f:arch/csky/abiv1/inc/abi/reg_ops.h
-f:arch/csky/abiv1/inc/abi/regdef.h
-f:arch/csky/abiv1/inc/abi/string.h
-f:arch/csky/abiv1/inc/abi/switch_context.h
-f:arch/csky/abiv1/inc/abi/vdso.h
-f:arch/csky/abiv1/mmap.c
-f:arch/csky/abiv2/Makefile
-f:arch/csky/abiv2/cacheflush.c
-f:arch/csky/abiv2/fpu.c
-f:arch/csky/abiv2/inc/abi/cacheflush.h
-f:arch/csky/abiv2/inc/abi/ckmmu.h
-f:arch/csky/abiv2/inc/abi/elf.h
-f:arch/csky/abiv2/inc/abi/entry.h
-f:arch/csky/abiv2/inc/abi/fpu.h
-f:arch/csky/abiv2/inc/abi/page.h
-f:arch/csky/abiv2/inc/abi/pgtable-bits.h
-f:arch/csky/abiv2/inc/abi/reg_ops.h
-f:arch/csky/abiv2/inc/abi/regdef.h
-f:arch/csky/abiv2/inc/abi/string.h
-f:arch/csky/abiv2/inc/abi/switch_context.h
-f:arch/csky/abiv2/inc/abi/vdso.h
-f:arch/csky/abiv2/mcount.S
-f:arch/csky/abiv2/memcmp.S
-f:arch/csky/abiv2/memcpy.S
-f:arch/csky/abiv2/memmove.S
-f:arch/csky/abiv2/memset.S
-f:arch/csky/abiv2/strcmp.S
-f:arch/csky/abiv2/strcpy.S
-f:arch/csky/abiv2/strksyms.c
-f:arch/csky/abiv2/strlen.S
-f:arch/csky/abiv2/sysdep.h
-f:arch/csky/boot/Makefile
-f:arch/csky/boot/dts/Makefile
-f:arch/csky/configs/defconfig
-f:arch/csky/include/asm/Kbuild
-f:arch/csky/include/asm/addrspace.h
-f:arch/csky/include/asm/asid.h
-f:arch/csky/include/asm/atomic.h
-f:arch/csky/include/asm/barrier.h
-f:arch/csky/include/asm/bitops.h
-f:arch/csky/include/asm/bug.h
-f:arch/csky/include/asm/cache.h
-f:arch/csky/include/asm/cacheflush.h
-f:arch/csky/include/asm/cachetype.h
-f:arch/csky/include/asm/checksum.h
-f:arch/csky/include/asm/clocksource.h
-f:arch/csky/include/asm/cmpxchg.h
-f:arch/csky/include/asm/elf.h
-f:arch/csky/include/asm/fixmap.h
-f:arch/csky/include/asm/ftrace.h
-f:arch/csky/include/asm/futex.h
-f:arch/csky/include/asm/highmem.h
-f:arch/csky/include/asm/io.h
-f:arch/csky/include/asm/irq_work.h
-f:arch/csky/include/asm/irqflags.h
-f:arch/csky/include/asm/jump_label.h
-f:arch/csky/include/asm/kprobes.h
-f:arch/csky/include/asm/memory.h
-f:arch/csky/include/asm/mmu.h
-f:arch/csky/include/asm/mmu_context.h
-f:arch/csky/include/asm/page.h
-f:arch/csky/include/asm/pci.h
-f:arch/csky/include/asm/perf_event.h
-f:arch/csky/include/asm/pgalloc.h
-f:arch/csky/include/asm/pgtable.h
-f:arch/csky/include/asm/probes.h
-f:arch/csky/include/asm/processor.h
-f:arch/csky/include/asm/ptrace.h
-f:arch/csky/include/asm/reg_ops.h
-f:arch/csky/include/asm/seccomp.h
-f:arch/csky/include/asm/sections.h
-f:arch/csky/include/asm/shmparam.h
-f:arch/csky/include/asm/smp.h
-f:arch/csky/include/asm/spinlock.h
-f:arch/csky/include/asm/spinlock_types.h
-f:arch/csky/include/asm/stackprotector.h
-f:arch/csky/include/asm/string.h
-f:arch/csky/include/asm/switch_to.h
-f:arch/csky/include/asm/syscall.h
-f:arch/csky/include/asm/syscalls.h
-f:arch/csky/include/asm/tcm.h
-f:arch/csky/include/asm/thread_info.h
-f:arch/csky/include/asm/tlb.h
-f:arch/csky/include/asm/tlbflush.h
-f:arch/csky/include/asm/traps.h
-f:arch/csky/include/asm/uaccess.h
-f:arch/csky/include/asm/unistd.h
-f:arch/csky/include/asm/uprobes.h
-f:arch/csky/include/asm/vdso.h
-f:arch/csky/include/asm/vmalloc.h
-f:arch/csky/include/uapi/asm/Kbuild
-f:arch/csky/include/uapi/asm/byteorder.h
-f:arch/csky/include/uapi/asm/cachectl.h
-f:arch/csky/include/uapi/asm/perf_regs.h
-f:arch/csky/include/uapi/asm/ptrace.h
-f:arch/csky/include/uapi/asm/sigcontext.h
-f:arch/csky/include/uapi/asm/unistd.h
-f:arch/csky/kernel/Makefile
-f:arch/csky/kernel/Makefile.syscalls
-f:arch/csky/kernel/asm-offsets.c
-f:arch/csky/kernel/atomic.S
-f:arch/csky/kernel/cpu-probe.c
-f:arch/csky/kernel/entry.S
-f:arch/csky/kernel/ftrace.c
-f:arch/csky/kernel/head.S
-f:arch/csky/kernel/irq.c
-f:arch/csky/kernel/jump_label.c
-f:arch/csky/kernel/module.c
-f:arch/csky/kernel/perf_callchain.c
-f:arch/csky/kernel/perf_event.c
-f:arch/csky/kernel/perf_regs.c
-f:arch/csky/kernel/power.c
-f:arch/csky/kernel/probes/Makefile
-f:arch/csky/kernel/probes/decode-insn.c
-f:arch/csky/kernel/probes/decode-insn.h
-f:arch/csky/kernel/probes/ftrace.c
-f:arch/csky/kernel/probes/kprobes.c
-f:arch/csky/kernel/probes/kprobes_trampoline.S
-f:arch/csky/kernel/probes/simulate-insn.c
-f:arch/csky/kernel/probes/simulate-insn.h
-f:arch/csky/kernel/probes/uprobes.c
-f:arch/csky/kernel/process.c
-f:arch/csky/kernel/ptrace.c
-f:arch/csky/kernel/setup.c
-f:arch/csky/kernel/signal.c
-f:arch/csky/kernel/smp.c
-f:arch/csky/kernel/stacktrace.c
-f:arch/csky/kernel/syscall.c
-f:arch/csky/kernel/syscall_table.c
-f:arch/csky/kernel/time.c
-f:arch/csky/kernel/traps.c
-f:arch/csky/kernel/vdso.c
-f:arch/csky/kernel/vdso/.gitignore
-f:arch/csky/kernel/vdso/Makefile
-f:arch/csky/kernel/vdso/note.S
-f:arch/csky/kernel/vdso/rt_sigreturn.S
-f:arch/csky/kernel/vdso/so2s.sh
-f:arch/csky/kernel/vdso/vdso.S
-f:arch/csky/kernel/vdso/vdso.lds.S
-f:arch/csky/kernel/vmlinux.lds.S
-f:arch/csky/lib/Makefile
-f:arch/csky/lib/delay.c
-f:arch/csky/lib/error-inject.c
-f:arch/csky/lib/string.c
-f:arch/csky/lib/usercopy.c
-f:arch/csky/mm/Makefile
-f:arch/csky/mm/asid.c
-f:arch/csky/mm/cachev1.c
-f:arch/csky/mm/cachev2.c
-f:arch/csky/mm/context.c
-f:arch/csky/mm/dma-mapping.c
-f:arch/csky/mm/fault.c
-f:arch/csky/mm/highmem.c
-f:arch/csky/mm/init.c
-f:arch/csky/mm/ioremap.c
-f:arch/csky/mm/syscache.c
-f:arch/csky/mm/tcm.c
-f:arch/csky/mm/tlb.c
-f:arch/hexagon/Kbuild
-f:arch/hexagon/Kconfig
-f:arch/hexagon/Kconfig.debug
-f:arch/hexagon/Makefile
-f:arch/hexagon/configs/comet_defconfig
-f:arch/hexagon/include/asm/Kbuild
-f:arch/hexagon/include/asm/asm-offsets.h
-f:arch/hexagon/include/asm/atomic.h
-f:arch/hexagon/include/asm/bitops.h
-f:arch/hexagon/include/asm/cache.h
-f:arch/hexagon/include/asm/cacheflush.h
-f:arch/hexagon/include/asm/checksum.h
-f:arch/hexagon/include/asm/cmpxchg.h
-f:arch/hexagon/include/asm/delay.h
-f:arch/hexagon/include/asm/dma.h
-f:arch/hexagon/include/asm/elf.h
-f:arch/hexagon/include/asm/exec.h
-f:arch/hexagon/include/asm/fixmap.h
-f:arch/hexagon/include/asm/fpu.h
-f:arch/hexagon/include/asm/futex.h
-f:arch/hexagon/include/asm/hexagon_vm.h
-f:arch/hexagon/include/asm/intrinsics.h
-f:arch/hexagon/include/asm/io.h
-f:arch/hexagon/include/asm/irq.h
-f:arch/hexagon/include/asm/irqflags.h
-f:arch/hexagon/include/asm/kgdb.h
-f:arch/hexagon/include/asm/linkage.h
-f:arch/hexagon/include/asm/mem-layout.h
-f:arch/hexagon/include/asm/mmu.h
-f:arch/hexagon/include/asm/mmu_context.h
-f:arch/hexagon/include/asm/page.h
-f:arch/hexagon/include/asm/perf_event.h
-f:arch/hexagon/include/asm/pgalloc.h
-f:arch/hexagon/include/asm/pgtable.h
-f:arch/hexagon/include/asm/processor.h
-f:arch/hexagon/include/asm/ptrace.h
-f:arch/hexagon/include/asm/setup.h
-f:arch/hexagon/include/asm/smp.h
-f:arch/hexagon/include/asm/spinlock.h
-f:arch/hexagon/include/asm/spinlock_types.h
-f:arch/hexagon/include/asm/string.h
-f:arch/hexagon/include/asm/suspend.h
-f:arch/hexagon/include/asm/switch_to.h
-f:arch/hexagon/include/asm/syscall.h
-f:arch/hexagon/include/asm/syscalls.h
-f:arch/hexagon/include/asm/thread_info.h
-f:arch/hexagon/include/asm/time.h
-f:arch/hexagon/include/asm/timex.h
-f:arch/hexagon/include/asm/tlb.h
-f:arch/hexagon/include/asm/tlbflush.h
-f:arch/hexagon/include/asm/traps.h
-f:arch/hexagon/include/asm/uaccess.h
-f:arch/hexagon/include/asm/unistd.h
-f:arch/hexagon/include/asm/vdso.h
-f:arch/hexagon/include/asm/vermagic.h
-f:arch/hexagon/include/asm/vm_fault.h
-f:arch/hexagon/include/asm/vm_mmu.h
-f:arch/hexagon/include/asm/vmalloc.h
-f:arch/hexagon/include/uapi/asm/Kbuild
-f:arch/hexagon/include/uapi/asm/byteorder.h
-f:arch/hexagon/include/uapi/asm/param.h
-f:arch/hexagon/include/uapi/asm/ptrace.h
-f:arch/hexagon/include/uapi/asm/registers.h
-f:arch/hexagon/include/uapi/asm/setup.h
-f:arch/hexagon/include/uapi/asm/sigcontext.h
-f:arch/hexagon/include/uapi/asm/signal.h
-f:arch/hexagon/include/uapi/asm/swab.h
-f:arch/hexagon/include/uapi/asm/unistd.h
-f:arch/hexagon/include/uapi/asm/user.h
-f:arch/hexagon/kernel/.gitignore
-f:arch/hexagon/kernel/Makefile
-f:arch/hexagon/kernel/Makefile.syscalls
-f:arch/hexagon/kernel/asm-offsets.c
-f:arch/hexagon/kernel/dma.c
-f:arch/hexagon/kernel/head.S
-f:arch/hexagon/kernel/hexagon_ksyms.c
-f:arch/hexagon/kernel/irq_cpu.c
-f:arch/hexagon/kernel/kgdb.c
-f:arch/hexagon/kernel/module.c
-f:arch/hexagon/kernel/process.c
-f:arch/hexagon/kernel/ptrace.c
-f:arch/hexagon/kernel/reset.c
-f:arch/hexagon/kernel/setup.c
-f:arch/hexagon/kernel/signal.c
-f:arch/hexagon/kernel/smp.c
-f:arch/hexagon/kernel/stacktrace.c
-f:arch/hexagon/kernel/syscalltab.c
-f:arch/hexagon/kernel/time.c
-f:arch/hexagon/kernel/trampoline.S
-f:arch/hexagon/kernel/traps.c
-f:arch/hexagon/kernel/vdso.c
-f:arch/hexagon/kernel/vm_entry.S
-f:arch/hexagon/kernel/vm_events.c
-f:arch/hexagon/kernel/vm_init_segtable.S
-f:arch/hexagon/kernel/vm_ops.S
-f:arch/hexagon/kernel/vm_switch.S
-f:arch/hexagon/kernel/vm_vectors.S
-f:arch/hexagon/kernel/vmlinux.lds.S
-f:arch/hexagon/lib/Makefile
-f:arch/hexagon/lib/checksum.c
-f:arch/hexagon/lib/divsi3.S
-f:arch/hexagon/lib/memcpy.S
-f:arch/hexagon/lib/memcpy_likely_aligned.S
-f:arch/hexagon/lib/memset.S
-f:arch/hexagon/lib/modsi3.S
-f:arch/hexagon/lib/udivsi3.S
-f:arch/hexagon/lib/umodsi3.S
-f:arch/hexagon/mm/Makefile
-f:arch/hexagon/mm/cache.c
-f:arch/hexagon/mm/copy_from_user.S
-f:arch/hexagon/mm/copy_to_user.S
-f:arch/hexagon/mm/copy_user_template.S
-f:arch/hexagon/mm/init.c
-f:arch/hexagon/mm/uaccess.c
-f:arch/hexagon/mm/vm_fault.c
-f:arch/hexagon/mm/vm_tlb.c
-f:arch/loongarch/Kbuild
-f:arch/loongarch/Kconfig
-f:arch/loongarch/Kconfig.debug
-f:arch/loongarch/Makefile
-f:arch/loongarch/boot/.gitignore
-f:arch/loongarch/boot/Makefile
-f:arch/loongarch/boot/dts/Makefile
-f:arch/loongarch/boot/dts/loongson-2k0500-ref.dts
-f:arch/loongarch/boot/dts/loongson-2k0500.dtsi
-f:arch/loongarch/boot/dts/loongson-2k1000-ref.dts
-f:arch/loongarch/boot/dts/loongson-2k1000.dtsi
-f:arch/loongarch/boot/dts/loongson-2k2000-ref.dts
-f:arch/loongarch/boot/dts/loongson-2k2000.dtsi
-f:arch/loongarch/boot/install.sh
-f:arch/loongarch/configs/loongson3_defconfig
-f:arch/loongarch/crypto/Kconfig
-f:arch/loongarch/crypto/Makefile
-f:arch/loongarch/include/asm/Kbuild
-f:arch/loongarch/include/asm/acenv.h
-f:arch/loongarch/include/asm/acpi.h
-f:arch/loongarch/include/asm/addrspace.h
-f:arch/loongarch/include/asm/alternative-asm.h
-f:arch/loongarch/include/asm/alternative.h
-f:arch/loongarch/include/asm/asm-extable.h
-f:arch/loongarch/include/asm/asm-offsets.h
-f:arch/loongarch/include/asm/asm-prototypes.h
-f:arch/loongarch/include/asm/asm.h
-f:arch/loongarch/include/asm/asmmacro.h
-f:arch/loongarch/include/asm/atomic.h
-f:arch/loongarch/include/asm/barrier.h
-f:arch/loongarch/include/asm/bitops.h
-f:arch/loongarch/include/asm/bitrev.h
-f:arch/loongarch/include/asm/bootinfo.h
-f:arch/loongarch/include/asm/branch.h
-f:arch/loongarch/include/asm/bug.h
-f:arch/loongarch/include/asm/cache.h
-f:arch/loongarch/include/asm/cacheflush.h
-f:arch/loongarch/include/asm/cacheops.h
-f:arch/loongarch/include/asm/checksum.h
-f:arch/loongarch/include/asm/clocksource.h
-f:arch/loongarch/include/asm/cmpxchg.h
-f:arch/loongarch/include/asm/cpu-features.h
-f:arch/loongarch/include/asm/cpu-info.h
-f:arch/loongarch/include/asm/cpu.h
-f:arch/loongarch/include/asm/cpufeature.h
-f:arch/loongarch/include/asm/crash_reserve.h
-f:arch/loongarch/include/asm/delay.h
-f:arch/loongarch/include/asm/dma.h
-f:arch/loongarch/include/asm/dmi.h
-f:arch/loongarch/include/asm/efi.h
-f:arch/loongarch/include/asm/elf.h
-f:arch/loongarch/include/asm/entry-common.h
-f:arch/loongarch/include/asm/exception.h
-f:arch/loongarch/include/asm/exec.h
-f:arch/loongarch/include/asm/extable.h
-f:arch/loongarch/include/asm/fixmap.h
-f:arch/loongarch/include/asm/fpregdef.h
-f:arch/loongarch/include/asm/fprobe.h
-f:arch/loongarch/include/asm/fpu.h
-f:arch/loongarch/include/asm/ftrace.h
-f:arch/loongarch/include/asm/futex.h
-f:arch/loongarch/include/asm/gpr-num.h
-f:arch/loongarch/include/asm/hardirq.h
-f:arch/loongarch/include/asm/hugetlb.h
-f:arch/loongarch/include/asm/hw_breakpoint.h
-f:arch/loongarch/include/asm/hw_irq.h
-f:arch/loongarch/include/asm/idle.h
-f:arch/loongarch/include/asm/inst.h
-f:arch/loongarch/include/asm/io.h
-f:arch/loongarch/include/asm/irq.h
-f:arch/loongarch/include/asm/irq_regs.h
-f:arch/loongarch/include/asm/irq_work.h
-f:arch/loongarch/include/asm/irqflags.h
-f:arch/loongarch/include/asm/jump_label.h
-f:arch/loongarch/include/asm/kasan.h
-f:arch/loongarch/include/asm/kdebug.h
-f:arch/loongarch/include/asm/kexec.h
-f:arch/loongarch/include/asm/kfence.h
-f:arch/loongarch/include/asm/kgdb.h
-f:arch/loongarch/include/asm/kprobes.h
-f:arch/loongarch/include/asm/kvm_csr.h
-f:arch/loongarch/include/asm/kvm_eiointc.h
-f:arch/loongarch/include/asm/kvm_host.h
-f:arch/loongarch/include/asm/kvm_ipi.h
-f:arch/loongarch/include/asm/kvm_mmu.h
-f:arch/loongarch/include/asm/kvm_para.h
-f:arch/loongarch/include/asm/kvm_pch_pic.h
-f:arch/loongarch/include/asm/kvm_types.h
-f:arch/loongarch/include/asm/kvm_vcpu.h
-f:arch/loongarch/include/asm/lbt.h
-f:arch/loongarch/include/asm/linkage.h
-f:arch/loongarch/include/asm/local.h
-f:arch/loongarch/include/asm/loongarch.h
-f:arch/loongarch/include/asm/loongson.h
-f:arch/loongarch/include/asm/mmu.h
-f:arch/loongarch/include/asm/mmu_context.h
-f:arch/loongarch/include/asm/module.h
-f:arch/loongarch/include/asm/module.lds.h
-f:arch/loongarch/include/asm/numa.h
-f:arch/loongarch/include/asm/orc_header.h
-f:arch/loongarch/include/asm/orc_lookup.h
-f:arch/loongarch/include/asm/orc_types.h
-f:arch/loongarch/include/asm/page.h
-f:arch/loongarch/include/asm/paravirt.h
-f:arch/loongarch/include/asm/paravirt_api_clock.h
-f:arch/loongarch/include/asm/pci.h
-f:arch/loongarch/include/asm/percpu.h
-f:arch/loongarch/include/asm/perf_event.h
-f:arch/loongarch/include/asm/pgalloc.h
-f:arch/loongarch/include/asm/pgtable-bits.h
-f:arch/loongarch/include/asm/pgtable.h
-f:arch/loongarch/include/asm/prefetch.h
-f:arch/loongarch/include/asm/processor.h
-f:arch/loongarch/include/asm/ptrace.h
-f:arch/loongarch/include/asm/qspinlock.h
-f:arch/loongarch/include/asm/regdef.h
-f:arch/loongarch/include/asm/seccomp.h
-f:arch/loongarch/include/asm/serial.h
-f:arch/loongarch/include/asm/set_memory.h
-f:arch/loongarch/include/asm/setup.h
-f:arch/loongarch/include/asm/smp.h
-f:arch/loongarch/include/asm/sparsemem.h
-f:arch/loongarch/include/asm/spinlock.h
-f:arch/loongarch/include/asm/spinlock_types.h
-f:arch/loongarch/include/asm/stackframe.h
-f:arch/loongarch/include/asm/stackprotector.h
-f:arch/loongarch/include/asm/stacktrace.h
-f:arch/loongarch/include/asm/string.h
-f:arch/loongarch/include/asm/suspend.h
-f:arch/loongarch/include/asm/switch_to.h
-f:arch/loongarch/include/asm/syscall.h
-f:arch/loongarch/include/asm/thread_info.h
-f:arch/loongarch/include/asm/time.h
-f:arch/loongarch/include/asm/timex.h
-f:arch/loongarch/include/asm/tlb.h
-f:arch/loongarch/include/asm/tlbflush.h
-f:arch/loongarch/include/asm/topology.h
-f:arch/loongarch/include/asm/types.h
-f:arch/loongarch/include/asm/uaccess.h
-f:arch/loongarch/include/asm/unistd.h
-f:arch/loongarch/include/asm/unwind.h
-f:arch/loongarch/include/asm/unwind_hints.h
-f:arch/loongarch/include/asm/uprobes.h
-f:arch/loongarch/include/asm/vdso.h
-f:arch/loongarch/include/asm/vdso/arch_data.h
-f:arch/loongarch/include/asm/vdso/clocksource.h
-f:arch/loongarch/include/asm/vdso/getrandom.h
-f:arch/loongarch/include/asm/vdso/gettimeofday.h
-f:arch/loongarch/include/asm/vdso/processor.h
-f:arch/loongarch/include/asm/vdso/vdso.h
-f:arch/loongarch/include/asm/vdso/vsyscall.h
-f:arch/loongarch/include/asm/vermagic.h
-f:arch/loongarch/include/asm/video.h
-f:arch/loongarch/include/asm/vmalloc.h
-f:arch/loongarch/include/asm/xor.h
-f:arch/loongarch/include/asm/xor_simd.h
-f:arch/loongarch/include/uapi/asm/Kbuild
-f:arch/loongarch/include/uapi/asm/auxvec.h
-f:arch/loongarch/include/uapi/asm/bpf_perf_event.h
-f:arch/loongarch/include/uapi/asm/break.h
-f:arch/loongarch/include/uapi/asm/byteorder.h
-f:arch/loongarch/include/uapi/asm/hwcap.h
-f:arch/loongarch/include/uapi/asm/kvm.h
-f:arch/loongarch/include/uapi/asm/kvm_para.h
-f:arch/loongarch/include/uapi/asm/perf_regs.h
-f:arch/loongarch/include/uapi/asm/ptrace.h
-f:arch/loongarch/include/uapi/asm/reg.h
-f:arch/loongarch/include/uapi/asm/sigcontext.h
-f:arch/loongarch/include/uapi/asm/signal.h
-f:arch/loongarch/include/uapi/asm/ucontext.h
-f:arch/loongarch/include/uapi/asm/unistd.h
-f:arch/loongarch/kernel/.gitignore
-f:arch/loongarch/kernel/Makefile
-f:arch/loongarch/kernel/Makefile.syscalls
-f:arch/loongarch/kernel/access-helper.h
-f:arch/loongarch/kernel/acpi.c
-f:arch/loongarch/kernel/alternative.c
-f:arch/loongarch/kernel/asm-offsets.c
-f:arch/loongarch/kernel/cacheinfo.c
-f:arch/loongarch/kernel/cpu-probe.c
-f:arch/loongarch/kernel/crash_dump.c
-f:arch/loongarch/kernel/dma.c
-f:arch/loongarch/kernel/efi-header.S
-f:arch/loongarch/kernel/efi.c
-f:arch/loongarch/kernel/elf.c
-f:arch/loongarch/kernel/entry.S
-f:arch/loongarch/kernel/env.c
-f:arch/loongarch/kernel/fpu.S
-f:arch/loongarch/kernel/ftrace.c
-f:arch/loongarch/kernel/ftrace_dyn.c
-f:arch/loongarch/kernel/genex.S
-f:arch/loongarch/kernel/head.S
-f:arch/loongarch/kernel/hw_breakpoint.c
-f:arch/loongarch/kernel/idle.c
-f:arch/loongarch/kernel/image-vars.h
-f:arch/loongarch/kernel/inst.c
-f:arch/loongarch/kernel/irq.c
-f:arch/loongarch/kernel/jump_label.c
-f:arch/loongarch/kernel/kdebugfs.c
-f:arch/loongarch/kernel/kfpu.c
-f:arch/loongarch/kernel/kgdb.c
-f:arch/loongarch/kernel/kprobes.c
-f:arch/loongarch/kernel/lbt.S
-f:arch/loongarch/kernel/machine_kexec.c
-f:arch/loongarch/kernel/mcount.S
-f:arch/loongarch/kernel/mcount_dyn.S
-f:arch/loongarch/kernel/mem.c
-f:arch/loongarch/kernel/module-sections.c
-f:arch/loongarch/kernel/module.c
-f:arch/loongarch/kernel/numa.c
-f:arch/loongarch/kernel/paravirt.c
-f:arch/loongarch/kernel/perf_event.c
-f:arch/loongarch/kernel/perf_regs.c
-f:arch/loongarch/kernel/proc.c
-f:arch/loongarch/kernel/process.c
-f:arch/loongarch/kernel/ptrace.c
-f:arch/loongarch/kernel/relocate.c
-f:arch/loongarch/kernel/relocate_kernel.S
-f:arch/loongarch/kernel/reset.c
-f:arch/loongarch/kernel/rethook.c
-f:arch/loongarch/kernel/rethook.h
-f:arch/loongarch/kernel/rethook_trampoline.S
-f:arch/loongarch/kernel/setup.c
-f:arch/loongarch/kernel/signal.c
-f:arch/loongarch/kernel/smp.c
-f:arch/loongarch/kernel/stacktrace.c
-f:arch/loongarch/kernel/switch.S
-f:arch/loongarch/kernel/syscall.c
-f:arch/loongarch/kernel/sysrq.c
-f:arch/loongarch/kernel/time.c
-f:arch/loongarch/kernel/topology.c
-f:arch/loongarch/kernel/traps.c
-f:arch/loongarch/kernel/unaligned.c
-f:arch/loongarch/kernel/unwind.c
-f:arch/loongarch/kernel/unwind_guess.c
-f:arch/loongarch/kernel/unwind_orc.c
-f:arch/loongarch/kernel/unwind_prologue.c
-f:arch/loongarch/kernel/uprobes.c
-f:arch/loongarch/kernel/vdso.c
-f:arch/loongarch/kernel/vmlinux.lds.S
-f:arch/loongarch/kvm/Kconfig
-f:arch/loongarch/kvm/Makefile
-f:arch/loongarch/kvm/exit.c
-f:arch/loongarch/kvm/intc/eiointc.c
-f:arch/loongarch/kvm/intc/ipi.c
-f:arch/loongarch/kvm/intc/pch_pic.c
-f:arch/loongarch/kvm/interrupt.c
-f:arch/loongarch/kvm/irqfd.c
-f:arch/loongarch/kvm/main.c
-f:arch/loongarch/kvm/mmu.c
-f:arch/loongarch/kvm/switch.S
-f:arch/loongarch/kvm/timer.c
-f:arch/loongarch/kvm/tlb.c
-f:arch/loongarch/kvm/trace.h
-f:arch/loongarch/kvm/vcpu.c
-f:arch/loongarch/kvm/vm.c
-f:arch/loongarch/lib/Makefile
-f:arch/loongarch/lib/clear_user.S
-f:arch/loongarch/lib/copy_user.S
-f:arch/loongarch/lib/csum.c
-f:arch/loongarch/lib/delay.c
-f:arch/loongarch/lib/dump_tlb.c
-f:arch/loongarch/lib/error-inject.c
-f:arch/loongarch/lib/memcpy.S
-f:arch/loongarch/lib/memmove.S
-f:arch/loongarch/lib/memset.S
-f:arch/loongarch/lib/tishift.S
-f:arch/loongarch/lib/unaligned.S
-f:arch/loongarch/lib/xor_simd.c
-f:arch/loongarch/lib/xor_simd.h
-f:arch/loongarch/lib/xor_simd_glue.c
-f:arch/loongarch/lib/xor_template.c
-f:arch/loongarch/mm/Makefile
-f:arch/loongarch/mm/cache.c
-f:arch/loongarch/mm/extable.c
-f:arch/loongarch/mm/fault.c
-f:arch/loongarch/mm/hugetlbpage.c
-f:arch/loongarch/mm/init.c
-f:arch/loongarch/mm/ioremap.c
-f:arch/loongarch/mm/kasan_init.c
-f:arch/loongarch/mm/maccess.c
-f:arch/loongarch/mm/mmap.c
-f:arch/loongarch/mm/page.S
-f:arch/loongarch/mm/pageattr.c
-f:arch/loongarch/mm/pgtable.c
-f:arch/loongarch/mm/tlb.c
-f:arch/loongarch/mm/tlbex.S
-f:arch/loongarch/net/Makefile
-f:arch/loongarch/net/bpf_jit.c
-f:arch/loongarch/net/bpf_jit.h
-f:arch/loongarch/pci/Makefile
-f:arch/loongarch/pci/acpi.c
-f:arch/loongarch/pci/pci.c
-f:arch/loongarch/power/Makefile
-f:arch/loongarch/power/hibernate.c
-f:arch/loongarch/power/hibernate_asm.S
-f:arch/loongarch/power/platform.c
-f:arch/loongarch/power/suspend.c
-f:arch/loongarch/power/suspend_asm.S
-f:arch/loongarch/vdso/.gitignore
-f:arch/loongarch/vdso/Makefile
-f:arch/loongarch/vdso/elf.S
-f:arch/loongarch/vdso/gen_vdso_offsets.sh
-f:arch/loongarch/vdso/sigreturn.S
-f:arch/loongarch/vdso/vdso.S
-f:arch/loongarch/vdso/vdso.lds.S
-f:arch/loongarch/vdso/vgetcpu.c
-f:arch/loongarch/vdso/vgetrandom-chacha.S
-f:arch/loongarch/vdso/vgetrandom.c
-f:arch/loongarch/vdso/vgettimeofday.c
-f:arch/m68k/68000/Makefile
-f:arch/m68k/68000/bootlogo-vz.h
-f:arch/m68k/68000/bootlogo.h
-f:arch/m68k/68000/dragen2.c
-f:arch/m68k/68000/entry.S
-f:arch/m68k/68000/head.S
-f:arch/m68k/68000/ints.c
-f:arch/m68k/68000/ints.h
-f:arch/m68k/68000/m68328.c
-f:arch/m68k/68000/m68328.h
-f:arch/m68k/68000/romvec.S
-f:arch/m68k/68000/screen.h
-f:arch/m68k/68000/timers.c
-f:arch/m68k/68000/ucsimm.c
-f:arch/m68k/Kbuild
-f:arch/m68k/Kconfig
-f:arch/m68k/Kconfig.bus
-f:arch/m68k/Kconfig.cpu
-f:arch/m68k/Kconfig.debug
-f:arch/m68k/Kconfig.devices
-f:arch/m68k/Kconfig.machine
-f:arch/m68k/Makefile
-f:arch/m68k/amiga/Makefile
-f:arch/m68k/amiga/amiga.h
-f:arch/m68k/amiga/amiints.c
-f:arch/m68k/amiga/amisound.c
-f:arch/m68k/amiga/chipram.c
-f:arch/m68k/amiga/cia.c
-f:arch/m68k/amiga/config.c
-f:arch/m68k/amiga/pcmcia.c
-f:arch/m68k/amiga/platform.c
-f:arch/m68k/apollo/Makefile
-f:arch/m68k/apollo/apollo.h
-f:arch/m68k/apollo/config.c
-f:arch/m68k/apollo/dn_ints.c
-f:arch/m68k/atari/Makefile
-f:arch/m68k/atari/ataints.c
-f:arch/m68k/atari/atakeyb.c
-f:arch/m68k/atari/atari.h
-f:arch/m68k/atari/atasound.c
-f:arch/m68k/atari/config.c
-f:arch/m68k/atari/debug.c
-f:arch/m68k/atari/nvram.c
-f:arch/m68k/atari/stdma.c
-f:arch/m68k/atari/stram.c
-f:arch/m68k/atari/time.c
-f:arch/m68k/bvme6000/Makefile
-f:arch/m68k/bvme6000/config.c
-f:arch/m68k/bvme6000/rtc.c
-f:arch/m68k/coldfire/Makefile
-f:arch/m68k/coldfire/amcore.c
-f:arch/m68k/coldfire/cache.c
-f:arch/m68k/coldfire/clk.c
-f:arch/m68k/coldfire/device.c
-f:arch/m68k/coldfire/dma_timer.c
-f:arch/m68k/coldfire/entry.S
-f:arch/m68k/coldfire/firebee.c
-f:arch/m68k/coldfire/gpio.c
-f:arch/m68k/coldfire/head.S
-f:arch/m68k/coldfire/intc-2.c
-f:arch/m68k/coldfire/intc-5249.c
-f:arch/m68k/coldfire/intc-525x.c
-f:arch/m68k/coldfire/intc-5272.c
-f:arch/m68k/coldfire/intc-simr.c
-f:arch/m68k/coldfire/intc.c
-f:arch/m68k/coldfire/m5206.c
-f:arch/m68k/coldfire/m520x.c
-f:arch/m68k/coldfire/m523x.c
-f:arch/m68k/coldfire/m5249.c
-f:arch/m68k/coldfire/m525x.c
-f:arch/m68k/coldfire/m5272.c
-f:arch/m68k/coldfire/m527x.c
-f:arch/m68k/coldfire/m528x.c
-f:arch/m68k/coldfire/m5307.c
-f:arch/m68k/coldfire/m53xx.c
-f:arch/m68k/coldfire/m5407.c
-f:arch/m68k/coldfire/m5441x.c
-f:arch/m68k/coldfire/m54xx.c
-f:arch/m68k/coldfire/mcf8390.c
-f:arch/m68k/coldfire/nettel.c
-f:arch/m68k/coldfire/pci.c
-f:arch/m68k/coldfire/pit.c
-f:arch/m68k/coldfire/reset.c
-f:arch/m68k/coldfire/sltimers.c
-f:arch/m68k/coldfire/stmark2.c
-f:arch/m68k/coldfire/timers.c
-f:arch/m68k/coldfire/vectors.c
-f:arch/m68k/configs/amcore_defconfig
-f:arch/m68k/configs/amiga_defconfig
-f:arch/m68k/configs/apollo_defconfig
-f:arch/m68k/configs/atari_defconfig
-f:arch/m68k/configs/bvme6000_defconfig
-f:arch/m68k/configs/hp300_defconfig
-f:arch/m68k/configs/m5208evb_defconfig
-f:arch/m68k/configs/m5249evb_defconfig
-f:arch/m68k/configs/m5272c3_defconfig
-f:arch/m68k/configs/m5275evb_defconfig
-f:arch/m68k/configs/m5307c3_defconfig
-f:arch/m68k/configs/m5407c3_defconfig
-f:arch/m68k/configs/m5475evb_defconfig
-f:arch/m68k/configs/mac_defconfig
-f:arch/m68k/configs/multi_defconfig
-f:arch/m68k/configs/mvme147_defconfig
-f:arch/m68k/configs/mvme16x_defconfig
-f:arch/m68k/configs/q40_defconfig
-f:arch/m68k/configs/stmark2_defconfig
-f:arch/m68k/configs/sun3_defconfig
-f:arch/m68k/configs/sun3x_defconfig
-f:arch/m68k/configs/virt_defconfig
-f:arch/m68k/emu/Makefile
-f:arch/m68k/emu/natfeat.c
-f:arch/m68k/emu/nfblock.c
-f:arch/m68k/emu/nfcon.c
-f:arch/m68k/emu/nfeth.c
-f:arch/m68k/fpsp040/Makefile
-f:arch/m68k/fpsp040/README
-f:arch/m68k/fpsp040/bindec.S
-f:arch/m68k/fpsp040/binstr.S
-f:arch/m68k/fpsp040/bugfix.S
-f:arch/m68k/fpsp040/decbin.S
-f:arch/m68k/fpsp040/do_func.S
-f:arch/m68k/fpsp040/fpsp.h
-f:arch/m68k/fpsp040/gen_except.S
-f:arch/m68k/fpsp040/get_op.S
-f:arch/m68k/fpsp040/kernel_ex.S
-f:arch/m68k/fpsp040/res_func.S
-f:arch/m68k/fpsp040/round.S
-f:arch/m68k/fpsp040/sacos.S
-f:arch/m68k/fpsp040/sasin.S
-f:arch/m68k/fpsp040/satan.S
-f:arch/m68k/fpsp040/satanh.S
-f:arch/m68k/fpsp040/scale.S
-f:arch/m68k/fpsp040/scosh.S
-f:arch/m68k/fpsp040/setox.S
-f:arch/m68k/fpsp040/sgetem.S
-f:arch/m68k/fpsp040/sint.S
-f:arch/m68k/fpsp040/skeleton.S
-f:arch/m68k/fpsp040/slog2.S
-f:arch/m68k/fpsp040/slogn.S
-f:arch/m68k/fpsp040/smovecr.S
-f:arch/m68k/fpsp040/srem_mod.S
-f:arch/m68k/fpsp040/ssin.S
-f:arch/m68k/fpsp040/ssinh.S
-f:arch/m68k/fpsp040/stan.S
-f:arch/m68k/fpsp040/stanh.S
-f:arch/m68k/fpsp040/sto_res.S
-f:arch/m68k/fpsp040/stwotox.S
-f:arch/m68k/fpsp040/tbldo.S
-f:arch/m68k/fpsp040/util.S
-f:arch/m68k/fpsp040/x_bsun.S
-f:arch/m68k/fpsp040/x_fline.S
-f:arch/m68k/fpsp040/x_operr.S
-f:arch/m68k/fpsp040/x_ovfl.S
-f:arch/m68k/fpsp040/x_snan.S
-f:arch/m68k/fpsp040/x_store.S
-f:arch/m68k/fpsp040/x_unfl.S
-f:arch/m68k/fpsp040/x_unimp.S
-f:arch/m68k/fpsp040/x_unsupp.S
-f:arch/m68k/hp300/Makefile
-f:arch/m68k/hp300/README.hp300
-f:arch/m68k/hp300/config.c
-f:arch/m68k/hp300/hp300map.map
-f:arch/m68k/hp300/reboot.S
-f:arch/m68k/hp300/time.c
-f:arch/m68k/hp300/time.h
-f:arch/m68k/ifpsp060/CHANGES
-f:arch/m68k/ifpsp060/MISC
-f:arch/m68k/ifpsp060/Makefile
-f:arch/m68k/ifpsp060/README
-f:arch/m68k/ifpsp060/TEST.DOC
-f:arch/m68k/ifpsp060/fplsp.doc
-f:arch/m68k/ifpsp060/fplsp.sa
-f:arch/m68k/ifpsp060/fpsp.doc
-f:arch/m68k/ifpsp060/fpsp.sa
-f:arch/m68k/ifpsp060/fskeleton.S
-f:arch/m68k/ifpsp060/ftest.sa
-f:arch/m68k/ifpsp060/ilsp.doc
-f:arch/m68k/ifpsp060/ilsp.sa
-f:arch/m68k/ifpsp060/iskeleton.S
-f:arch/m68k/ifpsp060/isp.doc
-f:arch/m68k/ifpsp060/isp.sa
-f:arch/m68k/ifpsp060/itest.sa
-f:arch/m68k/ifpsp060/os.S
-f:arch/m68k/ifpsp060/pfpsp.sa
-f:arch/m68k/ifpsp060/src/README-SRC
-f:arch/m68k/ifpsp060/src/fplsp.S
-f:arch/m68k/ifpsp060/src/fpsp.S
-f:arch/m68k/ifpsp060/src/ftest.S
-f:arch/m68k/ifpsp060/src/ilsp.S
-f:arch/m68k/ifpsp060/src/isp.S
-f:arch/m68k/ifpsp060/src/itest.S
-f:arch/m68k/ifpsp060/src/pfpsp.S
-f:arch/m68k/include/asm/Kbuild
-f:arch/m68k/include/asm/MC68328.h
-f:arch/m68k/include/asm/MC68EZ328.h
-f:arch/m68k/include/asm/MC68VZ328.h
-f:arch/m68k/include/asm/adb_iop.h
-f:arch/m68k/include/asm/amigahw.h
-f:arch/m68k/include/asm/amigaints.h
-f:arch/m68k/include/asm/amigayle.h
-f:arch/m68k/include/asm/amipcmcia.h
-f:arch/m68k/include/asm/apollohw.h
-f:arch/m68k/include/asm/asm-offsets.h
-f:arch/m68k/include/asm/asm-prototypes.h
-f:arch/m68k/include/asm/atari_joystick.h
-f:arch/m68k/include/asm/atari_stdma.h
-f:arch/m68k/include/asm/atari_stram.h
-f:arch/m68k/include/asm/atarihw.h
-f:arch/m68k/include/asm/atariints.h
-f:arch/m68k/include/asm/atarikb.h
-f:arch/m68k/include/asm/atomic.h
-f:arch/m68k/include/asm/bitops.h
-f:arch/m68k/include/asm/blinken.h
-f:arch/m68k/include/asm/bootinfo.h
-f:arch/m68k/include/asm/bootstd.h
-f:arch/m68k/include/asm/bug.h
-f:arch/m68k/include/asm/bvme6000hw.h
-f:arch/m68k/include/asm/cache.h
-f:arch/m68k/include/asm/cacheflush.h
-f:arch/m68k/include/asm/cacheflush_mm.h
-f:arch/m68k/include/asm/cacheflush_no.h
-f:arch/m68k/include/asm/cachetype.h
-f:arch/m68k/include/asm/checksum.h
-f:arch/m68k/include/asm/cmpxchg.h
-f:arch/m68k/include/asm/coldfire.h
-f:arch/m68k/include/asm/config.h
-f:arch/m68k/include/asm/contregs.h
-f:arch/m68k/include/asm/current.h
-f:arch/m68k/include/asm/delay.h
-f:arch/m68k/include/asm/div64.h
-f:arch/m68k/include/asm/dma.h
-f:arch/m68k/include/asm/dsp56k.h
-f:arch/m68k/include/asm/dvma.h
-f:arch/m68k/include/asm/elf.h
-f:arch/m68k/include/asm/entry.h
-f:arch/m68k/include/asm/fbio.h
-f:arch/m68k/include/asm/flat.h
-f:arch/m68k/include/asm/floppy.h
-f:arch/m68k/include/asm/fpu.h
-f:arch/m68k/include/asm/ftrace.h
-f:arch/m68k/include/asm/hash.h
-f:arch/m68k/include/asm/hp300hw.h
-f:arch/m68k/include/asm/hwtest.h
-f:arch/m68k/include/asm/idprom.h
-f:arch/m68k/include/asm/intersil.h
-f:arch/m68k/include/asm/io.h
-f:arch/m68k/include/asm/io_mm.h
-f:arch/m68k/include/asm/io_no.h
-f:arch/m68k/include/asm/irq.h
-f:arch/m68k/include/asm/irqflags.h
-f:arch/m68k/include/asm/kexec.h
-f:arch/m68k/include/asm/kmap.h
-f:arch/m68k/include/asm/libgcc.h
-f:arch/m68k/include/asm/linkage.h
-f:arch/m68k/include/asm/m5206sim.h
-f:arch/m68k/include/asm/m520xsim.h
-f:arch/m68k/include/asm/m523xsim.h
-f:arch/m68k/include/asm/m525xsim.h
-f:arch/m68k/include/asm/m5272sim.h
-f:arch/m68k/include/asm/m527xsim.h
-f:arch/m68k/include/asm/m528xsim.h
-f:arch/m68k/include/asm/m52xxacr.h
-f:arch/m68k/include/asm/m5307sim.h
-f:arch/m68k/include/asm/m53xxacr.h
-f:arch/m68k/include/asm/m53xxsim.h
-f:arch/m68k/include/asm/m5407sim.h
-f:arch/m68k/include/asm/m5441xsim.h
-f:arch/m68k/include/asm/m54xxacr.h
-f:arch/m68k/include/asm/m54xxgpt.h
-f:arch/m68k/include/asm/m54xxpci.h
-f:arch/m68k/include/asm/m54xxsim.h
-f:arch/m68k/include/asm/mac_asc.h
-f:arch/m68k/include/asm/mac_baboon.h
-f:arch/m68k/include/asm/mac_iop.h
-f:arch/m68k/include/asm/mac_oss.h
-f:arch/m68k/include/asm/mac_psc.h
-f:arch/m68k/include/asm/mac_via.h
-f:arch/m68k/include/asm/machdep.h
-f:arch/m68k/include/asm/machines.h
-f:arch/m68k/include/asm/machw.h
-f:arch/m68k/include/asm/macintosh.h
-f:arch/m68k/include/asm/macints.h
-f:arch/m68k/include/asm/math-emu.h
-f:arch/m68k/include/asm/mc146818rtc.h
-f:arch/m68k/include/asm/mcf8390.h
-f:arch/m68k/include/asm/mcf_pgalloc.h
-f:arch/m68k/include/asm/mcf_pgtable.h
-f:arch/m68k/include/asm/mcfclk.h
-f:arch/m68k/include/asm/mcfdma.h
-f:arch/m68k/include/asm/mcfgpio.h
-f:arch/m68k/include/asm/mcfintc.h
-f:arch/m68k/include/asm/mcfmmu.h
-f:arch/m68k/include/asm/mcfpit.h
-f:arch/m68k/include/asm/mcfqspi.h
-f:arch/m68k/include/asm/mcfsim.h
-f:arch/m68k/include/asm/mcfslt.h
-f:arch/m68k/include/asm/mcftimer.h
-f:arch/m68k/include/asm/mcfuart.h
-f:arch/m68k/include/asm/mcfwdebug.h
-f:arch/m68k/include/asm/mmu.h
-f:arch/m68k/include/asm/mmu_context.h
-f:arch/m68k/include/asm/module.h
-f:arch/m68k/include/asm/module.lds.h
-f:arch/m68k/include/asm/motorola_pgalloc.h
-f:arch/m68k/include/asm/motorola_pgtable.h
-f:arch/m68k/include/asm/movs.h
-f:arch/m68k/include/asm/mvme147hw.h
-f:arch/m68k/include/asm/mvme16xhw.h
-f:arch/m68k/include/asm/natfeat.h
-f:arch/m68k/include/asm/nettel.h
-f:arch/m68k/include/asm/nubus.h
-f:arch/m68k/include/asm/openprom.h
-f:arch/m68k/include/asm/oplib.h
-f:arch/m68k/include/asm/page.h
-f:arch/m68k/include/asm/page_mm.h
-f:arch/m68k/include/asm/page_no.h
-f:arch/m68k/include/asm/page_offset.h
-f:arch/m68k/include/asm/parport.h
-f:arch/m68k/include/asm/pci.h
-f:arch/m68k/include/asm/pgalloc.h
-f:arch/m68k/include/asm/pgtable.h
-f:arch/m68k/include/asm/pgtable_mm.h
-f:arch/m68k/include/asm/pgtable_no.h
-f:arch/m68k/include/asm/processor.h
-f:arch/m68k/include/asm/ptrace.h
-f:arch/m68k/include/asm/q40_master.h
-f:arch/m68k/include/asm/q40ints.h
-f:arch/m68k/include/asm/quicc_simple.h
-f:arch/m68k/include/asm/raw_io.h
-f:arch/m68k/include/asm/seccomp.h
-f:arch/m68k/include/asm/serial.h
-f:arch/m68k/include/asm/setup.h
-f:arch/m68k/include/asm/signal.h
-f:arch/m68k/include/asm/smp.h
-f:arch/m68k/include/asm/string.h
-f:arch/m68k/include/asm/sun3-head.h
-f:arch/m68k/include/asm/sun3_pgalloc.h
-f:arch/m68k/include/asm/sun3_pgtable.h
-f:arch/m68k/include/asm/sun3ints.h
-f:arch/m68k/include/asm/sun3mmu.h
-f:arch/m68k/include/asm/sun3x.h
-f:arch/m68k/include/asm/sun3xflop.h
-f:arch/m68k/include/asm/sun3xprom.h
-f:arch/m68k/include/asm/switch_to.h
-f:arch/m68k/include/asm/syscall.h
-f:arch/m68k/include/asm/syscalls.h
-f:arch/m68k/include/asm/thread_info.h
-f:arch/m68k/include/asm/timex.h
-f:arch/m68k/include/asm/tlb.h
-f:arch/m68k/include/asm/tlbflush.h
-f:arch/m68k/include/asm/traps.h
-f:arch/m68k/include/asm/uaccess.h
-f:arch/m68k/include/asm/ucontext.h
-f:arch/m68k/include/asm/unistd.h
-f:arch/m68k/include/asm/user.h
-f:arch/m68k/include/asm/vga.h
-f:arch/m68k/include/asm/video.h
-f:arch/m68k/include/asm/virt.h
-f:arch/m68k/include/asm/virtconvert.h
-f:arch/m68k/include/asm/vmalloc.h
-f:arch/m68k/include/asm/zorro.h
-f:arch/m68k/include/uapi/asm/Kbuild
-f:arch/m68k/include/uapi/asm/a.out.h
-f:arch/m68k/include/uapi/asm/bootinfo-amiga.h
-f:arch/m68k/include/uapi/asm/bootinfo-apollo.h
-f:arch/m68k/include/uapi/asm/bootinfo-atari.h
-f:arch/m68k/include/uapi/asm/bootinfo-hp300.h
-f:arch/m68k/include/uapi/asm/bootinfo-mac.h
-f:arch/m68k/include/uapi/asm/bootinfo-q40.h
-f:arch/m68k/include/uapi/asm/bootinfo-virt.h
-f:arch/m68k/include/uapi/asm/bootinfo-vme.h
-f:arch/m68k/include/uapi/asm/bootinfo.h
-f:arch/m68k/include/uapi/asm/byteorder.h
-f:arch/m68k/include/uapi/asm/cachectl.h
-f:arch/m68k/include/uapi/asm/fcntl.h
-f:arch/m68k/include/uapi/asm/ioctls.h
-f:arch/m68k/include/uapi/asm/param.h
-f:arch/m68k/include/uapi/asm/poll.h
-f:arch/m68k/include/uapi/asm/posix_types.h
-f:arch/m68k/include/uapi/asm/ptrace.h
-f:arch/m68k/include/uapi/asm/setup.h
-f:arch/m68k/include/uapi/asm/sigcontext.h
-f:arch/m68k/include/uapi/asm/signal.h
-f:arch/m68k/include/uapi/asm/stat.h
-f:arch/m68k/include/uapi/asm/swab.h
-f:arch/m68k/include/uapi/asm/unistd.h
-f:arch/m68k/install.sh
-f:arch/m68k/kernel/.gitignore
-f:arch/m68k/kernel/Makefile
-f:arch/m68k/kernel/asm-offsets.c
-f:arch/m68k/kernel/bootinfo_proc.c
-f:arch/m68k/kernel/dma.c
-f:arch/m68k/kernel/early_printk.c
-f:arch/m68k/kernel/entry.S
-f:arch/m68k/kernel/head.S
-f:arch/m68k/kernel/ints.c
-f:arch/m68k/kernel/ints.h
-f:arch/m68k/kernel/irq.c
-f:arch/m68k/kernel/machine_kexec.c
-f:arch/m68k/kernel/module.c
-f:arch/m68k/kernel/pcibios.c
-f:arch/m68k/kernel/process.c
-f:arch/m68k/kernel/process.h
-f:arch/m68k/kernel/ptrace.c
-f:arch/m68k/kernel/ptrace.h
-f:arch/m68k/kernel/relocate_kernel.S
-f:arch/m68k/kernel/setup.c
-f:arch/m68k/kernel/setup_mm.c
-f:arch/m68k/kernel/setup_no.c
-f:arch/m68k/kernel/signal.c
-f:arch/m68k/kernel/signal.h
-f:arch/m68k/kernel/sun3-head.S
-f:arch/m68k/kernel/sys_m68k.c
-f:arch/m68k/kernel/syscalls/Makefile
-f:arch/m68k/kernel/syscalls/syscall.tbl
-f:arch/m68k/kernel/syscalltable.S
-f:arch/m68k/kernel/time.c
-f:arch/m68k/kernel/traps.c
-f:arch/m68k/kernel/traps.h
-f:arch/m68k/kernel/uboot.c
-f:arch/m68k/kernel/vectors.c
-f:arch/m68k/kernel/vectors.h
-f:arch/m68k/kernel/vmlinux-nommu.lds
-f:arch/m68k/kernel/vmlinux-std.lds
-f:arch/m68k/kernel/vmlinux-sun3.lds
-f:arch/m68k/kernel/vmlinux.lds.S
-f:arch/m68k/lib/Makefile
-f:arch/m68k/lib/checksum.c
-f:arch/m68k/lib/divsi3.S
-f:arch/m68k/lib/memcpy.c
-f:arch/m68k/lib/memmove.c
-f:arch/m68k/lib/memset.c
-f:arch/m68k/lib/modsi3.S
-f:arch/m68k/lib/mulsi3.S
-f:arch/m68k/lib/uaccess.c
-f:arch/m68k/lib/udivsi3.S
-f:arch/m68k/lib/umodsi3.S
-f:arch/m68k/mac/Makefile
-f:arch/m68k/mac/baboon.c
-f:arch/m68k/mac/config.c
-f:arch/m68k/mac/iop.c
-f:arch/m68k/mac/mac.h
-f:arch/m68k/mac/mac_penguin.S
-f:arch/m68k/mac/macboing.c
-f:arch/m68k/mac/macints.c
-f:arch/m68k/mac/misc.c
-f:arch/m68k/mac/oss.c
-f:arch/m68k/mac/psc.c
-f:arch/m68k/mac/via.c
-f:arch/m68k/math-emu/Makefile
-f:arch/m68k/math-emu/fp_arith.c
-f:arch/m68k/math-emu/fp_arith.h
-f:arch/m68k/math-emu/fp_cond.S
-f:arch/m68k/math-emu/fp_decode.h
-f:arch/m68k/math-emu/fp_emu.h
-f:arch/m68k/math-emu/fp_entry.S
-f:arch/m68k/math-emu/fp_log.c
-f:arch/m68k/math-emu/fp_log.h
-f:arch/m68k/math-emu/fp_move.S
-f:arch/m68k/math-emu/fp_movem.S
-f:arch/m68k/math-emu/fp_scan.S
-f:arch/m68k/math-emu/fp_trig.c
-f:arch/m68k/math-emu/fp_trig.h
-f:arch/m68k/math-emu/fp_util.S
-f:arch/m68k/math-emu/multi_arith.h
-f:arch/m68k/mm/Makefile
-f:arch/m68k/mm/cache.c
-f:arch/m68k/mm/fault.c
-f:arch/m68k/mm/fault.h
-f:arch/m68k/mm/hwtest.c
-f:arch/m68k/mm/init.c
-f:arch/m68k/mm/kmap.c
-f:arch/m68k/mm/mcfmmu.c
-f:arch/m68k/mm/memory.c
-f:arch/m68k/mm/motorola.c
-f:arch/m68k/mm/sun3kmap.c
-f:arch/m68k/mm/sun3mmu.c
-f:arch/m68k/mvme147/Makefile
-f:arch/m68k/mvme147/config.c
-f:arch/m68k/mvme147/mvme147.h
-f:arch/m68k/mvme16x/Makefile
-f:arch/m68k/mvme16x/config.c
-f:arch/m68k/mvme16x/mvme16x.h
-f:arch/m68k/q40/Makefile
-f:arch/m68k/q40/README
-f:arch/m68k/q40/config.c
-f:arch/m68k/q40/q40.h
-f:arch/m68k/q40/q40ints.c
-f:arch/m68k/sun3/Makefile
-f:arch/m68k/sun3/config.c
-f:arch/m68k/sun3/dvma.c
-f:arch/m68k/sun3/idprom.c
-f:arch/m68k/sun3/intersil.c
-f:arch/m68k/sun3/leds.c
-f:arch/m68k/sun3/mmu_emu.c
-f:arch/m68k/sun3/prom/Makefile
-f:arch/m68k/sun3/prom/console.c
-f:arch/m68k/sun3/prom/init.c
-f:arch/m68k/sun3/prom/misc.c
-f:arch/m68k/sun3/prom/printf.c
-f:arch/m68k/sun3/sun3.h
-f:arch/m68k/sun3/sun3dvma.c
-f:arch/m68k/sun3/sun3ints.c
-f:arch/m68k/sun3x/Makefile
-f:arch/m68k/sun3x/config.c
-f:arch/m68k/sun3x/dvma.c
-f:arch/m68k/sun3x/prom.c
-f:arch/m68k/sun3x/time.c
-f:arch/m68k/sun3x/time.h
-f:arch/m68k/tools/amiga/Makefile
-f:arch/m68k/tools/amiga/dmesg.c
-f:arch/m68k/virt/Makefile
-f:arch/m68k/virt/config.c
-f:arch/m68k/virt/ints.c
-f:arch/m68k/virt/platform.c
-f:arch/microblaze/Kbuild
-f:arch/microblaze/Kconfig
-f:arch/microblaze/Kconfig.debug
-f:arch/microblaze/Kconfig.platform
-f:arch/microblaze/Makefile
-f:arch/microblaze/boot/.gitignore
-f:arch/microblaze/boot/Makefile
-f:arch/microblaze/boot/dts/Makefile
-f:arch/microblaze/boot/dts/linked_dtb.S
-f:arch/microblaze/boot/dts/system.dts
-f:arch/microblaze/configs/mmu_defconfig
-f:arch/microblaze/include/asm/Kbuild
-f:arch/microblaze/include/asm/asm-compat.h
-f:arch/microblaze/include/asm/asm-offsets.h
-f:arch/microblaze/include/asm/barrier.h
-f:arch/microblaze/include/asm/cache.h
-f:arch/microblaze/include/asm/cacheflush.h
-f:arch/microblaze/include/asm/checksum.h
-f:arch/microblaze/include/asm/cpuinfo.h
-f:arch/microblaze/include/asm/current.h
-f:arch/microblaze/include/asm/delay.h
-f:arch/microblaze/include/asm/dma.h
-f:arch/microblaze/include/asm/elf.h
-f:arch/microblaze/include/asm/entry.h
-f:arch/microblaze/include/asm/exceptions.h
-f:arch/microblaze/include/asm/fixmap.h
-f:arch/microblaze/include/asm/flat.h
-f:arch/microblaze/include/asm/ftrace.h
-f:arch/microblaze/include/asm/futex.h
-f:arch/microblaze/include/asm/hash.h
-f:arch/microblaze/include/asm/highmem.h
-f:arch/microblaze/include/asm/io.h
-f:arch/microblaze/include/asm/irq.h
-f:arch/microblaze/include/asm/irqflags.h
-f:arch/microblaze/include/asm/kgdb.h
-f:arch/microblaze/include/asm/mmu.h
-f:arch/microblaze/include/asm/mmu_context.h
-f:arch/microblaze/include/asm/mmu_context_mm.h
-f:arch/microblaze/include/asm/module.h
-f:arch/microblaze/include/asm/page.h
-f:arch/microblaze/include/asm/pci-bridge.h
-f:arch/microblaze/include/asm/pci.h
-f:arch/microblaze/include/asm/pgalloc.h
-f:arch/microblaze/include/asm/pgtable.h
-f:arch/microblaze/include/asm/processor.h
-f:arch/microblaze/include/asm/ptrace.h
-f:arch/microblaze/include/asm/pvr.h
-f:arch/microblaze/include/asm/registers.h
-f:arch/microblaze/include/asm/seccomp.h
-f:arch/microblaze/include/asm/sections.h
-f:arch/microblaze/include/asm/setup.h
-f:arch/microblaze/include/asm/string.h
-f:arch/microblaze/include/asm/switch_to.h
-f:arch/microblaze/include/asm/syscall.h
-f:arch/microblaze/include/asm/thread_info.h
-f:arch/microblaze/include/asm/timex.h
-f:arch/microblaze/include/asm/tlbflush.h
-f:arch/microblaze/include/asm/uaccess.h
-f:arch/microblaze/include/asm/unistd.h
-f:arch/microblaze/include/asm/unwind.h
-f:arch/microblaze/include/asm/vmalloc.h
-f:arch/microblaze/include/asm/xilinx_mb_manager.h
-f:arch/microblaze/include/uapi/asm/Kbuild
-f:arch/microblaze/include/uapi/asm/auxvec.h
-f:arch/microblaze/include/uapi/asm/byteorder.h
-f:arch/microblaze/include/uapi/asm/elf.h
-f:arch/microblaze/include/uapi/asm/posix_types.h
-f:arch/microblaze/include/uapi/asm/ptrace.h
-f:arch/microblaze/include/uapi/asm/setup.h
-f:arch/microblaze/include/uapi/asm/sigcontext.h
-f:arch/microblaze/include/uapi/asm/unistd.h
-f:arch/microblaze/kernel/.gitignore
-f:arch/microblaze/kernel/Makefile
-f:arch/microblaze/kernel/asm-offsets.c
-f:arch/microblaze/kernel/cpu/Makefile
-f:arch/microblaze/kernel/cpu/cache.c
-f:arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c
-f:arch/microblaze/kernel/cpu/cpuinfo-static.c
-f:arch/microblaze/kernel/cpu/cpuinfo.c
-f:arch/microblaze/kernel/cpu/mb.c
-f:arch/microblaze/kernel/cpu/pvr.c
-f:arch/microblaze/kernel/dma.c
-f:arch/microblaze/kernel/entry.S
-f:arch/microblaze/kernel/exceptions.c
-f:arch/microblaze/kernel/ftrace.c
-f:arch/microblaze/kernel/head.S
-f:arch/microblaze/kernel/hw_exception_handler.S
-f:arch/microblaze/kernel/irq.c
-f:arch/microblaze/kernel/kgdb.c
-f:arch/microblaze/kernel/mcount.S
-f:arch/microblaze/kernel/microblaze_ksyms.c
-f:arch/microblaze/kernel/misc.S
-f:arch/microblaze/kernel/module.c
-f:arch/microblaze/kernel/process.c
-f:arch/microblaze/kernel/prom.c
-f:arch/microblaze/kernel/ptrace.c
-f:arch/microblaze/kernel/reset.c
-f:arch/microblaze/kernel/setup.c
-f:arch/microblaze/kernel/signal.c
-f:arch/microblaze/kernel/stacktrace.c
-f:arch/microblaze/kernel/sys_microblaze.c
-f:arch/microblaze/kernel/syscall_table.S
-f:arch/microblaze/kernel/syscalls/Makefile
-f:arch/microblaze/kernel/syscalls/syscall.tbl
-f:arch/microblaze/kernel/timer.c
-f:arch/microblaze/kernel/traps.c
-f:arch/microblaze/kernel/unwind.c
-f:arch/microblaze/kernel/vmlinux.lds.S
-f:arch/microblaze/lib/Makefile
-f:arch/microblaze/lib/ashldi3.c
-f:arch/microblaze/lib/ashrdi3.c
-f:arch/microblaze/lib/cmpdi2.c
-f:arch/microblaze/lib/divsi3.S
-f:arch/microblaze/lib/fastcopy.S
-f:arch/microblaze/lib/libgcc.h
-f:arch/microblaze/lib/lshrdi3.c
-f:arch/microblaze/lib/memcpy.c
-f:arch/microblaze/lib/memmove.c
-f:arch/microblaze/lib/memset.c
-f:arch/microblaze/lib/modsi3.S
-f:arch/microblaze/lib/muldi3.c
-f:arch/microblaze/lib/mulsi3.S
-f:arch/microblaze/lib/uaccess_old.S
-f:arch/microblaze/lib/ucmpdi2.c
-f:arch/microblaze/lib/udivsi3.S
-f:arch/microblaze/lib/umodsi3.S
-f:arch/microblaze/mm/Makefile
-f:arch/microblaze/mm/consistent.c
-f:arch/microblaze/mm/fault.c
-f:arch/microblaze/mm/init.c
-f:arch/microblaze/mm/mmu_context.c
-f:arch/microblaze/mm/pgtable.c
-f:arch/microblaze/pci/Makefile
-f:arch/microblaze/pci/iomap.c
-f:arch/mips/Kbuild
-f:arch/mips/Kbuild.platforms
-f:arch/mips/Kconfig
-f:arch/mips/Kconfig.debug
-f:arch/mips/Makefile
-f:arch/mips/Makefile.postlink
-f:arch/mips/alchemy/Kconfig
-f:arch/mips/alchemy/Makefile
-f:arch/mips/alchemy/Platform
-f:arch/mips/alchemy/board-gpr.c
-f:arch/mips/alchemy/board-mtx1.c
-f:arch/mips/alchemy/board-xxs1500.c
-f:arch/mips/alchemy/common/Makefile
-f:arch/mips/alchemy/common/clock.c
-f:arch/mips/alchemy/common/dbdma.c
-f:arch/mips/alchemy/common/dma.c
-f:arch/mips/alchemy/common/gpiolib.c
-f:arch/mips/alchemy/common/irq.c
-f:arch/mips/alchemy/common/platform.c
-f:arch/mips/alchemy/common/power.c
-f:arch/mips/alchemy/common/prom.c
-f:arch/mips/alchemy/common/setup.c
-f:arch/mips/alchemy/common/sleeper.S
-f:arch/mips/alchemy/common/time.c
-f:arch/mips/alchemy/common/usb.c
-f:arch/mips/alchemy/common/vss.c
-f:arch/mips/alchemy/devboards/Makefile
-f:arch/mips/alchemy/devboards/bcsr.c
-f:arch/mips/alchemy/devboards/db1000.c
-f:arch/mips/alchemy/devboards/db1200.c
-f:arch/mips/alchemy/devboards/db1300.c
-f:arch/mips/alchemy/devboards/db1550.c
-f:arch/mips/alchemy/devboards/db1xxx.c
-f:arch/mips/alchemy/devboards/platform.c
-f:arch/mips/alchemy/devboards/platform.h
-f:arch/mips/alchemy/devboards/pm.c
-f:arch/mips/ath25/Kconfig
-f:arch/mips/ath25/Makefile
-f:arch/mips/ath25/Platform
-f:arch/mips/ath25/ar2315.c
-f:arch/mips/ath25/ar2315.h
-f:arch/mips/ath25/ar2315_regs.h
-f:arch/mips/ath25/ar5312.c
-f:arch/mips/ath25/ar5312.h
-f:arch/mips/ath25/ar5312_regs.h
-f:arch/mips/ath25/board.c
-f:arch/mips/ath25/devices.c
-f:arch/mips/ath25/devices.h
-f:arch/mips/ath25/early_printk.c
-f:arch/mips/ath25/prom.c
-f:arch/mips/ath79/Kconfig
-f:arch/mips/ath79/Makefile
-f:arch/mips/ath79/Platform
-f:arch/mips/ath79/clock.c
-f:arch/mips/ath79/common.c
-f:arch/mips/ath79/common.h
-f:arch/mips/ath79/early_printk.c
-f:arch/mips/ath79/prom.c
-f:arch/mips/ath79/setup.c
-f:arch/mips/bcm47xx/Kconfig
-f:arch/mips/bcm47xx/Makefile
-f:arch/mips/bcm47xx/Platform
-f:arch/mips/bcm47xx/bcm47xx_private.h
-f:arch/mips/bcm47xx/board.c
-f:arch/mips/bcm47xx/buttons.c
-f:arch/mips/bcm47xx/irq.c
-f:arch/mips/bcm47xx/leds.c
-f:arch/mips/bcm47xx/prom.c
-f:arch/mips/bcm47xx/serial.c
-f:arch/mips/bcm47xx/setup.c
-f:arch/mips/bcm47xx/time.c
-f:arch/mips/bcm47xx/workarounds.c
-f:arch/mips/bcm63xx/Kconfig
-f:arch/mips/bcm63xx/Makefile
-f:arch/mips/bcm63xx/Platform
-f:arch/mips/bcm63xx/boards/Kconfig
-f:arch/mips/bcm63xx/boards/Makefile
-f:arch/mips/bcm63xx/boards/board_bcm963xx.c
-f:arch/mips/bcm63xx/clk.c
-f:arch/mips/bcm63xx/cpu.c
-f:arch/mips/bcm63xx/cs.c
-f:arch/mips/bcm63xx/dev-enet.c
-f:arch/mips/bcm63xx/dev-flash.c
-f:arch/mips/bcm63xx/dev-hsspi.c
-f:arch/mips/bcm63xx/dev-pcmcia.c
-f:arch/mips/bcm63xx/dev-rng.c
-f:arch/mips/bcm63xx/dev-spi.c
-f:arch/mips/bcm63xx/dev-uart.c
-f:arch/mips/bcm63xx/dev-usb-usbd.c
-f:arch/mips/bcm63xx/dev-wdt.c
-f:arch/mips/bcm63xx/early_printk.c
-f:arch/mips/bcm63xx/gpio.c
-f:arch/mips/bcm63xx/irq.c
-f:arch/mips/bcm63xx/nvram.c
-f:arch/mips/bcm63xx/prom.c
-f:arch/mips/bcm63xx/reset.c
-f:arch/mips/bcm63xx/setup.c
-f:arch/mips/bcm63xx/timer.c
-f:arch/mips/bmips/Kconfig
-f:arch/mips/bmips/Makefile
-f:arch/mips/bmips/Platform
-f:arch/mips/bmips/dma.c
-f:arch/mips/bmips/irq.c
-f:arch/mips/bmips/setup.c
-f:arch/mips/boot/.gitignore
-f:arch/mips/boot/Makefile
-f:arch/mips/boot/compressed/Makefile
-f:arch/mips/boot/compressed/ashldi3.c
-f:arch/mips/boot/compressed/bswapdi.c
-f:arch/mips/boot/compressed/bswapsi.c
-f:arch/mips/boot/compressed/calc_vmlinuz_load_addr.c
-f:arch/mips/boot/compressed/clz_ctz.c
-f:arch/mips/boot/compressed/dbg.c
-f:arch/mips/boot/compressed/decompress.c
-f:arch/mips/boot/compressed/decompress.h
-f:arch/mips/boot/compressed/dummy.c
-f:arch/mips/boot/compressed/head.S
-f:arch/mips/boot/compressed/ld.script
-f:arch/mips/boot/compressed/string.c
-f:arch/mips/boot/compressed/uart-16550.c
-f:arch/mips/boot/compressed/uart-alchemy.c
-f:arch/mips/boot/compressed/uart-ath79.c
-f:arch/mips/boot/compressed/uart-prom.c
-f:arch/mips/boot/dts/Makefile
-f:arch/mips/boot/dts/brcm/Makefile
-f:arch/mips/boot/dts/brcm/bcm3368-netgear-cvg834g.dts
-f:arch/mips/boot/dts/brcm/bcm3368.dtsi
-f:arch/mips/boot/dts/brcm/bcm3384_viper.dtsi
-f:arch/mips/boot/dts/brcm/bcm3384_zephyr.dtsi
-f:arch/mips/boot/dts/brcm/bcm63268-comtrend-vr-3032u.dts
-f:arch/mips/boot/dts/brcm/bcm63268.dtsi
-f:arch/mips/boot/dts/brcm/bcm6328.dtsi
-f:arch/mips/boot/dts/brcm/bcm6358-neufbox4-sercomm.dts
-f:arch/mips/boot/dts/brcm/bcm6358.dtsi
-f:arch/mips/boot/dts/brcm/bcm6362-neufbox6-sercomm.dts
-f:arch/mips/boot/dts/brcm/bcm6362.dtsi
-f:arch/mips/boot/dts/brcm/bcm6368.dtsi
-f:arch/mips/boot/dts/brcm/bcm7125.dtsi
-f:arch/mips/boot/dts/brcm/bcm7346.dtsi
-f:arch/mips/boot/dts/brcm/bcm7358.dtsi
-f:arch/mips/boot/dts/brcm/bcm7360.dtsi
-f:arch/mips/boot/dts/brcm/bcm7362.dtsi
-f:arch/mips/boot/dts/brcm/bcm7420.dtsi
-f:arch/mips/boot/dts/brcm/bcm7425.dtsi
-f:arch/mips/boot/dts/brcm/bcm7435.dtsi
-f:arch/mips/boot/dts/brcm/bcm93384wvg.dts
-f:arch/mips/boot/dts/brcm/bcm93384wvg_viper.dts
-f:arch/mips/boot/dts/brcm/bcm96368mvwg.dts
-f:arch/mips/boot/dts/brcm/bcm97125cbmb.dts
-f:arch/mips/boot/dts/brcm/bcm97346dbsmb.dts
-f:arch/mips/boot/dts/brcm/bcm97358svmb.dts
-f:arch/mips/boot/dts/brcm/bcm97360svmb.dts
-f:arch/mips/boot/dts/brcm/bcm97362svmb.dts
-f:arch/mips/boot/dts/brcm/bcm97420c.dts
-f:arch/mips/boot/dts/brcm/bcm97425svmb.dts
-f:arch/mips/boot/dts/brcm/bcm97435svmb.dts
-f:arch/mips/boot/dts/brcm/bcm97xxx-nand-cs1-bch24.dtsi
-f:arch/mips/boot/dts/brcm/bcm97xxx-nand-cs1-bch4.dtsi
-f:arch/mips/boot/dts/brcm/bcm9ejtagprb.dts
-f:arch/mips/boot/dts/cavium-octeon/Makefile
-f:arch/mips/boot/dts/cavium-octeon/dlink_dsr-1000n.dts
-f:arch/mips/boot/dts/cavium-octeon/dlink_dsr-500n-1000n.dtsi
-f:arch/mips/boot/dts/cavium-octeon/dlink_dsr-500n.dts
-f:arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dts
-f:arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dtsi
-f:arch/mips/boot/dts/cavium-octeon/octeon_68xx.dts
-f:arch/mips/boot/dts/cavium-octeon/ubnt_e100.dts
-f:arch/mips/boot/dts/econet/Makefile
-f:arch/mips/boot/dts/econet/en751221.dtsi
-f:arch/mips/boot/dts/econet/en751221_smartfiber_xp8421-b.dts
-f:arch/mips/boot/dts/img/Makefile
-f:arch/mips/boot/dts/img/boston.dts
-f:arch/mips/boot/dts/img/pistachio.dtsi
-f:arch/mips/boot/dts/img/pistachio_marduk.dts
-f:arch/mips/boot/dts/ingenic/Makefile
-f:arch/mips/boot/dts/ingenic/ci20.dts
-f:arch/mips/boot/dts/ingenic/cu1000-neo.dts
-f:arch/mips/boot/dts/ingenic/cu1830-neo.dts
-f:arch/mips/boot/dts/ingenic/gcw0.dts
-f:arch/mips/boot/dts/ingenic/gcw0_proto.dts
-f:arch/mips/boot/dts/ingenic/jz4725b.dtsi
-f:arch/mips/boot/dts/ingenic/jz4740.dtsi
-f:arch/mips/boot/dts/ingenic/jz4770.dtsi
-f:arch/mips/boot/dts/ingenic/jz4780.dtsi
-f:arch/mips/boot/dts/ingenic/qi_lb60.dts
-f:arch/mips/boot/dts/ingenic/rs90.dts
-f:arch/mips/boot/dts/ingenic/x1000.dtsi
-f:arch/mips/boot/dts/ingenic/x1830.dtsi
-f:arch/mips/boot/dts/lantiq/Makefile
-f:arch/mips/boot/dts/lantiq/danube.dtsi
-f:arch/mips/boot/dts/lantiq/danube_easy50712.dts
-f:arch/mips/boot/dts/loongson/Makefile
-f:arch/mips/boot/dts/loongson/loongson64-2k1000.dtsi
-f:arch/mips/boot/dts/loongson/loongson64_2core_2k1000.dts
-f:arch/mips/boot/dts/loongson/loongson64c-package.dtsi
-f:arch/mips/boot/dts/loongson/loongson64c_4core_ls7a.dts
-f:arch/mips/boot/dts/loongson/loongson64c_4core_rs780e.dts
-f:arch/mips/boot/dts/loongson/loongson64c_8core_rs780e.dts
-f:arch/mips/boot/dts/loongson/loongson64g-package.dtsi
-f:arch/mips/boot/dts/loongson/loongson64g_4core_ls7a.dts
-f:arch/mips/boot/dts/loongson/loongson64v_4core_virtio.dts
-f:arch/mips/boot/dts/loongson/ls7a-pch.dtsi
-f:arch/mips/boot/dts/loongson/rs780e-pch.dtsi
-f:arch/mips/boot/dts/mobileye/Makefile
-f:arch/mips/boot/dts/mobileye/eyeq5-epm5.dts
-f:arch/mips/boot/dts/mobileye/eyeq5-pins.dtsi
-f:arch/mips/boot/dts/mobileye/eyeq5.dtsi
-f:arch/mips/boot/dts/mobileye/eyeq6h-epm6.dts
-f:arch/mips/boot/dts/mobileye/eyeq6h-pins.dtsi
-f:arch/mips/boot/dts/mobileye/eyeq6h.dtsi
-f:arch/mips/boot/dts/mscc/Makefile
-f:arch/mips/boot/dts/mscc/jaguar2.dtsi
-f:arch/mips/boot/dts/mscc/jaguar2_common.dtsi
-f:arch/mips/boot/dts/mscc/jaguar2_pcb110.dts
-f:arch/mips/boot/dts/mscc/jaguar2_pcb111.dts
-f:arch/mips/boot/dts/mscc/jaguar2_pcb118.dts
-f:arch/mips/boot/dts/mscc/luton.dtsi
-f:arch/mips/boot/dts/mscc/luton_pcb091.dts
-f:arch/mips/boot/dts/mscc/ocelot.dtsi
-f:arch/mips/boot/dts/mscc/ocelot_pcb120.dts
-f:arch/mips/boot/dts/mscc/ocelot_pcb123.dts
-f:arch/mips/boot/dts/mscc/serval.dtsi
-f:arch/mips/boot/dts/mscc/serval_common.dtsi
-f:arch/mips/boot/dts/mscc/serval_pcb105.dts
-f:arch/mips/boot/dts/mscc/serval_pcb106.dts
-f:arch/mips/boot/dts/mti/Makefile
-f:arch/mips/boot/dts/mti/malta.dts
-f:arch/mips/boot/dts/mti/sead3.dts
-f:arch/mips/boot/dts/ni/169445.dts
-f:arch/mips/boot/dts/ni/Makefile
-f:arch/mips/boot/dts/pic32/Makefile
-f:arch/mips/boot/dts/pic32/pic32mzda.dtsi
-f:arch/mips/boot/dts/pic32/pic32mzda_sk.dts
-f:arch/mips/boot/dts/qca/Makefile
-f:arch/mips/boot/dts/qca/ar9132.dtsi
-f:arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
-f:arch/mips/boot/dts/qca/ar9331.dtsi
-f:arch/mips/boot/dts/qca/ar9331_dpt_module.dts
-f:arch/mips/boot/dts/qca/ar9331_dragino_ms14.dts
-f:arch/mips/boot/dts/qca/ar9331_omega.dts
-f:arch/mips/boot/dts/qca/ar9331_openembed_som9331_board.dts
-f:arch/mips/boot/dts/qca/ar9331_tl_mr3020.dts
-f:arch/mips/boot/dts/ralink/Makefile
-f:arch/mips/boot/dts/ralink/gardena_smart_gateway_mt7688.dts
-f:arch/mips/boot/dts/ralink/mt7620a.dtsi
-f:arch/mips/boot/dts/ralink/mt7620a_eval.dts
-f:arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc1.dts
-f:arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts
-f:arch/mips/boot/dts/ralink/mt7621-tplink-hc220-g5-v1.dts
-f:arch/mips/boot/dts/ralink/mt7621.dtsi
-f:arch/mips/boot/dts/ralink/mt7628a.dtsi
-f:arch/mips/boot/dts/ralink/omega2p.dts
-f:arch/mips/boot/dts/ralink/rt2880.dtsi
-f:arch/mips/boot/dts/ralink/rt2880_eval.dts
-f:arch/mips/boot/dts/ralink/rt3050.dtsi
-f:arch/mips/boot/dts/ralink/rt3052_eval.dts
-f:arch/mips/boot/dts/ralink/rt3883.dtsi
-f:arch/mips/boot/dts/ralink/rt3883_eval.dts
-f:arch/mips/boot/dts/ralink/vocore2.dts
-f:arch/mips/boot/dts/realtek/Makefile
-f:arch/mips/boot/dts/realtek/cameo-rtl9302c-2x-rtl8224-2xge.dts
-f:arch/mips/boot/dts/realtek/cisco_sg220-26.dts
-f:arch/mips/boot/dts/realtek/rtl838x.dtsi
-f:arch/mips/boot/dts/realtek/rtl9302c.dtsi
-f:arch/mips/boot/dts/realtek/rtl930x.dtsi
-f:arch/mips/boot/dts/xilfpga/Makefile
-f:arch/mips/boot/dts/xilfpga/microAptiv.dtsi
-f:arch/mips/boot/dts/xilfpga/nexys4ddr.dts
-f:arch/mips/boot/ecoff.h
-f:arch/mips/boot/elf2ecoff.c
-f:arch/mips/boot/tools/.gitignore
-f:arch/mips/boot/tools/Makefile
-f:arch/mips/boot/tools/relocs.c
-f:arch/mips/boot/tools/relocs.h
-f:arch/mips/boot/tools/relocs_32.c
-f:arch/mips/boot/tools/relocs_64.c
-f:arch/mips/boot/tools/relocs_main.c
-f:arch/mips/cavium-octeon/Kconfig
-f:arch/mips/cavium-octeon/Makefile
-f:arch/mips/cavium-octeon/Platform
-f:arch/mips/cavium-octeon/cpu.c
-f:arch/mips/cavium-octeon/crypto/Makefile
-f:arch/mips/cavium-octeon/crypto/octeon-crypto.c
-f:arch/mips/cavium-octeon/crypto/octeon-md5.c
-f:arch/mips/cavium-octeon/csrc-octeon.c
-f:arch/mips/cavium-octeon/dma-octeon.c
-f:arch/mips/cavium-octeon/executive/Makefile
-f:arch/mips/cavium-octeon/executive/cvmx-boot-vector.c
-f:arch/mips/cavium-octeon/executive/cvmx-bootmem.c
-f:arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c
-f:arch/mips/cavium-octeon/executive/cvmx-helper-board.c
-f:arch/mips/cavium-octeon/executive/cvmx-helper-errata.c
-f:arch/mips/cavium-octeon/executive/cvmx-helper-jtag.c
-f:arch/mips/cavium-octeon/executive/cvmx-helper-loop.c
-f:arch/mips/cavium-octeon/executive/cvmx-helper-npi.c
-f:arch/mips/cavium-octeon/executive/cvmx-helper-rgmii.c
-f:arch/mips/cavium-octeon/executive/cvmx-helper-sgmii.c
-f:arch/mips/cavium-octeon/executive/cvmx-helper-spi.c
-f:arch/mips/cavium-octeon/executive/cvmx-helper-util.c
-f:arch/mips/cavium-octeon/executive/cvmx-helper-xaui.c
-f:arch/mips/cavium-octeon/executive/cvmx-helper.c
-f:arch/mips/cavium-octeon/executive/cvmx-interrupt-decodes.c
-f:arch/mips/cavium-octeon/executive/cvmx-interrupt-rsl.c
-f:arch/mips/cavium-octeon/executive/cvmx-l2c.c
-f:arch/mips/cavium-octeon/executive/cvmx-pko.c
-f:arch/mips/cavium-octeon/executive/cvmx-spi.c
-f:arch/mips/cavium-octeon/executive/cvmx-sysinfo.c
-f:arch/mips/cavium-octeon/executive/octeon-model.c
-f:arch/mips/cavium-octeon/flash_setup.c
-f:arch/mips/cavium-octeon/oct_ilm.c
-f:arch/mips/cavium-octeon/octeon-irq.c
-f:arch/mips/cavium-octeon/octeon-memcpy.S
-f:arch/mips/cavium-octeon/octeon-platform.c
-f:arch/mips/cavium-octeon/octeon_boot.h
-f:arch/mips/cavium-octeon/setup.c
-f:arch/mips/cavium-octeon/smp.c
-f:arch/mips/cobalt/Makefile
-f:arch/mips/cobalt/Platform
-f:arch/mips/cobalt/buttons.c
-f:arch/mips/cobalt/irq.c
-f:arch/mips/cobalt/lcd.c
-f:arch/mips/cobalt/led.c
-f:arch/mips/cobalt/mtd.c
-f:arch/mips/cobalt/pci.c
-f:arch/mips/cobalt/reset.c
-f:arch/mips/cobalt/rtc.c
-f:arch/mips/cobalt/serial.c
-f:arch/mips/cobalt/setup.c
-f:arch/mips/cobalt/time.c
-f:arch/mips/configs/ath25_defconfig
-f:arch/mips/configs/ath79_defconfig
-f:arch/mips/configs/bcm47xx_defconfig
-f:arch/mips/configs/bcm63xx_defconfig
-f:arch/mips/configs/bigsur_defconfig
-f:arch/mips/configs/bmips_be_defconfig
-f:arch/mips/configs/bmips_stb_defconfig
-f:arch/mips/configs/cavium_octeon_defconfig
-f:arch/mips/configs/ci20_defconfig
-f:arch/mips/configs/cobalt_defconfig
-f:arch/mips/configs/cu1000-neo_defconfig
-f:arch/mips/configs/cu1830-neo_defconfig
-f:arch/mips/configs/db1xxx_defconfig
-f:arch/mips/configs/decstation_64_defconfig
-f:arch/mips/configs/decstation_defconfig
-f:arch/mips/configs/decstation_r4k_defconfig
-f:arch/mips/configs/eyeq5_defconfig
-f:arch/mips/configs/eyeq6_defconfig
-f:arch/mips/configs/fuloong2e_defconfig
-f:arch/mips/configs/gcw0_defconfig
-f:arch/mips/configs/generic/32r1.config
-f:arch/mips/configs/generic/32r2.config
-f:arch/mips/configs/generic/32r6.config
-f:arch/mips/configs/generic/64r1.config
-f:arch/mips/configs/generic/64r2.config
-f:arch/mips/configs/generic/64r6.config
-f:arch/mips/configs/generic/board-boston.config
-f:arch/mips/configs/generic/board-litex.config
-f:arch/mips/configs/generic/board-marduk.config
-f:arch/mips/configs/generic/board-ni169445.config
-f:arch/mips/configs/generic/board-ocelot.config
-f:arch/mips/configs/generic/board-ranchu.config
-f:arch/mips/configs/generic/board-sead-3.config
-f:arch/mips/configs/generic/board-virt.config
-f:arch/mips/configs/generic/board-xilfpga.config
-f:arch/mips/configs/generic/eb.config
-f:arch/mips/configs/generic/el.config
-f:arch/mips/configs/generic/micro32r2.config
-f:arch/mips/configs/generic_defconfig
-f:arch/mips/configs/gpr_defconfig
-f:arch/mips/configs/ip22_defconfig
-f:arch/mips/configs/ip27_defconfig
-f:arch/mips/configs/ip28_defconfig
-f:arch/mips/configs/ip30_defconfig
-f:arch/mips/configs/ip32_defconfig
-f:arch/mips/configs/jazz_defconfig
-f:arch/mips/configs/lemote2f_defconfig
-f:arch/mips/configs/loongson1b_defconfig
-f:arch/mips/configs/loongson1c_defconfig
-f:arch/mips/configs/loongson2k_defconfig
-f:arch/mips/configs/loongson3_defconfig
-f:arch/mips/configs/malta_defconfig
-f:arch/mips/configs/malta_kvm_defconfig
-f:arch/mips/configs/malta_qemu_32r6_defconfig
-f:arch/mips/configs/maltaaprp_defconfig
-f:arch/mips/configs/maltasmvp_defconfig
-f:arch/mips/configs/maltasmvp_eva_defconfig
-f:arch/mips/configs/maltaup_defconfig
-f:arch/mips/configs/maltaup_xpa_defconfig
-f:arch/mips/configs/mtx1_defconfig
-f:arch/mips/configs/omega2p_defconfig
-f:arch/mips/configs/pic32mzda_defconfig
-f:arch/mips/configs/qi_lb60_defconfig
-f:arch/mips/configs/rb532_defconfig
-f:arch/mips/configs/rbtx49xx_defconfig
-f:arch/mips/configs/rm200_defconfig
-f:arch/mips/configs/rs90_defconfig
-f:arch/mips/configs/rt305x_defconfig
-f:arch/mips/configs/sb1250_swarm_defconfig
-f:arch/mips/configs/vocore2_defconfig
-f:arch/mips/configs/xway_defconfig
-f:arch/mips/crypto/.gitignore
-f:arch/mips/crypto/Kconfig
-f:arch/mips/crypto/Makefile
-f:arch/mips/dec/Makefile
-f:arch/mips/dec/Platform
-f:arch/mips/dec/ecc-berr.c
-f:arch/mips/dec/int-handler.S
-f:arch/mips/dec/ioasic-irq.c
-f:arch/mips/dec/kn01-berr.c
-f:arch/mips/dec/kn02-irq.c
-f:arch/mips/dec/kn02xa-berr.c
-f:arch/mips/dec/platform.c
-f:arch/mips/dec/prom/Makefile
-f:arch/mips/dec/prom/cmdline.c
-f:arch/mips/dec/prom/console.c
-f:arch/mips/dec/prom/dectypes.h
-f:arch/mips/dec/prom/identify.c
-f:arch/mips/dec/prom/init.c
-f:arch/mips/dec/prom/locore.S
-f:arch/mips/dec/prom/memory.c
-f:arch/mips/dec/reset.c
-f:arch/mips/dec/setup.c
-f:arch/mips/dec/tc.c
-f:arch/mips/dec/time.c
-f:arch/mips/dec/wbflush.c
-f:arch/mips/econet/Kconfig
-f:arch/mips/econet/Makefile
-f:arch/mips/econet/Platform
-f:arch/mips/econet/init.c
-f:arch/mips/fw/arc/Makefile
-f:arch/mips/fw/arc/arc_con.c
-f:arch/mips/fw/arc/cmdline.c
-f:arch/mips/fw/arc/env.c
-f:arch/mips/fw/arc/file.c
-f:arch/mips/fw/arc/identify.c
-f:arch/mips/fw/arc/init.c
-f:arch/mips/fw/arc/memory.c
-f:arch/mips/fw/arc/misc.c
-f:arch/mips/fw/arc/promlib.c
-f:arch/mips/fw/cfe/Makefile
-f:arch/mips/fw/cfe/cfe_api.c
-f:arch/mips/fw/cfe/cfe_api_int.h
-f:arch/mips/fw/lib/Makefile
-f:arch/mips/fw/lib/call_o32.S
-f:arch/mips/fw/lib/cmdline.c
-f:arch/mips/fw/sni/Makefile
-f:arch/mips/fw/sni/sniprom.c
-f:arch/mips/generic/Kconfig
-f:arch/mips/generic/Makefile
-f:arch/mips/generic/Platform
-f:arch/mips/generic/board-boston.its.S
-f:arch/mips/generic/board-ingenic.c
-f:arch/mips/generic/board-jaguar2.its.S
-f:arch/mips/generic/board-luton.its.S
-f:arch/mips/generic/board-marduk.its.S
-f:arch/mips/generic/board-ni169445.its.S
-f:arch/mips/generic/board-ocelot.c
-f:arch/mips/generic/board-ocelot.its.S
-f:arch/mips/generic/board-ranchu.c
-f:arch/mips/generic/board-realtek.c
-f:arch/mips/generic/board-sead3.c
-f:arch/mips/generic/board-serval.its.S
-f:arch/mips/generic/board-xilfpga.its.S
-f:arch/mips/generic/init.c
-f:arch/mips/generic/irq.c
-f:arch/mips/generic/proc.c
-f:arch/mips/generic/vmlinux.its.S
-f:arch/mips/generic/yamon-dt.c
-f:arch/mips/include/asm/Kbuild
-f:arch/mips/include/asm/abi.h
-f:arch/mips/include/asm/addrspace.h
-f:arch/mips/include/asm/amon.h
-f:arch/mips/include/asm/arch_hweight.h
-f:arch/mips/include/asm/asm-eva.h
-f:arch/mips/include/asm/asm-offsets.h
-f:arch/mips/include/asm/asm-prototypes.h
-f:arch/mips/include/asm/asm.h
-f:arch/mips/include/asm/asmmacro-32.h
-f:arch/mips/include/asm/asmmacro-64.h
-f:arch/mips/include/asm/asmmacro.h
-f:arch/mips/include/asm/atomic.h
-f:arch/mips/include/asm/barrier.h
-f:arch/mips/include/asm/bcache.h
-f:arch/mips/include/asm/bitops.h
-f:arch/mips/include/asm/bitrev.h
-f:arch/mips/include/asm/bmips-spaces.h
-f:arch/mips/include/asm/bmips.h
-f:arch/mips/include/asm/bootinfo.h
-f:arch/mips/include/asm/branch.h
-f:arch/mips/include/asm/break.h
-f:arch/mips/include/asm/bug.h
-f:arch/mips/include/asm/bugs.h
-f:arch/mips/include/asm/cache.h
-f:arch/mips/include/asm/cacheflush.h
-f:arch/mips/include/asm/cacheops.h
-f:arch/mips/include/asm/cachetype.h
-f:arch/mips/include/asm/cdmm.h
-f:arch/mips/include/asm/cevt-r4k.h
-f:arch/mips/include/asm/checksum.h
-f:arch/mips/include/asm/clocksource.h
-f:arch/mips/include/asm/cmp.h
-f:arch/mips/include/asm/cmpxchg.h
-f:arch/mips/include/asm/compat-signal.h
-f:arch/mips/include/asm/compat.h
-f:arch/mips/include/asm/compiler.h
-f:arch/mips/include/asm/cop2.h
-f:arch/mips/include/asm/cpu-features.h
-f:arch/mips/include/asm/cpu-info.h
-f:arch/mips/include/asm/cpu-type.h
-f:arch/mips/include/asm/cpu.h
-f:arch/mips/include/asm/cpufeature.h
-f:arch/mips/include/asm/debug.h
-f:arch/mips/include/asm/dec/ecc.h
-f:arch/mips/include/asm/dec/interrupts.h
-f:arch/mips/include/asm/dec/ioasic.h
-f:arch/mips/include/asm/dec/ioasic_addrs.h
-f:arch/mips/include/asm/dec/ioasic_ints.h
-f:arch/mips/include/asm/dec/kn01.h
-f:arch/mips/include/asm/dec/kn02.h
-f:arch/mips/include/asm/dec/kn02ba.h
-f:arch/mips/include/asm/dec/kn02ca.h
-f:arch/mips/include/asm/dec/kn02xa.h
-f:arch/mips/include/asm/dec/kn03.h
-f:arch/mips/include/asm/dec/kn05.h
-f:arch/mips/include/asm/dec/kn230.h
-f:arch/mips/include/asm/dec/machtype.h
-f:arch/mips/include/asm/dec/prom.h
-f:arch/mips/include/asm/dec/system.h
-f:arch/mips/include/asm/delay.h
-f:arch/mips/include/asm/div64.h
-f:arch/mips/include/asm/dma-direct.h
-f:arch/mips/include/asm/dma-mapping.h
-f:arch/mips/include/asm/dma.h
-f:arch/mips/include/asm/dmi.h
-f:arch/mips/include/asm/ds1287.h
-f:arch/mips/include/asm/dsemul.h
-f:arch/mips/include/asm/dsp.h
-f:arch/mips/include/asm/edac.h
-f:arch/mips/include/asm/elf.h
-f:arch/mips/include/asm/elfcore-compat.h
-f:arch/mips/include/asm/errno.h
-f:arch/mips/include/asm/eva.h
-f:arch/mips/include/asm/exec.h
-f:arch/mips/include/asm/extable.h
-f:arch/mips/include/asm/fixmap.h
-f:arch/mips/include/asm/floppy.h
-f:arch/mips/include/asm/fpregdef.h
-f:arch/mips/include/asm/fpu.h
-f:arch/mips/include/asm/fpu_emulator.h
-f:arch/mips/include/asm/ftrace.h
-f:arch/mips/include/asm/futex.h
-f:arch/mips/include/asm/fw/arc/hinv.h
-f:arch/mips/include/asm/fw/arc/types.h
-f:arch/mips/include/asm/fw/cfe/cfe_api.h
-f:arch/mips/include/asm/fw/cfe/cfe_error.h
-f:arch/mips/include/asm/fw/fw.h
-f:arch/mips/include/asm/ginvt.h
-f:arch/mips/include/asm/gio_device.h
-f:arch/mips/include/asm/gt64120.h
-f:arch/mips/include/asm/hardirq.h
-f:arch/mips/include/asm/hazards.h
-f:arch/mips/include/asm/highmem.h
-f:arch/mips/include/asm/hpet.h
-f:arch/mips/include/asm/hugetlb.h
-f:arch/mips/include/asm/hw_irq.h
-f:arch/mips/include/asm/i8259.h
-f:arch/mips/include/asm/idle.h
-f:arch/mips/include/asm/inst.h
-f:arch/mips/include/asm/io.h
-f:arch/mips/include/asm/ip32/crime.h
-f:arch/mips/include/asm/ip32/ip32_ints.h
-f:arch/mips/include/asm/ip32/mace.h
-f:arch/mips/include/asm/irq.h
-f:arch/mips/include/asm/irq_cpu.h
-f:arch/mips/include/asm/irq_gt641xx.h
-f:arch/mips/include/asm/irq_regs.h
-f:arch/mips/include/asm/irqflags.h
-f:arch/mips/include/asm/isa-rev.h
-f:arch/mips/include/asm/isadep.h
-f:arch/mips/include/asm/jazz.h
-f:arch/mips/include/asm/jazzdma.h
-f:arch/mips/include/asm/jump_label.h
-f:arch/mips/include/asm/kdebug.h
-f:arch/mips/include/asm/kexec.h
-f:arch/mips/include/asm/kgdb.h
-f:arch/mips/include/asm/kprobes.h
-f:arch/mips/include/asm/kvm_host.h
-f:arch/mips/include/asm/kvm_types.h
-f:arch/mips/include/asm/linkage.h
-f:arch/mips/include/asm/local.h
-f:arch/mips/include/asm/maar.h
-f:arch/mips/include/asm/mach-ath25/ath25_platform.h
-f:arch/mips/include/asm/mach-ath25/cpu-feature-overrides.h
-f:arch/mips/include/asm/mach-ath79/ar71xx_regs.h
-f:arch/mips/include/asm/mach-ath79/ar933x_uart.h
-f:arch/mips/include/asm/mach-ath79/ath79.h
-f:arch/mips/include/asm/mach-ath79/cpu-feature-overrides.h
-f:arch/mips/include/asm/mach-ath79/irq.h
-f:arch/mips/include/asm/mach-ath79/kernel-entry-init.h
-f:arch/mips/include/asm/mach-au1x00/au1000.h
-f:arch/mips/include/asm/mach-au1x00/au1000_dma.h
-f:arch/mips/include/asm/mach-au1x00/au1100_mmc.h
-f:arch/mips/include/asm/mach-au1x00/au1200fb.h
-f:arch/mips/include/asm/mach-au1x00/au1550_spi.h
-f:arch/mips/include/asm/mach-au1x00/au1550nd.h
-f:arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h
-f:arch/mips/include/asm/mach-au1x00/au1xxx_eth.h
-f:arch/mips/include/asm/mach-au1x00/au1xxx_psc.h
-f:arch/mips/include/asm/mach-au1x00/cpu-feature-overrides.h
-f:arch/mips/include/asm/mach-au1x00/gpio-au1000.h
-f:arch/mips/include/asm/mach-au1x00/gpio-au1300.h
-f:arch/mips/include/asm/mach-au1x00/prom.h
-f:arch/mips/include/asm/mach-bcm47xx/bcm47xx.h
-f:arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
-f:arch/mips/include/asm/mach-bcm47xx/cpu-feature-overrides.h
-f:arch/mips/include/asm/mach-bcm63xx/bcm63xx_board.h
-f:arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
-f:arch/mips/include/asm/mach-bcm63xx/bcm63xx_cs.h
-f:arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h
-f:arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_flash.h
-f:arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_hsspi.h
-f:arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_pci.h
-f:arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_pcmcia.h
-f:arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h
-f:arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_uart.h
-f:arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_usbd.h
-f:arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h
-f:arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h
-f:arch/mips/include/asm/mach-bcm63xx/bcm63xx_irq.h
-f:arch/mips/include/asm/mach-bcm63xx/bcm63xx_iudma.h
-f:arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h
-f:arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
-f:arch/mips/include/asm/mach-bcm63xx/bcm63xx_reset.h
-f:arch/mips/include/asm/mach-bcm63xx/bcm63xx_timer.h
-f:arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-f:arch/mips/include/asm/mach-bcm63xx/cpu-feature-overrides.h
-f:arch/mips/include/asm/mach-bcm63xx/ioremap.h
-f:arch/mips/include/asm/mach-bcm63xx/irq.h
-f:arch/mips/include/asm/mach-bcm63xx/spaces.h
-f:arch/mips/include/asm/mach-bmips/cpu-feature-overrides.h
-f:arch/mips/include/asm/mach-bmips/ioremap.h
-f:arch/mips/include/asm/mach-bmips/spaces.h
-f:arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h
-f:arch/mips/include/asm/mach-cavium-octeon/irq.h
-f:arch/mips/include/asm/mach-cavium-octeon/kernel-entry-init.h
-f:arch/mips/include/asm/mach-cavium-octeon/mangle-port.h
-f:arch/mips/include/asm/mach-cavium-octeon/spaces.h
-f:arch/mips/include/asm/mach-cobalt/cobalt.h
-f:arch/mips/include/asm/mach-cobalt/cpu-feature-overrides.h
-f:arch/mips/include/asm/mach-cobalt/irq.h
-f:arch/mips/include/asm/mach-cobalt/mach-gt64120.h
-f:arch/mips/include/asm/mach-db1x00/bcsr.h
-f:arch/mips/include/asm/mach-db1x00/irq.h
-f:arch/mips/include/asm/mach-dec/cpu-feature-overrides.h
-f:arch/mips/include/asm/mach-dec/mc146818rtc.h
-f:arch/mips/include/asm/mach-generic/cpu-feature-overrides.h
-f:arch/mips/include/asm/mach-generic/floppy.h
-f:arch/mips/include/asm/mach-generic/ioremap.h
-f:arch/mips/include/asm/mach-generic/irq.h
-f:arch/mips/include/asm/mach-generic/kernel-entry-init.h
-f:arch/mips/include/asm/mach-generic/kmalloc.h
-f:arch/mips/include/asm/mach-generic/mangle-port.h
-f:arch/mips/include/asm/mach-generic/mc146818rtc.h
-f:arch/mips/include/asm/mach-generic/spaces.h
-f:arch/mips/include/asm/mach-generic/topology.h
-f:arch/mips/include/asm/mach-ingenic/cpu-feature-overrides.h
-f:arch/mips/include/asm/mach-ip22/cpu-feature-overrides.h
-f:arch/mips/include/asm/mach-ip22/spaces.h
-f:arch/mips/include/asm/mach-ip27/cpu-feature-overrides.h
-f:arch/mips/include/asm/mach-ip27/irq.h
-f:arch/mips/include/asm/mach-ip27/kernel-entry-init.h
-f:arch/mips/include/asm/mach-ip27/mangle-port.h
-f:arch/mips/include/asm/mach-ip27/mmzone.h
-f:arch/mips/include/asm/mach-ip27/spaces.h
-f:arch/mips/include/asm/mach-ip27/topology.h
-f:arch/mips/include/asm/mach-ip28/cpu-feature-overrides.h
-f:arch/mips/include/asm/mach-ip28/spaces.h
-f:arch/mips/include/asm/mach-ip30/cpu-feature-overrides.h
-f:arch/mips/include/asm/mach-ip30/kernel-entry-init.h
-f:arch/mips/include/asm/mach-ip30/mangle-port.h
-f:arch/mips/include/asm/mach-ip30/spaces.h
-f:arch/mips/include/asm/mach-ip32/cpu-feature-overrides.h
-f:arch/mips/include/asm/mach-ip32/kmalloc.h
-f:arch/mips/include/asm/mach-ip32/mangle-port.h
-f:arch/mips/include/asm/mach-jazz/floppy.h
-f:arch/mips/include/asm/mach-jazz/mc146818rtc.h
-f:arch/mips/include/asm/mach-lantiq/falcon/cpu-feature-overrides.h
-f:arch/mips/include/asm/mach-lantiq/falcon/falcon_irq.h
-f:arch/mips/include/asm/mach-lantiq/falcon/irq.h
-f:arch/mips/include/asm/mach-lantiq/falcon/lantiq_soc.h
-f:arch/mips/include/asm/mach-lantiq/lantiq.h
-f:arch/mips/include/asm/mach-lantiq/lantiq_platform.h
-f:arch/mips/include/asm/mach-lantiq/xway/irq.h
-f:arch/mips/include/asm/mach-lantiq/xway/lantiq_irq.h
-f:arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h
-f:arch/mips/include/asm/mach-lantiq/xway/xway_dma.h
-f:arch/mips/include/asm/mach-loongson2ef/cpu-feature-overrides.h
-f:arch/mips/include/asm/mach-loongson2ef/cs5536/cs5536.h
-f:arch/mips/include/asm/mach-loongson2ef/cs5536/cs5536_mfgpt.h
-f:arch/mips/include/asm/mach-loongson2ef/cs5536/cs5536_pci.h
-f:arch/mips/include/asm/mach-loongson2ef/cs5536/cs5536_vsm.h
-f:arch/mips/include/asm/mach-loongson2ef/loongson.h
-f:arch/mips/include/asm/mach-loongson2ef/machine.h
-f:arch/mips/include/asm/mach-loongson2ef/mem.h
-f:arch/mips/include/asm/mach-loongson2ef/pci.h
-f:arch/mips/include/asm/mach-loongson2ef/spaces.h
-f:arch/mips/include/asm/mach-loongson32/irq.h
-f:arch/mips/include/asm/mach-loongson32/loongson1.h
-f:arch/mips/include/asm/mach-loongson32/platform.h
-f:arch/mips/include/asm/mach-loongson32/regs-mux.h
-f:arch/mips/include/asm/mach-loongson64/boot_param.h
-f:arch/mips/include/asm/mach-loongson64/builtin_dtbs.h
-f:arch/mips/include/asm/mach-loongson64/cpu-feature-overrides.h
-f:arch/mips/include/asm/mach-loongson64/cpucfg-emul.h
-f:arch/mips/include/asm/mach-loongson64/irq.h
-f:arch/mips/include/asm/mach-loongson64/kernel-entry-init.h
-f:arch/mips/include/asm/mach-loongson64/loongson.h
-f:arch/mips/include/asm/mach-loongson64/loongson_hwmon.h
-f:arch/mips/include/asm/mach-loongson64/loongson_regs.h
-f:arch/mips/include/asm/mach-loongson64/mmzone.h
-f:arch/mips/include/asm/mach-loongson64/pci.h
-f:arch/mips/include/asm/mach-loongson64/spaces.h
-f:arch/mips/include/asm/mach-loongson64/topology.h
-f:arch/mips/include/asm/mach-loongson64/workarounds.h
-f:arch/mips/include/asm/mach-malta/cpu-feature-overrides.h
-f:arch/mips/include/asm/mach-malta/irq.h
-f:arch/mips/include/asm/mach-malta/kernel-entry-init.h
-f:arch/mips/include/asm/mach-malta/mach-gt64120.h
-f:arch/mips/include/asm/mach-malta/mc146818rtc.h
-f:arch/mips/include/asm/mach-malta/spaces.h
-f:arch/mips/include/asm/mach-n64/irq.h
-f:arch/mips/include/asm/mach-n64/kmalloc.h
-f:arch/mips/include/asm/mach-pic32/cpu-feature-overrides.h
-f:arch/mips/include/asm/mach-pic32/irq.h
-f:arch/mips/include/asm/mach-pic32/pic32.h
-f:arch/mips/include/asm/mach-pic32/spaces.h
-f:arch/mips/include/asm/mach-ralink/irq.h
-f:arch/mips/include/asm/mach-ralink/mt7620.h
-f:arch/mips/include/asm/mach-ralink/mt7620/cpu-feature-overrides.h
-f:arch/mips/include/asm/mach-ralink/mt7621.h
-f:arch/mips/include/asm/mach-ralink/mt7621/cpu-feature-overrides.h
-f:arch/mips/include/asm/mach-ralink/ralink_regs.h
-f:arch/mips/include/asm/mach-ralink/rt288x.h
-f:arch/mips/include/asm/mach-ralink/rt288x/cpu-feature-overrides.h
-f:arch/mips/include/asm/mach-ralink/rt305x.h
-f:arch/mips/include/asm/mach-ralink/rt305x/cpu-feature-overrides.h
-f:arch/mips/include/asm/mach-ralink/rt3883.h
-f:arch/mips/include/asm/mach-ralink/rt3883/cpu-feature-overrides.h
-f:arch/mips/include/asm/mach-ralink/spaces.h
-f:arch/mips/include/asm/mach-rc32434/cpu-feature-overrides.h
-f:arch/mips/include/asm/mach-rc32434/ddr.h
-f:arch/mips/include/asm/mach-rc32434/dma.h
-f:arch/mips/include/asm/mach-rc32434/dma_v.h
-f:arch/mips/include/asm/mach-rc32434/eth.h
-f:arch/mips/include/asm/mach-rc32434/gpio.h
-f:arch/mips/include/asm/mach-rc32434/integ.h
-f:arch/mips/include/asm/mach-rc32434/irq.h
-f:arch/mips/include/asm/mach-rc32434/pci.h
-f:arch/mips/include/asm/mach-rc32434/prom.h
-f:arch/mips/include/asm/mach-rc32434/rb.h
-f:arch/mips/include/asm/mach-rc32434/rc32434.h
-f:arch/mips/include/asm/mach-rc32434/timer.h
-f:arch/mips/include/asm/mach-rm/cpu-feature-overrides.h
-f:arch/mips/include/asm/mach-sibyte/cpu-feature-overrides.h
-f:arch/mips/include/asm/mach-tx49xx/cpu-feature-overrides.h
-f:arch/mips/include/asm/mach-tx49xx/ioremap.h
-f:arch/mips/include/asm/mach-tx49xx/kmalloc.h
-f:arch/mips/include/asm/mach-tx49xx/mangle-port.h
-f:arch/mips/include/asm/mach-tx49xx/spaces.h
-f:arch/mips/include/asm/machine.h
-f:arch/mips/include/asm/mc146818-time.h
-f:arch/mips/include/asm/mc146818rtc.h
-f:arch/mips/include/asm/mips-boards/bonito64.h
-f:arch/mips/include/asm/mips-boards/generic.h
-f:arch/mips/include/asm/mips-boards/launch.h
-f:arch/mips/include/asm/mips-boards/malta.h
-f:arch/mips/include/asm/mips-boards/maltaint.h
-f:arch/mips/include/asm/mips-boards/msc01_pci.h
-f:arch/mips/include/asm/mips-boards/piix4.h
-f:arch/mips/include/asm/mips-boards/sead3-addr.h
-f:arch/mips/include/asm/mips-boards/sim.h
-f:arch/mips/include/asm/mips-cm.h
-f:arch/mips/include/asm/mips-cpc.h
-f:arch/mips/include/asm/mips-cps.h
-f:arch/mips/include/asm/mips-gic.h
-f:arch/mips/include/asm/mips-r2-to-r6-emul.h
-f:arch/mips/include/asm/mips_mt.h
-f:arch/mips/include/asm/mipsmtregs.h
-f:arch/mips/include/asm/mipsprom.h
-f:arch/mips/include/asm/mipsregs.h
-f:arch/mips/include/asm/mmiowb.h
-f:arch/mips/include/asm/mmu.h
-f:arch/mips/include/asm/mmu_context.h
-f:arch/mips/include/asm/mmzone.h
-f:arch/mips/include/asm/module.h
-f:arch/mips/include/asm/msa.h
-f:arch/mips/include/asm/msc01_ic.h
-f:arch/mips/include/asm/octeon/crypto.h
-f:arch/mips/include/asm/octeon/cvmx-address.h
-f:arch/mips/include/asm/octeon/cvmx-agl-defs.h
-f:arch/mips/include/asm/octeon/cvmx-asm.h
-f:arch/mips/include/asm/octeon/cvmx-asxx-defs.h
-f:arch/mips/include/asm/octeon/cvmx-boot-vector.h
-f:arch/mips/include/asm/octeon/cvmx-bootinfo.h
-f:arch/mips/include/asm/octeon/cvmx-bootmem.h
-f:arch/mips/include/asm/octeon/cvmx-ciu-defs.h
-f:arch/mips/include/asm/octeon/cvmx-ciu2-defs.h
-f:arch/mips/include/asm/octeon/cvmx-ciu3-defs.h
-f:arch/mips/include/asm/octeon/cvmx-cmd-queue.h
-f:arch/mips/include/asm/octeon/cvmx-config.h
-f:arch/mips/include/asm/octeon/cvmx-coremask.h
-f:arch/mips/include/asm/octeon/cvmx-dbg-defs.h
-f:arch/mips/include/asm/octeon/cvmx-dpi-defs.h
-f:arch/mips/include/asm/octeon/cvmx-fau.h
-f:arch/mips/include/asm/octeon/cvmx-fpa-defs.h
-f:arch/mips/include/asm/octeon/cvmx-fpa.h
-f:arch/mips/include/asm/octeon/cvmx-gmxx-defs.h
-f:arch/mips/include/asm/octeon/cvmx-gpio-defs.h
-f:arch/mips/include/asm/octeon/cvmx-helper-board.h
-f:arch/mips/include/asm/octeon/cvmx-helper-errata.h
-f:arch/mips/include/asm/octeon/cvmx-helper-jtag.h
-f:arch/mips/include/asm/octeon/cvmx-helper-loop.h
-f:arch/mips/include/asm/octeon/cvmx-helper-npi.h
-f:arch/mips/include/asm/octeon/cvmx-helper-rgmii.h
-f:arch/mips/include/asm/octeon/cvmx-helper-sgmii.h
-f:arch/mips/include/asm/octeon/cvmx-helper-spi.h
-f:arch/mips/include/asm/octeon/cvmx-helper-util.h
-f:arch/mips/include/asm/octeon/cvmx-helper-xaui.h
-f:arch/mips/include/asm/octeon/cvmx-helper.h
-f:arch/mips/include/asm/octeon/cvmx-iob-defs.h
-f:arch/mips/include/asm/octeon/cvmx-ipd-defs.h
-f:arch/mips/include/asm/octeon/cvmx-ipd.h
-f:arch/mips/include/asm/octeon/cvmx-l2c-defs.h
-f:arch/mips/include/asm/octeon/cvmx-l2c.h
-f:arch/mips/include/asm/octeon/cvmx-l2d-defs.h
-f:arch/mips/include/asm/octeon/cvmx-l2t-defs.h
-f:arch/mips/include/asm/octeon/cvmx-led-defs.h
-f:arch/mips/include/asm/octeon/cvmx-lmcx-defs.h
-f:arch/mips/include/asm/octeon/cvmx-mio-defs.h
-f:arch/mips/include/asm/octeon/cvmx-mixx-defs.h
-f:arch/mips/include/asm/octeon/cvmx-npei-defs.h
-f:arch/mips/include/asm/octeon/cvmx-npi-defs.h
-f:arch/mips/include/asm/octeon/cvmx-packet.h
-f:arch/mips/include/asm/octeon/cvmx-pci-defs.h
-f:arch/mips/include/asm/octeon/cvmx-pciercx-defs.h
-f:arch/mips/include/asm/octeon/cvmx-pcsx-defs.h
-f:arch/mips/include/asm/octeon/cvmx-pcsxx-defs.h
-f:arch/mips/include/asm/octeon/cvmx-pemx-defs.h
-f:arch/mips/include/asm/octeon/cvmx-pescx-defs.h
-f:arch/mips/include/asm/octeon/cvmx-pexp-defs.h
-f:arch/mips/include/asm/octeon/cvmx-pip-defs.h
-f:arch/mips/include/asm/octeon/cvmx-pip.h
-f:arch/mips/include/asm/octeon/cvmx-pko-defs.h
-f:arch/mips/include/asm/octeon/cvmx-pko.h
-f:arch/mips/include/asm/octeon/cvmx-pow-defs.h
-f:arch/mips/include/asm/octeon/cvmx-pow.h
-f:arch/mips/include/asm/octeon/cvmx-rnm-defs.h
-f:arch/mips/include/asm/octeon/cvmx-rst-defs.h
-f:arch/mips/include/asm/octeon/cvmx-scratch.h
-f:arch/mips/include/asm/octeon/cvmx-sli-defs.h
-f:arch/mips/include/asm/octeon/cvmx-spi.h
-f:arch/mips/include/asm/octeon/cvmx-spinlock.h
-f:arch/mips/include/asm/octeon/cvmx-spxx-defs.h
-f:arch/mips/include/asm/octeon/cvmx-sriox-defs.h
-f:arch/mips/include/asm/octeon/cvmx-srxx-defs.h
-f:arch/mips/include/asm/octeon/cvmx-stxx-defs.h
-f:arch/mips/include/asm/octeon/cvmx-sysinfo.h
-f:arch/mips/include/asm/octeon/cvmx-uctlx-defs.h
-f:arch/mips/include/asm/octeon/cvmx-wqe.h
-f:arch/mips/include/asm/octeon/cvmx.h
-f:arch/mips/include/asm/octeon/octeon-feature.h
-f:arch/mips/include/asm/octeon/octeon-model.h
-f:arch/mips/include/asm/octeon/octeon.h
-f:arch/mips/include/asm/octeon/pci-octeon.h
-f:arch/mips/include/asm/paccess.h
-f:arch/mips/include/asm/page.h
-f:arch/mips/include/asm/pci.h
-f:arch/mips/include/asm/pci/bridge.h
-f:arch/mips/include/asm/perf_event.h
-f:arch/mips/include/asm/pgalloc.h
-f:arch/mips/include/asm/pgtable-32.h
-f:arch/mips/include/asm/pgtable-64.h
-f:arch/mips/include/asm/pgtable-bits.h
-f:arch/mips/include/asm/pgtable.h
-f:arch/mips/include/asm/pm-cps.h
-f:arch/mips/include/asm/pm.h
-f:arch/mips/include/asm/prefetch.h
-f:arch/mips/include/asm/processor.h
-f:arch/mips/include/asm/prom.h
-f:arch/mips/include/asm/ptrace.h
-f:arch/mips/include/asm/r4k-timer.h
-f:arch/mips/include/asm/r4kcache.h
-f:arch/mips/include/asm/reboot.h
-f:arch/mips/include/asm/reg.h
-f:arch/mips/include/asm/regdef.h
-f:arch/mips/include/asm/rtlx.h
-f:arch/mips/include/asm/seccomp.h
-f:arch/mips/include/asm/setup.h
-f:arch/mips/include/asm/sgi/gio.h
-f:arch/mips/include/asm/sgi/heart.h
-f:arch/mips/include/asm/sgi/hpc3.h
-f:arch/mips/include/asm/sgi/ioc.h
-f:arch/mips/include/asm/sgi/ip22.h
-f:arch/mips/include/asm/sgi/mc.h
-f:arch/mips/include/asm/sgi/pi1.h
-f:arch/mips/include/asm/sgi/seeq.h
-f:arch/mips/include/asm/sgi/wd.h
-f:arch/mips/include/asm/sgialib.h
-f:arch/mips/include/asm/sgiarcs.h
-f:arch/mips/include/asm/shmparam.h
-f:arch/mips/include/asm/sibyte/bcm1480_int.h
-f:arch/mips/include/asm/sibyte/bcm1480_l2c.h
-f:arch/mips/include/asm/sibyte/bcm1480_mc.h
-f:arch/mips/include/asm/sibyte/bcm1480_regs.h
-f:arch/mips/include/asm/sibyte/bcm1480_scd.h
-f:arch/mips/include/asm/sibyte/bigsur.h
-f:arch/mips/include/asm/sibyte/board.h
-f:arch/mips/include/asm/sibyte/sb1250.h
-f:arch/mips/include/asm/sibyte/sb1250_defs.h
-f:arch/mips/include/asm/sibyte/sb1250_dma.h
-f:arch/mips/include/asm/sibyte/sb1250_genbus.h
-f:arch/mips/include/asm/sibyte/sb1250_int.h
-f:arch/mips/include/asm/sibyte/sb1250_l2c.h
-f:arch/mips/include/asm/sibyte/sb1250_ldt.h
-f:arch/mips/include/asm/sibyte/sb1250_mac.h
-f:arch/mips/include/asm/sibyte/sb1250_mc.h
-f:arch/mips/include/asm/sibyte/sb1250_regs.h
-f:arch/mips/include/asm/sibyte/sb1250_scd.h
-f:arch/mips/include/asm/sibyte/sb1250_smbus.h
-f:arch/mips/include/asm/sibyte/sb1250_syncser.h
-f:arch/mips/include/asm/sibyte/sb1250_uart.h
-f:arch/mips/include/asm/sibyte/sentosa.h
-f:arch/mips/include/asm/sibyte/swarm.h
-f:arch/mips/include/asm/sigcontext.h
-f:arch/mips/include/asm/signal.h
-f:arch/mips/include/asm/sim.h
-f:arch/mips/include/asm/smp-cps.h
-f:arch/mips/include/asm/smp-ops.h
-f:arch/mips/include/asm/smp.h
-f:arch/mips/include/asm/sn/addrs.h
-f:arch/mips/include/asm/sn/agent.h
-f:arch/mips/include/asm/sn/arch.h
-f:arch/mips/include/asm/sn/fru.h
-f:arch/mips/include/asm/sn/gda.h
-f:arch/mips/include/asm/sn/intr.h
-f:arch/mips/include/asm/sn/io.h
-f:arch/mips/include/asm/sn/ioc3.h
-f:arch/mips/include/asm/sn/irq_alloc.h
-f:arch/mips/include/asm/sn/klconfig.h
-f:arch/mips/include/asm/sn/kldir.h
-f:arch/mips/include/asm/sn/klkernvars.h
-f:arch/mips/include/asm/sn/launch.h
-f:arch/mips/include/asm/sn/mapped_kernel.h
-f:arch/mips/include/asm/sn/nmi.h
-f:arch/mips/include/asm/sn/sn0/addrs.h
-f:arch/mips/include/asm/sn/sn0/arch.h
-f:arch/mips/include/asm/sn/sn0/hub.h
-f:arch/mips/include/asm/sn/sn0/hubio.h
-f:arch/mips/include/asm/sn/sn0/hubmd.h
-f:arch/mips/include/asm/sn/sn0/hubni.h
-f:arch/mips/include/asm/sn/sn0/hubpi.h
-f:arch/mips/include/asm/sn/sn0/kldir.h
-f:arch/mips/include/asm/sn/types.h
-f:arch/mips/include/asm/sni.h
-f:arch/mips/include/asm/socket.h
-f:arch/mips/include/asm/sparsemem.h
-f:arch/mips/include/asm/spinlock.h
-f:arch/mips/include/asm/spinlock_types.h
-f:arch/mips/include/asm/spram.h
-f:arch/mips/include/asm/stackframe.h
-f:arch/mips/include/asm/stackprotector.h
-f:arch/mips/include/asm/stacktrace.h
-f:arch/mips/include/asm/string.h
-f:arch/mips/include/asm/switch_to.h
-f:arch/mips/include/asm/sync.h
-f:arch/mips/include/asm/syscall.h
-f:arch/mips/include/asm/syscalls.h
-f:arch/mips/include/asm/thread_info.h
-f:arch/mips/include/asm/time.h
-f:arch/mips/include/asm/timex.h
-f:arch/mips/include/asm/tlb.h
-f:arch/mips/include/asm/tlbdebug.h
-f:arch/mips/include/asm/tlbex.h
-f:arch/mips/include/asm/tlbflush.h
-f:arch/mips/include/asm/tlbmisc.h
-f:arch/mips/include/asm/topology.h
-f:arch/mips/include/asm/traps.h
-f:arch/mips/include/asm/txx9/boards.h
-f:arch/mips/include/asm/txx9/dmac.h
-f:arch/mips/include/asm/txx9/generic.h
-f:arch/mips/include/asm/txx9/pci.h
-f:arch/mips/include/asm/txx9/rbtx4927.h
-f:arch/mips/include/asm/txx9/smsc_fdc37m81x.h
-f:arch/mips/include/asm/txx9/tx4927.h
-f:arch/mips/include/asm/txx9/tx4927pcic.h
-f:arch/mips/include/asm/txx9/tx4938.h
-f:arch/mips/include/asm/txx9irq.h
-f:arch/mips/include/asm/txx9pio.h
-f:arch/mips/include/asm/txx9tmr.h
-f:arch/mips/include/asm/types.h
-f:arch/mips/include/asm/uaccess.h
-f:arch/mips/include/asm/uasm.h
-f:arch/mips/include/asm/unaligned-emul.h
-f:arch/mips/include/asm/unistd.h
-f:arch/mips/include/asm/unroll.h
-f:arch/mips/include/asm/uprobes.h
-f:arch/mips/include/asm/vdso.h
-f:arch/mips/include/asm/vdso/clocksource.h
-f:arch/mips/include/asm/vdso/gettimeofday.h
-f:arch/mips/include/asm/vdso/processor.h
-f:arch/mips/include/asm/vdso/vdso.h
-f:arch/mips/include/asm/vdso/vsyscall.h
-f:arch/mips/include/asm/vermagic.h
-f:arch/mips/include/asm/vga.h
-f:arch/mips/include/asm/video.h
-f:arch/mips/include/asm/vmalloc.h
-f:arch/mips/include/asm/vpe.h
-f:arch/mips/include/asm/watch.h
-f:arch/mips/include/asm/wbflush.h
-f:arch/mips/include/asm/xtalk/xtalk.h
-f:arch/mips/include/asm/xtalk/xwidget.h
-f:arch/mips/include/asm/yamon-dt.h
-f:arch/mips/include/uapi/asm/Kbuild
-f:arch/mips/include/uapi/asm/auxvec.h
-f:arch/mips/include/uapi/asm/bitfield.h
-f:arch/mips/include/uapi/asm/bitsperlong.h
-f:arch/mips/include/uapi/asm/break.h
-f:arch/mips/include/uapi/asm/byteorder.h
-f:arch/mips/include/uapi/asm/cachectl.h
-f:arch/mips/include/uapi/asm/errno.h
-f:arch/mips/include/uapi/asm/fcntl.h
-f:arch/mips/include/uapi/asm/hwcap.h
-f:arch/mips/include/uapi/asm/inst.h
-f:arch/mips/include/uapi/asm/ioctl.h
-f:arch/mips/include/uapi/asm/ioctls.h
-f:arch/mips/include/uapi/asm/kvm.h
-f:arch/mips/include/uapi/asm/mman.h
-f:arch/mips/include/uapi/asm/msgbuf.h
-f:arch/mips/include/uapi/asm/param.h
-f:arch/mips/include/uapi/asm/perf_regs.h
-f:arch/mips/include/uapi/asm/poll.h
-f:arch/mips/include/uapi/asm/posix_types.h
-f:arch/mips/include/uapi/asm/ptrace.h
-f:arch/mips/include/uapi/asm/reg.h
-f:arch/mips/include/uapi/asm/resource.h
-f:arch/mips/include/uapi/asm/sembuf.h
-f:arch/mips/include/uapi/asm/setup.h
-f:arch/mips/include/uapi/asm/sgidefs.h
-f:arch/mips/include/uapi/asm/shmbuf.h
-f:arch/mips/include/uapi/asm/sigcontext.h
-f:arch/mips/include/uapi/asm/siginfo.h
-f:arch/mips/include/uapi/asm/signal.h
-f:arch/mips/include/uapi/asm/socket.h
-f:arch/mips/include/uapi/asm/sockios.h
-f:arch/mips/include/uapi/asm/stat.h
-f:arch/mips/include/uapi/asm/statfs.h
-f:arch/mips/include/uapi/asm/swab.h
-f:arch/mips/include/uapi/asm/sysmips.h
-f:arch/mips/include/uapi/asm/termbits.h
-f:arch/mips/include/uapi/asm/termios.h
-f:arch/mips/include/uapi/asm/types.h
-f:arch/mips/include/uapi/asm/ucontext.h
-f:arch/mips/include/uapi/asm/unistd.h
-f:arch/mips/ingenic/Kconfig
-f:arch/mips/jazz/Kconfig
-f:arch/mips/jazz/Makefile
-f:arch/mips/jazz/Platform
-f:arch/mips/jazz/irq.c
-f:arch/mips/jazz/jazzdma.c
-f:arch/mips/jazz/reset.c
-f:arch/mips/jazz/setup.c
-f:arch/mips/kernel/.gitignore
-f:arch/mips/kernel/Makefile
-f:arch/mips/kernel/access-helper.h
-f:arch/mips/kernel/asm-offsets.c
-f:arch/mips/kernel/bmips_5xxx_init.S
-f:arch/mips/kernel/bmips_vec.S
-f:arch/mips/kernel/branch.c
-f:arch/mips/kernel/cacheinfo.c
-f:arch/mips/kernel/cevt-bcm1480.c
-f:arch/mips/kernel/cevt-ds1287.c
-f:arch/mips/kernel/cevt-gt641xx.c
-f:arch/mips/kernel/cevt-r4k.c
-f:arch/mips/kernel/cevt-sb1250.c
-f:arch/mips/kernel/cevt-txx9.c
-f:arch/mips/kernel/cmpxchg.c
-f:arch/mips/kernel/cps-vec-ns16550.S
-f:arch/mips/kernel/cps-vec.S
-f:arch/mips/kernel/cpu-probe.c
-f:arch/mips/kernel/cpu-r3k-probe.c
-f:arch/mips/kernel/crash.c
-f:arch/mips/kernel/crash_dump.c
-f:arch/mips/kernel/csrc-bcm1480.c
-f:arch/mips/kernel/csrc-ioasic.c
-f:arch/mips/kernel/csrc-r4k.c
-f:arch/mips/kernel/csrc-sb1250.c
-f:arch/mips/kernel/early_printk.c
-f:arch/mips/kernel/early_printk_8250.c
-f:arch/mips/kernel/elf.c
-f:arch/mips/kernel/entry.S
-f:arch/mips/kernel/fpu-probe.c
-f:arch/mips/kernel/fpu-probe.h
-f:arch/mips/kernel/ftrace.c
-f:arch/mips/kernel/genex.S
-f:arch/mips/kernel/gpio_txx9.c
-f:arch/mips/kernel/head.S
-f:arch/mips/kernel/i8253.c
-f:arch/mips/kernel/idle.c
-f:arch/mips/kernel/irq-gt641xx.c
-f:arch/mips/kernel/irq-msc01.c
-f:arch/mips/kernel/irq.c
-f:arch/mips/kernel/irq_txx9.c
-f:arch/mips/kernel/jump_label.c
-f:arch/mips/kernel/kgdb.c
-f:arch/mips/kernel/kprobes.c
-f:arch/mips/kernel/linux32.c
-f:arch/mips/kernel/machine_kexec.c
-f:arch/mips/kernel/mcount.S
-f:arch/mips/kernel/mips-cm.c
-f:arch/mips/kernel/mips-cpc.c
-f:arch/mips/kernel/mips-mt-fpaff.c
-f:arch/mips/kernel/mips-mt.c
-f:arch/mips/kernel/mips-r2-to-r6-emul.c
-f:arch/mips/kernel/module.c
-f:arch/mips/kernel/octeon_switch.S
-f:arch/mips/kernel/perf_event.c
-f:arch/mips/kernel/perf_event_mipsxx.c
-f:arch/mips/kernel/perf_regs.c
-f:arch/mips/kernel/pm-cps.c
-f:arch/mips/kernel/pm.c
-f:arch/mips/kernel/probes-common.h
-f:arch/mips/kernel/proc.c
-f:arch/mips/kernel/process.c
-f:arch/mips/kernel/prom.c
-f:arch/mips/kernel/ptrace.c
-f:arch/mips/kernel/ptrace32.c
-f:arch/mips/kernel/r2300_fpu.S
-f:arch/mips/kernel/r2300_switch.S
-f:arch/mips/kernel/r4k-bugs64.c
-f:arch/mips/kernel/r4k_fpu.S
-f:arch/mips/kernel/r4k_switch.S
-f:arch/mips/kernel/relocate.c
-f:arch/mips/kernel/relocate_kernel.S
-f:arch/mips/kernel/reset.c
-f:arch/mips/kernel/rtlx-mt.c
-f:arch/mips/kernel/rtlx.c
-f:arch/mips/kernel/scall32-o32.S
-f:arch/mips/kernel/scall64-n32.S
-f:arch/mips/kernel/scall64-n64.S
-f:arch/mips/kernel/scall64-o32.S
-f:arch/mips/kernel/segment.c
-f:arch/mips/kernel/setup.c
-f:arch/mips/kernel/signal-common.h
-f:arch/mips/kernel/signal.c
-f:arch/mips/kernel/signal32.c
-f:arch/mips/kernel/signal_n32.c
-f:arch/mips/kernel/signal_o32.c
-f:arch/mips/kernel/smp-bmips.c
-f:arch/mips/kernel/smp-cps.c
-f:arch/mips/kernel/smp-mt.c
-f:arch/mips/kernel/smp-up.c
-f:arch/mips/kernel/smp.c
-f:arch/mips/kernel/spinlock_test.c
-f:arch/mips/kernel/spram.c
-f:arch/mips/kernel/stacktrace.c
-f:arch/mips/kernel/sync-r4k.c
-f:arch/mips/kernel/syscall.c
-f:arch/mips/kernel/syscalls/Makefile
-f:arch/mips/kernel/syscalls/syscall_n32.tbl
-f:arch/mips/kernel/syscalls/syscall_n64.tbl
-f:arch/mips/kernel/syscalls/syscall_o32.tbl
-f:arch/mips/kernel/syscalls/syscallnr.sh
-f:arch/mips/kernel/sysrq.c
-f:arch/mips/kernel/time.c
-f:arch/mips/kernel/topology.c
-f:arch/mips/kernel/traps.c
-f:arch/mips/kernel/unaligned.c
-f:arch/mips/kernel/uprobes.c
-f:arch/mips/kernel/vdso.c
-f:arch/mips/kernel/vmlinux.lds.S
-f:arch/mips/kernel/vpe-mt.c
-f:arch/mips/kernel/vpe.c
-f:arch/mips/kernel/watch.c
-f:arch/mips/kvm/Kconfig
-f:arch/mips/kvm/Makefile
-f:arch/mips/kvm/emulate.c
-f:arch/mips/kvm/entry.c
-f:arch/mips/kvm/fpu.S
-f:arch/mips/kvm/hypcall.c
-f:arch/mips/kvm/interrupt.c
-f:arch/mips/kvm/interrupt.h
-f:arch/mips/kvm/loongson_ipi.c
-f:arch/mips/kvm/mips.c
-f:arch/mips/kvm/mmu.c
-f:arch/mips/kvm/msa.S
-f:arch/mips/kvm/stats.c
-f:arch/mips/kvm/tlb.c
-f:arch/mips/kvm/trace.h
-f:arch/mips/kvm/vz.c
-f:arch/mips/lantiq/Kconfig
-f:arch/mips/lantiq/Makefile
-f:arch/mips/lantiq/Platform
-f:arch/mips/lantiq/clk.c
-f:arch/mips/lantiq/clk.h
-f:arch/mips/lantiq/early_printk.c
-f:arch/mips/lantiq/falcon/Makefile
-f:arch/mips/lantiq/falcon/prom.c
-f:arch/mips/lantiq/falcon/reset.c
-f:arch/mips/lantiq/falcon/sysctrl.c
-f:arch/mips/lantiq/irq.c
-f:arch/mips/lantiq/prom.c
-f:arch/mips/lantiq/prom.h
-f:arch/mips/lantiq/xway/Makefile
-f:arch/mips/lantiq/xway/clk.c
-f:arch/mips/lantiq/xway/dcdc.c
-f:arch/mips/lantiq/xway/dma.c
-f:arch/mips/lantiq/xway/gptu.c
-f:arch/mips/lantiq/xway/prom.c
-f:arch/mips/lantiq/xway/sysctrl.c
-f:arch/mips/lantiq/xway/vmmc.c
-f:arch/mips/lib/.gitignore
-f:arch/mips/lib/Makefile
-f:arch/mips/lib/bitops.c
-f:arch/mips/lib/bswapdi.c
-f:arch/mips/lib/bswapsi.c
-f:arch/mips/lib/csum_partial.S
-f:arch/mips/lib/delay.c
-f:arch/mips/lib/dump_tlb.c
-f:arch/mips/lib/iomap-pci.c
-f:arch/mips/lib/iomap_copy.c
-f:arch/mips/lib/libgcc.h
-f:arch/mips/lib/memcpy.S
-f:arch/mips/lib/memset.S
-f:arch/mips/lib/mips-atomic.c
-f:arch/mips/lib/multi3.c
-f:arch/mips/lib/r3k_dump_tlb.c
-f:arch/mips/lib/strncpy_user.S
-f:arch/mips/lib/strnlen_user.S
-f:arch/mips/lib/uncached.c
-f:arch/mips/loongson2ef/Kconfig
-f:arch/mips/loongson2ef/Makefile
-f:arch/mips/loongson2ef/Platform
-f:arch/mips/loongson2ef/common/Makefile
-f:arch/mips/loongson2ef/common/bonito-irq.c
-f:arch/mips/loongson2ef/common/cs5536/Makefile
-f:arch/mips/loongson2ef/common/cs5536/cs5536_acc.c
-f:arch/mips/loongson2ef/common/cs5536/cs5536_ehci.c
-f:arch/mips/loongson2ef/common/cs5536/cs5536_ide.c
-f:arch/mips/loongson2ef/common/cs5536/cs5536_isa.c
-f:arch/mips/loongson2ef/common/cs5536/cs5536_mfgpt.c
-f:arch/mips/loongson2ef/common/cs5536/cs5536_ohci.c
-f:arch/mips/loongson2ef/common/cs5536/cs5536_pci.c
-f:arch/mips/loongson2ef/common/env.c
-f:arch/mips/loongson2ef/common/init.c
-f:arch/mips/loongson2ef/common/irq.c
-f:arch/mips/loongson2ef/common/machtype.c
-f:arch/mips/loongson2ef/common/mem.c
-f:arch/mips/loongson2ef/common/pci.c
-f:arch/mips/loongson2ef/common/platform.c
-f:arch/mips/loongson2ef/common/pm.c
-f:arch/mips/loongson2ef/common/reset.c
-f:arch/mips/loongson2ef/common/rtc.c
-f:arch/mips/loongson2ef/common/serial.c
-f:arch/mips/loongson2ef/common/setup.c
-f:arch/mips/loongson2ef/common/time.c
-f:arch/mips/loongson2ef/common/uart_base.c
-f:arch/mips/loongson2ef/fuloong-2e/Makefile
-f:arch/mips/loongson2ef/fuloong-2e/dma.c
-f:arch/mips/loongson2ef/fuloong-2e/irq.c
-f:arch/mips/loongson2ef/fuloong-2e/reset.c
-f:arch/mips/loongson2ef/lemote-2f/Makefile
-f:arch/mips/loongson2ef/lemote-2f/clock.c
-f:arch/mips/loongson2ef/lemote-2f/dma.c
-f:arch/mips/loongson2ef/lemote-2f/ec_kb3310b.c
-f:arch/mips/loongson2ef/lemote-2f/ec_kb3310b.h
-f:arch/mips/loongson2ef/lemote-2f/irq.c
-f:arch/mips/loongson2ef/lemote-2f/machtype.c
-f:arch/mips/loongson2ef/lemote-2f/pm.c
-f:arch/mips/loongson2ef/lemote-2f/reset.c
-f:arch/mips/loongson32/Kconfig
-f:arch/mips/loongson32/Makefile
-f:arch/mips/loongson32/Platform
-f:arch/mips/loongson32/common/Makefile
-f:arch/mips/loongson32/common/irq.c
-f:arch/mips/loongson32/common/platform.c
-f:arch/mips/loongson32/common/prom.c
-f:arch/mips/loongson32/common/setup.c
-f:arch/mips/loongson32/common/time.c
-f:arch/mips/loongson32/ls1b/Makefile
-f:arch/mips/loongson32/ls1b/board.c
-f:arch/mips/loongson32/ls1c/Makefile
-f:arch/mips/loongson32/ls1c/board.c
-f:arch/mips/loongson64/Kconfig
-f:arch/mips/loongson64/Makefile
-f:arch/mips/loongson64/Platform
-f:arch/mips/loongson64/boardinfo.c
-f:arch/mips/loongson64/cop2-ex.c
-f:arch/mips/loongson64/cpucfg-emul.c
-f:arch/mips/loongson64/dma.c
-f:arch/mips/loongson64/env.c
-f:arch/mips/loongson64/hpet.c
-f:arch/mips/loongson64/init.c
-f:arch/mips/loongson64/numa.c
-f:arch/mips/loongson64/pm.c
-f:arch/mips/loongson64/reset.c
-f:arch/mips/loongson64/setup.c
-f:arch/mips/loongson64/sleeper.S
-f:arch/mips/loongson64/smp.c
-f:arch/mips/loongson64/smp.h
-f:arch/mips/loongson64/time.c
-f:arch/mips/loongson64/vbios_quirk.c
-f:arch/mips/math-emu/Makefile
-f:arch/mips/math-emu/cp1emu.c
-f:arch/mips/math-emu/dp_2008class.c
-f:arch/mips/math-emu/dp_add.c
-f:arch/mips/math-emu/dp_cmp.c
-f:arch/mips/math-emu/dp_div.c
-f:arch/mips/math-emu/dp_fint.c
-f:arch/mips/math-emu/dp_flong.c
-f:arch/mips/math-emu/dp_fmax.c
-f:arch/mips/math-emu/dp_fmin.c
-f:arch/mips/math-emu/dp_fsp.c
-f:arch/mips/math-emu/dp_maddf.c
-f:arch/mips/math-emu/dp_mul.c
-f:arch/mips/math-emu/dp_rint.c
-f:arch/mips/math-emu/dp_simple.c
-f:arch/mips/math-emu/dp_sqrt.c
-f:arch/mips/math-emu/dp_sub.c
-f:arch/mips/math-emu/dp_tint.c
-f:arch/mips/math-emu/dp_tlong.c
-f:arch/mips/math-emu/dsemul.c
-f:arch/mips/math-emu/ieee754.c
-f:arch/mips/math-emu/ieee754.h
-f:arch/mips/math-emu/ieee754d.c
-f:arch/mips/math-emu/ieee754dp.c
-f:arch/mips/math-emu/ieee754dp.h
-f:arch/mips/math-emu/ieee754int.h
-f:arch/mips/math-emu/ieee754sp.c
-f:arch/mips/math-emu/ieee754sp.h
-f:arch/mips/math-emu/me-debugfs.c
-f:arch/mips/math-emu/sp_2008class.c
-f:arch/mips/math-emu/sp_add.c
-f:arch/mips/math-emu/sp_cmp.c
-f:arch/mips/math-emu/sp_div.c
-f:arch/mips/math-emu/sp_fdp.c
-f:arch/mips/math-emu/sp_fint.c
-f:arch/mips/math-emu/sp_flong.c
-f:arch/mips/math-emu/sp_fmax.c
-f:arch/mips/math-emu/sp_fmin.c
-f:arch/mips/math-emu/sp_maddf.c
-f:arch/mips/math-emu/sp_mul.c
-f:arch/mips/math-emu/sp_rint.c
-f:arch/mips/math-emu/sp_simple.c
-f:arch/mips/math-emu/sp_sqrt.c
-f:arch/mips/math-emu/sp_sub.c
-f:arch/mips/math-emu/sp_tint.c
-f:arch/mips/math-emu/sp_tlong.c
-f:arch/mips/mm/Makefile
-f:arch/mips/mm/c-octeon.c
-f:arch/mips/mm/c-r3k.c
-f:arch/mips/mm/c-r4k.c
-f:arch/mips/mm/cache.c
-f:arch/mips/mm/cerr-sb1.c
-f:arch/mips/mm/cex-gen.S
-f:arch/mips/mm/cex-oct.S
-f:arch/mips/mm/cex-sb1.S
-f:arch/mips/mm/context.c
-f:arch/mips/mm/dma-noncoherent.c
-f:arch/mips/mm/extable.c
-f:arch/mips/mm/fault.c
-f:arch/mips/mm/highmem.c
-f:arch/mips/mm/hugetlbpage.c
-f:arch/mips/mm/init.c
-f:arch/mips/mm/ioremap.c
-f:arch/mips/mm/ioremap64.c
-f:arch/mips/mm/maccess.c
-f:arch/mips/mm/mmap.c
-f:arch/mips/mm/page-funcs.S
-f:arch/mips/mm/page.c
-f:arch/mips/mm/pgtable-32.c
-f:arch/mips/mm/pgtable-64.c
-f:arch/mips/mm/pgtable.c
-f:arch/mips/mm/physaddr.c
-f:arch/mips/mm/sc-debugfs.c
-f:arch/mips/mm/sc-ip22.c
-f:arch/mips/mm/sc-mips.c
-f:arch/mips/mm/sc-r5k.c
-f:arch/mips/mm/sc-rm7k.c
-f:arch/mips/mm/tlb-funcs.S
-f:arch/mips/mm/tlb-r3k.c
-f:arch/mips/mm/tlb-r4k.c
-f:arch/mips/mm/tlbex-fault.S
-f:arch/mips/mm/tlbex.c
-f:arch/mips/mm/uasm-micromips.c
-f:arch/mips/mm/uasm-mips.c
-f:arch/mips/mm/uasm.c
-f:arch/mips/mobileye/Kconfig
-f:arch/mips/mobileye/Makefile
-f:arch/mips/mobileye/Platform
-f:arch/mips/mobileye/board-epm5.its.S
-f:arch/mips/mobileye/vmlinux.its.S
-f:arch/mips/mti-malta/Makefile
-f:arch/mips/mti-malta/Platform
-f:arch/mips/mti-malta/malta-dtshim.c
-f:arch/mips/mti-malta/malta-init.c
-f:arch/mips/mti-malta/malta-int.c
-f:arch/mips/mti-malta/malta-memory.c
-f:arch/mips/mti-malta/malta-platform.c
-f:arch/mips/mti-malta/malta-setup.c
-f:arch/mips/mti-malta/malta-time.c
-f:arch/mips/n64/Makefile
-f:arch/mips/n64/Platform
-f:arch/mips/n64/init.c
-f:arch/mips/n64/irq.c
-f:arch/mips/net/Makefile
-f:arch/mips/net/bpf_jit_comp.c
-f:arch/mips/net/bpf_jit_comp.h
-f:arch/mips/net/bpf_jit_comp32.c
-f:arch/mips/net/bpf_jit_comp64.c
-f:arch/mips/pci/Makefile
-f:arch/mips/pci/fixup-ath79.c
-f:arch/mips/pci/fixup-bcm63xx.c
-f:arch/mips/pci/fixup-cobalt.c
-f:arch/mips/pci/fixup-fuloong2e.c
-f:arch/mips/pci/fixup-ip32.c
-f:arch/mips/pci/fixup-lantiq.c
-f:arch/mips/pci/fixup-lemote2f.c
-f:arch/mips/pci/fixup-malta.c
-f:arch/mips/pci/fixup-rbtx4927.c
-f:arch/mips/pci/fixup-rc32434.c
-f:arch/mips/pci/fixup-sb1250.c
-f:arch/mips/pci/fixup-sni.c
-f:arch/mips/pci/msi-octeon.c
-f:arch/mips/pci/ops-bcm63xx.c
-f:arch/mips/pci/ops-bonito64.c
-f:arch/mips/pci/ops-gt64xxx_pci0.c
-f:arch/mips/pci/ops-lantiq.c
-f:arch/mips/pci/ops-loongson2.c
-f:arch/mips/pci/ops-mace.c
-f:arch/mips/pci/ops-msc.c
-f:arch/mips/pci/ops-rc32434.c
-f:arch/mips/pci/ops-sni.c
-f:arch/mips/pci/ops-tx4927.c
-f:arch/mips/pci/pci-alchemy.c
-f:arch/mips/pci/pci-ar2315.c
-f:arch/mips/pci/pci-ar71xx.c
-f:arch/mips/pci/pci-ar724x.c
-f:arch/mips/pci/pci-bcm1480.c
-f:arch/mips/pci/pci-bcm1480ht.c
-f:arch/mips/pci/pci-bcm47xx.c
-f:arch/mips/pci/pci-bcm63xx.c
-f:arch/mips/pci/pci-bcm63xx.h
-f:arch/mips/pci/pci-generic.c
-f:arch/mips/pci/pci-ip27.c
-f:arch/mips/pci/pci-ip32.c
-f:arch/mips/pci/pci-lantiq.c
-f:arch/mips/pci/pci-lantiq.h
-f:arch/mips/pci/pci-legacy.c
-f:arch/mips/pci/pci-malta.c
-f:arch/mips/pci/pci-mt7620.c
-f:arch/mips/pci/pci-octeon.c
-f:arch/mips/pci/pci-rc32434.c
-f:arch/mips/pci/pci-rt2880.c
-f:arch/mips/pci/pci-rt3883.c
-f:arch/mips/pci/pci-sb1250.c
-f:arch/mips/pci/pci-tx4927.c
-f:arch/mips/pci/pci-tx4938.c
-f:arch/mips/pci/pci-xtalk-bridge.c
-f:arch/mips/pci/pci.c
-f:arch/mips/pci/pcie-octeon.c
-f:arch/mips/pic32/Kconfig
-f:arch/mips/pic32/Makefile
-f:arch/mips/pic32/Platform
-f:arch/mips/pic32/common/Makefile
-f:arch/mips/pic32/common/irq.c
-f:arch/mips/pic32/common/reset.c
-f:arch/mips/pic32/pic32mzda/Makefile
-f:arch/mips/pic32/pic32mzda/config.c
-f:arch/mips/pic32/pic32mzda/early_clk.c
-f:arch/mips/pic32/pic32mzda/early_console.c
-f:arch/mips/pic32/pic32mzda/early_pin.c
-f:arch/mips/pic32/pic32mzda/early_pin.h
-f:arch/mips/pic32/pic32mzda/init.c
-f:arch/mips/pic32/pic32mzda/pic32mzda.h
-f:arch/mips/pic32/pic32mzda/time.c
-f:arch/mips/power/Makefile
-f:arch/mips/power/cpu.c
-f:arch/mips/power/hibernate.c
-f:arch/mips/power/hibernate_asm.S
-f:arch/mips/ralink/Kconfig
-f:arch/mips/ralink/Makefile
-f:arch/mips/ralink/Platform
-f:arch/mips/ralink/bootrom.c
-f:arch/mips/ralink/clk.c
-f:arch/mips/ralink/common.h
-f:arch/mips/ralink/early_printk.c
-f:arch/mips/ralink/ill_acc.c
-f:arch/mips/ralink/irq-gic.c
-f:arch/mips/ralink/irq.c
-f:arch/mips/ralink/mt7620.c
-f:arch/mips/ralink/mt7621.c
-f:arch/mips/ralink/of.c
-f:arch/mips/ralink/prom.c
-f:arch/mips/ralink/reset.c
-f:arch/mips/ralink/rt288x.c
-f:arch/mips/ralink/rt305x.c
-f:arch/mips/ralink/rt3883.c
-f:arch/mips/ralink/timer-gic.c
-f:arch/mips/ralink/timer.c
-f:arch/mips/rb532/Makefile
-f:arch/mips/rb532/Platform
-f:arch/mips/rb532/devices.c
-f:arch/mips/rb532/gpio.c
-f:arch/mips/rb532/irq.c
-f:arch/mips/rb532/prom.c
-f:arch/mips/rb532/serial.c
-f:arch/mips/rb532/setup.c
-f:arch/mips/rb532/time.c
-f:arch/mips/sgi-ip22/Makefile
-f:arch/mips/sgi-ip22/Platform
-f:arch/mips/sgi-ip22/ip22-berr.c
-f:arch/mips/sgi-ip22/ip22-eisa.c
-f:arch/mips/sgi-ip22/ip22-gio.c
-f:arch/mips/sgi-ip22/ip22-hpc.c
-f:arch/mips/sgi-ip22/ip22-int.c
-f:arch/mips/sgi-ip22/ip22-mc.c
-f:arch/mips/sgi-ip22/ip22-nvram.c
-f:arch/mips/sgi-ip22/ip22-platform.c
-f:arch/mips/sgi-ip22/ip22-reset.c
-f:arch/mips/sgi-ip22/ip22-setup.c
-f:arch/mips/sgi-ip22/ip22-time.c
-f:arch/mips/sgi-ip22/ip28-berr.c
-f:arch/mips/sgi-ip27/Kconfig
-f:arch/mips/sgi-ip27/Makefile
-f:arch/mips/sgi-ip27/Platform
-f:arch/mips/sgi-ip27/ip27-berr.c
-f:arch/mips/sgi-ip27/ip27-common.h
-f:arch/mips/sgi-ip27/ip27-console.c
-f:arch/mips/sgi-ip27/ip27-init.c
-f:arch/mips/sgi-ip27/ip27-irq.c
-f:arch/mips/sgi-ip27/ip27-klconfig.c
-f:arch/mips/sgi-ip27/ip27-klnuma.c
-f:arch/mips/sgi-ip27/ip27-memory.c
-f:arch/mips/sgi-ip27/ip27-nmi.c
-f:arch/mips/sgi-ip27/ip27-reset.c
-f:arch/mips/sgi-ip27/ip27-smp.c
-f:arch/mips/sgi-ip27/ip27-timer.c
-f:arch/mips/sgi-ip27/ip27-xtalk.c
-f:arch/mips/sgi-ip30/Makefile
-f:arch/mips/sgi-ip30/Platform
-f:arch/mips/sgi-ip30/ip30-common.h
-f:arch/mips/sgi-ip30/ip30-console.c
-f:arch/mips/sgi-ip30/ip30-irq.c
-f:arch/mips/sgi-ip30/ip30-power.c
-f:arch/mips/sgi-ip30/ip30-setup.c
-f:arch/mips/sgi-ip30/ip30-smp.c
-f:arch/mips/sgi-ip30/ip30-timer.c
-f:arch/mips/sgi-ip30/ip30-xtalk.c
-f:arch/mips/sgi-ip32/Makefile
-f:arch/mips/sgi-ip32/Platform
-f:arch/mips/sgi-ip32/crime.c
-f:arch/mips/sgi-ip32/ip32-berr.c
-f:arch/mips/sgi-ip32/ip32-common.h
-f:arch/mips/sgi-ip32/ip32-dma.c
-f:arch/mips/sgi-ip32/ip32-irq.c
-f:arch/mips/sgi-ip32/ip32-memory.c
-f:arch/mips/sgi-ip32/ip32-platform.c
-f:arch/mips/sgi-ip32/ip32-reset.c
-f:arch/mips/sgi-ip32/ip32-setup.c
-f:arch/mips/sibyte/Kconfig
-f:arch/mips/sibyte/Makefile
-f:arch/mips/sibyte/Platform
-f:arch/mips/sibyte/bcm1480/Makefile
-f:arch/mips/sibyte/bcm1480/irq.c
-f:arch/mips/sibyte/bcm1480/setup.c
-f:arch/mips/sibyte/bcm1480/smp.c
-f:arch/mips/sibyte/bcm1480/time.c
-f:arch/mips/sibyte/common/Makefile
-f:arch/mips/sibyte/common/bus_watcher.c
-f:arch/mips/sibyte/common/cfe.c
-f:arch/mips/sibyte/common/cfe_console.c
-f:arch/mips/sibyte/common/dma.c
-f:arch/mips/sibyte/common/sb_tbprof.c
-f:arch/mips/sibyte/sb1250/Makefile
-f:arch/mips/sibyte/sb1250/irq.c
-f:arch/mips/sibyte/sb1250/setup.c
-f:arch/mips/sibyte/sb1250/smp.c
-f:arch/mips/sibyte/sb1250/time.c
-f:arch/mips/sibyte/swarm/Makefile
-f:arch/mips/sibyte/swarm/platform.c
-f:arch/mips/sibyte/swarm/rtc_m41t81.c
-f:arch/mips/sibyte/swarm/rtc_xicor1241.c
-f:arch/mips/sibyte/swarm/setup.c
-f:arch/mips/sibyte/swarm/swarm-i2c.c
-f:arch/mips/sni/Makefile
-f:arch/mips/sni/Platform
-f:arch/mips/sni/a20r.c
-f:arch/mips/sni/eisa.c
-f:arch/mips/sni/irq.c
-f:arch/mips/sni/pcimt.c
-f:arch/mips/sni/pcit.c
-f:arch/mips/sni/reset.c
-f:arch/mips/sni/rm200.c
-f:arch/mips/sni/setup.c
-f:arch/mips/sni/time.c
-f:arch/mips/tools/.gitignore
-f:arch/mips/tools/Makefile
-f:arch/mips/tools/elf-entry.c
-f:arch/mips/tools/generic-board-config.sh
-f:arch/mips/tools/loongson3-llsc-check.c
-f:arch/mips/txx9/Kconfig
-f:arch/mips/txx9/Makefile
-f:arch/mips/txx9/Platform
-f:arch/mips/txx9/generic/Makefile
-f:arch/mips/txx9/generic/irq_tx4927.c
-f:arch/mips/txx9/generic/irq_tx4938.c
-f:arch/mips/txx9/generic/mem_tx4927.c
-f:arch/mips/txx9/generic/pci.c
-f:arch/mips/txx9/generic/setup.c
-f:arch/mips/txx9/generic/setup_tx4927.c
-f:arch/mips/txx9/generic/setup_tx4938.c
-f:arch/mips/txx9/generic/smsc_fdc37m81x.c
-f:arch/mips/txx9/rbtx4927/Makefile
-f:arch/mips/txx9/rbtx4927/irq.c
-f:arch/mips/txx9/rbtx4927/prom.c
-f:arch/mips/txx9/rbtx4927/setup.c
-f:arch/mips/vdso/.gitignore
-f:arch/mips/vdso/Kconfig
-f:arch/mips/vdso/Makefile
-f:arch/mips/vdso/config-n32-o32-env.c
-f:arch/mips/vdso/elf.S
-f:arch/mips/vdso/genvdso.c
-f:arch/mips/vdso/genvdso.h
-f:arch/mips/vdso/sigreturn.S
-f:arch/mips/vdso/vdso.lds.S
-f:arch/mips/vdso/vgettimeofday.c
-f:arch/nios2/Kbuild
-f:arch/nios2/Kconfig
-f:arch/nios2/Kconfig.debug
-f:arch/nios2/Makefile
-f:arch/nios2/boot/.gitignore
-f:arch/nios2/boot/Makefile
-f:arch/nios2/boot/compressed/Makefile
-f:arch/nios2/boot/compressed/console.c
-f:arch/nios2/boot/compressed/head.S
-f:arch/nios2/boot/compressed/misc.c
-f:arch/nios2/boot/compressed/vmlinux.lds.S
-f:arch/nios2/boot/compressed/vmlinux.scr
-f:arch/nios2/boot/dts/10m50_devboard.dts
-f:arch/nios2/boot/dts/3c120_devboard.dts
-f:arch/nios2/boot/dts/Makefile
-f:arch/nios2/boot/install.sh
-f:arch/nios2/configs/10m50_defconfig
-f:arch/nios2/configs/3c120_defconfig
-f:arch/nios2/include/asm/Kbuild
-f:arch/nios2/include/asm/asm-macros.h
-f:arch/nios2/include/asm/asm-offsets.h
-f:arch/nios2/include/asm/cache.h
-f:arch/nios2/include/asm/cacheflush.h
-f:arch/nios2/include/asm/cachetype.h
-f:arch/nios2/include/asm/checksum.h
-f:arch/nios2/include/asm/cpuinfo.h
-f:arch/nios2/include/asm/delay.h
-f:arch/nios2/include/asm/elf.h
-f:arch/nios2/include/asm/entry.h
-f:arch/nios2/include/asm/io.h
-f:arch/nios2/include/asm/irq.h
-f:arch/nios2/include/asm/irqflags.h
-f:arch/nios2/include/asm/kgdb.h
-f:arch/nios2/include/asm/linkage.h
-f:arch/nios2/include/asm/mmu.h
-f:arch/nios2/include/asm/mmu_context.h
-f:arch/nios2/include/asm/page.h
-f:arch/nios2/include/asm/pgalloc.h
-f:arch/nios2/include/asm/pgtable-bits.h
-f:arch/nios2/include/asm/pgtable.h
-f:arch/nios2/include/asm/processor.h
-f:arch/nios2/include/asm/ptrace.h
-f:arch/nios2/include/asm/registers.h
-f:arch/nios2/include/asm/setup.h
-f:arch/nios2/include/asm/shmparam.h
-f:arch/nios2/include/asm/string.h
-f:arch/nios2/include/asm/switch_to.h
-f:arch/nios2/include/asm/syscall.h
-f:arch/nios2/include/asm/syscalls.h
-f:arch/nios2/include/asm/thread_info.h
-f:arch/nios2/include/asm/timex.h
-f:arch/nios2/include/asm/tlb.h
-f:arch/nios2/include/asm/tlbflush.h
-f:arch/nios2/include/asm/traps.h
-f:arch/nios2/include/asm/uaccess.h
-f:arch/nios2/include/asm/unistd.h
-f:arch/nios2/include/asm/vmalloc.h
-f:arch/nios2/include/uapi/asm/Kbuild
-f:arch/nios2/include/uapi/asm/byteorder.h
-f:arch/nios2/include/uapi/asm/elf.h
-f:arch/nios2/include/uapi/asm/ptrace.h
-f:arch/nios2/include/uapi/asm/sigcontext.h
-f:arch/nios2/include/uapi/asm/signal.h
-f:arch/nios2/include/uapi/asm/swab.h
-f:arch/nios2/include/uapi/asm/unistd.h
-f:arch/nios2/kernel/.gitignore
-f:arch/nios2/kernel/Makefile
-f:arch/nios2/kernel/Makefile.syscalls
-f:arch/nios2/kernel/asm-offsets.c
-f:arch/nios2/kernel/cpuinfo.c
-f:arch/nios2/kernel/entry.S
-f:arch/nios2/kernel/head.S
-f:arch/nios2/kernel/insnemu.S
-f:arch/nios2/kernel/irq.c
-f:arch/nios2/kernel/kgdb.c
-f:arch/nios2/kernel/misaligned.c
-f:arch/nios2/kernel/module.c
-f:arch/nios2/kernel/nios2_ksyms.c
-f:arch/nios2/kernel/process.c
-f:arch/nios2/kernel/prom.c
-f:arch/nios2/kernel/ptrace.c
-f:arch/nios2/kernel/setup.c
-f:arch/nios2/kernel/signal.c
-f:arch/nios2/kernel/sys_nios2.c
-f:arch/nios2/kernel/syscall_table.c
-f:arch/nios2/kernel/time.c
-f:arch/nios2/kernel/traps.c
-f:arch/nios2/kernel/vmlinux.lds.S
-f:arch/nios2/lib/Makefile
-f:arch/nios2/lib/delay.c
-f:arch/nios2/lib/memcpy.c
-f:arch/nios2/lib/memmove.c
-f:arch/nios2/lib/memset.c
-f:arch/nios2/mm/Makefile
-f:arch/nios2/mm/cacheflush.c
-f:arch/nios2/mm/dma-mapping.c
-f:arch/nios2/mm/extable.c
-f:arch/nios2/mm/fault.c
-f:arch/nios2/mm/init.c
-f:arch/nios2/mm/ioremap.c
-f:arch/nios2/mm/mmu_context.c
-f:arch/nios2/mm/pgtable.c
-f:arch/nios2/mm/tlb.c
-f:arch/nios2/mm/uaccess.c
-f:arch/nios2/platform/Kconfig.platform
-f:arch/nios2/platform/Makefile
-f:arch/nios2/platform/platform.c
-f:arch/openrisc/Kbuild
-f:arch/openrisc/Kconfig
-f:arch/openrisc/Kconfig.debug
-f:arch/openrisc/Makefile
-f:arch/openrisc/boot/.gitignore
-f:arch/openrisc/boot/Makefile
-f:arch/openrisc/boot/dts/Makefile
-f:arch/openrisc/boot/dts/or1klitex.dts
-f:arch/openrisc/boot/dts/or1ksim.dts
-f:arch/openrisc/boot/dts/simple_smp.dts
-f:arch/openrisc/configs/or1klitex_defconfig
-f:arch/openrisc/configs/or1ksim_defconfig
-f:arch/openrisc/configs/simple_smp_defconfig
-f:arch/openrisc/configs/virt_defconfig
-f:arch/openrisc/include/asm/Kbuild
-f:arch/openrisc/include/asm/asm-offsets.h
-f:arch/openrisc/include/asm/atomic.h
-f:arch/openrisc/include/asm/barrier.h
-f:arch/openrisc/include/asm/bitops.h
-f:arch/openrisc/include/asm/bitops/__ffs.h
-f:arch/openrisc/include/asm/bitops/__fls.h
-f:arch/openrisc/include/asm/bitops/atomic.h
-f:arch/openrisc/include/asm/bitops/ffs.h
-f:arch/openrisc/include/asm/bitops/fls.h
-f:arch/openrisc/include/asm/bug.h
-f:arch/openrisc/include/asm/cache.h
-f:arch/openrisc/include/asm/cacheflush.h
-f:arch/openrisc/include/asm/cmpxchg.h
-f:arch/openrisc/include/asm/cpuinfo.h
-f:arch/openrisc/include/asm/delay.h
-f:arch/openrisc/include/asm/elf.h
-f:arch/openrisc/include/asm/fixmap.h
-f:arch/openrisc/include/asm/fpu.h
-f:arch/openrisc/include/asm/futex.h
-f:arch/openrisc/include/asm/io.h
-f:arch/openrisc/include/asm/irq.h
-f:arch/openrisc/include/asm/irqflags.h
-f:arch/openrisc/include/asm/linkage.h
-f:arch/openrisc/include/asm/mmu.h
-f:arch/openrisc/include/asm/mmu_context.h
-f:arch/openrisc/include/asm/page.h
-f:arch/openrisc/include/asm/pgalloc.h
-f:arch/openrisc/include/asm/pgtable.h
-f:arch/openrisc/include/asm/processor.h
-f:arch/openrisc/include/asm/ptrace.h
-f:arch/openrisc/include/asm/serial.h
-f:arch/openrisc/include/asm/setup.h
-f:arch/openrisc/include/asm/smp.h
-f:arch/openrisc/include/asm/spr.h
-f:arch/openrisc/include/asm/spr_defs.h
-f:arch/openrisc/include/asm/string.h
-f:arch/openrisc/include/asm/syscall.h
-f:arch/openrisc/include/asm/syscalls.h
-f:arch/openrisc/include/asm/thread_info.h
-f:arch/openrisc/include/asm/time.h
-f:arch/openrisc/include/asm/timex.h
-f:arch/openrisc/include/asm/tlb.h
-f:arch/openrisc/include/asm/tlbflush.h
-f:arch/openrisc/include/asm/uaccess.h
-f:arch/openrisc/include/asm/unistd.h
-f:arch/openrisc/include/asm/unwinder.h
-f:arch/openrisc/include/asm/vmalloc.h
-f:arch/openrisc/include/uapi/asm/Kbuild
-f:arch/openrisc/include/uapi/asm/byteorder.h
-f:arch/openrisc/include/uapi/asm/elf.h
-f:arch/openrisc/include/uapi/asm/param.h
-f:arch/openrisc/include/uapi/asm/ptrace.h
-f:arch/openrisc/include/uapi/asm/sigcontext.h
-f:arch/openrisc/include/uapi/asm/unistd.h
-f:arch/openrisc/kernel/.gitignore
-f:arch/openrisc/kernel/Makefile
-f:arch/openrisc/kernel/Makefile.syscalls
-f:arch/openrisc/kernel/asm-offsets.c
-f:arch/openrisc/kernel/cacheinfo.c
-f:arch/openrisc/kernel/dma.c
-f:arch/openrisc/kernel/entry.S
-f:arch/openrisc/kernel/head.S
-f:arch/openrisc/kernel/irq.c
-f:arch/openrisc/kernel/module.c
-f:arch/openrisc/kernel/or32_ksyms.c
-f:arch/openrisc/kernel/process.c
-f:arch/openrisc/kernel/prom.c
-f:arch/openrisc/kernel/ptrace.c
-f:arch/openrisc/kernel/setup.c
-f:arch/openrisc/kernel/signal.c
-f:arch/openrisc/kernel/smp.c
-f:arch/openrisc/kernel/stacktrace.c
-f:arch/openrisc/kernel/sync-timer.c
-f:arch/openrisc/kernel/sys_call_table.c
-f:arch/openrisc/kernel/time.c
-f:arch/openrisc/kernel/traps.c
-f:arch/openrisc/kernel/unwinder.c
-f:arch/openrisc/kernel/vmlinux.h
-f:arch/openrisc/kernel/vmlinux.lds.S
-f:arch/openrisc/lib/Makefile
-f:arch/openrisc/lib/delay.c
-f:arch/openrisc/lib/memcpy.c
-f:arch/openrisc/lib/memset.S
-f:arch/openrisc/lib/string.S
-f:arch/openrisc/mm/Makefile
-f:arch/openrisc/mm/cache.c
-f:arch/openrisc/mm/fault.c
-f:arch/openrisc/mm/init.c
-f:arch/openrisc/mm/ioremap.c
-f:arch/openrisc/mm/tlb.c
-f:arch/parisc/Kbuild
-f:arch/parisc/Kconfig
-f:arch/parisc/Kconfig.debug
-f:arch/parisc/Makefile
-f:arch/parisc/boot/.gitignore
-f:arch/parisc/boot/Makefile
-f:arch/parisc/boot/compressed/.gitignore
-f:arch/parisc/boot/compressed/Makefile
-f:arch/parisc/boot/compressed/firmware.c
-f:arch/parisc/boot/compressed/head.S
-f:arch/parisc/boot/compressed/misc.c
-f:arch/parisc/boot/compressed/real2.S
-f:arch/parisc/boot/compressed/vmlinux.lds.S
-f:arch/parisc/boot/compressed/vmlinux.scr
-f:arch/parisc/configs/generic-32bit_defconfig
-f:arch/parisc/configs/generic-64bit_defconfig
-f:arch/parisc/defpalo.conf
-f:arch/parisc/include/asm/Kbuild
-f:arch/parisc/include/asm/alternative.h
-f:arch/parisc/include/asm/asm-offsets.h
-f:arch/parisc/include/asm/asmregs.h
-f:arch/parisc/include/asm/assembly.h
-f:arch/parisc/include/asm/atomic.h
-f:arch/parisc/include/asm/barrier.h
-f:arch/parisc/include/asm/bitops.h
-f:arch/parisc/include/asm/bug.h
-f:arch/parisc/include/asm/cache.h
-f:arch/parisc/include/asm/cacheflush.h
-f:arch/parisc/include/asm/cachetype.h
-f:arch/parisc/include/asm/checksum.h
-f:arch/parisc/include/asm/cmpxchg.h
-f:arch/parisc/include/asm/compat.h
-f:arch/parisc/include/asm/compat_ucontext.h
-f:arch/parisc/include/asm/current.h
-f:arch/parisc/include/asm/delay.h
-f:arch/parisc/include/asm/dma-mapping.h
-f:arch/parisc/include/asm/dma.h
-f:arch/parisc/include/asm/dwarf.h
-f:arch/parisc/include/asm/eisa_bus.h
-f:arch/parisc/include/asm/eisa_eeprom.h
-f:arch/parisc/include/asm/elf.h
-f:arch/parisc/include/asm/extable.h
-f:arch/parisc/include/asm/fixmap.h
-f:arch/parisc/include/asm/floppy.h
-f:arch/parisc/include/asm/ftrace.h
-f:arch/parisc/include/asm/futex.h
-f:arch/parisc/include/asm/grfioctl.h
-f:arch/parisc/include/asm/hardirq.h
-f:arch/parisc/include/asm/hardware.h
-f:arch/parisc/include/asm/hash.h
-f:arch/parisc/include/asm/hugetlb.h
-f:arch/parisc/include/asm/io.h
-f:arch/parisc/include/asm/irq.h
-f:arch/parisc/include/asm/irqflags.h
-f:arch/parisc/include/asm/jump_label.h
-f:arch/parisc/include/asm/kbdleds.h
-f:arch/parisc/include/asm/kexec.h
-f:arch/parisc/include/asm/kfence.h
-f:arch/parisc/include/asm/kgdb.h
-f:arch/parisc/include/asm/kprobes.h
-f:arch/parisc/include/asm/ldcw.h
-f:arch/parisc/include/asm/led.h
-f:arch/parisc/include/asm/linkage.h
-f:arch/parisc/include/asm/mman.h
-f:arch/parisc/include/asm/mmu.h
-f:arch/parisc/include/asm/mmu_context.h
-f:arch/parisc/include/asm/mmzone.h
-f:arch/parisc/include/asm/module.h
-f:arch/parisc/include/asm/page.h
-f:arch/parisc/include/asm/parisc-device.h
-f:arch/parisc/include/asm/parport.h
-f:arch/parisc/include/asm/pci.h
-f:arch/parisc/include/asm/pdc.h
-f:arch/parisc/include/asm/pdc_chassis.h
-f:arch/parisc/include/asm/pdcpat.h
-f:arch/parisc/include/asm/perf.h
-f:arch/parisc/include/asm/perf_event.h
-f:arch/parisc/include/asm/pgalloc.h
-f:arch/parisc/include/asm/pgtable.h
-f:arch/parisc/include/asm/prefetch.h
-f:arch/parisc/include/asm/processor.h
-f:arch/parisc/include/asm/psw.h
-f:arch/parisc/include/asm/ptrace.h
-f:arch/parisc/include/asm/ropes.h
-f:arch/parisc/include/asm/rt_sigframe.h
-f:arch/parisc/include/asm/runway.h
-f:arch/parisc/include/asm/seccomp.h
-f:arch/parisc/include/asm/sections.h
-f:arch/parisc/include/asm/serial.h
-f:arch/parisc/include/asm/shmparam.h
-f:arch/parisc/include/asm/signal.h
-f:arch/parisc/include/asm/smp.h
-f:arch/parisc/include/asm/socket.h
-f:arch/parisc/include/asm/sparsemem.h
-f:arch/parisc/include/asm/special_insns.h
-f:arch/parisc/include/asm/spinlock.h
-f:arch/parisc/include/asm/spinlock_types.h
-f:arch/parisc/include/asm/string.h
-f:arch/parisc/include/asm/superio.h
-f:arch/parisc/include/asm/switch_to.h
-f:arch/parisc/include/asm/syscall.h
-f:arch/parisc/include/asm/text-patching.h
-f:arch/parisc/include/asm/thread_info.h
-f:arch/parisc/include/asm/timex.h
-f:arch/parisc/include/asm/tlb.h
-f:arch/parisc/include/asm/tlbflush.h
-f:arch/parisc/include/asm/topology.h
-f:arch/parisc/include/asm/traps.h
-f:arch/parisc/include/asm/uaccess.h
-f:arch/parisc/include/asm/ucontext.h
-f:arch/parisc/include/asm/unistd.h
-f:arch/parisc/include/asm/unwind.h
-f:arch/parisc/include/asm/vdso.h
-f:arch/parisc/include/asm/video.h
-f:arch/parisc/include/asm/vmalloc.h
-f:arch/parisc/include/uapi/asm/Kbuild
-f:arch/parisc/include/uapi/asm/auxvec.h
-f:arch/parisc/include/uapi/asm/bitsperlong.h
-f:arch/parisc/include/uapi/asm/byteorder.h
-f:arch/parisc/include/uapi/asm/cachectl.h
-f:arch/parisc/include/uapi/asm/errno.h
-f:arch/parisc/include/uapi/asm/fcntl.h
-f:arch/parisc/include/uapi/asm/ioctl.h
-f:arch/parisc/include/uapi/asm/ioctls.h
-f:arch/parisc/include/uapi/asm/ipcbuf.h
-f:arch/parisc/include/uapi/asm/mman.h
-f:arch/parisc/include/uapi/asm/msgbuf.h
-f:arch/parisc/include/uapi/asm/pdc.h
-f:arch/parisc/include/uapi/asm/posix_types.h
-f:arch/parisc/include/uapi/asm/ptrace.h
-f:arch/parisc/include/uapi/asm/sembuf.h
-f:arch/parisc/include/uapi/asm/setup.h
-f:arch/parisc/include/uapi/asm/shmbuf.h
-f:arch/parisc/include/uapi/asm/sigcontext.h
-f:arch/parisc/include/uapi/asm/signal.h
-f:arch/parisc/include/uapi/asm/socket.h
-f:arch/parisc/include/uapi/asm/stat.h
-f:arch/parisc/include/uapi/asm/statfs.h
-f:arch/parisc/include/uapi/asm/termbits.h
-f:arch/parisc/include/uapi/asm/unistd.h
-f:arch/parisc/install.sh
-f:arch/parisc/kernel/.gitignore
-f:arch/parisc/kernel/Makefile
-f:arch/parisc/kernel/alternative.c
-f:arch/parisc/kernel/asm-offsets.c
-f:arch/parisc/kernel/audit.c
-f:arch/parisc/kernel/cache.c
-f:arch/parisc/kernel/compat_audit.c
-f:arch/parisc/kernel/drivers.c
-f:arch/parisc/kernel/entry.S
-f:arch/parisc/kernel/firmware.c
-f:arch/parisc/kernel/ftrace.c
-f:arch/parisc/kernel/hardware.c
-f:arch/parisc/kernel/head.S
-f:arch/parisc/kernel/hpmc.S
-f:arch/parisc/kernel/inventory.c
-f:arch/parisc/kernel/irq.c
-f:arch/parisc/kernel/jump_label.c
-f:arch/parisc/kernel/kexec.c
-f:arch/parisc/kernel/kexec_file.c
-f:arch/parisc/kernel/kgdb.c
-f:arch/parisc/kernel/kprobes.c
-f:arch/parisc/kernel/module.c
-f:arch/parisc/kernel/pacache.S
-f:arch/parisc/kernel/parisc_ksyms.c
-f:arch/parisc/kernel/patch.c
-f:arch/parisc/kernel/pci-dma.c
-f:arch/parisc/kernel/pci.c
-f:arch/parisc/kernel/pdc_chassis.c
-f:arch/parisc/kernel/pdc_cons.c
-f:arch/parisc/kernel/pdt.c
-f:arch/parisc/kernel/perf.c
-f:arch/parisc/kernel/perf_asm.S
-f:arch/parisc/kernel/perf_images.h
-f:arch/parisc/kernel/process.c
-f:arch/parisc/kernel/processor.c
-f:arch/parisc/kernel/ptrace.c
-f:arch/parisc/kernel/real2.S
-f:arch/parisc/kernel/relocate_kernel.S
-f:arch/parisc/kernel/setup.c
-f:arch/parisc/kernel/signal.c
-f:arch/parisc/kernel/signal32.c
-f:arch/parisc/kernel/signal32.h
-f:arch/parisc/kernel/smp.c
-f:arch/parisc/kernel/stacktrace.c
-f:arch/parisc/kernel/sys_parisc.c
-f:arch/parisc/kernel/sys_parisc32.c
-f:arch/parisc/kernel/syscall.S
-f:arch/parisc/kernel/syscalls/Makefile
-f:arch/parisc/kernel/syscalls/syscall.tbl
-f:arch/parisc/kernel/time.c
-f:arch/parisc/kernel/toc.c
-f:arch/parisc/kernel/toc_asm.S
-f:arch/parisc/kernel/topology.c
-f:arch/parisc/kernel/traps.c
-f:arch/parisc/kernel/unaligned.c
-f:arch/parisc/kernel/unaligned.h
-f:arch/parisc/kernel/unwind.c
-f:arch/parisc/kernel/vdso.c
-f:arch/parisc/kernel/vdso32/Makefile
-f:arch/parisc/kernel/vdso32/gen_vdso_offsets.sh
-f:arch/parisc/kernel/vdso32/note.S
-f:arch/parisc/kernel/vdso32/restart_syscall.S
-f:arch/parisc/kernel/vdso32/sigtramp.S
-f:arch/parisc/kernel/vdso32/vdso32.lds.S
-f:arch/parisc/kernel/vdso32/vdso32_generic.c
-f:arch/parisc/kernel/vdso32/vdso32_wrapper.S
-f:arch/parisc/kernel/vdso64/Makefile
-f:arch/parisc/kernel/vdso64/gen_vdso_offsets.sh
-f:arch/parisc/kernel/vdso64/note.S
-f:arch/parisc/kernel/vdso64/restart_syscall.S
-f:arch/parisc/kernel/vdso64/sigtramp.S
-f:arch/parisc/kernel/vdso64/vdso64.lds.S
-f:arch/parisc/kernel/vdso64/vdso64_generic.c
-f:arch/parisc/kernel/vdso64/vdso64_wrapper.S
-f:arch/parisc/kernel/vmlinux.lds.S
-f:arch/parisc/lib/Makefile
-f:arch/parisc/lib/bitops.c
-f:arch/parisc/lib/checksum.c
-f:arch/parisc/lib/delay.c
-f:arch/parisc/lib/io.c
-f:arch/parisc/lib/iomap.c
-f:arch/parisc/lib/lusercopy.S
-f:arch/parisc/lib/memcpy.c
-f:arch/parisc/lib/memset.c
-f:arch/parisc/lib/ucmpdi2.c
-f:arch/parisc/math-emu/Makefile
-f:arch/parisc/math-emu/README
-f:arch/parisc/math-emu/cnv_float.h
-f:arch/parisc/math-emu/dbl_float.h
-f:arch/parisc/math-emu/decode_exc.c
-f:arch/parisc/math-emu/denormal.c
-f:arch/parisc/math-emu/dfadd.c
-f:arch/parisc/math-emu/dfcmp.c
-f:arch/parisc/math-emu/dfdiv.c
-f:arch/parisc/math-emu/dfmpy.c
-f:arch/parisc/math-emu/dfrem.c
-f:arch/parisc/math-emu/dfsqrt.c
-f:arch/parisc/math-emu/dfsub.c
-f:arch/parisc/math-emu/driver.c
-f:arch/parisc/math-emu/fcnvff.c
-f:arch/parisc/math-emu/fcnvfu.c
-f:arch/parisc/math-emu/fcnvfut.c
-f:arch/parisc/math-emu/fcnvfx.c
-f:arch/parisc/math-emu/fcnvfxt.c
-f:arch/parisc/math-emu/fcnvuf.c
-f:arch/parisc/math-emu/fcnvxf.c
-f:arch/parisc/math-emu/float.h
-f:arch/parisc/math-emu/fmpyfadd.c
-f:arch/parisc/math-emu/fpbits.h
-f:arch/parisc/math-emu/fpu.h
-f:arch/parisc/math-emu/fpudispatch.c
-f:arch/parisc/math-emu/frnd.c
-f:arch/parisc/math-emu/hppa.h
-f:arch/parisc/math-emu/math-emu.h
-f:arch/parisc/math-emu/sfadd.c
-f:arch/parisc/math-emu/sfcmp.c
-f:arch/parisc/math-emu/sfdiv.c
-f:arch/parisc/math-emu/sfmpy.c
-f:arch/parisc/math-emu/sfrem.c
-f:arch/parisc/math-emu/sfsqrt.c
-f:arch/parisc/math-emu/sfsub.c
-f:arch/parisc/math-emu/sgl_float.h
-f:arch/parisc/mm/Makefile
-f:arch/parisc/mm/fault.c
-f:arch/parisc/mm/fixmap.c
-f:arch/parisc/mm/hugetlbpage.c
-f:arch/parisc/mm/init.c
-f:arch/parisc/mm/ioremap.c
-f:arch/parisc/net/Makefile
-f:arch/parisc/net/bpf_jit.h
-f:arch/parisc/net/bpf_jit_comp32.c
-f:arch/parisc/net/bpf_jit_comp64.c
-f:arch/parisc/net/bpf_jit_core.c
-f:arch/parisc/video/Makefile
-f:arch/parisc/video/video-sti.c
-f:arch/powerpc/Kbuild
-f:arch/powerpc/Kconfig
-f:arch/powerpc/Kconfig.debug
-f:arch/powerpc/Makefile
-f:arch/powerpc/Makefile.postlink
-f:arch/powerpc/boot/.gitignore
-f:arch/powerpc/boot/44x.h
-f:arch/powerpc/boot/4xx.c
-f:arch/powerpc/boot/4xx.h
-f:arch/powerpc/boot/Makefile
-f:arch/powerpc/boot/README
-f:arch/powerpc/boot/addnote.c
-f:arch/powerpc/boot/bamboo.c
-f:arch/powerpc/boot/cpm-serial.c
-f:arch/powerpc/boot/crt0.S
-f:arch/powerpc/boot/crtsavres.S
-f:arch/powerpc/boot/cuboot-52xx.c
-f:arch/powerpc/boot/cuboot-824x.c
-f:arch/powerpc/boot/cuboot-83xx.c
-f:arch/powerpc/boot/cuboot-85xx-cpm2.c
-f:arch/powerpc/boot/cuboot-85xx.c
-f:arch/powerpc/boot/cuboot-8xx.c
-f:arch/powerpc/boot/cuboot-amigaone.c
-f:arch/powerpc/boot/cuboot-bamboo.c
-f:arch/powerpc/boot/cuboot-ebony.c
-f:arch/powerpc/boot/cuboot-katmai.c
-f:arch/powerpc/boot/cuboot-pq2.c
-f:arch/powerpc/boot/cuboot-rainier.c
-f:arch/powerpc/boot/cuboot-sam440ep.c
-f:arch/powerpc/boot/cuboot-sequoia.c
-f:arch/powerpc/boot/cuboot-taishan.c
-f:arch/powerpc/boot/cuboot-warp.c
-f:arch/powerpc/boot/cuboot-yosemite.c
-f:arch/powerpc/boot/cuboot.c
-f:arch/powerpc/boot/cuboot.h
-f:arch/powerpc/boot/dcr.h
-f:arch/powerpc/boot/decompress.c
-f:arch/powerpc/boot/devtree.c
-f:arch/powerpc/boot/div64.S
-f:arch/powerpc/boot/dts/Makefile
-f:arch/powerpc/boot/dts/a3m071.dts
-f:arch/powerpc/boot/dts/a4m072.dts
-f:arch/powerpc/boot/dts/ac14xx.dts
-f:arch/powerpc/boot/dts/adder875-redboot.dts
-f:arch/powerpc/boot/dts/adder875-uboot.dts
-f:arch/powerpc/boot/dts/akebono.dts
-f:arch/powerpc/boot/dts/amigaone.dts
-f:arch/powerpc/boot/dts/arches.dts
-f:arch/powerpc/boot/dts/asp834x-redboot.dts
-f:arch/powerpc/boot/dts/bamboo.dts
-f:arch/powerpc/boot/dts/bluestone.dts
-f:arch/powerpc/boot/dts/canyonlands.dts
-f:arch/powerpc/boot/dts/charon.dts
-f:arch/powerpc/boot/dts/cm5200.dts
-f:arch/powerpc/boot/dts/currituck.dts
-f:arch/powerpc/boot/dts/digsy_mtc.dts
-f:arch/powerpc/boot/dts/ebony.dts
-f:arch/powerpc/boot/dts/eiger.dts
-f:arch/powerpc/boot/dts/ep8248e.dts
-f:arch/powerpc/boot/dts/ep88xc.dts
-f:arch/powerpc/boot/dts/fsl/Makefile
-f:arch/powerpc/boot/dts/fsl/b4420qds.dts
-f:arch/powerpc/boot/dts/fsl/b4420si-post.dtsi
-f:arch/powerpc/boot/dts/fsl/b4420si-pre.dtsi
-f:arch/powerpc/boot/dts/fsl/b4860qds.dts
-f:arch/powerpc/boot/dts/fsl/b4860si-post.dtsi
-f:arch/powerpc/boot/dts/fsl/b4860si-pre.dtsi
-f:arch/powerpc/boot/dts/fsl/b4qds.dtsi
-f:arch/powerpc/boot/dts/fsl/b4si-post.dtsi
-f:arch/powerpc/boot/dts/fsl/bsc9131rdb.dts
-f:arch/powerpc/boot/dts/fsl/bsc9131rdb.dtsi
-f:arch/powerpc/boot/dts/fsl/bsc9131si-post.dtsi
-f:arch/powerpc/boot/dts/fsl/bsc9131si-pre.dtsi
-f:arch/powerpc/boot/dts/fsl/bsc9132qds.dts
-f:arch/powerpc/boot/dts/fsl/bsc9132qds.dtsi
-f:arch/powerpc/boot/dts/fsl/bsc9132si-post.dtsi
-f:arch/powerpc/boot/dts/fsl/bsc9132si-pre.dtsi
-f:arch/powerpc/boot/dts/fsl/c293pcie.dts
-f:arch/powerpc/boot/dts/fsl/c293si-post.dtsi
-f:arch/powerpc/boot/dts/fsl/c293si-pre.dtsi
-f:arch/powerpc/boot/dts/fsl/cyrus_p5020.dts
-f:arch/powerpc/boot/dts/fsl/e500mc_power_isa.dtsi
-f:arch/powerpc/boot/dts/fsl/e500v1_power_isa.dtsi
-f:arch/powerpc/boot/dts/fsl/e500v2_power_isa.dtsi
-f:arch/powerpc/boot/dts/fsl/e5500_power_isa.dtsi
-f:arch/powerpc/boot/dts/fsl/e6500_power_isa.dtsi
-f:arch/powerpc/boot/dts/fsl/elo3-dma-0.dtsi
-f:arch/powerpc/boot/dts/fsl/elo3-dma-1.dtsi
-f:arch/powerpc/boot/dts/fsl/elo3-dma-2.dtsi
-f:arch/powerpc/boot/dts/fsl/ge_imp3a.dts
-f:arch/powerpc/boot/dts/fsl/gef_ppc9a.dts
-f:arch/powerpc/boot/dts/fsl/gef_sbc310.dts
-f:arch/powerpc/boot/dts/fsl/gef_sbc610.dts
-f:arch/powerpc/boot/dts/fsl/interlaken-lac-portals.dtsi
-f:arch/powerpc/boot/dts/fsl/interlaken-lac.dtsi
-f:arch/powerpc/boot/dts/fsl/kmcent2.dts
-f:arch/powerpc/boot/dts/fsl/kmcoge4.dts
-f:arch/powerpc/boot/dts/fsl/mpc8536ds.dts
-f:arch/powerpc/boot/dts/fsl/mpc8536ds.dtsi
-f:arch/powerpc/boot/dts/fsl/mpc8536ds_36b.dts
-f:arch/powerpc/boot/dts/fsl/mpc8536si-post.dtsi
-f:arch/powerpc/boot/dts/fsl/mpc8536si-pre.dtsi
-f:arch/powerpc/boot/dts/fsl/mpc8544ds.dts
-f:arch/powerpc/boot/dts/fsl/mpc8544ds.dtsi
-f:arch/powerpc/boot/dts/fsl/mpc8544si-post.dtsi
-f:arch/powerpc/boot/dts/fsl/mpc8544si-pre.dtsi
-f:arch/powerpc/boot/dts/fsl/mpc8548si-post.dtsi
-f:arch/powerpc/boot/dts/fsl/mpc8548si-pre.dtsi
-f:arch/powerpc/boot/dts/fsl/mpc8568mds.dts
-f:arch/powerpc/boot/dts/fsl/mpc8568si-post.dtsi
-f:arch/powerpc/boot/dts/fsl/mpc8568si-pre.dtsi
-f:arch/powerpc/boot/dts/fsl/mpc8569mds.dts
-f:arch/powerpc/boot/dts/fsl/mpc8569si-post.dtsi
-f:arch/powerpc/boot/dts/fsl/mpc8569si-pre.dtsi
-f:arch/powerpc/boot/dts/fsl/mpc8572ds.dts
-f:arch/powerpc/boot/dts/fsl/mpc8572ds.dtsi
-f:arch/powerpc/boot/dts/fsl/mpc8572ds_36b.dts
-f:arch/powerpc/boot/dts/fsl/mpc8572ds_camp_core0.dts
-f:arch/powerpc/boot/dts/fsl/mpc8572ds_camp_core1.dts
-f:arch/powerpc/boot/dts/fsl/mpc8572si-post.dtsi
-f:arch/powerpc/boot/dts/fsl/mpc8572si-pre.dtsi
-f:arch/powerpc/boot/dts/fsl/mpc8641si-post.dtsi
-f:arch/powerpc/boot/dts/fsl/mpc8641si-pre.dtsi
-f:arch/powerpc/boot/dts/fsl/mvme2500.dts
-f:arch/powerpc/boot/dts/fsl/mvme7100.dts
-f:arch/powerpc/boot/dts/fsl/oca4080.dts
-f:arch/powerpc/boot/dts/fsl/p1010rdb-pa.dts
-f:arch/powerpc/boot/dts/fsl/p1010rdb-pa.dtsi
-f:arch/powerpc/boot/dts/fsl/p1010rdb-pa_36b.dts
-f:arch/powerpc/boot/dts/fsl/p1010rdb-pb.dts
-f:arch/powerpc/boot/dts/fsl/p1010rdb-pb_36b.dts
-f:arch/powerpc/boot/dts/fsl/p1010rdb.dtsi
-f:arch/powerpc/boot/dts/fsl/p1010rdb_32b.dtsi
-f:arch/powerpc/boot/dts/fsl/p1010rdb_36b.dtsi
-f:arch/powerpc/boot/dts/fsl/p1010si-post.dtsi
-f:arch/powerpc/boot/dts/fsl/p1010si-pre.dtsi
-f:arch/powerpc/boot/dts/fsl/p1020mbg-pc.dtsi
-f:arch/powerpc/boot/dts/fsl/p1020mbg-pc_32b.dts
-f:arch/powerpc/boot/dts/fsl/p1020mbg-pc_36b.dts
-f:arch/powerpc/boot/dts/fsl/p1020rdb-pc.dtsi
-f:arch/powerpc/boot/dts/fsl/p1020rdb-pc_32b.dts
-f:arch/powerpc/boot/dts/fsl/p1020rdb-pc_36b.dts
-f:arch/powerpc/boot/dts/fsl/p1020rdb-pc_camp_core0.dts
-f:arch/powerpc/boot/dts/fsl/p1020rdb-pc_camp_core1.dts
-f:arch/powerpc/boot/dts/fsl/p1020rdb-pd.dts
-f:arch/powerpc/boot/dts/fsl/p1020rdb.dts
-f:arch/powerpc/boot/dts/fsl/p1020rdb.dtsi
-f:arch/powerpc/boot/dts/fsl/p1020rdb_36b.dts
-f:arch/powerpc/boot/dts/fsl/p1020si-post.dtsi
-f:arch/powerpc/boot/dts/fsl/p1020si-pre.dtsi
-f:arch/powerpc/boot/dts/fsl/p1020utm-pc.dtsi
-f:arch/powerpc/boot/dts/fsl/p1020utm-pc_32b.dts
-f:arch/powerpc/boot/dts/fsl/p1020utm-pc_36b.dts
-f:arch/powerpc/boot/dts/fsl/p1021mds.dts
-f:arch/powerpc/boot/dts/fsl/p1021rdb-pc.dtsi
-f:arch/powerpc/boot/dts/fsl/p1021rdb-pc_32b.dts
-f:arch/powerpc/boot/dts/fsl/p1021rdb-pc_36b.dts
-f:arch/powerpc/boot/dts/fsl/p1021si-post.dtsi
-f:arch/powerpc/boot/dts/fsl/p1021si-pre.dtsi
-f:arch/powerpc/boot/dts/fsl/p1022ds.dtsi
-f:arch/powerpc/boot/dts/fsl/p1022ds_32b.dts
-f:arch/powerpc/boot/dts/fsl/p1022ds_36b.dts
-f:arch/powerpc/boot/dts/fsl/p1022rdk.dts
-f:arch/powerpc/boot/dts/fsl/p1022si-post.dtsi
-f:arch/powerpc/boot/dts/fsl/p1022si-pre.dtsi
-f:arch/powerpc/boot/dts/fsl/p1023rdb.dts
-f:arch/powerpc/boot/dts/fsl/p1023si-post.dtsi
-f:arch/powerpc/boot/dts/fsl/p1023si-pre.dtsi
-f:arch/powerpc/boot/dts/fsl/p1024rdb.dtsi
-f:arch/powerpc/boot/dts/fsl/p1024rdb_32b.dts
-f:arch/powerpc/boot/dts/fsl/p1024rdb_36b.dts
-f:arch/powerpc/boot/dts/fsl/p1025rdb.dtsi
-f:arch/powerpc/boot/dts/fsl/p1025rdb_32b.dts
-f:arch/powerpc/boot/dts/fsl/p1025rdb_36b.dts
-f:arch/powerpc/boot/dts/fsl/p1025twr.dts
-f:arch/powerpc/boot/dts/fsl/p1025twr.dtsi
-f:arch/powerpc/boot/dts/fsl/p2020ds.dts
-f:arch/powerpc/boot/dts/fsl/p2020ds.dtsi
-f:arch/powerpc/boot/dts/fsl/p2020rdb-pc.dtsi
-f:arch/powerpc/boot/dts/fsl/p2020rdb-pc_32b.dts
-f:arch/powerpc/boot/dts/fsl/p2020rdb-pc_36b.dts
-f:arch/powerpc/boot/dts/fsl/p2020rdb.dts
-f:arch/powerpc/boot/dts/fsl/p2020si-post.dtsi
-f:arch/powerpc/boot/dts/fsl/p2020si-pre.dtsi
-f:arch/powerpc/boot/dts/fsl/p2041rdb.dts
-f:arch/powerpc/boot/dts/fsl/p2041si-post.dtsi
-f:arch/powerpc/boot/dts/fsl/p2041si-pre.dtsi
-f:arch/powerpc/boot/dts/fsl/p3041ds.dts
-f:arch/powerpc/boot/dts/fsl/p3041si-post.dtsi
-f:arch/powerpc/boot/dts/fsl/p3041si-pre.dtsi
-f:arch/powerpc/boot/dts/fsl/p4080ds.dts
-f:arch/powerpc/boot/dts/fsl/p4080si-post.dtsi
-f:arch/powerpc/boot/dts/fsl/p4080si-pre.dtsi
-f:arch/powerpc/boot/dts/fsl/p5020ds.dts
-f:arch/powerpc/boot/dts/fsl/p5020si-post.dtsi
-f:arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi
-f:arch/powerpc/boot/dts/fsl/p5040ds.dts
-f:arch/powerpc/boot/dts/fsl/p5040si-post.dtsi
-f:arch/powerpc/boot/dts/fsl/p5040si-pre.dtsi
-f:arch/powerpc/boot/dts/fsl/ppa8548.dts
-f:arch/powerpc/boot/dts/fsl/pq3-dma-0.dtsi
-f:arch/powerpc/boot/dts/fsl/pq3-dma-1.dtsi
-f:arch/powerpc/boot/dts/fsl/pq3-duart-0.dtsi
-f:arch/powerpc/boot/dts/fsl/pq3-esdhc-0.dtsi
-f:arch/powerpc/boot/dts/fsl/pq3-espi-0.dtsi
-f:arch/powerpc/boot/dts/fsl/pq3-etsec1-0.dtsi
-f:arch/powerpc/boot/dts/fsl/pq3-etsec1-1.dtsi
-f:arch/powerpc/boot/dts/fsl/pq3-etsec1-2.dtsi
-f:arch/powerpc/boot/dts/fsl/pq3-etsec1-3.dtsi
-f:arch/powerpc/boot/dts/fsl/pq3-etsec1-timer-0.dtsi
-f:arch/powerpc/boot/dts/fsl/pq3-etsec2-0.dtsi
-f:arch/powerpc/boot/dts/fsl/pq3-etsec2-1.dtsi
-f:arch/powerpc/boot/dts/fsl/pq3-etsec2-2.dtsi
-f:arch/powerpc/boot/dts/fsl/pq3-etsec2-grp2-0.dtsi
-f:arch/powerpc/boot/dts/fsl/pq3-etsec2-grp2-1.dtsi
-f:arch/powerpc/boot/dts/fsl/pq3-etsec2-grp2-2.dtsi
-f:arch/powerpc/boot/dts/fsl/pq3-gpio-0.dtsi
-f:arch/powerpc/boot/dts/fsl/pq3-i2c-0.dtsi
-f:arch/powerpc/boot/dts/fsl/pq3-i2c-1.dtsi
-f:arch/powerpc/boot/dts/fsl/pq3-mpic-message-B.dtsi
-f:arch/powerpc/boot/dts/fsl/pq3-mpic-timer-B.dtsi
-f:arch/powerpc/boot/dts/fsl/pq3-mpic.dtsi
-f:arch/powerpc/boot/dts/fsl/pq3-power.dtsi
-f:arch/powerpc/boot/dts/fsl/pq3-rmu-0.dtsi
-f:arch/powerpc/boot/dts/fsl/pq3-sata2-0.dtsi
-f:arch/powerpc/boot/dts/fsl/pq3-sata2-1.dtsi
-f:arch/powerpc/boot/dts/fsl/pq3-sec2.1-0.dtsi
-f:arch/powerpc/boot/dts/fsl/pq3-sec3.0-0.dtsi
-f:arch/powerpc/boot/dts/fsl/pq3-sec3.1-0.dtsi
-f:arch/powerpc/boot/dts/fsl/pq3-sec3.3-0.dtsi
-f:arch/powerpc/boot/dts/fsl/pq3-sec4.4-0.dtsi
-f:arch/powerpc/boot/dts/fsl/pq3-usb2-dr-0.dtsi
-f:arch/powerpc/boot/dts/fsl/pq3-usb2-dr-1.dtsi
-f:arch/powerpc/boot/dts/fsl/qonverge-usb2-dr-0.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-bman1-portals.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-bman1.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-clockgen1.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-clockgen2.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-dma-0.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-dma-1.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-duart-0.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-duart-1.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-esdhc-0.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-espi-0.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-fman-0-10g-0.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-0.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-1.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-2.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-3.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-4.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-fman-0.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-fman-1-10g-0.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-0.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-1.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-2.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-3.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-4.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-fman-1.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-0-best-effort.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-0.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-1-best-effort.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-1.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-2.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-3.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-0.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-1.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-2.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-3.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-4.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-5.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-fman3-0.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-fman3-1-10g-0.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-fman3-1-10g-1.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-0.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-1.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-2.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-3.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-4.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-5.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-fman3-1.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-fman3l-0.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-gpio-0.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-gpio-1.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-gpio-2.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-gpio-3.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-i2c-0.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-i2c-1.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-mpic.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-mpic4.3.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-qman1-portals.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-qman1.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-qman3.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-raid1.0-0.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-rmu-0.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-sata2-0.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-sata2-1.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-sec4.0-0.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-sec4.2-0.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-sec5.0-0.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-sec5.2-0.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-sec5.3-0.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-sec6.0-0.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-usb2-dr-0.dtsi
-f:arch/powerpc/boot/dts/fsl/qoriq-usb2-mph-0.dtsi
-f:arch/powerpc/boot/dts/fsl/t1023rdb.dts
-f:arch/powerpc/boot/dts/fsl/t1023si-post.dtsi
-f:arch/powerpc/boot/dts/fsl/t1024qds.dts
-f:arch/powerpc/boot/dts/fsl/t1024rdb.dts
-f:arch/powerpc/boot/dts/fsl/t1024si-post.dtsi
-f:arch/powerpc/boot/dts/fsl/t102xsi-pre.dtsi
-f:arch/powerpc/boot/dts/fsl/t1040d4rdb.dts
-f:arch/powerpc/boot/dts/fsl/t1040qds.dts
-f:arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts
-f:arch/powerpc/boot/dts/fsl/t1040rdb.dts
-f:arch/powerpc/boot/dts/fsl/t1040si-post.dtsi
-f:arch/powerpc/boot/dts/fsl/t1042d4rdb.dts
-f:arch/powerpc/boot/dts/fsl/t1042qds.dts
-f:arch/powerpc/boot/dts/fsl/t1042rdb.dts
-f:arch/powerpc/boot/dts/fsl/t1042rdb_pi.dts
-f:arch/powerpc/boot/dts/fsl/t1042si-post.dtsi
-f:arch/powerpc/boot/dts/fsl/t104xd4rdb.dtsi
-f:arch/powerpc/boot/dts/fsl/t104xqds.dtsi
-f:arch/powerpc/boot/dts/fsl/t104xrdb.dtsi
-f:arch/powerpc/boot/dts/fsl/t104xsi-pre.dtsi
-f:arch/powerpc/boot/dts/fsl/t2080qds.dts
-f:arch/powerpc/boot/dts/fsl/t2080rdb.dts
-f:arch/powerpc/boot/dts/fsl/t2080si-post.dtsi
-f:arch/powerpc/boot/dts/fsl/t2081qds.dts
-f:arch/powerpc/boot/dts/fsl/t2081si-post.dtsi
-f:arch/powerpc/boot/dts/fsl/t208xqds.dtsi
-f:arch/powerpc/boot/dts/fsl/t208xrdb.dtsi
-f:arch/powerpc/boot/dts/fsl/t208xsi-pre.dtsi
-f:arch/powerpc/boot/dts/fsl/t4240qds.dts
-f:arch/powerpc/boot/dts/fsl/t4240rdb.dts
-f:arch/powerpc/boot/dts/fsl/t4240si-post.dtsi
-f:arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi
-f:arch/powerpc/boot/dts/fsp2.dts
-f:arch/powerpc/boot/dts/gamecube.dts
-f:arch/powerpc/boot/dts/glacier.dts
-f:arch/powerpc/boot/dts/holly.dts
-f:arch/powerpc/boot/dts/icon.dts
-f:arch/powerpc/boot/dts/iss4xx-mpic.dts
-f:arch/powerpc/boot/dts/iss4xx.dts
-f:arch/powerpc/boot/dts/katmai.dts
-f:arch/powerpc/boot/dts/kmeter1.dts
-f:arch/powerpc/boot/dts/ksi8560.dts
-f:arch/powerpc/boot/dts/kuroboxHD.dts
-f:arch/powerpc/boot/dts/kuroboxHG.dts
-f:arch/powerpc/boot/dts/lite5200.dts
-f:arch/powerpc/boot/dts/lite5200b.dts
-f:arch/powerpc/boot/dts/media5200.dts
-f:arch/powerpc/boot/dts/mgcoge.dts
-f:arch/powerpc/boot/dts/microwatt.dts
-f:arch/powerpc/boot/dts/motionpro.dts
-f:arch/powerpc/boot/dts/mpc5121.dtsi
-f:arch/powerpc/boot/dts/mpc5121ads.dts
-f:arch/powerpc/boot/dts/mpc5125twr.dts
-f:arch/powerpc/boot/dts/mpc5200b.dtsi
-f:arch/powerpc/boot/dts/mpc8308_p1m.dts
-f:arch/powerpc/boot/dts/mpc8308rdb.dts
-f:arch/powerpc/boot/dts/mpc8313erdb.dts
-f:arch/powerpc/boot/dts/mpc8315erdb.dts
-f:arch/powerpc/boot/dts/mpc832x_rdb.dts
-f:arch/powerpc/boot/dts/mpc8349emitx.dts
-f:arch/powerpc/boot/dts/mpc8349emitxgp.dts
-f:arch/powerpc/boot/dts/mpc836x_rdk.dts
-f:arch/powerpc/boot/dts/mpc8377_rdb.dts
-f:arch/powerpc/boot/dts/mpc8377_wlan.dts
-f:arch/powerpc/boot/dts/mpc8378_rdb.dts
-f:arch/powerpc/boot/dts/mpc8379_rdb.dts
-f:arch/powerpc/boot/dts/mpc866ads.dts
-f:arch/powerpc/boot/dts/mpc885ads.dts
-f:arch/powerpc/boot/dts/mucmc52.dts
-f:arch/powerpc/boot/dts/mvme5100.dts
-f:arch/powerpc/boot/dts/o2d.dts
-f:arch/powerpc/boot/dts/o2d.dtsi
-f:arch/powerpc/boot/dts/o2d300.dts
-f:arch/powerpc/boot/dts/o2dnt2.dts
-f:arch/powerpc/boot/dts/o2i.dts
-f:arch/powerpc/boot/dts/o2mnt.dts
-f:arch/powerpc/boot/dts/o3dnt.dts
-f:arch/powerpc/boot/dts/pcm030.dts
-f:arch/powerpc/boot/dts/pcm032.dts
-f:arch/powerpc/boot/dts/pdm360ng.dts
-f:arch/powerpc/boot/dts/ps3.dts
-f:arch/powerpc/boot/dts/rainier.dts
-f:arch/powerpc/boot/dts/redwood.dts
-f:arch/powerpc/boot/dts/sam440ep.dts
-f:arch/powerpc/boot/dts/sequoia.dts
-f:arch/powerpc/boot/dts/socrates.dts
-f:arch/powerpc/boot/dts/storcenter.dts
-f:arch/powerpc/boot/dts/stx_gp3_8560.dts
-f:arch/powerpc/boot/dts/stxssa8555.dts
-f:arch/powerpc/boot/dts/taishan.dts
-f:arch/powerpc/boot/dts/tqm5200.dts
-f:arch/powerpc/boot/dts/tqm8540.dts
-f:arch/powerpc/boot/dts/tqm8541.dts
-f:arch/powerpc/boot/dts/tqm8548-bigflash.dts
-f:arch/powerpc/boot/dts/tqm8548.dts
-f:arch/powerpc/boot/dts/tqm8555.dts
-f:arch/powerpc/boot/dts/tqm8560.dts
-f:arch/powerpc/boot/dts/tqm8xx.dts
-f:arch/powerpc/boot/dts/turris1x.dts
-f:arch/powerpc/boot/dts/uc101.dts
-f:arch/powerpc/boot/dts/warp.dts
-f:arch/powerpc/boot/dts/wii.dts
-f:arch/powerpc/boot/dts/xcalibur1501.dts
-f:arch/powerpc/boot/dts/xpedite5200.dts
-f:arch/powerpc/boot/dts/xpedite5200_xmon.dts
-f:arch/powerpc/boot/dts/xpedite5301.dts
-f:arch/powerpc/boot/dts/xpedite5330.dts
-f:arch/powerpc/boot/dts/xpedite5370.dts
-f:arch/powerpc/boot/dts/yosemite.dts
-f:arch/powerpc/boot/ebony.c
-f:arch/powerpc/boot/elf.h
-f:arch/powerpc/boot/elf_util.c
-f:arch/powerpc/boot/ep8248e.c
-f:arch/powerpc/boot/ep88xc.c
-f:arch/powerpc/boot/epapr-wrapper.c
-f:arch/powerpc/boot/epapr.c
-f:arch/powerpc/boot/fixed-head.S
-f:arch/powerpc/boot/fixup-headers.sed
-f:arch/powerpc/boot/fsl-soc.c
-f:arch/powerpc/boot/fsl-soc.h
-f:arch/powerpc/boot/gamecube-head.S
-f:arch/powerpc/boot/gamecube.c
-f:arch/powerpc/boot/hack-coff.c
-f:arch/powerpc/boot/holly.c
-f:arch/powerpc/boot/install.sh
-f:arch/powerpc/boot/io.h
-f:arch/powerpc/boot/libfdt-wrapper.c
-f:arch/powerpc/boot/libfdt_env.h
-f:arch/powerpc/boot/main.c
-f:arch/powerpc/boot/microwatt.c
-f:arch/powerpc/boot/mktree.c
-f:arch/powerpc/boot/motload-head.S
-f:arch/powerpc/boot/mpc52xx-psc.c
-f:arch/powerpc/boot/mpc8xx.c
-f:arch/powerpc/boot/mpc8xx.h
-f:arch/powerpc/boot/mvme5100.c
-f:arch/powerpc/boot/mvme7100.c
-f:arch/powerpc/boot/ns16550.c
-f:arch/powerpc/boot/of.c
-f:arch/powerpc/boot/of.h
-f:arch/powerpc/boot/ofconsole.c
-f:arch/powerpc/boot/oflib.c
-f:arch/powerpc/boot/opal-calls.S
-f:arch/powerpc/boot/opal.c
-f:arch/powerpc/boot/ops.h
-f:arch/powerpc/boot/page.h
-f:arch/powerpc/boot/planetcore.c
-f:arch/powerpc/boot/planetcore.h
-f:arch/powerpc/boot/ppc_asm.h
-f:arch/powerpc/boot/ppcboot.h
-f:arch/powerpc/boot/pq2.c
-f:arch/powerpc/boot/pq2.h
-f:arch/powerpc/boot/ps3-head.S
-f:arch/powerpc/boot/ps3-hvcall.S
-f:arch/powerpc/boot/ps3.c
-f:arch/powerpc/boot/pseries-head.S
-f:arch/powerpc/boot/redboot-83xx.c
-f:arch/powerpc/boot/redboot-8xx.c
-f:arch/powerpc/boot/redboot.h
-f:arch/powerpc/boot/reg.h
-f:arch/powerpc/boot/rs6000.h
-f:arch/powerpc/boot/serial.c
-f:arch/powerpc/boot/simple_alloc.c
-f:arch/powerpc/boot/simpleboot.c
-f:arch/powerpc/boot/stdbool.h
-f:arch/powerpc/boot/stdint.h
-f:arch/powerpc/boot/stdio.c
-f:arch/powerpc/boot/stdio.h
-f:arch/powerpc/boot/stdlib.c
-f:arch/powerpc/boot/stdlib.h
-f:arch/powerpc/boot/string.S
-f:arch/powerpc/boot/string.h
-f:arch/powerpc/boot/swab.h
-f:arch/powerpc/boot/treeboot-akebono.c
-f:arch/powerpc/boot/treeboot-bamboo.c
-f:arch/powerpc/boot/treeboot-currituck.c
-f:arch/powerpc/boot/treeboot-ebony.c
-f:arch/powerpc/boot/treeboot-iss4xx.c
-f:arch/powerpc/boot/types.h
-f:arch/powerpc/boot/ugecon.c
-f:arch/powerpc/boot/ugecon.h
-f:arch/powerpc/boot/util.S
-f:arch/powerpc/boot/wii-head.S
-f:arch/powerpc/boot/wii.c
-f:arch/powerpc/boot/wrapper
-f:arch/powerpc/boot/xz_config.h
-f:arch/powerpc/boot/zImage.coff.lds.S
-f:arch/powerpc/boot/zImage.lds.S
-f:arch/powerpc/boot/zImage.ps3.lds.S
-f:arch/powerpc/configs/32-bit.config
-f:arch/powerpc/configs/44x.config
-f:arch/powerpc/configs/44x/akebono_defconfig
-f:arch/powerpc/configs/44x/arches_defconfig
-f:arch/powerpc/configs/44x/bamboo_defconfig
-f:arch/powerpc/configs/44x/bluestone_defconfig
-f:arch/powerpc/configs/44x/canyonlands_defconfig
-f:arch/powerpc/configs/44x/currituck_defconfig
-f:arch/powerpc/configs/44x/ebony_defconfig
-f:arch/powerpc/configs/44x/eiger_defconfig
-f:arch/powerpc/configs/44x/fsp2_defconfig
-f:arch/powerpc/configs/44x/icon_defconfig
-f:arch/powerpc/configs/44x/iss476-smp_defconfig
-f:arch/powerpc/configs/44x/katmai_defconfig
-f:arch/powerpc/configs/44x/rainier_defconfig
-f:arch/powerpc/configs/44x/redwood_defconfig
-f:arch/powerpc/configs/44x/sam440ep_defconfig
-f:arch/powerpc/configs/44x/sequoia_defconfig
-f:arch/powerpc/configs/44x/taishan_defconfig
-f:arch/powerpc/configs/44x/warp_defconfig
-f:arch/powerpc/configs/52xx/cm5200_defconfig
-f:arch/powerpc/configs/52xx/lite5200b_defconfig
-f:arch/powerpc/configs/52xx/motionpro_defconfig
-f:arch/powerpc/configs/52xx/pcm030_defconfig
-f:arch/powerpc/configs/52xx/tqm5200_defconfig
-f:arch/powerpc/configs/64-bit.config
-f:arch/powerpc/configs/83xx/asp8347_defconfig
-f:arch/powerpc/configs/83xx/kmeter1_defconfig
-f:arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
-f:arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
-f:arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
-f:arch/powerpc/configs/83xx/mpc834x_itx_defconfig
-f:arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
-f:arch/powerpc/configs/83xx/mpc836x_rdk_defconfig
-f:arch/powerpc/configs/83xx/mpc837x_rdb_defconfig
-f:arch/powerpc/configs/85xx-32bit.config
-f:arch/powerpc/configs/85xx-64bit.config
-f:arch/powerpc/configs/85xx-hw.config
-f:arch/powerpc/configs/85xx-smp.config
-f:arch/powerpc/configs/85xx/ge_imp3a_defconfig
-f:arch/powerpc/configs/85xx/ksi8560_defconfig
-f:arch/powerpc/configs/85xx/ppa8548_defconfig
-f:arch/powerpc/configs/85xx/socrates_defconfig
-f:arch/powerpc/configs/85xx/stx_gp3_defconfig
-f:arch/powerpc/configs/85xx/tqm8540_defconfig
-f:arch/powerpc/configs/85xx/tqm8541_defconfig
-f:arch/powerpc/configs/85xx/tqm8548_defconfig
-f:arch/powerpc/configs/85xx/tqm8555_defconfig
-f:arch/powerpc/configs/85xx/tqm8560_defconfig
-f:arch/powerpc/configs/85xx/xes_mpc85xx_defconfig
-f:arch/powerpc/configs/86xx-hw.config
-f:arch/powerpc/configs/86xx-smp.config
-f:arch/powerpc/configs/8xx.config
-f:arch/powerpc/configs/adder875_defconfig
-f:arch/powerpc/configs/altivec.config
-f:arch/powerpc/configs/amigaone_defconfig
-f:arch/powerpc/configs/be.config
-f:arch/powerpc/configs/book3s_32.config
-f:arch/powerpc/configs/cell_defconfig
-f:arch/powerpc/configs/chrp32_defconfig
-f:arch/powerpc/configs/corenet_base.config
-f:arch/powerpc/configs/debug.config
-f:arch/powerpc/configs/disable-werror.config
-f:arch/powerpc/configs/dpaa.config
-f:arch/powerpc/configs/ep8248e_defconfig
-f:arch/powerpc/configs/ep88xc_defconfig
-f:arch/powerpc/configs/fsl-emb-nonhw.config
-f:arch/powerpc/configs/g5_defconfig
-f:arch/powerpc/configs/gamecube_defconfig
-f:arch/powerpc/configs/guest.config
-f:arch/powerpc/configs/hardening.config
-f:arch/powerpc/configs/holly_defconfig
-f:arch/powerpc/configs/le.config
-f:arch/powerpc/configs/linkstation_defconfig
-f:arch/powerpc/configs/mgcoge_defconfig
-f:arch/powerpc/configs/microwatt_defconfig
-f:arch/powerpc/configs/mpc512x_defconfig
-f:arch/powerpc/configs/mpc5200_defconfig
-f:arch/powerpc/configs/mpc83xx_defconfig
-f:arch/powerpc/configs/mpc85xx_base.config
-f:arch/powerpc/configs/mpc866_ads_defconfig
-f:arch/powerpc/configs/mpc86xx_base.config
-f:arch/powerpc/configs/mpc885_ads_defconfig
-f:arch/powerpc/configs/mvme5100_defconfig
-f:arch/powerpc/configs/pasemi_defconfig
-f:arch/powerpc/configs/pmac32_defconfig
-f:arch/powerpc/configs/powernv_defconfig
-f:arch/powerpc/configs/ppc44x_defconfig
-f:arch/powerpc/configs/ppc64_defconfig
-f:arch/powerpc/configs/ppc64e_defconfig
-f:arch/powerpc/configs/ppc64le.config
-f:arch/powerpc/configs/ppc6xx_defconfig
-f:arch/powerpc/configs/ps3_defconfig
-f:arch/powerpc/configs/security.config
-f:arch/powerpc/configs/skiroot_defconfig
-f:arch/powerpc/configs/storcenter_defconfig
-f:arch/powerpc/configs/tqm8xx_defconfig
-f:arch/powerpc/configs/wii_defconfig
-f:arch/powerpc/crypto/.gitignore
-f:arch/powerpc/crypto/Kconfig
-f:arch/powerpc/crypto/Makefile
-f:arch/powerpc/crypto/aes-gcm-p10-glue.c
-f:arch/powerpc/crypto/aes-gcm-p10.S
-f:arch/powerpc/crypto/aes-spe-core.S
-f:arch/powerpc/crypto/aes-spe-glue.c
-f:arch/powerpc/crypto/aes-spe-keys.S
-f:arch/powerpc/crypto/aes-spe-modes.S
-f:arch/powerpc/crypto/aes-spe-regs.h
-f:arch/powerpc/crypto/aes-tab-4k.S
-f:arch/powerpc/crypto/aes.c
-f:arch/powerpc/crypto/aes_cbc.c
-f:arch/powerpc/crypto/aes_ctr.c
-f:arch/powerpc/crypto/aes_xts.c
-f:arch/powerpc/crypto/aesp10-ppc.pl
-f:arch/powerpc/crypto/aesp8-ppc.h
-f:arch/powerpc/crypto/aesp8-ppc.pl
-f:arch/powerpc/crypto/curve25519-ppc64le-core.c
-f:arch/powerpc/crypto/curve25519-ppc64le_asm.S
-f:arch/powerpc/crypto/ghash.c
-f:arch/powerpc/crypto/ghashp10-ppc.pl
-f:arch/powerpc/crypto/ghashp8-ppc.pl
-f:arch/powerpc/crypto/md5-asm.S
-f:arch/powerpc/crypto/md5-glue.c
-f:arch/powerpc/crypto/ppc-xlate.pl
-f:arch/powerpc/crypto/vmx.c
-f:arch/powerpc/include/asm/8xx_immap.h
-f:arch/powerpc/include/asm/Kbuild
-f:arch/powerpc/include/asm/accounting.h
-f:arch/powerpc/include/asm/archrandom.h
-f:arch/powerpc/include/asm/asm-compat.h
-f:arch/powerpc/include/asm/asm-const.h
-f:arch/powerpc/include/asm/asm-offsets.h
-f:arch/powerpc/include/asm/asm-prototypes.h
-f:arch/powerpc/include/asm/asm.h
-f:arch/powerpc/include/asm/async_tx.h
-f:arch/powerpc/include/asm/atomic.h
-f:arch/powerpc/include/asm/backlight.h
-f:arch/powerpc/include/asm/barrier.h
-f:arch/powerpc/include/asm/bitops.h
-f:arch/powerpc/include/asm/book3s/32/kup.h
-f:arch/powerpc/include/asm/book3s/32/mmu-hash.h
-f:arch/powerpc/include/asm/book3s/32/pgalloc.h
-f:arch/powerpc/include/asm/book3s/32/pgtable.h
-f:arch/powerpc/include/asm/book3s/32/tlbflush.h
-f:arch/powerpc/include/asm/book3s/64/hash-4k.h
-f:arch/powerpc/include/asm/book3s/64/hash-64k.h
-f:arch/powerpc/include/asm/book3s/64/hash-pkey.h
-f:arch/powerpc/include/asm/book3s/64/hash.h
-f:arch/powerpc/include/asm/book3s/64/hugetlb.h
-f:arch/powerpc/include/asm/book3s/64/kexec.h
-f:arch/powerpc/include/asm/book3s/64/kup.h
-f:arch/powerpc/include/asm/book3s/64/mmu-hash.h
-f:arch/powerpc/include/asm/book3s/64/mmu.h
-f:arch/powerpc/include/asm/book3s/64/pgalloc.h
-f:arch/powerpc/include/asm/book3s/64/pgtable-64k.h
-f:arch/powerpc/include/asm/book3s/64/pgtable.h
-f:arch/powerpc/include/asm/book3s/64/pkeys.h
-f:arch/powerpc/include/asm/book3s/64/radix-4k.h
-f:arch/powerpc/include/asm/book3s/64/radix-64k.h
-f:arch/powerpc/include/asm/book3s/64/radix.h
-f:arch/powerpc/include/asm/book3s/64/slice.h
-f:arch/powerpc/include/asm/book3s/64/tlbflush-hash.h
-f:arch/powerpc/include/asm/book3s/64/tlbflush-radix.h
-f:arch/powerpc/include/asm/book3s/64/tlbflush.h
-f:arch/powerpc/include/asm/book3s/pgalloc.h
-f:arch/powerpc/include/asm/book3s/pgtable.h
-f:arch/powerpc/include/asm/book3s/tlbflush.h
-f:arch/powerpc/include/asm/bootx.h
-f:arch/powerpc/include/asm/bpf_perf_event.h
-f:arch/powerpc/include/asm/btext.h
-f:arch/powerpc/include/asm/bug.h
-f:arch/powerpc/include/asm/cache.h
-f:arch/powerpc/include/asm/cacheflush.h
-f:arch/powerpc/include/asm/cell-pmu.h
-f:arch/powerpc/include/asm/cell-regs.h
-f:arch/powerpc/include/asm/checksum.h
-f:arch/powerpc/include/asm/clocksource.h
-f:arch/powerpc/include/asm/cmpxchg.h
-f:arch/powerpc/include/asm/code-patching-asm.h
-f:arch/powerpc/include/asm/compat.h
-f:arch/powerpc/include/asm/context_tracking.h
-f:arch/powerpc/include/asm/copro.h
-f:arch/powerpc/include/asm/cpm.h
-f:arch/powerpc/include/asm/cpm1.h
-f:arch/powerpc/include/asm/cpm2.h
-f:arch/powerpc/include/asm/cpu_has_feature.h
-f:arch/powerpc/include/asm/cpu_setup.h
-f:arch/powerpc/include/asm/cpufeature.h
-f:arch/powerpc/include/asm/cpuidle.h
-f:arch/powerpc/include/asm/cputable.h
-f:arch/powerpc/include/asm/cputhreads.h
-f:arch/powerpc/include/asm/cputime.h
-f:arch/powerpc/include/asm/crash_reserve.h
-f:arch/powerpc/include/asm/crashdump-ppc64.h
-f:arch/powerpc/include/asm/current.h
-f:arch/powerpc/include/asm/dbdma.h
-f:arch/powerpc/include/asm/dbell.h
-f:arch/powerpc/include/asm/dcr-native.h
-f:arch/powerpc/include/asm/dcr-regs.h
-f:arch/powerpc/include/asm/dcr.h
-f:arch/powerpc/include/asm/debug.h
-f:arch/powerpc/include/asm/delay.h
-f:arch/powerpc/include/asm/device.h
-f:arch/powerpc/include/asm/disassemble.h
-f:arch/powerpc/include/asm/dma-direct.h
-f:arch/powerpc/include/asm/dma.h
-f:arch/powerpc/include/asm/drmem.h
-f:arch/powerpc/include/asm/dt_cpu_ftrs.h
-f:arch/powerpc/include/asm/dtl.h
-f:arch/powerpc/include/asm/edac.h
-f:arch/powerpc/include/asm/eeh.h
-f:arch/powerpc/include/asm/eeh_event.h
-f:arch/powerpc/include/asm/ehv_pic.h
-f:arch/powerpc/include/asm/elf.h
-f:arch/powerpc/include/asm/elfnote.h
-f:arch/powerpc/include/asm/emergency-restart.h
-f:arch/powerpc/include/asm/emulated_ops.h
-f:arch/powerpc/include/asm/epapr_hcalls.h
-f:arch/powerpc/include/asm/exception-64e.h
-f:arch/powerpc/include/asm/exception-64s.h
-f:arch/powerpc/include/asm/exec.h
-f:arch/powerpc/include/asm/extable.h
-f:arch/powerpc/include/asm/fadump-internal.h
-f:arch/powerpc/include/asm/fadump.h
-f:arch/powerpc/include/asm/feature-fixups.h
-f:arch/powerpc/include/asm/firmware.h
-f:arch/powerpc/include/asm/fixmap.h
-f:arch/powerpc/include/asm/floppy.h
-f:arch/powerpc/include/asm/fpu.h
-f:arch/powerpc/include/asm/fsl_gtm.h
-f:arch/powerpc/include/asm/fsl_hcalls.h
-f:arch/powerpc/include/asm/fsl_lbc.h
-f:arch/powerpc/include/asm/fsl_pamu_stash.h
-f:arch/powerpc/include/asm/fsl_pm.h
-f:arch/powerpc/include/asm/ftrace.h
-f:arch/powerpc/include/asm/futex.h
-f:arch/powerpc/include/asm/grackle.h
-f:arch/powerpc/include/asm/guest-state-buffer.h
-f:arch/powerpc/include/asm/hardirq.h
-f:arch/powerpc/include/asm/head-64.h
-f:arch/powerpc/include/asm/heathrow.h
-f:arch/powerpc/include/asm/highmem.h
-f:arch/powerpc/include/asm/hmi.h
-f:arch/powerpc/include/asm/hugetlb.h
-f:arch/powerpc/include/asm/hvcall.h
-f:arch/powerpc/include/asm/hvconsole.h
-f:arch/powerpc/include/asm/hvcserver.h
-f:arch/powerpc/include/asm/hvsi.h
-f:arch/powerpc/include/asm/hw_breakpoint.h
-f:arch/powerpc/include/asm/hw_irq.h
-f:arch/powerpc/include/asm/hydra.h
-f:arch/powerpc/include/asm/i8259.h
-f:arch/powerpc/include/asm/ibmebus.h
-f:arch/powerpc/include/asm/icswx.h
-f:arch/powerpc/include/asm/idle.h
-f:arch/powerpc/include/asm/imc-pmu.h
-f:arch/powerpc/include/asm/immap_cpm2.h
-f:arch/powerpc/include/asm/inst.h
-f:arch/powerpc/include/asm/interrupt.h
-f:arch/powerpc/include/asm/io-defs.h
-f:arch/powerpc/include/asm/io.h
-f:arch/powerpc/include/asm/io_event_irq.h
-f:arch/powerpc/include/asm/iommu.h
-f:arch/powerpc/include/asm/ipic.h
-f:arch/powerpc/include/asm/irq.h
-f:arch/powerpc/include/asm/irq_work.h
-f:arch/powerpc/include/asm/irqflags.h
-f:arch/powerpc/include/asm/isa-bridge.h
-f:arch/powerpc/include/asm/jump_label.h
-f:arch/powerpc/include/asm/kasan.h
-f:arch/powerpc/include/asm/kdebug.h
-f:arch/powerpc/include/asm/kdump.h
-f:arch/powerpc/include/asm/kexec.h
-f:arch/powerpc/include/asm/kexec_ranges.h
-f:arch/powerpc/include/asm/keylargo.h
-f:arch/powerpc/include/asm/kfence.h
-f:arch/powerpc/include/asm/kgdb.h
-f:arch/powerpc/include/asm/kprobes.h
-f:arch/powerpc/include/asm/kup.h
-f:arch/powerpc/include/asm/kvm_asm.h
-f:arch/powerpc/include/asm/kvm_book3s.h
-f:arch/powerpc/include/asm/kvm_book3s_32.h
-f:arch/powerpc/include/asm/kvm_book3s_64.h
-f:arch/powerpc/include/asm/kvm_book3s_asm.h
-f:arch/powerpc/include/asm/kvm_book3s_uvmem.h
-f:arch/powerpc/include/asm/kvm_booke.h
-f:arch/powerpc/include/asm/kvm_booke_hv_asm.h
-f:arch/powerpc/include/asm/kvm_fpu.h
-f:arch/powerpc/include/asm/kvm_guest.h
-f:arch/powerpc/include/asm/kvm_host.h
-f:arch/powerpc/include/asm/kvm_para.h
-f:arch/powerpc/include/asm/kvm_ppc.h
-f:arch/powerpc/include/asm/libata-portmap.h
-f:arch/powerpc/include/asm/linkage.h
-f:arch/powerpc/include/asm/livepatch.h
-f:arch/powerpc/include/asm/local.h
-f:arch/powerpc/include/asm/lppaca.h
-f:arch/powerpc/include/asm/lv1call.h
-f:arch/powerpc/include/asm/machdep.h
-f:arch/powerpc/include/asm/macio.h
-f:arch/powerpc/include/asm/mc146818rtc.h
-f:arch/powerpc/include/asm/mce.h
-f:arch/powerpc/include/asm/mediabay.h
-f:arch/powerpc/include/asm/mem_encrypt.h
-f:arch/powerpc/include/asm/membarrier.h
-f:arch/powerpc/include/asm/mman.h
-f:arch/powerpc/include/asm/mmiowb.h
-f:arch/powerpc/include/asm/mmu.h
-f:arch/powerpc/include/asm/mmu_context.h
-f:arch/powerpc/include/asm/mmzone.h
-f:arch/powerpc/include/asm/module.h
-f:arch/powerpc/include/asm/module.lds.h
-f:arch/powerpc/include/asm/mpc5121.h
-f:arch/powerpc/include/asm/mpc52xx.h
-f:arch/powerpc/include/asm/mpc52xx_psc.h
-f:arch/powerpc/include/asm/mpc5xxx.h
-f:arch/powerpc/include/asm/mpc6xx.h
-f:arch/powerpc/include/asm/mpc85xx.h
-f:arch/powerpc/include/asm/mpic.h
-f:arch/powerpc/include/asm/mpic_msgr.h
-f:arch/powerpc/include/asm/mpic_timer.h
-f:arch/powerpc/include/asm/msi_bitmap.h
-f:arch/powerpc/include/asm/nmi.h
-f:arch/powerpc/include/asm/nohash/32/hugetlb-8xx.h
-f:arch/powerpc/include/asm/nohash/32/kup-8xx.h
-f:arch/powerpc/include/asm/nohash/32/mmu-44x.h
-f:arch/powerpc/include/asm/nohash/32/mmu-8xx.h
-f:arch/powerpc/include/asm/nohash/32/pgalloc.h
-f:arch/powerpc/include/asm/nohash/32/pgtable.h
-f:arch/powerpc/include/asm/nohash/32/pte-44x.h
-f:arch/powerpc/include/asm/nohash/32/pte-85xx.h
-f:arch/powerpc/include/asm/nohash/32/pte-8xx.h
-f:arch/powerpc/include/asm/nohash/64/pgalloc.h
-f:arch/powerpc/include/asm/nohash/64/pgtable-4k.h
-f:arch/powerpc/include/asm/nohash/64/pgtable.h
-f:arch/powerpc/include/asm/nohash/hugetlb-e500.h
-f:arch/powerpc/include/asm/nohash/kup-booke.h
-f:arch/powerpc/include/asm/nohash/mmu-e500.h
-f:arch/powerpc/include/asm/nohash/mmu.h
-f:arch/powerpc/include/asm/nohash/pgalloc.h
-f:arch/powerpc/include/asm/nohash/pgtable.h
-f:arch/powerpc/include/asm/nohash/pte-e500.h
-f:arch/powerpc/include/asm/nohash/tlbflush.h
-f:arch/powerpc/include/asm/nvram.h
-f:arch/powerpc/include/asm/ohare.h
-f:arch/powerpc/include/asm/opal-api.h
-f:arch/powerpc/include/asm/opal.h
-f:arch/powerpc/include/asm/paca.h
-f:arch/powerpc/include/asm/page.h
-f:arch/powerpc/include/asm/page_32.h
-f:arch/powerpc/include/asm/page_64.h
-f:arch/powerpc/include/asm/papr-sysparm.h
-f:arch/powerpc/include/asm/paravirt.h
-f:arch/powerpc/include/asm/paravirt_api_clock.h
-f:arch/powerpc/include/asm/parport.h
-f:arch/powerpc/include/asm/pasemi_dma.h
-f:arch/powerpc/include/asm/pci-bridge.h
-f:arch/powerpc/include/asm/pci.h
-f:arch/powerpc/include/asm/percpu.h
-f:arch/powerpc/include/asm/perf_event.h
-f:arch/powerpc/include/asm/perf_event_fsl_emb.h
-f:arch/powerpc/include/asm/perf_event_server.h
-f:arch/powerpc/include/asm/pgalloc.h
-f:arch/powerpc/include/asm/pgtable-be-types.h
-f:arch/powerpc/include/asm/pgtable-masks.h
-f:arch/powerpc/include/asm/pgtable-types.h
-f:arch/powerpc/include/asm/pgtable.h
-f:arch/powerpc/include/asm/pkeys.h
-f:arch/powerpc/include/asm/plpar_wrappers.h
-f:arch/powerpc/include/asm/plpks.h
-f:arch/powerpc/include/asm/pmac_feature.h
-f:arch/powerpc/include/asm/pmac_low_i2c.h
-f:arch/powerpc/include/asm/pmac_pfunc.h
-f:arch/powerpc/include/asm/pmc.h
-f:arch/powerpc/include/asm/pnv-ocxl.h
-f:arch/powerpc/include/asm/pnv-pci.h
-f:arch/powerpc/include/asm/powernv.h
-f:arch/powerpc/include/asm/ppc-opcode.h
-f:arch/powerpc/include/asm/ppc-pci.h
-f:arch/powerpc/include/asm/ppc4xx.h
-f:arch/powerpc/include/asm/ppc_asm.h
-f:arch/powerpc/include/asm/preempt.h
-f:arch/powerpc/include/asm/probes.h
-f:arch/powerpc/include/asm/processor.h
-f:arch/powerpc/include/asm/prom.h
-f:arch/powerpc/include/asm/ps3.h
-f:arch/powerpc/include/asm/ps3av.h
-f:arch/powerpc/include/asm/ps3gpu.h
-f:arch/powerpc/include/asm/ps3stor.h
-f:arch/powerpc/include/asm/pte-walk.h
-f:arch/powerpc/include/asm/ptrace.h
-f:arch/powerpc/include/asm/qspinlock.h
-f:arch/powerpc/include/asm/qspinlock_types.h
-f:arch/powerpc/include/asm/reg.h
-f:arch/powerpc/include/asm/reg_8xx.h
-f:arch/powerpc/include/asm/reg_booke.h
-f:arch/powerpc/include/asm/reg_fsl_emb.h
-f:arch/powerpc/include/asm/rheap.h
-f:arch/powerpc/include/asm/rio.h
-f:arch/powerpc/include/asm/rtas-types.h
-f:arch/powerpc/include/asm/rtas-work-area.h
-f:arch/powerpc/include/asm/rtas.h
-f:arch/powerpc/include/asm/runlatch.h
-f:arch/powerpc/include/asm/seccomp.h
-f:arch/powerpc/include/asm/sections.h
-f:arch/powerpc/include/asm/secure_boot.h
-f:arch/powerpc/include/asm/security_features.h
-f:arch/powerpc/include/asm/secvar.h
-f:arch/powerpc/include/asm/serial.h
-f:arch/powerpc/include/asm/set_memory.h
-f:arch/powerpc/include/asm/setjmp.h
-f:arch/powerpc/include/asm/setup.h
-f:arch/powerpc/include/asm/sfp-machine.h
-f:arch/powerpc/include/asm/shmparam.h
-f:arch/powerpc/include/asm/signal.h
-f:arch/powerpc/include/asm/simple_spinlock.h
-f:arch/powerpc/include/asm/simple_spinlock_types.h
-f:arch/powerpc/include/asm/smp.h
-f:arch/powerpc/include/asm/smu.h
-f:arch/powerpc/include/asm/sparsemem.h
-f:arch/powerpc/include/asm/spinlock.h
-f:arch/powerpc/include/asm/spinlock_types.h
-f:arch/powerpc/include/asm/spu.h
-f:arch/powerpc/include/asm/spu_csa.h
-f:arch/powerpc/include/asm/spu_info.h
-f:arch/powerpc/include/asm/spu_priv1.h
-f:arch/powerpc/include/asm/sstep.h
-f:arch/powerpc/include/asm/stackprotector.h
-f:arch/powerpc/include/asm/stacktrace.h
-f:arch/powerpc/include/asm/static_call.h
-f:arch/powerpc/include/asm/string.h
-f:arch/powerpc/include/asm/svm.h
-f:arch/powerpc/include/asm/swab.h
-f:arch/powerpc/include/asm/swiotlb.h
-f:arch/powerpc/include/asm/switch_to.h
-f:arch/powerpc/include/asm/synch.h
-f:arch/powerpc/include/asm/syscall.h
-f:arch/powerpc/include/asm/syscall_wrapper.h
-f:arch/powerpc/include/asm/syscalls.h
-f:arch/powerpc/include/asm/syscalls_32.h
-f:arch/powerpc/include/asm/systemcfg.h
-f:arch/powerpc/include/asm/task_size_32.h
-f:arch/powerpc/include/asm/task_size_64.h
-f:arch/powerpc/include/asm/tce.h
-f:arch/powerpc/include/asm/text-patching.h
-f:arch/powerpc/include/asm/thread_info.h
-f:arch/powerpc/include/asm/time.h
-f:arch/powerpc/include/asm/timex.h
-f:arch/powerpc/include/asm/tlb.h
-f:arch/powerpc/include/asm/tlbflush.h
-f:arch/powerpc/include/asm/tm.h
-f:arch/powerpc/include/asm/topology.h
-f:arch/powerpc/include/asm/trace.h
-f:arch/powerpc/include/asm/trace_clock.h
-f:arch/powerpc/include/asm/tsi108.h
-f:arch/powerpc/include/asm/tsi108_irq.h
-f:arch/powerpc/include/asm/tsi108_pci.h
-f:arch/powerpc/include/asm/types.h
-f:arch/powerpc/include/asm/uaccess.h
-f:arch/powerpc/include/asm/udbg.h
-f:arch/powerpc/include/asm/uic.h
-f:arch/powerpc/include/asm/ultravisor-api.h
-f:arch/powerpc/include/asm/ultravisor.h
-f:arch/powerpc/include/asm/uninorth.h
-f:arch/powerpc/include/asm/unistd.h
-f:arch/powerpc/include/asm/uprobes.h
-f:arch/powerpc/include/asm/user.h
-f:arch/powerpc/include/asm/vas.h
-f:arch/powerpc/include/asm/vdso.h
-f:arch/powerpc/include/asm/vdso/arch_data.h
-f:arch/powerpc/include/asm/vdso/clocksource.h
-f:arch/powerpc/include/asm/vdso/getrandom.h
-f:arch/powerpc/include/asm/vdso/gettimeofday.h
-f:arch/powerpc/include/asm/vdso/processor.h
-f:arch/powerpc/include/asm/vdso/timebase.h
-f:arch/powerpc/include/asm/vdso/vsyscall.h
-f:arch/powerpc/include/asm/vdso_datapage.h
-f:arch/powerpc/include/asm/vermagic.h
-f:arch/powerpc/include/asm/vga.h
-f:arch/powerpc/include/asm/video.h
-f:arch/powerpc/include/asm/vio.h
-f:arch/powerpc/include/asm/vmalloc.h
-f:arch/powerpc/include/asm/vphn.h
-f:arch/powerpc/include/asm/word-at-a-time.h
-f:arch/powerpc/include/asm/xics.h
-f:arch/powerpc/include/asm/xive-regs.h
-f:arch/powerpc/include/asm/xive.h
-f:arch/powerpc/include/asm/xmon.h
-f:arch/powerpc/include/asm/xor.h
-f:arch/powerpc/include/asm/xor_altivec.h
-f:arch/powerpc/include/uapi/asm/Kbuild
-f:arch/powerpc/include/uapi/asm/auxvec.h
-f:arch/powerpc/include/uapi/asm/bitsperlong.h
-f:arch/powerpc/include/uapi/asm/bootx.h
-f:arch/powerpc/include/uapi/asm/byteorder.h
-f:arch/powerpc/include/uapi/asm/cputable.h
-f:arch/powerpc/include/uapi/asm/eeh.h
-f:arch/powerpc/include/uapi/asm/elf.h
-f:arch/powerpc/include/uapi/asm/epapr_hcalls.h
-f:arch/powerpc/include/uapi/asm/errno.h
-f:arch/powerpc/include/uapi/asm/fcntl.h
-f:arch/powerpc/include/uapi/asm/ioctl.h
-f:arch/powerpc/include/uapi/asm/ioctls.h
-f:arch/powerpc/include/uapi/asm/ipcbuf.h
-f:arch/powerpc/include/uapi/asm/kvm.h
-f:arch/powerpc/include/uapi/asm/kvm_para.h
-f:arch/powerpc/include/uapi/asm/mman.h
-f:arch/powerpc/include/uapi/asm/msgbuf.h
-f:arch/powerpc/include/uapi/asm/nvram.h
-f:arch/powerpc/include/uapi/asm/opal-prd.h
-f:arch/powerpc/include/uapi/asm/papr-indices.h
-f:arch/powerpc/include/uapi/asm/papr-miscdev.h
-f:arch/powerpc/include/uapi/asm/papr-physical-attestation.h
-f:arch/powerpc/include/uapi/asm/papr-platform-dump.h
-f:arch/powerpc/include/uapi/asm/papr-sysparm.h
-f:arch/powerpc/include/uapi/asm/papr-vpd.h
-f:arch/powerpc/include/uapi/asm/perf_event.h
-f:arch/powerpc/include/uapi/asm/perf_regs.h
-f:arch/powerpc/include/uapi/asm/posix_types.h
-f:arch/powerpc/include/uapi/asm/ps3fb.h
-f:arch/powerpc/include/uapi/asm/ptrace.h
-f:arch/powerpc/include/uapi/asm/sembuf.h
-f:arch/powerpc/include/uapi/asm/setup.h
-f:arch/powerpc/include/uapi/asm/shmbuf.h
-f:arch/powerpc/include/uapi/asm/sigcontext.h
-f:arch/powerpc/include/uapi/asm/signal.h
-f:arch/powerpc/include/uapi/asm/socket.h
-f:arch/powerpc/include/uapi/asm/spu_info.h
-f:arch/powerpc/include/uapi/asm/stat.h
-f:arch/powerpc/include/uapi/asm/swab.h
-f:arch/powerpc/include/uapi/asm/termbits.h
-f:arch/powerpc/include/uapi/asm/termios.h
-f:arch/powerpc/include/uapi/asm/tm.h
-f:arch/powerpc/include/uapi/asm/types.h
-f:arch/powerpc/include/uapi/asm/ucontext.h
-f:arch/powerpc/include/uapi/asm/unistd.h
-f:arch/powerpc/include/uapi/asm/vas-api.h
-f:arch/powerpc/kernel/.gitignore
-f:arch/powerpc/kernel/85xx_entry_mapping.S
-f:arch/powerpc/kernel/Makefile
-f:arch/powerpc/kernel/align.c
-f:arch/powerpc/kernel/asm-offsets.c
-f:arch/powerpc/kernel/audit.c
-f:arch/powerpc/kernel/audit_32.h
-f:arch/powerpc/kernel/btext.c
-f:arch/powerpc/kernel/cacheinfo.c
-f:arch/powerpc/kernel/cacheinfo.h
-f:arch/powerpc/kernel/compat_audit.c
-f:arch/powerpc/kernel/cpu_setup_44x.S
-f:arch/powerpc/kernel/cpu_setup_6xx.S
-f:arch/powerpc/kernel/cpu_setup_e500.S
-f:arch/powerpc/kernel/cpu_setup_pa6t.S
-f:arch/powerpc/kernel/cpu_setup_power.c
-f:arch/powerpc/kernel/cpu_setup_ppc970.S
-f:arch/powerpc/kernel/cpu_specs.h
-f:arch/powerpc/kernel/cpu_specs_44x.h
-f:arch/powerpc/kernel/cpu_specs_47x.h
-f:arch/powerpc/kernel/cpu_specs_85xx.h
-f:arch/powerpc/kernel/cpu_specs_8xx.h
-f:arch/powerpc/kernel/cpu_specs_book3s_32.h
-f:arch/powerpc/kernel/cpu_specs_book3s_64.h
-f:arch/powerpc/kernel/cpu_specs_e500mc.h
-f:arch/powerpc/kernel/cputable.c
-f:arch/powerpc/kernel/crash_dump.c
-f:arch/powerpc/kernel/dawr.c
-f:arch/powerpc/kernel/dbell.c
-f:arch/powerpc/kernel/dexcr.c
-f:arch/powerpc/kernel/dma-iommu.c
-f:arch/powerpc/kernel/dma-mask.c
-f:arch/powerpc/kernel/dma-swiotlb.c
-f:arch/powerpc/kernel/dt_cpu_ftrs.c
-f:arch/powerpc/kernel/early_32.c
-f:arch/powerpc/kernel/eeh.c
-f:arch/powerpc/kernel/eeh_cache.c
-f:arch/powerpc/kernel/eeh_driver.c
-f:arch/powerpc/kernel/eeh_event.c
-f:arch/powerpc/kernel/eeh_pe.c
-f:arch/powerpc/kernel/eeh_sysfs.c
-f:arch/powerpc/kernel/entry_32.S
-f:arch/powerpc/kernel/epapr_hcalls.S
-f:arch/powerpc/kernel/epapr_paravirt.c
-f:arch/powerpc/kernel/exceptions-64e.S
-f:arch/powerpc/kernel/exceptions-64s.S
-f:arch/powerpc/kernel/fadump.c
-f:arch/powerpc/kernel/firmware.c
-f:arch/powerpc/kernel/fpu.S
-f:arch/powerpc/kernel/head_32.h
-f:arch/powerpc/kernel/head_44x.S
-f:arch/powerpc/kernel/head_64.S
-f:arch/powerpc/kernel/head_85xx.S
-f:arch/powerpc/kernel/head_8xx.S
-f:arch/powerpc/kernel/head_book3s_32.S
-f:arch/powerpc/kernel/head_booke.h
-f:arch/powerpc/kernel/hw_breakpoint.c
-f:arch/powerpc/kernel/hw_breakpoint_constraints.c
-f:arch/powerpc/kernel/idle.c
-f:arch/powerpc/kernel/idle_64e.S
-f:arch/powerpc/kernel/idle_6xx.S
-f:arch/powerpc/kernel/idle_85xx.S
-f:arch/powerpc/kernel/idle_book3s.S
-f:arch/powerpc/kernel/ima_arch.c
-f:arch/powerpc/kernel/interrupt.c
-f:arch/powerpc/kernel/interrupt_64.S
-f:arch/powerpc/kernel/io.c
-f:arch/powerpc/kernel/iomap.c
-f:arch/powerpc/kernel/iommu.c
-f:arch/powerpc/kernel/irq.c
-f:arch/powerpc/kernel/irq_64.c
-f:arch/powerpc/kernel/isa-bridge.c
-f:arch/powerpc/kernel/jump_label.c
-f:arch/powerpc/kernel/kdebugfs.c
-f:arch/powerpc/kernel/kgdb.c
-f:arch/powerpc/kernel/kprobes-ftrace.c
-f:arch/powerpc/kernel/kprobes.c
-f:arch/powerpc/kernel/kvm.c
-f:arch/powerpc/kernel/kvm_emul.S
-f:arch/powerpc/kernel/l2cr_6xx.S
-f:arch/powerpc/kernel/legacy_serial.c
-f:arch/powerpc/kernel/mce.c
-f:arch/powerpc/kernel/mce_power.c
-f:arch/powerpc/kernel/misc.S
-f:arch/powerpc/kernel/misc_32.S
-f:arch/powerpc/kernel/misc_64.S
-f:arch/powerpc/kernel/module.c
-f:arch/powerpc/kernel/module_32.c
-f:arch/powerpc/kernel/module_64.c
-f:arch/powerpc/kernel/msi.c
-f:arch/powerpc/kernel/note.S
-f:arch/powerpc/kernel/nvram_64.c
-f:arch/powerpc/kernel/optprobes.c
-f:arch/powerpc/kernel/optprobes_head.S
-f:arch/powerpc/kernel/paca.c
-f:arch/powerpc/kernel/pci-common.c
-f:arch/powerpc/kernel/pci-hotplug.c
-f:arch/powerpc/kernel/pci_32.c
-f:arch/powerpc/kernel/pci_64.c
-f:arch/powerpc/kernel/pci_dn.c
-f:arch/powerpc/kernel/pci_of_scan.c
-f:arch/powerpc/kernel/pmc.c
-f:arch/powerpc/kernel/ppc_save_regs.S
-f:arch/powerpc/kernel/proc_powerpc.c
-f:arch/powerpc/kernel/process.c
-f:arch/powerpc/kernel/prom.c
-f:arch/powerpc/kernel/prom_entry_64.S
-f:arch/powerpc/kernel/prom_init.c
-f:arch/powerpc/kernel/prom_init_check.sh
-f:arch/powerpc/kernel/prom_parse.c
-f:arch/powerpc/kernel/ptrace/Makefile
-f:arch/powerpc/kernel/ptrace/ptrace-adv.c
-f:arch/powerpc/kernel/ptrace/ptrace-altivec.c
-f:arch/powerpc/kernel/ptrace/ptrace-decl.h
-f:arch/powerpc/kernel/ptrace/ptrace-fpu.c
-f:arch/powerpc/kernel/ptrace/ptrace-noadv.c
-f:arch/powerpc/kernel/ptrace/ptrace-novsx.c
-f:arch/powerpc/kernel/ptrace/ptrace-spe.c
-f:arch/powerpc/kernel/ptrace/ptrace-tm.c
-f:arch/powerpc/kernel/ptrace/ptrace-view.c
-f:arch/powerpc/kernel/ptrace/ptrace-vsx.c
-f:arch/powerpc/kernel/ptrace/ptrace.c
-f:arch/powerpc/kernel/ptrace/ptrace32.c
-f:arch/powerpc/kernel/reloc_32.S
-f:arch/powerpc/kernel/reloc_64.S
-f:arch/powerpc/kernel/rethook.c
-f:arch/powerpc/kernel/rtas-proc.c
-f:arch/powerpc/kernel/rtas-rtc.c
-f:arch/powerpc/kernel/rtas.c
-f:arch/powerpc/kernel/rtas_entry.S
-f:arch/powerpc/kernel/rtas_flash.c
-f:arch/powerpc/kernel/rtas_pci.c
-f:arch/powerpc/kernel/rtasd.c
-f:arch/powerpc/kernel/secure_boot.c
-f:arch/powerpc/kernel/security.c
-f:arch/powerpc/kernel/secvar-ops.c
-f:arch/powerpc/kernel/secvar-sysfs.c
-f:arch/powerpc/kernel/setup-common.c
-f:arch/powerpc/kernel/setup.h
-f:arch/powerpc/kernel/setup_32.c
-f:arch/powerpc/kernel/setup_64.c
-f:arch/powerpc/kernel/signal.c
-f:arch/powerpc/kernel/signal.h
-f:arch/powerpc/kernel/signal_32.c
-f:arch/powerpc/kernel/signal_64.c
-f:arch/powerpc/kernel/smp-tbsync.c
-f:arch/powerpc/kernel/smp.c
-f:arch/powerpc/kernel/stacktrace.c
-f:arch/powerpc/kernel/static_call.c
-f:arch/powerpc/kernel/suspend.c
-f:arch/powerpc/kernel/switch.S
-f:arch/powerpc/kernel/swsusp.c
-f:arch/powerpc/kernel/swsusp_32.S
-f:arch/powerpc/kernel/swsusp_64.c
-f:arch/powerpc/kernel/swsusp_85xx.S
-f:arch/powerpc/kernel/swsusp_asm64.S
-f:arch/powerpc/kernel/sys_ppc32.c
-f:arch/powerpc/kernel/syscall.c
-f:arch/powerpc/kernel/syscalls.c
-f:arch/powerpc/kernel/syscalls/Makefile
-f:arch/powerpc/kernel/syscalls/syscall.tbl
-f:arch/powerpc/kernel/sysfs.c
-f:arch/powerpc/kernel/systbl.c
-f:arch/powerpc/kernel/tau_6xx.c
-f:arch/powerpc/kernel/time.c
-f:arch/powerpc/kernel/tm.S
-f:arch/powerpc/kernel/trace/Makefile
-f:arch/powerpc/kernel/trace/ftrace.c
-f:arch/powerpc/kernel/trace/ftrace_64_pg.c
-f:arch/powerpc/kernel/trace/ftrace_64_pg_entry.S
-f:arch/powerpc/kernel/trace/ftrace_entry.S
-f:arch/powerpc/kernel/trace/trace_clock.c
-f:arch/powerpc/kernel/traps.c
-f:arch/powerpc/kernel/ucall.S
-f:arch/powerpc/kernel/udbg.c
-f:arch/powerpc/kernel/udbg_16550.c
-f:arch/powerpc/kernel/uprobes.c
-f:arch/powerpc/kernel/vdso.c
-f:arch/powerpc/kernel/vdso/.gitignore
-f:arch/powerpc/kernel/vdso/Makefile
-f:arch/powerpc/kernel/vdso/cacheflush.S
-f:arch/powerpc/kernel/vdso/datapage.S
-f:arch/powerpc/kernel/vdso/gen_vdso32_offsets.sh
-f:arch/powerpc/kernel/vdso/gen_vdso64_offsets.sh
-f:arch/powerpc/kernel/vdso/getcpu.S
-f:arch/powerpc/kernel/vdso/getrandom.S
-f:arch/powerpc/kernel/vdso/gettimeofday.S
-f:arch/powerpc/kernel/vdso/note.S
-f:arch/powerpc/kernel/vdso/sigtramp32.S
-f:arch/powerpc/kernel/vdso/sigtramp64.S
-f:arch/powerpc/kernel/vdso/vdso32.lds.S
-f:arch/powerpc/kernel/vdso/vdso64.lds.S
-f:arch/powerpc/kernel/vdso/vgetrandom-chacha.S
-f:arch/powerpc/kernel/vdso/vgetrandom.c
-f:arch/powerpc/kernel/vdso/vgettimeofday.c
-f:arch/powerpc/kernel/vdso32_wrapper.S
-f:arch/powerpc/kernel/vdso64_wrapper.S
-f:arch/powerpc/kernel/vecemu.c
-f:arch/powerpc/kernel/vector.S
-f:arch/powerpc/kernel/vmlinux.lds.S
-f:arch/powerpc/kernel/watchdog.c
-f:arch/powerpc/kexec/Makefile
-f:arch/powerpc/kexec/core.c
-f:arch/powerpc/kexec/core_32.c
-f:arch/powerpc/kexec/core_64.c
-f:arch/powerpc/kexec/crash.c
-f:arch/powerpc/kexec/elf_64.c
-f:arch/powerpc/kexec/file_load.c
-f:arch/powerpc/kexec/file_load_64.c
-f:arch/powerpc/kexec/ranges.c
-f:arch/powerpc/kexec/relocate_32.S
-f:arch/powerpc/kexec/vmcore_info.c
-f:arch/powerpc/kvm/Kconfig
-f:arch/powerpc/kvm/Makefile
-f:arch/powerpc/kvm/book3s.c
-f:arch/powerpc/kvm/book3s.h
-f:arch/powerpc/kvm/book3s_32_mmu.c
-f:arch/powerpc/kvm/book3s_32_mmu_host.c
-f:arch/powerpc/kvm/book3s_32_sr.S
-f:arch/powerpc/kvm/book3s_64_entry.S
-f:arch/powerpc/kvm/book3s_64_mmu.c
-f:arch/powerpc/kvm/book3s_64_mmu_host.c
-f:arch/powerpc/kvm/book3s_64_mmu_hv.c
-f:arch/powerpc/kvm/book3s_64_mmu_radix.c
-f:arch/powerpc/kvm/book3s_64_slb.S
-f:arch/powerpc/kvm/book3s_64_vio.c
-f:arch/powerpc/kvm/book3s_emulate.c
-f:arch/powerpc/kvm/book3s_exports.c
-f:arch/powerpc/kvm/book3s_hv.c
-f:arch/powerpc/kvm/book3s_hv.h
-f:arch/powerpc/kvm/book3s_hv_builtin.c
-f:arch/powerpc/kvm/book3s_hv_hmi.c
-f:arch/powerpc/kvm/book3s_hv_interrupts.S
-f:arch/powerpc/kvm/book3s_hv_nested.c
-f:arch/powerpc/kvm/book3s_hv_nestedv2.c
-f:arch/powerpc/kvm/book3s_hv_p9_entry.c
-f:arch/powerpc/kvm/book3s_hv_p9_perf.c
-f:arch/powerpc/kvm/book3s_hv_ras.c
-f:arch/powerpc/kvm/book3s_hv_rm_mmu.c
-f:arch/powerpc/kvm/book3s_hv_rm_xics.c
-f:arch/powerpc/kvm/book3s_hv_rmhandlers.S
-f:arch/powerpc/kvm/book3s_hv_tm.c
-f:arch/powerpc/kvm/book3s_hv_tm_builtin.c
-f:arch/powerpc/kvm/book3s_hv_uvmem.c
-f:arch/powerpc/kvm/book3s_interrupts.S
-f:arch/powerpc/kvm/book3s_mmu_hpte.c
-f:arch/powerpc/kvm/book3s_paired_singles.c
-f:arch/powerpc/kvm/book3s_pr.c
-f:arch/powerpc/kvm/book3s_pr_papr.c
-f:arch/powerpc/kvm/book3s_rmhandlers.S
-f:arch/powerpc/kvm/book3s_rtas.c
-f:arch/powerpc/kvm/book3s_segment.S
-f:arch/powerpc/kvm/book3s_xics.c
-f:arch/powerpc/kvm/book3s_xics.h
-f:arch/powerpc/kvm/book3s_xive.c
-f:arch/powerpc/kvm/book3s_xive.h
-f:arch/powerpc/kvm/book3s_xive_native.c
-f:arch/powerpc/kvm/booke.c
-f:arch/powerpc/kvm/booke.h
-f:arch/powerpc/kvm/booke_emulate.c
-f:arch/powerpc/kvm/booke_interrupts.S
-f:arch/powerpc/kvm/bookehv_interrupts.S
-f:arch/powerpc/kvm/e500.c
-f:arch/powerpc/kvm/e500.h
-f:arch/powerpc/kvm/e500_emulate.c
-f:arch/powerpc/kvm/e500_mmu.c
-f:arch/powerpc/kvm/e500_mmu_host.c
-f:arch/powerpc/kvm/e500_mmu_host.h
-f:arch/powerpc/kvm/e500mc.c
-f:arch/powerpc/kvm/emulate.c
-f:arch/powerpc/kvm/emulate_loadstore.c
-f:arch/powerpc/kvm/fpu.S
-f:arch/powerpc/kvm/guest-state-buffer.c
-f:arch/powerpc/kvm/mpic.c
-f:arch/powerpc/kvm/powerpc.c
-f:arch/powerpc/kvm/test-guest-state-buffer.c
-f:arch/powerpc/kvm/timing.c
-f:arch/powerpc/kvm/timing.h
-f:arch/powerpc/kvm/tm.S
-f:arch/powerpc/kvm/trace.h
-f:arch/powerpc/kvm/trace_book3s.h
-f:arch/powerpc/kvm/trace_booke.h
-f:arch/powerpc/kvm/trace_hv.h
-f:arch/powerpc/kvm/trace_pr.h
-f:arch/powerpc/lib/Makefile
-f:arch/powerpc/lib/checksum_32.S
-f:arch/powerpc/lib/checksum_64.S
-f:arch/powerpc/lib/checksum_wrappers.c
-f:arch/powerpc/lib/code-patching.c
-f:arch/powerpc/lib/copy_32.S
-f:arch/powerpc/lib/copy_mc_64.S
-f:arch/powerpc/lib/copypage_64.S
-f:arch/powerpc/lib/copypage_power7.S
-f:arch/powerpc/lib/copyuser_64.S
-f:arch/powerpc/lib/copyuser_power7.S
-f:arch/powerpc/lib/crtsavres.S
-f:arch/powerpc/lib/div64.S
-f:arch/powerpc/lib/error-inject.c
-f:arch/powerpc/lib/feature-fixups-test.S
-f:arch/powerpc/lib/feature-fixups.c
-f:arch/powerpc/lib/hweight_64.S
-f:arch/powerpc/lib/ldstfp.S
-f:arch/powerpc/lib/locks.c
-f:arch/powerpc/lib/mem_64.S
-f:arch/powerpc/lib/memcmp_32.S
-f:arch/powerpc/lib/memcmp_64.S
-f:arch/powerpc/lib/memcpy_64.S
-f:arch/powerpc/lib/memcpy_power7.S
-f:arch/powerpc/lib/pmem.c
-f:arch/powerpc/lib/qspinlock.c
-f:arch/powerpc/lib/quad.S
-f:arch/powerpc/lib/restart_table.c
-f:arch/powerpc/lib/rheap.c
-f:arch/powerpc/lib/sstep.c
-f:arch/powerpc/lib/string.S
-f:arch/powerpc/lib/string_32.S
-f:arch/powerpc/lib/string_64.S
-f:arch/powerpc/lib/strlen_32.S
-f:arch/powerpc/lib/test-code-patching.c
-f:arch/powerpc/lib/test_emulate_step.c
-f:arch/powerpc/lib/test_emulate_step_exec_instr.S
-f:arch/powerpc/lib/vmx-helper.c
-f:arch/powerpc/lib/xor_vmx.c
-f:arch/powerpc/lib/xor_vmx.h
-f:arch/powerpc/lib/xor_vmx_glue.c
-f:arch/powerpc/math-emu/Makefile
-f:arch/powerpc/math-emu/fabs.c
-f:arch/powerpc/math-emu/fadd.c
-f:arch/powerpc/math-emu/fadds.c
-f:arch/powerpc/math-emu/fcmpo.c
-f:arch/powerpc/math-emu/fcmpu.c
-f:arch/powerpc/math-emu/fctiw.c
-f:arch/powerpc/math-emu/fctiwz.c
-f:arch/powerpc/math-emu/fdiv.c
-f:arch/powerpc/math-emu/fdivs.c
-f:arch/powerpc/math-emu/fmadd.c
-f:arch/powerpc/math-emu/fmadds.c
-f:arch/powerpc/math-emu/fmr.c
-f:arch/powerpc/math-emu/fmsub.c
-f:arch/powerpc/math-emu/fmsubs.c
-f:arch/powerpc/math-emu/fmul.c
-f:arch/powerpc/math-emu/fmuls.c
-f:arch/powerpc/math-emu/fnabs.c
-f:arch/powerpc/math-emu/fneg.c
-f:arch/powerpc/math-emu/fnmadd.c
-f:arch/powerpc/math-emu/fnmadds.c
-f:arch/powerpc/math-emu/fnmsub.c
-f:arch/powerpc/math-emu/fnmsubs.c
-f:arch/powerpc/math-emu/fre.c
-f:arch/powerpc/math-emu/fres.c
-f:arch/powerpc/math-emu/frsp.c
-f:arch/powerpc/math-emu/frsqrte.c
-f:arch/powerpc/math-emu/frsqrtes.c
-f:arch/powerpc/math-emu/fsel.c
-f:arch/powerpc/math-emu/fsqrt.c
-f:arch/powerpc/math-emu/fsqrts.c
-f:arch/powerpc/math-emu/fsub.c
-f:arch/powerpc/math-emu/fsubs.c
-f:arch/powerpc/math-emu/lfd.c
-f:arch/powerpc/math-emu/lfs.c
-f:arch/powerpc/math-emu/math.c
-f:arch/powerpc/math-emu/math_efp.c
-f:arch/powerpc/math-emu/mcrfs.c
-f:arch/powerpc/math-emu/mffs.c
-f:arch/powerpc/math-emu/mtfsb0.c
-f:arch/powerpc/math-emu/mtfsb1.c
-f:arch/powerpc/math-emu/mtfsf.c
-f:arch/powerpc/math-emu/mtfsfi.c
-f:arch/powerpc/math-emu/stfd.c
-f:arch/powerpc/math-emu/stfiwx.c
-f:arch/powerpc/math-emu/stfs.c
-f:arch/powerpc/math-emu/udivmodti4.c
-f:arch/powerpc/mm/Makefile
-f:arch/powerpc/mm/book3s32/Makefile
-f:arch/powerpc/mm/book3s32/hash_low.S
-f:arch/powerpc/mm/book3s32/kuap.c
-f:arch/powerpc/mm/book3s32/mmu.c
-f:arch/powerpc/mm/book3s32/mmu_context.c
-f:arch/powerpc/mm/book3s32/nohash_low.S
-f:arch/powerpc/mm/book3s32/tlb.c
-f:arch/powerpc/mm/book3s64/Makefile
-f:arch/powerpc/mm/book3s64/hash_4k.c
-f:arch/powerpc/mm/book3s64/hash_64k.c
-f:arch/powerpc/mm/book3s64/hash_hugepage.c
-f:arch/powerpc/mm/book3s64/hash_native.c
-f:arch/powerpc/mm/book3s64/hash_pgtable.c
-f:arch/powerpc/mm/book3s64/hash_tlb.c
-f:arch/powerpc/mm/book3s64/hash_utils.c
-f:arch/powerpc/mm/book3s64/hugetlbpage.c
-f:arch/powerpc/mm/book3s64/internal.h
-f:arch/powerpc/mm/book3s64/iommu_api.c
-f:arch/powerpc/mm/book3s64/mmu_context.c
-f:arch/powerpc/mm/book3s64/pgtable.c
-f:arch/powerpc/mm/book3s64/pkeys.c
-f:arch/powerpc/mm/book3s64/radix_hugetlbpage.c
-f:arch/powerpc/mm/book3s64/radix_pgtable.c
-f:arch/powerpc/mm/book3s64/radix_tlb.c
-f:arch/powerpc/mm/book3s64/slb.c
-f:arch/powerpc/mm/book3s64/slice.c
-f:arch/powerpc/mm/book3s64/subpage_prot.c
-f:arch/powerpc/mm/book3s64/trace.c
-f:arch/powerpc/mm/cacheflush.c
-f:arch/powerpc/mm/copro_fault.c
-f:arch/powerpc/mm/dma-noncoherent.c
-f:arch/powerpc/mm/drmem.c
-f:arch/powerpc/mm/fault.c
-f:arch/powerpc/mm/hugetlbpage.c
-f:arch/powerpc/mm/init-common.c
-f:arch/powerpc/mm/init_32.c
-f:arch/powerpc/mm/init_64.c
-f:arch/powerpc/mm/ioremap.c
-f:arch/powerpc/mm/ioremap_32.c
-f:arch/powerpc/mm/ioremap_64.c
-f:arch/powerpc/mm/kasan/8xx.c
-f:arch/powerpc/mm/kasan/Makefile
-f:arch/powerpc/mm/kasan/book3s_32.c
-f:arch/powerpc/mm/kasan/init_32.c
-f:arch/powerpc/mm/kasan/init_book3e_64.c
-f:arch/powerpc/mm/kasan/init_book3s_64.c
-f:arch/powerpc/mm/maccess.c
-f:arch/powerpc/mm/mem.c
-f:arch/powerpc/mm/mmu_context.c
-f:arch/powerpc/mm/mmu_decl.h
-f:arch/powerpc/mm/nohash/44x.c
-f:arch/powerpc/mm/nohash/8xx.c
-f:arch/powerpc/mm/nohash/Makefile
-f:arch/powerpc/mm/nohash/book3e_pgtable.c
-f:arch/powerpc/mm/nohash/e500.c
-f:arch/powerpc/mm/nohash/e500_hugetlbpage.c
-f:arch/powerpc/mm/nohash/kaslr_booke.c
-f:arch/powerpc/mm/nohash/kup.c
-f:arch/powerpc/mm/nohash/mmu_context.c
-f:arch/powerpc/mm/nohash/tlb.c
-f:arch/powerpc/mm/nohash/tlb_64e.c
-f:arch/powerpc/mm/nohash/tlb_low.S
-f:arch/powerpc/mm/nohash/tlb_low_64e.S
-f:arch/powerpc/mm/numa.c
-f:arch/powerpc/mm/pageattr.c
-f:arch/powerpc/mm/pgtable-frag.c
-f:arch/powerpc/mm/pgtable.c
-f:arch/powerpc/mm/pgtable_32.c
-f:arch/powerpc/mm/pgtable_64.c
-f:arch/powerpc/mm/ptdump/8xx.c
-f:arch/powerpc/mm/ptdump/Makefile
-f:arch/powerpc/mm/ptdump/bats.c
-f:arch/powerpc/mm/ptdump/book3s64.c
-f:arch/powerpc/mm/ptdump/hashpagetable.c
-f:arch/powerpc/mm/ptdump/ptdump.c
-f:arch/powerpc/mm/ptdump/ptdump.h
-f:arch/powerpc/mm/ptdump/segment_regs.c
-f:arch/powerpc/mm/ptdump/shared.c
-f:arch/powerpc/net/Makefile
-f:arch/powerpc/net/bpf_jit.h
-f:arch/powerpc/net/bpf_jit_comp.c
-f:arch/powerpc/net/bpf_jit_comp32.c
-f:arch/powerpc/net/bpf_jit_comp64.c
-f:arch/powerpc/perf/8xx-pmu.c
-f:arch/powerpc/perf/Makefile
-f:arch/powerpc/perf/bhrb.S
-f:arch/powerpc/perf/callchain.c
-f:arch/powerpc/perf/callchain.h
-f:arch/powerpc/perf/callchain_32.c
-f:arch/powerpc/perf/callchain_64.c
-f:arch/powerpc/perf/core-book3s.c
-f:arch/powerpc/perf/core-fsl-emb.c
-f:arch/powerpc/perf/e500-pmu.c
-f:arch/powerpc/perf/e6500-pmu.c
-f:arch/powerpc/perf/generic-compat-pmu.c
-f:arch/powerpc/perf/hv-24x7-catalog.h
-f:arch/powerpc/perf/hv-24x7-domains.h
-f:arch/powerpc/perf/hv-24x7.c
-f:arch/powerpc/perf/hv-24x7.h
-f:arch/powerpc/perf/hv-common.c
-f:arch/powerpc/perf/hv-common.h
-f:arch/powerpc/perf/hv-gpci-requests.h
-f:arch/powerpc/perf/hv-gpci.c
-f:arch/powerpc/perf/hv-gpci.h
-f:arch/powerpc/perf/imc-pmu.c
-f:arch/powerpc/perf/internal.h
-f:arch/powerpc/perf/isa207-common.c
-f:arch/powerpc/perf/isa207-common.h
-f:arch/powerpc/perf/kvm-hv-pmu.c
-f:arch/powerpc/perf/mpc7450-pmu.c
-f:arch/powerpc/perf/perf_regs.c
-f:arch/powerpc/perf/power10-events-list.h
-f:arch/powerpc/perf/power10-pmu.c
-f:arch/powerpc/perf/power5+-pmu.c
-f:arch/powerpc/perf/power5-pmu.c
-f:arch/powerpc/perf/power6-pmu.c
-f:arch/powerpc/perf/power7-events-list.h
-f:arch/powerpc/perf/power7-pmu.c
-f:arch/powerpc/perf/power8-events-list.h
-f:arch/powerpc/perf/power8-pmu.c
-f:arch/powerpc/perf/power9-events-list.h
-f:arch/powerpc/perf/power9-pmu.c
-f:arch/powerpc/perf/ppc970-pmu.c
-f:arch/powerpc/perf/req-gen/_begin.h
-f:arch/powerpc/perf/req-gen/_clear.h
-f:arch/powerpc/perf/req-gen/_end.h
-f:arch/powerpc/perf/req-gen/_request-begin.h
-f:arch/powerpc/perf/req-gen/_request-end.h
-f:arch/powerpc/perf/req-gen/perf.h
-f:arch/powerpc/perf/vpa-pmu.c
-f:arch/powerpc/platforms/44x/44x.h
-f:arch/powerpc/platforms/44x/Kconfig
-f:arch/powerpc/platforms/44x/Makefile
-f:arch/powerpc/platforms/44x/canyonlands.c
-f:arch/powerpc/platforms/44x/cpm.c
-f:arch/powerpc/platforms/44x/ebony.c
-f:arch/powerpc/platforms/44x/fsp2.c
-f:arch/powerpc/platforms/44x/fsp2.h
-f:arch/powerpc/platforms/44x/gpio.c
-f:arch/powerpc/platforms/44x/hsta_msi.c
-f:arch/powerpc/platforms/44x/idle.c
-f:arch/powerpc/platforms/44x/iss4xx.c
-f:arch/powerpc/platforms/44x/machine_check.c
-f:arch/powerpc/platforms/44x/misc_44x.S
-f:arch/powerpc/platforms/44x/pci.c
-f:arch/powerpc/platforms/44x/pci.h
-f:arch/powerpc/platforms/44x/ppc44x_simple.c
-f:arch/powerpc/platforms/44x/ppc476.c
-f:arch/powerpc/platforms/44x/ppc476_modules.lds
-f:arch/powerpc/platforms/44x/sam440ep.c
-f:arch/powerpc/platforms/44x/soc.c
-f:arch/powerpc/platforms/44x/uic.c
-f:arch/powerpc/platforms/44x/warp.c
-f:arch/powerpc/platforms/512x/Kconfig
-f:arch/powerpc/platforms/512x/Makefile
-f:arch/powerpc/platforms/512x/clock-commonclk.c
-f:arch/powerpc/platforms/512x/mpc5121_ads.c
-f:arch/powerpc/platforms/512x/mpc5121_ads.h
-f:arch/powerpc/platforms/512x/mpc5121_ads_cpld.c
-f:arch/powerpc/platforms/512x/mpc512x.h
-f:arch/powerpc/platforms/512x/mpc512x_generic.c
-f:arch/powerpc/platforms/512x/mpc512x_lpbfifo.c
-f:arch/powerpc/platforms/512x/mpc512x_shared.c
-f:arch/powerpc/platforms/512x/pdm360ng.c
-f:arch/powerpc/platforms/52xx/Kconfig
-f:arch/powerpc/platforms/52xx/Makefile
-f:arch/powerpc/platforms/52xx/efika.c
-f:arch/powerpc/platforms/52xx/lite5200.c
-f:arch/powerpc/platforms/52xx/lite5200_pm.c
-f:arch/powerpc/platforms/52xx/lite5200_sleep.S
-f:arch/powerpc/platforms/52xx/media5200.c
-f:arch/powerpc/platforms/52xx/mpc5200_simple.c
-f:arch/powerpc/platforms/52xx/mpc52xx_common.c
-f:arch/powerpc/platforms/52xx/mpc52xx_gpt.c
-f:arch/powerpc/platforms/52xx/mpc52xx_pci.c
-f:arch/powerpc/platforms/52xx/mpc52xx_pic.c
-f:arch/powerpc/platforms/52xx/mpc52xx_pm.c
-f:arch/powerpc/platforms/52xx/mpc52xx_sleep.S
-f:arch/powerpc/platforms/82xx/Kconfig
-f:arch/powerpc/platforms/82xx/Makefile
-f:arch/powerpc/platforms/82xx/ep8248e.c
-f:arch/powerpc/platforms/82xx/km82xx.c
-f:arch/powerpc/platforms/82xx/pq2.c
-f:arch/powerpc/platforms/82xx/pq2.h
-f:arch/powerpc/platforms/83xx/Kconfig
-f:arch/powerpc/platforms/83xx/Makefile
-f:arch/powerpc/platforms/83xx/asp834x.c
-f:arch/powerpc/platforms/83xx/km83xx.c
-f:arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c
-f:arch/powerpc/platforms/83xx/misc.c
-f:arch/powerpc/platforms/83xx/mpc830x_rdb.c
-f:arch/powerpc/platforms/83xx/mpc831x_rdb.c
-f:arch/powerpc/platforms/83xx/mpc832x_rdb.c
-f:arch/powerpc/platforms/83xx/mpc834x_itx.c
-f:arch/powerpc/platforms/83xx/mpc836x_rdk.c
-f:arch/powerpc/platforms/83xx/mpc837x_rdb.c
-f:arch/powerpc/platforms/83xx/mpc83xx.h
-f:arch/powerpc/platforms/83xx/suspend-asm.S
-f:arch/powerpc/platforms/83xx/suspend.c
-f:arch/powerpc/platforms/83xx/usb_831x.c
-f:arch/powerpc/platforms/83xx/usb_834x.c
-f:arch/powerpc/platforms/83xx/usb_837x.c
-f:arch/powerpc/platforms/85xx/Kconfig
-f:arch/powerpc/platforms/85xx/Makefile
-f:arch/powerpc/platforms/85xx/bsc913x_qds.c
-f:arch/powerpc/platforms/85xx/bsc913x_rdb.c
-f:arch/powerpc/platforms/85xx/c293pcie.c
-f:arch/powerpc/platforms/85xx/common.c
-f:arch/powerpc/platforms/85xx/corenet_generic.c
-f:arch/powerpc/platforms/85xx/ge_imp3a.c
-f:arch/powerpc/platforms/85xx/ksi8560.c
-f:arch/powerpc/platforms/85xx/mpc8536_ds.c
-f:arch/powerpc/platforms/85xx/mpc85xx.h
-f:arch/powerpc/platforms/85xx/mpc85xx_8259.c
-f:arch/powerpc/platforms/85xx/mpc85xx_ds.c
-f:arch/powerpc/platforms/85xx/mpc85xx_mds.c
-f:arch/powerpc/platforms/85xx/mpc85xx_pm_ops.c
-f:arch/powerpc/platforms/85xx/mpc85xx_rdb.c
-f:arch/powerpc/platforms/85xx/mvme2500.c
-f:arch/powerpc/platforms/85xx/p1010rdb.c
-f:arch/powerpc/platforms/85xx/p1022_ds.c
-f:arch/powerpc/platforms/85xx/p1022_rdk.c
-f:arch/powerpc/platforms/85xx/p1023_rdb.c
-f:arch/powerpc/platforms/85xx/p2020.c
-f:arch/powerpc/platforms/85xx/ppa8548.c
-f:arch/powerpc/platforms/85xx/qemu_e500.c
-f:arch/powerpc/platforms/85xx/sgy_cts1000.c
-f:arch/powerpc/platforms/85xx/smp.c
-f:arch/powerpc/platforms/85xx/smp.h
-f:arch/powerpc/platforms/85xx/socrates.c
-f:arch/powerpc/platforms/85xx/socrates_fpga_pic.c
-f:arch/powerpc/platforms/85xx/socrates_fpga_pic.h
-f:arch/powerpc/platforms/85xx/stx_gp3.c
-f:arch/powerpc/platforms/85xx/t1042rdb_diu.c
-f:arch/powerpc/platforms/85xx/tqm85xx.c
-f:arch/powerpc/platforms/85xx/twr_p102x.c
-f:arch/powerpc/platforms/85xx/xes_mpc85xx.c
-f:arch/powerpc/platforms/86xx/Kconfig
-f:arch/powerpc/platforms/86xx/Makefile
-f:arch/powerpc/platforms/86xx/common.c
-f:arch/powerpc/platforms/86xx/gef_ppc9a.c
-f:arch/powerpc/platforms/86xx/gef_sbc310.c
-f:arch/powerpc/platforms/86xx/gef_sbc610.c
-f:arch/powerpc/platforms/86xx/mpc86xx.h
-f:arch/powerpc/platforms/86xx/mpc86xx_smp.c
-f:arch/powerpc/platforms/86xx/mvme7100.c
-f:arch/powerpc/platforms/86xx/pic.c
-f:arch/powerpc/platforms/8xx/Kconfig
-f:arch/powerpc/platforms/8xx/Makefile
-f:arch/powerpc/platforms/8xx/adder875.c
-f:arch/powerpc/platforms/8xx/cpm1-ic.c
-f:arch/powerpc/platforms/8xx/cpm1.c
-f:arch/powerpc/platforms/8xx/ep88xc.c
-f:arch/powerpc/platforms/8xx/m8xx_setup.c
-f:arch/powerpc/platforms/8xx/machine_check.c
-f:arch/powerpc/platforms/8xx/micropatch.c
-f:arch/powerpc/platforms/8xx/mpc86xads.h
-f:arch/powerpc/platforms/8xx/mpc86xads_setup.c
-f:arch/powerpc/platforms/8xx/mpc885ads.h
-f:arch/powerpc/platforms/8xx/mpc885ads_setup.c
-f:arch/powerpc/platforms/8xx/mpc8xx.h
-f:arch/powerpc/platforms/8xx/pic.c
-f:arch/powerpc/platforms/8xx/pic.h
-f:arch/powerpc/platforms/8xx/tqm8xx_setup.c
-f:arch/powerpc/platforms/Kconfig
-f:arch/powerpc/platforms/Kconfig.cputype
-f:arch/powerpc/platforms/Makefile
-f:arch/powerpc/platforms/amigaone/Kconfig
-f:arch/powerpc/platforms/amigaone/Makefile
-f:arch/powerpc/platforms/amigaone/setup.c
-f:arch/powerpc/platforms/book3s/Kconfig
-f:arch/powerpc/platforms/book3s/Makefile
-f:arch/powerpc/platforms/book3s/vas-api.c
-f:arch/powerpc/platforms/cell/Kconfig
-f:arch/powerpc/platforms/cell/Makefile
-f:arch/powerpc/platforms/cell/spu_base.c
-f:arch/powerpc/platforms/cell/spu_callbacks.c
-f:arch/powerpc/platforms/cell/spu_syscalls.c
-f:arch/powerpc/platforms/cell/spufs/.gitignore
-f:arch/powerpc/platforms/cell/spufs/Makefile
-f:arch/powerpc/platforms/cell/spufs/backing_ops.c
-f:arch/powerpc/platforms/cell/spufs/context.c
-f:arch/powerpc/platforms/cell/spufs/coredump.c
-f:arch/powerpc/platforms/cell/spufs/fault.c
-f:arch/powerpc/platforms/cell/spufs/file.c
-f:arch/powerpc/platforms/cell/spufs/gang.c
-f:arch/powerpc/platforms/cell/spufs/hw_ops.c
-f:arch/powerpc/platforms/cell/spufs/inode.c
-f:arch/powerpc/platforms/cell/spufs/lscsa_alloc.c
-f:arch/powerpc/platforms/cell/spufs/run.c
-f:arch/powerpc/platforms/cell/spufs/sched.c
-f:arch/powerpc/platforms/cell/spufs/spu_restore.c
-f:arch/powerpc/platforms/cell/spufs/spu_restore_crt0.S
-f:arch/powerpc/platforms/cell/spufs/spu_restore_dump.h_shipped
-f:arch/powerpc/platforms/cell/spufs/spu_save.c
-f:arch/powerpc/platforms/cell/spufs/spu_save_crt0.S
-f:arch/powerpc/platforms/cell/spufs/spu_save_dump.h_shipped
-f:arch/powerpc/platforms/cell/spufs/spu_utils.h
-f:arch/powerpc/platforms/cell/spufs/spufs.h
-f:arch/powerpc/platforms/cell/spufs/sputrace.h
-f:arch/powerpc/platforms/cell/spufs/switch.c
-f:arch/powerpc/platforms/cell/spufs/syscalls.c
-f:arch/powerpc/platforms/chrp/Kconfig
-f:arch/powerpc/platforms/chrp/Makefile
-f:arch/powerpc/platforms/chrp/chrp.h
-f:arch/powerpc/platforms/chrp/gg2.h
-f:arch/powerpc/platforms/chrp/nvram.c
-f:arch/powerpc/platforms/chrp/pci.c
-f:arch/powerpc/platforms/chrp/pegasos_eth.c
-f:arch/powerpc/platforms/chrp/setup.c
-f:arch/powerpc/platforms/chrp/smp.c
-f:arch/powerpc/platforms/chrp/time.c
-f:arch/powerpc/platforms/embedded6xx/Kconfig
-f:arch/powerpc/platforms/embedded6xx/Makefile
-f:arch/powerpc/platforms/embedded6xx/flipper-pic.c
-f:arch/powerpc/platforms/embedded6xx/flipper-pic.h
-f:arch/powerpc/platforms/embedded6xx/gamecube.c
-f:arch/powerpc/platforms/embedded6xx/hlwd-pic.c
-f:arch/powerpc/platforms/embedded6xx/hlwd-pic.h
-f:arch/powerpc/platforms/embedded6xx/holly.c
-f:arch/powerpc/platforms/embedded6xx/linkstation.c
-f:arch/powerpc/platforms/embedded6xx/ls_uart.c
-f:arch/powerpc/platforms/embedded6xx/mpc10x.h
-f:arch/powerpc/platforms/embedded6xx/mvme5100.c
-f:arch/powerpc/platforms/embedded6xx/storcenter.c
-f:arch/powerpc/platforms/embedded6xx/usbgecko_udbg.c
-f:arch/powerpc/platforms/embedded6xx/usbgecko_udbg.h
-f:arch/powerpc/platforms/embedded6xx/wii.c
-f:arch/powerpc/platforms/fsl_uli1575.c
-f:arch/powerpc/platforms/microwatt/Kconfig
-f:arch/powerpc/platforms/microwatt/Makefile
-f:arch/powerpc/platforms/microwatt/microwatt.h
-f:arch/powerpc/platforms/microwatt/rng.c
-f:arch/powerpc/platforms/microwatt/setup.c
-f:arch/powerpc/platforms/microwatt/smp.c
-f:arch/powerpc/platforms/pasemi/Kconfig
-f:arch/powerpc/platforms/pasemi/Makefile
-f:arch/powerpc/platforms/pasemi/dma_lib.c
-f:arch/powerpc/platforms/pasemi/gpio_mdio.c
-f:arch/powerpc/platforms/pasemi/idle.c
-f:arch/powerpc/platforms/pasemi/iommu.c
-f:arch/powerpc/platforms/pasemi/misc.c
-f:arch/powerpc/platforms/pasemi/msi.c
-f:arch/powerpc/platforms/pasemi/pasemi.h
-f:arch/powerpc/platforms/pasemi/pci.c
-f:arch/powerpc/platforms/pasemi/powersave.S
-f:arch/powerpc/platforms/pasemi/setup.c
-f:arch/powerpc/platforms/pasemi/time.c
-f:arch/powerpc/platforms/powermac/Kconfig
-f:arch/powerpc/platforms/powermac/Makefile
-f:arch/powerpc/platforms/powermac/backlight.c
-f:arch/powerpc/platforms/powermac/bootx_init.c
-f:arch/powerpc/platforms/powermac/cache.S
-f:arch/powerpc/platforms/powermac/feature.c
-f:arch/powerpc/platforms/powermac/low_i2c.c
-f:arch/powerpc/platforms/powermac/nvram.c
-f:arch/powerpc/platforms/powermac/pci.c
-f:arch/powerpc/platforms/powermac/pfunc_base.c
-f:arch/powerpc/platforms/powermac/pfunc_core.c
-f:arch/powerpc/platforms/powermac/pic.c
-f:arch/powerpc/platforms/powermac/pmac.h
-f:arch/powerpc/platforms/powermac/setup.c
-f:arch/powerpc/platforms/powermac/sleep.S
-f:arch/powerpc/platforms/powermac/smp.c
-f:arch/powerpc/platforms/powermac/time.c
-f:arch/powerpc/platforms/powermac/udbg_adb.c
-f:arch/powerpc/platforms/powermac/udbg_scc.c
-f:arch/powerpc/platforms/powernv/Kconfig
-f:arch/powerpc/platforms/powernv/Makefile
-f:arch/powerpc/platforms/powernv/copy-paste.h
-f:arch/powerpc/platforms/powernv/eeh-powernv.c
-f:arch/powerpc/platforms/powernv/idle.c
-f:arch/powerpc/platforms/powernv/memtrace.c
-f:arch/powerpc/platforms/powernv/ocxl.c
-f:arch/powerpc/platforms/powernv/opal-async.c
-f:arch/powerpc/platforms/powernv/opal-call.c
-f:arch/powerpc/platforms/powernv/opal-core.c
-f:arch/powerpc/platforms/powernv/opal-dump.c
-f:arch/powerpc/platforms/powernv/opal-elog.c
-f:arch/powerpc/platforms/powernv/opal-fadump.c
-f:arch/powerpc/platforms/powernv/opal-fadump.h
-f:arch/powerpc/platforms/powernv/opal-flash.c
-f:arch/powerpc/platforms/powernv/opal-hmi.c
-f:arch/powerpc/platforms/powernv/opal-imc.c
-f:arch/powerpc/platforms/powernv/opal-irqchip.c
-f:arch/powerpc/platforms/powernv/opal-kmsg.c
-f:arch/powerpc/platforms/powernv/opal-lpc.c
-f:arch/powerpc/platforms/powernv/opal-memory-errors.c
-f:arch/powerpc/platforms/powernv/opal-msglog.c
-f:arch/powerpc/platforms/powernv/opal-nvram.c
-f:arch/powerpc/platforms/powernv/opal-power.c
-f:arch/powerpc/platforms/powernv/opal-powercap.c
-f:arch/powerpc/platforms/powernv/opal-prd.c
-f:arch/powerpc/platforms/powernv/opal-psr.c
-f:arch/powerpc/platforms/powernv/opal-rtc.c
-f:arch/powerpc/platforms/powernv/opal-secvar.c
-f:arch/powerpc/platforms/powernv/opal-sensor-groups.c
-f:arch/powerpc/platforms/powernv/opal-sensor.c
-f:arch/powerpc/platforms/powernv/opal-sysparam.c
-f:arch/powerpc/platforms/powernv/opal-tracepoints.c
-f:arch/powerpc/platforms/powernv/opal-wrappers.S
-f:arch/powerpc/platforms/powernv/opal-xscom.c
-f:arch/powerpc/platforms/powernv/opal.c
-f:arch/powerpc/platforms/powernv/pci-ioda-tce.c
-f:arch/powerpc/platforms/powernv/pci-ioda.c
-f:arch/powerpc/platforms/powernv/pci-sriov.c
-f:arch/powerpc/platforms/powernv/pci.c
-f:arch/powerpc/platforms/powernv/pci.h
-f:arch/powerpc/platforms/powernv/powernv.h
-f:arch/powerpc/platforms/powernv/rng.c
-f:arch/powerpc/platforms/powernv/setup.c
-f:arch/powerpc/platforms/powernv/smp.c
-f:arch/powerpc/platforms/powernv/subcore-asm.S
-f:arch/powerpc/platforms/powernv/subcore.c
-f:arch/powerpc/platforms/powernv/subcore.h
-f:arch/powerpc/platforms/powernv/ultravisor.c
-f:arch/powerpc/platforms/powernv/vas-debug.c
-f:arch/powerpc/platforms/powernv/vas-fault.c
-f:arch/powerpc/platforms/powernv/vas-trace.h
-f:arch/powerpc/platforms/powernv/vas-window.c
-f:arch/powerpc/platforms/powernv/vas.c
-f:arch/powerpc/platforms/powernv/vas.h
-f:arch/powerpc/platforms/ps3/Kconfig
-f:arch/powerpc/platforms/ps3/Makefile
-f:arch/powerpc/platforms/ps3/device-init.c
-f:arch/powerpc/platforms/ps3/exports.c
-f:arch/powerpc/platforms/ps3/gelic_udbg.c
-f:arch/powerpc/platforms/ps3/htab.c
-f:arch/powerpc/platforms/ps3/hvcall.S
-f:arch/powerpc/platforms/ps3/interrupt.c
-f:arch/powerpc/platforms/ps3/mm.c
-f:arch/powerpc/platforms/ps3/os-area.c
-f:arch/powerpc/platforms/ps3/platform.h
-f:arch/powerpc/platforms/ps3/repository.c
-f:arch/powerpc/platforms/ps3/setup.c
-f:arch/powerpc/platforms/ps3/smp.c
-f:arch/powerpc/platforms/ps3/spu.c
-f:arch/powerpc/platforms/ps3/system-bus.c
-f:arch/powerpc/platforms/ps3/time.c
-f:arch/powerpc/platforms/pseries/Kconfig
-f:arch/powerpc/platforms/pseries/Makefile
-f:arch/powerpc/platforms/pseries/cc_platform.c
-f:arch/powerpc/platforms/pseries/cmm.c
-f:arch/powerpc/platforms/pseries/dlpar.c
-f:arch/powerpc/platforms/pseries/dtl.c
-f:arch/powerpc/platforms/pseries/eeh_pseries.c
-f:arch/powerpc/platforms/pseries/event_sources.c
-f:arch/powerpc/platforms/pseries/firmware.c
-f:arch/powerpc/platforms/pseries/hotplug-cpu.c
-f:arch/powerpc/platforms/pseries/hotplug-memory.c
-f:arch/powerpc/platforms/pseries/htmdump.c
-f:arch/powerpc/platforms/pseries/hvCall.S
-f:arch/powerpc/platforms/pseries/hvCall_inst.c
-f:arch/powerpc/platforms/pseries/hvconsole.c
-f:arch/powerpc/platforms/pseries/hvcserver.c
-f:arch/powerpc/platforms/pseries/ibmebus.c
-f:arch/powerpc/platforms/pseries/io_event_irq.c
-f:arch/powerpc/platforms/pseries/iommu.c
-f:arch/powerpc/platforms/pseries/kexec.c
-f:arch/powerpc/platforms/pseries/lpar.c
-f:arch/powerpc/platforms/pseries/lparcfg.c
-f:arch/powerpc/platforms/pseries/mobility.c
-f:arch/powerpc/platforms/pseries/msi.c
-f:arch/powerpc/platforms/pseries/nvram.c
-f:arch/powerpc/platforms/pseries/of_helpers.c
-f:arch/powerpc/platforms/pseries/of_helpers.h
-f:arch/powerpc/platforms/pseries/papr-indices.c
-f:arch/powerpc/platforms/pseries/papr-phy-attest.c
-f:arch/powerpc/platforms/pseries/papr-platform-dump.c
-f:arch/powerpc/platforms/pseries/papr-rtas-common.c
-f:arch/powerpc/platforms/pseries/papr-rtas-common.h
-f:arch/powerpc/platforms/pseries/papr-sysparm.c
-f:arch/powerpc/platforms/pseries/papr-vpd.c
-f:arch/powerpc/platforms/pseries/papr_platform_attributes.c
-f:arch/powerpc/platforms/pseries/papr_scm.c
-f:arch/powerpc/platforms/pseries/pci.c
-f:arch/powerpc/platforms/pseries/pci_dlpar.c
-f:arch/powerpc/platforms/pseries/plpks-secvar.c
-f:arch/powerpc/platforms/pseries/plpks.c
-f:arch/powerpc/platforms/pseries/plpks_sed_ops.c
-f:arch/powerpc/platforms/pseries/pmem.c
-f:arch/powerpc/platforms/pseries/power.c
-f:arch/powerpc/platforms/pseries/pseries.h
-f:arch/powerpc/platforms/pseries/pseries_energy.c
-f:arch/powerpc/platforms/pseries/ras.c
-f:arch/powerpc/platforms/pseries/reconfig.c
-f:arch/powerpc/platforms/pseries/rng.c
-f:arch/powerpc/platforms/pseries/rtas-fadump.c
-f:arch/powerpc/platforms/pseries/rtas-fadump.h
-f:arch/powerpc/platforms/pseries/rtas-work-area.c
-f:arch/powerpc/platforms/pseries/setup.c
-f:arch/powerpc/platforms/pseries/smp.c
-f:arch/powerpc/platforms/pseries/suspend.c
-f:arch/powerpc/platforms/pseries/svm.c
-f:arch/powerpc/platforms/pseries/vas-sysfs.c
-f:arch/powerpc/platforms/pseries/vas.c
-f:arch/powerpc/platforms/pseries/vas.h
-f:arch/powerpc/platforms/pseries/vio.c
-f:arch/powerpc/platforms/pseries/vphn.c
-f:arch/powerpc/purgatory/.gitignore
-f:arch/powerpc/purgatory/Makefile
-f:arch/powerpc/purgatory/kexec-purgatory.S
-f:arch/powerpc/purgatory/trampoline_64.S
-f:arch/powerpc/sysdev/6xx-suspend.S
-f:arch/powerpc/sysdev/Kconfig
-f:arch/powerpc/sysdev/Makefile
-f:arch/powerpc/sysdev/cpm2.c
-f:arch/powerpc/sysdev/cpm2_pic.c
-f:arch/powerpc/sysdev/cpm2_pic.h
-f:arch/powerpc/sysdev/cpm_common.c
-f:arch/powerpc/sysdev/cpm_gpio.c
-f:arch/powerpc/sysdev/dart.h
-f:arch/powerpc/sysdev/dart_iommu.c
-f:arch/powerpc/sysdev/dcr-low.S
-f:arch/powerpc/sysdev/dcr.c
-f:arch/powerpc/sysdev/ehv_pic.c
-f:arch/powerpc/sysdev/fsl_gtm.c
-f:arch/powerpc/sysdev/fsl_lbc.c
-f:arch/powerpc/sysdev/fsl_mpic_err.c
-f:arch/powerpc/sysdev/fsl_mpic_timer_wakeup.c
-f:arch/powerpc/sysdev/fsl_msi.c
-f:arch/powerpc/sysdev/fsl_msi.h
-f:arch/powerpc/sysdev/fsl_pci.c
-f:arch/powerpc/sysdev/fsl_pci.h
-f:arch/powerpc/sysdev/fsl_pmc.c
-f:arch/powerpc/sysdev/fsl_rcpm.c
-f:arch/powerpc/sysdev/fsl_rio.c
-f:arch/powerpc/sysdev/fsl_rio.h
-f:arch/powerpc/sysdev/fsl_rmu.c
-f:arch/powerpc/sysdev/fsl_soc.c
-f:arch/powerpc/sysdev/fsl_soc.h
-f:arch/powerpc/sysdev/ge/Makefile
-f:arch/powerpc/sysdev/ge/ge_pic.c
-f:arch/powerpc/sysdev/ge/ge_pic.h
-f:arch/powerpc/sysdev/grackle.c
-f:arch/powerpc/sysdev/i8259.c
-f:arch/powerpc/sysdev/indirect_pci.c
-f:arch/powerpc/sysdev/ipic.c
-f:arch/powerpc/sysdev/ipic.h
-f:arch/powerpc/sysdev/mmio_nvram.c
-f:arch/powerpc/sysdev/mpc5xxx_clocks.c
-f:arch/powerpc/sysdev/mpic.c
-f:arch/powerpc/sysdev/mpic.h
-f:arch/powerpc/sysdev/mpic_msgr.c
-f:arch/powerpc/sysdev/mpic_msi.c
-f:arch/powerpc/sysdev/mpic_timer.c
-f:arch/powerpc/sysdev/mpic_u3msi.c
-f:arch/powerpc/sysdev/msi_bitmap.c
-f:arch/powerpc/sysdev/of_rtc.c
-f:arch/powerpc/sysdev/rtc_cmos_setup.c
-f:arch/powerpc/sysdev/tsi108_dev.c
-f:arch/powerpc/sysdev/tsi108_pci.c
-f:arch/powerpc/sysdev/udbg_memcons.c
-f:arch/powerpc/sysdev/xics/Kconfig
-f:arch/powerpc/sysdev/xics/Makefile
-f:arch/powerpc/sysdev/xics/icp-hv.c
-f:arch/powerpc/sysdev/xics/icp-native.c
-f:arch/powerpc/sysdev/xics/icp-opal.c
-f:arch/powerpc/sysdev/xics/ics-native.c
-f:arch/powerpc/sysdev/xics/ics-opal.c
-f:arch/powerpc/sysdev/xics/ics-rtas.c
-f:arch/powerpc/sysdev/xics/xics-common.c
-f:arch/powerpc/sysdev/xive/Kconfig
-f:arch/powerpc/sysdev/xive/Makefile
-f:arch/powerpc/sysdev/xive/common.c
-f:arch/powerpc/sysdev/xive/native.c
-f:arch/powerpc/sysdev/xive/spapr.c
-f:arch/powerpc/sysdev/xive/xive-internal.h
-f:arch/powerpc/tools/.gitignore
-f:arch/powerpc/tools/Makefile
-f:arch/powerpc/tools/checkpatch.sh
-f:arch/powerpc/tools/ftrace-gen-ool-stubs.sh
-f:arch/powerpc/tools/ftrace_check.sh
-f:arch/powerpc/tools/gcc-check-fpatchable-function-entry.sh
-f:arch/powerpc/tools/gcc-check-mprofile-kernel.sh
-f:arch/powerpc/tools/head_check.sh
-f:arch/powerpc/tools/relocs_check.sh
-f:arch/powerpc/tools/unrel_branch_check.sh
-f:arch/powerpc/xmon/Makefile
-f:arch/powerpc/xmon/ansidecl.h
-f:arch/powerpc/xmon/dis-asm.h
-f:arch/powerpc/xmon/nonstdio.c
-f:arch/powerpc/xmon/nonstdio.h
-f:arch/powerpc/xmon/ppc-dis.c
-f:arch/powerpc/xmon/ppc-opc.c
-f:arch/powerpc/xmon/ppc.h
-f:arch/powerpc/xmon/spr_access.S
-f:arch/powerpc/xmon/xmon.c
-f:arch/powerpc/xmon/xmon_bpts.S
-f:arch/powerpc/xmon/xmon_bpts.h
-f:arch/riscv/Kbuild
-f:arch/riscv/Kconfig
-f:arch/riscv/Kconfig.debug
-f:arch/riscv/Kconfig.errata
-f:arch/riscv/Kconfig.socs
-f:arch/riscv/Kconfig.vendor
-f:arch/riscv/Makefile
-f:arch/riscv/Makefile.postlink
-f:arch/riscv/boot/.gitignore
-f:arch/riscv/boot/Makefile
-f:arch/riscv/boot/dts/Makefile
-f:arch/riscv/boot/dts/allwinner/Makefile
-f:arch/riscv/boot/dts/allwinner/sun20i-common-regulators.dtsi
-f:arch/riscv/boot/dts/allwinner/sun20i-d1-clockworkpi-v3.14.dts
-f:arch/riscv/boot/dts/allwinner/sun20i-d1-devterm-v3.14.dts
-f:arch/riscv/boot/dts/allwinner/sun20i-d1-dongshan-nezha-stu.dts
-f:arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-480p.dts
-f:arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-720p.dts
-f:arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel.dtsi
-f:arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-dock.dts
-f:arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv.dts
-f:arch/riscv/boot/dts/allwinner/sun20i-d1-mangopi-mq-pro.dts
-f:arch/riscv/boot/dts/allwinner/sun20i-d1-nezha.dts
-f:arch/riscv/boot/dts/allwinner/sun20i-d1.dtsi
-f:arch/riscv/boot/dts/allwinner/sun20i-d1s-mangopi-mq.dts
-f:arch/riscv/boot/dts/allwinner/sun20i-d1s.dtsi
-f:arch/riscv/boot/dts/allwinner/sunxi-d1-t113.dtsi
-f:arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi
-f:arch/riscv/boot/dts/andes/Makefile
-f:arch/riscv/boot/dts/andes/qilai-voyager.dts
-f:arch/riscv/boot/dts/andes/qilai.dtsi
-f:arch/riscv/boot/dts/canaan/Makefile
-f:arch/riscv/boot/dts/canaan/canaan_kd233.dts
-f:arch/riscv/boot/dts/canaan/k210.dtsi
-f:arch/riscv/boot/dts/canaan/k210_generic.dts
-f:arch/riscv/boot/dts/canaan/sipeed_maix_bit.dts
-f:arch/riscv/boot/dts/canaan/sipeed_maix_dock.dts
-f:arch/riscv/boot/dts/canaan/sipeed_maix_go.dts
-f:arch/riscv/boot/dts/canaan/sipeed_maixduino.dts
-f:arch/riscv/boot/dts/microchip/Makefile
-f:arch/riscv/boot/dts/microchip/mpfs-beaglev-fire-fabric.dtsi
-f:arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dts
-f:arch/riscv/boot/dts/microchip/mpfs-icicle-kit-fabric.dtsi
-f:arch/riscv/boot/dts/microchip/mpfs-icicle-kit.dts
-f:arch/riscv/boot/dts/microchip/mpfs-m100pfs-fabric.dtsi
-f:arch/riscv/boot/dts/microchip/mpfs-m100pfsevp.dts
-f:arch/riscv/boot/dts/microchip/mpfs-polarberry-fabric.dtsi
-f:arch/riscv/boot/dts/microchip/mpfs-polarberry.dts
-f:arch/riscv/boot/dts/microchip/mpfs-sev-kit-fabric.dtsi
-f:arch/riscv/boot/dts/microchip/mpfs-sev-kit.dts
-f:arch/riscv/boot/dts/microchip/mpfs-tysom-m-fabric.dtsi
-f:arch/riscv/boot/dts/microchip/mpfs-tysom-m.dts
-f:arch/riscv/boot/dts/microchip/mpfs.dtsi
-f:arch/riscv/boot/dts/renesas/Makefile
-f:arch/riscv/boot/dts/renesas/r9a07g043f.dtsi
-f:arch/riscv/boot/dts/renesas/r9a07g043f01-smarc.dts
-f:arch/riscv/boot/dts/renesas/rzfive-smarc-som.dtsi
-f:arch/riscv/boot/dts/renesas/rzfive-smarc.dtsi
-f:arch/riscv/boot/dts/sifive/Makefile
-f:arch/riscv/boot/dts/sifive/fu540-c000.dtsi
-f:arch/riscv/boot/dts/sifive/fu740-c000.dtsi
-f:arch/riscv/boot/dts/sifive/hifive-unleashed-a00.dts
-f:arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts
-f:arch/riscv/boot/dts/sophgo/Makefile
-f:arch/riscv/boot/dts/sophgo/cv1800b-milkv-duo.dts
-f:arch/riscv/boot/dts/sophgo/cv1800b.dtsi
-f:arch/riscv/boot/dts/sophgo/cv180x-cpus.dtsi
-f:arch/riscv/boot/dts/sophgo/cv180x.dtsi
-f:arch/riscv/boot/dts/sophgo/cv1812h-huashan-pi.dts
-f:arch/riscv/boot/dts/sophgo/cv1812h.dtsi
-f:arch/riscv/boot/dts/sophgo/cv181x.dtsi
-f:arch/riscv/boot/dts/sophgo/cv18xx-reset.h
-f:arch/riscv/boot/dts/sophgo/sg2002-licheerv-nano-b.dts
-f:arch/riscv/boot/dts/sophgo/sg2002.dtsi
-f:arch/riscv/boot/dts/sophgo/sg2042-cpus.dtsi
-f:arch/riscv/boot/dts/sophgo/sg2042-evb-v1.dts
-f:arch/riscv/boot/dts/sophgo/sg2042-evb-v2.dts
-f:arch/riscv/boot/dts/sophgo/sg2042-milkv-pioneer.dts
-f:arch/riscv/boot/dts/sophgo/sg2042.dtsi
-f:arch/riscv/boot/dts/sophgo/sg2044-cpus.dtsi
-f:arch/riscv/boot/dts/sophgo/sg2044-reset.h
-f:arch/riscv/boot/dts/sophgo/sg2044-sophgo-srd3-10.dts
-f:arch/riscv/boot/dts/sophgo/sg2044.dtsi
-f:arch/riscv/boot/dts/spacemit/Makefile
-f:arch/riscv/boot/dts/spacemit/k1-bananapi-f3.dts
-f:arch/riscv/boot/dts/spacemit/k1-milkv-jupiter.dts
-f:arch/riscv/boot/dts/spacemit/k1-pinctrl.dtsi
-f:arch/riscv/boot/dts/spacemit/k1.dtsi
-f:arch/riscv/boot/dts/starfive/Makefile
-f:arch/riscv/boot/dts/starfive/jh7100-beaglev-starlight.dts
-f:arch/riscv/boot/dts/starfive/jh7100-common.dtsi
-f:arch/riscv/boot/dts/starfive/jh7100-starfive-visionfive-v1.dts
-f:arch/riscv/boot/dts/starfive/jh7100.dtsi
-f:arch/riscv/boot/dts/starfive/jh7110-common.dtsi
-f:arch/riscv/boot/dts/starfive/jh7110-deepcomputing-fml13v01.dts
-f:arch/riscv/boot/dts/starfive/jh7110-milkv-mars.dts
-f:arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dts
-f:arch/riscv/boot/dts/starfive/jh7110-pinfunc.h
-f:arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-v1.2a.dts
-f:arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-v1.3b.dts
-f:arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi
-f:arch/riscv/boot/dts/starfive/jh7110.dtsi
-f:arch/riscv/boot/dts/thead/Makefile
-f:arch/riscv/boot/dts/thead/th1520-beaglev-ahead.dts
-f:arch/riscv/boot/dts/thead/th1520-lichee-module-4a.dtsi
-f:arch/riscv/boot/dts/thead/th1520-lichee-pi-4a.dts
-f:arch/riscv/boot/dts/thead/th1520.dtsi
-f:arch/riscv/boot/install.sh
-f:arch/riscv/boot/loader.S
-f:arch/riscv/boot/loader.lds.S
-f:arch/riscv/configs/32-bit.config
-f:arch/riscv/configs/64-bit.config
-f:arch/riscv/configs/defconfig
-f:arch/riscv/configs/nommu_k210_defconfig
-f:arch/riscv/configs/nommu_k210_sdcard_defconfig
-f:arch/riscv/configs/nommu_virt_defconfig
-f:arch/riscv/crypto/Kconfig
-f:arch/riscv/crypto/Makefile
-f:arch/riscv/crypto/aes-macros.S
-f:arch/riscv/crypto/aes-riscv64-glue.c
-f:arch/riscv/crypto/aes-riscv64-zvkned-zvbb-zvkg.S
-f:arch/riscv/crypto/aes-riscv64-zvkned-zvkb.S
-f:arch/riscv/crypto/aes-riscv64-zvkned.S
-f:arch/riscv/crypto/ghash-riscv64-glue.c
-f:arch/riscv/crypto/ghash-riscv64-zvkg.S
-f:arch/riscv/crypto/sm3-riscv64-glue.c
-f:arch/riscv/crypto/sm3-riscv64-zvksh-zvkb.S
-f:arch/riscv/crypto/sm4-riscv64-glue.c
-f:arch/riscv/crypto/sm4-riscv64-zvksed-zvkb.S
-f:arch/riscv/errata/Makefile
-f:arch/riscv/errata/andes/Makefile
-f:arch/riscv/errata/andes/errata.c
-f:arch/riscv/errata/sifive/Makefile
-f:arch/riscv/errata/sifive/errata.c
-f:arch/riscv/errata/sifive/errata_cip_453.S
-f:arch/riscv/errata/thead/Makefile
-f:arch/riscv/errata/thead/errata.c
-f:arch/riscv/include/asm/Kbuild
-f:arch/riscv/include/asm/acenv.h
-f:arch/riscv/include/asm/acpi.h
-f:arch/riscv/include/asm/alternative-macros.h
-f:arch/riscv/include/asm/alternative.h
-f:arch/riscv/include/asm/arch_hweight.h
-f:arch/riscv/include/asm/archrandom.h
-f:arch/riscv/include/asm/asm-extable.h
-f:arch/riscv/include/asm/asm-offsets.h
-f:arch/riscv/include/asm/asm-prototypes.h
-f:arch/riscv/include/asm/asm.h
-f:arch/riscv/include/asm/assembler.h
-f:arch/riscv/include/asm/atomic.h
-f:arch/riscv/include/asm/barrier.h
-f:arch/riscv/include/asm/bitops.h
-f:arch/riscv/include/asm/bug.h
-f:arch/riscv/include/asm/bugs.h
-f:arch/riscv/include/asm/cache.h
-f:arch/riscv/include/asm/cacheflush.h
-f:arch/riscv/include/asm/cacheinfo.h
-f:arch/riscv/include/asm/cfi.h
-f:arch/riscv/include/asm/checksum.h
-f:arch/riscv/include/asm/clint.h
-f:arch/riscv/include/asm/clocksource.h
-f:arch/riscv/include/asm/cmpxchg.h
-f:arch/riscv/include/asm/compat.h
-f:arch/riscv/include/asm/cpu.h
-f:arch/riscv/include/asm/cpu_ops.h
-f:arch/riscv/include/asm/cpu_ops_sbi.h
-f:arch/riscv/include/asm/cpufeature-macros.h
-f:arch/riscv/include/asm/cpufeature.h
-f:arch/riscv/include/asm/cpuidle.h
-f:arch/riscv/include/asm/crash_reserve.h
-f:arch/riscv/include/asm/csr.h
-f:arch/riscv/include/asm/current.h
-f:arch/riscv/include/asm/delay.h
-f:arch/riscv/include/asm/dma-noncoherent.h
-f:arch/riscv/include/asm/dmi.h
-f:arch/riscv/include/asm/efi.h
-f:arch/riscv/include/asm/elf.h
-f:arch/riscv/include/asm/entry-common.h
-f:arch/riscv/include/asm/errata_list.h
-f:arch/riscv/include/asm/exec.h
-f:arch/riscv/include/asm/extable.h
-f:arch/riscv/include/asm/fence.h
-f:arch/riscv/include/asm/fixmap.h
-f:arch/riscv/include/asm/fpu.h
-f:arch/riscv/include/asm/ftrace.h
-f:arch/riscv/include/asm/futex.h
-f:arch/riscv/include/asm/gdb_xml.h
-f:arch/riscv/include/asm/gpr-num.h
-f:arch/riscv/include/asm/hugetlb.h
-f:arch/riscv/include/asm/hwcap.h
-f:arch/riscv/include/asm/hwprobe.h
-f:arch/riscv/include/asm/image.h
-f:arch/riscv/include/asm/insn-def.h
-f:arch/riscv/include/asm/insn.h
-f:arch/riscv/include/asm/io.h
-f:arch/riscv/include/asm/irq.h
-f:arch/riscv/include/asm/irq_stack.h
-f:arch/riscv/include/asm/irq_work.h
-f:arch/riscv/include/asm/irqflags.h
-f:arch/riscv/include/asm/jump_label.h
-f:arch/riscv/include/asm/kasan.h
-f:arch/riscv/include/asm/kdebug.h
-f:arch/riscv/include/asm/kexec.h
-f:arch/riscv/include/asm/kfence.h
-f:arch/riscv/include/asm/kgdb.h
-f:arch/riscv/include/asm/kprobes.h
-f:arch/riscv/include/asm/kvm_aia.h
-f:arch/riscv/include/asm/kvm_gstage.h
-f:arch/riscv/include/asm/kvm_host.h
-f:arch/riscv/include/asm/kvm_mmu.h
-f:arch/riscv/include/asm/kvm_nacl.h
-f:arch/riscv/include/asm/kvm_tlb.h
-f:arch/riscv/include/asm/kvm_types.h
-f:arch/riscv/include/asm/kvm_vcpu_fp.h
-f:arch/riscv/include/asm/kvm_vcpu_insn.h
-f:arch/riscv/include/asm/kvm_vcpu_pmu.h
-f:arch/riscv/include/asm/kvm_vcpu_sbi.h
-f:arch/riscv/include/asm/kvm_vcpu_timer.h
-f:arch/riscv/include/asm/kvm_vcpu_vector.h
-f:arch/riscv/include/asm/kvm_vmid.h
-f:arch/riscv/include/asm/linkage.h
-f:arch/riscv/include/asm/membarrier.h
-f:arch/riscv/include/asm/mmio.h
-f:arch/riscv/include/asm/mmiowb.h
-f:arch/riscv/include/asm/mmu.h
-f:arch/riscv/include/asm/mmu_context.h
-f:arch/riscv/include/asm/module.h
-f:arch/riscv/include/asm/module.lds.h
-f:arch/riscv/include/asm/numa.h
-f:arch/riscv/include/asm/page.h
-f:arch/riscv/include/asm/paravirt.h
-f:arch/riscv/include/asm/paravirt_api_clock.h
-f:arch/riscv/include/asm/pci.h
-f:arch/riscv/include/asm/perf_event.h
-f:arch/riscv/include/asm/pgalloc.h
-f:arch/riscv/include/asm/pgtable-32.h
-f:arch/riscv/include/asm/pgtable-64.h
-f:arch/riscv/include/asm/pgtable-bits.h
-f:arch/riscv/include/asm/pgtable.h
-f:arch/riscv/include/asm/probes.h
-f:arch/riscv/include/asm/processor.h
-f:arch/riscv/include/asm/ptrace.h
-f:arch/riscv/include/asm/runtime-const.h
-f:arch/riscv/include/asm/sbi.h
-f:arch/riscv/include/asm/scs.h
-f:arch/riscv/include/asm/seccomp.h
-f:arch/riscv/include/asm/sections.h
-f:arch/riscv/include/asm/semihost.h
-f:arch/riscv/include/asm/set_memory.h
-f:arch/riscv/include/asm/signal32.h
-f:arch/riscv/include/asm/simd.h
-f:arch/riscv/include/asm/smp.h
-f:arch/riscv/include/asm/soc.h
-f:arch/riscv/include/asm/sparsemem.h
-f:arch/riscv/include/asm/spinlock.h
-f:arch/riscv/include/asm/stackprotector.h
-f:arch/riscv/include/asm/stacktrace.h
-f:arch/riscv/include/asm/string.h
-f:arch/riscv/include/asm/suspend.h
-f:arch/riscv/include/asm/switch_to.h
-f:arch/riscv/include/asm/sync_core.h
-f:arch/riscv/include/asm/syscall.h
-f:arch/riscv/include/asm/syscall_table.h
-f:arch/riscv/include/asm/syscall_wrapper.h
-f:arch/riscv/include/asm/text-patching.h
-f:arch/riscv/include/asm/thread_info.h
-f:arch/riscv/include/asm/timex.h
-f:arch/riscv/include/asm/tlb.h
-f:arch/riscv/include/asm/tlbbatch.h
-f:arch/riscv/include/asm/tlbflush.h
-f:arch/riscv/include/asm/topology.h
-f:arch/riscv/include/asm/trace.h
-f:arch/riscv/include/asm/uaccess.h
-f:arch/riscv/include/asm/unistd.h
-f:arch/riscv/include/asm/uprobes.h
-f:arch/riscv/include/asm/vdso.h
-f:arch/riscv/include/asm/vdso/arch_data.h
-f:arch/riscv/include/asm/vdso/clocksource.h
-f:arch/riscv/include/asm/vdso/getrandom.h
-f:arch/riscv/include/asm/vdso/gettimeofday.h
-f:arch/riscv/include/asm/vdso/processor.h
-f:arch/riscv/include/asm/vdso/vsyscall.h
-f:arch/riscv/include/asm/vector.h
-f:arch/riscv/include/asm/vendor_extensions.h
-f:arch/riscv/include/asm/vendor_extensions/andes.h
-f:arch/riscv/include/asm/vendor_extensions/sifive.h
-f:arch/riscv/include/asm/vendor_extensions/sifive_hwprobe.h
-f:arch/riscv/include/asm/vendor_extensions/thead.h
-f:arch/riscv/include/asm/vendor_extensions/thead_hwprobe.h
-f:arch/riscv/include/asm/vendor_extensions/vendor_hwprobe.h
-f:arch/riscv/include/asm/vendorid_list.h
-f:arch/riscv/include/asm/vermagic.h
-f:arch/riscv/include/asm/vmalloc.h
-f:arch/riscv/include/asm/word-at-a-time.h
-f:arch/riscv/include/asm/xip_fixup.h
-f:arch/riscv/include/asm/xor.h
-f:arch/riscv/include/uapi/asm/Kbuild
-f:arch/riscv/include/uapi/asm/auxvec.h
-f:arch/riscv/include/uapi/asm/bitsperlong.h
-f:arch/riscv/include/uapi/asm/bpf_perf_event.h
-f:arch/riscv/include/uapi/asm/byteorder.h
-f:arch/riscv/include/uapi/asm/elf.h
-f:arch/riscv/include/uapi/asm/hwcap.h
-f:arch/riscv/include/uapi/asm/hwprobe.h
-f:arch/riscv/include/uapi/asm/kvm.h
-f:arch/riscv/include/uapi/asm/perf_regs.h
-f:arch/riscv/include/uapi/asm/ptrace.h
-f:arch/riscv/include/uapi/asm/setup.h
-f:arch/riscv/include/uapi/asm/sigcontext.h
-f:arch/riscv/include/uapi/asm/ucontext.h
-f:arch/riscv/include/uapi/asm/unistd.h
-f:arch/riscv/include/uapi/asm/vendor/sifive.h
-f:arch/riscv/include/uapi/asm/vendor/thead.h
-f:arch/riscv/kernel/.gitignore
-f:arch/riscv/kernel/Makefile
-f:arch/riscv/kernel/Makefile.syscalls
-f:arch/riscv/kernel/acpi.c
-f:arch/riscv/kernel/acpi_numa.c
-f:arch/riscv/kernel/alternative.c
-f:arch/riscv/kernel/asm-offsets.c
-f:arch/riscv/kernel/bugs.c
-f:arch/riscv/kernel/cacheinfo.c
-f:arch/riscv/kernel/cfi.c
-f:arch/riscv/kernel/compat_signal.c
-f:arch/riscv/kernel/compat_syscall_table.c
-f:arch/riscv/kernel/compat_vdso/.gitignore
-f:arch/riscv/kernel/compat_vdso/Makefile
-f:arch/riscv/kernel/compat_vdso/compat_vdso.S
-f:arch/riscv/kernel/compat_vdso/compat_vdso.lds.S
-f:arch/riscv/kernel/compat_vdso/flush_icache.S
-f:arch/riscv/kernel/compat_vdso/gen_compat_vdso_offsets.sh
-f:arch/riscv/kernel/compat_vdso/getcpu.S
-f:arch/riscv/kernel/compat_vdso/note.S
-f:arch/riscv/kernel/compat_vdso/rt_sigreturn.S
-f:arch/riscv/kernel/copy-unaligned.S
-f:arch/riscv/kernel/copy-unaligned.h
-f:arch/riscv/kernel/cpu-hotplug.c
-f:arch/riscv/kernel/cpu.c
-f:arch/riscv/kernel/cpu_ops.c
-f:arch/riscv/kernel/cpu_ops_sbi.c
-f:arch/riscv/kernel/cpu_ops_spinwait.c
-f:arch/riscv/kernel/cpufeature.c
-f:arch/riscv/kernel/crash_dump.c
-f:arch/riscv/kernel/crash_save_regs.S
-f:arch/riscv/kernel/efi-header.S
-f:arch/riscv/kernel/efi.c
-f:arch/riscv/kernel/entry.S
-f:arch/riscv/kernel/fpu.S
-f:arch/riscv/kernel/ftrace.c
-f:arch/riscv/kernel/head.S
-f:arch/riscv/kernel/head.h
-f:arch/riscv/kernel/hibernate-asm.S
-f:arch/riscv/kernel/hibernate.c
-f:arch/riscv/kernel/image-vars.h
-f:arch/riscv/kernel/irq.c
-f:arch/riscv/kernel/jump_label.c
-f:arch/riscv/kernel/kernel_mode_fpu.c
-f:arch/riscv/kernel/kernel_mode_vector.c
-f:arch/riscv/kernel/kexec_elf.c
-f:arch/riscv/kernel/kexec_image.c
-f:arch/riscv/kernel/kexec_relocate.S
-f:arch/riscv/kernel/kgdb.c
-f:arch/riscv/kernel/machine_kexec.c
-f:arch/riscv/kernel/machine_kexec_file.c
-f:arch/riscv/kernel/mcount-dyn.S
-f:arch/riscv/kernel/mcount.S
-f:arch/riscv/kernel/module-sections.c
-f:arch/riscv/kernel/module.c
-f:arch/riscv/kernel/paravirt.c
-f:arch/riscv/kernel/patch.c
-f:arch/riscv/kernel/perf_callchain.c
-f:arch/riscv/kernel/perf_regs.c
-f:arch/riscv/kernel/pi/Makefile
-f:arch/riscv/kernel/pi/archrandom_early.c
-f:arch/riscv/kernel/pi/cmdline_early.c
-f:arch/riscv/kernel/pi/fdt_early.c
-f:arch/riscv/kernel/pi/pi.h
-f:arch/riscv/kernel/probes/Makefile
-f:arch/riscv/kernel/probes/decode-insn.c
-f:arch/riscv/kernel/probes/decode-insn.h
-f:arch/riscv/kernel/probes/kprobes.c
-f:arch/riscv/kernel/probes/rethook.c
-f:arch/riscv/kernel/probes/rethook.h
-f:arch/riscv/kernel/probes/rethook_trampoline.S
-f:arch/riscv/kernel/probes/simulate-insn.c
-f:arch/riscv/kernel/probes/simulate-insn.h
-f:arch/riscv/kernel/probes/uprobes.c
-f:arch/riscv/kernel/process.c
-f:arch/riscv/kernel/ptrace.c
-f:arch/riscv/kernel/reset.c
-f:arch/riscv/kernel/return_address.c
-f:arch/riscv/kernel/riscv_ksyms.c
-f:arch/riscv/kernel/sbi-ipi.c
-f:arch/riscv/kernel/sbi.c
-f:arch/riscv/kernel/sbi_ecall.c
-f:arch/riscv/kernel/setup.c
-f:arch/riscv/kernel/signal.c
-f:arch/riscv/kernel/smp.c
-f:arch/riscv/kernel/smpboot.c
-f:arch/riscv/kernel/soc.c
-f:arch/riscv/kernel/stacktrace.c
-f:arch/riscv/kernel/suspend.c
-f:arch/riscv/kernel/suspend_entry.S
-f:arch/riscv/kernel/sys_hwprobe.c
-f:arch/riscv/kernel/sys_riscv.c
-f:arch/riscv/kernel/syscall_table.c
-f:arch/riscv/kernel/tests/Kconfig.debug
-f:arch/riscv/kernel/tests/Makefile
-f:arch/riscv/kernel/tests/module_test/Makefile
-f:arch/riscv/kernel/tests/module_test/test_module_linking_main.c
-f:arch/riscv/kernel/tests/module_test/test_set16.S
-f:arch/riscv/kernel/tests/module_test/test_set32.S
-f:arch/riscv/kernel/tests/module_test/test_set6.S
-f:arch/riscv/kernel/tests/module_test/test_set8.S
-f:arch/riscv/kernel/tests/module_test/test_sub16.S
-f:arch/riscv/kernel/tests/module_test/test_sub32.S
-f:arch/riscv/kernel/tests/module_test/test_sub6.S
-f:arch/riscv/kernel/tests/module_test/test_sub64.S
-f:arch/riscv/kernel/tests/module_test/test_sub8.S
-f:arch/riscv/kernel/tests/module_test/test_uleb128.S
-f:arch/riscv/kernel/time.c
-f:arch/riscv/kernel/traps.c
-f:arch/riscv/kernel/traps_misaligned.c
-f:arch/riscv/kernel/unaligned_access_speed.c
-f:arch/riscv/kernel/vdso.c
-f:arch/riscv/kernel/vdso/.gitignore
-f:arch/riscv/kernel/vdso/Makefile
-f:arch/riscv/kernel/vdso/flush_icache.S
-f:arch/riscv/kernel/vdso/gen_vdso_offsets.sh
-f:arch/riscv/kernel/vdso/getcpu.S
-f:arch/riscv/kernel/vdso/getrandom.c
-f:arch/riscv/kernel/vdso/hwprobe.c
-f:arch/riscv/kernel/vdso/note.S
-f:arch/riscv/kernel/vdso/rt_sigreturn.S
-f:arch/riscv/kernel/vdso/sys_hwprobe.S
-f:arch/riscv/kernel/vdso/vdso.S
-f:arch/riscv/kernel/vdso/vdso.lds.S
-f:arch/riscv/kernel/vdso/vgetrandom-chacha.S
-f:arch/riscv/kernel/vdso/vgettimeofday.c
-f:arch/riscv/kernel/vec-copy-unaligned.S
-f:arch/riscv/kernel/vector.c
-f:arch/riscv/kernel/vendor_extensions.c
-f:arch/riscv/kernel/vendor_extensions/Makefile
-f:arch/riscv/kernel/vendor_extensions/andes.c
-f:arch/riscv/kernel/vendor_extensions/sifive.c
-f:arch/riscv/kernel/vendor_extensions/sifive_hwprobe.c
-f:arch/riscv/kernel/vendor_extensions/thead.c
-f:arch/riscv/kernel/vendor_extensions/thead_hwprobe.c
-f:arch/riscv/kernel/vmcore_info.c
-f:arch/riscv/kernel/vmlinux-xip.lds.S
-f:arch/riscv/kernel/vmlinux.lds.S
-f:arch/riscv/kvm/Kconfig
-f:arch/riscv/kvm/Makefile
-f:arch/riscv/kvm/aia.c
-f:arch/riscv/kvm/aia_aplic.c
-f:arch/riscv/kvm/aia_device.c
-f:arch/riscv/kvm/aia_imsic.c
-f:arch/riscv/kvm/gstage.c
-f:arch/riscv/kvm/main.c
-f:arch/riscv/kvm/mmu.c
-f:arch/riscv/kvm/nacl.c
-f:arch/riscv/kvm/tlb.c
-f:arch/riscv/kvm/trace.h
-f:arch/riscv/kvm/vcpu.c
-f:arch/riscv/kvm/vcpu_exit.c
-f:arch/riscv/kvm/vcpu_fp.c
-f:arch/riscv/kvm/vcpu_insn.c
-f:arch/riscv/kvm/vcpu_onereg.c
-f:arch/riscv/kvm/vcpu_pmu.c
-f:arch/riscv/kvm/vcpu_sbi.c
-f:arch/riscv/kvm/vcpu_sbi_base.c
-f:arch/riscv/kvm/vcpu_sbi_hsm.c
-f:arch/riscv/kvm/vcpu_sbi_pmu.c
-f:arch/riscv/kvm/vcpu_sbi_replace.c
-f:arch/riscv/kvm/vcpu_sbi_sta.c
-f:arch/riscv/kvm/vcpu_sbi_system.c
-f:arch/riscv/kvm/vcpu_sbi_v01.c
-f:arch/riscv/kvm/vcpu_switch.S
-f:arch/riscv/kvm/vcpu_timer.c
-f:arch/riscv/kvm/vcpu_vector.c
-f:arch/riscv/kvm/vm.c
-f:arch/riscv/kvm/vmid.c
-f:arch/riscv/lib/Makefile
-f:arch/riscv/lib/clear_page.S
-f:arch/riscv/lib/csum.c
-f:arch/riscv/lib/delay.c
-f:arch/riscv/lib/error-inject.c
-f:arch/riscv/lib/memcpy.S
-f:arch/riscv/lib/memmove.S
-f:arch/riscv/lib/memset.S
-f:arch/riscv/lib/riscv_v_helpers.c
-f:arch/riscv/lib/strcmp.S
-f:arch/riscv/lib/strlen.S
-f:arch/riscv/lib/strncmp.S
-f:arch/riscv/lib/tishift.S
-f:arch/riscv/lib/uaccess.S
-f:arch/riscv/lib/uaccess_vector.S
-f:arch/riscv/lib/xor.S
-f:arch/riscv/mm/Makefile
-f:arch/riscv/mm/cache-ops.c
-f:arch/riscv/mm/cacheflush.c
-f:arch/riscv/mm/context.c
-f:arch/riscv/mm/dma-noncoherent.c
-f:arch/riscv/mm/extable.c
-f:arch/riscv/mm/fault.c
-f:arch/riscv/mm/hugetlbpage.c
-f:arch/riscv/mm/init.c
-f:arch/riscv/mm/kasan_init.c
-f:arch/riscv/mm/pageattr.c
-f:arch/riscv/mm/pgtable.c
-f:arch/riscv/mm/physaddr.c
-f:arch/riscv/mm/pmem.c
-f:arch/riscv/mm/ptdump.c
-f:arch/riscv/mm/tlbflush.c
-f:arch/riscv/net/Makefile
-f:arch/riscv/net/bpf_jit.h
-f:arch/riscv/net/bpf_jit_comp32.c
-f:arch/riscv/net/bpf_jit_comp64.c
-f:arch/riscv/net/bpf_jit_core.c
-f:arch/riscv/purgatory/.gitignore
-f:arch/riscv/purgatory/Makefile
-f:arch/riscv/purgatory/entry.S
-f:arch/riscv/purgatory/kexec-purgatory.S
-f:arch/riscv/purgatory/purgatory.c
-f:arch/riscv/tools/relocs_check.sh
-f:arch/s390/Kbuild
-f:arch/s390/Kconfig
-f:arch/s390/Kconfig.debug
-f:arch/s390/Makefile
-f:arch/s390/Makefile.postlink
-f:arch/s390/appldata/Makefile
-f:arch/s390/appldata/appldata.h
-f:arch/s390/appldata/appldata_base.c
-f:arch/s390/appldata/appldata_mem.c
-f:arch/s390/appldata/appldata_net_sum.c
-f:arch/s390/appldata/appldata_os.c
-f:arch/s390/boot/.gitignore
-f:arch/s390/boot/Makefile
-f:arch/s390/boot/als.c
-f:arch/s390/boot/alternative.c
-f:arch/s390/boot/boot.h
-f:arch/s390/boot/clz_ctz.c
-f:arch/s390/boot/cmdline.c
-f:arch/s390/boot/ctype.c
-f:arch/s390/boot/decompressor.c
-f:arch/s390/boot/decompressor.h
-f:arch/s390/boot/ebcdic.c
-f:arch/s390/boot/head.S
-f:arch/s390/boot/head_kdump.S
-f:arch/s390/boot/install.sh
-f:arch/s390/boot/ipl_data.c
-f:arch/s390/boot/ipl_parm.c
-f:arch/s390/boot/ipl_report.c
-f:arch/s390/boot/ipl_vmparm.c
-f:arch/s390/boot/kaslr.c
-f:arch/s390/boot/kmsan.c
-f:arch/s390/boot/machine_kexec_reloc.c
-f:arch/s390/boot/mem.S
-f:arch/s390/boot/pgm_check.c
-f:arch/s390/boot/physmem_info.c
-f:arch/s390/boot/printk.c
-f:arch/s390/boot/sclp_early_core.c
-f:arch/s390/boot/startup.c
-f:arch/s390/boot/string.c
-f:arch/s390/boot/trampoline.S
-f:arch/s390/boot/uv.c
-f:arch/s390/boot/uv.h
-f:arch/s390/boot/version.c
-f:arch/s390/boot/vmem.c
-f:arch/s390/boot/vmlinux.lds.S
-f:arch/s390/configs/btf.config
-f:arch/s390/configs/compat.config
-f:arch/s390/configs/debug_defconfig
-f:arch/s390/configs/defconfig
-f:arch/s390/configs/kasan.config
-f:arch/s390/configs/mmtypes.config
-f:arch/s390/configs/zfcpdump_defconfig
-f:arch/s390/crypto/Kconfig
-f:arch/s390/crypto/Makefile
-f:arch/s390/crypto/aes_s390.c
-f:arch/s390/crypto/arch_random.c
-f:arch/s390/crypto/des_s390.c
-f:arch/s390/crypto/ghash_s390.c
-f:arch/s390/crypto/hmac_s390.c
-f:arch/s390/crypto/paes_s390.c
-f:arch/s390/crypto/phmac_s390.c
-f:arch/s390/crypto/prng.c
-f:arch/s390/crypto/sha.h
-f:arch/s390/crypto/sha3_256_s390.c
-f:arch/s390/crypto/sha3_512_s390.c
-f:arch/s390/crypto/sha_common.c
-f:arch/s390/hypfs/Makefile
-f:arch/s390/hypfs/hypfs.h
-f:arch/s390/hypfs/hypfs_dbfs.c
-f:arch/s390/hypfs/hypfs_diag.c
-f:arch/s390/hypfs/hypfs_diag.h
-f:arch/s390/hypfs/hypfs_diag0c.c
-f:arch/s390/hypfs/hypfs_diag_fs.c
-f:arch/s390/hypfs/hypfs_sprp.c
-f:arch/s390/hypfs/hypfs_vm.c
-f:arch/s390/hypfs/hypfs_vm.h
-f:arch/s390/hypfs/hypfs_vm_fs.c
-f:arch/s390/hypfs/inode.c
-f:arch/s390/include/asm/Kbuild
-f:arch/s390/include/asm/abs_lowcore.h
-f:arch/s390/include/asm/access-regs.h
-f:arch/s390/include/asm/airq.h
-f:arch/s390/include/asm/alternative.h
-f:arch/s390/include/asm/ap.h
-f:arch/s390/include/asm/appldata.h
-f:arch/s390/include/asm/arch_hweight.h
-f:arch/s390/include/asm/archrandom.h
-f:arch/s390/include/asm/asce.h
-f:arch/s390/include/asm/asm-const.h
-f:arch/s390/include/asm/asm-extable.h
-f:arch/s390/include/asm/asm-prototypes.h
-f:arch/s390/include/asm/asm.h
-f:arch/s390/include/asm/atomic.h
-f:arch/s390/include/asm/atomic_ops.h
-f:arch/s390/include/asm/barrier.h
-f:arch/s390/include/asm/bitops.h
-f:arch/s390/include/asm/boot_data.h
-f:arch/s390/include/asm/bug.h
-f:arch/s390/include/asm/cache.h
-f:arch/s390/include/asm/ccwdev.h
-f:arch/s390/include/asm/ccwgroup.h
-f:arch/s390/include/asm/checksum.h
-f:arch/s390/include/asm/chpid.h
-f:arch/s390/include/asm/chsc.h
-f:arch/s390/include/asm/cio.h
-f:arch/s390/include/asm/clocksource.h
-f:arch/s390/include/asm/clp.h
-f:arch/s390/include/asm/cmb.h
-f:arch/s390/include/asm/cmpxchg.h
-f:arch/s390/include/asm/compat.h
-f:arch/s390/include/asm/cpacf.h
-f:arch/s390/include/asm/cpcmd.h
-f:arch/s390/include/asm/cpu.h
-f:arch/s390/include/asm/cpu_mf-insn.h
-f:arch/s390/include/asm/cpu_mf.h
-f:arch/s390/include/asm/cpufeature.h
-f:arch/s390/include/asm/cputime.h
-f:arch/s390/include/asm/crw.h
-f:arch/s390/include/asm/css_chars.h
-f:arch/s390/include/asm/ctlreg.h
-f:arch/s390/include/asm/current.h
-f:arch/s390/include/asm/dat-bits.h
-f:arch/s390/include/asm/debug.h
-f:arch/s390/include/asm/delay.h
-f:arch/s390/include/asm/diag.h
-f:arch/s390/include/asm/diag288.h
-f:arch/s390/include/asm/dis.h
-f:arch/s390/include/asm/dma-types.h
-f:arch/s390/include/asm/dma.h
-f:arch/s390/include/asm/dwarf.h
-f:arch/s390/include/asm/eadm.h
-f:arch/s390/include/asm/ebcdic.h
-f:arch/s390/include/asm/elf.h
-f:arch/s390/include/asm/entry-common.h
-f:arch/s390/include/asm/exec.h
-f:arch/s390/include/asm/extable.h
-f:arch/s390/include/asm/extmem.h
-f:arch/s390/include/asm/facility.h
-f:arch/s390/include/asm/fault.h
-f:arch/s390/include/asm/fcx.h
-f:arch/s390/include/asm/fprobe.h
-f:arch/s390/include/asm/fpu-insn-asm.h
-f:arch/s390/include/asm/fpu-insn.h
-f:arch/s390/include/asm/fpu-types.h
-f:arch/s390/include/asm/fpu.h
-f:arch/s390/include/asm/ftrace.h
-f:arch/s390/include/asm/ftrace.lds.h
-f:arch/s390/include/asm/futex.h
-f:arch/s390/include/asm/gmap.h
-f:arch/s390/include/asm/gmap_helpers.h
-f:arch/s390/include/asm/hardirq.h
-f:arch/s390/include/asm/hiperdispatch.h
-f:arch/s390/include/asm/hugetlb.h
-f:arch/s390/include/asm/hw_irq.h
-f:arch/s390/include/asm/idals.h
-f:arch/s390/include/asm/idle.h
-f:arch/s390/include/asm/io.h
-f:arch/s390/include/asm/ipl.h
-f:arch/s390/include/asm/irq.h
-f:arch/s390/include/asm/irq_work.h
-f:arch/s390/include/asm/irqflags.h
-f:arch/s390/include/asm/isc.h
-f:arch/s390/include/asm/itcw.h
-f:arch/s390/include/asm/jump_label.h
-f:arch/s390/include/asm/kasan.h
-f:arch/s390/include/asm/kdebug.h
-f:arch/s390/include/asm/kexec.h
-f:arch/s390/include/asm/kfence.h
-f:arch/s390/include/asm/kmsan.h
-f:arch/s390/include/asm/kprobes.h
-f:arch/s390/include/asm/kvm_host.h
-f:arch/s390/include/asm/kvm_host_types.h
-f:arch/s390/include/asm/kvm_para.h
-f:arch/s390/include/asm/linkage.h
-f:arch/s390/include/asm/lowcore.h
-f:arch/s390/include/asm/maccess.h
-f:arch/s390/include/asm/machine.h
-f:arch/s390/include/asm/march.h
-f:arch/s390/include/asm/mem_encrypt.h
-f:arch/s390/include/asm/mmu.h
-f:arch/s390/include/asm/mmu_context.h
-f:arch/s390/include/asm/module.h
-f:arch/s390/include/asm/msi.h
-f:arch/s390/include/asm/nmi.h
-f:arch/s390/include/asm/nospec-branch.h
-f:arch/s390/include/asm/nospec-insn.h
-f:arch/s390/include/asm/numa.h
-f:arch/s390/include/asm/os_info.h
-f:arch/s390/include/asm/page-states.h
-f:arch/s390/include/asm/page.h
-f:arch/s390/include/asm/pai.h
-f:arch/s390/include/asm/pci.h
-f:arch/s390/include/asm/pci_clp.h
-f:arch/s390/include/asm/pci_debug.h
-f:arch/s390/include/asm/pci_dma.h
-f:arch/s390/include/asm/pci_insn.h
-f:arch/s390/include/asm/pci_io.h
-f:arch/s390/include/asm/percpu.h
-f:arch/s390/include/asm/perf_event.h
-f:arch/s390/include/asm/pfault.h
-f:arch/s390/include/asm/pgalloc.h
-f:arch/s390/include/asm/pgtable.h
-f:arch/s390/include/asm/physmem_info.h
-f:arch/s390/include/asm/pkey.h
-f:arch/s390/include/asm/pnet.h
-f:arch/s390/include/asm/preempt.h
-f:arch/s390/include/asm/processor.h
-f:arch/s390/include/asm/ptrace.h
-f:arch/s390/include/asm/purgatory.h
-f:arch/s390/include/asm/qdio.h
-f:arch/s390/include/asm/runtime-const.h
-f:arch/s390/include/asm/runtime_instr.h
-f:arch/s390/include/asm/rwonce.h
-f:arch/s390/include/asm/schid.h
-f:arch/s390/include/asm/sclp.h
-f:arch/s390/include/asm/scsw.h
-f:arch/s390/include/asm/seccomp.h
-f:arch/s390/include/asm/sections.h
-f:arch/s390/include/asm/set_memory.h
-f:arch/s390/include/asm/setup.h
-f:arch/s390/include/asm/signal.h
-f:arch/s390/include/asm/sigp.h
-f:arch/s390/include/asm/skey.h
-f:arch/s390/include/asm/smp.h
-f:arch/s390/include/asm/softirq_stack.h
-f:arch/s390/include/asm/sparsemem.h
-f:arch/s390/include/asm/spinlock.h
-f:arch/s390/include/asm/spinlock_types.h
-f:arch/s390/include/asm/stacktrace.h
-f:arch/s390/include/asm/stp.h
-f:arch/s390/include/asm/string.h
-f:arch/s390/include/asm/syscall.h
-f:arch/s390/include/asm/syscall_wrapper.h
-f:arch/s390/include/asm/sysinfo.h
-f:arch/s390/include/asm/text-patching.h
-f:arch/s390/include/asm/thread_info.h
-f:arch/s390/include/asm/timex.h
-f:arch/s390/include/asm/tlb.h
-f:arch/s390/include/asm/tlbflush.h
-f:arch/s390/include/asm/topology.h
-f:arch/s390/include/asm/tpi.h
-f:arch/s390/include/asm/trace/diag.h
-f:arch/s390/include/asm/trace/hiperdispatch.h
-f:arch/s390/include/asm/trace/zcrypt.h
-f:arch/s390/include/asm/types.h
-f:arch/s390/include/asm/uaccess.h
-f:arch/s390/include/asm/unistd.h
-f:arch/s390/include/asm/unwind.h
-f:arch/s390/include/asm/uprobes.h
-f:arch/s390/include/asm/user.h
-f:arch/s390/include/asm/uv.h
-f:arch/s390/include/asm/vdso-symbols.h
-f:arch/s390/include/asm/vdso.h
-f:arch/s390/include/asm/vdso/clocksource.h
-f:arch/s390/include/asm/vdso/getrandom.h
-f:arch/s390/include/asm/vdso/gettimeofday.h
-f:arch/s390/include/asm/vdso/processor.h
-f:arch/s390/include/asm/vdso/time_data.h
-f:arch/s390/include/asm/vdso/vsyscall.h
-f:arch/s390/include/asm/vmalloc.h
-f:arch/s390/include/asm/vmlinux.lds.h
-f:arch/s390/include/asm/vtime.h
-f:arch/s390/include/asm/vtimer.h
-f:arch/s390/include/asm/word-at-a-time.h
-f:arch/s390/include/asm/xor.h
-f:arch/s390/include/uapi/asm/Kbuild
-f:arch/s390/include/uapi/asm/auxvec.h
-f:arch/s390/include/uapi/asm/bitsperlong.h
-f:arch/s390/include/uapi/asm/bpf_perf_event.h
-f:arch/s390/include/uapi/asm/byteorder.h
-f:arch/s390/include/uapi/asm/chpid.h
-f:arch/s390/include/uapi/asm/chsc.h
-f:arch/s390/include/uapi/asm/clp.h
-f:arch/s390/include/uapi/asm/cmb.h
-f:arch/s390/include/uapi/asm/dasd.h
-f:arch/s390/include/uapi/asm/diag.h
-f:arch/s390/include/uapi/asm/fs3270.h
-f:arch/s390/include/uapi/asm/guarded_storage.h
-f:arch/s390/include/uapi/asm/hwctrset.h
-f:arch/s390/include/uapi/asm/hypfs.h
-f:arch/s390/include/uapi/asm/ioctls.h
-f:arch/s390/include/uapi/asm/ipcbuf.h
-f:arch/s390/include/uapi/asm/ipl.h
-f:arch/s390/include/uapi/asm/kvm.h
-f:arch/s390/include/uapi/asm/kvm_para.h
-f:arch/s390/include/uapi/asm/kvm_perf.h
-f:arch/s390/include/uapi/asm/monwriter.h
-f:arch/s390/include/uapi/asm/perf_regs.h
-f:arch/s390/include/uapi/asm/pkey.h
-f:arch/s390/include/uapi/asm/posix_types.h
-f:arch/s390/include/uapi/asm/ptrace.h
-f:arch/s390/include/uapi/asm/qeth.h
-f:arch/s390/include/uapi/asm/raw3270.h
-f:arch/s390/include/uapi/asm/runtime_instr.h
-f:arch/s390/include/uapi/asm/schid.h
-f:arch/s390/include/uapi/asm/sclp_ctl.h
-f:arch/s390/include/uapi/asm/setup.h
-f:arch/s390/include/uapi/asm/sie.h
-f:arch/s390/include/uapi/asm/sigcontext.h
-f:arch/s390/include/uapi/asm/signal.h
-f:arch/s390/include/uapi/asm/stat.h
-f:arch/s390/include/uapi/asm/statfs.h
-f:arch/s390/include/uapi/asm/sthyi.h
-f:arch/s390/include/uapi/asm/tape390.h
-f:arch/s390/include/uapi/asm/types.h
-f:arch/s390/include/uapi/asm/ucontext.h
-f:arch/s390/include/uapi/asm/unistd.h
-f:arch/s390/include/uapi/asm/uvdevice.h
-f:arch/s390/include/uapi/asm/virtio-ccw.h
-f:arch/s390/include/uapi/asm/vmcp.h
-f:arch/s390/include/uapi/asm/vtoc.h
-f:arch/s390/include/uapi/asm/zcrypt.h
-f:arch/s390/kernel/.gitignore
-f:arch/s390/kernel/Makefile
-f:arch/s390/kernel/abs_lowcore.c
-f:arch/s390/kernel/alternative.c
-f:arch/s390/kernel/asm-offsets.c
-f:arch/s390/kernel/audit.c
-f:arch/s390/kernel/audit.h
-f:arch/s390/kernel/cache.c
-f:arch/s390/kernel/cert_store.c
-f:arch/s390/kernel/compat_audit.c
-f:arch/s390/kernel/compat_linux.c
-f:arch/s390/kernel/compat_linux.h
-f:arch/s390/kernel/compat_ptrace.h
-f:arch/s390/kernel/compat_signal.c
-f:arch/s390/kernel/cpacf.c
-f:arch/s390/kernel/cpcmd.c
-f:arch/s390/kernel/cpufeature.c
-f:arch/s390/kernel/crash_dump.c
-f:arch/s390/kernel/ctlreg.c
-f:arch/s390/kernel/debug.c
-f:arch/s390/kernel/diag/Makefile
-f:arch/s390/kernel/diag/diag.c
-f:arch/s390/kernel/diag/diag310.c
-f:arch/s390/kernel/diag/diag324.c
-f:arch/s390/kernel/diag/diag_ioctl.h
-f:arch/s390/kernel/diag/diag_misc.c
-f:arch/s390/kernel/dis.c
-f:arch/s390/kernel/dumpstack.c
-f:arch/s390/kernel/early.c
-f:arch/s390/kernel/early_printk.c
-f:arch/s390/kernel/ebcdic.c
-f:arch/s390/kernel/entry.S
-f:arch/s390/kernel/entry.h
-f:arch/s390/kernel/facility.c
-f:arch/s390/kernel/fpu.c
-f:arch/s390/kernel/ftrace.c
-f:arch/s390/kernel/ftrace.h
-f:arch/s390/kernel/guarded_storage.c
-f:arch/s390/kernel/head64.S
-f:arch/s390/kernel/hiperdispatch.c
-f:arch/s390/kernel/idle.c
-f:arch/s390/kernel/ima_arch.c
-f:arch/s390/kernel/ipl.c
-f:arch/s390/kernel/ipl_vmparm.c
-f:arch/s390/kernel/irq.c
-f:arch/s390/kernel/jump_label.c
-f:arch/s390/kernel/kdebugfs.c
-f:arch/s390/kernel/kexec_elf.c
-f:arch/s390/kernel/kexec_image.c
-f:arch/s390/kernel/kprobes.c
-f:arch/s390/kernel/lgr.c
-f:arch/s390/kernel/machine_kexec.c
-f:arch/s390/kernel/machine_kexec_file.c
-f:arch/s390/kernel/machine_kexec_reloc.c
-f:arch/s390/kernel/mcount.S
-f:arch/s390/kernel/module.c
-f:arch/s390/kernel/nmi.c
-f:arch/s390/kernel/nospec-branch.c
-f:arch/s390/kernel/nospec-sysfs.c
-f:arch/s390/kernel/numa.c
-f:arch/s390/kernel/os_info.c
-f:arch/s390/kernel/perf_cpum_cf.c
-f:arch/s390/kernel/perf_cpum_cf_events.c
-f:arch/s390/kernel/perf_cpum_sf.c
-f:arch/s390/kernel/perf_event.c
-f:arch/s390/kernel/perf_pai_crypto.c
-f:arch/s390/kernel/perf_pai_ext.c
-f:arch/s390/kernel/perf_regs.c
-f:arch/s390/kernel/process.c
-f:arch/s390/kernel/processor.c
-f:arch/s390/kernel/ptrace.c
-f:arch/s390/kernel/reipl.S
-f:arch/s390/kernel/relocate_kernel.S
-f:arch/s390/kernel/rethook.c
-f:arch/s390/kernel/rethook.h
-f:arch/s390/kernel/runtime_instr.c
-f:arch/s390/kernel/setup.c
-f:arch/s390/kernel/signal.c
-f:arch/s390/kernel/skey.c
-f:arch/s390/kernel/smp.c
-f:arch/s390/kernel/stacktrace.c
-f:arch/s390/kernel/sthyi.c
-f:arch/s390/kernel/syscall.c
-f:arch/s390/kernel/syscalls/Makefile
-f:arch/s390/kernel/syscalls/syscall.tbl
-f:arch/s390/kernel/syscalls/syscalltbl
-f:arch/s390/kernel/sysinfo.c
-f:arch/s390/kernel/text_amode31.S
-f:arch/s390/kernel/time.c
-f:arch/s390/kernel/topology.c
-f:arch/s390/kernel/trace.c
-f:arch/s390/kernel/traps.c
-f:arch/s390/kernel/unwind_bc.c
-f:arch/s390/kernel/uprobes.c
-f:arch/s390/kernel/uv.c
-f:arch/s390/kernel/vdso.c
-f:arch/s390/kernel/vdso32/.gitignore
-f:arch/s390/kernel/vdso32/Makefile
-f:arch/s390/kernel/vdso32/gen_vdso_offsets.sh
-f:arch/s390/kernel/vdso32/note.S
-f:arch/s390/kernel/vdso32/vdso32.lds.S
-f:arch/s390/kernel/vdso32/vdso32_wrapper.S
-f:arch/s390/kernel/vdso32/vdso_user_wrapper.S
-f:arch/s390/kernel/vdso64/.gitignore
-f:arch/s390/kernel/vdso64/Makefile
-f:arch/s390/kernel/vdso64/gen_vdso_offsets.sh
-f:arch/s390/kernel/vdso64/getcpu.c
-f:arch/s390/kernel/vdso64/note.S
-f:arch/s390/kernel/vdso64/vdso.h
-f:arch/s390/kernel/vdso64/vdso64.lds.S
-f:arch/s390/kernel/vdso64/vdso64_generic.c
-f:arch/s390/kernel/vdso64/vdso64_wrapper.S
-f:arch/s390/kernel/vdso64/vdso_user_wrapper.S
-f:arch/s390/kernel/vdso64/vgetrandom-chacha.S
-f:arch/s390/kernel/vdso64/vgetrandom.c
-f:arch/s390/kernel/vmcore_info.c
-f:arch/s390/kernel/vmlinux.lds.S
-f:arch/s390/kernel/vtime.c
-f:arch/s390/kernel/wti.c
-f:arch/s390/kvm/Kconfig
-f:arch/s390/kvm/Makefile
-f:arch/s390/kvm/diag.c
-f:arch/s390/kvm/gaccess.c
-f:arch/s390/kvm/gaccess.h
-f:arch/s390/kvm/gmap-vsie.c
-f:arch/s390/kvm/guestdbg.c
-f:arch/s390/kvm/intercept.c
-f:arch/s390/kvm/interrupt.c
-f:arch/s390/kvm/kvm-s390.c
-f:arch/s390/kvm/kvm-s390.h
-f:arch/s390/kvm/pci.c
-f:arch/s390/kvm/pci.h
-f:arch/s390/kvm/priv.c
-f:arch/s390/kvm/pv.c
-f:arch/s390/kvm/sigp.c
-f:arch/s390/kvm/trace-s390.h
-f:arch/s390/kvm/trace.h
-f:arch/s390/kvm/vsie.c
-f:arch/s390/lib/Makefile
-f:arch/s390/lib/csum-partial.c
-f:arch/s390/lib/delay.c
-f:arch/s390/lib/error-inject.c
-f:arch/s390/lib/expoline.S
-f:arch/s390/lib/find.c
-f:arch/s390/lib/mem.S
-f:arch/s390/lib/probes.c
-f:arch/s390/lib/spinlock.c
-f:arch/s390/lib/string.c
-f:arch/s390/lib/test_kprobes.c
-f:arch/s390/lib/test_kprobes.h
-f:arch/s390/lib/test_kprobes_asm.S
-f:arch/s390/lib/test_modules.c
-f:arch/s390/lib/test_modules.h
-f:arch/s390/lib/test_modules_helpers.c
-f:arch/s390/lib/test_unwind.c
-f:arch/s390/lib/tishift.S
-f:arch/s390/lib/uaccess.c
-f:arch/s390/lib/xor.c
-f:arch/s390/mm/Makefile
-f:arch/s390/mm/cmm.c
-f:arch/s390/mm/dump_pagetables.c
-f:arch/s390/mm/extable.c
-f:arch/s390/mm/extmem.c
-f:arch/s390/mm/fault.c
-f:arch/s390/mm/gmap.c
-f:arch/s390/mm/gmap_helpers.c
-f:arch/s390/mm/hugetlbpage.c
-f:arch/s390/mm/init.c
-f:arch/s390/mm/maccess.c
-f:arch/s390/mm/mmap.c
-f:arch/s390/mm/page-states.c
-f:arch/s390/mm/pageattr.c
-f:arch/s390/mm/pfault.c
-f:arch/s390/mm/pgalloc.c
-f:arch/s390/mm/pgtable.c
-f:arch/s390/mm/physaddr.c
-f:arch/s390/mm/vmem.c
-f:arch/s390/net/Makefile
-f:arch/s390/net/bpf_jit_comp.c
-f:arch/s390/net/pnet.c
-f:arch/s390/pci/Makefile
-f:arch/s390/pci/pci.c
-f:arch/s390/pci/pci_bus.c
-f:arch/s390/pci/pci_bus.h
-f:arch/s390/pci/pci_clp.c
-f:arch/s390/pci/pci_debug.c
-f:arch/s390/pci/pci_event.c
-f:arch/s390/pci/pci_fixup.c
-f:arch/s390/pci/pci_insn.c
-f:arch/s390/pci/pci_iov.c
-f:arch/s390/pci/pci_iov.h
-f:arch/s390/pci/pci_irq.c
-f:arch/s390/pci/pci_kvm_hook.c
-f:arch/s390/pci/pci_mmio.c
-f:arch/s390/pci/pci_report.c
-f:arch/s390/pci/pci_report.h
-f:arch/s390/pci/pci_sysfs.c
-f:arch/s390/purgatory/.gitignore
-f:arch/s390/purgatory/Makefile
-f:arch/s390/purgatory/head.S
-f:arch/s390/purgatory/kexec-purgatory.S
-f:arch/s390/purgatory/purgatory.c
-f:arch/s390/purgatory/purgatory.lds.S
-f:arch/s390/purgatory/string.c
-f:arch/s390/tools/.gitignore
-f:arch/s390/tools/Makefile
-f:arch/s390/tools/gcc-thunk-extern.sh
-f:arch/s390/tools/gen_facilities.c
-f:arch/s390/tools/gen_opcode_table.c
-f:arch/s390/tools/opcodes.txt
-f:arch/s390/tools/relocs.c
-f:arch/sh/Kbuild
-f:arch/sh/Kconfig
-f:arch/sh/Kconfig.cpu
-f:arch/sh/Kconfig.debug
-f:arch/sh/Makefile
-f:arch/sh/boards/Kconfig
-f:arch/sh/boards/Makefile
-f:arch/sh/boards/board-apsh4a3a.c
-f:arch/sh/boards/board-apsh4ad0a.c
-f:arch/sh/boards/board-edosk7705.c
-f:arch/sh/boards/board-edosk7760.c
-f:arch/sh/boards/board-espt.c
-f:arch/sh/boards/board-magicpanelr2.c
-f:arch/sh/boards/board-polaris.c
-f:arch/sh/boards/board-secureedge5410.c
-f:arch/sh/boards/board-sh2007.c
-f:arch/sh/boards/board-sh7757lcr.c
-f:arch/sh/boards/board-sh7785lcr.c
-f:arch/sh/boards/board-shmin.c
-f:arch/sh/boards/board-titan.c
-f:arch/sh/boards/board-urquell.c
-f:arch/sh/boards/mach-ap325rxa/Makefile
-f:arch/sh/boards/mach-ap325rxa/sdram.S
-f:arch/sh/boards/mach-ap325rxa/setup.c
-f:arch/sh/boards/mach-dreamcast/Makefile
-f:arch/sh/boards/mach-dreamcast/irq.c
-f:arch/sh/boards/mach-dreamcast/rtc.c
-f:arch/sh/boards/mach-dreamcast/setup.c
-f:arch/sh/boards/mach-ecovec24/Makefile
-f:arch/sh/boards/mach-ecovec24/sdram.S
-f:arch/sh/boards/mach-ecovec24/setup.c
-f:arch/sh/boards/mach-highlander/Kconfig
-f:arch/sh/boards/mach-highlander/Makefile
-f:arch/sh/boards/mach-highlander/irq-r7780mp.c
-f:arch/sh/boards/mach-highlander/irq-r7780rp.c
-f:arch/sh/boards/mach-highlander/irq-r7785rp.c
-f:arch/sh/boards/mach-highlander/pinmux-r7785rp.c
-f:arch/sh/boards/mach-highlander/psw.c
-f:arch/sh/boards/mach-highlander/setup.c
-f:arch/sh/boards/mach-hp6xx/Makefile
-f:arch/sh/boards/mach-hp6xx/hp6xx_apm.c
-f:arch/sh/boards/mach-hp6xx/pm.c
-f:arch/sh/boards/mach-hp6xx/pm_wakeup.S
-f:arch/sh/boards/mach-hp6xx/setup.c
-f:arch/sh/boards/mach-kfr2r09/Makefile
-f:arch/sh/boards/mach-kfr2r09/lcd_wqvga.c
-f:arch/sh/boards/mach-kfr2r09/sdram.S
-f:arch/sh/boards/mach-kfr2r09/setup.c
-f:arch/sh/boards/mach-landisk/Makefile
-f:arch/sh/boards/mach-landisk/gio.c
-f:arch/sh/boards/mach-landisk/irq.c
-f:arch/sh/boards/mach-landisk/psw.c
-f:arch/sh/boards/mach-landisk/setup.c
-f:arch/sh/boards/mach-lboxre2/Makefile
-f:arch/sh/boards/mach-lboxre2/irq.c
-f:arch/sh/boards/mach-lboxre2/setup.c
-f:arch/sh/boards/mach-migor/Kconfig
-f:arch/sh/boards/mach-migor/Makefile
-f:arch/sh/boards/mach-migor/lcd_qvga.c
-f:arch/sh/boards/mach-migor/sdram.S
-f:arch/sh/boards/mach-migor/setup.c
-f:arch/sh/boards/mach-r2d/Kconfig
-f:arch/sh/boards/mach-r2d/Makefile
-f:arch/sh/boards/mach-r2d/irq.c
-f:arch/sh/boards/mach-r2d/setup.c
-f:arch/sh/boards/mach-rsk/Kconfig
-f:arch/sh/boards/mach-rsk/Makefile
-f:arch/sh/boards/mach-rsk/devices-rsk7203.c
-f:arch/sh/boards/mach-rsk/devices-rsk7264.c
-f:arch/sh/boards/mach-rsk/devices-rsk7269.c
-f:arch/sh/boards/mach-rsk/setup.c
-f:arch/sh/boards/mach-sdk7780/Kconfig
-f:arch/sh/boards/mach-sdk7780/Makefile
-f:arch/sh/boards/mach-sdk7780/irq.c
-f:arch/sh/boards/mach-sdk7780/setup.c
-f:arch/sh/boards/mach-sdk7786/Makefile
-f:arch/sh/boards/mach-sdk7786/fpga.c
-f:arch/sh/boards/mach-sdk7786/gpio.c
-f:arch/sh/boards/mach-sdk7786/irq.c
-f:arch/sh/boards/mach-sdk7786/nmi.c
-f:arch/sh/boards/mach-sdk7786/setup.c
-f:arch/sh/boards/mach-sdk7786/sram.c
-f:arch/sh/boards/mach-se/7206/Makefile
-f:arch/sh/boards/mach-se/7206/irq.c
-f:arch/sh/boards/mach-se/7206/setup.c
-f:arch/sh/boards/mach-se/7343/Makefile
-f:arch/sh/boards/mach-se/7343/irq.c
-f:arch/sh/boards/mach-se/7343/setup.c
-f:arch/sh/boards/mach-se/770x/Makefile
-f:arch/sh/boards/mach-se/770x/irq.c
-f:arch/sh/boards/mach-se/770x/setup.c
-f:arch/sh/boards/mach-se/7721/Makefile
-f:arch/sh/boards/mach-se/7721/irq.c
-f:arch/sh/boards/mach-se/7721/setup.c
-f:arch/sh/boards/mach-se/7722/Makefile
-f:arch/sh/boards/mach-se/7722/irq.c
-f:arch/sh/boards/mach-se/7722/setup.c
-f:arch/sh/boards/mach-se/7724/Makefile
-f:arch/sh/boards/mach-se/7724/irq.c
-f:arch/sh/boards/mach-se/7724/sdram.S
-f:arch/sh/boards/mach-se/7724/setup.c
-f:arch/sh/boards/mach-se/7751/Makefile
-f:arch/sh/boards/mach-se/7751/irq.c
-f:arch/sh/boards/mach-se/7751/setup.c
-f:arch/sh/boards/mach-se/7780/Makefile
-f:arch/sh/boards/mach-se/7780/irq.c
-f:arch/sh/boards/mach-se/7780/setup.c
-f:arch/sh/boards/mach-se/Makefile
-f:arch/sh/boards/mach-se/board-se7619.c
-f:arch/sh/boards/mach-sh03/Makefile
-f:arch/sh/boards/mach-sh03/rtc.c
-f:arch/sh/boards/mach-sh03/setup.c
-f:arch/sh/boards/mach-sh7763rdp/Makefile
-f:arch/sh/boards/mach-sh7763rdp/irq.c
-f:arch/sh/boards/mach-sh7763rdp/setup.c
-f:arch/sh/boards/mach-x3proto/Makefile
-f:arch/sh/boards/mach-x3proto/gpio.c
-f:arch/sh/boards/mach-x3proto/ilsel.c
-f:arch/sh/boards/mach-x3proto/setup.c
-f:arch/sh/boards/of-generic.c
-f:arch/sh/boot/.gitignore
-f:arch/sh/boot/Makefile
-f:arch/sh/boot/compressed/.gitignore
-f:arch/sh/boot/compressed/Makefile
-f:arch/sh/boot/compressed/ashiftrt.S
-f:arch/sh/boot/compressed/ashldi3.c
-f:arch/sh/boot/compressed/ashlsi3.S
-f:arch/sh/boot/compressed/ashrsi3.S
-f:arch/sh/boot/compressed/head_32.S
-f:arch/sh/boot/compressed/head_64.S
-f:arch/sh/boot/compressed/lshrsi3.S
-f:arch/sh/boot/compressed/misc.c
-f:arch/sh/boot/compressed/misc.h
-f:arch/sh/boot/compressed/vmlinux.scr
-f:arch/sh/boot/dts/Makefile
-f:arch/sh/boot/dts/j2_mimas_v2.dts
-f:arch/sh/boot/romimage/Makefile
-f:arch/sh/boot/romimage/head.S
-f:arch/sh/boot/romimage/mmcif-sh7724.c
-f:arch/sh/boot/romimage/vmlinux.scr
-f:arch/sh/cchips/Kconfig
-f:arch/sh/cchips/hd6446x/Makefile
-f:arch/sh/cchips/hd6446x/hd64461.c
-f:arch/sh/configs/ap325rxa_defconfig
-f:arch/sh/configs/apsh4a3a_defconfig
-f:arch/sh/configs/apsh4ad0a_defconfig
-f:arch/sh/configs/dreamcast_defconfig
-f:arch/sh/configs/ecovec24-romimage_defconfig
-f:arch/sh/configs/ecovec24_defconfig
-f:arch/sh/configs/edosk7705_defconfig
-f:arch/sh/configs/edosk7760_defconfig
-f:arch/sh/configs/espt_defconfig
-f:arch/sh/configs/hp6xx_defconfig
-f:arch/sh/configs/j2_defconfig
-f:arch/sh/configs/kfr2r09-romimage_defconfig
-f:arch/sh/configs/kfr2r09_defconfig
-f:arch/sh/configs/landisk_defconfig
-f:arch/sh/configs/lboxre2_defconfig
-f:arch/sh/configs/magicpanelr2_defconfig
-f:arch/sh/configs/migor_defconfig
-f:arch/sh/configs/polaris_defconfig
-f:arch/sh/configs/r7780mp_defconfig
-f:arch/sh/configs/r7785rp_defconfig
-f:arch/sh/configs/rsk7201_defconfig
-f:arch/sh/configs/rsk7203_defconfig
-f:arch/sh/configs/rsk7264_defconfig
-f:arch/sh/configs/rsk7269_defconfig
-f:arch/sh/configs/rts7751r2d1_defconfig
-f:arch/sh/configs/rts7751r2dplus_defconfig
-f:arch/sh/configs/sdk7780_defconfig
-f:arch/sh/configs/sdk7786_defconfig
-f:arch/sh/configs/se7206_defconfig
-f:arch/sh/configs/se7343_defconfig
-f:arch/sh/configs/se7619_defconfig
-f:arch/sh/configs/se7705_defconfig
-f:arch/sh/configs/se7712_defconfig
-f:arch/sh/configs/se7721_defconfig
-f:arch/sh/configs/se7722_defconfig
-f:arch/sh/configs/se7724_defconfig
-f:arch/sh/configs/se7750_defconfig
-f:arch/sh/configs/se7751_defconfig
-f:arch/sh/configs/se7780_defconfig
-f:arch/sh/configs/secureedge5410_defconfig
-f:arch/sh/configs/sh03_defconfig
-f:arch/sh/configs/sh2007_defconfig
-f:arch/sh/configs/sh7710voipgw_defconfig
-f:arch/sh/configs/sh7724_generic_defconfig
-f:arch/sh/configs/sh7757lcr_defconfig
-f:arch/sh/configs/sh7763rdp_defconfig
-f:arch/sh/configs/sh7770_generic_defconfig
-f:arch/sh/configs/sh7785lcr_32bit_defconfig
-f:arch/sh/configs/sh7785lcr_defconfig
-f:arch/sh/configs/shmin_defconfig
-f:arch/sh/configs/shx3_defconfig
-f:arch/sh/configs/titan_defconfig
-f:arch/sh/configs/ul2_defconfig
-f:arch/sh/configs/urquell_defconfig
-f:arch/sh/drivers/Kconfig
-f:arch/sh/drivers/Makefile
-f:arch/sh/drivers/dma/Kconfig
-f:arch/sh/drivers/dma/Makefile
-f:arch/sh/drivers/dma/dma-api.c
-f:arch/sh/drivers/dma/dma-g2.c
-f:arch/sh/drivers/dma/dma-pvr2.c
-f:arch/sh/drivers/dma/dma-sh.c
-f:arch/sh/drivers/dma/dma-sysfs.c
-f:arch/sh/drivers/dma/dmabrg.c
-f:arch/sh/drivers/heartbeat.c
-f:arch/sh/drivers/pci/Makefile
-f:arch/sh/drivers/pci/common.c
-f:arch/sh/drivers/pci/fixups-dreamcast.c
-f:arch/sh/drivers/pci/fixups-landisk.c
-f:arch/sh/drivers/pci/fixups-r7780rp.c
-f:arch/sh/drivers/pci/fixups-rts7751r2d.c
-f:arch/sh/drivers/pci/fixups-sdk7780.c
-f:arch/sh/drivers/pci/fixups-sdk7786.c
-f:arch/sh/drivers/pci/fixups-se7751.c
-f:arch/sh/drivers/pci/fixups-sh03.c
-f:arch/sh/drivers/pci/fixups-snapgear.c
-f:arch/sh/drivers/pci/fixups-titan.c
-f:arch/sh/drivers/pci/ops-dreamcast.c
-f:arch/sh/drivers/pci/ops-sh4.c
-f:arch/sh/drivers/pci/ops-sh7786.c
-f:arch/sh/drivers/pci/pci-dreamcast.c
-f:arch/sh/drivers/pci/pci-sh4.h
-f:arch/sh/drivers/pci/pci-sh7751.c
-f:arch/sh/drivers/pci/pci-sh7751.h
-f:arch/sh/drivers/pci/pci-sh7780.c
-f:arch/sh/drivers/pci/pci-sh7780.h
-f:arch/sh/drivers/pci/pci.c
-f:arch/sh/drivers/pci/pcie-sh7786.c
-f:arch/sh/drivers/pci/pcie-sh7786.h
-f:arch/sh/drivers/platform_early.c
-f:arch/sh/drivers/push-switch.c
-f:arch/sh/include/asm/Kbuild
-f:arch/sh/include/asm/adc.h
-f:arch/sh/include/asm/addrspace.h
-f:arch/sh/include/asm/alignment.h
-f:arch/sh/include/asm/asm-offsets.h
-f:arch/sh/include/asm/atomic-grb.h
-f:arch/sh/include/asm/atomic-irq.h
-f:arch/sh/include/asm/atomic-llsc.h
-f:arch/sh/include/asm/atomic.h
-f:arch/sh/include/asm/barrier.h
-f:arch/sh/include/asm/bitops-cas.h
-f:arch/sh/include/asm/bitops-grb.h
-f:arch/sh/include/asm/bitops-llsc.h
-f:arch/sh/include/asm/bitops-op32.h
-f:arch/sh/include/asm/bitops.h
-f:arch/sh/include/asm/bl_bit.h
-f:arch/sh/include/asm/bl_bit_32.h
-f:arch/sh/include/asm/bug.h
-f:arch/sh/include/asm/cache.h
-f:arch/sh/include/asm/cache_insns.h
-f:arch/sh/include/asm/cache_insns_32.h
-f:arch/sh/include/asm/cacheflush.h
-f:arch/sh/include/asm/cachetype.h
-f:arch/sh/include/asm/checksum.h
-f:arch/sh/include/asm/checksum_32.h
-f:arch/sh/include/asm/clock.h
-f:arch/sh/include/asm/cmpxchg-cas.h
-f:arch/sh/include/asm/cmpxchg-grb.h
-f:arch/sh/include/asm/cmpxchg-irq.h
-f:arch/sh/include/asm/cmpxchg-llsc.h
-f:arch/sh/include/asm/cmpxchg-xchg.h
-f:arch/sh/include/asm/cmpxchg.h
-f:arch/sh/include/asm/device.h
-f:arch/sh/include/asm/dma-register.h
-f:arch/sh/include/asm/dma.h
-f:arch/sh/include/asm/dmabrg.h
-f:arch/sh/include/asm/dwarf.h
-f:arch/sh/include/asm/elf.h
-f:arch/sh/include/asm/entry-macros.S
-f:arch/sh/include/asm/extable.h
-f:arch/sh/include/asm/fixmap.h
-f:arch/sh/include/asm/flat.h
-f:arch/sh/include/asm/fpu.h
-f:arch/sh/include/asm/freq.h
-f:arch/sh/include/asm/ftrace.h
-f:arch/sh/include/asm/futex-cas.h
-f:arch/sh/include/asm/futex-irq.h
-f:arch/sh/include/asm/futex-llsc.h
-f:arch/sh/include/asm/futex.h
-f:arch/sh/include/asm/hardirq.h
-f:arch/sh/include/asm/hd64461.h
-f:arch/sh/include/asm/heartbeat.h
-f:arch/sh/include/asm/hugetlb.h
-f:arch/sh/include/asm/hw_breakpoint.h
-f:arch/sh/include/asm/hw_irq.h
-f:arch/sh/include/asm/i2c-sh7760.h
-f:arch/sh/include/asm/io.h
-f:arch/sh/include/asm/io_generic.h
-f:arch/sh/include/asm/io_noioport.h
-f:arch/sh/include/asm/io_trapped.h
-f:arch/sh/include/asm/irq.h
-f:arch/sh/include/asm/irqflags.h
-f:arch/sh/include/asm/kdebug.h
-f:arch/sh/include/asm/kexec.h
-f:arch/sh/include/asm/kgdb.h
-f:arch/sh/include/asm/kprobes.h
-f:arch/sh/include/asm/linkage.h
-f:arch/sh/include/asm/machvec.h
-f:arch/sh/include/asm/mmiowb.h
-f:arch/sh/include/asm/mmu.h
-f:arch/sh/include/asm/mmu_context.h
-f:arch/sh/include/asm/mmu_context_32.h
-f:arch/sh/include/asm/mmzone.h
-f:arch/sh/include/asm/module.h
-f:arch/sh/include/asm/page.h
-f:arch/sh/include/asm/pci.h
-f:arch/sh/include/asm/perf_event.h
-f:arch/sh/include/asm/pgalloc.h
-f:arch/sh/include/asm/pgtable-2level.h
-f:arch/sh/include/asm/pgtable-3level.h
-f:arch/sh/include/asm/pgtable.h
-f:arch/sh/include/asm/pgtable_32.h
-f:arch/sh/include/asm/platform_early.h
-f:arch/sh/include/asm/posix_types.h
-f:arch/sh/include/asm/processor.h
-f:arch/sh/include/asm/processor_32.h
-f:arch/sh/include/asm/ptrace.h
-f:arch/sh/include/asm/ptrace_32.h
-f:arch/sh/include/asm/push-switch.h
-f:arch/sh/include/asm/reboot.h
-f:arch/sh/include/asm/romimage-macros.h
-f:arch/sh/include/asm/rtc.h
-f:arch/sh/include/asm/seccomp.h
-f:arch/sh/include/asm/sections.h
-f:arch/sh/include/asm/setup.h
-f:arch/sh/include/asm/sfp-machine.h
-f:arch/sh/include/asm/sh7760fb.h
-f:arch/sh/include/asm/sh_bios.h
-f:arch/sh/include/asm/shmparam.h
-f:arch/sh/include/asm/siu.h
-f:arch/sh/include/asm/smc37c93x.h
-f:arch/sh/include/asm/smp-ops.h
-f:arch/sh/include/asm/smp.h
-f:arch/sh/include/asm/sparsemem.h
-f:arch/sh/include/asm/spi.h
-f:arch/sh/include/asm/spinlock-cas.h
-f:arch/sh/include/asm/spinlock-llsc.h
-f:arch/sh/include/asm/spinlock.h
-f:arch/sh/include/asm/spinlock_types.h
-f:arch/sh/include/asm/sram.h
-f:arch/sh/include/asm/stackprotector.h
-f:arch/sh/include/asm/stacktrace.h
-f:arch/sh/include/asm/string.h
-f:arch/sh/include/asm/string_32.h
-f:arch/sh/include/asm/suspend.h
-f:arch/sh/include/asm/switch_to.h
-f:arch/sh/include/asm/switch_to_32.h
-f:arch/sh/include/asm/syscall.h
-f:arch/sh/include/asm/syscall_32.h
-f:arch/sh/include/asm/syscalls.h
-f:arch/sh/include/asm/syscalls_32.h
-f:arch/sh/include/asm/thread_info.h
-f:arch/sh/include/asm/timex.h
-f:arch/sh/include/asm/tlb.h
-f:arch/sh/include/asm/tlbflush.h
-f:arch/sh/include/asm/topology.h
-f:arch/sh/include/asm/traps.h
-f:arch/sh/include/asm/traps_32.h
-f:arch/sh/include/asm/types.h
-f:arch/sh/include/asm/uaccess.h
-f:arch/sh/include/asm/uaccess_32.h
-f:arch/sh/include/asm/uncached.h
-f:arch/sh/include/asm/unistd.h
-f:arch/sh/include/asm/unwinder.h
-f:arch/sh/include/asm/user.h
-f:arch/sh/include/asm/vermagic.h
-f:arch/sh/include/asm/vmalloc.h
-f:arch/sh/include/asm/vmlinux.lds.h
-f:arch/sh/include/asm/watchdog.h
-f:arch/sh/include/asm/word-at-a-time.h
-f:arch/sh/include/cpu-common/cpu/addrspace.h
-f:arch/sh/include/cpu-common/cpu/mmu_context.h
-f:arch/sh/include/cpu-common/cpu/pfc.h
-f:arch/sh/include/cpu-common/cpu/rtc.h
-f:arch/sh/include/cpu-common/cpu/sigcontext.h
-f:arch/sh/include/cpu-common/cpu/timer.h
-f:arch/sh/include/cpu-sh2/cpu/cache.h
-f:arch/sh/include/cpu-sh2/cpu/freq.h
-f:arch/sh/include/cpu-sh2/cpu/watchdog.h
-f:arch/sh/include/cpu-sh2a/cpu/addrspace.h
-f:arch/sh/include/cpu-sh2a/cpu/cache.h
-f:arch/sh/include/cpu-sh2a/cpu/freq.h
-f:arch/sh/include/cpu-sh2a/cpu/rtc.h
-f:arch/sh/include/cpu-sh2a/cpu/sh7203.h
-f:arch/sh/include/cpu-sh2a/cpu/sh7264.h
-f:arch/sh/include/cpu-sh2a/cpu/sh7269.h
-f:arch/sh/include/cpu-sh2a/cpu/watchdog.h
-f:arch/sh/include/cpu-sh3/cpu/adc.h
-f:arch/sh/include/cpu-sh3/cpu/cache.h
-f:arch/sh/include/cpu-sh3/cpu/dac.h
-f:arch/sh/include/cpu-sh3/cpu/dma-register.h
-f:arch/sh/include/cpu-sh3/cpu/dma.h
-f:arch/sh/include/cpu-sh3/cpu/freq.h
-f:arch/sh/include/cpu-sh3/cpu/gpio.h
-f:arch/sh/include/cpu-sh3/cpu/mmu_context.h
-f:arch/sh/include/cpu-sh3/cpu/serial.h
-f:arch/sh/include/cpu-sh3/cpu/sh7720.h
-f:arch/sh/include/cpu-sh3/cpu/watchdog.h
-f:arch/sh/include/cpu-sh4/cpu/addrspace.h
-f:arch/sh/include/cpu-sh4/cpu/cache.h
-f:arch/sh/include/cpu-sh4/cpu/dma-register.h
-f:arch/sh/include/cpu-sh4/cpu/dma.h
-f:arch/sh/include/cpu-sh4/cpu/fpu.h
-f:arch/sh/include/cpu-sh4/cpu/freq.h
-f:arch/sh/include/cpu-sh4/cpu/mmu_context.h
-f:arch/sh/include/cpu-sh4/cpu/rtc.h
-f:arch/sh/include/cpu-sh4/cpu/sh7722.h
-f:arch/sh/include/cpu-sh4/cpu/sh7723.h
-f:arch/sh/include/cpu-sh4/cpu/sh7724.h
-f:arch/sh/include/cpu-sh4/cpu/sh7734.h
-f:arch/sh/include/cpu-sh4/cpu/sh7757.h
-f:arch/sh/include/cpu-sh4/cpu/sh7785.h
-f:arch/sh/include/cpu-sh4/cpu/sh7786.h
-f:arch/sh/include/cpu-sh4/cpu/shx3.h
-f:arch/sh/include/cpu-sh4/cpu/sigcontext.h
-f:arch/sh/include/cpu-sh4/cpu/sq.h
-f:arch/sh/include/cpu-sh4/cpu/watchdog.h
-f:arch/sh/include/cpu-sh4a/cpu/dma.h
-f:arch/sh/include/cpu-sh4a/cpu/serial.h
-f:arch/sh/include/mach-common/mach/highlander.h
-f:arch/sh/include/mach-common/mach/hp6xx.h
-f:arch/sh/include/mach-common/mach/lboxre2.h
-f:arch/sh/include/mach-common/mach/magicpanelr2.h
-f:arch/sh/include/mach-common/mach/mangle-port.h
-f:arch/sh/include/mach-common/mach/r2d.h
-f:arch/sh/include/mach-common/mach/romimage.h
-f:arch/sh/include/mach-common/mach/sdk7780.h
-f:arch/sh/include/mach-common/mach/secureedge5410.h
-f:arch/sh/include/mach-common/mach/sh2007.h
-f:arch/sh/include/mach-common/mach/sh7763rdp.h
-f:arch/sh/include/mach-common/mach/sh7785lcr.h
-f:arch/sh/include/mach-common/mach/shmin.h
-f:arch/sh/include/mach-common/mach/titan.h
-f:arch/sh/include/mach-common/mach/urquell.h
-f:arch/sh/include/mach-dreamcast/mach/dma.h
-f:arch/sh/include/mach-dreamcast/mach/maple.h
-f:arch/sh/include/mach-dreamcast/mach/pci.h
-f:arch/sh/include/mach-dreamcast/mach/sysasic.h
-f:arch/sh/include/mach-ecovec24/mach/partner-jet-setup.txt
-f:arch/sh/include/mach-ecovec24/mach/romimage.h
-f:arch/sh/include/mach-kfr2r09/mach/kfr2r09.h
-f:arch/sh/include/mach-kfr2r09/mach/partner-jet-setup.txt
-f:arch/sh/include/mach-kfr2r09/mach/romimage.h
-f:arch/sh/include/mach-landisk/mach/gio.h
-f:arch/sh/include/mach-landisk/mach/iodata_landisk.h
-f:arch/sh/include/mach-migor/mach/migor.h
-f:arch/sh/include/mach-sdk7786/mach/fpga.h
-f:arch/sh/include/mach-sdk7786/mach/irq.h
-f:arch/sh/include/mach-se/mach/mrshpc.h
-f:arch/sh/include/mach-se/mach/se.h
-f:arch/sh/include/mach-se/mach/se7206.h
-f:arch/sh/include/mach-se/mach/se7343.h
-f:arch/sh/include/mach-se/mach/se7721.h
-f:arch/sh/include/mach-se/mach/se7722.h
-f:arch/sh/include/mach-se/mach/se7724.h
-f:arch/sh/include/mach-se/mach/se7751.h
-f:arch/sh/include/mach-se/mach/se7780.h
-f:arch/sh/include/mach-sh03/mach/io.h
-f:arch/sh/include/mach-sh03/mach/sh03.h
-f:arch/sh/include/mach-x3proto/mach/hardware.h
-f:arch/sh/include/mach-x3proto/mach/ilsel.h
-f:arch/sh/include/uapi/asm/Kbuild
-f:arch/sh/include/uapi/asm/auxvec.h
-f:arch/sh/include/uapi/asm/byteorder.h
-f:arch/sh/include/uapi/asm/cachectl.h
-f:arch/sh/include/uapi/asm/cpu-features.h
-f:arch/sh/include/uapi/asm/hw_breakpoint.h
-f:arch/sh/include/uapi/asm/ioctls.h
-f:arch/sh/include/uapi/asm/posix_types.h
-f:arch/sh/include/uapi/asm/posix_types_32.h
-f:arch/sh/include/uapi/asm/ptrace.h
-f:arch/sh/include/uapi/asm/ptrace_32.h
-f:arch/sh/include/uapi/asm/sigcontext.h
-f:arch/sh/include/uapi/asm/signal.h
-f:arch/sh/include/uapi/asm/sockios.h
-f:arch/sh/include/uapi/asm/stat.h
-f:arch/sh/include/uapi/asm/swab.h
-f:arch/sh/include/uapi/asm/unistd.h
-f:arch/sh/kernel/.gitignore
-f:arch/sh/kernel/Makefile
-f:arch/sh/kernel/asm-offsets.c
-f:arch/sh/kernel/cpu/Makefile
-f:arch/sh/kernel/cpu/adc.c
-f:arch/sh/kernel/cpu/clock-cpg.c
-f:arch/sh/kernel/cpu/clock.c
-f:arch/sh/kernel/cpu/fpu.c
-f:arch/sh/kernel/cpu/init.c
-f:arch/sh/kernel/cpu/irq/Makefile
-f:arch/sh/kernel/cpu/irq/imask.c
-f:arch/sh/kernel/cpu/irq/ipr.c
-f:arch/sh/kernel/cpu/pfc.c
-f:arch/sh/kernel/cpu/proc.c
-f:arch/sh/kernel/cpu/sh2/Makefile
-f:arch/sh/kernel/cpu/sh2/clock-sh7619.c
-f:arch/sh/kernel/cpu/sh2/entry.S
-f:arch/sh/kernel/cpu/sh2/ex.S
-f:arch/sh/kernel/cpu/sh2/probe.c
-f:arch/sh/kernel/cpu/sh2/setup-sh7619.c
-f:arch/sh/kernel/cpu/sh2/smp-j2.c
-f:arch/sh/kernel/cpu/sh2a/Makefile
-f:arch/sh/kernel/cpu/sh2a/clock-sh7201.c
-f:arch/sh/kernel/cpu/sh2a/clock-sh7203.c
-f:arch/sh/kernel/cpu/sh2a/clock-sh7206.c
-f:arch/sh/kernel/cpu/sh2a/clock-sh7264.c
-f:arch/sh/kernel/cpu/sh2a/clock-sh7269.c
-f:arch/sh/kernel/cpu/sh2a/entry.S
-f:arch/sh/kernel/cpu/sh2a/ex.S
-f:arch/sh/kernel/cpu/sh2a/fpu.c
-f:arch/sh/kernel/cpu/sh2a/opcode_helper.c
-f:arch/sh/kernel/cpu/sh2a/pinmux-sh7203.c
-f:arch/sh/kernel/cpu/sh2a/pinmux-sh7264.c
-f:arch/sh/kernel/cpu/sh2a/pinmux-sh7269.c
-f:arch/sh/kernel/cpu/sh2a/probe.c
-f:arch/sh/kernel/cpu/sh2a/setup-mxg.c
-f:arch/sh/kernel/cpu/sh2a/setup-sh7201.c
-f:arch/sh/kernel/cpu/sh2a/setup-sh7203.c
-f:arch/sh/kernel/cpu/sh2a/setup-sh7206.c
-f:arch/sh/kernel/cpu/sh2a/setup-sh7264.c
-f:arch/sh/kernel/cpu/sh2a/setup-sh7269.c
-f:arch/sh/kernel/cpu/sh3/Makefile
-f:arch/sh/kernel/cpu/sh3/clock-sh3.c
-f:arch/sh/kernel/cpu/sh3/clock-sh7705.c
-f:arch/sh/kernel/cpu/sh3/clock-sh7706.c
-f:arch/sh/kernel/cpu/sh3/clock-sh7709.c
-f:arch/sh/kernel/cpu/sh3/clock-sh7710.c
-f:arch/sh/kernel/cpu/sh3/clock-sh7712.c
-f:arch/sh/kernel/cpu/sh3/entry.S
-f:arch/sh/kernel/cpu/sh3/ex.S
-f:arch/sh/kernel/cpu/sh3/pinmux-sh7720.c
-f:arch/sh/kernel/cpu/sh3/probe.c
-f:arch/sh/kernel/cpu/sh3/serial-sh770x.c
-f:arch/sh/kernel/cpu/sh3/serial-sh7710.c
-f:arch/sh/kernel/cpu/sh3/serial-sh7720.c
-f:arch/sh/kernel/cpu/sh3/setup-sh3.c
-f:arch/sh/kernel/cpu/sh3/setup-sh7705.c
-f:arch/sh/kernel/cpu/sh3/setup-sh770x.c
-f:arch/sh/kernel/cpu/sh3/setup-sh7710.c
-f:arch/sh/kernel/cpu/sh3/setup-sh7720.c
-f:arch/sh/kernel/cpu/sh3/swsusp.S
-f:arch/sh/kernel/cpu/sh4/Makefile
-f:arch/sh/kernel/cpu/sh4/clock-sh4.c
-f:arch/sh/kernel/cpu/sh4/fpu.c
-f:arch/sh/kernel/cpu/sh4/perf_event.c
-f:arch/sh/kernel/cpu/sh4/probe.c
-f:arch/sh/kernel/cpu/sh4/setup-sh7750.c
-f:arch/sh/kernel/cpu/sh4/setup-sh7760.c
-f:arch/sh/kernel/cpu/sh4/softfloat.c
-f:arch/sh/kernel/cpu/sh4/sq.c
-f:arch/sh/kernel/cpu/sh4a/Makefile
-f:arch/sh/kernel/cpu/sh4a/clock-sh7343.c
-f:arch/sh/kernel/cpu/sh4a/clock-sh7366.c
-f:arch/sh/kernel/cpu/sh4a/clock-sh7722.c
-f:arch/sh/kernel/cpu/sh4a/clock-sh7723.c
-f:arch/sh/kernel/cpu/sh4a/clock-sh7724.c
-f:arch/sh/kernel/cpu/sh4a/clock-sh7734.c
-f:arch/sh/kernel/cpu/sh4a/clock-sh7757.c
-f:arch/sh/kernel/cpu/sh4a/clock-sh7763.c
-f:arch/sh/kernel/cpu/sh4a/clock-sh7770.c
-f:arch/sh/kernel/cpu/sh4a/clock-sh7780.c
-f:arch/sh/kernel/cpu/sh4a/clock-sh7785.c
-f:arch/sh/kernel/cpu/sh4a/clock-sh7786.c
-f:arch/sh/kernel/cpu/sh4a/clock-shx3.c
-f:arch/sh/kernel/cpu/sh4a/intc-shx3.c
-f:arch/sh/kernel/cpu/sh4a/perf_event.c
-f:arch/sh/kernel/cpu/sh4a/pinmux-sh7722.c
-f:arch/sh/kernel/cpu/sh4a/pinmux-sh7723.c
-f:arch/sh/kernel/cpu/sh4a/pinmux-sh7724.c
-f:arch/sh/kernel/cpu/sh4a/pinmux-sh7734.c
-f:arch/sh/kernel/cpu/sh4a/pinmux-sh7757.c
-f:arch/sh/kernel/cpu/sh4a/pinmux-sh7785.c
-f:arch/sh/kernel/cpu/sh4a/pinmux-sh7786.c
-f:arch/sh/kernel/cpu/sh4a/pinmux-shx3.c
-f:arch/sh/kernel/cpu/sh4a/serial-sh7722.c
-f:arch/sh/kernel/cpu/sh4a/setup-sh7343.c
-f:arch/sh/kernel/cpu/sh4a/setup-sh7366.c
-f:arch/sh/kernel/cpu/sh4a/setup-sh7722.c
-f:arch/sh/kernel/cpu/sh4a/setup-sh7723.c
-f:arch/sh/kernel/cpu/sh4a/setup-sh7724.c
-f:arch/sh/kernel/cpu/sh4a/setup-sh7734.c
-f:arch/sh/kernel/cpu/sh4a/setup-sh7757.c
-f:arch/sh/kernel/cpu/sh4a/setup-sh7763.c
-f:arch/sh/kernel/cpu/sh4a/setup-sh7770.c
-f:arch/sh/kernel/cpu/sh4a/setup-sh7780.c
-f:arch/sh/kernel/cpu/sh4a/setup-sh7785.c
-f:arch/sh/kernel/cpu/sh4a/setup-sh7786.c
-f:arch/sh/kernel/cpu/sh4a/setup-shx3.c
-f:arch/sh/kernel/cpu/sh4a/smp-shx3.c
-f:arch/sh/kernel/cpu/sh4a/ubc.c
-f:arch/sh/kernel/cpu/shmobile/Makefile
-f:arch/sh/kernel/cpu/shmobile/cpuidle.c
-f:arch/sh/kernel/cpu/shmobile/pm.c
-f:arch/sh/kernel/cpu/shmobile/sleep.S
-f:arch/sh/kernel/crash_dump.c
-f:arch/sh/kernel/debugtraps.S
-f:arch/sh/kernel/disassemble.c
-f:arch/sh/kernel/dma-coherent.c
-f:arch/sh/kernel/dumpstack.c
-f:arch/sh/kernel/dwarf.c
-f:arch/sh/kernel/entry-common.S
-f:arch/sh/kernel/ftrace.c
-f:arch/sh/kernel/head_32.S
-f:arch/sh/kernel/hw_breakpoint.c
-f:arch/sh/kernel/idle.c
-f:arch/sh/kernel/io.c
-f:arch/sh/kernel/io_trapped.c
-f:arch/sh/kernel/ioport.c
-f:arch/sh/kernel/irq.c
-f:arch/sh/kernel/irq_32.c
-f:arch/sh/kernel/kdebugfs.c
-f:arch/sh/kernel/kgdb.c
-f:arch/sh/kernel/kprobes.c
-f:arch/sh/kernel/machine_kexec.c
-f:arch/sh/kernel/machvec.c
-f:arch/sh/kernel/module.c
-f:arch/sh/kernel/nmi_debug.c
-f:arch/sh/kernel/perf_callchain.c
-f:arch/sh/kernel/perf_event.c
-f:arch/sh/kernel/process.c
-f:arch/sh/kernel/process_32.c
-f:arch/sh/kernel/ptrace.c
-f:arch/sh/kernel/ptrace_32.c
-f:arch/sh/kernel/reboot.c
-f:arch/sh/kernel/relocate_kernel.S
-f:arch/sh/kernel/return_address.c
-f:arch/sh/kernel/setup.c
-f:arch/sh/kernel/sh_bios.c
-f:arch/sh/kernel/sh_ksyms_32.c
-f:arch/sh/kernel/signal_32.c
-f:arch/sh/kernel/smp.c
-f:arch/sh/kernel/stacktrace.c
-f:arch/sh/kernel/swsusp.c
-f:arch/sh/kernel/sys_sh.c
-f:arch/sh/kernel/sys_sh32.c
-f:arch/sh/kernel/syscalls/Makefile
-f:arch/sh/kernel/syscalls/syscall.tbl
-f:arch/sh/kernel/syscalls_32.S
-f:arch/sh/kernel/time.c
-f:arch/sh/kernel/topology.c
-f:arch/sh/kernel/traps.c
-f:arch/sh/kernel/traps_32.c
-f:arch/sh/kernel/unwinder.c
-f:arch/sh/kernel/vmcore_info.c
-f:arch/sh/kernel/vmlinux.lds.S
-f:arch/sh/kernel/vsyscall/.gitignore
-f:arch/sh/kernel/vsyscall/Makefile
-f:arch/sh/kernel/vsyscall/vsyscall-note.S
-f:arch/sh/kernel/vsyscall/vsyscall-sigreturn.S
-f:arch/sh/kernel/vsyscall/vsyscall-syscall.S
-f:arch/sh/kernel/vsyscall/vsyscall-trapa.S
-f:arch/sh/kernel/vsyscall/vsyscall.c
-f:arch/sh/kernel/vsyscall/vsyscall.lds.S
-f:arch/sh/lib/Makefile
-f:arch/sh/lib/__clear_user.S
-f:arch/sh/lib/ashiftrt.S
-f:arch/sh/lib/ashlsi3.S
-f:arch/sh/lib/ashrsi3.S
-f:arch/sh/lib/checksum.S
-f:arch/sh/lib/copy_page.S
-f:arch/sh/lib/delay.c
-f:arch/sh/lib/div64-generic.c
-f:arch/sh/lib/div64.S
-f:arch/sh/lib/io.c
-f:arch/sh/lib/libgcc.h
-f:arch/sh/lib/lshrsi3.S
-f:arch/sh/lib/mcount.S
-f:arch/sh/lib/memchr.S
-f:arch/sh/lib/memcpy-sh4.S
-f:arch/sh/lib/memcpy.S
-f:arch/sh/lib/memmove.S
-f:arch/sh/lib/memset-sh4.S
-f:arch/sh/lib/memset.S
-f:arch/sh/lib/movmem.S
-f:arch/sh/lib/strlen.S
-f:arch/sh/lib/udiv_qrnnd.S
-f:arch/sh/lib/udivsi3.S
-f:arch/sh/lib/udivsi3_i4i-Os.S
-f:arch/sh/lib/udivsi3_i4i.S
-f:arch/sh/math-emu/Makefile
-f:arch/sh/math-emu/math.c
-f:arch/sh/math-emu/sfp-util.h
-f:arch/sh/mm/Kconfig
-f:arch/sh/mm/Makefile
-f:arch/sh/mm/alignment.c
-f:arch/sh/mm/asids-debugfs.c
-f:arch/sh/mm/cache-debugfs.c
-f:arch/sh/mm/cache-j2.c
-f:arch/sh/mm/cache-sh2.c
-f:arch/sh/mm/cache-sh2a.c
-f:arch/sh/mm/cache-sh3.c
-f:arch/sh/mm/cache-sh4.c
-f:arch/sh/mm/cache-sh7705.c
-f:arch/sh/mm/cache-shx3.c
-f:arch/sh/mm/cache.c
-f:arch/sh/mm/consistent.c
-f:arch/sh/mm/extable_32.c
-f:arch/sh/mm/fault.c
-f:arch/sh/mm/flush-sh4.c
-f:arch/sh/mm/hugetlbpage.c
-f:arch/sh/mm/init.c
-f:arch/sh/mm/ioremap.c
-f:arch/sh/mm/ioremap.h
-f:arch/sh/mm/ioremap_fixed.c
-f:arch/sh/mm/kmap.c
-f:arch/sh/mm/mmap.c
-f:arch/sh/mm/nommu.c
-f:arch/sh/mm/numa.c
-f:arch/sh/mm/pgtable.c
-f:arch/sh/mm/pmb.c
-f:arch/sh/mm/sram.c
-f:arch/sh/mm/tlb-debugfs.c
-f:arch/sh/mm/tlb-pteaex.c
-f:arch/sh/mm/tlb-sh3.c
-f:arch/sh/mm/tlb-sh4.c
-f:arch/sh/mm/tlb-urb.c
-f:arch/sh/mm/tlbex_32.c
-f:arch/sh/mm/tlbflush_32.c
-f:arch/sh/mm/uncached.c
-f:arch/sh/tools/Makefile
-f:arch/sh/tools/gen-mach-types
-f:arch/sh/tools/mach-types
-f:arch/sparc/Kbuild
-f:arch/sparc/Kconfig
-f:arch/sparc/Kconfig.debug
-f:arch/sparc/Makefile
-f:arch/sparc/boot/.gitignore
-f:arch/sparc/boot/Makefile
-f:arch/sparc/boot/install.sh
-f:arch/sparc/boot/piggyback.c
-f:arch/sparc/configs/sparc32_defconfig
-f:arch/sparc/configs/sparc64_defconfig
-f:arch/sparc/crypto/Kconfig
-f:arch/sparc/crypto/Makefile
-f:arch/sparc/crypto/aes_asm.S
-f:arch/sparc/crypto/aes_glue.c
-f:arch/sparc/crypto/camellia_asm.S
-f:arch/sparc/crypto/camellia_glue.c
-f:arch/sparc/crypto/crop_devid.c
-f:arch/sparc/crypto/des_asm.S
-f:arch/sparc/crypto/des_glue.c
-f:arch/sparc/crypto/md5_asm.S
-f:arch/sparc/crypto/md5_glue.c
-f:arch/sparc/include/asm/Kbuild
-f:arch/sparc/include/asm/adi.h
-f:arch/sparc/include/asm/adi_64.h
-f:arch/sparc/include/asm/apb.h
-f:arch/sparc/include/asm/asm-offsets.h
-f:arch/sparc/include/asm/asm-prototypes.h
-f:arch/sparc/include/asm/asm.h
-f:arch/sparc/include/asm/asmmacro.h
-f:arch/sparc/include/asm/atomic.h
-f:arch/sparc/include/asm/atomic_32.h
-f:arch/sparc/include/asm/atomic_64.h
-f:arch/sparc/include/asm/auxio.h
-f:arch/sparc/include/asm/auxio_32.h
-f:arch/sparc/include/asm/auxio_64.h
-f:arch/sparc/include/asm/backoff.h
-f:arch/sparc/include/asm/barrier.h
-f:arch/sparc/include/asm/barrier_32.h
-f:arch/sparc/include/asm/barrier_64.h
-f:arch/sparc/include/asm/bbc.h
-f:arch/sparc/include/asm/bitext.h
-f:arch/sparc/include/asm/bitops.h
-f:arch/sparc/include/asm/bitops_32.h
-f:arch/sparc/include/asm/bitops_64.h
-f:arch/sparc/include/asm/btext.h
-f:arch/sparc/include/asm/bug.h
-f:arch/sparc/include/asm/cache.h
-f:arch/sparc/include/asm/cacheflush.h
-f:arch/sparc/include/asm/cacheflush_32.h
-f:arch/sparc/include/asm/cacheflush_64.h
-f:arch/sparc/include/asm/cachetlb_32.h
-f:arch/sparc/include/asm/cachetype.h
-f:arch/sparc/include/asm/chafsr.h
-f:arch/sparc/include/asm/checksum.h
-f:arch/sparc/include/asm/checksum_32.h
-f:arch/sparc/include/asm/checksum_64.h
-f:arch/sparc/include/asm/chmctrl.h
-f:arch/sparc/include/asm/clock.h
-f:arch/sparc/include/asm/clocksource.h
-f:arch/sparc/include/asm/cmpxchg.h
-f:arch/sparc/include/asm/cmpxchg_32.h
-f:arch/sparc/include/asm/cmpxchg_64.h
-f:arch/sparc/include/asm/compat.h
-f:arch/sparc/include/asm/compat_signal.h
-f:arch/sparc/include/asm/contregs.h
-f:arch/sparc/include/asm/cpu_type.h
-f:arch/sparc/include/asm/cpudata.h
-f:arch/sparc/include/asm/cpudata_32.h
-f:arch/sparc/include/asm/cpudata_64.h
-f:arch/sparc/include/asm/current.h
-f:arch/sparc/include/asm/dcr.h
-f:arch/sparc/include/asm/dcu.h
-f:arch/sparc/include/asm/delay.h
-f:arch/sparc/include/asm/delay_32.h
-f:arch/sparc/include/asm/delay_64.h
-f:arch/sparc/include/asm/device.h
-f:arch/sparc/include/asm/dma-mapping.h
-f:arch/sparc/include/asm/dma.h
-f:arch/sparc/include/asm/ebus_dma.h
-f:arch/sparc/include/asm/ecc.h
-f:arch/sparc/include/asm/eeprom.h
-f:arch/sparc/include/asm/elf.h
-f:arch/sparc/include/asm/elf_32.h
-f:arch/sparc/include/asm/elf_64.h
-f:arch/sparc/include/asm/estate.h
-f:arch/sparc/include/asm/extable.h
-f:arch/sparc/include/asm/fbio.h
-f:arch/sparc/include/asm/fhc.h
-f:arch/sparc/include/asm/floppy.h
-f:arch/sparc/include/asm/floppy_32.h
-f:arch/sparc/include/asm/floppy_64.h
-f:arch/sparc/include/asm/fpumacro.h
-f:arch/sparc/include/asm/ftrace.h
-f:arch/sparc/include/asm/futex.h
-f:arch/sparc/include/asm/futex_32.h
-f:arch/sparc/include/asm/futex_64.h
-f:arch/sparc/include/asm/hardirq.h
-f:arch/sparc/include/asm/hardirq_32.h
-f:arch/sparc/include/asm/hardirq_64.h
-f:arch/sparc/include/asm/head.h
-f:arch/sparc/include/asm/head_32.h
-f:arch/sparc/include/asm/head_64.h
-f:arch/sparc/include/asm/hibernate.h
-f:arch/sparc/include/asm/highmem.h
-f:arch/sparc/include/asm/hugetlb.h
-f:arch/sparc/include/asm/hvtramp.h
-f:arch/sparc/include/asm/hw_irq.h
-f:arch/sparc/include/asm/hypervisor.h
-f:arch/sparc/include/asm/idprom.h
-f:arch/sparc/include/asm/intr_queue.h
-f:arch/sparc/include/asm/io-unit.h
-f:arch/sparc/include/asm/io.h
-f:arch/sparc/include/asm/io_32.h
-f:arch/sparc/include/asm/io_64.h
-f:arch/sparc/include/asm/ioctls.h
-f:arch/sparc/include/asm/iommu-common.h
-f:arch/sparc/include/asm/iommu.h
-f:arch/sparc/include/asm/iommu_32.h
-f:arch/sparc/include/asm/iommu_64.h
-f:arch/sparc/include/asm/irq.h
-f:arch/sparc/include/asm/irq_32.h
-f:arch/sparc/include/asm/irq_64.h
-f:arch/sparc/include/asm/irqflags.h
-f:arch/sparc/include/asm/irqflags_32.h
-f:arch/sparc/include/asm/irqflags_64.h
-f:arch/sparc/include/asm/jump_label.h
-f:arch/sparc/include/asm/kdebug.h
-f:arch/sparc/include/asm/kdebug_32.h
-f:arch/sparc/include/asm/kdebug_64.h
-f:arch/sparc/include/asm/kgdb.h
-f:arch/sparc/include/asm/kprobes.h
-f:arch/sparc/include/asm/ldc.h
-f:arch/sparc/include/asm/leon.h
-f:arch/sparc/include/asm/leon_amba.h
-f:arch/sparc/include/asm/leon_pci.h
-f:arch/sparc/include/asm/lsu.h
-f:arch/sparc/include/asm/machines.h
-f:arch/sparc/include/asm/mbus.h
-f:arch/sparc/include/asm/mc146818rtc.h
-f:arch/sparc/include/asm/mc146818rtc_32.h
-f:arch/sparc/include/asm/mc146818rtc_64.h
-f:arch/sparc/include/asm/mdesc.h
-f:arch/sparc/include/asm/memctrl.h
-f:arch/sparc/include/asm/mman.h
-f:arch/sparc/include/asm/mmu.h
-f:arch/sparc/include/asm/mmu_32.h
-f:arch/sparc/include/asm/mmu_64.h
-f:arch/sparc/include/asm/mmu_context.h
-f:arch/sparc/include/asm/mmu_context_32.h
-f:arch/sparc/include/asm/mmu_context_64.h
-f:arch/sparc/include/asm/mmzone.h
-f:arch/sparc/include/asm/mxcc.h
-f:arch/sparc/include/asm/nmi.h
-f:arch/sparc/include/asm/ns87303.h
-f:arch/sparc/include/asm/obio.h
-f:arch/sparc/include/asm/opcodes.h
-f:arch/sparc/include/asm/openprom.h
-f:arch/sparc/include/asm/oplib.h
-f:arch/sparc/include/asm/oplib_32.h
-f:arch/sparc/include/asm/oplib_64.h
-f:arch/sparc/include/asm/page.h
-f:arch/sparc/include/asm/page_32.h
-f:arch/sparc/include/asm/page_64.h
-f:arch/sparc/include/asm/parport.h
-f:arch/sparc/include/asm/parport_64.h
-f:arch/sparc/include/asm/pbm.h
-f:arch/sparc/include/asm/pci.h
-f:arch/sparc/include/asm/pcic.h
-f:arch/sparc/include/asm/pcr.h
-f:arch/sparc/include/asm/percpu.h
-f:arch/sparc/include/asm/percpu_32.h
-f:arch/sparc/include/asm/percpu_64.h
-f:arch/sparc/include/asm/perf_event.h
-f:arch/sparc/include/asm/pgalloc.h
-f:arch/sparc/include/asm/pgalloc_32.h
-f:arch/sparc/include/asm/pgalloc_64.h
-f:arch/sparc/include/asm/pgtable.h
-f:arch/sparc/include/asm/pgtable_32.h
-f:arch/sparc/include/asm/pgtable_64.h
-f:arch/sparc/include/asm/pgtsrmmu.h
-f:arch/sparc/include/asm/pil.h
-f:arch/sparc/include/asm/processor.h
-f:arch/sparc/include/asm/processor_32.h
-f:arch/sparc/include/asm/processor_64.h
-f:arch/sparc/include/asm/prom.h
-f:arch/sparc/include/asm/psr.h
-f:arch/sparc/include/asm/ptrace.h
-f:arch/sparc/include/asm/qrwlock.h
-f:arch/sparc/include/asm/qspinlock.h
-f:arch/sparc/include/asm/ross.h
-f:arch/sparc/include/asm/sbi.h
-f:arch/sparc/include/asm/scratchpad.h
-f:arch/sparc/include/asm/seccomp.h
-f:arch/sparc/include/asm/sections.h
-f:arch/sparc/include/asm/setup.h
-f:arch/sparc/include/asm/sfafsr.h
-f:arch/sparc/include/asm/sfp-machine.h
-f:arch/sparc/include/asm/sfp-machine_32.h
-f:arch/sparc/include/asm/sfp-machine_64.h
-f:arch/sparc/include/asm/shmparam.h
-f:arch/sparc/include/asm/shmparam_32.h
-f:arch/sparc/include/asm/shmparam_64.h
-f:arch/sparc/include/asm/sigcontext.h
-f:arch/sparc/include/asm/signal.h
-f:arch/sparc/include/asm/smp.h
-f:arch/sparc/include/asm/smp_32.h
-f:arch/sparc/include/asm/smp_64.h
-f:arch/sparc/include/asm/sparsemem.h
-f:arch/sparc/include/asm/spinlock.h
-f:arch/sparc/include/asm/spinlock_32.h
-f:arch/sparc/include/asm/spinlock_64.h
-f:arch/sparc/include/asm/spinlock_types.h
-f:arch/sparc/include/asm/spitfire.h
-f:arch/sparc/include/asm/stacktrace.h
-f:arch/sparc/include/asm/starfire.h
-f:arch/sparc/include/asm/string.h
-f:arch/sparc/include/asm/string_32.h
-f:arch/sparc/include/asm/string_64.h
-f:arch/sparc/include/asm/sunbpp.h
-f:arch/sparc/include/asm/swift.h
-f:arch/sparc/include/asm/switch_to.h
-f:arch/sparc/include/asm/switch_to_32.h
-f:arch/sparc/include/asm/switch_to_64.h
-f:arch/sparc/include/asm/syscall.h
-f:arch/sparc/include/asm/syscalls.h
-f:arch/sparc/include/asm/termbits.h
-f:arch/sparc/include/asm/thread_info.h
-f:arch/sparc/include/asm/thread_info_32.h
-f:arch/sparc/include/asm/thread_info_64.h
-f:arch/sparc/include/asm/timer.h
-f:arch/sparc/include/asm/timer_32.h
-f:arch/sparc/include/asm/timer_64.h
-f:arch/sparc/include/asm/timex.h
-f:arch/sparc/include/asm/timex_32.h
-f:arch/sparc/include/asm/timex_64.h
-f:arch/sparc/include/asm/tlb.h
-f:arch/sparc/include/asm/tlb_32.h
-f:arch/sparc/include/asm/tlb_64.h
-f:arch/sparc/include/asm/tlbflush.h
-f:arch/sparc/include/asm/tlbflush_32.h
-f:arch/sparc/include/asm/tlbflush_64.h
-f:arch/sparc/include/asm/topology.h
-f:arch/sparc/include/asm/topology_32.h
-f:arch/sparc/include/asm/topology_64.h
-f:arch/sparc/include/asm/trap_block.h
-f:arch/sparc/include/asm/traps.h
-f:arch/sparc/include/asm/tsb.h
-f:arch/sparc/include/asm/tsunami.h
-f:arch/sparc/include/asm/ttable.h
-f:arch/sparc/include/asm/turbosparc.h
-f:arch/sparc/include/asm/uaccess.h
-f:arch/sparc/include/asm/uaccess_32.h
-f:arch/sparc/include/asm/uaccess_64.h
-f:arch/sparc/include/asm/unistd.h
-f:arch/sparc/include/asm/upa.h
-f:arch/sparc/include/asm/uprobes.h
-f:arch/sparc/include/asm/user.h
-f:arch/sparc/include/asm/vaddrs.h
-f:arch/sparc/include/asm/vdso.h
-f:arch/sparc/include/asm/video.h
-f:arch/sparc/include/asm/viking.h
-f:arch/sparc/include/asm/vio.h
-f:arch/sparc/include/asm/visasm.h
-f:arch/sparc/include/asm/vmalloc.h
-f:arch/sparc/include/asm/vvar.h
-f:arch/sparc/include/asm/winmacro.h
-f:arch/sparc/include/asm/xor.h
-f:arch/sparc/include/asm/xor_32.h
-f:arch/sparc/include/asm/xor_64.h
-f:arch/sparc/include/uapi/asm/Kbuild
-f:arch/sparc/include/uapi/asm/apc.h
-f:arch/sparc/include/uapi/asm/asi.h
-f:arch/sparc/include/uapi/asm/auxvec.h
-f:arch/sparc/include/uapi/asm/bitsperlong.h
-f:arch/sparc/include/uapi/asm/byteorder.h
-f:arch/sparc/include/uapi/asm/display7seg.h
-f:arch/sparc/include/uapi/asm/envctrl.h
-f:arch/sparc/include/uapi/asm/errno.h
-f:arch/sparc/include/uapi/asm/fbio.h
-f:arch/sparc/include/uapi/asm/fcntl.h
-f:arch/sparc/include/uapi/asm/ioctl.h
-f:arch/sparc/include/uapi/asm/ioctls.h
-f:arch/sparc/include/uapi/asm/ipcbuf.h
-f:arch/sparc/include/uapi/asm/mman.h
-f:arch/sparc/include/uapi/asm/msgbuf.h
-f:arch/sparc/include/uapi/asm/openpromio.h
-f:arch/sparc/include/uapi/asm/oradax.h
-f:arch/sparc/include/uapi/asm/param.h
-f:arch/sparc/include/uapi/asm/perfctr.h
-f:arch/sparc/include/uapi/asm/poll.h
-f:arch/sparc/include/uapi/asm/posix_types.h
-f:arch/sparc/include/uapi/asm/psr.h
-f:arch/sparc/include/uapi/asm/psrcompat.h
-f:arch/sparc/include/uapi/asm/pstate.h
-f:arch/sparc/include/uapi/asm/ptrace.h
-f:arch/sparc/include/uapi/asm/resource.h
-f:arch/sparc/include/uapi/asm/sembuf.h
-f:arch/sparc/include/uapi/asm/setup.h
-f:arch/sparc/include/uapi/asm/shmbuf.h
-f:arch/sparc/include/uapi/asm/sigcontext.h
-f:arch/sparc/include/uapi/asm/siginfo.h
-f:arch/sparc/include/uapi/asm/signal.h
-f:arch/sparc/include/uapi/asm/socket.h
-f:arch/sparc/include/uapi/asm/stat.h
-f:arch/sparc/include/uapi/asm/swab.h
-f:arch/sparc/include/uapi/asm/termbits.h
-f:arch/sparc/include/uapi/asm/termios.h
-f:arch/sparc/include/uapi/asm/traps.h
-f:arch/sparc/include/uapi/asm/uctx.h
-f:arch/sparc/include/uapi/asm/unistd.h
-f:arch/sparc/include/uapi/asm/utrap.h
-f:arch/sparc/include/uapi/asm/watchdog.h
-f:arch/sparc/kernel/.gitignore
-f:arch/sparc/kernel/Makefile
-f:arch/sparc/kernel/adi_64.c
-f:arch/sparc/kernel/apc.c
-f:arch/sparc/kernel/asm-offsets.c
-f:arch/sparc/kernel/audit.c
-f:arch/sparc/kernel/auxio_32.c
-f:arch/sparc/kernel/auxio_64.c
-f:arch/sparc/kernel/btext.c
-f:arch/sparc/kernel/central.c
-f:arch/sparc/kernel/cherrs.S
-f:arch/sparc/kernel/chmc.c
-f:arch/sparc/kernel/compat_audit.c
-f:arch/sparc/kernel/cpu.c
-f:arch/sparc/kernel/cpumap.c
-f:arch/sparc/kernel/cpumap.h
-f:arch/sparc/kernel/devices.c
-f:arch/sparc/kernel/ds.c
-f:arch/sparc/kernel/dtlb_miss.S
-f:arch/sparc/kernel/dtlb_prot.S
-f:arch/sparc/kernel/ebus.c
-f:arch/sparc/kernel/entry.S
-f:arch/sparc/kernel/entry.h
-f:arch/sparc/kernel/etrap_32.S
-f:arch/sparc/kernel/etrap_64.S
-f:arch/sparc/kernel/fpu_traps.S
-f:arch/sparc/kernel/ftrace.c
-f:arch/sparc/kernel/getsetcc.S
-f:arch/sparc/kernel/head_32.S
-f:arch/sparc/kernel/head_64.S
-f:arch/sparc/kernel/helpers.S
-f:arch/sparc/kernel/hvapi.c
-f:arch/sparc/kernel/hvcalls.S
-f:arch/sparc/kernel/hvtramp.S
-f:arch/sparc/kernel/idprom.c
-f:arch/sparc/kernel/iommu-common.c
-f:arch/sparc/kernel/iommu.c
-f:arch/sparc/kernel/iommu_common.h
-f:arch/sparc/kernel/ioport.c
-f:arch/sparc/kernel/irq.h
-f:arch/sparc/kernel/irq_32.c
-f:arch/sparc/kernel/irq_64.c
-f:arch/sparc/kernel/itlb_miss.S
-f:arch/sparc/kernel/ivec.S
-f:arch/sparc/kernel/jump_label.c
-f:arch/sparc/kernel/kernel.h
-f:arch/sparc/kernel/kgdb_32.c
-f:arch/sparc/kernel/kgdb_64.c
-f:arch/sparc/kernel/kprobes.c
-f:arch/sparc/kernel/kstack.h
-f:arch/sparc/kernel/ktlb.S
-f:arch/sparc/kernel/ldc.c
-f:arch/sparc/kernel/led.c
-f:arch/sparc/kernel/leon_kernel.c
-f:arch/sparc/kernel/leon_pci.c
-f:arch/sparc/kernel/leon_pci_grpci1.c
-f:arch/sparc/kernel/leon_pci_grpci2.c
-f:arch/sparc/kernel/leon_pmc.c
-f:arch/sparc/kernel/leon_smp.c
-f:arch/sparc/kernel/mdesc.c
-f:arch/sparc/kernel/misctrap.S
-f:arch/sparc/kernel/module.c
-f:arch/sparc/kernel/nmi.c
-f:arch/sparc/kernel/of_device_32.c
-f:arch/sparc/kernel/of_device_64.c
-f:arch/sparc/kernel/of_device_common.c
-f:arch/sparc/kernel/of_device_common.h
-f:arch/sparc/kernel/pci.c
-f:arch/sparc/kernel/pci_common.c
-f:arch/sparc/kernel/pci_fire.c
-f:arch/sparc/kernel/pci_impl.h
-f:arch/sparc/kernel/pci_msi.c
-f:arch/sparc/kernel/pci_psycho.c
-f:arch/sparc/kernel/pci_sabre.c
-f:arch/sparc/kernel/pci_schizo.c
-f:arch/sparc/kernel/pci_sun4v.c
-f:arch/sparc/kernel/pci_sun4v.h
-f:arch/sparc/kernel/pci_sun4v_asm.S
-f:arch/sparc/kernel/pcic.c
-f:arch/sparc/kernel/pcr.c
-f:arch/sparc/kernel/perf_event.c
-f:arch/sparc/kernel/pmc.c
-f:arch/sparc/kernel/power.c
-f:arch/sparc/kernel/process.c
-f:arch/sparc/kernel/process_32.c
-f:arch/sparc/kernel/process_64.c
-f:arch/sparc/kernel/prom.h
-f:arch/sparc/kernel/prom_32.c
-f:arch/sparc/kernel/prom_64.c
-f:arch/sparc/kernel/prom_common.c
-f:arch/sparc/kernel/prom_irqtrans.c
-f:arch/sparc/kernel/psycho_common.c
-f:arch/sparc/kernel/psycho_common.h
-f:arch/sparc/kernel/ptrace_32.c
-f:arch/sparc/kernel/ptrace_64.c
-f:arch/sparc/kernel/reboot.c
-f:arch/sparc/kernel/rtrap_32.S
-f:arch/sparc/kernel/rtrap_64.S
-f:arch/sparc/kernel/sbus.c
-f:arch/sparc/kernel/setup.c
-f:arch/sparc/kernel/setup_32.c
-f:arch/sparc/kernel/setup_64.c
-f:arch/sparc/kernel/signal32.c
-f:arch/sparc/kernel/signal_32.c
-f:arch/sparc/kernel/signal_64.c
-f:arch/sparc/kernel/sigutil.h
-f:arch/sparc/kernel/sigutil_32.c
-f:arch/sparc/kernel/sigutil_64.c
-f:arch/sparc/kernel/smp_32.c
-f:arch/sparc/kernel/smp_64.c
-f:arch/sparc/kernel/sparc_ksyms.c
-f:arch/sparc/kernel/spiterrs.S
-f:arch/sparc/kernel/sstate.c
-f:arch/sparc/kernel/stacktrace.c
-f:arch/sparc/kernel/starfire.c
-f:arch/sparc/kernel/sun4d_irq.c
-f:arch/sparc/kernel/sun4d_smp.c
-f:arch/sparc/kernel/sun4m_irq.c
-f:arch/sparc/kernel/sun4m_smp.c
-f:arch/sparc/kernel/sun4v_ivec.S
-f:arch/sparc/kernel/sun4v_mcd.S
-f:arch/sparc/kernel/sun4v_tlb_miss.S
-f:arch/sparc/kernel/sys32.S
-f:arch/sparc/kernel/sys_sparc32.c
-f:arch/sparc/kernel/sys_sparc_32.c
-f:arch/sparc/kernel/sys_sparc_64.c
-f:arch/sparc/kernel/syscalls.S
-f:arch/sparc/kernel/syscalls/Makefile
-f:arch/sparc/kernel/syscalls/syscall.tbl
-f:arch/sparc/kernel/sysfs.c
-f:arch/sparc/kernel/systbls.h
-f:arch/sparc/kernel/systbls_32.S
-f:arch/sparc/kernel/systbls_64.S
-f:arch/sparc/kernel/termios.c
-f:arch/sparc/kernel/time_32.c
-f:arch/sparc/kernel/time_64.c
-f:arch/sparc/kernel/trampoline_32.S
-f:arch/sparc/kernel/trampoline_64.S
-f:arch/sparc/kernel/traps_32.c
-f:arch/sparc/kernel/traps_64.c
-f:arch/sparc/kernel/tsb.S
-f:arch/sparc/kernel/ttable_32.S
-f:arch/sparc/kernel/ttable_64.S
-f:arch/sparc/kernel/una_asm_32.S
-f:arch/sparc/kernel/una_asm_64.S
-f:arch/sparc/kernel/unaligned_32.c
-f:arch/sparc/kernel/unaligned_64.c
-f:arch/sparc/kernel/uprobes.c
-f:arch/sparc/kernel/urtt_fill.S
-f:arch/sparc/kernel/utrap.S
-f:arch/sparc/kernel/vdso.c
-f:arch/sparc/kernel/vio.c
-f:arch/sparc/kernel/viohs.c
-f:arch/sparc/kernel/visemul.c
-f:arch/sparc/kernel/vmlinux.lds.S
-f:arch/sparc/kernel/windows.c
-f:arch/sparc/kernel/winfixup.S
-f:arch/sparc/kernel/wof.S
-f:arch/sparc/kernel/wuf.S
-f:arch/sparc/lib/GENbzero.S
-f:arch/sparc/lib/GENcopy_from_user.S
-f:arch/sparc/lib/GENcopy_to_user.S
-f:arch/sparc/lib/GENmemcpy.S
-f:arch/sparc/lib/GENpage.S
-f:arch/sparc/lib/GENpatch.S
-f:arch/sparc/lib/M7copy_from_user.S
-f:arch/sparc/lib/M7copy_to_user.S
-f:arch/sparc/lib/M7memcpy.S
-f:arch/sparc/lib/M7memset.S
-f:arch/sparc/lib/M7patch.S
-f:arch/sparc/lib/Makefile
-f:arch/sparc/lib/Memcpy_utils.S
-f:arch/sparc/lib/NG2copy_from_user.S
-f:arch/sparc/lib/NG2copy_to_user.S
-f:arch/sparc/lib/NG2memcpy.S
-f:arch/sparc/lib/NG2patch.S
-f:arch/sparc/lib/NG4clear_page.S
-f:arch/sparc/lib/NG4copy_from_user.S
-f:arch/sparc/lib/NG4copy_page.S
-f:arch/sparc/lib/NG4copy_to_user.S
-f:arch/sparc/lib/NG4fls.S
-f:arch/sparc/lib/NG4memcpy.S
-f:arch/sparc/lib/NG4memset.S
-f:arch/sparc/lib/NG4patch.S
-f:arch/sparc/lib/NGbzero.S
-f:arch/sparc/lib/NGcopy_from_user.S
-f:arch/sparc/lib/NGcopy_to_user.S
-f:arch/sparc/lib/NGmemcpy.S
-f:arch/sparc/lib/NGpage.S
-f:arch/sparc/lib/NGpatch.S
-f:arch/sparc/lib/PeeCeeI.c
-f:arch/sparc/lib/U1copy_from_user.S
-f:arch/sparc/lib/U1copy_to_user.S
-f:arch/sparc/lib/U1memcpy.S
-f:arch/sparc/lib/U3copy_from_user.S
-f:arch/sparc/lib/U3copy_to_user.S
-f:arch/sparc/lib/U3memcpy.S
-f:arch/sparc/lib/U3patch.S
-f:arch/sparc/lib/VISsave.S
-f:arch/sparc/lib/ashldi3.S
-f:arch/sparc/lib/ashrdi3.S
-f:arch/sparc/lib/atomic32.c
-f:arch/sparc/lib/atomic_64.S
-f:arch/sparc/lib/bitext.c
-f:arch/sparc/lib/bitops.S
-f:arch/sparc/lib/blockops.S
-f:arch/sparc/lib/bzero.S
-f:arch/sparc/lib/checksum_32.S
-f:arch/sparc/lib/checksum_64.S
-f:arch/sparc/lib/clear_page.S
-f:arch/sparc/lib/copy_in_user.S
-f:arch/sparc/lib/copy_page.S
-f:arch/sparc/lib/copy_user.S
-f:arch/sparc/lib/csum_copy.S
-f:arch/sparc/lib/csum_copy_from_user.S
-f:arch/sparc/lib/csum_copy_to_user.S
-f:arch/sparc/lib/divdi3.S
-f:arch/sparc/lib/ffs.S
-f:arch/sparc/lib/fls.S
-f:arch/sparc/lib/fls64.S
-f:arch/sparc/lib/hweight.S
-f:arch/sparc/lib/iomap.c
-f:arch/sparc/lib/ipcsum.S
-f:arch/sparc/lib/libgcc.h
-f:arch/sparc/lib/locks.S
-f:arch/sparc/lib/lshrdi3.S
-f:arch/sparc/lib/mcount.S
-f:arch/sparc/lib/memcmp.S
-f:arch/sparc/lib/memcpy.S
-f:arch/sparc/lib/memmove.S
-f:arch/sparc/lib/memscan_32.S
-f:arch/sparc/lib/memscan_64.S
-f:arch/sparc/lib/memset.S
-f:arch/sparc/lib/muldi3.S
-f:arch/sparc/lib/multi3.S
-f:arch/sparc/lib/strlen.S
-f:arch/sparc/lib/strncmp_32.S
-f:arch/sparc/lib/strncmp_64.S
-f:arch/sparc/lib/udivdi3.S
-f:arch/sparc/lib/xor.S
-f:arch/sparc/math-emu/Makefile
-f:arch/sparc/math-emu/math_32.c
-f:arch/sparc/math-emu/math_64.c
-f:arch/sparc/math-emu/sfp-util_32.h
-f:arch/sparc/math-emu/sfp-util_64.h
-f:arch/sparc/mm/Makefile
-f:arch/sparc/mm/execmem.c
-f:arch/sparc/mm/fault_32.c
-f:arch/sparc/mm/fault_64.c
-f:arch/sparc/mm/hugetlbpage.c
-f:arch/sparc/mm/hypersparc.S
-f:arch/sparc/mm/init_32.c
-f:arch/sparc/mm/init_64.c
-f:arch/sparc/mm/init_64.h
-f:arch/sparc/mm/io-unit.c
-f:arch/sparc/mm/iommu.c
-f:arch/sparc/mm/leon_mm.c
-f:arch/sparc/mm/mm_32.h
-f:arch/sparc/mm/srmmu.c
-f:arch/sparc/mm/srmmu_access.S
-f:arch/sparc/mm/swift.S
-f:arch/sparc/mm/tlb.c
-f:arch/sparc/mm/tsb.c
-f:arch/sparc/mm/tsunami.S
-f:arch/sparc/mm/ultra.S
-f:arch/sparc/mm/viking.S
-f:arch/sparc/net/Makefile
-f:arch/sparc/net/bpf_jit_32.h
-f:arch/sparc/net/bpf_jit_64.h
-f:arch/sparc/net/bpf_jit_asm_32.S
-f:arch/sparc/net/bpf_jit_comp_32.c
-f:arch/sparc/net/bpf_jit_comp_64.c
-f:arch/sparc/power/Makefile
-f:arch/sparc/power/hibernate.c
-f:arch/sparc/power/hibernate_asm.S
-f:arch/sparc/prom/Makefile
-f:arch/sparc/prom/bootstr_32.c
-f:arch/sparc/prom/bootstr_64.c
-f:arch/sparc/prom/cif.S
-f:arch/sparc/prom/console_32.c
-f:arch/sparc/prom/console_64.c
-f:arch/sparc/prom/init_32.c
-f:arch/sparc/prom/init_64.c
-f:arch/sparc/prom/memory.c
-f:arch/sparc/prom/misc_32.c
-f:arch/sparc/prom/misc_64.c
-f:arch/sparc/prom/mp.c
-f:arch/sparc/prom/p1275.c
-f:arch/sparc/prom/printf.c
-f:arch/sparc/prom/ranges.c
-f:arch/sparc/prom/tree_32.c
-f:arch/sparc/prom/tree_64.c
-f:arch/sparc/vdso/.gitignore
-f:arch/sparc/vdso/Makefile
-f:arch/sparc/vdso/vclock_gettime.c
-f:arch/sparc/vdso/vdso-layout.lds.S
-f:arch/sparc/vdso/vdso-note.S
-f:arch/sparc/vdso/vdso.lds.S
-f:arch/sparc/vdso/vdso2c.c
-f:arch/sparc/vdso/vdso2c.h
-f:arch/sparc/vdso/vdso32/.gitignore
-f:arch/sparc/vdso/vdso32/vclock_gettime.c
-f:arch/sparc/vdso/vdso32/vdso-note.S
-f:arch/sparc/vdso/vdso32/vdso32.lds.S
-f:arch/sparc/vdso/vma.c
-f:arch/sparc/video/Makefile
-f:arch/sparc/video/video-common.c
-f:arch/um/.gitignore
-f:arch/um/Kbuild
-f:arch/um/Kconfig
-f:arch/um/Kconfig.debug
-f:arch/um/Makefile
-f:arch/um/Makefile-os-Linux
-f:arch/um/Makefile-skas
-f:arch/um/configs/i386_defconfig
-f:arch/um/configs/x86_64_defconfig
-f:arch/um/drivers/Kconfig
-f:arch/um/drivers/Makefile
-f:arch/um/drivers/chan.h
-f:arch/um/drivers/chan_kern.c
-f:arch/um/drivers/chan_user.c
-f:arch/um/drivers/chan_user.h
-f:arch/um/drivers/cow.h
-f:arch/um/drivers/cow_sys.h
-f:arch/um/drivers/cow_user.c
-f:arch/um/drivers/fd.c
-f:arch/um/drivers/harddog.h
-f:arch/um/drivers/harddog_kern.c
-f:arch/um/drivers/harddog_user.c
-f:arch/um/drivers/harddog_user_exp.c
-f:arch/um/drivers/hostaudio_kern.c
-f:arch/um/drivers/line.c
-f:arch/um/drivers/line.h
-f:arch/um/drivers/mconsole.h
-f:arch/um/drivers/mconsole_kern.c
-f:arch/um/drivers/mconsole_kern.h
-f:arch/um/drivers/mconsole_user.c
-f:arch/um/drivers/mmapper_kern.c
-f:arch/um/drivers/null.c
-f:arch/um/drivers/port.h
-f:arch/um/drivers/port_kern.c
-f:arch/um/drivers/port_user.c
-f:arch/um/drivers/pty.c
-f:arch/um/drivers/random.c
-f:arch/um/drivers/rtc.h
-f:arch/um/drivers/rtc_kern.c
-f:arch/um/drivers/rtc_user.c
-f:arch/um/drivers/ssl.c
-f:arch/um/drivers/stderr_console.c
-f:arch/um/drivers/stdio_console.c
-f:arch/um/drivers/stdio_console.h
-f:arch/um/drivers/tty.c
-f:arch/um/drivers/ubd.h
-f:arch/um/drivers/ubd_kern.c
-f:arch/um/drivers/ubd_user.c
-f:arch/um/drivers/vector_kern.c
-f:arch/um/drivers/vector_kern.h
-f:arch/um/drivers/vector_transports.c
-f:arch/um/drivers/vector_user.c
-f:arch/um/drivers/vector_user.h
-f:arch/um/drivers/vfio_kern.c
-f:arch/um/drivers/vfio_user.c
-f:arch/um/drivers/vfio_user.h
-f:arch/um/drivers/vhost_user.h
-f:arch/um/drivers/virt-pci.c
-f:arch/um/drivers/virt-pci.h
-f:arch/um/drivers/virtio_pcidev.c
-f:arch/um/drivers/virtio_uml.c
-f:arch/um/drivers/xterm.c
-f:arch/um/drivers/xterm.h
-f:arch/um/drivers/xterm_kern.c
-f:arch/um/include/asm/Kbuild
-f:arch/um/include/asm/archrandom.h
-f:arch/um/include/asm/asm-prototypes.h
-f:arch/um/include/asm/bpf_perf_event.h
-f:arch/um/include/asm/cache.h
-f:arch/um/include/asm/cacheflush.h
-f:arch/um/include/asm/common.lds.S
-f:arch/um/include/asm/cpufeature.h
-f:arch/um/include/asm/current.h
-f:arch/um/include/asm/delay.h
-f:arch/um/include/asm/dma.h
-f:arch/um/include/asm/fpu/api.h
-f:arch/um/include/asm/futex.h
-f:arch/um/include/asm/hardirq.h
-f:arch/um/include/asm/io.h
-f:arch/um/include/asm/irq.h
-f:arch/um/include/asm/irqflags.h
-f:arch/um/include/asm/kasan.h
-f:arch/um/include/asm/kvm_para.h
-f:arch/um/include/asm/mmu.h
-f:arch/um/include/asm/mmu_context.h
-f:arch/um/include/asm/msi.h
-f:arch/um/include/asm/page.h
-f:arch/um/include/asm/pci.h
-f:arch/um/include/asm/pgalloc.h
-f:arch/um/include/asm/pgtable-2level.h
-f:arch/um/include/asm/pgtable-4level.h
-f:arch/um/include/asm/pgtable.h
-f:arch/um/include/asm/processor-generic.h
-f:arch/um/include/asm/ptrace-generic.h
-f:arch/um/include/asm/sections.h
-f:arch/um/include/asm/setup.h
-f:arch/um/include/asm/smp.h
-f:arch/um/include/asm/stacktrace.h
-f:arch/um/include/asm/syscall-generic.h
-f:arch/um/include/asm/thread_info.h
-f:arch/um/include/asm/timex.h
-f:arch/um/include/asm/tlb.h
-f:arch/um/include/asm/tlbflush.h
-f:arch/um/include/asm/uaccess.h
-f:arch/um/include/asm/unwind.h
-f:arch/um/include/asm/vmalloc.h
-f:arch/um/include/asm/vmlinux.lds.h
-f:arch/um/include/asm/xor.h
-f:arch/um/include/linux/time-internal.h
-f:arch/um/include/linux/virtio-uml.h
-f:arch/um/include/shared/arch.h
-f:arch/um/include/shared/as-layout.h
-f:arch/um/include/shared/common-offsets.h
-f:arch/um/include/shared/elf_user.h
-f:arch/um/include/shared/frame_kern.h
-f:arch/um/include/shared/init.h
-f:arch/um/include/shared/irq_kern.h
-f:arch/um/include/shared/irq_user.h
-f:arch/um/include/shared/kern.h
-f:arch/um/include/shared/kern_util.h
-f:arch/um/include/shared/longjmp.h
-f:arch/um/include/shared/mem.h
-f:arch/um/include/shared/mem_user.h
-f:arch/um/include/shared/os.h
-f:arch/um/include/shared/ptrace_user.h
-f:arch/um/include/shared/registers.h
-f:arch/um/include/shared/sigio.h
-f:arch/um/include/shared/skas/mm_id.h
-f:arch/um/include/shared/skas/skas.h
-f:arch/um/include/shared/skas/stub-data.h
-f:arch/um/include/shared/timetravel.h
-f:arch/um/include/shared/um_malloc.h
-f:arch/um/include/shared/user.h
-f:arch/um/include/uapi/asm/Kbuild
-f:arch/um/kernel/Makefile
-f:arch/um/kernel/asm-offsets.c
-f:arch/um/kernel/config.c.in
-f:arch/um/kernel/dtb.c
-f:arch/um/kernel/dyn.lds.S
-f:arch/um/kernel/early_printk.c
-f:arch/um/kernel/exec.c
-f:arch/um/kernel/exitcode.c
-f:arch/um/kernel/gprof_syms.c
-f:arch/um/kernel/initrd.c
-f:arch/um/kernel/irq.c
-f:arch/um/kernel/kmsg_dump.c
-f:arch/um/kernel/ksyms.c
-f:arch/um/kernel/load_file.c
-f:arch/um/kernel/mem.c
-f:arch/um/kernel/physmem.c
-f:arch/um/kernel/process.c
-f:arch/um/kernel/ptrace.c
-f:arch/um/kernel/reboot.c
-f:arch/um/kernel/sigio.c
-f:arch/um/kernel/signal.c
-f:arch/um/kernel/skas/.gitignore
-f:arch/um/kernel/skas/Makefile
-f:arch/um/kernel/skas/mmu.c
-f:arch/um/kernel/skas/process.c
-f:arch/um/kernel/skas/stub.c
-f:arch/um/kernel/skas/stub_exe.c
-f:arch/um/kernel/skas/stub_exe_embed.S
-f:arch/um/kernel/skas/syscall.c
-f:arch/um/kernel/skas/uaccess.c
-f:arch/um/kernel/stacktrace.c
-f:arch/um/kernel/sysrq.c
-f:arch/um/kernel/time.c
-f:arch/um/kernel/tlb.c
-f:arch/um/kernel/trap.c
-f:arch/um/kernel/um_arch.c
-f:arch/um/kernel/um_arch.h
-f:arch/um/kernel/umid.c
-f:arch/um/kernel/uml.lds.S
-f:arch/um/kernel/vmlinux.lds.S
-f:arch/um/os-Linux/Makefile
-f:arch/um/os-Linux/elf_aux.c
-f:arch/um/os-Linux/execvp.c
-f:arch/um/os-Linux/file.c
-f:arch/um/os-Linux/helper.c
-f:arch/um/os-Linux/internal.h
-f:arch/um/os-Linux/irq.c
-f:arch/um/os-Linux/main.c
-f:arch/um/os-Linux/mem.c
-f:arch/um/os-Linux/process.c
-f:arch/um/os-Linux/registers.c
-f:arch/um/os-Linux/sigio.c
-f:arch/um/os-Linux/signal.c
-f:arch/um/os-Linux/skas/Makefile
-f:arch/um/os-Linux/skas/mem.c
-f:arch/um/os-Linux/skas/process.c
-f:arch/um/os-Linux/start_up.c
-f:arch/um/os-Linux/time.c
-f:arch/um/os-Linux/tty.c
-f:arch/um/os-Linux/umid.c
-f:arch/um/os-Linux/user_syms.c
-f:arch/um/os-Linux/util.c
-f:arch/um/scripts/Makefile.rules
-f:arch/x86/.gitignore
-f:arch/x86/Kbuild
-f:arch/x86/Kconfig
-f:arch/x86/Kconfig.assembler
-f:arch/x86/Kconfig.cpu
-f:arch/x86/Kconfig.cpufeatures
-f:arch/x86/Kconfig.debug
-f:arch/x86/Makefile
-f:arch/x86/Makefile.um
-f:arch/x86/Makefile_32.cpu
-f:arch/x86/boot/.gitignore
-f:arch/x86/boot/Makefile
-f:arch/x86/boot/a20.c
-f:arch/x86/boot/apm.c
-f:arch/x86/boot/bioscall.S
-f:arch/x86/boot/bitops.h
-f:arch/x86/boot/boot.h
-f:arch/x86/boot/cmdline.c
-f:arch/x86/boot/compressed/.gitignore
-f:arch/x86/boot/compressed/Makefile
-f:arch/x86/boot/compressed/acpi.c
-f:arch/x86/boot/compressed/cmdline.c
-f:arch/x86/boot/compressed/cpuflags.c
-f:arch/x86/boot/compressed/early_serial_console.c
-f:arch/x86/boot/compressed/efi.c
-f:arch/x86/boot/compressed/efi.h
-f:arch/x86/boot/compressed/error.c
-f:arch/x86/boot/compressed/error.h
-f:arch/x86/boot/compressed/head_32.S
-f:arch/x86/boot/compressed/head_64.S
-f:arch/x86/boot/compressed/ident_map_64.c
-f:arch/x86/boot/compressed/idt_64.c
-f:arch/x86/boot/compressed/idt_handlers_64.S
-f:arch/x86/boot/compressed/kaslr.c
-f:arch/x86/boot/compressed/kernel_info.S
-f:arch/x86/boot/compressed/mem.c
-f:arch/x86/boot/compressed/mem_encrypt.S
-f:arch/x86/boot/compressed/misc.c
-f:arch/x86/boot/compressed/misc.h
-f:arch/x86/boot/compressed/mkpiggy.c
-f:arch/x86/boot/compressed/pgtable_64.c
-f:arch/x86/boot/compressed/sbat.S
-f:arch/x86/boot/compressed/sev-handle-vc.c
-f:arch/x86/boot/compressed/sev.c
-f:arch/x86/boot/compressed/sev.h
-f:arch/x86/boot/compressed/string.c
-f:arch/x86/boot/compressed/tdcall.S
-f:arch/x86/boot/compressed/tdx-shared.c
-f:arch/x86/boot/compressed/tdx.c
-f:arch/x86/boot/compressed/tdx.h
-f:arch/x86/boot/compressed/vmlinux.lds.S
-f:arch/x86/boot/copy.S
-f:arch/x86/boot/cpu.c
-f:arch/x86/boot/cpucheck.c
-f:arch/x86/boot/cpuflags.c
-f:arch/x86/boot/cpuflags.h
-f:arch/x86/boot/ctype.h
-f:arch/x86/boot/early_serial_console.c
-f:arch/x86/boot/edd.c
-f:arch/x86/boot/genimage.sh
-f:arch/x86/boot/header.S
-f:arch/x86/boot/install.sh
-f:arch/x86/boot/io.h
-f:arch/x86/boot/main.c
-f:arch/x86/boot/memory.c
-f:arch/x86/boot/mkcpustr.c
-f:arch/x86/boot/msr.h
-f:arch/x86/boot/mtools.conf.in
-f:arch/x86/boot/pm.c
-f:arch/x86/boot/pmjump.S
-f:arch/x86/boot/printf.c
-f:arch/x86/boot/regs.c
-f:arch/x86/boot/setup.ld
-f:arch/x86/boot/startup/Makefile
-f:arch/x86/boot/startup/efi-mixed.S
-f:arch/x86/boot/startup/gdt_idt.c
-f:arch/x86/boot/startup/la57toggle.S
-f:arch/x86/boot/startup/map_kernel.c
-f:arch/x86/boot/startup/sev-shared.c
-f:arch/x86/boot/startup/sev-startup.c
-f:arch/x86/boot/startup/sme.c
-f:arch/x86/boot/string.c
-f:arch/x86/boot/string.h
-f:arch/x86/boot/tty.c
-f:arch/x86/boot/version.c
-f:arch/x86/boot/vesa.h
-f:arch/x86/boot/video-bios.c
-f:arch/x86/boot/video-mode.c
-f:arch/x86/boot/video-vesa.c
-f:arch/x86/boot/video-vga.c
-f:arch/x86/boot/video.c
-f:arch/x86/boot/video.h
-f:arch/x86/coco/Makefile
-f:arch/x86/coco/core.c
-f:arch/x86/coco/sev/Makefile
-f:arch/x86/coco/sev/core.c
-f:arch/x86/coco/sev/sev-nmi.c
-f:arch/x86/coco/sev/vc-handle.c
-f:arch/x86/coco/sev/vc-shared.c
-f:arch/x86/coco/tdx/Makefile
-f:arch/x86/coco/tdx/debug.c
-f:arch/x86/coco/tdx/tdcall.S
-f:arch/x86/coco/tdx/tdx-shared.c
-f:arch/x86/coco/tdx/tdx.c
-f:arch/x86/configs/hardening.config
-f:arch/x86/configs/i386_defconfig
-f:arch/x86/configs/tiny.config
-f:arch/x86/configs/x86_64_defconfig
-f:arch/x86/configs/xen.config
-f:arch/x86/crypto/.gitignore
-f:arch/x86/crypto/Kconfig
-f:arch/x86/crypto/Makefile
-f:arch/x86/crypto/aegis128-aesni-asm.S
-f:arch/x86/crypto/aegis128-aesni-glue.c
-f:arch/x86/crypto/aes-ctr-avx-x86_64.S
-f:arch/x86/crypto/aes-gcm-aesni-x86_64.S
-f:arch/x86/crypto/aes-gcm-avx10-x86_64.S
-f:arch/x86/crypto/aes-xts-avx-x86_64.S
-f:arch/x86/crypto/aesni-intel_asm.S
-f:arch/x86/crypto/aesni-intel_glue.c
-f:arch/x86/crypto/aria-aesni-avx-asm_64.S
-f:arch/x86/crypto/aria-aesni-avx2-asm_64.S
-f:arch/x86/crypto/aria-avx.h
-f:arch/x86/crypto/aria-gfni-avx512-asm_64.S
-f:arch/x86/crypto/aria_aesni_avx2_glue.c
-f:arch/x86/crypto/aria_aesni_avx_glue.c
-f:arch/x86/crypto/aria_gfni_avx512_glue.c
-f:arch/x86/crypto/blowfish-x86_64-asm_64.S
-f:arch/x86/crypto/blowfish_glue.c
-f:arch/x86/crypto/camellia-aesni-avx-asm_64.S
-f:arch/x86/crypto/camellia-aesni-avx2-asm_64.S
-f:arch/x86/crypto/camellia-x86_64-asm_64.S
-f:arch/x86/crypto/camellia.h
-f:arch/x86/crypto/camellia_aesni_avx2_glue.c
-f:arch/x86/crypto/camellia_aesni_avx_glue.c
-f:arch/x86/crypto/camellia_glue.c
-f:arch/x86/crypto/cast5-avx-x86_64-asm_64.S
-f:arch/x86/crypto/cast5_avx_glue.c
-f:arch/x86/crypto/cast6-avx-x86_64-asm_64.S
-f:arch/x86/crypto/cast6_avx_glue.c
-f:arch/x86/crypto/curve25519-x86_64.c
-f:arch/x86/crypto/des3_ede-asm_64.S
-f:arch/x86/crypto/des3_ede_glue.c
-f:arch/x86/crypto/ecb_cbc_helpers.h
-f:arch/x86/crypto/ghash-clmulni-intel_asm.S
-f:arch/x86/crypto/ghash-clmulni-intel_glue.c
-f:arch/x86/crypto/glue_helper-asm-avx.S
-f:arch/x86/crypto/glue_helper-asm-avx2.S
-f:arch/x86/crypto/nh-avx2-x86_64.S
-f:arch/x86/crypto/nh-sse2-x86_64.S
-f:arch/x86/crypto/nhpoly1305-avx2-glue.c
-f:arch/x86/crypto/nhpoly1305-sse2-glue.c
-f:arch/x86/crypto/polyval-clmulni_asm.S
-f:arch/x86/crypto/polyval-clmulni_glue.c
-f:arch/x86/crypto/serpent-avx-x86_64-asm_64.S
-f:arch/x86/crypto/serpent-avx.h
-f:arch/x86/crypto/serpent-avx2-asm_64.S
-f:arch/x86/crypto/serpent-sse2-i586-asm_32.S
-f:arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
-f:arch/x86/crypto/serpent-sse2.h
-f:arch/x86/crypto/serpent_avx2_glue.c
-f:arch/x86/crypto/serpent_avx_glue.c
-f:arch/x86/crypto/serpent_sse2_glue.c
-f:arch/x86/crypto/sm3-avx-asm_64.S
-f:arch/x86/crypto/sm3_avx_glue.c
-f:arch/x86/crypto/sm4-aesni-avx-asm_64.S
-f:arch/x86/crypto/sm4-aesni-avx2-asm_64.S
-f:arch/x86/crypto/sm4-avx.h
-f:arch/x86/crypto/sm4_aesni_avx2_glue.c
-f:arch/x86/crypto/sm4_aesni_avx_glue.c
-f:arch/x86/crypto/twofish-avx-x86_64-asm_64.S
-f:arch/x86/crypto/twofish-i586-asm_32.S
-f:arch/x86/crypto/twofish-x86_64-asm_64-3way.S
-f:arch/x86/crypto/twofish-x86_64-asm_64.S
-f:arch/x86/crypto/twofish.h
-f:arch/x86/crypto/twofish_avx_glue.c
-f:arch/x86/crypto/twofish_glue.c
-f:arch/x86/crypto/twofish_glue_3way.c
-f:arch/x86/entry/Makefile
-f:arch/x86/entry/calling.h
-f:arch/x86/entry/entry.S
-f:arch/x86/entry/entry_32.S
-f:arch/x86/entry/entry_64.S
-f:arch/x86/entry/entry_64_compat.S
-f:arch/x86/entry/entry_64_fred.S
-f:arch/x86/entry/entry_fred.c
-f:arch/x86/entry/syscall_32.c
-f:arch/x86/entry/syscall_64.c
-f:arch/x86/entry/syscalls/Makefile
-f:arch/x86/entry/syscalls/syscall_32.tbl
-f:arch/x86/entry/syscalls/syscall_64.tbl
-f:arch/x86/entry/thunk.S
-f:arch/x86/entry/vdso/.gitignore
-f:arch/x86/entry/vdso/Makefile
-f:arch/x86/entry/vdso/extable.c
-f:arch/x86/entry/vdso/extable.h
-f:arch/x86/entry/vdso/vclock_gettime.c
-f:arch/x86/entry/vdso/vdso-layout.lds.S
-f:arch/x86/entry/vdso/vdso-note.S
-f:arch/x86/entry/vdso/vdso.lds.S
-f:arch/x86/entry/vdso/vdso2c.c
-f:arch/x86/entry/vdso/vdso2c.h
-f:arch/x86/entry/vdso/vdso32-setup.c
-f:arch/x86/entry/vdso/vdso32/.gitignore
-f:arch/x86/entry/vdso/vdso32/fake_32bit_build.h
-f:arch/x86/entry/vdso/vdso32/note.S
-f:arch/x86/entry/vdso/vdso32/sigreturn.S
-f:arch/x86/entry/vdso/vdso32/system_call.S
-f:arch/x86/entry/vdso/vdso32/vclock_gettime.c
-f:arch/x86/entry/vdso/vdso32/vdso32.lds.S
-f:arch/x86/entry/vdso/vdso32/vgetcpu.c
-f:arch/x86/entry/vdso/vdsox32.lds.S
-f:arch/x86/entry/vdso/vgetcpu.c
-f:arch/x86/entry/vdso/vgetrandom-chacha.S
-f:arch/x86/entry/vdso/vgetrandom.c
-f:arch/x86/entry/vdso/vma.c
-f:arch/x86/entry/vdso/vsgx.S
-f:arch/x86/entry/vsyscall/Makefile
-f:arch/x86/entry/vsyscall/vsyscall_64.c
-f:arch/x86/entry/vsyscall/vsyscall_emu_64.S
-f:arch/x86/entry/vsyscall/vsyscall_trace.h
-f:arch/x86/events/Kconfig
-f:arch/x86/events/Makefile
-f:arch/x86/events/amd/Makefile
-f:arch/x86/events/amd/brs.c
-f:arch/x86/events/amd/core.c
-f:arch/x86/events/amd/ibs.c
-f:arch/x86/events/amd/iommu.c
-f:arch/x86/events/amd/iommu.h
-f:arch/x86/events/amd/lbr.c
-f:arch/x86/events/amd/power.c
-f:arch/x86/events/amd/uncore.c
-f:arch/x86/events/core.c
-f:arch/x86/events/intel/Makefile
-f:arch/x86/events/intel/bts.c
-f:arch/x86/events/intel/core.c
-f:arch/x86/events/intel/cstate.c
-f:arch/x86/events/intel/ds.c
-f:arch/x86/events/intel/knc.c
-f:arch/x86/events/intel/lbr.c
-f:arch/x86/events/intel/p4.c
-f:arch/x86/events/intel/p6.c
-f:arch/x86/events/intel/pt.c
-f:arch/x86/events/intel/pt.h
-f:arch/x86/events/intel/uncore.c
-f:arch/x86/events/intel/uncore.h
-f:arch/x86/events/intel/uncore_discovery.c
-f:arch/x86/events/intel/uncore_discovery.h
-f:arch/x86/events/intel/uncore_nhmex.c
-f:arch/x86/events/intel/uncore_snb.c
-f:arch/x86/events/intel/uncore_snbep.c
-f:arch/x86/events/msr.c
-f:arch/x86/events/perf_event.h
-f:arch/x86/events/perf_event_flags.h
-f:arch/x86/events/probe.c
-f:arch/x86/events/probe.h
-f:arch/x86/events/rapl.c
-f:arch/x86/events/utils.c
-f:arch/x86/events/zhaoxin/Makefile
-f:arch/x86/events/zhaoxin/core.c
-f:arch/x86/hyperv/Makefile
-f:arch/x86/hyperv/hv_apic.c
-f:arch/x86/hyperv/hv_init.c
-f:arch/x86/hyperv/hv_spinlock.c
-f:arch/x86/hyperv/hv_vtl.c
-f:arch/x86/hyperv/irqdomain.c
-f:arch/x86/hyperv/ivm.c
-f:arch/x86/hyperv/mmu.c
-f:arch/x86/hyperv/nested.c
-f:arch/x86/ia32/Makefile
-f:arch/x86/ia32/audit.c
-f:arch/x86/include/asm/GEN-for-each-reg.h
-f:arch/x86/include/asm/Kbuild
-f:arch/x86/include/asm/acenv.h
-f:arch/x86/include/asm/acpi.h
-f:arch/x86/include/asm/acrn.h
-f:arch/x86/include/asm/agp.h
-f:arch/x86/include/asm/alternative.h
-f:arch/x86/include/asm/amd/hsmp.h
-f:arch/x86/include/asm/amd/ibs.h
-f:arch/x86/include/asm/amd/nb.h
-f:arch/x86/include/asm/amd/node.h
-f:arch/x86/include/asm/apic.h
-f:arch/x86/include/asm/apicdef.h
-f:arch/x86/include/asm/apm.h
-f:arch/x86/include/asm/arch_hweight.h
-f:arch/x86/include/asm/archrandom.h
-f:arch/x86/include/asm/asm-offsets.h
-f:arch/x86/include/asm/asm-prototypes.h
-f:arch/x86/include/asm/asm.h
-f:arch/x86/include/asm/atomic.h
-f:arch/x86/include/asm/atomic64_32.h
-f:arch/x86/include/asm/atomic64_64.h
-f:arch/x86/include/asm/audit.h
-f:arch/x86/include/asm/barrier.h
-f:arch/x86/include/asm/bios_ebda.h
-f:arch/x86/include/asm/bitops.h
-f:arch/x86/include/asm/boot.h
-f:arch/x86/include/asm/bootparam_utils.h
-f:arch/x86/include/asm/bug.h
-f:arch/x86/include/asm/bugs.h
-f:arch/x86/include/asm/cache.h
-f:arch/x86/include/asm/cacheflush.h
-f:arch/x86/include/asm/cacheinfo.h
-f:arch/x86/include/asm/ce4100.h
-f:arch/x86/include/asm/cfi.h
-f:arch/x86/include/asm/checksum.h
-f:arch/x86/include/asm/checksum_32.h
-f:arch/x86/include/asm/checksum_64.h
-f:arch/x86/include/asm/clocksource.h
-f:arch/x86/include/asm/cmdline.h
-f:arch/x86/include/asm/cmpxchg.h
-f:arch/x86/include/asm/cmpxchg_32.h
-f:arch/x86/include/asm/cmpxchg_64.h
-f:arch/x86/include/asm/coco.h
-f:arch/x86/include/asm/compat.h
-f:arch/x86/include/asm/cpu.h
-f:arch/x86/include/asm/cpu_device_id.h
-f:arch/x86/include/asm/cpu_entry_area.h
-f:arch/x86/include/asm/cpufeature.h
-f:arch/x86/include/asm/cpufeatures.h
-f:arch/x86/include/asm/cpuid.h
-f:arch/x86/include/asm/cpuid/api.h
-f:arch/x86/include/asm/cpuid/types.h
-f:arch/x86/include/asm/cpuidle_haltpoll.h
-f:arch/x86/include/asm/cpumask.h
-f:arch/x86/include/asm/crash.h
-f:arch/x86/include/asm/crash_reserve.h
-f:arch/x86/include/asm/current.h
-f:arch/x86/include/asm/debugreg.h
-f:arch/x86/include/asm/delay.h
-f:arch/x86/include/asm/desc.h
-f:arch/x86/include/asm/desc_defs.h
-f:arch/x86/include/asm/device.h
-f:arch/x86/include/asm/div64.h
-f:arch/x86/include/asm/dma-mapping.h
-f:arch/x86/include/asm/dma.h
-f:arch/x86/include/asm/dmi.h
-f:arch/x86/include/asm/doublefault.h
-f:arch/x86/include/asm/dwarf2.h
-f:arch/x86/include/asm/e820/api.h
-f:arch/x86/include/asm/e820/types.h
-f:arch/x86/include/asm/edac.h
-f:arch/x86/include/asm/efi.h
-f:arch/x86/include/asm/elf.h
-f:arch/x86/include/asm/elfcore-compat.h
-f:arch/x86/include/asm/emergency-restart.h
-f:arch/x86/include/asm/emulate_prefix.h
-f:arch/x86/include/asm/enclu.h
-f:arch/x86/include/asm/entry-common.h
-f:arch/x86/include/asm/espfix.h
-f:arch/x86/include/asm/exec.h
-f:arch/x86/include/asm/extable.h
-f:arch/x86/include/asm/extable_fixup_types.h
-f:arch/x86/include/asm/fixmap.h
-f:arch/x86/include/asm/floppy.h
-f:arch/x86/include/asm/fpu.h
-f:arch/x86/include/asm/fpu/api.h
-f:arch/x86/include/asm/fpu/regset.h
-f:arch/x86/include/asm/fpu/sched.h
-f:arch/x86/include/asm/fpu/signal.h
-f:arch/x86/include/asm/fpu/types.h
-f:arch/x86/include/asm/fpu/xcr.h
-f:arch/x86/include/asm/fpu/xstate.h
-f:arch/x86/include/asm/frame.h
-f:arch/x86/include/asm/fred.h
-f:arch/x86/include/asm/fsgsbase.h
-f:arch/x86/include/asm/ftrace.h
-f:arch/x86/include/asm/futex.h
-f:arch/x86/include/asm/gart.h
-f:arch/x86/include/asm/genapic.h
-f:arch/x86/include/asm/geode.h
-f:arch/x86/include/asm/gsseg.h
-f:arch/x86/include/asm/hardirq.h
-f:arch/x86/include/asm/highmem.h
-f:arch/x86/include/asm/hpet.h
-f:arch/x86/include/asm/hugetlb.h
-f:arch/x86/include/asm/hw_breakpoint.h
-f:arch/x86/include/asm/hw_irq.h
-f:arch/x86/include/asm/hyperv_timer.h
-f:arch/x86/include/asm/hypervisor.h
-f:arch/x86/include/asm/i8259.h
-f:arch/x86/include/asm/ia32.h
-f:arch/x86/include/asm/ibt.h
-f:arch/x86/include/asm/idtentry.h
-f:arch/x86/include/asm/imr.h
-f:arch/x86/include/asm/inat.h
-f:arch/x86/include/asm/inat_types.h
-f:arch/x86/include/asm/init.h
-f:arch/x86/include/asm/insn-eval.h
-f:arch/x86/include/asm/insn.h
-f:arch/x86/include/asm/inst.h
-f:arch/x86/include/asm/intel-family.h
-f:arch/x86/include/asm/intel-mid.h
-f:arch/x86/include/asm/intel_ds.h
-f:arch/x86/include/asm/intel_pt.h
-f:arch/x86/include/asm/intel_punit_ipc.h
-f:arch/x86/include/asm/intel_telemetry.h
-f:arch/x86/include/asm/invpcid.h
-f:arch/x86/include/asm/io.h
-f:arch/x86/include/asm/io_apic.h
-f:arch/x86/include/asm/io_bitmap.h
-f:arch/x86/include/asm/iomap.h
-f:arch/x86/include/asm/iommu.h
-f:arch/x86/include/asm/iosf_mbi.h
-f:arch/x86/include/asm/irq.h
-f:arch/x86/include/asm/irq_remapping.h
-f:arch/x86/include/asm/irq_stack.h
-f:arch/x86/include/asm/irq_vectors.h
-f:arch/x86/include/asm/irq_work.h
-f:arch/x86/include/asm/irqdomain.h
-f:arch/x86/include/asm/irqflags.h
-f:arch/x86/include/asm/ist.h
-f:arch/x86/include/asm/jailhouse_para.h
-f:arch/x86/include/asm/jump_label.h
-f:arch/x86/include/asm/kasan.h
-f:arch/x86/include/asm/kaslr.h
-f:arch/x86/include/asm/kbdleds.h
-f:arch/x86/include/asm/kdebug.h
-f:arch/x86/include/asm/kexec-bzimage64.h
-f:arch/x86/include/asm/kexec.h
-f:arch/x86/include/asm/kfence.h
-f:arch/x86/include/asm/kgdb.h
-f:arch/x86/include/asm/kmsan.h
-f:arch/x86/include/asm/kprobes.h
-f:arch/x86/include/asm/kvm-x86-ops.h
-f:arch/x86/include/asm/kvm-x86-pmu-ops.h
-f:arch/x86/include/asm/kvm_host.h
-f:arch/x86/include/asm/kvm_page_track.h
-f:arch/x86/include/asm/kvm_para.h
-f:arch/x86/include/asm/kvm_types.h
-f:arch/x86/include/asm/kvm_vcpu_regs.h
-f:arch/x86/include/asm/kvmclock.h
-f:arch/x86/include/asm/linkage.h
-f:arch/x86/include/asm/local.h
-f:arch/x86/include/asm/mach_timer.h
-f:arch/x86/include/asm/mach_traps.h
-f:arch/x86/include/asm/math_emu.h
-f:arch/x86/include/asm/mc146818rtc.h
-f:arch/x86/include/asm/mce.h
-f:arch/x86/include/asm/mem_encrypt.h
-f:arch/x86/include/asm/memtype.h
-f:arch/x86/include/asm/microcode.h
-f:arch/x86/include/asm/misc.h
-f:arch/x86/include/asm/mman.h
-f:arch/x86/include/asm/mmconfig.h
-f:arch/x86/include/asm/mmu.h
-f:arch/x86/include/asm/mmu_context.h
-f:arch/x86/include/asm/module.h
-f:arch/x86/include/asm/mpspec.h
-f:arch/x86/include/asm/mpspec_def.h
-f:arch/x86/include/asm/mshyperv.h
-f:arch/x86/include/asm/msi.h
-f:arch/x86/include/asm/msr-index.h
-f:arch/x86/include/asm/msr-trace.h
-f:arch/x86/include/asm/msr.h
-f:arch/x86/include/asm/mtrr.h
-f:arch/x86/include/asm/mwait.h
-f:arch/x86/include/asm/nmi.h
-f:arch/x86/include/asm/nops.h
-f:arch/x86/include/asm/nospec-branch.h
-f:arch/x86/include/asm/numa.h
-f:arch/x86/include/asm/numachip/numachip.h
-f:arch/x86/include/asm/numachip/numachip_csr.h
-f:arch/x86/include/asm/olpc.h
-f:arch/x86/include/asm/olpc_ofw.h
-f:arch/x86/include/asm/orc_header.h
-f:arch/x86/include/asm/orc_lookup.h
-f:arch/x86/include/asm/orc_types.h
-f:arch/x86/include/asm/page.h
-f:arch/x86/include/asm/page_32.h
-f:arch/x86/include/asm/page_32_types.h
-f:arch/x86/include/asm/page_64.h
-f:arch/x86/include/asm/page_64_types.h
-f:arch/x86/include/asm/page_types.h
-f:arch/x86/include/asm/paravirt.h
-f:arch/x86/include/asm/paravirt_api_clock.h
-f:arch/x86/include/asm/paravirt_types.h
-f:arch/x86/include/asm/parport.h
-f:arch/x86/include/asm/pc-conf-reg.h
-f:arch/x86/include/asm/pci-direct.h
-f:arch/x86/include/asm/pci-functions.h
-f:arch/x86/include/asm/pci.h
-f:arch/x86/include/asm/pci_x86.h
-f:arch/x86/include/asm/percpu.h
-f:arch/x86/include/asm/perf_event.h
-f:arch/x86/include/asm/perf_event_p4.h
-f:arch/x86/include/asm/pgalloc.h
-f:arch/x86/include/asm/pgtable-2level.h
-f:arch/x86/include/asm/pgtable-2level_types.h
-f:arch/x86/include/asm/pgtable-3level.h
-f:arch/x86/include/asm/pgtable-3level_types.h
-f:arch/x86/include/asm/pgtable-invert.h
-f:arch/x86/include/asm/pgtable.h
-f:arch/x86/include/asm/pgtable_32.h
-f:arch/x86/include/asm/pgtable_32_areas.h
-f:arch/x86/include/asm/pgtable_32_types.h
-f:arch/x86/include/asm/pgtable_64.h
-f:arch/x86/include/asm/pgtable_64_types.h
-f:arch/x86/include/asm/pgtable_areas.h
-f:arch/x86/include/asm/pgtable_types.h
-f:arch/x86/include/asm/pkeys.h
-f:arch/x86/include/asm/pkru.h
-f:arch/x86/include/asm/platform_sst_audio.h
-f:arch/x86/include/asm/pm-trace.h
-f:arch/x86/include/asm/posix_types.h
-f:arch/x86/include/asm/posted_intr.h
-f:arch/x86/include/asm/preempt.h
-f:arch/x86/include/asm/probe_roms.h
-f:arch/x86/include/asm/processor-cyrix.h
-f:arch/x86/include/asm/processor-flags.h
-f:arch/x86/include/asm/processor.h
-f:arch/x86/include/asm/prom.h
-f:arch/x86/include/asm/proto.h
-f:arch/x86/include/asm/pti.h
-f:arch/x86/include/asm/ptrace.h
-f:arch/x86/include/asm/purgatory.h
-f:arch/x86/include/asm/pvclock-abi.h
-f:arch/x86/include/asm/pvclock.h
-f:arch/x86/include/asm/qrwlock.h
-f:arch/x86/include/asm/qspinlock.h
-f:arch/x86/include/asm/qspinlock_paravirt.h
-f:arch/x86/include/asm/realmode.h
-f:arch/x86/include/asm/reboot.h
-f:arch/x86/include/asm/reboot_fixups.h
-f:arch/x86/include/asm/resctrl.h
-f:arch/x86/include/asm/rmwcc.h
-f:arch/x86/include/asm/rqspinlock.h
-f:arch/x86/include/asm/runtime-const.h
-f:arch/x86/include/asm/seccomp.h
-f:arch/x86/include/asm/sections.h
-f:arch/x86/include/asm/segment.h
-f:arch/x86/include/asm/serial.h
-f:arch/x86/include/asm/set_memory.h
-f:arch/x86/include/asm/setup.h
-f:arch/x86/include/asm/setup_arch.h
-f:arch/x86/include/asm/setup_data.h
-f:arch/x86/include/asm/sev-common.h
-f:arch/x86/include/asm/sev-internal.h
-f:arch/x86/include/asm/sev.h
-f:arch/x86/include/asm/sgx.h
-f:arch/x86/include/asm/shared/io.h
-f:arch/x86/include/asm/shared/msr.h
-f:arch/x86/include/asm/shared/tdx.h
-f:arch/x86/include/asm/shmparam.h
-f:arch/x86/include/asm/shstk.h
-f:arch/x86/include/asm/sigcontext.h
-f:arch/x86/include/asm/sigframe.h
-f:arch/x86/include/asm/sighandling.h
-f:arch/x86/include/asm/signal.h
-f:arch/x86/include/asm/simd.h
-f:arch/x86/include/asm/smap.h
-f:arch/x86/include/asm/smp.h
-f:arch/x86/include/asm/softirq_stack.h
-f:arch/x86/include/asm/sparsemem.h
-f:arch/x86/include/asm/spec-ctrl.h
-f:arch/x86/include/asm/special_insns.h
-f:arch/x86/include/asm/spinlock.h
-f:arch/x86/include/asm/spinlock_types.h
-f:arch/x86/include/asm/stackprotector.h
-f:arch/x86/include/asm/stacktrace.h
-f:arch/x86/include/asm/static_call.h
-f:arch/x86/include/asm/string.h
-f:arch/x86/include/asm/string_32.h
-f:arch/x86/include/asm/string_64.h
-f:arch/x86/include/asm/suspend.h
-f:arch/x86/include/asm/suspend_32.h
-f:arch/x86/include/asm/suspend_64.h
-f:arch/x86/include/asm/svm.h
-f:arch/x86/include/asm/switch_to.h
-f:arch/x86/include/asm/sync_bitops.h
-f:arch/x86/include/asm/sync_core.h
-f:arch/x86/include/asm/syscall.h
-f:arch/x86/include/asm/syscall_wrapper.h
-f:arch/x86/include/asm/syscalls.h
-f:arch/x86/include/asm/tdx.h
-f:arch/x86/include/asm/tdx_global_metadata.h
-f:arch/x86/include/asm/text-patching.h
-f:arch/x86/include/asm/thermal.h
-f:arch/x86/include/asm/thread_info.h
-f:arch/x86/include/asm/time.h
-f:arch/x86/include/asm/timer.h
-f:arch/x86/include/asm/timex.h
-f:arch/x86/include/asm/tlb.h
-f:arch/x86/include/asm/tlbbatch.h
-f:arch/x86/include/asm/tlbflush.h
-f:arch/x86/include/asm/topology.h
-f:arch/x86/include/asm/trace/fpu.h
-f:arch/x86/include/asm/trace/hyperv.h
-f:arch/x86/include/asm/trace/irq_vectors.h
-f:arch/x86/include/asm/trace_clock.h
-f:arch/x86/include/asm/trap_pf.h
-f:arch/x86/include/asm/trapnr.h
-f:arch/x86/include/asm/traps.h
-f:arch/x86/include/asm/tsc.h
-f:arch/x86/include/asm/uaccess.h
-f:arch/x86/include/asm/uaccess_32.h
-f:arch/x86/include/asm/uaccess_64.h
-f:arch/x86/include/asm/umip.h
-f:arch/x86/include/asm/unaccepted_memory.h
-f:arch/x86/include/asm/unistd.h
-f:arch/x86/include/asm/unwind.h
-f:arch/x86/include/asm/unwind_hints.h
-f:arch/x86/include/asm/uprobes.h
-f:arch/x86/include/asm/user.h
-f:arch/x86/include/asm/user32.h
-f:arch/x86/include/asm/user_32.h
-f:arch/x86/include/asm/user_64.h
-f:arch/x86/include/asm/uv/bios.h
-f:arch/x86/include/asm/uv/uv.h
-f:arch/x86/include/asm/uv/uv_geo.h
-f:arch/x86/include/asm/uv/uv_hub.h
-f:arch/x86/include/asm/uv/uv_irq.h
-f:arch/x86/include/asm/uv/uv_mmrs.h
-f:arch/x86/include/asm/vdso.h
-f:arch/x86/include/asm/vdso/clocksource.h
-f:arch/x86/include/asm/vdso/getrandom.h
-f:arch/x86/include/asm/vdso/gettimeofday.h
-f:arch/x86/include/asm/vdso/processor.h
-f:arch/x86/include/asm/vdso/vsyscall.h
-f:arch/x86/include/asm/vermagic.h
-f:arch/x86/include/asm/vga.h
-f:arch/x86/include/asm/vgtod.h
-f:arch/x86/include/asm/video.h
-f:arch/x86/include/asm/vm86.h
-f:arch/x86/include/asm/vmalloc.h
-f:arch/x86/include/asm/vmware.h
-f:arch/x86/include/asm/vmx.h
-f:arch/x86/include/asm/vmxfeatures.h
-f:arch/x86/include/asm/vsyscall.h
-f:arch/x86/include/asm/word-at-a-time.h
-f:arch/x86/include/asm/x86_init.h
-f:arch/x86/include/asm/xen/cpuid.h
-f:arch/x86/include/asm/xen/events.h
-f:arch/x86/include/asm/xen/hypercall.h
-f:arch/x86/include/asm/xen/hypervisor.h
-f:arch/x86/include/asm/xen/interface.h
-f:arch/x86/include/asm/xen/interface_32.h
-f:arch/x86/include/asm/xen/interface_64.h
-f:arch/x86/include/asm/xen/page.h
-f:arch/x86/include/asm/xen/pci.h
-f:arch/x86/include/asm/xen/swiotlb-xen.h
-f:arch/x86/include/asm/xen/trace_types.h
-f:arch/x86/include/asm/xor.h
-f:arch/x86/include/asm/xor_32.h
-f:arch/x86/include/asm/xor_64.h
-f:arch/x86/include/asm/xor_avx.h
-f:arch/x86/include/uapi/asm/Kbuild
-f:arch/x86/include/uapi/asm/a.out.h
-f:arch/x86/include/uapi/asm/amd_hsmp.h
-f:arch/x86/include/uapi/asm/auxvec.h
-f:arch/x86/include/uapi/asm/bitsperlong.h
-f:arch/x86/include/uapi/asm/boot.h
-f:arch/x86/include/uapi/asm/bootparam.h
-f:arch/x86/include/uapi/asm/byteorder.h
-f:arch/x86/include/uapi/asm/debugreg.h
-f:arch/x86/include/uapi/asm/e820.h
-f:arch/x86/include/uapi/asm/elf.h
-f:arch/x86/include/uapi/asm/hw_breakpoint.h
-f:arch/x86/include/uapi/asm/hwcap2.h
-f:arch/x86/include/uapi/asm/ist.h
-f:arch/x86/include/uapi/asm/kvm.h
-f:arch/x86/include/uapi/asm/kvm_para.h
-f:arch/x86/include/uapi/asm/kvm_perf.h
-f:arch/x86/include/uapi/asm/ldt.h
-f:arch/x86/include/uapi/asm/mce.h
-f:arch/x86/include/uapi/asm/mman.h
-f:arch/x86/include/uapi/asm/msgbuf.h
-f:arch/x86/include/uapi/asm/msr.h
-f:arch/x86/include/uapi/asm/mtrr.h
-f:arch/x86/include/uapi/asm/perf_regs.h
-f:arch/x86/include/uapi/asm/posix_types.h
-f:arch/x86/include/uapi/asm/posix_types_32.h
-f:arch/x86/include/uapi/asm/posix_types_64.h
-f:arch/x86/include/uapi/asm/posix_types_x32.h
-f:arch/x86/include/uapi/asm/prctl.h
-f:arch/x86/include/uapi/asm/processor-flags.h
-f:arch/x86/include/uapi/asm/ptrace-abi.h
-f:arch/x86/include/uapi/asm/ptrace.h
-f:arch/x86/include/uapi/asm/sembuf.h
-f:arch/x86/include/uapi/asm/setup.h
-f:arch/x86/include/uapi/asm/setup_data.h
-f:arch/x86/include/uapi/asm/sgx.h
-f:arch/x86/include/uapi/asm/shmbuf.h
-f:arch/x86/include/uapi/asm/sigcontext.h
-f:arch/x86/include/uapi/asm/sigcontext32.h
-f:arch/x86/include/uapi/asm/siginfo.h
-f:arch/x86/include/uapi/asm/signal.h
-f:arch/x86/include/uapi/asm/stat.h
-f:arch/x86/include/uapi/asm/statfs.h
-f:arch/x86/include/uapi/asm/svm.h
-f:arch/x86/include/uapi/asm/swab.h
-f:arch/x86/include/uapi/asm/ucontext.h
-f:arch/x86/include/uapi/asm/unistd.h
-f:arch/x86/include/uapi/asm/vm86.h
-f:arch/x86/include/uapi/asm/vmx.h
-f:arch/x86/include/uapi/asm/vsyscall.h
-f:arch/x86/kernel/.gitignore
-f:arch/x86/kernel/Makefile
-f:arch/x86/kernel/acpi/Makefile
-f:arch/x86/kernel/acpi/apei.c
-f:arch/x86/kernel/acpi/boot.c
-f:arch/x86/kernel/acpi/cppc.c
-f:arch/x86/kernel/acpi/cstate.c
-f:arch/x86/kernel/acpi/madt_playdead.S
-f:arch/x86/kernel/acpi/madt_wakeup.c
-f:arch/x86/kernel/acpi/sleep.c
-f:arch/x86/kernel/acpi/sleep.h
-f:arch/x86/kernel/acpi/wakeup_32.S
-f:arch/x86/kernel/acpi/wakeup_64.S
-f:arch/x86/kernel/alternative.c
-f:arch/x86/kernel/amd_gart_64.c
-f:arch/x86/kernel/amd_nb.c
-f:arch/x86/kernel/amd_node.c
-f:arch/x86/kernel/aperture_64.c
-f:arch/x86/kernel/apic/Makefile
-f:arch/x86/kernel/apic/apic.c
-f:arch/x86/kernel/apic/apic_common.c
-f:arch/x86/kernel/apic/apic_flat_64.c
-f:arch/x86/kernel/apic/apic_noop.c
-f:arch/x86/kernel/apic/apic_numachip.c
-f:arch/x86/kernel/apic/hw_nmi.c
-f:arch/x86/kernel/apic/init.c
-f:arch/x86/kernel/apic/io_apic.c
-f:arch/x86/kernel/apic/ipi.c
-f:arch/x86/kernel/apic/local.h
-f:arch/x86/kernel/apic/msi.c
-f:arch/x86/kernel/apic/probe_32.c
-f:arch/x86/kernel/apic/probe_64.c
-f:arch/x86/kernel/apic/vector.c
-f:arch/x86/kernel/apic/x2apic_cluster.c
-f:arch/x86/kernel/apic/x2apic_phys.c
-f:arch/x86/kernel/apic/x2apic_uv_x.c
-f:arch/x86/kernel/apm_32.c
-f:arch/x86/kernel/asm-offsets.c
-f:arch/x86/kernel/asm-offsets_32.c
-f:arch/x86/kernel/asm-offsets_64.c
-f:arch/x86/kernel/audit_64.c
-f:arch/x86/kernel/bootflag.c
-f:arch/x86/kernel/callthunks.c
-f:arch/x86/kernel/cet.c
-f:arch/x86/kernel/cfi.c
-f:arch/x86/kernel/check.c
-f:arch/x86/kernel/cpu/.gitignore
-f:arch/x86/kernel/cpu/Makefile
-f:arch/x86/kernel/cpu/acrn.c
-f:arch/x86/kernel/cpu/amd.c
-f:arch/x86/kernel/cpu/amd_cache_disable.c
-f:arch/x86/kernel/cpu/aperfmperf.c
-f:arch/x86/kernel/cpu/bugs.c
-f:arch/x86/kernel/cpu/bus_lock.c
-f:arch/x86/kernel/cpu/cacheinfo.c
-f:arch/x86/kernel/cpu/centaur.c
-f:arch/x86/kernel/cpu/common.c
-f:arch/x86/kernel/cpu/cpu.h
-f:arch/x86/kernel/cpu/cpuid-deps.c
-f:arch/x86/kernel/cpu/cpuid_0x2_table.c
-f:arch/x86/kernel/cpu/cyrix.c
-f:arch/x86/kernel/cpu/debugfs.c
-f:arch/x86/kernel/cpu/feat_ctl.c
-f:arch/x86/kernel/cpu/hygon.c
-f:arch/x86/kernel/cpu/hypervisor.c
-f:arch/x86/kernel/cpu/intel.c
-f:arch/x86/kernel/cpu/intel_epb.c
-f:arch/x86/kernel/cpu/match.c
-f:arch/x86/kernel/cpu/mce/Makefile
-f:arch/x86/kernel/cpu/mce/amd.c
-f:arch/x86/kernel/cpu/mce/apei.c
-f:arch/x86/kernel/cpu/mce/core.c
-f:arch/x86/kernel/cpu/mce/dev-mcelog.c
-f:arch/x86/kernel/cpu/mce/genpool.c
-f:arch/x86/kernel/cpu/mce/inject.c
-f:arch/x86/kernel/cpu/mce/intel.c
-f:arch/x86/kernel/cpu/mce/internal.h
-f:arch/x86/kernel/cpu/mce/p5.c
-f:arch/x86/kernel/cpu/mce/severity.c
-f:arch/x86/kernel/cpu/mce/threshold.c
-f:arch/x86/kernel/cpu/mce/winchip.c
-f:arch/x86/kernel/cpu/microcode/Makefile
-f:arch/x86/kernel/cpu/microcode/amd.c
-f:arch/x86/kernel/cpu/microcode/amd_shas.c
-f:arch/x86/kernel/cpu/microcode/core.c
-f:arch/x86/kernel/cpu/microcode/intel-ucode-defs.h
-f:arch/x86/kernel/cpu/microcode/intel.c
-f:arch/x86/kernel/cpu/microcode/internal.h
-f:arch/x86/kernel/cpu/mkcapflags.sh
-f:arch/x86/kernel/cpu/mshyperv.c
-f:arch/x86/kernel/cpu/mtrr/Makefile
-f:arch/x86/kernel/cpu/mtrr/amd.c
-f:arch/x86/kernel/cpu/mtrr/centaur.c
-f:arch/x86/kernel/cpu/mtrr/cleanup.c
-f:arch/x86/kernel/cpu/mtrr/cyrix.c
-f:arch/x86/kernel/cpu/mtrr/generic.c
-f:arch/x86/kernel/cpu/mtrr/if.c
-f:arch/x86/kernel/cpu/mtrr/legacy.c
-f:arch/x86/kernel/cpu/mtrr/mtrr.c
-f:arch/x86/kernel/cpu/mtrr/mtrr.h
-f:arch/x86/kernel/cpu/perfctr-watchdog.c
-f:arch/x86/kernel/cpu/powerflags.c
-f:arch/x86/kernel/cpu/proc.c
-f:arch/x86/kernel/cpu/rdrand.c
-f:arch/x86/kernel/cpu/resctrl/Makefile
-f:arch/x86/kernel/cpu/resctrl/core.c
-f:arch/x86/kernel/cpu/resctrl/ctrlmondata.c
-f:arch/x86/kernel/cpu/resctrl/internal.h
-f:arch/x86/kernel/cpu/resctrl/monitor.c
-f:arch/x86/kernel/cpu/resctrl/pseudo_lock.c
-f:arch/x86/kernel/cpu/resctrl/pseudo_lock_trace.h
-f:arch/x86/kernel/cpu/resctrl/rdtgroup.c
-f:arch/x86/kernel/cpu/scattered.c
-f:arch/x86/kernel/cpu/sgx/Makefile
-f:arch/x86/kernel/cpu/sgx/driver.c
-f:arch/x86/kernel/cpu/sgx/driver.h
-f:arch/x86/kernel/cpu/sgx/encl.c
-f:arch/x86/kernel/cpu/sgx/encl.h
-f:arch/x86/kernel/cpu/sgx/encls.h
-f:arch/x86/kernel/cpu/sgx/ioctl.c
-f:arch/x86/kernel/cpu/sgx/main.c
-f:arch/x86/kernel/cpu/sgx/sgx.h
-f:arch/x86/kernel/cpu/sgx/virt.c
-f:arch/x86/kernel/cpu/topology.c
-f:arch/x86/kernel/cpu/topology.h
-f:arch/x86/kernel/cpu/topology_amd.c
-f:arch/x86/kernel/cpu/topology_common.c
-f:arch/x86/kernel/cpu/topology_ext.c
-f:arch/x86/kernel/cpu/transmeta.c
-f:arch/x86/kernel/cpu/tsx.c
-f:arch/x86/kernel/cpu/umc.c
-f:arch/x86/kernel/cpu/umwait.c
-f:arch/x86/kernel/cpu/vmware.c
-f:arch/x86/kernel/cpu/vortex.c
-f:arch/x86/kernel/cpu/zhaoxin.c
-f:arch/x86/kernel/cpuid.c
-f:arch/x86/kernel/crash.c
-f:arch/x86/kernel/crash_dump_32.c
-f:arch/x86/kernel/crash_dump_64.c
-f:arch/x86/kernel/devicetree.c
-f:arch/x86/kernel/doublefault_32.c
-f:arch/x86/kernel/dumpstack.c
-f:arch/x86/kernel/dumpstack_32.c
-f:arch/x86/kernel/dumpstack_64.c
-f:arch/x86/kernel/e820.c
-f:arch/x86/kernel/early-quirks.c
-f:arch/x86/kernel/early_printk.c
-f:arch/x86/kernel/ebda.c
-f:arch/x86/kernel/eisa.c
-f:arch/x86/kernel/espfix_64.c
-f:arch/x86/kernel/fpu/Makefile
-f:arch/x86/kernel/fpu/bugs.c
-f:arch/x86/kernel/fpu/context.h
-f:arch/x86/kernel/fpu/core.c
-f:arch/x86/kernel/fpu/init.c
-f:arch/x86/kernel/fpu/internal.h
-f:arch/x86/kernel/fpu/legacy.h
-f:arch/x86/kernel/fpu/regset.c
-f:arch/x86/kernel/fpu/signal.c
-f:arch/x86/kernel/fpu/xstate.c
-f:arch/x86/kernel/fpu/xstate.h
-f:arch/x86/kernel/fred.c
-f:arch/x86/kernel/ftrace.c
-f:arch/x86/kernel/ftrace_32.S
-f:arch/x86/kernel/ftrace_64.S
-f:arch/x86/kernel/head32.c
-f:arch/x86/kernel/head64.c
-f:arch/x86/kernel/head_32.S
-f:arch/x86/kernel/head_64.S
-f:arch/x86/kernel/hpet.c
-f:arch/x86/kernel/hw_breakpoint.c
-f:arch/x86/kernel/i8237.c
-f:arch/x86/kernel/i8253.c
-f:arch/x86/kernel/i8259.c
-f:arch/x86/kernel/ibt_selftest.S
-f:arch/x86/kernel/idt.c
-f:arch/x86/kernel/io_delay.c
-f:arch/x86/kernel/ioport.c
-f:arch/x86/kernel/irq.c
-f:arch/x86/kernel/irq_32.c
-f:arch/x86/kernel/irq_64.c
-f:arch/x86/kernel/irq_work.c
-f:arch/x86/kernel/irqflags.S
-f:arch/x86/kernel/irqinit.c
-f:arch/x86/kernel/itmt.c
-f:arch/x86/kernel/jailhouse.c
-f:arch/x86/kernel/jump_label.c
-f:arch/x86/kernel/kdebugfs.c
-f:arch/x86/kernel/kexec-bzimage64.c
-f:arch/x86/kernel/kgdb.c
-f:arch/x86/kernel/kprobes/Makefile
-f:arch/x86/kernel/kprobes/common.h
-f:arch/x86/kernel/kprobes/core.c
-f:arch/x86/kernel/kprobes/ftrace.c
-f:arch/x86/kernel/kprobes/opt.c
-f:arch/x86/kernel/ksysfs.c
-f:arch/x86/kernel/kvm.c
-f:arch/x86/kernel/kvmclock.c
-f:arch/x86/kernel/ldt.c
-f:arch/x86/kernel/machine_kexec_32.c
-f:arch/x86/kernel/machine_kexec_64.c
-f:arch/x86/kernel/mmconf-fam10h_64.c
-f:arch/x86/kernel/module.c
-f:arch/x86/kernel/mpparse.c
-f:arch/x86/kernel/msr.c
-f:arch/x86/kernel/nmi.c
-f:arch/x86/kernel/nmi_selftest.c
-f:arch/x86/kernel/paravirt-spinlocks.c
-f:arch/x86/kernel/paravirt.c
-f:arch/x86/kernel/pci-dma.c
-f:arch/x86/kernel/pcspeaker.c
-f:arch/x86/kernel/perf_regs.c
-f:arch/x86/kernel/platform-quirks.c
-f:arch/x86/kernel/pmem.c
-f:arch/x86/kernel/probe_roms.c
-f:arch/x86/kernel/process.c
-f:arch/x86/kernel/process.h
-f:arch/x86/kernel/process_32.c
-f:arch/x86/kernel/process_64.c
-f:arch/x86/kernel/ptrace.c
-f:arch/x86/kernel/pvclock.c
-f:arch/x86/kernel/quirks.c
-f:arch/x86/kernel/reboot.c
-f:arch/x86/kernel/reboot_fixups_32.c
-f:arch/x86/kernel/relocate_kernel_32.S
-f:arch/x86/kernel/relocate_kernel_64.S
-f:arch/x86/kernel/resource.c
-f:arch/x86/kernel/rethook.c
-f:arch/x86/kernel/rtc.c
-f:arch/x86/kernel/setup.c
-f:arch/x86/kernel/setup_percpu.c
-f:arch/x86/kernel/sev_verify_cbit.S
-f:arch/x86/kernel/shstk.c
-f:arch/x86/kernel/signal.c
-f:arch/x86/kernel/signal_32.c
-f:arch/x86/kernel/signal_64.c
-f:arch/x86/kernel/smp.c
-f:arch/x86/kernel/smpboot.c
-f:arch/x86/kernel/stacktrace.c
-f:arch/x86/kernel/static_call.c
-f:arch/x86/kernel/step.c
-f:arch/x86/kernel/sys_ia32.c
-f:arch/x86/kernel/sys_x86_64.c
-f:arch/x86/kernel/tboot.c
-f:arch/x86/kernel/time.c
-f:arch/x86/kernel/tls.c
-f:arch/x86/kernel/tls.h
-f:arch/x86/kernel/trace.c
-f:arch/x86/kernel/trace_clock.c
-f:arch/x86/kernel/traps.c
-f:arch/x86/kernel/tsc.c
-f:arch/x86/kernel/tsc_msr.c
-f:arch/x86/kernel/tsc_sync.c
-f:arch/x86/kernel/umip.c
-f:arch/x86/kernel/unwind_frame.c
-f:arch/x86/kernel/unwind_guess.c
-f:arch/x86/kernel/unwind_orc.c
-f:arch/x86/kernel/uprobes.c
-f:arch/x86/kernel/verify_cpu.S
-f:arch/x86/kernel/vm86_32.c
-f:arch/x86/kernel/vmcore_info_32.c
-f:arch/x86/kernel/vmcore_info_64.c
-f:arch/x86/kernel/vmlinux.lds.S
-f:arch/x86/kernel/vsmp_64.c
-f:arch/x86/kernel/x86_init.c
-f:arch/x86/kvm/.gitignore
-f:arch/x86/kvm/Kconfig
-f:arch/x86/kvm/Makefile
-f:arch/x86/kvm/cpuid.c
-f:arch/x86/kvm/cpuid.h
-f:arch/x86/kvm/debugfs.c
-f:arch/x86/kvm/emulate.c
-f:arch/x86/kvm/fpu.h
-f:arch/x86/kvm/hyperv.c
-f:arch/x86/kvm/hyperv.h
-f:arch/x86/kvm/i8254.c
-f:arch/x86/kvm/i8254.h
-f:arch/x86/kvm/i8259.c
-f:arch/x86/kvm/ioapic.c
-f:arch/x86/kvm/ioapic.h
-f:arch/x86/kvm/irq.c
-f:arch/x86/kvm/irq.h
-f:arch/x86/kvm/kvm-asm-offsets.c
-f:arch/x86/kvm/kvm_cache_regs.h
-f:arch/x86/kvm/kvm_emulate.h
-f:arch/x86/kvm/kvm_onhyperv.c
-f:arch/x86/kvm/kvm_onhyperv.h
-f:arch/x86/kvm/lapic.c
-f:arch/x86/kvm/lapic.h
-f:arch/x86/kvm/mmu.h
-f:arch/x86/kvm/mmu/mmu.c
-f:arch/x86/kvm/mmu/mmu_internal.h
-f:arch/x86/kvm/mmu/mmutrace.h
-f:arch/x86/kvm/mmu/page_track.c
-f:arch/x86/kvm/mmu/page_track.h
-f:arch/x86/kvm/mmu/paging_tmpl.h
-f:arch/x86/kvm/mmu/spte.c
-f:arch/x86/kvm/mmu/spte.h
-f:arch/x86/kvm/mmu/tdp_iter.c
-f:arch/x86/kvm/mmu/tdp_iter.h
-f:arch/x86/kvm/mmu/tdp_mmu.c
-f:arch/x86/kvm/mmu/tdp_mmu.h
-f:arch/x86/kvm/mtrr.c
-f:arch/x86/kvm/pmu.c
-f:arch/x86/kvm/pmu.h
-f:arch/x86/kvm/reverse_cpuid.h
-f:arch/x86/kvm/smm.c
-f:arch/x86/kvm/smm.h
-f:arch/x86/kvm/svm/avic.c
-f:arch/x86/kvm/svm/hyperv.c
-f:arch/x86/kvm/svm/hyperv.h
-f:arch/x86/kvm/svm/nested.c
-f:arch/x86/kvm/svm/pmu.c
-f:arch/x86/kvm/svm/sev.c
-f:arch/x86/kvm/svm/svm.c
-f:arch/x86/kvm/svm/svm.h
-f:arch/x86/kvm/svm/svm_onhyperv.c
-f:arch/x86/kvm/svm/svm_onhyperv.h
-f:arch/x86/kvm/svm/svm_ops.h
-f:arch/x86/kvm/svm/vmenter.S
-f:arch/x86/kvm/trace.h
-f:arch/x86/kvm/tss.h
-f:arch/x86/kvm/vmx/capabilities.h
-f:arch/x86/kvm/vmx/common.h
-f:arch/x86/kvm/vmx/hyperv.c
-f:arch/x86/kvm/vmx/hyperv.h
-f:arch/x86/kvm/vmx/hyperv_evmcs.c
-f:arch/x86/kvm/vmx/hyperv_evmcs.h
-f:arch/x86/kvm/vmx/main.c
-f:arch/x86/kvm/vmx/nested.c
-f:arch/x86/kvm/vmx/nested.h
-f:arch/x86/kvm/vmx/pmu_intel.c
-f:arch/x86/kvm/vmx/pmu_intel.h
-f:arch/x86/kvm/vmx/posted_intr.c
-f:arch/x86/kvm/vmx/posted_intr.h
-f:arch/x86/kvm/vmx/run_flags.h
-f:arch/x86/kvm/vmx/sgx.c
-f:arch/x86/kvm/vmx/sgx.h
-f:arch/x86/kvm/vmx/tdx.c
-f:arch/x86/kvm/vmx/tdx.h
-f:arch/x86/kvm/vmx/tdx_arch.h
-f:arch/x86/kvm/vmx/tdx_errno.h
-f:arch/x86/kvm/vmx/vmcs.h
-f:arch/x86/kvm/vmx/vmcs12.c
-f:arch/x86/kvm/vmx/vmcs12.h
-f:arch/x86/kvm/vmx/vmcs_shadow_fields.h
-f:arch/x86/kvm/vmx/vmenter.S
-f:arch/x86/kvm/vmx/vmx.c
-f:arch/x86/kvm/vmx/vmx.h
-f:arch/x86/kvm/vmx/vmx_onhyperv.c
-f:arch/x86/kvm/vmx/vmx_onhyperv.h
-f:arch/x86/kvm/vmx/vmx_ops.h
-f:arch/x86/kvm/vmx/x86_ops.h
-f:arch/x86/kvm/x86.c
-f:arch/x86/kvm/x86.h
-f:arch/x86/kvm/xen.c
-f:arch/x86/kvm/xen.h
-f:arch/x86/lib/.gitignore
-f:arch/x86/lib/Makefile
-f:arch/x86/lib/atomic64_32.c
-f:arch/x86/lib/atomic64_386_32.S
-f:arch/x86/lib/atomic64_cx8_32.S
-f:arch/x86/lib/bhi.S
-f:arch/x86/lib/cache-smp.c
-f:arch/x86/lib/checksum_32.S
-f:arch/x86/lib/clear_page_64.S
-f:arch/x86/lib/cmdline.c
-f:arch/x86/lib/cmpxchg16b_emu.S
-f:arch/x86/lib/cmpxchg8b_emu.S
-f:arch/x86/lib/copy_mc.c
-f:arch/x86/lib/copy_mc_64.S
-f:arch/x86/lib/copy_page_64.S
-f:arch/x86/lib/copy_user_64.S
-f:arch/x86/lib/copy_user_uncached_64.S
-f:arch/x86/lib/cpu.c
-f:arch/x86/lib/csum-copy_64.S
-f:arch/x86/lib/csum-partial_64.c
-f:arch/x86/lib/csum-wrappers_64.c
-f:arch/x86/lib/delay.c
-f:arch/x86/lib/error-inject.c
-f:arch/x86/lib/getuser.S
-f:arch/x86/lib/hweight.S
-f:arch/x86/lib/inat.c
-f:arch/x86/lib/insn-eval.c
-f:arch/x86/lib/insn.c
-f:arch/x86/lib/iomem.c
-f:arch/x86/lib/kaslr.c
-f:arch/x86/lib/memcpy_32.c
-f:arch/x86/lib/memcpy_64.S
-f:arch/x86/lib/memmove_32.S
-f:arch/x86/lib/memmove_64.S
-f:arch/x86/lib/memset_64.S
-f:arch/x86/lib/misc.c
-f:arch/x86/lib/msr-reg-export.c
-f:arch/x86/lib/msr-reg.S
-f:arch/x86/lib/msr-smp.c
-f:arch/x86/lib/msr.c
-f:arch/x86/lib/pc-conf-reg.c
-f:arch/x86/lib/putuser.S
-f:arch/x86/lib/retpoline.S
-f:arch/x86/lib/string_32.c
-f:arch/x86/lib/strstr_32.c
-f:arch/x86/lib/usercopy.c
-f:arch/x86/lib/usercopy_32.c
-f:arch/x86/lib/usercopy_64.c
-f:arch/x86/lib/x86-opcode-map.txt
-f:arch/x86/math-emu/Makefile
-f:arch/x86/math-emu/README
-f:arch/x86/math-emu/control_w.h
-f:arch/x86/math-emu/div_Xsig.S
-f:arch/x86/math-emu/div_small.S
-f:arch/x86/math-emu/errors.c
-f:arch/x86/math-emu/exception.h
-f:arch/x86/math-emu/fpu_arith.c
-f:arch/x86/math-emu/fpu_asm.h
-f:arch/x86/math-emu/fpu_aux.c
-f:arch/x86/math-emu/fpu_emu.h
-f:arch/x86/math-emu/fpu_entry.c
-f:arch/x86/math-emu/fpu_etc.c
-f:arch/x86/math-emu/fpu_proto.h
-f:arch/x86/math-emu/fpu_system.h
-f:arch/x86/math-emu/fpu_tags.c
-f:arch/x86/math-emu/fpu_trig.c
-f:arch/x86/math-emu/get_address.c
-f:arch/x86/math-emu/load_store.c
-f:arch/x86/math-emu/mul_Xsig.S
-f:arch/x86/math-emu/poly.h
-f:arch/x86/math-emu/poly_2xm1.c
-f:arch/x86/math-emu/poly_atan.c
-f:arch/x86/math-emu/poly_l2.c
-f:arch/x86/math-emu/poly_sin.c
-f:arch/x86/math-emu/poly_tan.c
-f:arch/x86/math-emu/polynom_Xsig.S
-f:arch/x86/math-emu/reg_add_sub.c
-f:arch/x86/math-emu/reg_compare.c
-f:arch/x86/math-emu/reg_constant.c
-f:arch/x86/math-emu/reg_constant.h
-f:arch/x86/math-emu/reg_convert.c
-f:arch/x86/math-emu/reg_divide.c
-f:arch/x86/math-emu/reg_ld_str.c
-f:arch/x86/math-emu/reg_mul.c
-f:arch/x86/math-emu/reg_norm.S
-f:arch/x86/math-emu/reg_round.S
-f:arch/x86/math-emu/reg_u_add.S
-f:arch/x86/math-emu/reg_u_div.S
-f:arch/x86/math-emu/reg_u_mul.S
-f:arch/x86/math-emu/reg_u_sub.S
-f:arch/x86/math-emu/round_Xsig.S
-f:arch/x86/math-emu/shr_Xsig.S
-f:arch/x86/math-emu/status_w.h
-f:arch/x86/math-emu/version.h
-f:arch/x86/math-emu/wm_shrx.S
-f:arch/x86/math-emu/wm_sqrt.S
-f:arch/x86/mm/Makefile
-f:arch/x86/mm/amdtopology.c
-f:arch/x86/mm/cpu_entry_area.c
-f:arch/x86/mm/debug_pagetables.c
-f:arch/x86/mm/dump_pagetables.c
-f:arch/x86/mm/extable.c
-f:arch/x86/mm/fault.c
-f:arch/x86/mm/hugetlbpage.c
-f:arch/x86/mm/ident_map.c
-f:arch/x86/mm/init.c
-f:arch/x86/mm/init_32.c
-f:arch/x86/mm/init_64.c
-f:arch/x86/mm/iomap_32.c
-f:arch/x86/mm/ioremap.c
-f:arch/x86/mm/kasan_init_64.c
-f:arch/x86/mm/kaslr.c
-f:arch/x86/mm/kmmio.c
-f:arch/x86/mm/kmsan_shadow.c
-f:arch/x86/mm/maccess.c
-f:arch/x86/mm/mem_encrypt.c
-f:arch/x86/mm/mem_encrypt_amd.c
-f:arch/x86/mm/mem_encrypt_boot.S
-f:arch/x86/mm/mm_internal.h
-f:arch/x86/mm/mmap.c
-f:arch/x86/mm/mmio-mod.c
-f:arch/x86/mm/numa.c
-f:arch/x86/mm/pat/Makefile
-f:arch/x86/mm/pat/cpa-test.c
-f:arch/x86/mm/pat/memtype.c
-f:arch/x86/mm/pat/memtype.h
-f:arch/x86/mm/pat/memtype_interval.c
-f:arch/x86/mm/pat/set_memory.c
-f:arch/x86/mm/pf_in.c
-f:arch/x86/mm/pf_in.h
-f:arch/x86/mm/pgprot.c
-f:arch/x86/mm/pgtable.c
-f:arch/x86/mm/pgtable_32.c
-f:arch/x86/mm/physaddr.c
-f:arch/x86/mm/physaddr.h
-f:arch/x86/mm/pkeys.c
-f:arch/x86/mm/pti.c
-f:arch/x86/mm/srat.c
-f:arch/x86/mm/testmmiotrace.c
-f:arch/x86/mm/tlb.c
-f:arch/x86/net/Makefile
-f:arch/x86/net/bpf_jit_comp.c
-f:arch/x86/net/bpf_jit_comp32.c
-f:arch/x86/net/bpf_timed_may_goto.S
-f:arch/x86/pci/Makefile
-f:arch/x86/pci/acpi.c
-f:arch/x86/pci/amd_bus.c
-f:arch/x86/pci/broadcom_bus.c
-f:arch/x86/pci/bus_numa.c
-f:arch/x86/pci/bus_numa.h
-f:arch/x86/pci/ce4100.c
-f:arch/x86/pci/common.c
-f:arch/x86/pci/direct.c
-f:arch/x86/pci/early.c
-f:arch/x86/pci/fixup.c
-f:arch/x86/pci/i386.c
-f:arch/x86/pci/init.c
-f:arch/x86/pci/intel_mid.c
-f:arch/x86/pci/irq.c
-f:arch/x86/pci/legacy.c
-f:arch/x86/pci/mmconfig-shared.c
-f:arch/x86/pci/mmconfig_32.c
-f:arch/x86/pci/mmconfig_64.c
-f:arch/x86/pci/numachip.c
-f:arch/x86/pci/olpc.c
-f:arch/x86/pci/pcbios.c
-f:arch/x86/pci/xen.c
-f:arch/x86/platform/Makefile
-f:arch/x86/platform/atom/Makefile
-f:arch/x86/platform/atom/punit_atom_debug.c
-f:arch/x86/platform/ce4100/Makefile
-f:arch/x86/platform/ce4100/ce4100.c
-f:arch/x86/platform/ce4100/falconfalls.dts
-f:arch/x86/platform/efi/Makefile
-f:arch/x86/platform/efi/efi.c
-f:arch/x86/platform/efi/efi_32.c
-f:arch/x86/platform/efi/efi_64.c
-f:arch/x86/platform/efi/efi_stub_32.S
-f:arch/x86/platform/efi/efi_stub_64.S
-f:arch/x86/platform/efi/efi_thunk_64.S
-f:arch/x86/platform/efi/memmap.c
-f:arch/x86/platform/efi/quirks.c
-f:arch/x86/platform/efi/runtime-map.c
-f:arch/x86/platform/geode/Makefile
-f:arch/x86/platform/geode/alix.c
-f:arch/x86/platform/geode/geode-common.c
-f:arch/x86/platform/geode/geode-common.h
-f:arch/x86/platform/geode/geos.c
-f:arch/x86/platform/geode/net5501.c
-f:arch/x86/platform/intel-mid/Makefile
-f:arch/x86/platform/intel-mid/intel-mid.c
-f:arch/x86/platform/intel-mid/pwr.c
-f:arch/x86/platform/intel-quark/Makefile
-f:arch/x86/platform/intel-quark/imr.c
-f:arch/x86/platform/intel-quark/imr_selftest.c
-f:arch/x86/platform/intel/Makefile
-f:arch/x86/platform/intel/iosf_mbi.c
-f:arch/x86/platform/iris/Makefile
-f:arch/x86/platform/iris/iris.c
-f:arch/x86/platform/olpc/Makefile
-f:arch/x86/platform/olpc/olpc-xo1-pm.c
-f:arch/x86/platform/olpc/olpc-xo1-rtc.c
-f:arch/x86/platform/olpc/olpc-xo1-sci.c
-f:arch/x86/platform/olpc/olpc-xo15-sci.c
-f:arch/x86/platform/olpc/olpc.c
-f:arch/x86/platform/olpc/olpc_dt.c
-f:arch/x86/platform/olpc/olpc_ofw.c
-f:arch/x86/platform/olpc/xo1-wakeup.S
-f:arch/x86/platform/pvh/Makefile
-f:arch/x86/platform/pvh/enlighten.c
-f:arch/x86/platform/pvh/head.S
-f:arch/x86/platform/scx200/Makefile
-f:arch/x86/platform/scx200/scx200_32.c
-f:arch/x86/platform/ts5500/Makefile
-f:arch/x86/platform/ts5500/ts5500.c
-f:arch/x86/platform/uv/Makefile
-f:arch/x86/platform/uv/bios_uv.c
-f:arch/x86/platform/uv/uv_irq.c
-f:arch/x86/platform/uv/uv_nmi.c
-f:arch/x86/platform/uv/uv_time.c
-f:arch/x86/power/Makefile
-f:arch/x86/power/cpu.c
-f:arch/x86/power/hibernate.c
-f:arch/x86/power/hibernate_32.c
-f:arch/x86/power/hibernate_64.c
-f:arch/x86/power/hibernate_asm_32.S
-f:arch/x86/power/hibernate_asm_64.S
-f:arch/x86/purgatory/.gitignore
-f:arch/x86/purgatory/Makefile
-f:arch/x86/purgatory/entry64.S
-f:arch/x86/purgatory/kexec-purgatory.S
-f:arch/x86/purgatory/purgatory.c
-f:arch/x86/purgatory/setup-x86_64.S
-f:arch/x86/purgatory/stack.S
-f:arch/x86/ras/Kconfig
-f:arch/x86/realmode/Makefile
-f:arch/x86/realmode/init.c
-f:arch/x86/realmode/rm/.gitignore
-f:arch/x86/realmode/rm/Makefile
-f:arch/x86/realmode/rm/bioscall.S
-f:arch/x86/realmode/rm/copy.S
-f:arch/x86/realmode/rm/header.S
-f:arch/x86/realmode/rm/realmode.h
-f:arch/x86/realmode/rm/realmode.lds.S
-f:arch/x86/realmode/rm/reboot.S
-f:arch/x86/realmode/rm/regs.c
-f:arch/x86/realmode/rm/stack.S
-f:arch/x86/realmode/rm/trampoline_32.S
-f:arch/x86/realmode/rm/trampoline_64.S
-f:arch/x86/realmode/rm/trampoline_common.S
-f:arch/x86/realmode/rm/video-bios.c
-f:arch/x86/realmode/rm/video-mode.c
-f:arch/x86/realmode/rm/video-vesa.c
-f:arch/x86/realmode/rm/video-vga.c
-f:arch/x86/realmode/rm/wakemain.c
-f:arch/x86/realmode/rm/wakeup.h
-f:arch/x86/realmode/rm/wakeup_asm.S
-f:arch/x86/realmode/rmpiggy.S
-f:arch/x86/tools/.gitignore
-f:arch/x86/tools/Makefile
-f:arch/x86/tools/cpufeaturemasks.awk
-f:arch/x86/tools/gen-insn-attr-x86.awk
-f:arch/x86/tools/insn_decoder_test.c
-f:arch/x86/tools/insn_sanity.c
-f:arch/x86/tools/objdump_reformat.awk
-f:arch/x86/tools/relocs.c
-f:arch/x86/tools/relocs.h
-f:arch/x86/tools/relocs_32.c
-f:arch/x86/tools/relocs_64.c
-f:arch/x86/tools/relocs_common.c
-f:arch/x86/um/Kconfig
-f:arch/x86/um/Makefile
-f:arch/x86/um/asm/apic.h
-f:arch/x86/um/asm/arch_hweight.h
-f:arch/x86/um/asm/barrier.h
-f:arch/x86/um/asm/checksum.h
-f:arch/x86/um/asm/checksum_32.h
-f:arch/x86/um/asm/checksum_64.h
-f:arch/x86/um/asm/desc.h
-f:arch/x86/um/asm/elf.h
-f:arch/x86/um/asm/irq_vectors.h
-f:arch/x86/um/asm/processor.h
-f:arch/x86/um/asm/processor_32.h
-f:arch/x86/um/asm/processor_64.h
-f:arch/x86/um/asm/ptrace.h
-f:arch/x86/um/asm/required-features.h
-f:arch/x86/um/asm/segment.h
-f:arch/x86/um/asm/syscall.h
-f:arch/x86/um/asm/vm-flags.h
-f:arch/x86/um/bugs_32.c
-f:arch/x86/um/bugs_64.c
-f:arch/x86/um/delay.c
-f:arch/x86/um/elfcore.c
-f:arch/x86/um/fault.c
-f:arch/x86/um/mem_32.c
-f:arch/x86/um/mem_64.c
-f:arch/x86/um/os-Linux/Makefile
-f:arch/x86/um/os-Linux/mcontext.c
-f:arch/x86/um/os-Linux/registers.c
-f:arch/x86/um/os-Linux/tls.c
-f:arch/x86/um/ptrace.c
-f:arch/x86/um/ptrace_32.c
-f:arch/x86/um/ptrace_64.c
-f:arch/x86/um/ptrace_user.c
-f:arch/x86/um/setjmp_32.S
-f:arch/x86/um/setjmp_64.S
-f:arch/x86/um/shared/sysdep/archsetjmp.h
-f:arch/x86/um/shared/sysdep/archsetjmp_32.h
-f:arch/x86/um/shared/sysdep/archsetjmp_64.h
-f:arch/x86/um/shared/sysdep/faultinfo.h
-f:arch/x86/um/shared/sysdep/faultinfo_32.h
-f:arch/x86/um/shared/sysdep/faultinfo_64.h
-f:arch/x86/um/shared/sysdep/kernel-offsets.h
-f:arch/x86/um/shared/sysdep/mcontext.h
-f:arch/x86/um/shared/sysdep/ptrace.h
-f:arch/x86/um/shared/sysdep/ptrace_32.h
-f:arch/x86/um/shared/sysdep/ptrace_64.h
-f:arch/x86/um/shared/sysdep/ptrace_user.h
-f:arch/x86/um/shared/sysdep/stub-data.h
-f:arch/x86/um/shared/sysdep/stub.h
-f:arch/x86/um/shared/sysdep/stub_32.h
-f:arch/x86/um/shared/sysdep/stub_64.h
-f:arch/x86/um/shared/sysdep/tls.h
-f:arch/x86/um/signal.c
-f:arch/x86/um/stub_segv.c
-f:arch/x86/um/sys_call_table_32.c
-f:arch/x86/um/sys_call_table_64.c
-f:arch/x86/um/syscalls_32.c
-f:arch/x86/um/syscalls_64.c
-f:arch/x86/um/sysrq_32.c
-f:arch/x86/um/sysrq_64.c
-f:arch/x86/um/tls_32.c
-f:arch/x86/um/tls_64.c
-f:arch/x86/um/user-offsets.c
-f:arch/x86/um/vdso/.gitignore
-f:arch/x86/um/vdso/Makefile
-f:arch/x86/um/vdso/um_vdso.c
-f:arch/x86/um/vdso/vdso-layout.lds.S
-f:arch/x86/um/vdso/vdso-note.S
-f:arch/x86/um/vdso/vdso.S
-f:arch/x86/um/vdso/vdso.lds.S
-f:arch/x86/um/vdso/vma.c
-f:arch/x86/video/Makefile
-f:arch/x86/video/video-common.c
-f:arch/x86/virt/Makefile
-f:arch/x86/virt/svm/Makefile
-f:arch/x86/virt/svm/cmdline.c
-f:arch/x86/virt/svm/sev.c
-f:arch/x86/virt/vmx/Makefile
-f:arch/x86/virt/vmx/tdx/Makefile
-f:arch/x86/virt/vmx/tdx/seamcall.S
-f:arch/x86/virt/vmx/tdx/tdx.c
-f:arch/x86/virt/vmx/tdx/tdx.h
-f:arch/x86/virt/vmx/tdx/tdx_global_metadata.c
-f:arch/x86/virt/vmx/tdx/tdxcall.S
-f:arch/x86/xen/Kconfig
-f:arch/x86/xen/Makefile
-f:arch/x86/xen/apic.c
-f:arch/x86/xen/debugfs.c
-f:arch/x86/xen/efi.c
-f:arch/x86/xen/enlighten.c
-f:arch/x86/xen/enlighten_hvm.c
-f:arch/x86/xen/enlighten_pv.c
-f:arch/x86/xen/enlighten_pvh.c
-f:arch/x86/xen/grant-table.c
-f:arch/x86/xen/irq.c
-f:arch/x86/xen/mmu.c
-f:arch/x86/xen/mmu_hvm.c
-f:arch/x86/xen/mmu_pv.c
-f:arch/x86/xen/multicalls.c
-f:arch/x86/xen/p2m.c
-f:arch/x86/xen/platform-pci-unplug.c
-f:arch/x86/xen/pmu.c
-f:arch/x86/xen/setup.c
-f:arch/x86/xen/smp.c
-f:arch/x86/xen/smp_hvm.c
-f:arch/x86/xen/smp_pv.c
-f:arch/x86/xen/spinlock.c
-f:arch/x86/xen/suspend.c
-f:arch/x86/xen/suspend_hvm.c
-f:arch/x86/xen/suspend_pv.c
-f:arch/x86/xen/time.c
-f:arch/x86/xen/trace.c
-f:arch/x86/xen/vga.c
-f:arch/x86/xen/xen-asm.S
-f:arch/x86/xen/xen-head.S
-f:arch/x86/xen/xen-ops.h
-f:arch/xtensa/Kbuild
-f:arch/xtensa/Kconfig
-f:arch/xtensa/Kconfig.debug
-f:arch/xtensa/Makefile
-f:arch/xtensa/boot/.gitignore
-f:arch/xtensa/boot/Makefile
-f:arch/xtensa/boot/boot-elf/.gitignore
-f:arch/xtensa/boot/boot-elf/Makefile
-f:arch/xtensa/boot/boot-elf/boot.lds.S
-f:arch/xtensa/boot/boot-elf/bootstrap.S
-f:arch/xtensa/boot/boot-redboot/Makefile
-f:arch/xtensa/boot/boot-redboot/boot.ld
-f:arch/xtensa/boot/boot-redboot/bootstrap.S
-f:arch/xtensa/boot/dts/Makefile
-f:arch/xtensa/boot/dts/csp.dts
-f:arch/xtensa/boot/dts/kc705.dts
-f:arch/xtensa/boot/dts/kc705_nommu.dts
-f:arch/xtensa/boot/dts/lx200mx.dts
-f:arch/xtensa/boot/dts/lx60.dts
-f:arch/xtensa/boot/dts/ml605.dts
-f:arch/xtensa/boot/dts/virt.dts
-f:arch/xtensa/boot/dts/xtfpga-flash-128m.dtsi
-f:arch/xtensa/boot/dts/xtfpga-flash-16m.dtsi
-f:arch/xtensa/boot/dts/xtfpga-flash-4m.dtsi
-f:arch/xtensa/boot/dts/xtfpga.dtsi
-f:arch/xtensa/boot/lib/.gitignore
-f:arch/xtensa/boot/lib/Makefile
-f:arch/xtensa/boot/lib/zmem.c
-f:arch/xtensa/configs/audio_kc705_defconfig
-f:arch/xtensa/configs/cadence_csp_defconfig
-f:arch/xtensa/configs/common_defconfig
-f:arch/xtensa/configs/generic_kc705_defconfig
-f:arch/xtensa/configs/iss_defconfig
-f:arch/xtensa/configs/nommu_kc705_defconfig
-f:arch/xtensa/configs/smp_lx200_defconfig
-f:arch/xtensa/configs/virt_defconfig
-f:arch/xtensa/configs/xip_kc705_defconfig
-f:arch/xtensa/include/asm/Kbuild
-f:arch/xtensa/include/asm/asm-offsets.h
-f:arch/xtensa/include/asm/asm-prototypes.h
-f:arch/xtensa/include/asm/asm-uaccess.h
-f:arch/xtensa/include/asm/asmmacro.h
-f:arch/xtensa/include/asm/atomic.h
-f:arch/xtensa/include/asm/barrier.h
-f:arch/xtensa/include/asm/bitops.h
-f:arch/xtensa/include/asm/bootparam.h
-f:arch/xtensa/include/asm/cache.h
-f:arch/xtensa/include/asm/cacheasm.h
-f:arch/xtensa/include/asm/cacheflush.h
-f:arch/xtensa/include/asm/cachetype.h
-f:arch/xtensa/include/asm/checksum.h
-f:arch/xtensa/include/asm/cmpxchg.h
-f:arch/xtensa/include/asm/coprocessor.h
-f:arch/xtensa/include/asm/core.h
-f:arch/xtensa/include/asm/current.h
-f:arch/xtensa/include/asm/delay.h
-f:arch/xtensa/include/asm/dma.h
-f:arch/xtensa/include/asm/elf.h
-f:arch/xtensa/include/asm/fixmap.h
-f:arch/xtensa/include/asm/flat.h
-f:arch/xtensa/include/asm/ftrace.h
-f:arch/xtensa/include/asm/futex.h
-f:arch/xtensa/include/asm/highmem.h
-f:arch/xtensa/include/asm/hw_breakpoint.h
-f:arch/xtensa/include/asm/initialize_mmu.h
-f:arch/xtensa/include/asm/io.h
-f:arch/xtensa/include/asm/irq.h
-f:arch/xtensa/include/asm/irqflags.h
-f:arch/xtensa/include/asm/jump_label.h
-f:arch/xtensa/include/asm/kasan.h
-f:arch/xtensa/include/asm/kmem_layout.h
-f:arch/xtensa/include/asm/linkage.h
-f:arch/xtensa/include/asm/mmu.h
-f:arch/xtensa/include/asm/mmu_context.h
-f:arch/xtensa/include/asm/mtd-xip.h
-f:arch/xtensa/include/asm/mxregs.h
-f:arch/xtensa/include/asm/nommu_context.h
-f:arch/xtensa/include/asm/page.h
-f:arch/xtensa/include/asm/pci-bridge.h
-f:arch/xtensa/include/asm/pci.h
-f:arch/xtensa/include/asm/perf_event.h
-f:arch/xtensa/include/asm/pgalloc.h
-f:arch/xtensa/include/asm/pgtable.h
-f:arch/xtensa/include/asm/platform.h
-f:arch/xtensa/include/asm/processor.h
-f:arch/xtensa/include/asm/ptrace.h
-f:arch/xtensa/include/asm/regs.h
-f:arch/xtensa/include/asm/seccomp.h
-f:arch/xtensa/include/asm/sections.h
-f:arch/xtensa/include/asm/serial.h
-f:arch/xtensa/include/asm/shmparam.h
-f:arch/xtensa/include/asm/signal.h
-f:arch/xtensa/include/asm/smp.h
-f:arch/xtensa/include/asm/spinlock.h
-f:arch/xtensa/include/asm/spinlock_types.h
-f:arch/xtensa/include/asm/stackprotector.h
-f:arch/xtensa/include/asm/stacktrace.h
-f:arch/xtensa/include/asm/string.h
-f:arch/xtensa/include/asm/switch_to.h
-f:arch/xtensa/include/asm/syscall.h
-f:arch/xtensa/include/asm/sysmem.h
-f:arch/xtensa/include/asm/thread_info.h
-f:arch/xtensa/include/asm/timex.h
-f:arch/xtensa/include/asm/tlb.h
-f:arch/xtensa/include/asm/tlbflush.h
-f:arch/xtensa/include/asm/traps.h
-f:arch/xtensa/include/asm/uaccess.h
-f:arch/xtensa/include/asm/ucontext.h
-f:arch/xtensa/include/asm/unistd.h
-f:arch/xtensa/include/asm/vectors.h
-f:arch/xtensa/include/asm/vermagic.h
-f:arch/xtensa/include/asm/vmalloc.h
-f:arch/xtensa/include/uapi/asm/Kbuild
-f:arch/xtensa/include/uapi/asm/auxvec.h
-f:arch/xtensa/include/uapi/asm/byteorder.h
-f:arch/xtensa/include/uapi/asm/ioctls.h
-f:arch/xtensa/include/uapi/asm/ipcbuf.h
-f:arch/xtensa/include/uapi/asm/mman.h
-f:arch/xtensa/include/uapi/asm/msgbuf.h
-f:arch/xtensa/include/uapi/asm/poll.h
-f:arch/xtensa/include/uapi/asm/posix_types.h
-f:arch/xtensa/include/uapi/asm/ptrace.h
-f:arch/xtensa/include/uapi/asm/sembuf.h
-f:arch/xtensa/include/uapi/asm/setup.h
-f:arch/xtensa/include/uapi/asm/shmbuf.h
-f:arch/xtensa/include/uapi/asm/sigcontext.h
-f:arch/xtensa/include/uapi/asm/signal.h
-f:arch/xtensa/include/uapi/asm/sockios.h
-f:arch/xtensa/include/uapi/asm/stat.h
-f:arch/xtensa/include/uapi/asm/swab.h
-f:arch/xtensa/include/uapi/asm/types.h
-f:arch/xtensa/include/uapi/asm/unistd.h
-f:arch/xtensa/kernel/.gitignore
-f:arch/xtensa/kernel/Makefile
-f:arch/xtensa/kernel/align.S
-f:arch/xtensa/kernel/asm-offsets.c
-f:arch/xtensa/kernel/coprocessor.S
-f:arch/xtensa/kernel/entry.S
-f:arch/xtensa/kernel/head.S
-f:arch/xtensa/kernel/hibernate.c
-f:arch/xtensa/kernel/hw_breakpoint.c
-f:arch/xtensa/kernel/irq.c
-f:arch/xtensa/kernel/jump_label.c
-f:arch/xtensa/kernel/mcount.S
-f:arch/xtensa/kernel/module.c
-f:arch/xtensa/kernel/mxhead.S
-f:arch/xtensa/kernel/pci-dma.c
-f:arch/xtensa/kernel/pci.c
-f:arch/xtensa/kernel/perf_event.c
-f:arch/xtensa/kernel/platform.c
-f:arch/xtensa/kernel/process.c
-f:arch/xtensa/kernel/ptrace.c
-f:arch/xtensa/kernel/s32c1i_selftest.c
-f:arch/xtensa/kernel/setup.c
-f:arch/xtensa/kernel/signal.c
-f:arch/xtensa/kernel/smp.c
-f:arch/xtensa/kernel/stacktrace.c
-f:arch/xtensa/kernel/syscall.c
-f:arch/xtensa/kernel/syscalls/Makefile
-f:arch/xtensa/kernel/syscalls/syscall.tbl
-f:arch/xtensa/kernel/time.c
-f:arch/xtensa/kernel/traps.c
-f:arch/xtensa/kernel/vectors.S
-f:arch/xtensa/kernel/vmlinux.lds.S
-f:arch/xtensa/kernel/xtensa_ksyms.c
-f:arch/xtensa/lib/Makefile
-f:arch/xtensa/lib/ashldi3.S
-f:arch/xtensa/lib/ashrdi3.S
-f:arch/xtensa/lib/bswapdi2.S
-f:arch/xtensa/lib/bswapsi2.S
-f:arch/xtensa/lib/checksum.S
-f:arch/xtensa/lib/divsi3.S
-f:arch/xtensa/lib/lshrdi3.S
-f:arch/xtensa/lib/memcopy.S
-f:arch/xtensa/lib/memset.S
-f:arch/xtensa/lib/modsi3.S
-f:arch/xtensa/lib/mulsi3.S
-f:arch/xtensa/lib/pci-auto.c
-f:arch/xtensa/lib/strncpy_user.S
-f:arch/xtensa/lib/strnlen_user.S
-f:arch/xtensa/lib/udivsi3.S
-f:arch/xtensa/lib/umodsi3.S
-f:arch/xtensa/lib/umulsidi3.S
-f:arch/xtensa/lib/usercopy.S
-f:arch/xtensa/mm/Makefile
-f:arch/xtensa/mm/cache.c
-f:arch/xtensa/mm/fault.c
-f:arch/xtensa/mm/highmem.c
-f:arch/xtensa/mm/init.c
-f:arch/xtensa/mm/ioremap.c
-f:arch/xtensa/mm/kasan_init.c
-f:arch/xtensa/mm/misc.S
-f:arch/xtensa/mm/mmu.c
-f:arch/xtensa/mm/tlb.c
-f:arch/xtensa/platforms/Makefile
-f:arch/xtensa/platforms/iss/Makefile
-f:arch/xtensa/platforms/iss/console.c
-f:arch/xtensa/platforms/iss/include/platform/serial.h
-f:arch/xtensa/platforms/iss/include/platform/simcall-gdbio.h
-f:arch/xtensa/platforms/iss/include/platform/simcall-iss.h
-f:arch/xtensa/platforms/iss/include/platform/simcall.h
-f:arch/xtensa/platforms/iss/network.c
-f:arch/xtensa/platforms/iss/setup.c
-f:arch/xtensa/platforms/iss/simdisk.c
-f:arch/xtensa/platforms/xt2000/Makefile
-f:arch/xtensa/platforms/xt2000/include/platform/hardware.h
-f:arch/xtensa/platforms/xt2000/include/platform/serial.h
-f:arch/xtensa/platforms/xt2000/setup.c
-f:arch/xtensa/platforms/xtfpga/Makefile
-f:arch/xtensa/platforms/xtfpga/include/platform/hardware.h
-f:arch/xtensa/platforms/xtfpga/include/platform/lcd.h
-f:arch/xtensa/platforms/xtfpga/include/platform/serial.h
-f:arch/xtensa/platforms/xtfpga/lcd.c
-f:arch/xtensa/platforms/xtfpga/setup.c
-f:arch/xtensa/variants/csp/include/variant/core.h
-f:arch/xtensa/variants/csp/include/variant/tie-asm.h
-f:arch/xtensa/variants/csp/include/variant/tie.h
-f:arch/xtensa/variants/dc232b/include/variant/core.h
-f:arch/xtensa/variants/dc232b/include/variant/tie-asm.h
-f:arch/xtensa/variants/dc232b/include/variant/tie.h
-f:arch/xtensa/variants/dc233c/include/variant/core.h
-f:arch/xtensa/variants/dc233c/include/variant/tie-asm.h
-f:arch/xtensa/variants/dc233c/include/variant/tie.h
-f:arch/xtensa/variants/de212/include/variant/core.h
-f:arch/xtensa/variants/de212/include/variant/tie-asm.h
-f:arch/xtensa/variants/de212/include/variant/tie.h
-f:arch/xtensa/variants/fsf/include/variant/core.h
-f:arch/xtensa/variants/fsf/include/variant/tie-asm.h
-f:arch/xtensa/variants/fsf/include/variant/tie.h
-f:arch/xtensa/variants/test_kc705_be/include/variant/core.h
-f:arch/xtensa/variants/test_kc705_be/include/variant/tie-asm.h
-f:arch/xtensa/variants/test_kc705_be/include/variant/tie.h
-f:arch/xtensa/variants/test_kc705_hifi/include/variant/core.h
-f:arch/xtensa/variants/test_kc705_hifi/include/variant/tie-asm.h
-f:arch/xtensa/variants/test_kc705_hifi/include/variant/tie.h
-f:arch/xtensa/variants/test_mmuhifi_c3/include/variant/core.h
-f:arch/xtensa/variants/test_mmuhifi_c3/include/variant/tie-asm.h
-f:arch/xtensa/variants/test_mmuhifi_c3/include/variant/tie.h
-f:block/Kconfig
-f:block/Kconfig.iosched
-f:block/Makefile
-f:block/badblocks.c
-f:block/bdev.c
-f:block/bfq-cgroup.c
-f:block/bfq-iosched.c
-f:block/bfq-iosched.h
-f:block/bfq-wf2q.c
-f:block/bio-integrity-auto.c
-f:block/bio-integrity.c
-f:block/bio.c
-f:block/blk-cgroup-fc-appid.c
-f:block/blk-cgroup-rwstat.c
-f:block/blk-cgroup-rwstat.h
-f:block/blk-cgroup.c
-f:block/blk-cgroup.h
-f:block/blk-core.c
-f:block/blk-crypto-fallback.c
-f:block/blk-crypto-internal.h
-f:block/blk-crypto-profile.c
-f:block/blk-crypto-sysfs.c
-f:block/blk-crypto.c
-f:block/blk-flush.c
-f:block/blk-ia-ranges.c
-f:block/blk-integrity.c
-f:block/blk-ioc.c
-f:block/blk-iocost.c
-f:block/blk-iolatency.c
-f:block/blk-ioprio.c
-f:block/blk-ioprio.h
-f:block/blk-lib.c
-f:block/blk-map.c
-f:block/blk-merge.c
-f:block/blk-mq-cpumap.c
-f:block/blk-mq-debugfs.c
-f:block/blk-mq-debugfs.h
-f:block/blk-mq-dma.c
-f:block/blk-mq-sched.c
-f:block/blk-mq-sched.h
-f:block/blk-mq-sysfs.c
-f:block/blk-mq-tag.c
-f:block/blk-mq.c
-f:block/blk-mq.h
-f:block/blk-pm.c
-f:block/blk-pm.h
-f:block/blk-rq-qos.c
-f:block/blk-rq-qos.h
-f:block/blk-settings.c
-f:block/blk-stat.c
-f:block/blk-stat.h
-f:block/blk-sysfs.c
-f:block/blk-throttle.c
-f:block/blk-throttle.h
-f:block/blk-timeout.c
-f:block/blk-wbt.c
-f:block/blk-wbt.h
-f:block/blk-zoned.c
-f:block/blk.h
-f:block/bsg-lib.c
-f:block/bsg.c
-f:block/disk-events.c
-f:block/early-lookup.c
-f:block/elevator.c
-f:block/elevator.h
-f:block/fops.c
-f:block/genhd.c
-f:block/holder.c
-f:block/ioctl.c
-f:block/ioprio.c
-f:block/kyber-iosched.c
-f:block/mq-deadline.c
-f:block/opal_proto.h
-f:block/partitions/Kconfig
-f:block/partitions/Makefile
-f:block/partitions/acorn.c
-f:block/partitions/aix.c
-f:block/partitions/amiga.c
-f:block/partitions/atari.c
-f:block/partitions/atari.h
-f:block/partitions/check.h
-f:block/partitions/cmdline.c
-f:block/partitions/core.c
-f:block/partitions/efi.c
-f:block/partitions/efi.h
-f:block/partitions/ibm.c
-f:block/partitions/karma.c
-f:block/partitions/ldm.c
-f:block/partitions/ldm.h
-f:block/partitions/mac.c
-f:block/partitions/mac.h
-f:block/partitions/msdos.c
-f:block/partitions/of.c
-f:block/partitions/osf.c
-f:block/partitions/sgi.c
-f:block/partitions/sun.c
-f:block/partitions/sysv68.c
-f:block/partitions/ultrix.c
-f:block/sed-opal.c
-f:block/t10-pi.c
-f:certs/.gitignore
-f:certs/Kconfig
-f:certs/Makefile
-f:certs/blacklist.c
-f:certs/blacklist.h
-f:certs/blacklist_hashes.c
-f:certs/check-blacklist-hashes.awk
-f:certs/default_x509.genkey
-f:certs/extract-cert.c
-f:certs/revocation_certificates.S
-f:certs/system_certificates.S
-f:certs/system_keyring.c
-f:crypto/842.c
-f:crypto/Kconfig
-f:crypto/Makefile
-f:crypto/acompress.c
-f:crypto/adiantum.c
-f:crypto/aead.c
-f:crypto/aegis-neon.h
-f:crypto/aegis.h
-f:crypto/aegis128-core.c
-f:crypto/aegis128-neon-inner.c
-f:crypto/aegis128-neon.c
-f:crypto/aes_generic.c
-f:crypto/aes_ti.c
-f:crypto/af_alg.c
-f:crypto/ahash.c
-f:crypto/akcipher.c
-f:crypto/algapi.c
-f:crypto/algboss.c
-f:crypto/algif_aead.c
-f:crypto/algif_hash.c
-f:crypto/algif_rng.c
-f:crypto/algif_skcipher.c
-f:crypto/ansi_cprng.c
-f:crypto/anubis.c
-f:crypto/api.c
-f:crypto/arc4.c
-f:crypto/aria_generic.c
-f:crypto/asymmetric_keys/Kconfig
-f:crypto/asymmetric_keys/Makefile
-f:crypto/asymmetric_keys/asymmetric_keys.h
-f:crypto/asymmetric_keys/asymmetric_type.c
-f:crypto/asymmetric_keys/mscode.asn1
-f:crypto/asymmetric_keys/mscode_parser.c
-f:crypto/asymmetric_keys/pkcs7.asn1
-f:crypto/asymmetric_keys/pkcs7_key_type.c
-f:crypto/asymmetric_keys/pkcs7_parser.c
-f:crypto/asymmetric_keys/pkcs7_parser.h
-f:crypto/asymmetric_keys/pkcs7_trust.c
-f:crypto/asymmetric_keys/pkcs7_verify.c
-f:crypto/asymmetric_keys/pkcs8.asn1
-f:crypto/asymmetric_keys/pkcs8_parser.c
-f:crypto/asymmetric_keys/public_key.c
-f:crypto/asymmetric_keys/restrict.c
-f:crypto/asymmetric_keys/selftest.c
-f:crypto/asymmetric_keys/selftest.h
-f:crypto/asymmetric_keys/selftest_ecdsa.c
-f:crypto/asymmetric_keys/selftest_rsa.c
-f:crypto/asymmetric_keys/signature.c
-f:crypto/asymmetric_keys/verify_pefile.c
-f:crypto/asymmetric_keys/verify_pefile.h
-f:crypto/asymmetric_keys/x509.asn1
-f:crypto/asymmetric_keys/x509_akid.asn1
-f:crypto/asymmetric_keys/x509_cert_parser.c
-f:crypto/asymmetric_keys/x509_loader.c
-f:crypto/asymmetric_keys/x509_parser.h
-f:crypto/asymmetric_keys/x509_public_key.c
-f:crypto/async_tx/Kconfig
-f:crypto/async_tx/Makefile
-f:crypto/async_tx/async_memcpy.c
-f:crypto/async_tx/async_pq.c
-f:crypto/async_tx/async_raid6_recov.c
-f:crypto/async_tx/async_tx.c
-f:crypto/async_tx/async_xor.c
-f:crypto/async_tx/raid6test.c
-f:crypto/authenc.c
-f:crypto/authencesn.c
-f:crypto/blake2b_generic.c
-f:crypto/blowfish_common.c
-f:crypto/blowfish_generic.c
-f:crypto/bpf_crypto_skcipher.c
-f:crypto/camellia_generic.c
-f:crypto/cast5_generic.c
-f:crypto/cast6_generic.c
-f:crypto/cast_common.c
-f:crypto/cbc.c
-f:crypto/ccm.c
-f:crypto/chacha.c
-f:crypto/chacha20poly1305.c
-f:crypto/cipher.c
-f:crypto/cmac.c
-f:crypto/compress.h
-f:crypto/crc32.c
-f:crypto/crc32c.c
-f:crypto/cryptd.c
-f:crypto/crypto_engine.c
-f:crypto/crypto_null.c
-f:crypto/crypto_user.c
-f:crypto/ctr.c
-f:crypto/cts.c
-f:crypto/curve25519-generic.c
-f:crypto/deflate.c
-f:crypto/des_generic.c
-f:crypto/dh.c
-f:crypto/dh_helper.c
-f:crypto/drbg.c
-f:crypto/ecb.c
-f:crypto/ecc.c
-f:crypto/ecc_curve_defs.h
-f:crypto/ecdh.c
-f:crypto/ecdh_helper.c
-f:crypto/ecdsa-p1363.c
-f:crypto/ecdsa-x962.c
-f:crypto/ecdsa.c
-f:crypto/ecdsasignature.asn1
-f:crypto/echainiv.c
-f:crypto/ecrdsa.c
-f:crypto/ecrdsa_defs.h
-f:crypto/ecrdsa_params.asn1
-f:crypto/ecrdsa_pub_key.asn1
-f:crypto/essiv.c
-f:crypto/fcrypt.c
-f:crypto/fips.c
-f:crypto/gcm.c
-f:crypto/geniv.c
-f:crypto/ghash-generic.c
-f:crypto/hash.h
-f:crypto/hctr2.c
-f:crypto/hkdf.c
-f:crypto/hmac.c
-f:crypto/internal.h
-f:crypto/jitterentropy-kcapi.c
-f:crypto/jitterentropy-testing.c
-f:crypto/jitterentropy.c
-f:crypto/jitterentropy.h
-f:crypto/kdf_sp800108.c
-f:crypto/khazad.c
-f:crypto/kpp.c
-f:crypto/krb5/Kconfig
-f:crypto/krb5/Makefile
-f:crypto/krb5/internal.h
-f:crypto/krb5/krb5_api.c
-f:crypto/krb5/krb5_kdf.c
-f:crypto/krb5/rfc3961_simplified.c
-f:crypto/krb5/rfc3962_aes.c
-f:crypto/krb5/rfc6803_camellia.c
-f:crypto/krb5/rfc8009_aes2.c
-f:crypto/krb5/selftest.c
-f:crypto/krb5/selftest_data.c
-f:crypto/krb5enc.c
-f:crypto/lrw.c
-f:crypto/lskcipher.c
-f:crypto/lz4.c
-f:crypto/lz4hc.c
-f:crypto/lzo-rle.c
-f:crypto/lzo.c
-f:crypto/md4.c
-f:crypto/md5.c
-f:crypto/michael_mic.c
-f:crypto/nhpoly1305.c
-f:crypto/pcbc.c
-f:crypto/pcrypt.c
-f:crypto/polyval-generic.c
-f:crypto/proc.c
-f:crypto/ripemd.h
-f:crypto/rmd160.c
-f:crypto/rng.c
-f:crypto/rsa-pkcs1pad.c
-f:crypto/rsa.c
-f:crypto/rsa_helper.c
-f:crypto/rsaprivkey.asn1
-f:crypto/rsapubkey.asn1
-f:crypto/rsassa-pkcs1.c
-f:crypto/scatterwalk.c
-f:crypto/scompress.c
-f:crypto/seed.c
-f:crypto/seqiv.c
-f:crypto/serpent_generic.c
-f:crypto/sha1.c
-f:crypto/sha256.c
-f:crypto/sha3_generic.c
-f:crypto/sha512.c
-f:crypto/shash.c
-f:crypto/sig.c
-f:crypto/simd.c
-f:crypto/skcipher.c
-f:crypto/skcipher.h
-f:crypto/sm3_generic.c
-f:crypto/sm4.c
-f:crypto/sm4_generic.c
-f:crypto/streebog_generic.c
-f:crypto/tcrypt.c
-f:crypto/tcrypt.h
-f:crypto/tea.c
-f:crypto/testmgr.c
-f:crypto/testmgr.h
-f:crypto/twofish_common.c
-f:crypto/twofish_generic.c
-f:crypto/wp512.c
-f:crypto/xcbc.c
-f:crypto/xctr.c
-f:crypto/xor.c
-f:crypto/xts.c
-f:crypto/xxhash_generic.c
-f:crypto/zstd.c
-f:drivers/Kconfig
-f:drivers/Makefile
-f:drivers/accel/Kconfig
-f:drivers/accel/Makefile
-f:drivers/accel/amdxdna/Kconfig
-f:drivers/accel/amdxdna/Makefile
-f:drivers/accel/amdxdna/TODO
-f:drivers/accel/amdxdna/aie2_ctx.c
-f:drivers/accel/amdxdna/aie2_error.c
-f:drivers/accel/amdxdna/aie2_message.c
-f:drivers/accel/amdxdna/aie2_msg_priv.h
-f:drivers/accel/amdxdna/aie2_pci.c
-f:drivers/accel/amdxdna/aie2_pci.h
-f:drivers/accel/amdxdna/aie2_pm.c
-f:drivers/accel/amdxdna/aie2_psp.c
-f:drivers/accel/amdxdna/aie2_smu.c
-f:drivers/accel/amdxdna/aie2_solver.c
-f:drivers/accel/amdxdna/aie2_solver.h
-f:drivers/accel/amdxdna/amdxdna_ctx.c
-f:drivers/accel/amdxdna/amdxdna_ctx.h
-f:drivers/accel/amdxdna/amdxdna_gem.c
-f:drivers/accel/amdxdna/amdxdna_gem.h
-f:drivers/accel/amdxdna/amdxdna_mailbox.c
-f:drivers/accel/amdxdna/amdxdna_mailbox.h
-f:drivers/accel/amdxdna/amdxdna_mailbox_helper.c
-f:drivers/accel/amdxdna/amdxdna_mailbox_helper.h
-f:drivers/accel/amdxdna/amdxdna_pci_drv.c
-f:drivers/accel/amdxdna/amdxdna_pci_drv.h
-f:drivers/accel/amdxdna/amdxdna_sysfs.c
-f:drivers/accel/amdxdna/npu1_regs.c
-f:drivers/accel/amdxdna/npu2_regs.c
-f:drivers/accel/amdxdna/npu4_regs.c
-f:drivers/accel/amdxdna/npu5_regs.c
-f:drivers/accel/amdxdna/npu6_regs.c
-f:drivers/accel/drm_accel.c
-f:drivers/accel/habanalabs/Kconfig
-f:drivers/accel/habanalabs/Makefile
-f:drivers/accel/habanalabs/common/Makefile
-f:drivers/accel/habanalabs/common/asid.c
-f:drivers/accel/habanalabs/common/command_buffer.c
-f:drivers/accel/habanalabs/common/command_submission.c
-f:drivers/accel/habanalabs/common/context.c
-f:drivers/accel/habanalabs/common/debugfs.c
-f:drivers/accel/habanalabs/common/decoder.c
-f:drivers/accel/habanalabs/common/device.c
-f:drivers/accel/habanalabs/common/firmware_if.c
-f:drivers/accel/habanalabs/common/habanalabs.h
-f:drivers/accel/habanalabs/common/habanalabs_drv.c
-f:drivers/accel/habanalabs/common/habanalabs_ioctl.c
-f:drivers/accel/habanalabs/common/hw_queue.c
-f:drivers/accel/habanalabs/common/hwmon.c
-f:drivers/accel/habanalabs/common/irq.c
-f:drivers/accel/habanalabs/common/memory.c
-f:drivers/accel/habanalabs/common/memory_mgr.c
-f:drivers/accel/habanalabs/common/mmu/Makefile
-f:drivers/accel/habanalabs/common/mmu/mmu.c
-f:drivers/accel/habanalabs/common/mmu/mmu_v1.c
-f:drivers/accel/habanalabs/common/mmu/mmu_v2.c
-f:drivers/accel/habanalabs/common/mmu/mmu_v2_hr.c
-f:drivers/accel/habanalabs/common/pci/Makefile
-f:drivers/accel/habanalabs/common/pci/pci.c
-f:drivers/accel/habanalabs/common/security.c
-f:drivers/accel/habanalabs/common/security.h
-f:drivers/accel/habanalabs/common/state_dump.c
-f:drivers/accel/habanalabs/common/sysfs.c
-f:drivers/accel/habanalabs/gaudi/Makefile
-f:drivers/accel/habanalabs/gaudi/gaudi.c
-f:drivers/accel/habanalabs/gaudi/gaudiP.h
-f:drivers/accel/habanalabs/gaudi/gaudi_coresight.c
-f:drivers/accel/habanalabs/gaudi/gaudi_security.c
-f:drivers/accel/habanalabs/gaudi2/Makefile
-f:drivers/accel/habanalabs/gaudi2/gaudi2.c
-f:drivers/accel/habanalabs/gaudi2/gaudi2P.h
-f:drivers/accel/habanalabs/gaudi2/gaudi2_coresight.c
-f:drivers/accel/habanalabs/gaudi2/gaudi2_coresight_regs.h
-f:drivers/accel/habanalabs/gaudi2/gaudi2_masks.h
-f:drivers/accel/habanalabs/gaudi2/gaudi2_security.c
-f:drivers/accel/habanalabs/goya/Makefile
-f:drivers/accel/habanalabs/goya/goya.c
-f:drivers/accel/habanalabs/goya/goyaP.h
-f:drivers/accel/habanalabs/goya/goya_coresight.c
-f:drivers/accel/habanalabs/goya/goya_hwmgr.c
-f:drivers/accel/habanalabs/goya/goya_security.c
-f:drivers/accel/habanalabs/include/common/qman_if.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/cpu_if_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/dma0_core_masks.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/dma0_core_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/dma0_qm_masks.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/dma0_qm_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/dma1_core_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/dma1_qm_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/dma2_core_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/dma2_qm_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/dma3_core_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/dma3_qm_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/dma4_core_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/dma4_qm_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/dma5_core_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/dma5_qm_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/dma6_core_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/dma6_qm_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/dma7_core_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/dma7_qm_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/dma_if_e_n_down_ch0_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/dma_if_e_n_down_ch1_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/dma_if_e_n_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/dma_if_e_s_down_ch0_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/dma_if_e_s_down_ch1_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/dma_if_e_s_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/dma_if_w_n_down_ch0_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/dma_if_w_n_down_ch1_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/dma_if_w_n_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/dma_if_w_s_down_ch0_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/dma_if_w_s_down_ch1_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/dma_if_w_s_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/gaudi_blocks.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/gaudi_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/mme0_ctrl_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/mme0_qm_masks.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/mme0_qm_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/mme1_ctrl_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/mme2_ctrl_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/mme2_qm_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/mme3_ctrl_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/mmu_up_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/nic0_qm0_masks.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/nic0_qm0_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/nic0_qm1_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/nic1_qm0_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/nic1_qm1_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/nic2_qm0_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/nic2_qm1_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/nic3_qm0_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/nic3_qm1_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/nic4_qm0_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/nic4_qm1_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/nif_rtr_ctrl_0_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/nif_rtr_ctrl_1_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/nif_rtr_ctrl_2_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/nif_rtr_ctrl_3_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/nif_rtr_ctrl_4_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/nif_rtr_ctrl_5_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/nif_rtr_ctrl_6_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/nif_rtr_ctrl_7_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/psoc_cpu_pll_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/psoc_etr_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/psoc_global_conf_masks.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/psoc_global_conf_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/psoc_timestamp_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/sif_rtr_ctrl_0_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/sif_rtr_ctrl_1_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/sif_rtr_ctrl_2_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/sif_rtr_ctrl_3_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/sif_rtr_ctrl_4_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/sif_rtr_ctrl_5_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/sif_rtr_ctrl_6_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/sif_rtr_ctrl_7_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/stlb_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/tpc0_cfg_masks.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/tpc0_cfg_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/tpc0_qm_masks.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/tpc0_qm_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/tpc1_cfg_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/tpc1_qm_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/tpc2_cfg_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/tpc2_qm_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/tpc3_cfg_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/tpc3_qm_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/tpc4_cfg_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/tpc4_qm_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/tpc5_cfg_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/tpc5_qm_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/tpc6_cfg_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/tpc6_qm_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/tpc7_cfg_regs.h
-f:drivers/accel/habanalabs/include/gaudi/asic_reg/tpc7_qm_regs.h
-f:drivers/accel/habanalabs/include/gaudi/gaudi.h
-f:drivers/accel/habanalabs/include/gaudi/gaudi_async_events.h
-f:drivers/accel/habanalabs/include/gaudi/gaudi_async_ids_map_extended.h
-f:drivers/accel/habanalabs/include/gaudi/gaudi_coresight.h
-f:drivers/accel/habanalabs/include/gaudi/gaudi_fw_if.h
-f:drivers/accel/habanalabs/include/gaudi/gaudi_masks.h
-f:drivers/accel/habanalabs/include/gaudi/gaudi_packets.h
-f:drivers/accel/habanalabs/include/gaudi/gaudi_reg_map.h
-f:drivers/accel/habanalabs/include/gaudi2/arc/gaudi2_arc_common_packets.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/arc_farm_arc0_acp_eng_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/arc_farm_arc0_aux_masks.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/arc_farm_arc0_aux_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/arc_farm_arc0_dup_eng_axuser_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/arc_farm_arc0_dup_eng_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/arc_farm_kdma_ctx_axuser_masks.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/arc_farm_kdma_ctx_axuser_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/arc_farm_kdma_ctx_masks.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/arc_farm_kdma_ctx_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/arc_farm_kdma_kdma_cgm_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/arc_farm_kdma_masks.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/arc_farm_kdma_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/cpu_if_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_dec0_cmd_masks.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_dec0_cmd_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_edma0_core_ctx_axuser_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_edma0_core_ctx_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_edma0_core_masks.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_edma0_core_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_edma0_qm_arc_aux_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_edma0_qm_axuser_nonsecured_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_edma0_qm_cgm_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_edma0_qm_masks.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_edma0_qm_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_edma1_core_ctx_axuser_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_edma1_qm_axuser_nonsecured_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_hmmu0_mmu_masks.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_hmmu0_mmu_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_hmmu0_stlb_masks.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_hmmu0_stlb_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_mme_acc_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_cout0_master_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_cout0_slave_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_cout1_master_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_cout1_slave_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in0_master_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in0_slave_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in1_master_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in1_slave_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in2_master_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in2_slave_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in3_master_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in3_slave_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in4_master_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in4_slave_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_base_addr_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_non_tensor_end_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_non_tensor_start_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_tensor_a_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_tensor_b_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_tensor_cout_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_masks.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_mme_axuser_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_mme_qm_arc_acp_eng_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_mme_qm_arc_aux_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_mme_qm_arc_dup_eng_axuser_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_mme_qm_arc_dup_eng_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_mme_qm_axuser_nonsecured_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_mme_qm_axuser_secured_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_mme_qm_cgm_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_mme_qm_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_mme_sbte0_masks.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_mme_sbte0_mstr_if_axuser_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_mme_wb0_mstr_if_axuser_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_rtr0_ctrl_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_rtr0_mstr_if_rr_prvt_hbw_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_rtr0_mstr_if_rr_prvt_lbw_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_rtr0_mstr_if_rr_shrd_hbw_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_rtr0_mstr_if_rr_shrd_lbw_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_sync_mngr_glbl_masks.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_sync_mngr_glbl_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_sync_mngr_mstr_if_axuser_masks.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_sync_mngr_mstr_if_axuser_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_sync_mngr_objs_masks.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_sync_mngr_objs_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_cfg_axuser_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_cfg_kernel_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_cfg_kernel_tensor_0_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_cfg_masks.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_cfg_qm_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_cfg_qm_sync_object_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_cfg_qm_tensor_0_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_cfg_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_cfg_special_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_eml_busmon_0_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_eml_etf_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_eml_funnel_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_eml_spmu_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_eml_stm_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_qm_arc_aux_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_qm_axuser_nonsecured_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_qm_cgm_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_qm_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_vdec0_brdg_ctrl_axuser_dec_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_vdec0_brdg_ctrl_axuser_msix_abnrm_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_vdec0_brdg_ctrl_axuser_msix_l2c_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_vdec0_brdg_ctrl_axuser_msix_nrm_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_vdec0_brdg_ctrl_axuser_msix_vcd_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_vdec0_brdg_ctrl_masks.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_vdec0_brdg_ctrl_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore0_vdec0_ctrl_special_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore1_mme_ctrl_lo_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore1_sync_mngr_glbl_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore3_mme_ctrl_lo_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/gaudi2_blocks_linux_driver.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/gaudi2_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/nic0_qm0_cgm_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/nic0_qm0_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/nic0_qm_arc_aux0_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/nic0_qpc0_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/nic0_umr0_0_completion_queue_ci_1_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/nic0_umr0_0_unsecure_doorbell0_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/pcie_aux_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/pcie_dbi_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/pcie_dec0_cmd_masks.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/pcie_dec0_cmd_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/pcie_vdec0_brdg_ctrl_axuser_dec_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/pcie_vdec0_brdg_ctrl_axuser_msix_abnrm_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/pcie_vdec0_brdg_ctrl_axuser_msix_l2c_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/pcie_vdec0_brdg_ctrl_axuser_msix_nrm_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/pcie_vdec0_brdg_ctrl_axuser_msix_vcd_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/pcie_vdec0_brdg_ctrl_masks.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/pcie_vdec0_brdg_ctrl_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/pcie_vdec0_ctrl_special_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/pcie_wrap_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/pcie_wrap_special_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/pdma0_core_ctx_axuser_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/pdma0_core_ctx_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/pdma0_core_masks.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/pdma0_core_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/pdma0_core_special_masks.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/pdma0_qm_arc_aux_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/pdma0_qm_axuser_nonsecured_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/pdma0_qm_axuser_secured_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/pdma0_qm_cgm_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/pdma0_qm_masks.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/pdma0_qm_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/pdma1_core_ctx_axuser_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/pdma1_qm_axuser_nonsecured_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/pmmu_hbw_stlb_masks.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/pmmu_hbw_stlb_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/pmmu_pif_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/psoc_etr_masks.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/psoc_etr_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/psoc_global_conf_masks.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/psoc_global_conf_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/psoc_reset_conf_masks.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/psoc_reset_conf_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/psoc_timestamp_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/rot0_desc_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/rot0_masks.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/rot0_qm_arc_aux_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/rot0_qm_axuser_nonsecured_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/rot0_qm_cgm_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/rot0_qm_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/rot0_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/xbar_edge_0_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/asic_reg/xbar_mid_0_regs.h
-f:drivers/accel/habanalabs/include/gaudi2/gaudi2.h
-f:drivers/accel/habanalabs/include/gaudi2/gaudi2_async_events.h
-f:drivers/accel/habanalabs/include/gaudi2/gaudi2_async_ids_map_extended.h
-f:drivers/accel/habanalabs/include/gaudi2/gaudi2_coresight.h
-f:drivers/accel/habanalabs/include/gaudi2/gaudi2_fw_if.h
-f:drivers/accel/habanalabs/include/gaudi2/gaudi2_packets.h
-f:drivers/accel/habanalabs/include/gaudi2/gaudi2_reg_map.h
-f:drivers/accel/habanalabs/include/gaudi2/gaudi2_special_blocks.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/cpu_ca53_cfg_masks.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/cpu_ca53_cfg_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/cpu_if_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/cpu_pll_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/dma_ch_0_masks.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/dma_ch_0_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/dma_ch_1_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/dma_ch_2_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/dma_ch_3_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/dma_ch_4_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/dma_macro_masks.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/dma_macro_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/dma_nrtr_masks.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/dma_nrtr_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/dma_qm_0_masks.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/dma_qm_0_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/dma_qm_1_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/dma_qm_2_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/dma_qm_3_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/dma_qm_4_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/goya_blocks.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/goya_masks.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/goya_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/ic_pll_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/mc_pll_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/mme1_rtr_masks.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/mme1_rtr_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/mme2_rtr_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/mme3_rtr_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/mme4_rtr_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/mme5_rtr_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/mme6_rtr_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/mme_cmdq_masks.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/mme_cmdq_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/mme_masks.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/mme_qm_masks.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/mme_qm_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/mme_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/mmu_masks.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/mmu_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/pci_nrtr_masks.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/pci_nrtr_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/pcie_aux_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/pcie_wrap_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/psoc_emmc_pll_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/psoc_etr_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/psoc_global_conf_masks.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/psoc_global_conf_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/psoc_mme_pll_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/psoc_pci_pll_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/psoc_spi_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/psoc_timestamp_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/sram_y0_x0_rtr_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/sram_y0_x1_rtr_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/sram_y0_x2_rtr_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/sram_y0_x3_rtr_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/sram_y0_x4_rtr_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/stlb_masks.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/stlb_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/tpc0_cfg_masks.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/tpc0_cfg_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/tpc0_cmdq_masks.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/tpc0_cmdq_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/tpc0_eml_cfg_masks.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/tpc0_eml_cfg_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/tpc0_nrtr_masks.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/tpc0_nrtr_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/tpc0_qm_masks.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/tpc0_qm_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/tpc1_cfg_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/tpc1_cmdq_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/tpc1_qm_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/tpc1_rtr_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/tpc2_cfg_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/tpc2_cmdq_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/tpc2_qm_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/tpc2_rtr_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/tpc3_cfg_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/tpc3_cmdq_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/tpc3_qm_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/tpc3_rtr_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/tpc4_cfg_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/tpc4_cmdq_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/tpc4_qm_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/tpc4_rtr_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/tpc5_cfg_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/tpc5_cmdq_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/tpc5_qm_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/tpc5_rtr_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/tpc6_cfg_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/tpc6_cmdq_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/tpc6_qm_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/tpc6_rtr_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/tpc7_cfg_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/tpc7_cmdq_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/tpc7_nrtr_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/tpc7_qm_regs.h
-f:drivers/accel/habanalabs/include/goya/asic_reg/tpc_pll_regs.h
-f:drivers/accel/habanalabs/include/goya/goya.h
-f:drivers/accel/habanalabs/include/goya/goya_async_events.h
-f:drivers/accel/habanalabs/include/goya/goya_coresight.h
-f:drivers/accel/habanalabs/include/goya/goya_fw_if.h
-f:drivers/accel/habanalabs/include/goya/goya_packets.h
-f:drivers/accel/habanalabs/include/goya/goya_reg_map.h
-f:drivers/accel/habanalabs/include/hw_ip/mmu/mmu_general.h
-f:drivers/accel/habanalabs/include/hw_ip/mmu/mmu_v1_0.h
-f:drivers/accel/habanalabs/include/hw_ip/mmu/mmu_v1_1.h
-f:drivers/accel/habanalabs/include/hw_ip/mmu/mmu_v2_0.h
-f:drivers/accel/habanalabs/include/hw_ip/pci/pci_general.h
-f:drivers/accel/ivpu/Kconfig
-f:drivers/accel/ivpu/Makefile
-f:drivers/accel/ivpu/ivpu_coredump.c
-f:drivers/accel/ivpu/ivpu_coredump.h
-f:drivers/accel/ivpu/ivpu_debugfs.c
-f:drivers/accel/ivpu/ivpu_debugfs.h
-f:drivers/accel/ivpu/ivpu_drv.c
-f:drivers/accel/ivpu/ivpu_drv.h
-f:drivers/accel/ivpu/ivpu_fw.c
-f:drivers/accel/ivpu/ivpu_fw.h
-f:drivers/accel/ivpu/ivpu_fw_log.c
-f:drivers/accel/ivpu/ivpu_fw_log.h
-f:drivers/accel/ivpu/ivpu_gem.c
-f:drivers/accel/ivpu/ivpu_gem.h
-f:drivers/accel/ivpu/ivpu_hw.c
-f:drivers/accel/ivpu/ivpu_hw.h
-f:drivers/accel/ivpu/ivpu_hw_37xx_reg.h
-f:drivers/accel/ivpu/ivpu_hw_40xx_reg.h
-f:drivers/accel/ivpu/ivpu_hw_btrs.c
-f:drivers/accel/ivpu/ivpu_hw_btrs.h
-f:drivers/accel/ivpu/ivpu_hw_btrs_lnl_reg.h
-f:drivers/accel/ivpu/ivpu_hw_btrs_mtl_reg.h
-f:drivers/accel/ivpu/ivpu_hw_ip.c
-f:drivers/accel/ivpu/ivpu_hw_ip.h
-f:drivers/accel/ivpu/ivpu_hw_reg_io.h
-f:drivers/accel/ivpu/ivpu_ipc.c
-f:drivers/accel/ivpu/ivpu_ipc.h
-f:drivers/accel/ivpu/ivpu_job.c
-f:drivers/accel/ivpu/ivpu_job.h
-f:drivers/accel/ivpu/ivpu_jsm_msg.c
-f:drivers/accel/ivpu/ivpu_jsm_msg.h
-f:drivers/accel/ivpu/ivpu_mmu.c
-f:drivers/accel/ivpu/ivpu_mmu.h
-f:drivers/accel/ivpu/ivpu_mmu_context.c
-f:drivers/accel/ivpu/ivpu_mmu_context.h
-f:drivers/accel/ivpu/ivpu_ms.c
-f:drivers/accel/ivpu/ivpu_ms.h
-f:drivers/accel/ivpu/ivpu_pm.c
-f:drivers/accel/ivpu/ivpu_pm.h
-f:drivers/accel/ivpu/ivpu_sysfs.c
-f:drivers/accel/ivpu/ivpu_sysfs.h
-f:drivers/accel/ivpu/ivpu_trace.h
-f:drivers/accel/ivpu/ivpu_trace_points.c
-f:drivers/accel/ivpu/vpu_boot_api.h
-f:drivers/accel/ivpu/vpu_jsm_api.h
-f:drivers/accel/qaic/Kconfig
-f:drivers/accel/qaic/Makefile
-f:drivers/accel/qaic/mhi_controller.c
-f:drivers/accel/qaic/mhi_controller.h
-f:drivers/accel/qaic/qaic.h
-f:drivers/accel/qaic/qaic_control.c
-f:drivers/accel/qaic/qaic_data.c
-f:drivers/accel/qaic/qaic_debugfs.c
-f:drivers/accel/qaic/qaic_debugfs.h
-f:drivers/accel/qaic/qaic_drv.c
-f:drivers/accel/qaic/qaic_ras.c
-f:drivers/accel/qaic/qaic_ras.h
-f:drivers/accel/qaic/qaic_timesync.c
-f:drivers/accel/qaic/qaic_timesync.h
-f:drivers/accel/qaic/sahara.c
-f:drivers/accel/qaic/sahara.h
-f:drivers/accessibility/Kconfig
-f:drivers/accessibility/Makefile
-f:drivers/accessibility/braille/Makefile
-f:drivers/accessibility/braille/braille_console.c
-f:drivers/accessibility/speakup/.gitignore
-f:drivers/accessibility/speakup/DefaultKeyAssignments
-f:drivers/accessibility/speakup/Kconfig
-f:drivers/accessibility/speakup/Makefile
-f:drivers/accessibility/speakup/TODO
-f:drivers/accessibility/speakup/buffers.c
-f:drivers/accessibility/speakup/devsynth.c
-f:drivers/accessibility/speakup/fakekey.c
-f:drivers/accessibility/speakup/genmap.c
-f:drivers/accessibility/speakup/i18n.c
-f:drivers/accessibility/speakup/i18n.h
-f:drivers/accessibility/speakup/keyhelp.c
-f:drivers/accessibility/speakup/kobjects.c
-f:drivers/accessibility/speakup/main.c
-f:drivers/accessibility/speakup/makemapdata.c
-f:drivers/accessibility/speakup/selection.c
-f:drivers/accessibility/speakup/serialio.c
-f:drivers/accessibility/speakup/serialio.h
-f:drivers/accessibility/speakup/speakup.h
-f:drivers/accessibility/speakup/speakup_acnt.h
-f:drivers/accessibility/speakup/speakup_acntpc.c
-f:drivers/accessibility/speakup/speakup_acntsa.c
-f:drivers/accessibility/speakup/speakup_apollo.c
-f:drivers/accessibility/speakup/speakup_audptr.c
-f:drivers/accessibility/speakup/speakup_bns.c
-f:drivers/accessibility/speakup/speakup_decext.c
-f:drivers/accessibility/speakup/speakup_decpc.c
-f:drivers/accessibility/speakup/speakup_dectlk.c
-f:drivers/accessibility/speakup/speakup_dtlk.c
-f:drivers/accessibility/speakup/speakup_dtlk.h
-f:drivers/accessibility/speakup/speakup_dummy.c
-f:drivers/accessibility/speakup/speakup_keypc.c
-f:drivers/accessibility/speakup/speakup_ltlk.c
-f:drivers/accessibility/speakup/speakup_soft.c
-f:drivers/accessibility/speakup/speakup_spkout.c
-f:drivers/accessibility/speakup/speakup_txprt.c
-f:drivers/accessibility/speakup/speakupmap.map
-f:drivers/accessibility/speakup/spk_priv.h
-f:drivers/accessibility/speakup/spk_priv_keyinfo.h
-f:drivers/accessibility/speakup/spk_ttyio.c
-f:drivers/accessibility/speakup/spk_types.h
-f:drivers/accessibility/speakup/synth.c
-f:drivers/accessibility/speakup/thread.c
-f:drivers/accessibility/speakup/utils.h
-f:drivers/accessibility/speakup/varhandlers.c
-f:drivers/acpi/Kconfig
-f:drivers/acpi/Makefile
-f:drivers/acpi/ac.c
-f:drivers/acpi/acpi_adxl.c
-f:drivers/acpi/acpi_apd.c
-f:drivers/acpi/acpi_configfs.c
-f:drivers/acpi/acpi_dbg.c
-f:drivers/acpi/acpi_extlog.c
-f:drivers/acpi/acpi_ffh.c
-f:drivers/acpi/acpi_fpdt.c
-f:drivers/acpi/acpi_ipmi.c
-f:drivers/acpi/acpi_lpat.c
-f:drivers/acpi/acpi_lpit.c
-f:drivers/acpi/acpi_memhotplug.c
-f:drivers/acpi/acpi_mrrm.c
-f:drivers/acpi/acpi_pad.c
-f:drivers/acpi/acpi_pcc.c
-f:drivers/acpi/acpi_platform.c
-f:drivers/acpi/acpi_pnp.c
-f:drivers/acpi/acpi_processor.c
-f:drivers/acpi/acpi_tad.c
-f:drivers/acpi/acpi_video.c
-f:drivers/acpi/acpi_watchdog.c
-f:drivers/acpi/acpica/Makefile
-f:drivers/acpi/acpica/acapps.h
-f:drivers/acpi/acpica/accommon.h
-f:drivers/acpi/acpica/acconvert.h
-f:drivers/acpi/acpica/acdebug.h
-f:drivers/acpi/acpica/acdispat.h
-f:drivers/acpi/acpica/acevents.h
-f:drivers/acpi/acpica/acglobal.h
-f:drivers/acpi/acpica/achware.h
-f:drivers/acpi/acpica/acinterp.h
-f:drivers/acpi/acpica/aclocal.h
-f:drivers/acpi/acpica/acmacros.h
-f:drivers/acpi/acpica/acnamesp.h
-f:drivers/acpi/acpica/acobject.h
-f:drivers/acpi/acpica/acopcode.h
-f:drivers/acpi/acpica/acparser.h
-f:drivers/acpi/acpica/acpredef.h
-f:drivers/acpi/acpica/acresrc.h
-f:drivers/acpi/acpica/acstruct.h
-f:drivers/acpi/acpica/actables.h
-f:drivers/acpi/acpica/acutils.h
-f:drivers/acpi/acpica/amlcode.h
-f:drivers/acpi/acpica/amlresrc.h
-f:drivers/acpi/acpica/dbcmds.c
-f:drivers/acpi/acpica/dbconvert.c
-f:drivers/acpi/acpica/dbdisply.c
-f:drivers/acpi/acpica/dbexec.c
-f:drivers/acpi/acpica/dbfileio.c
-f:drivers/acpi/acpica/dbhistry.c
-f:drivers/acpi/acpica/dbinput.c
-f:drivers/acpi/acpica/dbmethod.c
-f:drivers/acpi/acpica/dbnames.c
-f:drivers/acpi/acpica/dbobject.c
-f:drivers/acpi/acpica/dbstats.c
-f:drivers/acpi/acpica/dbtest.c
-f:drivers/acpi/acpica/dbutils.c
-f:drivers/acpi/acpica/dbxface.c
-f:drivers/acpi/acpica/dsargs.c
-f:drivers/acpi/acpica/dscontrol.c
-f:drivers/acpi/acpica/dsdebug.c
-f:drivers/acpi/acpica/dsfield.c
-f:drivers/acpi/acpica/dsinit.c
-f:drivers/acpi/acpica/dsmethod.c
-f:drivers/acpi/acpica/dsmthdat.c
-f:drivers/acpi/acpica/dsobject.c
-f:drivers/acpi/acpica/dsopcode.c
-f:drivers/acpi/acpica/dspkginit.c
-f:drivers/acpi/acpica/dsutils.c
-f:drivers/acpi/acpica/dswexec.c
-f:drivers/acpi/acpica/dswload.c
-f:drivers/acpi/acpica/dswload2.c
-f:drivers/acpi/acpica/dswscope.c
-f:drivers/acpi/acpica/dswstate.c
-f:drivers/acpi/acpica/evevent.c
-f:drivers/acpi/acpica/evglock.c
-f:drivers/acpi/acpica/evgpe.c
-f:drivers/acpi/acpica/evgpeblk.c
-f:drivers/acpi/acpica/evgpeinit.c
-f:drivers/acpi/acpica/evgpeutil.c
-f:drivers/acpi/acpica/evhandler.c
-f:drivers/acpi/acpica/evmisc.c
-f:drivers/acpi/acpica/evregion.c
-f:drivers/acpi/acpica/evrgnini.c
-f:drivers/acpi/acpica/evsci.c
-f:drivers/acpi/acpica/evxface.c
-f:drivers/acpi/acpica/evxfevnt.c
-f:drivers/acpi/acpica/evxfgpe.c
-f:drivers/acpi/acpica/evxfregn.c
-f:drivers/acpi/acpica/exconcat.c
-f:drivers/acpi/acpica/exconfig.c
-f:drivers/acpi/acpica/exconvrt.c
-f:drivers/acpi/acpica/excreate.c
-f:drivers/acpi/acpica/exdebug.c
-f:drivers/acpi/acpica/exdump.c
-f:drivers/acpi/acpica/exfield.c
-f:drivers/acpi/acpica/exfldio.c
-f:drivers/acpi/acpica/exmisc.c
-f:drivers/acpi/acpica/exmutex.c
-f:drivers/acpi/acpica/exnames.c
-f:drivers/acpi/acpica/exoparg1.c
-f:drivers/acpi/acpica/exoparg2.c
-f:drivers/acpi/acpica/exoparg3.c
-f:drivers/acpi/acpica/exoparg6.c
-f:drivers/acpi/acpica/exprep.c
-f:drivers/acpi/acpica/exregion.c
-f:drivers/acpi/acpica/exresnte.c
-f:drivers/acpi/acpica/exresolv.c
-f:drivers/acpi/acpica/exresop.c
-f:drivers/acpi/acpica/exserial.c
-f:drivers/acpi/acpica/exstore.c
-f:drivers/acpi/acpica/exstoren.c
-f:drivers/acpi/acpica/exstorob.c
-f:drivers/acpi/acpica/exsystem.c
-f:drivers/acpi/acpica/extrace.c
-f:drivers/acpi/acpica/exutils.c
-f:drivers/acpi/acpica/hwacpi.c
-f:drivers/acpi/acpica/hwesleep.c
-f:drivers/acpi/acpica/hwgpe.c
-f:drivers/acpi/acpica/hwpci.c
-f:drivers/acpi/acpica/hwregs.c
-f:drivers/acpi/acpica/hwsleep.c
-f:drivers/acpi/acpica/hwtimer.c
-f:drivers/acpi/acpica/hwvalid.c
-f:drivers/acpi/acpica/hwxface.c
-f:drivers/acpi/acpica/hwxfsleep.c
-f:drivers/acpi/acpica/nsaccess.c
-f:drivers/acpi/acpica/nsalloc.c
-f:drivers/acpi/acpica/nsarguments.c
-f:drivers/acpi/acpica/nsconvert.c
-f:drivers/acpi/acpica/nsdump.c
-f:drivers/acpi/acpica/nsdumpdv.c
-f:drivers/acpi/acpica/nseval.c
-f:drivers/acpi/acpica/nsinit.c
-f:drivers/acpi/acpica/nsload.c
-f:drivers/acpi/acpica/nsnames.c
-f:drivers/acpi/acpica/nsobject.c
-f:drivers/acpi/acpica/nsparse.c
-f:drivers/acpi/acpica/nspredef.c
-f:drivers/acpi/acpica/nsprepkg.c
-f:drivers/acpi/acpica/nsrepair.c
-f:drivers/acpi/acpica/nsrepair2.c
-f:drivers/acpi/acpica/nssearch.c
-f:drivers/acpi/acpica/nsutils.c
-f:drivers/acpi/acpica/nswalk.c
-f:drivers/acpi/acpica/nsxfeval.c
-f:drivers/acpi/acpica/nsxfname.c
-f:drivers/acpi/acpica/nsxfobj.c
-f:drivers/acpi/acpica/psargs.c
-f:drivers/acpi/acpica/psloop.c
-f:drivers/acpi/acpica/psobject.c
-f:drivers/acpi/acpica/psopcode.c
-f:drivers/acpi/acpica/psopinfo.c
-f:drivers/acpi/acpica/psparse.c
-f:drivers/acpi/acpica/psscope.c
-f:drivers/acpi/acpica/pstree.c
-f:drivers/acpi/acpica/psutils.c
-f:drivers/acpi/acpica/pswalk.c
-f:drivers/acpi/acpica/psxface.c
-f:drivers/acpi/acpica/rsaddr.c
-f:drivers/acpi/acpica/rscalc.c
-f:drivers/acpi/acpica/rscreate.c
-f:drivers/acpi/acpica/rsdump.c
-f:drivers/acpi/acpica/rsdumpinfo.c
-f:drivers/acpi/acpica/rsinfo.c
-f:drivers/acpi/acpica/rsio.c
-f:drivers/acpi/acpica/rsirq.c
-f:drivers/acpi/acpica/rslist.c
-f:drivers/acpi/acpica/rsmemory.c
-f:drivers/acpi/acpica/rsmisc.c
-f:drivers/acpi/acpica/rsserial.c
-f:drivers/acpi/acpica/rsutils.c
-f:drivers/acpi/acpica/rsxface.c
-f:drivers/acpi/acpica/tbdata.c
-f:drivers/acpi/acpica/tbfadt.c
-f:drivers/acpi/acpica/tbfind.c
-f:drivers/acpi/acpica/tbinstal.c
-f:drivers/acpi/acpica/tbprint.c
-f:drivers/acpi/acpica/tbutils.c
-f:drivers/acpi/acpica/tbxface.c
-f:drivers/acpi/acpica/tbxfload.c
-f:drivers/acpi/acpica/tbxfroot.c
-f:drivers/acpi/acpica/utaddress.c
-f:drivers/acpi/acpica/utalloc.c
-f:drivers/acpi/acpica/utascii.c
-f:drivers/acpi/acpica/utbuffer.c
-f:drivers/acpi/acpica/utcache.c
-f:drivers/acpi/acpica/utcksum.c
-f:drivers/acpi/acpica/utcopy.c
-f:drivers/acpi/acpica/utdebug.c
-f:drivers/acpi/acpica/utdecode.c
-f:drivers/acpi/acpica/utdelete.c
-f:drivers/acpi/acpica/uterror.c
-f:drivers/acpi/acpica/uteval.c
-f:drivers/acpi/acpica/utexcep.c
-f:drivers/acpi/acpica/utglobal.c
-f:drivers/acpi/acpica/uthex.c
-f:drivers/acpi/acpica/utids.c
-f:drivers/acpi/acpica/utinit.c
-f:drivers/acpi/acpica/utlock.c
-f:drivers/acpi/acpica/utmath.c
-f:drivers/acpi/acpica/utmisc.c
-f:drivers/acpi/acpica/utmutex.c
-f:drivers/acpi/acpica/utnonansi.c
-f:drivers/acpi/acpica/utobject.c
-f:drivers/acpi/acpica/utosi.c
-f:drivers/acpi/acpica/utownerid.c
-f:drivers/acpi/acpica/utpredef.c
-f:drivers/acpi/acpica/utprint.c
-f:drivers/acpi/acpica/utresdecode.c
-f:drivers/acpi/acpica/utresrc.c
-f:drivers/acpi/acpica/utstate.c
-f:drivers/acpi/acpica/utstring.c
-f:drivers/acpi/acpica/utstrsuppt.c
-f:drivers/acpi/acpica/utstrtoul64.c
-f:drivers/acpi/acpica/uttrack.c
-f:drivers/acpi/acpica/utuuid.c
-f:drivers/acpi/acpica/utxface.c
-f:drivers/acpi/acpica/utxferror.c
-f:drivers/acpi/acpica/utxfinit.c
-f:drivers/acpi/acpica/utxfmutex.c
-f:drivers/acpi/apei/Kconfig
-f:drivers/acpi/apei/Makefile
-f:drivers/acpi/apei/apei-base.c
-f:drivers/acpi/apei/apei-internal.h
-f:drivers/acpi/apei/bert.c
-f:drivers/acpi/apei/einj-core.c
-f:drivers/acpi/apei/einj-cxl.c
-f:drivers/acpi/apei/erst-dbg.c
-f:drivers/acpi/apei/erst.c
-f:drivers/acpi/apei/ghes.c
-f:drivers/acpi/apei/hest.c
-f:drivers/acpi/arm64/Kconfig
-f:drivers/acpi/arm64/Makefile
-f:drivers/acpi/arm64/agdi.c
-f:drivers/acpi/arm64/amba.c
-f:drivers/acpi/arm64/apmt.c
-f:drivers/acpi/arm64/cpuidle.c
-f:drivers/acpi/arm64/dma.c
-f:drivers/acpi/arm64/ffh.c
-f:drivers/acpi/arm64/gtdt.c
-f:drivers/acpi/arm64/init.c
-f:drivers/acpi/arm64/init.h
-f:drivers/acpi/arm64/iort.c
-f:drivers/acpi/arm64/thermal_cpufreq.c
-f:drivers/acpi/battery.c
-f:drivers/acpi/bgrt.c
-f:drivers/acpi/bus.c
-f:drivers/acpi/button.c
-f:drivers/acpi/container.c
-f:drivers/acpi/cppc_acpi.c
-f:drivers/acpi/debugfs.c
-f:drivers/acpi/device_pm.c
-f:drivers/acpi/device_sysfs.c
-f:drivers/acpi/dock.c
-f:drivers/acpi/dptf/Kconfig
-f:drivers/acpi/dptf/Makefile
-f:drivers/acpi/dptf/dptf_pch_fivr.c
-f:drivers/acpi/dptf/dptf_power.c
-f:drivers/acpi/dptf/int340x_thermal.c
-f:drivers/acpi/ec.c
-f:drivers/acpi/ec_sys.c
-f:drivers/acpi/event.c
-f:drivers/acpi/evged.c
-f:drivers/acpi/fan.h
-f:drivers/acpi/fan_attr.c
-f:drivers/acpi/fan_core.c
-f:drivers/acpi/fan_hwmon.c
-f:drivers/acpi/glue.c
-f:drivers/acpi/hed.c
-f:drivers/acpi/internal.h
-f:drivers/acpi/ioapic.c
-f:drivers/acpi/irq.c
-f:drivers/acpi/mipi-disco-img.c
-f:drivers/acpi/nfit/Kconfig
-f:drivers/acpi/nfit/Makefile
-f:drivers/acpi/nfit/core.c
-f:drivers/acpi/nfit/intel.c
-f:drivers/acpi/nfit/intel.h
-f:drivers/acpi/nfit/mce.c
-f:drivers/acpi/nfit/nfit.h
-f:drivers/acpi/nhlt.c
-f:drivers/acpi/numa/Kconfig
-f:drivers/acpi/numa/Makefile
-f:drivers/acpi/numa/hmat.c
-f:drivers/acpi/numa/srat.c
-f:drivers/acpi/nvs.c
-f:drivers/acpi/osi.c
-f:drivers/acpi/osl.c
-f:drivers/acpi/pci_irq.c
-f:drivers/acpi/pci_link.c
-f:drivers/acpi/pci_mcfg.c
-f:drivers/acpi/pci_root.c
-f:drivers/acpi/pci_slot.c
-f:drivers/acpi/pfr_telemetry.c
-f:drivers/acpi/pfr_update.c
-f:drivers/acpi/platform_profile.c
-f:drivers/acpi/pmic/Kconfig
-f:drivers/acpi/pmic/Makefile
-f:drivers/acpi/pmic/intel_pmic.c
-f:drivers/acpi/pmic/intel_pmic.h
-f:drivers/acpi/pmic/intel_pmic_bxtwc.c
-f:drivers/acpi/pmic/intel_pmic_bytcrc.c
-f:drivers/acpi/pmic/intel_pmic_chtcrc.c
-f:drivers/acpi/pmic/intel_pmic_chtdc_ti.c
-f:drivers/acpi/pmic/intel_pmic_chtwc.c
-f:drivers/acpi/pmic/intel_pmic_xpower.c
-f:drivers/acpi/pmic/tps68470_pmic.c
-f:drivers/acpi/power.c
-f:drivers/acpi/pptt.c
-f:drivers/acpi/prmt.c
-f:drivers/acpi/proc.c
-f:drivers/acpi/processor_core.c
-f:drivers/acpi/processor_driver.c
-f:drivers/acpi/processor_idle.c
-f:drivers/acpi/processor_pdc.c
-f:drivers/acpi/processor_perflib.c
-f:drivers/acpi/processor_thermal.c
-f:drivers/acpi/processor_throttling.c
-f:drivers/acpi/property.c
-f:drivers/acpi/reboot.c
-f:drivers/acpi/resource.c
-f:drivers/acpi/riscv/Makefile
-f:drivers/acpi/riscv/cppc.c
-f:drivers/acpi/riscv/cpuidle.c
-f:drivers/acpi/riscv/init.c
-f:drivers/acpi/riscv/init.h
-f:drivers/acpi/riscv/irq.c
-f:drivers/acpi/riscv/rhct.c
-f:drivers/acpi/sbs.c
-f:drivers/acpi/sbshc.c
-f:drivers/acpi/sbshc.h
-f:drivers/acpi/scan.c
-f:drivers/acpi/sleep.c
-f:drivers/acpi/sleep.h
-f:drivers/acpi/spcr.c
-f:drivers/acpi/sysfs.c
-f:drivers/acpi/tables.c
-f:drivers/acpi/thermal.c
-f:drivers/acpi/thermal_lib.c
-f:drivers/acpi/tiny-power-button.c
-f:drivers/acpi/utils.c
-f:drivers/acpi/video_detect.c
-f:drivers/acpi/viot.c
-f:drivers/acpi/wakeup.c
-f:drivers/acpi/x86/Makefile
-f:drivers/acpi/x86/apple.c
-f:drivers/acpi/x86/blacklist.c
-f:drivers/acpi/x86/cmos_rtc.c
-f:drivers/acpi/x86/lpss.c
-f:drivers/acpi/x86/s2idle.c
-f:drivers/acpi/x86/utils.c
-f:drivers/amba/Kconfig
-f:drivers/amba/Makefile
-f:drivers/amba/bus.c
-f:drivers/amba/tegra-ahb.c
-f:drivers/android/Kconfig
-f:drivers/android/Makefile
-f:drivers/android/binder.c
-f:drivers/android/binder_alloc.c
-f:drivers/android/binder_alloc.h
-f:drivers/android/binder_internal.h
-f:drivers/android/binder_trace.h
-f:drivers/android/binderfs.c
-f:drivers/android/dbitmap.h
-f:drivers/android/tests/.kunitconfig
-f:drivers/android/tests/Makefile
-f:drivers/android/tests/binder_alloc_kunit.c
-f:drivers/ata/Kconfig
-f:drivers/ata/Makefile
-f:drivers/ata/acard-ahci.c
-f:drivers/ata/ahci.c
-f:drivers/ata/ahci.h
-f:drivers/ata/ahci_brcm.c
-f:drivers/ata/ahci_ceva.c
-f:drivers/ata/ahci_da850.c
-f:drivers/ata/ahci_dm816.c
-f:drivers/ata/ahci_dwc.c
-f:drivers/ata/ahci_imx.c
-f:drivers/ata/ahci_mtk.c
-f:drivers/ata/ahci_mvebu.c
-f:drivers/ata/ahci_octeon.c
-f:drivers/ata/ahci_platform.c
-f:drivers/ata/ahci_qoriq.c
-f:drivers/ata/ahci_seattle.c
-f:drivers/ata/ahci_st.c
-f:drivers/ata/ahci_sunxi.c
-f:drivers/ata/ahci_tegra.c
-f:drivers/ata/ahci_xgene.c
-f:drivers/ata/ata_generic.c
-f:drivers/ata/ata_piix.c
-f:drivers/ata/libahci.c
-f:drivers/ata/libahci_platform.c
-f:drivers/ata/libata-acpi.c
-f:drivers/ata/libata-core.c
-f:drivers/ata/libata-eh.c
-f:drivers/ata/libata-pata-timings.c
-f:drivers/ata/libata-pmp.c
-f:drivers/ata/libata-sata.c
-f:drivers/ata/libata-scsi.c
-f:drivers/ata/libata-sff.c
-f:drivers/ata/libata-trace.c
-f:drivers/ata/libata-transport.c
-f:drivers/ata/libata-transport.h
-f:drivers/ata/libata-zpodd.c
-f:drivers/ata/libata.h
-f:drivers/ata/pata_acpi.c
-f:drivers/ata/pata_ali.c
-f:drivers/ata/pata_amd.c
-f:drivers/ata/pata_arasan_cf.c
-f:drivers/ata/pata_artop.c
-f:drivers/ata/pata_atiixp.c
-f:drivers/ata/pata_atp867x.c
-f:drivers/ata/pata_buddha.c
-f:drivers/ata/pata_cmd640.c
-f:drivers/ata/pata_cmd64x.c
-f:drivers/ata/pata_cs5520.c
-f:drivers/ata/pata_cs5530.c
-f:drivers/ata/pata_cs5535.c
-f:drivers/ata/pata_cs5536.c
-f:drivers/ata/pata_cypress.c
-f:drivers/ata/pata_efar.c
-f:drivers/ata/pata_ep93xx.c
-f:drivers/ata/pata_falcon.c
-f:drivers/ata/pata_ftide010.c
-f:drivers/ata/pata_gayle.c
-f:drivers/ata/pata_hpt366.c
-f:drivers/ata/pata_hpt37x.c
-f:drivers/ata/pata_hpt3x2n.c
-f:drivers/ata/pata_hpt3x3.c
-f:drivers/ata/pata_icside.c
-f:drivers/ata/pata_imx.c
-f:drivers/ata/pata_isapnp.c
-f:drivers/ata/pata_it8213.c
-f:drivers/ata/pata_it821x.c
-f:drivers/ata/pata_ixp4xx_cf.c
-f:drivers/ata/pata_jmicron.c
-f:drivers/ata/pata_legacy.c
-f:drivers/ata/pata_macio.c
-f:drivers/ata/pata_marvell.c
-f:drivers/ata/pata_mpc52xx.c
-f:drivers/ata/pata_mpiix.c
-f:drivers/ata/pata_netcell.c
-f:drivers/ata/pata_ninja32.c
-f:drivers/ata/pata_ns87410.c
-f:drivers/ata/pata_ns87415.c
-f:drivers/ata/pata_octeon_cf.c
-f:drivers/ata/pata_of_platform.c
-f:drivers/ata/pata_oldpiix.c
-f:drivers/ata/pata_opti.c
-f:drivers/ata/pata_optidma.c
-f:drivers/ata/pata_parport/Kconfig
-f:drivers/ata/pata_parport/Makefile
-f:drivers/ata/pata_parport/aten.c
-f:drivers/ata/pata_parport/bpck.c
-f:drivers/ata/pata_parport/bpck6.c
-f:drivers/ata/pata_parport/comm.c
-f:drivers/ata/pata_parport/dstr.c
-f:drivers/ata/pata_parport/epat.c
-f:drivers/ata/pata_parport/epia.c
-f:drivers/ata/pata_parport/fit2.c
-f:drivers/ata/pata_parport/fit3.c
-f:drivers/ata/pata_parport/friq.c
-f:drivers/ata/pata_parport/frpw.c
-f:drivers/ata/pata_parport/kbic.c
-f:drivers/ata/pata_parport/ktti.c
-f:drivers/ata/pata_parport/on20.c
-f:drivers/ata/pata_parport/on26.c
-f:drivers/ata/pata_parport/pata_parport.c
-f:drivers/ata/pata_parport/pata_parport.h
-f:drivers/ata/pata_pcmcia.c
-f:drivers/ata/pata_pdc2027x.c
-f:drivers/ata/pata_pdc202xx_old.c
-f:drivers/ata/pata_piccolo.c
-f:drivers/ata/pata_platform.c
-f:drivers/ata/pata_pxa.c
-f:drivers/ata/pata_radisys.c
-f:drivers/ata/pata_rb532_cf.c
-f:drivers/ata/pata_rdc.c
-f:drivers/ata/pata_rz1000.c
-f:drivers/ata/pata_sc1200.c
-f:drivers/ata/pata_sch.c
-f:drivers/ata/pata_serverworks.c
-f:drivers/ata/pata_sil680.c
-f:drivers/ata/pata_sis.c
-f:drivers/ata/pata_sl82c105.c
-f:drivers/ata/pata_triflex.c
-f:drivers/ata/pata_via.c
-f:drivers/ata/pdc_adma.c
-f:drivers/ata/sata_dwc_460ex.c
-f:drivers/ata/sata_fsl.c
-f:drivers/ata/sata_gemini.c
-f:drivers/ata/sata_gemini.h
-f:drivers/ata/sata_highbank.c
-f:drivers/ata/sata_inic162x.c
-f:drivers/ata/sata_mv.c
-f:drivers/ata/sata_nv.c
-f:drivers/ata/sata_promise.c
-f:drivers/ata/sata_promise.h
-f:drivers/ata/sata_qstor.c
-f:drivers/ata/sata_rcar.c
-f:drivers/ata/sata_sil.c
-f:drivers/ata/sata_sil24.c
-f:drivers/ata/sata_sis.c
-f:drivers/ata/sata_svw.c
-f:drivers/ata/sata_sx4.c
-f:drivers/ata/sata_uli.c
-f:drivers/ata/sata_via.c
-f:drivers/ata/sata_vsc.c
-f:drivers/ata/sis.h
-f:drivers/atm/.gitignore
-f:drivers/atm/Kconfig
-f:drivers/atm/Makefile
-f:drivers/atm/adummy.c
-f:drivers/atm/atmtcp.c
-f:drivers/atm/eni.c
-f:drivers/atm/eni.h
-f:drivers/atm/fore200e.c
-f:drivers/atm/fore200e.h
-f:drivers/atm/he.c
-f:drivers/atm/he.h
-f:drivers/atm/idt77105.c
-f:drivers/atm/idt77105.h
-f:drivers/atm/idt77252.c
-f:drivers/atm/idt77252.h
-f:drivers/atm/idt77252_tables.h
-f:drivers/atm/iphase.c
-f:drivers/atm/iphase.h
-f:drivers/atm/lanai.c
-f:drivers/atm/midway.h
-f:drivers/atm/nicstar.c
-f:drivers/atm/nicstar.h
-f:drivers/atm/nicstarmac.c
-f:drivers/atm/nicstarmac.copyright
-f:drivers/atm/solos-attrlist.c
-f:drivers/atm/solos-pci.c
-f:drivers/atm/suni.c
-f:drivers/atm/suni.h
-f:drivers/atm/tonga.h
-f:drivers/atm/zeprom.h
-f:drivers/auxdisplay/Kconfig
-f:drivers/auxdisplay/Makefile
-f:drivers/auxdisplay/arm-charlcd.c
-f:drivers/auxdisplay/cfag12864b.c
-f:drivers/auxdisplay/cfag12864bfb.c
-f:drivers/auxdisplay/charlcd.c
-f:drivers/auxdisplay/charlcd.h
-f:drivers/auxdisplay/hd44780.c
-f:drivers/auxdisplay/hd44780_common.c
-f:drivers/auxdisplay/hd44780_common.h
-f:drivers/auxdisplay/ht16k33.c
-f:drivers/auxdisplay/img-ascii-lcd.c
-f:drivers/auxdisplay/ks0108.c
-f:drivers/auxdisplay/lcd2s.c
-f:drivers/auxdisplay/line-display.c
-f:drivers/auxdisplay/line-display.h
-f:drivers/auxdisplay/max6959.c
-f:drivers/auxdisplay/panel.c
-f:drivers/auxdisplay/seg-led-gpio.c
-f:drivers/base/Kconfig
-f:drivers/base/Makefile
-f:drivers/base/arch_numa.c
-f:drivers/base/arch_topology.c
-f:drivers/base/attribute_container.c
-f:drivers/base/auxiliary.c
-f:drivers/base/auxiliary_sysfs.c
-f:drivers/base/base.h
-f:drivers/base/bus.c
-f:drivers/base/cacheinfo.c
-f:drivers/base/class.c
-f:drivers/base/component.c
-f:drivers/base/container.c
-f:drivers/base/core.c
-f:drivers/base/cpu.c
-f:drivers/base/dd.c
-f:drivers/base/devcoredump.c
-f:drivers/base/devres.c
-f:drivers/base/devtmpfs.c
-f:drivers/base/driver.c
-f:drivers/base/faux.c
-f:drivers/base/firmware.c
-f:drivers/base/firmware_loader/Kconfig
-f:drivers/base/firmware_loader/Makefile
-f:drivers/base/firmware_loader/builtin/.gitignore
-f:drivers/base/firmware_loader/builtin/Makefile
-f:drivers/base/firmware_loader/builtin/main.c
-f:drivers/base/firmware_loader/fallback.c
-f:drivers/base/firmware_loader/fallback.h
-f:drivers/base/firmware_loader/fallback_platform.c
-f:drivers/base/firmware_loader/fallback_table.c
-f:drivers/base/firmware_loader/firmware.h
-f:drivers/base/firmware_loader/main.c
-f:drivers/base/firmware_loader/sysfs.c
-f:drivers/base/firmware_loader/sysfs.h
-f:drivers/base/firmware_loader/sysfs_upload.c
-f:drivers/base/firmware_loader/sysfs_upload.h
-f:drivers/base/hypervisor.c
-f:drivers/base/init.c
-f:drivers/base/isa.c
-f:drivers/base/map.c
-f:drivers/base/memory.c
-f:drivers/base/module.c
-f:drivers/base/node.c
-f:drivers/base/physical_location.c
-f:drivers/base/physical_location.h
-f:drivers/base/pinctrl.c
-f:drivers/base/platform-msi.c
-f:drivers/base/platform.c
-f:drivers/base/power/Makefile
-f:drivers/base/power/clock_ops.c
-f:drivers/base/power/common.c
-f:drivers/base/power/generic_ops.c
-f:drivers/base/power/main.c
-f:drivers/base/power/power.h
-f:drivers/base/power/qos-test.c
-f:drivers/base/power/qos.c
-f:drivers/base/power/runtime.c
-f:drivers/base/power/sysfs.c
-f:drivers/base/power/trace.c
-f:drivers/base/power/wakeirq.c
-f:drivers/base/power/wakeup.c
-f:drivers/base/power/wakeup_stats.c
-f:drivers/base/property.c
-f:drivers/base/regmap/Kconfig
-f:drivers/base/regmap/Makefile
-f:drivers/base/regmap/internal.h
-f:drivers/base/regmap/regcache-flat.c
-f:drivers/base/regmap/regcache-maple.c
-f:drivers/base/regmap/regcache-rbtree.c
-f:drivers/base/regmap/regcache.c
-f:drivers/base/regmap/regmap-ac97.c
-f:drivers/base/regmap/regmap-debugfs.c
-f:drivers/base/regmap/regmap-fsi.c
-f:drivers/base/regmap/regmap-i2c.c
-f:drivers/base/regmap/regmap-i3c.c
-f:drivers/base/regmap/regmap-irq.c
-f:drivers/base/regmap/regmap-kunit.c
-f:drivers/base/regmap/regmap-mdio.c
-f:drivers/base/regmap/regmap-mmio.c
-f:drivers/base/regmap/regmap-ram.c
-f:drivers/base/regmap/regmap-raw-ram.c
-f:drivers/base/regmap/regmap-sccb.c
-f:drivers/base/regmap/regmap-sdw-mbq.c
-f:drivers/base/regmap/regmap-sdw.c
-f:drivers/base/regmap/regmap-slimbus.c
-f:drivers/base/regmap/regmap-spi-avmm.c
-f:drivers/base/regmap/regmap-spi.c
-f:drivers/base/regmap/regmap-spmi.c
-f:drivers/base/regmap/regmap-w1.c
-f:drivers/base/regmap/regmap.c
-f:drivers/base/regmap/trace.h
-f:drivers/base/soc.c
-f:drivers/base/swnode.c
-f:drivers/base/syscore.c
-f:drivers/base/test/.kunitconfig
-f:drivers/base/test/Kconfig
-f:drivers/base/test/Makefile
-f:drivers/base/test/platform-device-test.c
-f:drivers/base/test/property-entry-test.c
-f:drivers/base/test/root-device-test.c
-f:drivers/base/test/test_async_driver_probe.c
-f:drivers/base/topology.c
-f:drivers/base/trace.c
-f:drivers/base/trace.h
-f:drivers/base/transport_class.c
-f:drivers/bcma/Kconfig
-f:drivers/bcma/Makefile
-f:drivers/bcma/README
-f:drivers/bcma/TODO
-f:drivers/bcma/bcma_private.h
-f:drivers/bcma/core.c
-f:drivers/bcma/driver_chipcommon.c
-f:drivers/bcma/driver_chipcommon_b.c
-f:drivers/bcma/driver_chipcommon_nflash.c
-f:drivers/bcma/driver_chipcommon_pflash.c
-f:drivers/bcma/driver_chipcommon_pmu.c
-f:drivers/bcma/driver_chipcommon_sflash.c
-f:drivers/bcma/driver_gmac_cmn.c
-f:drivers/bcma/driver_gpio.c
-f:drivers/bcma/driver_mips.c
-f:drivers/bcma/driver_pci.c
-f:drivers/bcma/driver_pci_host.c
-f:drivers/bcma/driver_pcie2.c
-f:drivers/bcma/host_pci.c
-f:drivers/bcma/host_soc.c
-f:drivers/bcma/main.c
-f:drivers/bcma/scan.c
-f:drivers/bcma/scan.h
-f:drivers/bcma/sprom.c
-f:drivers/block/Kconfig
-f:drivers/block/Makefile
-f:drivers/block/amiflop.c
-f:drivers/block/aoe/Makefile
-f:drivers/block/aoe/aoe.h
-f:drivers/block/aoe/aoeblk.c
-f:drivers/block/aoe/aoechr.c
-f:drivers/block/aoe/aoecmd.c
-f:drivers/block/aoe/aoedev.c
-f:drivers/block/aoe/aoemain.c
-f:drivers/block/aoe/aoenet.c
-f:drivers/block/ataflop.c
-f:drivers/block/brd.c
-f:drivers/block/drbd/Kconfig
-f:drivers/block/drbd/Makefile
-f:drivers/block/drbd/drbd_actlog.c
-f:drivers/block/drbd/drbd_bitmap.c
-f:drivers/block/drbd/drbd_buildtag.c
-f:drivers/block/drbd/drbd_debugfs.c
-f:drivers/block/drbd/drbd_debugfs.h
-f:drivers/block/drbd/drbd_int.h
-f:drivers/block/drbd/drbd_interval.c
-f:drivers/block/drbd/drbd_interval.h
-f:drivers/block/drbd/drbd_main.c
-f:drivers/block/drbd/drbd_nl.c
-f:drivers/block/drbd/drbd_nla.c
-f:drivers/block/drbd/drbd_nla.h
-f:drivers/block/drbd/drbd_polymorph_printk.h
-f:drivers/block/drbd/drbd_proc.c
-f:drivers/block/drbd/drbd_protocol.h
-f:drivers/block/drbd/drbd_receiver.c
-f:drivers/block/drbd/drbd_req.c
-f:drivers/block/drbd/drbd_req.h
-f:drivers/block/drbd/drbd_state.c
-f:drivers/block/drbd/drbd_state.h
-f:drivers/block/drbd/drbd_state_change.h
-f:drivers/block/drbd/drbd_strings.c
-f:drivers/block/drbd/drbd_strings.h
-f:drivers/block/drbd/drbd_vli.h
-f:drivers/block/drbd/drbd_worker.c
-f:drivers/block/floppy.c
-f:drivers/block/loop.c
-f:drivers/block/mtip32xx/Kconfig
-f:drivers/block/mtip32xx/Makefile
-f:drivers/block/mtip32xx/mtip32xx.c
-f:drivers/block/mtip32xx/mtip32xx.h
-f:drivers/block/n64cart.c
-f:drivers/block/nbd.c
-f:drivers/block/null_blk/Kconfig
-f:drivers/block/null_blk/Makefile
-f:drivers/block/null_blk/main.c
-f:drivers/block/null_blk/null_blk.h
-f:drivers/block/null_blk/trace.c
-f:drivers/block/null_blk/trace.h
-f:drivers/block/null_blk/zoned.c
-f:drivers/block/ps3disk.c
-f:drivers/block/ps3vram.c
-f:drivers/block/rbd.c
-f:drivers/block/rbd_types.h
-f:drivers/block/rnbd/Kconfig
-f:drivers/block/rnbd/Makefile
-f:drivers/block/rnbd/README
-f:drivers/block/rnbd/rnbd-clt-sysfs.c
-f:drivers/block/rnbd/rnbd-clt.c
-f:drivers/block/rnbd/rnbd-clt.h
-f:drivers/block/rnbd/rnbd-log.h
-f:drivers/block/rnbd/rnbd-proto.h
-f:drivers/block/rnbd/rnbd-srv-sysfs.c
-f:drivers/block/rnbd/rnbd-srv-trace.c
-f:drivers/block/rnbd/rnbd-srv-trace.h
-f:drivers/block/rnbd/rnbd-srv.c
-f:drivers/block/rnbd/rnbd-srv.h
-f:drivers/block/rnull.rs
-f:drivers/block/sunvdc.c
-f:drivers/block/swim.c
-f:drivers/block/swim3.c
-f:drivers/block/swim_asm.S
-f:drivers/block/ublk_drv.c
-f:drivers/block/virtio_blk.c
-f:drivers/block/xen-blkback/Makefile
-f:drivers/block/xen-blkback/blkback.c
-f:drivers/block/xen-blkback/common.h
-f:drivers/block/xen-blkback/xenbus.c
-f:drivers/block/xen-blkfront.c
-f:drivers/block/z2ram.c
-f:drivers/block/zloop.c
-f:drivers/block/zram/Kconfig
-f:drivers/block/zram/Makefile
-f:drivers/block/zram/backend_842.c
-f:drivers/block/zram/backend_842.h
-f:drivers/block/zram/backend_deflate.c
-f:drivers/block/zram/backend_deflate.h
-f:drivers/block/zram/backend_lz4.c
-f:drivers/block/zram/backend_lz4.h
-f:drivers/block/zram/backend_lz4hc.c
-f:drivers/block/zram/backend_lz4hc.h
-f:drivers/block/zram/backend_lzo.c
-f:drivers/block/zram/backend_lzo.h
-f:drivers/block/zram/backend_lzorle.c
-f:drivers/block/zram/backend_lzorle.h
-f:drivers/block/zram/backend_zstd.c
-f:drivers/block/zram/backend_zstd.h
-f:drivers/block/zram/zcomp.c
-f:drivers/block/zram/zcomp.h
-f:drivers/block/zram/zram_drv.c
-f:drivers/block/zram/zram_drv.h
-f:drivers/bluetooth/Kconfig
-f:drivers/bluetooth/Makefile
-f:drivers/bluetooth/ath3k.c
-f:drivers/bluetooth/bcm203x.c
-f:drivers/bluetooth/bfusb.c
-f:drivers/bluetooth/bluecard_cs.c
-f:drivers/bluetooth/bpa10x.c
-f:drivers/bluetooth/bt3c_cs.c
-f:drivers/bluetooth/btbcm.c
-f:drivers/bluetooth/btbcm.h
-f:drivers/bluetooth/btintel.c
-f:drivers/bluetooth/btintel.h
-f:drivers/bluetooth/btintel_pcie.c
-f:drivers/bluetooth/btintel_pcie.h
-f:drivers/bluetooth/btmrvl_debugfs.c
-f:drivers/bluetooth/btmrvl_drv.h
-f:drivers/bluetooth/btmrvl_main.c
-f:drivers/bluetooth/btmrvl_sdio.c
-f:drivers/bluetooth/btmrvl_sdio.h
-f:drivers/bluetooth/btmtk.c
-f:drivers/bluetooth/btmtk.h
-f:drivers/bluetooth/btmtksdio.c
-f:drivers/bluetooth/btmtkuart.c
-f:drivers/bluetooth/btnxpuart.c
-f:drivers/bluetooth/btqca.c
-f:drivers/bluetooth/btqca.h
-f:drivers/bluetooth/btqcomsmd.c
-f:drivers/bluetooth/btrsi.c
-f:drivers/bluetooth/btrtl.c
-f:drivers/bluetooth/btrtl.h
-f:drivers/bluetooth/btsdio.c
-f:drivers/bluetooth/btusb.c
-f:drivers/bluetooth/dtl1_cs.c
-f:drivers/bluetooth/h4_recv.h
-f:drivers/bluetooth/hci_ag6xx.c
-f:drivers/bluetooth/hci_aml.c
-f:drivers/bluetooth/hci_ath.c
-f:drivers/bluetooth/hci_bcm.c
-f:drivers/bluetooth/hci_bcm4377.c
-f:drivers/bluetooth/hci_bcsp.c
-f:drivers/bluetooth/hci_h4.c
-f:drivers/bluetooth/hci_h5.c
-f:drivers/bluetooth/hci_intel.c
-f:drivers/bluetooth/hci_ldisc.c
-f:drivers/bluetooth/hci_ll.c
-f:drivers/bluetooth/hci_mrvl.c
-f:drivers/bluetooth/hci_nokia.c
-f:drivers/bluetooth/hci_qca.c
-f:drivers/bluetooth/hci_serdev.c
-f:drivers/bluetooth/hci_uart.h
-f:drivers/bluetooth/hci_vhci.c
-f:drivers/bluetooth/virtio_bt.c
-f:drivers/bus/Kconfig
-f:drivers/bus/Makefile
-f:drivers/bus/arm-cci.c
-f:drivers/bus/arm-integrator-lm.c
-f:drivers/bus/brcmstb_gisb.c
-f:drivers/bus/bt1-apb.c
-f:drivers/bus/bt1-axi.c
-f:drivers/bus/da8xx-mstpri.c
-f:drivers/bus/fsl-mc/Kconfig
-f:drivers/bus/fsl-mc/Makefile
-f:drivers/bus/fsl-mc/dpbp.c
-f:drivers/bus/fsl-mc/dpcon.c
-f:drivers/bus/fsl-mc/dpmcp.c
-f:drivers/bus/fsl-mc/dprc-driver.c
-f:drivers/bus/fsl-mc/dprc.c
-f:drivers/bus/fsl-mc/fsl-mc-allocator.c
-f:drivers/bus/fsl-mc/fsl-mc-bus.c
-f:drivers/bus/fsl-mc/fsl-mc-msi.c
-f:drivers/bus/fsl-mc/fsl-mc-private.h
-f:drivers/bus/fsl-mc/fsl-mc-uapi.c
-f:drivers/bus/fsl-mc/mc-io.c
-f:drivers/bus/fsl-mc/mc-sys.c
-f:drivers/bus/fsl-mc/obj-api.c
-f:drivers/bus/hisi_lpc.c
-f:drivers/bus/imx-aipstz.c
-f:drivers/bus/imx-weim.c
-f:drivers/bus/intel-ixp4xx-eb.c
-f:drivers/bus/mhi/Kconfig
-f:drivers/bus/mhi/Makefile
-f:drivers/bus/mhi/common.h
-f:drivers/bus/mhi/ep/Kconfig
-f:drivers/bus/mhi/ep/Makefile
-f:drivers/bus/mhi/ep/internal.h
-f:drivers/bus/mhi/ep/main.c
-f:drivers/bus/mhi/ep/mmio.c
-f:drivers/bus/mhi/ep/ring.c
-f:drivers/bus/mhi/ep/sm.c
-f:drivers/bus/mhi/host/Kconfig
-f:drivers/bus/mhi/host/Makefile
-f:drivers/bus/mhi/host/boot.c
-f:drivers/bus/mhi/host/debugfs.c
-f:drivers/bus/mhi/host/init.c
-f:drivers/bus/mhi/host/internal.h
-f:drivers/bus/mhi/host/main.c
-f:drivers/bus/mhi/host/pci_generic.c
-f:drivers/bus/mhi/host/pm.c
-f:drivers/bus/mhi/host/trace.h
-f:drivers/bus/mips_cdmm.c
-f:drivers/bus/moxtet.c
-f:drivers/bus/mvebu-mbus.c
-f:drivers/bus/omap-ocp2scp.c
-f:drivers/bus/omap_l3_noc.c
-f:drivers/bus/omap_l3_noc.h
-f:drivers/bus/omap_l3_smx.c
-f:drivers/bus/omap_l3_smx.h
-f:drivers/bus/qcom-ebi2.c
-f:drivers/bus/qcom-ssc-block-bus.c
-f:drivers/bus/simple-pm-bus.c
-f:drivers/bus/stm32_etzpc.c
-f:drivers/bus/stm32_firewall.c
-f:drivers/bus/stm32_firewall.h
-f:drivers/bus/stm32_rifsc.c
-f:drivers/bus/sun50i-de2.c
-f:drivers/bus/sunxi-rsb.c
-f:drivers/bus/tegra-aconnect.c
-f:drivers/bus/tegra-gmi.c
-f:drivers/bus/ti-pwmss.c
-f:drivers/bus/ti-sysc.c
-f:drivers/bus/ts-nbus.c
-f:drivers/bus/uniphier-system-bus.c
-f:drivers/bus/vexpress-config.c
-f:drivers/cache/Kconfig
-f:drivers/cache/Makefile
-f:drivers/cache/ax45mp_cache.c
-f:drivers/cache/sifive_ccache.c
-f:drivers/cache/starfive_starlink_cache.c
-f:drivers/cdrom/Makefile
-f:drivers/cdrom/cdrom.c
-f:drivers/cdrom/gdrom.c
-f:drivers/cdx/Kconfig
-f:drivers/cdx/Makefile
-f:drivers/cdx/cdx.c
-f:drivers/cdx/cdx.h
-f:drivers/cdx/cdx_msi.c
-f:drivers/cdx/controller/Kconfig
-f:drivers/cdx/controller/Makefile
-f:drivers/cdx/controller/bitfield.h
-f:drivers/cdx/controller/cdx_controller.c
-f:drivers/cdx/controller/cdx_controller.h
-f:drivers/cdx/controller/cdx_rpmsg.c
-f:drivers/cdx/controller/mc_cdx_pcol.h
-f:drivers/cdx/controller/mcdi.c
-f:drivers/cdx/controller/mcdi.h
-f:drivers/cdx/controller/mcdi_functions.c
-f:drivers/cdx/controller/mcdi_functions.h
-f:drivers/char/Kconfig
-f:drivers/char/Makefile
-f:drivers/char/adi.c
-f:drivers/char/agp/Kconfig
-f:drivers/char/agp/Makefile
-f:drivers/char/agp/agp.h
-f:drivers/char/agp/ali-agp.c
-f:drivers/char/agp/alpha-agp.c
-f:drivers/char/agp/amd-k7-agp.c
-f:drivers/char/agp/amd64-agp.c
-f:drivers/char/agp/ati-agp.c
-f:drivers/char/agp/backend.c
-f:drivers/char/agp/efficeon-agp.c
-f:drivers/char/agp/generic.c
-f:drivers/char/agp/intel-agp.c
-f:drivers/char/agp/intel-agp.h
-f:drivers/char/agp/intel-gtt.c
-f:drivers/char/agp/isoch.c
-f:drivers/char/agp/nvidia-agp.c
-f:drivers/char/agp/parisc-agp.c
-f:drivers/char/agp/sis-agp.c
-f:drivers/char/agp/sworks-agp.c
-f:drivers/char/agp/uninorth-agp.c
-f:drivers/char/agp/via-agp.c
-f:drivers/char/apm-emulation.c
-f:drivers/char/applicom.c
-f:drivers/char/applicom.h
-f:drivers/char/bsr.c
-f:drivers/char/ds1620.c
-f:drivers/char/dsp56k.c
-f:drivers/char/dtlk.c
-f:drivers/char/hangcheck-timer.c
-f:drivers/char/hpet.c
-f:drivers/char/hw_random/Kconfig
-f:drivers/char/hw_random/Makefile
-f:drivers/char/hw_random/airoha-trng.c
-f:drivers/char/hw_random/amd-rng.c
-f:drivers/char/hw_random/arm_smccc_trng.c
-f:drivers/char/hw_random/atmel-rng.c
-f:drivers/char/hw_random/ba431-rng.c
-f:drivers/char/hw_random/bcm2835-rng.c
-f:drivers/char/hw_random/bcm74110-rng.c
-f:drivers/char/hw_random/cavium-rng-vf.c
-f:drivers/char/hw_random/cavium-rng.c
-f:drivers/char/hw_random/cctrng.c
-f:drivers/char/hw_random/cctrng.h
-f:drivers/char/hw_random/cn10k-rng.c
-f:drivers/char/hw_random/core.c
-f:drivers/char/hw_random/exynos-trng.c
-f:drivers/char/hw_random/geode-rng.c
-f:drivers/char/hw_random/hisi-rng.c
-f:drivers/char/hw_random/histb-rng.c
-f:drivers/char/hw_random/imx-rngc.c
-f:drivers/char/hw_random/ingenic-rng.c
-f:drivers/char/hw_random/ingenic-trng.c
-f:drivers/char/hw_random/intel-rng.c
-f:drivers/char/hw_random/iproc-rng200.c
-f:drivers/char/hw_random/ixp4xx-rng.c
-f:drivers/char/hw_random/jh7110-trng.c
-f:drivers/char/hw_random/ks-sa-rng.c
-f:drivers/char/hw_random/meson-rng.c
-f:drivers/char/hw_random/mpfs-rng.c
-f:drivers/char/hw_random/mtk-rng.c
-f:drivers/char/hw_random/mxc-rnga.c
-f:drivers/char/hw_random/n2-asm.S
-f:drivers/char/hw_random/n2-drv.c
-f:drivers/char/hw_random/n2rng.h
-f:drivers/char/hw_random/nomadik-rng.c
-f:drivers/char/hw_random/npcm-rng.c
-f:drivers/char/hw_random/octeon-rng.c
-f:drivers/char/hw_random/omap-rng.c
-f:drivers/char/hw_random/omap3-rom-rng.c
-f:drivers/char/hw_random/optee-rng.c
-f:drivers/char/hw_random/pasemi-rng.c
-f:drivers/char/hw_random/pic32-rng.c
-f:drivers/char/hw_random/powernv-rng.c
-f:drivers/char/hw_random/pseries-rng.c
-f:drivers/char/hw_random/rockchip-rng.c
-f:drivers/char/hw_random/s390-trng.c
-f:drivers/char/hw_random/st-rng.c
-f:drivers/char/hw_random/stm32-rng.c
-f:drivers/char/hw_random/timeriomem-rng.c
-f:drivers/char/hw_random/via-rng.c
-f:drivers/char/hw_random/virtio-rng.c
-f:drivers/char/hw_random/xgene-rng.c
-f:drivers/char/hw_random/xiphera-trng.c
-f:drivers/char/ipmi/Kconfig
-f:drivers/char/ipmi/Makefile
-f:drivers/char/ipmi/bt-bmc.c
-f:drivers/char/ipmi/ipmb_dev_int.c
-f:drivers/char/ipmi/ipmi_bt_sm.c
-f:drivers/char/ipmi/ipmi_devintf.c
-f:drivers/char/ipmi/ipmi_dmi.c
-f:drivers/char/ipmi/ipmi_dmi.h
-f:drivers/char/ipmi/ipmi_ipmb.c
-f:drivers/char/ipmi/ipmi_kcs_sm.c
-f:drivers/char/ipmi/ipmi_msghandler.c
-f:drivers/char/ipmi/ipmi_plat_data.c
-f:drivers/char/ipmi/ipmi_plat_data.h
-f:drivers/char/ipmi/ipmi_powernv.c
-f:drivers/char/ipmi/ipmi_poweroff.c
-f:drivers/char/ipmi/ipmi_si.h
-f:drivers/char/ipmi/ipmi_si_hardcode.c
-f:drivers/char/ipmi/ipmi_si_hotmod.c
-f:drivers/char/ipmi/ipmi_si_intf.c
-f:drivers/char/ipmi/ipmi_si_mem_io.c
-f:drivers/char/ipmi/ipmi_si_parisc.c
-f:drivers/char/ipmi/ipmi_si_pci.c
-f:drivers/char/ipmi/ipmi_si_platform.c
-f:drivers/char/ipmi/ipmi_si_port_io.c
-f:drivers/char/ipmi/ipmi_si_sm.h
-f:drivers/char/ipmi/ipmi_smic_sm.c
-f:drivers/char/ipmi/ipmi_ssif.c
-f:drivers/char/ipmi/ipmi_watchdog.c
-f:drivers/char/ipmi/kcs_bmc.c
-f:drivers/char/ipmi/kcs_bmc.h
-f:drivers/char/ipmi/kcs_bmc_aspeed.c
-f:drivers/char/ipmi/kcs_bmc_cdev_ipmi.c
-f:drivers/char/ipmi/kcs_bmc_client.h
-f:drivers/char/ipmi/kcs_bmc_device.h
-f:drivers/char/ipmi/kcs_bmc_npcm7xx.c
-f:drivers/char/ipmi/kcs_bmc_serio.c
-f:drivers/char/ipmi/ssif_bmc.c
-f:drivers/char/lp.c
-f:drivers/char/mem.c
-f:drivers/char/misc.c
-f:drivers/char/mwave/3780i.c
-f:drivers/char/mwave/3780i.h
-f:drivers/char/mwave/Makefile
-f:drivers/char/mwave/README
-f:drivers/char/mwave/mwavedd.c
-f:drivers/char/mwave/mwavedd.h
-f:drivers/char/mwave/mwavepub.h
-f:drivers/char/mwave/smapi.c
-f:drivers/char/mwave/smapi.h
-f:drivers/char/mwave/tp3780i.c
-f:drivers/char/mwave/tp3780i.h
-f:drivers/char/nsc_gpio.c
-f:drivers/char/nvram.c
-f:drivers/char/nwbutton.c
-f:drivers/char/nwbutton.h
-f:drivers/char/nwflash.c
-f:drivers/char/pc8736x_gpio.c
-f:drivers/char/powernv-op-panel.c
-f:drivers/char/ppdev.c
-f:drivers/char/ps3flash.c
-f:drivers/char/random.c
-f:drivers/char/scx200_gpio.c
-f:drivers/char/sonypi.c
-f:drivers/char/tlclk.c
-f:drivers/char/toshiba.c
-f:drivers/char/tpm/Kconfig
-f:drivers/char/tpm/Makefile
-f:drivers/char/tpm/eventlog/acpi.c
-f:drivers/char/tpm/eventlog/common.c
-f:drivers/char/tpm/eventlog/common.h
-f:drivers/char/tpm/eventlog/efi.c
-f:drivers/char/tpm/eventlog/of.c
-f:drivers/char/tpm/eventlog/tpm1.c
-f:drivers/char/tpm/eventlog/tpm2.c
-f:drivers/char/tpm/st33zp24/Kconfig
-f:drivers/char/tpm/st33zp24/Makefile
-f:drivers/char/tpm/st33zp24/i2c.c
-f:drivers/char/tpm/st33zp24/spi.c
-f:drivers/char/tpm/st33zp24/st33zp24.c
-f:drivers/char/tpm/st33zp24/st33zp24.h
-f:drivers/char/tpm/tpm-buf.c
-f:drivers/char/tpm/tpm-chip.c
-f:drivers/char/tpm/tpm-dev-common.c
-f:drivers/char/tpm/tpm-dev.c
-f:drivers/char/tpm/tpm-dev.h
-f:drivers/char/tpm/tpm-interface.c
-f:drivers/char/tpm/tpm-sysfs.c
-f:drivers/char/tpm/tpm.h
-f:drivers/char/tpm/tpm1-cmd.c
-f:drivers/char/tpm/tpm2-cmd.c
-f:drivers/char/tpm/tpm2-sessions.c
-f:drivers/char/tpm/tpm2-space.c
-f:drivers/char/tpm/tpm_atmel.c
-f:drivers/char/tpm/tpm_crb.c
-f:drivers/char/tpm/tpm_crb_ffa.c
-f:drivers/char/tpm/tpm_crb_ffa.h
-f:drivers/char/tpm/tpm_ftpm_tee.c
-f:drivers/char/tpm/tpm_ftpm_tee.h
-f:drivers/char/tpm/tpm_i2c_atmel.c
-f:drivers/char/tpm/tpm_i2c_infineon.c
-f:drivers/char/tpm/tpm_i2c_nuvoton.c
-f:drivers/char/tpm/tpm_ibmvtpm.c
-f:drivers/char/tpm/tpm_ibmvtpm.h
-f:drivers/char/tpm/tpm_infineon.c
-f:drivers/char/tpm/tpm_nsc.c
-f:drivers/char/tpm/tpm_ppi.c
-f:drivers/char/tpm/tpm_svsm.c
-f:drivers/char/tpm/tpm_tis.c
-f:drivers/char/tpm/tpm_tis_core.c
-f:drivers/char/tpm/tpm_tis_core.h
-f:drivers/char/tpm/tpm_tis_i2c.c
-f:drivers/char/tpm/tpm_tis_i2c_cr50.c
-f:drivers/char/tpm/tpm_tis_spi.h
-f:drivers/char/tpm/tpm_tis_spi_cr50.c
-f:drivers/char/tpm/tpm_tis_spi_main.c
-f:drivers/char/tpm/tpm_tis_synquacer.c
-f:drivers/char/tpm/tpm_vtpm_proxy.c
-f:drivers/char/tpm/tpmrm-dev.c
-f:drivers/char/tpm/xen-tpmfront.c
-f:drivers/char/ttyprintk.c
-f:drivers/char/uv_mmtimer.c
-f:drivers/char/virtio_console.c
-f:drivers/char/xilinx_hwicap/Makefile
-f:drivers/char/xilinx_hwicap/buffer_icap.c
-f:drivers/char/xilinx_hwicap/buffer_icap.h
-f:drivers/char/xilinx_hwicap/fifo_icap.c
-f:drivers/char/xilinx_hwicap/fifo_icap.h
-f:drivers/char/xilinx_hwicap/xilinx_hwicap.c
-f:drivers/char/xilinx_hwicap/xilinx_hwicap.h
-f:drivers/char/xillybus/Kconfig
-f:drivers/char/xillybus/Makefile
-f:drivers/char/xillybus/xillybus.h
-f:drivers/char/xillybus/xillybus_class.c
-f:drivers/char/xillybus/xillybus_class.h
-f:drivers/char/xillybus/xillybus_core.c
-f:drivers/char/xillybus/xillybus_of.c
-f:drivers/char/xillybus/xillybus_pcie.c
-f:drivers/char/xillybus/xillyusb.c
-f:drivers/clk/.kunitconfig
-f:drivers/clk/Kconfig
-f:drivers/clk/Makefile
-f:drivers/clk/actions/Kconfig
-f:drivers/clk/actions/Makefile
-f:drivers/clk/actions/owl-common.c
-f:drivers/clk/actions/owl-common.h
-f:drivers/clk/actions/owl-composite.c
-f:drivers/clk/actions/owl-composite.h
-f:drivers/clk/actions/owl-divider.c
-f:drivers/clk/actions/owl-divider.h
-f:drivers/clk/actions/owl-factor.c
-f:drivers/clk/actions/owl-factor.h
-f:drivers/clk/actions/owl-fixed-factor.h
-f:drivers/clk/actions/owl-gate.c
-f:drivers/clk/actions/owl-gate.h
-f:drivers/clk/actions/owl-mux.c
-f:drivers/clk/actions/owl-mux.h
-f:drivers/clk/actions/owl-pll.c
-f:drivers/clk/actions/owl-pll.h
-f:drivers/clk/actions/owl-reset.c
-f:drivers/clk/actions/owl-reset.h
-f:drivers/clk/actions/owl-s500.c
-f:drivers/clk/actions/owl-s700.c
-f:drivers/clk/actions/owl-s900.c
-f:drivers/clk/analogbits/Kconfig
-f:drivers/clk/analogbits/Makefile
-f:drivers/clk/analogbits/wrpll-cln28hpc.c
-f:drivers/clk/at91/Makefile
-f:drivers/clk/at91/at91rm9200.c
-f:drivers/clk/at91/at91sam9260.c
-f:drivers/clk/at91/at91sam9g45.c
-f:drivers/clk/at91/at91sam9n12.c
-f:drivers/clk/at91/at91sam9rl.c
-f:drivers/clk/at91/at91sam9x5.c
-f:drivers/clk/at91/clk-audio-pll.c
-f:drivers/clk/at91/clk-generated.c
-f:drivers/clk/at91/clk-h32mx.c
-f:drivers/clk/at91/clk-i2s-mux.c
-f:drivers/clk/at91/clk-main.c
-f:drivers/clk/at91/clk-master.c
-f:drivers/clk/at91/clk-peripheral.c
-f:drivers/clk/at91/clk-pll.c
-f:drivers/clk/at91/clk-plldiv.c
-f:drivers/clk/at91/clk-programmable.c
-f:drivers/clk/at91/clk-sam9x60-pll.c
-f:drivers/clk/at91/clk-slow.c
-f:drivers/clk/at91/clk-smd.c
-f:drivers/clk/at91/clk-system.c
-f:drivers/clk/at91/clk-usb.c
-f:drivers/clk/at91/clk-utmi.c
-f:drivers/clk/at91/dt-compat.c
-f:drivers/clk/at91/pmc.c
-f:drivers/clk/at91/pmc.h
-f:drivers/clk/at91/sam9x60.c
-f:drivers/clk/at91/sam9x7.c
-f:drivers/clk/at91/sama5d2.c
-f:drivers/clk/at91/sama5d3.c
-f:drivers/clk/at91/sama5d4.c
-f:drivers/clk/at91/sama7d65.c
-f:drivers/clk/at91/sama7g5.c
-f:drivers/clk/at91/sckc.c
-f:drivers/clk/axis/Makefile
-f:drivers/clk/axis/clk-artpec6.c
-f:drivers/clk/axs10x/Makefile
-f:drivers/clk/axs10x/i2s_pll_clock.c
-f:drivers/clk/axs10x/pll_clock.c
-f:drivers/clk/baikal-t1/Kconfig
-f:drivers/clk/baikal-t1/Makefile
-f:drivers/clk/baikal-t1/ccu-div.c
-f:drivers/clk/baikal-t1/ccu-div.h
-f:drivers/clk/baikal-t1/ccu-pll.c
-f:drivers/clk/baikal-t1/ccu-pll.h
-f:drivers/clk/baikal-t1/ccu-rst.c
-f:drivers/clk/baikal-t1/ccu-rst.h
-f:drivers/clk/baikal-t1/clk-ccu-div.c
-f:drivers/clk/baikal-t1/clk-ccu-pll.c
-f:drivers/clk/bcm/Kconfig
-f:drivers/clk/bcm/Makefile
-f:drivers/clk/bcm/clk-bcm21664.c
-f:drivers/clk/bcm/clk-bcm2711-dvp.c
-f:drivers/clk/bcm/clk-bcm281xx.c
-f:drivers/clk/bcm/clk-bcm2835-aux.c
-f:drivers/clk/bcm/clk-bcm2835.c
-f:drivers/clk/bcm/clk-bcm53573-ilp.c
-f:drivers/clk/bcm/clk-bcm63268-timer.c
-f:drivers/clk/bcm/clk-bcm63xx-gate.c
-f:drivers/clk/bcm/clk-bcm63xx.c
-f:drivers/clk/bcm/clk-cygnus.c
-f:drivers/clk/bcm/clk-hr2.c
-f:drivers/clk/bcm/clk-iproc-armpll.c
-f:drivers/clk/bcm/clk-iproc-asiu.c
-f:drivers/clk/bcm/clk-iproc-pll.c
-f:drivers/clk/bcm/clk-iproc.h
-f:drivers/clk/bcm/clk-kona-setup.c
-f:drivers/clk/bcm/clk-kona.c
-f:drivers/clk/bcm/clk-kona.h
-f:drivers/clk/bcm/clk-ns2.c
-f:drivers/clk/bcm/clk-nsp.c
-f:drivers/clk/bcm/clk-raspberrypi.c
-f:drivers/clk/bcm/clk-sr.c
-f:drivers/clk/berlin/Makefile
-f:drivers/clk/berlin/berlin2-avpll.c
-f:drivers/clk/berlin/berlin2-avpll.h
-f:drivers/clk/berlin/berlin2-div.c
-f:drivers/clk/berlin/berlin2-div.h
-f:drivers/clk/berlin/berlin2-pll.c
-f:drivers/clk/berlin/berlin2-pll.h
-f:drivers/clk/berlin/bg2.c
-f:drivers/clk/berlin/bg2q.c
-f:drivers/clk/berlin/common.h
-f:drivers/clk/clk-apple-nco.c
-f:drivers/clk/clk-asm9260.c
-f:drivers/clk/clk-aspeed.c
-f:drivers/clk/clk-aspeed.h
-f:drivers/clk/clk-ast2600.c
-f:drivers/clk/clk-axi-clkgen.c
-f:drivers/clk/clk-axm5516.c
-f:drivers/clk/clk-bd718x7.c
-f:drivers/clk/clk-bm1880.c
-f:drivers/clk/clk-bulk.c
-f:drivers/clk/clk-cdce706.c
-f:drivers/clk/clk-cdce925.c
-f:drivers/clk/clk-clps711x.c
-f:drivers/clk/clk-composite.c
-f:drivers/clk/clk-conf.c
-f:drivers/clk/clk-cs2000-cp.c
-f:drivers/clk/clk-devres.c
-f:drivers/clk/clk-divider.c
-f:drivers/clk/clk-en7523.c
-f:drivers/clk/clk-ep93xx.c
-f:drivers/clk/clk-eyeq.c
-f:drivers/clk/clk-fixed-factor.c
-f:drivers/clk/clk-fixed-mmio.c
-f:drivers/clk/clk-fixed-rate.c
-f:drivers/clk/clk-fixed-rate_test.c
-f:drivers/clk/clk-fixed-rate_test.h
-f:drivers/clk/clk-fractional-divider.c
-f:drivers/clk/clk-fractional-divider.h
-f:drivers/clk/clk-fractional-divider_test.c
-f:drivers/clk/clk-fsl-flexspi.c
-f:drivers/clk/clk-fsl-sai.c
-f:drivers/clk/clk-gate.c
-f:drivers/clk/clk-gate_test.c
-f:drivers/clk/clk-gemini.c
-f:drivers/clk/clk-gpio.c
-f:drivers/clk/clk-hi655x.c
-f:drivers/clk/clk-highbank.c
-f:drivers/clk/clk-hsdk-pll.c
-f:drivers/clk/clk-k210.c
-f:drivers/clk/clk-lan966x.c
-f:drivers/clk/clk-lmk04832.c
-f:drivers/clk/clk-lochnagar.c
-f:drivers/clk/clk-loongson1.c
-f:drivers/clk/clk-loongson2.c
-f:drivers/clk/clk-max77686.c
-f:drivers/clk/clk-max9485.c
-f:drivers/clk/clk-milbeaut.c
-f:drivers/clk/clk-moxart.c
-f:drivers/clk/clk-multiplier.c
-f:drivers/clk/clk-mux.c
-f:drivers/clk/clk-nomadik.c
-f:drivers/clk/clk-npcm7xx.c
-f:drivers/clk/clk-npcm8xx.c
-f:drivers/clk/clk-nspire.c
-f:drivers/clk/clk-palmas.c
-f:drivers/clk/clk-plldig.c
-f:drivers/clk/clk-pwm.c
-f:drivers/clk/clk-qoriq.c
-f:drivers/clk/clk-renesas-pcie.c
-f:drivers/clk/clk-rk808.c
-f:drivers/clk/clk-rp1.c
-f:drivers/clk/clk-s2mps11.c
-f:drivers/clk/clk-scmi.c
-f:drivers/clk/clk-scpi.c
-f:drivers/clk/clk-si514.c
-f:drivers/clk/clk-si521xx.c
-f:drivers/clk/clk-si5341.c
-f:drivers/clk/clk-si5351.c
-f:drivers/clk/clk-si5351.h
-f:drivers/clk/clk-si544.c
-f:drivers/clk/clk-si570.c
-f:drivers/clk/clk-sp7021.c
-f:drivers/clk/clk-sparx5.c
-f:drivers/clk/clk-stm32f4.c
-f:drivers/clk/clk-stm32h7.c
-f:drivers/clk/clk-tps68470.c
-f:drivers/clk/clk-twl.c
-f:drivers/clk/clk-twl6040.c
-f:drivers/clk/clk-versaclock3.c
-f:drivers/clk/clk-versaclock5.c
-f:drivers/clk/clk-versaclock7.c
-f:drivers/clk/clk-vt8500.c
-f:drivers/clk/clk-wm831x.c
-f:drivers/clk/clk-xgene.c
-f:drivers/clk/clk.c
-f:drivers/clk/clk.h
-f:drivers/clk/clk_kunit_helpers.c
-f:drivers/clk/clk_parent_data_test.h
-f:drivers/clk/clk_test.c
-f:drivers/clk/clkdev.c
-f:drivers/clk/davinci/Makefile
-f:drivers/clk/davinci/da8xx-cfgchip.c
-f:drivers/clk/davinci/pll-da850.c
-f:drivers/clk/davinci/pll.c
-f:drivers/clk/davinci/pll.h
-f:drivers/clk/davinci/psc-da850.c
-f:drivers/clk/davinci/psc.c
-f:drivers/clk/davinci/psc.h
-f:drivers/clk/hisilicon/Kconfig
-f:drivers/clk/hisilicon/Makefile
-f:drivers/clk/hisilicon/clk-hi3519.c
-f:drivers/clk/hisilicon/clk-hi3559a.c
-f:drivers/clk/hisilicon/clk-hi3620.c
-f:drivers/clk/hisilicon/clk-hi3660-stub.c
-f:drivers/clk/hisilicon/clk-hi3660.c
-f:drivers/clk/hisilicon/clk-hi3670.c
-f:drivers/clk/hisilicon/clk-hi6220-stub.c
-f:drivers/clk/hisilicon/clk-hi6220.c
-f:drivers/clk/hisilicon/clk-hip04.c
-f:drivers/clk/hisilicon/clk-hisi-phase.c
-f:drivers/clk/hisilicon/clk-hix5hd2.c
-f:drivers/clk/hisilicon/clk.c
-f:drivers/clk/hisilicon/clk.h
-f:drivers/clk/hisilicon/clkdivider-hi6220.c
-f:drivers/clk/hisilicon/clkgate-separated.c
-f:drivers/clk/hisilicon/crg-hi3516cv300.c
-f:drivers/clk/hisilicon/crg-hi3798cv200.c
-f:drivers/clk/hisilicon/crg.h
-f:drivers/clk/hisilicon/reset.c
-f:drivers/clk/hisilicon/reset.h
-f:drivers/clk/imgtec/Kconfig
-f:drivers/clk/imgtec/Makefile
-f:drivers/clk/imgtec/clk-boston.c
-f:drivers/clk/imx/Kconfig
-f:drivers/clk/imx/Makefile
-f:drivers/clk/imx/clk-busy.c
-f:drivers/clk/imx/clk-composite-7ulp.c
-f:drivers/clk/imx/clk-composite-8m.c
-f:drivers/clk/imx/clk-composite-93.c
-f:drivers/clk/imx/clk-cpu.c
-f:drivers/clk/imx/clk-divider-gate.c
-f:drivers/clk/imx/clk-fixup-div.c
-f:drivers/clk/imx/clk-fixup-mux.c
-f:drivers/clk/imx/clk-frac-pll.c
-f:drivers/clk/imx/clk-fracn-gppll.c
-f:drivers/clk/imx/clk-gate-93.c
-f:drivers/clk/imx/clk-gate-exclusive.c
-f:drivers/clk/imx/clk-gate2.c
-f:drivers/clk/imx/clk-gpr-mux.c
-f:drivers/clk/imx/clk-imx1.c
-f:drivers/clk/imx/clk-imx25.c
-f:drivers/clk/imx/clk-imx27.c
-f:drivers/clk/imx/clk-imx31.c
-f:drivers/clk/imx/clk-imx35.c
-f:drivers/clk/imx/clk-imx5.c
-f:drivers/clk/imx/clk-imx6q.c
-f:drivers/clk/imx/clk-imx6sl.c
-f:drivers/clk/imx/clk-imx6sll.c
-f:drivers/clk/imx/clk-imx6sx.c
-f:drivers/clk/imx/clk-imx6ul.c
-f:drivers/clk/imx/clk-imx7d.c
-f:drivers/clk/imx/clk-imx7ulp.c
-f:drivers/clk/imx/clk-imx8-acm.c
-f:drivers/clk/imx/clk-imx8dxl-rsrc.c
-f:drivers/clk/imx/clk-imx8mm.c
-f:drivers/clk/imx/clk-imx8mn.c
-f:drivers/clk/imx/clk-imx8mp-audiomix.c
-f:drivers/clk/imx/clk-imx8mp.c
-f:drivers/clk/imx/clk-imx8mq.c
-f:drivers/clk/imx/clk-imx8qm-rsrc.c
-f:drivers/clk/imx/clk-imx8qxp-lpcg.c
-f:drivers/clk/imx/clk-imx8qxp-lpcg.h
-f:drivers/clk/imx/clk-imx8qxp-rsrc.c
-f:drivers/clk/imx/clk-imx8qxp.c
-f:drivers/clk/imx/clk-imx8ulp.c
-f:drivers/clk/imx/clk-imx93.c
-f:drivers/clk/imx/clk-imx95-blk-ctl.c
-f:drivers/clk/imx/clk-imxrt1050.c
-f:drivers/clk/imx/clk-lpcg-scu.c
-f:drivers/clk/imx/clk-pfd.c
-f:drivers/clk/imx/clk-pfdv2.c
-f:drivers/clk/imx/clk-pll14xx.c
-f:drivers/clk/imx/clk-pllv1.c
-f:drivers/clk/imx/clk-pllv2.c
-f:drivers/clk/imx/clk-pllv3.c
-f:drivers/clk/imx/clk-pllv4.c
-f:drivers/clk/imx/clk-scu.c
-f:drivers/clk/imx/clk-scu.h
-f:drivers/clk/imx/clk-sscg-pll.c
-f:drivers/clk/imx/clk-vf610.c
-f:drivers/clk/imx/clk.c
-f:drivers/clk/imx/clk.h
-f:drivers/clk/ingenic/Kconfig
-f:drivers/clk/ingenic/Makefile
-f:drivers/clk/ingenic/cgu.c
-f:drivers/clk/ingenic/cgu.h
-f:drivers/clk/ingenic/jz4725b-cgu.c
-f:drivers/clk/ingenic/jz4740-cgu.c
-f:drivers/clk/ingenic/jz4755-cgu.c
-f:drivers/clk/ingenic/jz4760-cgu.c
-f:drivers/clk/ingenic/jz4770-cgu.c
-f:drivers/clk/ingenic/jz4780-cgu.c
-f:drivers/clk/ingenic/pm.c
-f:drivers/clk/ingenic/pm.h
-f:drivers/clk/ingenic/tcu.c
-f:drivers/clk/ingenic/x1000-cgu.c
-f:drivers/clk/ingenic/x1830-cgu.c
-f:drivers/clk/keystone/Kconfig
-f:drivers/clk/keystone/Makefile
-f:drivers/clk/keystone/gate.c
-f:drivers/clk/keystone/pll.c
-f:drivers/clk/keystone/sci-clk.c
-f:drivers/clk/keystone/syscon-clk.c
-f:drivers/clk/kunit_clk_assigned_rates.h
-f:drivers/clk/kunit_clk_assigned_rates_multiple.dtso
-f:drivers/clk/kunit_clk_assigned_rates_multiple_consumer.dtso
-f:drivers/clk/kunit_clk_assigned_rates_null.dtso
-f:drivers/clk/kunit_clk_assigned_rates_null_consumer.dtso
-f:drivers/clk/kunit_clk_assigned_rates_one.dtso
-f:drivers/clk/kunit_clk_assigned_rates_one_consumer.dtso
-f:drivers/clk/kunit_clk_assigned_rates_u64_multiple.dtso
-f:drivers/clk/kunit_clk_assigned_rates_u64_multiple_consumer.dtso
-f:drivers/clk/kunit_clk_assigned_rates_u64_one.dtso
-f:drivers/clk/kunit_clk_assigned_rates_u64_one_consumer.dtso
-f:drivers/clk/kunit_clk_assigned_rates_without.dtso
-f:drivers/clk/kunit_clk_assigned_rates_without_consumer.dtso
-f:drivers/clk/kunit_clk_assigned_rates_zero.dtso
-f:drivers/clk/kunit_clk_assigned_rates_zero_consumer.dtso
-f:drivers/clk/kunit_clk_fixed_rate_test.dtso
-f:drivers/clk/kunit_clk_hw_get_dev_of_node.dtso
-f:drivers/clk/kunit_clk_parent_data_test.dtso
-f:drivers/clk/mediatek/Kconfig
-f:drivers/clk/mediatek/Makefile
-f:drivers/clk/mediatek/clk-apmixed.c
-f:drivers/clk/mediatek/clk-cpumux.c
-f:drivers/clk/mediatek/clk-cpumux.h
-f:drivers/clk/mediatek/clk-fhctl.c
-f:drivers/clk/mediatek/clk-fhctl.h
-f:drivers/clk/mediatek/clk-gate.c
-f:drivers/clk/mediatek/clk-gate.h
-f:drivers/clk/mediatek/clk-mt2701-aud.c
-f:drivers/clk/mediatek/clk-mt2701-bdp.c
-f:drivers/clk/mediatek/clk-mt2701-eth.c
-f:drivers/clk/mediatek/clk-mt2701-g3d.c
-f:drivers/clk/mediatek/clk-mt2701-hif.c
-f:drivers/clk/mediatek/clk-mt2701-img.c
-f:drivers/clk/mediatek/clk-mt2701-mm.c
-f:drivers/clk/mediatek/clk-mt2701-vdec.c
-f:drivers/clk/mediatek/clk-mt2701.c
-f:drivers/clk/mediatek/clk-mt2712-apmixedsys.c
-f:drivers/clk/mediatek/clk-mt2712-bdp.c
-f:drivers/clk/mediatek/clk-mt2712-img.c
-f:drivers/clk/mediatek/clk-mt2712-jpgdec.c
-f:drivers/clk/mediatek/clk-mt2712-mfg.c
-f:drivers/clk/mediatek/clk-mt2712-mm.c
-f:drivers/clk/mediatek/clk-mt2712-vdec.c
-f:drivers/clk/mediatek/clk-mt2712-venc.c
-f:drivers/clk/mediatek/clk-mt2712.c
-f:drivers/clk/mediatek/clk-mt6735-apmixedsys.c
-f:drivers/clk/mediatek/clk-mt6735-imgsys.c
-f:drivers/clk/mediatek/clk-mt6735-infracfg.c
-f:drivers/clk/mediatek/clk-mt6735-mfgcfg.c
-f:drivers/clk/mediatek/clk-mt6735-pericfg.c
-f:drivers/clk/mediatek/clk-mt6735-topckgen.c
-f:drivers/clk/mediatek/clk-mt6735-vdecsys.c
-f:drivers/clk/mediatek/clk-mt6735-vencsys.c
-f:drivers/clk/mediatek/clk-mt6765-audio.c
-f:drivers/clk/mediatek/clk-mt6765-cam.c
-f:drivers/clk/mediatek/clk-mt6765-img.c
-f:drivers/clk/mediatek/clk-mt6765-mipi0a.c
-f:drivers/clk/mediatek/clk-mt6765-mm.c
-f:drivers/clk/mediatek/clk-mt6765-vcodec.c
-f:drivers/clk/mediatek/clk-mt6765.c
-f:drivers/clk/mediatek/clk-mt6779-aud.c
-f:drivers/clk/mediatek/clk-mt6779-cam.c
-f:drivers/clk/mediatek/clk-mt6779-img.c
-f:drivers/clk/mediatek/clk-mt6779-ipe.c
-f:drivers/clk/mediatek/clk-mt6779-mfg.c
-f:drivers/clk/mediatek/clk-mt6779-mm.c
-f:drivers/clk/mediatek/clk-mt6779-vdec.c
-f:drivers/clk/mediatek/clk-mt6779-venc.c
-f:drivers/clk/mediatek/clk-mt6779.c
-f:drivers/clk/mediatek/clk-mt6795-apmixedsys.c
-f:drivers/clk/mediatek/clk-mt6795-infracfg.c
-f:drivers/clk/mediatek/clk-mt6795-mfg.c
-f:drivers/clk/mediatek/clk-mt6795-mm.c
-f:drivers/clk/mediatek/clk-mt6795-pericfg.c
-f:drivers/clk/mediatek/clk-mt6795-topckgen.c
-f:drivers/clk/mediatek/clk-mt6795-vdecsys.c
-f:drivers/clk/mediatek/clk-mt6795-vencsys.c
-f:drivers/clk/mediatek/clk-mt6797-img.c
-f:drivers/clk/mediatek/clk-mt6797-mm.c
-f:drivers/clk/mediatek/clk-mt6797-vdec.c
-f:drivers/clk/mediatek/clk-mt6797-venc.c
-f:drivers/clk/mediatek/clk-mt6797.c
-f:drivers/clk/mediatek/clk-mt7622-apmixedsys.c
-f:drivers/clk/mediatek/clk-mt7622-aud.c
-f:drivers/clk/mediatek/clk-mt7622-eth.c
-f:drivers/clk/mediatek/clk-mt7622-hif.c
-f:drivers/clk/mediatek/clk-mt7622-infracfg.c
-f:drivers/clk/mediatek/clk-mt7622.c
-f:drivers/clk/mediatek/clk-mt7629-eth.c
-f:drivers/clk/mediatek/clk-mt7629-hif.c
-f:drivers/clk/mediatek/clk-mt7629.c
-f:drivers/clk/mediatek/clk-mt7981-apmixed.c
-f:drivers/clk/mediatek/clk-mt7981-eth.c
-f:drivers/clk/mediatek/clk-mt7981-infracfg.c
-f:drivers/clk/mediatek/clk-mt7981-topckgen.c
-f:drivers/clk/mediatek/clk-mt7986-apmixed.c
-f:drivers/clk/mediatek/clk-mt7986-eth.c
-f:drivers/clk/mediatek/clk-mt7986-infracfg.c
-f:drivers/clk/mediatek/clk-mt7986-topckgen.c
-f:drivers/clk/mediatek/clk-mt7988-apmixed.c
-f:drivers/clk/mediatek/clk-mt7988-eth.c
-f:drivers/clk/mediatek/clk-mt7988-infracfg.c
-f:drivers/clk/mediatek/clk-mt7988-topckgen.c
-f:drivers/clk/mediatek/clk-mt7988-xfipll.c
-f:drivers/clk/mediatek/clk-mt8135-apmixedsys.c
-f:drivers/clk/mediatek/clk-mt8135.c
-f:drivers/clk/mediatek/clk-mt8167-apmixedsys.c
-f:drivers/clk/mediatek/clk-mt8167-aud.c
-f:drivers/clk/mediatek/clk-mt8167-img.c
-f:drivers/clk/mediatek/clk-mt8167-mfgcfg.c
-f:drivers/clk/mediatek/clk-mt8167-mm.c
-f:drivers/clk/mediatek/clk-mt8167-vdec.c
-f:drivers/clk/mediatek/clk-mt8167.c
-f:drivers/clk/mediatek/clk-mt8173-apmixedsys.c
-f:drivers/clk/mediatek/clk-mt8173-img.c
-f:drivers/clk/mediatek/clk-mt8173-infracfg.c
-f:drivers/clk/mediatek/clk-mt8173-mm.c
-f:drivers/clk/mediatek/clk-mt8173-pericfg.c
-f:drivers/clk/mediatek/clk-mt8173-topckgen.c
-f:drivers/clk/mediatek/clk-mt8173-vdecsys.c
-f:drivers/clk/mediatek/clk-mt8173-vencsys.c
-f:drivers/clk/mediatek/clk-mt8183-apmixedsys.c
-f:drivers/clk/mediatek/clk-mt8183-audio.c
-f:drivers/clk/mediatek/clk-mt8183-cam.c
-f:drivers/clk/mediatek/clk-mt8183-img.c
-f:drivers/clk/mediatek/clk-mt8183-ipu0.c
-f:drivers/clk/mediatek/clk-mt8183-ipu1.c
-f:drivers/clk/mediatek/clk-mt8183-ipu_adl.c
-f:drivers/clk/mediatek/clk-mt8183-ipu_conn.c
-f:drivers/clk/mediatek/clk-mt8183-mfgcfg.c
-f:drivers/clk/mediatek/clk-mt8183-mm.c
-f:drivers/clk/mediatek/clk-mt8183-vdec.c
-f:drivers/clk/mediatek/clk-mt8183-venc.c
-f:drivers/clk/mediatek/clk-mt8183.c
-f:drivers/clk/mediatek/clk-mt8186-apmixedsys.c
-f:drivers/clk/mediatek/clk-mt8186-cam.c
-f:drivers/clk/mediatek/clk-mt8186-img.c
-f:drivers/clk/mediatek/clk-mt8186-imp_iic_wrap.c
-f:drivers/clk/mediatek/clk-mt8186-infra_ao.c
-f:drivers/clk/mediatek/clk-mt8186-ipe.c
-f:drivers/clk/mediatek/clk-mt8186-mcu.c
-f:drivers/clk/mediatek/clk-mt8186-mdp.c
-f:drivers/clk/mediatek/clk-mt8186-mfg.c
-f:drivers/clk/mediatek/clk-mt8186-mm.c
-f:drivers/clk/mediatek/clk-mt8186-topckgen.c
-f:drivers/clk/mediatek/clk-mt8186-vdec.c
-f:drivers/clk/mediatek/clk-mt8186-venc.c
-f:drivers/clk/mediatek/clk-mt8186-wpe.c
-f:drivers/clk/mediatek/clk-mt8188-adsp_audio26m.c
-f:drivers/clk/mediatek/clk-mt8188-apmixedsys.c
-f:drivers/clk/mediatek/clk-mt8188-cam.c
-f:drivers/clk/mediatek/clk-mt8188-ccu.c
-f:drivers/clk/mediatek/clk-mt8188-img.c
-f:drivers/clk/mediatek/clk-mt8188-imp_iic_wrap.c
-f:drivers/clk/mediatek/clk-mt8188-infra_ao.c
-f:drivers/clk/mediatek/clk-mt8188-ipe.c
-f:drivers/clk/mediatek/clk-mt8188-mfg.c
-f:drivers/clk/mediatek/clk-mt8188-peri_ao.c
-f:drivers/clk/mediatek/clk-mt8188-topckgen.c
-f:drivers/clk/mediatek/clk-mt8188-vdec.c
-f:drivers/clk/mediatek/clk-mt8188-vdo0.c
-f:drivers/clk/mediatek/clk-mt8188-vdo1.c
-f:drivers/clk/mediatek/clk-mt8188-venc.c
-f:drivers/clk/mediatek/clk-mt8188-vpp0.c
-f:drivers/clk/mediatek/clk-mt8188-vpp1.c
-f:drivers/clk/mediatek/clk-mt8188-wpe.c
-f:drivers/clk/mediatek/clk-mt8192-apmixedsys.c
-f:drivers/clk/mediatek/clk-mt8192-aud.c
-f:drivers/clk/mediatek/clk-mt8192-cam.c
-f:drivers/clk/mediatek/clk-mt8192-img.c
-f:drivers/clk/mediatek/clk-mt8192-imp_iic_wrap.c
-f:drivers/clk/mediatek/clk-mt8192-ipe.c
-f:drivers/clk/mediatek/clk-mt8192-mdp.c
-f:drivers/clk/mediatek/clk-mt8192-mfg.c
-f:drivers/clk/mediatek/clk-mt8192-mm.c
-f:drivers/clk/mediatek/clk-mt8192-msdc.c
-f:drivers/clk/mediatek/clk-mt8192-scp_adsp.c
-f:drivers/clk/mediatek/clk-mt8192-vdec.c
-f:drivers/clk/mediatek/clk-mt8192-venc.c
-f:drivers/clk/mediatek/clk-mt8192.c
-f:drivers/clk/mediatek/clk-mt8195-apmixedsys.c
-f:drivers/clk/mediatek/clk-mt8195-apusys_pll.c
-f:drivers/clk/mediatek/clk-mt8195-cam.c
-f:drivers/clk/mediatek/clk-mt8195-ccu.c
-f:drivers/clk/mediatek/clk-mt8195-img.c
-f:drivers/clk/mediatek/clk-mt8195-imp_iic_wrap.c
-f:drivers/clk/mediatek/clk-mt8195-infra_ao.c
-f:drivers/clk/mediatek/clk-mt8195-ipe.c
-f:drivers/clk/mediatek/clk-mt8195-mfg.c
-f:drivers/clk/mediatek/clk-mt8195-peri_ao.c
-f:drivers/clk/mediatek/clk-mt8195-scp_adsp.c
-f:drivers/clk/mediatek/clk-mt8195-topckgen.c
-f:drivers/clk/mediatek/clk-mt8195-vdec.c
-f:drivers/clk/mediatek/clk-mt8195-vdo0.c
-f:drivers/clk/mediatek/clk-mt8195-vdo1.c
-f:drivers/clk/mediatek/clk-mt8195-venc.c
-f:drivers/clk/mediatek/clk-mt8195-vpp0.c
-f:drivers/clk/mediatek/clk-mt8195-vpp1.c
-f:drivers/clk/mediatek/clk-mt8195-wpe.c
-f:drivers/clk/mediatek/clk-mt8365-apmixedsys.c
-f:drivers/clk/mediatek/clk-mt8365-apu.c
-f:drivers/clk/mediatek/clk-mt8365-cam.c
-f:drivers/clk/mediatek/clk-mt8365-mfg.c
-f:drivers/clk/mediatek/clk-mt8365-mm.c
-f:drivers/clk/mediatek/clk-mt8365-vdec.c
-f:drivers/clk/mediatek/clk-mt8365-venc.c
-f:drivers/clk/mediatek/clk-mt8365.c
-f:drivers/clk/mediatek/clk-mt8516-apmixedsys.c
-f:drivers/clk/mediatek/clk-mt8516-aud.c
-f:drivers/clk/mediatek/clk-mt8516.c
-f:drivers/clk/mediatek/clk-mtk.c
-f:drivers/clk/mediatek/clk-mtk.h
-f:drivers/clk/mediatek/clk-mux.c
-f:drivers/clk/mediatek/clk-mux.h
-f:drivers/clk/mediatek/clk-pll.c
-f:drivers/clk/mediatek/clk-pll.h
-f:drivers/clk/mediatek/clk-pllfh.c
-f:drivers/clk/mediatek/clk-pllfh.h
-f:drivers/clk/mediatek/reset.c
-f:drivers/clk/mediatek/reset.h
-f:drivers/clk/meson/Kconfig
-f:drivers/clk/meson/Makefile
-f:drivers/clk/meson/a1-peripherals.c
-f:drivers/clk/meson/a1-pll.c
-f:drivers/clk/meson/axg-aoclk.c
-f:drivers/clk/meson/axg-audio.c
-f:drivers/clk/meson/axg.c
-f:drivers/clk/meson/c3-peripherals.c
-f:drivers/clk/meson/c3-pll.c
-f:drivers/clk/meson/clk-cpu-dyndiv.c
-f:drivers/clk/meson/clk-cpu-dyndiv.h
-f:drivers/clk/meson/clk-dualdiv.c
-f:drivers/clk/meson/clk-dualdiv.h
-f:drivers/clk/meson/clk-mpll.c
-f:drivers/clk/meson/clk-mpll.h
-f:drivers/clk/meson/clk-phase.c
-f:drivers/clk/meson/clk-phase.h
-f:drivers/clk/meson/clk-pll.c
-f:drivers/clk/meson/clk-pll.h
-f:drivers/clk/meson/clk-regmap.c
-f:drivers/clk/meson/clk-regmap.h
-f:drivers/clk/meson/g12a-aoclk.c
-f:drivers/clk/meson/g12a.c
-f:drivers/clk/meson/gxbb-aoclk.c
-f:drivers/clk/meson/gxbb.c
-f:drivers/clk/meson/meson-aoclk.c
-f:drivers/clk/meson/meson-aoclk.h
-f:drivers/clk/meson/meson-clkc-utils.c
-f:drivers/clk/meson/meson-clkc-utils.h
-f:drivers/clk/meson/meson-eeclk.c
-f:drivers/clk/meson/meson-eeclk.h
-f:drivers/clk/meson/meson8-ddr.c
-f:drivers/clk/meson/meson8b.c
-f:drivers/clk/meson/parm.h
-f:drivers/clk/meson/s4-peripherals.c
-f:drivers/clk/meson/s4-pll.c
-f:drivers/clk/meson/sclk-div.c
-f:drivers/clk/meson/sclk-div.h
-f:drivers/clk/meson/vclk.c
-f:drivers/clk/meson/vclk.h
-f:drivers/clk/meson/vid-pll-div.c
-f:drivers/clk/meson/vid-pll-div.h
-f:drivers/clk/microchip/Kconfig
-f:drivers/clk/microchip/Makefile
-f:drivers/clk/microchip/clk-core.c
-f:drivers/clk/microchip/clk-core.h
-f:drivers/clk/microchip/clk-mpfs-ccc.c
-f:drivers/clk/microchip/clk-mpfs.c
-f:drivers/clk/microchip/clk-pic32mzda.c
-f:drivers/clk/mmp/Makefile
-f:drivers/clk/mmp/clk-apbc.c
-f:drivers/clk/mmp/clk-apmu.c
-f:drivers/clk/mmp/clk-audio.c
-f:drivers/clk/mmp/clk-frac.c
-f:drivers/clk/mmp/clk-gate.c
-f:drivers/clk/mmp/clk-mix.c
-f:drivers/clk/mmp/clk-of-mmp2.c
-f:drivers/clk/mmp/clk-of-pxa168.c
-f:drivers/clk/mmp/clk-of-pxa1928.c
-f:drivers/clk/mmp/clk-of-pxa910.c
-f:drivers/clk/mmp/clk-pll.c
-f:drivers/clk/mmp/clk-pxa1908-apbc.c
-f:drivers/clk/mmp/clk-pxa1908-apbcp.c
-f:drivers/clk/mmp/clk-pxa1908-apmu.c
-f:drivers/clk/mmp/clk-pxa1908-mpmu.c
-f:drivers/clk/mmp/clk.c
-f:drivers/clk/mmp/clk.h
-f:drivers/clk/mmp/pwr-island.c
-f:drivers/clk/mmp/reset.c
-f:drivers/clk/mmp/reset.h
-f:drivers/clk/mstar/Kconfig
-f:drivers/clk/mstar/Makefile
-f:drivers/clk/mstar/clk-msc313-cpupll.c
-f:drivers/clk/mstar/clk-msc313-mpll.c
-f:drivers/clk/mvebu/Kconfig
-f:drivers/clk/mvebu/Makefile
-f:drivers/clk/mvebu/ap-cpu-clk.c
-f:drivers/clk/mvebu/ap806-system-controller.c
-f:drivers/clk/mvebu/armada-370.c
-f:drivers/clk/mvebu/armada-375.c
-f:drivers/clk/mvebu/armada-37xx-periph.c
-f:drivers/clk/mvebu/armada-37xx-tbg.c
-f:drivers/clk/mvebu/armada-37xx-xtal.c
-f:drivers/clk/mvebu/armada-38x.c
-f:drivers/clk/mvebu/armada-39x.c
-f:drivers/clk/mvebu/armada-xp.c
-f:drivers/clk/mvebu/armada_ap_cp_helper.c
-f:drivers/clk/mvebu/armada_ap_cp_helper.h
-f:drivers/clk/mvebu/clk-corediv.c
-f:drivers/clk/mvebu/clk-cpu.c
-f:drivers/clk/mvebu/common.c
-f:drivers/clk/mvebu/common.h
-f:drivers/clk/mvebu/cp110-system-controller.c
-f:drivers/clk/mvebu/dove-divider.c
-f:drivers/clk/mvebu/dove-divider.h
-f:drivers/clk/mvebu/dove.c
-f:drivers/clk/mvebu/kirkwood.c
-f:drivers/clk/mvebu/mv98dx3236.c
-f:drivers/clk/mvebu/orion.c
-f:drivers/clk/mxs/Makefile
-f:drivers/clk/mxs/clk-div.c
-f:drivers/clk/mxs/clk-frac.c
-f:drivers/clk/mxs/clk-imx23.c
-f:drivers/clk/mxs/clk-imx28.c
-f:drivers/clk/mxs/clk-pll.c
-f:drivers/clk/mxs/clk-ref.c
-f:drivers/clk/mxs/clk-ssp.c
-f:drivers/clk/mxs/clk.c
-f:drivers/clk/mxs/clk.h
-f:drivers/clk/nuvoton/Kconfig
-f:drivers/clk/nuvoton/Makefile
-f:drivers/clk/nuvoton/clk-ma35d1-divider.c
-f:drivers/clk/nuvoton/clk-ma35d1-pll.c
-f:drivers/clk/nuvoton/clk-ma35d1.c
-f:drivers/clk/nuvoton/clk-ma35d1.h
-f:drivers/clk/nxp/Makefile
-f:drivers/clk/nxp/clk-lpc18xx-ccu.c
-f:drivers/clk/nxp/clk-lpc18xx-cgu.c
-f:drivers/clk/nxp/clk-lpc18xx-creg.c
-f:drivers/clk/nxp/clk-lpc32xx.c
-f:drivers/clk/pistachio/Kconfig
-f:drivers/clk/pistachio/Makefile
-f:drivers/clk/pistachio/clk-pistachio.c
-f:drivers/clk/pistachio/clk-pll.c
-f:drivers/clk/pistachio/clk.c
-f:drivers/clk/pistachio/clk.h
-f:drivers/clk/pxa/Makefile
-f:drivers/clk/pxa/clk-pxa.c
-f:drivers/clk/pxa/clk-pxa.h
-f:drivers/clk/pxa/clk-pxa25x.c
-f:drivers/clk/pxa/clk-pxa27x.c
-f:drivers/clk/pxa/clk-pxa2xx.h
-f:drivers/clk/pxa/clk-pxa3xx.c
-f:drivers/clk/qcom/Kconfig
-f:drivers/clk/qcom/Makefile
-f:drivers/clk/qcom/a53-pll.c
-f:drivers/clk/qcom/a7-pll.c
-f:drivers/clk/qcom/apcs-msm8916.c
-f:drivers/clk/qcom/apcs-msm8996.c
-f:drivers/clk/qcom/apcs-sdx55.c
-f:drivers/clk/qcom/apss-ipq-pll.c
-f:drivers/clk/qcom/apss-ipq6018.c
-f:drivers/clk/qcom/camcc-milos.c
-f:drivers/clk/qcom/camcc-qcs615.c
-f:drivers/clk/qcom/camcc-sa8775p.c
-f:drivers/clk/qcom/camcc-sc7180.c
-f:drivers/clk/qcom/camcc-sc7280.c
-f:drivers/clk/qcom/camcc-sc8180x.c
-f:drivers/clk/qcom/camcc-sc8280xp.c
-f:drivers/clk/qcom/camcc-sdm845.c
-f:drivers/clk/qcom/camcc-sm4450.c
-f:drivers/clk/qcom/camcc-sm6350.c
-f:drivers/clk/qcom/camcc-sm7150.c
-f:drivers/clk/qcom/camcc-sm8150.c
-f:drivers/clk/qcom/camcc-sm8250.c
-f:drivers/clk/qcom/camcc-sm8450.c
-f:drivers/clk/qcom/camcc-sm8550.c
-f:drivers/clk/qcom/camcc-sm8650.c
-f:drivers/clk/qcom/camcc-x1e80100.c
-f:drivers/clk/qcom/clk-alpha-pll.c
-f:drivers/clk/qcom/clk-alpha-pll.h
-f:drivers/clk/qcom/clk-branch.c
-f:drivers/clk/qcom/clk-branch.h
-f:drivers/clk/qcom/clk-cbf-8996.c
-f:drivers/clk/qcom/clk-cpu-8996.c
-f:drivers/clk/qcom/clk-hfpll.c
-f:drivers/clk/qcom/clk-hfpll.h
-f:drivers/clk/qcom/clk-krait.c
-f:drivers/clk/qcom/clk-krait.h
-f:drivers/clk/qcom/clk-pll.c
-f:drivers/clk/qcom/clk-pll.h
-f:drivers/clk/qcom/clk-rcg.c
-f:drivers/clk/qcom/clk-rcg.h
-f:drivers/clk/qcom/clk-rcg2.c
-f:drivers/clk/qcom/clk-regmap-divider.c
-f:drivers/clk/qcom/clk-regmap-divider.h
-f:drivers/clk/qcom/clk-regmap-mux-div.c
-f:drivers/clk/qcom/clk-regmap-mux-div.h
-f:drivers/clk/qcom/clk-regmap-mux.c
-f:drivers/clk/qcom/clk-regmap-mux.h
-f:drivers/clk/qcom/clk-regmap-phy-mux.c
-f:drivers/clk/qcom/clk-regmap-phy-mux.h
-f:drivers/clk/qcom/clk-regmap.c
-f:drivers/clk/qcom/clk-regmap.h
-f:drivers/clk/qcom/clk-rpm.c
-f:drivers/clk/qcom/clk-rpmh.c
-f:drivers/clk/qcom/clk-smd-rpm.c
-f:drivers/clk/qcom/clk-spmi-pmic-div.c
-f:drivers/clk/qcom/common.c
-f:drivers/clk/qcom/common.h
-f:drivers/clk/qcom/dispcc-milos.c
-f:drivers/clk/qcom/dispcc-qcm2290.c
-f:drivers/clk/qcom/dispcc-qcs615.c
-f:drivers/clk/qcom/dispcc-sc7180.c
-f:drivers/clk/qcom/dispcc-sc7280.c
-f:drivers/clk/qcom/dispcc-sc8280xp.c
-f:drivers/clk/qcom/dispcc-sdm845.c
-f:drivers/clk/qcom/dispcc-sm4450.c
-f:drivers/clk/qcom/dispcc-sm6115.c
-f:drivers/clk/qcom/dispcc-sm6125.c
-f:drivers/clk/qcom/dispcc-sm6350.c
-f:drivers/clk/qcom/dispcc-sm6375.c
-f:drivers/clk/qcom/dispcc-sm7150.c
-f:drivers/clk/qcom/dispcc-sm8250.c
-f:drivers/clk/qcom/dispcc-sm8450.c
-f:drivers/clk/qcom/dispcc-sm8550.c
-f:drivers/clk/qcom/dispcc-sm8750.c
-f:drivers/clk/qcom/dispcc-x1e80100.c
-f:drivers/clk/qcom/dispcc0-sa8775p.c
-f:drivers/clk/qcom/dispcc1-sa8775p.c
-f:drivers/clk/qcom/ecpricc-qdu1000.c
-f:drivers/clk/qcom/gcc-apq8084.c
-f:drivers/clk/qcom/gcc-ipq4019.c
-f:drivers/clk/qcom/gcc-ipq5018.c
-f:drivers/clk/qcom/gcc-ipq5332.c
-f:drivers/clk/qcom/gcc-ipq5424.c
-f:drivers/clk/qcom/gcc-ipq6018.c
-f:drivers/clk/qcom/gcc-ipq806x.c
-f:drivers/clk/qcom/gcc-ipq8074.c
-f:drivers/clk/qcom/gcc-ipq9574.c
-f:drivers/clk/qcom/gcc-mdm9607.c
-f:drivers/clk/qcom/gcc-mdm9615.c
-f:drivers/clk/qcom/gcc-milos.c
-f:drivers/clk/qcom/gcc-msm8660.c
-f:drivers/clk/qcom/gcc-msm8909.c
-f:drivers/clk/qcom/gcc-msm8916.c
-f:drivers/clk/qcom/gcc-msm8917.c
-f:drivers/clk/qcom/gcc-msm8939.c
-f:drivers/clk/qcom/gcc-msm8953.c
-f:drivers/clk/qcom/gcc-msm8960.c
-f:drivers/clk/qcom/gcc-msm8974.c
-f:drivers/clk/qcom/gcc-msm8976.c
-f:drivers/clk/qcom/gcc-msm8994.c
-f:drivers/clk/qcom/gcc-msm8996.c
-f:drivers/clk/qcom/gcc-msm8998.c
-f:drivers/clk/qcom/gcc-qcm2290.c
-f:drivers/clk/qcom/gcc-qcs404.c
-f:drivers/clk/qcom/gcc-qcs615.c
-f:drivers/clk/qcom/gcc-qcs8300.c
-f:drivers/clk/qcom/gcc-qdu1000.c
-f:drivers/clk/qcom/gcc-sa8775p.c
-f:drivers/clk/qcom/gcc-sar2130p.c
-f:drivers/clk/qcom/gcc-sc7180.c
-f:drivers/clk/qcom/gcc-sc7280.c
-f:drivers/clk/qcom/gcc-sc8180x.c
-f:drivers/clk/qcom/gcc-sc8280xp.c
-f:drivers/clk/qcom/gcc-sdm660.c
-f:drivers/clk/qcom/gcc-sdm845.c
-f:drivers/clk/qcom/gcc-sdx55.c
-f:drivers/clk/qcom/gcc-sdx65.c
-f:drivers/clk/qcom/gcc-sdx75.c
-f:drivers/clk/qcom/gcc-sm4450.c
-f:drivers/clk/qcom/gcc-sm6115.c
-f:drivers/clk/qcom/gcc-sm6125.c
-f:drivers/clk/qcom/gcc-sm6350.c
-f:drivers/clk/qcom/gcc-sm6375.c
-f:drivers/clk/qcom/gcc-sm7150.c
-f:drivers/clk/qcom/gcc-sm8150.c
-f:drivers/clk/qcom/gcc-sm8250.c
-f:drivers/clk/qcom/gcc-sm8350.c
-f:drivers/clk/qcom/gcc-sm8450.c
-f:drivers/clk/qcom/gcc-sm8550.c
-f:drivers/clk/qcom/gcc-sm8650.c
-f:drivers/clk/qcom/gcc-sm8750.c
-f:drivers/clk/qcom/gcc-x1e80100.c
-f:drivers/clk/qcom/gdsc.c
-f:drivers/clk/qcom/gdsc.h
-f:drivers/clk/qcom/gpucc-milos.c
-f:drivers/clk/qcom/gpucc-msm8998.c
-f:drivers/clk/qcom/gpucc-qcm2290.c
-f:drivers/clk/qcom/gpucc-qcs615.c
-f:drivers/clk/qcom/gpucc-sa8775p.c
-f:drivers/clk/qcom/gpucc-sar2130p.c
-f:drivers/clk/qcom/gpucc-sc7180.c
-f:drivers/clk/qcom/gpucc-sc7280.c
-f:drivers/clk/qcom/gpucc-sc8280xp.c
-f:drivers/clk/qcom/gpucc-sdm660.c
-f:drivers/clk/qcom/gpucc-sdm845.c
-f:drivers/clk/qcom/gpucc-sm4450.c
-f:drivers/clk/qcom/gpucc-sm6115.c
-f:drivers/clk/qcom/gpucc-sm6125.c
-f:drivers/clk/qcom/gpucc-sm6350.c
-f:drivers/clk/qcom/gpucc-sm6375.c
-f:drivers/clk/qcom/gpucc-sm8150.c
-f:drivers/clk/qcom/gpucc-sm8250.c
-f:drivers/clk/qcom/gpucc-sm8350.c
-f:drivers/clk/qcom/gpucc-sm8450.c
-f:drivers/clk/qcom/gpucc-sm8550.c
-f:drivers/clk/qcom/gpucc-sm8650.c
-f:drivers/clk/qcom/gpucc-x1e80100.c
-f:drivers/clk/qcom/gpucc-x1p42100.c
-f:drivers/clk/qcom/hfpll.c
-f:drivers/clk/qcom/ipq-cmn-pll.c
-f:drivers/clk/qcom/kpss-xcc.c
-f:drivers/clk/qcom/krait-cc.c
-f:drivers/clk/qcom/lcc-ipq806x.c
-f:drivers/clk/qcom/lcc-msm8960.c
-f:drivers/clk/qcom/lpass-gfm-sm8250.c
-f:drivers/clk/qcom/lpassaudiocc-sc7280.c
-f:drivers/clk/qcom/lpasscc-sc7280.c
-f:drivers/clk/qcom/lpasscc-sc8280xp.c
-f:drivers/clk/qcom/lpasscc-sdm845.c
-f:drivers/clk/qcom/lpasscc-sm6115.c
-f:drivers/clk/qcom/lpasscorecc-sc7180.c
-f:drivers/clk/qcom/lpasscorecc-sc7280.c
-f:drivers/clk/qcom/mmcc-apq8084.c
-f:drivers/clk/qcom/mmcc-msm8960.c
-f:drivers/clk/qcom/mmcc-msm8974.c
-f:drivers/clk/qcom/mmcc-msm8994.c
-f:drivers/clk/qcom/mmcc-msm8996.c
-f:drivers/clk/qcom/mmcc-msm8998.c
-f:drivers/clk/qcom/mmcc-sdm660.c
-f:drivers/clk/qcom/nsscc-ipq9574.c
-f:drivers/clk/qcom/nsscc-qca8k.c
-f:drivers/clk/qcom/q6sstop-qcs404.c
-f:drivers/clk/qcom/reset.c
-f:drivers/clk/qcom/reset.h
-f:drivers/clk/qcom/tcsrcc-sm8550.c
-f:drivers/clk/qcom/tcsrcc-sm8650.c
-f:drivers/clk/qcom/tcsrcc-sm8750.c
-f:drivers/clk/qcom/tcsrcc-x1e80100.c
-f:drivers/clk/qcom/turingcc-qcs404.c
-f:drivers/clk/qcom/videocc-milos.c
-f:drivers/clk/qcom/videocc-qcs615.c
-f:drivers/clk/qcom/videocc-sa8775p.c
-f:drivers/clk/qcom/videocc-sc7180.c
-f:drivers/clk/qcom/videocc-sc7280.c
-f:drivers/clk/qcom/videocc-sdm845.c
-f:drivers/clk/qcom/videocc-sm6350.c
-f:drivers/clk/qcom/videocc-sm7150.c
-f:drivers/clk/qcom/videocc-sm8150.c
-f:drivers/clk/qcom/videocc-sm8250.c
-f:drivers/clk/qcom/videocc-sm8350.c
-f:drivers/clk/qcom/videocc-sm8450.c
-f:drivers/clk/qcom/videocc-sm8550.c
-f:drivers/clk/ralink/Kconfig
-f:drivers/clk/ralink/Makefile
-f:drivers/clk/ralink/clk-mt7621.c
-f:drivers/clk/ralink/clk-mtmips.c
-f:drivers/clk/renesas/Kconfig
-f:drivers/clk/renesas/Makefile
-f:drivers/clk/renesas/clk-div6.c
-f:drivers/clk/renesas/clk-div6.h
-f:drivers/clk/renesas/clk-emev2.c
-f:drivers/clk/renesas/clk-mstp.c
-f:drivers/clk/renesas/clk-r8a73a4.c
-f:drivers/clk/renesas/clk-r8a7740.c
-f:drivers/clk/renesas/clk-r8a7778.c
-f:drivers/clk/renesas/clk-r8a7779.c
-f:drivers/clk/renesas/clk-rz.c
-f:drivers/clk/renesas/clk-sh73a0.c
-f:drivers/clk/renesas/clk-vbattb.c
-f:drivers/clk/renesas/r7s9210-cpg-mssr.c
-f:drivers/clk/renesas/r8a7742-cpg-mssr.c
-f:drivers/clk/renesas/r8a7743-cpg-mssr.c
-f:drivers/clk/renesas/r8a7745-cpg-mssr.c
-f:drivers/clk/renesas/r8a77470-cpg-mssr.c
-f:drivers/clk/renesas/r8a774a1-cpg-mssr.c
-f:drivers/clk/renesas/r8a774b1-cpg-mssr.c
-f:drivers/clk/renesas/r8a774c0-cpg-mssr.c
-f:drivers/clk/renesas/r8a774e1-cpg-mssr.c
-f:drivers/clk/renesas/r8a7790-cpg-mssr.c
-f:drivers/clk/renesas/r8a7791-cpg-mssr.c
-f:drivers/clk/renesas/r8a7792-cpg-mssr.c
-f:drivers/clk/renesas/r8a7794-cpg-mssr.c
-f:drivers/clk/renesas/r8a7795-cpg-mssr.c
-f:drivers/clk/renesas/r8a7796-cpg-mssr.c
-f:drivers/clk/renesas/r8a77965-cpg-mssr.c
-f:drivers/clk/renesas/r8a77970-cpg-mssr.c
-f:drivers/clk/renesas/r8a77980-cpg-mssr.c
-f:drivers/clk/renesas/r8a77990-cpg-mssr.c
-f:drivers/clk/renesas/r8a77995-cpg-mssr.c
-f:drivers/clk/renesas/r8a779a0-cpg-mssr.c
-f:drivers/clk/renesas/r8a779f0-cpg-mssr.c
-f:drivers/clk/renesas/r8a779g0-cpg-mssr.c
-f:drivers/clk/renesas/r8a779h0-cpg-mssr.c
-f:drivers/clk/renesas/r9a06g032-clocks.c
-f:drivers/clk/renesas/r9a07g043-cpg.c
-f:drivers/clk/renesas/r9a07g044-cpg.c
-f:drivers/clk/renesas/r9a08g045-cpg.c
-f:drivers/clk/renesas/r9a09g011-cpg.c
-f:drivers/clk/renesas/r9a09g047-cpg.c
-f:drivers/clk/renesas/r9a09g056-cpg.c
-f:drivers/clk/renesas/r9a09g057-cpg.c
-f:drivers/clk/renesas/r9a09g077-cpg.c
-f:drivers/clk/renesas/rcar-cpg-lib.c
-f:drivers/clk/renesas/rcar-cpg-lib.h
-f:drivers/clk/renesas/rcar-gen2-cpg.c
-f:drivers/clk/renesas/rcar-gen2-cpg.h
-f:drivers/clk/renesas/rcar-gen3-cpg.c
-f:drivers/clk/renesas/rcar-gen3-cpg.h
-f:drivers/clk/renesas/rcar-gen4-cpg.c
-f:drivers/clk/renesas/rcar-gen4-cpg.h
-f:drivers/clk/renesas/rcar-usb2-clock-sel.c
-f:drivers/clk/renesas/renesas-cpg-mssr.c
-f:drivers/clk/renesas/renesas-cpg-mssr.h
-f:drivers/clk/renesas/rzg2l-cpg.c
-f:drivers/clk/renesas/rzg2l-cpg.h
-f:drivers/clk/renesas/rzv2h-cpg.c
-f:drivers/clk/renesas/rzv2h-cpg.h
-f:drivers/clk/rockchip/Kconfig
-f:drivers/clk/rockchip/Makefile
-f:drivers/clk/rockchip/clk-cpu.c
-f:drivers/clk/rockchip/clk-ddr.c
-f:drivers/clk/rockchip/clk-gate-grf.c
-f:drivers/clk/rockchip/clk-half-divider.c
-f:drivers/clk/rockchip/clk-inverter.c
-f:drivers/clk/rockchip/clk-mmc-phase.c
-f:drivers/clk/rockchip/clk-muxgrf.c
-f:drivers/clk/rockchip/clk-pll.c
-f:drivers/clk/rockchip/clk-px30.c
-f:drivers/clk/rockchip/clk-rk3036.c
-f:drivers/clk/rockchip/clk-rk3128.c
-f:drivers/clk/rockchip/clk-rk3188.c
-f:drivers/clk/rockchip/clk-rk3228.c
-f:drivers/clk/rockchip/clk-rk3288.c
-f:drivers/clk/rockchip/clk-rk3308.c
-f:drivers/clk/rockchip/clk-rk3328.c
-f:drivers/clk/rockchip/clk-rk3368.c
-f:drivers/clk/rockchip/clk-rk3399.c
-f:drivers/clk/rockchip/clk-rk3528.c
-f:drivers/clk/rockchip/clk-rk3562.c
-f:drivers/clk/rockchip/clk-rk3568.c
-f:drivers/clk/rockchip/clk-rk3576.c
-f:drivers/clk/rockchip/clk-rk3588.c
-f:drivers/clk/rockchip/clk-rv1108.c
-f:drivers/clk/rockchip/clk-rv1126.c
-f:drivers/clk/rockchip/clk.c
-f:drivers/clk/rockchip/clk.h
-f:drivers/clk/rockchip/gate-link.c
-f:drivers/clk/rockchip/rst-rk3528.c
-f:drivers/clk/rockchip/rst-rk3562.c
-f:drivers/clk/rockchip/rst-rk3576.c
-f:drivers/clk/rockchip/rst-rk3588.c
-f:drivers/clk/rockchip/softrst.c
-f:drivers/clk/samsung/Kconfig
-f:drivers/clk/samsung/Makefile
-f:drivers/clk/samsung/clk-cpu.c
-f:drivers/clk/samsung/clk-cpu.h
-f:drivers/clk/samsung/clk-exynos-arm64.c
-f:drivers/clk/samsung/clk-exynos-arm64.h
-f:drivers/clk/samsung/clk-exynos-audss.c
-f:drivers/clk/samsung/clk-exynos-clkout.c
-f:drivers/clk/samsung/clk-exynos2200.c
-f:drivers/clk/samsung/clk-exynos3250.c
-f:drivers/clk/samsung/clk-exynos4.c
-f:drivers/clk/samsung/clk-exynos4412-isp.c
-f:drivers/clk/samsung/clk-exynos5-subcmu.c
-f:drivers/clk/samsung/clk-exynos5-subcmu.h
-f:drivers/clk/samsung/clk-exynos5250.c
-f:drivers/clk/samsung/clk-exynos5260.c
-f:drivers/clk/samsung/clk-exynos5260.h
-f:drivers/clk/samsung/clk-exynos5410.c
-f:drivers/clk/samsung/clk-exynos5420.c
-f:drivers/clk/samsung/clk-exynos5433.c
-f:drivers/clk/samsung/clk-exynos7.c
-f:drivers/clk/samsung/clk-exynos7870.c
-f:drivers/clk/samsung/clk-exynos7885.c
-f:drivers/clk/samsung/clk-exynos850.c
-f:drivers/clk/samsung/clk-exynos8895.c
-f:drivers/clk/samsung/clk-exynos990.c
-f:drivers/clk/samsung/clk-exynosautov9.c
-f:drivers/clk/samsung/clk-exynosautov920.c
-f:drivers/clk/samsung/clk-fsd.c
-f:drivers/clk/samsung/clk-gs101.c
-f:drivers/clk/samsung/clk-pll.c
-f:drivers/clk/samsung/clk-pll.h
-f:drivers/clk/samsung/clk-s3c64xx.c
-f:drivers/clk/samsung/clk-s5pv210-audss.c
-f:drivers/clk/samsung/clk-s5pv210.c
-f:drivers/clk/samsung/clk.c
-f:drivers/clk/samsung/clk.h
-f:drivers/clk/sifive/Kconfig
-f:drivers/clk/sifive/Makefile
-f:drivers/clk/sifive/fu540-prci.h
-f:drivers/clk/sifive/fu740-prci.h
-f:drivers/clk/sifive/sifive-prci.c
-f:drivers/clk/sifive/sifive-prci.h
-f:drivers/clk/socfpga/Kconfig
-f:drivers/clk/socfpga/Makefile
-f:drivers/clk/socfpga/clk-agilex.c
-f:drivers/clk/socfpga/clk-gate-a10.c
-f:drivers/clk/socfpga/clk-gate-s10.c
-f:drivers/clk/socfpga/clk-gate.c
-f:drivers/clk/socfpga/clk-periph-a10.c
-f:drivers/clk/socfpga/clk-periph-s10.c
-f:drivers/clk/socfpga/clk-periph.c
-f:drivers/clk/socfpga/clk-pll-a10.c
-f:drivers/clk/socfpga/clk-pll-s10.c
-f:drivers/clk/socfpga/clk-pll.c
-f:drivers/clk/socfpga/clk-s10.c
-f:drivers/clk/socfpga/clk.c
-f:drivers/clk/socfpga/clk.h
-f:drivers/clk/socfpga/stratix10-clk.h
-f:drivers/clk/sophgo/Kconfig
-f:drivers/clk/sophgo/Makefile
-f:drivers/clk/sophgo/clk-cv1800.c
-f:drivers/clk/sophgo/clk-cv1800.h
-f:drivers/clk/sophgo/clk-cv18xx-common.c
-f:drivers/clk/sophgo/clk-cv18xx-common.h
-f:drivers/clk/sophgo/clk-cv18xx-ip.c
-f:drivers/clk/sophgo/clk-cv18xx-ip.h
-f:drivers/clk/sophgo/clk-cv18xx-pll.c
-f:drivers/clk/sophgo/clk-cv18xx-pll.h
-f:drivers/clk/sophgo/clk-sg2042-clkgen.c
-f:drivers/clk/sophgo/clk-sg2042-pll.c
-f:drivers/clk/sophgo/clk-sg2042-rpgate.c
-f:drivers/clk/sophgo/clk-sg2042.h
-f:drivers/clk/sophgo/clk-sg2044-pll.c
-f:drivers/clk/sophgo/clk-sg2044.c
-f:drivers/clk/spacemit/Kconfig
-f:drivers/clk/spacemit/Makefile
-f:drivers/clk/spacemit/ccu-k1.c
-f:drivers/clk/spacemit/ccu_common.h
-f:drivers/clk/spacemit/ccu_ddn.c
-f:drivers/clk/spacemit/ccu_ddn.h
-f:drivers/clk/spacemit/ccu_mix.c
-f:drivers/clk/spacemit/ccu_mix.h
-f:drivers/clk/spacemit/ccu_pll.c
-f:drivers/clk/spacemit/ccu_pll.h
-f:drivers/clk/spear/Makefile
-f:drivers/clk/spear/clk-aux-synth.c
-f:drivers/clk/spear/clk-frac-synth.c
-f:drivers/clk/spear/clk-gpt-synth.c
-f:drivers/clk/spear/clk-vco-pll.c
-f:drivers/clk/spear/clk.c
-f:drivers/clk/spear/clk.h
-f:drivers/clk/spear/spear1310_clock.c
-f:drivers/clk/spear/spear1340_clock.c
-f:drivers/clk/spear/spear3xx_clock.c
-f:drivers/clk/spear/spear6xx_clock.c
-f:drivers/clk/sprd/Kconfig
-f:drivers/clk/sprd/Makefile
-f:drivers/clk/sprd/common.c
-f:drivers/clk/sprd/common.h
-f:drivers/clk/sprd/composite.c
-f:drivers/clk/sprd/composite.h
-f:drivers/clk/sprd/div.c
-f:drivers/clk/sprd/div.h
-f:drivers/clk/sprd/gate.c
-f:drivers/clk/sprd/gate.h
-f:drivers/clk/sprd/mux.c
-f:drivers/clk/sprd/mux.h
-f:drivers/clk/sprd/pll.c
-f:drivers/clk/sprd/pll.h
-f:drivers/clk/sprd/sc9860-clk.c
-f:drivers/clk/sprd/sc9863a-clk.c
-f:drivers/clk/sprd/ums512-clk.c
-f:drivers/clk/st/Makefile
-f:drivers/clk/st/clk-flexgen.c
-f:drivers/clk/st/clkgen-fsyn.c
-f:drivers/clk/st/clkgen-mux.c
-f:drivers/clk/st/clkgen-pll.c
-f:drivers/clk/st/clkgen.h
-f:drivers/clk/starfive/Kconfig
-f:drivers/clk/starfive/Makefile
-f:drivers/clk/starfive/clk-starfive-jh7100-audio.c
-f:drivers/clk/starfive/clk-starfive-jh7100.c
-f:drivers/clk/starfive/clk-starfive-jh7110-aon.c
-f:drivers/clk/starfive/clk-starfive-jh7110-isp.c
-f:drivers/clk/starfive/clk-starfive-jh7110-pll.c
-f:drivers/clk/starfive/clk-starfive-jh7110-stg.c
-f:drivers/clk/starfive/clk-starfive-jh7110-sys.c
-f:drivers/clk/starfive/clk-starfive-jh7110-vout.c
-f:drivers/clk/starfive/clk-starfive-jh7110.h
-f:drivers/clk/starfive/clk-starfive-jh71x0.c
-f:drivers/clk/starfive/clk-starfive-jh71x0.h
-f:drivers/clk/stm32/Kconfig
-f:drivers/clk/stm32/Makefile
-f:drivers/clk/stm32/clk-stm32-core.c
-f:drivers/clk/stm32/clk-stm32-core.h
-f:drivers/clk/stm32/clk-stm32mp1.c
-f:drivers/clk/stm32/clk-stm32mp13.c
-f:drivers/clk/stm32/clk-stm32mp25.c
-f:drivers/clk/stm32/reset-stm32.c
-f:drivers/clk/stm32/reset-stm32.h
-f:drivers/clk/stm32/stm32mp13_rcc.h
-f:drivers/clk/stm32/stm32mp25_rcc.h
-f:drivers/clk/sunxi-ng/Kconfig
-f:drivers/clk/sunxi-ng/Makefile
-f:drivers/clk/sunxi-ng/ccu-sun20i-d1-r.c
-f:drivers/clk/sunxi-ng/ccu-sun20i-d1-r.h
-f:drivers/clk/sunxi-ng/ccu-sun20i-d1.c
-f:drivers/clk/sunxi-ng/ccu-sun20i-d1.h
-f:drivers/clk/sunxi-ng/ccu-sun4i-a10.c
-f:drivers/clk/sunxi-ng/ccu-sun4i-a10.h
-f:drivers/clk/sunxi-ng/ccu-sun50i-a100-r.c
-f:drivers/clk/sunxi-ng/ccu-sun50i-a100-r.h
-f:drivers/clk/sunxi-ng/ccu-sun50i-a100.c
-f:drivers/clk/sunxi-ng/ccu-sun50i-a100.h
-f:drivers/clk/sunxi-ng/ccu-sun50i-a64.c
-f:drivers/clk/sunxi-ng/ccu-sun50i-a64.h
-f:drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c
-f:drivers/clk/sunxi-ng/ccu-sun50i-h6-r.h
-f:drivers/clk/sunxi-ng/ccu-sun50i-h6.c
-f:drivers/clk/sunxi-ng/ccu-sun50i-h6.h
-f:drivers/clk/sunxi-ng/ccu-sun50i-h616.c
-f:drivers/clk/sunxi-ng/ccu-sun50i-h616.h
-f:drivers/clk/sunxi-ng/ccu-sun55i-a523-r.c
-f:drivers/clk/sunxi-ng/ccu-sun55i-a523-r.h
-f:drivers/clk/sunxi-ng/ccu-sun55i-a523.c
-f:drivers/clk/sunxi-ng/ccu-sun55i-a523.h
-f:drivers/clk/sunxi-ng/ccu-sun5i.c
-f:drivers/clk/sunxi-ng/ccu-sun5i.h
-f:drivers/clk/sunxi-ng/ccu-sun6i-a31.c
-f:drivers/clk/sunxi-ng/ccu-sun6i-a31.h
-f:drivers/clk/sunxi-ng/ccu-sun6i-rtc.c
-f:drivers/clk/sunxi-ng/ccu-sun6i-rtc.h
-f:drivers/clk/sunxi-ng/ccu-sun8i-a23-a33.h
-f:drivers/clk/sunxi-ng/ccu-sun8i-a23.c
-f:drivers/clk/sunxi-ng/ccu-sun8i-a33.c
-f:drivers/clk/sunxi-ng/ccu-sun8i-a83t.c
-f:drivers/clk/sunxi-ng/ccu-sun8i-a83t.h
-f:drivers/clk/sunxi-ng/ccu-sun8i-de2.c
-f:drivers/clk/sunxi-ng/ccu-sun8i-de2.h
-f:drivers/clk/sunxi-ng/ccu-sun8i-h3.c
-f:drivers/clk/sunxi-ng/ccu-sun8i-h3.h
-f:drivers/clk/sunxi-ng/ccu-sun8i-r.c
-f:drivers/clk/sunxi-ng/ccu-sun8i-r.h
-f:drivers/clk/sunxi-ng/ccu-sun8i-r40.c
-f:drivers/clk/sunxi-ng/ccu-sun8i-r40.h
-f:drivers/clk/sunxi-ng/ccu-sun8i-v3s.c
-f:drivers/clk/sunxi-ng/ccu-sun8i-v3s.h
-f:drivers/clk/sunxi-ng/ccu-sun9i-a80-de.c
-f:drivers/clk/sunxi-ng/ccu-sun9i-a80-de.h
-f:drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.c
-f:drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.h
-f:drivers/clk/sunxi-ng/ccu-sun9i-a80.c
-f:drivers/clk/sunxi-ng/ccu-sun9i-a80.h
-f:drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c
-f:drivers/clk/sunxi-ng/ccu-suniv-f1c100s.h
-f:drivers/clk/sunxi-ng/ccu_common.c
-f:drivers/clk/sunxi-ng/ccu_common.h
-f:drivers/clk/sunxi-ng/ccu_div.c
-f:drivers/clk/sunxi-ng/ccu_div.h
-f:drivers/clk/sunxi-ng/ccu_frac.c
-f:drivers/clk/sunxi-ng/ccu_frac.h
-f:drivers/clk/sunxi-ng/ccu_gate.c
-f:drivers/clk/sunxi-ng/ccu_gate.h
-f:drivers/clk/sunxi-ng/ccu_mmc_timing.c
-f:drivers/clk/sunxi-ng/ccu_mp.c
-f:drivers/clk/sunxi-ng/ccu_mp.h
-f:drivers/clk/sunxi-ng/ccu_mult.c
-f:drivers/clk/sunxi-ng/ccu_mult.h
-f:drivers/clk/sunxi-ng/ccu_mux.c
-f:drivers/clk/sunxi-ng/ccu_mux.h
-f:drivers/clk/sunxi-ng/ccu_nk.c
-f:drivers/clk/sunxi-ng/ccu_nk.h
-f:drivers/clk/sunxi-ng/ccu_nkm.c
-f:drivers/clk/sunxi-ng/ccu_nkm.h
-f:drivers/clk/sunxi-ng/ccu_nkmp.c
-f:drivers/clk/sunxi-ng/ccu_nkmp.h
-f:drivers/clk/sunxi-ng/ccu_nm.c
-f:drivers/clk/sunxi-ng/ccu_nm.h
-f:drivers/clk/sunxi-ng/ccu_phase.c
-f:drivers/clk/sunxi-ng/ccu_phase.h
-f:drivers/clk/sunxi-ng/ccu_reset.c
-f:drivers/clk/sunxi-ng/ccu_reset.h
-f:drivers/clk/sunxi-ng/ccu_sdm.c
-f:drivers/clk/sunxi-ng/ccu_sdm.h
-f:drivers/clk/sunxi/Kconfig
-f:drivers/clk/sunxi/Makefile
-f:drivers/clk/sunxi/clk-a10-codec.c
-f:drivers/clk/sunxi/clk-a10-hosc.c
-f:drivers/clk/sunxi/clk-a10-mod1.c
-f:drivers/clk/sunxi/clk-a10-pll2.c
-f:drivers/clk/sunxi/clk-a10-ve.c
-f:drivers/clk/sunxi/clk-a20-gmac.c
-f:drivers/clk/sunxi/clk-factors.c
-f:drivers/clk/sunxi/clk-factors.h
-f:drivers/clk/sunxi/clk-mod0.c
-f:drivers/clk/sunxi/clk-simple-gates.c
-f:drivers/clk/sunxi/clk-sun4i-display.c
-f:drivers/clk/sunxi/clk-sun4i-pll3.c
-f:drivers/clk/sunxi/clk-sun4i-tcon-ch1.c
-f:drivers/clk/sunxi/clk-sun6i-apb0-gates.c
-f:drivers/clk/sunxi/clk-sun6i-apb0.c
-f:drivers/clk/sunxi/clk-sun6i-ar100.c
-f:drivers/clk/sunxi/clk-sun8i-apb0.c
-f:drivers/clk/sunxi/clk-sun8i-bus-gates.c
-f:drivers/clk/sunxi/clk-sun8i-mbus.c
-f:drivers/clk/sunxi/clk-sun9i-core.c
-f:drivers/clk/sunxi/clk-sun9i-cpus.c
-f:drivers/clk/sunxi/clk-sun9i-mmc.c
-f:drivers/clk/sunxi/clk-sunxi.c
-f:drivers/clk/sunxi/clk-usb.c
-f:drivers/clk/tegra/Kconfig
-f:drivers/clk/tegra/Makefile
-f:drivers/clk/tegra/clk-audio-sync.c
-f:drivers/clk/tegra/clk-bpmp.c
-f:drivers/clk/tegra/clk-device.c
-f:drivers/clk/tegra/clk-dfll.c
-f:drivers/clk/tegra/clk-dfll.h
-f:drivers/clk/tegra/clk-divider.c
-f:drivers/clk/tegra/clk-id.h
-f:drivers/clk/tegra/clk-periph-fixed.c
-f:drivers/clk/tegra/clk-periph-gate.c
-f:drivers/clk/tegra/clk-periph.c
-f:drivers/clk/tegra/clk-pll-out.c
-f:drivers/clk/tegra/clk-pll.c
-f:drivers/clk/tegra/clk-sdmmc-mux.c
-f:drivers/clk/tegra/clk-super.c
-f:drivers/clk/tegra/clk-tegra-audio.c
-f:drivers/clk/tegra/clk-tegra-fixed.c
-f:drivers/clk/tegra/clk-tegra-periph.c
-f:drivers/clk/tegra/clk-tegra-super-cclk.c
-f:drivers/clk/tegra/clk-tegra-super-gen4.c
-f:drivers/clk/tegra/clk-tegra114.c
-f:drivers/clk/tegra/clk-tegra124-dfll-fcpu.c
-f:drivers/clk/tegra/clk-tegra124-emc.c
-f:drivers/clk/tegra/clk-tegra124.c
-f:drivers/clk/tegra/clk-tegra20-emc.c
-f:drivers/clk/tegra/clk-tegra20.c
-f:drivers/clk/tegra/clk-tegra210-emc.c
-f:drivers/clk/tegra/clk-tegra210.c
-f:drivers/clk/tegra/clk-tegra30.c
-f:drivers/clk/tegra/clk-utils.c
-f:drivers/clk/tegra/clk.c
-f:drivers/clk/tegra/clk.h
-f:drivers/clk/tegra/cvb.c
-f:drivers/clk/tegra/cvb.h
-f:drivers/clk/thead/Kconfig
-f:drivers/clk/thead/Makefile
-f:drivers/clk/thead/clk-th1520-ap.c
-f:drivers/clk/ti/Kconfig
-f:drivers/clk/ti/Makefile
-f:drivers/clk/ti/adpll.c
-f:drivers/clk/ti/apll.c
-f:drivers/clk/ti/autoidle.c
-f:drivers/clk/ti/clk-2xxx.c
-f:drivers/clk/ti/clk-33xx.c
-f:drivers/clk/ti/clk-3xxx.c
-f:drivers/clk/ti/clk-43xx.c
-f:drivers/clk/ti/clk-44xx.c
-f:drivers/clk/ti/clk-54xx.c
-f:drivers/clk/ti/clk-7xx.c
-f:drivers/clk/ti/clk-814x.c
-f:drivers/clk/ti/clk-816x.c
-f:drivers/clk/ti/clk-dra7-atl.c
-f:drivers/clk/ti/clk.c
-f:drivers/clk/ti/clkctrl.c
-f:drivers/clk/ti/clkt_dflt.c
-f:drivers/clk/ti/clkt_dpll.c
-f:drivers/clk/ti/clkt_iclk.c
-f:drivers/clk/ti/clock.h
-f:drivers/clk/ti/clockdomain.c
-f:drivers/clk/ti/composite.c
-f:drivers/clk/ti/divider.c
-f:drivers/clk/ti/dpll.c
-f:drivers/clk/ti/dpll3xxx.c
-f:drivers/clk/ti/dpll44xx.c
-f:drivers/clk/ti/fapll.c
-f:drivers/clk/ti/fixed-factor.c
-f:drivers/clk/ti/gate.c
-f:drivers/clk/ti/interface.c
-f:drivers/clk/ti/mux.c
-f:drivers/clk/uniphier/Kconfig
-f:drivers/clk/uniphier/Makefile
-f:drivers/clk/uniphier/clk-uniphier-core.c
-f:drivers/clk/uniphier/clk-uniphier-cpugear.c
-f:drivers/clk/uniphier/clk-uniphier-fixed-factor.c
-f:drivers/clk/uniphier/clk-uniphier-fixed-rate.c
-f:drivers/clk/uniphier/clk-uniphier-gate.c
-f:drivers/clk/uniphier/clk-uniphier-mio.c
-f:drivers/clk/uniphier/clk-uniphier-mux.c
-f:drivers/clk/uniphier/clk-uniphier-peri.c
-f:drivers/clk/uniphier/clk-uniphier-sys.c
-f:drivers/clk/uniphier/clk-uniphier.h
-f:drivers/clk/ux500/Makefile
-f:drivers/clk/ux500/abx500-clk.c
-f:drivers/clk/ux500/clk-prcc.c
-f:drivers/clk/ux500/clk-prcmu.c
-f:drivers/clk/ux500/clk-sysctrl.c
-f:drivers/clk/ux500/clk.h
-f:drivers/clk/ux500/prcc.h
-f:drivers/clk/ux500/reset-prcc.c
-f:drivers/clk/ux500/reset-prcc.h
-f:drivers/clk/ux500/u8500_of_clk.c
-f:drivers/clk/versatile/Kconfig
-f:drivers/clk/versatile/Makefile
-f:drivers/clk/versatile/clk-icst.c
-f:drivers/clk/versatile/clk-icst.h
-f:drivers/clk/versatile/clk-impd1.c
-f:drivers/clk/versatile/clk-sp810.c
-f:drivers/clk/versatile/clk-versatile.c
-f:drivers/clk/versatile/clk-vexpress-osc.c
-f:drivers/clk/versatile/icst.c
-f:drivers/clk/versatile/icst.h
-f:drivers/clk/visconti/Kconfig
-f:drivers/clk/visconti/Makefile
-f:drivers/clk/visconti/clkc-tmpv770x.c
-f:drivers/clk/visconti/clkc.c
-f:drivers/clk/visconti/clkc.h
-f:drivers/clk/visconti/pll-tmpv770x.c
-f:drivers/clk/visconti/pll.c
-f:drivers/clk/visconti/pll.h
-f:drivers/clk/visconti/reset.c
-f:drivers/clk/visconti/reset.h
-f:drivers/clk/x86/Kconfig
-f:drivers/clk/x86/Makefile
-f:drivers/clk/x86/clk-cgu-pll.c
-f:drivers/clk/x86/clk-cgu.c
-f:drivers/clk/x86/clk-cgu.h
-f:drivers/clk/x86/clk-fch.c
-f:drivers/clk/x86/clk-lgm.c
-f:drivers/clk/x86/clk-lpss-atom.c
-f:drivers/clk/x86/clk-pmc-atom.c
-f:drivers/clk/xilinx/Kconfig
-f:drivers/clk/xilinx/Makefile
-f:drivers/clk/xilinx/clk-xlnx-clock-wizard.c
-f:drivers/clk/xilinx/xlnx_vcu.c
-f:drivers/clk/zynq/Makefile
-f:drivers/clk/zynq/clkc.c
-f:drivers/clk/zynq/pll.c
-f:drivers/clk/zynqmp/Kconfig
-f:drivers/clk/zynqmp/Makefile
-f:drivers/clk/zynqmp/clk-gate-zynqmp.c
-f:drivers/clk/zynqmp/clk-mux-zynqmp.c
-f:drivers/clk/zynqmp/clk-zynqmp.h
-f:drivers/clk/zynqmp/clkc.c
-f:drivers/clk/zynqmp/divider.c
-f:drivers/clk/zynqmp/pll.c
-f:drivers/clocksource/Kconfig
-f:drivers/clocksource/Makefile
-f:drivers/clocksource/acpi_pm.c
-f:drivers/clocksource/arc_timer.c
-f:drivers/clocksource/arm_arch_timer.c
-f:drivers/clocksource/arm_global_timer.c
-f:drivers/clocksource/armv7m_systick.c
-f:drivers/clocksource/asm9260_timer.c
-f:drivers/clocksource/bcm2835_timer.c
-f:drivers/clocksource/bcm_kona_timer.c
-f:drivers/clocksource/clksrc-dbx500-prcmu.c
-f:drivers/clocksource/clksrc_st_lpc.c
-f:drivers/clocksource/clps711x-timer.c
-f:drivers/clocksource/dummy_timer.c
-f:drivers/clocksource/dw_apb_timer.c
-f:drivers/clocksource/dw_apb_timer_of.c
-f:drivers/clocksource/em_sti.c
-f:drivers/clocksource/exynos_mct.c
-f:drivers/clocksource/hyperv_timer.c
-f:drivers/clocksource/i8253.c
-f:drivers/clocksource/ingenic-ost.c
-f:drivers/clocksource/ingenic-sysost.c
-f:drivers/clocksource/ingenic-timer.c
-f:drivers/clocksource/jcore-pit.c
-f:drivers/clocksource/mips-gic-timer.c
-f:drivers/clocksource/mmio.c
-f:drivers/clocksource/mps2-timer.c
-f:drivers/clocksource/mxs_timer.c
-f:drivers/clocksource/nomadik-mtu.c
-f:drivers/clocksource/numachip.c
-f:drivers/clocksource/renesas-ostm.c
-f:drivers/clocksource/samsung_pwm_timer.c
-f:drivers/clocksource/scx200_hrt.c
-f:drivers/clocksource/sh_cmt.c
-f:drivers/clocksource/sh_mtu2.c
-f:drivers/clocksource/sh_tmu.c
-f:drivers/clocksource/timer-armada-370-xp.c
-f:drivers/clocksource/timer-atmel-pit.c
-f:drivers/clocksource/timer-atmel-st.c
-f:drivers/clocksource/timer-atmel-tcb.c
-f:drivers/clocksource/timer-cadence-ttc.c
-f:drivers/clocksource/timer-clint.c
-f:drivers/clocksource/timer-cs5535.c
-f:drivers/clocksource/timer-davinci.c
-f:drivers/clocksource/timer-digicolor.c
-f:drivers/clocksource/timer-econet-en751221.c
-f:drivers/clocksource/timer-ep93xx.c
-f:drivers/clocksource/timer-fsl-ftm.c
-f:drivers/clocksource/timer-fttmr010.c
-f:drivers/clocksource/timer-goldfish.c
-f:drivers/clocksource/timer-gx6605s.c
-f:drivers/clocksource/timer-gxp.c
-f:drivers/clocksource/timer-imx-gpt.c
-f:drivers/clocksource/timer-imx-sysctr.c
-f:drivers/clocksource/timer-imx-tpm.c
-f:drivers/clocksource/timer-integrator-ap.c
-f:drivers/clocksource/timer-ixp4xx.c
-f:drivers/clocksource/timer-keystone.c
-f:drivers/clocksource/timer-loongson1-pwm.c
-f:drivers/clocksource/timer-lpc32xx.c
-f:drivers/clocksource/timer-mediatek-cpux.c
-f:drivers/clocksource/timer-mediatek.c
-f:drivers/clocksource/timer-meson6.c
-f:drivers/clocksource/timer-microchip-pit64b.c
-f:drivers/clocksource/timer-milbeaut.c
-f:drivers/clocksource/timer-mp-csky.c
-f:drivers/clocksource/timer-msc313e.c
-f:drivers/clocksource/timer-npcm7xx.c
-f:drivers/clocksource/timer-nxp-stm.c
-f:drivers/clocksource/timer-of.c
-f:drivers/clocksource/timer-of.h
-f:drivers/clocksource/timer-orion.c
-f:drivers/clocksource/timer-owl.c
-f:drivers/clocksource/timer-pistachio.c
-f:drivers/clocksource/timer-probe.c
-f:drivers/clocksource/timer-pxa.c
-f:drivers/clocksource/timer-qcom.c
-f:drivers/clocksource/timer-ralink.c
-f:drivers/clocksource/timer-rda.c
-f:drivers/clocksource/timer-riscv.c
-f:drivers/clocksource/timer-rockchip.c
-f:drivers/clocksource/timer-rtl-otto.c
-f:drivers/clocksource/timer-sp.h
-f:drivers/clocksource/timer-sp804.c
-f:drivers/clocksource/timer-sprd.c
-f:drivers/clocksource/timer-stm32-lp.c
-f:drivers/clocksource/timer-stm32.c
-f:drivers/clocksource/timer-sun4i.c
-f:drivers/clocksource/timer-sun5i.c
-f:drivers/clocksource/timer-tegra.c
-f:drivers/clocksource/timer-tegra186.c
-f:drivers/clocksource/timer-ti-32k.c
-f:drivers/clocksource/timer-ti-dm-systimer.c
-f:drivers/clocksource/timer-ti-dm.c
-f:drivers/clocksource/timer-versatile.c
-f:drivers/clocksource/timer-vf-pit.c
-f:drivers/clocksource/timer-vt8500.c
-f:drivers/clocksource/timer-zevio.c
-f:drivers/comedi/Kconfig
-f:drivers/comedi/Makefile
-f:drivers/comedi/TODO
-f:drivers/comedi/comedi_buf.c
-f:drivers/comedi/comedi_fops.c
-f:drivers/comedi/comedi_internal.h
-f:drivers/comedi/comedi_pci.c
-f:drivers/comedi/comedi_pcmcia.c
-f:drivers/comedi/comedi_usb.c
-f:drivers/comedi/drivers.c
-f:drivers/comedi/drivers/8255.c
-f:drivers/comedi/drivers/8255_pci.c
-f:drivers/comedi/drivers/Makefile
-f:drivers/comedi/drivers/addi_apci_1032.c
-f:drivers/comedi/drivers/addi_apci_1500.c
-f:drivers/comedi/drivers/addi_apci_1516.c
-f:drivers/comedi/drivers/addi_apci_1564.c
-f:drivers/comedi/drivers/addi_apci_16xx.c
-f:drivers/comedi/drivers/addi_apci_2032.c
-f:drivers/comedi/drivers/addi_apci_2200.c
-f:drivers/comedi/drivers/addi_apci_3120.c
-f:drivers/comedi/drivers/addi_apci_3501.c
-f:drivers/comedi/drivers/addi_apci_3xxx.c
-f:drivers/comedi/drivers/addi_tcw.h
-f:drivers/comedi/drivers/addi_watchdog.c
-f:drivers/comedi/drivers/addi_watchdog.h
-f:drivers/comedi/drivers/adl_pci6208.c
-f:drivers/comedi/drivers/adl_pci7x3x.c
-f:drivers/comedi/drivers/adl_pci8164.c
-f:drivers/comedi/drivers/adl_pci9111.c
-f:drivers/comedi/drivers/adl_pci9118.c
-f:drivers/comedi/drivers/adq12b.c
-f:drivers/comedi/drivers/adv_pci1710.c
-f:drivers/comedi/drivers/adv_pci1720.c
-f:drivers/comedi/drivers/adv_pci1723.c
-f:drivers/comedi/drivers/adv_pci1724.c
-f:drivers/comedi/drivers/adv_pci1760.c
-f:drivers/comedi/drivers/adv_pci_dio.c
-f:drivers/comedi/drivers/aio_aio12_8.c
-f:drivers/comedi/drivers/aio_iiro_16.c
-f:drivers/comedi/drivers/amcc_s5933.h
-f:drivers/comedi/drivers/amplc_dio200.c
-f:drivers/comedi/drivers/amplc_dio200.h
-f:drivers/comedi/drivers/amplc_dio200_common.c
-f:drivers/comedi/drivers/amplc_dio200_pci.c
-f:drivers/comedi/drivers/amplc_pc236.c
-f:drivers/comedi/drivers/amplc_pc236.h
-f:drivers/comedi/drivers/amplc_pc236_common.c
-f:drivers/comedi/drivers/amplc_pc263.c
-f:drivers/comedi/drivers/amplc_pci224.c
-f:drivers/comedi/drivers/amplc_pci230.c
-f:drivers/comedi/drivers/amplc_pci236.c
-f:drivers/comedi/drivers/amplc_pci263.c
-f:drivers/comedi/drivers/c6xdigio.c
-f:drivers/comedi/drivers/cb_das16_cs.c
-f:drivers/comedi/drivers/cb_pcidas.c
-f:drivers/comedi/drivers/cb_pcidas64.c
-f:drivers/comedi/drivers/cb_pcidda.c
-f:drivers/comedi/drivers/cb_pcimdas.c
-f:drivers/comedi/drivers/cb_pcimdda.c
-f:drivers/comedi/drivers/comedi_8254.c
-f:drivers/comedi/drivers/comedi_8255.c
-f:drivers/comedi/drivers/comedi_bond.c
-f:drivers/comedi/drivers/comedi_isadma.c
-f:drivers/comedi/drivers/comedi_parport.c
-f:drivers/comedi/drivers/comedi_test.c
-f:drivers/comedi/drivers/contec_pci_dio.c
-f:drivers/comedi/drivers/dac02.c
-f:drivers/comedi/drivers/daqboard2000.c
-f:drivers/comedi/drivers/das08.c
-f:drivers/comedi/drivers/das08.h
-f:drivers/comedi/drivers/das08_cs.c
-f:drivers/comedi/drivers/das08_isa.c
-f:drivers/comedi/drivers/das08_pci.c
-f:drivers/comedi/drivers/das16.c
-f:drivers/comedi/drivers/das16m1.c
-f:drivers/comedi/drivers/das1800.c
-f:drivers/comedi/drivers/das6402.c
-f:drivers/comedi/drivers/das800.c
-f:drivers/comedi/drivers/dmm32at.c
-f:drivers/comedi/drivers/dt2801.c
-f:drivers/comedi/drivers/dt2811.c
-f:drivers/comedi/drivers/dt2814.c
-f:drivers/comedi/drivers/dt2815.c
-f:drivers/comedi/drivers/dt2817.c
-f:drivers/comedi/drivers/dt282x.c
-f:drivers/comedi/drivers/dt3000.c
-f:drivers/comedi/drivers/dt9812.c
-f:drivers/comedi/drivers/dyna_pci10xx.c
-f:drivers/comedi/drivers/fl512.c
-f:drivers/comedi/drivers/gsc_hpdi.c
-f:drivers/comedi/drivers/icp_multi.c
-f:drivers/comedi/drivers/ii_pci20kc.c
-f:drivers/comedi/drivers/jr3_pci.c
-f:drivers/comedi/drivers/jr3_pci.h
-f:drivers/comedi/drivers/ke_counter.c
-f:drivers/comedi/drivers/me4000.c
-f:drivers/comedi/drivers/me_daq.c
-f:drivers/comedi/drivers/mf6x4.c
-f:drivers/comedi/drivers/mite.c
-f:drivers/comedi/drivers/mite.h
-f:drivers/comedi/drivers/mpc624.c
-f:drivers/comedi/drivers/multiq3.c
-f:drivers/comedi/drivers/ni_6527.c
-f:drivers/comedi/drivers/ni_65xx.c
-f:drivers/comedi/drivers/ni_660x.c
-f:drivers/comedi/drivers/ni_670x.c
-f:drivers/comedi/drivers/ni_at_a2150.c
-f:drivers/comedi/drivers/ni_at_ao.c
-f:drivers/comedi/drivers/ni_atmio.c
-f:drivers/comedi/drivers/ni_atmio16d.c
-f:drivers/comedi/drivers/ni_daq_700.c
-f:drivers/comedi/drivers/ni_daq_dio24.c
-f:drivers/comedi/drivers/ni_labpc.c
-f:drivers/comedi/drivers/ni_labpc.h
-f:drivers/comedi/drivers/ni_labpc_common.c
-f:drivers/comedi/drivers/ni_labpc_cs.c
-f:drivers/comedi/drivers/ni_labpc_isadma.c
-f:drivers/comedi/drivers/ni_labpc_isadma.h
-f:drivers/comedi/drivers/ni_labpc_pci.c
-f:drivers/comedi/drivers/ni_labpc_regs.h
-f:drivers/comedi/drivers/ni_mio_common.c
-f:drivers/comedi/drivers/ni_mio_cs.c
-f:drivers/comedi/drivers/ni_pcidio.c
-f:drivers/comedi/drivers/ni_pcimio.c
-f:drivers/comedi/drivers/ni_routes.c
-f:drivers/comedi/drivers/ni_routes.h
-f:drivers/comedi/drivers/ni_routing/README
-f:drivers/comedi/drivers/ni_routing/ni_device_routes.c
-f:drivers/comedi/drivers/ni_routing/ni_device_routes.h
-f:drivers/comedi/drivers/ni_routing/ni_device_routes/all.h
-f:drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6070e.c
-f:drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6220.c
-f:drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6221.c
-f:drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6229.c
-f:drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6251.c
-f:drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6254.c
-f:drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6259.c
-f:drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6534.c
-f:drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6602.c
-f:drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6713.c
-f:drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6723.c
-f:drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6733.c
-f:drivers/comedi/drivers/ni_routing/ni_device_routes/pxi-6030e.c
-f:drivers/comedi/drivers/ni_routing/ni_device_routes/pxi-6224.c
-f:drivers/comedi/drivers/ni_routing/ni_device_routes/pxi-6225.c
-f:drivers/comedi/drivers/ni_routing/ni_device_routes/pxi-6251.c
-f:drivers/comedi/drivers/ni_routing/ni_device_routes/pxi-6733.c
-f:drivers/comedi/drivers/ni_routing/ni_device_routes/pxie-6251.c
-f:drivers/comedi/drivers/ni_routing/ni_device_routes/pxie-6535.c
-f:drivers/comedi/drivers/ni_routing/ni_device_routes/pxie-6738.c
-f:drivers/comedi/drivers/ni_routing/ni_route_values.c
-f:drivers/comedi/drivers/ni_routing/ni_route_values.h
-f:drivers/comedi/drivers/ni_routing/ni_route_values/all.h
-f:drivers/comedi/drivers/ni_routing/ni_route_values/ni_660x.c
-f:drivers/comedi/drivers/ni_routing/ni_route_values/ni_eseries.c
-f:drivers/comedi/drivers/ni_routing/ni_route_values/ni_mseries.c
-f:drivers/comedi/drivers/ni_routing/tools/.gitignore
-f:drivers/comedi/drivers/ni_routing/tools/Makefile
-f:drivers/comedi/drivers/ni_routing/tools/convert_c_to_py.c
-f:drivers/comedi/drivers/ni_routing/tools/convert_csv_to_c.py
-f:drivers/comedi/drivers/ni_routing/tools/convert_py_to_csv.py
-f:drivers/comedi/drivers/ni_routing/tools/csv_collection.py
-f:drivers/comedi/drivers/ni_routing/tools/make_blank_csv.py
-f:drivers/comedi/drivers/ni_routing/tools/ni_names.py
-f:drivers/comedi/drivers/ni_stc.h
-f:drivers/comedi/drivers/ni_tio.c
-f:drivers/comedi/drivers/ni_tio.h
-f:drivers/comedi/drivers/ni_tio_internal.h
-f:drivers/comedi/drivers/ni_tiocmd.c
-f:drivers/comedi/drivers/ni_usb6501.c
-f:drivers/comedi/drivers/pcl711.c
-f:drivers/comedi/drivers/pcl724.c
-f:drivers/comedi/drivers/pcl726.c
-f:drivers/comedi/drivers/pcl730.c
-f:drivers/comedi/drivers/pcl812.c
-f:drivers/comedi/drivers/pcl816.c
-f:drivers/comedi/drivers/pcl818.c
-f:drivers/comedi/drivers/pcm3724.c
-f:drivers/comedi/drivers/pcmad.c
-f:drivers/comedi/drivers/pcmda12.c
-f:drivers/comedi/drivers/pcmmio.c
-f:drivers/comedi/drivers/pcmuio.c
-f:drivers/comedi/drivers/plx9052.h
-f:drivers/comedi/drivers/plx9080.h
-f:drivers/comedi/drivers/quatech_daqp_cs.c
-f:drivers/comedi/drivers/rtd520.c
-f:drivers/comedi/drivers/rti800.c
-f:drivers/comedi/drivers/rti802.c
-f:drivers/comedi/drivers/s526.c
-f:drivers/comedi/drivers/s626.c
-f:drivers/comedi/drivers/s626.h
-f:drivers/comedi/drivers/ssv_dnp.c
-f:drivers/comedi/drivers/tests/Makefile
-f:drivers/comedi/drivers/tests/comedi_example_test.c
-f:drivers/comedi/drivers/tests/ni_routes_test.c
-f:drivers/comedi/drivers/tests/unittest.h
-f:drivers/comedi/drivers/usbdux.c
-f:drivers/comedi/drivers/usbduxfast.c
-f:drivers/comedi/drivers/usbduxsigma.c
-f:drivers/comedi/drivers/vmk80xx.c
-f:drivers/comedi/drivers/z8536.h
-f:drivers/comedi/kcomedilib/Makefile
-f:drivers/comedi/kcomedilib/kcomedilib_main.c
-f:drivers/comedi/proc.c
-f:drivers/comedi/range.c
-f:drivers/connector/Kconfig
-f:drivers/connector/Makefile
-f:drivers/connector/cn_proc.c
-f:drivers/connector/cn_queue.c
-f:drivers/connector/connector.c
-f:drivers/counter/104-quad-8.c
-f:drivers/counter/Kconfig
-f:drivers/counter/Makefile
-f:drivers/counter/counter-chrdev.c
-f:drivers/counter/counter-chrdev.h
-f:drivers/counter/counter-core.c
-f:drivers/counter/counter-sysfs.c
-f:drivers/counter/counter-sysfs.h
-f:drivers/counter/ftm-quaddec.c
-f:drivers/counter/i8254.c
-f:drivers/counter/intel-qep.c
-f:drivers/counter/interrupt-cnt.c
-f:drivers/counter/microchip-tcb-capture.c
-f:drivers/counter/rz-mtu3-cnt.c
-f:drivers/counter/stm32-lptimer-cnt.c
-f:drivers/counter/stm32-timer-cnt.c
-f:drivers/counter/ti-ecap-capture.c
-f:drivers/counter/ti-eqep.c
-f:drivers/cpufreq/Kconfig
-f:drivers/cpufreq/Kconfig.arm
-f:drivers/cpufreq/Kconfig.powerpc
-f:drivers/cpufreq/Kconfig.x86
-f:drivers/cpufreq/Makefile
-f:drivers/cpufreq/acpi-cpufreq.c
-f:drivers/cpufreq/airoha-cpufreq.c
-f:drivers/cpufreq/amd-pstate-trace.c
-f:drivers/cpufreq/amd-pstate-trace.h
-f:drivers/cpufreq/amd-pstate-ut.c
-f:drivers/cpufreq/amd-pstate.c
-f:drivers/cpufreq/amd-pstate.h
-f:drivers/cpufreq/amd_freq_sensitivity.c
-f:drivers/cpufreq/apple-soc-cpufreq.c
-f:drivers/cpufreq/armada-37xx-cpufreq.c
-f:drivers/cpufreq/armada-8k-cpufreq.c
-f:drivers/cpufreq/bmips-cpufreq.c
-f:drivers/cpufreq/brcmstb-avs-cpufreq.c
-f:drivers/cpufreq/cppc_cpufreq.c
-f:drivers/cpufreq/cpufreq-dt-platdev.c
-f:drivers/cpufreq/cpufreq-dt.c
-f:drivers/cpufreq/cpufreq-dt.h
-f:drivers/cpufreq/cpufreq-nforce2.c
-f:drivers/cpufreq/cpufreq.c
-f:drivers/cpufreq/cpufreq_conservative.c
-f:drivers/cpufreq/cpufreq_governor.c
-f:drivers/cpufreq/cpufreq_governor.h
-f:drivers/cpufreq/cpufreq_governor_attr_set.c
-f:drivers/cpufreq/cpufreq_ondemand.c
-f:drivers/cpufreq/cpufreq_ondemand.h
-f:drivers/cpufreq/cpufreq_performance.c
-f:drivers/cpufreq/cpufreq_powersave.c
-f:drivers/cpufreq/cpufreq_stats.c
-f:drivers/cpufreq/cpufreq_userspace.c
-f:drivers/cpufreq/davinci-cpufreq.c
-f:drivers/cpufreq/e_powersaver.c
-f:drivers/cpufreq/elanfreq.c
-f:drivers/cpufreq/freq_table.c
-f:drivers/cpufreq/gx-suspmod.c
-f:drivers/cpufreq/highbank-cpufreq.c
-f:drivers/cpufreq/imx-cpufreq-dt.c
-f:drivers/cpufreq/imx6q-cpufreq.c
-f:drivers/cpufreq/intel_pstate.c
-f:drivers/cpufreq/kirkwood-cpufreq.c
-f:drivers/cpufreq/longhaul.c
-f:drivers/cpufreq/longhaul.h
-f:drivers/cpufreq/longrun.c
-f:drivers/cpufreq/loongson2_cpufreq.c
-f:drivers/cpufreq/loongson3_cpufreq.c
-f:drivers/cpufreq/mediatek-cpufreq-hw.c
-f:drivers/cpufreq/mediatek-cpufreq.c
-f:drivers/cpufreq/mvebu-cpufreq.c
-f:drivers/cpufreq/omap-cpufreq.c
-f:drivers/cpufreq/p4-clockmod.c
-f:drivers/cpufreq/pasemi-cpufreq.c
-f:drivers/cpufreq/pcc-cpufreq.c
-f:drivers/cpufreq/pmac32-cpufreq.c
-f:drivers/cpufreq/pmac64-cpufreq.c
-f:drivers/cpufreq/powernow-k6.c
-f:drivers/cpufreq/powernow-k7.c
-f:drivers/cpufreq/powernow-k7.h
-f:drivers/cpufreq/powernow-k8.c
-f:drivers/cpufreq/powernow-k8.h
-f:drivers/cpufreq/powernv-cpufreq.c
-f:drivers/cpufreq/powernv-trace.h
-f:drivers/cpufreq/pxa2xx-cpufreq.c
-f:drivers/cpufreq/pxa3xx-cpufreq.c
-f:drivers/cpufreq/qcom-cpufreq-hw.c
-f:drivers/cpufreq/qcom-cpufreq-nvmem.c
-f:drivers/cpufreq/qoriq-cpufreq.c
-f:drivers/cpufreq/raspberrypi-cpufreq.c
-f:drivers/cpufreq/rcpufreq_dt.rs
-f:drivers/cpufreq/s3c64xx-cpufreq.c
-f:drivers/cpufreq/s5pv210-cpufreq.c
-f:drivers/cpufreq/sa1110-cpufreq.c
-f:drivers/cpufreq/sc520_freq.c
-f:drivers/cpufreq/scmi-cpufreq.c
-f:drivers/cpufreq/scpi-cpufreq.c
-f:drivers/cpufreq/sh-cpufreq.c
-f:drivers/cpufreq/sparc-us2e-cpufreq.c
-f:drivers/cpufreq/sparc-us3-cpufreq.c
-f:drivers/cpufreq/spear-cpufreq.c
-f:drivers/cpufreq/speedstep-centrino.c
-f:drivers/cpufreq/speedstep-ich.c
-f:drivers/cpufreq/speedstep-lib.c
-f:drivers/cpufreq/speedstep-lib.h
-f:drivers/cpufreq/speedstep-smi.c
-f:drivers/cpufreq/sti-cpufreq.c
-f:drivers/cpufreq/sun50i-cpufreq-nvmem.c
-f:drivers/cpufreq/tegra124-cpufreq.c
-f:drivers/cpufreq/tegra186-cpufreq.c
-f:drivers/cpufreq/tegra194-cpufreq.c
-f:drivers/cpufreq/tegra20-cpufreq.c
-f:drivers/cpufreq/ti-cpufreq.c
-f:drivers/cpufreq/vexpress-spc-cpufreq.c
-f:drivers/cpufreq/virtual-cpufreq.c
-f:drivers/cpuidle/Kconfig
-f:drivers/cpuidle/Kconfig.arm
-f:drivers/cpuidle/Kconfig.mips
-f:drivers/cpuidle/Kconfig.powerpc
-f:drivers/cpuidle/Kconfig.riscv
-f:drivers/cpuidle/Makefile
-f:drivers/cpuidle/coupled.c
-f:drivers/cpuidle/cpuidle-arm.c
-f:drivers/cpuidle/cpuidle-at91.c
-f:drivers/cpuidle/cpuidle-big_little.c
-f:drivers/cpuidle/cpuidle-calxeda.c
-f:drivers/cpuidle/cpuidle-clps711x.c
-f:drivers/cpuidle/cpuidle-cps.c
-f:drivers/cpuidle/cpuidle-exynos.c
-f:drivers/cpuidle/cpuidle-haltpoll.c
-f:drivers/cpuidle/cpuidle-kirkwood.c
-f:drivers/cpuidle/cpuidle-mvebu-v7.c
-f:drivers/cpuidle/cpuidle-powernv.c
-f:drivers/cpuidle/cpuidle-psci-domain.c
-f:drivers/cpuidle/cpuidle-psci.c
-f:drivers/cpuidle/cpuidle-psci.h
-f:drivers/cpuidle/cpuidle-pseries.c
-f:drivers/cpuidle/cpuidle-qcom-spm.c
-f:drivers/cpuidle/cpuidle-riscv-sbi.c
-f:drivers/cpuidle/cpuidle-tegra.c
-f:drivers/cpuidle/cpuidle-ux500.c
-f:drivers/cpuidle/cpuidle-zynq.c
-f:drivers/cpuidle/cpuidle.c
-f:drivers/cpuidle/cpuidle.h
-f:drivers/cpuidle/driver.c
-f:drivers/cpuidle/dt_idle_genpd.c
-f:drivers/cpuidle/dt_idle_genpd.h
-f:drivers/cpuidle/dt_idle_states.c
-f:drivers/cpuidle/dt_idle_states.h
-f:drivers/cpuidle/governor.c
-f:drivers/cpuidle/governors/Makefile
-f:drivers/cpuidle/governors/gov.h
-f:drivers/cpuidle/governors/haltpoll.c
-f:drivers/cpuidle/governors/ladder.c
-f:drivers/cpuidle/governors/menu.c
-f:drivers/cpuidle/governors/teo.c
-f:drivers/cpuidle/poll_state.c
-f:drivers/cpuidle/sysfs.c
-f:drivers/crypto/Kconfig
-f:drivers/crypto/Makefile
-f:drivers/crypto/allwinner/Kconfig
-f:drivers/crypto/allwinner/Makefile
-f:drivers/crypto/allwinner/sun4i-ss/Makefile
-f:drivers/crypto/allwinner/sun4i-ss/sun4i-ss-cipher.c
-f:drivers/crypto/allwinner/sun4i-ss/sun4i-ss-core.c
-f:drivers/crypto/allwinner/sun4i-ss/sun4i-ss-hash.c
-f:drivers/crypto/allwinner/sun4i-ss/sun4i-ss-prng.c
-f:drivers/crypto/allwinner/sun4i-ss/sun4i-ss.h
-f:drivers/crypto/allwinner/sun8i-ce/Makefile
-f:drivers/crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c
-f:drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c
-f:drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c
-f:drivers/crypto/allwinner/sun8i-ce/sun8i-ce-prng.c
-f:drivers/crypto/allwinner/sun8i-ce/sun8i-ce-trng.c
-f:drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h
-f:drivers/crypto/allwinner/sun8i-ss/Makefile
-f:drivers/crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c
-f:drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c
-f:drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c
-f:drivers/crypto/allwinner/sun8i-ss/sun8i-ss-prng.c
-f:drivers/crypto/allwinner/sun8i-ss/sun8i-ss.h
-f:drivers/crypto/amcc/Makefile
-f:drivers/crypto/amcc/crypto4xx_alg.c
-f:drivers/crypto/amcc/crypto4xx_core.c
-f:drivers/crypto/amcc/crypto4xx_core.h
-f:drivers/crypto/amcc/crypto4xx_reg_def.h
-f:drivers/crypto/amcc/crypto4xx_sa.h
-f:drivers/crypto/amcc/crypto4xx_trng.c
-f:drivers/crypto/amcc/crypto4xx_trng.h
-f:drivers/crypto/amlogic/Kconfig
-f:drivers/crypto/amlogic/Makefile
-f:drivers/crypto/amlogic/amlogic-gxl-cipher.c
-f:drivers/crypto/amlogic/amlogic-gxl-core.c
-f:drivers/crypto/amlogic/amlogic-gxl.h
-f:drivers/crypto/aspeed/Kconfig
-f:drivers/crypto/aspeed/Makefile
-f:drivers/crypto/aspeed/aspeed-acry.c
-f:drivers/crypto/aspeed/aspeed-hace-crypto.c
-f:drivers/crypto/aspeed/aspeed-hace-hash.c
-f:drivers/crypto/aspeed/aspeed-hace.c
-f:drivers/crypto/aspeed/aspeed-hace.h
-f:drivers/crypto/atmel-aes-regs.h
-f:drivers/crypto/atmel-aes.c
-f:drivers/crypto/atmel-authenc.h
-f:drivers/crypto/atmel-ecc.c
-f:drivers/crypto/atmel-i2c.c
-f:drivers/crypto/atmel-i2c.h
-f:drivers/crypto/atmel-sha-regs.h
-f:drivers/crypto/atmel-sha.c
-f:drivers/crypto/atmel-sha204a.c
-f:drivers/crypto/atmel-tdes-regs.h
-f:drivers/crypto/atmel-tdes.c
-f:drivers/crypto/axis/Makefile
-f:drivers/crypto/axis/artpec6_crypto.c
-f:drivers/crypto/bcm/Makefile
-f:drivers/crypto/bcm/cipher.c
-f:drivers/crypto/bcm/cipher.h
-f:drivers/crypto/bcm/spu.c
-f:drivers/crypto/bcm/spu.h
-f:drivers/crypto/bcm/spu2.c
-f:drivers/crypto/bcm/spu2.h
-f:drivers/crypto/bcm/spum.h
-f:drivers/crypto/bcm/util.c
-f:drivers/crypto/bcm/util.h
-f:drivers/crypto/caam/Kconfig
-f:drivers/crypto/caam/Makefile
-f:drivers/crypto/caam/blob_gen.c
-f:drivers/crypto/caam/caamalg.c
-f:drivers/crypto/caam/caamalg_desc.c
-f:drivers/crypto/caam/caamalg_desc.h
-f:drivers/crypto/caam/caamalg_qi.c
-f:drivers/crypto/caam/caamalg_qi2.c
-f:drivers/crypto/caam/caamalg_qi2.h
-f:drivers/crypto/caam/caamhash.c
-f:drivers/crypto/caam/caamhash_desc.c
-f:drivers/crypto/caam/caamhash_desc.h
-f:drivers/crypto/caam/caampkc.c
-f:drivers/crypto/caam/caampkc.h
-f:drivers/crypto/caam/caamprng.c
-f:drivers/crypto/caam/caamrng.c
-f:drivers/crypto/caam/compat.h
-f:drivers/crypto/caam/ctrl.c
-f:drivers/crypto/caam/ctrl.h
-f:drivers/crypto/caam/debugfs.c
-f:drivers/crypto/caam/debugfs.h
-f:drivers/crypto/caam/desc.h
-f:drivers/crypto/caam/desc_constr.h
-f:drivers/crypto/caam/dpseci-debugfs.c
-f:drivers/crypto/caam/dpseci-debugfs.h
-f:drivers/crypto/caam/dpseci.c
-f:drivers/crypto/caam/dpseci.h
-f:drivers/crypto/caam/dpseci_cmd.h
-f:drivers/crypto/caam/error.c
-f:drivers/crypto/caam/error.h
-f:drivers/crypto/caam/intern.h
-f:drivers/crypto/caam/jr.c
-f:drivers/crypto/caam/jr.h
-f:drivers/crypto/caam/key_gen.c
-f:drivers/crypto/caam/key_gen.h
-f:drivers/crypto/caam/pdb.h
-f:drivers/crypto/caam/pkc_desc.c
-f:drivers/crypto/caam/qi.c
-f:drivers/crypto/caam/qi.h
-f:drivers/crypto/caam/regs.h
-f:drivers/crypto/caam/sg_sw_qm.h
-f:drivers/crypto/caam/sg_sw_qm2.h
-f:drivers/crypto/caam/sg_sw_sec4.h
-f:drivers/crypto/cavium/Makefile
-f:drivers/crypto/cavium/cpt/Kconfig
-f:drivers/crypto/cavium/cpt/Makefile
-f:drivers/crypto/cavium/cpt/cpt_common.h
-f:drivers/crypto/cavium/cpt/cpt_hw_types.h
-f:drivers/crypto/cavium/cpt/cptpf.h
-f:drivers/crypto/cavium/cpt/cptpf_main.c
-f:drivers/crypto/cavium/cpt/cptpf_mbox.c
-f:drivers/crypto/cavium/cpt/cptvf.h
-f:drivers/crypto/cavium/cpt/cptvf_algs.c
-f:drivers/crypto/cavium/cpt/cptvf_algs.h
-f:drivers/crypto/cavium/cpt/cptvf_main.c
-f:drivers/crypto/cavium/cpt/cptvf_mbox.c
-f:drivers/crypto/cavium/cpt/cptvf_reqmanager.c
-f:drivers/crypto/cavium/cpt/request_manager.h
-f:drivers/crypto/cavium/nitrox/Kconfig
-f:drivers/crypto/cavium/nitrox/Makefile
-f:drivers/crypto/cavium/nitrox/nitrox_aead.c
-f:drivers/crypto/cavium/nitrox/nitrox_algs.c
-f:drivers/crypto/cavium/nitrox/nitrox_common.h
-f:drivers/crypto/cavium/nitrox/nitrox_csr.h
-f:drivers/crypto/cavium/nitrox/nitrox_debugfs.c
-f:drivers/crypto/cavium/nitrox/nitrox_debugfs.h
-f:drivers/crypto/cavium/nitrox/nitrox_dev.h
-f:drivers/crypto/cavium/nitrox/nitrox_hal.c
-f:drivers/crypto/cavium/nitrox/nitrox_hal.h
-f:drivers/crypto/cavium/nitrox/nitrox_isr.c
-f:drivers/crypto/cavium/nitrox/nitrox_isr.h
-f:drivers/crypto/cavium/nitrox/nitrox_lib.c
-f:drivers/crypto/cavium/nitrox/nitrox_main.c
-f:drivers/crypto/cavium/nitrox/nitrox_mbx.c
-f:drivers/crypto/cavium/nitrox/nitrox_mbx.h
-f:drivers/crypto/cavium/nitrox/nitrox_req.h
-f:drivers/crypto/cavium/nitrox/nitrox_reqmgr.c
-f:drivers/crypto/cavium/nitrox/nitrox_skcipher.c
-f:drivers/crypto/cavium/nitrox/nitrox_sriov.c
-f:drivers/crypto/ccp/Kconfig
-f:drivers/crypto/ccp/Makefile
-f:drivers/crypto/ccp/ccp-crypto-aes-cmac.c
-f:drivers/crypto/ccp/ccp-crypto-aes-galois.c
-f:drivers/crypto/ccp/ccp-crypto-aes-xts.c
-f:drivers/crypto/ccp/ccp-crypto-aes.c
-f:drivers/crypto/ccp/ccp-crypto-des3.c
-f:drivers/crypto/ccp/ccp-crypto-main.c
-f:drivers/crypto/ccp/ccp-crypto-rsa.c
-f:drivers/crypto/ccp/ccp-crypto-sha.c
-f:drivers/crypto/ccp/ccp-crypto.h
-f:drivers/crypto/ccp/ccp-debugfs.c
-f:drivers/crypto/ccp/ccp-dev-v3.c
-f:drivers/crypto/ccp/ccp-dev-v5.c
-f:drivers/crypto/ccp/ccp-dev.c
-f:drivers/crypto/ccp/ccp-dev.h
-f:drivers/crypto/ccp/ccp-dmaengine.c
-f:drivers/crypto/ccp/ccp-ops.c
-f:drivers/crypto/ccp/dbc.c
-f:drivers/crypto/ccp/dbc.h
-f:drivers/crypto/ccp/hsti.c
-f:drivers/crypto/ccp/hsti.h
-f:drivers/crypto/ccp/platform-access.c
-f:drivers/crypto/ccp/platform-access.h
-f:drivers/crypto/ccp/psp-dev.c
-f:drivers/crypto/ccp/psp-dev.h
-f:drivers/crypto/ccp/sev-dev.c
-f:drivers/crypto/ccp/sev-dev.h
-f:drivers/crypto/ccp/sp-dev.c
-f:drivers/crypto/ccp/sp-dev.h
-f:drivers/crypto/ccp/sp-pci.c
-f:drivers/crypto/ccp/sp-platform.c
-f:drivers/crypto/ccp/tee-dev.c
-f:drivers/crypto/ccp/tee-dev.h
-f:drivers/crypto/ccree/Makefile
-f:drivers/crypto/ccree/cc_aead.c
-f:drivers/crypto/ccree/cc_aead.h
-f:drivers/crypto/ccree/cc_buffer_mgr.c
-f:drivers/crypto/ccree/cc_buffer_mgr.h
-f:drivers/crypto/ccree/cc_cipher.c
-f:drivers/crypto/ccree/cc_cipher.h
-f:drivers/crypto/ccree/cc_crypto_ctx.h
-f:drivers/crypto/ccree/cc_debugfs.c
-f:drivers/crypto/ccree/cc_debugfs.h
-f:drivers/crypto/ccree/cc_driver.c
-f:drivers/crypto/ccree/cc_driver.h
-f:drivers/crypto/ccree/cc_fips.c
-f:drivers/crypto/ccree/cc_fips.h
-f:drivers/crypto/ccree/cc_hash.c
-f:drivers/crypto/ccree/cc_hash.h
-f:drivers/crypto/ccree/cc_host_regs.h
-f:drivers/crypto/ccree/cc_hw_queue_defs.h
-f:drivers/crypto/ccree/cc_kernel_regs.h
-f:drivers/crypto/ccree/cc_lli_defs.h
-f:drivers/crypto/ccree/cc_pm.c
-f:drivers/crypto/ccree/cc_pm.h
-f:drivers/crypto/ccree/cc_request_mgr.c
-f:drivers/crypto/ccree/cc_request_mgr.h
-f:drivers/crypto/ccree/cc_sram_mgr.c
-f:drivers/crypto/ccree/cc_sram_mgr.h
-f:drivers/crypto/chelsio/Kconfig
-f:drivers/crypto/chelsio/Makefile
-f:drivers/crypto/chelsio/chcr_algo.c
-f:drivers/crypto/chelsio/chcr_algo.h
-f:drivers/crypto/chelsio/chcr_core.c
-f:drivers/crypto/chelsio/chcr_core.h
-f:drivers/crypto/chelsio/chcr_crypto.h
-f:drivers/crypto/exynos-rng.c
-f:drivers/crypto/gemini/Makefile
-f:drivers/crypto/gemini/sl3516-ce-cipher.c
-f:drivers/crypto/gemini/sl3516-ce-core.c
-f:drivers/crypto/gemini/sl3516-ce-rng.c
-f:drivers/crypto/gemini/sl3516-ce.h
-f:drivers/crypto/geode-aes.c
-f:drivers/crypto/geode-aes.h
-f:drivers/crypto/hifn_795x.c
-f:drivers/crypto/hisilicon/Kconfig
-f:drivers/crypto/hisilicon/Makefile
-f:drivers/crypto/hisilicon/debugfs.c
-f:drivers/crypto/hisilicon/hpre/Makefile
-f:drivers/crypto/hisilicon/hpre/hpre.h
-f:drivers/crypto/hisilicon/hpre/hpre_crypto.c
-f:drivers/crypto/hisilicon/hpre/hpre_main.c
-f:drivers/crypto/hisilicon/qm.c
-f:drivers/crypto/hisilicon/qm_common.h
-f:drivers/crypto/hisilicon/sec/Makefile
-f:drivers/crypto/hisilicon/sec/sec_algs.c
-f:drivers/crypto/hisilicon/sec/sec_drv.c
-f:drivers/crypto/hisilicon/sec/sec_drv.h
-f:drivers/crypto/hisilicon/sec2/Makefile
-f:drivers/crypto/hisilicon/sec2/sec.h
-f:drivers/crypto/hisilicon/sec2/sec_crypto.c
-f:drivers/crypto/hisilicon/sec2/sec_crypto.h
-f:drivers/crypto/hisilicon/sec2/sec_main.c
-f:drivers/crypto/hisilicon/sgl.c
-f:drivers/crypto/hisilicon/trng/Makefile
-f:drivers/crypto/hisilicon/trng/trng.c
-f:drivers/crypto/hisilicon/zip/Makefile
-f:drivers/crypto/hisilicon/zip/dae_main.c
-f:drivers/crypto/hisilicon/zip/zip.h
-f:drivers/crypto/hisilicon/zip/zip_crypto.c
-f:drivers/crypto/hisilicon/zip/zip_main.c
-f:drivers/crypto/img-hash.c
-f:drivers/crypto/inside-secure/Makefile
-f:drivers/crypto/inside-secure/eip93/Kconfig
-f:drivers/crypto/inside-secure/eip93/Makefile
-f:drivers/crypto/inside-secure/eip93/eip93-aead.c
-f:drivers/crypto/inside-secure/eip93/eip93-aead.h
-f:drivers/crypto/inside-secure/eip93/eip93-aes.h
-f:drivers/crypto/inside-secure/eip93/eip93-cipher.c
-f:drivers/crypto/inside-secure/eip93/eip93-cipher.h
-f:drivers/crypto/inside-secure/eip93/eip93-common.c
-f:drivers/crypto/inside-secure/eip93/eip93-common.h
-f:drivers/crypto/inside-secure/eip93/eip93-des.h
-f:drivers/crypto/inside-secure/eip93/eip93-hash.c
-f:drivers/crypto/inside-secure/eip93/eip93-hash.h
-f:drivers/crypto/inside-secure/eip93/eip93-main.c
-f:drivers/crypto/inside-secure/eip93/eip93-main.h
-f:drivers/crypto/inside-secure/eip93/eip93-regs.h
-f:drivers/crypto/inside-secure/safexcel.c
-f:drivers/crypto/inside-secure/safexcel.h
-f:drivers/crypto/inside-secure/safexcel_cipher.c
-f:drivers/crypto/inside-secure/safexcel_hash.c
-f:drivers/crypto/inside-secure/safexcel_ring.c
-f:drivers/crypto/intel/Kconfig
-f:drivers/crypto/intel/Makefile
-f:drivers/crypto/intel/iaa/Kconfig
-f:drivers/crypto/intel/iaa/Makefile
-f:drivers/crypto/intel/iaa/iaa_crypto.h
-f:drivers/crypto/intel/iaa/iaa_crypto_comp_fixed.c
-f:drivers/crypto/intel/iaa/iaa_crypto_main.c
-f:drivers/crypto/intel/iaa/iaa_crypto_stats.c
-f:drivers/crypto/intel/iaa/iaa_crypto_stats.h
-f:drivers/crypto/intel/ixp4xx/Kconfig
-f:drivers/crypto/intel/ixp4xx/Makefile
-f:drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c
-f:drivers/crypto/intel/keembay/Kconfig
-f:drivers/crypto/intel/keembay/Makefile
-f:drivers/crypto/intel/keembay/keembay-ocs-aes-core.c
-f:drivers/crypto/intel/keembay/keembay-ocs-ecc.c
-f:drivers/crypto/intel/keembay/keembay-ocs-hcu-core.c
-f:drivers/crypto/intel/keembay/ocs-aes.c
-f:drivers/crypto/intel/keembay/ocs-aes.h
-f:drivers/crypto/intel/keembay/ocs-hcu.c
-f:drivers/crypto/intel/keembay/ocs-hcu.h
-f:drivers/crypto/intel/qat/Kconfig
-f:drivers/crypto/intel/qat/Makefile
-f:drivers/crypto/intel/qat/qat_420xx/Makefile
-f:drivers/crypto/intel/qat/qat_420xx/adf_420xx_hw_data.c
-f:drivers/crypto/intel/qat/qat_420xx/adf_420xx_hw_data.h
-f:drivers/crypto/intel/qat/qat_420xx/adf_drv.c
-f:drivers/crypto/intel/qat/qat_4xxx/Makefile
-f:drivers/crypto/intel/qat/qat_4xxx/adf_4xxx_hw_data.c
-f:drivers/crypto/intel/qat/qat_4xxx/adf_4xxx_hw_data.h
-f:drivers/crypto/intel/qat/qat_4xxx/adf_drv.c
-f:drivers/crypto/intel/qat/qat_6xxx/Makefile
-f:drivers/crypto/intel/qat/qat_6xxx/adf_6xxx_hw_data.c
-f:drivers/crypto/intel/qat/qat_6xxx/adf_6xxx_hw_data.h
-f:drivers/crypto/intel/qat/qat_6xxx/adf_drv.c
-f:drivers/crypto/intel/qat/qat_c3xxx/Makefile
-f:drivers/crypto/intel/qat/qat_c3xxx/adf_c3xxx_hw_data.c
-f:drivers/crypto/intel/qat/qat_c3xxx/adf_c3xxx_hw_data.h
-f:drivers/crypto/intel/qat/qat_c3xxx/adf_drv.c
-f:drivers/crypto/intel/qat/qat_c3xxxvf/Makefile
-f:drivers/crypto/intel/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.c
-f:drivers/crypto/intel/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.h
-f:drivers/crypto/intel/qat/qat_c3xxxvf/adf_drv.c
-f:drivers/crypto/intel/qat/qat_c62x/Makefile
-f:drivers/crypto/intel/qat/qat_c62x/adf_c62x_hw_data.c
-f:drivers/crypto/intel/qat/qat_c62x/adf_c62x_hw_data.h
-f:drivers/crypto/intel/qat/qat_c62x/adf_drv.c
-f:drivers/crypto/intel/qat/qat_c62xvf/Makefile
-f:drivers/crypto/intel/qat/qat_c62xvf/adf_c62xvf_hw_data.c
-f:drivers/crypto/intel/qat/qat_c62xvf/adf_c62xvf_hw_data.h
-f:drivers/crypto/intel/qat/qat_c62xvf/adf_drv.c
-f:drivers/crypto/intel/qat/qat_common/Makefile
-f:drivers/crypto/intel/qat/qat_common/adf_accel_devices.h
-f:drivers/crypto/intel/qat/qat_common/adf_accel_engine.c
-f:drivers/crypto/intel/qat/qat_common/adf_admin.c
-f:drivers/crypto/intel/qat/qat_common/adf_admin.h
-f:drivers/crypto/intel/qat/qat_common/adf_aer.c
-f:drivers/crypto/intel/qat/qat_common/adf_bank_state.c
-f:drivers/crypto/intel/qat/qat_common/adf_bank_state.h
-f:drivers/crypto/intel/qat/qat_common/adf_cfg.c
-f:drivers/crypto/intel/qat/qat_common/adf_cfg.h
-f:drivers/crypto/intel/qat/qat_common/adf_cfg_common.h
-f:drivers/crypto/intel/qat/qat_common/adf_cfg_services.c
-f:drivers/crypto/intel/qat/qat_common/adf_cfg_services.h
-f:drivers/crypto/intel/qat/qat_common/adf_cfg_strings.h
-f:drivers/crypto/intel/qat/qat_common/adf_cfg_user.h
-f:drivers/crypto/intel/qat/qat_common/adf_clock.c
-f:drivers/crypto/intel/qat/qat_common/adf_clock.h
-f:drivers/crypto/intel/qat/qat_common/adf_cnv_dbgfs.c
-f:drivers/crypto/intel/qat/qat_common/adf_cnv_dbgfs.h
-f:drivers/crypto/intel/qat/qat_common/adf_common_drv.h
-f:drivers/crypto/intel/qat/qat_common/adf_ctl_drv.c
-f:drivers/crypto/intel/qat/qat_common/adf_dbgfs.c
-f:drivers/crypto/intel/qat/qat_common/adf_dbgfs.h
-f:drivers/crypto/intel/qat/qat_common/adf_dc.c
-f:drivers/crypto/intel/qat/qat_common/adf_dc.h
-f:drivers/crypto/intel/qat/qat_common/adf_dev_mgr.c
-f:drivers/crypto/intel/qat/qat_common/adf_fw_config.h
-f:drivers/crypto/intel/qat/qat_common/adf_fw_counters.c
-f:drivers/crypto/intel/qat/qat_common/adf_fw_counters.h
-f:drivers/crypto/intel/qat/qat_common/adf_gen2_config.c
-f:drivers/crypto/intel/qat/qat_common/adf_gen2_config.h
-f:drivers/crypto/intel/qat/qat_common/adf_gen2_hw_csr_data.c
-f:drivers/crypto/intel/qat/qat_common/adf_gen2_hw_csr_data.h
-f:drivers/crypto/intel/qat/qat_common/adf_gen2_hw_data.c
-f:drivers/crypto/intel/qat/qat_common/adf_gen2_hw_data.h
-f:drivers/crypto/intel/qat/qat_common/adf_gen2_pfvf.c
-f:drivers/crypto/intel/qat/qat_common/adf_gen2_pfvf.h
-f:drivers/crypto/intel/qat/qat_common/adf_gen4_config.c
-f:drivers/crypto/intel/qat/qat_common/adf_gen4_config.h
-f:drivers/crypto/intel/qat/qat_common/adf_gen4_hw_csr_data.c
-f:drivers/crypto/intel/qat/qat_common/adf_gen4_hw_csr_data.h
-f:drivers/crypto/intel/qat/qat_common/adf_gen4_hw_data.c
-f:drivers/crypto/intel/qat/qat_common/adf_gen4_hw_data.h
-f:drivers/crypto/intel/qat/qat_common/adf_gen4_pfvf.c
-f:drivers/crypto/intel/qat/qat_common/adf_gen4_pfvf.h
-f:drivers/crypto/intel/qat/qat_common/adf_gen4_pm.c
-f:drivers/crypto/intel/qat/qat_common/adf_gen4_pm.h
-f:drivers/crypto/intel/qat/qat_common/adf_gen4_pm_debugfs.c
-f:drivers/crypto/intel/qat/qat_common/adf_gen4_ras.c
-f:drivers/crypto/intel/qat/qat_common/adf_gen4_ras.h
-f:drivers/crypto/intel/qat/qat_common/adf_gen4_tl.c
-f:drivers/crypto/intel/qat/qat_common/adf_gen4_tl.h
-f:drivers/crypto/intel/qat/qat_common/adf_gen4_vf_mig.c
-f:drivers/crypto/intel/qat/qat_common/adf_gen4_vf_mig.h
-f:drivers/crypto/intel/qat/qat_common/adf_gen6_pm.h
-f:drivers/crypto/intel/qat/qat_common/adf_gen6_pm_dbgfs.c
-f:drivers/crypto/intel/qat/qat_common/adf_gen6_ras.c
-f:drivers/crypto/intel/qat/qat_common/adf_gen6_ras.h
-f:drivers/crypto/intel/qat/qat_common/adf_gen6_shared.c
-f:drivers/crypto/intel/qat/qat_common/adf_gen6_shared.h
-f:drivers/crypto/intel/qat/qat_common/adf_gen6_tl.c
-f:drivers/crypto/intel/qat/qat_common/adf_gen6_tl.h
-f:drivers/crypto/intel/qat/qat_common/adf_heartbeat.c
-f:drivers/crypto/intel/qat/qat_common/adf_heartbeat.h
-f:drivers/crypto/intel/qat/qat_common/adf_heartbeat_dbgfs.c
-f:drivers/crypto/intel/qat/qat_common/adf_heartbeat_dbgfs.h
-f:drivers/crypto/intel/qat/qat_common/adf_heartbeat_inject.c
-f:drivers/crypto/intel/qat/qat_common/adf_hw_arbiter.c
-f:drivers/crypto/intel/qat/qat_common/adf_init.c
-f:drivers/crypto/intel/qat/qat_common/adf_isr.c
-f:drivers/crypto/intel/qat/qat_common/adf_mstate_mgr.c
-f:drivers/crypto/intel/qat/qat_common/adf_mstate_mgr.h
-f:drivers/crypto/intel/qat/qat_common/adf_pfvf_msg.h
-f:drivers/crypto/intel/qat/qat_common/adf_pfvf_pf_msg.c
-f:drivers/crypto/intel/qat/qat_common/adf_pfvf_pf_msg.h
-f:drivers/crypto/intel/qat/qat_common/adf_pfvf_pf_proto.c
-f:drivers/crypto/intel/qat/qat_common/adf_pfvf_pf_proto.h
-f:drivers/crypto/intel/qat/qat_common/adf_pfvf_utils.c
-f:drivers/crypto/intel/qat/qat_common/adf_pfvf_utils.h
-f:drivers/crypto/intel/qat/qat_common/adf_pfvf_vf_msg.c
-f:drivers/crypto/intel/qat/qat_common/adf_pfvf_vf_msg.h
-f:drivers/crypto/intel/qat/qat_common/adf_pfvf_vf_proto.c
-f:drivers/crypto/intel/qat/qat_common/adf_pfvf_vf_proto.h
-f:drivers/crypto/intel/qat/qat_common/adf_pm_dbgfs.c
-f:drivers/crypto/intel/qat/qat_common/adf_pm_dbgfs.h
-f:drivers/crypto/intel/qat/qat_common/adf_pm_dbgfs_utils.c
-f:drivers/crypto/intel/qat/qat_common/adf_pm_dbgfs_utils.h
-f:drivers/crypto/intel/qat/qat_common/adf_rl.c
-f:drivers/crypto/intel/qat/qat_common/adf_rl.h
-f:drivers/crypto/intel/qat/qat_common/adf_rl_admin.c
-f:drivers/crypto/intel/qat/qat_common/adf_rl_admin.h
-f:drivers/crypto/intel/qat/qat_common/adf_sriov.c
-f:drivers/crypto/intel/qat/qat_common/adf_sysfs.c
-f:drivers/crypto/intel/qat/qat_common/adf_sysfs_ras_counters.c
-f:drivers/crypto/intel/qat/qat_common/adf_sysfs_ras_counters.h
-f:drivers/crypto/intel/qat/qat_common/adf_sysfs_rl.c
-f:drivers/crypto/intel/qat/qat_common/adf_sysfs_rl.h
-f:drivers/crypto/intel/qat/qat_common/adf_telemetry.c
-f:drivers/crypto/intel/qat/qat_common/adf_telemetry.h
-f:drivers/crypto/intel/qat/qat_common/adf_timer.c
-f:drivers/crypto/intel/qat/qat_common/adf_timer.h
-f:drivers/crypto/intel/qat/qat_common/adf_tl_debugfs.c
-f:drivers/crypto/intel/qat/qat_common/adf_tl_debugfs.h
-f:drivers/crypto/intel/qat/qat_common/adf_transport.c
-f:drivers/crypto/intel/qat/qat_common/adf_transport.h
-f:drivers/crypto/intel/qat/qat_common/adf_transport_access_macros.h
-f:drivers/crypto/intel/qat/qat_common/adf_transport_debug.c
-f:drivers/crypto/intel/qat/qat_common/adf_transport_internal.h
-f:drivers/crypto/intel/qat/qat_common/adf_vf_isr.c
-f:drivers/crypto/intel/qat/qat_common/icp_qat_fw.h
-f:drivers/crypto/intel/qat/qat_common/icp_qat_fw_comp.h
-f:drivers/crypto/intel/qat/qat_common/icp_qat_fw_init_admin.h
-f:drivers/crypto/intel/qat/qat_common/icp_qat_fw_la.h
-f:drivers/crypto/intel/qat/qat_common/icp_qat_fw_loader_handle.h
-f:drivers/crypto/intel/qat/qat_common/icp_qat_fw_pke.h
-f:drivers/crypto/intel/qat/qat_common/icp_qat_hal.h
-f:drivers/crypto/intel/qat/qat_common/icp_qat_hw.h
-f:drivers/crypto/intel/qat/qat_common/icp_qat_hw_20_comp.h
-f:drivers/crypto/intel/qat/qat_common/icp_qat_hw_20_comp_defs.h
-f:drivers/crypto/intel/qat/qat_common/icp_qat_hw_51_comp.h
-f:drivers/crypto/intel/qat/qat_common/icp_qat_hw_51_comp_defs.h
-f:drivers/crypto/intel/qat/qat_common/icp_qat_uclo.h
-f:drivers/crypto/intel/qat/qat_common/qat_algs.c
-f:drivers/crypto/intel/qat/qat_common/qat_algs_send.c
-f:drivers/crypto/intel/qat/qat_common/qat_algs_send.h
-f:drivers/crypto/intel/qat/qat_common/qat_asym_algs.c
-f:drivers/crypto/intel/qat/qat_common/qat_bl.c
-f:drivers/crypto/intel/qat/qat_common/qat_bl.h
-f:drivers/crypto/intel/qat/qat_common/qat_comp_algs.c
-f:drivers/crypto/intel/qat/qat_common/qat_comp_req.h
-f:drivers/crypto/intel/qat/qat_common/qat_compression.c
-f:drivers/crypto/intel/qat/qat_common/qat_compression.h
-f:drivers/crypto/intel/qat/qat_common/qat_crypto.c
-f:drivers/crypto/intel/qat/qat_common/qat_crypto.h
-f:drivers/crypto/intel/qat/qat_common/qat_hal.c
-f:drivers/crypto/intel/qat/qat_common/qat_mig_dev.c
-f:drivers/crypto/intel/qat/qat_common/qat_uclo.c
-f:drivers/crypto/intel/qat/qat_dh895xcc/Makefile
-f:drivers/crypto/intel/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c
-f:drivers/crypto/intel/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h
-f:drivers/crypto/intel/qat/qat_dh895xcc/adf_drv.c
-f:drivers/crypto/intel/qat/qat_dh895xccvf/Makefile
-f:drivers/crypto/intel/qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.c
-f:drivers/crypto/intel/qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.h
-f:drivers/crypto/intel/qat/qat_dh895xccvf/adf_drv.c
-f:drivers/crypto/marvell/Kconfig
-f:drivers/crypto/marvell/Makefile
-f:drivers/crypto/marvell/cesa/Makefile
-f:drivers/crypto/marvell/cesa/cesa.c
-f:drivers/crypto/marvell/cesa/cesa.h
-f:drivers/crypto/marvell/cesa/cipher.c
-f:drivers/crypto/marvell/cesa/hash.c
-f:drivers/crypto/marvell/cesa/tdma.c
-f:drivers/crypto/marvell/octeontx/Makefile
-f:drivers/crypto/marvell/octeontx/otx_cpt_common.h
-f:drivers/crypto/marvell/octeontx/otx_cpt_hw_types.h
-f:drivers/crypto/marvell/octeontx/otx_cptpf.h
-f:drivers/crypto/marvell/octeontx/otx_cptpf_main.c
-f:drivers/crypto/marvell/octeontx/otx_cptpf_mbox.c
-f:drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c
-f:drivers/crypto/marvell/octeontx/otx_cptpf_ucode.h
-f:drivers/crypto/marvell/octeontx/otx_cptvf.h
-f:drivers/crypto/marvell/octeontx/otx_cptvf_algs.c
-f:drivers/crypto/marvell/octeontx/otx_cptvf_algs.h
-f:drivers/crypto/marvell/octeontx/otx_cptvf_main.c
-f:drivers/crypto/marvell/octeontx/otx_cptvf_mbox.c
-f:drivers/crypto/marvell/octeontx/otx_cptvf_reqmgr.c
-f:drivers/crypto/marvell/octeontx/otx_cptvf_reqmgr.h
-f:drivers/crypto/marvell/octeontx2/Makefile
-f:drivers/crypto/marvell/octeontx2/cn10k_cpt.c
-f:drivers/crypto/marvell/octeontx2/cn10k_cpt.h
-f:drivers/crypto/marvell/octeontx2/otx2_cpt_common.h
-f:drivers/crypto/marvell/octeontx2/otx2_cpt_devlink.c
-f:drivers/crypto/marvell/octeontx2/otx2_cpt_devlink.h
-f:drivers/crypto/marvell/octeontx2/otx2_cpt_hw_types.h
-f:drivers/crypto/marvell/octeontx2/otx2_cpt_mbox_common.c
-f:drivers/crypto/marvell/octeontx2/otx2_cpt_reqmgr.h
-f:drivers/crypto/marvell/octeontx2/otx2_cptlf.c
-f:drivers/crypto/marvell/octeontx2/otx2_cptlf.h
-f:drivers/crypto/marvell/octeontx2/otx2_cptpf.h
-f:drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c
-f:drivers/crypto/marvell/octeontx2/otx2_cptpf_mbox.c
-f:drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c
-f:drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.h
-f:drivers/crypto/marvell/octeontx2/otx2_cptvf.h
-f:drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.c
-f:drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.h
-f:drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c
-f:drivers/crypto/marvell/octeontx2/otx2_cptvf_mbox.c
-f:drivers/crypto/marvell/octeontx2/otx2_cptvf_reqmgr.c
-f:drivers/crypto/mxs-dcp.c
-f:drivers/crypto/nx/Kconfig
-f:drivers/crypto/nx/Makefile
-f:drivers/crypto/nx/nx-842.c
-f:drivers/crypto/nx/nx-842.h
-f:drivers/crypto/nx/nx-aes-cbc.c
-f:drivers/crypto/nx/nx-aes-ccm.c
-f:drivers/crypto/nx/nx-aes-ctr.c
-f:drivers/crypto/nx/nx-aes-ecb.c
-f:drivers/crypto/nx/nx-aes-gcm.c
-f:drivers/crypto/nx/nx-aes-xcbc.c
-f:drivers/crypto/nx/nx-common-powernv.c
-f:drivers/crypto/nx/nx-common-pseries.c
-f:drivers/crypto/nx/nx-sha256.c
-f:drivers/crypto/nx/nx-sha512.c
-f:drivers/crypto/nx/nx.c
-f:drivers/crypto/nx/nx.h
-f:drivers/crypto/nx/nx_csbcpb.h
-f:drivers/crypto/nx/nx_debugfs.c
-f:drivers/crypto/omap-aes-gcm.c
-f:drivers/crypto/omap-aes.c
-f:drivers/crypto/omap-aes.h
-f:drivers/crypto/omap-crypto.c
-f:drivers/crypto/omap-crypto.h
-f:drivers/crypto/omap-des.c
-f:drivers/crypto/omap-sham.c
-f:drivers/crypto/padlock-aes.c
-f:drivers/crypto/padlock-sha.c
-f:drivers/crypto/qce/Makefile
-f:drivers/crypto/qce/aead.c
-f:drivers/crypto/qce/aead.h
-f:drivers/crypto/qce/cipher.h
-f:drivers/crypto/qce/common.c
-f:drivers/crypto/qce/common.h
-f:drivers/crypto/qce/core.c
-f:drivers/crypto/qce/core.h
-f:drivers/crypto/qce/dma.c
-f:drivers/crypto/qce/dma.h
-f:drivers/crypto/qce/regs-v5.h
-f:drivers/crypto/qce/sha.c
-f:drivers/crypto/qce/sha.h
-f:drivers/crypto/qce/skcipher.c
-f:drivers/crypto/qcom-rng.c
-f:drivers/crypto/rockchip/Makefile
-f:drivers/crypto/rockchip/rk3288_crypto.c
-f:drivers/crypto/rockchip/rk3288_crypto.h
-f:drivers/crypto/rockchip/rk3288_crypto_ahash.c
-f:drivers/crypto/rockchip/rk3288_crypto_skcipher.c
-f:drivers/crypto/s5p-sss.c
-f:drivers/crypto/sa2ul.c
-f:drivers/crypto/sa2ul.h
-f:drivers/crypto/sahara.c
-f:drivers/crypto/starfive/Kconfig
-f:drivers/crypto/starfive/Makefile
-f:drivers/crypto/starfive/jh7110-aes.c
-f:drivers/crypto/starfive/jh7110-cryp.c
-f:drivers/crypto/starfive/jh7110-cryp.h
-f:drivers/crypto/starfive/jh7110-hash.c
-f:drivers/crypto/starfive/jh7110-rsa.c
-f:drivers/crypto/stm32/Kconfig
-f:drivers/crypto/stm32/Makefile
-f:drivers/crypto/stm32/stm32-cryp.c
-f:drivers/crypto/stm32/stm32-hash.c
-f:drivers/crypto/talitos.c
-f:drivers/crypto/talitos.h
-f:drivers/crypto/tegra/Makefile
-f:drivers/crypto/tegra/tegra-se-aes.c
-f:drivers/crypto/tegra/tegra-se-hash.c
-f:drivers/crypto/tegra/tegra-se-key.c
-f:drivers/crypto/tegra/tegra-se-main.c
-f:drivers/crypto/tegra/tegra-se.h
-f:drivers/crypto/virtio/Kconfig
-f:drivers/crypto/virtio/Makefile
-f:drivers/crypto/virtio/virtio_crypto_akcipher_algs.c
-f:drivers/crypto/virtio/virtio_crypto_common.h
-f:drivers/crypto/virtio/virtio_crypto_core.c
-f:drivers/crypto/virtio/virtio_crypto_mgr.c
-f:drivers/crypto/virtio/virtio_crypto_skcipher_algs.c
-f:drivers/crypto/xilinx/Makefile
-f:drivers/crypto/xilinx/zynqmp-aes-gcm.c
-f:drivers/crypto/xilinx/zynqmp-sha.c
-f:drivers/cxl/Kconfig
-f:drivers/cxl/Makefile
-f:drivers/cxl/acpi.c
-f:drivers/cxl/core/Makefile
-f:drivers/cxl/core/acpi.c
-f:drivers/cxl/core/cdat.c
-f:drivers/cxl/core/core.h
-f:drivers/cxl/core/edac.c
-f:drivers/cxl/core/features.c
-f:drivers/cxl/core/hdm.c
-f:drivers/cxl/core/mbox.c
-f:drivers/cxl/core/mce.c
-f:drivers/cxl/core/mce.h
-f:drivers/cxl/core/memdev.c
-f:drivers/cxl/core/pci.c
-f:drivers/cxl/core/pmem.c
-f:drivers/cxl/core/pmu.c
-f:drivers/cxl/core/port.c
-f:drivers/cxl/core/ras.c
-f:drivers/cxl/core/region.c
-f:drivers/cxl/core/regs.c
-f:drivers/cxl/core/suspend.c
-f:drivers/cxl/core/trace.c
-f:drivers/cxl/core/trace.h
-f:drivers/cxl/cxl.h
-f:drivers/cxl/cxlmem.h
-f:drivers/cxl/cxlpci.h
-f:drivers/cxl/mem.c
-f:drivers/cxl/pci.c
-f:drivers/cxl/pmem.c
-f:drivers/cxl/pmu.h
-f:drivers/cxl/port.c
-f:drivers/cxl/security.c
-f:drivers/dax/Kconfig
-f:drivers/dax/Makefile
-f:drivers/dax/bus.c
-f:drivers/dax/bus.h
-f:drivers/dax/cxl.c
-f:drivers/dax/dax-private.h
-f:drivers/dax/device.c
-f:drivers/dax/hmem/Makefile
-f:drivers/dax/hmem/device.c
-f:drivers/dax/hmem/hmem.c
-f:drivers/dax/kmem.c
-f:drivers/dax/pmem.c
-f:drivers/dax/super.c
-f:drivers/dca/Kconfig
-f:drivers/dca/Makefile
-f:drivers/dca/dca-core.c
-f:drivers/dca/dca-sysfs.c
-f:drivers/devfreq/Kconfig
-f:drivers/devfreq/Makefile
-f:drivers/devfreq/devfreq-event.c
-f:drivers/devfreq/devfreq.c
-f:drivers/devfreq/event/Kconfig
-f:drivers/devfreq/event/Makefile
-f:drivers/devfreq/event/exynos-nocp.c
-f:drivers/devfreq/event/exynos-nocp.h
-f:drivers/devfreq/event/exynos-ppmu.c
-f:drivers/devfreq/event/exynos-ppmu.h
-f:drivers/devfreq/event/rockchip-dfi.c
-f:drivers/devfreq/exynos-bus.c
-f:drivers/devfreq/governor.h
-f:drivers/devfreq/governor_passive.c
-f:drivers/devfreq/governor_performance.c
-f:drivers/devfreq/governor_powersave.c
-f:drivers/devfreq/governor_simpleondemand.c
-f:drivers/devfreq/governor_userspace.c
-f:drivers/devfreq/hisi_uncore_freq.c
-f:drivers/devfreq/imx-bus.c
-f:drivers/devfreq/imx8m-ddrc.c
-f:drivers/devfreq/mtk-cci-devfreq.c
-f:drivers/devfreq/rk3399_dmc.c
-f:drivers/devfreq/sun8i-a33-mbus.c
-f:drivers/devfreq/tegra30-devfreq.c
-f:drivers/dio/Makefile
-f:drivers/dio/dio-driver.c
-f:drivers/dio/dio-sysfs.c
-f:drivers/dio/dio.c
-f:drivers/dma-buf/Kconfig
-f:drivers/dma-buf/Makefile
-f:drivers/dma-buf/dma-buf-sysfs-stats.c
-f:drivers/dma-buf/dma-buf-sysfs-stats.h
-f:drivers/dma-buf/dma-buf.c
-f:drivers/dma-buf/dma-fence-array.c
-f:drivers/dma-buf/dma-fence-chain.c
-f:drivers/dma-buf/dma-fence-unwrap.c
-f:drivers/dma-buf/dma-fence.c
-f:drivers/dma-buf/dma-heap.c
-f:drivers/dma-buf/dma-resv.c
-f:drivers/dma-buf/heaps/Kconfig
-f:drivers/dma-buf/heaps/Makefile
-f:drivers/dma-buf/heaps/cma_heap.c
-f:drivers/dma-buf/heaps/system_heap.c
-f:drivers/dma-buf/selftest.c
-f:drivers/dma-buf/selftest.h
-f:drivers/dma-buf/selftests.h
-f:drivers/dma-buf/st-dma-fence-chain.c
-f:drivers/dma-buf/st-dma-fence-unwrap.c
-f:drivers/dma-buf/st-dma-fence.c
-f:drivers/dma-buf/st-dma-resv.c
-f:drivers/dma-buf/sw_sync.c
-f:drivers/dma-buf/sync_debug.c
-f:drivers/dma-buf/sync_debug.h
-f:drivers/dma-buf/sync_file.c
-f:drivers/dma-buf/sync_trace.h
-f:drivers/dma-buf/udmabuf.c
-f:drivers/dma/Kconfig
-f:drivers/dma/Makefile
-f:drivers/dma/TODO
-f:drivers/dma/acpi-dma.c
-f:drivers/dma/altera-msgdma.c
-f:drivers/dma/amba-pl08x.c
-f:drivers/dma/amd/Kconfig
-f:drivers/dma/amd/Makefile
-f:drivers/dma/amd/ae4dma/Makefile
-f:drivers/dma/amd/ae4dma/ae4dma-dev.c
-f:drivers/dma/amd/ae4dma/ae4dma-pci.c
-f:drivers/dma/amd/ae4dma/ae4dma.h
-f:drivers/dma/amd/ptdma/Makefile
-f:drivers/dma/amd/ptdma/ptdma-debugfs.c
-f:drivers/dma/amd/ptdma/ptdma-dev.c
-f:drivers/dma/amd/ptdma/ptdma-dmaengine.c
-f:drivers/dma/amd/ptdma/ptdma-pci.c
-f:drivers/dma/amd/ptdma/ptdma.h
-f:drivers/dma/amd/qdma/Makefile
-f:drivers/dma/amd/qdma/qdma-comm-regs.c
-f:drivers/dma/amd/qdma/qdma.c
-f:drivers/dma/amd/qdma/qdma.h
-f:drivers/dma/apple-admac.c
-f:drivers/dma/arm-dma350.c
-f:drivers/dma/at_hdmac.c
-f:drivers/dma/at_xdmac.c
-f:drivers/dma/bcm-sba-raid.c
-f:drivers/dma/bcm2835-dma.c
-f:drivers/dma/bestcomm/Kconfig
-f:drivers/dma/bestcomm/Makefile
-f:drivers/dma/bestcomm/ata.c
-f:drivers/dma/bestcomm/bcom_ata_task.c
-f:drivers/dma/bestcomm/bcom_fec_rx_task.c
-f:drivers/dma/bestcomm/bcom_fec_tx_task.c
-f:drivers/dma/bestcomm/bcom_gen_bd_rx_task.c
-f:drivers/dma/bestcomm/bcom_gen_bd_tx_task.c
-f:drivers/dma/bestcomm/bestcomm.c
-f:drivers/dma/bestcomm/fec.c
-f:drivers/dma/bestcomm/gen_bd.c
-f:drivers/dma/bestcomm/sram.c
-f:drivers/dma/dma-axi-dmac.c
-f:drivers/dma/dma-jz4780.c
-f:drivers/dma/dmaengine.c
-f:drivers/dma/dmaengine.h
-f:drivers/dma/dmatest.c
-f:drivers/dma/dw-axi-dmac/Makefile
-f:drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
-f:drivers/dma/dw-axi-dmac/dw-axi-dmac.h
-f:drivers/dma/dw-edma/Kconfig
-f:drivers/dma/dw-edma/Makefile
-f:drivers/dma/dw-edma/dw-edma-core.c
-f:drivers/dma/dw-edma/dw-edma-core.h
-f:drivers/dma/dw-edma/dw-edma-pcie.c
-f:drivers/dma/dw-edma/dw-edma-v0-core.c
-f:drivers/dma/dw-edma/dw-edma-v0-core.h
-f:drivers/dma/dw-edma/dw-edma-v0-debugfs.c
-f:drivers/dma/dw-edma/dw-edma-v0-debugfs.h
-f:drivers/dma/dw-edma/dw-edma-v0-regs.h
-f:drivers/dma/dw-edma/dw-hdma-v0-core.c
-f:drivers/dma/dw-edma/dw-hdma-v0-core.h
-f:drivers/dma/dw-edma/dw-hdma-v0-debugfs.c
-f:drivers/dma/dw-edma/dw-hdma-v0-debugfs.h
-f:drivers/dma/dw-edma/dw-hdma-v0-regs.h
-f:drivers/dma/dw/Kconfig
-f:drivers/dma/dw/Makefile
-f:drivers/dma/dw/acpi.c
-f:drivers/dma/dw/core.c
-f:drivers/dma/dw/dw.c
-f:drivers/dma/dw/idma32.c
-f:drivers/dma/dw/internal.h
-f:drivers/dma/dw/of.c
-f:drivers/dma/dw/pci.c
-f:drivers/dma/dw/platform.c
-f:drivers/dma/dw/regs.h
-f:drivers/dma/dw/rzn1-dmamux.c
-f:drivers/dma/ep93xx_dma.c
-f:drivers/dma/fsl-dpaa2-qdma/Kconfig
-f:drivers/dma/fsl-dpaa2-qdma/Makefile
-f:drivers/dma/fsl-dpaa2-qdma/dpaa2-qdma.c
-f:drivers/dma/fsl-dpaa2-qdma/dpaa2-qdma.h
-f:drivers/dma/fsl-dpaa2-qdma/dpdmai.c
-f:drivers/dma/fsl-dpaa2-qdma/dpdmai.h
-f:drivers/dma/fsl-edma-common.c
-f:drivers/dma/fsl-edma-common.h
-f:drivers/dma/fsl-edma-main.c
-f:drivers/dma/fsl-edma-trace.c
-f:drivers/dma/fsl-edma-trace.h
-f:drivers/dma/fsl-qdma.c
-f:drivers/dma/fsl_raid.c
-f:drivers/dma/fsl_raid.h
-f:drivers/dma/fsldma.c
-f:drivers/dma/fsldma.h
-f:drivers/dma/hisi_dma.c
-f:drivers/dma/hsu/Kconfig
-f:drivers/dma/hsu/Makefile
-f:drivers/dma/hsu/hsu.c
-f:drivers/dma/hsu/hsu.h
-f:drivers/dma/hsu/pci.c
-f:drivers/dma/idma64.c
-f:drivers/dma/idma64.h
-f:drivers/dma/idxd/Makefile
-f:drivers/dma/idxd/bus.c
-f:drivers/dma/idxd/cdev.c
-f:drivers/dma/idxd/compat.c
-f:drivers/dma/idxd/debugfs.c
-f:drivers/dma/idxd/defaults.c
-f:drivers/dma/idxd/device.c
-f:drivers/dma/idxd/dma.c
-f:drivers/dma/idxd/idxd.h
-f:drivers/dma/idxd/init.c
-f:drivers/dma/idxd/irq.c
-f:drivers/dma/idxd/perfmon.c
-f:drivers/dma/idxd/perfmon.h
-f:drivers/dma/idxd/registers.h
-f:drivers/dma/idxd/submit.c
-f:drivers/dma/idxd/sysfs.c
-f:drivers/dma/img-mdc-dma.c
-f:drivers/dma/imx-dma.c
-f:drivers/dma/imx-sdma.c
-f:drivers/dma/ioat/Makefile
-f:drivers/dma/ioat/dca.c
-f:drivers/dma/ioat/dma.c
-f:drivers/dma/ioat/dma.h
-f:drivers/dma/ioat/hw.h
-f:drivers/dma/ioat/init.c
-f:drivers/dma/ioat/prep.c
-f:drivers/dma/ioat/registers.h
-f:drivers/dma/ioat/sysfs.c
-f:drivers/dma/k3dma.c
-f:drivers/dma/lgm/Kconfig
-f:drivers/dma/lgm/Makefile
-f:drivers/dma/lgm/lgm-dma.c
-f:drivers/dma/loongson1-apb-dma.c
-f:drivers/dma/loongson2-apb-dma.c
-f:drivers/dma/lpc18xx-dmamux.c
-f:drivers/dma/lpc32xx-dmamux.c
-f:drivers/dma/mcf-edma-main.c
-f:drivers/dma/mediatek/Kconfig
-f:drivers/dma/mediatek/Makefile
-f:drivers/dma/mediatek/mtk-cqdma.c
-f:drivers/dma/mediatek/mtk-hsdma.c
-f:drivers/dma/mediatek/mtk-uart-apdma.c
-f:drivers/dma/milbeaut-hdmac.c
-f:drivers/dma/milbeaut-xdmac.c
-f:drivers/dma/mmp_pdma.c
-f:drivers/dma/mmp_tdma.c
-f:drivers/dma/moxart-dma.c
-f:drivers/dma/mpc512x_dma.c
-f:drivers/dma/mv_xor.c
-f:drivers/dma/mv_xor.h
-f:drivers/dma/mv_xor_v2.c
-f:drivers/dma/mxs-dma.c
-f:drivers/dma/nbpfaxi.c
-f:drivers/dma/of-dma.c
-f:drivers/dma/owl-dma.c
-f:drivers/dma/pch_dma.c
-f:drivers/dma/pl330.c
-f:drivers/dma/plx_dma.c
-f:drivers/dma/ppc4xx/Makefile
-f:drivers/dma/ppc4xx/adma.c
-f:drivers/dma/ppc4xx/adma.h
-f:drivers/dma/ppc4xx/dma.h
-f:drivers/dma/ppc4xx/xor.h
-f:drivers/dma/pxa_dma.c
-f:drivers/dma/qcom/Kconfig
-f:drivers/dma/qcom/Makefile
-f:drivers/dma/qcom/bam_dma.c
-f:drivers/dma/qcom/gpi.c
-f:drivers/dma/qcom/hidma.c
-f:drivers/dma/qcom/hidma.h
-f:drivers/dma/qcom/hidma_dbg.c
-f:drivers/dma/qcom/hidma_ll.c
-f:drivers/dma/qcom/hidma_mgmt.c
-f:drivers/dma/qcom/hidma_mgmt.h
-f:drivers/dma/qcom/hidma_mgmt_sys.c
-f:drivers/dma/qcom/qcom_adm.c
-f:drivers/dma/sa11x0-dma.c
-f:drivers/dma/sf-pdma/Kconfig
-f:drivers/dma/sf-pdma/Makefile
-f:drivers/dma/sf-pdma/sf-pdma.c
-f:drivers/dma/sf-pdma/sf-pdma.h
-f:drivers/dma/sh/Kconfig
-f:drivers/dma/sh/Makefile
-f:drivers/dma/sh/rcar-dmac.c
-f:drivers/dma/sh/rz-dmac.c
-f:drivers/dma/sh/shdma-base.c
-f:drivers/dma/sh/shdma.h
-f:drivers/dma/sh/shdmac.c
-f:drivers/dma/sh/usb-dmac.c
-f:drivers/dma/sprd-dma.c
-f:drivers/dma/st_fdma.c
-f:drivers/dma/st_fdma.h
-f:drivers/dma/ste_dma40.c
-f:drivers/dma/ste_dma40.h
-f:drivers/dma/ste_dma40_ll.c
-f:drivers/dma/ste_dma40_ll.h
-f:drivers/dma/stm32/Kconfig
-f:drivers/dma/stm32/Makefile
-f:drivers/dma/stm32/stm32-dma.c
-f:drivers/dma/stm32/stm32-dma3.c
-f:drivers/dma/stm32/stm32-dmamux.c
-f:drivers/dma/stm32/stm32-mdma.c
-f:drivers/dma/sun4i-dma.c
-f:drivers/dma/sun6i-dma.c
-f:drivers/dma/tegra186-gpc-dma.c
-f:drivers/dma/tegra20-apb-dma.c
-f:drivers/dma/tegra210-adma.c
-f:drivers/dma/ti/Kconfig
-f:drivers/dma/ti/Makefile
-f:drivers/dma/ti/cppi41.c
-f:drivers/dma/ti/dma-crossbar.c
-f:drivers/dma/ti/edma.c
-f:drivers/dma/ti/k3-psil-am62.c
-f:drivers/dma/ti/k3-psil-am62a.c
-f:drivers/dma/ti/k3-psil-am62p.c
-f:drivers/dma/ti/k3-psil-am64.c
-f:drivers/dma/ti/k3-psil-am654.c
-f:drivers/dma/ti/k3-psil-j7200.c
-f:drivers/dma/ti/k3-psil-j721e.c
-f:drivers/dma/ti/k3-psil-j721s2.c
-f:drivers/dma/ti/k3-psil-j784s4.c
-f:drivers/dma/ti/k3-psil-priv.h
-f:drivers/dma/ti/k3-psil.c
-f:drivers/dma/ti/k3-udma-glue.c
-f:drivers/dma/ti/k3-udma-private.c
-f:drivers/dma/ti/k3-udma.c
-f:drivers/dma/ti/k3-udma.h
-f:drivers/dma/ti/omap-dma.c
-f:drivers/dma/timb_dma.c
-f:drivers/dma/txx9dmac.c
-f:drivers/dma/txx9dmac.h
-f:drivers/dma/uniphier-mdmac.c
-f:drivers/dma/uniphier-xdmac.c
-f:drivers/dma/virt-dma.c
-f:drivers/dma/virt-dma.h
-f:drivers/dma/xgene-dma.c
-f:drivers/dma/xilinx/Makefile
-f:drivers/dma/xilinx/xdma-regs.h
-f:drivers/dma/xilinx/xdma.c
-f:drivers/dma/xilinx/xilinx_dma.c
-f:drivers/dma/xilinx/xilinx_dpdma.c
-f:drivers/dma/xilinx/zynqmp_dma.c
-f:drivers/dpll/Kconfig
-f:drivers/dpll/Makefile
-f:drivers/dpll/dpll_core.c
-f:drivers/dpll/dpll_core.h
-f:drivers/dpll/dpll_netlink.c
-f:drivers/dpll/dpll_netlink.h
-f:drivers/dpll/dpll_nl.c
-f:drivers/dpll/dpll_nl.h
-f:drivers/dpll/zl3073x/Kconfig
-f:drivers/dpll/zl3073x/Makefile
-f:drivers/dpll/zl3073x/core.c
-f:drivers/dpll/zl3073x/core.h
-f:drivers/dpll/zl3073x/devlink.c
-f:drivers/dpll/zl3073x/devlink.h
-f:drivers/dpll/zl3073x/dpll.c
-f:drivers/dpll/zl3073x/dpll.h
-f:drivers/dpll/zl3073x/i2c.c
-f:drivers/dpll/zl3073x/prop.c
-f:drivers/dpll/zl3073x/prop.h
-f:drivers/dpll/zl3073x/regs.h
-f:drivers/dpll/zl3073x/spi.c
-f:drivers/edac/Kconfig
-f:drivers/edac/Makefile
-f:drivers/edac/al_mc_edac.c
-f:drivers/edac/altera_edac.c
-f:drivers/edac/altera_edac.h
-f:drivers/edac/amd64_edac.c
-f:drivers/edac/amd64_edac.h
-f:drivers/edac/amd76x_edac.c
-f:drivers/edac/armada_xp_edac.c
-f:drivers/edac/aspeed_edac.c
-f:drivers/edac/bluefield_edac.c
-f:drivers/edac/cpc925_edac.c
-f:drivers/edac/debugfs.c
-f:drivers/edac/dmc520_edac.c
-f:drivers/edac/e752x_edac.c
-f:drivers/edac/e7xxx_edac.c
-f:drivers/edac/ecs.c
-f:drivers/edac/edac_device.c
-f:drivers/edac/edac_device.h
-f:drivers/edac/edac_device_sysfs.c
-f:drivers/edac/edac_mc.c
-f:drivers/edac/edac_mc.h
-f:drivers/edac/edac_mc_sysfs.c
-f:drivers/edac/edac_module.c
-f:drivers/edac/edac_module.h
-f:drivers/edac/edac_pci.c
-f:drivers/edac/edac_pci.h
-f:drivers/edac/edac_pci_sysfs.c
-f:drivers/edac/fsl_ddr_edac.c
-f:drivers/edac/fsl_ddr_edac.h
-f:drivers/edac/ghes_edac.c
-f:drivers/edac/highbank_l2_edac.c
-f:drivers/edac/highbank_mc_edac.c
-f:drivers/edac/i10nm_base.c
-f:drivers/edac/i3000_edac.c
-f:drivers/edac/i3200_edac.c
-f:drivers/edac/i5000_edac.c
-f:drivers/edac/i5100_edac.c
-f:drivers/edac/i5400_edac.c
-f:drivers/edac/i7300_edac.c
-f:drivers/edac/i7core_edac.c
-f:drivers/edac/i82443bxgx_edac.c
-f:drivers/edac/i82860_edac.c
-f:drivers/edac/i82875p_edac.c
-f:drivers/edac/i82975x_edac.c
-f:drivers/edac/ie31200_edac.c
-f:drivers/edac/igen6_edac.c
-f:drivers/edac/layerscape_edac.c
-f:drivers/edac/loongson_edac.c
-f:drivers/edac/mce_amd.c
-f:drivers/edac/mce_amd.h
-f:drivers/edac/mem_repair.c
-f:drivers/edac/mpc85xx_edac.c
-f:drivers/edac/mpc85xx_edac.h
-f:drivers/edac/npcm_edac.c
-f:drivers/edac/octeon_edac-l2c.c
-f:drivers/edac/octeon_edac-lmc.c
-f:drivers/edac/octeon_edac-pc.c
-f:drivers/edac/octeon_edac-pci.c
-f:drivers/edac/pasemi_edac.c
-f:drivers/edac/pnd2_edac.c
-f:drivers/edac/pnd2_edac.h
-f:drivers/edac/qcom_edac.c
-f:drivers/edac/r82600_edac.c
-f:drivers/edac/sb_edac.c
-f:drivers/edac/scrub.c
-f:drivers/edac/sifive_edac.c
-f:drivers/edac/skx_base.c
-f:drivers/edac/skx_common.c
-f:drivers/edac/skx_common.h
-f:drivers/edac/synopsys_edac.c
-f:drivers/edac/thunderx_edac.c
-f:drivers/edac/ti_edac.c
-f:drivers/edac/versal_edac.c
-f:drivers/edac/wq.c
-f:drivers/edac/x38_edac.c
-f:drivers/edac/xgene_edac.c
-f:drivers/edac/zynqmp_edac.c
-f:drivers/eisa/.gitignore
-f:drivers/eisa/Kconfig
-f:drivers/eisa/Makefile
-f:drivers/eisa/eisa-bus.c
-f:drivers/eisa/eisa.ids
-f:drivers/eisa/pci_eisa.c
-f:drivers/eisa/virtual_root.c
-f:drivers/extcon/Kconfig
-f:drivers/extcon/Makefile
-f:drivers/extcon/devres.c
-f:drivers/extcon/extcon-adc-jack.c
-f:drivers/extcon/extcon-axp288.c
-f:drivers/extcon/extcon-fsa9480.c
-f:drivers/extcon/extcon-gpio.c
-f:drivers/extcon/extcon-intel-cht-wc.c
-f:drivers/extcon/extcon-intel-int3496.c
-f:drivers/extcon/extcon-intel-mrfld.c
-f:drivers/extcon/extcon-intel.h
-f:drivers/extcon/extcon-lc824206xa.c
-f:drivers/extcon/extcon-max14577.c
-f:drivers/extcon/extcon-max3355.c
-f:drivers/extcon/extcon-max77693.c
-f:drivers/extcon/extcon-max77843.c
-f:drivers/extcon/extcon-max8997.c
-f:drivers/extcon/extcon-palmas.c
-f:drivers/extcon/extcon-ptn5150.c
-f:drivers/extcon/extcon-qcom-spmi-misc.c
-f:drivers/extcon/extcon-rt8973a.c
-f:drivers/extcon/extcon-rt8973a.h
-f:drivers/extcon/extcon-rtk-type-c.c
-f:drivers/extcon/extcon-sm5502.c
-f:drivers/extcon/extcon-sm5502.h
-f:drivers/extcon/extcon-usb-gpio.c
-f:drivers/extcon/extcon-usbc-cros-ec.c
-f:drivers/extcon/extcon-usbc-tusb320.c
-f:drivers/extcon/extcon.c
-f:drivers/extcon/extcon.h
-f:drivers/firewire/.kunitconfig
-f:drivers/firewire/Kconfig
-f:drivers/firewire/Makefile
-f:drivers/firewire/core-card.c
-f:drivers/firewire/core-cdev.c
-f:drivers/firewire/core-device.c
-f:drivers/firewire/core-iso.c
-f:drivers/firewire/core-topology.c
-f:drivers/firewire/core-trace.c
-f:drivers/firewire/core-transaction.c
-f:drivers/firewire/core.h
-f:drivers/firewire/device-attribute-test.c
-f:drivers/firewire/init_ohci1394_dma.c
-f:drivers/firewire/net.c
-f:drivers/firewire/nosy-user.h
-f:drivers/firewire/nosy.c
-f:drivers/firewire/nosy.h
-f:drivers/firewire/ohci-serdes-test.c
-f:drivers/firewire/ohci.c
-f:drivers/firewire/ohci.h
-f:drivers/firewire/packet-header-definitions.h
-f:drivers/firewire/packet-serdes-test.c
-f:drivers/firewire/phy-packet-definitions.h
-f:drivers/firewire/sbp2.c
-f:drivers/firewire/self-id-sequence-helper-test.c
-f:drivers/firewire/uapi-test.c
-f:drivers/firmware/Kconfig
-f:drivers/firmware/Makefile
-f:drivers/firmware/arm_ffa/Kconfig
-f:drivers/firmware/arm_ffa/Makefile
-f:drivers/firmware/arm_ffa/bus.c
-f:drivers/firmware/arm_ffa/common.h
-f:drivers/firmware/arm_ffa/driver.c
-f:drivers/firmware/arm_ffa/smccc.c
-f:drivers/firmware/arm_scmi/Kconfig
-f:drivers/firmware/arm_scmi/Makefile
-f:drivers/firmware/arm_scmi/base.c
-f:drivers/firmware/arm_scmi/bus.c
-f:drivers/firmware/arm_scmi/clock.c
-f:drivers/firmware/arm_scmi/common.h
-f:drivers/firmware/arm_scmi/driver.c
-f:drivers/firmware/arm_scmi/msg.c
-f:drivers/firmware/arm_scmi/notify.c
-f:drivers/firmware/arm_scmi/notify.h
-f:drivers/firmware/arm_scmi/perf.c
-f:drivers/firmware/arm_scmi/pinctrl.c
-f:drivers/firmware/arm_scmi/power.c
-f:drivers/firmware/arm_scmi/powercap.c
-f:drivers/firmware/arm_scmi/protocols.h
-f:drivers/firmware/arm_scmi/quirks.c
-f:drivers/firmware/arm_scmi/quirks.h
-f:drivers/firmware/arm_scmi/raw_mode.c
-f:drivers/firmware/arm_scmi/raw_mode.h
-f:drivers/firmware/arm_scmi/reset.c
-f:drivers/firmware/arm_scmi/scmi_power_control.c
-f:drivers/firmware/arm_scmi/sensors.c
-f:drivers/firmware/arm_scmi/shmem.c
-f:drivers/firmware/arm_scmi/system.c
-f:drivers/firmware/arm_scmi/transports/Kconfig
-f:drivers/firmware/arm_scmi/transports/Makefile
-f:drivers/firmware/arm_scmi/transports/mailbox.c
-f:drivers/firmware/arm_scmi/transports/optee.c
-f:drivers/firmware/arm_scmi/transports/smc.c
-f:drivers/firmware/arm_scmi/transports/virtio.c
-f:drivers/firmware/arm_scmi/vendors/imx/Kconfig
-f:drivers/firmware/arm_scmi/vendors/imx/Makefile
-f:drivers/firmware/arm_scmi/vendors/imx/imx-sm-bbm.c
-f:drivers/firmware/arm_scmi/vendors/imx/imx-sm-cpu.c
-f:drivers/firmware/arm_scmi/vendors/imx/imx-sm-lmm.c
-f:drivers/firmware/arm_scmi/vendors/imx/imx-sm-misc.c
-f:drivers/firmware/arm_scmi/vendors/imx/imx95.rst
-f:drivers/firmware/arm_scmi/voltage.c
-f:drivers/firmware/arm_scpi.c
-f:drivers/firmware/arm_sdei.c
-f:drivers/firmware/broadcom/Kconfig
-f:drivers/firmware/broadcom/Makefile
-f:drivers/firmware/broadcom/bcm47xx_nvram.c
-f:drivers/firmware/broadcom/bcm47xx_sprom.c
-f:drivers/firmware/broadcom/tee_bnxt_fw.c
-f:drivers/firmware/cirrus/Kconfig
-f:drivers/firmware/cirrus/Makefile
-f:drivers/firmware/cirrus/cs_dsp.c
-f:drivers/firmware/cirrus/test/Makefile
-f:drivers/firmware/cirrus/test/cs_dsp_mock_bin.c
-f:drivers/firmware/cirrus/test/cs_dsp_mock_mem_maps.c
-f:drivers/firmware/cirrus/test/cs_dsp_mock_regmap.c
-f:drivers/firmware/cirrus/test/cs_dsp_mock_utils.c
-f:drivers/firmware/cirrus/test/cs_dsp_mock_wmfw.c
-f:drivers/firmware/cirrus/test/cs_dsp_test_bin.c
-f:drivers/firmware/cirrus/test/cs_dsp_test_bin_error.c
-f:drivers/firmware/cirrus/test/cs_dsp_test_callbacks.c
-f:drivers/firmware/cirrus/test/cs_dsp_test_control_cache.c
-f:drivers/firmware/cirrus/test/cs_dsp_test_control_parse.c
-f:drivers/firmware/cirrus/test/cs_dsp_test_control_rw.c
-f:drivers/firmware/cirrus/test/cs_dsp_test_wmfw.c
-f:drivers/firmware/cirrus/test/cs_dsp_test_wmfw_error.c
-f:drivers/firmware/cirrus/test/cs_dsp_tests.c
-f:drivers/firmware/dmi-id.c
-f:drivers/firmware/dmi-sysfs.c
-f:drivers/firmware/dmi_scan.c
-f:drivers/firmware/edd.c
-f:drivers/firmware/efi/Kconfig
-f:drivers/firmware/efi/Makefile
-f:drivers/firmware/efi/apple-properties.c
-f:drivers/firmware/efi/arm-runtime.c
-f:drivers/firmware/efi/capsule-loader.c
-f:drivers/firmware/efi/capsule.c
-f:drivers/firmware/efi/cper-arm.c
-f:drivers/firmware/efi/cper-x86.c
-f:drivers/firmware/efi/cper.c
-f:drivers/firmware/efi/cper_cxl.c
-f:drivers/firmware/efi/dev-path-parser.c
-f:drivers/firmware/efi/earlycon.c
-f:drivers/firmware/efi/efi-bgrt.c
-f:drivers/firmware/efi/efi-init.c
-f:drivers/firmware/efi/efi-pstore.c
-f:drivers/firmware/efi/efi.c
-f:drivers/firmware/efi/efibc.c
-f:drivers/firmware/efi/embedded-firmware.c
-f:drivers/firmware/efi/esrt.c
-f:drivers/firmware/efi/fdtparams.c
-f:drivers/firmware/efi/libstub/Makefile
-f:drivers/firmware/efi/libstub/Makefile.zboot
-f:drivers/firmware/efi/libstub/alignedmem.c
-f:drivers/firmware/efi/libstub/arm32-stub.c
-f:drivers/firmware/efi/libstub/arm64-stub.c
-f:drivers/firmware/efi/libstub/arm64.c
-f:drivers/firmware/efi/libstub/bitmap.c
-f:drivers/firmware/efi/libstub/efi-stub-entry.c
-f:drivers/firmware/efi/libstub/efi-stub-helper.c
-f:drivers/firmware/efi/libstub/efi-stub.c
-f:drivers/firmware/efi/libstub/efistub.h
-f:drivers/firmware/efi/libstub/fdt.c
-f:drivers/firmware/efi/libstub/file.c
-f:drivers/firmware/efi/libstub/find.c
-f:drivers/firmware/efi/libstub/gop.c
-f:drivers/firmware/efi/libstub/intrinsics.c
-f:drivers/firmware/efi/libstub/kaslr.c
-f:drivers/firmware/efi/libstub/loongarch-stub.c
-f:drivers/firmware/efi/libstub/loongarch-stub.h
-f:drivers/firmware/efi/libstub/loongarch.c
-f:drivers/firmware/efi/libstub/mem.c
-f:drivers/firmware/efi/libstub/pci.c
-f:drivers/firmware/efi/libstub/printk.c
-f:drivers/firmware/efi/libstub/random.c
-f:drivers/firmware/efi/libstub/randomalloc.c
-f:drivers/firmware/efi/libstub/relocate.c
-f:drivers/firmware/efi/libstub/riscv-stub.c
-f:drivers/firmware/efi/libstub/riscv.c
-f:drivers/firmware/efi/libstub/screen_info.c
-f:drivers/firmware/efi/libstub/secureboot.c
-f:drivers/firmware/efi/libstub/skip_spaces.c
-f:drivers/firmware/efi/libstub/smbios.c
-f:drivers/firmware/efi/libstub/string.c
-f:drivers/firmware/efi/libstub/systable.c
-f:drivers/firmware/efi/libstub/tpm.c
-f:drivers/firmware/efi/libstub/unaccepted_memory.c
-f:drivers/firmware/efi/libstub/vsprintf.c
-f:drivers/firmware/efi/libstub/x86-5lvl.c
-f:drivers/firmware/efi/libstub/x86-stub.c
-f:drivers/firmware/efi/libstub/x86-stub.h
-f:drivers/firmware/efi/libstub/zboot-decompress-gzip.c
-f:drivers/firmware/efi/libstub/zboot-decompress-zstd.c
-f:drivers/firmware/efi/libstub/zboot-header.S
-f:drivers/firmware/efi/libstub/zboot.c
-f:drivers/firmware/efi/libstub/zboot.lds
-f:drivers/firmware/efi/memattr.c
-f:drivers/firmware/efi/memmap.c
-f:drivers/firmware/efi/mokvar-table.c
-f:drivers/firmware/efi/rci2-table.c
-f:drivers/firmware/efi/reboot.c
-f:drivers/firmware/efi/riscv-runtime.c
-f:drivers/firmware/efi/runtime-wrappers.c
-f:drivers/firmware/efi/stmm/mm_communication.h
-f:drivers/firmware/efi/stmm/tee_stmm_efi.c
-f:drivers/firmware/efi/sysfb_efi.c
-f:drivers/firmware/efi/test/Makefile
-f:drivers/firmware/efi/test/efi_test.c
-f:drivers/firmware/efi/test/efi_test.h
-f:drivers/firmware/efi/tpm.c
-f:drivers/firmware/efi/unaccepted_memory.c
-f:drivers/firmware/efi/vars.c
-f:drivers/firmware/google/Kconfig
-f:drivers/firmware/google/Makefile
-f:drivers/firmware/google/cbmem.c
-f:drivers/firmware/google/coreboot_table.c
-f:drivers/firmware/google/coreboot_table.h
-f:drivers/firmware/google/framebuffer-coreboot.c
-f:drivers/firmware/google/gsmi.c
-f:drivers/firmware/google/memconsole-coreboot.c
-f:drivers/firmware/google/memconsole-x86-legacy.c
-f:drivers/firmware/google/memconsole.c
-f:drivers/firmware/google/memconsole.h
-f:drivers/firmware/google/vpd.c
-f:drivers/firmware/google/vpd_decode.c
-f:drivers/firmware/google/vpd_decode.h
-f:drivers/firmware/imx/Kconfig
-f:drivers/firmware/imx/Makefile
-f:drivers/firmware/imx/imx-dsp.c
-f:drivers/firmware/imx/imx-scu-irq.c
-f:drivers/firmware/imx/imx-scu-soc.c
-f:drivers/firmware/imx/imx-scu.c
-f:drivers/firmware/imx/misc.c
-f:drivers/firmware/imx/rm.c
-f:drivers/firmware/imx/sm-cpu.c
-f:drivers/firmware/imx/sm-lmm.c
-f:drivers/firmware/imx/sm-misc.c
-f:drivers/firmware/iscsi_ibft.c
-f:drivers/firmware/iscsi_ibft_find.c
-f:drivers/firmware/memmap.c
-f:drivers/firmware/meson/Kconfig
-f:drivers/firmware/meson/Makefile
-f:drivers/firmware/meson/meson_sm.c
-f:drivers/firmware/microchip/Kconfig
-f:drivers/firmware/microchip/Makefile
-f:drivers/firmware/microchip/mpfs-auto-update.c
-f:drivers/firmware/mtk-adsp-ipc.c
-f:drivers/firmware/psci/Kconfig
-f:drivers/firmware/psci/Makefile
-f:drivers/firmware/psci/psci.c
-f:drivers/firmware/psci/psci_checker.c
-f:drivers/firmware/qcom/Kconfig
-f:drivers/firmware/qcom/Makefile
-f:drivers/firmware/qcom/qcom_qseecom.c
-f:drivers/firmware/qcom/qcom_qseecom_uefisecapp.c
-f:drivers/firmware/qcom/qcom_scm-legacy.c
-f:drivers/firmware/qcom/qcom_scm-smc.c
-f:drivers/firmware/qcom/qcom_scm.c
-f:drivers/firmware/qcom/qcom_scm.h
-f:drivers/firmware/qcom/qcom_tzmem.c
-f:drivers/firmware/qcom/qcom_tzmem.h
-f:drivers/firmware/qemu_fw_cfg.c
-f:drivers/firmware/raspberrypi.c
-f:drivers/firmware/samsung/Kconfig
-f:drivers/firmware/samsung/Makefile
-f:drivers/firmware/samsung/exynos-acpm-pmic.c
-f:drivers/firmware/samsung/exynos-acpm-pmic.h
-f:drivers/firmware/samsung/exynos-acpm.c
-f:drivers/firmware/samsung/exynos-acpm.h
-f:drivers/firmware/smccc/Kconfig
-f:drivers/firmware/smccc/Makefile
-f:drivers/firmware/smccc/kvm_guest.c
-f:drivers/firmware/smccc/smccc.c
-f:drivers/firmware/smccc/soc_id.c
-f:drivers/firmware/stratix10-rsu.c
-f:drivers/firmware/stratix10-svc.c
-f:drivers/firmware/sysfb.c
-f:drivers/firmware/sysfb_simplefb.c
-f:drivers/firmware/tegra/Kconfig
-f:drivers/firmware/tegra/Makefile
-f:drivers/firmware/tegra/bpmp-debugfs.c
-f:drivers/firmware/tegra/bpmp-private.h
-f:drivers/firmware/tegra/bpmp-tegra186.c
-f:drivers/firmware/tegra/bpmp-tegra210.c
-f:drivers/firmware/tegra/bpmp.c
-f:drivers/firmware/tegra/ivc.c
-f:drivers/firmware/thead,th1520-aon.c
-f:drivers/firmware/ti_sci.c
-f:drivers/firmware/ti_sci.h
-f:drivers/firmware/trusted_foundations.c
-f:drivers/firmware/turris-mox-rwtm.c
-f:drivers/firmware/xilinx/Kconfig
-f:drivers/firmware/xilinx/Makefile
-f:drivers/firmware/xilinx/zynqmp-debug.c
-f:drivers/firmware/xilinx/zynqmp-debug.h
-f:drivers/firmware/xilinx/zynqmp.c
-f:drivers/fpga/Kconfig
-f:drivers/fpga/Makefile
-f:drivers/fpga/altera-cvp.c
-f:drivers/fpga/altera-fpga2sdram.c
-f:drivers/fpga/altera-freeze-bridge.c
-f:drivers/fpga/altera-hps2fpga.c
-f:drivers/fpga/altera-pr-ip-core-plat.c
-f:drivers/fpga/altera-pr-ip-core.c
-f:drivers/fpga/altera-ps-spi.c
-f:drivers/fpga/dfl-afu-dma-region.c
-f:drivers/fpga/dfl-afu-error.c
-f:drivers/fpga/dfl-afu-main.c
-f:drivers/fpga/dfl-afu-region.c
-f:drivers/fpga/dfl-afu.h
-f:drivers/fpga/dfl-fme-br.c
-f:drivers/fpga/dfl-fme-error.c
-f:drivers/fpga/dfl-fme-main.c
-f:drivers/fpga/dfl-fme-mgr.c
-f:drivers/fpga/dfl-fme-perf.c
-f:drivers/fpga/dfl-fme-pr.c
-f:drivers/fpga/dfl-fme-pr.h
-f:drivers/fpga/dfl-fme-region.c
-f:drivers/fpga/dfl-fme.h
-f:drivers/fpga/dfl-n3000-nios.c
-f:drivers/fpga/dfl-pci.c
-f:drivers/fpga/dfl.c
-f:drivers/fpga/dfl.h
-f:drivers/fpga/fpga-bridge.c
-f:drivers/fpga/fpga-mgr.c
-f:drivers/fpga/fpga-region.c
-f:drivers/fpga/ice40-spi.c
-f:drivers/fpga/intel-m10-bmc-sec-update.c
-f:drivers/fpga/lattice-sysconfig-spi.c
-f:drivers/fpga/lattice-sysconfig.c
-f:drivers/fpga/lattice-sysconfig.h
-f:drivers/fpga/machxo2-spi.c
-f:drivers/fpga/microchip-spi.c
-f:drivers/fpga/of-fpga-region.c
-f:drivers/fpga/socfpga-a10.c
-f:drivers/fpga/socfpga.c
-f:drivers/fpga/stratix10-soc.c
-f:drivers/fpga/tests/.kunitconfig
-f:drivers/fpga/tests/Kconfig
-f:drivers/fpga/tests/Makefile
-f:drivers/fpga/tests/fpga-bridge-test.c
-f:drivers/fpga/tests/fpga-mgr-test.c
-f:drivers/fpga/tests/fpga-region-test.c
-f:drivers/fpga/ts73xx-fpga.c
-f:drivers/fpga/versal-fpga.c
-f:drivers/fpga/xilinx-core.c
-f:drivers/fpga/xilinx-core.h
-f:drivers/fpga/xilinx-pr-decoupler.c
-f:drivers/fpga/xilinx-selectmap.c
-f:drivers/fpga/xilinx-spi.c
-f:drivers/fpga/zynq-fpga.c
-f:drivers/fpga/zynqmp-fpga.c
-f:drivers/fsi/Kconfig
-f:drivers/fsi/Makefile
-f:drivers/fsi/cf-fsi-fw.h
-f:drivers/fsi/fsi-core.c
-f:drivers/fsi/fsi-master-aspeed.c
-f:drivers/fsi/fsi-master-ast-cf.c
-f:drivers/fsi/fsi-master-gpio.c
-f:drivers/fsi/fsi-master-hub.c
-f:drivers/fsi/fsi-master-i2cr.c
-f:drivers/fsi/fsi-master-i2cr.h
-f:drivers/fsi/fsi-master.h
-f:drivers/fsi/fsi-occ.c
-f:drivers/fsi/fsi-sbefifo.c
-f:drivers/fsi/fsi-scom.c
-f:drivers/fsi/fsi-slave.h
-f:drivers/fsi/i2cr-scom.c
-f:drivers/fwctl/Kconfig
-f:drivers/fwctl/Makefile
-f:drivers/fwctl/main.c
-f:drivers/fwctl/mlx5/Makefile
-f:drivers/fwctl/mlx5/main.c
-f:drivers/fwctl/pds/Makefile
-f:drivers/fwctl/pds/main.c
-f:drivers/gnss/Kconfig
-f:drivers/gnss/Makefile
-f:drivers/gnss/core.c
-f:drivers/gnss/mtk.c
-f:drivers/gnss/serial.c
-f:drivers/gnss/serial.h
-f:drivers/gnss/sirf.c
-f:drivers/gnss/ubx.c
-f:drivers/gnss/usb.c
-f:drivers/gpio/Kconfig
-f:drivers/gpio/Makefile
-f:drivers/gpio/TODO
-f:drivers/gpio/dev-sync-probe.c
-f:drivers/gpio/dev-sync-probe.h
-f:drivers/gpio/gpio-104-dio-48e.c
-f:drivers/gpio/gpio-104-idi-48.c
-f:drivers/gpio/gpio-104-idio-16.c
-f:drivers/gpio/gpio-74x164.c
-f:drivers/gpio/gpio-74xx-mmio.c
-f:drivers/gpio/gpio-adnp.c
-f:drivers/gpio/gpio-adp5520.c
-f:drivers/gpio/gpio-adp5585.c
-f:drivers/gpio/gpio-aggregator.c
-f:drivers/gpio/gpio-altera-a10sr.c
-f:drivers/gpio/gpio-altera.c
-f:drivers/gpio/gpio-amd-fch.c
-f:drivers/gpio/gpio-amd8111.c
-f:drivers/gpio/gpio-amdpt.c
-f:drivers/gpio/gpio-arizona.c
-f:drivers/gpio/gpio-aspeed-sgpio.c
-f:drivers/gpio/gpio-aspeed.c
-f:drivers/gpio/gpio-ath79.c
-f:drivers/gpio/gpio-bcm-kona.c
-f:drivers/gpio/gpio-bd71815.c
-f:drivers/gpio/gpio-bd71828.c
-f:drivers/gpio/gpio-bd9571mwv.c
-f:drivers/gpio/gpio-blzp1600.c
-f:drivers/gpio/gpio-brcmstb.c
-f:drivers/gpio/gpio-bt8xx.c
-f:drivers/gpio/gpio-cadence.c
-f:drivers/gpio/gpio-cgbc.c
-f:drivers/gpio/gpio-clps711x.c
-f:drivers/gpio/gpio-creg-snps.c
-f:drivers/gpio/gpio-cros-ec.c
-f:drivers/gpio/gpio-crystalcove.c
-f:drivers/gpio/gpio-cs5535.c
-f:drivers/gpio/gpio-da9052.c
-f:drivers/gpio/gpio-da9055.c
-f:drivers/gpio/gpio-davinci.c
-f:drivers/gpio/gpio-dln2.c
-f:drivers/gpio/gpio-ds4520.c
-f:drivers/gpio/gpio-dwapb.c
-f:drivers/gpio/gpio-eic-sprd.c
-f:drivers/gpio/gpio-elkhartlake.c
-f:drivers/gpio/gpio-em.c
-f:drivers/gpio/gpio-en7523.c
-f:drivers/gpio/gpio-ep93xx.c
-f:drivers/gpio/gpio-exar.c
-f:drivers/gpio/gpio-f7188x.c
-f:drivers/gpio/gpio-ftgpio010.c
-f:drivers/gpio/gpio-fxl6408.c
-f:drivers/gpio/gpio-ge.c
-f:drivers/gpio/gpio-gpio-mm.c
-f:drivers/gpio/gpio-graniterapids.c
-f:drivers/gpio/gpio-grgpio.c
-f:drivers/gpio/gpio-gw-pld.c
-f:drivers/gpio/gpio-hisi.c
-f:drivers/gpio/gpio-hlwd.c
-f:drivers/gpio/gpio-htc-egpio.c
-f:drivers/gpio/gpio-i8255.c
-f:drivers/gpio/gpio-i8255.h
-f:drivers/gpio/gpio-ich.c
-f:drivers/gpio/gpio-idio-16.c
-f:drivers/gpio/gpio-idio-16.h
-f:drivers/gpio/gpio-idt3243x.c
-f:drivers/gpio/gpio-imx-scu.c
-f:drivers/gpio/gpio-it87.c
-f:drivers/gpio/gpio-ixp4xx.c
-f:drivers/gpio/gpio-janz-ttl.c
-f:drivers/gpio/gpio-kempld.c
-f:drivers/gpio/gpio-latch.c
-f:drivers/gpio/gpio-ljca.c
-f:drivers/gpio/gpio-logicvc.c
-f:drivers/gpio/gpio-loongson-64bit.c
-f:drivers/gpio/gpio-loongson.c
-f:drivers/gpio/gpio-loongson1.c
-f:drivers/gpio/gpio-lp3943.c
-f:drivers/gpio/gpio-lp873x.c
-f:drivers/gpio/gpio-lp87565.c
-f:drivers/gpio/gpio-lpc18xx.c
-f:drivers/gpio/gpio-lpc32xx.c
-f:drivers/gpio/gpio-macsmc.c
-f:drivers/gpio/gpio-madera.c
-f:drivers/gpio/gpio-max3191x.c
-f:drivers/gpio/gpio-max7300.c
-f:drivers/gpio/gpio-max7301.c
-f:drivers/gpio/gpio-max730x.c
-f:drivers/gpio/gpio-max732x.c
-f:drivers/gpio/gpio-max77620.c
-f:drivers/gpio/gpio-max77650.c
-f:drivers/gpio/gpio-max77759.c
-f:drivers/gpio/gpio-mb86s7x.c
-f:drivers/gpio/gpio-mc33880.c
-f:drivers/gpio/gpio-menz127.c
-f:drivers/gpio/gpio-merrifield.c
-f:drivers/gpio/gpio-ml-ioh.c
-f:drivers/gpio/gpio-mlxbf.c
-f:drivers/gpio/gpio-mlxbf2.c
-f:drivers/gpio/gpio-mlxbf3.c
-f:drivers/gpio/gpio-mm-lantiq.c
-f:drivers/gpio/gpio-mmio.c
-f:drivers/gpio/gpio-mockup.c
-f:drivers/gpio/gpio-moxtet.c
-f:drivers/gpio/gpio-mpc5200.c
-f:drivers/gpio/gpio-mpc8xxx.c
-f:drivers/gpio/gpio-mpfs.c
-f:drivers/gpio/gpio-mpsse.c
-f:drivers/gpio/gpio-msc313.c
-f:drivers/gpio/gpio-mt7621.c
-f:drivers/gpio/gpio-mvebu.c
-f:drivers/gpio/gpio-mxc.c
-f:drivers/gpio/gpio-mxs.c
-f:drivers/gpio/gpio-nomadik.c
-f:drivers/gpio/gpio-npcm-sgpio.c
-f:drivers/gpio/gpio-octeon.c
-f:drivers/gpio/gpio-omap.c
-f:drivers/gpio/gpio-palmas.c
-f:drivers/gpio/gpio-pca953x.c
-f:drivers/gpio/gpio-pca9570.c
-f:drivers/gpio/gpio-pcf857x.c
-f:drivers/gpio/gpio-pch.c
-f:drivers/gpio/gpio-pci-idio-16.c
-f:drivers/gpio/gpio-pcie-idio-24.c
-f:drivers/gpio/gpio-pisosr.c
-f:drivers/gpio/gpio-pl061.c
-f:drivers/gpio/gpio-pmic-eic-sprd.c
-f:drivers/gpio/gpio-pxa.c
-f:drivers/gpio/gpio-raspberrypi-exp.c
-f:drivers/gpio/gpio-rc5t583.c
-f:drivers/gpio/gpio-rcar.c
-f:drivers/gpio/gpio-rda.c
-f:drivers/gpio/gpio-rdc321x.c
-f:drivers/gpio/gpio-realtek-otto.c
-f:drivers/gpio/gpio-reg.c
-f:drivers/gpio/gpio-regmap.c
-f:drivers/gpio/gpio-rockchip.c
-f:drivers/gpio/gpio-rtd.c
-f:drivers/gpio/gpio-sa1100.c
-f:drivers/gpio/gpio-sama5d2-piobu.c
-f:drivers/gpio/gpio-sch.c
-f:drivers/gpio/gpio-sch311x.c
-f:drivers/gpio/gpio-sifive.c
-f:drivers/gpio/gpio-sim.c
-f:drivers/gpio/gpio-siox.c
-f:drivers/gpio/gpio-sl28cpld.c
-f:drivers/gpio/gpio-sloppy-logic-analyzer.c
-f:drivers/gpio/gpio-sodaville.c
-f:drivers/gpio/gpio-spacemit-k1.c
-f:drivers/gpio/gpio-spear-spics.c
-f:drivers/gpio/gpio-sprd.c
-f:drivers/gpio/gpio-stmpe.c
-f:drivers/gpio/gpio-stp-xway.c
-f:drivers/gpio/gpio-syscon.c
-f:drivers/gpio/gpio-tangier.c
-f:drivers/gpio/gpio-tangier.h
-f:drivers/gpio/gpio-tb10x.c
-f:drivers/gpio/gpio-tc3589x.c
-f:drivers/gpio/gpio-tegra.c
-f:drivers/gpio/gpio-tegra186.c
-f:drivers/gpio/gpio-thunderx.c
-f:drivers/gpio/gpio-timberdale.c
-f:drivers/gpio/gpio-tn48m.c
-f:drivers/gpio/gpio-tpic2810.c
-f:drivers/gpio/gpio-tps65086.c
-f:drivers/gpio/gpio-tps65218.c
-f:drivers/gpio/gpio-tps65219.c
-f:drivers/gpio/gpio-tps6586x.c
-f:drivers/gpio/gpio-tps65910.c
-f:drivers/gpio/gpio-tps65912.c
-f:drivers/gpio/gpio-tps68470.c
-f:drivers/gpio/gpio-tqmx86.c
-f:drivers/gpio/gpio-ts4800.c
-f:drivers/gpio/gpio-ts4900.c
-f:drivers/gpio/gpio-ts5500.c
-f:drivers/gpio/gpio-twl4030.c
-f:drivers/gpio/gpio-twl6040.c
-f:drivers/gpio/gpio-uniphier.c
-f:drivers/gpio/gpio-vf610.c
-f:drivers/gpio/gpio-viperboard.c
-f:drivers/gpio/gpio-virtio.c
-f:drivers/gpio/gpio-virtuser.c
-f:drivers/gpio/gpio-visconti.c
-f:drivers/gpio/gpio-vx855.c
-f:drivers/gpio/gpio-wcd934x.c
-f:drivers/gpio/gpio-wcove.c
-f:drivers/gpio/gpio-winbond.c
-f:drivers/gpio/gpio-wm831x.c
-f:drivers/gpio/gpio-wm8350.c
-f:drivers/gpio/gpio-wm8994.c
-f:drivers/gpio/gpio-ws16c48.c
-f:drivers/gpio/gpio-xgene-sb.c
-f:drivers/gpio/gpio-xgene.c
-f:drivers/gpio/gpio-xgs-iproc.c
-f:drivers/gpio/gpio-xilinx.c
-f:drivers/gpio/gpio-xlp.c
-f:drivers/gpio/gpio-xra1403.c
-f:drivers/gpio/gpio-xtensa.c
-f:drivers/gpio/gpio-zevio.c
-f:drivers/gpio/gpio-zynq.c
-f:drivers/gpio/gpio-zynqmp-modepin.c
-f:drivers/gpio/gpiolib-acpi-core.c
-f:drivers/gpio/gpiolib-acpi-quirks.c
-f:drivers/gpio/gpiolib-acpi.h
-f:drivers/gpio/gpiolib-cdev.c
-f:drivers/gpio/gpiolib-cdev.h
-f:drivers/gpio/gpiolib-devres.c
-f:drivers/gpio/gpiolib-legacy.c
-f:drivers/gpio/gpiolib-of.c
-f:drivers/gpio/gpiolib-of.h
-f:drivers/gpio/gpiolib-swnode.c
-f:drivers/gpio/gpiolib-swnode.h
-f:drivers/gpio/gpiolib-sysfs.c
-f:drivers/gpio/gpiolib-sysfs.h
-f:drivers/gpio/gpiolib.c
-f:drivers/gpio/gpiolib.h
-f:drivers/gpu/Makefile
-f:drivers/gpu/drm/Kconfig
-f:drivers/gpu/drm/Kconfig.debug
-f:drivers/gpu/drm/Makefile
-f:drivers/gpu/drm/adp/Kconfig
-f:drivers/gpu/drm/adp/Makefile
-f:drivers/gpu/drm/adp/adp-mipi.c
-f:drivers/gpu/drm/adp/adp_drv.c
-f:drivers/gpu/drm/amd/acp/Kconfig
-f:drivers/gpu/drm/amd/acp/Makefile
-f:drivers/gpu/drm/amd/acp/acp_hw.c
-f:drivers/gpu/drm/amd/acp/include/acp_gfx_if.h
-f:drivers/gpu/drm/amd/amdgpu/Kconfig
-f:drivers/gpu/drm/amd/amdgpu/Makefile
-f:drivers/gpu/drm/amd/amdgpu/ObjectID.h
-f:drivers/gpu/drm/amd/amdgpu/aldebaran.c
-f:drivers/gpu/drm/amd/amdgpu/aldebaran.h
-f:drivers/gpu/drm/amd/amdgpu/aldebaran_reg_init.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_aca.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_aca.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_acp.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_afmt.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_aldebaran.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_aldebaran.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gc_9_4_3.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10_3.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v11.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v12.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_cper.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_cper.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_cs.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_csa.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_df.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_display.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell_mgr.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_drv.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_eeprom.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_eeprom.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_eviction_fence.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_eviction_fence.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_fw_attestation.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_fw_attestation.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_gds.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_gfxhub.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_hmm.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_hmm.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_ids.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_imu.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_ioc32.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_ip.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_ip.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_isp.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_isp.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_job.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_lsdma.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_lsdma.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_mca.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_mes_ctx.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_pll.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_pll.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_psp_ta.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_psp_ta.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_rap.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_rap.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_res_cursor.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_sched.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_seq64.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_seq64.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_smuio.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_socbb.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_sync.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_trace_points.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_umr.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_vf_error.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_vf_error.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_vm_tlb_fence.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.h
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
-f:drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h
-f:drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h
-f:drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c
-f:drivers/gpu/drm/amd/amdgpu/arct_reg_init.c
-f:drivers/gpu/drm/amd/amdgpu/athub_v1_0.c
-f:drivers/gpu/drm/amd/amdgpu/athub_v1_0.h
-f:drivers/gpu/drm/amd/amdgpu/athub_v2_0.c
-f:drivers/gpu/drm/amd/amdgpu/athub_v2_0.h
-f:drivers/gpu/drm/amd/amdgpu/athub_v2_1.c
-f:drivers/gpu/drm/amd/amdgpu/athub_v2_1.h
-f:drivers/gpu/drm/amd/amdgpu/athub_v3_0.c
-f:drivers/gpu/drm/amd/amdgpu/athub_v3_0.h
-f:drivers/gpu/drm/amd/amdgpu/athub_v4_1_0.c
-f:drivers/gpu/drm/amd/amdgpu/athub_v4_1_0.h
-f:drivers/gpu/drm/amd/amdgpu/atom.c
-f:drivers/gpu/drm/amd/amdgpu/atom.h
-f:drivers/gpu/drm/amd/amdgpu/atombios_crtc.c
-f:drivers/gpu/drm/amd/amdgpu/atombios_crtc.h
-f:drivers/gpu/drm/amd/amdgpu/atombios_dp.c
-f:drivers/gpu/drm/amd/amdgpu/atombios_dp.h
-f:drivers/gpu/drm/amd/amdgpu/atombios_encoders.c
-f:drivers/gpu/drm/amd/amdgpu/atombios_encoders.h
-f:drivers/gpu/drm/amd/amdgpu/atombios_i2c.c
-f:drivers/gpu/drm/amd/amdgpu/atombios_i2c.h
-f:drivers/gpu/drm/amd/amdgpu/cik.c
-f:drivers/gpu/drm/amd/amdgpu/cik.h
-f:drivers/gpu/drm/amd/amdgpu/cik_ih.c
-f:drivers/gpu/drm/amd/amdgpu/cik_ih.h
-f:drivers/gpu/drm/amd/amdgpu/cik_sdma.c
-f:drivers/gpu/drm/amd/amdgpu/cik_sdma.h
-f:drivers/gpu/drm/amd/amdgpu/cikd.h
-f:drivers/gpu/drm/amd/amdgpu/clearstate_ci.h
-f:drivers/gpu/drm/amd/amdgpu/clearstate_defs.h
-f:drivers/gpu/drm/amd/amdgpu/clearstate_gfx10.h
-f:drivers/gpu/drm/amd/amdgpu/clearstate_gfx11.h
-f:drivers/gpu/drm/amd/amdgpu/clearstate_gfx12.h
-f:drivers/gpu/drm/amd/amdgpu/clearstate_gfx9.h
-f:drivers/gpu/drm/amd/amdgpu/clearstate_si.h
-f:drivers/gpu/drm/amd/amdgpu/clearstate_vi.h
-f:drivers/gpu/drm/amd/amdgpu/cz_ih.c
-f:drivers/gpu/drm/amd/amdgpu/cz_ih.h
-f:drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
-f:drivers/gpu/drm/amd/amdgpu/dce_v10_0.h
-f:drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
-f:drivers/gpu/drm/amd/amdgpu/dce_v11_0.h
-f:drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
-f:drivers/gpu/drm/amd/amdgpu/dce_v6_0.h
-f:drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
-f:drivers/gpu/drm/amd/amdgpu/dce_v8_0.h
-f:drivers/gpu/drm/amd/amdgpu/df_v1_7.c
-f:drivers/gpu/drm/amd/amdgpu/df_v1_7.h
-f:drivers/gpu/drm/amd/amdgpu/df_v3_6.c
-f:drivers/gpu/drm/amd/amdgpu/df_v3_6.h
-f:drivers/gpu/drm/amd/amdgpu/df_v4_15.c
-f:drivers/gpu/drm/amd/amdgpu/df_v4_15.h
-f:drivers/gpu/drm/amd/amdgpu/df_v4_3.c
-f:drivers/gpu/drm/amd/amdgpu/df_v4_3.h
-f:drivers/gpu/drm/amd/amdgpu/df_v4_6_2.c
-f:drivers/gpu/drm/amd/amdgpu/df_v4_6_2.h
-f:drivers/gpu/drm/amd/amdgpu/dimgrey_cavefish_reg_init.c
-f:drivers/gpu/drm/amd/amdgpu/emu_soc.c
-f:drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
-f:drivers/gpu/drm/amd/amdgpu/gfx_v10_0.h
-f:drivers/gpu/drm/amd/amdgpu/gfx_v10_0_cleaner_shader.h
-f:drivers/gpu/drm/amd/amdgpu/gfx_v10_1_10_cleaner_shader.asm
-f:drivers/gpu/drm/amd/amdgpu/gfx_v10_3_0_cleaner_shader.asm
-f:drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
-f:drivers/gpu/drm/amd/amdgpu/gfx_v11_0.h
-f:drivers/gpu/drm/amd/amdgpu/gfx_v11_0_3.c
-f:drivers/gpu/drm/amd/amdgpu/gfx_v11_0_3.h
-f:drivers/gpu/drm/amd/amdgpu/gfx_v11_0_3_cleaner_shader.asm
-f:drivers/gpu/drm/amd/amdgpu/gfx_v11_0_cleaner_shader.h
-f:drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
-f:drivers/gpu/drm/amd/amdgpu/gfx_v12_0.h
-f:drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
-f:drivers/gpu/drm/amd/amdgpu/gfx_v6_0.h
-f:drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
-f:drivers/gpu/drm/amd/amdgpu/gfx_v7_0.h
-f:drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
-f:drivers/gpu/drm/amd/amdgpu/gfx_v8_0.h
-f:drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
-f:drivers/gpu/drm/amd/amdgpu/gfx_v9_0.h
-f:drivers/gpu/drm/amd/amdgpu/gfx_v9_0_cleaner_shader.h
-f:drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c
-f:drivers/gpu/drm/amd/amdgpu/gfx_v9_4.h
-f:drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c
-f:drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.h
-f:drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2_cleaner_shader.asm
-f:drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
-f:drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.h
-f:drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3_cleaner_shader.asm
-f:drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3_cleaner_shader.h
-f:drivers/gpu/drm/amd/amdgpu/gfxhub_v11_5_0.c
-f:drivers/gpu/drm/amd/amdgpu/gfxhub_v11_5_0.h
-f:drivers/gpu/drm/amd/amdgpu/gfxhub_v12_0.c
-f:drivers/gpu/drm/amd/amdgpu/gfxhub_v12_0.h
-f:drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c
-f:drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.h
-f:drivers/gpu/drm/amd/amdgpu/gfxhub_v1_1.c
-f:drivers/gpu/drm/amd/amdgpu/gfxhub_v1_1.h
-f:drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c
-f:drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.h
-f:drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c
-f:drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.h
-f:drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c
-f:drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.h
-f:drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0.c
-f:drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0.h
-f:drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0_3.c
-f:drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0_3.h
-f:drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
-f:drivers/gpu/drm/amd/amdgpu/gmc_v10_0.h
-f:drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c
-f:drivers/gpu/drm/amd/amdgpu/gmc_v11_0.h
-f:drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c
-f:drivers/gpu/drm/amd/amdgpu/gmc_v12_0.h
-f:drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
-f:drivers/gpu/drm/amd/amdgpu/gmc_v6_0.h
-f:drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
-f:drivers/gpu/drm/amd/amdgpu/gmc_v7_0.h
-f:drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
-f:drivers/gpu/drm/amd/amdgpu/gmc_v8_0.h
-f:drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
-f:drivers/gpu/drm/amd/amdgpu/gmc_v9_0.h
-f:drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c
-f:drivers/gpu/drm/amd/amdgpu/hdp_v4_0.h
-f:drivers/gpu/drm/amd/amdgpu/hdp_v5_0.c
-f:drivers/gpu/drm/amd/amdgpu/hdp_v5_0.h
-f:drivers/gpu/drm/amd/amdgpu/hdp_v5_2.c
-f:drivers/gpu/drm/amd/amdgpu/hdp_v5_2.h
-f:drivers/gpu/drm/amd/amdgpu/hdp_v6_0.c
-f:drivers/gpu/drm/amd/amdgpu/hdp_v6_0.h
-f:drivers/gpu/drm/amd/amdgpu/hdp_v7_0.c
-f:drivers/gpu/drm/amd/amdgpu/hdp_v7_0.h
-f:drivers/gpu/drm/amd/amdgpu/iceland_ih.c
-f:drivers/gpu/drm/amd/amdgpu/iceland_ih.h
-f:drivers/gpu/drm/amd/amdgpu/iceland_sdma_pkt_open.h
-f:drivers/gpu/drm/amd/amdgpu/ih_v6_0.c
-f:drivers/gpu/drm/amd/amdgpu/ih_v6_0.h
-f:drivers/gpu/drm/amd/amdgpu/ih_v6_1.c
-f:drivers/gpu/drm/amd/amdgpu/ih_v6_1.h
-f:drivers/gpu/drm/amd/amdgpu/ih_v7_0.c
-f:drivers/gpu/drm/amd/amdgpu/ih_v7_0.h
-f:drivers/gpu/drm/amd/amdgpu/imu_v11_0.c
-f:drivers/gpu/drm/amd/amdgpu/imu_v11_0.h
-f:drivers/gpu/drm/amd/amdgpu/imu_v11_0_3.c
-f:drivers/gpu/drm/amd/amdgpu/imu_v11_0_3.h
-f:drivers/gpu/drm/amd/amdgpu/imu_v12_0.c
-f:drivers/gpu/drm/amd/amdgpu/imu_v12_0.h
-f:drivers/gpu/drm/amd/amdgpu/isp_v4_1_0.c
-f:drivers/gpu/drm/amd/amdgpu/isp_v4_1_0.h
-f:drivers/gpu/drm/amd/amdgpu/isp_v4_1_1.c
-f:drivers/gpu/drm/amd/amdgpu/isp_v4_1_1.h
-f:drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c
-f:drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.h
-f:drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c
-f:drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.h
-f:drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c
-f:drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.h
-f:drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c
-f:drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.h
-f:drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c
-f:drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.h
-f:drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c
-f:drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.h
-f:drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.c
-f:drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.h
-f:drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c
-f:drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.h
-f:drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.c
-f:drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.h
-f:drivers/gpu/drm/amd/amdgpu/lsdma_v6_0.c
-f:drivers/gpu/drm/amd/amdgpu/lsdma_v6_0.h
-f:drivers/gpu/drm/amd/amdgpu/lsdma_v7_0.c
-f:drivers/gpu/drm/amd/amdgpu/lsdma_v7_0.h
-f:drivers/gpu/drm/amd/amdgpu/mca_v3_0.c
-f:drivers/gpu/drm/amd/amdgpu/mca_v3_0.h
-f:drivers/gpu/drm/amd/amdgpu/mes_userqueue.c
-f:drivers/gpu/drm/amd/amdgpu/mes_userqueue.h
-f:drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
-f:drivers/gpu/drm/amd/amdgpu/mes_v11_0.h
-f:drivers/gpu/drm/amd/amdgpu/mes_v12_0.c
-f:drivers/gpu/drm/amd/amdgpu/mes_v12_0.h
-f:drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
-f:drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h
-f:drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c
-f:drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.h
-f:drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c
-f:drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.h
-f:drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c
-f:drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.h
-f:drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c
-f:drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.h
-f:drivers/gpu/drm/amd/amdgpu/mmhub_v3_0.c
-f:drivers/gpu/drm/amd/amdgpu/mmhub_v3_0.h
-f:drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_1.c
-f:drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_1.h
-f:drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_2.c
-f:drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_2.h
-f:drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c
-f:drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.h
-f:drivers/gpu/drm/amd/amdgpu/mmhub_v4_1_0.c
-f:drivers/gpu/drm/amd/amdgpu/mmhub_v4_1_0.h
-f:drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c
-f:drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.h
-f:drivers/gpu/drm/amd/amdgpu/mmsch_v1_0.h
-f:drivers/gpu/drm/amd/amdgpu/mmsch_v2_0.h
-f:drivers/gpu/drm/amd/amdgpu/mmsch_v3_0.h
-f:drivers/gpu/drm/amd/amdgpu/mmsch_v4_0.h
-f:drivers/gpu/drm/amd/amdgpu/mmsch_v4_0_3.h
-f:drivers/gpu/drm/amd/amdgpu/mmsch_v5_0.h
-f:drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c
-f:drivers/gpu/drm/amd/amdgpu/mxgpu_ai.h
-f:drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c
-f:drivers/gpu/drm/amd/amdgpu/mxgpu_nv.h
-f:drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c
-f:drivers/gpu/drm/amd/amdgpu/mxgpu_vi.h
-f:drivers/gpu/drm/amd/amdgpu/navi10_ih.c
-f:drivers/gpu/drm/amd/amdgpu/navi10_ih.h
-f:drivers/gpu/drm/amd/amdgpu/navi10_sdma_pkt_open.h
-f:drivers/gpu/drm/amd/amdgpu/nbif_v6_3_1.c
-f:drivers/gpu/drm/amd/amdgpu/nbif_v6_3_1.h
-f:drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c
-f:drivers/gpu/drm/amd/amdgpu/nbio_v2_3.h
-f:drivers/gpu/drm/amd/amdgpu/nbio_v4_3.c
-f:drivers/gpu/drm/amd/amdgpu/nbio_v4_3.h
-f:drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c
-f:drivers/gpu/drm/amd/amdgpu/nbio_v6_1.h
-f:drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c
-f:drivers/gpu/drm/amd/amdgpu/nbio_v7_0.h
-f:drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c
-f:drivers/gpu/drm/amd/amdgpu/nbio_v7_11.h
-f:drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c
-f:drivers/gpu/drm/amd/amdgpu/nbio_v7_2.h
-f:drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c
-f:drivers/gpu/drm/amd/amdgpu/nbio_v7_4.h
-f:drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c
-f:drivers/gpu/drm/amd/amdgpu/nbio_v7_7.h
-f:drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c
-f:drivers/gpu/drm/amd/amdgpu/nbio_v7_9.h
-f:drivers/gpu/drm/amd/amdgpu/nv.c
-f:drivers/gpu/drm/amd/amdgpu/nv.h
-f:drivers/gpu/drm/amd/amdgpu/nvd.h
-f:drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h
-f:drivers/gpu/drm/amd/amdgpu/psp_v10_0.c
-f:drivers/gpu/drm/amd/amdgpu/psp_v10_0.h
-f:drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
-f:drivers/gpu/drm/amd/amdgpu/psp_v11_0.h
-f:drivers/gpu/drm/amd/amdgpu/psp_v11_0_8.c
-f:drivers/gpu/drm/amd/amdgpu/psp_v11_0_8.h
-f:drivers/gpu/drm/amd/amdgpu/psp_v12_0.c
-f:drivers/gpu/drm/amd/amdgpu/psp_v12_0.h
-f:drivers/gpu/drm/amd/amdgpu/psp_v13_0.c
-f:drivers/gpu/drm/amd/amdgpu/psp_v13_0.h
-f:drivers/gpu/drm/amd/amdgpu/psp_v13_0_4.c
-f:drivers/gpu/drm/amd/amdgpu/psp_v13_0_4.h
-f:drivers/gpu/drm/amd/amdgpu/psp_v14_0.c
-f:drivers/gpu/drm/amd/amdgpu/psp_v14_0.h
-f:drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
-f:drivers/gpu/drm/amd/amdgpu/psp_v3_1.h
-f:drivers/gpu/drm/amd/amdgpu/sdma_common.h
-f:drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
-f:drivers/gpu/drm/amd/amdgpu/sdma_v2_4.h
-f:drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
-f:drivers/gpu/drm/amd/amdgpu/sdma_v3_0.h
-f:drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
-f:drivers/gpu/drm/amd/amdgpu/sdma_v4_0.h
-f:drivers/gpu/drm/amd/amdgpu/sdma_v4_4.c
-f:drivers/gpu/drm/amd/amdgpu/sdma_v4_4.h
-f:drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c
-f:drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.h
-f:drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
-f:drivers/gpu/drm/amd/amdgpu/sdma_v5_0.h
-f:drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
-f:drivers/gpu/drm/amd/amdgpu/sdma_v5_2.h
-f:drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
-f:drivers/gpu/drm/amd/amdgpu/sdma_v6_0.h
-f:drivers/gpu/drm/amd/amdgpu/sdma_v6_0_0_pkt_open.h
-f:drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c
-f:drivers/gpu/drm/amd/amdgpu/sdma_v7_0.h
-f:drivers/gpu/drm/amd/amdgpu/si.c
-f:drivers/gpu/drm/amd/amdgpu/si.h
-f:drivers/gpu/drm/amd/amdgpu/si_dma.c
-f:drivers/gpu/drm/amd/amdgpu/si_dma.h
-f:drivers/gpu/drm/amd/amdgpu/si_enums.h
-f:drivers/gpu/drm/amd/amdgpu/si_ih.c
-f:drivers/gpu/drm/amd/amdgpu/si_ih.h
-f:drivers/gpu/drm/amd/amdgpu/sid.h
-f:drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c
-f:drivers/gpu/drm/amd/amdgpu/sienna_cichlid.h
-f:drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c
-f:drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.h
-f:drivers/gpu/drm/amd/amdgpu/smu_v13_0_10.c
-f:drivers/gpu/drm/amd/amdgpu/smu_v13_0_10.h
-f:drivers/gpu/drm/amd/amdgpu/smuio_v11_0.c
-f:drivers/gpu/drm/amd/amdgpu/smuio_v11_0.h
-f:drivers/gpu/drm/amd/amdgpu/smuio_v11_0_6.c
-f:drivers/gpu/drm/amd/amdgpu/smuio_v11_0_6.h
-f:drivers/gpu/drm/amd/amdgpu/smuio_v13_0.c
-f:drivers/gpu/drm/amd/amdgpu/smuio_v13_0.h
-f:drivers/gpu/drm/amd/amdgpu/smuio_v13_0_3.c
-f:drivers/gpu/drm/amd/amdgpu/smuio_v13_0_3.h
-f:drivers/gpu/drm/amd/amdgpu/smuio_v13_0_6.c
-f:drivers/gpu/drm/amd/amdgpu/smuio_v13_0_6.h
-f:drivers/gpu/drm/amd/amdgpu/smuio_v14_0_2.c
-f:drivers/gpu/drm/amd/amdgpu/smuio_v14_0_2.h
-f:drivers/gpu/drm/amd/amdgpu/smuio_v9_0.c
-f:drivers/gpu/drm/amd/amdgpu/smuio_v9_0.h
-f:drivers/gpu/drm/amd/amdgpu/soc15.c
-f:drivers/gpu/drm/amd/amdgpu/soc15.h
-f:drivers/gpu/drm/amd/amdgpu/soc15_common.h
-f:drivers/gpu/drm/amd/amdgpu/soc15d.h
-f:drivers/gpu/drm/amd/amdgpu/soc21.c
-f:drivers/gpu/drm/amd/amdgpu/soc21.h
-f:drivers/gpu/drm/amd/amdgpu/soc24.c
-f:drivers/gpu/drm/amd/amdgpu/soc24.h
-f:drivers/gpu/drm/amd/amdgpu/ta_rap_if.h
-f:drivers/gpu/drm/amd/amdgpu/ta_ras_if.h
-f:drivers/gpu/drm/amd/amdgpu/ta_secureDisplay_if.h
-f:drivers/gpu/drm/amd/amdgpu/ta_xgmi_if.h
-f:drivers/gpu/drm/amd/amdgpu/tonga_ih.c
-f:drivers/gpu/drm/amd/amdgpu/tonga_ih.h
-f:drivers/gpu/drm/amd/amdgpu/tonga_sdma_pkt_open.h
-f:drivers/gpu/drm/amd/amdgpu/umc_v12_0.c
-f:drivers/gpu/drm/amd/amdgpu/umc_v12_0.h
-f:drivers/gpu/drm/amd/amdgpu/umc_v6_0.c
-f:drivers/gpu/drm/amd/amdgpu/umc_v6_0.h
-f:drivers/gpu/drm/amd/amdgpu/umc_v6_1.c
-f:drivers/gpu/drm/amd/amdgpu/umc_v6_1.h
-f:drivers/gpu/drm/amd/amdgpu/umc_v6_7.c
-f:drivers/gpu/drm/amd/amdgpu/umc_v6_7.h
-f:drivers/gpu/drm/amd/amdgpu/umc_v8_10.c
-f:drivers/gpu/drm/amd/amdgpu/umc_v8_10.h
-f:drivers/gpu/drm/amd/amdgpu/umc_v8_14.c
-f:drivers/gpu/drm/amd/amdgpu/umc_v8_14.h
-f:drivers/gpu/drm/amd/amdgpu/umc_v8_7.c
-f:drivers/gpu/drm/amd/amdgpu/umc_v8_7.h
-f:drivers/gpu/drm/amd/amdgpu/umsch_mm_v4_0.c
-f:drivers/gpu/drm/amd/amdgpu/umsch_mm_v4_0.h
-f:drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c
-f:drivers/gpu/drm/amd/amdgpu/uvd_v3_1.h
-f:drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c
-f:drivers/gpu/drm/amd/amdgpu/uvd_v4_2.h
-f:drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c
-f:drivers/gpu/drm/amd/amdgpu/uvd_v5_0.h
-f:drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
-f:drivers/gpu/drm/amd/amdgpu/uvd_v6_0.h
-f:drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
-f:drivers/gpu/drm/amd/amdgpu/uvd_v7_0.h
-f:drivers/gpu/drm/amd/amdgpu/vce_v2_0.c
-f:drivers/gpu/drm/amd/amdgpu/vce_v2_0.h
-f:drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
-f:drivers/gpu/drm/amd/amdgpu/vce_v3_0.h
-f:drivers/gpu/drm/amd/amdgpu/vce_v4_0.c
-f:drivers/gpu/drm/amd/amdgpu/vce_v4_0.h
-f:drivers/gpu/drm/amd/amdgpu/vcn_sw_ring.c
-f:drivers/gpu/drm/amd/amdgpu/vcn_sw_ring.h
-f:drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
-f:drivers/gpu/drm/amd/amdgpu/vcn_v1_0.h
-f:drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
-f:drivers/gpu/drm/amd/amdgpu/vcn_v2_0.h
-f:drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
-f:drivers/gpu/drm/amd/amdgpu/vcn_v2_5.h
-f:drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
-f:drivers/gpu/drm/amd/amdgpu/vcn_v3_0.h
-f:drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
-f:drivers/gpu/drm/amd/amdgpu/vcn_v4_0.h
-f:drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c
-f:drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.h
-f:drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c
-f:drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.h
-f:drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c
-f:drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.h
-f:drivers/gpu/drm/amd/amdgpu/vcn_v5_0_1.c
-f:drivers/gpu/drm/amd/amdgpu/vcn_v5_0_1.h
-f:drivers/gpu/drm/amd/amdgpu/vega10_ih.c
-f:drivers/gpu/drm/amd/amdgpu/vega10_ih.h
-f:drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c
-f:drivers/gpu/drm/amd/amdgpu/vega10_sdma_pkt_open.h
-f:drivers/gpu/drm/amd/amdgpu/vega20_ih.c
-f:drivers/gpu/drm/amd/amdgpu/vega20_ih.h
-f:drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c
-f:drivers/gpu/drm/amd/amdgpu/vi.c
-f:drivers/gpu/drm/amd/amdgpu/vi.h
-f:drivers/gpu/drm/amd/amdgpu/vid.h
-f:drivers/gpu/drm/amd/amdgpu/vpe_6_1_fw_if.h
-f:drivers/gpu/drm/amd/amdgpu/vpe_v6_1.c
-f:drivers/gpu/drm/amd/amdgpu/vpe_v6_1.h
-f:drivers/gpu/drm/amd/amdkfd/Kconfig
-f:drivers/gpu/drm/amd/amdkfd/Makefile
-f:drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c
-f:drivers/gpu/drm/amd/amdkfd/cik_int.h
-f:drivers/gpu/drm/amd/amdkfd/cik_regs.h
-f:drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h
-f:drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm
-f:drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx12.asm
-f:drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx8.asm
-f:drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm
-f:drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
-f:drivers/gpu/drm/amd/amdkfd/kfd_crat.c
-f:drivers/gpu/drm/amd/amdkfd/kfd_crat.h
-f:drivers/gpu/drm/amd/amdkfd/kfd_debug.c
-f:drivers/gpu/drm/amd/amdkfd/kfd_debug.h
-f:drivers/gpu/drm/amd/amdkfd/kfd_debugfs.c
-f:drivers/gpu/drm/amd/amdkfd/kfd_device.c
-f:drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
-f:drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
-f:drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_cik.c
-f:drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v10.c
-f:drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v11.c
-f:drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v12.c
-f:drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v9.c
-f:drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_vi.c
-f:drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c
-f:drivers/gpu/drm/amd/amdkfd/kfd_events.c
-f:drivers/gpu/drm/amd/amdkfd/kfd_events.h
-f:drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c
-f:drivers/gpu/drm/amd/amdkfd/kfd_int_process_v10.c
-f:drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c
-f:drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c
-f:drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c
-f:drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c
-f:drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h
-f:drivers/gpu/drm/amd/amdkfd/kfd_migrate.c
-f:drivers/gpu/drm/amd/amdkfd/kfd_migrate.h
-f:drivers/gpu/drm/amd/amdkfd/kfd_module.c
-f:drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
-f:drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h
-f:drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c
-f:drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c
-f:drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c
-f:drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12.c
-f:drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c
-f:drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c
-f:drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c
-f:drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c
-f:drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_vi.c
-f:drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers.h
-f:drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_ai.h
-f:drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_aldebaran.h
-f:drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_vi.h
-f:drivers/gpu/drm/amd/amdkfd/kfd_pm4_opcodes.h
-f:drivers/gpu/drm/amd/amdkfd/kfd_priv.h
-f:drivers/gpu/drm/amd/amdkfd/kfd_process.c
-f:drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c
-f:drivers/gpu/drm/amd/amdkfd/kfd_queue.c
-f:drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c
-f:drivers/gpu/drm/amd/amdkfd/kfd_smi_events.h
-f:drivers/gpu/drm/amd/amdkfd/kfd_svm.c
-f:drivers/gpu/drm/amd/amdkfd/kfd_svm.h
-f:drivers/gpu/drm/amd/amdkfd/kfd_topology.c
-f:drivers/gpu/drm/amd/amdkfd/kfd_topology.h
-f:drivers/gpu/drm/amd/amdkfd/soc15_int.h
-f:drivers/gpu/drm/amd/amdxcp/Makefile
-f:drivers/gpu/drm/amd/amdxcp/amdgpu_xcp_drv.c
-f:drivers/gpu/drm/amd/amdxcp/amdgpu_xcp_drv.h
-f:drivers/gpu/drm/amd/display/Kconfig
-f:drivers/gpu/drm/amd/display/Makefile
-f:drivers/gpu/drm/amd/display/amdgpu_dm/Makefile
-f:drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
-f:drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
-f:drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c
-f:drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c
-f:drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.h
-f:drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c
-f:drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.h
-f:drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c
-f:drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.h
-f:drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c
-f:drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.h
-f:drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
-f:drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c
-f:drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h
-f:drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq_params.h
-f:drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
-f:drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h
-f:drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
-f:drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h
-f:drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c
-f:drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c
-f:drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.h
-f:drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_quirks.c
-f:drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_replay.c
-f:drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_replay.h
-f:drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.c
-f:drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_trace.h
-f:drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c
-f:drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.h
-f:drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.c
-f:drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.h
-f:drivers/gpu/drm/amd/display/dc/Makefile
-f:drivers/gpu/drm/amd/display/dc/basics/Makefile
-f:drivers/gpu/drm/amd/display/dc/basics/bw_fixed.c
-f:drivers/gpu/drm/amd/display/dc/basics/calcs_logger.h
-f:drivers/gpu/drm/amd/display/dc/basics/conversion.c
-f:drivers/gpu/drm/amd/display/dc/basics/conversion.h
-f:drivers/gpu/drm/amd/display/dc/basics/custom_float.c
-f:drivers/gpu/drm/amd/display/dc/basics/dc_common.c
-f:drivers/gpu/drm/amd/display/dc/basics/dc_common.h
-f:drivers/gpu/drm/amd/display/dc/basics/dce_calcs.c
-f:drivers/gpu/drm/amd/display/dc/basics/fixpt31_32.c
-f:drivers/gpu/drm/amd/display/dc/basics/logger.h
-f:drivers/gpu/drm/amd/display/dc/basics/vector.c
-f:drivers/gpu/drm/amd/display/dc/bios/Makefile
-f:drivers/gpu/drm/amd/display/dc/bios/bios_parser.c
-f:drivers/gpu/drm/amd/display/dc/bios/bios_parser.h
-f:drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c
-f:drivers/gpu/drm/amd/display/dc/bios/bios_parser2.h
-f:drivers/gpu/drm/amd/display/dc/bios/bios_parser_common.c
-f:drivers/gpu/drm/amd/display/dc/bios/bios_parser_common.h
-f:drivers/gpu/drm/amd/display/dc/bios/bios_parser_helper.c
-f:drivers/gpu/drm/amd/display/dc/bios/bios_parser_helper.h
-f:drivers/gpu/drm/amd/display/dc/bios/bios_parser_interface.c
-f:drivers/gpu/drm/amd/display/dc/bios/bios_parser_types_internal.h
-f:drivers/gpu/drm/amd/display/dc/bios/bios_parser_types_internal2.h
-f:drivers/gpu/drm/amd/display/dc/bios/command_table.c
-f:drivers/gpu/drm/amd/display/dc/bios/command_table.h
-f:drivers/gpu/drm/amd/display/dc/bios/command_table2.c
-f:drivers/gpu/drm/amd/display/dc/bios/command_table2.h
-f:drivers/gpu/drm/amd/display/dc/bios/command_table_helper.c
-f:drivers/gpu/drm/amd/display/dc/bios/command_table_helper.h
-f:drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c
-f:drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.h
-f:drivers/gpu/drm/amd/display/dc/bios/command_table_helper_struct.h
-f:drivers/gpu/drm/amd/display/dc/bios/dce110/command_table_helper_dce110.c
-f:drivers/gpu/drm/amd/display/dc/bios/dce110/command_table_helper_dce110.h
-f:drivers/gpu/drm/amd/display/dc/bios/dce112/command_table_helper2_dce112.c
-f:drivers/gpu/drm/amd/display/dc/bios/dce112/command_table_helper2_dce112.h
-f:drivers/gpu/drm/amd/display/dc/bios/dce112/command_table_helper_dce112.c
-f:drivers/gpu/drm/amd/display/dc/bios/dce112/command_table_helper_dce112.h
-f:drivers/gpu/drm/amd/display/dc/bios/dce60/command_table_helper_dce60.c
-f:drivers/gpu/drm/amd/display/dc/bios/dce60/command_table_helper_dce60.h
-f:drivers/gpu/drm/amd/display/dc/bios/dce80/command_table_helper_dce80.c
-f:drivers/gpu/drm/amd/display/dc/bios/dce80/command_table_helper_dce80.h
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dce100/dce_clk_mgr.h
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.c
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.h
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dce112/dce112_clk_mgr.c
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dce112/dce112_clk_mgr.h
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dce120/dce120_clk_mgr.c
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dce120/dce120_clk_mgr.h
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dce60/dce60_clk_mgr.c
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dce60/dce60_clk_mgr.h
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.h
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr_clk.h
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr_vbios_smu.c
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr_vbios_smu.h
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv2_clk_mgr.c
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv2_clk_mgr.h
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.h
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn201/dcn201_clk_mgr.c
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn201/dcn201_clk_mgr.h
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.h
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.h
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dalsmc.h
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.h
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.c
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.h
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_smu11_driver_if.h
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30m_clk_mgr.c
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30m_clk_mgr.h
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30m_clk_mgr_smu_msg.c
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30m_clk_mgr_smu_msg.h
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.c
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.h
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.h
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.h
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.h
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.h
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn314/dcn314_smu.c
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn314/dcn314_smu.h
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.h
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn315/dcn315_smu.c
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn315/dcn315_smu.h
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.c
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.h
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn316/dcn316_smu.c
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn316/dcn316_smu.h
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dalsmc.h
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.h
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr_smu_msg.c
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr_smu_msg.h
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_smu13_driver_if.h
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn351_clk_mgr.c
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.h
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_smu.c
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_smu.h
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn401/dalsmc.h
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.c
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.h
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr_smu_msg.c
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr_smu_msg.h
-f:drivers/gpu/drm/amd/display/dc/clk_mgr/dcn401/dcn401_smu14_driver_if.h
-f:drivers/gpu/drm/amd/display/dc/core/dc.c
-f:drivers/gpu/drm/amd/display/dc/core/dc_debug.c
-f:drivers/gpu/drm/amd/display/dc/core/dc_hw_sequencer.c
-f:drivers/gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c
-f:drivers/gpu/drm/amd/display/dc/core/dc_link_exports.c
-f:drivers/gpu/drm/amd/display/dc/core/dc_resource.c
-f:drivers/gpu/drm/amd/display/dc/core/dc_sink.c
-f:drivers/gpu/drm/amd/display/dc/core/dc_stat.c
-f:drivers/gpu/drm/amd/display/dc/core/dc_state.c
-f:drivers/gpu/drm/amd/display/dc/core/dc_stream.c
-f:drivers/gpu/drm/amd/display/dc/core/dc_surface.c
-f:drivers/gpu/drm/amd/display/dc/core/dc_vm_helper.c
-f:drivers/gpu/drm/amd/display/dc/dc.h
-f:drivers/gpu/drm/amd/display/dc/dc_bios_types.h
-f:drivers/gpu/drm/amd/display/dc/dc_ddc_types.h
-f:drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c
-f:drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h
-f:drivers/gpu/drm/amd/display/dc/dc_dp_types.h
-f:drivers/gpu/drm/amd/display/dc/dc_dsc.h
-f:drivers/gpu/drm/amd/display/dc/dc_edid_parser.c
-f:drivers/gpu/drm/amd/display/dc/dc_edid_parser.h
-f:drivers/gpu/drm/amd/display/dc/dc_fused_io.c
-f:drivers/gpu/drm/amd/display/dc/dc_fused_io.h
-f:drivers/gpu/drm/amd/display/dc/dc_hdmi_types.h
-f:drivers/gpu/drm/amd/display/dc/dc_helper.c
-f:drivers/gpu/drm/amd/display/dc/dc_hw_types.h
-f:drivers/gpu/drm/amd/display/dc/dc_plane.h
-f:drivers/gpu/drm/amd/display/dc/dc_plane_priv.h
-f:drivers/gpu/drm/amd/display/dc/dc_spl_translate.c
-f:drivers/gpu/drm/amd/display/dc/dc_spl_translate.h
-f:drivers/gpu/drm/amd/display/dc/dc_stat.h
-f:drivers/gpu/drm/amd/display/dc/dc_state.h
-f:drivers/gpu/drm/amd/display/dc/dc_state_priv.h
-f:drivers/gpu/drm/amd/display/dc/dc_stream.h
-f:drivers/gpu/drm/amd/display/dc/dc_stream_priv.h
-f:drivers/gpu/drm/amd/display/dc/dc_trace.h
-f:drivers/gpu/drm/amd/display/dc/dc_types.h
-f:drivers/gpu/drm/amd/display/dc/dccg/Makefile
-f:drivers/gpu/drm/amd/display/dc/dccg/dcn20/dcn20_dccg.c
-f:drivers/gpu/drm/amd/display/dc/dccg/dcn20/dcn20_dccg.h
-f:drivers/gpu/drm/amd/display/dc/dccg/dcn201/dcn201_dccg.c
-f:drivers/gpu/drm/amd/display/dc/dccg/dcn201/dcn201_dccg.h
-f:drivers/gpu/drm/amd/display/dc/dccg/dcn21/dcn21_dccg.c
-f:drivers/gpu/drm/amd/display/dc/dccg/dcn21/dcn21_dccg.h
-f:drivers/gpu/drm/amd/display/dc/dccg/dcn30/dcn30_dccg.c
-f:drivers/gpu/drm/amd/display/dc/dccg/dcn30/dcn30_dccg.h
-f:drivers/gpu/drm/amd/display/dc/dccg/dcn301/dcn301_dccg.c
-f:drivers/gpu/drm/amd/display/dc/dccg/dcn301/dcn301_dccg.h
-f:drivers/gpu/drm/amd/display/dc/dccg/dcn302/dcn302_dccg.h
-f:drivers/gpu/drm/amd/display/dc/dccg/dcn303/dcn303_dccg.h
-f:drivers/gpu/drm/amd/display/dc/dccg/dcn31/dcn31_dccg.c
-f:drivers/gpu/drm/amd/display/dc/dccg/dcn31/dcn31_dccg.h
-f:drivers/gpu/drm/amd/display/dc/dccg/dcn314/dcn314_dccg.c
-f:drivers/gpu/drm/amd/display/dc/dccg/dcn314/dcn314_dccg.h
-f:drivers/gpu/drm/amd/display/dc/dccg/dcn32/dcn32_dccg.c
-f:drivers/gpu/drm/amd/display/dc/dccg/dcn32/dcn32_dccg.h
-f:drivers/gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.c
-f:drivers/gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.h
-f:drivers/gpu/drm/amd/display/dc/dccg/dcn401/dcn401_dccg.c
-f:drivers/gpu/drm/amd/display/dc/dccg/dcn401/dcn401_dccg.h
-f:drivers/gpu/drm/amd/display/dc/dce/Makefile
-f:drivers/gpu/drm/amd/display/dc/dce/dce_abm.c
-f:drivers/gpu/drm/amd/display/dc/dce/dce_abm.h
-f:drivers/gpu/drm/amd/display/dc/dce/dce_audio.c
-f:drivers/gpu/drm/amd/display/dc/dce/dce_audio.h
-f:drivers/gpu/drm/amd/display/dc/dce/dce_aux.c
-f:drivers/gpu/drm/amd/display/dc/dce/dce_aux.h
-f:drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c
-f:drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c
-f:drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.h
-f:drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c
-f:drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h
-f:drivers/gpu/drm/amd/display/dc/dce/dce_i2c.c
-f:drivers/gpu/drm/amd/display/dc/dce/dce_i2c.h
-f:drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c
-f:drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.h
-f:drivers/gpu/drm/amd/display/dc/dce/dce_i2c_sw.c
-f:drivers/gpu/drm/amd/display/dc/dce/dce_i2c_sw.h
-f:drivers/gpu/drm/amd/display/dc/dce/dce_ipp.c
-f:drivers/gpu/drm/amd/display/dc/dce/dce_ipp.h
-f:drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c
-f:drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h
-f:drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c
-f:drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.h
-f:drivers/gpu/drm/amd/display/dc/dce/dce_opp.c
-f:drivers/gpu/drm/amd/display/dc/dce/dce_opp.h
-f:drivers/gpu/drm/amd/display/dc/dce/dce_panel_cntl.c
-f:drivers/gpu/drm/amd/display/dc/dce/dce_panel_cntl.h
-f:drivers/gpu/drm/amd/display/dc/dce/dce_scl_filters.c
-f:drivers/gpu/drm/amd/display/dc/dce/dce_scl_filters_old.c
-f:drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c
-f:drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.h
-f:drivers/gpu/drm/amd/display/dc/dce/dce_transform.c
-f:drivers/gpu/drm/amd/display/dc/dce/dce_transform.h
-f:drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c
-f:drivers/gpu/drm/amd/display/dc/dce/dmub_abm.h
-f:drivers/gpu/drm/amd/display/dc/dce/dmub_abm_lcd.c
-f:drivers/gpu/drm/amd/display/dc/dce/dmub_abm_lcd.h
-f:drivers/gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.c
-f:drivers/gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.h
-f:drivers/gpu/drm/amd/display/dc/dce/dmub_outbox.c
-f:drivers/gpu/drm/amd/display/dc/dce/dmub_outbox.h
-f:drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c
-f:drivers/gpu/drm/amd/display/dc/dce/dmub_psr.h
-f:drivers/gpu/drm/amd/display/dc/dce/dmub_replay.c
-f:drivers/gpu/drm/amd/display/dc/dce/dmub_replay.h
-f:drivers/gpu/drm/amd/display/dc/dce110/Makefile
-f:drivers/gpu/drm/amd/display/dc/dce110/dce110_compressor.c
-f:drivers/gpu/drm/amd/display/dc/dce110/dce110_compressor.h
-f:drivers/gpu/drm/amd/display/dc/dce110/dce110_mem_input_v.c
-f:drivers/gpu/drm/amd/display/dc/dce110/dce110_mem_input_v.h
-f:drivers/gpu/drm/amd/display/dc/dce110/dce110_opp_csc_v.c
-f:drivers/gpu/drm/amd/display/dc/dce110/dce110_opp_regamma_v.c
-f:drivers/gpu/drm/amd/display/dc/dce110/dce110_opp_v.c
-f:drivers/gpu/drm/amd/display/dc/dce110/dce110_opp_v.h
-f:drivers/gpu/drm/amd/display/dc/dce110/dce110_timing_generator.c
-f:drivers/gpu/drm/amd/display/dc/dce110/dce110_timing_generator.h
-f:drivers/gpu/drm/amd/display/dc/dce110/dce110_timing_generator_v.c
-f:drivers/gpu/drm/amd/display/dc/dce110/dce110_timing_generator_v.h
-f:drivers/gpu/drm/amd/display/dc/dce110/dce110_transform_v.c
-f:drivers/gpu/drm/amd/display/dc/dce110/dce110_transform_v.h
-f:drivers/gpu/drm/amd/display/dc/dce112/Makefile
-f:drivers/gpu/drm/amd/display/dc/dce112/dce112_compressor.c
-f:drivers/gpu/drm/amd/display/dc/dce112/dce112_compressor.h
-f:drivers/gpu/drm/amd/display/dc/dce120/Makefile
-f:drivers/gpu/drm/amd/display/dc/dce120/dce120_timing_generator.c
-f:drivers/gpu/drm/amd/display/dc/dce120/dce120_timing_generator.h
-f:drivers/gpu/drm/amd/display/dc/dce60/Makefile
-f:drivers/gpu/drm/amd/display/dc/dce60/dce60_timing_generator.c
-f:drivers/gpu/drm/amd/display/dc/dce60/dce60_timing_generator.h
-f:drivers/gpu/drm/amd/display/dc/dce80/Makefile
-f:drivers/gpu/drm/amd/display/dc/dce80/dce80_timing_generator.c
-f:drivers/gpu/drm/amd/display/dc/dce80/dce80_timing_generator.h
-f:drivers/gpu/drm/amd/display/dc/dcn10/Makefile
-f:drivers/gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c
-f:drivers/gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.h
-f:drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dwb.c
-f:drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dwb.h
-f:drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer_debug.c
-f:drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer_debug.h
-f:drivers/gpu/drm/amd/display/dc/dcn10/dcn10_ipp.c
-f:drivers/gpu/drm/amd/display/dc/dcn10/dcn10_ipp.h
-f:drivers/gpu/drm/amd/display/dc/dcn20/Makefile
-f:drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dwb.c
-f:drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dwb.h
-f:drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dwb_scl.c
-f:drivers/gpu/drm/amd/display/dc/dcn20/dcn20_vmid.c
-f:drivers/gpu/drm/amd/display/dc/dcn20/dcn20_vmid.h
-f:drivers/gpu/drm/amd/display/dc/dcn201/Makefile
-f:drivers/gpu/drm/amd/display/dc/dcn201/dcn201_link_encoder.c
-f:drivers/gpu/drm/amd/display/dc/dcn201/dcn201_link_encoder.h
-f:drivers/gpu/drm/amd/display/dc/dcn201/dcn201_mpc.c
-f:drivers/gpu/drm/amd/display/dc/dcn201/dcn201_mpc.h
-f:drivers/gpu/drm/amd/display/dc/dcn201/dcn201_opp.c
-f:drivers/gpu/drm/amd/display/dc/dcn201/dcn201_opp.h
-f:drivers/gpu/drm/amd/display/dc/dcn21/Makefile
-f:drivers/gpu/drm/amd/display/dc/dcn21/dcn21_link_encoder.c
-f:drivers/gpu/drm/amd/display/dc/dcn21/dcn21_link_encoder.h
-f:drivers/gpu/drm/amd/display/dc/dcn30/Makefile
-f:drivers/gpu/drm/amd/display/dc/dcn30/dcn30_afmt.c
-f:drivers/gpu/drm/amd/display/dc/dcn30/dcn30_afmt.h
-f:drivers/gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c
-f:drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mmhubbub.c
-f:drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mmhubbub.h
-f:drivers/gpu/drm/amd/display/dc/dcn30/dcn30_opp.h
-f:drivers/gpu/drm/amd/display/dc/dcn30/dcn30_vpg.c
-f:drivers/gpu/drm/amd/display/dc/dcn30/dcn30_vpg.h
-f:drivers/gpu/drm/amd/display/dc/dcn301/Makefile
-f:drivers/gpu/drm/amd/display/dc/dcn301/dcn301_panel_cntl.c
-f:drivers/gpu/drm/amd/display/dc/dcn301/dcn301_panel_cntl.h
-f:drivers/gpu/drm/amd/display/dc/dcn31/Makefile
-f:drivers/gpu/drm/amd/display/dc/dcn31/dcn31_afmt.c
-f:drivers/gpu/drm/amd/display/dc/dcn31/dcn31_afmt.h
-f:drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.c
-f:drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.h
-f:drivers/gpu/drm/amd/display/dc/dcn31/dcn31_panel_cntl.c
-f:drivers/gpu/drm/amd/display/dc/dcn31/dcn31_panel_cntl.h
-f:drivers/gpu/drm/amd/display/dc/dcn31/dcn31_vpg.c
-f:drivers/gpu/drm/amd/display/dc/dcn31/dcn31_vpg.h
-f:drivers/gpu/drm/amd/display/dc/dio/Makefile
-f:drivers/gpu/drm/amd/display/dc/dio/dcn10/dcn10_link_encoder.c
-f:drivers/gpu/drm/amd/display/dc/dio/dcn10/dcn10_link_encoder.h
-f:drivers/gpu/drm/amd/display/dc/dio/dcn10/dcn10_stream_encoder.c
-f:drivers/gpu/drm/amd/display/dc/dio/dcn10/dcn10_stream_encoder.h
-f:drivers/gpu/drm/amd/display/dc/dio/dcn20/dcn20_link_encoder.c
-f:drivers/gpu/drm/amd/display/dc/dio/dcn20/dcn20_link_encoder.h
-f:drivers/gpu/drm/amd/display/dc/dio/dcn20/dcn20_stream_encoder.c
-f:drivers/gpu/drm/amd/display/dc/dio/dcn20/dcn20_stream_encoder.h
-f:drivers/gpu/drm/amd/display/dc/dio/dcn30/dcn30_dio_link_encoder.c
-f:drivers/gpu/drm/amd/display/dc/dio/dcn30/dcn30_dio_link_encoder.h
-f:drivers/gpu/drm/amd/display/dc/dio/dcn30/dcn30_dio_stream_encoder.c
-f:drivers/gpu/drm/amd/display/dc/dio/dcn30/dcn30_dio_stream_encoder.h
-f:drivers/gpu/drm/amd/display/dc/dio/dcn301/dcn301_dio_link_encoder.c
-f:drivers/gpu/drm/amd/display/dc/dio/dcn301/dcn301_dio_link_encoder.h
-f:drivers/gpu/drm/amd/display/dc/dio/dcn31/dcn31_dio_link_encoder.c
-f:drivers/gpu/drm/amd/display/dc/dio/dcn31/dcn31_dio_link_encoder.h
-f:drivers/gpu/drm/amd/display/dc/dio/dcn314/dcn314_dio_stream_encoder.c
-f:drivers/gpu/drm/amd/display/dc/dio/dcn314/dcn314_dio_stream_encoder.h
-f:drivers/gpu/drm/amd/display/dc/dio/dcn32/dcn32_dio_link_encoder.c
-f:drivers/gpu/drm/amd/display/dc/dio/dcn32/dcn32_dio_link_encoder.h
-f:drivers/gpu/drm/amd/display/dc/dio/dcn32/dcn32_dio_stream_encoder.c
-f:drivers/gpu/drm/amd/display/dc/dio/dcn32/dcn32_dio_stream_encoder.h
-f:drivers/gpu/drm/amd/display/dc/dio/dcn321/dcn321_dio_link_encoder.c
-f:drivers/gpu/drm/amd/display/dc/dio/dcn321/dcn321_dio_link_encoder.h
-f:drivers/gpu/drm/amd/display/dc/dio/dcn35/dcn35_dio_link_encoder.c
-f:drivers/gpu/drm/amd/display/dc/dio/dcn35/dcn35_dio_link_encoder.h
-f:drivers/gpu/drm/amd/display/dc/dio/dcn35/dcn35_dio_stream_encoder.c
-f:drivers/gpu/drm/amd/display/dc/dio/dcn35/dcn35_dio_stream_encoder.h
-f:drivers/gpu/drm/amd/display/dc/dio/dcn401/dcn401_dio_link_encoder.c
-f:drivers/gpu/drm/amd/display/dc/dio/dcn401/dcn401_dio_link_encoder.h
-f:drivers/gpu/drm/amd/display/dc/dio/dcn401/dcn401_dio_stream_encoder.c
-f:drivers/gpu/drm/amd/display/dc/dio/dcn401/dcn401_dio_stream_encoder.h
-f:drivers/gpu/drm/amd/display/dc/dm_cp_psp.h
-f:drivers/gpu/drm/amd/display/dc/dm_event_log.h
-f:drivers/gpu/drm/amd/display/dc/dm_helpers.h
-f:drivers/gpu/drm/amd/display/dc/dm_pp_smu.h
-f:drivers/gpu/drm/amd/display/dc/dm_services.h
-f:drivers/gpu/drm/amd/display/dc/dm_services_types.h
-f:drivers/gpu/drm/amd/display/dc/dml/Makefile
-f:drivers/gpu/drm/amd/display/dc/dml/calcs/dcn_calc_auto.c
-f:drivers/gpu/drm/amd/display/dc/dml/calcs/dcn_calc_auto.h
-f:drivers/gpu/drm/amd/display/dc/dml/calcs/dcn_calc_math.c
-f:drivers/gpu/drm/amd/display/dc/dml/calcs/dcn_calcs.c
-f:drivers/gpu/drm/amd/display/dc/dml/dc_features.h
-f:drivers/gpu/drm/amd/display/dc/dml/dcn10/dcn10_fpu.c
-f:drivers/gpu/drm/amd/display/dc/dml/dcn10/dcn10_fpu.h
-f:drivers/gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c
-f:drivers/gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.h
-f:drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20.c
-f:drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20.h
-f:drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20v2.c
-f:drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20v2.h
-f:drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20.c
-f:drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20.h
-f:drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.c
-f:drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.h
-f:drivers/gpu/drm/amd/display/dc/dml/dcn21/display_mode_vba_21.c
-f:drivers/gpu/drm/amd/display/dc/dml/dcn21/display_mode_vba_21.h
-f:drivers/gpu/drm/amd/display/dc/dml/dcn21/display_rq_dlg_calc_21.c
-f:drivers/gpu/drm/amd/display/dc/dml/dcn21/display_rq_dlg_calc_21.h
-f:drivers/gpu/drm/amd/display/dc/dml/dcn30/dcn30_fpu.c
-f:drivers/gpu/drm/amd/display/dc/dml/dcn30/dcn30_fpu.h
-f:drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c
-f:drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.h
-f:drivers/gpu/drm/amd/display/dc/dml/dcn30/display_rq_dlg_calc_30.c
-f:drivers/gpu/drm/amd/display/dc/dml/dcn30/display_rq_dlg_calc_30.h
-f:drivers/gpu/drm/amd/display/dc/dml/dcn301/dcn301_fpu.c
-f:drivers/gpu/drm/amd/display/dc/dml/dcn301/dcn301_fpu.h
-f:drivers/gpu/drm/amd/display/dc/dml/dcn302/dcn302_fpu.c
-f:drivers/gpu/drm/amd/display/dc/dml/dcn302/dcn302_fpu.h
-f:drivers/gpu/drm/amd/display/dc/dml/dcn303/dcn303_fpu.c
-f:drivers/gpu/drm/amd/display/dc/dml/dcn303/dcn303_fpu.h
-f:drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c
-f:drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.h
-f:drivers/gpu/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.c
-f:drivers/gpu/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.h
-f:drivers/gpu/drm/amd/display/dc/dml/dcn31/display_rq_dlg_calc_31.c
-f:drivers/gpu/drm/amd/display/dc/dml/dcn31/display_rq_dlg_calc_31.h
-f:drivers/gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c
-f:drivers/gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.h
-f:drivers/gpu/drm/amd/display/dc/dml/dcn314/display_mode_vba_314.c
-f:drivers/gpu/drm/amd/display/dc/dml/dcn314/display_mode_vba_314.h
-f:drivers/gpu/drm/amd/display/dc/dml/dcn314/display_rq_dlg_calc_314.c
-f:drivers/gpu/drm/amd/display/dc/dml/dcn314/display_rq_dlg_calc_314.h
-f:drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c
-f:drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.h
-f:drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c
-f:drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.h
-f:drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_util_32.c
-f:drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_util_32.h
-f:drivers/gpu/drm/amd/display/dc/dml/dcn32/display_rq_dlg_calc_32.c
-f:drivers/gpu/drm/amd/display/dc/dml/dcn32/display_rq_dlg_calc_32.h
-f:drivers/gpu/drm/amd/display/dc/dml/dcn321/dcn321_fpu.c
-f:drivers/gpu/drm/amd/display/dc/dml/dcn321/dcn321_fpu.h
-f:drivers/gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c
-f:drivers/gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.h
-f:drivers/gpu/drm/amd/display/dc/dml/dcn351/dcn351_fpu.c
-f:drivers/gpu/drm/amd/display/dc/dml/dcn351/dcn351_fpu.h
-f:drivers/gpu/drm/amd/display/dc/dml/display_mode_enums.h
-f:drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.c
-f:drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.h
-f:drivers/gpu/drm/amd/display/dc/dml/display_mode_structs.h
-f:drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c
-f:drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.h
-f:drivers/gpu/drm/amd/display/dc/dml/display_rq_dlg_helpers.c
-f:drivers/gpu/drm/amd/display/dc/dml/display_rq_dlg_helpers.h
-f:drivers/gpu/drm/amd/display/dc/dml/dml1_display_rq_dlg_calc.c
-f:drivers/gpu/drm/amd/display/dc/dml/dml1_display_rq_dlg_calc.h
-f:drivers/gpu/drm/amd/display/dc/dml/dml_inline_defs.h
-f:drivers/gpu/drm/amd/display/dc/dml/dml_logger.h
-f:drivers/gpu/drm/amd/display/dc/dml/dsc/qp_tables.h
-f:drivers/gpu/drm/amd/display/dc/dml/dsc/rc_calc_fpu.c
-f:drivers/gpu/drm/amd/display/dc/dml/dsc/rc_calc_fpu.h
-f:drivers/gpu/drm/amd/display/dc/dml2/Makefile
-f:drivers/gpu/drm/amd/display/dc/dml2/cmntypes.h
-f:drivers/gpu/drm/amd/display/dc/dml2/display_mode_core.c
-f:drivers/gpu/drm/amd/display/dc/dml2/display_mode_core.h
-f:drivers/gpu/drm/amd/display/dc/dml2/display_mode_core_structs.h
-f:drivers/gpu/drm/amd/display/dc/dml2/display_mode_lib_defines.h
-f:drivers/gpu/drm/amd/display/dc/dml2/display_mode_util.c
-f:drivers/gpu/drm/amd/display/dc/dml2/display_mode_util.h
-f:drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_translation_helper.c
-f:drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_translation_helper.h
-f:drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_utils.c
-f:drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_utils.h
-f:drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_wrapper.c
-f:drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_wrapper.h
-f:drivers/gpu/drm/amd/display/dc/dml2/dml21/inc/bounding_boxes/dcn4_soc_bb.h
-f:drivers/gpu/drm/amd/display/dc/dml2/dml21/inc/dml2_external_lib_deps.h
-f:drivers/gpu/drm/amd/display/dc/dml2/dml21/inc/dml_top.h
-f:drivers/gpu/drm/amd/display/dc/dml2/dml21/inc/dml_top_dchub_registers.h
-f:drivers/gpu/drm/amd/display/dc/dml2/dml21/inc/dml_top_display_cfg_types.h
-f:drivers/gpu/drm/amd/display/dc/dml2/dml21/inc/dml_top_policy_types.h
-f:drivers/gpu/drm/amd/display/dc/dml2/dml21/inc/dml_top_soc_parameter_types.h
-f:drivers/gpu/drm/amd/display/dc/dml2/dml21/inc/dml_top_types.h
-f:drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_dcn4.c
-f:drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_dcn4.h
-f:drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_dcn4_calcs.c
-f:drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_dcn4_calcs.h
-f:drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_factory.c
-f:drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_factory.h
-f:drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_shared_types.h
-f:drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_utils.c
-f:drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_utils.h
-f:drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.c
-f:drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.h
-f:drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_factory.c
-f:drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_factory.h
-f:drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_mcg/dml2_mcg_dcn4.c
-f:drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_mcg/dml2_mcg_dcn4.h
-f:drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_mcg/dml2_mcg_factory.c
-f:drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_mcg/dml2_mcg_factory.h
-f:drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn3.c
-f:drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn3.h
-f:drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c
-f:drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.h
-f:drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_factory.c
-f:drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_factory.h
-f:drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_standalone_libraries/lib_float_math.c
-f:drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_standalone_libraries/lib_float_math.h
-f:drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml2_top_interfaces.c
-f:drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml2_top_legacy.c
-f:drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml2_top_legacy.h
-f:drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml2_top_soc15.c
-f:drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml2_top_soc15.h
-f:drivers/gpu/drm/amd/display/dc/dml2/dml21/src/inc/dml2_debug.h
-f:drivers/gpu/drm/amd/display/dc/dml2/dml21/src/inc/dml2_internal_shared_types.h
-f:drivers/gpu/drm/amd/display/dc/dml2/dml2_dc_resource_mgmt.c
-f:drivers/gpu/drm/amd/display/dc/dml2/dml2_dc_resource_mgmt.h
-f:drivers/gpu/drm/amd/display/dc/dml2/dml2_dc_types.h
-f:drivers/gpu/drm/amd/display/dc/dml2/dml2_internal_types.h
-f:drivers/gpu/drm/amd/display/dc/dml2/dml2_mall_phantom.c
-f:drivers/gpu/drm/amd/display/dc/dml2/dml2_mall_phantom.h
-f:drivers/gpu/drm/amd/display/dc/dml2/dml2_policy.c
-f:drivers/gpu/drm/amd/display/dc/dml2/dml2_policy.h
-f:drivers/gpu/drm/amd/display/dc/dml2/dml2_translation_helper.c
-f:drivers/gpu/drm/amd/display/dc/dml2/dml2_translation_helper.h
-f:drivers/gpu/drm/amd/display/dc/dml2/dml2_utils.c
-f:drivers/gpu/drm/amd/display/dc/dml2/dml2_utils.h
-f:drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.c
-f:drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.h
-f:drivers/gpu/drm/amd/display/dc/dml2/dml_assert.h
-f:drivers/gpu/drm/amd/display/dc/dml2/dml_depedencies.h
-f:drivers/gpu/drm/amd/display/dc/dml2/dml_display_rq_dlg_calc.c
-f:drivers/gpu/drm/amd/display/dc/dml2/dml_display_rq_dlg_calc.h
-f:drivers/gpu/drm/amd/display/dc/dml2/dml_logging.h
-f:drivers/gpu/drm/amd/display/dc/dpp/Makefile
-f:drivers/gpu/drm/amd/display/dc/dpp/dcn10/dcn10_dpp.c
-f:drivers/gpu/drm/amd/display/dc/dpp/dcn10/dcn10_dpp.h
-f:drivers/gpu/drm/amd/display/dc/dpp/dcn10/dcn10_dpp_cm.c
-f:drivers/gpu/drm/amd/display/dc/dpp/dcn10/dcn10_dpp_dscl.c
-f:drivers/gpu/drm/amd/display/dc/dpp/dcn20/dcn20_dpp.c
-f:drivers/gpu/drm/amd/display/dc/dpp/dcn20/dcn20_dpp.h
-f:drivers/gpu/drm/amd/display/dc/dpp/dcn20/dcn20_dpp_cm.c
-f:drivers/gpu/drm/amd/display/dc/dpp/dcn201/dcn201_dpp.c
-f:drivers/gpu/drm/amd/display/dc/dpp/dcn201/dcn201_dpp.h
-f:drivers/gpu/drm/amd/display/dc/dpp/dcn30/dcn30_dpp.c
-f:drivers/gpu/drm/amd/display/dc/dpp/dcn30/dcn30_dpp.h
-f:drivers/gpu/drm/amd/display/dc/dpp/dcn30/dcn30_dpp_cm.c
-f:drivers/gpu/drm/amd/display/dc/dpp/dcn32/dcn32_dpp.c
-f:drivers/gpu/drm/amd/display/dc/dpp/dcn32/dcn32_dpp.h
-f:drivers/gpu/drm/amd/display/dc/dpp/dcn35/dcn35_dpp.c
-f:drivers/gpu/drm/amd/display/dc/dpp/dcn35/dcn35_dpp.h
-f:drivers/gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp.c
-f:drivers/gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp.h
-f:drivers/gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp_cm.c
-f:drivers/gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp_dscl.c
-f:drivers/gpu/drm/amd/display/dc/dsc/Makefile
-f:drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c
-f:drivers/gpu/drm/amd/display/dc/dsc/dcn20/dcn20_dsc.c
-f:drivers/gpu/drm/amd/display/dc/dsc/dcn20/dcn20_dsc.h
-f:drivers/gpu/drm/amd/display/dc/dsc/dcn35/dcn35_dsc.c
-f:drivers/gpu/drm/amd/display/dc/dsc/dcn35/dcn35_dsc.h
-f:drivers/gpu/drm/amd/display/dc/dsc/dcn401/dcn401_dsc.c
-f:drivers/gpu/drm/amd/display/dc/dsc/dcn401/dcn401_dsc.h
-f:drivers/gpu/drm/amd/display/dc/dsc/dsc.h
-f:drivers/gpu/drm/amd/display/dc/dsc/dscc_types.h
-f:drivers/gpu/drm/amd/display/dc/dsc/rc_calc.c
-f:drivers/gpu/drm/amd/display/dc/dsc/rc_calc.h
-f:drivers/gpu/drm/amd/display/dc/dsc/rc_calc_dpi.c
-f:drivers/gpu/drm/amd/display/dc/dwb/Makefile
-f:drivers/gpu/drm/amd/display/dc/dwb/dcn30/dcn30_cm_common.h
-f:drivers/gpu/drm/amd/display/dc/dwb/dcn30/dcn30_dwb.c
-f:drivers/gpu/drm/amd/display/dc/dwb/dcn30/dcn30_dwb.h
-f:drivers/gpu/drm/amd/display/dc/dwb/dcn30/dcn30_dwb_cm.c
-f:drivers/gpu/drm/amd/display/dc/dwb/dcn35/dcn35_dwb.c
-f:drivers/gpu/drm/amd/display/dc/dwb/dcn35/dcn35_dwb.h
-f:drivers/gpu/drm/amd/display/dc/gpio/Makefile
-f:drivers/gpu/drm/amd/display/dc/gpio/dce110/hw_factory_dce110.c
-f:drivers/gpu/drm/amd/display/dc/gpio/dce110/hw_factory_dce110.h
-f:drivers/gpu/drm/amd/display/dc/gpio/dce110/hw_translate_dce110.c
-f:drivers/gpu/drm/amd/display/dc/gpio/dce110/hw_translate_dce110.h
-f:drivers/gpu/drm/amd/display/dc/gpio/dce120/hw_factory_dce120.c
-f:drivers/gpu/drm/amd/display/dc/gpio/dce120/hw_factory_dce120.h
-f:drivers/gpu/drm/amd/display/dc/gpio/dce120/hw_translate_dce120.c
-f:drivers/gpu/drm/amd/display/dc/gpio/dce120/hw_translate_dce120.h
-f:drivers/gpu/drm/amd/display/dc/gpio/dce60/hw_factory_dce60.c
-f:drivers/gpu/drm/amd/display/dc/gpio/dce60/hw_factory_dce60.h
-f:drivers/gpu/drm/amd/display/dc/gpio/dce60/hw_translate_dce60.c
-f:drivers/gpu/drm/amd/display/dc/gpio/dce60/hw_translate_dce60.h
-f:drivers/gpu/drm/amd/display/dc/gpio/dce80/hw_factory_dce80.c
-f:drivers/gpu/drm/amd/display/dc/gpio/dce80/hw_factory_dce80.h
-f:drivers/gpu/drm/amd/display/dc/gpio/dce80/hw_translate_dce80.c
-f:drivers/gpu/drm/amd/display/dc/gpio/dce80/hw_translate_dce80.h
-f:drivers/gpu/drm/amd/display/dc/gpio/dcn10/hw_factory_dcn10.c
-f:drivers/gpu/drm/amd/display/dc/gpio/dcn10/hw_factory_dcn10.h
-f:drivers/gpu/drm/amd/display/dc/gpio/dcn10/hw_translate_dcn10.c
-f:drivers/gpu/drm/amd/display/dc/gpio/dcn10/hw_translate_dcn10.h
-f:drivers/gpu/drm/amd/display/dc/gpio/dcn20/hw_factory_dcn20.c
-f:drivers/gpu/drm/amd/display/dc/gpio/dcn20/hw_factory_dcn20.h
-f:drivers/gpu/drm/amd/display/dc/gpio/dcn20/hw_translate_dcn20.c
-f:drivers/gpu/drm/amd/display/dc/gpio/dcn20/hw_translate_dcn20.h
-f:drivers/gpu/drm/amd/display/dc/gpio/dcn21/hw_factory_dcn21.c
-f:drivers/gpu/drm/amd/display/dc/gpio/dcn21/hw_factory_dcn21.h
-f:drivers/gpu/drm/amd/display/dc/gpio/dcn21/hw_translate_dcn21.c
-f:drivers/gpu/drm/amd/display/dc/gpio/dcn21/hw_translate_dcn21.h
-f:drivers/gpu/drm/amd/display/dc/gpio/dcn30/hw_factory_dcn30.c
-f:drivers/gpu/drm/amd/display/dc/gpio/dcn30/hw_factory_dcn30.h
-f:drivers/gpu/drm/amd/display/dc/gpio/dcn30/hw_translate_dcn30.c
-f:drivers/gpu/drm/amd/display/dc/gpio/dcn30/hw_translate_dcn30.h
-f:drivers/gpu/drm/amd/display/dc/gpio/dcn315/hw_factory_dcn315.c
-f:drivers/gpu/drm/amd/display/dc/gpio/dcn315/hw_factory_dcn315.h
-f:drivers/gpu/drm/amd/display/dc/gpio/dcn315/hw_translate_dcn315.c
-f:drivers/gpu/drm/amd/display/dc/gpio/dcn315/hw_translate_dcn315.h
-f:drivers/gpu/drm/amd/display/dc/gpio/dcn32/hw_factory_dcn32.c
-f:drivers/gpu/drm/amd/display/dc/gpio/dcn32/hw_factory_dcn32.h
-f:drivers/gpu/drm/amd/display/dc/gpio/dcn32/hw_translate_dcn32.c
-f:drivers/gpu/drm/amd/display/dc/gpio/dcn32/hw_translate_dcn32.h
-f:drivers/gpu/drm/amd/display/dc/gpio/dcn401/hw_factory_dcn401.c
-f:drivers/gpu/drm/amd/display/dc/gpio/dcn401/hw_factory_dcn401.h
-f:drivers/gpu/drm/amd/display/dc/gpio/dcn401/hw_translate_dcn401.c
-f:drivers/gpu/drm/amd/display/dc/gpio/dcn401/hw_translate_dcn401.h
-f:drivers/gpu/drm/amd/display/dc/gpio/ddc_regs.h
-f:drivers/gpu/drm/amd/display/dc/gpio/generic_regs.h
-f:drivers/gpu/drm/amd/display/dc/gpio/gpio_base.c
-f:drivers/gpu/drm/amd/display/dc/gpio/gpio_regs.h
-f:drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c
-f:drivers/gpu/drm/amd/display/dc/gpio/gpio_service.h
-f:drivers/gpu/drm/amd/display/dc/gpio/hpd_regs.h
-f:drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c
-f:drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.h
-f:drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c
-f:drivers/gpu/drm/amd/display/dc/gpio/hw_factory.h
-f:drivers/gpu/drm/amd/display/dc/gpio/hw_generic.c
-f:drivers/gpu/drm/amd/display/dc/gpio/hw_generic.h
-f:drivers/gpu/drm/amd/display/dc/gpio/hw_gpio.c
-f:drivers/gpu/drm/amd/display/dc/gpio/hw_gpio.h
-f:drivers/gpu/drm/amd/display/dc/gpio/hw_hpd.c
-f:drivers/gpu/drm/amd/display/dc/gpio/hw_hpd.h
-f:drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c
-f:drivers/gpu/drm/amd/display/dc/gpio/hw_translate.h
-f:drivers/gpu/drm/amd/display/dc/hdcp/Makefile
-f:drivers/gpu/drm/amd/display/dc/hdcp/hdcp_msg.c
-f:drivers/gpu/drm/amd/display/dc/hpo/Makefile
-f:drivers/gpu/drm/amd/display/dc/hpo/dcn31/dcn31_hpo_dp_link_encoder.c
-f:drivers/gpu/drm/amd/display/dc/hpo/dcn31/dcn31_hpo_dp_link_encoder.h
-f:drivers/gpu/drm/amd/display/dc/hpo/dcn31/dcn31_hpo_dp_stream_encoder.c
-f:drivers/gpu/drm/amd/display/dc/hpo/dcn31/dcn31_hpo_dp_stream_encoder.h
-f:drivers/gpu/drm/amd/display/dc/hpo/dcn32/dcn32_hpo_dp_link_encoder.c
-f:drivers/gpu/drm/amd/display/dc/hpo/dcn32/dcn32_hpo_dp_link_encoder.h
-f:drivers/gpu/drm/amd/display/dc/hubbub/Makefile
-f:drivers/gpu/drm/amd/display/dc/hubbub/dcn10/dcn10_hubbub.c
-f:drivers/gpu/drm/amd/display/dc/hubbub/dcn10/dcn10_hubbub.h
-f:drivers/gpu/drm/amd/display/dc/hubbub/dcn20/dcn20_hubbub.c
-f:drivers/gpu/drm/amd/display/dc/hubbub/dcn20/dcn20_hubbub.h
-f:drivers/gpu/drm/amd/display/dc/hubbub/dcn201/dcn201_hubbub.c
-f:drivers/gpu/drm/amd/display/dc/hubbub/dcn201/dcn201_hubbub.h
-f:drivers/gpu/drm/amd/display/dc/hubbub/dcn21/dcn21_hubbub.c
-f:drivers/gpu/drm/amd/display/dc/hubbub/dcn21/dcn21_hubbub.h
-f:drivers/gpu/drm/amd/display/dc/hubbub/dcn30/dcn30_hubbub.c
-f:drivers/gpu/drm/amd/display/dc/hubbub/dcn30/dcn30_hubbub.h
-f:drivers/gpu/drm/amd/display/dc/hubbub/dcn301/dcn301_hubbub.c
-f:drivers/gpu/drm/amd/display/dc/hubbub/dcn301/dcn301_hubbub.h
-f:drivers/gpu/drm/amd/display/dc/hubbub/dcn31/dcn31_hubbub.c
-f:drivers/gpu/drm/amd/display/dc/hubbub/dcn31/dcn31_hubbub.h
-f:drivers/gpu/drm/amd/display/dc/hubbub/dcn32/dcn32_hubbub.c
-f:drivers/gpu/drm/amd/display/dc/hubbub/dcn32/dcn32_hubbub.h
-f:drivers/gpu/drm/amd/display/dc/hubbub/dcn35/dcn35_hubbub.c
-f:drivers/gpu/drm/amd/display/dc/hubbub/dcn35/dcn35_hubbub.h
-f:drivers/gpu/drm/amd/display/dc/hubbub/dcn401/dcn401_hubbub.c
-f:drivers/gpu/drm/amd/display/dc/hubbub/dcn401/dcn401_hubbub.h
-f:drivers/gpu/drm/amd/display/dc/hubp/Makefile
-f:drivers/gpu/drm/amd/display/dc/hubp/dcn10/dcn10_hubp.c
-f:drivers/gpu/drm/amd/display/dc/hubp/dcn10/dcn10_hubp.h
-f:drivers/gpu/drm/amd/display/dc/hubp/dcn20/dcn20_hubp.c
-f:drivers/gpu/drm/amd/display/dc/hubp/dcn20/dcn20_hubp.h
-f:drivers/gpu/drm/amd/display/dc/hubp/dcn201/dcn201_hubp.c
-f:drivers/gpu/drm/amd/display/dc/hubp/dcn201/dcn201_hubp.h
-f:drivers/gpu/drm/amd/display/dc/hubp/dcn21/dcn21_hubp.c
-f:drivers/gpu/drm/amd/display/dc/hubp/dcn21/dcn21_hubp.h
-f:drivers/gpu/drm/amd/display/dc/hubp/dcn30/dcn30_hubp.c
-f:drivers/gpu/drm/amd/display/dc/hubp/dcn30/dcn30_hubp.h
-f:drivers/gpu/drm/amd/display/dc/hubp/dcn31/dcn31_hubp.c
-f:drivers/gpu/drm/amd/display/dc/hubp/dcn31/dcn31_hubp.h
-f:drivers/gpu/drm/amd/display/dc/hubp/dcn32/dcn32_hubp.c
-f:drivers/gpu/drm/amd/display/dc/hubp/dcn32/dcn32_hubp.h
-f:drivers/gpu/drm/amd/display/dc/hubp/dcn35/dcn35_hubp.c
-f:drivers/gpu/drm/amd/display/dc/hubp/dcn35/dcn35_hubp.h
-f:drivers/gpu/drm/amd/display/dc/hubp/dcn401/dcn401_hubp.c
-f:drivers/gpu/drm/amd/display/dc/hubp/dcn401/dcn401_hubp.h
-f:drivers/gpu/drm/amd/display/dc/hwss/Makefile
-f:drivers/gpu/drm/amd/display/dc/hwss/dce/dce_hwseq.c
-f:drivers/gpu/drm/amd/display/dc/hwss/dce/dce_hwseq.h
-f:drivers/gpu/drm/amd/display/dc/hwss/dce100/dce100_hwseq.c
-f:drivers/gpu/drm/amd/display/dc/hwss/dce100/dce100_hwseq.h
-f:drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c
-f:drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.h
-f:drivers/gpu/drm/amd/display/dc/hwss/dce112/dce112_hwseq.c
-f:drivers/gpu/drm/amd/display/dc/hwss/dce112/dce112_hwseq.h
-f:drivers/gpu/drm/amd/display/dc/hwss/dce120/dce120_hwseq.c
-f:drivers/gpu/drm/amd/display/dc/hwss/dce120/dce120_hwseq.h
-f:drivers/gpu/drm/amd/display/dc/hwss/dce60/dce60_hwseq.c
-f:drivers/gpu/drm/amd/display/dc/hwss/dce60/dce60_hwseq.h
-f:drivers/gpu/drm/amd/display/dc/hwss/dce80/dce80_hwseq.c
-f:drivers/gpu/drm/amd/display/dc/hwss/dce80/dce80_hwseq.h
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.h
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_init.c
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_init.h
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.h
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_init.c
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_init.h
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn201/dcn201_hwseq.c
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn201/dcn201_hwseq.h
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn201/dcn201_init.c
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn201/dcn201_init.h
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn21/dcn21_hwseq.c
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn21/dcn21_hwseq.h
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn21/dcn21_init.c
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn21/dcn21_init.h
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.c
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.h
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn30/dcn30_init.c
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn30/dcn30_init.h
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn301/dcn301_hwseq.c
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn301/dcn301_hwseq.h
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn301/dcn301_init.c
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn301/dcn301_init.h
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn302/dcn302_hwseq.c
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn302/dcn302_hwseq.h
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn302/dcn302_init.c
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn302/dcn302_init.h
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn303/dcn303_hwseq.c
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn303/dcn303_hwseq.h
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn303/dcn303_init.c
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn303/dcn303_init.h
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.c
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.h
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn31/dcn31_init.c
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn31/dcn31_init.h
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn314/dcn314_hwseq.c
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn314/dcn314_hwseq.h
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn314/dcn314_init.c
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn314/dcn314_init.h
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.h
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn32/dcn32_init.c
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn32/dcn32_init.h
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.h
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.h
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn351/Makefile
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn351/dcn351_hwseq.c
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn351/dcn351_hwseq.h
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn351/dcn351_init.c
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn351/dcn351_init.h
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.h
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_init.c
-f:drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_init.h
-f:drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h
-f:drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer_private.h
-f:drivers/gpu/drm/amd/display/dc/inc/bw_fixed.h
-f:drivers/gpu/drm/amd/display/dc/inc/clock_source.h
-f:drivers/gpu/drm/amd/display/dc/inc/compressor.h
-f:drivers/gpu/drm/amd/display/dc/inc/core_status.h
-f:drivers/gpu/drm/amd/display/dc/inc/core_types.h
-f:drivers/gpu/drm/amd/display/dc/inc/custom_float.h
-f:drivers/gpu/drm/amd/display/dc/inc/dce_calcs.h
-f:drivers/gpu/drm/amd/display/dc/inc/dcn_calc_math.h
-f:drivers/gpu/drm/amd/display/dc/inc/dcn_calcs.h
-f:drivers/gpu/drm/amd/display/dc/inc/hw/abm.h
-f:drivers/gpu/drm/amd/display/dc/inc/hw/audio.h
-f:drivers/gpu/drm/amd/display/dc/inc/hw/aux_engine.h
-f:drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h
-f:drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr_internal.h
-f:drivers/gpu/drm/amd/display/dc/inc/hw/cursor_reg_cache.h
-f:drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h
-f:drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h
-f:drivers/gpu/drm/amd/display/dc/inc/hw/dmcu.h
-f:drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h
-f:drivers/gpu/drm/amd/display/dc/inc/hw/dwb.h
-f:drivers/gpu/drm/amd/display/dc/inc/hw/gpio.h
-f:drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h
-f:drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h
-f:drivers/gpu/drm/amd/display/dc/inc/hw/ipp.h
-f:drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h
-f:drivers/gpu/drm/amd/display/dc/inc/hw/mcif_wb.h
-f:drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h
-f:drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h
-f:drivers/gpu/drm/amd/display/dc/inc/hw/opp.h
-f:drivers/gpu/drm/amd/display/dc/inc/hw/optc.h
-f:drivers/gpu/drm/amd/display/dc/inc/hw/panel_cntl.h
-f:drivers/gpu/drm/amd/display/dc/inc/hw/pg_cntl.h
-f:drivers/gpu/drm/amd/display/dc/inc/hw/stream_encoder.h
-f:drivers/gpu/drm/amd/display/dc/inc/hw/timing_generator.h
-f:drivers/gpu/drm/amd/display/dc/inc/hw/transform.h
-f:drivers/gpu/drm/amd/display/dc/inc/hw/vmid.h
-f:drivers/gpu/drm/amd/display/dc/inc/hw/vpg.h
-f:drivers/gpu/drm/amd/display/dc/inc/link.h
-f:drivers/gpu/drm/amd/display/dc/inc/link_enc_cfg.h
-f:drivers/gpu/drm/amd/display/dc/inc/link_hwss.h
-f:drivers/gpu/drm/amd/display/dc/inc/reg_helper.h
-f:drivers/gpu/drm/amd/display/dc/inc/resource.h
-f:drivers/gpu/drm/amd/display/dc/inc/vm_helper.h
-f:drivers/gpu/drm/amd/display/dc/irq/Makefile
-f:drivers/gpu/drm/amd/display/dc/irq/dce110/irq_service_dce110.c
-f:drivers/gpu/drm/amd/display/dc/irq/dce110/irq_service_dce110.h
-f:drivers/gpu/drm/amd/display/dc/irq/dce120/irq_service_dce120.c
-f:drivers/gpu/drm/amd/display/dc/irq/dce120/irq_service_dce120.h
-f:drivers/gpu/drm/amd/display/dc/irq/dce60/irq_service_dce60.c
-f:drivers/gpu/drm/amd/display/dc/irq/dce60/irq_service_dce60.h
-f:drivers/gpu/drm/amd/display/dc/irq/dce80/irq_service_dce80.c
-f:drivers/gpu/drm/amd/display/dc/irq/dce80/irq_service_dce80.h
-f:drivers/gpu/drm/amd/display/dc/irq/dcn10/irq_service_dcn10.c
-f:drivers/gpu/drm/amd/display/dc/irq/dcn10/irq_service_dcn10.h
-f:drivers/gpu/drm/amd/display/dc/irq/dcn20/irq_service_dcn20.c
-f:drivers/gpu/drm/amd/display/dc/irq/dcn20/irq_service_dcn20.h
-f:drivers/gpu/drm/amd/display/dc/irq/dcn201/irq_service_dcn201.c
-f:drivers/gpu/drm/amd/display/dc/irq/dcn201/irq_service_dcn201.h
-f:drivers/gpu/drm/amd/display/dc/irq/dcn21/irq_service_dcn21.c
-f:drivers/gpu/drm/amd/display/dc/irq/dcn21/irq_service_dcn21.h
-f:drivers/gpu/drm/amd/display/dc/irq/dcn30/irq_service_dcn30.c
-f:drivers/gpu/drm/amd/display/dc/irq/dcn30/irq_service_dcn30.h
-f:drivers/gpu/drm/amd/display/dc/irq/dcn302/irq_service_dcn302.c
-f:drivers/gpu/drm/amd/display/dc/irq/dcn302/irq_service_dcn302.h
-f:drivers/gpu/drm/amd/display/dc/irq/dcn303/irq_service_dcn303.c
-f:drivers/gpu/drm/amd/display/dc/irq/dcn303/irq_service_dcn303.h
-f:drivers/gpu/drm/amd/display/dc/irq/dcn31/irq_service_dcn31.c
-f:drivers/gpu/drm/amd/display/dc/irq/dcn31/irq_service_dcn31.h
-f:drivers/gpu/drm/amd/display/dc/irq/dcn314/irq_service_dcn314.c
-f:drivers/gpu/drm/amd/display/dc/irq/dcn314/irq_service_dcn314.h
-f:drivers/gpu/drm/amd/display/dc/irq/dcn315/irq_service_dcn315.c
-f:drivers/gpu/drm/amd/display/dc/irq/dcn315/irq_service_dcn315.h
-f:drivers/gpu/drm/amd/display/dc/irq/dcn32/irq_service_dcn32.c
-f:drivers/gpu/drm/amd/display/dc/irq/dcn32/irq_service_dcn32.h
-f:drivers/gpu/drm/amd/display/dc/irq/dcn35/irq_service_dcn35.c
-f:drivers/gpu/drm/amd/display/dc/irq/dcn35/irq_service_dcn35.h
-f:drivers/gpu/drm/amd/display/dc/irq/dcn351/irq_service_dcn351.c
-f:drivers/gpu/drm/amd/display/dc/irq/dcn351/irq_service_dcn351.h
-f:drivers/gpu/drm/amd/display/dc/irq/dcn36/irq_service_dcn36.c
-f:drivers/gpu/drm/amd/display/dc/irq/dcn36/irq_service_dcn36.h
-f:drivers/gpu/drm/amd/display/dc/irq/dcn401/irq_service_dcn401.c
-f:drivers/gpu/drm/amd/display/dc/irq/dcn401/irq_service_dcn401.h
-f:drivers/gpu/drm/amd/display/dc/irq/irq_service.c
-f:drivers/gpu/drm/amd/display/dc/irq/irq_service.h
-f:drivers/gpu/drm/amd/display/dc/irq_types.h
-f:drivers/gpu/drm/amd/display/dc/link/Makefile
-f:drivers/gpu/drm/amd/display/dc/link/accessories/link_dp_cts.c
-f:drivers/gpu/drm/amd/display/dc/link/accessories/link_dp_cts.h
-f:drivers/gpu/drm/amd/display/dc/link/accessories/link_dp_trace.c
-f:drivers/gpu/drm/amd/display/dc/link/accessories/link_dp_trace.h
-f:drivers/gpu/drm/amd/display/dc/link/hwss/link_hwss_dio.c
-f:drivers/gpu/drm/amd/display/dc/link/hwss/link_hwss_dio.h
-f:drivers/gpu/drm/amd/display/dc/link/hwss/link_hwss_dio_fixed_vs_pe_retimer.c
-f:drivers/gpu/drm/amd/display/dc/link/hwss/link_hwss_dio_fixed_vs_pe_retimer.h
-f:drivers/gpu/drm/amd/display/dc/link/hwss/link_hwss_dpia.c
-f:drivers/gpu/drm/amd/display/dc/link/hwss/link_hwss_dpia.h
-f:drivers/gpu/drm/amd/display/dc/link/hwss/link_hwss_hpo_dp.c
-f:drivers/gpu/drm/amd/display/dc/link/hwss/link_hwss_hpo_dp.h
-f:drivers/gpu/drm/amd/display/dc/link/hwss/link_hwss_hpo_fixed_vs_pe_retimer_dp.c
-f:drivers/gpu/drm/amd/display/dc/link/hwss/link_hwss_hpo_fixed_vs_pe_retimer_dp.h
-f:drivers/gpu/drm/amd/display/dc/link/link_detection.c
-f:drivers/gpu/drm/amd/display/dc/link/link_detection.h
-f:drivers/gpu/drm/amd/display/dc/link/link_dpms.c
-f:drivers/gpu/drm/amd/display/dc/link/link_dpms.h
-f:drivers/gpu/drm/amd/display/dc/link/link_factory.c
-f:drivers/gpu/drm/amd/display/dc/link/link_factory.h
-f:drivers/gpu/drm/amd/display/dc/link/link_hwss_hpo_frl.c
-f:drivers/gpu/drm/amd/display/dc/link/link_resource.c
-f:drivers/gpu/drm/amd/display/dc/link/link_resource.h
-f:drivers/gpu/drm/amd/display/dc/link/link_validation.c
-f:drivers/gpu/drm/amd/display/dc/link/link_validation.h
-f:drivers/gpu/drm/amd/display/dc/link/protocols/link_ddc.c
-f:drivers/gpu/drm/amd/display/dc/link/protocols/link_ddc.h
-f:drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_capability.c
-f:drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_capability.h
-f:drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_dpia.c
-f:drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_dpia.h
-f:drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_dpia_bw.c
-f:drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_dpia_bw.h
-f:drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_irq_handler.c
-f:drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_irq_handler.h
-f:drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_phy.c
-f:drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_phy.h
-f:drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_training.c
-f:drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_training.h
-f:drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_training_128b_132b.c
-f:drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_training_128b_132b.h
-f:drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_training_8b_10b.c
-f:drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_training_8b_10b.h
-f:drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_training_auxless.c
-f:drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_training_auxless.h
-f:drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_training_dpia.c
-f:drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_training_dpia.h
-f:drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_training_fixed_vs_pe_retimer.c
-f:drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_training_fixed_vs_pe_retimer.h
-f:drivers/gpu/drm/amd/display/dc/link/protocols/link_dpcd.c
-f:drivers/gpu/drm/amd/display/dc/link/protocols/link_dpcd.h
-f:drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c
-f:drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.h
-f:drivers/gpu/drm/amd/display/dc/link/protocols/link_hpd.c
-f:drivers/gpu/drm/amd/display/dc/link/protocols/link_hpd.h
-f:drivers/gpu/drm/amd/display/dc/mmhubbub/Makefile
-f:drivers/gpu/drm/amd/display/dc/mmhubbub/dcn20/dcn20_mmhubbub.c
-f:drivers/gpu/drm/amd/display/dc/mmhubbub/dcn20/dcn20_mmhubbub.h
-f:drivers/gpu/drm/amd/display/dc/mmhubbub/dcn32/dcn32_mmhubbub.c
-f:drivers/gpu/drm/amd/display/dc/mmhubbub/dcn32/dcn32_mmhubbub.h
-f:drivers/gpu/drm/amd/display/dc/mmhubbub/dcn35/dcn35_mmhubbub.c
-f:drivers/gpu/drm/amd/display/dc/mmhubbub/dcn35/dcn35_mmhubbub.h
-f:drivers/gpu/drm/amd/display/dc/mpc/Makefile
-f:drivers/gpu/drm/amd/display/dc/mpc/dcn10/dcn10_mpc.c
-f:drivers/gpu/drm/amd/display/dc/mpc/dcn10/dcn10_mpc.h
-f:drivers/gpu/drm/amd/display/dc/mpc/dcn20/dcn20_mpc.c
-f:drivers/gpu/drm/amd/display/dc/mpc/dcn20/dcn20_mpc.h
-f:drivers/gpu/drm/amd/display/dc/mpc/dcn30/dcn30_mpc.c
-f:drivers/gpu/drm/amd/display/dc/mpc/dcn30/dcn30_mpc.h
-f:drivers/gpu/drm/amd/display/dc/mpc/dcn32/dcn32_mpc.c
-f:drivers/gpu/drm/amd/display/dc/mpc/dcn32/dcn32_mpc.h
-f:drivers/gpu/drm/amd/display/dc/mpc/dcn401/dcn401_mpc.c
-f:drivers/gpu/drm/amd/display/dc/mpc/dcn401/dcn401_mpc.h
-f:drivers/gpu/drm/amd/display/dc/opp/Makefile
-f:drivers/gpu/drm/amd/display/dc/opp/dcn10/dcn10_opp.c
-f:drivers/gpu/drm/amd/display/dc/opp/dcn10/dcn10_opp.h
-f:drivers/gpu/drm/amd/display/dc/opp/dcn20/dcn20_opp.c
-f:drivers/gpu/drm/amd/display/dc/opp/dcn20/dcn20_opp.h
-f:drivers/gpu/drm/amd/display/dc/opp/dcn35/dcn35_opp.c
-f:drivers/gpu/drm/amd/display/dc/opp/dcn35/dcn35_opp.h
-f:drivers/gpu/drm/amd/display/dc/optc/Makefile
-f:drivers/gpu/drm/amd/display/dc/optc/dcn10/dcn10_optc.c
-f:drivers/gpu/drm/amd/display/dc/optc/dcn10/dcn10_optc.h
-f:drivers/gpu/drm/amd/display/dc/optc/dcn20/dcn20_optc.c
-f:drivers/gpu/drm/amd/display/dc/optc/dcn20/dcn20_optc.h
-f:drivers/gpu/drm/amd/display/dc/optc/dcn201/dcn201_optc.c
-f:drivers/gpu/drm/amd/display/dc/optc/dcn201/dcn201_optc.h
-f:drivers/gpu/drm/amd/display/dc/optc/dcn30/dcn30_optc.c
-f:drivers/gpu/drm/amd/display/dc/optc/dcn30/dcn30_optc.h
-f:drivers/gpu/drm/amd/display/dc/optc/dcn301/dcn301_optc.c
-f:drivers/gpu/drm/amd/display/dc/optc/dcn301/dcn301_optc.h
-f:drivers/gpu/drm/amd/display/dc/optc/dcn31/dcn31_optc.c
-f:drivers/gpu/drm/amd/display/dc/optc/dcn31/dcn31_optc.h
-f:drivers/gpu/drm/amd/display/dc/optc/dcn314/dcn314_optc.c
-f:drivers/gpu/drm/amd/display/dc/optc/dcn314/dcn314_optc.h
-f:drivers/gpu/drm/amd/display/dc/optc/dcn32/dcn32_optc.c
-f:drivers/gpu/drm/amd/display/dc/optc/dcn32/dcn32_optc.h
-f:drivers/gpu/drm/amd/display/dc/optc/dcn35/dcn35_optc.c
-f:drivers/gpu/drm/amd/display/dc/optc/dcn35/dcn35_optc.h
-f:drivers/gpu/drm/amd/display/dc/optc/dcn401/dcn401_optc.c
-f:drivers/gpu/drm/amd/display/dc/optc/dcn401/dcn401_optc.h
-f:drivers/gpu/drm/amd/display/dc/os_types.h
-f:drivers/gpu/drm/amd/display/dc/pg/Makefile
-f:drivers/gpu/drm/amd/display/dc/pg/dcn35/dcn35_pg_cntl.c
-f:drivers/gpu/drm/amd/display/dc/pg/dcn35/dcn35_pg_cntl.h
-f:drivers/gpu/drm/amd/display/dc/resource/Makefile
-f:drivers/gpu/drm/amd/display/dc/resource/dce100/dce100_resource.c
-f:drivers/gpu/drm/amd/display/dc/resource/dce100/dce100_resource.h
-f:drivers/gpu/drm/amd/display/dc/resource/dce110/dce110_resource.c
-f:drivers/gpu/drm/amd/display/dc/resource/dce110/dce110_resource.h
-f:drivers/gpu/drm/amd/display/dc/resource/dce112/dce112_resource.c
-f:drivers/gpu/drm/amd/display/dc/resource/dce112/dce112_resource.h
-f:drivers/gpu/drm/amd/display/dc/resource/dce120/dce120_resource.c
-f:drivers/gpu/drm/amd/display/dc/resource/dce120/dce120_resource.h
-f:drivers/gpu/drm/amd/display/dc/resource/dce60/dce60_resource.c
-f:drivers/gpu/drm/amd/display/dc/resource/dce60/dce60_resource.h
-f:drivers/gpu/drm/amd/display/dc/resource/dce80/dce80_resource.c
-f:drivers/gpu/drm/amd/display/dc/resource/dce80/dce80_resource.h
-f:drivers/gpu/drm/amd/display/dc/resource/dcn10/dcn10_resource.c
-f:drivers/gpu/drm/amd/display/dc/resource/dcn10/dcn10_resource.h
-f:drivers/gpu/drm/amd/display/dc/resource/dcn20/dcn20_resource.c
-f:drivers/gpu/drm/amd/display/dc/resource/dcn20/dcn20_resource.h
-f:drivers/gpu/drm/amd/display/dc/resource/dcn201/dcn201_resource.c
-f:drivers/gpu/drm/amd/display/dc/resource/dcn201/dcn201_resource.h
-f:drivers/gpu/drm/amd/display/dc/resource/dcn21/dcn21_resource.c
-f:drivers/gpu/drm/amd/display/dc/resource/dcn21/dcn21_resource.h
-f:drivers/gpu/drm/amd/display/dc/resource/dcn30/dcn30_resource.c
-f:drivers/gpu/drm/amd/display/dc/resource/dcn30/dcn30_resource.h
-f:drivers/gpu/drm/amd/display/dc/resource/dcn301/dcn301_resource.c
-f:drivers/gpu/drm/amd/display/dc/resource/dcn301/dcn301_resource.h
-f:drivers/gpu/drm/amd/display/dc/resource/dcn302/dcn302_resource.c
-f:drivers/gpu/drm/amd/display/dc/resource/dcn302/dcn302_resource.h
-f:drivers/gpu/drm/amd/display/dc/resource/dcn303/dcn303_resource.c
-f:drivers/gpu/drm/amd/display/dc/resource/dcn303/dcn303_resource.h
-f:drivers/gpu/drm/amd/display/dc/resource/dcn31/dcn31_resource.c
-f:drivers/gpu/drm/amd/display/dc/resource/dcn31/dcn31_resource.h
-f:drivers/gpu/drm/amd/display/dc/resource/dcn314/dcn314_resource.c
-f:drivers/gpu/drm/amd/display/dc/resource/dcn314/dcn314_resource.h
-f:drivers/gpu/drm/amd/display/dc/resource/dcn315/dcn315_resource.c
-f:drivers/gpu/drm/amd/display/dc/resource/dcn315/dcn315_resource.h
-f:drivers/gpu/drm/amd/display/dc/resource/dcn316/dcn316_resource.c
-f:drivers/gpu/drm/amd/display/dc/resource/dcn316/dcn316_resource.h
-f:drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c
-f:drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.h
-f:drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource_helpers.c
-f:drivers/gpu/drm/amd/display/dc/resource/dcn321/dcn321_resource.c
-f:drivers/gpu/drm/amd/display/dc/resource/dcn321/dcn321_resource.h
-f:drivers/gpu/drm/amd/display/dc/resource/dcn35/dcn35_resource.c
-f:drivers/gpu/drm/amd/display/dc/resource/dcn35/dcn35_resource.h
-f:drivers/gpu/drm/amd/display/dc/resource/dcn351/dcn351_resource.c
-f:drivers/gpu/drm/amd/display/dc/resource/dcn351/dcn351_resource.h
-f:drivers/gpu/drm/amd/display/dc/resource/dcn36/dcn36_resource.c
-f:drivers/gpu/drm/amd/display/dc/resource/dcn36/dcn36_resource.h
-f:drivers/gpu/drm/amd/display/dc/resource/dcn401/dcn401_resource.c
-f:drivers/gpu/drm/amd/display/dc/resource/dcn401/dcn401_resource.h
-f:drivers/gpu/drm/amd/display/dc/sspl/Makefile
-f:drivers/gpu/drm/amd/display/dc/sspl/dc_spl.c
-f:drivers/gpu/drm/amd/display/dc/sspl/dc_spl.h
-f:drivers/gpu/drm/amd/display/dc/sspl/dc_spl_filters.c
-f:drivers/gpu/drm/amd/display/dc/sspl/dc_spl_filters.h
-f:drivers/gpu/drm/amd/display/dc/sspl/dc_spl_isharp_filters.c
-f:drivers/gpu/drm/amd/display/dc/sspl/dc_spl_isharp_filters.h
-f:drivers/gpu/drm/amd/display/dc/sspl/dc_spl_scl_easf_filters.c
-f:drivers/gpu/drm/amd/display/dc/sspl/dc_spl_scl_easf_filters.h
-f:drivers/gpu/drm/amd/display/dc/sspl/dc_spl_scl_filters.c
-f:drivers/gpu/drm/amd/display/dc/sspl/dc_spl_scl_filters.h
-f:drivers/gpu/drm/amd/display/dc/sspl/dc_spl_types.h
-f:drivers/gpu/drm/amd/display/dc/sspl/spl_custom_float.c
-f:drivers/gpu/drm/amd/display/dc/sspl/spl_custom_float.h
-f:drivers/gpu/drm/amd/display/dc/sspl/spl_debug.h
-f:drivers/gpu/drm/amd/display/dc/sspl/spl_fixpt31_32.c
-f:drivers/gpu/drm/amd/display/dc/sspl/spl_fixpt31_32.h
-f:drivers/gpu/drm/amd/display/dc/sspl/spl_os_types.h
-f:drivers/gpu/drm/amd/display/dc/virtual/Makefile
-f:drivers/gpu/drm/amd/display/dc/virtual/virtual_link_encoder.c
-f:drivers/gpu/drm/amd/display/dc/virtual/virtual_link_encoder.h
-f:drivers/gpu/drm/amd/display/dc/virtual/virtual_link_hwss.c
-f:drivers/gpu/drm/amd/display/dc/virtual/virtual_link_hwss.h
-f:drivers/gpu/drm/amd/display/dc/virtual/virtual_stream_encoder.c
-f:drivers/gpu/drm/amd/display/dc/virtual/virtual_stream_encoder.h
-f:drivers/gpu/drm/amd/display/dmub/dmub_srv.h
-f:drivers/gpu/drm/amd/display/dmub/dmub_srv_stat.h
-f:drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h
-f:drivers/gpu/drm/amd/display/dmub/inc/dmub_trace_buffer.h
-f:drivers/gpu/drm/amd/display/dmub/src/Makefile
-f:drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c
-f:drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.h
-f:drivers/gpu/drm/amd/display/dmub/src/dmub_dcn21.c
-f:drivers/gpu/drm/amd/display/dmub/src/dmub_dcn21.h
-f:drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.c
-f:drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.h
-f:drivers/gpu/drm/amd/display/dmub/src/dmub_dcn301.c
-f:drivers/gpu/drm/amd/display/dmub/src/dmub_dcn301.h
-f:drivers/gpu/drm/amd/display/dmub/src/dmub_dcn302.c
-f:drivers/gpu/drm/amd/display/dmub/src/dmub_dcn302.h
-f:drivers/gpu/drm/amd/display/dmub/src/dmub_dcn303.c
-f:drivers/gpu/drm/amd/display/dmub/src/dmub_dcn303.h
-f:drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c
-f:drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.h
-f:drivers/gpu/drm/amd/display/dmub/src/dmub_dcn314.c
-f:drivers/gpu/drm/amd/display/dmub/src/dmub_dcn314.h
-f:drivers/gpu/drm/amd/display/dmub/src/dmub_dcn315.c
-f:drivers/gpu/drm/amd/display/dmub/src/dmub_dcn315.h
-f:drivers/gpu/drm/amd/display/dmub/src/dmub_dcn316.c
-f:drivers/gpu/drm/amd/display/dmub/src/dmub_dcn316.h
-f:drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.c
-f:drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.h
-f:drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.c
-f:drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.h
-f:drivers/gpu/drm/amd/display/dmub/src/dmub_dcn351.c
-f:drivers/gpu/drm/amd/display/dmub/src/dmub_dcn351.h
-f:drivers/gpu/drm/amd/display/dmub/src/dmub_dcn36.c
-f:drivers/gpu/drm/amd/display/dmub/src/dmub_dcn36.h
-f:drivers/gpu/drm/amd/display/dmub/src/dmub_dcn401.c
-f:drivers/gpu/drm/amd/display/dmub/src/dmub_dcn401.h
-f:drivers/gpu/drm/amd/display/dmub/src/dmub_reg.c
-f:drivers/gpu/drm/amd/display/dmub/src/dmub_reg.h
-f:drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c
-f:drivers/gpu/drm/amd/display/dmub/src/dmub_srv_stat.c
-f:drivers/gpu/drm/amd/display/include/audio_types.h
-f:drivers/gpu/drm/amd/display/include/bios_parser_interface.h
-f:drivers/gpu/drm/amd/display/include/bios_parser_types.h
-f:drivers/gpu/drm/amd/display/include/dal_asic_id.h
-f:drivers/gpu/drm/amd/display/include/dal_types.h
-f:drivers/gpu/drm/amd/display/include/ddc_service_types.h
-f:drivers/gpu/drm/amd/display/include/dpcd_defs.h
-f:drivers/gpu/drm/amd/display/include/fixed31_32.h
-f:drivers/gpu/drm/amd/display/include/gpio_interface.h
-f:drivers/gpu/drm/amd/display/include/gpio_service_interface.h
-f:drivers/gpu/drm/amd/display/include/gpio_types.h
-f:drivers/gpu/drm/amd/display/include/grph_object_ctrl_defs.h
-f:drivers/gpu/drm/amd/display/include/grph_object_defs.h
-f:drivers/gpu/drm/amd/display/include/grph_object_id.h
-f:drivers/gpu/drm/amd/display/include/hdcp_msg_types.h
-f:drivers/gpu/drm/amd/display/include/irq_service_interface.h
-f:drivers/gpu/drm/amd/display/include/link_service_types.h
-f:drivers/gpu/drm/amd/display/include/logger_interface.h
-f:drivers/gpu/drm/amd/display/include/logger_types.h
-f:drivers/gpu/drm/amd/display/include/set_mode_types.h
-f:drivers/gpu/drm/amd/display/include/signal_types.h
-f:drivers/gpu/drm/amd/display/include/vector.h
-f:drivers/gpu/drm/amd/display/modules/color/Makefile
-f:drivers/gpu/drm/amd/display/modules/color/color_gamma.c
-f:drivers/gpu/drm/amd/display/modules/color/color_gamma.h
-f:drivers/gpu/drm/amd/display/modules/color/color_table.c
-f:drivers/gpu/drm/amd/display/modules/color/color_table.h
-f:drivers/gpu/drm/amd/display/modules/color/luts_1d.h
-f:drivers/gpu/drm/amd/display/modules/freesync/Makefile
-f:drivers/gpu/drm/amd/display/modules/freesync/freesync.c
-f:drivers/gpu/drm/amd/display/modules/hdcp/Makefile
-f:drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c
-f:drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h
-f:drivers/gpu/drm/amd/display/modules/hdcp/hdcp1_execution.c
-f:drivers/gpu/drm/amd/display/modules/hdcp/hdcp1_transition.c
-f:drivers/gpu/drm/amd/display/modules/hdcp/hdcp2_execution.c
-f:drivers/gpu/drm/amd/display/modules/hdcp/hdcp2_transition.c
-f:drivers/gpu/drm/amd/display/modules/hdcp/hdcp_ddc.c
-f:drivers/gpu/drm/amd/display/modules/hdcp/hdcp_log.c
-f:drivers/gpu/drm/amd/display/modules/hdcp/hdcp_log.h
-f:drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.c
-f:drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.h
-f:drivers/gpu/drm/amd/display/modules/inc/mod_freesync.h
-f:drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h
-f:drivers/gpu/drm/amd/display/modules/inc/mod_info_packet.h
-f:drivers/gpu/drm/amd/display/modules/inc/mod_shared.h
-f:drivers/gpu/drm/amd/display/modules/inc/mod_stats.h
-f:drivers/gpu/drm/amd/display/modules/inc/mod_vmid.h
-f:drivers/gpu/drm/amd/display/modules/info_packet/Makefile
-f:drivers/gpu/drm/amd/display/modules/info_packet/info_packet.c
-f:drivers/gpu/drm/amd/display/modules/power/Makefile
-f:drivers/gpu/drm/amd/display/modules/power/power_helpers.c
-f:drivers/gpu/drm/amd/display/modules/power/power_helpers.h
-f:drivers/gpu/drm/amd/display/modules/vmid/vmid.c
-f:drivers/gpu/drm/amd/include/aldebaran_ip_offset.h
-f:drivers/gpu/drm/amd/include/amd_acpi.h
-f:drivers/gpu/drm/amd/include/amd_cper.h
-f:drivers/gpu/drm/amd/include/amd_pcie.h
-f:drivers/gpu/drm/amd/include/amd_pcie_helpers.h
-f:drivers/gpu/drm/amd/include/amd_shared.h
-f:drivers/gpu/drm/amd/include/amdgpu_reg_state.h
-f:drivers/gpu/drm/amd/include/arct_ip_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/athub/athub_1_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/athub/athub_1_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/athub/athub_1_8_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/athub/athub_1_8_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/athub/athub_2_0_0_default.h
-f:drivers/gpu/drm/amd/include/asic_reg/athub/athub_2_0_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/athub/athub_2_0_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/athub/athub_2_1_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/athub/athub_2_1_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/athub/athub_3_0_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/athub/athub_3_0_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/athub/athub_4_1_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/athub/athub_4_1_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/bif/bif_3_0_d.h
-f:drivers/gpu/drm/amd/include/asic_reg/bif/bif_3_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/bif/bif_4_1_d.h
-f:drivers/gpu/drm/amd/include/asic_reg/bif/bif_4_1_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/bif/bif_5_0_d.h
-f:drivers/gpu/drm/amd/include/asic_reg/bif/bif_5_0_enum.h
-f:drivers/gpu/drm/amd/include/asic_reg/bif/bif_5_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/bif/bif_5_1_d.h
-f:drivers/gpu/drm/amd/include/asic_reg/bif/bif_5_1_enum.h
-f:drivers/gpu/drm/amd/include/asic_reg/bif/bif_5_1_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/clk/clk_10_0_2_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/clk/clk_10_0_2_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/clk/clk_11_0_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/clk/clk_11_0_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/clk/clk_11_0_1_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/clk/clk_11_0_1_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/clk/clk_11_5_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/clk/clk_11_5_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/dce/dce_10_0_d.h
-f:drivers/gpu/drm/amd/include/asic_reg/dce/dce_10_0_enum.h
-f:drivers/gpu/drm/amd/include/asic_reg/dce/dce_10_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/dce/dce_11_0_d.h
-f:drivers/gpu/drm/amd/include/asic_reg/dce/dce_11_0_enum.h
-f:drivers/gpu/drm/amd/include/asic_reg/dce/dce_11_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/dce/dce_11_2_d.h
-f:drivers/gpu/drm/amd/include/asic_reg/dce/dce_11_2_enum.h
-f:drivers/gpu/drm/amd/include/asic_reg/dce/dce_11_2_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/dce/dce_12_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/dce/dce_12_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/dce/dce_6_0_d.h
-f:drivers/gpu/drm/amd/include/asic_reg/dce/dce_6_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/dce/dce_8_0_d.h
-f:drivers/gpu/drm/amd/include/asic_reg/dce/dce_8_0_enum.h
-f:drivers/gpu/drm/amd/include/asic_reg/dce/dce_8_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_1_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_1_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_2_0_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_2_0_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_2_0_1_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_2_0_1_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_2_1_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_2_1_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_1_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_1_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_2_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_2_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_3_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_0_3_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_1_2_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_1_2_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_1_4_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_1_4_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_1_5_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_1_5_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_1_6_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_1_6_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_2_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_2_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_2_1_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_2_1_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_5_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_5_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_5_1_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_5_1_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_6_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_6_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_4_1_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_4_1_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/df/df_1_7_default.h
-f:drivers/gpu/drm/amd/include/asic_reg/df/df_1_7_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/df/df_1_7_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/df/df_3_6_default.h
-f:drivers/gpu/drm/amd/include/asic_reg/df/df_3_6_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/df/df_3_6_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/df/df_4_15_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/df/df_4_15_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/df/df_4_3_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/df/df_4_3_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_2_0_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_2_0_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_2_0_3_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_2_0_3_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_2_1_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_2_1_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_3_0_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_3_0_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_3_0_3_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_3_0_3_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_3_1_4_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_3_1_4_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_4_2_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_4_2_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_4_2_2_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_4_2_2_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_4_2_3_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_4_2_3_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/gc/gc_10_1_0_default.h
-f:drivers/gpu/drm/amd/include/asic_reg/gc/gc_10_1_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/gc/gc_10_1_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/gc/gc_10_3_0_default.h
-f:drivers/gpu/drm/amd/include/asic_reg/gc/gc_10_3_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/gc/gc_10_3_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/gc/gc_11_0_0_default.h
-f:drivers/gpu/drm/amd/include/asic_reg/gc/gc_11_0_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/gc/gc_11_0_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/gc/gc_11_0_3_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/gc/gc_11_0_3_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/gc/gc_11_5_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/gc/gc_11_5_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/gc/gc_12_0_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/gc/gc_12_0_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/gc/gc_9_0_default.h
-f:drivers/gpu/drm/amd/include/asic_reg/gc/gc_9_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/gc/gc_9_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/gc/gc_9_1_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/gc/gc_9_1_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/gc/gc_9_2_1_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/gc/gc_9_2_1_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/gc/gc_9_4_1_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/gc/gc_9_4_1_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/gc/gc_9_4_2_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/gc/gc_9_4_2_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/gc/gc_9_4_3_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/gc/gc_9_4_3_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/gca/gfx_6_0_d.h
-f:drivers/gpu/drm/amd/include/asic_reg/gca/gfx_6_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/gca/gfx_7_0_d.h
-f:drivers/gpu/drm/amd/include/asic_reg/gca/gfx_7_2_d.h
-f:drivers/gpu/drm/amd/include/asic_reg/gca/gfx_7_2_enum.h
-f:drivers/gpu/drm/amd/include/asic_reg/gca/gfx_7_2_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/gca/gfx_8_0_d.h
-f:drivers/gpu/drm/amd/include/asic_reg/gca/gfx_8_0_enum.h
-f:drivers/gpu/drm/amd/include/asic_reg/gca/gfx_8_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/gca/gfx_8_1_d.h
-f:drivers/gpu/drm/amd/include/asic_reg/gca/gfx_8_1_enum.h
-f:drivers/gpu/drm/amd/include/asic_reg/gca/gfx_8_1_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/gmc/gmc_6_0_d.h
-f:drivers/gpu/drm/amd/include/asic_reg/gmc/gmc_6_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/gmc/gmc_7_0_d.h
-f:drivers/gpu/drm/amd/include/asic_reg/gmc/gmc_7_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/gmc/gmc_7_1_d.h
-f:drivers/gpu/drm/amd/include/asic_reg/gmc/gmc_7_1_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/gmc/gmc_8_1_d.h
-f:drivers/gpu/drm/amd/include/asic_reg/gmc/gmc_8_1_enum.h
-f:drivers/gpu/drm/amd/include/asic_reg/gmc/gmc_8_1_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/gmc/gmc_8_2_d.h
-f:drivers/gpu/drm/amd/include/asic_reg/gmc/gmc_8_2_enum.h
-f:drivers/gpu/drm/amd/include/asic_reg/gmc/gmc_8_2_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/hdp/hdp_4_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/hdp/hdp_4_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/hdp/hdp_4_4_2_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/hdp/hdp_4_4_2_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/hdp/hdp_5_0_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/hdp/hdp_5_0_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/hdp/hdp_5_2_1_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/hdp/hdp_5_2_1_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/hdp/hdp_6_0_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/hdp/hdp_6_0_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/hdp/hdp_7_0_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/hdp/hdp_7_0_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/lsdma/lsdma_6_0_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/lsdma/lsdma_6_0_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/lsdma/lsdma_7_0_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/lsdma/lsdma_7_0_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_1_0_default.h
-f:drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_1_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_1_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_1_7_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_1_7_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_1_8_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_1_8_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_2_0_0_default.h
-f:drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_2_0_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_2_0_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_2_3_0_default.h
-f:drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_2_3_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_2_3_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_3_0_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_3_0_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_3_0_1_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_3_0_1_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_3_0_2_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_3_0_2_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_3_3_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_3_3_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_4_1_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_4_1_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_9_1_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_9_1_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_9_3_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_9_3_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_9_4_1_default.h
-f:drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_9_4_1_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_9_4_1_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/mp/mp_10_0_default.h
-f:drivers/gpu/drm/amd/include/asic_reg/mp/mp_10_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/mp/mp_10_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/mp/mp_11_0_8_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/mp/mp_11_0_8_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/mp/mp_11_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/mp/mp_11_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/mp/mp_11_5_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/mp/mp_11_5_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/mp/mp_12_0_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/mp/mp_12_0_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_2_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_2_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_4_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_4_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_5_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_5_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_6_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_6_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_8_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_8_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/mp/mp_14_0_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/mp/mp_14_0_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/mp/mp_14_0_2_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/mp/mp_14_0_2_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/mp/mp_9_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/mp/mp_9_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/nbif/nbif_6_1_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/nbif/nbif_6_1_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/nbif/nbif_6_3_1_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/nbif/nbif_6_3_1_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_2_3_default.h
-f:drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_2_3_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_2_3_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_4_3_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_4_3_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_6_1_default.h
-f:drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_6_1_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_6_1_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_6_1_smn.h
-f:drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_0_default.h
-f:drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_0_smn.h
-f:drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_11_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_11_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_2_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_2_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_4_0_smn.h
-f:drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_4_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_4_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_7_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_7_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_9_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_9_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/oss/oss_1_0_d.h
-f:drivers/gpu/drm/amd/include/asic_reg/oss/oss_1_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/oss/oss_2_0_d.h
-f:drivers/gpu/drm/amd/include/asic_reg/oss/oss_2_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/oss/oss_2_4_d.h
-f:drivers/gpu/drm/amd/include/asic_reg/oss/oss_2_4_enum.h
-f:drivers/gpu/drm/amd/include/asic_reg/oss/oss_2_4_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/oss/oss_3_0_1_d.h
-f:drivers/gpu/drm/amd/include/asic_reg/oss/oss_3_0_1_enum.h
-f:drivers/gpu/drm/amd/include/asic_reg/oss/oss_3_0_1_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/oss/oss_3_0_d.h
-f:drivers/gpu/drm/amd/include/asic_reg/oss/oss_3_0_enum.h
-f:drivers/gpu/drm/amd/include/asic_reg/oss/oss_3_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/oss/osssys_4_0_1_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/oss/osssys_4_0_1_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/oss/osssys_4_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/oss/osssys_4_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/oss/osssys_4_2_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/oss/osssys_4_2_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/oss/osssys_4_4_2_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/oss/osssys_4_4_2_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/oss/osssys_5_0_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/oss/osssys_5_0_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/oss/osssys_6_0_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/oss/osssys_6_0_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/oss/osssys_6_1_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/oss/osssys_6_1_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/oss/osssys_7_0_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/oss/osssys_7_0_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/pcie/pcie_6_1_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/pcie/pcie_6_1_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/pwr/pwr_10_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/pwr/pwr_10_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/rsmu/rsmu_0_0_2_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/rsmu/rsmu_0_0_2_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/sdma/sdma_4_4_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/sdma/sdma_4_4_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/sdma/sdma_4_4_2_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/sdma/sdma_4_4_2_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_0_default.h
-f:drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_1_default.h
-f:drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_1_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_1_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_2_2_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_2_2_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_2_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_2_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/sdma1/sdma1_4_0_default.h
-f:drivers/gpu/drm/amd/include/asic_reg/sdma1/sdma1_4_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/sdma1/sdma1_4_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/sdma1/sdma1_4_2_2_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/sdma1/sdma1_4_2_2_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/sdma1/sdma1_4_2_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/sdma1/sdma1_4_2_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/sdma2/sdma2_4_2_2_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/sdma2/sdma2_4_2_2_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/sdma3/sdma3_4_2_2_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/sdma3/sdma3_4_2_2_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/sdma4/sdma4_4_2_2_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/sdma4/sdma4_4_2_2_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/sdma5/sdma5_4_2_2_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/sdma5/sdma5_4_2_2_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/sdma6/sdma6_4_2_2_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/sdma6/sdma6_4_2_2_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/sdma7/sdma7_4_2_2_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/sdma7/sdma7_4_2_2_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/smu/smu_6_0_d.h
-f:drivers/gpu/drm/amd/include/asic_reg/smu/smu_6_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_0_0_d.h
-f:drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_0_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_0_1_d.h
-f:drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_0_1_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_1_0_d.h
-f:drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_1_0_enum.h
-f:drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_1_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_1_1_d.h
-f:drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_1_1_enum.h
-f:drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_1_1_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_1_2_d.h
-f:drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_1_2_enum.h
-f:drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_1_2_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_1_3_d.h
-f:drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_1_3_enum.h
-f:drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_1_3_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/smu/smu_8_0_d.h
-f:drivers/gpu/drm/amd/include/asic_reg/smu/smu_8_0_enum.h
-f:drivers/gpu/drm/amd/include/asic_reg/smu/smu_8_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_10_0_2_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_10_0_2_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_11_0_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_11_0_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_11_0_6_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_11_0_6_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_12_0_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_12_0_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_13_0_2_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_13_0_2_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_13_0_3_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_13_0_3_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_13_0_6_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_13_0_6_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_14_0_2_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_14_0_2_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_9_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_9_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/thm/thm_10_0_default.h
-f:drivers/gpu/drm/amd/include/asic_reg/thm/thm_10_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/thm/thm_10_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/thm/thm_11_0_2_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/thm/thm_11_0_2_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/thm/thm_13_0_2_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/thm/thm_13_0_2_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/thm/thm_14_0_2_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/thm/thm_14_0_2_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/thm/thm_9_0_default.h
-f:drivers/gpu/drm/amd/include/asic_reg/thm/thm_9_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/thm/thm_9_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/umc/umc_12_0_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/umc/umc_12_0_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/umc/umc_6_0_default.h
-f:drivers/gpu/drm/amd/include/asic_reg/umc/umc_6_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/umc/umc_6_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/umc/umc_6_1_1_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/umc/umc_6_1_1_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/umc/umc_6_1_2_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/umc/umc_6_1_2_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/umc/umc_6_7_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/umc/umc_6_7_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/umc/umc_8_10_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/umc/umc_8_10_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/umc/umc_8_14_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/umc/umc_8_14_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/umc/umc_8_7_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/umc/umc_8_7_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_3_1_d.h
-f:drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_3_1_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_4_0_d.h
-f:drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_4_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_4_2_d.h
-f:drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_4_2_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_5_0_d.h
-f:drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_5_0_enum.h
-f:drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_5_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_6_0_d.h
-f:drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_6_0_enum.h
-f:drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_6_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_7_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_7_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/vce/vce_1_0_d.h
-f:drivers/gpu/drm/amd/include/asic_reg/vce/vce_1_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/vce/vce_2_0_d.h
-f:drivers/gpu/drm/amd/include/asic_reg/vce/vce_2_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/vce/vce_3_0_d.h
-f:drivers/gpu/drm/amd/include/asic_reg/vce/vce_3_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/vce/vce_4_0_default.h
-f:drivers/gpu/drm/amd/include/asic_reg/vce/vce_4_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/vce/vce_4_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_1_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_1_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_2_0_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_2_0_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_2_5_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_2_5_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_2_6_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_2_6_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_3_0_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_3_0_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_4_0_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_4_0_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_4_0_3_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_4_0_3_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_4_0_5_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_4_0_5_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_5_0_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_5_0_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/vpe/vpe_6_1_0_offset.h
-f:drivers/gpu/drm/amd/include/asic_reg/vpe/vpe_6_1_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/wafl/wafl2_4_0_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/wafl/wafl2_4_0_0_smn.h
-f:drivers/gpu/drm/amd/include/asic_reg/xgmi/xgmi_4_0_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/asic_reg/xgmi/xgmi_4_0_0_smn.h
-f:drivers/gpu/drm/amd/include/asic_reg/xgmi/xgmi_6_1_0_sh_mask.h
-f:drivers/gpu/drm/amd/include/atom-bits.h
-f:drivers/gpu/drm/amd/include/atom-names.h
-f:drivers/gpu/drm/amd/include/atom-types.h
-f:drivers/gpu/drm/amd/include/atombios.h
-f:drivers/gpu/drm/amd/include/atomfirmware.h
-f:drivers/gpu/drm/amd/include/atomfirmwareid.h
-f:drivers/gpu/drm/amd/include/beige_goby_ip_offset.h
-f:drivers/gpu/drm/amd/include/cgs_common.h
-f:drivers/gpu/drm/amd/include/cik_structs.h
-f:drivers/gpu/drm/amd/include/cyan_skillfish_ip_offset.h
-f:drivers/gpu/drm/amd/include/dimgrey_cavefish_ip_offset.h
-f:drivers/gpu/drm/amd/include/discovery.h
-f:drivers/gpu/drm/amd/include/displayobject.h
-f:drivers/gpu/drm/amd/include/dm_pp_interface.h
-f:drivers/gpu/drm/amd/include/ivsrcid/dcn/irqsrcs_dcn_1_0.h
-f:drivers/gpu/drm/amd/include/ivsrcid/gfx/irqsrcs_gfx_10_1.h
-f:drivers/gpu/drm/amd/include/ivsrcid/gfx/irqsrcs_gfx_11_0_0.h
-f:drivers/gpu/drm/amd/include/ivsrcid/gfx/irqsrcs_gfx_12_0_0.h
-f:drivers/gpu/drm/amd/include/ivsrcid/gfx/irqsrcs_gfx_9_0.h
-f:drivers/gpu/drm/amd/include/ivsrcid/isp/irqsrcs_isp_4_1.h
-f:drivers/gpu/drm/amd/include/ivsrcid/ivsrcid_vislands30.h
-f:drivers/gpu/drm/amd/include/ivsrcid/nbio/irqsrcs_nbif_7_4.h
-f:drivers/gpu/drm/amd/include/ivsrcid/sdma0/irqsrcs_sdma0_4_0.h
-f:drivers/gpu/drm/amd/include/ivsrcid/sdma0/irqsrcs_sdma0_5_0.h
-f:drivers/gpu/drm/amd/include/ivsrcid/sdma1/irqsrcs_sdma1_4_0.h
-f:drivers/gpu/drm/amd/include/ivsrcid/sdma1/irqsrcs_sdma1_5_0.h
-f:drivers/gpu/drm/amd/include/ivsrcid/sdma2/irqsrcs_sdma2_5_0.h
-f:drivers/gpu/drm/amd/include/ivsrcid/sdma3/irqsrcs_sdma3_5_0.h
-f:drivers/gpu/drm/amd/include/ivsrcid/smuio/irqsrcs_smuio_9_0.h
-f:drivers/gpu/drm/amd/include/ivsrcid/thm/irqsrcs_thm_9_0.h
-f:drivers/gpu/drm/amd/include/ivsrcid/uvd/irqsrcs_uvd_7_0.h
-f:drivers/gpu/drm/amd/include/ivsrcid/vce/irqsrcs_vce_4_0.h
-f:drivers/gpu/drm/amd/include/ivsrcid/vcn/irqsrcs_vcn_1_0.h
-f:drivers/gpu/drm/amd/include/ivsrcid/vcn/irqsrcs_vcn_2_0.h
-f:drivers/gpu/drm/amd/include/ivsrcid/vcn/irqsrcs_vcn_4_0.h
-f:drivers/gpu/drm/amd/include/ivsrcid/vcn/irqsrcs_vcn_5_0.h
-f:drivers/gpu/drm/amd/include/ivsrcid/vmc/irqsrcs_vmc_1_0.h
-f:drivers/gpu/drm/amd/include/ivsrcid/vpe/irqsrcs_vpe_6_1.h
-f:drivers/gpu/drm/amd/include/kgd_kfd_interface.h
-f:drivers/gpu/drm/amd/include/kgd_pp_interface.h
-f:drivers/gpu/drm/amd/include/mes_v11_api_def.h
-f:drivers/gpu/drm/amd/include/mes_v12_api_def.h
-f:drivers/gpu/drm/amd/include/navi10_enum.h
-f:drivers/gpu/drm/amd/include/navi10_ip_offset.h
-f:drivers/gpu/drm/amd/include/navi12_ip_offset.h
-f:drivers/gpu/drm/amd/include/navi14_ip_offset.h
-f:drivers/gpu/drm/amd/include/pptable.h
-f:drivers/gpu/drm/amd/include/renoir_ip_offset.h
-f:drivers/gpu/drm/amd/include/sienna_cichlid_ip_offset.h
-f:drivers/gpu/drm/amd/include/soc15_hw_ip.h
-f:drivers/gpu/drm/amd/include/soc15_ih_clientid.h
-f:drivers/gpu/drm/amd/include/soc21_enum.h
-f:drivers/gpu/drm/amd/include/soc24_enum.h
-f:drivers/gpu/drm/amd/include/umsch_mm_4_0_api_def.h
-f:drivers/gpu/drm/amd/include/v10_structs.h
-f:drivers/gpu/drm/amd/include/v11_structs.h
-f:drivers/gpu/drm/amd/include/v12_structs.h
-f:drivers/gpu/drm/amd/include/v9_structs.h
-f:drivers/gpu/drm/amd/include/vangogh_ip_offset.h
-f:drivers/gpu/drm/amd/include/vega10_enum.h
-f:drivers/gpu/drm/amd/include/vega10_ip_offset.h
-f:drivers/gpu/drm/amd/include/vega20_ip_offset.h
-f:drivers/gpu/drm/amd/include/vi_structs.h
-f:drivers/gpu/drm/amd/include/yellow_carp_offset.h
-f:drivers/gpu/drm/amd/pm/Makefile
-f:drivers/gpu/drm/amd/pm/amdgpu_dpm.c
-f:drivers/gpu/drm/amd/pm/amdgpu_dpm_internal.c
-f:drivers/gpu/drm/amd/pm/amdgpu_pm.c
-f:drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h
-f:drivers/gpu/drm/amd/pm/inc/amdgpu_dpm_internal.h
-f:drivers/gpu/drm/amd/pm/inc/amdgpu_pm.h
-f:drivers/gpu/drm/amd/pm/inc/smu_v13_0_0_pptable.h
-f:drivers/gpu/drm/amd/pm/legacy-dpm/Makefile
-f:drivers/gpu/drm/amd/pm/legacy-dpm/cik_dpm.h
-f:drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c
-f:drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.h
-f:drivers/gpu/drm/amd/pm/legacy-dpm/kv_smc.c
-f:drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c
-f:drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.h
-f:drivers/gpu/drm/amd/pm/legacy-dpm/ppsmc.h
-f:drivers/gpu/drm/amd/pm/legacy-dpm/r600_dpm.h
-f:drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c
-f:drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.h
-f:drivers/gpu/drm/amd/pm/legacy-dpm/si_smc.c
-f:drivers/gpu/drm/amd/pm/legacy-dpm/sislands_smc.h
-f:drivers/gpu/drm/amd/pm/powerplay/Makefile
-f:drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/Makefile
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/ci_baco.c
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/ci_baco.h
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/common_baco.c
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/common_baco.h
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/fiji_baco.c
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/fiji_baco.h
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/hardwaremanager.c
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/hwmgr.c
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/hwmgr_ppt.h
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/polaris_baco.c
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/polaris_baco.h
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/pp_overdriver.c
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/pp_overdriver.h
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/pp_psm.c
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/pp_psm.h
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.h
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppatomfwctrl.c
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppatomfwctrl.h
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/pppcielanes.c
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/pppcielanes.h
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/pptable_v1_0.h
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/process_pptables_v1_0.c
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/process_pptables_v1_0.h
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/processpptables.c
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/processpptables.h
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.h
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_inc.h
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_baco.c
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_baco.h
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_clockpowergating.c
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_clockpowergating.h
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_dyn_defaults.h
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.h
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_powertune.c
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_powertune.h
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_thermal.c
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_thermal.h
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.h
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu9_baco.c
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu9_baco.h
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu_helper.c
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu_helper.h
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/tonga_baco.c
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/tonga_baco.h
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_baco.c
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_baco.h
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.h
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_inc.h
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_powertune.c
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_powertune.h
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_pptable.h
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_processpptables.c
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_processpptables.h
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_thermal.c
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_thermal.h
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega12_baco.c
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega12_baco.h
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.h
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega12_inc.h
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega12_pptable.h
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega12_processpptables.c
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega12_processpptables.h
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega12_thermal.c
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega12_thermal.h
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_baco.c
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_baco.h
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.h
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_inc.h
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_powertune.c
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_powertune.h
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_pptable.h
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_processpptables.c
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_processpptables.h
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_thermal.c
-f:drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_thermal.h
-f:drivers/gpu/drm/amd/pm/powerplay/inc/amd_powerplay.h
-f:drivers/gpu/drm/amd/pm/powerplay/inc/cz_ppsmc.h
-f:drivers/gpu/drm/amd/pm/powerplay/inc/fiji_ppsmc.h
-f:drivers/gpu/drm/amd/pm/powerplay/inc/hardwaremanager.h
-f:drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h
-f:drivers/gpu/drm/amd/pm/powerplay/inc/polaris10_pwrvirus.h
-f:drivers/gpu/drm/amd/pm/powerplay/inc/power_state.h
-f:drivers/gpu/drm/amd/pm/powerplay/inc/pp_debug.h
-f:drivers/gpu/drm/amd/pm/powerplay/inc/pp_endian.h
-f:drivers/gpu/drm/amd/pm/powerplay/inc/pp_thermal.h
-f:drivers/gpu/drm/amd/pm/powerplay/inc/ppinterrupt.h
-f:drivers/gpu/drm/amd/pm/powerplay/inc/rv_ppsmc.h
-f:drivers/gpu/drm/amd/pm/powerplay/inc/smu10.h
-f:drivers/gpu/drm/amd/pm/powerplay/inc/smu10_driver_if.h
-f:drivers/gpu/drm/amd/pm/powerplay/inc/smu11_driver_if.h
-f:drivers/gpu/drm/amd/pm/powerplay/inc/smu7.h
-f:drivers/gpu/drm/amd/pm/powerplay/inc/smu71.h
-f:drivers/gpu/drm/amd/pm/powerplay/inc/smu71_discrete.h
-f:drivers/gpu/drm/amd/pm/powerplay/inc/smu72.h
-f:drivers/gpu/drm/amd/pm/powerplay/inc/smu72_discrete.h
-f:drivers/gpu/drm/amd/pm/powerplay/inc/smu73.h
-f:drivers/gpu/drm/amd/pm/powerplay/inc/smu73_discrete.h
-f:drivers/gpu/drm/amd/pm/powerplay/inc/smu74.h
-f:drivers/gpu/drm/amd/pm/powerplay/inc/smu74_discrete.h
-f:drivers/gpu/drm/amd/pm/powerplay/inc/smu75.h
-f:drivers/gpu/drm/amd/pm/powerplay/inc/smu75_discrete.h
-f:drivers/gpu/drm/amd/pm/powerplay/inc/smu7_common.h
-f:drivers/gpu/drm/amd/pm/powerplay/inc/smu7_discrete.h
-f:drivers/gpu/drm/amd/pm/powerplay/inc/smu7_fusion.h
-f:drivers/gpu/drm/amd/pm/powerplay/inc/smu7_ppsmc.h
-f:drivers/gpu/drm/amd/pm/powerplay/inc/smu8.h
-f:drivers/gpu/drm/amd/pm/powerplay/inc/smu8_fusion.h
-f:drivers/gpu/drm/amd/pm/powerplay/inc/smu9.h
-f:drivers/gpu/drm/amd/pm/powerplay/inc/smu9_driver_if.h
-f:drivers/gpu/drm/amd/pm/powerplay/inc/smu_ucode_xfer_cz.h
-f:drivers/gpu/drm/amd/pm/powerplay/inc/smu_ucode_xfer_vi.h
-f:drivers/gpu/drm/amd/pm/powerplay/inc/smumgr.h
-f:drivers/gpu/drm/amd/pm/powerplay/inc/tonga_ppsmc.h
-f:drivers/gpu/drm/amd/pm/powerplay/inc/vega10_ppsmc.h
-f:drivers/gpu/drm/amd/pm/powerplay/inc/vega12/smu9_driver_if.h
-f:drivers/gpu/drm/amd/pm/powerplay/inc/vega12_ppsmc.h
-f:drivers/gpu/drm/amd/pm/powerplay/inc/vega20_ppsmc.h
-f:drivers/gpu/drm/amd/pm/powerplay/smumgr/Makefile
-f:drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c
-f:drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.h
-f:drivers/gpu/drm/amd/pm/powerplay/smumgr/fiji_smumgr.c
-f:drivers/gpu/drm/amd/pm/powerplay/smumgr/fiji_smumgr.h
-f:drivers/gpu/drm/amd/pm/powerplay/smumgr/iceland_smumgr.c
-f:drivers/gpu/drm/amd/pm/powerplay/smumgr/iceland_smumgr.h
-f:drivers/gpu/drm/amd/pm/powerplay/smumgr/polaris10_smumgr.c
-f:drivers/gpu/drm/amd/pm/powerplay/smumgr/polaris10_smumgr.h
-f:drivers/gpu/drm/amd/pm/powerplay/smumgr/smu10_smumgr.c
-f:drivers/gpu/drm/amd/pm/powerplay/smumgr/smu10_smumgr.h
-f:drivers/gpu/drm/amd/pm/powerplay/smumgr/smu7_smumgr.c
-f:drivers/gpu/drm/amd/pm/powerplay/smumgr/smu7_smumgr.h
-f:drivers/gpu/drm/amd/pm/powerplay/smumgr/smu8_smumgr.c
-f:drivers/gpu/drm/amd/pm/powerplay/smumgr/smu8_smumgr.h
-f:drivers/gpu/drm/amd/pm/powerplay/smumgr/smu9_smumgr.c
-f:drivers/gpu/drm/amd/pm/powerplay/smumgr/smu9_smumgr.h
-f:drivers/gpu/drm/amd/pm/powerplay/smumgr/smumgr.c
-f:drivers/gpu/drm/amd/pm/powerplay/smumgr/tonga_smumgr.c
-f:drivers/gpu/drm/amd/pm/powerplay/smumgr/tonga_smumgr.h
-f:drivers/gpu/drm/amd/pm/powerplay/smumgr/vega10_smumgr.c
-f:drivers/gpu/drm/amd/pm/powerplay/smumgr/vega10_smumgr.h
-f:drivers/gpu/drm/amd/pm/powerplay/smumgr/vega12_smumgr.c
-f:drivers/gpu/drm/amd/pm/powerplay/smumgr/vega12_smumgr.h
-f:drivers/gpu/drm/amd/pm/powerplay/smumgr/vega20_smumgr.c
-f:drivers/gpu/drm/amd/pm/powerplay/smumgr/vega20_smumgr.h
-f:drivers/gpu/drm/amd/pm/powerplay/smumgr/vegam_smumgr.c
-f:drivers/gpu/drm/amd/pm/powerplay/smumgr/vegam_smumgr.h
-f:drivers/gpu/drm/amd/pm/swsmu/Makefile
-f:drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
-f:drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/aldebaran_ppsmc.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/arcturus_ppsmc.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu11_driver_if_arcturus.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu11_driver_if_cyan_skillfish.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu11_driver_if_navi10.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu11_driver_if_sienna_cichlid.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu11_driver_if_vangogh.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu12_driver_if.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_aldebaran.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_0.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_4.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_5.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_6.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_7.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_yellow_carp.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu14_driver_if_v14_0.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu14_driver_if_v14_0_0.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v11_0_7_ppsmc.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v11_0_ppsmc.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v11_5_pmfw.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v11_5_ppsmc.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v11_8_pmfw.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v11_8_ppsmc.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v12_0_ppsmc.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_0_ppsmc.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_12_pmfw.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_12_ppsmc.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_1_pmfw.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_1_ppsmc.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_4_pmfw.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_4_ppsmc.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_5_pmfw.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_5_ppsmc.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_pmfw.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_ppsmc.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_7_ppsmc.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v14_0_0_pmfw.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v14_0_0_ppsmc.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v14_0_2_ppsmc.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/smu_11_0_cdr_table.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0_7_pptable.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0_pptable.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/smu_v12_0.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0_7_pptable.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0_pptable.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/smu_v14_0.h
-f:drivers/gpu/drm/amd/pm/swsmu/inc/smu_v14_0_2_pptable.h
-f:drivers/gpu/drm/amd/pm/swsmu/smu11/Makefile
-f:drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c
-f:drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.h
-f:drivers/gpu/drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.c
-f:drivers/gpu/drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.h
-f:drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
-f:drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.h
-f:drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c
-f:drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.h
-f:drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c
-f:drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c
-f:drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.h
-f:drivers/gpu/drm/amd/pm/swsmu/smu12/Makefile
-f:drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c
-f:drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.h
-f:drivers/gpu/drm/amd/pm/swsmu/smu12/smu_v12_0.c
-f:drivers/gpu/drm/amd/pm/swsmu/smu13/Makefile
-f:drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c
-f:drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.h
-f:drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
-f:drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
-f:drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.h
-f:drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c
-f:drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c
-f:drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.h
-f:drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c
-f:drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.h
-f:drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
-f:drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.h
-f:drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c
-f:drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.h
-f:drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c
-f:drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.h
-f:drivers/gpu/drm/amd/pm/swsmu/smu14/Makefile
-f:drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c
-f:drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c
-f:drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.h
-f:drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c
-f:drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.h
-f:drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c
-f:drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h
-f:drivers/gpu/drm/amd/pm/swsmu/smu_internal.h
-f:drivers/gpu/drm/arm/Kconfig
-f:drivers/gpu/drm/arm/Makefile
-f:drivers/gpu/drm/arm/display/Kbuild
-f:drivers/gpu/drm/arm/display/Kconfig
-f:drivers/gpu/drm/arm/display/include/malidp_io.h
-f:drivers/gpu/drm/arm/display/include/malidp_product.h
-f:drivers/gpu/drm/arm/display/include/malidp_utils.h
-f:drivers/gpu/drm/arm/display/komeda/Makefile
-f:drivers/gpu/drm/arm/display/komeda/d71/d71_component.c
-f:drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c
-f:drivers/gpu/drm/arm/display/komeda/d71/d71_dev.h
-f:drivers/gpu/drm/arm/display/komeda/d71/d71_regs.h
-f:drivers/gpu/drm/arm/display/komeda/komeda_color_mgmt.c
-f:drivers/gpu/drm/arm/display/komeda/komeda_color_mgmt.h
-f:drivers/gpu/drm/arm/display/komeda/komeda_crtc.c
-f:drivers/gpu/drm/arm/display/komeda/komeda_dev.c
-f:drivers/gpu/drm/arm/display/komeda/komeda_dev.h
-f:drivers/gpu/drm/arm/display/komeda/komeda_drv.c
-f:drivers/gpu/drm/arm/display/komeda/komeda_event.c
-f:drivers/gpu/drm/arm/display/komeda/komeda_format_caps.c
-f:drivers/gpu/drm/arm/display/komeda/komeda_format_caps.h
-f:drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c
-f:drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.h
-f:drivers/gpu/drm/arm/display/komeda/komeda_kms.c
-f:drivers/gpu/drm/arm/display/komeda/komeda_kms.h
-f:drivers/gpu/drm/arm/display/komeda/komeda_pipeline.c
-f:drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h
-f:drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c
-f:drivers/gpu/drm/arm/display/komeda/komeda_plane.c
-f:drivers/gpu/drm/arm/display/komeda/komeda_private_obj.c
-f:drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c
-f:drivers/gpu/drm/arm/hdlcd_crtc.c
-f:drivers/gpu/drm/arm/hdlcd_drv.c
-f:drivers/gpu/drm/arm/hdlcd_drv.h
-f:drivers/gpu/drm/arm/hdlcd_regs.h
-f:drivers/gpu/drm/arm/malidp_crtc.c
-f:drivers/gpu/drm/arm/malidp_drv.c
-f:drivers/gpu/drm/arm/malidp_drv.h
-f:drivers/gpu/drm/arm/malidp_hw.c
-f:drivers/gpu/drm/arm/malidp_hw.h
-f:drivers/gpu/drm/arm/malidp_mw.c
-f:drivers/gpu/drm/arm/malidp_mw.h
-f:drivers/gpu/drm/arm/malidp_planes.c
-f:drivers/gpu/drm/arm/malidp_regs.h
-f:drivers/gpu/drm/armada/Kconfig
-f:drivers/gpu/drm/armada/Makefile
-f:drivers/gpu/drm/armada/armada_510.c
-f:drivers/gpu/drm/armada/armada_crtc.c
-f:drivers/gpu/drm/armada/armada_crtc.h
-f:drivers/gpu/drm/armada/armada_debugfs.c
-f:drivers/gpu/drm/armada/armada_drm.h
-f:drivers/gpu/drm/armada/armada_drv.c
-f:drivers/gpu/drm/armada/armada_fb.c
-f:drivers/gpu/drm/armada/armada_fb.h
-f:drivers/gpu/drm/armada/armada_fbdev.c
-f:drivers/gpu/drm/armada/armada_gem.c
-f:drivers/gpu/drm/armada/armada_gem.h
-f:drivers/gpu/drm/armada/armada_hw.h
-f:drivers/gpu/drm/armada/armada_ioctlP.h
-f:drivers/gpu/drm/armada/armada_overlay.c
-f:drivers/gpu/drm/armada/armada_plane.c
-f:drivers/gpu/drm/armada/armada_plane.h
-f:drivers/gpu/drm/armada/armada_trace.c
-f:drivers/gpu/drm/armada/armada_trace.h
-f:drivers/gpu/drm/aspeed/Kconfig
-f:drivers/gpu/drm/aspeed/Makefile
-f:drivers/gpu/drm/aspeed/aspeed_gfx.h
-f:drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c
-f:drivers/gpu/drm/aspeed/aspeed_gfx_drv.c
-f:drivers/gpu/drm/aspeed/aspeed_gfx_out.c
-f:drivers/gpu/drm/ast/Kconfig
-f:drivers/gpu/drm/ast/Makefile
-f:drivers/gpu/drm/ast/ast_2000.c
-f:drivers/gpu/drm/ast/ast_2100.c
-f:drivers/gpu/drm/ast/ast_2300.c
-f:drivers/gpu/drm/ast/ast_2500.c
-f:drivers/gpu/drm/ast/ast_2600.c
-f:drivers/gpu/drm/ast/ast_cursor.c
-f:drivers/gpu/drm/ast/ast_ddc.c
-f:drivers/gpu/drm/ast/ast_ddc.h
-f:drivers/gpu/drm/ast/ast_dp.c
-f:drivers/gpu/drm/ast/ast_dp501.c
-f:drivers/gpu/drm/ast/ast_drv.c
-f:drivers/gpu/drm/ast/ast_drv.h
-f:drivers/gpu/drm/ast/ast_main.c
-f:drivers/gpu/drm/ast/ast_mm.c
-f:drivers/gpu/drm/ast/ast_mode.c
-f:drivers/gpu/drm/ast/ast_post.c
-f:drivers/gpu/drm/ast/ast_post.h
-f:drivers/gpu/drm/ast/ast_reg.h
-f:drivers/gpu/drm/ast/ast_sil164.c
-f:drivers/gpu/drm/ast/ast_tables.h
-f:drivers/gpu/drm/ast/ast_vbios.c
-f:drivers/gpu/drm/ast/ast_vbios.h
-f:drivers/gpu/drm/ast/ast_vga.c
-f:drivers/gpu/drm/atmel-hlcdc/Kconfig
-f:drivers/gpu/drm/atmel-hlcdc/Makefile
-f:drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
-f:drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
-f:drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h
-f:drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c
-f:drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
-f:drivers/gpu/drm/bridge/Kconfig
-f:drivers/gpu/drm/bridge/Makefile
-f:drivers/gpu/drm/bridge/adv7511/Kconfig
-f:drivers/gpu/drm/bridge/adv7511/Makefile
-f:drivers/gpu/drm/bridge/adv7511/adv7511.h
-f:drivers/gpu/drm/bridge/adv7511/adv7511_audio.c
-f:drivers/gpu/drm/bridge/adv7511/adv7511_cec.c
-f:drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
-f:drivers/gpu/drm/bridge/adv7511/adv7533.c
-f:drivers/gpu/drm/bridge/analogix/Kconfig
-f:drivers/gpu/drm/bridge/analogix/Makefile
-f:drivers/gpu/drm/bridge/analogix/analogix-anx6345.c
-f:drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c
-f:drivers/gpu/drm/bridge/analogix/analogix-anx78xx.h
-f:drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.c
-f:drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.h
-f:drivers/gpu/drm/bridge/analogix/analogix-i2c-txcommon.h
-f:drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
-f:drivers/gpu/drm/bridge/analogix/analogix_dp_core.h
-f:drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
-f:drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h
-f:drivers/gpu/drm/bridge/analogix/anx7625.c
-f:drivers/gpu/drm/bridge/analogix/anx7625.h
-f:drivers/gpu/drm/bridge/aux-bridge.c
-f:drivers/gpu/drm/bridge/aux-hpd-bridge.c
-f:drivers/gpu/drm/bridge/cadence/Kconfig
-f:drivers/gpu/drm/bridge/cadence/Makefile
-f:drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c
-f:drivers/gpu/drm/bridge/cadence/cdns-dsi-core.h
-f:drivers/gpu/drm/bridge/cadence/cdns-dsi-j721e.c
-f:drivers/gpu/drm/bridge/cadence/cdns-dsi-j721e.h
-f:drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c
-f:drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.h
-f:drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-hdcp.c
-f:drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-hdcp.h
-f:drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-j721e.c
-f:drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-j721e.h
-f:drivers/gpu/drm/bridge/chipone-icn6211.c
-f:drivers/gpu/drm/bridge/chrontel-ch7033.c
-f:drivers/gpu/drm/bridge/cros-ec-anx7688.c
-f:drivers/gpu/drm/bridge/display-connector.c
-f:drivers/gpu/drm/bridge/fsl-ldb.c
-f:drivers/gpu/drm/bridge/imx/Kconfig
-f:drivers/gpu/drm/bridge/imx/Makefile
-f:drivers/gpu/drm/bridge/imx/imx-ldb-helper.c
-f:drivers/gpu/drm/bridge/imx/imx-ldb-helper.h
-f:drivers/gpu/drm/bridge/imx/imx-legacy-bridge.c
-f:drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pvi.c
-f:drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c
-f:drivers/gpu/drm/bridge/imx/imx8qm-ldb.c
-f:drivers/gpu/drm/bridge/imx/imx8qxp-ldb.c
-f:drivers/gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c
-f:drivers/gpu/drm/bridge/imx/imx8qxp-pixel-link.c
-f:drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c
-f:drivers/gpu/drm/bridge/imx/imx93-mipi-dsi.c
-f:drivers/gpu/drm/bridge/ite-it6263.c
-f:drivers/gpu/drm/bridge/ite-it6505.c
-f:drivers/gpu/drm/bridge/ite-it66121.c
-f:drivers/gpu/drm/bridge/lontium-lt8912b.c
-f:drivers/gpu/drm/bridge/lontium-lt9211.c
-f:drivers/gpu/drm/bridge/lontium-lt9611.c
-f:drivers/gpu/drm/bridge/lontium-lt9611uxc.c
-f:drivers/gpu/drm/bridge/lvds-codec.c
-f:drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
-f:drivers/gpu/drm/bridge/microchip-lvds.c
-f:drivers/gpu/drm/bridge/nwl-dsi.c
-f:drivers/gpu/drm/bridge/nwl-dsi.h
-f:drivers/gpu/drm/bridge/nxp-ptn3460.c
-f:drivers/gpu/drm/bridge/panel.c
-f:drivers/gpu/drm/bridge/parade-ps8622.c
-f:drivers/gpu/drm/bridge/parade-ps8640.c
-f:drivers/gpu/drm/bridge/samsung-dsim.c
-f:drivers/gpu/drm/bridge/sii902x.c
-f:drivers/gpu/drm/bridge/sii9234.c
-f:drivers/gpu/drm/bridge/sil-sii8620.c
-f:drivers/gpu/drm/bridge/sil-sii8620.h
-f:drivers/gpu/drm/bridge/simple-bridge.c
-f:drivers/gpu/drm/bridge/synopsys/Kconfig
-f:drivers/gpu/drm/bridge/synopsys/Makefile
-f:drivers/gpu/drm/bridge/synopsys/dw-hdmi-ahb-audio.c
-f:drivers/gpu/drm/bridge/synopsys/dw-hdmi-audio.h
-f:drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c
-f:drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.h
-f:drivers/gpu/drm/bridge/synopsys/dw-hdmi-gp-audio.c
-f:drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c
-f:drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c
-f:drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h
-f:drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
-f:drivers/gpu/drm/bridge/synopsys/dw-hdmi.h
-f:drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c
-f:drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi2.c
-f:drivers/gpu/drm/bridge/tc358762.c
-f:drivers/gpu/drm/bridge/tc358764.c
-f:drivers/gpu/drm/bridge/tc358767.c
-f:drivers/gpu/drm/bridge/tc358768.c
-f:drivers/gpu/drm/bridge/tc358775.c
-f:drivers/gpu/drm/bridge/tda998x_drv.c
-f:drivers/gpu/drm/bridge/thc63lvd1024.c
-f:drivers/gpu/drm/bridge/ti-dlpc3433.c
-f:drivers/gpu/drm/bridge/ti-sn65dsi83.c
-f:drivers/gpu/drm/bridge/ti-sn65dsi86.c
-f:drivers/gpu/drm/bridge/ti-tdp158.c
-f:drivers/gpu/drm/bridge/ti-tfp410.c
-f:drivers/gpu/drm/bridge/ti-tpd12s015.c
-f:drivers/gpu/drm/ci/arm.config
-f:drivers/gpu/drm/ci/arm64.config
-f:drivers/gpu/drm/ci/build-igt.sh
-f:drivers/gpu/drm/ci/build.sh
-f:drivers/gpu/drm/ci/build.yml
-f:drivers/gpu/drm/ci/check-devicetrees.yml
-f:drivers/gpu/drm/ci/check-patch.py
-f:drivers/gpu/drm/ci/container.yml
-f:drivers/gpu/drm/ci/dt-binding-check.sh
-f:drivers/gpu/drm/ci/dtbs-check.sh
-f:drivers/gpu/drm/ci/gitlab-ci.yml
-f:drivers/gpu/drm/ci/igt_runner.sh
-f:drivers/gpu/drm/ci/image-tags.yml
-f:drivers/gpu/drm/ci/kunit.sh
-f:drivers/gpu/drm/ci/kunit.yml
-f:drivers/gpu/drm/ci/lava-submit.sh
-f:drivers/gpu/drm/ci/setup-llvm-links.sh
-f:drivers/gpu/drm/ci/static-checks.yml
-f:drivers/gpu/drm/ci/test.yml
-f:drivers/gpu/drm/ci/x86_64.config
-f:drivers/gpu/drm/ci/xfails/amdgpu-stoney-fails.txt
-f:drivers/gpu/drm/ci/xfails/amdgpu-stoney-flakes.txt
-f:drivers/gpu/drm/ci/xfails/amdgpu-stoney-skips.txt
-f:drivers/gpu/drm/ci/xfails/i915-amly-fails.txt
-f:drivers/gpu/drm/ci/xfails/i915-amly-flakes.txt
-f:drivers/gpu/drm/ci/xfails/i915-amly-skips.txt
-f:drivers/gpu/drm/ci/xfails/i915-apl-fails.txt
-f:drivers/gpu/drm/ci/xfails/i915-apl-flakes.txt
-f:drivers/gpu/drm/ci/xfails/i915-apl-skips.txt
-f:drivers/gpu/drm/ci/xfails/i915-cml-fails.txt
-f:drivers/gpu/drm/ci/xfails/i915-cml-flakes.txt
-f:drivers/gpu/drm/ci/xfails/i915-cml-skips.txt
-f:drivers/gpu/drm/ci/xfails/i915-glk-fails.txt
-f:drivers/gpu/drm/ci/xfails/i915-glk-flakes.txt
-f:drivers/gpu/drm/ci/xfails/i915-glk-skips.txt
-f:drivers/gpu/drm/ci/xfails/i915-jsl-fails.txt
-f:drivers/gpu/drm/ci/xfails/i915-jsl-flakes.txt
-f:drivers/gpu/drm/ci/xfails/i915-jsl-skips.txt
-f:drivers/gpu/drm/ci/xfails/i915-kbl-fails.txt
-f:drivers/gpu/drm/ci/xfails/i915-kbl-flakes.txt
-f:drivers/gpu/drm/ci/xfails/i915-kbl-skips.txt
-f:drivers/gpu/drm/ci/xfails/i915-tgl-fails.txt
-f:drivers/gpu/drm/ci/xfails/i915-tgl-skips.txt
-f:drivers/gpu/drm/ci/xfails/i915-whl-fails.txt
-f:drivers/gpu/drm/ci/xfails/i915-whl-flakes.txt
-f:drivers/gpu/drm/ci/xfails/i915-whl-skips.txt
-f:drivers/gpu/drm/ci/xfails/mediatek-mt8173-fails.txt
-f:drivers/gpu/drm/ci/xfails/mediatek-mt8173-flakes.txt
-f:drivers/gpu/drm/ci/xfails/mediatek-mt8173-skips.txt
-f:drivers/gpu/drm/ci/xfails/mediatek-mt8183-fails.txt
-f:drivers/gpu/drm/ci/xfails/mediatek-mt8183-flakes.txt
-f:drivers/gpu/drm/ci/xfails/mediatek-mt8183-skips.txt
-f:drivers/gpu/drm/ci/xfails/meson-g12b-fails.txt
-f:drivers/gpu/drm/ci/xfails/meson-g12b-skips.txt
-f:drivers/gpu/drm/ci/xfails/msm-apq8016-fails.txt
-f:drivers/gpu/drm/ci/xfails/msm-apq8016-skips.txt
-f:drivers/gpu/drm/ci/xfails/msm-apq8096-fails.txt
-f:drivers/gpu/drm/ci/xfails/msm-apq8096-flakes.txt
-f:drivers/gpu/drm/ci/xfails/msm-apq8096-skips.txt
-f:drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-kingoftown-fails.txt
-f:drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-kingoftown-flakes.txt
-f:drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-kingoftown-skips.txt
-f:drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-lazor-limozeen-fails.txt
-f:drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-lazor-limozeen-flakes.txt
-f:drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-lazor-limozeen-skips.txt
-f:drivers/gpu/drm/ci/xfails/msm-sm8350-hdk-fails.txt
-f:drivers/gpu/drm/ci/xfails/msm-sm8350-hdk-flakes.txt
-f:drivers/gpu/drm/ci/xfails/msm-sm8350-hdk-skips.txt
-f:drivers/gpu/drm/ci/xfails/panfrost-g12b-fails.txt
-f:drivers/gpu/drm/ci/xfails/panfrost-g12b-skips.txt
-f:drivers/gpu/drm/ci/xfails/panfrost-mt8183-fails.txt
-f:drivers/gpu/drm/ci/xfails/panfrost-mt8183-skips.txt
-f:drivers/gpu/drm/ci/xfails/panfrost-rk3288-fails.txt
-f:drivers/gpu/drm/ci/xfails/panfrost-rk3288-skips.txt
-f:drivers/gpu/drm/ci/xfails/panfrost-rk3399-fails.txt
-f:drivers/gpu/drm/ci/xfails/panfrost-rk3399-flakes.txt
-f:drivers/gpu/drm/ci/xfails/panfrost-rk3399-skips.txt
-f:drivers/gpu/drm/ci/xfails/rockchip-rk3288-fails.txt
-f:drivers/gpu/drm/ci/xfails/rockchip-rk3288-flakes.txt
-f:drivers/gpu/drm/ci/xfails/rockchip-rk3288-skips.txt
-f:drivers/gpu/drm/ci/xfails/rockchip-rk3399-fails.txt
-f:drivers/gpu/drm/ci/xfails/rockchip-rk3399-flakes.txt
-f:drivers/gpu/drm/ci/xfails/rockchip-rk3399-skips.txt
-f:drivers/gpu/drm/ci/xfails/virtio_gpu-none-fails.txt
-f:drivers/gpu/drm/ci/xfails/virtio_gpu-none-skips.txt
-f:drivers/gpu/drm/ci/xfails/vkms-none-fails.txt
-f:drivers/gpu/drm/ci/xfails/vkms-none-flakes.txt
-f:drivers/gpu/drm/ci/xfails/vkms-none-skips.txt
-f:drivers/gpu/drm/clients/Kconfig
-f:drivers/gpu/drm/clients/Makefile
-f:drivers/gpu/drm/clients/drm_client_internal.h
-f:drivers/gpu/drm/clients/drm_client_setup.c
-f:drivers/gpu/drm/clients/drm_fbdev_client.c
-f:drivers/gpu/drm/clients/drm_log.c
-f:drivers/gpu/drm/display/Kconfig
-f:drivers/gpu/drm/display/Makefile
-f:drivers/gpu/drm/display/drm_bridge_connector.c
-f:drivers/gpu/drm/display/drm_display_helper_mod.c
-f:drivers/gpu/drm/display/drm_dp_aux_bus.c
-f:drivers/gpu/drm/display/drm_dp_aux_dev.c
-f:drivers/gpu/drm/display/drm_dp_cec.c
-f:drivers/gpu/drm/display/drm_dp_dual_mode_helper.c
-f:drivers/gpu/drm/display/drm_dp_helper.c
-f:drivers/gpu/drm/display/drm_dp_helper_internal.h
-f:drivers/gpu/drm/display/drm_dp_mst_topology.c
-f:drivers/gpu/drm/display/drm_dp_mst_topology_internal.h
-f:drivers/gpu/drm/display/drm_dp_tunnel.c
-f:drivers/gpu/drm/display/drm_dsc_helper.c
-f:drivers/gpu/drm/display/drm_hdcp_helper.c
-f:drivers/gpu/drm/display/drm_hdmi_audio_helper.c
-f:drivers/gpu/drm/display/drm_hdmi_cec_helper.c
-f:drivers/gpu/drm/display/drm_hdmi_cec_notifier_helper.c
-f:drivers/gpu/drm/display/drm_hdmi_helper.c
-f:drivers/gpu/drm/display/drm_hdmi_state_helper.c
-f:drivers/gpu/drm/display/drm_scdc_helper.c
-f:drivers/gpu/drm/drm_atomic.c
-f:drivers/gpu/drm/drm_atomic_helper.c
-f:drivers/gpu/drm/drm_atomic_state_helper.c
-f:drivers/gpu/drm/drm_atomic_uapi.c
-f:drivers/gpu/drm/drm_auth.c
-f:drivers/gpu/drm/drm_blend.c
-f:drivers/gpu/drm/drm_bridge.c
-f:drivers/gpu/drm/drm_bridge_helper.c
-f:drivers/gpu/drm/drm_buddy.c
-f:drivers/gpu/drm/drm_cache.c
-f:drivers/gpu/drm/drm_client.c
-f:drivers/gpu/drm/drm_client_event.c
-f:drivers/gpu/drm/drm_client_modeset.c
-f:drivers/gpu/drm/drm_color_mgmt.c
-f:drivers/gpu/drm/drm_connector.c
-f:drivers/gpu/drm/drm_crtc.c
-f:drivers/gpu/drm/drm_crtc_helper.c
-f:drivers/gpu/drm/drm_crtc_helper_internal.h
-f:drivers/gpu/drm/drm_crtc_internal.h
-f:drivers/gpu/drm/drm_damage_helper.c
-f:drivers/gpu/drm/drm_debugfs.c
-f:drivers/gpu/drm/drm_debugfs_crc.c
-f:drivers/gpu/drm/drm_displayid.c
-f:drivers/gpu/drm/drm_displayid_internal.h
-f:drivers/gpu/drm/drm_draw.c
-f:drivers/gpu/drm/drm_draw_internal.h
-f:drivers/gpu/drm/drm_drv.c
-f:drivers/gpu/drm/drm_dumb_buffers.c
-f:drivers/gpu/drm/drm_edid.c
-f:drivers/gpu/drm/drm_edid_load.c
-f:drivers/gpu/drm/drm_eld.c
-f:drivers/gpu/drm/drm_encoder.c
-f:drivers/gpu/drm/drm_exec.c
-f:drivers/gpu/drm/drm_fb_dma_helper.c
-f:drivers/gpu/drm/drm_fb_helper.c
-f:drivers/gpu/drm/drm_fbdev_dma.c
-f:drivers/gpu/drm/drm_fbdev_shmem.c
-f:drivers/gpu/drm/drm_fbdev_ttm.c
-f:drivers/gpu/drm/drm_file.c
-f:drivers/gpu/drm/drm_flip_work.c
-f:drivers/gpu/drm/drm_format_helper.c
-f:drivers/gpu/drm/drm_format_internal.h
-f:drivers/gpu/drm/drm_fourcc.c
-f:drivers/gpu/drm/drm_framebuffer.c
-f:drivers/gpu/drm/drm_gem.c
-f:drivers/gpu/drm/drm_gem_atomic_helper.c
-f:drivers/gpu/drm/drm_gem_dma_helper.c
-f:drivers/gpu/drm/drm_gem_framebuffer_helper.c
-f:drivers/gpu/drm/drm_gem_shmem_helper.c
-f:drivers/gpu/drm/drm_gem_ttm_helper.c
-f:drivers/gpu/drm/drm_gem_vram_helper.c
-f:drivers/gpu/drm/drm_gpusvm.c
-f:drivers/gpu/drm/drm_gpuvm.c
-f:drivers/gpu/drm/drm_internal.h
-f:drivers/gpu/drm/drm_ioc32.c
-f:drivers/gpu/drm/drm_ioctl.c
-f:drivers/gpu/drm/drm_kms_helper_common.c
-f:drivers/gpu/drm/drm_lease.c
-f:drivers/gpu/drm/drm_managed.c
-f:drivers/gpu/drm/drm_mipi_dbi.c
-f:drivers/gpu/drm/drm_mipi_dsi.c
-f:drivers/gpu/drm/drm_mm.c
-f:drivers/gpu/drm/drm_mode_config.c
-f:drivers/gpu/drm/drm_mode_object.c
-f:drivers/gpu/drm/drm_modes.c
-f:drivers/gpu/drm/drm_modeset_helper.c
-f:drivers/gpu/drm/drm_modeset_lock.c
-f:drivers/gpu/drm/drm_of.c
-f:drivers/gpu/drm/drm_pagemap.c
-f:drivers/gpu/drm/drm_panel.c
-f:drivers/gpu/drm/drm_panel_backlight_quirks.c
-f:drivers/gpu/drm/drm_panel_orientation_quirks.c
-f:drivers/gpu/drm/drm_panic.c
-f:drivers/gpu/drm/drm_panic_qr.rs
-f:drivers/gpu/drm/drm_pci.c
-f:drivers/gpu/drm/drm_plane.c
-f:drivers/gpu/drm/drm_plane_helper.c
-f:drivers/gpu/drm/drm_prime.c
-f:drivers/gpu/drm/drm_print.c
-f:drivers/gpu/drm/drm_privacy_screen.c
-f:drivers/gpu/drm/drm_privacy_screen_x86.c
-f:drivers/gpu/drm/drm_probe_helper.c
-f:drivers/gpu/drm/drm_property.c
-f:drivers/gpu/drm/drm_rect.c
-f:drivers/gpu/drm/drm_self_refresh_helper.c
-f:drivers/gpu/drm/drm_simple_kms_helper.c
-f:drivers/gpu/drm/drm_suballoc.c
-f:drivers/gpu/drm/drm_syncobj.c
-f:drivers/gpu/drm/drm_sysfs.c
-f:drivers/gpu/drm/drm_trace.h
-f:drivers/gpu/drm/drm_trace_points.c
-f:drivers/gpu/drm/drm_vblank.c
-f:drivers/gpu/drm/drm_vblank_work.c
-f:drivers/gpu/drm/drm_vma_manager.c
-f:drivers/gpu/drm/drm_writeback.c
-f:drivers/gpu/drm/etnaviv/Kconfig
-f:drivers/gpu/drm/etnaviv/Makefile
-f:drivers/gpu/drm/etnaviv/cmdstream.xml.h
-f:drivers/gpu/drm/etnaviv/common.xml.h
-f:drivers/gpu/drm/etnaviv/etnaviv_buffer.c
-f:drivers/gpu/drm/etnaviv/etnaviv_cmd_parser.c
-f:drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c
-f:drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.h
-f:drivers/gpu/drm/etnaviv/etnaviv_drv.c
-f:drivers/gpu/drm/etnaviv/etnaviv_drv.h
-f:drivers/gpu/drm/etnaviv/etnaviv_dump.c
-f:drivers/gpu/drm/etnaviv/etnaviv_dump.h
-f:drivers/gpu/drm/etnaviv/etnaviv_gem.c
-f:drivers/gpu/drm/etnaviv/etnaviv_gem.h
-f:drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c
-f:drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
-f:drivers/gpu/drm/etnaviv/etnaviv_gpu.c
-f:drivers/gpu/drm/etnaviv/etnaviv_gpu.h
-f:drivers/gpu/drm/etnaviv/etnaviv_hwdb.c
-f:drivers/gpu/drm/etnaviv/etnaviv_iommu.c
-f:drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.c
-f:drivers/gpu/drm/etnaviv/etnaviv_mmu.c
-f:drivers/gpu/drm/etnaviv/etnaviv_mmu.h
-f:drivers/gpu/drm/etnaviv/etnaviv_perfmon.c
-f:drivers/gpu/drm/etnaviv/etnaviv_perfmon.h
-f:drivers/gpu/drm/etnaviv/etnaviv_sched.c
-f:drivers/gpu/drm/etnaviv/etnaviv_sched.h
-f:drivers/gpu/drm/etnaviv/state.xml.h
-f:drivers/gpu/drm/etnaviv/state_3d.xml.h
-f:drivers/gpu/drm/etnaviv/state_blt.xml.h
-f:drivers/gpu/drm/etnaviv/state_hi.xml.h
-f:drivers/gpu/drm/exynos/Kconfig
-f:drivers/gpu/drm/exynos/Makefile
-f:drivers/gpu/drm/exynos/exynos5433_drm_decon.c
-f:drivers/gpu/drm/exynos/exynos7_drm_decon.c
-f:drivers/gpu/drm/exynos/exynos_dp.c
-f:drivers/gpu/drm/exynos/exynos_drm_crtc.c
-f:drivers/gpu/drm/exynos/exynos_drm_crtc.h
-f:drivers/gpu/drm/exynos/exynos_drm_dma.c
-f:drivers/gpu/drm/exynos/exynos_drm_dpi.c
-f:drivers/gpu/drm/exynos/exynos_drm_drv.c
-f:drivers/gpu/drm/exynos/exynos_drm_drv.h
-f:drivers/gpu/drm/exynos/exynos_drm_dsi.c
-f:drivers/gpu/drm/exynos/exynos_drm_fb.c
-f:drivers/gpu/drm/exynos/exynos_drm_fb.h
-f:drivers/gpu/drm/exynos/exynos_drm_fbdev.c
-f:drivers/gpu/drm/exynos/exynos_drm_fbdev.h
-f:drivers/gpu/drm/exynos/exynos_drm_fimc.c
-f:drivers/gpu/drm/exynos/exynos_drm_fimd.c
-f:drivers/gpu/drm/exynos/exynos_drm_g2d.c
-f:drivers/gpu/drm/exynos/exynos_drm_g2d.h
-f:drivers/gpu/drm/exynos/exynos_drm_gem.c
-f:drivers/gpu/drm/exynos/exynos_drm_gem.h
-f:drivers/gpu/drm/exynos/exynos_drm_gsc.c
-f:drivers/gpu/drm/exynos/exynos_drm_ipp.c
-f:drivers/gpu/drm/exynos/exynos_drm_ipp.h
-f:drivers/gpu/drm/exynos/exynos_drm_mic.c
-f:drivers/gpu/drm/exynos/exynos_drm_plane.c
-f:drivers/gpu/drm/exynos/exynos_drm_plane.h
-f:drivers/gpu/drm/exynos/exynos_drm_rotator.c
-f:drivers/gpu/drm/exynos/exynos_drm_scaler.c
-f:drivers/gpu/drm/exynos/exynos_drm_vidi.c
-f:drivers/gpu/drm/exynos/exynos_drm_vidi.h
-f:drivers/gpu/drm/exynos/exynos_hdmi.c
-f:drivers/gpu/drm/exynos/exynos_mixer.c
-f:drivers/gpu/drm/exynos/regs-decon5433.h
-f:drivers/gpu/drm/exynos/regs-decon7.h
-f:drivers/gpu/drm/exynos/regs-fimc.h
-f:drivers/gpu/drm/exynos/regs-gsc.h
-f:drivers/gpu/drm/exynos/regs-hdmi.h
-f:drivers/gpu/drm/exynos/regs-mixer.h
-f:drivers/gpu/drm/exynos/regs-rotator.h
-f:drivers/gpu/drm/exynos/regs-scaler.h
-f:drivers/gpu/drm/exynos/regs-vp.h
-f:drivers/gpu/drm/fsl-dcu/Kconfig
-f:drivers/gpu/drm/fsl-dcu/Makefile
-f:drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c
-f:drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.h
-f:drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
-f:drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h
-f:drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_kms.c
-f:drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_output.h
-f:drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c
-f:drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.h
-f:drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c
-f:drivers/gpu/drm/fsl-dcu/fsl_tcon.c
-f:drivers/gpu/drm/fsl-dcu/fsl_tcon.h
-f:drivers/gpu/drm/gma500/Kconfig
-f:drivers/gpu/drm/gma500/Makefile
-f:drivers/gpu/drm/gma500/backlight.c
-f:drivers/gpu/drm/gma500/cdv_device.c
-f:drivers/gpu/drm/gma500/cdv_device.h
-f:drivers/gpu/drm/gma500/cdv_intel_crt.c
-f:drivers/gpu/drm/gma500/cdv_intel_display.c
-f:drivers/gpu/drm/gma500/cdv_intel_dp.c
-f:drivers/gpu/drm/gma500/cdv_intel_hdmi.c
-f:drivers/gpu/drm/gma500/cdv_intel_lvds.c
-f:drivers/gpu/drm/gma500/fbdev.c
-f:drivers/gpu/drm/gma500/framebuffer.c
-f:drivers/gpu/drm/gma500/framebuffer.h
-f:drivers/gpu/drm/gma500/gem.c
-f:drivers/gpu/drm/gma500/gem.h
-f:drivers/gpu/drm/gma500/gma_device.c
-f:drivers/gpu/drm/gma500/gma_device.h
-f:drivers/gpu/drm/gma500/gma_display.c
-f:drivers/gpu/drm/gma500/gma_display.h
-f:drivers/gpu/drm/gma500/gtt.c
-f:drivers/gpu/drm/gma500/gtt.h
-f:drivers/gpu/drm/gma500/intel_bios.c
-f:drivers/gpu/drm/gma500/intel_bios.h
-f:drivers/gpu/drm/gma500/intel_gmbus.c
-f:drivers/gpu/drm/gma500/intel_i2c.c
-f:drivers/gpu/drm/gma500/mid_bios.c
-f:drivers/gpu/drm/gma500/mid_bios.h
-f:drivers/gpu/drm/gma500/mmu.c
-f:drivers/gpu/drm/gma500/mmu.h
-f:drivers/gpu/drm/gma500/oaktrail.h
-f:drivers/gpu/drm/gma500/oaktrail_crtc.c
-f:drivers/gpu/drm/gma500/oaktrail_device.c
-f:drivers/gpu/drm/gma500/oaktrail_hdmi.c
-f:drivers/gpu/drm/gma500/oaktrail_hdmi_i2c.c
-f:drivers/gpu/drm/gma500/oaktrail_lvds.c
-f:drivers/gpu/drm/gma500/oaktrail_lvds_i2c.c
-f:drivers/gpu/drm/gma500/opregion.c
-f:drivers/gpu/drm/gma500/opregion.h
-f:drivers/gpu/drm/gma500/power.c
-f:drivers/gpu/drm/gma500/power.h
-f:drivers/gpu/drm/gma500/psb_device.c
-f:drivers/gpu/drm/gma500/psb_device.h
-f:drivers/gpu/drm/gma500/psb_drv.c
-f:drivers/gpu/drm/gma500/psb_drv.h
-f:drivers/gpu/drm/gma500/psb_intel_display.c
-f:drivers/gpu/drm/gma500/psb_intel_drv.h
-f:drivers/gpu/drm/gma500/psb_intel_lvds.c
-f:drivers/gpu/drm/gma500/psb_intel_modes.c
-f:drivers/gpu/drm/gma500/psb_intel_reg.h
-f:drivers/gpu/drm/gma500/psb_intel_sdvo.c
-f:drivers/gpu/drm/gma500/psb_intel_sdvo_regs.h
-f:drivers/gpu/drm/gma500/psb_irq.c
-f:drivers/gpu/drm/gma500/psb_irq.h
-f:drivers/gpu/drm/gma500/psb_reg.h
-f:drivers/gpu/drm/gud/Kconfig
-f:drivers/gpu/drm/gud/Makefile
-f:drivers/gpu/drm/gud/gud_connector.c
-f:drivers/gpu/drm/gud/gud_drv.c
-f:drivers/gpu/drm/gud/gud_internal.h
-f:drivers/gpu/drm/gud/gud_pipe.c
-f:drivers/gpu/drm/hisilicon/Kconfig
-f:drivers/gpu/drm/hisilicon/Makefile
-f:drivers/gpu/drm/hisilicon/hibmc/Kconfig
-f:drivers/gpu/drm/hisilicon/hibmc/Makefile
-f:drivers/gpu/drm/hisilicon/hibmc/dp/dp_aux.c
-f:drivers/gpu/drm/hisilicon/hibmc/dp/dp_comm.h
-f:drivers/gpu/drm/hisilicon/hibmc/dp/dp_config.h
-f:drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.c
-f:drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.h
-f:drivers/gpu/drm/hisilicon/hibmc/dp/dp_link.c
-f:drivers/gpu/drm/hisilicon/hibmc/dp/dp_reg.h
-f:drivers/gpu/drm/hisilicon/hibmc/dp/dp_serdes.c
-f:drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c
-f:drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_debugfs.c
-f:drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c
-f:drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
-f:drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h
-f:drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_i2c.c
-f:drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_regs.h
-f:drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c
-f:drivers/gpu/drm/hisilicon/kirin/Kconfig
-f:drivers/gpu/drm/hisilicon/kirin/Makefile
-f:drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c
-f:drivers/gpu/drm/hisilicon/kirin/dw_dsi_reg.h
-f:drivers/gpu/drm/hisilicon/kirin/kirin_ade_reg.h
-f:drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
-f:drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c
-f:drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h
-f:drivers/gpu/drm/hyperv/Makefile
-f:drivers/gpu/drm/hyperv/hyperv_drm.h
-f:drivers/gpu/drm/hyperv/hyperv_drm_drv.c
-f:drivers/gpu/drm/hyperv/hyperv_drm_modeset.c
-f:drivers/gpu/drm/hyperv/hyperv_drm_proto.c
-f:drivers/gpu/drm/i915/.gitignore
-f:drivers/gpu/drm/i915/Kconfig
-f:drivers/gpu/drm/i915/Kconfig.debug
-f:drivers/gpu/drm/i915/Kconfig.profile
-f:drivers/gpu/drm/i915/Makefile
-f:drivers/gpu/drm/i915/TODO.txt
-f:drivers/gpu/drm/i915/display/bxt_dpio_phy_regs.h
-f:drivers/gpu/drm/i915/display/dvo_ch7017.c
-f:drivers/gpu/drm/i915/display/dvo_ch7xxx.c
-f:drivers/gpu/drm/i915/display/dvo_ivch.c
-f:drivers/gpu/drm/i915/display/dvo_ns2501.c
-f:drivers/gpu/drm/i915/display/dvo_sil164.c
-f:drivers/gpu/drm/i915/display/dvo_tfp410.c
-f:drivers/gpu/drm/i915/display/g4x_dp.c
-f:drivers/gpu/drm/i915/display/g4x_dp.h
-f:drivers/gpu/drm/i915/display/g4x_hdmi.c
-f:drivers/gpu/drm/i915/display/g4x_hdmi.h
-f:drivers/gpu/drm/i915/display/hsw_ips.c
-f:drivers/gpu/drm/i915/display/hsw_ips.h
-f:drivers/gpu/drm/i915/display/i9xx_display_sr.c
-f:drivers/gpu/drm/i915/display/i9xx_display_sr.h
-f:drivers/gpu/drm/i915/display/i9xx_plane.c
-f:drivers/gpu/drm/i915/display/i9xx_plane.h
-f:drivers/gpu/drm/i915/display/i9xx_plane_regs.h
-f:drivers/gpu/drm/i915/display/i9xx_wm.c
-f:drivers/gpu/drm/i915/display/i9xx_wm.h
-f:drivers/gpu/drm/i915/display/i9xx_wm_regs.h
-f:drivers/gpu/drm/i915/display/icl_dsi.c
-f:drivers/gpu/drm/i915/display/icl_dsi.h
-f:drivers/gpu/drm/i915/display/icl_dsi_regs.h
-f:drivers/gpu/drm/i915/display/intel_acpi.c
-f:drivers/gpu/drm/i915/display/intel_acpi.h
-f:drivers/gpu/drm/i915/display/intel_alpm.c
-f:drivers/gpu/drm/i915/display/intel_alpm.h
-f:drivers/gpu/drm/i915/display/intel_atomic.c
-f:drivers/gpu/drm/i915/display/intel_atomic.h
-f:drivers/gpu/drm/i915/display/intel_audio.c
-f:drivers/gpu/drm/i915/display/intel_audio.h
-f:drivers/gpu/drm/i915/display/intel_audio_regs.h
-f:drivers/gpu/drm/i915/display/intel_backlight.c
-f:drivers/gpu/drm/i915/display/intel_backlight.h
-f:drivers/gpu/drm/i915/display/intel_backlight_regs.h
-f:drivers/gpu/drm/i915/display/intel_bios.c
-f:drivers/gpu/drm/i915/display/intel_bios.h
-f:drivers/gpu/drm/i915/display/intel_bo.c
-f:drivers/gpu/drm/i915/display/intel_bo.h
-f:drivers/gpu/drm/i915/display/intel_bw.c
-f:drivers/gpu/drm/i915/display/intel_bw.h
-f:drivers/gpu/drm/i915/display/intel_cdclk.c
-f:drivers/gpu/drm/i915/display/intel_cdclk.h
-f:drivers/gpu/drm/i915/display/intel_cmtg.c
-f:drivers/gpu/drm/i915/display/intel_cmtg.h
-f:drivers/gpu/drm/i915/display/intel_cmtg_regs.h
-f:drivers/gpu/drm/i915/display/intel_color.c
-f:drivers/gpu/drm/i915/display/intel_color.h
-f:drivers/gpu/drm/i915/display/intel_color_regs.h
-f:drivers/gpu/drm/i915/display/intel_combo_phy.c
-f:drivers/gpu/drm/i915/display/intel_combo_phy.h
-f:drivers/gpu/drm/i915/display/intel_combo_phy_regs.h
-f:drivers/gpu/drm/i915/display/intel_connector.c
-f:drivers/gpu/drm/i915/display/intel_connector.h
-f:drivers/gpu/drm/i915/display/intel_crt.c
-f:drivers/gpu/drm/i915/display/intel_crt.h
-f:drivers/gpu/drm/i915/display/intel_crt_regs.h
-f:drivers/gpu/drm/i915/display/intel_crtc.c
-f:drivers/gpu/drm/i915/display/intel_crtc.h
-f:drivers/gpu/drm/i915/display/intel_crtc_state_dump.c
-f:drivers/gpu/drm/i915/display/intel_crtc_state_dump.h
-f:drivers/gpu/drm/i915/display/intel_cursor.c
-f:drivers/gpu/drm/i915/display/intel_cursor.h
-f:drivers/gpu/drm/i915/display/intel_cursor_regs.h
-f:drivers/gpu/drm/i915/display/intel_cx0_phy.c
-f:drivers/gpu/drm/i915/display/intel_cx0_phy.h
-f:drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h
-f:drivers/gpu/drm/i915/display/intel_ddi.c
-f:drivers/gpu/drm/i915/display/intel_ddi.h
-f:drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c
-f:drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h
-f:drivers/gpu/drm/i915/display/intel_de.h
-f:drivers/gpu/drm/i915/display/intel_display.c
-f:drivers/gpu/drm/i915/display/intel_display.h
-f:drivers/gpu/drm/i915/display/intel_display_conversion.c
-f:drivers/gpu/drm/i915/display/intel_display_conversion.h
-f:drivers/gpu/drm/i915/display/intel_display_core.h
-f:drivers/gpu/drm/i915/display/intel_display_debugfs.c
-f:drivers/gpu/drm/i915/display/intel_display_debugfs.h
-f:drivers/gpu/drm/i915/display/intel_display_debugfs_params.c
-f:drivers/gpu/drm/i915/display/intel_display_debugfs_params.h
-f:drivers/gpu/drm/i915/display/intel_display_device.c
-f:drivers/gpu/drm/i915/display/intel_display_device.h
-f:drivers/gpu/drm/i915/display/intel_display_driver.c
-f:drivers/gpu/drm/i915/display/intel_display_driver.h
-f:drivers/gpu/drm/i915/display/intel_display_irq.c
-f:drivers/gpu/drm/i915/display/intel_display_irq.h
-f:drivers/gpu/drm/i915/display/intel_display_limits.h
-f:drivers/gpu/drm/i915/display/intel_display_params.c
-f:drivers/gpu/drm/i915/display/intel_display_params.h
-f:drivers/gpu/drm/i915/display/intel_display_power.c
-f:drivers/gpu/drm/i915/display/intel_display_power.h
-f:drivers/gpu/drm/i915/display/intel_display_power_map.c
-f:drivers/gpu/drm/i915/display/intel_display_power_map.h
-f:drivers/gpu/drm/i915/display/intel_display_power_well.c
-f:drivers/gpu/drm/i915/display/intel_display_power_well.h
-f:drivers/gpu/drm/i915/display/intel_display_reg_defs.h
-f:drivers/gpu/drm/i915/display/intel_display_regs.h
-f:drivers/gpu/drm/i915/display/intel_display_reset.c
-f:drivers/gpu/drm/i915/display/intel_display_reset.h
-f:drivers/gpu/drm/i915/display/intel_display_rpm.c
-f:drivers/gpu/drm/i915/display/intel_display_rpm.h
-f:drivers/gpu/drm/i915/display/intel_display_rps.c
-f:drivers/gpu/drm/i915/display/intel_display_rps.h
-f:drivers/gpu/drm/i915/display/intel_display_snapshot.c
-f:drivers/gpu/drm/i915/display/intel_display_snapshot.h
-f:drivers/gpu/drm/i915/display/intel_display_trace.c
-f:drivers/gpu/drm/i915/display/intel_display_trace.h
-f:drivers/gpu/drm/i915/display/intel_display_types.h
-f:drivers/gpu/drm/i915/display/intel_display_wa.c
-f:drivers/gpu/drm/i915/display/intel_display_wa.h
-f:drivers/gpu/drm/i915/display/intel_dkl_phy.c
-f:drivers/gpu/drm/i915/display/intel_dkl_phy.h
-f:drivers/gpu/drm/i915/display/intel_dkl_phy_regs.h
-f:drivers/gpu/drm/i915/display/intel_dmc.c
-f:drivers/gpu/drm/i915/display/intel_dmc.h
-f:drivers/gpu/drm/i915/display/intel_dmc_regs.h
-f:drivers/gpu/drm/i915/display/intel_dmc_wl.c
-f:drivers/gpu/drm/i915/display/intel_dmc_wl.h
-f:drivers/gpu/drm/i915/display/intel_dp.c
-f:drivers/gpu/drm/i915/display/intel_dp.h
-f:drivers/gpu/drm/i915/display/intel_dp_aux.c
-f:drivers/gpu/drm/i915/display/intel_dp_aux.h
-f:drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
-f:drivers/gpu/drm/i915/display/intel_dp_aux_backlight.h
-f:drivers/gpu/drm/i915/display/intel_dp_aux_regs.h
-f:drivers/gpu/drm/i915/display/intel_dp_hdcp.c
-f:drivers/gpu/drm/i915/display/intel_dp_hdcp.h
-f:drivers/gpu/drm/i915/display/intel_dp_link_training.c
-f:drivers/gpu/drm/i915/display/intel_dp_link_training.h
-f:drivers/gpu/drm/i915/display/intel_dp_mst.c
-f:drivers/gpu/drm/i915/display/intel_dp_mst.h
-f:drivers/gpu/drm/i915/display/intel_dp_test.c
-f:drivers/gpu/drm/i915/display/intel_dp_test.h
-f:drivers/gpu/drm/i915/display/intel_dp_tunnel.c
-f:drivers/gpu/drm/i915/display/intel_dp_tunnel.h
-f:drivers/gpu/drm/i915/display/intel_dpio_phy.c
-f:drivers/gpu/drm/i915/display/intel_dpio_phy.h
-f:drivers/gpu/drm/i915/display/intel_dpll.c
-f:drivers/gpu/drm/i915/display/intel_dpll.h
-f:drivers/gpu/drm/i915/display/intel_dpll_mgr.c
-f:drivers/gpu/drm/i915/display/intel_dpll_mgr.h
-f:drivers/gpu/drm/i915/display/intel_dpt.c
-f:drivers/gpu/drm/i915/display/intel_dpt.h
-f:drivers/gpu/drm/i915/display/intel_dpt_common.c
-f:drivers/gpu/drm/i915/display/intel_dpt_common.h
-f:drivers/gpu/drm/i915/display/intel_drrs.c
-f:drivers/gpu/drm/i915/display/intel_drrs.h
-f:drivers/gpu/drm/i915/display/intel_dsb.c
-f:drivers/gpu/drm/i915/display/intel_dsb.h
-f:drivers/gpu/drm/i915/display/intel_dsb_buffer.c
-f:drivers/gpu/drm/i915/display/intel_dsb_buffer.h
-f:drivers/gpu/drm/i915/display/intel_dsb_regs.h
-f:drivers/gpu/drm/i915/display/intel_dsi.c
-f:drivers/gpu/drm/i915/display/intel_dsi.h
-f:drivers/gpu/drm/i915/display/intel_dsi_dcs_backlight.c
-f:drivers/gpu/drm/i915/display/intel_dsi_dcs_backlight.h
-f:drivers/gpu/drm/i915/display/intel_dsi_vbt.c
-f:drivers/gpu/drm/i915/display/intel_dsi_vbt.h
-f:drivers/gpu/drm/i915/display/intel_dvo.c
-f:drivers/gpu/drm/i915/display/intel_dvo.h
-f:drivers/gpu/drm/i915/display/intel_dvo_dev.h
-f:drivers/gpu/drm/i915/display/intel_dvo_regs.h
-f:drivers/gpu/drm/i915/display/intel_encoder.c
-f:drivers/gpu/drm/i915/display/intel_encoder.h
-f:drivers/gpu/drm/i915/display/intel_fb.c
-f:drivers/gpu/drm/i915/display/intel_fb.h
-f:drivers/gpu/drm/i915/display/intel_fb_bo.c
-f:drivers/gpu/drm/i915/display/intel_fb_bo.h
-f:drivers/gpu/drm/i915/display/intel_fb_pin.c
-f:drivers/gpu/drm/i915/display/intel_fb_pin.h
-f:drivers/gpu/drm/i915/display/intel_fbc.c
-f:drivers/gpu/drm/i915/display/intel_fbc.h
-f:drivers/gpu/drm/i915/display/intel_fbc_regs.h
-f:drivers/gpu/drm/i915/display/intel_fbdev.c
-f:drivers/gpu/drm/i915/display/intel_fbdev.h
-f:drivers/gpu/drm/i915/display/intel_fbdev_fb.c
-f:drivers/gpu/drm/i915/display/intel_fbdev_fb.h
-f:drivers/gpu/drm/i915/display/intel_fdi.c
-f:drivers/gpu/drm/i915/display/intel_fdi.h
-f:drivers/gpu/drm/i915/display/intel_fdi_regs.h
-f:drivers/gpu/drm/i915/display/intel_fifo_underrun.c
-f:drivers/gpu/drm/i915/display/intel_fifo_underrun.h
-f:drivers/gpu/drm/i915/display/intel_fixed.h
-f:drivers/gpu/drm/i915/display/intel_flipq.c
-f:drivers/gpu/drm/i915/display/intel_flipq.h
-f:drivers/gpu/drm/i915/display/intel_frontbuffer.c
-f:drivers/gpu/drm/i915/display/intel_frontbuffer.h
-f:drivers/gpu/drm/i915/display/intel_global_state.c
-f:drivers/gpu/drm/i915/display/intel_global_state.h
-f:drivers/gpu/drm/i915/display/intel_gmbus.c
-f:drivers/gpu/drm/i915/display/intel_gmbus.h
-f:drivers/gpu/drm/i915/display/intel_gmbus_regs.h
-f:drivers/gpu/drm/i915/display/intel_hdcp.c
-f:drivers/gpu/drm/i915/display/intel_hdcp.h
-f:drivers/gpu/drm/i915/display/intel_hdcp_gsc.c
-f:drivers/gpu/drm/i915/display/intel_hdcp_gsc.h
-f:drivers/gpu/drm/i915/display/intel_hdcp_gsc_message.c
-f:drivers/gpu/drm/i915/display/intel_hdcp_gsc_message.h
-f:drivers/gpu/drm/i915/display/intel_hdcp_regs.h
-f:drivers/gpu/drm/i915/display/intel_hdcp_shim.h
-f:drivers/gpu/drm/i915/display/intel_hdmi.c
-f:drivers/gpu/drm/i915/display/intel_hdmi.h
-f:drivers/gpu/drm/i915/display/intel_hotplug.c
-f:drivers/gpu/drm/i915/display/intel_hotplug.h
-f:drivers/gpu/drm/i915/display/intel_hotplug_irq.c
-f:drivers/gpu/drm/i915/display/intel_hotplug_irq.h
-f:drivers/gpu/drm/i915/display/intel_hti.c
-f:drivers/gpu/drm/i915/display/intel_hti.h
-f:drivers/gpu/drm/i915/display/intel_hti_regs.h
-f:drivers/gpu/drm/i915/display/intel_link_bw.c
-f:drivers/gpu/drm/i915/display/intel_link_bw.h
-f:drivers/gpu/drm/i915/display/intel_load_detect.c
-f:drivers/gpu/drm/i915/display/intel_load_detect.h
-f:drivers/gpu/drm/i915/display/intel_lpe_audio.c
-f:drivers/gpu/drm/i915/display/intel_lpe_audio.h
-f:drivers/gpu/drm/i915/display/intel_lspcon.c
-f:drivers/gpu/drm/i915/display/intel_lspcon.h
-f:drivers/gpu/drm/i915/display/intel_lvds.c
-f:drivers/gpu/drm/i915/display/intel_lvds.h
-f:drivers/gpu/drm/i915/display/intel_lvds_regs.h
-f:drivers/gpu/drm/i915/display/intel_mg_phy_regs.h
-f:drivers/gpu/drm/i915/display/intel_modeset_lock.c
-f:drivers/gpu/drm/i915/display/intel_modeset_lock.h
-f:drivers/gpu/drm/i915/display/intel_modeset_setup.c
-f:drivers/gpu/drm/i915/display/intel_modeset_setup.h
-f:drivers/gpu/drm/i915/display/intel_modeset_verify.c
-f:drivers/gpu/drm/i915/display/intel_modeset_verify.h
-f:drivers/gpu/drm/i915/display/intel_opregion.c
-f:drivers/gpu/drm/i915/display/intel_opregion.h
-f:drivers/gpu/drm/i915/display/intel_overlay.c
-f:drivers/gpu/drm/i915/display/intel_overlay.h
-f:drivers/gpu/drm/i915/display/intel_panel.c
-f:drivers/gpu/drm/i915/display/intel_panel.h
-f:drivers/gpu/drm/i915/display/intel_pch.c
-f:drivers/gpu/drm/i915/display/intel_pch.h
-f:drivers/gpu/drm/i915/display/intel_pch_display.c
-f:drivers/gpu/drm/i915/display/intel_pch_display.h
-f:drivers/gpu/drm/i915/display/intel_pch_refclk.c
-f:drivers/gpu/drm/i915/display/intel_pch_refclk.h
-f:drivers/gpu/drm/i915/display/intel_pfit.c
-f:drivers/gpu/drm/i915/display/intel_pfit.h
-f:drivers/gpu/drm/i915/display/intel_pfit_regs.h
-f:drivers/gpu/drm/i915/display/intel_pipe_crc.c
-f:drivers/gpu/drm/i915/display/intel_pipe_crc.h
-f:drivers/gpu/drm/i915/display/intel_pipe_crc_regs.h
-f:drivers/gpu/drm/i915/display/intel_plane.c
-f:drivers/gpu/drm/i915/display/intel_plane.h
-f:drivers/gpu/drm/i915/display/intel_plane_initial.c
-f:drivers/gpu/drm/i915/display/intel_plane_initial.h
-f:drivers/gpu/drm/i915/display/intel_pmdemand.c
-f:drivers/gpu/drm/i915/display/intel_pmdemand.h
-f:drivers/gpu/drm/i915/display/intel_pps.c
-f:drivers/gpu/drm/i915/display/intel_pps.h
-f:drivers/gpu/drm/i915/display/intel_pps_regs.h
-f:drivers/gpu/drm/i915/display/intel_psr.c
-f:drivers/gpu/drm/i915/display/intel_psr.h
-f:drivers/gpu/drm/i915/display/intel_psr_regs.h
-f:drivers/gpu/drm/i915/display/intel_qp_tables.c
-f:drivers/gpu/drm/i915/display/intel_qp_tables.h
-f:drivers/gpu/drm/i915/display/intel_quirks.c
-f:drivers/gpu/drm/i915/display/intel_quirks.h
-f:drivers/gpu/drm/i915/display/intel_sbi.c
-f:drivers/gpu/drm/i915/display/intel_sbi.h
-f:drivers/gpu/drm/i915/display/intel_sbi_regs.h
-f:drivers/gpu/drm/i915/display/intel_sdvo.c
-f:drivers/gpu/drm/i915/display/intel_sdvo.h
-f:drivers/gpu/drm/i915/display/intel_sdvo_regs.h
-f:drivers/gpu/drm/i915/display/intel_snps_hdmi_pll.c
-f:drivers/gpu/drm/i915/display/intel_snps_hdmi_pll.h
-f:drivers/gpu/drm/i915/display/intel_snps_phy.c
-f:drivers/gpu/drm/i915/display/intel_snps_phy.h
-f:drivers/gpu/drm/i915/display/intel_snps_phy_regs.h
-f:drivers/gpu/drm/i915/display/intel_sprite.c
-f:drivers/gpu/drm/i915/display/intel_sprite.h
-f:drivers/gpu/drm/i915/display/intel_sprite_regs.h
-f:drivers/gpu/drm/i915/display/intel_sprite_uapi.c
-f:drivers/gpu/drm/i915/display/intel_sprite_uapi.h
-f:drivers/gpu/drm/i915/display/intel_tc.c
-f:drivers/gpu/drm/i915/display/intel_tc.h
-f:drivers/gpu/drm/i915/display/intel_tdf.h
-f:drivers/gpu/drm/i915/display/intel_tv.c
-f:drivers/gpu/drm/i915/display/intel_tv.h
-f:drivers/gpu/drm/i915/display/intel_tv_regs.h
-f:drivers/gpu/drm/i915/display/intel_vblank.c
-f:drivers/gpu/drm/i915/display/intel_vblank.h
-f:drivers/gpu/drm/i915/display/intel_vbt_defs.h
-f:drivers/gpu/drm/i915/display/intel_vdsc.c
-f:drivers/gpu/drm/i915/display/intel_vdsc.h
-f:drivers/gpu/drm/i915/display/intel_vdsc_regs.h
-f:drivers/gpu/drm/i915/display/intel_vga.c
-f:drivers/gpu/drm/i915/display/intel_vga.h
-f:drivers/gpu/drm/i915/display/intel_vga_regs.h
-f:drivers/gpu/drm/i915/display/intel_vrr.c
-f:drivers/gpu/drm/i915/display/intel_vrr.h
-f:drivers/gpu/drm/i915/display/intel_vrr_regs.h
-f:drivers/gpu/drm/i915/display/intel_wm.c
-f:drivers/gpu/drm/i915/display/intel_wm.h
-f:drivers/gpu/drm/i915/display/intel_wm_types.h
-f:drivers/gpu/drm/i915/display/skl_scaler.c
-f:drivers/gpu/drm/i915/display/skl_scaler.h
-f:drivers/gpu/drm/i915/display/skl_universal_plane.c
-f:drivers/gpu/drm/i915/display/skl_universal_plane.h
-f:drivers/gpu/drm/i915/display/skl_universal_plane_regs.h
-f:drivers/gpu/drm/i915/display/skl_watermark.c
-f:drivers/gpu/drm/i915/display/skl_watermark.h
-f:drivers/gpu/drm/i915/display/skl_watermark_regs.h
-f:drivers/gpu/drm/i915/display/vlv_dpio_phy_regs.h
-f:drivers/gpu/drm/i915/display/vlv_dsi.c
-f:drivers/gpu/drm/i915/display/vlv_dsi.h
-f:drivers/gpu/drm/i915/display/vlv_dsi_pll.c
-f:drivers/gpu/drm/i915/display/vlv_dsi_pll.h
-f:drivers/gpu/drm/i915/display/vlv_dsi_pll_regs.h
-f:drivers/gpu/drm/i915/display/vlv_dsi_regs.h
-f:drivers/gpu/drm/i915/display/vlv_sideband.c
-f:drivers/gpu/drm/i915/display/vlv_sideband.h
-f:drivers/gpu/drm/i915/gem/i915_gem_busy.c
-f:drivers/gpu/drm/i915/gem/i915_gem_clflush.c
-f:drivers/gpu/drm/i915/gem/i915_gem_clflush.h
-f:drivers/gpu/drm/i915/gem/i915_gem_context.c
-f:drivers/gpu/drm/i915/gem/i915_gem_context.h
-f:drivers/gpu/drm/i915/gem/i915_gem_context_types.h
-f:drivers/gpu/drm/i915/gem/i915_gem_create.c
-f:drivers/gpu/drm/i915/gem/i915_gem_create.h
-f:drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
-f:drivers/gpu/drm/i915/gem/i915_gem_dmabuf.h
-f:drivers/gpu/drm/i915/gem/i915_gem_domain.c
-f:drivers/gpu/drm/i915/gem/i915_gem_domain.h
-f:drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
-f:drivers/gpu/drm/i915/gem/i915_gem_internal.c
-f:drivers/gpu/drm/i915/gem/i915_gem_internal.h
-f:drivers/gpu/drm/i915/gem/i915_gem_ioctls.h
-f:drivers/gpu/drm/i915/gem/i915_gem_lmem.c
-f:drivers/gpu/drm/i915/gem/i915_gem_lmem.h
-f:drivers/gpu/drm/i915/gem/i915_gem_mman.c
-f:drivers/gpu/drm/i915/gem/i915_gem_mman.h
-f:drivers/gpu/drm/i915/gem/i915_gem_object.c
-f:drivers/gpu/drm/i915/gem/i915_gem_object.h
-f:drivers/gpu/drm/i915/gem/i915_gem_object_frontbuffer.h
-f:drivers/gpu/drm/i915/gem/i915_gem_object_types.h
-f:drivers/gpu/drm/i915/gem/i915_gem_pages.c
-f:drivers/gpu/drm/i915/gem/i915_gem_phys.c
-f:drivers/gpu/drm/i915/gem/i915_gem_pm.c
-f:drivers/gpu/drm/i915/gem/i915_gem_pm.h
-f:drivers/gpu/drm/i915/gem/i915_gem_region.c
-f:drivers/gpu/drm/i915/gem/i915_gem_region.h
-f:drivers/gpu/drm/i915/gem/i915_gem_shmem.c
-f:drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
-f:drivers/gpu/drm/i915/gem/i915_gem_shrinker.h
-f:drivers/gpu/drm/i915/gem/i915_gem_stolen.c
-f:drivers/gpu/drm/i915/gem/i915_gem_stolen.h
-f:drivers/gpu/drm/i915/gem/i915_gem_throttle.c
-f:drivers/gpu/drm/i915/gem/i915_gem_tiling.c
-f:drivers/gpu/drm/i915/gem/i915_gem_tiling.h
-f:drivers/gpu/drm/i915/gem/i915_gem_ttm.c
-f:drivers/gpu/drm/i915/gem/i915_gem_ttm.h
-f:drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c
-f:drivers/gpu/drm/i915/gem/i915_gem_ttm_move.h
-f:drivers/gpu/drm/i915/gem/i915_gem_ttm_pm.c
-f:drivers/gpu/drm/i915/gem/i915_gem_ttm_pm.h
-f:drivers/gpu/drm/i915/gem/i915_gem_userptr.c
-f:drivers/gpu/drm/i915/gem/i915_gem_wait.c
-f:drivers/gpu/drm/i915/gem/i915_gemfs.c
-f:drivers/gpu/drm/i915/gem/i915_gemfs.h
-f:drivers/gpu/drm/i915/gem/selftests/huge_gem_object.c
-f:drivers/gpu/drm/i915/gem/selftests/huge_gem_object.h
-f:drivers/gpu/drm/i915/gem/selftests/huge_pages.c
-f:drivers/gpu/drm/i915/gem/selftests/i915_gem_client_blt.c
-f:drivers/gpu/drm/i915/gem/selftests/i915_gem_coherency.c
-f:drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
-f:drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c
-f:drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c
-f:drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
-f:drivers/gpu/drm/i915/gem/selftests/i915_gem_object.c
-f:drivers/gpu/drm/i915/gem/selftests/i915_gem_phys.c
-f:drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c
-f:drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.h
-f:drivers/gpu/drm/i915/gem/selftests/mock_context.c
-f:drivers/gpu/drm/i915/gem/selftests/mock_context.h
-f:drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.c
-f:drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.h
-f:drivers/gpu/drm/i915/gem/selftests/mock_gem_object.h
-f:drivers/gpu/drm/i915/gt/gen2_engine_cs.c
-f:drivers/gpu/drm/i915/gt/gen2_engine_cs.h
-f:drivers/gpu/drm/i915/gt/gen6_engine_cs.c
-f:drivers/gpu/drm/i915/gt/gen6_engine_cs.h
-f:drivers/gpu/drm/i915/gt/gen6_ppgtt.c
-f:drivers/gpu/drm/i915/gt/gen6_ppgtt.h
-f:drivers/gpu/drm/i915/gt/gen6_renderstate.c
-f:drivers/gpu/drm/i915/gt/gen7_renderclear.c
-f:drivers/gpu/drm/i915/gt/gen7_renderclear.h
-f:drivers/gpu/drm/i915/gt/gen7_renderstate.c
-f:drivers/gpu/drm/i915/gt/gen8_engine_cs.c
-f:drivers/gpu/drm/i915/gt/gen8_engine_cs.h
-f:drivers/gpu/drm/i915/gt/gen8_ppgtt.c
-f:drivers/gpu/drm/i915/gt/gen8_ppgtt.h
-f:drivers/gpu/drm/i915/gt/gen8_renderstate.c
-f:drivers/gpu/drm/i915/gt/gen9_renderstate.c
-f:drivers/gpu/drm/i915/gt/hsw_clear_kernel.c
-f:drivers/gpu/drm/i915/gt/intel_breadcrumbs.c
-f:drivers/gpu/drm/i915/gt/intel_breadcrumbs.h
-f:drivers/gpu/drm/i915/gt/intel_breadcrumbs_types.h
-f:drivers/gpu/drm/i915/gt/intel_context.c
-f:drivers/gpu/drm/i915/gt/intel_context.h
-f:drivers/gpu/drm/i915/gt/intel_context_param.h
-f:drivers/gpu/drm/i915/gt/intel_context_sseu.c
-f:drivers/gpu/drm/i915/gt/intel_context_types.h
-f:drivers/gpu/drm/i915/gt/intel_engine.h
-f:drivers/gpu/drm/i915/gt/intel_engine_cs.c
-f:drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c
-f:drivers/gpu/drm/i915/gt/intel_engine_heartbeat.h
-f:drivers/gpu/drm/i915/gt/intel_engine_pm.c
-f:drivers/gpu/drm/i915/gt/intel_engine_pm.h
-f:drivers/gpu/drm/i915/gt/intel_engine_regs.h
-f:drivers/gpu/drm/i915/gt/intel_engine_stats.h
-f:drivers/gpu/drm/i915/gt/intel_engine_types.h
-f:drivers/gpu/drm/i915/gt/intel_engine_user.c
-f:drivers/gpu/drm/i915/gt/intel_engine_user.h
-f:drivers/gpu/drm/i915/gt/intel_execlists_submission.c
-f:drivers/gpu/drm/i915/gt/intel_execlists_submission.h
-f:drivers/gpu/drm/i915/gt/intel_ggtt.c
-f:drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c
-f:drivers/gpu/drm/i915/gt/intel_ggtt_fencing.h
-f:drivers/gpu/drm/i915/gt/intel_ggtt_gmch.c
-f:drivers/gpu/drm/i915/gt/intel_ggtt_gmch.h
-f:drivers/gpu/drm/i915/gt/intel_gpu_commands.h
-f:drivers/gpu/drm/i915/gt/intel_gsc.c
-f:drivers/gpu/drm/i915/gt/intel_gsc.h
-f:drivers/gpu/drm/i915/gt/intel_gt.c
-f:drivers/gpu/drm/i915/gt/intel_gt.h
-f:drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.c
-f:drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.h
-f:drivers/gpu/drm/i915/gt/intel_gt_buffer_pool_types.h
-f:drivers/gpu/drm/i915/gt/intel_gt_ccs_mode.c
-f:drivers/gpu/drm/i915/gt/intel_gt_ccs_mode.h
-f:drivers/gpu/drm/i915/gt/intel_gt_clock_utils.c
-f:drivers/gpu/drm/i915/gt/intel_gt_clock_utils.h
-f:drivers/gpu/drm/i915/gt/intel_gt_debugfs.c
-f:drivers/gpu/drm/i915/gt/intel_gt_debugfs.h
-f:drivers/gpu/drm/i915/gt/intel_gt_defines.h
-f:drivers/gpu/drm/i915/gt/intel_gt_engines_debugfs.c
-f:drivers/gpu/drm/i915/gt/intel_gt_engines_debugfs.h
-f:drivers/gpu/drm/i915/gt/intel_gt_irq.c
-f:drivers/gpu/drm/i915/gt/intel_gt_irq.h
-f:drivers/gpu/drm/i915/gt/intel_gt_mcr.c
-f:drivers/gpu/drm/i915/gt/intel_gt_mcr.h
-f:drivers/gpu/drm/i915/gt/intel_gt_pm.c
-f:drivers/gpu/drm/i915/gt/intel_gt_pm.h
-f:drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c
-f:drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.h
-f:drivers/gpu/drm/i915/gt/intel_gt_pm_irq.c
-f:drivers/gpu/drm/i915/gt/intel_gt_pm_irq.h
-f:drivers/gpu/drm/i915/gt/intel_gt_print.h
-f:drivers/gpu/drm/i915/gt/intel_gt_regs.h
-f:drivers/gpu/drm/i915/gt/intel_gt_requests.c
-f:drivers/gpu/drm/i915/gt/intel_gt_requests.h
-f:drivers/gpu/drm/i915/gt/intel_gt_sysfs.c
-f:drivers/gpu/drm/i915/gt/intel_gt_sysfs.h
-f:drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c
-f:drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.h
-f:drivers/gpu/drm/i915/gt/intel_gt_types.h
-f:drivers/gpu/drm/i915/gt/intel_gtt.c
-f:drivers/gpu/drm/i915/gt/intel_gtt.h
-f:drivers/gpu/drm/i915/gt/intel_hwconfig.h
-f:drivers/gpu/drm/i915/gt/intel_llc.c
-f:drivers/gpu/drm/i915/gt/intel_llc.h
-f:drivers/gpu/drm/i915/gt/intel_llc_types.h
-f:drivers/gpu/drm/i915/gt/intel_lrc.c
-f:drivers/gpu/drm/i915/gt/intel_lrc.h
-f:drivers/gpu/drm/i915/gt/intel_lrc_reg.h
-f:drivers/gpu/drm/i915/gt/intel_migrate.c
-f:drivers/gpu/drm/i915/gt/intel_migrate.h
-f:drivers/gpu/drm/i915/gt/intel_migrate_types.h
-f:drivers/gpu/drm/i915/gt/intel_mocs.c
-f:drivers/gpu/drm/i915/gt/intel_mocs.h
-f:drivers/gpu/drm/i915/gt/intel_ppgtt.c
-f:drivers/gpu/drm/i915/gt/intel_rc6.c
-f:drivers/gpu/drm/i915/gt/intel_rc6.h
-f:drivers/gpu/drm/i915/gt/intel_rc6_types.h
-f:drivers/gpu/drm/i915/gt/intel_region_lmem.c
-f:drivers/gpu/drm/i915/gt/intel_region_lmem.h
-f:drivers/gpu/drm/i915/gt/intel_renderstate.c
-f:drivers/gpu/drm/i915/gt/intel_renderstate.h
-f:drivers/gpu/drm/i915/gt/intel_reset.c
-f:drivers/gpu/drm/i915/gt/intel_reset.h
-f:drivers/gpu/drm/i915/gt/intel_reset_types.h
-f:drivers/gpu/drm/i915/gt/intel_ring.c
-f:drivers/gpu/drm/i915/gt/intel_ring.h
-f:drivers/gpu/drm/i915/gt/intel_ring_submission.c
-f:drivers/gpu/drm/i915/gt/intel_ring_types.h
-f:drivers/gpu/drm/i915/gt/intel_rps.c
-f:drivers/gpu/drm/i915/gt/intel_rps.h
-f:drivers/gpu/drm/i915/gt/intel_rps_types.h
-f:drivers/gpu/drm/i915/gt/intel_sa_media.c
-f:drivers/gpu/drm/i915/gt/intel_sa_media.h
-f:drivers/gpu/drm/i915/gt/intel_sseu.c
-f:drivers/gpu/drm/i915/gt/intel_sseu.h
-f:drivers/gpu/drm/i915/gt/intel_sseu_debugfs.c
-f:drivers/gpu/drm/i915/gt/intel_sseu_debugfs.h
-f:drivers/gpu/drm/i915/gt/intel_timeline.c
-f:drivers/gpu/drm/i915/gt/intel_timeline.h
-f:drivers/gpu/drm/i915/gt/intel_timeline_types.h
-f:drivers/gpu/drm/i915/gt/intel_tlb.c
-f:drivers/gpu/drm/i915/gt/intel_tlb.h
-f:drivers/gpu/drm/i915/gt/intel_wopcm.c
-f:drivers/gpu/drm/i915/gt/intel_wopcm.h
-f:drivers/gpu/drm/i915/gt/intel_workarounds.c
-f:drivers/gpu/drm/i915/gt/intel_workarounds.h
-f:drivers/gpu/drm/i915/gt/intel_workarounds_types.h
-f:drivers/gpu/drm/i915/gt/ivb_clear_kernel.c
-f:drivers/gpu/drm/i915/gt/mock_engine.c
-f:drivers/gpu/drm/i915/gt/mock_engine.h
-f:drivers/gpu/drm/i915/gt/selftest_context.c
-f:drivers/gpu/drm/i915/gt/selftest_engine.c
-f:drivers/gpu/drm/i915/gt/selftest_engine.h
-f:drivers/gpu/drm/i915/gt/selftest_engine_cs.c
-f:drivers/gpu/drm/i915/gt/selftest_engine_heartbeat.c
-f:drivers/gpu/drm/i915/gt/selftest_engine_heartbeat.h
-f:drivers/gpu/drm/i915/gt/selftest_engine_pm.c
-f:drivers/gpu/drm/i915/gt/selftest_execlists.c
-f:drivers/gpu/drm/i915/gt/selftest_gt_pm.c
-f:drivers/gpu/drm/i915/gt/selftest_hangcheck.c
-f:drivers/gpu/drm/i915/gt/selftest_llc.c
-f:drivers/gpu/drm/i915/gt/selftest_llc.h
-f:drivers/gpu/drm/i915/gt/selftest_lrc.c
-f:drivers/gpu/drm/i915/gt/selftest_migrate.c
-f:drivers/gpu/drm/i915/gt/selftest_mocs.c
-f:drivers/gpu/drm/i915/gt/selftest_rc6.c
-f:drivers/gpu/drm/i915/gt/selftest_rc6.h
-f:drivers/gpu/drm/i915/gt/selftest_reset.c
-f:drivers/gpu/drm/i915/gt/selftest_ring.c
-f:drivers/gpu/drm/i915/gt/selftest_ring_submission.c
-f:drivers/gpu/drm/i915/gt/selftest_rps.c
-f:drivers/gpu/drm/i915/gt/selftest_rps.h
-f:drivers/gpu/drm/i915/gt/selftest_slpc.c
-f:drivers/gpu/drm/i915/gt/selftest_timeline.c
-f:drivers/gpu/drm/i915/gt/selftest_tlb.c
-f:drivers/gpu/drm/i915/gt/selftest_workarounds.c
-f:drivers/gpu/drm/i915/gt/selftests/mock_timeline.c
-f:drivers/gpu/drm/i915/gt/selftests/mock_timeline.h
-f:drivers/gpu/drm/i915/gt/shaders/README
-f:drivers/gpu/drm/i915/gt/shaders/clear_kernel/hsw.asm
-f:drivers/gpu/drm/i915/gt/shaders/clear_kernel/ivb.asm
-f:drivers/gpu/drm/i915/gt/shmem_utils.c
-f:drivers/gpu/drm/i915/gt/shmem_utils.h
-f:drivers/gpu/drm/i915/gt/st_shmem_utils.c
-f:drivers/gpu/drm/i915/gt/sysfs_engines.c
-f:drivers/gpu/drm/i915/gt/sysfs_engines.h
-f:drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h
-f:drivers/gpu/drm/i915/gt/uc/abi/guc_actions_slpc_abi.h
-f:drivers/gpu/drm/i915/gt/uc/abi/guc_communication_ctb_abi.h
-f:drivers/gpu/drm/i915/gt/uc/abi/guc_communication_mmio_abi.h
-f:drivers/gpu/drm/i915/gt/uc/abi/guc_errors_abi.h
-f:drivers/gpu/drm/i915/gt/uc/abi/guc_klvs_abi.h
-f:drivers/gpu/drm/i915/gt/uc/abi/guc_messages_abi.h
-f:drivers/gpu/drm/i915/gt/uc/guc_capture_fwif.h
-f:drivers/gpu/drm/i915/gt/uc/intel_gsc_binary_headers.h
-f:drivers/gpu/drm/i915/gt/uc/intel_gsc_fw.c
-f:drivers/gpu/drm/i915/gt/uc/intel_gsc_fw.h
-f:drivers/gpu/drm/i915/gt/uc/intel_gsc_proxy.c
-f:drivers/gpu/drm/i915/gt/uc/intel_gsc_proxy.h
-f:drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c
-f:drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.h
-f:drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_debugfs.c
-f:drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_debugfs.h
-f:drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.c
-f:drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.h
-f:drivers/gpu/drm/i915/gt/uc/intel_guc.c
-f:drivers/gpu/drm/i915/gt/uc/intel_guc.h
-f:drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c
-f:drivers/gpu/drm/i915/gt/uc/intel_guc_ads.h
-f:drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c
-f:drivers/gpu/drm/i915/gt/uc/intel_guc_capture.h
-f:drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
-f:drivers/gpu/drm/i915/gt/uc/intel_guc_ct.h
-f:drivers/gpu/drm/i915/gt/uc/intel_guc_debugfs.c
-f:drivers/gpu/drm/i915/gt/uc/intel_guc_debugfs.h
-f:drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c
-f:drivers/gpu/drm/i915/gt/uc/intel_guc_fw.h
-f:drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h
-f:drivers/gpu/drm/i915/gt/uc/intel_guc_hwconfig.c
-f:drivers/gpu/drm/i915/gt/uc/intel_guc_log.c
-f:drivers/gpu/drm/i915/gt/uc/intel_guc_log.h
-f:drivers/gpu/drm/i915/gt/uc/intel_guc_log_debugfs.c
-f:drivers/gpu/drm/i915/gt/uc/intel_guc_log_debugfs.h
-f:drivers/gpu/drm/i915/gt/uc/intel_guc_print.h
-f:drivers/gpu/drm/i915/gt/uc/intel_guc_rc.c
-f:drivers/gpu/drm/i915/gt/uc/intel_guc_rc.h
-f:drivers/gpu/drm/i915/gt/uc/intel_guc_reg.h
-f:drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c
-f:drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h
-f:drivers/gpu/drm/i915/gt/uc/intel_guc_slpc_types.h
-f:drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
-f:drivers/gpu/drm/i915/gt/uc/intel_guc_submission.h
-f:drivers/gpu/drm/i915/gt/uc/intel_huc.c
-f:drivers/gpu/drm/i915/gt/uc/intel_huc.h
-f:drivers/gpu/drm/i915/gt/uc/intel_huc_debugfs.c
-f:drivers/gpu/drm/i915/gt/uc/intel_huc_debugfs.h
-f:drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
-f:drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h
-f:drivers/gpu/drm/i915/gt/uc/intel_huc_print.h
-f:drivers/gpu/drm/i915/gt/uc/intel_uc.c
-f:drivers/gpu/drm/i915/gt/uc/intel_uc.h
-f:drivers/gpu/drm/i915/gt/uc/intel_uc_debugfs.c
-f:drivers/gpu/drm/i915/gt/uc/intel_uc_debugfs.h
-f:drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
-f:drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
-f:drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
-f:drivers/gpu/drm/i915/gt/uc/selftest_guc.c
-f:drivers/gpu/drm/i915/gt/uc/selftest_guc_hangcheck.c
-f:drivers/gpu/drm/i915/gt/uc/selftest_guc_multi_lrc.c
-f:drivers/gpu/drm/i915/gvt/Makefile
-f:drivers/gpu/drm/i915/gvt/aperture_gm.c
-f:drivers/gpu/drm/i915/gvt/cfg_space.c
-f:drivers/gpu/drm/i915/gvt/cmd_parser.c
-f:drivers/gpu/drm/i915/gvt/cmd_parser.h
-f:drivers/gpu/drm/i915/gvt/debug.h
-f:drivers/gpu/drm/i915/gvt/debugfs.c
-f:drivers/gpu/drm/i915/gvt/display.c
-f:drivers/gpu/drm/i915/gvt/display.h
-f:drivers/gpu/drm/i915/gvt/dmabuf.c
-f:drivers/gpu/drm/i915/gvt/dmabuf.h
-f:drivers/gpu/drm/i915/gvt/edid.c
-f:drivers/gpu/drm/i915/gvt/edid.h
-f:drivers/gpu/drm/i915/gvt/execlist.c
-f:drivers/gpu/drm/i915/gvt/execlist.h
-f:drivers/gpu/drm/i915/gvt/fb_decoder.c
-f:drivers/gpu/drm/i915/gvt/fb_decoder.h
-f:drivers/gpu/drm/i915/gvt/firmware.c
-f:drivers/gpu/drm/i915/gvt/gtt.c
-f:drivers/gpu/drm/i915/gvt/gtt.h
-f:drivers/gpu/drm/i915/gvt/gvt.h
-f:drivers/gpu/drm/i915/gvt/handlers.c
-f:drivers/gpu/drm/i915/gvt/interrupt.c
-f:drivers/gpu/drm/i915/gvt/interrupt.h
-f:drivers/gpu/drm/i915/gvt/kvmgt.c
-f:drivers/gpu/drm/i915/gvt/mmio.c
-f:drivers/gpu/drm/i915/gvt/mmio.h
-f:drivers/gpu/drm/i915/gvt/mmio_context.c
-f:drivers/gpu/drm/i915/gvt/mmio_context.h
-f:drivers/gpu/drm/i915/gvt/opregion.c
-f:drivers/gpu/drm/i915/gvt/page_track.c
-f:drivers/gpu/drm/i915/gvt/page_track.h
-f:drivers/gpu/drm/i915/gvt/reg.h
-f:drivers/gpu/drm/i915/gvt/sched_policy.c
-f:drivers/gpu/drm/i915/gvt/sched_policy.h
-f:drivers/gpu/drm/i915/gvt/scheduler.c
-f:drivers/gpu/drm/i915/gvt/scheduler.h
-f:drivers/gpu/drm/i915/gvt/trace.h
-f:drivers/gpu/drm/i915/gvt/trace_points.c
-f:drivers/gpu/drm/i915/gvt/vgpu.c
-f:drivers/gpu/drm/i915/i915_active.c
-f:drivers/gpu/drm/i915/i915_active.h
-f:drivers/gpu/drm/i915/i915_active_types.h
-f:drivers/gpu/drm/i915/i915_cmd_parser.c
-f:drivers/gpu/drm/i915/i915_cmd_parser.h
-f:drivers/gpu/drm/i915/i915_config.c
-f:drivers/gpu/drm/i915/i915_config.h
-f:drivers/gpu/drm/i915/i915_debugfs.c
-f:drivers/gpu/drm/i915/i915_debugfs.h
-f:drivers/gpu/drm/i915/i915_debugfs_params.c
-f:drivers/gpu/drm/i915/i915_debugfs_params.h
-f:drivers/gpu/drm/i915/i915_deps.c
-f:drivers/gpu/drm/i915/i915_deps.h
-f:drivers/gpu/drm/i915/i915_driver.c
-f:drivers/gpu/drm/i915/i915_driver.h
-f:drivers/gpu/drm/i915/i915_drm_client.c
-f:drivers/gpu/drm/i915/i915_drm_client.h
-f:drivers/gpu/drm/i915/i915_drv.h
-f:drivers/gpu/drm/i915/i915_file_private.h
-f:drivers/gpu/drm/i915/i915_gem.c
-f:drivers/gpu/drm/i915/i915_gem.h
-f:drivers/gpu/drm/i915/i915_gem_evict.c
-f:drivers/gpu/drm/i915/i915_gem_evict.h
-f:drivers/gpu/drm/i915/i915_gem_gtt.c
-f:drivers/gpu/drm/i915/i915_gem_gtt.h
-f:drivers/gpu/drm/i915/i915_gem_ww.c
-f:drivers/gpu/drm/i915/i915_gem_ww.h
-f:drivers/gpu/drm/i915/i915_getparam.c
-f:drivers/gpu/drm/i915/i915_getparam.h
-f:drivers/gpu/drm/i915/i915_gpu_error.c
-f:drivers/gpu/drm/i915/i915_gpu_error.h
-f:drivers/gpu/drm/i915/i915_gtt_view_types.h
-f:drivers/gpu/drm/i915/i915_hwmon.c
-f:drivers/gpu/drm/i915/i915_hwmon.h
-f:drivers/gpu/drm/i915/i915_ioc32.c
-f:drivers/gpu/drm/i915/i915_ioc32.h
-f:drivers/gpu/drm/i915/i915_ioctl.c
-f:drivers/gpu/drm/i915/i915_ioctl.h
-f:drivers/gpu/drm/i915/i915_iosf_mbi.h
-f:drivers/gpu/drm/i915/i915_irq.c
-f:drivers/gpu/drm/i915/i915_irq.h
-f:drivers/gpu/drm/i915/i915_memcpy.c
-f:drivers/gpu/drm/i915/i915_memcpy.h
-f:drivers/gpu/drm/i915/i915_mitigations.c
-f:drivers/gpu/drm/i915/i915_mitigations.h
-f:drivers/gpu/drm/i915/i915_mm.c
-f:drivers/gpu/drm/i915/i915_mm.h
-f:drivers/gpu/drm/i915/i915_module.c
-f:drivers/gpu/drm/i915/i915_params.c
-f:drivers/gpu/drm/i915/i915_params.h
-f:drivers/gpu/drm/i915/i915_pci.c
-f:drivers/gpu/drm/i915/i915_pci.h
-f:drivers/gpu/drm/i915/i915_perf.c
-f:drivers/gpu/drm/i915/i915_perf.h
-f:drivers/gpu/drm/i915/i915_perf_oa_regs.h
-f:drivers/gpu/drm/i915/i915_perf_types.h
-f:drivers/gpu/drm/i915/i915_pmu.c
-f:drivers/gpu/drm/i915/i915_pmu.h
-f:drivers/gpu/drm/i915/i915_priolist_types.h
-f:drivers/gpu/drm/i915/i915_pvinfo.h
-f:drivers/gpu/drm/i915/i915_query.c
-f:drivers/gpu/drm/i915/i915_query.h
-f:drivers/gpu/drm/i915/i915_reg.h
-f:drivers/gpu/drm/i915/i915_reg_defs.h
-f:drivers/gpu/drm/i915/i915_request.c
-f:drivers/gpu/drm/i915/i915_request.h
-f:drivers/gpu/drm/i915/i915_scatterlist.c
-f:drivers/gpu/drm/i915/i915_scatterlist.h
-f:drivers/gpu/drm/i915/i915_scheduler.c
-f:drivers/gpu/drm/i915/i915_scheduler.h
-f:drivers/gpu/drm/i915/i915_scheduler_types.h
-f:drivers/gpu/drm/i915/i915_selftest.h
-f:drivers/gpu/drm/i915/i915_sw_fence.c
-f:drivers/gpu/drm/i915/i915_sw_fence.h
-f:drivers/gpu/drm/i915/i915_sw_fence_work.c
-f:drivers/gpu/drm/i915/i915_sw_fence_work.h
-f:drivers/gpu/drm/i915/i915_switcheroo.c
-f:drivers/gpu/drm/i915/i915_switcheroo.h
-f:drivers/gpu/drm/i915/i915_syncmap.c
-f:drivers/gpu/drm/i915/i915_syncmap.h
-f:drivers/gpu/drm/i915/i915_sysfs.c
-f:drivers/gpu/drm/i915/i915_sysfs.h
-f:drivers/gpu/drm/i915/i915_tasklet.h
-f:drivers/gpu/drm/i915/i915_trace.h
-f:drivers/gpu/drm/i915/i915_trace_points.c
-f:drivers/gpu/drm/i915/i915_ttm_buddy_manager.c
-f:drivers/gpu/drm/i915/i915_ttm_buddy_manager.h
-f:drivers/gpu/drm/i915/i915_user_extensions.c
-f:drivers/gpu/drm/i915/i915_user_extensions.h
-f:drivers/gpu/drm/i915/i915_utils.c
-f:drivers/gpu/drm/i915/i915_utils.h
-f:drivers/gpu/drm/i915/i915_vgpu.c
-f:drivers/gpu/drm/i915/i915_vgpu.h
-f:drivers/gpu/drm/i915/i915_vma.c
-f:drivers/gpu/drm/i915/i915_vma.h
-f:drivers/gpu/drm/i915/i915_vma_resource.c
-f:drivers/gpu/drm/i915/i915_vma_resource.h
-f:drivers/gpu/drm/i915/i915_vma_types.h
-f:drivers/gpu/drm/i915/intel_clock_gating.c
-f:drivers/gpu/drm/i915/intel_clock_gating.h
-f:drivers/gpu/drm/i915/intel_cpu_info.c
-f:drivers/gpu/drm/i915/intel_cpu_info.h
-f:drivers/gpu/drm/i915/intel_device_info.c
-f:drivers/gpu/drm/i915/intel_device_info.h
-f:drivers/gpu/drm/i915/intel_gvt.c
-f:drivers/gpu/drm/i915/intel_gvt.h
-f:drivers/gpu/drm/i915/intel_gvt_mmio_table.c
-f:drivers/gpu/drm/i915/intel_mchbar_regs.h
-f:drivers/gpu/drm/i915/intel_memory_region.c
-f:drivers/gpu/drm/i915/intel_memory_region.h
-f:drivers/gpu/drm/i915/intel_pci_config.h
-f:drivers/gpu/drm/i915/intel_pcode.c
-f:drivers/gpu/drm/i915/intel_pcode.h
-f:drivers/gpu/drm/i915/intel_region_ttm.c
-f:drivers/gpu/drm/i915/intel_region_ttm.h
-f:drivers/gpu/drm/i915/intel_runtime_pm.c
-f:drivers/gpu/drm/i915/intel_runtime_pm.h
-f:drivers/gpu/drm/i915/intel_step.c
-f:drivers/gpu/drm/i915/intel_step.h
-f:drivers/gpu/drm/i915/intel_uncore.c
-f:drivers/gpu/drm/i915/intel_uncore.h
-f:drivers/gpu/drm/i915/intel_uncore_trace.c
-f:drivers/gpu/drm/i915/intel_uncore_trace.h
-f:drivers/gpu/drm/i915/intel_wakeref.c
-f:drivers/gpu/drm/i915/intel_wakeref.h
-f:drivers/gpu/drm/i915/pxp/intel_pxp.c
-f:drivers/gpu/drm/i915/pxp/intel_pxp.h
-f:drivers/gpu/drm/i915/pxp/intel_pxp_cmd.c
-f:drivers/gpu/drm/i915/pxp/intel_pxp_cmd.h
-f:drivers/gpu/drm/i915/pxp/intel_pxp_cmd_interface_42.h
-f:drivers/gpu/drm/i915/pxp/intel_pxp_cmd_interface_43.h
-f:drivers/gpu/drm/i915/pxp/intel_pxp_cmd_interface_cmn.h
-f:drivers/gpu/drm/i915/pxp/intel_pxp_debugfs.c
-f:drivers/gpu/drm/i915/pxp/intel_pxp_debugfs.h
-f:drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c
-f:drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.h
-f:drivers/gpu/drm/i915/pxp/intel_pxp_huc.c
-f:drivers/gpu/drm/i915/pxp/intel_pxp_huc.h
-f:drivers/gpu/drm/i915/pxp/intel_pxp_irq.c
-f:drivers/gpu/drm/i915/pxp/intel_pxp_irq.h
-f:drivers/gpu/drm/i915/pxp/intel_pxp_pm.c
-f:drivers/gpu/drm/i915/pxp/intel_pxp_pm.h
-f:drivers/gpu/drm/i915/pxp/intel_pxp_regs.h
-f:drivers/gpu/drm/i915/pxp/intel_pxp_session.c
-f:drivers/gpu/drm/i915/pxp/intel_pxp_session.h
-f:drivers/gpu/drm/i915/pxp/intel_pxp_tee.c
-f:drivers/gpu/drm/i915/pxp/intel_pxp_tee.h
-f:drivers/gpu/drm/i915/pxp/intel_pxp_types.h
-f:drivers/gpu/drm/i915/selftests/i915_active.c
-f:drivers/gpu/drm/i915/selftests/i915_gem.c
-f:drivers/gpu/drm/i915/selftests/i915_gem_evict.c
-f:drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
-f:drivers/gpu/drm/i915/selftests/i915_live_selftests.h
-f:drivers/gpu/drm/i915/selftests/i915_mock_selftests.h
-f:drivers/gpu/drm/i915/selftests/i915_perf.c
-f:drivers/gpu/drm/i915/selftests/i915_perf_selftests.h
-f:drivers/gpu/drm/i915/selftests/i915_random.c
-f:drivers/gpu/drm/i915/selftests/i915_random.h
-f:drivers/gpu/drm/i915/selftests/i915_request.c
-f:drivers/gpu/drm/i915/selftests/i915_selftest.c
-f:drivers/gpu/drm/i915/selftests/i915_sw_fence.c
-f:drivers/gpu/drm/i915/selftests/i915_syncmap.c
-f:drivers/gpu/drm/i915/selftests/i915_vma.c
-f:drivers/gpu/drm/i915/selftests/igt_atomic.c
-f:drivers/gpu/drm/i915/selftests/igt_atomic.h
-f:drivers/gpu/drm/i915/selftests/igt_flush_test.c
-f:drivers/gpu/drm/i915/selftests/igt_flush_test.h
-f:drivers/gpu/drm/i915/selftests/igt_live_test.c
-f:drivers/gpu/drm/i915/selftests/igt_live_test.h
-f:drivers/gpu/drm/i915/selftests/igt_mmap.c
-f:drivers/gpu/drm/i915/selftests/igt_mmap.h
-f:drivers/gpu/drm/i915/selftests/igt_reset.c
-f:drivers/gpu/drm/i915/selftests/igt_reset.h
-f:drivers/gpu/drm/i915/selftests/igt_spinner.c
-f:drivers/gpu/drm/i915/selftests/igt_spinner.h
-f:drivers/gpu/drm/i915/selftests/intel_memory_region.c
-f:drivers/gpu/drm/i915/selftests/intel_scheduler_helpers.c
-f:drivers/gpu/drm/i915/selftests/intel_scheduler_helpers.h
-f:drivers/gpu/drm/i915/selftests/intel_uncore.c
-f:drivers/gpu/drm/i915/selftests/lib_sw_fence.c
-f:drivers/gpu/drm/i915/selftests/lib_sw_fence.h
-f:drivers/gpu/drm/i915/selftests/librapl.c
-f:drivers/gpu/drm/i915/selftests/librapl.h
-f:drivers/gpu/drm/i915/selftests/mock_drm.h
-f:drivers/gpu/drm/i915/selftests/mock_gem_device.c
-f:drivers/gpu/drm/i915/selftests/mock_gem_device.h
-f:drivers/gpu/drm/i915/selftests/mock_gtt.c
-f:drivers/gpu/drm/i915/selftests/mock_gtt.h
-f:drivers/gpu/drm/i915/selftests/mock_region.c
-f:drivers/gpu/drm/i915/selftests/mock_region.h
-f:drivers/gpu/drm/i915/selftests/mock_request.c
-f:drivers/gpu/drm/i915/selftests/mock_request.h
-f:drivers/gpu/drm/i915/selftests/mock_uncore.c
-f:drivers/gpu/drm/i915/selftests/mock_uncore.h
-f:drivers/gpu/drm/i915/selftests/scatterlist.c
-f:drivers/gpu/drm/i915/soc/intel_dram.c
-f:drivers/gpu/drm/i915/soc/intel_dram.h
-f:drivers/gpu/drm/i915/soc/intel_gmch.c
-f:drivers/gpu/drm/i915/soc/intel_gmch.h
-f:drivers/gpu/drm/i915/soc/intel_rom.c
-f:drivers/gpu/drm/i915/soc/intel_rom.h
-f:drivers/gpu/drm/i915/vlv_iosf_sb.c
-f:drivers/gpu/drm/i915/vlv_iosf_sb.h
-f:drivers/gpu/drm/i915/vlv_iosf_sb_reg.h
-f:drivers/gpu/drm/i915/vlv_suspend.c
-f:drivers/gpu/drm/i915/vlv_suspend.h
-f:drivers/gpu/drm/imagination/Kconfig
-f:drivers/gpu/drm/imagination/Makefile
-f:drivers/gpu/drm/imagination/pvr_ccb.c
-f:drivers/gpu/drm/imagination/pvr_ccb.h
-f:drivers/gpu/drm/imagination/pvr_cccb.c
-f:drivers/gpu/drm/imagination/pvr_cccb.h
-f:drivers/gpu/drm/imagination/pvr_context.c
-f:drivers/gpu/drm/imagination/pvr_context.h
-f:drivers/gpu/drm/imagination/pvr_debugfs.c
-f:drivers/gpu/drm/imagination/pvr_debugfs.h
-f:drivers/gpu/drm/imagination/pvr_device.c
-f:drivers/gpu/drm/imagination/pvr_device.h
-f:drivers/gpu/drm/imagination/pvr_device_info.c
-f:drivers/gpu/drm/imagination/pvr_device_info.h
-f:drivers/gpu/drm/imagination/pvr_drv.c
-f:drivers/gpu/drm/imagination/pvr_drv.h
-f:drivers/gpu/drm/imagination/pvr_free_list.c
-f:drivers/gpu/drm/imagination/pvr_free_list.h
-f:drivers/gpu/drm/imagination/pvr_fw.c
-f:drivers/gpu/drm/imagination/pvr_fw.h
-f:drivers/gpu/drm/imagination/pvr_fw_info.h
-f:drivers/gpu/drm/imagination/pvr_fw_meta.c
-f:drivers/gpu/drm/imagination/pvr_fw_meta.h
-f:drivers/gpu/drm/imagination/pvr_fw_mips.c
-f:drivers/gpu/drm/imagination/pvr_fw_mips.h
-f:drivers/gpu/drm/imagination/pvr_fw_riscv.c
-f:drivers/gpu/drm/imagination/pvr_fw_startstop.c
-f:drivers/gpu/drm/imagination/pvr_fw_startstop.h
-f:drivers/gpu/drm/imagination/pvr_fw_trace.c
-f:drivers/gpu/drm/imagination/pvr_fw_trace.h
-f:drivers/gpu/drm/imagination/pvr_fw_util.c
-f:drivers/gpu/drm/imagination/pvr_gem.c
-f:drivers/gpu/drm/imagination/pvr_gem.h
-f:drivers/gpu/drm/imagination/pvr_hwrt.c
-f:drivers/gpu/drm/imagination/pvr_hwrt.h
-f:drivers/gpu/drm/imagination/pvr_job.c
-f:drivers/gpu/drm/imagination/pvr_job.h
-f:drivers/gpu/drm/imagination/pvr_mmu.c
-f:drivers/gpu/drm/imagination/pvr_mmu.h
-f:drivers/gpu/drm/imagination/pvr_params.c
-f:drivers/gpu/drm/imagination/pvr_params.h
-f:drivers/gpu/drm/imagination/pvr_power.c
-f:drivers/gpu/drm/imagination/pvr_power.h
-f:drivers/gpu/drm/imagination/pvr_queue.c
-f:drivers/gpu/drm/imagination/pvr_queue.h
-f:drivers/gpu/drm/imagination/pvr_rogue_cr_defs.h
-f:drivers/gpu/drm/imagination/pvr_rogue_cr_defs_client.h
-f:drivers/gpu/drm/imagination/pvr_rogue_defs.h
-f:drivers/gpu/drm/imagination/pvr_rogue_fwif.h
-f:drivers/gpu/drm/imagination/pvr_rogue_fwif_check.h
-f:drivers/gpu/drm/imagination/pvr_rogue_fwif_client.h
-f:drivers/gpu/drm/imagination/pvr_rogue_fwif_client_check.h
-f:drivers/gpu/drm/imagination/pvr_rogue_fwif_common.h
-f:drivers/gpu/drm/imagination/pvr_rogue_fwif_dev_info.h
-f:drivers/gpu/drm/imagination/pvr_rogue_fwif_resetframework.h
-f:drivers/gpu/drm/imagination/pvr_rogue_fwif_sf.h
-f:drivers/gpu/drm/imagination/pvr_rogue_fwif_shared.h
-f:drivers/gpu/drm/imagination/pvr_rogue_fwif_shared_check.h
-f:drivers/gpu/drm/imagination/pvr_rogue_fwif_stream.h
-f:drivers/gpu/drm/imagination/pvr_rogue_heap_config.h
-f:drivers/gpu/drm/imagination/pvr_rogue_meta.h
-f:drivers/gpu/drm/imagination/pvr_rogue_mips.h
-f:drivers/gpu/drm/imagination/pvr_rogue_mips_check.h
-f:drivers/gpu/drm/imagination/pvr_rogue_mmu_defs.h
-f:drivers/gpu/drm/imagination/pvr_rogue_riscv.h
-f:drivers/gpu/drm/imagination/pvr_stream.c
-f:drivers/gpu/drm/imagination/pvr_stream.h
-f:drivers/gpu/drm/imagination/pvr_stream_defs.c
-f:drivers/gpu/drm/imagination/pvr_stream_defs.h
-f:drivers/gpu/drm/imagination/pvr_sync.c
-f:drivers/gpu/drm/imagination/pvr_sync.h
-f:drivers/gpu/drm/imagination/pvr_vm.c
-f:drivers/gpu/drm/imagination/pvr_vm.h
-f:drivers/gpu/drm/imagination/pvr_vm_mips.c
-f:drivers/gpu/drm/imagination/pvr_vm_mips.h
-f:drivers/gpu/drm/imx/Kconfig
-f:drivers/gpu/drm/imx/Makefile
-f:drivers/gpu/drm/imx/dc/Kconfig
-f:drivers/gpu/drm/imx/dc/Makefile
-f:drivers/gpu/drm/imx/dc/dc-cf.c
-f:drivers/gpu/drm/imx/dc/dc-crtc.c
-f:drivers/gpu/drm/imx/dc/dc-de.c
-f:drivers/gpu/drm/imx/dc/dc-de.h
-f:drivers/gpu/drm/imx/dc/dc-drv.c
-f:drivers/gpu/drm/imx/dc/dc-drv.h
-f:drivers/gpu/drm/imx/dc/dc-ed.c
-f:drivers/gpu/drm/imx/dc/dc-fg.c
-f:drivers/gpu/drm/imx/dc/dc-fl.c
-f:drivers/gpu/drm/imx/dc/dc-fu.c
-f:drivers/gpu/drm/imx/dc/dc-fu.h
-f:drivers/gpu/drm/imx/dc/dc-fw.c
-f:drivers/gpu/drm/imx/dc/dc-ic.c
-f:drivers/gpu/drm/imx/dc/dc-kms.c
-f:drivers/gpu/drm/imx/dc/dc-kms.h
-f:drivers/gpu/drm/imx/dc/dc-lb.c
-f:drivers/gpu/drm/imx/dc/dc-pe.c
-f:drivers/gpu/drm/imx/dc/dc-pe.h
-f:drivers/gpu/drm/imx/dc/dc-plane.c
-f:drivers/gpu/drm/imx/dc/dc-tc.c
-f:drivers/gpu/drm/imx/dcss/Kconfig
-f:drivers/gpu/drm/imx/dcss/Makefile
-f:drivers/gpu/drm/imx/dcss/dcss-blkctl.c
-f:drivers/gpu/drm/imx/dcss/dcss-crtc.c
-f:drivers/gpu/drm/imx/dcss/dcss-ctxld.c
-f:drivers/gpu/drm/imx/dcss/dcss-dev.c
-f:drivers/gpu/drm/imx/dcss/dcss-dev.h
-f:drivers/gpu/drm/imx/dcss/dcss-dpr.c
-f:drivers/gpu/drm/imx/dcss/dcss-drv.c
-f:drivers/gpu/drm/imx/dcss/dcss-dtg.c
-f:drivers/gpu/drm/imx/dcss/dcss-kms.c
-f:drivers/gpu/drm/imx/dcss/dcss-kms.h
-f:drivers/gpu/drm/imx/dcss/dcss-plane.c
-f:drivers/gpu/drm/imx/dcss/dcss-scaler.c
-f:drivers/gpu/drm/imx/dcss/dcss-ss.c
-f:drivers/gpu/drm/imx/ipuv3/Kconfig
-f:drivers/gpu/drm/imx/ipuv3/Makefile
-f:drivers/gpu/drm/imx/ipuv3/dw_hdmi-imx.c
-f:drivers/gpu/drm/imx/ipuv3/imx-drm-core.c
-f:drivers/gpu/drm/imx/ipuv3/imx-drm.h
-f:drivers/gpu/drm/imx/ipuv3/imx-ldb.c
-f:drivers/gpu/drm/imx/ipuv3/imx-tve.c
-f:drivers/gpu/drm/imx/ipuv3/ipuv3-crtc.c
-f:drivers/gpu/drm/imx/ipuv3/ipuv3-plane.c
-f:drivers/gpu/drm/imx/ipuv3/ipuv3-plane.h
-f:drivers/gpu/drm/imx/ipuv3/parallel-display.c
-f:drivers/gpu/drm/imx/lcdc/Kconfig
-f:drivers/gpu/drm/imx/lcdc/Makefile
-f:drivers/gpu/drm/imx/lcdc/imx-lcdc.c
-f:drivers/gpu/drm/ingenic/Kconfig
-f:drivers/gpu/drm/ingenic/Makefile
-f:drivers/gpu/drm/ingenic/ingenic-drm-drv.c
-f:drivers/gpu/drm/ingenic/ingenic-drm.h
-f:drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c
-f:drivers/gpu/drm/ingenic/ingenic-ipu.c
-f:drivers/gpu/drm/ingenic/ingenic-ipu.h
-f:drivers/gpu/drm/kmb/Kconfig
-f:drivers/gpu/drm/kmb/Makefile
-f:drivers/gpu/drm/kmb/kmb_crtc.c
-f:drivers/gpu/drm/kmb/kmb_drv.c
-f:drivers/gpu/drm/kmb/kmb_drv.h
-f:drivers/gpu/drm/kmb/kmb_dsi.c
-f:drivers/gpu/drm/kmb/kmb_dsi.h
-f:drivers/gpu/drm/kmb/kmb_plane.c
-f:drivers/gpu/drm/kmb/kmb_plane.h
-f:drivers/gpu/drm/kmb/kmb_regs.h
-f:drivers/gpu/drm/lib/drm_random.c
-f:drivers/gpu/drm/lib/drm_random.h
-f:drivers/gpu/drm/lima/Kconfig
-f:drivers/gpu/drm/lima/Makefile
-f:drivers/gpu/drm/lima/lima_bcast.c
-f:drivers/gpu/drm/lima/lima_bcast.h
-f:drivers/gpu/drm/lima/lima_ctx.c
-f:drivers/gpu/drm/lima/lima_ctx.h
-f:drivers/gpu/drm/lima/lima_devfreq.c
-f:drivers/gpu/drm/lima/lima_devfreq.h
-f:drivers/gpu/drm/lima/lima_device.c
-f:drivers/gpu/drm/lima/lima_device.h
-f:drivers/gpu/drm/lima/lima_dlbu.c
-f:drivers/gpu/drm/lima/lima_dlbu.h
-f:drivers/gpu/drm/lima/lima_drv.c
-f:drivers/gpu/drm/lima/lima_drv.h
-f:drivers/gpu/drm/lima/lima_dump.h
-f:drivers/gpu/drm/lima/lima_gem.c
-f:drivers/gpu/drm/lima/lima_gem.h
-f:drivers/gpu/drm/lima/lima_gp.c
-f:drivers/gpu/drm/lima/lima_gp.h
-f:drivers/gpu/drm/lima/lima_l2_cache.c
-f:drivers/gpu/drm/lima/lima_l2_cache.h
-f:drivers/gpu/drm/lima/lima_mmu.c
-f:drivers/gpu/drm/lima/lima_mmu.h
-f:drivers/gpu/drm/lima/lima_pmu.c
-f:drivers/gpu/drm/lima/lima_pmu.h
-f:drivers/gpu/drm/lima/lima_pp.c
-f:drivers/gpu/drm/lima/lima_pp.h
-f:drivers/gpu/drm/lima/lima_regs.h
-f:drivers/gpu/drm/lima/lima_sched.c
-f:drivers/gpu/drm/lima/lima_sched.h
-f:drivers/gpu/drm/lima/lima_trace.c
-f:drivers/gpu/drm/lima/lima_trace.h
-f:drivers/gpu/drm/lima/lima_vm.c
-f:drivers/gpu/drm/lima/lima_vm.h
-f:drivers/gpu/drm/logicvc/Kconfig
-f:drivers/gpu/drm/logicvc/Makefile
-f:drivers/gpu/drm/logicvc/logicvc_crtc.c
-f:drivers/gpu/drm/logicvc/logicvc_crtc.h
-f:drivers/gpu/drm/logicvc/logicvc_drm.c
-f:drivers/gpu/drm/logicvc/logicvc_drm.h
-f:drivers/gpu/drm/logicvc/logicvc_interface.c
-f:drivers/gpu/drm/logicvc/logicvc_interface.h
-f:drivers/gpu/drm/logicvc/logicvc_layer.c
-f:drivers/gpu/drm/logicvc/logicvc_layer.h
-f:drivers/gpu/drm/logicvc/logicvc_mode.c
-f:drivers/gpu/drm/logicvc/logicvc_mode.h
-f:drivers/gpu/drm/logicvc/logicvc_of.c
-f:drivers/gpu/drm/logicvc/logicvc_of.h
-f:drivers/gpu/drm/logicvc/logicvc_regs.h
-f:drivers/gpu/drm/loongson/Kconfig
-f:drivers/gpu/drm/loongson/Makefile
-f:drivers/gpu/drm/loongson/loongson_device.c
-f:drivers/gpu/drm/loongson/loongson_module.c
-f:drivers/gpu/drm/loongson/loongson_module.h
-f:drivers/gpu/drm/loongson/lsdc_benchmark.c
-f:drivers/gpu/drm/loongson/lsdc_benchmark.h
-f:drivers/gpu/drm/loongson/lsdc_crtc.c
-f:drivers/gpu/drm/loongson/lsdc_debugfs.c
-f:drivers/gpu/drm/loongson/lsdc_drv.c
-f:drivers/gpu/drm/loongson/lsdc_drv.h
-f:drivers/gpu/drm/loongson/lsdc_gem.c
-f:drivers/gpu/drm/loongson/lsdc_gem.h
-f:drivers/gpu/drm/loongson/lsdc_gfxpll.c
-f:drivers/gpu/drm/loongson/lsdc_gfxpll.h
-f:drivers/gpu/drm/loongson/lsdc_i2c.c
-f:drivers/gpu/drm/loongson/lsdc_i2c.h
-f:drivers/gpu/drm/loongson/lsdc_irq.c
-f:drivers/gpu/drm/loongson/lsdc_irq.h
-f:drivers/gpu/drm/loongson/lsdc_output.h
-f:drivers/gpu/drm/loongson/lsdc_output_7a1000.c
-f:drivers/gpu/drm/loongson/lsdc_output_7a2000.c
-f:drivers/gpu/drm/loongson/lsdc_pixpll.c
-f:drivers/gpu/drm/loongson/lsdc_pixpll.h
-f:drivers/gpu/drm/loongson/lsdc_plane.c
-f:drivers/gpu/drm/loongson/lsdc_probe.c
-f:drivers/gpu/drm/loongson/lsdc_probe.h
-f:drivers/gpu/drm/loongson/lsdc_regs.h
-f:drivers/gpu/drm/loongson/lsdc_ttm.c
-f:drivers/gpu/drm/loongson/lsdc_ttm.h
-f:drivers/gpu/drm/mcde/Kconfig
-f:drivers/gpu/drm/mcde/Makefile
-f:drivers/gpu/drm/mcde/mcde_clk_div.c
-f:drivers/gpu/drm/mcde/mcde_display.c
-f:drivers/gpu/drm/mcde/mcde_display_regs.h
-f:drivers/gpu/drm/mcde/mcde_drm.h
-f:drivers/gpu/drm/mcde/mcde_drv.c
-f:drivers/gpu/drm/mcde/mcde_dsi.c
-f:drivers/gpu/drm/mcde/mcde_dsi_regs.h
-f:drivers/gpu/drm/mediatek/Kconfig
-f:drivers/gpu/drm/mediatek/Makefile
-f:drivers/gpu/drm/mediatek/mtk_cec.c
-f:drivers/gpu/drm/mediatek/mtk_cec.h
-f:drivers/gpu/drm/mediatek/mtk_crtc.c
-f:drivers/gpu/drm/mediatek/mtk_crtc.h
-f:drivers/gpu/drm/mediatek/mtk_ddp_comp.c
-f:drivers/gpu/drm/mediatek/mtk_ddp_comp.h
-f:drivers/gpu/drm/mediatek/mtk_disp_aal.c
-f:drivers/gpu/drm/mediatek/mtk_disp_ccorr.c
-f:drivers/gpu/drm/mediatek/mtk_disp_color.c
-f:drivers/gpu/drm/mediatek/mtk_disp_drv.h
-f:drivers/gpu/drm/mediatek/mtk_disp_gamma.c
-f:drivers/gpu/drm/mediatek/mtk_disp_merge.c
-f:drivers/gpu/drm/mediatek/mtk_disp_ovl.c
-f:drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
-f:drivers/gpu/drm/mediatek/mtk_disp_rdma.c
-f:drivers/gpu/drm/mediatek/mtk_dp.c
-f:drivers/gpu/drm/mediatek/mtk_dp_reg.h
-f:drivers/gpu/drm/mediatek/mtk_dpi.c
-f:drivers/gpu/drm/mediatek/mtk_dpi_regs.h
-f:drivers/gpu/drm/mediatek/mtk_drm_drv.c
-f:drivers/gpu/drm/mediatek/mtk_drm_drv.h
-f:drivers/gpu/drm/mediatek/mtk_dsi.c
-f:drivers/gpu/drm/mediatek/mtk_ethdr.c
-f:drivers/gpu/drm/mediatek/mtk_ethdr.h
-f:drivers/gpu/drm/mediatek/mtk_gem.c
-f:drivers/gpu/drm/mediatek/mtk_gem.h
-f:drivers/gpu/drm/mediatek/mtk_hdmi.c
-f:drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c
-f:drivers/gpu/drm/mediatek/mtk_hdmi_regs.h
-f:drivers/gpu/drm/mediatek/mtk_mdp_rdma.c
-f:drivers/gpu/drm/mediatek/mtk_mdp_rdma.h
-f:drivers/gpu/drm/mediatek/mtk_padding.c
-f:drivers/gpu/drm/mediatek/mtk_plane.c
-f:drivers/gpu/drm/mediatek/mtk_plane.h
-f:drivers/gpu/drm/meson/Kconfig
-f:drivers/gpu/drm/meson/Makefile
-f:drivers/gpu/drm/meson/meson_crtc.c
-f:drivers/gpu/drm/meson/meson_crtc.h
-f:drivers/gpu/drm/meson/meson_drv.c
-f:drivers/gpu/drm/meson/meson_drv.h
-f:drivers/gpu/drm/meson/meson_dw_hdmi.c
-f:drivers/gpu/drm/meson/meson_dw_hdmi.h
-f:drivers/gpu/drm/meson/meson_dw_mipi_dsi.c
-f:drivers/gpu/drm/meson/meson_dw_mipi_dsi.h
-f:drivers/gpu/drm/meson/meson_encoder_cvbs.c
-f:drivers/gpu/drm/meson/meson_encoder_cvbs.h
-f:drivers/gpu/drm/meson/meson_encoder_dsi.c
-f:drivers/gpu/drm/meson/meson_encoder_dsi.h
-f:drivers/gpu/drm/meson/meson_encoder_hdmi.c
-f:drivers/gpu/drm/meson/meson_encoder_hdmi.h
-f:drivers/gpu/drm/meson/meson_osd_afbcd.c
-f:drivers/gpu/drm/meson/meson_osd_afbcd.h
-f:drivers/gpu/drm/meson/meson_overlay.c
-f:drivers/gpu/drm/meson/meson_overlay.h
-f:drivers/gpu/drm/meson/meson_plane.c
-f:drivers/gpu/drm/meson/meson_plane.h
-f:drivers/gpu/drm/meson/meson_rdma.c
-f:drivers/gpu/drm/meson/meson_rdma.h
-f:drivers/gpu/drm/meson/meson_registers.h
-f:drivers/gpu/drm/meson/meson_vclk.c
-f:drivers/gpu/drm/meson/meson_vclk.h
-f:drivers/gpu/drm/meson/meson_venc.c
-f:drivers/gpu/drm/meson/meson_venc.h
-f:drivers/gpu/drm/meson/meson_viu.c
-f:drivers/gpu/drm/meson/meson_viu.h
-f:drivers/gpu/drm/meson/meson_vpp.c
-f:drivers/gpu/drm/meson/meson_vpp.h
-f:drivers/gpu/drm/mgag200/Kconfig
-f:drivers/gpu/drm/mgag200/Makefile
-f:drivers/gpu/drm/mgag200/mgag200_bmc.c
-f:drivers/gpu/drm/mgag200/mgag200_ddc.c
-f:drivers/gpu/drm/mgag200/mgag200_ddc.h
-f:drivers/gpu/drm/mgag200/mgag200_drv.c
-f:drivers/gpu/drm/mgag200/mgag200_drv.h
-f:drivers/gpu/drm/mgag200/mgag200_g200.c
-f:drivers/gpu/drm/mgag200/mgag200_g200eh.c
-f:drivers/gpu/drm/mgag200/mgag200_g200eh3.c
-f:drivers/gpu/drm/mgag200/mgag200_g200eh5.c
-f:drivers/gpu/drm/mgag200/mgag200_g200er.c
-f:drivers/gpu/drm/mgag200/mgag200_g200ev.c
-f:drivers/gpu/drm/mgag200/mgag200_g200ew3.c
-f:drivers/gpu/drm/mgag200/mgag200_g200se.c
-f:drivers/gpu/drm/mgag200/mgag200_g200wb.c
-f:drivers/gpu/drm/mgag200/mgag200_mode.c
-f:drivers/gpu/drm/mgag200/mgag200_reg.h
-f:drivers/gpu/drm/mgag200/mgag200_vga.c
-f:drivers/gpu/drm/mgag200/mgag200_vga_bmc.c
-f:drivers/gpu/drm/msm/.gitignore
-f:drivers/gpu/drm/msm/Kconfig
-f:drivers/gpu/drm/msm/Makefile
-f:drivers/gpu/drm/msm/NOTES
-f:drivers/gpu/drm/msm/adreno/a2xx_catalog.c
-f:drivers/gpu/drm/msm/adreno/a2xx_gpu.c
-f:drivers/gpu/drm/msm/adreno/a2xx_gpu.h
-f:drivers/gpu/drm/msm/adreno/a2xx_gpummu.c
-f:drivers/gpu/drm/msm/adreno/a3xx_catalog.c
-f:drivers/gpu/drm/msm/adreno/a3xx_gpu.c
-f:drivers/gpu/drm/msm/adreno/a3xx_gpu.h
-f:drivers/gpu/drm/msm/adreno/a4xx_catalog.c
-f:drivers/gpu/drm/msm/adreno/a4xx_gpu.c
-f:drivers/gpu/drm/msm/adreno/a4xx_gpu.h
-f:drivers/gpu/drm/msm/adreno/a5xx_catalog.c
-f:drivers/gpu/drm/msm/adreno/a5xx_debugfs.c
-f:drivers/gpu/drm/msm/adreno/a5xx_gpu.c
-f:drivers/gpu/drm/msm/adreno/a5xx_gpu.h
-f:drivers/gpu/drm/msm/adreno/a5xx_power.c
-f:drivers/gpu/drm/msm/adreno/a5xx_preempt.c
-f:drivers/gpu/drm/msm/adreno/a6xx_catalog.c
-f:drivers/gpu/drm/msm/adreno/a6xx_gmu.c
-f:drivers/gpu/drm/msm/adreno/a6xx_gmu.h
-f:drivers/gpu/drm/msm/adreno/a6xx_gpu.c
-f:drivers/gpu/drm/msm/adreno/a6xx_gpu.h
-f:drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c
-f:drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h
-f:drivers/gpu/drm/msm/adreno/a6xx_hfi.c
-f:drivers/gpu/drm/msm/adreno/a6xx_hfi.h
-f:drivers/gpu/drm/msm/adreno/a6xx_preempt.c
-f:drivers/gpu/drm/msm/adreno/adreno_device.c
-f:drivers/gpu/drm/msm/adreno/adreno_gen7_0_0_snapshot.h
-f:drivers/gpu/drm/msm/adreno/adreno_gen7_2_0_snapshot.h
-f:drivers/gpu/drm/msm/adreno/adreno_gen7_9_0_snapshot.h
-f:drivers/gpu/drm/msm/adreno/adreno_gpu.c
-f:drivers/gpu/drm/msm/adreno/adreno_gpu.h
-f:drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h
-f:drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_12_0_sm8750.h
-f:drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_14_msm8937.h
-f:drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_15_msm8917.h
-f:drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_16_msm8953.h
-f:drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_7_msm8996.h
-f:drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h
-f:drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h
-f:drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h
-f:drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h
-f:drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_1_sdm670.h
-f:drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h
-f:drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h
-f:drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h
-f:drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h
-f:drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h
-f:drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h
-f:drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h
-f:drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h
-f:drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h
-f:drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h
-f:drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h
-f:drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h
-f:drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h
-f:drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h
-f:drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h
-f:drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h
-f:drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h
-f:drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h
-f:drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.h
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.h
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_formats.h
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.c
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.h
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cwb.c
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cwb.h
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.c
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.h
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc_1_2.c
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.h
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.h
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.h
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.h
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.h
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.c
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.c
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.h
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.h
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_hwio.h
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.h
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c
-f:drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.h
-f:drivers/gpu/drm/msm/disp/dpu1/msm_media_info.h
-f:drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c
-f:drivers/gpu/drm/msm/disp/mdp4/mdp4_dsi_encoder.c
-f:drivers/gpu/drm/msm/disp/mdp4/mdp4_dtv_encoder.c
-f:drivers/gpu/drm/msm/disp/mdp4/mdp4_irq.c
-f:drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c
-f:drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.h
-f:drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c
-f:drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_pll.c
-f:drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c
-f:drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c
-f:drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.h
-f:drivers/gpu/drm/msm/disp/mdp5/mdp5_cmd_encoder.c
-f:drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c
-f:drivers/gpu/drm/msm/disp/mdp5/mdp5_ctl.c
-f:drivers/gpu/drm/msm/disp/mdp5/mdp5_ctl.h
-f:drivers/gpu/drm/msm/disp/mdp5/mdp5_encoder.c
-f:drivers/gpu/drm/msm/disp/mdp5/mdp5_irq.c
-f:drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c
-f:drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.h
-f:drivers/gpu/drm/msm/disp/mdp5/mdp5_mixer.c
-f:drivers/gpu/drm/msm/disp/mdp5/mdp5_mixer.h
-f:drivers/gpu/drm/msm/disp/mdp5/mdp5_pipe.c
-f:drivers/gpu/drm/msm/disp/mdp5/mdp5_pipe.h
-f:drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
-f:drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c
-f:drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.h
-f:drivers/gpu/drm/msm/disp/mdp_format.c
-f:drivers/gpu/drm/msm/disp/mdp_format.h
-f:drivers/gpu/drm/msm/disp/mdp_kms.c
-f:drivers/gpu/drm/msm/disp/mdp_kms.h
-f:drivers/gpu/drm/msm/disp/msm_disp_snapshot.c
-f:drivers/gpu/drm/msm/disp/msm_disp_snapshot.h
-f:drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c
-f:drivers/gpu/drm/msm/dp/dp_audio.c
-f:drivers/gpu/drm/msm/dp/dp_audio.h
-f:drivers/gpu/drm/msm/dp/dp_aux.c
-f:drivers/gpu/drm/msm/dp/dp_aux.h
-f:drivers/gpu/drm/msm/dp/dp_ctrl.c
-f:drivers/gpu/drm/msm/dp/dp_ctrl.h
-f:drivers/gpu/drm/msm/dp/dp_debug.c
-f:drivers/gpu/drm/msm/dp/dp_debug.h
-f:drivers/gpu/drm/msm/dp/dp_display.c
-f:drivers/gpu/drm/msm/dp/dp_display.h
-f:drivers/gpu/drm/msm/dp/dp_drm.c
-f:drivers/gpu/drm/msm/dp/dp_drm.h
-f:drivers/gpu/drm/msm/dp/dp_link.c
-f:drivers/gpu/drm/msm/dp/dp_link.h
-f:drivers/gpu/drm/msm/dp/dp_panel.c
-f:drivers/gpu/drm/msm/dp/dp_panel.h
-f:drivers/gpu/drm/msm/dp/dp_reg.h
-f:drivers/gpu/drm/msm/dp/dp_utils.c
-f:drivers/gpu/drm/msm/dp/dp_utils.h
-f:drivers/gpu/drm/msm/dsi/dsi.c
-f:drivers/gpu/drm/msm/dsi/dsi.h
-f:drivers/gpu/drm/msm/dsi/dsi_cfg.c
-f:drivers/gpu/drm/msm/dsi/dsi_cfg.h
-f:drivers/gpu/drm/msm/dsi/dsi_host.c
-f:drivers/gpu/drm/msm/dsi/dsi_manager.c
-f:drivers/gpu/drm/msm/dsi/phy/dsi_phy.c
-f:drivers/gpu/drm/msm/dsi/phy/dsi_phy.h
-f:drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c
-f:drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c
-f:drivers/gpu/drm/msm/dsi/phy/dsi_phy_20nm.c
-f:drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c
-f:drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c
-f:drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c
-f:drivers/gpu/drm/msm/hdmi/hdmi.c
-f:drivers/gpu/drm/msm/hdmi/hdmi.h
-f:drivers/gpu/drm/msm/hdmi/hdmi_audio.c
-f:drivers/gpu/drm/msm/hdmi/hdmi_bridge.c
-f:drivers/gpu/drm/msm/hdmi/hdmi_hdcp.c
-f:drivers/gpu/drm/msm/hdmi/hdmi_hpd.c
-f:drivers/gpu/drm/msm/hdmi/hdmi_i2c.c
-f:drivers/gpu/drm/msm/hdmi/hdmi_phy.c
-f:drivers/gpu/drm/msm/hdmi/hdmi_phy_8960.c
-f:drivers/gpu/drm/msm/hdmi/hdmi_phy_8996.c
-f:drivers/gpu/drm/msm/hdmi/hdmi_phy_8998.c
-f:drivers/gpu/drm/msm/hdmi/hdmi_phy_8x60.c
-f:drivers/gpu/drm/msm/hdmi/hdmi_phy_8x74.c
-f:drivers/gpu/drm/msm/hdmi/hdmi_pll_8960.c
-f:drivers/gpu/drm/msm/msm_atomic.c
-f:drivers/gpu/drm/msm/msm_atomic_trace.h
-f:drivers/gpu/drm/msm/msm_atomic_tracepoints.c
-f:drivers/gpu/drm/msm/msm_debugfs.c
-f:drivers/gpu/drm/msm/msm_debugfs.h
-f:drivers/gpu/drm/msm/msm_drv.c
-f:drivers/gpu/drm/msm/msm_drv.h
-f:drivers/gpu/drm/msm/msm_dsc_helper.h
-f:drivers/gpu/drm/msm/msm_fb.c
-f:drivers/gpu/drm/msm/msm_fbdev.c
-f:drivers/gpu/drm/msm/msm_fence.c
-f:drivers/gpu/drm/msm/msm_fence.h
-f:drivers/gpu/drm/msm/msm_gem.c
-f:drivers/gpu/drm/msm/msm_gem.h
-f:drivers/gpu/drm/msm/msm_gem_prime.c
-f:drivers/gpu/drm/msm/msm_gem_shrinker.c
-f:drivers/gpu/drm/msm/msm_gem_submit.c
-f:drivers/gpu/drm/msm/msm_gem_vma.c
-f:drivers/gpu/drm/msm/msm_gpu.c
-f:drivers/gpu/drm/msm/msm_gpu.h
-f:drivers/gpu/drm/msm/msm_gpu_devfreq.c
-f:drivers/gpu/drm/msm/msm_gpu_trace.h
-f:drivers/gpu/drm/msm/msm_gpu_tracepoints.c
-f:drivers/gpu/drm/msm/msm_io_utils.c
-f:drivers/gpu/drm/msm/msm_iommu.c
-f:drivers/gpu/drm/msm/msm_kms.c
-f:drivers/gpu/drm/msm/msm_kms.h
-f:drivers/gpu/drm/msm/msm_mdss.c
-f:drivers/gpu/drm/msm/msm_mmu.h
-f:drivers/gpu/drm/msm/msm_perf.c
-f:drivers/gpu/drm/msm/msm_rd.c
-f:drivers/gpu/drm/msm/msm_ringbuffer.c
-f:drivers/gpu/drm/msm/msm_ringbuffer.h
-f:drivers/gpu/drm/msm/msm_submitqueue.c
-f:drivers/gpu/drm/msm/msm_syncobj.c
-f:drivers/gpu/drm/msm/msm_syncobj.h
-f:drivers/gpu/drm/msm/registers/.gitignore
-f:drivers/gpu/drm/msm/registers/adreno/a2xx.xml
-f:drivers/gpu/drm/msm/registers/adreno/a3xx.xml
-f:drivers/gpu/drm/msm/registers/adreno/a4xx.xml
-f:drivers/gpu/drm/msm/registers/adreno/a5xx.xml
-f:drivers/gpu/drm/msm/registers/adreno/a6xx.xml
-f:drivers/gpu/drm/msm/registers/adreno/a6xx_descriptors.xml
-f:drivers/gpu/drm/msm/registers/adreno/a6xx_enums.xml
-f:drivers/gpu/drm/msm/registers/adreno/a6xx_gmu.xml
-f:drivers/gpu/drm/msm/registers/adreno/a6xx_perfcntrs.xml
-f:drivers/gpu/drm/msm/registers/adreno/a7xx_enums.xml
-f:drivers/gpu/drm/msm/registers/adreno/a7xx_perfcntrs.xml
-f:drivers/gpu/drm/msm/registers/adreno/adreno_common.xml
-f:drivers/gpu/drm/msm/registers/adreno/adreno_pm4.xml
-f:drivers/gpu/drm/msm/registers/display/dsi.xml
-f:drivers/gpu/drm/msm/registers/display/dsi_phy_10nm.xml
-f:drivers/gpu/drm/msm/registers/display/dsi_phy_14nm.xml
-f:drivers/gpu/drm/msm/registers/display/dsi_phy_20nm.xml
-f:drivers/gpu/drm/msm/registers/display/dsi_phy_28nm.xml
-f:drivers/gpu/drm/msm/registers/display/dsi_phy_28nm_8960.xml
-f:drivers/gpu/drm/msm/registers/display/dsi_phy_7nm.xml
-f:drivers/gpu/drm/msm/registers/display/edp.xml
-f:drivers/gpu/drm/msm/registers/display/hdmi.xml
-f:drivers/gpu/drm/msm/registers/display/mdp4.xml
-f:drivers/gpu/drm/msm/registers/display/mdp5.xml
-f:drivers/gpu/drm/msm/registers/display/mdp_common.xml
-f:drivers/gpu/drm/msm/registers/display/mdss.xml
-f:drivers/gpu/drm/msm/registers/display/msm.xml
-f:drivers/gpu/drm/msm/registers/display/sfpb.xml
-f:drivers/gpu/drm/msm/registers/freedreno_copyright.xml
-f:drivers/gpu/drm/msm/registers/gen_header.py
-f:drivers/gpu/drm/msm/registers/rules-fd.xsd
-f:drivers/gpu/drm/mxsfb/Kconfig
-f:drivers/gpu/drm/mxsfb/Makefile
-f:drivers/gpu/drm/mxsfb/lcdif_drv.c
-f:drivers/gpu/drm/mxsfb/lcdif_drv.h
-f:drivers/gpu/drm/mxsfb/lcdif_kms.c
-f:drivers/gpu/drm/mxsfb/lcdif_regs.h
-f:drivers/gpu/drm/mxsfb/mxsfb_drv.c
-f:drivers/gpu/drm/mxsfb/mxsfb_drv.h
-f:drivers/gpu/drm/mxsfb/mxsfb_kms.c
-f:drivers/gpu/drm/mxsfb/mxsfb_regs.h
-f:drivers/gpu/drm/nouveau/Kbuild
-f:drivers/gpu/drm/nouveau/Kconfig
-f:drivers/gpu/drm/nouveau/dispnv04/Kbuild
-f:drivers/gpu/drm/nouveau/dispnv04/arb.c
-f:drivers/gpu/drm/nouveau/dispnv04/crtc.c
-f:drivers/gpu/drm/nouveau/dispnv04/cursor.c
-f:drivers/gpu/drm/nouveau/dispnv04/dac.c
-f:drivers/gpu/drm/nouveau/dispnv04/dfp.c
-f:drivers/gpu/drm/nouveau/dispnv04/disp.c
-f:drivers/gpu/drm/nouveau/dispnv04/disp.h
-f:drivers/gpu/drm/nouveau/dispnv04/hw.c
-f:drivers/gpu/drm/nouveau/dispnv04/hw.h
-f:drivers/gpu/drm/nouveau/dispnv04/i2c/Kbuild
-f:drivers/gpu/drm/nouveau/dispnv04/i2c/ch7006_drv.c
-f:drivers/gpu/drm/nouveau/dispnv04/i2c/ch7006_mode.c
-f:drivers/gpu/drm/nouveau/dispnv04/i2c/ch7006_priv.h
-f:drivers/gpu/drm/nouveau/dispnv04/i2c/sil164_drv.c
-f:drivers/gpu/drm/nouveau/dispnv04/nouveau_i2c_encoder.c
-f:drivers/gpu/drm/nouveau/dispnv04/nvreg.h
-f:drivers/gpu/drm/nouveau/dispnv04/overlay.c
-f:drivers/gpu/drm/nouveau/dispnv04/tvmodesnv17.c
-f:drivers/gpu/drm/nouveau/dispnv04/tvnv04.c
-f:drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
-f:drivers/gpu/drm/nouveau/dispnv04/tvnv17.h
-f:drivers/gpu/drm/nouveau/dispnv50/Kbuild
-f:drivers/gpu/drm/nouveau/dispnv50/atom.h
-f:drivers/gpu/drm/nouveau/dispnv50/base.c
-f:drivers/gpu/drm/nouveau/dispnv50/base.h
-f:drivers/gpu/drm/nouveau/dispnv50/base507c.c
-f:drivers/gpu/drm/nouveau/dispnv50/base827c.c
-f:drivers/gpu/drm/nouveau/dispnv50/base907c.c
-f:drivers/gpu/drm/nouveau/dispnv50/base917c.c
-f:drivers/gpu/drm/nouveau/dispnv50/core.c
-f:drivers/gpu/drm/nouveau/dispnv50/core.h
-f:drivers/gpu/drm/nouveau/dispnv50/core507d.c
-f:drivers/gpu/drm/nouveau/dispnv50/core827d.c
-f:drivers/gpu/drm/nouveau/dispnv50/core907d.c
-f:drivers/gpu/drm/nouveau/dispnv50/core917d.c
-f:drivers/gpu/drm/nouveau/dispnv50/corec37d.c
-f:drivers/gpu/drm/nouveau/dispnv50/corec57d.c
-f:drivers/gpu/drm/nouveau/dispnv50/coreca7d.c
-f:drivers/gpu/drm/nouveau/dispnv50/crc.c
-f:drivers/gpu/drm/nouveau/dispnv50/crc.h
-f:drivers/gpu/drm/nouveau/dispnv50/crc907d.c
-f:drivers/gpu/drm/nouveau/dispnv50/crcc37d.c
-f:drivers/gpu/drm/nouveau/dispnv50/crcc37d.h
-f:drivers/gpu/drm/nouveau/dispnv50/crcc57d.c
-f:drivers/gpu/drm/nouveau/dispnv50/crcca7d.c
-f:drivers/gpu/drm/nouveau/dispnv50/curs.c
-f:drivers/gpu/drm/nouveau/dispnv50/curs.h
-f:drivers/gpu/drm/nouveau/dispnv50/curs507a.c
-f:drivers/gpu/drm/nouveau/dispnv50/curs907a.c
-f:drivers/gpu/drm/nouveau/dispnv50/cursc37a.c
-f:drivers/gpu/drm/nouveau/dispnv50/dac507d.c
-f:drivers/gpu/drm/nouveau/dispnv50/dac907d.c
-f:drivers/gpu/drm/nouveau/dispnv50/disp.c
-f:drivers/gpu/drm/nouveau/dispnv50/disp.h
-f:drivers/gpu/drm/nouveau/dispnv50/handles.h
-f:drivers/gpu/drm/nouveau/dispnv50/head.c
-f:drivers/gpu/drm/nouveau/dispnv50/head.h
-f:drivers/gpu/drm/nouveau/dispnv50/head507d.c
-f:drivers/gpu/drm/nouveau/dispnv50/head827d.c
-f:drivers/gpu/drm/nouveau/dispnv50/head907d.c
-f:drivers/gpu/drm/nouveau/dispnv50/head917d.c
-f:drivers/gpu/drm/nouveau/dispnv50/headc37d.c
-f:drivers/gpu/drm/nouveau/dispnv50/headc57d.c
-f:drivers/gpu/drm/nouveau/dispnv50/headca7d.c
-f:drivers/gpu/drm/nouveau/dispnv50/lut.c
-f:drivers/gpu/drm/nouveau/dispnv50/lut.h
-f:drivers/gpu/drm/nouveau/dispnv50/oimm.c
-f:drivers/gpu/drm/nouveau/dispnv50/oimm.h
-f:drivers/gpu/drm/nouveau/dispnv50/oimm507b.c
-f:drivers/gpu/drm/nouveau/dispnv50/ovly.c
-f:drivers/gpu/drm/nouveau/dispnv50/ovly.h
-f:drivers/gpu/drm/nouveau/dispnv50/ovly507e.c
-f:drivers/gpu/drm/nouveau/dispnv50/ovly827e.c
-f:drivers/gpu/drm/nouveau/dispnv50/ovly907e.c
-f:drivers/gpu/drm/nouveau/dispnv50/ovly917e.c
-f:drivers/gpu/drm/nouveau/dispnv50/pior507d.c
-f:drivers/gpu/drm/nouveau/dispnv50/sor507d.c
-f:drivers/gpu/drm/nouveau/dispnv50/sor907d.c
-f:drivers/gpu/drm/nouveau/dispnv50/sorc37d.c
-f:drivers/gpu/drm/nouveau/dispnv50/tile.h
-f:drivers/gpu/drm/nouveau/dispnv50/wimm.c
-f:drivers/gpu/drm/nouveau/dispnv50/wimm.h
-f:drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c
-f:drivers/gpu/drm/nouveau/dispnv50/wndw.c
-f:drivers/gpu/drm/nouveau/dispnv50/wndw.h
-f:drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c
-f:drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c
-f:drivers/gpu/drm/nouveau/dispnv50/wndwc67e.c
-f:drivers/gpu/drm/nouveau/dispnv50/wndwca7e.c
-f:drivers/gpu/drm/nouveau/gv100_fence.c
-f:drivers/gpu/drm/nouveau/include/dispnv04/i2c/ch7006.h
-f:drivers/gpu/drm/nouveau/include/dispnv04/i2c/encoder_i2c.h
-f:drivers/gpu/drm/nouveau/include/dispnv04/i2c/sil164.h
-f:drivers/gpu/drm/nouveau/include/nvfw/acr.h
-f:drivers/gpu/drm/nouveau/include/nvfw/flcn.h
-f:drivers/gpu/drm/nouveau/include/nvfw/fw.h
-f:drivers/gpu/drm/nouveau/include/nvfw/hs.h
-f:drivers/gpu/drm/nouveau/include/nvfw/ls.h
-f:drivers/gpu/drm/nouveau/include/nvfw/pmu.h
-f:drivers/gpu/drm/nouveau/include/nvfw/sec2.h
-f:drivers/gpu/drm/nouveau/include/nvhw/class/cl0039.h
-f:drivers/gpu/drm/nouveau/include/nvhw/class/cl006c.h
-f:drivers/gpu/drm/nouveau/include/nvhw/class/cl006e.h
-f:drivers/gpu/drm/nouveau/include/nvhw/class/cl176e.h
-f:drivers/gpu/drm/nouveau/include/nvhw/class/cl206e.h
-f:drivers/gpu/drm/nouveau/include/nvhw/class/cl502d.h
-f:drivers/gpu/drm/nouveau/include/nvhw/class/cl5039.h
-f:drivers/gpu/drm/nouveau/include/nvhw/class/cl507a.h
-f:drivers/gpu/drm/nouveau/include/nvhw/class/cl507c.h
-f:drivers/gpu/drm/nouveau/include/nvhw/class/cl507d.h
-f:drivers/gpu/drm/nouveau/include/nvhw/class/cl507e.h
-f:drivers/gpu/drm/nouveau/include/nvhw/class/cl826f.h
-f:drivers/gpu/drm/nouveau/include/nvhw/class/cl827c.h
-f:drivers/gpu/drm/nouveau/include/nvhw/class/cl827d.h
-f:drivers/gpu/drm/nouveau/include/nvhw/class/cl827e.h
-f:drivers/gpu/drm/nouveau/include/nvhw/class/cl837d.h
-f:drivers/gpu/drm/nouveau/include/nvhw/class/cl887d.h
-f:drivers/gpu/drm/nouveau/include/nvhw/class/cl902d.h
-f:drivers/gpu/drm/nouveau/include/nvhw/class/cl9039.h
-f:drivers/gpu/drm/nouveau/include/nvhw/class/cl906f.h
-f:drivers/gpu/drm/nouveau/include/nvhw/class/cl907c.h
-f:drivers/gpu/drm/nouveau/include/nvhw/class/cl907d.h
-f:drivers/gpu/drm/nouveau/include/nvhw/class/cl907e.h
-f:drivers/gpu/drm/nouveau/include/nvhw/class/cl917d.h
-f:drivers/gpu/drm/nouveau/include/nvhw/class/cla0b5.h
-f:drivers/gpu/drm/nouveau/include/nvhw/class/clc36f.h
-f:drivers/gpu/drm/nouveau/include/nvhw/class/clc37a.h
-f:drivers/gpu/drm/nouveau/include/nvhw/class/clc37b.h
-f:drivers/gpu/drm/nouveau/include/nvhw/class/clc37d.h
-f:drivers/gpu/drm/nouveau/include/nvhw/class/clc37e.h
-f:drivers/gpu/drm/nouveau/include/nvhw/class/clc57d.h
-f:drivers/gpu/drm/nouveau/include/nvhw/class/clc57e.h
-f:drivers/gpu/drm/nouveau/include/nvhw/class/clc97b.h
-f:drivers/gpu/drm/nouveau/include/nvhw/class/clca7d.h
-f:drivers/gpu/drm/nouveau/include/nvhw/class/clca7e.h
-f:drivers/gpu/drm/nouveau/include/nvhw/drf.h
-f:drivers/gpu/drm/nouveau/include/nvhw/ref/gb100/dev_hshub_base.h
-f:drivers/gpu/drm/nouveau/include/nvhw/ref/gb10b/dev_fbhub.h
-f:drivers/gpu/drm/nouveau/include/nvhw/ref/gb202/dev_ce.h
-f:drivers/gpu/drm/nouveau/include/nvhw/ref/gb202/dev_therm.h
-f:drivers/gpu/drm/nouveau/include/nvhw/ref/gh100/dev_falcon_v4.h
-f:drivers/gpu/drm/nouveau/include/nvhw/ref/gh100/dev_fb.h
-f:drivers/gpu/drm/nouveau/include/nvhw/ref/gh100/dev_fsp_pri.h
-f:drivers/gpu/drm/nouveau/include/nvhw/ref/gh100/dev_mmu.h
-f:drivers/gpu/drm/nouveau/include/nvhw/ref/gh100/dev_riscv_pri.h
-f:drivers/gpu/drm/nouveau/include/nvhw/ref/gh100/dev_therm.h
-f:drivers/gpu/drm/nouveau/include/nvhw/ref/gh100/dev_xtl_ep_pri.h
-f:drivers/gpu/drm/nouveau/include/nvhw/ref/gh100/pri_nv_xal_ep.h
-f:drivers/gpu/drm/nouveau/include/nvif/chan.h
-f:drivers/gpu/drm/nouveau/include/nvif/cl0002.h
-f:drivers/gpu/drm/nouveau/include/nvif/cl0046.h
-f:drivers/gpu/drm/nouveau/include/nvif/cl0080.h
-f:drivers/gpu/drm/nouveau/include/nvif/cl9097.h
-f:drivers/gpu/drm/nouveau/include/nvif/class.h
-f:drivers/gpu/drm/nouveau/include/nvif/clb069.h
-f:drivers/gpu/drm/nouveau/include/nvif/client.h
-f:drivers/gpu/drm/nouveau/include/nvif/conn.h
-f:drivers/gpu/drm/nouveau/include/nvif/device.h
-f:drivers/gpu/drm/nouveau/include/nvif/disp.h
-f:drivers/gpu/drm/nouveau/include/nvif/driver.h
-f:drivers/gpu/drm/nouveau/include/nvif/event.h
-f:drivers/gpu/drm/nouveau/include/nvif/fifo.h
-f:drivers/gpu/drm/nouveau/include/nvif/head.h
-f:drivers/gpu/drm/nouveau/include/nvif/if0000.h
-f:drivers/gpu/drm/nouveau/include/nvif/if0001.h
-f:drivers/gpu/drm/nouveau/include/nvif/if0004.h
-f:drivers/gpu/drm/nouveau/include/nvif/if0005.h
-f:drivers/gpu/drm/nouveau/include/nvif/if0008.h
-f:drivers/gpu/drm/nouveau/include/nvif/if000a.h
-f:drivers/gpu/drm/nouveau/include/nvif/if000b.h
-f:drivers/gpu/drm/nouveau/include/nvif/if000c.h
-f:drivers/gpu/drm/nouveau/include/nvif/if000d.h
-f:drivers/gpu/drm/nouveau/include/nvif/if000e.h
-f:drivers/gpu/drm/nouveau/include/nvif/if0010.h
-f:drivers/gpu/drm/nouveau/include/nvif/if0011.h
-f:drivers/gpu/drm/nouveau/include/nvif/if0012.h
-f:drivers/gpu/drm/nouveau/include/nvif/if0013.h
-f:drivers/gpu/drm/nouveau/include/nvif/if0014.h
-f:drivers/gpu/drm/nouveau/include/nvif/if0020.h
-f:drivers/gpu/drm/nouveau/include/nvif/if0021.h
-f:drivers/gpu/drm/nouveau/include/nvif/if500b.h
-f:drivers/gpu/drm/nouveau/include/nvif/if500d.h
-f:drivers/gpu/drm/nouveau/include/nvif/if900b.h
-f:drivers/gpu/drm/nouveau/include/nvif/if900d.h
-f:drivers/gpu/drm/nouveau/include/nvif/ifb00d.h
-f:drivers/gpu/drm/nouveau/include/nvif/ifc00d.h
-f:drivers/gpu/drm/nouveau/include/nvif/ioctl.h
-f:drivers/gpu/drm/nouveau/include/nvif/log.h
-f:drivers/gpu/drm/nouveau/include/nvif/mem.h
-f:drivers/gpu/drm/nouveau/include/nvif/mmu.h
-f:drivers/gpu/drm/nouveau/include/nvif/object.h
-f:drivers/gpu/drm/nouveau/include/nvif/os.h
-f:drivers/gpu/drm/nouveau/include/nvif/outp.h
-f:drivers/gpu/drm/nouveau/include/nvif/parent.h
-f:drivers/gpu/drm/nouveau/include/nvif/printf.h
-f:drivers/gpu/drm/nouveau/include/nvif/push.h
-f:drivers/gpu/drm/nouveau/include/nvif/push006c.h
-f:drivers/gpu/drm/nouveau/include/nvif/push206e.h
-f:drivers/gpu/drm/nouveau/include/nvif/push507c.h
-f:drivers/gpu/drm/nouveau/include/nvif/push906f.h
-f:drivers/gpu/drm/nouveau/include/nvif/pushc37b.h
-f:drivers/gpu/drm/nouveau/include/nvif/pushc97b.h
-f:drivers/gpu/drm/nouveau/include/nvif/timer.h
-f:drivers/gpu/drm/nouveau/include/nvif/unpack.h
-f:drivers/gpu/drm/nouveau/include/nvif/user.h
-f:drivers/gpu/drm/nouveau/include/nvif/vmm.h
-f:drivers/gpu/drm/nouveau/include/nvkm/core/client.h
-f:drivers/gpu/drm/nouveau/include/nvkm/core/debug.h
-f:drivers/gpu/drm/nouveau/include/nvkm/core/device.h
-f:drivers/gpu/drm/nouveau/include/nvkm/core/engine.h
-f:drivers/gpu/drm/nouveau/include/nvkm/core/enum.h
-f:drivers/gpu/drm/nouveau/include/nvkm/core/event.h
-f:drivers/gpu/drm/nouveau/include/nvkm/core/falcon.h
-f:drivers/gpu/drm/nouveau/include/nvkm/core/firmware.h
-f:drivers/gpu/drm/nouveau/include/nvkm/core/gpuobj.h
-f:drivers/gpu/drm/nouveau/include/nvkm/core/intr.h
-f:drivers/gpu/drm/nouveau/include/nvkm/core/ioctl.h
-f:drivers/gpu/drm/nouveau/include/nvkm/core/layout.h
-f:drivers/gpu/drm/nouveau/include/nvkm/core/memory.h
-f:drivers/gpu/drm/nouveau/include/nvkm/core/mm.h
-f:drivers/gpu/drm/nouveau/include/nvkm/core/object.h
-f:drivers/gpu/drm/nouveau/include/nvkm/core/oclass.h
-f:drivers/gpu/drm/nouveau/include/nvkm/core/oproxy.h
-f:drivers/gpu/drm/nouveau/include/nvkm/core/option.h
-f:drivers/gpu/drm/nouveau/include/nvkm/core/os.h
-f:drivers/gpu/drm/nouveau/include/nvkm/core/pci.h
-f:drivers/gpu/drm/nouveau/include/nvkm/core/ramht.h
-f:drivers/gpu/drm/nouveau/include/nvkm/core/subdev.h
-f:drivers/gpu/drm/nouveau/include/nvkm/core/tegra.h
-f:drivers/gpu/drm/nouveau/include/nvkm/engine/bsp.h
-f:drivers/gpu/drm/nouveau/include/nvkm/engine/ce.h
-f:drivers/gpu/drm/nouveau/include/nvkm/engine/cipher.h
-f:drivers/gpu/drm/nouveau/include/nvkm/engine/disp.h
-f:drivers/gpu/drm/nouveau/include/nvkm/engine/dma.h
-f:drivers/gpu/drm/nouveau/include/nvkm/engine/falcon.h
-f:drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h
-f:drivers/gpu/drm/nouveau/include/nvkm/engine/gr.h
-f:drivers/gpu/drm/nouveau/include/nvkm/engine/mpeg.h
-f:drivers/gpu/drm/nouveau/include/nvkm/engine/msenc.h
-f:drivers/gpu/drm/nouveau/include/nvkm/engine/mspdec.h
-f:drivers/gpu/drm/nouveau/include/nvkm/engine/msppp.h
-f:drivers/gpu/drm/nouveau/include/nvkm/engine/msvld.h
-f:drivers/gpu/drm/nouveau/include/nvkm/engine/nvdec.h
-f:drivers/gpu/drm/nouveau/include/nvkm/engine/nvenc.h
-f:drivers/gpu/drm/nouveau/include/nvkm/engine/sec.h
-f:drivers/gpu/drm/nouveau/include/nvkm/engine/sec2.h
-f:drivers/gpu/drm/nouveau/include/nvkm/engine/sw.h
-f:drivers/gpu/drm/nouveau/include/nvkm/engine/vic.h
-f:drivers/gpu/drm/nouveau/include/nvkm/engine/vp.h
-f:drivers/gpu/drm/nouveau/include/nvkm/engine/xtensa.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/acr.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/bar.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/bios.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/M0203.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/M0205.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/M0209.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/P0260.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/bit.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/bmp.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/boost.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/conn.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/cstep.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/dcb.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/disp.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/dp.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/extdev.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/fan.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/gpio.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/i2c.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/iccsense.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/image.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/init.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/mxm.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/npde.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/pcir.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/perf.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/pll.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/pmu.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/power_budget.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/ramcfg.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/rammap.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/therm.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/timing.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/vmap.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/volt.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/vpstate.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/xpio.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/bus.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/clk.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/devinit.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/fault.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/fsp.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/fuse.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/gpio.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/i2c.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/iccsense.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/instmem.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/ltc.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/mc.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/mxm.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/pci.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/pmu.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/privring.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/therm.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/top.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/vfn.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/vga.h
-f:drivers/gpu/drm/nouveau/include/nvkm/subdev/volt.h
-f:drivers/gpu/drm/nouveau/include/nvrm/nvtypes.h
-f:drivers/gpu/drm/nouveau/nouveau_abi16.c
-f:drivers/gpu/drm/nouveau/nouveau_abi16.h
-f:drivers/gpu/drm/nouveau/nouveau_acpi.c
-f:drivers/gpu/drm/nouveau/nouveau_acpi.h
-f:drivers/gpu/drm/nouveau/nouveau_backlight.c
-f:drivers/gpu/drm/nouveau/nouveau_bios.c
-f:drivers/gpu/drm/nouveau/nouveau_bios.h
-f:drivers/gpu/drm/nouveau/nouveau_bo.c
-f:drivers/gpu/drm/nouveau/nouveau_bo.h
-f:drivers/gpu/drm/nouveau/nouveau_bo0039.c
-f:drivers/gpu/drm/nouveau/nouveau_bo5039.c
-f:drivers/gpu/drm/nouveau/nouveau_bo74c1.c
-f:drivers/gpu/drm/nouveau/nouveau_bo85b5.c
-f:drivers/gpu/drm/nouveau/nouveau_bo9039.c
-f:drivers/gpu/drm/nouveau/nouveau_bo90b5.c
-f:drivers/gpu/drm/nouveau/nouveau_boa0b5.c
-f:drivers/gpu/drm/nouveau/nouveau_chan.c
-f:drivers/gpu/drm/nouveau/nouveau_chan.h
-f:drivers/gpu/drm/nouveau/nouveau_connector.c
-f:drivers/gpu/drm/nouveau/nouveau_connector.h
-f:drivers/gpu/drm/nouveau/nouveau_crtc.h
-f:drivers/gpu/drm/nouveau/nouveau_debugfs.c
-f:drivers/gpu/drm/nouveau/nouveau_debugfs.h
-f:drivers/gpu/drm/nouveau/nouveau_display.c
-f:drivers/gpu/drm/nouveau/nouveau_display.h
-f:drivers/gpu/drm/nouveau/nouveau_dma.c
-f:drivers/gpu/drm/nouveau/nouveau_dma.h
-f:drivers/gpu/drm/nouveau/nouveau_dmem.c
-f:drivers/gpu/drm/nouveau/nouveau_dmem.h
-f:drivers/gpu/drm/nouveau/nouveau_dp.c
-f:drivers/gpu/drm/nouveau/nouveau_drm.c
-f:drivers/gpu/drm/nouveau/nouveau_drv.h
-f:drivers/gpu/drm/nouveau/nouveau_encoder.h
-f:drivers/gpu/drm/nouveau/nouveau_exec.c
-f:drivers/gpu/drm/nouveau/nouveau_exec.h
-f:drivers/gpu/drm/nouveau/nouveau_fence.c
-f:drivers/gpu/drm/nouveau/nouveau_fence.h
-f:drivers/gpu/drm/nouveau/nouveau_gem.c
-f:drivers/gpu/drm/nouveau/nouveau_gem.h
-f:drivers/gpu/drm/nouveau/nouveau_hwmon.c
-f:drivers/gpu/drm/nouveau/nouveau_hwmon.h
-f:drivers/gpu/drm/nouveau/nouveau_ioc32.c
-f:drivers/gpu/drm/nouveau/nouveau_ioctl.h
-f:drivers/gpu/drm/nouveau/nouveau_led.c
-f:drivers/gpu/drm/nouveau/nouveau_led.h
-f:drivers/gpu/drm/nouveau/nouveau_mem.c
-f:drivers/gpu/drm/nouveau/nouveau_mem.h
-f:drivers/gpu/drm/nouveau/nouveau_nvif.c
-f:drivers/gpu/drm/nouveau/nouveau_platform.c
-f:drivers/gpu/drm/nouveau/nouveau_platform.h
-f:drivers/gpu/drm/nouveau/nouveau_prime.c
-f:drivers/gpu/drm/nouveau/nouveau_reg.h
-f:drivers/gpu/drm/nouveau/nouveau_sched.c
-f:drivers/gpu/drm/nouveau/nouveau_sched.h
-f:drivers/gpu/drm/nouveau/nouveau_sgdma.c
-f:drivers/gpu/drm/nouveau/nouveau_svm.c
-f:drivers/gpu/drm/nouveau/nouveau_svm.h
-f:drivers/gpu/drm/nouveau/nouveau_ttm.c
-f:drivers/gpu/drm/nouveau/nouveau_ttm.h
-f:drivers/gpu/drm/nouveau/nouveau_uvmm.c
-f:drivers/gpu/drm/nouveau/nouveau_uvmm.h
-f:drivers/gpu/drm/nouveau/nouveau_vga.c
-f:drivers/gpu/drm/nouveau/nouveau_vga.h
-f:drivers/gpu/drm/nouveau/nouveau_vmm.c
-f:drivers/gpu/drm/nouveau/nouveau_vmm.h
-f:drivers/gpu/drm/nouveau/nv04_fence.c
-f:drivers/gpu/drm/nouveau/nv10_fence.c
-f:drivers/gpu/drm/nouveau/nv10_fence.h
-f:drivers/gpu/drm/nouveau/nv17_fence.c
-f:drivers/gpu/drm/nouveau/nv50_display.h
-f:drivers/gpu/drm/nouveau/nv50_fence.c
-f:drivers/gpu/drm/nouveau/nv84_fence.c
-f:drivers/gpu/drm/nouveau/nvc0_fence.c
-f:drivers/gpu/drm/nouveau/nvif/Kbuild
-f:drivers/gpu/drm/nouveau/nvif/chan.c
-f:drivers/gpu/drm/nouveau/nvif/chan506f.c
-f:drivers/gpu/drm/nouveau/nvif/chan906f.c
-f:drivers/gpu/drm/nouveau/nvif/chanc36f.c
-f:drivers/gpu/drm/nouveau/nvif/client.c
-f:drivers/gpu/drm/nouveau/nvif/conn.c
-f:drivers/gpu/drm/nouveau/nvif/device.c
-f:drivers/gpu/drm/nouveau/nvif/disp.c
-f:drivers/gpu/drm/nouveau/nvif/driver.c
-f:drivers/gpu/drm/nouveau/nvif/event.c
-f:drivers/gpu/drm/nouveau/nvif/fifo.c
-f:drivers/gpu/drm/nouveau/nvif/head.c
-f:drivers/gpu/drm/nouveau/nvif/mem.c
-f:drivers/gpu/drm/nouveau/nvif/mmu.c
-f:drivers/gpu/drm/nouveau/nvif/object.c
-f:drivers/gpu/drm/nouveau/nvif/outp.c
-f:drivers/gpu/drm/nouveau/nvif/timer.c
-f:drivers/gpu/drm/nouveau/nvif/user.c
-f:drivers/gpu/drm/nouveau/nvif/userc361.c
-f:drivers/gpu/drm/nouveau/nvif/vmm.c
-f:drivers/gpu/drm/nouveau/nvkm/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/core/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/core/client.c
-f:drivers/gpu/drm/nouveau/nvkm/core/engine.c
-f:drivers/gpu/drm/nouveau/nvkm/core/enum.c
-f:drivers/gpu/drm/nouveau/nvkm/core/event.c
-f:drivers/gpu/drm/nouveau/nvkm/core/firmware.c
-f:drivers/gpu/drm/nouveau/nvkm/core/gpuobj.c
-f:drivers/gpu/drm/nouveau/nvkm/core/intr.c
-f:drivers/gpu/drm/nouveau/nvkm/core/ioctl.c
-f:drivers/gpu/drm/nouveau/nvkm/core/memory.c
-f:drivers/gpu/drm/nouveau/nvkm/core/mm.c
-f:drivers/gpu/drm/nouveau/nvkm/core/object.c
-f:drivers/gpu/drm/nouveau/nvkm/core/oproxy.c
-f:drivers/gpu/drm/nouveau/nvkm/core/option.c
-f:drivers/gpu/drm/nouveau/nvkm/core/ramht.c
-f:drivers/gpu/drm/nouveau/nvkm/core/subdev.c
-f:drivers/gpu/drm/nouveau/nvkm/core/uevent.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/engine/bsp/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/engine/bsp/g84.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/ce/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc/com.fuc
-f:drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc/gf100.fuc3
-f:drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc/gf100.fuc3.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc/gt215.fuc3
-f:drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc/gt215.fuc3.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/ce/ga100.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/ce/ga102.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/ce/gb202.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/ce/gf100.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/ce/gk104.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/ce/gm107.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/ce/gm200.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/ce/gp100.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/ce/gp102.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/ce/gt215.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/ce/gv100.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/ce/priv.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/ce/tu102.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/cipher/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/engine/cipher/g84.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/device/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/engine/device/acpi.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/device/acpi.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/device/ctrl.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/device/ctrl.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/device/priv.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/device/user.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/disp/chan.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/disp/chan.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/disp/conn.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/disp/conn.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/disp/g84.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/disp/g94.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/disp/ga102.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/disp/gk104.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/disp/gk110.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/disp/gm107.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/disp/gm200.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/disp/gp100.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/disp/gp102.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/disp/gt200.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/disp/gt215.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/disp/gv100.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/disp/head.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/disp/head.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp77.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp89.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/disp/nv04.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/disp/priv.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/disp/tu102.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/disp/uconn.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/disp/udisp.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/disp/uhead.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/disp/uoutp.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/disp/vga.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/dma/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/engine/dma/base.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/dma/gf100.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/dma/gf119.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/dma/gv100.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/dma/nv04.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/dma/nv50.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/dma/priv.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/dma/user.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/dma/user.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/dma/usergf100.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/dma/usergf119.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/dma/usergv100.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/dma/usernv04.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/dma/usernv50.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/falcon.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/fifo/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/fifo/cgrp.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/fifo/cgrp.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/fifo/chid.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/fifo/chid.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/fifo/g84.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/fifo/g98.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/fifo/ga100.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/fifo/ga102.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/fifo/gb202.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk110.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk208.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk20a.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/fifo/gm107.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/fifo/gm200.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/fifo/gp100.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/fifo/gv100.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv10.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv17.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv40.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv50.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/fifo/priv.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/fifo/regsnv04.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/fifo/runl.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/fifo/runl.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/fifo/runq.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/fifo/runq.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/fifo/tu102.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/fifo/ucgrp.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/fifo/uchan.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/base.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxga102.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf104.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf108.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf110.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf117.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf119.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk104.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk110.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk110b.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk208.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk20a.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm107.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm200.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm20b.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp100.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp102.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp104.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp107.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgv100.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxnv40.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxnv40.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxnv50.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxtu102.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/com.fuc
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpc.fuc
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf100.fuc3
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf100.fuc3.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf117.fuc3
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf117.fuc3.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk104.fuc3
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk104.fuc3.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk110.fuc3
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk110.fuc3.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk208.fuc5
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk208.fuc5.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgm107.fuc5
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgm107.fuc5.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hub.fuc
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgf100.fuc3
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgf100.fuc3.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgf117.fuc3
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgf117.fuc3.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk104.fuc3
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk104.fuc3.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk110.fuc3
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk110.fuc3.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk208.fuc5
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk208.fuc5.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgm107.fuc5
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgm107.fuc5.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/macros.fuc
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/os.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/g84.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/ga102.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/gf104.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/gf108.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/gf110.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/gf117.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/gf119.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/gk104.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/gk104.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110b.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/gk208.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/gm107.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/gm200.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/gm20b.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/gp100.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/gp102.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/gp104.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/gp107.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/gp108.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/gp10b.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/gt200.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/gt215.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/gv100.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/mcp79.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/mcp89.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/nv04.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/nv10.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/nv10.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/nv15.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/nv17.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/nv20.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/nv20.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/nv25.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/nv2a.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/nv30.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/nv34.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/nv35.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/nv44.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/nv50.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/nv50.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/priv.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/regs.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/gr/tu102.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/mpeg/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/engine/mpeg/g84.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv40.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv44.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv50.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/mpeg/priv.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/msenc/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/engine/mspdec/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/engine/mspdec/base.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/mspdec/g98.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gf100.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gk104.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gt215.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/mspdec/priv.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/msppp/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/engine/msppp/base.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/msppp/g98.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/msppp/gf100.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/msppp/gt215.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/msppp/priv.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/msvld/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/engine/msvld/base.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/msvld/gf100.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/msvld/gk104.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/msvld/gt215.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/msvld/mcp89.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/msvld/priv.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/nvdec/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/engine/nvdec/base.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/nvdec/ga102.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/nvdec/gm107.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/nvdec/priv.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/nvdec/tu102.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/nvenc/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/engine/nvenc/base.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/nvenc/gm107.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/nvenc/priv.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/nvenc/tu102.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/sec/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/engine/sec/fuc/g98.fuc0s
-f:drivers/gpu/drm/nouveau/nvkm/engine/sec/fuc/g98.fuc0s.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/sec/g98.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/sec2/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/engine/sec2/base.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/sec2/ga102.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/sec2/gp102.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/sec2/gp108.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/sec2/priv.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/sec2/r535.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/sec2/tu102.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/sw/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/engine/sw/base.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/sw/chan.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/sw/chan.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/sw/gf100.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/sw/nv04.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/sw/nv10.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/sw/nv50.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/sw/nv50.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/sw/nvsw.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/sw/nvsw.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/sw/priv.h
-f:drivers/gpu/drm/nouveau/nvkm/engine/vic/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/engine/vp/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/engine/vp/g84.c
-f:drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c
-f:drivers/gpu/drm/nouveau/nvkm/falcon/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/falcon/base.c
-f:drivers/gpu/drm/nouveau/nvkm/falcon/cmdq.c
-f:drivers/gpu/drm/nouveau/nvkm/falcon/fw.c
-f:drivers/gpu/drm/nouveau/nvkm/falcon/ga100.c
-f:drivers/gpu/drm/nouveau/nvkm/falcon/ga102.c
-f:drivers/gpu/drm/nouveau/nvkm/falcon/gm200.c
-f:drivers/gpu/drm/nouveau/nvkm/falcon/gp102.c
-f:drivers/gpu/drm/nouveau/nvkm/falcon/msgq.c
-f:drivers/gpu/drm/nouveau/nvkm/falcon/priv.h
-f:drivers/gpu/drm/nouveau/nvkm/falcon/qmgr.c
-f:drivers/gpu/drm/nouveau/nvkm/falcon/qmgr.h
-f:drivers/gpu/drm/nouveau/nvkm/falcon/tu102.c
-f:drivers/gpu/drm/nouveau/nvkm/falcon/v1.c
-f:drivers/gpu/drm/nouveau/nvkm/nvfw/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/nvfw/acr.c
-f:drivers/gpu/drm/nouveau/nvkm/nvfw/flcn.c
-f:drivers/gpu/drm/nouveau/nvkm/nvfw/fw.c
-f:drivers/gpu/drm/nouveau/nvkm/nvfw/hs.c
-f:drivers/gpu/drm/nouveau/nvkm/nvfw/ls.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/subdev/acr/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/subdev/acr/base.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/acr/ga100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/acr/ga102.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/acr/gm200.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/acr/gm20b.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/acr/gp102.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/acr/gp108.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/acr/gp10b.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/acr/gv100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/acr/lsfw.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/acr/priv.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/acr/tu102.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bar/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bar/base.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bar/g84.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bar/gk20a.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bar/gm107.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bar/gm20b.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bar/priv.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bar/tu102.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bios/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bios/M0203.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bios/M0205.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bios/M0209.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bios/P0260.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bios/base.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bios/bit.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bios/boost.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bios/conn.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bios/cstep.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bios/dcb.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bios/disp.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bios/dp.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bios/extdev.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bios/fan.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bios/gpio.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bios/i2c.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bios/iccsense.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bios/image.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bios/mxm.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bios/npde.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bios/pcir.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bios/perf.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bios/pll.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bios/pmu.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bios/power_budget.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bios/priv.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bios/ramcfg.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bios/rammap.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadow.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowacpi.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowof.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowpci.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowramin.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowrom.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bios/therm.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bios/timing.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bios/vmap.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bios/volt.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bios/vpstate.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bios/xpio.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bus/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bus/base.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bus/g94.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bus/gf100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bus/hwsq.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bus/hwsq.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bus/nv04.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bus/nv31.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bus/nv50.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/bus/priv.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/clk/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/clk/g84.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/clk/gf100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk104.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk20a.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk20a.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/clk/gm20b.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/clk/nv04.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/clk/nv40.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/clk/nv50.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/clk/nv50.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/clk/pll.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/clk/pllgt215.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/clk/pllnv04.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/clk/priv.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/clk/seq.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/devinit/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/subdev/devinit/base.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/devinit/fbmem.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g84.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g98.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/devinit/ga100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gf100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm107.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm200.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gt215.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gv100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/devinit/mcp89.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv04.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv04.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv05.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv10.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv1a.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv20.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/devinit/priv.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/devinit/r535.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/devinit/tu102.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fault/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fault/base.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fault/gp100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fault/gp10b.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fault/gv100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fault/priv.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fault/tu102.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fault/user.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/base.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/g84.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/ga100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/ga102.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/gb100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/gb202.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/gddr3.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/gddr5.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf108.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/gh100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk104.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk104.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk110.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk20a.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/gm107.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/gm200.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/gm20b.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp102.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp10b.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/gt215.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/gv100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/mcp77.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/mcp89.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv04.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv10.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv1a.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv20.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv25.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv30.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv35.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv36.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv40.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv41.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv44.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv46.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv47.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv49.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv4e.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv50.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv50.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/r535.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramfuc.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf108.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgm107.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgm200.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp102.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgt215.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/rammcp77.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv04.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv10.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv1a.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv20.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv41.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv44.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv49.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv4e.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv50.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramseq.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/regsnv04.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/sddr2.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/sddr3.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fb/tu102.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fsp/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fsp/base.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fsp/gb100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fsp/gb202.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fsp/gh100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fsp/priv.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fuse/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fuse/base.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fuse/gf100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fuse/gm107.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fuse/nv50.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/fuse/priv.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gpio/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gpio/base.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gpio/g94.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gpio/ga102.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gpio/gf119.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gpio/gk104.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gpio/nv10.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gpio/nv50.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gpio/priv.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ad102.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/base.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/fwsec.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga102.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/gb100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/gb202.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/gh100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/gv100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/priv.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/ad10x.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/client.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/engine.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/engine.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/ga100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/ga1xx.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/gb10x.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/gb20x.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/gh100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/gpu.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/gr.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/gr.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/handles.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/nvdec.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/nvenc.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/alloc.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/bar.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/ce.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/client.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/ctrl.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/device.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/disp.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/fbsr.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/fifo.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/gr.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/gsp.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvdec.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvenc.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvjpg.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/alloc.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/bar.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/ce.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/client.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/ctrl.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/device.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/disp.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/engine.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/event.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/fbsr.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/fifo.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/gr.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/gsp.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/msgfn.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/nvdec.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/nvenc.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/nvjpg.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/ofa.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/rpcfn.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/nvrm/vmm.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/ofa.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/rm.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/rpc.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/vmm.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/client.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/disp.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/fbsr.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/fifo.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/gr.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/gsp.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/nvrm/client.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/nvrm/disp.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/nvrm/engine.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/nvrm/fbsr.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/nvrm/fifo.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/nvrm/gr.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/nvrm/gsp.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/nvrm/msgfn.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/nvrm/ofa.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/nvrm/rpcfn.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/ofa.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/rm.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/rm.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/rpc.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/tu1xx.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu102.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu116.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/i2c/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/subdev/i2c/anx9805.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxch.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxch.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgf119.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/i2c/base.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/i2c/bit.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/i2c/bus.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/i2c/bus.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/i2c/busgf119.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/i2c/busnv04.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/i2c/busnv4e.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/i2c/busnv50.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/i2c/g94.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gf117.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gf119.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gk104.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gk110.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gm200.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/i2c/nv04.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/i2c/nv4e.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/i2c/nv50.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/i2c/pad.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/i2c/pad.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/i2c/padg94.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/i2c/padgf119.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/i2c/padgm200.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/i2c/padnv04.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/i2c/padnv4e.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/i2c/padnv50.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/i2c/priv.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/gf100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/priv.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/instmem/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/subdev/instmem/base.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/instmem/gh100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv04.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv40.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/instmem/priv.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/ltc/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/subdev/ltc/base.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/ltc/ga102.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gf100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gk104.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gm107.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gm200.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gp100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gp102.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gp10b.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/ltc/priv.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mc/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mc/base.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mc/g84.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mc/g98.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mc/ga100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mc/gf100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mc/gk104.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mc/gk20a.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mc/gp100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mc/gp10b.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mc/gt215.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv04.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv11.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv17.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv44.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv50.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mc/priv.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/base.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/g84.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gf100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gh100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gk104.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gk20a.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gm200.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gm20b.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gp100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gp10b.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gv100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/mcp77.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/mem.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/mem.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/memgf100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/memnv04.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/memnv50.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv04.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv41.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv44.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv50.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/priv.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/tu102.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/umem.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/umem.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/ummu.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/ummu.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/uvmm.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/uvmm.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgf100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgh100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgk104.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgk20a.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgm200.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgm20b.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp10b.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgv100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmmcp77.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmnv04.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmnv41.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmnv44.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmnv50.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmtu102.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mxm/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mxm/base.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mxm/mxms.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mxm/mxms.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mxm/nv50.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/mxm/priv.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pci/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pci/agp.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pci/agp.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pci/base.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pci/g84.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pci/g92.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pci/g94.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pci/gf100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pci/gf106.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pci/gh100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pci/gk104.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pci/gp100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pci/nv04.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pci/nv40.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pci/nv46.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pci/nv4c.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pci/pcie.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pci/priv.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pmu/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/arith.fuc
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf100.fuc3
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf100.fuc3.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf119.fuc4
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf119.fuc4.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gk208.fuc5
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gk208.fuc5.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gt215.fuc3
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gt215.fuc3.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/host.fuc
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/i2c_.fuc
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/idle.fuc
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/kernel.fuc
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/macros.fuc
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/memx.fuc
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/os.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/perf.fuc
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/test.fuc
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gf100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gf119.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk104.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk110.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk208.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk20a.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gm107.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gm200.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gm20b.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp102.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp10b.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gt215.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pmu/memx.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/pmu/priv.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/privring/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/subdev/privring/gf100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/privring/gf117.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/privring/gk104.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/privring/gk20a.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/privring/gm200.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/privring/gp10b.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/privring/priv.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/therm/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/therm/fan.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/therm/fannil.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/therm/fanpwm.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/therm/fantog.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/therm/g84.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf100.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf119.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/therm/gm107.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/therm/gm200.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/therm/gp100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/therm/gt215.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/therm/ic.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/therm/nv40.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/therm/nv50.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/therm/priv.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/therm/temp.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/timer/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/subdev/timer/base.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/timer/gk20a.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/timer/nv04.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/timer/nv40.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/timer/nv41.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/timer/priv.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/timer/regsnv04.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/top/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/subdev/top/base.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/top/ga100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/top/gk104.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/top/priv.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/vfn/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/subdev/vfn/base.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/vfn/ga100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/vfn/gv100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/vfn/priv.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/vfn/r535.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/vfn/tu102.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/vfn/uvfn.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/volt/Kbuild
-f:drivers/gpu/drm/nouveau/nvkm/subdev/volt/base.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/volt/gf100.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/volt/gf117.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk104.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk20a.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk20a.h
-f:drivers/gpu/drm/nouveau/nvkm/subdev/volt/gm20b.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/volt/gpio.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/volt/nv40.c
-f:drivers/gpu/drm/nouveau/nvkm/subdev/volt/priv.h
-f:drivers/gpu/drm/nova/Kconfig
-f:drivers/gpu/drm/nova/Makefile
-f:drivers/gpu/drm/nova/driver.rs
-f:drivers/gpu/drm/nova/file.rs
-f:drivers/gpu/drm/nova/gem.rs
-f:drivers/gpu/drm/nova/nova.rs
-f:drivers/gpu/drm/nova/uapi.rs
-f:drivers/gpu/drm/omapdrm/Kconfig
-f:drivers/gpu/drm/omapdrm/Makefile
-f:drivers/gpu/drm/omapdrm/TODO
-f:drivers/gpu/drm/omapdrm/dss/base.c
-f:drivers/gpu/drm/omapdrm/dss/dispc.c
-f:drivers/gpu/drm/omapdrm/dss/dispc.h
-f:drivers/gpu/drm/omapdrm/dss/dispc_coefs.c
-f:drivers/gpu/drm/omapdrm/dss/dpi.c
-f:drivers/gpu/drm/omapdrm/dss/dsi.c
-f:drivers/gpu/drm/omapdrm/dss/dsi.h
-f:drivers/gpu/drm/omapdrm/dss/dss.c
-f:drivers/gpu/drm/omapdrm/dss/dss.h
-f:drivers/gpu/drm/omapdrm/dss/hdmi.h
-f:drivers/gpu/drm/omapdrm/dss/hdmi4.c
-f:drivers/gpu/drm/omapdrm/dss/hdmi4_cec.c
-f:drivers/gpu/drm/omapdrm/dss/hdmi4_cec.h
-f:drivers/gpu/drm/omapdrm/dss/hdmi4_core.c
-f:drivers/gpu/drm/omapdrm/dss/hdmi4_core.h
-f:drivers/gpu/drm/omapdrm/dss/hdmi5.c
-f:drivers/gpu/drm/omapdrm/dss/hdmi5_core.c
-f:drivers/gpu/drm/omapdrm/dss/hdmi5_core.h
-f:drivers/gpu/drm/omapdrm/dss/hdmi_common.c
-f:drivers/gpu/drm/omapdrm/dss/hdmi_phy.c
-f:drivers/gpu/drm/omapdrm/dss/hdmi_pll.c
-f:drivers/gpu/drm/omapdrm/dss/hdmi_wp.c
-f:drivers/gpu/drm/omapdrm/dss/omapdss.h
-f:drivers/gpu/drm/omapdrm/dss/output.c
-f:drivers/gpu/drm/omapdrm/dss/pll.c
-f:drivers/gpu/drm/omapdrm/dss/sdi.c
-f:drivers/gpu/drm/omapdrm/dss/venc.c
-f:drivers/gpu/drm/omapdrm/dss/video-pll.c
-f:drivers/gpu/drm/omapdrm/omap_crtc.c
-f:drivers/gpu/drm/omapdrm/omap_crtc.h
-f:drivers/gpu/drm/omapdrm/omap_debugfs.c
-f:drivers/gpu/drm/omapdrm/omap_dmm_priv.h
-f:drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
-f:drivers/gpu/drm/omapdrm/omap_dmm_tiler.h
-f:drivers/gpu/drm/omapdrm/omap_drv.c
-f:drivers/gpu/drm/omapdrm/omap_drv.h
-f:drivers/gpu/drm/omapdrm/omap_encoder.c
-f:drivers/gpu/drm/omapdrm/omap_encoder.h
-f:drivers/gpu/drm/omapdrm/omap_fb.c
-f:drivers/gpu/drm/omapdrm/omap_fb.h
-f:drivers/gpu/drm/omapdrm/omap_fbdev.c
-f:drivers/gpu/drm/omapdrm/omap_fbdev.h
-f:drivers/gpu/drm/omapdrm/omap_gem.c
-f:drivers/gpu/drm/omapdrm/omap_gem.h
-f:drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
-f:drivers/gpu/drm/omapdrm/omap_irq.c
-f:drivers/gpu/drm/omapdrm/omap_irq.h
-f:drivers/gpu/drm/omapdrm/omap_overlay.c
-f:drivers/gpu/drm/omapdrm/omap_overlay.h
-f:drivers/gpu/drm/omapdrm/omap_plane.c
-f:drivers/gpu/drm/omapdrm/omap_plane.h
-f:drivers/gpu/drm/omapdrm/tcm-sita.c
-f:drivers/gpu/drm/omapdrm/tcm.h
-f:drivers/gpu/drm/panel/Kconfig
-f:drivers/gpu/drm/panel/Makefile
-f:drivers/gpu/drm/panel/panel-abt-y030xx067a.c
-f:drivers/gpu/drm/panel/panel-arm-versatile.c
-f:drivers/gpu/drm/panel/panel-asus-z00t-tm5p5-n35596.c
-f:drivers/gpu/drm/panel/panel-auo-a030jtn01.c
-f:drivers/gpu/drm/panel/panel-boe-bf060y8m-aj0.c
-f:drivers/gpu/drm/panel/panel-boe-himax8279d.c
-f:drivers/gpu/drm/panel/panel-boe-td4320.c
-f:drivers/gpu/drm/panel/panel-boe-th101mb31ig002-28a.c
-f:drivers/gpu/drm/panel/panel-boe-tv101wum-ll2.c
-f:drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c
-f:drivers/gpu/drm/panel/panel-dsi-cm.c
-f:drivers/gpu/drm/panel/panel-ebbg-ft8719.c
-f:drivers/gpu/drm/panel/panel-edp.c
-f:drivers/gpu/drm/panel/panel-elida-kd35t133.c
-f:drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c
-f:drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c
-f:drivers/gpu/drm/panel/panel-himax-hx8279.c
-f:drivers/gpu/drm/panel/panel-himax-hx83102.c
-f:drivers/gpu/drm/panel/panel-himax-hx83112a.c
-f:drivers/gpu/drm/panel/panel-himax-hx83112b.c
-f:drivers/gpu/drm/panel/panel-himax-hx8394.c
-f:drivers/gpu/drm/panel/panel-ilitek-ili9322.c
-f:drivers/gpu/drm/panel/panel-ilitek-ili9341.c
-f:drivers/gpu/drm/panel/panel-ilitek-ili9805.c
-f:drivers/gpu/drm/panel/panel-ilitek-ili9806e.c
-f:drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
-f:drivers/gpu/drm/panel/panel-ilitek-ili9882t.c
-f:drivers/gpu/drm/panel/panel-innolux-ej030na.c
-f:drivers/gpu/drm/panel/panel-innolux-p079zca.c
-f:drivers/gpu/drm/panel/panel-jadard-jd9365da-h3.c
-f:drivers/gpu/drm/panel/panel-jdi-fhd-r63452.c
-f:drivers/gpu/drm/panel/panel-jdi-lpm102a188a.c
-f:drivers/gpu/drm/panel/panel-jdi-lt070me05000.c
-f:drivers/gpu/drm/panel/panel-khadas-ts050.c
-f:drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c
-f:drivers/gpu/drm/panel/panel-leadtek-ltk050h3146w.c
-f:drivers/gpu/drm/panel/panel-leadtek-ltk500hd1829.c
-f:drivers/gpu/drm/panel/panel-lg-lb035q02.c
-f:drivers/gpu/drm/panel/panel-lg-lg4573.c
-f:drivers/gpu/drm/panel/panel-lg-sw43408.c
-f:drivers/gpu/drm/panel/panel-lincolntech-lcd197.c
-f:drivers/gpu/drm/panel/panel-lvds.c
-f:drivers/gpu/drm/panel/panel-magnachip-d53e6ea8966.c
-f:drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c
-f:drivers/gpu/drm/panel/panel-nec-nl8048hl11.c
-f:drivers/gpu/drm/panel/panel-newvision-nv3051d.c
-f:drivers/gpu/drm/panel/panel-newvision-nv3052c.c
-f:drivers/gpu/drm/panel/panel-novatek-nt35510.c
-f:drivers/gpu/drm/panel/panel-novatek-nt35560.c
-f:drivers/gpu/drm/panel/panel-novatek-nt35950.c
-f:drivers/gpu/drm/panel/panel-novatek-nt36523.c
-f:drivers/gpu/drm/panel/panel-novatek-nt36672a.c
-f:drivers/gpu/drm/panel/panel-novatek-nt36672e.c
-f:drivers/gpu/drm/panel/panel-novatek-nt37801.c
-f:drivers/gpu/drm/panel/panel-novatek-nt39016.c
-f:drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c
-f:drivers/gpu/drm/panel/panel-orisetech-ota5601a.c
-f:drivers/gpu/drm/panel/panel-orisetech-otm8009a.c
-f:drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c
-f:drivers/gpu/drm/panel/panel-panasonic-vvx10f034n00.c
-f:drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
-f:drivers/gpu/drm/panel/panel-raydium-rm67191.c
-f:drivers/gpu/drm/panel/panel-raydium-rm67200.c
-f:drivers/gpu/drm/panel/panel-raydium-rm68200.c
-f:drivers/gpu/drm/panel/panel-raydium-rm692e5.c
-f:drivers/gpu/drm/panel/panel-raydium-rm69380.c
-f:drivers/gpu/drm/panel/panel-renesas-r61307.c
-f:drivers/gpu/drm/panel/panel-renesas-r69328.c
-f:drivers/gpu/drm/panel/panel-ronbo-rb070d30.c
-f:drivers/gpu/drm/panel/panel-samsung-ams581vf01.c
-f:drivers/gpu/drm/panel/panel-samsung-ams639rq08.c
-f:drivers/gpu/drm/panel/panel-samsung-atna33xc20.c
-f:drivers/gpu/drm/panel/panel-samsung-db7430.c
-f:drivers/gpu/drm/panel/panel-samsung-ld9040.c
-f:drivers/gpu/drm/panel/panel-samsung-s6d16d0.c
-f:drivers/gpu/drm/panel/panel-samsung-s6d27a1.c
-f:drivers/gpu/drm/panel/panel-samsung-s6d7aa0.c
-f:drivers/gpu/drm/panel/panel-samsung-s6e3fa7.c
-f:drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c
-f:drivers/gpu/drm/panel/panel-samsung-s6e3ha8.c
-f:drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c
-f:drivers/gpu/drm/panel/panel-samsung-s6e63m0-dsi.c
-f:drivers/gpu/drm/panel/panel-samsung-s6e63m0-spi.c
-f:drivers/gpu/drm/panel/panel-samsung-s6e63m0.c
-f:drivers/gpu/drm/panel/panel-samsung-s6e63m0.h
-f:drivers/gpu/drm/panel/panel-samsung-s6e88a0-ams427ap24.c
-f:drivers/gpu/drm/panel/panel-samsung-s6e88a0-ams452ef01.c
-f:drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c
-f:drivers/gpu/drm/panel/panel-samsung-sofef00.c
-f:drivers/gpu/drm/panel/panel-seiko-43wvf1g.c
-f:drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c
-f:drivers/gpu/drm/panel/panel-sharp-ls037v7dw01.c
-f:drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c
-f:drivers/gpu/drm/panel/panel-sharp-ls060t1sx01.c
-f:drivers/gpu/drm/panel/panel-simple.c
-f:drivers/gpu/drm/panel/panel-sitronix-st7701.c
-f:drivers/gpu/drm/panel/panel-sitronix-st7703.c
-f:drivers/gpu/drm/panel/panel-sitronix-st7789v.c
-f:drivers/gpu/drm/panel/panel-sony-acx565akm.c
-f:drivers/gpu/drm/panel/panel-sony-td4353-jdi.c
-f:drivers/gpu/drm/panel/panel-sony-tulip-truly-nt35521.c
-f:drivers/gpu/drm/panel/panel-startek-kd070fhfid015.c
-f:drivers/gpu/drm/panel/panel-summit.c
-f:drivers/gpu/drm/panel/panel-synaptics-r63353.c
-f:drivers/gpu/drm/panel/panel-tdo-tl070wsh30.c
-f:drivers/gpu/drm/panel/panel-tpo-td028ttec1.c
-f:drivers/gpu/drm/panel/panel-tpo-td043mtea1.c
-f:drivers/gpu/drm/panel/panel-tpo-tpg110.c
-f:drivers/gpu/drm/panel/panel-truly-nt35597.c
-f:drivers/gpu/drm/panel/panel-visionox-g2647fb105.c
-f:drivers/gpu/drm/panel/panel-visionox-r66451.c
-f:drivers/gpu/drm/panel/panel-visionox-rm69299.c
-f:drivers/gpu/drm/panel/panel-visionox-rm692e5.c
-f:drivers/gpu/drm/panel/panel-visionox-vtdr6130.c
-f:drivers/gpu/drm/panel/panel-widechips-ws2401.c
-f:drivers/gpu/drm/panel/panel-xinpeng-xpp055c272.c
-f:drivers/gpu/drm/panfrost/Kconfig
-f:drivers/gpu/drm/panfrost/Makefile
-f:drivers/gpu/drm/panfrost/TODO
-f:drivers/gpu/drm/panfrost/panfrost_devfreq.c
-f:drivers/gpu/drm/panfrost/panfrost_devfreq.h
-f:drivers/gpu/drm/panfrost/panfrost_device.c
-f:drivers/gpu/drm/panfrost/panfrost_device.h
-f:drivers/gpu/drm/panfrost/panfrost_drv.c
-f:drivers/gpu/drm/panfrost/panfrost_dump.c
-f:drivers/gpu/drm/panfrost/panfrost_dump.h
-f:drivers/gpu/drm/panfrost/panfrost_features.h
-f:drivers/gpu/drm/panfrost/panfrost_gem.c
-f:drivers/gpu/drm/panfrost/panfrost_gem.h
-f:drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c
-f:drivers/gpu/drm/panfrost/panfrost_gpu.c
-f:drivers/gpu/drm/panfrost/panfrost_gpu.h
-f:drivers/gpu/drm/panfrost/panfrost_issues.h
-f:drivers/gpu/drm/panfrost/panfrost_job.c
-f:drivers/gpu/drm/panfrost/panfrost_job.h
-f:drivers/gpu/drm/panfrost/panfrost_mmu.c
-f:drivers/gpu/drm/panfrost/panfrost_mmu.h
-f:drivers/gpu/drm/panfrost/panfrost_perfcnt.c
-f:drivers/gpu/drm/panfrost/panfrost_perfcnt.h
-f:drivers/gpu/drm/panfrost/panfrost_regs.h
-f:drivers/gpu/drm/panthor/Kconfig
-f:drivers/gpu/drm/panthor/Makefile
-f:drivers/gpu/drm/panthor/panthor_devfreq.c
-f:drivers/gpu/drm/panthor/panthor_devfreq.h
-f:drivers/gpu/drm/panthor/panthor_device.c
-f:drivers/gpu/drm/panthor/panthor_device.h
-f:drivers/gpu/drm/panthor/panthor_drv.c
-f:drivers/gpu/drm/panthor/panthor_fw.c
-f:drivers/gpu/drm/panthor/panthor_fw.h
-f:drivers/gpu/drm/panthor/panthor_gem.c
-f:drivers/gpu/drm/panthor/panthor_gem.h
-f:drivers/gpu/drm/panthor/panthor_gpu.c
-f:drivers/gpu/drm/panthor/panthor_gpu.h
-f:drivers/gpu/drm/panthor/panthor_heap.c
-f:drivers/gpu/drm/panthor/panthor_heap.h
-f:drivers/gpu/drm/panthor/panthor_mmu.c
-f:drivers/gpu/drm/panthor/panthor_mmu.h
-f:drivers/gpu/drm/panthor/panthor_regs.h
-f:drivers/gpu/drm/panthor/panthor_sched.c
-f:drivers/gpu/drm/panthor/panthor_sched.h
-f:drivers/gpu/drm/pl111/Kconfig
-f:drivers/gpu/drm/pl111/Makefile
-f:drivers/gpu/drm/pl111/pl111_debugfs.c
-f:drivers/gpu/drm/pl111/pl111_display.c
-f:drivers/gpu/drm/pl111/pl111_drm.h
-f:drivers/gpu/drm/pl111/pl111_drv.c
-f:drivers/gpu/drm/pl111/pl111_nomadik.c
-f:drivers/gpu/drm/pl111/pl111_nomadik.h
-f:drivers/gpu/drm/pl111/pl111_versatile.c
-f:drivers/gpu/drm/pl111/pl111_versatile.h
-f:drivers/gpu/drm/qxl/Kconfig
-f:drivers/gpu/drm/qxl/Makefile
-f:drivers/gpu/drm/qxl/qxl_cmd.c
-f:drivers/gpu/drm/qxl/qxl_debugfs.c
-f:drivers/gpu/drm/qxl/qxl_dev.h
-f:drivers/gpu/drm/qxl/qxl_display.c
-f:drivers/gpu/drm/qxl/qxl_draw.c
-f:drivers/gpu/drm/qxl/qxl_drv.c
-f:drivers/gpu/drm/qxl/qxl_drv.h
-f:drivers/gpu/drm/qxl/qxl_dumb.c
-f:drivers/gpu/drm/qxl/qxl_gem.c
-f:drivers/gpu/drm/qxl/qxl_image.c
-f:drivers/gpu/drm/qxl/qxl_ioctl.c
-f:drivers/gpu/drm/qxl/qxl_irq.c
-f:drivers/gpu/drm/qxl/qxl_kms.c
-f:drivers/gpu/drm/qxl/qxl_object.c
-f:drivers/gpu/drm/qxl/qxl_object.h
-f:drivers/gpu/drm/qxl/qxl_prime.c
-f:drivers/gpu/drm/qxl/qxl_release.c
-f:drivers/gpu/drm/qxl/qxl_ttm.c
-f:drivers/gpu/drm/radeon/.gitignore
-f:drivers/gpu/drm/radeon/Kconfig
-f:drivers/gpu/drm/radeon/Makefile
-f:drivers/gpu/drm/radeon/ObjectID.h
-f:drivers/gpu/drm/radeon/atom-bits.h
-f:drivers/gpu/drm/radeon/atom-names.h
-f:drivers/gpu/drm/radeon/atom-types.h
-f:drivers/gpu/drm/radeon/atom.c
-f:drivers/gpu/drm/radeon/atom.h
-f:drivers/gpu/drm/radeon/atombios.h
-f:drivers/gpu/drm/radeon/atombios_crtc.c
-f:drivers/gpu/drm/radeon/atombios_dp.c
-f:drivers/gpu/drm/radeon/atombios_encoders.c
-f:drivers/gpu/drm/radeon/atombios_i2c.c
-f:drivers/gpu/drm/radeon/avivod.h
-f:drivers/gpu/drm/radeon/btc_dpm.c
-f:drivers/gpu/drm/radeon/btc_dpm.h
-f:drivers/gpu/drm/radeon/btcd.h
-f:drivers/gpu/drm/radeon/cayman_blit_shaders.h
-f:drivers/gpu/drm/radeon/ci_dpm.c
-f:drivers/gpu/drm/radeon/ci_dpm.h
-f:drivers/gpu/drm/radeon/ci_smc.c
-f:drivers/gpu/drm/radeon/cik.c
-f:drivers/gpu/drm/radeon/cik.h
-f:drivers/gpu/drm/radeon/cik_blit_shaders.h
-f:drivers/gpu/drm/radeon/cik_reg.h
-f:drivers/gpu/drm/radeon/cik_sdma.c
-f:drivers/gpu/drm/radeon/cikd.h
-f:drivers/gpu/drm/radeon/clearstate_cayman.h
-f:drivers/gpu/drm/radeon/clearstate_ci.h
-f:drivers/gpu/drm/radeon/clearstate_defs.h
-f:drivers/gpu/drm/radeon/clearstate_evergreen.h
-f:drivers/gpu/drm/radeon/clearstate_si.h
-f:drivers/gpu/drm/radeon/cypress_dpm.c
-f:drivers/gpu/drm/radeon/cypress_dpm.h
-f:drivers/gpu/drm/radeon/dce3_1_afmt.c
-f:drivers/gpu/drm/radeon/dce6_afmt.c
-f:drivers/gpu/drm/radeon/dce6_afmt.h
-f:drivers/gpu/drm/radeon/evergreen.c
-f:drivers/gpu/drm/radeon/evergreen.h
-f:drivers/gpu/drm/radeon/evergreen_blit_shaders.h
-f:drivers/gpu/drm/radeon/evergreen_cs.c
-f:drivers/gpu/drm/radeon/evergreen_dma.c
-f:drivers/gpu/drm/radeon/evergreen_hdmi.c
-f:drivers/gpu/drm/radeon/evergreen_hdmi.h
-f:drivers/gpu/drm/radeon/evergreen_reg.h
-f:drivers/gpu/drm/radeon/evergreen_smc.h
-f:drivers/gpu/drm/radeon/evergreend.h
-f:drivers/gpu/drm/radeon/kv_dpm.c
-f:drivers/gpu/drm/radeon/kv_dpm.h
-f:drivers/gpu/drm/radeon/kv_smc.c
-f:drivers/gpu/drm/radeon/mkregtable.c
-f:drivers/gpu/drm/radeon/ni.c
-f:drivers/gpu/drm/radeon/ni.h
-f:drivers/gpu/drm/radeon/ni_dma.c
-f:drivers/gpu/drm/radeon/ni_dpm.c
-f:drivers/gpu/drm/radeon/ni_dpm.h
-f:drivers/gpu/drm/radeon/ni_reg.h
-f:drivers/gpu/drm/radeon/nid.h
-f:drivers/gpu/drm/radeon/nislands_smc.h
-f:drivers/gpu/drm/radeon/ppsmc.h
-f:drivers/gpu/drm/radeon/pptable.h
-f:drivers/gpu/drm/radeon/r100.c
-f:drivers/gpu/drm/radeon/r100_track.h
-f:drivers/gpu/drm/radeon/r100d.h
-f:drivers/gpu/drm/radeon/r200.c
-f:drivers/gpu/drm/radeon/r300.c
-f:drivers/gpu/drm/radeon/r300_reg.h
-f:drivers/gpu/drm/radeon/r300d.h
-f:drivers/gpu/drm/radeon/r420.c
-f:drivers/gpu/drm/radeon/r420d.h
-f:drivers/gpu/drm/radeon/r500_reg.h
-f:drivers/gpu/drm/radeon/r520.c
-f:drivers/gpu/drm/radeon/r520d.h
-f:drivers/gpu/drm/radeon/r600.c
-f:drivers/gpu/drm/radeon/r600.h
-f:drivers/gpu/drm/radeon/r600_cs.c
-f:drivers/gpu/drm/radeon/r600_dma.c
-f:drivers/gpu/drm/radeon/r600_dpm.c
-f:drivers/gpu/drm/radeon/r600_dpm.h
-f:drivers/gpu/drm/radeon/r600_hdmi.c
-f:drivers/gpu/drm/radeon/r600_reg.h
-f:drivers/gpu/drm/radeon/r600d.h
-f:drivers/gpu/drm/radeon/radeon.h
-f:drivers/gpu/drm/radeon/radeon_acpi.c
-f:drivers/gpu/drm/radeon/radeon_acpi.h
-f:drivers/gpu/drm/radeon/radeon_agp.c
-f:drivers/gpu/drm/radeon/radeon_asic.c
-f:drivers/gpu/drm/radeon/radeon_asic.h
-f:drivers/gpu/drm/radeon/radeon_atombios.c
-f:drivers/gpu/drm/radeon/radeon_atombios.h
-f:drivers/gpu/drm/radeon/radeon_atpx_handler.c
-f:drivers/gpu/drm/radeon/radeon_audio.c
-f:drivers/gpu/drm/radeon/radeon_audio.h
-f:drivers/gpu/drm/radeon/radeon_benchmark.c
-f:drivers/gpu/drm/radeon/radeon_bios.c
-f:drivers/gpu/drm/radeon/radeon_clocks.c
-f:drivers/gpu/drm/radeon/radeon_combios.c
-f:drivers/gpu/drm/radeon/radeon_connectors.c
-f:drivers/gpu/drm/radeon/radeon_cs.c
-f:drivers/gpu/drm/radeon/radeon_cursor.c
-f:drivers/gpu/drm/radeon/radeon_device.c
-f:drivers/gpu/drm/radeon/radeon_device.h
-f:drivers/gpu/drm/radeon/radeon_display.c
-f:drivers/gpu/drm/radeon/radeon_dp_auxch.c
-f:drivers/gpu/drm/radeon/radeon_drv.c
-f:drivers/gpu/drm/radeon/radeon_drv.h
-f:drivers/gpu/drm/radeon/radeon_encoders.c
-f:drivers/gpu/drm/radeon/radeon_family.h
-f:drivers/gpu/drm/radeon/radeon_fbdev.c
-f:drivers/gpu/drm/radeon/radeon_fence.c
-f:drivers/gpu/drm/radeon/radeon_gart.c
-f:drivers/gpu/drm/radeon/radeon_gem.c
-f:drivers/gpu/drm/radeon/radeon_i2c.c
-f:drivers/gpu/drm/radeon/radeon_ib.c
-f:drivers/gpu/drm/radeon/radeon_irq_kms.c
-f:drivers/gpu/drm/radeon/radeon_kms.c
-f:drivers/gpu/drm/radeon/radeon_kms.h
-f:drivers/gpu/drm/radeon/radeon_legacy_crtc.c
-f:drivers/gpu/drm/radeon/radeon_legacy_encoders.c
-f:drivers/gpu/drm/radeon/radeon_legacy_encoders.h
-f:drivers/gpu/drm/radeon/radeon_legacy_tv.c
-f:drivers/gpu/drm/radeon/radeon_mn.c
-f:drivers/gpu/drm/radeon/radeon_mode.h
-f:drivers/gpu/drm/radeon/radeon_object.c
-f:drivers/gpu/drm/radeon/radeon_object.h
-f:drivers/gpu/drm/radeon/radeon_pm.c
-f:drivers/gpu/drm/radeon/radeon_pm.h
-f:drivers/gpu/drm/radeon/radeon_prime.c
-f:drivers/gpu/drm/radeon/radeon_prime.h
-f:drivers/gpu/drm/radeon/radeon_reg.h
-f:drivers/gpu/drm/radeon/radeon_ring.c
-f:drivers/gpu/drm/radeon/radeon_sa.c
-f:drivers/gpu/drm/radeon/radeon_semaphore.c
-f:drivers/gpu/drm/radeon/radeon_sync.c
-f:drivers/gpu/drm/radeon/radeon_test.c
-f:drivers/gpu/drm/radeon/radeon_trace.h
-f:drivers/gpu/drm/radeon/radeon_trace_points.c
-f:drivers/gpu/drm/radeon/radeon_ttm.c
-f:drivers/gpu/drm/radeon/radeon_ttm.h
-f:drivers/gpu/drm/radeon/radeon_ucode.c
-f:drivers/gpu/drm/radeon/radeon_ucode.h
-f:drivers/gpu/drm/radeon/radeon_uvd.c
-f:drivers/gpu/drm/radeon/radeon_vce.c
-f:drivers/gpu/drm/radeon/radeon_vm.c
-f:drivers/gpu/drm/radeon/reg_srcs/cayman
-f:drivers/gpu/drm/radeon/reg_srcs/evergreen
-f:drivers/gpu/drm/radeon/reg_srcs/r100
-f:drivers/gpu/drm/radeon/reg_srcs/r200
-f:drivers/gpu/drm/radeon/reg_srcs/r300
-f:drivers/gpu/drm/radeon/reg_srcs/r420
-f:drivers/gpu/drm/radeon/reg_srcs/r600
-f:drivers/gpu/drm/radeon/reg_srcs/rn50
-f:drivers/gpu/drm/radeon/reg_srcs/rs600
-f:drivers/gpu/drm/radeon/reg_srcs/rv515
-f:drivers/gpu/drm/radeon/rs100d.h
-f:drivers/gpu/drm/radeon/rs400.c
-f:drivers/gpu/drm/radeon/rs400d.h
-f:drivers/gpu/drm/radeon/rs600.c
-f:drivers/gpu/drm/radeon/rs600d.h
-f:drivers/gpu/drm/radeon/rs690.c
-f:drivers/gpu/drm/radeon/rs690d.h
-f:drivers/gpu/drm/radeon/rs780_dpm.c
-f:drivers/gpu/drm/radeon/rs780_dpm.h
-f:drivers/gpu/drm/radeon/rs780d.h
-f:drivers/gpu/drm/radeon/rv200d.h
-f:drivers/gpu/drm/radeon/rv250d.h
-f:drivers/gpu/drm/radeon/rv350d.h
-f:drivers/gpu/drm/radeon/rv515.c
-f:drivers/gpu/drm/radeon/rv515d.h
-f:drivers/gpu/drm/radeon/rv6xx_dpm.c
-f:drivers/gpu/drm/radeon/rv6xx_dpm.h
-f:drivers/gpu/drm/radeon/rv6xxd.h
-f:drivers/gpu/drm/radeon/rv730_dpm.c
-f:drivers/gpu/drm/radeon/rv730d.h
-f:drivers/gpu/drm/radeon/rv740_dpm.c
-f:drivers/gpu/drm/radeon/rv740d.h
-f:drivers/gpu/drm/radeon/rv770.c
-f:drivers/gpu/drm/radeon/rv770.h
-f:drivers/gpu/drm/radeon/rv770_dma.c
-f:drivers/gpu/drm/radeon/rv770_dpm.c
-f:drivers/gpu/drm/radeon/rv770_dpm.h
-f:drivers/gpu/drm/radeon/rv770_smc.c
-f:drivers/gpu/drm/radeon/rv770_smc.h
-f:drivers/gpu/drm/radeon/rv770d.h
-f:drivers/gpu/drm/radeon/si.c
-f:drivers/gpu/drm/radeon/si.h
-f:drivers/gpu/drm/radeon/si_blit_shaders.h
-f:drivers/gpu/drm/radeon/si_dma.c
-f:drivers/gpu/drm/radeon/si_dpm.c
-f:drivers/gpu/drm/radeon/si_dpm.h
-f:drivers/gpu/drm/radeon/si_reg.h
-f:drivers/gpu/drm/radeon/si_smc.c
-f:drivers/gpu/drm/radeon/sid.h
-f:drivers/gpu/drm/radeon/sislands_smc.h
-f:drivers/gpu/drm/radeon/smu7.h
-f:drivers/gpu/drm/radeon/smu7_discrete.h
-f:drivers/gpu/drm/radeon/smu7_fusion.h
-f:drivers/gpu/drm/radeon/sumo_dpm.c
-f:drivers/gpu/drm/radeon/sumo_dpm.h
-f:drivers/gpu/drm/radeon/sumo_smc.c
-f:drivers/gpu/drm/radeon/sumod.h
-f:drivers/gpu/drm/radeon/trinity_dpm.c
-f:drivers/gpu/drm/radeon/trinity_dpm.h
-f:drivers/gpu/drm/radeon/trinity_smc.c
-f:drivers/gpu/drm/radeon/trinityd.h
-f:drivers/gpu/drm/radeon/uvd_v1_0.c
-f:drivers/gpu/drm/radeon/uvd_v2_2.c
-f:drivers/gpu/drm/radeon/uvd_v3_1.c
-f:drivers/gpu/drm/radeon/uvd_v4_2.c
-f:drivers/gpu/drm/radeon/vce.h
-f:drivers/gpu/drm/radeon/vce_v1_0.c
-f:drivers/gpu/drm/radeon/vce_v2_0.c
-f:drivers/gpu/drm/renesas/Kconfig
-f:drivers/gpu/drm/renesas/Makefile
-f:drivers/gpu/drm/renesas/rcar-du/Kconfig
-f:drivers/gpu/drm/renesas/rcar-du/Makefile
-f:drivers/gpu/drm/renesas/rcar-du/rcar_cmm.c
-f:drivers/gpu/drm/renesas/rcar-du/rcar_cmm.h
-f:drivers/gpu/drm/renesas/rcar-du/rcar_du_crtc.c
-f:drivers/gpu/drm/renesas/rcar-du/rcar_du_crtc.h
-f:drivers/gpu/drm/renesas/rcar-du/rcar_du_drv.c
-f:drivers/gpu/drm/renesas/rcar-du/rcar_du_drv.h
-f:drivers/gpu/drm/renesas/rcar-du/rcar_du_encoder.c
-f:drivers/gpu/drm/renesas/rcar-du/rcar_du_encoder.h
-f:drivers/gpu/drm/renesas/rcar-du/rcar_du_group.c
-f:drivers/gpu/drm/renesas/rcar-du/rcar_du_group.h
-f:drivers/gpu/drm/renesas/rcar-du/rcar_du_kms.c
-f:drivers/gpu/drm/renesas/rcar-du/rcar_du_kms.h
-f:drivers/gpu/drm/renesas/rcar-du/rcar_du_plane.c
-f:drivers/gpu/drm/renesas/rcar-du/rcar_du_plane.h
-f:drivers/gpu/drm/renesas/rcar-du/rcar_du_regs.h
-f:drivers/gpu/drm/renesas/rcar-du/rcar_du_vsp.c
-f:drivers/gpu/drm/renesas/rcar-du/rcar_du_vsp.h
-f:drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c
-f:drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.h
-f:drivers/gpu/drm/renesas/rcar-du/rcar_dw_hdmi.c
-f:drivers/gpu/drm/renesas/rcar-du/rcar_lvds.c
-f:drivers/gpu/drm/renesas/rcar-du/rcar_lvds.h
-f:drivers/gpu/drm/renesas/rcar-du/rcar_lvds_regs.h
-f:drivers/gpu/drm/renesas/rcar-du/rcar_mipi_dsi.c
-f:drivers/gpu/drm/renesas/rcar-du/rcar_mipi_dsi.h
-f:drivers/gpu/drm/renesas/rcar-du/rcar_mipi_dsi_regs.h
-f:drivers/gpu/drm/renesas/rz-du/Kconfig
-f:drivers/gpu/drm/renesas/rz-du/Makefile
-f:drivers/gpu/drm/renesas/rz-du/rzg2l_du_crtc.c
-f:drivers/gpu/drm/renesas/rz-du/rzg2l_du_crtc.h
-f:drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c
-f:drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.h
-f:drivers/gpu/drm/renesas/rz-du/rzg2l_du_encoder.c
-f:drivers/gpu/drm/renesas/rz-du/rzg2l_du_encoder.h
-f:drivers/gpu/drm/renesas/rz-du/rzg2l_du_kms.c
-f:drivers/gpu/drm/renesas/rz-du/rzg2l_du_kms.h
-f:drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c
-f:drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h
-f:drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi.c
-f:drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi_regs.h
-f:drivers/gpu/drm/renesas/shmobile/Kconfig
-f:drivers/gpu/drm/renesas/shmobile/Makefile
-f:drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c
-f:drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h
-f:drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c
-f:drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.h
-f:drivers/gpu/drm/renesas/shmobile/shmob_drm_kms.c
-f:drivers/gpu/drm/renesas/shmobile/shmob_drm_kms.h
-f:drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c
-f:drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.h
-f:drivers/gpu/drm/renesas/shmobile/shmob_drm_regs.h
-f:drivers/gpu/drm/rockchip/Kconfig
-f:drivers/gpu/drm/rockchip/Makefile
-f:drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
-f:drivers/gpu/drm/rockchip/cdn-dp-core.c
-f:drivers/gpu/drm/rockchip/cdn-dp-core.h
-f:drivers/gpu/drm/rockchip/cdn-dp-reg.c
-f:drivers/gpu/drm/rockchip/cdn-dp-reg.h
-f:drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
-f:drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c
-f:drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
-f:drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c
-f:drivers/gpu/drm/rockchip/inno_hdmi.c
-f:drivers/gpu/drm/rockchip/rk3066_hdmi.c
-f:drivers/gpu/drm/rockchip/rk3066_hdmi.h
-f:drivers/gpu/drm/rockchip/rockchip_drm_drv.c
-f:drivers/gpu/drm/rockchip/rockchip_drm_drv.h
-f:drivers/gpu/drm/rockchip/rockchip_drm_fb.c
-f:drivers/gpu/drm/rockchip/rockchip_drm_fb.h
-f:drivers/gpu/drm/rockchip/rockchip_drm_gem.c
-f:drivers/gpu/drm/rockchip/rockchip_drm_gem.h
-f:drivers/gpu/drm/rockchip/rockchip_drm_vop.c
-f:drivers/gpu/drm/rockchip/rockchip_drm_vop.h
-f:drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
-f:drivers/gpu/drm/rockchip/rockchip_drm_vop2.h
-f:drivers/gpu/drm/rockchip/rockchip_lvds.c
-f:drivers/gpu/drm/rockchip/rockchip_lvds.h
-f:drivers/gpu/drm/rockchip/rockchip_rgb.c
-f:drivers/gpu/drm/rockchip/rockchip_rgb.h
-f:drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
-f:drivers/gpu/drm/rockchip/rockchip_vop_reg.c
-f:drivers/gpu/drm/rockchip/rockchip_vop_reg.h
-f:drivers/gpu/drm/scheduler/.kunitconfig
-f:drivers/gpu/drm/scheduler/Makefile
-f:drivers/gpu/drm/scheduler/gpu_scheduler_trace.h
-f:drivers/gpu/drm/scheduler/sched_entity.c
-f:drivers/gpu/drm/scheduler/sched_fence.c
-f:drivers/gpu/drm/scheduler/sched_internal.h
-f:drivers/gpu/drm/scheduler/sched_main.c
-f:drivers/gpu/drm/scheduler/tests/Makefile
-f:drivers/gpu/drm/scheduler/tests/mock_scheduler.c
-f:drivers/gpu/drm/scheduler/tests/sched_tests.h
-f:drivers/gpu/drm/scheduler/tests/tests_basic.c
-f:drivers/gpu/drm/sitronix/Kconfig
-f:drivers/gpu/drm/sitronix/Makefile
-f:drivers/gpu/drm/sitronix/st7571-i2c.c
-f:drivers/gpu/drm/sitronix/st7586.c
-f:drivers/gpu/drm/sitronix/st7735r.c
-f:drivers/gpu/drm/solomon/Kconfig
-f:drivers/gpu/drm/solomon/Makefile
-f:drivers/gpu/drm/solomon/ssd130x-i2c.c
-f:drivers/gpu/drm/solomon/ssd130x-spi.c
-f:drivers/gpu/drm/solomon/ssd130x.c
-f:drivers/gpu/drm/solomon/ssd130x.h
-f:drivers/gpu/drm/sprd/Kconfig
-f:drivers/gpu/drm/sprd/Makefile
-f:drivers/gpu/drm/sprd/megacores_pll.c
-f:drivers/gpu/drm/sprd/sprd_dpu.c
-f:drivers/gpu/drm/sprd/sprd_dpu.h
-f:drivers/gpu/drm/sprd/sprd_drm.c
-f:drivers/gpu/drm/sprd/sprd_drm.h
-f:drivers/gpu/drm/sprd/sprd_dsi.c
-f:drivers/gpu/drm/sprd/sprd_dsi.h
-f:drivers/gpu/drm/sti/Kconfig
-f:drivers/gpu/drm/sti/Makefile
-f:drivers/gpu/drm/sti/NOTES
-f:drivers/gpu/drm/sti/sti_awg_utils.c
-f:drivers/gpu/drm/sti/sti_awg_utils.h
-f:drivers/gpu/drm/sti/sti_compositor.c
-f:drivers/gpu/drm/sti/sti_compositor.h
-f:drivers/gpu/drm/sti/sti_crtc.c
-f:drivers/gpu/drm/sti/sti_crtc.h
-f:drivers/gpu/drm/sti/sti_cursor.c
-f:drivers/gpu/drm/sti/sti_cursor.h
-f:drivers/gpu/drm/sti/sti_drv.c
-f:drivers/gpu/drm/sti/sti_drv.h
-f:drivers/gpu/drm/sti/sti_dvo.c
-f:drivers/gpu/drm/sti/sti_gdp.c
-f:drivers/gpu/drm/sti/sti_gdp.h
-f:drivers/gpu/drm/sti/sti_hda.c
-f:drivers/gpu/drm/sti/sti_hdmi.c
-f:drivers/gpu/drm/sti/sti_hdmi.h
-f:drivers/gpu/drm/sti/sti_hdmi_tx3g4c28phy.c
-f:drivers/gpu/drm/sti/sti_hdmi_tx3g4c28phy.h
-f:drivers/gpu/drm/sti/sti_hqvdp.c
-f:drivers/gpu/drm/sti/sti_hqvdp_lut.h
-f:drivers/gpu/drm/sti/sti_mixer.c
-f:drivers/gpu/drm/sti/sti_mixer.h
-f:drivers/gpu/drm/sti/sti_plane.c
-f:drivers/gpu/drm/sti/sti_plane.h
-f:drivers/gpu/drm/sti/sti_tvout.c
-f:drivers/gpu/drm/sti/sti_vid.c
-f:drivers/gpu/drm/sti/sti_vid.h
-f:drivers/gpu/drm/sti/sti_vtg.c
-f:drivers/gpu/drm/sti/sti_vtg.h
-f:drivers/gpu/drm/stm/Kconfig
-f:drivers/gpu/drm/stm/Makefile
-f:drivers/gpu/drm/stm/drv.c
-f:drivers/gpu/drm/stm/dw_mipi_dsi-stm.c
-f:drivers/gpu/drm/stm/ltdc.c
-f:drivers/gpu/drm/stm/ltdc.h
-f:drivers/gpu/drm/stm/lvds.c
-f:drivers/gpu/drm/sun4i/Kconfig
-f:drivers/gpu/drm/sun4i/Makefile
-f:drivers/gpu/drm/sun4i/sun4i_backend.c
-f:drivers/gpu/drm/sun4i/sun4i_backend.h
-f:drivers/gpu/drm/sun4i/sun4i_crtc.c
-f:drivers/gpu/drm/sun4i/sun4i_crtc.h
-f:drivers/gpu/drm/sun4i/sun4i_drv.c
-f:drivers/gpu/drm/sun4i/sun4i_drv.h
-f:drivers/gpu/drm/sun4i/sun4i_framebuffer.c
-f:drivers/gpu/drm/sun4i/sun4i_framebuffer.h
-f:drivers/gpu/drm/sun4i/sun4i_frontend.c
-f:drivers/gpu/drm/sun4i/sun4i_frontend.h
-f:drivers/gpu/drm/sun4i/sun4i_hdmi.h
-f:drivers/gpu/drm/sun4i/sun4i_hdmi_ddc_clk.c
-f:drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
-f:drivers/gpu/drm/sun4i/sun4i_hdmi_i2c.c
-f:drivers/gpu/drm/sun4i/sun4i_hdmi_tmds_clk.c
-f:drivers/gpu/drm/sun4i/sun4i_layer.c
-f:drivers/gpu/drm/sun4i/sun4i_layer.h
-f:drivers/gpu/drm/sun4i/sun4i_lvds.c
-f:drivers/gpu/drm/sun4i/sun4i_lvds.h
-f:drivers/gpu/drm/sun4i/sun4i_rgb.c
-f:drivers/gpu/drm/sun4i/sun4i_rgb.h
-f:drivers/gpu/drm/sun4i/sun4i_tcon.c
-f:drivers/gpu/drm/sun4i/sun4i_tcon.h
-f:drivers/gpu/drm/sun4i/sun4i_tcon_dclk.c
-f:drivers/gpu/drm/sun4i/sun4i_tcon_dclk.h
-f:drivers/gpu/drm/sun4i/sun4i_tv.c
-f:drivers/gpu/drm/sun4i/sun6i_drc.c
-f:drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
-f:drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h
-f:drivers/gpu/drm/sun4i/sun8i_csc.c
-f:drivers/gpu/drm/sun4i/sun8i_csc.h
-f:drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c
-f:drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h
-f:drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c
-f:drivers/gpu/drm/sun4i/sun8i_hdmi_phy_clk.c
-f:drivers/gpu/drm/sun4i/sun8i_mixer.c
-f:drivers/gpu/drm/sun4i/sun8i_mixer.h
-f:drivers/gpu/drm/sun4i/sun8i_tcon_top.c
-f:drivers/gpu/drm/sun4i/sun8i_tcon_top.h
-f:drivers/gpu/drm/sun4i/sun8i_ui_layer.c
-f:drivers/gpu/drm/sun4i/sun8i_ui_layer.h
-f:drivers/gpu/drm/sun4i/sun8i_ui_scaler.c
-f:drivers/gpu/drm/sun4i/sun8i_ui_scaler.h
-f:drivers/gpu/drm/sun4i/sun8i_vi_layer.c
-f:drivers/gpu/drm/sun4i/sun8i_vi_layer.h
-f:drivers/gpu/drm/sun4i/sun8i_vi_scaler.c
-f:drivers/gpu/drm/sun4i/sun8i_vi_scaler.h
-f:drivers/gpu/drm/sun4i/sunxi_engine.h
-f:drivers/gpu/drm/sysfb/Kconfig
-f:drivers/gpu/drm/sysfb/Makefile
-f:drivers/gpu/drm/sysfb/drm_sysfb.c
-f:drivers/gpu/drm/sysfb/drm_sysfb_helper.h
-f:drivers/gpu/drm/sysfb/drm_sysfb_modeset.c
-f:drivers/gpu/drm/sysfb/drm_sysfb_screen_info.c
-f:drivers/gpu/drm/sysfb/efidrm.c
-f:drivers/gpu/drm/sysfb/ofdrm.c
-f:drivers/gpu/drm/sysfb/simpledrm.c
-f:drivers/gpu/drm/sysfb/vesadrm.c
-f:drivers/gpu/drm/tegra/Kconfig
-f:drivers/gpu/drm/tegra/Makefile
-f:drivers/gpu/drm/tegra/dc.c
-f:drivers/gpu/drm/tegra/dc.h
-f:drivers/gpu/drm/tegra/dp.c
-f:drivers/gpu/drm/tegra/dp.h
-f:drivers/gpu/drm/tegra/dpaux.c
-f:drivers/gpu/drm/tegra/dpaux.h
-f:drivers/gpu/drm/tegra/drm.c
-f:drivers/gpu/drm/tegra/drm.h
-f:drivers/gpu/drm/tegra/dsi.c
-f:drivers/gpu/drm/tegra/dsi.h
-f:drivers/gpu/drm/tegra/falcon.c
-f:drivers/gpu/drm/tegra/falcon.h
-f:drivers/gpu/drm/tegra/fb.c
-f:drivers/gpu/drm/tegra/fbdev.c
-f:drivers/gpu/drm/tegra/firewall.c
-f:drivers/gpu/drm/tegra/gem.c
-f:drivers/gpu/drm/tegra/gem.h
-f:drivers/gpu/drm/tegra/gr2d.c
-f:drivers/gpu/drm/tegra/gr2d.h
-f:drivers/gpu/drm/tegra/gr3d.c
-f:drivers/gpu/drm/tegra/gr3d.h
-f:drivers/gpu/drm/tegra/hda.c
-f:drivers/gpu/drm/tegra/hda.h
-f:drivers/gpu/drm/tegra/hdmi.c
-f:drivers/gpu/drm/tegra/hdmi.h
-f:drivers/gpu/drm/tegra/hub.c
-f:drivers/gpu/drm/tegra/hub.h
-f:drivers/gpu/drm/tegra/mipi-phy.c
-f:drivers/gpu/drm/tegra/mipi-phy.h
-f:drivers/gpu/drm/tegra/nvdec.c
-f:drivers/gpu/drm/tegra/output.c
-f:drivers/gpu/drm/tegra/plane.c
-f:drivers/gpu/drm/tegra/plane.h
-f:drivers/gpu/drm/tegra/rgb.c
-f:drivers/gpu/drm/tegra/riscv.c
-f:drivers/gpu/drm/tegra/riscv.h
-f:drivers/gpu/drm/tegra/sor.c
-f:drivers/gpu/drm/tegra/sor.h
-f:drivers/gpu/drm/tegra/submit.c
-f:drivers/gpu/drm/tegra/submit.h
-f:drivers/gpu/drm/tegra/trace.c
-f:drivers/gpu/drm/tegra/trace.h
-f:drivers/gpu/drm/tegra/uapi.c
-f:drivers/gpu/drm/tegra/uapi.h
-f:drivers/gpu/drm/tegra/vic.c
-f:drivers/gpu/drm/tegra/vic.h
-f:drivers/gpu/drm/tests/.kunitconfig
-f:drivers/gpu/drm/tests/Makefile
-f:drivers/gpu/drm/tests/drm_atomic_state_test.c
-f:drivers/gpu/drm/tests/drm_atomic_test.c
-f:drivers/gpu/drm/tests/drm_bridge_test.c
-f:drivers/gpu/drm/tests/drm_buddy_test.c
-f:drivers/gpu/drm/tests/drm_client_modeset_test.c
-f:drivers/gpu/drm/tests/drm_cmdline_parser_test.c
-f:drivers/gpu/drm/tests/drm_connector_test.c
-f:drivers/gpu/drm/tests/drm_damage_helper_test.c
-f:drivers/gpu/drm/tests/drm_dp_mst_helper_test.c
-f:drivers/gpu/drm/tests/drm_exec_test.c
-f:drivers/gpu/drm/tests/drm_format_helper_test.c
-f:drivers/gpu/drm/tests/drm_format_test.c
-f:drivers/gpu/drm/tests/drm_framebuffer_test.c
-f:drivers/gpu/drm/tests/drm_gem_shmem_test.c
-f:drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c
-f:drivers/gpu/drm/tests/drm_kunit_edid.h
-f:drivers/gpu/drm/tests/drm_kunit_helpers.c
-f:drivers/gpu/drm/tests/drm_managed_test.c
-f:drivers/gpu/drm/tests/drm_mm_test.c
-f:drivers/gpu/drm/tests/drm_modes_test.c
-f:drivers/gpu/drm/tests/drm_plane_helper_test.c
-f:drivers/gpu/drm/tests/drm_probe_helper_test.c
-f:drivers/gpu/drm/tests/drm_rect_test.c
-f:drivers/gpu/drm/tests/drm_sysfb_modeset_test.c
-f:drivers/gpu/drm/tidss/Kconfig
-f:drivers/gpu/drm/tidss/Makefile
-f:drivers/gpu/drm/tidss/tidss_crtc.c
-f:drivers/gpu/drm/tidss/tidss_crtc.h
-f:drivers/gpu/drm/tidss/tidss_dispc.c
-f:drivers/gpu/drm/tidss/tidss_dispc.h
-f:drivers/gpu/drm/tidss/tidss_dispc_regs.h
-f:drivers/gpu/drm/tidss/tidss_drv.c
-f:drivers/gpu/drm/tidss/tidss_drv.h
-f:drivers/gpu/drm/tidss/tidss_encoder.c
-f:drivers/gpu/drm/tidss/tidss_encoder.h
-f:drivers/gpu/drm/tidss/tidss_irq.c
-f:drivers/gpu/drm/tidss/tidss_irq.h
-f:drivers/gpu/drm/tidss/tidss_kms.c
-f:drivers/gpu/drm/tidss/tidss_kms.h
-f:drivers/gpu/drm/tidss/tidss_oldi.c
-f:drivers/gpu/drm/tidss/tidss_oldi.h
-f:drivers/gpu/drm/tidss/tidss_plane.c
-f:drivers/gpu/drm/tidss/tidss_plane.h
-f:drivers/gpu/drm/tidss/tidss_scale_coefs.c
-f:drivers/gpu/drm/tidss/tidss_scale_coefs.h
-f:drivers/gpu/drm/tilcdc/Kconfig
-f:drivers/gpu/drm/tilcdc/Makefile
-f:drivers/gpu/drm/tilcdc/tilcdc_crtc.c
-f:drivers/gpu/drm/tilcdc/tilcdc_drv.c
-f:drivers/gpu/drm/tilcdc/tilcdc_drv.h
-f:drivers/gpu/drm/tilcdc/tilcdc_external.c
-f:drivers/gpu/drm/tilcdc/tilcdc_external.h
-f:drivers/gpu/drm/tilcdc/tilcdc_panel.c
-f:drivers/gpu/drm/tilcdc/tilcdc_panel.h
-f:drivers/gpu/drm/tilcdc/tilcdc_plane.c
-f:drivers/gpu/drm/tilcdc/tilcdc_regs.h
-f:drivers/gpu/drm/tiny/Kconfig
-f:drivers/gpu/drm/tiny/Makefile
-f:drivers/gpu/drm/tiny/appletbdrm.c
-f:drivers/gpu/drm/tiny/arcpgu.c
-f:drivers/gpu/drm/tiny/bochs.c
-f:drivers/gpu/drm/tiny/cirrus-qemu.c
-f:drivers/gpu/drm/tiny/gm12u320.c
-f:drivers/gpu/drm/tiny/hx8357d.c
-f:drivers/gpu/drm/tiny/ili9163.c
-f:drivers/gpu/drm/tiny/ili9225.c
-f:drivers/gpu/drm/tiny/ili9341.c
-f:drivers/gpu/drm/tiny/ili9486.c
-f:drivers/gpu/drm/tiny/mi0283qt.c
-f:drivers/gpu/drm/tiny/panel-mipi-dbi.c
-f:drivers/gpu/drm/tiny/repaper.c
-f:drivers/gpu/drm/tiny/sharp-memory.c
-f:drivers/gpu/drm/ttm/Makefile
-f:drivers/gpu/drm/ttm/tests/.kunitconfig
-f:drivers/gpu/drm/ttm/tests/Makefile
-f:drivers/gpu/drm/ttm/tests/TODO
-f:drivers/gpu/drm/ttm/tests/ttm_bo_test.c
-f:drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c
-f:drivers/gpu/drm/ttm/tests/ttm_device_test.c
-f:drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c
-f:drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.h
-f:drivers/gpu/drm/ttm/tests/ttm_mock_manager.c
-f:drivers/gpu/drm/ttm/tests/ttm_mock_manager.h
-f:drivers/gpu/drm/ttm/tests/ttm_pool_test.c
-f:drivers/gpu/drm/ttm/tests/ttm_resource_test.c
-f:drivers/gpu/drm/ttm/tests/ttm_tt_test.c
-f:drivers/gpu/drm/ttm/ttm_agp_backend.c
-f:drivers/gpu/drm/ttm/ttm_backup.c
-f:drivers/gpu/drm/ttm/ttm_bo.c
-f:drivers/gpu/drm/ttm/ttm_bo_internal.h
-f:drivers/gpu/drm/ttm/ttm_bo_util.c
-f:drivers/gpu/drm/ttm/ttm_bo_vm.c
-f:drivers/gpu/drm/ttm/ttm_device.c
-f:drivers/gpu/drm/ttm/ttm_execbuf_util.c
-f:drivers/gpu/drm/ttm/ttm_module.c
-f:drivers/gpu/drm/ttm/ttm_module.h
-f:drivers/gpu/drm/ttm/ttm_pool.c
-f:drivers/gpu/drm/ttm/ttm_range_manager.c
-f:drivers/gpu/drm/ttm/ttm_resource.c
-f:drivers/gpu/drm/ttm/ttm_sys_manager.c
-f:drivers/gpu/drm/ttm/ttm_tt.c
-f:drivers/gpu/drm/tve200/Kconfig
-f:drivers/gpu/drm/tve200/Makefile
-f:drivers/gpu/drm/tve200/tve200_display.c
-f:drivers/gpu/drm/tve200/tve200_drm.h
-f:drivers/gpu/drm/tve200/tve200_drv.c
-f:drivers/gpu/drm/udl/Kconfig
-f:drivers/gpu/drm/udl/Makefile
-f:drivers/gpu/drm/udl/udl_drv.c
-f:drivers/gpu/drm/udl/udl_drv.h
-f:drivers/gpu/drm/udl/udl_edid.c
-f:drivers/gpu/drm/udl/udl_edid.h
-f:drivers/gpu/drm/udl/udl_main.c
-f:drivers/gpu/drm/udl/udl_modeset.c
-f:drivers/gpu/drm/udl/udl_proto.h
-f:drivers/gpu/drm/udl/udl_transfer.c
-f:drivers/gpu/drm/v3d/Kconfig
-f:drivers/gpu/drm/v3d/Makefile
-f:drivers/gpu/drm/v3d/v3d_bo.c
-f:drivers/gpu/drm/v3d/v3d_debugfs.c
-f:drivers/gpu/drm/v3d/v3d_drv.c
-f:drivers/gpu/drm/v3d/v3d_drv.h
-f:drivers/gpu/drm/v3d/v3d_fence.c
-f:drivers/gpu/drm/v3d/v3d_gem.c
-f:drivers/gpu/drm/v3d/v3d_gemfs.c
-f:drivers/gpu/drm/v3d/v3d_irq.c
-f:drivers/gpu/drm/v3d/v3d_mmu.c
-f:drivers/gpu/drm/v3d/v3d_perfmon.c
-f:drivers/gpu/drm/v3d/v3d_performance_counters.h
-f:drivers/gpu/drm/v3d/v3d_regs.h
-f:drivers/gpu/drm/v3d/v3d_sched.c
-f:drivers/gpu/drm/v3d/v3d_submit.c
-f:drivers/gpu/drm/v3d/v3d_sysfs.c
-f:drivers/gpu/drm/v3d/v3d_trace.h
-f:drivers/gpu/drm/v3d/v3d_trace_points.c
-f:drivers/gpu/drm/vboxvideo/Kconfig
-f:drivers/gpu/drm/vboxvideo/Makefile
-f:drivers/gpu/drm/vboxvideo/hgsmi_base.c
-f:drivers/gpu/drm/vboxvideo/hgsmi_ch_setup.h
-f:drivers/gpu/drm/vboxvideo/hgsmi_channels.h
-f:drivers/gpu/drm/vboxvideo/hgsmi_defs.h
-f:drivers/gpu/drm/vboxvideo/modesetting.c
-f:drivers/gpu/drm/vboxvideo/vbox_drv.c
-f:drivers/gpu/drm/vboxvideo/vbox_drv.h
-f:drivers/gpu/drm/vboxvideo/vbox_hgsmi.c
-f:drivers/gpu/drm/vboxvideo/vbox_irq.c
-f:drivers/gpu/drm/vboxvideo/vbox_main.c
-f:drivers/gpu/drm/vboxvideo/vbox_mode.c
-f:drivers/gpu/drm/vboxvideo/vbox_ttm.c
-f:drivers/gpu/drm/vboxvideo/vboxvideo.h
-f:drivers/gpu/drm/vboxvideo/vboxvideo_guest.h
-f:drivers/gpu/drm/vboxvideo/vboxvideo_vbe.h
-f:drivers/gpu/drm/vboxvideo/vbva_base.c
-f:drivers/gpu/drm/vc4/Kconfig
-f:drivers/gpu/drm/vc4/Makefile
-f:drivers/gpu/drm/vc4/tests/.kunitconfig
-f:drivers/gpu/drm/vc4/tests/vc4_mock.c
-f:drivers/gpu/drm/vc4/tests/vc4_mock.h
-f:drivers/gpu/drm/vc4/tests/vc4_mock_crtc.c
-f:drivers/gpu/drm/vc4/tests/vc4_mock_output.c
-f:drivers/gpu/drm/vc4/tests/vc4_mock_plane.c
-f:drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c
-f:drivers/gpu/drm/vc4/vc4_bo.c
-f:drivers/gpu/drm/vc4/vc4_crtc.c
-f:drivers/gpu/drm/vc4/vc4_debugfs.c
-f:drivers/gpu/drm/vc4/vc4_dpi.c
-f:drivers/gpu/drm/vc4/vc4_drv.c
-f:drivers/gpu/drm/vc4/vc4_drv.h
-f:drivers/gpu/drm/vc4/vc4_dsi.c
-f:drivers/gpu/drm/vc4/vc4_fence.c
-f:drivers/gpu/drm/vc4/vc4_gem.c
-f:drivers/gpu/drm/vc4/vc4_hdmi.c
-f:drivers/gpu/drm/vc4/vc4_hdmi.h
-f:drivers/gpu/drm/vc4/vc4_hdmi_phy.c
-f:drivers/gpu/drm/vc4/vc4_hdmi_regs.h
-f:drivers/gpu/drm/vc4/vc4_hvs.c
-f:drivers/gpu/drm/vc4/vc4_irq.c
-f:drivers/gpu/drm/vc4/vc4_kms.c
-f:drivers/gpu/drm/vc4/vc4_packet.h
-f:drivers/gpu/drm/vc4/vc4_perfmon.c
-f:drivers/gpu/drm/vc4/vc4_plane.c
-f:drivers/gpu/drm/vc4/vc4_qpu_defines.h
-f:drivers/gpu/drm/vc4/vc4_regs.h
-f:drivers/gpu/drm/vc4/vc4_render_cl.c
-f:drivers/gpu/drm/vc4/vc4_trace.h
-f:drivers/gpu/drm/vc4/vc4_trace_points.c
-f:drivers/gpu/drm/vc4/vc4_txp.c
-f:drivers/gpu/drm/vc4/vc4_v3d.c
-f:drivers/gpu/drm/vc4/vc4_validate.c
-f:drivers/gpu/drm/vc4/vc4_validate_shaders.c
-f:drivers/gpu/drm/vc4/vc4_vec.c
-f:drivers/gpu/drm/vgem/Makefile
-f:drivers/gpu/drm/vgem/vgem_drv.c
-f:drivers/gpu/drm/vgem/vgem_drv.h
-f:drivers/gpu/drm/vgem/vgem_fence.c
-f:drivers/gpu/drm/virtio/Kconfig
-f:drivers/gpu/drm/virtio/Makefile
-f:drivers/gpu/drm/virtio/virtgpu_debugfs.c
-f:drivers/gpu/drm/virtio/virtgpu_display.c
-f:drivers/gpu/drm/virtio/virtgpu_drv.c
-f:drivers/gpu/drm/virtio/virtgpu_drv.h
-f:drivers/gpu/drm/virtio/virtgpu_fence.c
-f:drivers/gpu/drm/virtio/virtgpu_gem.c
-f:drivers/gpu/drm/virtio/virtgpu_ioctl.c
-f:drivers/gpu/drm/virtio/virtgpu_kms.c
-f:drivers/gpu/drm/virtio/virtgpu_object.c
-f:drivers/gpu/drm/virtio/virtgpu_plane.c
-f:drivers/gpu/drm/virtio/virtgpu_prime.c
-f:drivers/gpu/drm/virtio/virtgpu_submit.c
-f:drivers/gpu/drm/virtio/virtgpu_trace.h
-f:drivers/gpu/drm/virtio/virtgpu_trace_points.c
-f:drivers/gpu/drm/virtio/virtgpu_vq.c
-f:drivers/gpu/drm/virtio/virtgpu_vram.c
-f:drivers/gpu/drm/vkms/Kconfig
-f:drivers/gpu/drm/vkms/Makefile
-f:drivers/gpu/drm/vkms/tests/.kunitconfig
-f:drivers/gpu/drm/vkms/tests/Makefile
-f:drivers/gpu/drm/vkms/tests/vkms_config_test.c
-f:drivers/gpu/drm/vkms/tests/vkms_format_test.c
-f:drivers/gpu/drm/vkms/vkms_composer.c
-f:drivers/gpu/drm/vkms/vkms_config.c
-f:drivers/gpu/drm/vkms/vkms_config.h
-f:drivers/gpu/drm/vkms/vkms_connector.c
-f:drivers/gpu/drm/vkms/vkms_connector.h
-f:drivers/gpu/drm/vkms/vkms_crtc.c
-f:drivers/gpu/drm/vkms/vkms_drv.c
-f:drivers/gpu/drm/vkms/vkms_drv.h
-f:drivers/gpu/drm/vkms/vkms_formats.c
-f:drivers/gpu/drm/vkms/vkms_formats.h
-f:drivers/gpu/drm/vkms/vkms_output.c
-f:drivers/gpu/drm/vkms/vkms_plane.c
-f:drivers/gpu/drm/vkms/vkms_writeback.c
-f:drivers/gpu/drm/vmwgfx/Kconfig
-f:drivers/gpu/drm/vmwgfx/Makefile
-f:drivers/gpu/drm/vmwgfx/device_include/svga3d_cmd.h
-f:drivers/gpu/drm/vmwgfx/device_include/svga3d_devcaps.h
-f:drivers/gpu/drm/vmwgfx/device_include/svga3d_dx.h
-f:drivers/gpu/drm/vmwgfx/device_include/svga3d_limits.h
-f:drivers/gpu/drm/vmwgfx/device_include/svga3d_reg.h
-f:drivers/gpu/drm/vmwgfx/device_include/svga3d_surfacedefs.h
-f:drivers/gpu/drm/vmwgfx/device_include/svga3d_types.h
-f:drivers/gpu/drm/vmwgfx/device_include/svga_escape.h
-f:drivers/gpu/drm/vmwgfx/device_include/svga_overlay.h
-f:drivers/gpu/drm/vmwgfx/device_include/svga_reg.h
-f:drivers/gpu/drm/vmwgfx/device_include/vm_basic_types.h
-f:drivers/gpu/drm/vmwgfx/ttm_object.c
-f:drivers/gpu/drm/vmwgfx/ttm_object.h
-f:drivers/gpu/drm/vmwgfx/vmw_surface_cache.h
-f:drivers/gpu/drm/vmwgfx/vmwgfx_binding.c
-f:drivers/gpu/drm/vmwgfx/vmwgfx_binding.h
-f:drivers/gpu/drm/vmwgfx/vmwgfx_blit.c
-f:drivers/gpu/drm/vmwgfx/vmwgfx_bo.c
-f:drivers/gpu/drm/vmwgfx/vmwgfx_bo.h
-f:drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c
-f:drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c
-f:drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c
-f:drivers/gpu/drm/vmwgfx/vmwgfx_context.c
-f:drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c
-f:drivers/gpu/drm/vmwgfx/vmwgfx_cursor_plane.c
-f:drivers/gpu/drm/vmwgfx/vmwgfx_cursor_plane.h
-f:drivers/gpu/drm/vmwgfx/vmwgfx_devcaps.c
-f:drivers/gpu/drm/vmwgfx/vmwgfx_devcaps.h
-f:drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
-f:drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
-f:drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
-f:drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
-f:drivers/gpu/drm/vmwgfx/vmwgfx_fence.h
-f:drivers/gpu/drm/vmwgfx/vmwgfx_gem.c
-f:drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c
-f:drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
-f:drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
-f:drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
-f:drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
-f:drivers/gpu/drm/vmwgfx/vmwgfx_kms.h
-f:drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
-f:drivers/gpu/drm/vmwgfx/vmwgfx_mksstat.h
-f:drivers/gpu/drm/vmwgfx/vmwgfx_mob.c
-f:drivers/gpu/drm/vmwgfx/vmwgfx_msg.c
-f:drivers/gpu/drm/vmwgfx/vmwgfx_msg_arm64.h
-f:drivers/gpu/drm/vmwgfx/vmwgfx_msg_x86.h
-f:drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c
-f:drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c
-f:drivers/gpu/drm/vmwgfx/vmwgfx_prime.c
-f:drivers/gpu/drm/vmwgfx/vmwgfx_reg.h
-f:drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
-f:drivers/gpu/drm/vmwgfx/vmwgfx_resource_priv.h
-f:drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
-f:drivers/gpu/drm/vmwgfx/vmwgfx_shader.c
-f:drivers/gpu/drm/vmwgfx/vmwgfx_simple_resource.c
-f:drivers/gpu/drm/vmwgfx/vmwgfx_so.c
-f:drivers/gpu/drm/vmwgfx/vmwgfx_so.h
-f:drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
-f:drivers/gpu/drm/vmwgfx/vmwgfx_streamoutput.c
-f:drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
-f:drivers/gpu/drm/vmwgfx/vmwgfx_system_manager.c
-f:drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
-f:drivers/gpu/drm/vmwgfx/vmwgfx_va.c
-f:drivers/gpu/drm/vmwgfx/vmwgfx_validation.c
-f:drivers/gpu/drm/vmwgfx/vmwgfx_validation.h
-f:drivers/gpu/drm/vmwgfx/vmwgfx_vkms.c
-f:drivers/gpu/drm/vmwgfx/vmwgfx_vkms.h
-f:drivers/gpu/drm/xe/.gitignore
-f:drivers/gpu/drm/xe/.kunitconfig
-f:drivers/gpu/drm/xe/Kconfig
-f:drivers/gpu/drm/xe/Kconfig.debug
-f:drivers/gpu/drm/xe/Kconfig.profile
-f:drivers/gpu/drm/xe/Makefile
-f:drivers/gpu/drm/xe/abi/gsc_command_header_abi.h
-f:drivers/gpu/drm/xe/abi/gsc_mkhi_commands_abi.h
-f:drivers/gpu/drm/xe/abi/gsc_proxy_commands_abi.h
-f:drivers/gpu/drm/xe/abi/gsc_pxp_commands_abi.h
-f:drivers/gpu/drm/xe/abi/guc_actions_abi.h
-f:drivers/gpu/drm/xe/abi/guc_actions_slpc_abi.h
-f:drivers/gpu/drm/xe/abi/guc_actions_sriov_abi.h
-f:drivers/gpu/drm/xe/abi/guc_capture_abi.h
-f:drivers/gpu/drm/xe/abi/guc_communication_ctb_abi.h
-f:drivers/gpu/drm/xe/abi/guc_communication_mmio_abi.h
-f:drivers/gpu/drm/xe/abi/guc_errors_abi.h
-f:drivers/gpu/drm/xe/abi/guc_klvs_abi.h
-f:drivers/gpu/drm/xe/abi/guc_log_abi.h
-f:drivers/gpu/drm/xe/abi/guc_messages_abi.h
-f:drivers/gpu/drm/xe/abi/guc_relay_actions_abi.h
-f:drivers/gpu/drm/xe/abi/guc_relay_communication_abi.h
-f:drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_object.h
-f:drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_stolen.h
-f:drivers/gpu/drm/xe/compat-i915-headers/gt/intel_gt_types.h
-f:drivers/gpu/drm/xe/compat-i915-headers/i915_active.h
-f:drivers/gpu/drm/xe/compat-i915-headers/i915_active_types.h
-f:drivers/gpu/drm/xe/compat-i915-headers/i915_config.h
-f:drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
-f:drivers/gpu/drm/xe/compat-i915-headers/i915_gtt_view_types.h
-f:drivers/gpu/drm/xe/compat-i915-headers/i915_irq.h
-f:drivers/gpu/drm/xe/compat-i915-headers/i915_reg.h
-f:drivers/gpu/drm/xe/compat-i915-headers/i915_reg_defs.h
-f:drivers/gpu/drm/xe/compat-i915-headers/i915_scheduler_types.h
-f:drivers/gpu/drm/xe/compat-i915-headers/i915_utils.h
-f:drivers/gpu/drm/xe/compat-i915-headers/i915_vgpu.h
-f:drivers/gpu/drm/xe/compat-i915-headers/i915_vma.h
-f:drivers/gpu/drm/xe/compat-i915-headers/intel_clock_gating.h
-f:drivers/gpu/drm/xe/compat-i915-headers/intel_mchbar_regs.h
-f:drivers/gpu/drm/xe/compat-i915-headers/intel_pci_config.h
-f:drivers/gpu/drm/xe/compat-i915-headers/intel_pcode.h
-f:drivers/gpu/drm/xe/compat-i915-headers/intel_step.h
-f:drivers/gpu/drm/xe/compat-i915-headers/intel_uncore.h
-f:drivers/gpu/drm/xe/compat-i915-headers/intel_uncore_trace.h
-f:drivers/gpu/drm/xe/compat-i915-headers/intel_wakeref.h
-f:drivers/gpu/drm/xe/compat-i915-headers/pxp/intel_pxp.h
-f:drivers/gpu/drm/xe/compat-i915-headers/soc/intel_dram.h
-f:drivers/gpu/drm/xe/compat-i915-headers/soc/intel_gmch.h
-f:drivers/gpu/drm/xe/compat-i915-headers/soc/intel_rom.h
-f:drivers/gpu/drm/xe/compat-i915-headers/vlv_iosf_sb.h
-f:drivers/gpu/drm/xe/compat-i915-headers/vlv_iosf_sb_reg.h
-f:drivers/gpu/drm/xe/display/ext/i915_irq.c
-f:drivers/gpu/drm/xe/display/ext/i915_utils.c
-f:drivers/gpu/drm/xe/display/intel_bo.c
-f:drivers/gpu/drm/xe/display/intel_fb_bo.c
-f:drivers/gpu/drm/xe/display/intel_fbdev_fb.c
-f:drivers/gpu/drm/xe/display/xe_display.c
-f:drivers/gpu/drm/xe/display/xe_display.h
-f:drivers/gpu/drm/xe/display/xe_display_misc.c
-f:drivers/gpu/drm/xe/display/xe_display_rpm.c
-f:drivers/gpu/drm/xe/display/xe_display_wa.c
-f:drivers/gpu/drm/xe/display/xe_dsb_buffer.c
-f:drivers/gpu/drm/xe/display/xe_fb_pin.c
-f:drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
-f:drivers/gpu/drm/xe/display/xe_plane_initial.c
-f:drivers/gpu/drm/xe/display/xe_tdf.c
-f:drivers/gpu/drm/xe/instructions/xe_alu_commands.h
-f:drivers/gpu/drm/xe/instructions/xe_gfx_state_commands.h
-f:drivers/gpu/drm/xe/instructions/xe_gfxpipe_commands.h
-f:drivers/gpu/drm/xe/instructions/xe_gpu_commands.h
-f:drivers/gpu/drm/xe/instructions/xe_gsc_commands.h
-f:drivers/gpu/drm/xe/instructions/xe_instr_defs.h
-f:drivers/gpu/drm/xe/instructions/xe_mfx_commands.h
-f:drivers/gpu/drm/xe/instructions/xe_mi_commands.h
-f:drivers/gpu/drm/xe/regs/xe_bars.h
-f:drivers/gpu/drm/xe/regs/xe_engine_regs.h
-f:drivers/gpu/drm/xe/regs/xe_eu_stall_regs.h
-f:drivers/gpu/drm/xe/regs/xe_gsc_regs.h
-f:drivers/gpu/drm/xe/regs/xe_gt_regs.h
-f:drivers/gpu/drm/xe/regs/xe_gtt_defs.h
-f:drivers/gpu/drm/xe/regs/xe_guc_regs.h
-f:drivers/gpu/drm/xe/regs/xe_i2c_regs.h
-f:drivers/gpu/drm/xe/regs/xe_irq_regs.h
-f:drivers/gpu/drm/xe/regs/xe_lrc_layout.h
-f:drivers/gpu/drm/xe/regs/xe_mchbar_regs.h
-f:drivers/gpu/drm/xe/regs/xe_oa_regs.h
-f:drivers/gpu/drm/xe/regs/xe_pcode_regs.h
-f:drivers/gpu/drm/xe/regs/xe_pmt.h
-f:drivers/gpu/drm/xe/regs/xe_pxp_regs.h
-f:drivers/gpu/drm/xe/regs/xe_reg_defs.h
-f:drivers/gpu/drm/xe/regs/xe_regs.h
-f:drivers/gpu/drm/xe/tests/Makefile
-f:drivers/gpu/drm/xe/tests/xe_args_test.c
-f:drivers/gpu/drm/xe/tests/xe_bo.c
-f:drivers/gpu/drm/xe/tests/xe_dma_buf.c
-f:drivers/gpu/drm/xe/tests/xe_guc_buf_kunit.c
-f:drivers/gpu/drm/xe/tests/xe_guc_db_mgr_test.c
-f:drivers/gpu/drm/xe/tests/xe_guc_id_mgr_test.c
-f:drivers/gpu/drm/xe/tests/xe_guc_relay_test.c
-f:drivers/gpu/drm/xe/tests/xe_kunit_helpers.c
-f:drivers/gpu/drm/xe/tests/xe_kunit_helpers.h
-f:drivers/gpu/drm/xe/tests/xe_live_test_mod.c
-f:drivers/gpu/drm/xe/tests/xe_lmtt_test.c
-f:drivers/gpu/drm/xe/tests/xe_migrate.c
-f:drivers/gpu/drm/xe/tests/xe_mocs.c
-f:drivers/gpu/drm/xe/tests/xe_pci.c
-f:drivers/gpu/drm/xe/tests/xe_pci_test.c
-f:drivers/gpu/drm/xe/tests/xe_pci_test.h
-f:drivers/gpu/drm/xe/tests/xe_rtp_test.c
-f:drivers/gpu/drm/xe/tests/xe_sriov_pf_service_kunit.c
-f:drivers/gpu/drm/xe/tests/xe_test.h
-f:drivers/gpu/drm/xe/tests/xe_test_mod.c
-f:drivers/gpu/drm/xe/tests/xe_wa_test.c
-f:drivers/gpu/drm/xe/xe_args.h
-f:drivers/gpu/drm/xe/xe_assert.h
-f:drivers/gpu/drm/xe/xe_bb.c
-f:drivers/gpu/drm/xe/xe_bb.h
-f:drivers/gpu/drm/xe/xe_bb_types.h
-f:drivers/gpu/drm/xe/xe_bo.c
-f:drivers/gpu/drm/xe/xe_bo.h
-f:drivers/gpu/drm/xe/xe_bo_doc.h
-f:drivers/gpu/drm/xe/xe_bo_evict.c
-f:drivers/gpu/drm/xe/xe_bo_evict.h
-f:drivers/gpu/drm/xe/xe_bo_types.h
-f:drivers/gpu/drm/xe/xe_configfs.c
-f:drivers/gpu/drm/xe/xe_configfs.h
-f:drivers/gpu/drm/xe/xe_debugfs.c
-f:drivers/gpu/drm/xe/xe_debugfs.h
-f:drivers/gpu/drm/xe/xe_devcoredump.c
-f:drivers/gpu/drm/xe/xe_devcoredump.h
-f:drivers/gpu/drm/xe/xe_devcoredump_types.h
-f:drivers/gpu/drm/xe/xe_device.c
-f:drivers/gpu/drm/xe/xe_device.h
-f:drivers/gpu/drm/xe/xe_device_sysfs.c
-f:drivers/gpu/drm/xe/xe_device_sysfs.h
-f:drivers/gpu/drm/xe/xe_device_types.h
-f:drivers/gpu/drm/xe/xe_device_wa_oob.rules
-f:drivers/gpu/drm/xe/xe_dma_buf.c
-f:drivers/gpu/drm/xe/xe_dma_buf.h
-f:drivers/gpu/drm/xe/xe_drm_client.c
-f:drivers/gpu/drm/xe/xe_drm_client.h
-f:drivers/gpu/drm/xe/xe_drv.h
-f:drivers/gpu/drm/xe/xe_eu_stall.c
-f:drivers/gpu/drm/xe/xe_eu_stall.h
-f:drivers/gpu/drm/xe/xe_exec.c
-f:drivers/gpu/drm/xe/xe_exec.h
-f:drivers/gpu/drm/xe/xe_exec_queue.c
-f:drivers/gpu/drm/xe/xe_exec_queue.h
-f:drivers/gpu/drm/xe/xe_exec_queue_types.h
-f:drivers/gpu/drm/xe/xe_execlist.c
-f:drivers/gpu/drm/xe/xe_execlist.h
-f:drivers/gpu/drm/xe/xe_execlist_types.h
-f:drivers/gpu/drm/xe/xe_force_wake.c
-f:drivers/gpu/drm/xe/xe_force_wake.h
-f:drivers/gpu/drm/xe/xe_force_wake_types.h
-f:drivers/gpu/drm/xe/xe_gen_wa_oob.c
-f:drivers/gpu/drm/xe/xe_ggtt.c
-f:drivers/gpu/drm/xe/xe_ggtt.h
-f:drivers/gpu/drm/xe/xe_ggtt_types.h
-f:drivers/gpu/drm/xe/xe_gpu_scheduler.c
-f:drivers/gpu/drm/xe/xe_gpu_scheduler.h
-f:drivers/gpu/drm/xe/xe_gpu_scheduler_types.h
-f:drivers/gpu/drm/xe/xe_gsc.c
-f:drivers/gpu/drm/xe/xe_gsc.h
-f:drivers/gpu/drm/xe/xe_gsc_debugfs.c
-f:drivers/gpu/drm/xe/xe_gsc_debugfs.h
-f:drivers/gpu/drm/xe/xe_gsc_proxy.c
-f:drivers/gpu/drm/xe/xe_gsc_proxy.h
-f:drivers/gpu/drm/xe/xe_gsc_submit.c
-f:drivers/gpu/drm/xe/xe_gsc_submit.h
-f:drivers/gpu/drm/xe/xe_gsc_types.h
-f:drivers/gpu/drm/xe/xe_gt.c
-f:drivers/gpu/drm/xe/xe_gt.h
-f:drivers/gpu/drm/xe/xe_gt_ccs_mode.c
-f:drivers/gpu/drm/xe/xe_gt_ccs_mode.h
-f:drivers/gpu/drm/xe/xe_gt_clock.c
-f:drivers/gpu/drm/xe/xe_gt_clock.h
-f:drivers/gpu/drm/xe/xe_gt_debugfs.c
-f:drivers/gpu/drm/xe/xe_gt_debugfs.h
-f:drivers/gpu/drm/xe/xe_gt_freq.c
-f:drivers/gpu/drm/xe/xe_gt_freq.h
-f:drivers/gpu/drm/xe/xe_gt_idle.c
-f:drivers/gpu/drm/xe/xe_gt_idle.h
-f:drivers/gpu/drm/xe/xe_gt_idle_types.h
-f:drivers/gpu/drm/xe/xe_gt_mcr.c
-f:drivers/gpu/drm/xe/xe_gt_mcr.h
-f:drivers/gpu/drm/xe/xe_gt_pagefault.c
-f:drivers/gpu/drm/xe/xe_gt_pagefault.h
-f:drivers/gpu/drm/xe/xe_gt_printk.h
-f:drivers/gpu/drm/xe/xe_gt_sriov_pf.c
-f:drivers/gpu/drm/xe/xe_gt_sriov_pf.h
-f:drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c
-f:drivers/gpu/drm/xe/xe_gt_sriov_pf_config.h
-f:drivers/gpu/drm/xe/xe_gt_sriov_pf_config_types.h
-f:drivers/gpu/drm/xe/xe_gt_sriov_pf_control.c
-f:drivers/gpu/drm/xe/xe_gt_sriov_pf_control.h
-f:drivers/gpu/drm/xe/xe_gt_sriov_pf_control_types.h
-f:drivers/gpu/drm/xe/xe_gt_sriov_pf_debugfs.c
-f:drivers/gpu/drm/xe/xe_gt_sriov_pf_debugfs.h
-f:drivers/gpu/drm/xe/xe_gt_sriov_pf_helpers.h
-f:drivers/gpu/drm/xe/xe_gt_sriov_pf_migration.c
-f:drivers/gpu/drm/xe/xe_gt_sriov_pf_migration.h
-f:drivers/gpu/drm/xe/xe_gt_sriov_pf_migration_types.h
-f:drivers/gpu/drm/xe/xe_gt_sriov_pf_monitor.c
-f:drivers/gpu/drm/xe/xe_gt_sriov_pf_monitor.h
-f:drivers/gpu/drm/xe/xe_gt_sriov_pf_monitor_types.h
-f:drivers/gpu/drm/xe/xe_gt_sriov_pf_policy.c
-f:drivers/gpu/drm/xe/xe_gt_sriov_pf_policy.h
-f:drivers/gpu/drm/xe/xe_gt_sriov_pf_policy_types.h
-f:drivers/gpu/drm/xe/xe_gt_sriov_pf_service.c
-f:drivers/gpu/drm/xe/xe_gt_sriov_pf_service.h
-f:drivers/gpu/drm/xe/xe_gt_sriov_pf_service_types.h
-f:drivers/gpu/drm/xe/xe_gt_sriov_pf_types.h
-f:drivers/gpu/drm/xe/xe_gt_sriov_printk.h
-f:drivers/gpu/drm/xe/xe_gt_sriov_vf.c
-f:drivers/gpu/drm/xe/xe_gt_sriov_vf.h
-f:drivers/gpu/drm/xe/xe_gt_sriov_vf_debugfs.c
-f:drivers/gpu/drm/xe/xe_gt_sriov_vf_debugfs.h
-f:drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h
-f:drivers/gpu/drm/xe/xe_gt_stats.c
-f:drivers/gpu/drm/xe/xe_gt_stats.h
-f:drivers/gpu/drm/xe/xe_gt_stats_types.h
-f:drivers/gpu/drm/xe/xe_gt_sysfs.c
-f:drivers/gpu/drm/xe/xe_gt_sysfs.h
-f:drivers/gpu/drm/xe/xe_gt_sysfs_types.h
-f:drivers/gpu/drm/xe/xe_gt_throttle.c
-f:drivers/gpu/drm/xe/xe_gt_throttle.h
-f:drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c
-f:drivers/gpu/drm/xe/xe_gt_tlb_invalidation.h
-f:drivers/gpu/drm/xe/xe_gt_tlb_invalidation_types.h
-f:drivers/gpu/drm/xe/xe_gt_topology.c
-f:drivers/gpu/drm/xe/xe_gt_topology.h
-f:drivers/gpu/drm/xe/xe_gt_types.h
-f:drivers/gpu/drm/xe/xe_guc.c
-f:drivers/gpu/drm/xe/xe_guc.h
-f:drivers/gpu/drm/xe/xe_guc_ads.c
-f:drivers/gpu/drm/xe/xe_guc_ads.h
-f:drivers/gpu/drm/xe/xe_guc_ads_types.h
-f:drivers/gpu/drm/xe/xe_guc_buf.c
-f:drivers/gpu/drm/xe/xe_guc_buf.h
-f:drivers/gpu/drm/xe/xe_guc_buf_types.h
-f:drivers/gpu/drm/xe/xe_guc_capture.c
-f:drivers/gpu/drm/xe/xe_guc_capture.h
-f:drivers/gpu/drm/xe/xe_guc_capture_types.h
-f:drivers/gpu/drm/xe/xe_guc_ct.c
-f:drivers/gpu/drm/xe/xe_guc_ct.h
-f:drivers/gpu/drm/xe/xe_guc_ct_types.h
-f:drivers/gpu/drm/xe/xe_guc_db_mgr.c
-f:drivers/gpu/drm/xe/xe_guc_db_mgr.h
-f:drivers/gpu/drm/xe/xe_guc_debugfs.c
-f:drivers/gpu/drm/xe/xe_guc_debugfs.h
-f:drivers/gpu/drm/xe/xe_guc_engine_activity.c
-f:drivers/gpu/drm/xe/xe_guc_engine_activity.h
-f:drivers/gpu/drm/xe/xe_guc_engine_activity_types.h
-f:drivers/gpu/drm/xe/xe_guc_exec_queue_types.h
-f:drivers/gpu/drm/xe/xe_guc_fwif.h
-f:drivers/gpu/drm/xe/xe_guc_hwconfig.c
-f:drivers/gpu/drm/xe/xe_guc_hwconfig.h
-f:drivers/gpu/drm/xe/xe_guc_hxg_helpers.h
-f:drivers/gpu/drm/xe/xe_guc_id_mgr.c
-f:drivers/gpu/drm/xe/xe_guc_id_mgr.h
-f:drivers/gpu/drm/xe/xe_guc_klv_helpers.c
-f:drivers/gpu/drm/xe/xe_guc_klv_helpers.h
-f:drivers/gpu/drm/xe/xe_guc_klv_thresholds_set.h
-f:drivers/gpu/drm/xe/xe_guc_klv_thresholds_set_types.h
-f:drivers/gpu/drm/xe/xe_guc_log.c
-f:drivers/gpu/drm/xe/xe_guc_log.h
-f:drivers/gpu/drm/xe/xe_guc_log_types.h
-f:drivers/gpu/drm/xe/xe_guc_pc.c
-f:drivers/gpu/drm/xe/xe_guc_pc.h
-f:drivers/gpu/drm/xe/xe_guc_pc_types.h
-f:drivers/gpu/drm/xe/xe_guc_relay.c
-f:drivers/gpu/drm/xe/xe_guc_relay.h
-f:drivers/gpu/drm/xe/xe_guc_relay_types.h
-f:drivers/gpu/drm/xe/xe_guc_submit.c
-f:drivers/gpu/drm/xe/xe_guc_submit.h
-f:drivers/gpu/drm/xe/xe_guc_submit_types.h
-f:drivers/gpu/drm/xe/xe_guc_types.h
-f:drivers/gpu/drm/xe/xe_heci_gsc.c
-f:drivers/gpu/drm/xe/xe_heci_gsc.h
-f:drivers/gpu/drm/xe/xe_hmm.c
-f:drivers/gpu/drm/xe/xe_hmm.h
-f:drivers/gpu/drm/xe/xe_huc.c
-f:drivers/gpu/drm/xe/xe_huc.h
-f:drivers/gpu/drm/xe/xe_huc_debugfs.c
-f:drivers/gpu/drm/xe/xe_huc_debugfs.h
-f:drivers/gpu/drm/xe/xe_huc_types.h
-f:drivers/gpu/drm/xe/xe_hw_engine.c
-f:drivers/gpu/drm/xe/xe_hw_engine.h
-f:drivers/gpu/drm/xe/xe_hw_engine_class_sysfs.c
-f:drivers/gpu/drm/xe/xe_hw_engine_class_sysfs.h
-f:drivers/gpu/drm/xe/xe_hw_engine_group.c
-f:drivers/gpu/drm/xe/xe_hw_engine_group.h
-f:drivers/gpu/drm/xe/xe_hw_engine_group_types.h
-f:drivers/gpu/drm/xe/xe_hw_engine_types.h
-f:drivers/gpu/drm/xe/xe_hw_fence.c
-f:drivers/gpu/drm/xe/xe_hw_fence.h
-f:drivers/gpu/drm/xe/xe_hw_fence_types.h
-f:drivers/gpu/drm/xe/xe_hwmon.c
-f:drivers/gpu/drm/xe/xe_hwmon.h
-f:drivers/gpu/drm/xe/xe_i2c.c
-f:drivers/gpu/drm/xe/xe_i2c.h
-f:drivers/gpu/drm/xe/xe_irq.c
-f:drivers/gpu/drm/xe/xe_irq.h
-f:drivers/gpu/drm/xe/xe_lmtt.c
-f:drivers/gpu/drm/xe/xe_lmtt.h
-f:drivers/gpu/drm/xe/xe_lmtt_2l.c
-f:drivers/gpu/drm/xe/xe_lmtt_ml.c
-f:drivers/gpu/drm/xe/xe_lmtt_types.h
-f:drivers/gpu/drm/xe/xe_lrc.c
-f:drivers/gpu/drm/xe/xe_lrc.h
-f:drivers/gpu/drm/xe/xe_lrc_types.h
-f:drivers/gpu/drm/xe/xe_macros.h
-f:drivers/gpu/drm/xe/xe_map.h
-f:drivers/gpu/drm/xe/xe_memirq.c
-f:drivers/gpu/drm/xe/xe_memirq.h
-f:drivers/gpu/drm/xe/xe_memirq_types.h
-f:drivers/gpu/drm/xe/xe_migrate.c
-f:drivers/gpu/drm/xe/xe_migrate.h
-f:drivers/gpu/drm/xe/xe_migrate_doc.h
-f:drivers/gpu/drm/xe/xe_mmio.c
-f:drivers/gpu/drm/xe/xe_mmio.h
-f:drivers/gpu/drm/xe/xe_mocs.c
-f:drivers/gpu/drm/xe/xe_mocs.h
-f:drivers/gpu/drm/xe/xe_module.c
-f:drivers/gpu/drm/xe/xe_module.h
-f:drivers/gpu/drm/xe/xe_nvm.c
-f:drivers/gpu/drm/xe/xe_nvm.h
-f:drivers/gpu/drm/xe/xe_oa.c
-f:drivers/gpu/drm/xe/xe_oa.h
-f:drivers/gpu/drm/xe/xe_oa_types.h
-f:drivers/gpu/drm/xe/xe_observation.c
-f:drivers/gpu/drm/xe/xe_observation.h
-f:drivers/gpu/drm/xe/xe_pat.c
-f:drivers/gpu/drm/xe/xe_pat.h
-f:drivers/gpu/drm/xe/xe_pci.c
-f:drivers/gpu/drm/xe/xe_pci.h
-f:drivers/gpu/drm/xe/xe_pci_sriov.c
-f:drivers/gpu/drm/xe/xe_pci_sriov.h
-f:drivers/gpu/drm/xe/xe_pci_types.h
-f:drivers/gpu/drm/xe/xe_pcode.c
-f:drivers/gpu/drm/xe/xe_pcode.h
-f:drivers/gpu/drm/xe/xe_pcode_api.h
-f:drivers/gpu/drm/xe/xe_platform_types.h
-f:drivers/gpu/drm/xe/xe_pm.c
-f:drivers/gpu/drm/xe/xe_pm.h
-f:drivers/gpu/drm/xe/xe_pmu.c
-f:drivers/gpu/drm/xe/xe_pmu.h
-f:drivers/gpu/drm/xe/xe_pmu_types.h
-f:drivers/gpu/drm/xe/xe_preempt_fence.c
-f:drivers/gpu/drm/xe/xe_preempt_fence.h
-f:drivers/gpu/drm/xe/xe_preempt_fence_types.h
-f:drivers/gpu/drm/xe/xe_pt.c
-f:drivers/gpu/drm/xe/xe_pt.h
-f:drivers/gpu/drm/xe/xe_pt_types.h
-f:drivers/gpu/drm/xe/xe_pt_walk.c
-f:drivers/gpu/drm/xe/xe_pt_walk.h
-f:drivers/gpu/drm/xe/xe_pxp.c
-f:drivers/gpu/drm/xe/xe_pxp.h
-f:drivers/gpu/drm/xe/xe_pxp_debugfs.c
-f:drivers/gpu/drm/xe/xe_pxp_debugfs.h
-f:drivers/gpu/drm/xe/xe_pxp_submit.c
-f:drivers/gpu/drm/xe/xe_pxp_submit.h
-f:drivers/gpu/drm/xe/xe_pxp_types.h
-f:drivers/gpu/drm/xe/xe_query.c
-f:drivers/gpu/drm/xe/xe_query.h
-f:drivers/gpu/drm/xe/xe_range_fence.c
-f:drivers/gpu/drm/xe/xe_range_fence.h
-f:drivers/gpu/drm/xe/xe_reg_sr.c
-f:drivers/gpu/drm/xe/xe_reg_sr.h
-f:drivers/gpu/drm/xe/xe_reg_sr_types.h
-f:drivers/gpu/drm/xe/xe_reg_whitelist.c
-f:drivers/gpu/drm/xe/xe_reg_whitelist.h
-f:drivers/gpu/drm/xe/xe_res_cursor.h
-f:drivers/gpu/drm/xe/xe_ring_ops.c
-f:drivers/gpu/drm/xe/xe_ring_ops.h
-f:drivers/gpu/drm/xe/xe_ring_ops_types.h
-f:drivers/gpu/drm/xe/xe_rtp.c
-f:drivers/gpu/drm/xe/xe_rtp.h
-f:drivers/gpu/drm/xe/xe_rtp_helpers.h
-f:drivers/gpu/drm/xe/xe_rtp_types.h
-f:drivers/gpu/drm/xe/xe_sa.c
-f:drivers/gpu/drm/xe/xe_sa.h
-f:drivers/gpu/drm/xe/xe_sa_types.h
-f:drivers/gpu/drm/xe/xe_sched_job.c
-f:drivers/gpu/drm/xe/xe_sched_job.h
-f:drivers/gpu/drm/xe/xe_sched_job_types.h
-f:drivers/gpu/drm/xe/xe_shrinker.c
-f:drivers/gpu/drm/xe/xe_shrinker.h
-f:drivers/gpu/drm/xe/xe_sriov.c
-f:drivers/gpu/drm/xe/xe_sriov.h
-f:drivers/gpu/drm/xe/xe_sriov_pf.c
-f:drivers/gpu/drm/xe/xe_sriov_pf.h
-f:drivers/gpu/drm/xe/xe_sriov_pf_helpers.h
-f:drivers/gpu/drm/xe/xe_sriov_pf_service.c
-f:drivers/gpu/drm/xe/xe_sriov_pf_service.h
-f:drivers/gpu/drm/xe/xe_sriov_pf_service_types.h
-f:drivers/gpu/drm/xe/xe_sriov_pf_types.h
-f:drivers/gpu/drm/xe/xe_sriov_printk.h
-f:drivers/gpu/drm/xe/xe_sriov_types.h
-f:drivers/gpu/drm/xe/xe_sriov_vf.c
-f:drivers/gpu/drm/xe/xe_sriov_vf.h
-f:drivers/gpu/drm/xe/xe_sriov_vf_types.h
-f:drivers/gpu/drm/xe/xe_step.c
-f:drivers/gpu/drm/xe/xe_step.h
-f:drivers/gpu/drm/xe/xe_step_types.h
-f:drivers/gpu/drm/xe/xe_survivability_mode.c
-f:drivers/gpu/drm/xe/xe_survivability_mode.h
-f:drivers/gpu/drm/xe/xe_survivability_mode_types.h
-f:drivers/gpu/drm/xe/xe_svm.c
-f:drivers/gpu/drm/xe/xe_svm.h
-f:drivers/gpu/drm/xe/xe_sync.c
-f:drivers/gpu/drm/xe/xe_sync.h
-f:drivers/gpu/drm/xe/xe_sync_types.h
-f:drivers/gpu/drm/xe/xe_tile.c
-f:drivers/gpu/drm/xe/xe_tile.h
-f:drivers/gpu/drm/xe/xe_tile_sriov_vf.c
-f:drivers/gpu/drm/xe/xe_tile_sriov_vf.h
-f:drivers/gpu/drm/xe/xe_tile_sysfs.c
-f:drivers/gpu/drm/xe/xe_tile_sysfs.h
-f:drivers/gpu/drm/xe/xe_tile_sysfs_types.h
-f:drivers/gpu/drm/xe/xe_trace.c
-f:drivers/gpu/drm/xe/xe_trace.h
-f:drivers/gpu/drm/xe/xe_trace_bo.c
-f:drivers/gpu/drm/xe/xe_trace_bo.h
-f:drivers/gpu/drm/xe/xe_trace_guc.c
-f:drivers/gpu/drm/xe/xe_trace_guc.h
-f:drivers/gpu/drm/xe/xe_trace_lrc.c
-f:drivers/gpu/drm/xe/xe_trace_lrc.h
-f:drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c
-f:drivers/gpu/drm/xe/xe_ttm_stolen_mgr.h
-f:drivers/gpu/drm/xe/xe_ttm_sys_mgr.c
-f:drivers/gpu/drm/xe/xe_ttm_sys_mgr.h
-f:drivers/gpu/drm/xe/xe_ttm_vram_mgr.c
-f:drivers/gpu/drm/xe/xe_ttm_vram_mgr.h
-f:drivers/gpu/drm/xe/xe_ttm_vram_mgr_types.h
-f:drivers/gpu/drm/xe/xe_tuning.c
-f:drivers/gpu/drm/xe/xe_tuning.h
-f:drivers/gpu/drm/xe/xe_uc.c
-f:drivers/gpu/drm/xe/xe_uc.h
-f:drivers/gpu/drm/xe/xe_uc_debugfs.c
-f:drivers/gpu/drm/xe/xe_uc_debugfs.h
-f:drivers/gpu/drm/xe/xe_uc_fw.c
-f:drivers/gpu/drm/xe/xe_uc_fw.h
-f:drivers/gpu/drm/xe/xe_uc_fw_abi.h
-f:drivers/gpu/drm/xe/xe_uc_fw_types.h
-f:drivers/gpu/drm/xe/xe_uc_types.h
-f:drivers/gpu/drm/xe/xe_vm.c
-f:drivers/gpu/drm/xe/xe_vm.h
-f:drivers/gpu/drm/xe/xe_vm_doc.h
-f:drivers/gpu/drm/xe/xe_vm_types.h
-f:drivers/gpu/drm/xe/xe_vram.c
-f:drivers/gpu/drm/xe/xe_vram.h
-f:drivers/gpu/drm/xe/xe_vram_freq.c
-f:drivers/gpu/drm/xe/xe_vram_freq.h
-f:drivers/gpu/drm/xe/xe_vsec.c
-f:drivers/gpu/drm/xe/xe_vsec.h
-f:drivers/gpu/drm/xe/xe_wa.c
-f:drivers/gpu/drm/xe/xe_wa.h
-f:drivers/gpu/drm/xe/xe_wa_oob.rules
-f:drivers/gpu/drm/xe/xe_wait_user_fence.c
-f:drivers/gpu/drm/xe/xe_wait_user_fence.h
-f:drivers/gpu/drm/xe/xe_wopcm.c
-f:drivers/gpu/drm/xe/xe_wopcm.h
-f:drivers/gpu/drm/xe/xe_wopcm_types.h
-f:drivers/gpu/drm/xen/Kconfig
-f:drivers/gpu/drm/xen/Makefile
-f:drivers/gpu/drm/xen/xen_drm_front.c
-f:drivers/gpu/drm/xen/xen_drm_front.h
-f:drivers/gpu/drm/xen/xen_drm_front_cfg.c
-f:drivers/gpu/drm/xen/xen_drm_front_cfg.h
-f:drivers/gpu/drm/xen/xen_drm_front_conn.c
-f:drivers/gpu/drm/xen/xen_drm_front_conn.h
-f:drivers/gpu/drm/xen/xen_drm_front_evtchnl.c
-f:drivers/gpu/drm/xen/xen_drm_front_evtchnl.h
-f:drivers/gpu/drm/xen/xen_drm_front_gem.c
-f:drivers/gpu/drm/xen/xen_drm_front_gem.h
-f:drivers/gpu/drm/xen/xen_drm_front_kms.c
-f:drivers/gpu/drm/xen/xen_drm_front_kms.h
-f:drivers/gpu/drm/xlnx/Kconfig
-f:drivers/gpu/drm/xlnx/Makefile
-f:drivers/gpu/drm/xlnx/zynqmp_disp.c
-f:drivers/gpu/drm/xlnx/zynqmp_disp.h
-f:drivers/gpu/drm/xlnx/zynqmp_disp_regs.h
-f:drivers/gpu/drm/xlnx/zynqmp_dp.c
-f:drivers/gpu/drm/xlnx/zynqmp_dp.h
-f:drivers/gpu/drm/xlnx/zynqmp_dp_audio.c
-f:drivers/gpu/drm/xlnx/zynqmp_dpsub.c
-f:drivers/gpu/drm/xlnx/zynqmp_dpsub.h
-f:drivers/gpu/drm/xlnx/zynqmp_kms.c
-f:drivers/gpu/drm/xlnx/zynqmp_kms.h
-f:drivers/gpu/host1x/Kconfig
-f:drivers/gpu/host1x/Makefile
-f:drivers/gpu/host1x/bus.c
-f:drivers/gpu/host1x/bus.h
-f:drivers/gpu/host1x/cdma.c
-f:drivers/gpu/host1x/cdma.h
-f:drivers/gpu/host1x/channel.c
-f:drivers/gpu/host1x/channel.h
-f:drivers/gpu/host1x/context.c
-f:drivers/gpu/host1x/context.h
-f:drivers/gpu/host1x/context_bus.c
-f:drivers/gpu/host1x/debug.c
-f:drivers/gpu/host1x/debug.h
-f:drivers/gpu/host1x/dev.c
-f:drivers/gpu/host1x/dev.h
-f:drivers/gpu/host1x/fence.c
-f:drivers/gpu/host1x/fence.h
-f:drivers/gpu/host1x/hw/cdma_hw.c
-f:drivers/gpu/host1x/hw/channel_hw.c
-f:drivers/gpu/host1x/hw/debug_hw.c
-f:drivers/gpu/host1x/hw/debug_hw_1x01.c
-f:drivers/gpu/host1x/hw/debug_hw_1x06.c
-f:drivers/gpu/host1x/hw/host1x01.c
-f:drivers/gpu/host1x/hw/host1x01.h
-f:drivers/gpu/host1x/hw/host1x01_hardware.h
-f:drivers/gpu/host1x/hw/host1x02.c
-f:drivers/gpu/host1x/hw/host1x02.h
-f:drivers/gpu/host1x/hw/host1x02_hardware.h
-f:drivers/gpu/host1x/hw/host1x04.c
-f:drivers/gpu/host1x/hw/host1x04.h
-f:drivers/gpu/host1x/hw/host1x04_hardware.h
-f:drivers/gpu/host1x/hw/host1x05.c
-f:drivers/gpu/host1x/hw/host1x05.h
-f:drivers/gpu/host1x/hw/host1x05_hardware.h
-f:drivers/gpu/host1x/hw/host1x06.c
-f:drivers/gpu/host1x/hw/host1x06.h
-f:drivers/gpu/host1x/hw/host1x06_hardware.h
-f:drivers/gpu/host1x/hw/host1x07.c
-f:drivers/gpu/host1x/hw/host1x07.h
-f:drivers/gpu/host1x/hw/host1x07_hardware.h
-f:drivers/gpu/host1x/hw/host1x08.c
-f:drivers/gpu/host1x/hw/host1x08.h
-f:drivers/gpu/host1x/hw/host1x08_hardware.h
-f:drivers/gpu/host1x/hw/hw_host1x01_channel.h
-f:drivers/gpu/host1x/hw/hw_host1x01_sync.h
-f:drivers/gpu/host1x/hw/hw_host1x01_uclass.h
-f:drivers/gpu/host1x/hw/hw_host1x02_channel.h
-f:drivers/gpu/host1x/hw/hw_host1x02_sync.h
-f:drivers/gpu/host1x/hw/hw_host1x02_uclass.h
-f:drivers/gpu/host1x/hw/hw_host1x04_channel.h
-f:drivers/gpu/host1x/hw/hw_host1x04_sync.h
-f:drivers/gpu/host1x/hw/hw_host1x04_uclass.h
-f:drivers/gpu/host1x/hw/hw_host1x05_channel.h
-f:drivers/gpu/host1x/hw/hw_host1x05_sync.h
-f:drivers/gpu/host1x/hw/hw_host1x05_uclass.h
-f:drivers/gpu/host1x/hw/hw_host1x06_channel.h
-f:drivers/gpu/host1x/hw/hw_host1x06_hypervisor.h
-f:drivers/gpu/host1x/hw/hw_host1x06_uclass.h
-f:drivers/gpu/host1x/hw/hw_host1x06_vm.h
-f:drivers/gpu/host1x/hw/hw_host1x07_channel.h
-f:drivers/gpu/host1x/hw/hw_host1x07_hypervisor.h
-f:drivers/gpu/host1x/hw/hw_host1x07_uclass.h
-f:drivers/gpu/host1x/hw/hw_host1x07_vm.h
-f:drivers/gpu/host1x/hw/hw_host1x08_channel.h
-f:drivers/gpu/host1x/hw/hw_host1x08_common.h
-f:drivers/gpu/host1x/hw/hw_host1x08_hypervisor.h
-f:drivers/gpu/host1x/hw/hw_host1x08_uclass.h
-f:drivers/gpu/host1x/hw/hw_host1x08_vm.h
-f:drivers/gpu/host1x/hw/intr_hw.c
-f:drivers/gpu/host1x/hw/opcodes.h
-f:drivers/gpu/host1x/hw/syncpt_hw.c
-f:drivers/gpu/host1x/intr.c
-f:drivers/gpu/host1x/intr.h
-f:drivers/gpu/host1x/job.c
-f:drivers/gpu/host1x/job.h
-f:drivers/gpu/host1x/mipi.c
-f:drivers/gpu/host1x/syncpt.c
-f:drivers/gpu/host1x/syncpt.h
-f:drivers/gpu/ipu-v3/Kconfig
-f:drivers/gpu/ipu-v3/Makefile
-f:drivers/gpu/ipu-v3/ipu-common.c
-f:drivers/gpu/ipu-v3/ipu-cpmem.c
-f:drivers/gpu/ipu-v3/ipu-csi.c
-f:drivers/gpu/ipu-v3/ipu-dc.c
-f:drivers/gpu/ipu-v3/ipu-di.c
-f:drivers/gpu/ipu-v3/ipu-dmfc.c
-f:drivers/gpu/ipu-v3/ipu-dp.c
-f:drivers/gpu/ipu-v3/ipu-ic-csc.c
-f:drivers/gpu/ipu-v3/ipu-ic.c
-f:drivers/gpu/ipu-v3/ipu-image-convert.c
-f:drivers/gpu/ipu-v3/ipu-pre.c
-f:drivers/gpu/ipu-v3/ipu-prg.c
-f:drivers/gpu/ipu-v3/ipu-prv.h
-f:drivers/gpu/ipu-v3/ipu-smfc.c
-f:drivers/gpu/ipu-v3/ipu-vdi.c
-f:drivers/gpu/nova-core/Kconfig
-f:drivers/gpu/nova-core/Makefile
-f:drivers/gpu/nova-core/dma.rs
-f:drivers/gpu/nova-core/driver.rs
-f:drivers/gpu/nova-core/falcon.rs
-f:drivers/gpu/nova-core/falcon/gsp.rs
-f:drivers/gpu/nova-core/falcon/hal.rs
-f:drivers/gpu/nova-core/falcon/hal/ga102.rs
-f:drivers/gpu/nova-core/falcon/sec2.rs
-f:drivers/gpu/nova-core/fb.rs
-f:drivers/gpu/nova-core/fb/hal.rs
-f:drivers/gpu/nova-core/fb/hal/ga100.rs
-f:drivers/gpu/nova-core/fb/hal/ga102.rs
-f:drivers/gpu/nova-core/fb/hal/tu102.rs
-f:drivers/gpu/nova-core/firmware.rs
-f:drivers/gpu/nova-core/firmware/fwsec.rs
-f:drivers/gpu/nova-core/gfw.rs
-f:drivers/gpu/nova-core/gpu.rs
-f:drivers/gpu/nova-core/nova_core.rs
-f:drivers/gpu/nova-core/regs.rs
-f:drivers/gpu/nova-core/regs/macros.rs
-f:drivers/gpu/nova-core/util.rs
-f:drivers/gpu/nova-core/vbios.rs
-f:drivers/gpu/trace/Kconfig
-f:drivers/gpu/trace/Makefile
-f:drivers/gpu/trace/trace_gpu_mem.c
-f:drivers/gpu/vga/Kconfig
-f:drivers/gpu/vga/Makefile
-f:drivers/gpu/vga/vga_switcheroo.c
-f:drivers/greybus/Kconfig
-f:drivers/greybus/Makefile
-f:drivers/greybus/arpc.h
-f:drivers/greybus/bundle.c
-f:drivers/greybus/connection.c
-f:drivers/greybus/control.c
-f:drivers/greybus/core.c
-f:drivers/greybus/debugfs.c
-f:drivers/greybus/es2.c
-f:drivers/greybus/gb-beagleplay.c
-f:drivers/greybus/greybus_trace.h
-f:drivers/greybus/hd.c
-f:drivers/greybus/interface.c
-f:drivers/greybus/manifest.c
-f:drivers/greybus/module.c
-f:drivers/greybus/operation.c
-f:drivers/greybus/svc.c
-f:drivers/greybus/svc_watchdog.c
-f:drivers/hid/.kunitconfig
-f:drivers/hid/Kconfig
-f:drivers/hid/Makefile
-f:drivers/hid/amd-sfh-hid/Kconfig
-f:drivers/hid/amd-sfh-hid/Makefile
-f:drivers/hid/amd-sfh-hid/amd_sfh_client.c
-f:drivers/hid/amd-sfh-hid/amd_sfh_common.h
-f:drivers/hid/amd-sfh-hid/amd_sfh_hid.c
-f:drivers/hid/amd-sfh-hid/amd_sfh_hid.h
-f:drivers/hid/amd-sfh-hid/amd_sfh_pcie.c
-f:drivers/hid/amd-sfh-hid/amd_sfh_pcie.h
-f:drivers/hid/amd-sfh-hid/hid_descriptor/amd_sfh_hid_desc.c
-f:drivers/hid/amd-sfh-hid/hid_descriptor/amd_sfh_hid_desc.h
-f:drivers/hid/amd-sfh-hid/hid_descriptor/amd_sfh_hid_report_desc.h
-f:drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_desc.c
-f:drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c
-f:drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.h
-f:drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_interface.c
-f:drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_interface.h
-f:drivers/hid/bpf/Kconfig
-f:drivers/hid/bpf/Makefile
-f:drivers/hid/bpf/hid_bpf_dispatch.c
-f:drivers/hid/bpf/hid_bpf_dispatch.h
-f:drivers/hid/bpf/hid_bpf_struct_ops.c
-f:drivers/hid/bpf/progs/FR-TEC__Raptor-Mach-2.bpf.c
-f:drivers/hid/bpf/progs/HP__Elite-Presenter.bpf.c
-f:drivers/hid/bpf/progs/Huion__Dial-2.bpf.c
-f:drivers/hid/bpf/progs/Huion__Inspiroy-2-S.bpf.c
-f:drivers/hid/bpf/progs/Huion__Kamvas-Pro-19.bpf.c
-f:drivers/hid/bpf/progs/Huion__KeydialK20.bpf.c
-f:drivers/hid/bpf/progs/IOGEAR__Kaliber-MMOmentum.bpf.c
-f:drivers/hid/bpf/progs/Makefile
-f:drivers/hid/bpf/progs/Microsoft__Xbox-Elite-2.bpf.c
-f:drivers/hid/bpf/progs/Mistel__MD770.bpf.c
-f:drivers/hid/bpf/progs/README
-f:drivers/hid/bpf/progs/Rapoo__M50-Plus-Silent.bpf.c
-f:drivers/hid/bpf/progs/TUXEDO__Sirius-16-Gen1-and-Gen2.bpf.c
-f:drivers/hid/bpf/progs/Thrustmaster__TCA-Yoke-Boeing.bpf.c
-f:drivers/hid/bpf/progs/Wacom__ArtPen.bpf.c
-f:drivers/hid/bpf/progs/XPPen__ACK05.bpf.c
-f:drivers/hid/bpf/progs/XPPen__Artist24.bpf.c
-f:drivers/hid/bpf/progs/XPPen__ArtistPro16Gen2.bpf.c
-f:drivers/hid/bpf/progs/XPPen__DecoMini4.bpf.c
-f:drivers/hid/bpf/progs/hid_bpf.h
-f:drivers/hid/bpf/progs/hid_bpf_async.h
-f:drivers/hid/bpf/progs/hid_bpf_helpers.h
-f:drivers/hid/bpf/progs/hid_report_helpers.h
-f:drivers/hid/hid-a4tech.c
-f:drivers/hid/hid-accutouch.c
-f:drivers/hid/hid-alps.c
-f:drivers/hid/hid-apple.c
-f:drivers/hid/hid-appleir.c
-f:drivers/hid/hid-appletb-bl.c
-f:drivers/hid/hid-appletb-kbd.c
-f:drivers/hid/hid-asus.c
-f:drivers/hid/hid-aureal.c
-f:drivers/hid/hid-axff.c
-f:drivers/hid/hid-belkin.c
-f:drivers/hid/hid-betopff.c
-f:drivers/hid/hid-bigbenff.c
-f:drivers/hid/hid-cherry.c
-f:drivers/hid/hid-chicony.c
-f:drivers/hid/hid-cmedia.c
-f:drivers/hid/hid-core.c
-f:drivers/hid/hid-corsair-void.c
-f:drivers/hid/hid-corsair.c
-f:drivers/hid/hid-cougar.c
-f:drivers/hid/hid-cp2112.c
-f:drivers/hid/hid-creative-sb0540.c
-f:drivers/hid/hid-cypress.c
-f:drivers/hid/hid-debug.c
-f:drivers/hid/hid-dr.c
-f:drivers/hid/hid-elan.c
-f:drivers/hid/hid-elecom.c
-f:drivers/hid/hid-elo.c
-f:drivers/hid/hid-emsff.c
-f:drivers/hid/hid-evision.c
-f:drivers/hid/hid-ezkey.c
-f:drivers/hid/hid-ft260.c
-f:drivers/hid/hid-gaff.c
-f:drivers/hid/hid-gembird.c
-f:drivers/hid/hid-generic.c
-f:drivers/hid/hid-gfrm.c
-f:drivers/hid/hid-glorious.c
-f:drivers/hid/hid-goodix-spi.c
-f:drivers/hid/hid-google-hammer.c
-f:drivers/hid/hid-google-stadiaff.c
-f:drivers/hid/hid-gt683r.c
-f:drivers/hid/hid-gyration.c
-f:drivers/hid/hid-holtek-kbd.c
-f:drivers/hid/hid-holtek-mouse.c
-f:drivers/hid/hid-holtekff.c
-f:drivers/hid/hid-hyperv.c
-f:drivers/hid/hid-icade.c
-f:drivers/hid/hid-ids.h
-f:drivers/hid/hid-input-test.c
-f:drivers/hid/hid-input.c
-f:drivers/hid/hid-ite.c
-f:drivers/hid/hid-jabra.c
-f:drivers/hid/hid-kensington.c
-f:drivers/hid/hid-keytouch.c
-f:drivers/hid/hid-kye.c
-f:drivers/hid/hid-kysona.c
-f:drivers/hid/hid-lcpower.c
-f:drivers/hid/hid-led.c
-f:drivers/hid/hid-lenovo.c
-f:drivers/hid/hid-letsketch.c
-f:drivers/hid/hid-lg-g15.c
-f:drivers/hid/hid-lg.c
-f:drivers/hid/hid-lg.h
-f:drivers/hid/hid-lg2ff.c
-f:drivers/hid/hid-lg3ff.c
-f:drivers/hid/hid-lg4ff.c
-f:drivers/hid/hid-lg4ff.h
-f:drivers/hid/hid-lgff.c
-f:drivers/hid/hid-logitech-dj.c
-f:drivers/hid/hid-logitech-hidpp.c
-f:drivers/hid/hid-macally.c
-f:drivers/hid/hid-magicmouse.c
-f:drivers/hid/hid-maltron.c
-f:drivers/hid/hid-mcp2200.c
-f:drivers/hid/hid-mcp2221.c
-f:drivers/hid/hid-megaworld.c
-f:drivers/hid/hid-mf.c
-f:drivers/hid/hid-microsoft.c
-f:drivers/hid/hid-monterey.c
-f:drivers/hid/hid-multitouch.c
-f:drivers/hid/hid-nintendo.c
-f:drivers/hid/hid-nti.c
-f:drivers/hid/hid-ntrig.c
-f:drivers/hid/hid-nvidia-shield.c
-f:drivers/hid/hid-ortek.c
-f:drivers/hid/hid-penmount.c
-f:drivers/hid/hid-petalynx.c
-f:drivers/hid/hid-picolcd.h
-f:drivers/hid/hid-picolcd_backlight.c
-f:drivers/hid/hid-picolcd_cir.c
-f:drivers/hid/hid-picolcd_core.c
-f:drivers/hid/hid-picolcd_debugfs.c
-f:drivers/hid/hid-picolcd_fb.c
-f:drivers/hid/hid-picolcd_lcd.c
-f:drivers/hid/hid-picolcd_leds.c
-f:drivers/hid/hid-pl.c
-f:drivers/hid/hid-plantronics.c
-f:drivers/hid/hid-playstation.c
-f:drivers/hid/hid-primax.c
-f:drivers/hid/hid-prodikeys.c
-f:drivers/hid/hid-pxrc.c
-f:drivers/hid/hid-quirks.c
-f:drivers/hid/hid-razer.c
-f:drivers/hid/hid-redragon.c
-f:drivers/hid/hid-retrode.c
-f:drivers/hid/hid-rmi.c
-f:drivers/hid/hid-roccat-arvo.c
-f:drivers/hid/hid-roccat-arvo.h
-f:drivers/hid/hid-roccat-common.c
-f:drivers/hid/hid-roccat-common.h
-f:drivers/hid/hid-roccat-isku.c
-f:drivers/hid/hid-roccat-isku.h
-f:drivers/hid/hid-roccat-kone.c
-f:drivers/hid/hid-roccat-kone.h
-f:drivers/hid/hid-roccat-koneplus.c
-f:drivers/hid/hid-roccat-koneplus.h
-f:drivers/hid/hid-roccat-konepure.c
-f:drivers/hid/hid-roccat-kovaplus.c
-f:drivers/hid/hid-roccat-kovaplus.h
-f:drivers/hid/hid-roccat-lua.c
-f:drivers/hid/hid-roccat-lua.h
-f:drivers/hid/hid-roccat-pyra.c
-f:drivers/hid/hid-roccat-pyra.h
-f:drivers/hid/hid-roccat-ryos.c
-f:drivers/hid/hid-roccat-savu.c
-f:drivers/hid/hid-roccat-savu.h
-f:drivers/hid/hid-roccat.c
-f:drivers/hid/hid-saitek.c
-f:drivers/hid/hid-samsung.c
-f:drivers/hid/hid-semitek.c
-f:drivers/hid/hid-sensor-custom.c
-f:drivers/hid/hid-sensor-hub.c
-f:drivers/hid/hid-sigmamicro.c
-f:drivers/hid/hid-sjoy.c
-f:drivers/hid/hid-sony.c
-f:drivers/hid/hid-speedlink.c
-f:drivers/hid/hid-steam.c
-f:drivers/hid/hid-steelseries.c
-f:drivers/hid/hid-sunplus.c
-f:drivers/hid/hid-thrustmaster.c
-f:drivers/hid/hid-tivo.c
-f:drivers/hid/hid-tmff.c
-f:drivers/hid/hid-topre.c
-f:drivers/hid/hid-topseed.c
-f:drivers/hid/hid-twinhan.c
-f:drivers/hid/hid-u2fzero.c
-f:drivers/hid/hid-uclogic-core-test.c
-f:drivers/hid/hid-uclogic-core.c
-f:drivers/hid/hid-uclogic-params-test.c
-f:drivers/hid/hid-uclogic-params.c
-f:drivers/hid/hid-uclogic-params.h
-f:drivers/hid/hid-uclogic-rdesc-test.c
-f:drivers/hid/hid-uclogic-rdesc.c
-f:drivers/hid/hid-uclogic-rdesc.h
-f:drivers/hid/hid-udraw-ps3.c
-f:drivers/hid/hid-universal-pidff.c
-f:drivers/hid/hid-viewsonic.c
-f:drivers/hid/hid-vivaldi-common.c
-f:drivers/hid/hid-vivaldi-common.h
-f:drivers/hid/hid-vivaldi.c
-f:drivers/hid/hid-vrc2.c
-f:drivers/hid/hid-waltop.c
-f:drivers/hid/hid-wiimote-core.c
-f:drivers/hid/hid-wiimote-debug.c
-f:drivers/hid/hid-wiimote-modules.c
-f:drivers/hid/hid-wiimote.h
-f:drivers/hid/hid-winwing.c
-f:drivers/hid/hid-xiaomi.c
-f:drivers/hid/hid-xinmo.c
-f:drivers/hid/hid-zpff.c
-f:drivers/hid/hid-zydacron.c
-f:drivers/hid/hidraw.c
-f:drivers/hid/i2c-hid/Kconfig
-f:drivers/hid/i2c-hid/Makefile
-f:drivers/hid/i2c-hid/i2c-hid-acpi.c
-f:drivers/hid/i2c-hid/i2c-hid-core.c
-f:drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c
-f:drivers/hid/i2c-hid/i2c-hid-of-elan.c
-f:drivers/hid/i2c-hid/i2c-hid-of-goodix.c
-f:drivers/hid/i2c-hid/i2c-hid-of.c
-f:drivers/hid/i2c-hid/i2c-hid.h
-f:drivers/hid/intel-ish-hid/Kconfig
-f:drivers/hid/intel-ish-hid/Makefile
-f:drivers/hid/intel-ish-hid/ipc/hw-ish-regs.h
-f:drivers/hid/intel-ish-hid/ipc/hw-ish.h
-f:drivers/hid/intel-ish-hid/ipc/ipc.c
-f:drivers/hid/intel-ish-hid/ipc/pci-ish.c
-f:drivers/hid/intel-ish-hid/ishtp-fw-loader.c
-f:drivers/hid/intel-ish-hid/ishtp-hid-client.c
-f:drivers/hid/intel-ish-hid/ishtp-hid.c
-f:drivers/hid/intel-ish-hid/ishtp-hid.h
-f:drivers/hid/intel-ish-hid/ishtp/bus.c
-f:drivers/hid/intel-ish-hid/ishtp/bus.h
-f:drivers/hid/intel-ish-hid/ishtp/client-buffers.c
-f:drivers/hid/intel-ish-hid/ishtp/client.c
-f:drivers/hid/intel-ish-hid/ishtp/client.h
-f:drivers/hid/intel-ish-hid/ishtp/dma-if.c
-f:drivers/hid/intel-ish-hid/ishtp/hbm.c
-f:drivers/hid/intel-ish-hid/ishtp/hbm.h
-f:drivers/hid/intel-ish-hid/ishtp/init.c
-f:drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h
-f:drivers/hid/intel-ish-hid/ishtp/loader.c
-f:drivers/hid/intel-ish-hid/ishtp/loader.h
-f:drivers/hid/intel-thc-hid/Kconfig
-f:drivers/hid/intel-thc-hid/Makefile
-f:drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c
-f:drivers/hid/intel-thc-hid/intel-quicki2c/quicki2c-dev.h
-f:drivers/hid/intel-thc-hid/intel-quicki2c/quicki2c-hid.c
-f:drivers/hid/intel-thc-hid/intel-quicki2c/quicki2c-hid.h
-f:drivers/hid/intel-thc-hid/intel-quicki2c/quicki2c-protocol.c
-f:drivers/hid/intel-thc-hid/intel-quicki2c/quicki2c-protocol.h
-f:drivers/hid/intel-thc-hid/intel-quickspi/pci-quickspi.c
-f:drivers/hid/intel-thc-hid/intel-quickspi/quickspi-dev.h
-f:drivers/hid/intel-thc-hid/intel-quickspi/quickspi-hid.c
-f:drivers/hid/intel-thc-hid/intel-quickspi/quickspi-hid.h
-f:drivers/hid/intel-thc-hid/intel-quickspi/quickspi-protocol.c
-f:drivers/hid/intel-thc-hid/intel-quickspi/quickspi-protocol.h
-f:drivers/hid/intel-thc-hid/intel-thc/intel-thc-dev.c
-f:drivers/hid/intel-thc-hid/intel-thc/intel-thc-dev.h
-f:drivers/hid/intel-thc-hid/intel-thc/intel-thc-dma.c
-f:drivers/hid/intel-thc-hid/intel-thc/intel-thc-dma.h
-f:drivers/hid/intel-thc-hid/intel-thc/intel-thc-hw.h
-f:drivers/hid/intel-thc-hid/intel-thc/intel-thc-wot.c
-f:drivers/hid/intel-thc-hid/intel-thc/intel-thc-wot.h
-f:drivers/hid/surface-hid/Kconfig
-f:drivers/hid/surface-hid/Makefile
-f:drivers/hid/surface-hid/surface_hid.c
-f:drivers/hid/surface-hid/surface_hid_core.c
-f:drivers/hid/surface-hid/surface_hid_core.h
-f:drivers/hid/surface-hid/surface_kbd.c
-f:drivers/hid/uhid.c
-f:drivers/hid/usbhid/Kconfig
-f:drivers/hid/usbhid/Makefile
-f:drivers/hid/usbhid/hid-core.c
-f:drivers/hid/usbhid/hid-pidff.c
-f:drivers/hid/usbhid/hid-pidff.h
-f:drivers/hid/usbhid/hiddev.c
-f:drivers/hid/usbhid/usbhid.h
-f:drivers/hid/usbhid/usbkbd.c
-f:drivers/hid/usbhid/usbmouse.c
-f:drivers/hid/wacom.h
-f:drivers/hid/wacom_sys.c
-f:drivers/hid/wacom_wac.c
-f:drivers/hid/wacom_wac.h
-f:drivers/hsi/Kconfig
-f:drivers/hsi/Makefile
-f:drivers/hsi/clients/Kconfig
-f:drivers/hsi/clients/Makefile
-f:drivers/hsi/clients/cmt_speech.c
-f:drivers/hsi/clients/hsi_char.c
-f:drivers/hsi/clients/nokia-modem.c
-f:drivers/hsi/clients/ssi_protocol.c
-f:drivers/hsi/controllers/Kconfig
-f:drivers/hsi/controllers/Makefile
-f:drivers/hsi/controllers/omap_ssi.h
-f:drivers/hsi/controllers/omap_ssi_core.c
-f:drivers/hsi/controllers/omap_ssi_port.c
-f:drivers/hsi/controllers/omap_ssi_regs.h
-f:drivers/hsi/hsi_boardinfo.c
-f:drivers/hsi/hsi_core.c
-f:drivers/hsi/hsi_core.h
-f:drivers/hte/Kconfig
-f:drivers/hte/Makefile
-f:drivers/hte/hte-tegra194-test.c
-f:drivers/hte/hte-tegra194.c
-f:drivers/hte/hte.c
-f:drivers/hv/Kconfig
-f:drivers/hv/Makefile
-f:drivers/hv/channel.c
-f:drivers/hv/channel_mgmt.c
-f:drivers/hv/connection.c
-f:drivers/hv/hv.c
-f:drivers/hv/hv_balloon.c
-f:drivers/hv/hv_common.c
-f:drivers/hv/hv_debugfs.c
-f:drivers/hv/hv_kvp.c
-f:drivers/hv/hv_proc.c
-f:drivers/hv/hv_snapshot.c
-f:drivers/hv/hv_trace.c
-f:drivers/hv/hv_trace.h
-f:drivers/hv/hv_trace_balloon.h
-f:drivers/hv/hv_util.c
-f:drivers/hv/hv_utils_transport.c
-f:drivers/hv/hv_utils_transport.h
-f:drivers/hv/hyperv_vmbus.h
-f:drivers/hv/mshv.h
-f:drivers/hv/mshv_common.c
-f:drivers/hv/mshv_eventfd.c
-f:drivers/hv/mshv_eventfd.h
-f:drivers/hv/mshv_irq.c
-f:drivers/hv/mshv_portid_table.c
-f:drivers/hv/mshv_root.h
-f:drivers/hv/mshv_root_hv_call.c
-f:drivers/hv/mshv_root_main.c
-f:drivers/hv/mshv_synic.c
-f:drivers/hv/ring_buffer.c
-f:drivers/hv/vmbus_drv.c
-f:drivers/hwmon/Kconfig
-f:drivers/hwmon/Makefile
-f:drivers/hwmon/abituguru.c
-f:drivers/hwmon/abituguru3.c
-f:drivers/hwmon/acpi_power_meter.c
-f:drivers/hwmon/ad7314.c
-f:drivers/hwmon/ad7414.c
-f:drivers/hwmon/ad7418.c
-f:drivers/hwmon/adc128d818.c
-f:drivers/hwmon/adcxx.c
-f:drivers/hwmon/adm1025.c
-f:drivers/hwmon/adm1026.c
-f:drivers/hwmon/adm1029.c
-f:drivers/hwmon/adm1031.c
-f:drivers/hwmon/adm1177.c
-f:drivers/hwmon/adm9240.c
-f:drivers/hwmon/ads7828.c
-f:drivers/hwmon/ads7871.c
-f:drivers/hwmon/adt7310.c
-f:drivers/hwmon/adt7410.c
-f:drivers/hwmon/adt7411.c
-f:drivers/hwmon/adt7462.c
-f:drivers/hwmon/adt7470.c
-f:drivers/hwmon/adt7475.c
-f:drivers/hwmon/adt7x10.c
-f:drivers/hwmon/adt7x10.h
-f:drivers/hwmon/aht10.c
-f:drivers/hwmon/amc6821.c
-f:drivers/hwmon/applesmc.c
-f:drivers/hwmon/aquacomputer_d5next.c
-f:drivers/hwmon/as370-hwmon.c
-f:drivers/hwmon/asb100.c
-f:drivers/hwmon/asc7621.c
-f:drivers/hwmon/aspeed-g6-pwm-tach.c
-f:drivers/hwmon/aspeed-pwm-tacho.c
-f:drivers/hwmon/asus-ec-sensors.c
-f:drivers/hwmon/asus_atk0110.c
-f:drivers/hwmon/asus_rog_ryujin.c
-f:drivers/hwmon/asus_wmi_sensors.c
-f:drivers/hwmon/atxp1.c
-f:drivers/hwmon/axi-fan-control.c
-f:drivers/hwmon/bt1-pvt.c
-f:drivers/hwmon/bt1-pvt.h
-f:drivers/hwmon/cgbc-hwmon.c
-f:drivers/hwmon/chipcap2.c
-f:drivers/hwmon/coretemp.c
-f:drivers/hwmon/corsair-cpro.c
-f:drivers/hwmon/corsair-psu.c
-f:drivers/hwmon/cros_ec_hwmon.c
-f:drivers/hwmon/da9052-hwmon.c
-f:drivers/hwmon/da9055-hwmon.c
-f:drivers/hwmon/dell-smm-hwmon.c
-f:drivers/hwmon/dme1737.c
-f:drivers/hwmon/drivetemp.c
-f:drivers/hwmon/ds1621.c
-f:drivers/hwmon/ds620.c
-f:drivers/hwmon/emc1403.c
-f:drivers/hwmon/emc2103.c
-f:drivers/hwmon/emc2305.c
-f:drivers/hwmon/emc6w201.c
-f:drivers/hwmon/f71805f.c
-f:drivers/hwmon/f71882fg.c
-f:drivers/hwmon/f75375s.c
-f:drivers/hwmon/fam15h_power.c
-f:drivers/hwmon/fschmd.c
-f:drivers/hwmon/ftsteutates.c
-f:drivers/hwmon/g760a.c
-f:drivers/hwmon/g762.c
-f:drivers/hwmon/gigabyte_waterforce.c
-f:drivers/hwmon/gl518sm.c
-f:drivers/hwmon/gl520sm.c
-f:drivers/hwmon/gpio-fan.c
-f:drivers/hwmon/gsc-hwmon.c
-f:drivers/hwmon/gxp-fan-ctrl.c
-f:drivers/hwmon/hih6130.c
-f:drivers/hwmon/hp-wmi-sensors.c
-f:drivers/hwmon/hs3001.c
-f:drivers/hwmon/htu31.c
-f:drivers/hwmon/hwmon-vid.c
-f:drivers/hwmon/hwmon.c
-f:drivers/hwmon/i5500_temp.c
-f:drivers/hwmon/i5k_amb.c
-f:drivers/hwmon/ibmaem.c
-f:drivers/hwmon/ibmpex.c
-f:drivers/hwmon/ibmpowernv.c
-f:drivers/hwmon/iio_hwmon.c
-f:drivers/hwmon/ina209.c
-f:drivers/hwmon/ina238.c
-f:drivers/hwmon/ina2xx.c
-f:drivers/hwmon/ina3221.c
-f:drivers/hwmon/intel-m10-bmc-hwmon.c
-f:drivers/hwmon/isl28022.c
-f:drivers/hwmon/it87.c
-f:drivers/hwmon/jc42.c
-f:drivers/hwmon/k10temp.c
-f:drivers/hwmon/k8temp.c
-f:drivers/hwmon/kbatt.c
-f:drivers/hwmon/kfan.c
-f:drivers/hwmon/lan966x-hwmon.c
-f:drivers/hwmon/lenovo-ec-sensors.c
-f:drivers/hwmon/lineage-pem.c
-f:drivers/hwmon/lm63.c
-f:drivers/hwmon/lm70.c
-f:drivers/hwmon/lm73.c
-f:drivers/hwmon/lm75.c
-f:drivers/hwmon/lm75.h
-f:drivers/hwmon/lm77.c
-f:drivers/hwmon/lm78.c
-f:drivers/hwmon/lm80.c
-f:drivers/hwmon/lm83.c
-f:drivers/hwmon/lm85.c
-f:drivers/hwmon/lm87.c
-f:drivers/hwmon/lm90.c
-f:drivers/hwmon/lm92.c
-f:drivers/hwmon/lm93.c
-f:drivers/hwmon/lm95234.c
-f:drivers/hwmon/lm95241.c
-f:drivers/hwmon/lm95245.c
-f:drivers/hwmon/lochnagar-hwmon.c
-f:drivers/hwmon/ltc2945.c
-f:drivers/hwmon/ltc2947-core.c
-f:drivers/hwmon/ltc2947-i2c.c
-f:drivers/hwmon/ltc2947-spi.c
-f:drivers/hwmon/ltc2947.h
-f:drivers/hwmon/ltc2990.c
-f:drivers/hwmon/ltc2991.c
-f:drivers/hwmon/ltc2992.c
-f:drivers/hwmon/ltc4151.c
-f:drivers/hwmon/ltc4215.c
-f:drivers/hwmon/ltc4222.c
-f:drivers/hwmon/ltc4245.c
-f:drivers/hwmon/ltc4260.c
-f:drivers/hwmon/ltc4261.c
-f:drivers/hwmon/ltc4282.c
-f:drivers/hwmon/ltq-cputemp.c
-f:drivers/hwmon/max1111.c
-f:drivers/hwmon/max127.c
-f:drivers/hwmon/max16065.c
-f:drivers/hwmon/max1619.c
-f:drivers/hwmon/max1668.c
-f:drivers/hwmon/max197.c
-f:drivers/hwmon/max31722.c
-f:drivers/hwmon/max31730.c
-f:drivers/hwmon/max31760.c
-f:drivers/hwmon/max31790.c
-f:drivers/hwmon/max31827.c
-f:drivers/hwmon/max6620.c
-f:drivers/hwmon/max6621.c
-f:drivers/hwmon/max6639.c
-f:drivers/hwmon/max6650.c
-f:drivers/hwmon/max6697.c
-f:drivers/hwmon/max77705-hwmon.c
-f:drivers/hwmon/mc13783-adc.c
-f:drivers/hwmon/mc33xs2410_hwmon.c
-f:drivers/hwmon/mc34vr500.c
-f:drivers/hwmon/mcp3021.c
-f:drivers/hwmon/menf21bmc_hwmon.c
-f:drivers/hwmon/mlxreg-fan.c
-f:drivers/hwmon/mr75203.c
-f:drivers/hwmon/nct6683.c
-f:drivers/hwmon/nct6775-core.c
-f:drivers/hwmon/nct6775-i2c.c
-f:drivers/hwmon/nct6775-platform.c
-f:drivers/hwmon/nct6775.h
-f:drivers/hwmon/nct7363.c
-f:drivers/hwmon/nct7802.c
-f:drivers/hwmon/nct7904.c
-f:drivers/hwmon/npcm750-pwm-fan.c
-f:drivers/hwmon/nsa320-hwmon.c
-f:drivers/hwmon/ntc_thermistor.c
-f:drivers/hwmon/nzxt-kraken2.c
-f:drivers/hwmon/nzxt-kraken3.c
-f:drivers/hwmon/nzxt-smart2.c
-f:drivers/hwmon/occ/Kconfig
-f:drivers/hwmon/occ/Makefile
-f:drivers/hwmon/occ/common.c
-f:drivers/hwmon/occ/common.h
-f:drivers/hwmon/occ/p8_i2c.c
-f:drivers/hwmon/occ/p9_sbe.c
-f:drivers/hwmon/occ/sysfs.c
-f:drivers/hwmon/pc87360.c
-f:drivers/hwmon/pc87427.c
-f:drivers/hwmon/pcf8591.c
-f:drivers/hwmon/peci/Kconfig
-f:drivers/hwmon/peci/Makefile
-f:drivers/hwmon/peci/common.h
-f:drivers/hwmon/peci/cputemp.c
-f:drivers/hwmon/peci/dimmtemp.c
-f:drivers/hwmon/pmbus/Kconfig
-f:drivers/hwmon/pmbus/Makefile
-f:drivers/hwmon/pmbus/acbel-fsg032.c
-f:drivers/hwmon/pmbus/adm1266.c
-f:drivers/hwmon/pmbus/adm1275.c
-f:drivers/hwmon/pmbus/adp1050.c
-f:drivers/hwmon/pmbus/bel-pfe.c
-f:drivers/hwmon/pmbus/bpa-rs600.c
-f:drivers/hwmon/pmbus/crps.c
-f:drivers/hwmon/pmbus/delta-ahe50dc-fan.c
-f:drivers/hwmon/pmbus/dps920ab.c
-f:drivers/hwmon/pmbus/fsp-3y.c
-f:drivers/hwmon/pmbus/ibm-cffps.c
-f:drivers/hwmon/pmbus/ina233.c
-f:drivers/hwmon/pmbus/inspur-ipsps.c
-f:drivers/hwmon/pmbus/ir35221.c
-f:drivers/hwmon/pmbus/ir36021.c
-f:drivers/hwmon/pmbus/ir38064.c
-f:drivers/hwmon/pmbus/irps5401.c
-f:drivers/hwmon/pmbus/isl68137.c
-f:drivers/hwmon/pmbus/lm25066.c
-f:drivers/hwmon/pmbus/lt3074.c
-f:drivers/hwmon/pmbus/lt7182s.c
-f:drivers/hwmon/pmbus/ltc2978.c
-f:drivers/hwmon/pmbus/ltc3815.c
-f:drivers/hwmon/pmbus/ltc4286.c
-f:drivers/hwmon/pmbus/max15301.c
-f:drivers/hwmon/pmbus/max16064.c
-f:drivers/hwmon/pmbus/max16601.c
-f:drivers/hwmon/pmbus/max20730.c
-f:drivers/hwmon/pmbus/max20751.c
-f:drivers/hwmon/pmbus/max31785.c
-f:drivers/hwmon/pmbus/max34440.c
-f:drivers/hwmon/pmbus/max8688.c
-f:drivers/hwmon/pmbus/mp2856.c
-f:drivers/hwmon/pmbus/mp2888.c
-f:drivers/hwmon/pmbus/mp2891.c
-f:drivers/hwmon/pmbus/mp2975.c
-f:drivers/hwmon/pmbus/mp2993.c
-f:drivers/hwmon/pmbus/mp5023.c
-f:drivers/hwmon/pmbus/mp5920.c
-f:drivers/hwmon/pmbus/mp5990.c
-f:drivers/hwmon/pmbus/mp9941.c
-f:drivers/hwmon/pmbus/mpq7932.c
-f:drivers/hwmon/pmbus/mpq8785.c
-f:drivers/hwmon/pmbus/pim4328.c
-f:drivers/hwmon/pmbus/pli1209bc.c
-f:drivers/hwmon/pmbus/pm6764tr.c
-f:drivers/hwmon/pmbus/pmbus.c
-f:drivers/hwmon/pmbus/pmbus.h
-f:drivers/hwmon/pmbus/pmbus_core.c
-f:drivers/hwmon/pmbus/pxe1610.c
-f:drivers/hwmon/pmbus/q54sj108a2.c
-f:drivers/hwmon/pmbus/stpddc60.c
-f:drivers/hwmon/pmbus/tda38640.c
-f:drivers/hwmon/pmbus/tps25990.c
-f:drivers/hwmon/pmbus/tps40422.c
-f:drivers/hwmon/pmbus/tps53679.c
-f:drivers/hwmon/pmbus/tps546d24.c
-f:drivers/hwmon/pmbus/ucd9000.c
-f:drivers/hwmon/pmbus/ucd9200.c
-f:drivers/hwmon/pmbus/xdp710.c
-f:drivers/hwmon/pmbus/xdpe12284.c
-f:drivers/hwmon/pmbus/xdpe152c4.c
-f:drivers/hwmon/pmbus/zl6100.c
-f:drivers/hwmon/powerz.c
-f:drivers/hwmon/powr1220.c
-f:drivers/hwmon/pt5161l.c
-f:drivers/hwmon/pwm-fan.c
-f:drivers/hwmon/qnap-mcu-hwmon.c
-f:drivers/hwmon/raspberrypi-hwmon.c
-f:drivers/hwmon/sbtsi_temp.c
-f:drivers/hwmon/sch5627.c
-f:drivers/hwmon/sch5636.c
-f:drivers/hwmon/sch56xx-common.c
-f:drivers/hwmon/sch56xx-common.h
-f:drivers/hwmon/scmi-hwmon.c
-f:drivers/hwmon/scpi-hwmon.c
-f:drivers/hwmon/sfctemp.c
-f:drivers/hwmon/sg2042-mcu.c
-f:drivers/hwmon/sht15.c
-f:drivers/hwmon/sht21.c
-f:drivers/hwmon/sht3x.c
-f:drivers/hwmon/sht4x.c
-f:drivers/hwmon/shtc1.c
-f:drivers/hwmon/sis5595.c
-f:drivers/hwmon/sl28cpld-hwmon.c
-f:drivers/hwmon/smpro-hwmon.c
-f:drivers/hwmon/smsc47b397.c
-f:drivers/hwmon/smsc47m1.c
-f:drivers/hwmon/smsc47m192.c
-f:drivers/hwmon/sparx5-temp.c
-f:drivers/hwmon/spd5118.c
-f:drivers/hwmon/stts751.c
-f:drivers/hwmon/surface_fan.c
-f:drivers/hwmon/surface_temp.c
-f:drivers/hwmon/sy7636a-hwmon.c
-f:drivers/hwmon/tc654.c
-f:drivers/hwmon/tc74.c
-f:drivers/hwmon/thmc50.c
-f:drivers/hwmon/tmp102.c
-f:drivers/hwmon/tmp103.c
-f:drivers/hwmon/tmp108.c
-f:drivers/hwmon/tmp401.c
-f:drivers/hwmon/tmp421.c
-f:drivers/hwmon/tmp464.c
-f:drivers/hwmon/tmp513.c
-f:drivers/hwmon/tps23861.c
-f:drivers/hwmon/ultra45_env.c
-f:drivers/hwmon/vexpress-hwmon.c
-f:drivers/hwmon/via-cputemp.c
-f:drivers/hwmon/via686a.c
-f:drivers/hwmon/vt1211.c
-f:drivers/hwmon/vt8231.c
-f:drivers/hwmon/w83627ehf.c
-f:drivers/hwmon/w83627hf.c
-f:drivers/hwmon/w83773g.c
-f:drivers/hwmon/w83781d.c
-f:drivers/hwmon/w83791d.c
-f:drivers/hwmon/w83792d.c
-f:drivers/hwmon/w83793.c
-f:drivers/hwmon/w83795.c
-f:drivers/hwmon/w83l785ts.c
-f:drivers/hwmon/w83l786ng.c
-f:drivers/hwmon/wm831x-hwmon.c
-f:drivers/hwmon/wm8350-hwmon.c
-f:drivers/hwmon/xgene-hwmon.c
-f:drivers/hwspinlock/Kconfig
-f:drivers/hwspinlock/Makefile
-f:drivers/hwspinlock/hwspinlock_core.c
-f:drivers/hwspinlock/hwspinlock_internal.h
-f:drivers/hwspinlock/omap_hwspinlock.c
-f:drivers/hwspinlock/qcom_hwspinlock.c
-f:drivers/hwspinlock/sprd_hwspinlock.c
-f:drivers/hwspinlock/stm32_hwspinlock.c
-f:drivers/hwspinlock/sun6i_hwspinlock.c
-f:drivers/hwspinlock/u8500_hsem.c
-f:drivers/hwtracing/Kconfig
-f:drivers/hwtracing/coresight/Kconfig
-f:drivers/hwtracing/coresight/Makefile
-f:drivers/hwtracing/coresight/coresight-catu.c
-f:drivers/hwtracing/coresight/coresight-catu.h
-f:drivers/hwtracing/coresight/coresight-cfg-afdo.c
-f:drivers/hwtracing/coresight/coresight-cfg-preload.c
-f:drivers/hwtracing/coresight/coresight-cfg-preload.h
-f:drivers/hwtracing/coresight/coresight-cfg-pstop.c
-f:drivers/hwtracing/coresight/coresight-config.c
-f:drivers/hwtracing/coresight/coresight-config.h
-f:drivers/hwtracing/coresight/coresight-core.c
-f:drivers/hwtracing/coresight/coresight-cpu-debug.c
-f:drivers/hwtracing/coresight/coresight-ctcu-core.c
-f:drivers/hwtracing/coresight/coresight-ctcu.h
-f:drivers/hwtracing/coresight/coresight-cti-core.c
-f:drivers/hwtracing/coresight/coresight-cti-platform.c
-f:drivers/hwtracing/coresight/coresight-cti-sysfs.c
-f:drivers/hwtracing/coresight/coresight-cti.h
-f:drivers/hwtracing/coresight/coresight-dummy.c
-f:drivers/hwtracing/coresight/coresight-etb10.c
-f:drivers/hwtracing/coresight/coresight-etm-cp14.c
-f:drivers/hwtracing/coresight/coresight-etm-perf.c
-f:drivers/hwtracing/coresight/coresight-etm-perf.h
-f:drivers/hwtracing/coresight/coresight-etm.h
-f:drivers/hwtracing/coresight/coresight-etm3x-core.c
-f:drivers/hwtracing/coresight/coresight-etm3x-sysfs.c
-f:drivers/hwtracing/coresight/coresight-etm4x-cfg.c
-f:drivers/hwtracing/coresight/coresight-etm4x-cfg.h
-f:drivers/hwtracing/coresight/coresight-etm4x-core.c
-f:drivers/hwtracing/coresight/coresight-etm4x-sysfs.c
-f:drivers/hwtracing/coresight/coresight-etm4x.h
-f:drivers/hwtracing/coresight/coresight-funnel.c
-f:drivers/hwtracing/coresight/coresight-kunit-tests.c
-f:drivers/hwtracing/coresight/coresight-platform.c
-f:drivers/hwtracing/coresight/coresight-priv.h
-f:drivers/hwtracing/coresight/coresight-replicator.c
-f:drivers/hwtracing/coresight/coresight-self-hosted-trace.h
-f:drivers/hwtracing/coresight/coresight-stm.c
-f:drivers/hwtracing/coresight/coresight-syscfg-configfs.c
-f:drivers/hwtracing/coresight/coresight-syscfg-configfs.h
-f:drivers/hwtracing/coresight/coresight-syscfg.c
-f:drivers/hwtracing/coresight/coresight-syscfg.h
-f:drivers/hwtracing/coresight/coresight-sysfs.c
-f:drivers/hwtracing/coresight/coresight-tmc-core.c
-f:drivers/hwtracing/coresight/coresight-tmc-etf.c
-f:drivers/hwtracing/coresight/coresight-tmc-etr.c
-f:drivers/hwtracing/coresight/coresight-tmc.h
-f:drivers/hwtracing/coresight/coresight-tpda.c
-f:drivers/hwtracing/coresight/coresight-tpda.h
-f:drivers/hwtracing/coresight/coresight-tpdm.c
-f:drivers/hwtracing/coresight/coresight-tpdm.h
-f:drivers/hwtracing/coresight/coresight-tpiu.c
-f:drivers/hwtracing/coresight/coresight-trace-id.c
-f:drivers/hwtracing/coresight/coresight-trace-id.h
-f:drivers/hwtracing/coresight/coresight-trbe.c
-f:drivers/hwtracing/coresight/coresight-trbe.h
-f:drivers/hwtracing/coresight/ultrasoc-smb.c
-f:drivers/hwtracing/coresight/ultrasoc-smb.h
-f:drivers/hwtracing/intel_th/Kconfig
-f:drivers/hwtracing/intel_th/Makefile
-f:drivers/hwtracing/intel_th/acpi.c
-f:drivers/hwtracing/intel_th/core.c
-f:drivers/hwtracing/intel_th/debug.c
-f:drivers/hwtracing/intel_th/debug.h
-f:drivers/hwtracing/intel_th/gth.c
-f:drivers/hwtracing/intel_th/gth.h
-f:drivers/hwtracing/intel_th/intel_th.h
-f:drivers/hwtracing/intel_th/msu-sink.c
-f:drivers/hwtracing/intel_th/msu.c
-f:drivers/hwtracing/intel_th/msu.h
-f:drivers/hwtracing/intel_th/pci.c
-f:drivers/hwtracing/intel_th/pti.c
-f:drivers/hwtracing/intel_th/pti.h
-f:drivers/hwtracing/intel_th/sth.c
-f:drivers/hwtracing/intel_th/sth.h
-f:drivers/hwtracing/ptt/Kconfig
-f:drivers/hwtracing/ptt/Makefile
-f:drivers/hwtracing/ptt/hisi_ptt.c
-f:drivers/hwtracing/ptt/hisi_ptt.h
-f:drivers/hwtracing/stm/Kconfig
-f:drivers/hwtracing/stm/Makefile
-f:drivers/hwtracing/stm/console.c
-f:drivers/hwtracing/stm/core.c
-f:drivers/hwtracing/stm/dummy_stm.c
-f:drivers/hwtracing/stm/ftrace.c
-f:drivers/hwtracing/stm/heartbeat.c
-f:drivers/hwtracing/stm/p_basic.c
-f:drivers/hwtracing/stm/p_sys-t.c
-f:drivers/hwtracing/stm/policy.c
-f:drivers/hwtracing/stm/stm.h
-f:drivers/i2c/Kconfig
-f:drivers/i2c/Makefile
-f:drivers/i2c/algos/Kconfig
-f:drivers/i2c/algos/Makefile
-f:drivers/i2c/algos/i2c-algo-bit.c
-f:drivers/i2c/algos/i2c-algo-pca.c
-f:drivers/i2c/algos/i2c-algo-pcf.c
-f:drivers/i2c/algos/i2c-algo-pcf.h
-f:drivers/i2c/busses/Kconfig
-f:drivers/i2c/busses/Makefile
-f:drivers/i2c/busses/i2c-acorn.c
-f:drivers/i2c/busses/i2c-ali1535.c
-f:drivers/i2c/busses/i2c-ali1563.c
-f:drivers/i2c/busses/i2c-ali15x3.c
-f:drivers/i2c/busses/i2c-altera.c
-f:drivers/i2c/busses/i2c-amd-asf-plat.c
-f:drivers/i2c/busses/i2c-amd-mp2-pci.c
-f:drivers/i2c/busses/i2c-amd-mp2-plat.c
-f:drivers/i2c/busses/i2c-amd-mp2.h
-f:drivers/i2c/busses/i2c-amd756.c
-f:drivers/i2c/busses/i2c-amd8111.c
-f:drivers/i2c/busses/i2c-aspeed.c
-f:drivers/i2c/busses/i2c-at91-core.c
-f:drivers/i2c/busses/i2c-at91-master.c
-f:drivers/i2c/busses/i2c-at91-slave.c
-f:drivers/i2c/busses/i2c-at91.h
-f:drivers/i2c/busses/i2c-au1550.c
-f:drivers/i2c/busses/i2c-axxia.c
-f:drivers/i2c/busses/i2c-bcm-iproc.c
-f:drivers/i2c/busses/i2c-bcm-kona.c
-f:drivers/i2c/busses/i2c-bcm2835.c
-f:drivers/i2c/busses/i2c-brcmstb.c
-f:drivers/i2c/busses/i2c-cadence.c
-f:drivers/i2c/busses/i2c-cbus-gpio.c
-f:drivers/i2c/busses/i2c-ccgx-ucsi.c
-f:drivers/i2c/busses/i2c-ccgx-ucsi.h
-f:drivers/i2c/busses/i2c-cgbc.c
-f:drivers/i2c/busses/i2c-cht-wc.c
-f:drivers/i2c/busses/i2c-cp2615.c
-f:drivers/i2c/busses/i2c-cpm.c
-f:drivers/i2c/busses/i2c-cros-ec-tunnel.c
-f:drivers/i2c/busses/i2c-davinci.c
-f:drivers/i2c/busses/i2c-designware-amdisp.c
-f:drivers/i2c/busses/i2c-designware-amdpsp.c
-f:drivers/i2c/busses/i2c-designware-baytrail.c
-f:drivers/i2c/busses/i2c-designware-common.c
-f:drivers/i2c/busses/i2c-designware-core.h
-f:drivers/i2c/busses/i2c-designware-master.c
-f:drivers/i2c/busses/i2c-designware-pcidrv.c
-f:drivers/i2c/busses/i2c-designware-platdrv.c
-f:drivers/i2c/busses/i2c-designware-slave.c
-f:drivers/i2c/busses/i2c-digicolor.c
-f:drivers/i2c/busses/i2c-diolan-u2c.c
-f:drivers/i2c/busses/i2c-dln2.c
-f:drivers/i2c/busses/i2c-eg20t.c
-f:drivers/i2c/busses/i2c-elektor.c
-f:drivers/i2c/busses/i2c-emev2.c
-f:drivers/i2c/busses/i2c-exynos5.c
-f:drivers/i2c/busses/i2c-fsi.c
-f:drivers/i2c/busses/i2c-gpio.c
-f:drivers/i2c/busses/i2c-gxp.c
-f:drivers/i2c/busses/i2c-highlander.c
-f:drivers/i2c/busses/i2c-hisi.c
-f:drivers/i2c/busses/i2c-hix5hd2.c
-f:drivers/i2c/busses/i2c-hydra.c
-f:drivers/i2c/busses/i2c-i801.c
-f:drivers/i2c/busses/i2c-ibm_iic.c
-f:drivers/i2c/busses/i2c-ibm_iic.h
-f:drivers/i2c/busses/i2c-icy.c
-f:drivers/i2c/busses/i2c-img-scb.c
-f:drivers/i2c/busses/i2c-imx-lpi2c.c
-f:drivers/i2c/busses/i2c-imx.c
-f:drivers/i2c/busses/i2c-iop3xx.c
-f:drivers/i2c/busses/i2c-iop3xx.h
-f:drivers/i2c/busses/i2c-isch.c
-f:drivers/i2c/busses/i2c-ismt.c
-f:drivers/i2c/busses/i2c-jz4780.c
-f:drivers/i2c/busses/i2c-k1.c
-f:drivers/i2c/busses/i2c-keba.c
-f:drivers/i2c/busses/i2c-kempld.c
-f:drivers/i2c/busses/i2c-ljca.c
-f:drivers/i2c/busses/i2c-lpc2k.c
-f:drivers/i2c/busses/i2c-ls2x.c
-f:drivers/i2c/busses/i2c-mchp-pci1xxxx.c
-f:drivers/i2c/busses/i2c-meson.c
-f:drivers/i2c/busses/i2c-microchip-corei2c.c
-f:drivers/i2c/busses/i2c-mlxbf.c
-f:drivers/i2c/busses/i2c-mlxcpld.c
-f:drivers/i2c/busses/i2c-mpc.c
-f:drivers/i2c/busses/i2c-mt65xx.c
-f:drivers/i2c/busses/i2c-mt7621.c
-f:drivers/i2c/busses/i2c-mv64xxx.c
-f:drivers/i2c/busses/i2c-mxs.c
-f:drivers/i2c/busses/i2c-nforce2.c
-f:drivers/i2c/busses/i2c-nomadik.c
-f:drivers/i2c/busses/i2c-npcm7xx.c
-f:drivers/i2c/busses/i2c-nvidia-gpu.c
-f:drivers/i2c/busses/i2c-ocores.c
-f:drivers/i2c/busses/i2c-octeon-core.c
-f:drivers/i2c/busses/i2c-octeon-core.h
-f:drivers/i2c/busses/i2c-octeon-platdrv.c
-f:drivers/i2c/busses/i2c-omap.c
-f:drivers/i2c/busses/i2c-opal.c
-f:drivers/i2c/busses/i2c-owl.c
-f:drivers/i2c/busses/i2c-parport.c
-f:drivers/i2c/busses/i2c-pasemi-core.c
-f:drivers/i2c/busses/i2c-pasemi-core.h
-f:drivers/i2c/busses/i2c-pasemi-pci.c
-f:drivers/i2c/busses/i2c-pasemi-platform.c
-f:drivers/i2c/busses/i2c-pca-isa.c
-f:drivers/i2c/busses/i2c-pca-platform.c
-f:drivers/i2c/busses/i2c-piix4.c
-f:drivers/i2c/busses/i2c-piix4.h
-f:drivers/i2c/busses/i2c-pnx.c
-f:drivers/i2c/busses/i2c-powermac.c
-f:drivers/i2c/busses/i2c-pxa-pci.c
-f:drivers/i2c/busses/i2c-pxa.c
-f:drivers/i2c/busses/i2c-qcom-cci.c
-f:drivers/i2c/busses/i2c-qcom-geni.c
-f:drivers/i2c/busses/i2c-qup.c
-f:drivers/i2c/busses/i2c-rcar.c
-f:drivers/i2c/busses/i2c-riic.c
-f:drivers/i2c/busses/i2c-rk3x.c
-f:drivers/i2c/busses/i2c-robotfuzz-osif.c
-f:drivers/i2c/busses/i2c-rtl9300.c
-f:drivers/i2c/busses/i2c-rzv2m.c
-f:drivers/i2c/busses/i2c-s3c2410.c
-f:drivers/i2c/busses/i2c-scmi.c
-f:drivers/i2c/busses/i2c-sh7760.c
-f:drivers/i2c/busses/i2c-sh_mobile.c
-f:drivers/i2c/busses/i2c-sibyte.c
-f:drivers/i2c/busses/i2c-simtec.c
-f:drivers/i2c/busses/i2c-sis5595.c
-f:drivers/i2c/busses/i2c-sis630.c
-f:drivers/i2c/busses/i2c-sis96x.c
-f:drivers/i2c/busses/i2c-sprd.c
-f:drivers/i2c/busses/i2c-st.c
-f:drivers/i2c/busses/i2c-stm32.c
-f:drivers/i2c/busses/i2c-stm32.h
-f:drivers/i2c/busses/i2c-stm32f4.c
-f:drivers/i2c/busses/i2c-stm32f7.c
-f:drivers/i2c/busses/i2c-sun6i-p2wi.c
-f:drivers/i2c/busses/i2c-synquacer.c
-f:drivers/i2c/busses/i2c-taos-evm.c
-f:drivers/i2c/busses/i2c-tegra-bpmp.c
-f:drivers/i2c/busses/i2c-tegra.c
-f:drivers/i2c/busses/i2c-thunderx-pcidrv.c
-f:drivers/i2c/busses/i2c-tiny-usb.c
-f:drivers/i2c/busses/i2c-uniphier-f.c
-f:drivers/i2c/busses/i2c-uniphier.c
-f:drivers/i2c/busses/i2c-versatile.c
-f:drivers/i2c/busses/i2c-via.c
-f:drivers/i2c/busses/i2c-viai2c-common.c
-f:drivers/i2c/busses/i2c-viai2c-common.h
-f:drivers/i2c/busses/i2c-viai2c-wmt.c
-f:drivers/i2c/busses/i2c-viai2c-zhaoxin.c
-f:drivers/i2c/busses/i2c-viapro.c
-f:drivers/i2c/busses/i2c-viperboard.c
-f:drivers/i2c/busses/i2c-virtio.c
-f:drivers/i2c/busses/i2c-xgene-slimpro.c
-f:drivers/i2c/busses/i2c-xiic.c
-f:drivers/i2c/busses/i2c-xlp9xx.c
-f:drivers/i2c/busses/scx200_acb.c
-f:drivers/i2c/i2c-atr.c
-f:drivers/i2c/i2c-boardinfo.c
-f:drivers/i2c/i2c-core-acpi.c
-f:drivers/i2c/i2c-core-base.c
-f:drivers/i2c/i2c-core-of-prober.c
-f:drivers/i2c/i2c-core-of.c
-f:drivers/i2c/i2c-core-slave.c
-f:drivers/i2c/i2c-core-smbus.c
-f:drivers/i2c/i2c-core.h
-f:drivers/i2c/i2c-dev.c
-f:drivers/i2c/i2c-mux.c
-f:drivers/i2c/i2c-slave-eeprom.c
-f:drivers/i2c/i2c-slave-testunit.c
-f:drivers/i2c/i2c-smbus.c
-f:drivers/i2c/i2c-stub.c
-f:drivers/i2c/muxes/Kconfig
-f:drivers/i2c/muxes/Makefile
-f:drivers/i2c/muxes/i2c-arb-gpio-challenge.c
-f:drivers/i2c/muxes/i2c-demux-pinctrl.c
-f:drivers/i2c/muxes/i2c-mux-gpio.c
-f:drivers/i2c/muxes/i2c-mux-gpmux.c
-f:drivers/i2c/muxes/i2c-mux-ltc4306.c
-f:drivers/i2c/muxes/i2c-mux-mlxcpld.c
-f:drivers/i2c/muxes/i2c-mux-mule.c
-f:drivers/i2c/muxes/i2c-mux-pca9541.c
-f:drivers/i2c/muxes/i2c-mux-pca954x.c
-f:drivers/i2c/muxes/i2c-mux-pinctrl.c
-f:drivers/i2c/muxes/i2c-mux-reg.c
-f:drivers/i3c/Kconfig
-f:drivers/i3c/Makefile
-f:drivers/i3c/device.c
-f:drivers/i3c/internals.h
-f:drivers/i3c/master.c
-f:drivers/i3c/master/Kconfig
-f:drivers/i3c/master/Makefile
-f:drivers/i3c/master/ast2600-i3c-master.c
-f:drivers/i3c/master/dw-i3c-master.c
-f:drivers/i3c/master/dw-i3c-master.h
-f:drivers/i3c/master/i3c-master-cdns.c
-f:drivers/i3c/master/mipi-i3c-hci/Makefile
-f:drivers/i3c/master/mipi-i3c-hci/cmd.h
-f:drivers/i3c/master/mipi-i3c-hci/cmd_v1.c
-f:drivers/i3c/master/mipi-i3c-hci/cmd_v2.c
-f:drivers/i3c/master/mipi-i3c-hci/core.c
-f:drivers/i3c/master/mipi-i3c-hci/dat.h
-f:drivers/i3c/master/mipi-i3c-hci/dat_v1.c
-f:drivers/i3c/master/mipi-i3c-hci/dct.h
-f:drivers/i3c/master/mipi-i3c-hci/dct_v1.c
-f:drivers/i3c/master/mipi-i3c-hci/dma.c
-f:drivers/i3c/master/mipi-i3c-hci/ext_caps.c
-f:drivers/i3c/master/mipi-i3c-hci/ext_caps.h
-f:drivers/i3c/master/mipi-i3c-hci/hci.h
-f:drivers/i3c/master/mipi-i3c-hci/hci_quirks.c
-f:drivers/i3c/master/mipi-i3c-hci/ibi.h
-f:drivers/i3c/master/mipi-i3c-hci/mipi-i3c-hci-pci.c
-f:drivers/i3c/master/mipi-i3c-hci/pio.c
-f:drivers/i3c/master/mipi-i3c-hci/xfer_mode_rate.h
-f:drivers/i3c/master/svc-i3c-master.c
-f:drivers/idle/Kconfig
-f:drivers/idle/Makefile
-f:drivers/idle/intel_idle.c
-f:drivers/iio/Kconfig
-f:drivers/iio/Makefile
-f:drivers/iio/TODO
-f:drivers/iio/accel/Kconfig
-f:drivers/iio/accel/Makefile
-f:drivers/iio/accel/adis16201.c
-f:drivers/iio/accel/adis16209.c
-f:drivers/iio/accel/adxl313.h
-f:drivers/iio/accel/adxl313_core.c
-f:drivers/iio/accel/adxl313_i2c.c
-f:drivers/iio/accel/adxl313_spi.c
-f:drivers/iio/accel/adxl345.h
-f:drivers/iio/accel/adxl345_core.c
-f:drivers/iio/accel/adxl345_i2c.c
-f:drivers/iio/accel/adxl345_spi.c
-f:drivers/iio/accel/adxl355.h
-f:drivers/iio/accel/adxl355_core.c
-f:drivers/iio/accel/adxl355_i2c.c
-f:drivers/iio/accel/adxl355_spi.c
-f:drivers/iio/accel/adxl367.c
-f:drivers/iio/accel/adxl367.h
-f:drivers/iio/accel/adxl367_i2c.c
-f:drivers/iio/accel/adxl367_spi.c
-f:drivers/iio/accel/adxl372.c
-f:drivers/iio/accel/adxl372.h
-f:drivers/iio/accel/adxl372_i2c.c
-f:drivers/iio/accel/adxl372_spi.c
-f:drivers/iio/accel/adxl380.c
-f:drivers/iio/accel/adxl380.h
-f:drivers/iio/accel/adxl380_i2c.c
-f:drivers/iio/accel/adxl380_spi.c
-f:drivers/iio/accel/bma180.c
-f:drivers/iio/accel/bma220_spi.c
-f:drivers/iio/accel/bma400.h
-f:drivers/iio/accel/bma400_core.c
-f:drivers/iio/accel/bma400_i2c.c
-f:drivers/iio/accel/bma400_spi.c
-f:drivers/iio/accel/bmc150-accel-core.c
-f:drivers/iio/accel/bmc150-accel-i2c.c
-f:drivers/iio/accel/bmc150-accel-spi.c
-f:drivers/iio/accel/bmc150-accel.h
-f:drivers/iio/accel/bmi088-accel-core.c
-f:drivers/iio/accel/bmi088-accel-i2c.c
-f:drivers/iio/accel/bmi088-accel-spi.c
-f:drivers/iio/accel/bmi088-accel.h
-f:drivers/iio/accel/cros_ec_accel_legacy.c
-f:drivers/iio/accel/da280.c
-f:drivers/iio/accel/da311.c
-f:drivers/iio/accel/dmard06.c
-f:drivers/iio/accel/dmard09.c
-f:drivers/iio/accel/dmard10.c
-f:drivers/iio/accel/fxls8962af-core.c
-f:drivers/iio/accel/fxls8962af-i2c.c
-f:drivers/iio/accel/fxls8962af-spi.c
-f:drivers/iio/accel/fxls8962af.h
-f:drivers/iio/accel/hid-sensor-accel-3d.c
-f:drivers/iio/accel/kionix-kx022a-i2c.c
-f:drivers/iio/accel/kionix-kx022a-spi.c
-f:drivers/iio/accel/kionix-kx022a.c
-f:drivers/iio/accel/kionix-kx022a.h
-f:drivers/iio/accel/kxcjk-1013.c
-f:drivers/iio/accel/kxsd9-i2c.c
-f:drivers/iio/accel/kxsd9-spi.c
-f:drivers/iio/accel/kxsd9.c
-f:drivers/iio/accel/kxsd9.h
-f:drivers/iio/accel/mc3230.c
-f:drivers/iio/accel/mma7455.h
-f:drivers/iio/accel/mma7455_core.c
-f:drivers/iio/accel/mma7455_i2c.c
-f:drivers/iio/accel/mma7455_spi.c
-f:drivers/iio/accel/mma7660.c
-f:drivers/iio/accel/mma8452.c
-f:drivers/iio/accel/mma9551.c
-f:drivers/iio/accel/mma9551_core.c
-f:drivers/iio/accel/mma9551_core.h
-f:drivers/iio/accel/mma9553.c
-f:drivers/iio/accel/msa311.c
-f:drivers/iio/accel/mxc4005.c
-f:drivers/iio/accel/mxc6255.c
-f:drivers/iio/accel/sca3000.c
-f:drivers/iio/accel/sca3300.c
-f:drivers/iio/accel/ssp_accel_sensor.c
-f:drivers/iio/accel/st_accel.h
-f:drivers/iio/accel/st_accel_buffer.c
-f:drivers/iio/accel/st_accel_core.c
-f:drivers/iio/accel/st_accel_i2c.c
-f:drivers/iio/accel/st_accel_spi.c
-f:drivers/iio/accel/stk8312.c
-f:drivers/iio/accel/stk8ba50.c
-f:drivers/iio/adc/Kconfig
-f:drivers/iio/adc/Makefile
-f:drivers/iio/adc/ab8500-gpadc.c
-f:drivers/iio/adc/ad4000.c
-f:drivers/iio/adc/ad4030.c
-f:drivers/iio/adc/ad4080.c
-f:drivers/iio/adc/ad4130.c
-f:drivers/iio/adc/ad4170-4.c
-f:drivers/iio/adc/ad4695.c
-f:drivers/iio/adc/ad4851.c
-f:drivers/iio/adc/ad7091r-base.c
-f:drivers/iio/adc/ad7091r-base.h
-f:drivers/iio/adc/ad7091r5.c
-f:drivers/iio/adc/ad7091r8.c
-f:drivers/iio/adc/ad7124.c
-f:drivers/iio/adc/ad7173.c
-f:drivers/iio/adc/ad7191.c
-f:drivers/iio/adc/ad7192.c
-f:drivers/iio/adc/ad7266.c
-f:drivers/iio/adc/ad7280a.c
-f:drivers/iio/adc/ad7291.c
-f:drivers/iio/adc/ad7292.c
-f:drivers/iio/adc/ad7298.c
-f:drivers/iio/adc/ad7380.c
-f:drivers/iio/adc/ad7405.c
-f:drivers/iio/adc/ad7476.c
-f:drivers/iio/adc/ad7606.c
-f:drivers/iio/adc/ad7606.h
-f:drivers/iio/adc/ad7606_bus_iface.h
-f:drivers/iio/adc/ad7606_par.c
-f:drivers/iio/adc/ad7606_spi.c
-f:drivers/iio/adc/ad7625.c
-f:drivers/iio/adc/ad7766.c
-f:drivers/iio/adc/ad7768-1.c
-f:drivers/iio/adc/ad7779.c
-f:drivers/iio/adc/ad7780.c
-f:drivers/iio/adc/ad7791.c
-f:drivers/iio/adc/ad7793.c
-f:drivers/iio/adc/ad7887.c
-f:drivers/iio/adc/ad7923.c
-f:drivers/iio/adc/ad7944.c
-f:drivers/iio/adc/ad7949.c
-f:drivers/iio/adc/ad799x.c
-f:drivers/iio/adc/ad9467.c
-f:drivers/iio/adc/ad_sigma_delta.c
-f:drivers/iio/adc/adi-axi-adc.c
-f:drivers/iio/adc/aspeed_adc.c
-f:drivers/iio/adc/at91-sama5d2_adc.c
-f:drivers/iio/adc/at91_adc.c
-f:drivers/iio/adc/axp20x_adc.c
-f:drivers/iio/adc/axp288_adc.c
-f:drivers/iio/adc/bcm_iproc_adc.c
-f:drivers/iio/adc/berlin2-adc.c
-f:drivers/iio/adc/cc10001_adc.c
-f:drivers/iio/adc/cpcap-adc.c
-f:drivers/iio/adc/da9150-gpadc.c
-f:drivers/iio/adc/dln2-adc.c
-f:drivers/iio/adc/envelope-detector.c
-f:drivers/iio/adc/ep93xx_adc.c
-f:drivers/iio/adc/exynos_adc.c
-f:drivers/iio/adc/fsl-imx25-gcq.c
-f:drivers/iio/adc/gehc-pmc-adc.c
-f:drivers/iio/adc/hi8435.c
-f:drivers/iio/adc/hx711.c
-f:drivers/iio/adc/imx7d_adc.c
-f:drivers/iio/adc/imx8qxp-adc.c
-f:drivers/iio/adc/imx93_adc.c
-f:drivers/iio/adc/ina2xx-adc.c
-f:drivers/iio/adc/industrialio-adc.c
-f:drivers/iio/adc/ingenic-adc.c
-f:drivers/iio/adc/intel_mrfld_adc.c
-f:drivers/iio/adc/lp8788_adc.c
-f:drivers/iio/adc/lpc18xx_adc.c
-f:drivers/iio/adc/lpc32xx_adc.c
-f:drivers/iio/adc/ltc2309.c
-f:drivers/iio/adc/ltc2471.c
-f:drivers/iio/adc/ltc2485.c
-f:drivers/iio/adc/ltc2496.c
-f:drivers/iio/adc/ltc2497-core.c
-f:drivers/iio/adc/ltc2497.c
-f:drivers/iio/adc/ltc2497.h
-f:drivers/iio/adc/max1027.c
-f:drivers/iio/adc/max11100.c
-f:drivers/iio/adc/max1118.c
-f:drivers/iio/adc/max11205.c
-f:drivers/iio/adc/max11410.c
-f:drivers/iio/adc/max1241.c
-f:drivers/iio/adc/max1363.c
-f:drivers/iio/adc/max34408.c
-f:drivers/iio/adc/max77541-adc.c
-f:drivers/iio/adc/max9611.c
-f:drivers/iio/adc/mcp320x.c
-f:drivers/iio/adc/mcp3422.c
-f:drivers/iio/adc/mcp3564.c
-f:drivers/iio/adc/mcp3911.c
-f:drivers/iio/adc/men_z188_adc.c
-f:drivers/iio/adc/meson_saradc.c
-f:drivers/iio/adc/mp2629_adc.c
-f:drivers/iio/adc/mt6359-auxadc.c
-f:drivers/iio/adc/mt6360-adc.c
-f:drivers/iio/adc/mt6370-adc.c
-f:drivers/iio/adc/mt6577_auxadc.c
-f:drivers/iio/adc/mxs-lradc-adc.c
-f:drivers/iio/adc/nau7802.c
-f:drivers/iio/adc/nct7201.c
-f:drivers/iio/adc/npcm_adc.c
-f:drivers/iio/adc/pac1921.c
-f:drivers/iio/adc/pac1934.c
-f:drivers/iio/adc/palmas_gpadc.c
-f:drivers/iio/adc/qcom-pm8xxx-xoadc.c
-f:drivers/iio/adc/qcom-spmi-adc5.c
-f:drivers/iio/adc/qcom-spmi-iadc.c
-f:drivers/iio/adc/qcom-spmi-rradc.c
-f:drivers/iio/adc/qcom-spmi-vadc.c
-f:drivers/iio/adc/qcom-vadc-common.c
-f:drivers/iio/adc/rcar-gyroadc.c
-f:drivers/iio/adc/rn5t618-adc.c
-f:drivers/iio/adc/rockchip_saradc.c
-f:drivers/iio/adc/rohm-bd79124.c
-f:drivers/iio/adc/rtq6056.c
-f:drivers/iio/adc/rzg2l_adc.c
-f:drivers/iio/adc/sc27xx_adc.c
-f:drivers/iio/adc/sd_adc_modulator.c
-f:drivers/iio/adc/sophgo-cv1800b-adc.c
-f:drivers/iio/adc/spear_adc.c
-f:drivers/iio/adc/stm32-adc-core.c
-f:drivers/iio/adc/stm32-adc-core.h
-f:drivers/iio/adc/stm32-adc.c
-f:drivers/iio/adc/stm32-dfsdm-adc.c
-f:drivers/iio/adc/stm32-dfsdm-core.c
-f:drivers/iio/adc/stm32-dfsdm.h
-f:drivers/iio/adc/stmpe-adc.c
-f:drivers/iio/adc/sun20i-gpadc-iio.c
-f:drivers/iio/adc/sun4i-gpadc-iio.c
-f:drivers/iio/adc/ti-adc081c.c
-f:drivers/iio/adc/ti-adc0832.c
-f:drivers/iio/adc/ti-adc084s021.c
-f:drivers/iio/adc/ti-adc108s102.c
-f:drivers/iio/adc/ti-adc12138.c
-f:drivers/iio/adc/ti-adc128s052.c
-f:drivers/iio/adc/ti-adc161s626.c
-f:drivers/iio/adc/ti-ads1015.c
-f:drivers/iio/adc/ti-ads1100.c
-f:drivers/iio/adc/ti-ads1119.c
-f:drivers/iio/adc/ti-ads124s08.c
-f:drivers/iio/adc/ti-ads1298.c
-f:drivers/iio/adc/ti-ads131e08.c
-f:drivers/iio/adc/ti-ads7138.c
-f:drivers/iio/adc/ti-ads7924.c
-f:drivers/iio/adc/ti-ads7950.c
-f:drivers/iio/adc/ti-ads8344.c
-f:drivers/iio/adc/ti-ads8688.c
-f:drivers/iio/adc/ti-lmp92064.c
-f:drivers/iio/adc/ti-tlc4541.c
-f:drivers/iio/adc/ti-tsc2046.c
-f:drivers/iio/adc/ti_am335x_adc.c
-f:drivers/iio/adc/twl4030-madc.c
-f:drivers/iio/adc/twl6030-gpadc.c
-f:drivers/iio/adc/vf610_adc.c
-f:drivers/iio/adc/viperboard_adc.c
-f:drivers/iio/adc/xilinx-ams.c
-f:drivers/iio/adc/xilinx-xadc-core.c
-f:drivers/iio/adc/xilinx-xadc-events.c
-f:drivers/iio/adc/xilinx-xadc.h
-f:drivers/iio/addac/Kconfig
-f:drivers/iio/addac/Makefile
-f:drivers/iio/addac/ad74115.c
-f:drivers/iio/addac/ad74413r.c
-f:drivers/iio/addac/stx104.c
-f:drivers/iio/afe/Kconfig
-f:drivers/iio/afe/Makefile
-f:drivers/iio/afe/iio-rescale.c
-f:drivers/iio/amplifiers/Kconfig
-f:drivers/iio/amplifiers/Makefile
-f:drivers/iio/amplifiers/ad8366.c
-f:drivers/iio/amplifiers/ada4250.c
-f:drivers/iio/amplifiers/hmc425a.c
-f:drivers/iio/buffer/Kconfig
-f:drivers/iio/buffer/Makefile
-f:drivers/iio/buffer/industrialio-buffer-cb.c
-f:drivers/iio/buffer/industrialio-buffer-dma.c
-f:drivers/iio/buffer/industrialio-buffer-dmaengine.c
-f:drivers/iio/buffer/industrialio-hw-consumer.c
-f:drivers/iio/buffer/industrialio-triggered-buffer.c
-f:drivers/iio/buffer/kfifo_buf.c
-f:drivers/iio/cdc/Kconfig
-f:drivers/iio/cdc/Makefile
-f:drivers/iio/cdc/ad7150.c
-f:drivers/iio/cdc/ad7746.c
-f:drivers/iio/chemical/Kconfig
-f:drivers/iio/chemical/Makefile
-f:drivers/iio/chemical/ags02ma.c
-f:drivers/iio/chemical/ams-iaq-core.c
-f:drivers/iio/chemical/atlas-ezo-sensor.c
-f:drivers/iio/chemical/atlas-sensor.c
-f:drivers/iio/chemical/bme680.h
-f:drivers/iio/chemical/bme680_core.c
-f:drivers/iio/chemical/bme680_i2c.c
-f:drivers/iio/chemical/bme680_spi.c
-f:drivers/iio/chemical/ccs811.c
-f:drivers/iio/chemical/ens160.h
-f:drivers/iio/chemical/ens160_core.c
-f:drivers/iio/chemical/ens160_i2c.c
-f:drivers/iio/chemical/ens160_spi.c
-f:drivers/iio/chemical/mhz19b.c
-f:drivers/iio/chemical/pms7003.c
-f:drivers/iio/chemical/scd30.h
-f:drivers/iio/chemical/scd30_core.c
-f:drivers/iio/chemical/scd30_i2c.c
-f:drivers/iio/chemical/scd30_serial.c
-f:drivers/iio/chemical/scd4x.c
-f:drivers/iio/chemical/sen0322.c
-f:drivers/iio/chemical/sgp30.c
-f:drivers/iio/chemical/sgp40.c
-f:drivers/iio/chemical/sps30.c
-f:drivers/iio/chemical/sps30.h
-f:drivers/iio/chemical/sps30_i2c.c
-f:drivers/iio/chemical/sps30_serial.c
-f:drivers/iio/chemical/sunrise_co2.c
-f:drivers/iio/chemical/vz89x.c
-f:drivers/iio/common/Kconfig
-f:drivers/iio/common/Makefile
-f:drivers/iio/common/cros_ec_sensors/Kconfig
-f:drivers/iio/common/cros_ec_sensors/Makefile
-f:drivers/iio/common/cros_ec_sensors/cros_ec_activity.c
-f:drivers/iio/common/cros_ec_sensors/cros_ec_lid_angle.c
-f:drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c
-f:drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c
-f:drivers/iio/common/cros_ec_sensors/cros_ec_sensors_trace.c
-f:drivers/iio/common/cros_ec_sensors/cros_ec_sensors_trace.h
-f:drivers/iio/common/hid-sensors/Kconfig
-f:drivers/iio/common/hid-sensors/Makefile
-f:drivers/iio/common/hid-sensors/hid-sensor-attributes.c
-f:drivers/iio/common/hid-sensors/hid-sensor-trigger.c
-f:drivers/iio/common/hid-sensors/hid-sensor-trigger.h
-f:drivers/iio/common/inv_sensors/Kconfig
-f:drivers/iio/common/inv_sensors/Makefile
-f:drivers/iio/common/inv_sensors/inv_sensors_timestamp.c
-f:drivers/iio/common/ms_sensors/Kconfig
-f:drivers/iio/common/ms_sensors/Makefile
-f:drivers/iio/common/ms_sensors/ms_sensors_i2c.c
-f:drivers/iio/common/ms_sensors/ms_sensors_i2c.h
-f:drivers/iio/common/scmi_sensors/Kconfig
-f:drivers/iio/common/scmi_sensors/Makefile
-f:drivers/iio/common/scmi_sensors/scmi_iio.c
-f:drivers/iio/common/ssp_sensors/Kconfig
-f:drivers/iio/common/ssp_sensors/Makefile
-f:drivers/iio/common/ssp_sensors/ssp.h
-f:drivers/iio/common/ssp_sensors/ssp_dev.c
-f:drivers/iio/common/ssp_sensors/ssp_iio.c
-f:drivers/iio/common/ssp_sensors/ssp_iio_sensor.h
-f:drivers/iio/common/ssp_sensors/ssp_spi.c
-f:drivers/iio/common/st_sensors/Kconfig
-f:drivers/iio/common/st_sensors/Makefile
-f:drivers/iio/common/st_sensors/st_sensors_buffer.c
-f:drivers/iio/common/st_sensors/st_sensors_core.c
-f:drivers/iio/common/st_sensors/st_sensors_core.h
-f:drivers/iio/common/st_sensors/st_sensors_i2c.c
-f:drivers/iio/common/st_sensors/st_sensors_spi.c
-f:drivers/iio/common/st_sensors/st_sensors_trigger.c
-f:drivers/iio/dac/Kconfig
-f:drivers/iio/dac/Makefile
-f:drivers/iio/dac/ad3530r.c
-f:drivers/iio/dac/ad3552r-common.c
-f:drivers/iio/dac/ad3552r-hs.c
-f:drivers/iio/dac/ad3552r-hs.h
-f:drivers/iio/dac/ad3552r.c
-f:drivers/iio/dac/ad3552r.h
-f:drivers/iio/dac/ad5064.c
-f:drivers/iio/dac/ad5360.c
-f:drivers/iio/dac/ad5380.c
-f:drivers/iio/dac/ad5421.c
-f:drivers/iio/dac/ad5446.c
-f:drivers/iio/dac/ad5449.c
-f:drivers/iio/dac/ad5504.c
-f:drivers/iio/dac/ad5592r-base.c
-f:drivers/iio/dac/ad5592r-base.h
-f:drivers/iio/dac/ad5592r.c
-f:drivers/iio/dac/ad5593r.c
-f:drivers/iio/dac/ad5624r.h
-f:drivers/iio/dac/ad5624r_spi.c
-f:drivers/iio/dac/ad5686-spi.c
-f:drivers/iio/dac/ad5686.c
-f:drivers/iio/dac/ad5686.h
-f:drivers/iio/dac/ad5696-i2c.c
-f:drivers/iio/dac/ad5755.c
-f:drivers/iio/dac/ad5758.c
-f:drivers/iio/dac/ad5761.c
-f:drivers/iio/dac/ad5764.c
-f:drivers/iio/dac/ad5766.c
-f:drivers/iio/dac/ad5770r.c
-f:drivers/iio/dac/ad5791.c
-f:drivers/iio/dac/ad7293.c
-f:drivers/iio/dac/ad7303.c
-f:drivers/iio/dac/ad8460.c
-f:drivers/iio/dac/ad8801.c
-f:drivers/iio/dac/ad9739a.c
-f:drivers/iio/dac/adi-axi-dac.c
-f:drivers/iio/dac/cio-dac.c
-f:drivers/iio/dac/dpot-dac.c
-f:drivers/iio/dac/ds4424.c
-f:drivers/iio/dac/lpc18xx_dac.c
-f:drivers/iio/dac/ltc1660.c
-f:drivers/iio/dac/ltc2632.c
-f:drivers/iio/dac/ltc2664.c
-f:drivers/iio/dac/ltc2688.c
-f:drivers/iio/dac/m62332.c
-f:drivers/iio/dac/max517.c
-f:drivers/iio/dac/max5522.c
-f:drivers/iio/dac/max5821.c
-f:drivers/iio/dac/mcp4725.c
-f:drivers/iio/dac/mcp4728.c
-f:drivers/iio/dac/mcp4821.c
-f:drivers/iio/dac/mcp4922.c
-f:drivers/iio/dac/rohm-bd79703.c
-f:drivers/iio/dac/stm32-dac-core.c
-f:drivers/iio/dac/stm32-dac-core.h
-f:drivers/iio/dac/stm32-dac.c
-f:drivers/iio/dac/ti-dac082s085.c
-f:drivers/iio/dac/ti-dac5571.c
-f:drivers/iio/dac/ti-dac7311.c
-f:drivers/iio/dac/ti-dac7612.c
-f:drivers/iio/dac/vf610_dac.c
-f:drivers/iio/dummy/Kconfig
-f:drivers/iio/dummy/Makefile
-f:drivers/iio/dummy/iio_dummy_evgen.c
-f:drivers/iio/dummy/iio_dummy_evgen.h
-f:drivers/iio/dummy/iio_simple_dummy.c
-f:drivers/iio/dummy/iio_simple_dummy.h
-f:drivers/iio/dummy/iio_simple_dummy_buffer.c
-f:drivers/iio/dummy/iio_simple_dummy_events.c
-f:drivers/iio/filter/Kconfig
-f:drivers/iio/filter/Makefile
-f:drivers/iio/filter/admv8818.c
-f:drivers/iio/frequency/Kconfig
-f:drivers/iio/frequency/Makefile
-f:drivers/iio/frequency/ad9523.c
-f:drivers/iio/frequency/adf4350.c
-f:drivers/iio/frequency/adf4371.c
-f:drivers/iio/frequency/adf4377.c
-f:drivers/iio/frequency/admfm2000.c
-f:drivers/iio/frequency/admv1013.c
-f:drivers/iio/frequency/admv1014.c
-f:drivers/iio/frequency/admv4420.c
-f:drivers/iio/frequency/adrf6780.c
-f:drivers/iio/gyro/Kconfig
-f:drivers/iio/gyro/Makefile
-f:drivers/iio/gyro/adis16080.c
-f:drivers/iio/gyro/adis16130.c
-f:drivers/iio/gyro/adis16136.c
-f:drivers/iio/gyro/adis16260.c
-f:drivers/iio/gyro/adxrs290.c
-f:drivers/iio/gyro/adxrs450.c
-f:drivers/iio/gyro/bmg160.h
-f:drivers/iio/gyro/bmg160_core.c
-f:drivers/iio/gyro/bmg160_i2c.c
-f:drivers/iio/gyro/bmg160_spi.c
-f:drivers/iio/gyro/fxas21002c.h
-f:drivers/iio/gyro/fxas21002c_core.c
-f:drivers/iio/gyro/fxas21002c_i2c.c
-f:drivers/iio/gyro/fxas21002c_spi.c
-f:drivers/iio/gyro/hid-sensor-gyro-3d.c
-f:drivers/iio/gyro/itg3200_buffer.c
-f:drivers/iio/gyro/itg3200_core.c
-f:drivers/iio/gyro/mpu3050-core.c
-f:drivers/iio/gyro/mpu3050-i2c.c
-f:drivers/iio/gyro/mpu3050.h
-f:drivers/iio/gyro/ssp_gyro_sensor.c
-f:drivers/iio/gyro/st_gyro.h
-f:drivers/iio/gyro/st_gyro_buffer.c
-f:drivers/iio/gyro/st_gyro_core.c
-f:drivers/iio/gyro/st_gyro_i2c.c
-f:drivers/iio/gyro/st_gyro_spi.c
-f:drivers/iio/health/Kconfig
-f:drivers/iio/health/Makefile
-f:drivers/iio/health/afe4403.c
-f:drivers/iio/health/afe4404.c
-f:drivers/iio/health/afe440x.h
-f:drivers/iio/health/max30100.c
-f:drivers/iio/health/max30102.c
-f:drivers/iio/humidity/Kconfig
-f:drivers/iio/humidity/Makefile
-f:drivers/iio/humidity/am2315.c
-f:drivers/iio/humidity/dht11.c
-f:drivers/iio/humidity/ens210.c
-f:drivers/iio/humidity/hdc100x.c
-f:drivers/iio/humidity/hdc2010.c
-f:drivers/iio/humidity/hdc3020.c
-f:drivers/iio/humidity/hid-sensor-humidity.c
-f:drivers/iio/humidity/hts221.h
-f:drivers/iio/humidity/hts221_buffer.c
-f:drivers/iio/humidity/hts221_core.c
-f:drivers/iio/humidity/hts221_i2c.c
-f:drivers/iio/humidity/hts221_spi.c
-f:drivers/iio/humidity/htu21.c
-f:drivers/iio/humidity/si7005.c
-f:drivers/iio/humidity/si7020.c
-f:drivers/iio/iio_core.h
-f:drivers/iio/iio_core_trigger.h
-f:drivers/iio/imu/Kconfig
-f:drivers/iio/imu/Makefile
-f:drivers/iio/imu/adis.c
-f:drivers/iio/imu/adis16400.c
-f:drivers/iio/imu/adis16460.c
-f:drivers/iio/imu/adis16475.c
-f:drivers/iio/imu/adis16480.c
-f:drivers/iio/imu/adis16550.c
-f:drivers/iio/imu/adis_buffer.c
-f:drivers/iio/imu/adis_trigger.c
-f:drivers/iio/imu/bmi160/Kconfig
-f:drivers/iio/imu/bmi160/Makefile
-f:drivers/iio/imu/bmi160/bmi160.h
-f:drivers/iio/imu/bmi160/bmi160_core.c
-f:drivers/iio/imu/bmi160/bmi160_i2c.c
-f:drivers/iio/imu/bmi160/bmi160_spi.c
-f:drivers/iio/imu/bmi270/Kconfig
-f:drivers/iio/imu/bmi270/Makefile
-f:drivers/iio/imu/bmi270/bmi270.h
-f:drivers/iio/imu/bmi270/bmi270_core.c
-f:drivers/iio/imu/bmi270/bmi270_i2c.c
-f:drivers/iio/imu/bmi270/bmi270_spi.c
-f:drivers/iio/imu/bmi323/Kconfig
-f:drivers/iio/imu/bmi323/Makefile
-f:drivers/iio/imu/bmi323/bmi323.h
-f:drivers/iio/imu/bmi323/bmi323_core.c
-f:drivers/iio/imu/bmi323/bmi323_i2c.c
-f:drivers/iio/imu/bmi323/bmi323_spi.c
-f:drivers/iio/imu/bno055/Kconfig
-f:drivers/iio/imu/bno055/Makefile
-f:drivers/iio/imu/bno055/bno055.c
-f:drivers/iio/imu/bno055/bno055.h
-f:drivers/iio/imu/bno055/bno055_i2c.c
-f:drivers/iio/imu/bno055/bno055_ser_core.c
-f:drivers/iio/imu/bno055/bno055_ser_trace.c
-f:drivers/iio/imu/bno055/bno055_ser_trace.h
-f:drivers/iio/imu/fxos8700.h
-f:drivers/iio/imu/fxos8700_core.c
-f:drivers/iio/imu/fxos8700_i2c.c
-f:drivers/iio/imu/fxos8700_spi.c
-f:drivers/iio/imu/inv_icm42600/Kconfig
-f:drivers/iio/imu/inv_icm42600/Makefile
-f:drivers/iio/imu/inv_icm42600/inv_icm42600.h
-f:drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c
-f:drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c
-f:drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.h
-f:drivers/iio/imu/inv_icm42600/inv_icm42600_core.c
-f:drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c
-f:drivers/iio/imu/inv_icm42600/inv_icm42600_i2c.c
-f:drivers/iio/imu/inv_icm42600/inv_icm42600_spi.c
-f:drivers/iio/imu/inv_icm42600/inv_icm42600_temp.c
-f:drivers/iio/imu/inv_icm42600/inv_icm42600_temp.h
-f:drivers/iio/imu/inv_mpu6050/Kconfig
-f:drivers/iio/imu/inv_mpu6050/Makefile
-f:drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c
-f:drivers/iio/imu/inv_mpu6050/inv_mpu_aux.c
-f:drivers/iio/imu/inv_mpu6050/inv_mpu_aux.h
-f:drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
-f:drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c
-f:drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h
-f:drivers/iio/imu/inv_mpu6050/inv_mpu_magn.c
-f:drivers/iio/imu/inv_mpu6050/inv_mpu_magn.h
-f:drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c
-f:drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c
-f:drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c
-f:drivers/iio/imu/kmx61.c
-f:drivers/iio/imu/smi240.c
-f:drivers/iio/imu/st_lsm6dsx/Kconfig
-f:drivers/iio/imu/st_lsm6dsx/Makefile
-f:drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
-f:drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c
-f:drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
-f:drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c
-f:drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c
-f:drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c
-f:drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c
-f:drivers/iio/imu/st_lsm9ds0/Kconfig
-f:drivers/iio/imu/st_lsm9ds0/Makefile
-f:drivers/iio/imu/st_lsm9ds0/st_lsm9ds0.h
-f:drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_core.c
-f:drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_i2c.c
-f:drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_spi.c
-f:drivers/iio/industrialio-acpi.c
-f:drivers/iio/industrialio-backend.c
-f:drivers/iio/industrialio-buffer.c
-f:drivers/iio/industrialio-configfs.c
-f:drivers/iio/industrialio-core.c
-f:drivers/iio/industrialio-event.c
-f:drivers/iio/industrialio-gts-helper.c
-f:drivers/iio/industrialio-sw-device.c
-f:drivers/iio/industrialio-sw-trigger.c
-f:drivers/iio/industrialio-trigger.c
-f:drivers/iio/industrialio-triggered-event.c
-f:drivers/iio/inkern.c
-f:drivers/iio/light/Kconfig
-f:drivers/iio/light/Makefile
-f:drivers/iio/light/acpi-als.c
-f:drivers/iio/light/adjd_s311.c
-f:drivers/iio/light/adux1020.c
-f:drivers/iio/light/al3000a.c
-f:drivers/iio/light/al3010.c
-f:drivers/iio/light/al3320a.c
-f:drivers/iio/light/apds9160.c
-f:drivers/iio/light/apds9300.c
-f:drivers/iio/light/apds9306.c
-f:drivers/iio/light/apds9960.c
-f:drivers/iio/light/as73211.c
-f:drivers/iio/light/bh1745.c
-f:drivers/iio/light/bh1750.c
-f:drivers/iio/light/bh1780.c
-f:drivers/iio/light/cm32181.c
-f:drivers/iio/light/cm3232.c
-f:drivers/iio/light/cm3323.c
-f:drivers/iio/light/cm3605.c
-f:drivers/iio/light/cm36651.c
-f:drivers/iio/light/cros_ec_light_prox.c
-f:drivers/iio/light/gp2ap002.c
-f:drivers/iio/light/gp2ap020a00f.c
-f:drivers/iio/light/hid-sensor-als.c
-f:drivers/iio/light/hid-sensor-prox.c
-f:drivers/iio/light/iqs621-als.c
-f:drivers/iio/light/isl29018.c
-f:drivers/iio/light/isl29028.c
-f:drivers/iio/light/isl29125.c
-f:drivers/iio/light/isl76682.c
-f:drivers/iio/light/jsa1212.c
-f:drivers/iio/light/lm3533-als.c
-f:drivers/iio/light/ltr390.c
-f:drivers/iio/light/ltr501.c
-f:drivers/iio/light/ltrf216a.c
-f:drivers/iio/light/lv0104cs.c
-f:drivers/iio/light/max44000.c
-f:drivers/iio/light/max44009.c
-f:drivers/iio/light/noa1305.c
-f:drivers/iio/light/opt3001.c
-f:drivers/iio/light/opt4001.c
-f:drivers/iio/light/opt4060.c
-f:drivers/iio/light/pa12203001.c
-f:drivers/iio/light/rohm-bu27034.c
-f:drivers/iio/light/rpr0521.c
-f:drivers/iio/light/si1133.c
-f:drivers/iio/light/si1145.c
-f:drivers/iio/light/st_uvis25.h
-f:drivers/iio/light/st_uvis25_core.c
-f:drivers/iio/light/st_uvis25_i2c.c
-f:drivers/iio/light/st_uvis25_spi.c
-f:drivers/iio/light/stk3310.c
-f:drivers/iio/light/tcs3414.c
-f:drivers/iio/light/tcs3472.c
-f:drivers/iio/light/tsl2563.c
-f:drivers/iio/light/tsl2583.c
-f:drivers/iio/light/tsl2591.c
-f:drivers/iio/light/tsl2772.c
-f:drivers/iio/light/tsl4531.c
-f:drivers/iio/light/us5182d.c
-f:drivers/iio/light/vcnl4000.c
-f:drivers/iio/light/vcnl4035.c
-f:drivers/iio/light/veml3235.c
-f:drivers/iio/light/veml6030.c
-f:drivers/iio/light/veml6040.c
-f:drivers/iio/light/veml6070.c
-f:drivers/iio/light/veml6075.c
-f:drivers/iio/light/vl6180.c
-f:drivers/iio/light/zopt2201.c
-f:drivers/iio/magnetometer/Kconfig
-f:drivers/iio/magnetometer/Makefile
-f:drivers/iio/magnetometer/af8133j.c
-f:drivers/iio/magnetometer/ak8974.c
-f:drivers/iio/magnetometer/ak8975.c
-f:drivers/iio/magnetometer/als31300.c
-f:drivers/iio/magnetometer/bmc150_magn.c
-f:drivers/iio/magnetometer/bmc150_magn.h
-f:drivers/iio/magnetometer/bmc150_magn_i2c.c
-f:drivers/iio/magnetometer/bmc150_magn_spi.c
-f:drivers/iio/magnetometer/hid-sensor-magn-3d.c
-f:drivers/iio/magnetometer/hmc5843.h
-f:drivers/iio/magnetometer/hmc5843_core.c
-f:drivers/iio/magnetometer/hmc5843_i2c.c
-f:drivers/iio/magnetometer/hmc5843_spi.c
-f:drivers/iio/magnetometer/mag3110.c
-f:drivers/iio/magnetometer/mmc35240.c
-f:drivers/iio/magnetometer/rm3100-core.c
-f:drivers/iio/magnetometer/rm3100-i2c.c
-f:drivers/iio/magnetometer/rm3100-spi.c
-f:drivers/iio/magnetometer/rm3100.h
-f:drivers/iio/magnetometer/si7210.c
-f:drivers/iio/magnetometer/st_magn.h
-f:drivers/iio/magnetometer/st_magn_buffer.c
-f:drivers/iio/magnetometer/st_magn_core.c
-f:drivers/iio/magnetometer/st_magn_i2c.c
-f:drivers/iio/magnetometer/st_magn_spi.c
-f:drivers/iio/magnetometer/tmag5273.c
-f:drivers/iio/magnetometer/yamaha-yas530.c
-f:drivers/iio/multiplexer/Kconfig
-f:drivers/iio/multiplexer/Makefile
-f:drivers/iio/multiplexer/iio-mux.c
-f:drivers/iio/orientation/Kconfig
-f:drivers/iio/orientation/Makefile
-f:drivers/iio/orientation/hid-sensor-incl-3d.c
-f:drivers/iio/orientation/hid-sensor-rotation.c
-f:drivers/iio/position/Kconfig
-f:drivers/iio/position/Makefile
-f:drivers/iio/position/hid-sensor-custom-intel-hinge.c
-f:drivers/iio/position/iqs624-pos.c
-f:drivers/iio/potentiometer/Kconfig
-f:drivers/iio/potentiometer/Makefile
-f:drivers/iio/potentiometer/ad5110.c
-f:drivers/iio/potentiometer/ad5272.c
-f:drivers/iio/potentiometer/ds1803.c
-f:drivers/iio/potentiometer/max5432.c
-f:drivers/iio/potentiometer/max5481.c
-f:drivers/iio/potentiometer/max5487.c
-f:drivers/iio/potentiometer/mcp4018.c
-f:drivers/iio/potentiometer/mcp41010.c
-f:drivers/iio/potentiometer/mcp4131.c
-f:drivers/iio/potentiometer/mcp4531.c
-f:drivers/iio/potentiometer/tpl0102.c
-f:drivers/iio/potentiometer/x9250.c
-f:drivers/iio/potentiostat/Kconfig
-f:drivers/iio/potentiostat/Makefile
-f:drivers/iio/potentiostat/lmp91000.c
-f:drivers/iio/pressure/Kconfig
-f:drivers/iio/pressure/Makefile
-f:drivers/iio/pressure/abp060mg.c
-f:drivers/iio/pressure/bmp280-core.c
-f:drivers/iio/pressure/bmp280-i2c.c
-f:drivers/iio/pressure/bmp280-regmap.c
-f:drivers/iio/pressure/bmp280-spi.c
-f:drivers/iio/pressure/bmp280.h
-f:drivers/iio/pressure/cros_ec_baro.c
-f:drivers/iio/pressure/dlhl60d.c
-f:drivers/iio/pressure/dps310.c
-f:drivers/iio/pressure/hid-sensor-press.c
-f:drivers/iio/pressure/hp03.c
-f:drivers/iio/pressure/hp206c.c
-f:drivers/iio/pressure/hsc030pa.c
-f:drivers/iio/pressure/hsc030pa.h
-f:drivers/iio/pressure/hsc030pa_i2c.c
-f:drivers/iio/pressure/hsc030pa_spi.c
-f:drivers/iio/pressure/icp10100.c
-f:drivers/iio/pressure/mpl115.c
-f:drivers/iio/pressure/mpl115.h
-f:drivers/iio/pressure/mpl115_i2c.c
-f:drivers/iio/pressure/mpl115_spi.c
-f:drivers/iio/pressure/mpl3115.c
-f:drivers/iio/pressure/mprls0025pa.c
-f:drivers/iio/pressure/mprls0025pa.h
-f:drivers/iio/pressure/mprls0025pa_i2c.c
-f:drivers/iio/pressure/mprls0025pa_spi.c
-f:drivers/iio/pressure/ms5611.h
-f:drivers/iio/pressure/ms5611_core.c
-f:drivers/iio/pressure/ms5611_i2c.c
-f:drivers/iio/pressure/ms5611_spi.c
-f:drivers/iio/pressure/ms5637.c
-f:drivers/iio/pressure/rohm-bm1390.c
-f:drivers/iio/pressure/sdp500.c
-f:drivers/iio/pressure/st_pressure.h
-f:drivers/iio/pressure/st_pressure_buffer.c
-f:drivers/iio/pressure/st_pressure_core.c
-f:drivers/iio/pressure/st_pressure_i2c.c
-f:drivers/iio/pressure/st_pressure_spi.c
-f:drivers/iio/pressure/t5403.c
-f:drivers/iio/pressure/zpa2326.c
-f:drivers/iio/pressure/zpa2326.h
-f:drivers/iio/pressure/zpa2326_i2c.c
-f:drivers/iio/pressure/zpa2326_spi.c
-f:drivers/iio/proximity/Kconfig
-f:drivers/iio/proximity/Makefile
-f:drivers/iio/proximity/as3935.c
-f:drivers/iio/proximity/aw96103.c
-f:drivers/iio/proximity/cros_ec_mkbp_proximity.c
-f:drivers/iio/proximity/d3323aa.c
-f:drivers/iio/proximity/hx9023s.c
-f:drivers/iio/proximity/irsd200.c
-f:drivers/iio/proximity/isl29501.c
-f:drivers/iio/proximity/mb1232.c
-f:drivers/iio/proximity/ping.c
-f:drivers/iio/proximity/pulsedlight-lidar-lite-v2.c
-f:drivers/iio/proximity/rfd77402.c
-f:drivers/iio/proximity/srf04.c
-f:drivers/iio/proximity/srf08.c
-f:drivers/iio/proximity/sx9310.c
-f:drivers/iio/proximity/sx9324.c
-f:drivers/iio/proximity/sx9360.c
-f:drivers/iio/proximity/sx9500.c
-f:drivers/iio/proximity/sx_common.c
-f:drivers/iio/proximity/sx_common.h
-f:drivers/iio/proximity/vcnl3020.c
-f:drivers/iio/proximity/vl53l0x-i2c.c
-f:drivers/iio/resolver/Kconfig
-f:drivers/iio/resolver/Makefile
-f:drivers/iio/resolver/ad2s1200.c
-f:drivers/iio/resolver/ad2s1210.c
-f:drivers/iio/resolver/ad2s90.c
-f:drivers/iio/temperature/Kconfig
-f:drivers/iio/temperature/Makefile
-f:drivers/iio/temperature/hid-sensor-temperature.c
-f:drivers/iio/temperature/iqs620at-temp.c
-f:drivers/iio/temperature/ltc2983.c
-f:drivers/iio/temperature/max30208.c
-f:drivers/iio/temperature/max31856.c
-f:drivers/iio/temperature/max31865.c
-f:drivers/iio/temperature/maxim_thermocouple.c
-f:drivers/iio/temperature/mcp9600.c
-f:drivers/iio/temperature/mlx90614.c
-f:drivers/iio/temperature/mlx90632.c
-f:drivers/iio/temperature/mlx90635.c
-f:drivers/iio/temperature/tmp006.c
-f:drivers/iio/temperature/tmp007.c
-f:drivers/iio/temperature/tmp117.c
-f:drivers/iio/temperature/tsys01.c
-f:drivers/iio/temperature/tsys02d.c
-f:drivers/iio/test/Kconfig
-f:drivers/iio/test/Makefile
-f:drivers/iio/test/iio-test-format.c
-f:drivers/iio/test/iio-test-gts.c
-f:drivers/iio/test/iio-test-rescale.c
-f:drivers/iio/trigger/Kconfig
-f:drivers/iio/trigger/Makefile
-f:drivers/iio/trigger/iio-trig-hrtimer.c
-f:drivers/iio/trigger/iio-trig-interrupt.c
-f:drivers/iio/trigger/iio-trig-loop.c
-f:drivers/iio/trigger/iio-trig-sysfs.c
-f:drivers/iio/trigger/stm32-lptimer-trigger.c
-f:drivers/iio/trigger/stm32-timer-trigger.c
-f:drivers/infiniband/Kconfig
-f:drivers/infiniband/Makefile
-f:drivers/infiniband/core/Makefile
-f:drivers/infiniband/core/addr.c
-f:drivers/infiniband/core/agent.c
-f:drivers/infiniband/core/agent.h
-f:drivers/infiniband/core/cache.c
-f:drivers/infiniband/core/cgroup.c
-f:drivers/infiniband/core/cm.c
-f:drivers/infiniband/core/cm_msgs.h
-f:drivers/infiniband/core/cm_trace.c
-f:drivers/infiniband/core/cm_trace.h
-f:drivers/infiniband/core/cma.c
-f:drivers/infiniband/core/cma_configfs.c
-f:drivers/infiniband/core/cma_priv.h
-f:drivers/infiniband/core/cma_trace.c
-f:drivers/infiniband/core/cma_trace.h
-f:drivers/infiniband/core/core_priv.h
-f:drivers/infiniband/core/counters.c
-f:drivers/infiniband/core/cq.c
-f:drivers/infiniband/core/device.c
-f:drivers/infiniband/core/ib_core_uverbs.c
-f:drivers/infiniband/core/iwcm.c
-f:drivers/infiniband/core/iwcm.h
-f:drivers/infiniband/core/iwpm_msg.c
-f:drivers/infiniband/core/iwpm_util.c
-f:drivers/infiniband/core/iwpm_util.h
-f:drivers/infiniband/core/lag.c
-f:drivers/infiniband/core/mad.c
-f:drivers/infiniband/core/mad_priv.h
-f:drivers/infiniband/core/mad_rmpp.c
-f:drivers/infiniband/core/mad_rmpp.h
-f:drivers/infiniband/core/mr_pool.c
-f:drivers/infiniband/core/multicast.c
-f:drivers/infiniband/core/netlink.c
-f:drivers/infiniband/core/nldev.c
-f:drivers/infiniband/core/opa_smi.h
-f:drivers/infiniband/core/packer.c
-f:drivers/infiniband/core/rdma_core.c
-f:drivers/infiniband/core/rdma_core.h
-f:drivers/infiniband/core/restrack.c
-f:drivers/infiniband/core/restrack.h
-f:drivers/infiniband/core/roce_gid_mgmt.c
-f:drivers/infiniband/core/rw.c
-f:drivers/infiniband/core/sa.h
-f:drivers/infiniband/core/sa_query.c
-f:drivers/infiniband/core/security.c
-f:drivers/infiniband/core/smi.c
-f:drivers/infiniband/core/smi.h
-f:drivers/infiniband/core/sysfs.c
-f:drivers/infiniband/core/trace.c
-f:drivers/infiniband/core/ucaps.c
-f:drivers/infiniband/core/ucma.c
-f:drivers/infiniband/core/ud_header.c
-f:drivers/infiniband/core/umem.c
-f:drivers/infiniband/core/umem_dmabuf.c
-f:drivers/infiniband/core/umem_odp.c
-f:drivers/infiniband/core/user_mad.c
-f:drivers/infiniband/core/uverbs.h
-f:drivers/infiniband/core/uverbs_cmd.c
-f:drivers/infiniband/core/uverbs_ioctl.c
-f:drivers/infiniband/core/uverbs_main.c
-f:drivers/infiniband/core/uverbs_marshall.c
-f:drivers/infiniband/core/uverbs_std_types.c
-f:drivers/infiniband/core/uverbs_std_types_async_fd.c
-f:drivers/infiniband/core/uverbs_std_types_counters.c
-f:drivers/infiniband/core/uverbs_std_types_cq.c
-f:drivers/infiniband/core/uverbs_std_types_device.c
-f:drivers/infiniband/core/uverbs_std_types_dm.c
-f:drivers/infiniband/core/uverbs_std_types_dmah.c
-f:drivers/infiniband/core/uverbs_std_types_flow_action.c
-f:drivers/infiniband/core/uverbs_std_types_mr.c
-f:drivers/infiniband/core/uverbs_std_types_qp.c
-f:drivers/infiniband/core/uverbs_std_types_srq.c
-f:drivers/infiniband/core/uverbs_std_types_wq.c
-f:drivers/infiniband/core/uverbs_uapi.c
-f:drivers/infiniband/core/verbs.c
-f:drivers/infiniband/hw/Makefile
-f:drivers/infiniband/hw/bnxt_re/Kconfig
-f:drivers/infiniband/hw/bnxt_re/Makefile
-f:drivers/infiniband/hw/bnxt_re/bnxt_re.h
-f:drivers/infiniband/hw/bnxt_re/debugfs.c
-f:drivers/infiniband/hw/bnxt_re/debugfs.h
-f:drivers/infiniband/hw/bnxt_re/hw_counters.c
-f:drivers/infiniband/hw/bnxt_re/hw_counters.h
-f:drivers/infiniband/hw/bnxt_re/ib_verbs.c
-f:drivers/infiniband/hw/bnxt_re/ib_verbs.h
-f:drivers/infiniband/hw/bnxt_re/main.c
-f:drivers/infiniband/hw/bnxt_re/qplib_fp.c
-f:drivers/infiniband/hw/bnxt_re/qplib_fp.h
-f:drivers/infiniband/hw/bnxt_re/qplib_rcfw.c
-f:drivers/infiniband/hw/bnxt_re/qplib_rcfw.h
-f:drivers/infiniband/hw/bnxt_re/qplib_res.c
-f:drivers/infiniband/hw/bnxt_re/qplib_res.h
-f:drivers/infiniband/hw/bnxt_re/qplib_sp.c
-f:drivers/infiniband/hw/bnxt_re/qplib_sp.h
-f:drivers/infiniband/hw/bnxt_re/qplib_tlv.h
-f:drivers/infiniband/hw/bnxt_re/roce_hsi.h
-f:drivers/infiniband/hw/cxgb4/Kconfig
-f:drivers/infiniband/hw/cxgb4/Makefile
-f:drivers/infiniband/hw/cxgb4/cm.c
-f:drivers/infiniband/hw/cxgb4/cq.c
-f:drivers/infiniband/hw/cxgb4/device.c
-f:drivers/infiniband/hw/cxgb4/ev.c
-f:drivers/infiniband/hw/cxgb4/id_table.c
-f:drivers/infiniband/hw/cxgb4/iw_cxgb4.h
-f:drivers/infiniband/hw/cxgb4/mem.c
-f:drivers/infiniband/hw/cxgb4/provider.c
-f:drivers/infiniband/hw/cxgb4/qp.c
-f:drivers/infiniband/hw/cxgb4/resource.c
-f:drivers/infiniband/hw/cxgb4/restrack.c
-f:drivers/infiniband/hw/cxgb4/t4.h
-f:drivers/infiniband/hw/cxgb4/t4fw_ri_api.h
-f:drivers/infiniband/hw/efa/Kconfig
-f:drivers/infiniband/hw/efa/Makefile
-f:drivers/infiniband/hw/efa/efa.h
-f:drivers/infiniband/hw/efa/efa_admin_cmds_defs.h
-f:drivers/infiniband/hw/efa/efa_admin_defs.h
-f:drivers/infiniband/hw/efa/efa_com.c
-f:drivers/infiniband/hw/efa/efa_com.h
-f:drivers/infiniband/hw/efa/efa_com_cmd.c
-f:drivers/infiniband/hw/efa/efa_com_cmd.h
-f:drivers/infiniband/hw/efa/efa_common_defs.h
-f:drivers/infiniband/hw/efa/efa_io_defs.h
-f:drivers/infiniband/hw/efa/efa_main.c
-f:drivers/infiniband/hw/efa/efa_regs_defs.h
-f:drivers/infiniband/hw/efa/efa_verbs.c
-f:drivers/infiniband/hw/erdma/Kconfig
-f:drivers/infiniband/hw/erdma/Makefile
-f:drivers/infiniband/hw/erdma/erdma.h
-f:drivers/infiniband/hw/erdma/erdma_cm.c
-f:drivers/infiniband/hw/erdma/erdma_cm.h
-f:drivers/infiniband/hw/erdma/erdma_cmdq.c
-f:drivers/infiniband/hw/erdma/erdma_cq.c
-f:drivers/infiniband/hw/erdma/erdma_eq.c
-f:drivers/infiniband/hw/erdma/erdma_hw.h
-f:drivers/infiniband/hw/erdma/erdma_main.c
-f:drivers/infiniband/hw/erdma/erdma_qp.c
-f:drivers/infiniband/hw/erdma/erdma_verbs.c
-f:drivers/infiniband/hw/erdma/erdma_verbs.h
-f:drivers/infiniband/hw/hfi1/Kconfig
-f:drivers/infiniband/hw/hfi1/Makefile
-f:drivers/infiniband/hw/hfi1/affinity.c
-f:drivers/infiniband/hw/hfi1/affinity.h
-f:drivers/infiniband/hw/hfi1/aspm.c
-f:drivers/infiniband/hw/hfi1/aspm.h
-f:drivers/infiniband/hw/hfi1/chip.c
-f:drivers/infiniband/hw/hfi1/chip.h
-f:drivers/infiniband/hw/hfi1/chip_registers.h
-f:drivers/infiniband/hw/hfi1/common.h
-f:drivers/infiniband/hw/hfi1/debugfs.c
-f:drivers/infiniband/hw/hfi1/debugfs.h
-f:drivers/infiniband/hw/hfi1/device.c
-f:drivers/infiniband/hw/hfi1/device.h
-f:drivers/infiniband/hw/hfi1/driver.c
-f:drivers/infiniband/hw/hfi1/efivar.c
-f:drivers/infiniband/hw/hfi1/efivar.h
-f:drivers/infiniband/hw/hfi1/eprom.c
-f:drivers/infiniband/hw/hfi1/eprom.h
-f:drivers/infiniband/hw/hfi1/exp_rcv.c
-f:drivers/infiniband/hw/hfi1/exp_rcv.h
-f:drivers/infiniband/hw/hfi1/fault.c
-f:drivers/infiniband/hw/hfi1/fault.h
-f:drivers/infiniband/hw/hfi1/file_ops.c
-f:drivers/infiniband/hw/hfi1/firmware.c
-f:drivers/infiniband/hw/hfi1/hfi.h
-f:drivers/infiniband/hw/hfi1/init.c
-f:drivers/infiniband/hw/hfi1/intr.c
-f:drivers/infiniband/hw/hfi1/iowait.c
-f:drivers/infiniband/hw/hfi1/iowait.h
-f:drivers/infiniband/hw/hfi1/ipoib.h
-f:drivers/infiniband/hw/hfi1/ipoib_main.c
-f:drivers/infiniband/hw/hfi1/ipoib_rx.c
-f:drivers/infiniband/hw/hfi1/ipoib_tx.c
-f:drivers/infiniband/hw/hfi1/mad.c
-f:drivers/infiniband/hw/hfi1/mad.h
-f:drivers/infiniband/hw/hfi1/mmu_rb.c
-f:drivers/infiniband/hw/hfi1/mmu_rb.h
-f:drivers/infiniband/hw/hfi1/msix.c
-f:drivers/infiniband/hw/hfi1/msix.h
-f:drivers/infiniband/hw/hfi1/netdev.h
-f:drivers/infiniband/hw/hfi1/netdev_rx.c
-f:drivers/infiniband/hw/hfi1/opa_compat.h
-f:drivers/infiniband/hw/hfi1/opfn.c
-f:drivers/infiniband/hw/hfi1/opfn.h
-f:drivers/infiniband/hw/hfi1/pcie.c
-f:drivers/infiniband/hw/hfi1/pin_system.c
-f:drivers/infiniband/hw/hfi1/pinning.h
-f:drivers/infiniband/hw/hfi1/pio.c
-f:drivers/infiniband/hw/hfi1/pio.h
-f:drivers/infiniband/hw/hfi1/pio_copy.c
-f:drivers/infiniband/hw/hfi1/platform.c
-f:drivers/infiniband/hw/hfi1/platform.h
-f:drivers/infiniband/hw/hfi1/qp.c
-f:drivers/infiniband/hw/hfi1/qp.h
-f:drivers/infiniband/hw/hfi1/qsfp.c
-f:drivers/infiniband/hw/hfi1/qsfp.h
-f:drivers/infiniband/hw/hfi1/rc.c
-f:drivers/infiniband/hw/hfi1/rc.h
-f:drivers/infiniband/hw/hfi1/ruc.c
-f:drivers/infiniband/hw/hfi1/sdma.c
-f:drivers/infiniband/hw/hfi1/sdma.h
-f:drivers/infiniband/hw/hfi1/sdma_txreq.h
-f:drivers/infiniband/hw/hfi1/sysfs.c
-f:drivers/infiniband/hw/hfi1/tid_rdma.c
-f:drivers/infiniband/hw/hfi1/tid_rdma.h
-f:drivers/infiniband/hw/hfi1/trace.c
-f:drivers/infiniband/hw/hfi1/trace.h
-f:drivers/infiniband/hw/hfi1/trace_ctxts.h
-f:drivers/infiniband/hw/hfi1/trace_dbg.h
-f:drivers/infiniband/hw/hfi1/trace_ibhdrs.h
-f:drivers/infiniband/hw/hfi1/trace_iowait.h
-f:drivers/infiniband/hw/hfi1/trace_misc.h
-f:drivers/infiniband/hw/hfi1/trace_mmu.h
-f:drivers/infiniband/hw/hfi1/trace_rc.h
-f:drivers/infiniband/hw/hfi1/trace_rx.h
-f:drivers/infiniband/hw/hfi1/trace_tid.h
-f:drivers/infiniband/hw/hfi1/trace_tx.h
-f:drivers/infiniband/hw/hfi1/uc.c
-f:drivers/infiniband/hw/hfi1/ud.c
-f:drivers/infiniband/hw/hfi1/user_exp_rcv.c
-f:drivers/infiniband/hw/hfi1/user_exp_rcv.h
-f:drivers/infiniband/hw/hfi1/user_pages.c
-f:drivers/infiniband/hw/hfi1/user_sdma.c
-f:drivers/infiniband/hw/hfi1/user_sdma.h
-f:drivers/infiniband/hw/hfi1/verbs.c
-f:drivers/infiniband/hw/hfi1/verbs.h
-f:drivers/infiniband/hw/hfi1/verbs_txreq.c
-f:drivers/infiniband/hw/hfi1/verbs_txreq.h
-f:drivers/infiniband/hw/hfi1/vnic.h
-f:drivers/infiniband/hw/hfi1/vnic_main.c
-f:drivers/infiniband/hw/hfi1/vnic_sdma.c
-f:drivers/infiniband/hw/hns/Kconfig
-f:drivers/infiniband/hw/hns/Makefile
-f:drivers/infiniband/hw/hns/hns_roce_ah.c
-f:drivers/infiniband/hw/hns/hns_roce_alloc.c
-f:drivers/infiniband/hw/hns/hns_roce_cmd.c
-f:drivers/infiniband/hw/hns/hns_roce_cmd.h
-f:drivers/infiniband/hw/hns/hns_roce_common.h
-f:drivers/infiniband/hw/hns/hns_roce_cq.c
-f:drivers/infiniband/hw/hns/hns_roce_db.c
-f:drivers/infiniband/hw/hns/hns_roce_debugfs.c
-f:drivers/infiniband/hw/hns/hns_roce_debugfs.h
-f:drivers/infiniband/hw/hns/hns_roce_device.h
-f:drivers/infiniband/hw/hns/hns_roce_hem.c
-f:drivers/infiniband/hw/hns/hns_roce_hem.h
-f:drivers/infiniband/hw/hns/hns_roce_hw_v2.c
-f:drivers/infiniband/hw/hns/hns_roce_hw_v2.h
-f:drivers/infiniband/hw/hns/hns_roce_main.c
-f:drivers/infiniband/hw/hns/hns_roce_mr.c
-f:drivers/infiniband/hw/hns/hns_roce_pd.c
-f:drivers/infiniband/hw/hns/hns_roce_qp.c
-f:drivers/infiniband/hw/hns/hns_roce_restrack.c
-f:drivers/infiniband/hw/hns/hns_roce_srq.c
-f:drivers/infiniband/hw/hns/hns_roce_trace.h
-f:drivers/infiniband/hw/irdma/Kconfig
-f:drivers/infiniband/hw/irdma/Makefile
-f:drivers/infiniband/hw/irdma/cm.c
-f:drivers/infiniband/hw/irdma/cm.h
-f:drivers/infiniband/hw/irdma/ctrl.c
-f:drivers/infiniband/hw/irdma/defs.h
-f:drivers/infiniband/hw/irdma/hmc.c
-f:drivers/infiniband/hw/irdma/hmc.h
-f:drivers/infiniband/hw/irdma/hw.c
-f:drivers/infiniband/hw/irdma/i40iw_hw.c
-f:drivers/infiniband/hw/irdma/i40iw_hw.h
-f:drivers/infiniband/hw/irdma/i40iw_if.c
-f:drivers/infiniband/hw/irdma/icrdma_hw.c
-f:drivers/infiniband/hw/irdma/icrdma_hw.h
-f:drivers/infiniband/hw/irdma/irdma.h
-f:drivers/infiniband/hw/irdma/main.c
-f:drivers/infiniband/hw/irdma/main.h
-f:drivers/infiniband/hw/irdma/osdep.h
-f:drivers/infiniband/hw/irdma/pble.c
-f:drivers/infiniband/hw/irdma/pble.h
-f:drivers/infiniband/hw/irdma/protos.h
-f:drivers/infiniband/hw/irdma/puda.c
-f:drivers/infiniband/hw/irdma/puda.h
-f:drivers/infiniband/hw/irdma/trace.c
-f:drivers/infiniband/hw/irdma/trace.h
-f:drivers/infiniband/hw/irdma/trace_cm.h
-f:drivers/infiniband/hw/irdma/type.h
-f:drivers/infiniband/hw/irdma/uda.c
-f:drivers/infiniband/hw/irdma/uda.h
-f:drivers/infiniband/hw/irdma/uda_d.h
-f:drivers/infiniband/hw/irdma/uk.c
-f:drivers/infiniband/hw/irdma/user.h
-f:drivers/infiniband/hw/irdma/utils.c
-f:drivers/infiniband/hw/irdma/verbs.c
-f:drivers/infiniband/hw/irdma/verbs.h
-f:drivers/infiniband/hw/irdma/ws.c
-f:drivers/infiniband/hw/irdma/ws.h
-f:drivers/infiniband/hw/mana/Kconfig
-f:drivers/infiniband/hw/mana/Makefile
-f:drivers/infiniband/hw/mana/ah.c
-f:drivers/infiniband/hw/mana/counters.c
-f:drivers/infiniband/hw/mana/counters.h
-f:drivers/infiniband/hw/mana/cq.c
-f:drivers/infiniband/hw/mana/device.c
-f:drivers/infiniband/hw/mana/main.c
-f:drivers/infiniband/hw/mana/mana_ib.h
-f:drivers/infiniband/hw/mana/mr.c
-f:drivers/infiniband/hw/mana/qp.c
-f:drivers/infiniband/hw/mana/shadow_queue.h
-f:drivers/infiniband/hw/mana/wq.c
-f:drivers/infiniband/hw/mana/wr.c
-f:drivers/infiniband/hw/mlx4/Kconfig
-f:drivers/infiniband/hw/mlx4/Makefile
-f:drivers/infiniband/hw/mlx4/ah.c
-f:drivers/infiniband/hw/mlx4/alias_GUID.c
-f:drivers/infiniband/hw/mlx4/cm.c
-f:drivers/infiniband/hw/mlx4/cq.c
-f:drivers/infiniband/hw/mlx4/doorbell.c
-f:drivers/infiniband/hw/mlx4/mad.c
-f:drivers/infiniband/hw/mlx4/main.c
-f:drivers/infiniband/hw/mlx4/mcg.c
-f:drivers/infiniband/hw/mlx4/mlx4_ib.h
-f:drivers/infiniband/hw/mlx4/mr.c
-f:drivers/infiniband/hw/mlx4/qp.c
-f:drivers/infiniband/hw/mlx4/srq.c
-f:drivers/infiniband/hw/mlx4/sysfs.c
-f:drivers/infiniband/hw/mlx5/Kconfig
-f:drivers/infiniband/hw/mlx5/Makefile
-f:drivers/infiniband/hw/mlx5/ah.c
-f:drivers/infiniband/hw/mlx5/cmd.c
-f:drivers/infiniband/hw/mlx5/cmd.h
-f:drivers/infiniband/hw/mlx5/cong.c
-f:drivers/infiniband/hw/mlx5/counters.c
-f:drivers/infiniband/hw/mlx5/counters.h
-f:drivers/infiniband/hw/mlx5/cq.c
-f:drivers/infiniband/hw/mlx5/data_direct.c
-f:drivers/infiniband/hw/mlx5/data_direct.h
-f:drivers/infiniband/hw/mlx5/devx.c
-f:drivers/infiniband/hw/mlx5/devx.h
-f:drivers/infiniband/hw/mlx5/dm.c
-f:drivers/infiniband/hw/mlx5/dm.h
-f:drivers/infiniband/hw/mlx5/dmah.c
-f:drivers/infiniband/hw/mlx5/dmah.h
-f:drivers/infiniband/hw/mlx5/doorbell.c
-f:drivers/infiniband/hw/mlx5/fs.c
-f:drivers/infiniband/hw/mlx5/fs.h
-f:drivers/infiniband/hw/mlx5/gsi.c
-f:drivers/infiniband/hw/mlx5/ib_rep.c
-f:drivers/infiniband/hw/mlx5/ib_rep.h
-f:drivers/infiniband/hw/mlx5/ib_virt.c
-f:drivers/infiniband/hw/mlx5/macsec.c
-f:drivers/infiniband/hw/mlx5/macsec.h
-f:drivers/infiniband/hw/mlx5/mad.c
-f:drivers/infiniband/hw/mlx5/main.c
-f:drivers/infiniband/hw/mlx5/mem.c
-f:drivers/infiniband/hw/mlx5/mlx5_ib.h
-f:drivers/infiniband/hw/mlx5/mr.c
-f:drivers/infiniband/hw/mlx5/odp.c
-f:drivers/infiniband/hw/mlx5/qos.c
-f:drivers/infiniband/hw/mlx5/qp.c
-f:drivers/infiniband/hw/mlx5/qp.h
-f:drivers/infiniband/hw/mlx5/qpc.c
-f:drivers/infiniband/hw/mlx5/restrack.c
-f:drivers/infiniband/hw/mlx5/restrack.h
-f:drivers/infiniband/hw/mlx5/srq.c
-f:drivers/infiniband/hw/mlx5/srq.h
-f:drivers/infiniband/hw/mlx5/srq_cmd.c
-f:drivers/infiniband/hw/mlx5/std_types.c
-f:drivers/infiniband/hw/mlx5/umr.c
-f:drivers/infiniband/hw/mlx5/umr.h
-f:drivers/infiniband/hw/mlx5/wr.c
-f:drivers/infiniband/hw/mlx5/wr.h
-f:drivers/infiniband/hw/mthca/Kconfig
-f:drivers/infiniband/hw/mthca/Makefile
-f:drivers/infiniband/hw/mthca/mthca_allocator.c
-f:drivers/infiniband/hw/mthca/mthca_av.c
-f:drivers/infiniband/hw/mthca/mthca_catas.c
-f:drivers/infiniband/hw/mthca/mthca_cmd.c
-f:drivers/infiniband/hw/mthca/mthca_cmd.h
-f:drivers/infiniband/hw/mthca/mthca_config_reg.h
-f:drivers/infiniband/hw/mthca/mthca_cq.c
-f:drivers/infiniband/hw/mthca/mthca_dev.h
-f:drivers/infiniband/hw/mthca/mthca_doorbell.h
-f:drivers/infiniband/hw/mthca/mthca_eq.c
-f:drivers/infiniband/hw/mthca/mthca_mad.c
-f:drivers/infiniband/hw/mthca/mthca_main.c
-f:drivers/infiniband/hw/mthca/mthca_mcg.c
-f:drivers/infiniband/hw/mthca/mthca_memfree.c
-f:drivers/infiniband/hw/mthca/mthca_memfree.h
-f:drivers/infiniband/hw/mthca/mthca_mr.c
-f:drivers/infiniband/hw/mthca/mthca_pd.c
-f:drivers/infiniband/hw/mthca/mthca_profile.c
-f:drivers/infiniband/hw/mthca/mthca_profile.h
-f:drivers/infiniband/hw/mthca/mthca_provider.c
-f:drivers/infiniband/hw/mthca/mthca_provider.h
-f:drivers/infiniband/hw/mthca/mthca_qp.c
-f:drivers/infiniband/hw/mthca/mthca_reset.c
-f:drivers/infiniband/hw/mthca/mthca_srq.c
-f:drivers/infiniband/hw/mthca/mthca_uar.c
-f:drivers/infiniband/hw/mthca/mthca_wqe.h
-f:drivers/infiniband/hw/ocrdma/Kconfig
-f:drivers/infiniband/hw/ocrdma/Makefile
-f:drivers/infiniband/hw/ocrdma/ocrdma.h
-f:drivers/infiniband/hw/ocrdma/ocrdma_ah.c
-f:drivers/infiniband/hw/ocrdma/ocrdma_ah.h
-f:drivers/infiniband/hw/ocrdma/ocrdma_hw.c
-f:drivers/infiniband/hw/ocrdma/ocrdma_hw.h
-f:drivers/infiniband/hw/ocrdma/ocrdma_main.c
-f:drivers/infiniband/hw/ocrdma/ocrdma_sli.h
-f:drivers/infiniband/hw/ocrdma/ocrdma_stats.c
-f:drivers/infiniband/hw/ocrdma/ocrdma_stats.h
-f:drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
-f:drivers/infiniband/hw/ocrdma/ocrdma_verbs.h
-f:drivers/infiniband/hw/qedr/Kconfig
-f:drivers/infiniband/hw/qedr/Makefile
-f:drivers/infiniband/hw/qedr/main.c
-f:drivers/infiniband/hw/qedr/qedr.h
-f:drivers/infiniband/hw/qedr/qedr_hsi_rdma.h
-f:drivers/infiniband/hw/qedr/qedr_iw_cm.c
-f:drivers/infiniband/hw/qedr/qedr_iw_cm.h
-f:drivers/infiniband/hw/qedr/qedr_roce_cm.c
-f:drivers/infiniband/hw/qedr/qedr_roce_cm.h
-f:drivers/infiniband/hw/qedr/verbs.c
-f:drivers/infiniband/hw/qedr/verbs.h
-f:drivers/infiniband/hw/usnic/Kconfig
-f:drivers/infiniband/hw/usnic/Makefile
-f:drivers/infiniband/hw/usnic/usnic.h
-f:drivers/infiniband/hw/usnic/usnic_abi.h
-f:drivers/infiniband/hw/usnic/usnic_common_pkt_hdr.h
-f:drivers/infiniband/hw/usnic/usnic_common_util.h
-f:drivers/infiniband/hw/usnic/usnic_debugfs.c
-f:drivers/infiniband/hw/usnic/usnic_debugfs.h
-f:drivers/infiniband/hw/usnic/usnic_fwd.c
-f:drivers/infiniband/hw/usnic/usnic_fwd.h
-f:drivers/infiniband/hw/usnic/usnic_ib.h
-f:drivers/infiniband/hw/usnic/usnic_ib_main.c
-f:drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c
-f:drivers/infiniband/hw/usnic/usnic_ib_qp_grp.h
-f:drivers/infiniband/hw/usnic/usnic_ib_sysfs.c
-f:drivers/infiniband/hw/usnic/usnic_ib_sysfs.h
-f:drivers/infiniband/hw/usnic/usnic_ib_verbs.c
-f:drivers/infiniband/hw/usnic/usnic_ib_verbs.h
-f:drivers/infiniband/hw/usnic/usnic_log.h
-f:drivers/infiniband/hw/usnic/usnic_transport.c
-f:drivers/infiniband/hw/usnic/usnic_transport.h
-f:drivers/infiniband/hw/usnic/usnic_uiom.c
-f:drivers/infiniband/hw/usnic/usnic_uiom.h
-f:drivers/infiniband/hw/usnic/usnic_uiom_interval_tree.c
-f:drivers/infiniband/hw/usnic/usnic_uiom_interval_tree.h
-f:drivers/infiniband/hw/usnic/usnic_vnic.c
-f:drivers/infiniband/hw/usnic/usnic_vnic.h
-f:drivers/infiniband/hw/vmw_pvrdma/Kconfig
-f:drivers/infiniband/hw/vmw_pvrdma/Makefile
-f:drivers/infiniband/hw/vmw_pvrdma/pvrdma.h
-f:drivers/infiniband/hw/vmw_pvrdma/pvrdma_cmd.c
-f:drivers/infiniband/hw/vmw_pvrdma/pvrdma_cq.c
-f:drivers/infiniband/hw/vmw_pvrdma/pvrdma_dev_api.h
-f:drivers/infiniband/hw/vmw_pvrdma/pvrdma_doorbell.c
-f:drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c
-f:drivers/infiniband/hw/vmw_pvrdma/pvrdma_misc.c
-f:drivers/infiniband/hw/vmw_pvrdma/pvrdma_mr.c
-f:drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c
-f:drivers/infiniband/hw/vmw_pvrdma/pvrdma_ring.h
-f:drivers/infiniband/hw/vmw_pvrdma/pvrdma_srq.c
-f:drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c
-f:drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.h
-f:drivers/infiniband/sw/Makefile
-f:drivers/infiniband/sw/rdmavt/Kconfig
-f:drivers/infiniband/sw/rdmavt/Makefile
-f:drivers/infiniband/sw/rdmavt/ah.c
-f:drivers/infiniband/sw/rdmavt/ah.h
-f:drivers/infiniband/sw/rdmavt/cq.c
-f:drivers/infiniband/sw/rdmavt/cq.h
-f:drivers/infiniband/sw/rdmavt/mad.c
-f:drivers/infiniband/sw/rdmavt/mad.h
-f:drivers/infiniband/sw/rdmavt/mcast.c
-f:drivers/infiniband/sw/rdmavt/mcast.h
-f:drivers/infiniband/sw/rdmavt/mmap.c
-f:drivers/infiniband/sw/rdmavt/mmap.h
-f:drivers/infiniband/sw/rdmavt/mr.c
-f:drivers/infiniband/sw/rdmavt/mr.h
-f:drivers/infiniband/sw/rdmavt/pd.c
-f:drivers/infiniband/sw/rdmavt/pd.h
-f:drivers/infiniband/sw/rdmavt/qp.c
-f:drivers/infiniband/sw/rdmavt/qp.h
-f:drivers/infiniband/sw/rdmavt/rc.c
-f:drivers/infiniband/sw/rdmavt/srq.c
-f:drivers/infiniband/sw/rdmavt/srq.h
-f:drivers/infiniband/sw/rdmavt/trace.c
-f:drivers/infiniband/sw/rdmavt/trace.h
-f:drivers/infiniband/sw/rdmavt/trace_cq.h
-f:drivers/infiniband/sw/rdmavt/trace_mr.h
-f:drivers/infiniband/sw/rdmavt/trace_qp.h
-f:drivers/infiniband/sw/rdmavt/trace_rc.h
-f:drivers/infiniband/sw/rdmavt/trace_rvt.h
-f:drivers/infiniband/sw/rdmavt/trace_tx.h
-f:drivers/infiniband/sw/rdmavt/vt.c
-f:drivers/infiniband/sw/rdmavt/vt.h
-f:drivers/infiniband/sw/rxe/Kconfig
-f:drivers/infiniband/sw/rxe/Makefile
-f:drivers/infiniband/sw/rxe/rxe.c
-f:drivers/infiniband/sw/rxe/rxe.h
-f:drivers/infiniband/sw/rxe/rxe_av.c
-f:drivers/infiniband/sw/rxe/rxe_comp.c
-f:drivers/infiniband/sw/rxe/rxe_cq.c
-f:drivers/infiniband/sw/rxe/rxe_hdr.h
-f:drivers/infiniband/sw/rxe/rxe_hw_counters.c
-f:drivers/infiniband/sw/rxe/rxe_hw_counters.h
-f:drivers/infiniband/sw/rxe/rxe_icrc.c
-f:drivers/infiniband/sw/rxe/rxe_loc.h
-f:drivers/infiniband/sw/rxe/rxe_mcast.c
-f:drivers/infiniband/sw/rxe/rxe_mmap.c
-f:drivers/infiniband/sw/rxe/rxe_mr.c
-f:drivers/infiniband/sw/rxe/rxe_mw.c
-f:drivers/infiniband/sw/rxe/rxe_net.c
-f:drivers/infiniband/sw/rxe/rxe_net.h
-f:drivers/infiniband/sw/rxe/rxe_odp.c
-f:drivers/infiniband/sw/rxe/rxe_opcode.c
-f:drivers/infiniband/sw/rxe/rxe_opcode.h
-f:drivers/infiniband/sw/rxe/rxe_param.h
-f:drivers/infiniband/sw/rxe/rxe_pool.c
-f:drivers/infiniband/sw/rxe/rxe_pool.h
-f:drivers/infiniband/sw/rxe/rxe_qp.c
-f:drivers/infiniband/sw/rxe/rxe_queue.c
-f:drivers/infiniband/sw/rxe/rxe_queue.h
-f:drivers/infiniband/sw/rxe/rxe_recv.c
-f:drivers/infiniband/sw/rxe/rxe_req.c
-f:drivers/infiniband/sw/rxe/rxe_resp.c
-f:drivers/infiniband/sw/rxe/rxe_srq.c
-f:drivers/infiniband/sw/rxe/rxe_task.c
-f:drivers/infiniband/sw/rxe/rxe_task.h
-f:drivers/infiniband/sw/rxe/rxe_verbs.c
-f:drivers/infiniband/sw/rxe/rxe_verbs.h
-f:drivers/infiniband/sw/siw/Kconfig
-f:drivers/infiniband/sw/siw/Makefile
-f:drivers/infiniband/sw/siw/iwarp.h
-f:drivers/infiniband/sw/siw/siw.h
-f:drivers/infiniband/sw/siw/siw_cm.c
-f:drivers/infiniband/sw/siw/siw_cm.h
-f:drivers/infiniband/sw/siw/siw_cq.c
-f:drivers/infiniband/sw/siw/siw_main.c
-f:drivers/infiniband/sw/siw/siw_mem.c
-f:drivers/infiniband/sw/siw/siw_mem.h
-f:drivers/infiniband/sw/siw/siw_qp.c
-f:drivers/infiniband/sw/siw/siw_qp_rx.c
-f:drivers/infiniband/sw/siw/siw_qp_tx.c
-f:drivers/infiniband/sw/siw/siw_verbs.c
-f:drivers/infiniband/sw/siw/siw_verbs.h
-f:drivers/infiniband/ulp/Makefile
-f:drivers/infiniband/ulp/ipoib/Kconfig
-f:drivers/infiniband/ulp/ipoib/Makefile
-f:drivers/infiniband/ulp/ipoib/ipoib.h
-f:drivers/infiniband/ulp/ipoib/ipoib_cm.c
-f:drivers/infiniband/ulp/ipoib/ipoib_ethtool.c
-f:drivers/infiniband/ulp/ipoib/ipoib_fs.c
-f:drivers/infiniband/ulp/ipoib/ipoib_ib.c
-f:drivers/infiniband/ulp/ipoib/ipoib_main.c
-f:drivers/infiniband/ulp/ipoib/ipoib_multicast.c
-f:drivers/infiniband/ulp/ipoib/ipoib_netlink.c
-f:drivers/infiniband/ulp/ipoib/ipoib_verbs.c
-f:drivers/infiniband/ulp/ipoib/ipoib_vlan.c
-f:drivers/infiniband/ulp/iser/Kconfig
-f:drivers/infiniband/ulp/iser/Makefile
-f:drivers/infiniband/ulp/iser/iscsi_iser.c
-f:drivers/infiniband/ulp/iser/iscsi_iser.h
-f:drivers/infiniband/ulp/iser/iser_initiator.c
-f:drivers/infiniband/ulp/iser/iser_memory.c
-f:drivers/infiniband/ulp/iser/iser_verbs.c
-f:drivers/infiniband/ulp/isert/Kconfig
-f:drivers/infiniband/ulp/isert/Makefile
-f:drivers/infiniband/ulp/isert/ib_isert.c
-f:drivers/infiniband/ulp/isert/ib_isert.h
-f:drivers/infiniband/ulp/opa_vnic/Kconfig
-f:drivers/infiniband/ulp/opa_vnic/Makefile
-f:drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.c
-f:drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.h
-f:drivers/infiniband/ulp/opa_vnic/opa_vnic_ethtool.c
-f:drivers/infiniband/ulp/opa_vnic/opa_vnic_internal.h
-f:drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c
-f:drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c
-f:drivers/infiniband/ulp/opa_vnic/opa_vnic_vema_iface.c
-f:drivers/infiniband/ulp/rtrs/Kconfig
-f:drivers/infiniband/ulp/rtrs/Makefile
-f:drivers/infiniband/ulp/rtrs/README
-f:drivers/infiniband/ulp/rtrs/rtrs-clt-stats.c
-f:drivers/infiniband/ulp/rtrs/rtrs-clt-sysfs.c
-f:drivers/infiniband/ulp/rtrs/rtrs-clt-trace.c
-f:drivers/infiniband/ulp/rtrs/rtrs-clt-trace.h
-f:drivers/infiniband/ulp/rtrs/rtrs-clt.c
-f:drivers/infiniband/ulp/rtrs/rtrs-clt.h
-f:drivers/infiniband/ulp/rtrs/rtrs-log.h
-f:drivers/infiniband/ulp/rtrs/rtrs-pri.h
-f:drivers/infiniband/ulp/rtrs/rtrs-srv-stats.c
-f:drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c
-f:drivers/infiniband/ulp/rtrs/rtrs-srv-trace.c
-f:drivers/infiniband/ulp/rtrs/rtrs-srv-trace.h
-f:drivers/infiniband/ulp/rtrs/rtrs-srv.c
-f:drivers/infiniband/ulp/rtrs/rtrs-srv.h
-f:drivers/infiniband/ulp/rtrs/rtrs.c
-f:drivers/infiniband/ulp/rtrs/rtrs.h
-f:drivers/infiniband/ulp/srp/Kbuild
-f:drivers/infiniband/ulp/srp/Kconfig
-f:drivers/infiniband/ulp/srp/ib_srp.c
-f:drivers/infiniband/ulp/srp/ib_srp.h
-f:drivers/infiniband/ulp/srpt/Kconfig
-f:drivers/infiniband/ulp/srpt/Makefile
-f:drivers/infiniband/ulp/srpt/ib_dm_mad.h
-f:drivers/infiniband/ulp/srpt/ib_srpt.c
-f:drivers/infiniband/ulp/srpt/ib_srpt.h
-f:drivers/input/Kconfig
-f:drivers/input/Makefile
-f:drivers/input/apm-power.c
-f:drivers/input/evdev.c
-f:drivers/input/ff-core.c
-f:drivers/input/ff-memless.c
-f:drivers/input/gameport/Kconfig
-f:drivers/input/gameport/Makefile
-f:drivers/input/gameport/emu10k1-gp.c
-f:drivers/input/gameport/fm801-gp.c
-f:drivers/input/gameport/gameport.c
-f:drivers/input/gameport/lightning.c
-f:drivers/input/gameport/ns558.c
-f:drivers/input/input-compat.c
-f:drivers/input/input-compat.h
-f:drivers/input/input-core-private.h
-f:drivers/input/input-leds.c
-f:drivers/input/input-mt.c
-f:drivers/input/input-poller.c
-f:drivers/input/input-poller.h
-f:drivers/input/input.c
-f:drivers/input/joydev.c
-f:drivers/input/joystick/Kconfig
-f:drivers/input/joystick/Makefile
-f:drivers/input/joystick/a3d.c
-f:drivers/input/joystick/adafruit-seesaw.c
-f:drivers/input/joystick/adc-joystick.c
-f:drivers/input/joystick/adi.c
-f:drivers/input/joystick/amijoy.c
-f:drivers/input/joystick/analog.c
-f:drivers/input/joystick/as5011.c
-f:drivers/input/joystick/cobra.c
-f:drivers/input/joystick/db9.c
-f:drivers/input/joystick/fsia6b.c
-f:drivers/input/joystick/gamecon.c
-f:drivers/input/joystick/gf2k.c
-f:drivers/input/joystick/grip.c
-f:drivers/input/joystick/grip_mp.c
-f:drivers/input/joystick/guillemot.c
-f:drivers/input/joystick/iforce/Kconfig
-f:drivers/input/joystick/iforce/Makefile
-f:drivers/input/joystick/iforce/iforce-ff.c
-f:drivers/input/joystick/iforce/iforce-main.c
-f:drivers/input/joystick/iforce/iforce-packets.c
-f:drivers/input/joystick/iforce/iforce-serio.c
-f:drivers/input/joystick/iforce/iforce-usb.c
-f:drivers/input/joystick/iforce/iforce.h
-f:drivers/input/joystick/interact.c
-f:drivers/input/joystick/joydump.c
-f:drivers/input/joystick/magellan.c
-f:drivers/input/joystick/maplecontrol.c
-f:drivers/input/joystick/n64joy.c
-f:drivers/input/joystick/psxpad-spi.c
-f:drivers/input/joystick/pxrc.c
-f:drivers/input/joystick/qwiic-joystick.c
-f:drivers/input/joystick/sensehat-joystick.c
-f:drivers/input/joystick/sidewinder.c
-f:drivers/input/joystick/spaceball.c
-f:drivers/input/joystick/spaceorb.c
-f:drivers/input/joystick/stinger.c
-f:drivers/input/joystick/tmdc.c
-f:drivers/input/joystick/turbografx.c
-f:drivers/input/joystick/twidjoy.c
-f:drivers/input/joystick/walkera0701.c
-f:drivers/input/joystick/warrior.c
-f:drivers/input/joystick/xpad.c
-f:drivers/input/joystick/zhenhua.c
-f:drivers/input/keyboard/Kconfig
-f:drivers/input/keyboard/Makefile
-f:drivers/input/keyboard/adc-keys.c
-f:drivers/input/keyboard/adp5520-keys.c
-f:drivers/input/keyboard/adp5585-keys.c
-f:drivers/input/keyboard/adp5588-keys.c
-f:drivers/input/keyboard/amikbd.c
-f:drivers/input/keyboard/applespi.c
-f:drivers/input/keyboard/applespi.h
-f:drivers/input/keyboard/applespi_trace.h
-f:drivers/input/keyboard/atakbd.c
-f:drivers/input/keyboard/atkbd.c
-f:drivers/input/keyboard/bcm-keypad.c
-f:drivers/input/keyboard/cap11xx.c
-f:drivers/input/keyboard/clps711x-keypad.c
-f:drivers/input/keyboard/cros_ec_keyb.c
-f:drivers/input/keyboard/cypress-sf.c
-f:drivers/input/keyboard/dlink-dir685-touchkeys.c
-f:drivers/input/keyboard/ep93xx_keypad.c
-f:drivers/input/keyboard/goldfish_events.c
-f:drivers/input/keyboard/gpio_keys.c
-f:drivers/input/keyboard/gpio_keys_polled.c
-f:drivers/input/keyboard/hil_kbd.c
-f:drivers/input/keyboard/hilkbd.c
-f:drivers/input/keyboard/hpps2atkbd.h
-f:drivers/input/keyboard/imx-sm-bbm-key.c
-f:drivers/input/keyboard/imx_keypad.c
-f:drivers/input/keyboard/imx_sc_key.c
-f:drivers/input/keyboard/ipaq-micro-keys.c
-f:drivers/input/keyboard/iqs62x-keys.c
-f:drivers/input/keyboard/jornada680_kbd.c
-f:drivers/input/keyboard/jornada720_kbd.c
-f:drivers/input/keyboard/lkkbd.c
-f:drivers/input/keyboard/lm8323.c
-f:drivers/input/keyboard/lm8333.c
-f:drivers/input/keyboard/locomokbd.c
-f:drivers/input/keyboard/lpc32xx-keys.c
-f:drivers/input/keyboard/maple_keyb.c
-f:drivers/input/keyboard/matrix_keypad.c
-f:drivers/input/keyboard/max7359_keypad.c
-f:drivers/input/keyboard/mpr121_touchkey.c
-f:drivers/input/keyboard/mt6779-keypad.c
-f:drivers/input/keyboard/mtk-pmic-keys.c
-f:drivers/input/keyboard/newtonkbd.c
-f:drivers/input/keyboard/nspire-keypad.c
-f:drivers/input/keyboard/omap-keypad.c
-f:drivers/input/keyboard/omap4-keypad.c
-f:drivers/input/keyboard/opencores-kbd.c
-f:drivers/input/keyboard/pinephone-keyboard.c
-f:drivers/input/keyboard/pmic8xxx-keypad.c
-f:drivers/input/keyboard/pxa27x_keypad.c
-f:drivers/input/keyboard/qt1050.c
-f:drivers/input/keyboard/qt1070.c
-f:drivers/input/keyboard/qt2160.c
-f:drivers/input/keyboard/samsung-keypad.c
-f:drivers/input/keyboard/sh_keysc.c
-f:drivers/input/keyboard/snvs_pwrkey.c
-f:drivers/input/keyboard/spear-keyboard.c
-f:drivers/input/keyboard/st-keyscan.c
-f:drivers/input/keyboard/stmpe-keypad.c
-f:drivers/input/keyboard/stowaway.c
-f:drivers/input/keyboard/sun4i-lradc-keys.c
-f:drivers/input/keyboard/sunkbd.c
-f:drivers/input/keyboard/tc3589x-keypad.c
-f:drivers/input/keyboard/tca6416-keypad.c
-f:drivers/input/keyboard/tca8418_keypad.c
-f:drivers/input/keyboard/tegra-kbc.c
-f:drivers/input/keyboard/tm2-touchkey.c
-f:drivers/input/keyboard/twl4030_keypad.c
-f:drivers/input/keyboard/xtkbd.c
-f:drivers/input/matrix-keymap.c
-f:drivers/input/misc/88pm80x_onkey.c
-f:drivers/input/misc/88pm860x_onkey.c
-f:drivers/input/misc/88pm886-onkey.c
-f:drivers/input/misc/Kconfig
-f:drivers/input/misc/Makefile
-f:drivers/input/misc/ab8500-ponkey.c
-f:drivers/input/misc/ad714x-i2c.c
-f:drivers/input/misc/ad714x-spi.c
-f:drivers/input/misc/ad714x.c
-f:drivers/input/misc/ad714x.h
-f:drivers/input/misc/adxl34x-i2c.c
-f:drivers/input/misc/adxl34x-spi.c
-f:drivers/input/misc/adxl34x.c
-f:drivers/input/misc/adxl34x.h
-f:drivers/input/misc/apanel.c
-f:drivers/input/misc/ariel-pwrbutton.c
-f:drivers/input/misc/arizona-haptics.c
-f:drivers/input/misc/atc260x-onkey.c
-f:drivers/input/misc/ati_remote2.c
-f:drivers/input/misc/atlas_btns.c
-f:drivers/input/misc/atmel_captouch.c
-f:drivers/input/misc/axp20x-pek.c
-f:drivers/input/misc/bma150.c
-f:drivers/input/misc/cm109.c
-f:drivers/input/misc/cma3000_d0x.c
-f:drivers/input/misc/cma3000_d0x.h
-f:drivers/input/misc/cma3000_d0x_i2c.c
-f:drivers/input/misc/cobalt_btns.c
-f:drivers/input/misc/cpcap-pwrbutton.c
-f:drivers/input/misc/cs40l50-vibra.c
-f:drivers/input/misc/da7280.c
-f:drivers/input/misc/da9052_onkey.c
-f:drivers/input/misc/da9055_onkey.c
-f:drivers/input/misc/da9063_onkey.c
-f:drivers/input/misc/drv260x.c
-f:drivers/input/misc/drv2665.c
-f:drivers/input/misc/drv2667.c
-f:drivers/input/misc/e3x0-button.c
-f:drivers/input/misc/gpio-beeper.c
-f:drivers/input/misc/gpio-vibra.c
-f:drivers/input/misc/gpio_decoder.c
-f:drivers/input/misc/hisi_powerkey.c
-f:drivers/input/misc/hp_sdc_rtc.c
-f:drivers/input/misc/ibm-panel.c
-f:drivers/input/misc/ideapad_slidebar.c
-f:drivers/input/misc/ims-pcu.c
-f:drivers/input/misc/iqs269a.c
-f:drivers/input/misc/iqs626a.c
-f:drivers/input/misc/iqs7222.c
-f:drivers/input/misc/keyspan_remote.c
-f:drivers/input/misc/kxtj9.c
-f:drivers/input/misc/m68kspkr.c
-f:drivers/input/misc/max77650-onkey.c
-f:drivers/input/misc/max77693-haptic.c
-f:drivers/input/misc/max8925_onkey.c
-f:drivers/input/misc/max8997_haptic.c
-f:drivers/input/misc/mc13783-pwrbutton.c
-f:drivers/input/misc/mma8450.c
-f:drivers/input/misc/nxp-bbnsm-pwrkey.c
-f:drivers/input/misc/palmas-pwrbutton.c
-f:drivers/input/misc/pcap_keys.c
-f:drivers/input/misc/pcf50633-input.c
-f:drivers/input/misc/pcf8574_keypad.c
-f:drivers/input/misc/pcspkr.c
-f:drivers/input/misc/pm8941-pwrkey.c
-f:drivers/input/misc/pm8xxx-vibrator.c
-f:drivers/input/misc/pmic8xxx-pwrkey.c
-f:drivers/input/misc/powermate.c
-f:drivers/input/misc/pwm-beeper.c
-f:drivers/input/misc/pwm-vibra.c
-f:drivers/input/misc/qnap-mcu-input.c
-f:drivers/input/misc/rave-sp-pwrbutton.c
-f:drivers/input/misc/rb532_button.c
-f:drivers/input/misc/regulator-haptic.c
-f:drivers/input/misc/retu-pwrbutton.c
-f:drivers/input/misc/rk805-pwrkey.c
-f:drivers/input/misc/rotary_encoder.c
-f:drivers/input/misc/rt5120-pwrkey.c
-f:drivers/input/misc/sc27xx-vibra.c
-f:drivers/input/misc/sgi_btns.c
-f:drivers/input/misc/soc_button_array.c
-f:drivers/input/misc/sparcspkr.c
-f:drivers/input/misc/stpmic1_onkey.c
-f:drivers/input/misc/tps65218-pwrbutton.c
-f:drivers/input/misc/tps65219-pwrbutton.c
-f:drivers/input/misc/twl4030-pwrbutton.c
-f:drivers/input/misc/twl4030-vibra.c
-f:drivers/input/misc/twl6040-vibra.c
-f:drivers/input/misc/uinput.c
-f:drivers/input/misc/wistron_btns.c
-f:drivers/input/misc/wm831x-on.c
-f:drivers/input/misc/xen-kbdfront.c
-f:drivers/input/misc/yealink.c
-f:drivers/input/misc/yealink.h
-f:drivers/input/mouse/Kconfig
-f:drivers/input/mouse/Makefile
-f:drivers/input/mouse/alps.c
-f:drivers/input/mouse/alps.h
-f:drivers/input/mouse/amimouse.c
-f:drivers/input/mouse/appletouch.c
-f:drivers/input/mouse/atarimouse.c
-f:drivers/input/mouse/bcm5974.c
-f:drivers/input/mouse/byd.c
-f:drivers/input/mouse/byd.h
-f:drivers/input/mouse/cyapa.c
-f:drivers/input/mouse/cyapa.h
-f:drivers/input/mouse/cyapa_gen3.c
-f:drivers/input/mouse/cyapa_gen5.c
-f:drivers/input/mouse/cyapa_gen6.c
-f:drivers/input/mouse/cypress_ps2.c
-f:drivers/input/mouse/cypress_ps2.h
-f:drivers/input/mouse/elan_i2c.h
-f:drivers/input/mouse/elan_i2c_core.c
-f:drivers/input/mouse/elan_i2c_i2c.c
-f:drivers/input/mouse/elan_i2c_smbus.c
-f:drivers/input/mouse/elantech.c
-f:drivers/input/mouse/elantech.h
-f:drivers/input/mouse/focaltech.c
-f:drivers/input/mouse/focaltech.h
-f:drivers/input/mouse/gpio_mouse.c
-f:drivers/input/mouse/hgpk.c
-f:drivers/input/mouse/hgpk.h
-f:drivers/input/mouse/inport.c
-f:drivers/input/mouse/lifebook.c
-f:drivers/input/mouse/lifebook.h
-f:drivers/input/mouse/logibm.c
-f:drivers/input/mouse/logips2pp.c
-f:drivers/input/mouse/logips2pp.h
-f:drivers/input/mouse/maplemouse.c
-f:drivers/input/mouse/pc110pad.c
-f:drivers/input/mouse/psmouse-base.c
-f:drivers/input/mouse/psmouse-smbus.c
-f:drivers/input/mouse/psmouse.h
-f:drivers/input/mouse/rpcmouse.c
-f:drivers/input/mouse/sentelic.c
-f:drivers/input/mouse/sentelic.h
-f:drivers/input/mouse/sermouse.c
-f:drivers/input/mouse/synaptics.c
-f:drivers/input/mouse/synaptics.h
-f:drivers/input/mouse/synaptics_i2c.c
-f:drivers/input/mouse/synaptics_usb.c
-f:drivers/input/mouse/touchkit_ps2.c
-f:drivers/input/mouse/touchkit_ps2.h
-f:drivers/input/mouse/trackpoint.c
-f:drivers/input/mouse/trackpoint.h
-f:drivers/input/mouse/vmmouse.c
-f:drivers/input/mouse/vmmouse.h
-f:drivers/input/mouse/vsxxxaa.c
-f:drivers/input/mousedev.c
-f:drivers/input/rmi4/Kconfig
-f:drivers/input/rmi4/Makefile
-f:drivers/input/rmi4/rmi_2d_sensor.c
-f:drivers/input/rmi4/rmi_2d_sensor.h
-f:drivers/input/rmi4/rmi_bus.c
-f:drivers/input/rmi4/rmi_bus.h
-f:drivers/input/rmi4/rmi_driver.c
-f:drivers/input/rmi4/rmi_driver.h
-f:drivers/input/rmi4/rmi_f01.c
-f:drivers/input/rmi4/rmi_f03.c
-f:drivers/input/rmi4/rmi_f11.c
-f:drivers/input/rmi4/rmi_f12.c
-f:drivers/input/rmi4/rmi_f30.c
-f:drivers/input/rmi4/rmi_f34.c
-f:drivers/input/rmi4/rmi_f34.h
-f:drivers/input/rmi4/rmi_f34v7.c
-f:drivers/input/rmi4/rmi_f3a.c
-f:drivers/input/rmi4/rmi_f54.c
-f:drivers/input/rmi4/rmi_f55.c
-f:drivers/input/rmi4/rmi_i2c.c
-f:drivers/input/rmi4/rmi_smbus.c
-f:drivers/input/rmi4/rmi_spi.c
-f:drivers/input/serio/Kconfig
-f:drivers/input/serio/Makefile
-f:drivers/input/serio/altera_ps2.c
-f:drivers/input/serio/ambakmi.c
-f:drivers/input/serio/ams_delta_serio.c
-f:drivers/input/serio/apbps2.c
-f:drivers/input/serio/arc_ps2.c
-f:drivers/input/serio/ct82c710.c
-f:drivers/input/serio/gscps2.c
-f:drivers/input/serio/hil_mlc.c
-f:drivers/input/serio/hp_sdc.c
-f:drivers/input/serio/hp_sdc_mlc.c
-f:drivers/input/serio/hyperv-keyboard.c
-f:drivers/input/serio/i8042-acpipnpio.h
-f:drivers/input/serio/i8042-io.h
-f:drivers/input/serio/i8042-ip22io.h
-f:drivers/input/serio/i8042-jazzio.h
-f:drivers/input/serio/i8042-snirm.h
-f:drivers/input/serio/i8042-sparcio.h
-f:drivers/input/serio/i8042.c
-f:drivers/input/serio/i8042.h
-f:drivers/input/serio/ioc3kbd.c
-f:drivers/input/serio/libps2.c
-f:drivers/input/serio/maceps2.c
-f:drivers/input/serio/olpc_apsp.c
-f:drivers/input/serio/parkbd.c
-f:drivers/input/serio/pcips2.c
-f:drivers/input/serio/ps2-gpio.c
-f:drivers/input/serio/ps2mult.c
-f:drivers/input/serio/q40kbd.c
-f:drivers/input/serio/rpckbd.c
-f:drivers/input/serio/sa1111ps2.c
-f:drivers/input/serio/serio.c
-f:drivers/input/serio/serio_raw.c
-f:drivers/input/serio/serport.c
-f:drivers/input/serio/sun4i-ps2.c
-f:drivers/input/serio/userio.c
-f:drivers/input/serio/xilinx_ps2.c
-f:drivers/input/sparse-keymap.c
-f:drivers/input/tablet/Kconfig
-f:drivers/input/tablet/Makefile
-f:drivers/input/tablet/acecad.c
-f:drivers/input/tablet/aiptek.c
-f:drivers/input/tablet/hanwang.c
-f:drivers/input/tablet/kbtab.c
-f:drivers/input/tablet/pegasus_notetaker.c
-f:drivers/input/tablet/wacom_serial4.c
-f:drivers/input/tests/.kunitconfig
-f:drivers/input/tests/Makefile
-f:drivers/input/tests/input_test.c
-f:drivers/input/touchscreen.c
-f:drivers/input/touchscreen/88pm860x-ts.c
-f:drivers/input/touchscreen/Kconfig
-f:drivers/input/touchscreen/Makefile
-f:drivers/input/touchscreen/ad7877.c
-f:drivers/input/touchscreen/ad7879-i2c.c
-f:drivers/input/touchscreen/ad7879-spi.c
-f:drivers/input/touchscreen/ad7879.c
-f:drivers/input/touchscreen/ad7879.h
-f:drivers/input/touchscreen/ads7846.c
-f:drivers/input/touchscreen/apple_z2.c
-f:drivers/input/touchscreen/ar1021_i2c.c
-f:drivers/input/touchscreen/atmel_mxt_ts.c
-f:drivers/input/touchscreen/auo-pixcir-ts.c
-f:drivers/input/touchscreen/bcm_iproc_tsc.c
-f:drivers/input/touchscreen/bu21013_ts.c
-f:drivers/input/touchscreen/bu21029_ts.c
-f:drivers/input/touchscreen/chipone_icn8318.c
-f:drivers/input/touchscreen/chipone_icn8505.c
-f:drivers/input/touchscreen/colibri-vf50-ts.c
-f:drivers/input/touchscreen/cy8ctma140.c
-f:drivers/input/touchscreen/cy8ctmg110_ts.c
-f:drivers/input/touchscreen/cyttsp5.c
-f:drivers/input/touchscreen/cyttsp_core.c
-f:drivers/input/touchscreen/cyttsp_core.h
-f:drivers/input/touchscreen/cyttsp_i2c.c
-f:drivers/input/touchscreen/cyttsp_spi.c
-f:drivers/input/touchscreen/da9034-ts.c
-f:drivers/input/touchscreen/da9052_tsi.c
-f:drivers/input/touchscreen/dynapro.c
-f:drivers/input/touchscreen/edt-ft5x06.c
-f:drivers/input/touchscreen/eeti_ts.c
-f:drivers/input/touchscreen/egalax_ts.c
-f:drivers/input/touchscreen/egalax_ts_serial.c
-f:drivers/input/touchscreen/ektf2127.c
-f:drivers/input/touchscreen/elants_i2c.c
-f:drivers/input/touchscreen/elo.c
-f:drivers/input/touchscreen/exc3000.c
-f:drivers/input/touchscreen/fsl-imx25-tcq.c
-f:drivers/input/touchscreen/fujitsu_ts.c
-f:drivers/input/touchscreen/goodix.c
-f:drivers/input/touchscreen/goodix.h
-f:drivers/input/touchscreen/goodix_berlin.h
-f:drivers/input/touchscreen/goodix_berlin_core.c
-f:drivers/input/touchscreen/goodix_berlin_i2c.c
-f:drivers/input/touchscreen/goodix_berlin_spi.c
-f:drivers/input/touchscreen/goodix_fwupload.c
-f:drivers/input/touchscreen/gunze.c
-f:drivers/input/touchscreen/hampshire.c
-f:drivers/input/touchscreen/hideep.c
-f:drivers/input/touchscreen/himax_hx83112b.c
-f:drivers/input/touchscreen/hp680_ts_input.c
-f:drivers/input/touchscreen/htcpen.c
-f:drivers/input/touchscreen/hycon-hy46xx.c
-f:drivers/input/touchscreen/hynitron_cstxxx.c
-f:drivers/input/touchscreen/ili210x.c
-f:drivers/input/touchscreen/ilitek_ts_i2c.c
-f:drivers/input/touchscreen/imagis.c
-f:drivers/input/touchscreen/imx6ul_tsc.c
-f:drivers/input/touchscreen/inexio.c
-f:drivers/input/touchscreen/ipaq-micro-ts.c
-f:drivers/input/touchscreen/iqs5xx.c
-f:drivers/input/touchscreen/iqs7211.c
-f:drivers/input/touchscreen/jornada720_ts.c
-f:drivers/input/touchscreen/lpc32xx_ts.c
-f:drivers/input/touchscreen/mainstone-wm97xx.c
-f:drivers/input/touchscreen/max11801_ts.c
-f:drivers/input/touchscreen/mc13783_ts.c
-f:drivers/input/touchscreen/melfas_mip4.c
-f:drivers/input/touchscreen/migor_ts.c
-f:drivers/input/touchscreen/mk712.c
-f:drivers/input/touchscreen/mms114.c
-f:drivers/input/touchscreen/msg2638.c
-f:drivers/input/touchscreen/mtouch.c
-f:drivers/input/touchscreen/mxs-lradc-ts.c
-f:drivers/input/touchscreen/novatek-nvt-ts.c
-f:drivers/input/touchscreen/pcap_ts.c
-f:drivers/input/touchscreen/penmount.c
-f:drivers/input/touchscreen/pixcir_i2c_ts.c
-f:drivers/input/touchscreen/raspberrypi-ts.c
-f:drivers/input/touchscreen/raydium_i2c_ts.c
-f:drivers/input/touchscreen/resistive-adc-touch.c
-f:drivers/input/touchscreen/rohm_bu21023.c
-f:drivers/input/touchscreen/s6sy761.c
-f:drivers/input/touchscreen/silead.c
-f:drivers/input/touchscreen/sis_i2c.c
-f:drivers/input/touchscreen/st1232.c
-f:drivers/input/touchscreen/stmfts.c
-f:drivers/input/touchscreen/stmpe-ts.c
-f:drivers/input/touchscreen/sun4i-ts.c
-f:drivers/input/touchscreen/sur40.c
-f:drivers/input/touchscreen/surface3_spi.c
-f:drivers/input/touchscreen/sx8654.c
-f:drivers/input/touchscreen/ti_am335x_tsc.c
-f:drivers/input/touchscreen/touchit213.c
-f:drivers/input/touchscreen/touchright.c
-f:drivers/input/touchscreen/touchwin.c
-f:drivers/input/touchscreen/tps6507x-ts.c
-f:drivers/input/touchscreen/ts4800-ts.c
-f:drivers/input/touchscreen/tsc2004.c
-f:drivers/input/touchscreen/tsc2005.c
-f:drivers/input/touchscreen/tsc2007.h
-f:drivers/input/touchscreen/tsc2007_core.c
-f:drivers/input/touchscreen/tsc2007_iio.c
-f:drivers/input/touchscreen/tsc200x-core.c
-f:drivers/input/touchscreen/tsc200x-core.h
-f:drivers/input/touchscreen/tsc40.c
-f:drivers/input/touchscreen/usbtouchscreen.c
-f:drivers/input/touchscreen/wacom_i2c.c
-f:drivers/input/touchscreen/wacom_w8001.c
-f:drivers/input/touchscreen/wdt87xx_i2c.c
-f:drivers/input/touchscreen/wm831x-ts.c
-f:drivers/input/touchscreen/wm9705.c
-f:drivers/input/touchscreen/wm9712.c
-f:drivers/input/touchscreen/wm9713.c
-f:drivers/input/touchscreen/wm97xx-core.c
-f:drivers/input/touchscreen/zet6223.c
-f:drivers/input/touchscreen/zforce_ts.c
-f:drivers/input/touchscreen/zinitix.c
-f:drivers/input/vivaldi-fmap.c
-f:drivers/interconnect/Kconfig
-f:drivers/interconnect/Makefile
-f:drivers/interconnect/bulk.c
-f:drivers/interconnect/core.c
-f:drivers/interconnect/debugfs-client.c
-f:drivers/interconnect/icc-clk.c
-f:drivers/interconnect/imx/Kconfig
-f:drivers/interconnect/imx/Makefile
-f:drivers/interconnect/imx/imx.c
-f:drivers/interconnect/imx/imx.h
-f:drivers/interconnect/imx/imx8mm.c
-f:drivers/interconnect/imx/imx8mn.c
-f:drivers/interconnect/imx/imx8mp.c
-f:drivers/interconnect/imx/imx8mq.c
-f:drivers/interconnect/internal.h
-f:drivers/interconnect/mediatek/Kconfig
-f:drivers/interconnect/mediatek/Makefile
-f:drivers/interconnect/mediatek/icc-emi.c
-f:drivers/interconnect/mediatek/icc-emi.h
-f:drivers/interconnect/mediatek/mt8183.c
-f:drivers/interconnect/mediatek/mt8195.c
-f:drivers/interconnect/qcom/Kconfig
-f:drivers/interconnect/qcom/Makefile
-f:drivers/interconnect/qcom/bcm-voter.c
-f:drivers/interconnect/qcom/bcm-voter.h
-f:drivers/interconnect/qcom/icc-common.c
-f:drivers/interconnect/qcom/icc-common.h
-f:drivers/interconnect/qcom/icc-rpm-clocks.c
-f:drivers/interconnect/qcom/icc-rpm.c
-f:drivers/interconnect/qcom/icc-rpm.h
-f:drivers/interconnect/qcom/icc-rpmh.c
-f:drivers/interconnect/qcom/icc-rpmh.h
-f:drivers/interconnect/qcom/milos.c
-f:drivers/interconnect/qcom/msm8909.c
-f:drivers/interconnect/qcom/msm8916.c
-f:drivers/interconnect/qcom/msm8937.c
-f:drivers/interconnect/qcom/msm8939.c
-f:drivers/interconnect/qcom/msm8953.c
-f:drivers/interconnect/qcom/msm8974.c
-f:drivers/interconnect/qcom/msm8976.c
-f:drivers/interconnect/qcom/msm8996.c
-f:drivers/interconnect/qcom/msm8996.h
-f:drivers/interconnect/qcom/osm-l3.c
-f:drivers/interconnect/qcom/qcm2290.c
-f:drivers/interconnect/qcom/qcs404.c
-f:drivers/interconnect/qcom/qcs615.c
-f:drivers/interconnect/qcom/qcs615.h
-f:drivers/interconnect/qcom/qcs8300.c
-f:drivers/interconnect/qcom/qcs8300.h
-f:drivers/interconnect/qcom/qdu1000.c
-f:drivers/interconnect/qcom/qdu1000.h
-f:drivers/interconnect/qcom/sa8775p.c
-f:drivers/interconnect/qcom/sar2130p.c
-f:drivers/interconnect/qcom/sc7180.c
-f:drivers/interconnect/qcom/sc7180.h
-f:drivers/interconnect/qcom/sc7280.c
-f:drivers/interconnect/qcom/sc7280.h
-f:drivers/interconnect/qcom/sc8180x.c
-f:drivers/interconnect/qcom/sc8180x.h
-f:drivers/interconnect/qcom/sc8280xp.c
-f:drivers/interconnect/qcom/sc8280xp.h
-f:drivers/interconnect/qcom/sdm660.c
-f:drivers/interconnect/qcom/sdm670.c
-f:drivers/interconnect/qcom/sdm670.h
-f:drivers/interconnect/qcom/sdm845.c
-f:drivers/interconnect/qcom/sdm845.h
-f:drivers/interconnect/qcom/sdx55.c
-f:drivers/interconnect/qcom/sdx55.h
-f:drivers/interconnect/qcom/sdx65.c
-f:drivers/interconnect/qcom/sdx65.h
-f:drivers/interconnect/qcom/sdx75.c
-f:drivers/interconnect/qcom/sdx75.h
-f:drivers/interconnect/qcom/sm6115.c
-f:drivers/interconnect/qcom/sm6350.c
-f:drivers/interconnect/qcom/sm6350.h
-f:drivers/interconnect/qcom/sm7150.c
-f:drivers/interconnect/qcom/sm7150.h
-f:drivers/interconnect/qcom/sm8150.c
-f:drivers/interconnect/qcom/sm8150.h
-f:drivers/interconnect/qcom/sm8250.c
-f:drivers/interconnect/qcom/sm8250.h
-f:drivers/interconnect/qcom/sm8350.c
-f:drivers/interconnect/qcom/sm8350.h
-f:drivers/interconnect/qcom/sm8450.c
-f:drivers/interconnect/qcom/sm8450.h
-f:drivers/interconnect/qcom/sm8550.c
-f:drivers/interconnect/qcom/sm8550.h
-f:drivers/interconnect/qcom/sm8650.c
-f:drivers/interconnect/qcom/sm8650.h
-f:drivers/interconnect/qcom/sm8750.c
-f:drivers/interconnect/qcom/smd-rpm.c
-f:drivers/interconnect/qcom/x1e80100.c
-f:drivers/interconnect/qcom/x1e80100.h
-f:drivers/interconnect/samsung/Kconfig
-f:drivers/interconnect/samsung/Makefile
-f:drivers/interconnect/samsung/exynos.c
-f:drivers/interconnect/trace.h
-f:drivers/iommu/Kconfig
-f:drivers/iommu/Makefile
-f:drivers/iommu/amd/Kconfig
-f:drivers/iommu/amd/Makefile
-f:drivers/iommu/amd/amd_iommu.h
-f:drivers/iommu/amd/amd_iommu_types.h
-f:drivers/iommu/amd/debugfs.c
-f:drivers/iommu/amd/init.c
-f:drivers/iommu/amd/io_pgtable.c
-f:drivers/iommu/amd/io_pgtable_v2.c
-f:drivers/iommu/amd/iommu.c
-f:drivers/iommu/amd/pasid.c
-f:drivers/iommu/amd/ppr.c
-f:drivers/iommu/amd/quirks.c
-f:drivers/iommu/apple-dart.c
-f:drivers/iommu/arm/Kconfig
-f:drivers/iommu/arm/Makefile
-f:drivers/iommu/arm/arm-smmu-v3/Makefile
-f:drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c
-f:drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c
-f:drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-test.c
-f:drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
-f:drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h
-f:drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c
-f:drivers/iommu/arm/arm-smmu/Makefile
-f:drivers/iommu/arm/arm-smmu/arm-smmu-impl.c
-f:drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c
-f:drivers/iommu/arm/arm-smmu/arm-smmu-qcom-debug.c
-f:drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
-f:drivers/iommu/arm/arm-smmu/arm-smmu-qcom.h
-f:drivers/iommu/arm/arm-smmu/arm-smmu.c
-f:drivers/iommu/arm/arm-smmu/arm-smmu.h
-f:drivers/iommu/arm/arm-smmu/qcom_iommu.c
-f:drivers/iommu/dma-iommu.c
-f:drivers/iommu/dma-iommu.h
-f:drivers/iommu/exynos-iommu.c
-f:drivers/iommu/fsl_pamu.c
-f:drivers/iommu/fsl_pamu.h
-f:drivers/iommu/fsl_pamu_domain.c
-f:drivers/iommu/fsl_pamu_domain.h
-f:drivers/iommu/hyperv-iommu.c
-f:drivers/iommu/intel/Kconfig
-f:drivers/iommu/intel/Makefile
-f:drivers/iommu/intel/cache.c
-f:drivers/iommu/intel/debugfs.c
-f:drivers/iommu/intel/dmar.c
-f:drivers/iommu/intel/iommu.c
-f:drivers/iommu/intel/iommu.h
-f:drivers/iommu/intel/irq_remapping.c
-f:drivers/iommu/intel/nested.c
-f:drivers/iommu/intel/pasid.c
-f:drivers/iommu/intel/pasid.h
-f:drivers/iommu/intel/perf.c
-f:drivers/iommu/intel/perf.h
-f:drivers/iommu/intel/perfmon.c
-f:drivers/iommu/intel/perfmon.h
-f:drivers/iommu/intel/prq.c
-f:drivers/iommu/intel/svm.c
-f:drivers/iommu/intel/trace.c
-f:drivers/iommu/intel/trace.h
-f:drivers/iommu/io-pgfault.c
-f:drivers/iommu/io-pgtable-arm-v7s.c
-f:drivers/iommu/io-pgtable-arm.c
-f:drivers/iommu/io-pgtable-arm.h
-f:drivers/iommu/io-pgtable-dart.c
-f:drivers/iommu/io-pgtable.c
-f:drivers/iommu/iommu-debugfs.c
-f:drivers/iommu/iommu-pages.c
-f:drivers/iommu/iommu-pages.h
-f:drivers/iommu/iommu-priv.h
-f:drivers/iommu/iommu-sva.c
-f:drivers/iommu/iommu-sysfs.c
-f:drivers/iommu/iommu-traces.c
-f:drivers/iommu/iommu.c
-f:drivers/iommu/iommufd/Kconfig
-f:drivers/iommu/iommufd/Makefile
-f:drivers/iommu/iommufd/device.c
-f:drivers/iommu/iommufd/double_span.h
-f:drivers/iommu/iommufd/driver.c
-f:drivers/iommu/iommufd/eventq.c
-f:drivers/iommu/iommufd/hw_pagetable.c
-f:drivers/iommu/iommufd/io_pagetable.c
-f:drivers/iommu/iommufd/io_pagetable.h
-f:drivers/iommu/iommufd/ioas.c
-f:drivers/iommu/iommufd/iommufd_private.h
-f:drivers/iommu/iommufd/iommufd_test.h
-f:drivers/iommu/iommufd/iova_bitmap.c
-f:drivers/iommu/iommufd/main.c
-f:drivers/iommu/iommufd/pages.c
-f:drivers/iommu/iommufd/selftest.c
-f:drivers/iommu/iommufd/vfio_compat.c
-f:drivers/iommu/iommufd/viommu.c
-f:drivers/iommu/iova.c
-f:drivers/iommu/ipmmu-vmsa.c
-f:drivers/iommu/irq_remapping.c
-f:drivers/iommu/irq_remapping.h
-f:drivers/iommu/msm_iommu.c
-f:drivers/iommu/msm_iommu.h
-f:drivers/iommu/msm_iommu_hw-8xxx.h
-f:drivers/iommu/mtk_iommu.c
-f:drivers/iommu/mtk_iommu_v1.c
-f:drivers/iommu/of_iommu.c
-f:drivers/iommu/omap-iommu-debug.c
-f:drivers/iommu/omap-iommu.c
-f:drivers/iommu/omap-iommu.h
-f:drivers/iommu/omap-iopgtable.h
-f:drivers/iommu/riscv/Kconfig
-f:drivers/iommu/riscv/Makefile
-f:drivers/iommu/riscv/iommu-bits.h
-f:drivers/iommu/riscv/iommu-pci.c
-f:drivers/iommu/riscv/iommu-platform.c
-f:drivers/iommu/riscv/iommu.c
-f:drivers/iommu/riscv/iommu.h
-f:drivers/iommu/rockchip-iommu.c
-f:drivers/iommu/s390-iommu.c
-f:drivers/iommu/sprd-iommu.c
-f:drivers/iommu/sun50i-iommu.c
-f:drivers/iommu/tegra-smmu.c
-f:drivers/iommu/virtio-iommu.c
-f:drivers/ipack/Kconfig
-f:drivers/ipack/Makefile
-f:drivers/ipack/carriers/Kconfig
-f:drivers/ipack/carriers/Makefile
-f:drivers/ipack/carriers/tpci200.c
-f:drivers/ipack/carriers/tpci200.h
-f:drivers/ipack/devices/Kconfig
-f:drivers/ipack/devices/Makefile
-f:drivers/ipack/devices/ipoctal.c
-f:drivers/ipack/devices/ipoctal.h
-f:drivers/ipack/devices/scc2698.h
-f:drivers/ipack/ipack.c
-f:drivers/irqchip/Kconfig
-f:drivers/irqchip/Makefile
-f:drivers/irqchip/alphascale_asm9260-icoll.h
-f:drivers/irqchip/exynos-combiner.c
-f:drivers/irqchip/irq-aclint-sswi.c
-f:drivers/irqchip/irq-al-fic.c
-f:drivers/irqchip/irq-alpine-msi.c
-f:drivers/irqchip/irq-apple-aic.c
-f:drivers/irqchip/irq-armada-370-xp.c
-f:drivers/irqchip/irq-aspeed-i2c-ic.c
-f:drivers/irqchip/irq-aspeed-intc.c
-f:drivers/irqchip/irq-aspeed-scu-ic.c
-f:drivers/irqchip/irq-aspeed-vic.c
-f:drivers/irqchip/irq-ath79-cpu.c
-f:drivers/irqchip/irq-ath79-misc.c
-f:drivers/irqchip/irq-atmel-aic-common.c
-f:drivers/irqchip/irq-atmel-aic-common.h
-f:drivers/irqchip/irq-atmel-aic.c
-f:drivers/irqchip/irq-atmel-aic5.c
-f:drivers/irqchip/irq-bcm2712-mip.c
-f:drivers/irqchip/irq-bcm2835.c
-f:drivers/irqchip/irq-bcm2836.c
-f:drivers/irqchip/irq-bcm6345-l1.c
-f:drivers/irqchip/irq-bcm7038-l1.c
-f:drivers/irqchip/irq-bcm7120-l2.c
-f:drivers/irqchip/irq-brcmstb-l2.c
-f:drivers/irqchip/irq-clps711x.c
-f:drivers/irqchip/irq-crossbar.c
-f:drivers/irqchip/irq-csky-apb-intc.c
-f:drivers/irqchip/irq-csky-mpintc.c
-f:drivers/irqchip/irq-davinci-cp-intc.c
-f:drivers/irqchip/irq-digicolor.c
-f:drivers/irqchip/irq-dw-apb-ictl.c
-f:drivers/irqchip/irq-econet-en751221.c
-f:drivers/irqchip/irq-ftintc010.c
-f:drivers/irqchip/irq-gic-common.c
-f:drivers/irqchip/irq-gic-common.h
-f:drivers/irqchip/irq-gic-its-msi-parent.c
-f:drivers/irqchip/irq-gic-its-msi-parent.h
-f:drivers/irqchip/irq-gic-pm.c
-f:drivers/irqchip/irq-gic-realview.c
-f:drivers/irqchip/irq-gic-v2m.c
-f:drivers/irqchip/irq-gic-v3-its-fsl-mc-msi.c
-f:drivers/irqchip/irq-gic-v3-its.c
-f:drivers/irqchip/irq-gic-v3-mbi.c
-f:drivers/irqchip/irq-gic-v3.c
-f:drivers/irqchip/irq-gic-v4.c
-f:drivers/irqchip/irq-gic-v5-irs.c
-f:drivers/irqchip/irq-gic-v5-its.c
-f:drivers/irqchip/irq-gic-v5-iwb.c
-f:drivers/irqchip/irq-gic-v5.c
-f:drivers/irqchip/irq-gic.c
-f:drivers/irqchip/irq-goldfish-pic.c
-f:drivers/irqchip/irq-hip04.c
-f:drivers/irqchip/irq-i8259.c
-f:drivers/irqchip/irq-idt3243x.c
-f:drivers/irqchip/irq-imgpdc.c
-f:drivers/irqchip/irq-imx-gpcv2.c
-f:drivers/irqchip/irq-imx-intmux.c
-f:drivers/irqchip/irq-imx-irqsteer.c
-f:drivers/irqchip/irq-imx-mu-msi.c
-f:drivers/irqchip/irq-ingenic-tcu.c
-f:drivers/irqchip/irq-ingenic.c
-f:drivers/irqchip/irq-ixp4xx.c
-f:drivers/irqchip/irq-jcore-aic.c
-f:drivers/irqchip/irq-keystone.c
-f:drivers/irqchip/irq-lan966x-oic.c
-f:drivers/irqchip/irq-loongarch-avec.c
-f:drivers/irqchip/irq-loongarch-cpu.c
-f:drivers/irqchip/irq-loongson-eiointc.c
-f:drivers/irqchip/irq-loongson-htpic.c
-f:drivers/irqchip/irq-loongson-htvec.c
-f:drivers/irqchip/irq-loongson-liointc.c
-f:drivers/irqchip/irq-loongson-pch-lpc.c
-f:drivers/irqchip/irq-loongson-pch-msi.c
-f:drivers/irqchip/irq-loongson-pch-pic.c
-f:drivers/irqchip/irq-loongson.h
-f:drivers/irqchip/irq-lpc32xx.c
-f:drivers/irqchip/irq-ls-extirq.c
-f:drivers/irqchip/irq-ls-scfg-msi.c
-f:drivers/irqchip/irq-ls1x.c
-f:drivers/irqchip/irq-madera.c
-f:drivers/irqchip/irq-mbigen.c
-f:drivers/irqchip/irq-mchp-eic.c
-f:drivers/irqchip/irq-meson-gpio.c
-f:drivers/irqchip/irq-mips-cpu.c
-f:drivers/irqchip/irq-mips-gic.c
-f:drivers/irqchip/irq-mmp.c
-f:drivers/irqchip/irq-mscc-ocelot.c
-f:drivers/irqchip/irq-msi-lib.c
-f:drivers/irqchip/irq-mst-intc.c
-f:drivers/irqchip/irq-mtk-cirq.c
-f:drivers/irqchip/irq-mtk-sysirq.c
-f:drivers/irqchip/irq-mvebu-gicp.c
-f:drivers/irqchip/irq-mvebu-icu.c
-f:drivers/irqchip/irq-mvebu-odmi.c
-f:drivers/irqchip/irq-mvebu-pic.c
-f:drivers/irqchip/irq-mvebu-sei.c
-f:drivers/irqchip/irq-mxs.c
-f:drivers/irqchip/irq-nvic.c
-f:drivers/irqchip/irq-omap-intc.c
-f:drivers/irqchip/irq-ompic.c
-f:drivers/irqchip/irq-or1k-pic.c
-f:drivers/irqchip/irq-orion.c
-f:drivers/irqchip/irq-owl-sirq.c
-f:drivers/irqchip/irq-partition-percpu.c
-f:drivers/irqchip/irq-pic32-evic.c
-f:drivers/irqchip/irq-pruss-intc.c
-f:drivers/irqchip/irq-qcom-mpm.c
-f:drivers/irqchip/irq-rda-intc.c
-f:drivers/irqchip/irq-realtek-rtl.c
-f:drivers/irqchip/irq-renesas-intc-irqpin.c
-f:drivers/irqchip/irq-renesas-irqc.c
-f:drivers/irqchip/irq-renesas-rza1.c
-f:drivers/irqchip/irq-renesas-rzg2l.c
-f:drivers/irqchip/irq-renesas-rzv2h.c
-f:drivers/irqchip/irq-riscv-aplic-direct.c
-f:drivers/irqchip/irq-riscv-aplic-main.c
-f:drivers/irqchip/irq-riscv-aplic-main.h
-f:drivers/irqchip/irq-riscv-aplic-msi.c
-f:drivers/irqchip/irq-riscv-imsic-early.c
-f:drivers/irqchip/irq-riscv-imsic-platform.c
-f:drivers/irqchip/irq-riscv-imsic-state.c
-f:drivers/irqchip/irq-riscv-imsic-state.h
-f:drivers/irqchip/irq-riscv-intc.c
-f:drivers/irqchip/irq-sa11x0.c
-f:drivers/irqchip/irq-sg2042-msi.c
-f:drivers/irqchip/irq-sifive-plic.c
-f:drivers/irqchip/irq-sl28cpld.c
-f:drivers/irqchip/irq-sni-exiu.c
-f:drivers/irqchip/irq-sp7021-intc.c
-f:drivers/irqchip/irq-st.c
-f:drivers/irqchip/irq-starfive-jh8100-intc.c
-f:drivers/irqchip/irq-stm32-exti.c
-f:drivers/irqchip/irq-stm32mp-exti.c
-f:drivers/irqchip/irq-sun4i.c
-f:drivers/irqchip/irq-sun6i-r.c
-f:drivers/irqchip/irq-sunxi-nmi.c
-f:drivers/irqchip/irq-tb10x.c
-f:drivers/irqchip/irq-tegra.c
-f:drivers/irqchip/irq-ti-sci-inta.c
-f:drivers/irqchip/irq-ti-sci-intr.c
-f:drivers/irqchip/irq-ts4800.c
-f:drivers/irqchip/irq-uniphier-aidet.c
-f:drivers/irqchip/irq-versatile-fpga.c
-f:drivers/irqchip/irq-vf610-mscm-ir.c
-f:drivers/irqchip/irq-vic.c
-f:drivers/irqchip/irq-vt8500.c
-f:drivers/irqchip/irq-wpcm450-aic.c
-f:drivers/irqchip/irq-xilinx-intc.c
-f:drivers/irqchip/irq-xtensa-mx.c
-f:drivers/irqchip/irq-xtensa-pic.c
-f:drivers/irqchip/irq-zevio.c
-f:drivers/irqchip/irqchip.c
-f:drivers/irqchip/qcom-irq-combiner.c
-f:drivers/irqchip/qcom-pdc.c
-f:drivers/irqchip/spear-shirq.c
-f:drivers/isdn/Kconfig
-f:drivers/isdn/Makefile
-f:drivers/isdn/capi/Kconfig
-f:drivers/isdn/capi/Makefile
-f:drivers/isdn/capi/capi.c
-f:drivers/isdn/capi/capiutil.c
-f:drivers/isdn/capi/kcapi.c
-f:drivers/isdn/capi/kcapi.h
-f:drivers/isdn/capi/kcapi_proc.c
-f:drivers/isdn/hardware/Makefile
-f:drivers/isdn/hardware/mISDN/Kconfig
-f:drivers/isdn/hardware/mISDN/Makefile
-f:drivers/isdn/hardware/mISDN/avmfritz.c
-f:drivers/isdn/hardware/mISDN/hfc_multi.h
-f:drivers/isdn/hardware/mISDN/hfc_multi_8xx.h
-f:drivers/isdn/hardware/mISDN/hfc_pci.h
-f:drivers/isdn/hardware/mISDN/hfcmulti.c
-f:drivers/isdn/hardware/mISDN/hfcpci.c
-f:drivers/isdn/hardware/mISDN/hfcsusb.c
-f:drivers/isdn/hardware/mISDN/hfcsusb.h
-f:drivers/isdn/hardware/mISDN/iohelper.h
-f:drivers/isdn/hardware/mISDN/ipac.h
-f:drivers/isdn/hardware/mISDN/isar.h
-f:drivers/isdn/hardware/mISDN/isdnhdlc.c
-f:drivers/isdn/hardware/mISDN/isdnhdlc.h
-f:drivers/isdn/hardware/mISDN/mISDNinfineon.c
-f:drivers/isdn/hardware/mISDN/mISDNipac.c
-f:drivers/isdn/hardware/mISDN/mISDNisar.c
-f:drivers/isdn/hardware/mISDN/netjet.c
-f:drivers/isdn/hardware/mISDN/netjet.h
-f:drivers/isdn/hardware/mISDN/speedfax.c
-f:drivers/isdn/hardware/mISDN/w6692.c
-f:drivers/isdn/hardware/mISDN/w6692.h
-f:drivers/isdn/mISDN/Kconfig
-f:drivers/isdn/mISDN/Makefile
-f:drivers/isdn/mISDN/clock.c
-f:drivers/isdn/mISDN/core.c
-f:drivers/isdn/mISDN/core.h
-f:drivers/isdn/mISDN/dsp.h
-f:drivers/isdn/mISDN/dsp_audio.c
-f:drivers/isdn/mISDN/dsp_biquad.h
-f:drivers/isdn/mISDN/dsp_blowfish.c
-f:drivers/isdn/mISDN/dsp_cmx.c
-f:drivers/isdn/mISDN/dsp_core.c
-f:drivers/isdn/mISDN/dsp_dtmf.c
-f:drivers/isdn/mISDN/dsp_ecdis.h
-f:drivers/isdn/mISDN/dsp_hwec.c
-f:drivers/isdn/mISDN/dsp_hwec.h
-f:drivers/isdn/mISDN/dsp_pipeline.c
-f:drivers/isdn/mISDN/dsp_tones.c
-f:drivers/isdn/mISDN/fsm.c
-f:drivers/isdn/mISDN/fsm.h
-f:drivers/isdn/mISDN/hwchannel.c
-f:drivers/isdn/mISDN/l1oip.h
-f:drivers/isdn/mISDN/l1oip_codec.c
-f:drivers/isdn/mISDN/l1oip_core.c
-f:drivers/isdn/mISDN/layer1.c
-f:drivers/isdn/mISDN/layer1.h
-f:drivers/isdn/mISDN/layer2.c
-f:drivers/isdn/mISDN/layer2.h
-f:drivers/isdn/mISDN/socket.c
-f:drivers/isdn/mISDN/stack.c
-f:drivers/isdn/mISDN/tei.c
-f:drivers/isdn/mISDN/timerdev.c
-f:drivers/leds/.kunitconfig
-f:drivers/leds/Kconfig
-f:drivers/leds/Makefile
-f:drivers/leds/TODO
-f:drivers/leds/blink/Kconfig
-f:drivers/leds/blink/Makefile
-f:drivers/leds/blink/leds-bcm63138.c
-f:drivers/leds/blink/leds-lgm-sso.c
-f:drivers/leds/flash/Kconfig
-f:drivers/leds/flash/Makefile
-f:drivers/leds/flash/leds-aat1290.c
-f:drivers/leds/flash/leds-as3645a.c
-f:drivers/leds/flash/leds-ktd2692.c
-f:drivers/leds/flash/leds-lm3601x.c
-f:drivers/leds/flash/leds-max77693.c
-f:drivers/leds/flash/leds-mt6360.c
-f:drivers/leds/flash/leds-mt6370-flash.c
-f:drivers/leds/flash/leds-qcom-flash.c
-f:drivers/leds/flash/leds-rt4505.c
-f:drivers/leds/flash/leds-rt8515.c
-f:drivers/leds/flash/leds-sgm3140.c
-f:drivers/leds/flash/leds-sy7802.c
-f:drivers/leds/flash/leds-tps6131x.c
-f:drivers/leds/led-class-flash.c
-f:drivers/leds/led-class-multicolor.c
-f:drivers/leds/led-class.c
-f:drivers/leds/led-core.c
-f:drivers/leds/led-test.c
-f:drivers/leds/led-triggers.c
-f:drivers/leds/leds-88pm860x.c
-f:drivers/leds/leds-acer-a500.c
-f:drivers/leds/leds-adp5520.c
-f:drivers/leds/leds-an30259a.c
-f:drivers/leds/leds-apu.c
-f:drivers/leds/leds-ariel.c
-f:drivers/leds/leds-aw200xx.c
-f:drivers/leds/leds-aw2013.c
-f:drivers/leds/leds-bcm6328.c
-f:drivers/leds/leds-bcm6358.c
-f:drivers/leds/leds-bd2606mvv.c
-f:drivers/leds/leds-bd2802.c
-f:drivers/leds/leds-blinkm.c
-f:drivers/leds/leds-cht-wcove.c
-f:drivers/leds/leds-clevo-mail.c
-f:drivers/leds/leds-cobalt-qube.c
-f:drivers/leds/leds-cobalt-raq.c
-f:drivers/leds/leds-cpcap.c
-f:drivers/leds/leds-cr0014114.c
-f:drivers/leds/leds-cros_ec.c
-f:drivers/leds/leds-da903x.c
-f:drivers/leds/leds-da9052.c
-f:drivers/leds/leds-dac124s085.c
-f:drivers/leds/leds-el15203000.c
-f:drivers/leds/leds-expresswire.c
-f:drivers/leds/leds-gpio-register.c
-f:drivers/leds/leds-gpio.c
-f:drivers/leds/leds-hp6xx.c
-f:drivers/leds/leds-ip30.c
-f:drivers/leds/leds-ipaq-micro.c
-f:drivers/leds/leds-is31fl319x.c
-f:drivers/leds/leds-is31fl32xx.c
-f:drivers/leds/leds-lm3530.c
-f:drivers/leds/leds-lm3532.c
-f:drivers/leds/leds-lm3533.c
-f:drivers/leds/leds-lm355x.c
-f:drivers/leds/leds-lm36274.c
-f:drivers/leds/leds-lm3642.c
-f:drivers/leds/leds-lm3692x.c
-f:drivers/leds/leds-lm3697.c
-f:drivers/leds/leds-locomo.c
-f:drivers/leds/leds-lp3944.c
-f:drivers/leds/leds-lp3952.c
-f:drivers/leds/leds-lp50xx.c
-f:drivers/leds/leds-lp5521.c
-f:drivers/leds/leds-lp5523.c
-f:drivers/leds/leds-lp5562.c
-f:drivers/leds/leds-lp5569.c
-f:drivers/leds/leds-lp55xx-common.c
-f:drivers/leds/leds-lp55xx-common.h
-f:drivers/leds/leds-lp8501.c
-f:drivers/leds/leds-lp8788.c
-f:drivers/leds/leds-lp8860.c
-f:drivers/leds/leds-lp8864.c
-f:drivers/leds/leds-lt3593.c
-f:drivers/leds/leds-max5970.c
-f:drivers/leds/leds-max77650.c
-f:drivers/leds/leds-max77705.c
-f:drivers/leds/leds-max8997.c
-f:drivers/leds/leds-mc13783.c
-f:drivers/leds/leds-menf21bmc.c
-f:drivers/leds/leds-mlxcpld.c
-f:drivers/leds/leds-mlxreg.c
-f:drivers/leds/leds-mt6323.c
-f:drivers/leds/leds-net48xx.c
-f:drivers/leds/leds-netxbig.c
-f:drivers/leds/leds-nic78bx.c
-f:drivers/leds/leds-ns2.c
-f:drivers/leds/leds-ot200.c
-f:drivers/leds/leds-pca9532.c
-f:drivers/leds/leds-pca955x.c
-f:drivers/leds/leds-pca963x.c
-f:drivers/leds/leds-pca995x.c
-f:drivers/leds/leds-pm8058.c
-f:drivers/leds/leds-powernv.c
-f:drivers/leds/leds-pwm.c
-f:drivers/leds/leds-qnap-mcu.c
-f:drivers/leds/leds-rb532.c
-f:drivers/leds/leds-regulator.c
-f:drivers/leds/leds-sc27xx-bltc.c
-f:drivers/leds/leds-spi-byte.c
-f:drivers/leds/leds-ss4200.c
-f:drivers/leds/leds-st1202.c
-f:drivers/leds/leds-sun50i-a100.c
-f:drivers/leds/leds-sunfire.c
-f:drivers/leds/leds-syscon.c
-f:drivers/leds/leds-tca6507.c
-f:drivers/leds/leds-ti-lmu-common.c
-f:drivers/leds/leds-tlc591xx.c
-f:drivers/leds/leds-tps6105x.c
-f:drivers/leds/leds-turris-omnia.c
-f:drivers/leds/leds-upboard.c
-f:drivers/leds/leds-wm831x-status.c
-f:drivers/leds/leds-wm8350.c
-f:drivers/leds/leds-wrap.c
-f:drivers/leds/leds.h
-f:drivers/leds/rgb/Kconfig
-f:drivers/leds/rgb/Makefile
-f:drivers/leds/rgb/leds-group-multicolor.c
-f:drivers/leds/rgb/leds-ktd202x.c
-f:drivers/leds/rgb/leds-mt6370-rgb.c
-f:drivers/leds/rgb/leds-ncp5623.c
-f:drivers/leds/rgb/leds-pwm-multicolor.c
-f:drivers/leds/rgb/leds-qcom-lpg.c
-f:drivers/leds/simatic/Kconfig
-f:drivers/leds/simatic/Makefile
-f:drivers/leds/simatic/simatic-ipc-leds-gpio-apollolake.c
-f:drivers/leds/simatic/simatic-ipc-leds-gpio-core.c
-f:drivers/leds/simatic/simatic-ipc-leds-gpio-elkhartlake.c
-f:drivers/leds/simatic/simatic-ipc-leds-gpio-f7188x.c
-f:drivers/leds/simatic/simatic-ipc-leds-gpio.h
-f:drivers/leds/simatic/simatic-ipc-leds.c
-f:drivers/leds/trigger/Kconfig
-f:drivers/leds/trigger/Makefile
-f:drivers/leds/trigger/ledtrig-activity.c
-f:drivers/leds/trigger/ledtrig-backlight.c
-f:drivers/leds/trigger/ledtrig-camera.c
-f:drivers/leds/trigger/ledtrig-cpu.c
-f:drivers/leds/trigger/ledtrig-default-on.c
-f:drivers/leds/trigger/ledtrig-disk.c
-f:drivers/leds/trigger/ledtrig-gpio.c
-f:drivers/leds/trigger/ledtrig-heartbeat.c
-f:drivers/leds/trigger/ledtrig-input-events.c
-f:drivers/leds/trigger/ledtrig-mtd.c
-f:drivers/leds/trigger/ledtrig-netdev.c
-f:drivers/leds/trigger/ledtrig-oneshot.c
-f:drivers/leds/trigger/ledtrig-panic.c
-f:drivers/leds/trigger/ledtrig-pattern.c
-f:drivers/leds/trigger/ledtrig-timer.c
-f:drivers/leds/trigger/ledtrig-transient.c
-f:drivers/leds/trigger/ledtrig-tty.c
-f:drivers/leds/uleds.c
-f:drivers/macintosh/Kconfig
-f:drivers/macintosh/Makefile
-f:drivers/macintosh/adb-iop.c
-f:drivers/macintosh/adb.c
-f:drivers/macintosh/adbhid.c
-f:drivers/macintosh/ams/Makefile
-f:drivers/macintosh/ams/ams-core.c
-f:drivers/macintosh/ams/ams-i2c.c
-f:drivers/macintosh/ams/ams-input.c
-f:drivers/macintosh/ams/ams-pmu.c
-f:drivers/macintosh/ams/ams.h
-f:drivers/macintosh/ans-lcd.c
-f:drivers/macintosh/ans-lcd.h
-f:drivers/macintosh/apm_emu.c
-f:drivers/macintosh/mac_hid.c
-f:drivers/macintosh/macio-adb.c
-f:drivers/macintosh/macio_asic.c
-f:drivers/macintosh/macio_sysfs.c
-f:drivers/macintosh/mediabay.c
-f:drivers/macintosh/rack-meter.c
-f:drivers/macintosh/smu.c
-f:drivers/macintosh/therm_adt746x.c
-f:drivers/macintosh/therm_windtunnel.c
-f:drivers/macintosh/via-cuda.c
-f:drivers/macintosh/via-macii.c
-f:drivers/macintosh/via-pmu-backlight.c
-f:drivers/macintosh/via-pmu-event.c
-f:drivers/macintosh/via-pmu-event.h
-f:drivers/macintosh/via-pmu-led.c
-f:drivers/macintosh/via-pmu.c
-f:drivers/macintosh/windfarm.h
-f:drivers/macintosh/windfarm_ad7417_sensor.c
-f:drivers/macintosh/windfarm_core.c
-f:drivers/macintosh/windfarm_cpufreq_clamp.c
-f:drivers/macintosh/windfarm_fcu_controls.c
-f:drivers/macintosh/windfarm_lm75_sensor.c
-f:drivers/macintosh/windfarm_lm87_sensor.c
-f:drivers/macintosh/windfarm_max6690_sensor.c
-f:drivers/macintosh/windfarm_mpu.h
-f:drivers/macintosh/windfarm_pid.c
-f:drivers/macintosh/windfarm_pid.h
-f:drivers/macintosh/windfarm_pm112.c
-f:drivers/macintosh/windfarm_pm121.c
-f:drivers/macintosh/windfarm_pm72.c
-f:drivers/macintosh/windfarm_pm81.c
-f:drivers/macintosh/windfarm_pm91.c
-f:drivers/macintosh/windfarm_rm31.c
-f:drivers/macintosh/windfarm_smu_controls.c
-f:drivers/macintosh/windfarm_smu_sat.c
-f:drivers/macintosh/windfarm_smu_sensors.c
-f:drivers/mailbox/Kconfig
-f:drivers/mailbox/Makefile
-f:drivers/mailbox/arm_mhu.c
-f:drivers/mailbox/arm_mhu_db.c
-f:drivers/mailbox/arm_mhuv2.c
-f:drivers/mailbox/arm_mhuv3.c
-f:drivers/mailbox/armada-37xx-rwtm-mailbox.c
-f:drivers/mailbox/bcm-flexrm-mailbox.c
-f:drivers/mailbox/bcm-pdc-mailbox.c
-f:drivers/mailbox/bcm2835-mailbox.c
-f:drivers/mailbox/cix-mailbox.c
-f:drivers/mailbox/cv1800-mailbox.c
-f:drivers/mailbox/exynos-mailbox.c
-f:drivers/mailbox/hi3660-mailbox.c
-f:drivers/mailbox/hi6220-mailbox.c
-f:drivers/mailbox/imx-mailbox.c
-f:drivers/mailbox/mailbox-altera.c
-f:drivers/mailbox/mailbox-mchp-ipc-sbi.c
-f:drivers/mailbox/mailbox-mpfs.c
-f:drivers/mailbox/mailbox-sti.c
-f:drivers/mailbox/mailbox-test.c
-f:drivers/mailbox/mailbox-th1520.c
-f:drivers/mailbox/mailbox-xgene-slimpro.c
-f:drivers/mailbox/mailbox.c
-f:drivers/mailbox/mailbox.h
-f:drivers/mailbox/mtk-adsp-mailbox.c
-f:drivers/mailbox/mtk-cmdq-mailbox.c
-f:drivers/mailbox/omap-mailbox.c
-f:drivers/mailbox/pcc.c
-f:drivers/mailbox/pl320-ipc.c
-f:drivers/mailbox/platform_mhu.c
-f:drivers/mailbox/qcom-apcs-ipc-mailbox.c
-f:drivers/mailbox/qcom-cpucp-mbox.c
-f:drivers/mailbox/qcom-ipcc.c
-f:drivers/mailbox/rockchip-mailbox.c
-f:drivers/mailbox/sprd-mailbox.c
-f:drivers/mailbox/stm32-ipcc.c
-f:drivers/mailbox/sun6i-msgbox.c
-f:drivers/mailbox/tegra-hsp.c
-f:drivers/mailbox/ti-msgmgr.c
-f:drivers/mailbox/zynqmp-ipi-mailbox.c
-f:drivers/mcb/Kconfig
-f:drivers/mcb/Makefile
-f:drivers/mcb/mcb-core.c
-f:drivers/mcb/mcb-internal.h
-f:drivers/mcb/mcb-lpc.c
-f:drivers/mcb/mcb-parse.c
-f:drivers/mcb/mcb-pci.c
-f:drivers/md/Kconfig
-f:drivers/md/Makefile
-f:drivers/md/bcache/Kconfig
-f:drivers/md/bcache/Makefile
-f:drivers/md/bcache/alloc.c
-f:drivers/md/bcache/bcache.h
-f:drivers/md/bcache/bcache_ondisk.h
-f:drivers/md/bcache/bset.c
-f:drivers/md/bcache/bset.h
-f:drivers/md/bcache/btree.c
-f:drivers/md/bcache/btree.h
-f:drivers/md/bcache/debug.c
-f:drivers/md/bcache/debug.h
-f:drivers/md/bcache/extents.c
-f:drivers/md/bcache/extents.h
-f:drivers/md/bcache/features.c
-f:drivers/md/bcache/features.h
-f:drivers/md/bcache/io.c
-f:drivers/md/bcache/journal.c
-f:drivers/md/bcache/journal.h
-f:drivers/md/bcache/movinggc.c
-f:drivers/md/bcache/request.c
-f:drivers/md/bcache/request.h
-f:drivers/md/bcache/stats.c
-f:drivers/md/bcache/stats.h
-f:drivers/md/bcache/super.c
-f:drivers/md/bcache/sysfs.c
-f:drivers/md/bcache/sysfs.h
-f:drivers/md/bcache/trace.c
-f:drivers/md/bcache/util.c
-f:drivers/md/bcache/util.h
-f:drivers/md/bcache/writeback.c
-f:drivers/md/bcache/writeback.h
-f:drivers/md/dm-audit.c
-f:drivers/md/dm-audit.h
-f:drivers/md/dm-bio-prison-v1.c
-f:drivers/md/dm-bio-prison-v1.h
-f:drivers/md/dm-bio-prison-v2.c
-f:drivers/md/dm-bio-prison-v2.h
-f:drivers/md/dm-bio-record.h
-f:drivers/md/dm-bufio.c
-f:drivers/md/dm-builtin.c
-f:drivers/md/dm-cache-background-tracker.c
-f:drivers/md/dm-cache-background-tracker.h
-f:drivers/md/dm-cache-block-types.h
-f:drivers/md/dm-cache-metadata.c
-f:drivers/md/dm-cache-metadata.h
-f:drivers/md/dm-cache-policy-internal.h
-f:drivers/md/dm-cache-policy-smq.c
-f:drivers/md/dm-cache-policy.c
-f:drivers/md/dm-cache-policy.h
-f:drivers/md/dm-cache-target.c
-f:drivers/md/dm-clone-metadata.c
-f:drivers/md/dm-clone-metadata.h
-f:drivers/md/dm-clone-target.c
-f:drivers/md/dm-core.h
-f:drivers/md/dm-crypt.c
-f:drivers/md/dm-delay.c
-f:drivers/md/dm-dust.c
-f:drivers/md/dm-ebs-target.c
-f:drivers/md/dm-era-target.c
-f:drivers/md/dm-exception-store.c
-f:drivers/md/dm-exception-store.h
-f:drivers/md/dm-flakey.c
-f:drivers/md/dm-ima.c
-f:drivers/md/dm-ima.h
-f:drivers/md/dm-init.c
-f:drivers/md/dm-integrity.c
-f:drivers/md/dm-io-rewind.c
-f:drivers/md/dm-io-tracker.h
-f:drivers/md/dm-io.c
-f:drivers/md/dm-ioctl.c
-f:drivers/md/dm-kcopyd.c
-f:drivers/md/dm-linear.c
-f:drivers/md/dm-log-userspace-base.c
-f:drivers/md/dm-log-userspace-transfer.c
-f:drivers/md/dm-log-userspace-transfer.h
-f:drivers/md/dm-log-writes.c
-f:drivers/md/dm-log.c
-f:drivers/md/dm-mpath.c
-f:drivers/md/dm-mpath.h
-f:drivers/md/dm-path-selector.c
-f:drivers/md/dm-path-selector.h
-f:drivers/md/dm-ps-historical-service-time.c
-f:drivers/md/dm-ps-io-affinity.c
-f:drivers/md/dm-ps-queue-length.c
-f:drivers/md/dm-ps-round-robin.c
-f:drivers/md/dm-ps-service-time.c
-f:drivers/md/dm-raid.c
-f:drivers/md/dm-raid1.c
-f:drivers/md/dm-region-hash.c
-f:drivers/md/dm-rq.c
-f:drivers/md/dm-rq.h
-f:drivers/md/dm-snap-persistent.c
-f:drivers/md/dm-snap-transient.c
-f:drivers/md/dm-snap.c
-f:drivers/md/dm-stats.c
-f:drivers/md/dm-stats.h
-f:drivers/md/dm-stripe.c
-f:drivers/md/dm-switch.c
-f:drivers/md/dm-sysfs.c
-f:drivers/md/dm-table.c
-f:drivers/md/dm-target.c
-f:drivers/md/dm-thin-metadata.c
-f:drivers/md/dm-thin-metadata.h
-f:drivers/md/dm-thin.c
-f:drivers/md/dm-uevent.c
-f:drivers/md/dm-uevent.h
-f:drivers/md/dm-unstripe.c
-f:drivers/md/dm-vdo/Kconfig
-f:drivers/md/dm-vdo/Makefile
-f:drivers/md/dm-vdo/action-manager.c
-f:drivers/md/dm-vdo/action-manager.h
-f:drivers/md/dm-vdo/admin-state.c
-f:drivers/md/dm-vdo/admin-state.h
-f:drivers/md/dm-vdo/block-map.c
-f:drivers/md/dm-vdo/block-map.h
-f:drivers/md/dm-vdo/completion.c
-f:drivers/md/dm-vdo/completion.h
-f:drivers/md/dm-vdo/constants.h
-f:drivers/md/dm-vdo/cpu.h
-f:drivers/md/dm-vdo/data-vio.c
-f:drivers/md/dm-vdo/data-vio.h
-f:drivers/md/dm-vdo/dedupe.c
-f:drivers/md/dm-vdo/dedupe.h
-f:drivers/md/dm-vdo/dm-vdo-target.c
-f:drivers/md/dm-vdo/dump.c
-f:drivers/md/dm-vdo/dump.h
-f:drivers/md/dm-vdo/encodings.c
-f:drivers/md/dm-vdo/encodings.h
-f:drivers/md/dm-vdo/errors.c
-f:drivers/md/dm-vdo/errors.h
-f:drivers/md/dm-vdo/flush.c
-f:drivers/md/dm-vdo/flush.h
-f:drivers/md/dm-vdo/funnel-queue.c
-f:drivers/md/dm-vdo/funnel-queue.h
-f:drivers/md/dm-vdo/funnel-workqueue.c
-f:drivers/md/dm-vdo/funnel-workqueue.h
-f:drivers/md/dm-vdo/indexer/chapter-index.c
-f:drivers/md/dm-vdo/indexer/chapter-index.h
-f:drivers/md/dm-vdo/indexer/config.c
-f:drivers/md/dm-vdo/indexer/config.h
-f:drivers/md/dm-vdo/indexer/delta-index.c
-f:drivers/md/dm-vdo/indexer/delta-index.h
-f:drivers/md/dm-vdo/indexer/funnel-requestqueue.c
-f:drivers/md/dm-vdo/indexer/funnel-requestqueue.h
-f:drivers/md/dm-vdo/indexer/geometry.c
-f:drivers/md/dm-vdo/indexer/geometry.h
-f:drivers/md/dm-vdo/indexer/hash-utils.h
-f:drivers/md/dm-vdo/indexer/index-layout.c
-f:drivers/md/dm-vdo/indexer/index-layout.h
-f:drivers/md/dm-vdo/indexer/index-page-map.c
-f:drivers/md/dm-vdo/indexer/index-page-map.h
-f:drivers/md/dm-vdo/indexer/index-session.c
-f:drivers/md/dm-vdo/indexer/index-session.h
-f:drivers/md/dm-vdo/indexer/index.c
-f:drivers/md/dm-vdo/indexer/index.h
-f:drivers/md/dm-vdo/indexer/indexer.h
-f:drivers/md/dm-vdo/indexer/io-factory.c
-f:drivers/md/dm-vdo/indexer/io-factory.h
-f:drivers/md/dm-vdo/indexer/open-chapter.c
-f:drivers/md/dm-vdo/indexer/open-chapter.h
-f:drivers/md/dm-vdo/indexer/radix-sort.c
-f:drivers/md/dm-vdo/indexer/radix-sort.h
-f:drivers/md/dm-vdo/indexer/sparse-cache.c
-f:drivers/md/dm-vdo/indexer/sparse-cache.h
-f:drivers/md/dm-vdo/indexer/volume-index.c
-f:drivers/md/dm-vdo/indexer/volume-index.h
-f:drivers/md/dm-vdo/indexer/volume.c
-f:drivers/md/dm-vdo/indexer/volume.h
-f:drivers/md/dm-vdo/int-map.c
-f:drivers/md/dm-vdo/int-map.h
-f:drivers/md/dm-vdo/io-submitter.c
-f:drivers/md/dm-vdo/io-submitter.h
-f:drivers/md/dm-vdo/logger.c
-f:drivers/md/dm-vdo/logger.h
-f:drivers/md/dm-vdo/logical-zone.c
-f:drivers/md/dm-vdo/logical-zone.h
-f:drivers/md/dm-vdo/memory-alloc.c
-f:drivers/md/dm-vdo/memory-alloc.h
-f:drivers/md/dm-vdo/message-stats.c
-f:drivers/md/dm-vdo/message-stats.h
-f:drivers/md/dm-vdo/murmurhash3.c
-f:drivers/md/dm-vdo/murmurhash3.h
-f:drivers/md/dm-vdo/numeric.h
-f:drivers/md/dm-vdo/packer.c
-f:drivers/md/dm-vdo/packer.h
-f:drivers/md/dm-vdo/permassert.c
-f:drivers/md/dm-vdo/permassert.h
-f:drivers/md/dm-vdo/physical-zone.c
-f:drivers/md/dm-vdo/physical-zone.h
-f:drivers/md/dm-vdo/priority-table.c
-f:drivers/md/dm-vdo/priority-table.h
-f:drivers/md/dm-vdo/recovery-journal.c
-f:drivers/md/dm-vdo/recovery-journal.h
-f:drivers/md/dm-vdo/repair.c
-f:drivers/md/dm-vdo/repair.h
-f:drivers/md/dm-vdo/slab-depot.c
-f:drivers/md/dm-vdo/slab-depot.h
-f:drivers/md/dm-vdo/statistics.h
-f:drivers/md/dm-vdo/status-codes.c
-f:drivers/md/dm-vdo/status-codes.h
-f:drivers/md/dm-vdo/string-utils.c
-f:drivers/md/dm-vdo/string-utils.h
-f:drivers/md/dm-vdo/thread-device.c
-f:drivers/md/dm-vdo/thread-device.h
-f:drivers/md/dm-vdo/thread-registry.c
-f:drivers/md/dm-vdo/thread-registry.h
-f:drivers/md/dm-vdo/thread-utils.c
-f:drivers/md/dm-vdo/thread-utils.h
-f:drivers/md/dm-vdo/time-utils.h
-f:drivers/md/dm-vdo/types.h
-f:drivers/md/dm-vdo/vdo.c
-f:drivers/md/dm-vdo/vdo.h
-f:drivers/md/dm-vdo/vio.c
-f:drivers/md/dm-vdo/vio.h
-f:drivers/md/dm-vdo/wait-queue.c
-f:drivers/md/dm-vdo/wait-queue.h
-f:drivers/md/dm-verity-fec.c
-f:drivers/md/dm-verity-fec.h
-f:drivers/md/dm-verity-loadpin.c
-f:drivers/md/dm-verity-target.c
-f:drivers/md/dm-verity-verify-sig.c
-f:drivers/md/dm-verity-verify-sig.h
-f:drivers/md/dm-verity.h
-f:drivers/md/dm-writecache.c
-f:drivers/md/dm-zero.c
-f:drivers/md/dm-zone.c
-f:drivers/md/dm-zoned-metadata.c
-f:drivers/md/dm-zoned-reclaim.c
-f:drivers/md/dm-zoned-target.c
-f:drivers/md/dm-zoned.h
-f:drivers/md/dm.c
-f:drivers/md/dm.h
-f:drivers/md/md-autodetect.c
-f:drivers/md/md-bitmap.c
-f:drivers/md/md-bitmap.h
-f:drivers/md/md-cluster.c
-f:drivers/md/md-cluster.h
-f:drivers/md/md-linear.c
-f:drivers/md/md.c
-f:drivers/md/md.h
-f:drivers/md/persistent-data/Kconfig
-f:drivers/md/persistent-data/Makefile
-f:drivers/md/persistent-data/dm-array.c
-f:drivers/md/persistent-data/dm-array.h
-f:drivers/md/persistent-data/dm-bitset.c
-f:drivers/md/persistent-data/dm-bitset.h
-f:drivers/md/persistent-data/dm-block-manager.c
-f:drivers/md/persistent-data/dm-block-manager.h
-f:drivers/md/persistent-data/dm-btree-internal.h
-f:drivers/md/persistent-data/dm-btree-remove.c
-f:drivers/md/persistent-data/dm-btree-spine.c
-f:drivers/md/persistent-data/dm-btree.c
-f:drivers/md/persistent-data/dm-btree.h
-f:drivers/md/persistent-data/dm-persistent-data-internal.h
-f:drivers/md/persistent-data/dm-space-map-common.c
-f:drivers/md/persistent-data/dm-space-map-common.h
-f:drivers/md/persistent-data/dm-space-map-disk.c
-f:drivers/md/persistent-data/dm-space-map-disk.h
-f:drivers/md/persistent-data/dm-space-map-metadata.c
-f:drivers/md/persistent-data/dm-space-map-metadata.h
-f:drivers/md/persistent-data/dm-space-map.h
-f:drivers/md/persistent-data/dm-transaction-manager.c
-f:drivers/md/persistent-data/dm-transaction-manager.h
-f:drivers/md/raid0.c
-f:drivers/md/raid0.h
-f:drivers/md/raid1-10.c
-f:drivers/md/raid1.c
-f:drivers/md/raid1.h
-f:drivers/md/raid10.c
-f:drivers/md/raid10.h
-f:drivers/md/raid5-cache.c
-f:drivers/md/raid5-log.h
-f:drivers/md/raid5-ppl.c
-f:drivers/md/raid5.c
-f:drivers/md/raid5.h
-f:drivers/media/Kconfig
-f:drivers/media/Makefile
-f:drivers/media/cec/Kconfig
-f:drivers/media/cec/Makefile
-f:drivers/media/cec/core/Makefile
-f:drivers/media/cec/core/cec-adap.c
-f:drivers/media/cec/core/cec-api.c
-f:drivers/media/cec/core/cec-core.c
-f:drivers/media/cec/core/cec-notifier.c
-f:drivers/media/cec/core/cec-pin-error-inj.c
-f:drivers/media/cec/core/cec-pin-priv.h
-f:drivers/media/cec/core/cec-pin.c
-f:drivers/media/cec/core/cec-priv.h
-f:drivers/media/cec/i2c/Kconfig
-f:drivers/media/cec/i2c/Makefile
-f:drivers/media/cec/i2c/ch7322.c
-f:drivers/media/cec/i2c/tda9950.c
-f:drivers/media/cec/platform/Kconfig
-f:drivers/media/cec/platform/Makefile
-f:drivers/media/cec/platform/cec-gpio/Makefile
-f:drivers/media/cec/platform/cec-gpio/cec-gpio.c
-f:drivers/media/cec/platform/cros-ec/Makefile
-f:drivers/media/cec/platform/cros-ec/cros-ec-cec.c
-f:drivers/media/cec/platform/meson/Makefile
-f:drivers/media/cec/platform/meson/ao-cec-g12a.c
-f:drivers/media/cec/platform/meson/ao-cec.c
-f:drivers/media/cec/platform/s5p/Makefile
-f:drivers/media/cec/platform/s5p/exynos_hdmi_cec.h
-f:drivers/media/cec/platform/s5p/exynos_hdmi_cecctrl.c
-f:drivers/media/cec/platform/s5p/regs-cec.h
-f:drivers/media/cec/platform/s5p/s5p_cec.c
-f:drivers/media/cec/platform/s5p/s5p_cec.h
-f:drivers/media/cec/platform/seco/Makefile
-f:drivers/media/cec/platform/seco/seco-cec.c
-f:drivers/media/cec/platform/seco/seco-cec.h
-f:drivers/media/cec/platform/sti/Makefile
-f:drivers/media/cec/platform/sti/stih-cec.c
-f:drivers/media/cec/platform/stm32/Makefile
-f:drivers/media/cec/platform/stm32/stm32-cec.c
-f:drivers/media/cec/platform/tegra/Makefile
-f:drivers/media/cec/platform/tegra/tegra_cec.c
-f:drivers/media/cec/platform/tegra/tegra_cec.h
-f:drivers/media/cec/usb/Kconfig
-f:drivers/media/cec/usb/Makefile
-f:drivers/media/cec/usb/extron-da-hd-4k-plus/Kconfig
-f:drivers/media/cec/usb/extron-da-hd-4k-plus/Makefile
-f:drivers/media/cec/usb/extron-da-hd-4k-plus/cec-splitter.c
-f:drivers/media/cec/usb/extron-da-hd-4k-plus/cec-splitter.h
-f:drivers/media/cec/usb/extron-da-hd-4k-plus/extron-da-hd-4k-plus.c
-f:drivers/media/cec/usb/extron-da-hd-4k-plus/extron-da-hd-4k-plus.h
-f:drivers/media/cec/usb/pulse8/Kconfig
-f:drivers/media/cec/usb/pulse8/Makefile
-f:drivers/media/cec/usb/pulse8/pulse8-cec.c
-f:drivers/media/cec/usb/rainshadow/Kconfig
-f:drivers/media/cec/usb/rainshadow/Makefile
-f:drivers/media/cec/usb/rainshadow/rainshadow-cec.c
-f:drivers/media/common/Kconfig
-f:drivers/media/common/Makefile
-f:drivers/media/common/b2c2/Kconfig
-f:drivers/media/common/b2c2/Makefile
-f:drivers/media/common/b2c2/flexcop-common.h
-f:drivers/media/common/b2c2/flexcop-eeprom.c
-f:drivers/media/common/b2c2/flexcop-fe-tuner.c
-f:drivers/media/common/b2c2/flexcop-hw-filter.c
-f:drivers/media/common/b2c2/flexcop-i2c.c
-f:drivers/media/common/b2c2/flexcop-misc.c
-f:drivers/media/common/b2c2/flexcop-reg.h
-f:drivers/media/common/b2c2/flexcop-sram.c
-f:drivers/media/common/b2c2/flexcop.c
-f:drivers/media/common/b2c2/flexcop.h
-f:drivers/media/common/b2c2/flexcop_ibi_value_be.h
-f:drivers/media/common/b2c2/flexcop_ibi_value_le.h
-f:drivers/media/common/cx2341x.c
-f:drivers/media/common/cypress_firmware.c
-f:drivers/media/common/cypress_firmware.h
-f:drivers/media/common/saa7146/Kconfig
-f:drivers/media/common/saa7146/Makefile
-f:drivers/media/common/saa7146/saa7146_core.c
-f:drivers/media/common/saa7146/saa7146_fops.c
-f:drivers/media/common/saa7146/saa7146_hlp.c
-f:drivers/media/common/saa7146/saa7146_i2c.c
-f:drivers/media/common/saa7146/saa7146_vbi.c
-f:drivers/media/common/saa7146/saa7146_video.c
-f:drivers/media/common/siano/Kconfig
-f:drivers/media/common/siano/Makefile
-f:drivers/media/common/siano/sms-cards.c
-f:drivers/media/common/siano/sms-cards.h
-f:drivers/media/common/siano/smscoreapi.c
-f:drivers/media/common/siano/smscoreapi.h
-f:drivers/media/common/siano/smsdvb-debugfs.c
-f:drivers/media/common/siano/smsdvb-main.c
-f:drivers/media/common/siano/smsdvb.h
-f:drivers/media/common/siano/smsendian.c
-f:drivers/media/common/siano/smsendian.h
-f:drivers/media/common/siano/smsir.c
-f:drivers/media/common/siano/smsir.h
-f:drivers/media/common/ttpci-eeprom.c
-f:drivers/media/common/ttpci-eeprom.h
-f:drivers/media/common/tveeprom.c
-f:drivers/media/common/uvc.c
-f:drivers/media/common/v4l2-tpg/Kconfig
-f:drivers/media/common/v4l2-tpg/Makefile
-f:drivers/media/common/v4l2-tpg/v4l2-tpg-colors.c
-f:drivers/media/common/v4l2-tpg/v4l2-tpg-core.c
-f:drivers/media/common/videobuf2/Kconfig
-f:drivers/media/common/videobuf2/Makefile
-f:drivers/media/common/videobuf2/frame_vector.c
-f:drivers/media/common/videobuf2/vb2-trace.c
-f:drivers/media/common/videobuf2/videobuf2-core.c
-f:drivers/media/common/videobuf2/videobuf2-dma-contig.c
-f:drivers/media/common/videobuf2/videobuf2-dma-sg.c
-f:drivers/media/common/videobuf2/videobuf2-dvb.c
-f:drivers/media/common/videobuf2/videobuf2-memops.c
-f:drivers/media/common/videobuf2/videobuf2-v4l2.c
-f:drivers/media/common/videobuf2/videobuf2-vmalloc.c
-f:drivers/media/dvb-core/Kconfig
-f:drivers/media/dvb-core/Makefile
-f:drivers/media/dvb-core/dmxdev.c
-f:drivers/media/dvb-core/dvb_ca_en50221.c
-f:drivers/media/dvb-core/dvb_demux.c
-f:drivers/media/dvb-core/dvb_frontend.c
-f:drivers/media/dvb-core/dvb_net.c
-f:drivers/media/dvb-core/dvb_ringbuffer.c
-f:drivers/media/dvb-core/dvb_vb2.c
-f:drivers/media/dvb-core/dvbdev.c
-f:drivers/media/dvb-frontends/Kconfig
-f:drivers/media/dvb-frontends/Makefile
-f:drivers/media/dvb-frontends/a8293.c
-f:drivers/media/dvb-frontends/a8293.h
-f:drivers/media/dvb-frontends/af9013.c
-f:drivers/media/dvb-frontends/af9013.h
-f:drivers/media/dvb-frontends/af9013_priv.h
-f:drivers/media/dvb-frontends/af9033.c
-f:drivers/media/dvb-frontends/af9033.h
-f:drivers/media/dvb-frontends/af9033_priv.h
-f:drivers/media/dvb-frontends/as102_fe.c
-f:drivers/media/dvb-frontends/as102_fe.h
-f:drivers/media/dvb-frontends/as102_fe_types.h
-f:drivers/media/dvb-frontends/ascot2e.c
-f:drivers/media/dvb-frontends/ascot2e.h
-f:drivers/media/dvb-frontends/atbm8830.c
-f:drivers/media/dvb-frontends/atbm8830.h
-f:drivers/media/dvb-frontends/atbm8830_priv.h
-f:drivers/media/dvb-frontends/au8522.h
-f:drivers/media/dvb-frontends/au8522_common.c
-f:drivers/media/dvb-frontends/au8522_decoder.c
-f:drivers/media/dvb-frontends/au8522_dig.c
-f:drivers/media/dvb-frontends/au8522_priv.h
-f:drivers/media/dvb-frontends/bcm3510.c
-f:drivers/media/dvb-frontends/bcm3510.h
-f:drivers/media/dvb-frontends/bcm3510_priv.h
-f:drivers/media/dvb-frontends/bsbe1-d01a.h
-f:drivers/media/dvb-frontends/bsbe1.h
-f:drivers/media/dvb-frontends/bsru6.h
-f:drivers/media/dvb-frontends/cx22700.c
-f:drivers/media/dvb-frontends/cx22700.h
-f:drivers/media/dvb-frontends/cx22702.c
-f:drivers/media/dvb-frontends/cx22702.h
-f:drivers/media/dvb-frontends/cx24110.c
-f:drivers/media/dvb-frontends/cx24110.h
-f:drivers/media/dvb-frontends/cx24113.c
-f:drivers/media/dvb-frontends/cx24113.h
-f:drivers/media/dvb-frontends/cx24116.c
-f:drivers/media/dvb-frontends/cx24116.h
-f:drivers/media/dvb-frontends/cx24117.c
-f:drivers/media/dvb-frontends/cx24117.h
-f:drivers/media/dvb-frontends/cx24120.c
-f:drivers/media/dvb-frontends/cx24120.h
-f:drivers/media/dvb-frontends/cx24123.c
-f:drivers/media/dvb-frontends/cx24123.h
-f:drivers/media/dvb-frontends/cxd2099.c
-f:drivers/media/dvb-frontends/cxd2099.h
-f:drivers/media/dvb-frontends/cxd2820r.h
-f:drivers/media/dvb-frontends/cxd2820r_c.c
-f:drivers/media/dvb-frontends/cxd2820r_core.c
-f:drivers/media/dvb-frontends/cxd2820r_priv.h
-f:drivers/media/dvb-frontends/cxd2820r_t.c
-f:drivers/media/dvb-frontends/cxd2820r_t2.c
-f:drivers/media/dvb-frontends/cxd2841er.c
-f:drivers/media/dvb-frontends/cxd2841er.h
-f:drivers/media/dvb-frontends/cxd2841er_priv.h
-f:drivers/media/dvb-frontends/cxd2880/Kconfig
-f:drivers/media/dvb-frontends/cxd2880/Makefile
-f:drivers/media/dvb-frontends/cxd2880/cxd2880.h
-f:drivers/media/dvb-frontends/cxd2880/cxd2880_common.c
-f:drivers/media/dvb-frontends/cxd2880/cxd2880_common.h
-f:drivers/media/dvb-frontends/cxd2880/cxd2880_devio_spi.c
-f:drivers/media/dvb-frontends/cxd2880/cxd2880_devio_spi.h
-f:drivers/media/dvb-frontends/cxd2880/cxd2880_dtv.h
-f:drivers/media/dvb-frontends/cxd2880/cxd2880_dvbt.h
-f:drivers/media/dvb-frontends/cxd2880/cxd2880_dvbt2.h
-f:drivers/media/dvb-frontends/cxd2880/cxd2880_integ.c
-f:drivers/media/dvb-frontends/cxd2880/cxd2880_integ.h
-f:drivers/media/dvb-frontends/cxd2880/cxd2880_io.c
-f:drivers/media/dvb-frontends/cxd2880/cxd2880_io.h
-f:drivers/media/dvb-frontends/cxd2880/cxd2880_spi.h
-f:drivers/media/dvb-frontends/cxd2880/cxd2880_spi_device.c
-f:drivers/media/dvb-frontends/cxd2880/cxd2880_spi_device.h
-f:drivers/media/dvb-frontends/cxd2880/cxd2880_tnrdmd.c
-f:drivers/media/dvb-frontends/cxd2880/cxd2880_tnrdmd.h
-f:drivers/media/dvb-frontends/cxd2880/cxd2880_tnrdmd_driver_version.h
-f:drivers/media/dvb-frontends/cxd2880/cxd2880_tnrdmd_dvbt.c
-f:drivers/media/dvb-frontends/cxd2880/cxd2880_tnrdmd_dvbt.h
-f:drivers/media/dvb-frontends/cxd2880/cxd2880_tnrdmd_dvbt2.c
-f:drivers/media/dvb-frontends/cxd2880/cxd2880_tnrdmd_dvbt2.h
-f:drivers/media/dvb-frontends/cxd2880/cxd2880_tnrdmd_dvbt2_mon.c
-f:drivers/media/dvb-frontends/cxd2880/cxd2880_tnrdmd_dvbt2_mon.h
-f:drivers/media/dvb-frontends/cxd2880/cxd2880_tnrdmd_dvbt_mon.c
-f:drivers/media/dvb-frontends/cxd2880/cxd2880_tnrdmd_dvbt_mon.h
-f:drivers/media/dvb-frontends/cxd2880/cxd2880_tnrdmd_mon.c
-f:drivers/media/dvb-frontends/cxd2880/cxd2880_tnrdmd_mon.h
-f:drivers/media/dvb-frontends/cxd2880/cxd2880_top.c
-f:drivers/media/dvb-frontends/dib0070.c
-f:drivers/media/dvb-frontends/dib0070.h
-f:drivers/media/dvb-frontends/dib0090.c
-f:drivers/media/dvb-frontends/dib0090.h
-f:drivers/media/dvb-frontends/dib3000.h
-f:drivers/media/dvb-frontends/dib3000mb.c
-f:drivers/media/dvb-frontends/dib3000mb_priv.h
-f:drivers/media/dvb-frontends/dib3000mc.c
-f:drivers/media/dvb-frontends/dib3000mc.h
-f:drivers/media/dvb-frontends/dib7000m.c
-f:drivers/media/dvb-frontends/dib7000m.h
-f:drivers/media/dvb-frontends/dib7000p.c
-f:drivers/media/dvb-frontends/dib7000p.h
-f:drivers/media/dvb-frontends/dib8000.c
-f:drivers/media/dvb-frontends/dib8000.h
-f:drivers/media/dvb-frontends/dib9000.c
-f:drivers/media/dvb-frontends/dib9000.h
-f:drivers/media/dvb-frontends/dibx000_common.c
-f:drivers/media/dvb-frontends/dibx000_common.h
-f:drivers/media/dvb-frontends/drx39xyj/Kconfig
-f:drivers/media/dvb-frontends/drx39xyj/Makefile
-f:drivers/media/dvb-frontends/drx39xyj/drx39xxj.h
-f:drivers/media/dvb-frontends/drx39xyj/drx_dap_fasi.h
-f:drivers/media/dvb-frontends/drx39xyj/drx_driver.h
-f:drivers/media/dvb-frontends/drx39xyj/drx_driver_version.h
-f:drivers/media/dvb-frontends/drx39xyj/drxj.c
-f:drivers/media/dvb-frontends/drx39xyj/drxj.h
-f:drivers/media/dvb-frontends/drx39xyj/drxj_map.h
-f:drivers/media/dvb-frontends/drxd.h
-f:drivers/media/dvb-frontends/drxd_firm.c
-f:drivers/media/dvb-frontends/drxd_firm.h
-f:drivers/media/dvb-frontends/drxd_hard.c
-f:drivers/media/dvb-frontends/drxd_map_firm.h
-f:drivers/media/dvb-frontends/drxk.h
-f:drivers/media/dvb-frontends/drxk_hard.c
-f:drivers/media/dvb-frontends/drxk_hard.h
-f:drivers/media/dvb-frontends/drxk_map.h
-f:drivers/media/dvb-frontends/ds3000.c
-f:drivers/media/dvb-frontends/ds3000.h
-f:drivers/media/dvb-frontends/dvb-pll.c
-f:drivers/media/dvb-frontends/dvb-pll.h
-f:drivers/media/dvb-frontends/dvb_dummy_fe.c
-f:drivers/media/dvb-frontends/dvb_dummy_fe.h
-f:drivers/media/dvb-frontends/ec100.c
-f:drivers/media/dvb-frontends/ec100.h
-f:drivers/media/dvb-frontends/eds1547.h
-f:drivers/media/dvb-frontends/gp8psk-fe.c
-f:drivers/media/dvb-frontends/gp8psk-fe.h
-f:drivers/media/dvb-frontends/helene.c
-f:drivers/media/dvb-frontends/helene.h
-f:drivers/media/dvb-frontends/horus3a.c
-f:drivers/media/dvb-frontends/horus3a.h
-f:drivers/media/dvb-frontends/isl6405.c
-f:drivers/media/dvb-frontends/isl6405.h
-f:drivers/media/dvb-frontends/isl6421.c
-f:drivers/media/dvb-frontends/isl6421.h
-f:drivers/media/dvb-frontends/isl6423.c
-f:drivers/media/dvb-frontends/isl6423.h
-f:drivers/media/dvb-frontends/itd1000.c
-f:drivers/media/dvb-frontends/itd1000.h
-f:drivers/media/dvb-frontends/itd1000_priv.h
-f:drivers/media/dvb-frontends/ix2505v.c
-f:drivers/media/dvb-frontends/ix2505v.h
-f:drivers/media/dvb-frontends/l64781.c
-f:drivers/media/dvb-frontends/l64781.h
-f:drivers/media/dvb-frontends/lg2160.c
-f:drivers/media/dvb-frontends/lg2160.h
-f:drivers/media/dvb-frontends/lgdt3305.c
-f:drivers/media/dvb-frontends/lgdt3305.h
-f:drivers/media/dvb-frontends/lgdt3306a.c
-f:drivers/media/dvb-frontends/lgdt3306a.h
-f:drivers/media/dvb-frontends/lgdt330x.c
-f:drivers/media/dvb-frontends/lgdt330x.h
-f:drivers/media/dvb-frontends/lgdt330x_priv.h
-f:drivers/media/dvb-frontends/lgs8gl5.c
-f:drivers/media/dvb-frontends/lgs8gl5.h
-f:drivers/media/dvb-frontends/lgs8gxx.c
-f:drivers/media/dvb-frontends/lgs8gxx.h
-f:drivers/media/dvb-frontends/lgs8gxx_priv.h
-f:drivers/media/dvb-frontends/lnbh24.h
-f:drivers/media/dvb-frontends/lnbh25.c
-f:drivers/media/dvb-frontends/lnbh25.h
-f:drivers/media/dvb-frontends/lnbh29.c
-f:drivers/media/dvb-frontends/lnbh29.h
-f:drivers/media/dvb-frontends/lnbp21.c
-f:drivers/media/dvb-frontends/lnbp21.h
-f:drivers/media/dvb-frontends/lnbp22.c
-f:drivers/media/dvb-frontends/lnbp22.h
-f:drivers/media/dvb-frontends/m88ds3103.c
-f:drivers/media/dvb-frontends/m88ds3103.h
-f:drivers/media/dvb-frontends/m88ds3103_priv.h
-f:drivers/media/dvb-frontends/m88rs2000.c
-f:drivers/media/dvb-frontends/m88rs2000.h
-f:drivers/media/dvb-frontends/mb86a16.c
-f:drivers/media/dvb-frontends/mb86a16.h
-f:drivers/media/dvb-frontends/mb86a16_priv.h
-f:drivers/media/dvb-frontends/mb86a20s.c
-f:drivers/media/dvb-frontends/mb86a20s.h
-f:drivers/media/dvb-frontends/mn88443x.c
-f:drivers/media/dvb-frontends/mn88443x.h
-f:drivers/media/dvb-frontends/mn88472.c
-f:drivers/media/dvb-frontends/mn88472.h
-f:drivers/media/dvb-frontends/mn88472_priv.h
-f:drivers/media/dvb-frontends/mn88473.c
-f:drivers/media/dvb-frontends/mn88473.h
-f:drivers/media/dvb-frontends/mn88473_priv.h
-f:drivers/media/dvb-frontends/mt312.c
-f:drivers/media/dvb-frontends/mt312.h
-f:drivers/media/dvb-frontends/mt312_priv.h
-f:drivers/media/dvb-frontends/mt352.c
-f:drivers/media/dvb-frontends/mt352.h
-f:drivers/media/dvb-frontends/mt352_priv.h
-f:drivers/media/dvb-frontends/mxl5xx.c
-f:drivers/media/dvb-frontends/mxl5xx.h
-f:drivers/media/dvb-frontends/mxl5xx_defs.h
-f:drivers/media/dvb-frontends/mxl5xx_regs.h
-f:drivers/media/dvb-frontends/mxl692.c
-f:drivers/media/dvb-frontends/mxl692.h
-f:drivers/media/dvb-frontends/mxl692_defs.h
-f:drivers/media/dvb-frontends/nxt200x.c
-f:drivers/media/dvb-frontends/nxt200x.h
-f:drivers/media/dvb-frontends/nxt6000.c
-f:drivers/media/dvb-frontends/nxt6000.h
-f:drivers/media/dvb-frontends/nxt6000_priv.h
-f:drivers/media/dvb-frontends/or51132.c
-f:drivers/media/dvb-frontends/or51132.h
-f:drivers/media/dvb-frontends/or51211.c
-f:drivers/media/dvb-frontends/or51211.h
-f:drivers/media/dvb-frontends/rtl2830.c
-f:drivers/media/dvb-frontends/rtl2830.h
-f:drivers/media/dvb-frontends/rtl2830_priv.h
-f:drivers/media/dvb-frontends/rtl2832.c
-f:drivers/media/dvb-frontends/rtl2832.h
-f:drivers/media/dvb-frontends/rtl2832_priv.h
-f:drivers/media/dvb-frontends/rtl2832_sdr.c
-f:drivers/media/dvb-frontends/rtl2832_sdr.h
-f:drivers/media/dvb-frontends/s5h1409.c
-f:drivers/media/dvb-frontends/s5h1409.h
-f:drivers/media/dvb-frontends/s5h1411.c
-f:drivers/media/dvb-frontends/s5h1411.h
-f:drivers/media/dvb-frontends/s5h1420.c
-f:drivers/media/dvb-frontends/s5h1420.h
-f:drivers/media/dvb-frontends/s5h1420_priv.h
-f:drivers/media/dvb-frontends/s5h1432.c
-f:drivers/media/dvb-frontends/s5h1432.h
-f:drivers/media/dvb-frontends/s921.c
-f:drivers/media/dvb-frontends/s921.h
-f:drivers/media/dvb-frontends/si2165.c
-f:drivers/media/dvb-frontends/si2165.h
-f:drivers/media/dvb-frontends/si2165_priv.h
-f:drivers/media/dvb-frontends/si2168.c
-f:drivers/media/dvb-frontends/si2168.h
-f:drivers/media/dvb-frontends/si2168_priv.h
-f:drivers/media/dvb-frontends/si21xx.c
-f:drivers/media/dvb-frontends/si21xx.h
-f:drivers/media/dvb-frontends/sp2.c
-f:drivers/media/dvb-frontends/sp2.h
-f:drivers/media/dvb-frontends/sp2_priv.h
-f:drivers/media/dvb-frontends/sp887x.c
-f:drivers/media/dvb-frontends/sp887x.h
-f:drivers/media/dvb-frontends/stb0899_algo.c
-f:drivers/media/dvb-frontends/stb0899_cfg.h
-f:drivers/media/dvb-frontends/stb0899_drv.c
-f:drivers/media/dvb-frontends/stb0899_drv.h
-f:drivers/media/dvb-frontends/stb0899_priv.h
-f:drivers/media/dvb-frontends/stb0899_reg.h
-f:drivers/media/dvb-frontends/stb6000.c
-f:drivers/media/dvb-frontends/stb6000.h
-f:drivers/media/dvb-frontends/stb6100.c
-f:drivers/media/dvb-frontends/stb6100.h
-f:drivers/media/dvb-frontends/stb6100_cfg.h
-f:drivers/media/dvb-frontends/stb6100_proc.h
-f:drivers/media/dvb-frontends/stv0288.c
-f:drivers/media/dvb-frontends/stv0288.h
-f:drivers/media/dvb-frontends/stv0297.c
-f:drivers/media/dvb-frontends/stv0297.h
-f:drivers/media/dvb-frontends/stv0299.c
-f:drivers/media/dvb-frontends/stv0299.h
-f:drivers/media/dvb-frontends/stv0367.c
-f:drivers/media/dvb-frontends/stv0367.h
-f:drivers/media/dvb-frontends/stv0367_defs.h
-f:drivers/media/dvb-frontends/stv0367_priv.h
-f:drivers/media/dvb-frontends/stv0367_regs.h
-f:drivers/media/dvb-frontends/stv0900.h
-f:drivers/media/dvb-frontends/stv0900_core.c
-f:drivers/media/dvb-frontends/stv0900_init.h
-f:drivers/media/dvb-frontends/stv0900_priv.h
-f:drivers/media/dvb-frontends/stv0900_reg.h
-f:drivers/media/dvb-frontends/stv0900_sw.c
-f:drivers/media/dvb-frontends/stv090x.c
-f:drivers/media/dvb-frontends/stv090x.h
-f:drivers/media/dvb-frontends/stv090x_priv.h
-f:drivers/media/dvb-frontends/stv090x_reg.h
-f:drivers/media/dvb-frontends/stv0910.c
-f:drivers/media/dvb-frontends/stv0910.h
-f:drivers/media/dvb-frontends/stv0910_regs.h
-f:drivers/media/dvb-frontends/stv6110.c
-f:drivers/media/dvb-frontends/stv6110.h
-f:drivers/media/dvb-frontends/stv6110x.c
-f:drivers/media/dvb-frontends/stv6110x.h
-f:drivers/media/dvb-frontends/stv6110x_priv.h
-f:drivers/media/dvb-frontends/stv6110x_reg.h
-f:drivers/media/dvb-frontends/stv6111.c
-f:drivers/media/dvb-frontends/stv6111.h
-f:drivers/media/dvb-frontends/tc90522.c
-f:drivers/media/dvb-frontends/tc90522.h
-f:drivers/media/dvb-frontends/tda10021.c
-f:drivers/media/dvb-frontends/tda10023.c
-f:drivers/media/dvb-frontends/tda1002x.h
-f:drivers/media/dvb-frontends/tda10048.c
-f:drivers/media/dvb-frontends/tda10048.h
-f:drivers/media/dvb-frontends/tda1004x.c
-f:drivers/media/dvb-frontends/tda1004x.h
-f:drivers/media/dvb-frontends/tda10071.c
-f:drivers/media/dvb-frontends/tda10071.h
-f:drivers/media/dvb-frontends/tda10071_priv.h
-f:drivers/media/dvb-frontends/tda10086.c
-f:drivers/media/dvb-frontends/tda10086.h
-f:drivers/media/dvb-frontends/tda18271c2dd.c
-f:drivers/media/dvb-frontends/tda18271c2dd.h
-f:drivers/media/dvb-frontends/tda18271c2dd_maps.h
-f:drivers/media/dvb-frontends/tda665x.c
-f:drivers/media/dvb-frontends/tda665x.h
-f:drivers/media/dvb-frontends/tda8083.c
-f:drivers/media/dvb-frontends/tda8083.h
-f:drivers/media/dvb-frontends/tda8261.c
-f:drivers/media/dvb-frontends/tda8261.h
-f:drivers/media/dvb-frontends/tda8261_cfg.h
-f:drivers/media/dvb-frontends/tda826x.c
-f:drivers/media/dvb-frontends/tda826x.h
-f:drivers/media/dvb-frontends/tdhd1.h
-f:drivers/media/dvb-frontends/ts2020.c
-f:drivers/media/dvb-frontends/ts2020.h
-f:drivers/media/dvb-frontends/tua6100.c
-f:drivers/media/dvb-frontends/tua6100.h
-f:drivers/media/dvb-frontends/ves1820.c
-f:drivers/media/dvb-frontends/ves1820.h
-f:drivers/media/dvb-frontends/ves1x93.c
-f:drivers/media/dvb-frontends/ves1x93.h
-f:drivers/media/dvb-frontends/z0194a.h
-f:drivers/media/dvb-frontends/zd1301_demod.c
-f:drivers/media/dvb-frontends/zd1301_demod.h
-f:drivers/media/dvb-frontends/zl10036.c
-f:drivers/media/dvb-frontends/zl10036.h
-f:drivers/media/dvb-frontends/zl10039.c
-f:drivers/media/dvb-frontends/zl10039.h
-f:drivers/media/dvb-frontends/zl10353.c
-f:drivers/media/dvb-frontends/zl10353.h
-f:drivers/media/dvb-frontends/zl10353_priv.h
-f:drivers/media/firewire/Kconfig
-f:drivers/media/firewire/Makefile
-f:drivers/media/firewire/firedtv-avc.c
-f:drivers/media/firewire/firedtv-ci.c
-f:drivers/media/firewire/firedtv-dvb.c
-f:drivers/media/firewire/firedtv-fe.c
-f:drivers/media/firewire/firedtv-fw.c
-f:drivers/media/firewire/firedtv-rc.c
-f:drivers/media/firewire/firedtv.h
-f:drivers/media/i2c/Kconfig
-f:drivers/media/i2c/Makefile
-f:drivers/media/i2c/ad5820.c
-f:drivers/media/i2c/adp1653.c
-f:drivers/media/i2c/adv7170.c
-f:drivers/media/i2c/adv7175.c
-f:drivers/media/i2c/adv7180.c
-f:drivers/media/i2c/adv7183.c
-f:drivers/media/i2c/adv7183_regs.h
-f:drivers/media/i2c/adv7343.c
-f:drivers/media/i2c/adv7343_regs.h
-f:drivers/media/i2c/adv7393.c
-f:drivers/media/i2c/adv7393_regs.h
-f:drivers/media/i2c/adv748x/Makefile
-f:drivers/media/i2c/adv748x/adv748x-afe.c
-f:drivers/media/i2c/adv748x/adv748x-core.c
-f:drivers/media/i2c/adv748x/adv748x-csi2.c
-f:drivers/media/i2c/adv748x/adv748x-hdmi.c
-f:drivers/media/i2c/adv748x/adv748x.h
-f:drivers/media/i2c/adv7511-v4l2.c
-f:drivers/media/i2c/adv7604.c
-f:drivers/media/i2c/adv7842.c
-f:drivers/media/i2c/ak7375.c
-f:drivers/media/i2c/ak881x.c
-f:drivers/media/i2c/alvium-csi2.c
-f:drivers/media/i2c/alvium-csi2.h
-f:drivers/media/i2c/aptina-pll.c
-f:drivers/media/i2c/aptina-pll.h
-f:drivers/media/i2c/ar0521.c
-f:drivers/media/i2c/bt819.c
-f:drivers/media/i2c/bt856.c
-f:drivers/media/i2c/bt866.c
-f:drivers/media/i2c/ccs-pll.c
-f:drivers/media/i2c/ccs-pll.h
-f:drivers/media/i2c/ccs/Kconfig
-f:drivers/media/i2c/ccs/Makefile
-f:drivers/media/i2c/ccs/ccs-core.c
-f:drivers/media/i2c/ccs/ccs-data-defs.h
-f:drivers/media/i2c/ccs/ccs-data.c
-f:drivers/media/i2c/ccs/ccs-data.h
-f:drivers/media/i2c/ccs/ccs-limits.c
-f:drivers/media/i2c/ccs/ccs-limits.h
-f:drivers/media/i2c/ccs/ccs-quirk.c
-f:drivers/media/i2c/ccs/ccs-quirk.h
-f:drivers/media/i2c/ccs/ccs-reg-access.c
-f:drivers/media/i2c/ccs/ccs-reg-access.h
-f:drivers/media/i2c/ccs/ccs-regs.h
-f:drivers/media/i2c/ccs/ccs.h
-f:drivers/media/i2c/ccs/smiapp-reg-defs.h
-f:drivers/media/i2c/cs3308.c
-f:drivers/media/i2c/cs5345.c
-f:drivers/media/i2c/cs53l32a.c
-f:drivers/media/i2c/cx25840/Kconfig
-f:drivers/media/i2c/cx25840/Makefile
-f:drivers/media/i2c/cx25840/cx25840-audio.c
-f:drivers/media/i2c/cx25840/cx25840-core.c
-f:drivers/media/i2c/cx25840/cx25840-core.h
-f:drivers/media/i2c/cx25840/cx25840-firmware.c
-f:drivers/media/i2c/cx25840/cx25840-ir.c
-f:drivers/media/i2c/cx25840/cx25840-vbi.c
-f:drivers/media/i2c/ds90ub913.c
-f:drivers/media/i2c/ds90ub953.c
-f:drivers/media/i2c/ds90ub953.h
-f:drivers/media/i2c/ds90ub960.c
-f:drivers/media/i2c/dw9714.c
-f:drivers/media/i2c/dw9719.c
-f:drivers/media/i2c/dw9768.c
-f:drivers/media/i2c/dw9807-vcm.c
-f:drivers/media/i2c/et8ek8/Kconfig
-f:drivers/media/i2c/et8ek8/Makefile
-f:drivers/media/i2c/et8ek8/et8ek8_driver.c
-f:drivers/media/i2c/et8ek8/et8ek8_mode.c
-f:drivers/media/i2c/et8ek8/et8ek8_reg.h
-f:drivers/media/i2c/gc0308.c
-f:drivers/media/i2c/gc05a2.c
-f:drivers/media/i2c/gc08a3.c
-f:drivers/media/i2c/gc2145.c
-f:drivers/media/i2c/hi556.c
-f:drivers/media/i2c/hi846.c
-f:drivers/media/i2c/hi847.c
-f:drivers/media/i2c/imx208.c
-f:drivers/media/i2c/imx214.c
-f:drivers/media/i2c/imx219.c
-f:drivers/media/i2c/imx258.c
-f:drivers/media/i2c/imx274.c
-f:drivers/media/i2c/imx283.c
-f:drivers/media/i2c/imx290.c
-f:drivers/media/i2c/imx296.c
-f:drivers/media/i2c/imx319.c
-f:drivers/media/i2c/imx334.c
-f:drivers/media/i2c/imx335.c
-f:drivers/media/i2c/imx355.c
-f:drivers/media/i2c/imx412.c
-f:drivers/media/i2c/imx415.c
-f:drivers/media/i2c/ir-kbd-i2c.c
-f:drivers/media/i2c/isl7998x.c
-f:drivers/media/i2c/ks0127.c
-f:drivers/media/i2c/ks0127.h
-f:drivers/media/i2c/lm3560.c
-f:drivers/media/i2c/lm3646.c
-f:drivers/media/i2c/lt6911uxe.c
-f:drivers/media/i2c/m52790.c
-f:drivers/media/i2c/max2175.c
-f:drivers/media/i2c/max2175.h
-f:drivers/media/i2c/max9271.c
-f:drivers/media/i2c/max9271.h
-f:drivers/media/i2c/max9286.c
-f:drivers/media/i2c/max96714.c
-f:drivers/media/i2c/max96717.c
-f:drivers/media/i2c/ml86v7667.c
-f:drivers/media/i2c/msp3400-driver.c
-f:drivers/media/i2c/msp3400-driver.h
-f:drivers/media/i2c/msp3400-kthreads.c
-f:drivers/media/i2c/mt9m001.c
-f:drivers/media/i2c/mt9m111.c
-f:drivers/media/i2c/mt9m114.c
-f:drivers/media/i2c/mt9p031.c
-f:drivers/media/i2c/mt9t112.c
-f:drivers/media/i2c/mt9v011.c
-f:drivers/media/i2c/mt9v032.c
-f:drivers/media/i2c/mt9v111.c
-f:drivers/media/i2c/og01a1b.c
-f:drivers/media/i2c/ov01a10.c
-f:drivers/media/i2c/ov02a10.c
-f:drivers/media/i2c/ov02c10.c
-f:drivers/media/i2c/ov02e10.c
-f:drivers/media/i2c/ov08d10.c
-f:drivers/media/i2c/ov08x40.c
-f:drivers/media/i2c/ov13858.c
-f:drivers/media/i2c/ov13b10.c
-f:drivers/media/i2c/ov2640.c
-f:drivers/media/i2c/ov2659.c
-f:drivers/media/i2c/ov2680.c
-f:drivers/media/i2c/ov2685.c
-f:drivers/media/i2c/ov2740.c
-f:drivers/media/i2c/ov4689.c
-f:drivers/media/i2c/ov5640.c
-f:drivers/media/i2c/ov5645.c
-f:drivers/media/i2c/ov5647.c
-f:drivers/media/i2c/ov5648.c
-f:drivers/media/i2c/ov5670.c
-f:drivers/media/i2c/ov5675.c
-f:drivers/media/i2c/ov5693.c
-f:drivers/media/i2c/ov5695.c
-f:drivers/media/i2c/ov64a40.c
-f:drivers/media/i2c/ov6650.c
-f:drivers/media/i2c/ov7251.c
-f:drivers/media/i2c/ov7640.c
-f:drivers/media/i2c/ov7670.c
-f:drivers/media/i2c/ov772x.c
-f:drivers/media/i2c/ov7740.c
-f:drivers/media/i2c/ov8856.c
-f:drivers/media/i2c/ov8858.c
-f:drivers/media/i2c/ov8865.c
-f:drivers/media/i2c/ov9282.c
-f:drivers/media/i2c/ov9640.c
-f:drivers/media/i2c/ov9640.h
-f:drivers/media/i2c/ov9650.c
-f:drivers/media/i2c/ov9734.c
-f:drivers/media/i2c/rdacm20.c
-f:drivers/media/i2c/rdacm21.c
-f:drivers/media/i2c/rj54n1cb0c.c
-f:drivers/media/i2c/s5c73m3/Makefile
-f:drivers/media/i2c/s5c73m3/s5c73m3-core.c
-f:drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c
-f:drivers/media/i2c/s5c73m3/s5c73m3-spi.c
-f:drivers/media/i2c/s5c73m3/s5c73m3.h
-f:drivers/media/i2c/s5k5baf.c
-f:drivers/media/i2c/s5k6a3.c
-f:drivers/media/i2c/saa6588.c
-f:drivers/media/i2c/saa6752hs.c
-f:drivers/media/i2c/saa7110.c
-f:drivers/media/i2c/saa7115.c
-f:drivers/media/i2c/saa711x_regs.h
-f:drivers/media/i2c/saa7127.c
-f:drivers/media/i2c/saa717x.c
-f:drivers/media/i2c/saa7185.c
-f:drivers/media/i2c/sony-btf-mpx.c
-f:drivers/media/i2c/st-mipid02.c
-f:drivers/media/i2c/tc358743.c
-f:drivers/media/i2c/tc358743_regs.h
-f:drivers/media/i2c/tc358746.c
-f:drivers/media/i2c/tda1997x.c
-f:drivers/media/i2c/tda1997x_regs.h
-f:drivers/media/i2c/tda7432.c
-f:drivers/media/i2c/tda9840.c
-f:drivers/media/i2c/tea6415c.c
-f:drivers/media/i2c/tea6415c.h
-f:drivers/media/i2c/tea6420.c
-f:drivers/media/i2c/tea6420.h
-f:drivers/media/i2c/thp7312.c
-f:drivers/media/i2c/ths7303.c
-f:drivers/media/i2c/ths8200.c
-f:drivers/media/i2c/ths8200_regs.h
-f:drivers/media/i2c/tlv320aic23b.c
-f:drivers/media/i2c/tvaudio.c
-f:drivers/media/i2c/tvp514x.c
-f:drivers/media/i2c/tvp514x_regs.h
-f:drivers/media/i2c/tvp5150.c
-f:drivers/media/i2c/tvp5150_reg.h
-f:drivers/media/i2c/tvp7002.c
-f:drivers/media/i2c/tvp7002_reg.h
-f:drivers/media/i2c/tw2804.c
-f:drivers/media/i2c/tw9900.c
-f:drivers/media/i2c/tw9903.c
-f:drivers/media/i2c/tw9906.c
-f:drivers/media/i2c/tw9910.c
-f:drivers/media/i2c/uda1342.c
-f:drivers/media/i2c/upd64031a.c
-f:drivers/media/i2c/upd64083.c
-f:drivers/media/i2c/vd55g1.c
-f:drivers/media/i2c/vd56g3.c
-f:drivers/media/i2c/vgxy61.c
-f:drivers/media/i2c/video-i2c.c
-f:drivers/media/i2c/vp27smpx.c
-f:drivers/media/i2c/vpx3220.c
-f:drivers/media/i2c/wm8739.c
-f:drivers/media/i2c/wm8775.c
-f:drivers/media/mc/Kconfig
-f:drivers/media/mc/Makefile
-f:drivers/media/mc/mc-dev-allocator.c
-f:drivers/media/mc/mc-device.c
-f:drivers/media/mc/mc-devnode.c
-f:drivers/media/mc/mc-entity.c
-f:drivers/media/mc/mc-request.c
-f:drivers/media/mmc/Kconfig
-f:drivers/media/mmc/Makefile
-f:drivers/media/mmc/siano/Kconfig
-f:drivers/media/mmc/siano/Makefile
-f:drivers/media/mmc/siano/smssdio.c
-f:drivers/media/pci/Kconfig
-f:drivers/media/pci/Makefile
-f:drivers/media/pci/b2c2/Kconfig
-f:drivers/media/pci/b2c2/Makefile
-f:drivers/media/pci/b2c2/flexcop-dma.c
-f:drivers/media/pci/b2c2/flexcop-pci.c
-f:drivers/media/pci/bt8xx/Kconfig
-f:drivers/media/pci/bt8xx/Makefile
-f:drivers/media/pci/bt8xx/bt848.h
-f:drivers/media/pci/bt8xx/bt878.c
-f:drivers/media/pci/bt8xx/bt878.h
-f:drivers/media/pci/bt8xx/btcx-risc.c
-f:drivers/media/pci/bt8xx/btcx-risc.h
-f:drivers/media/pci/bt8xx/bttv-audio-hook.c
-f:drivers/media/pci/bt8xx/bttv-audio-hook.h
-f:drivers/media/pci/bt8xx/bttv-cards.c
-f:drivers/media/pci/bt8xx/bttv-driver.c
-f:drivers/media/pci/bt8xx/bttv-gpio.c
-f:drivers/media/pci/bt8xx/bttv-i2c.c
-f:drivers/media/pci/bt8xx/bttv-if.c
-f:drivers/media/pci/bt8xx/bttv-input.c
-f:drivers/media/pci/bt8xx/bttv-risc.c
-f:drivers/media/pci/bt8xx/bttv-vbi.c
-f:drivers/media/pci/bt8xx/bttv.h
-f:drivers/media/pci/bt8xx/bttvp.h
-f:drivers/media/pci/bt8xx/dst.c
-f:drivers/media/pci/bt8xx/dst_ca.c
-f:drivers/media/pci/bt8xx/dst_ca.h
-f:drivers/media/pci/bt8xx/dst_common.h
-f:drivers/media/pci/bt8xx/dst_priv.h
-f:drivers/media/pci/bt8xx/dvb-bt8xx.c
-f:drivers/media/pci/bt8xx/dvb-bt8xx.h
-f:drivers/media/pci/cobalt/Kconfig
-f:drivers/media/pci/cobalt/Makefile
-f:drivers/media/pci/cobalt/cobalt-alsa-main.c
-f:drivers/media/pci/cobalt/cobalt-alsa-pcm.c
-f:drivers/media/pci/cobalt/cobalt-alsa-pcm.h
-f:drivers/media/pci/cobalt/cobalt-alsa.h
-f:drivers/media/pci/cobalt/cobalt-cpld.c
-f:drivers/media/pci/cobalt/cobalt-cpld.h
-f:drivers/media/pci/cobalt/cobalt-driver.c
-f:drivers/media/pci/cobalt/cobalt-driver.h
-f:drivers/media/pci/cobalt/cobalt-flash.c
-f:drivers/media/pci/cobalt/cobalt-flash.h
-f:drivers/media/pci/cobalt/cobalt-i2c.c
-f:drivers/media/pci/cobalt/cobalt-i2c.h
-f:drivers/media/pci/cobalt/cobalt-irq.c
-f:drivers/media/pci/cobalt/cobalt-irq.h
-f:drivers/media/pci/cobalt/cobalt-omnitek.c
-f:drivers/media/pci/cobalt/cobalt-omnitek.h
-f:drivers/media/pci/cobalt/cobalt-v4l2.c
-f:drivers/media/pci/cobalt/cobalt-v4l2.h
-f:drivers/media/pci/cobalt/m00233_video_measure_memmap_package.h
-f:drivers/media/pci/cobalt/m00235_fdma_packer_memmap_package.h
-f:drivers/media/pci/cobalt/m00389_cvi_memmap_package.h
-f:drivers/media/pci/cobalt/m00460_evcnt_memmap_package.h
-f:drivers/media/pci/cobalt/m00473_freewheel_memmap_package.h
-f:drivers/media/pci/cobalt/m00479_clk_loss_detector_memmap_package.h
-f:drivers/media/pci/cobalt/m00514_syncgen_flow_evcnt_memmap_package.h
-f:drivers/media/pci/cx18/Kconfig
-f:drivers/media/pci/cx18/Makefile
-f:drivers/media/pci/cx18/cx18-alsa-main.c
-f:drivers/media/pci/cx18/cx18-alsa-pcm.c
-f:drivers/media/pci/cx18/cx18-alsa-pcm.h
-f:drivers/media/pci/cx18/cx18-alsa.h
-f:drivers/media/pci/cx18/cx18-audio.c
-f:drivers/media/pci/cx18/cx18-audio.h
-f:drivers/media/pci/cx18/cx18-av-audio.c
-f:drivers/media/pci/cx18/cx18-av-core.c
-f:drivers/media/pci/cx18/cx18-av-core.h
-f:drivers/media/pci/cx18/cx18-av-firmware.c
-f:drivers/media/pci/cx18/cx18-av-vbi.c
-f:drivers/media/pci/cx18/cx18-cards.c
-f:drivers/media/pci/cx18/cx18-cards.h
-f:drivers/media/pci/cx18/cx18-controls.c
-f:drivers/media/pci/cx18/cx18-controls.h
-f:drivers/media/pci/cx18/cx18-driver.c
-f:drivers/media/pci/cx18/cx18-driver.h
-f:drivers/media/pci/cx18/cx18-dvb.c
-f:drivers/media/pci/cx18/cx18-dvb.h
-f:drivers/media/pci/cx18/cx18-fileops.c
-f:drivers/media/pci/cx18/cx18-fileops.h
-f:drivers/media/pci/cx18/cx18-firmware.c
-f:drivers/media/pci/cx18/cx18-firmware.h
-f:drivers/media/pci/cx18/cx18-gpio.c
-f:drivers/media/pci/cx18/cx18-gpio.h
-f:drivers/media/pci/cx18/cx18-i2c.c
-f:drivers/media/pci/cx18/cx18-i2c.h
-f:drivers/media/pci/cx18/cx18-io.c
-f:drivers/media/pci/cx18/cx18-io.h
-f:drivers/media/pci/cx18/cx18-ioctl.c
-f:drivers/media/pci/cx18/cx18-ioctl.h
-f:drivers/media/pci/cx18/cx18-irq.c
-f:drivers/media/pci/cx18/cx18-irq.h
-f:drivers/media/pci/cx18/cx18-mailbox.c
-f:drivers/media/pci/cx18/cx18-mailbox.h
-f:drivers/media/pci/cx18/cx18-queue.c
-f:drivers/media/pci/cx18/cx18-queue.h
-f:drivers/media/pci/cx18/cx18-scb.c
-f:drivers/media/pci/cx18/cx18-scb.h
-f:drivers/media/pci/cx18/cx18-streams.c
-f:drivers/media/pci/cx18/cx18-streams.h
-f:drivers/media/pci/cx18/cx18-vbi.c
-f:drivers/media/pci/cx18/cx18-vbi.h
-f:drivers/media/pci/cx18/cx18-version.h
-f:drivers/media/pci/cx18/cx18-video.c
-f:drivers/media/pci/cx18/cx18-video.h
-f:drivers/media/pci/cx18/cx23418.h
-f:drivers/media/pci/cx23885/Kconfig
-f:drivers/media/pci/cx23885/Makefile
-f:drivers/media/pci/cx23885/altera-ci.c
-f:drivers/media/pci/cx23885/altera-ci.h
-f:drivers/media/pci/cx23885/cimax2.c
-f:drivers/media/pci/cx23885/cimax2.h
-f:drivers/media/pci/cx23885/cx23885-417.c
-f:drivers/media/pci/cx23885/cx23885-alsa.c
-f:drivers/media/pci/cx23885/cx23885-av.c
-f:drivers/media/pci/cx23885/cx23885-av.h
-f:drivers/media/pci/cx23885/cx23885-cards.c
-f:drivers/media/pci/cx23885/cx23885-core.c
-f:drivers/media/pci/cx23885/cx23885-dvb.c
-f:drivers/media/pci/cx23885/cx23885-f300.c
-f:drivers/media/pci/cx23885/cx23885-f300.h
-f:drivers/media/pci/cx23885/cx23885-i2c.c
-f:drivers/media/pci/cx23885/cx23885-input.c
-f:drivers/media/pci/cx23885/cx23885-input.h
-f:drivers/media/pci/cx23885/cx23885-ioctl.c
-f:drivers/media/pci/cx23885/cx23885-ioctl.h
-f:drivers/media/pci/cx23885/cx23885-ir.c
-f:drivers/media/pci/cx23885/cx23885-ir.h
-f:drivers/media/pci/cx23885/cx23885-reg.h
-f:drivers/media/pci/cx23885/cx23885-vbi.c
-f:drivers/media/pci/cx23885/cx23885-video.c
-f:drivers/media/pci/cx23885/cx23885-video.h
-f:drivers/media/pci/cx23885/cx23885.h
-f:drivers/media/pci/cx23885/cx23888-ir.c
-f:drivers/media/pci/cx23885/cx23888-ir.h
-f:drivers/media/pci/cx23885/netup-eeprom.c
-f:drivers/media/pci/cx23885/netup-eeprom.h
-f:drivers/media/pci/cx23885/netup-init.c
-f:drivers/media/pci/cx23885/netup-init.h
-f:drivers/media/pci/cx25821/Kconfig
-f:drivers/media/pci/cx25821/Makefile
-f:drivers/media/pci/cx25821/cx25821-alsa.c
-f:drivers/media/pci/cx25821/cx25821-audio.h
-f:drivers/media/pci/cx25821/cx25821-biffuncs.h
-f:drivers/media/pci/cx25821/cx25821-cards.c
-f:drivers/media/pci/cx25821/cx25821-core.c
-f:drivers/media/pci/cx25821/cx25821-gpio.c
-f:drivers/media/pci/cx25821/cx25821-i2c.c
-f:drivers/media/pci/cx25821/cx25821-medusa-defines.h
-f:drivers/media/pci/cx25821/cx25821-medusa-reg.h
-f:drivers/media/pci/cx25821/cx25821-medusa-video.c
-f:drivers/media/pci/cx25821/cx25821-medusa-video.h
-f:drivers/media/pci/cx25821/cx25821-reg.h
-f:drivers/media/pci/cx25821/cx25821-sram.h
-f:drivers/media/pci/cx25821/cx25821-video.c
-f:drivers/media/pci/cx25821/cx25821-video.h
-f:drivers/media/pci/cx25821/cx25821.h
-f:drivers/media/pci/cx88/Kconfig
-f:drivers/media/pci/cx88/Makefile
-f:drivers/media/pci/cx88/cx88-alsa.c
-f:drivers/media/pci/cx88/cx88-blackbird.c
-f:drivers/media/pci/cx88/cx88-cards.c
-f:drivers/media/pci/cx88/cx88-core.c
-f:drivers/media/pci/cx88/cx88-dsp.c
-f:drivers/media/pci/cx88/cx88-dvb.c
-f:drivers/media/pci/cx88/cx88-i2c.c
-f:drivers/media/pci/cx88/cx88-input.c
-f:drivers/media/pci/cx88/cx88-mpeg.c
-f:drivers/media/pci/cx88/cx88-reg.h
-f:drivers/media/pci/cx88/cx88-tvaudio.c
-f:drivers/media/pci/cx88/cx88-vbi.c
-f:drivers/media/pci/cx88/cx88-video.c
-f:drivers/media/pci/cx88/cx88-vp3054-i2c.c
-f:drivers/media/pci/cx88/cx88-vp3054-i2c.h
-f:drivers/media/pci/cx88/cx88.h
-f:drivers/media/pci/ddbridge/Kconfig
-f:drivers/media/pci/ddbridge/Makefile
-f:drivers/media/pci/ddbridge/ddbridge-ci.c
-f:drivers/media/pci/ddbridge/ddbridge-ci.h
-f:drivers/media/pci/ddbridge/ddbridge-core.c
-f:drivers/media/pci/ddbridge/ddbridge-dummy-fe.c
-f:drivers/media/pci/ddbridge/ddbridge-dummy-fe.h
-f:drivers/media/pci/ddbridge/ddbridge-hw.c
-f:drivers/media/pci/ddbridge/ddbridge-hw.h
-f:drivers/media/pci/ddbridge/ddbridge-i2c.c
-f:drivers/media/pci/ddbridge/ddbridge-i2c.h
-f:drivers/media/pci/ddbridge/ddbridge-io.h
-f:drivers/media/pci/ddbridge/ddbridge-main.c
-f:drivers/media/pci/ddbridge/ddbridge-max.c
-f:drivers/media/pci/ddbridge/ddbridge-max.h
-f:drivers/media/pci/ddbridge/ddbridge-mci.c
-f:drivers/media/pci/ddbridge/ddbridge-mci.h
-f:drivers/media/pci/ddbridge/ddbridge-regs.h
-f:drivers/media/pci/ddbridge/ddbridge-sx8.c
-f:drivers/media/pci/ddbridge/ddbridge.h
-f:drivers/media/pci/dm1105/Kconfig
-f:drivers/media/pci/dm1105/Makefile
-f:drivers/media/pci/dm1105/dm1105.c
-f:drivers/media/pci/dt3155/Kconfig
-f:drivers/media/pci/dt3155/Makefile
-f:drivers/media/pci/dt3155/dt3155.c
-f:drivers/media/pci/dt3155/dt3155.h
-f:drivers/media/pci/intel/Kconfig
-f:drivers/media/pci/intel/Makefile
-f:drivers/media/pci/intel/ipu-bridge.c
-f:drivers/media/pci/intel/ipu3/Kconfig
-f:drivers/media/pci/intel/ipu3/Makefile
-f:drivers/media/pci/intel/ipu3/ipu3-cio2.c
-f:drivers/media/pci/intel/ipu3/ipu3-cio2.h
-f:drivers/media/pci/intel/ipu6/Kconfig
-f:drivers/media/pci/intel/ipu6/Makefile
-f:drivers/media/pci/intel/ipu6/ipu6-bus.c
-f:drivers/media/pci/intel/ipu6/ipu6-bus.h
-f:drivers/media/pci/intel/ipu6/ipu6-buttress.c
-f:drivers/media/pci/intel/ipu6/ipu6-buttress.h
-f:drivers/media/pci/intel/ipu6/ipu6-cpd.c
-f:drivers/media/pci/intel/ipu6/ipu6-cpd.h
-f:drivers/media/pci/intel/ipu6/ipu6-dma.c
-f:drivers/media/pci/intel/ipu6/ipu6-dma.h
-f:drivers/media/pci/intel/ipu6/ipu6-fw-com.c
-f:drivers/media/pci/intel/ipu6/ipu6-fw-com.h
-f:drivers/media/pci/intel/ipu6/ipu6-fw-isys.c
-f:drivers/media/pci/intel/ipu6/ipu6-fw-isys.h
-f:drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c
-f:drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h
-f:drivers/media/pci/intel/ipu6/ipu6-isys-dwc-phy.c
-f:drivers/media/pci/intel/ipu6/ipu6-isys-jsl-phy.c
-f:drivers/media/pci/intel/ipu6/ipu6-isys-mcd-phy.c
-f:drivers/media/pci/intel/ipu6/ipu6-isys-queue.c
-f:drivers/media/pci/intel/ipu6/ipu6-isys-queue.h
-f:drivers/media/pci/intel/ipu6/ipu6-isys-subdev.c
-f:drivers/media/pci/intel/ipu6/ipu6-isys-subdev.h
-f:drivers/media/pci/intel/ipu6/ipu6-isys-video.c
-f:drivers/media/pci/intel/ipu6/ipu6-isys-video.h
-f:drivers/media/pci/intel/ipu6/ipu6-isys.c
-f:drivers/media/pci/intel/ipu6/ipu6-isys.h
-f:drivers/media/pci/intel/ipu6/ipu6-mmu.c
-f:drivers/media/pci/intel/ipu6/ipu6-mmu.h
-f:drivers/media/pci/intel/ipu6/ipu6-platform-buttress-regs.h
-f:drivers/media/pci/intel/ipu6/ipu6-platform-isys-csi2-reg.h
-f:drivers/media/pci/intel/ipu6/ipu6-platform-regs.h
-f:drivers/media/pci/intel/ipu6/ipu6.c
-f:drivers/media/pci/intel/ipu6/ipu6.h
-f:drivers/media/pci/intel/ivsc/Kconfig
-f:drivers/media/pci/intel/ivsc/Makefile
-f:drivers/media/pci/intel/ivsc/mei_ace.c
-f:drivers/media/pci/intel/ivsc/mei_csi.c
-f:drivers/media/pci/ivtv/Kconfig
-f:drivers/media/pci/ivtv/Makefile
-f:drivers/media/pci/ivtv/ivtv-alsa-main.c
-f:drivers/media/pci/ivtv/ivtv-alsa-pcm.c
-f:drivers/media/pci/ivtv/ivtv-alsa-pcm.h
-f:drivers/media/pci/ivtv/ivtv-alsa.h
-f:drivers/media/pci/ivtv/ivtv-cards.c
-f:drivers/media/pci/ivtv/ivtv-cards.h
-f:drivers/media/pci/ivtv/ivtv-controls.c
-f:drivers/media/pci/ivtv/ivtv-controls.h
-f:drivers/media/pci/ivtv/ivtv-driver.c
-f:drivers/media/pci/ivtv/ivtv-driver.h
-f:drivers/media/pci/ivtv/ivtv-fileops.c
-f:drivers/media/pci/ivtv/ivtv-fileops.h
-f:drivers/media/pci/ivtv/ivtv-firmware.c
-f:drivers/media/pci/ivtv/ivtv-firmware.h
-f:drivers/media/pci/ivtv/ivtv-gpio.c
-f:drivers/media/pci/ivtv/ivtv-gpio.h
-f:drivers/media/pci/ivtv/ivtv-i2c.c
-f:drivers/media/pci/ivtv/ivtv-i2c.h
-f:drivers/media/pci/ivtv/ivtv-ioctl.c
-f:drivers/media/pci/ivtv/ivtv-ioctl.h
-f:drivers/media/pci/ivtv/ivtv-irq.c
-f:drivers/media/pci/ivtv/ivtv-irq.h
-f:drivers/media/pci/ivtv/ivtv-mailbox.c
-f:drivers/media/pci/ivtv/ivtv-mailbox.h
-f:drivers/media/pci/ivtv/ivtv-queue.c
-f:drivers/media/pci/ivtv/ivtv-queue.h
-f:drivers/media/pci/ivtv/ivtv-routing.c
-f:drivers/media/pci/ivtv/ivtv-routing.h
-f:drivers/media/pci/ivtv/ivtv-streams.c
-f:drivers/media/pci/ivtv/ivtv-streams.h
-f:drivers/media/pci/ivtv/ivtv-udma.c
-f:drivers/media/pci/ivtv/ivtv-udma.h
-f:drivers/media/pci/ivtv/ivtv-vbi.c
-f:drivers/media/pci/ivtv/ivtv-vbi.h
-f:drivers/media/pci/ivtv/ivtv-version.h
-f:drivers/media/pci/ivtv/ivtv-yuv.c
-f:drivers/media/pci/ivtv/ivtv-yuv.h
-f:drivers/media/pci/ivtv/ivtvfb.c
-f:drivers/media/pci/mantis/Kconfig
-f:drivers/media/pci/mantis/Makefile
-f:drivers/media/pci/mantis/hopper_cards.c
-f:drivers/media/pci/mantis/hopper_vp3028.c
-f:drivers/media/pci/mantis/hopper_vp3028.h
-f:drivers/media/pci/mantis/mantis_ca.c
-f:drivers/media/pci/mantis/mantis_ca.h
-f:drivers/media/pci/mantis/mantis_cards.c
-f:drivers/media/pci/mantis/mantis_common.h
-f:drivers/media/pci/mantis/mantis_dma.c
-f:drivers/media/pci/mantis/mantis_dma.h
-f:drivers/media/pci/mantis/mantis_dvb.c
-f:drivers/media/pci/mantis/mantis_dvb.h
-f:drivers/media/pci/mantis/mantis_evm.c
-f:drivers/media/pci/mantis/mantis_hif.c
-f:drivers/media/pci/mantis/mantis_hif.h
-f:drivers/media/pci/mantis/mantis_i2c.c
-f:drivers/media/pci/mantis/mantis_i2c.h
-f:drivers/media/pci/mantis/mantis_input.c
-f:drivers/media/pci/mantis/mantis_input.h
-f:drivers/media/pci/mantis/mantis_ioc.c
-f:drivers/media/pci/mantis/mantis_ioc.h
-f:drivers/media/pci/mantis/mantis_link.h
-f:drivers/media/pci/mantis/mantis_pci.c
-f:drivers/media/pci/mantis/mantis_pci.h
-f:drivers/media/pci/mantis/mantis_pcmcia.c
-f:drivers/media/pci/mantis/mantis_reg.h
-f:drivers/media/pci/mantis/mantis_uart.c
-f:drivers/media/pci/mantis/mantis_uart.h
-f:drivers/media/pci/mantis/mantis_vp1033.c
-f:drivers/media/pci/mantis/mantis_vp1033.h
-f:drivers/media/pci/mantis/mantis_vp1034.c
-f:drivers/media/pci/mantis/mantis_vp1034.h
-f:drivers/media/pci/mantis/mantis_vp1041.c
-f:drivers/media/pci/mantis/mantis_vp1041.h
-f:drivers/media/pci/mantis/mantis_vp2033.c
-f:drivers/media/pci/mantis/mantis_vp2033.h
-f:drivers/media/pci/mantis/mantis_vp2040.c
-f:drivers/media/pci/mantis/mantis_vp2040.h
-f:drivers/media/pci/mantis/mantis_vp3030.c
-f:drivers/media/pci/mantis/mantis_vp3030.h
-f:drivers/media/pci/mgb4/Kconfig
-f:drivers/media/pci/mgb4/Makefile
-f:drivers/media/pci/mgb4/mgb4_cmt.c
-f:drivers/media/pci/mgb4/mgb4_cmt.h
-f:drivers/media/pci/mgb4/mgb4_core.c
-f:drivers/media/pci/mgb4/mgb4_core.h
-f:drivers/media/pci/mgb4/mgb4_dma.c
-f:drivers/media/pci/mgb4/mgb4_dma.h
-f:drivers/media/pci/mgb4/mgb4_i2c.c
-f:drivers/media/pci/mgb4/mgb4_i2c.h
-f:drivers/media/pci/mgb4/mgb4_io.h
-f:drivers/media/pci/mgb4/mgb4_regs.c
-f:drivers/media/pci/mgb4/mgb4_regs.h
-f:drivers/media/pci/mgb4/mgb4_sysfs.h
-f:drivers/media/pci/mgb4/mgb4_sysfs_in.c
-f:drivers/media/pci/mgb4/mgb4_sysfs_out.c
-f:drivers/media/pci/mgb4/mgb4_sysfs_pci.c
-f:drivers/media/pci/mgb4/mgb4_trigger.c
-f:drivers/media/pci/mgb4/mgb4_trigger.h
-f:drivers/media/pci/mgb4/mgb4_vin.c
-f:drivers/media/pci/mgb4/mgb4_vin.h
-f:drivers/media/pci/mgb4/mgb4_vout.c
-f:drivers/media/pci/mgb4/mgb4_vout.h
-f:drivers/media/pci/netup_unidvb/Kconfig
-f:drivers/media/pci/netup_unidvb/Makefile
-f:drivers/media/pci/netup_unidvb/netup_unidvb.h
-f:drivers/media/pci/netup_unidvb/netup_unidvb_ci.c
-f:drivers/media/pci/netup_unidvb/netup_unidvb_core.c
-f:drivers/media/pci/netup_unidvb/netup_unidvb_i2c.c
-f:drivers/media/pci/netup_unidvb/netup_unidvb_spi.c
-f:drivers/media/pci/ngene/Kconfig
-f:drivers/media/pci/ngene/Makefile
-f:drivers/media/pci/ngene/ngene-cards.c
-f:drivers/media/pci/ngene/ngene-core.c
-f:drivers/media/pci/ngene/ngene-dvb.c
-f:drivers/media/pci/ngene/ngene-i2c.c
-f:drivers/media/pci/ngene/ngene.h
-f:drivers/media/pci/pluto2/Kconfig
-f:drivers/media/pci/pluto2/Makefile
-f:drivers/media/pci/pluto2/pluto2.c
-f:drivers/media/pci/pt1/Kconfig
-f:drivers/media/pci/pt1/Makefile
-f:drivers/media/pci/pt1/pt1.c
-f:drivers/media/pci/pt3/Kconfig
-f:drivers/media/pci/pt3/Makefile
-f:drivers/media/pci/pt3/pt3.c
-f:drivers/media/pci/pt3/pt3.h
-f:drivers/media/pci/pt3/pt3_dma.c
-f:drivers/media/pci/pt3/pt3_i2c.c
-f:drivers/media/pci/saa7134/Kconfig
-f:drivers/media/pci/saa7134/Makefile
-f:drivers/media/pci/saa7134/saa7134-alsa.c
-f:drivers/media/pci/saa7134/saa7134-cards.c
-f:drivers/media/pci/saa7134/saa7134-core.c
-f:drivers/media/pci/saa7134/saa7134-dvb.c
-f:drivers/media/pci/saa7134/saa7134-empress.c
-f:drivers/media/pci/saa7134/saa7134-go7007.c
-f:drivers/media/pci/saa7134/saa7134-i2c.c
-f:drivers/media/pci/saa7134/saa7134-input.c
-f:drivers/media/pci/saa7134/saa7134-reg.h
-f:drivers/media/pci/saa7134/saa7134-ts.c
-f:drivers/media/pci/saa7134/saa7134-tvaudio.c
-f:drivers/media/pci/saa7134/saa7134-vbi.c
-f:drivers/media/pci/saa7134/saa7134-video.c
-f:drivers/media/pci/saa7134/saa7134.h
-f:drivers/media/pci/saa7146/Kconfig
-f:drivers/media/pci/saa7146/Makefile
-f:drivers/media/pci/saa7146/hexium_gemini.c
-f:drivers/media/pci/saa7146/hexium_orion.c
-f:drivers/media/pci/saa7146/mxb.c
-f:drivers/media/pci/saa7164/Kconfig
-f:drivers/media/pci/saa7164/Makefile
-f:drivers/media/pci/saa7164/saa7164-api.c
-f:drivers/media/pci/saa7164/saa7164-buffer.c
-f:drivers/media/pci/saa7164/saa7164-bus.c
-f:drivers/media/pci/saa7164/saa7164-cards.c
-f:drivers/media/pci/saa7164/saa7164-cmd.c
-f:drivers/media/pci/saa7164/saa7164-core.c
-f:drivers/media/pci/saa7164/saa7164-dvb.c
-f:drivers/media/pci/saa7164/saa7164-encoder.c
-f:drivers/media/pci/saa7164/saa7164-fw.c
-f:drivers/media/pci/saa7164/saa7164-i2c.c
-f:drivers/media/pci/saa7164/saa7164-reg.h
-f:drivers/media/pci/saa7164/saa7164-types.h
-f:drivers/media/pci/saa7164/saa7164-vbi.c
-f:drivers/media/pci/saa7164/saa7164.h
-f:drivers/media/pci/smipcie/Kconfig
-f:drivers/media/pci/smipcie/Makefile
-f:drivers/media/pci/smipcie/smipcie-ir.c
-f:drivers/media/pci/smipcie/smipcie-main.c
-f:drivers/media/pci/smipcie/smipcie.h
-f:drivers/media/pci/solo6x10/Kconfig
-f:drivers/media/pci/solo6x10/Makefile
-f:drivers/media/pci/solo6x10/solo6x10-core.c
-f:drivers/media/pci/solo6x10/solo6x10-disp.c
-f:drivers/media/pci/solo6x10/solo6x10-eeprom.c
-f:drivers/media/pci/solo6x10/solo6x10-enc.c
-f:drivers/media/pci/solo6x10/solo6x10-g723.c
-f:drivers/media/pci/solo6x10/solo6x10-gpio.c
-f:drivers/media/pci/solo6x10/solo6x10-i2c.c
-f:drivers/media/pci/solo6x10/solo6x10-jpeg.h
-f:drivers/media/pci/solo6x10/solo6x10-offsets.h
-f:drivers/media/pci/solo6x10/solo6x10-p2m.c
-f:drivers/media/pci/solo6x10/solo6x10-regs.h
-f:drivers/media/pci/solo6x10/solo6x10-tw28.c
-f:drivers/media/pci/solo6x10/solo6x10-tw28.h
-f:drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
-f:drivers/media/pci/solo6x10/solo6x10-v4l2.c
-f:drivers/media/pci/solo6x10/solo6x10.h
-f:drivers/media/pci/ttpci/Kconfig
-f:drivers/media/pci/ttpci/Makefile
-f:drivers/media/pci/ttpci/budget-av.c
-f:drivers/media/pci/ttpci/budget-ci.c
-f:drivers/media/pci/ttpci/budget-core.c
-f:drivers/media/pci/ttpci/budget.c
-f:drivers/media/pci/ttpci/budget.h
-f:drivers/media/pci/tw5864/Kconfig
-f:drivers/media/pci/tw5864/Makefile
-f:drivers/media/pci/tw5864/tw5864-core.c
-f:drivers/media/pci/tw5864/tw5864-h264.c
-f:drivers/media/pci/tw5864/tw5864-reg.h
-f:drivers/media/pci/tw5864/tw5864-util.c
-f:drivers/media/pci/tw5864/tw5864-video.c
-f:drivers/media/pci/tw5864/tw5864.h
-f:drivers/media/pci/tw68/Kconfig
-f:drivers/media/pci/tw68/Makefile
-f:drivers/media/pci/tw68/tw68-core.c
-f:drivers/media/pci/tw68/tw68-reg.h
-f:drivers/media/pci/tw68/tw68-risc.c
-f:drivers/media/pci/tw68/tw68-video.c
-f:drivers/media/pci/tw68/tw68.h
-f:drivers/media/pci/tw686x/Kconfig
-f:drivers/media/pci/tw686x/Makefile
-f:drivers/media/pci/tw686x/tw686x-audio.c
-f:drivers/media/pci/tw686x/tw686x-core.c
-f:drivers/media/pci/tw686x/tw686x-regs.h
-f:drivers/media/pci/tw686x/tw686x-video.c
-f:drivers/media/pci/tw686x/tw686x.h
-f:drivers/media/pci/zoran/Kconfig
-f:drivers/media/pci/zoran/Makefile
-f:drivers/media/pci/zoran/videocodec.c
-f:drivers/media/pci/zoran/videocodec.h
-f:drivers/media/pci/zoran/zoran.h
-f:drivers/media/pci/zoran/zoran_card.c
-f:drivers/media/pci/zoran/zoran_card.h
-f:drivers/media/pci/zoran/zoran_device.c
-f:drivers/media/pci/zoran/zoran_device.h
-f:drivers/media/pci/zoran/zoran_driver.c
-f:drivers/media/pci/zoran/zr36016.c
-f:drivers/media/pci/zoran/zr36016.h
-f:drivers/media/pci/zoran/zr36050.c
-f:drivers/media/pci/zoran/zr36050.h
-f:drivers/media/pci/zoran/zr36057.h
-f:drivers/media/pci/zoran/zr36060.c
-f:drivers/media/pci/zoran/zr36060.h
-f:drivers/media/platform/Kconfig
-f:drivers/media/platform/Makefile
-f:drivers/media/platform/allegro-dvt/Kconfig
-f:drivers/media/platform/allegro-dvt/Makefile
-f:drivers/media/platform/allegro-dvt/allegro-core.c
-f:drivers/media/platform/allegro-dvt/allegro-mail.c
-f:drivers/media/platform/allegro-dvt/allegro-mail.h
-f:drivers/media/platform/allegro-dvt/nal-h264.c
-f:drivers/media/platform/allegro-dvt/nal-h264.h
-f:drivers/media/platform/allegro-dvt/nal-hevc.c
-f:drivers/media/platform/allegro-dvt/nal-hevc.h
-f:drivers/media/platform/allegro-dvt/nal-rbsp.c
-f:drivers/media/platform/allegro-dvt/nal-rbsp.h
-f:drivers/media/platform/amlogic/Kconfig
-f:drivers/media/platform/amlogic/Makefile
-f:drivers/media/platform/amlogic/c3/Kconfig
-f:drivers/media/platform/amlogic/c3/Makefile
-f:drivers/media/platform/amlogic/c3/isp/Kconfig
-f:drivers/media/platform/amlogic/c3/isp/Makefile
-f:drivers/media/platform/amlogic/c3/isp/c3-isp-capture.c
-f:drivers/media/platform/amlogic/c3/isp/c3-isp-common.h
-f:drivers/media/platform/amlogic/c3/isp/c3-isp-core.c
-f:drivers/media/platform/amlogic/c3/isp/c3-isp-dev.c
-f:drivers/media/platform/amlogic/c3/isp/c3-isp-params.c
-f:drivers/media/platform/amlogic/c3/isp/c3-isp-regs.h
-f:drivers/media/platform/amlogic/c3/isp/c3-isp-resizer.c
-f:drivers/media/platform/amlogic/c3/isp/c3-isp-stats.c
-f:drivers/media/platform/amlogic/c3/mipi-adapter/Kconfig
-f:drivers/media/platform/amlogic/c3/mipi-adapter/Makefile
-f:drivers/media/platform/amlogic/c3/mipi-adapter/c3-mipi-adap.c
-f:drivers/media/platform/amlogic/c3/mipi-csi2/Kconfig
-f:drivers/media/platform/amlogic/c3/mipi-csi2/Makefile
-f:drivers/media/platform/amlogic/c3/mipi-csi2/c3-mipi-csi2.c
-f:drivers/media/platform/amlogic/meson-ge2d/Kconfig
-f:drivers/media/platform/amlogic/meson-ge2d/Makefile
-f:drivers/media/platform/amlogic/meson-ge2d/ge2d-regs.h
-f:drivers/media/platform/amlogic/meson-ge2d/ge2d.c
-f:drivers/media/platform/amphion/Kconfig
-f:drivers/media/platform/amphion/Makefile
-f:drivers/media/platform/amphion/vdec.c
-f:drivers/media/platform/amphion/venc.c
-f:drivers/media/platform/amphion/vpu.h
-f:drivers/media/platform/amphion/vpu_cmds.c
-f:drivers/media/platform/amphion/vpu_cmds.h
-f:drivers/media/platform/amphion/vpu_codec.h
-f:drivers/media/platform/amphion/vpu_color.c
-f:drivers/media/platform/amphion/vpu_core.c
-f:drivers/media/platform/amphion/vpu_core.h
-f:drivers/media/platform/amphion/vpu_dbg.c
-f:drivers/media/platform/amphion/vpu_defs.h
-f:drivers/media/platform/amphion/vpu_drv.c
-f:drivers/media/platform/amphion/vpu_helpers.c
-f:drivers/media/platform/amphion/vpu_helpers.h
-f:drivers/media/platform/amphion/vpu_imx8q.c
-f:drivers/media/platform/amphion/vpu_imx8q.h
-f:drivers/media/platform/amphion/vpu_malone.c
-f:drivers/media/platform/amphion/vpu_malone.h
-f:drivers/media/platform/amphion/vpu_mbox.c
-f:drivers/media/platform/amphion/vpu_mbox.h
-f:drivers/media/platform/amphion/vpu_msgs.c
-f:drivers/media/platform/amphion/vpu_msgs.h
-f:drivers/media/platform/amphion/vpu_rpc.c
-f:drivers/media/platform/amphion/vpu_rpc.h
-f:drivers/media/platform/amphion/vpu_v4l2.c
-f:drivers/media/platform/amphion/vpu_v4l2.h
-f:drivers/media/platform/amphion/vpu_windsor.c
-f:drivers/media/platform/amphion/vpu_windsor.h
-f:drivers/media/platform/aspeed/Kconfig
-f:drivers/media/platform/aspeed/Makefile
-f:drivers/media/platform/aspeed/aspeed-video.c
-f:drivers/media/platform/atmel/Kconfig
-f:drivers/media/platform/atmel/Makefile
-f:drivers/media/platform/atmel/atmel-isi.c
-f:drivers/media/platform/atmel/atmel-isi.h
-f:drivers/media/platform/broadcom/Kconfig
-f:drivers/media/platform/broadcom/Makefile
-f:drivers/media/platform/broadcom/bcm2835-unicam-regs.h
-f:drivers/media/platform/broadcom/bcm2835-unicam.c
-f:drivers/media/platform/cadence/Kconfig
-f:drivers/media/platform/cadence/Makefile
-f:drivers/media/platform/cadence/cdns-csi2rx.c
-f:drivers/media/platform/cadence/cdns-csi2tx.c
-f:drivers/media/platform/chips-media/Kconfig
-f:drivers/media/platform/chips-media/Makefile
-f:drivers/media/platform/chips-media/coda/Kconfig
-f:drivers/media/platform/chips-media/coda/Makefile
-f:drivers/media/platform/chips-media/coda/coda-bit.c
-f:drivers/media/platform/chips-media/coda/coda-common.c
-f:drivers/media/platform/chips-media/coda/coda-gdi.c
-f:drivers/media/platform/chips-media/coda/coda-h264.c
-f:drivers/media/platform/chips-media/coda/coda-jpeg.c
-f:drivers/media/platform/chips-media/coda/coda-mpeg2.c
-f:drivers/media/platform/chips-media/coda/coda-mpeg4.c
-f:drivers/media/platform/chips-media/coda/coda.h
-f:drivers/media/platform/chips-media/coda/coda_regs.h
-f:drivers/media/platform/chips-media/coda/imx-vdoa.c
-f:drivers/media/platform/chips-media/coda/imx-vdoa.h
-f:drivers/media/platform/chips-media/coda/trace.h
-f:drivers/media/platform/chips-media/wave5/Kconfig
-f:drivers/media/platform/chips-media/wave5/Makefile
-f:drivers/media/platform/chips-media/wave5/wave5-helper.c
-f:drivers/media/platform/chips-media/wave5/wave5-helper.h
-f:drivers/media/platform/chips-media/wave5/wave5-hw.c
-f:drivers/media/platform/chips-media/wave5/wave5-regdefine.h
-f:drivers/media/platform/chips-media/wave5/wave5-vdi.c
-f:drivers/media/platform/chips-media/wave5/wave5-vdi.h
-f:drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c
-f:drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c
-f:drivers/media/platform/chips-media/wave5/wave5-vpu.c
-f:drivers/media/platform/chips-media/wave5/wave5-vpu.h
-f:drivers/media/platform/chips-media/wave5/wave5-vpuapi.c
-f:drivers/media/platform/chips-media/wave5/wave5-vpuapi.h
-f:drivers/media/platform/chips-media/wave5/wave5-vpuconfig.h
-f:drivers/media/platform/chips-media/wave5/wave5-vpuerror.h
-f:drivers/media/platform/chips-media/wave5/wave5.h
-f:drivers/media/platform/imagination/Kconfig
-f:drivers/media/platform/imagination/Makefile
-f:drivers/media/platform/imagination/e5010-core-regs.h
-f:drivers/media/platform/imagination/e5010-jpeg-enc-hw.c
-f:drivers/media/platform/imagination/e5010-jpeg-enc-hw.h
-f:drivers/media/platform/imagination/e5010-jpeg-enc.c
-f:drivers/media/platform/imagination/e5010-jpeg-enc.h
-f:drivers/media/platform/imagination/e5010-mmu-regs.h
-f:drivers/media/platform/intel/Kconfig
-f:drivers/media/platform/intel/Makefile
-f:drivers/media/platform/intel/pxa_camera.c
-f:drivers/media/platform/m2m-deinterlace.c
-f:drivers/media/platform/marvell/Kconfig
-f:drivers/media/platform/marvell/Makefile
-f:drivers/media/platform/marvell/cafe-driver.c
-f:drivers/media/platform/marvell/mcam-core.c
-f:drivers/media/platform/marvell/mcam-core.h
-f:drivers/media/platform/marvell/mmp-driver.c
-f:drivers/media/platform/mediatek/Kconfig
-f:drivers/media/platform/mediatek/Makefile
-f:drivers/media/platform/mediatek/jpeg/Kconfig
-f:drivers/media/platform/mediatek/jpeg/Makefile
-f:drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
-f:drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h
-f:drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c
-f:drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.h
-f:drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.c
-f:drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.h
-f:drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_reg.h
-f:drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c
-f:drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.h
-f:drivers/media/platform/mediatek/mdp/Kconfig
-f:drivers/media/platform/mediatek/mdp/Makefile
-f:drivers/media/platform/mediatek/mdp/mtk_mdp_comp.c
-f:drivers/media/platform/mediatek/mdp/mtk_mdp_comp.h
-f:drivers/media/platform/mediatek/mdp/mtk_mdp_core.c
-f:drivers/media/platform/mediatek/mdp/mtk_mdp_core.h
-f:drivers/media/platform/mediatek/mdp/mtk_mdp_ipi.h
-f:drivers/media/platform/mediatek/mdp/mtk_mdp_m2m.c
-f:drivers/media/platform/mediatek/mdp/mtk_mdp_m2m.h
-f:drivers/media/platform/mediatek/mdp/mtk_mdp_regs.c
-f:drivers/media/platform/mediatek/mdp/mtk_mdp_regs.h
-f:drivers/media/platform/mediatek/mdp/mtk_mdp_vpu.c
-f:drivers/media/platform/mediatek/mdp/mtk_mdp_vpu.h
-f:drivers/media/platform/mediatek/mdp3/Kconfig
-f:drivers/media/platform/mediatek/mdp3/Makefile
-f:drivers/media/platform/mediatek/mdp3/mdp_cfg_data.c
-f:drivers/media/platform/mediatek/mdp3/mdp_reg_aal.h
-f:drivers/media/platform/mediatek/mdp3/mdp_reg_ccorr.h
-f:drivers/media/platform/mediatek/mdp3/mdp_reg_color.h
-f:drivers/media/platform/mediatek/mdp3/mdp_reg_fg.h
-f:drivers/media/platform/mediatek/mdp3/mdp_reg_hdr.h
-f:drivers/media/platform/mediatek/mdp3/mdp_reg_merge.h
-f:drivers/media/platform/mediatek/mdp3/mdp_reg_ovl.h
-f:drivers/media/platform/mediatek/mdp3/mdp_reg_pad.h
-f:drivers/media/platform/mediatek/mdp3/mdp_reg_rdma.h
-f:drivers/media/platform/mediatek/mdp3/mdp_reg_rsz.h
-f:drivers/media/platform/mediatek/mdp3/mdp_reg_tdshp.h
-f:drivers/media/platform/mediatek/mdp3/mdp_reg_wdma.h
-f:drivers/media/platform/mediatek/mdp3/mdp_reg_wrot.h
-f:drivers/media/platform/mediatek/mdp3/mdp_sm_mt8183.h
-f:drivers/media/platform/mediatek/mdp3/mdp_sm_mt8195.h
-f:drivers/media/platform/mediatek/mdp3/mtk-img-ipi.h
-f:drivers/media/platform/mediatek/mdp3/mtk-mdp3-cfg.h
-f:drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c
-f:drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.h
-f:drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.c
-f:drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.h
-f:drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.c
-f:drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.h
-f:drivers/media/platform/mediatek/mdp3/mtk-mdp3-m2m.c
-f:drivers/media/platform/mediatek/mdp3/mtk-mdp3-m2m.h
-f:drivers/media/platform/mediatek/mdp3/mtk-mdp3-regs.c
-f:drivers/media/platform/mediatek/mdp3/mtk-mdp3-regs.h
-f:drivers/media/platform/mediatek/mdp3/mtk-mdp3-type.h
-f:drivers/media/platform/mediatek/mdp3/mtk-mdp3-vpu.c
-f:drivers/media/platform/mediatek/mdp3/mtk-mdp3-vpu.h
-f:drivers/media/platform/mediatek/vcodec/Kconfig
-f:drivers/media/platform/mediatek/vcodec/Makefile
-f:drivers/media/platform/mediatek/vcodec/common/Makefile
-f:drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_cmn_drv.h
-f:drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_dbgfs.c
-f:drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_dbgfs.h
-f:drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw.c
-f:drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw.h
-f:drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw_priv.h
-f:drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw_scp.c
-f:drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw_vpu.c
-f:drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_intr.c
-f:drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_intr.h
-f:drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_util.c
-f:drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_util.h
-f:drivers/media/platform/mediatek/vcodec/decoder/Makefile
-f:drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec.c
-f:drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec.h
-f:drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_drv.c
-f:drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_drv.h
-f:drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_hw.c
-f:drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_hw.h
-f:drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_pm.c
-f:drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_pm.h
-f:drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_stateful.c
-f:drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_stateless.c
-f:drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_av1_req_lat_if.c
-f:drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_h264_if.c
-f:drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_h264_req_common.c
-f:drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_h264_req_common.h
-f:drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_h264_req_if.c
-f:drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_h264_req_multi_if.c
-f:drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_hevc_req_multi_if.c
-f:drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp8_if.c
-f:drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp8_req_if.c
-f:drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_if.c
-f:drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c
-f:drivers/media/platform/mediatek/vcodec/decoder/vdec_drv_base.h
-f:drivers/media/platform/mediatek/vcodec/decoder/vdec_drv_if.c
-f:drivers/media/platform/mediatek/vcodec/decoder/vdec_drv_if.h
-f:drivers/media/platform/mediatek/vcodec/decoder/vdec_ipi_msg.h
-f:drivers/media/platform/mediatek/vcodec/decoder/vdec_msg_queue.c
-f:drivers/media/platform/mediatek/vcodec/decoder/vdec_msg_queue.h
-f:drivers/media/platform/mediatek/vcodec/decoder/vdec_vpu_if.c
-f:drivers/media/platform/mediatek/vcodec/decoder/vdec_vpu_if.h
-f:drivers/media/platform/mediatek/vcodec/encoder/Makefile
-f:drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c
-f:drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.h
-f:drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_drv.c
-f:drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_drv.h
-f:drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_pm.c
-f:drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_pm.h
-f:drivers/media/platform/mediatek/vcodec/encoder/venc/venc_h264_if.c
-f:drivers/media/platform/mediatek/vcodec/encoder/venc/venc_vp8_if.c
-f:drivers/media/platform/mediatek/vcodec/encoder/venc_drv_base.h
-f:drivers/media/platform/mediatek/vcodec/encoder/venc_drv_if.c
-f:drivers/media/platform/mediatek/vcodec/encoder/venc_drv_if.h
-f:drivers/media/platform/mediatek/vcodec/encoder/venc_ipi_msg.h
-f:drivers/media/platform/mediatek/vcodec/encoder/venc_vpu_if.c
-f:drivers/media/platform/mediatek/vcodec/encoder/venc_vpu_if.h
-f:drivers/media/platform/mediatek/vpu/Kconfig
-f:drivers/media/platform/mediatek/vpu/Makefile
-f:drivers/media/platform/mediatek/vpu/mtk_vpu.c
-f:drivers/media/platform/mediatek/vpu/mtk_vpu.h
-f:drivers/media/platform/microchip/Kconfig
-f:drivers/media/platform/microchip/Makefile
-f:drivers/media/platform/microchip/microchip-csi2dc.c
-f:drivers/media/platform/microchip/microchip-isc-base.c
-f:drivers/media/platform/microchip/microchip-isc-clk.c
-f:drivers/media/platform/microchip/microchip-isc-regs.h
-f:drivers/media/platform/microchip/microchip-isc-scaler.c
-f:drivers/media/platform/microchip/microchip-isc.h
-f:drivers/media/platform/microchip/microchip-sama5d2-isc.c
-f:drivers/media/platform/microchip/microchip-sama7g5-isc.c
-f:drivers/media/platform/nuvoton/Kconfig
-f:drivers/media/platform/nuvoton/Makefile
-f:drivers/media/platform/nuvoton/npcm-regs.h
-f:drivers/media/platform/nuvoton/npcm-video.c
-f:drivers/media/platform/nvidia/Kconfig
-f:drivers/media/platform/nvidia/Makefile
-f:drivers/media/platform/nvidia/tegra-vde/Kconfig
-f:drivers/media/platform/nvidia/tegra-vde/Makefile
-f:drivers/media/platform/nvidia/tegra-vde/dmabuf-cache.c
-f:drivers/media/platform/nvidia/tegra-vde/h264.c
-f:drivers/media/platform/nvidia/tegra-vde/iommu.c
-f:drivers/media/platform/nvidia/tegra-vde/trace.h
-f:drivers/media/platform/nvidia/tegra-vde/v4l2.c
-f:drivers/media/platform/nvidia/tegra-vde/vde.c
-f:drivers/media/platform/nvidia/tegra-vde/vde.h
-f:drivers/media/platform/nxp/Kconfig
-f:drivers/media/platform/nxp/Makefile
-f:drivers/media/platform/nxp/dw100/Kconfig
-f:drivers/media/platform/nxp/dw100/Makefile
-f:drivers/media/platform/nxp/dw100/dw100.c
-f:drivers/media/platform/nxp/dw100/dw100_regs.h
-f:drivers/media/platform/nxp/imx-jpeg/Kconfig
-f:drivers/media/platform/nxp/imx-jpeg/Makefile
-f:drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.c
-f:drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.h
-f:drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
-f:drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.h
-f:drivers/media/platform/nxp/imx-mipi-csis.c
-f:drivers/media/platform/nxp/imx-pxp.c
-f:drivers/media/platform/nxp/imx-pxp.h
-f:drivers/media/platform/nxp/imx7-media-csi.c
-f:drivers/media/platform/nxp/imx8-isi/Kconfig
-f:drivers/media/platform/nxp/imx8-isi/Makefile
-f:drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c
-f:drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h
-f:drivers/media/platform/nxp/imx8-isi/imx8-isi-crossbar.c
-f:drivers/media/platform/nxp/imx8-isi/imx8-isi-debug.c
-f:drivers/media/platform/nxp/imx8-isi/imx8-isi-gasket.c
-f:drivers/media/platform/nxp/imx8-isi/imx8-isi-hw.c
-f:drivers/media/platform/nxp/imx8-isi/imx8-isi-m2m.c
-f:drivers/media/platform/nxp/imx8-isi/imx8-isi-pipe.c
-f:drivers/media/platform/nxp/imx8-isi/imx8-isi-regs.h
-f:drivers/media/platform/nxp/imx8-isi/imx8-isi-video.c
-f:drivers/media/platform/nxp/imx8mq-mipi-csi2.c
-f:drivers/media/platform/nxp/mx2_emmaprp.c
-f:drivers/media/platform/qcom/Kconfig
-f:drivers/media/platform/qcom/Makefile
-f:drivers/media/platform/qcom/camss/Kconfig
-f:drivers/media/platform/qcom/camss/Makefile
-f:drivers/media/platform/qcom/camss/camss-csid-4-1.c
-f:drivers/media/platform/qcom/camss/camss-csid-4-7.c
-f:drivers/media/platform/qcom/camss/camss-csid-680.c
-f:drivers/media/platform/qcom/camss/camss-csid-780.c
-f:drivers/media/platform/qcom/camss/camss-csid-780.h
-f:drivers/media/platform/qcom/camss/camss-csid-gen1.h
-f:drivers/media/platform/qcom/camss/camss-csid-gen2.c
-f:drivers/media/platform/qcom/camss/camss-csid-gen2.h
-f:drivers/media/platform/qcom/camss/camss-csid.c
-f:drivers/media/platform/qcom/camss/camss-csid.h
-f:drivers/media/platform/qcom/camss/camss-csiphy-2ph-1-0.c
-f:drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c
-f:drivers/media/platform/qcom/camss/camss-csiphy.c
-f:drivers/media/platform/qcom/camss/camss-csiphy.h
-f:drivers/media/platform/qcom/camss/camss-format.c
-f:drivers/media/platform/qcom/camss/camss-format.h
-f:drivers/media/platform/qcom/camss/camss-ispif.c
-f:drivers/media/platform/qcom/camss/camss-ispif.h
-f:drivers/media/platform/qcom/camss/camss-vfe-17x.c
-f:drivers/media/platform/qcom/camss/camss-vfe-4-1.c
-f:drivers/media/platform/qcom/camss/camss-vfe-4-7.c
-f:drivers/media/platform/qcom/camss/camss-vfe-4-8.c
-f:drivers/media/platform/qcom/camss/camss-vfe-480.c
-f:drivers/media/platform/qcom/camss/camss-vfe-680.c
-f:drivers/media/platform/qcom/camss/camss-vfe-780.c
-f:drivers/media/platform/qcom/camss/camss-vfe-gen1.c
-f:drivers/media/platform/qcom/camss/camss-vfe-gen1.h
-f:drivers/media/platform/qcom/camss/camss-vfe.c
-f:drivers/media/platform/qcom/camss/camss-vfe.h
-f:drivers/media/platform/qcom/camss/camss-video.c
-f:drivers/media/platform/qcom/camss/camss-video.h
-f:drivers/media/platform/qcom/camss/camss.c
-f:drivers/media/platform/qcom/camss/camss.h
-f:drivers/media/platform/qcom/iris/Kconfig
-f:drivers/media/platform/qcom/iris/Makefile
-f:drivers/media/platform/qcom/iris/iris_buffer.c
-f:drivers/media/platform/qcom/iris/iris_buffer.h
-f:drivers/media/platform/qcom/iris/iris_core.c
-f:drivers/media/platform/qcom/iris/iris_core.h
-f:drivers/media/platform/qcom/iris/iris_ctrls.c
-f:drivers/media/platform/qcom/iris/iris_ctrls.h
-f:drivers/media/platform/qcom/iris/iris_firmware.c
-f:drivers/media/platform/qcom/iris/iris_firmware.h
-f:drivers/media/platform/qcom/iris/iris_hfi_common.c
-f:drivers/media/platform/qcom/iris/iris_hfi_common.h
-f:drivers/media/platform/qcom/iris/iris_hfi_gen1.h
-f:drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c
-f:drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h
-f:drivers/media/platform/qcom/iris/iris_hfi_gen1_response.c
-f:drivers/media/platform/qcom/iris/iris_hfi_gen2.h
-f:drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c
-f:drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h
-f:drivers/media/platform/qcom/iris/iris_hfi_gen2_packet.c
-f:drivers/media/platform/qcom/iris/iris_hfi_gen2_packet.h
-f:drivers/media/platform/qcom/iris/iris_hfi_gen2_response.c
-f:drivers/media/platform/qcom/iris/iris_hfi_queue.c
-f:drivers/media/platform/qcom/iris/iris_hfi_queue.h
-f:drivers/media/platform/qcom/iris/iris_instance.h
-f:drivers/media/platform/qcom/iris/iris_platform_common.h
-f:drivers/media/platform/qcom/iris/iris_platform_gen2.c
-f:drivers/media/platform/qcom/iris/iris_platform_qcs8300.h
-f:drivers/media/platform/qcom/iris/iris_platform_sm8250.c
-f:drivers/media/platform/qcom/iris/iris_platform_sm8650.h
-f:drivers/media/platform/qcom/iris/iris_power.c
-f:drivers/media/platform/qcom/iris/iris_power.h
-f:drivers/media/platform/qcom/iris/iris_probe.c
-f:drivers/media/platform/qcom/iris/iris_resources.c
-f:drivers/media/platform/qcom/iris/iris_resources.h
-f:drivers/media/platform/qcom/iris/iris_state.c
-f:drivers/media/platform/qcom/iris/iris_state.h
-f:drivers/media/platform/qcom/iris/iris_utils.c
-f:drivers/media/platform/qcom/iris/iris_utils.h
-f:drivers/media/platform/qcom/iris/iris_vb2.c
-f:drivers/media/platform/qcom/iris/iris_vb2.h
-f:drivers/media/platform/qcom/iris/iris_vdec.c
-f:drivers/media/platform/qcom/iris/iris_vdec.h
-f:drivers/media/platform/qcom/iris/iris_vidc.c
-f:drivers/media/platform/qcom/iris/iris_vidc.h
-f:drivers/media/platform/qcom/iris/iris_vpu2.c
-f:drivers/media/platform/qcom/iris/iris_vpu3x.c
-f:drivers/media/platform/qcom/iris/iris_vpu_buffer.c
-f:drivers/media/platform/qcom/iris/iris_vpu_buffer.h
-f:drivers/media/platform/qcom/iris/iris_vpu_common.c
-f:drivers/media/platform/qcom/iris/iris_vpu_common.h
-f:drivers/media/platform/qcom/iris/iris_vpu_register_defines.h
-f:drivers/media/platform/qcom/venus/Kconfig
-f:drivers/media/platform/qcom/venus/Makefile
-f:drivers/media/platform/qcom/venus/core.c
-f:drivers/media/platform/qcom/venus/core.h
-f:drivers/media/platform/qcom/venus/dbgfs.c
-f:drivers/media/platform/qcom/venus/dbgfs.h
-f:drivers/media/platform/qcom/venus/firmware.c
-f:drivers/media/platform/qcom/venus/firmware.h
-f:drivers/media/platform/qcom/venus/helpers.c
-f:drivers/media/platform/qcom/venus/helpers.h
-f:drivers/media/platform/qcom/venus/hfi.c
-f:drivers/media/platform/qcom/venus/hfi.h
-f:drivers/media/platform/qcom/venus/hfi_cmds.c
-f:drivers/media/platform/qcom/venus/hfi_cmds.h
-f:drivers/media/platform/qcom/venus/hfi_helper.h
-f:drivers/media/platform/qcom/venus/hfi_msgs.c
-f:drivers/media/platform/qcom/venus/hfi_msgs.h
-f:drivers/media/platform/qcom/venus/hfi_parser.c
-f:drivers/media/platform/qcom/venus/hfi_parser.h
-f:drivers/media/platform/qcom/venus/hfi_plat_bufs.h
-f:drivers/media/platform/qcom/venus/hfi_plat_bufs_v6.c
-f:drivers/media/platform/qcom/venus/hfi_platform.c
-f:drivers/media/platform/qcom/venus/hfi_platform.h
-f:drivers/media/platform/qcom/venus/hfi_platform_v4.c
-f:drivers/media/platform/qcom/venus/hfi_platform_v6.c
-f:drivers/media/platform/qcom/venus/hfi_venus.c
-f:drivers/media/platform/qcom/venus/hfi_venus.h
-f:drivers/media/platform/qcom/venus/hfi_venus_io.h
-f:drivers/media/platform/qcom/venus/pm_helpers.c
-f:drivers/media/platform/qcom/venus/pm_helpers.h
-f:drivers/media/platform/qcom/venus/vdec.c
-f:drivers/media/platform/qcom/venus/vdec.h
-f:drivers/media/platform/qcom/venus/vdec_ctrls.c
-f:drivers/media/platform/qcom/venus/venc.c
-f:drivers/media/platform/qcom/venus/venc.h
-f:drivers/media/platform/qcom/venus/venc_ctrls.c
-f:drivers/media/platform/raspberrypi/Kconfig
-f:drivers/media/platform/raspberrypi/Makefile
-f:drivers/media/platform/raspberrypi/pisp_be/Kconfig
-f:drivers/media/platform/raspberrypi/pisp_be/Makefile
-f:drivers/media/platform/raspberrypi/pisp_be/pisp_be.c
-f:drivers/media/platform/raspberrypi/pisp_be/pisp_be_formats.h
-f:drivers/media/platform/raspberrypi/rp1-cfe/Kconfig
-f:drivers/media/platform/raspberrypi/rp1-cfe/Makefile
-f:drivers/media/platform/raspberrypi/rp1-cfe/cfe-fmts.h
-f:drivers/media/platform/raspberrypi/rp1-cfe/cfe-trace.h
-f:drivers/media/platform/raspberrypi/rp1-cfe/cfe.c
-f:drivers/media/platform/raspberrypi/rp1-cfe/cfe.h
-f:drivers/media/platform/raspberrypi/rp1-cfe/csi2.c
-f:drivers/media/platform/raspberrypi/rp1-cfe/csi2.h
-f:drivers/media/platform/raspberrypi/rp1-cfe/dphy.c
-f:drivers/media/platform/raspberrypi/rp1-cfe/dphy.h
-f:drivers/media/platform/raspberrypi/rp1-cfe/pisp-fe.c
-f:drivers/media/platform/raspberrypi/rp1-cfe/pisp-fe.h
-f:drivers/media/platform/renesas/Kconfig
-f:drivers/media/platform/renesas/Makefile
-f:drivers/media/platform/renesas/rcar-csi2.c
-f:drivers/media/platform/renesas/rcar-fcp.c
-f:drivers/media/platform/renesas/rcar-isp/Kconfig
-f:drivers/media/platform/renesas/rcar-isp/Makefile
-f:drivers/media/platform/renesas/rcar-isp/csisp.c
-f:drivers/media/platform/renesas/rcar-vin/Kconfig
-f:drivers/media/platform/renesas/rcar-vin/Makefile
-f:drivers/media/platform/renesas/rcar-vin/rcar-core.c
-f:drivers/media/platform/renesas/rcar-vin/rcar-dma.c
-f:drivers/media/platform/renesas/rcar-vin/rcar-v4l2.c
-f:drivers/media/platform/renesas/rcar-vin/rcar-vin.h
-f:drivers/media/platform/renesas/rcar_drif.c
-f:drivers/media/platform/renesas/rcar_fdp1.c
-f:drivers/media/platform/renesas/rcar_jpu.c
-f:drivers/media/platform/renesas/renesas-ceu.c
-f:drivers/media/platform/renesas/rzg2l-cru/Kconfig
-f:drivers/media/platform/renesas/rzg2l-cru/Makefile
-f:drivers/media/platform/renesas/rzg2l-cru/rzg2l-core.c
-f:drivers/media/platform/renesas/rzg2l-cru/rzg2l-cru-regs.h
-f:drivers/media/platform/renesas/rzg2l-cru/rzg2l-cru.h
-f:drivers/media/platform/renesas/rzg2l-cru/rzg2l-csi2.c
-f:drivers/media/platform/renesas/rzg2l-cru/rzg2l-ip.c
-f:drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c
-f:drivers/media/platform/renesas/sh_vou.c
-f:drivers/media/platform/renesas/vsp1/Makefile
-f:drivers/media/platform/renesas/vsp1/vsp1.h
-f:drivers/media/platform/renesas/vsp1/vsp1_brx.c
-f:drivers/media/platform/renesas/vsp1/vsp1_brx.h
-f:drivers/media/platform/renesas/vsp1/vsp1_clu.c
-f:drivers/media/platform/renesas/vsp1/vsp1_clu.h
-f:drivers/media/platform/renesas/vsp1/vsp1_dl.c
-f:drivers/media/platform/renesas/vsp1/vsp1_dl.h
-f:drivers/media/platform/renesas/vsp1/vsp1_drm.c
-f:drivers/media/platform/renesas/vsp1/vsp1_drm.h
-f:drivers/media/platform/renesas/vsp1/vsp1_drv.c
-f:drivers/media/platform/renesas/vsp1/vsp1_entity.c
-f:drivers/media/platform/renesas/vsp1/vsp1_entity.h
-f:drivers/media/platform/renesas/vsp1/vsp1_hgo.c
-f:drivers/media/platform/renesas/vsp1/vsp1_hgo.h
-f:drivers/media/platform/renesas/vsp1/vsp1_hgt.c
-f:drivers/media/platform/renesas/vsp1/vsp1_hgt.h
-f:drivers/media/platform/renesas/vsp1/vsp1_histo.c
-f:drivers/media/platform/renesas/vsp1/vsp1_histo.h
-f:drivers/media/platform/renesas/vsp1/vsp1_hsit.c
-f:drivers/media/platform/renesas/vsp1/vsp1_hsit.h
-f:drivers/media/platform/renesas/vsp1/vsp1_iif.c
-f:drivers/media/platform/renesas/vsp1/vsp1_iif.h
-f:drivers/media/platform/renesas/vsp1/vsp1_lif.c
-f:drivers/media/platform/renesas/vsp1/vsp1_lif.h
-f:drivers/media/platform/renesas/vsp1/vsp1_lut.c
-f:drivers/media/platform/renesas/vsp1/vsp1_lut.h
-f:drivers/media/platform/renesas/vsp1/vsp1_pipe.c
-f:drivers/media/platform/renesas/vsp1/vsp1_pipe.h
-f:drivers/media/platform/renesas/vsp1/vsp1_regs.h
-f:drivers/media/platform/renesas/vsp1/vsp1_rpf.c
-f:drivers/media/platform/renesas/vsp1/vsp1_rwpf.c
-f:drivers/media/platform/renesas/vsp1/vsp1_rwpf.h
-f:drivers/media/platform/renesas/vsp1/vsp1_sru.c
-f:drivers/media/platform/renesas/vsp1/vsp1_sru.h
-f:drivers/media/platform/renesas/vsp1/vsp1_uds.c
-f:drivers/media/platform/renesas/vsp1/vsp1_uds.h
-f:drivers/media/platform/renesas/vsp1/vsp1_uif.c
-f:drivers/media/platform/renesas/vsp1/vsp1_uif.h
-f:drivers/media/platform/renesas/vsp1/vsp1_video.c
-f:drivers/media/platform/renesas/vsp1/vsp1_video.h
-f:drivers/media/platform/renesas/vsp1/vsp1_vspx.c
-f:drivers/media/platform/renesas/vsp1/vsp1_vspx.h
-f:drivers/media/platform/renesas/vsp1/vsp1_wpf.c
-f:drivers/media/platform/rockchip/Kconfig
-f:drivers/media/platform/rockchip/Makefile
-f:drivers/media/platform/rockchip/rga/Kconfig
-f:drivers/media/platform/rockchip/rga/Makefile
-f:drivers/media/platform/rockchip/rga/rga-buf.c
-f:drivers/media/platform/rockchip/rga/rga-hw.c
-f:drivers/media/platform/rockchip/rga/rga-hw.h
-f:drivers/media/platform/rockchip/rga/rga.c
-f:drivers/media/platform/rockchip/rga/rga.h
-f:drivers/media/platform/rockchip/rkisp1/Kconfig
-f:drivers/media/platform/rockchip/rkisp1/Makefile
-f:drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c
-f:drivers/media/platform/rockchip/rkisp1/rkisp1-common.c
-f:drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
-f:drivers/media/platform/rockchip/rkisp1/rkisp1-csi.c
-f:drivers/media/platform/rockchip/rkisp1/rkisp1-csi.h
-f:drivers/media/platform/rockchip/rkisp1/rkisp1-debug.c
-f:drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
-f:drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
-f:drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
-f:drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h
-f:drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c
-f:drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c
-f:drivers/media/platform/rockchip/rkvdec/Kconfig
-f:drivers/media/platform/rockchip/rkvdec/Makefile
-f:drivers/media/platform/rockchip/rkvdec/rkvdec-h264.c
-f:drivers/media/platform/rockchip/rkvdec/rkvdec-regs.h
-f:drivers/media/platform/rockchip/rkvdec/rkvdec-vp9.c
-f:drivers/media/platform/rockchip/rkvdec/rkvdec.c
-f:drivers/media/platform/rockchip/rkvdec/rkvdec.h
-f:drivers/media/platform/samsung/Kconfig
-f:drivers/media/platform/samsung/Makefile
-f:drivers/media/platform/samsung/exynos-gsc/Kconfig
-f:drivers/media/platform/samsung/exynos-gsc/Makefile
-f:drivers/media/platform/samsung/exynos-gsc/gsc-core.c
-f:drivers/media/platform/samsung/exynos-gsc/gsc-core.h
-f:drivers/media/platform/samsung/exynos-gsc/gsc-m2m.c
-f:drivers/media/platform/samsung/exynos-gsc/gsc-regs.c
-f:drivers/media/platform/samsung/exynos-gsc/gsc-regs.h
-f:drivers/media/platform/samsung/exynos4-is/Kconfig
-f:drivers/media/platform/samsung/exynos4-is/Makefile
-f:drivers/media/platform/samsung/exynos4-is/common.c
-f:drivers/media/platform/samsung/exynos4-is/common.h
-f:drivers/media/platform/samsung/exynos4-is/fimc-capture.c
-f:drivers/media/platform/samsung/exynos4-is/fimc-core.c
-f:drivers/media/platform/samsung/exynos4-is/fimc-core.h
-f:drivers/media/platform/samsung/exynos4-is/fimc-is-command.h
-f:drivers/media/platform/samsung/exynos4-is/fimc-is-errno.c
-f:drivers/media/platform/samsung/exynos4-is/fimc-is-errno.h
-f:drivers/media/platform/samsung/exynos4-is/fimc-is-i2c.c
-f:drivers/media/platform/samsung/exynos4-is/fimc-is-i2c.h
-f:drivers/media/platform/samsung/exynos4-is/fimc-is-param.c
-f:drivers/media/platform/samsung/exynos4-is/fimc-is-param.h
-f:drivers/media/platform/samsung/exynos4-is/fimc-is-regs.c
-f:drivers/media/platform/samsung/exynos4-is/fimc-is-regs.h
-f:drivers/media/platform/samsung/exynos4-is/fimc-is-sensor.c
-f:drivers/media/platform/samsung/exynos4-is/fimc-is-sensor.h
-f:drivers/media/platform/samsung/exynos4-is/fimc-is.c
-f:drivers/media/platform/samsung/exynos4-is/fimc-is.h
-f:drivers/media/platform/samsung/exynos4-is/fimc-isp-video.c
-f:drivers/media/platform/samsung/exynos4-is/fimc-isp-video.h
-f:drivers/media/platform/samsung/exynos4-is/fimc-isp.c
-f:drivers/media/platform/samsung/exynos4-is/fimc-isp.h
-f:drivers/media/platform/samsung/exynos4-is/fimc-lite-reg.c
-f:drivers/media/platform/samsung/exynos4-is/fimc-lite-reg.h
-f:drivers/media/platform/samsung/exynos4-is/fimc-lite.c
-f:drivers/media/platform/samsung/exynos4-is/fimc-lite.h
-f:drivers/media/platform/samsung/exynos4-is/fimc-m2m.c
-f:drivers/media/platform/samsung/exynos4-is/fimc-reg.c
-f:drivers/media/platform/samsung/exynos4-is/fimc-reg.h
-f:drivers/media/platform/samsung/exynos4-is/media-dev.c
-f:drivers/media/platform/samsung/exynos4-is/media-dev.h
-f:drivers/media/platform/samsung/exynos4-is/mipi-csis.c
-f:drivers/media/platform/samsung/exynos4-is/mipi-csis.h
-f:drivers/media/platform/samsung/s3c-camif/Kconfig
-f:drivers/media/platform/samsung/s3c-camif/Makefile
-f:drivers/media/platform/samsung/s3c-camif/camif-capture.c
-f:drivers/media/platform/samsung/s3c-camif/camif-core.c
-f:drivers/media/platform/samsung/s3c-camif/camif-core.h
-f:drivers/media/platform/samsung/s3c-camif/camif-regs.c
-f:drivers/media/platform/samsung/s3c-camif/camif-regs.h
-f:drivers/media/platform/samsung/s5p-g2d/Kconfig
-f:drivers/media/platform/samsung/s5p-g2d/Makefile
-f:drivers/media/platform/samsung/s5p-g2d/g2d-hw.c
-f:drivers/media/platform/samsung/s5p-g2d/g2d-regs.h
-f:drivers/media/platform/samsung/s5p-g2d/g2d.c
-f:drivers/media/platform/samsung/s5p-g2d/g2d.h
-f:drivers/media/platform/samsung/s5p-jpeg/Kconfig
-f:drivers/media/platform/samsung/s5p-jpeg/Makefile
-f:drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c
-f:drivers/media/platform/samsung/s5p-jpeg/jpeg-core.h
-f:drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos3250.c
-f:drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos3250.h
-f:drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos4.c
-f:drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos4.h
-f:drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-s5p.c
-f:drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-s5p.h
-f:drivers/media/platform/samsung/s5p-jpeg/jpeg-regs.h
-f:drivers/media/platform/samsung/s5p-mfc/Kconfig
-f:drivers/media/platform/samsung/s5p-mfc/Makefile
-f:drivers/media/platform/samsung/s5p-mfc/regs-mfc-v10.h
-f:drivers/media/platform/samsung/s5p-mfc/regs-mfc-v12.h
-f:drivers/media/platform/samsung/s5p-mfc/regs-mfc-v6.h
-f:drivers/media/platform/samsung/s5p-mfc/regs-mfc-v7.h
-f:drivers/media/platform/samsung/s5p-mfc/regs-mfc-v8.h
-f:drivers/media/platform/samsung/s5p-mfc/regs-mfc.h
-f:drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c
-f:drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.c
-f:drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.h
-f:drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.c
-f:drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.h
-f:drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.c
-f:drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.h
-f:drivers/media/platform/samsung/s5p-mfc/s5p_mfc_common.h
-f:drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.c
-f:drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.h
-f:drivers/media/platform/samsung/s5p-mfc/s5p_mfc_debug.h
-f:drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.c
-f:drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.h
-f:drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c
-f:drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.h
-f:drivers/media/platform/samsung/s5p-mfc/s5p_mfc_intr.c
-f:drivers/media/platform/samsung/s5p-mfc/s5p_mfc_intr.h
-f:drivers/media/platform/samsung/s5p-mfc/s5p_mfc_iommu.h
-f:drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.c
-f:drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.h
-f:drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v5.c
-f:drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v5.h
-f:drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.c
-f:drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.h
-f:drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.c
-f:drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.h
-f:drivers/media/platform/st/Kconfig
-f:drivers/media/platform/st/Makefile
-f:drivers/media/platform/st/sti/Kconfig
-f:drivers/media/platform/st/sti/Makefile
-f:drivers/media/platform/st/sti/bdisp/Kconfig
-f:drivers/media/platform/st/sti/bdisp/Makefile
-f:drivers/media/platform/st/sti/bdisp/bdisp-debug.c
-f:drivers/media/platform/st/sti/bdisp/bdisp-filter.h
-f:drivers/media/platform/st/sti/bdisp/bdisp-hw.c
-f:drivers/media/platform/st/sti/bdisp/bdisp-reg.h
-f:drivers/media/platform/st/sti/bdisp/bdisp-v4l2.c
-f:drivers/media/platform/st/sti/bdisp/bdisp.h
-f:drivers/media/platform/st/sti/c8sectpfe/Kconfig
-f:drivers/media/platform/st/sti/c8sectpfe/Makefile
-f:drivers/media/platform/st/sti/c8sectpfe/c8sectpfe-common.c
-f:drivers/media/platform/st/sti/c8sectpfe/c8sectpfe-common.h
-f:drivers/media/platform/st/sti/c8sectpfe/c8sectpfe-core.c
-f:drivers/media/platform/st/sti/c8sectpfe/c8sectpfe-core.h
-f:drivers/media/platform/st/sti/c8sectpfe/c8sectpfe-debugfs.c
-f:drivers/media/platform/st/sti/c8sectpfe/c8sectpfe-debugfs.h
-f:drivers/media/platform/st/sti/c8sectpfe/c8sectpfe-dvb.c
-f:drivers/media/platform/st/sti/c8sectpfe/c8sectpfe-dvb.h
-f:drivers/media/platform/st/sti/delta/Kconfig
-f:drivers/media/platform/st/sti/delta/Makefile
-f:drivers/media/platform/st/sti/delta/delta-cfg.h
-f:drivers/media/platform/st/sti/delta/delta-debug.c
-f:drivers/media/platform/st/sti/delta/delta-debug.h
-f:drivers/media/platform/st/sti/delta/delta-ipc.c
-f:drivers/media/platform/st/sti/delta/delta-ipc.h
-f:drivers/media/platform/st/sti/delta/delta-mem.c
-f:drivers/media/platform/st/sti/delta/delta-mem.h
-f:drivers/media/platform/st/sti/delta/delta-mjpeg-dec.c
-f:drivers/media/platform/st/sti/delta/delta-mjpeg-fw.h
-f:drivers/media/platform/st/sti/delta/delta-mjpeg-hdr.c
-f:drivers/media/platform/st/sti/delta/delta-mjpeg.h
-f:drivers/media/platform/st/sti/delta/delta-v4l2.c
-f:drivers/media/platform/st/sti/delta/delta.h
-f:drivers/media/platform/st/sti/hva/Kconfig
-f:drivers/media/platform/st/sti/hva/Makefile
-f:drivers/media/platform/st/sti/hva/hva-debugfs.c
-f:drivers/media/platform/st/sti/hva/hva-h264.c
-f:drivers/media/platform/st/sti/hva/hva-hw.c
-f:drivers/media/platform/st/sti/hva/hva-hw.h
-f:drivers/media/platform/st/sti/hva/hva-mem.c
-f:drivers/media/platform/st/sti/hva/hva-mem.h
-f:drivers/media/platform/st/sti/hva/hva-v4l2.c
-f:drivers/media/platform/st/sti/hva/hva.h
-f:drivers/media/platform/st/stm32/Kconfig
-f:drivers/media/platform/st/stm32/Makefile
-f:drivers/media/platform/st/stm32/dma2d/dma2d-hw.c
-f:drivers/media/platform/st/stm32/dma2d/dma2d-regs.h
-f:drivers/media/platform/st/stm32/dma2d/dma2d.c
-f:drivers/media/platform/st/stm32/dma2d/dma2d.h
-f:drivers/media/platform/st/stm32/stm32-csi.c
-f:drivers/media/platform/st/stm32/stm32-dcmi.c
-f:drivers/media/platform/st/stm32/stm32-dcmipp/Makefile
-f:drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-bytecap.c
-f:drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-byteproc.c
-f:drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-common.c
-f:drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-common.h
-f:drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-core.c
-f:drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-input.c
-f:drivers/media/platform/sunxi/Kconfig
-f:drivers/media/platform/sunxi/Makefile
-f:drivers/media/platform/sunxi/sun4i-csi/Kconfig
-f:drivers/media/platform/sunxi/sun4i-csi/Makefile
-f:drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c
-f:drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.h
-f:drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c
-f:drivers/media/platform/sunxi/sun4i-csi/sun4i_v4l2.c
-f:drivers/media/platform/sunxi/sun6i-csi/Kconfig
-f:drivers/media/platform/sunxi/sun6i-csi/Makefile
-f:drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c
-f:drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h
-f:drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c
-f:drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.h
-f:drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c
-f:drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h
-f:drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_reg.h
-f:drivers/media/platform/sunxi/sun6i-mipi-csi2/Kconfig
-f:drivers/media/platform/sunxi/sun6i-mipi-csi2/Makefile
-f:drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c
-f:drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.h
-f:drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2_reg.h
-f:drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/Kconfig
-f:drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/Makefile
-f:drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_dphy.c
-f:drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_dphy.h
-f:drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c
-f:drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.h
-f:drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2_reg.h
-f:drivers/media/platform/sunxi/sun8i-di/Kconfig
-f:drivers/media/platform/sunxi/sun8i-di/Makefile
-f:drivers/media/platform/sunxi/sun8i-di/sun8i-di.c
-f:drivers/media/platform/sunxi/sun8i-di/sun8i-di.h
-f:drivers/media/platform/sunxi/sun8i-rotate/Kconfig
-f:drivers/media/platform/sunxi/sun8i-rotate/Makefile
-f:drivers/media/platform/sunxi/sun8i-rotate/sun8i-formats.h
-f:drivers/media/platform/sunxi/sun8i-rotate/sun8i-rotate.h
-f:drivers/media/platform/sunxi/sun8i-rotate/sun8i_formats.c
-f:drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c
-f:drivers/media/platform/synopsys/Kconfig
-f:drivers/media/platform/synopsys/Makefile
-f:drivers/media/platform/synopsys/hdmirx/Kconfig
-f:drivers/media/platform/synopsys/hdmirx/Makefile
-f:drivers/media/platform/synopsys/hdmirx/snps_hdmirx.c
-f:drivers/media/platform/synopsys/hdmirx/snps_hdmirx.h
-f:drivers/media/platform/synopsys/hdmirx/snps_hdmirx_cec.c
-f:drivers/media/platform/synopsys/hdmirx/snps_hdmirx_cec.h
-f:drivers/media/platform/ti/Kconfig
-f:drivers/media/platform/ti/Makefile
-f:drivers/media/platform/ti/am437x/Kconfig
-f:drivers/media/platform/ti/am437x/Makefile
-f:drivers/media/platform/ti/am437x/am437x-vpfe.c
-f:drivers/media/platform/ti/am437x/am437x-vpfe.h
-f:drivers/media/platform/ti/am437x/am437x-vpfe_regs.h
-f:drivers/media/platform/ti/cal/Makefile
-f:drivers/media/platform/ti/cal/cal-camerarx.c
-f:drivers/media/platform/ti/cal/cal-video.c
-f:drivers/media/platform/ti/cal/cal.c
-f:drivers/media/platform/ti/cal/cal.h
-f:drivers/media/platform/ti/cal/cal_regs.h
-f:drivers/media/platform/ti/davinci/Kconfig
-f:drivers/media/platform/ti/davinci/Makefile
-f:drivers/media/platform/ti/davinci/vpif.c
-f:drivers/media/platform/ti/davinci/vpif.h
-f:drivers/media/platform/ti/davinci/vpif_capture.c
-f:drivers/media/platform/ti/davinci/vpif_capture.h
-f:drivers/media/platform/ti/davinci/vpif_display.c
-f:drivers/media/platform/ti/davinci/vpif_display.h
-f:drivers/media/platform/ti/j721e-csi2rx/Makefile
-f:drivers/media/platform/ti/j721e-csi2rx/j721e-csi2rx.c
-f:drivers/media/platform/ti/omap/Kconfig
-f:drivers/media/platform/ti/omap/Makefile
-f:drivers/media/platform/ti/omap/omap_vout.c
-f:drivers/media/platform/ti/omap/omap_vout_vrfb.c
-f:drivers/media/platform/ti/omap/omap_vout_vrfb.h
-f:drivers/media/platform/ti/omap/omap_voutdef.h
-f:drivers/media/platform/ti/omap/omap_voutlib.c
-f:drivers/media/platform/ti/omap/omap_voutlib.h
-f:drivers/media/platform/ti/omap3isp/Kconfig
-f:drivers/media/platform/ti/omap3isp/Makefile
-f:drivers/media/platform/ti/omap3isp/cfa_coef_table.h
-f:drivers/media/platform/ti/omap3isp/gamma_table.h
-f:drivers/media/platform/ti/omap3isp/isp.c
-f:drivers/media/platform/ti/omap3isp/isp.h
-f:drivers/media/platform/ti/omap3isp/ispccdc.c
-f:drivers/media/platform/ti/omap3isp/ispccdc.h
-f:drivers/media/platform/ti/omap3isp/ispccp2.c
-f:drivers/media/platform/ti/omap3isp/ispccp2.h
-f:drivers/media/platform/ti/omap3isp/ispcsi2.c
-f:drivers/media/platform/ti/omap3isp/ispcsi2.h
-f:drivers/media/platform/ti/omap3isp/ispcsiphy.c
-f:drivers/media/platform/ti/omap3isp/ispcsiphy.h
-f:drivers/media/platform/ti/omap3isp/isph3a.h
-f:drivers/media/platform/ti/omap3isp/isph3a_aewb.c
-f:drivers/media/platform/ti/omap3isp/isph3a_af.c
-f:drivers/media/platform/ti/omap3isp/isphist.c
-f:drivers/media/platform/ti/omap3isp/isphist.h
-f:drivers/media/platform/ti/omap3isp/isppreview.c
-f:drivers/media/platform/ti/omap3isp/isppreview.h
-f:drivers/media/platform/ti/omap3isp/ispreg.h
-f:drivers/media/platform/ti/omap3isp/ispresizer.c
-f:drivers/media/platform/ti/omap3isp/ispresizer.h
-f:drivers/media/platform/ti/omap3isp/ispstat.c
-f:drivers/media/platform/ti/omap3isp/ispstat.h
-f:drivers/media/platform/ti/omap3isp/ispvideo.c
-f:drivers/media/platform/ti/omap3isp/ispvideo.h
-f:drivers/media/platform/ti/omap3isp/luma_enhance_table.h
-f:drivers/media/platform/ti/omap3isp/noise_filter_table.h
-f:drivers/media/platform/ti/omap3isp/omap3isp.h
-f:drivers/media/platform/ti/vpe/Makefile
-f:drivers/media/platform/ti/vpe/csc.c
-f:drivers/media/platform/ti/vpe/csc.h
-f:drivers/media/platform/ti/vpe/sc.c
-f:drivers/media/platform/ti/vpe/sc.h
-f:drivers/media/platform/ti/vpe/sc_coeff.h
-f:drivers/media/platform/ti/vpe/vpdma.c
-f:drivers/media/platform/ti/vpe/vpdma.h
-f:drivers/media/platform/ti/vpe/vpdma_priv.h
-f:drivers/media/platform/ti/vpe/vpe.c
-f:drivers/media/platform/ti/vpe/vpe_regs.h
-f:drivers/media/platform/verisilicon/Kconfig
-f:drivers/media/platform/verisilicon/Makefile
-f:drivers/media/platform/verisilicon/hantro.h
-f:drivers/media/platform/verisilicon/hantro_drv.c
-f:drivers/media/platform/verisilicon/hantro_g1.c
-f:drivers/media/platform/verisilicon/hantro_g1_h264_dec.c
-f:drivers/media/platform/verisilicon/hantro_g1_mpeg2_dec.c
-f:drivers/media/platform/verisilicon/hantro_g1_regs.h
-f:drivers/media/platform/verisilicon/hantro_g1_vp8_dec.c
-f:drivers/media/platform/verisilicon/hantro_g2.c
-f:drivers/media/platform/verisilicon/hantro_g2_hevc_dec.c
-f:drivers/media/platform/verisilicon/hantro_g2_regs.h
-f:drivers/media/platform/verisilicon/hantro_g2_vp9_dec.c
-f:drivers/media/platform/verisilicon/hantro_h1_jpeg_enc.c
-f:drivers/media/platform/verisilicon/hantro_h1_regs.h
-f:drivers/media/platform/verisilicon/hantro_h264.c
-f:drivers/media/platform/verisilicon/hantro_hevc.c
-f:drivers/media/platform/verisilicon/hantro_hw.h
-f:drivers/media/platform/verisilicon/hantro_jpeg.c
-f:drivers/media/platform/verisilicon/hantro_jpeg.h
-f:drivers/media/platform/verisilicon/hantro_mpeg2.c
-f:drivers/media/platform/verisilicon/hantro_postproc.c
-f:drivers/media/platform/verisilicon/hantro_v4l2.c
-f:drivers/media/platform/verisilicon/hantro_v4l2.h
-f:drivers/media/platform/verisilicon/hantro_vp8.c
-f:drivers/media/platform/verisilicon/hantro_vp9.c
-f:drivers/media/platform/verisilicon/hantro_vp9.h
-f:drivers/media/platform/verisilicon/imx8m_vpu_hw.c
-f:drivers/media/platform/verisilicon/rockchip_av1_entropymode.c
-f:drivers/media/platform/verisilicon/rockchip_av1_entropymode.h
-f:drivers/media/platform/verisilicon/rockchip_av1_filmgrain.c
-f:drivers/media/platform/verisilicon/rockchip_av1_filmgrain.h
-f:drivers/media/platform/verisilicon/rockchip_vpu2_hw_h264_dec.c
-f:drivers/media/platform/verisilicon/rockchip_vpu2_hw_jpeg_enc.c
-f:drivers/media/platform/verisilicon/rockchip_vpu2_hw_mpeg2_dec.c
-f:drivers/media/platform/verisilicon/rockchip_vpu2_hw_vp8_dec.c
-f:drivers/media/platform/verisilicon/rockchip_vpu2_regs.h
-f:drivers/media/platform/verisilicon/rockchip_vpu981_hw_av1_dec.c
-f:drivers/media/platform/verisilicon/rockchip_vpu981_regs.h
-f:drivers/media/platform/verisilicon/rockchip_vpu_hw.c
-f:drivers/media/platform/verisilicon/sama5d4_vdec_hw.c
-f:drivers/media/platform/verisilicon/stm32mp25_vpu_hw.c
-f:drivers/media/platform/verisilicon/sunxi_vpu_hw.c
-f:drivers/media/platform/via/Kconfig
-f:drivers/media/platform/via/Makefile
-f:drivers/media/platform/via/via-camera.c
-f:drivers/media/platform/via/via-camera.h
-f:drivers/media/platform/video-mux.c
-f:drivers/media/platform/xilinx/Kconfig
-f:drivers/media/platform/xilinx/Makefile
-f:drivers/media/platform/xilinx/xilinx-csi2rxss.c
-f:drivers/media/platform/xilinx/xilinx-dma.c
-f:drivers/media/platform/xilinx/xilinx-dma.h
-f:drivers/media/platform/xilinx/xilinx-tpg.c
-f:drivers/media/platform/xilinx/xilinx-vip.c
-f:drivers/media/platform/xilinx/xilinx-vip.h
-f:drivers/media/platform/xilinx/xilinx-vipp.c
-f:drivers/media/platform/xilinx/xilinx-vipp.h
-f:drivers/media/platform/xilinx/xilinx-vtc.c
-f:drivers/media/platform/xilinx/xilinx-vtc.h
-f:drivers/media/radio/Kconfig
-f:drivers/media/radio/Makefile
-f:drivers/media/radio/dsbr100.c
-f:drivers/media/radio/lm7000.h
-f:drivers/media/radio/radio-aimslab.c
-f:drivers/media/radio/radio-aztech.c
-f:drivers/media/radio/radio-cadet.c
-f:drivers/media/radio/radio-gemtek.c
-f:drivers/media/radio/radio-isa.c
-f:drivers/media/radio/radio-isa.h
-f:drivers/media/radio/radio-keene.c
-f:drivers/media/radio/radio-ma901.c
-f:drivers/media/radio/radio-maxiradio.c
-f:drivers/media/radio/radio-miropcm20.c
-f:drivers/media/radio/radio-mr800.c
-f:drivers/media/radio/radio-raremono.c
-f:drivers/media/radio/radio-rtrack2.c
-f:drivers/media/radio/radio-sf16fmi.c
-f:drivers/media/radio/radio-sf16fmr2.c
-f:drivers/media/radio/radio-shark.c
-f:drivers/media/radio/radio-shark2.c
-f:drivers/media/radio/radio-si476x.c
-f:drivers/media/radio/radio-tea5764.c
-f:drivers/media/radio/radio-tea5777.c
-f:drivers/media/radio/radio-tea5777.h
-f:drivers/media/radio/radio-terratec.c
-f:drivers/media/radio/radio-timb.c
-f:drivers/media/radio/radio-trust.c
-f:drivers/media/radio/radio-typhoon.c
-f:drivers/media/radio/radio-wl1273.c
-f:drivers/media/radio/radio-zoltrix.c
-f:drivers/media/radio/saa7706h.c
-f:drivers/media/radio/si470x/Kconfig
-f:drivers/media/radio/si470x/Makefile
-f:drivers/media/radio/si470x/radio-si470x-common.c
-f:drivers/media/radio/si470x/radio-si470x-i2c.c
-f:drivers/media/radio/si470x/radio-si470x-usb.c
-f:drivers/media/radio/si470x/radio-si470x.h
-f:drivers/media/radio/si4713/Kconfig
-f:drivers/media/radio/si4713/Makefile
-f:drivers/media/radio/si4713/radio-platform-si4713.c
-f:drivers/media/radio/si4713/radio-usb-si4713.c
-f:drivers/media/radio/si4713/si4713.c
-f:drivers/media/radio/si4713/si4713.h
-f:drivers/media/radio/tea575x.c
-f:drivers/media/radio/tef6862.c
-f:drivers/media/rc/Kconfig
-f:drivers/media/rc/Makefile
-f:drivers/media/rc/ati_remote.c
-f:drivers/media/rc/bpf-lirc.c
-f:drivers/media/rc/ene_ir.c
-f:drivers/media/rc/ene_ir.h
-f:drivers/media/rc/fintek-cir.c
-f:drivers/media/rc/fintek-cir.h
-f:drivers/media/rc/gpio-ir-recv.c
-f:drivers/media/rc/gpio-ir-tx.c
-f:drivers/media/rc/igorplugusb.c
-f:drivers/media/rc/iguanair.c
-f:drivers/media/rc/img-ir/Kconfig
-f:drivers/media/rc/img-ir/Makefile
-f:drivers/media/rc/img-ir/img-ir-core.c
-f:drivers/media/rc/img-ir/img-ir-hw.c
-f:drivers/media/rc/img-ir/img-ir-hw.h
-f:drivers/media/rc/img-ir/img-ir-jvc.c
-f:drivers/media/rc/img-ir/img-ir-nec.c
-f:drivers/media/rc/img-ir/img-ir-raw.c
-f:drivers/media/rc/img-ir/img-ir-raw.h
-f:drivers/media/rc/img-ir/img-ir-rc5.c
-f:drivers/media/rc/img-ir/img-ir-rc6.c
-f:drivers/media/rc/img-ir/img-ir-sanyo.c
-f:drivers/media/rc/img-ir/img-ir-sharp.c
-f:drivers/media/rc/img-ir/img-ir-sony.c
-f:drivers/media/rc/img-ir/img-ir.h
-f:drivers/media/rc/imon.c
-f:drivers/media/rc/imon_raw.c
-f:drivers/media/rc/ir-hix5hd2.c
-f:drivers/media/rc/ir-imon-decoder.c
-f:drivers/media/rc/ir-jvc-decoder.c
-f:drivers/media/rc/ir-mce_kbd-decoder.c
-f:drivers/media/rc/ir-nec-decoder.c
-f:drivers/media/rc/ir-rc5-decoder.c
-f:drivers/media/rc/ir-rc6-decoder.c
-f:drivers/media/rc/ir-rcmm-decoder.c
-f:drivers/media/rc/ir-sanyo-decoder.c
-f:drivers/media/rc/ir-sharp-decoder.c
-f:drivers/media/rc/ir-sony-decoder.c
-f:drivers/media/rc/ir-spi.c
-f:drivers/media/rc/ir-xmp-decoder.c
-f:drivers/media/rc/ir_toy.c
-f:drivers/media/rc/ite-cir.c
-f:drivers/media/rc/ite-cir.h
-f:drivers/media/rc/keymaps/Kconfig
-f:drivers/media/rc/keymaps/Makefile
-f:drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c
-f:drivers/media/rc/keymaps/rc-alink-dtu-m.c
-f:drivers/media/rc/keymaps/rc-anysee.c
-f:drivers/media/rc/keymaps/rc-apac-viewcomp.c
-f:drivers/media/rc/keymaps/rc-astrometa-t2hybrid.c
-f:drivers/media/rc/keymaps/rc-asus-pc39.c
-f:drivers/media/rc/keymaps/rc-asus-ps3-100.c
-f:drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c
-f:drivers/media/rc/keymaps/rc-ati-x10.c
-f:drivers/media/rc/keymaps/rc-avermedia-a16d.c
-f:drivers/media/rc/keymaps/rc-avermedia-cardbus.c
-f:drivers/media/rc/keymaps/rc-avermedia-dvbt.c
-f:drivers/media/rc/keymaps/rc-avermedia-m135a.c
-f:drivers/media/rc/keymaps/rc-avermedia-m733a-rm-k6.c
-f:drivers/media/rc/keymaps/rc-avermedia-rm-ks.c
-f:drivers/media/rc/keymaps/rc-avermedia.c
-f:drivers/media/rc/keymaps/rc-avertv-303.c
-f:drivers/media/rc/keymaps/rc-azurewave-ad-tu700.c
-f:drivers/media/rc/keymaps/rc-beelink-gs1.c
-f:drivers/media/rc/keymaps/rc-beelink-mxiii.c
-f:drivers/media/rc/keymaps/rc-behold-columbus.c
-f:drivers/media/rc/keymaps/rc-behold.c
-f:drivers/media/rc/keymaps/rc-budget-ci-old.c
-f:drivers/media/rc/keymaps/rc-cec.c
-f:drivers/media/rc/keymaps/rc-cinergy-1400.c
-f:drivers/media/rc/keymaps/rc-cinergy.c
-f:drivers/media/rc/keymaps/rc-ct-90405.c
-f:drivers/media/rc/keymaps/rc-d680-dmb.c
-f:drivers/media/rc/keymaps/rc-delock-61959.c
-f:drivers/media/rc/keymaps/rc-dib0700-nec.c
-f:drivers/media/rc/keymaps/rc-dib0700-rc5.c
-f:drivers/media/rc/keymaps/rc-digitalnow-tinytwin.c
-f:drivers/media/rc/keymaps/rc-digittrade.c
-f:drivers/media/rc/keymaps/rc-dm1105-nec.c
-f:drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c
-f:drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.c
-f:drivers/media/rc/keymaps/rc-dreambox.c
-f:drivers/media/rc/keymaps/rc-dtt200u.c
-f:drivers/media/rc/keymaps/rc-dvbsky.c
-f:drivers/media/rc/keymaps/rc-dvico-mce.c
-f:drivers/media/rc/keymaps/rc-dvico-portable.c
-f:drivers/media/rc/keymaps/rc-em-terratec.c
-f:drivers/media/rc/keymaps/rc-encore-enltv-fm53.c
-f:drivers/media/rc/keymaps/rc-encore-enltv.c
-f:drivers/media/rc/keymaps/rc-encore-enltv2.c
-f:drivers/media/rc/keymaps/rc-evga-indtube.c
-f:drivers/media/rc/keymaps/rc-eztv.c
-f:drivers/media/rc/keymaps/rc-flydvb.c
-f:drivers/media/rc/keymaps/rc-flyvideo.c
-f:drivers/media/rc/keymaps/rc-fusionhdtv-mce.c
-f:drivers/media/rc/keymaps/rc-gadmei-rm008z.c
-f:drivers/media/rc/keymaps/rc-geekbox.c
-f:drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c
-f:drivers/media/rc/keymaps/rc-gotview7135.c
-f:drivers/media/rc/keymaps/rc-hauppauge.c
-f:drivers/media/rc/keymaps/rc-hisi-poplar.c
-f:drivers/media/rc/keymaps/rc-hisi-tv-demo.c
-f:drivers/media/rc/keymaps/rc-imon-mce.c
-f:drivers/media/rc/keymaps/rc-imon-pad.c
-f:drivers/media/rc/keymaps/rc-imon-rsc.c
-f:drivers/media/rc/keymaps/rc-iodata-bctv7e.c
-f:drivers/media/rc/keymaps/rc-it913x-v1.c
-f:drivers/media/rc/keymaps/rc-it913x-v2.c
-f:drivers/media/rc/keymaps/rc-kaiomy.c
-f:drivers/media/rc/keymaps/rc-khadas.c
-f:drivers/media/rc/keymaps/rc-khamsin.c
-f:drivers/media/rc/keymaps/rc-kworld-315u.c
-f:drivers/media/rc/keymaps/rc-kworld-pc150u.c
-f:drivers/media/rc/keymaps/rc-kworld-plus-tv-analog.c
-f:drivers/media/rc/keymaps/rc-leadtek-y04g0051.c
-f:drivers/media/rc/keymaps/rc-lme2510.c
-f:drivers/media/rc/keymaps/rc-manli.c
-f:drivers/media/rc/keymaps/rc-mecool-kii-pro.c
-f:drivers/media/rc/keymaps/rc-mecool-kiii-pro.c
-f:drivers/media/rc/keymaps/rc-medion-x10-digitainer.c
-f:drivers/media/rc/keymaps/rc-medion-x10-or2x.c
-f:drivers/media/rc/keymaps/rc-medion-x10.c
-f:drivers/media/rc/keymaps/rc-minix-neo.c
-f:drivers/media/rc/keymaps/rc-msi-digivox-ii.c
-f:drivers/media/rc/keymaps/rc-msi-digivox-iii.c
-f:drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c
-f:drivers/media/rc/keymaps/rc-msi-tvanywhere.c
-f:drivers/media/rc/keymaps/rc-mygica-utv3.c
-f:drivers/media/rc/keymaps/rc-nebula.c
-f:drivers/media/rc/keymaps/rc-nec-terratec-cinergy-xs.c
-f:drivers/media/rc/keymaps/rc-norwood.c
-f:drivers/media/rc/keymaps/rc-npgtech.c
-f:drivers/media/rc/keymaps/rc-odroid.c
-f:drivers/media/rc/keymaps/rc-pctv-sedna.c
-f:drivers/media/rc/keymaps/rc-pine64.c
-f:drivers/media/rc/keymaps/rc-pinnacle-color.c
-f:drivers/media/rc/keymaps/rc-pinnacle-grey.c
-f:drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c
-f:drivers/media/rc/keymaps/rc-pixelview-002t.c
-f:drivers/media/rc/keymaps/rc-pixelview-mk12.c
-f:drivers/media/rc/keymaps/rc-pixelview-new.c
-f:drivers/media/rc/keymaps/rc-pixelview.c
-f:drivers/media/rc/keymaps/rc-powercolor-real-angel.c
-f:drivers/media/rc/keymaps/rc-proteus-2309.c
-f:drivers/media/rc/keymaps/rc-purpletv.c
-f:drivers/media/rc/keymaps/rc-pv951.c
-f:drivers/media/rc/keymaps/rc-rc6-mce.c
-f:drivers/media/rc/keymaps/rc-real-audio-220-32-keys.c
-f:drivers/media/rc/keymaps/rc-reddo.c
-f:drivers/media/rc/keymaps/rc-siemens-gigaset-rc20.c
-f:drivers/media/rc/keymaps/rc-snapstream-firefly.c
-f:drivers/media/rc/keymaps/rc-streamzap.c
-f:drivers/media/rc/keymaps/rc-su3000.c
-f:drivers/media/rc/keymaps/rc-tanix-tx3mini.c
-f:drivers/media/rc/keymaps/rc-tanix-tx5max.c
-f:drivers/media/rc/keymaps/rc-tbs-nec.c
-f:drivers/media/rc/keymaps/rc-technisat-ts35.c
-f:drivers/media/rc/keymaps/rc-technisat-usb2.c
-f:drivers/media/rc/keymaps/rc-terratec-cinergy-c-pci.c
-f:drivers/media/rc/keymaps/rc-terratec-cinergy-s2-hd.c
-f:drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c
-f:drivers/media/rc/keymaps/rc-terratec-slim-2.c
-f:drivers/media/rc/keymaps/rc-terratec-slim.c
-f:drivers/media/rc/keymaps/rc-tevii-nec.c
-f:drivers/media/rc/keymaps/rc-tivo.c
-f:drivers/media/rc/keymaps/rc-total-media-in-hand-02.c
-f:drivers/media/rc/keymaps/rc-total-media-in-hand.c
-f:drivers/media/rc/keymaps/rc-trekstor.c
-f:drivers/media/rc/keymaps/rc-tt-1500.c
-f:drivers/media/rc/keymaps/rc-twinhan-dtv-cab-ci.c
-f:drivers/media/rc/keymaps/rc-twinhan1027.c
-f:drivers/media/rc/keymaps/rc-vega-s9x.c
-f:drivers/media/rc/keymaps/rc-videomate-m1f.c
-f:drivers/media/rc/keymaps/rc-videomate-s350.c
-f:drivers/media/rc/keymaps/rc-videomate-tv-pvr.c
-f:drivers/media/rc/keymaps/rc-videostrong-kii-pro.c
-f:drivers/media/rc/keymaps/rc-wetek-hub.c
-f:drivers/media/rc/keymaps/rc-wetek-play2.c
-f:drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.c
-f:drivers/media/rc/keymaps/rc-winfast.c
-f:drivers/media/rc/keymaps/rc-x96max.c
-f:drivers/media/rc/keymaps/rc-xbox-360.c
-f:drivers/media/rc/keymaps/rc-xbox-dvd.c
-f:drivers/media/rc/keymaps/rc-zx-irdec.c
-f:drivers/media/rc/lirc_dev.c
-f:drivers/media/rc/mceusb.c
-f:drivers/media/rc/meson-ir-tx.c
-f:drivers/media/rc/meson-ir.c
-f:drivers/media/rc/mtk-cir.c
-f:drivers/media/rc/nuvoton-cir.c
-f:drivers/media/rc/nuvoton-cir.h
-f:drivers/media/rc/pwm-ir-tx.c
-f:drivers/media/rc/rc-core-priv.h
-f:drivers/media/rc/rc-ir-raw.c
-f:drivers/media/rc/rc-loopback.c
-f:drivers/media/rc/rc-main.c
-f:drivers/media/rc/redrat3.c
-f:drivers/media/rc/serial_ir.c
-f:drivers/media/rc/st_rc.c
-f:drivers/media/rc/streamzap.c
-f:drivers/media/rc/sunxi-cir.c
-f:drivers/media/rc/ttusbir.c
-f:drivers/media/rc/winbond-cir.c
-f:drivers/media/rc/xbox_remote.c
-f:drivers/media/spi/Kconfig
-f:drivers/media/spi/Makefile
-f:drivers/media/spi/cxd2880-spi.c
-f:drivers/media/spi/gs1662.c
-f:drivers/media/test-drivers/Kconfig
-f:drivers/media/test-drivers/Makefile
-f:drivers/media/test-drivers/vicodec/Kconfig
-f:drivers/media/test-drivers/vicodec/Makefile
-f:drivers/media/test-drivers/vicodec/codec-fwht.c
-f:drivers/media/test-drivers/vicodec/codec-fwht.h
-f:drivers/media/test-drivers/vicodec/codec-v4l2-fwht.c
-f:drivers/media/test-drivers/vicodec/codec-v4l2-fwht.h
-f:drivers/media/test-drivers/vicodec/vicodec-core.c
-f:drivers/media/test-drivers/vidtv/Kconfig
-f:drivers/media/test-drivers/vidtv/Makefile
-f:drivers/media/test-drivers/vidtv/vidtv_bridge.c
-f:drivers/media/test-drivers/vidtv/vidtv_bridge.h
-f:drivers/media/test-drivers/vidtv/vidtv_channel.c
-f:drivers/media/test-drivers/vidtv/vidtv_channel.h
-f:drivers/media/test-drivers/vidtv/vidtv_common.c
-f:drivers/media/test-drivers/vidtv/vidtv_common.h
-f:drivers/media/test-drivers/vidtv/vidtv_demod.c
-f:drivers/media/test-drivers/vidtv/vidtv_demod.h
-f:drivers/media/test-drivers/vidtv/vidtv_encoder.h
-f:drivers/media/test-drivers/vidtv/vidtv_mux.c
-f:drivers/media/test-drivers/vidtv/vidtv_mux.h
-f:drivers/media/test-drivers/vidtv/vidtv_pes.c
-f:drivers/media/test-drivers/vidtv/vidtv_pes.h
-f:drivers/media/test-drivers/vidtv/vidtv_psi.c
-f:drivers/media/test-drivers/vidtv/vidtv_psi.h
-f:drivers/media/test-drivers/vidtv/vidtv_s302m.c
-f:drivers/media/test-drivers/vidtv/vidtv_s302m.h
-f:drivers/media/test-drivers/vidtv/vidtv_ts.c
-f:drivers/media/test-drivers/vidtv/vidtv_ts.h
-f:drivers/media/test-drivers/vidtv/vidtv_tuner.c
-f:drivers/media/test-drivers/vidtv/vidtv_tuner.h
-f:drivers/media/test-drivers/vim2m.c
-f:drivers/media/test-drivers/vimc/Kconfig
-f:drivers/media/test-drivers/vimc/Makefile
-f:drivers/media/test-drivers/vimc/vimc-capture.c
-f:drivers/media/test-drivers/vimc/vimc-common.c
-f:drivers/media/test-drivers/vimc/vimc-common.h
-f:drivers/media/test-drivers/vimc/vimc-core.c
-f:drivers/media/test-drivers/vimc/vimc-debayer.c
-f:drivers/media/test-drivers/vimc/vimc-lens.c
-f:drivers/media/test-drivers/vimc/vimc-scaler.c
-f:drivers/media/test-drivers/vimc/vimc-sensor.c
-f:drivers/media/test-drivers/vimc/vimc-streamer.c
-f:drivers/media/test-drivers/vimc/vimc-streamer.h
-f:drivers/media/test-drivers/visl/Kconfig
-f:drivers/media/test-drivers/visl/Makefile
-f:drivers/media/test-drivers/visl/visl-core.c
-f:drivers/media/test-drivers/visl/visl-debugfs.c
-f:drivers/media/test-drivers/visl/visl-debugfs.h
-f:drivers/media/test-drivers/visl/visl-dec.c
-f:drivers/media/test-drivers/visl/visl-dec.h
-f:drivers/media/test-drivers/visl/visl-trace-av1.h
-f:drivers/media/test-drivers/visl/visl-trace-fwht.h
-f:drivers/media/test-drivers/visl/visl-trace-h264.h
-f:drivers/media/test-drivers/visl/visl-trace-hevc.h
-f:drivers/media/test-drivers/visl/visl-trace-mpeg2.h
-f:drivers/media/test-drivers/visl/visl-trace-points.c
-f:drivers/media/test-drivers/visl/visl-trace-vp8.h
-f:drivers/media/test-drivers/visl/visl-trace-vp9.h
-f:drivers/media/test-drivers/visl/visl-video.c
-f:drivers/media/test-drivers/visl/visl-video.h
-f:drivers/media/test-drivers/visl/visl.h
-f:drivers/media/test-drivers/vivid/Kconfig
-f:drivers/media/test-drivers/vivid/Makefile
-f:drivers/media/test-drivers/vivid/vivid-cec.c
-f:drivers/media/test-drivers/vivid/vivid-cec.h
-f:drivers/media/test-drivers/vivid/vivid-core.c
-f:drivers/media/test-drivers/vivid/vivid-core.h
-f:drivers/media/test-drivers/vivid/vivid-ctrls.c
-f:drivers/media/test-drivers/vivid/vivid-ctrls.h
-f:drivers/media/test-drivers/vivid/vivid-kthread-cap.c
-f:drivers/media/test-drivers/vivid/vivid-kthread-cap.h
-f:drivers/media/test-drivers/vivid/vivid-kthread-out.c
-f:drivers/media/test-drivers/vivid/vivid-kthread-out.h
-f:drivers/media/test-drivers/vivid/vivid-kthread-touch.c
-f:drivers/media/test-drivers/vivid/vivid-kthread-touch.h
-f:drivers/media/test-drivers/vivid/vivid-meta-cap.c
-f:drivers/media/test-drivers/vivid/vivid-meta-cap.h
-f:drivers/media/test-drivers/vivid/vivid-meta-out.c
-f:drivers/media/test-drivers/vivid/vivid-meta-out.h
-f:drivers/media/test-drivers/vivid/vivid-osd.c
-f:drivers/media/test-drivers/vivid/vivid-osd.h
-f:drivers/media/test-drivers/vivid/vivid-radio-common.c
-f:drivers/media/test-drivers/vivid/vivid-radio-common.h
-f:drivers/media/test-drivers/vivid/vivid-radio-rx.c
-f:drivers/media/test-drivers/vivid/vivid-radio-rx.h
-f:drivers/media/test-drivers/vivid/vivid-radio-tx.c
-f:drivers/media/test-drivers/vivid/vivid-radio-tx.h
-f:drivers/media/test-drivers/vivid/vivid-rds-gen.c
-f:drivers/media/test-drivers/vivid/vivid-rds-gen.h
-f:drivers/media/test-drivers/vivid/vivid-sdr-cap.c
-f:drivers/media/test-drivers/vivid/vivid-sdr-cap.h
-f:drivers/media/test-drivers/vivid/vivid-touch-cap.c
-f:drivers/media/test-drivers/vivid/vivid-touch-cap.h
-f:drivers/media/test-drivers/vivid/vivid-vbi-cap.c
-f:drivers/media/test-drivers/vivid/vivid-vbi-cap.h
-f:drivers/media/test-drivers/vivid/vivid-vbi-gen.c
-f:drivers/media/test-drivers/vivid/vivid-vbi-gen.h
-f:drivers/media/test-drivers/vivid/vivid-vbi-out.c
-f:drivers/media/test-drivers/vivid/vivid-vbi-out.h
-f:drivers/media/test-drivers/vivid/vivid-vid-cap.c
-f:drivers/media/test-drivers/vivid/vivid-vid-cap.h
-f:drivers/media/test-drivers/vivid/vivid-vid-common.c
-f:drivers/media/test-drivers/vivid/vivid-vid-common.h
-f:drivers/media/test-drivers/vivid/vivid-vid-out.c
-f:drivers/media/test-drivers/vivid/vivid-vid-out.h
-f:drivers/media/tuners/Kconfig
-f:drivers/media/tuners/Makefile
-f:drivers/media/tuners/e4000.c
-f:drivers/media/tuners/e4000.h
-f:drivers/media/tuners/e4000_priv.h
-f:drivers/media/tuners/fc0011.c
-f:drivers/media/tuners/fc0011.h
-f:drivers/media/tuners/fc0012-priv.h
-f:drivers/media/tuners/fc0012.c
-f:drivers/media/tuners/fc0012.h
-f:drivers/media/tuners/fc0013-priv.h
-f:drivers/media/tuners/fc0013.c
-f:drivers/media/tuners/fc0013.h
-f:drivers/media/tuners/fc001x-common.h
-f:drivers/media/tuners/fc2580.c
-f:drivers/media/tuners/fc2580.h
-f:drivers/media/tuners/fc2580_priv.h
-f:drivers/media/tuners/it913x.c
-f:drivers/media/tuners/it913x.h
-f:drivers/media/tuners/m88rs6000t.c
-f:drivers/media/tuners/m88rs6000t.h
-f:drivers/media/tuners/max2165.c
-f:drivers/media/tuners/max2165.h
-f:drivers/media/tuners/max2165_priv.h
-f:drivers/media/tuners/mc44s803.c
-f:drivers/media/tuners/mc44s803.h
-f:drivers/media/tuners/mc44s803_priv.h
-f:drivers/media/tuners/msi001.c
-f:drivers/media/tuners/mt2060.c
-f:drivers/media/tuners/mt2060.h
-f:drivers/media/tuners/mt2060_priv.h
-f:drivers/media/tuners/mt2063.c
-f:drivers/media/tuners/mt2063.h
-f:drivers/media/tuners/mt20xx.c
-f:drivers/media/tuners/mt20xx.h
-f:drivers/media/tuners/mt2131.c
-f:drivers/media/tuners/mt2131.h
-f:drivers/media/tuners/mt2131_priv.h
-f:drivers/media/tuners/mt2266.c
-f:drivers/media/tuners/mt2266.h
-f:drivers/media/tuners/mxl301rf.c
-f:drivers/media/tuners/mxl301rf.h
-f:drivers/media/tuners/mxl5005s.c
-f:drivers/media/tuners/mxl5005s.h
-f:drivers/media/tuners/mxl5007t.c
-f:drivers/media/tuners/mxl5007t.h
-f:drivers/media/tuners/qm1d1b0004.c
-f:drivers/media/tuners/qm1d1b0004.h
-f:drivers/media/tuners/qm1d1c0042.c
-f:drivers/media/tuners/qm1d1c0042.h
-f:drivers/media/tuners/qt1010.c
-f:drivers/media/tuners/qt1010.h
-f:drivers/media/tuners/qt1010_priv.h
-f:drivers/media/tuners/r820t.c
-f:drivers/media/tuners/r820t.h
-f:drivers/media/tuners/si2157.c
-f:drivers/media/tuners/si2157.h
-f:drivers/media/tuners/si2157_priv.h
-f:drivers/media/tuners/tda18212.c
-f:drivers/media/tuners/tda18212.h
-f:drivers/media/tuners/tda18218.c
-f:drivers/media/tuners/tda18218.h
-f:drivers/media/tuners/tda18218_priv.h
-f:drivers/media/tuners/tda18250.c
-f:drivers/media/tuners/tda18250.h
-f:drivers/media/tuners/tda18250_priv.h
-f:drivers/media/tuners/tda18271-common.c
-f:drivers/media/tuners/tda18271-fe.c
-f:drivers/media/tuners/tda18271-maps.c
-f:drivers/media/tuners/tda18271-priv.h
-f:drivers/media/tuners/tda18271.h
-f:drivers/media/tuners/tda827x.c
-f:drivers/media/tuners/tda827x.h
-f:drivers/media/tuners/tda8290.c
-f:drivers/media/tuners/tda8290.h
-f:drivers/media/tuners/tda9887.c
-f:drivers/media/tuners/tda9887.h
-f:drivers/media/tuners/tea5761.c
-f:drivers/media/tuners/tea5761.h
-f:drivers/media/tuners/tea5767.c
-f:drivers/media/tuners/tea5767.h
-f:drivers/media/tuners/tua9001.c
-f:drivers/media/tuners/tua9001.h
-f:drivers/media/tuners/tua9001_priv.h
-f:drivers/media/tuners/tuner-i2c.h
-f:drivers/media/tuners/tuner-simple.c
-f:drivers/media/tuners/tuner-simple.h
-f:drivers/media/tuners/tuner-types.c
-f:drivers/media/tuners/xc2028-types.h
-f:drivers/media/tuners/xc2028.c
-f:drivers/media/tuners/xc2028.h
-f:drivers/media/tuners/xc4000.c
-f:drivers/media/tuners/xc4000.h
-f:drivers/media/tuners/xc5000.c
-f:drivers/media/tuners/xc5000.h
-f:drivers/media/usb/Kconfig
-f:drivers/media/usb/Makefile
-f:drivers/media/usb/airspy/Kconfig
-f:drivers/media/usb/airspy/Makefile
-f:drivers/media/usb/airspy/airspy.c
-f:drivers/media/usb/as102/Kconfig
-f:drivers/media/usb/as102/Makefile
-f:drivers/media/usb/as102/as102_drv.c
-f:drivers/media/usb/as102/as102_drv.h
-f:drivers/media/usb/as102/as102_fw.c
-f:drivers/media/usb/as102/as102_fw.h
-f:drivers/media/usb/as102/as102_usb_drv.c
-f:drivers/media/usb/as102/as102_usb_drv.h
-f:drivers/media/usb/as102/as10x_cmd.c
-f:drivers/media/usb/as102/as10x_cmd.h
-f:drivers/media/usb/as102/as10x_cmd_cfg.c
-f:drivers/media/usb/as102/as10x_cmd_stream.c
-f:drivers/media/usb/as102/as10x_handle.h
-f:drivers/media/usb/au0828/Kconfig
-f:drivers/media/usb/au0828/Makefile
-f:drivers/media/usb/au0828/au0828-cards.c
-f:drivers/media/usb/au0828/au0828-cards.h
-f:drivers/media/usb/au0828/au0828-core.c
-f:drivers/media/usb/au0828/au0828-dvb.c
-f:drivers/media/usb/au0828/au0828-i2c.c
-f:drivers/media/usb/au0828/au0828-input.c
-f:drivers/media/usb/au0828/au0828-reg.h
-f:drivers/media/usb/au0828/au0828-vbi.c
-f:drivers/media/usb/au0828/au0828-video.c
-f:drivers/media/usb/au0828/au0828.h
-f:drivers/media/usb/b2c2/Kconfig
-f:drivers/media/usb/b2c2/Makefile
-f:drivers/media/usb/b2c2/flexcop-usb.c
-f:drivers/media/usb/b2c2/flexcop-usb.h
-f:drivers/media/usb/cx231xx/Kconfig
-f:drivers/media/usb/cx231xx/Makefile
-f:drivers/media/usb/cx231xx/cx231xx-417.c
-f:drivers/media/usb/cx231xx/cx231xx-audio.c
-f:drivers/media/usb/cx231xx/cx231xx-avcore.c
-f:drivers/media/usb/cx231xx/cx231xx-cards.c
-f:drivers/media/usb/cx231xx/cx231xx-conf-reg.h
-f:drivers/media/usb/cx231xx/cx231xx-core.c
-f:drivers/media/usb/cx231xx/cx231xx-dif.h
-f:drivers/media/usb/cx231xx/cx231xx-dvb.c
-f:drivers/media/usb/cx231xx/cx231xx-i2c.c
-f:drivers/media/usb/cx231xx/cx231xx-input.c
-f:drivers/media/usb/cx231xx/cx231xx-pcb-cfg.c
-f:drivers/media/usb/cx231xx/cx231xx-pcb-cfg.h
-f:drivers/media/usb/cx231xx/cx231xx-reg.h
-f:drivers/media/usb/cx231xx/cx231xx-vbi.c
-f:drivers/media/usb/cx231xx/cx231xx-vbi.h
-f:drivers/media/usb/cx231xx/cx231xx-video.c
-f:drivers/media/usb/cx231xx/cx231xx.h
-f:drivers/media/usb/dvb-usb-v2/Kconfig
-f:drivers/media/usb/dvb-usb-v2/Makefile
-f:drivers/media/usb/dvb-usb-v2/af9015.c
-f:drivers/media/usb/dvb-usb-v2/af9015.h
-f:drivers/media/usb/dvb-usb-v2/af9035.c
-f:drivers/media/usb/dvb-usb-v2/af9035.h
-f:drivers/media/usb/dvb-usb-v2/anysee.c
-f:drivers/media/usb/dvb-usb-v2/anysee.h
-f:drivers/media/usb/dvb-usb-v2/au6610.c
-f:drivers/media/usb/dvb-usb-v2/au6610.h
-f:drivers/media/usb/dvb-usb-v2/az6007.c
-f:drivers/media/usb/dvb-usb-v2/ce6230.c
-f:drivers/media/usb/dvb-usb-v2/ce6230.h
-f:drivers/media/usb/dvb-usb-v2/dvb_usb.h
-f:drivers/media/usb/dvb-usb-v2/dvb_usb_common.h
-f:drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
-f:drivers/media/usb/dvb-usb-v2/dvb_usb_urb.c
-f:drivers/media/usb/dvb-usb-v2/dvbsky.c
-f:drivers/media/usb/dvb-usb-v2/ec168.c
-f:drivers/media/usb/dvb-usb-v2/ec168.h
-f:drivers/media/usb/dvb-usb-v2/gl861.c
-f:drivers/media/usb/dvb-usb-v2/lmedm04.c
-f:drivers/media/usb/dvb-usb-v2/lmedm04.h
-f:drivers/media/usb/dvb-usb-v2/mxl111sf-demod.c
-f:drivers/media/usb/dvb-usb-v2/mxl111sf-demod.h
-f:drivers/media/usb/dvb-usb-v2/mxl111sf-gpio.c
-f:drivers/media/usb/dvb-usb-v2/mxl111sf-gpio.h
-f:drivers/media/usb/dvb-usb-v2/mxl111sf-i2c.c
-f:drivers/media/usb/dvb-usb-v2/mxl111sf-i2c.h
-f:drivers/media/usb/dvb-usb-v2/mxl111sf-phy.c
-f:drivers/media/usb/dvb-usb-v2/mxl111sf-phy.h
-f:drivers/media/usb/dvb-usb-v2/mxl111sf-reg.h
-f:drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.c
-f:drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.h
-f:drivers/media/usb/dvb-usb-v2/mxl111sf.c
-f:drivers/media/usb/dvb-usb-v2/mxl111sf.h
-f:drivers/media/usb/dvb-usb-v2/rtl28xxu.c
-f:drivers/media/usb/dvb-usb-v2/rtl28xxu.h
-f:drivers/media/usb/dvb-usb-v2/usb_urb.c
-f:drivers/media/usb/dvb-usb-v2/zd1301.c
-f:drivers/media/usb/dvb-usb/Kconfig
-f:drivers/media/usb/dvb-usb/Makefile
-f:drivers/media/usb/dvb-usb/a800.c
-f:drivers/media/usb/dvb-usb/af9005-fe.c
-f:drivers/media/usb/dvb-usb/af9005-remote.c
-f:drivers/media/usb/dvb-usb/af9005-script.h
-f:drivers/media/usb/dvb-usb/af9005.c
-f:drivers/media/usb/dvb-usb/af9005.h
-f:drivers/media/usb/dvb-usb/az6027.c
-f:drivers/media/usb/dvb-usb/az6027.h
-f:drivers/media/usb/dvb-usb/cinergyT2-core.c
-f:drivers/media/usb/dvb-usb/cinergyT2-fe.c
-f:drivers/media/usb/dvb-usb/cinergyT2.h
-f:drivers/media/usb/dvb-usb/cxusb-analog.c
-f:drivers/media/usb/dvb-usb/cxusb.c
-f:drivers/media/usb/dvb-usb/cxusb.h
-f:drivers/media/usb/dvb-usb/dib0700.h
-f:drivers/media/usb/dvb-usb/dib0700_core.c
-f:drivers/media/usb/dvb-usb/dib0700_devices.c
-f:drivers/media/usb/dvb-usb/dib07x0.h
-f:drivers/media/usb/dvb-usb/dibusb-common.c
-f:drivers/media/usb/dvb-usb/dibusb-mb.c
-f:drivers/media/usb/dvb-usb/dibusb-mc-common.c
-f:drivers/media/usb/dvb-usb/dibusb-mc.c
-f:drivers/media/usb/dvb-usb/dibusb.h
-f:drivers/media/usb/dvb-usb/digitv.c
-f:drivers/media/usb/dvb-usb/digitv.h
-f:drivers/media/usb/dvb-usb/dtt200u-fe.c
-f:drivers/media/usb/dvb-usb/dtt200u.c
-f:drivers/media/usb/dvb-usb/dtt200u.h
-f:drivers/media/usb/dvb-usb/dtv5100.c
-f:drivers/media/usb/dvb-usb/dtv5100.h
-f:drivers/media/usb/dvb-usb/dvb-usb-common.h
-f:drivers/media/usb/dvb-usb/dvb-usb-dvb.c
-f:drivers/media/usb/dvb-usb/dvb-usb-firmware.c
-f:drivers/media/usb/dvb-usb/dvb-usb-i2c.c
-f:drivers/media/usb/dvb-usb/dvb-usb-init.c
-f:drivers/media/usb/dvb-usb/dvb-usb-remote.c
-f:drivers/media/usb/dvb-usb/dvb-usb-urb.c
-f:drivers/media/usb/dvb-usb/dvb-usb.h
-f:drivers/media/usb/dvb-usb/dw2102.c
-f:drivers/media/usb/dvb-usb/dw2102.h
-f:drivers/media/usb/dvb-usb/gp8psk.c
-f:drivers/media/usb/dvb-usb/gp8psk.h
-f:drivers/media/usb/dvb-usb/m920x.c
-f:drivers/media/usb/dvb-usb/m920x.h
-f:drivers/media/usb/dvb-usb/nova-t-usb2.c
-f:drivers/media/usb/dvb-usb/opera1.c
-f:drivers/media/usb/dvb-usb/pctv452e.c
-f:drivers/media/usb/dvb-usb/technisat-usb2.c
-f:drivers/media/usb/dvb-usb/ttusb2.c
-f:drivers/media/usb/dvb-usb/ttusb2.h
-f:drivers/media/usb/dvb-usb/umt-010.c
-f:drivers/media/usb/dvb-usb/usb-urb.c
-f:drivers/media/usb/dvb-usb/vp702x-fe.c
-f:drivers/media/usb/dvb-usb/vp702x.c
-f:drivers/media/usb/dvb-usb/vp702x.h
-f:drivers/media/usb/dvb-usb/vp7045-fe.c
-f:drivers/media/usb/dvb-usb/vp7045.c
-f:drivers/media/usb/dvb-usb/vp7045.h
-f:drivers/media/usb/em28xx/Kconfig
-f:drivers/media/usb/em28xx/Makefile
-f:drivers/media/usb/em28xx/em28xx-audio.c
-f:drivers/media/usb/em28xx/em28xx-camera.c
-f:drivers/media/usb/em28xx/em28xx-cards.c
-f:drivers/media/usb/em28xx/em28xx-core.c
-f:drivers/media/usb/em28xx/em28xx-dvb.c
-f:drivers/media/usb/em28xx/em28xx-i2c.c
-f:drivers/media/usb/em28xx/em28xx-input.c
-f:drivers/media/usb/em28xx/em28xx-reg.h
-f:drivers/media/usb/em28xx/em28xx-v4l.h
-f:drivers/media/usb/em28xx/em28xx-vbi.c
-f:drivers/media/usb/em28xx/em28xx-video.c
-f:drivers/media/usb/em28xx/em28xx.h
-f:drivers/media/usb/go7007/Kconfig
-f:drivers/media/usb/go7007/Makefile
-f:drivers/media/usb/go7007/go7007-driver.c
-f:drivers/media/usb/go7007/go7007-fw.c
-f:drivers/media/usb/go7007/go7007-i2c.c
-f:drivers/media/usb/go7007/go7007-loader.c
-f:drivers/media/usb/go7007/go7007-priv.h
-f:drivers/media/usb/go7007/go7007-usb.c
-f:drivers/media/usb/go7007/go7007-v4l2.c
-f:drivers/media/usb/go7007/s2250-board.c
-f:drivers/media/usb/go7007/snd-go7007.c
-f:drivers/media/usb/gspca/Kconfig
-f:drivers/media/usb/gspca/Makefile
-f:drivers/media/usb/gspca/autogain_functions.c
-f:drivers/media/usb/gspca/benq.c
-f:drivers/media/usb/gspca/conex.c
-f:drivers/media/usb/gspca/cpia1.c
-f:drivers/media/usb/gspca/dtcs033.c
-f:drivers/media/usb/gspca/etoms.c
-f:drivers/media/usb/gspca/finepix.c
-f:drivers/media/usb/gspca/gl860/Kconfig
-f:drivers/media/usb/gspca/gl860/Makefile
-f:drivers/media/usb/gspca/gl860/gl860-mi1320.c
-f:drivers/media/usb/gspca/gl860/gl860-mi2020.c
-f:drivers/media/usb/gspca/gl860/gl860-ov2640.c
-f:drivers/media/usb/gspca/gl860/gl860-ov9655.c
-f:drivers/media/usb/gspca/gl860/gl860.c
-f:drivers/media/usb/gspca/gl860/gl860.h
-f:drivers/media/usb/gspca/gspca.c
-f:drivers/media/usb/gspca/gspca.h
-f:drivers/media/usb/gspca/jeilinj.c
-f:drivers/media/usb/gspca/jl2005bcd.c
-f:drivers/media/usb/gspca/jpeg.h
-f:drivers/media/usb/gspca/kinect.c
-f:drivers/media/usb/gspca/konica.c
-f:drivers/media/usb/gspca/m5602/Kconfig
-f:drivers/media/usb/gspca/m5602/Makefile
-f:drivers/media/usb/gspca/m5602/m5602_bridge.h
-f:drivers/media/usb/gspca/m5602/m5602_core.c
-f:drivers/media/usb/gspca/m5602/m5602_mt9m111.c
-f:drivers/media/usb/gspca/m5602/m5602_mt9m111.h
-f:drivers/media/usb/gspca/m5602/m5602_ov7660.c
-f:drivers/media/usb/gspca/m5602/m5602_ov7660.h
-f:drivers/media/usb/gspca/m5602/m5602_ov9650.c
-f:drivers/media/usb/gspca/m5602/m5602_ov9650.h
-f:drivers/media/usb/gspca/m5602/m5602_po1030.c
-f:drivers/media/usb/gspca/m5602/m5602_po1030.h
-f:drivers/media/usb/gspca/m5602/m5602_s5k4aa.c
-f:drivers/media/usb/gspca/m5602/m5602_s5k4aa.h
-f:drivers/media/usb/gspca/m5602/m5602_s5k83a.c
-f:drivers/media/usb/gspca/m5602/m5602_s5k83a.h
-f:drivers/media/usb/gspca/m5602/m5602_sensor.h
-f:drivers/media/usb/gspca/mars.c
-f:drivers/media/usb/gspca/mr97310a.c
-f:drivers/media/usb/gspca/nw80x.c
-f:drivers/media/usb/gspca/ov519.c
-f:drivers/media/usb/gspca/ov534.c
-f:drivers/media/usb/gspca/ov534_9.c
-f:drivers/media/usb/gspca/pac207.c
-f:drivers/media/usb/gspca/pac7302.c
-f:drivers/media/usb/gspca/pac7311.c
-f:drivers/media/usb/gspca/pac_common.h
-f:drivers/media/usb/gspca/se401.c
-f:drivers/media/usb/gspca/se401.h
-f:drivers/media/usb/gspca/sn9c2028.c
-f:drivers/media/usb/gspca/sn9c2028.h
-f:drivers/media/usb/gspca/sn9c20x.c
-f:drivers/media/usb/gspca/sonixb.c
-f:drivers/media/usb/gspca/sonixj.c
-f:drivers/media/usb/gspca/spca1528.c
-f:drivers/media/usb/gspca/spca500.c
-f:drivers/media/usb/gspca/spca501.c
-f:drivers/media/usb/gspca/spca505.c
-f:drivers/media/usb/gspca/spca506.c
-f:drivers/media/usb/gspca/spca508.c
-f:drivers/media/usb/gspca/spca561.c
-f:drivers/media/usb/gspca/sq905.c
-f:drivers/media/usb/gspca/sq905c.c
-f:drivers/media/usb/gspca/sq930x.c
-f:drivers/media/usb/gspca/stk014.c
-f:drivers/media/usb/gspca/stk1135.c
-f:drivers/media/usb/gspca/stk1135.h
-f:drivers/media/usb/gspca/stv0680.c
-f:drivers/media/usb/gspca/stv06xx/Kconfig
-f:drivers/media/usb/gspca/stv06xx/Makefile
-f:drivers/media/usb/gspca/stv06xx/stv06xx.c
-f:drivers/media/usb/gspca/stv06xx/stv06xx.h
-f:drivers/media/usb/gspca/stv06xx/stv06xx_hdcs.c
-f:drivers/media/usb/gspca/stv06xx/stv06xx_hdcs.h
-f:drivers/media/usb/gspca/stv06xx/stv06xx_pb0100.c
-f:drivers/media/usb/gspca/stv06xx/stv06xx_pb0100.h
-f:drivers/media/usb/gspca/stv06xx/stv06xx_sensor.h
-f:drivers/media/usb/gspca/stv06xx/stv06xx_st6422.c
-f:drivers/media/usb/gspca/stv06xx/stv06xx_st6422.h
-f:drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.c
-f:drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.h
-f:drivers/media/usb/gspca/sunplus.c
-f:drivers/media/usb/gspca/t613.c
-f:drivers/media/usb/gspca/topro.c
-f:drivers/media/usb/gspca/touptek.c
-f:drivers/media/usb/gspca/tv8532.c
-f:drivers/media/usb/gspca/vc032x.c
-f:drivers/media/usb/gspca/vicam.c
-f:drivers/media/usb/gspca/w996Xcf.c
-f:drivers/media/usb/gspca/xirlink_cit.c
-f:drivers/media/usb/gspca/zc3xx-reg.h
-f:drivers/media/usb/gspca/zc3xx.c
-f:drivers/media/usb/hackrf/Kconfig
-f:drivers/media/usb/hackrf/Makefile
-f:drivers/media/usb/hackrf/hackrf.c
-f:drivers/media/usb/hdpvr/Kconfig
-f:drivers/media/usb/hdpvr/Makefile
-f:drivers/media/usb/hdpvr/hdpvr-control.c
-f:drivers/media/usb/hdpvr/hdpvr-core.c
-f:drivers/media/usb/hdpvr/hdpvr-i2c.c
-f:drivers/media/usb/hdpvr/hdpvr-video.c
-f:drivers/media/usb/hdpvr/hdpvr.h
-f:drivers/media/usb/msi2500/Kconfig
-f:drivers/media/usb/msi2500/Makefile
-f:drivers/media/usb/msi2500/msi2500.c
-f:drivers/media/usb/pvrusb2/Kconfig
-f:drivers/media/usb/pvrusb2/Makefile
-f:drivers/media/usb/pvrusb2/pvrusb2-audio.c
-f:drivers/media/usb/pvrusb2/pvrusb2-audio.h
-f:drivers/media/usb/pvrusb2/pvrusb2-context.c
-f:drivers/media/usb/pvrusb2/pvrusb2-context.h
-f:drivers/media/usb/pvrusb2/pvrusb2-cs53l32a.c
-f:drivers/media/usb/pvrusb2/pvrusb2-cs53l32a.h
-f:drivers/media/usb/pvrusb2/pvrusb2-ctrl.c
-f:drivers/media/usb/pvrusb2/pvrusb2-ctrl.h
-f:drivers/media/usb/pvrusb2/pvrusb2-cx2584x-v4l.c
-f:drivers/media/usb/pvrusb2/pvrusb2-cx2584x-v4l.h
-f:drivers/media/usb/pvrusb2/pvrusb2-debug.h
-f:drivers/media/usb/pvrusb2/pvrusb2-debugifc.c
-f:drivers/media/usb/pvrusb2/pvrusb2-debugifc.h
-f:drivers/media/usb/pvrusb2/pvrusb2-devattr.c
-f:drivers/media/usb/pvrusb2/pvrusb2-devattr.h
-f:drivers/media/usb/pvrusb2/pvrusb2-dvb.c
-f:drivers/media/usb/pvrusb2/pvrusb2-dvb.h
-f:drivers/media/usb/pvrusb2/pvrusb2-eeprom.c
-f:drivers/media/usb/pvrusb2/pvrusb2-eeprom.h
-f:drivers/media/usb/pvrusb2/pvrusb2-encoder.c
-f:drivers/media/usb/pvrusb2/pvrusb2-encoder.h
-f:drivers/media/usb/pvrusb2/pvrusb2-fx2-cmd.h
-f:drivers/media/usb/pvrusb2/pvrusb2-hdw-internal.h
-f:drivers/media/usb/pvrusb2/pvrusb2-hdw.c
-f:drivers/media/usb/pvrusb2/pvrusb2-hdw.h
-f:drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c
-f:drivers/media/usb/pvrusb2/pvrusb2-i2c-core.h
-f:drivers/media/usb/pvrusb2/pvrusb2-io.c
-f:drivers/media/usb/pvrusb2/pvrusb2-io.h
-f:drivers/media/usb/pvrusb2/pvrusb2-ioread.c
-f:drivers/media/usb/pvrusb2/pvrusb2-ioread.h
-f:drivers/media/usb/pvrusb2/pvrusb2-main.c
-f:drivers/media/usb/pvrusb2/pvrusb2-std.c
-f:drivers/media/usb/pvrusb2/pvrusb2-std.h
-f:drivers/media/usb/pvrusb2/pvrusb2-sysfs.c
-f:drivers/media/usb/pvrusb2/pvrusb2-sysfs.h
-f:drivers/media/usb/pvrusb2/pvrusb2-util.h
-f:drivers/media/usb/pvrusb2/pvrusb2-v4l2.c
-f:drivers/media/usb/pvrusb2/pvrusb2-v4l2.h
-f:drivers/media/usb/pvrusb2/pvrusb2-video-v4l.c
-f:drivers/media/usb/pvrusb2/pvrusb2-video-v4l.h
-f:drivers/media/usb/pvrusb2/pvrusb2-wm8775.c
-f:drivers/media/usb/pvrusb2/pvrusb2-wm8775.h
-f:drivers/media/usb/pvrusb2/pvrusb2.h
-f:drivers/media/usb/pwc/Kconfig
-f:drivers/media/usb/pwc/Makefile
-f:drivers/media/usb/pwc/pwc-ctrl.c
-f:drivers/media/usb/pwc/pwc-dec1.c
-f:drivers/media/usb/pwc/pwc-dec1.h
-f:drivers/media/usb/pwc/pwc-dec23.c
-f:drivers/media/usb/pwc/pwc-dec23.h
-f:drivers/media/usb/pwc/pwc-if.c
-f:drivers/media/usb/pwc/pwc-kiara.c
-f:drivers/media/usb/pwc/pwc-kiara.h
-f:drivers/media/usb/pwc/pwc-misc.c
-f:drivers/media/usb/pwc/pwc-nala.h
-f:drivers/media/usb/pwc/pwc-timon.c
-f:drivers/media/usb/pwc/pwc-timon.h
-f:drivers/media/usb/pwc/pwc-uncompress.c
-f:drivers/media/usb/pwc/pwc-v4l.c
-f:drivers/media/usb/pwc/pwc.h
-f:drivers/media/usb/s2255/Kconfig
-f:drivers/media/usb/s2255/Makefile
-f:drivers/media/usb/s2255/s2255drv.c
-f:drivers/media/usb/siano/Kconfig
-f:drivers/media/usb/siano/Makefile
-f:drivers/media/usb/siano/smsusb.c
-f:drivers/media/usb/stk1160/Kconfig
-f:drivers/media/usb/stk1160/Makefile
-f:drivers/media/usb/stk1160/stk1160-ac97.c
-f:drivers/media/usb/stk1160/stk1160-core.c
-f:drivers/media/usb/stk1160/stk1160-i2c.c
-f:drivers/media/usb/stk1160/stk1160-reg.h
-f:drivers/media/usb/stk1160/stk1160-v4l.c
-f:drivers/media/usb/stk1160/stk1160-video.c
-f:drivers/media/usb/stk1160/stk1160.h
-f:drivers/media/usb/ttusb-budget/Kconfig
-f:drivers/media/usb/ttusb-budget/Makefile
-f:drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c
-f:drivers/media/usb/ttusb-dec/Kconfig
-f:drivers/media/usb/ttusb-dec/Makefile
-f:drivers/media/usb/ttusb-dec/ttusb_dec.c
-f:drivers/media/usb/ttusb-dec/ttusbdecfe.c
-f:drivers/media/usb/ttusb-dec/ttusbdecfe.h
-f:drivers/media/usb/usbtv/Kconfig
-f:drivers/media/usb/usbtv/Makefile
-f:drivers/media/usb/usbtv/usbtv-audio.c
-f:drivers/media/usb/usbtv/usbtv-core.c
-f:drivers/media/usb/usbtv/usbtv-video.c
-f:drivers/media/usb/usbtv/usbtv.h
-f:drivers/media/usb/uvc/Kconfig
-f:drivers/media/usb/uvc/Makefile
-f:drivers/media/usb/uvc/uvc_ctrl.c
-f:drivers/media/usb/uvc/uvc_debugfs.c
-f:drivers/media/usb/uvc/uvc_driver.c
-f:drivers/media/usb/uvc/uvc_entity.c
-f:drivers/media/usb/uvc/uvc_isight.c
-f:drivers/media/usb/uvc/uvc_metadata.c
-f:drivers/media/usb/uvc/uvc_queue.c
-f:drivers/media/usb/uvc/uvc_status.c
-f:drivers/media/usb/uvc/uvc_v4l2.c
-f:drivers/media/usb/uvc/uvc_video.c
-f:drivers/media/usb/uvc/uvcvideo.h
-f:drivers/media/v4l2-core/Kconfig
-f:drivers/media/v4l2-core/Makefile
-f:drivers/media/v4l2-core/tuner-core.c
-f:drivers/media/v4l2-core/v4l2-async.c
-f:drivers/media/v4l2-core/v4l2-cci.c
-f:drivers/media/v4l2-core/v4l2-common.c
-f:drivers/media/v4l2-core/v4l2-compat-ioctl32.c
-f:drivers/media/v4l2-core/v4l2-ctrls-api.c
-f:drivers/media/v4l2-core/v4l2-ctrls-core.c
-f:drivers/media/v4l2-core/v4l2-ctrls-defs.c
-f:drivers/media/v4l2-core/v4l2-ctrls-priv.h
-f:drivers/media/v4l2-core/v4l2-ctrls-request.c
-f:drivers/media/v4l2-core/v4l2-dev.c
-f:drivers/media/v4l2-core/v4l2-device.c
-f:drivers/media/v4l2-core/v4l2-dv-timings.c
-f:drivers/media/v4l2-core/v4l2-event.c
-f:drivers/media/v4l2-core/v4l2-fh.c
-f:drivers/media/v4l2-core/v4l2-flash-led-class.c
-f:drivers/media/v4l2-core/v4l2-fwnode.c
-f:drivers/media/v4l2-core/v4l2-h264.c
-f:drivers/media/v4l2-core/v4l2-i2c.c
-f:drivers/media/v4l2-core/v4l2-ioctl.c
-f:drivers/media/v4l2-core/v4l2-jpeg.c
-f:drivers/media/v4l2-core/v4l2-mc.c
-f:drivers/media/v4l2-core/v4l2-mem2mem.c
-f:drivers/media/v4l2-core/v4l2-spi.c
-f:drivers/media/v4l2-core/v4l2-subdev-priv.h
-f:drivers/media/v4l2-core/v4l2-subdev.c
-f:drivers/media/v4l2-core/v4l2-trace.c
-f:drivers/media/v4l2-core/v4l2-vp9.c
-f:drivers/memory/.gitignore
-f:drivers/memory/Kconfig
-f:drivers/memory/Makefile
-f:drivers/memory/atmel-ebi.c
-f:drivers/memory/brcmstb_dpfe.c
-f:drivers/memory/brcmstb_memc.c
-f:drivers/memory/bt1-l2-ctl.c
-f:drivers/memory/da8xx-ddrctl.c
-f:drivers/memory/dfl-emif.c
-f:drivers/memory/emif-asm-offsets.c
-f:drivers/memory/emif.c
-f:drivers/memory/emif.h
-f:drivers/memory/fsl-corenet-cf.c
-f:drivers/memory/fsl_ifc.c
-f:drivers/memory/jedec_ddr.h
-f:drivers/memory/jedec_ddr_data.c
-f:drivers/memory/jz4780-nemc.c
-f:drivers/memory/mtk-smi.c
-f:drivers/memory/mvebu-devbus.c
-f:drivers/memory/of_memory.c
-f:drivers/memory/of_memory.h
-f:drivers/memory/omap-gpmc.c
-f:drivers/memory/pl172.c
-f:drivers/memory/pl353-smc.c
-f:drivers/memory/renesas-rpc-if-regs.h
-f:drivers/memory/renesas-rpc-if.c
-f:drivers/memory/renesas-xspi-if-regs.h
-f:drivers/memory/samsung/Kconfig
-f:drivers/memory/samsung/Makefile
-f:drivers/memory/samsung/exynos-srom.c
-f:drivers/memory/samsung/exynos-srom.h
-f:drivers/memory/samsung/exynos5422-dmc.c
-f:drivers/memory/stm32-fmc2-ebi.c
-f:drivers/memory/stm32_omm.c
-f:drivers/memory/tegra/Kconfig
-f:drivers/memory/tegra/Makefile
-f:drivers/memory/tegra/mc.c
-f:drivers/memory/tegra/mc.h
-f:drivers/memory/tegra/tegra114.c
-f:drivers/memory/tegra/tegra124-emc.c
-f:drivers/memory/tegra/tegra124.c
-f:drivers/memory/tegra/tegra186-emc.c
-f:drivers/memory/tegra/tegra186.c
-f:drivers/memory/tegra/tegra194.c
-f:drivers/memory/tegra/tegra20-emc.c
-f:drivers/memory/tegra/tegra20.c
-f:drivers/memory/tegra/tegra210-emc-cc-r21021.c
-f:drivers/memory/tegra/tegra210-emc-core.c
-f:drivers/memory/tegra/tegra210-emc-table.c
-f:drivers/memory/tegra/tegra210-emc.h
-f:drivers/memory/tegra/tegra210-mc.h
-f:drivers/memory/tegra/tegra210.c
-f:drivers/memory/tegra/tegra234.c
-f:drivers/memory/tegra/tegra264-bwmgr.h
-f:drivers/memory/tegra/tegra264.c
-f:drivers/memory/tegra/tegra30-emc.c
-f:drivers/memory/tegra/tegra30.c
-f:drivers/memory/ti-aemif.c
-f:drivers/memory/ti-emif-pm.c
-f:drivers/memory/ti-emif-sram-pm.S
-f:drivers/memstick/Kconfig
-f:drivers/memstick/Makefile
-f:drivers/memstick/core/Kconfig
-f:drivers/memstick/core/Makefile
-f:drivers/memstick/core/memstick.c
-f:drivers/memstick/core/ms_block.c
-f:drivers/memstick/core/ms_block.h
-f:drivers/memstick/core/mspro_block.c
-f:drivers/memstick/host/Kconfig
-f:drivers/memstick/host/Makefile
-f:drivers/memstick/host/jmb38x_ms.c
-f:drivers/memstick/host/r592.c
-f:drivers/memstick/host/r592.h
-f:drivers/memstick/host/rtsx_usb_ms.c
-f:drivers/memstick/host/tifm_ms.c
-f:drivers/message/Makefile
-f:drivers/message/fusion/Kconfig
-f:drivers/message/fusion/Makefile
-f:drivers/message/fusion/lsi/mpi.h
-f:drivers/message/fusion/lsi/mpi_cnfg.h
-f:drivers/message/fusion/lsi/mpi_fc.h
-f:drivers/message/fusion/lsi/mpi_history.txt
-f:drivers/message/fusion/lsi/mpi_init.h
-f:drivers/message/fusion/lsi/mpi_ioc.h
-f:drivers/message/fusion/lsi/mpi_lan.h
-f:drivers/message/fusion/lsi/mpi_log_fc.h
-f:drivers/message/fusion/lsi/mpi_log_sas.h
-f:drivers/message/fusion/lsi/mpi_raid.h
-f:drivers/message/fusion/lsi/mpi_sas.h
-f:drivers/message/fusion/lsi/mpi_targ.h
-f:drivers/message/fusion/lsi/mpi_tool.h
-f:drivers/message/fusion/lsi/mpi_type.h
-f:drivers/message/fusion/mptbase.c
-f:drivers/message/fusion/mptbase.h
-f:drivers/message/fusion/mptctl.c
-f:drivers/message/fusion/mptctl.h
-f:drivers/message/fusion/mptdebug.h
-f:drivers/message/fusion/mptfc.c
-f:drivers/message/fusion/mptlan.c
-f:drivers/message/fusion/mptlan.h
-f:drivers/message/fusion/mptsas.c
-f:drivers/message/fusion/mptsas.h
-f:drivers/message/fusion/mptscsih.c
-f:drivers/message/fusion/mptscsih.h
-f:drivers/message/fusion/mptspi.c
-f:drivers/mfd/88pm800.c
-f:drivers/mfd/88pm805.c
-f:drivers/mfd/88pm80x.c
-f:drivers/mfd/88pm860x-core.c
-f:drivers/mfd/88pm860x-i2c.c
-f:drivers/mfd/88pm886.c
-f:drivers/mfd/Kconfig
-f:drivers/mfd/Makefile
-f:drivers/mfd/aat2870-core.c
-f:drivers/mfd/ab8500-core.c
-f:drivers/mfd/ab8500-sysctrl.c
-f:drivers/mfd/abx500-core.c
-f:drivers/mfd/ac100.c
-f:drivers/mfd/acer-ec-a500.c
-f:drivers/mfd/act8945a.c
-f:drivers/mfd/adp5520.c
-f:drivers/mfd/adp5585.c
-f:drivers/mfd/altera-a10sr.c
-f:drivers/mfd/altera-sysmgr.c
-f:drivers/mfd/arizona-core.c
-f:drivers/mfd/arizona-i2c.c
-f:drivers/mfd/arizona-irq.c
-f:drivers/mfd/arizona-spi.c
-f:drivers/mfd/arizona.h
-f:drivers/mfd/as3711.c
-f:drivers/mfd/as3722.c
-f:drivers/mfd/at91-usart.c
-f:drivers/mfd/atc260x-core.c
-f:drivers/mfd/atc260x-i2c.c
-f:drivers/mfd/atmel-flexcom.c
-f:drivers/mfd/atmel-hlcdc.c
-f:drivers/mfd/atmel-smc.c
-f:drivers/mfd/axp20x-i2c.c
-f:drivers/mfd/axp20x-rsb.c
-f:drivers/mfd/axp20x.c
-f:drivers/mfd/bcm2835-pm.c
-f:drivers/mfd/bcm590xx.c
-f:drivers/mfd/bd9571mwv.c
-f:drivers/mfd/cgbc-core.c
-f:drivers/mfd/cros_ec_dev.c
-f:drivers/mfd/cs40l50-core.c
-f:drivers/mfd/cs40l50-i2c.c
-f:drivers/mfd/cs40l50-spi.c
-f:drivers/mfd/cs42l43-i2c.c
-f:drivers/mfd/cs42l43-sdw.c
-f:drivers/mfd/cs42l43.c
-f:drivers/mfd/cs42l43.h
-f:drivers/mfd/cs47l15-tables.c
-f:drivers/mfd/cs47l24-tables.c
-f:drivers/mfd/cs47l35-tables.c
-f:drivers/mfd/cs47l85-tables.c
-f:drivers/mfd/cs47l90-tables.c
-f:drivers/mfd/cs47l92-tables.c
-f:drivers/mfd/cs5535-mfd.c
-f:drivers/mfd/da903x.c
-f:drivers/mfd/da9052-core.c
-f:drivers/mfd/da9052-i2c.c
-f:drivers/mfd/da9052-irq.c
-f:drivers/mfd/da9052-spi.c
-f:drivers/mfd/da9055-core.c
-f:drivers/mfd/da9055-i2c.c
-f:drivers/mfd/da9062-core.c
-f:drivers/mfd/da9063-core.c
-f:drivers/mfd/da9063-i2c.c
-f:drivers/mfd/da9063-irq.c
-f:drivers/mfd/da9150-core.c
-f:drivers/mfd/db8500-prcmu-regs.h
-f:drivers/mfd/db8500-prcmu.c
-f:drivers/mfd/dln2.c
-f:drivers/mfd/ene-kb3930.c
-f:drivers/mfd/exynos-lpass.c
-f:drivers/mfd/ezx-pcap.c
-f:drivers/mfd/fsl-imx25-tsadc.c
-f:drivers/mfd/gateworks-gsc.c
-f:drivers/mfd/hi6421-pmic-core.c
-f:drivers/mfd/hi6421-spmi-pmic.c
-f:drivers/mfd/hi655x-pmic.c
-f:drivers/mfd/intel-lpss-acpi.c
-f:drivers/mfd/intel-lpss-pci.c
-f:drivers/mfd/intel-lpss.c
-f:drivers/mfd/intel-lpss.h
-f:drivers/mfd/intel-m10-bmc-core.c
-f:drivers/mfd/intel-m10-bmc-pmci.c
-f:drivers/mfd/intel-m10-bmc-spi.c
-f:drivers/mfd/intel_pmc_bxt.c
-f:drivers/mfd/intel_quark_i2c_gpio.c
-f:drivers/mfd/intel_soc_pmic_bxtwc.c
-f:drivers/mfd/intel_soc_pmic_chtdc_ti.c
-f:drivers/mfd/intel_soc_pmic_chtwc.c
-f:drivers/mfd/intel_soc_pmic_crc.c
-f:drivers/mfd/intel_soc_pmic_mrfld.c
-f:drivers/mfd/ioc3.c
-f:drivers/mfd/ipaq-micro.c
-f:drivers/mfd/iqs62x.c
-f:drivers/mfd/janz-cmodio.c
-f:drivers/mfd/kempld-core.c
-f:drivers/mfd/khadas-mcu.c
-f:drivers/mfd/lm3533-core.c
-f:drivers/mfd/lm3533-ctrlbank.c
-f:drivers/mfd/lochnagar-i2c.c
-f:drivers/mfd/lp3943.c
-f:drivers/mfd/lp873x.c
-f:drivers/mfd/lp87565.c
-f:drivers/mfd/lp8788-irq.c
-f:drivers/mfd/lp8788.c
-f:drivers/mfd/lpc_ich.c
-f:drivers/mfd/lpc_sch.c
-f:drivers/mfd/macsmc.c
-f:drivers/mfd/madera-core.c
-f:drivers/mfd/madera-i2c.c
-f:drivers/mfd/madera-spi.c
-f:drivers/mfd/madera.h
-f:drivers/mfd/max14577.c
-f:drivers/mfd/max77541.c
-f:drivers/mfd/max77620.c
-f:drivers/mfd/max77650.c
-f:drivers/mfd/max77686.c
-f:drivers/mfd/max77693.c
-f:drivers/mfd/max77705.c
-f:drivers/mfd/max77714.c
-f:drivers/mfd/max77759.c
-f:drivers/mfd/max77843.c
-f:drivers/mfd/max8907.c
-f:drivers/mfd/max8925-core.c
-f:drivers/mfd/max8925-i2c.c
-f:drivers/mfd/max8997-irq.c
-f:drivers/mfd/max8997.c
-f:drivers/mfd/max8998-irq.c
-f:drivers/mfd/max8998.c
-f:drivers/mfd/mc13xxx-core.c
-f:drivers/mfd/mc13xxx-i2c.c
-f:drivers/mfd/mc13xxx-spi.c
-f:drivers/mfd/mc13xxx.h
-f:drivers/mfd/mcp-core.c
-f:drivers/mfd/mcp-sa11x0.c
-f:drivers/mfd/menelaus.c
-f:drivers/mfd/menf21bmc.c
-f:drivers/mfd/mfd-core.c
-f:drivers/mfd/motorola-cpcap.c
-f:drivers/mfd/mp2629.c
-f:drivers/mfd/mt6358-irq.c
-f:drivers/mfd/mt6360-core.c
-f:drivers/mfd/mt6370.c
-f:drivers/mfd/mt6370.h
-f:drivers/mfd/mt6397-core.c
-f:drivers/mfd/mt6397-irq.c
-f:drivers/mfd/mxs-lradc.c
-f:drivers/mfd/ntxec.c
-f:drivers/mfd/ocelot-core.c
-f:drivers/mfd/ocelot-spi.c
-f:drivers/mfd/ocelot.h
-f:drivers/mfd/omap-usb-host.c
-f:drivers/mfd/omap-usb-tll.c
-f:drivers/mfd/omap-usb.h
-f:drivers/mfd/palmas.c
-f:drivers/mfd/qcom-pm8008.c
-f:drivers/mfd/qcom-pm8xxx.c
-f:drivers/mfd/qcom-spmi-pmic.c
-f:drivers/mfd/qcom_rpm.c
-f:drivers/mfd/qnap-mcu.c
-f:drivers/mfd/rave-sp.c
-f:drivers/mfd/rc5t583-irq.c
-f:drivers/mfd/rc5t583.c
-f:drivers/mfd/rdc321x-southbridge.c
-f:drivers/mfd/retu-mfd.c
-f:drivers/mfd/rk8xx-core.c
-f:drivers/mfd/rk8xx-i2c.c
-f:drivers/mfd/rk8xx-spi.c
-f:drivers/mfd/rn5t618.c
-f:drivers/mfd/rohm-bd71828.c
-f:drivers/mfd/rohm-bd718x7.c
-f:drivers/mfd/rohm-bd9576.c
-f:drivers/mfd/rohm-bd96801.c
-f:drivers/mfd/rsmu.h
-f:drivers/mfd/rsmu_core.c
-f:drivers/mfd/rsmu_i2c.c
-f:drivers/mfd/rsmu_spi.c
-f:drivers/mfd/rt4831.c
-f:drivers/mfd/rt5033.c
-f:drivers/mfd/rt5120.c
-f:drivers/mfd/rz-mtu3.c
-f:drivers/mfd/rz-mtu3.h
-f:drivers/mfd/sec-acpm.c
-f:drivers/mfd/sec-common.c
-f:drivers/mfd/sec-core.h
-f:drivers/mfd/sec-i2c.c
-f:drivers/mfd/sec-irq.c
-f:drivers/mfd/si476x-cmd.c
-f:drivers/mfd/si476x-i2c.c
-f:drivers/mfd/si476x-prop.c
-f:drivers/mfd/simple-mfd-i2c.c
-f:drivers/mfd/simple-mfd-i2c.h
-f:drivers/mfd/sky81452.c
-f:drivers/mfd/sm501.c
-f:drivers/mfd/smpro-core.c
-f:drivers/mfd/sprd-sc27xx-spi.c
-f:drivers/mfd/ssbi.c
-f:drivers/mfd/stm32-lptimer.c
-f:drivers/mfd/stm32-timers.c
-f:drivers/mfd/stmfx.c
-f:drivers/mfd/stmpe-i2c.c
-f:drivers/mfd/stmpe-spi.c
-f:drivers/mfd/stmpe.c
-f:drivers/mfd/stmpe.h
-f:drivers/mfd/stpmic1.c
-f:drivers/mfd/stw481x.c
-f:drivers/mfd/sun4i-gpadc.c
-f:drivers/mfd/sun6i-prcm.c
-f:drivers/mfd/syscon.c
-f:drivers/mfd/tc3589x.c
-f:drivers/mfd/ti-lmu.c
-f:drivers/mfd/ti_am335x_tscadc.c
-f:drivers/mfd/timberdale.c
-f:drivers/mfd/timberdale.h
-f:drivers/mfd/tps6105x.c
-f:drivers/mfd/tps65010.c
-f:drivers/mfd/tps6507x.c
-f:drivers/mfd/tps65086.c
-f:drivers/mfd/tps65090.c
-f:drivers/mfd/tps65217.c
-f:drivers/mfd/tps65218.c
-f:drivers/mfd/tps65219.c
-f:drivers/mfd/tps6586x.c
-f:drivers/mfd/tps65910.c
-f:drivers/mfd/tps65911-comparator.c
-f:drivers/mfd/tps65912-core.c
-f:drivers/mfd/tps65912-i2c.c
-f:drivers/mfd/tps65912-spi.c
-f:drivers/mfd/tps6594-core.c
-f:drivers/mfd/tps6594-i2c.c
-f:drivers/mfd/tps6594-spi.c
-f:drivers/mfd/tqmx86.c
-f:drivers/mfd/twl-core.c
-f:drivers/mfd/twl-core.h
-f:drivers/mfd/twl4030-audio.c
-f:drivers/mfd/twl4030-irq.c
-f:drivers/mfd/twl4030-power.c
-f:drivers/mfd/twl6030-irq.c
-f:drivers/mfd/twl6040.c
-f:drivers/mfd/ucb1x00-assabet.c
-f:drivers/mfd/ucb1x00-core.c
-f:drivers/mfd/ucb1x00-ts.c
-f:drivers/mfd/upboard-fpga.c
-f:drivers/mfd/vexpress-sysreg.c
-f:drivers/mfd/viperboard.c
-f:drivers/mfd/vx855.c
-f:drivers/mfd/wcd934x.c
-f:drivers/mfd/wl1273-core.c
-f:drivers/mfd/wm5102-tables.c
-f:drivers/mfd/wm5110-tables.c
-f:drivers/mfd/wm831x-auxadc.c
-f:drivers/mfd/wm831x-core.c
-f:drivers/mfd/wm831x-i2c.c
-f:drivers/mfd/wm831x-irq.c
-f:drivers/mfd/wm831x-otp.c
-f:drivers/mfd/wm831x-spi.c
-f:drivers/mfd/wm8350-core.c
-f:drivers/mfd/wm8350-gpio.c
-f:drivers/mfd/wm8350-i2c.c
-f:drivers/mfd/wm8350-irq.c
-f:drivers/mfd/wm8350-regmap.c
-f:drivers/mfd/wm8400-core.c
-f:drivers/mfd/wm8994-core.c
-f:drivers/mfd/wm8994-irq.c
-f:drivers/mfd/wm8994-regmap.c
-f:drivers/mfd/wm8994.h
-f:drivers/mfd/wm8997-tables.c
-f:drivers/mfd/wm8998-tables.c
-f:drivers/mfd/wm97xx-core.c
-f:drivers/misc/Kconfig
-f:drivers/misc/Makefile
-f:drivers/misc/ad525x_dpot-i2c.c
-f:drivers/misc/ad525x_dpot-spi.c
-f:drivers/misc/ad525x_dpot.c
-f:drivers/misc/ad525x_dpot.h
-f:drivers/misc/altera-stapl/Kconfig
-f:drivers/misc/altera-stapl/Makefile
-f:drivers/misc/altera-stapl/altera-comp.c
-f:drivers/misc/altera-stapl/altera-exprt.h
-f:drivers/misc/altera-stapl/altera-jtag.c
-f:drivers/misc/altera-stapl/altera-jtag.h
-f:drivers/misc/altera-stapl/altera-lpt.c
-f:drivers/misc/altera-stapl/altera.c
-f:drivers/misc/amd-sbi/Kconfig
-f:drivers/misc/amd-sbi/Makefile
-f:drivers/misc/amd-sbi/rmi-core.c
-f:drivers/misc/amd-sbi/rmi-core.h
-f:drivers/misc/amd-sbi/rmi-hwmon.c
-f:drivers/misc/amd-sbi/rmi-i2c.c
-f:drivers/misc/apds9802als.c
-f:drivers/misc/apds990x.c
-f:drivers/misc/atmel-ssc.c
-f:drivers/misc/bcm-vk/Kconfig
-f:drivers/misc/bcm-vk/Makefile
-f:drivers/misc/bcm-vk/bcm_vk.h
-f:drivers/misc/bcm-vk/bcm_vk_dev.c
-f:drivers/misc/bcm-vk/bcm_vk_msg.c
-f:drivers/misc/bcm-vk/bcm_vk_msg.h
-f:drivers/misc/bcm-vk/bcm_vk_sg.c
-f:drivers/misc/bcm-vk/bcm_vk_sg.h
-f:drivers/misc/bcm-vk/bcm_vk_tty.c
-f:drivers/misc/bh1770glc.c
-f:drivers/misc/c2port/Kconfig
-f:drivers/misc/c2port/Makefile
-f:drivers/misc/c2port/c2port-duramar2150.c
-f:drivers/misc/c2port/core.c
-f:drivers/misc/cardreader/Kconfig
-f:drivers/misc/cardreader/Makefile
-f:drivers/misc/cardreader/alcor_pci.c
-f:drivers/misc/cardreader/rtl8411.c
-f:drivers/misc/cardreader/rts5209.c
-f:drivers/misc/cardreader/rts5227.c
-f:drivers/misc/cardreader/rts5228.c
-f:drivers/misc/cardreader/rts5228.h
-f:drivers/misc/cardreader/rts5229.c
-f:drivers/misc/cardreader/rts5249.c
-f:drivers/misc/cardreader/rts5260.c
-f:drivers/misc/cardreader/rts5260.h
-f:drivers/misc/cardreader/rts5261.c
-f:drivers/misc/cardreader/rts5261.h
-f:drivers/misc/cardreader/rts5264.c
-f:drivers/misc/cardreader/rts5264.h
-f:drivers/misc/cardreader/rtsx_pcr.c
-f:drivers/misc/cardreader/rtsx_pcr.h
-f:drivers/misc/cardreader/rtsx_usb.c
-f:drivers/misc/cb710/Kconfig
-f:drivers/misc/cb710/Makefile
-f:drivers/misc/cb710/core.c
-f:drivers/misc/cb710/debug.c
-f:drivers/misc/cb710/sgbuf2.c
-f:drivers/misc/cs5535-mfgpt.c
-f:drivers/misc/ds1682.c
-f:drivers/misc/dummy-irq.c
-f:drivers/misc/dw-xdata-pcie.c
-f:drivers/misc/eeprom/Kconfig
-f:drivers/misc/eeprom/Makefile
-f:drivers/misc/eeprom/at24.c
-f:drivers/misc/eeprom/at25.c
-f:drivers/misc/eeprom/digsy_mtc_eeprom.c
-f:drivers/misc/eeprom/ee1004.c
-f:drivers/misc/eeprom/eeprom_93cx6.c
-f:drivers/misc/eeprom/eeprom_93xx46.c
-f:drivers/misc/eeprom/idt_89hpesx.c
-f:drivers/misc/eeprom/max6875.c
-f:drivers/misc/enclosure.c
-f:drivers/misc/fastrpc.c
-f:drivers/misc/gehc-achc.c
-f:drivers/misc/genwqe/Kconfig
-f:drivers/misc/genwqe/Makefile
-f:drivers/misc/genwqe/card_base.c
-f:drivers/misc/genwqe/card_base.h
-f:drivers/misc/genwqe/card_ddcb.c
-f:drivers/misc/genwqe/card_ddcb.h
-f:drivers/misc/genwqe/card_debugfs.c
-f:drivers/misc/genwqe/card_dev.c
-f:drivers/misc/genwqe/card_sysfs.c
-f:drivers/misc/genwqe/card_utils.c
-f:drivers/misc/genwqe/genwqe_driver.h
-f:drivers/misc/hi6421v600-irq.c
-f:drivers/misc/hisi_hikey_usb.c
-f:drivers/misc/hmc6352.c
-f:drivers/misc/hpilo.c
-f:drivers/misc/hpilo.h
-f:drivers/misc/ibmasm/Makefile
-f:drivers/misc/ibmasm/command.c
-f:drivers/misc/ibmasm/dot_command.c
-f:drivers/misc/ibmasm/dot_command.h
-f:drivers/misc/ibmasm/event.c
-f:drivers/misc/ibmasm/heartbeat.c
-f:drivers/misc/ibmasm/i2o.h
-f:drivers/misc/ibmasm/ibmasm.h
-f:drivers/misc/ibmasm/ibmasmfs.c
-f:drivers/misc/ibmasm/lowlevel.c
-f:drivers/misc/ibmasm/lowlevel.h
-f:drivers/misc/ibmasm/module.c
-f:drivers/misc/ibmasm/r_heartbeat.c
-f:drivers/misc/ibmasm/remote.c
-f:drivers/misc/ibmasm/remote.h
-f:drivers/misc/ibmasm/uart.c
-f:drivers/misc/ibmvmc.c
-f:drivers/misc/ibmvmc.h
-f:drivers/misc/ics932s401.c
-f:drivers/misc/isl29003.c
-f:drivers/misc/isl29020.c
-f:drivers/misc/keba/Kconfig
-f:drivers/misc/keba/Makefile
-f:drivers/misc/keba/cp500.c
-f:drivers/misc/keba/lan9252.c
-f:drivers/misc/kgdbts.c
-f:drivers/misc/lan966x_pci.c
-f:drivers/misc/lan966x_pci.dtso
-f:drivers/misc/lattice-ecp3-config.c
-f:drivers/misc/lis3lv02d/Kconfig
-f:drivers/misc/lis3lv02d/Makefile
-f:drivers/misc/lis3lv02d/lis3lv02d.c
-f:drivers/misc/lis3lv02d/lis3lv02d.h
-f:drivers/misc/lis3lv02d/lis3lv02d_i2c.c
-f:drivers/misc/lis3lv02d/lis3lv02d_spi.c
-f:drivers/misc/lkdtm/Makefile
-f:drivers/misc/lkdtm/bugs.c
-f:drivers/misc/lkdtm/cfi.c
-f:drivers/misc/lkdtm/core.c
-f:drivers/misc/lkdtm/fortify.c
-f:drivers/misc/lkdtm/heap.c
-f:drivers/misc/lkdtm/kstack_erase.c
-f:drivers/misc/lkdtm/lkdtm.h
-f:drivers/misc/lkdtm/perms.c
-f:drivers/misc/lkdtm/powerpc.c
-f:drivers/misc/lkdtm/refcount.c
-f:drivers/misc/lkdtm/rodata.c
-f:drivers/misc/lkdtm/usercopy.c
-f:drivers/misc/mchp_pci1xxxx/Kconfig
-f:drivers/misc/mchp_pci1xxxx/Makefile
-f:drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gp.c
-f:drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gp.h
-f:drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gpio.c
-f:drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_otpe2p.c
-f:drivers/misc/mei/Kconfig
-f:drivers/misc/mei/Makefile
-f:drivers/misc/mei/bus-fixup.c
-f:drivers/misc/mei/bus.c
-f:drivers/misc/mei/client.c
-f:drivers/misc/mei/client.h
-f:drivers/misc/mei/debugfs.c
-f:drivers/misc/mei/dma-ring.c
-f:drivers/misc/mei/gsc-me.c
-f:drivers/misc/mei/gsc_proxy/Kconfig
-f:drivers/misc/mei/gsc_proxy/Makefile
-f:drivers/misc/mei/gsc_proxy/mei_gsc_proxy.c
-f:drivers/misc/mei/hbm.c
-f:drivers/misc/mei/hbm.h
-f:drivers/misc/mei/hdcp/Kconfig
-f:drivers/misc/mei/hdcp/Makefile
-f:drivers/misc/mei/hdcp/mei_hdcp.c
-f:drivers/misc/mei/hdcp/mei_hdcp.h
-f:drivers/misc/mei/hw-me-regs.h
-f:drivers/misc/mei/hw-me.c
-f:drivers/misc/mei/hw-me.h
-f:drivers/misc/mei/hw-txe-regs.h
-f:drivers/misc/mei/hw-txe.c
-f:drivers/misc/mei/hw-txe.h
-f:drivers/misc/mei/hw.h
-f:drivers/misc/mei/init.c
-f:drivers/misc/mei/interrupt.c
-f:drivers/misc/mei/main.c
-f:drivers/misc/mei/mei-trace.c
-f:drivers/misc/mei/mei-trace.h
-f:drivers/misc/mei/mei_dev.h
-f:drivers/misc/mei/mkhi.h
-f:drivers/misc/mei/pci-me.c
-f:drivers/misc/mei/pci-txe.c
-f:drivers/misc/mei/platform-vsc.c
-f:drivers/misc/mei/pxp/Kconfig
-f:drivers/misc/mei/pxp/Makefile
-f:drivers/misc/mei/pxp/mei_pxp.c
-f:drivers/misc/mei/pxp/mei_pxp.h
-f:drivers/misc/mei/vsc-fw-loader.c
-f:drivers/misc/mei/vsc-tp.c
-f:drivers/misc/mei/vsc-tp.h
-f:drivers/misc/misc_minor_kunit.c
-f:drivers/misc/mrvl_cn10k_dpi.c
-f:drivers/misc/nsm.c
-f:drivers/misc/ntsync.c
-f:drivers/misc/ocxl/Kconfig
-f:drivers/misc/ocxl/Makefile
-f:drivers/misc/ocxl/afu_irq.c
-f:drivers/misc/ocxl/config.c
-f:drivers/misc/ocxl/context.c
-f:drivers/misc/ocxl/core.c
-f:drivers/misc/ocxl/file.c
-f:drivers/misc/ocxl/link.c
-f:drivers/misc/ocxl/main.c
-f:drivers/misc/ocxl/mmio.c
-f:drivers/misc/ocxl/ocxl_internal.h
-f:drivers/misc/ocxl/pasid.c
-f:drivers/misc/ocxl/pci.c
-f:drivers/misc/ocxl/sysfs.c
-f:drivers/misc/ocxl/trace.c
-f:drivers/misc/ocxl/trace.h
-f:drivers/misc/open-dice.c
-f:drivers/misc/pch_phub.c
-f:drivers/misc/pci_endpoint_test.c
-f:drivers/misc/phantom.c
-f:drivers/misc/pvpanic/Kconfig
-f:drivers/misc/pvpanic/Makefile
-f:drivers/misc/pvpanic/pvpanic-mmio.c
-f:drivers/misc/pvpanic/pvpanic-pci.c
-f:drivers/misc/pvpanic/pvpanic.c
-f:drivers/misc/pvpanic/pvpanic.h
-f:drivers/misc/qcom-coincell.c
-f:drivers/misc/rp1/Kconfig
-f:drivers/misc/rp1/Makefile
-f:drivers/misc/rp1/rp1-pci.dtso
-f:drivers/misc/rp1/rp1_pci.c
-f:drivers/misc/rpmb-core.c
-f:drivers/misc/sgi-gru/Makefile
-f:drivers/misc/sgi-gru/gru.h
-f:drivers/misc/sgi-gru/gru_instructions.h
-f:drivers/misc/sgi-gru/grufault.c
-f:drivers/misc/sgi-gru/grufile.c
-f:drivers/misc/sgi-gru/gruhandles.c
-f:drivers/misc/sgi-gru/gruhandles.h
-f:drivers/misc/sgi-gru/grukdump.c
-f:drivers/misc/sgi-gru/grukservices.c
-f:drivers/misc/sgi-gru/grukservices.h
-f:drivers/misc/sgi-gru/grulib.h
-f:drivers/misc/sgi-gru/grumain.c
-f:drivers/misc/sgi-gru/gruprocfs.c
-f:drivers/misc/sgi-gru/grutables.h
-f:drivers/misc/sgi-gru/grutlbpurge.c
-f:drivers/misc/sgi-xp/Makefile
-f:drivers/misc/sgi-xp/xp.h
-f:drivers/misc/sgi-xp/xp_main.c
-f:drivers/misc/sgi-xp/xp_uv.c
-f:drivers/misc/sgi-xp/xpc.h
-f:drivers/misc/sgi-xp/xpc_channel.c
-f:drivers/misc/sgi-xp/xpc_main.c
-f:drivers/misc/sgi-xp/xpc_partition.c
-f:drivers/misc/sgi-xp/xpc_uv.c
-f:drivers/misc/sgi-xp/xpnet.c
-f:drivers/misc/smpro-errmon.c
-f:drivers/misc/smpro-misc.c
-f:drivers/misc/sram-exec.c
-f:drivers/misc/sram.c
-f:drivers/misc/sram.h
-f:drivers/misc/ti_fpc202.c
-f:drivers/misc/tifm_7xx1.c
-f:drivers/misc/tifm_core.c
-f:drivers/misc/tps6594-esm.c
-f:drivers/misc/tps6594-pfsm.c
-f:drivers/misc/tsl2550.c
-f:drivers/misc/uacce/Kconfig
-f:drivers/misc/uacce/Makefile
-f:drivers/misc/uacce/uacce.c
-f:drivers/misc/vcpu_stall_detector.c
-f:drivers/misc/vmw_balloon.c
-f:drivers/misc/vmw_vmci/Kconfig
-f:drivers/misc/vmw_vmci/Makefile
-f:drivers/misc/vmw_vmci/vmci_context.c
-f:drivers/misc/vmw_vmci/vmci_context.h
-f:drivers/misc/vmw_vmci/vmci_datagram.c
-f:drivers/misc/vmw_vmci/vmci_datagram.h
-f:drivers/misc/vmw_vmci/vmci_doorbell.c
-f:drivers/misc/vmw_vmci/vmci_doorbell.h
-f:drivers/misc/vmw_vmci/vmci_driver.c
-f:drivers/misc/vmw_vmci/vmci_driver.h
-f:drivers/misc/vmw_vmci/vmci_event.c
-f:drivers/misc/vmw_vmci/vmci_event.h
-f:drivers/misc/vmw_vmci/vmci_guest.c
-f:drivers/misc/vmw_vmci/vmci_handle_array.c
-f:drivers/misc/vmw_vmci/vmci_handle_array.h
-f:drivers/misc/vmw_vmci/vmci_host.c
-f:drivers/misc/vmw_vmci/vmci_queue_pair.c
-f:drivers/misc/vmw_vmci/vmci_queue_pair.h
-f:drivers/misc/vmw_vmci/vmci_resource.c
-f:drivers/misc/vmw_vmci/vmci_resource.h
-f:drivers/misc/vmw_vmci/vmci_route.c
-f:drivers/misc/vmw_vmci/vmci_route.h
-f:drivers/misc/xilinx_sdfec.c
-f:drivers/misc/xilinx_tmr_inject.c
-f:drivers/misc/xilinx_tmr_manager.c
-f:drivers/mmc/Kconfig
-f:drivers/mmc/Makefile
-f:drivers/mmc/core/Kconfig
-f:drivers/mmc/core/Makefile
-f:drivers/mmc/core/block.c
-f:drivers/mmc/core/block.h
-f:drivers/mmc/core/bus.c
-f:drivers/mmc/core/bus.h
-f:drivers/mmc/core/card.h
-f:drivers/mmc/core/core.c
-f:drivers/mmc/core/core.h
-f:drivers/mmc/core/crypto.c
-f:drivers/mmc/core/crypto.h
-f:drivers/mmc/core/debugfs.c
-f:drivers/mmc/core/host.c
-f:drivers/mmc/core/host.h
-f:drivers/mmc/core/mmc.c
-f:drivers/mmc/core/mmc_ops.c
-f:drivers/mmc/core/mmc_ops.h
-f:drivers/mmc/core/mmc_test.c
-f:drivers/mmc/core/pwrseq.c
-f:drivers/mmc/core/pwrseq.h
-f:drivers/mmc/core/pwrseq_emmc.c
-f:drivers/mmc/core/pwrseq_sd8787.c
-f:drivers/mmc/core/pwrseq_simple.c
-f:drivers/mmc/core/queue.c
-f:drivers/mmc/core/queue.h
-f:drivers/mmc/core/quirks.h
-f:drivers/mmc/core/regulator.c
-f:drivers/mmc/core/sd.c
-f:drivers/mmc/core/sd.h
-f:drivers/mmc/core/sd_ops.c
-f:drivers/mmc/core/sd_ops.h
-f:drivers/mmc/core/sd_uhs2.c
-f:drivers/mmc/core/sdio.c
-f:drivers/mmc/core/sdio_bus.c
-f:drivers/mmc/core/sdio_bus.h
-f:drivers/mmc/core/sdio_cis.c
-f:drivers/mmc/core/sdio_cis.h
-f:drivers/mmc/core/sdio_io.c
-f:drivers/mmc/core/sdio_irq.c
-f:drivers/mmc/core/sdio_ops.c
-f:drivers/mmc/core/sdio_ops.h
-f:drivers/mmc/core/sdio_uart.c
-f:drivers/mmc/core/slot-gpio.c
-f:drivers/mmc/core/slot-gpio.h
-f:drivers/mmc/host/Kconfig
-f:drivers/mmc/host/Makefile
-f:drivers/mmc/host/alcor.c
-f:drivers/mmc/host/atmel-mci.c
-f:drivers/mmc/host/au1xmmc.c
-f:drivers/mmc/host/bcm2835.c
-f:drivers/mmc/host/cavium-octeon.c
-f:drivers/mmc/host/cavium-thunderx.c
-f:drivers/mmc/host/cavium.c
-f:drivers/mmc/host/cavium.h
-f:drivers/mmc/host/cb710-mmc.c
-f:drivers/mmc/host/cb710-mmc.h
-f:drivers/mmc/host/cqhci-core.c
-f:drivers/mmc/host/cqhci-crypto.c
-f:drivers/mmc/host/cqhci-crypto.h
-f:drivers/mmc/host/cqhci.h
-f:drivers/mmc/host/davinci_mmc.c
-f:drivers/mmc/host/dw_mmc-bluefield.c
-f:drivers/mmc/host/dw_mmc-exynos.c
-f:drivers/mmc/host/dw_mmc-exynos.h
-f:drivers/mmc/host/dw_mmc-hi3798cv200.c
-f:drivers/mmc/host/dw_mmc-hi3798mv200.c
-f:drivers/mmc/host/dw_mmc-k3.c
-f:drivers/mmc/host/dw_mmc-pci.c
-f:drivers/mmc/host/dw_mmc-pltfm.c
-f:drivers/mmc/host/dw_mmc-pltfm.h
-f:drivers/mmc/host/dw_mmc-rockchip.c
-f:drivers/mmc/host/dw_mmc-starfive.c
-f:drivers/mmc/host/dw_mmc.c
-f:drivers/mmc/host/dw_mmc.h
-f:drivers/mmc/host/jz4740_mmc.c
-f:drivers/mmc/host/litex_mmc.c
-f:drivers/mmc/host/loongson2-mmc.c
-f:drivers/mmc/host/meson-gx-mmc.c
-f:drivers/mmc/host/meson-mx-sdhc-clkc.c
-f:drivers/mmc/host/meson-mx-sdhc-mmc.c
-f:drivers/mmc/host/meson-mx-sdhc.h
-f:drivers/mmc/host/meson-mx-sdio.c
-f:drivers/mmc/host/mmc_hsq.c
-f:drivers/mmc/host/mmc_hsq.h
-f:drivers/mmc/host/mmc_spi.c
-f:drivers/mmc/host/mmci.c
-f:drivers/mmc/host/mmci.h
-f:drivers/mmc/host/mmci_qcom_dml.c
-f:drivers/mmc/host/mmci_stm32_sdmmc.c
-f:drivers/mmc/host/moxart-mmc.c
-f:drivers/mmc/host/mtk-sd.c
-f:drivers/mmc/host/mvsdio.c
-f:drivers/mmc/host/mvsdio.h
-f:drivers/mmc/host/mxcmmc.c
-f:drivers/mmc/host/mxs-mmc.c
-f:drivers/mmc/host/of_mmc_spi.c
-f:drivers/mmc/host/omap.c
-f:drivers/mmc/host/omap_hsmmc.c
-f:drivers/mmc/host/owl-mmc.c
-f:drivers/mmc/host/pxamci.c
-f:drivers/mmc/host/pxamci.h
-f:drivers/mmc/host/renesas_sdhi.h
-f:drivers/mmc/host/renesas_sdhi_core.c
-f:drivers/mmc/host/renesas_sdhi_internal_dmac.c
-f:drivers/mmc/host/renesas_sdhi_sys_dmac.c
-f:drivers/mmc/host/rtsx_pci_sdmmc.c
-f:drivers/mmc/host/rtsx_usb_sdmmc.c
-f:drivers/mmc/host/sdhci-acpi.c
-f:drivers/mmc/host/sdhci-bcm-kona.c
-f:drivers/mmc/host/sdhci-brcmstb.c
-f:drivers/mmc/host/sdhci-cadence.c
-f:drivers/mmc/host/sdhci-cqhci.h
-f:drivers/mmc/host/sdhci-dove.c
-f:drivers/mmc/host/sdhci-esdhc-imx.c
-f:drivers/mmc/host/sdhci-esdhc-mcf.c
-f:drivers/mmc/host/sdhci-esdhc.h
-f:drivers/mmc/host/sdhci-iproc.c
-f:drivers/mmc/host/sdhci-milbeaut.c
-f:drivers/mmc/host/sdhci-msm.c
-f:drivers/mmc/host/sdhci-npcm.c
-f:drivers/mmc/host/sdhci-of-arasan.c
-f:drivers/mmc/host/sdhci-of-aspeed-test.c
-f:drivers/mmc/host/sdhci-of-aspeed.c
-f:drivers/mmc/host/sdhci-of-at91.c
-f:drivers/mmc/host/sdhci-of-dwcmshc.c
-f:drivers/mmc/host/sdhci-of-esdhc.c
-f:drivers/mmc/host/sdhci-of-hlwd.c
-f:drivers/mmc/host/sdhci-of-k1.c
-f:drivers/mmc/host/sdhci-of-ma35d1.c
-f:drivers/mmc/host/sdhci-of-sparx5.c
-f:drivers/mmc/host/sdhci-omap.c
-f:drivers/mmc/host/sdhci-pci-arasan.c
-f:drivers/mmc/host/sdhci-pci-core.c
-f:drivers/mmc/host/sdhci-pci-dwc-mshc.c
-f:drivers/mmc/host/sdhci-pci-gli.c
-f:drivers/mmc/host/sdhci-pci-o2micro.c
-f:drivers/mmc/host/sdhci-pci.h
-f:drivers/mmc/host/sdhci-pic32.c
-f:drivers/mmc/host/sdhci-pltfm.c
-f:drivers/mmc/host/sdhci-pltfm.h
-f:drivers/mmc/host/sdhci-pxav2.c
-f:drivers/mmc/host/sdhci-pxav3.c
-f:drivers/mmc/host/sdhci-s3c.c
-f:drivers/mmc/host/sdhci-spear.c
-f:drivers/mmc/host/sdhci-sprd.c
-f:drivers/mmc/host/sdhci-st.c
-f:drivers/mmc/host/sdhci-tegra.c
-f:drivers/mmc/host/sdhci-uhs2.c
-f:drivers/mmc/host/sdhci-uhs2.h
-f:drivers/mmc/host/sdhci-xenon-phy.c
-f:drivers/mmc/host/sdhci-xenon.c
-f:drivers/mmc/host/sdhci-xenon.h
-f:drivers/mmc/host/sdhci.c
-f:drivers/mmc/host/sdhci.h
-f:drivers/mmc/host/sdhci_am654.c
-f:drivers/mmc/host/sdhci_f_sdh30.c
-f:drivers/mmc/host/sdhci_f_sdh30.h
-f:drivers/mmc/host/sdricoh_cs.c
-f:drivers/mmc/host/sh_mmcif.c
-f:drivers/mmc/host/sunplus-mmc.c
-f:drivers/mmc/host/sunxi-mmc.c
-f:drivers/mmc/host/tifm_sd.c
-f:drivers/mmc/host/tmio_mmc.h
-f:drivers/mmc/host/tmio_mmc_core.c
-f:drivers/mmc/host/toshsd.c
-f:drivers/mmc/host/toshsd.h
-f:drivers/mmc/host/uniphier-sd.c
-f:drivers/mmc/host/usdhi6rol0.c
-f:drivers/mmc/host/ushc.c
-f:drivers/mmc/host/via-sdmmc.c
-f:drivers/mmc/host/vub300.c
-f:drivers/mmc/host/wbsd.c
-f:drivers/mmc/host/wbsd.h
-f:drivers/mmc/host/wmt-sdmmc.c
-f:drivers/most/Kconfig
-f:drivers/most/Makefile
-f:drivers/most/configfs.c
-f:drivers/most/core.c
-f:drivers/most/most_cdev.c
-f:drivers/most/most_snd.c
-f:drivers/most/most_usb.c
-f:drivers/mtd/Kconfig
-f:drivers/mtd/Makefile
-f:drivers/mtd/chips/Kconfig
-f:drivers/mtd/chips/Makefile
-f:drivers/mtd/chips/cfi_cmdset_0001.c
-f:drivers/mtd/chips/cfi_cmdset_0002.c
-f:drivers/mtd/chips/cfi_cmdset_0020.c
-f:drivers/mtd/chips/cfi_probe.c
-f:drivers/mtd/chips/cfi_util.c
-f:drivers/mtd/chips/chipreg.c
-f:drivers/mtd/chips/fwh_lock.h
-f:drivers/mtd/chips/gen_probe.c
-f:drivers/mtd/chips/jedec_probe.c
-f:drivers/mtd/chips/map_absent.c
-f:drivers/mtd/chips/map_ram.c
-f:drivers/mtd/chips/map_rom.c
-f:drivers/mtd/devices/Kconfig
-f:drivers/mtd/devices/Makefile
-f:drivers/mtd/devices/bcm47xxsflash.c
-f:drivers/mtd/devices/bcm47xxsflash.h
-f:drivers/mtd/devices/block2mtd.c
-f:drivers/mtd/devices/docg3.c
-f:drivers/mtd/devices/docg3.h
-f:drivers/mtd/devices/mchp23k256.c
-f:drivers/mtd/devices/mchp48l640.c
-f:drivers/mtd/devices/ms02-nv.c
-f:drivers/mtd/devices/ms02-nv.h
-f:drivers/mtd/devices/mtd_dataflash.c
-f:drivers/mtd/devices/mtd_intel_dg.c
-f:drivers/mtd/devices/mtdram.c
-f:drivers/mtd/devices/phram.c
-f:drivers/mtd/devices/pmc551.c
-f:drivers/mtd/devices/powernv_flash.c
-f:drivers/mtd/devices/serial_flash_cmds.h
-f:drivers/mtd/devices/slram.c
-f:drivers/mtd/devices/spear_smi.c
-f:drivers/mtd/devices/sst25l.c
-f:drivers/mtd/devices/st_spi_fsm.c
-f:drivers/mtd/ftl.c
-f:drivers/mtd/hyperbus/Kconfig
-f:drivers/mtd/hyperbus/Makefile
-f:drivers/mtd/hyperbus/hbmc-am654.c
-f:drivers/mtd/hyperbus/hyperbus-core.c
-f:drivers/mtd/hyperbus/rpc-if.c
-f:drivers/mtd/inftlcore.c
-f:drivers/mtd/inftlmount.c
-f:drivers/mtd/lpddr/Kconfig
-f:drivers/mtd/lpddr/Makefile
-f:drivers/mtd/lpddr/lpddr2_nvm.c
-f:drivers/mtd/lpddr/lpddr_cmds.c
-f:drivers/mtd/lpddr/qinfo_probe.c
-f:drivers/mtd/maps/Kconfig
-f:drivers/mtd/maps/Makefile
-f:drivers/mtd/maps/amd76xrom.c
-f:drivers/mtd/maps/cfi_flagadm.c
-f:drivers/mtd/maps/ck804xrom.c
-f:drivers/mtd/maps/dc21285.c
-f:drivers/mtd/maps/esb2rom.c
-f:drivers/mtd/maps/ichxrom.c
-f:drivers/mtd/maps/impa7.c
-f:drivers/mtd/maps/l440gx.c
-f:drivers/mtd/maps/lantiq-flash.c
-f:drivers/mtd/maps/map_funcs.c
-f:drivers/mtd/maps/netsc520.c
-f:drivers/mtd/maps/nettel.c
-f:drivers/mtd/maps/pci.c
-f:drivers/mtd/maps/pcmciamtd.c
-f:drivers/mtd/maps/physmap-bt1-rom.c
-f:drivers/mtd/maps/physmap-bt1-rom.h
-f:drivers/mtd/maps/physmap-core.c
-f:drivers/mtd/maps/physmap-gemini.c
-f:drivers/mtd/maps/physmap-gemini.h
-f:drivers/mtd/maps/physmap-ixp4xx.c
-f:drivers/mtd/maps/physmap-ixp4xx.h
-f:drivers/mtd/maps/physmap-versatile.c
-f:drivers/mtd/maps/physmap-versatile.h
-f:drivers/mtd/maps/pismo.c
-f:drivers/mtd/maps/plat-ram.c
-f:drivers/mtd/maps/pxa2xx-flash.c
-f:drivers/mtd/maps/sa1100-flash.c
-f:drivers/mtd/maps/sbc_gxx.c
-f:drivers/mtd/maps/sc520cdp.c
-f:drivers/mtd/maps/scb2_flash.c
-f:drivers/mtd/maps/scx200_docflash.c
-f:drivers/mtd/maps/solutionengine.c
-f:drivers/mtd/maps/sun_uflash.c
-f:drivers/mtd/maps/ts5500_flash.c
-f:drivers/mtd/maps/tsunami_flash.c
-f:drivers/mtd/maps/uclinux.c
-f:drivers/mtd/maps/vmu-flash.c
-f:drivers/mtd/mtd_blkdevs.c
-f:drivers/mtd/mtdblock.c
-f:drivers/mtd/mtdblock_ro.c
-f:drivers/mtd/mtdchar.c
-f:drivers/mtd/mtdconcat.c
-f:drivers/mtd/mtdcore.c
-f:drivers/mtd/mtdcore.h
-f:drivers/mtd/mtdoops.c
-f:drivers/mtd/mtdpart.c
-f:drivers/mtd/mtdpstore.c
-f:drivers/mtd/mtdsuper.c
-f:drivers/mtd/mtdswap.c
-f:drivers/mtd/nand/Kconfig
-f:drivers/mtd/nand/Makefile
-f:drivers/mtd/nand/bbt.c
-f:drivers/mtd/nand/core.c
-f:drivers/mtd/nand/ecc-mtk.c
-f:drivers/mtd/nand/ecc-mxic.c
-f:drivers/mtd/nand/ecc-sw-bch.c
-f:drivers/mtd/nand/ecc-sw-hamming.c
-f:drivers/mtd/nand/ecc.c
-f:drivers/mtd/nand/onenand/Kconfig
-f:drivers/mtd/nand/onenand/Makefile
-f:drivers/mtd/nand/onenand/generic.c
-f:drivers/mtd/nand/onenand/onenand_base.c
-f:drivers/mtd/nand/onenand/onenand_bbt.c
-f:drivers/mtd/nand/onenand/onenand_omap2.c
-f:drivers/mtd/nand/onenand/onenand_samsung.c
-f:drivers/mtd/nand/onenand/samsung.h
-f:drivers/mtd/nand/qpic_common.c
-f:drivers/mtd/nand/raw/Kconfig
-f:drivers/mtd/nand/raw/Makefile
-f:drivers/mtd/nand/raw/ams-delta.c
-f:drivers/mtd/nand/raw/arasan-nand-controller.c
-f:drivers/mtd/nand/raw/atmel/Makefile
-f:drivers/mtd/nand/raw/atmel/nand-controller.c
-f:drivers/mtd/nand/raw/atmel/pmecc.c
-f:drivers/mtd/nand/raw/atmel/pmecc.h
-f:drivers/mtd/nand/raw/au1550nd.c
-f:drivers/mtd/nand/raw/bcm47xxnflash/Makefile
-f:drivers/mtd/nand/raw/bcm47xxnflash/bcm47xxnflash.h
-f:drivers/mtd/nand/raw/bcm47xxnflash/main.c
-f:drivers/mtd/nand/raw/bcm47xxnflash/ops_bcm4706.c
-f:drivers/mtd/nand/raw/brcmnand/Kconfig
-f:drivers/mtd/nand/raw/brcmnand/Makefile
-f:drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c
-f:drivers/mtd/nand/raw/brcmnand/bcma_nand.c
-f:drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
-f:drivers/mtd/nand/raw/brcmnand/brcmnand.c
-f:drivers/mtd/nand/raw/brcmnand/brcmnand.h
-f:drivers/mtd/nand/raw/brcmnand/brcmstb_nand.c
-f:drivers/mtd/nand/raw/brcmnand/iproc_nand.c
-f:drivers/mtd/nand/raw/cadence-nand-controller.c
-f:drivers/mtd/nand/raw/cafe_nand.c
-f:drivers/mtd/nand/raw/cs553x_nand.c
-f:drivers/mtd/nand/raw/davinci_nand.c
-f:drivers/mtd/nand/raw/denali.c
-f:drivers/mtd/nand/raw/denali.h
-f:drivers/mtd/nand/raw/denali_dt.c
-f:drivers/mtd/nand/raw/denali_pci.c
-f:drivers/mtd/nand/raw/diskonchip.c
-f:drivers/mtd/nand/raw/fsl_elbc_nand.c
-f:drivers/mtd/nand/raw/fsl_ifc_nand.c
-f:drivers/mtd/nand/raw/fsl_upm.c
-f:drivers/mtd/nand/raw/fsmc_nand.c
-f:drivers/mtd/nand/raw/gpio.c
-f:drivers/mtd/nand/raw/gpmi-nand/Makefile
-f:drivers/mtd/nand/raw/gpmi-nand/bch-regs.h
-f:drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
-f:drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h
-f:drivers/mtd/nand/raw/gpmi-nand/gpmi-regs.h
-f:drivers/mtd/nand/raw/hisi504_nand.c
-f:drivers/mtd/nand/raw/ingenic/Kconfig
-f:drivers/mtd/nand/raw/ingenic/Makefile
-f:drivers/mtd/nand/raw/ingenic/ingenic_ecc.c
-f:drivers/mtd/nand/raw/ingenic/ingenic_ecc.h
-f:drivers/mtd/nand/raw/ingenic/ingenic_nand_drv.c
-f:drivers/mtd/nand/raw/ingenic/jz4725b_bch.c
-f:drivers/mtd/nand/raw/ingenic/jz4740_ecc.c
-f:drivers/mtd/nand/raw/ingenic/jz4780_bch.c
-f:drivers/mtd/nand/raw/intel-nand-controller.c
-f:drivers/mtd/nand/raw/internals.h
-f:drivers/mtd/nand/raw/loongson1-nand-controller.c
-f:drivers/mtd/nand/raw/lpc32xx_mlc.c
-f:drivers/mtd/nand/raw/lpc32xx_slc.c
-f:drivers/mtd/nand/raw/marvell_nand.c
-f:drivers/mtd/nand/raw/meson_nand.c
-f:drivers/mtd/nand/raw/mpc5121_nfc.c
-f:drivers/mtd/nand/raw/mtk_nand.c
-f:drivers/mtd/nand/raw/mxc_nand.c
-f:drivers/mtd/nand/raw/mxic_nand.c
-f:drivers/mtd/nand/raw/nand_amd.c
-f:drivers/mtd/nand/raw/nand_base.c
-f:drivers/mtd/nand/raw/nand_bbt.c
-f:drivers/mtd/nand/raw/nand_esmt.c
-f:drivers/mtd/nand/raw/nand_hynix.c
-f:drivers/mtd/nand/raw/nand_ids.c
-f:drivers/mtd/nand/raw/nand_jedec.c
-f:drivers/mtd/nand/raw/nand_legacy.c
-f:drivers/mtd/nand/raw/nand_macronix.c
-f:drivers/mtd/nand/raw/nand_micron.c
-f:drivers/mtd/nand/raw/nand_onfi.c
-f:drivers/mtd/nand/raw/nand_samsung.c
-f:drivers/mtd/nand/raw/nand_sandisk.c
-f:drivers/mtd/nand/raw/nand_timings.c
-f:drivers/mtd/nand/raw/nand_toshiba.c
-f:drivers/mtd/nand/raw/nandsim.c
-f:drivers/mtd/nand/raw/ndfc.c
-f:drivers/mtd/nand/raw/nuvoton-ma35d1-nand-controller.c
-f:drivers/mtd/nand/raw/omap2.c
-f:drivers/mtd/nand/raw/omap_elm.c
-f:drivers/mtd/nand/raw/orion_nand.c
-f:drivers/mtd/nand/raw/pasemi_nand.c
-f:drivers/mtd/nand/raw/pl35x-nand-controller.c
-f:drivers/mtd/nand/raw/plat_nand.c
-f:drivers/mtd/nand/raw/qcom_nandc.c
-f:drivers/mtd/nand/raw/r852.c
-f:drivers/mtd/nand/raw/r852.h
-f:drivers/mtd/nand/raw/renesas-nand-controller.c
-f:drivers/mtd/nand/raw/rockchip-nand-controller.c
-f:drivers/mtd/nand/raw/s3c2410.c
-f:drivers/mtd/nand/raw/sh_flctl.c
-f:drivers/mtd/nand/raw/sharpsl.c
-f:drivers/mtd/nand/raw/sm_common.c
-f:drivers/mtd/nand/raw/sm_common.h
-f:drivers/mtd/nand/raw/socrates_nand.c
-f:drivers/mtd/nand/raw/stm32_fmc2_nand.c
-f:drivers/mtd/nand/raw/sunxi_nand.c
-f:drivers/mtd/nand/raw/technologic-nand-controller.c
-f:drivers/mtd/nand/raw/tegra_nand.c
-f:drivers/mtd/nand/raw/txx9ndfmc.c
-f:drivers/mtd/nand/raw/vf610_nfc.c
-f:drivers/mtd/nand/raw/xway_nand.c
-f:drivers/mtd/nand/spi/Kconfig
-f:drivers/mtd/nand/spi/Makefile
-f:drivers/mtd/nand/spi/alliancememory.c
-f:drivers/mtd/nand/spi/ato.c
-f:drivers/mtd/nand/spi/core.c
-f:drivers/mtd/nand/spi/esmt.c
-f:drivers/mtd/nand/spi/foresee.c
-f:drivers/mtd/nand/spi/gigadevice.c
-f:drivers/mtd/nand/spi/macronix.c
-f:drivers/mtd/nand/spi/micron.c
-f:drivers/mtd/nand/spi/otp.c
-f:drivers/mtd/nand/spi/paragon.c
-f:drivers/mtd/nand/spi/skyhigh.c
-f:drivers/mtd/nand/spi/toshiba.c
-f:drivers/mtd/nand/spi/winbond.c
-f:drivers/mtd/nand/spi/xtx.c
-f:drivers/mtd/nftlcore.c
-f:drivers/mtd/nftlmount.c
-f:drivers/mtd/parsers/Kconfig
-f:drivers/mtd/parsers/Makefile
-f:drivers/mtd/parsers/afs.c
-f:drivers/mtd/parsers/bcm47xxpart.c
-f:drivers/mtd/parsers/bcm63xxpart.c
-f:drivers/mtd/parsers/brcm_u-boot.c
-f:drivers/mtd/parsers/cmdlinepart.c
-f:drivers/mtd/parsers/ofpart_bcm4908.c
-f:drivers/mtd/parsers/ofpart_bcm4908.h
-f:drivers/mtd/parsers/ofpart_core.c
-f:drivers/mtd/parsers/ofpart_linksys_ns.c
-f:drivers/mtd/parsers/ofpart_linksys_ns.h
-f:drivers/mtd/parsers/parser_imagetag.c
-f:drivers/mtd/parsers/parser_trx.c
-f:drivers/mtd/parsers/qcomsmempart.c
-f:drivers/mtd/parsers/redboot.c
-f:drivers/mtd/parsers/scpart.c
-f:drivers/mtd/parsers/sharpslpart.c
-f:drivers/mtd/parsers/tplink_safeloader.c
-f:drivers/mtd/rfd_ftl.c
-f:drivers/mtd/sm_ftl.c
-f:drivers/mtd/sm_ftl.h
-f:drivers/mtd/spi-nor/Kconfig
-f:drivers/mtd/spi-nor/Makefile
-f:drivers/mtd/spi-nor/atmel.c
-f:drivers/mtd/spi-nor/controllers/Kconfig
-f:drivers/mtd/spi-nor/controllers/Makefile
-f:drivers/mtd/spi-nor/controllers/hisi-sfc.c
-f:drivers/mtd/spi-nor/controllers/nxp-spifi.c
-f:drivers/mtd/spi-nor/core.c
-f:drivers/mtd/spi-nor/core.h
-f:drivers/mtd/spi-nor/debugfs.c
-f:drivers/mtd/spi-nor/eon.c
-f:drivers/mtd/spi-nor/esmt.c
-f:drivers/mtd/spi-nor/everspin.c
-f:drivers/mtd/spi-nor/gigadevice.c
-f:drivers/mtd/spi-nor/intel.c
-f:drivers/mtd/spi-nor/issi.c
-f:drivers/mtd/spi-nor/macronix.c
-f:drivers/mtd/spi-nor/micron-st.c
-f:drivers/mtd/spi-nor/otp.c
-f:drivers/mtd/spi-nor/sfdp.c
-f:drivers/mtd/spi-nor/sfdp.h
-f:drivers/mtd/spi-nor/spansion.c
-f:drivers/mtd/spi-nor/sst.c
-f:drivers/mtd/spi-nor/swp.c
-f:drivers/mtd/spi-nor/sysfs.c
-f:drivers/mtd/spi-nor/winbond.c
-f:drivers/mtd/spi-nor/xmc.c
-f:drivers/mtd/ssfdc.c
-f:drivers/mtd/tests/Makefile
-f:drivers/mtd/tests/mtd_nandecctest.c
-f:drivers/mtd/tests/mtd_test.c
-f:drivers/mtd/tests/mtd_test.h
-f:drivers/mtd/tests/nandbiterrs.c
-f:drivers/mtd/tests/oobtest.c
-f:drivers/mtd/tests/pagetest.c
-f:drivers/mtd/tests/readtest.c
-f:drivers/mtd/tests/speedtest.c
-f:drivers/mtd/tests/stresstest.c
-f:drivers/mtd/tests/subpagetest.c
-f:drivers/mtd/tests/torturetest.c
-f:drivers/mtd/ubi/Kconfig
-f:drivers/mtd/ubi/Makefile
-f:drivers/mtd/ubi/attach.c
-f:drivers/mtd/ubi/block.c
-f:drivers/mtd/ubi/build.c
-f:drivers/mtd/ubi/cdev.c
-f:drivers/mtd/ubi/debug.c
-f:drivers/mtd/ubi/debug.h
-f:drivers/mtd/ubi/eba.c
-f:drivers/mtd/ubi/fastmap-wl.c
-f:drivers/mtd/ubi/fastmap.c
-f:drivers/mtd/ubi/gluebi.c
-f:drivers/mtd/ubi/io.c
-f:drivers/mtd/ubi/kapi.c
-f:drivers/mtd/ubi/misc.c
-f:drivers/mtd/ubi/nvmem.c
-f:drivers/mtd/ubi/ubi-media.h
-f:drivers/mtd/ubi/ubi.h
-f:drivers/mtd/ubi/upd.c
-f:drivers/mtd/ubi/vmt.c
-f:drivers/mtd/ubi/vtbl.c
-f:drivers/mtd/ubi/wl.c
-f:drivers/mtd/ubi/wl.h
-f:drivers/mux/Kconfig
-f:drivers/mux/Makefile
-f:drivers/mux/adg792a.c
-f:drivers/mux/adgs1408.c
-f:drivers/mux/core.c
-f:drivers/mux/gpio.c
-f:drivers/mux/mmio.c
-f:drivers/net/Kconfig
-f:drivers/net/LICENSE.SRC
-f:drivers/net/Makefile
-f:drivers/net/Space.c
-f:drivers/net/amt.c
-f:drivers/net/arcnet/Kconfig
-f:drivers/net/arcnet/Makefile
-f:drivers/net/arcnet/arc-rawmode.c
-f:drivers/net/arcnet/arc-rimi.c
-f:drivers/net/arcnet/arcdevice.h
-f:drivers/net/arcnet/arcnet.c
-f:drivers/net/arcnet/capmode.c
-f:drivers/net/arcnet/com20020-isa.c
-f:drivers/net/arcnet/com20020-pci.c
-f:drivers/net/arcnet/com20020.c
-f:drivers/net/arcnet/com20020.h
-f:drivers/net/arcnet/com20020_cs.c
-f:drivers/net/arcnet/com9026.h
-f:drivers/net/arcnet/com90io.c
-f:drivers/net/arcnet/com90xx.c
-f:drivers/net/arcnet/rfc1051.c
-f:drivers/net/arcnet/rfc1201.c
-f:drivers/net/bareudp.c
-f:drivers/net/bonding/Makefile
-f:drivers/net/bonding/bond_3ad.c
-f:drivers/net/bonding/bond_alb.c
-f:drivers/net/bonding/bond_debugfs.c
-f:drivers/net/bonding/bond_main.c
-f:drivers/net/bonding/bond_netlink.c
-f:drivers/net/bonding/bond_options.c
-f:drivers/net/bonding/bond_procfs.c
-f:drivers/net/bonding/bond_sysfs.c
-f:drivers/net/bonding/bond_sysfs_slave.c
-f:drivers/net/bonding/bonding_priv.h
-f:drivers/net/caif/Kconfig
-f:drivers/net/caif/Makefile
-f:drivers/net/caif/caif_serial.c
-f:drivers/net/caif/caif_virtio.c
-f:drivers/net/can/Kconfig
-f:drivers/net/can/Makefile
-f:drivers/net/can/at91_can.c
-f:drivers/net/can/bxcan.c
-f:drivers/net/can/c_can/Kconfig
-f:drivers/net/can/c_can/Makefile
-f:drivers/net/can/c_can/c_can.h
-f:drivers/net/can/c_can/c_can_ethtool.c
-f:drivers/net/can/c_can/c_can_main.c
-f:drivers/net/can/c_can/c_can_pci.c
-f:drivers/net/can/c_can/c_can_platform.c
-f:drivers/net/can/can327.c
-f:drivers/net/can/cc770/Kconfig
-f:drivers/net/can/cc770/Makefile
-f:drivers/net/can/cc770/cc770.c
-f:drivers/net/can/cc770/cc770.h
-f:drivers/net/can/cc770/cc770_isa.c
-f:drivers/net/can/cc770/cc770_platform.c
-f:drivers/net/can/ctucanfd/Kconfig
-f:drivers/net/can/ctucanfd/Makefile
-f:drivers/net/can/ctucanfd/ctucanfd.h
-f:drivers/net/can/ctucanfd/ctucanfd_base.c
-f:drivers/net/can/ctucanfd/ctucanfd_kframe.h
-f:drivers/net/can/ctucanfd/ctucanfd_kregs.h
-f:drivers/net/can/ctucanfd/ctucanfd_pci.c
-f:drivers/net/can/ctucanfd/ctucanfd_platform.c
-f:drivers/net/can/dev/Makefile
-f:drivers/net/can/dev/bittiming.c
-f:drivers/net/can/dev/calc_bittiming.c
-f:drivers/net/can/dev/dev.c
-f:drivers/net/can/dev/length.c
-f:drivers/net/can/dev/netlink.c
-f:drivers/net/can/dev/rx-offload.c
-f:drivers/net/can/dev/skb.c
-f:drivers/net/can/esd/Kconfig
-f:drivers/net/can/esd/Makefile
-f:drivers/net/can/esd/esd_402_pci-core.c
-f:drivers/net/can/esd/esdacc.c
-f:drivers/net/can/esd/esdacc.h
-f:drivers/net/can/flexcan/Makefile
-f:drivers/net/can/flexcan/flexcan-core.c
-f:drivers/net/can/flexcan/flexcan-ethtool.c
-f:drivers/net/can/flexcan/flexcan.h
-f:drivers/net/can/grcan.c
-f:drivers/net/can/ifi_canfd/Kconfig
-f:drivers/net/can/ifi_canfd/Makefile
-f:drivers/net/can/ifi_canfd/ifi_canfd.c
-f:drivers/net/can/janz-ican3.c
-f:drivers/net/can/kvaser_pciefd/Makefile
-f:drivers/net/can/kvaser_pciefd/kvaser_pciefd.h
-f:drivers/net/can/kvaser_pciefd/kvaser_pciefd_core.c
-f:drivers/net/can/kvaser_pciefd/kvaser_pciefd_devlink.c
-f:drivers/net/can/m_can/Kconfig
-f:drivers/net/can/m_can/Makefile
-f:drivers/net/can/m_can/m_can.c
-f:drivers/net/can/m_can/m_can.h
-f:drivers/net/can/m_can/m_can_pci.c
-f:drivers/net/can/m_can/m_can_platform.c
-f:drivers/net/can/m_can/tcan4x5x-core.c
-f:drivers/net/can/m_can/tcan4x5x-regmap.c
-f:drivers/net/can/m_can/tcan4x5x.h
-f:drivers/net/can/mscan/Kconfig
-f:drivers/net/can/mscan/Makefile
-f:drivers/net/can/mscan/mpc5xxx_can.c
-f:drivers/net/can/mscan/mscan.c
-f:drivers/net/can/mscan/mscan.h
-f:drivers/net/can/peak_canfd/Kconfig
-f:drivers/net/can/peak_canfd/Makefile
-f:drivers/net/can/peak_canfd/peak_canfd.c
-f:drivers/net/can/peak_canfd/peak_canfd_user.h
-f:drivers/net/can/peak_canfd/peak_pciefd_main.c
-f:drivers/net/can/rcar/Kconfig
-f:drivers/net/can/rcar/Makefile
-f:drivers/net/can/rcar/rcar_can.c
-f:drivers/net/can/rcar/rcar_canfd.c
-f:drivers/net/can/rockchip/Kconfig
-f:drivers/net/can/rockchip/Makefile
-f:drivers/net/can/rockchip/rockchip_canfd-core.c
-f:drivers/net/can/rockchip/rockchip_canfd-ethtool.c
-f:drivers/net/can/rockchip/rockchip_canfd-rx.c
-f:drivers/net/can/rockchip/rockchip_canfd-timestamp.c
-f:drivers/net/can/rockchip/rockchip_canfd-tx.c
-f:drivers/net/can/rockchip/rockchip_canfd.h
-f:drivers/net/can/sja1000/Kconfig
-f:drivers/net/can/sja1000/Makefile
-f:drivers/net/can/sja1000/ems_pci.c
-f:drivers/net/can/sja1000/ems_pcmcia.c
-f:drivers/net/can/sja1000/f81601.c
-f:drivers/net/can/sja1000/kvaser_pci.c
-f:drivers/net/can/sja1000/peak_pci.c
-f:drivers/net/can/sja1000/peak_pcmcia.c
-f:drivers/net/can/sja1000/plx_pci.c
-f:drivers/net/can/sja1000/sja1000.c
-f:drivers/net/can/sja1000/sja1000.h
-f:drivers/net/can/sja1000/sja1000_isa.c
-f:drivers/net/can/sja1000/sja1000_platform.c
-f:drivers/net/can/sja1000/tscan1.c
-f:drivers/net/can/slcan/Makefile
-f:drivers/net/can/slcan/slcan-core.c
-f:drivers/net/can/slcan/slcan-ethtool.c
-f:drivers/net/can/slcan/slcan.h
-f:drivers/net/can/softing/Kconfig
-f:drivers/net/can/softing/Makefile
-f:drivers/net/can/softing/softing.h
-f:drivers/net/can/softing/softing_cs.c
-f:drivers/net/can/softing/softing_fw.c
-f:drivers/net/can/softing/softing_main.c
-f:drivers/net/can/softing/softing_platform.h
-f:drivers/net/can/spi/Kconfig
-f:drivers/net/can/spi/Makefile
-f:drivers/net/can/spi/hi311x.c
-f:drivers/net/can/spi/mcp251x.c
-f:drivers/net/can/spi/mcp251xfd/Kconfig
-f:drivers/net/can/spi/mcp251xfd/Makefile
-f:drivers/net/can/spi/mcp251xfd/mcp251xfd-chip-fifo.c
-f:drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
-f:drivers/net/can/spi/mcp251xfd/mcp251xfd-crc16.c
-f:drivers/net/can/spi/mcp251xfd/mcp251xfd-dump.c
-f:drivers/net/can/spi/mcp251xfd/mcp251xfd-dump.h
-f:drivers/net/can/spi/mcp251xfd/mcp251xfd-ethtool.c
-f:drivers/net/can/spi/mcp251xfd/mcp251xfd-ram.c
-f:drivers/net/can/spi/mcp251xfd/mcp251xfd-ram.h
-f:drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c
-f:drivers/net/can/spi/mcp251xfd/mcp251xfd-ring.c
-f:drivers/net/can/spi/mcp251xfd/mcp251xfd-rx.c
-f:drivers/net/can/spi/mcp251xfd/mcp251xfd-tef.c
-f:drivers/net/can/spi/mcp251xfd/mcp251xfd-timestamp.c
-f:drivers/net/can/spi/mcp251xfd/mcp251xfd-tx.c
-f:drivers/net/can/spi/mcp251xfd/mcp251xfd.h
-f:drivers/net/can/sun4i_can.c
-f:drivers/net/can/ti_hecc.c
-f:drivers/net/can/usb/Kconfig
-f:drivers/net/can/usb/Makefile
-f:drivers/net/can/usb/ems_usb.c
-f:drivers/net/can/usb/esd_usb.c
-f:drivers/net/can/usb/etas_es58x/Makefile
-f:drivers/net/can/usb/etas_es58x/es581_4.c
-f:drivers/net/can/usb/etas_es58x/es581_4.h
-f:drivers/net/can/usb/etas_es58x/es58x_core.c
-f:drivers/net/can/usb/etas_es58x/es58x_core.h
-f:drivers/net/can/usb/etas_es58x/es58x_devlink.c
-f:drivers/net/can/usb/etas_es58x/es58x_fd.c
-f:drivers/net/can/usb/etas_es58x/es58x_fd.h
-f:drivers/net/can/usb/f81604.c
-f:drivers/net/can/usb/gs_usb.c
-f:drivers/net/can/usb/kvaser_usb/Makefile
-f:drivers/net/can/usb/kvaser_usb/kvaser_usb.h
-f:drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c
-f:drivers/net/can/usb/kvaser_usb/kvaser_usb_devlink.c
-f:drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c
-f:drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c
-f:drivers/net/can/usb/mcba_usb.c
-f:drivers/net/can/usb/peak_usb/Makefile
-f:drivers/net/can/usb/peak_usb/pcan_usb.c
-f:drivers/net/can/usb/peak_usb/pcan_usb_core.c
-f:drivers/net/can/usb/peak_usb/pcan_usb_core.h
-f:drivers/net/can/usb/peak_usb/pcan_usb_fd.c
-f:drivers/net/can/usb/peak_usb/pcan_usb_pro.c
-f:drivers/net/can/usb/peak_usb/pcan_usb_pro.h
-f:drivers/net/can/usb/ucan.c
-f:drivers/net/can/usb/usb_8dev.c
-f:drivers/net/can/vcan.c
-f:drivers/net/can/vxcan.c
-f:drivers/net/can/xilinx_can.c
-f:drivers/net/dsa/Kconfig
-f:drivers/net/dsa/Makefile
-f:drivers/net/dsa/b53/Kconfig
-f:drivers/net/dsa/b53/Makefile
-f:drivers/net/dsa/b53/b53_common.c
-f:drivers/net/dsa/b53/b53_mdio.c
-f:drivers/net/dsa/b53/b53_mmap.c
-f:drivers/net/dsa/b53/b53_priv.h
-f:drivers/net/dsa/b53/b53_regs.h
-f:drivers/net/dsa/b53/b53_serdes.c
-f:drivers/net/dsa/b53/b53_serdes.h
-f:drivers/net/dsa/b53/b53_spi.c
-f:drivers/net/dsa/b53/b53_srab.c
-f:drivers/net/dsa/bcm_sf2.c
-f:drivers/net/dsa/bcm_sf2.h
-f:drivers/net/dsa/bcm_sf2_cfp.c
-f:drivers/net/dsa/bcm_sf2_regs.h
-f:drivers/net/dsa/dsa_loop.c
-f:drivers/net/dsa/dsa_loop.h
-f:drivers/net/dsa/dsa_loop_bdinfo.c
-f:drivers/net/dsa/hirschmann/Kconfig
-f:drivers/net/dsa/hirschmann/Makefile
-f:drivers/net/dsa/hirschmann/hellcreek.c
-f:drivers/net/dsa/hirschmann/hellcreek.h
-f:drivers/net/dsa/hirschmann/hellcreek_hwtstamp.c
-f:drivers/net/dsa/hirschmann/hellcreek_hwtstamp.h
-f:drivers/net/dsa/hirschmann/hellcreek_ptp.c
-f:drivers/net/dsa/hirschmann/hellcreek_ptp.h
-f:drivers/net/dsa/lan9303-core.c
-f:drivers/net/dsa/lan9303.h
-f:drivers/net/dsa/lan9303_i2c.c
-f:drivers/net/dsa/lan9303_mdio.c
-f:drivers/net/dsa/lantiq_gswip.c
-f:drivers/net/dsa/lantiq_pce.h
-f:drivers/net/dsa/microchip/Kconfig
-f:drivers/net/dsa/microchip/Makefile
-f:drivers/net/dsa/microchip/ksz8.c
-f:drivers/net/dsa/microchip/ksz8.h
-f:drivers/net/dsa/microchip/ksz8863_smi.c
-f:drivers/net/dsa/microchip/ksz8_reg.h
-f:drivers/net/dsa/microchip/ksz9477.c
-f:drivers/net/dsa/microchip/ksz9477.h
-f:drivers/net/dsa/microchip/ksz9477_acl.c
-f:drivers/net/dsa/microchip/ksz9477_i2c.c
-f:drivers/net/dsa/microchip/ksz9477_reg.h
-f:drivers/net/dsa/microchip/ksz9477_tc_flower.c
-f:drivers/net/dsa/microchip/ksz_common.c
-f:drivers/net/dsa/microchip/ksz_common.h
-f:drivers/net/dsa/microchip/ksz_dcb.c
-f:drivers/net/dsa/microchip/ksz_dcb.h
-f:drivers/net/dsa/microchip/ksz_ptp.c
-f:drivers/net/dsa/microchip/ksz_ptp.h
-f:drivers/net/dsa/microchip/ksz_ptp_reg.h
-f:drivers/net/dsa/microchip/ksz_spi.c
-f:drivers/net/dsa/microchip/lan937x.h
-f:drivers/net/dsa/microchip/lan937x_main.c
-f:drivers/net/dsa/microchip/lan937x_reg.h
-f:drivers/net/dsa/mt7530-mdio.c
-f:drivers/net/dsa/mt7530-mmio.c
-f:drivers/net/dsa/mt7530.c
-f:drivers/net/dsa/mt7530.h
-f:drivers/net/dsa/mv88e6060.c
-f:drivers/net/dsa/mv88e6060.h
-f:drivers/net/dsa/mv88e6xxx/Kconfig
-f:drivers/net/dsa/mv88e6xxx/Makefile
-f:drivers/net/dsa/mv88e6xxx/chip.c
-f:drivers/net/dsa/mv88e6xxx/chip.h
-f:drivers/net/dsa/mv88e6xxx/devlink.c
-f:drivers/net/dsa/mv88e6xxx/devlink.h
-f:drivers/net/dsa/mv88e6xxx/global1.c
-f:drivers/net/dsa/mv88e6xxx/global1.h
-f:drivers/net/dsa/mv88e6xxx/global1_atu.c
-f:drivers/net/dsa/mv88e6xxx/global1_vtu.c
-f:drivers/net/dsa/mv88e6xxx/global2.c
-f:drivers/net/dsa/mv88e6xxx/global2.h
-f:drivers/net/dsa/mv88e6xxx/global2_avb.c
-f:drivers/net/dsa/mv88e6xxx/global2_scratch.c
-f:drivers/net/dsa/mv88e6xxx/hwtstamp.c
-f:drivers/net/dsa/mv88e6xxx/hwtstamp.h
-f:drivers/net/dsa/mv88e6xxx/leds.c
-f:drivers/net/dsa/mv88e6xxx/pcs-6185.c
-f:drivers/net/dsa/mv88e6xxx/pcs-6352.c
-f:drivers/net/dsa/mv88e6xxx/pcs-639x.c
-f:drivers/net/dsa/mv88e6xxx/phy.c
-f:drivers/net/dsa/mv88e6xxx/phy.h
-f:drivers/net/dsa/mv88e6xxx/port.c
-f:drivers/net/dsa/mv88e6xxx/port.h
-f:drivers/net/dsa/mv88e6xxx/port_hidden.c
-f:drivers/net/dsa/mv88e6xxx/ptp.c
-f:drivers/net/dsa/mv88e6xxx/ptp.h
-f:drivers/net/dsa/mv88e6xxx/serdes.c
-f:drivers/net/dsa/mv88e6xxx/serdes.h
-f:drivers/net/dsa/mv88e6xxx/smi.c
-f:drivers/net/dsa/mv88e6xxx/smi.h
-f:drivers/net/dsa/mv88e6xxx/switchdev.c
-f:drivers/net/dsa/mv88e6xxx/switchdev.h
-f:drivers/net/dsa/mv88e6xxx/trace.c
-f:drivers/net/dsa/mv88e6xxx/trace.h
-f:drivers/net/dsa/ocelot/Kconfig
-f:drivers/net/dsa/ocelot/Makefile
-f:drivers/net/dsa/ocelot/felix.c
-f:drivers/net/dsa/ocelot/felix.h
-f:drivers/net/dsa/ocelot/felix_vsc9959.c
-f:drivers/net/dsa/ocelot/ocelot_ext.c
-f:drivers/net/dsa/ocelot/seville_vsc9953.c
-f:drivers/net/dsa/qca/Kconfig
-f:drivers/net/dsa/qca/Makefile
-f:drivers/net/dsa/qca/ar9331.c
-f:drivers/net/dsa/qca/qca8k-8xxx.c
-f:drivers/net/dsa/qca/qca8k-common.c
-f:drivers/net/dsa/qca/qca8k-leds.c
-f:drivers/net/dsa/qca/qca8k.h
-f:drivers/net/dsa/qca/qca8k_leds.h
-f:drivers/net/dsa/realtek/Kconfig
-f:drivers/net/dsa/realtek/Makefile
-f:drivers/net/dsa/realtek/realtek-mdio.c
-f:drivers/net/dsa/realtek/realtek-mdio.h
-f:drivers/net/dsa/realtek/realtek-smi.c
-f:drivers/net/dsa/realtek/realtek-smi.h
-f:drivers/net/dsa/realtek/realtek.h
-f:drivers/net/dsa/realtek/rtl8365mb.c
-f:drivers/net/dsa/realtek/rtl8366-core.c
-f:drivers/net/dsa/realtek/rtl8366rb-leds.c
-f:drivers/net/dsa/realtek/rtl8366rb.c
-f:drivers/net/dsa/realtek/rtl8366rb.h
-f:drivers/net/dsa/realtek/rtl83xx.c
-f:drivers/net/dsa/realtek/rtl83xx.h
-f:drivers/net/dsa/rzn1_a5psw.c
-f:drivers/net/dsa/rzn1_a5psw.h
-f:drivers/net/dsa/sja1105/Kconfig
-f:drivers/net/dsa/sja1105/Makefile
-f:drivers/net/dsa/sja1105/sja1105.h
-f:drivers/net/dsa/sja1105/sja1105_clocking.c
-f:drivers/net/dsa/sja1105/sja1105_devlink.c
-f:drivers/net/dsa/sja1105/sja1105_dynamic_config.c
-f:drivers/net/dsa/sja1105/sja1105_dynamic_config.h
-f:drivers/net/dsa/sja1105/sja1105_ethtool.c
-f:drivers/net/dsa/sja1105/sja1105_flower.c
-f:drivers/net/dsa/sja1105/sja1105_main.c
-f:drivers/net/dsa/sja1105/sja1105_mdio.c
-f:drivers/net/dsa/sja1105/sja1105_ptp.c
-f:drivers/net/dsa/sja1105/sja1105_ptp.h
-f:drivers/net/dsa/sja1105/sja1105_spi.c
-f:drivers/net/dsa/sja1105/sja1105_static_config.c
-f:drivers/net/dsa/sja1105/sja1105_static_config.h
-f:drivers/net/dsa/sja1105/sja1105_tas.c
-f:drivers/net/dsa/sja1105/sja1105_tas.h
-f:drivers/net/dsa/sja1105/sja1105_vl.c
-f:drivers/net/dsa/sja1105/sja1105_vl.h
-f:drivers/net/dsa/vitesse-vsc73xx-core.c
-f:drivers/net/dsa/vitesse-vsc73xx-platform.c
-f:drivers/net/dsa/vitesse-vsc73xx-spi.c
-f:drivers/net/dsa/vitesse-vsc73xx.h
-f:drivers/net/dsa/xrs700x/Kconfig
-f:drivers/net/dsa/xrs700x/Makefile
-f:drivers/net/dsa/xrs700x/xrs700x.c
-f:drivers/net/dsa/xrs700x/xrs700x.h
-f:drivers/net/dsa/xrs700x/xrs700x_i2c.c
-f:drivers/net/dsa/xrs700x/xrs700x_mdio.c
-f:drivers/net/dsa/xrs700x/xrs700x_reg.h
-f:drivers/net/dummy.c
-f:drivers/net/eql.c
-f:drivers/net/ethernet/3com/3c509.c
-f:drivers/net/ethernet/3com/3c515.c
-f:drivers/net/ethernet/3com/3c574_cs.c
-f:drivers/net/ethernet/3com/3c589_cs.c
-f:drivers/net/ethernet/3com/3c59x.c
-f:drivers/net/ethernet/3com/Kconfig
-f:drivers/net/ethernet/3com/Makefile
-f:drivers/net/ethernet/3com/typhoon.c
-f:drivers/net/ethernet/3com/typhoon.h
-f:drivers/net/ethernet/8390/8390.c
-f:drivers/net/ethernet/8390/8390.h
-f:drivers/net/ethernet/8390/8390p.c
-f:drivers/net/ethernet/8390/Kconfig
-f:drivers/net/ethernet/8390/Makefile
-f:drivers/net/ethernet/8390/apne.c
-f:drivers/net/ethernet/8390/ax88796.c
-f:drivers/net/ethernet/8390/axnet_cs.c
-f:drivers/net/ethernet/8390/etherh.c
-f:drivers/net/ethernet/8390/hydra.c
-f:drivers/net/ethernet/8390/lib8390.c
-f:drivers/net/ethernet/8390/mac8390.c
-f:drivers/net/ethernet/8390/mcf8390.c
-f:drivers/net/ethernet/8390/ne.c
-f:drivers/net/ethernet/8390/ne2k-pci.c
-f:drivers/net/ethernet/8390/pcnet_cs.c
-f:drivers/net/ethernet/8390/smc-ultra.c
-f:drivers/net/ethernet/8390/stnic.c
-f:drivers/net/ethernet/8390/wd.c
-f:drivers/net/ethernet/8390/xsurf100.c
-f:drivers/net/ethernet/8390/zorro8390.c
-f:drivers/net/ethernet/Kconfig
-f:drivers/net/ethernet/Makefile
-f:drivers/net/ethernet/actions/Kconfig
-f:drivers/net/ethernet/actions/Makefile
-f:drivers/net/ethernet/actions/owl-emac.c
-f:drivers/net/ethernet/actions/owl-emac.h
-f:drivers/net/ethernet/adaptec/Kconfig
-f:drivers/net/ethernet/adaptec/Makefile
-f:drivers/net/ethernet/adaptec/starfire.c
-f:drivers/net/ethernet/adi/Kconfig
-f:drivers/net/ethernet/adi/Makefile
-f:drivers/net/ethernet/adi/adin1110.c
-f:drivers/net/ethernet/aeroflex/Kconfig
-f:drivers/net/ethernet/aeroflex/Makefile
-f:drivers/net/ethernet/aeroflex/greth.c
-f:drivers/net/ethernet/aeroflex/greth.h
-f:drivers/net/ethernet/agere/Kconfig
-f:drivers/net/ethernet/agere/Makefile
-f:drivers/net/ethernet/agere/et131x.c
-f:drivers/net/ethernet/agere/et131x.h
-f:drivers/net/ethernet/airoha/Kconfig
-f:drivers/net/ethernet/airoha/Makefile
-f:drivers/net/ethernet/airoha/airoha_eth.c
-f:drivers/net/ethernet/airoha/airoha_eth.h
-f:drivers/net/ethernet/airoha/airoha_npu.c
-f:drivers/net/ethernet/airoha/airoha_npu.h
-f:drivers/net/ethernet/airoha/airoha_ppe.c
-f:drivers/net/ethernet/airoha/airoha_ppe_debugfs.c
-f:drivers/net/ethernet/airoha/airoha_regs.h
-f:drivers/net/ethernet/alacritech/Kconfig
-f:drivers/net/ethernet/alacritech/Makefile
-f:drivers/net/ethernet/alacritech/slic.h
-f:drivers/net/ethernet/alacritech/slicoss.c
-f:drivers/net/ethernet/allwinner/Kconfig
-f:drivers/net/ethernet/allwinner/Makefile
-f:drivers/net/ethernet/allwinner/sun4i-emac.c
-f:drivers/net/ethernet/allwinner/sun4i-emac.h
-f:drivers/net/ethernet/alteon/Kconfig
-f:drivers/net/ethernet/alteon/Makefile
-f:drivers/net/ethernet/alteon/acenic.c
-f:drivers/net/ethernet/alteon/acenic.h
-f:drivers/net/ethernet/altera/Kconfig
-f:drivers/net/ethernet/altera/Makefile
-f:drivers/net/ethernet/altera/altera_msgdma.c
-f:drivers/net/ethernet/altera/altera_msgdma.h
-f:drivers/net/ethernet/altera/altera_msgdmahw.h
-f:drivers/net/ethernet/altera/altera_sgdma.c
-f:drivers/net/ethernet/altera/altera_sgdma.h
-f:drivers/net/ethernet/altera/altera_sgdmahw.h
-f:drivers/net/ethernet/altera/altera_tse.h
-f:drivers/net/ethernet/altera/altera_tse_ethtool.c
-f:drivers/net/ethernet/altera/altera_tse_main.c
-f:drivers/net/ethernet/altera/altera_utils.c
-f:drivers/net/ethernet/altera/altera_utils.h
-f:drivers/net/ethernet/amazon/Kconfig
-f:drivers/net/ethernet/amazon/Makefile
-f:drivers/net/ethernet/amazon/ena/Makefile
-f:drivers/net/ethernet/amazon/ena/ena_admin_defs.h
-f:drivers/net/ethernet/amazon/ena/ena_com.c
-f:drivers/net/ethernet/amazon/ena/ena_com.h
-f:drivers/net/ethernet/amazon/ena/ena_common_defs.h
-f:drivers/net/ethernet/amazon/ena/ena_debugfs.c
-f:drivers/net/ethernet/amazon/ena/ena_debugfs.h
-f:drivers/net/ethernet/amazon/ena/ena_devlink.c
-f:drivers/net/ethernet/amazon/ena/ena_devlink.h
-f:drivers/net/ethernet/amazon/ena/ena_eth_com.c
-f:drivers/net/ethernet/amazon/ena/ena_eth_com.h
-f:drivers/net/ethernet/amazon/ena/ena_eth_io_defs.h
-f:drivers/net/ethernet/amazon/ena/ena_ethtool.c
-f:drivers/net/ethernet/amazon/ena/ena_netdev.c
-f:drivers/net/ethernet/amazon/ena/ena_netdev.h
-f:drivers/net/ethernet/amazon/ena/ena_pci_id_tbl.h
-f:drivers/net/ethernet/amazon/ena/ena_phc.c
-f:drivers/net/ethernet/amazon/ena/ena_phc.h
-f:drivers/net/ethernet/amazon/ena/ena_regs_defs.h
-f:drivers/net/ethernet/amazon/ena/ena_xdp.c
-f:drivers/net/ethernet/amazon/ena/ena_xdp.h
-f:drivers/net/ethernet/amd/7990.c
-f:drivers/net/ethernet/amd/7990.h
-f:drivers/net/ethernet/amd/Kconfig
-f:drivers/net/ethernet/amd/Makefile
-f:drivers/net/ethernet/amd/a2065.c
-f:drivers/net/ethernet/amd/a2065.h
-f:drivers/net/ethernet/amd/amd8111e.c
-f:drivers/net/ethernet/amd/amd8111e.h
-f:drivers/net/ethernet/amd/ariadne.c
-f:drivers/net/ethernet/amd/ariadne.h
-f:drivers/net/ethernet/amd/atarilance.c
-f:drivers/net/ethernet/amd/au1000_eth.c
-f:drivers/net/ethernet/amd/au1000_eth.h
-f:drivers/net/ethernet/amd/declance.c
-f:drivers/net/ethernet/amd/hplance.c
-f:drivers/net/ethernet/amd/hplance.h
-f:drivers/net/ethernet/amd/lance.c
-f:drivers/net/ethernet/amd/mvme147.c
-f:drivers/net/ethernet/amd/nmclan_cs.c
-f:drivers/net/ethernet/amd/pcnet32.c
-f:drivers/net/ethernet/amd/pds_core/Makefile
-f:drivers/net/ethernet/amd/pds_core/adminq.c
-f:drivers/net/ethernet/amd/pds_core/auxbus.c
-f:drivers/net/ethernet/amd/pds_core/core.c
-f:drivers/net/ethernet/amd/pds_core/core.h
-f:drivers/net/ethernet/amd/pds_core/debugfs.c
-f:drivers/net/ethernet/amd/pds_core/dev.c
-f:drivers/net/ethernet/amd/pds_core/devlink.c
-f:drivers/net/ethernet/amd/pds_core/fw.c
-f:drivers/net/ethernet/amd/pds_core/main.c
-f:drivers/net/ethernet/amd/sun3lance.c
-f:drivers/net/ethernet/amd/sunlance.c
-f:drivers/net/ethernet/amd/xgbe/Makefile
-f:drivers/net/ethernet/amd/xgbe/xgbe-common.h
-f:drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
-f:drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c
-f:drivers/net/ethernet/amd/xgbe/xgbe-desc.c
-f:drivers/net/ethernet/amd/xgbe/xgbe-dev.c
-f:drivers/net/ethernet/amd/xgbe/xgbe-drv.c
-f:drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
-f:drivers/net/ethernet/amd/xgbe/xgbe-hwtstamp.c
-f:drivers/net/ethernet/amd/xgbe/xgbe-i2c.c
-f:drivers/net/ethernet/amd/xgbe/xgbe-main.c
-f:drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
-f:drivers/net/ethernet/amd/xgbe/xgbe-pci.c
-f:drivers/net/ethernet/amd/xgbe/xgbe-phy-v1.c
-f:drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c
-f:drivers/net/ethernet/amd/xgbe/xgbe-platform.c
-f:drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
-f:drivers/net/ethernet/amd/xgbe/xgbe-smn.h
-f:drivers/net/ethernet/amd/xgbe/xgbe.h
-f:drivers/net/ethernet/apm/Kconfig
-f:drivers/net/ethernet/apm/Makefile
-f:drivers/net/ethernet/apm/xgene-v2/Kconfig
-f:drivers/net/ethernet/apm/xgene-v2/Makefile
-f:drivers/net/ethernet/apm/xgene-v2/enet.c
-f:drivers/net/ethernet/apm/xgene-v2/enet.h
-f:drivers/net/ethernet/apm/xgene-v2/ethtool.c
-f:drivers/net/ethernet/apm/xgene-v2/ethtool.h
-f:drivers/net/ethernet/apm/xgene-v2/mac.c
-f:drivers/net/ethernet/apm/xgene-v2/mac.h
-f:drivers/net/ethernet/apm/xgene-v2/main.c
-f:drivers/net/ethernet/apm/xgene-v2/main.h
-f:drivers/net/ethernet/apm/xgene-v2/mdio.c
-f:drivers/net/ethernet/apm/xgene-v2/ring.c
-f:drivers/net/ethernet/apm/xgene-v2/ring.h
-f:drivers/net/ethernet/apm/xgene/Kconfig
-f:drivers/net/ethernet/apm/xgene/Makefile
-f:drivers/net/ethernet/apm/xgene/xgene_enet_cle.c
-f:drivers/net/ethernet/apm/xgene/xgene_enet_cle.h
-f:drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c
-f:drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
-f:drivers/net/ethernet/apm/xgene/xgene_enet_hw.h
-f:drivers/net/ethernet/apm/xgene/xgene_enet_main.c
-f:drivers/net/ethernet/apm/xgene/xgene_enet_main.h
-f:drivers/net/ethernet/apm/xgene/xgene_enet_ring2.c
-f:drivers/net/ethernet/apm/xgene/xgene_enet_ring2.h
-f:drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c
-f:drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.h
-f:drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c
-f:drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h
-f:drivers/net/ethernet/apple/Kconfig
-f:drivers/net/ethernet/apple/Makefile
-f:drivers/net/ethernet/apple/bmac.c
-f:drivers/net/ethernet/apple/bmac.h
-f:drivers/net/ethernet/apple/mace.c
-f:drivers/net/ethernet/apple/mace.h
-f:drivers/net/ethernet/apple/macmace.c
-f:drivers/net/ethernet/aquantia/Kconfig
-f:drivers/net/ethernet/aquantia/Makefile
-f:drivers/net/ethernet/aquantia/atlantic/Makefile
-f:drivers/net/ethernet/aquantia/atlantic/aq_cfg.h
-f:drivers/net/ethernet/aquantia/atlantic/aq_common.h
-f:drivers/net/ethernet/aquantia/atlantic/aq_drvinfo.c
-f:drivers/net/ethernet/aquantia/atlantic/aq_drvinfo.h
-f:drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c
-f:drivers/net/ethernet/aquantia/atlantic/aq_ethtool.h
-f:drivers/net/ethernet/aquantia/atlantic/aq_filters.c
-f:drivers/net/ethernet/aquantia/atlantic/aq_filters.h
-f:drivers/net/ethernet/aquantia/atlantic/aq_hw.h
-f:drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.c
-f:drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.h
-f:drivers/net/ethernet/aquantia/atlantic/aq_macsec.c
-f:drivers/net/ethernet/aquantia/atlantic/aq_macsec.h
-f:drivers/net/ethernet/aquantia/atlantic/aq_main.c
-f:drivers/net/ethernet/aquantia/atlantic/aq_main.h
-f:drivers/net/ethernet/aquantia/atlantic/aq_nic.c
-f:drivers/net/ethernet/aquantia/atlantic/aq_nic.h
-f:drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c
-f:drivers/net/ethernet/aquantia/atlantic/aq_pci_func.h
-f:drivers/net/ethernet/aquantia/atlantic/aq_phy.c
-f:drivers/net/ethernet/aquantia/atlantic/aq_phy.h
-f:drivers/net/ethernet/aquantia/atlantic/aq_ptp.c
-f:drivers/net/ethernet/aquantia/atlantic/aq_ptp.h
-f:drivers/net/ethernet/aquantia/atlantic/aq_ring.c
-f:drivers/net/ethernet/aquantia/atlantic/aq_ring.h
-f:drivers/net/ethernet/aquantia/atlantic/aq_rss.h
-f:drivers/net/ethernet/aquantia/atlantic/aq_utils.h
-f:drivers/net/ethernet/aquantia/atlantic/aq_vec.c
-f:drivers/net/ethernet/aquantia/atlantic/aq_vec.h
-f:drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c
-f:drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.h
-f:drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0_internal.h
-f:drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
-f:drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.h
-f:drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0_internal.h
-f:drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c
-f:drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h
-f:drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh_internal.h
-f:drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c
-f:drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h
-f:drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c
-f:drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c
-f:drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.h
-f:drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_internal.h
-f:drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_llh.c
-f:drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_llh.h
-f:drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_llh_internal.h
-f:drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils.c
-f:drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils.h
-f:drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c
-f:drivers/net/ethernet/aquantia/atlantic/macsec/MSS_Egress_registers.h
-f:drivers/net/ethernet/aquantia/atlantic/macsec/MSS_Ingress_registers.h
-f:drivers/net/ethernet/aquantia/atlantic/macsec/macsec_api.c
-f:drivers/net/ethernet/aquantia/atlantic/macsec/macsec_api.h
-f:drivers/net/ethernet/aquantia/atlantic/macsec/macsec_struct.h
-f:drivers/net/ethernet/arc/Kconfig
-f:drivers/net/ethernet/arc/Makefile
-f:drivers/net/ethernet/arc/emac.h
-f:drivers/net/ethernet/arc/emac_main.c
-f:drivers/net/ethernet/arc/emac_mdio.c
-f:drivers/net/ethernet/arc/emac_rockchip.c
-f:drivers/net/ethernet/asix/Kconfig
-f:drivers/net/ethernet/asix/Makefile
-f:drivers/net/ethernet/asix/ax88796c_ioctl.c
-f:drivers/net/ethernet/asix/ax88796c_ioctl.h
-f:drivers/net/ethernet/asix/ax88796c_main.c
-f:drivers/net/ethernet/asix/ax88796c_main.h
-f:drivers/net/ethernet/asix/ax88796c_spi.c
-f:drivers/net/ethernet/asix/ax88796c_spi.h
-f:drivers/net/ethernet/atheros/Kconfig
-f:drivers/net/ethernet/atheros/Makefile
-f:drivers/net/ethernet/atheros/ag71xx.c
-f:drivers/net/ethernet/atheros/alx/Makefile
-f:drivers/net/ethernet/atheros/alx/alx.h
-f:drivers/net/ethernet/atheros/alx/ethtool.c
-f:drivers/net/ethernet/atheros/alx/hw.c
-f:drivers/net/ethernet/atheros/alx/hw.h
-f:drivers/net/ethernet/atheros/alx/main.c
-f:drivers/net/ethernet/atheros/alx/reg.h
-f:drivers/net/ethernet/atheros/atl1c/Makefile
-f:drivers/net/ethernet/atheros/atl1c/atl1c.h
-f:drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c
-f:drivers/net/ethernet/atheros/atl1c/atl1c_hw.c
-f:drivers/net/ethernet/atheros/atl1c/atl1c_hw.h
-f:drivers/net/ethernet/atheros/atl1c/atl1c_main.c
-f:drivers/net/ethernet/atheros/atl1e/Makefile
-f:drivers/net/ethernet/atheros/atl1e/atl1e.h
-f:drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c
-f:drivers/net/ethernet/atheros/atl1e/atl1e_hw.c
-f:drivers/net/ethernet/atheros/atl1e/atl1e_hw.h
-f:drivers/net/ethernet/atheros/atl1e/atl1e_main.c
-f:drivers/net/ethernet/atheros/atl1e/atl1e_param.c
-f:drivers/net/ethernet/atheros/atlx/Makefile
-f:drivers/net/ethernet/atheros/atlx/atl1.c
-f:drivers/net/ethernet/atheros/atlx/atl1.h
-f:drivers/net/ethernet/atheros/atlx/atl2.c
-f:drivers/net/ethernet/atheros/atlx/atl2.h
-f:drivers/net/ethernet/atheros/atlx/atlx.c
-f:drivers/net/ethernet/atheros/atlx/atlx.h
-f:drivers/net/ethernet/broadcom/Kconfig
-f:drivers/net/ethernet/broadcom/Makefile
-f:drivers/net/ethernet/broadcom/asp2/Makefile
-f:drivers/net/ethernet/broadcom/asp2/bcmasp.c
-f:drivers/net/ethernet/broadcom/asp2/bcmasp.h
-f:drivers/net/ethernet/broadcom/asp2/bcmasp_ethtool.c
-f:drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c
-f:drivers/net/ethernet/broadcom/asp2/bcmasp_intf_defs.h
-f:drivers/net/ethernet/broadcom/b44.c
-f:drivers/net/ethernet/broadcom/b44.h
-f:drivers/net/ethernet/broadcom/bcm4908_enet.c
-f:drivers/net/ethernet/broadcom/bcm4908_enet.h
-f:drivers/net/ethernet/broadcom/bcm63xx_enet.c
-f:drivers/net/ethernet/broadcom/bcm63xx_enet.h
-f:drivers/net/ethernet/broadcom/bcmsysport.c
-f:drivers/net/ethernet/broadcom/bcmsysport.h
-f:drivers/net/ethernet/broadcom/bgmac-bcma-mdio.c
-f:drivers/net/ethernet/broadcom/bgmac-bcma.c
-f:drivers/net/ethernet/broadcom/bgmac-platform.c
-f:drivers/net/ethernet/broadcom/bgmac.c
-f:drivers/net/ethernet/broadcom/bgmac.h
-f:drivers/net/ethernet/broadcom/bnge/Makefile
-f:drivers/net/ethernet/broadcom/bnge/bnge.h
-f:drivers/net/ethernet/broadcom/bnge/bnge_core.c
-f:drivers/net/ethernet/broadcom/bnge/bnge_devlink.c
-f:drivers/net/ethernet/broadcom/bnge/bnge_devlink.h
-f:drivers/net/ethernet/broadcom/bnge/bnge_ethtool.c
-f:drivers/net/ethernet/broadcom/bnge/bnge_ethtool.h
-f:drivers/net/ethernet/broadcom/bnge/bnge_hwrm.c
-f:drivers/net/ethernet/broadcom/bnge/bnge_hwrm.h
-f:drivers/net/ethernet/broadcom/bnge/bnge_hwrm_lib.c
-f:drivers/net/ethernet/broadcom/bnge/bnge_hwrm_lib.h
-f:drivers/net/ethernet/broadcom/bnge/bnge_netdev.c
-f:drivers/net/ethernet/broadcom/bnge/bnge_netdev.h
-f:drivers/net/ethernet/broadcom/bnge/bnge_resc.c
-f:drivers/net/ethernet/broadcom/bnge/bnge_resc.h
-f:drivers/net/ethernet/broadcom/bnge/bnge_rmem.c
-f:drivers/net/ethernet/broadcom/bnge/bnge_rmem.h
-f:drivers/net/ethernet/broadcom/bnx2.c
-f:drivers/net/ethernet/broadcom/bnx2.h
-f:drivers/net/ethernet/broadcom/bnx2_fw.h
-f:drivers/net/ethernet/broadcom/bnx2x/Makefile
-f:drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
-f:drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
-f:drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
-f:drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c
-f:drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h
-f:drivers/net/ethernet/broadcom/bnx2x/bnx2x_dump.h
-f:drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
-f:drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h
-f:drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_file_hdr.h
-f:drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
-f:drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h
-f:drivers/net/ethernet/broadcom/bnx2x/bnx2x_init_ops.h
-f:drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
-f:drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h
-f:drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
-f:drivers/net/ethernet/broadcom/bnx2x/bnx2x_mfw_req.h
-f:drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h
-f:drivers/net/ethernet/broadcom/bnx2x/bnx2x_self_test.c
-f:drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
-f:drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
-f:drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
-f:drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h
-f:drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
-f:drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h
-f:drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c
-f:drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.h
-f:drivers/net/ethernet/broadcom/bnxt/Makefile
-f:drivers/net/ethernet/broadcom/bnxt/bnxt.c
-f:drivers/net/ethernet/broadcom/bnxt/bnxt.h
-f:drivers/net/ethernet/broadcom/bnxt/bnxt_coredump.c
-f:drivers/net/ethernet/broadcom/bnxt/bnxt_coredump.h
-f:drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c
-f:drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.h
-f:drivers/net/ethernet/broadcom/bnxt/bnxt_debugfs.c
-f:drivers/net/ethernet/broadcom/bnxt/bnxt_debugfs.h
-f:drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
-f:drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h
-f:drivers/net/ethernet/broadcom/bnxt/bnxt_dim.c
-f:drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
-f:drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h
-f:drivers/net/ethernet/broadcom/bnxt/bnxt_fw_hdr.h
-f:drivers/net/ethernet/broadcom/bnxt/bnxt_hwmon.c
-f:drivers/net/ethernet/broadcom/bnxt/bnxt_hwmon.h
-f:drivers/net/ethernet/broadcom/bnxt/bnxt_hwrm.c
-f:drivers/net/ethernet/broadcom/bnxt/bnxt_hwrm.h
-f:drivers/net/ethernet/broadcom/bnxt/bnxt_nvm_defs.h
-f:drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c
-f:drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h
-f:drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
-f:drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.h
-f:drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c
-f:drivers/net/ethernet/broadcom/bnxt/bnxt_tc.h
-f:drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c
-f:drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h
-f:drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c
-f:drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.h
-f:drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c
-f:drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h
-f:drivers/net/ethernet/broadcom/cnic.c
-f:drivers/net/ethernet/broadcom/cnic.h
-f:drivers/net/ethernet/broadcom/cnic_defs.h
-f:drivers/net/ethernet/broadcom/cnic_if.h
-f:drivers/net/ethernet/broadcom/genet/Makefile
-f:drivers/net/ethernet/broadcom/genet/bcmgenet.c
-f:drivers/net/ethernet/broadcom/genet/bcmgenet.h
-f:drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c
-f:drivers/net/ethernet/broadcom/genet/bcmmii.c
-f:drivers/net/ethernet/broadcom/sb1250-mac.c
-f:drivers/net/ethernet/broadcom/tg3.c
-f:drivers/net/ethernet/broadcom/tg3.h
-f:drivers/net/ethernet/broadcom/unimac.h
-f:drivers/net/ethernet/brocade/Kconfig
-f:drivers/net/ethernet/brocade/Makefile
-f:drivers/net/ethernet/brocade/bna/Kconfig
-f:drivers/net/ethernet/brocade/bna/Makefile
-f:drivers/net/ethernet/brocade/bna/bfa_cee.c
-f:drivers/net/ethernet/brocade/bna/bfa_cee.h
-f:drivers/net/ethernet/brocade/bna/bfa_cs.h
-f:drivers/net/ethernet/brocade/bna/bfa_defs.h
-f:drivers/net/ethernet/brocade/bna/bfa_defs_cna.h
-f:drivers/net/ethernet/brocade/bna/bfa_defs_mfg_comm.h
-f:drivers/net/ethernet/brocade/bna/bfa_defs_status.h
-f:drivers/net/ethernet/brocade/bna/bfa_ioc.c
-f:drivers/net/ethernet/brocade/bna/bfa_ioc.h
-f:drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c
-f:drivers/net/ethernet/brocade/bna/bfa_msgq.c
-f:drivers/net/ethernet/brocade/bna/bfa_msgq.h
-f:drivers/net/ethernet/brocade/bna/bfi.h
-f:drivers/net/ethernet/brocade/bna/bfi_cna.h
-f:drivers/net/ethernet/brocade/bna/bfi_enet.h
-f:drivers/net/ethernet/brocade/bna/bfi_reg.h
-f:drivers/net/ethernet/brocade/bna/bna.h
-f:drivers/net/ethernet/brocade/bna/bna_enet.c
-f:drivers/net/ethernet/brocade/bna/bna_hw_defs.h
-f:drivers/net/ethernet/brocade/bna/bna_tx_rx.c
-f:drivers/net/ethernet/brocade/bna/bna_types.h
-f:drivers/net/ethernet/brocade/bna/bnad.c
-f:drivers/net/ethernet/brocade/bna/bnad.h
-f:drivers/net/ethernet/brocade/bna/bnad_debugfs.c
-f:drivers/net/ethernet/brocade/bna/bnad_ethtool.c
-f:drivers/net/ethernet/brocade/bna/cna.h
-f:drivers/net/ethernet/brocade/bna/cna_fwimg.c
-f:drivers/net/ethernet/cadence/Kconfig
-f:drivers/net/ethernet/cadence/Makefile
-f:drivers/net/ethernet/cadence/macb.h
-f:drivers/net/ethernet/cadence/macb_main.c
-f:drivers/net/ethernet/cadence/macb_pci.c
-f:drivers/net/ethernet/cadence/macb_ptp.c
-f:drivers/net/ethernet/calxeda/Kconfig
-f:drivers/net/ethernet/calxeda/Makefile
-f:drivers/net/ethernet/calxeda/xgmac.c
-f:drivers/net/ethernet/cavium/Kconfig
-f:drivers/net/ethernet/cavium/Makefile
-f:drivers/net/ethernet/cavium/common/Makefile
-f:drivers/net/ethernet/cavium/common/cavium_ptp.c
-f:drivers/net/ethernet/cavium/common/cavium_ptp.h
-f:drivers/net/ethernet/cavium/liquidio/Makefile
-f:drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c
-f:drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.h
-f:drivers/net/ethernet/cavium/liquidio/cn23xx_pf_regs.h
-f:drivers/net/ethernet/cavium/liquidio/cn23xx_vf_device.c
-f:drivers/net/ethernet/cavium/liquidio/cn23xx_vf_device.h
-f:drivers/net/ethernet/cavium/liquidio/cn23xx_vf_regs.h
-f:drivers/net/ethernet/cavium/liquidio/cn66xx_device.c
-f:drivers/net/ethernet/cavium/liquidio/cn66xx_device.h
-f:drivers/net/ethernet/cavium/liquidio/cn66xx_regs.h
-f:drivers/net/ethernet/cavium/liquidio/cn68xx_device.c
-f:drivers/net/ethernet/cavium/liquidio/cn68xx_device.h
-f:drivers/net/ethernet/cavium/liquidio/cn68xx_regs.h
-f:drivers/net/ethernet/cavium/liquidio/lio_core.c
-f:drivers/net/ethernet/cavium/liquidio/lio_ethtool.c
-f:drivers/net/ethernet/cavium/liquidio/lio_main.c
-f:drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
-f:drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c
-f:drivers/net/ethernet/cavium/liquidio/lio_vf_rep.h
-f:drivers/net/ethernet/cavium/liquidio/liquidio_common.h
-f:drivers/net/ethernet/cavium/liquidio/liquidio_image.h
-f:drivers/net/ethernet/cavium/liquidio/octeon_config.h
-f:drivers/net/ethernet/cavium/liquidio/octeon_console.c
-f:drivers/net/ethernet/cavium/liquidio/octeon_device.c
-f:drivers/net/ethernet/cavium/liquidio/octeon_device.h
-f:drivers/net/ethernet/cavium/liquidio/octeon_droq.c
-f:drivers/net/ethernet/cavium/liquidio/octeon_droq.h
-f:drivers/net/ethernet/cavium/liquidio/octeon_iq.h
-f:drivers/net/ethernet/cavium/liquidio/octeon_mailbox.c
-f:drivers/net/ethernet/cavium/liquidio/octeon_mailbox.h
-f:drivers/net/ethernet/cavium/liquidio/octeon_main.h
-f:drivers/net/ethernet/cavium/liquidio/octeon_mem_ops.c
-f:drivers/net/ethernet/cavium/liquidio/octeon_mem_ops.h
-f:drivers/net/ethernet/cavium/liquidio/octeon_network.h
-f:drivers/net/ethernet/cavium/liquidio/octeon_nic.c
-f:drivers/net/ethernet/cavium/liquidio/octeon_nic.h
-f:drivers/net/ethernet/cavium/liquidio/request_manager.c
-f:drivers/net/ethernet/cavium/liquidio/response_manager.c
-f:drivers/net/ethernet/cavium/liquidio/response_manager.h
-f:drivers/net/ethernet/cavium/octeon/Makefile
-f:drivers/net/ethernet/cavium/octeon/octeon_mgmt.c
-f:drivers/net/ethernet/cavium/thunder/Makefile
-f:drivers/net/ethernet/cavium/thunder/nic.h
-f:drivers/net/ethernet/cavium/thunder/nic_main.c
-f:drivers/net/ethernet/cavium/thunder/nic_reg.h
-f:drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c
-f:drivers/net/ethernet/cavium/thunder/nicvf_main.c
-f:drivers/net/ethernet/cavium/thunder/nicvf_queues.c
-f:drivers/net/ethernet/cavium/thunder/nicvf_queues.h
-f:drivers/net/ethernet/cavium/thunder/q_struct.h
-f:drivers/net/ethernet/cavium/thunder/thunder_bgx.c
-f:drivers/net/ethernet/cavium/thunder/thunder_bgx.h
-f:drivers/net/ethernet/cavium/thunder/thunder_xcv.c
-f:drivers/net/ethernet/chelsio/Kconfig
-f:drivers/net/ethernet/chelsio/Makefile
-f:drivers/net/ethernet/chelsio/cxgb/Makefile
-f:drivers/net/ethernet/chelsio/cxgb/common.h
-f:drivers/net/ethernet/chelsio/cxgb/cphy.h
-f:drivers/net/ethernet/chelsio/cxgb/cpl5_cmd.h
-f:drivers/net/ethernet/chelsio/cxgb/cxgb2.c
-f:drivers/net/ethernet/chelsio/cxgb/elmer0.h
-f:drivers/net/ethernet/chelsio/cxgb/espi.c
-f:drivers/net/ethernet/chelsio/cxgb/espi.h
-f:drivers/net/ethernet/chelsio/cxgb/fpga_defs.h
-f:drivers/net/ethernet/chelsio/cxgb/gmac.h
-f:drivers/net/ethernet/chelsio/cxgb/mv88e1xxx.c
-f:drivers/net/ethernet/chelsio/cxgb/mv88e1xxx.h
-f:drivers/net/ethernet/chelsio/cxgb/mv88x201x.c
-f:drivers/net/ethernet/chelsio/cxgb/my3126.c
-f:drivers/net/ethernet/chelsio/cxgb/pm3393.c
-f:drivers/net/ethernet/chelsio/cxgb/regs.h
-f:drivers/net/ethernet/chelsio/cxgb/sge.c
-f:drivers/net/ethernet/chelsio/cxgb/sge.h
-f:drivers/net/ethernet/chelsio/cxgb/subr.c
-f:drivers/net/ethernet/chelsio/cxgb/suni1x10gexp_regs.h
-f:drivers/net/ethernet/chelsio/cxgb/tp.c
-f:drivers/net/ethernet/chelsio/cxgb/tp.h
-f:drivers/net/ethernet/chelsio/cxgb/vsc7326.c
-f:drivers/net/ethernet/chelsio/cxgb/vsc7326_reg.h
-f:drivers/net/ethernet/chelsio/cxgb3/Makefile
-f:drivers/net/ethernet/chelsio/cxgb3/adapter.h
-f:drivers/net/ethernet/chelsio/cxgb3/ael1002.c
-f:drivers/net/ethernet/chelsio/cxgb3/aq100x.c
-f:drivers/net/ethernet/chelsio/cxgb3/common.h
-f:drivers/net/ethernet/chelsio/cxgb3/cxgb3_ctl_defs.h
-f:drivers/net/ethernet/chelsio/cxgb3/cxgb3_defs.h
-f:drivers/net/ethernet/chelsio/cxgb3/cxgb3_ioctl.h
-f:drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
-f:drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
-f:drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.h
-f:drivers/net/ethernet/chelsio/cxgb3/firmware_exports.h
-f:drivers/net/ethernet/chelsio/cxgb3/l2t.c
-f:drivers/net/ethernet/chelsio/cxgb3/l2t.h
-f:drivers/net/ethernet/chelsio/cxgb3/mc5.c
-f:drivers/net/ethernet/chelsio/cxgb3/regs.h
-f:drivers/net/ethernet/chelsio/cxgb3/sge.c
-f:drivers/net/ethernet/chelsio/cxgb3/sge_defs.h
-f:drivers/net/ethernet/chelsio/cxgb3/t3_cpl.h
-f:drivers/net/ethernet/chelsio/cxgb3/t3_hw.c
-f:drivers/net/ethernet/chelsio/cxgb3/t3cdev.h
-f:drivers/net/ethernet/chelsio/cxgb3/version.h
-f:drivers/net/ethernet/chelsio/cxgb3/vsc8211.c
-f:drivers/net/ethernet/chelsio/cxgb3/xgmac.c
-f:drivers/net/ethernet/chelsio/cxgb4/Makefile
-f:drivers/net/ethernet/chelsio/cxgb4/clip_tbl.c
-f:drivers/net/ethernet/chelsio/cxgb4/clip_tbl.h
-f:drivers/net/ethernet/chelsio/cxgb4/cudbg_common.c
-f:drivers/net/ethernet/chelsio/cxgb4/cudbg_entity.h
-f:drivers/net/ethernet/chelsio/cxgb4/cudbg_if.h
-f:drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c
-f:drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.h
-f:drivers/net/ethernet/chelsio/cxgb4/cudbg_lib_common.h
-f:drivers/net/ethernet/chelsio/cxgb4/cudbg_zlib.c
-f:drivers/net/ethernet/chelsio/cxgb4/cudbg_zlib.h
-f:drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
-f:drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.c
-f:drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.h
-f:drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c
-f:drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.h
-f:drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c
-f:drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.h
-f:drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c
-f:drivers/net/ethernet/chelsio/cxgb4/cxgb4_fcoe.c
-f:drivers/net/ethernet/chelsio/cxgb4/cxgb4_fcoe.h
-f:drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c
-f:drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.h
-f:drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
-f:drivers/net/ethernet/chelsio/cxgb4/cxgb4_mps.c
-f:drivers/net/ethernet/chelsio/cxgb4/cxgb4_ptp.c
-f:drivers/net/ethernet/chelsio/cxgb4/cxgb4_ptp.h
-f:drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c
-f:drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.h
-f:drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_matchall.c
-f:drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_matchall.h
-f:drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.c
-f:drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.h
-f:drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c
-f:drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.h
-f:drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32_parse.h
-f:drivers/net/ethernet/chelsio/cxgb4/cxgb4_thermal.c
-f:drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c
-f:drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h
-f:drivers/net/ethernet/chelsio/cxgb4/l2t.c
-f:drivers/net/ethernet/chelsio/cxgb4/l2t.h
-f:drivers/net/ethernet/chelsio/cxgb4/sched.c
-f:drivers/net/ethernet/chelsio/cxgb4/sched.h
-f:drivers/net/ethernet/chelsio/cxgb4/sge.c
-f:drivers/net/ethernet/chelsio/cxgb4/smt.c
-f:drivers/net/ethernet/chelsio/cxgb4/smt.h
-f:drivers/net/ethernet/chelsio/cxgb4/srq.c
-f:drivers/net/ethernet/chelsio/cxgb4/srq.h
-f:drivers/net/ethernet/chelsio/cxgb4/t4_chip_type.h
-f:drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
-f:drivers/net/ethernet/chelsio/cxgb4/t4_hw.h
-f:drivers/net/ethernet/chelsio/cxgb4/t4_msg.h
-f:drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h
-f:drivers/net/ethernet/chelsio/cxgb4/t4_regs.h
-f:drivers/net/ethernet/chelsio/cxgb4/t4_tcb.h
-f:drivers/net/ethernet/chelsio/cxgb4/t4_values.h
-f:drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h
-f:drivers/net/ethernet/chelsio/cxgb4/t4fw_version.h
-f:drivers/net/ethernet/chelsio/cxgb4vf/Makefile
-f:drivers/net/ethernet/chelsio/cxgb4vf/adapter.h
-f:drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
-f:drivers/net/ethernet/chelsio/cxgb4vf/sge.c
-f:drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h
-f:drivers/net/ethernet/chelsio/cxgb4vf/t4vf_defs.h
-f:drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c
-f:drivers/net/ethernet/chelsio/inline_crypto/Kconfig
-f:drivers/net/ethernet/chelsio/inline_crypto/Makefile
-f:drivers/net/ethernet/chelsio/inline_crypto/ch_ipsec/Makefile
-f:drivers/net/ethernet/chelsio/inline_crypto/ch_ipsec/chcr_ipsec.c
-f:drivers/net/ethernet/chelsio/inline_crypto/ch_ipsec/chcr_ipsec.h
-f:drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/Makefile
-f:drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_common.h
-f:drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.c
-f:drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.h
-f:drivers/net/ethernet/chelsio/inline_crypto/chtls/Makefile
-f:drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls.h
-f:drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c
-f:drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.h
-f:drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_hw.c
-f:drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_io.c
-f:drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_main.c
-f:drivers/net/ethernet/chelsio/libcxgb/Makefile
-f:drivers/net/ethernet/chelsio/libcxgb/libcxgb_cm.c
-f:drivers/net/ethernet/chelsio/libcxgb/libcxgb_cm.h
-f:drivers/net/ethernet/chelsio/libcxgb/libcxgb_ppm.c
-f:drivers/net/ethernet/chelsio/libcxgb/libcxgb_ppm.h
-f:drivers/net/ethernet/cirrus/Kconfig
-f:drivers/net/ethernet/cirrus/Makefile
-f:drivers/net/ethernet/cirrus/cs89x0.c
-f:drivers/net/ethernet/cirrus/cs89x0.h
-f:drivers/net/ethernet/cirrus/ep93xx_eth.c
-f:drivers/net/ethernet/cirrus/mac89x0.c
-f:drivers/net/ethernet/cisco/Kconfig
-f:drivers/net/ethernet/cisco/Makefile
-f:drivers/net/ethernet/cisco/enic/Kconfig
-f:drivers/net/ethernet/cisco/enic/Makefile
-f:drivers/net/ethernet/cisco/enic/cq_desc.h
-f:drivers/net/ethernet/cisco/enic/cq_enet_desc.h
-f:drivers/net/ethernet/cisco/enic/enic.h
-f:drivers/net/ethernet/cisco/enic/enic_api.c
-f:drivers/net/ethernet/cisco/enic/enic_api.h
-f:drivers/net/ethernet/cisco/enic/enic_clsf.c
-f:drivers/net/ethernet/cisco/enic/enic_clsf.h
-f:drivers/net/ethernet/cisco/enic/enic_dev.c
-f:drivers/net/ethernet/cisco/enic/enic_dev.h
-f:drivers/net/ethernet/cisco/enic/enic_ethtool.c
-f:drivers/net/ethernet/cisco/enic/enic_main.c
-f:drivers/net/ethernet/cisco/enic/enic_pp.c
-f:drivers/net/ethernet/cisco/enic/enic_pp.h
-f:drivers/net/ethernet/cisco/enic/enic_res.c
-f:drivers/net/ethernet/cisco/enic/enic_res.h
-f:drivers/net/ethernet/cisco/enic/enic_rq.c
-f:drivers/net/ethernet/cisco/enic/enic_rq.h
-f:drivers/net/ethernet/cisco/enic/enic_wq.c
-f:drivers/net/ethernet/cisco/enic/enic_wq.h
-f:drivers/net/ethernet/cisco/enic/rq_enet_desc.h
-f:drivers/net/ethernet/cisco/enic/vnic_cq.c
-f:drivers/net/ethernet/cisco/enic/vnic_cq.h
-f:drivers/net/ethernet/cisco/enic/vnic_dev.c
-f:drivers/net/ethernet/cisco/enic/vnic_dev.h
-f:drivers/net/ethernet/cisco/enic/vnic_devcmd.h
-f:drivers/net/ethernet/cisco/enic/vnic_enet.h
-f:drivers/net/ethernet/cisco/enic/vnic_intr.c
-f:drivers/net/ethernet/cisco/enic/vnic_intr.h
-f:drivers/net/ethernet/cisco/enic/vnic_nic.h
-f:drivers/net/ethernet/cisco/enic/vnic_resource.h
-f:drivers/net/ethernet/cisco/enic/vnic_rq.c
-f:drivers/net/ethernet/cisco/enic/vnic_rq.h
-f:drivers/net/ethernet/cisco/enic/vnic_rss.h
-f:drivers/net/ethernet/cisco/enic/vnic_stats.h
-f:drivers/net/ethernet/cisco/enic/vnic_vic.c
-f:drivers/net/ethernet/cisco/enic/vnic_vic.h
-f:drivers/net/ethernet/cisco/enic/vnic_wq.c
-f:drivers/net/ethernet/cisco/enic/vnic_wq.h
-f:drivers/net/ethernet/cisco/enic/wq_enet_desc.h
-f:drivers/net/ethernet/cortina/Kconfig
-f:drivers/net/ethernet/cortina/Makefile
-f:drivers/net/ethernet/cortina/gemini.c
-f:drivers/net/ethernet/cortina/gemini.h
-f:drivers/net/ethernet/davicom/Kconfig
-f:drivers/net/ethernet/davicom/Makefile
-f:drivers/net/ethernet/davicom/dm9000.c
-f:drivers/net/ethernet/davicom/dm9000.h
-f:drivers/net/ethernet/davicom/dm9051.c
-f:drivers/net/ethernet/davicom/dm9051.h
-f:drivers/net/ethernet/dec/Kconfig
-f:drivers/net/ethernet/dec/Makefile
-f:drivers/net/ethernet/dec/tulip/21142.c
-f:drivers/net/ethernet/dec/tulip/Kconfig
-f:drivers/net/ethernet/dec/tulip/Makefile
-f:drivers/net/ethernet/dec/tulip/de2104x.c
-f:drivers/net/ethernet/dec/tulip/dmfe.c
-f:drivers/net/ethernet/dec/tulip/eeprom.c
-f:drivers/net/ethernet/dec/tulip/interrupt.c
-f:drivers/net/ethernet/dec/tulip/media.c
-f:drivers/net/ethernet/dec/tulip/pnic.c
-f:drivers/net/ethernet/dec/tulip/pnic2.c
-f:drivers/net/ethernet/dec/tulip/timer.c
-f:drivers/net/ethernet/dec/tulip/tulip.h
-f:drivers/net/ethernet/dec/tulip/tulip_core.c
-f:drivers/net/ethernet/dec/tulip/uli526x.c
-f:drivers/net/ethernet/dec/tulip/winbond-840.c
-f:drivers/net/ethernet/dec/tulip/xircom_cb.c
-f:drivers/net/ethernet/dlink/Kconfig
-f:drivers/net/ethernet/dlink/Makefile
-f:drivers/net/ethernet/dlink/dl2k.c
-f:drivers/net/ethernet/dlink/dl2k.h
-f:drivers/net/ethernet/dnet.c
-f:drivers/net/ethernet/dnet.h
-f:drivers/net/ethernet/ec_bhf.c
-f:drivers/net/ethernet/emulex/Kconfig
-f:drivers/net/ethernet/emulex/Makefile
-f:drivers/net/ethernet/emulex/benet/Kconfig
-f:drivers/net/ethernet/emulex/benet/Makefile
-f:drivers/net/ethernet/emulex/benet/be.h
-f:drivers/net/ethernet/emulex/benet/be_cmds.c
-f:drivers/net/ethernet/emulex/benet/be_cmds.h
-f:drivers/net/ethernet/emulex/benet/be_ethtool.c
-f:drivers/net/ethernet/emulex/benet/be_hw.h
-f:drivers/net/ethernet/emulex/benet/be_main.c
-f:drivers/net/ethernet/emulex/benet/be_roce.c
-f:drivers/net/ethernet/emulex/benet/be_roce.h
-f:drivers/net/ethernet/engleder/Kconfig
-f:drivers/net/ethernet/engleder/Makefile
-f:drivers/net/ethernet/engleder/tsnep.h
-f:drivers/net/ethernet/engleder/tsnep_ethtool.c
-f:drivers/net/ethernet/engleder/tsnep_hw.h
-f:drivers/net/ethernet/engleder/tsnep_main.c
-f:drivers/net/ethernet/engleder/tsnep_ptp.c
-f:drivers/net/ethernet/engleder/tsnep_rxnfc.c
-f:drivers/net/ethernet/engleder/tsnep_selftests.c
-f:drivers/net/ethernet/engleder/tsnep_tc.c
-f:drivers/net/ethernet/engleder/tsnep_xdp.c
-f:drivers/net/ethernet/ethoc.c
-f:drivers/net/ethernet/ezchip/Kconfig
-f:drivers/net/ethernet/ezchip/Makefile
-f:drivers/net/ethernet/ezchip/nps_enet.c
-f:drivers/net/ethernet/ezchip/nps_enet.h
-f:drivers/net/ethernet/faraday/Kconfig
-f:drivers/net/ethernet/faraday/Makefile
-f:drivers/net/ethernet/faraday/ftgmac100.c
-f:drivers/net/ethernet/faraday/ftgmac100.h
-f:drivers/net/ethernet/faraday/ftmac100.c
-f:drivers/net/ethernet/faraday/ftmac100.h
-f:drivers/net/ethernet/fealnx.c
-f:drivers/net/ethernet/freescale/Kconfig
-f:drivers/net/ethernet/freescale/Makefile
-f:drivers/net/ethernet/freescale/dpaa/Kconfig
-f:drivers/net/ethernet/freescale/dpaa/Makefile
-f:drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
-f:drivers/net/ethernet/freescale/dpaa/dpaa_eth.h
-f:drivers/net/ethernet/freescale/dpaa/dpaa_eth_sysfs.c
-f:drivers/net/ethernet/freescale/dpaa/dpaa_eth_trace.h
-f:drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c
-f:drivers/net/ethernet/freescale/dpaa2/Kconfig
-f:drivers/net/ethernet/freescale/dpaa2/Makefile
-f:drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-dcb.c
-f:drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-debugfs.c
-f:drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-debugfs.h
-f:drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-devlink.c
-f:drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-trace.h
-f:drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
-f:drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h
-f:drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c
-f:drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
-f:drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
-f:drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c
-f:drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.h
-f:drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-ethtool.c
-f:drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-flower.c
-f:drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c
-f:drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.h
-f:drivers/net/ethernet/freescale/dpaa2/dpaa2-xsk.c
-f:drivers/net/ethernet/freescale/dpaa2/dpkg.h
-f:drivers/net/ethernet/freescale/dpaa2/dpmac-cmd.h
-f:drivers/net/ethernet/freescale/dpaa2/dpmac.c
-f:drivers/net/ethernet/freescale/dpaa2/dpmac.h
-f:drivers/net/ethernet/freescale/dpaa2/dpni-cmd.h
-f:drivers/net/ethernet/freescale/dpaa2/dpni.c
-f:drivers/net/ethernet/freescale/dpaa2/dpni.h
-f:drivers/net/ethernet/freescale/dpaa2/dprtc-cmd.h
-f:drivers/net/ethernet/freescale/dpaa2/dprtc.c
-f:drivers/net/ethernet/freescale/dpaa2/dprtc.h
-f:drivers/net/ethernet/freescale/dpaa2/dpsw-cmd.h
-f:drivers/net/ethernet/freescale/dpaa2/dpsw.c
-f:drivers/net/ethernet/freescale/dpaa2/dpsw.h
-f:drivers/net/ethernet/freescale/enetc/Kconfig
-f:drivers/net/ethernet/freescale/enetc/Makefile
-f:drivers/net/ethernet/freescale/enetc/enetc.c
-f:drivers/net/ethernet/freescale/enetc/enetc.h
-f:drivers/net/ethernet/freescale/enetc/enetc4_debugfs.c
-f:drivers/net/ethernet/freescale/enetc/enetc4_debugfs.h
-f:drivers/net/ethernet/freescale/enetc/enetc4_hw.h
-f:drivers/net/ethernet/freescale/enetc/enetc4_pf.c
-f:drivers/net/ethernet/freescale/enetc/enetc_cbdr.c
-f:drivers/net/ethernet/freescale/enetc/enetc_ethtool.c
-f:drivers/net/ethernet/freescale/enetc/enetc_hw.h
-f:drivers/net/ethernet/freescale/enetc/enetc_ierb.c
-f:drivers/net/ethernet/freescale/enetc/enetc_ierb.h
-f:drivers/net/ethernet/freescale/enetc/enetc_mdio.c
-f:drivers/net/ethernet/freescale/enetc/enetc_msg.c
-f:drivers/net/ethernet/freescale/enetc/enetc_pci_mdio.c
-f:drivers/net/ethernet/freescale/enetc/enetc_pf.c
-f:drivers/net/ethernet/freescale/enetc/enetc_pf.h
-f:drivers/net/ethernet/freescale/enetc/enetc_pf_common.c
-f:drivers/net/ethernet/freescale/enetc/enetc_pf_common.h
-f:drivers/net/ethernet/freescale/enetc/enetc_ptp.c
-f:drivers/net/ethernet/freescale/enetc/enetc_qos.c
-f:drivers/net/ethernet/freescale/enetc/enetc_vf.c
-f:drivers/net/ethernet/freescale/enetc/netc_blk_ctrl.c
-f:drivers/net/ethernet/freescale/enetc/ntmp.c
-f:drivers/net/ethernet/freescale/enetc/ntmp_private.h
-f:drivers/net/ethernet/freescale/fec.h
-f:drivers/net/ethernet/freescale/fec_main.c
-f:drivers/net/ethernet/freescale/fec_mpc52xx.c
-f:drivers/net/ethernet/freescale/fec_mpc52xx.h
-f:drivers/net/ethernet/freescale/fec_mpc52xx_phy.c
-f:drivers/net/ethernet/freescale/fec_ptp.c
-f:drivers/net/ethernet/freescale/fman/Kconfig
-f:drivers/net/ethernet/freescale/fman/Makefile
-f:drivers/net/ethernet/freescale/fman/fman.c
-f:drivers/net/ethernet/freescale/fman/fman.h
-f:drivers/net/ethernet/freescale/fman/fman_dtsec.c
-f:drivers/net/ethernet/freescale/fman/fman_dtsec.h
-f:drivers/net/ethernet/freescale/fman/fman_keygen.c
-f:drivers/net/ethernet/freescale/fman/fman_keygen.h
-f:drivers/net/ethernet/freescale/fman/fman_mac.h
-f:drivers/net/ethernet/freescale/fman/fman_memac.c
-f:drivers/net/ethernet/freescale/fman/fman_memac.h
-f:drivers/net/ethernet/freescale/fman/fman_muram.c
-f:drivers/net/ethernet/freescale/fman/fman_muram.h
-f:drivers/net/ethernet/freescale/fman/fman_port.c
-f:drivers/net/ethernet/freescale/fman/fman_port.h
-f:drivers/net/ethernet/freescale/fman/fman_sp.c
-f:drivers/net/ethernet/freescale/fman/fman_sp.h
-f:drivers/net/ethernet/freescale/fman/fman_tgec.c
-f:drivers/net/ethernet/freescale/fman/fman_tgec.h
-f:drivers/net/ethernet/freescale/fman/mac.c
-f:drivers/net/ethernet/freescale/fman/mac.h
-f:drivers/net/ethernet/freescale/fs_enet/Kconfig
-f:drivers/net/ethernet/freescale/fs_enet/Makefile
-f:drivers/net/ethernet/freescale/fs_enet/fec.h
-f:drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
-f:drivers/net/ethernet/freescale/fs_enet/fs_enet.h
-f:drivers/net/ethernet/freescale/fs_enet/mac-fcc.c
-f:drivers/net/ethernet/freescale/fs_enet/mac-fec.c
-f:drivers/net/ethernet/freescale/fs_enet/mac-scc.c
-f:drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c
-f:drivers/net/ethernet/freescale/fs_enet/mii-fec.c
-f:drivers/net/ethernet/freescale/fsl_pq_mdio.c
-f:drivers/net/ethernet/freescale/gianfar.c
-f:drivers/net/ethernet/freescale/gianfar.h
-f:drivers/net/ethernet/freescale/gianfar_ethtool.c
-f:drivers/net/ethernet/freescale/ucc_geth.c
-f:drivers/net/ethernet/freescale/ucc_geth.h
-f:drivers/net/ethernet/freescale/ucc_geth_ethtool.c
-f:drivers/net/ethernet/freescale/xgmac_mdio.c
-f:drivers/net/ethernet/fujitsu/Kconfig
-f:drivers/net/ethernet/fujitsu/Makefile
-f:drivers/net/ethernet/fujitsu/fmvj18x_cs.c
-f:drivers/net/ethernet/fungible/Kconfig
-f:drivers/net/ethernet/fungible/Makefile
-f:drivers/net/ethernet/fungible/funcore/Makefile
-f:drivers/net/ethernet/fungible/funcore/fun_dev.c
-f:drivers/net/ethernet/fungible/funcore/fun_dev.h
-f:drivers/net/ethernet/fungible/funcore/fun_hci.h
-f:drivers/net/ethernet/fungible/funcore/fun_queue.c
-f:drivers/net/ethernet/fungible/funcore/fun_queue.h
-f:drivers/net/ethernet/fungible/funeth/Kconfig
-f:drivers/net/ethernet/fungible/funeth/Makefile
-f:drivers/net/ethernet/fungible/funeth/fun_port.h
-f:drivers/net/ethernet/fungible/funeth/funeth.h
-f:drivers/net/ethernet/fungible/funeth/funeth_devlink.c
-f:drivers/net/ethernet/fungible/funeth/funeth_devlink.h
-f:drivers/net/ethernet/fungible/funeth/funeth_ethtool.c
-f:drivers/net/ethernet/fungible/funeth/funeth_ktls.c
-f:drivers/net/ethernet/fungible/funeth/funeth_ktls.h
-f:drivers/net/ethernet/fungible/funeth/funeth_main.c
-f:drivers/net/ethernet/fungible/funeth/funeth_rx.c
-f:drivers/net/ethernet/fungible/funeth/funeth_trace.h
-f:drivers/net/ethernet/fungible/funeth/funeth_tx.c
-f:drivers/net/ethernet/fungible/funeth/funeth_txrx.h
-f:drivers/net/ethernet/google/Kconfig
-f:drivers/net/ethernet/google/Makefile
-f:drivers/net/ethernet/google/gve/Makefile
-f:drivers/net/ethernet/google/gve/gve.h
-f:drivers/net/ethernet/google/gve/gve_adminq.c
-f:drivers/net/ethernet/google/gve/gve_adminq.h
-f:drivers/net/ethernet/google/gve/gve_buffer_mgmt_dqo.c
-f:drivers/net/ethernet/google/gve/gve_desc.h
-f:drivers/net/ethernet/google/gve/gve_desc_dqo.h
-f:drivers/net/ethernet/google/gve/gve_dqo.h
-f:drivers/net/ethernet/google/gve/gve_ethtool.c
-f:drivers/net/ethernet/google/gve/gve_flow_rule.c
-f:drivers/net/ethernet/google/gve/gve_main.c
-f:drivers/net/ethernet/google/gve/gve_ptp.c
-f:drivers/net/ethernet/google/gve/gve_register.h
-f:drivers/net/ethernet/google/gve/gve_rx.c
-f:drivers/net/ethernet/google/gve/gve_rx_dqo.c
-f:drivers/net/ethernet/google/gve/gve_tx.c
-f:drivers/net/ethernet/google/gve/gve_tx_dqo.c
-f:drivers/net/ethernet/google/gve/gve_utils.c
-f:drivers/net/ethernet/google/gve/gve_utils.h
-f:drivers/net/ethernet/hisilicon/Kconfig
-f:drivers/net/ethernet/hisilicon/Makefile
-f:drivers/net/ethernet/hisilicon/hibmcge/Makefile
-f:drivers/net/ethernet/hisilicon/hibmcge/hbg_common.h
-f:drivers/net/ethernet/hisilicon/hibmcge/hbg_debugfs.c
-f:drivers/net/ethernet/hisilicon/hibmcge/hbg_debugfs.h
-f:drivers/net/ethernet/hisilicon/hibmcge/hbg_diagnose.c
-f:drivers/net/ethernet/hisilicon/hibmcge/hbg_diagnose.h
-f:drivers/net/ethernet/hisilicon/hibmcge/hbg_err.c
-f:drivers/net/ethernet/hisilicon/hibmcge/hbg_err.h
-f:drivers/net/ethernet/hisilicon/hibmcge/hbg_ethtool.c
-f:drivers/net/ethernet/hisilicon/hibmcge/hbg_ethtool.h
-f:drivers/net/ethernet/hisilicon/hibmcge/hbg_hw.c
-f:drivers/net/ethernet/hisilicon/hibmcge/hbg_hw.h
-f:drivers/net/ethernet/hisilicon/hibmcge/hbg_irq.c
-f:drivers/net/ethernet/hisilicon/hibmcge/hbg_irq.h
-f:drivers/net/ethernet/hisilicon/hibmcge/hbg_main.c
-f:drivers/net/ethernet/hisilicon/hibmcge/hbg_mdio.c
-f:drivers/net/ethernet/hisilicon/hibmcge/hbg_mdio.h
-f:drivers/net/ethernet/hisilicon/hibmcge/hbg_reg.h
-f:drivers/net/ethernet/hisilicon/hibmcge/hbg_txrx.c
-f:drivers/net/ethernet/hisilicon/hibmcge/hbg_txrx.h
-f:drivers/net/ethernet/hisilicon/hip04_eth.c
-f:drivers/net/ethernet/hisilicon/hisi_femac.c
-f:drivers/net/ethernet/hisilicon/hix5hd2_gmac.c
-f:drivers/net/ethernet/hisilicon/hns/Makefile
-f:drivers/net/ethernet/hisilicon/hns/hnae.c
-f:drivers/net/ethernet/hisilicon/hns/hnae.h
-f:drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c
-f:drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c
-f:drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.h
-f:drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
-f:drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h
-f:drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c
-f:drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h
-f:drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c
-f:drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.h
-f:drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c
-f:drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.h
-f:drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c
-f:drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h
-f:drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h
-f:drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c
-f:drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.h
-f:drivers/net/ethernet/hisilicon/hns/hns_enet.c
-f:drivers/net/ethernet/hisilicon/hns/hns_enet.h
-f:drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
-f:drivers/net/ethernet/hisilicon/hns3/Makefile
-f:drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h
-f:drivers/net/ethernet/hisilicon/hns3/hnae3.c
-f:drivers/net/ethernet/hisilicon/hns3/hnae3.h
-f:drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.c
-f:drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.h
-f:drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_rss.c
-f:drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_rss.h
-f:drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_tqp_stats.c
-f:drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_tqp_stats.h
-f:drivers/net/ethernet/hisilicon/hns3/hns3_dcbnl.c
-f:drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c
-f:drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.h
-f:drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
-f:drivers/net/ethernet/hisilicon/hns3/hns3_enet.h
-f:drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
-f:drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.h
-f:drivers/net/ethernet/hisilicon/hns3/hns3_trace.h
-f:drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h
-f:drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c
-f:drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.h
-f:drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c
-f:drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h
-f:drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_devlink.c
-f:drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_devlink.h
-f:drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c
-f:drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.h
-f:drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
-f:drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
-f:drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c
-f:drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c
-f:drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.h
-f:drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c
-f:drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.h
-f:drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_regs.c
-f:drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_regs.h
-f:drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c
-f:drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h
-f:drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_trace.h
-f:drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.h
-f:drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_devlink.c
-f:drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_devlink.h
-f:drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
-f:drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h
-f:drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c
-f:drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_regs.c
-f:drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_regs.h
-f:drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_trace.h
-f:drivers/net/ethernet/hisilicon/hns_mdio.c
-f:drivers/net/ethernet/huawei/Kconfig
-f:drivers/net/ethernet/huawei/Makefile
-f:drivers/net/ethernet/huawei/hinic/Kconfig
-f:drivers/net/ethernet/huawei/hinic/Makefile
-f:drivers/net/ethernet/huawei/hinic/hinic_common.c
-f:drivers/net/ethernet/huawei/hinic/hinic_common.h
-f:drivers/net/ethernet/huawei/hinic/hinic_debugfs.c
-f:drivers/net/ethernet/huawei/hinic/hinic_debugfs.h
-f:drivers/net/ethernet/huawei/hinic/hinic_dev.h
-f:drivers/net/ethernet/huawei/hinic/hinic_devlink.c
-f:drivers/net/ethernet/huawei/hinic/hinic_devlink.h
-f:drivers/net/ethernet/huawei/hinic/hinic_ethtool.c
-f:drivers/net/ethernet/huawei/hinic/hinic_hw_api_cmd.c
-f:drivers/net/ethernet/huawei/hinic/hinic_hw_api_cmd.h
-f:drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.c
-f:drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.h
-f:drivers/net/ethernet/huawei/hinic/hinic_hw_csr.h
-f:drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c
-f:drivers/net/ethernet/huawei/hinic/hinic_hw_dev.h
-f:drivers/net/ethernet/huawei/hinic/hinic_hw_eqs.c
-f:drivers/net/ethernet/huawei/hinic/hinic_hw_eqs.h
-f:drivers/net/ethernet/huawei/hinic/hinic_hw_if.c
-f:drivers/net/ethernet/huawei/hinic/hinic_hw_if.h
-f:drivers/net/ethernet/huawei/hinic/hinic_hw_io.c
-f:drivers/net/ethernet/huawei/hinic/hinic_hw_io.h
-f:drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c
-f:drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.h
-f:drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c
-f:drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.h
-f:drivers/net/ethernet/huawei/hinic/hinic_hw_qp.c
-f:drivers/net/ethernet/huawei/hinic/hinic_hw_qp.h
-f:drivers/net/ethernet/huawei/hinic/hinic_hw_qp_ctxt.h
-f:drivers/net/ethernet/huawei/hinic/hinic_hw_wq.c
-f:drivers/net/ethernet/huawei/hinic/hinic_hw_wq.h
-f:drivers/net/ethernet/huawei/hinic/hinic_hw_wqe.h
-f:drivers/net/ethernet/huawei/hinic/hinic_main.c
-f:drivers/net/ethernet/huawei/hinic/hinic_port.c
-f:drivers/net/ethernet/huawei/hinic/hinic_port.h
-f:drivers/net/ethernet/huawei/hinic/hinic_rx.c
-f:drivers/net/ethernet/huawei/hinic/hinic_rx.h
-f:drivers/net/ethernet/huawei/hinic/hinic_sriov.c
-f:drivers/net/ethernet/huawei/hinic/hinic_sriov.h
-f:drivers/net/ethernet/huawei/hinic/hinic_tx.c
-f:drivers/net/ethernet/huawei/hinic/hinic_tx.h
-f:drivers/net/ethernet/huawei/hinic3/Kconfig
-f:drivers/net/ethernet/huawei/hinic3/Makefile
-f:drivers/net/ethernet/huawei/hinic3/hinic3_common.c
-f:drivers/net/ethernet/huawei/hinic3/hinic3_common.h
-f:drivers/net/ethernet/huawei/hinic3/hinic3_hw_cfg.c
-f:drivers/net/ethernet/huawei/hinic3/hinic3_hw_cfg.h
-f:drivers/net/ethernet/huawei/hinic3/hinic3_hw_comm.c
-f:drivers/net/ethernet/huawei/hinic3/hinic3_hw_comm.h
-f:drivers/net/ethernet/huawei/hinic3/hinic3_hw_intf.h
-f:drivers/net/ethernet/huawei/hinic3/hinic3_hwdev.c
-f:drivers/net/ethernet/huawei/hinic3/hinic3_hwdev.h
-f:drivers/net/ethernet/huawei/hinic3/hinic3_hwif.c
-f:drivers/net/ethernet/huawei/hinic3/hinic3_hwif.h
-f:drivers/net/ethernet/huawei/hinic3/hinic3_irq.c
-f:drivers/net/ethernet/huawei/hinic3/hinic3_lld.c
-f:drivers/net/ethernet/huawei/hinic3/hinic3_lld.h
-f:drivers/net/ethernet/huawei/hinic3/hinic3_main.c
-f:drivers/net/ethernet/huawei/hinic3/hinic3_mbox.c
-f:drivers/net/ethernet/huawei/hinic3/hinic3_mbox.h
-f:drivers/net/ethernet/huawei/hinic3/hinic3_mgmt.h
-f:drivers/net/ethernet/huawei/hinic3/hinic3_mgmt_interface.h
-f:drivers/net/ethernet/huawei/hinic3/hinic3_netdev_ops.c
-f:drivers/net/ethernet/huawei/hinic3/hinic3_nic_cfg.c
-f:drivers/net/ethernet/huawei/hinic3/hinic3_nic_cfg.h
-f:drivers/net/ethernet/huawei/hinic3/hinic3_nic_dev.h
-f:drivers/net/ethernet/huawei/hinic3/hinic3_nic_io.c
-f:drivers/net/ethernet/huawei/hinic3/hinic3_nic_io.h
-f:drivers/net/ethernet/huawei/hinic3/hinic3_queue_common.c
-f:drivers/net/ethernet/huawei/hinic3/hinic3_queue_common.h
-f:drivers/net/ethernet/huawei/hinic3/hinic3_rx.c
-f:drivers/net/ethernet/huawei/hinic3/hinic3_rx.h
-f:drivers/net/ethernet/huawei/hinic3/hinic3_tx.c
-f:drivers/net/ethernet/huawei/hinic3/hinic3_tx.h
-f:drivers/net/ethernet/huawei/hinic3/hinic3_wq.c
-f:drivers/net/ethernet/huawei/hinic3/hinic3_wq.h
-f:drivers/net/ethernet/i825xx/82596.c
-f:drivers/net/ethernet/i825xx/Kconfig
-f:drivers/net/ethernet/i825xx/Makefile
-f:drivers/net/ethernet/i825xx/ether1.c
-f:drivers/net/ethernet/i825xx/ether1.h
-f:drivers/net/ethernet/i825xx/lasi_82596.c
-f:drivers/net/ethernet/i825xx/lib82596.c
-f:drivers/net/ethernet/i825xx/sni_82596.c
-f:drivers/net/ethernet/i825xx/sun3_82586.c
-f:drivers/net/ethernet/i825xx/sun3_82586.h
-f:drivers/net/ethernet/ibm/Kconfig
-f:drivers/net/ethernet/ibm/Makefile
-f:drivers/net/ethernet/ibm/ehea/Makefile
-f:drivers/net/ethernet/ibm/ehea/ehea.h
-f:drivers/net/ethernet/ibm/ehea/ehea_ethtool.c
-f:drivers/net/ethernet/ibm/ehea/ehea_hw.h
-f:drivers/net/ethernet/ibm/ehea/ehea_main.c
-f:drivers/net/ethernet/ibm/ehea/ehea_phyp.c
-f:drivers/net/ethernet/ibm/ehea/ehea_phyp.h
-f:drivers/net/ethernet/ibm/ehea/ehea_qmr.c
-f:drivers/net/ethernet/ibm/ehea/ehea_qmr.h
-f:drivers/net/ethernet/ibm/emac/Kconfig
-f:drivers/net/ethernet/ibm/emac/Makefile
-f:drivers/net/ethernet/ibm/emac/core.c
-f:drivers/net/ethernet/ibm/emac/core.h
-f:drivers/net/ethernet/ibm/emac/debug.h
-f:drivers/net/ethernet/ibm/emac/emac.h
-f:drivers/net/ethernet/ibm/emac/mal.c
-f:drivers/net/ethernet/ibm/emac/mal.h
-f:drivers/net/ethernet/ibm/emac/phy.c
-f:drivers/net/ethernet/ibm/emac/phy.h
-f:drivers/net/ethernet/ibm/emac/rgmii.c
-f:drivers/net/ethernet/ibm/emac/rgmii.h
-f:drivers/net/ethernet/ibm/emac/tah.c
-f:drivers/net/ethernet/ibm/emac/tah.h
-f:drivers/net/ethernet/ibm/emac/zmii.c
-f:drivers/net/ethernet/ibm/emac/zmii.h
-f:drivers/net/ethernet/ibm/ibmveth.c
-f:drivers/net/ethernet/ibm/ibmveth.h
-f:drivers/net/ethernet/ibm/ibmvnic.c
-f:drivers/net/ethernet/ibm/ibmvnic.h
-f:drivers/net/ethernet/intel/Kconfig
-f:drivers/net/ethernet/intel/Makefile
-f:drivers/net/ethernet/intel/e100.c
-f:drivers/net/ethernet/intel/e1000/Makefile
-f:drivers/net/ethernet/intel/e1000/e1000.h
-f:drivers/net/ethernet/intel/e1000/e1000_ethtool.c
-f:drivers/net/ethernet/intel/e1000/e1000_hw.c
-f:drivers/net/ethernet/intel/e1000/e1000_hw.h
-f:drivers/net/ethernet/intel/e1000/e1000_main.c
-f:drivers/net/ethernet/intel/e1000/e1000_osdep.h
-f:drivers/net/ethernet/intel/e1000/e1000_param.c
-f:drivers/net/ethernet/intel/e1000e/80003es2lan.c
-f:drivers/net/ethernet/intel/e1000e/80003es2lan.h
-f:drivers/net/ethernet/intel/e1000e/82571.c
-f:drivers/net/ethernet/intel/e1000e/82571.h
-f:drivers/net/ethernet/intel/e1000e/Makefile
-f:drivers/net/ethernet/intel/e1000e/defines.h
-f:drivers/net/ethernet/intel/e1000e/e1000.h
-f:drivers/net/ethernet/intel/e1000e/e1000e_trace.h
-f:drivers/net/ethernet/intel/e1000e/ethtool.c
-f:drivers/net/ethernet/intel/e1000e/hw.h
-f:drivers/net/ethernet/intel/e1000e/ich8lan.c
-f:drivers/net/ethernet/intel/e1000e/ich8lan.h
-f:drivers/net/ethernet/intel/e1000e/mac.c
-f:drivers/net/ethernet/intel/e1000e/mac.h
-f:drivers/net/ethernet/intel/e1000e/manage.c
-f:drivers/net/ethernet/intel/e1000e/manage.h
-f:drivers/net/ethernet/intel/e1000e/netdev.c
-f:drivers/net/ethernet/intel/e1000e/nvm.c
-f:drivers/net/ethernet/intel/e1000e/nvm.h
-f:drivers/net/ethernet/intel/e1000e/param.c
-f:drivers/net/ethernet/intel/e1000e/phy.c
-f:drivers/net/ethernet/intel/e1000e/phy.h
-f:drivers/net/ethernet/intel/e1000e/ptp.c
-f:drivers/net/ethernet/intel/e1000e/regs.h
-f:drivers/net/ethernet/intel/fm10k/Makefile
-f:drivers/net/ethernet/intel/fm10k/fm10k.h
-f:drivers/net/ethernet/intel/fm10k/fm10k_common.c
-f:drivers/net/ethernet/intel/fm10k/fm10k_common.h
-f:drivers/net/ethernet/intel/fm10k/fm10k_dcbnl.c
-f:drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c
-f:drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c
-f:drivers/net/ethernet/intel/fm10k/fm10k_iov.c
-f:drivers/net/ethernet/intel/fm10k/fm10k_main.c
-f:drivers/net/ethernet/intel/fm10k/fm10k_mbx.c
-f:drivers/net/ethernet/intel/fm10k/fm10k_mbx.h
-f:drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
-f:drivers/net/ethernet/intel/fm10k/fm10k_pci.c
-f:drivers/net/ethernet/intel/fm10k/fm10k_pf.c
-f:drivers/net/ethernet/intel/fm10k/fm10k_pf.h
-f:drivers/net/ethernet/intel/fm10k/fm10k_tlv.c
-f:drivers/net/ethernet/intel/fm10k/fm10k_tlv.h
-f:drivers/net/ethernet/intel/fm10k/fm10k_type.h
-f:drivers/net/ethernet/intel/fm10k/fm10k_vf.c
-f:drivers/net/ethernet/intel/fm10k/fm10k_vf.h
-f:drivers/net/ethernet/intel/i40e/Makefile
-f:drivers/net/ethernet/intel/i40e/i40e.h
-f:drivers/net/ethernet/intel/i40e/i40e_adminq.c
-f:drivers/net/ethernet/intel/i40e/i40e_adminq.h
-f:drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h
-f:drivers/net/ethernet/intel/i40e/i40e_alloc.h
-f:drivers/net/ethernet/intel/i40e/i40e_client.c
-f:drivers/net/ethernet/intel/i40e/i40e_common.c
-f:drivers/net/ethernet/intel/i40e/i40e_dcb.c
-f:drivers/net/ethernet/intel/i40e/i40e_dcb.h
-f:drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c
-f:drivers/net/ethernet/intel/i40e/i40e_ddp.c
-f:drivers/net/ethernet/intel/i40e/i40e_debug.h
-f:drivers/net/ethernet/intel/i40e/i40e_debugfs.c
-f:drivers/net/ethernet/intel/i40e/i40e_devids.h
-f:drivers/net/ethernet/intel/i40e/i40e_devlink.c
-f:drivers/net/ethernet/intel/i40e/i40e_devlink.h
-f:drivers/net/ethernet/intel/i40e/i40e_diag.c
-f:drivers/net/ethernet/intel/i40e/i40e_diag.h
-f:drivers/net/ethernet/intel/i40e/i40e_ethtool.c
-f:drivers/net/ethernet/intel/i40e/i40e_hmc.c
-f:drivers/net/ethernet/intel/i40e/i40e_hmc.h
-f:drivers/net/ethernet/intel/i40e/i40e_io.h
-f:drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c
-f:drivers/net/ethernet/intel/i40e/i40e_lan_hmc.h
-f:drivers/net/ethernet/intel/i40e/i40e_main.c
-f:drivers/net/ethernet/intel/i40e/i40e_nvm.c
-f:drivers/net/ethernet/intel/i40e/i40e_prototype.h
-f:drivers/net/ethernet/intel/i40e/i40e_ptp.c
-f:drivers/net/ethernet/intel/i40e/i40e_register.h
-f:drivers/net/ethernet/intel/i40e/i40e_trace.h
-f:drivers/net/ethernet/intel/i40e/i40e_txrx.c
-f:drivers/net/ethernet/intel/i40e/i40e_txrx.h
-f:drivers/net/ethernet/intel/i40e/i40e_txrx_common.h
-f:drivers/net/ethernet/intel/i40e/i40e_type.h
-f:drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
-f:drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h
-f:drivers/net/ethernet/intel/i40e/i40e_xsk.c
-f:drivers/net/ethernet/intel/i40e/i40e_xsk.h
-f:drivers/net/ethernet/intel/iavf/Makefile
-f:drivers/net/ethernet/intel/iavf/iavf.h
-f:drivers/net/ethernet/intel/iavf/iavf_adminq.c
-f:drivers/net/ethernet/intel/iavf/iavf_adminq.h
-f:drivers/net/ethernet/intel/iavf/iavf_adminq_cmd.h
-f:drivers/net/ethernet/intel/iavf/iavf_adv_rss.c
-f:drivers/net/ethernet/intel/iavf/iavf_adv_rss.h
-f:drivers/net/ethernet/intel/iavf/iavf_alloc.h
-f:drivers/net/ethernet/intel/iavf/iavf_common.c
-f:drivers/net/ethernet/intel/iavf/iavf_devids.h
-f:drivers/net/ethernet/intel/iavf/iavf_ethtool.c
-f:drivers/net/ethernet/intel/iavf/iavf_fdir.c
-f:drivers/net/ethernet/intel/iavf/iavf_fdir.h
-f:drivers/net/ethernet/intel/iavf/iavf_main.c
-f:drivers/net/ethernet/intel/iavf/iavf_osdep.h
-f:drivers/net/ethernet/intel/iavf/iavf_prototype.h
-f:drivers/net/ethernet/intel/iavf/iavf_ptp.c
-f:drivers/net/ethernet/intel/iavf/iavf_ptp.h
-f:drivers/net/ethernet/intel/iavf/iavf_register.h
-f:drivers/net/ethernet/intel/iavf/iavf_status.h
-f:drivers/net/ethernet/intel/iavf/iavf_trace.h
-f:drivers/net/ethernet/intel/iavf/iavf_txrx.c
-f:drivers/net/ethernet/intel/iavf/iavf_txrx.h
-f:drivers/net/ethernet/intel/iavf/iavf_type.h
-f:drivers/net/ethernet/intel/iavf/iavf_types.h
-f:drivers/net/ethernet/intel/iavf/iavf_virtchnl.c
-f:drivers/net/ethernet/intel/ice/Makefile
-f:drivers/net/ethernet/intel/ice/devlink/devlink.c
-f:drivers/net/ethernet/intel/ice/devlink/devlink.h
-f:drivers/net/ethernet/intel/ice/devlink/health.c
-f:drivers/net/ethernet/intel/ice/devlink/health.h
-f:drivers/net/ethernet/intel/ice/devlink/port.c
-f:drivers/net/ethernet/intel/ice/devlink/port.h
-f:drivers/net/ethernet/intel/ice/ice.h
-f:drivers/net/ethernet/intel/ice/ice_adapter.c
-f:drivers/net/ethernet/intel/ice/ice_adapter.h
-f:drivers/net/ethernet/intel/ice/ice_adminq_cmd.h
-f:drivers/net/ethernet/intel/ice/ice_arfs.c
-f:drivers/net/ethernet/intel/ice/ice_arfs.h
-f:drivers/net/ethernet/intel/ice/ice_base.c
-f:drivers/net/ethernet/intel/ice/ice_base.h
-f:drivers/net/ethernet/intel/ice/ice_common.c
-f:drivers/net/ethernet/intel/ice/ice_common.h
-f:drivers/net/ethernet/intel/ice/ice_controlq.c
-f:drivers/net/ethernet/intel/ice/ice_controlq.h
-f:drivers/net/ethernet/intel/ice/ice_dcb.c
-f:drivers/net/ethernet/intel/ice/ice_dcb.h
-f:drivers/net/ethernet/intel/ice/ice_dcb_lib.c
-f:drivers/net/ethernet/intel/ice/ice_dcb_lib.h
-f:drivers/net/ethernet/intel/ice/ice_dcb_nl.c
-f:drivers/net/ethernet/intel/ice/ice_dcb_nl.h
-f:drivers/net/ethernet/intel/ice/ice_ddp.c
-f:drivers/net/ethernet/intel/ice/ice_ddp.h
-f:drivers/net/ethernet/intel/ice/ice_debugfs.c
-f:drivers/net/ethernet/intel/ice/ice_devids.h
-f:drivers/net/ethernet/intel/ice/ice_dpll.c
-f:drivers/net/ethernet/intel/ice/ice_dpll.h
-f:drivers/net/ethernet/intel/ice/ice_eswitch.c
-f:drivers/net/ethernet/intel/ice/ice_eswitch.h
-f:drivers/net/ethernet/intel/ice/ice_eswitch_br.c
-f:drivers/net/ethernet/intel/ice/ice_eswitch_br.h
-f:drivers/net/ethernet/intel/ice/ice_ethtool.c
-f:drivers/net/ethernet/intel/ice/ice_ethtool.h
-f:drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c
-f:drivers/net/ethernet/intel/ice/ice_fdir.c
-f:drivers/net/ethernet/intel/ice/ice_fdir.h
-f:drivers/net/ethernet/intel/ice/ice_flex_pipe.c
-f:drivers/net/ethernet/intel/ice/ice_flex_pipe.h
-f:drivers/net/ethernet/intel/ice/ice_flex_type.h
-f:drivers/net/ethernet/intel/ice/ice_flow.c
-f:drivers/net/ethernet/intel/ice/ice_flow.h
-f:drivers/net/ethernet/intel/ice/ice_fltr.c
-f:drivers/net/ethernet/intel/ice/ice_fltr.h
-f:drivers/net/ethernet/intel/ice/ice_fw_update.c
-f:drivers/net/ethernet/intel/ice/ice_fw_update.h
-f:drivers/net/ethernet/intel/ice/ice_fwlog.c
-f:drivers/net/ethernet/intel/ice/ice_fwlog.h
-f:drivers/net/ethernet/intel/ice/ice_gnss.c
-f:drivers/net/ethernet/intel/ice/ice_gnss.h
-f:drivers/net/ethernet/intel/ice/ice_hw_autogen.h
-f:drivers/net/ethernet/intel/ice/ice_hwmon.c
-f:drivers/net/ethernet/intel/ice/ice_hwmon.h
-f:drivers/net/ethernet/intel/ice/ice_idc.c
-f:drivers/net/ethernet/intel/ice/ice_idc_int.h
-f:drivers/net/ethernet/intel/ice/ice_irq.c
-f:drivers/net/ethernet/intel/ice/ice_irq.h
-f:drivers/net/ethernet/intel/ice/ice_lag.c
-f:drivers/net/ethernet/intel/ice/ice_lag.h
-f:drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h
-f:drivers/net/ethernet/intel/ice/ice_lib.c
-f:drivers/net/ethernet/intel/ice/ice_lib.h
-f:drivers/net/ethernet/intel/ice/ice_main.c
-f:drivers/net/ethernet/intel/ice/ice_nvm.c
-f:drivers/net/ethernet/intel/ice/ice_nvm.h
-f:drivers/net/ethernet/intel/ice/ice_osdep.h
-f:drivers/net/ethernet/intel/ice/ice_parser.c
-f:drivers/net/ethernet/intel/ice/ice_parser.h
-f:drivers/net/ethernet/intel/ice/ice_parser_rt.c
-f:drivers/net/ethernet/intel/ice/ice_pf_vsi_vlan_ops.c
-f:drivers/net/ethernet/intel/ice/ice_pf_vsi_vlan_ops.h
-f:drivers/net/ethernet/intel/ice/ice_protocol_type.h
-f:drivers/net/ethernet/intel/ice/ice_ptp.c
-f:drivers/net/ethernet/intel/ice/ice_ptp.h
-f:drivers/net/ethernet/intel/ice/ice_ptp_consts.h
-f:drivers/net/ethernet/intel/ice/ice_ptp_hw.c
-f:drivers/net/ethernet/intel/ice/ice_ptp_hw.h
-f:drivers/net/ethernet/intel/ice/ice_repr.c
-f:drivers/net/ethernet/intel/ice/ice_repr.h
-f:drivers/net/ethernet/intel/ice/ice_sbq_cmd.h
-f:drivers/net/ethernet/intel/ice/ice_sched.c
-f:drivers/net/ethernet/intel/ice/ice_sched.h
-f:drivers/net/ethernet/intel/ice/ice_sf_eth.c
-f:drivers/net/ethernet/intel/ice/ice_sf_eth.h
-f:drivers/net/ethernet/intel/ice/ice_sf_vsi_vlan_ops.c
-f:drivers/net/ethernet/intel/ice/ice_sf_vsi_vlan_ops.h
-f:drivers/net/ethernet/intel/ice/ice_sriov.c
-f:drivers/net/ethernet/intel/ice/ice_sriov.h
-f:drivers/net/ethernet/intel/ice/ice_switch.c
-f:drivers/net/ethernet/intel/ice/ice_switch.h
-f:drivers/net/ethernet/intel/ice/ice_tc_lib.c
-f:drivers/net/ethernet/intel/ice/ice_tc_lib.h
-f:drivers/net/ethernet/intel/ice/ice_trace.h
-f:drivers/net/ethernet/intel/ice/ice_tspll.c
-f:drivers/net/ethernet/intel/ice/ice_tspll.h
-f:drivers/net/ethernet/intel/ice/ice_txrx.c
-f:drivers/net/ethernet/intel/ice/ice_txrx.h
-f:drivers/net/ethernet/intel/ice/ice_txrx_lib.c
-f:drivers/net/ethernet/intel/ice/ice_txrx_lib.h
-f:drivers/net/ethernet/intel/ice/ice_type.h
-f:drivers/net/ethernet/intel/ice/ice_vf_lib.c
-f:drivers/net/ethernet/intel/ice/ice_vf_lib.h
-f:drivers/net/ethernet/intel/ice/ice_vf_lib_private.h
-f:drivers/net/ethernet/intel/ice/ice_vf_mbx.c
-f:drivers/net/ethernet/intel/ice/ice_vf_mbx.h
-f:drivers/net/ethernet/intel/ice/ice_vf_vsi_vlan_ops.c
-f:drivers/net/ethernet/intel/ice/ice_vf_vsi_vlan_ops.h
-f:drivers/net/ethernet/intel/ice/ice_virtchnl.c
-f:drivers/net/ethernet/intel/ice/ice_virtchnl.h
-f:drivers/net/ethernet/intel/ice/ice_virtchnl_allowlist.c
-f:drivers/net/ethernet/intel/ice/ice_virtchnl_allowlist.h
-f:drivers/net/ethernet/intel/ice/ice_virtchnl_fdir.c
-f:drivers/net/ethernet/intel/ice/ice_virtchnl_fdir.h
-f:drivers/net/ethernet/intel/ice/ice_vlan.h
-f:drivers/net/ethernet/intel/ice/ice_vlan_mode.c
-f:drivers/net/ethernet/intel/ice/ice_vlan_mode.h
-f:drivers/net/ethernet/intel/ice/ice_vsi_vlan_lib.c
-f:drivers/net/ethernet/intel/ice/ice_vsi_vlan_lib.h
-f:drivers/net/ethernet/intel/ice/ice_vsi_vlan_ops.c
-f:drivers/net/ethernet/intel/ice/ice_vsi_vlan_ops.h
-f:drivers/net/ethernet/intel/ice/ice_xsk.c
-f:drivers/net/ethernet/intel/ice/ice_xsk.h
-f:drivers/net/ethernet/intel/idpf/Kconfig
-f:drivers/net/ethernet/intel/idpf/Makefile
-f:drivers/net/ethernet/intel/idpf/idpf.h
-f:drivers/net/ethernet/intel/idpf/idpf_controlq.c
-f:drivers/net/ethernet/intel/idpf/idpf_controlq.h
-f:drivers/net/ethernet/intel/idpf/idpf_controlq_api.h
-f:drivers/net/ethernet/intel/idpf/idpf_controlq_setup.c
-f:drivers/net/ethernet/intel/idpf/idpf_dev.c
-f:drivers/net/ethernet/intel/idpf/idpf_devids.h
-f:drivers/net/ethernet/intel/idpf/idpf_ethtool.c
-f:drivers/net/ethernet/intel/idpf/idpf_idc.c
-f:drivers/net/ethernet/intel/idpf/idpf_lan_pf_regs.h
-f:drivers/net/ethernet/intel/idpf/idpf_lan_txrx.h
-f:drivers/net/ethernet/intel/idpf/idpf_lan_vf_regs.h
-f:drivers/net/ethernet/intel/idpf/idpf_lib.c
-f:drivers/net/ethernet/intel/idpf/idpf_main.c
-f:drivers/net/ethernet/intel/idpf/idpf_mem.h
-f:drivers/net/ethernet/intel/idpf/idpf_ptp.c
-f:drivers/net/ethernet/intel/idpf/idpf_ptp.h
-f:drivers/net/ethernet/intel/idpf/idpf_singleq_txrx.c
-f:drivers/net/ethernet/intel/idpf/idpf_txrx.c
-f:drivers/net/ethernet/intel/idpf/idpf_txrx.h
-f:drivers/net/ethernet/intel/idpf/idpf_vf_dev.c
-f:drivers/net/ethernet/intel/idpf/idpf_virtchnl.c
-f:drivers/net/ethernet/intel/idpf/idpf_virtchnl.h
-f:drivers/net/ethernet/intel/idpf/idpf_virtchnl_ptp.c
-f:drivers/net/ethernet/intel/idpf/virtchnl2.h
-f:drivers/net/ethernet/intel/idpf/virtchnl2_lan_desc.h
-f:drivers/net/ethernet/intel/igb/Makefile
-f:drivers/net/ethernet/intel/igb/e1000_82575.c
-f:drivers/net/ethernet/intel/igb/e1000_82575.h
-f:drivers/net/ethernet/intel/igb/e1000_defines.h
-f:drivers/net/ethernet/intel/igb/e1000_hw.h
-f:drivers/net/ethernet/intel/igb/e1000_i210.c
-f:drivers/net/ethernet/intel/igb/e1000_i210.h
-f:drivers/net/ethernet/intel/igb/e1000_mac.c
-f:drivers/net/ethernet/intel/igb/e1000_mac.h
-f:drivers/net/ethernet/intel/igb/e1000_mbx.c
-f:drivers/net/ethernet/intel/igb/e1000_mbx.h
-f:drivers/net/ethernet/intel/igb/e1000_nvm.c
-f:drivers/net/ethernet/intel/igb/e1000_nvm.h
-f:drivers/net/ethernet/intel/igb/e1000_phy.c
-f:drivers/net/ethernet/intel/igb/e1000_phy.h
-f:drivers/net/ethernet/intel/igb/e1000_regs.h
-f:drivers/net/ethernet/intel/igb/igb.h
-f:drivers/net/ethernet/intel/igb/igb_ethtool.c
-f:drivers/net/ethernet/intel/igb/igb_hwmon.c
-f:drivers/net/ethernet/intel/igb/igb_main.c
-f:drivers/net/ethernet/intel/igb/igb_ptp.c
-f:drivers/net/ethernet/intel/igb/igb_xsk.c
-f:drivers/net/ethernet/intel/igbvf/Makefile
-f:drivers/net/ethernet/intel/igbvf/defines.h
-f:drivers/net/ethernet/intel/igbvf/ethtool.c
-f:drivers/net/ethernet/intel/igbvf/igbvf.h
-f:drivers/net/ethernet/intel/igbvf/mbx.c
-f:drivers/net/ethernet/intel/igbvf/mbx.h
-f:drivers/net/ethernet/intel/igbvf/netdev.c
-f:drivers/net/ethernet/intel/igbvf/regs.h
-f:drivers/net/ethernet/intel/igbvf/vf.c
-f:drivers/net/ethernet/intel/igbvf/vf.h
-f:drivers/net/ethernet/intel/igc/Makefile
-f:drivers/net/ethernet/intel/igc/igc.h
-f:drivers/net/ethernet/intel/igc/igc_base.c
-f:drivers/net/ethernet/intel/igc/igc_base.h
-f:drivers/net/ethernet/intel/igc/igc_defines.h
-f:drivers/net/ethernet/intel/igc/igc_diag.c
-f:drivers/net/ethernet/intel/igc/igc_diag.h
-f:drivers/net/ethernet/intel/igc/igc_dump.c
-f:drivers/net/ethernet/intel/igc/igc_ethtool.c
-f:drivers/net/ethernet/intel/igc/igc_hw.h
-f:drivers/net/ethernet/intel/igc/igc_i225.c
-f:drivers/net/ethernet/intel/igc/igc_i225.h
-f:drivers/net/ethernet/intel/igc/igc_leds.c
-f:drivers/net/ethernet/intel/igc/igc_mac.c
-f:drivers/net/ethernet/intel/igc/igc_mac.h
-f:drivers/net/ethernet/intel/igc/igc_main.c
-f:drivers/net/ethernet/intel/igc/igc_nvm.c
-f:drivers/net/ethernet/intel/igc/igc_nvm.h
-f:drivers/net/ethernet/intel/igc/igc_phy.c
-f:drivers/net/ethernet/intel/igc/igc_phy.h
-f:drivers/net/ethernet/intel/igc/igc_ptp.c
-f:drivers/net/ethernet/intel/igc/igc_regs.h
-f:drivers/net/ethernet/intel/igc/igc_tsn.c
-f:drivers/net/ethernet/intel/igc/igc_tsn.h
-f:drivers/net/ethernet/intel/igc/igc_xdp.c
-f:drivers/net/ethernet/intel/igc/igc_xdp.h
-f:drivers/net/ethernet/intel/ixgbe/Makefile
-f:drivers/net/ethernet/intel/ixgbe/devlink/devlink.c
-f:drivers/net/ethernet/intel/ixgbe/devlink/devlink.h
-f:drivers/net/ethernet/intel/ixgbe/devlink/region.c
-f:drivers/net/ethernet/intel/ixgbe/ixgbe.h
-f:drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c
-f:drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c
-f:drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
-f:drivers/net/ethernet/intel/ixgbe/ixgbe_common.h
-f:drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c
-f:drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.h
-f:drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c
-f:drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.h
-f:drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c
-f:drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.h
-f:drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
-f:drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c
-f:drivers/net/ethernet/intel/ixgbe/ixgbe_e610.c
-f:drivers/net/ethernet/intel/ixgbe/ixgbe_e610.h
-f:drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
-f:drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c
-f:drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.h
-f:drivers/net/ethernet/intel/ixgbe/ixgbe_fw_update.c
-f:drivers/net/ethernet/intel/ixgbe/ixgbe_fw_update.h
-f:drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c
-f:drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.h
-f:drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c
-f:drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
-f:drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c
-f:drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h
-f:drivers/net/ethernet/intel/ixgbe/ixgbe_model.h
-f:drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
-f:drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h
-f:drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
-f:drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
-f:drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h
-f:drivers/net/ethernet/intel/ixgbe/ixgbe_sysfs.c
-f:drivers/net/ethernet/intel/ixgbe/ixgbe_txrx_common.h
-f:drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
-f:drivers/net/ethernet/intel/ixgbe/ixgbe_type_e610.h
-f:drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c
-f:drivers/net/ethernet/intel/ixgbe/ixgbe_x540.h
-f:drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
-f:drivers/net/ethernet/intel/ixgbe/ixgbe_x550.h
-f:drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c
-f:drivers/net/ethernet/intel/ixgbevf/Makefile
-f:drivers/net/ethernet/intel/ixgbevf/defines.h
-f:drivers/net/ethernet/intel/ixgbevf/ethtool.c
-f:drivers/net/ethernet/intel/ixgbevf/ipsec.c
-f:drivers/net/ethernet/intel/ixgbevf/ipsec.h
-f:drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
-f:drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
-f:drivers/net/ethernet/intel/ixgbevf/mbx.c
-f:drivers/net/ethernet/intel/ixgbevf/mbx.h
-f:drivers/net/ethernet/intel/ixgbevf/regs.h
-f:drivers/net/ethernet/intel/ixgbevf/vf.c
-f:drivers/net/ethernet/intel/ixgbevf/vf.h
-f:drivers/net/ethernet/intel/libeth/Kconfig
-f:drivers/net/ethernet/intel/libeth/Makefile
-f:drivers/net/ethernet/intel/libeth/priv.h
-f:drivers/net/ethernet/intel/libeth/rx.c
-f:drivers/net/ethernet/intel/libeth/tx.c
-f:drivers/net/ethernet/intel/libeth/xdp.c
-f:drivers/net/ethernet/intel/libeth/xsk.c
-f:drivers/net/ethernet/intel/libie/Kconfig
-f:drivers/net/ethernet/intel/libie/Makefile
-f:drivers/net/ethernet/intel/libie/adminq.c
-f:drivers/net/ethernet/intel/libie/rx.c
-f:drivers/net/ethernet/jme.c
-f:drivers/net/ethernet/jme.h
-f:drivers/net/ethernet/korina.c
-f:drivers/net/ethernet/lantiq_etop.c
-f:drivers/net/ethernet/lantiq_xrx200.c
-f:drivers/net/ethernet/litex/Kconfig
-f:drivers/net/ethernet/litex/Makefile
-f:drivers/net/ethernet/litex/litex_liteeth.c
-f:drivers/net/ethernet/marvell/Kconfig
-f:drivers/net/ethernet/marvell/Makefile
-f:drivers/net/ethernet/marvell/mv643xx_eth.c
-f:drivers/net/ethernet/marvell/mvmdio.c
-f:drivers/net/ethernet/marvell/mvneta.c
-f:drivers/net/ethernet/marvell/mvneta_bm.c
-f:drivers/net/ethernet/marvell/mvneta_bm.h
-f:drivers/net/ethernet/marvell/mvpp2/Makefile
-f:drivers/net/ethernet/marvell/mvpp2/mvpp2.h
-f:drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c
-f:drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.h
-f:drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c
-f:drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
-f:drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c
-f:drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.h
-f:drivers/net/ethernet/marvell/mvpp2/mvpp2_tai.c
-f:drivers/net/ethernet/marvell/octeon_ep/Kconfig
-f:drivers/net/ethernet/marvell/octeon_ep/Makefile
-f:drivers/net/ethernet/marvell/octeon_ep/octep_cn9k_pf.c
-f:drivers/net/ethernet/marvell/octeon_ep/octep_cnxk_pf.c
-f:drivers/net/ethernet/marvell/octeon_ep/octep_config.h
-f:drivers/net/ethernet/marvell/octeon_ep/octep_cp_version.h
-f:drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_mbox.c
-f:drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_mbox.h
-f:drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.c
-f:drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.h
-f:drivers/net/ethernet/marvell/octeon_ep/octep_ethtool.c
-f:drivers/net/ethernet/marvell/octeon_ep/octep_main.c
-f:drivers/net/ethernet/marvell/octeon_ep/octep_main.h
-f:drivers/net/ethernet/marvell/octeon_ep/octep_pfvf_mbox.c
-f:drivers/net/ethernet/marvell/octeon_ep/octep_pfvf_mbox.h
-f:drivers/net/ethernet/marvell/octeon_ep/octep_regs_cn9k_pf.h
-f:drivers/net/ethernet/marvell/octeon_ep/octep_regs_cnxk_pf.h
-f:drivers/net/ethernet/marvell/octeon_ep/octep_rx.c
-f:drivers/net/ethernet/marvell/octeon_ep/octep_rx.h
-f:drivers/net/ethernet/marvell/octeon_ep/octep_tx.c
-f:drivers/net/ethernet/marvell/octeon_ep/octep_tx.h
-f:drivers/net/ethernet/marvell/octeon_ep_vf/Kconfig
-f:drivers/net/ethernet/marvell/octeon_ep_vf/Makefile
-f:drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_cn9k.c
-f:drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_cnxk.c
-f:drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_config.h
-f:drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_ethtool.c
-f:drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_main.c
-f:drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_main.h
-f:drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_mbox.c
-f:drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_mbox.h
-f:drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_regs_cn9k.h
-f:drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_regs_cnxk.h
-f:drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_rx.c
-f:drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_rx.h
-f:drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_tx.c
-f:drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_tx.h
-f:drivers/net/ethernet/marvell/octeontx2/Kconfig
-f:drivers/net/ethernet/marvell/octeontx2/Makefile
-f:drivers/net/ethernet/marvell/octeontx2/af/Makefile
-f:drivers/net/ethernet/marvell/octeontx2/af/cgx.c
-f:drivers/net/ethernet/marvell/octeontx2/af/cgx.h
-f:drivers/net/ethernet/marvell/octeontx2/af/cgx_fw_if.h
-f:drivers/net/ethernet/marvell/octeontx2/af/cn20k/api.h
-f:drivers/net/ethernet/marvell/octeontx2/af/cn20k/mbox_init.c
-f:drivers/net/ethernet/marvell/octeontx2/af/cn20k/reg.h
-f:drivers/net/ethernet/marvell/octeontx2/af/cn20k/struct.h
-f:drivers/net/ethernet/marvell/octeontx2/af/common.h
-f:drivers/net/ethernet/marvell/octeontx2/af/lmac_common.h
-f:drivers/net/ethernet/marvell/octeontx2/af/mbox.c
-f:drivers/net/ethernet/marvell/octeontx2/af/mbox.h
-f:drivers/net/ethernet/marvell/octeontx2/af/mcs.c
-f:drivers/net/ethernet/marvell/octeontx2/af/mcs.h
-f:drivers/net/ethernet/marvell/octeontx2/af/mcs_cnf10kb.c
-f:drivers/net/ethernet/marvell/octeontx2/af/mcs_reg.h
-f:drivers/net/ethernet/marvell/octeontx2/af/mcs_rvu_if.c
-f:drivers/net/ethernet/marvell/octeontx2/af/npc.h
-f:drivers/net/ethernet/marvell/octeontx2/af/npc_profile.h
-f:drivers/net/ethernet/marvell/octeontx2/af/ptp.c
-f:drivers/net/ethernet/marvell/octeontx2/af/ptp.h
-f:drivers/net/ethernet/marvell/octeontx2/af/rpm.c
-f:drivers/net/ethernet/marvell/octeontx2/af/rpm.h
-f:drivers/net/ethernet/marvell/octeontx2/af/rvu.c
-f:drivers/net/ethernet/marvell/octeontx2/af/rvu.h
-f:drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c
-f:drivers/net/ethernet/marvell/octeontx2/af/rvu_cn10k.c
-f:drivers/net/ethernet/marvell/octeontx2/af/rvu_cpt.c
-f:drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c
-f:drivers/net/ethernet/marvell/octeontx2/af/rvu_devlink.c
-f:drivers/net/ethernet/marvell/octeontx2/af/rvu_devlink.h
-f:drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
-f:drivers/net/ethernet/marvell/octeontx2/af/rvu_npa.c
-f:drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c
-f:drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c
-f:drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.h
-f:drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_hash.c
-f:drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_hash.h
-f:drivers/net/ethernet/marvell/octeontx2/af/rvu_reg.c
-f:drivers/net/ethernet/marvell/octeontx2/af/rvu_reg.h
-f:drivers/net/ethernet/marvell/octeontx2/af/rvu_rep.c
-f:drivers/net/ethernet/marvell/octeontx2/af/rvu_sdp.c
-f:drivers/net/ethernet/marvell/octeontx2/af/rvu_struct.h
-f:drivers/net/ethernet/marvell/octeontx2/af/rvu_switch.c
-f:drivers/net/ethernet/marvell/octeontx2/af/rvu_trace.c
-f:drivers/net/ethernet/marvell/octeontx2/af/rvu_trace.h
-f:drivers/net/ethernet/marvell/octeontx2/nic/Makefile
-f:drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c
-f:drivers/net/ethernet/marvell/octeontx2/nic/cn10k.h
-f:drivers/net/ethernet/marvell/octeontx2/nic/cn10k_ipsec.c
-f:drivers/net/ethernet/marvell/octeontx2/nic/cn10k_ipsec.h
-f:drivers/net/ethernet/marvell/octeontx2/nic/cn10k_macsec.c
-f:drivers/net/ethernet/marvell/octeontx2/nic/cn20k.c
-f:drivers/net/ethernet/marvell/octeontx2/nic/cn20k.h
-f:drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c
-f:drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h
-f:drivers/net/ethernet/marvell/octeontx2/nic/otx2_dcbnl.c
-f:drivers/net/ethernet/marvell/octeontx2/nic/otx2_devlink.c
-f:drivers/net/ethernet/marvell/octeontx2/nic/otx2_devlink.h
-f:drivers/net/ethernet/marvell/octeontx2/nic/otx2_dmac_flt.c
-f:drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c
-f:drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c
-f:drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c
-f:drivers/net/ethernet/marvell/octeontx2/nic/otx2_ptp.c
-f:drivers/net/ethernet/marvell/octeontx2/nic/otx2_ptp.h
-f:drivers/net/ethernet/marvell/octeontx2/nic/otx2_reg.h
-f:drivers/net/ethernet/marvell/octeontx2/nic/otx2_struct.h
-f:drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c
-f:drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.c
-f:drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.h
-f:drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c
-f:drivers/net/ethernet/marvell/octeontx2/nic/otx2_xsk.c
-f:drivers/net/ethernet/marvell/octeontx2/nic/otx2_xsk.h
-f:drivers/net/ethernet/marvell/octeontx2/nic/qos.c
-f:drivers/net/ethernet/marvell/octeontx2/nic/qos.h
-f:drivers/net/ethernet/marvell/octeontx2/nic/qos_sq.c
-f:drivers/net/ethernet/marvell/octeontx2/nic/rep.c
-f:drivers/net/ethernet/marvell/octeontx2/nic/rep.h
-f:drivers/net/ethernet/marvell/prestera/Kconfig
-f:drivers/net/ethernet/marvell/prestera/Makefile
-f:drivers/net/ethernet/marvell/prestera/prestera.h
-f:drivers/net/ethernet/marvell/prestera/prestera_acl.c
-f:drivers/net/ethernet/marvell/prestera/prestera_acl.h
-f:drivers/net/ethernet/marvell/prestera/prestera_counter.c
-f:drivers/net/ethernet/marvell/prestera/prestera_counter.h
-f:drivers/net/ethernet/marvell/prestera/prestera_devlink.c
-f:drivers/net/ethernet/marvell/prestera/prestera_devlink.h
-f:drivers/net/ethernet/marvell/prestera/prestera_dsa.c
-f:drivers/net/ethernet/marvell/prestera/prestera_dsa.h
-f:drivers/net/ethernet/marvell/prestera/prestera_ethtool.c
-f:drivers/net/ethernet/marvell/prestera/prestera_ethtool.h
-f:drivers/net/ethernet/marvell/prestera/prestera_flow.c
-f:drivers/net/ethernet/marvell/prestera/prestera_flow.h
-f:drivers/net/ethernet/marvell/prestera/prestera_flower.c
-f:drivers/net/ethernet/marvell/prestera/prestera_flower.h
-f:drivers/net/ethernet/marvell/prestera/prestera_hw.c
-f:drivers/net/ethernet/marvell/prestera/prestera_hw.h
-f:drivers/net/ethernet/marvell/prestera/prestera_main.c
-f:drivers/net/ethernet/marvell/prestera/prestera_matchall.c
-f:drivers/net/ethernet/marvell/prestera/prestera_matchall.h
-f:drivers/net/ethernet/marvell/prestera/prestera_pci.c
-f:drivers/net/ethernet/marvell/prestera/prestera_router.c
-f:drivers/net/ethernet/marvell/prestera/prestera_router_hw.c
-f:drivers/net/ethernet/marvell/prestera/prestera_router_hw.h
-f:drivers/net/ethernet/marvell/prestera/prestera_rxtx.c
-f:drivers/net/ethernet/marvell/prestera/prestera_rxtx.h
-f:drivers/net/ethernet/marvell/prestera/prestera_span.c
-f:drivers/net/ethernet/marvell/prestera/prestera_span.h
-f:drivers/net/ethernet/marvell/prestera/prestera_switchdev.c
-f:drivers/net/ethernet/marvell/prestera/prestera_switchdev.h
-f:drivers/net/ethernet/marvell/pxa168_eth.c
-f:drivers/net/ethernet/marvell/skge.c
-f:drivers/net/ethernet/marvell/skge.h
-f:drivers/net/ethernet/marvell/sky2.c
-f:drivers/net/ethernet/marvell/sky2.h
-f:drivers/net/ethernet/mediatek/Kconfig
-f:drivers/net/ethernet/mediatek/Makefile
-f:drivers/net/ethernet/mediatek/mtk_eth_path.c
-f:drivers/net/ethernet/mediatek/mtk_eth_soc.c
-f:drivers/net/ethernet/mediatek/mtk_eth_soc.h
-f:drivers/net/ethernet/mediatek/mtk_ppe.c
-f:drivers/net/ethernet/mediatek/mtk_ppe.h
-f:drivers/net/ethernet/mediatek/mtk_ppe_debugfs.c
-f:drivers/net/ethernet/mediatek/mtk_ppe_offload.c
-f:drivers/net/ethernet/mediatek/mtk_ppe_regs.h
-f:drivers/net/ethernet/mediatek/mtk_star_emac.c
-f:drivers/net/ethernet/mediatek/mtk_wed.c
-f:drivers/net/ethernet/mediatek/mtk_wed.h
-f:drivers/net/ethernet/mediatek/mtk_wed_debugfs.c
-f:drivers/net/ethernet/mediatek/mtk_wed_mcu.c
-f:drivers/net/ethernet/mediatek/mtk_wed_ops.c
-f:drivers/net/ethernet/mediatek/mtk_wed_regs.h
-f:drivers/net/ethernet/mediatek/mtk_wed_wo.c
-f:drivers/net/ethernet/mediatek/mtk_wed_wo.h
-f:drivers/net/ethernet/mellanox/Kconfig
-f:drivers/net/ethernet/mellanox/Makefile
-f:drivers/net/ethernet/mellanox/mlx4/Kconfig
-f:drivers/net/ethernet/mellanox/mlx4/Makefile
-f:drivers/net/ethernet/mellanox/mlx4/alloc.c
-f:drivers/net/ethernet/mellanox/mlx4/catas.c
-f:drivers/net/ethernet/mellanox/mlx4/cmd.c
-f:drivers/net/ethernet/mellanox/mlx4/cq.c
-f:drivers/net/ethernet/mellanox/mlx4/crdump.c
-f:drivers/net/ethernet/mellanox/mlx4/en_clock.c
-f:drivers/net/ethernet/mellanox/mlx4/en_cq.c
-f:drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c
-f:drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
-f:drivers/net/ethernet/mellanox/mlx4/en_main.c
-f:drivers/net/ethernet/mellanox/mlx4/en_netdev.c
-f:drivers/net/ethernet/mellanox/mlx4/en_port.c
-f:drivers/net/ethernet/mellanox/mlx4/en_port.h
-f:drivers/net/ethernet/mellanox/mlx4/en_resources.c
-f:drivers/net/ethernet/mellanox/mlx4/en_rx.c
-f:drivers/net/ethernet/mellanox/mlx4/en_selftest.c
-f:drivers/net/ethernet/mellanox/mlx4/en_tx.c
-f:drivers/net/ethernet/mellanox/mlx4/eq.c
-f:drivers/net/ethernet/mellanox/mlx4/fw.c
-f:drivers/net/ethernet/mellanox/mlx4/fw.h
-f:drivers/net/ethernet/mellanox/mlx4/fw_qos.c
-f:drivers/net/ethernet/mellanox/mlx4/fw_qos.h
-f:drivers/net/ethernet/mellanox/mlx4/icm.c
-f:drivers/net/ethernet/mellanox/mlx4/icm.h
-f:drivers/net/ethernet/mellanox/mlx4/intf.c
-f:drivers/net/ethernet/mellanox/mlx4/main.c
-f:drivers/net/ethernet/mellanox/mlx4/mcg.c
-f:drivers/net/ethernet/mellanox/mlx4/mlx4.h
-f:drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
-f:drivers/net/ethernet/mellanox/mlx4/mlx4_stats.h
-f:drivers/net/ethernet/mellanox/mlx4/mr.c
-f:drivers/net/ethernet/mellanox/mlx4/pd.c
-f:drivers/net/ethernet/mellanox/mlx4/port.c
-f:drivers/net/ethernet/mellanox/mlx4/profile.c
-f:drivers/net/ethernet/mellanox/mlx4/qp.c
-f:drivers/net/ethernet/mellanox/mlx4/reset.c
-f:drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
-f:drivers/net/ethernet/mellanox/mlx4/sense.c
-f:drivers/net/ethernet/mellanox/mlx4/srq.c
-f:drivers/net/ethernet/mellanox/mlx5/core/Kconfig
-f:drivers/net/ethernet/mellanox/mlx5/core/Makefile
-f:drivers/net/ethernet/mellanox/mlx5/core/alloc.c
-f:drivers/net/ethernet/mellanox/mlx5/core/cmd.c
-f:drivers/net/ethernet/mellanox/mlx5/core/cq.c
-f:drivers/net/ethernet/mellanox/mlx5/core/debugfs.c
-f:drivers/net/ethernet/mellanox/mlx5/core/dev.c
-f:drivers/net/ethernet/mellanox/mlx5/core/devlink.c
-f:drivers/net/ethernet/mellanox/mlx5/core/devlink.h
-f:drivers/net/ethernet/mellanox/mlx5/core/diag/cmd_tracepoint.h
-f:drivers/net/ethernet/mellanox/mlx5/core/diag/crdump.c
-f:drivers/net/ethernet/mellanox/mlx5/core/diag/en_rep_tracepoint.h
-f:drivers/net/ethernet/mellanox/mlx5/core/diag/en_tc_tracepoint.c
-f:drivers/net/ethernet/mellanox/mlx5/core/diag/en_tc_tracepoint.h
-f:drivers/net/ethernet/mellanox/mlx5/core/diag/fs_tracepoint.c
-f:drivers/net/ethernet/mellanox/mlx5/core/diag/fs_tracepoint.h
-f:drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c
-f:drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.h
-f:drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer_tracepoint.h
-f:drivers/net/ethernet/mellanox/mlx5/core/diag/reporter_vnic.c
-f:drivers/net/ethernet/mellanox/mlx5/core/diag/reporter_vnic.h
-f:drivers/net/ethernet/mellanox/mlx5/core/diag/rsc_dump.c
-f:drivers/net/ethernet/mellanox/mlx5/core/diag/rsc_dump.h
-f:drivers/net/ethernet/mellanox/mlx5/core/dpll.c
-f:drivers/net/ethernet/mellanox/mlx5/core/ecpf.c
-f:drivers/net/ethernet/mellanox/mlx5/core/ecpf.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/channels.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/channels.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/dcbnl.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/devlink.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/devlink.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/dim.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/fs.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/fs_ethtool.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/fs_tt_redirect.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/fs_tt_redirect.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/health.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/health.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/htb.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/htb.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/hv_vhca_stats.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/hv_vhca_stats.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/mapping.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/mapping.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/mod_hdr.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/mod_hdr.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/monitor_stats.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/monitor_stats.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/params.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/params.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/pcie_cong_event.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/pcie_cong_event.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/port.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/port.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/port_buffer.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/port_buffer.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/ptp.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/qos.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/qos.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/rep/bond.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/rep/bridge.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/rep/bridge.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/rep/neigh.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/rep/neigh.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/rqt.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/rqt.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/rss.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/rss.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/selq.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/selq.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/accept.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/act.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/act.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/csum.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/ct.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/drop.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/goto.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/mark.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/mirred.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/mirred_nic.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/mpls.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/pedit.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/pedit.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/police.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/ptype.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/redirect_ingress.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/sample.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/sample.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/trap.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/tun.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/vlan.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/vlan.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/vlan_mangle.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc/act_stats.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc/act_stats.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc/ct_fs.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc/ct_fs_dmfs.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc/ct_fs_hmfs.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc/ct_fs_smfs.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc/int_port.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc/int_port.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc/meter.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc/meter.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc/post_act.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc/post_act.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc/post_meter.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc/post_meter.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc/sample.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc/sample.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc_priv.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_geneve.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_gre.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_mplsoudp.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tir.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/tir.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/trap.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/trap.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/xsk/pool.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/xsk/pool.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en/xsk/tx.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en/xsk/tx.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en_accel/en_accel.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_fs.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_offload.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_stats.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_stats.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_txrx.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_txrx.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_utils.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec_stats.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en_common.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en_dim.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en_fs_ethtool.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en_main.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en_rep.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en_selftest.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en_stats.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en_stats.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en_tc.h
-f:drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
-f:drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
-f:drivers/net/ethernet/mellanox/mlx5/core/eq.c
-f:drivers/net/ethernet/mellanox/mlx5/core/esw/Makefile
-f:drivers/net/ethernet/mellanox/mlx5/core/esw/acl/egress_lgcy.c
-f:drivers/net/ethernet/mellanox/mlx5/core/esw/acl/egress_ofld.c
-f:drivers/net/ethernet/mellanox/mlx5/core/esw/acl/helper.c
-f:drivers/net/ethernet/mellanox/mlx5/core/esw/acl/helper.h
-f:drivers/net/ethernet/mellanox/mlx5/core/esw/acl/ingress_lgcy.c
-f:drivers/net/ethernet/mellanox/mlx5/core/esw/acl/ingress_ofld.c
-f:drivers/net/ethernet/mellanox/mlx5/core/esw/acl/lgcy.h
-f:drivers/net/ethernet/mellanox/mlx5/core/esw/acl/ofld.h
-f:drivers/net/ethernet/mellanox/mlx5/core/esw/bridge.c
-f:drivers/net/ethernet/mellanox/mlx5/core/esw/bridge.h
-f:drivers/net/ethernet/mellanox/mlx5/core/esw/bridge_debugfs.c
-f:drivers/net/ethernet/mellanox/mlx5/core/esw/bridge_mcast.c
-f:drivers/net/ethernet/mellanox/mlx5/core/esw/bridge_priv.h
-f:drivers/net/ethernet/mellanox/mlx5/core/esw/devlink_port.c
-f:drivers/net/ethernet/mellanox/mlx5/core/esw/diag/bridge_tracepoint.h
-f:drivers/net/ethernet/mellanox/mlx5/core/esw/diag/qos_tracepoint.h
-f:drivers/net/ethernet/mellanox/mlx5/core/esw/indir_table.c
-f:drivers/net/ethernet/mellanox/mlx5/core/esw/indir_table.h
-f:drivers/net/ethernet/mellanox/mlx5/core/esw/ipsec.c
-f:drivers/net/ethernet/mellanox/mlx5/core/esw/ipsec_fs.c
-f:drivers/net/ethernet/mellanox/mlx5/core/esw/ipsec_fs.h
-f:drivers/net/ethernet/mellanox/mlx5/core/esw/legacy.c
-f:drivers/net/ethernet/mellanox/mlx5/core/esw/legacy.h
-f:drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c
-f:drivers/net/ethernet/mellanox/mlx5/core/esw/qos.h
-f:drivers/net/ethernet/mellanox/mlx5/core/esw/vporttbl.c
-f:drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
-f:drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
-f:drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
-f:drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c
-f:drivers/net/ethernet/mellanox/mlx5/core/events.c
-f:drivers/net/ethernet/mellanox/mlx5/core/fpga/cmd.c
-f:drivers/net/ethernet/mellanox/mlx5/core/fpga/cmd.h
-f:drivers/net/ethernet/mellanox/mlx5/core/fpga/conn.c
-f:drivers/net/ethernet/mellanox/mlx5/core/fpga/conn.h
-f:drivers/net/ethernet/mellanox/mlx5/core/fpga/core.c
-f:drivers/net/ethernet/mellanox/mlx5/core/fpga/core.h
-f:drivers/net/ethernet/mellanox/mlx5/core/fpga/sdk.c
-f:drivers/net/ethernet/mellanox/mlx5/core/fpga/sdk.h
-f:drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c
-f:drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.h
-f:drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
-f:drivers/net/ethernet/mellanox/mlx5/core/fs_core.h
-f:drivers/net/ethernet/mellanox/mlx5/core/fs_counters.c
-f:drivers/net/ethernet/mellanox/mlx5/core/fs_ft_pool.c
-f:drivers/net/ethernet/mellanox/mlx5/core/fs_ft_pool.h
-f:drivers/net/ethernet/mellanox/mlx5/core/fs_pool.c
-f:drivers/net/ethernet/mellanox/mlx5/core/fs_pool.h
-f:drivers/net/ethernet/mellanox/mlx5/core/fw.c
-f:drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c
-f:drivers/net/ethernet/mellanox/mlx5/core/fw_reset.h
-f:drivers/net/ethernet/mellanox/mlx5/core/health.c
-f:drivers/net/ethernet/mellanox/mlx5/core/hwmon.c
-f:drivers/net/ethernet/mellanox/mlx5/core/hwmon.h
-f:drivers/net/ethernet/mellanox/mlx5/core/ipoib/ethtool.c
-f:drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c
-f:drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.h
-f:drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib_vlan.c
-f:drivers/net/ethernet/mellanox/mlx5/core/irq_affinity.c
-f:drivers/net/ethernet/mellanox/mlx5/core/lag/debugfs.c
-f:drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c
-f:drivers/net/ethernet/mellanox/mlx5/core/lag/lag.h
-f:drivers/net/ethernet/mellanox/mlx5/core/lag/mp.c
-f:drivers/net/ethernet/mellanox/mlx5/core/lag/mp.h
-f:drivers/net/ethernet/mellanox/mlx5/core/lag/mpesw.c
-f:drivers/net/ethernet/mellanox/mlx5/core/lag/mpesw.h
-f:drivers/net/ethernet/mellanox/mlx5/core/lag/port_sel.c
-f:drivers/net/ethernet/mellanox/mlx5/core/lag/port_sel.h
-f:drivers/net/ethernet/mellanox/mlx5/core/lib/aso.c
-f:drivers/net/ethernet/mellanox/mlx5/core/lib/aso.h
-f:drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c
-f:drivers/net/ethernet/mellanox/mlx5/core/lib/clock.h
-f:drivers/net/ethernet/mellanox/mlx5/core/lib/crypto.c
-f:drivers/net/ethernet/mellanox/mlx5/core/lib/crypto.h
-f:drivers/net/ethernet/mellanox/mlx5/core/lib/devcom.c
-f:drivers/net/ethernet/mellanox/mlx5/core/lib/devcom.h
-f:drivers/net/ethernet/mellanox/mlx5/core/lib/dm.c
-f:drivers/net/ethernet/mellanox/mlx5/core/lib/eq.h
-f:drivers/net/ethernet/mellanox/mlx5/core/lib/events.h
-f:drivers/net/ethernet/mellanox/mlx5/core/lib/fs_chains.c
-f:drivers/net/ethernet/mellanox/mlx5/core/lib/fs_chains.h
-f:drivers/net/ethernet/mellanox/mlx5/core/lib/fs_ttc.c
-f:drivers/net/ethernet/mellanox/mlx5/core/lib/fs_ttc.h
-f:drivers/net/ethernet/mellanox/mlx5/core/lib/geneve.c
-f:drivers/net/ethernet/mellanox/mlx5/core/lib/geneve.h
-f:drivers/net/ethernet/mellanox/mlx5/core/lib/gid.c
-f:drivers/net/ethernet/mellanox/mlx5/core/lib/hv.c
-f:drivers/net/ethernet/mellanox/mlx5/core/lib/hv.h
-f:drivers/net/ethernet/mellanox/mlx5/core/lib/hv_vhca.c
-f:drivers/net/ethernet/mellanox/mlx5/core/lib/hv_vhca.h
-f:drivers/net/ethernet/mellanox/mlx5/core/lib/ipsec_fs_roce.c
-f:drivers/net/ethernet/mellanox/mlx5/core/lib/ipsec_fs_roce.h
-f:drivers/net/ethernet/mellanox/mlx5/core/lib/macsec_fs.c
-f:drivers/net/ethernet/mellanox/mlx5/core/lib/macsec_fs.h
-f:drivers/net/ethernet/mellanox/mlx5/core/lib/mlx5.h
-f:drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c
-f:drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.h
-f:drivers/net/ethernet/mellanox/mlx5/core/lib/pci_vsc.c
-f:drivers/net/ethernet/mellanox/mlx5/core/lib/pci_vsc.h
-f:drivers/net/ethernet/mellanox/mlx5/core/lib/port_tun.c
-f:drivers/net/ethernet/mellanox/mlx5/core/lib/port_tun.h
-f:drivers/net/ethernet/mellanox/mlx5/core/lib/sd.c
-f:drivers/net/ethernet/mellanox/mlx5/core/lib/sd.h
-f:drivers/net/ethernet/mellanox/mlx5/core/lib/sf.h
-f:drivers/net/ethernet/mellanox/mlx5/core/lib/smfs.c
-f:drivers/net/ethernet/mellanox/mlx5/core/lib/smfs.h
-f:drivers/net/ethernet/mellanox/mlx5/core/lib/st.c
-f:drivers/net/ethernet/mellanox/mlx5/core/lib/tout.c
-f:drivers/net/ethernet/mellanox/mlx5/core/lib/tout.h
-f:drivers/net/ethernet/mellanox/mlx5/core/lib/vxlan.c
-f:drivers/net/ethernet/mellanox/mlx5/core/lib/vxlan.h
-f:drivers/net/ethernet/mellanox/mlx5/core/main.c
-f:drivers/net/ethernet/mellanox/mlx5/core/mcg.c
-f:drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h
-f:drivers/net/ethernet/mellanox/mlx5/core/mlx5_irq.h
-f:drivers/net/ethernet/mellanox/mlx5/core/mr.c
-f:drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
-f:drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c
-f:drivers/net/ethernet/mellanox/mlx5/core/pci_irq.h
-f:drivers/net/ethernet/mellanox/mlx5/core/pd.c
-f:drivers/net/ethernet/mellanox/mlx5/core/port.c
-f:drivers/net/ethernet/mellanox/mlx5/core/qos.c
-f:drivers/net/ethernet/mellanox/mlx5/core/qos.h
-f:drivers/net/ethernet/mellanox/mlx5/core/rdma.c
-f:drivers/net/ethernet/mellanox/mlx5/core/rdma.h
-f:drivers/net/ethernet/mellanox/mlx5/core/rl.c
-f:drivers/net/ethernet/mellanox/mlx5/core/sf/cmd.c
-f:drivers/net/ethernet/mellanox/mlx5/core/sf/dev/dev.c
-f:drivers/net/ethernet/mellanox/mlx5/core/sf/dev/dev.h
-f:drivers/net/ethernet/mellanox/mlx5/core/sf/dev/diag/dev_tracepoint.h
-f:drivers/net/ethernet/mellanox/mlx5/core/sf/dev/driver.c
-f:drivers/net/ethernet/mellanox/mlx5/core/sf/devlink.c
-f:drivers/net/ethernet/mellanox/mlx5/core/sf/diag/sf_tracepoint.h
-f:drivers/net/ethernet/mellanox/mlx5/core/sf/diag/vhca_tracepoint.h
-f:drivers/net/ethernet/mellanox/mlx5/core/sf/hw_table.c
-f:drivers/net/ethernet/mellanox/mlx5/core/sf/mlx5_ifc_vhca_event.h
-f:drivers/net/ethernet/mellanox/mlx5/core/sf/priv.h
-f:drivers/net/ethernet/mellanox/mlx5/core/sf/sf.h
-f:drivers/net/ethernet/mellanox/mlx5/core/sf/vhca_event.c
-f:drivers/net/ethernet/mellanox/mlx5/core/sf/vhca_event.h
-f:drivers/net/ethernet/mellanox/mlx5/core/sriov.c
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/Makefile
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/hws/Makefile
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/hws/action.c
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/hws/action.h
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/hws/action_ste_pool.c
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/hws/action_ste_pool.h
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/hws/buddy.c
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/hws/buddy.h
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/hws/bwc.c
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/hws/bwc.h
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/hws/bwc_complex.c
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/hws/bwc_complex.h
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/hws/cmd.c
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/hws/cmd.h
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/hws/context.c
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/hws/context.h
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/hws/debug.c
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/hws/debug.h
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/hws/definer.c
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/hws/definer.h
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.h
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws_pools.c
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws_pools.h
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/hws/internal.h
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/hws/matcher.c
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/hws/matcher.h
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/hws/mlx5hws.h
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/hws/pat_arg.c
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/hws/pat_arg.h
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/hws/pool.c
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/hws/pool.h
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/hws/prm.h
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/hws/rule.c
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/hws/rule.h
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/hws/send.c
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/hws/send.h
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/hws/table.c
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/hws/table.h
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/hws/vport.c
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/hws/vport.h
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_action.c
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_arg.c
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_buddy.c
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_cmd.c
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_dbg.c
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_dbg.h
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_definer.c
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_domain.c
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_fw.c
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_icm_pool.c
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_matcher.c
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ptrn.c
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_rule.c
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_send.c
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ste.c
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ste.h
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ste_v0.c
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ste_v1.c
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ste_v1.h
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ste_v2.c
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ste_v2.h
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ste_v3.c
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_table.c
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_types.h
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/sws/fs_dr.c
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/sws/fs_dr.h
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/sws/mlx5_ifc_dr.h
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/sws/mlx5_ifc_dr_ste_v1.h
-f:drivers/net/ethernet/mellanox/mlx5/core/steering/sws/mlx5dr.h
-f:drivers/net/ethernet/mellanox/mlx5/core/transobj.c
-f:drivers/net/ethernet/mellanox/mlx5/core/uar.c
-f:drivers/net/ethernet/mellanox/mlx5/core/vport.c
-f:drivers/net/ethernet/mellanox/mlx5/core/wc.c
-f:drivers/net/ethernet/mellanox/mlx5/core/wq.c
-f:drivers/net/ethernet/mellanox/mlx5/core/wq.h
-f:drivers/net/ethernet/mellanox/mlxbf_gige/Kconfig
-f:drivers/net/ethernet/mellanox/mlxbf_gige/Makefile
-f:drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige.h
-f:drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_ethtool.c
-f:drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_intr.c
-f:drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c
-f:drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio.c
-f:drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio_bf2.h
-f:drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio_bf3.h
-f:drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_regs.h
-f:drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_rx.c
-f:drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_tx.c
-f:drivers/net/ethernet/mellanox/mlxfw/Kconfig
-f:drivers/net/ethernet/mellanox/mlxfw/Makefile
-f:drivers/net/ethernet/mellanox/mlxfw/mlxfw.h
-f:drivers/net/ethernet/mellanox/mlxfw/mlxfw_fsm.c
-f:drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.c
-f:drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.h
-f:drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2_file.h
-f:drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2_format.h
-f:drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2_tlv.h
-f:drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2_tlv_multi.c
-f:drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2_tlv_multi.h
-f:drivers/net/ethernet/mellanox/mlxsw/Kconfig
-f:drivers/net/ethernet/mellanox/mlxsw/Makefile
-f:drivers/net/ethernet/mellanox/mlxsw/cmd.h
-f:drivers/net/ethernet/mellanox/mlxsw/core.c
-f:drivers/net/ethernet/mellanox/mlxsw/core.h
-f:drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c
-f:drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.h
-f:drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_keys.c
-f:drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_keys.h
-f:drivers/net/ethernet/mellanox/mlxsw/core_env.c
-f:drivers/net/ethernet/mellanox/mlxsw/core_env.h
-f:drivers/net/ethernet/mellanox/mlxsw/core_hwmon.c
-f:drivers/net/ethernet/mellanox/mlxsw/core_linecard_dev.c
-f:drivers/net/ethernet/mellanox/mlxsw/core_linecards.c
-f:drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
-f:drivers/net/ethernet/mellanox/mlxsw/emad.h
-f:drivers/net/ethernet/mellanox/mlxsw/i2c.c
-f:drivers/net/ethernet/mellanox/mlxsw/i2c.h
-f:drivers/net/ethernet/mellanox/mlxsw/item.h
-f:drivers/net/ethernet/mellanox/mlxsw/minimal.c
-f:drivers/net/ethernet/mellanox/mlxsw/pci.c
-f:drivers/net/ethernet/mellanox/mlxsw/pci.h
-f:drivers/net/ethernet/mellanox/mlxsw/pci_hw.h
-f:drivers/net/ethernet/mellanox/mlxsw/port.h
-f:drivers/net/ethernet/mellanox/mlxsw/reg.h
-f:drivers/net/ethernet/mellanox/mlxsw/resources.h
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum.c
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum.h
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum1_acl_tcam.c
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum1_kvdl.c
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum1_mr_tcam.c
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum2_acl_tcam.c
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum2_kvdl.c
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum2_mr_tcam.c
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_atcam.c
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_bloom_filter.c
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_ctcam.c
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_erp.c
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_flex_actions.c
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_flex_actions.h
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_flex_keys.c
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.h
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum_cnt.c
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum_cnt.h
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum_dcb.c
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.c
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.h
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum_ethtool.c
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum_flow.c
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.c
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.h
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum_kvdl.c
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum_matchall.c
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum_mr.c
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum_mr.h
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum_mr_tcam.c
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum_mr_tcam.h
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.h
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum_pgt.c
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum_policer.c
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum_port_range.c
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.h
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum_qdisc.c
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum_router.h
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum_span.h
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.h
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum_trap.c
-f:drivers/net/ethernet/mellanox/mlxsw/spectrum_trap.h
-f:drivers/net/ethernet/mellanox/mlxsw/trap.h
-f:drivers/net/ethernet/mellanox/mlxsw/txheader.h
-f:drivers/net/ethernet/meta/Kconfig
-f:drivers/net/ethernet/meta/Makefile
-f:drivers/net/ethernet/meta/fbnic/Makefile
-f:drivers/net/ethernet/meta/fbnic/fbnic.h
-f:drivers/net/ethernet/meta/fbnic/fbnic_csr.c
-f:drivers/net/ethernet/meta/fbnic/fbnic_csr.h
-f:drivers/net/ethernet/meta/fbnic/fbnic_debugfs.c
-f:drivers/net/ethernet/meta/fbnic/fbnic_devlink.c
-f:drivers/net/ethernet/meta/fbnic/fbnic_drvinfo.h
-f:drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c
-f:drivers/net/ethernet/meta/fbnic/fbnic_fw.c
-f:drivers/net/ethernet/meta/fbnic/fbnic_fw.h
-f:drivers/net/ethernet/meta/fbnic/fbnic_fw_log.c
-f:drivers/net/ethernet/meta/fbnic/fbnic_fw_log.h
-f:drivers/net/ethernet/meta/fbnic/fbnic_hw_stats.c
-f:drivers/net/ethernet/meta/fbnic/fbnic_hw_stats.h
-f:drivers/net/ethernet/meta/fbnic/fbnic_hwmon.c
-f:drivers/net/ethernet/meta/fbnic/fbnic_irq.c
-f:drivers/net/ethernet/meta/fbnic/fbnic_mac.c
-f:drivers/net/ethernet/meta/fbnic/fbnic_mac.h
-f:drivers/net/ethernet/meta/fbnic/fbnic_netdev.c
-f:drivers/net/ethernet/meta/fbnic/fbnic_netdev.h
-f:drivers/net/ethernet/meta/fbnic/fbnic_pci.c
-f:drivers/net/ethernet/meta/fbnic/fbnic_phylink.c
-f:drivers/net/ethernet/meta/fbnic/fbnic_rpc.c
-f:drivers/net/ethernet/meta/fbnic/fbnic_rpc.h
-f:drivers/net/ethernet/meta/fbnic/fbnic_time.c
-f:drivers/net/ethernet/meta/fbnic/fbnic_tlv.c
-f:drivers/net/ethernet/meta/fbnic/fbnic_tlv.h
-f:drivers/net/ethernet/meta/fbnic/fbnic_txrx.c
-f:drivers/net/ethernet/meta/fbnic/fbnic_txrx.h
-f:drivers/net/ethernet/micrel/Kconfig
-f:drivers/net/ethernet/micrel/Makefile
-f:drivers/net/ethernet/micrel/ks8842.c
-f:drivers/net/ethernet/micrel/ks8851.h
-f:drivers/net/ethernet/micrel/ks8851_common.c
-f:drivers/net/ethernet/micrel/ks8851_par.c
-f:drivers/net/ethernet/micrel/ks8851_spi.c
-f:drivers/net/ethernet/micrel/ksz884x.c
-f:drivers/net/ethernet/microchip/Kconfig
-f:drivers/net/ethernet/microchip/Makefile
-f:drivers/net/ethernet/microchip/enc28j60.c
-f:drivers/net/ethernet/microchip/enc28j60_hw.h
-f:drivers/net/ethernet/microchip/encx24j600-regmap.c
-f:drivers/net/ethernet/microchip/encx24j600.c
-f:drivers/net/ethernet/microchip/encx24j600_hw.h
-f:drivers/net/ethernet/microchip/fdma/Kconfig
-f:drivers/net/ethernet/microchip/fdma/Makefile
-f:drivers/net/ethernet/microchip/fdma/fdma_api.c
-f:drivers/net/ethernet/microchip/fdma/fdma_api.h
-f:drivers/net/ethernet/microchip/lan743x_ethtool.c
-f:drivers/net/ethernet/microchip/lan743x_ethtool.h
-f:drivers/net/ethernet/microchip/lan743x_main.c
-f:drivers/net/ethernet/microchip/lan743x_main.h
-f:drivers/net/ethernet/microchip/lan743x_ptp.c
-f:drivers/net/ethernet/microchip/lan743x_ptp.h
-f:drivers/net/ethernet/microchip/lan865x/Kconfig
-f:drivers/net/ethernet/microchip/lan865x/Makefile
-f:drivers/net/ethernet/microchip/lan865x/lan865x.c
-f:drivers/net/ethernet/microchip/lan966x/Kconfig
-f:drivers/net/ethernet/microchip/lan966x/Makefile
-f:drivers/net/ethernet/microchip/lan966x/lan966x_cbs.c
-f:drivers/net/ethernet/microchip/lan966x/lan966x_dcb.c
-f:drivers/net/ethernet/microchip/lan966x/lan966x_ethtool.c
-f:drivers/net/ethernet/microchip/lan966x/lan966x_ets.c
-f:drivers/net/ethernet/microchip/lan966x/lan966x_fdb.c
-f:drivers/net/ethernet/microchip/lan966x/lan966x_fdma.c
-f:drivers/net/ethernet/microchip/lan966x/lan966x_goto.c
-f:drivers/net/ethernet/microchip/lan966x/lan966x_ifh.h
-f:drivers/net/ethernet/microchip/lan966x/lan966x_lag.c
-f:drivers/net/ethernet/microchip/lan966x/lan966x_mac.c
-f:drivers/net/ethernet/microchip/lan966x/lan966x_main.c
-f:drivers/net/ethernet/microchip/lan966x/lan966x_main.h
-f:drivers/net/ethernet/microchip/lan966x/lan966x_mdb.c
-f:drivers/net/ethernet/microchip/lan966x/lan966x_mirror.c
-f:drivers/net/ethernet/microchip/lan966x/lan966x_mqprio.c
-f:drivers/net/ethernet/microchip/lan966x/lan966x_phylink.c
-f:drivers/net/ethernet/microchip/lan966x/lan966x_police.c
-f:drivers/net/ethernet/microchip/lan966x/lan966x_port.c
-f:drivers/net/ethernet/microchip/lan966x/lan966x_ptp.c
-f:drivers/net/ethernet/microchip/lan966x/lan966x_regs.h
-f:drivers/net/ethernet/microchip/lan966x/lan966x_switchdev.c
-f:drivers/net/ethernet/microchip/lan966x/lan966x_taprio.c
-f:drivers/net/ethernet/microchip/lan966x/lan966x_tbf.c
-f:drivers/net/ethernet/microchip/lan966x/lan966x_tc.c
-f:drivers/net/ethernet/microchip/lan966x/lan966x_tc_flower.c
-f:drivers/net/ethernet/microchip/lan966x/lan966x_tc_matchall.c
-f:drivers/net/ethernet/microchip/lan966x/lan966x_vcap_ag_api.c
-f:drivers/net/ethernet/microchip/lan966x/lan966x_vcap_ag_api.h
-f:drivers/net/ethernet/microchip/lan966x/lan966x_vcap_debugfs.c
-f:drivers/net/ethernet/microchip/lan966x/lan966x_vcap_impl.c
-f:drivers/net/ethernet/microchip/lan966x/lan966x_vlan.c
-f:drivers/net/ethernet/microchip/lan966x/lan966x_xdp.c
-f:drivers/net/ethernet/microchip/sparx5/Kconfig
-f:drivers/net/ethernet/microchip/sparx5/Makefile
-f:drivers/net/ethernet/microchip/sparx5/lan969x/lan969x.c
-f:drivers/net/ethernet/microchip/sparx5/lan969x/lan969x.h
-f:drivers/net/ethernet/microchip/sparx5/lan969x/lan969x_calendar.c
-f:drivers/net/ethernet/microchip/sparx5/lan969x/lan969x_fdma.c
-f:drivers/net/ethernet/microchip/sparx5/lan969x/lan969x_regs.c
-f:drivers/net/ethernet/microchip/sparx5/lan969x/lan969x_rgmii.c
-f:drivers/net/ethernet/microchip/sparx5/lan969x/lan969x_vcap_ag_api.c
-f:drivers/net/ethernet/microchip/sparx5/lan969x/lan969x_vcap_impl.c
-f:drivers/net/ethernet/microchip/sparx5/sparx5_calendar.c
-f:drivers/net/ethernet/microchip/sparx5/sparx5_dcb.c
-f:drivers/net/ethernet/microchip/sparx5/sparx5_ethtool.c
-f:drivers/net/ethernet/microchip/sparx5/sparx5_fdma.c
-f:drivers/net/ethernet/microchip/sparx5/sparx5_mactable.c
-f:drivers/net/ethernet/microchip/sparx5/sparx5_main.c
-f:drivers/net/ethernet/microchip/sparx5/sparx5_main.h
-f:drivers/net/ethernet/microchip/sparx5/sparx5_main_regs.h
-f:drivers/net/ethernet/microchip/sparx5/sparx5_mirror.c
-f:drivers/net/ethernet/microchip/sparx5/sparx5_netdev.c
-f:drivers/net/ethernet/microchip/sparx5/sparx5_packet.c
-f:drivers/net/ethernet/microchip/sparx5/sparx5_pgid.c
-f:drivers/net/ethernet/microchip/sparx5/sparx5_phylink.c
-f:drivers/net/ethernet/microchip/sparx5/sparx5_police.c
-f:drivers/net/ethernet/microchip/sparx5/sparx5_pool.c
-f:drivers/net/ethernet/microchip/sparx5/sparx5_port.c
-f:drivers/net/ethernet/microchip/sparx5/sparx5_port.h
-f:drivers/net/ethernet/microchip/sparx5/sparx5_psfp.c
-f:drivers/net/ethernet/microchip/sparx5/sparx5_ptp.c
-f:drivers/net/ethernet/microchip/sparx5/sparx5_qos.c
-f:drivers/net/ethernet/microchip/sparx5/sparx5_qos.h
-f:drivers/net/ethernet/microchip/sparx5/sparx5_regs.c
-f:drivers/net/ethernet/microchip/sparx5/sparx5_regs.h
-f:drivers/net/ethernet/microchip/sparx5/sparx5_sdlb.c
-f:drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c
-f:drivers/net/ethernet/microchip/sparx5/sparx5_tc.c
-f:drivers/net/ethernet/microchip/sparx5/sparx5_tc.h
-f:drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c
-f:drivers/net/ethernet/microchip/sparx5/sparx5_tc_matchall.c
-f:drivers/net/ethernet/microchip/sparx5/sparx5_vcap_ag_api.c
-f:drivers/net/ethernet/microchip/sparx5/sparx5_vcap_ag_api.h
-f:drivers/net/ethernet/microchip/sparx5/sparx5_vcap_debugfs.c
-f:drivers/net/ethernet/microchip/sparx5/sparx5_vcap_debugfs.h
-f:drivers/net/ethernet/microchip/sparx5/sparx5_vcap_impl.c
-f:drivers/net/ethernet/microchip/sparx5/sparx5_vcap_impl.h
-f:drivers/net/ethernet/microchip/sparx5/sparx5_vlan.c
-f:drivers/net/ethernet/microchip/vcap/Kconfig
-f:drivers/net/ethernet/microchip/vcap/Makefile
-f:drivers/net/ethernet/microchip/vcap/vcap_ag_api.h
-f:drivers/net/ethernet/microchip/vcap/vcap_api.c
-f:drivers/net/ethernet/microchip/vcap/vcap_api.h
-f:drivers/net/ethernet/microchip/vcap/vcap_api_client.h
-f:drivers/net/ethernet/microchip/vcap/vcap_api_debugfs.c
-f:drivers/net/ethernet/microchip/vcap/vcap_api_debugfs.h
-f:drivers/net/ethernet/microchip/vcap/vcap_api_debugfs_kunit.c
-f:drivers/net/ethernet/microchip/vcap/vcap_api_kunit.c
-f:drivers/net/ethernet/microchip/vcap/vcap_api_private.h
-f:drivers/net/ethernet/microchip/vcap/vcap_model_kunit.c
-f:drivers/net/ethernet/microchip/vcap/vcap_model_kunit.h
-f:drivers/net/ethernet/microchip/vcap/vcap_tc.c
-f:drivers/net/ethernet/microchip/vcap/vcap_tc.h
-f:drivers/net/ethernet/microsoft/Kconfig
-f:drivers/net/ethernet/microsoft/Makefile
-f:drivers/net/ethernet/microsoft/mana/Makefile
-f:drivers/net/ethernet/microsoft/mana/gdma_main.c
-f:drivers/net/ethernet/microsoft/mana/hw_channel.c
-f:drivers/net/ethernet/microsoft/mana/mana_bpf.c
-f:drivers/net/ethernet/microsoft/mana/mana_en.c
-f:drivers/net/ethernet/microsoft/mana/mana_ethtool.c
-f:drivers/net/ethernet/microsoft/mana/shm_channel.c
-f:drivers/net/ethernet/moxa/Kconfig
-f:drivers/net/ethernet/moxa/Makefile
-f:drivers/net/ethernet/moxa/moxart_ether.c
-f:drivers/net/ethernet/moxa/moxart_ether.h
-f:drivers/net/ethernet/mscc/Kconfig
-f:drivers/net/ethernet/mscc/Makefile
-f:drivers/net/ethernet/mscc/ocelot.c
-f:drivers/net/ethernet/mscc/ocelot.h
-f:drivers/net/ethernet/mscc/ocelot_devlink.c
-f:drivers/net/ethernet/mscc/ocelot_fdma.c
-f:drivers/net/ethernet/mscc/ocelot_fdma.h
-f:drivers/net/ethernet/mscc/ocelot_flower.c
-f:drivers/net/ethernet/mscc/ocelot_io.c
-f:drivers/net/ethernet/mscc/ocelot_mm.c
-f:drivers/net/ethernet/mscc/ocelot_mrp.c
-f:drivers/net/ethernet/mscc/ocelot_net.c
-f:drivers/net/ethernet/mscc/ocelot_police.c
-f:drivers/net/ethernet/mscc/ocelot_police.h
-f:drivers/net/ethernet/mscc/ocelot_ptp.c
-f:drivers/net/ethernet/mscc/ocelot_qs.h
-f:drivers/net/ethernet/mscc/ocelot_rew.h
-f:drivers/net/ethernet/mscc/ocelot_stats.c
-f:drivers/net/ethernet/mscc/ocelot_vcap.c
-f:drivers/net/ethernet/mscc/ocelot_vcap.h
-f:drivers/net/ethernet/mscc/ocelot_vsc7514.c
-f:drivers/net/ethernet/mscc/vsc7514_regs.c
-f:drivers/net/ethernet/myricom/Kconfig
-f:drivers/net/ethernet/myricom/Makefile
-f:drivers/net/ethernet/myricom/myri10ge/Makefile
-f:drivers/net/ethernet/myricom/myri10ge/myri10ge.c
-f:drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp.h
-f:drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp_gen_header.h
-f:drivers/net/ethernet/natsemi/Kconfig
-f:drivers/net/ethernet/natsemi/Makefile
-f:drivers/net/ethernet/natsemi/jazzsonic.c
-f:drivers/net/ethernet/natsemi/macsonic.c
-f:drivers/net/ethernet/natsemi/natsemi.c
-f:drivers/net/ethernet/natsemi/ns83820.c
-f:drivers/net/ethernet/natsemi/sonic.c
-f:drivers/net/ethernet/natsemi/sonic.h
-f:drivers/net/ethernet/natsemi/xtsonic.c
-f:drivers/net/ethernet/neterion/Kconfig
-f:drivers/net/ethernet/neterion/Makefile
-f:drivers/net/ethernet/neterion/s2io-regs.h
-f:drivers/net/ethernet/neterion/s2io.c
-f:drivers/net/ethernet/neterion/s2io.h
-f:drivers/net/ethernet/netronome/Kconfig
-f:drivers/net/ethernet/netronome/Makefile
-f:drivers/net/ethernet/netronome/nfp/Makefile
-f:drivers/net/ethernet/netronome/nfp/abm/cls.c
-f:drivers/net/ethernet/netronome/nfp/abm/ctrl.c
-f:drivers/net/ethernet/netronome/nfp/abm/main.c
-f:drivers/net/ethernet/netronome/nfp/abm/main.h
-f:drivers/net/ethernet/netronome/nfp/abm/qdisc.c
-f:drivers/net/ethernet/netronome/nfp/bpf/cmsg.c
-f:drivers/net/ethernet/netronome/nfp/bpf/fw.h
-f:drivers/net/ethernet/netronome/nfp/bpf/jit.c
-f:drivers/net/ethernet/netronome/nfp/bpf/main.c
-f:drivers/net/ethernet/netronome/nfp/bpf/main.h
-f:drivers/net/ethernet/netronome/nfp/bpf/offload.c
-f:drivers/net/ethernet/netronome/nfp/bpf/verifier.c
-f:drivers/net/ethernet/netronome/nfp/ccm.c
-f:drivers/net/ethernet/netronome/nfp/ccm.h
-f:drivers/net/ethernet/netronome/nfp/ccm_mbox.c
-f:drivers/net/ethernet/netronome/nfp/crypto/crypto.h
-f:drivers/net/ethernet/netronome/nfp/crypto/fw.h
-f:drivers/net/ethernet/netronome/nfp/crypto/ipsec.c
-f:drivers/net/ethernet/netronome/nfp/crypto/tls.c
-f:drivers/net/ethernet/netronome/nfp/devlink_param.c
-f:drivers/net/ethernet/netronome/nfp/flower/action.c
-f:drivers/net/ethernet/netronome/nfp/flower/cmsg.c
-f:drivers/net/ethernet/netronome/nfp/flower/cmsg.h
-f:drivers/net/ethernet/netronome/nfp/flower/conntrack.c
-f:drivers/net/ethernet/netronome/nfp/flower/conntrack.h
-f:drivers/net/ethernet/netronome/nfp/flower/lag_conf.c
-f:drivers/net/ethernet/netronome/nfp/flower/main.c
-f:drivers/net/ethernet/netronome/nfp/flower/main.h
-f:drivers/net/ethernet/netronome/nfp/flower/match.c
-f:drivers/net/ethernet/netronome/nfp/flower/metadata.c
-f:drivers/net/ethernet/netronome/nfp/flower/offload.c
-f:drivers/net/ethernet/netronome/nfp/flower/qos_conf.c
-f:drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c
-f:drivers/net/ethernet/netronome/nfp/nfd3/dp.c
-f:drivers/net/ethernet/netronome/nfp/nfd3/ipsec.c
-f:drivers/net/ethernet/netronome/nfp/nfd3/nfd3.h
-f:drivers/net/ethernet/netronome/nfp/nfd3/rings.c
-f:drivers/net/ethernet/netronome/nfp/nfd3/xsk.c
-f:drivers/net/ethernet/netronome/nfp/nfdk/dp.c
-f:drivers/net/ethernet/netronome/nfp/nfdk/ipsec.c
-f:drivers/net/ethernet/netronome/nfp/nfdk/nfdk.h
-f:drivers/net/ethernet/netronome/nfp/nfdk/rings.c
-f:drivers/net/ethernet/netronome/nfp/nfp_abi.h
-f:drivers/net/ethernet/netronome/nfp/nfp_app.c
-f:drivers/net/ethernet/netronome/nfp/nfp_app.h
-f:drivers/net/ethernet/netronome/nfp/nfp_app_nic.c
-f:drivers/net/ethernet/netronome/nfp/nfp_asm.c
-f:drivers/net/ethernet/netronome/nfp/nfp_asm.h
-f:drivers/net/ethernet/netronome/nfp/nfp_devlink.c
-f:drivers/net/ethernet/netronome/nfp/nfp_hwmon.c
-f:drivers/net/ethernet/netronome/nfp/nfp_main.c
-f:drivers/net/ethernet/netronome/nfp/nfp_main.h
-f:drivers/net/ethernet/netronome/nfp/nfp_net.h
-f:drivers/net/ethernet/netronome/nfp/nfp_net_common.c
-f:drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.c
-f:drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h
-f:drivers/net/ethernet/netronome/nfp/nfp_net_debugdump.c
-f:drivers/net/ethernet/netronome/nfp/nfp_net_debugfs.c
-f:drivers/net/ethernet/netronome/nfp/nfp_net_dp.c
-f:drivers/net/ethernet/netronome/nfp/nfp_net_dp.h
-f:drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c
-f:drivers/net/ethernet/netronome/nfp/nfp_net_main.c
-f:drivers/net/ethernet/netronome/nfp/nfp_net_repr.c
-f:drivers/net/ethernet/netronome/nfp/nfp_net_repr.h
-f:drivers/net/ethernet/netronome/nfp/nfp_net_sriov.c
-f:drivers/net/ethernet/netronome/nfp/nfp_net_sriov.h
-f:drivers/net/ethernet/netronome/nfp/nfp_net_xsk.c
-f:drivers/net/ethernet/netronome/nfp/nfp_net_xsk.h
-f:drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c
-f:drivers/net/ethernet/netronome/nfp/nfp_port.c
-f:drivers/net/ethernet/netronome/nfp/nfp_port.h
-f:drivers/net/ethernet/netronome/nfp/nfp_shared_buf.c
-f:drivers/net/ethernet/netronome/nfp/nfpcore/crc32.h
-f:drivers/net/ethernet/netronome/nfp/nfpcore/nfp.h
-f:drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000/nfp6000.h
-f:drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000/nfp_xpb.h
-f:drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c
-f:drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.h
-f:drivers/net/ethernet/netronome/nfp/nfpcore/nfp_arm.h
-f:drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cpp.h
-f:drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c
-f:drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cpplib.c
-f:drivers/net/ethernet/netronome/nfp/nfpcore/nfp_dev.c
-f:drivers/net/ethernet/netronome/nfp/nfpcore/nfp_dev.h
-f:drivers/net/ethernet/netronome/nfp/nfpcore/nfp_hwinfo.c
-f:drivers/net/ethernet/netronome/nfp/nfpcore/nfp_mip.c
-f:drivers/net/ethernet/netronome/nfp/nfpcore/nfp_mutex.c
-f:drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nffw.c
-f:drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nffw.h
-f:drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c
-f:drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h
-f:drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp_cmds.c
-f:drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp_eth.c
-f:drivers/net/ethernet/netronome/nfp/nfpcore/nfp_resource.c
-f:drivers/net/ethernet/netronome/nfp/nfpcore/nfp_rtsym.c
-f:drivers/net/ethernet/netronome/nfp/nfpcore/nfp_target.c
-f:drivers/net/ethernet/netronome/nfp/nic/dcb.c
-f:drivers/net/ethernet/netronome/nfp/nic/main.c
-f:drivers/net/ethernet/netronome/nfp/nic/main.h
-f:drivers/net/ethernet/ni/Kconfig
-f:drivers/net/ethernet/ni/Makefile
-f:drivers/net/ethernet/ni/nixge.c
-f:drivers/net/ethernet/nvidia/Kconfig
-f:drivers/net/ethernet/nvidia/Makefile
-f:drivers/net/ethernet/nvidia/forcedeth.c
-f:drivers/net/ethernet/nxp/Kconfig
-f:drivers/net/ethernet/nxp/Makefile
-f:drivers/net/ethernet/nxp/lpc_eth.c
-f:drivers/net/ethernet/oa_tc6.c
-f:drivers/net/ethernet/oki-semi/Kconfig
-f:drivers/net/ethernet/oki-semi/Makefile
-f:drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
-f:drivers/net/ethernet/oki-semi/pch_gbe/Makefile
-f:drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h
-f:drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c
-f:drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
-f:drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c
-f:drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.c
-f:drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.h
-f:drivers/net/ethernet/packetengines/Kconfig
-f:drivers/net/ethernet/packetengines/Makefile
-f:drivers/net/ethernet/packetengines/hamachi.c
-f:drivers/net/ethernet/packetengines/yellowfin.c
-f:drivers/net/ethernet/pasemi/Kconfig
-f:drivers/net/ethernet/pasemi/Makefile
-f:drivers/net/ethernet/pasemi/pasemi_mac.c
-f:drivers/net/ethernet/pasemi/pasemi_mac.h
-f:drivers/net/ethernet/pasemi/pasemi_mac_ethtool.c
-f:drivers/net/ethernet/pensando/Kconfig
-f:drivers/net/ethernet/pensando/Makefile
-f:drivers/net/ethernet/pensando/ionic/Makefile
-f:drivers/net/ethernet/pensando/ionic/ionic.h
-f:drivers/net/ethernet/pensando/ionic/ionic_bus.h
-f:drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c
-f:drivers/net/ethernet/pensando/ionic/ionic_debugfs.c
-f:drivers/net/ethernet/pensando/ionic/ionic_debugfs.h
-f:drivers/net/ethernet/pensando/ionic/ionic_dev.c
-f:drivers/net/ethernet/pensando/ionic/ionic_dev.h
-f:drivers/net/ethernet/pensando/ionic/ionic_devlink.c
-f:drivers/net/ethernet/pensando/ionic/ionic_devlink.h
-f:drivers/net/ethernet/pensando/ionic/ionic_ethtool.c
-f:drivers/net/ethernet/pensando/ionic/ionic_ethtool.h
-f:drivers/net/ethernet/pensando/ionic/ionic_fw.c
-f:drivers/net/ethernet/pensando/ionic/ionic_if.h
-f:drivers/net/ethernet/pensando/ionic/ionic_lif.c
-f:drivers/net/ethernet/pensando/ionic/ionic_lif.h
-f:drivers/net/ethernet/pensando/ionic/ionic_main.c
-f:drivers/net/ethernet/pensando/ionic/ionic_phc.c
-f:drivers/net/ethernet/pensando/ionic/ionic_regs.h
-f:drivers/net/ethernet/pensando/ionic/ionic_rx_filter.c
-f:drivers/net/ethernet/pensando/ionic/ionic_rx_filter.h
-f:drivers/net/ethernet/pensando/ionic/ionic_stats.c
-f:drivers/net/ethernet/pensando/ionic/ionic_stats.h
-f:drivers/net/ethernet/pensando/ionic/ionic_txrx.c
-f:drivers/net/ethernet/pensando/ionic/ionic_txrx.h
-f:drivers/net/ethernet/qlogic/Kconfig
-f:drivers/net/ethernet/qlogic/Makefile
-f:drivers/net/ethernet/qlogic/netxen/Makefile
-f:drivers/net/ethernet/qlogic/netxen/netxen_nic.h
-f:drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c
-f:drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c
-f:drivers/net/ethernet/qlogic/netxen/netxen_nic_hdr.h
-f:drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c
-f:drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.h
-f:drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
-f:drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
-f:drivers/net/ethernet/qlogic/qed/Makefile
-f:drivers/net/ethernet/qlogic/qed/qed.h
-f:drivers/net/ethernet/qlogic/qed/qed_chain.c
-f:drivers/net/ethernet/qlogic/qed/qed_cxt.c
-f:drivers/net/ethernet/qlogic/qed/qed_cxt.h
-f:drivers/net/ethernet/qlogic/qed/qed_dbg_hsi.h
-f:drivers/net/ethernet/qlogic/qed/qed_dcbx.c
-f:drivers/net/ethernet/qlogic/qed/qed_dcbx.h
-f:drivers/net/ethernet/qlogic/qed/qed_debug.c
-f:drivers/net/ethernet/qlogic/qed/qed_debug.h
-f:drivers/net/ethernet/qlogic/qed/qed_dev.c
-f:drivers/net/ethernet/qlogic/qed/qed_dev_api.h
-f:drivers/net/ethernet/qlogic/qed/qed_devlink.c
-f:drivers/net/ethernet/qlogic/qed/qed_devlink.h
-f:drivers/net/ethernet/qlogic/qed/qed_fcoe.c
-f:drivers/net/ethernet/qlogic/qed/qed_fcoe.h
-f:drivers/net/ethernet/qlogic/qed/qed_hsi.h
-f:drivers/net/ethernet/qlogic/qed/qed_hw.c
-f:drivers/net/ethernet/qlogic/qed/qed_hw.h
-f:drivers/net/ethernet/qlogic/qed/qed_init_fw_funcs.c
-f:drivers/net/ethernet/qlogic/qed/qed_init_ops.c
-f:drivers/net/ethernet/qlogic/qed/qed_init_ops.h
-f:drivers/net/ethernet/qlogic/qed/qed_int.c
-f:drivers/net/ethernet/qlogic/qed/qed_int.h
-f:drivers/net/ethernet/qlogic/qed/qed_iro_hsi.h
-f:drivers/net/ethernet/qlogic/qed/qed_iscsi.c
-f:drivers/net/ethernet/qlogic/qed/qed_iscsi.h
-f:drivers/net/ethernet/qlogic/qed/qed_iwarp.c
-f:drivers/net/ethernet/qlogic/qed/qed_iwarp.h
-f:drivers/net/ethernet/qlogic/qed/qed_l2.c
-f:drivers/net/ethernet/qlogic/qed/qed_l2.h
-f:drivers/net/ethernet/qlogic/qed/qed_ll2.c
-f:drivers/net/ethernet/qlogic/qed/qed_ll2.h
-f:drivers/net/ethernet/qlogic/qed/qed_main.c
-f:drivers/net/ethernet/qlogic/qed/qed_mcp.c
-f:drivers/net/ethernet/qlogic/qed/qed_mcp.h
-f:drivers/net/ethernet/qlogic/qed/qed_mfw_hsi.h
-f:drivers/net/ethernet/qlogic/qed/qed_mng_tlv.c
-f:drivers/net/ethernet/qlogic/qed/qed_nvmetcp.c
-f:drivers/net/ethernet/qlogic/qed/qed_nvmetcp.h
-f:drivers/net/ethernet/qlogic/qed/qed_nvmetcp_fw_funcs.c
-f:drivers/net/ethernet/qlogic/qed/qed_nvmetcp_fw_funcs.h
-f:drivers/net/ethernet/qlogic/qed/qed_ooo.c
-f:drivers/net/ethernet/qlogic/qed/qed_ooo.h
-f:drivers/net/ethernet/qlogic/qed/qed_ptp.c
-f:drivers/net/ethernet/qlogic/qed/qed_ptp.h
-f:drivers/net/ethernet/qlogic/qed/qed_rdma.c
-f:drivers/net/ethernet/qlogic/qed/qed_rdma.h
-f:drivers/net/ethernet/qlogic/qed/qed_reg_addr.h
-f:drivers/net/ethernet/qlogic/qed/qed_roce.c
-f:drivers/net/ethernet/qlogic/qed/qed_roce.h
-f:drivers/net/ethernet/qlogic/qed/qed_selftest.c
-f:drivers/net/ethernet/qlogic/qed/qed_selftest.h
-f:drivers/net/ethernet/qlogic/qed/qed_sp.h
-f:drivers/net/ethernet/qlogic/qed/qed_sp_commands.c
-f:drivers/net/ethernet/qlogic/qed/qed_spq.c
-f:drivers/net/ethernet/qlogic/qed/qed_sriov.c
-f:drivers/net/ethernet/qlogic/qed/qed_sriov.h
-f:drivers/net/ethernet/qlogic/qed/qed_vf.c
-f:drivers/net/ethernet/qlogic/qed/qed_vf.h
-f:drivers/net/ethernet/qlogic/qede/Makefile
-f:drivers/net/ethernet/qlogic/qede/qede.h
-f:drivers/net/ethernet/qlogic/qede/qede_dcbnl.c
-f:drivers/net/ethernet/qlogic/qede/qede_ethtool.c
-f:drivers/net/ethernet/qlogic/qede/qede_filter.c
-f:drivers/net/ethernet/qlogic/qede/qede_fp.c
-f:drivers/net/ethernet/qlogic/qede/qede_main.c
-f:drivers/net/ethernet/qlogic/qede/qede_ptp.c
-f:drivers/net/ethernet/qlogic/qede/qede_ptp.h
-f:drivers/net/ethernet/qlogic/qede/qede_rdma.c
-f:drivers/net/ethernet/qlogic/qla3xxx.c
-f:drivers/net/ethernet/qlogic/qla3xxx.h
-f:drivers/net/ethernet/qlogic/qlcnic/Makefile
-f:drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
-f:drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
-f:drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h
-f:drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
-f:drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
-f:drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
-f:drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.c
-f:drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.h
-f:drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
-f:drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h
-f:drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
-f:drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.h
-f:drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
-f:drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
-f:drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
-f:drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
-f:drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov.h
-f:drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c
-f:drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c
-f:drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c
-f:drivers/net/ethernet/qualcomm/Kconfig
-f:drivers/net/ethernet/qualcomm/Makefile
-f:drivers/net/ethernet/qualcomm/emac/Makefile
-f:drivers/net/ethernet/qualcomm/emac/emac-ethtool.c
-f:drivers/net/ethernet/qualcomm/emac/emac-mac.c
-f:drivers/net/ethernet/qualcomm/emac/emac-mac.h
-f:drivers/net/ethernet/qualcomm/emac/emac-phy.c
-f:drivers/net/ethernet/qualcomm/emac/emac-phy.h
-f:drivers/net/ethernet/qualcomm/emac/emac-sgmii-fsm9900.c
-f:drivers/net/ethernet/qualcomm/emac/emac-sgmii-qdf2400.c
-f:drivers/net/ethernet/qualcomm/emac/emac-sgmii-qdf2432.c
-f:drivers/net/ethernet/qualcomm/emac/emac-sgmii.c
-f:drivers/net/ethernet/qualcomm/emac/emac-sgmii.h
-f:drivers/net/ethernet/qualcomm/emac/emac.c
-f:drivers/net/ethernet/qualcomm/emac/emac.h
-f:drivers/net/ethernet/qualcomm/qca_7k.c
-f:drivers/net/ethernet/qualcomm/qca_7k.h
-f:drivers/net/ethernet/qualcomm/qca_7k_common.c
-f:drivers/net/ethernet/qualcomm/qca_7k_common.h
-f:drivers/net/ethernet/qualcomm/qca_debug.c
-f:drivers/net/ethernet/qualcomm/qca_debug.h
-f:drivers/net/ethernet/qualcomm/qca_spi.c
-f:drivers/net/ethernet/qualcomm/qca_spi.h
-f:drivers/net/ethernet/qualcomm/qca_uart.c
-f:drivers/net/ethernet/qualcomm/rmnet/Kconfig
-f:drivers/net/ethernet/qualcomm/rmnet/Makefile
-f:drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c
-f:drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h
-f:drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c
-f:drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.h
-f:drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h
-f:drivers/net/ethernet/qualcomm/rmnet/rmnet_map_command.c
-f:drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c
-f:drivers/net/ethernet/qualcomm/rmnet/rmnet_private.h
-f:drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c
-f:drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.h
-f:drivers/net/ethernet/rdc/Kconfig
-f:drivers/net/ethernet/rdc/Makefile
-f:drivers/net/ethernet/rdc/r6040.c
-f:drivers/net/ethernet/realtek/8139cp.c
-f:drivers/net/ethernet/realtek/8139too.c
-f:drivers/net/ethernet/realtek/Kconfig
-f:drivers/net/ethernet/realtek/Makefile
-f:drivers/net/ethernet/realtek/atp.c
-f:drivers/net/ethernet/realtek/atp.h
-f:drivers/net/ethernet/realtek/r8169.h
-f:drivers/net/ethernet/realtek/r8169_firmware.c
-f:drivers/net/ethernet/realtek/r8169_firmware.h
-f:drivers/net/ethernet/realtek/r8169_leds.c
-f:drivers/net/ethernet/realtek/r8169_main.c
-f:drivers/net/ethernet/realtek/r8169_phy_config.c
-f:drivers/net/ethernet/realtek/rtase/Makefile
-f:drivers/net/ethernet/realtek/rtase/rtase.h
-f:drivers/net/ethernet/realtek/rtase/rtase_main.c
-f:drivers/net/ethernet/renesas/Kconfig
-f:drivers/net/ethernet/renesas/Makefile
-f:drivers/net/ethernet/renesas/ravb.h
-f:drivers/net/ethernet/renesas/ravb_main.c
-f:drivers/net/ethernet/renesas/ravb_ptp.c
-f:drivers/net/ethernet/renesas/rcar_gen4_ptp.c
-f:drivers/net/ethernet/renesas/rcar_gen4_ptp.h
-f:drivers/net/ethernet/renesas/rswitch.c
-f:drivers/net/ethernet/renesas/rswitch.h
-f:drivers/net/ethernet/renesas/rtsn.c
-f:drivers/net/ethernet/renesas/rtsn.h
-f:drivers/net/ethernet/renesas/sh_eth.c
-f:drivers/net/ethernet/renesas/sh_eth.h
-f:drivers/net/ethernet/rocker/Kconfig
-f:drivers/net/ethernet/rocker/Makefile
-f:drivers/net/ethernet/rocker/rocker.h
-f:drivers/net/ethernet/rocker/rocker_hw.h
-f:drivers/net/ethernet/rocker/rocker_main.c
-f:drivers/net/ethernet/rocker/rocker_ofdpa.c
-f:drivers/net/ethernet/rocker/rocker_tlv.c
-f:drivers/net/ethernet/rocker/rocker_tlv.h
-f:drivers/net/ethernet/samsung/Kconfig
-f:drivers/net/ethernet/samsung/Makefile
-f:drivers/net/ethernet/samsung/sxgbe/Makefile
-f:drivers/net/ethernet/samsung/sxgbe/sxgbe_common.h
-f:drivers/net/ethernet/samsung/sxgbe/sxgbe_core.c
-f:drivers/net/ethernet/samsung/sxgbe/sxgbe_desc.c
-f:drivers/net/ethernet/samsung/sxgbe/sxgbe_desc.h
-f:drivers/net/ethernet/samsung/sxgbe/sxgbe_dma.c
-f:drivers/net/ethernet/samsung/sxgbe/sxgbe_dma.h
-f:drivers/net/ethernet/samsung/sxgbe/sxgbe_ethtool.c
-f:drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c
-f:drivers/net/ethernet/samsung/sxgbe/sxgbe_mdio.c
-f:drivers/net/ethernet/samsung/sxgbe/sxgbe_mtl.c
-f:drivers/net/ethernet/samsung/sxgbe/sxgbe_mtl.h
-f:drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c
-f:drivers/net/ethernet/samsung/sxgbe/sxgbe_reg.h
-f:drivers/net/ethernet/seeq/Kconfig
-f:drivers/net/ethernet/seeq/Makefile
-f:drivers/net/ethernet/seeq/ether3.c
-f:drivers/net/ethernet/seeq/ether3.h
-f:drivers/net/ethernet/seeq/sgiseeq.c
-f:drivers/net/ethernet/seeq/sgiseeq.h
-f:drivers/net/ethernet/sfc/Kconfig
-f:drivers/net/ethernet/sfc/Makefile
-f:drivers/net/ethernet/sfc/bitfield.h
-f:drivers/net/ethernet/sfc/ef10.c
-f:drivers/net/ethernet/sfc/ef100.c
-f:drivers/net/ethernet/sfc/ef100.h
-f:drivers/net/ethernet/sfc/ef100_ethtool.c
-f:drivers/net/ethernet/sfc/ef100_ethtool.h
-f:drivers/net/ethernet/sfc/ef100_netdev.c
-f:drivers/net/ethernet/sfc/ef100_netdev.h
-f:drivers/net/ethernet/sfc/ef100_nic.c
-f:drivers/net/ethernet/sfc/ef100_nic.h
-f:drivers/net/ethernet/sfc/ef100_regs.h
-f:drivers/net/ethernet/sfc/ef100_rep.c
-f:drivers/net/ethernet/sfc/ef100_rep.h
-f:drivers/net/ethernet/sfc/ef100_rx.c
-f:drivers/net/ethernet/sfc/ef100_rx.h
-f:drivers/net/ethernet/sfc/ef100_sriov.c
-f:drivers/net/ethernet/sfc/ef100_sriov.h
-f:drivers/net/ethernet/sfc/ef100_tx.c
-f:drivers/net/ethernet/sfc/ef100_tx.h
-f:drivers/net/ethernet/sfc/ef10_regs.h
-f:drivers/net/ethernet/sfc/ef10_sriov.c
-f:drivers/net/ethernet/sfc/ef10_sriov.h
-f:drivers/net/ethernet/sfc/efx.c
-f:drivers/net/ethernet/sfc/efx.h
-f:drivers/net/ethernet/sfc/efx_channels.c
-f:drivers/net/ethernet/sfc/efx_channels.h
-f:drivers/net/ethernet/sfc/efx_common.c
-f:drivers/net/ethernet/sfc/efx_common.h
-f:drivers/net/ethernet/sfc/efx_devlink.c
-f:drivers/net/ethernet/sfc/efx_devlink.h
-f:drivers/net/ethernet/sfc/efx_reflash.c
-f:drivers/net/ethernet/sfc/efx_reflash.h
-f:drivers/net/ethernet/sfc/enum.h
-f:drivers/net/ethernet/sfc/ethtool.c
-f:drivers/net/ethernet/sfc/ethtool_common.c
-f:drivers/net/ethernet/sfc/ethtool_common.h
-f:drivers/net/ethernet/sfc/falcon/Kconfig
-f:drivers/net/ethernet/sfc/falcon/Makefile
-f:drivers/net/ethernet/sfc/falcon/bitfield.h
-f:drivers/net/ethernet/sfc/falcon/efx.c
-f:drivers/net/ethernet/sfc/falcon/efx.h
-f:drivers/net/ethernet/sfc/falcon/enum.h
-f:drivers/net/ethernet/sfc/falcon/ethtool.c
-f:drivers/net/ethernet/sfc/falcon/falcon.c
-f:drivers/net/ethernet/sfc/falcon/falcon_boards.c
-f:drivers/net/ethernet/sfc/falcon/farch.c
-f:drivers/net/ethernet/sfc/falcon/farch_regs.h
-f:drivers/net/ethernet/sfc/falcon/filter.h
-f:drivers/net/ethernet/sfc/falcon/io.h
-f:drivers/net/ethernet/sfc/falcon/mdio_10g.c
-f:drivers/net/ethernet/sfc/falcon/mdio_10g.h
-f:drivers/net/ethernet/sfc/falcon/mtd.c
-f:drivers/net/ethernet/sfc/falcon/net_driver.h
-f:drivers/net/ethernet/sfc/falcon/nic.c
-f:drivers/net/ethernet/sfc/falcon/nic.h
-f:drivers/net/ethernet/sfc/falcon/phy.h
-f:drivers/net/ethernet/sfc/falcon/qt202x_phy.c
-f:drivers/net/ethernet/sfc/falcon/rx.c
-f:drivers/net/ethernet/sfc/falcon/selftest.c
-f:drivers/net/ethernet/sfc/falcon/selftest.h
-f:drivers/net/ethernet/sfc/falcon/tenxpress.c
-f:drivers/net/ethernet/sfc/falcon/tx.c
-f:drivers/net/ethernet/sfc/falcon/tx.h
-f:drivers/net/ethernet/sfc/falcon/txc43128_phy.c
-f:drivers/net/ethernet/sfc/falcon/workarounds.h
-f:drivers/net/ethernet/sfc/filter.h
-f:drivers/net/ethernet/sfc/fw_formats.h
-f:drivers/net/ethernet/sfc/io.h
-f:drivers/net/ethernet/sfc/mae.c
-f:drivers/net/ethernet/sfc/mae.h
-f:drivers/net/ethernet/sfc/mae_counter_format.h
-f:drivers/net/ethernet/sfc/mcdi.c
-f:drivers/net/ethernet/sfc/mcdi.h
-f:drivers/net/ethernet/sfc/mcdi_filters.c
-f:drivers/net/ethernet/sfc/mcdi_filters.h
-f:drivers/net/ethernet/sfc/mcdi_functions.c
-f:drivers/net/ethernet/sfc/mcdi_functions.h
-f:drivers/net/ethernet/sfc/mcdi_mon.c
-f:drivers/net/ethernet/sfc/mcdi_pcol.h
-f:drivers/net/ethernet/sfc/mcdi_pcol_mae.h
-f:drivers/net/ethernet/sfc/mcdi_port.c
-f:drivers/net/ethernet/sfc/mcdi_port.h
-f:drivers/net/ethernet/sfc/mcdi_port_common.c
-f:drivers/net/ethernet/sfc/mcdi_port_common.h
-f:drivers/net/ethernet/sfc/mtd.c
-f:drivers/net/ethernet/sfc/net_driver.h
-f:drivers/net/ethernet/sfc/nic.c
-f:drivers/net/ethernet/sfc/nic.h
-f:drivers/net/ethernet/sfc/nic_common.h
-f:drivers/net/ethernet/sfc/ptp.c
-f:drivers/net/ethernet/sfc/ptp.h
-f:drivers/net/ethernet/sfc/rx.c
-f:drivers/net/ethernet/sfc/rx_common.c
-f:drivers/net/ethernet/sfc/rx_common.h
-f:drivers/net/ethernet/sfc/selftest.c
-f:drivers/net/ethernet/sfc/selftest.h
-f:drivers/net/ethernet/sfc/siena/Kconfig
-f:drivers/net/ethernet/sfc/siena/Makefile
-f:drivers/net/ethernet/sfc/siena/bitfield.h
-f:drivers/net/ethernet/sfc/siena/efx.c
-f:drivers/net/ethernet/sfc/siena/efx.h
-f:drivers/net/ethernet/sfc/siena/efx_channels.c
-f:drivers/net/ethernet/sfc/siena/efx_channels.h
-f:drivers/net/ethernet/sfc/siena/efx_common.c
-f:drivers/net/ethernet/sfc/siena/efx_common.h
-f:drivers/net/ethernet/sfc/siena/enum.h
-f:drivers/net/ethernet/sfc/siena/ethtool.c
-f:drivers/net/ethernet/sfc/siena/ethtool_common.c
-f:drivers/net/ethernet/sfc/siena/ethtool_common.h
-f:drivers/net/ethernet/sfc/siena/farch.c
-f:drivers/net/ethernet/sfc/siena/farch_regs.h
-f:drivers/net/ethernet/sfc/siena/filter.h
-f:drivers/net/ethernet/sfc/siena/io.h
-f:drivers/net/ethernet/sfc/siena/mcdi.c
-f:drivers/net/ethernet/sfc/siena/mcdi.h
-f:drivers/net/ethernet/sfc/siena/mcdi_mon.c
-f:drivers/net/ethernet/sfc/siena/mcdi_pcol.h
-f:drivers/net/ethernet/sfc/siena/mcdi_port.c
-f:drivers/net/ethernet/sfc/siena/mcdi_port.h
-f:drivers/net/ethernet/sfc/siena/mcdi_port_common.c
-f:drivers/net/ethernet/sfc/siena/mcdi_port_common.h
-f:drivers/net/ethernet/sfc/siena/mtd.c
-f:drivers/net/ethernet/sfc/siena/net_driver.h
-f:drivers/net/ethernet/sfc/siena/nic.c
-f:drivers/net/ethernet/sfc/siena/nic.h
-f:drivers/net/ethernet/sfc/siena/nic_common.h
-f:drivers/net/ethernet/sfc/siena/ptp.c
-f:drivers/net/ethernet/sfc/siena/ptp.h
-f:drivers/net/ethernet/sfc/siena/rx.c
-f:drivers/net/ethernet/sfc/siena/rx_common.c
-f:drivers/net/ethernet/sfc/siena/rx_common.h
-f:drivers/net/ethernet/sfc/siena/selftest.c
-f:drivers/net/ethernet/sfc/siena/selftest.h
-f:drivers/net/ethernet/sfc/siena/siena.c
-f:drivers/net/ethernet/sfc/siena/siena_sriov.c
-f:drivers/net/ethernet/sfc/siena/siena_sriov.h
-f:drivers/net/ethernet/sfc/siena/sriov.h
-f:drivers/net/ethernet/sfc/siena/tx.c
-f:drivers/net/ethernet/sfc/siena/tx.h
-f:drivers/net/ethernet/sfc/siena/tx_common.c
-f:drivers/net/ethernet/sfc/siena/tx_common.h
-f:drivers/net/ethernet/sfc/siena/vfdi.h
-f:drivers/net/ethernet/sfc/siena/workarounds.h
-f:drivers/net/ethernet/sfc/sriov.c
-f:drivers/net/ethernet/sfc/sriov.h
-f:drivers/net/ethernet/sfc/tc.c
-f:drivers/net/ethernet/sfc/tc.h
-f:drivers/net/ethernet/sfc/tc_bindings.c
-f:drivers/net/ethernet/sfc/tc_bindings.h
-f:drivers/net/ethernet/sfc/tc_conntrack.c
-f:drivers/net/ethernet/sfc/tc_conntrack.h
-f:drivers/net/ethernet/sfc/tc_counters.c
-f:drivers/net/ethernet/sfc/tc_counters.h
-f:drivers/net/ethernet/sfc/tc_encap_actions.c
-f:drivers/net/ethernet/sfc/tc_encap_actions.h
-f:drivers/net/ethernet/sfc/tx.c
-f:drivers/net/ethernet/sfc/tx.h
-f:drivers/net/ethernet/sfc/tx_common.c
-f:drivers/net/ethernet/sfc/tx_common.h
-f:drivers/net/ethernet/sfc/tx_tso.c
-f:drivers/net/ethernet/sfc/workarounds.h
-f:drivers/net/ethernet/sgi/Kconfig
-f:drivers/net/ethernet/sgi/Makefile
-f:drivers/net/ethernet/sgi/ioc3-eth.c
-f:drivers/net/ethernet/sgi/meth.c
-f:drivers/net/ethernet/sgi/meth.h
-f:drivers/net/ethernet/silan/Kconfig
-f:drivers/net/ethernet/silan/Makefile
-f:drivers/net/ethernet/silan/sc92031.c
-f:drivers/net/ethernet/sis/Kconfig
-f:drivers/net/ethernet/sis/Makefile
-f:drivers/net/ethernet/sis/sis190.c
-f:drivers/net/ethernet/sis/sis900.c
-f:drivers/net/ethernet/sis/sis900.h
-f:drivers/net/ethernet/smsc/Kconfig
-f:drivers/net/ethernet/smsc/Makefile
-f:drivers/net/ethernet/smsc/epic100.c
-f:drivers/net/ethernet/smsc/smc9194.c
-f:drivers/net/ethernet/smsc/smc9194.h
-f:drivers/net/ethernet/smsc/smc91c92_cs.c
-f:drivers/net/ethernet/smsc/smc91x.c
-f:drivers/net/ethernet/smsc/smc91x.h
-f:drivers/net/ethernet/smsc/smsc911x.c
-f:drivers/net/ethernet/smsc/smsc911x.h
-f:drivers/net/ethernet/smsc/smsc9420.c
-f:drivers/net/ethernet/smsc/smsc9420.h
-f:drivers/net/ethernet/socionext/Kconfig
-f:drivers/net/ethernet/socionext/Makefile
-f:drivers/net/ethernet/socionext/netsec.c
-f:drivers/net/ethernet/socionext/sni_ave.c
-f:drivers/net/ethernet/stmicro/Kconfig
-f:drivers/net/ethernet/stmicro/Makefile
-f:drivers/net/ethernet/stmicro/stmmac/Kconfig
-f:drivers/net/ethernet/stmicro/stmmac/Makefile
-f:drivers/net/ethernet/stmicro/stmmac/chain_mode.c
-f:drivers/net/ethernet/stmicro/stmmac/common.h
-f:drivers/net/ethernet/stmicro/stmmac/descs.h
-f:drivers/net/ethernet/stmicro/stmmac/descs_com.h
-f:drivers/net/ethernet/stmicro/stmmac/dwmac-anarion.c
-f:drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c
-f:drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c
-f:drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c
-f:drivers/net/ethernet/stmicro/stmmac/dwmac-ingenic.c
-f:drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c
-f:drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
-f:drivers/net/ethernet/stmicro/stmmac/dwmac-intel.h
-f:drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c
-f:drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
-f:drivers/net/ethernet/stmicro/stmmac/dwmac-loongson1.c
-f:drivers/net/ethernet/stmicro/stmmac/dwmac-lpc18xx.c
-f:drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c
-f:drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c
-f:drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c
-f:drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
-f:drivers/net/ethernet/stmicro/stmmac/dwmac-renesas-gbeth.c
-f:drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
-f:drivers/net/ethernet/stmicro/stmmac/dwmac-rzn1.c
-f:drivers/net/ethernet/stmicro/stmmac/dwmac-s32.c
-f:drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
-f:drivers/net/ethernet/stmicro/stmmac/dwmac-sophgo.c
-f:drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
-f:drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c
-f:drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c
-f:drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
-f:drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c
-f:drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c
-f:drivers/net/ethernet/stmicro/stmmac/dwmac-thead.c
-f:drivers/net/ethernet/stmicro/stmmac/dwmac-visconti.c
-f:drivers/net/ethernet/stmicro/stmmac/dwmac100.h
-f:drivers/net/ethernet/stmicro/stmmac/dwmac1000.h
-f:drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
-f:drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c
-f:drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c
-f:drivers/net/ethernet/stmicro/stmmac/dwmac100_dma.c
-f:drivers/net/ethernet/stmicro/stmmac/dwmac4.h
-f:drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
-f:drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
-f:drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.h
-f:drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c
-f:drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h
-f:drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c
-f:drivers/net/ethernet/stmicro/stmmac/dwmac5.c
-f:drivers/net/ethernet/stmicro/stmmac/dwmac5.h
-f:drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h
-f:drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c
-f:drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h
-f:drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c
-f:drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c
-f:drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c
-f:drivers/net/ethernet/stmicro/stmmac/dwxlgmac2.h
-f:drivers/net/ethernet/stmicro/stmmac/enh_desc.c
-f:drivers/net/ethernet/stmicro/stmmac/hwif.c
-f:drivers/net/ethernet/stmicro/stmmac/hwif.h
-f:drivers/net/ethernet/stmicro/stmmac/mmc.h
-f:drivers/net/ethernet/stmicro/stmmac/mmc_core.c
-f:drivers/net/ethernet/stmicro/stmmac/norm_desc.c
-f:drivers/net/ethernet/stmicro/stmmac/ring_mode.c
-f:drivers/net/ethernet/stmicro/stmmac/stmmac.h
-f:drivers/net/ethernet/stmicro/stmmac/stmmac_est.c
-f:drivers/net/ethernet/stmicro/stmmac/stmmac_est.h
-f:drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
-f:drivers/net/ethernet/stmicro/stmmac/stmmac_fpe.c
-f:drivers/net/ethernet/stmicro/stmmac/stmmac_fpe.h
-f:drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c
-f:drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-f:drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
-f:drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
-f:drivers/net/ethernet/stmicro/stmmac/stmmac_pcs.h
-f:drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
-f:drivers/net/ethernet/stmicro/stmmac/stmmac_platform.h
-f:drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
-f:drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h
-f:drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c
-f:drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c
-f:drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.c
-f:drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.h
-f:drivers/net/ethernet/stmicro/stmmac/stmmac_xdp.c
-f:drivers/net/ethernet/stmicro/stmmac/stmmac_xdp.h
-f:drivers/net/ethernet/sun/Kconfig
-f:drivers/net/ethernet/sun/Makefile
-f:drivers/net/ethernet/sun/cassini.c
-f:drivers/net/ethernet/sun/cassini.h
-f:drivers/net/ethernet/sun/ldmvsw.c
-f:drivers/net/ethernet/sun/niu.c
-f:drivers/net/ethernet/sun/niu.h
-f:drivers/net/ethernet/sun/sunbmac.c
-f:drivers/net/ethernet/sun/sunbmac.h
-f:drivers/net/ethernet/sun/sungem.c
-f:drivers/net/ethernet/sun/sungem.h
-f:drivers/net/ethernet/sun/sunhme.c
-f:drivers/net/ethernet/sun/sunhme.h
-f:drivers/net/ethernet/sun/sunqe.c
-f:drivers/net/ethernet/sun/sunqe.h
-f:drivers/net/ethernet/sun/sunvnet.c
-f:drivers/net/ethernet/sun/sunvnet_common.c
-f:drivers/net/ethernet/sun/sunvnet_common.h
-f:drivers/net/ethernet/sunplus/Kconfig
-f:drivers/net/ethernet/sunplus/Makefile
-f:drivers/net/ethernet/sunplus/spl2sw_define.h
-f:drivers/net/ethernet/sunplus/spl2sw_desc.c
-f:drivers/net/ethernet/sunplus/spl2sw_desc.h
-f:drivers/net/ethernet/sunplus/spl2sw_driver.c
-f:drivers/net/ethernet/sunplus/spl2sw_int.c
-f:drivers/net/ethernet/sunplus/spl2sw_int.h
-f:drivers/net/ethernet/sunplus/spl2sw_mac.c
-f:drivers/net/ethernet/sunplus/spl2sw_mac.h
-f:drivers/net/ethernet/sunplus/spl2sw_mdio.c
-f:drivers/net/ethernet/sunplus/spl2sw_mdio.h
-f:drivers/net/ethernet/sunplus/spl2sw_phy.c
-f:drivers/net/ethernet/sunplus/spl2sw_phy.h
-f:drivers/net/ethernet/sunplus/spl2sw_register.h
-f:drivers/net/ethernet/synopsys/Kconfig
-f:drivers/net/ethernet/synopsys/Makefile
-f:drivers/net/ethernet/synopsys/dwc-xlgmac-common.c
-f:drivers/net/ethernet/synopsys/dwc-xlgmac-desc.c
-f:drivers/net/ethernet/synopsys/dwc-xlgmac-ethtool.c
-f:drivers/net/ethernet/synopsys/dwc-xlgmac-hw.c
-f:drivers/net/ethernet/synopsys/dwc-xlgmac-net.c
-f:drivers/net/ethernet/synopsys/dwc-xlgmac-pci.c
-f:drivers/net/ethernet/synopsys/dwc-xlgmac-reg.h
-f:drivers/net/ethernet/synopsys/dwc-xlgmac.h
-f:drivers/net/ethernet/tehuti/Kconfig
-f:drivers/net/ethernet/tehuti/Makefile
-f:drivers/net/ethernet/tehuti/tehuti.c
-f:drivers/net/ethernet/tehuti/tehuti.h
-f:drivers/net/ethernet/tehuti/tn40.c
-f:drivers/net/ethernet/tehuti/tn40.h
-f:drivers/net/ethernet/tehuti/tn40_mdio.c
-f:drivers/net/ethernet/tehuti/tn40_phy.c
-f:drivers/net/ethernet/tehuti/tn40_regs.h
-f:drivers/net/ethernet/ti/Kconfig
-f:drivers/net/ethernet/ti/Makefile
-f:drivers/net/ethernet/ti/am65-cpsw-ethtool.c
-f:drivers/net/ethernet/ti/am65-cpsw-nuss.c
-f:drivers/net/ethernet/ti/am65-cpsw-nuss.h
-f:drivers/net/ethernet/ti/am65-cpsw-qos.c
-f:drivers/net/ethernet/ti/am65-cpsw-qos.h
-f:drivers/net/ethernet/ti/am65-cpsw-switchdev.c
-f:drivers/net/ethernet/ti/am65-cpsw-switchdev.h
-f:drivers/net/ethernet/ti/am65-cpts.c
-f:drivers/net/ethernet/ti/am65-cpts.h
-f:drivers/net/ethernet/ti/cpsw-common.c
-f:drivers/net/ethernet/ti/cpsw-phy-sel.c
-f:drivers/net/ethernet/ti/cpsw.c
-f:drivers/net/ethernet/ti/cpsw.h
-f:drivers/net/ethernet/ti/cpsw_ale.c
-f:drivers/net/ethernet/ti/cpsw_ale.h
-f:drivers/net/ethernet/ti/cpsw_ethtool.c
-f:drivers/net/ethernet/ti/cpsw_new.c
-f:drivers/net/ethernet/ti/cpsw_priv.c
-f:drivers/net/ethernet/ti/cpsw_priv.h
-f:drivers/net/ethernet/ti/cpsw_sl.c
-f:drivers/net/ethernet/ti/cpsw_sl.h
-f:drivers/net/ethernet/ti/cpsw_switchdev.c
-f:drivers/net/ethernet/ti/cpsw_switchdev.h
-f:drivers/net/ethernet/ti/cpts.c
-f:drivers/net/ethernet/ti/cpts.h
-f:drivers/net/ethernet/ti/davinci_cpdma.c
-f:drivers/net/ethernet/ti/davinci_cpdma.h
-f:drivers/net/ethernet/ti/davinci_emac.c
-f:drivers/net/ethernet/ti/davinci_mdio.c
-f:drivers/net/ethernet/ti/icssg/icss_iep.c
-f:drivers/net/ethernet/ti/icssg/icss_iep.h
-f:drivers/net/ethernet/ti/icssg/icssg_classifier.c
-f:drivers/net/ethernet/ti/icssg/icssg_common.c
-f:drivers/net/ethernet/ti/icssg/icssg_config.c
-f:drivers/net/ethernet/ti/icssg/icssg_config.h
-f:drivers/net/ethernet/ti/icssg/icssg_ethtool.c
-f:drivers/net/ethernet/ti/icssg/icssg_mii_cfg.c
-f:drivers/net/ethernet/ti/icssg/icssg_mii_rt.h
-f:drivers/net/ethernet/ti/icssg/icssg_prueth.c
-f:drivers/net/ethernet/ti/icssg/icssg_prueth.h
-f:drivers/net/ethernet/ti/icssg/icssg_prueth_sr1.c
-f:drivers/net/ethernet/ti/icssg/icssg_queues.c
-f:drivers/net/ethernet/ti/icssg/icssg_stats.c
-f:drivers/net/ethernet/ti/icssg/icssg_stats.h
-f:drivers/net/ethernet/ti/icssg/icssg_switch_map.h
-f:drivers/net/ethernet/ti/icssg/icssg_switchdev.c
-f:drivers/net/ethernet/ti/icssg/icssg_switchdev.h
-f:drivers/net/ethernet/ti/k3-cppi-desc-pool.c
-f:drivers/net/ethernet/ti/k3-cppi-desc-pool.h
-f:drivers/net/ethernet/ti/netcp.h
-f:drivers/net/ethernet/ti/netcp_core.c
-f:drivers/net/ethernet/ti/netcp_ethss.c
-f:drivers/net/ethernet/ti/netcp_sgmii.c
-f:drivers/net/ethernet/ti/netcp_xgbepcsr.c
-f:drivers/net/ethernet/ti/tlan.c
-f:drivers/net/ethernet/ti/tlan.h
-f:drivers/net/ethernet/toshiba/Kconfig
-f:drivers/net/ethernet/toshiba/Makefile
-f:drivers/net/ethernet/toshiba/ps3_gelic_net.c
-f:drivers/net/ethernet/toshiba/ps3_gelic_net.h
-f:drivers/net/ethernet/toshiba/ps3_gelic_wireless.c
-f:drivers/net/ethernet/toshiba/ps3_gelic_wireless.h
-f:drivers/net/ethernet/toshiba/tc35815.c
-f:drivers/net/ethernet/tundra/Kconfig
-f:drivers/net/ethernet/tundra/Makefile
-f:drivers/net/ethernet/tundra/tsi108_eth.c
-f:drivers/net/ethernet/tundra/tsi108_eth.h
-f:drivers/net/ethernet/vertexcom/Kconfig
-f:drivers/net/ethernet/vertexcom/Makefile
-f:drivers/net/ethernet/vertexcom/mse102x.c
-f:drivers/net/ethernet/via/Kconfig
-f:drivers/net/ethernet/via/Makefile
-f:drivers/net/ethernet/via/via-rhine.c
-f:drivers/net/ethernet/via/via-velocity.c
-f:drivers/net/ethernet/via/via-velocity.h
-f:drivers/net/ethernet/wangxun/Kconfig
-f:drivers/net/ethernet/wangxun/Makefile
-f:drivers/net/ethernet/wangxun/libwx/Makefile
-f:drivers/net/ethernet/wangxun/libwx/wx_ethtool.c
-f:drivers/net/ethernet/wangxun/libwx/wx_ethtool.h
-f:drivers/net/ethernet/wangxun/libwx/wx_hw.c
-f:drivers/net/ethernet/wangxun/libwx/wx_hw.h
-f:drivers/net/ethernet/wangxun/libwx/wx_lib.c
-f:drivers/net/ethernet/wangxun/libwx/wx_lib.h
-f:drivers/net/ethernet/wangxun/libwx/wx_mbx.c
-f:drivers/net/ethernet/wangxun/libwx/wx_mbx.h
-f:drivers/net/ethernet/wangxun/libwx/wx_ptp.c
-f:drivers/net/ethernet/wangxun/libwx/wx_ptp.h
-f:drivers/net/ethernet/wangxun/libwx/wx_sriov.c
-f:drivers/net/ethernet/wangxun/libwx/wx_sriov.h
-f:drivers/net/ethernet/wangxun/libwx/wx_type.h
-f:drivers/net/ethernet/wangxun/libwx/wx_vf.c
-f:drivers/net/ethernet/wangxun/libwx/wx_vf.h
-f:drivers/net/ethernet/wangxun/libwx/wx_vf_common.c
-f:drivers/net/ethernet/wangxun/libwx/wx_vf_common.h
-f:drivers/net/ethernet/wangxun/libwx/wx_vf_lib.c
-f:drivers/net/ethernet/wangxun/libwx/wx_vf_lib.h
-f:drivers/net/ethernet/wangxun/ngbe/Makefile
-f:drivers/net/ethernet/wangxun/ngbe/ngbe_ethtool.c
-f:drivers/net/ethernet/wangxun/ngbe/ngbe_ethtool.h
-f:drivers/net/ethernet/wangxun/ngbe/ngbe_hw.c
-f:drivers/net/ethernet/wangxun/ngbe/ngbe_hw.h
-f:drivers/net/ethernet/wangxun/ngbe/ngbe_main.c
-f:drivers/net/ethernet/wangxun/ngbe/ngbe_mdio.c
-f:drivers/net/ethernet/wangxun/ngbe/ngbe_mdio.h
-f:drivers/net/ethernet/wangxun/ngbe/ngbe_type.h
-f:drivers/net/ethernet/wangxun/ngbevf/Makefile
-f:drivers/net/ethernet/wangxun/ngbevf/ngbevf_main.c
-f:drivers/net/ethernet/wangxun/ngbevf/ngbevf_type.h
-f:drivers/net/ethernet/wangxun/txgbe/Makefile
-f:drivers/net/ethernet/wangxun/txgbe/txgbe_aml.c
-f:drivers/net/ethernet/wangxun/txgbe/txgbe_aml.h
-f:drivers/net/ethernet/wangxun/txgbe/txgbe_ethtool.c
-f:drivers/net/ethernet/wangxun/txgbe/txgbe_ethtool.h
-f:drivers/net/ethernet/wangxun/txgbe/txgbe_fdir.c
-f:drivers/net/ethernet/wangxun/txgbe/txgbe_fdir.h
-f:drivers/net/ethernet/wangxun/txgbe/txgbe_hw.c
-f:drivers/net/ethernet/wangxun/txgbe/txgbe_hw.h
-f:drivers/net/ethernet/wangxun/txgbe/txgbe_irq.c
-f:drivers/net/ethernet/wangxun/txgbe/txgbe_irq.h
-f:drivers/net/ethernet/wangxun/txgbe/txgbe_main.c
-f:drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c
-f:drivers/net/ethernet/wangxun/txgbe/txgbe_phy.h
-f:drivers/net/ethernet/wangxun/txgbe/txgbe_type.h
-f:drivers/net/ethernet/wangxun/txgbevf/Makefile
-f:drivers/net/ethernet/wangxun/txgbevf/txgbevf_main.c
-f:drivers/net/ethernet/wangxun/txgbevf/txgbevf_type.h
-f:drivers/net/ethernet/wiznet/Kconfig
-f:drivers/net/ethernet/wiznet/Makefile
-f:drivers/net/ethernet/wiznet/w5100-spi.c
-f:drivers/net/ethernet/wiznet/w5100.c
-f:drivers/net/ethernet/wiznet/w5100.h
-f:drivers/net/ethernet/wiznet/w5300.c
-f:drivers/net/ethernet/xilinx/Kconfig
-f:drivers/net/ethernet/xilinx/Makefile
-f:drivers/net/ethernet/xilinx/ll_temac.h
-f:drivers/net/ethernet/xilinx/ll_temac_main.c
-f:drivers/net/ethernet/xilinx/ll_temac_mdio.c
-f:drivers/net/ethernet/xilinx/xilinx_axienet.h
-f:drivers/net/ethernet/xilinx/xilinx_axienet_main.c
-f:drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c
-f:drivers/net/ethernet/xilinx/xilinx_emaclite.c
-f:drivers/net/ethernet/xircom/Kconfig
-f:drivers/net/ethernet/xircom/Makefile
-f:drivers/net/ethernet/xircom/xirc2ps_cs.c
-f:drivers/net/ethernet/xscale/Kconfig
-f:drivers/net/ethernet/xscale/Makefile
-f:drivers/net/ethernet/xscale/ixp46x_ts.h
-f:drivers/net/ethernet/xscale/ixp4xx_eth.c
-f:drivers/net/ethernet/xscale/ptp_ixp46x.c
-f:drivers/net/fddi/Kconfig
-f:drivers/net/fddi/Makefile
-f:drivers/net/fddi/defxx.c
-f:drivers/net/fddi/defxx.h
-f:drivers/net/fddi/defza.c
-f:drivers/net/fddi/defza.h
-f:drivers/net/fddi/skfp/Makefile
-f:drivers/net/fddi/skfp/cfm.c
-f:drivers/net/fddi/skfp/drvfbi.c
-f:drivers/net/fddi/skfp/ecm.c
-f:drivers/net/fddi/skfp/ess.c
-f:drivers/net/fddi/skfp/fplustm.c
-f:drivers/net/fddi/skfp/h/cmtdef.h
-f:drivers/net/fddi/skfp/h/fddi.h
-f:drivers/net/fddi/skfp/h/fddimib.h
-f:drivers/net/fddi/skfp/h/fplustm.h
-f:drivers/net/fddi/skfp/h/hwmtm.h
-f:drivers/net/fddi/skfp/h/mbuf.h
-f:drivers/net/fddi/skfp/h/osdef1st.h
-f:drivers/net/fddi/skfp/h/sba.h
-f:drivers/net/fddi/skfp/h/sba_def.h
-f:drivers/net/fddi/skfp/h/skfbi.h
-f:drivers/net/fddi/skfp/h/skfbiinc.h
-f:drivers/net/fddi/skfp/h/smc.h
-f:drivers/net/fddi/skfp/h/smt.h
-f:drivers/net/fddi/skfp/h/smt_p.h
-f:drivers/net/fddi/skfp/h/smtstate.h
-f:drivers/net/fddi/skfp/h/supern_2.h
-f:drivers/net/fddi/skfp/h/targethw.h
-f:drivers/net/fddi/skfp/h/targetos.h
-f:drivers/net/fddi/skfp/h/types.h
-f:drivers/net/fddi/skfp/hwmtm.c
-f:drivers/net/fddi/skfp/hwt.c
-f:drivers/net/fddi/skfp/pcmplc.c
-f:drivers/net/fddi/skfp/pmf.c
-f:drivers/net/fddi/skfp/queue.c
-f:drivers/net/fddi/skfp/rmt.c
-f:drivers/net/fddi/skfp/skfddi.c
-f:drivers/net/fddi/skfp/smt.c
-f:drivers/net/fddi/skfp/smtdef.c
-f:drivers/net/fddi/skfp/smtinit.c
-f:drivers/net/fddi/skfp/smttimer.c
-f:drivers/net/fddi/skfp/srf.c
-f:drivers/net/fjes/Makefile
-f:drivers/net/fjes/fjes.h
-f:drivers/net/fjes/fjes_debugfs.c
-f:drivers/net/fjes/fjes_ethtool.c
-f:drivers/net/fjes/fjes_hw.c
-f:drivers/net/fjes/fjes_hw.h
-f:drivers/net/fjes/fjes_main.c
-f:drivers/net/fjes/fjes_regs.h
-f:drivers/net/fjes/fjes_trace.c
-f:drivers/net/fjes/fjes_trace.h
-f:drivers/net/geneve.c
-f:drivers/net/gtp.c
-f:drivers/net/hamradio/6pack.c
-f:drivers/net/hamradio/Kconfig
-f:drivers/net/hamradio/Makefile
-f:drivers/net/hamradio/baycom_epp.c
-f:drivers/net/hamradio/baycom_par.c
-f:drivers/net/hamradio/baycom_ser_fdx.c
-f:drivers/net/hamradio/baycom_ser_hdx.c
-f:drivers/net/hamradio/bpqether.c
-f:drivers/net/hamradio/hdlcdrv.c
-f:drivers/net/hamradio/mkiss.c
-f:drivers/net/hamradio/scc.c
-f:drivers/net/hamradio/yam.c
-f:drivers/net/hamradio/z8530.h
-f:drivers/net/hippi/Kconfig
-f:drivers/net/hippi/Makefile
-f:drivers/net/hippi/rrunner.c
-f:drivers/net/hippi/rrunner.h
-f:drivers/net/hyperv/Kconfig
-f:drivers/net/hyperv/Makefile
-f:drivers/net/hyperv/hyperv_net.h
-f:drivers/net/hyperv/netvsc.c
-f:drivers/net/hyperv/netvsc_bpf.c
-f:drivers/net/hyperv/netvsc_drv.c
-f:drivers/net/hyperv/netvsc_trace.c
-f:drivers/net/hyperv/netvsc_trace.h
-f:drivers/net/hyperv/rndis_filter.c
-f:drivers/net/ieee802154/Kconfig
-f:drivers/net/ieee802154/Makefile
-f:drivers/net/ieee802154/adf7242.c
-f:drivers/net/ieee802154/at86rf230.c
-f:drivers/net/ieee802154/at86rf230.h
-f:drivers/net/ieee802154/atusb.c
-f:drivers/net/ieee802154/atusb.h
-f:drivers/net/ieee802154/ca8210.c
-f:drivers/net/ieee802154/cc2520.c
-f:drivers/net/ieee802154/fakelb.c
-f:drivers/net/ieee802154/mac802154_hwsim.c
-f:drivers/net/ieee802154/mac802154_hwsim.h
-f:drivers/net/ieee802154/mcr20a.c
-f:drivers/net/ieee802154/mcr20a.h
-f:drivers/net/ieee802154/mrf24j40.c
-f:drivers/net/ifb.c
-f:drivers/net/ipa/Kconfig
-f:drivers/net/ipa/Makefile
-f:drivers/net/ipa/data/ipa_data-v3.1.c
-f:drivers/net/ipa/data/ipa_data-v3.5.1.c
-f:drivers/net/ipa/data/ipa_data-v4.11.c
-f:drivers/net/ipa/data/ipa_data-v4.2.c
-f:drivers/net/ipa/data/ipa_data-v4.5.c
-f:drivers/net/ipa/data/ipa_data-v4.7.c
-f:drivers/net/ipa/data/ipa_data-v4.9.c
-f:drivers/net/ipa/data/ipa_data-v5.0.c
-f:drivers/net/ipa/data/ipa_data-v5.5.c
-f:drivers/net/ipa/gsi.c
-f:drivers/net/ipa/gsi.h
-f:drivers/net/ipa/gsi_private.h
-f:drivers/net/ipa/gsi_reg.c
-f:drivers/net/ipa/gsi_reg.h
-f:drivers/net/ipa/gsi_trans.c
-f:drivers/net/ipa/gsi_trans.h
-f:drivers/net/ipa/ipa.h
-f:drivers/net/ipa/ipa_cmd.c
-f:drivers/net/ipa/ipa_cmd.h
-f:drivers/net/ipa/ipa_data.h
-f:drivers/net/ipa/ipa_endpoint.c
-f:drivers/net/ipa/ipa_endpoint.h
-f:drivers/net/ipa/ipa_gsi.c
-f:drivers/net/ipa/ipa_gsi.h
-f:drivers/net/ipa/ipa_interrupt.c
-f:drivers/net/ipa/ipa_interrupt.h
-f:drivers/net/ipa/ipa_main.c
-f:drivers/net/ipa/ipa_mem.c
-f:drivers/net/ipa/ipa_mem.h
-f:drivers/net/ipa/ipa_modem.c
-f:drivers/net/ipa/ipa_modem.h
-f:drivers/net/ipa/ipa_power.c
-f:drivers/net/ipa/ipa_power.h
-f:drivers/net/ipa/ipa_qmi.c
-f:drivers/net/ipa/ipa_qmi.h
-f:drivers/net/ipa/ipa_qmi_msg.c
-f:drivers/net/ipa/ipa_qmi_msg.h
-f:drivers/net/ipa/ipa_reg.c
-f:drivers/net/ipa/ipa_reg.h
-f:drivers/net/ipa/ipa_resource.c
-f:drivers/net/ipa/ipa_resource.h
-f:drivers/net/ipa/ipa_smp2p.c
-f:drivers/net/ipa/ipa_smp2p.h
-f:drivers/net/ipa/ipa_sysfs.c
-f:drivers/net/ipa/ipa_sysfs.h
-f:drivers/net/ipa/ipa_table.c
-f:drivers/net/ipa/ipa_table.h
-f:drivers/net/ipa/ipa_uc.c
-f:drivers/net/ipa/ipa_uc.h
-f:drivers/net/ipa/ipa_version.h
-f:drivers/net/ipa/reg.h
-f:drivers/net/ipa/reg/gsi_reg-v3.1.c
-f:drivers/net/ipa/reg/gsi_reg-v3.5.1.c
-f:drivers/net/ipa/reg/gsi_reg-v4.0.c
-f:drivers/net/ipa/reg/gsi_reg-v4.11.c
-f:drivers/net/ipa/reg/gsi_reg-v4.5.c
-f:drivers/net/ipa/reg/gsi_reg-v4.9.c
-f:drivers/net/ipa/reg/gsi_reg-v5.0.c
-f:drivers/net/ipa/reg/ipa_reg-v3.1.c
-f:drivers/net/ipa/reg/ipa_reg-v3.5.1.c
-f:drivers/net/ipa/reg/ipa_reg-v4.11.c
-f:drivers/net/ipa/reg/ipa_reg-v4.2.c
-f:drivers/net/ipa/reg/ipa_reg-v4.5.c
-f:drivers/net/ipa/reg/ipa_reg-v4.7.c
-f:drivers/net/ipa/reg/ipa_reg-v4.9.c
-f:drivers/net/ipa/reg/ipa_reg-v5.0.c
-f:drivers/net/ipa/reg/ipa_reg-v5.5.c
-f:drivers/net/ipvlan/Makefile
-f:drivers/net/ipvlan/ipvlan.h
-f:drivers/net/ipvlan/ipvlan_core.c
-f:drivers/net/ipvlan/ipvlan_l3s.c
-f:drivers/net/ipvlan/ipvlan_main.c
-f:drivers/net/ipvlan/ipvtap.c
-f:drivers/net/loopback.c
-f:drivers/net/macsec.c
-f:drivers/net/macvlan.c
-f:drivers/net/macvtap.c
-f:drivers/net/mctp/Kconfig
-f:drivers/net/mctp/Makefile
-f:drivers/net/mctp/mctp-i2c.c
-f:drivers/net/mctp/mctp-i3c.c
-f:drivers/net/mctp/mctp-serial.c
-f:drivers/net/mctp/mctp-usb.c
-f:drivers/net/mdio.c
-f:drivers/net/mdio/Kconfig
-f:drivers/net/mdio/Makefile
-f:drivers/net/mdio/acpi_mdio.c
-f:drivers/net/mdio/fwnode_mdio.c
-f:drivers/net/mdio/mdio-airoha.c
-f:drivers/net/mdio/mdio-aspeed.c
-f:drivers/net/mdio/mdio-bcm-iproc.c
-f:drivers/net/mdio/mdio-bcm-unimac.c
-f:drivers/net/mdio/mdio-bitbang.c
-f:drivers/net/mdio/mdio-cavium.c
-f:drivers/net/mdio/mdio-cavium.h
-f:drivers/net/mdio/mdio-gpio.c
-f:drivers/net/mdio/mdio-hisi-femac.c
-f:drivers/net/mdio/mdio-i2c.c
-f:drivers/net/mdio/mdio-ipq4019.c
-f:drivers/net/mdio/mdio-ipq8064.c
-f:drivers/net/mdio/mdio-moxart.c
-f:drivers/net/mdio/mdio-mscc-miim.c
-f:drivers/net/mdio/mdio-mux-bcm-iproc.c
-f:drivers/net/mdio/mdio-mux-bcm6368.c
-f:drivers/net/mdio/mdio-mux-gpio.c
-f:drivers/net/mdio/mdio-mux-meson-g12a.c
-f:drivers/net/mdio/mdio-mux-meson-gxl.c
-f:drivers/net/mdio/mdio-mux-mmioreg.c
-f:drivers/net/mdio/mdio-mux-multiplexer.c
-f:drivers/net/mdio/mdio-mux.c
-f:drivers/net/mdio/mdio-mvusb.c
-f:drivers/net/mdio/mdio-octeon.c
-f:drivers/net/mdio/mdio-realtek-rtl9300.c
-f:drivers/net/mdio/mdio-regmap.c
-f:drivers/net/mdio/mdio-sun4i.c
-f:drivers/net/mdio/mdio-thunder.c
-f:drivers/net/mdio/mdio-xgene.c
-f:drivers/net/mdio/of_mdio.c
-f:drivers/net/mhi_net.c
-f:drivers/net/mii.c
-f:drivers/net/net_failover.c
-f:drivers/net/netconsole.c
-f:drivers/net/netdevsim/Makefile
-f:drivers/net/netdevsim/bpf.c
-f:drivers/net/netdevsim/bus.c
-f:drivers/net/netdevsim/dev.c
-f:drivers/net/netdevsim/ethtool.c
-f:drivers/net/netdevsim/fib.c
-f:drivers/net/netdevsim/health.c
-f:drivers/net/netdevsim/hwstats.c
-f:drivers/net/netdevsim/ipsec.c
-f:drivers/net/netdevsim/macsec.c
-f:drivers/net/netdevsim/netdev.c
-f:drivers/net/netdevsim/netdevsim.h
-f:drivers/net/netdevsim/psample.c
-f:drivers/net/netdevsim/udp_tunnels.c
-f:drivers/net/netkit.c
-f:drivers/net/nlmon.c
-f:drivers/net/ntb_netdev.c
-f:drivers/net/ovpn/Makefile
-f:drivers/net/ovpn/bind.c
-f:drivers/net/ovpn/bind.h
-f:drivers/net/ovpn/crypto.c
-f:drivers/net/ovpn/crypto.h
-f:drivers/net/ovpn/crypto_aead.c
-f:drivers/net/ovpn/crypto_aead.h
-f:drivers/net/ovpn/io.c
-f:drivers/net/ovpn/io.h
-f:drivers/net/ovpn/main.c
-f:drivers/net/ovpn/main.h
-f:drivers/net/ovpn/netlink-gen.c
-f:drivers/net/ovpn/netlink-gen.h
-f:drivers/net/ovpn/netlink.c
-f:drivers/net/ovpn/netlink.h
-f:drivers/net/ovpn/ovpnpriv.h
-f:drivers/net/ovpn/peer.c
-f:drivers/net/ovpn/peer.h
-f:drivers/net/ovpn/pktid.c
-f:drivers/net/ovpn/pktid.h
-f:drivers/net/ovpn/proto.h
-f:drivers/net/ovpn/skb.h
-f:drivers/net/ovpn/socket.c
-f:drivers/net/ovpn/socket.h
-f:drivers/net/ovpn/stats.c
-f:drivers/net/ovpn/stats.h
-f:drivers/net/ovpn/tcp.c
-f:drivers/net/ovpn/tcp.h
-f:drivers/net/ovpn/udp.c
-f:drivers/net/ovpn/udp.h
-f:drivers/net/pcs/Kconfig
-f:drivers/net/pcs/Makefile
-f:drivers/net/pcs/pcs-lynx.c
-f:drivers/net/pcs/pcs-mtk-lynxi.c
-f:drivers/net/pcs/pcs-rzn1-miic.c
-f:drivers/net/pcs/pcs-xpcs-nxp.c
-f:drivers/net/pcs/pcs-xpcs-plat.c
-f:drivers/net/pcs/pcs-xpcs-wx.c
-f:drivers/net/pcs/pcs-xpcs.c
-f:drivers/net/pcs/pcs-xpcs.h
-f:drivers/net/pfcp.c
-f:drivers/net/phy/Kconfig
-f:drivers/net/phy/Makefile
-f:drivers/net/phy/adin.c
-f:drivers/net/phy/adin1100.c
-f:drivers/net/phy/air_en8811h.c
-f:drivers/net/phy/amd.c
-f:drivers/net/phy/aquantia/Kconfig
-f:drivers/net/phy/aquantia/Makefile
-f:drivers/net/phy/aquantia/aquantia.h
-f:drivers/net/phy/aquantia/aquantia_firmware.c
-f:drivers/net/phy/aquantia/aquantia_hwmon.c
-f:drivers/net/phy/aquantia/aquantia_leds.c
-f:drivers/net/phy/aquantia/aquantia_main.c
-f:drivers/net/phy/as21xxx.c
-f:drivers/net/phy/ax88796b.c
-f:drivers/net/phy/ax88796b_rust.rs
-f:drivers/net/phy/bcm-cygnus.c
-f:drivers/net/phy/bcm-phy-lib.c
-f:drivers/net/phy/bcm-phy-lib.h
-f:drivers/net/phy/bcm-phy-ptp.c
-f:drivers/net/phy/bcm54140.c
-f:drivers/net/phy/bcm63xx.c
-f:drivers/net/phy/bcm7xxx.c
-f:drivers/net/phy/bcm84881.c
-f:drivers/net/phy/bcm87xx.c
-f:drivers/net/phy/broadcom.c
-f:drivers/net/phy/cicada.c
-f:drivers/net/phy/cortina.c
-f:drivers/net/phy/davicom.c
-f:drivers/net/phy/dp83640.c
-f:drivers/net/phy/dp83640_reg.h
-f:drivers/net/phy/dp83822.c
-f:drivers/net/phy/dp83848.c
-f:drivers/net/phy/dp83867.c
-f:drivers/net/phy/dp83869.c
-f:drivers/net/phy/dp83tc811.c
-f:drivers/net/phy/dp83td510.c
-f:drivers/net/phy/dp83tg720.c
-f:drivers/net/phy/et1011c.c
-f:drivers/net/phy/fixed_phy.c
-f:drivers/net/phy/icplus.c
-f:drivers/net/phy/intel-xway.c
-f:drivers/net/phy/linkmode.c
-f:drivers/net/phy/lxt.c
-f:drivers/net/phy/marvell-88q2xxx.c
-f:drivers/net/phy/marvell-88x2222.c
-f:drivers/net/phy/marvell.c
-f:drivers/net/phy/marvell10g.c
-f:drivers/net/phy/mdio-boardinfo.c
-f:drivers/net/phy/mdio-boardinfo.h
-f:drivers/net/phy/mdio-open-alliance.h
-f:drivers/net/phy/mdio_bus.c
-f:drivers/net/phy/mdio_bus_provider.c
-f:drivers/net/phy/mdio_device.c
-f:drivers/net/phy/mdio_devres.c
-f:drivers/net/phy/mediatek/Kconfig
-f:drivers/net/phy/mediatek/Makefile
-f:drivers/net/phy/mediatek/mtk-2p5ge.c
-f:drivers/net/phy/mediatek/mtk-ge-soc.c
-f:drivers/net/phy/mediatek/mtk-ge.c
-f:drivers/net/phy/mediatek/mtk-phy-lib.c
-f:drivers/net/phy/mediatek/mtk.h
-f:drivers/net/phy/meson-gxl.c
-f:drivers/net/phy/micrel.c
-f:drivers/net/phy/microchip.c
-f:drivers/net/phy/microchip_rds_ptp.c
-f:drivers/net/phy/microchip_rds_ptp.h
-f:drivers/net/phy/microchip_t1.c
-f:drivers/net/phy/microchip_t1s.c
-f:drivers/net/phy/mii_timestamper.c
-f:drivers/net/phy/motorcomm.c
-f:drivers/net/phy/mscc/Makefile
-f:drivers/net/phy/mscc/mscc.h
-f:drivers/net/phy/mscc/mscc_fc_buffer.h
-f:drivers/net/phy/mscc/mscc_mac.h
-f:drivers/net/phy/mscc/mscc_macsec.c
-f:drivers/net/phy/mscc/mscc_macsec.h
-f:drivers/net/phy/mscc/mscc_main.c
-f:drivers/net/phy/mscc/mscc_ptp.c
-f:drivers/net/phy/mscc/mscc_ptp.h
-f:drivers/net/phy/mscc/mscc_serdes.c
-f:drivers/net/phy/mscc/mscc_serdes.h
-f:drivers/net/phy/mxl-86110.c
-f:drivers/net/phy/mxl-gpy.c
-f:drivers/net/phy/national.c
-f:drivers/net/phy/ncn26000.c
-f:drivers/net/phy/nxp-c45-tja11xx-macsec.c
-f:drivers/net/phy/nxp-c45-tja11xx.c
-f:drivers/net/phy/nxp-c45-tja11xx.h
-f:drivers/net/phy/nxp-cbtx.c
-f:drivers/net/phy/nxp-tja11xx.c
-f:drivers/net/phy/open_alliance_helpers.c
-f:drivers/net/phy/open_alliance_helpers.h
-f:drivers/net/phy/phy-c45.c
-f:drivers/net/phy/phy-caps.h
-f:drivers/net/phy/phy-core.c
-f:drivers/net/phy/phy.c
-f:drivers/net/phy/phy_caps.c
-f:drivers/net/phy/phy_device.c
-f:drivers/net/phy/phy_led_triggers.c
-f:drivers/net/phy/phy_link_topology.c
-f:drivers/net/phy/phy_package.c
-f:drivers/net/phy/phylib-internal.h
-f:drivers/net/phy/phylib.h
-f:drivers/net/phy/phylink.c
-f:drivers/net/phy/qcom/Kconfig
-f:drivers/net/phy/qcom/Makefile
-f:drivers/net/phy/qcom/at803x.c
-f:drivers/net/phy/qcom/qca807x.c
-f:drivers/net/phy/qcom/qca808x.c
-f:drivers/net/phy/qcom/qca83xx.c
-f:drivers/net/phy/qcom/qcom-phy-lib.c
-f:drivers/net/phy/qcom/qcom.h
-f:drivers/net/phy/qsemi.c
-f:drivers/net/phy/qt2025.rs
-f:drivers/net/phy/realtek/Kconfig
-f:drivers/net/phy/realtek/Makefile
-f:drivers/net/phy/realtek/realtek.h
-f:drivers/net/phy/realtek/realtek_hwmon.c
-f:drivers/net/phy/realtek/realtek_main.c
-f:drivers/net/phy/rockchip.c
-f:drivers/net/phy/sfp-bus.c
-f:drivers/net/phy/sfp.c
-f:drivers/net/phy/sfp.h
-f:drivers/net/phy/smsc.c
-f:drivers/net/phy/spi_ks8995.c
-f:drivers/net/phy/ste10Xp.c
-f:drivers/net/phy/stubs.c
-f:drivers/net/phy/swphy.c
-f:drivers/net/phy/swphy.h
-f:drivers/net/phy/teranetics.c
-f:drivers/net/phy/uPD60620.c
-f:drivers/net/phy/vitesse.c
-f:drivers/net/phy/xilinx_gmii2rgmii.c
-f:drivers/net/plip/Kconfig
-f:drivers/net/plip/Makefile
-f:drivers/net/plip/plip.c
-f:drivers/net/ppp/Kconfig
-f:drivers/net/ppp/Makefile
-f:drivers/net/ppp/bsd_comp.c
-f:drivers/net/ppp/ppp_async.c
-f:drivers/net/ppp/ppp_deflate.c
-f:drivers/net/ppp/ppp_generic.c
-f:drivers/net/ppp/ppp_mppe.c
-f:drivers/net/ppp/ppp_mppe.h
-f:drivers/net/ppp/ppp_synctty.c
-f:drivers/net/ppp/pppoe.c
-f:drivers/net/ppp/pppox.c
-f:drivers/net/ppp/pptp.c
-f:drivers/net/pse-pd/Kconfig
-f:drivers/net/pse-pd/Makefile
-f:drivers/net/pse-pd/pd692x0.c
-f:drivers/net/pse-pd/pse_core.c
-f:drivers/net/pse-pd/pse_regulator.c
-f:drivers/net/pse-pd/tps23881.c
-f:drivers/net/rionet.c
-f:drivers/net/slip/Kconfig
-f:drivers/net/slip/Makefile
-f:drivers/net/slip/slhc.c
-f:drivers/net/slip/slip.c
-f:drivers/net/slip/slip.h
-f:drivers/net/sungem_phy.c
-f:drivers/net/tap.c
-f:drivers/net/team/Kconfig
-f:drivers/net/team/Makefile
-f:drivers/net/team/team_core.c
-f:drivers/net/team/team_mode_activebackup.c
-f:drivers/net/team/team_mode_broadcast.c
-f:drivers/net/team/team_mode_loadbalance.c
-f:drivers/net/team/team_mode_random.c
-f:drivers/net/team/team_mode_roundrobin.c
-f:drivers/net/team/team_nl.c
-f:drivers/net/team/team_nl.h
-f:drivers/net/thunderbolt/Kconfig
-f:drivers/net/thunderbolt/Makefile
-f:drivers/net/thunderbolt/main.c
-f:drivers/net/thunderbolt/trace.c
-f:drivers/net/thunderbolt/trace.h
-f:drivers/net/tun.c
-f:drivers/net/tun_vnet.h
-f:drivers/net/usb/Kconfig
-f:drivers/net/usb/Makefile
-f:drivers/net/usb/aqc111.c
-f:drivers/net/usb/aqc111.h
-f:drivers/net/usb/asix.h
-f:drivers/net/usb/asix_common.c
-f:drivers/net/usb/asix_devices.c
-f:drivers/net/usb/ax88172a.c
-f:drivers/net/usb/ax88179_178a.c
-f:drivers/net/usb/catc.c
-f:drivers/net/usb/cdc-phonet.c
-f:drivers/net/usb/cdc_eem.c
-f:drivers/net/usb/cdc_ether.c
-f:drivers/net/usb/cdc_mbim.c
-f:drivers/net/usb/cdc_ncm.c
-f:drivers/net/usb/cdc_subset.c
-f:drivers/net/usb/ch9200.c
-f:drivers/net/usb/cx82310_eth.c
-f:drivers/net/usb/dm9601.c
-f:drivers/net/usb/gl620a.c
-f:drivers/net/usb/hso.c
-f:drivers/net/usb/huawei_cdc_ncm.c
-f:drivers/net/usb/int51x1.c
-f:drivers/net/usb/ipheth.c
-f:drivers/net/usb/kalmia.c
-f:drivers/net/usb/kaweth.c
-f:drivers/net/usb/lan78xx.c
-f:drivers/net/usb/lan78xx.h
-f:drivers/net/usb/lg-vl600.c
-f:drivers/net/usb/mcs7830.c
-f:drivers/net/usb/net1080.c
-f:drivers/net/usb/pegasus.c
-f:drivers/net/usb/pegasus.h
-f:drivers/net/usb/plusb.c
-f:drivers/net/usb/qmi_wwan.c
-f:drivers/net/usb/r8152.c
-f:drivers/net/usb/r8153_ecm.c
-f:drivers/net/usb/rndis_host.c
-f:drivers/net/usb/rtl8150.c
-f:drivers/net/usb/sierra_net.c
-f:drivers/net/usb/smsc75xx.c
-f:drivers/net/usb/smsc75xx.h
-f:drivers/net/usb/smsc95xx.c
-f:drivers/net/usb/smsc95xx.h
-f:drivers/net/usb/sr9700.c
-f:drivers/net/usb/sr9700.h
-f:drivers/net/usb/sr9800.c
-f:drivers/net/usb/sr9800.h
-f:drivers/net/usb/usbnet.c
-f:drivers/net/usb/zaurus.c
-f:drivers/net/veth.c
-f:drivers/net/virtio_net.c
-f:drivers/net/vmxnet3/Makefile
-f:drivers/net/vmxnet3/upt1_defs.h
-f:drivers/net/vmxnet3/vmxnet3_defs.h
-f:drivers/net/vmxnet3/vmxnet3_drv.c
-f:drivers/net/vmxnet3/vmxnet3_ethtool.c
-f:drivers/net/vmxnet3/vmxnet3_int.h
-f:drivers/net/vmxnet3/vmxnet3_xdp.c
-f:drivers/net/vmxnet3/vmxnet3_xdp.h
-f:drivers/net/vrf.c
-f:drivers/net/vsockmon.c
-f:drivers/net/vxlan/Makefile
-f:drivers/net/vxlan/vxlan_core.c
-f:drivers/net/vxlan/vxlan_mdb.c
-f:drivers/net/vxlan/vxlan_multicast.c
-f:drivers/net/vxlan/vxlan_private.h
-f:drivers/net/vxlan/vxlan_vnifilter.c
-f:drivers/net/wan/.gitignore
-f:drivers/net/wan/Kconfig
-f:drivers/net/wan/Makefile
-f:drivers/net/wan/c101.c
-f:drivers/net/wan/farsync.c
-f:drivers/net/wan/farsync.h
-f:drivers/net/wan/framer/Kconfig
-f:drivers/net/wan/framer/Makefile
-f:drivers/net/wan/framer/framer-core.c
-f:drivers/net/wan/framer/pef2256/Makefile
-f:drivers/net/wan/framer/pef2256/pef2256-regs.h
-f:drivers/net/wan/framer/pef2256/pef2256.c
-f:drivers/net/wan/fsl_qmc_hdlc.c
-f:drivers/net/wan/fsl_ucc_hdlc.c
-f:drivers/net/wan/fsl_ucc_hdlc.h
-f:drivers/net/wan/hd64570.c
-f:drivers/net/wan/hd64570.h
-f:drivers/net/wan/hd64572.c
-f:drivers/net/wan/hd64572.h
-f:drivers/net/wan/hdlc.c
-f:drivers/net/wan/hdlc_cisco.c
-f:drivers/net/wan/hdlc_fr.c
-f:drivers/net/wan/hdlc_ppp.c
-f:drivers/net/wan/hdlc_raw.c
-f:drivers/net/wan/hdlc_raw_eth.c
-f:drivers/net/wan/hdlc_x25.c
-f:drivers/net/wan/ixp4xx_hss.c
-f:drivers/net/wan/lapbether.c
-f:drivers/net/wan/n2.c
-f:drivers/net/wan/pc300too.c
-f:drivers/net/wan/pci200syn.c
-f:drivers/net/wan/slic_ds26522.c
-f:drivers/net/wan/slic_ds26522.h
-f:drivers/net/wan/wanxl.c
-f:drivers/net/wan/wanxl.h
-f:drivers/net/wan/wanxlfw.S
-f:drivers/net/wan/wanxlfw.inc_shipped
-f:drivers/net/wireguard/Makefile
-f:drivers/net/wireguard/allowedips.c
-f:drivers/net/wireguard/allowedips.h
-f:drivers/net/wireguard/cookie.c
-f:drivers/net/wireguard/cookie.h
-f:drivers/net/wireguard/device.c
-f:drivers/net/wireguard/device.h
-f:drivers/net/wireguard/main.c
-f:drivers/net/wireguard/messages.h
-f:drivers/net/wireguard/netlink.c
-f:drivers/net/wireguard/netlink.h
-f:drivers/net/wireguard/noise.c
-f:drivers/net/wireguard/noise.h
-f:drivers/net/wireguard/peer.c
-f:drivers/net/wireguard/peer.h
-f:drivers/net/wireguard/peerlookup.c
-f:drivers/net/wireguard/peerlookup.h
-f:drivers/net/wireguard/queueing.c
-f:drivers/net/wireguard/queueing.h
-f:drivers/net/wireguard/ratelimiter.c
-f:drivers/net/wireguard/ratelimiter.h
-f:drivers/net/wireguard/receive.c
-f:drivers/net/wireguard/selftest/allowedips.c
-f:drivers/net/wireguard/selftest/counter.c
-f:drivers/net/wireguard/selftest/ratelimiter.c
-f:drivers/net/wireguard/send.c
-f:drivers/net/wireguard/socket.c
-f:drivers/net/wireguard/socket.h
-f:drivers/net/wireguard/timers.c
-f:drivers/net/wireguard/timers.h
-f:drivers/net/wireguard/version.h
-f:drivers/net/wireless/Kconfig
-f:drivers/net/wireless/Makefile
-f:drivers/net/wireless/admtek/Kconfig
-f:drivers/net/wireless/admtek/Makefile
-f:drivers/net/wireless/admtek/adm8211.c
-f:drivers/net/wireless/admtek/adm8211.h
-f:drivers/net/wireless/ath/Kconfig
-f:drivers/net/wireless/ath/Makefile
-f:drivers/net/wireless/ath/ar5523/Kconfig
-f:drivers/net/wireless/ath/ar5523/Makefile
-f:drivers/net/wireless/ath/ar5523/ar5523.c
-f:drivers/net/wireless/ath/ar5523/ar5523.h
-f:drivers/net/wireless/ath/ar5523/ar5523_hw.h
-f:drivers/net/wireless/ath/ath.h
-f:drivers/net/wireless/ath/ath10k/Kconfig
-f:drivers/net/wireless/ath/ath10k/Makefile
-f:drivers/net/wireless/ath/ath10k/ahb.c
-f:drivers/net/wireless/ath/ath10k/ahb.h
-f:drivers/net/wireless/ath/ath10k/bmi.c
-f:drivers/net/wireless/ath/ath10k/bmi.h
-f:drivers/net/wireless/ath/ath10k/ce.c
-f:drivers/net/wireless/ath/ath10k/ce.h
-f:drivers/net/wireless/ath/ath10k/core.c
-f:drivers/net/wireless/ath/ath10k/core.h
-f:drivers/net/wireless/ath/ath10k/coredump.c
-f:drivers/net/wireless/ath/ath10k/coredump.h
-f:drivers/net/wireless/ath/ath10k/debug.c
-f:drivers/net/wireless/ath/ath10k/debug.h
-f:drivers/net/wireless/ath/ath10k/debugfs_sta.c
-f:drivers/net/wireless/ath/ath10k/hif.h
-f:drivers/net/wireless/ath/ath10k/htc.c
-f:drivers/net/wireless/ath/ath10k/htc.h
-f:drivers/net/wireless/ath/ath10k/htt.c
-f:drivers/net/wireless/ath/ath10k/htt.h
-f:drivers/net/wireless/ath/ath10k/htt_rx.c
-f:drivers/net/wireless/ath/ath10k/htt_tx.c
-f:drivers/net/wireless/ath/ath10k/hw.c
-f:drivers/net/wireless/ath/ath10k/hw.h
-f:drivers/net/wireless/ath/ath10k/leds.c
-f:drivers/net/wireless/ath/ath10k/leds.h
-f:drivers/net/wireless/ath/ath10k/mac.c
-f:drivers/net/wireless/ath/ath10k/mac.h
-f:drivers/net/wireless/ath/ath10k/p2p.c
-f:drivers/net/wireless/ath/ath10k/p2p.h
-f:drivers/net/wireless/ath/ath10k/pci.c
-f:drivers/net/wireless/ath/ath10k/pci.h
-f:drivers/net/wireless/ath/ath10k/qmi.c
-f:drivers/net/wireless/ath/ath10k/qmi.h
-f:drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.c
-f:drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.h
-f:drivers/net/wireless/ath/ath10k/rx_desc.h
-f:drivers/net/wireless/ath/ath10k/sdio.c
-f:drivers/net/wireless/ath/ath10k/sdio.h
-f:drivers/net/wireless/ath/ath10k/snoc.c
-f:drivers/net/wireless/ath/ath10k/snoc.h
-f:drivers/net/wireless/ath/ath10k/spectral.c
-f:drivers/net/wireless/ath/ath10k/spectral.h
-f:drivers/net/wireless/ath/ath10k/swap.c
-f:drivers/net/wireless/ath/ath10k/swap.h
-f:drivers/net/wireless/ath/ath10k/targaddrs.h
-f:drivers/net/wireless/ath/ath10k/testmode.c
-f:drivers/net/wireless/ath/ath10k/testmode.h
-f:drivers/net/wireless/ath/ath10k/testmode_i.h
-f:drivers/net/wireless/ath/ath10k/thermal.c
-f:drivers/net/wireless/ath/ath10k/thermal.h
-f:drivers/net/wireless/ath/ath10k/trace.c
-f:drivers/net/wireless/ath/ath10k/trace.h
-f:drivers/net/wireless/ath/ath10k/txrx.c
-f:drivers/net/wireless/ath/ath10k/txrx.h
-f:drivers/net/wireless/ath/ath10k/usb.c
-f:drivers/net/wireless/ath/ath10k/usb.h
-f:drivers/net/wireless/ath/ath10k/wmi-ops.h
-f:drivers/net/wireless/ath/ath10k/wmi-tlv.c
-f:drivers/net/wireless/ath/ath10k/wmi-tlv.h
-f:drivers/net/wireless/ath/ath10k/wmi.c
-f:drivers/net/wireless/ath/ath10k/wmi.h
-f:drivers/net/wireless/ath/ath10k/wow.c
-f:drivers/net/wireless/ath/ath10k/wow.h
-f:drivers/net/wireless/ath/ath11k/Kconfig
-f:drivers/net/wireless/ath/ath11k/Makefile
-f:drivers/net/wireless/ath/ath11k/ahb.c
-f:drivers/net/wireless/ath/ath11k/ahb.h
-f:drivers/net/wireless/ath/ath11k/ce.c
-f:drivers/net/wireless/ath/ath11k/ce.h
-f:drivers/net/wireless/ath/ath11k/core.c
-f:drivers/net/wireless/ath/ath11k/core.h
-f:drivers/net/wireless/ath/ath11k/coredump.c
-f:drivers/net/wireless/ath/ath11k/coredump.h
-f:drivers/net/wireless/ath/ath11k/dbring.c
-f:drivers/net/wireless/ath/ath11k/dbring.h
-f:drivers/net/wireless/ath/ath11k/debug.c
-f:drivers/net/wireless/ath/ath11k/debug.h
-f:drivers/net/wireless/ath/ath11k/debugfs.c
-f:drivers/net/wireless/ath/ath11k/debugfs.h
-f:drivers/net/wireless/ath/ath11k/debugfs_htt_stats.c
-f:drivers/net/wireless/ath/ath11k/debugfs_htt_stats.h
-f:drivers/net/wireless/ath/ath11k/debugfs_sta.c
-f:drivers/net/wireless/ath/ath11k/debugfs_sta.h
-f:drivers/net/wireless/ath/ath11k/dp.c
-f:drivers/net/wireless/ath/ath11k/dp.h
-f:drivers/net/wireless/ath/ath11k/dp_rx.c
-f:drivers/net/wireless/ath/ath11k/dp_rx.h
-f:drivers/net/wireless/ath/ath11k/dp_tx.c
-f:drivers/net/wireless/ath/ath11k/dp_tx.h
-f:drivers/net/wireless/ath/ath11k/fw.c
-f:drivers/net/wireless/ath/ath11k/fw.h
-f:drivers/net/wireless/ath/ath11k/hal.c
-f:drivers/net/wireless/ath/ath11k/hal.h
-f:drivers/net/wireless/ath/ath11k/hal_desc.h
-f:drivers/net/wireless/ath/ath11k/hal_rx.c
-f:drivers/net/wireless/ath/ath11k/hal_rx.h
-f:drivers/net/wireless/ath/ath11k/hal_tx.c
-f:drivers/net/wireless/ath/ath11k/hal_tx.h
-f:drivers/net/wireless/ath/ath11k/hif.h
-f:drivers/net/wireless/ath/ath11k/htc.c
-f:drivers/net/wireless/ath/ath11k/htc.h
-f:drivers/net/wireless/ath/ath11k/hw.c
-f:drivers/net/wireless/ath/ath11k/hw.h
-f:drivers/net/wireless/ath/ath11k/mac.c
-f:drivers/net/wireless/ath/ath11k/mac.h
-f:drivers/net/wireless/ath/ath11k/mhi.c
-f:drivers/net/wireless/ath/ath11k/mhi.h
-f:drivers/net/wireless/ath/ath11k/p2p.c
-f:drivers/net/wireless/ath/ath11k/p2p.h
-f:drivers/net/wireless/ath/ath11k/pci.c
-f:drivers/net/wireless/ath/ath11k/pci.h
-f:drivers/net/wireless/ath/ath11k/pcic.c
-f:drivers/net/wireless/ath/ath11k/pcic.h
-f:drivers/net/wireless/ath/ath11k/peer.c
-f:drivers/net/wireless/ath/ath11k/peer.h
-f:drivers/net/wireless/ath/ath11k/qmi.c
-f:drivers/net/wireless/ath/ath11k/qmi.h
-f:drivers/net/wireless/ath/ath11k/reg.c
-f:drivers/net/wireless/ath/ath11k/reg.h
-f:drivers/net/wireless/ath/ath11k/rx_desc.h
-f:drivers/net/wireless/ath/ath11k/spectral.c
-f:drivers/net/wireless/ath/ath11k/spectral.h
-f:drivers/net/wireless/ath/ath11k/testmode.c
-f:drivers/net/wireless/ath/ath11k/testmode.h
-f:drivers/net/wireless/ath/ath11k/thermal.c
-f:drivers/net/wireless/ath/ath11k/thermal.h
-f:drivers/net/wireless/ath/ath11k/trace.c
-f:drivers/net/wireless/ath/ath11k/trace.h
-f:drivers/net/wireless/ath/ath11k/wmi.c
-f:drivers/net/wireless/ath/ath11k/wmi.h
-f:drivers/net/wireless/ath/ath11k/wow.c
-f:drivers/net/wireless/ath/ath11k/wow.h
-f:drivers/net/wireless/ath/ath12k/Kconfig
-f:drivers/net/wireless/ath/ath12k/Makefile
-f:drivers/net/wireless/ath/ath12k/acpi.c
-f:drivers/net/wireless/ath/ath12k/acpi.h
-f:drivers/net/wireless/ath/ath12k/ahb.c
-f:drivers/net/wireless/ath/ath12k/ahb.h
-f:drivers/net/wireless/ath/ath12k/ce.c
-f:drivers/net/wireless/ath/ath12k/ce.h
-f:drivers/net/wireless/ath/ath12k/core.c
-f:drivers/net/wireless/ath/ath12k/core.h
-f:drivers/net/wireless/ath/ath12k/coredump.c
-f:drivers/net/wireless/ath/ath12k/coredump.h
-f:drivers/net/wireless/ath/ath12k/dbring.c
-f:drivers/net/wireless/ath/ath12k/dbring.h
-f:drivers/net/wireless/ath/ath12k/debug.c
-f:drivers/net/wireless/ath/ath12k/debug.h
-f:drivers/net/wireless/ath/ath12k/debugfs.c
-f:drivers/net/wireless/ath/ath12k/debugfs.h
-f:drivers/net/wireless/ath/ath12k/debugfs_htt_stats.c
-f:drivers/net/wireless/ath/ath12k/debugfs_htt_stats.h
-f:drivers/net/wireless/ath/ath12k/debugfs_sta.c
-f:drivers/net/wireless/ath/ath12k/debugfs_sta.h
-f:drivers/net/wireless/ath/ath12k/dp.c
-f:drivers/net/wireless/ath/ath12k/dp.h
-f:drivers/net/wireless/ath/ath12k/dp_mon.c
-f:drivers/net/wireless/ath/ath12k/dp_mon.h
-f:drivers/net/wireless/ath/ath12k/dp_rx.c
-f:drivers/net/wireless/ath/ath12k/dp_rx.h
-f:drivers/net/wireless/ath/ath12k/dp_tx.c
-f:drivers/net/wireless/ath/ath12k/dp_tx.h
-f:drivers/net/wireless/ath/ath12k/fw.c
-f:drivers/net/wireless/ath/ath12k/fw.h
-f:drivers/net/wireless/ath/ath12k/hal.c
-f:drivers/net/wireless/ath/ath12k/hal.h
-f:drivers/net/wireless/ath/ath12k/hal_desc.h
-f:drivers/net/wireless/ath/ath12k/hal_rx.c
-f:drivers/net/wireless/ath/ath12k/hal_rx.h
-f:drivers/net/wireless/ath/ath12k/hal_tx.c
-f:drivers/net/wireless/ath/ath12k/hal_tx.h
-f:drivers/net/wireless/ath/ath12k/hif.h
-f:drivers/net/wireless/ath/ath12k/htc.c
-f:drivers/net/wireless/ath/ath12k/htc.h
-f:drivers/net/wireless/ath/ath12k/hw.c
-f:drivers/net/wireless/ath/ath12k/hw.h
-f:drivers/net/wireless/ath/ath12k/mac.c
-f:drivers/net/wireless/ath/ath12k/mac.h
-f:drivers/net/wireless/ath/ath12k/mhi.c
-f:drivers/net/wireless/ath/ath12k/mhi.h
-f:drivers/net/wireless/ath/ath12k/p2p.c
-f:drivers/net/wireless/ath/ath12k/p2p.h
-f:drivers/net/wireless/ath/ath12k/pci.c
-f:drivers/net/wireless/ath/ath12k/pci.h
-f:drivers/net/wireless/ath/ath12k/peer.c
-f:drivers/net/wireless/ath/ath12k/peer.h
-f:drivers/net/wireless/ath/ath12k/qmi.c
-f:drivers/net/wireless/ath/ath12k/qmi.h
-f:drivers/net/wireless/ath/ath12k/reg.c
-f:drivers/net/wireless/ath/ath12k/reg.h
-f:drivers/net/wireless/ath/ath12k/rx_desc.h
-f:drivers/net/wireless/ath/ath12k/testmode.c
-f:drivers/net/wireless/ath/ath12k/testmode.h
-f:drivers/net/wireless/ath/ath12k/trace.c
-f:drivers/net/wireless/ath/ath12k/trace.h
-f:drivers/net/wireless/ath/ath12k/wmi.c
-f:drivers/net/wireless/ath/ath12k/wmi.h
-f:drivers/net/wireless/ath/ath12k/wow.c
-f:drivers/net/wireless/ath/ath12k/wow.h
-f:drivers/net/wireless/ath/ath5k/Kconfig
-f:drivers/net/wireless/ath/ath5k/Makefile
-f:drivers/net/wireless/ath/ath5k/ahb.c
-f:drivers/net/wireless/ath/ath5k/ani.c
-f:drivers/net/wireless/ath/ath5k/ani.h
-f:drivers/net/wireless/ath/ath5k/ath5k.h
-f:drivers/net/wireless/ath/ath5k/attach.c
-f:drivers/net/wireless/ath/ath5k/base.c
-f:drivers/net/wireless/ath/ath5k/base.h
-f:drivers/net/wireless/ath/ath5k/caps.c
-f:drivers/net/wireless/ath/ath5k/debug.c
-f:drivers/net/wireless/ath/ath5k/debug.h
-f:drivers/net/wireless/ath/ath5k/desc.c
-f:drivers/net/wireless/ath/ath5k/desc.h
-f:drivers/net/wireless/ath/ath5k/dma.c
-f:drivers/net/wireless/ath/ath5k/eeprom.c
-f:drivers/net/wireless/ath/ath5k/eeprom.h
-f:drivers/net/wireless/ath/ath5k/gpio.c
-f:drivers/net/wireless/ath/ath5k/initvals.c
-f:drivers/net/wireless/ath/ath5k/led.c
-f:drivers/net/wireless/ath/ath5k/mac80211-ops.c
-f:drivers/net/wireless/ath/ath5k/pci.c
-f:drivers/net/wireless/ath/ath5k/pcu.c
-f:drivers/net/wireless/ath/ath5k/phy.c
-f:drivers/net/wireless/ath/ath5k/qcu.c
-f:drivers/net/wireless/ath/ath5k/reg.h
-f:drivers/net/wireless/ath/ath5k/reset.c
-f:drivers/net/wireless/ath/ath5k/rfbuffer.h
-f:drivers/net/wireless/ath/ath5k/rfgain.h
-f:drivers/net/wireless/ath/ath5k/rfkill.c
-f:drivers/net/wireless/ath/ath5k/sysfs.c
-f:drivers/net/wireless/ath/ath5k/trace.h
-f:drivers/net/wireless/ath/ath6kl/Kconfig
-f:drivers/net/wireless/ath/ath6kl/Makefile
-f:drivers/net/wireless/ath/ath6kl/bmi.c
-f:drivers/net/wireless/ath/ath6kl/bmi.h
-f:drivers/net/wireless/ath/ath6kl/cfg80211.c
-f:drivers/net/wireless/ath/ath6kl/cfg80211.h
-f:drivers/net/wireless/ath/ath6kl/common.h
-f:drivers/net/wireless/ath/ath6kl/core.c
-f:drivers/net/wireless/ath/ath6kl/core.h
-f:drivers/net/wireless/ath/ath6kl/debug.c
-f:drivers/net/wireless/ath/ath6kl/debug.h
-f:drivers/net/wireless/ath/ath6kl/hif-ops.h
-f:drivers/net/wireless/ath/ath6kl/hif.c
-f:drivers/net/wireless/ath/ath6kl/hif.h
-f:drivers/net/wireless/ath/ath6kl/htc-ops.h
-f:drivers/net/wireless/ath/ath6kl/htc.h
-f:drivers/net/wireless/ath/ath6kl/htc_mbox.c
-f:drivers/net/wireless/ath/ath6kl/htc_pipe.c
-f:drivers/net/wireless/ath/ath6kl/init.c
-f:drivers/net/wireless/ath/ath6kl/main.c
-f:drivers/net/wireless/ath/ath6kl/recovery.c
-f:drivers/net/wireless/ath/ath6kl/sdio.c
-f:drivers/net/wireless/ath/ath6kl/target.h
-f:drivers/net/wireless/ath/ath6kl/testmode.c
-f:drivers/net/wireless/ath/ath6kl/testmode.h
-f:drivers/net/wireless/ath/ath6kl/trace.c
-f:drivers/net/wireless/ath/ath6kl/trace.h
-f:drivers/net/wireless/ath/ath6kl/txrx.c
-f:drivers/net/wireless/ath/ath6kl/usb.c
-f:drivers/net/wireless/ath/ath6kl/wmi.c
-f:drivers/net/wireless/ath/ath6kl/wmi.h
-f:drivers/net/wireless/ath/ath9k/Kconfig
-f:drivers/net/wireless/ath/ath9k/Makefile
-f:drivers/net/wireless/ath/ath9k/ahb.c
-f:drivers/net/wireless/ath/ath9k/ani.c
-f:drivers/net/wireless/ath/ath9k/ani.h
-f:drivers/net/wireless/ath/ath9k/antenna.c
-f:drivers/net/wireless/ath/ath9k/ar5008_initvals.h
-f:drivers/net/wireless/ath/ath9k/ar5008_phy.c
-f:drivers/net/wireless/ath/ath9k/ar9001_initvals.h
-f:drivers/net/wireless/ath/ath9k/ar9002_calib.c
-f:drivers/net/wireless/ath/ath9k/ar9002_hw.c
-f:drivers/net/wireless/ath/ath9k/ar9002_initvals.h
-f:drivers/net/wireless/ath/ath9k/ar9002_mac.c
-f:drivers/net/wireless/ath/ath9k/ar9002_phy.c
-f:drivers/net/wireless/ath/ath9k/ar9002_phy.h
-f:drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
-f:drivers/net/wireless/ath/ath9k/ar9003_aic.c
-f:drivers/net/wireless/ath/ath9k/ar9003_aic.h
-f:drivers/net/wireless/ath/ath9k/ar9003_buffalo_initvals.h
-f:drivers/net/wireless/ath/ath9k/ar9003_calib.c
-f:drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
-f:drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
-f:drivers/net/wireless/ath/ath9k/ar9003_hw.c
-f:drivers/net/wireless/ath/ath9k/ar9003_mac.c
-f:drivers/net/wireless/ath/ath9k/ar9003_mac.h
-f:drivers/net/wireless/ath/ath9k/ar9003_mci.c
-f:drivers/net/wireless/ath/ath9k/ar9003_mci.h
-f:drivers/net/wireless/ath/ath9k/ar9003_paprd.c
-f:drivers/net/wireless/ath/ath9k/ar9003_phy.c
-f:drivers/net/wireless/ath/ath9k/ar9003_phy.h
-f:drivers/net/wireless/ath/ath9k/ar9003_rtt.c
-f:drivers/net/wireless/ath/ath9k/ar9003_rtt.h
-f:drivers/net/wireless/ath/ath9k/ar9003_wow.c
-f:drivers/net/wireless/ath/ath9k/ar9330_1p1_initvals.h
-f:drivers/net/wireless/ath/ath9k/ar9330_1p2_initvals.h
-f:drivers/net/wireless/ath/ath9k/ar9340_initvals.h
-f:drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h
-f:drivers/net/wireless/ath/ath9k/ar9462_2p1_initvals.h
-f:drivers/net/wireless/ath/ath9k/ar9485_initvals.h
-f:drivers/net/wireless/ath/ath9k/ar953x_initvals.h
-f:drivers/net/wireless/ath/ath9k/ar955x_1p0_initvals.h
-f:drivers/net/wireless/ath/ath9k/ar9565_1p0_initvals.h
-f:drivers/net/wireless/ath/ath9k/ar9565_1p1_initvals.h
-f:drivers/net/wireless/ath/ath9k/ar956x_initvals.h
-f:drivers/net/wireless/ath/ath9k/ar9580_1p0_initvals.h
-f:drivers/net/wireless/ath/ath9k/ath9k.h
-f:drivers/net/wireless/ath/ath9k/ath9k_pci_owl_loader.c
-f:drivers/net/wireless/ath/ath9k/beacon.c
-f:drivers/net/wireless/ath/ath9k/btcoex.c
-f:drivers/net/wireless/ath/ath9k/btcoex.h
-f:drivers/net/wireless/ath/ath9k/calib.c
-f:drivers/net/wireless/ath/ath9k/calib.h
-f:drivers/net/wireless/ath/ath9k/channel.c
-f:drivers/net/wireless/ath/ath9k/common-beacon.c
-f:drivers/net/wireless/ath/ath9k/common-beacon.h
-f:drivers/net/wireless/ath/ath9k/common-debug.c
-f:drivers/net/wireless/ath/ath9k/common-debug.h
-f:drivers/net/wireless/ath/ath9k/common-init.c
-f:drivers/net/wireless/ath/ath9k/common-init.h
-f:drivers/net/wireless/ath/ath9k/common-spectral.c
-f:drivers/net/wireless/ath/ath9k/common-spectral.h
-f:drivers/net/wireless/ath/ath9k/common.c
-f:drivers/net/wireless/ath/ath9k/common.h
-f:drivers/net/wireless/ath/ath9k/debug.c
-f:drivers/net/wireless/ath/ath9k/debug.h
-f:drivers/net/wireless/ath/ath9k/debug_sta.c
-f:drivers/net/wireless/ath/ath9k/dfs.c
-f:drivers/net/wireless/ath/ath9k/dfs.h
-f:drivers/net/wireless/ath/ath9k/dfs_debug.c
-f:drivers/net/wireless/ath/ath9k/dfs_debug.h
-f:drivers/net/wireless/ath/ath9k/dynack.c
-f:drivers/net/wireless/ath/ath9k/dynack.h
-f:drivers/net/wireless/ath/ath9k/eeprom.c
-f:drivers/net/wireless/ath/ath9k/eeprom.h
-f:drivers/net/wireless/ath/ath9k/eeprom_4k.c
-f:drivers/net/wireless/ath/ath9k/eeprom_9287.c
-f:drivers/net/wireless/ath/ath9k/eeprom_def.c
-f:drivers/net/wireless/ath/ath9k/gpio.c
-f:drivers/net/wireless/ath/ath9k/hif_usb.c
-f:drivers/net/wireless/ath/ath9k/hif_usb.h
-f:drivers/net/wireless/ath/ath9k/htc.h
-f:drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
-f:drivers/net/wireless/ath/ath9k/htc_drv_debug.c
-f:drivers/net/wireless/ath/ath9k/htc_drv_gpio.c
-f:drivers/net/wireless/ath/ath9k/htc_drv_init.c
-f:drivers/net/wireless/ath/ath9k/htc_drv_main.c
-f:drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
-f:drivers/net/wireless/ath/ath9k/htc_hst.c
-f:drivers/net/wireless/ath/ath9k/htc_hst.h
-f:drivers/net/wireless/ath/ath9k/hw-ops.h
-f:drivers/net/wireless/ath/ath9k/hw.c
-f:drivers/net/wireless/ath/ath9k/hw.h
-f:drivers/net/wireless/ath/ath9k/init.c
-f:drivers/net/wireless/ath/ath9k/link.c
-f:drivers/net/wireless/ath/ath9k/mac.c
-f:drivers/net/wireless/ath/ath9k/mac.h
-f:drivers/net/wireless/ath/ath9k/main.c
-f:drivers/net/wireless/ath/ath9k/mci.c
-f:drivers/net/wireless/ath/ath9k/mci.h
-f:drivers/net/wireless/ath/ath9k/pci.c
-f:drivers/net/wireless/ath/ath9k/phy.h
-f:drivers/net/wireless/ath/ath9k/recv.c
-f:drivers/net/wireless/ath/ath9k/reg.h
-f:drivers/net/wireless/ath/ath9k/reg_aic.h
-f:drivers/net/wireless/ath/ath9k/reg_mci.h
-f:drivers/net/wireless/ath/ath9k/reg_wow.h
-f:drivers/net/wireless/ath/ath9k/rng.c
-f:drivers/net/wireless/ath/ath9k/tx99.c
-f:drivers/net/wireless/ath/ath9k/wmi.c
-f:drivers/net/wireless/ath/ath9k/wmi.h
-f:drivers/net/wireless/ath/ath9k/wow.c
-f:drivers/net/wireless/ath/ath9k/xmit.c
-f:drivers/net/wireless/ath/carl9170/Kconfig
-f:drivers/net/wireless/ath/carl9170/Makefile
-f:drivers/net/wireless/ath/carl9170/carl9170.h
-f:drivers/net/wireless/ath/carl9170/cmd.c
-f:drivers/net/wireless/ath/carl9170/cmd.h
-f:drivers/net/wireless/ath/carl9170/debug.c
-f:drivers/net/wireless/ath/carl9170/debug.h
-f:drivers/net/wireless/ath/carl9170/eeprom.h
-f:drivers/net/wireless/ath/carl9170/fw.c
-f:drivers/net/wireless/ath/carl9170/fwcmd.h
-f:drivers/net/wireless/ath/carl9170/fwdesc.h
-f:drivers/net/wireless/ath/carl9170/hw.h
-f:drivers/net/wireless/ath/carl9170/led.c
-f:drivers/net/wireless/ath/carl9170/mac.c
-f:drivers/net/wireless/ath/carl9170/main.c
-f:drivers/net/wireless/ath/carl9170/phy.c
-f:drivers/net/wireless/ath/carl9170/phy.h
-f:drivers/net/wireless/ath/carl9170/rx.c
-f:drivers/net/wireless/ath/carl9170/tx.c
-f:drivers/net/wireless/ath/carl9170/usb.c
-f:drivers/net/wireless/ath/carl9170/version.h
-f:drivers/net/wireless/ath/carl9170/wlan.h
-f:drivers/net/wireless/ath/debug.c
-f:drivers/net/wireless/ath/dfs_pattern_detector.c
-f:drivers/net/wireless/ath/dfs_pattern_detector.h
-f:drivers/net/wireless/ath/dfs_pri_detector.c
-f:drivers/net/wireless/ath/dfs_pri_detector.h
-f:drivers/net/wireless/ath/hw.c
-f:drivers/net/wireless/ath/key.c
-f:drivers/net/wireless/ath/main.c
-f:drivers/net/wireless/ath/reg.h
-f:drivers/net/wireless/ath/regd.c
-f:drivers/net/wireless/ath/regd.h
-f:drivers/net/wireless/ath/regd_common.h
-f:drivers/net/wireless/ath/spectral_common.h
-f:drivers/net/wireless/ath/testmode_i.h
-f:drivers/net/wireless/ath/trace.c
-f:drivers/net/wireless/ath/trace.h
-f:drivers/net/wireless/ath/wcn36xx/Kconfig
-f:drivers/net/wireless/ath/wcn36xx/Makefile
-f:drivers/net/wireless/ath/wcn36xx/debug.c
-f:drivers/net/wireless/ath/wcn36xx/debug.h
-f:drivers/net/wireless/ath/wcn36xx/dxe.c
-f:drivers/net/wireless/ath/wcn36xx/dxe.h
-f:drivers/net/wireless/ath/wcn36xx/firmware.c
-f:drivers/net/wireless/ath/wcn36xx/firmware.h
-f:drivers/net/wireless/ath/wcn36xx/hal.h
-f:drivers/net/wireless/ath/wcn36xx/main.c
-f:drivers/net/wireless/ath/wcn36xx/pmc.c
-f:drivers/net/wireless/ath/wcn36xx/pmc.h
-f:drivers/net/wireless/ath/wcn36xx/smd.c
-f:drivers/net/wireless/ath/wcn36xx/smd.h
-f:drivers/net/wireless/ath/wcn36xx/testmode.c
-f:drivers/net/wireless/ath/wcn36xx/testmode.h
-f:drivers/net/wireless/ath/wcn36xx/testmode_i.h
-f:drivers/net/wireless/ath/wcn36xx/txrx.c
-f:drivers/net/wireless/ath/wcn36xx/txrx.h
-f:drivers/net/wireless/ath/wcn36xx/wcn36xx.h
-f:drivers/net/wireless/ath/wil6210/Kconfig
-f:drivers/net/wireless/ath/wil6210/Makefile
-f:drivers/net/wireless/ath/wil6210/boot_loader.h
-f:drivers/net/wireless/ath/wil6210/cfg80211.c
-f:drivers/net/wireless/ath/wil6210/debug.c
-f:drivers/net/wireless/ath/wil6210/debugfs.c
-f:drivers/net/wireless/ath/wil6210/ethtool.c
-f:drivers/net/wireless/ath/wil6210/fw.c
-f:drivers/net/wireless/ath/wil6210/fw.h
-f:drivers/net/wireless/ath/wil6210/fw_inc.c
-f:drivers/net/wireless/ath/wil6210/interrupt.c
-f:drivers/net/wireless/ath/wil6210/main.c
-f:drivers/net/wireless/ath/wil6210/netdev.c
-f:drivers/net/wireless/ath/wil6210/p2p.c
-f:drivers/net/wireless/ath/wil6210/pcie_bus.c
-f:drivers/net/wireless/ath/wil6210/pm.c
-f:drivers/net/wireless/ath/wil6210/pmc.c
-f:drivers/net/wireless/ath/wil6210/pmc.h
-f:drivers/net/wireless/ath/wil6210/rx_reorder.c
-f:drivers/net/wireless/ath/wil6210/trace.c
-f:drivers/net/wireless/ath/wil6210/trace.h
-f:drivers/net/wireless/ath/wil6210/txrx.c
-f:drivers/net/wireless/ath/wil6210/txrx.h
-f:drivers/net/wireless/ath/wil6210/txrx_edma.c
-f:drivers/net/wireless/ath/wil6210/txrx_edma.h
-f:drivers/net/wireless/ath/wil6210/wil6210.h
-f:drivers/net/wireless/ath/wil6210/wil_crash_dump.c
-f:drivers/net/wireless/ath/wil6210/wil_platform.c
-f:drivers/net/wireless/ath/wil6210/wil_platform.h
-f:drivers/net/wireless/ath/wil6210/wmi.c
-f:drivers/net/wireless/ath/wil6210/wmi.h
-f:drivers/net/wireless/atmel/Kconfig
-f:drivers/net/wireless/atmel/Makefile
-f:drivers/net/wireless/atmel/at76c50x-usb.c
-f:drivers/net/wireless/atmel/at76c50x-usb.h
-f:drivers/net/wireless/broadcom/Kconfig
-f:drivers/net/wireless/broadcom/Makefile
-f:drivers/net/wireless/broadcom/b43/Kconfig
-f:drivers/net/wireless/broadcom/b43/Makefile
-f:drivers/net/wireless/broadcom/b43/b43.h
-f:drivers/net/wireless/broadcom/b43/bus.c
-f:drivers/net/wireless/broadcom/b43/bus.h
-f:drivers/net/wireless/broadcom/b43/debugfs.c
-f:drivers/net/wireless/broadcom/b43/debugfs.h
-f:drivers/net/wireless/broadcom/b43/dma.c
-f:drivers/net/wireless/broadcom/b43/dma.h
-f:drivers/net/wireless/broadcom/b43/leds.c
-f:drivers/net/wireless/broadcom/b43/leds.h
-f:drivers/net/wireless/broadcom/b43/lo.c
-f:drivers/net/wireless/broadcom/b43/lo.h
-f:drivers/net/wireless/broadcom/b43/main.c
-f:drivers/net/wireless/broadcom/b43/main.h
-f:drivers/net/wireless/broadcom/b43/phy_a.h
-f:drivers/net/wireless/broadcom/b43/phy_ac.c
-f:drivers/net/wireless/broadcom/b43/phy_ac.h
-f:drivers/net/wireless/broadcom/b43/phy_common.c
-f:drivers/net/wireless/broadcom/b43/phy_common.h
-f:drivers/net/wireless/broadcom/b43/phy_g.c
-f:drivers/net/wireless/broadcom/b43/phy_g.h
-f:drivers/net/wireless/broadcom/b43/phy_ht.c
-f:drivers/net/wireless/broadcom/b43/phy_ht.h
-f:drivers/net/wireless/broadcom/b43/phy_lcn.c
-f:drivers/net/wireless/broadcom/b43/phy_lcn.h
-f:drivers/net/wireless/broadcom/b43/phy_lp.c
-f:drivers/net/wireless/broadcom/b43/phy_lp.h
-f:drivers/net/wireless/broadcom/b43/phy_n.c
-f:drivers/net/wireless/broadcom/b43/phy_n.h
-f:drivers/net/wireless/broadcom/b43/pio.c
-f:drivers/net/wireless/broadcom/b43/pio.h
-f:drivers/net/wireless/broadcom/b43/ppr.c
-f:drivers/net/wireless/broadcom/b43/ppr.h
-f:drivers/net/wireless/broadcom/b43/radio_2055.c
-f:drivers/net/wireless/broadcom/b43/radio_2055.h
-f:drivers/net/wireless/broadcom/b43/radio_2056.c
-f:drivers/net/wireless/broadcom/b43/radio_2056.h
-f:drivers/net/wireless/broadcom/b43/radio_2057.c
-f:drivers/net/wireless/broadcom/b43/radio_2057.h
-f:drivers/net/wireless/broadcom/b43/radio_2059.c
-f:drivers/net/wireless/broadcom/b43/radio_2059.h
-f:drivers/net/wireless/broadcom/b43/rfkill.c
-f:drivers/net/wireless/broadcom/b43/rfkill.h
-f:drivers/net/wireless/broadcom/b43/sdio.c
-f:drivers/net/wireless/broadcom/b43/sdio.h
-f:drivers/net/wireless/broadcom/b43/sysfs.c
-f:drivers/net/wireless/broadcom/b43/sysfs.h
-f:drivers/net/wireless/broadcom/b43/tables.c
-f:drivers/net/wireless/broadcom/b43/tables.h
-f:drivers/net/wireless/broadcom/b43/tables_lpphy.c
-f:drivers/net/wireless/broadcom/b43/tables_lpphy.h
-f:drivers/net/wireless/broadcom/b43/tables_nphy.c
-f:drivers/net/wireless/broadcom/b43/tables_nphy.h
-f:drivers/net/wireless/broadcom/b43/tables_phy_ht.c
-f:drivers/net/wireless/broadcom/b43/tables_phy_ht.h
-f:drivers/net/wireless/broadcom/b43/tables_phy_lcn.c
-f:drivers/net/wireless/broadcom/b43/tables_phy_lcn.h
-f:drivers/net/wireless/broadcom/b43/wa.c
-f:drivers/net/wireless/broadcom/b43/wa.h
-f:drivers/net/wireless/broadcom/b43/xmit.c
-f:drivers/net/wireless/broadcom/b43/xmit.h
-f:drivers/net/wireless/broadcom/b43legacy/Kconfig
-f:drivers/net/wireless/broadcom/b43legacy/Makefile
-f:drivers/net/wireless/broadcom/b43legacy/b43legacy.h
-f:drivers/net/wireless/broadcom/b43legacy/debugfs.c
-f:drivers/net/wireless/broadcom/b43legacy/debugfs.h
-f:drivers/net/wireless/broadcom/b43legacy/dma.c
-f:drivers/net/wireless/broadcom/b43legacy/dma.h
-f:drivers/net/wireless/broadcom/b43legacy/ilt.c
-f:drivers/net/wireless/broadcom/b43legacy/ilt.h
-f:drivers/net/wireless/broadcom/b43legacy/leds.c
-f:drivers/net/wireless/broadcom/b43legacy/leds.h
-f:drivers/net/wireless/broadcom/b43legacy/main.c
-f:drivers/net/wireless/broadcom/b43legacy/main.h
-f:drivers/net/wireless/broadcom/b43legacy/phy.c
-f:drivers/net/wireless/broadcom/b43legacy/phy.h
-f:drivers/net/wireless/broadcom/b43legacy/pio.c
-f:drivers/net/wireless/broadcom/b43legacy/pio.h
-f:drivers/net/wireless/broadcom/b43legacy/radio.c
-f:drivers/net/wireless/broadcom/b43legacy/radio.h
-f:drivers/net/wireless/broadcom/b43legacy/rfkill.c
-f:drivers/net/wireless/broadcom/b43legacy/rfkill.h
-f:drivers/net/wireless/broadcom/b43legacy/sysfs.c
-f:drivers/net/wireless/broadcom/b43legacy/sysfs.h
-f:drivers/net/wireless/broadcom/b43legacy/xmit.c
-f:drivers/net/wireless/broadcom/b43legacy/xmit.h
-f:drivers/net/wireless/broadcom/brcm80211/Kconfig
-f:drivers/net/wireless/broadcom/brcm80211/Makefile
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/Kconfig
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/acpi.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/Makefile
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/core.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/module.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/vops.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/commonring.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/commonring.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/Makefile
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/fwil_types.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/module.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/vops.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/vendor.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/vendor.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/Makefile
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/core.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/module.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/vops.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/xtlv.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmfmac/xtlv.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/aiutils.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/aiutils.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/ampdu.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/ampdu.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/antsel.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/antsel.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_tx.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_events.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_events.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/channel.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/channel.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/d11.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/debug.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/debug.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/dma.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/dma.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_hal.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_int.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_qmath.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_qmath.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_radio.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phyreg_n.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phytbl_n.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phytbl_n.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy_shim.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy_shim.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/pmu.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/pmu.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/pub.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/rate.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/rate.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/scb.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/stf.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/stf.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/types.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/ucode_loader.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmsmac/ucode_loader.h
-f:drivers/net/wireless/broadcom/brcm80211/brcmutil/Makefile
-f:drivers/net/wireless/broadcom/brcm80211/brcmutil/d11.c
-f:drivers/net/wireless/broadcom/brcm80211/brcmutil/utils.c
-f:drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h
-f:drivers/net/wireless/broadcom/brcm80211/include/brcmu_d11.h
-f:drivers/net/wireless/broadcom/brcm80211/include/brcmu_utils.h
-f:drivers/net/wireless/broadcom/brcm80211/include/brcmu_wifi.h
-f:drivers/net/wireless/broadcom/brcm80211/include/chipcommon.h
-f:drivers/net/wireless/broadcom/brcm80211/include/defs.h
-f:drivers/net/wireless/broadcom/brcm80211/include/soc.h
-f:drivers/net/wireless/intel/Kconfig
-f:drivers/net/wireless/intel/Makefile
-f:drivers/net/wireless/intel/ipw2x00/Kconfig
-f:drivers/net/wireless/intel/ipw2x00/Makefile
-f:drivers/net/wireless/intel/ipw2x00/ipw.h
-f:drivers/net/wireless/intel/ipw2x00/ipw2100.c
-f:drivers/net/wireless/intel/ipw2x00/ipw2100.h
-f:drivers/net/wireless/intel/ipw2x00/ipw2200.c
-f:drivers/net/wireless/intel/ipw2x00/ipw2200.h
-f:drivers/net/wireless/intel/ipw2x00/libipw.h
-f:drivers/net/wireless/intel/ipw2x00/libipw_crypto.c
-f:drivers/net/wireless/intel/ipw2x00/libipw_crypto_ccmp.c
-f:drivers/net/wireless/intel/ipw2x00/libipw_crypto_tkip.c
-f:drivers/net/wireless/intel/ipw2x00/libipw_crypto_wep.c
-f:drivers/net/wireless/intel/ipw2x00/libipw_geo.c
-f:drivers/net/wireless/intel/ipw2x00/libipw_module.c
-f:drivers/net/wireless/intel/ipw2x00/libipw_rx.c
-f:drivers/net/wireless/intel/ipw2x00/libipw_spy.c
-f:drivers/net/wireless/intel/ipw2x00/libipw_tx.c
-f:drivers/net/wireless/intel/ipw2x00/libipw_wx.c
-f:drivers/net/wireless/intel/iwlegacy/3945-debug.c
-f:drivers/net/wireless/intel/iwlegacy/3945-mac.c
-f:drivers/net/wireless/intel/iwlegacy/3945-rs.c
-f:drivers/net/wireless/intel/iwlegacy/3945.c
-f:drivers/net/wireless/intel/iwlegacy/3945.h
-f:drivers/net/wireless/intel/iwlegacy/4965-calib.c
-f:drivers/net/wireless/intel/iwlegacy/4965-debug.c
-f:drivers/net/wireless/intel/iwlegacy/4965-mac.c
-f:drivers/net/wireless/intel/iwlegacy/4965-rs.c
-f:drivers/net/wireless/intel/iwlegacy/4965.c
-f:drivers/net/wireless/intel/iwlegacy/4965.h
-f:drivers/net/wireless/intel/iwlegacy/Kconfig
-f:drivers/net/wireless/intel/iwlegacy/Makefile
-f:drivers/net/wireless/intel/iwlegacy/commands.h
-f:drivers/net/wireless/intel/iwlegacy/common.c
-f:drivers/net/wireless/intel/iwlegacy/common.h
-f:drivers/net/wireless/intel/iwlegacy/csr.h
-f:drivers/net/wireless/intel/iwlegacy/debug.c
-f:drivers/net/wireless/intel/iwlegacy/iwl-spectrum.h
-f:drivers/net/wireless/intel/iwlegacy/prph.h
-f:drivers/net/wireless/intel/iwlwifi/Kconfig
-f:drivers/net/wireless/intel/iwlwifi/Makefile
-f:drivers/net/wireless/intel/iwlwifi/cfg/1000.c
-f:drivers/net/wireless/intel/iwlwifi/cfg/2000.c
-f:drivers/net/wireless/intel/iwlwifi/cfg/22000.c
-f:drivers/net/wireless/intel/iwlwifi/cfg/5000.c
-f:drivers/net/wireless/intel/iwlwifi/cfg/6000.c
-f:drivers/net/wireless/intel/iwlwifi/cfg/7000.c
-f:drivers/net/wireless/intel/iwlwifi/cfg/8000.c
-f:drivers/net/wireless/intel/iwlwifi/cfg/9000.c
-f:drivers/net/wireless/intel/iwlwifi/cfg/ax210.c
-f:drivers/net/wireless/intel/iwlwifi/cfg/bz.c
-f:drivers/net/wireless/intel/iwlwifi/cfg/dr.c
-f:drivers/net/wireless/intel/iwlwifi/cfg/rf-fm.c
-f:drivers/net/wireless/intel/iwlwifi/cfg/rf-gf.c
-f:drivers/net/wireless/intel/iwlwifi/cfg/rf-hr.c
-f:drivers/net/wireless/intel/iwlwifi/cfg/rf-jf.c
-f:drivers/net/wireless/intel/iwlwifi/cfg/rf-pe.c
-f:drivers/net/wireless/intel/iwlwifi/cfg/rf-wh.c
-f:drivers/net/wireless/intel/iwlwifi/cfg/sc.c
-f:drivers/net/wireless/intel/iwlwifi/dvm/Makefile
-f:drivers/net/wireless/intel/iwlwifi/dvm/agn.h
-f:drivers/net/wireless/intel/iwlwifi/dvm/calib.c
-f:drivers/net/wireless/intel/iwlwifi/dvm/calib.h
-f:drivers/net/wireless/intel/iwlwifi/dvm/commands.h
-f:drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c
-f:drivers/net/wireless/intel/iwlwifi/dvm/dev.h
-f:drivers/net/wireless/intel/iwlwifi/dvm/devices.c
-f:drivers/net/wireless/intel/iwlwifi/dvm/eeprom.c
-f:drivers/net/wireless/intel/iwlwifi/dvm/led.c
-f:drivers/net/wireless/intel/iwlwifi/dvm/led.h
-f:drivers/net/wireless/intel/iwlwifi/dvm/lib.c
-f:drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c
-f:drivers/net/wireless/intel/iwlwifi/dvm/main.c
-f:drivers/net/wireless/intel/iwlwifi/dvm/power.c
-f:drivers/net/wireless/intel/iwlwifi/dvm/power.h
-f:drivers/net/wireless/intel/iwlwifi/dvm/rs.c
-f:drivers/net/wireless/intel/iwlwifi/dvm/rs.h
-f:drivers/net/wireless/intel/iwlwifi/dvm/rx.c
-f:drivers/net/wireless/intel/iwlwifi/dvm/rxon.c
-f:drivers/net/wireless/intel/iwlwifi/dvm/scan.c
-f:drivers/net/wireless/intel/iwlwifi/dvm/sta.c
-f:drivers/net/wireless/intel/iwlwifi/dvm/tt.c
-f:drivers/net/wireless/intel/iwlwifi/dvm/tt.h
-f:drivers/net/wireless/intel/iwlwifi/dvm/tx.c
-f:drivers/net/wireless/intel/iwlwifi/dvm/ucode.c
-f:drivers/net/wireless/intel/iwlwifi/fw/acpi.c
-f:drivers/net/wireless/intel/iwlwifi/fw/acpi.h
-f:drivers/net/wireless/intel/iwlwifi/fw/api/alive.h
-f:drivers/net/wireless/intel/iwlwifi/fw/api/binding.h
-f:drivers/net/wireless/intel/iwlwifi/fw/api/cmdhdr.h
-f:drivers/net/wireless/intel/iwlwifi/fw/api/coex.h
-f:drivers/net/wireless/intel/iwlwifi/fw/api/commands.h
-f:drivers/net/wireless/intel/iwlwifi/fw/api/config.h
-f:drivers/net/wireless/intel/iwlwifi/fw/api/context.h
-f:drivers/net/wireless/intel/iwlwifi/fw/api/d3.h
-f:drivers/net/wireless/intel/iwlwifi/fw/api/datapath.h
-f:drivers/net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h
-f:drivers/net/wireless/intel/iwlwifi/fw/api/debug.h
-f:drivers/net/wireless/intel/iwlwifi/fw/api/dhc.h
-f:drivers/net/wireless/intel/iwlwifi/fw/api/filter.h
-f:drivers/net/wireless/intel/iwlwifi/fw/api/led.h
-f:drivers/net/wireless/intel/iwlwifi/fw/api/location.h
-f:drivers/net/wireless/intel/iwlwifi/fw/api/mac-cfg.h
-f:drivers/net/wireless/intel/iwlwifi/fw/api/mac.h
-f:drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h
-f:drivers/net/wireless/intel/iwlwifi/fw/api/offload.h
-f:drivers/net/wireless/intel/iwlwifi/fw/api/paging.h
-f:drivers/net/wireless/intel/iwlwifi/fw/api/phy-ctxt.h
-f:drivers/net/wireless/intel/iwlwifi/fw/api/phy.h
-f:drivers/net/wireless/intel/iwlwifi/fw/api/power.h
-f:drivers/net/wireless/intel/iwlwifi/fw/api/rfi.h
-f:drivers/net/wireless/intel/iwlwifi/fw/api/rs.h
-f:drivers/net/wireless/intel/iwlwifi/fw/api/rx.h
-f:drivers/net/wireless/intel/iwlwifi/fw/api/scan.h
-f:drivers/net/wireless/intel/iwlwifi/fw/api/sf.h
-f:drivers/net/wireless/intel/iwlwifi/fw/api/sta.h
-f:drivers/net/wireless/intel/iwlwifi/fw/api/stats.h
-f:drivers/net/wireless/intel/iwlwifi/fw/api/system.h
-f:drivers/net/wireless/intel/iwlwifi/fw/api/tdls.h
-f:drivers/net/wireless/intel/iwlwifi/fw/api/time-event.h
-f:drivers/net/wireless/intel/iwlwifi/fw/api/tx.h
-f:drivers/net/wireless/intel/iwlwifi/fw/api/txq.h
-f:drivers/net/wireless/intel/iwlwifi/fw/dbg.c
-f:drivers/net/wireless/intel/iwlwifi/fw/dbg.h
-f:drivers/net/wireless/intel/iwlwifi/fw/debugfs.c
-f:drivers/net/wireless/intel/iwlwifi/fw/debugfs.h
-f:drivers/net/wireless/intel/iwlwifi/fw/dhc-utils.h
-f:drivers/net/wireless/intel/iwlwifi/fw/dump.c
-f:drivers/net/wireless/intel/iwlwifi/fw/error-dump.h
-f:drivers/net/wireless/intel/iwlwifi/fw/file.h
-f:drivers/net/wireless/intel/iwlwifi/fw/img.c
-f:drivers/net/wireless/intel/iwlwifi/fw/img.h
-f:drivers/net/wireless/intel/iwlwifi/fw/init.c
-f:drivers/net/wireless/intel/iwlwifi/fw/notif-wait.c
-f:drivers/net/wireless/intel/iwlwifi/fw/notif-wait.h
-f:drivers/net/wireless/intel/iwlwifi/fw/paging.c
-f:drivers/net/wireless/intel/iwlwifi/fw/pnvm.c
-f:drivers/net/wireless/intel/iwlwifi/fw/pnvm.h
-f:drivers/net/wireless/intel/iwlwifi/fw/regulatory.c
-f:drivers/net/wireless/intel/iwlwifi/fw/regulatory.h
-f:drivers/net/wireless/intel/iwlwifi/fw/rs.c
-f:drivers/net/wireless/intel/iwlwifi/fw/runtime.h
-f:drivers/net/wireless/intel/iwlwifi/fw/smem.c
-f:drivers/net/wireless/intel/iwlwifi/fw/uefi.c
-f:drivers/net/wireless/intel/iwlwifi/fw/uefi.h
-f:drivers/net/wireless/intel/iwlwifi/iwl-agn-hw.h
-f:drivers/net/wireless/intel/iwlwifi/iwl-config.h
-f:drivers/net/wireless/intel/iwlwifi/iwl-csr.h
-f:drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c
-f:drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.h
-f:drivers/net/wireless/intel/iwlwifi/iwl-debug.c
-f:drivers/net/wireless/intel/iwlwifi/iwl-debug.h
-f:drivers/net/wireless/intel/iwlwifi/iwl-devtrace-data.h
-f:drivers/net/wireless/intel/iwlwifi/iwl-devtrace-io.h
-f:drivers/net/wireless/intel/iwlwifi/iwl-devtrace-iwlwifi.h
-f:drivers/net/wireless/intel/iwlwifi/iwl-devtrace-msg.h
-f:drivers/net/wireless/intel/iwlwifi/iwl-devtrace-ucode.h
-f:drivers/net/wireless/intel/iwlwifi/iwl-devtrace.c
-f:drivers/net/wireless/intel/iwlwifi/iwl-devtrace.h
-f:drivers/net/wireless/intel/iwlwifi/iwl-drv.c
-f:drivers/net/wireless/intel/iwlwifi/iwl-drv.h
-f:drivers/net/wireless/intel/iwlwifi/iwl-fh.h
-f:drivers/net/wireless/intel/iwlwifi/iwl-io.c
-f:drivers/net/wireless/intel/iwlwifi/iwl-io.h
-f:drivers/net/wireless/intel/iwlwifi/iwl-modparams.h
-f:drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
-f:drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h
-f:drivers/net/wireless/intel/iwlwifi/iwl-nvm-utils.c
-f:drivers/net/wireless/intel/iwlwifi/iwl-nvm-utils.h
-f:drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h
-f:drivers/net/wireless/intel/iwlwifi/iwl-phy-db.c
-f:drivers/net/wireless/intel/iwlwifi/iwl-phy-db.h
-f:drivers/net/wireless/intel/iwlwifi/iwl-prph.h
-f:drivers/net/wireless/intel/iwlwifi/iwl-scd.h
-f:drivers/net/wireless/intel/iwlwifi/iwl-trans.c
-f:drivers/net/wireless/intel/iwlwifi/iwl-trans.h
-f:drivers/net/wireless/intel/iwlwifi/iwl-utils.c
-f:drivers/net/wireless/intel/iwlwifi/iwl-utils.h
-f:drivers/net/wireless/intel/iwlwifi/mei/Makefile
-f:drivers/net/wireless/intel/iwlwifi/mei/internal.h
-f:drivers/net/wireless/intel/iwlwifi/mei/iwl-mei.h
-f:drivers/net/wireless/intel/iwlwifi/mei/main.c
-f:drivers/net/wireless/intel/iwlwifi/mei/net.c
-f:drivers/net/wireless/intel/iwlwifi/mei/sap.h
-f:drivers/net/wireless/intel/iwlwifi/mei/trace-data.h
-f:drivers/net/wireless/intel/iwlwifi/mei/trace.c
-f:drivers/net/wireless/intel/iwlwifi/mei/trace.h
-f:drivers/net/wireless/intel/iwlwifi/mld/Makefile
-f:drivers/net/wireless/intel/iwlwifi/mld/agg.c
-f:drivers/net/wireless/intel/iwlwifi/mld/agg.h
-f:drivers/net/wireless/intel/iwlwifi/mld/ap.c
-f:drivers/net/wireless/intel/iwlwifi/mld/ap.h
-f:drivers/net/wireless/intel/iwlwifi/mld/coex.c
-f:drivers/net/wireless/intel/iwlwifi/mld/coex.h
-f:drivers/net/wireless/intel/iwlwifi/mld/constants.h
-f:drivers/net/wireless/intel/iwlwifi/mld/d3.c
-f:drivers/net/wireless/intel/iwlwifi/mld/d3.h
-f:drivers/net/wireless/intel/iwlwifi/mld/debugfs.c
-f:drivers/net/wireless/intel/iwlwifi/mld/debugfs.h
-f:drivers/net/wireless/intel/iwlwifi/mld/ftm-initiator.c
-f:drivers/net/wireless/intel/iwlwifi/mld/ftm-initiator.h
-f:drivers/net/wireless/intel/iwlwifi/mld/fw.c
-f:drivers/net/wireless/intel/iwlwifi/mld/hcmd.h
-f:drivers/net/wireless/intel/iwlwifi/mld/iface.c
-f:drivers/net/wireless/intel/iwlwifi/mld/iface.h
-f:drivers/net/wireless/intel/iwlwifi/mld/key.c
-f:drivers/net/wireless/intel/iwlwifi/mld/key.h
-f:drivers/net/wireless/intel/iwlwifi/mld/led.c
-f:drivers/net/wireless/intel/iwlwifi/mld/led.h
-f:drivers/net/wireless/intel/iwlwifi/mld/link.c
-f:drivers/net/wireless/intel/iwlwifi/mld/link.h
-f:drivers/net/wireless/intel/iwlwifi/mld/low_latency.c
-f:drivers/net/wireless/intel/iwlwifi/mld/low_latency.h
-f:drivers/net/wireless/intel/iwlwifi/mld/mac80211.c
-f:drivers/net/wireless/intel/iwlwifi/mld/mac80211.h
-f:drivers/net/wireless/intel/iwlwifi/mld/mcc.c
-f:drivers/net/wireless/intel/iwlwifi/mld/mcc.h
-f:drivers/net/wireless/intel/iwlwifi/mld/mld.c
-f:drivers/net/wireless/intel/iwlwifi/mld/mld.h
-f:drivers/net/wireless/intel/iwlwifi/mld/mlo.c
-f:drivers/net/wireless/intel/iwlwifi/mld/mlo.h
-f:drivers/net/wireless/intel/iwlwifi/mld/notif.c
-f:drivers/net/wireless/intel/iwlwifi/mld/notif.h
-f:drivers/net/wireless/intel/iwlwifi/mld/phy.c
-f:drivers/net/wireless/intel/iwlwifi/mld/phy.h
-f:drivers/net/wireless/intel/iwlwifi/mld/power.c
-f:drivers/net/wireless/intel/iwlwifi/mld/power.h
-f:drivers/net/wireless/intel/iwlwifi/mld/ptp.c
-f:drivers/net/wireless/intel/iwlwifi/mld/ptp.h
-f:drivers/net/wireless/intel/iwlwifi/mld/regulatory.c
-f:drivers/net/wireless/intel/iwlwifi/mld/regulatory.h
-f:drivers/net/wireless/intel/iwlwifi/mld/roc.c
-f:drivers/net/wireless/intel/iwlwifi/mld/roc.h
-f:drivers/net/wireless/intel/iwlwifi/mld/rx.c
-f:drivers/net/wireless/intel/iwlwifi/mld/rx.h
-f:drivers/net/wireless/intel/iwlwifi/mld/scan.c
-f:drivers/net/wireless/intel/iwlwifi/mld/scan.h
-f:drivers/net/wireless/intel/iwlwifi/mld/session-protect.c
-f:drivers/net/wireless/intel/iwlwifi/mld/session-protect.h
-f:drivers/net/wireless/intel/iwlwifi/mld/sta.c
-f:drivers/net/wireless/intel/iwlwifi/mld/sta.h
-f:drivers/net/wireless/intel/iwlwifi/mld/stats.c
-f:drivers/net/wireless/intel/iwlwifi/mld/stats.h
-f:drivers/net/wireless/intel/iwlwifi/mld/tests/Makefile
-f:drivers/net/wireless/intel/iwlwifi/mld/tests/agg.c
-f:drivers/net/wireless/intel/iwlwifi/mld/tests/hcmd.c
-f:drivers/net/wireless/intel/iwlwifi/mld/tests/link-selection.c
-f:drivers/net/wireless/intel/iwlwifi/mld/tests/link.c
-f:drivers/net/wireless/intel/iwlwifi/mld/tests/module.c
-f:drivers/net/wireless/intel/iwlwifi/mld/tests/rx.c
-f:drivers/net/wireless/intel/iwlwifi/mld/tests/utils.c
-f:drivers/net/wireless/intel/iwlwifi/mld/tests/utils.h
-f:drivers/net/wireless/intel/iwlwifi/mld/thermal.c
-f:drivers/net/wireless/intel/iwlwifi/mld/thermal.h
-f:drivers/net/wireless/intel/iwlwifi/mld/time_sync.c
-f:drivers/net/wireless/intel/iwlwifi/mld/time_sync.h
-f:drivers/net/wireless/intel/iwlwifi/mld/tlc.c
-f:drivers/net/wireless/intel/iwlwifi/mld/tlc.h
-f:drivers/net/wireless/intel/iwlwifi/mld/tx.c
-f:drivers/net/wireless/intel/iwlwifi/mld/tx.h
-f:drivers/net/wireless/intel/iwlwifi/mvm/Makefile
-f:drivers/net/wireless/intel/iwlwifi/mvm/binding.c
-f:drivers/net/wireless/intel/iwlwifi/mvm/coex.c
-f:drivers/net/wireless/intel/iwlwifi/mvm/constants.h
-f:drivers/net/wireless/intel/iwlwifi/mvm/d3.c
-f:drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c
-f:drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
-f:drivers/net/wireless/intel/iwlwifi/mvm/debugfs.h
-f:drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c
-f:drivers/net/wireless/intel/iwlwifi/mvm/ftm-responder.c
-f:drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h
-f:drivers/net/wireless/intel/iwlwifi/mvm/fw.c
-f:drivers/net/wireless/intel/iwlwifi/mvm/led.c
-f:drivers/net/wireless/intel/iwlwifi/mvm/link.c
-f:drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
-f:drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
-f:drivers/net/wireless/intel/iwlwifi/mvm/mld-key.c
-f:drivers/net/wireless/intel/iwlwifi/mvm/mld-mac.c
-f:drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c
-f:drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c
-f:drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
-f:drivers/net/wireless/intel/iwlwifi/mvm/nvm.c
-f:drivers/net/wireless/intel/iwlwifi/mvm/offloading.c
-f:drivers/net/wireless/intel/iwlwifi/mvm/ops.c
-f:drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c
-f:drivers/net/wireless/intel/iwlwifi/mvm/power.c
-f:drivers/net/wireless/intel/iwlwifi/mvm/ptp.c
-f:drivers/net/wireless/intel/iwlwifi/mvm/quota.c
-f:drivers/net/wireless/intel/iwlwifi/mvm/rfi.c
-f:drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c
-f:drivers/net/wireless/intel/iwlwifi/mvm/rs.c
-f:drivers/net/wireless/intel/iwlwifi/mvm/rs.h
-f:drivers/net/wireless/intel/iwlwifi/mvm/rx.c
-f:drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
-f:drivers/net/wireless/intel/iwlwifi/mvm/scan.c
-f:drivers/net/wireless/intel/iwlwifi/mvm/sf.c
-f:drivers/net/wireless/intel/iwlwifi/mvm/sta.c
-f:drivers/net/wireless/intel/iwlwifi/mvm/sta.h
-f:drivers/net/wireless/intel/iwlwifi/mvm/tdls.c
-f:drivers/net/wireless/intel/iwlwifi/mvm/testmode.h
-f:drivers/net/wireless/intel/iwlwifi/mvm/tests/Makefile
-f:drivers/net/wireless/intel/iwlwifi/mvm/tests/hcmd.c
-f:drivers/net/wireless/intel/iwlwifi/mvm/tests/links.c
-f:drivers/net/wireless/intel/iwlwifi/mvm/tests/module.c
-f:drivers/net/wireless/intel/iwlwifi/mvm/time-event.c
-f:drivers/net/wireless/intel/iwlwifi/mvm/time-event.h
-f:drivers/net/wireless/intel/iwlwifi/mvm/time-sync.c
-f:drivers/net/wireless/intel/iwlwifi/mvm/time-sync.h
-f:drivers/net/wireless/intel/iwlwifi/mvm/tt.c
-f:drivers/net/wireless/intel/iwlwifi/mvm/tx.c
-f:drivers/net/wireless/intel/iwlwifi/mvm/utils.c
-f:drivers/net/wireless/intel/iwlwifi/mvm/vendor-cmd.c
-f:drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-v2.c
-f:drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c
-f:drivers/net/wireless/intel/iwlwifi/pcie/drv.c
-f:drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/internal.h
-f:drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/rx.c
-f:drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans-gen2.c
-f:drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c
-f:drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx-gen2.c
-f:drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx.c
-f:drivers/net/wireless/intel/iwlwifi/pcie/iwl-context-info-v2.h
-f:drivers/net/wireless/intel/iwlwifi/pcie/iwl-context-info.h
-f:drivers/net/wireless/intel/iwlwifi/pcie/utils.c
-f:drivers/net/wireless/intel/iwlwifi/pcie/utils.h
-f:drivers/net/wireless/intel/iwlwifi/tests/Makefile
-f:drivers/net/wireless/intel/iwlwifi/tests/devinfo.c
-f:drivers/net/wireless/intel/iwlwifi/tests/module.c
-f:drivers/net/wireless/intel/iwlwifi/tests/utils.c
-f:drivers/net/wireless/intersil/Kconfig
-f:drivers/net/wireless/intersil/Makefile
-f:drivers/net/wireless/intersil/p54/Kconfig
-f:drivers/net/wireless/intersil/p54/Makefile
-f:drivers/net/wireless/intersil/p54/eeprom.c
-f:drivers/net/wireless/intersil/p54/eeprom.h
-f:drivers/net/wireless/intersil/p54/fwio.c
-f:drivers/net/wireless/intersil/p54/led.c
-f:drivers/net/wireless/intersil/p54/lmac.h
-f:drivers/net/wireless/intersil/p54/main.c
-f:drivers/net/wireless/intersil/p54/p54.h
-f:drivers/net/wireless/intersil/p54/p54pci.c
-f:drivers/net/wireless/intersil/p54/p54pci.h
-f:drivers/net/wireless/intersil/p54/p54spi.c
-f:drivers/net/wireless/intersil/p54/p54spi.h
-f:drivers/net/wireless/intersil/p54/p54spi_eeprom.h
-f:drivers/net/wireless/intersil/p54/p54usb.c
-f:drivers/net/wireless/intersil/p54/p54usb.h
-f:drivers/net/wireless/intersil/p54/txrx.c
-f:drivers/net/wireless/marvell/Kconfig
-f:drivers/net/wireless/marvell/Makefile
-f:drivers/net/wireless/marvell/libertas/Kconfig
-f:drivers/net/wireless/marvell/libertas/LICENSE
-f:drivers/net/wireless/marvell/libertas/Makefile
-f:drivers/net/wireless/marvell/libertas/README
-f:drivers/net/wireless/marvell/libertas/cfg.c
-f:drivers/net/wireless/marvell/libertas/cfg.h
-f:drivers/net/wireless/marvell/libertas/cmd.c
-f:drivers/net/wireless/marvell/libertas/cmd.h
-f:drivers/net/wireless/marvell/libertas/cmdresp.c
-f:drivers/net/wireless/marvell/libertas/debugfs.c
-f:drivers/net/wireless/marvell/libertas/debugfs.h
-f:drivers/net/wireless/marvell/libertas/decl.h
-f:drivers/net/wireless/marvell/libertas/defs.h
-f:drivers/net/wireless/marvell/libertas/dev.h
-f:drivers/net/wireless/marvell/libertas/ethtool.c
-f:drivers/net/wireless/marvell/libertas/firmware.c
-f:drivers/net/wireless/marvell/libertas/host.h
-f:drivers/net/wireless/marvell/libertas/if_sdio.c
-f:drivers/net/wireless/marvell/libertas/if_sdio.h
-f:drivers/net/wireless/marvell/libertas/if_spi.c
-f:drivers/net/wireless/marvell/libertas/if_spi.h
-f:drivers/net/wireless/marvell/libertas/if_usb.c
-f:drivers/net/wireless/marvell/libertas/if_usb.h
-f:drivers/net/wireless/marvell/libertas/main.c
-f:drivers/net/wireless/marvell/libertas/mesh.c
-f:drivers/net/wireless/marvell/libertas/mesh.h
-f:drivers/net/wireless/marvell/libertas/radiotap.h
-f:drivers/net/wireless/marvell/libertas/rx.c
-f:drivers/net/wireless/marvell/libertas/tx.c
-f:drivers/net/wireless/marvell/libertas/types.h
-f:drivers/net/wireless/marvell/libertas_tf/Kconfig
-f:drivers/net/wireless/marvell/libertas_tf/Makefile
-f:drivers/net/wireless/marvell/libertas_tf/cmd.c
-f:drivers/net/wireless/marvell/libertas_tf/deb_defs.h
-f:drivers/net/wireless/marvell/libertas_tf/if_usb.c
-f:drivers/net/wireless/marvell/libertas_tf/if_usb.h
-f:drivers/net/wireless/marvell/libertas_tf/libertas_tf.h
-f:drivers/net/wireless/marvell/libertas_tf/main.c
-f:drivers/net/wireless/marvell/mwifiex/11ac.c
-f:drivers/net/wireless/marvell/mwifiex/11ac.h
-f:drivers/net/wireless/marvell/mwifiex/11h.c
-f:drivers/net/wireless/marvell/mwifiex/11n.c
-f:drivers/net/wireless/marvell/mwifiex/11n.h
-f:drivers/net/wireless/marvell/mwifiex/11n_aggr.c
-f:drivers/net/wireless/marvell/mwifiex/11n_aggr.h
-f:drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c
-f:drivers/net/wireless/marvell/mwifiex/11n_rxreorder.h
-f:drivers/net/wireless/marvell/mwifiex/Kconfig
-f:drivers/net/wireless/marvell/mwifiex/Makefile
-f:drivers/net/wireless/marvell/mwifiex/README
-f:drivers/net/wireless/marvell/mwifiex/cfg80211.c
-f:drivers/net/wireless/marvell/mwifiex/cfg80211.h
-f:drivers/net/wireless/marvell/mwifiex/cfp.c
-f:drivers/net/wireless/marvell/mwifiex/cmdevt.c
-f:drivers/net/wireless/marvell/mwifiex/debugfs.c
-f:drivers/net/wireless/marvell/mwifiex/decl.h
-f:drivers/net/wireless/marvell/mwifiex/ethtool.c
-f:drivers/net/wireless/marvell/mwifiex/fw.h
-f:drivers/net/wireless/marvell/mwifiex/ie.c
-f:drivers/net/wireless/marvell/mwifiex/init.c
-f:drivers/net/wireless/marvell/mwifiex/ioctl.h
-f:drivers/net/wireless/marvell/mwifiex/join.c
-f:drivers/net/wireless/marvell/mwifiex/main.c
-f:drivers/net/wireless/marvell/mwifiex/main.h
-f:drivers/net/wireless/marvell/mwifiex/pcie.c
-f:drivers/net/wireless/marvell/mwifiex/pcie.h
-f:drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
-f:drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
-f:drivers/net/wireless/marvell/mwifiex/scan.c
-f:drivers/net/wireless/marvell/mwifiex/sdio.c
-f:drivers/net/wireless/marvell/mwifiex/sdio.h
-f:drivers/net/wireless/marvell/mwifiex/sta_cmd.c
-f:drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
-f:drivers/net/wireless/marvell/mwifiex/sta_event.c
-f:drivers/net/wireless/marvell/mwifiex/sta_ioctl.c
-f:drivers/net/wireless/marvell/mwifiex/sta_rx.c
-f:drivers/net/wireless/marvell/mwifiex/sta_tx.c
-f:drivers/net/wireless/marvell/mwifiex/tdls.c
-f:drivers/net/wireless/marvell/mwifiex/txrx.c
-f:drivers/net/wireless/marvell/mwifiex/uap_cmd.c
-f:drivers/net/wireless/marvell/mwifiex/uap_event.c
-f:drivers/net/wireless/marvell/mwifiex/uap_txrx.c
-f:drivers/net/wireless/marvell/mwifiex/usb.c
-f:drivers/net/wireless/marvell/mwifiex/usb.h
-f:drivers/net/wireless/marvell/mwifiex/util.c
-f:drivers/net/wireless/marvell/mwifiex/util.h
-f:drivers/net/wireless/marvell/mwifiex/wmm.c
-f:drivers/net/wireless/marvell/mwifiex/wmm.h
-f:drivers/net/wireless/marvell/mwl8k.c
-f:drivers/net/wireless/mediatek/Kconfig
-f:drivers/net/wireless/mediatek/Makefile
-f:drivers/net/wireless/mediatek/mt76/Kconfig
-f:drivers/net/wireless/mediatek/mt76/Makefile
-f:drivers/net/wireless/mediatek/mt76/agg-rx.c
-f:drivers/net/wireless/mediatek/mt76/channel.c
-f:drivers/net/wireless/mediatek/mt76/debugfs.c
-f:drivers/net/wireless/mediatek/mt76/dma.c
-f:drivers/net/wireless/mediatek/mt76/dma.h
-f:drivers/net/wireless/mediatek/mt76/eeprom.c
-f:drivers/net/wireless/mediatek/mt76/mac80211.c
-f:drivers/net/wireless/mediatek/mt76/mcu.c
-f:drivers/net/wireless/mediatek/mt76/mmio.c
-f:drivers/net/wireless/mediatek/mt76/mt76.h
-f:drivers/net/wireless/mediatek/mt76/mt7603/Kconfig
-f:drivers/net/wireless/mediatek/mt76/mt7603/Makefile
-f:drivers/net/wireless/mediatek/mt76/mt7603/beacon.c
-f:drivers/net/wireless/mediatek/mt76/mt7603/core.c
-f:drivers/net/wireless/mediatek/mt76/mt7603/debugfs.c
-f:drivers/net/wireless/mediatek/mt76/mt7603/dma.c
-f:drivers/net/wireless/mediatek/mt76/mt7603/eeprom.c
-f:drivers/net/wireless/mediatek/mt76/mt7603/eeprom.h
-f:drivers/net/wireless/mediatek/mt76/mt7603/init.c
-f:drivers/net/wireless/mediatek/mt76/mt7603/mac.c
-f:drivers/net/wireless/mediatek/mt76/mt7603/mac.h
-f:drivers/net/wireless/mediatek/mt76/mt7603/main.c
-f:drivers/net/wireless/mediatek/mt76/mt7603/mcu.c
-f:drivers/net/wireless/mediatek/mt76/mt7603/mcu.h
-f:drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h
-f:drivers/net/wireless/mediatek/mt76/mt7603/pci.c
-f:drivers/net/wireless/mediatek/mt76/mt7603/regs.h
-f:drivers/net/wireless/mediatek/mt76/mt7603/soc.c
-f:drivers/net/wireless/mediatek/mt76/mt7615/Kconfig
-f:drivers/net/wireless/mediatek/mt76/mt7615/Makefile
-f:drivers/net/wireless/mediatek/mt76/mt7615/debugfs.c
-f:drivers/net/wireless/mediatek/mt76/mt7615/dma.c
-f:drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c
-f:drivers/net/wireless/mediatek/mt76/mt7615/eeprom.h
-f:drivers/net/wireless/mediatek/mt76/mt7615/init.c
-f:drivers/net/wireless/mediatek/mt76/mt7615/mac.c
-f:drivers/net/wireless/mediatek/mt76/mt7615/mac.h
-f:drivers/net/wireless/mediatek/mt76/mt7615/main.c
-f:drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
-f:drivers/net/wireless/mediatek/mt76/mt7615/mcu.h
-f:drivers/net/wireless/mediatek/mt76/mt7615/mmio.c
-f:drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
-f:drivers/net/wireless/mediatek/mt76/mt7615/mt7615_trace.h
-f:drivers/net/wireless/mediatek/mt76/mt7615/pci.c
-f:drivers/net/wireless/mediatek/mt76/mt7615/pci_init.c
-f:drivers/net/wireless/mediatek/mt76/mt7615/pci_mac.c
-f:drivers/net/wireless/mediatek/mt76/mt7615/regs.h
-f:drivers/net/wireless/mediatek/mt76/mt7615/sdio.c
-f:drivers/net/wireless/mediatek/mt76/mt7615/sdio_mcu.c
-f:drivers/net/wireless/mediatek/mt76/mt7615/soc.c
-f:drivers/net/wireless/mediatek/mt76/mt7615/testmode.c
-f:drivers/net/wireless/mediatek/mt76/mt7615/trace.c
-f:drivers/net/wireless/mediatek/mt76/mt7615/usb.c
-f:drivers/net/wireless/mediatek/mt76/mt7615/usb_mcu.c
-f:drivers/net/wireless/mediatek/mt76/mt7615/usb_sdio.c
-f:drivers/net/wireless/mediatek/mt76/mt76_connac.h
-f:drivers/net/wireless/mediatek/mt76/mt76_connac2_mac.h
-f:drivers/net/wireless/mediatek/mt76/mt76_connac3_mac.c
-f:drivers/net/wireless/mediatek/mt76/mt76_connac3_mac.h
-f:drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c
-f:drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
-f:drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
-f:drivers/net/wireless/mediatek/mt76/mt76x0/Kconfig
-f:drivers/net/wireless/mediatek/mt76/mt76x0/Makefile
-f:drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c
-f:drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.h
-f:drivers/net/wireless/mediatek/mt76/mt76x0/init.c
-f:drivers/net/wireless/mediatek/mt76/mt76x0/initvals.h
-f:drivers/net/wireless/mediatek/mt76/mt76x0/initvals_init.h
-f:drivers/net/wireless/mediatek/mt76/mt76x0/initvals_phy.h
-f:drivers/net/wireless/mediatek/mt76/mt76x0/main.c
-f:drivers/net/wireless/mediatek/mt76/mt76x0/mcu.h
-f:drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h
-f:drivers/net/wireless/mediatek/mt76/mt76x0/pci.c
-f:drivers/net/wireless/mediatek/mt76/mt76x0/pci_mcu.c
-f:drivers/net/wireless/mediatek/mt76/mt76x0/phy.c
-f:drivers/net/wireless/mediatek/mt76/mt76x0/phy.h
-f:drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
-f:drivers/net/wireless/mediatek/mt76/mt76x0/usb_mcu.c
-f:drivers/net/wireless/mediatek/mt76/mt76x02.h
-f:drivers/net/wireless/mediatek/mt76/mt76x02_beacon.c
-f:drivers/net/wireless/mediatek/mt76/mt76x02_debugfs.c
-f:drivers/net/wireless/mediatek/mt76/mt76x02_dfs.c
-f:drivers/net/wireless/mediatek/mt76/mt76x02_dfs.h
-f:drivers/net/wireless/mediatek/mt76/mt76x02_dma.h
-f:drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.c
-f:drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.h
-f:drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
-f:drivers/net/wireless/mediatek/mt76/mt76x02_mac.h
-f:drivers/net/wireless/mediatek/mt76/mt76x02_mcu.c
-f:drivers/net/wireless/mediatek/mt76/mt76x02_mcu.h
-f:drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
-f:drivers/net/wireless/mediatek/mt76/mt76x02_phy.c
-f:drivers/net/wireless/mediatek/mt76/mt76x02_phy.h
-f:drivers/net/wireless/mediatek/mt76/mt76x02_regs.h
-f:drivers/net/wireless/mediatek/mt76/mt76x02_trace.c
-f:drivers/net/wireless/mediatek/mt76/mt76x02_trace.h
-f:drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c
-f:drivers/net/wireless/mediatek/mt76/mt76x02_usb.h
-f:drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c
-f:drivers/net/wireless/mediatek/mt76/mt76x02_usb_mcu.c
-f:drivers/net/wireless/mediatek/mt76/mt76x02_util.c
-f:drivers/net/wireless/mediatek/mt76/mt76x2/Kconfig
-f:drivers/net/wireless/mediatek/mt76/mt76x2/Makefile
-f:drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.c
-f:drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.h
-f:drivers/net/wireless/mediatek/mt76/mt76x2/init.c
-f:drivers/net/wireless/mediatek/mt76/mt76x2/mac.c
-f:drivers/net/wireless/mediatek/mt76/mt76x2/mac.h
-f:drivers/net/wireless/mediatek/mt76/mt76x2/mcu.c
-f:drivers/net/wireless/mediatek/mt76/mt76x2/mcu.h
-f:drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h
-f:drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2u.h
-f:drivers/net/wireless/mediatek/mt76/mt76x2/pci.c
-f:drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c
-f:drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c
-f:drivers/net/wireless/mediatek/mt76/mt76x2/pci_mcu.c
-f:drivers/net/wireless/mediatek/mt76/mt76x2/pci_phy.c
-f:drivers/net/wireless/mediatek/mt76/mt76x2/phy.c
-f:drivers/net/wireless/mediatek/mt76/mt76x2/usb.c
-f:drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c
-f:drivers/net/wireless/mediatek/mt76/mt76x2/usb_mac.c
-f:drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.c
-f:drivers/net/wireless/mediatek/mt76/mt76x2/usb_mcu.c
-f:drivers/net/wireless/mediatek/mt76/mt76x2/usb_phy.c
-f:drivers/net/wireless/mediatek/mt76/mt7915/Kconfig
-f:drivers/net/wireless/mediatek/mt76/mt7915/Makefile
-f:drivers/net/wireless/mediatek/mt76/mt7915/coredump.c
-f:drivers/net/wireless/mediatek/mt76/mt7915/coredump.h
-f:drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
-f:drivers/net/wireless/mediatek/mt76/mt7915/dma.c
-f:drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c
-f:drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h
-f:drivers/net/wireless/mediatek/mt76/mt7915/init.c
-f:drivers/net/wireless/mediatek/mt76/mt7915/mac.c
-f:drivers/net/wireless/mediatek/mt76/mt7915/mac.h
-f:drivers/net/wireless/mediatek/mt76/mt7915/main.c
-f:drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
-f:drivers/net/wireless/mediatek/mt76/mt7915/mcu.h
-f:drivers/net/wireless/mediatek/mt76/mt7915/mmio.c
-f:drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
-f:drivers/net/wireless/mediatek/mt76/mt7915/pci.c
-f:drivers/net/wireless/mediatek/mt76/mt7915/regs.h
-f:drivers/net/wireless/mediatek/mt76/mt7915/soc.c
-f:drivers/net/wireless/mediatek/mt76/mt7915/testmode.c
-f:drivers/net/wireless/mediatek/mt76/mt7915/testmode.h
-f:drivers/net/wireless/mediatek/mt76/mt7921/Kconfig
-f:drivers/net/wireless/mediatek/mt76/mt7921/Makefile
-f:drivers/net/wireless/mediatek/mt76/mt7921/debugfs.c
-f:drivers/net/wireless/mediatek/mt76/mt7921/init.c
-f:drivers/net/wireless/mediatek/mt76/mt7921/mac.c
-f:drivers/net/wireless/mediatek/mt76/mt7921/main.c
-f:drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
-f:drivers/net/wireless/mediatek/mt76/mt7921/mcu.h
-f:drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
-f:drivers/net/wireless/mediatek/mt76/mt7921/pci.c
-f:drivers/net/wireless/mediatek/mt76/mt7921/pci_mac.c
-f:drivers/net/wireless/mediatek/mt76/mt7921/pci_mcu.c
-f:drivers/net/wireless/mediatek/mt76/mt7921/regs.h
-f:drivers/net/wireless/mediatek/mt76/mt7921/sdio.c
-f:drivers/net/wireless/mediatek/mt76/mt7921/sdio_mac.c
-f:drivers/net/wireless/mediatek/mt76/mt7921/sdio_mcu.c
-f:drivers/net/wireless/mediatek/mt76/mt7921/testmode.c
-f:drivers/net/wireless/mediatek/mt76/mt7921/usb.c
-f:drivers/net/wireless/mediatek/mt76/mt7925/Kconfig
-f:drivers/net/wireless/mediatek/mt76/mt7925/Makefile
-f:drivers/net/wireless/mediatek/mt76/mt7925/debugfs.c
-f:drivers/net/wireless/mediatek/mt76/mt7925/init.c
-f:drivers/net/wireless/mediatek/mt76/mt7925/mac.c
-f:drivers/net/wireless/mediatek/mt76/mt7925/mac.h
-f:drivers/net/wireless/mediatek/mt76/mt7925/main.c
-f:drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
-f:drivers/net/wireless/mediatek/mt76/mt7925/mcu.h
-f:drivers/net/wireless/mediatek/mt76/mt7925/mt7925.h
-f:drivers/net/wireless/mediatek/mt76/mt7925/pci.c
-f:drivers/net/wireless/mediatek/mt76/mt7925/pci_mac.c
-f:drivers/net/wireless/mediatek/mt76/mt7925/pci_mcu.c
-f:drivers/net/wireless/mediatek/mt76/mt7925/regs.h
-f:drivers/net/wireless/mediatek/mt76/mt7925/testmode.c
-f:drivers/net/wireless/mediatek/mt76/mt7925/usb.c
-f:drivers/net/wireless/mediatek/mt76/mt792x.h
-f:drivers/net/wireless/mediatek/mt76/mt792x_acpi_sar.c
-f:drivers/net/wireless/mediatek/mt76/mt792x_acpi_sar.h
-f:drivers/net/wireless/mediatek/mt76/mt792x_core.c
-f:drivers/net/wireless/mediatek/mt76/mt792x_debugfs.c
-f:drivers/net/wireless/mediatek/mt76/mt792x_dma.c
-f:drivers/net/wireless/mediatek/mt76/mt792x_mac.c
-f:drivers/net/wireless/mediatek/mt76/mt792x_regs.h
-f:drivers/net/wireless/mediatek/mt76/mt792x_trace.c
-f:drivers/net/wireless/mediatek/mt76/mt792x_trace.h
-f:drivers/net/wireless/mediatek/mt76/mt792x_usb.c
-f:drivers/net/wireless/mediatek/mt76/mt7996/Kconfig
-f:drivers/net/wireless/mediatek/mt76/mt7996/Makefile
-f:drivers/net/wireless/mediatek/mt76/mt7996/coredump.c
-f:drivers/net/wireless/mediatek/mt76/mt7996/coredump.h
-f:drivers/net/wireless/mediatek/mt76/mt7996/debugfs.c
-f:drivers/net/wireless/mediatek/mt76/mt7996/dma.c
-f:drivers/net/wireless/mediatek/mt76/mt7996/eeprom.c
-f:drivers/net/wireless/mediatek/mt76/mt7996/eeprom.h
-f:drivers/net/wireless/mediatek/mt76/mt7996/init.c
-f:drivers/net/wireless/mediatek/mt76/mt7996/mac.c
-f:drivers/net/wireless/mediatek/mt76/mt7996/mac.h
-f:drivers/net/wireless/mediatek/mt76/mt7996/main.c
-f:drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
-f:drivers/net/wireless/mediatek/mt76/mt7996/mcu.h
-f:drivers/net/wireless/mediatek/mt76/mt7996/mmio.c
-f:drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
-f:drivers/net/wireless/mediatek/mt76/mt7996/pci.c
-f:drivers/net/wireless/mediatek/mt76/mt7996/regs.h
-f:drivers/net/wireless/mediatek/mt76/pci.c
-f:drivers/net/wireless/mediatek/mt76/scan.c
-f:drivers/net/wireless/mediatek/mt76/sdio.c
-f:drivers/net/wireless/mediatek/mt76/sdio.h
-f:drivers/net/wireless/mediatek/mt76/sdio_txrx.c
-f:drivers/net/wireless/mediatek/mt76/testmode.c
-f:drivers/net/wireless/mediatek/mt76/testmode.h
-f:drivers/net/wireless/mediatek/mt76/trace.c
-f:drivers/net/wireless/mediatek/mt76/trace.h
-f:drivers/net/wireless/mediatek/mt76/tx.c
-f:drivers/net/wireless/mediatek/mt76/usb.c
-f:drivers/net/wireless/mediatek/mt76/usb_trace.c
-f:drivers/net/wireless/mediatek/mt76/usb_trace.h
-f:drivers/net/wireless/mediatek/mt76/util.c
-f:drivers/net/wireless/mediatek/mt76/util.h
-f:drivers/net/wireless/mediatek/mt76/wed.c
-f:drivers/net/wireless/mediatek/mt7601u/Kconfig
-f:drivers/net/wireless/mediatek/mt7601u/Makefile
-f:drivers/net/wireless/mediatek/mt7601u/core.c
-f:drivers/net/wireless/mediatek/mt7601u/debugfs.c
-f:drivers/net/wireless/mediatek/mt7601u/dma.c
-f:drivers/net/wireless/mediatek/mt7601u/dma.h
-f:drivers/net/wireless/mediatek/mt7601u/eeprom.c
-f:drivers/net/wireless/mediatek/mt7601u/eeprom.h
-f:drivers/net/wireless/mediatek/mt7601u/init.c
-f:drivers/net/wireless/mediatek/mt7601u/initvals.h
-f:drivers/net/wireless/mediatek/mt7601u/initvals_phy.h
-f:drivers/net/wireless/mediatek/mt7601u/mac.c
-f:drivers/net/wireless/mediatek/mt7601u/mac.h
-f:drivers/net/wireless/mediatek/mt7601u/main.c
-f:drivers/net/wireless/mediatek/mt7601u/mcu.c
-f:drivers/net/wireless/mediatek/mt7601u/mcu.h
-f:drivers/net/wireless/mediatek/mt7601u/mt7601u.h
-f:drivers/net/wireless/mediatek/mt7601u/phy.c
-f:drivers/net/wireless/mediatek/mt7601u/regs.h
-f:drivers/net/wireless/mediatek/mt7601u/trace.c
-f:drivers/net/wireless/mediatek/mt7601u/trace.h
-f:drivers/net/wireless/mediatek/mt7601u/tx.c
-f:drivers/net/wireless/mediatek/mt7601u/usb.c
-f:drivers/net/wireless/mediatek/mt7601u/usb.h
-f:drivers/net/wireless/mediatek/mt7601u/util.c
-f:drivers/net/wireless/microchip/Kconfig
-f:drivers/net/wireless/microchip/Makefile
-f:drivers/net/wireless/microchip/wilc1000/Kconfig
-f:drivers/net/wireless/microchip/wilc1000/Makefile
-f:drivers/net/wireless/microchip/wilc1000/cfg80211.c
-f:drivers/net/wireless/microchip/wilc1000/cfg80211.h
-f:drivers/net/wireless/microchip/wilc1000/fw.h
-f:drivers/net/wireless/microchip/wilc1000/hif.c
-f:drivers/net/wireless/microchip/wilc1000/hif.h
-f:drivers/net/wireless/microchip/wilc1000/mon.c
-f:drivers/net/wireless/microchip/wilc1000/netdev.c
-f:drivers/net/wireless/microchip/wilc1000/netdev.h
-f:drivers/net/wireless/microchip/wilc1000/sdio.c
-f:drivers/net/wireless/microchip/wilc1000/spi.c
-f:drivers/net/wireless/microchip/wilc1000/wlan.c
-f:drivers/net/wireless/microchip/wilc1000/wlan.h
-f:drivers/net/wireless/microchip/wilc1000/wlan_cfg.c
-f:drivers/net/wireless/microchip/wilc1000/wlan_cfg.h
-f:drivers/net/wireless/microchip/wilc1000/wlan_if.h
-f:drivers/net/wireless/purelifi/Kconfig
-f:drivers/net/wireless/purelifi/Makefile
-f:drivers/net/wireless/purelifi/plfxlc/Kconfig
-f:drivers/net/wireless/purelifi/plfxlc/Makefile
-f:drivers/net/wireless/purelifi/plfxlc/chip.c
-f:drivers/net/wireless/purelifi/plfxlc/chip.h
-f:drivers/net/wireless/purelifi/plfxlc/firmware.c
-f:drivers/net/wireless/purelifi/plfxlc/intf.h
-f:drivers/net/wireless/purelifi/plfxlc/mac.c
-f:drivers/net/wireless/purelifi/plfxlc/mac.h
-f:drivers/net/wireless/purelifi/plfxlc/usb.c
-f:drivers/net/wireless/purelifi/plfxlc/usb.h
-f:drivers/net/wireless/quantenna/Kconfig
-f:drivers/net/wireless/quantenna/Makefile
-f:drivers/net/wireless/quantenna/qtnfmac/Kconfig
-f:drivers/net/wireless/quantenna/qtnfmac/Makefile
-f:drivers/net/wireless/quantenna/qtnfmac/bus.h
-f:drivers/net/wireless/quantenna/qtnfmac/cfg80211.c
-f:drivers/net/wireless/quantenna/qtnfmac/cfg80211.h
-f:drivers/net/wireless/quantenna/qtnfmac/commands.c
-f:drivers/net/wireless/quantenna/qtnfmac/commands.h
-f:drivers/net/wireless/quantenna/qtnfmac/core.c
-f:drivers/net/wireless/quantenna/qtnfmac/core.h
-f:drivers/net/wireless/quantenna/qtnfmac/debug.c
-f:drivers/net/wireless/quantenna/qtnfmac/debug.h
-f:drivers/net/wireless/quantenna/qtnfmac/event.c
-f:drivers/net/wireless/quantenna/qtnfmac/event.h
-f:drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c
-f:drivers/net/wireless/quantenna/qtnfmac/pcie/pcie_priv.h
-f:drivers/net/wireless/quantenna/qtnfmac/pcie/pearl_pcie.c
-f:drivers/net/wireless/quantenna/qtnfmac/pcie/pearl_pcie_ipc.h
-f:drivers/net/wireless/quantenna/qtnfmac/pcie/pearl_pcie_regs.h
-f:drivers/net/wireless/quantenna/qtnfmac/pcie/topaz_pcie.c
-f:drivers/net/wireless/quantenna/qtnfmac/pcie/topaz_pcie_ipc.h
-f:drivers/net/wireless/quantenna/qtnfmac/pcie/topaz_pcie_regs.h
-f:drivers/net/wireless/quantenna/qtnfmac/qlink.h
-f:drivers/net/wireless/quantenna/qtnfmac/qlink_util.c
-f:drivers/net/wireless/quantenna/qtnfmac/qlink_util.h
-f:drivers/net/wireless/quantenna/qtnfmac/qtn_hw_ids.h
-f:drivers/net/wireless/quantenna/qtnfmac/shm_ipc.c
-f:drivers/net/wireless/quantenna/qtnfmac/shm_ipc.h
-f:drivers/net/wireless/quantenna/qtnfmac/shm_ipc_defs.h
-f:drivers/net/wireless/quantenna/qtnfmac/switchdev.h
-f:drivers/net/wireless/quantenna/qtnfmac/trans.c
-f:drivers/net/wireless/quantenna/qtnfmac/trans.h
-f:drivers/net/wireless/quantenna/qtnfmac/util.c
-f:drivers/net/wireless/quantenna/qtnfmac/util.h
-f:drivers/net/wireless/ralink/Kconfig
-f:drivers/net/wireless/ralink/Makefile
-f:drivers/net/wireless/ralink/rt2x00/Kconfig
-f:drivers/net/wireless/ralink/rt2x00/Makefile
-f:drivers/net/wireless/ralink/rt2x00/rt2400pci.c
-f:drivers/net/wireless/ralink/rt2x00/rt2400pci.h
-f:drivers/net/wireless/ralink/rt2x00/rt2500pci.c
-f:drivers/net/wireless/ralink/rt2x00/rt2500pci.h
-f:drivers/net/wireless/ralink/rt2x00/rt2500usb.c
-f:drivers/net/wireless/ralink/rt2x00/rt2500usb.h
-f:drivers/net/wireless/ralink/rt2x00/rt2800.h
-f:drivers/net/wireless/ralink/rt2x00/rt2800lib.c
-f:drivers/net/wireless/ralink/rt2x00/rt2800lib.h
-f:drivers/net/wireless/ralink/rt2x00/rt2800mmio.c
-f:drivers/net/wireless/ralink/rt2x00/rt2800mmio.h
-f:drivers/net/wireless/ralink/rt2x00/rt2800pci.c
-f:drivers/net/wireless/ralink/rt2x00/rt2800pci.h
-f:drivers/net/wireless/ralink/rt2x00/rt2800soc.c
-f:drivers/net/wireless/ralink/rt2x00/rt2800usb.c
-f:drivers/net/wireless/ralink/rt2x00/rt2800usb.h
-f:drivers/net/wireless/ralink/rt2x00/rt2x00.h
-f:drivers/net/wireless/ralink/rt2x00/rt2x00config.c
-f:drivers/net/wireless/ralink/rt2x00/rt2x00crypto.c
-f:drivers/net/wireless/ralink/rt2x00/rt2x00debug.c
-f:drivers/net/wireless/ralink/rt2x00/rt2x00debug.h
-f:drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
-f:drivers/net/wireless/ralink/rt2x00/rt2x00dump.h
-f:drivers/net/wireless/ralink/rt2x00/rt2x00firmware.c
-f:drivers/net/wireless/ralink/rt2x00/rt2x00leds.c
-f:drivers/net/wireless/ralink/rt2x00/rt2x00leds.h
-f:drivers/net/wireless/ralink/rt2x00/rt2x00lib.h
-f:drivers/net/wireless/ralink/rt2x00/rt2x00link.c
-f:drivers/net/wireless/ralink/rt2x00/rt2x00mac.c
-f:drivers/net/wireless/ralink/rt2x00/rt2x00mmio.c
-f:drivers/net/wireless/ralink/rt2x00/rt2x00mmio.h
-f:drivers/net/wireless/ralink/rt2x00/rt2x00pci.c
-f:drivers/net/wireless/ralink/rt2x00/rt2x00pci.h
-f:drivers/net/wireless/ralink/rt2x00/rt2x00queue.c
-f:drivers/net/wireless/ralink/rt2x00/rt2x00queue.h
-f:drivers/net/wireless/ralink/rt2x00/rt2x00reg.h
-f:drivers/net/wireless/ralink/rt2x00/rt2x00usb.c
-f:drivers/net/wireless/ralink/rt2x00/rt2x00usb.h
-f:drivers/net/wireless/ralink/rt2x00/rt61pci.c
-f:drivers/net/wireless/ralink/rt2x00/rt61pci.h
-f:drivers/net/wireless/ralink/rt2x00/rt73usb.c
-f:drivers/net/wireless/ralink/rt2x00/rt73usb.h
-f:drivers/net/wireless/realtek/Kconfig
-f:drivers/net/wireless/realtek/Makefile
-f:drivers/net/wireless/realtek/rtl818x/Kconfig
-f:drivers/net/wireless/realtek/rtl818x/Makefile
-f:drivers/net/wireless/realtek/rtl818x/rtl8180/Makefile
-f:drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c
-f:drivers/net/wireless/realtek/rtl818x/rtl8180/grf5101.c
-f:drivers/net/wireless/realtek/rtl818x/rtl8180/grf5101.h
-f:drivers/net/wireless/realtek/rtl818x/rtl8180/max2820.c
-f:drivers/net/wireless/realtek/rtl818x/rtl8180/max2820.h
-f:drivers/net/wireless/realtek/rtl818x/rtl8180/rtl8180.h
-f:drivers/net/wireless/realtek/rtl818x/rtl8180/rtl8225.c
-f:drivers/net/wireless/realtek/rtl818x/rtl8180/rtl8225.h
-f:drivers/net/wireless/realtek/rtl818x/rtl8180/rtl8225se.c
-f:drivers/net/wireless/realtek/rtl818x/rtl8180/rtl8225se.h
-f:drivers/net/wireless/realtek/rtl818x/rtl8180/sa2400.c
-f:drivers/net/wireless/realtek/rtl818x/rtl8180/sa2400.h
-f:drivers/net/wireless/realtek/rtl818x/rtl8187/Makefile
-f:drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c
-f:drivers/net/wireless/realtek/rtl818x/rtl8187/leds.c
-f:drivers/net/wireless/realtek/rtl818x/rtl8187/leds.h
-f:drivers/net/wireless/realtek/rtl818x/rtl8187/rfkill.c
-f:drivers/net/wireless/realtek/rtl818x/rtl8187/rfkill.h
-f:drivers/net/wireless/realtek/rtl818x/rtl8187/rtl8187.h
-f:drivers/net/wireless/realtek/rtl818x/rtl8187/rtl8225.c
-f:drivers/net/wireless/realtek/rtl818x/rtl8187/rtl8225.h
-f:drivers/net/wireless/realtek/rtl818x/rtl818x.h
-f:drivers/net/wireless/realtek/rtl8xxxu/8188e.c
-f:drivers/net/wireless/realtek/rtl8xxxu/8188f.c
-f:drivers/net/wireless/realtek/rtl8xxxu/8192c.c
-f:drivers/net/wireless/realtek/rtl8xxxu/8192e.c
-f:drivers/net/wireless/realtek/rtl8xxxu/8192f.c
-f:drivers/net/wireless/realtek/rtl8xxxu/8710b.c
-f:drivers/net/wireless/realtek/rtl8xxxu/8723a.c
-f:drivers/net/wireless/realtek/rtl8xxxu/8723b.c
-f:drivers/net/wireless/realtek/rtl8xxxu/Kconfig
-f:drivers/net/wireless/realtek/rtl8xxxu/Makefile
-f:drivers/net/wireless/realtek/rtl8xxxu/core.c
-f:drivers/net/wireless/realtek/rtl8xxxu/regs.h
-f:drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
-f:drivers/net/wireless/realtek/rtlwifi/Kconfig
-f:drivers/net/wireless/realtek/rtlwifi/Makefile
-f:drivers/net/wireless/realtek/rtlwifi/base.c
-f:drivers/net/wireless/realtek/rtlwifi/base.h
-f:drivers/net/wireless/realtek/rtlwifi/btcoexist/Makefile
-f:drivers/net/wireless/realtek/rtlwifi/btcoexist/halbt_precomp.h
-f:drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8192e2ant.c
-f:drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8192e2ant.h
-f:drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c
-f:drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.h
-f:drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c
-f:drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.h
-f:drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c
-f:drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.h
-f:drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c
-f:drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.h
-f:drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8822bwifionly.c
-f:drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8822bwifionly.h
-f:drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c
-f:drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h
-f:drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.c
-f:drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.h
-f:drivers/net/wireless/realtek/rtlwifi/cam.c
-f:drivers/net/wireless/realtek/rtlwifi/cam.h
-f:drivers/net/wireless/realtek/rtlwifi/core.c
-f:drivers/net/wireless/realtek/rtlwifi/core.h
-f:drivers/net/wireless/realtek/rtlwifi/debug.c
-f:drivers/net/wireless/realtek/rtlwifi/debug.h
-f:drivers/net/wireless/realtek/rtlwifi/efuse.c
-f:drivers/net/wireless/realtek/rtlwifi/efuse.h
-f:drivers/net/wireless/realtek/rtlwifi/pci.c
-f:drivers/net/wireless/realtek/rtlwifi/pci.h
-f:drivers/net/wireless/realtek/rtlwifi/ps.c
-f:drivers/net/wireless/realtek/rtlwifi/ps.h
-f:drivers/net/wireless/realtek/rtlwifi/pwrseqcmd.h
-f:drivers/net/wireless/realtek/rtlwifi/rc.c
-f:drivers/net/wireless/realtek/rtlwifi/rc.h
-f:drivers/net/wireless/realtek/rtlwifi/regd.c
-f:drivers/net/wireless/realtek/rtlwifi/regd.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8188ee/Makefile
-f:drivers/net/wireless/realtek/rtlwifi/rtl8188ee/def.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8188ee/led.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8188ee/led.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8188ee/pwrseq.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8188ee/pwrseq.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8188ee/reg.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8188ee/rf.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8188ee/rf.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8188ee/table.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8188ee/table.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192c/Makefile
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192c/dm_common.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192c/dm_common.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192c/main.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192ce/Makefile
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192ce/def.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192ce/dm.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192ce/dm.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192ce/hw.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192ce/hw.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192ce/led.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192ce/led.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192ce/reg.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192ce/rf.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192ce/rf.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192ce/table.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192ce/table.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192cu/Makefile
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192cu/def.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192cu/dm.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192cu/dm.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192cu/hw.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192cu/hw.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192cu/led.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192cu/led.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192cu/mac.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192cu/mac.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192cu/phy.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192cu/phy.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192cu/reg.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192cu/rf.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192cu/rf.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192cu/table.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192cu/table.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192cu/trx.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192cu/trx.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192d/Makefile
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192d/def.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192d/dm_common.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192d/dm_common.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192d/fw_common.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192d/fw_common.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192d/hw_common.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192d/hw_common.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192d/main.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192d/phy_common.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192d/phy_common.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192d/reg.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192d/rf_common.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192d/rf_common.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192d/trx_common.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192d/trx_common.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192de/Makefile
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192de/fw.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192de/fw.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192de/led.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192de/led.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192de/rf.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192de/rf.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192de/table.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192de/table.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192du/Makefile
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192du/dm.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192du/dm.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192du/fw.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192du/fw.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192du/hw.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192du/hw.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192du/led.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192du/led.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192du/phy.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192du/phy.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192du/rf.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192du/rf.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192du/sw.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192du/table.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192du/table.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192du/trx.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192du/trx.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192ee/Makefile
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192ee/def.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192ee/dm.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192ee/dm.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192ee/led.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192ee/led.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192ee/pwrseq.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192ee/pwrseq.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192ee/reg.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192ee/rf.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192ee/rf.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192ee/table.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192ee/table.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192se/Makefile
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192se/def.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192se/dm.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192se/dm.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192se/fw.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192se/fw.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192se/hw.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192se/hw.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192se/led.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192se/led.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192se/phy.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192se/phy.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192se/reg.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192se/rf.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192se/rf.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192se/table.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192se/table.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192se/trx.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8192se/trx.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723ae/Makefile
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723ae/btc.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723ae/def.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723ae/dm.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723ae/dm.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_bt_coexist.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_bt_coexist.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_btc.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_btc.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723ae/led.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723ae/led.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723ae/pwrseq.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723ae/pwrseq.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723ae/reg.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723ae/rf.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723ae/rf.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723ae/table.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723ae/table.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723be/Makefile
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723be/def.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723be/dm.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723be/dm.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723be/led.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723be/led.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723be/phy.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723be/phy.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723be/pwrseq.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723be/pwrseq.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723be/reg.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723be/rf.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723be/rf.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723be/table.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723be/table.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723com/Makefile
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723com/dm_common.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723com/dm_common.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723com/fw_common.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723com/fw_common.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723com/main.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723com/phy_common.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8723com/phy_common.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8821ae/Makefile
-f:drivers/net/wireless/realtek/rtlwifi/rtl8821ae/def.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8821ae/led.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8821ae/led.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8821ae/pwrseq.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8821ae/pwrseq.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8821ae/reg.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8821ae/rf.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8821ae/rf.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8821ae/table.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8821ae/table.h
-f:drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.c
-f:drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.h
-f:drivers/net/wireless/realtek/rtlwifi/stats.c
-f:drivers/net/wireless/realtek/rtlwifi/stats.h
-f:drivers/net/wireless/realtek/rtlwifi/usb.c
-f:drivers/net/wireless/realtek/rtlwifi/usb.h
-f:drivers/net/wireless/realtek/rtlwifi/wifi.h
-f:drivers/net/wireless/realtek/rtw88/Kconfig
-f:drivers/net/wireless/realtek/rtw88/Makefile
-f:drivers/net/wireless/realtek/rtw88/bf.c
-f:drivers/net/wireless/realtek/rtw88/bf.h
-f:drivers/net/wireless/realtek/rtw88/coex.c
-f:drivers/net/wireless/realtek/rtw88/coex.h
-f:drivers/net/wireless/realtek/rtw88/debug.c
-f:drivers/net/wireless/realtek/rtw88/debug.h
-f:drivers/net/wireless/realtek/rtw88/efuse.c
-f:drivers/net/wireless/realtek/rtw88/efuse.h
-f:drivers/net/wireless/realtek/rtw88/fw.c
-f:drivers/net/wireless/realtek/rtw88/fw.h
-f:drivers/net/wireless/realtek/rtw88/hci.h
-f:drivers/net/wireless/realtek/rtw88/led.c
-f:drivers/net/wireless/realtek/rtw88/led.h
-f:drivers/net/wireless/realtek/rtw88/mac.c
-f:drivers/net/wireless/realtek/rtw88/mac.h
-f:drivers/net/wireless/realtek/rtw88/mac80211.c
-f:drivers/net/wireless/realtek/rtw88/main.c
-f:drivers/net/wireless/realtek/rtw88/main.h
-f:drivers/net/wireless/realtek/rtw88/pci.c
-f:drivers/net/wireless/realtek/rtw88/pci.h
-f:drivers/net/wireless/realtek/rtw88/phy.c
-f:drivers/net/wireless/realtek/rtw88/phy.h
-f:drivers/net/wireless/realtek/rtw88/ps.c
-f:drivers/net/wireless/realtek/rtw88/ps.h
-f:drivers/net/wireless/realtek/rtw88/reg.h
-f:drivers/net/wireless/realtek/rtw88/regd.c
-f:drivers/net/wireless/realtek/rtw88/regd.h
-f:drivers/net/wireless/realtek/rtw88/rtw8703b.c
-f:drivers/net/wireless/realtek/rtw88/rtw8703b.h
-f:drivers/net/wireless/realtek/rtw88/rtw8703b_tables.c
-f:drivers/net/wireless/realtek/rtw88/rtw8703b_tables.h
-f:drivers/net/wireless/realtek/rtw88/rtw8723cs.c
-f:drivers/net/wireless/realtek/rtw88/rtw8723d.c
-f:drivers/net/wireless/realtek/rtw88/rtw8723d.h
-f:drivers/net/wireless/realtek/rtw88/rtw8723d_table.c
-f:drivers/net/wireless/realtek/rtw88/rtw8723d_table.h
-f:drivers/net/wireless/realtek/rtw88/rtw8723de.c
-f:drivers/net/wireless/realtek/rtw88/rtw8723ds.c
-f:drivers/net/wireless/realtek/rtw88/rtw8723du.c
-f:drivers/net/wireless/realtek/rtw88/rtw8723x.c
-f:drivers/net/wireless/realtek/rtw88/rtw8723x.h
-f:drivers/net/wireless/realtek/rtw88/rtw8812a.c
-f:drivers/net/wireless/realtek/rtw88/rtw8812a.h
-f:drivers/net/wireless/realtek/rtw88/rtw8812a_table.c
-f:drivers/net/wireless/realtek/rtw88/rtw8812a_table.h
-f:drivers/net/wireless/realtek/rtw88/rtw8812au.c
-f:drivers/net/wireless/realtek/rtw88/rtw8814a.c
-f:drivers/net/wireless/realtek/rtw88/rtw8814a.h
-f:drivers/net/wireless/realtek/rtw88/rtw8814a_table.c
-f:drivers/net/wireless/realtek/rtw88/rtw8814a_table.h
-f:drivers/net/wireless/realtek/rtw88/rtw8814ae.c
-f:drivers/net/wireless/realtek/rtw88/rtw8814au.c
-f:drivers/net/wireless/realtek/rtw88/rtw8821a.c
-f:drivers/net/wireless/realtek/rtw88/rtw8821a.h
-f:drivers/net/wireless/realtek/rtw88/rtw8821a_table.c
-f:drivers/net/wireless/realtek/rtw88/rtw8821a_table.h
-f:drivers/net/wireless/realtek/rtw88/rtw8821au.c
-f:drivers/net/wireless/realtek/rtw88/rtw8821c.c
-f:drivers/net/wireless/realtek/rtw88/rtw8821c.h
-f:drivers/net/wireless/realtek/rtw88/rtw8821c_table.c
-f:drivers/net/wireless/realtek/rtw88/rtw8821c_table.h
-f:drivers/net/wireless/realtek/rtw88/rtw8821ce.c
-f:drivers/net/wireless/realtek/rtw88/rtw8821cs.c
-f:drivers/net/wireless/realtek/rtw88/rtw8821cu.c
-f:drivers/net/wireless/realtek/rtw88/rtw8822b.c
-f:drivers/net/wireless/realtek/rtw88/rtw8822b.h
-f:drivers/net/wireless/realtek/rtw88/rtw8822b_table.c
-f:drivers/net/wireless/realtek/rtw88/rtw8822b_table.h
-f:drivers/net/wireless/realtek/rtw88/rtw8822be.c
-f:drivers/net/wireless/realtek/rtw88/rtw8822bs.c
-f:drivers/net/wireless/realtek/rtw88/rtw8822bu.c
-f:drivers/net/wireless/realtek/rtw88/rtw8822c.c
-f:drivers/net/wireless/realtek/rtw88/rtw8822c.h
-f:drivers/net/wireless/realtek/rtw88/rtw8822c_table.c
-f:drivers/net/wireless/realtek/rtw88/rtw8822c_table.h
-f:drivers/net/wireless/realtek/rtw88/rtw8822ce.c
-f:drivers/net/wireless/realtek/rtw88/rtw8822cs.c
-f:drivers/net/wireless/realtek/rtw88/rtw8822cu.c
-f:drivers/net/wireless/realtek/rtw88/rtw88xxa.c
-f:drivers/net/wireless/realtek/rtw88/rtw88xxa.h
-f:drivers/net/wireless/realtek/rtw88/rx.c
-f:drivers/net/wireless/realtek/rtw88/rx.h
-f:drivers/net/wireless/realtek/rtw88/sar.c
-f:drivers/net/wireless/realtek/rtw88/sar.h
-f:drivers/net/wireless/realtek/rtw88/sdio.c
-f:drivers/net/wireless/realtek/rtw88/sdio.h
-f:drivers/net/wireless/realtek/rtw88/sec.c
-f:drivers/net/wireless/realtek/rtw88/sec.h
-f:drivers/net/wireless/realtek/rtw88/tx.c
-f:drivers/net/wireless/realtek/rtw88/tx.h
-f:drivers/net/wireless/realtek/rtw88/usb.c
-f:drivers/net/wireless/realtek/rtw88/usb.h
-f:drivers/net/wireless/realtek/rtw88/util.c
-f:drivers/net/wireless/realtek/rtw88/util.h
-f:drivers/net/wireless/realtek/rtw88/wow.c
-f:drivers/net/wireless/realtek/rtw88/wow.h
-f:drivers/net/wireless/realtek/rtw89/Kconfig
-f:drivers/net/wireless/realtek/rtw89/Makefile
-f:drivers/net/wireless/realtek/rtw89/acpi.c
-f:drivers/net/wireless/realtek/rtw89/acpi.h
-f:drivers/net/wireless/realtek/rtw89/cam.c
-f:drivers/net/wireless/realtek/rtw89/cam.h
-f:drivers/net/wireless/realtek/rtw89/chan.c
-f:drivers/net/wireless/realtek/rtw89/chan.h
-f:drivers/net/wireless/realtek/rtw89/coex.c
-f:drivers/net/wireless/realtek/rtw89/coex.h
-f:drivers/net/wireless/realtek/rtw89/core.c
-f:drivers/net/wireless/realtek/rtw89/core.h
-f:drivers/net/wireless/realtek/rtw89/debug.c
-f:drivers/net/wireless/realtek/rtw89/debug.h
-f:drivers/net/wireless/realtek/rtw89/efuse.c
-f:drivers/net/wireless/realtek/rtw89/efuse.h
-f:drivers/net/wireless/realtek/rtw89/efuse_be.c
-f:drivers/net/wireless/realtek/rtw89/fw.c
-f:drivers/net/wireless/realtek/rtw89/fw.h
-f:drivers/net/wireless/realtek/rtw89/mac.c
-f:drivers/net/wireless/realtek/rtw89/mac.h
-f:drivers/net/wireless/realtek/rtw89/mac80211.c
-f:drivers/net/wireless/realtek/rtw89/mac_be.c
-f:drivers/net/wireless/realtek/rtw89/pci.c
-f:drivers/net/wireless/realtek/rtw89/pci.h
-f:drivers/net/wireless/realtek/rtw89/pci_be.c
-f:drivers/net/wireless/realtek/rtw89/phy.c
-f:drivers/net/wireless/realtek/rtw89/phy.h
-f:drivers/net/wireless/realtek/rtw89/phy_be.c
-f:drivers/net/wireless/realtek/rtw89/ps.c
-f:drivers/net/wireless/realtek/rtw89/ps.h
-f:drivers/net/wireless/realtek/rtw89/reg.h
-f:drivers/net/wireless/realtek/rtw89/regd.c
-f:drivers/net/wireless/realtek/rtw89/rtw8851b.c
-f:drivers/net/wireless/realtek/rtw89/rtw8851b.h
-f:drivers/net/wireless/realtek/rtw89/rtw8851b_rfk.c
-f:drivers/net/wireless/realtek/rtw89/rtw8851b_rfk.h
-f:drivers/net/wireless/realtek/rtw89/rtw8851b_rfk_table.c
-f:drivers/net/wireless/realtek/rtw89/rtw8851b_rfk_table.h
-f:drivers/net/wireless/realtek/rtw89/rtw8851b_table.c
-f:drivers/net/wireless/realtek/rtw89/rtw8851b_table.h
-f:drivers/net/wireless/realtek/rtw89/rtw8851be.c
-f:drivers/net/wireless/realtek/rtw89/rtw8851bu.c
-f:drivers/net/wireless/realtek/rtw89/rtw8852a.c
-f:drivers/net/wireless/realtek/rtw89/rtw8852a.h
-f:drivers/net/wireless/realtek/rtw89/rtw8852a_rfk.c
-f:drivers/net/wireless/realtek/rtw89/rtw8852a_rfk.h
-f:drivers/net/wireless/realtek/rtw89/rtw8852a_rfk_table.c
-f:drivers/net/wireless/realtek/rtw89/rtw8852a_rfk_table.h
-f:drivers/net/wireless/realtek/rtw89/rtw8852a_table.c
-f:drivers/net/wireless/realtek/rtw89/rtw8852a_table.h
-f:drivers/net/wireless/realtek/rtw89/rtw8852ae.c
-f:drivers/net/wireless/realtek/rtw89/rtw8852b.c
-f:drivers/net/wireless/realtek/rtw89/rtw8852b.h
-f:drivers/net/wireless/realtek/rtw89/rtw8852b_common.c
-f:drivers/net/wireless/realtek/rtw89/rtw8852b_common.h
-f:drivers/net/wireless/realtek/rtw89/rtw8852b_rfk.c
-f:drivers/net/wireless/realtek/rtw89/rtw8852b_rfk.h
-f:drivers/net/wireless/realtek/rtw89/rtw8852b_rfk_table.c
-f:drivers/net/wireless/realtek/rtw89/rtw8852b_rfk_table.h
-f:drivers/net/wireless/realtek/rtw89/rtw8852b_table.c
-f:drivers/net/wireless/realtek/rtw89/rtw8852b_table.h
-f:drivers/net/wireless/realtek/rtw89/rtw8852be.c
-f:drivers/net/wireless/realtek/rtw89/rtw8852bt.c
-f:drivers/net/wireless/realtek/rtw89/rtw8852bt.h
-f:drivers/net/wireless/realtek/rtw89/rtw8852bt_rfk.c
-f:drivers/net/wireless/realtek/rtw89/rtw8852bt_rfk.h
-f:drivers/net/wireless/realtek/rtw89/rtw8852bt_rfk_table.c
-f:drivers/net/wireless/realtek/rtw89/rtw8852bt_rfk_table.h
-f:drivers/net/wireless/realtek/rtw89/rtw8852bte.c
-f:drivers/net/wireless/realtek/rtw89/rtw8852bu.c
-f:drivers/net/wireless/realtek/rtw89/rtw8852c.c
-f:drivers/net/wireless/realtek/rtw89/rtw8852c.h
-f:drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.c
-f:drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.h
-f:drivers/net/wireless/realtek/rtw89/rtw8852c_rfk_table.c
-f:drivers/net/wireless/realtek/rtw89/rtw8852c_rfk_table.h
-f:drivers/net/wireless/realtek/rtw89/rtw8852c_table.c
-f:drivers/net/wireless/realtek/rtw89/rtw8852c_table.h
-f:drivers/net/wireless/realtek/rtw89/rtw8852ce.c
-f:drivers/net/wireless/realtek/rtw89/rtw8922a.c
-f:drivers/net/wireless/realtek/rtw89/rtw8922a.h
-f:drivers/net/wireless/realtek/rtw89/rtw8922a_rfk.c
-f:drivers/net/wireless/realtek/rtw89/rtw8922a_rfk.h
-f:drivers/net/wireless/realtek/rtw89/rtw8922ae.c
-f:drivers/net/wireless/realtek/rtw89/sar.c
-f:drivers/net/wireless/realtek/rtw89/sar.h
-f:drivers/net/wireless/realtek/rtw89/ser.c
-f:drivers/net/wireless/realtek/rtw89/ser.h
-f:drivers/net/wireless/realtek/rtw89/txrx.h
-f:drivers/net/wireless/realtek/rtw89/usb.c
-f:drivers/net/wireless/realtek/rtw89/usb.h
-f:drivers/net/wireless/realtek/rtw89/util.c
-f:drivers/net/wireless/realtek/rtw89/util.h
-f:drivers/net/wireless/realtek/rtw89/wow.c
-f:drivers/net/wireless/realtek/rtw89/wow.h
-f:drivers/net/wireless/rsi/Kconfig
-f:drivers/net/wireless/rsi/Makefile
-f:drivers/net/wireless/rsi/rsi_91x_coex.c
-f:drivers/net/wireless/rsi/rsi_91x_core.c
-f:drivers/net/wireless/rsi/rsi_91x_debugfs.c
-f:drivers/net/wireless/rsi/rsi_91x_hal.c
-f:drivers/net/wireless/rsi/rsi_91x_mac80211.c
-f:drivers/net/wireless/rsi/rsi_91x_main.c
-f:drivers/net/wireless/rsi/rsi_91x_mgmt.c
-f:drivers/net/wireless/rsi/rsi_91x_ps.c
-f:drivers/net/wireless/rsi/rsi_91x_sdio.c
-f:drivers/net/wireless/rsi/rsi_91x_sdio_ops.c
-f:drivers/net/wireless/rsi/rsi_91x_usb.c
-f:drivers/net/wireless/rsi/rsi_91x_usb_ops.c
-f:drivers/net/wireless/rsi/rsi_boot_params.h
-f:drivers/net/wireless/rsi/rsi_coex.h
-f:drivers/net/wireless/rsi/rsi_common.h
-f:drivers/net/wireless/rsi/rsi_debugfs.h
-f:drivers/net/wireless/rsi/rsi_hal.h
-f:drivers/net/wireless/rsi/rsi_main.h
-f:drivers/net/wireless/rsi/rsi_mgmt.h
-f:drivers/net/wireless/rsi/rsi_ps.h
-f:drivers/net/wireless/rsi/rsi_sdio.h
-f:drivers/net/wireless/rsi/rsi_usb.h
-f:drivers/net/wireless/silabs/Kconfig
-f:drivers/net/wireless/silabs/Makefile
-f:drivers/net/wireless/silabs/wfx/Kconfig
-f:drivers/net/wireless/silabs/wfx/Makefile
-f:drivers/net/wireless/silabs/wfx/bh.c
-f:drivers/net/wireless/silabs/wfx/bh.h
-f:drivers/net/wireless/silabs/wfx/bus.h
-f:drivers/net/wireless/silabs/wfx/bus_sdio.c
-f:drivers/net/wireless/silabs/wfx/bus_spi.c
-f:drivers/net/wireless/silabs/wfx/data_rx.c
-f:drivers/net/wireless/silabs/wfx/data_rx.h
-f:drivers/net/wireless/silabs/wfx/data_tx.c
-f:drivers/net/wireless/silabs/wfx/data_tx.h
-f:drivers/net/wireless/silabs/wfx/debug.c
-f:drivers/net/wireless/silabs/wfx/debug.h
-f:drivers/net/wireless/silabs/wfx/fwio.c
-f:drivers/net/wireless/silabs/wfx/fwio.h
-f:drivers/net/wireless/silabs/wfx/hif_api_cmd.h
-f:drivers/net/wireless/silabs/wfx/hif_api_general.h
-f:drivers/net/wireless/silabs/wfx/hif_api_mib.h
-f:drivers/net/wireless/silabs/wfx/hif_rx.c
-f:drivers/net/wireless/silabs/wfx/hif_rx.h
-f:drivers/net/wireless/silabs/wfx/hif_tx.c
-f:drivers/net/wireless/silabs/wfx/hif_tx.h
-f:drivers/net/wireless/silabs/wfx/hif_tx_mib.c
-f:drivers/net/wireless/silabs/wfx/hif_tx_mib.h
-f:drivers/net/wireless/silabs/wfx/hwio.c
-f:drivers/net/wireless/silabs/wfx/hwio.h
-f:drivers/net/wireless/silabs/wfx/key.c
-f:drivers/net/wireless/silabs/wfx/key.h
-f:drivers/net/wireless/silabs/wfx/main.c
-f:drivers/net/wireless/silabs/wfx/main.h
-f:drivers/net/wireless/silabs/wfx/queue.c
-f:drivers/net/wireless/silabs/wfx/queue.h
-f:drivers/net/wireless/silabs/wfx/scan.c
-f:drivers/net/wireless/silabs/wfx/scan.h
-f:drivers/net/wireless/silabs/wfx/sta.c
-f:drivers/net/wireless/silabs/wfx/sta.h
-f:drivers/net/wireless/silabs/wfx/traces.h
-f:drivers/net/wireless/silabs/wfx/wfx.h
-f:drivers/net/wireless/st/Kconfig
-f:drivers/net/wireless/st/Makefile
-f:drivers/net/wireless/st/cw1200/Kconfig
-f:drivers/net/wireless/st/cw1200/Makefile
-f:drivers/net/wireless/st/cw1200/bh.c
-f:drivers/net/wireless/st/cw1200/bh.h
-f:drivers/net/wireless/st/cw1200/cw1200.h
-f:drivers/net/wireless/st/cw1200/cw1200_sdio.c
-f:drivers/net/wireless/st/cw1200/cw1200_spi.c
-f:drivers/net/wireless/st/cw1200/debug.c
-f:drivers/net/wireless/st/cw1200/debug.h
-f:drivers/net/wireless/st/cw1200/fwio.c
-f:drivers/net/wireless/st/cw1200/fwio.h
-f:drivers/net/wireless/st/cw1200/hwbus.h
-f:drivers/net/wireless/st/cw1200/hwio.c
-f:drivers/net/wireless/st/cw1200/hwio.h
-f:drivers/net/wireless/st/cw1200/main.c
-f:drivers/net/wireless/st/cw1200/pm.c
-f:drivers/net/wireless/st/cw1200/pm.h
-f:drivers/net/wireless/st/cw1200/queue.c
-f:drivers/net/wireless/st/cw1200/queue.h
-f:drivers/net/wireless/st/cw1200/scan.c
-f:drivers/net/wireless/st/cw1200/scan.h
-f:drivers/net/wireless/st/cw1200/sta.c
-f:drivers/net/wireless/st/cw1200/sta.h
-f:drivers/net/wireless/st/cw1200/txrx.c
-f:drivers/net/wireless/st/cw1200/txrx.h
-f:drivers/net/wireless/st/cw1200/wsm.c
-f:drivers/net/wireless/st/cw1200/wsm.h
-f:drivers/net/wireless/ti/Kconfig
-f:drivers/net/wireless/ti/Makefile
-f:drivers/net/wireless/ti/wl1251/Kconfig
-f:drivers/net/wireless/ti/wl1251/Makefile
-f:drivers/net/wireless/ti/wl1251/acx.c
-f:drivers/net/wireless/ti/wl1251/acx.h
-f:drivers/net/wireless/ti/wl1251/boot.c
-f:drivers/net/wireless/ti/wl1251/boot.h
-f:drivers/net/wireless/ti/wl1251/cmd.c
-f:drivers/net/wireless/ti/wl1251/cmd.h
-f:drivers/net/wireless/ti/wl1251/debugfs.c
-f:drivers/net/wireless/ti/wl1251/debugfs.h
-f:drivers/net/wireless/ti/wl1251/event.c
-f:drivers/net/wireless/ti/wl1251/event.h
-f:drivers/net/wireless/ti/wl1251/init.c
-f:drivers/net/wireless/ti/wl1251/init.h
-f:drivers/net/wireless/ti/wl1251/io.c
-f:drivers/net/wireless/ti/wl1251/io.h
-f:drivers/net/wireless/ti/wl1251/main.c
-f:drivers/net/wireless/ti/wl1251/ps.c
-f:drivers/net/wireless/ti/wl1251/ps.h
-f:drivers/net/wireless/ti/wl1251/reg.h
-f:drivers/net/wireless/ti/wl1251/rx.c
-f:drivers/net/wireless/ti/wl1251/rx.h
-f:drivers/net/wireless/ti/wl1251/sdio.c
-f:drivers/net/wireless/ti/wl1251/spi.c
-f:drivers/net/wireless/ti/wl1251/spi.h
-f:drivers/net/wireless/ti/wl1251/tx.c
-f:drivers/net/wireless/ti/wl1251/tx.h
-f:drivers/net/wireless/ti/wl1251/wl1251.h
-f:drivers/net/wireless/ti/wl1251/wl12xx_80211.h
-f:drivers/net/wireless/ti/wl12xx/Kconfig
-f:drivers/net/wireless/ti/wl12xx/Makefile
-f:drivers/net/wireless/ti/wl12xx/acx.c
-f:drivers/net/wireless/ti/wl12xx/acx.h
-f:drivers/net/wireless/ti/wl12xx/cmd.c
-f:drivers/net/wireless/ti/wl12xx/cmd.h
-f:drivers/net/wireless/ti/wl12xx/conf.h
-f:drivers/net/wireless/ti/wl12xx/debugfs.c
-f:drivers/net/wireless/ti/wl12xx/debugfs.h
-f:drivers/net/wireless/ti/wl12xx/event.c
-f:drivers/net/wireless/ti/wl12xx/event.h
-f:drivers/net/wireless/ti/wl12xx/main.c
-f:drivers/net/wireless/ti/wl12xx/reg.h
-f:drivers/net/wireless/ti/wl12xx/scan.c
-f:drivers/net/wireless/ti/wl12xx/scan.h
-f:drivers/net/wireless/ti/wl12xx/wl12xx.h
-f:drivers/net/wireless/ti/wl18xx/Kconfig
-f:drivers/net/wireless/ti/wl18xx/Makefile
-f:drivers/net/wireless/ti/wl18xx/acx.c
-f:drivers/net/wireless/ti/wl18xx/acx.h
-f:drivers/net/wireless/ti/wl18xx/cmd.c
-f:drivers/net/wireless/ti/wl18xx/cmd.h
-f:drivers/net/wireless/ti/wl18xx/conf.h
-f:drivers/net/wireless/ti/wl18xx/debugfs.c
-f:drivers/net/wireless/ti/wl18xx/debugfs.h
-f:drivers/net/wireless/ti/wl18xx/event.c
-f:drivers/net/wireless/ti/wl18xx/event.h
-f:drivers/net/wireless/ti/wl18xx/io.c
-f:drivers/net/wireless/ti/wl18xx/io.h
-f:drivers/net/wireless/ti/wl18xx/main.c
-f:drivers/net/wireless/ti/wl18xx/reg.h
-f:drivers/net/wireless/ti/wl18xx/scan.c
-f:drivers/net/wireless/ti/wl18xx/scan.h
-f:drivers/net/wireless/ti/wl18xx/tx.c
-f:drivers/net/wireless/ti/wl18xx/tx.h
-f:drivers/net/wireless/ti/wl18xx/wl18xx.h
-f:drivers/net/wireless/ti/wlcore/Kconfig
-f:drivers/net/wireless/ti/wlcore/Makefile
-f:drivers/net/wireless/ti/wlcore/acx.c
-f:drivers/net/wireless/ti/wlcore/acx.h
-f:drivers/net/wireless/ti/wlcore/boot.c
-f:drivers/net/wireless/ti/wlcore/boot.h
-f:drivers/net/wireless/ti/wlcore/cmd.c
-f:drivers/net/wireless/ti/wlcore/cmd.h
-f:drivers/net/wireless/ti/wlcore/conf.h
-f:drivers/net/wireless/ti/wlcore/debug.h
-f:drivers/net/wireless/ti/wlcore/debugfs.c
-f:drivers/net/wireless/ti/wlcore/debugfs.h
-f:drivers/net/wireless/ti/wlcore/event.c
-f:drivers/net/wireless/ti/wlcore/event.h
-f:drivers/net/wireless/ti/wlcore/hw_ops.h
-f:drivers/net/wireless/ti/wlcore/ini.h
-f:drivers/net/wireless/ti/wlcore/init.c
-f:drivers/net/wireless/ti/wlcore/init.h
-f:drivers/net/wireless/ti/wlcore/io.c
-f:drivers/net/wireless/ti/wlcore/io.h
-f:drivers/net/wireless/ti/wlcore/main.c
-f:drivers/net/wireless/ti/wlcore/ps.c
-f:drivers/net/wireless/ti/wlcore/ps.h
-f:drivers/net/wireless/ti/wlcore/rx.c
-f:drivers/net/wireless/ti/wlcore/rx.h
-f:drivers/net/wireless/ti/wlcore/scan.c
-f:drivers/net/wireless/ti/wlcore/scan.h
-f:drivers/net/wireless/ti/wlcore/sdio.c
-f:drivers/net/wireless/ti/wlcore/spi.c
-f:drivers/net/wireless/ti/wlcore/sysfs.c
-f:drivers/net/wireless/ti/wlcore/sysfs.h
-f:drivers/net/wireless/ti/wlcore/testmode.c
-f:drivers/net/wireless/ti/wlcore/testmode.h
-f:drivers/net/wireless/ti/wlcore/tx.c
-f:drivers/net/wireless/ti/wlcore/tx.h
-f:drivers/net/wireless/ti/wlcore/vendor_cmd.c
-f:drivers/net/wireless/ti/wlcore/vendor_cmd.h
-f:drivers/net/wireless/ti/wlcore/wl12xx_80211.h
-f:drivers/net/wireless/ti/wlcore/wlcore.h
-f:drivers/net/wireless/ti/wlcore/wlcore_i.h
-f:drivers/net/wireless/virtual/Kconfig
-f:drivers/net/wireless/virtual/Makefile
-f:drivers/net/wireless/virtual/mac80211_hwsim.c
-f:drivers/net/wireless/virtual/mac80211_hwsim.h
-f:drivers/net/wireless/virtual/virt_wifi.c
-f:drivers/net/wireless/zydas/Kconfig
-f:drivers/net/wireless/zydas/Makefile
-f:drivers/net/wireless/zydas/zd1211rw/Kconfig
-f:drivers/net/wireless/zydas/zd1211rw/Makefile
-f:drivers/net/wireless/zydas/zd1211rw/zd_chip.c
-f:drivers/net/wireless/zydas/zd1211rw/zd_chip.h
-f:drivers/net/wireless/zydas/zd1211rw/zd_def.h
-f:drivers/net/wireless/zydas/zd1211rw/zd_mac.c
-f:drivers/net/wireless/zydas/zd1211rw/zd_mac.h
-f:drivers/net/wireless/zydas/zd1211rw/zd_rf.c
-f:drivers/net/wireless/zydas/zd1211rw/zd_rf.h
-f:drivers/net/wireless/zydas/zd1211rw/zd_rf_al2230.c
-f:drivers/net/wireless/zydas/zd1211rw/zd_rf_al7230b.c
-f:drivers/net/wireless/zydas/zd1211rw/zd_rf_rf2959.c
-f:drivers/net/wireless/zydas/zd1211rw/zd_rf_uw2453.c
-f:drivers/net/wireless/zydas/zd1211rw/zd_usb.c
-f:drivers/net/wireless/zydas/zd1211rw/zd_usb.h
-f:drivers/net/wwan/Kconfig
-f:drivers/net/wwan/Makefile
-f:drivers/net/wwan/iosm/Makefile
-f:drivers/net/wwan/iosm/iosm_ipc_chnl_cfg.c
-f:drivers/net/wwan/iosm/iosm_ipc_chnl_cfg.h
-f:drivers/net/wwan/iosm/iosm_ipc_coredump.c
-f:drivers/net/wwan/iosm/iosm_ipc_coredump.h
-f:drivers/net/wwan/iosm/iosm_ipc_debugfs.c
-f:drivers/net/wwan/iosm/iosm_ipc_debugfs.h
-f:drivers/net/wwan/iosm/iosm_ipc_devlink.c
-f:drivers/net/wwan/iosm/iosm_ipc_devlink.h
-f:drivers/net/wwan/iosm/iosm_ipc_flash.c
-f:drivers/net/wwan/iosm/iosm_ipc_flash.h
-f:drivers/net/wwan/iosm/iosm_ipc_imem.c
-f:drivers/net/wwan/iosm/iosm_ipc_imem.h
-f:drivers/net/wwan/iosm/iosm_ipc_imem_ops.c
-f:drivers/net/wwan/iosm/iosm_ipc_imem_ops.h
-f:drivers/net/wwan/iosm/iosm_ipc_irq.c
-f:drivers/net/wwan/iosm/iosm_ipc_irq.h
-f:drivers/net/wwan/iosm/iosm_ipc_mmio.c
-f:drivers/net/wwan/iosm/iosm_ipc_mmio.h
-f:drivers/net/wwan/iosm/iosm_ipc_mux.c
-f:drivers/net/wwan/iosm/iosm_ipc_mux.h
-f:drivers/net/wwan/iosm/iosm_ipc_mux_codec.c
-f:drivers/net/wwan/iosm/iosm_ipc_mux_codec.h
-f:drivers/net/wwan/iosm/iosm_ipc_pcie.c
-f:drivers/net/wwan/iosm/iosm_ipc_pcie.h
-f:drivers/net/wwan/iosm/iosm_ipc_pm.c
-f:drivers/net/wwan/iosm/iosm_ipc_pm.h
-f:drivers/net/wwan/iosm/iosm_ipc_port.c
-f:drivers/net/wwan/iosm/iosm_ipc_port.h
-f:drivers/net/wwan/iosm/iosm_ipc_protocol.c
-f:drivers/net/wwan/iosm/iosm_ipc_protocol.h
-f:drivers/net/wwan/iosm/iosm_ipc_protocol_ops.c
-f:drivers/net/wwan/iosm/iosm_ipc_protocol_ops.h
-f:drivers/net/wwan/iosm/iosm_ipc_task_queue.c
-f:drivers/net/wwan/iosm/iosm_ipc_task_queue.h
-f:drivers/net/wwan/iosm/iosm_ipc_trace.c
-f:drivers/net/wwan/iosm/iosm_ipc_trace.h
-f:drivers/net/wwan/iosm/iosm_ipc_uevent.c
-f:drivers/net/wwan/iosm/iosm_ipc_uevent.h
-f:drivers/net/wwan/iosm/iosm_ipc_wwan.c
-f:drivers/net/wwan/iosm/iosm_ipc_wwan.h
-f:drivers/net/wwan/mhi_wwan_ctrl.c
-f:drivers/net/wwan/mhi_wwan_mbim.c
-f:drivers/net/wwan/qcom_bam_dmux.c
-f:drivers/net/wwan/rpmsg_wwan_ctrl.c
-f:drivers/net/wwan/t7xx/Makefile
-f:drivers/net/wwan/t7xx/t7xx_cldma.c
-f:drivers/net/wwan/t7xx/t7xx_cldma.h
-f:drivers/net/wwan/t7xx/t7xx_dpmaif.c
-f:drivers/net/wwan/t7xx/t7xx_dpmaif.h
-f:drivers/net/wwan/t7xx/t7xx_hif_cldma.c
-f:drivers/net/wwan/t7xx/t7xx_hif_cldma.h
-f:drivers/net/wwan/t7xx/t7xx_hif_dpmaif.c
-f:drivers/net/wwan/t7xx/t7xx_hif_dpmaif.h
-f:drivers/net/wwan/t7xx/t7xx_hif_dpmaif_rx.c
-f:drivers/net/wwan/t7xx/t7xx_hif_dpmaif_rx.h
-f:drivers/net/wwan/t7xx/t7xx_hif_dpmaif_tx.c
-f:drivers/net/wwan/t7xx/t7xx_hif_dpmaif_tx.h
-f:drivers/net/wwan/t7xx/t7xx_mhccif.c
-f:drivers/net/wwan/t7xx/t7xx_mhccif.h
-f:drivers/net/wwan/t7xx/t7xx_modem_ops.c
-f:drivers/net/wwan/t7xx/t7xx_modem_ops.h
-f:drivers/net/wwan/t7xx/t7xx_netdev.c
-f:drivers/net/wwan/t7xx/t7xx_netdev.h
-f:drivers/net/wwan/t7xx/t7xx_pci.c
-f:drivers/net/wwan/t7xx/t7xx_pci.h
-f:drivers/net/wwan/t7xx/t7xx_pcie_mac.c
-f:drivers/net/wwan/t7xx/t7xx_pcie_mac.h
-f:drivers/net/wwan/t7xx/t7xx_port.h
-f:drivers/net/wwan/t7xx/t7xx_port_ctrl_msg.c
-f:drivers/net/wwan/t7xx/t7xx_port_proxy.c
-f:drivers/net/wwan/t7xx/t7xx_port_proxy.h
-f:drivers/net/wwan/t7xx/t7xx_port_trace.c
-f:drivers/net/wwan/t7xx/t7xx_port_wwan.c
-f:drivers/net/wwan/t7xx/t7xx_reg.h
-f:drivers/net/wwan/t7xx/t7xx_state_monitor.c
-f:drivers/net/wwan/t7xx/t7xx_state_monitor.h
-f:drivers/net/wwan/wwan_core.c
-f:drivers/net/wwan/wwan_hwsim.c
-f:drivers/net/xen-netback/Makefile
-f:drivers/net/xen-netback/common.h
-f:drivers/net/xen-netback/hash.c
-f:drivers/net/xen-netback/interface.c
-f:drivers/net/xen-netback/netback.c
-f:drivers/net/xen-netback/rx.c
-f:drivers/net/xen-netback/xenbus.c
-f:drivers/net/xen-netfront.c
-f:drivers/nfc/Kconfig
-f:drivers/nfc/Makefile
-f:drivers/nfc/fdp/Kconfig
-f:drivers/nfc/fdp/Makefile
-f:drivers/nfc/fdp/fdp.c
-f:drivers/nfc/fdp/fdp.h
-f:drivers/nfc/fdp/i2c.c
-f:drivers/nfc/mei_phy.c
-f:drivers/nfc/mei_phy.h
-f:drivers/nfc/microread/Kconfig
-f:drivers/nfc/microread/Makefile
-f:drivers/nfc/microread/i2c.c
-f:drivers/nfc/microread/mei.c
-f:drivers/nfc/microread/microread.c
-f:drivers/nfc/microread/microread.h
-f:drivers/nfc/nfcmrvl/Kconfig
-f:drivers/nfc/nfcmrvl/Makefile
-f:drivers/nfc/nfcmrvl/fw_dnld.c
-f:drivers/nfc/nfcmrvl/fw_dnld.h
-f:drivers/nfc/nfcmrvl/i2c.c
-f:drivers/nfc/nfcmrvl/main.c
-f:drivers/nfc/nfcmrvl/nfcmrvl.h
-f:drivers/nfc/nfcmrvl/spi.c
-f:drivers/nfc/nfcmrvl/uart.c
-f:drivers/nfc/nfcmrvl/usb.c
-f:drivers/nfc/nfcsim.c
-f:drivers/nfc/nxp-nci/Kconfig
-f:drivers/nfc/nxp-nci/Makefile
-f:drivers/nfc/nxp-nci/core.c
-f:drivers/nfc/nxp-nci/firmware.c
-f:drivers/nfc/nxp-nci/i2c.c
-f:drivers/nfc/nxp-nci/nxp-nci.h
-f:drivers/nfc/pn533/Kconfig
-f:drivers/nfc/pn533/Makefile
-f:drivers/nfc/pn533/i2c.c
-f:drivers/nfc/pn533/pn533.c
-f:drivers/nfc/pn533/pn533.h
-f:drivers/nfc/pn533/uart.c
-f:drivers/nfc/pn533/usb.c
-f:drivers/nfc/pn544/Kconfig
-f:drivers/nfc/pn544/Makefile
-f:drivers/nfc/pn544/i2c.c
-f:drivers/nfc/pn544/mei.c
-f:drivers/nfc/pn544/pn544.c
-f:drivers/nfc/pn544/pn544.h
-f:drivers/nfc/port100.c
-f:drivers/nfc/s3fwrn5/Kconfig
-f:drivers/nfc/s3fwrn5/Makefile
-f:drivers/nfc/s3fwrn5/core.c
-f:drivers/nfc/s3fwrn5/firmware.c
-f:drivers/nfc/s3fwrn5/firmware.h
-f:drivers/nfc/s3fwrn5/i2c.c
-f:drivers/nfc/s3fwrn5/nci.c
-f:drivers/nfc/s3fwrn5/nci.h
-f:drivers/nfc/s3fwrn5/phy_common.c
-f:drivers/nfc/s3fwrn5/phy_common.h
-f:drivers/nfc/s3fwrn5/s3fwrn5.h
-f:drivers/nfc/s3fwrn5/uart.c
-f:drivers/nfc/st-nci/Kconfig
-f:drivers/nfc/st-nci/Makefile
-f:drivers/nfc/st-nci/core.c
-f:drivers/nfc/st-nci/i2c.c
-f:drivers/nfc/st-nci/ndlc.c
-f:drivers/nfc/st-nci/ndlc.h
-f:drivers/nfc/st-nci/se.c
-f:drivers/nfc/st-nci/spi.c
-f:drivers/nfc/st-nci/st-nci.h
-f:drivers/nfc/st-nci/vendor_cmds.c
-f:drivers/nfc/st21nfca/Kconfig
-f:drivers/nfc/st21nfca/Makefile
-f:drivers/nfc/st21nfca/core.c
-f:drivers/nfc/st21nfca/dep.c
-f:drivers/nfc/st21nfca/i2c.c
-f:drivers/nfc/st21nfca/se.c
-f:drivers/nfc/st21nfca/st21nfca.h
-f:drivers/nfc/st21nfca/vendor_cmds.c
-f:drivers/nfc/st95hf/Kconfig
-f:drivers/nfc/st95hf/Makefile
-f:drivers/nfc/st95hf/core.c
-f:drivers/nfc/st95hf/spi.c
-f:drivers/nfc/st95hf/spi.h
-f:drivers/nfc/trf7970a.c
-f:drivers/nfc/virtual_ncidev.c
-f:drivers/ntb/Kconfig
-f:drivers/ntb/Makefile
-f:drivers/ntb/core.c
-f:drivers/ntb/hw/Kconfig
-f:drivers/ntb/hw/Makefile
-f:drivers/ntb/hw/amd/Kconfig
-f:drivers/ntb/hw/amd/Makefile
-f:drivers/ntb/hw/amd/ntb_hw_amd.c
-f:drivers/ntb/hw/amd/ntb_hw_amd.h
-f:drivers/ntb/hw/epf/Kconfig
-f:drivers/ntb/hw/epf/Makefile
-f:drivers/ntb/hw/epf/ntb_hw_epf.c
-f:drivers/ntb/hw/idt/Kconfig
-f:drivers/ntb/hw/idt/Makefile
-f:drivers/ntb/hw/idt/ntb_hw_idt.c
-f:drivers/ntb/hw/idt/ntb_hw_idt.h
-f:drivers/ntb/hw/intel/Kconfig
-f:drivers/ntb/hw/intel/Makefile
-f:drivers/ntb/hw/intel/ntb_hw_gen1.c
-f:drivers/ntb/hw/intel/ntb_hw_gen1.h
-f:drivers/ntb/hw/intel/ntb_hw_gen3.c
-f:drivers/ntb/hw/intel/ntb_hw_gen3.h
-f:drivers/ntb/hw/intel/ntb_hw_gen4.c
-f:drivers/ntb/hw/intel/ntb_hw_gen4.h
-f:drivers/ntb/hw/intel/ntb_hw_intel.h
-f:drivers/ntb/hw/mscc/Kconfig
-f:drivers/ntb/hw/mscc/Makefile
-f:drivers/ntb/hw/mscc/ntb_hw_switchtec.c
-f:drivers/ntb/msi.c
-f:drivers/ntb/ntb_transport.c
-f:drivers/ntb/test/Kconfig
-f:drivers/ntb/test/Makefile
-f:drivers/ntb/test/ntb_msi_test.c
-f:drivers/ntb/test/ntb_perf.c
-f:drivers/ntb/test/ntb_pingpong.c
-f:drivers/ntb/test/ntb_tool.c
-f:drivers/nubus/Makefile
-f:drivers/nubus/bus.c
-f:drivers/nubus/nubus.c
-f:drivers/nubus/proc.c
-f:drivers/nvdimm/Kconfig
-f:drivers/nvdimm/Makefile
-f:drivers/nvdimm/badrange.c
-f:drivers/nvdimm/btt.c
-f:drivers/nvdimm/btt.h
-f:drivers/nvdimm/btt_devs.c
-f:drivers/nvdimm/bus.c
-f:drivers/nvdimm/claim.c
-f:drivers/nvdimm/core.c
-f:drivers/nvdimm/dax_devs.c
-f:drivers/nvdimm/dimm.c
-f:drivers/nvdimm/dimm_devs.c
-f:drivers/nvdimm/e820.c
-f:drivers/nvdimm/label.c
-f:drivers/nvdimm/label.h
-f:drivers/nvdimm/namespace_devs.c
-f:drivers/nvdimm/nd-core.h
-f:drivers/nvdimm/nd.h
-f:drivers/nvdimm/nd_perf.c
-f:drivers/nvdimm/nd_virtio.c
-f:drivers/nvdimm/of_pmem.c
-f:drivers/nvdimm/pfn.h
-f:drivers/nvdimm/pfn_devs.c
-f:drivers/nvdimm/pmem.c
-f:drivers/nvdimm/pmem.h
-f:drivers/nvdimm/region.c
-f:drivers/nvdimm/region_devs.c
-f:drivers/nvdimm/security.c
-f:drivers/nvdimm/virtio_pmem.c
-f:drivers/nvdimm/virtio_pmem.h
-f:drivers/nvme/Kconfig
-f:drivers/nvme/Makefile
-f:drivers/nvme/common/Kconfig
-f:drivers/nvme/common/Makefile
-f:drivers/nvme/common/auth.c
-f:drivers/nvme/common/keyring.c
-f:drivers/nvme/host/Kconfig
-f:drivers/nvme/host/Makefile
-f:drivers/nvme/host/apple.c
-f:drivers/nvme/host/auth.c
-f:drivers/nvme/host/constants.c
-f:drivers/nvme/host/core.c
-f:drivers/nvme/host/fabrics.c
-f:drivers/nvme/host/fabrics.h
-f:drivers/nvme/host/fault_inject.c
-f:drivers/nvme/host/fc.c
-f:drivers/nvme/host/fc.h
-f:drivers/nvme/host/hwmon.c
-f:drivers/nvme/host/ioctl.c
-f:drivers/nvme/host/multipath.c
-f:drivers/nvme/host/nvme.h
-f:drivers/nvme/host/pci.c
-f:drivers/nvme/host/pr.c
-f:drivers/nvme/host/rdma.c
-f:drivers/nvme/host/sysfs.c
-f:drivers/nvme/host/tcp.c
-f:drivers/nvme/host/trace.c
-f:drivers/nvme/host/trace.h
-f:drivers/nvme/host/zns.c
-f:drivers/nvme/target/Kconfig
-f:drivers/nvme/target/Makefile
-f:drivers/nvme/target/admin-cmd.c
-f:drivers/nvme/target/auth.c
-f:drivers/nvme/target/configfs.c
-f:drivers/nvme/target/core.c
-f:drivers/nvme/target/debugfs.c
-f:drivers/nvme/target/debugfs.h
-f:drivers/nvme/target/discovery.c
-f:drivers/nvme/target/fabrics-cmd-auth.c
-f:drivers/nvme/target/fabrics-cmd.c
-f:drivers/nvme/target/fc.c
-f:drivers/nvme/target/fcloop.c
-f:drivers/nvme/target/io-cmd-bdev.c
-f:drivers/nvme/target/io-cmd-file.c
-f:drivers/nvme/target/loop.c
-f:drivers/nvme/target/nvmet.h
-f:drivers/nvme/target/passthru.c
-f:drivers/nvme/target/pci-epf.c
-f:drivers/nvme/target/pr.c
-f:drivers/nvme/target/rdma.c
-f:drivers/nvme/target/tcp.c
-f:drivers/nvme/target/trace.c
-f:drivers/nvme/target/trace.h
-f:drivers/nvme/target/zns.c
-f:drivers/nvmem/Kconfig
-f:drivers/nvmem/Makefile
-f:drivers/nvmem/apple-efuses.c
-f:drivers/nvmem/apple-spmi-nvmem.c
-f:drivers/nvmem/bcm-ocotp.c
-f:drivers/nvmem/brcm_nvram.c
-f:drivers/nvmem/core.c
-f:drivers/nvmem/imx-iim.c
-f:drivers/nvmem/imx-ocotp-ele.c
-f:drivers/nvmem/imx-ocotp-scu.c
-f:drivers/nvmem/imx-ocotp.c
-f:drivers/nvmem/internals.h
-f:drivers/nvmem/jz4780-efuse.c
-f:drivers/nvmem/lan9662-otpc.c
-f:drivers/nvmem/layerscape-sfp.c
-f:drivers/nvmem/layouts.c
-f:drivers/nvmem/layouts/Kconfig
-f:drivers/nvmem/layouts/Makefile
-f:drivers/nvmem/layouts/onie-tlv.c
-f:drivers/nvmem/layouts/sl28vpd.c
-f:drivers/nvmem/layouts/u-boot-env.c
-f:drivers/nvmem/layouts/u-boot-env.h
-f:drivers/nvmem/lpc18xx_eeprom.c
-f:drivers/nvmem/lpc18xx_otp.c
-f:drivers/nvmem/max77759-nvmem.c
-f:drivers/nvmem/meson-efuse.c
-f:drivers/nvmem/meson-mx-efuse.c
-f:drivers/nvmem/microchip-otpc.c
-f:drivers/nvmem/mtk-efuse.c
-f:drivers/nvmem/mxs-ocotp.c
-f:drivers/nvmem/nintendo-otp.c
-f:drivers/nvmem/qcom-spmi-sdam.c
-f:drivers/nvmem/qfprom.c
-f:drivers/nvmem/qoriq-efuse.c
-f:drivers/nvmem/rave-sp-eeprom.c
-f:drivers/nvmem/rcar-efuse.c
-f:drivers/nvmem/rmem.c
-f:drivers/nvmem/rockchip-efuse.c
-f:drivers/nvmem/rockchip-otp.c
-f:drivers/nvmem/sc27xx-efuse.c
-f:drivers/nvmem/sec-qfprom.c
-f:drivers/nvmem/snvs_lpgpr.c
-f:drivers/nvmem/sprd-efuse.c
-f:drivers/nvmem/stm32-bsec-optee-ta.c
-f:drivers/nvmem/stm32-bsec-optee-ta.h
-f:drivers/nvmem/stm32-romem.c
-f:drivers/nvmem/sunplus-ocotp.c
-f:drivers/nvmem/sunxi_sid.c
-f:drivers/nvmem/u-boot-env.c
-f:drivers/nvmem/uniphier-efuse.c
-f:drivers/nvmem/vf610-ocotp.c
-f:drivers/nvmem/zynqmp_nvmem.c
-f:drivers/of/.kunitconfig
-f:drivers/of/Kconfig
-f:drivers/of/Makefile
-f:drivers/of/address.c
-f:drivers/of/base.c
-f:drivers/of/cpu.c
-f:drivers/of/device.c
-f:drivers/of/dynamic.c
-f:drivers/of/empty_root.dts
-f:drivers/of/fdt.c
-f:drivers/of/fdt_address.c
-f:drivers/of/irq.c
-f:drivers/of/kexec.c
-f:drivers/of/kobj.c
-f:drivers/of/kunit_overlay_test.dtso
-f:drivers/of/module.c
-f:drivers/of/of_kunit_helpers.c
-f:drivers/of/of_numa.c
-f:drivers/of/of_private.h
-f:drivers/of/of_reserved_mem.c
-f:drivers/of/of_test.c
-f:drivers/of/overlay.c
-f:drivers/of/overlay_test.c
-f:drivers/of/pdt.c
-f:drivers/of/platform.c
-f:drivers/of/property.c
-f:drivers/of/resolver.c
-f:drivers/of/unittest-data/Makefile
-f:drivers/of/unittest-data/overlay.dtso
-f:drivers/of/unittest-data/overlay_0.dtso
-f:drivers/of/unittest-data/overlay_1.dtso
-f:drivers/of/unittest-data/overlay_10.dtso
-f:drivers/of/unittest-data/overlay_11.dtso
-f:drivers/of/unittest-data/overlay_12.dtso
-f:drivers/of/unittest-data/overlay_13.dtso
-f:drivers/of/unittest-data/overlay_15.dtso
-f:drivers/of/unittest-data/overlay_16.dtso
-f:drivers/of/unittest-data/overlay_17.dtso
-f:drivers/of/unittest-data/overlay_18.dtso
-f:drivers/of/unittest-data/overlay_19.dtso
-f:drivers/of/unittest-data/overlay_2.dtso
-f:drivers/of/unittest-data/overlay_20.dtso
-f:drivers/of/unittest-data/overlay_3.dtso
-f:drivers/of/unittest-data/overlay_4.dtso
-f:drivers/of/unittest-data/overlay_5.dtso
-f:drivers/of/unittest-data/overlay_6.dtso
-f:drivers/of/unittest-data/overlay_7.dtso
-f:drivers/of/unittest-data/overlay_8.dtso
-f:drivers/of/unittest-data/overlay_9.dtso
-f:drivers/of/unittest-data/overlay_bad_add_dup_node.dtso
-f:drivers/of/unittest-data/overlay_bad_add_dup_prop.dtso
-f:drivers/of/unittest-data/overlay_bad_phandle.dtso
-f:drivers/of/unittest-data/overlay_bad_symbol.dtso
-f:drivers/of/unittest-data/overlay_bad_unresolved.dtso
-f:drivers/of/unittest-data/overlay_base.dtso
-f:drivers/of/unittest-data/overlay_common.dtsi
-f:drivers/of/unittest-data/overlay_gpio_01.dtso
-f:drivers/of/unittest-data/overlay_gpio_02a.dtso
-f:drivers/of/unittest-data/overlay_gpio_02b.dtso
-f:drivers/of/unittest-data/overlay_gpio_03.dtso
-f:drivers/of/unittest-data/overlay_gpio_04a.dtso
-f:drivers/of/unittest-data/overlay_gpio_04b.dtso
-f:drivers/of/unittest-data/overlay_pci_node.dtso
-f:drivers/of/unittest-data/static_base_1.dts
-f:drivers/of/unittest-data/static_base_2.dts
-f:drivers/of/unittest-data/testcases.dtso
-f:drivers/of/unittest-data/testcases_common.dtsi
-f:drivers/of/unittest-data/tests-address.dtsi
-f:drivers/of/unittest-data/tests-interrupts.dtsi
-f:drivers/of/unittest-data/tests-lifecycle.dtsi
-f:drivers/of/unittest-data/tests-match.dtsi
-f:drivers/of/unittest-data/tests-overlay.dtsi
-f:drivers/of/unittest-data/tests-phandle.dtsi
-f:drivers/of/unittest-data/tests-platform.dtsi
-f:drivers/of/unittest.c
-f:drivers/opp/Kconfig
-f:drivers/opp/Makefile
-f:drivers/opp/core.c
-f:drivers/opp/cpu.c
-f:drivers/opp/debugfs.c
-f:drivers/opp/of.c
-f:drivers/opp/opp.h
-f:drivers/opp/ti-opp-supply.c
-f:drivers/parisc/Kconfig
-f:drivers/parisc/Makefile
-f:drivers/parisc/README.dino
-f:drivers/parisc/asp.c
-f:drivers/parisc/ccio-dma.c
-f:drivers/parisc/dino.c
-f:drivers/parisc/eisa.c
-f:drivers/parisc/eisa_eeprom.c
-f:drivers/parisc/eisa_enumerator.c
-f:drivers/parisc/gsc.c
-f:drivers/parisc/gsc.h
-f:drivers/parisc/hppb.c
-f:drivers/parisc/iommu-helpers.h
-f:drivers/parisc/iommu.h
-f:drivers/parisc/iosapic.c
-f:drivers/parisc/iosapic_private.h
-f:drivers/parisc/lasi.c
-f:drivers/parisc/lba_pci.c
-f:drivers/parisc/led.c
-f:drivers/parisc/pdc_stable.c
-f:drivers/parisc/power.c
-f:drivers/parisc/sba_iommu.c
-f:drivers/parisc/superio.c
-f:drivers/parisc/wax.c
-f:drivers/parport/BUGS-parport
-f:drivers/parport/Kconfig
-f:drivers/parport/Makefile
-f:drivers/parport/TODO-parport
-f:drivers/parport/daisy.c
-f:drivers/parport/ieee1284.c
-f:drivers/parport/ieee1284_ops.c
-f:drivers/parport/multiface.h
-f:drivers/parport/parport_amiga.c
-f:drivers/parport/parport_atari.c
-f:drivers/parport/parport_cs.c
-f:drivers/parport/parport_gsc.c
-f:drivers/parport/parport_gsc.h
-f:drivers/parport/parport_ip32.c
-f:drivers/parport/parport_mfc3.c
-f:drivers/parport/parport_pc.c
-f:drivers/parport/parport_serial.c
-f:drivers/parport/parport_sunbpp.c
-f:drivers/parport/probe.c
-f:drivers/parport/procfs.c
-f:drivers/parport/share.c
-f:drivers/pci/Kconfig
-f:drivers/pci/Makefile
-f:drivers/pci/access.c
-f:drivers/pci/ats.c
-f:drivers/pci/bus.c
-f:drivers/pci/controller/Kconfig
-f:drivers/pci/controller/Makefile
-f:drivers/pci/controller/cadence/Kconfig
-f:drivers/pci/controller/cadence/Makefile
-f:drivers/pci/controller/cadence/pci-j721e.c
-f:drivers/pci/controller/cadence/pcie-cadence-ep.c
-f:drivers/pci/controller/cadence/pcie-cadence-host.c
-f:drivers/pci/controller/cadence/pcie-cadence-plat.c
-f:drivers/pci/controller/cadence/pcie-cadence.c
-f:drivers/pci/controller/cadence/pcie-cadence.h
-f:drivers/pci/controller/dwc/Kconfig
-f:drivers/pci/controller/dwc/Makefile
-f:drivers/pci/controller/dwc/pci-dra7xx.c
-f:drivers/pci/controller/dwc/pci-exynos.c
-f:drivers/pci/controller/dwc/pci-imx6.c
-f:drivers/pci/controller/dwc/pci-keystone.c
-f:drivers/pci/controller/dwc/pci-layerscape-ep.c
-f:drivers/pci/controller/dwc/pci-layerscape.c
-f:drivers/pci/controller/dwc/pci-meson.c
-f:drivers/pci/controller/dwc/pcie-al.c
-f:drivers/pci/controller/dwc/pcie-amd-mdb.c
-f:drivers/pci/controller/dwc/pcie-armada8k.c
-f:drivers/pci/controller/dwc/pcie-artpec6.c
-f:drivers/pci/controller/dwc/pcie-bt1.c
-f:drivers/pci/controller/dwc/pcie-designware-debugfs.c
-f:drivers/pci/controller/dwc/pcie-designware-ep.c
-f:drivers/pci/controller/dwc/pcie-designware-host.c
-f:drivers/pci/controller/dwc/pcie-designware-plat.c
-f:drivers/pci/controller/dwc/pcie-designware.c
-f:drivers/pci/controller/dwc/pcie-designware.h
-f:drivers/pci/controller/dwc/pcie-dw-rockchip.c
-f:drivers/pci/controller/dwc/pcie-fu740.c
-f:drivers/pci/controller/dwc/pcie-hisi.c
-f:drivers/pci/controller/dwc/pcie-histb.c
-f:drivers/pci/controller/dwc/pcie-intel-gw.c
-f:drivers/pci/controller/dwc/pcie-keembay.c
-f:drivers/pci/controller/dwc/pcie-kirin.c
-f:drivers/pci/controller/dwc/pcie-qcom-common.c
-f:drivers/pci/controller/dwc/pcie-qcom-common.h
-f:drivers/pci/controller/dwc/pcie-qcom-ep.c
-f:drivers/pci/controller/dwc/pcie-qcom.c
-f:drivers/pci/controller/dwc/pcie-rcar-gen4.c
-f:drivers/pci/controller/dwc/pcie-spear13xx.c
-f:drivers/pci/controller/dwc/pcie-tegra194-acpi.c
-f:drivers/pci/controller/dwc/pcie-tegra194.c
-f:drivers/pci/controller/dwc/pcie-uniphier-ep.c
-f:drivers/pci/controller/dwc/pcie-uniphier.c
-f:drivers/pci/controller/dwc/pcie-visconti.c
-f:drivers/pci/controller/mobiveil/Kconfig
-f:drivers/pci/controller/mobiveil/Makefile
-f:drivers/pci/controller/mobiveil/pcie-layerscape-gen4.c
-f:drivers/pci/controller/mobiveil/pcie-mobiveil-host.c
-f:drivers/pci/controller/mobiveil/pcie-mobiveil-plat.c
-f:drivers/pci/controller/mobiveil/pcie-mobiveil.c
-f:drivers/pci/controller/mobiveil/pcie-mobiveil.h
-f:drivers/pci/controller/pci-aardvark.c
-f:drivers/pci/controller/pci-ftpci100.c
-f:drivers/pci/controller/pci-host-common.c
-f:drivers/pci/controller/pci-host-common.h
-f:drivers/pci/controller/pci-host-generic.c
-f:drivers/pci/controller/pci-hyperv-intf.c
-f:drivers/pci/controller/pci-hyperv.c
-f:drivers/pci/controller/pci-ixp4xx.c
-f:drivers/pci/controller/pci-loongson.c
-f:drivers/pci/controller/pci-mvebu.c
-f:drivers/pci/controller/pci-rcar-gen2.c
-f:drivers/pci/controller/pci-tegra.c
-f:drivers/pci/controller/pci-thunder-ecam.c
-f:drivers/pci/controller/pci-thunder-pem.c
-f:drivers/pci/controller/pci-v3-semi.c
-f:drivers/pci/controller/pci-versatile.c
-f:drivers/pci/controller/pci-xgene-msi.c
-f:drivers/pci/controller/pci-xgene.c
-f:drivers/pci/controller/pcie-altera-msi.c
-f:drivers/pci/controller/pcie-altera.c
-f:drivers/pci/controller/pcie-apple.c
-f:drivers/pci/controller/pcie-brcmstb.c
-f:drivers/pci/controller/pcie-hisi-error.c
-f:drivers/pci/controller/pcie-iproc-bcma.c
-f:drivers/pci/controller/pcie-iproc-msi.c
-f:drivers/pci/controller/pcie-iproc-platform.c
-f:drivers/pci/controller/pcie-iproc.c
-f:drivers/pci/controller/pcie-iproc.h
-f:drivers/pci/controller/pcie-mediatek-gen3.c
-f:drivers/pci/controller/pcie-mediatek.c
-f:drivers/pci/controller/pcie-mt7621.c
-f:drivers/pci/controller/pcie-rcar-ep.c
-f:drivers/pci/controller/pcie-rcar-host.c
-f:drivers/pci/controller/pcie-rcar.c
-f:drivers/pci/controller/pcie-rcar.h
-f:drivers/pci/controller/pcie-rockchip-ep.c
-f:drivers/pci/controller/pcie-rockchip-host.c
-f:drivers/pci/controller/pcie-rockchip.c
-f:drivers/pci/controller/pcie-rockchip.h
-f:drivers/pci/controller/pcie-xilinx-common.h
-f:drivers/pci/controller/pcie-xilinx-cpm.c
-f:drivers/pci/controller/pcie-xilinx-dma-pl.c
-f:drivers/pci/controller/pcie-xilinx-nwl.c
-f:drivers/pci/controller/pcie-xilinx.c
-f:drivers/pci/controller/plda/Kconfig
-f:drivers/pci/controller/plda/Makefile
-f:drivers/pci/controller/plda/pcie-microchip-host.c
-f:drivers/pci/controller/plda/pcie-plda-host.c
-f:drivers/pci/controller/plda/pcie-plda.h
-f:drivers/pci/controller/plda/pcie-starfive.c
-f:drivers/pci/controller/vmd.c
-f:drivers/pci/devres.c
-f:drivers/pci/doe.c
-f:drivers/pci/ecam.c
-f:drivers/pci/endpoint/Kconfig
-f:drivers/pci/endpoint/Makefile
-f:drivers/pci/endpoint/functions/Kconfig
-f:drivers/pci/endpoint/functions/Makefile
-f:drivers/pci/endpoint/functions/pci-epf-mhi.c
-f:drivers/pci/endpoint/functions/pci-epf-ntb.c
-f:drivers/pci/endpoint/functions/pci-epf-test.c
-f:drivers/pci/endpoint/functions/pci-epf-vntb.c
-f:drivers/pci/endpoint/pci-ep-cfs.c
-f:drivers/pci/endpoint/pci-epc-core.c
-f:drivers/pci/endpoint/pci-epc-mem.c
-f:drivers/pci/endpoint/pci-epf-core.c
-f:drivers/pci/host-bridge.c
-f:drivers/pci/hotplug/Kconfig
-f:drivers/pci/hotplug/Makefile
-f:drivers/pci/hotplug/TODO
-f:drivers/pci/hotplug/acpi_pcihp.c
-f:drivers/pci/hotplug/acpiphp.h
-f:drivers/pci/hotplug/acpiphp_ampere_altra.c
-f:drivers/pci/hotplug/acpiphp_core.c
-f:drivers/pci/hotplug/acpiphp_glue.c
-f:drivers/pci/hotplug/acpiphp_ibm.c
-f:drivers/pci/hotplug/cpci_hotplug.h
-f:drivers/pci/hotplug/cpci_hotplug_core.c
-f:drivers/pci/hotplug/cpci_hotplug_pci.c
-f:drivers/pci/hotplug/cpcihp_generic.c
-f:drivers/pci/hotplug/cpcihp_zt5550.c
-f:drivers/pci/hotplug/cpcihp_zt5550.h
-f:drivers/pci/hotplug/cpqphp.h
-f:drivers/pci/hotplug/cpqphp_core.c
-f:drivers/pci/hotplug/cpqphp_ctrl.c
-f:drivers/pci/hotplug/cpqphp_nvram.c
-f:drivers/pci/hotplug/cpqphp_nvram.h
-f:drivers/pci/hotplug/cpqphp_pci.c
-f:drivers/pci/hotplug/cpqphp_sysfs.c
-f:drivers/pci/hotplug/ibmphp.h
-f:drivers/pci/hotplug/ibmphp_core.c
-f:drivers/pci/hotplug/ibmphp_ebda.c
-f:drivers/pci/hotplug/ibmphp_hpc.c
-f:drivers/pci/hotplug/ibmphp_pci.c
-f:drivers/pci/hotplug/ibmphp_res.c
-f:drivers/pci/hotplug/octep_hp.c
-f:drivers/pci/hotplug/pci_hotplug_core.c
-f:drivers/pci/hotplug/pciehp.h
-f:drivers/pci/hotplug/pciehp_core.c
-f:drivers/pci/hotplug/pciehp_ctrl.c
-f:drivers/pci/hotplug/pciehp_hpc.c
-f:drivers/pci/hotplug/pciehp_pci.c
-f:drivers/pci/hotplug/pnv_php.c
-f:drivers/pci/hotplug/rpadlpar.h
-f:drivers/pci/hotplug/rpadlpar_core.c
-f:drivers/pci/hotplug/rpadlpar_sysfs.c
-f:drivers/pci/hotplug/rpaphp.h
-f:drivers/pci/hotplug/rpaphp_core.c
-f:drivers/pci/hotplug/rpaphp_pci.c
-f:drivers/pci/hotplug/rpaphp_slot.c
-f:drivers/pci/hotplug/s390_pci_hpc.c
-f:drivers/pci/hotplug/shpchp.h
-f:drivers/pci/hotplug/shpchp_core.c
-f:drivers/pci/hotplug/shpchp_ctrl.c
-f:drivers/pci/hotplug/shpchp_hpc.c
-f:drivers/pci/hotplug/shpchp_pci.c
-f:drivers/pci/hotplug/shpchp_sysfs.c
-f:drivers/pci/iomap.c
-f:drivers/pci/iov.c
-f:drivers/pci/irq.c
-f:drivers/pci/mmap.c
-f:drivers/pci/msi/Makefile
-f:drivers/pci/msi/api.c
-f:drivers/pci/msi/irqdomain.c
-f:drivers/pci/msi/legacy.c
-f:drivers/pci/msi/msi.c
-f:drivers/pci/msi/msi.h
-f:drivers/pci/msi/pcidev_msi.c
-f:drivers/pci/npem.c
-f:drivers/pci/of.c
-f:drivers/pci/of_property.c
-f:drivers/pci/p2pdma.c
-f:drivers/pci/pci-acpi.c
-f:drivers/pci/pci-bridge-emul.c
-f:drivers/pci/pci-bridge-emul.h
-f:drivers/pci/pci-driver.c
-f:drivers/pci/pci-label.c
-f:drivers/pci/pci-mid.c
-f:drivers/pci/pci-pf-stub.c
-f:drivers/pci/pci-stub.c
-f:drivers/pci/pci-sysfs.c
-f:drivers/pci/pci.c
-f:drivers/pci/pci.h
-f:drivers/pci/pcie/Kconfig
-f:drivers/pci/pcie/Makefile
-f:drivers/pci/pcie/aer.c
-f:drivers/pci/pcie/aer_inject.c
-f:drivers/pci/pcie/aspm.c
-f:drivers/pci/pcie/bwctrl.c
-f:drivers/pci/pcie/dpc.c
-f:drivers/pci/pcie/edr.c
-f:drivers/pci/pcie/err.c
-f:drivers/pci/pcie/pme.c
-f:drivers/pci/pcie/portdrv.c
-f:drivers/pci/pcie/portdrv.h
-f:drivers/pci/pcie/ptm.c
-f:drivers/pci/pcie/rcec.c
-f:drivers/pci/pcie/tlp.c
-f:drivers/pci/probe.c
-f:drivers/pci/proc.c
-f:drivers/pci/pwrctrl/Kconfig
-f:drivers/pci/pwrctrl/Makefile
-f:drivers/pci/pwrctrl/core.c
-f:drivers/pci/pwrctrl/pci-pwrctrl-pwrseq.c
-f:drivers/pci/pwrctrl/slot.c
-f:drivers/pci/quirks.c
-f:drivers/pci/remove.c
-f:drivers/pci/rom.c
-f:drivers/pci/search.c
-f:drivers/pci/setup-bus.c
-f:drivers/pci/setup-res.c
-f:drivers/pci/slot.c
-f:drivers/pci/switch/Kconfig
-f:drivers/pci/switch/Makefile
-f:drivers/pci/switch/switchtec.c
-f:drivers/pci/syscall.c
-f:drivers/pci/tph.c
-f:drivers/pci/vc.c
-f:drivers/pci/vgaarb.c
-f:drivers/pci/vpd.c
-f:drivers/pci/xen-pcifront.c
-f:drivers/pcmcia/Kconfig
-f:drivers/pcmcia/Makefile
-f:drivers/pcmcia/bcm63xx_pcmcia.c
-f:drivers/pcmcia/bcm63xx_pcmcia.h
-f:drivers/pcmcia/cardbus.c
-f:drivers/pcmcia/cirrus.h
-f:drivers/pcmcia/cistpl.c
-f:drivers/pcmcia/cs.c
-f:drivers/pcmcia/cs_internal.h
-f:drivers/pcmcia/db1xxx_ss.c
-f:drivers/pcmcia/ds.c
-f:drivers/pcmcia/electra_cf.c
-f:drivers/pcmcia/i82092.c
-f:drivers/pcmcia/i82092aa.h
-f:drivers/pcmcia/i82365.c
-f:drivers/pcmcia/i82365.h
-f:drivers/pcmcia/max1600.c
-f:drivers/pcmcia/max1600.h
-f:drivers/pcmcia/o2micro.h
-f:drivers/pcmcia/omap_cf.c
-f:drivers/pcmcia/pcmcia_cis.c
-f:drivers/pcmcia/pcmcia_resource.c
-f:drivers/pcmcia/pd6729.c
-f:drivers/pcmcia/pd6729.h
-f:drivers/pcmcia/pxa2xx_base.c
-f:drivers/pcmcia/pxa2xx_base.h
-f:drivers/pcmcia/pxa2xx_sharpsl.c
-f:drivers/pcmcia/ricoh.h
-f:drivers/pcmcia/rsrc_iodyn.c
-f:drivers/pcmcia/rsrc_mgr.c
-f:drivers/pcmcia/rsrc_nonstatic.c
-f:drivers/pcmcia/sa1100_generic.c
-f:drivers/pcmcia/sa1100_generic.h
-f:drivers/pcmcia/sa1100_h3600.c
-f:drivers/pcmcia/sa1111_generic.c
-f:drivers/pcmcia/sa1111_generic.h
-f:drivers/pcmcia/sa1111_jornada720.c
-f:drivers/pcmcia/sa1111_neponset.c
-f:drivers/pcmcia/sa11xx_base.c
-f:drivers/pcmcia/sa11xx_base.h
-f:drivers/pcmcia/soc_common.c
-f:drivers/pcmcia/soc_common.h
-f:drivers/pcmcia/socket_sysfs.c
-f:drivers/pcmcia/tcic.c
-f:drivers/pcmcia/tcic.h
-f:drivers/pcmcia/ti113x.h
-f:drivers/pcmcia/topic.h
-f:drivers/pcmcia/vg468.h
-f:drivers/pcmcia/xxs1500_ss.c
-f:drivers/pcmcia/yenta_socket.c
-f:drivers/pcmcia/yenta_socket.h
-f:drivers/peci/Kconfig
-f:drivers/peci/Makefile
-f:drivers/peci/controller/Kconfig
-f:drivers/peci/controller/Makefile
-f:drivers/peci/controller/peci-aspeed.c
-f:drivers/peci/controller/peci-npcm.c
-f:drivers/peci/core.c
-f:drivers/peci/cpu.c
-f:drivers/peci/device.c
-f:drivers/peci/internal.h
-f:drivers/peci/request.c
-f:drivers/peci/sysfs.c
-f:drivers/perf/Kconfig
-f:drivers/perf/Makefile
-f:drivers/perf/alibaba_uncore_drw_pmu.c
-f:drivers/perf/amlogic/Kconfig
-f:drivers/perf/amlogic/Makefile
-f:drivers/perf/amlogic/meson_ddr_pmu_core.c
-f:drivers/perf/amlogic/meson_g12_ddr_pmu.c
-f:drivers/perf/apple_m1_cpu_pmu.c
-f:drivers/perf/arm-cci.c
-f:drivers/perf/arm-ccn.c
-f:drivers/perf/arm-cmn.c
-f:drivers/perf/arm-ni.c
-f:drivers/perf/arm_brbe.c
-f:drivers/perf/arm_brbe.h
-f:drivers/perf/arm_cspmu/Kconfig
-f:drivers/perf/arm_cspmu/Makefile
-f:drivers/perf/arm_cspmu/ampere_cspmu.c
-f:drivers/perf/arm_cspmu/arm_cspmu.c
-f:drivers/perf/arm_cspmu/arm_cspmu.h
-f:drivers/perf/arm_cspmu/nvidia_cspmu.c
-f:drivers/perf/arm_dmc620_pmu.c
-f:drivers/perf/arm_dsu_pmu.c
-f:drivers/perf/arm_pmu.c
-f:drivers/perf/arm_pmu_acpi.c
-f:drivers/perf/arm_pmu_platform.c
-f:drivers/perf/arm_pmuv3.c
-f:drivers/perf/arm_smmuv3_pmu.c
-f:drivers/perf/arm_spe_pmu.c
-f:drivers/perf/arm_v6_pmu.c
-f:drivers/perf/arm_v7_pmu.c
-f:drivers/perf/arm_xscale_pmu.c
-f:drivers/perf/cxl_pmu.c
-f:drivers/perf/dwc_pcie_pmu.c
-f:drivers/perf/fsl_imx8_ddr_perf.c
-f:drivers/perf/fsl_imx9_ddr_perf.c
-f:drivers/perf/hisilicon/Kconfig
-f:drivers/perf/hisilicon/Makefile
-f:drivers/perf/hisilicon/hisi_pcie_pmu.c
-f:drivers/perf/hisilicon/hisi_uncore_cpa_pmu.c
-f:drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c
-f:drivers/perf/hisilicon/hisi_uncore_hha_pmu.c
-f:drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c
-f:drivers/perf/hisilicon/hisi_uncore_pa_pmu.c
-f:drivers/perf/hisilicon/hisi_uncore_pmu.c
-f:drivers/perf/hisilicon/hisi_uncore_pmu.h
-f:drivers/perf/hisilicon/hisi_uncore_sllc_pmu.c
-f:drivers/perf/hisilicon/hisi_uncore_uc_pmu.c
-f:drivers/perf/hisilicon/hns3_pmu.c
-f:drivers/perf/marvell_cn10k_ddr_pmu.c
-f:drivers/perf/marvell_cn10k_tad_pmu.c
-f:drivers/perf/marvell_pem_pmu.c
-f:drivers/perf/qcom_l2_pmu.c
-f:drivers/perf/qcom_l3_pmu.c
-f:drivers/perf/riscv_pmu.c
-f:drivers/perf/riscv_pmu_legacy.c
-f:drivers/perf/riscv_pmu_sbi.c
-f:drivers/perf/starfive_starlink_pmu.c
-f:drivers/perf/thunderx2_pmu.c
-f:drivers/perf/xgene_pmu.c
-f:drivers/phy/Kconfig
-f:drivers/phy/Makefile
-f:drivers/phy/allwinner/Kconfig
-f:drivers/phy/allwinner/Makefile
-f:drivers/phy/allwinner/phy-sun4i-usb.c
-f:drivers/phy/allwinner/phy-sun50i-usb3.c
-f:drivers/phy/allwinner/phy-sun6i-mipi-dphy.c
-f:drivers/phy/allwinner/phy-sun9i-usb.c
-f:drivers/phy/amlogic/Kconfig
-f:drivers/phy/amlogic/Makefile
-f:drivers/phy/amlogic/phy-meson-axg-mipi-dphy.c
-f:drivers/phy/amlogic/phy-meson-axg-mipi-pcie-analog.c
-f:drivers/phy/amlogic/phy-meson-axg-pcie.c
-f:drivers/phy/amlogic/phy-meson-g12a-mipi-dphy-analog.c
-f:drivers/phy/amlogic/phy-meson-g12a-usb2.c
-f:drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c
-f:drivers/phy/amlogic/phy-meson-gxl-usb2.c
-f:drivers/phy/amlogic/phy-meson8-hdmi-tx.c
-f:drivers/phy/amlogic/phy-meson8b-usb2.c
-f:drivers/phy/broadcom/Kconfig
-f:drivers/phy/broadcom/Makefile
-f:drivers/phy/broadcom/phy-bcm-cygnus-pcie.c
-f:drivers/phy/broadcom/phy-bcm-kona-usb2.c
-f:drivers/phy/broadcom/phy-bcm-ns-usb2.c
-f:drivers/phy/broadcom/phy-bcm-ns-usb3.c
-f:drivers/phy/broadcom/phy-bcm-ns2-pcie.c
-f:drivers/phy/broadcom/phy-bcm-ns2-usbdrd.c
-f:drivers/phy/broadcom/phy-bcm-sr-pcie.c
-f:drivers/phy/broadcom/phy-bcm-sr-usb.c
-f:drivers/phy/broadcom/phy-bcm63xx-usbh.c
-f:drivers/phy/broadcom/phy-brcm-sata.c
-f:drivers/phy/broadcom/phy-brcm-usb-init-synopsys.c
-f:drivers/phy/broadcom/phy-brcm-usb-init.c
-f:drivers/phy/broadcom/phy-brcm-usb-init.h
-f:drivers/phy/broadcom/phy-brcm-usb.c
-f:drivers/phy/cadence/Kconfig
-f:drivers/phy/cadence/Makefile
-f:drivers/phy/cadence/cdns-dphy-rx.c
-f:drivers/phy/cadence/cdns-dphy.c
-f:drivers/phy/cadence/phy-cadence-salvo.c
-f:drivers/phy/cadence/phy-cadence-sierra.c
-f:drivers/phy/cadence/phy-cadence-torrent.c
-f:drivers/phy/freescale/Kconfig
-f:drivers/phy/freescale/Makefile
-f:drivers/phy/freescale/phy-fsl-imx8-mipi-dphy.c
-f:drivers/phy/freescale/phy-fsl-imx8m-pcie.c
-f:drivers/phy/freescale/phy-fsl-imx8mq-usb.c
-f:drivers/phy/freescale/phy-fsl-imx8qm-hsio.c
-f:drivers/phy/freescale/phy-fsl-imx8qm-lvds-phy.c
-f:drivers/phy/freescale/phy-fsl-lynx-28g.c
-f:drivers/phy/freescale/phy-fsl-samsung-hdmi.c
-f:drivers/phy/hisilicon/Kconfig
-f:drivers/phy/hisilicon/Makefile
-f:drivers/phy/hisilicon/phy-hi3660-usb3.c
-f:drivers/phy/hisilicon/phy-hi3670-pcie.c
-f:drivers/phy/hisilicon/phy-hi3670-usb3.c
-f:drivers/phy/hisilicon/phy-hi6220-usb.c
-f:drivers/phy/hisilicon/phy-hisi-inno-usb2.c
-f:drivers/phy/hisilicon/phy-histb-combphy.c
-f:drivers/phy/hisilicon/phy-hix5hd2-sata.c
-f:drivers/phy/ingenic/Kconfig
-f:drivers/phy/ingenic/Makefile
-f:drivers/phy/ingenic/phy-ingenic-usb.c
-f:drivers/phy/intel/Kconfig
-f:drivers/phy/intel/Makefile
-f:drivers/phy/intel/phy-intel-keembay-emmc.c
-f:drivers/phy/intel/phy-intel-keembay-usb.c
-f:drivers/phy/intel/phy-intel-lgm-combo.c
-f:drivers/phy/intel/phy-intel-lgm-emmc.c
-f:drivers/phy/lantiq/Kconfig
-f:drivers/phy/lantiq/Makefile
-f:drivers/phy/lantiq/phy-lantiq-rcu-usb2.c
-f:drivers/phy/lantiq/phy-lantiq-vrx200-pcie.c
-f:drivers/phy/marvell/Kconfig
-f:drivers/phy/marvell/Makefile
-f:drivers/phy/marvell/phy-armada375-usb2.c
-f:drivers/phy/marvell/phy-armada38x-comphy.c
-f:drivers/phy/marvell/phy-berlin-sata.c
-f:drivers/phy/marvell/phy-berlin-usb.c
-f:drivers/phy/marvell/phy-mmp3-hsic.c
-f:drivers/phy/marvell/phy-mmp3-usb.c
-f:drivers/phy/marvell/phy-mvebu-a3700-comphy.c
-f:drivers/phy/marvell/phy-mvebu-a3700-utmi.c
-f:drivers/phy/marvell/phy-mvebu-cp110-comphy.c
-f:drivers/phy/marvell/phy-mvebu-cp110-utmi.c
-f:drivers/phy/marvell/phy-mvebu-sata.c
-f:drivers/phy/marvell/phy-pxa-28nm-hsic.c
-f:drivers/phy/marvell/phy-pxa-28nm-usb2.c
-f:drivers/phy/marvell/phy-pxa-usb.c
-f:drivers/phy/mediatek/Kconfig
-f:drivers/phy/mediatek/Makefile
-f:drivers/phy/mediatek/phy-mtk-dp.c
-f:drivers/phy/mediatek/phy-mtk-hdmi-mt2701.c
-f:drivers/phy/mediatek/phy-mtk-hdmi-mt8173.c
-f:drivers/phy/mediatek/phy-mtk-hdmi-mt8195.c
-f:drivers/phy/mediatek/phy-mtk-hdmi-mt8195.h
-f:drivers/phy/mediatek/phy-mtk-hdmi.c
-f:drivers/phy/mediatek/phy-mtk-hdmi.h
-f:drivers/phy/mediatek/phy-mtk-io.h
-f:drivers/phy/mediatek/phy-mtk-mipi-csi-0-5-rx-reg.h
-f:drivers/phy/mediatek/phy-mtk-mipi-csi-0-5.c
-f:drivers/phy/mediatek/phy-mtk-mipi-dsi-mt8173.c
-f:drivers/phy/mediatek/phy-mtk-mipi-dsi-mt8183.c
-f:drivers/phy/mediatek/phy-mtk-mipi-dsi.c
-f:drivers/phy/mediatek/phy-mtk-mipi-dsi.h
-f:drivers/phy/mediatek/phy-mtk-pcie.c
-f:drivers/phy/mediatek/phy-mtk-tphy.c
-f:drivers/phy/mediatek/phy-mtk-ufs.c
-f:drivers/phy/mediatek/phy-mtk-xfi-tphy.c
-f:drivers/phy/mediatek/phy-mtk-xsphy.c
-f:drivers/phy/microchip/Kconfig
-f:drivers/phy/microchip/Makefile
-f:drivers/phy/microchip/lan966x_serdes.c
-f:drivers/phy/microchip/lan966x_serdes_regs.h
-f:drivers/phy/microchip/sparx5_serdes.c
-f:drivers/phy/microchip/sparx5_serdes.h
-f:drivers/phy/microchip/sparx5_serdes_regs.h
-f:drivers/phy/motorola/Kconfig
-f:drivers/phy/motorola/Makefile
-f:drivers/phy/motorola/phy-cpcap-usb.c
-f:drivers/phy/motorola/phy-mapphone-mdm6600.c
-f:drivers/phy/mscc/Kconfig
-f:drivers/phy/mscc/Makefile
-f:drivers/phy/mscc/phy-ocelot-serdes.c
-f:drivers/phy/nuvoton/Kconfig
-f:drivers/phy/nuvoton/Makefile
-f:drivers/phy/nuvoton/phy-ma35d1-usb2.c
-f:drivers/phy/phy-airoha-pcie-regs.h
-f:drivers/phy/phy-airoha-pcie.c
-f:drivers/phy/phy-can-transceiver.c
-f:drivers/phy/phy-core-mipi-dphy.c
-f:drivers/phy/phy-core.c
-f:drivers/phy/phy-lgm-usb.c
-f:drivers/phy/phy-lpc18xx-usb-otg.c
-f:drivers/phy/phy-nxp-ptn3222.c
-f:drivers/phy/phy-pistachio-usb.c
-f:drivers/phy/phy-snps-eusb2.c
-f:drivers/phy/phy-xgene.c
-f:drivers/phy/qualcomm/Kconfig
-f:drivers/phy/qualcomm/Makefile
-f:drivers/phy/qualcomm/phy-ath79-usb.c
-f:drivers/phy/qualcomm/phy-qcom-apq8064-sata.c
-f:drivers/phy/qualcomm/phy-qcom-edp.c
-f:drivers/phy/qualcomm/phy-qcom-eusb2-repeater.c
-f:drivers/phy/qualcomm/phy-qcom-ipq4019-usb.c
-f:drivers/phy/qualcomm/phy-qcom-ipq806x-sata.c
-f:drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c
-f:drivers/phy/qualcomm/phy-qcom-m31.c
-f:drivers/phy/qualcomm/phy-qcom-pcie2.c
-f:drivers/phy/qualcomm/phy-qcom-qmp-combo.c
-f:drivers/phy/qualcomm/phy-qcom-qmp-common.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-dp-com-v3.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-dp-phy-v3.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-dp-phy-v4.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-dp-phy-v5.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-dp-phy-v6.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-dp-phy.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c
-f:drivers/phy/qualcomm/phy-qcom-qmp-pcie-qhp.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-pcie.c
-f:drivers/phy/qualcomm/phy-qcom-qmp-pcs-misc-v3.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-pcs-misc-v4.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v4.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v4_20.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v5.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v5_20.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v6.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v6_20.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v6_30.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-pcs-sgmii.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-pcs-ufs-v2.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-pcs-ufs-v3.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-pcs-ufs-v4.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-pcs-ufs-v5.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-pcs-ufs-v6.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-pcs-usb-v4.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-pcs-usb-v5.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-pcs-usb-v6.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-pcs-usb-v7.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-pcs-v2.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-pcs-v3.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-pcs-v4.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-pcs-v4_20.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-pcs-v5.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-pcs-v5_20.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-pcs-v6-n4.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-pcs-v6.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-pcs-v6_20.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-pcs-v6_30.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-pcs-v7.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-qserdes-com-v3.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-qserdes-com-v4.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-qserdes-com-v5.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-qserdes-com-v6.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-qserdes-com-v7.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-qserdes-com.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-qserdes-ln-shrd-v6.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-qserdes-pll.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-qserdes-txrx-ufs-v6.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-qserdes-txrx-ufs-v7.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v3.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v4.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v4_20.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v5.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v5_20.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v5_5nm.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v6.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v6_20.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v6_n4.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v7.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-qserdes-txrx.h
-f:drivers/phy/qualcomm/phy-qcom-qmp-ufs.c
-f:drivers/phy/qualcomm/phy-qcom-qmp-usb-legacy.c
-f:drivers/phy/qualcomm/phy-qcom-qmp-usb.c
-f:drivers/phy/qualcomm/phy-qcom-qmp-usbc.c
-f:drivers/phy/qualcomm/phy-qcom-qmp.h
-f:drivers/phy/qualcomm/phy-qcom-qusb2.c
-f:drivers/phy/qualcomm/phy-qcom-sgmii-eth.c
-f:drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c
-f:drivers/phy/qualcomm/phy-qcom-uniphy-pcie-28lp.c
-f:drivers/phy/qualcomm/phy-qcom-usb-hs-28nm.c
-f:drivers/phy/qualcomm/phy-qcom-usb-hs.c
-f:drivers/phy/qualcomm/phy-qcom-usb-hsic.c
-f:drivers/phy/qualcomm/phy-qcom-usb-ss.c
-f:drivers/phy/ralink/Kconfig
-f:drivers/phy/ralink/Makefile
-f:drivers/phy/ralink/phy-mt7621-pci.c
-f:drivers/phy/ralink/phy-ralink-usb.c
-f:drivers/phy/realtek/Kconfig
-f:drivers/phy/realtek/Makefile
-f:drivers/phy/realtek/phy-rtk-usb2.c
-f:drivers/phy/realtek/phy-rtk-usb3.c
-f:drivers/phy/renesas/Kconfig
-f:drivers/phy/renesas/Makefile
-f:drivers/phy/renesas/phy-rcar-gen2.c
-f:drivers/phy/renesas/phy-rcar-gen3-pcie.c
-f:drivers/phy/renesas/phy-rcar-gen3-usb2.c
-f:drivers/phy/renesas/phy-rcar-gen3-usb3.c
-f:drivers/phy/renesas/r8a779f0-ether-serdes.c
-f:drivers/phy/rockchip/Kconfig
-f:drivers/phy/rockchip/Makefile
-f:drivers/phy/rockchip/phy-rockchip-dp.c
-f:drivers/phy/rockchip/phy-rockchip-dphy-rx0.c
-f:drivers/phy/rockchip/phy-rockchip-emmc.c
-f:drivers/phy/rockchip/phy-rockchip-inno-csidphy.c
-f:drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c
-f:drivers/phy/rockchip/phy-rockchip-inno-hdmi.c
-f:drivers/phy/rockchip/phy-rockchip-inno-usb2.c
-f:drivers/phy/rockchip/phy-rockchip-naneng-combphy.c
-f:drivers/phy/rockchip/phy-rockchip-pcie.c
-f:drivers/phy/rockchip/phy-rockchip-samsung-dcphy.c
-f:drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
-f:drivers/phy/rockchip/phy-rockchip-snps-pcie3.c
-f:drivers/phy/rockchip/phy-rockchip-typec.c
-f:drivers/phy/rockchip/phy-rockchip-usb.c
-f:drivers/phy/rockchip/phy-rockchip-usbdp.c
-f:drivers/phy/samsung/Kconfig
-f:drivers/phy/samsung/Makefile
-f:drivers/phy/samsung/phy-exynos-dp-video.c
-f:drivers/phy/samsung/phy-exynos-mipi-video.c
-f:drivers/phy/samsung/phy-exynos-pcie.c
-f:drivers/phy/samsung/phy-exynos4210-usb2.c
-f:drivers/phy/samsung/phy-exynos4x12-usb2.c
-f:drivers/phy/samsung/phy-exynos5-usbdrd.c
-f:drivers/phy/samsung/phy-exynos5250-sata.c
-f:drivers/phy/samsung/phy-exynos5250-usb2.c
-f:drivers/phy/samsung/phy-exynos7-ufs.c
-f:drivers/phy/samsung/phy-exynosautov9-ufs.c
-f:drivers/phy/samsung/phy-exynosautov920-ufs.c
-f:drivers/phy/samsung/phy-fsd-ufs.c
-f:drivers/phy/samsung/phy-gs101-ufs.c
-f:drivers/phy/samsung/phy-s5pv210-usb2.c
-f:drivers/phy/samsung/phy-samsung-ufs.c
-f:drivers/phy/samsung/phy-samsung-ufs.h
-f:drivers/phy/samsung/phy-samsung-usb2.c
-f:drivers/phy/samsung/phy-samsung-usb2.h
-f:drivers/phy/socionext/Kconfig
-f:drivers/phy/socionext/Makefile
-f:drivers/phy/socionext/phy-uniphier-ahci.c
-f:drivers/phy/socionext/phy-uniphier-pcie.c
-f:drivers/phy/socionext/phy-uniphier-usb2.c
-f:drivers/phy/socionext/phy-uniphier-usb3hs.c
-f:drivers/phy/socionext/phy-uniphier-usb3ss.c
-f:drivers/phy/st/Kconfig
-f:drivers/phy/st/Makefile
-f:drivers/phy/st/phy-miphy28lp.c
-f:drivers/phy/st/phy-spear1310-miphy.c
-f:drivers/phy/st/phy-spear1340-miphy.c
-f:drivers/phy/st/phy-stih407-usb.c
-f:drivers/phy/st/phy-stm32-combophy.c
-f:drivers/phy/st/phy-stm32-usbphyc.c
-f:drivers/phy/starfive/Kconfig
-f:drivers/phy/starfive/Makefile
-f:drivers/phy/starfive/phy-jh7110-dphy-rx.c
-f:drivers/phy/starfive/phy-jh7110-dphy-tx.c
-f:drivers/phy/starfive/phy-jh7110-pcie.c
-f:drivers/phy/starfive/phy-jh7110-usb.c
-f:drivers/phy/sunplus/Kconfig
-f:drivers/phy/sunplus/Makefile
-f:drivers/phy/sunplus/phy-sunplus-usb2.c
-f:drivers/phy/tegra/Kconfig
-f:drivers/phy/tegra/Makefile
-f:drivers/phy/tegra/phy-tegra194-p2u.c
-f:drivers/phy/tegra/xusb-tegra124.c
-f:drivers/phy/tegra/xusb-tegra186.c
-f:drivers/phy/tegra/xusb-tegra210.c
-f:drivers/phy/tegra/xusb.c
-f:drivers/phy/tegra/xusb.h
-f:drivers/phy/ti/Kconfig
-f:drivers/phy/ti/Makefile
-f:drivers/phy/ti/phy-am654-serdes.c
-f:drivers/phy/ti/phy-da8xx-usb.c
-f:drivers/phy/ti/phy-dm816x-usb.c
-f:drivers/phy/ti/phy-gmii-sel.c
-f:drivers/phy/ti/phy-j721e-wiz.c
-f:drivers/phy/ti/phy-omap-control.c
-f:drivers/phy/ti/phy-omap-usb2.c
-f:drivers/phy/ti/phy-ti-pipe3.c
-f:drivers/phy/ti/phy-tusb1210.c
-f:drivers/phy/ti/phy-twl4030-usb.c
-f:drivers/phy/xilinx/Kconfig
-f:drivers/phy/xilinx/Makefile
-f:drivers/phy/xilinx/phy-zynqmp.c
-f:drivers/pinctrl/Kconfig
-f:drivers/pinctrl/Makefile
-f:drivers/pinctrl/actions/Kconfig
-f:drivers/pinctrl/actions/Makefile
-f:drivers/pinctrl/actions/pinctrl-owl.c
-f:drivers/pinctrl/actions/pinctrl-owl.h
-f:drivers/pinctrl/actions/pinctrl-s500.c
-f:drivers/pinctrl/actions/pinctrl-s700.c
-f:drivers/pinctrl/actions/pinctrl-s900.c
-f:drivers/pinctrl/aspeed/Kconfig
-f:drivers/pinctrl/aspeed/Makefile
-f:drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c
-f:drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c
-f:drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c
-f:drivers/pinctrl/aspeed/pinctrl-aspeed.c
-f:drivers/pinctrl/aspeed/pinctrl-aspeed.h
-f:drivers/pinctrl/aspeed/pinmux-aspeed.c
-f:drivers/pinctrl/aspeed/pinmux-aspeed.h
-f:drivers/pinctrl/bcm/Kconfig
-f:drivers/pinctrl/bcm/Makefile
-f:drivers/pinctrl/bcm/pinctrl-bcm281xx.c
-f:drivers/pinctrl/bcm/pinctrl-bcm2835.c
-f:drivers/pinctrl/bcm/pinctrl-bcm4908.c
-f:drivers/pinctrl/bcm/pinctrl-bcm6318.c
-f:drivers/pinctrl/bcm/pinctrl-bcm63268.c
-f:drivers/pinctrl/bcm/pinctrl-bcm6328.c
-f:drivers/pinctrl/bcm/pinctrl-bcm6358.c
-f:drivers/pinctrl/bcm/pinctrl-bcm6362.c
-f:drivers/pinctrl/bcm/pinctrl-bcm6368.c
-f:drivers/pinctrl/bcm/pinctrl-bcm63xx.c
-f:drivers/pinctrl/bcm/pinctrl-bcm63xx.h
-f:drivers/pinctrl/bcm/pinctrl-cygnus-mux.c
-f:drivers/pinctrl/bcm/pinctrl-iproc-gpio.c
-f:drivers/pinctrl/bcm/pinctrl-ns.c
-f:drivers/pinctrl/bcm/pinctrl-ns2-mux.c
-f:drivers/pinctrl/bcm/pinctrl-nsp-gpio.c
-f:drivers/pinctrl/bcm/pinctrl-nsp-mux.c
-f:drivers/pinctrl/berlin/Kconfig
-f:drivers/pinctrl/berlin/Makefile
-f:drivers/pinctrl/berlin/berlin-bg2.c
-f:drivers/pinctrl/berlin/berlin-bg2cd.c
-f:drivers/pinctrl/berlin/berlin-bg2q.c
-f:drivers/pinctrl/berlin/berlin-bg4ct.c
-f:drivers/pinctrl/berlin/berlin.c
-f:drivers/pinctrl/berlin/berlin.h
-f:drivers/pinctrl/berlin/pinctrl-as370.c
-f:drivers/pinctrl/cirrus/Kconfig
-f:drivers/pinctrl/cirrus/Makefile
-f:drivers/pinctrl/cirrus/pinctrl-cs42l43.c
-f:drivers/pinctrl/cirrus/pinctrl-cs47l15.c
-f:drivers/pinctrl/cirrus/pinctrl-cs47l35.c
-f:drivers/pinctrl/cirrus/pinctrl-cs47l85.c
-f:drivers/pinctrl/cirrus/pinctrl-cs47l90.c
-f:drivers/pinctrl/cirrus/pinctrl-cs47l92.c
-f:drivers/pinctrl/cirrus/pinctrl-lochnagar.c
-f:drivers/pinctrl/cirrus/pinctrl-madera-core.c
-f:drivers/pinctrl/cirrus/pinctrl-madera.h
-f:drivers/pinctrl/core.c
-f:drivers/pinctrl/core.h
-f:drivers/pinctrl/devicetree.c
-f:drivers/pinctrl/devicetree.h
-f:drivers/pinctrl/freescale/Kconfig
-f:drivers/pinctrl/freescale/Makefile
-f:drivers/pinctrl/freescale/pinctrl-imx-scmi.c
-f:drivers/pinctrl/freescale/pinctrl-imx.c
-f:drivers/pinctrl/freescale/pinctrl-imx.h
-f:drivers/pinctrl/freescale/pinctrl-imx1-core.c
-f:drivers/pinctrl/freescale/pinctrl-imx1.c
-f:drivers/pinctrl/freescale/pinctrl-imx1.h
-f:drivers/pinctrl/freescale/pinctrl-imx23.c
-f:drivers/pinctrl/freescale/pinctrl-imx25.c
-f:drivers/pinctrl/freescale/pinctrl-imx27.c
-f:drivers/pinctrl/freescale/pinctrl-imx28.c
-f:drivers/pinctrl/freescale/pinctrl-imx35.c
-f:drivers/pinctrl/freescale/pinctrl-imx50.c
-f:drivers/pinctrl/freescale/pinctrl-imx51.c
-f:drivers/pinctrl/freescale/pinctrl-imx53.c
-f:drivers/pinctrl/freescale/pinctrl-imx6dl.c
-f:drivers/pinctrl/freescale/pinctrl-imx6q.c
-f:drivers/pinctrl/freescale/pinctrl-imx6sl.c
-f:drivers/pinctrl/freescale/pinctrl-imx6sll.c
-f:drivers/pinctrl/freescale/pinctrl-imx6sx.c
-f:drivers/pinctrl/freescale/pinctrl-imx6ul.c
-f:drivers/pinctrl/freescale/pinctrl-imx7d.c
-f:drivers/pinctrl/freescale/pinctrl-imx7ulp.c
-f:drivers/pinctrl/freescale/pinctrl-imx8dxl.c
-f:drivers/pinctrl/freescale/pinctrl-imx8mm.c
-f:drivers/pinctrl/freescale/pinctrl-imx8mn.c
-f:drivers/pinctrl/freescale/pinctrl-imx8mp.c
-f:drivers/pinctrl/freescale/pinctrl-imx8mq.c
-f:drivers/pinctrl/freescale/pinctrl-imx8qm.c
-f:drivers/pinctrl/freescale/pinctrl-imx8qxp.c
-f:drivers/pinctrl/freescale/pinctrl-imx8ulp.c
-f:drivers/pinctrl/freescale/pinctrl-imx91.c
-f:drivers/pinctrl/freescale/pinctrl-imx93.c
-f:drivers/pinctrl/freescale/pinctrl-imxrt1050.c
-f:drivers/pinctrl/freescale/pinctrl-imxrt1170.c
-f:drivers/pinctrl/freescale/pinctrl-mxs.c
-f:drivers/pinctrl/freescale/pinctrl-mxs.h
-f:drivers/pinctrl/freescale/pinctrl-scu.c
-f:drivers/pinctrl/freescale/pinctrl-vf610.c
-f:drivers/pinctrl/intel/Kconfig
-f:drivers/pinctrl/intel/Kconfig.tng
-f:drivers/pinctrl/intel/Makefile
-f:drivers/pinctrl/intel/pinctrl-alderlake.c
-f:drivers/pinctrl/intel/pinctrl-baytrail.c
-f:drivers/pinctrl/intel/pinctrl-broxton.c
-f:drivers/pinctrl/intel/pinctrl-cannonlake.c
-f:drivers/pinctrl/intel/pinctrl-cedarfork.c
-f:drivers/pinctrl/intel/pinctrl-cherryview.c
-f:drivers/pinctrl/intel/pinctrl-denverton.c
-f:drivers/pinctrl/intel/pinctrl-elkhartlake.c
-f:drivers/pinctrl/intel/pinctrl-emmitsburg.c
-f:drivers/pinctrl/intel/pinctrl-geminilake.c
-f:drivers/pinctrl/intel/pinctrl-icelake.c
-f:drivers/pinctrl/intel/pinctrl-intel-platform.c
-f:drivers/pinctrl/intel/pinctrl-intel.c
-f:drivers/pinctrl/intel/pinctrl-intel.h
-f:drivers/pinctrl/intel/pinctrl-jasperlake.c
-f:drivers/pinctrl/intel/pinctrl-lakefield.c
-f:drivers/pinctrl/intel/pinctrl-lewisburg.c
-f:drivers/pinctrl/intel/pinctrl-lynxpoint.c
-f:drivers/pinctrl/intel/pinctrl-merrifield.c
-f:drivers/pinctrl/intel/pinctrl-meteorlake.c
-f:drivers/pinctrl/intel/pinctrl-meteorpoint.c
-f:drivers/pinctrl/intel/pinctrl-moorefield.c
-f:drivers/pinctrl/intel/pinctrl-sunrisepoint.c
-f:drivers/pinctrl/intel/pinctrl-tangier.c
-f:drivers/pinctrl/intel/pinctrl-tangier.h
-f:drivers/pinctrl/intel/pinctrl-tigerlake.c
-f:drivers/pinctrl/mediatek/Kconfig
-f:drivers/pinctrl/mediatek/Makefile
-f:drivers/pinctrl/mediatek/mtk-eint.c
-f:drivers/pinctrl/mediatek/mtk-eint.h
-f:drivers/pinctrl/mediatek/pinctrl-airoha.c
-f:drivers/pinctrl/mediatek/pinctrl-moore.c
-f:drivers/pinctrl/mediatek/pinctrl-moore.h
-f:drivers/pinctrl/mediatek/pinctrl-mt2701.c
-f:drivers/pinctrl/mediatek/pinctrl-mt2712.c
-f:drivers/pinctrl/mediatek/pinctrl-mt6397.c
-f:drivers/pinctrl/mediatek/pinctrl-mt6765.c
-f:drivers/pinctrl/mediatek/pinctrl-mt6779.c
-f:drivers/pinctrl/mediatek/pinctrl-mt6795.c
-f:drivers/pinctrl/mediatek/pinctrl-mt6797.c
-f:drivers/pinctrl/mediatek/pinctrl-mt6893.c
-f:drivers/pinctrl/mediatek/pinctrl-mt7620.c
-f:drivers/pinctrl/mediatek/pinctrl-mt7621.c
-f:drivers/pinctrl/mediatek/pinctrl-mt7622.c
-f:drivers/pinctrl/mediatek/pinctrl-mt7623.c
-f:drivers/pinctrl/mediatek/pinctrl-mt7629.c
-f:drivers/pinctrl/mediatek/pinctrl-mt76x8.c
-f:drivers/pinctrl/mediatek/pinctrl-mt7981.c
-f:drivers/pinctrl/mediatek/pinctrl-mt7986.c
-f:drivers/pinctrl/mediatek/pinctrl-mt7988.c
-f:drivers/pinctrl/mediatek/pinctrl-mt8127.c
-f:drivers/pinctrl/mediatek/pinctrl-mt8135.c
-f:drivers/pinctrl/mediatek/pinctrl-mt8167.c
-f:drivers/pinctrl/mediatek/pinctrl-mt8173.c
-f:drivers/pinctrl/mediatek/pinctrl-mt8183.c
-f:drivers/pinctrl/mediatek/pinctrl-mt8186.c
-f:drivers/pinctrl/mediatek/pinctrl-mt8188.c
-f:drivers/pinctrl/mediatek/pinctrl-mt8192.c
-f:drivers/pinctrl/mediatek/pinctrl-mt8195.c
-f:drivers/pinctrl/mediatek/pinctrl-mt8196.c
-f:drivers/pinctrl/mediatek/pinctrl-mt8365.c
-f:drivers/pinctrl/mediatek/pinctrl-mt8516.c
-f:drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c
-f:drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h
-f:drivers/pinctrl/mediatek/pinctrl-mtk-common.c
-f:drivers/pinctrl/mediatek/pinctrl-mtk-common.h
-f:drivers/pinctrl/mediatek/pinctrl-mtk-mt2701.h
-f:drivers/pinctrl/mediatek/pinctrl-mtk-mt2712.h
-f:drivers/pinctrl/mediatek/pinctrl-mtk-mt6397.h
-f:drivers/pinctrl/mediatek/pinctrl-mtk-mt6765.h
-f:drivers/pinctrl/mediatek/pinctrl-mtk-mt6779.h
-f:drivers/pinctrl/mediatek/pinctrl-mtk-mt6795.h
-f:drivers/pinctrl/mediatek/pinctrl-mtk-mt6797.h
-f:drivers/pinctrl/mediatek/pinctrl-mtk-mt6893.h
-f:drivers/pinctrl/mediatek/pinctrl-mtk-mt8127.h
-f:drivers/pinctrl/mediatek/pinctrl-mtk-mt8135.h
-f:drivers/pinctrl/mediatek/pinctrl-mtk-mt8167.h
-f:drivers/pinctrl/mediatek/pinctrl-mtk-mt8173.h
-f:drivers/pinctrl/mediatek/pinctrl-mtk-mt8183.h
-f:drivers/pinctrl/mediatek/pinctrl-mtk-mt8186.h
-f:drivers/pinctrl/mediatek/pinctrl-mtk-mt8188.h
-f:drivers/pinctrl/mediatek/pinctrl-mtk-mt8192.h
-f:drivers/pinctrl/mediatek/pinctrl-mtk-mt8195.h
-f:drivers/pinctrl/mediatek/pinctrl-mtk-mt8196.h
-f:drivers/pinctrl/mediatek/pinctrl-mtk-mt8365.h
-f:drivers/pinctrl/mediatek/pinctrl-mtk-mt8516.h
-f:drivers/pinctrl/mediatek/pinctrl-mtmips.c
-f:drivers/pinctrl/mediatek/pinctrl-mtmips.h
-f:drivers/pinctrl/mediatek/pinctrl-paris.c
-f:drivers/pinctrl/mediatek/pinctrl-paris.h
-f:drivers/pinctrl/mediatek/pinctrl-rt2880.c
-f:drivers/pinctrl/mediatek/pinctrl-rt305x.c
-f:drivers/pinctrl/mediatek/pinctrl-rt3883.c
-f:drivers/pinctrl/meson/Kconfig
-f:drivers/pinctrl/meson/Makefile
-f:drivers/pinctrl/meson/pinctrl-amlogic-a4.c
-f:drivers/pinctrl/meson/pinctrl-amlogic-c3.c
-f:drivers/pinctrl/meson/pinctrl-amlogic-t7.c
-f:drivers/pinctrl/meson/pinctrl-meson-a1.c
-f:drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c
-f:drivers/pinctrl/meson/pinctrl-meson-axg-pmx.h
-f:drivers/pinctrl/meson/pinctrl-meson-axg.c
-f:drivers/pinctrl/meson/pinctrl-meson-g12a.c
-f:drivers/pinctrl/meson/pinctrl-meson-gxbb.c
-f:drivers/pinctrl/meson/pinctrl-meson-gxl.c
-f:drivers/pinctrl/meson/pinctrl-meson-s4.c
-f:drivers/pinctrl/meson/pinctrl-meson.c
-f:drivers/pinctrl/meson/pinctrl-meson.h
-f:drivers/pinctrl/meson/pinctrl-meson8-pmx.c
-f:drivers/pinctrl/meson/pinctrl-meson8-pmx.h
-f:drivers/pinctrl/meson/pinctrl-meson8.c
-f:drivers/pinctrl/meson/pinctrl-meson8b.c
-f:drivers/pinctrl/mvebu/Kconfig
-f:drivers/pinctrl/mvebu/Makefile
-f:drivers/pinctrl/mvebu/pinctrl-ac5.c
-f:drivers/pinctrl/mvebu/pinctrl-armada-370.c
-f:drivers/pinctrl/mvebu/pinctrl-armada-375.c
-f:drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
-f:drivers/pinctrl/mvebu/pinctrl-armada-38x.c
-f:drivers/pinctrl/mvebu/pinctrl-armada-39x.c
-f:drivers/pinctrl/mvebu/pinctrl-armada-ap806.c
-f:drivers/pinctrl/mvebu/pinctrl-armada-cp110.c
-f:drivers/pinctrl/mvebu/pinctrl-armada-xp.c
-f:drivers/pinctrl/mvebu/pinctrl-dove.c
-f:drivers/pinctrl/mvebu/pinctrl-kirkwood.c
-f:drivers/pinctrl/mvebu/pinctrl-mvebu.c
-f:drivers/pinctrl/mvebu/pinctrl-mvebu.h
-f:drivers/pinctrl/mvebu/pinctrl-orion.c
-f:drivers/pinctrl/nomadik/Kconfig
-f:drivers/pinctrl/nomadik/Makefile
-f:drivers/pinctrl/nomadik/pinctrl-ab8500.c
-f:drivers/pinctrl/nomadik/pinctrl-ab8505.c
-f:drivers/pinctrl/nomadik/pinctrl-abx500.c
-f:drivers/pinctrl/nomadik/pinctrl-abx500.h
-f:drivers/pinctrl/nomadik/pinctrl-nomadik-db8500.c
-f:drivers/pinctrl/nomadik/pinctrl-nomadik-stn8815.c
-f:drivers/pinctrl/nomadik/pinctrl-nomadik.c
-f:drivers/pinctrl/nuvoton/Kconfig
-f:drivers/pinctrl/nuvoton/Makefile
-f:drivers/pinctrl/nuvoton/pinctrl-ma35.c
-f:drivers/pinctrl/nuvoton/pinctrl-ma35.h
-f:drivers/pinctrl/nuvoton/pinctrl-ma35d1.c
-f:drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c
-f:drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c
-f:drivers/pinctrl/nuvoton/pinctrl-wpcm450.c
-f:drivers/pinctrl/nxp/Kconfig
-f:drivers/pinctrl/nxp/Makefile
-f:drivers/pinctrl/nxp/pinctrl-s32.h
-f:drivers/pinctrl/nxp/pinctrl-s32cc.c
-f:drivers/pinctrl/nxp/pinctrl-s32g2.c
-f:drivers/pinctrl/pinconf-generic.c
-f:drivers/pinctrl/pinconf.c
-f:drivers/pinctrl/pinconf.h
-f:drivers/pinctrl/pinctrl-amd.c
-f:drivers/pinctrl/pinctrl-amd.h
-f:drivers/pinctrl/pinctrl-amdisp.c
-f:drivers/pinctrl/pinctrl-amdisp.h
-f:drivers/pinctrl/pinctrl-apple-gpio.c
-f:drivers/pinctrl/pinctrl-artpec6.c
-f:drivers/pinctrl/pinctrl-as3722.c
-f:drivers/pinctrl/pinctrl-at91-pio4.c
-f:drivers/pinctrl/pinctrl-at91.c
-f:drivers/pinctrl/pinctrl-at91.h
-f:drivers/pinctrl/pinctrl-aw9523.c
-f:drivers/pinctrl/pinctrl-axp209.c
-f:drivers/pinctrl/pinctrl-bm1880.c
-f:drivers/pinctrl/pinctrl-cy8c95x0.c
-f:drivers/pinctrl/pinctrl-da850-pupd.c
-f:drivers/pinctrl/pinctrl-da9062.c
-f:drivers/pinctrl/pinctrl-digicolor.c
-f:drivers/pinctrl/pinctrl-ep93xx.c
-f:drivers/pinctrl/pinctrl-equilibrium.c
-f:drivers/pinctrl/pinctrl-equilibrium.h
-f:drivers/pinctrl/pinctrl-eyeq5.c
-f:drivers/pinctrl/pinctrl-falcon.c
-f:drivers/pinctrl/pinctrl-gemini.c
-f:drivers/pinctrl/pinctrl-ingenic.c
-f:drivers/pinctrl/pinctrl-k210.c
-f:drivers/pinctrl/pinctrl-k230.c
-f:drivers/pinctrl/pinctrl-keembay.c
-f:drivers/pinctrl/pinctrl-lantiq.c
-f:drivers/pinctrl/pinctrl-lantiq.h
-f:drivers/pinctrl/pinctrl-loongson2.c
-f:drivers/pinctrl/pinctrl-lpc18xx.c
-f:drivers/pinctrl/pinctrl-max77620.c
-f:drivers/pinctrl/pinctrl-mcp23s08.c
-f:drivers/pinctrl/pinctrl-mcp23s08.h
-f:drivers/pinctrl/pinctrl-mcp23s08_i2c.c
-f:drivers/pinctrl/pinctrl-mcp23s08_spi.c
-f:drivers/pinctrl/pinctrl-microchip-sgpio.c
-f:drivers/pinctrl/pinctrl-mlxbf3.c
-f:drivers/pinctrl/pinctrl-ocelot.c
-f:drivers/pinctrl/pinctrl-palmas.c
-f:drivers/pinctrl/pinctrl-pef2256.c
-f:drivers/pinctrl/pinctrl-pic32.c
-f:drivers/pinctrl/pinctrl-pic32.h
-f:drivers/pinctrl/pinctrl-pistachio.c
-f:drivers/pinctrl/pinctrl-rk805.c
-f:drivers/pinctrl/pinctrl-rockchip.c
-f:drivers/pinctrl/pinctrl-rockchip.h
-f:drivers/pinctrl/pinctrl-rp1.c
-f:drivers/pinctrl/pinctrl-scmi.c
-f:drivers/pinctrl/pinctrl-single.c
-f:drivers/pinctrl/pinctrl-st.c
-f:drivers/pinctrl/pinctrl-stmfx.c
-f:drivers/pinctrl/pinctrl-sx150x.c
-f:drivers/pinctrl/pinctrl-tb10x.c
-f:drivers/pinctrl/pinctrl-th1520.c
-f:drivers/pinctrl/pinctrl-tps6594.c
-f:drivers/pinctrl/pinctrl-utils.c
-f:drivers/pinctrl/pinctrl-utils.h
-f:drivers/pinctrl/pinctrl-xway.c
-f:drivers/pinctrl/pinctrl-zynq.c
-f:drivers/pinctrl/pinctrl-zynqmp.c
-f:drivers/pinctrl/pinmux.c
-f:drivers/pinctrl/pinmux.h
-f:drivers/pinctrl/pxa/Kconfig
-f:drivers/pinctrl/pxa/Makefile
-f:drivers/pinctrl/pxa/pinctrl-pxa25x.c
-f:drivers/pinctrl/pxa/pinctrl-pxa27x.c
-f:drivers/pinctrl/pxa/pinctrl-pxa2xx.c
-f:drivers/pinctrl/pxa/pinctrl-pxa2xx.h
-f:drivers/pinctrl/qcom/Kconfig
-f:drivers/pinctrl/qcom/Kconfig.msm
-f:drivers/pinctrl/qcom/Makefile
-f:drivers/pinctrl/qcom/pinctrl-apq8064.c
-f:drivers/pinctrl/qcom/pinctrl-apq8084.c
-f:drivers/pinctrl/qcom/pinctrl-ipq4019.c
-f:drivers/pinctrl/qcom/pinctrl-ipq5018.c
-f:drivers/pinctrl/qcom/pinctrl-ipq5332.c
-f:drivers/pinctrl/qcom/pinctrl-ipq5424.c
-f:drivers/pinctrl/qcom/pinctrl-ipq6018.c
-f:drivers/pinctrl/qcom/pinctrl-ipq8064.c
-f:drivers/pinctrl/qcom/pinctrl-ipq8074.c
-f:drivers/pinctrl/qcom/pinctrl-ipq9574.c
-f:drivers/pinctrl/qcom/pinctrl-lpass-lpi.c
-f:drivers/pinctrl/qcom/pinctrl-lpass-lpi.h
-f:drivers/pinctrl/qcom/pinctrl-mdm9607.c
-f:drivers/pinctrl/qcom/pinctrl-mdm9615.c
-f:drivers/pinctrl/qcom/pinctrl-msm.c
-f:drivers/pinctrl/qcom/pinctrl-msm.h
-f:drivers/pinctrl/qcom/pinctrl-msm8226.c
-f:drivers/pinctrl/qcom/pinctrl-msm8660.c
-f:drivers/pinctrl/qcom/pinctrl-msm8909.c
-f:drivers/pinctrl/qcom/pinctrl-msm8916.c
-f:drivers/pinctrl/qcom/pinctrl-msm8917.c
-f:drivers/pinctrl/qcom/pinctrl-msm8953.c
-f:drivers/pinctrl/qcom/pinctrl-msm8960.c
-f:drivers/pinctrl/qcom/pinctrl-msm8976.c
-f:drivers/pinctrl/qcom/pinctrl-msm8994.c
-f:drivers/pinctrl/qcom/pinctrl-msm8996.c
-f:drivers/pinctrl/qcom/pinctrl-msm8998.c
-f:drivers/pinctrl/qcom/pinctrl-msm8x74.c
-f:drivers/pinctrl/qcom/pinctrl-qcm2290.c
-f:drivers/pinctrl/qcom/pinctrl-qcs404.c
-f:drivers/pinctrl/qcom/pinctrl-qcs615.c
-f:drivers/pinctrl/qcom/pinctrl-qcs8300.c
-f:drivers/pinctrl/qcom/pinctrl-qdf2xxx.c
-f:drivers/pinctrl/qcom/pinctrl-qdu1000.c
-f:drivers/pinctrl/qcom/pinctrl-sa8775p.c
-f:drivers/pinctrl/qcom/pinctrl-sar2130p.c
-f:drivers/pinctrl/qcom/pinctrl-sc7180.c
-f:drivers/pinctrl/qcom/pinctrl-sc7280-lpass-lpi.c
-f:drivers/pinctrl/qcom/pinctrl-sc7280.c
-f:drivers/pinctrl/qcom/pinctrl-sc8180x.c
-f:drivers/pinctrl/qcom/pinctrl-sc8280xp-lpass-lpi.c
-f:drivers/pinctrl/qcom/pinctrl-sc8280xp.c
-f:drivers/pinctrl/qcom/pinctrl-sdm660.c
-f:drivers/pinctrl/qcom/pinctrl-sdm670.c
-f:drivers/pinctrl/qcom/pinctrl-sdm845.c
-f:drivers/pinctrl/qcom/pinctrl-sdx55.c
-f:drivers/pinctrl/qcom/pinctrl-sdx65.c
-f:drivers/pinctrl/qcom/pinctrl-sdx75.c
-f:drivers/pinctrl/qcom/pinctrl-sm4250-lpass-lpi.c
-f:drivers/pinctrl/qcom/pinctrl-sm4450.c
-f:drivers/pinctrl/qcom/pinctrl-sm6115-lpass-lpi.c
-f:drivers/pinctrl/qcom/pinctrl-sm6115.c
-f:drivers/pinctrl/qcom/pinctrl-sm6125.c
-f:drivers/pinctrl/qcom/pinctrl-sm6350.c
-f:drivers/pinctrl/qcom/pinctrl-sm6375.c
-f:drivers/pinctrl/qcom/pinctrl-sm7150.c
-f:drivers/pinctrl/qcom/pinctrl-sm8150.c
-f:drivers/pinctrl/qcom/pinctrl-sm8250-lpass-lpi.c
-f:drivers/pinctrl/qcom/pinctrl-sm8250.c
-f:drivers/pinctrl/qcom/pinctrl-sm8350-lpass-lpi.c
-f:drivers/pinctrl/qcom/pinctrl-sm8350.c
-f:drivers/pinctrl/qcom/pinctrl-sm8450-lpass-lpi.c
-f:drivers/pinctrl/qcom/pinctrl-sm8450.c
-f:drivers/pinctrl/qcom/pinctrl-sm8550-lpass-lpi.c
-f:drivers/pinctrl/qcom/pinctrl-sm8550.c
-f:drivers/pinctrl/qcom/pinctrl-sm8650-lpass-lpi.c
-f:drivers/pinctrl/qcom/pinctrl-sm8650.c
-f:drivers/pinctrl/qcom/pinctrl-sm8750.c
-f:drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
-f:drivers/pinctrl/qcom/pinctrl-spmi-mpp.c
-f:drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c
-f:drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c
-f:drivers/pinctrl/qcom/pinctrl-x1e80100.c
-f:drivers/pinctrl/qcom/tlmm-test.c
-f:drivers/pinctrl/realtek/Kconfig
-f:drivers/pinctrl/realtek/Makefile
-f:drivers/pinctrl/realtek/pinctrl-rtd.c
-f:drivers/pinctrl/realtek/pinctrl-rtd.h
-f:drivers/pinctrl/realtek/pinctrl-rtd1315e.c
-f:drivers/pinctrl/realtek/pinctrl-rtd1319d.c
-f:drivers/pinctrl/realtek/pinctrl-rtd1619b.c
-f:drivers/pinctrl/renesas/Kconfig
-f:drivers/pinctrl/renesas/Makefile
-f:drivers/pinctrl/renesas/core.c
-f:drivers/pinctrl/renesas/core.h
-f:drivers/pinctrl/renesas/gpio.c
-f:drivers/pinctrl/renesas/pfc-emev2.c
-f:drivers/pinctrl/renesas/pfc-r8a73a4.c
-f:drivers/pinctrl/renesas/pfc-r8a7740.c
-f:drivers/pinctrl/renesas/pfc-r8a77470.c
-f:drivers/pinctrl/renesas/pfc-r8a7778.c
-f:drivers/pinctrl/renesas/pfc-r8a7779.c
-f:drivers/pinctrl/renesas/pfc-r8a7790.c
-f:drivers/pinctrl/renesas/pfc-r8a7791.c
-f:drivers/pinctrl/renesas/pfc-r8a7792.c
-f:drivers/pinctrl/renesas/pfc-r8a7794.c
-f:drivers/pinctrl/renesas/pfc-r8a77951.c
-f:drivers/pinctrl/renesas/pfc-r8a7796.c
-f:drivers/pinctrl/renesas/pfc-r8a77965.c
-f:drivers/pinctrl/renesas/pfc-r8a77970.c
-f:drivers/pinctrl/renesas/pfc-r8a77980.c
-f:drivers/pinctrl/renesas/pfc-r8a77990.c
-f:drivers/pinctrl/renesas/pfc-r8a77995.c
-f:drivers/pinctrl/renesas/pfc-r8a779a0.c
-f:drivers/pinctrl/renesas/pfc-r8a779f0.c
-f:drivers/pinctrl/renesas/pfc-r8a779g0.c
-f:drivers/pinctrl/renesas/pfc-r8a779h0.c
-f:drivers/pinctrl/renesas/pfc-sh7203.c
-f:drivers/pinctrl/renesas/pfc-sh7264.c
-f:drivers/pinctrl/renesas/pfc-sh7269.c
-f:drivers/pinctrl/renesas/pfc-sh73a0.c
-f:drivers/pinctrl/renesas/pfc-sh7720.c
-f:drivers/pinctrl/renesas/pfc-sh7722.c
-f:drivers/pinctrl/renesas/pfc-sh7723.c
-f:drivers/pinctrl/renesas/pfc-sh7724.c
-f:drivers/pinctrl/renesas/pfc-sh7734.c
-f:drivers/pinctrl/renesas/pfc-sh7757.c
-f:drivers/pinctrl/renesas/pfc-sh7785.c
-f:drivers/pinctrl/renesas/pfc-sh7786.c
-f:drivers/pinctrl/renesas/pfc-shx3.c
-f:drivers/pinctrl/renesas/pinctrl-rza1.c
-f:drivers/pinctrl/renesas/pinctrl-rza2.c
-f:drivers/pinctrl/renesas/pinctrl-rzg2l.c
-f:drivers/pinctrl/renesas/pinctrl-rzn1.c
-f:drivers/pinctrl/renesas/pinctrl-rzv2m.c
-f:drivers/pinctrl/renesas/pinctrl.c
-f:drivers/pinctrl/renesas/sh_pfc.h
-f:drivers/pinctrl/samsung/Kconfig
-f:drivers/pinctrl/samsung/Makefile
-f:drivers/pinctrl/samsung/pinctrl-exynos-arm.c
-f:drivers/pinctrl/samsung/pinctrl-exynos-arm64.c
-f:drivers/pinctrl/samsung/pinctrl-exynos.c
-f:drivers/pinctrl/samsung/pinctrl-exynos.h
-f:drivers/pinctrl/samsung/pinctrl-s3c64xx.c
-f:drivers/pinctrl/samsung/pinctrl-samsung.c
-f:drivers/pinctrl/samsung/pinctrl-samsung.h
-f:drivers/pinctrl/sophgo/Kconfig
-f:drivers/pinctrl/sophgo/Makefile
-f:drivers/pinctrl/sophgo/pinctrl-cv1800b.c
-f:drivers/pinctrl/sophgo/pinctrl-cv1812h.c
-f:drivers/pinctrl/sophgo/pinctrl-cv18xx.c
-f:drivers/pinctrl/sophgo/pinctrl-cv18xx.h
-f:drivers/pinctrl/sophgo/pinctrl-sg2000.c
-f:drivers/pinctrl/sophgo/pinctrl-sg2002.c
-f:drivers/pinctrl/sophgo/pinctrl-sg2042-ops.c
-f:drivers/pinctrl/sophgo/pinctrl-sg2042.c
-f:drivers/pinctrl/sophgo/pinctrl-sg2042.h
-f:drivers/pinctrl/sophgo/pinctrl-sg2044.c
-f:drivers/pinctrl/sophgo/pinctrl-sophgo-common.c
-f:drivers/pinctrl/sophgo/pinctrl-sophgo.h
-f:drivers/pinctrl/spacemit/Kconfig
-f:drivers/pinctrl/spacemit/Makefile
-f:drivers/pinctrl/spacemit/pinctrl-k1.c
-f:drivers/pinctrl/spacemit/pinctrl-k1.h
-f:drivers/pinctrl/spear/Kconfig
-f:drivers/pinctrl/spear/Makefile
-f:drivers/pinctrl/spear/pinctrl-plgpio.c
-f:drivers/pinctrl/spear/pinctrl-spear.c
-f:drivers/pinctrl/spear/pinctrl-spear.h
-f:drivers/pinctrl/spear/pinctrl-spear1310.c
-f:drivers/pinctrl/spear/pinctrl-spear1340.c
-f:drivers/pinctrl/spear/pinctrl-spear300.c
-f:drivers/pinctrl/spear/pinctrl-spear310.c
-f:drivers/pinctrl/spear/pinctrl-spear320.c
-f:drivers/pinctrl/spear/pinctrl-spear3xx.c
-f:drivers/pinctrl/spear/pinctrl-spear3xx.h
-f:drivers/pinctrl/sprd/Kconfig
-f:drivers/pinctrl/sprd/Makefile
-f:drivers/pinctrl/sprd/pinctrl-sprd-sc9860.c
-f:drivers/pinctrl/sprd/pinctrl-sprd.c
-f:drivers/pinctrl/sprd/pinctrl-sprd.h
-f:drivers/pinctrl/starfive/Kconfig
-f:drivers/pinctrl/starfive/Makefile
-f:drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c
-f:drivers/pinctrl/starfive/pinctrl-starfive-jh7110-aon.c
-f:drivers/pinctrl/starfive/pinctrl-starfive-jh7110-sys.c
-f:drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c
-f:drivers/pinctrl/starfive/pinctrl-starfive-jh7110.h
-f:drivers/pinctrl/stm32/Kconfig
-f:drivers/pinctrl/stm32/Makefile
-f:drivers/pinctrl/stm32/pinctrl-stm32.c
-f:drivers/pinctrl/stm32/pinctrl-stm32.h
-f:drivers/pinctrl/stm32/pinctrl-stm32f429.c
-f:drivers/pinctrl/stm32/pinctrl-stm32f469.c
-f:drivers/pinctrl/stm32/pinctrl-stm32f746.c
-f:drivers/pinctrl/stm32/pinctrl-stm32f769.c
-f:drivers/pinctrl/stm32/pinctrl-stm32h743.c
-f:drivers/pinctrl/stm32/pinctrl-stm32mp135.c
-f:drivers/pinctrl/stm32/pinctrl-stm32mp157.c
-f:drivers/pinctrl/stm32/pinctrl-stm32mp257.c
-f:drivers/pinctrl/sunplus/Kconfig
-f:drivers/pinctrl/sunplus/Makefile
-f:drivers/pinctrl/sunplus/sppctl.c
-f:drivers/pinctrl/sunplus/sppctl.h
-f:drivers/pinctrl/sunplus/sppctl_sp7021.c
-f:drivers/pinctrl/sunxi/Kconfig
-f:drivers/pinctrl/sunxi/Makefile
-f:drivers/pinctrl/sunxi/pinctrl-sun20i-d1.c
-f:drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c
-f:drivers/pinctrl/sunxi/pinctrl-sun50i-a100-r.c
-f:drivers/pinctrl/sunxi/pinctrl-sun50i-a100.c
-f:drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c
-f:drivers/pinctrl/sunxi/pinctrl-sun50i-a64.c
-f:drivers/pinctrl/sunxi/pinctrl-sun50i-h5.c
-f:drivers/pinctrl/sunxi/pinctrl-sun50i-h6-r.c
-f:drivers/pinctrl/sunxi/pinctrl-sun50i-h6.c
-f:drivers/pinctrl/sunxi/pinctrl-sun50i-h616-r.c
-f:drivers/pinctrl/sunxi/pinctrl-sun50i-h616.c
-f:drivers/pinctrl/sunxi/pinctrl-sun55i-a523-r.c
-f:drivers/pinctrl/sunxi/pinctrl-sun55i-a523.c
-f:drivers/pinctrl/sunxi/pinctrl-sun5i.c
-f:drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c
-f:drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c
-f:drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c
-f:drivers/pinctrl/sunxi/pinctrl-sun8i-a23.c
-f:drivers/pinctrl/sunxi/pinctrl-sun8i-a33.c
-f:drivers/pinctrl/sunxi/pinctrl-sun8i-a83t-r.c
-f:drivers/pinctrl/sunxi/pinctrl-sun8i-a83t.c
-f:drivers/pinctrl/sunxi/pinctrl-sun8i-h3-r.c
-f:drivers/pinctrl/sunxi/pinctrl-sun8i-h3.c
-f:drivers/pinctrl/sunxi/pinctrl-sun8i-v3s.c
-f:drivers/pinctrl/sunxi/pinctrl-sun9i-a80-r.c
-f:drivers/pinctrl/sunxi/pinctrl-sun9i-a80.c
-f:drivers/pinctrl/sunxi/pinctrl-suniv-f1c100s.c
-f:drivers/pinctrl/sunxi/pinctrl-sunxi-dt.c
-f:drivers/pinctrl/sunxi/pinctrl-sunxi.c
-f:drivers/pinctrl/sunxi/pinctrl-sunxi.h
-f:drivers/pinctrl/tegra/Kconfig
-f:drivers/pinctrl/tegra/Makefile
-f:drivers/pinctrl/tegra/pinctrl-tegra-xusb.c
-f:drivers/pinctrl/tegra/pinctrl-tegra.c
-f:drivers/pinctrl/tegra/pinctrl-tegra.h
-f:drivers/pinctrl/tegra/pinctrl-tegra114.c
-f:drivers/pinctrl/tegra/pinctrl-tegra124.c
-f:drivers/pinctrl/tegra/pinctrl-tegra194.c
-f:drivers/pinctrl/tegra/pinctrl-tegra20.c
-f:drivers/pinctrl/tegra/pinctrl-tegra210.c
-f:drivers/pinctrl/tegra/pinctrl-tegra234.c
-f:drivers/pinctrl/tegra/pinctrl-tegra30.c
-f:drivers/pinctrl/ti/Kconfig
-f:drivers/pinctrl/ti/Makefile
-f:drivers/pinctrl/ti/pinctrl-ti-iodelay.c
-f:drivers/pinctrl/uniphier/Kconfig
-f:drivers/pinctrl/uniphier/Makefile
-f:drivers/pinctrl/uniphier/pinctrl-uniphier-core.c
-f:drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c
-f:drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c
-f:drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c
-f:drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c
-f:drivers/pinctrl/uniphier/pinctrl-uniphier-nx1.c
-f:drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c
-f:drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c
-f:drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c
-f:drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c
-f:drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c
-f:drivers/pinctrl/uniphier/pinctrl-uniphier.h
-f:drivers/pinctrl/visconti/Kconfig
-f:drivers/pinctrl/visconti/Makefile
-f:drivers/pinctrl/visconti/pinctrl-common.c
-f:drivers/pinctrl/visconti/pinctrl-common.h
-f:drivers/pinctrl/visconti/pinctrl-tmpv7700.c
-f:drivers/pinctrl/vt8500/Kconfig
-f:drivers/pinctrl/vt8500/Makefile
-f:drivers/pinctrl/vt8500/pinctrl-vt8500.c
-f:drivers/pinctrl/vt8500/pinctrl-wm8505.c
-f:drivers/pinctrl/vt8500/pinctrl-wm8650.c
-f:drivers/pinctrl/vt8500/pinctrl-wm8750.c
-f:drivers/pinctrl/vt8500/pinctrl-wm8850.c
-f:drivers/pinctrl/vt8500/pinctrl-wmt.c
-f:drivers/pinctrl/vt8500/pinctrl-wmt.h
-f:drivers/platform/Kconfig
-f:drivers/platform/Makefile
-f:drivers/platform/arm64/Kconfig
-f:drivers/platform/arm64/Makefile
-f:drivers/platform/arm64/acer-aspire1-ec.c
-f:drivers/platform/arm64/huawei-gaokun-ec.c
-f:drivers/platform/arm64/lenovo-yoga-c630.c
-f:drivers/platform/chrome/Kconfig
-f:drivers/platform/chrome/Makefile
-f:drivers/platform/chrome/chromeos_acpi.c
-f:drivers/platform/chrome/chromeos_laptop.c
-f:drivers/platform/chrome/chromeos_of_hw_prober.c
-f:drivers/platform/chrome/chromeos_privacy_screen.c
-f:drivers/platform/chrome/chromeos_pstore.c
-f:drivers/platform/chrome/chromeos_tbmc.c
-f:drivers/platform/chrome/cros_ec.c
-f:drivers/platform/chrome/cros_ec.h
-f:drivers/platform/chrome/cros_ec_chardev.c
-f:drivers/platform/chrome/cros_ec_debugfs.c
-f:drivers/platform/chrome/cros_ec_i2c.c
-f:drivers/platform/chrome/cros_ec_ishtp.c
-f:drivers/platform/chrome/cros_ec_lightbar.c
-f:drivers/platform/chrome/cros_ec_lpc.c
-f:drivers/platform/chrome/cros_ec_lpc_mec.c
-f:drivers/platform/chrome/cros_ec_lpc_mec.h
-f:drivers/platform/chrome/cros_ec_proto.c
-f:drivers/platform/chrome/cros_ec_proto_test.c
-f:drivers/platform/chrome/cros_ec_proto_test_util.c
-f:drivers/platform/chrome/cros_ec_proto_test_util.h
-f:drivers/platform/chrome/cros_ec_rpmsg.c
-f:drivers/platform/chrome/cros_ec_sensorhub.c
-f:drivers/platform/chrome/cros_ec_sensorhub_ring.c
-f:drivers/platform/chrome/cros_ec_sensorhub_trace.h
-f:drivers/platform/chrome/cros_ec_spi.c
-f:drivers/platform/chrome/cros_ec_sysfs.c
-f:drivers/platform/chrome/cros_ec_trace.c
-f:drivers/platform/chrome/cros_ec_trace.h
-f:drivers/platform/chrome/cros_ec_typec.c
-f:drivers/platform/chrome/cros_ec_typec.h
-f:drivers/platform/chrome/cros_ec_uart.c
-f:drivers/platform/chrome/cros_ec_vbc.c
-f:drivers/platform/chrome/cros_hps_i2c.c
-f:drivers/platform/chrome/cros_kbd_led_backlight.c
-f:drivers/platform/chrome/cros_typec_altmode.c
-f:drivers/platform/chrome/cros_typec_altmode.h
-f:drivers/platform/chrome/cros_typec_switch.c
-f:drivers/platform/chrome/cros_typec_vdm.c
-f:drivers/platform/chrome/cros_typec_vdm.h
-f:drivers/platform/chrome/cros_usbpd_logger.c
-f:drivers/platform/chrome/cros_usbpd_notify.c
-f:drivers/platform/chrome/wilco_ec/Kconfig
-f:drivers/platform/chrome/wilco_ec/Makefile
-f:drivers/platform/chrome/wilco_ec/core.c
-f:drivers/platform/chrome/wilco_ec/debugfs.c
-f:drivers/platform/chrome/wilco_ec/event.c
-f:drivers/platform/chrome/wilco_ec/keyboard_leds.c
-f:drivers/platform/chrome/wilco_ec/mailbox.c
-f:drivers/platform/chrome/wilco_ec/properties.c
-f:drivers/platform/chrome/wilco_ec/sysfs.c
-f:drivers/platform/chrome/wilco_ec/telemetry.c
-f:drivers/platform/cznic/Kconfig
-f:drivers/platform/cznic/Makefile
-f:drivers/platform/cznic/turris-omnia-mcu-base.c
-f:drivers/platform/cznic/turris-omnia-mcu-gpio.c
-f:drivers/platform/cznic/turris-omnia-mcu-keyctl.c
-f:drivers/platform/cznic/turris-omnia-mcu-sys-off-wakeup.c
-f:drivers/platform/cznic/turris-omnia-mcu-trng.c
-f:drivers/platform/cznic/turris-omnia-mcu-watchdog.c
-f:drivers/platform/cznic/turris-omnia-mcu.h
-f:drivers/platform/cznic/turris-signing-key.c
-f:drivers/platform/goldfish/Kconfig
-f:drivers/platform/goldfish/Makefile
-f:drivers/platform/goldfish/goldfish_pipe.c
-f:drivers/platform/goldfish/goldfish_pipe_qemu.h
-f:drivers/platform/loongarch/Kconfig
-f:drivers/platform/loongarch/Makefile
-f:drivers/platform/loongarch/loongson-laptop.c
-f:drivers/platform/mellanox/Kconfig
-f:drivers/platform/mellanox/Makefile
-f:drivers/platform/mellanox/mlx-platform.c
-f:drivers/platform/mellanox/mlxbf-bootctl.c
-f:drivers/platform/mellanox/mlxbf-bootctl.h
-f:drivers/platform/mellanox/mlxbf-pmc.c
-f:drivers/platform/mellanox/mlxbf-tmfifo-regs.h
-f:drivers/platform/mellanox/mlxbf-tmfifo.c
-f:drivers/platform/mellanox/mlxreg-dpu.c
-f:drivers/platform/mellanox/mlxreg-hotplug.c
-f:drivers/platform/mellanox/mlxreg-io.c
-f:drivers/platform/mellanox/mlxreg-lc.c
-f:drivers/platform/mellanox/nvsw-sn2201.c
-f:drivers/platform/mips/Kconfig
-f:drivers/platform/mips/Makefile
-f:drivers/platform/mips/cpu_hwmon.c
-f:drivers/platform/mips/ls2k-reset.c
-f:drivers/platform/mips/rs780e-acpi.c
-f:drivers/platform/olpc/Kconfig
-f:drivers/platform/olpc/Makefile
-f:drivers/platform/olpc/olpc-ec.c
-f:drivers/platform/olpc/olpc-xo175-ec.c
-f:drivers/platform/surface/Kconfig
-f:drivers/platform/surface/Makefile
-f:drivers/platform/surface/aggregator/Kconfig
-f:drivers/platform/surface/aggregator/Makefile
-f:drivers/platform/surface/aggregator/bus.c
-f:drivers/platform/surface/aggregator/bus.h
-f:drivers/platform/surface/aggregator/controller.c
-f:drivers/platform/surface/aggregator/controller.h
-f:drivers/platform/surface/aggregator/core.c
-f:drivers/platform/surface/aggregator/ssh_msgb.h
-f:drivers/platform/surface/aggregator/ssh_packet_layer.c
-f:drivers/platform/surface/aggregator/ssh_packet_layer.h
-f:drivers/platform/surface/aggregator/ssh_parser.c
-f:drivers/platform/surface/aggregator/ssh_parser.h
-f:drivers/platform/surface/aggregator/ssh_request_layer.c
-f:drivers/platform/surface/aggregator/ssh_request_layer.h
-f:drivers/platform/surface/aggregator/trace.h
-f:drivers/platform/surface/surface3-wmi.c
-f:drivers/platform/surface/surface3_power.c
-f:drivers/platform/surface/surface_acpi_notify.c
-f:drivers/platform/surface/surface_aggregator_cdev.c
-f:drivers/platform/surface/surface_aggregator_hub.c
-f:drivers/platform/surface/surface_aggregator_registry.c
-f:drivers/platform/surface/surface_aggregator_tabletsw.c
-f:drivers/platform/surface/surface_dtx.c
-f:drivers/platform/surface/surface_gpe.c
-f:drivers/platform/surface/surface_hotplug.c
-f:drivers/platform/surface/surface_platform_profile.c
-f:drivers/platform/surface/surfacepro3_button.c
-f:drivers/platform/x86/Kconfig
-f:drivers/platform/x86/Makefile
-f:drivers/platform/x86/acer-wireless.c
-f:drivers/platform/x86/acer-wmi.c
-f:drivers/platform/x86/acerhdf.c
-f:drivers/platform/x86/adv_swbutton.c
-f:drivers/platform/x86/amd/Kconfig
-f:drivers/platform/x86/amd/Makefile
-f:drivers/platform/x86/amd/amd_isp4.c
-f:drivers/platform/x86/amd/hfi/Kconfig
-f:drivers/platform/x86/amd/hfi/Makefile
-f:drivers/platform/x86/amd/hfi/hfi.c
-f:drivers/platform/x86/amd/hsmp/Kconfig
-f:drivers/platform/x86/amd/hsmp/Makefile
-f:drivers/platform/x86/amd/hsmp/acpi.c
-f:drivers/platform/x86/amd/hsmp/hsmp.c
-f:drivers/platform/x86/amd/hsmp/hsmp.h
-f:drivers/platform/x86/amd/hsmp/hwmon.c
-f:drivers/platform/x86/amd/hsmp/plat.c
-f:drivers/platform/x86/amd/pmc/Kconfig
-f:drivers/platform/x86/amd/pmc/Makefile
-f:drivers/platform/x86/amd/pmc/mp1_stb.c
-f:drivers/platform/x86/amd/pmc/mp2_stb.c
-f:drivers/platform/x86/amd/pmc/pmc-quirks.c
-f:drivers/platform/x86/amd/pmc/pmc.c
-f:drivers/platform/x86/amd/pmc/pmc.h
-f:drivers/platform/x86/amd/pmf/Kconfig
-f:drivers/platform/x86/amd/pmf/Makefile
-f:drivers/platform/x86/amd/pmf/acpi.c
-f:drivers/platform/x86/amd/pmf/auto-mode.c
-f:drivers/platform/x86/amd/pmf/cnqf.c
-f:drivers/platform/x86/amd/pmf/core.c
-f:drivers/platform/x86/amd/pmf/pmf.h
-f:drivers/platform/x86/amd/pmf/spc.c
-f:drivers/platform/x86/amd/pmf/sps.c
-f:drivers/platform/x86/amd/pmf/tee-if.c
-f:drivers/platform/x86/amd/wbrf.c
-f:drivers/platform/x86/amd/x3d_vcache.c
-f:drivers/platform/x86/amilo-rfkill.c
-f:drivers/platform/x86/apple-gmux.c
-f:drivers/platform/x86/asus-laptop.c
-f:drivers/platform/x86/asus-nb-wmi.c
-f:drivers/platform/x86/asus-tf103c-dock.c
-f:drivers/platform/x86/asus-wireless.c
-f:drivers/platform/x86/asus-wmi.c
-f:drivers/platform/x86/asus-wmi.h
-f:drivers/platform/x86/barco-p50-gpio.c
-f:drivers/platform/x86/classmate-laptop.c
-f:drivers/platform/x86/compal-laptop.c
-f:drivers/platform/x86/dasharo-acpi.c
-f:drivers/platform/x86/dell/Kconfig
-f:drivers/platform/x86/dell/Makefile
-f:drivers/platform/x86/dell/alienware-wmi-base.c
-f:drivers/platform/x86/dell/alienware-wmi-legacy.c
-f:drivers/platform/x86/dell/alienware-wmi-wmax.c
-f:drivers/platform/x86/dell/alienware-wmi.h
-f:drivers/platform/x86/dell/dcdbas.c
-f:drivers/platform/x86/dell/dcdbas.h
-f:drivers/platform/x86/dell/dell-laptop.c
-f:drivers/platform/x86/dell/dell-lis3lv02d.c
-f:drivers/platform/x86/dell/dell-pc.c
-f:drivers/platform/x86/dell/dell-rbtn.c
-f:drivers/platform/x86/dell/dell-rbtn.h
-f:drivers/platform/x86/dell/dell-smbios-base.c
-f:drivers/platform/x86/dell/dell-smbios-smm.c
-f:drivers/platform/x86/dell/dell-smbios-wmi.c
-f:drivers/platform/x86/dell/dell-smbios.h
-f:drivers/platform/x86/dell/dell-smo8800-ids.h
-f:drivers/platform/x86/dell/dell-smo8800.c
-f:drivers/platform/x86/dell/dell-uart-backlight.c
-f:drivers/platform/x86/dell/dell-wmi-aio.c
-f:drivers/platform/x86/dell/dell-wmi-base.c
-f:drivers/platform/x86/dell/dell-wmi-ddv.c
-f:drivers/platform/x86/dell/dell-wmi-descriptor.c
-f:drivers/platform/x86/dell/dell-wmi-descriptor.h
-f:drivers/platform/x86/dell/dell-wmi-led.c
-f:drivers/platform/x86/dell/dell-wmi-privacy.c
-f:drivers/platform/x86/dell/dell-wmi-privacy.h
-f:drivers/platform/x86/dell/dell-wmi-sysman/Makefile
-f:drivers/platform/x86/dell/dell-wmi-sysman/biosattr-interface.c
-f:drivers/platform/x86/dell/dell-wmi-sysman/dell-wmi-sysman.h
-f:drivers/platform/x86/dell/dell-wmi-sysman/enum-attributes.c
-f:drivers/platform/x86/dell/dell-wmi-sysman/int-attributes.c
-f:drivers/platform/x86/dell/dell-wmi-sysman/passobj-attributes.c
-f:drivers/platform/x86/dell/dell-wmi-sysman/passwordattr-interface.c
-f:drivers/platform/x86/dell/dell-wmi-sysman/string-attributes.c
-f:drivers/platform/x86/dell/dell-wmi-sysman/sysman.c
-f:drivers/platform/x86/dell/dell_rbu.c
-f:drivers/platform/x86/dual_accel_detect.h
-f:drivers/platform/x86/eeepc-laptop.c
-f:drivers/platform/x86/eeepc-wmi.c
-f:drivers/platform/x86/firmware_attributes_class.c
-f:drivers/platform/x86/firmware_attributes_class.h
-f:drivers/platform/x86/fujitsu-laptop.c
-f:drivers/platform/x86/fujitsu-tablet.c
-f:drivers/platform/x86/gigabyte-wmi.c
-f:drivers/platform/x86/gpd-pocket-fan.c
-f:drivers/platform/x86/hdaps.c
-f:drivers/platform/x86/hp/Kconfig
-f:drivers/platform/x86/hp/Makefile
-f:drivers/platform/x86/hp/hp-bioscfg/Makefile
-f:drivers/platform/x86/hp/hp-bioscfg/biosattr-interface.c
-f:drivers/platform/x86/hp/hp-bioscfg/bioscfg.c
-f:drivers/platform/x86/hp/hp-bioscfg/bioscfg.h
-f:drivers/platform/x86/hp/hp-bioscfg/enum-attributes.c
-f:drivers/platform/x86/hp/hp-bioscfg/int-attributes.c
-f:drivers/platform/x86/hp/hp-bioscfg/order-list-attributes.c
-f:drivers/platform/x86/hp/hp-bioscfg/passwdobj-attributes.c
-f:drivers/platform/x86/hp/hp-bioscfg/spmobj-attributes.c
-f:drivers/platform/x86/hp/hp-bioscfg/string-attributes.c
-f:drivers/platform/x86/hp/hp-bioscfg/surestart-attributes.c
-f:drivers/platform/x86/hp/hp-wmi.c
-f:drivers/platform/x86/hp/hp_accel.c
-f:drivers/platform/x86/hp/tc1100-wmi.c
-f:drivers/platform/x86/huawei-wmi.c
-f:drivers/platform/x86/ibm_rtl.c
-f:drivers/platform/x86/inspur_platform_profile.c
-f:drivers/platform/x86/intel/Kconfig
-f:drivers/platform/x86/intel/Makefile
-f:drivers/platform/x86/intel/atomisp2/Kconfig
-f:drivers/platform/x86/intel/atomisp2/Makefile
-f:drivers/platform/x86/intel/atomisp2/led.c
-f:drivers/platform/x86/intel/atomisp2/pm.c
-f:drivers/platform/x86/intel/bxtwc_tmu.c
-f:drivers/platform/x86/intel/bytcrc_pwrsrc.c
-f:drivers/platform/x86/intel/chtdc_ti_pwrbtn.c
-f:drivers/platform/x86/intel/chtwc_int33fe.c
-f:drivers/platform/x86/intel/crystal_cove_charger.c
-f:drivers/platform/x86/intel/hid.c
-f:drivers/platform/x86/intel/ifs/Kconfig
-f:drivers/platform/x86/intel/ifs/Makefile
-f:drivers/platform/x86/intel/ifs/core.c
-f:drivers/platform/x86/intel/ifs/ifs.h
-f:drivers/platform/x86/intel/ifs/load.c
-f:drivers/platform/x86/intel/ifs/runtest.c
-f:drivers/platform/x86/intel/ifs/sysfs.c
-f:drivers/platform/x86/intel/int0002_vgpio.c
-f:drivers/platform/x86/intel/int1092/Kconfig
-f:drivers/platform/x86/intel/int1092/Makefile
-f:drivers/platform/x86/intel/int1092/intel_sar.c
-f:drivers/platform/x86/intel/int1092/intel_sar.h
-f:drivers/platform/x86/intel/int3472/Kconfig
-f:drivers/platform/x86/intel/int3472/Makefile
-f:drivers/platform/x86/intel/int3472/clk_and_regulator.c
-f:drivers/platform/x86/intel/int3472/common.c
-f:drivers/platform/x86/intel/int3472/discrete.c
-f:drivers/platform/x86/intel/int3472/discrete_quirks.c
-f:drivers/platform/x86/intel/int3472/led.c
-f:drivers/platform/x86/intel/int3472/tps68470.c
-f:drivers/platform/x86/intel/int3472/tps68470.h
-f:drivers/platform/x86/intel/int3472/tps68470_board_data.c
-f:drivers/platform/x86/intel/ishtp_eclite.c
-f:drivers/platform/x86/intel/mrfld_pwrbtn.c
-f:drivers/platform/x86/intel/oaktrail.c
-f:drivers/platform/x86/intel/plr_tpmi.c
-f:drivers/platform/x86/intel/pmc/Kconfig
-f:drivers/platform/x86/intel/pmc/Makefile
-f:drivers/platform/x86/intel/pmc/adl.c
-f:drivers/platform/x86/intel/pmc/arl.c
-f:drivers/platform/x86/intel/pmc/cnp.c
-f:drivers/platform/x86/intel/pmc/core.c
-f:drivers/platform/x86/intel/pmc/core.h
-f:drivers/platform/x86/intel/pmc/icl.c
-f:drivers/platform/x86/intel/pmc/lnl.c
-f:drivers/platform/x86/intel/pmc/mtl.c
-f:drivers/platform/x86/intel/pmc/pltdrv.c
-f:drivers/platform/x86/intel/pmc/ptl.c
-f:drivers/platform/x86/intel/pmc/spt.c
-f:drivers/platform/x86/intel/pmc/ssram_telemetry.c
-f:drivers/platform/x86/intel/pmc/ssram_telemetry.h
-f:drivers/platform/x86/intel/pmc/tgl.c
-f:drivers/platform/x86/intel/pmt/Kconfig
-f:drivers/platform/x86/intel/pmt/Makefile
-f:drivers/platform/x86/intel/pmt/class.c
-f:drivers/platform/x86/intel/pmt/class.h
-f:drivers/platform/x86/intel/pmt/crashlog.c
-f:drivers/platform/x86/intel/pmt/discovery-kunit.c
-f:drivers/platform/x86/intel/pmt/discovery.c
-f:drivers/platform/x86/intel/pmt/features.c
-f:drivers/platform/x86/intel/pmt/telemetry.c
-f:drivers/platform/x86/intel/pmt/telemetry.h
-f:drivers/platform/x86/intel/punit_ipc.c
-f:drivers/platform/x86/intel/rst.c
-f:drivers/platform/x86/intel/sdsi.c
-f:drivers/platform/x86/intel/smartconnect.c
-f:drivers/platform/x86/intel/speed_select_if/Kconfig
-f:drivers/platform/x86/intel/speed_select_if/Makefile
-f:drivers/platform/x86/intel/speed_select_if/isst_if_common.c
-f:drivers/platform/x86/intel/speed_select_if/isst_if_common.h
-f:drivers/platform/x86/intel/speed_select_if/isst_if_mbox_msr.c
-f:drivers/platform/x86/intel/speed_select_if/isst_if_mbox_pci.c
-f:drivers/platform/x86/intel/speed_select_if/isst_if_mmio.c
-f:drivers/platform/x86/intel/speed_select_if/isst_tpmi.c
-f:drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.c
-f:drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.h
-f:drivers/platform/x86/intel/telemetry/Kconfig
-f:drivers/platform/x86/intel/telemetry/Makefile
-f:drivers/platform/x86/intel/telemetry/core.c
-f:drivers/platform/x86/intel/telemetry/debugfs.c
-f:drivers/platform/x86/intel/telemetry/pltdrv.c
-f:drivers/platform/x86/intel/tpmi_power_domains.c
-f:drivers/platform/x86/intel/tpmi_power_domains.h
-f:drivers/platform/x86/intel/turbo_max_3.c
-f:drivers/platform/x86/intel/uncore-frequency/Kconfig
-f:drivers/platform/x86/intel/uncore-frequency/Makefile
-f:drivers/platform/x86/intel/uncore-frequency/uncore-frequency-common.c
-f:drivers/platform/x86/intel/uncore-frequency/uncore-frequency-common.h
-f:drivers/platform/x86/intel/uncore-frequency/uncore-frequency-tpmi.c
-f:drivers/platform/x86/intel/uncore-frequency/uncore-frequency.c
-f:drivers/platform/x86/intel/vbtn.c
-f:drivers/platform/x86/intel/vsec.c
-f:drivers/platform/x86/intel/vsec_tpmi.c
-f:drivers/platform/x86/intel/wmi/Kconfig
-f:drivers/platform/x86/intel/wmi/Makefile
-f:drivers/platform/x86/intel/wmi/sbl-fw-update.c
-f:drivers/platform/x86/intel/wmi/thunderbolt.c
-f:drivers/platform/x86/intel_ips.c
-f:drivers/platform/x86/intel_ips.h
-f:drivers/platform/x86/intel_scu_ipc.c
-f:drivers/platform/x86/intel_scu_ipcutil.c
-f:drivers/platform/x86/intel_scu_pcidrv.c
-f:drivers/platform/x86/intel_scu_pltdrv.c
-f:drivers/platform/x86/intel_scu_wdt.c
-f:drivers/platform/x86/lenovo/Kconfig
-f:drivers/platform/x86/lenovo/Makefile
-f:drivers/platform/x86/lenovo/ideapad-laptop.c
-f:drivers/platform/x86/lenovo/ideapad-laptop.h
-f:drivers/platform/x86/lenovo/think-lmi.c
-f:drivers/platform/x86/lenovo/think-lmi.h
-f:drivers/platform/x86/lenovo/thinkpad_acpi.c
-f:drivers/platform/x86/lenovo/wmi-camera.c
-f:drivers/platform/x86/lenovo/wmi-capdata01.c
-f:drivers/platform/x86/lenovo/wmi-capdata01.h
-f:drivers/platform/x86/lenovo/wmi-events.c
-f:drivers/platform/x86/lenovo/wmi-events.h
-f:drivers/platform/x86/lenovo/wmi-gamezone.c
-f:drivers/platform/x86/lenovo/wmi-gamezone.h
-f:drivers/platform/x86/lenovo/wmi-helpers.c
-f:drivers/platform/x86/lenovo/wmi-helpers.h
-f:drivers/platform/x86/lenovo/wmi-hotkey-utilities.c
-f:drivers/platform/x86/lenovo/wmi-other.c
-f:drivers/platform/x86/lenovo/wmi-other.h
-f:drivers/platform/x86/lenovo/ymc.c
-f:drivers/platform/x86/lenovo/yoga-tab2-pro-1380-fastcharger.c
-f:drivers/platform/x86/lenovo/yogabook.c
-f:drivers/platform/x86/lg-laptop.c
-f:drivers/platform/x86/meegopad_anx7428.c
-f:drivers/platform/x86/meraki-mx100.c
-f:drivers/platform/x86/msi-ec.c
-f:drivers/platform/x86/msi-ec.h
-f:drivers/platform/x86/msi-laptop.c
-f:drivers/platform/x86/msi-wmi-platform.c
-f:drivers/platform/x86/msi-wmi.c
-f:drivers/platform/x86/mxm-wmi.c
-f:drivers/platform/x86/nvidia-wmi-ec-backlight.c
-f:drivers/platform/x86/oxpec.c
-f:drivers/platform/x86/p2sb.c
-f:drivers/platform/x86/panasonic-laptop.c
-f:drivers/platform/x86/pcengines-apuv2.c
-f:drivers/platform/x86/pmc_atom.c
-f:drivers/platform/x86/portwell-ec.c
-f:drivers/platform/x86/quickstart.c
-f:drivers/platform/x86/samsung-galaxybook.c
-f:drivers/platform/x86/samsung-laptop.c
-f:drivers/platform/x86/samsung-q10.c
-f:drivers/platform/x86/sel3350-platform.c
-f:drivers/platform/x86/serdev_helpers.h
-f:drivers/platform/x86/serial-multi-instantiate.c
-f:drivers/platform/x86/siemens/Kconfig
-f:drivers/platform/x86/siemens/Makefile
-f:drivers/platform/x86/siemens/simatic-ipc-batt-apollolake.c
-f:drivers/platform/x86/siemens/simatic-ipc-batt-elkhartlake.c
-f:drivers/platform/x86/siemens/simatic-ipc-batt-f7188x.c
-f:drivers/platform/x86/siemens/simatic-ipc-batt.c
-f:drivers/platform/x86/siemens/simatic-ipc-batt.h
-f:drivers/platform/x86/siemens/simatic-ipc.c
-f:drivers/platform/x86/silicom-platform.c
-f:drivers/platform/x86/sony-laptop.c
-f:drivers/platform/x86/system76_acpi.c
-f:drivers/platform/x86/topstar-laptop.c
-f:drivers/platform/x86/toshiba-wmi.c
-f:drivers/platform/x86/toshiba_acpi.c
-f:drivers/platform/x86/toshiba_bluetooth.c
-f:drivers/platform/x86/toshiba_haps.c
-f:drivers/platform/x86/touchscreen_dmi.c
-f:drivers/platform/x86/tuxedo/Kconfig
-f:drivers/platform/x86/tuxedo/Makefile
-f:drivers/platform/x86/tuxedo/nb04/Kconfig
-f:drivers/platform/x86/tuxedo/nb04/Makefile
-f:drivers/platform/x86/tuxedo/nb04/wmi_ab.c
-f:drivers/platform/x86/tuxedo/nb04/wmi_util.c
-f:drivers/platform/x86/tuxedo/nb04/wmi_util.h
-f:drivers/platform/x86/uv_sysfs.c
-f:drivers/platform/x86/winmate-fm07-keys.c
-f:drivers/platform/x86/wireless-hotkey.c
-f:drivers/platform/x86/wmi-bmof.c
-f:drivers/platform/x86/wmi.c
-f:drivers/platform/x86/x86-android-tablets/Kconfig
-f:drivers/platform/x86/x86-android-tablets/Makefile
-f:drivers/platform/x86/x86-android-tablets/asus.c
-f:drivers/platform/x86/x86-android-tablets/core.c
-f:drivers/platform/x86/x86-android-tablets/dmi.c
-f:drivers/platform/x86/x86-android-tablets/lenovo.c
-f:drivers/platform/x86/x86-android-tablets/other.c
-f:drivers/platform/x86/x86-android-tablets/shared-psy-info.c
-f:drivers/platform/x86/x86-android-tablets/shared-psy-info.h
-f:drivers/platform/x86/x86-android-tablets/vexia_atla10_ec.c
-f:drivers/platform/x86/x86-android-tablets/x86-android-tablets.h
-f:drivers/platform/x86/xiaomi-wmi.c
-f:drivers/platform/x86/xo1-rfkill.c
-f:drivers/platform/x86/xo15-ebook.c
-f:drivers/pmdomain/Kconfig
-f:drivers/pmdomain/Makefile
-f:drivers/pmdomain/actions/Kconfig
-f:drivers/pmdomain/actions/Makefile
-f:drivers/pmdomain/actions/owl-sps-helper.c
-f:drivers/pmdomain/actions/owl-sps.c
-f:drivers/pmdomain/amlogic/Kconfig
-f:drivers/pmdomain/amlogic/Makefile
-f:drivers/pmdomain/amlogic/meson-ee-pwrc.c
-f:drivers/pmdomain/amlogic/meson-secure-pwrc.c
-f:drivers/pmdomain/apple/Kconfig
-f:drivers/pmdomain/apple/Makefile
-f:drivers/pmdomain/apple/pmgr-pwrstate.c
-f:drivers/pmdomain/arm/Kconfig
-f:drivers/pmdomain/arm/Makefile
-f:drivers/pmdomain/arm/scmi_perf_domain.c
-f:drivers/pmdomain/arm/scmi_pm_domain.c
-f:drivers/pmdomain/arm/scpi_pm_domain.c
-f:drivers/pmdomain/bcm/Kconfig
-f:drivers/pmdomain/bcm/Makefile
-f:drivers/pmdomain/bcm/bcm-pmb.c
-f:drivers/pmdomain/bcm/bcm2835-power.c
-f:drivers/pmdomain/bcm/bcm63xx-power.c
-f:drivers/pmdomain/bcm/raspberrypi-power.c
-f:drivers/pmdomain/core.c
-f:drivers/pmdomain/governor.c
-f:drivers/pmdomain/imx/Kconfig
-f:drivers/pmdomain/imx/Makefile
-f:drivers/pmdomain/imx/gpc.c
-f:drivers/pmdomain/imx/gpcv2.c
-f:drivers/pmdomain/imx/imx8m-blk-ctrl.c
-f:drivers/pmdomain/imx/imx8mp-blk-ctrl.c
-f:drivers/pmdomain/imx/imx93-blk-ctrl.c
-f:drivers/pmdomain/imx/imx93-pd.c
-f:drivers/pmdomain/imx/scu-pd.c
-f:drivers/pmdomain/mediatek/Kconfig
-f:drivers/pmdomain/mediatek/Makefile
-f:drivers/pmdomain/mediatek/airoha-cpu-pmdomain.c
-f:drivers/pmdomain/mediatek/mt6735-pm-domains.h
-f:drivers/pmdomain/mediatek/mt6795-pm-domains.h
-f:drivers/pmdomain/mediatek/mt6893-pm-domains.h
-f:drivers/pmdomain/mediatek/mt8167-pm-domains.h
-f:drivers/pmdomain/mediatek/mt8173-pm-domains.h
-f:drivers/pmdomain/mediatek/mt8183-pm-domains.h
-f:drivers/pmdomain/mediatek/mt8186-pm-domains.h
-f:drivers/pmdomain/mediatek/mt8188-pm-domains.h
-f:drivers/pmdomain/mediatek/mt8192-pm-domains.h
-f:drivers/pmdomain/mediatek/mt8195-pm-domains.h
-f:drivers/pmdomain/mediatek/mt8365-pm-domains.h
-f:drivers/pmdomain/mediatek/mtk-pm-domains.c
-f:drivers/pmdomain/mediatek/mtk-pm-domains.h
-f:drivers/pmdomain/mediatek/mtk-scpsys.c
-f:drivers/pmdomain/qcom/Kconfig
-f:drivers/pmdomain/qcom/Makefile
-f:drivers/pmdomain/qcom/cpr.c
-f:drivers/pmdomain/qcom/rpmhpd.c
-f:drivers/pmdomain/qcom/rpmpd.c
-f:drivers/pmdomain/renesas/Kconfig
-f:drivers/pmdomain/renesas/Makefile
-f:drivers/pmdomain/renesas/r8a7742-sysc.c
-f:drivers/pmdomain/renesas/r8a7743-sysc.c
-f:drivers/pmdomain/renesas/r8a7745-sysc.c
-f:drivers/pmdomain/renesas/r8a77470-sysc.c
-f:drivers/pmdomain/renesas/r8a774a1-sysc.c
-f:drivers/pmdomain/renesas/r8a774b1-sysc.c
-f:drivers/pmdomain/renesas/r8a774c0-sysc.c
-f:drivers/pmdomain/renesas/r8a774e1-sysc.c
-f:drivers/pmdomain/renesas/r8a7779-sysc.c
-f:drivers/pmdomain/renesas/r8a7790-sysc.c
-f:drivers/pmdomain/renesas/r8a7791-sysc.c
-f:drivers/pmdomain/renesas/r8a7792-sysc.c
-f:drivers/pmdomain/renesas/r8a7794-sysc.c
-f:drivers/pmdomain/renesas/r8a7795-sysc.c
-f:drivers/pmdomain/renesas/r8a77960-sysc.c
-f:drivers/pmdomain/renesas/r8a77961-sysc.c
-f:drivers/pmdomain/renesas/r8a77965-sysc.c
-f:drivers/pmdomain/renesas/r8a77970-sysc.c
-f:drivers/pmdomain/renesas/r8a77980-sysc.c
-f:drivers/pmdomain/renesas/r8a77990-sysc.c
-f:drivers/pmdomain/renesas/r8a77995-sysc.c
-f:drivers/pmdomain/renesas/r8a779a0-sysc.c
-f:drivers/pmdomain/renesas/r8a779f0-sysc.c
-f:drivers/pmdomain/renesas/r8a779g0-sysc.c
-f:drivers/pmdomain/renesas/r8a779h0-sysc.c
-f:drivers/pmdomain/renesas/rcar-gen4-sysc.c
-f:drivers/pmdomain/renesas/rcar-gen4-sysc.h
-f:drivers/pmdomain/renesas/rcar-sysc.c
-f:drivers/pmdomain/renesas/rcar-sysc.h
-f:drivers/pmdomain/renesas/rmobile-sysc.c
-f:drivers/pmdomain/rockchip/Kconfig
-f:drivers/pmdomain/rockchip/Makefile
-f:drivers/pmdomain/rockchip/pm-domains.c
-f:drivers/pmdomain/samsung/Kconfig
-f:drivers/pmdomain/samsung/Makefile
-f:drivers/pmdomain/samsung/exynos-pm-domains.c
-f:drivers/pmdomain/st/Kconfig
-f:drivers/pmdomain/st/Makefile
-f:drivers/pmdomain/st/ste-ux500-pm-domain.c
-f:drivers/pmdomain/starfive/Kconfig
-f:drivers/pmdomain/starfive/Makefile
-f:drivers/pmdomain/starfive/jh71xx-pmu.c
-f:drivers/pmdomain/sunxi/Kconfig
-f:drivers/pmdomain/sunxi/Makefile
-f:drivers/pmdomain/sunxi/sun20i-ppu.c
-f:drivers/pmdomain/sunxi/sun50i-h6-prcm-ppu.c
-f:drivers/pmdomain/sunxi/sun55i-pck600.c
-f:drivers/pmdomain/tegra/Kconfig
-f:drivers/pmdomain/tegra/Makefile
-f:drivers/pmdomain/tegra/powergate-bpmp.c
-f:drivers/pmdomain/thead/Kconfig
-f:drivers/pmdomain/thead/Makefile
-f:drivers/pmdomain/thead/th1520-pm-domains.c
-f:drivers/pmdomain/ti/Kconfig
-f:drivers/pmdomain/ti/Makefile
-f:drivers/pmdomain/ti/omap_prm.c
-f:drivers/pmdomain/ti/ti_sci_pm_domains.c
-f:drivers/pmdomain/xilinx/Kconfig
-f:drivers/pmdomain/xilinx/Makefile
-f:drivers/pmdomain/xilinx/zynqmp-pm-domains.c
-f:drivers/pnp/Kconfig
-f:drivers/pnp/Makefile
-f:drivers/pnp/base.h
-f:drivers/pnp/card.c
-f:drivers/pnp/core.c
-f:drivers/pnp/driver.c
-f:drivers/pnp/interface.c
-f:drivers/pnp/isapnp/Kconfig
-f:drivers/pnp/isapnp/Makefile
-f:drivers/pnp/isapnp/compat.c
-f:drivers/pnp/isapnp/core.c
-f:drivers/pnp/isapnp/proc.c
-f:drivers/pnp/manager.c
-f:drivers/pnp/pnpacpi/Kconfig
-f:drivers/pnp/pnpacpi/Makefile
-f:drivers/pnp/pnpacpi/core.c
-f:drivers/pnp/pnpacpi/pnpacpi.h
-f:drivers/pnp/pnpacpi/rsparser.c
-f:drivers/pnp/pnpbios/Kconfig
-f:drivers/pnp/pnpbios/Makefile
-f:drivers/pnp/pnpbios/bioscalls.c
-f:drivers/pnp/pnpbios/core.c
-f:drivers/pnp/pnpbios/pnpbios.h
-f:drivers/pnp/pnpbios/proc.c
-f:drivers/pnp/pnpbios/rsparser.c
-f:drivers/pnp/quirks.c
-f:drivers/pnp/resource.c
-f:drivers/pnp/support.c
-f:drivers/pnp/system.c
-f:drivers/power/Kconfig
-f:drivers/power/Makefile
-f:drivers/power/reset/Kconfig
-f:drivers/power/reset/Makefile
-f:drivers/power/reset/arm-versatile-reboot.c
-f:drivers/power/reset/as3722-poweroff.c
-f:drivers/power/reset/at91-poweroff.c
-f:drivers/power/reset/at91-reset.c
-f:drivers/power/reset/at91-sama5d2_shdwc.c
-f:drivers/power/reset/atc260x-poweroff.c
-f:drivers/power/reset/axxia-reset.c
-f:drivers/power/reset/brcm-kona-reset.c
-f:drivers/power/reset/brcmstb-reboot.c
-f:drivers/power/reset/ep93xx-restart.c
-f:drivers/power/reset/gemini-poweroff.c
-f:drivers/power/reset/gpio-poweroff.c
-f:drivers/power/reset/gpio-restart.c
-f:drivers/power/reset/hisi-reboot.c
-f:drivers/power/reset/keystone-reset.c
-f:drivers/power/reset/linkstation-poweroff.c
-f:drivers/power/reset/ltc2952-poweroff.c
-f:drivers/power/reset/macsmc-reboot.c
-f:drivers/power/reset/msm-poweroff.c
-f:drivers/power/reset/mt6323-poweroff.c
-f:drivers/power/reset/nvmem-reboot-mode.c
-f:drivers/power/reset/ocelot-reset.c
-f:drivers/power/reset/odroid-go-ultra-poweroff.c
-f:drivers/power/reset/piix4-poweroff.c
-f:drivers/power/reset/pwr-mlxbf.c
-f:drivers/power/reset/qcom-pon.c
-f:drivers/power/reset/qnap-poweroff.c
-f:drivers/power/reset/reboot-mode.c
-f:drivers/power/reset/regulator-poweroff.c
-f:drivers/power/reset/restart-poweroff.c
-f:drivers/power/reset/rmobile-reset.c
-f:drivers/power/reset/sc27xx-poweroff.c
-f:drivers/power/reset/st-poweroff.c
-f:drivers/power/reset/syscon-poweroff.c
-f:drivers/power/reset/syscon-reboot-mode.c
-f:drivers/power/reset/syscon-reboot.c
-f:drivers/power/reset/tdx-ec-poweroff.c
-f:drivers/power/reset/tps65086-restart.c
-f:drivers/power/reset/vexpress-poweroff.c
-f:drivers/power/reset/xgene-reboot.c
-f:drivers/power/sequencing/Kconfig
-f:drivers/power/sequencing/Makefile
-f:drivers/power/sequencing/core.c
-f:drivers/power/sequencing/pwrseq-qcom-wcn.c
-f:drivers/power/sequencing/pwrseq-thead-gpu.c
-f:drivers/power/supply/88pm860x_battery.c
-f:drivers/power/supply/88pm860x_charger.c
-f:drivers/power/supply/Kconfig
-f:drivers/power/supply/Makefile
-f:drivers/power/supply/ab8500-bm.h
-f:drivers/power/supply/ab8500-chargalg.h
-f:drivers/power/supply/ab8500_bmdata.c
-f:drivers/power/supply/ab8500_btemp.c
-f:drivers/power/supply/ab8500_chargalg.c
-f:drivers/power/supply/ab8500_charger.c
-f:drivers/power/supply/ab8500_fg.c
-f:drivers/power/supply/acer_a500_battery.c
-f:drivers/power/supply/act8945a_charger.c
-f:drivers/power/supply/adp5061.c
-f:drivers/power/supply/apm_power.c
-f:drivers/power/supply/axp20x_ac_power.c
-f:drivers/power/supply/axp20x_battery.c
-f:drivers/power/supply/axp20x_usb_power.c
-f:drivers/power/supply/axp288_charger.c
-f:drivers/power/supply/axp288_fuel_gauge.c
-f:drivers/power/supply/bd99954-charger.c
-f:drivers/power/supply/bd99954-charger.h
-f:drivers/power/supply/bq2415x_charger.c
-f:drivers/power/supply/bq24190_charger.c
-f:drivers/power/supply/bq24257_charger.c
-f:drivers/power/supply/bq24735-charger.c
-f:drivers/power/supply/bq2515x_charger.c
-f:drivers/power/supply/bq256xx_charger.c
-f:drivers/power/supply/bq25890_charger.c
-f:drivers/power/supply/bq25980_charger.c
-f:drivers/power/supply/bq25980_charger.h
-f:drivers/power/supply/bq27xxx_battery.c
-f:drivers/power/supply/bq27xxx_battery_hdq.c
-f:drivers/power/supply/bq27xxx_battery_i2c.c
-f:drivers/power/supply/chagall-battery.c
-f:drivers/power/supply/charger-manager.c
-f:drivers/power/supply/collie_battery.c
-f:drivers/power/supply/cpcap-battery.c
-f:drivers/power/supply/cpcap-charger.c
-f:drivers/power/supply/cros_charge-control.c
-f:drivers/power/supply/cros_peripheral_charger.c
-f:drivers/power/supply/cros_usbpd-charger.c
-f:drivers/power/supply/cw2015_battery.c
-f:drivers/power/supply/da9030_battery.c
-f:drivers/power/supply/da9052-battery.c
-f:drivers/power/supply/da9150-charger.c
-f:drivers/power/supply/da9150-fg.c
-f:drivers/power/supply/ds2760_battery.c
-f:drivers/power/supply/ds2780_battery.c
-f:drivers/power/supply/ds2781_battery.c
-f:drivers/power/supply/ds2782_battery.c
-f:drivers/power/supply/generic-adc-battery.c
-f:drivers/power/supply/goldfish_battery.c
-f:drivers/power/supply/gpio-charger.c
-f:drivers/power/supply/huawei-gaokun-battery.c
-f:drivers/power/supply/ingenic-battery.c
-f:drivers/power/supply/ip5xxx_power.c
-f:drivers/power/supply/ipaq_micro_battery.c
-f:drivers/power/supply/isp1704_charger.c
-f:drivers/power/supply/lego_ev3_battery.c
-f:drivers/power/supply/lenovo_yoga_c630_battery.c
-f:drivers/power/supply/lp8727_charger.c
-f:drivers/power/supply/lp8788-charger.c
-f:drivers/power/supply/lt3651-charger.c
-f:drivers/power/supply/ltc2941-battery-gauge.c
-f:drivers/power/supply/ltc4162-l-charger.c
-f:drivers/power/supply/max14577_charger.c
-f:drivers/power/supply/max14656_charger_detector.c
-f:drivers/power/supply/max17040_battery.c
-f:drivers/power/supply/max17042_battery.c
-f:drivers/power/supply/max1720x_battery.c
-f:drivers/power/supply/max1721x_battery.c
-f:drivers/power/supply/max77650-charger.c
-f:drivers/power/supply/max77693_charger.c
-f:drivers/power/supply/max77705_charger.c
-f:drivers/power/supply/max77976_charger.c
-f:drivers/power/supply/max8903_charger.c
-f:drivers/power/supply/max8925_power.c
-f:drivers/power/supply/max8971_charger.c
-f:drivers/power/supply/max8997_charger.c
-f:drivers/power/supply/max8998_charger.c
-f:drivers/power/supply/mm8013.c
-f:drivers/power/supply/mp2629_charger.c
-f:drivers/power/supply/mt6360_charger.c
-f:drivers/power/supply/mt6370-charger.c
-f:drivers/power/supply/olpc_battery.c
-f:drivers/power/supply/pm8916_bms_vm.c
-f:drivers/power/supply/pm8916_lbc.c
-f:drivers/power/supply/pmu_battery.c
-f:drivers/power/supply/power_supply.h
-f:drivers/power/supply/power_supply_core.c
-f:drivers/power/supply/power_supply_hwmon.c
-f:drivers/power/supply/power_supply_leds.c
-f:drivers/power/supply/power_supply_sysfs.c
-f:drivers/power/supply/qcom_battmgr.c
-f:drivers/power/supply/qcom_smbb.c
-f:drivers/power/supply/qcom_smbx.c
-f:drivers/power/supply/rk817_charger.c
-f:drivers/power/supply/rn5t618_power.c
-f:drivers/power/supply/rt5033_battery.c
-f:drivers/power/supply/rt5033_charger.c
-f:drivers/power/supply/rt9455_charger.c
-f:drivers/power/supply/rt9467-charger.c
-f:drivers/power/supply/rt9471.c
-f:drivers/power/supply/rx51_battery.c
-f:drivers/power/supply/samsung-sdi-battery.c
-f:drivers/power/supply/samsung-sdi-battery.h
-f:drivers/power/supply/sbs-battery.c
-f:drivers/power/supply/sbs-charger.c
-f:drivers/power/supply/sbs-manager.c
-f:drivers/power/supply/sc2731_charger.c
-f:drivers/power/supply/sc27xx_fuel_gauge.c
-f:drivers/power/supply/smb347-charger.c
-f:drivers/power/supply/stc3117_fuel_gauge.c
-f:drivers/power/supply/surface_battery.c
-f:drivers/power/supply/surface_charger.c
-f:drivers/power/supply/test_power.c
-f:drivers/power/supply/tps65090-charger.c
-f:drivers/power/supply/tps65217_charger.c
-f:drivers/power/supply/twl4030_charger.c
-f:drivers/power/supply/twl4030_madc_battery.c
-f:drivers/power/supply/twl6030_charger.c
-f:drivers/power/supply/ucs1002_power.c
-f:drivers/power/supply/ug3105_battery.c
-f:drivers/power/supply/wilco-charger.c
-f:drivers/power/supply/wm831x_backup.c
-f:drivers/power/supply/wm831x_power.c
-f:drivers/power/supply/wm8350_power.c
-f:drivers/power/supply/wm97xx_battery.c
-f:drivers/powercap/Kconfig
-f:drivers/powercap/Makefile
-f:drivers/powercap/arm_scmi_powercap.c
-f:drivers/powercap/dtpm.c
-f:drivers/powercap/dtpm_cpu.c
-f:drivers/powercap/dtpm_devfreq.c
-f:drivers/powercap/dtpm_subsys.h
-f:drivers/powercap/idle_inject.c
-f:drivers/powercap/intel_rapl_common.c
-f:drivers/powercap/intel_rapl_msr.c
-f:drivers/powercap/intel_rapl_tpmi.c
-f:drivers/powercap/powercap_sys.c
-f:drivers/pps/Kconfig
-f:drivers/pps/Makefile
-f:drivers/pps/clients/Kconfig
-f:drivers/pps/clients/Makefile
-f:drivers/pps/clients/pps-gpio.c
-f:drivers/pps/clients/pps-ktimer.c
-f:drivers/pps/clients/pps-ldisc.c
-f:drivers/pps/clients/pps_parport.c
-f:drivers/pps/generators/Kconfig
-f:drivers/pps/generators/Makefile
-f:drivers/pps/generators/pps_gen-dummy.c
-f:drivers/pps/generators/pps_gen.c
-f:drivers/pps/generators/pps_gen_parport.c
-f:drivers/pps/generators/pps_gen_tio.c
-f:drivers/pps/generators/sysfs.c
-f:drivers/pps/kapi.c
-f:drivers/pps/kc.c
-f:drivers/pps/kc.h
-f:drivers/pps/pps.c
-f:drivers/pps/sysfs.c
-f:drivers/ps3/Makefile
-f:drivers/ps3/ps3-lpm.c
-f:drivers/ps3/ps3-sys-manager.c
-f:drivers/ps3/ps3-vuart.c
-f:drivers/ps3/ps3av.c
-f:drivers/ps3/ps3av_cmd.c
-f:drivers/ps3/ps3stor_lib.c
-f:drivers/ps3/sys-manager-core.c
-f:drivers/ps3/vuart.h
-f:drivers/ptp/Kconfig
-f:drivers/ptp/Makefile
-f:drivers/ptp/ptp_chardev.c
-f:drivers/ptp/ptp_clock.c
-f:drivers/ptp/ptp_clockmatrix.c
-f:drivers/ptp/ptp_clockmatrix.h
-f:drivers/ptp/ptp_dfl_tod.c
-f:drivers/ptp/ptp_dte.c
-f:drivers/ptp/ptp_fc3.c
-f:drivers/ptp/ptp_fc3.h
-f:drivers/ptp/ptp_idt82p33.c
-f:drivers/ptp/ptp_idt82p33.h
-f:drivers/ptp/ptp_ines.c
-f:drivers/ptp/ptp_kvm_arm.c
-f:drivers/ptp/ptp_kvm_common.c
-f:drivers/ptp/ptp_kvm_x86.c
-f:drivers/ptp/ptp_mock.c
-f:drivers/ptp/ptp_ocp.c
-f:drivers/ptp/ptp_pch.c
-f:drivers/ptp/ptp_private.h
-f:drivers/ptp/ptp_qoriq.c
-f:drivers/ptp/ptp_qoriq_debugfs.c
-f:drivers/ptp/ptp_s390.c
-f:drivers/ptp/ptp_sysfs.c
-f:drivers/ptp/ptp_vclock.c
-f:drivers/ptp/ptp_vmclock.c
-f:drivers/ptp/ptp_vmw.c
-f:drivers/pwm/Kconfig
-f:drivers/pwm/Makefile
-f:drivers/pwm/core.c
-f:drivers/pwm/pwm-ab8500.c
-f:drivers/pwm/pwm-adp5585.c
-f:drivers/pwm/pwm-apple.c
-f:drivers/pwm/pwm-argon-fan-hat.c
-f:drivers/pwm/pwm-atmel-hlcdc.c
-f:drivers/pwm/pwm-atmel-tcb.c
-f:drivers/pwm/pwm-atmel.c
-f:drivers/pwm/pwm-axi-pwmgen.c
-f:drivers/pwm/pwm-bcm-iproc.c
-f:drivers/pwm/pwm-bcm-kona.c
-f:drivers/pwm/pwm-bcm2835.c
-f:drivers/pwm/pwm-berlin.c
-f:drivers/pwm/pwm-brcmstb.c
-f:drivers/pwm/pwm-clk.c
-f:drivers/pwm/pwm-clps711x.c
-f:drivers/pwm/pwm-crc.c
-f:drivers/pwm/pwm-cros-ec.c
-f:drivers/pwm/pwm-dwc-core.c
-f:drivers/pwm/pwm-dwc.c
-f:drivers/pwm/pwm-dwc.h
-f:drivers/pwm/pwm-ep93xx.c
-f:drivers/pwm/pwm-fsl-ftm.c
-f:drivers/pwm/pwm-gpio.c
-f:drivers/pwm/pwm-hibvt.c
-f:drivers/pwm/pwm-img.c
-f:drivers/pwm/pwm-imx-tpm.c
-f:drivers/pwm/pwm-imx1.c
-f:drivers/pwm/pwm-imx27.c
-f:drivers/pwm/pwm-intel-lgm.c
-f:drivers/pwm/pwm-iqs620a.c
-f:drivers/pwm/pwm-jz4740.c
-f:drivers/pwm/pwm-keembay.c
-f:drivers/pwm/pwm-loongson.c
-f:drivers/pwm/pwm-lp3943.c
-f:drivers/pwm/pwm-lpc18xx-sct.c
-f:drivers/pwm/pwm-lpc32xx.c
-f:drivers/pwm/pwm-lpss-pci.c
-f:drivers/pwm/pwm-lpss-platform.c
-f:drivers/pwm/pwm-lpss.c
-f:drivers/pwm/pwm-lpss.h
-f:drivers/pwm/pwm-mc33xs2410.c
-f:drivers/pwm/pwm-mediatek.c
-f:drivers/pwm/pwm-meson.c
-f:drivers/pwm/pwm-microchip-core.c
-f:drivers/pwm/pwm-mtk-disp.c
-f:drivers/pwm/pwm-mxs.c
-f:drivers/pwm/pwm-ntxec.c
-f:drivers/pwm/pwm-omap-dmtimer.c
-f:drivers/pwm/pwm-pca9685.c
-f:drivers/pwm/pwm-pxa.c
-f:drivers/pwm/pwm-raspberrypi-poe.c
-f:drivers/pwm/pwm-rcar.c
-f:drivers/pwm/pwm-renesas-tpu.c
-f:drivers/pwm/pwm-rockchip.c
-f:drivers/pwm/pwm-rz-mtu3.c
-f:drivers/pwm/pwm-rzg2l-gpt.c
-f:drivers/pwm/pwm-samsung.c
-f:drivers/pwm/pwm-sifive.c
-f:drivers/pwm/pwm-sl28cpld.c
-f:drivers/pwm/pwm-sophgo-sg2042.c
-f:drivers/pwm/pwm-spear.c
-f:drivers/pwm/pwm-sprd.c
-f:drivers/pwm/pwm-sti.c
-f:drivers/pwm/pwm-stm32-lp.c
-f:drivers/pwm/pwm-stm32.c
-f:drivers/pwm/pwm-stmpe.c
-f:drivers/pwm/pwm-sun4i.c
-f:drivers/pwm/pwm-sunplus.c
-f:drivers/pwm/pwm-tegra.c
-f:drivers/pwm/pwm-tiecap.c
-f:drivers/pwm/pwm-tiehrpwm.c
-f:drivers/pwm/pwm-twl-led.c
-f:drivers/pwm/pwm-twl.c
-f:drivers/pwm/pwm-visconti.c
-f:drivers/pwm/pwm-vt8500.c
-f:drivers/pwm/pwm-xilinx.c
-f:drivers/rapidio/Kconfig
-f:drivers/rapidio/Makefile
-f:drivers/rapidio/devices/Kconfig
-f:drivers/rapidio/devices/Makefile
-f:drivers/rapidio/devices/rio_mport_cdev.c
-f:drivers/rapidio/devices/tsi721.c
-f:drivers/rapidio/devices/tsi721.h
-f:drivers/rapidio/devices/tsi721_dma.c
-f:drivers/rapidio/rio-access.c
-f:drivers/rapidio/rio-driver.c
-f:drivers/rapidio/rio-scan.c
-f:drivers/rapidio/rio-sysfs.c
-f:drivers/rapidio/rio.c
-f:drivers/rapidio/rio.h
-f:drivers/rapidio/rio_cm.c
-f:drivers/rapidio/switches/Kconfig
-f:drivers/rapidio/switches/Makefile
-f:drivers/rapidio/switches/idt_gen2.c
-f:drivers/rapidio/switches/idt_gen3.c
-f:drivers/rapidio/switches/idtcps.c
-f:drivers/ras/Kconfig
-f:drivers/ras/Makefile
-f:drivers/ras/amd/atl/Kconfig
-f:drivers/ras/amd/atl/Makefile
-f:drivers/ras/amd/atl/access.c
-f:drivers/ras/amd/atl/core.c
-f:drivers/ras/amd/atl/dehash.c
-f:drivers/ras/amd/atl/denormalize.c
-f:drivers/ras/amd/atl/internal.h
-f:drivers/ras/amd/atl/map.c
-f:drivers/ras/amd/atl/prm.c
-f:drivers/ras/amd/atl/reg_fields.h
-f:drivers/ras/amd/atl/system.c
-f:drivers/ras/amd/atl/umc.c
-f:drivers/ras/amd/fmpm.c
-f:drivers/ras/cec.c
-f:drivers/ras/debugfs.c
-f:drivers/ras/debugfs.h
-f:drivers/ras/ras.c
-f:drivers/regulator/88pg86x.c
-f:drivers/regulator/88pm800-regulator.c
-f:drivers/regulator/88pm8607.c
-f:drivers/regulator/88pm886-regulator.c
-f:drivers/regulator/Kconfig
-f:drivers/regulator/Makefile
-f:drivers/regulator/aat2870-regulator.c
-f:drivers/regulator/ab8500-ext.c
-f:drivers/regulator/ab8500.c
-f:drivers/regulator/act8865-regulator.c
-f:drivers/regulator/act8945a-regulator.c
-f:drivers/regulator/ad5398.c
-f:drivers/regulator/adp5055-regulator.c
-f:drivers/regulator/anatop-regulator.c
-f:drivers/regulator/arizona-ldo1.c
-f:drivers/regulator/arizona-micsupp.c
-f:drivers/regulator/as3711-regulator.c
-f:drivers/regulator/as3722-regulator.c
-f:drivers/regulator/atc260x-regulator.c
-f:drivers/regulator/aw37503-regulator.c
-f:drivers/regulator/axp20x-regulator.c
-f:drivers/regulator/bcm590xx-regulator.c
-f:drivers/regulator/bd71815-regulator.c
-f:drivers/regulator/bd71828-regulator.c
-f:drivers/regulator/bd718x7-regulator.c
-f:drivers/regulator/bd9571mwv-regulator.c
-f:drivers/regulator/bd9576-regulator.c
-f:drivers/regulator/bd96801-regulator.c
-f:drivers/regulator/core.c
-f:drivers/regulator/cpcap-regulator.c
-f:drivers/regulator/cros-ec-regulator.c
-f:drivers/regulator/da903x-regulator.c
-f:drivers/regulator/da9052-regulator.c
-f:drivers/regulator/da9055-regulator.c
-f:drivers/regulator/da9062-regulator.c
-f:drivers/regulator/da9063-regulator.c
-f:drivers/regulator/da9121-regulator.c
-f:drivers/regulator/da9121-regulator.h
-f:drivers/regulator/da9210-regulator.c
-f:drivers/regulator/da9210-regulator.h
-f:drivers/regulator/da9211-regulator.c
-f:drivers/regulator/da9211-regulator.h
-f:drivers/regulator/db8500-prcmu.c
-f:drivers/regulator/dbx500-prcmu.c
-f:drivers/regulator/dbx500-prcmu.h
-f:drivers/regulator/devres.c
-f:drivers/regulator/dummy.c
-f:drivers/regulator/dummy.h
-f:drivers/regulator/event.c
-f:drivers/regulator/fan53555.c
-f:drivers/regulator/fan53880.c
-f:drivers/regulator/fixed-helper.c
-f:drivers/regulator/fixed.c
-f:drivers/regulator/gpio-regulator.c
-f:drivers/regulator/helpers.c
-f:drivers/regulator/hi6421-regulator.c
-f:drivers/regulator/hi6421v530-regulator.c
-f:drivers/regulator/hi6421v600-regulator.c
-f:drivers/regulator/hi655x-regulator.c
-f:drivers/regulator/internal.h
-f:drivers/regulator/irq_helpers.c
-f:drivers/regulator/isl6271a-regulator.c
-f:drivers/regulator/isl9305.c
-f:drivers/regulator/lm363x-regulator.c
-f:drivers/regulator/lochnagar-regulator.c
-f:drivers/regulator/lp3971.c
-f:drivers/regulator/lp3972.c
-f:drivers/regulator/lp872x.c
-f:drivers/regulator/lp873x-regulator.c
-f:drivers/regulator/lp8755.c
-f:drivers/regulator/lp87565-regulator.c
-f:drivers/regulator/lp8788-buck.c
-f:drivers/regulator/lp8788-ldo.c
-f:drivers/regulator/ltc3589.c
-f:drivers/regulator/ltc3676.c
-f:drivers/regulator/max14577-regulator.c
-f:drivers/regulator/max1586.c
-f:drivers/regulator/max20086-regulator.c
-f:drivers/regulator/max20411-regulator.c
-f:drivers/regulator/max5970-regulator.c
-f:drivers/regulator/max77503-regulator.c
-f:drivers/regulator/max77541-regulator.c
-f:drivers/regulator/max77620-regulator.c
-f:drivers/regulator/max77650-regulator.c
-f:drivers/regulator/max77686-regulator.c
-f:drivers/regulator/max77693-regulator.c
-f:drivers/regulator/max77802-regulator.c
-f:drivers/regulator/max77826-regulator.c
-f:drivers/regulator/max77857-regulator.c
-f:drivers/regulator/max8649.c
-f:drivers/regulator/max8660.c
-f:drivers/regulator/max8893.c
-f:drivers/regulator/max8907-regulator.c
-f:drivers/regulator/max8925-regulator.c
-f:drivers/regulator/max8952.c
-f:drivers/regulator/max8973-regulator.c
-f:drivers/regulator/max8997-regulator.c
-f:drivers/regulator/max8998.c
-f:drivers/regulator/mc13783-regulator.c
-f:drivers/regulator/mc13892-regulator.c
-f:drivers/regulator/mc13xxx-regulator-core.c
-f:drivers/regulator/mc13xxx.h
-f:drivers/regulator/mcp16502.c
-f:drivers/regulator/mp5416.c
-f:drivers/regulator/mp8859.c
-f:drivers/regulator/mp886x.c
-f:drivers/regulator/mpq7920.c
-f:drivers/regulator/mpq7920.h
-f:drivers/regulator/mt6311-regulator.c
-f:drivers/regulator/mt6311-regulator.h
-f:drivers/regulator/mt6315-regulator.c
-f:drivers/regulator/mt6323-regulator.c
-f:drivers/regulator/mt6331-regulator.c
-f:drivers/regulator/mt6332-regulator.c
-f:drivers/regulator/mt6357-regulator.c
-f:drivers/regulator/mt6358-regulator.c
-f:drivers/regulator/mt6359-regulator.c
-f:drivers/regulator/mt6360-regulator.c
-f:drivers/regulator/mt6370-regulator.c
-f:drivers/regulator/mt6380-regulator.c
-f:drivers/regulator/mt6397-regulator.c
-f:drivers/regulator/mtk-dvfsrc-regulator.c
-f:drivers/regulator/of_regulator.c
-f:drivers/regulator/palmas-regulator.c
-f:drivers/regulator/pbias-regulator.c
-f:drivers/regulator/pca9450-regulator.c
-f:drivers/regulator/pcap-regulator.c
-f:drivers/regulator/pf8x00-regulator.c
-f:drivers/regulator/pf9453-regulator.c
-f:drivers/regulator/pfuze100-regulator.c
-f:drivers/regulator/pv88060-regulator.c
-f:drivers/regulator/pv88060-regulator.h
-f:drivers/regulator/pv88080-regulator.c
-f:drivers/regulator/pv88080-regulator.h
-f:drivers/regulator/pv88090-regulator.c
-f:drivers/regulator/pv88090-regulator.h
-f:drivers/regulator/pwm-regulator.c
-f:drivers/regulator/qcom-labibb-regulator.c
-f:drivers/regulator/qcom-pm8008-regulator.c
-f:drivers/regulator/qcom-refgen-regulator.c
-f:drivers/regulator/qcom-rpmh-regulator.c
-f:drivers/regulator/qcom_rpm-regulator.c
-f:drivers/regulator/qcom_smd-regulator.c
-f:drivers/regulator/qcom_spmi-regulator.c
-f:drivers/regulator/qcom_usb_vbus-regulator.c
-f:drivers/regulator/raa215300.c
-f:drivers/regulator/rc5t583-regulator.c
-f:drivers/regulator/regnl.h
-f:drivers/regulator/renesas-usb-vbus-regulator.c
-f:drivers/regulator/rk808-regulator.c
-f:drivers/regulator/rn5t618-regulator.c
-f:drivers/regulator/rohm-regulator.c
-f:drivers/regulator/rpi-panel-attiny-regulator.c
-f:drivers/regulator/rpi-panel-v2-regulator.c
-f:drivers/regulator/rt4801-regulator.c
-f:drivers/regulator/rt4803.c
-f:drivers/regulator/rt4831-regulator.c
-f:drivers/regulator/rt5033-regulator.c
-f:drivers/regulator/rt5120-regulator.c
-f:drivers/regulator/rt5190a-regulator.c
-f:drivers/regulator/rt5739.c
-f:drivers/regulator/rt5759-regulator.c
-f:drivers/regulator/rt6160-regulator.c
-f:drivers/regulator/rt6190-regulator.c
-f:drivers/regulator/rt6245-regulator.c
-f:drivers/regulator/rtmv20-regulator.c
-f:drivers/regulator/rtq2134-regulator.c
-f:drivers/regulator/rtq2208-regulator.c
-f:drivers/regulator/rtq6752-regulator.c
-f:drivers/regulator/s2mpa01.c
-f:drivers/regulator/s2mps11.c
-f:drivers/regulator/s5m8767.c
-f:drivers/regulator/sc2731-regulator.c
-f:drivers/regulator/scmi-regulator.c
-f:drivers/regulator/sky81452-regulator.c
-f:drivers/regulator/slg51000-regulator.c
-f:drivers/regulator/slg51000-regulator.h
-f:drivers/regulator/stm32-booster.c
-f:drivers/regulator/stm32-pwr.c
-f:drivers/regulator/stm32-vrefbuf.c
-f:drivers/regulator/stpmic1_regulator.c
-f:drivers/regulator/stw481x-vmmc.c
-f:drivers/regulator/sun20i-regulator.c
-f:drivers/regulator/sy7636a-regulator.c
-f:drivers/regulator/sy8106a-regulator.c
-f:drivers/regulator/sy8824x.c
-f:drivers/regulator/sy8827n.c
-f:drivers/regulator/ti-abb-regulator.c
-f:drivers/regulator/tps51632-regulator.c
-f:drivers/regulator/tps6105x-regulator.c
-f:drivers/regulator/tps62360-regulator.c
-f:drivers/regulator/tps6286x-regulator.c
-f:drivers/regulator/tps6287x-regulator.c
-f:drivers/regulator/tps65023-regulator.c
-f:drivers/regulator/tps6507x-regulator.c
-f:drivers/regulator/tps65086-regulator.c
-f:drivers/regulator/tps65090-regulator.c
-f:drivers/regulator/tps65132-regulator.c
-f:drivers/regulator/tps65217-regulator.c
-f:drivers/regulator/tps65218-regulator.c
-f:drivers/regulator/tps65219-regulator.c
-f:drivers/regulator/tps6524x-regulator.c
-f:drivers/regulator/tps6586x-regulator.c
-f:drivers/regulator/tps65910-regulator.c
-f:drivers/regulator/tps65912-regulator.c
-f:drivers/regulator/tps6594-regulator.c
-f:drivers/regulator/tps68470-regulator.c
-f:drivers/regulator/twl-regulator.c
-f:drivers/regulator/twl6030-regulator.c
-f:drivers/regulator/uniphier-regulator.c
-f:drivers/regulator/userspace-consumer.c
-f:drivers/regulator/vctrl-regulator.c
-f:drivers/regulator/vexpress-regulator.c
-f:drivers/regulator/virtual.c
-f:drivers/regulator/vqmmc-ipq4019-regulator.c
-f:drivers/regulator/wm831x-dcdc.c
-f:drivers/regulator/wm831x-isink.c
-f:drivers/regulator/wm831x-ldo.c
-f:drivers/regulator/wm8350-regulator.c
-f:drivers/regulator/wm8400-regulator.c
-f:drivers/regulator/wm8994-regulator.c
-f:drivers/remoteproc/Kconfig
-f:drivers/remoteproc/Makefile
-f:drivers/remoteproc/da8xx_remoteproc.c
-f:drivers/remoteproc/imx_dsp_rproc.c
-f:drivers/remoteproc/imx_rproc.c
-f:drivers/remoteproc/imx_rproc.h
-f:drivers/remoteproc/ingenic_rproc.c
-f:drivers/remoteproc/keystone_remoteproc.c
-f:drivers/remoteproc/meson_mx_ao_arc.c
-f:drivers/remoteproc/mtk_common.h
-f:drivers/remoteproc/mtk_scp.c
-f:drivers/remoteproc/mtk_scp_ipi.c
-f:drivers/remoteproc/omap_remoteproc.c
-f:drivers/remoteproc/omap_remoteproc.h
-f:drivers/remoteproc/pru_rproc.c
-f:drivers/remoteproc/pru_rproc.h
-f:drivers/remoteproc/qcom_common.c
-f:drivers/remoteproc/qcom_common.h
-f:drivers/remoteproc/qcom_pil_info.c
-f:drivers/remoteproc/qcom_pil_info.h
-f:drivers/remoteproc/qcom_q6v5.c
-f:drivers/remoteproc/qcom_q6v5.h
-f:drivers/remoteproc/qcom_q6v5_adsp.c
-f:drivers/remoteproc/qcom_q6v5_mss.c
-f:drivers/remoteproc/qcom_q6v5_pas.c
-f:drivers/remoteproc/qcom_q6v5_wcss.c
-f:drivers/remoteproc/qcom_sysmon.c
-f:drivers/remoteproc/qcom_wcnss.c
-f:drivers/remoteproc/qcom_wcnss.h
-f:drivers/remoteproc/qcom_wcnss_iris.c
-f:drivers/remoteproc/rcar_rproc.c
-f:drivers/remoteproc/remoteproc_cdev.c
-f:drivers/remoteproc/remoteproc_core.c
-f:drivers/remoteproc/remoteproc_coredump.c
-f:drivers/remoteproc/remoteproc_debugfs.c
-f:drivers/remoteproc/remoteproc_elf_helpers.h
-f:drivers/remoteproc/remoteproc_elf_loader.c
-f:drivers/remoteproc/remoteproc_internal.h
-f:drivers/remoteproc/remoteproc_sysfs.c
-f:drivers/remoteproc/remoteproc_virtio.c
-f:drivers/remoteproc/st_remoteproc.c
-f:drivers/remoteproc/st_slim_rproc.c
-f:drivers/remoteproc/stm32_rproc.c
-f:drivers/remoteproc/ti_k3_common.c
-f:drivers/remoteproc/ti_k3_common.h
-f:drivers/remoteproc/ti_k3_dsp_remoteproc.c
-f:drivers/remoteproc/ti_k3_m4_remoteproc.c
-f:drivers/remoteproc/ti_k3_r5_remoteproc.c
-f:drivers/remoteproc/ti_sci_proc.h
-f:drivers/remoteproc/wkup_m3_rproc.c
-f:drivers/remoteproc/xlnx_r5_remoteproc.c
-f:drivers/reset/Kconfig
-f:drivers/reset/Makefile
-f:drivers/reset/amlogic/Kconfig
-f:drivers/reset/amlogic/Makefile
-f:drivers/reset/amlogic/reset-meson-audio-arb.c
-f:drivers/reset/amlogic/reset-meson-aux.c
-f:drivers/reset/amlogic/reset-meson-common.c
-f:drivers/reset/amlogic/reset-meson.c
-f:drivers/reset/amlogic/reset-meson.h
-f:drivers/reset/core.c
-f:drivers/reset/hisilicon/Kconfig
-f:drivers/reset/hisilicon/Makefile
-f:drivers/reset/hisilicon/hi6220_reset.c
-f:drivers/reset/hisilicon/reset-hi3660.c
-f:drivers/reset/reset-a10sr.c
-f:drivers/reset/reset-ath79.c
-f:drivers/reset/reset-axs10x.c
-f:drivers/reset/reset-bcm6345.c
-f:drivers/reset/reset-berlin.c
-f:drivers/reset/reset-brcmstb-rescal.c
-f:drivers/reset/reset-brcmstb.c
-f:drivers/reset/reset-eyeq.c
-f:drivers/reset/reset-gpio.c
-f:drivers/reset/reset-hsdk.c
-f:drivers/reset/reset-imx-scu.c
-f:drivers/reset/reset-imx7.c
-f:drivers/reset/reset-imx8mp-audiomix.c
-f:drivers/reset/reset-intel-gw.c
-f:drivers/reset/reset-k210.c
-f:drivers/reset/reset-k230.c
-f:drivers/reset/reset-lantiq.c
-f:drivers/reset/reset-lpc18xx.c
-f:drivers/reset/reset-ma35d1.c
-f:drivers/reset/reset-microchip-sparx5.c
-f:drivers/reset/reset-mpfs.c
-f:drivers/reset/reset-npcm.c
-f:drivers/reset/reset-pistachio.c
-f:drivers/reset/reset-qcom-aoss.c
-f:drivers/reset/reset-qcom-pdc.c
-f:drivers/reset/reset-raspberrypi.c
-f:drivers/reset/reset-rzg2l-usbphy-ctrl.c
-f:drivers/reset/reset-rzv2h-usb2phy.c
-f:drivers/reset/reset-scmi.c
-f:drivers/reset/reset-simple.c
-f:drivers/reset/reset-socfpga.c
-f:drivers/reset/reset-spacemit.c
-f:drivers/reset/reset-sunplus.c
-f:drivers/reset/reset-sunxi.c
-f:drivers/reset/reset-th1520.c
-f:drivers/reset/reset-ti-sci.c
-f:drivers/reset/reset-ti-syscon.c
-f:drivers/reset/reset-tn48m.c
-f:drivers/reset/reset-tps380x.c
-f:drivers/reset/reset-uniphier-glue.c
-f:drivers/reset/reset-uniphier.c
-f:drivers/reset/reset-zynq.c
-f:drivers/reset/reset-zynqmp.c
-f:drivers/reset/starfive/Kconfig
-f:drivers/reset/starfive/Makefile
-f:drivers/reset/starfive/reset-starfive-jh7100.c
-f:drivers/reset/starfive/reset-starfive-jh7110.c
-f:drivers/reset/starfive/reset-starfive-jh71x0.c
-f:drivers/reset/starfive/reset-starfive-jh71x0.h
-f:drivers/reset/sti/Kconfig
-f:drivers/reset/sti/Makefile
-f:drivers/reset/sti/reset-stih407.c
-f:drivers/reset/sti/reset-syscfg.c
-f:drivers/reset/sti/reset-syscfg.h
-f:drivers/reset/tegra/Kconfig
-f:drivers/reset/tegra/Makefile
-f:drivers/reset/tegra/reset-bpmp.c
-f:drivers/rpmsg/Kconfig
-f:drivers/rpmsg/Makefile
-f:drivers/rpmsg/mtk_rpmsg.c
-f:drivers/rpmsg/qcom_glink_native.c
-f:drivers/rpmsg/qcom_glink_native.h
-f:drivers/rpmsg/qcom_glink_rpm.c
-f:drivers/rpmsg/qcom_glink_smem.c
-f:drivers/rpmsg/qcom_glink_ssr.c
-f:drivers/rpmsg/qcom_glink_trace.h
-f:drivers/rpmsg/qcom_smd.c
-f:drivers/rpmsg/rpmsg_char.c
-f:drivers/rpmsg/rpmsg_char.h
-f:drivers/rpmsg/rpmsg_core.c
-f:drivers/rpmsg/rpmsg_ctrl.c
-f:drivers/rpmsg/rpmsg_internal.h
-f:drivers/rpmsg/rpmsg_ns.c
-f:drivers/rpmsg/virtio_rpmsg_bus.c
-f:drivers/rtc/Kconfig
-f:drivers/rtc/Makefile
-f:drivers/rtc/class.c
-f:drivers/rtc/dev.c
-f:drivers/rtc/interface.c
-f:drivers/rtc/lib.c
-f:drivers/rtc/lib_test.c
-f:drivers/rtc/nvmem.c
-f:drivers/rtc/proc.c
-f:drivers/rtc/rtc-88pm80x.c
-f:drivers/rtc/rtc-88pm860x.c
-f:drivers/rtc/rtc-88pm886.c
-f:drivers/rtc/rtc-ab-b5ze-s3.c
-f:drivers/rtc/rtc-ab-eoz9.c
-f:drivers/rtc/rtc-ab8500.c
-f:drivers/rtc/rtc-abx80x.c
-f:drivers/rtc/rtc-ac100.c
-f:drivers/rtc/rtc-amlogic-a4.c
-f:drivers/rtc/rtc-armada38x.c
-f:drivers/rtc/rtc-as3722.c
-f:drivers/rtc/rtc-asm9260.c
-f:drivers/rtc/rtc-aspeed.c
-f:drivers/rtc/rtc-at91rm9200.c
-f:drivers/rtc/rtc-at91sam9.c
-f:drivers/rtc/rtc-au1xxx.c
-f:drivers/rtc/rtc-bd70528.c
-f:drivers/rtc/rtc-bq32k.c
-f:drivers/rtc/rtc-bq4802.c
-f:drivers/rtc/rtc-brcmstb-waketimer.c
-f:drivers/rtc/rtc-cadence.c
-f:drivers/rtc/rtc-cmos.c
-f:drivers/rtc/rtc-core.h
-f:drivers/rtc/rtc-cpcap.c
-f:drivers/rtc/rtc-cros-ec.c
-f:drivers/rtc/rtc-cv1800.c
-f:drivers/rtc/rtc-da9052.c
-f:drivers/rtc/rtc-da9055.c
-f:drivers/rtc/rtc-da9063.c
-f:drivers/rtc/rtc-digicolor.c
-f:drivers/rtc/rtc-ds1216.c
-f:drivers/rtc/rtc-ds1286.c
-f:drivers/rtc/rtc-ds1302.c
-f:drivers/rtc/rtc-ds1305.c
-f:drivers/rtc/rtc-ds1307.c
-f:drivers/rtc/rtc-ds1343.c
-f:drivers/rtc/rtc-ds1347.c
-f:drivers/rtc/rtc-ds1374.c
-f:drivers/rtc/rtc-ds1390.c
-f:drivers/rtc/rtc-ds1511.c
-f:drivers/rtc/rtc-ds1553.c
-f:drivers/rtc/rtc-ds1672.c
-f:drivers/rtc/rtc-ds1685.c
-f:drivers/rtc/rtc-ds1742.c
-f:drivers/rtc/rtc-ds2404.c
-f:drivers/rtc/rtc-ds3232.c
-f:drivers/rtc/rtc-efi.c
-f:drivers/rtc/rtc-em3027.c
-f:drivers/rtc/rtc-ep93xx.c
-f:drivers/rtc/rtc-fm3130.c
-f:drivers/rtc/rtc-fsl-ftm-alarm.c
-f:drivers/rtc/rtc-ftrtc010.c
-f:drivers/rtc/rtc-gamecube.c
-f:drivers/rtc/rtc-generic.c
-f:drivers/rtc/rtc-goldfish.c
-f:drivers/rtc/rtc-hid-sensor-time.c
-f:drivers/rtc/rtc-hym8563.c
-f:drivers/rtc/rtc-imx-sc.c
-f:drivers/rtc/rtc-imx-sm-bbm.c
-f:drivers/rtc/rtc-imxdi.c
-f:drivers/rtc/rtc-isl12022.c
-f:drivers/rtc/rtc-isl12026.c
-f:drivers/rtc/rtc-isl1208.c
-f:drivers/rtc/rtc-jz4740.c
-f:drivers/rtc/rtc-loongson.c
-f:drivers/rtc/rtc-lp8788.c
-f:drivers/rtc/rtc-lpc24xx.c
-f:drivers/rtc/rtc-lpc32xx.c
-f:drivers/rtc/rtc-m41t80.c
-f:drivers/rtc/rtc-m41t93.c
-f:drivers/rtc/rtc-m41t94.c
-f:drivers/rtc/rtc-m48t35.c
-f:drivers/rtc/rtc-m48t59.c
-f:drivers/rtc/rtc-m48t86.c
-f:drivers/rtc/rtc-ma35d1.c
-f:drivers/rtc/rtc-max31335.c
-f:drivers/rtc/rtc-max6900.c
-f:drivers/rtc/rtc-max6902.c
-f:drivers/rtc/rtc-max6916.c
-f:drivers/rtc/rtc-max77686.c
-f:drivers/rtc/rtc-max8907.c
-f:drivers/rtc/rtc-max8925.c
-f:drivers/rtc/rtc-max8997.c
-f:drivers/rtc/rtc-max8998.c
-f:drivers/rtc/rtc-mc13xxx.c
-f:drivers/rtc/rtc-mc146818-lib.c
-f:drivers/rtc/rtc-mcp795.c
-f:drivers/rtc/rtc-meson-vrtc.c
-f:drivers/rtc/rtc-meson.c
-f:drivers/rtc/rtc-moxart.c
-f:drivers/rtc/rtc-mpc5121.c
-f:drivers/rtc/rtc-mpfs.c
-f:drivers/rtc/rtc-msc313.c
-f:drivers/rtc/rtc-msm6242.c
-f:drivers/rtc/rtc-mt2712.c
-f:drivers/rtc/rtc-mt6397.c
-f:drivers/rtc/rtc-mt7622.c
-f:drivers/rtc/rtc-mv.c
-f:drivers/rtc/rtc-mxc.c
-f:drivers/rtc/rtc-mxc_v2.c
-f:drivers/rtc/rtc-nct3018y.c
-f:drivers/rtc/rtc-ntxec.c
-f:drivers/rtc/rtc-nxp-bbnsm.c
-f:drivers/rtc/rtc-omap.c
-f:drivers/rtc/rtc-opal.c
-f:drivers/rtc/rtc-optee.c
-f:drivers/rtc/rtc-palmas.c
-f:drivers/rtc/rtc-pcap.c
-f:drivers/rtc/rtc-pcf2123.c
-f:drivers/rtc/rtc-pcf2127.c
-f:drivers/rtc/rtc-pcf85063.c
-f:drivers/rtc/rtc-pcf8523.c
-f:drivers/rtc/rtc-pcf85363.c
-f:drivers/rtc/rtc-pcf8563.c
-f:drivers/rtc/rtc-pcf8583.c
-f:drivers/rtc/rtc-pic32.c
-f:drivers/rtc/rtc-pl030.c
-f:drivers/rtc/rtc-pl031.c
-f:drivers/rtc/rtc-pm8xxx.c
-f:drivers/rtc/rtc-ps3.c
-f:drivers/rtc/rtc-pxa.c
-f:drivers/rtc/rtc-r7301.c
-f:drivers/rtc/rtc-r9701.c
-f:drivers/rtc/rtc-rc5t583.c
-f:drivers/rtc/rtc-rc5t619.c
-f:drivers/rtc/rtc-renesas-rtca3.c
-f:drivers/rtc/rtc-rk808.c
-f:drivers/rtc/rtc-rp5c01.c
-f:drivers/rtc/rtc-rs5c313.c
-f:drivers/rtc/rtc-rs5c348.c
-f:drivers/rtc/rtc-rs5c372.c
-f:drivers/rtc/rtc-rtd119x.c
-f:drivers/rtc/rtc-rv3028.c
-f:drivers/rtc/rtc-rv3029c2.c
-f:drivers/rtc/rtc-rv3032.c
-f:drivers/rtc/rtc-rv8803.c
-f:drivers/rtc/rtc-rx4581.c
-f:drivers/rtc/rtc-rx6110.c
-f:drivers/rtc/rtc-rx8010.c
-f:drivers/rtc/rtc-rx8025.c
-f:drivers/rtc/rtc-rx8111.c
-f:drivers/rtc/rtc-rx8581.c
-f:drivers/rtc/rtc-rzn1.c
-f:drivers/rtc/rtc-s32g.c
-f:drivers/rtc/rtc-s35390a.c
-f:drivers/rtc/rtc-s3c.c
-f:drivers/rtc/rtc-s3c.h
-f:drivers/rtc/rtc-s5m.c
-f:drivers/rtc/rtc-sa1100.c
-f:drivers/rtc/rtc-sa1100.h
-f:drivers/rtc/rtc-sc27xx.c
-f:drivers/rtc/rtc-sd2405al.c
-f:drivers/rtc/rtc-sd3078.c
-f:drivers/rtc/rtc-sh.c
-f:drivers/rtc/rtc-snvs.c
-f:drivers/rtc/rtc-spear.c
-f:drivers/rtc/rtc-ssd202d.c
-f:drivers/rtc/rtc-st-lpc.c
-f:drivers/rtc/rtc-starfire.c
-f:drivers/rtc/rtc-stk17ta8.c
-f:drivers/rtc/rtc-stm32.c
-f:drivers/rtc/rtc-stmp3xxx.c
-f:drivers/rtc/rtc-sun4v.c
-f:drivers/rtc/rtc-sun6i.c
-f:drivers/rtc/rtc-sunplus.c
-f:drivers/rtc/rtc-sunxi.c
-f:drivers/rtc/rtc-tegra.c
-f:drivers/rtc/rtc-test.c
-f:drivers/rtc/rtc-ti-k3.c
-f:drivers/rtc/rtc-tps6586x.c
-f:drivers/rtc/rtc-tps65910.c
-f:drivers/rtc/rtc-tps6594.c
-f:drivers/rtc/rtc-twl.c
-f:drivers/rtc/rtc-vt8500.c
-f:drivers/rtc/rtc-wilco-ec.c
-f:drivers/rtc/rtc-wm831x.c
-f:drivers/rtc/rtc-wm8350.c
-f:drivers/rtc/rtc-x1205.c
-f:drivers/rtc/rtc-xgene.c
-f:drivers/rtc/rtc-zynqmp.c
-f:drivers/rtc/sysfs.c
-f:drivers/s390/Makefile
-f:drivers/s390/block/Kconfig
-f:drivers/s390/block/Makefile
-f:drivers/s390/block/dasd.c
-f:drivers/s390/block/dasd_3990_erp.c
-f:drivers/s390/block/dasd_alias.c
-f:drivers/s390/block/dasd_devmap.c
-f:drivers/s390/block/dasd_diag.c
-f:drivers/s390/block/dasd_diag.h
-f:drivers/s390/block/dasd_eckd.c
-f:drivers/s390/block/dasd_eckd.h
-f:drivers/s390/block/dasd_eer.c
-f:drivers/s390/block/dasd_erp.c
-f:drivers/s390/block/dasd_fba.c
-f:drivers/s390/block/dasd_fba.h
-f:drivers/s390/block/dasd_genhd.c
-f:drivers/s390/block/dasd_int.h
-f:drivers/s390/block/dasd_ioctl.c
-f:drivers/s390/block/dasd_proc.c
-f:drivers/s390/block/dcssblk.c
-f:drivers/s390/block/scm_blk.c
-f:drivers/s390/block/scm_blk.h
-f:drivers/s390/block/scm_drv.c
-f:drivers/s390/char/Kconfig
-f:drivers/s390/char/Makefile
-f:drivers/s390/char/con3215.c
-f:drivers/s390/char/con3270.c
-f:drivers/s390/char/ctrlchar.c
-f:drivers/s390/char/ctrlchar.h
-f:drivers/s390/char/defkeymap.c
-f:drivers/s390/char/defkeymap.map
-f:drivers/s390/char/diag_ftp.c
-f:drivers/s390/char/diag_ftp.h
-f:drivers/s390/char/fs3270.c
-f:drivers/s390/char/hmcdrv_cache.c
-f:drivers/s390/char/hmcdrv_cache.h
-f:drivers/s390/char/hmcdrv_dev.c
-f:drivers/s390/char/hmcdrv_dev.h
-f:drivers/s390/char/hmcdrv_ftp.c
-f:drivers/s390/char/hmcdrv_ftp.h
-f:drivers/s390/char/hmcdrv_mod.c
-f:drivers/s390/char/keyboard.c
-f:drivers/s390/char/keyboard.h
-f:drivers/s390/char/monreader.c
-f:drivers/s390/char/monwriter.c
-f:drivers/s390/char/raw3270.c
-f:drivers/s390/char/raw3270.h
-f:drivers/s390/char/sclp.c
-f:drivers/s390/char/sclp.h
-f:drivers/s390/char/sclp_ap.c
-f:drivers/s390/char/sclp_cmd.c
-f:drivers/s390/char/sclp_con.c
-f:drivers/s390/char/sclp_config.c
-f:drivers/s390/char/sclp_cpi_sys.c
-f:drivers/s390/char/sclp_cpi_sys.h
-f:drivers/s390/char/sclp_ctl.c
-f:drivers/s390/char/sclp_diag.h
-f:drivers/s390/char/sclp_early.c
-f:drivers/s390/char/sclp_early_core.c
-f:drivers/s390/char/sclp_ftp.c
-f:drivers/s390/char/sclp_ftp.h
-f:drivers/s390/char/sclp_ocf.c
-f:drivers/s390/char/sclp_pci.c
-f:drivers/s390/char/sclp_quiesce.c
-f:drivers/s390/char/sclp_rw.c
-f:drivers/s390/char/sclp_rw.h
-f:drivers/s390/char/sclp_sd.c
-f:drivers/s390/char/sclp_sdias.c
-f:drivers/s390/char/sclp_sdias.h
-f:drivers/s390/char/sclp_tty.c
-f:drivers/s390/char/sclp_tty.h
-f:drivers/s390/char/sclp_vt220.c
-f:drivers/s390/char/tape.h
-f:drivers/s390/char/tape_34xx.c
-f:drivers/s390/char/tape_3590.c
-f:drivers/s390/char/tape_3590.h
-f:drivers/s390/char/tape_char.c
-f:drivers/s390/char/tape_class.c
-f:drivers/s390/char/tape_class.h
-f:drivers/s390/char/tape_core.c
-f:drivers/s390/char/tape_proc.c
-f:drivers/s390/char/tape_std.c
-f:drivers/s390/char/tape_std.h
-f:drivers/s390/char/uvdevice.c
-f:drivers/s390/char/vmcp.c
-f:drivers/s390/char/vmlogrdr.c
-f:drivers/s390/char/vmur.c
-f:drivers/s390/char/vmur.h
-f:drivers/s390/char/zcore.c
-f:drivers/s390/cio/Makefile
-f:drivers/s390/cio/airq.c
-f:drivers/s390/cio/blacklist.c
-f:drivers/s390/cio/blacklist.h
-f:drivers/s390/cio/ccwgroup.c
-f:drivers/s390/cio/ccwreq.c
-f:drivers/s390/cio/chp.c
-f:drivers/s390/cio/chp.h
-f:drivers/s390/cio/chsc.c
-f:drivers/s390/cio/chsc.h
-f:drivers/s390/cio/chsc_sch.c
-f:drivers/s390/cio/chsc_sch.h
-f:drivers/s390/cio/cio.c
-f:drivers/s390/cio/cio.h
-f:drivers/s390/cio/cio_debug.h
-f:drivers/s390/cio/cio_debugfs.c
-f:drivers/s390/cio/cio_inject.c
-f:drivers/s390/cio/cio_inject.h
-f:drivers/s390/cio/cmf.c
-f:drivers/s390/cio/crw.c
-f:drivers/s390/cio/css.c
-f:drivers/s390/cio/css.h
-f:drivers/s390/cio/device.c
-f:drivers/s390/cio/device.h
-f:drivers/s390/cio/device_fsm.c
-f:drivers/s390/cio/device_id.c
-f:drivers/s390/cio/device_ops.c
-f:drivers/s390/cio/device_pgid.c
-f:drivers/s390/cio/device_status.c
-f:drivers/s390/cio/eadm_sch.c
-f:drivers/s390/cio/eadm_sch.h
-f:drivers/s390/cio/fcx.c
-f:drivers/s390/cio/idset.c
-f:drivers/s390/cio/idset.h
-f:drivers/s390/cio/io_sch.h
-f:drivers/s390/cio/ioasm.c
-f:drivers/s390/cio/ioasm.h
-f:drivers/s390/cio/isc.c
-f:drivers/s390/cio/itcw.c
-f:drivers/s390/cio/orb.h
-f:drivers/s390/cio/qdio.h
-f:drivers/s390/cio/qdio_debug.c
-f:drivers/s390/cio/qdio_debug.h
-f:drivers/s390/cio/qdio_main.c
-f:drivers/s390/cio/qdio_setup.c
-f:drivers/s390/cio/qdio_thinint.c
-f:drivers/s390/cio/scm.c
-f:drivers/s390/cio/trace.c
-f:drivers/s390/cio/trace.h
-f:drivers/s390/cio/vfio_ccw_async.c
-f:drivers/s390/cio/vfio_ccw_chp.c
-f:drivers/s390/cio/vfio_ccw_cp.c
-f:drivers/s390/cio/vfio_ccw_cp.h
-f:drivers/s390/cio/vfio_ccw_drv.c
-f:drivers/s390/cio/vfio_ccw_fsm.c
-f:drivers/s390/cio/vfio_ccw_ops.c
-f:drivers/s390/cio/vfio_ccw_private.h
-f:drivers/s390/cio/vfio_ccw_trace.c
-f:drivers/s390/cio/vfio_ccw_trace.h
-f:drivers/s390/crypto/Makefile
-f:drivers/s390/crypto/ap_bus.c
-f:drivers/s390/crypto/ap_bus.h
-f:drivers/s390/crypto/ap_card.c
-f:drivers/s390/crypto/ap_debug.h
-f:drivers/s390/crypto/ap_queue.c
-f:drivers/s390/crypto/pkey_api.c
-f:drivers/s390/crypto/pkey_base.c
-f:drivers/s390/crypto/pkey_base.h
-f:drivers/s390/crypto/pkey_cca.c
-f:drivers/s390/crypto/pkey_ep11.c
-f:drivers/s390/crypto/pkey_pckmo.c
-f:drivers/s390/crypto/pkey_sysfs.c
-f:drivers/s390/crypto/pkey_uv.c
-f:drivers/s390/crypto/vfio_ap_debug.h
-f:drivers/s390/crypto/vfio_ap_drv.c
-f:drivers/s390/crypto/vfio_ap_ops.c
-f:drivers/s390/crypto/vfio_ap_private.h
-f:drivers/s390/crypto/zcrypt_api.c
-f:drivers/s390/crypto/zcrypt_api.h
-f:drivers/s390/crypto/zcrypt_card.c
-f:drivers/s390/crypto/zcrypt_cca_key.h
-f:drivers/s390/crypto/zcrypt_ccamisc.c
-f:drivers/s390/crypto/zcrypt_ccamisc.h
-f:drivers/s390/crypto/zcrypt_cex2a.c
-f:drivers/s390/crypto/zcrypt_cex2a.h
-f:drivers/s390/crypto/zcrypt_cex2c.c
-f:drivers/s390/crypto/zcrypt_cex2c.h
-f:drivers/s390/crypto/zcrypt_cex4.c
-f:drivers/s390/crypto/zcrypt_cex4.h
-f:drivers/s390/crypto/zcrypt_debug.h
-f:drivers/s390/crypto/zcrypt_ep11misc.c
-f:drivers/s390/crypto/zcrypt_ep11misc.h
-f:drivers/s390/crypto/zcrypt_error.h
-f:drivers/s390/crypto/zcrypt_msgtype50.c
-f:drivers/s390/crypto/zcrypt_msgtype50.h
-f:drivers/s390/crypto/zcrypt_msgtype6.c
-f:drivers/s390/crypto/zcrypt_msgtype6.h
-f:drivers/s390/crypto/zcrypt_queue.c
-f:drivers/s390/net/Kconfig
-f:drivers/s390/net/Makefile
-f:drivers/s390/net/ctcm_dbug.c
-f:drivers/s390/net/ctcm_dbug.h
-f:drivers/s390/net/ctcm_fsms.c
-f:drivers/s390/net/ctcm_fsms.h
-f:drivers/s390/net/ctcm_main.c
-f:drivers/s390/net/ctcm_main.h
-f:drivers/s390/net/ctcm_mpc.c
-f:drivers/s390/net/ctcm_mpc.h
-f:drivers/s390/net/ctcm_sysfs.c
-f:drivers/s390/net/fsm.c
-f:drivers/s390/net/fsm.h
-f:drivers/s390/net/ism.h
-f:drivers/s390/net/ism_drv.c
-f:drivers/s390/net/qeth_core.h
-f:drivers/s390/net/qeth_core_main.c
-f:drivers/s390/net/qeth_core_mpc.c
-f:drivers/s390/net/qeth_core_mpc.h
-f:drivers/s390/net/qeth_core_sys.c
-f:drivers/s390/net/qeth_ethtool.c
-f:drivers/s390/net/qeth_l2.h
-f:drivers/s390/net/qeth_l2_main.c
-f:drivers/s390/net/qeth_l2_sys.c
-f:drivers/s390/net/qeth_l3.h
-f:drivers/s390/net/qeth_l3_main.c
-f:drivers/s390/net/qeth_l3_sys.c
-f:drivers/s390/net/smsgiucv.c
-f:drivers/s390/net/smsgiucv.h
-f:drivers/s390/net/smsgiucv_app.c
-f:drivers/s390/scsi/Makefile
-f:drivers/s390/scsi/zfcp_aux.c
-f:drivers/s390/scsi/zfcp_ccw.c
-f:drivers/s390/scsi/zfcp_dbf.c
-f:drivers/s390/scsi/zfcp_dbf.h
-f:drivers/s390/scsi/zfcp_def.h
-f:drivers/s390/scsi/zfcp_diag.c
-f:drivers/s390/scsi/zfcp_diag.h
-f:drivers/s390/scsi/zfcp_erp.c
-f:drivers/s390/scsi/zfcp_ext.h
-f:drivers/s390/scsi/zfcp_fc.c
-f:drivers/s390/scsi/zfcp_fc.h
-f:drivers/s390/scsi/zfcp_fsf.c
-f:drivers/s390/scsi/zfcp_fsf.h
-f:drivers/s390/scsi/zfcp_qdio.c
-f:drivers/s390/scsi/zfcp_qdio.h
-f:drivers/s390/scsi/zfcp_reqlist.h
-f:drivers/s390/scsi/zfcp_scsi.c
-f:drivers/s390/scsi/zfcp_sysfs.c
-f:drivers/s390/scsi/zfcp_unit.c
-f:drivers/s390/virtio/Makefile
-f:drivers/s390/virtio/virtio_ccw.c
-f:drivers/sbus/Makefile
-f:drivers/sbus/char/Kconfig
-f:drivers/sbus/char/Makefile
-f:drivers/sbus/char/bbc_envctrl.c
-f:drivers/sbus/char/bbc_i2c.c
-f:drivers/sbus/char/bbc_i2c.h
-f:drivers/sbus/char/display7seg.c
-f:drivers/sbus/char/envctrl.c
-f:drivers/sbus/char/flash.c
-f:drivers/sbus/char/max1617.h
-f:drivers/sbus/char/openprom.c
-f:drivers/sbus/char/oradax.c
-f:drivers/sbus/char/uctrl.c
-f:drivers/scsi/.gitignore
-f:drivers/scsi/3w-9xxx.c
-f:drivers/scsi/3w-9xxx.h
-f:drivers/scsi/3w-sas.c
-f:drivers/scsi/3w-sas.h
-f:drivers/scsi/3w-xxxx.c
-f:drivers/scsi/3w-xxxx.h
-f:drivers/scsi/53c700.c
-f:drivers/scsi/53c700.h
-f:drivers/scsi/53c700.scr
-f:drivers/scsi/53c700_d.h_shipped
-f:drivers/scsi/BusLogic.c
-f:drivers/scsi/BusLogic.h
-f:drivers/scsi/FlashPoint.c
-f:drivers/scsi/Kconfig
-f:drivers/scsi/Makefile
-f:drivers/scsi/NCR5380.c
-f:drivers/scsi/NCR5380.h
-f:drivers/scsi/a100u2w.c
-f:drivers/scsi/a100u2w.h
-f:drivers/scsi/a2091.c
-f:drivers/scsi/a2091.h
-f:drivers/scsi/a3000.c
-f:drivers/scsi/a3000.h
-f:drivers/scsi/a4000t.c
-f:drivers/scsi/aacraid/Makefile
-f:drivers/scsi/aacraid/aachba.c
-f:drivers/scsi/aacraid/aacraid.h
-f:drivers/scsi/aacraid/commctrl.c
-f:drivers/scsi/aacraid/comminit.c
-f:drivers/scsi/aacraid/commsup.c
-f:drivers/scsi/aacraid/dpcsup.c
-f:drivers/scsi/aacraid/linit.c
-f:drivers/scsi/aacraid/nark.c
-f:drivers/scsi/aacraid/rkt.c
-f:drivers/scsi/aacraid/rx.c
-f:drivers/scsi/aacraid/sa.c
-f:drivers/scsi/aacraid/src.c
-f:drivers/scsi/advansys.c
-f:drivers/scsi/aha152x.c
-f:drivers/scsi/aha152x.h
-f:drivers/scsi/aha1542.c
-f:drivers/scsi/aha1542.h
-f:drivers/scsi/aha1740.c
-f:drivers/scsi/aha1740.h
-f:drivers/scsi/aic7xxx/.gitignore
-f:drivers/scsi/aic7xxx/Kconfig.aic79xx
-f:drivers/scsi/aic7xxx/Kconfig.aic7xxx
-f:drivers/scsi/aic7xxx/Makefile
-f:drivers/scsi/aic7xxx/aic7770.c
-f:drivers/scsi/aic7xxx/aic7770_osm.c
-f:drivers/scsi/aic7xxx/aic79xx.h
-f:drivers/scsi/aic7xxx/aic79xx.reg
-f:drivers/scsi/aic7xxx/aic79xx.seq
-f:drivers/scsi/aic7xxx/aic79xx_core.c
-f:drivers/scsi/aic7xxx/aic79xx_inline.h
-f:drivers/scsi/aic7xxx/aic79xx_osm.c
-f:drivers/scsi/aic7xxx/aic79xx_osm.h
-f:drivers/scsi/aic7xxx/aic79xx_osm_pci.c
-f:drivers/scsi/aic7xxx/aic79xx_pci.c
-f:drivers/scsi/aic7xxx/aic79xx_pci.h
-f:drivers/scsi/aic7xxx/aic79xx_proc.c
-f:drivers/scsi/aic7xxx/aic79xx_reg.h_shipped
-f:drivers/scsi/aic7xxx/aic79xx_reg_print.c_shipped
-f:drivers/scsi/aic7xxx/aic79xx_seq.h_shipped
-f:drivers/scsi/aic7xxx/aic7xxx.h
-f:drivers/scsi/aic7xxx/aic7xxx.reg
-f:drivers/scsi/aic7xxx/aic7xxx.seq
-f:drivers/scsi/aic7xxx/aic7xxx_93cx6.c
-f:drivers/scsi/aic7xxx/aic7xxx_93cx6.h
-f:drivers/scsi/aic7xxx/aic7xxx_core.c
-f:drivers/scsi/aic7xxx/aic7xxx_inline.h
-f:drivers/scsi/aic7xxx/aic7xxx_osm.c
-f:drivers/scsi/aic7xxx/aic7xxx_osm.h
-f:drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
-f:drivers/scsi/aic7xxx/aic7xxx_pci.c
-f:drivers/scsi/aic7xxx/aic7xxx_pci.h
-f:drivers/scsi/aic7xxx/aic7xxx_proc.c
-f:drivers/scsi/aic7xxx/aic7xxx_reg.h_shipped
-f:drivers/scsi/aic7xxx/aic7xxx_reg_print.c_shipped
-f:drivers/scsi/aic7xxx/aic7xxx_seq.h_shipped
-f:drivers/scsi/aic7xxx/aicasm/Makefile
-f:drivers/scsi/aic7xxx/aicasm/aicasm.c
-f:drivers/scsi/aic7xxx/aicasm/aicasm.h
-f:drivers/scsi/aic7xxx/aicasm/aicasm_gram.y
-f:drivers/scsi/aic7xxx/aicasm/aicasm_insformat.h
-f:drivers/scsi/aic7xxx/aicasm/aicasm_macro_gram.y
-f:drivers/scsi/aic7xxx/aicasm/aicasm_macro_scan.l
-f:drivers/scsi/aic7xxx/aicasm/aicasm_scan.l
-f:drivers/scsi/aic7xxx/aicasm/aicasm_symbol.c
-f:drivers/scsi/aic7xxx/aicasm/aicasm_symbol.h
-f:drivers/scsi/aic7xxx/aiclib.h
-f:drivers/scsi/aic7xxx/cam.h
-f:drivers/scsi/aic7xxx/queue.h
-f:drivers/scsi/aic7xxx/scsi_iu.h
-f:drivers/scsi/aic7xxx/scsi_message.h
-f:drivers/scsi/aic94xx/Kconfig
-f:drivers/scsi/aic94xx/Makefile
-f:drivers/scsi/aic94xx/aic94xx.h
-f:drivers/scsi/aic94xx/aic94xx_dev.c
-f:drivers/scsi/aic94xx/aic94xx_dump.c
-f:drivers/scsi/aic94xx/aic94xx_dump.h
-f:drivers/scsi/aic94xx/aic94xx_hwi.c
-f:drivers/scsi/aic94xx/aic94xx_hwi.h
-f:drivers/scsi/aic94xx/aic94xx_init.c
-f:drivers/scsi/aic94xx/aic94xx_reg.c
-f:drivers/scsi/aic94xx/aic94xx_reg.h
-f:drivers/scsi/aic94xx/aic94xx_reg_def.h
-f:drivers/scsi/aic94xx/aic94xx_sas.h
-f:drivers/scsi/aic94xx/aic94xx_scb.c
-f:drivers/scsi/aic94xx/aic94xx_sds.c
-f:drivers/scsi/aic94xx/aic94xx_sds.h
-f:drivers/scsi/aic94xx/aic94xx_seq.c
-f:drivers/scsi/aic94xx/aic94xx_seq.h
-f:drivers/scsi/aic94xx/aic94xx_task.c
-f:drivers/scsi/aic94xx/aic94xx_tmf.c
-f:drivers/scsi/am53c974.c
-f:drivers/scsi/arcmsr/Makefile
-f:drivers/scsi/arcmsr/arcmsr.h
-f:drivers/scsi/arcmsr/arcmsr_attr.c
-f:drivers/scsi/arcmsr/arcmsr_hba.c
-f:drivers/scsi/arm/Kconfig
-f:drivers/scsi/arm/Makefile
-f:drivers/scsi/arm/acornscsi-io.S
-f:drivers/scsi/arm/acornscsi.c
-f:drivers/scsi/arm/acornscsi.h
-f:drivers/scsi/arm/arm_scsi.h
-f:drivers/scsi/arm/arxescsi.c
-f:drivers/scsi/arm/cumana_1.c
-f:drivers/scsi/arm/cumana_2.c
-f:drivers/scsi/arm/eesox.c
-f:drivers/scsi/arm/fas216.c
-f:drivers/scsi/arm/fas216.h
-f:drivers/scsi/arm/msgqueue.c
-f:drivers/scsi/arm/msgqueue.h
-f:drivers/scsi/arm/oak.c
-f:drivers/scsi/arm/powertec.c
-f:drivers/scsi/arm/queue.c
-f:drivers/scsi/arm/queue.h
-f:drivers/scsi/atari_scsi.c
-f:drivers/scsi/atp870u.c
-f:drivers/scsi/atp870u.h
-f:drivers/scsi/be2iscsi/Kconfig
-f:drivers/scsi/be2iscsi/Makefile
-f:drivers/scsi/be2iscsi/be.h
-f:drivers/scsi/be2iscsi/be_cmds.c
-f:drivers/scsi/be2iscsi/be_cmds.h
-f:drivers/scsi/be2iscsi/be_iscsi.c
-f:drivers/scsi/be2iscsi/be_iscsi.h
-f:drivers/scsi/be2iscsi/be_main.c
-f:drivers/scsi/be2iscsi/be_main.h
-f:drivers/scsi/be2iscsi/be_mgmt.c
-f:drivers/scsi/be2iscsi/be_mgmt.h
-f:drivers/scsi/bfa/Makefile
-f:drivers/scsi/bfa/bfa.h
-f:drivers/scsi/bfa/bfa_core.c
-f:drivers/scsi/bfa/bfa_cs.h
-f:drivers/scsi/bfa/bfa_defs.h
-f:drivers/scsi/bfa/bfa_defs_fcs.h
-f:drivers/scsi/bfa/bfa_defs_svc.h
-f:drivers/scsi/bfa/bfa_fc.h
-f:drivers/scsi/bfa/bfa_fcbuild.c
-f:drivers/scsi/bfa/bfa_fcbuild.h
-f:drivers/scsi/bfa/bfa_fcpim.c
-f:drivers/scsi/bfa/bfa_fcpim.h
-f:drivers/scsi/bfa/bfa_fcs.c
-f:drivers/scsi/bfa/bfa_fcs.h
-f:drivers/scsi/bfa/bfa_fcs_fcpim.c
-f:drivers/scsi/bfa/bfa_fcs_lport.c
-f:drivers/scsi/bfa/bfa_fcs_rport.c
-f:drivers/scsi/bfa/bfa_hw_cb.c
-f:drivers/scsi/bfa/bfa_hw_ct.c
-f:drivers/scsi/bfa/bfa_ioc.c
-f:drivers/scsi/bfa/bfa_ioc.h
-f:drivers/scsi/bfa/bfa_ioc_cb.c
-f:drivers/scsi/bfa/bfa_ioc_ct.c
-f:drivers/scsi/bfa/bfa_modules.h
-f:drivers/scsi/bfa/bfa_plog.h
-f:drivers/scsi/bfa/bfa_port.c
-f:drivers/scsi/bfa/bfa_port.h
-f:drivers/scsi/bfa/bfa_svc.c
-f:drivers/scsi/bfa/bfa_svc.h
-f:drivers/scsi/bfa/bfad.c
-f:drivers/scsi/bfa/bfad_attr.c
-f:drivers/scsi/bfa/bfad_bsg.c
-f:drivers/scsi/bfa/bfad_bsg.h
-f:drivers/scsi/bfa/bfad_debugfs.c
-f:drivers/scsi/bfa/bfad_drv.h
-f:drivers/scsi/bfa/bfad_im.c
-f:drivers/scsi/bfa/bfad_im.h
-f:drivers/scsi/bfa/bfi.h
-f:drivers/scsi/bfa/bfi_ms.h
-f:drivers/scsi/bfa/bfi_reg.h
-f:drivers/scsi/bnx2fc/57xx_hsi_bnx2fc.h
-f:drivers/scsi/bnx2fc/Kconfig
-f:drivers/scsi/bnx2fc/Makefile
-f:drivers/scsi/bnx2fc/bnx2fc.h
-f:drivers/scsi/bnx2fc/bnx2fc_constants.h
-f:drivers/scsi/bnx2fc/bnx2fc_debug.c
-f:drivers/scsi/bnx2fc/bnx2fc_debug.h
-f:drivers/scsi/bnx2fc/bnx2fc_els.c
-f:drivers/scsi/bnx2fc/bnx2fc_fcoe.c
-f:drivers/scsi/bnx2fc/bnx2fc_hwi.c
-f:drivers/scsi/bnx2fc/bnx2fc_io.c
-f:drivers/scsi/bnx2fc/bnx2fc_tgt.c
-f:drivers/scsi/bnx2i/57xx_iscsi_constants.h
-f:drivers/scsi/bnx2i/57xx_iscsi_hsi.h
-f:drivers/scsi/bnx2i/Kconfig
-f:drivers/scsi/bnx2i/Makefile
-f:drivers/scsi/bnx2i/bnx2i.h
-f:drivers/scsi/bnx2i/bnx2i_hwi.c
-f:drivers/scsi/bnx2i/bnx2i_init.c
-f:drivers/scsi/bnx2i/bnx2i_iscsi.c
-f:drivers/scsi/bnx2i/bnx2i_sysfs.c
-f:drivers/scsi/bvme6000_scsi.c
-f:drivers/scsi/ch.c
-f:drivers/scsi/constants.c
-f:drivers/scsi/csiostor/Kconfig
-f:drivers/scsi/csiostor/Makefile
-f:drivers/scsi/csiostor/csio_attr.c
-f:drivers/scsi/csiostor/csio_defs.h
-f:drivers/scsi/csiostor/csio_hw.c
-f:drivers/scsi/csiostor/csio_hw.h
-f:drivers/scsi/csiostor/csio_hw_chip.h
-f:drivers/scsi/csiostor/csio_hw_t5.c
-f:drivers/scsi/csiostor/csio_init.c
-f:drivers/scsi/csiostor/csio_init.h
-f:drivers/scsi/csiostor/csio_isr.c
-f:drivers/scsi/csiostor/csio_lnode.c
-f:drivers/scsi/csiostor/csio_lnode.h
-f:drivers/scsi/csiostor/csio_mb.c
-f:drivers/scsi/csiostor/csio_mb.h
-f:drivers/scsi/csiostor/csio_rnode.c
-f:drivers/scsi/csiostor/csio_rnode.h
-f:drivers/scsi/csiostor/csio_scsi.c
-f:drivers/scsi/csiostor/csio_scsi.h
-f:drivers/scsi/csiostor/csio_wr.c
-f:drivers/scsi/csiostor/csio_wr.h
-f:drivers/scsi/csiostor/t4fw_api_stor.h
-f:drivers/scsi/cxgbi/Kconfig
-f:drivers/scsi/cxgbi/Makefile
-f:drivers/scsi/cxgbi/cxgb3i/Kbuild
-f:drivers/scsi/cxgbi/cxgb3i/Kconfig
-f:drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
-f:drivers/scsi/cxgbi/cxgb3i/cxgb3i.h
-f:drivers/scsi/cxgbi/cxgb4i/Kbuild
-f:drivers/scsi/cxgbi/cxgb4i/Kconfig
-f:drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
-f:drivers/scsi/cxgbi/cxgb4i/cxgb4i.h
-f:drivers/scsi/cxgbi/libcxgbi.c
-f:drivers/scsi/cxgbi/libcxgbi.h
-f:drivers/scsi/dc395x.c
-f:drivers/scsi/dc395x.h
-f:drivers/scsi/device_handler/Kconfig
-f:drivers/scsi/device_handler/Makefile
-f:drivers/scsi/device_handler/scsi_dh_alua.c
-f:drivers/scsi/device_handler/scsi_dh_emc.c
-f:drivers/scsi/device_handler/scsi_dh_hp_sw.c
-f:drivers/scsi/device_handler/scsi_dh_rdac.c
-f:drivers/scsi/dmx3191d.c
-f:drivers/scsi/elx/Kconfig
-f:drivers/scsi/elx/Makefile
-f:drivers/scsi/elx/efct/efct_driver.c
-f:drivers/scsi/elx/efct/efct_driver.h
-f:drivers/scsi/elx/efct/efct_hw.c
-f:drivers/scsi/elx/efct/efct_hw.h
-f:drivers/scsi/elx/efct/efct_hw_queues.c
-f:drivers/scsi/elx/efct/efct_io.c
-f:drivers/scsi/elx/efct/efct_io.h
-f:drivers/scsi/elx/efct/efct_lio.c
-f:drivers/scsi/elx/efct/efct_lio.h
-f:drivers/scsi/elx/efct/efct_scsi.c
-f:drivers/scsi/elx/efct/efct_scsi.h
-f:drivers/scsi/elx/efct/efct_unsol.c
-f:drivers/scsi/elx/efct/efct_unsol.h
-f:drivers/scsi/elx/efct/efct_xport.c
-f:drivers/scsi/elx/efct/efct_xport.h
-f:drivers/scsi/elx/include/efc_common.h
-f:drivers/scsi/elx/libefc/efc.h
-f:drivers/scsi/elx/libefc/efc_cmds.c
-f:drivers/scsi/elx/libefc/efc_cmds.h
-f:drivers/scsi/elx/libefc/efc_device.c
-f:drivers/scsi/elx/libefc/efc_device.h
-f:drivers/scsi/elx/libefc/efc_domain.c
-f:drivers/scsi/elx/libefc/efc_domain.h
-f:drivers/scsi/elx/libefc/efc_els.c
-f:drivers/scsi/elx/libefc/efc_els.h
-f:drivers/scsi/elx/libefc/efc_fabric.c
-f:drivers/scsi/elx/libefc/efc_fabric.h
-f:drivers/scsi/elx/libefc/efc_node.c
-f:drivers/scsi/elx/libefc/efc_node.h
-f:drivers/scsi/elx/libefc/efc_nport.c
-f:drivers/scsi/elx/libefc/efc_nport.h
-f:drivers/scsi/elx/libefc/efc_sm.c
-f:drivers/scsi/elx/libefc/efc_sm.h
-f:drivers/scsi/elx/libefc/efclib.c
-f:drivers/scsi/elx/libefc/efclib.h
-f:drivers/scsi/elx/libefc_sli/sli4.c
-f:drivers/scsi/elx/libefc_sli/sli4.h
-f:drivers/scsi/esas2r/Kconfig
-f:drivers/scsi/esas2r/Makefile
-f:drivers/scsi/esas2r/atioctl.h
-f:drivers/scsi/esas2r/atvda.h
-f:drivers/scsi/esas2r/esas2r.h
-f:drivers/scsi/esas2r/esas2r_disc.c
-f:drivers/scsi/esas2r/esas2r_flash.c
-f:drivers/scsi/esas2r/esas2r_init.c
-f:drivers/scsi/esas2r/esas2r_int.c
-f:drivers/scsi/esas2r/esas2r_io.c
-f:drivers/scsi/esas2r/esas2r_ioctl.c
-f:drivers/scsi/esas2r/esas2r_log.c
-f:drivers/scsi/esas2r/esas2r_log.h
-f:drivers/scsi/esas2r/esas2r_main.c
-f:drivers/scsi/esas2r/esas2r_targdb.c
-f:drivers/scsi/esas2r/esas2r_vda.c
-f:drivers/scsi/esp_scsi.c
-f:drivers/scsi/esp_scsi.h
-f:drivers/scsi/fcoe/Makefile
-f:drivers/scsi/fcoe/fcoe.c
-f:drivers/scsi/fcoe/fcoe.h
-f:drivers/scsi/fcoe/fcoe_ctlr.c
-f:drivers/scsi/fcoe/fcoe_sysfs.c
-f:drivers/scsi/fcoe/fcoe_transport.c
-f:drivers/scsi/fcoe/libfcoe.h
-f:drivers/scsi/fdomain.c
-f:drivers/scsi/fdomain.h
-f:drivers/scsi/fdomain_isa.c
-f:drivers/scsi/fdomain_pci.c
-f:drivers/scsi/fnic/Makefile
-f:drivers/scsi/fnic/cq_desc.h
-f:drivers/scsi/fnic/cq_enet_desc.h
-f:drivers/scsi/fnic/cq_exch_desc.h
-f:drivers/scsi/fnic/fcpio.h
-f:drivers/scsi/fnic/fdls_disc.c
-f:drivers/scsi/fnic/fdls_fc.h
-f:drivers/scsi/fnic/fip.c
-f:drivers/scsi/fnic/fip.h
-f:drivers/scsi/fnic/fnic.h
-f:drivers/scsi/fnic/fnic_attrs.c
-f:drivers/scsi/fnic/fnic_debugfs.c
-f:drivers/scsi/fnic/fnic_fcs.c
-f:drivers/scsi/fnic/fnic_fdls.h
-f:drivers/scsi/fnic/fnic_io.h
-f:drivers/scsi/fnic/fnic_isr.c
-f:drivers/scsi/fnic/fnic_main.c
-f:drivers/scsi/fnic/fnic_pci_subsys_devid.c
-f:drivers/scsi/fnic/fnic_res.c
-f:drivers/scsi/fnic/fnic_res.h
-f:drivers/scsi/fnic/fnic_scsi.c
-f:drivers/scsi/fnic/fnic_stats.h
-f:drivers/scsi/fnic/fnic_trace.c
-f:drivers/scsi/fnic/fnic_trace.h
-f:drivers/scsi/fnic/rq_enet_desc.h
-f:drivers/scsi/fnic/vnic_cq.c
-f:drivers/scsi/fnic/vnic_cq.h
-f:drivers/scsi/fnic/vnic_cq_copy.h
-f:drivers/scsi/fnic/vnic_dev.c
-f:drivers/scsi/fnic/vnic_dev.h
-f:drivers/scsi/fnic/vnic_devcmd.h
-f:drivers/scsi/fnic/vnic_intr.c
-f:drivers/scsi/fnic/vnic_intr.h
-f:drivers/scsi/fnic/vnic_nic.h
-f:drivers/scsi/fnic/vnic_resource.h
-f:drivers/scsi/fnic/vnic_rq.c
-f:drivers/scsi/fnic/vnic_rq.h
-f:drivers/scsi/fnic/vnic_scsi.h
-f:drivers/scsi/fnic/vnic_stats.h
-f:drivers/scsi/fnic/vnic_wq.c
-f:drivers/scsi/fnic/vnic_wq.h
-f:drivers/scsi/fnic/vnic_wq_copy.c
-f:drivers/scsi/fnic/vnic_wq_copy.h
-f:drivers/scsi/fnic/wq_enet_desc.h
-f:drivers/scsi/g_NCR5380.c
-f:drivers/scsi/gvp11.c
-f:drivers/scsi/gvp11.h
-f:drivers/scsi/hisi_sas/Kconfig
-f:drivers/scsi/hisi_sas/Makefile
-f:drivers/scsi/hisi_sas/hisi_sas.h
-f:drivers/scsi/hisi_sas/hisi_sas_main.c
-f:drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
-f:drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
-f:drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
-f:drivers/scsi/hosts.c
-f:drivers/scsi/hpsa.c
-f:drivers/scsi/hpsa.h
-f:drivers/scsi/hpsa_cmd.h
-f:drivers/scsi/hptiop.c
-f:drivers/scsi/hptiop.h
-f:drivers/scsi/ibmvscsi/Makefile
-f:drivers/scsi/ibmvscsi/ibmvfc.c
-f:drivers/scsi/ibmvscsi/ibmvfc.h
-f:drivers/scsi/ibmvscsi/ibmvscsi.c
-f:drivers/scsi/ibmvscsi/ibmvscsi.h
-f:drivers/scsi/ibmvscsi_tgt/Makefile
-f:drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c
-f:drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.h
-f:drivers/scsi/ibmvscsi_tgt/libsrp.c
-f:drivers/scsi/ibmvscsi_tgt/libsrp.h
-f:drivers/scsi/imm.c
-f:drivers/scsi/imm.h
-f:drivers/scsi/initio.c
-f:drivers/scsi/initio.h
-f:drivers/scsi/ipr.c
-f:drivers/scsi/ipr.h
-f:drivers/scsi/ips.c
-f:drivers/scsi/ips.h
-f:drivers/scsi/isci/Makefile
-f:drivers/scsi/isci/host.c
-f:drivers/scsi/isci/host.h
-f:drivers/scsi/isci/init.c
-f:drivers/scsi/isci/isci.h
-f:drivers/scsi/isci/phy.c
-f:drivers/scsi/isci/phy.h
-f:drivers/scsi/isci/port.c
-f:drivers/scsi/isci/port.h
-f:drivers/scsi/isci/port_config.c
-f:drivers/scsi/isci/probe_roms.c
-f:drivers/scsi/isci/probe_roms.h
-f:drivers/scsi/isci/registers.h
-f:drivers/scsi/isci/remote_device.c
-f:drivers/scsi/isci/remote_device.h
-f:drivers/scsi/isci/remote_node_context.c
-f:drivers/scsi/isci/remote_node_context.h
-f:drivers/scsi/isci/remote_node_table.c
-f:drivers/scsi/isci/remote_node_table.h
-f:drivers/scsi/isci/request.c
-f:drivers/scsi/isci/request.h
-f:drivers/scsi/isci/sas.h
-f:drivers/scsi/isci/scu_completion_codes.h
-f:drivers/scsi/isci/scu_event_codes.h
-f:drivers/scsi/isci/scu_remote_node_context.h
-f:drivers/scsi/isci/scu_task_context.h
-f:drivers/scsi/isci/task.c
-f:drivers/scsi/isci/task.h
-f:drivers/scsi/isci/unsolicited_frame_control.c
-f:drivers/scsi/isci/unsolicited_frame_control.h
-f:drivers/scsi/iscsi_boot_sysfs.c
-f:drivers/scsi/iscsi_tcp.c
-f:drivers/scsi/iscsi_tcp.h
-f:drivers/scsi/jazz_esp.c
-f:drivers/scsi/lasi700.c
-f:drivers/scsi/libfc/Makefile
-f:drivers/scsi/libfc/fc_disc.c
-f:drivers/scsi/libfc/fc_elsct.c
-f:drivers/scsi/libfc/fc_encode.h
-f:drivers/scsi/libfc/fc_exch.c
-f:drivers/scsi/libfc/fc_fcp.c
-f:drivers/scsi/libfc/fc_frame.c
-f:drivers/scsi/libfc/fc_libfc.c
-f:drivers/scsi/libfc/fc_libfc.h
-f:drivers/scsi/libfc/fc_lport.c
-f:drivers/scsi/libfc/fc_npiv.c
-f:drivers/scsi/libfc/fc_rport.c
-f:drivers/scsi/libiscsi.c
-f:drivers/scsi/libiscsi_tcp.c
-f:drivers/scsi/libsas/Kconfig
-f:drivers/scsi/libsas/Makefile
-f:drivers/scsi/libsas/sas_ata.c
-f:drivers/scsi/libsas/sas_discover.c
-f:drivers/scsi/libsas/sas_event.c
-f:drivers/scsi/libsas/sas_expander.c
-f:drivers/scsi/libsas/sas_host_smp.c
-f:drivers/scsi/libsas/sas_init.c
-f:drivers/scsi/libsas/sas_internal.h
-f:drivers/scsi/libsas/sas_phy.c
-f:drivers/scsi/libsas/sas_port.c
-f:drivers/scsi/libsas/sas_scsi_host.c
-f:drivers/scsi/libsas/sas_task.c
-f:drivers/scsi/lpfc/Makefile
-f:drivers/scsi/lpfc/lpfc.h
-f:drivers/scsi/lpfc/lpfc_attr.c
-f:drivers/scsi/lpfc/lpfc_attr.h
-f:drivers/scsi/lpfc/lpfc_bsg.c
-f:drivers/scsi/lpfc/lpfc_bsg.h
-f:drivers/scsi/lpfc/lpfc_compat.h
-f:drivers/scsi/lpfc/lpfc_crtn.h
-f:drivers/scsi/lpfc/lpfc_ct.c
-f:drivers/scsi/lpfc/lpfc_debugfs.c
-f:drivers/scsi/lpfc/lpfc_debugfs.h
-f:drivers/scsi/lpfc/lpfc_disc.h
-f:drivers/scsi/lpfc/lpfc_els.c
-f:drivers/scsi/lpfc/lpfc_hbadisc.c
-f:drivers/scsi/lpfc/lpfc_hw.h
-f:drivers/scsi/lpfc/lpfc_hw4.h
-f:drivers/scsi/lpfc/lpfc_ids.h
-f:drivers/scsi/lpfc/lpfc_init.c
-f:drivers/scsi/lpfc/lpfc_logmsg.h
-f:drivers/scsi/lpfc/lpfc_mbox.c
-f:drivers/scsi/lpfc/lpfc_mem.c
-f:drivers/scsi/lpfc/lpfc_nl.h
-f:drivers/scsi/lpfc/lpfc_nportdisc.c
-f:drivers/scsi/lpfc/lpfc_nvme.c
-f:drivers/scsi/lpfc/lpfc_nvme.h
-f:drivers/scsi/lpfc/lpfc_nvmet.c
-f:drivers/scsi/lpfc/lpfc_scsi.c
-f:drivers/scsi/lpfc/lpfc_scsi.h
-f:drivers/scsi/lpfc/lpfc_sli.c
-f:drivers/scsi/lpfc/lpfc_sli.h
-f:drivers/scsi/lpfc/lpfc_sli4.h
-f:drivers/scsi/lpfc/lpfc_version.h
-f:drivers/scsi/lpfc/lpfc_vmid.c
-f:drivers/scsi/lpfc/lpfc_vport.c
-f:drivers/scsi/lpfc/lpfc_vport.h
-f:drivers/scsi/mac53c94.c
-f:drivers/scsi/mac53c94.h
-f:drivers/scsi/mac_esp.c
-f:drivers/scsi/mac_scsi.c
-f:drivers/scsi/megaraid.c
-f:drivers/scsi/megaraid.h
-f:drivers/scsi/megaraid/Kconfig.megaraid
-f:drivers/scsi/megaraid/Makefile
-f:drivers/scsi/megaraid/mbox_defs.h
-f:drivers/scsi/megaraid/mega_common.h
-f:drivers/scsi/megaraid/megaraid_ioctl.h
-f:drivers/scsi/megaraid/megaraid_mbox.c
-f:drivers/scsi/megaraid/megaraid_mbox.h
-f:drivers/scsi/megaraid/megaraid_mm.c
-f:drivers/scsi/megaraid/megaraid_mm.h
-f:drivers/scsi/megaraid/megaraid_sas.h
-f:drivers/scsi/megaraid/megaraid_sas_base.c
-f:drivers/scsi/megaraid/megaraid_sas_debugfs.c
-f:drivers/scsi/megaraid/megaraid_sas_fp.c
-f:drivers/scsi/megaraid/megaraid_sas_fusion.c
-f:drivers/scsi/megaraid/megaraid_sas_fusion.h
-f:drivers/scsi/mesh.c
-f:drivers/scsi/mesh.h
-f:drivers/scsi/mpi3mr/Kconfig
-f:drivers/scsi/mpi3mr/Makefile
-f:drivers/scsi/mpi3mr/mpi/mpi30_cnfg.h
-f:drivers/scsi/mpi3mr/mpi/mpi30_image.h
-f:drivers/scsi/mpi3mr/mpi/mpi30_init.h
-f:drivers/scsi/mpi3mr/mpi/mpi30_ioc.h
-f:drivers/scsi/mpi3mr/mpi/mpi30_pci.h
-f:drivers/scsi/mpi3mr/mpi/mpi30_sas.h
-f:drivers/scsi/mpi3mr/mpi/mpi30_tool.h
-f:drivers/scsi/mpi3mr/mpi/mpi30_transport.h
-f:drivers/scsi/mpi3mr/mpi3mr.h
-f:drivers/scsi/mpi3mr/mpi3mr_app.c
-f:drivers/scsi/mpi3mr/mpi3mr_debug.h
-f:drivers/scsi/mpi3mr/mpi3mr_fw.c
-f:drivers/scsi/mpi3mr/mpi3mr_os.c
-f:drivers/scsi/mpi3mr/mpi3mr_transport.c
-f:drivers/scsi/mpt3sas/Kconfig
-f:drivers/scsi/mpt3sas/Makefile
-f:drivers/scsi/mpt3sas/mpi/mpi2.h
-f:drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h
-f:drivers/scsi/mpt3sas/mpi/mpi2_image.h
-f:drivers/scsi/mpt3sas/mpi/mpi2_init.h
-f:drivers/scsi/mpt3sas/mpi/mpi2_ioc.h
-f:drivers/scsi/mpt3sas/mpi/mpi2_pci.h
-f:drivers/scsi/mpt3sas/mpi/mpi2_raid.h
-f:drivers/scsi/mpt3sas/mpi/mpi2_sas.h
-f:drivers/scsi/mpt3sas/mpi/mpi2_tool.h
-f:drivers/scsi/mpt3sas/mpi/mpi2_type.h
-f:drivers/scsi/mpt3sas/mpt3sas_base.c
-f:drivers/scsi/mpt3sas/mpt3sas_base.h
-f:drivers/scsi/mpt3sas/mpt3sas_config.c
-f:drivers/scsi/mpt3sas/mpt3sas_ctl.c
-f:drivers/scsi/mpt3sas/mpt3sas_ctl.h
-f:drivers/scsi/mpt3sas/mpt3sas_debug.h
-f:drivers/scsi/mpt3sas/mpt3sas_debugfs.c
-f:drivers/scsi/mpt3sas/mpt3sas_scsih.c
-f:drivers/scsi/mpt3sas/mpt3sas_transport.c
-f:drivers/scsi/mpt3sas/mpt3sas_trigger_diag.c
-f:drivers/scsi/mpt3sas/mpt3sas_trigger_diag.h
-f:drivers/scsi/mpt3sas/mpt3sas_trigger_pages.h
-f:drivers/scsi/mpt3sas/mpt3sas_warpdrive.c
-f:drivers/scsi/mvme147.c
-f:drivers/scsi/mvme147.h
-f:drivers/scsi/mvme16x_scsi.c
-f:drivers/scsi/mvsas/Kconfig
-f:drivers/scsi/mvsas/Makefile
-f:drivers/scsi/mvsas/mv_64xx.c
-f:drivers/scsi/mvsas/mv_64xx.h
-f:drivers/scsi/mvsas/mv_94xx.c
-f:drivers/scsi/mvsas/mv_94xx.h
-f:drivers/scsi/mvsas/mv_chips.h
-f:drivers/scsi/mvsas/mv_defs.h
-f:drivers/scsi/mvsas/mv_init.c
-f:drivers/scsi/mvsas/mv_sas.c
-f:drivers/scsi/mvsas/mv_sas.h
-f:drivers/scsi/mvumi.c
-f:drivers/scsi/mvumi.h
-f:drivers/scsi/myrb.c
-f:drivers/scsi/myrb.h
-f:drivers/scsi/myrs.c
-f:drivers/scsi/myrs.h
-f:drivers/scsi/ncr53c8xx.c
-f:drivers/scsi/ncr53c8xx.h
-f:drivers/scsi/nsp32.c
-f:drivers/scsi/nsp32.h
-f:drivers/scsi/nsp32_debug.c
-f:drivers/scsi/nsp32_io.h
-f:drivers/scsi/pcmcia/Kconfig
-f:drivers/scsi/pcmcia/Makefile
-f:drivers/scsi/pcmcia/aha152x_core.c
-f:drivers/scsi/pcmcia/aha152x_stub.c
-f:drivers/scsi/pcmcia/fdomain_cs.c
-f:drivers/scsi/pcmcia/nsp_cs.c
-f:drivers/scsi/pcmcia/nsp_cs.h
-f:drivers/scsi/pcmcia/nsp_debug.c
-f:drivers/scsi/pcmcia/nsp_io.h
-f:drivers/scsi/pcmcia/nsp_message.c
-f:drivers/scsi/pcmcia/qlogic_stub.c
-f:drivers/scsi/pcmcia/sym53c500_cs.c
-f:drivers/scsi/pm8001/Makefile
-f:drivers/scsi/pm8001/pm8001_chips.h
-f:drivers/scsi/pm8001/pm8001_ctl.c
-f:drivers/scsi/pm8001/pm8001_ctl.h
-f:drivers/scsi/pm8001/pm8001_defs.h
-f:drivers/scsi/pm8001/pm8001_hwi.c
-f:drivers/scsi/pm8001/pm8001_hwi.h
-f:drivers/scsi/pm8001/pm8001_init.c
-f:drivers/scsi/pm8001/pm8001_sas.c
-f:drivers/scsi/pm8001/pm8001_sas.h
-f:drivers/scsi/pm8001/pm80xx_hwi.c
-f:drivers/scsi/pm8001/pm80xx_hwi.h
-f:drivers/scsi/pm8001/pm80xx_tracepoints.c
-f:drivers/scsi/pm8001/pm80xx_tracepoints.h
-f:drivers/scsi/pmcraid.c
-f:drivers/scsi/pmcraid.h
-f:drivers/scsi/ppa.c
-f:drivers/scsi/ppa.h
-f:drivers/scsi/ps3rom.c
-f:drivers/scsi/qedf/Kconfig
-f:drivers/scsi/qedf/Makefile
-f:drivers/scsi/qedf/drv_fcoe_fw_funcs.c
-f:drivers/scsi/qedf/drv_fcoe_fw_funcs.h
-f:drivers/scsi/qedf/drv_scsi_fw_funcs.c
-f:drivers/scsi/qedf/drv_scsi_fw_funcs.h
-f:drivers/scsi/qedf/qedf.h
-f:drivers/scsi/qedf/qedf_attr.c
-f:drivers/scsi/qedf/qedf_dbg.c
-f:drivers/scsi/qedf/qedf_dbg.h
-f:drivers/scsi/qedf/qedf_debugfs.c
-f:drivers/scsi/qedf/qedf_els.c
-f:drivers/scsi/qedf/qedf_fip.c
-f:drivers/scsi/qedf/qedf_hsi.h
-f:drivers/scsi/qedf/qedf_io.c
-f:drivers/scsi/qedf/qedf_main.c
-f:drivers/scsi/qedf/qedf_version.h
-f:drivers/scsi/qedi/Kconfig
-f:drivers/scsi/qedi/Makefile
-f:drivers/scsi/qedi/qedi.h
-f:drivers/scsi/qedi/qedi_dbg.c
-f:drivers/scsi/qedi/qedi_dbg.h
-f:drivers/scsi/qedi/qedi_debugfs.c
-f:drivers/scsi/qedi/qedi_fw.c
-f:drivers/scsi/qedi/qedi_fw_api.c
-f:drivers/scsi/qedi/qedi_fw_iscsi.h
-f:drivers/scsi/qedi/qedi_fw_scsi.h
-f:drivers/scsi/qedi/qedi_gbl.h
-f:drivers/scsi/qedi/qedi_hsi.h
-f:drivers/scsi/qedi/qedi_iscsi.c
-f:drivers/scsi/qedi/qedi_iscsi.h
-f:drivers/scsi/qedi/qedi_main.c
-f:drivers/scsi/qedi/qedi_nvm_iscsi_cfg.h
-f:drivers/scsi/qedi/qedi_sysfs.c
-f:drivers/scsi/qedi/qedi_version.h
-f:drivers/scsi/qla1280.c
-f:drivers/scsi/qla1280.h
-f:drivers/scsi/qla2xxx/Kconfig
-f:drivers/scsi/qla2xxx/Makefile
-f:drivers/scsi/qla2xxx/qla_attr.c
-f:drivers/scsi/qla2xxx/qla_bsg.c
-f:drivers/scsi/qla2xxx/qla_bsg.h
-f:drivers/scsi/qla2xxx/qla_dbg.c
-f:drivers/scsi/qla2xxx/qla_dbg.h
-f:drivers/scsi/qla2xxx/qla_def.h
-f:drivers/scsi/qla2xxx/qla_devtbl.h
-f:drivers/scsi/qla2xxx/qla_dfs.c
-f:drivers/scsi/qla2xxx/qla_dsd.h
-f:drivers/scsi/qla2xxx/qla_edif.c
-f:drivers/scsi/qla2xxx/qla_edif.h
-f:drivers/scsi/qla2xxx/qla_edif_bsg.h
-f:drivers/scsi/qla2xxx/qla_fw.h
-f:drivers/scsi/qla2xxx/qla_gbl.h
-f:drivers/scsi/qla2xxx/qla_gs.c
-f:drivers/scsi/qla2xxx/qla_init.c
-f:drivers/scsi/qla2xxx/qla_inline.h
-f:drivers/scsi/qla2xxx/qla_iocb.c
-f:drivers/scsi/qla2xxx/qla_isr.c
-f:drivers/scsi/qla2xxx/qla_mbx.c
-f:drivers/scsi/qla2xxx/qla_mid.c
-f:drivers/scsi/qla2xxx/qla_mr.c
-f:drivers/scsi/qla2xxx/qla_mr.h
-f:drivers/scsi/qla2xxx/qla_nvme.c
-f:drivers/scsi/qla2xxx/qla_nvme.h
-f:drivers/scsi/qla2xxx/qla_nx.c
-f:drivers/scsi/qla2xxx/qla_nx.h
-f:drivers/scsi/qla2xxx/qla_nx2.c
-f:drivers/scsi/qla2xxx/qla_nx2.h
-f:drivers/scsi/qla2xxx/qla_os.c
-f:drivers/scsi/qla2xxx/qla_settings.h
-f:drivers/scsi/qla2xxx/qla_sup.c
-f:drivers/scsi/qla2xxx/qla_target.c
-f:drivers/scsi/qla2xxx/qla_target.h
-f:drivers/scsi/qla2xxx/qla_tmpl.c
-f:drivers/scsi/qla2xxx/qla_tmpl.h
-f:drivers/scsi/qla2xxx/qla_version.h
-f:drivers/scsi/qla2xxx/tcm_qla2xxx.c
-f:drivers/scsi/qla2xxx/tcm_qla2xxx.h
-f:drivers/scsi/qla4xxx/Kconfig
-f:drivers/scsi/qla4xxx/Makefile
-f:drivers/scsi/qla4xxx/ql4_83xx.c
-f:drivers/scsi/qla4xxx/ql4_83xx.h
-f:drivers/scsi/qla4xxx/ql4_attr.c
-f:drivers/scsi/qla4xxx/ql4_bsg.c
-f:drivers/scsi/qla4xxx/ql4_bsg.h
-f:drivers/scsi/qla4xxx/ql4_dbg.c
-f:drivers/scsi/qla4xxx/ql4_dbg.h
-f:drivers/scsi/qla4xxx/ql4_def.h
-f:drivers/scsi/qla4xxx/ql4_fw.h
-f:drivers/scsi/qla4xxx/ql4_glbl.h
-f:drivers/scsi/qla4xxx/ql4_init.c
-f:drivers/scsi/qla4xxx/ql4_inline.h
-f:drivers/scsi/qla4xxx/ql4_iocb.c
-f:drivers/scsi/qla4xxx/ql4_isr.c
-f:drivers/scsi/qla4xxx/ql4_mbx.c
-f:drivers/scsi/qla4xxx/ql4_nvram.c
-f:drivers/scsi/qla4xxx/ql4_nvram.h
-f:drivers/scsi/qla4xxx/ql4_nx.c
-f:drivers/scsi/qla4xxx/ql4_nx.h
-f:drivers/scsi/qla4xxx/ql4_os.c
-f:drivers/scsi/qla4xxx/ql4_version.h
-f:drivers/scsi/qlogicfas.c
-f:drivers/scsi/qlogicfas408.c
-f:drivers/scsi/qlogicfas408.h
-f:drivers/scsi/qlogicpti.c
-f:drivers/scsi/qlogicpti.h
-f:drivers/scsi/raid_class.c
-f:drivers/scsi/script_asm.pl
-f:drivers/scsi/scsi.c
-f:drivers/scsi/scsi_bsg.c
-f:drivers/scsi/scsi_common.c
-f:drivers/scsi/scsi_debug.c
-f:drivers/scsi/scsi_debugfs.c
-f:drivers/scsi/scsi_debugfs.h
-f:drivers/scsi/scsi_devinfo.c
-f:drivers/scsi/scsi_dh.c
-f:drivers/scsi/scsi_error.c
-f:drivers/scsi/scsi_ioctl.c
-f:drivers/scsi/scsi_lib.c
-f:drivers/scsi/scsi_lib_dma.c
-f:drivers/scsi/scsi_lib_test.c
-f:drivers/scsi/scsi_logging.c
-f:drivers/scsi/scsi_logging.h
-f:drivers/scsi/scsi_netlink.c
-f:drivers/scsi/scsi_pm.c
-f:drivers/scsi/scsi_priv.h
-f:drivers/scsi/scsi_proc.c
-f:drivers/scsi/scsi_proto_test.c
-f:drivers/scsi/scsi_sas_internal.h
-f:drivers/scsi/scsi_scan.c
-f:drivers/scsi/scsi_sysctl.c
-f:drivers/scsi/scsi_sysfs.c
-f:drivers/scsi/scsi_trace.c
-f:drivers/scsi/scsi_transport_api.h
-f:drivers/scsi/scsi_transport_fc.c
-f:drivers/scsi/scsi_transport_iscsi.c
-f:drivers/scsi/scsi_transport_sas.c
-f:drivers/scsi/scsi_transport_spi.c
-f:drivers/scsi/scsi_transport_srp.c
-f:drivers/scsi/scsicam.c
-f:drivers/scsi/sd.c
-f:drivers/scsi/sd.h
-f:drivers/scsi/sd_dif.c
-f:drivers/scsi/sd_trace.h
-f:drivers/scsi/sd_zbc.c
-f:drivers/scsi/sense_codes.h
-f:drivers/scsi/ses.c
-f:drivers/scsi/sg.c
-f:drivers/scsi/sgiwd93.c
-f:drivers/scsi/sim710.c
-f:drivers/scsi/smartpqi/Kconfig
-f:drivers/scsi/smartpqi/Makefile
-f:drivers/scsi/smartpqi/smartpqi.h
-f:drivers/scsi/smartpqi/smartpqi_init.c
-f:drivers/scsi/smartpqi/smartpqi_sas_transport.c
-f:drivers/scsi/smartpqi/smartpqi_sis.c
-f:drivers/scsi/smartpqi/smartpqi_sis.h
-f:drivers/scsi/sni_53c710.c
-f:drivers/scsi/snic/Makefile
-f:drivers/scsi/snic/cq_desc.h
-f:drivers/scsi/snic/cq_enet_desc.h
-f:drivers/scsi/snic/snic.h
-f:drivers/scsi/snic/snic_attrs.c
-f:drivers/scsi/snic/snic_ctl.c
-f:drivers/scsi/snic/snic_debugfs.c
-f:drivers/scsi/snic/snic_disc.c
-f:drivers/scsi/snic/snic_disc.h
-f:drivers/scsi/snic/snic_fwint.h
-f:drivers/scsi/snic/snic_io.c
-f:drivers/scsi/snic/snic_io.h
-f:drivers/scsi/snic/snic_isr.c
-f:drivers/scsi/snic/snic_main.c
-f:drivers/scsi/snic/snic_res.c
-f:drivers/scsi/snic/snic_res.h
-f:drivers/scsi/snic/snic_scsi.c
-f:drivers/scsi/snic/snic_stats.h
-f:drivers/scsi/snic/snic_trc.c
-f:drivers/scsi/snic/snic_trc.h
-f:drivers/scsi/snic/vnic_cq.c
-f:drivers/scsi/snic/vnic_cq.h
-f:drivers/scsi/snic/vnic_cq_fw.h
-f:drivers/scsi/snic/vnic_dev.c
-f:drivers/scsi/snic/vnic_dev.h
-f:drivers/scsi/snic/vnic_devcmd.h
-f:drivers/scsi/snic/vnic_intr.c
-f:drivers/scsi/snic/vnic_intr.h
-f:drivers/scsi/snic/vnic_resource.h
-f:drivers/scsi/snic/vnic_snic.h
-f:drivers/scsi/snic/vnic_stats.h
-f:drivers/scsi/snic/vnic_wq.c
-f:drivers/scsi/snic/vnic_wq.h
-f:drivers/scsi/snic/wq_enet_desc.h
-f:drivers/scsi/sr.c
-f:drivers/scsi/sr.h
-f:drivers/scsi/sr_ioctl.c
-f:drivers/scsi/sr_vendor.c
-f:drivers/scsi/st.c
-f:drivers/scsi/st.h
-f:drivers/scsi/st_options.h
-f:drivers/scsi/stex.c
-f:drivers/scsi/storvsc_drv.c
-f:drivers/scsi/sun3_scsi.c
-f:drivers/scsi/sun3_scsi_vme.c
-f:drivers/scsi/sun3x_esp.c
-f:drivers/scsi/sun_esp.c
-f:drivers/scsi/sym53c8xx_2/Makefile
-f:drivers/scsi/sym53c8xx_2/sym53c8xx.h
-f:drivers/scsi/sym53c8xx_2/sym_defs.h
-f:drivers/scsi/sym53c8xx_2/sym_fw.c
-f:drivers/scsi/sym53c8xx_2/sym_fw.h
-f:drivers/scsi/sym53c8xx_2/sym_fw1.h
-f:drivers/scsi/sym53c8xx_2/sym_fw2.h
-f:drivers/scsi/sym53c8xx_2/sym_glue.c
-f:drivers/scsi/sym53c8xx_2/sym_glue.h
-f:drivers/scsi/sym53c8xx_2/sym_hipd.c
-f:drivers/scsi/sym53c8xx_2/sym_hipd.h
-f:drivers/scsi/sym53c8xx_2/sym_malloc.c
-f:drivers/scsi/sym53c8xx_2/sym_misc.h
-f:drivers/scsi/sym53c8xx_2/sym_nvram.c
-f:drivers/scsi/sym53c8xx_2/sym_nvram.h
-f:drivers/scsi/virtio_scsi.c
-f:drivers/scsi/vmw_pvscsi.c
-f:drivers/scsi/vmw_pvscsi.h
-f:drivers/scsi/wd33c93.c
-f:drivers/scsi/wd33c93.h
-f:drivers/scsi/wd719x.c
-f:drivers/scsi/wd719x.h
-f:drivers/scsi/xen-scsifront.c
-f:drivers/scsi/zalon.c
-f:drivers/scsi/zorro7xx.c
-f:drivers/scsi/zorro_esp.c
-f:drivers/sh/Kconfig
-f:drivers/sh/Makefile
-f:drivers/sh/clk/Makefile
-f:drivers/sh/clk/core.c
-f:drivers/sh/clk/cpg.c
-f:drivers/sh/intc/Kconfig
-f:drivers/sh/intc/Makefile
-f:drivers/sh/intc/access.c
-f:drivers/sh/intc/balancing.c
-f:drivers/sh/intc/chip.c
-f:drivers/sh/intc/core.c
-f:drivers/sh/intc/handle.c
-f:drivers/sh/intc/internals.h
-f:drivers/sh/intc/irqdomain.c
-f:drivers/sh/intc/userimask.c
-f:drivers/sh/intc/virq-debugfs.c
-f:drivers/sh/intc/virq.c
-f:drivers/sh/maple/Makefile
-f:drivers/sh/maple/maple.c
-f:drivers/sh/pm_runtime.c
-f:drivers/siox/Kconfig
-f:drivers/siox/Makefile
-f:drivers/siox/siox-bus-gpio.c
-f:drivers/siox/siox-core.c
-f:drivers/siox/siox.h
-f:drivers/slimbus/Kconfig
-f:drivers/slimbus/Makefile
-f:drivers/slimbus/core.c
-f:drivers/slimbus/messaging.c
-f:drivers/slimbus/qcom-ctrl.c
-f:drivers/slimbus/qcom-ngd-ctrl.c
-f:drivers/slimbus/sched.c
-f:drivers/slimbus/slimbus.h
-f:drivers/slimbus/stream.c
-f:drivers/soc/Kconfig
-f:drivers/soc/Makefile
-f:drivers/soc/amlogic/Kconfig
-f:drivers/soc/amlogic/Makefile
-f:drivers/soc/amlogic/meson-canvas.c
-f:drivers/soc/amlogic/meson-clk-measure.c
-f:drivers/soc/amlogic/meson-gx-socinfo.c
-f:drivers/soc/amlogic/meson-mx-socinfo.c
-f:drivers/soc/apple/Kconfig
-f:drivers/soc/apple/Makefile
-f:drivers/soc/apple/mailbox.c
-f:drivers/soc/apple/mailbox.h
-f:drivers/soc/apple/rtkit-crashlog.c
-f:drivers/soc/apple/rtkit-internal.h
-f:drivers/soc/apple/rtkit.c
-f:drivers/soc/apple/sart.c
-f:drivers/soc/aspeed/Kconfig
-f:drivers/soc/aspeed/Makefile
-f:drivers/soc/aspeed/aspeed-lpc-ctrl.c
-f:drivers/soc/aspeed/aspeed-lpc-snoop.c
-f:drivers/soc/aspeed/aspeed-p2a-ctrl.c
-f:drivers/soc/aspeed/aspeed-socinfo.c
-f:drivers/soc/aspeed/aspeed-uart-routing.c
-f:drivers/soc/atmel/Kconfig
-f:drivers/soc/atmel/Makefile
-f:drivers/soc/atmel/sfr.c
-f:drivers/soc/atmel/soc.c
-f:drivers/soc/atmel/soc.h
-f:drivers/soc/bcm/Kconfig
-f:drivers/soc/bcm/Makefile
-f:drivers/soc/bcm/brcmstb/Kconfig
-f:drivers/soc/bcm/brcmstb/Makefile
-f:drivers/soc/bcm/brcmstb/biuctrl.c
-f:drivers/soc/bcm/brcmstb/common.c
-f:drivers/soc/bcm/brcmstb/pm/Makefile
-f:drivers/soc/bcm/brcmstb/pm/pm-mips.c
-f:drivers/soc/bcm/brcmstb/pm/pm.h
-f:drivers/soc/bcm/brcmstb/pm/s2-mips.S
-f:drivers/soc/bcm/brcmstb/pm/s3-mips.S
-f:drivers/soc/canaan/Kconfig
-f:drivers/soc/canaan/Makefile
-f:drivers/soc/canaan/k210-sysctl.c
-f:drivers/soc/cirrus/Kconfig
-f:drivers/soc/cirrus/Makefile
-f:drivers/soc/cirrus/soc-ep93xx.c
-f:drivers/soc/dove/Makefile
-f:drivers/soc/dove/pmu.c
-f:drivers/soc/fsl/Kconfig
-f:drivers/soc/fsl/Makefile
-f:drivers/soc/fsl/dpaa2-console.c
-f:drivers/soc/fsl/dpio/Makefile
-f:drivers/soc/fsl/dpio/dpio-cmd.h
-f:drivers/soc/fsl/dpio/dpio-driver.c
-f:drivers/soc/fsl/dpio/dpio-service.c
-f:drivers/soc/fsl/dpio/dpio.c
-f:drivers/soc/fsl/dpio/dpio.h
-f:drivers/soc/fsl/dpio/qbman-portal.c
-f:drivers/soc/fsl/dpio/qbman-portal.h
-f:drivers/soc/fsl/guts.c
-f:drivers/soc/fsl/qbman/Kconfig
-f:drivers/soc/fsl/qbman/Makefile
-f:drivers/soc/fsl/qbman/bman.c
-f:drivers/soc/fsl/qbman/bman_ccsr.c
-f:drivers/soc/fsl/qbman/bman_portal.c
-f:drivers/soc/fsl/qbman/bman_priv.h
-f:drivers/soc/fsl/qbman/bman_test.c
-f:drivers/soc/fsl/qbman/bman_test.h
-f:drivers/soc/fsl/qbman/bman_test_api.c
-f:drivers/soc/fsl/qbman/dpaa_sys.c
-f:drivers/soc/fsl/qbman/dpaa_sys.h
-f:drivers/soc/fsl/qbman/qman.c
-f:drivers/soc/fsl/qbman/qman_ccsr.c
-f:drivers/soc/fsl/qbman/qman_portal.c
-f:drivers/soc/fsl/qbman/qman_priv.h
-f:drivers/soc/fsl/qbman/qman_test.c
-f:drivers/soc/fsl/qbman/qman_test.h
-f:drivers/soc/fsl/qbman/qman_test_api.c
-f:drivers/soc/fsl/qbman/qman_test_stash.c
-f:drivers/soc/fsl/qe/Kconfig
-f:drivers/soc/fsl/qe/Makefile
-f:drivers/soc/fsl/qe/gpio.c
-f:drivers/soc/fsl/qe/qe.c
-f:drivers/soc/fsl/qe/qe_common.c
-f:drivers/soc/fsl/qe/qe_ic.c
-f:drivers/soc/fsl/qe/qe_io.c
-f:drivers/soc/fsl/qe/qe_tdm.c
-f:drivers/soc/fsl/qe/qmc.c
-f:drivers/soc/fsl/qe/tsa.c
-f:drivers/soc/fsl/qe/tsa.h
-f:drivers/soc/fsl/qe/ucc.c
-f:drivers/soc/fsl/qe/ucc_fast.c
-f:drivers/soc/fsl/qe/ucc_slow.c
-f:drivers/soc/fsl/qe/usb.c
-f:drivers/soc/fsl/rcpm.c
-f:drivers/soc/fujitsu/Kconfig
-f:drivers/soc/fujitsu/Makefile
-f:drivers/soc/fujitsu/a64fx-diag.c
-f:drivers/soc/gemini/Makefile
-f:drivers/soc/gemini/soc-gemini.c
-f:drivers/soc/hisilicon/Kconfig
-f:drivers/soc/hisilicon/Makefile
-f:drivers/soc/hisilicon/kunpeng_hccs.c
-f:drivers/soc/hisilicon/kunpeng_hccs.h
-f:drivers/soc/imx/Kconfig
-f:drivers/soc/imx/Makefile
-f:drivers/soc/imx/imx93-src.c
-f:drivers/soc/imx/soc-imx.c
-f:drivers/soc/imx/soc-imx8m.c
-f:drivers/soc/imx/soc-imx9.c
-f:drivers/soc/ixp4xx/Kconfig
-f:drivers/soc/ixp4xx/Makefile
-f:drivers/soc/ixp4xx/ixp4xx-npe.c
-f:drivers/soc/ixp4xx/ixp4xx-qmgr.c
-f:drivers/soc/lantiq/Makefile
-f:drivers/soc/lantiq/fpi-bus.c
-f:drivers/soc/litex/Kconfig
-f:drivers/soc/litex/Makefile
-f:drivers/soc/litex/litex_soc_ctrl.c
-f:drivers/soc/loongson/Kconfig
-f:drivers/soc/loongson/Makefile
-f:drivers/soc/loongson/loongson2_guts.c
-f:drivers/soc/loongson/loongson2_pm.c
-f:drivers/soc/mediatek/Kconfig
-f:drivers/soc/mediatek/Makefile
-f:drivers/soc/mediatek/mt8167-mmsys.h
-f:drivers/soc/mediatek/mt8173-mmsys.h
-f:drivers/soc/mediatek/mt8183-mmsys.h
-f:drivers/soc/mediatek/mt8186-mmsys.h
-f:drivers/soc/mediatek/mt8188-mmsys.h
-f:drivers/soc/mediatek/mt8192-mmsys.h
-f:drivers/soc/mediatek/mt8195-mmsys.h
-f:drivers/soc/mediatek/mt8365-mmsys.h
-f:drivers/soc/mediatek/mtk-cmdq-helper.c
-f:drivers/soc/mediatek/mtk-devapc.c
-f:drivers/soc/mediatek/mtk-dvfsrc.c
-f:drivers/soc/mediatek/mtk-infracfg.c
-f:drivers/soc/mediatek/mtk-mmsys.c
-f:drivers/soc/mediatek/mtk-mmsys.h
-f:drivers/soc/mediatek/mtk-mutex.c
-f:drivers/soc/mediatek/mtk-pmic-wrap.c
-f:drivers/soc/mediatek/mtk-regulator-coupler.c
-f:drivers/soc/mediatek/mtk-socinfo.c
-f:drivers/soc/mediatek/mtk-svs.c
-f:drivers/soc/microchip/Kconfig
-f:drivers/soc/microchip/Makefile
-f:drivers/soc/microchip/mpfs-sys-controller.c
-f:drivers/soc/nuvoton/Kconfig
-f:drivers/soc/nuvoton/Makefile
-f:drivers/soc/nuvoton/wpcm450-soc.c
-f:drivers/soc/pxa/Kconfig
-f:drivers/soc/pxa/Makefile
-f:drivers/soc/pxa/mfp.c
-f:drivers/soc/pxa/ssp.c
-f:drivers/soc/qcom/Kconfig
-f:drivers/soc/qcom/Makefile
-f:drivers/soc/qcom/apr.c
-f:drivers/soc/qcom/cmd-db.c
-f:drivers/soc/qcom/icc-bwmon.c
-f:drivers/soc/qcom/ice.c
-f:drivers/soc/qcom/kryo-l2-accessors.c
-f:drivers/soc/qcom/llcc-qcom.c
-f:drivers/soc/qcom/mdt_loader.c
-f:drivers/soc/qcom/ocmem.c
-f:drivers/soc/qcom/pdr_interface.c
-f:drivers/soc/qcom/pdr_internal.h
-f:drivers/soc/qcom/pmic_glink.c
-f:drivers/soc/qcom/pmic_glink_altmode.c
-f:drivers/soc/qcom/pmic_pdcharger_ulog.c
-f:drivers/soc/qcom/pmic_pdcharger_ulog.h
-f:drivers/soc/qcom/qcom-geni-se.c
-f:drivers/soc/qcom/qcom-pbs.c
-f:drivers/soc/qcom/qcom_aoss.c
-f:drivers/soc/qcom/qcom_gsbi.c
-f:drivers/soc/qcom/qcom_pd_mapper.c
-f:drivers/soc/qcom/qcom_pdr_msg.c
-f:drivers/soc/qcom/qcom_stats.c
-f:drivers/soc/qcom/qmi_encdec.c
-f:drivers/soc/qcom/qmi_interface.c
-f:drivers/soc/qcom/ramp_controller.c
-f:drivers/soc/qcom/rmtfs_mem.c
-f:drivers/soc/qcom/rpm-proc.c
-f:drivers/soc/qcom/rpm_master_stats.c
-f:drivers/soc/qcom/rpmh-internal.h
-f:drivers/soc/qcom/rpmh-rsc.c
-f:drivers/soc/qcom/rpmh.c
-f:drivers/soc/qcom/smd-rpm.c
-f:drivers/soc/qcom/smem.c
-f:drivers/soc/qcom/smem_state.c
-f:drivers/soc/qcom/smp2p.c
-f:drivers/soc/qcom/smsm.c
-f:drivers/soc/qcom/socinfo.c
-f:drivers/soc/qcom/spm.c
-f:drivers/soc/qcom/trace-aoss.h
-f:drivers/soc/qcom/trace-rpmh.h
-f:drivers/soc/qcom/trace-smp2p.h
-f:drivers/soc/qcom/trace_icc-bwmon.h
-f:drivers/soc/qcom/ubwc_config.c
-f:drivers/soc/qcom/wcnss_ctrl.c
-f:drivers/soc/renesas/Kconfig
-f:drivers/soc/renesas/Makefile
-f:drivers/soc/renesas/pwc-rzv2m.c
-f:drivers/soc/renesas/r9a06g032-smp.c
-f:drivers/soc/renesas/r9a08g045-sysc.c
-f:drivers/soc/renesas/r9a09g047-sys.c
-f:drivers/soc/renesas/r9a09g056-sys.c
-f:drivers/soc/renesas/r9a09g057-sys.c
-f:drivers/soc/renesas/rcar-rst.c
-f:drivers/soc/renesas/renesas-soc.c
-f:drivers/soc/renesas/rz-sysc.c
-f:drivers/soc/renesas/rz-sysc.h
-f:drivers/soc/rockchip/Kconfig
-f:drivers/soc/rockchip/Makefile
-f:drivers/soc/rockchip/dtpm.c
-f:drivers/soc/rockchip/grf.c
-f:drivers/soc/rockchip/io-domain.c
-f:drivers/soc/samsung/Kconfig
-f:drivers/soc/samsung/Makefile
-f:drivers/soc/samsung/exynos-asv.c
-f:drivers/soc/samsung/exynos-asv.h
-f:drivers/soc/samsung/exynos-chipid.c
-f:drivers/soc/samsung/exynos-pmu.c
-f:drivers/soc/samsung/exynos-pmu.h
-f:drivers/soc/samsung/exynos-regulator-coupler.c
-f:drivers/soc/samsung/exynos-usi.c
-f:drivers/soc/samsung/exynos3250-pmu.c
-f:drivers/soc/samsung/exynos4-pmu.c
-f:drivers/soc/samsung/exynos5250-pmu.c
-f:drivers/soc/samsung/exynos5420-pmu.c
-f:drivers/soc/samsung/exynos5422-asv.c
-f:drivers/soc/samsung/exynos5422-asv.h
-f:drivers/soc/samsung/s3c-pm-check.c
-f:drivers/soc/sophgo/Kconfig
-f:drivers/soc/sophgo/Makefile
-f:drivers/soc/sophgo/cv1800-rtcsys.c
-f:drivers/soc/sophgo/sg2044-topsys.c
-f:drivers/soc/sunxi/Kconfig
-f:drivers/soc/sunxi/Makefile
-f:drivers/soc/sunxi/sunxi_mbus.c
-f:drivers/soc/sunxi/sunxi_sram.c
-f:drivers/soc/tegra/Kconfig
-f:drivers/soc/tegra/Makefile
-f:drivers/soc/tegra/ari-tegra186.c
-f:drivers/soc/tegra/cbb/Makefile
-f:drivers/soc/tegra/cbb/tegra-cbb.c
-f:drivers/soc/tegra/cbb/tegra194-cbb.c
-f:drivers/soc/tegra/cbb/tegra234-cbb.c
-f:drivers/soc/tegra/common.c
-f:drivers/soc/tegra/flowctrl.c
-f:drivers/soc/tegra/fuse/Makefile
-f:drivers/soc/tegra/fuse/fuse-tegra.c
-f:drivers/soc/tegra/fuse/fuse-tegra20.c
-f:drivers/soc/tegra/fuse/fuse-tegra30.c
-f:drivers/soc/tegra/fuse/fuse.h
-f:drivers/soc/tegra/fuse/speedo-tegra114.c
-f:drivers/soc/tegra/fuse/speedo-tegra124.c
-f:drivers/soc/tegra/fuse/speedo-tegra20.c
-f:drivers/soc/tegra/fuse/speedo-tegra210.c
-f:drivers/soc/tegra/fuse/speedo-tegra30.c
-f:drivers/soc/tegra/fuse/tegra-apbmisc.c
-f:drivers/soc/tegra/pmc.c
-f:drivers/soc/tegra/regulators-tegra20.c
-f:drivers/soc/tegra/regulators-tegra30.c
-f:drivers/soc/ti/Kconfig
-f:drivers/soc/ti/Makefile
-f:drivers/soc/ti/k3-ringacc.c
-f:drivers/soc/ti/k3-socinfo.c
-f:drivers/soc/ti/knav_dma.c
-f:drivers/soc/ti/knav_qmss.h
-f:drivers/soc/ti/knav_qmss_acc.c
-f:drivers/soc/ti/knav_qmss_queue.c
-f:drivers/soc/ti/pm33xx.c
-f:drivers/soc/ti/pruss.c
-f:drivers/soc/ti/pruss.h
-f:drivers/soc/ti/smartreflex.c
-f:drivers/soc/ti/ti_sci_inta_msi.c
-f:drivers/soc/ti/wkup_m3_ipc.c
-f:drivers/soc/ux500/Kconfig
-f:drivers/soc/ux500/Makefile
-f:drivers/soc/ux500/ux500-soc-id.c
-f:drivers/soc/versatile/Kconfig
-f:drivers/soc/versatile/Makefile
-f:drivers/soc/versatile/soc-integrator.c
-f:drivers/soc/versatile/soc-realview.c
-f:drivers/soc/vt8500/Kconfig
-f:drivers/soc/vt8500/Makefile
-f:drivers/soc/vt8500/wmt-socinfo.c
-f:drivers/soc/xilinx/Kconfig
-f:drivers/soc/xilinx/Makefile
-f:drivers/soc/xilinx/xlnx_event_manager.c
-f:drivers/soc/xilinx/zynqmp_power.c
-f:drivers/soundwire/Kconfig
-f:drivers/soundwire/Makefile
-f:drivers/soundwire/amd_init.c
-f:drivers/soundwire/amd_init.h
-f:drivers/soundwire/amd_manager.c
-f:drivers/soundwire/amd_manager.h
-f:drivers/soundwire/bus.c
-f:drivers/soundwire/bus.h
-f:drivers/soundwire/bus_type.c
-f:drivers/soundwire/cadence_master.c
-f:drivers/soundwire/cadence_master.h
-f:drivers/soundwire/debugfs.c
-f:drivers/soundwire/dmi-quirks.c
-f:drivers/soundwire/generic_bandwidth_allocation.c
-f:drivers/soundwire/intel.c
-f:drivers/soundwire/intel.h
-f:drivers/soundwire/intel_ace2x.c
-f:drivers/soundwire/intel_ace2x_debugfs.c
-f:drivers/soundwire/intel_auxdevice.c
-f:drivers/soundwire/intel_auxdevice.h
-f:drivers/soundwire/intel_bus_common.c
-f:drivers/soundwire/intel_init.c
-f:drivers/soundwire/irq.c
-f:drivers/soundwire/irq.h
-f:drivers/soundwire/master.c
-f:drivers/soundwire/mipi_disco.c
-f:drivers/soundwire/qcom.c
-f:drivers/soundwire/slave.c
-f:drivers/soundwire/stream.c
-f:drivers/soundwire/sysfs_local.h
-f:drivers/soundwire/sysfs_slave.c
-f:drivers/soundwire/sysfs_slave_dpn.c
-f:drivers/spi/Kconfig
-f:drivers/spi/Makefile
-f:drivers/spi/atmel-quadspi.c
-f:drivers/spi/internals.h
-f:drivers/spi/spi-airoha-snfi.c
-f:drivers/spi/spi-altera-core.c
-f:drivers/spi/spi-altera-dfl.c
-f:drivers/spi/spi-altera-platform.c
-f:drivers/spi/spi-amd-pci.c
-f:drivers/spi/spi-amd.c
-f:drivers/spi/spi-amd.h
-f:drivers/spi/spi-amlogic-spifc-a1.c
-f:drivers/spi/spi-amlogic-spisg.c
-f:drivers/spi/spi-apple.c
-f:drivers/spi/spi-ar934x.c
-f:drivers/spi/spi-armada-3700.c
-f:drivers/spi/spi-aspeed-smc.c
-f:drivers/spi/spi-at91-usart.c
-f:drivers/spi/spi-ath79.c
-f:drivers/spi/spi-atmel.c
-f:drivers/spi/spi-au1550.c
-f:drivers/spi/spi-axi-spi-engine.c
-f:drivers/spi/spi-bcm-qspi.c
-f:drivers/spi/spi-bcm-qspi.h
-f:drivers/spi/spi-bcm2835.c
-f:drivers/spi/spi-bcm2835aux.c
-f:drivers/spi/spi-bcm63xx-hsspi.c
-f:drivers/spi/spi-bcm63xx.c
-f:drivers/spi/spi-bcmbca-hsspi.c
-f:drivers/spi/spi-bitbang-txrx.h
-f:drivers/spi/spi-bitbang.c
-f:drivers/spi/spi-brcmstb-qspi.c
-f:drivers/spi/spi-butterfly.c
-f:drivers/spi/spi-cadence-quadspi.c
-f:drivers/spi/spi-cadence-xspi.c
-f:drivers/spi/spi-cadence.c
-f:drivers/spi/spi-cavium-octeon.c
-f:drivers/spi/spi-cavium-thunderx.c
-f:drivers/spi/spi-cavium.c
-f:drivers/spi/spi-cavium.h
-f:drivers/spi/spi-ch341.c
-f:drivers/spi/spi-clps711x.c
-f:drivers/spi/spi-coldfire-qspi.c
-f:drivers/spi/spi-cs42l43.c
-f:drivers/spi/spi-davinci.c
-f:drivers/spi/spi-dln2.c
-f:drivers/spi/spi-dw-bt1.c
-f:drivers/spi/spi-dw-core.c
-f:drivers/spi/spi-dw-dma.c
-f:drivers/spi/spi-dw-mmio.c
-f:drivers/spi/spi-dw-pci.c
-f:drivers/spi/spi-dw.h
-f:drivers/spi/spi-ep93xx.c
-f:drivers/spi/spi-falcon.c
-f:drivers/spi/spi-fsi.c
-f:drivers/spi/spi-fsl-cpm.c
-f:drivers/spi/spi-fsl-cpm.h
-f:drivers/spi/spi-fsl-dspi.c
-f:drivers/spi/spi-fsl-espi.c
-f:drivers/spi/spi-fsl-lib.c
-f:drivers/spi/spi-fsl-lib.h
-f:drivers/spi/spi-fsl-lpspi.c
-f:drivers/spi/spi-fsl-qspi.c
-f:drivers/spi/spi-fsl-spi.c
-f:drivers/spi/spi-fsl-spi.h
-f:drivers/spi/spi-geni-qcom.c
-f:drivers/spi/spi-gpio.c
-f:drivers/spi/spi-gxp.c
-f:drivers/spi/spi-hisi-kunpeng.c
-f:drivers/spi/spi-hisi-sfc-v3xx.c
-f:drivers/spi/spi-img-spfi.c
-f:drivers/spi/spi-imx.c
-f:drivers/spi/spi-ingenic.c
-f:drivers/spi/spi-intel-pci.c
-f:drivers/spi/spi-intel-platform.c
-f:drivers/spi/spi-intel.c
-f:drivers/spi/spi-intel.h
-f:drivers/spi/spi-iproc-qspi.c
-f:drivers/spi/spi-jcore.c
-f:drivers/spi/spi-kspi2.c
-f:drivers/spi/spi-lantiq-ssc.c
-f:drivers/spi/spi-ljca.c
-f:drivers/spi/spi-lm70llp.c
-f:drivers/spi/spi-loongson-core.c
-f:drivers/spi/spi-loongson-pci.c
-f:drivers/spi/spi-loongson-plat.c
-f:drivers/spi/spi-loongson.h
-f:drivers/spi/spi-loopback-test.c
-f:drivers/spi/spi-lp8841-rtc.c
-f:drivers/spi/spi-mem.c
-f:drivers/spi/spi-meson-spicc.c
-f:drivers/spi/spi-meson-spifc.c
-f:drivers/spi/spi-microchip-core-qspi.c
-f:drivers/spi/spi-microchip-core.c
-f:drivers/spi/spi-mpc512x-psc.c
-f:drivers/spi/spi-mpc52xx-psc.c
-f:drivers/spi/spi-mpc52xx.c
-f:drivers/spi/spi-mt65xx.c
-f:drivers/spi/spi-mt7621.c
-f:drivers/spi/spi-mtk-nor.c
-f:drivers/spi/spi-mtk-snfi.c
-f:drivers/spi/spi-mux.c
-f:drivers/spi/spi-mxic.c
-f:drivers/spi/spi-mxs.c
-f:drivers/spi/spi-npcm-fiu.c
-f:drivers/spi/spi-npcm-pspi.c
-f:drivers/spi/spi-nxp-fspi.c
-f:drivers/spi/spi-oc-tiny.c
-f:drivers/spi/spi-offload-trigger-adi-util-sigma-delta.c
-f:drivers/spi/spi-offload-trigger-pwm.c
-f:drivers/spi/spi-offload.c
-f:drivers/spi/spi-omap-uwire.c
-f:drivers/spi/spi-omap2-mcspi.c
-f:drivers/spi/spi-orion.c
-f:drivers/spi/spi-pci1xxxx.c
-f:drivers/spi/spi-pic32-sqi.c
-f:drivers/spi/spi-pic32.c
-f:drivers/spi/spi-pl022.c
-f:drivers/spi/spi-ppc4xx.c
-f:drivers/spi/spi-pxa2xx-dma.c
-f:drivers/spi/spi-pxa2xx-pci.c
-f:drivers/spi/spi-pxa2xx-platform.c
-f:drivers/spi/spi-pxa2xx.c
-f:drivers/spi/spi-pxa2xx.h
-f:drivers/spi/spi-qcom-qspi.c
-f:drivers/spi/spi-qpic-snand.c
-f:drivers/spi/spi-qup.c
-f:drivers/spi/spi-rb4xx.c
-f:drivers/spi/spi-realtek-rtl-snand.c
-f:drivers/spi/spi-realtek-rtl.c
-f:drivers/spi/spi-rockchip-sfc.c
-f:drivers/spi/spi-rockchip.c
-f:drivers/spi/spi-rpc-if.c
-f:drivers/spi/spi-rspi.c
-f:drivers/spi/spi-rzv2h-rspi.c
-f:drivers/spi/spi-rzv2m-csi.c
-f:drivers/spi/spi-s3c64xx.c
-f:drivers/spi/spi-sc18is602.c
-f:drivers/spi/spi-sg2044-nor.c
-f:drivers/spi/spi-sh-hspi.c
-f:drivers/spi/spi-sh-msiof.c
-f:drivers/spi/spi-sh-sci.c
-f:drivers/spi/spi-sh.c
-f:drivers/spi/spi-sifive.c
-f:drivers/spi/spi-slave-mt27xx.c
-f:drivers/spi/spi-slave-system-control.c
-f:drivers/spi/spi-slave-time.c
-f:drivers/spi/spi-sn-f-ospi.c
-f:drivers/spi/spi-sprd-adi.c
-f:drivers/spi/spi-sprd.c
-f:drivers/spi/spi-st-ssc4.c
-f:drivers/spi/spi-stm32-ospi.c
-f:drivers/spi/spi-stm32-qspi.c
-f:drivers/spi/spi-stm32.c
-f:drivers/spi/spi-sun4i.c
-f:drivers/spi/spi-sun6i.c
-f:drivers/spi/spi-sunplus-sp7021.c
-f:drivers/spi/spi-synquacer.c
-f:drivers/spi/spi-tegra114.c
-f:drivers/spi/spi-tegra20-sflash.c
-f:drivers/spi/spi-tegra20-slink.c
-f:drivers/spi/spi-tegra210-quad.c
-f:drivers/spi/spi-test.h
-f:drivers/spi/spi-ti-qspi.c
-f:drivers/spi/spi-tle62x0.c
-f:drivers/spi/spi-topcliff-pch.c
-f:drivers/spi/spi-uniphier.c
-f:drivers/spi/spi-wpcm-fiu.c
-f:drivers/spi/spi-xcomm.c
-f:drivers/spi/spi-xilinx.c
-f:drivers/spi/spi-xlp.c
-f:drivers/spi/spi-xtensa-xtfpga.c
-f:drivers/spi/spi-zynq-qspi.c
-f:drivers/spi/spi-zynqmp-gqspi.c
-f:drivers/spi/spi.c
-f:drivers/spi/spidev.c
-f:drivers/spmi/Kconfig
-f:drivers/spmi/Makefile
-f:drivers/spmi/hisi-spmi-controller.c
-f:drivers/spmi/spmi-apple-controller.c
-f:drivers/spmi/spmi-devres.c
-f:drivers/spmi/spmi-mtk-pmif.c
-f:drivers/spmi/spmi-pmic-arb.c
-f:drivers/spmi/spmi.c
-f:drivers/ssb/Kconfig
-f:drivers/ssb/Makefile
-f:drivers/ssb/b43_pci_bridge.c
-f:drivers/ssb/bridge_pcmcia_80211.c
-f:drivers/ssb/driver_chipcommon.c
-f:drivers/ssb/driver_chipcommon_pmu.c
-f:drivers/ssb/driver_chipcommon_sflash.c
-f:drivers/ssb/driver_extif.c
-f:drivers/ssb/driver_gige.c
-f:drivers/ssb/driver_gpio.c
-f:drivers/ssb/driver_mipscore.c
-f:drivers/ssb/driver_pcicore.c
-f:drivers/ssb/embedded.c
-f:drivers/ssb/host_soc.c
-f:drivers/ssb/main.c
-f:drivers/ssb/pci.c
-f:drivers/ssb/pcihost_wrapper.c
-f:drivers/ssb/pcmcia.c
-f:drivers/ssb/scan.c
-f:drivers/ssb/sdio.c
-f:drivers/ssb/sprom.c
-f:drivers/ssb/ssb_private.h
-f:drivers/staging/Kconfig
-f:drivers/staging/Makefile
-f:drivers/staging/axis-fifo/Kconfig
-f:drivers/staging/axis-fifo/Makefile
-f:drivers/staging/axis-fifo/README
-f:drivers/staging/axis-fifo/axis-fifo.c
-f:drivers/staging/axis-fifo/axis-fifo.txt
-f:drivers/staging/fbtft/Kconfig
-f:drivers/staging/fbtft/Makefile
-f:drivers/staging/fbtft/README
-f:drivers/staging/fbtft/TODO
-f:drivers/staging/fbtft/fb_agm1264k-fl.c
-f:drivers/staging/fbtft/fb_bd663474.c
-f:drivers/staging/fbtft/fb_hx8340bn.c
-f:drivers/staging/fbtft/fb_hx8347d.c
-f:drivers/staging/fbtft/fb_hx8353d.c
-f:drivers/staging/fbtft/fb_hx8357d.c
-f:drivers/staging/fbtft/fb_hx8357d.h
-f:drivers/staging/fbtft/fb_ili9163.c
-f:drivers/staging/fbtft/fb_ili9320.c
-f:drivers/staging/fbtft/fb_ili9325.c
-f:drivers/staging/fbtft/fb_ili9340.c
-f:drivers/staging/fbtft/fb_ili9341.c
-f:drivers/staging/fbtft/fb_ili9481.c
-f:drivers/staging/fbtft/fb_ili9486.c
-f:drivers/staging/fbtft/fb_pcd8544.c
-f:drivers/staging/fbtft/fb_ra8875.c
-f:drivers/staging/fbtft/fb_s6d02a1.c
-f:drivers/staging/fbtft/fb_s6d1121.c
-f:drivers/staging/fbtft/fb_seps525.c
-f:drivers/staging/fbtft/fb_sh1106.c
-f:drivers/staging/fbtft/fb_ssd1289.c
-f:drivers/staging/fbtft/fb_ssd1305.c
-f:drivers/staging/fbtft/fb_ssd1306.c
-f:drivers/staging/fbtft/fb_ssd1325.c
-f:drivers/staging/fbtft/fb_ssd1331.c
-f:drivers/staging/fbtft/fb_ssd1351.c
-f:drivers/staging/fbtft/fb_st7735r.c
-f:drivers/staging/fbtft/fb_st7789v.c
-f:drivers/staging/fbtft/fb_tinylcd.c
-f:drivers/staging/fbtft/fb_tls8204.c
-f:drivers/staging/fbtft/fb_uc1611.c
-f:drivers/staging/fbtft/fb_uc1701.c
-f:drivers/staging/fbtft/fb_upd161704.c
-f:drivers/staging/fbtft/fbtft-bus.c
-f:drivers/staging/fbtft/fbtft-core.c
-f:drivers/staging/fbtft/fbtft-io.c
-f:drivers/staging/fbtft/fbtft-sysfs.c
-f:drivers/staging/fbtft/fbtft.h
-f:drivers/staging/fbtft/internal.h
-f:drivers/staging/gpib/Kconfig
-f:drivers/staging/gpib/Makefile
-f:drivers/staging/gpib/TODO
-f:drivers/staging/gpib/agilent_82350b/Makefile
-f:drivers/staging/gpib/agilent_82350b/agilent_82350b.c
-f:drivers/staging/gpib/agilent_82350b/agilent_82350b.h
-f:drivers/staging/gpib/agilent_82357a/Makefile
-f:drivers/staging/gpib/agilent_82357a/agilent_82357a.c
-f:drivers/staging/gpib/agilent_82357a/agilent_82357a.h
-f:drivers/staging/gpib/cb7210/Makefile
-f:drivers/staging/gpib/cb7210/cb7210.c
-f:drivers/staging/gpib/cb7210/cb7210.h
-f:drivers/staging/gpib/cec/Makefile
-f:drivers/staging/gpib/cec/cec.h
-f:drivers/staging/gpib/cec/cec_gpib.c
-f:drivers/staging/gpib/common/Makefile
-f:drivers/staging/gpib/common/gpib_os.c
-f:drivers/staging/gpib/common/iblib.c
-f:drivers/staging/gpib/common/ibsys.h
-f:drivers/staging/gpib/eastwood/Makefile
-f:drivers/staging/gpib/eastwood/fluke_gpib.c
-f:drivers/staging/gpib/eastwood/fluke_gpib.h
-f:drivers/staging/gpib/fmh_gpib/Makefile
-f:drivers/staging/gpib/fmh_gpib/fmh_gpib.c
-f:drivers/staging/gpib/fmh_gpib/fmh_gpib.h
-f:drivers/staging/gpib/gpio/Makefile
-f:drivers/staging/gpib/gpio/gpib_bitbang.c
-f:drivers/staging/gpib/hp_82335/Makefile
-f:drivers/staging/gpib/hp_82335/hp82335.c
-f:drivers/staging/gpib/hp_82335/hp82335.h
-f:drivers/staging/gpib/hp_82341/Makefile
-f:drivers/staging/gpib/hp_82341/hp_82341.c
-f:drivers/staging/gpib/hp_82341/hp_82341.h
-f:drivers/staging/gpib/include/amcc5920.h
-f:drivers/staging/gpib/include/amccs5933.h
-f:drivers/staging/gpib/include/gpibP.h
-f:drivers/staging/gpib/include/gpib_cmd.h
-f:drivers/staging/gpib/include/gpib_pci_ids.h
-f:drivers/staging/gpib/include/gpib_proto.h
-f:drivers/staging/gpib/include/gpib_state_machines.h
-f:drivers/staging/gpib/include/gpib_types.h
-f:drivers/staging/gpib/include/nec7210.h
-f:drivers/staging/gpib/include/nec7210_registers.h
-f:drivers/staging/gpib/include/plx9050.h
-f:drivers/staging/gpib/include/quancom_pci.h
-f:drivers/staging/gpib/include/tms9914.h
-f:drivers/staging/gpib/include/tnt4882_registers.h
-f:drivers/staging/gpib/ines/Makefile
-f:drivers/staging/gpib/ines/ines.h
-f:drivers/staging/gpib/ines/ines_gpib.c
-f:drivers/staging/gpib/lpvo_usb_gpib/Makefile
-f:drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c
-f:drivers/staging/gpib/nec7210/Makefile
-f:drivers/staging/gpib/nec7210/board.h
-f:drivers/staging/gpib/nec7210/nec7210.c
-f:drivers/staging/gpib/ni_usb/Makefile
-f:drivers/staging/gpib/ni_usb/ni_usb_gpib.c
-f:drivers/staging/gpib/ni_usb/ni_usb_gpib.h
-f:drivers/staging/gpib/pc2/Makefile
-f:drivers/staging/gpib/pc2/pc2_gpib.c
-f:drivers/staging/gpib/tms9914/Makefile
-f:drivers/staging/gpib/tms9914/tms9914.c
-f:drivers/staging/gpib/tnt4882/Makefile
-f:drivers/staging/gpib/tnt4882/mite.c
-f:drivers/staging/gpib/tnt4882/mite.h
-f:drivers/staging/gpib/tnt4882/tnt4882_gpib.c
-f:drivers/staging/gpib/uapi/gpib.h
-f:drivers/staging/gpib/uapi/gpib_ioctl.h
-f:drivers/staging/greybus/Documentation/firmware/authenticate.c
-f:drivers/staging/greybus/Documentation/firmware/firmware-management
-f:drivers/staging/greybus/Documentation/firmware/firmware.c
-f:drivers/staging/greybus/Documentation/sysfs-bus-greybus
-f:drivers/staging/greybus/Kconfig
-f:drivers/staging/greybus/Makefile
-f:drivers/staging/greybus/TODO
-f:drivers/staging/greybus/arche-apb-ctrl.c
-f:drivers/staging/greybus/arche-platform.c
-f:drivers/staging/greybus/arche_platform.h
-f:drivers/staging/greybus/audio_apbridgea.c
-f:drivers/staging/greybus/audio_apbridgea.h
-f:drivers/staging/greybus/audio_codec.c
-f:drivers/staging/greybus/audio_codec.h
-f:drivers/staging/greybus/audio_gb.c
-f:drivers/staging/greybus/audio_helper.c
-f:drivers/staging/greybus/audio_helper.h
-f:drivers/staging/greybus/audio_manager.c
-f:drivers/staging/greybus/audio_manager.h
-f:drivers/staging/greybus/audio_manager_module.c
-f:drivers/staging/greybus/audio_manager_private.h
-f:drivers/staging/greybus/audio_manager_sysfs.c
-f:drivers/staging/greybus/audio_module.c
-f:drivers/staging/greybus/audio_topology.c
-f:drivers/staging/greybus/authentication.c
-f:drivers/staging/greybus/bootrom.c
-f:drivers/staging/greybus/camera.c
-f:drivers/staging/greybus/firmware.h
-f:drivers/staging/greybus/fw-core.c
-f:drivers/staging/greybus/fw-download.c
-f:drivers/staging/greybus/fw-management.c
-f:drivers/staging/greybus/gb-camera.h
-f:drivers/staging/greybus/gbphy.c
-f:drivers/staging/greybus/gbphy.h
-f:drivers/staging/greybus/gpio.c
-f:drivers/staging/greybus/greybus_authentication.h
-f:drivers/staging/greybus/greybus_firmware.h
-f:drivers/staging/greybus/hid.c
-f:drivers/staging/greybus/i2c.c
-f:drivers/staging/greybus/light.c
-f:drivers/staging/greybus/log.c
-f:drivers/staging/greybus/loopback.c
-f:drivers/staging/greybus/power_supply.c
-f:drivers/staging/greybus/pwm.c
-f:drivers/staging/greybus/raw.c
-f:drivers/staging/greybus/sdio.c
-f:drivers/staging/greybus/spi.c
-f:drivers/staging/greybus/spilib.c
-f:drivers/staging/greybus/spilib.h
-f:drivers/staging/greybus/uart.c
-f:drivers/staging/greybus/usb.c
-f:drivers/staging/greybus/vibrator.c
-f:drivers/staging/iio/Documentation/inkernel.txt
-f:drivers/staging/iio/Documentation/sysfs-bus-iio-adc-ad7280a
-f:drivers/staging/iio/Documentation/sysfs-bus-iio-dds
-f:drivers/staging/iio/Kconfig
-f:drivers/staging/iio/Makefile
-f:drivers/staging/iio/accel/Kconfig
-f:drivers/staging/iio/accel/Makefile
-f:drivers/staging/iio/accel/adis16203.c
-f:drivers/staging/iio/adc/Kconfig
-f:drivers/staging/iio/adc/Makefile
-f:drivers/staging/iio/adc/ad7816.c
-f:drivers/staging/iio/addac/Kconfig
-f:drivers/staging/iio/addac/Makefile
-f:drivers/staging/iio/addac/adt7316-i2c.c
-f:drivers/staging/iio/addac/adt7316-spi.c
-f:drivers/staging/iio/addac/adt7316.c
-f:drivers/staging/iio/addac/adt7316.h
-f:drivers/staging/iio/frequency/Kconfig
-f:drivers/staging/iio/frequency/Makefile
-f:drivers/staging/iio/frequency/ad9832.c
-f:drivers/staging/iio/frequency/ad9832.h
-f:drivers/staging/iio/frequency/ad9834.c
-f:drivers/staging/iio/frequency/ad9834.h
-f:drivers/staging/iio/frequency/dds.h
-f:drivers/staging/iio/impedance-analyzer/Kconfig
-f:drivers/staging/iio/impedance-analyzer/Makefile
-f:drivers/staging/iio/impedance-analyzer/ad5933.c
-f:drivers/staging/media/Kconfig
-f:drivers/staging/media/Makefile
-f:drivers/staging/media/atomisp/Kconfig
-f:drivers/staging/media/atomisp/Makefile
-f:drivers/staging/media/atomisp/TODO
-f:drivers/staging/media/atomisp/i2c/Kconfig
-f:drivers/staging/media/atomisp/i2c/Makefile
-f:drivers/staging/media/atomisp/i2c/atomisp-gc0310.c
-f:drivers/staging/media/atomisp/i2c/atomisp-gc2235.c
-f:drivers/staging/media/atomisp/i2c/atomisp-ov2722.c
-f:drivers/staging/media/atomisp/i2c/gc2235.h
-f:drivers/staging/media/atomisp/i2c/ov2722.h
-f:drivers/staging/media/atomisp/include/hmm/hmm.h
-f:drivers/staging/media/atomisp/include/hmm/hmm_bo.h
-f:drivers/staging/media/atomisp/include/hmm/hmm_common.h
-f:drivers/staging/media/atomisp/include/linux/atomisp.h
-f:drivers/staging/media/atomisp/include/linux/atomisp_gmin_platform.h
-f:drivers/staging/media/atomisp/include/linux/atomisp_platform.h
-f:drivers/staging/media/atomisp/include/mmu/isp_mmu.h
-f:drivers/staging/media/atomisp/include/mmu/sh_mmu_mrfld.h
-f:drivers/staging/media/atomisp/notes.txt
-f:drivers/staging/media/atomisp/pci/atomisp-regs.h
-f:drivers/staging/media/atomisp/pci/atomisp_cmd.c
-f:drivers/staging/media/atomisp/pci/atomisp_cmd.h
-f:drivers/staging/media/atomisp/pci/atomisp_common.h
-f:drivers/staging/media/atomisp/pci/atomisp_compat.h
-f:drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
-f:drivers/staging/media/atomisp/pci/atomisp_compat_css20.h
-f:drivers/staging/media/atomisp/pci/atomisp_csi2.c
-f:drivers/staging/media/atomisp/pci/atomisp_csi2.h
-f:drivers/staging/media/atomisp/pci/atomisp_csi2_bridge.c
-f:drivers/staging/media/atomisp/pci/atomisp_dfs_tables.h
-f:drivers/staging/media/atomisp/pci/atomisp_fops.c
-f:drivers/staging/media/atomisp/pci/atomisp_fops.h
-f:drivers/staging/media/atomisp/pci/atomisp_gmin_platform.c
-f:drivers/staging/media/atomisp/pci/atomisp_internal.h
-f:drivers/staging/media/atomisp/pci/atomisp_ioctl.c
-f:drivers/staging/media/atomisp/pci/atomisp_ioctl.h
-f:drivers/staging/media/atomisp/pci/atomisp_subdev.c
-f:drivers/staging/media/atomisp/pci/atomisp_subdev.h
-f:drivers/staging/media/atomisp/pci/atomisp_tables.h
-f:drivers/staging/media/atomisp/pci/atomisp_trace_event.h
-f:drivers/staging/media/atomisp/pci/atomisp_v4l2.c
-f:drivers/staging/media/atomisp/pci/atomisp_v4l2.h
-f:drivers/staging/media/atomisp/pci/base/circbuf/interface/ia_css_circbuf.h
-f:drivers/staging/media/atomisp/pci/base/circbuf/interface/ia_css_circbuf_comm.h
-f:drivers/staging/media/atomisp/pci/base/circbuf/interface/ia_css_circbuf_desc.h
-f:drivers/staging/media/atomisp/pci/base/circbuf/src/circbuf.c
-f:drivers/staging/media/atomisp/pci/base/refcount/interface/ia_css_refcount.h
-f:drivers/staging/media/atomisp/pci/base/refcount/src/refcount.c
-f:drivers/staging/media/atomisp/pci/bits.h
-f:drivers/staging/media/atomisp/pci/camera/pipe/interface/ia_css_pipe_binarydesc.h
-f:drivers/staging/media/atomisp/pci/camera/pipe/interface/ia_css_pipe_stagedesc.h
-f:drivers/staging/media/atomisp/pci/camera/pipe/interface/ia_css_pipe_util.h
-f:drivers/staging/media/atomisp/pci/camera/pipe/src/pipe_binarydesc.c
-f:drivers/staging/media/atomisp/pci/camera/pipe/src/pipe_stagedesc.c
-f:drivers/staging/media/atomisp/pci/camera/pipe/src/pipe_util.c
-f:drivers/staging/media/atomisp/pci/camera/util/interface/ia_css_util.h
-f:drivers/staging/media/atomisp/pci/camera/util/src/util.c
-f:drivers/staging/media/atomisp/pci/cell_params.h
-f:drivers/staging/media/atomisp/pci/css_2401_system/csi_rx_global.h
-f:drivers/staging/media/atomisp/pci/css_2401_system/host/csi_rx.c
-f:drivers/staging/media/atomisp/pci/css_2401_system/host/csi_rx_local.h
-f:drivers/staging/media/atomisp/pci/css_2401_system/host/csi_rx_private.h
-f:drivers/staging/media/atomisp/pci/css_2401_system/host/ibuf_ctrl.c
-f:drivers/staging/media/atomisp/pci/css_2401_system/host/ibuf_ctrl_local.h
-f:drivers/staging/media/atomisp/pci/css_2401_system/host/isys_dma.c
-f:drivers/staging/media/atomisp/pci/css_2401_system/host/isys_dma_private.h
-f:drivers/staging/media/atomisp/pci/css_2401_system/host/isys_irq.c
-f:drivers/staging/media/atomisp/pci/css_2401_system/host/isys_irq_local.h
-f:drivers/staging/media/atomisp/pci/css_2401_system/host/isys_irq_private.h
-f:drivers/staging/media/atomisp/pci/css_2401_system/host/isys_stream2mmio.c
-f:drivers/staging/media/atomisp/pci/css_2401_system/host/isys_stream2mmio_local.h
-f:drivers/staging/media/atomisp/pci/css_2401_system/host/isys_stream2mmio_private.h
-f:drivers/staging/media/atomisp/pci/css_2401_system/host/pixelgen_local.h
-f:drivers/staging/media/atomisp/pci/css_2401_system/host/pixelgen_private.h
-f:drivers/staging/media/atomisp/pci/css_2401_system/hrt/PixelGen_SysBlock_defs.h
-f:drivers/staging/media/atomisp/pci/css_2401_system/hrt/ibuf_cntrl_defs.h
-f:drivers/staging/media/atomisp/pci/css_2401_system/hrt/mipi_backend_common_defs.h
-f:drivers/staging/media/atomisp/pci/css_2401_system/hrt/mipi_backend_defs.h
-f:drivers/staging/media/atomisp/pci/css_2401_system/hrt/rx_csi_defs.h
-f:drivers/staging/media/atomisp/pci/css_2401_system/hrt/stream2mmio_defs.h
-f:drivers/staging/media/atomisp/pci/css_2401_system/ibuf_ctrl_global.h
-f:drivers/staging/media/atomisp/pci/css_2401_system/isys_dma_global.h
-f:drivers/staging/media/atomisp/pci/css_2401_system/isys_irq_global.h
-f:drivers/staging/media/atomisp/pci/css_2401_system/isys_stream2mmio_global.h
-f:drivers/staging/media/atomisp/pci/css_2401_system/pixelgen_global.h
-f:drivers/staging/media/atomisp/pci/css_receiver_2400_common_defs.h
-f:drivers/staging/media/atomisp/pci/css_receiver_2400_defs.h
-f:drivers/staging/media/atomisp/pci/css_trace.h
-f:drivers/staging/media/atomisp/pci/dma_v2_defs.h
-f:drivers/staging/media/atomisp/pci/gdc_v2_defs.h
-f:drivers/staging/media/atomisp/pci/gp_timer_defs.h
-f:drivers/staging/media/atomisp/pci/gpio_block_defs.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/debug_global.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/dma_global.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/event_fifo_global.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/fifo_monitor_global.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/gdc_global.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/gp_device_global.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/gp_timer_global.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/gpio_global.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/hmem_global.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/debug.c
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/debug_local.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/debug_private.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/dma.c
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/dma_local.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/dma_private.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/event_fifo.c
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/event_fifo_local.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/event_fifo_private.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/fifo_monitor.c
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/fifo_monitor_local.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/fifo_monitor_private.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gdc.c
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gdc_local.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gdc_private.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gp_device.c
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gp_device_local.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gp_device_private.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gp_timer.c
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gp_timer_local.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gp_timer_private.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/gpio_private.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/hmem.c
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/hmem_local.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/hmem_private.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_formatter.c
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_formatter_local.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_formatter_private.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_system.c
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/irq.c
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/irq_local.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/irq_private.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/isp.c
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/isp_local.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/isp_private.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/mmu.c
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/mmu_local.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/sp.c
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/sp_local.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/sp_private.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/timed_ctrl.c
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/timed_ctrl_local.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/timed_ctrl_private.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/vamem_local.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/vmem.c
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/vmem_local.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/host/vmem_private.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/input_formatter_global.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/irq_global.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/isp_global.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/mmu_global.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/sp_global.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/timed_ctrl_global.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/vamem_global.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_common/vmem_global.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_defs.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/assert_support.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/bitop_support.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/csi_rx.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/debug.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/device_access/device_access.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/dma.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/event_fifo.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/fifo_monitor.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/gdc_device.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/gp_device.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/gp_timer.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/hmem.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/host/csi_rx_public.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/host/debug_public.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/host/dma_public.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/host/event_fifo_public.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/host/fifo_monitor_public.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/host/gdc_public.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/host/gp_device_public.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/host/gp_timer_public.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/host/hmem_public.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/host/input_formatter_public.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/host/irq_public.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/host/isp_public.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/host/isys_dma_public.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/host/isys_irq_public.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/host/isys_stream2mmio_public.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/host/mmu_public.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/host/pixelgen_public.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/host/sp_public.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/host/tag_public.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/host/timed_ctrl_public.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/host/vamem_public.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/host/vmem_public.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/input_formatter.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/input_system.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/irq.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/isp.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/isys_irq.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/isys_stream2mmio.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/math_support.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/misc_support.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/mmu_device.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/pixelgen.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/platform_support.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/print_support.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/queue.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/resource.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/sp.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/tag.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/timed_ctrl.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/type_support.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/vamem.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_include/vmem.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_shared/host/queue_local.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_shared/host/queue_private.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_shared/host/tag.c
-f:drivers/staging/media/atomisp/pci/hive_isp_css_shared/host/tag_local.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_shared/host/tag_private.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_shared/queue_global.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_shared/sw_event_global.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_shared/tag_global.h
-f:drivers/staging/media/atomisp/pci/hive_isp_css_streaming_to_mipi_types_hrt.h
-f:drivers/staging/media/atomisp/pci/hive_types.h
-f:drivers/staging/media/atomisp/pci/hmm/hmm.c
-f:drivers/staging/media/atomisp/pci/hmm/hmm_bo.c
-f:drivers/staging/media/atomisp/pci/ia_css.h
-f:drivers/staging/media/atomisp/pci/ia_css_3a.h
-f:drivers/staging/media/atomisp/pci/ia_css_acc_types.h
-f:drivers/staging/media/atomisp/pci/ia_css_buffer.h
-f:drivers/staging/media/atomisp/pci/ia_css_control.h
-f:drivers/staging/media/atomisp/pci/ia_css_device_access.c
-f:drivers/staging/media/atomisp/pci/ia_css_device_access.h
-f:drivers/staging/media/atomisp/pci/ia_css_dvs.h
-f:drivers/staging/media/atomisp/pci/ia_css_env.h
-f:drivers/staging/media/atomisp/pci/ia_css_err.h
-f:drivers/staging/media/atomisp/pci/ia_css_event_public.h
-f:drivers/staging/media/atomisp/pci/ia_css_firmware.h
-f:drivers/staging/media/atomisp/pci/ia_css_frac.h
-f:drivers/staging/media/atomisp/pci/ia_css_frame_format.h
-f:drivers/staging/media/atomisp/pci/ia_css_frame_public.h
-f:drivers/staging/media/atomisp/pci/ia_css_host_data.h
-f:drivers/staging/media/atomisp/pci/ia_css_input_port.h
-f:drivers/staging/media/atomisp/pci/ia_css_irq.h
-f:drivers/staging/media/atomisp/pci/ia_css_isp_configs.c
-f:drivers/staging/media/atomisp/pci/ia_css_isp_configs.h
-f:drivers/staging/media/atomisp/pci/ia_css_isp_params.c
-f:drivers/staging/media/atomisp/pci/ia_css_isp_params.h
-f:drivers/staging/media/atomisp/pci/ia_css_isp_states.c
-f:drivers/staging/media/atomisp/pci/ia_css_isp_states.h
-f:drivers/staging/media/atomisp/pci/ia_css_metadata.h
-f:drivers/staging/media/atomisp/pci/ia_css_mipi.h
-f:drivers/staging/media/atomisp/pci/ia_css_mmu.h
-f:drivers/staging/media/atomisp/pci/ia_css_mmu_private.h
-f:drivers/staging/media/atomisp/pci/ia_css_morph.h
-f:drivers/staging/media/atomisp/pci/ia_css_pipe.h
-f:drivers/staging/media/atomisp/pci/ia_css_pipe_public.h
-f:drivers/staging/media/atomisp/pci/ia_css_prbs.h
-f:drivers/staging/media/atomisp/pci/ia_css_properties.h
-f:drivers/staging/media/atomisp/pci/ia_css_shading.h
-f:drivers/staging/media/atomisp/pci/ia_css_stream.h
-f:drivers/staging/media/atomisp/pci/ia_css_stream_format.h
-f:drivers/staging/media/atomisp/pci/ia_css_stream_public.h
-f:drivers/staging/media/atomisp/pci/ia_css_timer.h
-f:drivers/staging/media/atomisp/pci/ia_css_types.h
-f:drivers/staging/media/atomisp/pci/ia_css_version.h
-f:drivers/staging/media/atomisp/pci/ia_css_version_data.h
-f:drivers/staging/media/atomisp/pci/if_defs.h
-f:drivers/staging/media/atomisp/pci/input_formatter_subsystem_defs.h
-f:drivers/staging/media/atomisp/pci/input_selector_defs.h
-f:drivers/staging/media/atomisp/pci/input_switch_2400_defs.h
-f:drivers/staging/media/atomisp/pci/input_system_ctrl_defs.h
-f:drivers/staging/media/atomisp/pci/input_system_defs.h
-f:drivers/staging/media/atomisp/pci/input_system_global.h
-f:drivers/staging/media/atomisp/pci/input_system_local.h
-f:drivers/staging/media/atomisp/pci/input_system_private.h
-f:drivers/staging/media/atomisp/pci/input_system_public.h
-f:drivers/staging/media/atomisp/pci/irq_controller_defs.h
-f:drivers/staging/media/atomisp/pci/irq_types_hrt.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/aa/aa_2/ia_css_aa2.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/aa/aa_2/ia_css_aa2.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/aa/aa_2/ia_css_aa2_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/aa/aa_2/ia_css_aa2_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_1.0/ia_css_anr.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_1.0/ia_css_anr.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_1.0/ia_css_anr_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_1.0/ia_css_anr_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_2/ia_css_anr2.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_2/ia_css_anr2.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_2/ia_css_anr2_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_2/ia_css_anr2_table.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_2/ia_css_anr2_table.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_2/ia_css_anr2_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/bh/bh_2/ia_css_bh.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/bh/bh_2/ia_css_bh.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/bh/bh_2/ia_css_bh_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/bh/bh_2/ia_css_bh_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/bnlm/ia_css_bnlm.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/bnlm/ia_css_bnlm.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/bnlm/ia_css_bnlm_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/bnlm/ia_css_bnlm_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/bnr/bnr_1.0/ia_css_bnr_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/cnr/cnr_1.0/ia_css_cnr_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/cnr/cnr_2/ia_css_cnr2.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/cnr/cnr_2/ia_css_cnr2.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/cnr/cnr_2/ia_css_cnr2_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/cnr/cnr_2/ia_css_cnr2_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/conversion/conversion_1.0/ia_css_conversion.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/conversion/conversion_1.0/ia_css_conversion.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/conversion/conversion_1.0/ia_css_conversion_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/conversion/conversion_1.0/ia_css_conversion_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/crop/crop_1.0/ia_css_crop.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/crop/crop_1.0/ia_css_crop.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/crop/crop_1.0/ia_css_crop_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/crop/crop_1.0/ia_css_crop_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/csc/csc_1.0/ia_css_csc.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/csc/csc_1.0/ia_css_csc.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/csc/csc_1.0/ia_css_csc_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/csc/csc_1.0/ia_css_csc_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc2/ia_css_ctc2.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc2/ia_css_ctc2.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc2/ia_css_ctc2_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc2/ia_css_ctc2_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc_1.0/ia_css_ctc_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc_1.0/ia_css_ctc_table.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc_1.0/ia_css_ctc_table.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc_1.0/ia_css_ctc_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/de/de_1.0/ia_css_de.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/de/de_1.0/ia_css_de.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/de/de_1.0/ia_css_de_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/de/de_1.0/ia_css_de_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/de/de_2/ia_css_de2.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/de/de_2/ia_css_de2.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/de/de_2/ia_css_de2_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/de/de_2/ia_css_de2_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/dp/dp_1.0/ia_css_dp.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/dp/dp_1.0/ia_css_dp.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/dp/dp_1.0/ia_css_dp_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/dp/dp_1.0/ia_css_dp_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/dpc2/ia_css_dpc2.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/dpc2/ia_css_dpc2.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/dpc2/ia_css_dpc2_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/dpc2/ia_css_dpc2_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/eed1_8/ia_css_eed1_8.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/eed1_8/ia_css_eed1_8.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/eed1_8/ia_css_eed1_8_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/eed1_8/ia_css_eed1_8_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/fc/fc_1.0/ia_css_formats.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/fc/fc_1.0/ia_css_formats.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/fc/fc_1.0/ia_css_formats_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/fc/fc_1.0/ia_css_formats_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/fpn/fpn_1.0/ia_css_fpn_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/fpn/fpn_1.0/ia_css_fpn_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_1.0/ia_css_gc.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_1.0/ia_css_gc.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_1.0/ia_css_gc_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_1.0/ia_css_gc_table.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_1.0/ia_css_gc_table.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_1.0/ia_css_gc_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_2/ia_css_gc2.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_2/ia_css_gc2.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_2/ia_css_gc2_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_2/ia_css_gc2_table.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_2/ia_css_gc2_table.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/gc/gc_2/ia_css_gc2_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/hdr/ia_css_hdr.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/hdr/ia_css_hdr.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/hdr/ia_css_hdr_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/hdr/ia_css_hdr_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/common/ia_css_common_io_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/common/ia_css_common_io_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/iterator/iterator_1.0/ia_css_iterator_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/macc/macc1_5/ia_css_macc1_5.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/macc/macc1_5/ia_css_macc1_5.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/macc/macc1_5/ia_css_macc1_5_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/macc/macc1_5/ia_css_macc1_5_table.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/macc/macc1_5/ia_css_macc1_5_table.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/macc/macc1_5/ia_css_macc1_5_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/macc/macc_1.0/ia_css_macc.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/macc/macc_1.0/ia_css_macc.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/macc/macc_1.0/ia_css_macc_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/macc/macc_1.0/ia_css_macc_table.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/macc/macc_1.0/ia_css_macc_table.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/macc/macc_1.0/ia_css_macc_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/norm/norm_1.0/ia_css_norm.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/norm/norm_1.0/ia_css_norm.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/norm/norm_1.0/ia_css_norm_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/ob/ob2/ia_css_ob2.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/ob/ob2/ia_css_ob2.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/ob/ob2/ia_css_ob2_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/ob/ob2/ia_css_ob2_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/ob/ob_1.0/ia_css_ob.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/ob/ob_1.0/ia_css_ob.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/ob/ob_1.0/ia_css_ob_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/ob/ob_1.0/ia_css_ob_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/output/output_1.0/ia_css_output.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/output/output_1.0/ia_css_output.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/output/output_1.0/ia_css_output_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/output/output_1.0/ia_css_output_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/qplane/qplane_2/ia_css_qplane.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/qplane/qplane_2/ia_css_qplane.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/qplane/qplane_2/ia_css_qplane_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/qplane/qplane_2/ia_css_qplane_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/raw/raw_1.0/ia_css_raw.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/raw/raw_1.0/ia_css_raw.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/raw/raw_1.0/ia_css_raw_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/raw/raw_1.0/ia_css_raw_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/raw_aa_binning/raw_aa_binning_1.0/ia_css_raa.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/raw_aa_binning/raw_aa_binning_1.0/ia_css_raa.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/ref/ref_1.0/ia_css_ref.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/ref/ref_1.0/ia_css_ref.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/ref/ref_1.0/ia_css_ref_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/ref/ref_1.0/ia_css_ref_state.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/ref/ref_1.0/ia_css_ref_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/s3a/s3a_1.0/ia_css_s3a_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/sc/sc_1.0/ia_css_sc.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/sc/sc_1.0/ia_css_sc.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/sc/sc_1.0/ia_css_sc_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/sc/sc_1.0/ia_css_sc_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/sdis/common/ia_css_sdis_common.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/sdis/common/ia_css_sdis_common_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_1.0/ia_css_sdis_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_2/ia_css_sdis2_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/tdf/tdf_1.0/ia_css_tdf_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/tdf/tdf_1.0/ia_css_tdf_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/tnr/tnr3/ia_css_tnr3_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/tnr/tnr_1.0/ia_css_tnr_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/tnr/tnr_1.0/ia_css_tnr_state.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/tnr/tnr_1.0/ia_css_tnr_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/uds/uds_1.0/ia_css_uds_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/vf/vf_1.0/ia_css_vf.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/vf/vf_1.0/ia_css_vf.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/vf/vf_1.0/ia_css_vf_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/vf/vf_1.0/ia_css_vf_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/wb/wb_1.0/ia_css_wb.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/wb/wb_1.0/ia_css_wb.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/wb/wb_1.0/ia_css_wb_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/wb/wb_1.0/ia_css_wb_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/xnr/xnr_1.0/ia_css_xnr_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/xnr/xnr_1.0/ia_css_xnr_table.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/xnr/xnr_1.0/ia_css_xnr_table.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/xnr/xnr_1.0/ia_css_xnr_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/xnr/xnr_3.0/ia_css_xnr3_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/xnr/xnr_3.0/ia_css_xnr3_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/ynr/ynr_1.0/ia_css_ynr_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/ynr/ynr_1.0/ia_css_ynr_types.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/ynr/ynr_2/ia_css_ynr2.host.c
-f:drivers/staging/media/atomisp/pci/isp/kernels/ynr/ynr_2/ia_css_ynr2.host.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/ynr/ynr_2/ia_css_ynr2_param.h
-f:drivers/staging/media/atomisp/pci/isp/kernels/ynr/ynr_2/ia_css_ynr2_types.h
-f:drivers/staging/media/atomisp/pci/isp/modes/interface/input_buf.isp.h
-f:drivers/staging/media/atomisp/pci/isp/modes/interface/isp_types.h
-f:drivers/staging/media/atomisp/pci/isp2400_input_system_global.h
-f:drivers/staging/media/atomisp/pci/isp2400_input_system_local.h
-f:drivers/staging/media/atomisp/pci/isp2400_input_system_private.h
-f:drivers/staging/media/atomisp/pci/isp2400_input_system_public.h
-f:drivers/staging/media/atomisp/pci/isp2400_support.h
-f:drivers/staging/media/atomisp/pci/isp2401_input_system_global.h
-f:drivers/staging/media/atomisp/pci/isp2401_input_system_local.h
-f:drivers/staging/media/atomisp/pci/isp2401_input_system_private.h
-f:drivers/staging/media/atomisp/pci/isp_acquisition_defs.h
-f:drivers/staging/media/atomisp/pci/isp_capture_defs.h
-f:drivers/staging/media/atomisp/pci/mamoiada_params.h
-f:drivers/staging/media/atomisp/pci/mmu/isp_mmu.c
-f:drivers/staging/media/atomisp/pci/mmu/sh_mmu_mrfld.c
-f:drivers/staging/media/atomisp/pci/mmu_defs.h
-f:drivers/staging/media/atomisp/pci/runtime/binary/interface/ia_css_binary.h
-f:drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c
-f:drivers/staging/media/atomisp/pci/runtime/bufq/interface/ia_css_bufq.h
-f:drivers/staging/media/atomisp/pci/runtime/bufq/interface/ia_css_bufq_comm.h
-f:drivers/staging/media/atomisp/pci/runtime/bufq/src/bufq.c
-f:drivers/staging/media/atomisp/pci/runtime/debug/interface/ia_css_debug.h
-f:drivers/staging/media/atomisp/pci/runtime/debug/interface/ia_css_debug_internal.h
-f:drivers/staging/media/atomisp/pci/runtime/debug/interface/ia_css_debug_pipe.h
-f:drivers/staging/media/atomisp/pci/runtime/debug/src/ia_css_debug.c
-f:drivers/staging/media/atomisp/pci/runtime/event/interface/ia_css_event.h
-f:drivers/staging/media/atomisp/pci/runtime/event/src/event.c
-f:drivers/staging/media/atomisp/pci/runtime/eventq/interface/ia_css_eventq.h
-f:drivers/staging/media/atomisp/pci/runtime/eventq/src/eventq.c
-f:drivers/staging/media/atomisp/pci/runtime/frame/interface/ia_css_frame.h
-f:drivers/staging/media/atomisp/pci/runtime/frame/interface/ia_css_frame_comm.h
-f:drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c
-f:drivers/staging/media/atomisp/pci/runtime/ifmtr/interface/ia_css_ifmtr.h
-f:drivers/staging/media/atomisp/pci/runtime/ifmtr/src/ifmtr.c
-f:drivers/staging/media/atomisp/pci/runtime/inputfifo/interface/ia_css_inputfifo.h
-f:drivers/staging/media/atomisp/pci/runtime/inputfifo/src/inputfifo.c
-f:drivers/staging/media/atomisp/pci/runtime/isp_param/interface/ia_css_isp_param.h
-f:drivers/staging/media/atomisp/pci/runtime/isp_param/interface/ia_css_isp_param_types.h
-f:drivers/staging/media/atomisp/pci/runtime/isp_param/src/isp_param.c
-f:drivers/staging/media/atomisp/pci/runtime/isys/interface/ia_css_isys.h
-f:drivers/staging/media/atomisp/pci/runtime/isys/interface/ia_css_isys_comm.h
-f:drivers/staging/media/atomisp/pci/runtime/isys/src/csi_rx_rmgr.c
-f:drivers/staging/media/atomisp/pci/runtime/isys/src/csi_rx_rmgr.h
-f:drivers/staging/media/atomisp/pci/runtime/isys/src/ibuf_ctrl_rmgr.c
-f:drivers/staging/media/atomisp/pci/runtime/isys/src/ibuf_ctrl_rmgr.h
-f:drivers/staging/media/atomisp/pci/runtime/isys/src/isys_dma_rmgr.c
-f:drivers/staging/media/atomisp/pci/runtime/isys/src/isys_dma_rmgr.h
-f:drivers/staging/media/atomisp/pci/runtime/isys/src/isys_init.c
-f:drivers/staging/media/atomisp/pci/runtime/isys/src/isys_stream2mmio_rmgr.c
-f:drivers/staging/media/atomisp/pci/runtime/isys/src/isys_stream2mmio_rmgr.h
-f:drivers/staging/media/atomisp/pci/runtime/isys/src/rx.c
-f:drivers/staging/media/atomisp/pci/runtime/isys/src/virtual_isys.c
-f:drivers/staging/media/atomisp/pci/runtime/isys/src/virtual_isys.h
-f:drivers/staging/media/atomisp/pci/runtime/pipeline/interface/ia_css_pipeline.h
-f:drivers/staging/media/atomisp/pci/runtime/pipeline/interface/ia_css_pipeline_common.h
-f:drivers/staging/media/atomisp/pci/runtime/pipeline/src/pipeline.c
-f:drivers/staging/media/atomisp/pci/runtime/queue/interface/ia_css_queue.h
-f:drivers/staging/media/atomisp/pci/runtime/queue/interface/ia_css_queue_comm.h
-f:drivers/staging/media/atomisp/pci/runtime/queue/src/queue.c
-f:drivers/staging/media/atomisp/pci/runtime/queue/src/queue_access.c
-f:drivers/staging/media/atomisp/pci/runtime/queue/src/queue_access.h
-f:drivers/staging/media/atomisp/pci/runtime/rmgr/interface/ia_css_rmgr.h
-f:drivers/staging/media/atomisp/pci/runtime/rmgr/interface/ia_css_rmgr_vbuf.h
-f:drivers/staging/media/atomisp/pci/runtime/rmgr/src/rmgr.c
-f:drivers/staging/media/atomisp/pci/runtime/rmgr/src/rmgr_vbuf.c
-f:drivers/staging/media/atomisp/pci/runtime/spctrl/interface/ia_css_spctrl.h
-f:drivers/staging/media/atomisp/pci/runtime/spctrl/interface/ia_css_spctrl_comm.h
-f:drivers/staging/media/atomisp/pci/runtime/spctrl/src/spctrl.c
-f:drivers/staging/media/atomisp/pci/runtime/tagger/interface/ia_css_tagger_common.h
-f:drivers/staging/media/atomisp/pci/runtime/timer/src/timer.c
-f:drivers/staging/media/atomisp/pci/scalar_processor_2400_params.h
-f:drivers/staging/media/atomisp/pci/sh_css.c
-f:drivers/staging/media/atomisp/pci/sh_css_defs.h
-f:drivers/staging/media/atomisp/pci/sh_css_firmware.c
-f:drivers/staging/media/atomisp/pci/sh_css_firmware.h
-f:drivers/staging/media/atomisp/pci/sh_css_frac.h
-f:drivers/staging/media/atomisp/pci/sh_css_host_data.c
-f:drivers/staging/media/atomisp/pci/sh_css_hrt.c
-f:drivers/staging/media/atomisp/pci/sh_css_hrt.h
-f:drivers/staging/media/atomisp/pci/sh_css_internal.h
-f:drivers/staging/media/atomisp/pci/sh_css_legacy.h
-f:drivers/staging/media/atomisp/pci/sh_css_metrics.c
-f:drivers/staging/media/atomisp/pci/sh_css_metrics.h
-f:drivers/staging/media/atomisp/pci/sh_css_mipi.c
-f:drivers/staging/media/atomisp/pci/sh_css_mipi.h
-f:drivers/staging/media/atomisp/pci/sh_css_mmu.c
-f:drivers/staging/media/atomisp/pci/sh_css_param_dvs.c
-f:drivers/staging/media/atomisp/pci/sh_css_param_dvs.h
-f:drivers/staging/media/atomisp/pci/sh_css_param_shading.c
-f:drivers/staging/media/atomisp/pci/sh_css_param_shading.h
-f:drivers/staging/media/atomisp/pci/sh_css_params.c
-f:drivers/staging/media/atomisp/pci/sh_css_params.h
-f:drivers/staging/media/atomisp/pci/sh_css_params_internal.h
-f:drivers/staging/media/atomisp/pci/sh_css_properties.c
-f:drivers/staging/media/atomisp/pci/sh_css_sp.c
-f:drivers/staging/media/atomisp/pci/sh_css_sp.h
-f:drivers/staging/media/atomisp/pci/sh_css_stream_format.c
-f:drivers/staging/media/atomisp/pci/sh_css_stream_format.h
-f:drivers/staging/media/atomisp/pci/sh_css_struct.h
-f:drivers/staging/media/atomisp/pci/sh_css_uds.h
-f:drivers/staging/media/atomisp/pci/sh_css_version.c
-f:drivers/staging/media/atomisp/pci/str2mem_defs.h
-f:drivers/staging/media/atomisp/pci/streaming_to_mipi_defs.h
-f:drivers/staging/media/atomisp/pci/system_global.h
-f:drivers/staging/media/atomisp/pci/system_local.c
-f:drivers/staging/media/atomisp/pci/system_local.h
-f:drivers/staging/media/atomisp/pci/timed_controller_defs.h
-f:drivers/staging/media/atomisp/pci/version.h
-f:drivers/staging/media/av7110/Kconfig
-f:drivers/staging/media/av7110/Makefile
-f:drivers/staging/media/av7110/av7110.c
-f:drivers/staging/media/av7110/av7110.h
-f:drivers/staging/media/av7110/av7110_av.c
-f:drivers/staging/media/av7110/av7110_av.h
-f:drivers/staging/media/av7110/av7110_ca.c
-f:drivers/staging/media/av7110/av7110_ca.h
-f:drivers/staging/media/av7110/av7110_hw.c
-f:drivers/staging/media/av7110/av7110_hw.h
-f:drivers/staging/media/av7110/av7110_ipack.c
-f:drivers/staging/media/av7110/av7110_ipack.h
-f:drivers/staging/media/av7110/av7110_ir.c
-f:drivers/staging/media/av7110/av7110_v4l.c
-f:drivers/staging/media/av7110/dvb_filter.c
-f:drivers/staging/media/av7110/dvb_filter.h
-f:drivers/staging/media/av7110/sp8870.c
-f:drivers/staging/media/av7110/sp8870.h
-f:drivers/staging/media/deprecated/atmel/Kconfig
-f:drivers/staging/media/deprecated/atmel/Makefile
-f:drivers/staging/media/deprecated/atmel/TODO
-f:drivers/staging/media/deprecated/atmel/atmel-isc-base.c
-f:drivers/staging/media/deprecated/atmel/atmel-isc-clk.c
-f:drivers/staging/media/deprecated/atmel/atmel-isc-regs.h
-f:drivers/staging/media/deprecated/atmel/atmel-isc.h
-f:drivers/staging/media/deprecated/atmel/atmel-sama5d2-isc.c
-f:drivers/staging/media/deprecated/atmel/atmel-sama7g5-isc.c
-f:drivers/staging/media/imx/Kconfig
-f:drivers/staging/media/imx/Makefile
-f:drivers/staging/media/imx/TODO
-f:drivers/staging/media/imx/imx-ic-common.c
-f:drivers/staging/media/imx/imx-ic-prp.c
-f:drivers/staging/media/imx/imx-ic-prpencvf.c
-f:drivers/staging/media/imx/imx-ic.h
-f:drivers/staging/media/imx/imx-media-capture.c
-f:drivers/staging/media/imx/imx-media-csc-scaler.c
-f:drivers/staging/media/imx/imx-media-csi.c
-f:drivers/staging/media/imx/imx-media-dev-common.c
-f:drivers/staging/media/imx/imx-media-dev.c
-f:drivers/staging/media/imx/imx-media-fim.c
-f:drivers/staging/media/imx/imx-media-internal-sd.c
-f:drivers/staging/media/imx/imx-media-of.c
-f:drivers/staging/media/imx/imx-media-utils.c
-f:drivers/staging/media/imx/imx-media-vdic.c
-f:drivers/staging/media/imx/imx-media.h
-f:drivers/staging/media/imx/imx6-mipi-csi2.c
-f:drivers/staging/media/ipu3/Kconfig
-f:drivers/staging/media/ipu3/Makefile
-f:drivers/staging/media/ipu3/TODO
-f:drivers/staging/media/ipu3/include/uapi/intel-ipu3.h
-f:drivers/staging/media/ipu3/ipu3-abi.h
-f:drivers/staging/media/ipu3/ipu3-css-fw.c
-f:drivers/staging/media/ipu3/ipu3-css-fw.h
-f:drivers/staging/media/ipu3/ipu3-css-params.c
-f:drivers/staging/media/ipu3/ipu3-css-params.h
-f:drivers/staging/media/ipu3/ipu3-css-pool.c
-f:drivers/staging/media/ipu3/ipu3-css-pool.h
-f:drivers/staging/media/ipu3/ipu3-css.c
-f:drivers/staging/media/ipu3/ipu3-css.h
-f:drivers/staging/media/ipu3/ipu3-dmamap.c
-f:drivers/staging/media/ipu3/ipu3-dmamap.h
-f:drivers/staging/media/ipu3/ipu3-mmu.c
-f:drivers/staging/media/ipu3/ipu3-mmu.h
-f:drivers/staging/media/ipu3/ipu3-tables.c
-f:drivers/staging/media/ipu3/ipu3-tables.h
-f:drivers/staging/media/ipu3/ipu3-v4l2.c
-f:drivers/staging/media/ipu3/ipu3.c
-f:drivers/staging/media/ipu3/ipu3.h
-f:drivers/staging/media/ipu7/Kconfig
-f:drivers/staging/media/ipu7/Makefile
-f:drivers/staging/media/ipu7/TODO
-f:drivers/staging/media/ipu7/abi/ipu7_fw_boot_abi.h
-f:drivers/staging/media/ipu7/abi/ipu7_fw_common_abi.h
-f:drivers/staging/media/ipu7/abi/ipu7_fw_config_abi.h
-f:drivers/staging/media/ipu7/abi/ipu7_fw_insys_config_abi.h
-f:drivers/staging/media/ipu7/abi/ipu7_fw_isys_abi.h
-f:drivers/staging/media/ipu7/abi/ipu7_fw_msg_abi.h
-f:drivers/staging/media/ipu7/abi/ipu7_fw_psys_config_abi.h
-f:drivers/staging/media/ipu7/abi/ipu7_fw_syscom_abi.h
-f:drivers/staging/media/ipu7/ipu7-boot.c
-f:drivers/staging/media/ipu7/ipu7-boot.h
-f:drivers/staging/media/ipu7/ipu7-bus.c
-f:drivers/staging/media/ipu7/ipu7-bus.h
-f:drivers/staging/media/ipu7/ipu7-buttress-regs.h
-f:drivers/staging/media/ipu7/ipu7-buttress.c
-f:drivers/staging/media/ipu7/ipu7-buttress.h
-f:drivers/staging/media/ipu7/ipu7-cpd.c
-f:drivers/staging/media/ipu7/ipu7-cpd.h
-f:drivers/staging/media/ipu7/ipu7-dma.c
-f:drivers/staging/media/ipu7/ipu7-dma.h
-f:drivers/staging/media/ipu7/ipu7-fw-isys.c
-f:drivers/staging/media/ipu7/ipu7-fw-isys.h
-f:drivers/staging/media/ipu7/ipu7-isys-csi-phy.c
-f:drivers/staging/media/ipu7/ipu7-isys-csi-phy.h
-f:drivers/staging/media/ipu7/ipu7-isys-csi2-regs.h
-f:drivers/staging/media/ipu7/ipu7-isys-csi2.c
-f:drivers/staging/media/ipu7/ipu7-isys-csi2.h
-f:drivers/staging/media/ipu7/ipu7-isys-queue.c
-f:drivers/staging/media/ipu7/ipu7-isys-queue.h
-f:drivers/staging/media/ipu7/ipu7-isys-subdev.c
-f:drivers/staging/media/ipu7/ipu7-isys-subdev.h
-f:drivers/staging/media/ipu7/ipu7-isys-video.c
-f:drivers/staging/media/ipu7/ipu7-isys-video.h
-f:drivers/staging/media/ipu7/ipu7-isys.c
-f:drivers/staging/media/ipu7/ipu7-isys.h
-f:drivers/staging/media/ipu7/ipu7-mmu.c
-f:drivers/staging/media/ipu7/ipu7-mmu.h
-f:drivers/staging/media/ipu7/ipu7-platform-regs.h
-f:drivers/staging/media/ipu7/ipu7-syscom.c
-f:drivers/staging/media/ipu7/ipu7-syscom.h
-f:drivers/staging/media/ipu7/ipu7.c
-f:drivers/staging/media/ipu7/ipu7.h
-f:drivers/staging/media/max96712/Kconfig
-f:drivers/staging/media/max96712/Makefile
-f:drivers/staging/media/max96712/max96712.c
-f:drivers/staging/media/meson/vdec/Kconfig
-f:drivers/staging/media/meson/vdec/Makefile
-f:drivers/staging/media/meson/vdec/TODO
-f:drivers/staging/media/meson/vdec/codec_h264.c
-f:drivers/staging/media/meson/vdec/codec_h264.h
-f:drivers/staging/media/meson/vdec/codec_hevc_common.c
-f:drivers/staging/media/meson/vdec/codec_hevc_common.h
-f:drivers/staging/media/meson/vdec/codec_mpeg12.c
-f:drivers/staging/media/meson/vdec/codec_mpeg12.h
-f:drivers/staging/media/meson/vdec/codec_vp9.c
-f:drivers/staging/media/meson/vdec/codec_vp9.h
-f:drivers/staging/media/meson/vdec/dos_regs.h
-f:drivers/staging/media/meson/vdec/esparser.c
-f:drivers/staging/media/meson/vdec/esparser.h
-f:drivers/staging/media/meson/vdec/hevc_regs.h
-f:drivers/staging/media/meson/vdec/vdec.c
-f:drivers/staging/media/meson/vdec/vdec.h
-f:drivers/staging/media/meson/vdec/vdec_1.c
-f:drivers/staging/media/meson/vdec/vdec_1.h
-f:drivers/staging/media/meson/vdec/vdec_helpers.c
-f:drivers/staging/media/meson/vdec/vdec_helpers.h
-f:drivers/staging/media/meson/vdec/vdec_hevc.c
-f:drivers/staging/media/meson/vdec/vdec_hevc.h
-f:drivers/staging/media/meson/vdec/vdec_platform.c
-f:drivers/staging/media/meson/vdec/vdec_platform.h
-f:drivers/staging/media/starfive/Kconfig
-f:drivers/staging/media/starfive/Makefile
-f:drivers/staging/media/starfive/camss/Kconfig
-f:drivers/staging/media/starfive/camss/Makefile
-f:drivers/staging/media/starfive/camss/TODO.txt
-f:drivers/staging/media/starfive/camss/stf-camss.c
-f:drivers/staging/media/starfive/camss/stf-camss.h
-f:drivers/staging/media/starfive/camss/stf-capture.c
-f:drivers/staging/media/starfive/camss/stf-capture.h
-f:drivers/staging/media/starfive/camss/stf-isp-hw-ops.c
-f:drivers/staging/media/starfive/camss/stf-isp.c
-f:drivers/staging/media/starfive/camss/stf-isp.h
-f:drivers/staging/media/starfive/camss/stf-video.c
-f:drivers/staging/media/starfive/camss/stf-video.h
-f:drivers/staging/media/sunxi/Kconfig
-f:drivers/staging/media/sunxi/Makefile
-f:drivers/staging/media/sunxi/cedrus/Kconfig
-f:drivers/staging/media/sunxi/cedrus/Makefile
-f:drivers/staging/media/sunxi/cedrus/TODO
-f:drivers/staging/media/sunxi/cedrus/cedrus.c
-f:drivers/staging/media/sunxi/cedrus/cedrus.h
-f:drivers/staging/media/sunxi/cedrus/cedrus_dec.c
-f:drivers/staging/media/sunxi/cedrus/cedrus_dec.h
-f:drivers/staging/media/sunxi/cedrus/cedrus_h264.c
-f:drivers/staging/media/sunxi/cedrus/cedrus_h265.c
-f:drivers/staging/media/sunxi/cedrus/cedrus_hw.c
-f:drivers/staging/media/sunxi/cedrus/cedrus_hw.h
-f:drivers/staging/media/sunxi/cedrus/cedrus_mpeg2.c
-f:drivers/staging/media/sunxi/cedrus/cedrus_regs.h
-f:drivers/staging/media/sunxi/cedrus/cedrus_video.c
-f:drivers/staging/media/sunxi/cedrus/cedrus_video.h
-f:drivers/staging/media/sunxi/cedrus/cedrus_vp8.c
-f:drivers/staging/media/sunxi/sun6i-isp/Kconfig
-f:drivers/staging/media/sunxi/sun6i-isp/Makefile
-f:drivers/staging/media/sunxi/sun6i-isp/TODO.txt
-f:drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.c
-f:drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.h
-f:drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_capture.c
-f:drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_capture.h
-f:drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_params.c
-f:drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_params.h
-f:drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_proc.c
-f:drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_proc.h
-f:drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_reg.h
-f:drivers/staging/media/sunxi/sun6i-isp/uapi/sun6i-isp-config.h
-f:drivers/staging/media/tegra-video/Kconfig
-f:drivers/staging/media/tegra-video/Makefile
-f:drivers/staging/media/tegra-video/TODO
-f:drivers/staging/media/tegra-video/csi.c
-f:drivers/staging/media/tegra-video/csi.h
-f:drivers/staging/media/tegra-video/tegra20.c
-f:drivers/staging/media/tegra-video/tegra210.c
-f:drivers/staging/media/tegra-video/vi.c
-f:drivers/staging/media/tegra-video/vi.h
-f:drivers/staging/media/tegra-video/video.c
-f:drivers/staging/media/tegra-video/video.h
-f:drivers/staging/media/tegra-video/vip.c
-f:drivers/staging/media/tegra-video/vip.h
-f:drivers/staging/most/Documentation/ABI/sysfs-class-most.txt
-f:drivers/staging/most/Documentation/driver_usage.txt
-f:drivers/staging/most/Kconfig
-f:drivers/staging/most/Makefile
-f:drivers/staging/most/TODO
-f:drivers/staging/most/dim2/Kconfig
-f:drivers/staging/most/dim2/Makefile
-f:drivers/staging/most/dim2/dim2.c
-f:drivers/staging/most/dim2/errors.h
-f:drivers/staging/most/dim2/hal.c
-f:drivers/staging/most/dim2/hal.h
-f:drivers/staging/most/dim2/reg.h
-f:drivers/staging/most/dim2/sysfs.h
-f:drivers/staging/most/i2c/Kconfig
-f:drivers/staging/most/i2c/Makefile
-f:drivers/staging/most/i2c/i2c.c
-f:drivers/staging/most/net/Kconfig
-f:drivers/staging/most/net/Makefile
-f:drivers/staging/most/net/net.c
-f:drivers/staging/most/video/Kconfig
-f:drivers/staging/most/video/Makefile
-f:drivers/staging/most/video/video.c
-f:drivers/staging/nvec/Kconfig
-f:drivers/staging/nvec/Makefile
-f:drivers/staging/nvec/README
-f:drivers/staging/nvec/TODO
-f:drivers/staging/nvec/nvec-keytable.h
-f:drivers/staging/nvec/nvec.c
-f:drivers/staging/nvec/nvec.h
-f:drivers/staging/nvec/nvec_kbd.c
-f:drivers/staging/nvec/nvec_paz00.c
-f:drivers/staging/nvec/nvec_power.c
-f:drivers/staging/nvec/nvec_ps2.c
-f:drivers/staging/octeon/Kconfig
-f:drivers/staging/octeon/Makefile
-f:drivers/staging/octeon/TODO
-f:drivers/staging/octeon/ethernet-defines.h
-f:drivers/staging/octeon/ethernet-mdio.c
-f:drivers/staging/octeon/ethernet-mdio.h
-f:drivers/staging/octeon/ethernet-mem.c
-f:drivers/staging/octeon/ethernet-mem.h
-f:drivers/staging/octeon/ethernet-rgmii.c
-f:drivers/staging/octeon/ethernet-rx.c
-f:drivers/staging/octeon/ethernet-rx.h
-f:drivers/staging/octeon/ethernet-sgmii.c
-f:drivers/staging/octeon/ethernet-spi.c
-f:drivers/staging/octeon/ethernet-tx.c
-f:drivers/staging/octeon/ethernet-tx.h
-f:drivers/staging/octeon/ethernet-util.h
-f:drivers/staging/octeon/ethernet.c
-f:drivers/staging/octeon/octeon-ethernet.h
-f:drivers/staging/octeon/octeon-stubs.h
-f:drivers/staging/rtl8723bs/Kconfig
-f:drivers/staging/rtl8723bs/Makefile
-f:drivers/staging/rtl8723bs/TODO
-f:drivers/staging/rtl8723bs/core/rtw_ap.c
-f:drivers/staging/rtl8723bs/core/rtw_btcoex.c
-f:drivers/staging/rtl8723bs/core/rtw_cmd.c
-f:drivers/staging/rtl8723bs/core/rtw_efuse.c
-f:drivers/staging/rtl8723bs/core/rtw_ieee80211.c
-f:drivers/staging/rtl8723bs/core/rtw_io.c
-f:drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
-f:drivers/staging/rtl8723bs/core/rtw_mlme.c
-f:drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
-f:drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
-f:drivers/staging/rtl8723bs/core/rtw_recv.c
-f:drivers/staging/rtl8723bs/core/rtw_security.c
-f:drivers/staging/rtl8723bs/core/rtw_sta_mgt.c
-f:drivers/staging/rtl8723bs/core/rtw_wlan_util.c
-f:drivers/staging/rtl8723bs/core/rtw_xmit.c
-f:drivers/staging/rtl8723bs/hal/Hal8723BReg.h
-f:drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c
-f:drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.h
-f:drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c
-f:drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.h
-f:drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h
-f:drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.c
-f:drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.h
-f:drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.c
-f:drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.h
-f:drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.c
-f:drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.h
-f:drivers/staging/rtl8723bs/hal/HalPhyRf.c
-f:drivers/staging/rtl8723bs/hal/HalPhyRf.h
-f:drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c
-f:drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.h
-f:drivers/staging/rtl8723bs/hal/HalPwrSeqCmd.c
-f:drivers/staging/rtl8723bs/hal/Mp_Precomp.h
-f:drivers/staging/rtl8723bs/hal/hal_btcoex.c
-f:drivers/staging/rtl8723bs/hal/hal_com.c
-f:drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
-f:drivers/staging/rtl8723bs/hal/hal_intf.c
-f:drivers/staging/rtl8723bs/hal/hal_pwr_seq.c
-f:drivers/staging/rtl8723bs/hal/hal_sdio.c
-f:drivers/staging/rtl8723bs/hal/odm.c
-f:drivers/staging/rtl8723bs/hal/odm.h
-f:drivers/staging/rtl8723bs/hal/odm_CfoTracking.c
-f:drivers/staging/rtl8723bs/hal/odm_CfoTracking.h
-f:drivers/staging/rtl8723bs/hal/odm_DIG.c
-f:drivers/staging/rtl8723bs/hal/odm_DIG.h
-f:drivers/staging/rtl8723bs/hal/odm_DynamicBBPowerSaving.c
-f:drivers/staging/rtl8723bs/hal/odm_DynamicBBPowerSaving.h
-f:drivers/staging/rtl8723bs/hal/odm_DynamicTxPower.c
-f:drivers/staging/rtl8723bs/hal/odm_DynamicTxPower.h
-f:drivers/staging/rtl8723bs/hal/odm_EdcaTurboCheck.c
-f:drivers/staging/rtl8723bs/hal/odm_EdcaTurboCheck.h
-f:drivers/staging/rtl8723bs/hal/odm_HWConfig.c
-f:drivers/staging/rtl8723bs/hal/odm_HWConfig.h
-f:drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.c
-f:drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.h
-f:drivers/staging/rtl8723bs/hal/odm_RegDefine11N.h
-f:drivers/staging/rtl8723bs/hal/odm_interface.h
-f:drivers/staging/rtl8723bs/hal/odm_precomp.h
-f:drivers/staging/rtl8723bs/hal/odm_reg.h
-f:drivers/staging/rtl8723bs/hal/odm_types.h
-f:drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c
-f:drivers/staging/rtl8723bs/hal/rtl8723b_dm.c
-f:drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
-f:drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c
-f:drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c
-f:drivers/staging/rtl8723bs/hal/rtl8723b_rxdesc.c
-f:drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c
-f:drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
-f:drivers/staging/rtl8723bs/hal/sdio_halinit.c
-f:drivers/staging/rtl8723bs/hal/sdio_ops.c
-f:drivers/staging/rtl8723bs/include/Hal8192CPhyReg.h
-f:drivers/staging/rtl8723bs/include/HalPwrSeqCmd.h
-f:drivers/staging/rtl8723bs/include/HalVerDef.h
-f:drivers/staging/rtl8723bs/include/basic_types.h
-f:drivers/staging/rtl8723bs/include/cmd_osdep.h
-f:drivers/staging/rtl8723bs/include/drv_types.h
-f:drivers/staging/rtl8723bs/include/drv_types_sdio.h
-f:drivers/staging/rtl8723bs/include/hal_btcoex.h
-f:drivers/staging/rtl8723bs/include/hal_com.h
-f:drivers/staging/rtl8723bs/include/hal_com_h2c.h
-f:drivers/staging/rtl8723bs/include/hal_com_phycfg.h
-f:drivers/staging/rtl8723bs/include/hal_com_reg.h
-f:drivers/staging/rtl8723bs/include/hal_data.h
-f:drivers/staging/rtl8723bs/include/hal_intf.h
-f:drivers/staging/rtl8723bs/include/hal_pg.h
-f:drivers/staging/rtl8723bs/include/hal_phy.h
-f:drivers/staging/rtl8723bs/include/hal_phy_cfg.h
-f:drivers/staging/rtl8723bs/include/hal_phy_reg.h
-f:drivers/staging/rtl8723bs/include/hal_pwr_seq.h
-f:drivers/staging/rtl8723bs/include/hal_sdio.h
-f:drivers/staging/rtl8723bs/include/ieee80211.h
-f:drivers/staging/rtl8723bs/include/ioctl_cfg80211.h
-f:drivers/staging/rtl8723bs/include/mlme_osdep.h
-f:drivers/staging/rtl8723bs/include/osdep_intf.h
-f:drivers/staging/rtl8723bs/include/osdep_service.h
-f:drivers/staging/rtl8723bs/include/osdep_service_linux.h
-f:drivers/staging/rtl8723bs/include/recv_osdep.h
-f:drivers/staging/rtl8723bs/include/rtl8192c_recv.h
-f:drivers/staging/rtl8723bs/include/rtl8723b_cmd.h
-f:drivers/staging/rtl8723bs/include/rtl8723b_dm.h
-f:drivers/staging/rtl8723bs/include/rtl8723b_hal.h
-f:drivers/staging/rtl8723bs/include/rtl8723b_recv.h
-f:drivers/staging/rtl8723bs/include/rtl8723b_rf.h
-f:drivers/staging/rtl8723bs/include/rtl8723b_spec.h
-f:drivers/staging/rtl8723bs/include/rtl8723b_xmit.h
-f:drivers/staging/rtl8723bs/include/rtw_ap.h
-f:drivers/staging/rtl8723bs/include/rtw_btcoex.h
-f:drivers/staging/rtl8723bs/include/rtw_byteorder.h
-f:drivers/staging/rtl8723bs/include/rtw_cmd.h
-f:drivers/staging/rtl8723bs/include/rtw_eeprom.h
-f:drivers/staging/rtl8723bs/include/rtw_efuse.h
-f:drivers/staging/rtl8723bs/include/rtw_event.h
-f:drivers/staging/rtl8723bs/include/rtw_ht.h
-f:drivers/staging/rtl8723bs/include/rtw_io.h
-f:drivers/staging/rtl8723bs/include/rtw_ioctl_set.h
-f:drivers/staging/rtl8723bs/include/rtw_mlme.h
-f:drivers/staging/rtl8723bs/include/rtw_mlme_ext.h
-f:drivers/staging/rtl8723bs/include/rtw_pwrctrl.h
-f:drivers/staging/rtl8723bs/include/rtw_qos.h
-f:drivers/staging/rtl8723bs/include/rtw_recv.h
-f:drivers/staging/rtl8723bs/include/rtw_rf.h
-f:drivers/staging/rtl8723bs/include/rtw_security.h
-f:drivers/staging/rtl8723bs/include/rtw_version.h
-f:drivers/staging/rtl8723bs/include/rtw_wifi_regd.h
-f:drivers/staging/rtl8723bs/include/rtw_xmit.h
-f:drivers/staging/rtl8723bs/include/sdio_hal.h
-f:drivers/staging/rtl8723bs/include/sdio_ops.h
-f:drivers/staging/rtl8723bs/include/sdio_ops_linux.h
-f:drivers/staging/rtl8723bs/include/sta_info.h
-f:drivers/staging/rtl8723bs/include/wifi.h
-f:drivers/staging/rtl8723bs/include/wlan_bssdef.h
-f:drivers/staging/rtl8723bs/include/xmit_osdep.h
-f:drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
-f:drivers/staging/rtl8723bs/os_dep/mlme_linux.c
-f:drivers/staging/rtl8723bs/os_dep/os_intfs.c
-f:drivers/staging/rtl8723bs/os_dep/osdep_service.c
-f:drivers/staging/rtl8723bs/os_dep/recv_linux.c
-f:drivers/staging/rtl8723bs/os_dep/sdio_intf.c
-f:drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c
-f:drivers/staging/rtl8723bs/os_dep/wifi_regd.c
-f:drivers/staging/rtl8723bs/os_dep/xmit_linux.c
-f:drivers/staging/sm750fb/Kconfig
-f:drivers/staging/sm750fb/Makefile
-f:drivers/staging/sm750fb/TODO
-f:drivers/staging/sm750fb/ddk750.h
-f:drivers/staging/sm750fb/ddk750_chip.c
-f:drivers/staging/sm750fb/ddk750_chip.h
-f:drivers/staging/sm750fb/ddk750_display.c
-f:drivers/staging/sm750fb/ddk750_display.h
-f:drivers/staging/sm750fb/ddk750_mode.c
-f:drivers/staging/sm750fb/ddk750_mode.h
-f:drivers/staging/sm750fb/ddk750_power.c
-f:drivers/staging/sm750fb/ddk750_power.h
-f:drivers/staging/sm750fb/ddk750_reg.h
-f:drivers/staging/sm750fb/ddk750_swi2c.c
-f:drivers/staging/sm750fb/ddk750_swi2c.h
-f:drivers/staging/sm750fb/readme
-f:drivers/staging/sm750fb/sm750.c
-f:drivers/staging/sm750fb/sm750.h
-f:drivers/staging/sm750fb/sm750_accel.c
-f:drivers/staging/sm750fb/sm750_accel.h
-f:drivers/staging/sm750fb/sm750_cursor.c
-f:drivers/staging/sm750fb/sm750_cursor.h
-f:drivers/staging/sm750fb/sm750_hw.c
-f:drivers/staging/vc04_services/Kconfig
-f:drivers/staging/vc04_services/Makefile
-f:drivers/staging/vc04_services/bcm2835-audio/Kconfig
-f:drivers/staging/vc04_services/bcm2835-audio/Makefile
-f:drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
-f:drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
-f:drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
-f:drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
-f:drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
-f:drivers/staging/vc04_services/bcm2835-audio/vc_vchi_audioserv_defs.h
-f:drivers/staging/vc04_services/bcm2835-camera/Kconfig
-f:drivers/staging/vc04_services/bcm2835-camera/Makefile
-f:drivers/staging/vc04_services/bcm2835-camera/TODO
-f:drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
-f:drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h
-f:drivers/staging/vc04_services/bcm2835-camera/controls.c
-f:drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h
-f:drivers/staging/vc04_services/interface/TESTING
-f:drivers/staging/vc04_services/interface/TODO
-f:drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-f:drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h
-f:drivers/staging/vc04_services/interface/vchiq_arm/vchiq_bus.c
-f:drivers/staging/vc04_services/interface/vchiq_arm/vchiq_bus.h
-f:drivers/staging/vc04_services/interface/vchiq_arm/vchiq_cfg.h
-f:drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
-f:drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
-f:drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c
-f:drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.h
-f:drivers/staging/vc04_services/interface/vchiq_arm/vchiq_dev.c
-f:drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h
-f:drivers/staging/vc04_services/vchiq-mmal/Kconfig
-f:drivers/staging/vc04_services/vchiq-mmal/Makefile
-f:drivers/staging/vc04_services/vchiq-mmal/mmal-common.h
-f:drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h
-f:drivers/staging/vc04_services/vchiq-mmal/mmal-msg-common.h
-f:drivers/staging/vc04_services/vchiq-mmal/mmal-msg-format.h
-f:drivers/staging/vc04_services/vchiq-mmal/mmal-msg-port.h
-f:drivers/staging/vc04_services/vchiq-mmal/mmal-msg.h
-f:drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
-f:drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-f:drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h
-f:drivers/staging/vme_user/Kconfig
-f:drivers/staging/vme_user/Makefile
-f:drivers/staging/vme_user/vme.c
-f:drivers/staging/vme_user/vme.h
-f:drivers/staging/vme_user/vme_bridge.h
-f:drivers/staging/vme_user/vme_fake.c
-f:drivers/staging/vme_user/vme_tsi148.c
-f:drivers/staging/vme_user/vme_tsi148.h
-f:drivers/staging/vme_user/vme_user.c
-f:drivers/staging/vme_user/vme_user.h
-f:drivers/target/Kconfig
-f:drivers/target/Makefile
-f:drivers/target/iscsi/Kconfig
-f:drivers/target/iscsi/Makefile
-f:drivers/target/iscsi/cxgbit/Kconfig
-f:drivers/target/iscsi/cxgbit/Makefile
-f:drivers/target/iscsi/cxgbit/cxgbit.h
-f:drivers/target/iscsi/cxgbit/cxgbit_cm.c
-f:drivers/target/iscsi/cxgbit/cxgbit_ddp.c
-f:drivers/target/iscsi/cxgbit/cxgbit_lro.h
-f:drivers/target/iscsi/cxgbit/cxgbit_main.c
-f:drivers/target/iscsi/cxgbit/cxgbit_target.c
-f:drivers/target/iscsi/iscsi_target.c
-f:drivers/target/iscsi/iscsi_target.h
-f:drivers/target/iscsi/iscsi_target_auth.c
-f:drivers/target/iscsi/iscsi_target_auth.h
-f:drivers/target/iscsi/iscsi_target_configfs.c
-f:drivers/target/iscsi/iscsi_target_datain_values.c
-f:drivers/target/iscsi/iscsi_target_datain_values.h
-f:drivers/target/iscsi/iscsi_target_device.c
-f:drivers/target/iscsi/iscsi_target_device.h
-f:drivers/target/iscsi/iscsi_target_erl0.c
-f:drivers/target/iscsi/iscsi_target_erl0.h
-f:drivers/target/iscsi/iscsi_target_erl1.c
-f:drivers/target/iscsi/iscsi_target_erl1.h
-f:drivers/target/iscsi/iscsi_target_erl2.c
-f:drivers/target/iscsi/iscsi_target_erl2.h
-f:drivers/target/iscsi/iscsi_target_login.c
-f:drivers/target/iscsi/iscsi_target_login.h
-f:drivers/target/iscsi/iscsi_target_nego.c
-f:drivers/target/iscsi/iscsi_target_nego.h
-f:drivers/target/iscsi/iscsi_target_nodeattrib.c
-f:drivers/target/iscsi/iscsi_target_nodeattrib.h
-f:drivers/target/iscsi/iscsi_target_parameters.c
-f:drivers/target/iscsi/iscsi_target_parameters.h
-f:drivers/target/iscsi/iscsi_target_seq_pdu_list.c
-f:drivers/target/iscsi/iscsi_target_seq_pdu_list.h
-f:drivers/target/iscsi/iscsi_target_stat.c
-f:drivers/target/iscsi/iscsi_target_tmr.c
-f:drivers/target/iscsi/iscsi_target_tmr.h
-f:drivers/target/iscsi/iscsi_target_tpg.c
-f:drivers/target/iscsi/iscsi_target_tpg.h
-f:drivers/target/iscsi/iscsi_target_transport.c
-f:drivers/target/iscsi/iscsi_target_util.c
-f:drivers/target/iscsi/iscsi_target_util.h
-f:drivers/target/loopback/Kconfig
-f:drivers/target/loopback/Makefile
-f:drivers/target/loopback/tcm_loop.c
-f:drivers/target/loopback/tcm_loop.h
-f:drivers/target/sbp/Kconfig
-f:drivers/target/sbp/Makefile
-f:drivers/target/sbp/sbp_target.c
-f:drivers/target/sbp/sbp_target.h
-f:drivers/target/target_core_alua.c
-f:drivers/target/target_core_alua.h
-f:drivers/target/target_core_configfs.c
-f:drivers/target/target_core_device.c
-f:drivers/target/target_core_fabric_configfs.c
-f:drivers/target/target_core_fabric_lib.c
-f:drivers/target/target_core_file.c
-f:drivers/target/target_core_file.h
-f:drivers/target/target_core_hba.c
-f:drivers/target/target_core_iblock.c
-f:drivers/target/target_core_iblock.h
-f:drivers/target/target_core_internal.h
-f:drivers/target/target_core_pr.c
-f:drivers/target/target_core_pr.h
-f:drivers/target/target_core_pscsi.c
-f:drivers/target/target_core_pscsi.h
-f:drivers/target/target_core_rd.c
-f:drivers/target/target_core_rd.h
-f:drivers/target/target_core_sbc.c
-f:drivers/target/target_core_spc.c
-f:drivers/target/target_core_stat.c
-f:drivers/target/target_core_tmr.c
-f:drivers/target/target_core_tpg.c
-f:drivers/target/target_core_transport.c
-f:drivers/target/target_core_ua.c
-f:drivers/target/target_core_ua.h
-f:drivers/target/target_core_user.c
-f:drivers/target/target_core_xcopy.c
-f:drivers/target/target_core_xcopy.h
-f:drivers/target/tcm_fc/Kconfig
-f:drivers/target/tcm_fc/Makefile
-f:drivers/target/tcm_fc/tcm_fc.h
-f:drivers/target/tcm_fc/tfc_cmd.c
-f:drivers/target/tcm_fc/tfc_conf.c
-f:drivers/target/tcm_fc/tfc_io.c
-f:drivers/target/tcm_fc/tfc_sess.c
-f:drivers/target/tcm_remote/Kconfig
-f:drivers/target/tcm_remote/Makefile
-f:drivers/target/tcm_remote/tcm_remote.c
-f:drivers/target/tcm_remote/tcm_remote.h
-f:drivers/tc/Makefile
-f:drivers/tc/tc-driver.c
-f:drivers/tc/tc.c
-f:drivers/tee/Kconfig
-f:drivers/tee/Makefile
-f:drivers/tee/amdtee/Kconfig
-f:drivers/tee/amdtee/Makefile
-f:drivers/tee/amdtee/amdtee_if.h
-f:drivers/tee/amdtee/amdtee_private.h
-f:drivers/tee/amdtee/call.c
-f:drivers/tee/amdtee/core.c
-f:drivers/tee/amdtee/shm_pool.c
-f:drivers/tee/optee/Kconfig
-f:drivers/tee/optee/Makefile
-f:drivers/tee/optee/call.c
-f:drivers/tee/optee/core.c
-f:drivers/tee/optee/device.c
-f:drivers/tee/optee/ffa_abi.c
-f:drivers/tee/optee/notif.c
-f:drivers/tee/optee/optee_ffa.h
-f:drivers/tee/optee/optee_msg.h
-f:drivers/tee/optee/optee_private.h
-f:drivers/tee/optee/optee_rpc_cmd.h
-f:drivers/tee/optee/optee_smc.h
-f:drivers/tee/optee/optee_trace.h
-f:drivers/tee/optee/rpc.c
-f:drivers/tee/optee/smc_abi.c
-f:drivers/tee/optee/supp.c
-f:drivers/tee/tee_core.c
-f:drivers/tee/tee_private.h
-f:drivers/tee/tee_shm.c
-f:drivers/tee/tee_shm_pool.c
-f:drivers/tee/tstee/Kconfig
-f:drivers/tee/tstee/Makefile
-f:drivers/tee/tstee/core.c
-f:drivers/tee/tstee/tstee_private.h
-f:drivers/thermal/Kconfig
-f:drivers/thermal/Makefile
-f:drivers/thermal/airoha_thermal.c
-f:drivers/thermal/amlogic_thermal.c
-f:drivers/thermal/armada_thermal.c
-f:drivers/thermal/broadcom/Kconfig
-f:drivers/thermal/broadcom/Makefile
-f:drivers/thermal/broadcom/bcm2711_thermal.c
-f:drivers/thermal/broadcom/bcm2835_thermal.c
-f:drivers/thermal/broadcom/brcmstb_thermal.c
-f:drivers/thermal/broadcom/ns-thermal.c
-f:drivers/thermal/broadcom/sr-thermal.c
-f:drivers/thermal/cpufreq_cooling.c
-f:drivers/thermal/cpuidle_cooling.c
-f:drivers/thermal/da9062-thermal.c
-f:drivers/thermal/db8500_thermal.c
-f:drivers/thermal/devfreq_cooling.c
-f:drivers/thermal/dove_thermal.c
-f:drivers/thermal/gov_bang_bang.c
-f:drivers/thermal/gov_fair_share.c
-f:drivers/thermal/gov_power_allocator.c
-f:drivers/thermal/gov_step_wise.c
-f:drivers/thermal/gov_user_space.c
-f:drivers/thermal/hisi_thermal.c
-f:drivers/thermal/imx8mm_thermal.c
-f:drivers/thermal/imx_sc_thermal.c
-f:drivers/thermal/imx_thermal.c
-f:drivers/thermal/intel/Kconfig
-f:drivers/thermal/intel/Makefile
-f:drivers/thermal/intel/int340x_thermal/Kconfig
-f:drivers/thermal/intel/int340x_thermal/Makefile
-f:drivers/thermal/intel/int340x_thermal/acpi_thermal_rel.c
-f:drivers/thermal/intel/int340x_thermal/acpi_thermal_rel.h
-f:drivers/thermal/intel/int340x_thermal/int3400_thermal.c
-f:drivers/thermal/intel/int340x_thermal/int3401_thermal.c
-f:drivers/thermal/intel/int340x_thermal/int3402_thermal.c
-f:drivers/thermal/intel/int340x_thermal/int3403_thermal.c
-f:drivers/thermal/intel/int340x_thermal/int3406_thermal.c
-f:drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c
-f:drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.h
-f:drivers/thermal/intel/int340x_thermal/platform_temperature_control.c
-f:drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
-f:drivers/thermal/intel/int340x_thermal/processor_thermal_device.h
-f:drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c
-f:drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci_legacy.c
-f:drivers/thermal/intel/int340x_thermal/processor_thermal_mbox.c
-f:drivers/thermal/intel/int340x_thermal/processor_thermal_power_floor.c
-f:drivers/thermal/intel/int340x_thermal/processor_thermal_rapl.c
-f:drivers/thermal/intel/int340x_thermal/processor_thermal_rfim.c
-f:drivers/thermal/intel/int340x_thermal/processor_thermal_wt_hint.c
-f:drivers/thermal/intel/int340x_thermal/processor_thermal_wt_req.c
-f:drivers/thermal/intel/intel_bxt_pmic_thermal.c
-f:drivers/thermal/intel/intel_hfi.c
-f:drivers/thermal/intel/intel_hfi.h
-f:drivers/thermal/intel/intel_pch_thermal.c
-f:drivers/thermal/intel/intel_powerclamp.c
-f:drivers/thermal/intel/intel_quark_dts_thermal.c
-f:drivers/thermal/intel/intel_soc_dts_iosf.c
-f:drivers/thermal/intel/intel_soc_dts_iosf.h
-f:drivers/thermal/intel/intel_soc_dts_thermal.c
-f:drivers/thermal/intel/intel_tcc.c
-f:drivers/thermal/intel/intel_tcc_cooling.c
-f:drivers/thermal/intel/therm_throt.c
-f:drivers/thermal/intel/thermal_interrupt.h
-f:drivers/thermal/intel/x86_pkg_temp_thermal.c
-f:drivers/thermal/k3_bandgap.c
-f:drivers/thermal/k3_j72xx_bandgap.c
-f:drivers/thermal/khadas_mcu_fan.c
-f:drivers/thermal/kirkwood_thermal.c
-f:drivers/thermal/loongson2_thermal.c
-f:drivers/thermal/max77620_thermal.c
-f:drivers/thermal/mediatek/Kconfig
-f:drivers/thermal/mediatek/Makefile
-f:drivers/thermal/mediatek/auxadc_thermal.c
-f:drivers/thermal/mediatek/lvts_thermal.c
-f:drivers/thermal/pcie_cooling.c
-f:drivers/thermal/qcom/Kconfig
-f:drivers/thermal/qcom/Makefile
-f:drivers/thermal/qcom/lmh.c
-f:drivers/thermal/qcom/qcom-spmi-adc-tm5.c
-f:drivers/thermal/qcom/qcom-spmi-temp-alarm.c
-f:drivers/thermal/qcom/tsens-8960.c
-f:drivers/thermal/qcom/tsens-v0_1.c
-f:drivers/thermal/qcom/tsens-v1.c
-f:drivers/thermal/qcom/tsens-v2.c
-f:drivers/thermal/qcom/tsens.c
-f:drivers/thermal/qcom/tsens.h
-f:drivers/thermal/qoriq_thermal.c
-f:drivers/thermal/renesas/Kconfig
-f:drivers/thermal/renesas/Makefile
-f:drivers/thermal/renesas/rcar_gen3_thermal.c
-f:drivers/thermal/renesas/rcar_thermal.c
-f:drivers/thermal/renesas/rzg2l_thermal.c
-f:drivers/thermal/rockchip_thermal.c
-f:drivers/thermal/samsung/Kconfig
-f:drivers/thermal/samsung/Makefile
-f:drivers/thermal/samsung/exynos_tmu.c
-f:drivers/thermal/spear_thermal.c
-f:drivers/thermal/sprd_thermal.c
-f:drivers/thermal/st/Kconfig
-f:drivers/thermal/st/Makefile
-f:drivers/thermal/st/st_thermal.c
-f:drivers/thermal/st/st_thermal.h
-f:drivers/thermal/st/st_thermal_memmap.c
-f:drivers/thermal/st/stm_thermal.c
-f:drivers/thermal/sun8i_thermal.c
-f:drivers/thermal/tegra/Kconfig
-f:drivers/thermal/tegra/Makefile
-f:drivers/thermal/tegra/soctherm-fuse.c
-f:drivers/thermal/tegra/soctherm.c
-f:drivers/thermal/tegra/soctherm.h
-f:drivers/thermal/tegra/tegra-bpmp-thermal.c
-f:drivers/thermal/tegra/tegra124-soctherm.c
-f:drivers/thermal/tegra/tegra132-soctherm.c
-f:drivers/thermal/tegra/tegra210-soctherm.c
-f:drivers/thermal/tegra/tegra30-tsensor.c
-f:drivers/thermal/testing/Makefile
-f:drivers/thermal/testing/command.c
-f:drivers/thermal/testing/thermal_testing.h
-f:drivers/thermal/testing/zone.c
-f:drivers/thermal/thermal-generic-adc.c
-f:drivers/thermal/thermal_core.c
-f:drivers/thermal/thermal_core.h
-f:drivers/thermal/thermal_debugfs.c
-f:drivers/thermal/thermal_debugfs.h
-f:drivers/thermal/thermal_helpers.c
-f:drivers/thermal/thermal_hwmon.c
-f:drivers/thermal/thermal_hwmon.h
-f:drivers/thermal/thermal_mmio.c
-f:drivers/thermal/thermal_netlink.c
-f:drivers/thermal/thermal_netlink.h
-f:drivers/thermal/thermal_of.c
-f:drivers/thermal/thermal_sysfs.c
-f:drivers/thermal/thermal_thresholds.c
-f:drivers/thermal/thermal_thresholds.h
-f:drivers/thermal/thermal_trace.h
-f:drivers/thermal/thermal_trace_ipa.h
-f:drivers/thermal/thermal_trip.c
-f:drivers/thermal/ti-soc-thermal/Kconfig
-f:drivers/thermal/ti-soc-thermal/Makefile
-f:drivers/thermal/ti-soc-thermal/TODO
-f:drivers/thermal/ti-soc-thermal/dra752-bandgap.h
-f:drivers/thermal/ti-soc-thermal/dra752-thermal-data.c
-f:drivers/thermal/ti-soc-thermal/omap3-thermal-data.c
-f:drivers/thermal/ti-soc-thermal/omap4-thermal-data.c
-f:drivers/thermal/ti-soc-thermal/omap4xxx-bandgap.h
-f:drivers/thermal/ti-soc-thermal/omap5-thermal-data.c
-f:drivers/thermal/ti-soc-thermal/omap5xxx-bandgap.h
-f:drivers/thermal/ti-soc-thermal/ti-bandgap.c
-f:drivers/thermal/ti-soc-thermal/ti-bandgap.h
-f:drivers/thermal/ti-soc-thermal/ti-thermal-common.c
-f:drivers/thermal/ti-soc-thermal/ti-thermal.h
-f:drivers/thermal/uniphier_thermal.c
-f:drivers/thunderbolt/Kconfig
-f:drivers/thunderbolt/Makefile
-f:drivers/thunderbolt/acpi.c
-f:drivers/thunderbolt/cap.c
-f:drivers/thunderbolt/clx.c
-f:drivers/thunderbolt/ctl.c
-f:drivers/thunderbolt/ctl.h
-f:drivers/thunderbolt/debugfs.c
-f:drivers/thunderbolt/dma_port.c
-f:drivers/thunderbolt/dma_port.h
-f:drivers/thunderbolt/dma_test.c
-f:drivers/thunderbolt/domain.c
-f:drivers/thunderbolt/eeprom.c
-f:drivers/thunderbolt/icm.c
-f:drivers/thunderbolt/lc.c
-f:drivers/thunderbolt/nhi.c
-f:drivers/thunderbolt/nhi.h
-f:drivers/thunderbolt/nhi_ops.c
-f:drivers/thunderbolt/nhi_regs.h
-f:drivers/thunderbolt/nvm.c
-f:drivers/thunderbolt/path.c
-f:drivers/thunderbolt/property.c
-f:drivers/thunderbolt/quirks.c
-f:drivers/thunderbolt/retimer.c
-f:drivers/thunderbolt/sb_regs.h
-f:drivers/thunderbolt/switch.c
-f:drivers/thunderbolt/tb.c
-f:drivers/thunderbolt/tb.h
-f:drivers/thunderbolt/tb_msgs.h
-f:drivers/thunderbolt/tb_regs.h
-f:drivers/thunderbolt/test.c
-f:drivers/thunderbolt/tmu.c
-f:drivers/thunderbolt/trace.h
-f:drivers/thunderbolt/tunnel.c
-f:drivers/thunderbolt/tunnel.h
-f:drivers/thunderbolt/usb4.c
-f:drivers/thunderbolt/usb4_port.c
-f:drivers/thunderbolt/xdomain.c
-f:drivers/tty/Kconfig
-f:drivers/tty/Makefile
-f:drivers/tty/amiserial.c
-f:drivers/tty/ehv_bytechan.c
-f:drivers/tty/goldfish.c
-f:drivers/tty/hvc/Kconfig
-f:drivers/tty/hvc/Makefile
-f:drivers/tty/hvc/hvc_console.c
-f:drivers/tty/hvc/hvc_console.h
-f:drivers/tty/hvc/hvc_dcc.c
-f:drivers/tty/hvc/hvc_irq.c
-f:drivers/tty/hvc/hvc_iucv.c
-f:drivers/tty/hvc/hvc_opal.c
-f:drivers/tty/hvc/hvc_riscv_sbi.c
-f:drivers/tty/hvc/hvc_rtas.c
-f:drivers/tty/hvc/hvc_udbg.c
-f:drivers/tty/hvc/hvc_vio.c
-f:drivers/tty/hvc/hvc_xen.c
-f:drivers/tty/hvc/hvcs.c
-f:drivers/tty/hvc/hvsi.c
-f:drivers/tty/hvc/hvsi_lib.c
-f:drivers/tty/ipwireless/Makefile
-f:drivers/tty/ipwireless/hardware.c
-f:drivers/tty/ipwireless/hardware.h
-f:drivers/tty/ipwireless/main.c
-f:drivers/tty/ipwireless/main.h
-f:drivers/tty/ipwireless/network.c
-f:drivers/tty/ipwireless/network.h
-f:drivers/tty/ipwireless/setup_protocol.h
-f:drivers/tty/ipwireless/tty.c
-f:drivers/tty/ipwireless/tty.h
-f:drivers/tty/mips_ejtag_fdc.c
-f:drivers/tty/moxa.c
-f:drivers/tty/mxser.c
-f:drivers/tty/n_gsm.c
-f:drivers/tty/n_hdlc.c
-f:drivers/tty/n_null.c
-f:drivers/tty/n_tty.c
-f:drivers/tty/nozomi.c
-f:drivers/tty/pty.c
-f:drivers/tty/rpmsg_tty.c
-f:drivers/tty/serdev/Kconfig
-f:drivers/tty/serdev/Makefile
-f:drivers/tty/serdev/core.c
-f:drivers/tty/serdev/serdev-ttyport.c
-f:drivers/tty/serial/21285.c
-f:drivers/tty/serial/8250/8250.h
-f:drivers/tty/serial/8250/8250_accent.c
-f:drivers/tty/serial/8250/8250_acorn.c
-f:drivers/tty/serial/8250/8250_aspeed_vuart.c
-f:drivers/tty/serial/8250/8250_bcm2835aux.c
-f:drivers/tty/serial/8250/8250_bcm7271.c
-f:drivers/tty/serial/8250/8250_boca.c
-f:drivers/tty/serial/8250/8250_ce4100.c
-f:drivers/tty/serial/8250/8250_core.c
-f:drivers/tty/serial/8250/8250_dfl.c
-f:drivers/tty/serial/8250/8250_dma.c
-f:drivers/tty/serial/8250/8250_dw.c
-f:drivers/tty/serial/8250/8250_dwlib.c
-f:drivers/tty/serial/8250/8250_dwlib.h
-f:drivers/tty/serial/8250/8250_early.c
-f:drivers/tty/serial/8250/8250_em.c
-f:drivers/tty/serial/8250/8250_exar.c
-f:drivers/tty/serial/8250/8250_exar_st16c554.c
-f:drivers/tty/serial/8250/8250_fintek.c
-f:drivers/tty/serial/8250/8250_fourport.c
-f:drivers/tty/serial/8250/8250_fsl.c
-f:drivers/tty/serial/8250/8250_hp300.c
-f:drivers/tty/serial/8250/8250_hub6.c
-f:drivers/tty/serial/8250/8250_ingenic.c
-f:drivers/tty/serial/8250/8250_ioc3.c
-f:drivers/tty/serial/8250/8250_lpc18xx.c
-f:drivers/tty/serial/8250/8250_lpss.c
-f:drivers/tty/serial/8250/8250_men_mcb.c
-f:drivers/tty/serial/8250/8250_mid.c
-f:drivers/tty/serial/8250/8250_mtk.c
-f:drivers/tty/serial/8250/8250_ni.c
-f:drivers/tty/serial/8250/8250_of.c
-f:drivers/tty/serial/8250/8250_omap.c
-f:drivers/tty/serial/8250/8250_parisc.c
-f:drivers/tty/serial/8250/8250_pci.c
-f:drivers/tty/serial/8250/8250_pci1xxxx.c
-f:drivers/tty/serial/8250/8250_pcilib.c
-f:drivers/tty/serial/8250/8250_pcilib.h
-f:drivers/tty/serial/8250/8250_pericom.c
-f:drivers/tty/serial/8250/8250_platform.c
-f:drivers/tty/serial/8250/8250_pnp.c
-f:drivers/tty/serial/8250/8250_port.c
-f:drivers/tty/serial/8250/8250_pxa.c
-f:drivers/tty/serial/8250/8250_rsa.c
-f:drivers/tty/serial/8250/8250_rt288x.c
-f:drivers/tty/serial/8250/8250_tegra.c
-f:drivers/tty/serial/8250/8250_uniphier.c
-f:drivers/tty/serial/8250/Kconfig
-f:drivers/tty/serial/8250/Makefile
-f:drivers/tty/serial/8250/serial_cs.c
-f:drivers/tty/serial/Kconfig
-f:drivers/tty/serial/Makefile
-f:drivers/tty/serial/altera_jtaguart.c
-f:drivers/tty/serial/altera_uart.c
-f:drivers/tty/serial/amba-pl010.c
-f:drivers/tty/serial/amba-pl011.c
-f:drivers/tty/serial/apbuart.c
-f:drivers/tty/serial/apbuart.h
-f:drivers/tty/serial/ar933x_uart.c
-f:drivers/tty/serial/arc_uart.c
-f:drivers/tty/serial/atmel_serial.c
-f:drivers/tty/serial/atmel_serial.h
-f:drivers/tty/serial/bcm63xx_uart.c
-f:drivers/tty/serial/clps711x.c
-f:drivers/tty/serial/cpm_uart.c
-f:drivers/tty/serial/cpm_uart.h
-f:drivers/tty/serial/digicolor-usart.c
-f:drivers/tty/serial/dz.c
-f:drivers/tty/serial/dz.h
-f:drivers/tty/serial/earlycon-riscv-sbi.c
-f:drivers/tty/serial/earlycon-semihost.c
-f:drivers/tty/serial/earlycon.c
-f:drivers/tty/serial/esp32_acm.c
-f:drivers/tty/serial/esp32_uart.c
-f:drivers/tty/serial/fsl_linflexuart.c
-f:drivers/tty/serial/fsl_lpuart.c
-f:drivers/tty/serial/icom.c
-f:drivers/tty/serial/imx.c
-f:drivers/tty/serial/imx_earlycon.c
-f:drivers/tty/serial/ip22zilog.c
-f:drivers/tty/serial/ip22zilog.h
-f:drivers/tty/serial/jsm/Makefile
-f:drivers/tty/serial/jsm/jsm.h
-f:drivers/tty/serial/jsm/jsm_cls.c
-f:drivers/tty/serial/jsm/jsm_driver.c
-f:drivers/tty/serial/jsm/jsm_neo.c
-f:drivers/tty/serial/jsm/jsm_tty.c
-f:drivers/tty/serial/kgdboc.c
-f:drivers/tty/serial/lantiq.c
-f:drivers/tty/serial/liteuart.c
-f:drivers/tty/serial/lpc32xx_hs.c
-f:drivers/tty/serial/ma35d1_serial.c
-f:drivers/tty/serial/max3100.c
-f:drivers/tty/serial/max310x.c
-f:drivers/tty/serial/mcf.c
-f:drivers/tty/serial/men_z135_uart.c
-f:drivers/tty/serial/meson_uart.c
-f:drivers/tty/serial/milbeaut_usio.c
-f:drivers/tty/serial/mpc52xx_uart.c
-f:drivers/tty/serial/mps2-uart.c
-f:drivers/tty/serial/msm_serial.c
-f:drivers/tty/serial/mux.c
-f:drivers/tty/serial/mvebu-uart.c
-f:drivers/tty/serial/mxs-auart.c
-f:drivers/tty/serial/omap-serial.c
-f:drivers/tty/serial/owl-uart.c
-f:drivers/tty/serial/pch_uart.c
-f:drivers/tty/serial/pic32_uart.c
-f:drivers/tty/serial/pmac_zilog.c
-f:drivers/tty/serial/pmac_zilog.h
-f:drivers/tty/serial/pxa.c
-f:drivers/tty/serial/qcom_geni_serial.c
-f:drivers/tty/serial/rda-uart.c
-f:drivers/tty/serial/rp2.c
-f:drivers/tty/serial/rsci.c
-f:drivers/tty/serial/rsci.h
-f:drivers/tty/serial/sa1100.c
-f:drivers/tty/serial/samsung_tty.c
-f:drivers/tty/serial/sb1250-duart.c
-f:drivers/tty/serial/sc16is7xx.c
-f:drivers/tty/serial/sc16is7xx.h
-f:drivers/tty/serial/sc16is7xx_i2c.c
-f:drivers/tty/serial/sc16is7xx_spi.c
-f:drivers/tty/serial/sccnxp.c
-f:drivers/tty/serial/serial-tegra.c
-f:drivers/tty/serial/serial_base.h
-f:drivers/tty/serial/serial_base_bus.c
-f:drivers/tty/serial/serial_core.c
-f:drivers/tty/serial/serial_ctrl.c
-f:drivers/tty/serial/serial_mctrl_gpio.c
-f:drivers/tty/serial/serial_mctrl_gpio.h
-f:drivers/tty/serial/serial_port.c
-f:drivers/tty/serial/serial_txx9.c
-f:drivers/tty/serial/sh-sci-common.h
-f:drivers/tty/serial/sh-sci.c
-f:drivers/tty/serial/sh-sci.h
-f:drivers/tty/serial/sifive.c
-f:drivers/tty/serial/sprd_serial.c
-f:drivers/tty/serial/st-asc.c
-f:drivers/tty/serial/stm32-usart.c
-f:drivers/tty/serial/stm32-usart.h
-f:drivers/tty/serial/suncore.c
-f:drivers/tty/serial/sunhv.c
-f:drivers/tty/serial/sunplus-uart.c
-f:drivers/tty/serial/sunsab.c
-f:drivers/tty/serial/sunsab.h
-f:drivers/tty/serial/sunsu.c
-f:drivers/tty/serial/sunzilog.c
-f:drivers/tty/serial/sunzilog.h
-f:drivers/tty/serial/tegra-tcu.c
-f:drivers/tty/serial/tegra-utc.c
-f:drivers/tty/serial/timbuart.c
-f:drivers/tty/serial/timbuart.h
-f:drivers/tty/serial/uartlite.c
-f:drivers/tty/serial/ucc_uart.c
-f:drivers/tty/serial/vt8500_serial.c
-f:drivers/tty/serial/xilinx_uartps.c
-f:drivers/tty/serial/zs.c
-f:drivers/tty/serial/zs.h
-f:drivers/tty/synclink_gt.c
-f:drivers/tty/sysrq.c
-f:drivers/tty/tty.h
-f:drivers/tty/tty_audit.c
-f:drivers/tty/tty_baudrate.c
-f:drivers/tty/tty_buffer.c
-f:drivers/tty/tty_io.c
-f:drivers/tty/tty_ioctl.c
-f:drivers/tty/tty_jobctrl.c
-f:drivers/tty/tty_ldisc.c
-f:drivers/tty/tty_ldsem.c
-f:drivers/tty/tty_mutex.c
-f:drivers/tty/tty_port.c
-f:drivers/tty/ttynull.c
-f:drivers/tty/vcc.c
-f:drivers/tty/vt/.gitignore
-f:drivers/tty/vt/Makefile
-f:drivers/tty/vt/conmakehash.c
-f:drivers/tty/vt/consolemap.c
-f:drivers/tty/vt/cp437.uni
-f:drivers/tty/vt/defkeymap.c_shipped
-f:drivers/tty/vt/defkeymap.map
-f:drivers/tty/vt/gen_ucs_fallback_table.py
-f:drivers/tty/vt/gen_ucs_recompose_table.py
-f:drivers/tty/vt/gen_ucs_width_table.py
-f:drivers/tty/vt/keyboard.c
-f:drivers/tty/vt/selection.c
-f:drivers/tty/vt/ucs.c
-f:drivers/tty/vt/ucs_fallback_table.h_shipped
-f:drivers/tty/vt/ucs_recompose_table.h_shipped
-f:drivers/tty/vt/ucs_width_table.h_shipped
-f:drivers/tty/vt/vc_screen.c
-f:drivers/tty/vt/vt.c
-f:drivers/tty/vt/vt_ioctl.c
-f:drivers/ufs/Kconfig
-f:drivers/ufs/Makefile
-f:drivers/ufs/core/Kconfig
-f:drivers/ufs/core/Makefile
-f:drivers/ufs/core/ufs-debugfs.c
-f:drivers/ufs/core/ufs-debugfs.h
-f:drivers/ufs/core/ufs-fault-injection.c
-f:drivers/ufs/core/ufs-fault-injection.h
-f:drivers/ufs/core/ufs-hwmon.c
-f:drivers/ufs/core/ufs-mcq.c
-f:drivers/ufs/core/ufs-sysfs.c
-f:drivers/ufs/core/ufs-sysfs.h
-f:drivers/ufs/core/ufs_bsg.c
-f:drivers/ufs/core/ufs_bsg.h
-f:drivers/ufs/core/ufs_trace.h
-f:drivers/ufs/core/ufshcd-crypto.c
-f:drivers/ufs/core/ufshcd-crypto.h
-f:drivers/ufs/core/ufshcd-priv.h
-f:drivers/ufs/core/ufshcd.c
-f:drivers/ufs/host/Kconfig
-f:drivers/ufs/host/Makefile
-f:drivers/ufs/host/cdns-pltfrm.c
-f:drivers/ufs/host/tc-dwc-g210-pci.c
-f:drivers/ufs/host/tc-dwc-g210-pltfrm.c
-f:drivers/ufs/host/tc-dwc-g210.c
-f:drivers/ufs/host/tc-dwc-g210.h
-f:drivers/ufs/host/ti-j721e-ufs.c
-f:drivers/ufs/host/ufs-exynos.c
-f:drivers/ufs/host/ufs-exynos.h
-f:drivers/ufs/host/ufs-hisi.c
-f:drivers/ufs/host/ufs-hisi.h
-f:drivers/ufs/host/ufs-mediatek-sip.h
-f:drivers/ufs/host/ufs-mediatek-trace.h
-f:drivers/ufs/host/ufs-mediatek.c
-f:drivers/ufs/host/ufs-mediatek.h
-f:drivers/ufs/host/ufs-qcom.c
-f:drivers/ufs/host/ufs-qcom.h
-f:drivers/ufs/host/ufs-renesas.c
-f:drivers/ufs/host/ufs-rockchip.c
-f:drivers/ufs/host/ufs-rockchip.h
-f:drivers/ufs/host/ufs-sprd.c
-f:drivers/ufs/host/ufs-sprd.h
-f:drivers/ufs/host/ufshcd-dwc.c
-f:drivers/ufs/host/ufshcd-dwc.h
-f:drivers/ufs/host/ufshcd-pci.c
-f:drivers/ufs/host/ufshcd-pltfrm.c
-f:drivers/ufs/host/ufshcd-pltfrm.h
-f:drivers/ufs/host/ufshci-dwc.h
-f:drivers/uio/Kconfig
-f:drivers/uio/Makefile
-f:drivers/uio/uio.c
-f:drivers/uio/uio_aec.c
-f:drivers/uio/uio_cif.c
-f:drivers/uio/uio_dfl.c
-f:drivers/uio/uio_dmem_genirq.c
-f:drivers/uio/uio_fsl_elbc_gpcm.c
-f:drivers/uio/uio_hv_generic.c
-f:drivers/uio/uio_mf624.c
-f:drivers/uio/uio_netx.c
-f:drivers/uio/uio_pci_generic.c
-f:drivers/uio/uio_pdrv_genirq.c
-f:drivers/uio/uio_sercos3.c
-f:drivers/usb/Kconfig
-f:drivers/usb/Makefile
-f:drivers/usb/atm/Kconfig
-f:drivers/usb/atm/Makefile
-f:drivers/usb/atm/cxacru.c
-f:drivers/usb/atm/speedtch.c
-f:drivers/usb/atm/ueagle-atm.c
-f:drivers/usb/atm/usbatm.c
-f:drivers/usb/atm/usbatm.h
-f:drivers/usb/atm/xusbatm.c
-f:drivers/usb/c67x00/Makefile
-f:drivers/usb/c67x00/c67x00-drv.c
-f:drivers/usb/c67x00/c67x00-hcd.c
-f:drivers/usb/c67x00/c67x00-hcd.h
-f:drivers/usb/c67x00/c67x00-ll-hpi.c
-f:drivers/usb/c67x00/c67x00-sched.c
-f:drivers/usb/c67x00/c67x00.h
-f:drivers/usb/cdns3/Kconfig
-f:drivers/usb/cdns3/Makefile
-f:drivers/usb/cdns3/cdns3-debug.h
-f:drivers/usb/cdns3/cdns3-ep0.c
-f:drivers/usb/cdns3/cdns3-gadget.c
-f:drivers/usb/cdns3/cdns3-gadget.h
-f:drivers/usb/cdns3/cdns3-imx.c
-f:drivers/usb/cdns3/cdns3-pci-wrap.c
-f:drivers/usb/cdns3/cdns3-plat.c
-f:drivers/usb/cdns3/cdns3-starfive.c
-f:drivers/usb/cdns3/cdns3-ti.c
-f:drivers/usb/cdns3/cdns3-trace.c
-f:drivers/usb/cdns3/cdns3-trace.h
-f:drivers/usb/cdns3/cdnsp-debug.h
-f:drivers/usb/cdns3/cdnsp-ep0.c
-f:drivers/usb/cdns3/cdnsp-gadget.c
-f:drivers/usb/cdns3/cdnsp-gadget.h
-f:drivers/usb/cdns3/cdnsp-mem.c
-f:drivers/usb/cdns3/cdnsp-pci.c
-f:drivers/usb/cdns3/cdnsp-ring.c
-f:drivers/usb/cdns3/cdnsp-trace.c
-f:drivers/usb/cdns3/cdnsp-trace.h
-f:drivers/usb/cdns3/core.c
-f:drivers/usb/cdns3/core.h
-f:drivers/usb/cdns3/drd.c
-f:drivers/usb/cdns3/drd.h
-f:drivers/usb/cdns3/gadget-export.h
-f:drivers/usb/cdns3/host-export.h
-f:drivers/usb/cdns3/host.c
-f:drivers/usb/chipidea/Kconfig
-f:drivers/usb/chipidea/Makefile
-f:drivers/usb/chipidea/bits.h
-f:drivers/usb/chipidea/ci.h
-f:drivers/usb/chipidea/ci_hdrc_imx.c
-f:drivers/usb/chipidea/ci_hdrc_imx.h
-f:drivers/usb/chipidea/ci_hdrc_msm.c
-f:drivers/usb/chipidea/ci_hdrc_npcm.c
-f:drivers/usb/chipidea/ci_hdrc_pci.c
-f:drivers/usb/chipidea/ci_hdrc_tegra.c
-f:drivers/usb/chipidea/ci_hdrc_usb2.c
-f:drivers/usb/chipidea/core.c
-f:drivers/usb/chipidea/debug.c
-f:drivers/usb/chipidea/host.c
-f:drivers/usb/chipidea/host.h
-f:drivers/usb/chipidea/otg.c
-f:drivers/usb/chipidea/otg.h
-f:drivers/usb/chipidea/otg_fsm.c
-f:drivers/usb/chipidea/otg_fsm.h
-f:drivers/usb/chipidea/trace.c
-f:drivers/usb/chipidea/trace.h
-f:drivers/usb/chipidea/udc.c
-f:drivers/usb/chipidea/udc.h
-f:drivers/usb/chipidea/ulpi.c
-f:drivers/usb/chipidea/usbmisc_imx.c
-f:drivers/usb/class/Kconfig
-f:drivers/usb/class/Makefile
-f:drivers/usb/class/cdc-acm.c
-f:drivers/usb/class/cdc-acm.h
-f:drivers/usb/class/cdc-wdm.c
-f:drivers/usb/class/usblp.c
-f:drivers/usb/class/usbtmc.c
-f:drivers/usb/common/Kconfig
-f:drivers/usb/common/Makefile
-f:drivers/usb/common/common.c
-f:drivers/usb/common/common.h
-f:drivers/usb/common/debug.c
-f:drivers/usb/common/led.c
-f:drivers/usb/common/ulpi.c
-f:drivers/usb/common/usb-conn-gpio.c
-f:drivers/usb/common/usb-otg-fsm.c
-f:drivers/usb/core/Kconfig
-f:drivers/usb/core/Makefile
-f:drivers/usb/core/buffer.c
-f:drivers/usb/core/config.c
-f:drivers/usb/core/devices.c
-f:drivers/usb/core/devio.c
-f:drivers/usb/core/driver.c
-f:drivers/usb/core/endpoint.c
-f:drivers/usb/core/file.c
-f:drivers/usb/core/generic.c
-f:drivers/usb/core/hcd-pci.c
-f:drivers/usb/core/hcd.c
-f:drivers/usb/core/hub.c
-f:drivers/usb/core/hub.h
-f:drivers/usb/core/ledtrig-usbport.c
-f:drivers/usb/core/message.c
-f:drivers/usb/core/notify.c
-f:drivers/usb/core/of.c
-f:drivers/usb/core/otg_productlist.h
-f:drivers/usb/core/phy.c
-f:drivers/usb/core/phy.h
-f:drivers/usb/core/port.c
-f:drivers/usb/core/quirks.c
-f:drivers/usb/core/sysfs.c
-f:drivers/usb/core/urb.c
-f:drivers/usb/core/usb-acpi.c
-f:drivers/usb/core/usb.c
-f:drivers/usb/core/usb.h
-f:drivers/usb/dwc2/Kconfig
-f:drivers/usb/dwc2/Makefile
-f:drivers/usb/dwc2/core.c
-f:drivers/usb/dwc2/core.h
-f:drivers/usb/dwc2/core_intr.c
-f:drivers/usb/dwc2/debug.h
-f:drivers/usb/dwc2/debugfs.c
-f:drivers/usb/dwc2/drd.c
-f:drivers/usb/dwc2/gadget.c
-f:drivers/usb/dwc2/hcd.c
-f:drivers/usb/dwc2/hcd.h
-f:drivers/usb/dwc2/hcd_ddma.c
-f:drivers/usb/dwc2/hcd_intr.c
-f:drivers/usb/dwc2/hcd_queue.c
-f:drivers/usb/dwc2/hw.h
-f:drivers/usb/dwc2/params.c
-f:drivers/usb/dwc2/pci.c
-f:drivers/usb/dwc2/platform.c
-f:drivers/usb/dwc3/Kconfig
-f:drivers/usb/dwc3/Makefile
-f:drivers/usb/dwc3/core.c
-f:drivers/usb/dwc3/core.h
-f:drivers/usb/dwc3/debug.h
-f:drivers/usb/dwc3/debugfs.c
-f:drivers/usb/dwc3/drd.c
-f:drivers/usb/dwc3/dwc3-am62.c
-f:drivers/usb/dwc3/dwc3-exynos.c
-f:drivers/usb/dwc3/dwc3-haps.c
-f:drivers/usb/dwc3/dwc3-imx8mp.c
-f:drivers/usb/dwc3/dwc3-keystone.c
-f:drivers/usb/dwc3/dwc3-meson-g12a.c
-f:drivers/usb/dwc3/dwc3-octeon.c
-f:drivers/usb/dwc3/dwc3-of-simple.c
-f:drivers/usb/dwc3/dwc3-omap.c
-f:drivers/usb/dwc3/dwc3-pci.c
-f:drivers/usb/dwc3/dwc3-qcom-legacy.c
-f:drivers/usb/dwc3/dwc3-qcom.c
-f:drivers/usb/dwc3/dwc3-rtk.c
-f:drivers/usb/dwc3/dwc3-st.c
-f:drivers/usb/dwc3/dwc3-xilinx.c
-f:drivers/usb/dwc3/ep0.c
-f:drivers/usb/dwc3/gadget.c
-f:drivers/usb/dwc3/gadget.h
-f:drivers/usb/dwc3/glue.h
-f:drivers/usb/dwc3/host.c
-f:drivers/usb/dwc3/io.h
-f:drivers/usb/dwc3/trace.c
-f:drivers/usb/dwc3/trace.h
-f:drivers/usb/dwc3/ulpi.c
-f:drivers/usb/early/Makefile
-f:drivers/usb/early/ehci-dbgp.c
-f:drivers/usb/early/xhci-dbc.c
-f:drivers/usb/early/xhci-dbc.h
-f:drivers/usb/fotg210/Kconfig
-f:drivers/usb/fotg210/Makefile
-f:drivers/usb/fotg210/fotg210-core.c
-f:drivers/usb/fotg210/fotg210-hcd.c
-f:drivers/usb/fotg210/fotg210-hcd.h
-f:drivers/usb/fotg210/fotg210-udc.c
-f:drivers/usb/fotg210/fotg210-udc.h
-f:drivers/usb/fotg210/fotg210.h
-f:drivers/usb/gadget/Kconfig
-f:drivers/usb/gadget/Makefile
-f:drivers/usb/gadget/composite.c
-f:drivers/usb/gadget/config.c
-f:drivers/usb/gadget/configfs.c
-f:drivers/usb/gadget/configfs.h
-f:drivers/usb/gadget/epautoconf.c
-f:drivers/usb/gadget/function/Makefile
-f:drivers/usb/gadget/function/f_acm.c
-f:drivers/usb/gadget/function/f_ecm.c
-f:drivers/usb/gadget/function/f_eem.c
-f:drivers/usb/gadget/function/f_fs.c
-f:drivers/usb/gadget/function/f_hid.c
-f:drivers/usb/gadget/function/f_loopback.c
-f:drivers/usb/gadget/function/f_mass_storage.c
-f:drivers/usb/gadget/function/f_mass_storage.h
-f:drivers/usb/gadget/function/f_midi.c
-f:drivers/usb/gadget/function/f_midi2.c
-f:drivers/usb/gadget/function/f_ncm.c
-f:drivers/usb/gadget/function/f_obex.c
-f:drivers/usb/gadget/function/f_phonet.c
-f:drivers/usb/gadget/function/f_printer.c
-f:drivers/usb/gadget/function/f_rndis.c
-f:drivers/usb/gadget/function/f_serial.c
-f:drivers/usb/gadget/function/f_sourcesink.c
-f:drivers/usb/gadget/function/f_subset.c
-f:drivers/usb/gadget/function/f_tcm.c
-f:drivers/usb/gadget/function/f_uac1.c
-f:drivers/usb/gadget/function/f_uac1_legacy.c
-f:drivers/usb/gadget/function/f_uac2.c
-f:drivers/usb/gadget/function/f_uvc.c
-f:drivers/usb/gadget/function/f_uvc.h
-f:drivers/usb/gadget/function/g_zero.h
-f:drivers/usb/gadget/function/ndis.h
-f:drivers/usb/gadget/function/rndis.c
-f:drivers/usb/gadget/function/rndis.h
-f:drivers/usb/gadget/function/storage_common.c
-f:drivers/usb/gadget/function/storage_common.h
-f:drivers/usb/gadget/function/tcm.h
-f:drivers/usb/gadget/function/u_audio.c
-f:drivers/usb/gadget/function/u_audio.h
-f:drivers/usb/gadget/function/u_ecm.h
-f:drivers/usb/gadget/function/u_eem.h
-f:drivers/usb/gadget/function/u_ether.c
-f:drivers/usb/gadget/function/u_ether.h
-f:drivers/usb/gadget/function/u_ether_configfs.h
-f:drivers/usb/gadget/function/u_fs.h
-f:drivers/usb/gadget/function/u_gether.h
-f:drivers/usb/gadget/function/u_hid.h
-f:drivers/usb/gadget/function/u_midi.h
-f:drivers/usb/gadget/function/u_midi2.h
-f:drivers/usb/gadget/function/u_ncm.h
-f:drivers/usb/gadget/function/u_phonet.h
-f:drivers/usb/gadget/function/u_printer.h
-f:drivers/usb/gadget/function/u_rndis.h
-f:drivers/usb/gadget/function/u_serial.c
-f:drivers/usb/gadget/function/u_serial.h
-f:drivers/usb/gadget/function/u_tcm.h
-f:drivers/usb/gadget/function/u_uac1.h
-f:drivers/usb/gadget/function/u_uac1_legacy.c
-f:drivers/usb/gadget/function/u_uac1_legacy.h
-f:drivers/usb/gadget/function/u_uac2.h
-f:drivers/usb/gadget/function/u_uvc.h
-f:drivers/usb/gadget/function/uac_common.h
-f:drivers/usb/gadget/function/uvc.h
-f:drivers/usb/gadget/function/uvc_configfs.c
-f:drivers/usb/gadget/function/uvc_configfs.h
-f:drivers/usb/gadget/function/uvc_queue.c
-f:drivers/usb/gadget/function/uvc_queue.h
-f:drivers/usb/gadget/function/uvc_trace.c
-f:drivers/usb/gadget/function/uvc_trace.h
-f:drivers/usb/gadget/function/uvc_v4l2.c
-f:drivers/usb/gadget/function/uvc_v4l2.h
-f:drivers/usb/gadget/function/uvc_video.c
-f:drivers/usb/gadget/function/uvc_video.h
-f:drivers/usb/gadget/functions.c
-f:drivers/usb/gadget/legacy/Kconfig
-f:drivers/usb/gadget/legacy/Makefile
-f:drivers/usb/gadget/legacy/acm_ms.c
-f:drivers/usb/gadget/legacy/audio.c
-f:drivers/usb/gadget/legacy/cdc2.c
-f:drivers/usb/gadget/legacy/dbgp.c
-f:drivers/usb/gadget/legacy/ether.c
-f:drivers/usb/gadget/legacy/g_ffs.c
-f:drivers/usb/gadget/legacy/gmidi.c
-f:drivers/usb/gadget/legacy/hid.c
-f:drivers/usb/gadget/legacy/inode.c
-f:drivers/usb/gadget/legacy/mass_storage.c
-f:drivers/usb/gadget/legacy/multi.c
-f:drivers/usb/gadget/legacy/ncm.c
-f:drivers/usb/gadget/legacy/nokia.c
-f:drivers/usb/gadget/legacy/printer.c
-f:drivers/usb/gadget/legacy/raw_gadget.c
-f:drivers/usb/gadget/legacy/serial.c
-f:drivers/usb/gadget/legacy/tcm_usb_gadget.c
-f:drivers/usb/gadget/legacy/webcam.c
-f:drivers/usb/gadget/legacy/zero.c
-f:drivers/usb/gadget/u_f.c
-f:drivers/usb/gadget/u_os_desc.h
-f:drivers/usb/gadget/udc/Kconfig
-f:drivers/usb/gadget/udc/Makefile
-f:drivers/usb/gadget/udc/amd5536udc.h
-f:drivers/usb/gadget/udc/amd5536udc_pci.c
-f:drivers/usb/gadget/udc/aspeed-vhub/Kconfig
-f:drivers/usb/gadget/udc/aspeed-vhub/Makefile
-f:drivers/usb/gadget/udc/aspeed-vhub/core.c
-f:drivers/usb/gadget/udc/aspeed-vhub/dev.c
-f:drivers/usb/gadget/udc/aspeed-vhub/ep0.c
-f:drivers/usb/gadget/udc/aspeed-vhub/epn.c
-f:drivers/usb/gadget/udc/aspeed-vhub/hub.c
-f:drivers/usb/gadget/udc/aspeed-vhub/vhub.h
-f:drivers/usb/gadget/udc/aspeed_udc.c
-f:drivers/usb/gadget/udc/at91_udc.c
-f:drivers/usb/gadget/udc/at91_udc.h
-f:drivers/usb/gadget/udc/atmel_usba_udc.c
-f:drivers/usb/gadget/udc/atmel_usba_udc.h
-f:drivers/usb/gadget/udc/bcm63xx_udc.c
-f:drivers/usb/gadget/udc/bdc/Kconfig
-f:drivers/usb/gadget/udc/bdc/Makefile
-f:drivers/usb/gadget/udc/bdc/bdc.h
-f:drivers/usb/gadget/udc/bdc/bdc_cmd.c
-f:drivers/usb/gadget/udc/bdc/bdc_cmd.h
-f:drivers/usb/gadget/udc/bdc/bdc_core.c
-f:drivers/usb/gadget/udc/bdc/bdc_dbg.c
-f:drivers/usb/gadget/udc/bdc/bdc_dbg.h
-f:drivers/usb/gadget/udc/bdc/bdc_ep.c
-f:drivers/usb/gadget/udc/bdc/bdc_ep.h
-f:drivers/usb/gadget/udc/bdc/bdc_udc.c
-f:drivers/usb/gadget/udc/cdns2/Kconfig
-f:drivers/usb/gadget/udc/cdns2/Makefile
-f:drivers/usb/gadget/udc/cdns2/cdns2-debug.h
-f:drivers/usb/gadget/udc/cdns2/cdns2-ep0.c
-f:drivers/usb/gadget/udc/cdns2/cdns2-gadget.c
-f:drivers/usb/gadget/udc/cdns2/cdns2-gadget.h
-f:drivers/usb/gadget/udc/cdns2/cdns2-pci.c
-f:drivers/usb/gadget/udc/cdns2/cdns2-trace.c
-f:drivers/usb/gadget/udc/cdns2/cdns2-trace.h
-f:drivers/usb/gadget/udc/core.c
-f:drivers/usb/gadget/udc/dummy_hcd.c
-f:drivers/usb/gadget/udc/fsl_qe_udc.c
-f:drivers/usb/gadget/udc/fsl_qe_udc.h
-f:drivers/usb/gadget/udc/fsl_udc_core.c
-f:drivers/usb/gadget/udc/fsl_usb2_udc.h
-f:drivers/usb/gadget/udc/goku_udc.c
-f:drivers/usb/gadget/udc/goku_udc.h
-f:drivers/usb/gadget/udc/gr_udc.c
-f:drivers/usb/gadget/udc/gr_udc.h
-f:drivers/usb/gadget/udc/lpc32xx_udc.c
-f:drivers/usb/gadget/udc/m66592-udc.c
-f:drivers/usb/gadget/udc/m66592-udc.h
-f:drivers/usb/gadget/udc/max3420_udc.c
-f:drivers/usb/gadget/udc/net2280.c
-f:drivers/usb/gadget/udc/net2280.h
-f:drivers/usb/gadget/udc/omap_udc.c
-f:drivers/usb/gadget/udc/omap_udc.h
-f:drivers/usb/gadget/udc/pch_udc.c
-f:drivers/usb/gadget/udc/pxa25x_udc.c
-f:drivers/usb/gadget/udc/pxa25x_udc.h
-f:drivers/usb/gadget/udc/pxa27x_udc.c
-f:drivers/usb/gadget/udc/pxa27x_udc.h
-f:drivers/usb/gadget/udc/r8a66597-udc.c
-f:drivers/usb/gadget/udc/r8a66597-udc.h
-f:drivers/usb/gadget/udc/renesas_usb3.c
-f:drivers/usb/gadget/udc/renesas_usbf.c
-f:drivers/usb/gadget/udc/rzv2m_usb3drd.c
-f:drivers/usb/gadget/udc/snps_udc_core.c
-f:drivers/usb/gadget/udc/snps_udc_plat.c
-f:drivers/usb/gadget/udc/tegra-xudc.c
-f:drivers/usb/gadget/udc/trace.c
-f:drivers/usb/gadget/udc/trace.h
-f:drivers/usb/gadget/udc/udc-xilinx.c
-f:drivers/usb/gadget/usbstring.c
-f:drivers/usb/host/Kconfig
-f:drivers/usb/host/Makefile
-f:drivers/usb/host/bcma-hcd.c
-f:drivers/usb/host/ehci-atmel.c
-f:drivers/usb/host/ehci-brcm.c
-f:drivers/usb/host/ehci-dbg.c
-f:drivers/usb/host/ehci-exynos.c
-f:drivers/usb/host/ehci-fsl.c
-f:drivers/usb/host/ehci-fsl.h
-f:drivers/usb/host/ehci-grlib.c
-f:drivers/usb/host/ehci-hcd.c
-f:drivers/usb/host/ehci-hub.c
-f:drivers/usb/host/ehci-mem.c
-f:drivers/usb/host/ehci-mv.c
-f:drivers/usb/host/ehci-npcm7xx.c
-f:drivers/usb/host/ehci-omap.c
-f:drivers/usb/host/ehci-orion.c
-f:drivers/usb/host/ehci-pci.c
-f:drivers/usb/host/ehci-platform.c
-f:drivers/usb/host/ehci-ppc-of.c
-f:drivers/usb/host/ehci-ps3.c
-f:drivers/usb/host/ehci-q.c
-f:drivers/usb/host/ehci-sched.c
-f:drivers/usb/host/ehci-sh.c
-f:drivers/usb/host/ehci-spear.c
-f:drivers/usb/host/ehci-st.c
-f:drivers/usb/host/ehci-sysfs.c
-f:drivers/usb/host/ehci-timer.c
-f:drivers/usb/host/ehci-xilinx-of.c
-f:drivers/usb/host/ehci.h
-f:drivers/usb/host/fhci-dbg.c
-f:drivers/usb/host/fhci-hcd.c
-f:drivers/usb/host/fhci-hub.c
-f:drivers/usb/host/fhci-mem.c
-f:drivers/usb/host/fhci-q.c
-f:drivers/usb/host/fhci-sched.c
-f:drivers/usb/host/fhci-tds.c
-f:drivers/usb/host/fhci.h
-f:drivers/usb/host/fsl-mph-dr-of.c
-f:drivers/usb/host/isp116x-hcd.c
-f:drivers/usb/host/isp116x.h
-f:drivers/usb/host/isp1362-hcd.c
-f:drivers/usb/host/isp1362.h
-f:drivers/usb/host/max3421-hcd.c
-f:drivers/usb/host/octeon-hcd.c
-f:drivers/usb/host/octeon-hcd.h
-f:drivers/usb/host/ohci-at91.c
-f:drivers/usb/host/ohci-da8xx.c
-f:drivers/usb/host/ohci-dbg.c
-f:drivers/usb/host/ohci-exynos.c
-f:drivers/usb/host/ohci-hcd.c
-f:drivers/usb/host/ohci-hub.c
-f:drivers/usb/host/ohci-mem.c
-f:drivers/usb/host/ohci-nxp.c
-f:drivers/usb/host/ohci-omap.c
-f:drivers/usb/host/ohci-pci.c
-f:drivers/usb/host/ohci-platform.c
-f:drivers/usb/host/ohci-ppc-of.c
-f:drivers/usb/host/ohci-ps3.c
-f:drivers/usb/host/ohci-pxa27x.c
-f:drivers/usb/host/ohci-q.c
-f:drivers/usb/host/ohci-s3c2410.c
-f:drivers/usb/host/ohci-sa1111.c
-f:drivers/usb/host/ohci-sm501.c
-f:drivers/usb/host/ohci-spear.c
-f:drivers/usb/host/ohci-st.c
-f:drivers/usb/host/ohci.h
-f:drivers/usb/host/oxu210hp-hcd.c
-f:drivers/usb/host/pci-quirks.c
-f:drivers/usb/host/pci-quirks.h
-f:drivers/usb/host/r8a66597-hcd.c
-f:drivers/usb/host/r8a66597.h
-f:drivers/usb/host/sl811-hcd.c
-f:drivers/usb/host/sl811.h
-f:drivers/usb/host/sl811_cs.c
-f:drivers/usb/host/ssb-hcd.c
-f:drivers/usb/host/uhci-debug.c
-f:drivers/usb/host/uhci-grlib.c
-f:drivers/usb/host/uhci-hcd.c
-f:drivers/usb/host/uhci-hcd.h
-f:drivers/usb/host/uhci-hub.c
-f:drivers/usb/host/uhci-pci.c
-f:drivers/usb/host/uhci-platform.c
-f:drivers/usb/host/uhci-q.c
-f:drivers/usb/host/xen-hcd.c
-f:drivers/usb/host/xhci-caps.h
-f:drivers/usb/host/xhci-dbg.c
-f:drivers/usb/host/xhci-dbgcap.c
-f:drivers/usb/host/xhci-dbgcap.h
-f:drivers/usb/host/xhci-dbgtty.c
-f:drivers/usb/host/xhci-debugfs.c
-f:drivers/usb/host/xhci-debugfs.h
-f:drivers/usb/host/xhci-ext-caps.c
-f:drivers/usb/host/xhci-ext-caps.h
-f:drivers/usb/host/xhci-histb.c
-f:drivers/usb/host/xhci-hub.c
-f:drivers/usb/host/xhci-mem.c
-f:drivers/usb/host/xhci-mtk-sch.c
-f:drivers/usb/host/xhci-mtk.c
-f:drivers/usb/host/xhci-mtk.h
-f:drivers/usb/host/xhci-mvebu.c
-f:drivers/usb/host/xhci-mvebu.h
-f:drivers/usb/host/xhci-pci-renesas.c
-f:drivers/usb/host/xhci-pci.c
-f:drivers/usb/host/xhci-pci.h
-f:drivers/usb/host/xhci-plat.c
-f:drivers/usb/host/xhci-plat.h
-f:drivers/usb/host/xhci-port.h
-f:drivers/usb/host/xhci-rcar.c
-f:drivers/usb/host/xhci-ring.c
-f:drivers/usb/host/xhci-rzv2m.c
-f:drivers/usb/host/xhci-rzv2m.h
-f:drivers/usb/host/xhci-sideband.c
-f:drivers/usb/host/xhci-tegra.c
-f:drivers/usb/host/xhci-trace.c
-f:drivers/usb/host/xhci-trace.h
-f:drivers/usb/host/xhci.c
-f:drivers/usb/host/xhci.h
-f:drivers/usb/image/Kconfig
-f:drivers/usb/image/Makefile
-f:drivers/usb/image/mdc800.c
-f:drivers/usb/image/microtek.c
-f:drivers/usb/image/microtek.h
-f:drivers/usb/isp1760/Kconfig
-f:drivers/usb/isp1760/Makefile
-f:drivers/usb/isp1760/isp1760-core.c
-f:drivers/usb/isp1760/isp1760-core.h
-f:drivers/usb/isp1760/isp1760-hcd.c
-f:drivers/usb/isp1760/isp1760-hcd.h
-f:drivers/usb/isp1760/isp1760-if.c
-f:drivers/usb/isp1760/isp1760-regs.h
-f:drivers/usb/isp1760/isp1760-udc.c
-f:drivers/usb/isp1760/isp1760-udc.h
-f:drivers/usb/misc/Kconfig
-f:drivers/usb/misc/Makefile
-f:drivers/usb/misc/adutux.c
-f:drivers/usb/misc/apple-mfi-fastcharge.c
-f:drivers/usb/misc/appledisplay.c
-f:drivers/usb/misc/brcmstb-usb-pinmap.c
-f:drivers/usb/misc/chaoskey.c
-f:drivers/usb/misc/cypress_cy7c63.c
-f:drivers/usb/misc/cytherm.c
-f:drivers/usb/misc/ehset.c
-f:drivers/usb/misc/emi26.c
-f:drivers/usb/misc/emi62.c
-f:drivers/usb/misc/ezusb.c
-f:drivers/usb/misc/idmouse.c
-f:drivers/usb/misc/iowarrior.c
-f:drivers/usb/misc/isight_firmware.c
-f:drivers/usb/misc/ldusb.c
-f:drivers/usb/misc/legousbtower.c
-f:drivers/usb/misc/lvstest.c
-f:drivers/usb/misc/onboard_usb_dev.c
-f:drivers/usb/misc/onboard_usb_dev.h
-f:drivers/usb/misc/onboard_usb_dev_pdevs.c
-f:drivers/usb/misc/qcom_eud.c
-f:drivers/usb/misc/sisusbvga/Kconfig
-f:drivers/usb/misc/sisusbvga/Makefile
-f:drivers/usb/misc/sisusbvga/sisusb.h
-f:drivers/usb/misc/sisusbvga/sisusb_struct.h
-f:drivers/usb/misc/sisusbvga/sisusb_tables.h
-f:drivers/usb/misc/sisusbvga/sisusbvga.c
-f:drivers/usb/misc/trancevibrator.c
-f:drivers/usb/misc/usb-ljca.c
-f:drivers/usb/misc/usb251xb.c
-f:drivers/usb/misc/usb3503.c
-f:drivers/usb/misc/usb4604.c
-f:drivers/usb/misc/usblcd.c
-f:drivers/usb/misc/usbsevseg.c
-f:drivers/usb/misc/usbtest.c
-f:drivers/usb/misc/uss720.c
-f:drivers/usb/misc/yurex.c
-f:drivers/usb/mon/Kconfig
-f:drivers/usb/mon/Makefile
-f:drivers/usb/mon/mon_bin.c
-f:drivers/usb/mon/mon_main.c
-f:drivers/usb/mon/mon_stat.c
-f:drivers/usb/mon/mon_text.c
-f:drivers/usb/mon/usb_mon.h
-f:drivers/usb/mtu3/Kconfig
-f:drivers/usb/mtu3/Makefile
-f:drivers/usb/mtu3/mtu3.h
-f:drivers/usb/mtu3/mtu3_core.c
-f:drivers/usb/mtu3/mtu3_debug.h
-f:drivers/usb/mtu3/mtu3_debugfs.c
-f:drivers/usb/mtu3/mtu3_dr.c
-f:drivers/usb/mtu3/mtu3_dr.h
-f:drivers/usb/mtu3/mtu3_gadget.c
-f:drivers/usb/mtu3/mtu3_gadget_ep0.c
-f:drivers/usb/mtu3/mtu3_host.c
-f:drivers/usb/mtu3/mtu3_hw_regs.h
-f:drivers/usb/mtu3/mtu3_plat.c
-f:drivers/usb/mtu3/mtu3_qmu.c
-f:drivers/usb/mtu3/mtu3_qmu.h
-f:drivers/usb/mtu3/mtu3_trace.c
-f:drivers/usb/mtu3/mtu3_trace.h
-f:drivers/usb/musb/Kconfig
-f:drivers/usb/musb/Makefile
-f:drivers/usb/musb/cppi_dma.h
-f:drivers/usb/musb/da8xx.c
-f:drivers/usb/musb/jz4740.c
-f:drivers/usb/musb/mediatek.c
-f:drivers/usb/musb/mpfs.c
-f:drivers/usb/musb/musb_core.c
-f:drivers/usb/musb/musb_core.h
-f:drivers/usb/musb/musb_cppi41.c
-f:drivers/usb/musb/musb_debug.h
-f:drivers/usb/musb/musb_debugfs.c
-f:drivers/usb/musb/musb_dma.h
-f:drivers/usb/musb/musb_dsps.c
-f:drivers/usb/musb/musb_gadget.c
-f:drivers/usb/musb/musb_gadget.h
-f:drivers/usb/musb/musb_gadget_ep0.c
-f:drivers/usb/musb/musb_host.c
-f:drivers/usb/musb/musb_host.h
-f:drivers/usb/musb/musb_io.h
-f:drivers/usb/musb/musb_regs.h
-f:drivers/usb/musb/musb_trace.c
-f:drivers/usb/musb/musb_trace.h
-f:drivers/usb/musb/musb_virthub.c
-f:drivers/usb/musb/musbhsdma.c
-f:drivers/usb/musb/omap2430.c
-f:drivers/usb/musb/omap2430.h
-f:drivers/usb/musb/sunxi.c
-f:drivers/usb/musb/tusb6010.c
-f:drivers/usb/musb/tusb6010.h
-f:drivers/usb/musb/tusb6010_omap.c
-f:drivers/usb/musb/ux500.c
-f:drivers/usb/musb/ux500_dma.c
-f:drivers/usb/phy/Kconfig
-f:drivers/usb/phy/Makefile
-f:drivers/usb/phy/of.c
-f:drivers/usb/phy/phy-ab8500-usb.c
-f:drivers/usb/phy/phy-am335x-control.c
-f:drivers/usb/phy/phy-am335x-control.h
-f:drivers/usb/phy/phy-am335x.c
-f:drivers/usb/phy/phy-fsl-usb.c
-f:drivers/usb/phy/phy-fsl-usb.h
-f:drivers/usb/phy/phy-generic.c
-f:drivers/usb/phy/phy-generic.h
-f:drivers/usb/phy/phy-gpio-vbus-usb.c
-f:drivers/usb/phy/phy-isp1301.c
-f:drivers/usb/phy/phy-keystone.c
-f:drivers/usb/phy/phy-mv-usb.h
-f:drivers/usb/phy/phy-mxs-usb.c
-f:drivers/usb/phy/phy-omap-otg.c
-f:drivers/usb/phy/phy-tahvo.c
-f:drivers/usb/phy/phy-tegra-usb.c
-f:drivers/usb/phy/phy-twl6030-usb.c
-f:drivers/usb/phy/phy-ulpi-viewport.c
-f:drivers/usb/phy/phy-ulpi.c
-f:drivers/usb/phy/phy.c
-f:drivers/usb/renesas_usbhs/Kconfig
-f:drivers/usb/renesas_usbhs/Makefile
-f:drivers/usb/renesas_usbhs/common.c
-f:drivers/usb/renesas_usbhs/common.h
-f:drivers/usb/renesas_usbhs/fifo.c
-f:drivers/usb/renesas_usbhs/fifo.h
-f:drivers/usb/renesas_usbhs/mod.c
-f:drivers/usb/renesas_usbhs/mod.h
-f:drivers/usb/renesas_usbhs/mod_gadget.c
-f:drivers/usb/renesas_usbhs/mod_host.c
-f:drivers/usb/renesas_usbhs/pipe.c
-f:drivers/usb/renesas_usbhs/pipe.h
-f:drivers/usb/renesas_usbhs/rcar2.c
-f:drivers/usb/renesas_usbhs/rcar2.h
-f:drivers/usb/renesas_usbhs/rcar3.c
-f:drivers/usb/renesas_usbhs/rcar3.h
-f:drivers/usb/renesas_usbhs/rza.c
-f:drivers/usb/renesas_usbhs/rza.h
-f:drivers/usb/renesas_usbhs/rza2.c
-f:drivers/usb/roles/Kconfig
-f:drivers/usb/roles/Makefile
-f:drivers/usb/roles/class.c
-f:drivers/usb/roles/intel-xhci-usb-role-switch.c
-f:drivers/usb/serial/Kconfig
-f:drivers/usb/serial/Makefile
-f:drivers/usb/serial/Makefile-keyspan_pda_fw
-f:drivers/usb/serial/aircable.c
-f:drivers/usb/serial/ark3116.c
-f:drivers/usb/serial/belkin_sa.c
-f:drivers/usb/serial/belkin_sa.h
-f:drivers/usb/serial/bus.c
-f:drivers/usb/serial/ch341.c
-f:drivers/usb/serial/console.c
-f:drivers/usb/serial/cp210x.c
-f:drivers/usb/serial/cyberjack.c
-f:drivers/usb/serial/cypress_m8.c
-f:drivers/usb/serial/cypress_m8.h
-f:drivers/usb/serial/digi_acceleport.c
-f:drivers/usb/serial/empeg.c
-f:drivers/usb/serial/ezusb_convert.pl
-f:drivers/usb/serial/f81232.c
-f:drivers/usb/serial/f81534.c
-f:drivers/usb/serial/ftdi_sio.c
-f:drivers/usb/serial/ftdi_sio.h
-f:drivers/usb/serial/ftdi_sio_ids.h
-f:drivers/usb/serial/garmin_gps.c
-f:drivers/usb/serial/generic.c
-f:drivers/usb/serial/io_16654.h
-f:drivers/usb/serial/io_edgeport.c
-f:drivers/usb/serial/io_edgeport.h
-f:drivers/usb/serial/io_ionsp.h
-f:drivers/usb/serial/io_ti.c
-f:drivers/usb/serial/io_ti.h
-f:drivers/usb/serial/io_usbvend.h
-f:drivers/usb/serial/ipaq.c
-f:drivers/usb/serial/ipw.c
-f:drivers/usb/serial/ir-usb.c
-f:drivers/usb/serial/iuu_phoenix.c
-f:drivers/usb/serial/iuu_phoenix.h
-f:drivers/usb/serial/keyspan.c
-f:drivers/usb/serial/keyspan_pda.c
-f:drivers/usb/serial/keyspan_usa26msg.h
-f:drivers/usb/serial/keyspan_usa28msg.h
-f:drivers/usb/serial/keyspan_usa49msg.h
-f:drivers/usb/serial/keyspan_usa67msg.h
-f:drivers/usb/serial/keyspan_usa90msg.h
-f:drivers/usb/serial/kl5kusb105.c
-f:drivers/usb/serial/kl5kusb105.h
-f:drivers/usb/serial/kobil_sct.c
-f:drivers/usb/serial/kobil_sct.h
-f:drivers/usb/serial/mct_u232.c
-f:drivers/usb/serial/mct_u232.h
-f:drivers/usb/serial/metro-usb.c
-f:drivers/usb/serial/mos7720.c
-f:drivers/usb/serial/mos7840.c
-f:drivers/usb/serial/mxuport.c
-f:drivers/usb/serial/navman.c
-f:drivers/usb/serial/omninet.c
-f:drivers/usb/serial/opticon.c
-f:drivers/usb/serial/option.c
-f:drivers/usb/serial/oti6858.c
-f:drivers/usb/serial/oti6858.h
-f:drivers/usb/serial/pl2303.c
-f:drivers/usb/serial/pl2303.h
-f:drivers/usb/serial/qcaux.c
-f:drivers/usb/serial/qcserial.c
-f:drivers/usb/serial/quatech2.c
-f:drivers/usb/serial/safe_serial.c
-f:drivers/usb/serial/sierra.c
-f:drivers/usb/serial/spcp8x5.c
-f:drivers/usb/serial/ssu100.c
-f:drivers/usb/serial/symbolserial.c
-f:drivers/usb/serial/ti_usb_3410_5052.c
-f:drivers/usb/serial/upd78f0730.c
-f:drivers/usb/serial/usb-serial-simple.c
-f:drivers/usb/serial/usb-serial.c
-f:drivers/usb/serial/usb-wwan.h
-f:drivers/usb/serial/usb_debug.c
-f:drivers/usb/serial/usb_wwan.c
-f:drivers/usb/serial/visor.c
-f:drivers/usb/serial/visor.h
-f:drivers/usb/serial/whiteheat.c
-f:drivers/usb/serial/whiteheat.h
-f:drivers/usb/serial/wishbone-serial.c
-f:drivers/usb/serial/xr_serial.c
-f:drivers/usb/serial/xsens_mt.c
-f:drivers/usb/storage/Kconfig
-f:drivers/usb/storage/Makefile
-f:drivers/usb/storage/alauda.c
-f:drivers/usb/storage/cypress_atacb.c
-f:drivers/usb/storage/datafab.c
-f:drivers/usb/storage/debug.c
-f:drivers/usb/storage/debug.h
-f:drivers/usb/storage/ene_ub6250.c
-f:drivers/usb/storage/freecom.c
-f:drivers/usb/storage/initializers.c
-f:drivers/usb/storage/initializers.h
-f:drivers/usb/storage/isd200.c
-f:drivers/usb/storage/jumpshot.c
-f:drivers/usb/storage/karma.c
-f:drivers/usb/storage/onetouch.c
-f:drivers/usb/storage/option_ms.c
-f:drivers/usb/storage/option_ms.h
-f:drivers/usb/storage/protocol.c
-f:drivers/usb/storage/protocol.h
-f:drivers/usb/storage/realtek_cr.c
-f:drivers/usb/storage/scsiglue.c
-f:drivers/usb/storage/scsiglue.h
-f:drivers/usb/storage/sddr09.c
-f:drivers/usb/storage/sddr55.c
-f:drivers/usb/storage/shuttle_usbat.c
-f:drivers/usb/storage/sierra_ms.c
-f:drivers/usb/storage/sierra_ms.h
-f:drivers/usb/storage/transport.c
-f:drivers/usb/storage/transport.h
-f:drivers/usb/storage/uas-detect.h
-f:drivers/usb/storage/uas.c
-f:drivers/usb/storage/unusual_alauda.h
-f:drivers/usb/storage/unusual_cypress.h
-f:drivers/usb/storage/unusual_datafab.h
-f:drivers/usb/storage/unusual_devs.h
-f:drivers/usb/storage/unusual_ene_ub6250.h
-f:drivers/usb/storage/unusual_freecom.h
-f:drivers/usb/storage/unusual_isd200.h
-f:drivers/usb/storage/unusual_jumpshot.h
-f:drivers/usb/storage/unusual_karma.h
-f:drivers/usb/storage/unusual_onetouch.h
-f:drivers/usb/storage/unusual_realtek.h
-f:drivers/usb/storage/unusual_sddr09.h
-f:drivers/usb/storage/unusual_sddr55.h
-f:drivers/usb/storage/unusual_uas.h
-f:drivers/usb/storage/unusual_usbat.h
-f:drivers/usb/storage/usb.c
-f:drivers/usb/storage/usb.h
-f:drivers/usb/storage/usual-tables.c
-f:drivers/usb/typec/Kconfig
-f:drivers/usb/typec/Makefile
-f:drivers/usb/typec/altmodes/Kconfig
-f:drivers/usb/typec/altmodes/Makefile
-f:drivers/usb/typec/altmodes/displayport.c
-f:drivers/usb/typec/altmodes/displayport.h
-f:drivers/usb/typec/altmodes/nvidia.c
-f:drivers/usb/typec/altmodes/thunderbolt.c
-f:drivers/usb/typec/anx7411.c
-f:drivers/usb/typec/bus.c
-f:drivers/usb/typec/bus.h
-f:drivers/usb/typec/class.c
-f:drivers/usb/typec/class.h
-f:drivers/usb/typec/hd3ss3220.c
-f:drivers/usb/typec/mux.c
-f:drivers/usb/typec/mux.h
-f:drivers/usb/typec/mux/Kconfig
-f:drivers/usb/typec/mux/Makefile
-f:drivers/usb/typec/mux/fsa4480.c
-f:drivers/usb/typec/mux/gpio-sbu-mux.c
-f:drivers/usb/typec/mux/intel_pmc_mux.c
-f:drivers/usb/typec/mux/it5205.c
-f:drivers/usb/typec/mux/nb7vpq904m.c
-f:drivers/usb/typec/mux/pi3usb30532.c
-f:drivers/usb/typec/mux/ps883x.c
-f:drivers/usb/typec/mux/ptn36502.c
-f:drivers/usb/typec/mux/tusb1046.c
-f:drivers/usb/typec/mux/wcd939x-usbss.c
-f:drivers/usb/typec/pd.c
-f:drivers/usb/typec/pd.h
-f:drivers/usb/typec/port-mapper.c
-f:drivers/usb/typec/retimer.c
-f:drivers/usb/typec/retimer.h
-f:drivers/usb/typec/rt1719.c
-f:drivers/usb/typec/stusb160x.c
-f:drivers/usb/typec/tcpm/Kconfig
-f:drivers/usb/typec/tcpm/Makefile
-f:drivers/usb/typec/tcpm/fusb302.c
-f:drivers/usb/typec/tcpm/fusb302_reg.h
-f:drivers/usb/typec/tcpm/maxim_contaminant.c
-f:drivers/usb/typec/tcpm/qcom/Makefile
-f:drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c
-f:drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.h
-f:drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c
-f:drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.h
-f:drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy_stub.c
-f:drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.c
-f:drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.h
-f:drivers/usb/typec/tcpm/tcpci.c
-f:drivers/usb/typec/tcpm/tcpci_maxim.h
-f:drivers/usb/typec/tcpm/tcpci_maxim_core.c
-f:drivers/usb/typec/tcpm/tcpci_mt6360.c
-f:drivers/usb/typec/tcpm/tcpci_mt6370.c
-f:drivers/usb/typec/tcpm/tcpci_rt1711h.c
-f:drivers/usb/typec/tcpm/tcpm.c
-f:drivers/usb/typec/tcpm/wcove.c
-f:drivers/usb/typec/tipd/Kconfig
-f:drivers/usb/typec/tipd/Makefile
-f:drivers/usb/typec/tipd/core.c
-f:drivers/usb/typec/tipd/tps6598x.h
-f:drivers/usb/typec/tipd/trace.c
-f:drivers/usb/typec/tipd/trace.h
-f:drivers/usb/typec/ucsi/Kconfig
-f:drivers/usb/typec/ucsi/Makefile
-f:drivers/usb/typec/ucsi/cros_ec_ucsi.c
-f:drivers/usb/typec/ucsi/debugfs.c
-f:drivers/usb/typec/ucsi/displayport.c
-f:drivers/usb/typec/ucsi/psy.c
-f:drivers/usb/typec/ucsi/trace.c
-f:drivers/usb/typec/ucsi/trace.h
-f:drivers/usb/typec/ucsi/ucsi.c
-f:drivers/usb/typec/ucsi/ucsi.h
-f:drivers/usb/typec/ucsi/ucsi_acpi.c
-f:drivers/usb/typec/ucsi/ucsi_ccg.c
-f:drivers/usb/typec/ucsi/ucsi_glink.c
-f:drivers/usb/typec/ucsi/ucsi_huawei_gaokun.c
-f:drivers/usb/typec/ucsi/ucsi_stm32g0.c
-f:drivers/usb/typec/ucsi/ucsi_yoga_c630.c
-f:drivers/usb/typec/wusb3801.c
-f:drivers/usb/usb-skeleton.c
-f:drivers/usb/usbip/Kconfig
-f:drivers/usb/usbip/Makefile
-f:drivers/usb/usbip/stub.h
-f:drivers/usb/usbip/stub_dev.c
-f:drivers/usb/usbip/stub_main.c
-f:drivers/usb/usbip/stub_rx.c
-f:drivers/usb/usbip/stub_tx.c
-f:drivers/usb/usbip/usbip_common.c
-f:drivers/usb/usbip/usbip_common.h
-f:drivers/usb/usbip/usbip_event.c
-f:drivers/usb/usbip/vhci.h
-f:drivers/usb/usbip/vhci_hcd.c
-f:drivers/usb/usbip/vhci_rx.c
-f:drivers/usb/usbip/vhci_sysfs.c
-f:drivers/usb/usbip/vhci_tx.c
-f:drivers/usb/usbip/vudc.h
-f:drivers/usb/usbip/vudc_dev.c
-f:drivers/usb/usbip/vudc_main.c
-f:drivers/usb/usbip/vudc_rx.c
-f:drivers/usb/usbip/vudc_sysfs.c
-f:drivers/usb/usbip/vudc_transfer.c
-f:drivers/usb/usbip/vudc_tx.c
-f:drivers/vdpa/Kconfig
-f:drivers/vdpa/Makefile
-f:drivers/vdpa/alibaba/Makefile
-f:drivers/vdpa/alibaba/eni_vdpa.c
-f:drivers/vdpa/ifcvf/Makefile
-f:drivers/vdpa/ifcvf/ifcvf_base.c
-f:drivers/vdpa/ifcvf/ifcvf_base.h
-f:drivers/vdpa/ifcvf/ifcvf_main.c
-f:drivers/vdpa/mlx5/Makefile
-f:drivers/vdpa/mlx5/core/mlx5_vdpa.h
-f:drivers/vdpa/mlx5/core/mr.c
-f:drivers/vdpa/mlx5/core/resources.c
-f:drivers/vdpa/mlx5/net/debug.c
-f:drivers/vdpa/mlx5/net/mlx5_vnet.c
-f:drivers/vdpa/mlx5/net/mlx5_vnet.h
-f:drivers/vdpa/octeon_ep/Makefile
-f:drivers/vdpa/octeon_ep/octep_vdpa.h
-f:drivers/vdpa/octeon_ep/octep_vdpa_hw.c
-f:drivers/vdpa/octeon_ep/octep_vdpa_main.c
-f:drivers/vdpa/pds/Makefile
-f:drivers/vdpa/pds/aux_drv.c
-f:drivers/vdpa/pds/aux_drv.h
-f:drivers/vdpa/pds/cmds.c
-f:drivers/vdpa/pds/cmds.h
-f:drivers/vdpa/pds/debugfs.c
-f:drivers/vdpa/pds/debugfs.h
-f:drivers/vdpa/pds/vdpa_dev.c
-f:drivers/vdpa/pds/vdpa_dev.h
-f:drivers/vdpa/solidrun/Makefile
-f:drivers/vdpa/solidrun/snet_ctrl.c
-f:drivers/vdpa/solidrun/snet_hwmon.c
-f:drivers/vdpa/solidrun/snet_main.c
-f:drivers/vdpa/solidrun/snet_vdpa.h
-f:drivers/vdpa/vdpa.c
-f:drivers/vdpa/vdpa_sim/Makefile
-f:drivers/vdpa/vdpa_sim/vdpa_sim.c
-f:drivers/vdpa/vdpa_sim/vdpa_sim.h
-f:drivers/vdpa/vdpa_sim/vdpa_sim_blk.c
-f:drivers/vdpa/vdpa_sim/vdpa_sim_net.c
-f:drivers/vdpa/vdpa_user/Makefile
-f:drivers/vdpa/vdpa_user/iova_domain.c
-f:drivers/vdpa/vdpa_user/iova_domain.h
-f:drivers/vdpa/vdpa_user/vduse_dev.c
-f:drivers/vdpa/virtio_pci/Makefile
-f:drivers/vdpa/virtio_pci/vp_vdpa.c
-f:drivers/vfio/Kconfig
-f:drivers/vfio/Makefile
-f:drivers/vfio/cdx/Kconfig
-f:drivers/vfio/cdx/Makefile
-f:drivers/vfio/cdx/intr.c
-f:drivers/vfio/cdx/main.c
-f:drivers/vfio/cdx/private.h
-f:drivers/vfio/container.c
-f:drivers/vfio/debugfs.c
-f:drivers/vfio/device_cdev.c
-f:drivers/vfio/fsl-mc/Kconfig
-f:drivers/vfio/fsl-mc/Makefile
-f:drivers/vfio/fsl-mc/vfio_fsl_mc.c
-f:drivers/vfio/fsl-mc/vfio_fsl_mc_intr.c
-f:drivers/vfio/fsl-mc/vfio_fsl_mc_private.h
-f:drivers/vfio/group.c
-f:drivers/vfio/iommufd.c
-f:drivers/vfio/mdev/Kconfig
-f:drivers/vfio/mdev/Makefile
-f:drivers/vfio/mdev/mdev_core.c
-f:drivers/vfio/mdev/mdev_driver.c
-f:drivers/vfio/mdev/mdev_private.h
-f:drivers/vfio/mdev/mdev_sysfs.c
-f:drivers/vfio/pci/Kconfig
-f:drivers/vfio/pci/Makefile
-f:drivers/vfio/pci/hisilicon/Kconfig
-f:drivers/vfio/pci/hisilicon/Makefile
-f:drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c
-f:drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.h
-f:drivers/vfio/pci/mlx5/Kconfig
-f:drivers/vfio/pci/mlx5/Makefile
-f:drivers/vfio/pci/mlx5/cmd.c
-f:drivers/vfio/pci/mlx5/cmd.h
-f:drivers/vfio/pci/mlx5/main.c
-f:drivers/vfio/pci/nvgrace-gpu/Kconfig
-f:drivers/vfio/pci/nvgrace-gpu/Makefile
-f:drivers/vfio/pci/nvgrace-gpu/main.c
-f:drivers/vfio/pci/pds/Kconfig
-f:drivers/vfio/pci/pds/Makefile
-f:drivers/vfio/pci/pds/cmds.c
-f:drivers/vfio/pci/pds/cmds.h
-f:drivers/vfio/pci/pds/dirty.c
-f:drivers/vfio/pci/pds/dirty.h
-f:drivers/vfio/pci/pds/lm.c
-f:drivers/vfio/pci/pds/lm.h
-f:drivers/vfio/pci/pds/pci_drv.c
-f:drivers/vfio/pci/pds/pci_drv.h
-f:drivers/vfio/pci/pds/vfio_dev.c
-f:drivers/vfio/pci/pds/vfio_dev.h
-f:drivers/vfio/pci/qat/Kconfig
-f:drivers/vfio/pci/qat/Makefile
-f:drivers/vfio/pci/qat/main.c
-f:drivers/vfio/pci/trace.h
-f:drivers/vfio/pci/vfio_pci.c
-f:drivers/vfio/pci/vfio_pci_config.c
-f:drivers/vfio/pci/vfio_pci_core.c
-f:drivers/vfio/pci/vfio_pci_igd.c
-f:drivers/vfio/pci/vfio_pci_intrs.c
-f:drivers/vfio/pci/vfio_pci_priv.h
-f:drivers/vfio/pci/vfio_pci_rdwr.c
-f:drivers/vfio/pci/vfio_pci_zdev.c
-f:drivers/vfio/pci/virtio/Kconfig
-f:drivers/vfio/pci/virtio/Makefile
-f:drivers/vfio/pci/virtio/common.h
-f:drivers/vfio/pci/virtio/legacy_io.c
-f:drivers/vfio/pci/virtio/main.c
-f:drivers/vfio/pci/virtio/migrate.c
-f:drivers/vfio/platform/Kconfig
-f:drivers/vfio/platform/Makefile
-f:drivers/vfio/platform/reset/Kconfig
-f:drivers/vfio/platform/reset/Makefile
-f:drivers/vfio/platform/reset/vfio_platform_amdxgbe.c
-f:drivers/vfio/platform/reset/vfio_platform_bcmflexrm.c
-f:drivers/vfio/platform/reset/vfio_platform_calxedaxgmac.c
-f:drivers/vfio/platform/vfio_amba.c
-f:drivers/vfio/platform/vfio_platform.c
-f:drivers/vfio/platform/vfio_platform_common.c
-f:drivers/vfio/platform/vfio_platform_irq.c
-f:drivers/vfio/platform/vfio_platform_private.h
-f:drivers/vfio/vfio.h
-f:drivers/vfio/vfio_iommu_spapr_tce.c
-f:drivers/vfio/vfio_iommu_type1.c
-f:drivers/vfio/vfio_main.c
-f:drivers/vfio/virqfd.c
-f:drivers/vhost/Kconfig
-f:drivers/vhost/Makefile
-f:drivers/vhost/iotlb.c
-f:drivers/vhost/net.c
-f:drivers/vhost/scsi.c
-f:drivers/vhost/test.c
-f:drivers/vhost/test.h
-f:drivers/vhost/vdpa.c
-f:drivers/vhost/vhost.c
-f:drivers/vhost/vhost.h
-f:drivers/vhost/vringh.c
-f:drivers/vhost/vsock.c
-f:drivers/video/Kconfig
-f:drivers/video/Makefile
-f:drivers/video/aperture.c
-f:drivers/video/backlight/88pm860x_bl.c
-f:drivers/video/backlight/Kconfig
-f:drivers/video/backlight/Makefile
-f:drivers/video/backlight/aat2870_bl.c
-f:drivers/video/backlight/adp5520_bl.c
-f:drivers/video/backlight/adp8860_bl.c
-f:drivers/video/backlight/adp8870_bl.c
-f:drivers/video/backlight/ams369fg06.c
-f:drivers/video/backlight/apple_bl.c
-f:drivers/video/backlight/apple_dwi_bl.c
-f:drivers/video/backlight/arcxcnn_bl.c
-f:drivers/video/backlight/as3711_bl.c
-f:drivers/video/backlight/backlight.c
-f:drivers/video/backlight/bd6107.c
-f:drivers/video/backlight/corgi_lcd.c
-f:drivers/video/backlight/da903x_bl.c
-f:drivers/video/backlight/da9052_bl.c
-f:drivers/video/backlight/ep93xx_bl.c
-f:drivers/video/backlight/gpio_backlight.c
-f:drivers/video/backlight/hp680_bl.c
-f:drivers/video/backlight/hx8357.c
-f:drivers/video/backlight/ili922x.c
-f:drivers/video/backlight/ili9320.c
-f:drivers/video/backlight/ili9320.h
-f:drivers/video/backlight/ipaq_micro_bl.c
-f:drivers/video/backlight/jornada720_bl.c
-f:drivers/video/backlight/jornada720_lcd.c
-f:drivers/video/backlight/kb3886_bl.c
-f:drivers/video/backlight/ktd253-backlight.c
-f:drivers/video/backlight/ktd2801-backlight.c
-f:drivers/video/backlight/ktz8866.c
-f:drivers/video/backlight/l4f00242t03.c
-f:drivers/video/backlight/lcd.c
-f:drivers/video/backlight/led_bl.c
-f:drivers/video/backlight/lm3509_bl.c
-f:drivers/video/backlight/lm3533_bl.c
-f:drivers/video/backlight/lm3630a_bl.c
-f:drivers/video/backlight/lm3639_bl.c
-f:drivers/video/backlight/lms283gf05.c
-f:drivers/video/backlight/lms501kf03.c
-f:drivers/video/backlight/locomolcd.c
-f:drivers/video/backlight/lp855x_bl.c
-f:drivers/video/backlight/lp8788_bl.c
-f:drivers/video/backlight/ltv350qv.c
-f:drivers/video/backlight/ltv350qv.h
-f:drivers/video/backlight/lv5207lp.c
-f:drivers/video/backlight/max8925_bl.c
-f:drivers/video/backlight/mp3309c.c
-f:drivers/video/backlight/mt6370-backlight.c
-f:drivers/video/backlight/omap1_bl.c
-f:drivers/video/backlight/otm3225a.c
-f:drivers/video/backlight/pandora_bl.c
-f:drivers/video/backlight/platform_lcd.c
-f:drivers/video/backlight/pwm_bl.c
-f:drivers/video/backlight/qcom-wled.c
-f:drivers/video/backlight/rave-sp-backlight.c
-f:drivers/video/backlight/rt4831-backlight.c
-f:drivers/video/backlight/sky81452-backlight.c
-f:drivers/video/backlight/tdo24m.c
-f:drivers/video/backlight/tps65217_bl.c
-f:drivers/video/backlight/vgg2432a4.c
-f:drivers/video/backlight/wm831x_bl.c
-f:drivers/video/cmdline.c
-f:drivers/video/console/Kconfig
-f:drivers/video/console/Makefile
-f:drivers/video/console/dummycon.c
-f:drivers/video/console/mdacon.c
-f:drivers/video/console/newport_con.c
-f:drivers/video/console/sticon.c
-f:drivers/video/console/vgacon.c
-f:drivers/video/display_timing.c
-f:drivers/video/fbdev/68328fb.c
-f:drivers/video/fbdev/Kconfig
-f:drivers/video/fbdev/Makefile
-f:drivers/video/fbdev/acornfb.c
-f:drivers/video/fbdev/acornfb.h
-f:drivers/video/fbdev/amifb.c
-f:drivers/video/fbdev/arcfb.c
-f:drivers/video/fbdev/arkfb.c
-f:drivers/video/fbdev/asiliantfb.c
-f:drivers/video/fbdev/atafb.c
-f:drivers/video/fbdev/atafb.h
-f:drivers/video/fbdev/atafb_iplan2p2.c
-f:drivers/video/fbdev/atafb_iplan2p4.c
-f:drivers/video/fbdev/atafb_iplan2p8.c
-f:drivers/video/fbdev/atafb_mfb.c
-f:drivers/video/fbdev/atafb_utils.h
-f:drivers/video/fbdev/atmel_lcdfb.c
-f:drivers/video/fbdev/aty/Makefile
-f:drivers/video/fbdev/aty/ati_ids.h
-f:drivers/video/fbdev/aty/aty128fb.c
-f:drivers/video/fbdev/aty/atyfb.h
-f:drivers/video/fbdev/aty/atyfb_base.c
-f:drivers/video/fbdev/aty/mach64_accel.c
-f:drivers/video/fbdev/aty/mach64_ct.c
-f:drivers/video/fbdev/aty/mach64_cursor.c
-f:drivers/video/fbdev/aty/mach64_gx.c
-f:drivers/video/fbdev/aty/radeon_accel.c
-f:drivers/video/fbdev/aty/radeon_backlight.c
-f:drivers/video/fbdev/aty/radeon_base.c
-f:drivers/video/fbdev/aty/radeon_i2c.c
-f:drivers/video/fbdev/aty/radeon_monitor.c
-f:drivers/video/fbdev/aty/radeon_pm.c
-f:drivers/video/fbdev/aty/radeonfb.h
-f:drivers/video/fbdev/au1100fb.c
-f:drivers/video/fbdev/au1100fb.h
-f:drivers/video/fbdev/au1200fb.c
-f:drivers/video/fbdev/au1200fb.h
-f:drivers/video/fbdev/broadsheetfb.c
-f:drivers/video/fbdev/bt431.h
-f:drivers/video/fbdev/bt455.h
-f:drivers/video/fbdev/bw2.c
-f:drivers/video/fbdev/c2p.h
-f:drivers/video/fbdev/c2p_core.h
-f:drivers/video/fbdev/c2p_iplan2.c
-f:drivers/video/fbdev/c2p_planar.c
-f:drivers/video/fbdev/carminefb.c
-f:drivers/video/fbdev/carminefb.h
-f:drivers/video/fbdev/carminefb_regs.h
-f:drivers/video/fbdev/cg14.c
-f:drivers/video/fbdev/cg3.c
-f:drivers/video/fbdev/cg6.c
-f:drivers/video/fbdev/chipsfb.c
-f:drivers/video/fbdev/cirrusfb.c
-f:drivers/video/fbdev/clps711x-fb.c
-f:drivers/video/fbdev/cobalt_lcdfb.c
-f:drivers/video/fbdev/controlfb.c
-f:drivers/video/fbdev/controlfb.h
-f:drivers/video/fbdev/core/Kconfig
-f:drivers/video/fbdev/core/Makefile
-f:drivers/video/fbdev/core/bitblit.c
-f:drivers/video/fbdev/core/cfbcopyarea.c
-f:drivers/video/fbdev/core/cfbfillrect.c
-f:drivers/video/fbdev/core/cfbimgblt.c
-f:drivers/video/fbdev/core/cfbmem.h
-f:drivers/video/fbdev/core/fb_backlight.c
-f:drivers/video/fbdev/core/fb_chrdev.c
-f:drivers/video/fbdev/core/fb_cmdline.c
-f:drivers/video/fbdev/core/fb_copyarea.h
-f:drivers/video/fbdev/core/fb_ddc.c
-f:drivers/video/fbdev/core/fb_defio.c
-f:drivers/video/fbdev/core/fb_draw.h
-f:drivers/video/fbdev/core/fb_fillrect.h
-f:drivers/video/fbdev/core/fb_imageblit.h
-f:drivers/video/fbdev/core/fb_info.c
-f:drivers/video/fbdev/core/fb_internal.h
-f:drivers/video/fbdev/core/fb_io_fops.c
-f:drivers/video/fbdev/core/fb_logo.c
-f:drivers/video/fbdev/core/fb_notify.c
-f:drivers/video/fbdev/core/fb_procfs.c
-f:drivers/video/fbdev/core/fb_sys_fops.c
-f:drivers/video/fbdev/core/fbcmap.c
-f:drivers/video/fbdev/core/fbcon.c
-f:drivers/video/fbdev/core/fbcon.h
-f:drivers/video/fbdev/core/fbcon_ccw.c
-f:drivers/video/fbdev/core/fbcon_cw.c
-f:drivers/video/fbdev/core/fbcon_rotate.c
-f:drivers/video/fbdev/core/fbcon_rotate.h
-f:drivers/video/fbdev/core/fbcon_ud.c
-f:drivers/video/fbdev/core/fbcvt.c
-f:drivers/video/fbdev/core/fbmem.c
-f:drivers/video/fbdev/core/fbmon.c
-f:drivers/video/fbdev/core/fbsysfs.c
-f:drivers/video/fbdev/core/modedb.c
-f:drivers/video/fbdev/core/softcursor.c
-f:drivers/video/fbdev/core/svgalib.c
-f:drivers/video/fbdev/core/syscopyarea.c
-f:drivers/video/fbdev/core/sysfillrect.c
-f:drivers/video/fbdev/core/sysimgblt.c
-f:drivers/video/fbdev/core/sysmem.h
-f:drivers/video/fbdev/core/tileblit.c
-f:drivers/video/fbdev/cyber2000fb.c
-f:drivers/video/fbdev/cyber2000fb.h
-f:drivers/video/fbdev/dnfb.c
-f:drivers/video/fbdev/edid.h
-f:drivers/video/fbdev/efifb.c
-f:drivers/video/fbdev/ep93xx-fb.c
-f:drivers/video/fbdev/ffb.c
-f:drivers/video/fbdev/fm2fb.c
-f:drivers/video/fbdev/fsl-diu-fb.c
-f:drivers/video/fbdev/g364fb.c
-f:drivers/video/fbdev/gbefb.c
-f:drivers/video/fbdev/geode/Kconfig
-f:drivers/video/fbdev/geode/Makefile
-f:drivers/video/fbdev/geode/display_gx.c
-f:drivers/video/fbdev/geode/display_gx1.c
-f:drivers/video/fbdev/geode/display_gx1.h
-f:drivers/video/fbdev/geode/geodefb.h
-f:drivers/video/fbdev/geode/gx1fb_core.c
-f:drivers/video/fbdev/geode/gxfb.h
-f:drivers/video/fbdev/geode/gxfb_core.c
-f:drivers/video/fbdev/geode/lxfb.h
-f:drivers/video/fbdev/geode/lxfb_core.c
-f:drivers/video/fbdev/geode/lxfb_ops.c
-f:drivers/video/fbdev/geode/suspend_gx.c
-f:drivers/video/fbdev/geode/video_cs5530.c
-f:drivers/video/fbdev/geode/video_cs5530.h
-f:drivers/video/fbdev/geode/video_gx.c
-f:drivers/video/fbdev/goldfishfb.c
-f:drivers/video/fbdev/grvga.c
-f:drivers/video/fbdev/gxt4500.c
-f:drivers/video/fbdev/hecubafb.c
-f:drivers/video/fbdev/hgafb.c
-f:drivers/video/fbdev/hitfb.c
-f:drivers/video/fbdev/hpfb.c
-f:drivers/video/fbdev/hyperv_fb.c
-f:drivers/video/fbdev/i740_reg.h
-f:drivers/video/fbdev/i740fb.c
-f:drivers/video/fbdev/i810/Makefile
-f:drivers/video/fbdev/i810/i810-i2c.c
-f:drivers/video/fbdev/i810/i810.h
-f:drivers/video/fbdev/i810/i810_accel.c
-f:drivers/video/fbdev/i810/i810_dvt.c
-f:drivers/video/fbdev/i810/i810_gtf.c
-f:drivers/video/fbdev/i810/i810_main.c
-f:drivers/video/fbdev/i810/i810_main.h
-f:drivers/video/fbdev/i810/i810_regs.h
-f:drivers/video/fbdev/imsttfb.c
-f:drivers/video/fbdev/imxfb.c
-f:drivers/video/fbdev/kyro/Makefile
-f:drivers/video/fbdev/kyro/STG4000InitDevice.c
-f:drivers/video/fbdev/kyro/STG4000Interface.h
-f:drivers/video/fbdev/kyro/STG4000OverlayDevice.c
-f:drivers/video/fbdev/kyro/STG4000Ramdac.c
-f:drivers/video/fbdev/kyro/STG4000Reg.h
-f:drivers/video/fbdev/kyro/STG4000VTG.c
-f:drivers/video/fbdev/kyro/fbdev.c
-f:drivers/video/fbdev/leo.c
-f:drivers/video/fbdev/macfb.c
-f:drivers/video/fbdev/macmodes.c
-f:drivers/video/fbdev/macmodes.h
-f:drivers/video/fbdev/matrox/Makefile
-f:drivers/video/fbdev/matrox/g450_pll.c
-f:drivers/video/fbdev/matrox/g450_pll.h
-f:drivers/video/fbdev/matrox/i2c-matroxfb.c
-f:drivers/video/fbdev/matrox/matroxfb_DAC1064.c
-f:drivers/video/fbdev/matrox/matroxfb_DAC1064.h
-f:drivers/video/fbdev/matrox/matroxfb_Ti3026.c
-f:drivers/video/fbdev/matrox/matroxfb_Ti3026.h
-f:drivers/video/fbdev/matrox/matroxfb_accel.c
-f:drivers/video/fbdev/matrox/matroxfb_accel.h
-f:drivers/video/fbdev/matrox/matroxfb_base.c
-f:drivers/video/fbdev/matrox/matroxfb_base.h
-f:drivers/video/fbdev/matrox/matroxfb_crtc2.c
-f:drivers/video/fbdev/matrox/matroxfb_crtc2.h
-f:drivers/video/fbdev/matrox/matroxfb_g450.c
-f:drivers/video/fbdev/matrox/matroxfb_g450.h
-f:drivers/video/fbdev/matrox/matroxfb_maven.c
-f:drivers/video/fbdev/matrox/matroxfb_maven.h
-f:drivers/video/fbdev/matrox/matroxfb_misc.c
-f:drivers/video/fbdev/matrox/matroxfb_misc.h
-f:drivers/video/fbdev/maxinefb.c
-f:drivers/video/fbdev/mb862xx/Makefile
-f:drivers/video/fbdev/mb862xx/mb862xx-i2c.c
-f:drivers/video/fbdev/mb862xx/mb862xx_reg.h
-f:drivers/video/fbdev/mb862xx/mb862xxfb.h
-f:drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
-f:drivers/video/fbdev/mb862xx/mb862xxfb_accel.h
-f:drivers/video/fbdev/mb862xx/mb862xxfbdrv.c
-f:drivers/video/fbdev/metronomefb.c
-f:drivers/video/fbdev/mmp/Kconfig
-f:drivers/video/fbdev/mmp/Makefile
-f:drivers/video/fbdev/mmp/core.c
-f:drivers/video/fbdev/mmp/fb/Kconfig
-f:drivers/video/fbdev/mmp/fb/Makefile
-f:drivers/video/fbdev/mmp/fb/mmpfb.c
-f:drivers/video/fbdev/mmp/fb/mmpfb.h
-f:drivers/video/fbdev/mmp/hw/Kconfig
-f:drivers/video/fbdev/mmp/hw/Makefile
-f:drivers/video/fbdev/mmp/hw/mmp_ctrl.c
-f:drivers/video/fbdev/mmp/hw/mmp_ctrl.h
-f:drivers/video/fbdev/mmp/hw/mmp_spi.c
-f:drivers/video/fbdev/mmp/panel/Kconfig
-f:drivers/video/fbdev/mmp/panel/Makefile
-f:drivers/video/fbdev/mmp/panel/tpo_tj032md01bw.c
-f:drivers/video/fbdev/n411.c
-f:drivers/video/fbdev/neofb.c
-f:drivers/video/fbdev/nvidia/Makefile
-f:drivers/video/fbdev/nvidia/nv_accel.c
-f:drivers/video/fbdev/nvidia/nv_backlight.c
-f:drivers/video/fbdev/nvidia/nv_dma.h
-f:drivers/video/fbdev/nvidia/nv_hw.c
-f:drivers/video/fbdev/nvidia/nv_i2c.c
-f:drivers/video/fbdev/nvidia/nv_local.h
-f:drivers/video/fbdev/nvidia/nv_of.c
-f:drivers/video/fbdev/nvidia/nv_proto.h
-f:drivers/video/fbdev/nvidia/nv_setup.c
-f:drivers/video/fbdev/nvidia/nv_type.h
-f:drivers/video/fbdev/nvidia/nvidia.c
-f:drivers/video/fbdev/ocfb.c
-f:drivers/video/fbdev/offb.c
-f:drivers/video/fbdev/omap/Kconfig
-f:drivers/video/fbdev/omap/Makefile
-f:drivers/video/fbdev/omap/hwa742.c
-f:drivers/video/fbdev/omap/lcd_ams_delta.c
-f:drivers/video/fbdev/omap/lcd_dma.c
-f:drivers/video/fbdev/omap/lcd_dma.h
-f:drivers/video/fbdev/omap/lcd_mipid.c
-f:drivers/video/fbdev/omap/lcd_palmte.c
-f:drivers/video/fbdev/omap/lcdc.c
-f:drivers/video/fbdev/omap/lcdc.h
-f:drivers/video/fbdev/omap/omapfb.h
-f:drivers/video/fbdev/omap/omapfb_main.c
-f:drivers/video/fbdev/omap/sossi.c
-f:drivers/video/fbdev/omap2/Kconfig
-f:drivers/video/fbdev/omap2/Makefile
-f:drivers/video/fbdev/omap2/omapfb/Kconfig
-f:drivers/video/fbdev/omap2/omapfb/Makefile
-f:drivers/video/fbdev/omap2/omapfb/displays/Kconfig
-f:drivers/video/fbdev/omap2/omapfb/displays/Makefile
-f:drivers/video/fbdev/omap2/omapfb/displays/connector-analog-tv.c
-f:drivers/video/fbdev/omap2/omapfb/displays/connector-dvi.c
-f:drivers/video/fbdev/omap2/omapfb/displays/connector-hdmi.c
-f:drivers/video/fbdev/omap2/omapfb/displays/encoder-opa362.c
-f:drivers/video/fbdev/omap2/omapfb/displays/encoder-tfp410.c
-f:drivers/video/fbdev/omap2/omapfb/displays/encoder-tpd12s015.c
-f:drivers/video/fbdev/omap2/omapfb/displays/panel-dpi.c
-f:drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.c
-f:drivers/video/fbdev/omap2/omapfb/displays/panel-lgphilips-lb035q02.c
-f:drivers/video/fbdev/omap2/omapfb/displays/panel-nec-nl8048hl11.c
-f:drivers/video/fbdev/omap2/omapfb/displays/panel-sharp-ls037v7dw01.c
-f:drivers/video/fbdev/omap2/omapfb/displays/panel-sony-acx565akm.c
-f:drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td028ttec1.c
-f:drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td043mtea1.c
-f:drivers/video/fbdev/omap2/omapfb/dss/Kconfig
-f:drivers/video/fbdev/omap2/omapfb/dss/Makefile
-f:drivers/video/fbdev/omap2/omapfb/dss/apply.c
-f:drivers/video/fbdev/omap2/omapfb/dss/core.c
-f:drivers/video/fbdev/omap2/omapfb/dss/dispc-compat.c
-f:drivers/video/fbdev/omap2/omapfb/dss/dispc-compat.h
-f:drivers/video/fbdev/omap2/omapfb/dss/dispc.c
-f:drivers/video/fbdev/omap2/omapfb/dss/dispc.h
-f:drivers/video/fbdev/omap2/omapfb/dss/dispc_coefs.c
-f:drivers/video/fbdev/omap2/omapfb/dss/display-sysfs.c
-f:drivers/video/fbdev/omap2/omapfb/dss/display.c
-f:drivers/video/fbdev/omap2/omapfb/dss/dpi.c
-f:drivers/video/fbdev/omap2/omapfb/dss/dsi.c
-f:drivers/video/fbdev/omap2/omapfb/dss/dss-of.c
-f:drivers/video/fbdev/omap2/omapfb/dss/dss.c
-f:drivers/video/fbdev/omap2/omapfb/dss/dss.h
-f:drivers/video/fbdev/omap2/omapfb/dss/dss_features.c
-f:drivers/video/fbdev/omap2/omapfb/dss/dss_features.h
-f:drivers/video/fbdev/omap2/omapfb/dss/hdmi.h
-f:drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c
-f:drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c
-f:drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.h
-f:drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c
-f:drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c
-f:drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.h
-f:drivers/video/fbdev/omap2/omapfb/dss/hdmi_common.c
-f:drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c
-f:drivers/video/fbdev/omap2/omapfb/dss/hdmi_pll.c
-f:drivers/video/fbdev/omap2/omapfb/dss/hdmi_wp.c
-f:drivers/video/fbdev/omap2/omapfb/dss/manager-sysfs.c
-f:drivers/video/fbdev/omap2/omapfb/dss/manager.c
-f:drivers/video/fbdev/omap2/omapfb/dss/omapdss-boot-init.c
-f:drivers/video/fbdev/omap2/omapfb/dss/output.c
-f:drivers/video/fbdev/omap2/omapfb/dss/overlay-sysfs.c
-f:drivers/video/fbdev/omap2/omapfb/dss/overlay.c
-f:drivers/video/fbdev/omap2/omapfb/dss/pll.c
-f:drivers/video/fbdev/omap2/omapfb/dss/sdi.c
-f:drivers/video/fbdev/omap2/omapfb/dss/venc.c
-f:drivers/video/fbdev/omap2/omapfb/dss/video-pll.c
-f:drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c
-f:drivers/video/fbdev/omap2/omapfb/omapfb-main.c
-f:drivers/video/fbdev/omap2/omapfb/omapfb-sysfs.c
-f:drivers/video/fbdev/omap2/omapfb/omapfb.h
-f:drivers/video/fbdev/omap2/omapfb/vrfb.c
-f:drivers/video/fbdev/p9100.c
-f:drivers/video/fbdev/platinumfb.c
-f:drivers/video/fbdev/platinumfb.h
-f:drivers/video/fbdev/pm2fb.c
-f:drivers/video/fbdev/pm3fb.c
-f:drivers/video/fbdev/pmag-aa-fb.c
-f:drivers/video/fbdev/pmag-ba-fb.c
-f:drivers/video/fbdev/pmagb-b-fb.c
-f:drivers/video/fbdev/ps3fb.c
-f:drivers/video/fbdev/pvr2fb.c
-f:drivers/video/fbdev/pxa168fb.c
-f:drivers/video/fbdev/pxa168fb.h
-f:drivers/video/fbdev/pxa3xx-gcu.c
-f:drivers/video/fbdev/pxa3xx-gcu.h
-f:drivers/video/fbdev/pxa3xx-regs.h
-f:drivers/video/fbdev/pxafb.c
-f:drivers/video/fbdev/pxafb.h
-f:drivers/video/fbdev/q40fb.c
-f:drivers/video/fbdev/riva/Makefile
-f:drivers/video/fbdev/riva/fbdev.c
-f:drivers/video/fbdev/riva/nv_driver.c
-f:drivers/video/fbdev/riva/nv_type.h
-f:drivers/video/fbdev/riva/nvreg.h
-f:drivers/video/fbdev/riva/riva_hw.c
-f:drivers/video/fbdev/riva/riva_hw.h
-f:drivers/video/fbdev/riva/riva_tbl.h
-f:drivers/video/fbdev/riva/rivafb-i2c.c
-f:drivers/video/fbdev/riva/rivafb.h
-f:drivers/video/fbdev/s1d13xxxfb.c
-f:drivers/video/fbdev/s3c-fb.c
-f:drivers/video/fbdev/s3fb.c
-f:drivers/video/fbdev/sa1100fb.c
-f:drivers/video/fbdev/sa1100fb.h
-f:drivers/video/fbdev/savage/Makefile
-f:drivers/video/fbdev/savage/savagefb-i2c.c
-f:drivers/video/fbdev/savage/savagefb.h
-f:drivers/video/fbdev/savage/savagefb_accel.c
-f:drivers/video/fbdev/savage/savagefb_driver.c
-f:drivers/video/fbdev/sbuslib.c
-f:drivers/video/fbdev/sbuslib.h
-f:drivers/video/fbdev/sh7760fb.c
-f:drivers/video/fbdev/sh_mobile_lcdcfb.c
-f:drivers/video/fbdev/sh_mobile_lcdcfb.h
-f:drivers/video/fbdev/simplefb.c
-f:drivers/video/fbdev/sis/300vtbl.h
-f:drivers/video/fbdev/sis/310vtbl.h
-f:drivers/video/fbdev/sis/Makefile
-f:drivers/video/fbdev/sis/init.c
-f:drivers/video/fbdev/sis/init.h
-f:drivers/video/fbdev/sis/init301.c
-f:drivers/video/fbdev/sis/init301.h
-f:drivers/video/fbdev/sis/initdef.h
-f:drivers/video/fbdev/sis/initextlfb.c
-f:drivers/video/fbdev/sis/oem300.h
-f:drivers/video/fbdev/sis/oem310.h
-f:drivers/video/fbdev/sis/sis.h
-f:drivers/video/fbdev/sis/sis_accel.c
-f:drivers/video/fbdev/sis/sis_accel.h
-f:drivers/video/fbdev/sis/sis_main.c
-f:drivers/video/fbdev/sis/sis_main.h
-f:drivers/video/fbdev/sis/vgatypes.h
-f:drivers/video/fbdev/sis/vstruct.h
-f:drivers/video/fbdev/skeletonfb.c
-f:drivers/video/fbdev/sm501fb.c
-f:drivers/video/fbdev/sm712.h
-f:drivers/video/fbdev/sm712fb.c
-f:drivers/video/fbdev/smscufx.c
-f:drivers/video/fbdev/ssd1307fb.c
-f:drivers/video/fbdev/sstfb.c
-f:drivers/video/fbdev/stifb.c
-f:drivers/video/fbdev/sunxvr1000.c
-f:drivers/video/fbdev/sunxvr2500.c
-f:drivers/video/fbdev/sunxvr500.c
-f:drivers/video/fbdev/tcx.c
-f:drivers/video/fbdev/tdfxfb.c
-f:drivers/video/fbdev/tgafb.c
-f:drivers/video/fbdev/tridentfb.c
-f:drivers/video/fbdev/udlfb.c
-f:drivers/video/fbdev/uvesafb.c
-f:drivers/video/fbdev/valkyriefb.c
-f:drivers/video/fbdev/valkyriefb.h
-f:drivers/video/fbdev/vesafb.c
-f:drivers/video/fbdev/vfb.c
-f:drivers/video/fbdev/vga16fb.c
-f:drivers/video/fbdev/via/Makefile
-f:drivers/video/fbdev/via/accel.c
-f:drivers/video/fbdev/via/accel.h
-f:drivers/video/fbdev/via/chip.h
-f:drivers/video/fbdev/via/debug.h
-f:drivers/video/fbdev/via/dvi.c
-f:drivers/video/fbdev/via/dvi.h
-f:drivers/video/fbdev/via/global.c
-f:drivers/video/fbdev/via/global.h
-f:drivers/video/fbdev/via/hw.c
-f:drivers/video/fbdev/via/hw.h
-f:drivers/video/fbdev/via/ioctl.c
-f:drivers/video/fbdev/via/ioctl.h
-f:drivers/video/fbdev/via/lcd.c
-f:drivers/video/fbdev/via/lcd.h
-f:drivers/video/fbdev/via/share.h
-f:drivers/video/fbdev/via/tblDPASetting.c
-f:drivers/video/fbdev/via/tblDPASetting.h
-f:drivers/video/fbdev/via/via-core.c
-f:drivers/video/fbdev/via/via-gpio.c
-f:drivers/video/fbdev/via/via-gpio.h
-f:drivers/video/fbdev/via/via_aux.c
-f:drivers/video/fbdev/via/via_aux.h
-f:drivers/video/fbdev/via/via_aux_ch7301.c
-f:drivers/video/fbdev/via/via_aux_edid.c
-f:drivers/video/fbdev/via/via_aux_sii164.c
-f:drivers/video/fbdev/via/via_aux_vt1621.c
-f:drivers/video/fbdev/via/via_aux_vt1622.c
-f:drivers/video/fbdev/via/via_aux_vt1625.c
-f:drivers/video/fbdev/via/via_aux_vt1631.c
-f:drivers/video/fbdev/via/via_aux_vt1632.c
-f:drivers/video/fbdev/via/via_aux_vt1636.c
-f:drivers/video/fbdev/via/via_clock.c
-f:drivers/video/fbdev/via/via_clock.h
-f:drivers/video/fbdev/via/via_i2c.c
-f:drivers/video/fbdev/via/via_modesetting.c
-f:drivers/video/fbdev/via/via_modesetting.h
-f:drivers/video/fbdev/via/via_utility.c
-f:drivers/video/fbdev/via/via_utility.h
-f:drivers/video/fbdev/via/viafbdev.c
-f:drivers/video/fbdev/via/viafbdev.h
-f:drivers/video/fbdev/via/viamode.c
-f:drivers/video/fbdev/via/viamode.h
-f:drivers/video/fbdev/via/vt1636.c
-f:drivers/video/fbdev/via/vt1636.h
-f:drivers/video/fbdev/vt8500lcdfb.c
-f:drivers/video/fbdev/vt8500lcdfb.h
-f:drivers/video/fbdev/vt8623fb.c
-f:drivers/video/fbdev/wm8505fb.c
-f:drivers/video/fbdev/wm8505fb_regs.h
-f:drivers/video/fbdev/wmt_ge_rops.c
-f:drivers/video/fbdev/wmt_ge_rops.h
-f:drivers/video/fbdev/xen-fbfront.c
-f:drivers/video/fbdev/xilinxfb.c
-f:drivers/video/hdmi.c
-f:drivers/video/logo/.gitignore
-f:drivers/video/logo/Kconfig
-f:drivers/video/logo/Makefile
-f:drivers/video/logo/clut_vga16.ppm
-f:drivers/video/logo/logo.c
-f:drivers/video/logo/logo_dec_clut224.ppm
-f:drivers/video/logo/logo_linux_clut224.ppm
-f:drivers/video/logo/logo_linux_mono.pbm
-f:drivers/video/logo/logo_linux_vga16.ppm
-f:drivers/video/logo/logo_mac_clut224.ppm
-f:drivers/video/logo/logo_parisc_clut224.ppm
-f:drivers/video/logo/logo_sgi_clut224.ppm
-f:drivers/video/logo/logo_spe_clut224.ppm
-f:drivers/video/logo/logo_sun_clut224.ppm
-f:drivers/video/logo/logo_superh_clut224.ppm
-f:drivers/video/logo/logo_superh_mono.pbm
-f:drivers/video/logo/logo_superh_vga16.ppm
-f:drivers/video/logo/pnmtologo.c
-f:drivers/video/nomodeset.c
-f:drivers/video/of_display_timing.c
-f:drivers/video/of_videomode.c
-f:drivers/video/screen_info_generic.c
-f:drivers/video/screen_info_pci.c
-f:drivers/video/sticore.c
-f:drivers/video/vgastate.c
-f:drivers/video/videomode.c
-f:drivers/virt/Kconfig
-f:drivers/virt/Makefile
-f:drivers/virt/acrn/Kconfig
-f:drivers/virt/acrn/Makefile
-f:drivers/virt/acrn/acrn_drv.h
-f:drivers/virt/acrn/hsm.c
-f:drivers/virt/acrn/hypercall.h
-f:drivers/virt/acrn/ioeventfd.c
-f:drivers/virt/acrn/ioreq.c
-f:drivers/virt/acrn/irqfd.c
-f:drivers/virt/acrn/mm.c
-f:drivers/virt/acrn/vm.c
-f:drivers/virt/coco/Kconfig
-f:drivers/virt/coco/Makefile
-f:drivers/virt/coco/arm-cca-guest/Kconfig
-f:drivers/virt/coco/arm-cca-guest/Makefile
-f:drivers/virt/coco/arm-cca-guest/arm-cca-guest.c
-f:drivers/virt/coco/efi_secret/Kconfig
-f:drivers/virt/coco/efi_secret/Makefile
-f:drivers/virt/coco/efi_secret/efi_secret.c
-f:drivers/virt/coco/guest/Kconfig
-f:drivers/virt/coco/guest/Makefile
-f:drivers/virt/coco/guest/report.c
-f:drivers/virt/coco/guest/tsm-mr.c
-f:drivers/virt/coco/pkvm-guest/Kconfig
-f:drivers/virt/coco/pkvm-guest/Makefile
-f:drivers/virt/coco/pkvm-guest/arm-pkvm-guest.c
-f:drivers/virt/coco/sev-guest/Kconfig
-f:drivers/virt/coco/sev-guest/Makefile
-f:drivers/virt/coco/sev-guest/sev-guest.c
-f:drivers/virt/coco/tdx-guest/Kconfig
-f:drivers/virt/coco/tdx-guest/Makefile
-f:drivers/virt/coco/tdx-guest/tdx-guest.c
-f:drivers/virt/fsl_hypervisor.c
-f:drivers/virt/nitro_enclaves/Kconfig
-f:drivers/virt/nitro_enclaves/Makefile
-f:drivers/virt/nitro_enclaves/ne_misc_dev.c
-f:drivers/virt/nitro_enclaves/ne_misc_dev.h
-f:drivers/virt/nitro_enclaves/ne_misc_dev_test.c
-f:drivers/virt/nitro_enclaves/ne_pci_dev.c
-f:drivers/virt/nitro_enclaves/ne_pci_dev.h
-f:drivers/virt/vboxguest/Kconfig
-f:drivers/virt/vboxguest/Makefile
-f:drivers/virt/vboxguest/vboxguest_core.c
-f:drivers/virt/vboxguest/vboxguest_core.h
-f:drivers/virt/vboxguest/vboxguest_linux.c
-f:drivers/virt/vboxguest/vboxguest_utils.c
-f:drivers/virt/vboxguest/vboxguest_version.h
-f:drivers/virt/vboxguest/vmmdev.h
-f:drivers/virt/vmgenid.c
-f:drivers/virtio/Kconfig
-f:drivers/virtio/Makefile
-f:drivers/virtio/virtio.c
-f:drivers/virtio/virtio_anchor.c
-f:drivers/virtio/virtio_balloon.c
-f:drivers/virtio/virtio_debug.c
-f:drivers/virtio/virtio_dma_buf.c
-f:drivers/virtio/virtio_input.c
-f:drivers/virtio/virtio_mem.c
-f:drivers/virtio/virtio_mmio.c
-f:drivers/virtio/virtio_pci_admin_legacy_io.c
-f:drivers/virtio/virtio_pci_common.c
-f:drivers/virtio/virtio_pci_common.h
-f:drivers/virtio/virtio_pci_legacy.c
-f:drivers/virtio/virtio_pci_legacy_dev.c
-f:drivers/virtio/virtio_pci_modern.c
-f:drivers/virtio/virtio_pci_modern_dev.c
-f:drivers/virtio/virtio_ring.c
-f:drivers/virtio/virtio_rtc_arm.c
-f:drivers/virtio/virtio_rtc_class.c
-f:drivers/virtio/virtio_rtc_driver.c
-f:drivers/virtio/virtio_rtc_internal.h
-f:drivers/virtio/virtio_rtc_ptp.c
-f:drivers/virtio/virtio_vdpa.c
-f:drivers/w1/Kconfig
-f:drivers/w1/Makefile
-f:drivers/w1/masters/Kconfig
-f:drivers/w1/masters/Makefile
-f:drivers/w1/masters/amd_axi_w1.c
-f:drivers/w1/masters/ds2482.c
-f:drivers/w1/masters/ds2490.c
-f:drivers/w1/masters/matrox_w1.c
-f:drivers/w1/masters/mxc_w1.c
-f:drivers/w1/masters/omap_hdq.c
-f:drivers/w1/masters/sgi_w1.c
-f:drivers/w1/masters/w1-gpio.c
-f:drivers/w1/masters/w1-uart.c
-f:drivers/w1/slaves/Kconfig
-f:drivers/w1/slaves/Makefile
-f:drivers/w1/slaves/w1_ds2405.c
-f:drivers/w1/slaves/w1_ds2406.c
-f:drivers/w1/slaves/w1_ds2408.c
-f:drivers/w1/slaves/w1_ds2413.c
-f:drivers/w1/slaves/w1_ds2423.c
-f:drivers/w1/slaves/w1_ds2430.c
-f:drivers/w1/slaves/w1_ds2431.c
-f:drivers/w1/slaves/w1_ds2433.c
-f:drivers/w1/slaves/w1_ds2438.c
-f:drivers/w1/slaves/w1_ds250x.c
-f:drivers/w1/slaves/w1_ds2780.c
-f:drivers/w1/slaves/w1_ds2780.h
-f:drivers/w1/slaves/w1_ds2781.c
-f:drivers/w1/slaves/w1_ds2781.h
-f:drivers/w1/slaves/w1_ds2805.c
-f:drivers/w1/slaves/w1_ds28e04.c
-f:drivers/w1/slaves/w1_ds28e17.c
-f:drivers/w1/slaves/w1_smem.c
-f:drivers/w1/slaves/w1_therm.c
-f:drivers/w1/w1.c
-f:drivers/w1/w1_family.c
-f:drivers/w1/w1_int.c
-f:drivers/w1/w1_internal.h
-f:drivers/w1/w1_io.c
-f:drivers/w1/w1_netlink.c
-f:drivers/w1/w1_netlink.h
-f:drivers/watchdog/Kconfig
-f:drivers/watchdog/Makefile
-f:drivers/watchdog/acquirewdt.c
-f:drivers/watchdog/advantech_ec_wdt.c
-f:drivers/watchdog/advantechwdt.c
-f:drivers/watchdog/airoha_wdt.c
-f:drivers/watchdog/alim1535_wdt.c
-f:drivers/watchdog/alim7101_wdt.c
-f:drivers/watchdog/apple_wdt.c
-f:drivers/watchdog/arm_smc_wdt.c
-f:drivers/watchdog/armada_37xx_wdt.c
-f:drivers/watchdog/asm9260_wdt.c
-f:drivers/watchdog/aspeed_wdt.c
-f:drivers/watchdog/at91rm9200_wdt.c
-f:drivers/watchdog/at91sam9_wdt.c
-f:drivers/watchdog/at91sam9_wdt.h
-f:drivers/watchdog/ath79_wdt.c
-f:drivers/watchdog/bcm2835_wdt.c
-f:drivers/watchdog/bcm47xx_wdt.c
-f:drivers/watchdog/bcm7038_wdt.c
-f:drivers/watchdog/bcm_kona_wdt.c
-f:drivers/watchdog/bd9576_wdt.c
-f:drivers/watchdog/bd96801_wdt.c
-f:drivers/watchdog/booke_wdt.c
-f:drivers/watchdog/cadence_wdt.c
-f:drivers/watchdog/cgbc_wdt.c
-f:drivers/watchdog/cpwd.c
-f:drivers/watchdog/cros_ec_wdt.c
-f:drivers/watchdog/da9052_wdt.c
-f:drivers/watchdog/da9055_wdt.c
-f:drivers/watchdog/da9062_wdt.c
-f:drivers/watchdog/da9063_wdt.c
-f:drivers/watchdog/davinci_wdt.c
-f:drivers/watchdog/db8500_wdt.c
-f:drivers/watchdog/diag288_wdt.c
-f:drivers/watchdog/digicolor_wdt.c
-f:drivers/watchdog/dw_wdt.c
-f:drivers/watchdog/ebc-c384_wdt.c
-f:drivers/watchdog/ep93xx_wdt.c
-f:drivers/watchdog/eurotechwdt.c
-f:drivers/watchdog/exar_wdt.c
-f:drivers/watchdog/f71808e_wdt.c
-f:drivers/watchdog/ftwdt010_wdt.c
-f:drivers/watchdog/gef_wdt.c
-f:drivers/watchdog/geodewdt.c
-f:drivers/watchdog/gpio_wdt.c
-f:drivers/watchdog/gxp-wdt.c
-f:drivers/watchdog/hpwdt.c
-f:drivers/watchdog/i6300esb.c
-f:drivers/watchdog/iTCO_vendor.h
-f:drivers/watchdog/iTCO_vendor_support.c
-f:drivers/watchdog/iTCO_wdt.c
-f:drivers/watchdog/ib700wdt.c
-f:drivers/watchdog/ibmasr.c
-f:drivers/watchdog/ie6xx_wdt.c
-f:drivers/watchdog/imgpdc_wdt.c
-f:drivers/watchdog/imx2_wdt.c
-f:drivers/watchdog/imx7ulp_wdt.c
-f:drivers/watchdog/imx_sc_wdt.c
-f:drivers/watchdog/indydog.c
-f:drivers/watchdog/intel-mid_wdt.c
-f:drivers/watchdog/intel_oc_wdt.c
-f:drivers/watchdog/it8712f_wdt.c
-f:drivers/watchdog/it87_wdt.c
-f:drivers/watchdog/ixp4xx_wdt.c
-f:drivers/watchdog/jz4740_wdt.c
-f:drivers/watchdog/keembay_wdt.c
-f:drivers/watchdog/kempld_wdt.c
-f:drivers/watchdog/lantiq_wdt.c
-f:drivers/watchdog/lenovo_se10_wdt.c
-f:drivers/watchdog/lenovo_se30_wdt.c
-f:drivers/watchdog/loongson1_wdt.c
-f:drivers/watchdog/lpc18xx_wdt.c
-f:drivers/watchdog/m54xx_wdt.c
-f:drivers/watchdog/machzwd.c
-f:drivers/watchdog/marvell_gti_wdt.c
-f:drivers/watchdog/max63xx_wdt.c
-f:drivers/watchdog/max77620_wdt.c
-f:drivers/watchdog/mei_wdt.c
-f:drivers/watchdog/mena21_wdt.c
-f:drivers/watchdog/menf21bmc_wdt.c
-f:drivers/watchdog/menz69_wdt.c
-f:drivers/watchdog/meson_gxbb_wdt.c
-f:drivers/watchdog/meson_wdt.c
-f:drivers/watchdog/mixcomwd.c
-f:drivers/watchdog/mlx_wdt.c
-f:drivers/watchdog/moxart_wdt.c
-f:drivers/watchdog/mpc8xxx_wdt.c
-f:drivers/watchdog/msc313e_wdt.c
-f:drivers/watchdog/mt7621_wdt.c
-f:drivers/watchdog/mtk_wdt.c
-f:drivers/watchdog/mtx-1_wdt.c
-f:drivers/watchdog/ni903x_wdt.c
-f:drivers/watchdog/nic7018_wdt.c
-f:drivers/watchdog/npcm_wdt.c
-f:drivers/watchdog/nv_tco.c
-f:drivers/watchdog/nv_tco.h
-f:drivers/watchdog/octeon-wdt-main.c
-f:drivers/watchdog/octeon-wdt-nmi.S
-f:drivers/watchdog/of_xilinx_wdt.c
-f:drivers/watchdog/omap_wdt.c
-f:drivers/watchdog/omap_wdt.h
-f:drivers/watchdog/orion_wdt.c
-f:drivers/watchdog/pc87413_wdt.c
-f:drivers/watchdog/pcwd.c
-f:drivers/watchdog/pcwd_pci.c
-f:drivers/watchdog/pcwd_usb.c
-f:drivers/watchdog/pic32-dmt.c
-f:drivers/watchdog/pic32-wdt.c
-f:drivers/watchdog/pika_wdt.c
-f:drivers/watchdog/pm8916_wdt.c
-f:drivers/watchdog/pnx4008_wdt.c
-f:drivers/watchdog/pretimeout_noop.c
-f:drivers/watchdog/pretimeout_panic.c
-f:drivers/watchdog/pseries-wdt.c
-f:drivers/watchdog/qcom-wdt.c
-f:drivers/watchdog/rave-sp-wdt.c
-f:drivers/watchdog/rc32434_wdt.c
-f:drivers/watchdog/rdc321x_wdt.c
-f:drivers/watchdog/realtek_otto_wdt.c
-f:drivers/watchdog/renesas_wdt.c
-f:drivers/watchdog/retu_wdt.c
-f:drivers/watchdog/riowd.c
-f:drivers/watchdog/rn5t618_wdt.c
-f:drivers/watchdog/rt2880_wdt.c
-f:drivers/watchdog/rtd119x_wdt.c
-f:drivers/watchdog/rti_wdt.c
-f:drivers/watchdog/rza_wdt.c
-f:drivers/watchdog/rzg2l_wdt.c
-f:drivers/watchdog/rzn1_wdt.c
-f:drivers/watchdog/rzv2h_wdt.c
-f:drivers/watchdog/s32g_wdt.c
-f:drivers/watchdog/s3c2410_wdt.c
-f:drivers/watchdog/sa1100_wdt.c
-f:drivers/watchdog/sama5d4_wdt.c
-f:drivers/watchdog/sb_wdog.c
-f:drivers/watchdog/sbc60xxwdt.c
-f:drivers/watchdog/sbc7240_wdt.c
-f:drivers/watchdog/sbc8360.c
-f:drivers/watchdog/sbc_epx_c3.c
-f:drivers/watchdog/sbc_fitpc2_wdt.c
-f:drivers/watchdog/sbsa_gwdt.c
-f:drivers/watchdog/sc1200wdt.c
-f:drivers/watchdog/sc520_wdt.c
-f:drivers/watchdog/sch311x_wdt.c
-f:drivers/watchdog/scx200_wdt.c
-f:drivers/watchdog/shwdt.c
-f:drivers/watchdog/simatic-ipc-wdt.c
-f:drivers/watchdog/sl28cpld_wdt.c
-f:drivers/watchdog/smsc37b787_wdt.c
-f:drivers/watchdog/softdog.c
-f:drivers/watchdog/sp5100_tco.c
-f:drivers/watchdog/sp5100_tco.h
-f:drivers/watchdog/sp805_wdt.c
-f:drivers/watchdog/sprd_wdt.c
-f:drivers/watchdog/st_lpc_wdt.c
-f:drivers/watchdog/starfive-wdt.c
-f:drivers/watchdog/stm32_iwdg.c
-f:drivers/watchdog/stmp3xxx_rtc_wdt.c
-f:drivers/watchdog/stpmic1_wdt.c
-f:drivers/watchdog/sun4v_wdt.c
-f:drivers/watchdog/sunplus_wdt.c
-f:drivers/watchdog/sunxi_wdt.c
-f:drivers/watchdog/tegra_wdt.c
-f:drivers/watchdog/tqmx86_wdt.c
-f:drivers/watchdog/ts4800_wdt.c
-f:drivers/watchdog/ts72xx_wdt.c
-f:drivers/watchdog/twl4030_wdt.c
-f:drivers/watchdog/txx9wdt.c
-f:drivers/watchdog/uniphier_wdt.c
-f:drivers/watchdog/via_wdt.c
-f:drivers/watchdog/visconti_wdt.c
-f:drivers/watchdog/w83627hf_wdt.c
-f:drivers/watchdog/w83877f_wdt.c
-f:drivers/watchdog/w83977f_wdt.c
-f:drivers/watchdog/wafer5823wdt.c
-f:drivers/watchdog/watchdog_core.c
-f:drivers/watchdog/watchdog_core.h
-f:drivers/watchdog/watchdog_dev.c
-f:drivers/watchdog/watchdog_hrtimer_pretimeout.c
-f:drivers/watchdog/watchdog_pretimeout.c
-f:drivers/watchdog/watchdog_pretimeout.h
-f:drivers/watchdog/wd501p.h
-f:drivers/watchdog/wdat_wdt.c
-f:drivers/watchdog/wdrtas.c
-f:drivers/watchdog/wdt.c
-f:drivers/watchdog/wdt285.c
-f:drivers/watchdog/wdt977.c
-f:drivers/watchdog/wdt_pci.c
-f:drivers/watchdog/wm831x_wdt.c
-f:drivers/watchdog/wm8350_wdt.c
-f:drivers/watchdog/xen_wdt.c
-f:drivers/watchdog/xilinx_wwdt.c
-f:drivers/watchdog/ziirave_wdt.c
-f:drivers/xen/Kconfig
-f:drivers/xen/Makefile
-f:drivers/xen/acpi.c
-f:drivers/xen/arm-device.c
-f:drivers/xen/balloon.c
-f:drivers/xen/biomerge.c
-f:drivers/xen/cpu_hotplug.c
-f:drivers/xen/dbgp.c
-f:drivers/xen/efi.c
-f:drivers/xen/events/Makefile
-f:drivers/xen/events/events_2l.c
-f:drivers/xen/events/events_base.c
-f:drivers/xen/events/events_fifo.c
-f:drivers/xen/events/events_internal.h
-f:drivers/xen/evtchn.c
-f:drivers/xen/features.c
-f:drivers/xen/gntalloc.c
-f:drivers/xen/gntdev-common.h
-f:drivers/xen/gntdev-dmabuf.c
-f:drivers/xen/gntdev-dmabuf.h
-f:drivers/xen/gntdev.c
-f:drivers/xen/grant-dma-iommu.c
-f:drivers/xen/grant-dma-ops.c
-f:drivers/xen/grant-table.c
-f:drivers/xen/manage.c
-f:drivers/xen/mcelog.c
-f:drivers/xen/mem-reservation.c
-f:drivers/xen/pci.c
-f:drivers/xen/pcpu.c
-f:drivers/xen/platform-pci.c
-f:drivers/xen/privcmd-buf.c
-f:drivers/xen/privcmd.c
-f:drivers/xen/privcmd.h
-f:drivers/xen/pvcalls-back.c
-f:drivers/xen/pvcalls-front.c
-f:drivers/xen/pvcalls-front.h
-f:drivers/xen/swiotlb-xen.c
-f:drivers/xen/sys-hypervisor.c
-f:drivers/xen/time.c
-f:drivers/xen/unpopulated-alloc.c
-f:drivers/xen/xen-acpi-pad.c
-f:drivers/xen/xen-acpi-processor.c
-f:drivers/xen/xen-balloon.c
-f:drivers/xen/xen-front-pgdir-shbuf.c
-f:drivers/xen/xen-pciback/Makefile
-f:drivers/xen/xen-pciback/conf_space.c
-f:drivers/xen/xen-pciback/conf_space.h
-f:drivers/xen/xen-pciback/conf_space_capability.c
-f:drivers/xen/xen-pciback/conf_space_header.c
-f:drivers/xen/xen-pciback/conf_space_quirks.c
-f:drivers/xen/xen-pciback/conf_space_quirks.h
-f:drivers/xen/xen-pciback/passthrough.c
-f:drivers/xen/xen-pciback/pci_stub.c
-f:drivers/xen/xen-pciback/pciback.h
-f:drivers/xen/xen-pciback/pciback_ops.c
-f:drivers/xen/xen-pciback/vpci.c
-f:drivers/xen/xen-pciback/xenbus.c
-f:drivers/xen/xen-scsiback.c
-f:drivers/xen/xenbus/Makefile
-f:drivers/xen/xenbus/xenbus.h
-f:drivers/xen/xenbus/xenbus_client.c
-f:drivers/xen/xenbus/xenbus_comms.c
-f:drivers/xen/xenbus/xenbus_dev_backend.c
-f:drivers/xen/xenbus/xenbus_dev_frontend.c
-f:drivers/xen/xenbus/xenbus_probe.c
-f:drivers/xen/xenbus/xenbus_probe_backend.c
-f:drivers/xen/xenbus/xenbus_probe_frontend.c
-f:drivers/xen/xenbus/xenbus_xs.c
-f:drivers/xen/xenfs/Makefile
-f:drivers/xen/xenfs/super.c
-f:drivers/xen/xenfs/xenfs.h
-f:drivers/xen/xenfs/xenstored.c
-f:drivers/xen/xenfs/xensyms.c
-f:drivers/xen/xlate_mmu.c
-f:drivers/zorro/.gitignore
-f:drivers/zorro/Kconfig
-f:drivers/zorro/Makefile
-f:drivers/zorro/gen-devlist.c
-f:drivers/zorro/names.c
-f:drivers/zorro/proc.c
-f:drivers/zorro/zorro-driver.c
-f:drivers/zorro/zorro-sysfs.c
-f:drivers/zorro/zorro.c
-f:drivers/zorro/zorro.h
-f:drivers/zorro/zorro.ids
-f:fs/9p/Kconfig
-f:fs/9p/Makefile
-f:fs/9p/acl.c
-f:fs/9p/acl.h
-f:fs/9p/cache.c
-f:fs/9p/cache.h
-f:fs/9p/fid.c
-f:fs/9p/fid.h
-f:fs/9p/v9fs.c
-f:fs/9p/v9fs.h
-f:fs/9p/v9fs_vfs.h
-f:fs/9p/vfs_addr.c
-f:fs/9p/vfs_dentry.c
-f:fs/9p/vfs_dir.c
-f:fs/9p/vfs_file.c
-f:fs/9p/vfs_inode.c
-f:fs/9p/vfs_inode_dotl.c
-f:fs/9p/vfs_super.c
-f:fs/9p/xattr.c
-f:fs/9p/xattr.h
-f:fs/Kconfig
-f:fs/Kconfig.binfmt
-f:fs/Makefile
-f:fs/adfs/Kconfig
-f:fs/adfs/Makefile
-f:fs/adfs/adfs.h
-f:fs/adfs/dir.c
-f:fs/adfs/dir_f.c
-f:fs/adfs/dir_f.h
-f:fs/adfs/dir_fplus.c
-f:fs/adfs/dir_fplus.h
-f:fs/adfs/file.c
-f:fs/adfs/inode.c
-f:fs/adfs/map.c
-f:fs/adfs/super.c
-f:fs/affs/Changes
-f:fs/affs/Kconfig
-f:fs/affs/Makefile
-f:fs/affs/affs.h
-f:fs/affs/amigaffs.c
-f:fs/affs/amigaffs.h
-f:fs/affs/bitmap.c
-f:fs/affs/dir.c
-f:fs/affs/file.c
-f:fs/affs/inode.c
-f:fs/affs/namei.c
-f:fs/affs/super.c
-f:fs/affs/symlink.c
-f:fs/afs/Kconfig
-f:fs/afs/Makefile
-f:fs/afs/addr_list.c
-f:fs/afs/addr_prefs.c
-f:fs/afs/afs.h
-f:fs/afs/afs_cm.h
-f:fs/afs/afs_fs.h
-f:fs/afs/afs_vl.h
-f:fs/afs/callback.c
-f:fs/afs/cell.c
-f:fs/afs/cm_security.c
-f:fs/afs/cmservice.c
-f:fs/afs/dir.c
-f:fs/afs/dir_edit.c
-f:fs/afs/dir_search.c
-f:fs/afs/dir_silly.c
-f:fs/afs/dynroot.c
-f:fs/afs/file.c
-f:fs/afs/flock.c
-f:fs/afs/fs_operation.c
-f:fs/afs/fs_probe.c
-f:fs/afs/fsclient.c
-f:fs/afs/inode.c
-f:fs/afs/internal.h
-f:fs/afs/main.c
-f:fs/afs/misc.c
-f:fs/afs/mntpt.c
-f:fs/afs/proc.c
-f:fs/afs/protocol_afs.h
-f:fs/afs/protocol_uae.h
-f:fs/afs/protocol_yfs.h
-f:fs/afs/rotate.c
-f:fs/afs/rxrpc.c
-f:fs/afs/security.c
-f:fs/afs/server.c
-f:fs/afs/server_list.c
-f:fs/afs/super.c
-f:fs/afs/validation.c
-f:fs/afs/vl_alias.c
-f:fs/afs/vl_list.c
-f:fs/afs/vl_probe.c
-f:fs/afs/vl_rotate.c
-f:fs/afs/vlclient.c
-f:fs/afs/volume.c
-f:fs/afs/write.c
-f:fs/afs/xattr.c
-f:fs/afs/xdr_fs.h
-f:fs/afs/yfsclient.c
-f:fs/aio.c
-f:fs/anon_inodes.c
-f:fs/attr.c
-f:fs/autofs/Kconfig
-f:fs/autofs/Makefile
-f:fs/autofs/autofs_i.h
-f:fs/autofs/dev-ioctl.c
-f:fs/autofs/expire.c
-f:fs/autofs/init.c
-f:fs/autofs/inode.c
-f:fs/autofs/root.c
-f:fs/autofs/symlink.c
-f:fs/autofs/waitq.c
-f:fs/backing-file.c
-f:fs/bad_inode.c
-f:fs/bcachefs/Kconfig
-f:fs/bcachefs/Makefile
-f:fs/bcachefs/acl.c
-f:fs/bcachefs/acl.h
-f:fs/bcachefs/alloc_background.c
-f:fs/bcachefs/alloc_background.h
-f:fs/bcachefs/alloc_background_format.h
-f:fs/bcachefs/alloc_foreground.c
-f:fs/bcachefs/alloc_foreground.h
-f:fs/bcachefs/alloc_types.h
-f:fs/bcachefs/async_objs.c
-f:fs/bcachefs/async_objs.h
-f:fs/bcachefs/async_objs_types.h
-f:fs/bcachefs/backpointers.c
-f:fs/bcachefs/backpointers.h
-f:fs/bcachefs/bbpos.h
-f:fs/bcachefs/bbpos_types.h
-f:fs/bcachefs/bcachefs.h
-f:fs/bcachefs/bcachefs_format.h
-f:fs/bcachefs/bcachefs_ioctl.h
-f:fs/bcachefs/bkey.c
-f:fs/bcachefs/bkey.h
-f:fs/bcachefs/bkey_buf.h
-f:fs/bcachefs/bkey_cmp.h
-f:fs/bcachefs/bkey_methods.c
-f:fs/bcachefs/bkey_methods.h
-f:fs/bcachefs/bkey_sort.c
-f:fs/bcachefs/bkey_sort.h
-f:fs/bcachefs/bkey_types.h
-f:fs/bcachefs/bset.c
-f:fs/bcachefs/bset.h
-f:fs/bcachefs/btree_cache.c
-f:fs/bcachefs/btree_cache.h
-f:fs/bcachefs/btree_gc.c
-f:fs/bcachefs/btree_gc.h
-f:fs/bcachefs/btree_gc_types.h
-f:fs/bcachefs/btree_io.c
-f:fs/bcachefs/btree_io.h
-f:fs/bcachefs/btree_iter.c
-f:fs/bcachefs/btree_iter.h
-f:fs/bcachefs/btree_journal_iter.c
-f:fs/bcachefs/btree_journal_iter.h
-f:fs/bcachefs/btree_journal_iter_types.h
-f:fs/bcachefs/btree_key_cache.c
-f:fs/bcachefs/btree_key_cache.h
-f:fs/bcachefs/btree_key_cache_types.h
-f:fs/bcachefs/btree_locking.c
-f:fs/bcachefs/btree_locking.h
-f:fs/bcachefs/btree_node_scan.c
-f:fs/bcachefs/btree_node_scan.h
-f:fs/bcachefs/btree_node_scan_types.h
-f:fs/bcachefs/btree_trans_commit.c
-f:fs/bcachefs/btree_types.h
-f:fs/bcachefs/btree_update.c
-f:fs/bcachefs/btree_update.h
-f:fs/bcachefs/btree_update_interior.c
-f:fs/bcachefs/btree_update_interior.h
-f:fs/bcachefs/btree_write_buffer.c
-f:fs/bcachefs/btree_write_buffer.h
-f:fs/bcachefs/btree_write_buffer_types.h
-f:fs/bcachefs/buckets.c
-f:fs/bcachefs/buckets.h
-f:fs/bcachefs/buckets_types.h
-f:fs/bcachefs/buckets_waiting_for_journal.c
-f:fs/bcachefs/buckets_waiting_for_journal.h
-f:fs/bcachefs/buckets_waiting_for_journal_types.h
-f:fs/bcachefs/chardev.c
-f:fs/bcachefs/chardev.h
-f:fs/bcachefs/checksum.c
-f:fs/bcachefs/checksum.h
-f:fs/bcachefs/clock.c
-f:fs/bcachefs/clock.h
-f:fs/bcachefs/clock_types.h
-f:fs/bcachefs/compress.c
-f:fs/bcachefs/compress.h
-f:fs/bcachefs/darray.c
-f:fs/bcachefs/darray.h
-f:fs/bcachefs/data_update.c
-f:fs/bcachefs/data_update.h
-f:fs/bcachefs/debug.c
-f:fs/bcachefs/debug.h
-f:fs/bcachefs/dirent.c
-f:fs/bcachefs/dirent.h
-f:fs/bcachefs/dirent_format.h
-f:fs/bcachefs/disk_accounting.c
-f:fs/bcachefs/disk_accounting.h
-f:fs/bcachefs/disk_accounting_format.h
-f:fs/bcachefs/disk_accounting_types.h
-f:fs/bcachefs/disk_groups.c
-f:fs/bcachefs/disk_groups.h
-f:fs/bcachefs/disk_groups_format.h
-f:fs/bcachefs/disk_groups_types.h
-f:fs/bcachefs/ec.c
-f:fs/bcachefs/ec.h
-f:fs/bcachefs/ec_format.h
-f:fs/bcachefs/ec_types.h
-f:fs/bcachefs/enumerated_ref.c
-f:fs/bcachefs/enumerated_ref.h
-f:fs/bcachefs/enumerated_ref_types.h
-f:fs/bcachefs/errcode.c
-f:fs/bcachefs/errcode.h
-f:fs/bcachefs/error.c
-f:fs/bcachefs/error.h
-f:fs/bcachefs/extent_update.c
-f:fs/bcachefs/extent_update.h
-f:fs/bcachefs/extents.c
-f:fs/bcachefs/extents.h
-f:fs/bcachefs/extents_format.h
-f:fs/bcachefs/extents_types.h
-f:fs/bcachefs/eytzinger.c
-f:fs/bcachefs/eytzinger.h
-f:fs/bcachefs/fast_list.c
-f:fs/bcachefs/fast_list.h
-f:fs/bcachefs/fifo.h
-f:fs/bcachefs/fs-io-buffered.c
-f:fs/bcachefs/fs-io-buffered.h
-f:fs/bcachefs/fs-io-direct.c
-f:fs/bcachefs/fs-io-direct.h
-f:fs/bcachefs/fs-io-pagecache.c
-f:fs/bcachefs/fs-io-pagecache.h
-f:fs/bcachefs/fs-io.c
-f:fs/bcachefs/fs-io.h
-f:fs/bcachefs/fs-ioctl.c
-f:fs/bcachefs/fs-ioctl.h
-f:fs/bcachefs/fs.c
-f:fs/bcachefs/fs.h
-f:fs/bcachefs/fsck.c
-f:fs/bcachefs/fsck.h
-f:fs/bcachefs/inode.c
-f:fs/bcachefs/inode.h
-f:fs/bcachefs/inode_format.h
-f:fs/bcachefs/io_misc.c
-f:fs/bcachefs/io_misc.h
-f:fs/bcachefs/io_read.c
-f:fs/bcachefs/io_read.h
-f:fs/bcachefs/io_write.c
-f:fs/bcachefs/io_write.h
-f:fs/bcachefs/io_write_types.h
-f:fs/bcachefs/journal.c
-f:fs/bcachefs/journal.h
-f:fs/bcachefs/journal_io.c
-f:fs/bcachefs/journal_io.h
-f:fs/bcachefs/journal_reclaim.c
-f:fs/bcachefs/journal_reclaim.h
-f:fs/bcachefs/journal_sb.c
-f:fs/bcachefs/journal_sb.h
-f:fs/bcachefs/journal_seq_blacklist.c
-f:fs/bcachefs/journal_seq_blacklist.h
-f:fs/bcachefs/journal_seq_blacklist_format.h
-f:fs/bcachefs/journal_types.h
-f:fs/bcachefs/keylist.c
-f:fs/bcachefs/keylist.h
-f:fs/bcachefs/keylist_types.h
-f:fs/bcachefs/logged_ops.c
-f:fs/bcachefs/logged_ops.h
-f:fs/bcachefs/logged_ops_format.h
-f:fs/bcachefs/lru.c
-f:fs/bcachefs/lru.h
-f:fs/bcachefs/lru_format.h
-f:fs/bcachefs/mean_and_variance.c
-f:fs/bcachefs/mean_and_variance.h
-f:fs/bcachefs/mean_and_variance_test.c
-f:fs/bcachefs/migrate.c
-f:fs/bcachefs/migrate.h
-f:fs/bcachefs/move.c
-f:fs/bcachefs/move.h
-f:fs/bcachefs/move_types.h
-f:fs/bcachefs/movinggc.c
-f:fs/bcachefs/movinggc.h
-f:fs/bcachefs/namei.c
-f:fs/bcachefs/namei.h
-f:fs/bcachefs/nocow_locking.c
-f:fs/bcachefs/nocow_locking.h
-f:fs/bcachefs/nocow_locking_types.h
-f:fs/bcachefs/opts.c
-f:fs/bcachefs/opts.h
-f:fs/bcachefs/printbuf.c
-f:fs/bcachefs/printbuf.h
-f:fs/bcachefs/progress.c
-f:fs/bcachefs/progress.h
-f:fs/bcachefs/quota.c
-f:fs/bcachefs/quota.h
-f:fs/bcachefs/quota_format.h
-f:fs/bcachefs/quota_types.h
-f:fs/bcachefs/rcu_pending.c
-f:fs/bcachefs/rcu_pending.h
-f:fs/bcachefs/rebalance.c
-f:fs/bcachefs/rebalance.h
-f:fs/bcachefs/rebalance_format.h
-f:fs/bcachefs/rebalance_types.h
-f:fs/bcachefs/recovery.c
-f:fs/bcachefs/recovery.h
-f:fs/bcachefs/recovery_passes.c
-f:fs/bcachefs/recovery_passes.h
-f:fs/bcachefs/recovery_passes_format.h
-f:fs/bcachefs/recovery_passes_types.h
-f:fs/bcachefs/reflink.c
-f:fs/bcachefs/reflink.h
-f:fs/bcachefs/reflink_format.h
-f:fs/bcachefs/replicas.c
-f:fs/bcachefs/replicas.h
-f:fs/bcachefs/replicas_format.h
-f:fs/bcachefs/replicas_types.h
-f:fs/bcachefs/sb-clean.c
-f:fs/bcachefs/sb-clean.h
-f:fs/bcachefs/sb-counters.c
-f:fs/bcachefs/sb-counters.h
-f:fs/bcachefs/sb-counters_format.h
-f:fs/bcachefs/sb-downgrade.c
-f:fs/bcachefs/sb-downgrade.h
-f:fs/bcachefs/sb-downgrade_format.h
-f:fs/bcachefs/sb-errors.c
-f:fs/bcachefs/sb-errors.h
-f:fs/bcachefs/sb-errors_format.h
-f:fs/bcachefs/sb-errors_types.h
-f:fs/bcachefs/sb-members.c
-f:fs/bcachefs/sb-members.h
-f:fs/bcachefs/sb-members_format.h
-f:fs/bcachefs/sb-members_types.h
-f:fs/bcachefs/seqmutex.h
-f:fs/bcachefs/siphash.c
-f:fs/bcachefs/siphash.h
-f:fs/bcachefs/six.c
-f:fs/bcachefs/six.h
-f:fs/bcachefs/snapshot.c
-f:fs/bcachefs/snapshot.h
-f:fs/bcachefs/snapshot_format.h
-f:fs/bcachefs/snapshot_types.h
-f:fs/bcachefs/str_hash.c
-f:fs/bcachefs/str_hash.h
-f:fs/bcachefs/subvolume.c
-f:fs/bcachefs/subvolume.h
-f:fs/bcachefs/subvolume_format.h
-f:fs/bcachefs/subvolume_types.h
-f:fs/bcachefs/super-io.c
-f:fs/bcachefs/super-io.h
-f:fs/bcachefs/super.c
-f:fs/bcachefs/super.h
-f:fs/bcachefs/super_types.h
-f:fs/bcachefs/sysfs.c
-f:fs/bcachefs/sysfs.h
-f:fs/bcachefs/tests.c
-f:fs/bcachefs/tests.h
-f:fs/bcachefs/thread_with_file.c
-f:fs/bcachefs/thread_with_file.h
-f:fs/bcachefs/thread_with_file_types.h
-f:fs/bcachefs/time_stats.c
-f:fs/bcachefs/time_stats.h
-f:fs/bcachefs/trace.c
-f:fs/bcachefs/trace.h
-f:fs/bcachefs/two_state_shared_lock.c
-f:fs/bcachefs/two_state_shared_lock.h
-f:fs/bcachefs/util.c
-f:fs/bcachefs/util.h
-f:fs/bcachefs/varint.c
-f:fs/bcachefs/varint.h
-f:fs/bcachefs/vstructs.h
-f:fs/bcachefs/xattr.c
-f:fs/bcachefs/xattr.h
-f:fs/bcachefs/xattr_format.h
-f:fs/befs/ChangeLog
-f:fs/befs/Kconfig
-f:fs/befs/Makefile
-f:fs/befs/befs.h
-f:fs/befs/befs_fs_types.h
-f:fs/befs/btree.c
-f:fs/befs/btree.h
-f:fs/befs/datastream.c
-f:fs/befs/datastream.h
-f:fs/befs/debug.c
-f:fs/befs/endian.h
-f:fs/befs/inode.c
-f:fs/befs/inode.h
-f:fs/befs/io.c
-f:fs/befs/io.h
-f:fs/befs/linuxvfs.c
-f:fs/befs/super.c
-f:fs/befs/super.h
-f:fs/bfs/Kconfig
-f:fs/bfs/Makefile
-f:fs/bfs/bfs.h
-f:fs/bfs/dir.c
-f:fs/bfs/file.c
-f:fs/bfs/inode.c
-f:fs/binfmt_elf.c
-f:fs/binfmt_elf_fdpic.c
-f:fs/binfmt_flat.c
-f:fs/binfmt_misc.c
-f:fs/binfmt_script.c
-f:fs/bpf_fs_kfuncs.c
-f:fs/btrfs/Kconfig
-f:fs/btrfs/Makefile
-f:fs/btrfs/accessors.c
-f:fs/btrfs/accessors.h
-f:fs/btrfs/acl.c
-f:fs/btrfs/acl.h
-f:fs/btrfs/async-thread.c
-f:fs/btrfs/async-thread.h
-f:fs/btrfs/backref.c
-f:fs/btrfs/backref.h
-f:fs/btrfs/bio.c
-f:fs/btrfs/bio.h
-f:fs/btrfs/block-group.c
-f:fs/btrfs/block-group.h
-f:fs/btrfs/block-rsv.c
-f:fs/btrfs/block-rsv.h
-f:fs/btrfs/btrfs_inode.h
-f:fs/btrfs/compression.c
-f:fs/btrfs/compression.h
-f:fs/btrfs/ctree.c
-f:fs/btrfs/ctree.h
-f:fs/btrfs/defrag.c
-f:fs/btrfs/defrag.h
-f:fs/btrfs/delalloc-space.c
-f:fs/btrfs/delalloc-space.h
-f:fs/btrfs/delayed-inode.c
-f:fs/btrfs/delayed-inode.h
-f:fs/btrfs/delayed-ref.c
-f:fs/btrfs/delayed-ref.h
-f:fs/btrfs/dev-replace.c
-f:fs/btrfs/dev-replace.h
-f:fs/btrfs/dir-item.c
-f:fs/btrfs/dir-item.h
-f:fs/btrfs/direct-io.c
-f:fs/btrfs/direct-io.h
-f:fs/btrfs/discard.c
-f:fs/btrfs/discard.h
-f:fs/btrfs/disk-io.c
-f:fs/btrfs/disk-io.h
-f:fs/btrfs/export.c
-f:fs/btrfs/export.h
-f:fs/btrfs/extent-io-tree.c
-f:fs/btrfs/extent-io-tree.h
-f:fs/btrfs/extent-tree.c
-f:fs/btrfs/extent-tree.h
-f:fs/btrfs/extent_io.c
-f:fs/btrfs/extent_io.h
-f:fs/btrfs/extent_map.c
-f:fs/btrfs/extent_map.h
-f:fs/btrfs/fiemap.c
-f:fs/btrfs/fiemap.h
-f:fs/btrfs/file-item.c
-f:fs/btrfs/file-item.h
-f:fs/btrfs/file.c
-f:fs/btrfs/file.h
-f:fs/btrfs/free-space-cache.c
-f:fs/btrfs/free-space-cache.h
-f:fs/btrfs/free-space-tree.c
-f:fs/btrfs/free-space-tree.h
-f:fs/btrfs/fs.c
-f:fs/btrfs/fs.h
-f:fs/btrfs/inode-item.c
-f:fs/btrfs/inode-item.h
-f:fs/btrfs/inode.c
-f:fs/btrfs/ioctl.c
-f:fs/btrfs/ioctl.h
-f:fs/btrfs/locking.c
-f:fs/btrfs/locking.h
-f:fs/btrfs/lru_cache.c
-f:fs/btrfs/lru_cache.h
-f:fs/btrfs/lzo.c
-f:fs/btrfs/messages.c
-f:fs/btrfs/messages.h
-f:fs/btrfs/misc.h
-f:fs/btrfs/ordered-data.c
-f:fs/btrfs/ordered-data.h
-f:fs/btrfs/orphan.c
-f:fs/btrfs/orphan.h
-f:fs/btrfs/print-tree.c
-f:fs/btrfs/print-tree.h
-f:fs/btrfs/props.c
-f:fs/btrfs/props.h
-f:fs/btrfs/qgroup.c
-f:fs/btrfs/qgroup.h
-f:fs/btrfs/raid-stripe-tree.c
-f:fs/btrfs/raid-stripe-tree.h
-f:fs/btrfs/raid56.c
-f:fs/btrfs/raid56.h
-f:fs/btrfs/ref-verify.c
-f:fs/btrfs/ref-verify.h
-f:fs/btrfs/reflink.c
-f:fs/btrfs/reflink.h
-f:fs/btrfs/relocation.c
-f:fs/btrfs/relocation.h
-f:fs/btrfs/root-tree.c
-f:fs/btrfs/root-tree.h
-f:fs/btrfs/scrub.c
-f:fs/btrfs/scrub.h
-f:fs/btrfs/send.c
-f:fs/btrfs/send.h
-f:fs/btrfs/space-info.c
-f:fs/btrfs/space-info.h
-f:fs/btrfs/subpage.c
-f:fs/btrfs/subpage.h
-f:fs/btrfs/super.c
-f:fs/btrfs/super.h
-f:fs/btrfs/sysfs.c
-f:fs/btrfs/sysfs.h
-f:fs/btrfs/tests/btrfs-tests.c
-f:fs/btrfs/tests/btrfs-tests.h
-f:fs/btrfs/tests/delayed-refs-tests.c
-f:fs/btrfs/tests/extent-buffer-tests.c
-f:fs/btrfs/tests/extent-io-tests.c
-f:fs/btrfs/tests/extent-map-tests.c
-f:fs/btrfs/tests/free-space-tests.c
-f:fs/btrfs/tests/free-space-tree-tests.c
-f:fs/btrfs/tests/inode-tests.c
-f:fs/btrfs/tests/qgroup-tests.c
-f:fs/btrfs/tests/raid-stripe-tree-tests.c
-f:fs/btrfs/transaction.c
-f:fs/btrfs/transaction.h
-f:fs/btrfs/tree-checker.c
-f:fs/btrfs/tree-checker.h
-f:fs/btrfs/tree-log.c
-f:fs/btrfs/tree-log.h
-f:fs/btrfs/tree-mod-log.c
-f:fs/btrfs/tree-mod-log.h
-f:fs/btrfs/ulist.c
-f:fs/btrfs/ulist.h
-f:fs/btrfs/uuid-tree.c
-f:fs/btrfs/uuid-tree.h
-f:fs/btrfs/verity.c
-f:fs/btrfs/verity.h
-f:fs/btrfs/volumes.c
-f:fs/btrfs/volumes.h
-f:fs/btrfs/xattr.c
-f:fs/btrfs/xattr.h
-f:fs/btrfs/zlib.c
-f:fs/btrfs/zoned.c
-f:fs/btrfs/zoned.h
-f:fs/btrfs/zstd.c
-f:fs/buffer.c
-f:fs/cachefiles/Kconfig
-f:fs/cachefiles/Makefile
-f:fs/cachefiles/cache.c
-f:fs/cachefiles/daemon.c
-f:fs/cachefiles/error_inject.c
-f:fs/cachefiles/interface.c
-f:fs/cachefiles/internal.h
-f:fs/cachefiles/io.c
-f:fs/cachefiles/key.c
-f:fs/cachefiles/main.c
-f:fs/cachefiles/namei.c
-f:fs/cachefiles/ondemand.c
-f:fs/cachefiles/security.c
-f:fs/cachefiles/volume.c
-f:fs/cachefiles/xattr.c
-f:fs/ceph/Kconfig
-f:fs/ceph/Makefile
-f:fs/ceph/acl.c
-f:fs/ceph/addr.c
-f:fs/ceph/cache.c
-f:fs/ceph/cache.h
-f:fs/ceph/caps.c
-f:fs/ceph/ceph_frag.c
-f:fs/ceph/crypto.c
-f:fs/ceph/crypto.h
-f:fs/ceph/debugfs.c
-f:fs/ceph/dir.c
-f:fs/ceph/export.c
-f:fs/ceph/file.c
-f:fs/ceph/inode.c
-f:fs/ceph/io.c
-f:fs/ceph/io.h
-f:fs/ceph/ioctl.c
-f:fs/ceph/ioctl.h
-f:fs/ceph/locks.c
-f:fs/ceph/mds_client.c
-f:fs/ceph/mds_client.h
-f:fs/ceph/mdsmap.c
-f:fs/ceph/mdsmap.h
-f:fs/ceph/metric.c
-f:fs/ceph/metric.h
-f:fs/ceph/quota.c
-f:fs/ceph/snap.c
-f:fs/ceph/strings.c
-f:fs/ceph/super.c
-f:fs/ceph/super.h
-f:fs/ceph/util.c
-f:fs/ceph/xattr.c
-f:fs/char_dev.c
-f:fs/coda/Kconfig
-f:fs/coda/Makefile
-f:fs/coda/cache.c
-f:fs/coda/cnode.c
-f:fs/coda/coda_cache.h
-f:fs/coda/coda_fs_i.h
-f:fs/coda/coda_int.h
-f:fs/coda/coda_linux.c
-f:fs/coda/coda_linux.h
-f:fs/coda/coda_psdev.h
-f:fs/coda/dir.c
-f:fs/coda/file.c
-f:fs/coda/inode.c
-f:fs/coda/pioctl.c
-f:fs/coda/psdev.c
-f:fs/coda/symlink.c
-f:fs/coda/sysctl.c
-f:fs/coda/upcall.c
-f:fs/compat_binfmt_elf.c
-f:fs/configfs/Kconfig
-f:fs/configfs/Makefile
-f:fs/configfs/configfs_internal.h
-f:fs/configfs/dir.c
-f:fs/configfs/file.c
-f:fs/configfs/inode.c
-f:fs/configfs/item.c
-f:fs/configfs/mount.c
-f:fs/configfs/symlink.c
-f:fs/coredump.c
-f:fs/cramfs/Kconfig
-f:fs/cramfs/Makefile
-f:fs/cramfs/README
-f:fs/cramfs/inode.c
-f:fs/cramfs/internal.h
-f:fs/cramfs/uncompress.c
-f:fs/crypto/Kconfig
-f:fs/crypto/Makefile
-f:fs/crypto/bio.c
-f:fs/crypto/crypto.c
-f:fs/crypto/fname.c
-f:fs/crypto/fscrypt_private.h
-f:fs/crypto/hkdf.c
-f:fs/crypto/hooks.c
-f:fs/crypto/inline_crypt.c
-f:fs/crypto/keyring.c
-f:fs/crypto/keysetup.c
-f:fs/crypto/keysetup_v1.c
-f:fs/crypto/policy.c
-f:fs/d_path.c
-f:fs/dax.c
-f:fs/dcache.c
-f:fs/debugfs/Makefile
-f:fs/debugfs/file.c
-f:fs/debugfs/inode.c
-f:fs/debugfs/internal.h
-f:fs/devpts/Makefile
-f:fs/devpts/inode.c
-f:fs/direct-io.c
-f:fs/dlm/Kconfig
-f:fs/dlm/Makefile
-f:fs/dlm/ast.c
-f:fs/dlm/ast.h
-f:fs/dlm/config.c
-f:fs/dlm/config.h
-f:fs/dlm/debug_fs.c
-f:fs/dlm/dir.c
-f:fs/dlm/dir.h
-f:fs/dlm/dlm_internal.h
-f:fs/dlm/lock.c
-f:fs/dlm/lock.h
-f:fs/dlm/lockspace.c
-f:fs/dlm/lockspace.h
-f:fs/dlm/lowcomms.c
-f:fs/dlm/lowcomms.h
-f:fs/dlm/lvb_table.h
-f:fs/dlm/main.c
-f:fs/dlm/member.c
-f:fs/dlm/member.h
-f:fs/dlm/memory.c
-f:fs/dlm/memory.h
-f:fs/dlm/midcomms.c
-f:fs/dlm/midcomms.h
-f:fs/dlm/plock.c
-f:fs/dlm/rcom.c
-f:fs/dlm/rcom.h
-f:fs/dlm/recover.c
-f:fs/dlm/recover.h
-f:fs/dlm/recoverd.c
-f:fs/dlm/recoverd.h
-f:fs/dlm/requestqueue.c
-f:fs/dlm/requestqueue.h
-f:fs/dlm/user.c
-f:fs/dlm/user.h
-f:fs/dlm/util.c
-f:fs/dlm/util.h
-f:fs/drop_caches.c
-f:fs/ecryptfs/Kconfig
-f:fs/ecryptfs/Makefile
-f:fs/ecryptfs/crypto.c
-f:fs/ecryptfs/debug.c
-f:fs/ecryptfs/dentry.c
-f:fs/ecryptfs/ecryptfs_kernel.h
-f:fs/ecryptfs/file.c
-f:fs/ecryptfs/inode.c
-f:fs/ecryptfs/keystore.c
-f:fs/ecryptfs/kthread.c
-f:fs/ecryptfs/main.c
-f:fs/ecryptfs/messaging.c
-f:fs/ecryptfs/miscdev.c
-f:fs/ecryptfs/mmap.c
-f:fs/ecryptfs/read_write.c
-f:fs/ecryptfs/super.c
-f:fs/efivarfs/Kconfig
-f:fs/efivarfs/Makefile
-f:fs/efivarfs/file.c
-f:fs/efivarfs/inode.c
-f:fs/efivarfs/internal.h
-f:fs/efivarfs/super.c
-f:fs/efivarfs/vars.c
-f:fs/efs/Kconfig
-f:fs/efs/Makefile
-f:fs/efs/dir.c
-f:fs/efs/efs.h
-f:fs/efs/file.c
-f:fs/efs/inode.c
-f:fs/efs/namei.c
-f:fs/efs/super.c
-f:fs/efs/symlink.c
-f:fs/erofs/Kconfig
-f:fs/erofs/Makefile
-f:fs/erofs/compress.h
-f:fs/erofs/data.c
-f:fs/erofs/decompressor.c
-f:fs/erofs/decompressor_crypto.c
-f:fs/erofs/decompressor_deflate.c
-f:fs/erofs/decompressor_lzma.c
-f:fs/erofs/decompressor_zstd.c
-f:fs/erofs/dir.c
-f:fs/erofs/erofs_fs.h
-f:fs/erofs/fileio.c
-f:fs/erofs/fscache.c
-f:fs/erofs/inode.c
-f:fs/erofs/internal.h
-f:fs/erofs/namei.c
-f:fs/erofs/super.c
-f:fs/erofs/sysfs.c
-f:fs/erofs/xattr.c
-f:fs/erofs/xattr.h
-f:fs/erofs/zdata.c
-f:fs/erofs/zmap.c
-f:fs/erofs/zutil.c
-f:fs/eventfd.c
-f:fs/eventpoll.c
-f:fs/exec.c
-f:fs/exfat/Kconfig
-f:fs/exfat/Makefile
-f:fs/exfat/balloc.c
-f:fs/exfat/cache.c
-f:fs/exfat/dir.c
-f:fs/exfat/exfat_fs.h
-f:fs/exfat/exfat_raw.h
-f:fs/exfat/fatent.c
-f:fs/exfat/file.c
-f:fs/exfat/inode.c
-f:fs/exfat/misc.c
-f:fs/exfat/namei.c
-f:fs/exfat/nls.c
-f:fs/exfat/super.c
-f:fs/exportfs/Makefile
-f:fs/exportfs/expfs.c
-f:fs/ext2/Kconfig
-f:fs/ext2/Makefile
-f:fs/ext2/acl.c
-f:fs/ext2/acl.h
-f:fs/ext2/balloc.c
-f:fs/ext2/dir.c
-f:fs/ext2/ext2.h
-f:fs/ext2/file.c
-f:fs/ext2/ialloc.c
-f:fs/ext2/inode.c
-f:fs/ext2/ioctl.c
-f:fs/ext2/namei.c
-f:fs/ext2/super.c
-f:fs/ext2/symlink.c
-f:fs/ext2/trace.c
-f:fs/ext2/trace.h
-f:fs/ext2/xattr.c
-f:fs/ext2/xattr.h
-f:fs/ext2/xattr_security.c
-f:fs/ext2/xattr_trusted.c
-f:fs/ext2/xattr_user.c
-f:fs/ext4/.kunitconfig
-f:fs/ext4/Kconfig
-f:fs/ext4/Makefile
-f:fs/ext4/acl.c
-f:fs/ext4/acl.h
-f:fs/ext4/balloc.c
-f:fs/ext4/bitmap.c
-f:fs/ext4/block_validity.c
-f:fs/ext4/crypto.c
-f:fs/ext4/dir.c
-f:fs/ext4/ext4.h
-f:fs/ext4/ext4_extents.h
-f:fs/ext4/ext4_jbd2.c
-f:fs/ext4/ext4_jbd2.h
-f:fs/ext4/extents.c
-f:fs/ext4/extents_status.c
-f:fs/ext4/extents_status.h
-f:fs/ext4/fast_commit.c
-f:fs/ext4/fast_commit.h
-f:fs/ext4/file.c
-f:fs/ext4/fsmap.c
-f:fs/ext4/fsmap.h
-f:fs/ext4/fsync.c
-f:fs/ext4/hash.c
-f:fs/ext4/ialloc.c
-f:fs/ext4/indirect.c
-f:fs/ext4/inline.c
-f:fs/ext4/inode-test.c
-f:fs/ext4/inode.c
-f:fs/ext4/ioctl.c
-f:fs/ext4/mballoc-test.c
-f:fs/ext4/mballoc.c
-f:fs/ext4/mballoc.h
-f:fs/ext4/migrate.c
-f:fs/ext4/mmp.c
-f:fs/ext4/move_extent.c
-f:fs/ext4/namei.c
-f:fs/ext4/orphan.c
-f:fs/ext4/page-io.c
-f:fs/ext4/readpage.c
-f:fs/ext4/resize.c
-f:fs/ext4/super.c
-f:fs/ext4/symlink.c
-f:fs/ext4/sysfs.c
-f:fs/ext4/truncate.h
-f:fs/ext4/verity.c
-f:fs/ext4/xattr.c
-f:fs/ext4/xattr.h
-f:fs/ext4/xattr_hurd.c
-f:fs/ext4/xattr_security.c
-f:fs/ext4/xattr_trusted.c
-f:fs/ext4/xattr_user.c
-f:fs/f2fs/Kconfig
-f:fs/f2fs/Makefile
-f:fs/f2fs/acl.c
-f:fs/f2fs/acl.h
-f:fs/f2fs/checkpoint.c
-f:fs/f2fs/compress.c
-f:fs/f2fs/data.c
-f:fs/f2fs/debug.c
-f:fs/f2fs/dir.c
-f:fs/f2fs/extent_cache.c
-f:fs/f2fs/f2fs.h
-f:fs/f2fs/file.c
-f:fs/f2fs/gc.c
-f:fs/f2fs/gc.h
-f:fs/f2fs/hash.c
-f:fs/f2fs/inline.c
-f:fs/f2fs/inode.c
-f:fs/f2fs/iostat.c
-f:fs/f2fs/iostat.h
-f:fs/f2fs/namei.c
-f:fs/f2fs/node.c
-f:fs/f2fs/node.h
-f:fs/f2fs/recovery.c
-f:fs/f2fs/segment.c
-f:fs/f2fs/segment.h
-f:fs/f2fs/shrinker.c
-f:fs/f2fs/super.c
-f:fs/f2fs/sysfs.c
-f:fs/f2fs/verity.c
-f:fs/f2fs/xattr.c
-f:fs/f2fs/xattr.h
-f:fs/fat/.kunitconfig
-f:fs/fat/Kconfig
-f:fs/fat/Makefile
-f:fs/fat/cache.c
-f:fs/fat/dir.c
-f:fs/fat/fat.h
-f:fs/fat/fat_test.c
-f:fs/fat/fatent.c
-f:fs/fat/file.c
-f:fs/fat/inode.c
-f:fs/fat/misc.c
-f:fs/fat/namei_msdos.c
-f:fs/fat/namei_vfat.c
-f:fs/fat/nfs.c
-f:fs/fcntl.c
-f:fs/fhandle.c
-f:fs/file.c
-f:fs/file_attr.c
-f:fs/file_table.c
-f:fs/filesystems.c
-f:fs/freevxfs/Kconfig
-f:fs/freevxfs/Makefile
-f:fs/freevxfs/vxfs.h
-f:fs/freevxfs/vxfs_bmap.c
-f:fs/freevxfs/vxfs_dir.h
-f:fs/freevxfs/vxfs_extern.h
-f:fs/freevxfs/vxfs_fshead.c
-f:fs/freevxfs/vxfs_fshead.h
-f:fs/freevxfs/vxfs_immed.c
-f:fs/freevxfs/vxfs_inode.c
-f:fs/freevxfs/vxfs_inode.h
-f:fs/freevxfs/vxfs_lookup.c
-f:fs/freevxfs/vxfs_olt.c
-f:fs/freevxfs/vxfs_olt.h
-f:fs/freevxfs/vxfs_subr.c
-f:fs/freevxfs/vxfs_super.c
-f:fs/fs-writeback.c
-f:fs/fs_context.c
-f:fs/fs_parser.c
-f:fs/fs_pin.c
-f:fs/fs_struct.c
-f:fs/fs_types.c
-f:fs/fsopen.c
-f:fs/fuse/Kconfig
-f:fs/fuse/Makefile
-f:fs/fuse/acl.c
-f:fs/fuse/control.c
-f:fs/fuse/cuse.c
-f:fs/fuse/dax.c
-f:fs/fuse/dev.c
-f:fs/fuse/dev_uring.c
-f:fs/fuse/dev_uring_i.h
-f:fs/fuse/dir.c
-f:fs/fuse/file.c
-f:fs/fuse/fuse_dev_i.h
-f:fs/fuse/fuse_i.h
-f:fs/fuse/fuse_trace.h
-f:fs/fuse/inode.c
-f:fs/fuse/ioctl.c
-f:fs/fuse/iomode.c
-f:fs/fuse/passthrough.c
-f:fs/fuse/readdir.c
-f:fs/fuse/sysctl.c
-f:fs/fuse/virtio_fs.c
-f:fs/fuse/xattr.c
-f:fs/gfs2/Kconfig
-f:fs/gfs2/Makefile
-f:fs/gfs2/acl.c
-f:fs/gfs2/acl.h
-f:fs/gfs2/aops.c
-f:fs/gfs2/aops.h
-f:fs/gfs2/bmap.c
-f:fs/gfs2/bmap.h
-f:fs/gfs2/dentry.c
-f:fs/gfs2/dir.c
-f:fs/gfs2/dir.h
-f:fs/gfs2/export.c
-f:fs/gfs2/file.c
-f:fs/gfs2/gfs2.h
-f:fs/gfs2/glock.c
-f:fs/gfs2/glock.h
-f:fs/gfs2/glops.c
-f:fs/gfs2/glops.h
-f:fs/gfs2/incore.h
-f:fs/gfs2/inode.c
-f:fs/gfs2/inode.h
-f:fs/gfs2/lock_dlm.c
-f:fs/gfs2/log.c
-f:fs/gfs2/log.h
-f:fs/gfs2/lops.c
-f:fs/gfs2/lops.h
-f:fs/gfs2/main.c
-f:fs/gfs2/meta_io.c
-f:fs/gfs2/meta_io.h
-f:fs/gfs2/ops_fstype.c
-f:fs/gfs2/quota.c
-f:fs/gfs2/quota.h
-f:fs/gfs2/recovery.c
-f:fs/gfs2/recovery.h
-f:fs/gfs2/rgrp.c
-f:fs/gfs2/rgrp.h
-f:fs/gfs2/super.c
-f:fs/gfs2/super.h
-f:fs/gfs2/sys.c
-f:fs/gfs2/sys.h
-f:fs/gfs2/trace_gfs2.h
-f:fs/gfs2/trans.c
-f:fs/gfs2/trans.h
-f:fs/gfs2/util.c
-f:fs/gfs2/util.h
-f:fs/gfs2/xattr.c
-f:fs/gfs2/xattr.h
-f:fs/hfs/Kconfig
-f:fs/hfs/Makefile
-f:fs/hfs/attr.c
-f:fs/hfs/bfind.c
-f:fs/hfs/bitmap.c
-f:fs/hfs/bnode.c
-f:fs/hfs/brec.c
-f:fs/hfs/btree.c
-f:fs/hfs/btree.h
-f:fs/hfs/catalog.c
-f:fs/hfs/dir.c
-f:fs/hfs/extent.c
-f:fs/hfs/hfs.h
-f:fs/hfs/hfs_fs.h
-f:fs/hfs/inode.c
-f:fs/hfs/mdb.c
-f:fs/hfs/part_tbl.c
-f:fs/hfs/string.c
-f:fs/hfs/super.c
-f:fs/hfs/sysdep.c
-f:fs/hfs/trans.c
-f:fs/hfsplus/Kconfig
-f:fs/hfsplus/Makefile
-f:fs/hfsplus/attributes.c
-f:fs/hfsplus/bfind.c
-f:fs/hfsplus/bitmap.c
-f:fs/hfsplus/bnode.c
-f:fs/hfsplus/brec.c
-f:fs/hfsplus/btree.c
-f:fs/hfsplus/catalog.c
-f:fs/hfsplus/dir.c
-f:fs/hfsplus/extents.c
-f:fs/hfsplus/hfsplus_fs.h
-f:fs/hfsplus/hfsplus_raw.h
-f:fs/hfsplus/inode.c
-f:fs/hfsplus/ioctl.c
-f:fs/hfsplus/options.c
-f:fs/hfsplus/part_tbl.c
-f:fs/hfsplus/super.c
-f:fs/hfsplus/tables.c
-f:fs/hfsplus/unicode.c
-f:fs/hfsplus/wrapper.c
-f:fs/hfsplus/xattr.c
-f:fs/hfsplus/xattr.h
-f:fs/hfsplus/xattr_security.c
-f:fs/hfsplus/xattr_trusted.c
-f:fs/hfsplus/xattr_user.c
-f:fs/hostfs/Makefile
-f:fs/hostfs/hostfs.h
-f:fs/hostfs/hostfs_kern.c
-f:fs/hostfs/hostfs_user.c
-f:fs/hostfs/hostfs_user_exp.c
-f:fs/hpfs/Kconfig
-f:fs/hpfs/Makefile
-f:fs/hpfs/alloc.c
-f:fs/hpfs/anode.c
-f:fs/hpfs/buffer.c
-f:fs/hpfs/dentry.c
-f:fs/hpfs/dir.c
-f:fs/hpfs/dnode.c
-f:fs/hpfs/ea.c
-f:fs/hpfs/file.c
-f:fs/hpfs/hpfs.h
-f:fs/hpfs/hpfs_fn.h
-f:fs/hpfs/inode.c
-f:fs/hpfs/map.c
-f:fs/hpfs/name.c
-f:fs/hpfs/namei.c
-f:fs/hpfs/super.c
-f:fs/hugetlbfs/Makefile
-f:fs/hugetlbfs/inode.c
-f:fs/init.c
-f:fs/inode.c
-f:fs/internal.h
-f:fs/ioctl.c
-f:fs/iomap/Makefile
-f:fs/iomap/buffered-io.c
-f:fs/iomap/direct-io.c
-f:fs/iomap/fiemap.c
-f:fs/iomap/internal.h
-f:fs/iomap/ioend.c
-f:fs/iomap/iter.c
-f:fs/iomap/seek.c
-f:fs/iomap/swapfile.c
-f:fs/iomap/trace.c
-f:fs/iomap/trace.h
-f:fs/isofs/Kconfig
-f:fs/isofs/Makefile
-f:fs/isofs/compress.c
-f:fs/isofs/dir.c
-f:fs/isofs/export.c
-f:fs/isofs/inode.c
-f:fs/isofs/isofs.h
-f:fs/isofs/joliet.c
-f:fs/isofs/namei.c
-f:fs/isofs/rock.c
-f:fs/isofs/rock.h
-f:fs/isofs/util.c
-f:fs/isofs/zisofs.h
-f:fs/jbd2/Kconfig
-f:fs/jbd2/Makefile
-f:fs/jbd2/checkpoint.c
-f:fs/jbd2/commit.c
-f:fs/jbd2/journal.c
-f:fs/jbd2/recovery.c
-f:fs/jbd2/revoke.c
-f:fs/jbd2/transaction.c
-f:fs/jffs2/Kconfig
-f:fs/jffs2/LICENCE
-f:fs/jffs2/Makefile
-f:fs/jffs2/README.Locking
-f:fs/jffs2/acl.c
-f:fs/jffs2/acl.h
-f:fs/jffs2/background.c
-f:fs/jffs2/build.c
-f:fs/jffs2/compr.c
-f:fs/jffs2/compr.h
-f:fs/jffs2/compr_lzo.c
-f:fs/jffs2/compr_rtime.c
-f:fs/jffs2/compr_rubin.c
-f:fs/jffs2/compr_zlib.c
-f:fs/jffs2/debug.c
-f:fs/jffs2/debug.h
-f:fs/jffs2/dir.c
-f:fs/jffs2/erase.c
-f:fs/jffs2/file.c
-f:fs/jffs2/fs.c
-f:fs/jffs2/gc.c
-f:fs/jffs2/ioctl.c
-f:fs/jffs2/jffs2_fs_i.h
-f:fs/jffs2/jffs2_fs_sb.h
-f:fs/jffs2/malloc.c
-f:fs/jffs2/nodelist.c
-f:fs/jffs2/nodelist.h
-f:fs/jffs2/nodemgmt.c
-f:fs/jffs2/os-linux.h
-f:fs/jffs2/read.c
-f:fs/jffs2/readinode.c
-f:fs/jffs2/scan.c
-f:fs/jffs2/security.c
-f:fs/jffs2/summary.c
-f:fs/jffs2/summary.h
-f:fs/jffs2/super.c
-f:fs/jffs2/symlink.c
-f:fs/jffs2/wbuf.c
-f:fs/jffs2/write.c
-f:fs/jffs2/writev.c
-f:fs/jffs2/xattr.c
-f:fs/jffs2/xattr.h
-f:fs/jffs2/xattr_trusted.c
-f:fs/jffs2/xattr_user.c
-f:fs/jfs/Kconfig
-f:fs/jfs/Makefile
-f:fs/jfs/acl.c
-f:fs/jfs/file.c
-f:fs/jfs/inode.c
-f:fs/jfs/ioctl.c
-f:fs/jfs/jfs_acl.h
-f:fs/jfs/jfs_btree.h
-f:fs/jfs/jfs_debug.c
-f:fs/jfs/jfs_debug.h
-f:fs/jfs/jfs_dinode.h
-f:fs/jfs/jfs_discard.c
-f:fs/jfs/jfs_discard.h
-f:fs/jfs/jfs_dmap.c
-f:fs/jfs/jfs_dmap.h
-f:fs/jfs/jfs_dtree.c
-f:fs/jfs/jfs_dtree.h
-f:fs/jfs/jfs_extent.c
-f:fs/jfs/jfs_extent.h
-f:fs/jfs/jfs_filsys.h
-f:fs/jfs/jfs_imap.c
-f:fs/jfs/jfs_imap.h
-f:fs/jfs/jfs_incore.h
-f:fs/jfs/jfs_inode.c
-f:fs/jfs/jfs_inode.h
-f:fs/jfs/jfs_lock.h
-f:fs/jfs/jfs_logmgr.c
-f:fs/jfs/jfs_logmgr.h
-f:fs/jfs/jfs_metapage.c
-f:fs/jfs/jfs_metapage.h
-f:fs/jfs/jfs_mount.c
-f:fs/jfs/jfs_superblock.h
-f:fs/jfs/jfs_txnmgr.c
-f:fs/jfs/jfs_txnmgr.h
-f:fs/jfs/jfs_types.h
-f:fs/jfs/jfs_umount.c
-f:fs/jfs/jfs_unicode.c
-f:fs/jfs/jfs_unicode.h
-f:fs/jfs/jfs_xattr.h
-f:fs/jfs/jfs_xtree.c
-f:fs/jfs/jfs_xtree.h
-f:fs/jfs/namei.c
-f:fs/jfs/resize.c
-f:fs/jfs/super.c
-f:fs/jfs/symlink.c
-f:fs/jfs/xattr.c
-f:fs/kernel_read_file.c
-f:fs/kernfs/Kconfig
-f:fs/kernfs/Makefile
-f:fs/kernfs/dir.c
-f:fs/kernfs/file.c
-f:fs/kernfs/inode.c
-f:fs/kernfs/kernfs-internal.h
-f:fs/kernfs/mount.c
-f:fs/kernfs/symlink.c
-f:fs/libfs.c
-f:fs/lockd/Makefile
-f:fs/lockd/clnt4xdr.c
-f:fs/lockd/clntlock.c
-f:fs/lockd/clntproc.c
-f:fs/lockd/clntxdr.c
-f:fs/lockd/host.c
-f:fs/lockd/mon.c
-f:fs/lockd/netlink.c
-f:fs/lockd/netlink.h
-f:fs/lockd/netns.h
-f:fs/lockd/procfs.c
-f:fs/lockd/procfs.h
-f:fs/lockd/svc.c
-f:fs/lockd/svc4proc.c
-f:fs/lockd/svclock.c
-f:fs/lockd/svcproc.c
-f:fs/lockd/svcshare.c
-f:fs/lockd/svcsubs.c
-f:fs/lockd/svcxdr.h
-f:fs/lockd/trace.c
-f:fs/lockd/trace.h
-f:fs/lockd/xdr.c
-f:fs/lockd/xdr4.c
-f:fs/locks.c
-f:fs/mbcache.c
-f:fs/minix/Kconfig
-f:fs/minix/Makefile
-f:fs/minix/bitmap.c
-f:fs/minix/dir.c
-f:fs/minix/file.c
-f:fs/minix/inode.c
-f:fs/minix/itree_common.c
-f:fs/minix/itree_v1.c
-f:fs/minix/itree_v2.c
-f:fs/minix/minix.h
-f:fs/minix/namei.c
-f:fs/mnt_idmapping.c
-f:fs/mount.h
-f:fs/mpage.c
-f:fs/namei.c
-f:fs/namespace.c
-f:fs/netfs/Kconfig
-f:fs/netfs/Makefile
-f:fs/netfs/buffered_read.c
-f:fs/netfs/buffered_write.c
-f:fs/netfs/direct_read.c
-f:fs/netfs/direct_write.c
-f:fs/netfs/fscache_cache.c
-f:fs/netfs/fscache_cookie.c
-f:fs/netfs/fscache_internal.h
-f:fs/netfs/fscache_io.c
-f:fs/netfs/fscache_main.c
-f:fs/netfs/fscache_proc.c
-f:fs/netfs/fscache_stats.c
-f:fs/netfs/fscache_volume.c
-f:fs/netfs/internal.h
-f:fs/netfs/iterator.c
-f:fs/netfs/locking.c
-f:fs/netfs/main.c
-f:fs/netfs/misc.c
-f:fs/netfs/objects.c
-f:fs/netfs/read_collect.c
-f:fs/netfs/read_pgpriv2.c
-f:fs/netfs/read_retry.c
-f:fs/netfs/read_single.c
-f:fs/netfs/rolling_buffer.c
-f:fs/netfs/stats.c
-f:fs/netfs/write_collect.c
-f:fs/netfs/write_issue.c
-f:fs/netfs/write_retry.c
-f:fs/nfs/Kconfig
-f:fs/nfs/Makefile
-f:fs/nfs/blocklayout/Makefile
-f:fs/nfs/blocklayout/blocklayout.c
-f:fs/nfs/blocklayout/blocklayout.h
-f:fs/nfs/blocklayout/dev.c
-f:fs/nfs/blocklayout/extent_tree.c
-f:fs/nfs/blocklayout/rpc_pipefs.c
-f:fs/nfs/cache_lib.c
-f:fs/nfs/cache_lib.h
-f:fs/nfs/callback.c
-f:fs/nfs/callback.h
-f:fs/nfs/callback_proc.c
-f:fs/nfs/callback_xdr.c
-f:fs/nfs/client.c
-f:fs/nfs/delegation.c
-f:fs/nfs/delegation.h
-f:fs/nfs/dir.c
-f:fs/nfs/direct.c
-f:fs/nfs/dns_resolve.c
-f:fs/nfs/dns_resolve.h
-f:fs/nfs/export.c
-f:fs/nfs/file.c
-f:fs/nfs/filelayout/Makefile
-f:fs/nfs/filelayout/filelayout.c
-f:fs/nfs/filelayout/filelayout.h
-f:fs/nfs/filelayout/filelayoutdev.c
-f:fs/nfs/flexfilelayout/Makefile
-f:fs/nfs/flexfilelayout/flexfilelayout.c
-f:fs/nfs/flexfilelayout/flexfilelayout.h
-f:fs/nfs/flexfilelayout/flexfilelayoutdev.c
-f:fs/nfs/fs_context.c
-f:fs/nfs/fscache.c
-f:fs/nfs/fscache.h
-f:fs/nfs/getroot.c
-f:fs/nfs/inode.c
-f:fs/nfs/internal.h
-f:fs/nfs/io.c
-f:fs/nfs/iostat.h
-f:fs/nfs/localio.c
-f:fs/nfs/mount_clnt.c
-f:fs/nfs/namespace.c
-f:fs/nfs/netns.h
-f:fs/nfs/nfs.h
-f:fs/nfs/nfs2super.c
-f:fs/nfs/nfs2xdr.c
-f:fs/nfs/nfs3_fs.h
-f:fs/nfs/nfs3acl.c
-f:fs/nfs/nfs3client.c
-f:fs/nfs/nfs3proc.c
-f:fs/nfs/nfs3super.c
-f:fs/nfs/nfs3xdr.c
-f:fs/nfs/nfs42.h
-f:fs/nfs/nfs42proc.c
-f:fs/nfs/nfs42xattr.c
-f:fs/nfs/nfs42xdr.c
-f:fs/nfs/nfs4_fs.h
-f:fs/nfs/nfs4client.c
-f:fs/nfs/nfs4file.c
-f:fs/nfs/nfs4getroot.c
-f:fs/nfs/nfs4idmap.c
-f:fs/nfs/nfs4idmap.h
-f:fs/nfs/nfs4namespace.c
-f:fs/nfs/nfs4proc.c
-f:fs/nfs/nfs4renewd.c
-f:fs/nfs/nfs4session.c
-f:fs/nfs/nfs4session.h
-f:fs/nfs/nfs4state.c
-f:fs/nfs/nfs4super.c
-f:fs/nfs/nfs4sysctl.c
-f:fs/nfs/nfs4trace.c
-f:fs/nfs/nfs4trace.h
-f:fs/nfs/nfs4xdr.c
-f:fs/nfs/nfsroot.c
-f:fs/nfs/nfstrace.c
-f:fs/nfs/nfstrace.h
-f:fs/nfs/pagelist.c
-f:fs/nfs/pnfs.c
-f:fs/nfs/pnfs.h
-f:fs/nfs/pnfs_dev.c
-f:fs/nfs/pnfs_nfs.c
-f:fs/nfs/proc.c
-f:fs/nfs/read.c
-f:fs/nfs/super.c
-f:fs/nfs/symlink.c
-f:fs/nfs/sysctl.c
-f:fs/nfs/sysfs.c
-f:fs/nfs/sysfs.h
-f:fs/nfs/unlink.c
-f:fs/nfs/write.c
-f:fs/nfs_common/Makefile
-f:fs/nfs_common/common.c
-f:fs/nfs_common/grace.c
-f:fs/nfs_common/localio_trace.c
-f:fs/nfs_common/localio_trace.h
-f:fs/nfs_common/nfs_ssc.c
-f:fs/nfs_common/nfsacl.c
-f:fs/nfs_common/nfslocalio.c
-f:fs/nfsd/Kconfig
-f:fs/nfsd/Makefile
-f:fs/nfsd/acl.h
-f:fs/nfsd/auth.c
-f:fs/nfsd/auth.h
-f:fs/nfsd/blocklayout.c
-f:fs/nfsd/blocklayoutxdr.c
-f:fs/nfsd/blocklayoutxdr.h
-f:fs/nfsd/cache.h
-f:fs/nfsd/current_stateid.h
-f:fs/nfsd/debugfs.c
-f:fs/nfsd/export.c
-f:fs/nfsd/export.h
-f:fs/nfsd/filecache.c
-f:fs/nfsd/filecache.h
-f:fs/nfsd/flexfilelayout.c
-f:fs/nfsd/flexfilelayoutxdr.c
-f:fs/nfsd/flexfilelayoutxdr.h
-f:fs/nfsd/idmap.h
-f:fs/nfsd/localio.c
-f:fs/nfsd/lockd.c
-f:fs/nfsd/netlink.c
-f:fs/nfsd/netlink.h
-f:fs/nfsd/netns.h
-f:fs/nfsd/nfs2acl.c
-f:fs/nfsd/nfs3acl.c
-f:fs/nfsd/nfs3proc.c
-f:fs/nfsd/nfs3xdr.c
-f:fs/nfsd/nfs4acl.c
-f:fs/nfsd/nfs4callback.c
-f:fs/nfsd/nfs4idmap.c
-f:fs/nfsd/nfs4layouts.c
-f:fs/nfsd/nfs4proc.c
-f:fs/nfsd/nfs4recover.c
-f:fs/nfsd/nfs4state.c
-f:fs/nfsd/nfs4xdr.c
-f:fs/nfsd/nfs4xdr_gen.c
-f:fs/nfsd/nfs4xdr_gen.h
-f:fs/nfsd/nfscache.c
-f:fs/nfsd/nfsctl.c
-f:fs/nfsd/nfsd.h
-f:fs/nfsd/nfsfh.c
-f:fs/nfsd/nfsfh.h
-f:fs/nfsd/nfsproc.c
-f:fs/nfsd/nfssvc.c
-f:fs/nfsd/nfsxdr.c
-f:fs/nfsd/pnfs.h
-f:fs/nfsd/state.h
-f:fs/nfsd/stats.c
-f:fs/nfsd/stats.h
-f:fs/nfsd/trace.c
-f:fs/nfsd/trace.h
-f:fs/nfsd/vfs.c
-f:fs/nfsd/vfs.h
-f:fs/nfsd/xdr.h
-f:fs/nfsd/xdr3.h
-f:fs/nfsd/xdr4.h
-f:fs/nfsd/xdr4cb.h
-f:fs/nilfs2/Kconfig
-f:fs/nilfs2/Makefile
-f:fs/nilfs2/alloc.c
-f:fs/nilfs2/alloc.h
-f:fs/nilfs2/bmap.c
-f:fs/nilfs2/bmap.h
-f:fs/nilfs2/btnode.c
-f:fs/nilfs2/btnode.h
-f:fs/nilfs2/btree.c
-f:fs/nilfs2/btree.h
-f:fs/nilfs2/cpfile.c
-f:fs/nilfs2/cpfile.h
-f:fs/nilfs2/dat.c
-f:fs/nilfs2/dat.h
-f:fs/nilfs2/dir.c
-f:fs/nilfs2/direct.c
-f:fs/nilfs2/direct.h
-f:fs/nilfs2/export.h
-f:fs/nilfs2/file.c
-f:fs/nilfs2/gcinode.c
-f:fs/nilfs2/ifile.c
-f:fs/nilfs2/ifile.h
-f:fs/nilfs2/inode.c
-f:fs/nilfs2/ioctl.c
-f:fs/nilfs2/mdt.c
-f:fs/nilfs2/mdt.h
-f:fs/nilfs2/namei.c
-f:fs/nilfs2/nilfs.h
-f:fs/nilfs2/page.c
-f:fs/nilfs2/page.h
-f:fs/nilfs2/recovery.c
-f:fs/nilfs2/segbuf.c
-f:fs/nilfs2/segbuf.h
-f:fs/nilfs2/segment.c
-f:fs/nilfs2/segment.h
-f:fs/nilfs2/sufile.c
-f:fs/nilfs2/sufile.h
-f:fs/nilfs2/super.c
-f:fs/nilfs2/sysfs.c
-f:fs/nilfs2/sysfs.h
-f:fs/nilfs2/the_nilfs.c
-f:fs/nilfs2/the_nilfs.h
-f:fs/nls/Kconfig
-f:fs/nls/Makefile
-f:fs/nls/mac-celtic.c
-f:fs/nls/mac-centeuro.c
-f:fs/nls/mac-croatian.c
-f:fs/nls/mac-cyrillic.c
-f:fs/nls/mac-gaelic.c
-f:fs/nls/mac-greek.c
-f:fs/nls/mac-iceland.c
-f:fs/nls/mac-inuit.c
-f:fs/nls/mac-roman.c
-f:fs/nls/mac-romanian.c
-f:fs/nls/mac-turkish.c
-f:fs/nls/nls_ascii.c
-f:fs/nls/nls_base.c
-f:fs/nls/nls_cp1250.c
-f:fs/nls/nls_cp1251.c
-f:fs/nls/nls_cp1255.c
-f:fs/nls/nls_cp437.c
-f:fs/nls/nls_cp737.c
-f:fs/nls/nls_cp775.c
-f:fs/nls/nls_cp850.c
-f:fs/nls/nls_cp852.c
-f:fs/nls/nls_cp855.c
-f:fs/nls/nls_cp857.c
-f:fs/nls/nls_cp860.c
-f:fs/nls/nls_cp861.c
-f:fs/nls/nls_cp862.c
-f:fs/nls/nls_cp863.c
-f:fs/nls/nls_cp864.c
-f:fs/nls/nls_cp865.c
-f:fs/nls/nls_cp866.c
-f:fs/nls/nls_cp869.c
-f:fs/nls/nls_cp874.c
-f:fs/nls/nls_cp932.c
-f:fs/nls/nls_cp936.c
-f:fs/nls/nls_cp949.c
-f:fs/nls/nls_cp950.c
-f:fs/nls/nls_euc-jp.c
-f:fs/nls/nls_iso8859-1.c
-f:fs/nls/nls_iso8859-13.c
-f:fs/nls/nls_iso8859-14.c
-f:fs/nls/nls_iso8859-15.c
-f:fs/nls/nls_iso8859-2.c
-f:fs/nls/nls_iso8859-3.c
-f:fs/nls/nls_iso8859-4.c
-f:fs/nls/nls_iso8859-5.c
-f:fs/nls/nls_iso8859-6.c
-f:fs/nls/nls_iso8859-7.c
-f:fs/nls/nls_iso8859-9.c
-f:fs/nls/nls_koi8-r.c
-f:fs/nls/nls_koi8-ru.c
-f:fs/nls/nls_koi8-u.c
-f:fs/nls/nls_ucs2_data.h
-f:fs/nls/nls_ucs2_utils.c
-f:fs/nls/nls_ucs2_utils.h
-f:fs/nls/nls_utf8.c
-f:fs/notify/Kconfig
-f:fs/notify/Makefile
-f:fs/notify/dnotify/Kconfig
-f:fs/notify/dnotify/Makefile
-f:fs/notify/dnotify/dnotify.c
-f:fs/notify/fanotify/Kconfig
-f:fs/notify/fanotify/Makefile
-f:fs/notify/fanotify/fanotify.c
-f:fs/notify/fanotify/fanotify.h
-f:fs/notify/fanotify/fanotify_user.c
-f:fs/notify/fdinfo.c
-f:fs/notify/fdinfo.h
-f:fs/notify/fsnotify.c
-f:fs/notify/fsnotify.h
-f:fs/notify/group.c
-f:fs/notify/inotify/Kconfig
-f:fs/notify/inotify/Makefile
-f:fs/notify/inotify/inotify.h
-f:fs/notify/inotify/inotify_fsnotify.c
-f:fs/notify/inotify/inotify_user.c
-f:fs/notify/mark.c
-f:fs/notify/notification.c
-f:fs/nsfs.c
-f:fs/ntfs3/Kconfig
-f:fs/ntfs3/Makefile
-f:fs/ntfs3/attrib.c
-f:fs/ntfs3/attrlist.c
-f:fs/ntfs3/bitfunc.c
-f:fs/ntfs3/bitmap.c
-f:fs/ntfs3/debug.h
-f:fs/ntfs3/dir.c
-f:fs/ntfs3/file.c
-f:fs/ntfs3/frecord.c
-f:fs/ntfs3/fslog.c
-f:fs/ntfs3/fsntfs.c
-f:fs/ntfs3/index.c
-f:fs/ntfs3/inode.c
-f:fs/ntfs3/lib/decompress_common.c
-f:fs/ntfs3/lib/decompress_common.h
-f:fs/ntfs3/lib/lib.h
-f:fs/ntfs3/lib/lzx_decompress.c
-f:fs/ntfs3/lib/xpress_decompress.c
-f:fs/ntfs3/lznt.c
-f:fs/ntfs3/namei.c
-f:fs/ntfs3/ntfs.h
-f:fs/ntfs3/ntfs_fs.h
-f:fs/ntfs3/record.c
-f:fs/ntfs3/run.c
-f:fs/ntfs3/super.c
-f:fs/ntfs3/upcase.c
-f:fs/ntfs3/xattr.c
-f:fs/ocfs2/Kconfig
-f:fs/ocfs2/Makefile
-f:fs/ocfs2/acl.c
-f:fs/ocfs2/acl.h
-f:fs/ocfs2/alloc.c
-f:fs/ocfs2/alloc.h
-f:fs/ocfs2/aops.c
-f:fs/ocfs2/aops.h
-f:fs/ocfs2/blockcheck.c
-f:fs/ocfs2/blockcheck.h
-f:fs/ocfs2/buffer_head_io.c
-f:fs/ocfs2/buffer_head_io.h
-f:fs/ocfs2/cluster/Makefile
-f:fs/ocfs2/cluster/heartbeat.c
-f:fs/ocfs2/cluster/heartbeat.h
-f:fs/ocfs2/cluster/masklog.c
-f:fs/ocfs2/cluster/masklog.h
-f:fs/ocfs2/cluster/netdebug.c
-f:fs/ocfs2/cluster/nodemanager.c
-f:fs/ocfs2/cluster/nodemanager.h
-f:fs/ocfs2/cluster/ocfs2_heartbeat.h
-f:fs/ocfs2/cluster/ocfs2_nodemanager.h
-f:fs/ocfs2/cluster/quorum.c
-f:fs/ocfs2/cluster/quorum.h
-f:fs/ocfs2/cluster/sys.c
-f:fs/ocfs2/cluster/sys.h
-f:fs/ocfs2/cluster/tcp.c
-f:fs/ocfs2/cluster/tcp.h
-f:fs/ocfs2/cluster/tcp_internal.h
-f:fs/ocfs2/dcache.c
-f:fs/ocfs2/dcache.h
-f:fs/ocfs2/dir.c
-f:fs/ocfs2/dir.h
-f:fs/ocfs2/dlm/Makefile
-f:fs/ocfs2/dlm/dlmapi.h
-f:fs/ocfs2/dlm/dlmast.c
-f:fs/ocfs2/dlm/dlmcommon.h
-f:fs/ocfs2/dlm/dlmconvert.c
-f:fs/ocfs2/dlm/dlmconvert.h
-f:fs/ocfs2/dlm/dlmdebug.c
-f:fs/ocfs2/dlm/dlmdebug.h
-f:fs/ocfs2/dlm/dlmdomain.c
-f:fs/ocfs2/dlm/dlmdomain.h
-f:fs/ocfs2/dlm/dlmlock.c
-f:fs/ocfs2/dlm/dlmmaster.c
-f:fs/ocfs2/dlm/dlmrecovery.c
-f:fs/ocfs2/dlm/dlmthread.c
-f:fs/ocfs2/dlm/dlmunlock.c
-f:fs/ocfs2/dlmfs/Makefile
-f:fs/ocfs2/dlmfs/dlmfs.c
-f:fs/ocfs2/dlmfs/userdlm.c
-f:fs/ocfs2/dlmfs/userdlm.h
-f:fs/ocfs2/dlmglue.c
-f:fs/ocfs2/dlmglue.h
-f:fs/ocfs2/export.c
-f:fs/ocfs2/export.h
-f:fs/ocfs2/extent_map.c
-f:fs/ocfs2/extent_map.h
-f:fs/ocfs2/file.c
-f:fs/ocfs2/file.h
-f:fs/ocfs2/filecheck.c
-f:fs/ocfs2/filecheck.h
-f:fs/ocfs2/heartbeat.c
-f:fs/ocfs2/heartbeat.h
-f:fs/ocfs2/inode.c
-f:fs/ocfs2/inode.h
-f:fs/ocfs2/ioctl.c
-f:fs/ocfs2/ioctl.h
-f:fs/ocfs2/journal.c
-f:fs/ocfs2/journal.h
-f:fs/ocfs2/localalloc.c
-f:fs/ocfs2/localalloc.h
-f:fs/ocfs2/locks.c
-f:fs/ocfs2/locks.h
-f:fs/ocfs2/mmap.c
-f:fs/ocfs2/mmap.h
-f:fs/ocfs2/move_extents.c
-f:fs/ocfs2/move_extents.h
-f:fs/ocfs2/namei.c
-f:fs/ocfs2/namei.h
-f:fs/ocfs2/ocfs1_fs_compat.h
-f:fs/ocfs2/ocfs2.h
-f:fs/ocfs2/ocfs2_fs.h
-f:fs/ocfs2/ocfs2_ioctl.h
-f:fs/ocfs2/ocfs2_lockid.h
-f:fs/ocfs2/ocfs2_lockingver.h
-f:fs/ocfs2/ocfs2_trace.h
-f:fs/ocfs2/quota.h
-f:fs/ocfs2/quota_global.c
-f:fs/ocfs2/quota_local.c
-f:fs/ocfs2/refcounttree.c
-f:fs/ocfs2/refcounttree.h
-f:fs/ocfs2/reservations.c
-f:fs/ocfs2/reservations.h
-f:fs/ocfs2/resize.c
-f:fs/ocfs2/resize.h
-f:fs/ocfs2/slot_map.c
-f:fs/ocfs2/slot_map.h
-f:fs/ocfs2/stack_o2cb.c
-f:fs/ocfs2/stack_user.c
-f:fs/ocfs2/stackglue.c
-f:fs/ocfs2/stackglue.h
-f:fs/ocfs2/suballoc.c
-f:fs/ocfs2/suballoc.h
-f:fs/ocfs2/super.c
-f:fs/ocfs2/super.h
-f:fs/ocfs2/symlink.c
-f:fs/ocfs2/symlink.h
-f:fs/ocfs2/sysfile.c
-f:fs/ocfs2/sysfile.h
-f:fs/ocfs2/uptodate.c
-f:fs/ocfs2/uptodate.h
-f:fs/ocfs2/xattr.c
-f:fs/ocfs2/xattr.h
-f:fs/omfs/Kconfig
-f:fs/omfs/Makefile
-f:fs/omfs/bitmap.c
-f:fs/omfs/dir.c
-f:fs/omfs/file.c
-f:fs/omfs/inode.c
-f:fs/omfs/omfs.h
-f:fs/omfs/omfs_fs.h
-f:fs/open.c
-f:fs/openpromfs/Makefile
-f:fs/openpromfs/inode.c
-f:fs/orangefs/Kconfig
-f:fs/orangefs/Makefile
-f:fs/orangefs/acl.c
-f:fs/orangefs/dcache.c
-f:fs/orangefs/devorangefs-req.c
-f:fs/orangefs/dir.c
-f:fs/orangefs/downcall.h
-f:fs/orangefs/file.c
-f:fs/orangefs/inode.c
-f:fs/orangefs/namei.c
-f:fs/orangefs/orangefs-bufmap.c
-f:fs/orangefs/orangefs-bufmap.h
-f:fs/orangefs/orangefs-cache.c
-f:fs/orangefs/orangefs-debug.h
-f:fs/orangefs/orangefs-debugfs.c
-f:fs/orangefs/orangefs-debugfs.h
-f:fs/orangefs/orangefs-dev-proto.h
-f:fs/orangefs/orangefs-kernel.h
-f:fs/orangefs/orangefs-mod.c
-f:fs/orangefs/orangefs-sysfs.c
-f:fs/orangefs/orangefs-sysfs.h
-f:fs/orangefs/orangefs-utils.c
-f:fs/orangefs/protocol.h
-f:fs/orangefs/super.c
-f:fs/orangefs/symlink.c
-f:fs/orangefs/upcall.h
-f:fs/orangefs/waitqueue.c
-f:fs/orangefs/xattr.c
-f:fs/overlayfs/Kconfig
-f:fs/overlayfs/Makefile
-f:fs/overlayfs/copy_up.c
-f:fs/overlayfs/dir.c
-f:fs/overlayfs/export.c
-f:fs/overlayfs/file.c
-f:fs/overlayfs/inode.c
-f:fs/overlayfs/namei.c
-f:fs/overlayfs/overlayfs.h
-f:fs/overlayfs/ovl_entry.h
-f:fs/overlayfs/params.c
-f:fs/overlayfs/params.h
-f:fs/overlayfs/readdir.c
-f:fs/overlayfs/super.c
-f:fs/overlayfs/util.c
-f:fs/overlayfs/xattrs.c
-f:fs/pidfs.c
-f:fs/pipe.c
-f:fs/pnode.c
-f:fs/pnode.h
-f:fs/posix_acl.c
-f:fs/proc/Kconfig
-f:fs/proc/Makefile
-f:fs/proc/array.c
-f:fs/proc/base.c
-f:fs/proc/bootconfig.c
-f:fs/proc/cmdline.c
-f:fs/proc/consoles.c
-f:fs/proc/cpuinfo.c
-f:fs/proc/devices.c
-f:fs/proc/fd.c
-f:fs/proc/fd.h
-f:fs/proc/generic.c
-f:fs/proc/inode.c
-f:fs/proc/internal.h
-f:fs/proc/interrupts.c
-f:fs/proc/kcore.c
-f:fs/proc/kmsg.c
-f:fs/proc/loadavg.c
-f:fs/proc/meminfo.c
-f:fs/proc/namespaces.c
-f:fs/proc/nommu.c
-f:fs/proc/page.c
-f:fs/proc/proc_net.c
-f:fs/proc/proc_sysctl.c
-f:fs/proc/proc_tty.c
-f:fs/proc/root.c
-f:fs/proc/self.c
-f:fs/proc/softirqs.c
-f:fs/proc/stat.c
-f:fs/proc/task_mmu.c
-f:fs/proc/task_nommu.c
-f:fs/proc/thread_self.c
-f:fs/proc/uptime.c
-f:fs/proc/util.c
-f:fs/proc/version.c
-f:fs/proc/vmcore.c
-f:fs/proc_namespace.c
-f:fs/pstore/Kconfig
-f:fs/pstore/Makefile
-f:fs/pstore/blk.c
-f:fs/pstore/ftrace.c
-f:fs/pstore/inode.c
-f:fs/pstore/internal.h
-f:fs/pstore/platform.c
-f:fs/pstore/pmsg.c
-f:fs/pstore/ram.c
-f:fs/pstore/ram_core.c
-f:fs/pstore/ram_internal.h
-f:fs/pstore/zone.c
-f:fs/qnx4/Kconfig
-f:fs/qnx4/Makefile
-f:fs/qnx4/bitmap.c
-f:fs/qnx4/dir.c
-f:fs/qnx4/inode.c
-f:fs/qnx4/namei.c
-f:fs/qnx4/qnx4.h
-f:fs/qnx6/Kconfig
-f:fs/qnx6/Makefile
-f:fs/qnx6/dir.c
-f:fs/qnx6/inode.c
-f:fs/qnx6/namei.c
-f:fs/qnx6/qnx6.h
-f:fs/qnx6/super_mmi.c
-f:fs/quota/Kconfig
-f:fs/quota/Makefile
-f:fs/quota/compat.h
-f:fs/quota/dquot.c
-f:fs/quota/kqid.c
-f:fs/quota/netlink.c
-f:fs/quota/quota.c
-f:fs/quota/quota_tree.c
-f:fs/quota/quota_tree.h
-f:fs/quota/quota_v1.c
-f:fs/quota/quota_v2.c
-f:fs/quota/quotaio_v1.h
-f:fs/quota/quotaio_v2.h
-f:fs/ramfs/Makefile
-f:fs/ramfs/file-mmu.c
-f:fs/ramfs/file-nommu.c
-f:fs/ramfs/inode.c
-f:fs/ramfs/internal.h
-f:fs/read_write.c
-f:fs/readdir.c
-f:fs/remap_range.c
-f:fs/resctrl/Kconfig
-f:fs/resctrl/Makefile
-f:fs/resctrl/ctrlmondata.c
-f:fs/resctrl/internal.h
-f:fs/resctrl/monitor.c
-f:fs/resctrl/monitor_trace.h
-f:fs/resctrl/pseudo_lock.c
-f:fs/resctrl/rdtgroup.c
-f:fs/romfs/Kconfig
-f:fs/romfs/Makefile
-f:fs/romfs/internal.h
-f:fs/romfs/mmap-nommu.c
-f:fs/romfs/storage.c
-f:fs/romfs/super.c
-f:fs/select.c
-f:fs/seq_file.c
-f:fs/signalfd.c
-f:fs/smb/Kconfig
-f:fs/smb/Makefile
-f:fs/smb/client/Kconfig
-f:fs/smb/client/Makefile
-f:fs/smb/client/asn1.c
-f:fs/smb/client/cached_dir.c
-f:fs/smb/client/cached_dir.h
-f:fs/smb/client/cifs_debug.c
-f:fs/smb/client/cifs_debug.h
-f:fs/smb/client/cifs_fs_sb.h
-f:fs/smb/client/cifs_ioctl.h
-f:fs/smb/client/cifs_spnego.c
-f:fs/smb/client/cifs_spnego.h
-f:fs/smb/client/cifs_spnego_negtokeninit.asn1
-f:fs/smb/client/cifs_swn.c
-f:fs/smb/client/cifs_swn.h
-f:fs/smb/client/cifs_unicode.c
-f:fs/smb/client/cifs_unicode.h
-f:fs/smb/client/cifsacl.c
-f:fs/smb/client/cifsacl.h
-f:fs/smb/client/cifsencrypt.c
-f:fs/smb/client/cifsfs.c
-f:fs/smb/client/cifsfs.h
-f:fs/smb/client/cifsglob.h
-f:fs/smb/client/cifspdu.h
-f:fs/smb/client/cifsproto.h
-f:fs/smb/client/cifsroot.c
-f:fs/smb/client/cifssmb.c
-f:fs/smb/client/compress.c
-f:fs/smb/client/compress.h
-f:fs/smb/client/compress/lz77.c
-f:fs/smb/client/compress/lz77.h
-f:fs/smb/client/connect.c
-f:fs/smb/client/dfs.c
-f:fs/smb/client/dfs.h
-f:fs/smb/client/dfs_cache.c
-f:fs/smb/client/dfs_cache.h
-f:fs/smb/client/dir.c
-f:fs/smb/client/dns_resolve.c
-f:fs/smb/client/dns_resolve.h
-f:fs/smb/client/export.c
-f:fs/smb/client/file.c
-f:fs/smb/client/fs_context.c
-f:fs/smb/client/fs_context.h
-f:fs/smb/client/fscache.c
-f:fs/smb/client/fscache.h
-f:fs/smb/client/inode.c
-f:fs/smb/client/ioctl.c
-f:fs/smb/client/link.c
-f:fs/smb/client/misc.c
-f:fs/smb/client/namespace.c
-f:fs/smb/client/netlink.c
-f:fs/smb/client/netlink.h
-f:fs/smb/client/netmisc.c
-f:fs/smb/client/nterr.c
-f:fs/smb/client/nterr.h
-f:fs/smb/client/ntlmssp.h
-f:fs/smb/client/readdir.c
-f:fs/smb/client/reparse.c
-f:fs/smb/client/reparse.h
-f:fs/smb/client/rfc1002pdu.h
-f:fs/smb/client/sess.c
-f:fs/smb/client/smb1ops.c
-f:fs/smb/client/smb2file.c
-f:fs/smb/client/smb2glob.h
-f:fs/smb/client/smb2inode.c
-f:fs/smb/client/smb2maperror.c
-f:fs/smb/client/smb2misc.c
-f:fs/smb/client/smb2ops.c
-f:fs/smb/client/smb2pdu.c
-f:fs/smb/client/smb2pdu.h
-f:fs/smb/client/smb2proto.h
-f:fs/smb/client/smb2transport.c
-f:fs/smb/client/smbdirect.c
-f:fs/smb/client/smbdirect.h
-f:fs/smb/client/smbencrypt.c
-f:fs/smb/client/smberr.h
-f:fs/smb/client/trace.c
-f:fs/smb/client/trace.h
-f:fs/smb/client/transport.c
-f:fs/smb/client/unc.c
-f:fs/smb/client/winucase.c
-f:fs/smb/client/xattr.c
-f:fs/smb/common/Makefile
-f:fs/smb/common/arc4.h
-f:fs/smb/common/cifs_arc4.c
-f:fs/smb/common/cifs_md4.c
-f:fs/smb/common/md4.h
-f:fs/smb/common/smb2pdu.h
-f:fs/smb/common/smb2status.h
-f:fs/smb/common/smbacl.h
-f:fs/smb/common/smbdirect/smbdirect.h
-f:fs/smb/common/smbdirect/smbdirect_pdu.h
-f:fs/smb/common/smbdirect/smbdirect_socket.h
-f:fs/smb/common/smbfsctl.h
-f:fs/smb/server/Kconfig
-f:fs/smb/server/Makefile
-f:fs/smb/server/asn1.c
-f:fs/smb/server/asn1.h
-f:fs/smb/server/auth.c
-f:fs/smb/server/auth.h
-f:fs/smb/server/connection.c
-f:fs/smb/server/connection.h
-f:fs/smb/server/crypto_ctx.c
-f:fs/smb/server/crypto_ctx.h
-f:fs/smb/server/glob.h
-f:fs/smb/server/ksmbd_netlink.h
-f:fs/smb/server/ksmbd_spnego_negtokeninit.asn1
-f:fs/smb/server/ksmbd_spnego_negtokentarg.asn1
-f:fs/smb/server/ksmbd_work.c
-f:fs/smb/server/ksmbd_work.h
-f:fs/smb/server/mgmt/ksmbd_ida.c
-f:fs/smb/server/mgmt/ksmbd_ida.h
-f:fs/smb/server/mgmt/share_config.c
-f:fs/smb/server/mgmt/share_config.h
-f:fs/smb/server/mgmt/tree_connect.c
-f:fs/smb/server/mgmt/tree_connect.h
-f:fs/smb/server/mgmt/user_config.c
-f:fs/smb/server/mgmt/user_config.h
-f:fs/smb/server/mgmt/user_session.c
-f:fs/smb/server/mgmt/user_session.h
-f:fs/smb/server/misc.c
-f:fs/smb/server/misc.h
-f:fs/smb/server/ndr.c
-f:fs/smb/server/ndr.h
-f:fs/smb/server/nterr.h
-f:fs/smb/server/ntlmssp.h
-f:fs/smb/server/oplock.c
-f:fs/smb/server/oplock.h
-f:fs/smb/server/server.c
-f:fs/smb/server/server.h
-f:fs/smb/server/smb2misc.c
-f:fs/smb/server/smb2ops.c
-f:fs/smb/server/smb2pdu.c
-f:fs/smb/server/smb2pdu.h
-f:fs/smb/server/smb_common.c
-f:fs/smb/server/smb_common.h
-f:fs/smb/server/smbacl.c
-f:fs/smb/server/smbacl.h
-f:fs/smb/server/smbfsctl.h
-f:fs/smb/server/transport_ipc.c
-f:fs/smb/server/transport_ipc.h
-f:fs/smb/server/transport_rdma.c
-f:fs/smb/server/transport_rdma.h
-f:fs/smb/server/transport_tcp.c
-f:fs/smb/server/transport_tcp.h
-f:fs/smb/server/unicode.c
-f:fs/smb/server/unicode.h
-f:fs/smb/server/vfs.c
-f:fs/smb/server/vfs.h
-f:fs/smb/server/vfs_cache.c
-f:fs/smb/server/vfs_cache.h
-f:fs/smb/server/xattr.h
-f:fs/splice.c
-f:fs/squashfs/Kconfig
-f:fs/squashfs/Makefile
-f:fs/squashfs/block.c
-f:fs/squashfs/cache.c
-f:fs/squashfs/decompressor.c
-f:fs/squashfs/decompressor.h
-f:fs/squashfs/decompressor_multi.c
-f:fs/squashfs/decompressor_multi_percpu.c
-f:fs/squashfs/decompressor_single.c
-f:fs/squashfs/dir.c
-f:fs/squashfs/export.c
-f:fs/squashfs/file.c
-f:fs/squashfs/file_cache.c
-f:fs/squashfs/file_direct.c
-f:fs/squashfs/fragment.c
-f:fs/squashfs/id.c
-f:fs/squashfs/inode.c
-f:fs/squashfs/lz4_wrapper.c
-f:fs/squashfs/lzo_wrapper.c
-f:fs/squashfs/namei.c
-f:fs/squashfs/page_actor.c
-f:fs/squashfs/page_actor.h
-f:fs/squashfs/squashfs.h
-f:fs/squashfs/squashfs_fs.h
-f:fs/squashfs/squashfs_fs_i.h
-f:fs/squashfs/squashfs_fs_sb.h
-f:fs/squashfs/super.c
-f:fs/squashfs/symlink.c
-f:fs/squashfs/xattr.c
-f:fs/squashfs/xattr.h
-f:fs/squashfs/xattr_id.c
-f:fs/squashfs/xz_wrapper.c
-f:fs/squashfs/zlib_wrapper.c
-f:fs/squashfs/zstd_wrapper.c
-f:fs/stack.c
-f:fs/stat.c
-f:fs/statfs.c
-f:fs/super.c
-f:fs/sync.c
-f:fs/sysctls.c
-f:fs/sysfs/Kconfig
-f:fs/sysfs/Makefile
-f:fs/sysfs/dir.c
-f:fs/sysfs/file.c
-f:fs/sysfs/group.c
-f:fs/sysfs/mount.c
-f:fs/sysfs/symlink.c
-f:fs/sysfs/sysfs.h
-f:fs/tests/binfmt_elf_kunit.c
-f:fs/tests/exec_kunit.c
-f:fs/timerfd.c
-f:fs/tracefs/Makefile
-f:fs/tracefs/event_inode.c
-f:fs/tracefs/inode.c
-f:fs/tracefs/internal.h
-f:fs/ubifs/Kconfig
-f:fs/ubifs/Makefile
-f:fs/ubifs/auth.c
-f:fs/ubifs/budget.c
-f:fs/ubifs/commit.c
-f:fs/ubifs/compress.c
-f:fs/ubifs/crypto.c
-f:fs/ubifs/debug.c
-f:fs/ubifs/debug.h
-f:fs/ubifs/dir.c
-f:fs/ubifs/file.c
-f:fs/ubifs/find.c
-f:fs/ubifs/gc.c
-f:fs/ubifs/io.c
-f:fs/ubifs/ioctl.c
-f:fs/ubifs/journal.c
-f:fs/ubifs/key.h
-f:fs/ubifs/log.c
-f:fs/ubifs/lprops.c
-f:fs/ubifs/lpt.c
-f:fs/ubifs/lpt_commit.c
-f:fs/ubifs/master.c
-f:fs/ubifs/misc.c
-f:fs/ubifs/misc.h
-f:fs/ubifs/orphan.c
-f:fs/ubifs/recovery.c
-f:fs/ubifs/replay.c
-f:fs/ubifs/sb.c
-f:fs/ubifs/scan.c
-f:fs/ubifs/shrinker.c
-f:fs/ubifs/super.c
-f:fs/ubifs/sysfs.c
-f:fs/ubifs/tnc.c
-f:fs/ubifs/tnc_commit.c
-f:fs/ubifs/tnc_misc.c
-f:fs/ubifs/ubifs-media.h
-f:fs/ubifs/ubifs.h
-f:fs/ubifs/xattr.c
-f:fs/udf/Kconfig
-f:fs/udf/Makefile
-f:fs/udf/balloc.c
-f:fs/udf/dir.c
-f:fs/udf/directory.c
-f:fs/udf/ecma_167.h
-f:fs/udf/file.c
-f:fs/udf/ialloc.c
-f:fs/udf/inode.c
-f:fs/udf/lowlevel.c
-f:fs/udf/misc.c
-f:fs/udf/namei.c
-f:fs/udf/osta_udf.h
-f:fs/udf/partition.c
-f:fs/udf/super.c
-f:fs/udf/symlink.c
-f:fs/udf/truncate.c
-f:fs/udf/udf_i.h
-f:fs/udf/udf_sb.h
-f:fs/udf/udfdecl.h
-f:fs/udf/udfend.h
-f:fs/udf/udftime.c
-f:fs/udf/unicode.c
-f:fs/ufs/Kconfig
-f:fs/ufs/Makefile
-f:fs/ufs/balloc.c
-f:fs/ufs/cylinder.c
-f:fs/ufs/dir.c
-f:fs/ufs/file.c
-f:fs/ufs/ialloc.c
-f:fs/ufs/inode.c
-f:fs/ufs/namei.c
-f:fs/ufs/super.c
-f:fs/ufs/swab.h
-f:fs/ufs/ufs.h
-f:fs/ufs/ufs_fs.h
-f:fs/ufs/util.c
-f:fs/ufs/util.h
-f:fs/unicode/.gitignore
-f:fs/unicode/Kconfig
-f:fs/unicode/Makefile
-f:fs/unicode/README.utf8data
-f:fs/unicode/mkutf8data.c
-f:fs/unicode/tests/.kunitconfig
-f:fs/unicode/tests/utf8_kunit.c
-f:fs/unicode/utf8-core.c
-f:fs/unicode/utf8-norm.c
-f:fs/unicode/utf8data.c_shipped
-f:fs/unicode/utf8n.h
-f:fs/userfaultfd.c
-f:fs/utimes.c
-f:fs/vboxsf/Kconfig
-f:fs/vboxsf/Makefile
-f:fs/vboxsf/dir.c
-f:fs/vboxsf/file.c
-f:fs/vboxsf/shfl_hostintf.h
-f:fs/vboxsf/super.c
-f:fs/vboxsf/utils.c
-f:fs/vboxsf/vboxsf_wrappers.c
-f:fs/vboxsf/vfsmod.h
-f:fs/verity/Kconfig
-f:fs/verity/Makefile
-f:fs/verity/enable.c
-f:fs/verity/fsverity_private.h
-f:fs/verity/hash_algs.c
-f:fs/verity/init.c
-f:fs/verity/measure.c
-f:fs/verity/open.c
-f:fs/verity/read_metadata.c
-f:fs/verity/signature.c
-f:fs/verity/verify.c
-f:fs/xattr.c
-f:fs/xfs/Kconfig
-f:fs/xfs/Makefile
-f:fs/xfs/libxfs/xfs_ag.c
-f:fs/xfs/libxfs/xfs_ag.h
-f:fs/xfs/libxfs/xfs_ag_resv.c
-f:fs/xfs/libxfs/xfs_ag_resv.h
-f:fs/xfs/libxfs/xfs_alloc.c
-f:fs/xfs/libxfs/xfs_alloc.h
-f:fs/xfs/libxfs/xfs_alloc_btree.c
-f:fs/xfs/libxfs/xfs_alloc_btree.h
-f:fs/xfs/libxfs/xfs_attr.c
-f:fs/xfs/libxfs/xfs_attr.h
-f:fs/xfs/libxfs/xfs_attr_leaf.c
-f:fs/xfs/libxfs/xfs_attr_leaf.h
-f:fs/xfs/libxfs/xfs_attr_remote.c
-f:fs/xfs/libxfs/xfs_attr_remote.h
-f:fs/xfs/libxfs/xfs_attr_sf.h
-f:fs/xfs/libxfs/xfs_bit.c
-f:fs/xfs/libxfs/xfs_bit.h
-f:fs/xfs/libxfs/xfs_bmap.c
-f:fs/xfs/libxfs/xfs_bmap.h
-f:fs/xfs/libxfs/xfs_bmap_btree.c
-f:fs/xfs/libxfs/xfs_bmap_btree.h
-f:fs/xfs/libxfs/xfs_btree.c
-f:fs/xfs/libxfs/xfs_btree.h
-f:fs/xfs/libxfs/xfs_btree_mem.c
-f:fs/xfs/libxfs/xfs_btree_mem.h
-f:fs/xfs/libxfs/xfs_btree_staging.c
-f:fs/xfs/libxfs/xfs_btree_staging.h
-f:fs/xfs/libxfs/xfs_cksum.h
-f:fs/xfs/libxfs/xfs_da_btree.c
-f:fs/xfs/libxfs/xfs_da_btree.h
-f:fs/xfs/libxfs/xfs_da_format.h
-f:fs/xfs/libxfs/xfs_defer.c
-f:fs/xfs/libxfs/xfs_defer.h
-f:fs/xfs/libxfs/xfs_dir2.c
-f:fs/xfs/libxfs/xfs_dir2.h
-f:fs/xfs/libxfs/xfs_dir2_block.c
-f:fs/xfs/libxfs/xfs_dir2_data.c
-f:fs/xfs/libxfs/xfs_dir2_leaf.c
-f:fs/xfs/libxfs/xfs_dir2_node.c
-f:fs/xfs/libxfs/xfs_dir2_priv.h
-f:fs/xfs/libxfs/xfs_dir2_sf.c
-f:fs/xfs/libxfs/xfs_dquot_buf.c
-f:fs/xfs/libxfs/xfs_errortag.h
-f:fs/xfs/libxfs/xfs_exchmaps.c
-f:fs/xfs/libxfs/xfs_exchmaps.h
-f:fs/xfs/libxfs/xfs_format.h
-f:fs/xfs/libxfs/xfs_fs.h
-f:fs/xfs/libxfs/xfs_group.c
-f:fs/xfs/libxfs/xfs_group.h
-f:fs/xfs/libxfs/xfs_health.h
-f:fs/xfs/libxfs/xfs_ialloc.c
-f:fs/xfs/libxfs/xfs_ialloc.h
-f:fs/xfs/libxfs/xfs_ialloc_btree.c
-f:fs/xfs/libxfs/xfs_ialloc_btree.h
-f:fs/xfs/libxfs/xfs_iext_tree.c
-f:fs/xfs/libxfs/xfs_inode_buf.c
-f:fs/xfs/libxfs/xfs_inode_buf.h
-f:fs/xfs/libxfs/xfs_inode_fork.c
-f:fs/xfs/libxfs/xfs_inode_fork.h
-f:fs/xfs/libxfs/xfs_inode_util.c
-f:fs/xfs/libxfs/xfs_inode_util.h
-f:fs/xfs/libxfs/xfs_log_format.h
-f:fs/xfs/libxfs/xfs_log_recover.h
-f:fs/xfs/libxfs/xfs_log_rlimit.c
-f:fs/xfs/libxfs/xfs_metadir.c
-f:fs/xfs/libxfs/xfs_metadir.h
-f:fs/xfs/libxfs/xfs_metafile.c
-f:fs/xfs/libxfs/xfs_metafile.h
-f:fs/xfs/libxfs/xfs_ondisk.h
-f:fs/xfs/libxfs/xfs_parent.c
-f:fs/xfs/libxfs/xfs_parent.h
-f:fs/xfs/libxfs/xfs_quota_defs.h
-f:fs/xfs/libxfs/xfs_refcount.c
-f:fs/xfs/libxfs/xfs_refcount.h
-f:fs/xfs/libxfs/xfs_refcount_btree.c
-f:fs/xfs/libxfs/xfs_refcount_btree.h
-f:fs/xfs/libxfs/xfs_rmap.c
-f:fs/xfs/libxfs/xfs_rmap.h
-f:fs/xfs/libxfs/xfs_rmap_btree.c
-f:fs/xfs/libxfs/xfs_rmap_btree.h
-f:fs/xfs/libxfs/xfs_rtbitmap.c
-f:fs/xfs/libxfs/xfs_rtbitmap.h
-f:fs/xfs/libxfs/xfs_rtgroup.c
-f:fs/xfs/libxfs/xfs_rtgroup.h
-f:fs/xfs/libxfs/xfs_rtrefcount_btree.c
-f:fs/xfs/libxfs/xfs_rtrefcount_btree.h
-f:fs/xfs/libxfs/xfs_rtrmap_btree.c
-f:fs/xfs/libxfs/xfs_rtrmap_btree.h
-f:fs/xfs/libxfs/xfs_sb.c
-f:fs/xfs/libxfs/xfs_sb.h
-f:fs/xfs/libxfs/xfs_shared.h
-f:fs/xfs/libxfs/xfs_symlink_remote.c
-f:fs/xfs/libxfs/xfs_symlink_remote.h
-f:fs/xfs/libxfs/xfs_trans_inode.c
-f:fs/xfs/libxfs/xfs_trans_resv.c
-f:fs/xfs/libxfs/xfs_trans_resv.h
-f:fs/xfs/libxfs/xfs_trans_space.c
-f:fs/xfs/libxfs/xfs_trans_space.h
-f:fs/xfs/libxfs/xfs_types.c
-f:fs/xfs/libxfs/xfs_types.h
-f:fs/xfs/libxfs/xfs_zones.c
-f:fs/xfs/libxfs/xfs_zones.h
-f:fs/xfs/scrub/agb_bitmap.c
-f:fs/xfs/scrub/agb_bitmap.h
-f:fs/xfs/scrub/agheader.c
-f:fs/xfs/scrub/agheader_repair.c
-f:fs/xfs/scrub/agino_bitmap.h
-f:fs/xfs/scrub/alloc.c
-f:fs/xfs/scrub/alloc_repair.c
-f:fs/xfs/scrub/attr.c
-f:fs/xfs/scrub/attr.h
-f:fs/xfs/scrub/attr_repair.c
-f:fs/xfs/scrub/attr_repair.h
-f:fs/xfs/scrub/bitmap.c
-f:fs/xfs/scrub/bitmap.h
-f:fs/xfs/scrub/bmap.c
-f:fs/xfs/scrub/bmap_repair.c
-f:fs/xfs/scrub/btree.c
-f:fs/xfs/scrub/btree.h
-f:fs/xfs/scrub/common.c
-f:fs/xfs/scrub/common.h
-f:fs/xfs/scrub/cow_repair.c
-f:fs/xfs/scrub/dab_bitmap.h
-f:fs/xfs/scrub/dabtree.c
-f:fs/xfs/scrub/dabtree.h
-f:fs/xfs/scrub/dir.c
-f:fs/xfs/scrub/dir_repair.c
-f:fs/xfs/scrub/dirtree.c
-f:fs/xfs/scrub/dirtree.h
-f:fs/xfs/scrub/dirtree_repair.c
-f:fs/xfs/scrub/dqiterate.c
-f:fs/xfs/scrub/findparent.c
-f:fs/xfs/scrub/findparent.h
-f:fs/xfs/scrub/fsb_bitmap.h
-f:fs/xfs/scrub/fscounters.c
-f:fs/xfs/scrub/fscounters.h
-f:fs/xfs/scrub/fscounters_repair.c
-f:fs/xfs/scrub/health.c
-f:fs/xfs/scrub/health.h
-f:fs/xfs/scrub/ialloc.c
-f:fs/xfs/scrub/ialloc_repair.c
-f:fs/xfs/scrub/ino_bitmap.h
-f:fs/xfs/scrub/inode.c
-f:fs/xfs/scrub/inode_repair.c
-f:fs/xfs/scrub/iscan.c
-f:fs/xfs/scrub/iscan.h
-f:fs/xfs/scrub/listxattr.c
-f:fs/xfs/scrub/listxattr.h
-f:fs/xfs/scrub/metapath.c
-f:fs/xfs/scrub/newbt.c
-f:fs/xfs/scrub/newbt.h
-f:fs/xfs/scrub/nlinks.c
-f:fs/xfs/scrub/nlinks.h
-f:fs/xfs/scrub/nlinks_repair.c
-f:fs/xfs/scrub/off_bitmap.h
-f:fs/xfs/scrub/orphanage.c
-f:fs/xfs/scrub/orphanage.h
-f:fs/xfs/scrub/parent.c
-f:fs/xfs/scrub/parent_repair.c
-f:fs/xfs/scrub/quota.c
-f:fs/xfs/scrub/quota.h
-f:fs/xfs/scrub/quota_repair.c
-f:fs/xfs/scrub/quotacheck.c
-f:fs/xfs/scrub/quotacheck.h
-f:fs/xfs/scrub/quotacheck_repair.c
-f:fs/xfs/scrub/rcbag.c
-f:fs/xfs/scrub/rcbag.h
-f:fs/xfs/scrub/rcbag_btree.c
-f:fs/xfs/scrub/rcbag_btree.h
-f:fs/xfs/scrub/readdir.c
-f:fs/xfs/scrub/readdir.h
-f:fs/xfs/scrub/reap.c
-f:fs/xfs/scrub/reap.h
-f:fs/xfs/scrub/refcount.c
-f:fs/xfs/scrub/refcount_repair.c
-f:fs/xfs/scrub/repair.c
-f:fs/xfs/scrub/repair.h
-f:fs/xfs/scrub/rgb_bitmap.h
-f:fs/xfs/scrub/rgsuper.c
-f:fs/xfs/scrub/rmap.c
-f:fs/xfs/scrub/rmap_repair.c
-f:fs/xfs/scrub/rtb_bitmap.h
-f:fs/xfs/scrub/rtbitmap.c
-f:fs/xfs/scrub/rtbitmap.h
-f:fs/xfs/scrub/rtbitmap_repair.c
-f:fs/xfs/scrub/rtrefcount.c
-f:fs/xfs/scrub/rtrefcount_repair.c
-f:fs/xfs/scrub/rtrmap.c
-f:fs/xfs/scrub/rtrmap_repair.c
-f:fs/xfs/scrub/rtsummary.c
-f:fs/xfs/scrub/rtsummary.h
-f:fs/xfs/scrub/rtsummary_repair.c
-f:fs/xfs/scrub/scrub.c
-f:fs/xfs/scrub/scrub.h
-f:fs/xfs/scrub/stats.c
-f:fs/xfs/scrub/stats.h
-f:fs/xfs/scrub/symlink.c
-f:fs/xfs/scrub/symlink_repair.c
-f:fs/xfs/scrub/tempexch.h
-f:fs/xfs/scrub/tempfile.c
-f:fs/xfs/scrub/tempfile.h
-f:fs/xfs/scrub/trace.c
-f:fs/xfs/scrub/trace.h
-f:fs/xfs/scrub/xfarray.c
-f:fs/xfs/scrub/xfarray.h
-f:fs/xfs/scrub/xfblob.c
-f:fs/xfs/scrub/xfblob.h
-f:fs/xfs/scrub/xfile.c
-f:fs/xfs/scrub/xfile.h
-f:fs/xfs/scrub/xfs_scrub.h
-f:fs/xfs/xfs.h
-f:fs/xfs/xfs_acl.c
-f:fs/xfs/xfs_acl.h
-f:fs/xfs/xfs_aops.c
-f:fs/xfs/xfs_aops.h
-f:fs/xfs/xfs_attr_inactive.c
-f:fs/xfs/xfs_attr_item.c
-f:fs/xfs/xfs_attr_item.h
-f:fs/xfs/xfs_attr_list.c
-f:fs/xfs/xfs_bio_io.c
-f:fs/xfs/xfs_bmap_item.c
-f:fs/xfs/xfs_bmap_item.h
-f:fs/xfs/xfs_bmap_util.c
-f:fs/xfs/xfs_bmap_util.h
-f:fs/xfs/xfs_buf.c
-f:fs/xfs/xfs_buf.h
-f:fs/xfs/xfs_buf_item.c
-f:fs/xfs/xfs_buf_item.h
-f:fs/xfs/xfs_buf_item_recover.c
-f:fs/xfs/xfs_buf_mem.c
-f:fs/xfs/xfs_buf_mem.h
-f:fs/xfs/xfs_dahash_test.c
-f:fs/xfs/xfs_dahash_test.h
-f:fs/xfs/xfs_dir2_readdir.c
-f:fs/xfs/xfs_discard.c
-f:fs/xfs/xfs_discard.h
-f:fs/xfs/xfs_dquot.c
-f:fs/xfs/xfs_dquot.h
-f:fs/xfs/xfs_dquot_item.c
-f:fs/xfs/xfs_dquot_item.h
-f:fs/xfs/xfs_dquot_item_recover.c
-f:fs/xfs/xfs_drain.c
-f:fs/xfs/xfs_drain.h
-f:fs/xfs/xfs_error.c
-f:fs/xfs/xfs_error.h
-f:fs/xfs/xfs_exchmaps_item.c
-f:fs/xfs/xfs_exchmaps_item.h
-f:fs/xfs/xfs_exchrange.c
-f:fs/xfs/xfs_exchrange.h
-f:fs/xfs/xfs_export.c
-f:fs/xfs/xfs_export.h
-f:fs/xfs/xfs_extent_busy.c
-f:fs/xfs/xfs_extent_busy.h
-f:fs/xfs/xfs_extfree_item.c
-f:fs/xfs/xfs_extfree_item.h
-f:fs/xfs/xfs_file.c
-f:fs/xfs/xfs_file.h
-f:fs/xfs/xfs_filestream.c
-f:fs/xfs/xfs_filestream.h
-f:fs/xfs/xfs_fsmap.c
-f:fs/xfs/xfs_fsmap.h
-f:fs/xfs/xfs_fsops.c
-f:fs/xfs/xfs_fsops.h
-f:fs/xfs/xfs_globals.c
-f:fs/xfs/xfs_handle.c
-f:fs/xfs/xfs_handle.h
-f:fs/xfs/xfs_health.c
-f:fs/xfs/xfs_hooks.c
-f:fs/xfs/xfs_hooks.h
-f:fs/xfs/xfs_icache.c
-f:fs/xfs/xfs_icache.h
-f:fs/xfs/xfs_icreate_item.c
-f:fs/xfs/xfs_icreate_item.h
-f:fs/xfs/xfs_inode.c
-f:fs/xfs/xfs_inode.h
-f:fs/xfs/xfs_inode_item.c
-f:fs/xfs/xfs_inode_item.h
-f:fs/xfs/xfs_inode_item_recover.c
-f:fs/xfs/xfs_ioctl.c
-f:fs/xfs/xfs_ioctl.h
-f:fs/xfs/xfs_ioctl32.c
-f:fs/xfs/xfs_ioctl32.h
-f:fs/xfs/xfs_iomap.c
-f:fs/xfs/xfs_iomap.h
-f:fs/xfs/xfs_iops.c
-f:fs/xfs/xfs_iops.h
-f:fs/xfs/xfs_itable.c
-f:fs/xfs/xfs_itable.h
-f:fs/xfs/xfs_iunlink_item.c
-f:fs/xfs/xfs_iunlink_item.h
-f:fs/xfs/xfs_iwalk.c
-f:fs/xfs/xfs_iwalk.h
-f:fs/xfs/xfs_linux.h
-f:fs/xfs/xfs_log.c
-f:fs/xfs/xfs_log.h
-f:fs/xfs/xfs_log_cil.c
-f:fs/xfs/xfs_log_priv.h
-f:fs/xfs/xfs_log_recover.c
-f:fs/xfs/xfs_message.c
-f:fs/xfs/xfs_message.h
-f:fs/xfs/xfs_mount.c
-f:fs/xfs/xfs_mount.h
-f:fs/xfs/xfs_mru_cache.c
-f:fs/xfs/xfs_mru_cache.h
-f:fs/xfs/xfs_notify_failure.c
-f:fs/xfs/xfs_notify_failure.h
-f:fs/xfs/xfs_pnfs.c
-f:fs/xfs/xfs_pnfs.h
-f:fs/xfs/xfs_pwork.c
-f:fs/xfs/xfs_pwork.h
-f:fs/xfs/xfs_qm.c
-f:fs/xfs/xfs_qm.h
-f:fs/xfs/xfs_qm_bhv.c
-f:fs/xfs/xfs_qm_syscalls.c
-f:fs/xfs/xfs_quota.h
-f:fs/xfs/xfs_quotaops.c
-f:fs/xfs/xfs_refcount_item.c
-f:fs/xfs/xfs_refcount_item.h
-f:fs/xfs/xfs_reflink.c
-f:fs/xfs/xfs_reflink.h
-f:fs/xfs/xfs_rmap_item.c
-f:fs/xfs/xfs_rmap_item.h
-f:fs/xfs/xfs_rtalloc.c
-f:fs/xfs/xfs_rtalloc.h
-f:fs/xfs/xfs_stats.c
-f:fs/xfs/xfs_stats.h
-f:fs/xfs/xfs_super.c
-f:fs/xfs/xfs_super.h
-f:fs/xfs/xfs_symlink.c
-f:fs/xfs/xfs_symlink.h
-f:fs/xfs/xfs_sysctl.c
-f:fs/xfs/xfs_sysctl.h
-f:fs/xfs/xfs_sysfs.c
-f:fs/xfs/xfs_sysfs.h
-f:fs/xfs/xfs_trace.c
-f:fs/xfs/xfs_trace.h
-f:fs/xfs/xfs_trans.c
-f:fs/xfs/xfs_trans.h
-f:fs/xfs/xfs_trans_ail.c
-f:fs/xfs/xfs_trans_buf.c
-f:fs/xfs/xfs_trans_dquot.c
-f:fs/xfs/xfs_trans_priv.h
-f:fs/xfs/xfs_xattr.c
-f:fs/xfs/xfs_xattr.h
-f:fs/xfs/xfs_zone_alloc.c
-f:fs/xfs/xfs_zone_alloc.h
-f:fs/xfs/xfs_zone_gc.c
-f:fs/xfs/xfs_zone_info.c
-f:fs/xfs/xfs_zone_priv.h
-f:fs/xfs/xfs_zone_space_resv.c
-f:fs/zonefs/Kconfig
-f:fs/zonefs/Makefile
-f:fs/zonefs/file.c
-f:fs/zonefs/super.c
-f:fs/zonefs/sysfs.c
-f:fs/zonefs/trace.h
-f:fs/zonefs/zonefs.h
-f:include/Kbuild
-f:include/acpi/acbuffer.h
-f:include/acpi/acconfig.h
-f:include/acpi/acexcep.h
-f:include/acpi/acnames.h
-f:include/acpi/acoutput.h
-f:include/acpi/acpi.h
-f:include/acpi/acpi_bus.h
-f:include/acpi/acpi_drivers.h
-f:include/acpi/acpi_io.h
-f:include/acpi/acpi_lpat.h
-f:include/acpi/acpi_numa.h
-f:include/acpi/acpiosxf.h
-f:include/acpi/acpixf.h
-f:include/acpi/acrestyp.h
-f:include/acpi/actbl.h
-f:include/acpi/actbl1.h
-f:include/acpi/actbl2.h
-f:include/acpi/actbl3.h
-f:include/acpi/actypes.h
-f:include/acpi/acuuid.h
-f:include/acpi/apei.h
-f:include/acpi/battery.h
-f:include/acpi/button.h
-f:include/acpi/cppc_acpi.h
-f:include/acpi/ghes.h
-f:include/acpi/hed.h
-f:include/acpi/nfit.h
-f:include/acpi/nhlt.h
-f:include/acpi/pcc.h
-f:include/acpi/platform/acenv.h
-f:include/acpi/platform/acenvex.h
-f:include/acpi/platform/acgcc.h
-f:include/acpi/platform/acgccex.h
-f:include/acpi/platform/aclinux.h
-f:include/acpi/platform/aclinuxex.h
-f:include/acpi/platform/aczephyr.h
-f:include/acpi/proc_cap_intel.h
-f:include/acpi/processor.h
-f:include/acpi/reboot.h
-f:include/acpi/video.h
-f:include/asm-generic/Kbuild
-f:include/asm-generic/access_ok.h
-f:include/asm-generic/agp.h
-f:include/asm-generic/archrandom.h
-f:include/asm-generic/asm-offsets.h
-f:include/asm-generic/asm-prototypes.h
-f:include/asm-generic/atomic.h
-f:include/asm-generic/atomic64.h
-f:include/asm-generic/audit_change_attr.h
-f:include/asm-generic/audit_dir_write.h
-f:include/asm-generic/audit_read.h
-f:include/asm-generic/audit_signal.h
-f:include/asm-generic/audit_write.h
-f:include/asm-generic/barrier.h
-f:include/asm-generic/bitops.h
-f:include/asm-generic/bitops/__ffs.h
-f:include/asm-generic/bitops/__fls.h
-f:include/asm-generic/bitops/arch_hweight.h
-f:include/asm-generic/bitops/atomic.h
-f:include/asm-generic/bitops/builtin-__ffs.h
-f:include/asm-generic/bitops/builtin-__fls.h
-f:include/asm-generic/bitops/builtin-ffs.h
-f:include/asm-generic/bitops/builtin-fls.h
-f:include/asm-generic/bitops/const_hweight.h
-f:include/asm-generic/bitops/ext2-atomic-setbit.h
-f:include/asm-generic/bitops/ext2-atomic.h
-f:include/asm-generic/bitops/ffs.h
-f:include/asm-generic/bitops/ffz.h
-f:include/asm-generic/bitops/fls.h
-f:include/asm-generic/bitops/fls64.h
-f:include/asm-generic/bitops/generic-non-atomic.h
-f:include/asm-generic/bitops/hweight.h
-f:include/asm-generic/bitops/instrumented-atomic.h
-f:include/asm-generic/bitops/instrumented-lock.h
-f:include/asm-generic/bitops/instrumented-non-atomic.h
-f:include/asm-generic/bitops/le.h
-f:include/asm-generic/bitops/lock.h
-f:include/asm-generic/bitops/non-atomic.h
-f:include/asm-generic/bitops/non-instrumented-non-atomic.h
-f:include/asm-generic/bitops/sched.h
-f:include/asm-generic/bitsperlong.h
-f:include/asm-generic/bug.h
-f:include/asm-generic/cache.h
-f:include/asm-generic/cacheflush.h
-f:include/asm-generic/cfi.h
-f:include/asm-generic/checksum.h
-f:include/asm-generic/cmpxchg-local.h
-f:include/asm-generic/cmpxchg.h
-f:include/asm-generic/codetag.lds.h
-f:include/asm-generic/compat.h
-f:include/asm-generic/current.h
-f:include/asm-generic/delay.h
-f:include/asm-generic/device.h
-f:include/asm-generic/div64.h
-f:include/asm-generic/dma-mapping.h
-f:include/asm-generic/dma.h
-f:include/asm-generic/early_ioremap.h
-f:include/asm-generic/emergency-restart.h
-f:include/asm-generic/error-injection.h
-f:include/asm-generic/exec.h
-f:include/asm-generic/extable.h
-f:include/asm-generic/fixmap.h
-f:include/asm-generic/flat.h
-f:include/asm-generic/fprobe.h
-f:include/asm-generic/ftrace.h
-f:include/asm-generic/futex.h
-f:include/asm-generic/getorder.h
-f:include/asm-generic/hardirq.h
-f:include/asm-generic/hugetlb.h
-f:include/asm-generic/hw_irq.h
-f:include/asm-generic/int-ll64.h
-f:include/asm-generic/io.h
-f:include/asm-generic/ioctl.h
-f:include/asm-generic/iomap.h
-f:include/asm-generic/irq.h
-f:include/asm-generic/irq_regs.h
-f:include/asm-generic/irq_work.h
-f:include/asm-generic/irqflags.h
-f:include/asm-generic/kdebug.h
-f:include/asm-generic/kmap_size.h
-f:include/asm-generic/kprobes.h
-f:include/asm-generic/kvm_para.h
-f:include/asm-generic/kvm_types.h
-f:include/asm-generic/linkage.h
-f:include/asm-generic/local.h
-f:include/asm-generic/local64.h
-f:include/asm-generic/logic_io.h
-f:include/asm-generic/mcs_spinlock.h
-f:include/asm-generic/memory_model.h
-f:include/asm-generic/mm_hooks.h
-f:include/asm-generic/mmiowb.h
-f:include/asm-generic/mmiowb_types.h
-f:include/asm-generic/mmu.h
-f:include/asm-generic/mmu_context.h
-f:include/asm-generic/mmzone.h
-f:include/asm-generic/module.h
-f:include/asm-generic/module.lds.h
-f:include/asm-generic/mshyperv.h
-f:include/asm-generic/msi.h
-f:include/asm-generic/nommu_context.h
-f:include/asm-generic/numa.h
-f:include/asm-generic/param.h
-f:include/asm-generic/parport.h
-f:include/asm-generic/pci.h
-f:include/asm-generic/pci_iomap.h
-f:include/asm-generic/percpu.h
-f:include/asm-generic/pgalloc.h
-f:include/asm-generic/pgtable-nop4d.h
-f:include/asm-generic/pgtable-nopmd.h
-f:include/asm-generic/pgtable-nopud.h
-f:include/asm-generic/pgtable_uffd.h
-f:include/asm-generic/preempt.h
-f:include/asm-generic/qrwlock.h
-f:include/asm-generic/qrwlock_types.h
-f:include/asm-generic/qspinlock.h
-f:include/asm-generic/qspinlock_types.h
-f:include/asm-generic/resource.h
-f:include/asm-generic/rqspinlock.h
-f:include/asm-generic/runtime-const.h
-f:include/asm-generic/rwonce.h
-f:include/asm-generic/seccomp.h
-f:include/asm-generic/sections.h
-f:include/asm-generic/serial.h
-f:include/asm-generic/set_memory.h
-f:include/asm-generic/shmparam.h
-f:include/asm-generic/signal.h
-f:include/asm-generic/simd.h
-f:include/asm-generic/softirq_stack.h
-f:include/asm-generic/spinlock.h
-f:include/asm-generic/spinlock_types.h
-f:include/asm-generic/statfs.h
-f:include/asm-generic/string.h
-f:include/asm-generic/switch_to.h
-f:include/asm-generic/syscall.h
-f:include/asm-generic/syscalls.h
-f:include/asm-generic/text-patching.h
-f:include/asm-generic/ticket_spinlock.h
-f:include/asm-generic/timex.h
-f:include/asm-generic/tlb.h
-f:include/asm-generic/tlbflush.h
-f:include/asm-generic/topology.h
-f:include/asm-generic/trace_clock.h
-f:include/asm-generic/uaccess.h
-f:include/asm-generic/user.h
-f:include/asm-generic/vdso/vsyscall.h
-f:include/asm-generic/vermagic.h
-f:include/asm-generic/vga.h
-f:include/asm-generic/video.h
-f:include/asm-generic/vmlinux.lds.h
-f:include/asm-generic/word-at-a-time.h
-f:include/asm-generic/xor.h
-f:include/clocksource/arm_arch_timer.h
-f:include/clocksource/hyperv_timer.h
-f:include/clocksource/pxa.h
-f:include/clocksource/samsung_pwm.h
-f:include/clocksource/timer-davinci.h
-f:include/clocksource/timer-goldfish.h
-f:include/clocksource/timer-riscv.h
-f:include/clocksource/timer-ti-dm.h
-f:include/clocksource/timer-xilinx.h
-f:include/crypto/acompress.h
-f:include/crypto/aead.h
-f:include/crypto/aes.h
-f:include/crypto/akcipher.h
-f:include/crypto/algapi.h
-f:include/crypto/arc4.h
-f:include/crypto/aria.h
-f:include/crypto/authenc.h
-f:include/crypto/b128ops.h
-f:include/crypto/blake2b.h
-f:include/crypto/blake2s.h
-f:include/crypto/blowfish.h
-f:include/crypto/cast5.h
-f:include/crypto/cast6.h
-f:include/crypto/cast_common.h
-f:include/crypto/chacha.h
-f:include/crypto/chacha20poly1305.h
-f:include/crypto/cryptd.h
-f:include/crypto/ctr.h
-f:include/crypto/curve25519.h
-f:include/crypto/des.h
-f:include/crypto/dh.h
-f:include/crypto/drbg.h
-f:include/crypto/ecc_curve.h
-f:include/crypto/ecdh.h
-f:include/crypto/engine.h
-f:include/crypto/gcm.h
-f:include/crypto/gf128mul.h
-f:include/crypto/ghash.h
-f:include/crypto/hash.h
-f:include/crypto/hash_info.h
-f:include/crypto/hkdf.h
-f:include/crypto/hmac.h
-f:include/crypto/if_alg.h
-f:include/crypto/internal/acompress.h
-f:include/crypto/internal/aead.h
-f:include/crypto/internal/akcipher.h
-f:include/crypto/internal/blake2b.h
-f:include/crypto/internal/blake2s.h
-f:include/crypto/internal/blockhash.h
-f:include/crypto/internal/cipher.h
-f:include/crypto/internal/des.h
-f:include/crypto/internal/ecc.h
-f:include/crypto/internal/engine.h
-f:include/crypto/internal/geniv.h
-f:include/crypto/internal/hash.h
-f:include/crypto/internal/kdf_selftest.h
-f:include/crypto/internal/kpp.h
-f:include/crypto/internal/poly1305.h
-f:include/crypto/internal/rng.h
-f:include/crypto/internal/rsa.h
-f:include/crypto/internal/scompress.h
-f:include/crypto/internal/sig.h
-f:include/crypto/internal/simd.h
-f:include/crypto/internal/skcipher.h
-f:include/crypto/kdf_sp800108.h
-f:include/crypto/kpp.h
-f:include/crypto/krb5.h
-f:include/crypto/md5.h
-f:include/crypto/nhpoly1305.h
-f:include/crypto/null.h
-f:include/crypto/padlock.h
-f:include/crypto/pcrypt.h
-f:include/crypto/pkcs7.h
-f:include/crypto/poly1305.h
-f:include/crypto/polyval.h
-f:include/crypto/public_key.h
-f:include/crypto/rng.h
-f:include/crypto/scatterwalk.h
-f:include/crypto/serpent.h
-f:include/crypto/sha1.h
-f:include/crypto/sha2.h
-f:include/crypto/sha3.h
-f:include/crypto/sig.h
-f:include/crypto/skcipher.h
-f:include/crypto/sm3.h
-f:include/crypto/sm3_base.h
-f:include/crypto/sm4.h
-f:include/crypto/streebog.h
-f:include/crypto/twofish.h
-f:include/crypto/utils.h
-f:include/crypto/xts.h
-f:include/cxl/einj.h
-f:include/cxl/event.h
-f:include/cxl/features.h
-f:include/cxl/mailbox.h
-f:include/drm/Makefile
-f:include/drm/amd/isp.h
-f:include/drm/amd_asic_type.h
-f:include/drm/bridge/analogix_dp.h
-f:include/drm/bridge/aux-bridge.h
-f:include/drm/bridge/dw_hdmi.h
-f:include/drm/bridge/dw_hdmi_qp.h
-f:include/drm/bridge/dw_mipi_dsi.h
-f:include/drm/bridge/dw_mipi_dsi2.h
-f:include/drm/bridge/imx.h
-f:include/drm/bridge/mhl.h
-f:include/drm/bridge/samsung-dsim.h
-f:include/drm/clients/drm_client_setup.h
-f:include/drm/display/drm_dp.h
-f:include/drm/display/drm_dp_aux_bus.h
-f:include/drm/display/drm_dp_dual_mode_helper.h
-f:include/drm/display/drm_dp_helper.h
-f:include/drm/display/drm_dp_mst_helper.h
-f:include/drm/display/drm_dp_tunnel.h
-f:include/drm/display/drm_dsc.h
-f:include/drm/display/drm_dsc_helper.h
-f:include/drm/display/drm_hdcp.h
-f:include/drm/display/drm_hdcp_helper.h
-f:include/drm/display/drm_hdmi_audio_helper.h
-f:include/drm/display/drm_hdmi_cec_helper.h
-f:include/drm/display/drm_hdmi_helper.h
-f:include/drm/display/drm_hdmi_state_helper.h
-f:include/drm/display/drm_scdc.h
-f:include/drm/display/drm_scdc_helper.h
-f:include/drm/drm_accel.h
-f:include/drm/drm_atomic.h
-f:include/drm/drm_atomic_helper.h
-f:include/drm/drm_atomic_state_helper.h
-f:include/drm/drm_atomic_uapi.h
-f:include/drm/drm_audio_component.h
-f:include/drm/drm_auth.h
-f:include/drm/drm_blend.h
-f:include/drm/drm_bridge.h
-f:include/drm/drm_bridge_connector.h
-f:include/drm/drm_bridge_helper.h
-f:include/drm/drm_buddy.h
-f:include/drm/drm_cache.h
-f:include/drm/drm_client.h
-f:include/drm/drm_client_event.h
-f:include/drm/drm_color_mgmt.h
-f:include/drm/drm_connector.h
-f:include/drm/drm_crtc.h
-f:include/drm/drm_crtc_helper.h
-f:include/drm/drm_damage_helper.h
-f:include/drm/drm_debugfs.h
-f:include/drm/drm_debugfs_crc.h
-f:include/drm/drm_device.h
-f:include/drm/drm_drv.h
-f:include/drm/drm_edid.h
-f:include/drm/drm_eld.h
-f:include/drm/drm_encoder.h
-f:include/drm/drm_exec.h
-f:include/drm/drm_fb_dma_helper.h
-f:include/drm/drm_fb_helper.h
-f:include/drm/drm_fbdev_dma.h
-f:include/drm/drm_fbdev_shmem.h
-f:include/drm/drm_fbdev_ttm.h
-f:include/drm/drm_file.h
-f:include/drm/drm_fixed.h
-f:include/drm/drm_flip_work.h
-f:include/drm/drm_format_helper.h
-f:include/drm/drm_fourcc.h
-f:include/drm/drm_framebuffer.h
-f:include/drm/drm_gem.h
-f:include/drm/drm_gem_atomic_helper.h
-f:include/drm/drm_gem_dma_helper.h
-f:include/drm/drm_gem_framebuffer_helper.h
-f:include/drm/drm_gem_shmem_helper.h
-f:include/drm/drm_gem_ttm_helper.h
-f:include/drm/drm_gem_vram_helper.h
-f:include/drm/drm_gpusvm.h
-f:include/drm/drm_gpuvm.h
-f:include/drm/drm_ioctl.h
-f:include/drm/drm_kunit_helpers.h
-f:include/drm/drm_lease.h
-f:include/drm/drm_managed.h
-f:include/drm/drm_mipi_dbi.h
-f:include/drm/drm_mipi_dsi.h
-f:include/drm/drm_mm.h
-f:include/drm/drm_mode_config.h
-f:include/drm/drm_mode_object.h
-f:include/drm/drm_modes.h
-f:include/drm/drm_modeset_helper.h
-f:include/drm/drm_modeset_helper_vtables.h
-f:include/drm/drm_modeset_lock.h
-f:include/drm/drm_module.h
-f:include/drm/drm_of.h
-f:include/drm/drm_pagemap.h
-f:include/drm/drm_panel.h
-f:include/drm/drm_panic.h
-f:include/drm/drm_pciids.h
-f:include/drm/drm_plane.h
-f:include/drm/drm_plane_helper.h
-f:include/drm/drm_prime.h
-f:include/drm/drm_print.h
-f:include/drm/drm_privacy_screen_consumer.h
-f:include/drm/drm_privacy_screen_driver.h
-f:include/drm/drm_privacy_screen_machine.h
-f:include/drm/drm_probe_helper.h
-f:include/drm/drm_property.h
-f:include/drm/drm_rect.h
-f:include/drm/drm_self_refresh_helper.h
-f:include/drm/drm_simple_kms_helper.h
-f:include/drm/drm_suballoc.h
-f:include/drm/drm_syncobj.h
-f:include/drm/drm_sysfs.h
-f:include/drm/drm_util.h
-f:include/drm/drm_utils.h
-f:include/drm/drm_vblank.h
-f:include/drm/drm_vblank_work.h
-f:include/drm/drm_vma_manager.h
-f:include/drm/drm_writeback.h
-f:include/drm/gpu_scheduler.h
-f:include/drm/gud.h
-f:include/drm/intel/i915_component.h
-f:include/drm/intel/i915_drm.h
-f:include/drm/intel/i915_gsc_proxy_mei_interface.h
-f:include/drm/intel/i915_hdcp_interface.h
-f:include/drm/intel/i915_pxp_tee_interface.h
-f:include/drm/intel/intel-gtt.h
-f:include/drm/intel/intel_lpe_audio.h
-f:include/drm/intel/pciids.h
-f:include/drm/spsc_queue.h
-f:include/drm/task_barrier.h
-f:include/drm/ttm/ttm_backup.h
-f:include/drm/ttm/ttm_bo.h
-f:include/drm/ttm/ttm_caching.h
-f:include/drm/ttm/ttm_device.h
-f:include/drm/ttm/ttm_execbuf_util.h
-f:include/drm/ttm/ttm_kmap_iter.h
-f:include/drm/ttm/ttm_placement.h
-f:include/drm/ttm/ttm_pool.h
-f:include/drm/ttm/ttm_range_manager.h
-f:include/drm/ttm/ttm_resource.h
-f:include/drm/ttm/ttm_tt.h
-f:include/dt-bindings/arm/coresight-cti-dt.h
-f:include/dt-bindings/arm/mhuv3-dt.h
-f:include/dt-bindings/arm/qcom,ids.h
-f:include/dt-bindings/arm/ux500_pm_domains.h
-f:include/dt-bindings/ata/ahci.h
-f:include/dt-bindings/bus/moxtet.h
-f:include/dt-bindings/bus/ti-sysc.h
-f:include/dt-bindings/clock/actions,s500-cmu.h
-f:include/dt-bindings/clock/actions,s700-cmu.h
-f:include/dt-bindings/clock/actions,s900-cmu.h
-f:include/dt-bindings/clock/agilex-clock.h
-f:include/dt-bindings/clock/alphascale,asm9260.h
-f:include/dt-bindings/clock/am3.h
-f:include/dt-bindings/clock/am4.h
-f:include/dt-bindings/clock/amlogic,a1-peripherals-clkc.h
-f:include/dt-bindings/clock/amlogic,a1-pll-clkc.h
-f:include/dt-bindings/clock/amlogic,c3-peripherals-clkc.h
-f:include/dt-bindings/clock/amlogic,c3-pll-clkc.h
-f:include/dt-bindings/clock/amlogic,c3-scmi-clkc.h
-f:include/dt-bindings/clock/amlogic,s4-peripherals-clkc.h
-f:include/dt-bindings/clock/amlogic,s4-pll-clkc.h
-f:include/dt-bindings/clock/aspeed,ast2700-scu.h
-f:include/dt-bindings/clock/aspeed-clock.h
-f:include/dt-bindings/clock/ast2600-clock.h
-f:include/dt-bindings/clock/at91.h
-f:include/dt-bindings/clock/ath79-clk.h
-f:include/dt-bindings/clock/axg-aoclkc.h
-f:include/dt-bindings/clock/axg-audio-clkc.h
-f:include/dt-bindings/clock/axg-clkc.h
-f:include/dt-bindings/clock/axis,artpec6-clkctrl.h
-f:include/dt-bindings/clock/bcm-cygnus.h
-f:include/dt-bindings/clock/bcm-ns2.h
-f:include/dt-bindings/clock/bcm-nsp.h
-f:include/dt-bindings/clock/bcm-sr.h
-f:include/dt-bindings/clock/bcm21664.h
-f:include/dt-bindings/clock/bcm281xx.h
-f:include/dt-bindings/clock/bcm2835-aux.h
-f:include/dt-bindings/clock/bcm2835.h
-f:include/dt-bindings/clock/bcm3368-clock.h
-f:include/dt-bindings/clock/bcm6318-clock.h
-f:include/dt-bindings/clock/bcm63268-clock.h
-f:include/dt-bindings/clock/bcm6328-clock.h
-f:include/dt-bindings/clock/bcm6358-clock.h
-f:include/dt-bindings/clock/bcm6362-clock.h
-f:include/dt-bindings/clock/bcm6368-clock.h
-f:include/dt-bindings/clock/berlin2.h
-f:include/dt-bindings/clock/berlin2q.h
-f:include/dt-bindings/clock/bm1880-clock.h
-f:include/dt-bindings/clock/boston-clock.h
-f:include/dt-bindings/clock/bt1-ccu.h
-f:include/dt-bindings/clock/cirrus,cs2000-cp.h
-f:include/dt-bindings/clock/cirrus,ep9301-syscon.h
-f:include/dt-bindings/clock/cix,sky1.h
-f:include/dt-bindings/clock/clps711x-clock.h
-f:include/dt-bindings/clock/cortina,gemini-clock.h
-f:include/dt-bindings/clock/dm814.h
-f:include/dt-bindings/clock/dm816.h
-f:include/dt-bindings/clock/dra7.h
-f:include/dt-bindings/clock/en7523-clk.h
-f:include/dt-bindings/clock/exynos-audss-clk.h
-f:include/dt-bindings/clock/exynos3250.h
-f:include/dt-bindings/clock/exynos4.h
-f:include/dt-bindings/clock/exynos5250.h
-f:include/dt-bindings/clock/exynos5260-clk.h
-f:include/dt-bindings/clock/exynos5410.h
-f:include/dt-bindings/clock/exynos5420.h
-f:include/dt-bindings/clock/exynos5433.h
-f:include/dt-bindings/clock/exynos7-clk.h
-f:include/dt-bindings/clock/exynos7885.h
-f:include/dt-bindings/clock/exynos850.h
-f:include/dt-bindings/clock/fsd-clk.h
-f:include/dt-bindings/clock/fsl,qoriq-clockgen.h
-f:include/dt-bindings/clock/g12a-aoclkc.h
-f:include/dt-bindings/clock/g12a-clkc.h
-f:include/dt-bindings/clock/google,gs101.h
-f:include/dt-bindings/clock/gxbb-aoclkc.h
-f:include/dt-bindings/clock/gxbb-clkc.h
-f:include/dt-bindings/clock/hi3516cv300-clock.h
-f:include/dt-bindings/clock/hi3519-clock.h
-f:include/dt-bindings/clock/hi3559av100-clock.h
-f:include/dt-bindings/clock/hi3620-clock.h
-f:include/dt-bindings/clock/hi3660-clock.h
-f:include/dt-bindings/clock/hi3670-clock.h
-f:include/dt-bindings/clock/hi6220-clock.h
-f:include/dt-bindings/clock/hip04-clock.h
-f:include/dt-bindings/clock/histb-clock.h
-f:include/dt-bindings/clock/hix5hd2-clock.h
-f:include/dt-bindings/clock/imx1-clock.h
-f:include/dt-bindings/clock/imx21-clock.h
-f:include/dt-bindings/clock/imx27-clock.h
-f:include/dt-bindings/clock/imx5-clock.h
-f:include/dt-bindings/clock/imx6qdl-clock.h
-f:include/dt-bindings/clock/imx6sl-clock.h
-f:include/dt-bindings/clock/imx6sll-clock.h
-f:include/dt-bindings/clock/imx6sx-clock.h
-f:include/dt-bindings/clock/imx6ul-clock.h
-f:include/dt-bindings/clock/imx7d-clock.h
-f:include/dt-bindings/clock/imx7ulp-clock.h
-f:include/dt-bindings/clock/imx8-clock.h
-f:include/dt-bindings/clock/imx8-lpcg.h
-f:include/dt-bindings/clock/imx8mm-clock.h
-f:include/dt-bindings/clock/imx8mn-clock.h
-f:include/dt-bindings/clock/imx8mp-clock.h
-f:include/dt-bindings/clock/imx8mq-clock.h
-f:include/dt-bindings/clock/imx8ulp-clock.h
-f:include/dt-bindings/clock/imx93-clock.h
-f:include/dt-bindings/clock/imxrt1050-clock.h
-f:include/dt-bindings/clock/ingenic,jz4725b-cgu.h
-f:include/dt-bindings/clock/ingenic,jz4740-cgu.h
-f:include/dt-bindings/clock/ingenic,jz4755-cgu.h
-f:include/dt-bindings/clock/ingenic,jz4760-cgu.h
-f:include/dt-bindings/clock/ingenic,jz4770-cgu.h
-f:include/dt-bindings/clock/ingenic,jz4780-cgu.h
-f:include/dt-bindings/clock/ingenic,sysost.h
-f:include/dt-bindings/clock/ingenic,tcu.h
-f:include/dt-bindings/clock/ingenic,x1000-cgu.h
-f:include/dt-bindings/clock/ingenic,x1830-cgu.h
-f:include/dt-bindings/clock/intel,agilex5-clkmgr.h
-f:include/dt-bindings/clock/intel,lgm-clk.h
-f:include/dt-bindings/clock/k210-clk.h
-f:include/dt-bindings/clock/lochnagar.h
-f:include/dt-bindings/clock/loongson,ls1x-clk.h
-f:include/dt-bindings/clock/loongson,ls2k-clk.h
-f:include/dt-bindings/clock/lpc18xx-ccu.h
-f:include/dt-bindings/clock/lpc18xx-cgu.h
-f:include/dt-bindings/clock/lpc32xx-clock.h
-f:include/dt-bindings/clock/lsi,axm5516-clks.h
-f:include/dt-bindings/clock/marvell,mmp2-audio.h
-f:include/dt-bindings/clock/marvell,mmp2.h
-f:include/dt-bindings/clock/marvell,pxa168.h
-f:include/dt-bindings/clock/marvell,pxa1908.h
-f:include/dt-bindings/clock/marvell,pxa1928.h
-f:include/dt-bindings/clock/marvell,pxa910.h
-f:include/dt-bindings/clock/maxim,max77620.h
-f:include/dt-bindings/clock/maxim,max77686.h
-f:include/dt-bindings/clock/maxim,max77802.h
-f:include/dt-bindings/clock/maxim,max9485.h
-f:include/dt-bindings/clock/mediatek,mt6735-apmixedsys.h
-f:include/dt-bindings/clock/mediatek,mt6735-imgsys.h
-f:include/dt-bindings/clock/mediatek,mt6735-infracfg.h
-f:include/dt-bindings/clock/mediatek,mt6735-mfgcfg.h
-f:include/dt-bindings/clock/mediatek,mt6735-pericfg.h
-f:include/dt-bindings/clock/mediatek,mt6735-topckgen.h
-f:include/dt-bindings/clock/mediatek,mt6735-vdecsys.h
-f:include/dt-bindings/clock/mediatek,mt6735-vencsys.h
-f:include/dt-bindings/clock/mediatek,mt6795-clk.h
-f:include/dt-bindings/clock/mediatek,mt7981-clk.h
-f:include/dt-bindings/clock/mediatek,mt7988-clk.h
-f:include/dt-bindings/clock/mediatek,mt8188-clk.h
-f:include/dt-bindings/clock/mediatek,mt8365-clk.h
-f:include/dt-bindings/clock/mediatek,mtmips-sysc.h
-f:include/dt-bindings/clock/meson8-ddr-clkc.h
-f:include/dt-bindings/clock/meson8b-clkc.h
-f:include/dt-bindings/clock/microchip,lan966x.h
-f:include/dt-bindings/clock/microchip,mpfs-clock.h
-f:include/dt-bindings/clock/microchip,pic32-clock.h
-f:include/dt-bindings/clock/microchip,sparx5.h
-f:include/dt-bindings/clock/mobileye,eyeq5-clk.h
-f:include/dt-bindings/clock/mpc512x-clock.h
-f:include/dt-bindings/clock/mstar-msc313-mpll.h
-f:include/dt-bindings/clock/mt2701-clk.h
-f:include/dt-bindings/clock/mt2712-clk.h
-f:include/dt-bindings/clock/mt6765-clk.h
-f:include/dt-bindings/clock/mt6779-clk.h
-f:include/dt-bindings/clock/mt6797-clk.h
-f:include/dt-bindings/clock/mt7621-clk.h
-f:include/dt-bindings/clock/mt7622-clk.h
-f:include/dt-bindings/clock/mt7629-clk.h
-f:include/dt-bindings/clock/mt7986-clk.h
-f:include/dt-bindings/clock/mt8135-clk.h
-f:include/dt-bindings/clock/mt8167-clk.h
-f:include/dt-bindings/clock/mt8173-clk.h
-f:include/dt-bindings/clock/mt8183-clk.h
-f:include/dt-bindings/clock/mt8186-clk.h
-f:include/dt-bindings/clock/mt8192-clk.h
-f:include/dt-bindings/clock/mt8195-clk.h
-f:include/dt-bindings/clock/mt8516-clk.h
-f:include/dt-bindings/clock/nuvoton,ma35d1-clk.h
-f:include/dt-bindings/clock/nuvoton,npcm7xx-clock.h
-f:include/dt-bindings/clock/nuvoton,npcm845-clk.h
-f:include/dt-bindings/clock/nvidia,tegra264.h
-f:include/dt-bindings/clock/nxp,imx94-clock.h
-f:include/dt-bindings/clock/nxp,imx95-clock.h
-f:include/dt-bindings/clock/omap4.h
-f:include/dt-bindings/clock/omap5.h
-f:include/dt-bindings/clock/oxsemi,ox810se.h
-f:include/dt-bindings/clock/oxsemi,ox820.h
-f:include/dt-bindings/clock/pistachio-clk.h
-f:include/dt-bindings/clock/px30-cru.h
-f:include/dt-bindings/clock/pxa-clock.h
-f:include/dt-bindings/clock/qcom,apss-ipq.h
-f:include/dt-bindings/clock/qcom,camcc-sc7180.h
-f:include/dt-bindings/clock/qcom,camcc-sc7280.h
-f:include/dt-bindings/clock/qcom,camcc-sdm845.h
-f:include/dt-bindings/clock/qcom,camcc-sm8250.h
-f:include/dt-bindings/clock/qcom,dispcc-qcm2290.h
-f:include/dt-bindings/clock/qcom,dispcc-sc7180.h
-f:include/dt-bindings/clock/qcom,dispcc-sc7280.h
-f:include/dt-bindings/clock/qcom,dispcc-sc8280xp.h
-f:include/dt-bindings/clock/qcom,dispcc-sdm845.h
-f:include/dt-bindings/clock/qcom,dispcc-sm6125.h
-f:include/dt-bindings/clock/qcom,dispcc-sm6350.h
-f:include/dt-bindings/clock/qcom,dispcc-sm8250.h
-f:include/dt-bindings/clock/qcom,dsi-phy-28nm.h
-f:include/dt-bindings/clock/qcom,gcc-apq8084.h
-f:include/dt-bindings/clock/qcom,gcc-ipq4019.h
-f:include/dt-bindings/clock/qcom,gcc-ipq5018.h
-f:include/dt-bindings/clock/qcom,gcc-ipq6018.h
-f:include/dt-bindings/clock/qcom,gcc-ipq806x.h
-f:include/dt-bindings/clock/qcom,gcc-ipq8074.h
-f:include/dt-bindings/clock/qcom,gcc-mdm9607.h
-f:include/dt-bindings/clock/qcom,gcc-mdm9615.h
-f:include/dt-bindings/clock/qcom,gcc-msm8660.h
-f:include/dt-bindings/clock/qcom,gcc-msm8909.h
-f:include/dt-bindings/clock/qcom,gcc-msm8916.h
-f:include/dt-bindings/clock/qcom,gcc-msm8917.h
-f:include/dt-bindings/clock/qcom,gcc-msm8939.h
-f:include/dt-bindings/clock/qcom,gcc-msm8953.h
-f:include/dt-bindings/clock/qcom,gcc-msm8960.h
-f:include/dt-bindings/clock/qcom,gcc-msm8974.h
-f:include/dt-bindings/clock/qcom,gcc-msm8976.h
-f:include/dt-bindings/clock/qcom,gcc-msm8994.h
-f:include/dt-bindings/clock/qcom,gcc-msm8996.h
-f:include/dt-bindings/clock/qcom,gcc-msm8998.h
-f:include/dt-bindings/clock/qcom,gcc-qcm2290.h
-f:include/dt-bindings/clock/qcom,gcc-qcs404.h
-f:include/dt-bindings/clock/qcom,gcc-sc7180.h
-f:include/dt-bindings/clock/qcom,gcc-sc7280.h
-f:include/dt-bindings/clock/qcom,gcc-sc8180x.h
-f:include/dt-bindings/clock/qcom,gcc-sc8280xp.h
-f:include/dt-bindings/clock/qcom,gcc-sdm660.h
-f:include/dt-bindings/clock/qcom,gcc-sdm845.h
-f:include/dt-bindings/clock/qcom,gcc-sdx55.h
-f:include/dt-bindings/clock/qcom,gcc-sdx65.h
-f:include/dt-bindings/clock/qcom,gcc-sm6115.h
-f:include/dt-bindings/clock/qcom,gcc-sm6125.h
-f:include/dt-bindings/clock/qcom,gcc-sm6350.h
-f:include/dt-bindings/clock/qcom,gcc-sm8150.h
-f:include/dt-bindings/clock/qcom,gcc-sm8250.h
-f:include/dt-bindings/clock/qcom,gcc-sm8350.h
-f:include/dt-bindings/clock/qcom,gcc-sm8450.h
-f:include/dt-bindings/clock/qcom,gpucc-msm8998.h
-f:include/dt-bindings/clock/qcom,gpucc-sc7180.h
-f:include/dt-bindings/clock/qcom,gpucc-sc7280.h
-f:include/dt-bindings/clock/qcom,gpucc-sc8280xp.h
-f:include/dt-bindings/clock/qcom,gpucc-sdm660.h
-f:include/dt-bindings/clock/qcom,gpucc-sdm845.h
-f:include/dt-bindings/clock/qcom,gpucc-sm6350.h
-f:include/dt-bindings/clock/qcom,gpucc-sm8150.h
-f:include/dt-bindings/clock/qcom,gpucc-sm8250.h
-f:include/dt-bindings/clock/qcom,gpucc-sm8350.h
-f:include/dt-bindings/clock/qcom,ipq-cmn-pll.h
-f:include/dt-bindings/clock/qcom,ipq5018-cmn-pll.h
-f:include/dt-bindings/clock/qcom,ipq5332-gcc.h
-f:include/dt-bindings/clock/qcom,ipq5424-cmn-pll.h
-f:include/dt-bindings/clock/qcom,ipq5424-gcc.h
-f:include/dt-bindings/clock/qcom,ipq9574-gcc.h
-f:include/dt-bindings/clock/qcom,ipq9574-nsscc.h
-f:include/dt-bindings/clock/qcom,lcc-ipq806x.h
-f:include/dt-bindings/clock/qcom,lcc-msm8960.h
-f:include/dt-bindings/clock/qcom,lpass-sc7280.h
-f:include/dt-bindings/clock/qcom,lpass-sdm845.h
-f:include/dt-bindings/clock/qcom,lpassaudiocc-sc7280.h
-f:include/dt-bindings/clock/qcom,lpasscorecc-sc7180.h
-f:include/dt-bindings/clock/qcom,lpasscorecc-sc7280.h
-f:include/dt-bindings/clock/qcom,milos-camcc.h
-f:include/dt-bindings/clock/qcom,milos-dispcc.h
-f:include/dt-bindings/clock/qcom,milos-gcc.h
-f:include/dt-bindings/clock/qcom,milos-gpucc.h
-f:include/dt-bindings/clock/qcom,milos-videocc.h
-f:include/dt-bindings/clock/qcom,mmcc-apq8084.h
-f:include/dt-bindings/clock/qcom,mmcc-msm8960.h
-f:include/dt-bindings/clock/qcom,mmcc-msm8974.h
-f:include/dt-bindings/clock/qcom,mmcc-msm8994.h
-f:include/dt-bindings/clock/qcom,mmcc-msm8996.h
-f:include/dt-bindings/clock/qcom,mmcc-msm8998.h
-f:include/dt-bindings/clock/qcom,mmcc-sdm660.h
-f:include/dt-bindings/clock/qcom,mss-sc7180.h
-f:include/dt-bindings/clock/qcom,q6sstopcc-qcs404.h
-f:include/dt-bindings/clock/qcom,qca8k-nsscc.h
-f:include/dt-bindings/clock/qcom,qcm2290-gpucc.h
-f:include/dt-bindings/clock/qcom,qcs615-camcc.h
-f:include/dt-bindings/clock/qcom,qcs615-dispcc.h
-f:include/dt-bindings/clock/qcom,qcs615-gcc.h
-f:include/dt-bindings/clock/qcom,qcs615-gpucc.h
-f:include/dt-bindings/clock/qcom,qcs615-videocc.h
-f:include/dt-bindings/clock/qcom,qcs8300-camcc.h
-f:include/dt-bindings/clock/qcom,qcs8300-gcc.h
-f:include/dt-bindings/clock/qcom,qcs8300-gpucc.h
-f:include/dt-bindings/clock/qcom,qdu1000-ecpricc.h
-f:include/dt-bindings/clock/qcom,qdu1000-gcc.h
-f:include/dt-bindings/clock/qcom,rpmcc.h
-f:include/dt-bindings/clock/qcom,rpmh.h
-f:include/dt-bindings/clock/qcom,sa8775p-camcc.h
-f:include/dt-bindings/clock/qcom,sa8775p-dispcc.h
-f:include/dt-bindings/clock/qcom,sa8775p-gcc.h
-f:include/dt-bindings/clock/qcom,sa8775p-gpucc.h
-f:include/dt-bindings/clock/qcom,sa8775p-videocc.h
-f:include/dt-bindings/clock/qcom,sar2130p-gcc.h
-f:include/dt-bindings/clock/qcom,sar2130p-gpucc.h
-f:include/dt-bindings/clock/qcom,sc8180x-camcc.h
-f:include/dt-bindings/clock/qcom,sc8280xp-camcc.h
-f:include/dt-bindings/clock/qcom,sc8280xp-lpasscc.h
-f:include/dt-bindings/clock/qcom,sdx75-gcc.h
-f:include/dt-bindings/clock/qcom,sm4450-camcc.h
-f:include/dt-bindings/clock/qcom,sm4450-dispcc.h
-f:include/dt-bindings/clock/qcom,sm4450-gcc.h
-f:include/dt-bindings/clock/qcom,sm4450-gpucc.h
-f:include/dt-bindings/clock/qcom,sm6115-dispcc.h
-f:include/dt-bindings/clock/qcom,sm6115-gpucc.h
-f:include/dt-bindings/clock/qcom,sm6115-lpasscc.h
-f:include/dt-bindings/clock/qcom,sm6125-gpucc.h
-f:include/dt-bindings/clock/qcom,sm6350-camcc.h
-f:include/dt-bindings/clock/qcom,sm6350-videocc.h
-f:include/dt-bindings/clock/qcom,sm6375-dispcc.h
-f:include/dt-bindings/clock/qcom,sm6375-gcc.h
-f:include/dt-bindings/clock/qcom,sm6375-gpucc.h
-f:include/dt-bindings/clock/qcom,sm7150-camcc.h
-f:include/dt-bindings/clock/qcom,sm7150-dispcc.h
-f:include/dt-bindings/clock/qcom,sm7150-gcc.h
-f:include/dt-bindings/clock/qcom,sm7150-videocc.h
-f:include/dt-bindings/clock/qcom,sm8150-camcc.h
-f:include/dt-bindings/clock/qcom,sm8250-lpass-aoncc.h
-f:include/dt-bindings/clock/qcom,sm8250-lpass-audiocc.h
-f:include/dt-bindings/clock/qcom,sm8350-videocc.h
-f:include/dt-bindings/clock/qcom,sm8450-camcc.h
-f:include/dt-bindings/clock/qcom,sm8450-dispcc.h
-f:include/dt-bindings/clock/qcom,sm8450-gpucc.h
-f:include/dt-bindings/clock/qcom,sm8450-videocc.h
-f:include/dt-bindings/clock/qcom,sm8550-camcc.h
-f:include/dt-bindings/clock/qcom,sm8550-dispcc.h
-f:include/dt-bindings/clock/qcom,sm8550-gcc.h
-f:include/dt-bindings/clock/qcom,sm8550-gpucc.h
-f:include/dt-bindings/clock/qcom,sm8550-tcsr.h
-f:include/dt-bindings/clock/qcom,sm8650-camcc.h
-f:include/dt-bindings/clock/qcom,sm8650-gcc.h
-f:include/dt-bindings/clock/qcom,sm8650-gpucc.h
-f:include/dt-bindings/clock/qcom,sm8650-tcsr.h
-f:include/dt-bindings/clock/qcom,sm8650-videocc.h
-f:include/dt-bindings/clock/qcom,sm8750-dispcc.h
-f:include/dt-bindings/clock/qcom,sm8750-gcc.h
-f:include/dt-bindings/clock/qcom,sm8750-tcsr.h
-f:include/dt-bindings/clock/qcom,turingcc-qcs404.h
-f:include/dt-bindings/clock/qcom,videocc-sc7180.h
-f:include/dt-bindings/clock/qcom,videocc-sc7280.h
-f:include/dt-bindings/clock/qcom,videocc-sdm845.h
-f:include/dt-bindings/clock/qcom,videocc-sm8150.h
-f:include/dt-bindings/clock/qcom,videocc-sm8250.h
-f:include/dt-bindings/clock/qcom,x1e80100-camcc.h
-f:include/dt-bindings/clock/qcom,x1e80100-dispcc.h
-f:include/dt-bindings/clock/qcom,x1e80100-gcc.h
-f:include/dt-bindings/clock/qcom,x1e80100-gpucc.h
-f:include/dt-bindings/clock/qcom,x1e80100-tcsr.h
-f:include/dt-bindings/clock/r7s72100-clock.h
-f:include/dt-bindings/clock/r7s9210-cpg-mssr.h
-f:include/dt-bindings/clock/r8a73a4-clock.h
-f:include/dt-bindings/clock/r8a7740-clock.h
-f:include/dt-bindings/clock/r8a7742-cpg-mssr.h
-f:include/dt-bindings/clock/r8a7743-cpg-mssr.h
-f:include/dt-bindings/clock/r8a7744-cpg-mssr.h
-f:include/dt-bindings/clock/r8a7745-cpg-mssr.h
-f:include/dt-bindings/clock/r8a77470-cpg-mssr.h
-f:include/dt-bindings/clock/r8a774a1-cpg-mssr.h
-f:include/dt-bindings/clock/r8a774b1-cpg-mssr.h
-f:include/dt-bindings/clock/r8a774c0-cpg-mssr.h
-f:include/dt-bindings/clock/r8a774e1-cpg-mssr.h
-f:include/dt-bindings/clock/r8a7778-clock.h
-f:include/dt-bindings/clock/r8a7779-clock.h
-f:include/dt-bindings/clock/r8a7790-cpg-mssr.h
-f:include/dt-bindings/clock/r8a7791-cpg-mssr.h
-f:include/dt-bindings/clock/r8a7792-cpg-mssr.h
-f:include/dt-bindings/clock/r8a7793-cpg-mssr.h
-f:include/dt-bindings/clock/r8a7794-cpg-mssr.h
-f:include/dt-bindings/clock/r8a7795-cpg-mssr.h
-f:include/dt-bindings/clock/r8a7796-cpg-mssr.h
-f:include/dt-bindings/clock/r8a77961-cpg-mssr.h
-f:include/dt-bindings/clock/r8a77965-cpg-mssr.h
-f:include/dt-bindings/clock/r8a77970-cpg-mssr.h
-f:include/dt-bindings/clock/r8a77980-cpg-mssr.h
-f:include/dt-bindings/clock/r8a77990-cpg-mssr.h
-f:include/dt-bindings/clock/r8a77995-cpg-mssr.h
-f:include/dt-bindings/clock/r8a779a0-cpg-mssr.h
-f:include/dt-bindings/clock/r8a779f0-cpg-mssr.h
-f:include/dt-bindings/clock/r8a779g0-cpg-mssr.h
-f:include/dt-bindings/clock/r9a06g032-sysctrl.h
-f:include/dt-bindings/clock/r9a07g043-cpg.h
-f:include/dt-bindings/clock/r9a07g044-cpg.h
-f:include/dt-bindings/clock/r9a07g054-cpg.h
-f:include/dt-bindings/clock/r9a08g045-cpg.h
-f:include/dt-bindings/clock/r9a09g011-cpg.h
-f:include/dt-bindings/clock/raspberrypi,rp1-clocks.h
-f:include/dt-bindings/clock/renesas,r8a779h0-cpg-mssr.h
-f:include/dt-bindings/clock/renesas,r9a08g045-vbattb.h
-f:include/dt-bindings/clock/renesas,r9a09g047-cpg.h
-f:include/dt-bindings/clock/renesas,r9a09g056-cpg.h
-f:include/dt-bindings/clock/renesas,r9a09g057-cpg.h
-f:include/dt-bindings/clock/renesas,r9a09g077-cpg-mssr.h
-f:include/dt-bindings/clock/renesas,r9a09g087-cpg-mssr.h
-f:include/dt-bindings/clock/renesas-cpg-mssr.h
-f:include/dt-bindings/clock/rk3036-cru.h
-f:include/dt-bindings/clock/rk3066a-cru.h
-f:include/dt-bindings/clock/rk3128-cru.h
-f:include/dt-bindings/clock/rk3188-cru-common.h
-f:include/dt-bindings/clock/rk3188-cru.h
-f:include/dt-bindings/clock/rk3228-cru.h
-f:include/dt-bindings/clock/rk3288-cru.h
-f:include/dt-bindings/clock/rk3308-cru.h
-f:include/dt-bindings/clock/rk3328-cru.h
-f:include/dt-bindings/clock/rk3368-cru.h
-f:include/dt-bindings/clock/rk3399-cru.h
-f:include/dt-bindings/clock/rk3399-ddr.h
-f:include/dt-bindings/clock/rk3568-cru.h
-f:include/dt-bindings/clock/rockchip,rk3528-cru.h
-f:include/dt-bindings/clock/rockchip,rk3562-cru.h
-f:include/dt-bindings/clock/rockchip,rk3576-cru.h
-f:include/dt-bindings/clock/rockchip,rk3588-cru.h
-f:include/dt-bindings/clock/rockchip,rk808.h
-f:include/dt-bindings/clock/rockchip,rv1126-cru.h
-f:include/dt-bindings/clock/rv1108-cru.h
-f:include/dt-bindings/clock/s5pv210-audss.h
-f:include/dt-bindings/clock/s5pv210.h
-f:include/dt-bindings/clock/samsung,exynos2200-cmu.h
-f:include/dt-bindings/clock/samsung,exynos7870-cmu.h
-f:include/dt-bindings/clock/samsung,exynos8895.h
-f:include/dt-bindings/clock/samsung,exynos990.h
-f:include/dt-bindings/clock/samsung,exynosautov9.h
-f:include/dt-bindings/clock/samsung,exynosautov920.h
-f:include/dt-bindings/clock/samsung,s2mps11.h
-f:include/dt-bindings/clock/samsung,s3c64xx-clock.h
-f:include/dt-bindings/clock/sh73a0-clock.h
-f:include/dt-bindings/clock/sifive-fu540-prci.h
-f:include/dt-bindings/clock/sifive-fu740-prci.h
-f:include/dt-bindings/clock/sophgo,cv1800.h
-f:include/dt-bindings/clock/sophgo,sg2042-clkgen.h
-f:include/dt-bindings/clock/sophgo,sg2042-pll.h
-f:include/dt-bindings/clock/sophgo,sg2042-rpgate.h
-f:include/dt-bindings/clock/sophgo,sg2044-clk.h
-f:include/dt-bindings/clock/sophgo,sg2044-pll.h
-f:include/dt-bindings/clock/spacemit,k1-syscon.h
-f:include/dt-bindings/clock/sprd,sc9860-clk.h
-f:include/dt-bindings/clock/sprd,sc9863a-clk.h
-f:include/dt-bindings/clock/sprd,ums512-clk.h
-f:include/dt-bindings/clock/st,stm32mp25-rcc.h
-f:include/dt-bindings/clock/starfive,jh7110-crg.h
-f:include/dt-bindings/clock/starfive-jh7100-audio.h
-f:include/dt-bindings/clock/starfive-jh7100.h
-f:include/dt-bindings/clock/ste-ab8500.h
-f:include/dt-bindings/clock/ste-db8500-clkout.h
-f:include/dt-bindings/clock/stih407-clks.h
-f:include/dt-bindings/clock/stih410-clks.h
-f:include/dt-bindings/clock/stih418-clks.h
-f:include/dt-bindings/clock/stm32fx-clock.h
-f:include/dt-bindings/clock/stm32h7-clks.h
-f:include/dt-bindings/clock/stm32mp1-clks.h
-f:include/dt-bindings/clock/stm32mp13-clks.h
-f:include/dt-bindings/clock/stratix10-clock.h
-f:include/dt-bindings/clock/sun20i-d1-ccu.h
-f:include/dt-bindings/clock/sun20i-d1-r-ccu.h
-f:include/dt-bindings/clock/sun4i-a10-ccu.h
-f:include/dt-bindings/clock/sun4i-a10-pll2.h
-f:include/dt-bindings/clock/sun50i-a100-ccu.h
-f:include/dt-bindings/clock/sun50i-a100-r-ccu.h
-f:include/dt-bindings/clock/sun50i-a64-ccu.h
-f:include/dt-bindings/clock/sun50i-h6-ccu.h
-f:include/dt-bindings/clock/sun50i-h6-r-ccu.h
-f:include/dt-bindings/clock/sun50i-h616-ccu.h
-f:include/dt-bindings/clock/sun55i-a523-ccu.h
-f:include/dt-bindings/clock/sun55i-a523-r-ccu.h
-f:include/dt-bindings/clock/sun5i-ccu.h
-f:include/dt-bindings/clock/sun6i-a31-ccu.h
-f:include/dt-bindings/clock/sun6i-rtc.h
-f:include/dt-bindings/clock/sun7i-a20-ccu.h
-f:include/dt-bindings/clock/sun8i-a23-a33-ccu.h
-f:include/dt-bindings/clock/sun8i-a83t-ccu.h
-f:include/dt-bindings/clock/sun8i-de2.h
-f:include/dt-bindings/clock/sun8i-h3-ccu.h
-f:include/dt-bindings/clock/sun8i-r-ccu.h
-f:include/dt-bindings/clock/sun8i-r40-ccu.h
-f:include/dt-bindings/clock/sun8i-tcon-top.h
-f:include/dt-bindings/clock/sun8i-v3s-ccu.h
-f:include/dt-bindings/clock/sun9i-a80-ccu.h
-f:include/dt-bindings/clock/sun9i-a80-de.h
-f:include/dt-bindings/clock/sun9i-a80-usb.h
-f:include/dt-bindings/clock/suniv-ccu-f1c100s.h
-f:include/dt-bindings/clock/sunplus,sp7021-clkc.h
-f:include/dt-bindings/clock/tegra114-car.h
-f:include/dt-bindings/clock/tegra124-car-common.h
-f:include/dt-bindings/clock/tegra124-car.h
-f:include/dt-bindings/clock/tegra186-clock.h
-f:include/dt-bindings/clock/tegra194-clock.h
-f:include/dt-bindings/clock/tegra20-car.h
-f:include/dt-bindings/clock/tegra210-car.h
-f:include/dt-bindings/clock/tegra234-clock.h
-f:include/dt-bindings/clock/tegra30-car.h
-f:include/dt-bindings/clock/thead,th1520-clk-ap.h
-f:include/dt-bindings/clock/ti-dra7-atl.h
-f:include/dt-bindings/clock/toshiba,tmpv770x.h
-f:include/dt-bindings/clock/versaclock.h
-f:include/dt-bindings/clock/vf610-clock.h
-f:include/dt-bindings/clock/xlnx-vcu.h
-f:include/dt-bindings/clock/xlnx-versal-clk.h
-f:include/dt-bindings/clock/xlnx-zynqmp-clk.h
-f:include/dt-bindings/display/sdtv-standards.h
-f:include/dt-bindings/display/tda998x.h
-f:include/dt-bindings/dma/at91.h
-f:include/dt-bindings/dma/axi-dmac.h
-f:include/dt-bindings/dma/dw-dmac.h
-f:include/dt-bindings/dma/fsl-edma.h
-f:include/dt-bindings/dma/jz4775-dma.h
-f:include/dt-bindings/dma/jz4780-dma.h
-f:include/dt-bindings/dma/nbpfaxi.h
-f:include/dt-bindings/dma/qcom-gpi.h
-f:include/dt-bindings/dma/sun4i-a10.h
-f:include/dt-bindings/dma/x1000-dma.h
-f:include/dt-bindings/dma/x1830-dma.h
-f:include/dt-bindings/dma/x2000-dma.h
-f:include/dt-bindings/dma/xlnx-zynqmp-dpdma.h
-f:include/dt-bindings/firmware/imx/rsrc.h
-f:include/dt-bindings/firmware/qcom,scm.h
-f:include/dt-bindings/gce/mediatek,mt6795-gce.h
-f:include/dt-bindings/gce/mt6779-gce.h
-f:include/dt-bindings/gce/mt8173-gce.h
-f:include/dt-bindings/gce/mt8183-gce.h
-f:include/dt-bindings/gce/mt8186-gce.h
-f:include/dt-bindings/gce/mt8192-gce.h
-f:include/dt-bindings/gce/mt8195-gce.h
-f:include/dt-bindings/gpio/amlogic,t7-periphs-pinctrl.h
-f:include/dt-bindings/gpio/amlogic-c3-gpio.h
-f:include/dt-bindings/gpio/aspeed-gpio.h
-f:include/dt-bindings/gpio/gpio.h
-f:include/dt-bindings/gpio/meson-a1-gpio.h
-f:include/dt-bindings/gpio/meson-axg-gpio.h
-f:include/dt-bindings/gpio/meson-g12a-gpio.h
-f:include/dt-bindings/gpio/meson-gxbb-gpio.h
-f:include/dt-bindings/gpio/meson-gxl-gpio.h
-f:include/dt-bindings/gpio/meson-s4-gpio.h
-f:include/dt-bindings/gpio/meson8-gpio.h
-f:include/dt-bindings/gpio/meson8b-gpio.h
-f:include/dt-bindings/gpio/msc313-gpio.h
-f:include/dt-bindings/gpio/tegra-gpio.h
-f:include/dt-bindings/gpio/tegra186-gpio.h
-f:include/dt-bindings/gpio/tegra194-gpio.h
-f:include/dt-bindings/gpio/tegra234-gpio.h
-f:include/dt-bindings/gpio/tegra241-gpio.h
-f:include/dt-bindings/gpio/uniphier-gpio.h
-f:include/dt-bindings/i2c/i2c.h
-f:include/dt-bindings/i3c/i3c.h
-f:include/dt-bindings/iio/adc/adi,ad4695.h
-f:include/dt-bindings/iio/adc/adi,ad7606.h
-f:include/dt-bindings/iio/adc/adi,ad7768-1.h
-f:include/dt-bindings/iio/adc/at91-sama5d2_adc.h
-f:include/dt-bindings/iio/adc/fsl-imx25-gcq.h
-f:include/dt-bindings/iio/adc/gehc,pmc-adc.h
-f:include/dt-bindings/iio/adc/ingenic,adc.h
-f:include/dt-bindings/iio/adc/mediatek,mt6357-auxadc.h
-f:include/dt-bindings/iio/adc/mediatek,mt6358-auxadc.h
-f:include/dt-bindings/iio/adc/mediatek,mt6359-auxadc.h
-f:include/dt-bindings/iio/adc/mediatek,mt6363-auxadc.h
-f:include/dt-bindings/iio/adc/mediatek,mt6370_adc.h
-f:include/dt-bindings/iio/adc/mediatek,mt6373-auxadc.h
-f:include/dt-bindings/iio/addac/adi,ad74413r.h
-f:include/dt-bindings/iio/adi,ad5592r.h
-f:include/dt-bindings/iio/qcom,spmi-adc7-pm7325.h
-f:include/dt-bindings/iio/qcom,spmi-adc7-pm8350.h
-f:include/dt-bindings/iio/qcom,spmi-adc7-pm8350b.h
-f:include/dt-bindings/iio/qcom,spmi-adc7-pmk8350.h
-f:include/dt-bindings/iio/qcom,spmi-adc7-pmr735a.h
-f:include/dt-bindings/iio/qcom,spmi-adc7-pmr735b.h
-f:include/dt-bindings/iio/qcom,spmi-adc7-smb139x.h
-f:include/dt-bindings/iio/qcom,spmi-vadc.h
-f:include/dt-bindings/iio/temperature/thermocouple.h
-f:include/dt-bindings/input/atmel-maxtouch.h
-f:include/dt-bindings/input/cros-ec-keyboard.h
-f:include/dt-bindings/input/gpio-keys.h
-f:include/dt-bindings/input/input.h
-f:include/dt-bindings/input/ti-drv260x.h
-f:include/dt-bindings/interconnect/fsl,imx8mp.h
-f:include/dt-bindings/interconnect/imx8mm.h
-f:include/dt-bindings/interconnect/imx8mn.h
-f:include/dt-bindings/interconnect/imx8mq.h
-f:include/dt-bindings/interconnect/mediatek,mt8183.h
-f:include/dt-bindings/interconnect/mediatek,mt8195.h
-f:include/dt-bindings/interconnect/qcom,icc.h
-f:include/dt-bindings/interconnect/qcom,ipq5332.h
-f:include/dt-bindings/interconnect/qcom,ipq5424.h
-f:include/dt-bindings/interconnect/qcom,ipq9574.h
-f:include/dt-bindings/interconnect/qcom,milos-rpmh.h
-f:include/dt-bindings/interconnect/qcom,msm8909.h
-f:include/dt-bindings/interconnect/qcom,msm8916.h
-f:include/dt-bindings/interconnect/qcom,msm8937.h
-f:include/dt-bindings/interconnect/qcom,msm8939.h
-f:include/dt-bindings/interconnect/qcom,msm8953.h
-f:include/dt-bindings/interconnect/qcom,msm8974.h
-f:include/dt-bindings/interconnect/qcom,msm8976.h
-f:include/dt-bindings/interconnect/qcom,msm8996-cbf.h
-f:include/dt-bindings/interconnect/qcom,msm8996.h
-f:include/dt-bindings/interconnect/qcom,osm-l3.h
-f:include/dt-bindings/interconnect/qcom,qcm2290.h
-f:include/dt-bindings/interconnect/qcom,qcs404.h
-f:include/dt-bindings/interconnect/qcom,qcs615-rpmh.h
-f:include/dt-bindings/interconnect/qcom,qcs8300-rpmh.h
-f:include/dt-bindings/interconnect/qcom,qdu1000-rpmh.h
-f:include/dt-bindings/interconnect/qcom,rpm-icc.h
-f:include/dt-bindings/interconnect/qcom,sa8775p-rpmh.h
-f:include/dt-bindings/interconnect/qcom,sar2130p-rpmh.h
-f:include/dt-bindings/interconnect/qcom,sc7180.h
-f:include/dt-bindings/interconnect/qcom,sc7280.h
-f:include/dt-bindings/interconnect/qcom,sc8180x.h
-f:include/dt-bindings/interconnect/qcom,sc8280xp.h
-f:include/dt-bindings/interconnect/qcom,sdm660.h
-f:include/dt-bindings/interconnect/qcom,sdm670-rpmh.h
-f:include/dt-bindings/interconnect/qcom,sdm845.h
-f:include/dt-bindings/interconnect/qcom,sdx55.h
-f:include/dt-bindings/interconnect/qcom,sdx65.h
-f:include/dt-bindings/interconnect/qcom,sdx75.h
-f:include/dt-bindings/interconnect/qcom,sm6115.h
-f:include/dt-bindings/interconnect/qcom,sm6350.h
-f:include/dt-bindings/interconnect/qcom,sm7150-rpmh.h
-f:include/dt-bindings/interconnect/qcom,sm8150.h
-f:include/dt-bindings/interconnect/qcom,sm8250.h
-f:include/dt-bindings/interconnect/qcom,sm8350.h
-f:include/dt-bindings/interconnect/qcom,sm8450.h
-f:include/dt-bindings/interconnect/qcom,sm8550-rpmh.h
-f:include/dt-bindings/interconnect/qcom,sm8650-rpmh.h
-f:include/dt-bindings/interconnect/qcom,sm8750-rpmh.h
-f:include/dt-bindings/interconnect/qcom,x1e80100-rpmh.h
-f:include/dt-bindings/interrupt-controller/amlogic,meson-g12a-gpio-intc.h
-f:include/dt-bindings/interrupt-controller/apple-aic.h
-f:include/dt-bindings/interrupt-controller/arm-gic.h
-f:include/dt-bindings/interrupt-controller/aspeed-scu-ic.h
-f:include/dt-bindings/interrupt-controller/irq-st.h
-f:include/dt-bindings/interrupt-controller/irq.h
-f:include/dt-bindings/interrupt-controller/irqc-rzg2l.h
-f:include/dt-bindings/interrupt-controller/mips-gic.h
-f:include/dt-bindings/interrupt-controller/mvebu-icu.h
-f:include/dt-bindings/leds/common.h
-f:include/dt-bindings/leds/leds-lp55xx.h
-f:include/dt-bindings/leds/leds-netxbig.h
-f:include/dt-bindings/leds/leds-ns2.h
-f:include/dt-bindings/leds/leds-pca9532.h
-f:include/dt-bindings/leds/leds-pca955x.h
-f:include/dt-bindings/leds/rt4831-backlight.h
-f:include/dt-bindings/mailbox/mediatek,mt8188-gce.h
-f:include/dt-bindings/mailbox/qcom-ipcc.h
-f:include/dt-bindings/mailbox/tegra186-hsp.h
-f:include/dt-bindings/media/c8sectpfe.h
-f:include/dt-bindings/media/omap3-isp.h
-f:include/dt-bindings/media/tda1997x.h
-f:include/dt-bindings/media/tvp5150.h
-f:include/dt-bindings/media/video-interfaces.h
-f:include/dt-bindings/media/xilinx-vip.h
-f:include/dt-bindings/memory/mediatek,mt6893-memory-port.h
-f:include/dt-bindings/memory/mediatek,mt8188-memory-port.h
-f:include/dt-bindings/memory/mediatek,mt8365-larb-port.h
-f:include/dt-bindings/memory/mt2701-larb-port.h
-f:include/dt-bindings/memory/mt2712-larb-port.h
-f:include/dt-bindings/memory/mt6779-larb-port.h
-f:include/dt-bindings/memory/mt6795-larb-port.h
-f:include/dt-bindings/memory/mt8167-larb-port.h
-f:include/dt-bindings/memory/mt8173-larb-port.h
-f:include/dt-bindings/memory/mt8183-larb-port.h
-f:include/dt-bindings/memory/mt8186-memory-port.h
-f:include/dt-bindings/memory/mt8192-larb-port.h
-f:include/dt-bindings/memory/mt8195-memory-port.h
-f:include/dt-bindings/memory/mtk-memory-port.h
-f:include/dt-bindings/memory/nvidia,tegra264.h
-f:include/dt-bindings/memory/tegra114-mc.h
-f:include/dt-bindings/memory/tegra124-mc.h
-f:include/dt-bindings/memory/tegra186-mc.h
-f:include/dt-bindings/memory/tegra194-mc.h
-f:include/dt-bindings/memory/tegra20-mc.h
-f:include/dt-bindings/memory/tegra210-mc.h
-f:include/dt-bindings/memory/tegra234-mc.h
-f:include/dt-bindings/memory/tegra30-mc.h
-f:include/dt-bindings/mfd/arizona.h
-f:include/dt-bindings/mfd/as3722.h
-f:include/dt-bindings/mfd/at91-usart.h
-f:include/dt-bindings/mfd/atmel-flexcom.h
-f:include/dt-bindings/mfd/cros_ec.h
-f:include/dt-bindings/mfd/dbx500-prcmu.h
-f:include/dt-bindings/mfd/max77620.h
-f:include/dt-bindings/mfd/palmas.h
-f:include/dt-bindings/mfd/qcom-rpm.h
-f:include/dt-bindings/mfd/st,stpmic1.h
-f:include/dt-bindings/mfd/st-lpc.h
-f:include/dt-bindings/mfd/stm32f4-rcc.h
-f:include/dt-bindings/mfd/stm32f7-rcc.h
-f:include/dt-bindings/mfd/stm32h7-rcc.h
-f:include/dt-bindings/mips/lantiq_rcu_gphy.h
-f:include/dt-bindings/mux/mux.h
-f:include/dt-bindings/mux/ti-serdes.h
-f:include/dt-bindings/net/microchip-lan78xx.h
-f:include/dt-bindings/net/mscc-phy-vsc8531.h
-f:include/dt-bindings/net/pcs-rzn1-miic.h
-f:include/dt-bindings/net/qca-ar803x.h
-f:include/dt-bindings/net/ti-dp83867.h
-f:include/dt-bindings/net/ti-dp83869.h
-f:include/dt-bindings/nvmem/microchip,sama7g5-otpc.h
-f:include/dt-bindings/phy/phy-am654-serdes.h
-f:include/dt-bindings/phy/phy-cadence.h
-f:include/dt-bindings/phy/phy-imx8-pcie.h
-f:include/dt-bindings/phy/phy-lan966x-serdes.h
-f:include/dt-bindings/phy/phy-lantiq-vrx200-pcie.h
-f:include/dt-bindings/phy/phy-ocelot-serdes.h
-f:include/dt-bindings/phy/phy-pistachio-usb.h
-f:include/dt-bindings/phy/phy-qcom-qmp.h
-f:include/dt-bindings/phy/phy-qcom-qusb2.h
-f:include/dt-bindings/phy/phy-ti.h
-f:include/dt-bindings/phy/phy.h
-f:include/dt-bindings/pinctrl/am33xx.h
-f:include/dt-bindings/pinctrl/am43xx.h
-f:include/dt-bindings/pinctrl/amlogic,pinctrl.h
-f:include/dt-bindings/pinctrl/apple.h
-f:include/dt-bindings/pinctrl/at91.h
-f:include/dt-bindings/pinctrl/bcm2835.h
-f:include/dt-bindings/pinctrl/brcm,pinctrl-stingray.h
-f:include/dt-bindings/pinctrl/dm814x.h
-f:include/dt-bindings/pinctrl/dra.h
-f:include/dt-bindings/pinctrl/hisi.h
-f:include/dt-bindings/pinctrl/k210-fpioa.h
-f:include/dt-bindings/pinctrl/keystone.h
-f:include/dt-bindings/pinctrl/lochnagar.h
-f:include/dt-bindings/pinctrl/mediatek,mt8188-pinfunc.h
-f:include/dt-bindings/pinctrl/mt6397-pinfunc.h
-f:include/dt-bindings/pinctrl/mt65xx.h
-f:include/dt-bindings/pinctrl/mt6779-pinfunc.h
-f:include/dt-bindings/pinctrl/mt6795-pinfunc.h
-f:include/dt-bindings/pinctrl/mt6797-pinfunc.h
-f:include/dt-bindings/pinctrl/mt7623-pinfunc.h
-f:include/dt-bindings/pinctrl/mt8135-pinfunc.h
-f:include/dt-bindings/pinctrl/mt8183-pinfunc.h
-f:include/dt-bindings/pinctrl/mt8186-pinfunc.h
-f:include/dt-bindings/pinctrl/mt8192-pinfunc.h
-f:include/dt-bindings/pinctrl/mt8195-pinfunc.h
-f:include/dt-bindings/pinctrl/mt8365-pinfunc.h
-f:include/dt-bindings/pinctrl/nomadik.h
-f:include/dt-bindings/pinctrl/omap.h
-f:include/dt-bindings/pinctrl/pads-imx8dxl.h
-f:include/dt-bindings/pinctrl/pads-imx8qm.h
-f:include/dt-bindings/pinctrl/pads-imx8qxp.h
-f:include/dt-bindings/pinctrl/pinctrl-cv1800b.h
-f:include/dt-bindings/pinctrl/pinctrl-cv1812h.h
-f:include/dt-bindings/pinctrl/pinctrl-cv18xx.h
-f:include/dt-bindings/pinctrl/pinctrl-sg2000.h
-f:include/dt-bindings/pinctrl/pinctrl-sg2002.h
-f:include/dt-bindings/pinctrl/pinctrl-sg2042.h
-f:include/dt-bindings/pinctrl/pinctrl-sg2044.h
-f:include/dt-bindings/pinctrl/pinctrl-starfive-jh7100.h
-f:include/dt-bindings/pinctrl/pinctrl-tegra-io-pad.h
-f:include/dt-bindings/pinctrl/pinctrl-tegra-xusb.h
-f:include/dt-bindings/pinctrl/pinctrl-tegra.h
-f:include/dt-bindings/pinctrl/pinctrl-zynq.h
-f:include/dt-bindings/pinctrl/pinctrl-zynqmp.h
-f:include/dt-bindings/pinctrl/qcom,pmic-gpio.h
-f:include/dt-bindings/pinctrl/qcom,pmic-mpp.h
-f:include/dt-bindings/pinctrl/r7s72100-pinctrl.h
-f:include/dt-bindings/pinctrl/r7s9210-pinctrl.h
-f:include/dt-bindings/pinctrl/renesas,r9a09g047-pinctrl.h
-f:include/dt-bindings/pinctrl/renesas,r9a09g057-pinctrl.h
-f:include/dt-bindings/pinctrl/rockchip.h
-f:include/dt-bindings/pinctrl/rzg2l-pinctrl.h
-f:include/dt-bindings/pinctrl/rzn1-pinctrl.h
-f:include/dt-bindings/pinctrl/rzv2m-pinctrl.h
-f:include/dt-bindings/pinctrl/sppctl-sp7021.h
-f:include/dt-bindings/pinctrl/sppctl.h
-f:include/dt-bindings/pinctrl/starfive,jh7110-pinctrl.h
-f:include/dt-bindings/pinctrl/stm32-pinfunc.h
-f:include/dt-bindings/pinctrl/sun4i-a10.h
-f:include/dt-bindings/pmu/exynos_ppmu.h
-f:include/dt-bindings/power/allwinner,sun20i-d1-ppu.h
-f:include/dt-bindings/power/allwinner,sun55i-a523-pck-600.h
-f:include/dt-bindings/power/allwinner,sun55i-a523-ppu.h
-f:include/dt-bindings/power/allwinner,sun8i-v853-ppu.h
-f:include/dt-bindings/power/amlogic,a4-pwrc.h
-f:include/dt-bindings/power/amlogic,a5-pwrc.h
-f:include/dt-bindings/power/amlogic,c3-pwrc.h
-f:include/dt-bindings/power/amlogic,t7-pwrc.h
-f:include/dt-bindings/power/fsl,imx93-power.h
-f:include/dt-bindings/power/imx7-power.h
-f:include/dt-bindings/power/imx8mm-power.h
-f:include/dt-bindings/power/imx8mn-power.h
-f:include/dt-bindings/power/imx8mp-power.h
-f:include/dt-bindings/power/imx8mq-power.h
-f:include/dt-bindings/power/imx8ulp-power.h
-f:include/dt-bindings/power/marvell,mmp2.h
-f:include/dt-bindings/power/mediatek,mt6735-power-controller.h
-f:include/dt-bindings/power/mediatek,mt6893-power.h
-f:include/dt-bindings/power/mediatek,mt8188-power.h
-f:include/dt-bindings/power/mediatek,mt8365-power.h
-f:include/dt-bindings/power/meson-a1-power.h
-f:include/dt-bindings/power/meson-axg-power.h
-f:include/dt-bindings/power/meson-g12a-power.h
-f:include/dt-bindings/power/meson-gxbb-power.h
-f:include/dt-bindings/power/meson-s4-power.h
-f:include/dt-bindings/power/meson-sm1-power.h
-f:include/dt-bindings/power/meson8-power.h
-f:include/dt-bindings/power/mt2701-power.h
-f:include/dt-bindings/power/mt2712-power.h
-f:include/dt-bindings/power/mt6765-power.h
-f:include/dt-bindings/power/mt6795-power.h
-f:include/dt-bindings/power/mt6797-power.h
-f:include/dt-bindings/power/mt7622-power.h
-f:include/dt-bindings/power/mt7623a-power.h
-f:include/dt-bindings/power/mt8167-power.h
-f:include/dt-bindings/power/mt8173-power.h
-f:include/dt-bindings/power/mt8183-power.h
-f:include/dt-bindings/power/mt8186-power.h
-f:include/dt-bindings/power/mt8192-power.h
-f:include/dt-bindings/power/mt8195-power.h
-f:include/dt-bindings/power/owl-s500-powergate.h
-f:include/dt-bindings/power/owl-s700-powergate.h
-f:include/dt-bindings/power/owl-s900-powergate.h
-f:include/dt-bindings/power/px30-power.h
-f:include/dt-bindings/power/qcom,rpmhpd.h
-f:include/dt-bindings/power/qcom-rpmpd.h
-f:include/dt-bindings/power/r8a7742-sysc.h
-f:include/dt-bindings/power/r8a7743-sysc.h
-f:include/dt-bindings/power/r8a7744-sysc.h
-f:include/dt-bindings/power/r8a7745-sysc.h
-f:include/dt-bindings/power/r8a77470-sysc.h
-f:include/dt-bindings/power/r8a774a1-sysc.h
-f:include/dt-bindings/power/r8a774b1-sysc.h
-f:include/dt-bindings/power/r8a774c0-sysc.h
-f:include/dt-bindings/power/r8a774e1-sysc.h
-f:include/dt-bindings/power/r8a7779-sysc.h
-f:include/dt-bindings/power/r8a7790-sysc.h
-f:include/dt-bindings/power/r8a7791-sysc.h
-f:include/dt-bindings/power/r8a7792-sysc.h
-f:include/dt-bindings/power/r8a7793-sysc.h
-f:include/dt-bindings/power/r8a7794-sysc.h
-f:include/dt-bindings/power/r8a7795-sysc.h
-f:include/dt-bindings/power/r8a7796-sysc.h
-f:include/dt-bindings/power/r8a77961-sysc.h
-f:include/dt-bindings/power/r8a77965-sysc.h
-f:include/dt-bindings/power/r8a77970-sysc.h
-f:include/dt-bindings/power/r8a77980-sysc.h
-f:include/dt-bindings/power/r8a77990-sysc.h
-f:include/dt-bindings/power/r8a77995-sysc.h
-f:include/dt-bindings/power/r8a779a0-sysc.h
-f:include/dt-bindings/power/r8a779f0-sysc.h
-f:include/dt-bindings/power/r8a779g0-sysc.h
-f:include/dt-bindings/power/raspberrypi-power.h
-f:include/dt-bindings/power/renesas,r8a779h0-sysc.h
-f:include/dt-bindings/power/rk3036-power.h
-f:include/dt-bindings/power/rk3066-power.h
-f:include/dt-bindings/power/rk3128-power.h
-f:include/dt-bindings/power/rk3188-power.h
-f:include/dt-bindings/power/rk3228-power.h
-f:include/dt-bindings/power/rk3288-power.h
-f:include/dt-bindings/power/rk3328-power.h
-f:include/dt-bindings/power/rk3366-power.h
-f:include/dt-bindings/power/rk3368-power.h
-f:include/dt-bindings/power/rk3399-power.h
-f:include/dt-bindings/power/rk3568-power.h
-f:include/dt-bindings/power/rk3588-power.h
-f:include/dt-bindings/power/rockchip,rk3528-power.h
-f:include/dt-bindings/power/rockchip,rk3562-power.h
-f:include/dt-bindings/power/rockchip,rk3576-power.h
-f:include/dt-bindings/power/rockchip,rv1126-power.h
-f:include/dt-bindings/power/starfive,jh7110-pmu.h
-f:include/dt-bindings/power/summit,smb347-charger.h
-f:include/dt-bindings/power/tegra186-powergate.h
-f:include/dt-bindings/power/tegra194-powergate.h
-f:include/dt-bindings/power/tegra234-powergate.h
-f:include/dt-bindings/power/thead,th1520-power.h
-f:include/dt-bindings/power/xlnx-zynqmp-power.h
-f:include/dt-bindings/pwm/pwm.h
-f:include/dt-bindings/pwm/raspberrypi,firmware-poe-pwm.h
-f:include/dt-bindings/regulator/active-semi,8865-regulator.h
-f:include/dt-bindings/regulator/active-semi,8945a-regulator.h
-f:include/dt-bindings/regulator/dlg,da9063-regulator.h
-f:include/dt-bindings/regulator/dlg,da9121-regulator.h
-f:include/dt-bindings/regulator/dlg,da9211-regulator.h
-f:include/dt-bindings/regulator/maxim,max77802.h
-f:include/dt-bindings/regulator/mediatek,mt6360-regulator.h
-f:include/dt-bindings/regulator/mediatek,mt6397-regulator.h
-f:include/dt-bindings/regulator/nxp,pca9450-regulator.h
-f:include/dt-bindings/regulator/qcom,rpmh-regulator.h
-f:include/dt-bindings/regulator/richtek,rt5190a-regulator.h
-f:include/dt-bindings/regulator/st,stm32mp13-regulator.h
-f:include/dt-bindings/regulator/st,stm32mp15-regulator.h
-f:include/dt-bindings/regulator/st,stm32mp25-regulator.h
-f:include/dt-bindings/regulator/ti,tps62864.h
-f:include/dt-bindings/reset/actions,s500-reset.h
-f:include/dt-bindings/reset/actions,s700-reset.h
-f:include/dt-bindings/reset/actions,s900-reset.h
-f:include/dt-bindings/reset/airoha,en7581-reset.h
-f:include/dt-bindings/reset/altr,rst-mgr-a10.h
-f:include/dt-bindings/reset/altr,rst-mgr-a10sr.h
-f:include/dt-bindings/reset/altr,rst-mgr-s10.h
-f:include/dt-bindings/reset/altr,rst-mgr.h
-f:include/dt-bindings/reset/amlogic,c3-reset.h
-f:include/dt-bindings/reset/amlogic,meson-a1-audio-reset.h
-f:include/dt-bindings/reset/amlogic,meson-a1-reset.h
-f:include/dt-bindings/reset/amlogic,meson-axg-audio-arb.h
-f:include/dt-bindings/reset/amlogic,meson-axg-reset.h
-f:include/dt-bindings/reset/amlogic,meson-g12a-audio-reset.h
-f:include/dt-bindings/reset/amlogic,meson-g12a-reset.h
-f:include/dt-bindings/reset/amlogic,meson-gxbb-reset.h
-f:include/dt-bindings/reset/amlogic,meson-s4-reset.h
-f:include/dt-bindings/reset/amlogic,meson8b-clkc-reset.h
-f:include/dt-bindings/reset/amlogic,meson8b-reset.h
-f:include/dt-bindings/reset/aspeed,ast2700-scu.h
-f:include/dt-bindings/reset/axg-aoclkc.h
-f:include/dt-bindings/reset/bcm6318-reset.h
-f:include/dt-bindings/reset/bcm63268-reset.h
-f:include/dt-bindings/reset/bcm6328-reset.h
-f:include/dt-bindings/reset/bcm6358-reset.h
-f:include/dt-bindings/reset/bcm6362-reset.h
-f:include/dt-bindings/reset/bcm6368-reset.h
-f:include/dt-bindings/reset/bitmain,bm1880-reset.h
-f:include/dt-bindings/reset/bt1-ccu.h
-f:include/dt-bindings/reset/canaan,k230-rst.h
-f:include/dt-bindings/reset/cortina,gemini-reset.h
-f:include/dt-bindings/reset/delta,tn48m-reset.h
-f:include/dt-bindings/reset/g12a-aoclkc.h
-f:include/dt-bindings/reset/gxbb-aoclkc.h
-f:include/dt-bindings/reset/hisi,hi6220-resets.h
-f:include/dt-bindings/reset/imx7-reset.h
-f:include/dt-bindings/reset/imx8mp-reset-audiomix.h
-f:include/dt-bindings/reset/imx8mp-reset.h
-f:include/dt-bindings/reset/imx8mq-reset.h
-f:include/dt-bindings/reset/imx8ulp-pcc-reset.h
-f:include/dt-bindings/reset/k210-rst.h
-f:include/dt-bindings/reset/mediatek,mt6735-infracfg.h
-f:include/dt-bindings/reset/mediatek,mt6735-mfgcfg.h
-f:include/dt-bindings/reset/mediatek,mt6735-pericfg.h
-f:include/dt-bindings/reset/mediatek,mt6735-vdecsys.h
-f:include/dt-bindings/reset/mediatek,mt6735-wdt.h
-f:include/dt-bindings/reset/mediatek,mt6795-resets.h
-f:include/dt-bindings/reset/mediatek,mt7988-resets.h
-f:include/dt-bindings/reset/mt2701-resets.h
-f:include/dt-bindings/reset/mt2712-resets.h
-f:include/dt-bindings/reset/mt7621-reset.h
-f:include/dt-bindings/reset/mt7622-reset.h
-f:include/dt-bindings/reset/mt7629-resets.h
-f:include/dt-bindings/reset/mt7986-resets.h
-f:include/dt-bindings/reset/mt8135-resets.h
-f:include/dt-bindings/reset/mt8173-resets.h
-f:include/dt-bindings/reset/mt8183-resets.h
-f:include/dt-bindings/reset/mt8186-resets.h
-f:include/dt-bindings/reset/mt8188-resets.h
-f:include/dt-bindings/reset/mt8192-resets.h
-f:include/dt-bindings/reset/mt8195-resets.h
-f:include/dt-bindings/reset/nuvoton,ma35d1-reset.h
-f:include/dt-bindings/reset/nuvoton,npcm7xx-reset.h
-f:include/dt-bindings/reset/nvidia,tegra264.h
-f:include/dt-bindings/reset/oxsemi,ox810se.h
-f:include/dt-bindings/reset/oxsemi,ox820.h
-f:include/dt-bindings/reset/pistachio-resets.h
-f:include/dt-bindings/reset/qcom,gcc-apq8084.h
-f:include/dt-bindings/reset/qcom,gcc-ipq5018.h
-f:include/dt-bindings/reset/qcom,gcc-ipq6018.h
-f:include/dt-bindings/reset/qcom,gcc-ipq806x.h
-f:include/dt-bindings/reset/qcom,gcc-mdm9615.h
-f:include/dt-bindings/reset/qcom,gcc-msm8660.h
-f:include/dt-bindings/reset/qcom,gcc-msm8916.h
-f:include/dt-bindings/reset/qcom,gcc-msm8939.h
-f:include/dt-bindings/reset/qcom,gcc-msm8960.h
-f:include/dt-bindings/reset/qcom,gcc-msm8974.h
-f:include/dt-bindings/reset/qcom,ipq5424-gcc.h
-f:include/dt-bindings/reset/qcom,ipq9574-gcc.h
-f:include/dt-bindings/reset/qcom,ipq9574-nsscc.h
-f:include/dt-bindings/reset/qcom,mmcc-apq8084.h
-f:include/dt-bindings/reset/qcom,mmcc-msm8960.h
-f:include/dt-bindings/reset/qcom,mmcc-msm8974.h
-f:include/dt-bindings/reset/qcom,qca8k-nsscc.h
-f:include/dt-bindings/reset/qcom,sar2130p-gpucc.h
-f:include/dt-bindings/reset/qcom,sdm845-aoss.h
-f:include/dt-bindings/reset/qcom,sdm845-pdc.h
-f:include/dt-bindings/reset/qcom,sm8350-videocc.h
-f:include/dt-bindings/reset/qcom,sm8450-gpucc.h
-f:include/dt-bindings/reset/qcom,sm8650-gpucc.h
-f:include/dt-bindings/reset/qcom,x1e80100-gpucc.h
-f:include/dt-bindings/reset/raspberrypi,firmware-reset.h
-f:include/dt-bindings/reset/realtek,rtd1195.h
-f:include/dt-bindings/reset/realtek,rtd1295.h
-f:include/dt-bindings/reset/rockchip,rk3528-cru.h
-f:include/dt-bindings/reset/rockchip,rk3562-cru.h
-f:include/dt-bindings/reset/rockchip,rk3576-cru.h
-f:include/dt-bindings/reset/rockchip,rk3588-cru.h
-f:include/dt-bindings/reset/sama7g5-reset.h
-f:include/dt-bindings/reset/snps,hsdk-reset.h
-f:include/dt-bindings/reset/sophgo,sg2042-reset.h
-f:include/dt-bindings/reset/st,stm32mp25-rcc.h
-f:include/dt-bindings/reset/starfive,jh7110-crg.h
-f:include/dt-bindings/reset/starfive-jh7100.h
-f:include/dt-bindings/reset/stericsson,db8500-prcc-reset.h
-f:include/dt-bindings/reset/stih407-resets.h
-f:include/dt-bindings/reset/stm32mp1-resets.h
-f:include/dt-bindings/reset/stm32mp13-resets.h
-f:include/dt-bindings/reset/sun20i-d1-ccu.h
-f:include/dt-bindings/reset/sun20i-d1-r-ccu.h
-f:include/dt-bindings/reset/sun4i-a10-ccu.h
-f:include/dt-bindings/reset/sun50i-a100-ccu.h
-f:include/dt-bindings/reset/sun50i-a100-r-ccu.h
-f:include/dt-bindings/reset/sun50i-a64-ccu.h
-f:include/dt-bindings/reset/sun50i-h6-ccu.h
-f:include/dt-bindings/reset/sun50i-h6-r-ccu.h
-f:include/dt-bindings/reset/sun50i-h616-ccu.h
-f:include/dt-bindings/reset/sun55i-a523-ccu.h
-f:include/dt-bindings/reset/sun55i-a523-r-ccu.h
-f:include/dt-bindings/reset/sun5i-ccu.h
-f:include/dt-bindings/reset/sun6i-a31-ccu.h
-f:include/dt-bindings/reset/sun8i-a23-a33-ccu.h
-f:include/dt-bindings/reset/sun8i-a83t-ccu.h
-f:include/dt-bindings/reset/sun8i-de2.h
-f:include/dt-bindings/reset/sun8i-h3-ccu.h
-f:include/dt-bindings/reset/sun8i-r-ccu.h
-f:include/dt-bindings/reset/sun8i-r40-ccu.h
-f:include/dt-bindings/reset/sun8i-v3s-ccu.h
-f:include/dt-bindings/reset/sun9i-a80-ccu.h
-f:include/dt-bindings/reset/sun9i-a80-de.h
-f:include/dt-bindings/reset/sun9i-a80-usb.h
-f:include/dt-bindings/reset/suniv-ccu-f1c100s.h
-f:include/dt-bindings/reset/sunplus,sp7021-reset.h
-f:include/dt-bindings/reset/tegra124-car.h
-f:include/dt-bindings/reset/tegra186-reset.h
-f:include/dt-bindings/reset/tegra194-reset.h
-f:include/dt-bindings/reset/tegra210-car.h
-f:include/dt-bindings/reset/tegra234-reset.h
-f:include/dt-bindings/reset/thead,th1520-reset.h
-f:include/dt-bindings/reset/ti-syscon.h
-f:include/dt-bindings/reset/toshiba,tmpv770x.h
-f:include/dt-bindings/reset/xlnx-versal-resets.h
-f:include/dt-bindings/reset/xlnx-zynqmp-resets.h
-f:include/dt-bindings/soc/bcm-pmb.h
-f:include/dt-bindings/soc/bcm2835-pm.h
-f:include/dt-bindings/soc/bcm6318-pm.h
-f:include/dt-bindings/soc/bcm63268-pm.h
-f:include/dt-bindings/soc/bcm6328-pm.h
-f:include/dt-bindings/soc/bcm6362-pm.h
-f:include/dt-bindings/soc/cpm1-fsl,tsa.h
-f:include/dt-bindings/soc/qcom,apr.h
-f:include/dt-bindings/soc/qcom,gpr.h
-f:include/dt-bindings/soc/qcom,gsbi.h
-f:include/dt-bindings/soc/qcom,rpmh-rsc.h
-f:include/dt-bindings/soc/qe-fsl,tsa.h
-f:include/dt-bindings/soc/rockchip,boot-mode.h
-f:include/dt-bindings/soc/rockchip,vop2.h
-f:include/dt-bindings/soc/samsung,boot-mode.h
-f:include/dt-bindings/soc/samsung,exynos-usi.h
-f:include/dt-bindings/soc/tegra-pmc.h
-f:include/dt-bindings/soc/ti,sci_pm_domain.h
-f:include/dt-bindings/sound/adi,adau1977.h
-f:include/dt-bindings/sound/apq8016-lpass.h
-f:include/dt-bindings/sound/audio-graph.h
-f:include/dt-bindings/sound/audio-jack-events.h
-f:include/dt-bindings/sound/cs35l32.h
-f:include/dt-bindings/sound/cs35l45.h
-f:include/dt-bindings/sound/cs42l42.h
-f:include/dt-bindings/sound/cs48l32.h
-f:include/dt-bindings/sound/fsl-imx-audmux.h
-f:include/dt-bindings/sound/madera.h
-f:include/dt-bindings/sound/meson-aiu.h
-f:include/dt-bindings/sound/meson-g12a-toacodec.h
-f:include/dt-bindings/sound/meson-g12a-tohdmitx.h
-f:include/dt-bindings/sound/microchip,pdmc.h
-f:include/dt-bindings/sound/qcom,lpass.h
-f:include/dt-bindings/sound/qcom,q6afe.h
-f:include/dt-bindings/sound/qcom,q6asm.h
-f:include/dt-bindings/sound/qcom,q6dsp-lpass-ports.h
-f:include/dt-bindings/sound/qcom,wcd9335.h
-f:include/dt-bindings/sound/qcom,wcd934x.h
-f:include/dt-bindings/sound/rt5640.h
-f:include/dt-bindings/sound/rt5651.h
-f:include/dt-bindings/sound/samsung-i2s.h
-f:include/dt-bindings/sound/sc7180-lpass.h
-f:include/dt-bindings/sound/tas2552.h
-f:include/dt-bindings/sound/tlv320adc3xxx.h
-f:include/dt-bindings/sound/tlv320aic31xx.h
-f:include/dt-bindings/spmi/spmi.h
-f:include/dt-bindings/thermal/lm90.h
-f:include/dt-bindings/thermal/mediatek,lvts-thermal.h
-f:include/dt-bindings/thermal/tegra124-soctherm.h
-f:include/dt-bindings/thermal/tegra186-bpmp-thermal.h
-f:include/dt-bindings/thermal/tegra194-bpmp-thermal.h
-f:include/dt-bindings/thermal/tegra234-bpmp-thermal.h
-f:include/dt-bindings/thermal/thermal.h
-f:include/dt-bindings/thermal/thermal_exynos.h
-f:include/dt-bindings/usb/pd.h
-f:include/dt-bindings/watchdog/aspeed-wdt.h
-f:include/hyperv/hvgdk.h
-f:include/hyperv/hvgdk_ext.h
-f:include/hyperv/hvgdk_mini.h
-f:include/hyperv/hvhdk.h
-f:include/hyperv/hvhdk_mini.h
-f:include/keys/asymmetric-parser.h
-f:include/keys/asymmetric-subtype.h
-f:include/keys/asymmetric-type.h
-f:include/keys/big_key-type.h
-f:include/keys/ceph-type.h
-f:include/keys/dns_resolver-type.h
-f:include/keys/encrypted-type.h
-f:include/keys/keyring-type.h
-f:include/keys/request_key_auth-type.h
-f:include/keys/rxrpc-type.h
-f:include/keys/system_keyring.h
-f:include/keys/trusted-type.h
-f:include/keys/trusted_caam.h
-f:include/keys/trusted_dcp.h
-f:include/keys/trusted_tee.h
-f:include/keys/trusted_tpm.h
-f:include/keys/user-type.h
-f:include/kunit/assert.h
-f:include/kunit/attributes.h
-f:include/kunit/clk.h
-f:include/kunit/device.h
-f:include/kunit/of.h
-f:include/kunit/platform_device.h
-f:include/kunit/resource.h
-f:include/kunit/skbuff.h
-f:include/kunit/static_stub.h
-f:include/kunit/test-bug.h
-f:include/kunit/test.h
-f:include/kunit/try-catch.h
-f:include/kunit/visibility.h
-f:include/kvm/arm_arch_timer.h
-f:include/kvm/arm_hypercalls.h
-f:include/kvm/arm_pmu.h
-f:include/kvm/arm_psci.h
-f:include/kvm/arm_vgic.h
-f:include/kvm/iodev.h
-f:include/linux/8250_pci.h
-f:include/linux/acct.h
-f:include/linux/acpi.h
-f:include/linux/acpi_amd_wbrf.h
-f:include/linux/acpi_dma.h
-f:include/linux/acpi_iort.h
-f:include/linux/acpi_mdio.h
-f:include/linux/acpi_pmtmr.h
-f:include/linux/acpi_viot.h
-f:include/linux/adb.h
-f:include/linux/adfs_fs.h
-f:include/linux/adi-axi-common.h
-f:include/linux/adreno-smmu-priv.h
-f:include/linux/adxl.h
-f:include/linux/aer.h
-f:include/linux/agp_backend.h
-f:include/linux/agpgart.h
-f:include/linux/ahci-remap.h
-f:include/linux/ahci_platform.h
-f:include/linux/aio.h
-f:include/linux/alarmtimer.h
-f:include/linux/alcor_pci.h
-f:include/linux/align.h
-f:include/linux/alloc_tag.h
-f:include/linux/altera_jtaguart.h
-f:include/linux/altera_uart.h
-f:include/linux/amba/bus.h
-f:include/linux/amba/kmi.h
-f:include/linux/amba/mmci.h
-f:include/linux/amba/pl022.h
-f:include/linux/amba/pl080.h
-f:include/linux/amba/pl08x.h
-f:include/linux/amba/serial.h
-f:include/linux/amba/sp810.h
-f:include/linux/amd-iommu.h
-f:include/linux/amd-pmf-io.h
-f:include/linux/anon_inodes.h
-f:include/linux/aperture.h
-f:include/linux/apm-emulation.h
-f:include/linux/apm_bios.h
-f:include/linux/apple-gmux.h
-f:include/linux/arch_topology.h
-f:include/linux/args.h
-f:include/linux/arm-cci.h
-f:include/linux/arm-smccc.h
-f:include/linux/arm_ffa.h
-f:include/linux/arm_sdei.h
-f:include/linux/armada-37xx-rwtm-mailbox.h
-f:include/linux/array_size.h
-f:include/linux/ascii85.h
-f:include/linux/asn1.h
-f:include/linux/asn1_ber_bytecode.h
-f:include/linux/asn1_decoder.h
-f:include/linux/asn1_encoder.h
-f:include/linux/assoc_array.h
-f:include/linux/assoc_array_priv.h
-f:include/linux/async.h
-f:include/linux/async_tx.h
-f:include/linux/ata.h
-f:include/linux/ata_platform.h
-f:include/linux/atalk.h
-f:include/linux/atm.h
-f:include/linux/atm_tcp.h
-f:include/linux/atmdev.h
-f:include/linux/atmel-isc-media.h
-f:include/linux/atmel-ssc.h
-f:include/linux/atmel_pdc.h
-f:include/linux/atomic.h
-f:include/linux/atomic/atomic-arch-fallback.h
-f:include/linux/atomic/atomic-instrumented.h
-f:include/linux/atomic/atomic-long.h
-f:include/linux/attribute_container.h
-f:include/linux/audit.h
-f:include/linux/audit_arch.h
-f:include/linux/auto_dev-ioctl.h
-f:include/linux/auto_fs.h
-f:include/linux/auxiliary_bus.h
-f:include/linux/auxvec.h
-f:include/linux/average.h
-f:include/linux/avf/virtchnl.h
-f:include/linux/backing-dev-defs.h
-f:include/linux/backing-dev.h
-f:include/linux/backing-file.h
-f:include/linux/backlight.h
-f:include/linux/badblocks.h
-f:include/linux/balloon_compaction.h
-f:include/linux/base64.h
-f:include/linux/bcd.h
-f:include/linux/bch.h
-f:include/linux/bcm47xx_nvram.h
-f:include/linux/bcm47xx_sprom.h
-f:include/linux/bcm47xx_wdt.h
-f:include/linux/bcm963xx_nvram.h
-f:include/linux/bcm963xx_tag.h
-f:include/linux/bcma/bcma.h
-f:include/linux/bcma/bcma_driver_arm_c9.h
-f:include/linux/bcma/bcma_driver_chipcommon.h
-f:include/linux/bcma/bcma_driver_gmac_cmn.h
-f:include/linux/bcma/bcma_driver_mips.h
-f:include/linux/bcma/bcma_driver_pci.h
-f:include/linux/bcma/bcma_driver_pcie2.h
-f:include/linux/bcma/bcma_regs.h
-f:include/linux/bcma/bcma_soc.h
-f:include/linux/binfmts.h
-f:include/linux/bio-integrity.h
-f:include/linux/bio.h
-f:include/linux/bit_spinlock.h
-f:include/linux/bitfield.h
-f:include/linux/bitmap-str.h
-f:include/linux/bitmap.h
-f:include/linux/bitops.h
-f:include/linux/bitrev.h
-f:include/linux/bits.h
-f:include/linux/blk-cgroup.h
-f:include/linux/blk-crypto-profile.h
-f:include/linux/blk-crypto.h
-f:include/linux/blk-integrity.h
-f:include/linux/blk-mq-dma.h
-f:include/linux/blk-mq.h
-f:include/linux/blk-pm.h
-f:include/linux/blk_types.h
-f:include/linux/blkdev.h
-f:include/linux/blkpg.h
-f:include/linux/blktrace_api.h
-f:include/linux/blockgroup_lock.h
-f:include/linux/bma150.h
-f:include/linux/bnxt/hsi.h
-f:include/linux/bootconfig.h
-f:include/linux/bootmem_info.h
-f:include/linux/bottom_half.h
-f:include/linux/bpf-cgroup-defs.h
-f:include/linux/bpf-cgroup.h
-f:include/linux/bpf-netns.h
-f:include/linux/bpf.h
-f:include/linux/bpf_crypto.h
-f:include/linux/bpf_lirc.h
-f:include/linux/bpf_local_storage.h
-f:include/linux/bpf_lsm.h
-f:include/linux/bpf_mem_alloc.h
-f:include/linux/bpf_mprog.h
-f:include/linux/bpf_trace.h
-f:include/linux/bpf_types.h
-f:include/linux/bpf_verifier.h
-f:include/linux/bpfptr.h
-f:include/linux/brcmphy.h
-f:include/linux/bsearch.h
-f:include/linux/bsg-lib.h
-f:include/linux/bsg.h
-f:include/linux/btf.h
-f:include/linux/btf_ids.h
-f:include/linux/btree-128.h
-f:include/linux/btree-type.h
-f:include/linux/btree.h
-f:include/linux/btrfs.h
-f:include/linux/buffer_head.h
-f:include/linux/bug.h
-f:include/linux/build-salt.h
-f:include/linux/build_bug.h
-f:include/linux/buildid.h
-f:include/linux/bus/stm32_firewall_device.h
-f:include/linux/bvec.h
-f:include/linux/byteorder/big_endian.h
-f:include/linux/byteorder/generic.h
-f:include/linux/byteorder/little_endian.h
-f:include/linux/c2port.h
-f:include/linux/cache.h
-f:include/linux/cacheflush.h
-f:include/linux/cacheinfo.h
-f:include/linux/call_once.h
-f:include/linux/can/bittiming.h
-f:include/linux/can/can-ml.h
-f:include/linux/can/core.h
-f:include/linux/can/dev.h
-f:include/linux/can/dev/peak_canfd.h
-f:include/linux/can/length.h
-f:include/linux/can/platform/cc770.h
-f:include/linux/can/platform/flexcan.h
-f:include/linux/can/platform/sja1000.h
-f:include/linux/can/rx-offload.h
-f:include/linux/can/skb.h
-f:include/linux/capability.h
-f:include/linux/cb710.h
-f:include/linux/cc_platform.h
-f:include/linux/cciss_ioctl.h
-f:include/linux/ccp.h
-f:include/linux/cdev.h
-f:include/linux/cdrom.h
-f:include/linux/cdx/cdx_bus.h
-f:include/linux/ceph/auth.h
-f:include/linux/ceph/buffer.h
-f:include/linux/ceph/ceph_debug.h
-f:include/linux/ceph/ceph_features.h
-f:include/linux/ceph/ceph_frag.h
-f:include/linux/ceph/ceph_fs.h
-f:include/linux/ceph/ceph_hash.h
-f:include/linux/ceph/cls_lock_client.h
-f:include/linux/ceph/debugfs.h
-f:include/linux/ceph/decode.h
-f:include/linux/ceph/libceph.h
-f:include/linux/ceph/messenger.h
-f:include/linux/ceph/mon_client.h
-f:include/linux/ceph/msgpool.h
-f:include/linux/ceph/msgr.h
-f:include/linux/ceph/osd_client.h
-f:include/linux/ceph/osdmap.h
-f:include/linux/ceph/pagelist.h
-f:include/linux/ceph/rados.h
-f:include/linux/ceph/string_table.h
-f:include/linux/ceph/striper.h
-f:include/linux/ceph/types.h
-f:include/linux/cfag12864b.h
-f:include/linux/cfi.h
-f:include/linux/cfi_types.h
-f:include/linux/cgroup-defs.h
-f:include/linux/cgroup.h
-f:include/linux/cgroup_api.h
-f:include/linux/cgroup_dmem.h
-f:include/linux/cgroup_rdma.h
-f:include/linux/cgroup_refcnt.h
-f:include/linux/cgroup_subsys.h
-f:include/linux/circ_buf.h
-f:include/linux/cleanup.h
-f:include/linux/clk-provider.h
-f:include/linux/clk.h
-f:include/linux/clk/analogbits-wrpll-cln28hpc.h
-f:include/linux/clk/at91_pmc.h
-f:include/linux/clk/clk-conf.h
-f:include/linux/clk/davinci.h
-f:include/linux/clk/imx.h
-f:include/linux/clk/mxs.h
-f:include/linux/clk/pxa.h
-f:include/linux/clk/renesas.h
-f:include/linux/clk/samsung.h
-f:include/linux/clk/spear.h
-f:include/linux/clk/sunxi-ng.h
-f:include/linux/clk/tegra.h
-f:include/linux/clk/ti.h
-f:include/linux/clk/zynq.h
-f:include/linux/clkdev.h
-f:include/linux/clockchips.h
-f:include/linux/clocksource.h
-f:include/linux/clocksource_ids.h
-f:include/linux/closure.h
-f:include/linux/cma.h
-f:include/linux/cmpxchg-emu.h
-f:include/linux/cn_proc.h
-f:include/linux/cnt32_to_63.h
-f:include/linux/coda.h
-f:include/linux/codetag.h
-f:include/linux/comedi/comedi_8254.h
-f:include/linux/comedi/comedi_8255.h
-f:include/linux/comedi/comedi_isadma.h
-f:include/linux/comedi/comedi_pci.h
-f:include/linux/comedi/comedi_pcmcia.h
-f:include/linux/comedi/comedi_usb.h
-f:include/linux/comedi/comedidev.h
-f:include/linux/comedi/comedilib.h
-f:include/linux/compaction.h
-f:include/linux/compat.h
-f:include/linux/compiler-clang.h
-f:include/linux/compiler-gcc.h
-f:include/linux/compiler-version.h
-f:include/linux/compiler.h
-f:include/linux/compiler_attributes.h
-f:include/linux/compiler_types.h
-f:include/linux/completion.h
-f:include/linux/component.h
-f:include/linux/configfs.h
-f:include/linux/connector.h
-f:include/linux/console.h
-f:include/linux/console_struct.h
-f:include/linux/consolemap.h
-f:include/linux/const.h
-f:include/linux/container.h
-f:include/linux/container_of.h
-f:include/linux/context_tracking.h
-f:include/linux/context_tracking_irq.h
-f:include/linux/context_tracking_state.h
-f:include/linux/cookie.h
-f:include/linux/cordic.h
-f:include/linux/coredump.h
-f:include/linux/coresight-pmu.h
-f:include/linux/coresight-stm.h
-f:include/linux/coresight.h
-f:include/linux/count_zeros.h
-f:include/linux/counter.h
-f:include/linux/cper.h
-f:include/linux/cpu.h
-f:include/linux/cpu_cooling.h
-f:include/linux/cpu_pm.h
-f:include/linux/cpu_rmap.h
-f:include/linux/cpu_smt.h
-f:include/linux/cpufeature.h
-f:include/linux/cpufreq.h
-f:include/linux/cpuhotplug.h
-f:include/linux/cpuhplock.h
-f:include/linux/cpuidle.h
-f:include/linux/cpuidle_haltpoll.h
-f:include/linux/cpumask.h
-f:include/linux/cpumask_api.h
-f:include/linux/cpumask_types.h
-f:include/linux/cpuset.h
-f:include/linux/crash_core.h
-f:include/linux/crash_dump.h
-f:include/linux/crash_reserve.h
-f:include/linux/crc-ccitt.h
-f:include/linux/crc-itu-t.h
-f:include/linux/crc-t10dif.h
-f:include/linux/crc16.h
-f:include/linux/crc32.h
-f:include/linux/crc32c.h
-f:include/linux/crc32poly.h
-f:include/linux/crc4.h
-f:include/linux/crc64.h
-f:include/linux/crc7.h
-f:include/linux/crc8.h
-f:include/linux/cred.h
-f:include/linux/crush/crush.h
-f:include/linux/crush/hash.h
-f:include/linux/crush/mapper.h
-f:include/linux/crypto.h
-f:include/linux/cs5535.h
-f:include/linux/ctype.h
-f:include/linux/cuda.h
-f:include/linux/damon.h
-f:include/linux/dasd_mod.h
-f:include/linux/davinci_emac.h
-f:include/linux/dax.h
-f:include/linux/dca.h
-f:include/linux/dcache.h
-f:include/linux/dccp.h
-f:include/linux/debug_locks.h
-f:include/linux/debugfs.h
-f:include/linux/debugobjects.h
-f:include/linux/decompress/bunzip2.h
-f:include/linux/decompress/generic.h
-f:include/linux/decompress/inflate.h
-f:include/linux/decompress/mm.h
-f:include/linux/decompress/unlz4.h
-f:include/linux/decompress/unlzma.h
-f:include/linux/decompress/unlzo.h
-f:include/linux/decompress/unxz.h
-f:include/linux/decompress/unzstd.h
-f:include/linux/delay.h
-f:include/linux/delayacct.h
-f:include/linux/delayed_call.h
-f:include/linux/dev_printk.h
-f:include/linux/devcoredump.h
-f:include/linux/devfreq-event.h
-f:include/linux/devfreq.h
-f:include/linux/devfreq_cooling.h
-f:include/linux/device-mapper.h
-f:include/linux/device.h
-f:include/linux/device/bus.h
-f:include/linux/device/class.h
-f:include/linux/device/devres.h
-f:include/linux/device/driver.h
-f:include/linux/device/faux.h
-f:include/linux/device_cgroup.h
-f:include/linux/devm-helpers.h
-f:include/linux/devpts_fs.h
-f:include/linux/dfl.h
-f:include/linux/digsig.h
-f:include/linux/dim.h
-f:include/linux/dio.h
-f:include/linux/dirent.h
-f:include/linux/dlm.h
-f:include/linux/dlm_plock.h
-f:include/linux/dm-bufio.h
-f:include/linux/dm-dirty-log.h
-f:include/linux/dm-io.h
-f:include/linux/dm-kcopyd.h
-f:include/linux/dm-region-hash.h
-f:include/linux/dm-verity-loadpin.h
-f:include/linux/dm9000.h
-f:include/linux/dma-buf.h
-f:include/linux/dma-direct.h
-f:include/linux/dma-direction.h
-f:include/linux/dma-fence-array.h
-f:include/linux/dma-fence-chain.h
-f:include/linux/dma-fence-unwrap.h
-f:include/linux/dma-fence.h
-f:include/linux/dma-heap.h
-f:include/linux/dma-map-ops.h
-f:include/linux/dma-mapping.h
-f:include/linux/dma-resv.h
-f:include/linux/dma/amd_xdma.h
-f:include/linux/dma/dw.h
-f:include/linux/dma/edma.h
-f:include/linux/dma/hsu.h
-f:include/linux/dma/idma64.h
-f:include/linux/dma/imx-dma.h
-f:include/linux/dma/k3-event-router.h
-f:include/linux/dma/k3-psil.h
-f:include/linux/dma/k3-udma-glue.h
-f:include/linux/dma/mxs-dma.h
-f:include/linux/dma/pxa-dma.h
-f:include/linux/dma/qcom-gpi-dma.h
-f:include/linux/dma/qcom_adm.h
-f:include/linux/dma/qcom_bam_dma.h
-f:include/linux/dma/sprd-dma.h
-f:include/linux/dma/ti-cppi5.h
-f:include/linux/dma/xilinx_dma.h
-f:include/linux/dma/xilinx_dpdma.h
-f:include/linux/dmaengine.h
-f:include/linux/dmapool.h
-f:include/linux/dmar.h
-f:include/linux/dmi.h
-f:include/linux/dnotify.h
-f:include/linux/dns_resolver.h
-f:include/linux/dpll.h
-f:include/linux/dqblk_qtree.h
-f:include/linux/dqblk_v1.h
-f:include/linux/dqblk_v2.h
-f:include/linux/drbd.h
-f:include/linux/drbd_config.h
-f:include/linux/drbd_genl.h
-f:include/linux/drbd_genl_api.h
-f:include/linux/drbd_limits.h
-f:include/linux/ds2782_battery.h
-f:include/linux/dsa/8021q.h
-f:include/linux/dsa/brcm.h
-f:include/linux/dsa/ksz_common.h
-f:include/linux/dsa/lan9303.h
-f:include/linux/dsa/loop.h
-f:include/linux/dsa/mv88e6xxx.h
-f:include/linux/dsa/ocelot.h
-f:include/linux/dsa/sja1105.h
-f:include/linux/dsa/tag_qca.h
-f:include/linux/dtlk.h
-f:include/linux/dtpm.h
-f:include/linux/dw_apb_timer.h
-f:include/linux/dynamic_debug.h
-f:include/linux/dynamic_queue_limits.h
-f:include/linux/earlycpio.h
-f:include/linux/ecryptfs.h
-f:include/linux/edac.h
-f:include/linux/edd.h
-f:include/linux/eeprom_93cx6.h
-f:include/linux/efi-bgrt.h
-f:include/linux/efi.h
-f:include/linux/efi_embedded_fw.h
-f:include/linux/efs_vh.h
-f:include/linux/eisa.h
-f:include/linux/elf-fdpic.h
-f:include/linux/elf-randomize.h
-f:include/linux/elf.h
-f:include/linux/elfcore-compat.h
-f:include/linux/elfcore.h
-f:include/linux/elfnote-lto.h
-f:include/linux/elfnote.h
-f:include/linux/enclosure.h
-f:include/linux/energy_model.h
-f:include/linux/entry-common.h
-f:include/linux/entry-kvm.h
-f:include/linux/err.h
-f:include/linux/errname.h
-f:include/linux/errno.h
-f:include/linux/error-injection.h
-f:include/linux/errqueue.h
-f:include/linux/errseq.h
-f:include/linux/etherdevice.h
-f:include/linux/ethtool.h
-f:include/linux/ethtool_netlink.h
-f:include/linux/eventfd.h
-f:include/linux/eventpoll.h
-f:include/linux/evm.h
-f:include/linux/execmem.h
-f:include/linux/export-internal.h
-f:include/linux/export.h
-f:include/linux/exportfs.h
-f:include/linux/ext2_fs.h
-f:include/linux/extable.h
-f:include/linux/extcon-provider.h
-f:include/linux/extcon.h
-f:include/linux/extcon/extcon-adc-jack.h
-f:include/linux/f2fs_fs.h
-f:include/linux/f75375s.h
-f:include/linux/falloc.h
-f:include/linux/fanotify.h
-f:include/linux/fault-inject-usercopy.h
-f:include/linux/fault-inject.h
-f:include/linux/fb.h
-f:include/linux/fbcon.h
-f:include/linux/fcdevice.h
-f:include/linux/fcntl.h
-f:include/linux/fd.h
-f:include/linux/fddidevice.h
-f:include/linux/fdtable.h
-f:include/linux/fec.h
-f:include/linux/fiemap.h
-f:include/linux/file.h
-f:include/linux/file_ref.h
-f:include/linux/fileattr.h
-f:include/linux/filelock.h
-f:include/linux/filter.h
-f:include/linux/find.h
-f:include/linux/fips.h
-f:include/linux/firewire.h
-f:include/linux/firmware-map.h
-f:include/linux/firmware.h
-f:include/linux/firmware/broadcom/tee_bnxt_fw.h
-f:include/linux/firmware/cirrus/cs_dsp.h
-f:include/linux/firmware/cirrus/cs_dsp_test_utils.h
-f:include/linux/firmware/cirrus/wmfw.h
-f:include/linux/firmware/imx/dsp.h
-f:include/linux/firmware/imx/ipc.h
-f:include/linux/firmware/imx/s4.h
-f:include/linux/firmware/imx/sci.h
-f:include/linux/firmware/imx/sm.h
-f:include/linux/firmware/imx/svc/misc.h
-f:include/linux/firmware/imx/svc/pm.h
-f:include/linux/firmware/imx/svc/rm.h
-f:include/linux/firmware/intel/stratix10-smc.h
-f:include/linux/firmware/intel/stratix10-svc-client.h
-f:include/linux/firmware/mediatek/mtk-adsp-ipc.h
-f:include/linux/firmware/meson/meson_sm.h
-f:include/linux/firmware/qcom/qcom_qseecom.h
-f:include/linux/firmware/qcom/qcom_scm.h
-f:include/linux/firmware/qcom/qcom_tzmem.h
-f:include/linux/firmware/samsung/exynos-acpm-protocol.h
-f:include/linux/firmware/thead/thead,th1520-aon.h
-f:include/linux/firmware/trusted_foundations.h
-f:include/linux/firmware/xlnx-event-manager.h
-f:include/linux/firmware/xlnx-zynqmp.h
-f:include/linux/fixp-arith.h
-f:include/linux/flat.h
-f:include/linux/flex_proportions.h
-f:include/linux/folio_queue.h
-f:include/linux/font.h
-f:include/linux/fortify-string.h
-f:include/linux/fpga/altera-pr-ip-core.h
-f:include/linux/fpga/fpga-bridge.h
-f:include/linux/fpga/fpga-mgr.h
-f:include/linux/fpga/fpga-region.h
-f:include/linux/fprobe.h
-f:include/linux/fpu.h
-f:include/linux/framer/framer-provider.h
-f:include/linux/framer/framer.h
-f:include/linux/framer/pef2256.h
-f:include/linux/freezer.h
-f:include/linux/fs.h
-f:include/linux/fs_api.h
-f:include/linux/fs_context.h
-f:include/linux/fs_parser.h
-f:include/linux/fs_pin.h
-f:include/linux/fs_stack.h
-f:include/linux/fs_struct.h
-f:include/linux/fs_types.h
-f:include/linux/fscache-cache.h
-f:include/linux/fscache.h
-f:include/linux/fscrypt.h
-f:include/linux/fsi-occ.h
-f:include/linux/fsi-sbefifo.h
-f:include/linux/fsi.h
-f:include/linux/fsl-diu-fb.h
-f:include/linux/fsl/bestcomm/ata.h
-f:include/linux/fsl/bestcomm/bestcomm.h
-f:include/linux/fsl/bestcomm/bestcomm_priv.h
-f:include/linux/fsl/bestcomm/fec.h
-f:include/linux/fsl/bestcomm/gen_bd.h
-f:include/linux/fsl/bestcomm/sram.h
-f:include/linux/fsl/edac.h
-f:include/linux/fsl/enetc_mdio.h
-f:include/linux/fsl/ftm.h
-f:include/linux/fsl/guts.h
-f:include/linux/fsl/mc.h
-f:include/linux/fsl/netc_global.h
-f:include/linux/fsl/ntmp.h
-f:include/linux/fsl/ptp_qoriq.h
-f:include/linux/fsl_devices.h
-f:include/linux/fsl_hypervisor.h
-f:include/linux/fsl_ifc.h
-f:include/linux/fsldma.h
-f:include/linux/fsnotify.h
-f:include/linux/fsnotify_backend.h
-f:include/linux/fsverity.h
-f:include/linux/ftrace.h
-f:include/linux/ftrace_irq.h
-f:include/linux/ftrace_regs.h
-f:include/linux/futex.h
-f:include/linux/fw_table.h
-f:include/linux/fwctl.h
-f:include/linux/fwnode.h
-f:include/linux/fwnode_mdio.h
-f:include/linux/gameport.h
-f:include/linux/gcd.h
-f:include/linux/genalloc.h
-f:include/linux/generic-radix-tree.h
-f:include/linux/genl_magic_func.h
-f:include/linux/genl_magic_struct.h
-f:include/linux/getcpu.h
-f:include/linux/gfp.h
-f:include/linux/gfp_api.h
-f:include/linux/gfp_types.h
-f:include/linux/glob.h
-f:include/linux/gnss.h
-f:include/linux/goldfish.h
-f:include/linux/gpio-pxa.h
-f:include/linux/gpio.h
-f:include/linux/gpio/aspeed.h
-f:include/linux/gpio/consumer.h
-f:include/linux/gpio/driver.h
-f:include/linux/gpio/generic.h
-f:include/linux/gpio/gpio-nomadik.h
-f:include/linux/gpio/gpio-reg.h
-f:include/linux/gpio/legacy-of-mm-gpiochip.h
-f:include/linux/gpio/machine.h
-f:include/linux/gpio/property.h
-f:include/linux/gpio/regmap.h
-f:include/linux/gpio_keys.h
-f:include/linux/greybus.h
-f:include/linux/greybus/bundle.h
-f:include/linux/greybus/connection.h
-f:include/linux/greybus/control.h
-f:include/linux/greybus/greybus_id.h
-f:include/linux/greybus/greybus_manifest.h
-f:include/linux/greybus/greybus_protocols.h
-f:include/linux/greybus/hd.h
-f:include/linux/greybus/interface.h
-f:include/linux/greybus/manifest.h
-f:include/linux/greybus/module.h
-f:include/linux/greybus/operation.h
-f:include/linux/greybus/svc.h
-f:include/linux/group_cpus.h
-f:include/linux/habanalabs/cpucp_if.h
-f:include/linux/habanalabs/hl_boot_if.h
-f:include/linux/hardirq.h
-f:include/linux/hash.h
-f:include/linux/hashtable.h
-f:include/linux/hashtable_api.h
-f:include/linux/hdlc.h
-f:include/linux/hdlcdrv.h
-f:include/linux/hdmi.h
-f:include/linux/hex.h
-f:include/linux/hid-debug.h
-f:include/linux/hid-over-i2c.h
-f:include/linux/hid-over-spi.h
-f:include/linux/hid-roccat.h
-f:include/linux/hid-sensor-hub.h
-f:include/linux/hid-sensor-ids.h
-f:include/linux/hid.h
-f:include/linux/hid_bpf.h
-f:include/linux/hidden.h
-f:include/linux/hiddev.h
-f:include/linux/hidraw.h
-f:include/linux/highmem-internal.h
-f:include/linux/highmem.h
-f:include/linux/highuid.h
-f:include/linux/hil.h
-f:include/linux/hil_mlc.h
-f:include/linux/hippidevice.h
-f:include/linux/hisi_acc_qm.h
-f:include/linux/hmm-dma.h
-f:include/linux/hmm.h
-f:include/linux/host1x.h
-f:include/linux/host1x_context_bus.h
-f:include/linux/hp_sdc.h
-f:include/linux/hpet.h
-f:include/linux/hrtimer.h
-f:include/linux/hrtimer_api.h
-f:include/linux/hrtimer_defs.h
-f:include/linux/hrtimer_types.h
-f:include/linux/hsi/hsi.h
-f:include/linux/hsi/ssi_protocol.h
-f:include/linux/hte.h
-f:include/linux/huge_mm.h
-f:include/linux/hugetlb.h
-f:include/linux/hugetlb_cgroup.h
-f:include/linux/hugetlb_inline.h
-f:include/linux/hung_task.h
-f:include/linux/hw_breakpoint.h
-f:include/linux/hw_random.h
-f:include/linux/hwmon-sysfs.h
-f:include/linux/hwmon-vid.h
-f:include/linux/hwmon.h
-f:include/linux/hwspinlock.h
-f:include/linux/hyperv.h
-f:include/linux/hypervisor.h
-f:include/linux/i2c-algo-bit.h
-f:include/linux/i2c-algo-pca.h
-f:include/linux/i2c-algo-pcf.h
-f:include/linux/i2c-atr.h
-f:include/linux/i2c-dev.h
-f:include/linux/i2c-mux.h
-f:include/linux/i2c-of-prober.h
-f:include/linux/i2c-smbus.h
-f:include/linux/i2c.h
-f:include/linux/i3c/ccc.h
-f:include/linux/i3c/device.h
-f:include/linux/i3c/master.h
-f:include/linux/i8042.h
-f:include/linux/i8253.h
-f:include/linux/i8254.h
-f:include/linux/icmp.h
-f:include/linux/icmpv6.h
-f:include/linux/idle_inject.h
-f:include/linux/idr.h
-f:include/linux/ieee80211.h
-f:include/linux/ieee802154.h
-f:include/linux/if_arp.h
-f:include/linux/if_bridge.h
-f:include/linux/if_eql.h
-f:include/linux/if_ether.h
-f:include/linux/if_fddi.h
-f:include/linux/if_hsr.h
-f:include/linux/if_link.h
-f:include/linux/if_macvlan.h
-f:include/linux/if_phonet.h
-f:include/linux/if_pppol2tp.h
-f:include/linux/if_pppox.h
-f:include/linux/if_rmnet.h
-f:include/linux/if_tap.h
-f:include/linux/if_team.h
-f:include/linux/if_tun.h
-f:include/linux/if_tunnel.h
-f:include/linux/if_vlan.h
-f:include/linux/igmp.h
-f:include/linux/ihex.h
-f:include/linux/iio/accel/kxcjk_1013.h
-f:include/linux/iio/adc-helpers.h
-f:include/linux/iio/adc/ad_sigma_delta.h
-f:include/linux/iio/adc/qcom-vadc-common.h
-f:include/linux/iio/adc/stm32-dfsdm-adc.h
-f:include/linux/iio/afe/rescale.h
-f:include/linux/iio/backend.h
-f:include/linux/iio/buffer-dma.h
-f:include/linux/iio/buffer-dmaengine.h
-f:include/linux/iio/buffer.h
-f:include/linux/iio/buffer_impl.h
-f:include/linux/iio/common/cros_ec_sensors_core.h
-f:include/linux/iio/common/inv_sensors_timestamp.h
-f:include/linux/iio/common/ssp_sensors.h
-f:include/linux/iio/common/st_sensors.h
-f:include/linux/iio/common/st_sensors_i2c.h
-f:include/linux/iio/common/st_sensors_spi.h
-f:include/linux/iio/configfs.h
-f:include/linux/iio/consumer.h
-f:include/linux/iio/dac/ad5421.h
-f:include/linux/iio/dac/ad5504.h
-f:include/linux/iio/dac/ad5791.h
-f:include/linux/iio/dac/max517.h
-f:include/linux/iio/dac/mcp4725.h
-f:include/linux/iio/driver.h
-f:include/linux/iio/events.h
-f:include/linux/iio/frequency/ad9523.h
-f:include/linux/iio/frequency/adf4350.h
-f:include/linux/iio/gyro/itg3200.h
-f:include/linux/iio/hw-consumer.h
-f:include/linux/iio/iio-gts-helper.h
-f:include/linux/iio/iio-opaque.h
-f:include/linux/iio/iio.h
-f:include/linux/iio/imu/adis.h
-f:include/linux/iio/kfifo_buf.h
-f:include/linux/iio/machine.h
-f:include/linux/iio/sw_device.h
-f:include/linux/iio/sw_trigger.h
-f:include/linux/iio/sysfs.h
-f:include/linux/iio/timer/stm32-lptim-trigger.h
-f:include/linux/iio/timer/stm32-timer-trigger.h
-f:include/linux/iio/trigger.h
-f:include/linux/iio/trigger_consumer.h
-f:include/linux/iio/triggered_buffer.h
-f:include/linux/iio/triggered_event.h
-f:include/linux/iio/types.h
-f:include/linux/ima.h
-f:include/linux/imx-media.h
-f:include/linux/in.h
-f:include/linux/in6.h
-f:include/linux/indirect_call_wrapper.h
-f:include/linux/inet.h
-f:include/linux/inet_diag.h
-f:include/linux/inetdevice.h
-f:include/linux/init.h
-f:include/linux/init_ohci1394_dma.h
-f:include/linux/init_syscalls.h
-f:include/linux/init_task.h
-f:include/linux/initrd.h
-f:include/linux/inotify.h
-f:include/linux/input.h
-f:include/linux/input/ad714x.h
-f:include/linux/input/adp5589.h
-f:include/linux/input/adxl34x.h
-f:include/linux/input/as5011.h
-f:include/linux/input/cma3000.h
-f:include/linux/input/elan-i2c-ids.h
-f:include/linux/input/kxtj9.h
-f:include/linux/input/lm8333.h
-f:include/linux/input/matrix_keypad.h
-f:include/linux/input/mt.h
-f:include/linux/input/samsung-keypad.h
-f:include/linux/input/sh_keysc.h
-f:include/linux/input/sparse-keymap.h
-f:include/linux/input/touchscreen.h
-f:include/linux/input/tps6507x-ts.h
-f:include/linux/input/vivaldi-fmap.h
-f:include/linux/instruction_pointer.h
-f:include/linux/instrumentation.h
-f:include/linux/instrumented.h
-f:include/linux/int_log.h
-f:include/linux/integrity.h
-f:include/linux/intel-ish-client-if.h
-f:include/linux/intel_dg_nvm_aux.h
-f:include/linux/intel_pmt_features.h
-f:include/linux/intel_rapl.h
-f:include/linux/intel_tcc.h
-f:include/linux/intel_th.h
-f:include/linux/intel_tpmi.h
-f:include/linux/intel_vsec.h
-f:include/linux/interconnect-clk.h
-f:include/linux/interconnect-provider.h
-f:include/linux/interconnect.h
-f:include/linux/interrupt.h
-f:include/linux/interval_tree.h
-f:include/linux/interval_tree_generic.h
-f:include/linux/io-64-nonatomic-hi-lo.h
-f:include/linux/io-64-nonatomic-lo-hi.h
-f:include/linux/io-mapping.h
-f:include/linux/io-pgtable.h
-f:include/linux/io.h
-f:include/linux/io_uring.h
-f:include/linux/io_uring/cmd.h
-f:include/linux/io_uring/net.h
-f:include/linux/io_uring_types.h
-f:include/linux/ioam6.h
-f:include/linux/ioam6_genl.h
-f:include/linux/ioam6_iptunnel.h
-f:include/linux/iocontext.h
-f:include/linux/iomap.h
-f:include/linux/iommu-dma.h
-f:include/linux/iommu-helper.h
-f:include/linux/iommu.h
-f:include/linux/iommufd.h
-f:include/linux/iopoll.h
-f:include/linux/ioport.h
-f:include/linux/ioprio.h
-f:include/linux/ioremap.h
-f:include/linux/iosys-map.h
-f:include/linux/iov_iter.h
-f:include/linux/iova.h
-f:include/linux/iova_bitmap.h
-f:include/linux/ip.h
-f:include/linux/ipack.h
-f:include/linux/ipc.h
-f:include/linux/ipc_namespace.h
-f:include/linux/ipmi.h
-f:include/linux/ipmi_smi.h
-f:include/linux/ipv6.h
-f:include/linux/ipv6_route.h
-f:include/linux/irq-entry-common.h
-f:include/linux/irq.h
-f:include/linux/irq_poll.h
-f:include/linux/irq_sim.h
-f:include/linux/irq_work.h
-f:include/linux/irqbypass.h
-f:include/linux/irqchip.h
-f:include/linux/irqchip/arm-gic-common.h
-f:include/linux/irqchip/arm-gic-v3-prio.h
-f:include/linux/irqchip/arm-gic-v3.h
-f:include/linux/irqchip/arm-gic-v4.h
-f:include/linux/irqchip/arm-gic-v5.h
-f:include/linux/irqchip/arm-gic.h
-f:include/linux/irqchip/arm-vgic-info.h
-f:include/linux/irqchip/arm-vic.h
-f:include/linux/irqchip/chained_irq.h
-f:include/linux/irqchip/irq-bcm2836.h
-f:include/linux/irqchip/irq-madera.h
-f:include/linux/irqchip/irq-msi-lib.h
-f:include/linux/irqchip/irq-omap-intc.h
-f:include/linux/irqchip/irq-partition-percpu.h
-f:include/linux/irqchip/irq-renesas-rzv2h.h
-f:include/linux/irqchip/irq-sa11x0.h
-f:include/linux/irqchip/riscv-aplic.h
-f:include/linux/irqchip/riscv-imsic.h
-f:include/linux/irqchip/xtensa-mx.h
-f:include/linux/irqchip/xtensa-pic.h
-f:include/linux/irqdesc.h
-f:include/linux/irqdomain.h
-f:include/linux/irqdomain_defs.h
-f:include/linux/irqflags.h
-f:include/linux/irqflags_types.h
-f:include/linux/irqhandler.h
-f:include/linux/irqnr.h
-f:include/linux/irqreturn.h
-f:include/linux/isa-dma.h
-f:include/linux/isa.h
-f:include/linux/isapnp.h
-f:include/linux/iscsi_boot_sysfs.h
-f:include/linux/iscsi_ibft.h
-f:include/linux/isdn/capilli.h
-f:include/linux/isdn/capiutil.h
-f:include/linux/ism.h
-f:include/linux/iversion.h
-f:include/linux/jbd2.h
-f:include/linux/jhash.h
-f:include/linux/jiffies.h
-f:include/linux/journal-head.h
-f:include/linux/joystick.h
-f:include/linux/jump_label.h
-f:include/linux/jump_label_ratelimit.h
-f:include/linux/jz4740-adc.h
-f:include/linux/jz4780-nemc.h
-f:include/linux/kallsyms.h
-f:include/linux/kasan-checks.h
-f:include/linux/kasan-enabled.h
-f:include/linux/kasan-tags.h
-f:include/linux/kasan.h
-f:include/linux/kbd_diacr.h
-f:include/linux/kbd_kern.h
-f:include/linux/kbuild.h
-f:include/linux/kconfig.h
-f:include/linux/kcore.h
-f:include/linux/kcov.h
-f:include/linux/kcsan-checks.h
-f:include/linux/kcsan.h
-f:include/linux/kdb.h
-f:include/linux/kdebug.h
-f:include/linux/kdev_t.h
-f:include/linux/kern_levels.h
-f:include/linux/kernel-page-flags.h
-f:include/linux/kernel.h
-f:include/linux/kernel_read_file.h
-f:include/linux/kernel_stat.h
-f:include/linux/kernelcapi.h
-f:include/linux/kernfs.h
-f:include/linux/kexec.h
-f:include/linux/kexec_handover.h
-f:include/linux/key-type.h
-f:include/linux/key.h
-f:include/linux/keyboard.h
-f:include/linux/keyctl.h
-f:include/linux/kfence.h
-f:include/linux/kfifo.h
-f:include/linux/kgdb.h
-f:include/linux/khugepaged.h
-f:include/linux/klist.h
-f:include/linux/kmemleak.h
-f:include/linux/kmod.h
-f:include/linux/kmsan-checks.h
-f:include/linux/kmsan.h
-f:include/linux/kmsan_string.h
-f:include/linux/kmsan_types.h
-f:include/linux/kmsg_dump.h
-f:include/linux/kobj_map.h
-f:include/linux/kobject.h
-f:include/linux/kobject_api.h
-f:include/linux/kobject_ns.h
-f:include/linux/kprobes.h
-f:include/linux/kref.h
-f:include/linux/kref_api.h
-f:include/linux/ks0108.h
-f:include/linux/ks8842.h
-f:include/linux/ks8851_mll.h
-f:include/linux/ksm.h
-f:include/linux/kstack_erase.h
-f:include/linux/kstrtox.h
-f:include/linux/kthread.h
-f:include/linux/ktime.h
-f:include/linux/ktime_api.h
-f:include/linux/kvm_dirty_ring.h
-f:include/linux/kvm_host.h
-f:include/linux/kvm_irqfd.h
-f:include/linux/kvm_para.h
-f:include/linux/kvm_types.h
-f:include/linux/l2tp.h
-f:include/linux/lantiq.h
-f:include/linux/lapb.h
-f:include/linux/latencytop.h
-f:include/linux/lcd.h
-f:include/linux/lcm.h
-f:include/linux/led-class-flash.h
-f:include/linux/led-class-multicolor.h
-f:include/linux/led-lm3530.h
-f:include/linux/leds-bd2802.h
-f:include/linux/leds-expresswire.h
-f:include/linux/leds-lp3944.h
-f:include/linux/leds-lp3952.h
-f:include/linux/leds-pca9532.h
-f:include/linux/leds-regulator.h
-f:include/linux/leds-ti-lmu-common.h
-f:include/linux/leds.h
-f:include/linux/libata.h
-f:include/linux/libfdt.h
-f:include/linux/libfdt_env.h
-f:include/linux/libgcc.h
-f:include/linux/libnvdimm.h
-f:include/linux/libps2.h
-f:include/linux/license.h
-f:include/linux/limits.h
-f:include/linux/linear_range.h
-f:include/linux/linkage.h
-f:include/linux/linkmode.h
-f:include/linux/linux_logo.h
-f:include/linux/lis3lv02d.h
-f:include/linux/list.h
-f:include/linux/list_bl.h
-f:include/linux/list_lru.h
-f:include/linux/list_nulls.h
-f:include/linux/list_sort.h
-f:include/linux/litex.h
-f:include/linux/livepatch.h
-f:include/linux/livepatch_sched.h
-f:include/linux/llc.h
-f:include/linux/llist.h
-f:include/linux/llist_api.h
-f:include/linux/local_lock.h
-f:include/linux/local_lock_internal.h
-f:include/linux/lockd/bind.h
-f:include/linux/lockd/debug.h
-f:include/linux/lockd/lockd.h
-f:include/linux/lockd/nlm.h
-f:include/linux/lockd/share.h
-f:include/linux/lockd/xdr.h
-f:include/linux/lockd/xdr4.h
-f:include/linux/lockdep.h
-f:include/linux/lockdep_api.h
-f:include/linux/lockdep_types.h
-f:include/linux/lockref.h
-f:include/linux/log2.h
-f:include/linux/logic_iomem.h
-f:include/linux/logic_pio.h
-f:include/linux/lp.h
-f:include/linux/lru_cache.h
-f:include/linux/lsm/apparmor.h
-f:include/linux/lsm/bpf.h
-f:include/linux/lsm/selinux.h
-f:include/linux/lsm/smack.h
-f:include/linux/lsm_audit.h
-f:include/linux/lsm_count.h
-f:include/linux/lsm_hook_defs.h
-f:include/linux/lsm_hooks.h
-f:include/linux/lwq.h
-f:include/linux/lz4.h
-f:include/linux/lzo.h
-f:include/linux/mISDNdsp.h
-f:include/linux/mISDNhw.h
-f:include/linux/mISDNif.h
-f:include/linux/mailbox/arm_mhuv2_message.h
-f:include/linux/mailbox/brcm-message.h
-f:include/linux/mailbox/exynos-message.h
-f:include/linux/mailbox/mchp-ipc.h
-f:include/linux/mailbox/mtk-cmdq-mailbox.h
-f:include/linux/mailbox/zynqmp-ipi-message.h
-f:include/linux/mailbox_client.h
-f:include/linux/mailbox_controller.h
-f:include/linux/map_benchmark.h
-f:include/linux/maple.h
-f:include/linux/maple_tree.h
-f:include/linux/marvell_phy.h
-f:include/linux/math.h
-f:include/linux/math64.h
-f:include/linux/mbcache.h
-f:include/linux/mbus.h
-f:include/linux/mc146818rtc.h
-f:include/linux/mc33xs2410.h
-f:include/linux/mc6821.h
-f:include/linux/mcb.h
-f:include/linux/mdev.h
-f:include/linux/mdio-bitbang.h
-f:include/linux/mdio-gpio.h
-f:include/linux/mdio-mux.h
-f:include/linux/mdio.h
-f:include/linux/mdio/mdio-i2c.h
-f:include/linux/mdio/mdio-mscc-miim.h
-f:include/linux/mdio/mdio-regmap.h
-f:include/linux/mdio/mdio-xgene.h
-f:include/linux/mei_aux.h
-f:include/linux/mei_cl_bus.h
-f:include/linux/mem_encrypt.h
-f:include/linux/memblock.h
-f:include/linux/memcontrol.h
-f:include/linux/memfd.h
-f:include/linux/memory-tiers.h
-f:include/linux/memory.h
-f:include/linux/memory/ti-aemif.h
-f:include/linux/memory_hotplug.h
-f:include/linux/mempolicy.h
-f:include/linux/mempool.h
-f:include/linux/memregion.h
-f:include/linux/memremap.h
-f:include/linux/memstick.h
-f:include/linux/mfd/88pm80x.h
-f:include/linux/mfd/88pm860x.h
-f:include/linux/mfd/88pm886.h
-f:include/linux/mfd/aat2870.h
-f:include/linux/mfd/abx500.h
-f:include/linux/mfd/abx500/ab8500-codec.h
-f:include/linux/mfd/abx500/ab8500-sysctrl.h
-f:include/linux/mfd/abx500/ab8500.h
-f:include/linux/mfd/ac100.h
-f:include/linux/mfd/adp5520.h
-f:include/linux/mfd/adp5585.h
-f:include/linux/mfd/altera-a10sr.h
-f:include/linux/mfd/altera-sysmgr.h
-f:include/linux/mfd/arizona/core.h
-f:include/linux/mfd/arizona/pdata.h
-f:include/linux/mfd/arizona/registers.h
-f:include/linux/mfd/as3711.h
-f:include/linux/mfd/as3722.h
-f:include/linux/mfd/atc260x/atc2603c.h
-f:include/linux/mfd/atc260x/atc2609a.h
-f:include/linux/mfd/atc260x/core.h
-f:include/linux/mfd/atmel-hlcdc.h
-f:include/linux/mfd/axp20x.h
-f:include/linux/mfd/bcm2835-pm.h
-f:include/linux/mfd/bcm590xx.h
-f:include/linux/mfd/bd9571mwv.h
-f:include/linux/mfd/cgbc.h
-f:include/linux/mfd/core.h
-f:include/linux/mfd/cs40l50.h
-f:include/linux/mfd/cs42l43-regs.h
-f:include/linux/mfd/cs42l43.h
-f:include/linux/mfd/da8xx-cfgchip.h
-f:include/linux/mfd/da903x.h
-f:include/linux/mfd/da9052/da9052.h
-f:include/linux/mfd/da9052/pdata.h
-f:include/linux/mfd/da9052/reg.h
-f:include/linux/mfd/da9055/core.h
-f:include/linux/mfd/da9055/pdata.h
-f:include/linux/mfd/da9055/reg.h
-f:include/linux/mfd/da9062/core.h
-f:include/linux/mfd/da9062/registers.h
-f:include/linux/mfd/da9063/core.h
-f:include/linux/mfd/da9063/registers.h
-f:include/linux/mfd/da9150/core.h
-f:include/linux/mfd/da9150/registers.h
-f:include/linux/mfd/davinci_voicecodec.h
-f:include/linux/mfd/db8500-prcmu.h
-f:include/linux/mfd/dbx500-prcmu.h
-f:include/linux/mfd/dln2.h
-f:include/linux/mfd/ezx-pcap.h
-f:include/linux/mfd/gsc.h
-f:include/linux/mfd/hi6421-pmic.h
-f:include/linux/mfd/hi655x-pmic.h
-f:include/linux/mfd/idt82p33_reg.h
-f:include/linux/mfd/idt8a340_reg.h
-f:include/linux/mfd/idtRC38xxx_reg.h
-f:include/linux/mfd/imx25-tsadc.h
-f:include/linux/mfd/ingenic-tcu.h
-f:include/linux/mfd/intel-m10-bmc.h
-f:include/linux/mfd/intel_pmc_bxt.h
-f:include/linux/mfd/intel_soc_pmic.h
-f:include/linux/mfd/intel_soc_pmic_bxtwc.h
-f:include/linux/mfd/intel_soc_pmic_mrfld.h
-f:include/linux/mfd/ipaq-micro.h
-f:include/linux/mfd/iqs62x.h
-f:include/linux/mfd/janz.h
-f:include/linux/mfd/kempld.h
-f:include/linux/mfd/khadas-mcu.h
-f:include/linux/mfd/lm3533.h
-f:include/linux/mfd/lochnagar.h
-f:include/linux/mfd/lochnagar1_regs.h
-f:include/linux/mfd/lochnagar2_regs.h
-f:include/linux/mfd/lp3943.h
-f:include/linux/mfd/lp873x.h
-f:include/linux/mfd/lp87565.h
-f:include/linux/mfd/lp8788-isink.h
-f:include/linux/mfd/lp8788.h
-f:include/linux/mfd/lpc_ich.h
-f:include/linux/mfd/macsmc.h
-f:include/linux/mfd/madera/core.h
-f:include/linux/mfd/madera/pdata.h
-f:include/linux/mfd/madera/registers.h
-f:include/linux/mfd/max14577-private.h
-f:include/linux/mfd/max14577.h
-f:include/linux/mfd/max5970.h
-f:include/linux/mfd/max77541.h
-f:include/linux/mfd/max77620.h
-f:include/linux/mfd/max77650.h
-f:include/linux/mfd/max77686-private.h
-f:include/linux/mfd/max77686.h
-f:include/linux/mfd/max77693-common.h
-f:include/linux/mfd/max77693-private.h
-f:include/linux/mfd/max77693.h
-f:include/linux/mfd/max77705-private.h
-f:include/linux/mfd/max77714.h
-f:include/linux/mfd/max77759.h
-f:include/linux/mfd/max77843-private.h
-f:include/linux/mfd/max8907.h
-f:include/linux/mfd/max8925.h
-f:include/linux/mfd/max8997-private.h
-f:include/linux/mfd/max8997.h
-f:include/linux/mfd/max8998-private.h
-f:include/linux/mfd/max8998.h
-f:include/linux/mfd/mc13783.h
-f:include/linux/mfd/mc13892.h
-f:include/linux/mfd/mc13xxx.h
-f:include/linux/mfd/mcp.h
-f:include/linux/mfd/menelaus.h
-f:include/linux/mfd/motorola-cpcap.h
-f:include/linux/mfd/mp2629.h
-f:include/linux/mfd/mt6323/core.h
-f:include/linux/mfd/mt6323/registers.h
-f:include/linux/mfd/mt6328/core.h
-f:include/linux/mfd/mt6328/registers.h
-f:include/linux/mfd/mt6331/core.h
-f:include/linux/mfd/mt6331/registers.h
-f:include/linux/mfd/mt6332/core.h
-f:include/linux/mfd/mt6332/registers.h
-f:include/linux/mfd/mt6357/core.h
-f:include/linux/mfd/mt6357/registers.h
-f:include/linux/mfd/mt6358/core.h
-f:include/linux/mfd/mt6358/registers.h
-f:include/linux/mfd/mt6359/core.h
-f:include/linux/mfd/mt6359/registers.h
-f:include/linux/mfd/mt6359p/registers.h
-f:include/linux/mfd/mt6397/core.h
-f:include/linux/mfd/mt6397/registers.h
-f:include/linux/mfd/mt6397/rtc.h
-f:include/linux/mfd/mxs-lradc.h
-f:include/linux/mfd/ntxec.h
-f:include/linux/mfd/ocelot.h
-f:include/linux/mfd/palmas.h
-f:include/linux/mfd/qcom_rpm.h
-f:include/linux/mfd/qnap-mcu.h
-f:include/linux/mfd/rave-sp.h
-f:include/linux/mfd/rc5t583.h
-f:include/linux/mfd/rdc321x.h
-f:include/linux/mfd/retu.h
-f:include/linux/mfd/rk808.h
-f:include/linux/mfd/rn5t618.h
-f:include/linux/mfd/rohm-bd71815.h
-f:include/linux/mfd/rohm-bd71828.h
-f:include/linux/mfd/rohm-bd718x7.h
-f:include/linux/mfd/rohm-bd957x.h
-f:include/linux/mfd/rohm-bd96801.h
-f:include/linux/mfd/rohm-bd96802.h
-f:include/linux/mfd/rohm-generic.h
-f:include/linux/mfd/rohm-shared.h
-f:include/linux/mfd/rsmu.h
-f:include/linux/mfd/rt5033-private.h
-f:include/linux/mfd/rt5033.h
-f:include/linux/mfd/rz-mtu3.h
-f:include/linux/mfd/samsung/core.h
-f:include/linux/mfd/samsung/irq.h
-f:include/linux/mfd/samsung/rtc.h
-f:include/linux/mfd/samsung/s2mpa01.h
-f:include/linux/mfd/samsung/s2mpg10.h
-f:include/linux/mfd/samsung/s2mps11.h
-f:include/linux/mfd/samsung/s2mps13.h
-f:include/linux/mfd/samsung/s2mps14.h
-f:include/linux/mfd/samsung/s2mps15.h
-f:include/linux/mfd/samsung/s2mpu02.h
-f:include/linux/mfd/samsung/s2mpu05.h
-f:include/linux/mfd/samsung/s5m8767.h
-f:include/linux/mfd/sc27xx-pmic.h
-f:include/linux/mfd/si476x-core.h
-f:include/linux/mfd/si476x-platform.h
-f:include/linux/mfd/si476x-reports.h
-f:include/linux/mfd/sky81452.h
-f:include/linux/mfd/stm32-lptimer.h
-f:include/linux/mfd/stm32-timers.h
-f:include/linux/mfd/stmfx.h
-f:include/linux/mfd/stmpe.h
-f:include/linux/mfd/stpmic1.h
-f:include/linux/mfd/stw481x.h
-f:include/linux/mfd/sun4i-gpadc.h
-f:include/linux/mfd/sy7636a.h
-f:include/linux/mfd/syscon.h
-f:include/linux/mfd/syscon/atmel-matrix.h
-f:include/linux/mfd/syscon/atmel-mc.h
-f:include/linux/mfd/syscon/atmel-smc.h
-f:include/linux/mfd/syscon/atmel-st.h
-f:include/linux/mfd/syscon/clps711x.h
-f:include/linux/mfd/syscon/imx6q-iomuxc-gpr.h
-f:include/linux/mfd/syscon/imx7-iomuxc-gpr.h
-f:include/linux/mfd/syscon/xlnx-vcu.h
-f:include/linux/mfd/tc3589x.h
-f:include/linux/mfd/ti-lmu-register.h
-f:include/linux/mfd/ti-lmu.h
-f:include/linux/mfd/ti_am335x_tscadc.h
-f:include/linux/mfd/tps6105x.h
-f:include/linux/mfd/tps65010.h
-f:include/linux/mfd/tps6507x.h
-f:include/linux/mfd/tps65086.h
-f:include/linux/mfd/tps65090.h
-f:include/linux/mfd/tps65217.h
-f:include/linux/mfd/tps65218.h
-f:include/linux/mfd/tps65219.h
-f:include/linux/mfd/tps6586x.h
-f:include/linux/mfd/tps65910.h
-f:include/linux/mfd/tps65912.h
-f:include/linux/mfd/tps6594.h
-f:include/linux/mfd/tps68470.h
-f:include/linux/mfd/twl.h
-f:include/linux/mfd/twl4030-audio.h
-f:include/linux/mfd/twl6040.h
-f:include/linux/mfd/ucb1x00.h
-f:include/linux/mfd/upboard-fpga.h
-f:include/linux/mfd/viperboard.h
-f:include/linux/mfd/wcd934x/registers.h
-f:include/linux/mfd/wcd934x/wcd934x.h
-f:include/linux/mfd/wl1273-core.h
-f:include/linux/mfd/wm831x/auxadc.h
-f:include/linux/mfd/wm831x/core.h
-f:include/linux/mfd/wm831x/gpio.h
-f:include/linux/mfd/wm831x/irq.h
-f:include/linux/mfd/wm831x/otp.h
-f:include/linux/mfd/wm831x/pdata.h
-f:include/linux/mfd/wm831x/pmu.h
-f:include/linux/mfd/wm831x/regulator.h
-f:include/linux/mfd/wm831x/status.h
-f:include/linux/mfd/wm831x/watchdog.h
-f:include/linux/mfd/wm8350/audio.h
-f:include/linux/mfd/wm8350/comparator.h
-f:include/linux/mfd/wm8350/core.h
-f:include/linux/mfd/wm8350/gpio.h
-f:include/linux/mfd/wm8350/pmic.h
-f:include/linux/mfd/wm8350/rtc.h
-f:include/linux/mfd/wm8350/supply.h
-f:include/linux/mfd/wm8350/wdt.h
-f:include/linux/mfd/wm8400-audio.h
-f:include/linux/mfd/wm8400-private.h
-f:include/linux/mfd/wm8400.h
-f:include/linux/mfd/wm8994/core.h
-f:include/linux/mfd/wm8994/gpio.h
-f:include/linux/mfd/wm8994/pdata.h
-f:include/linux/mfd/wm8994/registers.h
-f:include/linux/mfd/wm97xx.h
-f:include/linux/mhi.h
-f:include/linux/mhi_ep.h
-f:include/linux/micrel_phy.h
-f:include/linux/microchipphy.h
-f:include/linux/migrate.h
-f:include/linux/migrate_mode.h
-f:include/linux/mii.h
-f:include/linux/mii_timestamper.h
-f:include/linux/min_heap.h
-f:include/linux/minmax.h
-f:include/linux/misc/keba.h
-f:include/linux/misc_cgroup.h
-f:include/linux/miscdevice.h
-f:include/linux/mlx4/cmd.h
-f:include/linux/mlx4/cq.h
-f:include/linux/mlx4/device.h
-f:include/linux/mlx4/doorbell.h
-f:include/linux/mlx4/driver.h
-f:include/linux/mlx4/qp.h
-f:include/linux/mlx4/srq.h
-f:include/linux/mlx5/cq.h
-f:include/linux/mlx5/device.h
-f:include/linux/mlx5/doorbell.h
-f:include/linux/mlx5/driver.h
-f:include/linux/mlx5/eq.h
-f:include/linux/mlx5/eswitch.h
-f:include/linux/mlx5/fs.h
-f:include/linux/mlx5/fs_helpers.h
-f:include/linux/mlx5/macsec.h
-f:include/linux/mlx5/mlx5_ifc.h
-f:include/linux/mlx5/mlx5_ifc_fpga.h
-f:include/linux/mlx5/mlx5_ifc_vdpa.h
-f:include/linux/mlx5/mpfs.h
-f:include/linux/mlx5/port.h
-f:include/linux/mlx5/qp.h
-f:include/linux/mlx5/rsc_dump.h
-f:include/linux/mlx5/transobj.h
-f:include/linux/mlx5/vport.h
-f:include/linux/mm.h
-f:include/linux/mm_api.h
-f:include/linux/mm_inline.h
-f:include/linux/mm_types.h
-f:include/linux/mm_types_task.h
-f:include/linux/mman.h
-f:include/linux/mmap_lock.h
-f:include/linux/mmc/card.h
-f:include/linux/mmc/core.h
-f:include/linux/mmc/host.h
-f:include/linux/mmc/mmc.h
-f:include/linux/mmc/pm.h
-f:include/linux/mmc/sd.h
-f:include/linux/mmc/sd_uhs2.h
-f:include/linux/mmc/sdio.h
-f:include/linux/mmc/sdio_func.h
-f:include/linux/mmc/sdio_ids.h
-f:include/linux/mmc/slot-gpio.h
-f:include/linux/mmdebug.h
-f:include/linux/mmiotrace.h
-f:include/linux/mmu_context.h
-f:include/linux/mmu_notifier.h
-f:include/linux/mmzone.h
-f:include/linux/mnt_idmapping.h
-f:include/linux/mnt_namespace.h
-f:include/linux/mod_devicetable.h
-f:include/linux/module.h
-f:include/linux/module_signature.h
-f:include/linux/module_symbol.h
-f:include/linux/moduleloader.h
-f:include/linux/moduleparam.h
-f:include/linux/most.h
-f:include/linux/mount.h
-f:include/linux/moxtet.h
-f:include/linux/mpage.h
-f:include/linux/mpi.h
-f:include/linux/mpls.h
-f:include/linux/mpls_iptunnel.h
-f:include/linux/mroute.h
-f:include/linux/mroute6.h
-f:include/linux/mroute_base.h
-f:include/linux/msdos_fs.h
-f:include/linux/msdos_partition.h
-f:include/linux/msg.h
-f:include/linux/msi.h
-f:include/linux/msi_api.h
-f:include/linux/mtd/bbm.h
-f:include/linux/mtd/blktrans.h
-f:include/linux/mtd/cfi.h
-f:include/linux/mtd/cfi_endian.h
-f:include/linux/mtd/concat.h
-f:include/linux/mtd/doc2000.h
-f:include/linux/mtd/flashchip.h
-f:include/linux/mtd/ftl.h
-f:include/linux/mtd/gen_probe.h
-f:include/linux/mtd/hyperbus.h
-f:include/linux/mtd/inftl.h
-f:include/linux/mtd/jedec.h
-f:include/linux/mtd/lpc32xx_mlc.h
-f:include/linux/mtd/lpc32xx_slc.h
-f:include/linux/mtd/map.h
-f:include/linux/mtd/mtd.h
-f:include/linux/mtd/mtdram.h
-f:include/linux/mtd/nand-ecc-mtk.h
-f:include/linux/mtd/nand-ecc-mxic.h
-f:include/linux/mtd/nand-ecc-sw-bch.h
-f:include/linux/mtd/nand-ecc-sw-hamming.h
-f:include/linux/mtd/nand-gpio.h
-f:include/linux/mtd/nand-qpic-common.h
-f:include/linux/mtd/nand.h
-f:include/linux/mtd/ndfc.h
-f:include/linux/mtd/nftl.h
-f:include/linux/mtd/onenand.h
-f:include/linux/mtd/onenand_regs.h
-f:include/linux/mtd/onfi.h
-f:include/linux/mtd/partitions.h
-f:include/linux/mtd/pfow.h
-f:include/linux/mtd/physmap.h
-f:include/linux/mtd/pismo.h
-f:include/linux/mtd/plat-ram.h
-f:include/linux/mtd/platnand.h
-f:include/linux/mtd/qinfo.h
-f:include/linux/mtd/rawnand.h
-f:include/linux/mtd/sh_flctl.h
-f:include/linux/mtd/sharpsl.h
-f:include/linux/mtd/spear_smi.h
-f:include/linux/mtd/spi-nor.h
-f:include/linux/mtd/spinand.h
-f:include/linux/mtd/super.h
-f:include/linux/mtd/ubi.h
-f:include/linux/mtd/xip.h
-f:include/linux/mtio.h
-f:include/linux/mutex.h
-f:include/linux/mutex_api.h
-f:include/linux/mutex_types.h
-f:include/linux/mux/consumer.h
-f:include/linux/mux/driver.h
-f:include/linux/mv643xx_eth.h
-f:include/linux/mv643xx_i2c.h
-f:include/linux/mvebu-pmsu.h
-f:include/linux/mxm-wmi.h
-f:include/linux/namei.h
-f:include/linux/nd.h
-f:include/linux/ndctl.h
-f:include/linux/net.h
-f:include/linux/net/intel/i40e_client.h
-f:include/linux/net/intel/iidc_rdma.h
-f:include/linux/net/intel/iidc_rdma_ice.h
-f:include/linux/net/intel/iidc_rdma_idpf.h
-f:include/linux/net/intel/libie/adminq.h
-f:include/linux/net/intel/libie/pctype.h
-f:include/linux/net/intel/libie/rx.h
-f:include/linux/net_tstamp.h
-f:include/linux/netdev_features.h
-f:include/linux/netdevice.h
-f:include/linux/netdevice_xmit.h
-f:include/linux/netfilter.h
-f:include/linux/netfilter/ipset/ip_set.h
-f:include/linux/netfilter/ipset/ip_set_bitmap.h
-f:include/linux/netfilter/ipset/ip_set_getport.h
-f:include/linux/netfilter/ipset/ip_set_hash.h
-f:include/linux/netfilter/ipset/ip_set_list.h
-f:include/linux/netfilter/ipset/pfxlen.h
-f:include/linux/netfilter/nf_conntrack_amanda.h
-f:include/linux/netfilter/nf_conntrack_common.h
-f:include/linux/netfilter/nf_conntrack_ftp.h
-f:include/linux/netfilter/nf_conntrack_h323.h
-f:include/linux/netfilter/nf_conntrack_h323_asn1.h
-f:include/linux/netfilter/nf_conntrack_h323_types.h
-f:include/linux/netfilter/nf_conntrack_irc.h
-f:include/linux/netfilter/nf_conntrack_pptp.h
-f:include/linux/netfilter/nf_conntrack_proto_gre.h
-f:include/linux/netfilter/nf_conntrack_sane.h
-f:include/linux/netfilter/nf_conntrack_sctp.h
-f:include/linux/netfilter/nf_conntrack_sip.h
-f:include/linux/netfilter/nf_conntrack_snmp.h
-f:include/linux/netfilter/nf_conntrack_tcp.h
-f:include/linux/netfilter/nf_conntrack_tftp.h
-f:include/linux/netfilter/nf_conntrack_zones_common.h
-f:include/linux/netfilter/nfnetlink.h
-f:include/linux/netfilter/nfnetlink_acct.h
-f:include/linux/netfilter/nfnetlink_osf.h
-f:include/linux/netfilter/x_tables.h
-f:include/linux/netfilter_arp/arp_tables.h
-f:include/linux/netfilter_bridge.h
-f:include/linux/netfilter_bridge/ebtables.h
-f:include/linux/netfilter_defs.h
-f:include/linux/netfilter_ipv4.h
-f:include/linux/netfilter_ipv4/ip_tables.h
-f:include/linux/netfilter_ipv6.h
-f:include/linux/netfilter_ipv6/ip6_tables.h
-f:include/linux/netfilter_netdev.h
-f:include/linux/netfs.h
-f:include/linux/netlink.h
-f:include/linux/netpoll.h
-f:include/linux/nfs.h
-f:include/linux/nfs3.h
-f:include/linux/nfs4.h
-f:include/linux/nfs_common.h
-f:include/linux/nfs_fs.h
-f:include/linux/nfs_fs_i.h
-f:include/linux/nfs_fs_sb.h
-f:include/linux/nfs_iostat.h
-f:include/linux/nfs_page.h
-f:include/linux/nfs_ssc.h
-f:include/linux/nfs_xdr.h
-f:include/linux/nfsacl.h
-f:include/linux/nfslocalio.h
-f:include/linux/nitro_enclaves.h
-f:include/linux/nl802154.h
-f:include/linux/nls.h
-f:include/linux/nmi.h
-f:include/linux/node.h
-f:include/linux/nodemask.h
-f:include/linux/nodemask_types.h
-f:include/linux/nospec.h
-f:include/linux/notifier.h
-f:include/linux/ns_common.h
-f:include/linux/nsc_gpio.h
-f:include/linux/nsproxy.h
-f:include/linux/ntb.h
-f:include/linux/ntb_transport.h
-f:include/linux/nubus.h
-f:include/linux/numa.h
-f:include/linux/numa_memblks.h
-f:include/linux/nvme-auth.h
-f:include/linux/nvme-fc-driver.h
-f:include/linux/nvme-fc.h
-f:include/linux/nvme-keyring.h
-f:include/linux/nvme-rdma.h
-f:include/linux/nvme-tcp.h
-f:include/linux/nvme.h
-f:include/linux/nvmem-consumer.h
-f:include/linux/nvmem-provider.h
-f:include/linux/nvram.h
-f:include/linux/oa_tc6.h
-f:include/linux/objagg.h
-f:include/linux/objpool.h
-f:include/linux/objtool.h
-f:include/linux/objtool_types.h
-f:include/linux/of.h
-f:include/linux/of_address.h
-f:include/linux/of_clk.h
-f:include/linux/of_device.h
-f:include/linux/of_dma.h
-f:include/linux/of_fdt.h
-f:include/linux/of_gpio.h
-f:include/linux/of_graph.h
-f:include/linux/of_iommu.h
-f:include/linux/of_irq.h
-f:include/linux/of_mdio.h
-f:include/linux/of_net.h
-f:include/linux/of_pci.h
-f:include/linux/of_pdt.h
-f:include/linux/of_platform.h
-f:include/linux/of_reserved_mem.h
-f:include/linux/oid_registry.h
-f:include/linux/olpc-ec.h
-f:include/linux/omap-dma.h
-f:include/linux/omap-gpmc.h
-f:include/linux/omap-iommu.h
-f:include/linux/omap-mailbox.h
-f:include/linux/omapfb.h
-f:include/linux/once.h
-f:include/linux/once_lite.h
-f:include/linux/oom.h
-f:include/linux/openvswitch.h
-f:include/linux/osq_lock.h
-f:include/linux/overflow.h
-f:include/linux/packing.h
-f:include/linux/padata.h
-f:include/linux/page-flags-layout.h
-f:include/linux/page-flags.h
-f:include/linux/page-isolation.h
-f:include/linux/page_counter.h
-f:include/linux/page_ext.h
-f:include/linux/page_frag_cache.h
-f:include/linux/page_idle.h
-f:include/linux/page_owner.h
-f:include/linux/page_ref.h
-f:include/linux/page_reporting.h
-f:include/linux/page_table_check.h
-f:include/linux/pageblock-flags.h
-f:include/linux/pagemap.h
-f:include/linux/pagevec.h
-f:include/linux/pagewalk.h
-f:include/linux/panic.h
-f:include/linux/panic_notifier.h
-f:include/linux/papr_scm.h
-f:include/linux/parman.h
-f:include/linux/parport.h
-f:include/linux/parport_pc.h
-f:include/linux/parser.h
-f:include/linux/part_stat.h
-f:include/linux/pata_arasan_cf_data.h
-f:include/linux/patchkey.h
-f:include/linux/path.h
-f:include/linux/pch_dma.h
-f:include/linux/pci-acpi.h
-f:include/linux/pci-ats.h
-f:include/linux/pci-bwctrl.h
-f:include/linux/pci-doe.h
-f:include/linux/pci-ecam.h
-f:include/linux/pci-ep-cfs.h
-f:include/linux/pci-epc.h
-f:include/linux/pci-epf.h
-f:include/linux/pci-p2pdma.h
-f:include/linux/pci-pwrctrl.h
-f:include/linux/pci-tph.h
-f:include/linux/pci.h
-f:include/linux/pci_hotplug.h
-f:include/linux/pci_ids.h
-f:include/linux/pcie-dwc.h
-f:include/linux/pcs-lynx.h
-f:include/linux/pcs-rzn1-miic.h
-f:include/linux/pcs/pcs-mtk-lynxi.h
-f:include/linux/pcs/pcs-xpcs.h
-f:include/linux/pds/pds_adminq.h
-f:include/linux/pds/pds_auxbus.h
-f:include/linux/pds/pds_common.h
-f:include/linux/pds/pds_core_if.h
-f:include/linux/pds/pds_intr.h
-f:include/linux/pe.h
-f:include/linux/peci-cpu.h
-f:include/linux/peci.h
-f:include/linux/percpu-defs.h
-f:include/linux/percpu-refcount.h
-f:include/linux/percpu-rwsem.h
-f:include/linux/percpu.h
-f:include/linux/percpu_counter.h
-f:include/linux/perf/arm_pmu.h
-f:include/linux/perf/arm_pmuv3.h
-f:include/linux/perf/riscv_pmu.h
-f:include/linux/perf_event.h
-f:include/linux/perf_event_api.h
-f:include/linux/perf_regs.h
-f:include/linux/personality.h
-f:include/linux/pfn.h
-f:include/linux/pgalloc_tag.h
-f:include/linux/pgtable.h
-f:include/linux/pgtable_api.h
-f:include/linux/phonet.h
-f:include/linux/phy.h
-f:include/linux/phy/omap_control_phy.h
-f:include/linux/phy/omap_usb.h
-f:include/linux/phy/pcie.h
-f:include/linux/phy/phy-dp.h
-f:include/linux/phy/phy-hdmi.h
-f:include/linux/phy/phy-lvds.h
-f:include/linux/phy/phy-mipi-dphy.h
-f:include/linux/phy/phy-sun4i-usb.h
-f:include/linux/phy/phy.h
-f:include/linux/phy/tegra/xusb.h
-f:include/linux/phy/ulpi_phy.h
-f:include/linux/phy_fixed.h
-f:include/linux/phy_led_triggers.h
-f:include/linux/phy_link_topology.h
-f:include/linux/phylib_stubs.h
-f:include/linux/phylink.h
-f:include/linux/pid.h
-f:include/linux/pid_namespace.h
-f:include/linux/pid_types.h
-f:include/linux/pidfs.h
-f:include/linux/pim.h
-f:include/linux/pinctrl/consumer.h
-f:include/linux/pinctrl/devinfo.h
-f:include/linux/pinctrl/machine.h
-f:include/linux/pinctrl/pinconf-generic.h
-f:include/linux/pinctrl/pinconf.h
-f:include/linux/pinctrl/pinctrl-state.h
-f:include/linux/pinctrl/pinctrl.h
-f:include/linux/pinctrl/pinmux.h
-f:include/linux/pipe_fs_i.h
-f:include/linux/pkeys.h
-f:include/linux/pl320-ipc.h
-f:include/linux/platform_data/ad5761.h
-f:include/linux/platform_data/ad7266.h
-f:include/linux/platform_data/ad7791.h
-f:include/linux/platform_data/ad7793.h
-f:include/linux/platform_data/ad7887.h
-f:include/linux/platform_data/adau17x1.h
-f:include/linux/platform_data/adp8860.h
-f:include/linux/platform_data/adp8870.h
-f:include/linux/platform_data/ads7828.h
-f:include/linux/platform_data/amd_qdma.h
-f:include/linux/platform_data/amd_xdma.h
-f:include/linux/platform_data/ams-delta-fiq.h
-f:include/linux/platform_data/apds990x.h
-f:include/linux/platform_data/arm-ux500-pm.h
-f:include/linux/platform_data/asoc-imx-ssi.h
-f:include/linux/platform_data/asoc-kirkwood.h
-f:include/linux/platform_data/asoc-pxa.h
-f:include/linux/platform_data/asoc-s3c.h
-f:include/linux/platform_data/asoc-ti-mcbsp.h
-f:include/linux/platform_data/ata-pxa.h
-f:include/linux/platform_data/atmel.h
-f:include/linux/platform_data/b53.h
-f:include/linux/platform_data/bcm7038_wdt.h
-f:include/linux/platform_data/bcmgenet.h
-f:include/linux/platform_data/bd6107.h
-f:include/linux/platform_data/bh1770glc.h
-f:include/linux/platform_data/brcmfmac.h
-f:include/linux/platform_data/brcmnand.h
-f:include/linux/platform_data/clk-da8xx-cfgchip.h
-f:include/linux/platform_data/clk-fch.h
-f:include/linux/platform_data/cpuidle-exynos.h
-f:include/linux/platform_data/cros_ec_chardev.h
-f:include/linux/platform_data/cros_ec_commands.h
-f:include/linux/platform_data/cros_ec_proto.h
-f:include/linux/platform_data/cros_ec_sensorhub.h
-f:include/linux/platform_data/cros_usbpd_notify.h
-f:include/linux/platform_data/crypto-ux500.h
-f:include/linux/platform_data/davinci-cpufreq.h
-f:include/linux/platform_data/davinci_asp.h
-f:include/linux/platform_data/dma-dw.h
-f:include/linux/platform_data/dma-hsu.h
-f:include/linux/platform_data/dma-iop32x.h
-f:include/linux/platform_data/dma-mcf-edma.h
-f:include/linux/platform_data/dma-mv_xor.h
-f:include/linux/platform_data/dmtimer-omap.h
-f:include/linux/platform_data/ds620.h
-f:include/linux/platform_data/dsa.h
-f:include/linux/platform_data/edma.h
-f:include/linux/platform_data/elm.h
-f:include/linux/platform_data/emc2305.h
-f:include/linux/platform_data/emif_plat.h
-f:include/linux/platform_data/g762.h
-f:include/linux/platform_data/gpio-htc-egpio.h
-f:include/linux/platform_data/gpio-omap.h
-f:include/linux/platform_data/gpio/gpio-amd-fch.h
-f:include/linux/platform_data/gpio_backlight.h
-f:include/linux/platform_data/gpmc-omap.h
-f:include/linux/platform_data/gsc_hwmon.h
-f:include/linux/platform_data/hirschmann-hellcreek.h
-f:include/linux/platform_data/hsmmc-omap.h
-f:include/linux/platform_data/huawei-gaokun-ec.h
-f:include/linux/platform_data/hwmon-s3c.h
-f:include/linux/platform_data/i2c-gpio.h
-f:include/linux/platform_data/i2c-imx.h
-f:include/linux/platform_data/i2c-mux-gpio.h
-f:include/linux/platform_data/i2c-mux-reg.h
-f:include/linux/platform_data/i2c-ocores.h
-f:include/linux/platform_data/i2c-omap.h
-f:include/linux/platform_data/i2c-pca-platform.h
-f:include/linux/platform_data/i2c-pxa.h
-f:include/linux/platform_data/i2c-s3c2410.h
-f:include/linux/platform_data/i2c-xiic.h
-f:include/linux/platform_data/ina2xx.h
-f:include/linux/platform_data/invensense_mpu6050.h
-f:include/linux/platform_data/iommu-omap.h
-f:include/linux/platform_data/isl9305.h
-f:include/linux/platform_data/itco_wdt.h
-f:include/linux/platform_data/keyboard-spear.h
-f:include/linux/platform_data/keypad-omap.h
-f:include/linux/platform_data/keypad-pxa27x.h
-f:include/linux/platform_data/lcd-mipid.h
-f:include/linux/platform_data/leds-lm355x.h
-f:include/linux/platform_data/leds-lm3642.h
-f:include/linux/platform_data/leds-lp55xx.h
-f:include/linux/platform_data/lenovo-yoga-c630.h
-f:include/linux/platform_data/lm3630a_bl.h
-f:include/linux/platform_data/lm3639_bl.h
-f:include/linux/platform_data/lm8323.h
-f:include/linux/platform_data/lp855x.h
-f:include/linux/platform_data/lp8727.h
-f:include/linux/platform_data/lp8755.h
-f:include/linux/platform_data/ltc4245.h
-f:include/linux/platform_data/lv5207lp.h
-f:include/linux/platform_data/max197.h
-f:include/linux/platform_data/max3421-hcd.h
-f:include/linux/platform_data/max732x.h
-f:include/linux/platform_data/mdio-bcm-unimac.h
-f:include/linux/platform_data/mdio-gpio.h
-f:include/linux/platform_data/media/camera-pxa.h
-f:include/linux/platform_data/media/mmp-camera.h
-f:include/linux/platform_data/media/si4713.h
-f:include/linux/platform_data/media/timb_radio.h
-f:include/linux/platform_data/media/timb_video.h
-f:include/linux/platform_data/mfd-mcp-sa11x0.h
-f:include/linux/platform_data/microchip-ksz.h
-f:include/linux/platform_data/mlxcpld.h
-f:include/linux/platform_data/mlxreg.h
-f:include/linux/platform_data/mmc-davinci.h
-f:include/linux/platform_data/mmc-esdhc-mcf.h
-f:include/linux/platform_data/mmc-mxcmmc.h
-f:include/linux/platform_data/mmc-omap.h
-f:include/linux/platform_data/mmc-pxamci.h
-f:include/linux/platform_data/mmc-sdhci-s3c.h
-f:include/linux/platform_data/mmp_dma.h
-f:include/linux/platform_data/mtd-nand-omap2.h
-f:include/linux/platform_data/mtd-nand-pxa3xx.h
-f:include/linux/platform_data/mtd-nand-s3c2410.h
-f:include/linux/platform_data/mtd-orion_nand.h
-f:include/linux/platform_data/mv88e6xxx.h
-f:include/linux/platform_data/mv_usb.h
-f:include/linux/platform_data/net-cw1200.h
-f:include/linux/platform_data/omap-twl4030.h
-f:include/linux/platform_data/omap-wd-timer.h
-f:include/linux/platform_data/omap1_bl.h
-f:include/linux/platform_data/omapdss.h
-f:include/linux/platform_data/pca953x.h
-f:include/linux/platform_data/phy-da8xx-usb.h
-f:include/linux/platform_data/pinctrl-single.h
-f:include/linux/platform_data/pm33xx.h
-f:include/linux/platform_data/pxa2xx_udc.h
-f:include/linux/platform_data/pxa_sdhci.h
-f:include/linux/platform_data/regulator-haptic.h
-f:include/linux/platform_data/s3c-hsotg.h
-f:include/linux/platform_data/sa11x0-serial.h
-f:include/linux/platform_data/sc18is602.h
-f:include/linux/platform_data/sdhci-pic32.h
-f:include/linux/platform_data/serial-omap.h
-f:include/linux/platform_data/serial-sccnxp.h
-f:include/linux/platform_data/sgi-w1.h
-f:include/linux/platform_data/sh_mmcif.h
-f:include/linux/platform_data/shmob_drm.h
-f:include/linux/platform_data/shtc1.h
-f:include/linux/platform_data/si5351.h
-f:include/linux/platform_data/simplefb.h
-f:include/linux/platform_data/spi-davinci.h
-f:include/linux/platform_data/spi-mt65xx.h
-f:include/linux/platform_data/spi-omap2-mcspi.h
-f:include/linux/platform_data/spi-s3c64xx.h
-f:include/linux/platform_data/st_sensors_pdata.h
-f:include/linux/platform_data/tda9950.h
-f:include/linux/platform_data/ti-prm.h
-f:include/linux/platform_data/ti-sysc.h
-f:include/linux/platform_data/tmio.h
-f:include/linux/platform_data/touchscreen-s3c2410.h
-f:include/linux/platform_data/tps68470.h
-f:include/linux/platform_data/tsc2007.h
-f:include/linux/platform_data/tsl2772.h
-f:include/linux/platform_data/txx9/ndfmc.h
-f:include/linux/platform_data/uio_dmem_genirq.h
-f:include/linux/platform_data/usb-davinci.h
-f:include/linux/platform_data/usb-ehci-orion.h
-f:include/linux/platform_data/usb-musb-ux500.h
-f:include/linux/platform_data/usb-ohci-pxa27x.h
-f:include/linux/platform_data/usb-ohci-s3c2410.h
-f:include/linux/platform_data/usb-omap.h
-f:include/linux/platform_data/usb-omap1.h
-f:include/linux/platform_data/usb3503.h
-f:include/linux/platform_data/video-ep93xx.h
-f:include/linux/platform_data/video-pxafb.h
-f:include/linux/platform_data/video_s3c.h
-f:include/linux/platform_data/voltage-omap.h
-f:include/linux/platform_data/wilco-ec.h
-f:include/linux/platform_data/wiznet.h
-f:include/linux/platform_data/wkup_m3.h
-f:include/linux/platform_data/x86/amd-fch.h
-f:include/linux/platform_data/x86/apple.h
-f:include/linux/platform_data/x86/asus-wmi.h
-f:include/linux/platform_data/x86/clk-lpss.h
-f:include/linux/platform_data/x86/clk-pmc-atom.h
-f:include/linux/platform_data/x86/int3472.h
-f:include/linux/platform_data/x86/intel-mid_wdt.h
-f:include/linux/platform_data/x86/intel_pmc_ipc.h
-f:include/linux/platform_data/x86/intel_scu_ipc.h
-f:include/linux/platform_data/x86/nvidia-wmi-ec-backlight.h
-f:include/linux/platform_data/x86/p2sb.h
-f:include/linux/platform_data/x86/pmc_atom.h
-f:include/linux/platform_data/x86/pwm-lpss.h
-f:include/linux/platform_data/x86/simatic-ipc-base.h
-f:include/linux/platform_data/x86/simatic-ipc.h
-f:include/linux/platform_data/x86/soc.h
-f:include/linux/platform_data/x86/spi-intel.h
-f:include/linux/platform_data/xilinx-ll-temac.h
-f:include/linux/platform_data/xtalk-bridge.h
-f:include/linux/platform_device.h
-f:include/linux/platform_profile.h
-f:include/linux/pldmfw.h
-f:include/linux/plist.h
-f:include/linux/plist_types.h
-f:include/linux/pm-trace.h
-f:include/linux/pm.h
-f:include/linux/pm_clock.h
-f:include/linux/pm_domain.h
-f:include/linux/pm_opp.h
-f:include/linux/pm_qos.h
-f:include/linux/pm_runtime.h
-f:include/linux/pm_wakeirq.h
-f:include/linux/pm_wakeup.h
-f:include/linux/pmbus.h
-f:include/linux/pmu.h
-f:include/linux/pnp.h
-f:include/linux/poison.h
-f:include/linux/poll.h
-f:include/linux/polynomial.h
-f:include/linux/posix-clock.h
-f:include/linux/posix-timers.h
-f:include/linux/posix-timers_types.h
-f:include/linux/posix_acl.h
-f:include/linux/posix_acl_xattr.h
-f:include/linux/power/bq2415x_charger.h
-f:include/linux/power/bq24190_charger.h
-f:include/linux/power/bq24735-charger.h
-f:include/linux/power/bq25890_charger.h
-f:include/linux/power/bq27xxx_battery.h
-f:include/linux/power/charger-manager.h
-f:include/linux/power/gpio-charger.h
-f:include/linux/power/jz4740-battery.h
-f:include/linux/power/max17042_battery.h
-f:include/linux/power/max77705_charger.h
-f:include/linux/power/power_on_reason.h
-f:include/linux/power/sbs-battery.h
-f:include/linux/power/smartreflex.h
-f:include/linux/power/twl4030_madc_battery.h
-f:include/linux/power_supply.h
-f:include/linux/powercap.h
-f:include/linux/ppp-comp.h
-f:include/linux/ppp_channel.h
-f:include/linux/ppp_defs.h
-f:include/linux/pps_gen_kernel.h
-f:include/linux/pps_kernel.h
-f:include/linux/pr.h
-f:include/linux/prandom.h
-f:include/linux/preempt.h
-f:include/linux/prefetch.h
-f:include/linux/prime_numbers.h
-f:include/linux/printk.h
-f:include/linux/prmt.h
-f:include/linux/proc_fs.h
-f:include/linux/proc_ns.h
-f:include/linux/processor.h
-f:include/linux/profile.h
-f:include/linux/projid.h
-f:include/linux/property.h
-f:include/linux/pruss_driver.h
-f:include/linux/psci.h
-f:include/linux/pse-pd/pse.h
-f:include/linux/pseudo_fs.h
-f:include/linux/psi.h
-f:include/linux/psi_types.h
-f:include/linux/psp-platform-access.h
-f:include/linux/psp-sev.h
-f:include/linux/psp-tee.h
-f:include/linux/psp.h
-f:include/linux/pstore.h
-f:include/linux/pstore_blk.h
-f:include/linux/pstore_ram.h
-f:include/linux/pstore_zone.h
-f:include/linux/ptdump.h
-f:include/linux/pti.h
-f:include/linux/ptp_classify.h
-f:include/linux/ptp_clock_kernel.h
-f:include/linux/ptp_kvm.h
-f:include/linux/ptp_mock.h
-f:include/linux/ptp_pch.h
-f:include/linux/ptr_ring.h
-f:include/linux/ptrace.h
-f:include/linux/ptrace_api.h
-f:include/linux/purgatory.h
-f:include/linux/pvclock_gtod.h
-f:include/linux/pwm.h
-f:include/linux/pwm_backlight.h
-f:include/linux/pwrseq/consumer.h
-f:include/linux/pwrseq/provider.h
-f:include/linux/pxa168_eth.h
-f:include/linux/pxa2xx_ssp.h
-f:include/linux/qat/qat_mig_dev.h
-f:include/linux/qed/common_hsi.h
-f:include/linux/qed/eth_common.h
-f:include/linux/qed/fcoe_common.h
-f:include/linux/qed/iscsi_common.h
-f:include/linux/qed/iwarp_common.h
-f:include/linux/qed/nvmetcp_common.h
-f:include/linux/qed/qed_chain.h
-f:include/linux/qed/qed_eth_if.h
-f:include/linux/qed/qed_fcoe_if.h
-f:include/linux/qed/qed_if.h
-f:include/linux/qed/qed_iov_if.h
-f:include/linux/qed/qed_iscsi_if.h
-f:include/linux/qed/qed_ll2_if.h
-f:include/linux/qed/qed_nvmetcp_if.h
-f:include/linux/qed/qed_rdma_if.h
-f:include/linux/qed/qede_rdma.h
-f:include/linux/qed/rdma_common.h
-f:include/linux/qed/roce_common.h
-f:include/linux/qed/storage_common.h
-f:include/linux/qed/tcp_common.h
-f:include/linux/qnx6_fs.h
-f:include/linux/quota.h
-f:include/linux/quotaops.h
-f:include/linux/radix-tree.h
-f:include/linux/raid/detect.h
-f:include/linux/raid/pq.h
-f:include/linux/raid/xor.h
-f:include/linux/raid_class.h
-f:include/linux/ramfs.h
-f:include/linux/random.h
-f:include/linux/randomize_kstack.h
-f:include/linux/range.h
-f:include/linux/ras.h
-f:include/linux/ratelimit.h
-f:include/linux/ratelimit_types.h
-f:include/linux/rational.h
-f:include/linux/rbtree.h
-f:include/linux/rbtree_augmented.h
-f:include/linux/rbtree_latch.h
-f:include/linux/rbtree_types.h
-f:include/linux/rcu_node_tree.h
-f:include/linux/rcu_notifier.h
-f:include/linux/rcu_segcblist.h
-f:include/linux/rcu_sync.h
-f:include/linux/rculist.h
-f:include/linux/rculist_bl.h
-f:include/linux/rculist_nulls.h
-f:include/linux/rcupdate.h
-f:include/linux/rcupdate_trace.h
-f:include/linux/rcupdate_wait.h
-f:include/linux/rcuref.h
-f:include/linux/rcutiny.h
-f:include/linux/rcutree.h
-f:include/linux/rcuwait.h
-f:include/linux/rcuwait_api.h
-f:include/linux/reboot-mode.h
-f:include/linux/reboot.h
-f:include/linux/reciprocal_div.h
-f:include/linux/ref_tracker.h
-f:include/linux/refcount.h
-f:include/linux/refcount_api.h
-f:include/linux/refcount_types.h
-f:include/linux/regmap.h
-f:include/linux/regset.h
-f:include/linux/regulator/act8865.h
-f:include/linux/regulator/arizona-ldo1.h
-f:include/linux/regulator/arizona-micsupp.h
-f:include/linux/regulator/consumer.h
-f:include/linux/regulator/coupler.h
-f:include/linux/regulator/da9121.h
-f:include/linux/regulator/da9211.h
-f:include/linux/regulator/db8500-prcmu.h
-f:include/linux/regulator/driver.h
-f:include/linux/regulator/fan53555.h
-f:include/linux/regulator/fixed.h
-f:include/linux/regulator/gpio-regulator.h
-f:include/linux/regulator/lp3971.h
-f:include/linux/regulator/lp3972.h
-f:include/linux/regulator/lp872x.h
-f:include/linux/regulator/machine.h
-f:include/linux/regulator/max1586.h
-f:include/linux/regulator/max8649.h
-f:include/linux/regulator/max8660.h
-f:include/linux/regulator/max8952.h
-f:include/linux/regulator/max8973-regulator.h
-f:include/linux/regulator/mt6311.h
-f:include/linux/regulator/mt6315-regulator.h
-f:include/linux/regulator/mt6323-regulator.h
-f:include/linux/regulator/mt6331-regulator.h
-f:include/linux/regulator/mt6332-regulator.h
-f:include/linux/regulator/mt6357-regulator.h
-f:include/linux/regulator/mt6358-regulator.h
-f:include/linux/regulator/mt6359-regulator.h
-f:include/linux/regulator/mt6380-regulator.h
-f:include/linux/regulator/mt6397-regulator.h
-f:include/linux/regulator/of_regulator.h
-f:include/linux/regulator/pca9450.h
-f:include/linux/regulator/pfuze100.h
-f:include/linux/regulator/tps51632-regulator.h
-f:include/linux/regulator/tps62360.h
-f:include/linux/regulator/tps6507x.h
-f:include/linux/regulator/userspace-consumer.h
-f:include/linux/relay.h
-f:include/linux/remoteproc.h
-f:include/linux/remoteproc/mtk_scp.h
-f:include/linux/remoteproc/pruss.h
-f:include/linux/remoteproc/qcom_rproc.h
-f:include/linux/remoteproc/st_slim_rproc.h
-f:include/linux/resctrl.h
-f:include/linux/resctrl_types.h
-f:include/linux/reset-controller.h
-f:include/linux/reset.h
-f:include/linux/reset/bcm63xx_pmb.h
-f:include/linux/reset/reset-simple.h
-f:include/linux/reset/socfpga.h
-f:include/linux/reset/sunxi.h
-f:include/linux/resource.h
-f:include/linux/resource_ext.h
-f:include/linux/restart_block.h
-f:include/linux/resume_user_mode.h
-f:include/linux/rethook.h
-f:include/linux/rfkill.h
-f:include/linux/rhashtable-types.h
-f:include/linux/rhashtable.h
-f:include/linux/ring_buffer.h
-f:include/linux/rio.h
-f:include/linux/rio_drv.h
-f:include/linux/rio_ids.h
-f:include/linux/rio_regs.h
-f:include/linux/rmap.h
-f:include/linux/rmi.h
-f:include/linux/rndis.h
-f:include/linux/rodata_test.h
-f:include/linux/rolling_buffer.h
-f:include/linux/root_dev.h
-f:include/linux/rpmb.h
-f:include/linux/rpmsg.h
-f:include/linux/rpmsg/byteorder.h
-f:include/linux/rpmsg/mtk_rpmsg.h
-f:include/linux/rpmsg/ns.h
-f:include/linux/rpmsg/qcom_glink.h
-f:include/linux/rpmsg/qcom_smd.h
-f:include/linux/rseq.h
-f:include/linux/rslib.h
-f:include/linux/rtc.h
-f:include/linux/rtc/ds1286.h
-f:include/linux/rtc/ds1307.h
-f:include/linux/rtc/ds1685.h
-f:include/linux/rtc/m48t59.h
-f:include/linux/rtc/rtc-omap.h
-f:include/linux/rtmutex.h
-f:include/linux/rtnetlink.h
-f:include/linux/rtsx_common.h
-f:include/linux/rtsx_pci.h
-f:include/linux/rtsx_usb.h
-f:include/linux/rv.h
-f:include/linux/rw_hint.h
-f:include/linux/rwbase_rt.h
-f:include/linux/rwlock.h
-f:include/linux/rwlock_api_smp.h
-f:include/linux/rwlock_rt.h
-f:include/linux/rwlock_types.h
-f:include/linux/rwsem.h
-f:include/linux/sbitmap.h
-f:include/linux/scatterlist.h
-f:include/linux/scc.h
-f:include/linux/sched.h
-f:include/linux/sched/affinity.h
-f:include/linux/sched/autogroup.h
-f:include/linux/sched/clock.h
-f:include/linux/sched/cond_resched.h
-f:include/linux/sched/coredump.h
-f:include/linux/sched/cpufreq.h
-f:include/linux/sched/cputime.h
-f:include/linux/sched/deadline.h
-f:include/linux/sched/debug.h
-f:include/linux/sched/ext.h
-f:include/linux/sched/hotplug.h
-f:include/linux/sched/idle.h
-f:include/linux/sched/init.h
-f:include/linux/sched/isolation.h
-f:include/linux/sched/jobctl.h
-f:include/linux/sched/loadavg.h
-f:include/linux/sched/mm.h
-f:include/linux/sched/nohz.h
-f:include/linux/sched/numa_balancing.h
-f:include/linux/sched/posix-timers.h
-f:include/linux/sched/prio.h
-f:include/linux/sched/rseq_api.h
-f:include/linux/sched/rt.h
-f:include/linux/sched/sd_flags.h
-f:include/linux/sched/signal.h
-f:include/linux/sched/smt.h
-f:include/linux/sched/stat.h
-f:include/linux/sched/sysctl.h
-f:include/linux/sched/task.h
-f:include/linux/sched/task_flags.h
-f:include/linux/sched/task_stack.h
-f:include/linux/sched/thread_info_api.h
-f:include/linux/sched/topology.h
-f:include/linux/sched/types.h
-f:include/linux/sched/user.h
-f:include/linux/sched/vhost_task.h
-f:include/linux/sched/wake_q.h
-f:include/linux/sched/xacct.h
-f:include/linux/sched_clock.h
-f:include/linux/scmi_imx_protocol.h
-f:include/linux/scmi_protocol.h
-f:include/linux/scpi_protocol.h
-f:include/linux/screen_info.h
-f:include/linux/scs.h
-f:include/linux/sctp.h
-f:include/linux/scx200.h
-f:include/linux/scx200_gpio.h
-f:include/linux/seccomp.h
-f:include/linux/seccomp_types.h
-f:include/linux/secretmem.h
-f:include/linux/securebits.h
-f:include/linux/security.h
-f:include/linux/sed-opal-key.h
-f:include/linux/sed-opal.h
-f:include/linux/seg6.h
-f:include/linux/seg6_genl.h
-f:include/linux/seg6_hmac.h
-f:include/linux/seg6_iptunnel.h
-f:include/linux/seg6_local.h
-f:include/linux/selection.h
-f:include/linux/sem.h
-f:include/linux/sem_types.h
-f:include/linux/semaphore.h
-f:include/linux/seq_buf.h
-f:include/linux/seq_file.h
-f:include/linux/seq_file_net.h
-f:include/linux/seqlock.h
-f:include/linux/seqlock_api.h
-f:include/linux/seqlock_types.h
-f:include/linux/serdev.h
-f:include/linux/serial.h
-f:include/linux/serial_8250.h
-f:include/linux/serial_bcm63xx.h
-f:include/linux/serial_core.h
-f:include/linux/serial_s3c.h
-f:include/linux/serial_sci.h
-f:include/linux/serio.h
-f:include/linux/set_memory.h
-f:include/linux/sfp.h
-f:include/linux/sh_clk.h
-f:include/linux/sh_dma.h
-f:include/linux/sh_eth.h
-f:include/linux/sh_intc.h
-f:include/linux/sh_timer.h
-f:include/linux/shdma-base.h
-f:include/linux/shm.h
-f:include/linux/shmem_fs.h
-f:include/linux/shrinker.h
-f:include/linux/signal.h
-f:include/linux/signal_types.h
-f:include/linux/signalfd.h
-f:include/linux/siox.h
-f:include/linux/siphash.h
-f:include/linux/sizes.h
-f:include/linux/skb_array.h
-f:include/linux/skbuff.h
-f:include/linux/skbuff_ref.h
-f:include/linux/skmsg.h
-f:include/linux/slab.h
-f:include/linux/slimbus.h
-f:include/linux/sm501-regs.h
-f:include/linux/sm501.h
-f:include/linux/smc91x.h
-f:include/linux/smp.h
-f:include/linux/smp_types.h
-f:include/linux/smpboot.h
-f:include/linux/smsc911x.h
-f:include/linux/smscphy.h
-f:include/linux/soc/actions/owl-sps.h
-f:include/linux/soc/amd/isp4_misc.h
-f:include/linux/soc/amlogic/meson-canvas.h
-f:include/linux/soc/andes/irq.h
-f:include/linux/soc/apple/rtkit.h
-f:include/linux/soc/apple/sart.h
-f:include/linux/soc/brcmstb/brcmstb.h
-f:include/linux/soc/cirrus/ep93xx.h
-f:include/linux/soc/dove/pmu.h
-f:include/linux/soc/ixp4xx/cpu.h
-f:include/linux/soc/ixp4xx/npe.h
-f:include/linux/soc/ixp4xx/qmgr.h
-f:include/linux/soc/marvell/octeontx2/asm.h
-f:include/linux/soc/marvell/silicons.h
-f:include/linux/soc/mediatek/dvfsrc.h
-f:include/linux/soc/mediatek/infracfg.h
-f:include/linux/soc/mediatek/mtk-cmdq.h
-f:include/linux/soc/mediatek/mtk-mmsys.h
-f:include/linux/soc/mediatek/mtk-mutex.h
-f:include/linux/soc/mediatek/mtk_sip_svc.h
-f:include/linux/soc/mediatek/mtk_wed.h
-f:include/linux/soc/mmp/cputype.h
-f:include/linux/soc/nxp/lpc32xx-misc.h
-f:include/linux/soc/pxa/cpu.h
-f:include/linux/soc/pxa/mfp.h
-f:include/linux/soc/pxa/smemc.h
-f:include/linux/soc/qcom/apr.h
-f:include/linux/soc/qcom/geni-se.h
-f:include/linux/soc/qcom/irq.h
-f:include/linux/soc/qcom/llcc-qcom.h
-f:include/linux/soc/qcom/mdt_loader.h
-f:include/linux/soc/qcom/pdr.h
-f:include/linux/soc/qcom/pmic_glink.h
-f:include/linux/soc/qcom/qcom-pbs.h
-f:include/linux/soc/qcom/qcom_aoss.h
-f:include/linux/soc/qcom/qmi.h
-f:include/linux/soc/qcom/smd-rpm.h
-f:include/linux/soc/qcom/smem.h
-f:include/linux/soc/qcom/smem_state.h
-f:include/linux/soc/qcom/socinfo.h
-f:include/linux/soc/qcom/ubwc.h
-f:include/linux/soc/qcom/wcnss_ctrl.h
-f:include/linux/soc/renesas/r9a06g032-sysctrl.h
-f:include/linux/soc/renesas/rcar-rst.h
-f:include/linux/soc/renesas/rcar-sysc.h
-f:include/linux/soc/samsung/exynos-chipid.h
-f:include/linux/soc/samsung/exynos-pmu.h
-f:include/linux/soc/samsung/exynos-regs-pmu.h
-f:include/linux/soc/samsung/s3c-pm.h
-f:include/linux/soc/sunxi/sunxi_sram.h
-f:include/linux/soc/ti/k3-ringacc.h
-f:include/linux/soc/ti/knav_dma.h
-f:include/linux/soc/ti/knav_qmss.h
-f:include/linux/soc/ti/omap1-io.h
-f:include/linux/soc/ti/omap1-mux.h
-f:include/linux/soc/ti/omap1-soc.h
-f:include/linux/soc/ti/omap1-usb.h
-f:include/linux/soc/ti/ti-msgmgr.h
-f:include/linux/soc/ti/ti_sci_inta_msi.h
-f:include/linux/soc/ti/ti_sci_protocol.h
-f:include/linux/sock_diag.h
-f:include/linux/socket.h
-f:include/linux/sockptr.h
-f:include/linux/softirq.h
-f:include/linux/sonet.h
-f:include/linux/sonypi.h
-f:include/linux/sort.h
-f:include/linux/sound.h
-f:include/linux/soundcard.h
-f:include/linux/soundwire/sdw.h
-f:include/linux/soundwire/sdw_amd.h
-f:include/linux/soundwire/sdw_intel.h
-f:include/linux/soundwire/sdw_registers.h
-f:include/linux/soundwire/sdw_type.h
-f:include/linux/spi/ad7877.h
-f:include/linux/spi/ads7846.h
-f:include/linux/spi/altera.h
-f:include/linux/spi/at73c213.h
-f:include/linux/spi/corgi_lcd.h
-f:include/linux/spi/ds1305.h
-f:include/linux/spi/eeprom.h
-f:include/linux/spi/flash.h
-f:include/linux/spi/libertas_spi.h
-f:include/linux/spi/max7301.h
-f:include/linux/spi/mc33880.h
-f:include/linux/spi/mmc_spi.h
-f:include/linux/spi/mxs-spi.h
-f:include/linux/spi/offload/consumer.h
-f:include/linux/spi/offload/provider.h
-f:include/linux/spi/offload/types.h
-f:include/linux/spi/sh_hspi.h
-f:include/linux/spi/sh_msiof.h
-f:include/linux/spi/spi-fsl-dspi.h
-f:include/linux/spi/spi-mem.h
-f:include/linux/spi/spi.h
-f:include/linux/spi/spi_bitbang.h
-f:include/linux/spi/spi_gpio.h
-f:include/linux/spi/spi_oc_tiny.h
-f:include/linux/spi/tdo24m.h
-f:include/linux/spi/tle62x0.h
-f:include/linux/spi/xilinx_spi.h
-f:include/linux/spinlock.h
-f:include/linux/spinlock_api.h
-f:include/linux/spinlock_api_smp.h
-f:include/linux/spinlock_api_up.h
-f:include/linux/spinlock_rt.h
-f:include/linux/spinlock_types.h
-f:include/linux/spinlock_types_raw.h
-f:include/linux/spinlock_types_up.h
-f:include/linux/spinlock_up.h
-f:include/linux/splice.h
-f:include/linux/spmi.h
-f:include/linux/sprintf.h
-f:include/linux/sram.h
-f:include/linux/srcu.h
-f:include/linux/srcutiny.h
-f:include/linux/srcutree.h
-f:include/linux/ssb/ssb.h
-f:include/linux/ssb/ssb_driver_chipcommon.h
-f:include/linux/ssb/ssb_driver_extif.h
-f:include/linux/ssb/ssb_driver_gige.h
-f:include/linux/ssb/ssb_driver_mips.h
-f:include/linux/ssb/ssb_driver_pci.h
-f:include/linux/ssb/ssb_embedded.h
-f:include/linux/ssb/ssb_regs.h
-f:include/linux/ssbi.h
-f:include/linux/stackdepot.h
-f:include/linux/stackprotector.h
-f:include/linux/stacktrace.h
-f:include/linux/start_kernel.h
-f:include/linux/stat.h
-f:include/linux/statfs.h
-f:include/linux/static_call.h
-f:include/linux/static_call_types.h
-f:include/linux/static_key.h
-f:include/linux/stdarg.h
-f:include/linux/stddef.h
-f:include/linux/stm.h
-f:include/linux/stmmac.h
-f:include/linux/stmp3xxx_rtc_wdt.h
-f:include/linux/stmp_device.h
-f:include/linux/stop_machine.h
-f:include/linux/string.h
-f:include/linux/string_choices.h
-f:include/linux/string_helpers.h
-f:include/linux/stringhash.h
-f:include/linux/stringify.h
-f:include/linux/sungem_phy.h
-f:include/linux/sunrpc/addr.h
-f:include/linux/sunrpc/auth.h
-f:include/linux/sunrpc/auth_gss.h
-f:include/linux/sunrpc/bc_xprt.h
-f:include/linux/sunrpc/cache.h
-f:include/linux/sunrpc/clnt.h
-f:include/linux/sunrpc/debug.h
-f:include/linux/sunrpc/gss_api.h
-f:include/linux/sunrpc/gss_err.h
-f:include/linux/sunrpc/gss_krb5.h
-f:include/linux/sunrpc/metrics.h
-f:include/linux/sunrpc/msg_prot.h
-f:include/linux/sunrpc/rdma_rn.h
-f:include/linux/sunrpc/rpc_pipe_fs.h
-f:include/linux/sunrpc/rpc_rdma.h
-f:include/linux/sunrpc/rpc_rdma_cid.h
-f:include/linux/sunrpc/sched.h
-f:include/linux/sunrpc/stats.h
-f:include/linux/sunrpc/svc.h
-f:include/linux/sunrpc/svc_rdma.h
-f:include/linux/sunrpc/svc_rdma_pcl.h
-f:include/linux/sunrpc/svc_xprt.h
-f:include/linux/sunrpc/svcauth.h
-f:include/linux/sunrpc/svcauth_gss.h
-f:include/linux/sunrpc/svcsock.h
-f:include/linux/sunrpc/timer.h
-f:include/linux/sunrpc/types.h
-f:include/linux/sunrpc/xdr.h
-f:include/linux/sunrpc/xdrgen/_builtins.h
-f:include/linux/sunrpc/xdrgen/_defs.h
-f:include/linux/sunrpc/xdrgen/nfs4_1.h
-f:include/linux/sunrpc/xprt.h
-f:include/linux/sunrpc/xprtmultipath.h
-f:include/linux/sunrpc/xprtrdma.h
-f:include/linux/sunrpc/xprtsock.h
-f:include/linux/sunserialcore.h
-f:include/linux/sunxi-rsb.h
-f:include/linux/surface_acpi_notify.h
-f:include/linux/surface_aggregator/controller.h
-f:include/linux/surface_aggregator/device.h
-f:include/linux/surface_aggregator/serial_hub.h
-f:include/linux/suspend.h
-f:include/linux/svga.h
-f:include/linux/sw842.h
-f:include/linux/swab.h
-f:include/linux/swait.h
-f:include/linux/swait_api.h
-f:include/linux/swap.h
-f:include/linux/swap_cgroup.h
-f:include/linux/swapfile.h
-f:include/linux/swapops.h
-f:include/linux/swiotlb.h
-f:include/linux/switchtec.h
-f:include/linux/sxgbe_platform.h
-f:include/linux/sync_core.h
-f:include/linux/sync_file.h
-f:include/linux/synclink.h
-f:include/linux/sys.h
-f:include/linux/sys_soc.h
-f:include/linux/syscall_user_dispatch.h
-f:include/linux/syscall_user_dispatch_types.h
-f:include/linux/syscalls.h
-f:include/linux/syscalls_api.h
-f:include/linux/syscore_ops.h
-f:include/linux/sysctl.h
-f:include/linux/sysfb.h
-f:include/linux/sysfs.h
-f:include/linux/syslog.h
-f:include/linux/sysrq.h
-f:include/linux/t10-pi.h
-f:include/linux/task_io_accounting.h
-f:include/linux/task_io_accounting_ops.h
-f:include/linux/task_work.h
-f:include/linux/taskstats_kern.h
-f:include/linux/tboot.h
-f:include/linux/tc.h
-f:include/linux/tca6416_keypad.h
-f:include/linux/tcp.h
-f:include/linux/tee_core.h
-f:include/linux/tee_drv.h
-f:include/linux/tegra-icc.h
-f:include/linux/termios_internal.h
-f:include/linux/text-patching.h
-f:include/linux/textsearch.h
-f:include/linux/textsearch_fsm.h
-f:include/linux/thermal.h
-f:include/linux/thread_info.h
-f:include/linux/threads.h
-f:include/linux/thunderbolt.h
-f:include/linux/ti-emif-sram.h
-f:include/linux/ti_wilink_st.h
-f:include/linux/tick.h
-f:include/linux/tifm.h
-f:include/linux/timb_dma.h
-f:include/linux/timb_gpio.h
-f:include/linux/time.h
-f:include/linux/time32.h
-f:include/linux/time64.h
-f:include/linux/time_namespace.h
-f:include/linux/timecounter.h
-f:include/linux/timekeeper_internal.h
-f:include/linux/timekeeping.h
-f:include/linux/timer.h
-f:include/linux/timer_types.h
-f:include/linux/timerfd.h
-f:include/linux/timeriomem-rng.h
-f:include/linux/timerqueue.h
-f:include/linux/timerqueue_types.h
-f:include/linux/timex.h
-f:include/linux/tnum.h
-f:include/linux/topology.h
-f:include/linux/torture.h
-f:include/linux/toshiba.h
-f:include/linux/tpm.h
-f:include/linux/tpm_command.h
-f:include/linux/tpm_eventlog.h
-f:include/linux/tpm_svsm.h
-f:include/linux/trace.h
-f:include/linux/trace_clock.h
-f:include/linux/trace_events.h
-f:include/linux/trace_recursion.h
-f:include/linux/trace_seq.h
-f:include/linux/tracefs.h
-f:include/linux/tracepoint-defs.h
-f:include/linux/tracepoint.h
-f:include/linux/transport_class.h
-f:include/linux/ts-nbus.h
-f:include/linux/tsacct_kern.h
-f:include/linux/tsm-mr.h
-f:include/linux/tsm.h
-f:include/linux/tty.h
-f:include/linux/tty_buffer.h
-f:include/linux/tty_driver.h
-f:include/linux/tty_flip.h
-f:include/linux/tty_ldisc.h
-f:include/linux/tty_port.h
-f:include/linux/turris-omnia-mcu-interface.h
-f:include/linux/turris-signing-key.h
-f:include/linux/typecheck.h
-f:include/linux/types.h
-f:include/linux/u64_stats_sync.h
-f:include/linux/u64_stats_sync_api.h
-f:include/linux/uacce.h
-f:include/linux/uaccess.h
-f:include/linux/ubsan.h
-f:include/linux/ucopysize.h
-f:include/linux/ucs2_string.h
-f:include/linux/udp.h
-f:include/linux/uidgid.h
-f:include/linux/uidgid_types.h
-f:include/linux/uio.h
-f:include/linux/uio_driver.h
-f:include/linux/ulpi/driver.h
-f:include/linux/ulpi/interface.h
-f:include/linux/ulpi/regs.h
-f:include/linux/umh.h
-f:include/linux/unaligned.h
-f:include/linux/unaligned/packed_struct.h
-f:include/linux/unicode.h
-f:include/linux/union_find.h
-f:include/linux/units.h
-f:include/linux/unroll.h
-f:include/linux/uprobes.h
-f:include/linux/usb.h
-f:include/linux/usb/audio-v2.h
-f:include/linux/usb/audio-v3.h
-f:include/linux/usb/audio.h
-f:include/linux/usb/c67x00.h
-f:include/linux/usb/ccid.h
-f:include/linux/usb/cdc-wdm.h
-f:include/linux/usb/cdc.h
-f:include/linux/usb/cdc_ncm.h
-f:include/linux/usb/ch9.h
-f:include/linux/usb/chipidea.h
-f:include/linux/usb/composite.h
-f:include/linux/usb/ehci-dbgp.h
-f:include/linux/usb/ehci_def.h
-f:include/linux/usb/ehci_pdriver.h
-f:include/linux/usb/ezusb.h
-f:include/linux/usb/func_utils.h
-f:include/linux/usb/functionfs.h
-f:include/linux/usb/g_hid.h
-f:include/linux/usb/gadget.h
-f:include/linux/usb/gadget_configfs.h
-f:include/linux/usb/hcd.h
-f:include/linux/usb/input.h
-f:include/linux/usb/iowarrior.h
-f:include/linux/usb/irda.h
-f:include/linux/usb/isp116x.h
-f:include/linux/usb/isp1301.h
-f:include/linux/usb/isp1362.h
-f:include/linux/usb/ljca.h
-f:include/linux/usb/m66592.h
-f:include/linux/usb/mctp-usb.h
-f:include/linux/usb/midi-v2.h
-f:include/linux/usb/musb-ux500.h
-f:include/linux/usb/musb.h
-f:include/linux/usb/net2280.h
-f:include/linux/usb/of.h
-f:include/linux/usb/ohci_pdriver.h
-f:include/linux/usb/onboard_dev.h
-f:include/linux/usb/otg-fsm.h
-f:include/linux/usb/otg.h
-f:include/linux/usb/pd.h
-f:include/linux/usb/pd_ado.h
-f:include/linux/usb/pd_bdo.h
-f:include/linux/usb/pd_ext_sdb.h
-f:include/linux/usb/pd_vdo.h
-f:include/linux/usb/phy.h
-f:include/linux/usb/phy_companion.h
-f:include/linux/usb/quirks.h
-f:include/linux/usb/r8152.h
-f:include/linux/usb/r8a66597.h
-f:include/linux/usb/renesas_usbhs.h
-f:include/linux/usb/rndis_host.h
-f:include/linux/usb/role.h
-f:include/linux/usb/rzv2m_usb3drd.h
-f:include/linux/usb/serial.h
-f:include/linux/usb/sl811.h
-f:include/linux/usb/storage.h
-f:include/linux/usb/tcpci.h
-f:include/linux/usb/tcpm.h
-f:include/linux/usb/tegra_usb_phy.h
-f:include/linux/usb/typec.h
-f:include/linux/usb/typec_altmode.h
-f:include/linux/usb/typec_dp.h
-f:include/linux/usb/typec_mux.h
-f:include/linux/usb/typec_retimer.h
-f:include/linux/usb/typec_tbt.h
-f:include/linux/usb/uas.h
-f:include/linux/usb/ulpi.h
-f:include/linux/usb/usb338x.h
-f:include/linux/usb/usb_phy_generic.h
-f:include/linux/usb/usbnet.h
-f:include/linux/usb/uvc.h
-f:include/linux/usb/webusb.h
-f:include/linux/usb/xhci-dbgp.h
-f:include/linux/usb/xhci-sideband.h
-f:include/linux/usb_usual.h
-f:include/linux/usbdevice_fs.h
-f:include/linux/user-return-notifier.h
-f:include/linux/user.h
-f:include/linux/user_events.h
-f:include/linux/user_namespace.h
-f:include/linux/userfaultfd_k.h
-f:include/linux/util_macros.h
-f:include/linux/uts.h
-f:include/linux/utsname.h
-f:include/linux/uuid.h
-f:include/linux/vbox_utils.h
-f:include/linux/vdpa.h
-f:include/linux/vdso_datastore.h
-f:include/linux/verification.h
-f:include/linux/vermagic.h
-f:include/linux/vexpress.h
-f:include/linux/vfio.h
-f:include/linux/vfio_pci_core.h
-f:include/linux/vfs.h
-f:include/linux/vfsdebug.h
-f:include/linux/vga_switcheroo.h
-f:include/linux/vgaarb.h
-f:include/linux/vhost_iotlb.h
-f:include/linux/via-core.h
-f:include/linux/via.h
-f:include/linux/via_i2c.h
-f:include/linux/videodev2.h
-f:include/linux/virtio.h
-f:include/linux/virtio_anchor.h
-f:include/linux/virtio_byteorder.h
-f:include/linux/virtio_caif.h
-f:include/linux/virtio_config.h
-f:include/linux/virtio_dma_buf.h
-f:include/linux/virtio_features.h
-f:include/linux/virtio_net.h
-f:include/linux/virtio_pci_admin.h
-f:include/linux/virtio_pci_legacy.h
-f:include/linux/virtio_pci_modern.h
-f:include/linux/virtio_ring.h
-f:include/linux/virtio_vsock.h
-f:include/linux/vm_event_item.h
-f:include/linux/vmalloc.h
-f:include/linux/vmcore_info.h
-f:include/linux/vmpressure.h
-f:include/linux/vmstat.h
-f:include/linux/vmw_vmci_api.h
-f:include/linux/vmw_vmci_defs.h
-f:include/linux/vringh.h
-f:include/linux/vt.h
-f:include/linux/vt_buffer.h
-f:include/linux/vt_kern.h
-f:include/linux/vtime.h
-f:include/linux/w1.h
-f:include/linux/wait.h
-f:include/linux/wait_api.h
-f:include/linux/wait_bit.h
-f:include/linux/watch_queue.h
-f:include/linux/watchdog.h
-f:include/linux/win_minmax.h
-f:include/linux/wireless.h
-f:include/linux/wkup_m3_ipc.h
-f:include/linux/wm97xx.h
-f:include/linux/wmi.h
-f:include/linux/wordpart.h
-f:include/linux/workqueue.h
-f:include/linux/workqueue_api.h
-f:include/linux/workqueue_types.h
-f:include/linux/writeback.h
-f:include/linux/ww_mutex.h
-f:include/linux/wwan.h
-f:include/linux/xarray.h
-f:include/linux/xattr.h
-f:include/linux/xxhash.h
-f:include/linux/xz.h
-f:include/linux/yam.h
-f:include/linux/zconf.h
-f:include/linux/zlib.h
-f:include/linux/zorro.h
-f:include/linux/zpool.h
-f:include/linux/zsmalloc.h
-f:include/linux/zstd.h
-f:include/linux/zstd_errors.h
-f:include/linux/zstd_lib.h
-f:include/linux/zswap.h
-f:include/linux/zutil.h
-f:include/math-emu/double.h
-f:include/math-emu/op-1.h
-f:include/math-emu/op-2.h
-f:include/math-emu/op-4.h
-f:include/math-emu/op-8.h
-f:include/math-emu/op-common.h
-f:include/math-emu/quad.h
-f:include/math-emu/single.h
-f:include/math-emu/soft-fp.h
-f:include/media/cec-notifier.h
-f:include/media/cec-pin.h
-f:include/media/cec.h
-f:include/media/davinci/vpfe_types.h
-f:include/media/davinci/vpif_types.h
-f:include/media/demux.h
-f:include/media/dmxdev.h
-f:include/media/drv-intf/cx2341x.h
-f:include/media/drv-intf/cx25840.h
-f:include/media/drv-intf/exynos-fimc.h
-f:include/media/drv-intf/msp3400.h
-f:include/media/drv-intf/renesas-ceu.h
-f:include/media/drv-intf/s3c_camif.h
-f:include/media/drv-intf/saa7146.h
-f:include/media/drv-intf/saa7146_vv.h
-f:include/media/drv-intf/sh_vou.h
-f:include/media/drv-intf/si476x.h
-f:include/media/drv-intf/tea575x.h
-f:include/media/dvb-usb-ids.h
-f:include/media/dvb_ca_en50221.h
-f:include/media/dvb_demux.h
-f:include/media/dvb_frontend.h
-f:include/media/dvb_net.h
-f:include/media/dvb_ringbuffer.h
-f:include/media/dvb_vb2.h
-f:include/media/dvbdev.h
-f:include/media/frame_vector.h
-f:include/media/i2c/adp1653.h
-f:include/media/i2c/adv7183.h
-f:include/media/i2c/adv7343.h
-f:include/media/i2c/adv7393.h
-f:include/media/i2c/adv7511.h
-f:include/media/i2c/adv7604.h
-f:include/media/i2c/adv7842.h
-f:include/media/i2c/ak881x.h
-f:include/media/i2c/bt819.h
-f:include/media/i2c/cs5345.h
-f:include/media/i2c/cs53l32a.h
-f:include/media/i2c/ds90ub9xx.h
-f:include/media/i2c/ir-kbd-i2c.h
-f:include/media/i2c/lm3560.h
-f:include/media/i2c/lm3646.h
-f:include/media/i2c/m52790.h
-f:include/media/i2c/mt9t112.h
-f:include/media/i2c/mt9v011.h
-f:include/media/i2c/mt9v022.h
-f:include/media/i2c/mt9v032.h
-f:include/media/i2c/ov2659.h
-f:include/media/i2c/ov7670.h
-f:include/media/i2c/ov772x.h
-f:include/media/i2c/rj54n1cb0c.h
-f:include/media/i2c/saa6588.h
-f:include/media/i2c/saa7115.h
-f:include/media/i2c/saa7127.h
-f:include/media/i2c/tc358743.h
-f:include/media/i2c/tda1997x.h
-f:include/media/i2c/ths7303.h
-f:include/media/i2c/tvaudio.h
-f:include/media/i2c/tvp514x.h
-f:include/media/i2c/tvp7002.h
-f:include/media/i2c/tw9910.h
-f:include/media/i2c/uda1342.h
-f:include/media/i2c/upd64031a.h
-f:include/media/i2c/upd64083.h
-f:include/media/i2c/wm8775.h
-f:include/media/imx.h
-f:include/media/ipu-bridge.h
-f:include/media/ipu6-pci-table.h
-f:include/media/jpeg.h
-f:include/media/media-dev-allocator.h
-f:include/media/media-device.h
-f:include/media/media-devnode.h
-f:include/media/media-entity.h
-f:include/media/media-request.h
-f:include/media/mipi-csi2.h
-f:include/media/rc-core.h
-f:include/media/rc-map.h
-f:include/media/rcar-fcp.h
-f:include/media/tpg/v4l2-tpg.h
-f:include/media/tuner-types.h
-f:include/media/tuner.h
-f:include/media/tveeprom.h
-f:include/media/v4l2-async.h
-f:include/media/v4l2-cci.h
-f:include/media/v4l2-common.h
-f:include/media/v4l2-ctrls.h
-f:include/media/v4l2-dev.h
-f:include/media/v4l2-device.h
-f:include/media/v4l2-dv-timings.h
-f:include/media/v4l2-event.h
-f:include/media/v4l2-fh.h
-f:include/media/v4l2-flash-led-class.h
-f:include/media/v4l2-fwnode.h
-f:include/media/v4l2-h264.h
-f:include/media/v4l2-image-sizes.h
-f:include/media/v4l2-ioctl.h
-f:include/media/v4l2-jpeg.h
-f:include/media/v4l2-mc.h
-f:include/media/v4l2-mediabus.h
-f:include/media/v4l2-mem2mem.h
-f:include/media/v4l2-rect.h
-f:include/media/v4l2-subdev.h
-f:include/media/v4l2-vp9.h
-f:include/media/videobuf2-core.h
-f:include/media/videobuf2-dma-contig.h
-f:include/media/videobuf2-dma-sg.h
-f:include/media/videobuf2-dvb.h
-f:include/media/videobuf2-memops.h
-f:include/media/videobuf2-v4l2.h
-f:include/media/videobuf2-vmalloc.h
-f:include/media/vsp1.h
-f:include/memory/renesas-rpc-if.h
-f:include/misc/altera.h
-f:include/misc/ocxl-config.h
-f:include/misc/ocxl.h
-f:include/net/6lowpan.h
-f:include/net/9p/9p.h
-f:include/net/9p/client.h
-f:include/net/9p/transport.h
-f:include/net/Space.h
-f:include/net/act_api.h
-f:include/net/addrconf.h
-f:include/net/af_ieee802154.h
-f:include/net/af_rxrpc.h
-f:include/net/af_unix.h
-f:include/net/af_vsock.h
-f:include/net/ah.h
-f:include/net/aligned_data.h
-f:include/net/amt.h
-f:include/net/arp.h
-f:include/net/atmclip.h
-f:include/net/ax25.h
-f:include/net/ax88796.h
-f:include/net/bareudp.h
-f:include/net/bluetooth/bluetooth.h
-f:include/net/bluetooth/coredump.h
-f:include/net/bluetooth/hci.h
-f:include/net/bluetooth/hci_core.h
-f:include/net/bluetooth/hci_drv.h
-f:include/net/bluetooth/hci_mon.h
-f:include/net/bluetooth/hci_sock.h
-f:include/net/bluetooth/hci_sync.h
-f:include/net/bluetooth/iso.h
-f:include/net/bluetooth/l2cap.h
-f:include/net/bluetooth/mgmt.h
-f:include/net/bluetooth/rfcomm.h
-f:include/net/bluetooth/sco.h
-f:include/net/bond_3ad.h
-f:include/net/bond_alb.h
-f:include/net/bond_options.h
-f:include/net/bonding.h
-f:include/net/bpf_sk_storage.h
-f:include/net/busy_poll.h
-f:include/net/caif/caif_dev.h
-f:include/net/caif/caif_device.h
-f:include/net/caif/caif_layer.h
-f:include/net/caif/cfcnfg.h
-f:include/net/caif/cfctrl.h
-f:include/net/caif/cffrml.h
-f:include/net/caif/cfmuxl.h
-f:include/net/caif/cfpkt.h
-f:include/net/caif/cfserl.h
-f:include/net/caif/cfsrvl.h
-f:include/net/calipso.h
-f:include/net/cfg80211-wext.h
-f:include/net/cfg80211.h
-f:include/net/cfg802154.h
-f:include/net/checksum.h
-f:include/net/cipso_ipv4.h
-f:include/net/cls_cgroup.h
-f:include/net/codel.h
-f:include/net/codel_impl.h
-f:include/net/codel_qdisc.h
-f:include/net/compat.h
-f:include/net/datalink.h
-f:include/net/dcbevent.h
-f:include/net/dcbnl.h
-f:include/net/devlink.h
-f:include/net/dropreason-core.h
-f:include/net/dropreason.h
-f:include/net/dsa.h
-f:include/net/dsa_stubs.h
-f:include/net/dscp.h
-f:include/net/dsfield.h
-f:include/net/dst.h
-f:include/net/dst_cache.h
-f:include/net/dst_metadata.h
-f:include/net/dst_ops.h
-f:include/net/eee.h
-f:include/net/erspan.h
-f:include/net/esp.h
-f:include/net/espintcp.h
-f:include/net/ethoc.h
-f:include/net/failover.h
-f:include/net/fib_notifier.h
-f:include/net/fib_rules.h
-f:include/net/firewire.h
-f:include/net/flow.h
-f:include/net/flow_dissector.h
-f:include/net/flow_offload.h
-f:include/net/fou.h
-f:include/net/fq.h
-f:include/net/fq_impl.h
-f:include/net/garp.h
-f:include/net/gen_stats.h
-f:include/net/genetlink.h
-f:include/net/geneve.h
-f:include/net/gre.h
-f:include/net/gro.h
-f:include/net/gro_cells.h
-f:include/net/gso.h
-f:include/net/gtp.h
-f:include/net/gue.h
-f:include/net/handshake.h
-f:include/net/hotdata.h
-f:include/net/hwbm.h
-f:include/net/icmp.h
-f:include/net/ieee80211_radiotap.h
-f:include/net/ieee802154_netdev.h
-f:include/net/ieee8021q.h
-f:include/net/if_inet6.h
-f:include/net/ife.h
-f:include/net/inet6_connection_sock.h
-f:include/net/inet6_hashtables.h
-f:include/net/inet_common.h
-f:include/net/inet_connection_sock.h
-f:include/net/inet_dscp.h
-f:include/net/inet_ecn.h
-f:include/net/inet_frag.h
-f:include/net/inet_hashtables.h
-f:include/net/inet_sock.h
-f:include/net/inet_timewait_sock.h
-f:include/net/inetpeer.h
-f:include/net/ioam6.h
-f:include/net/ip.h
-f:include/net/ip6_checksum.h
-f:include/net/ip6_fib.h
-f:include/net/ip6_route.h
-f:include/net/ip6_tunnel.h
-f:include/net/ip_fib.h
-f:include/net/ip_tunnels.h
-f:include/net/ip_vs.h
-f:include/net/ipcomp.h
-f:include/net/ipconfig.h
-f:include/net/ipv6.h
-f:include/net/ipv6_frag.h
-f:include/net/ipv6_stubs.h
-f:include/net/iucv/af_iucv.h
-f:include/net/iucv/iucv.h
-f:include/net/iw_handler.h
-f:include/net/kcm.h
-f:include/net/l3mdev.h
-f:include/net/lag.h
-f:include/net/lapb.h
-f:include/net/libeth/cache.h
-f:include/net/libeth/rx.h
-f:include/net/libeth/tx.h
-f:include/net/libeth/types.h
-f:include/net/libeth/xdp.h
-f:include/net/libeth/xsk.h
-f:include/net/llc.h
-f:include/net/llc_c_ac.h
-f:include/net/llc_c_ev.h
-f:include/net/llc_c_st.h
-f:include/net/llc_conn.h
-f:include/net/llc_if.h
-f:include/net/llc_pdu.h
-f:include/net/llc_s_ac.h
-f:include/net/llc_s_ev.h
-f:include/net/llc_s_st.h
-f:include/net/llc_sap.h
-f:include/net/lwtunnel.h
-f:include/net/mac80211.h
-f:include/net/mac802154.h
-f:include/net/macsec.h
-f:include/net/mana/gdma.h
-f:include/net/mana/hw_channel.h
-f:include/net/mana/mana.h
-f:include/net/mana/mana_auxiliary.h
-f:include/net/mana/shm_channel.h
-f:include/net/mctp.h
-f:include/net/mctpdevice.h
-f:include/net/mip6.h
-f:include/net/mld.h
-f:include/net/mpls.h
-f:include/net/mpls_iptunnel.h
-f:include/net/mptcp.h
-f:include/net/mrp.h
-f:include/net/ncsi.h
-f:include/net/ndisc.h
-f:include/net/neighbour.h
-f:include/net/neighbour_tables.h
-f:include/net/net_debug.h
-f:include/net/net_failover.h
-f:include/net/net_namespace.h
-f:include/net/net_ratelimit.h
-f:include/net/net_shaper.h
-f:include/net/net_trackers.h
-f:include/net/netdev_lock.h
-f:include/net/netdev_netlink.h
-f:include/net/netdev_queues.h
-f:include/net/netdev_rx_queue.h
-f:include/net/netevent.h
-f:include/net/netfilter/br_netfilter.h
-f:include/net/netfilter/ipv4/nf_conntrack_ipv4.h
-f:include/net/netfilter/ipv4/nf_defrag_ipv4.h
-f:include/net/netfilter/ipv4/nf_dup_ipv4.h
-f:include/net/netfilter/ipv4/nf_reject.h
-f:include/net/netfilter/ipv6/nf_conntrack_ipv6.h
-f:include/net/netfilter/ipv6/nf_defrag_ipv6.h
-f:include/net/netfilter/ipv6/nf_dup_ipv6.h
-f:include/net/netfilter/ipv6/nf_reject.h
-f:include/net/netfilter/nf_bpf_link.h
-f:include/net/netfilter/nf_conntrack.h
-f:include/net/netfilter/nf_conntrack_acct.h
-f:include/net/netfilter/nf_conntrack_act_ct.h
-f:include/net/netfilter/nf_conntrack_bpf.h
-f:include/net/netfilter/nf_conntrack_bridge.h
-f:include/net/netfilter/nf_conntrack_core.h
-f:include/net/netfilter/nf_conntrack_count.h
-f:include/net/netfilter/nf_conntrack_ecache.h
-f:include/net/netfilter/nf_conntrack_expect.h
-f:include/net/netfilter/nf_conntrack_extend.h
-f:include/net/netfilter/nf_conntrack_helper.h
-f:include/net/netfilter/nf_conntrack_l4proto.h
-f:include/net/netfilter/nf_conntrack_labels.h
-f:include/net/netfilter/nf_conntrack_seqadj.h
-f:include/net/netfilter/nf_conntrack_synproxy.h
-f:include/net/netfilter/nf_conntrack_timeout.h
-f:include/net/netfilter/nf_conntrack_timestamp.h
-f:include/net/netfilter/nf_conntrack_tuple.h
-f:include/net/netfilter/nf_conntrack_zones.h
-f:include/net/netfilter/nf_dup_netdev.h
-f:include/net/netfilter/nf_flow_table.h
-f:include/net/netfilter/nf_hooks_lwtunnel.h
-f:include/net/netfilter/nf_log.h
-f:include/net/netfilter/nf_nat.h
-f:include/net/netfilter/nf_nat_helper.h
-f:include/net/netfilter/nf_nat_masquerade.h
-f:include/net/netfilter/nf_nat_redirect.h
-f:include/net/netfilter/nf_queue.h
-f:include/net/netfilter/nf_reject.h
-f:include/net/netfilter/nf_socket.h
-f:include/net/netfilter/nf_synproxy.h
-f:include/net/netfilter/nf_tables.h
-f:include/net/netfilter/nf_tables_core.h
-f:include/net/netfilter/nf_tables_ipv4.h
-f:include/net/netfilter/nf_tables_ipv6.h
-f:include/net/netfilter/nf_tables_offload.h
-f:include/net/netfilter/nf_tproxy.h
-f:include/net/netfilter/nft_fib.h
-f:include/net/netfilter/nft_meta.h
-f:include/net/netfilter/nft_reject.h
-f:include/net/netfilter/xt_rateest.h
-f:include/net/netkit.h
-f:include/net/netlabel.h
-f:include/net/netlink.h
-f:include/net/netmem.h
-f:include/net/netns/bpf.h
-f:include/net/netns/can.h
-f:include/net/netns/conntrack.h
-f:include/net/netns/core.h
-f:include/net/netns/flow_table.h
-f:include/net/netns/generic.h
-f:include/net/netns/hash.h
-f:include/net/netns/ieee802154_6lowpan.h
-f:include/net/netns/ipv4.h
-f:include/net/netns/ipv6.h
-f:include/net/netns/mctp.h
-f:include/net/netns/mib.h
-f:include/net/netns/mpls.h
-f:include/net/netns/netfilter.h
-f:include/net/netns/nexthop.h
-f:include/net/netns/nftables.h
-f:include/net/netns/packet.h
-f:include/net/netns/sctp.h
-f:include/net/netns/smc.h
-f:include/net/netns/unix.h
-f:include/net/netns/xdp.h
-f:include/net/netns/xfrm.h
-f:include/net/netprio_cgroup.h
-f:include/net/netrom.h
-f:include/net/nexthop.h
-f:include/net/nfc/digital.h
-f:include/net/nfc/hci.h
-f:include/net/nfc/llc.h
-f:include/net/nfc/nci.h
-f:include/net/nfc/nci_core.h
-f:include/net/nfc/nfc.h
-f:include/net/nl802154.h
-f:include/net/nsh.h
-f:include/net/page_pool/helpers.h
-f:include/net/page_pool/memory_provider.h
-f:include/net/page_pool/types.h
-f:include/net/pfcp.h
-f:include/net/phonet/gprs.h
-f:include/net/phonet/pep.h
-f:include/net/phonet/phonet.h
-f:include/net/phonet/pn_dev.h
-f:include/net/pie.h
-f:include/net/ping.h
-f:include/net/pkt_cls.h
-f:include/net/pkt_sched.h
-f:include/net/pptp.h
-f:include/net/proto_memory.h
-f:include/net/protocol.h
-f:include/net/psample.h
-f:include/net/psnap.h
-f:include/net/raw.h
-f:include/net/rawv6.h
-f:include/net/red.h
-f:include/net/regulatory.h
-f:include/net/request_sock.h
-f:include/net/rose.h
-f:include/net/route.h
-f:include/net/rpl.h
-f:include/net/rps.h
-f:include/net/rsi_91x.h
-f:include/net/rstreason.h
-f:include/net/rtnetlink.h
-f:include/net/rtnh.h
-f:include/net/sch_generic.h
-f:include/net/scm.h
-f:include/net/sctp/auth.h
-f:include/net/sctp/checksum.h
-f:include/net/sctp/command.h
-f:include/net/sctp/constants.h
-f:include/net/sctp/sctp.h
-f:include/net/sctp/sm.h
-f:include/net/sctp/stream_interleave.h
-f:include/net/sctp/stream_sched.h
-f:include/net/sctp/structs.h
-f:include/net/sctp/tsnmap.h
-f:include/net/sctp/ulpevent.h
-f:include/net/sctp/ulpqueue.h
-f:include/net/secure_seq.h
-f:include/net/seg6.h
-f:include/net/seg6_hmac.h
-f:include/net/seg6_local.h
-f:include/net/selftests.h
-f:include/net/slhc_vj.h
-f:include/net/smc.h
-f:include/net/snmp.h
-f:include/net/sock.h
-f:include/net/sock_reuseport.h
-f:include/net/stp.h
-f:include/net/strparser.h
-f:include/net/switchdev.h
-f:include/net/tc_act/tc_bpf.h
-f:include/net/tc_act/tc_connmark.h
-f:include/net/tc_act/tc_csum.h
-f:include/net/tc_act/tc_ct.h
-f:include/net/tc_act/tc_ctinfo.h
-f:include/net/tc_act/tc_defact.h
-f:include/net/tc_act/tc_gact.h
-f:include/net/tc_act/tc_gate.h
-f:include/net/tc_act/tc_ife.h
-f:include/net/tc_act/tc_mirred.h
-f:include/net/tc_act/tc_mpls.h
-f:include/net/tc_act/tc_nat.h
-f:include/net/tc_act/tc_pedit.h
-f:include/net/tc_act/tc_police.h
-f:include/net/tc_act/tc_sample.h
-f:include/net/tc_act/tc_skbedit.h
-f:include/net/tc_act/tc_skbmod.h
-f:include/net/tc_act/tc_tunnel_key.h
-f:include/net/tc_act/tc_vlan.h
-f:include/net/tc_wrapper.h
-f:include/net/tcp.h
-f:include/net/tcp_ao.h
-f:include/net/tcp_states.h
-f:include/net/tcx.h
-f:include/net/timewait_sock.h
-f:include/net/tipc.h
-f:include/net/tls.h
-f:include/net/tls_prot.h
-f:include/net/tls_toe.h
-f:include/net/transp_v6.h
-f:include/net/tso.h
-f:include/net/tun_proto.h
-f:include/net/udp.h
-f:include/net/udp_tunnel.h
-f:include/net/udplite.h
-f:include/net/vsock_addr.h
-f:include/net/vxlan.h
-f:include/net/wext.h
-f:include/net/x25.h
-f:include/net/x25device.h
-f:include/net/xdp.h
-f:include/net/xdp_priv.h
-f:include/net/xdp_sock.h
-f:include/net/xdp_sock_drv.h
-f:include/net/xfrm.h
-f:include/net/xsk_buff_pool.h
-f:include/pcmcia/ciscode.h
-f:include/pcmcia/cisreg.h
-f:include/pcmcia/cistpl.h
-f:include/pcmcia/device_id.h
-f:include/pcmcia/ds.h
-f:include/pcmcia/soc_common.h
-f:include/pcmcia/ss.h
-f:include/ras/ras_event.h
-f:include/rdma/ib.h
-f:include/rdma/ib_addr.h
-f:include/rdma/ib_cache.h
-f:include/rdma/ib_cm.h
-f:include/rdma/ib_hdrs.h
-f:include/rdma/ib_mad.h
-f:include/rdma/ib_marshall.h
-f:include/rdma/ib_pack.h
-f:include/rdma/ib_pma.h
-f:include/rdma/ib_sa.h
-f:include/rdma/ib_smi.h
-f:include/rdma/ib_sysfs.h
-f:include/rdma/ib_ucaps.h
-f:include/rdma/ib_umem.h
-f:include/rdma/ib_umem_odp.h
-f:include/rdma/ib_verbs.h
-f:include/rdma/iba.h
-f:include/rdma/ibta_vol1_c12.h
-f:include/rdma/iw_cm.h
-f:include/rdma/iw_portmap.h
-f:include/rdma/lag.h
-f:include/rdma/mr_pool.h
-f:include/rdma/opa_addr.h
-f:include/rdma/opa_port_info.h
-f:include/rdma/opa_smi.h
-f:include/rdma/opa_vnic.h
-f:include/rdma/rdma_cm.h
-f:include/rdma/rdma_cm_ib.h
-f:include/rdma/rdma_counter.h
-f:include/rdma/rdma_netlink.h
-f:include/rdma/rdma_vt.h
-f:include/rdma/rdmavt_cq.h
-f:include/rdma/rdmavt_mr.h
-f:include/rdma/rdmavt_qp.h
-f:include/rdma/restrack.h
-f:include/rdma/rw.h
-f:include/rdma/signature.h
-f:include/rdma/tid_rdma_defs.h
-f:include/rdma/uverbs_ioctl.h
-f:include/rdma/uverbs_named_ioctl.h
-f:include/rdma/uverbs_std_types.h
-f:include/rdma/uverbs_types.h
-f:include/rv/automata.h
-f:include/rv/da_monitor.h
-f:include/rv/instrumentation.h
-f:include/rv/ltl_monitor.h
-f:include/scsi/fc/fc_encaps.h
-f:include/scsi/fc/fc_fc2.h
-f:include/scsi/fc/fc_fcoe.h
-f:include/scsi/fc/fc_fcp.h
-f:include/scsi/fc/fc_fip.h
-f:include/scsi/fc/fc_ms.h
-f:include/scsi/fc_frame.h
-f:include/scsi/fcoe_sysfs.h
-f:include/scsi/iscsi_if.h
-f:include/scsi/iscsi_proto.h
-f:include/scsi/iser.h
-f:include/scsi/libfc.h
-f:include/scsi/libfcoe.h
-f:include/scsi/libiscsi.h
-f:include/scsi/libiscsi_tcp.h
-f:include/scsi/libsas.h
-f:include/scsi/sas.h
-f:include/scsi/sas_ata.h
-f:include/scsi/scsi.h
-f:include/scsi/scsi_bsg_iscsi.h
-f:include/scsi/scsi_cmnd.h
-f:include/scsi/scsi_common.h
-f:include/scsi/scsi_dbg.h
-f:include/scsi/scsi_device.h
-f:include/scsi/scsi_devinfo.h
-f:include/scsi/scsi_dh.h
-f:include/scsi/scsi_driver.h
-f:include/scsi/scsi_eh.h
-f:include/scsi/scsi_host.h
-f:include/scsi/scsi_ioctl.h
-f:include/scsi/scsi_proto.h
-f:include/scsi/scsi_status.h
-f:include/scsi/scsi_tcq.h
-f:include/scsi/scsi_transport.h
-f:include/scsi/scsi_transport_fc.h
-f:include/scsi/scsi_transport_iscsi.h
-f:include/scsi/scsi_transport_sas.h
-f:include/scsi/scsi_transport_spi.h
-f:include/scsi/scsi_transport_srp.h
-f:include/scsi/scsicam.h
-f:include/scsi/sg.h
-f:include/scsi/srp.h
-f:include/scsi/viosrp.h
-f:include/soc/amlogic/meson_ddr_pmu.h
-f:include/soc/arc/arc_aux.h
-f:include/soc/arc/mcip.h
-f:include/soc/arc/timers.h
-f:include/soc/at91/at91sam9_ddrsdr.h
-f:include/soc/at91/at91sam9_sdramc.h
-f:include/soc/at91/atmel-secumod.h
-f:include/soc/at91/atmel-sfr.h
-f:include/soc/at91/atmel_tcb.h
-f:include/soc/at91/sama7-ddr.h
-f:include/soc/at91/sama7-sfrbu.h
-f:include/soc/bcm2835/raspberrypi-firmware.h
-f:include/soc/canaan/k210-sysctl.h
-f:include/soc/fsl/bman.h
-f:include/soc/fsl/caam-blob.h
-f:include/soc/fsl/cpm.h
-f:include/soc/fsl/dcp.h
-f:include/soc/fsl/dpaa2-fd.h
-f:include/soc/fsl/dpaa2-global.h
-f:include/soc/fsl/dpaa2-io.h
-f:include/soc/fsl/qe/immap_qe.h
-f:include/soc/fsl/qe/qe.h
-f:include/soc/fsl/qe/qe_tdm.h
-f:include/soc/fsl/qe/qmc.h
-f:include/soc/fsl/qe/ucc.h
-f:include/soc/fsl/qe/ucc_fast.h
-f:include/soc/fsl/qe/ucc_slow.h
-f:include/soc/fsl/qman.h
-f:include/soc/imx/cpu.h
-f:include/soc/imx/cpuidle.h
-f:include/soc/imx/revision.h
-f:include/soc/mediatek/smi.h
-f:include/soc/microchip/mpfs.h
-f:include/soc/mscc/ocelot.h
-f:include/soc/mscc/ocelot_ana.h
-f:include/soc/mscc/ocelot_dev.h
-f:include/soc/mscc/ocelot_hsio.h
-f:include/soc/mscc/ocelot_ptp.h
-f:include/soc/mscc/ocelot_qsys.h
-f:include/soc/mscc/ocelot_sys.h
-f:include/soc/mscc/ocelot_vcap.h
-f:include/soc/mscc/vsc7514_regs.h
-f:include/soc/nuvoton/clock-npcm8xx.h
-f:include/soc/qcom/cmd-db.h
-f:include/soc/qcom/ice.h
-f:include/soc/qcom/kryo-l2-accessors.h
-f:include/soc/qcom/ocmem.h
-f:include/soc/qcom/qcom-spmi-pmic.h
-f:include/soc/qcom/rpmh.h
-f:include/soc/qcom/spm.h
-f:include/soc/qcom/tcs.h
-f:include/soc/rockchip/pm_domains.h
-f:include/soc/rockchip/rk3399_grf.h
-f:include/soc/rockchip/rk3568_grf.h
-f:include/soc/rockchip/rk3588_grf.h
-f:include/soc/rockchip/rockchip_grf.h
-f:include/soc/rockchip/rockchip_sip.h
-f:include/soc/sa1100/pwer.h
-f:include/soc/sifive/sifive_ccache.h
-f:include/soc/spacemit/k1-syscon.h
-f:include/soc/starfive/reset-starfive-jh71x0.h
-f:include/soc/tegra/ahb.h
-f:include/soc/tegra/bpmp-abi.h
-f:include/soc/tegra/bpmp.h
-f:include/soc/tegra/common.h
-f:include/soc/tegra/cpuidle.h
-f:include/soc/tegra/flowctrl.h
-f:include/soc/tegra/fuse.h
-f:include/soc/tegra/irq.h
-f:include/soc/tegra/ivc.h
-f:include/soc/tegra/mc.h
-f:include/soc/tegra/pm.h
-f:include/soc/tegra/pmc.h
-f:include/soc/tegra/tegra-cbb.h
-f:include/sound/ac97/codec.h
-f:include/sound/ac97/compat.h
-f:include/sound/ac97/controller.h
-f:include/sound/ac97/regs.h
-f:include/sound/ac97_codec.h
-f:include/sound/aci.h
-f:include/sound/acp63_chip_offset_byte.h
-f:include/sound/ad1816a.h
-f:include/sound/ad1843.h
-f:include/sound/ak4113.h
-f:include/sound/ak4114.h
-f:include/sound/ak4117.h
-f:include/sound/ak4531_codec.h
-f:include/sound/ak4641.h
-f:include/sound/ak4xxx-adda.h
-f:include/sound/alc5623.h
-f:include/sound/asequencer.h
-f:include/sound/asound.h
-f:include/sound/asoundef.h
-f:include/sound/compress_driver.h
-f:include/sound/control.h
-f:include/sound/core.h
-f:include/sound/cs-amp-lib.h
-f:include/sound/cs35l33.h
-f:include/sound/cs35l34.h
-f:include/sound/cs35l35.h
-f:include/sound/cs35l36.h
-f:include/sound/cs35l41.h
-f:include/sound/cs35l56.h
-f:include/sound/cs4231-regs.h
-f:include/sound/cs4271.h
-f:include/sound/cs42l42.h
-f:include/sound/cs42l43.h
-f:include/sound/cs48l32.h
-f:include/sound/cs48l32_registers.h
-f:include/sound/cs8403.h
-f:include/sound/cs8427.h
-f:include/sound/da7213.h
-f:include/sound/da7218.h
-f:include/sound/da7219-aad.h
-f:include/sound/da7219.h
-f:include/sound/da9055.h
-f:include/sound/designware_i2s.h
-f:include/sound/dmaengine_pcm.h
-f:include/sound/emu10k1.h
-f:include/sound/emu10k1_synth.h
-f:include/sound/emu8000.h
-f:include/sound/emu8000_reg.h
-f:include/sound/emux_legacy.h
-f:include/sound/emux_synth.h
-f:include/sound/es1688.h
-f:include/sound/graph_card.h
-f:include/sound/gus.h
-f:include/sound/hda-mlink.h
-f:include/sound/hda-sdw-bpt.h
-f:include/sound/hda_chmap.h
-f:include/sound/hda_codec.h
-f:include/sound/hda_component.h
-f:include/sound/hda_hwdep.h
-f:include/sound/hda_i915.h
-f:include/sound/hda_register.h
-f:include/sound/hda_regmap.h
-f:include/sound/hda_verbs.h
-f:include/sound/hdaudio.h
-f:include/sound/hdaudio_ext.h
-f:include/sound/hdmi-codec.h
-f:include/sound/hwdep.h
-f:include/sound/i2c.h
-f:include/sound/info.h
-f:include/sound/initval.h
-f:include/sound/intel-dsp-config.h
-f:include/sound/intel-nhlt.h
-f:include/sound/jack.h
-f:include/sound/madera-pdata.h
-f:include/sound/max9768.h
-f:include/sound/max98088.h
-f:include/sound/max98090.h
-f:include/sound/max98095.h
-f:include/sound/memalloc.h
-f:include/sound/minors.h
-f:include/sound/mixer_oss.h
-f:include/sound/mpu401.h
-f:include/sound/omap-hdmi-audio.h
-f:include/sound/opl3.h
-f:include/sound/opl4.h
-f:include/sound/pcm-indirect.h
-f:include/sound/pcm.h
-f:include/sound/pcm_drm_eld.h
-f:include/sound/pcm_iec958.h
-f:include/sound/pcm_oss.h
-f:include/sound/pcm_params.h
-f:include/sound/pt2258.h
-f:include/sound/pxa2xx-lib.h
-f:include/sound/q6usboffload.h
-f:include/sound/rawmidi.h
-f:include/sound/rt1015.h
-f:include/sound/rt1318.h
-f:include/sound/rt286.h
-f:include/sound/rt298.h
-f:include/sound/rt5514.h
-f:include/sound/rt5659.h
-f:include/sound/rt5660.h
-f:include/sound/rt5663.h
-f:include/sound/rt5665.h
-f:include/sound/rt5668.h
-f:include/sound/rt5682.h
-f:include/sound/rt5682s.h
-f:include/sound/sb.h
-f:include/sound/sb16_csp.h
-f:include/sound/sdca.h
-f:include/sound/sdca_asoc.h
-f:include/sound/sdca_function.h
-f:include/sound/sdca_hid.h
-f:include/sound/sdca_interrupts.h
-f:include/sound/sdca_regmap.h
-f:include/sound/sdw.h
-f:include/sound/seq_device.h
-f:include/sound/seq_kernel.h
-f:include/sound/seq_midi_emul.h
-f:include/sound/seq_midi_event.h
-f:include/sound/seq_oss.h
-f:include/sound/seq_oss_legacy.h
-f:include/sound/seq_virmidi.h
-f:include/sound/sh_dac_audio.h
-f:include/sound/sh_fsi.h
-f:include/sound/simple_card.h
-f:include/sound/simple_card_utils.h
-f:include/sound/snd_wavefront.h
-f:include/sound/soc-acpi-intel-match.h
-f:include/sound/soc-acpi-intel-ssp-common.h
-f:include/sound/soc-acpi.h
-f:include/sound/soc-card.h
-f:include/sound/soc-component.h
-f:include/sound/soc-dai.h
-f:include/sound/soc-dapm.h
-f:include/sound/soc-dpcm.h
-f:include/sound/soc-jack.h
-f:include/sound/soc-link.h
-f:include/sound/soc-topology.h
-f:include/sound/soc-usb.h
-f:include/sound/soc.h
-f:include/sound/soc_sdw_utils.h
-f:include/sound/sof.h
-f:include/sound/sof/channel_map.h
-f:include/sound/sof/control.h
-f:include/sound/sof/dai-amd.h
-f:include/sound/sof/dai-imx.h
-f:include/sound/sof/dai-intel.h
-f:include/sound/sof/dai-mediatek.h
-f:include/sound/sof/dai.h
-f:include/sound/sof/debug.h
-f:include/sound/sof/ext_manifest.h
-f:include/sound/sof/ext_manifest4.h
-f:include/sound/sof/header.h
-f:include/sound/sof/info.h
-f:include/sound/sof/ipc4/header.h
-f:include/sound/sof/pm.h
-f:include/sound/sof/stream.h
-f:include/sound/sof/topology.h
-f:include/sound/sof/trace.h
-f:include/sound/sof/xtensa.h
-f:include/sound/soundfont.h
-f:include/sound/spear_dma.h
-f:include/sound/spear_spdif.h
-f:include/sound/sta32x.h
-f:include/sound/sta350.h
-f:include/sound/tas2552-plat.h
-f:include/sound/tas2563-tlv.h
-f:include/sound/tas2770-tlv.h
-f:include/sound/tas2781-comlib-i2c.h
-f:include/sound/tas2781-dsp.h
-f:include/sound/tas2781-tlv.h
-f:include/sound/tas2781.h
-f:include/sound/tas5086.h
-f:include/sound/tea6330t.h
-f:include/sound/timer.h
-f:include/sound/tlv.h
-f:include/sound/tlv320aic32x4.h
-f:include/sound/tlv320dac33-plat.h
-f:include/sound/uda1380.h
-f:include/sound/ump.h
-f:include/sound/ump_convert.h
-f:include/sound/ump_msg.h
-f:include/sound/util_mem.h
-f:include/sound/vx_core.h
-f:include/sound/wavefront.h
-f:include/sound/wm0010.h
-f:include/sound/wm2000.h
-f:include/sound/wm2200.h
-f:include/sound/wm5100.h
-f:include/sound/wm8903.h
-f:include/sound/wm8904.h
-f:include/sound/wm8955.h
-f:include/sound/wm8960.h
-f:include/sound/wm8962.h
-f:include/sound/wm8993.h
-f:include/sound/wm8996.h
-f:include/sound/wm9081.h
-f:include/sound/wm9090.h
-f:include/sound/wss.h
-f:include/target/iscsi/iscsi_target_core.h
-f:include/target/iscsi/iscsi_target_stat.h
-f:include/target/iscsi/iscsi_transport.h
-f:include/target/target_core_backend.h
-f:include/target/target_core_base.h
-f:include/target/target_core_fabric.h
-f:include/trace/bpf_probe.h
-f:include/trace/define_custom_trace.h
-f:include/trace/define_trace.h
-f:include/trace/events/9p.h
-f:include/trace/events/afs.h
-f:include/trace/events/alarmtimer.h
-f:include/trace/events/amdxdna.h
-f:include/trace/events/asoc.h
-f:include/trace/events/avc.h
-f:include/trace/events/bcache.h
-f:include/trace/events/block.h
-f:include/trace/events/bpf_test_run.h
-f:include/trace/events/bridge.h
-f:include/trace/events/btrfs.h
-f:include/trace/events/cachefiles.h
-f:include/trace/events/capability.h
-f:include/trace/events/cgroup.h
-f:include/trace/events/clk.h
-f:include/trace/events/cma.h
-f:include/trace/events/compaction.h
-f:include/trace/events/context_tracking.h
-f:include/trace/events/cpuhp.h
-f:include/trace/events/csd.h
-f:include/trace/events/damon.h
-f:include/trace/events/devfreq.h
-f:include/trace/events/devlink.h
-f:include/trace/events/dlm.h
-f:include/trace/events/dma.h
-f:include/trace/events/dma_fence.h
-f:include/trace/events/erofs.h
-f:include/trace/events/error_report.h
-f:include/trace/events/exceptions.h
-f:include/trace/events/ext4.h
-f:include/trace/events/f2fs.h
-f:include/trace/events/fib.h
-f:include/trace/events/fib6.h
-f:include/trace/events/filelock.h
-f:include/trace/events/filemap.h
-f:include/trace/events/firewire.h
-f:include/trace/events/firewire_ohci.h
-f:include/trace/events/fs_dax.h
-f:include/trace/events/fscache.h
-f:include/trace/events/fsi.h
-f:include/trace/events/fsi_master_aspeed.h
-f:include/trace/events/fsi_master_ast_cf.h
-f:include/trace/events/fsi_master_gpio.h
-f:include/trace/events/fsi_master_i2cr.h
-f:include/trace/events/gpio.h
-f:include/trace/events/gpu_mem.h
-f:include/trace/events/habanalabs.h
-f:include/trace/events/handshake.h
-f:include/trace/events/host1x.h
-f:include/trace/events/huge_memory.h
-f:include/trace/events/hugetlbfs.h
-f:include/trace/events/hw_pressure.h
-f:include/trace/events/hwmon.h
-f:include/trace/events/i2c.h
-f:include/trace/events/i2c_slave.h
-f:include/trace/events/ib_mad.h
-f:include/trace/events/ib_umad.h
-f:include/trace/events/icmp.h
-f:include/trace/events/initcall.h
-f:include/trace/events/intel-sst.h
-f:include/trace/events/intel_ifs.h
-f:include/trace/events/intel_ish.h
-f:include/trace/events/io_uring.h
-f:include/trace/events/iocost.h
-f:include/trace/events/iommu.h
-f:include/trace/events/ipi.h
-f:include/trace/events/irq.h
-f:include/trace/events/irq_matrix.h
-f:include/trace/events/iscsi.h
-f:include/trace/events/jbd2.h
-f:include/trace/events/kmem.h
-f:include/trace/events/ksm.h
-f:include/trace/events/kvm.h
-f:include/trace/events/kyber.h
-f:include/trace/events/libata.h
-f:include/trace/events/lock.h
-f:include/trace/events/maple_tree.h
-f:include/trace/events/mce.h
-f:include/trace/events/mctp.h
-f:include/trace/events/mdio.h
-f:include/trace/events/memcg.h
-f:include/trace/events/migrate.h
-f:include/trace/events/mlxsw.h
-f:include/trace/events/mmap.h
-f:include/trace/events/mmap_lock.h
-f:include/trace/events/mmc.h
-f:include/trace/events/mmflags.h
-f:include/trace/events/module.h
-f:include/trace/events/mptcp.h
-f:include/trace/events/napi.h
-f:include/trace/events/nbd.h
-f:include/trace/events/neigh.h
-f:include/trace/events/net.h
-f:include/trace/events/net_probe_common.h
-f:include/trace/events/netfs.h
-f:include/trace/events/netlink.h
-f:include/trace/events/nilfs2.h
-f:include/trace/events/nmi.h
-f:include/trace/events/notifier.h
-f:include/trace/events/objagg.h
-f:include/trace/events/oom.h
-f:include/trace/events/osnoise.h
-f:include/trace/events/page_isolation.h
-f:include/trace/events/page_pool.h
-f:include/trace/events/page_ref.h
-f:include/trace/events/pagemap.h
-f:include/trace/events/percpu.h
-f:include/trace/events/power.h
-f:include/trace/events/power_cpu_migrate.h
-f:include/trace/events/preemptirq.h
-f:include/trace/events/printk.h
-f:include/trace/events/pwc.h
-f:include/trace/events/pwm.h
-f:include/trace/events/qdisc.h
-f:include/trace/events/qla.h
-f:include/trace/events/qrtr.h
-f:include/trace/events/rcu.h
-f:include/trace/events/rdma_core.h
-f:include/trace/events/regulator.h
-f:include/trace/events/rpcgss.h
-f:include/trace/events/rpcrdma.h
-f:include/trace/events/rpm.h
-f:include/trace/events/rseq.h
-f:include/trace/events/rtc.h
-f:include/trace/events/rust_sample.h
-f:include/trace/events/rwmmio.h
-f:include/trace/events/rxrpc.h
-f:include/trace/events/sched.h
-f:include/trace/events/sched_ext.h
-f:include/trace/events/scmi.h
-f:include/trace/events/scsi.h
-f:include/trace/events/sctp.h
-f:include/trace/events/signal.h
-f:include/trace/events/siox.h
-f:include/trace/events/skb.h
-f:include/trace/events/smbus.h
-f:include/trace/events/sock.h
-f:include/trace/events/sof.h
-f:include/trace/events/sof_intel.h
-f:include/trace/events/spi.h
-f:include/trace/events/spmi.h
-f:include/trace/events/sunrpc.h
-f:include/trace/events/sunvnet.h
-f:include/trace/events/swiotlb.h
-f:include/trace/events/syscalls.h
-f:include/trace/events/target.h
-f:include/trace/events/task.h
-f:include/trace/events/tcp.h
-f:include/trace/events/tegra_apb_dma.h
-f:include/trace/events/thp.h
-f:include/trace/events/timer.h
-f:include/trace/events/timer_migration.h
-f:include/trace/events/timestamp.h
-f:include/trace/events/tlb.h
-f:include/trace/events/tsm_mr.h
-f:include/trace/events/udp.h
-f:include/trace/events/v4l2.h
-f:include/trace/events/vb2.h
-f:include/trace/events/vmalloc.h
-f:include/trace/events/vmscan.h
-f:include/trace/events/vsock_virtio_transport_common.h
-f:include/trace/events/watchdog.h
-f:include/trace/events/wbt.h
-f:include/trace/events/workqueue.h
-f:include/trace/events/writeback.h
-f:include/trace/events/xdp.h
-f:include/trace/events/xen.h
-f:include/trace/misc/fs.h
-f:include/trace/misc/nfs.h
-f:include/trace/misc/rdma.h
-f:include/trace/misc/sunrpc.h
-f:include/trace/perf.h
-f:include/trace/stages/init.h
-f:include/trace/stages/stage1_struct_define.h
-f:include/trace/stages/stage2_data_offsets.h
-f:include/trace/stages/stage3_trace_output.h
-f:include/trace/stages/stage4_event_fields.h
-f:include/trace/stages/stage5_get_offsets.h
-f:include/trace/stages/stage6_event_callback.h
-f:include/trace/stages/stage7_class_define.h
-f:include/trace/syscall.h
-f:include/trace/trace_custom_events.h
-f:include/trace/trace_events.h
-f:include/uapi/Kbuild
-f:include/uapi/asm-generic/Kbuild
-f:include/uapi/asm-generic/auxvec.h
-f:include/uapi/asm-generic/bitsperlong.h
-f:include/uapi/asm-generic/bpf_perf_event.h
-f:include/uapi/asm-generic/errno-base.h
-f:include/uapi/asm-generic/errno.h
-f:include/uapi/asm-generic/fcntl.h
-f:include/uapi/asm-generic/hugetlb_encode.h
-f:include/uapi/asm-generic/int-l64.h
-f:include/uapi/asm-generic/int-ll64.h
-f:include/uapi/asm-generic/ioctl.h
-f:include/uapi/asm-generic/ioctls.h
-f:include/uapi/asm-generic/ipcbuf.h
-f:include/uapi/asm-generic/kvm_para.h
-f:include/uapi/asm-generic/mman-common.h
-f:include/uapi/asm-generic/mman.h
-f:include/uapi/asm-generic/msgbuf.h
-f:include/uapi/asm-generic/param.h
-f:include/uapi/asm-generic/poll.h
-f:include/uapi/asm-generic/posix_types.h
-f:include/uapi/asm-generic/resource.h
-f:include/uapi/asm-generic/sembuf.h
-f:include/uapi/asm-generic/setup.h
-f:include/uapi/asm-generic/shmbuf.h
-f:include/uapi/asm-generic/siginfo.h
-f:include/uapi/asm-generic/signal-defs.h
-f:include/uapi/asm-generic/signal.h
-f:include/uapi/asm-generic/socket.h
-f:include/uapi/asm-generic/sockios.h
-f:include/uapi/asm-generic/stat.h
-f:include/uapi/asm-generic/statfs.h
-f:include/uapi/asm-generic/swab.h
-f:include/uapi/asm-generic/termbits-common.h
-f:include/uapi/asm-generic/termbits.h
-f:include/uapi/asm-generic/termios.h
-f:include/uapi/asm-generic/types.h
-f:include/uapi/asm-generic/ucontext.h
-f:include/uapi/asm-generic/unistd.h
-f:include/uapi/cxl/features.h
-f:include/uapi/drm/amdgpu_drm.h
-f:include/uapi/drm/amdxdna_accel.h
-f:include/uapi/drm/armada_drm.h
-f:include/uapi/drm/asahi_drm.h
-f:include/uapi/drm/drm.h
-f:include/uapi/drm/drm_fourcc.h
-f:include/uapi/drm/drm_mode.h
-f:include/uapi/drm/drm_sarea.h
-f:include/uapi/drm/etnaviv_drm.h
-f:include/uapi/drm/exynos_drm.h
-f:include/uapi/drm/habanalabs_accel.h
-f:include/uapi/drm/i915_drm.h
-f:include/uapi/drm/ivpu_accel.h
-f:include/uapi/drm/lima_drm.h
-f:include/uapi/drm/msm_drm.h
-f:include/uapi/drm/nouveau_drm.h
-f:include/uapi/drm/nova_drm.h
-f:include/uapi/drm/omap_drm.h
-f:include/uapi/drm/panfrost_drm.h
-f:include/uapi/drm/panthor_drm.h
-f:include/uapi/drm/pvr_drm.h
-f:include/uapi/drm/qaic_accel.h
-f:include/uapi/drm/qxl_drm.h
-f:include/uapi/drm/radeon_drm.h
-f:include/uapi/drm/tegra_drm.h
-f:include/uapi/drm/v3d_drm.h
-f:include/uapi/drm/vc4_drm.h
-f:include/uapi/drm/vgem_drm.h
-f:include/uapi/drm/virtgpu_drm.h
-f:include/uapi/drm/vmwgfx_drm.h
-f:include/uapi/drm/xe_drm.h
-f:include/uapi/fwctl/cxl.h
-f:include/uapi/fwctl/fwctl.h
-f:include/uapi/fwctl/mlx5.h
-f:include/uapi/fwctl/pds.h
-f:include/uapi/linux/a.out.h
-f:include/uapi/linux/acct.h
-f:include/uapi/linux/acrn.h
-f:include/uapi/linux/adb.h
-f:include/uapi/linux/adfs_fs.h
-f:include/uapi/linux/affs_hardblocks.h
-f:include/uapi/linux/agpgart.h
-f:include/uapi/linux/aio_abi.h
-f:include/uapi/linux/am437x-vpfe.h
-f:include/uapi/linux/amt.h
-f:include/uapi/linux/android/binder.h
-f:include/uapi/linux/android/binderfs.h
-f:include/uapi/linux/apm_bios.h
-f:include/uapi/linux/arcfb.h
-f:include/uapi/linux/arm_sdei.h
-f:include/uapi/linux/aspeed-lpc-ctrl.h
-f:include/uapi/linux/aspeed-p2a-ctrl.h
-f:include/uapi/linux/aspeed-video.h
-f:include/uapi/linux/atalk.h
-f:include/uapi/linux/atm.h
-f:include/uapi/linux/atm_eni.h
-f:include/uapi/linux/atm_he.h
-f:include/uapi/linux/atm_idt77105.h
-f:include/uapi/linux/atm_nicstar.h
-f:include/uapi/linux/atm_tcp.h
-f:include/uapi/linux/atm_zatm.h
-f:include/uapi/linux/atmapi.h
-f:include/uapi/linux/atmarp.h
-f:include/uapi/linux/atmbr2684.h
-f:include/uapi/linux/atmclip.h
-f:include/uapi/linux/atmdev.h
-f:include/uapi/linux/atmioc.h
-f:include/uapi/linux/atmlec.h
-f:include/uapi/linux/atmmpc.h
-f:include/uapi/linux/atmppp.h
-f:include/uapi/linux/atmsap.h
-f:include/uapi/linux/atmsvc.h
-f:include/uapi/linux/audit.h
-f:include/uapi/linux/auto_dev-ioctl.h
-f:include/uapi/linux/auto_fs.h
-f:include/uapi/linux/auto_fs4.h
-f:include/uapi/linux/auxvec.h
-f:include/uapi/linux/ax25.h
-f:include/uapi/linux/batadv_packet.h
-f:include/uapi/linux/batman_adv.h
-f:include/uapi/linux/baycom.h
-f:include/uapi/linux/bcm933xx_hcs.h
-f:include/uapi/linux/bfs_fs.h
-f:include/uapi/linux/binfmts.h
-f:include/uapi/linux/bits.h
-f:include/uapi/linux/blk-crypto.h
-f:include/uapi/linux/blkdev.h
-f:include/uapi/linux/blkpg.h
-f:include/uapi/linux/blktrace_api.h
-f:include/uapi/linux/blkzoned.h
-f:include/uapi/linux/bpf.h
-f:include/uapi/linux/bpf_common.h
-f:include/uapi/linux/bpf_perf_event.h
-f:include/uapi/linux/bpqether.h
-f:include/uapi/linux/bsg.h
-f:include/uapi/linux/bt-bmc.h
-f:include/uapi/linux/btf.h
-f:include/uapi/linux/btrfs.h
-f:include/uapi/linux/btrfs_tree.h
-f:include/uapi/linux/byteorder/big_endian.h
-f:include/uapi/linux/byteorder/little_endian.h
-f:include/uapi/linux/cachefiles.h
-f:include/uapi/linux/caif/caif_socket.h
-f:include/uapi/linux/caif/if_caif.h
-f:include/uapi/linux/can.h
-f:include/uapi/linux/can/bcm.h
-f:include/uapi/linux/can/error.h
-f:include/uapi/linux/can/gw.h
-f:include/uapi/linux/can/isotp.h
-f:include/uapi/linux/can/j1939.h
-f:include/uapi/linux/can/netlink.h
-f:include/uapi/linux/can/raw.h
-f:include/uapi/linux/can/vxcan.h
-f:include/uapi/linux/capability.h
-f:include/uapi/linux/capi.h
-f:include/uapi/linux/cciss_defs.h
-f:include/uapi/linux/cciss_ioctl.h
-f:include/uapi/linux/ccs.h
-f:include/uapi/linux/cdrom.h
-f:include/uapi/linux/cec-funcs.h
-f:include/uapi/linux/cec.h
-f:include/uapi/linux/cfm_bridge.h
-f:include/uapi/linux/cgroupstats.h
-f:include/uapi/linux/chio.h
-f:include/uapi/linux/cifs/cifs_mount.h
-f:include/uapi/linux/cifs/cifs_netlink.h
-f:include/uapi/linux/close_range.h
-f:include/uapi/linux/cn_proc.h
-f:include/uapi/linux/coda.h
-f:include/uapi/linux/coff.h
-f:include/uapi/linux/comedi.h
-f:include/uapi/linux/connector.h
-f:include/uapi/linux/const.h
-f:include/uapi/linux/coredump.h
-f:include/uapi/linux/coresight-stm.h
-f:include/uapi/linux/counter.h
-f:include/uapi/linux/counter/microchip-tcb-capture.h
-f:include/uapi/linux/cramfs_fs.h
-f:include/uapi/linux/cryptouser.h
-f:include/uapi/linux/cuda.h
-f:include/uapi/linux/cxl_mem.h
-f:include/uapi/linux/cyclades.h
-f:include/uapi/linux/cycx_cfm.h
-f:include/uapi/linux/dcbnl.h
-f:include/uapi/linux/dccp.h
-f:include/uapi/linux/devlink.h
-f:include/uapi/linux/dlm.h
-f:include/uapi/linux/dlm_device.h
-f:include/uapi/linux/dlm_plock.h
-f:include/uapi/linux/dlmconstants.h
-f:include/uapi/linux/dm-ioctl.h
-f:include/uapi/linux/dm-log-userspace.h
-f:include/uapi/linux/dma-buf.h
-f:include/uapi/linux/dma-heap.h
-f:include/uapi/linux/dns_resolver.h
-f:include/uapi/linux/dpll.h
-f:include/uapi/linux/dqblk_xfs.h
-f:include/uapi/linux/dvb/audio.h
-f:include/uapi/linux/dvb/ca.h
-f:include/uapi/linux/dvb/dmx.h
-f:include/uapi/linux/dvb/frontend.h
-f:include/uapi/linux/dvb/net.h
-f:include/uapi/linux/dvb/osd.h
-f:include/uapi/linux/dvb/version.h
-f:include/uapi/linux/dvb/video.h
-f:include/uapi/linux/dw100.h
-f:include/uapi/linux/edd.h
-f:include/uapi/linux/efs_fs_sb.h
-f:include/uapi/linux/elf-em.h
-f:include/uapi/linux/elf-fdpic.h
-f:include/uapi/linux/elf.h
-f:include/uapi/linux/errno.h
-f:include/uapi/linux/errqueue.h
-f:include/uapi/linux/erspan.h
-f:include/uapi/linux/ethtool.h
-f:include/uapi/linux/ethtool_netlink.h
-f:include/uapi/linux/ethtool_netlink_generated.h
-f:include/uapi/linux/eventfd.h
-f:include/uapi/linux/eventpoll.h
-f:include/uapi/linux/exfat.h
-f:include/uapi/linux/ext4.h
-f:include/uapi/linux/f2fs.h
-f:include/uapi/linux/fadvise.h
-f:include/uapi/linux/falloc.h
-f:include/uapi/linux/fanotify.h
-f:include/uapi/linux/fb.h
-f:include/uapi/linux/fcntl.h
-f:include/uapi/linux/fd.h
-f:include/uapi/linux/fdreg.h
-f:include/uapi/linux/fib_rules.h
-f:include/uapi/linux/fiemap.h
-f:include/uapi/linux/filter.h
-f:include/uapi/linux/firewire-cdev.h
-f:include/uapi/linux/firewire-constants.h
-f:include/uapi/linux/fou.h
-f:include/uapi/linux/fpga-dfl.h
-f:include/uapi/linux/fs.h
-f:include/uapi/linux/fscrypt.h
-f:include/uapi/linux/fsi.h
-f:include/uapi/linux/fsl_hypervisor.h
-f:include/uapi/linux/fsl_mc.h
-f:include/uapi/linux/fsmap.h
-f:include/uapi/linux/fsverity.h
-f:include/uapi/linux/fuse.h
-f:include/uapi/linux/futex.h
-f:include/uapi/linux/gameport.h
-f:include/uapi/linux/gen_stats.h
-f:include/uapi/linux/genetlink.h
-f:include/uapi/linux/genwqe/genwqe_card.h
-f:include/uapi/linux/gfs2_ondisk.h
-f:include/uapi/linux/gpio.h
-f:include/uapi/linux/gsmmux.h
-f:include/uapi/linux/gtp.h
-f:include/uapi/linux/handshake.h
-f:include/uapi/linux/hash_info.h
-f:include/uapi/linux/hdlc.h
-f:include/uapi/linux/hdlc/ioctl.h
-f:include/uapi/linux/hdlcdrv.h
-f:include/uapi/linux/hdreg.h
-f:include/uapi/linux/hid.h
-f:include/uapi/linux/hiddev.h
-f:include/uapi/linux/hidraw.h
-f:include/uapi/linux/hpet.h
-f:include/uapi/linux/hsi/cs-protocol.h
-f:include/uapi/linux/hsi/hsi_char.h
-f:include/uapi/linux/hsr_netlink.h
-f:include/uapi/linux/hw_breakpoint.h
-f:include/uapi/linux/hyperv.h
-f:include/uapi/linux/i2c-dev.h
-f:include/uapi/linux/i2c.h
-f:include/uapi/linux/i2o-dev.h
-f:include/uapi/linux/i8k.h
-f:include/uapi/linux/icmp.h
-f:include/uapi/linux/icmpv6.h
-f:include/uapi/linux/idxd.h
-f:include/uapi/linux/if.h
-f:include/uapi/linux/if_addr.h
-f:include/uapi/linux/if_addrlabel.h
-f:include/uapi/linux/if_alg.h
-f:include/uapi/linux/if_arcnet.h
-f:include/uapi/linux/if_arp.h
-f:include/uapi/linux/if_bonding.h
-f:include/uapi/linux/if_bridge.h
-f:include/uapi/linux/if_eql.h
-f:include/uapi/linux/if_ether.h
-f:include/uapi/linux/if_fc.h
-f:include/uapi/linux/if_fddi.h
-f:include/uapi/linux/if_hippi.h
-f:include/uapi/linux/if_infiniband.h
-f:include/uapi/linux/if_link.h
-f:include/uapi/linux/if_ltalk.h
-f:include/uapi/linux/if_macsec.h
-f:include/uapi/linux/if_packet.h
-f:include/uapi/linux/if_phonet.h
-f:include/uapi/linux/if_plip.h
-f:include/uapi/linux/if_ppp.h
-f:include/uapi/linux/if_pppol2tp.h
-f:include/uapi/linux/if_pppox.h
-f:include/uapi/linux/if_slip.h
-f:include/uapi/linux/if_team.h
-f:include/uapi/linux/if_tun.h
-f:include/uapi/linux/if_tunnel.h
-f:include/uapi/linux/if_vlan.h
-f:include/uapi/linux/if_x25.h
-f:include/uapi/linux/if_xdp.h
-f:include/uapi/linux/ife.h
-f:include/uapi/linux/igmp.h
-f:include/uapi/linux/iio/buffer.h
-f:include/uapi/linux/iio/events.h
-f:include/uapi/linux/iio/types.h
-f:include/uapi/linux/ila.h
-f:include/uapi/linux/in.h
-f:include/uapi/linux/in6.h
-f:include/uapi/linux/in_route.h
-f:include/uapi/linux/inet_diag.h
-f:include/uapi/linux/inotify.h
-f:include/uapi/linux/input-event-codes.h
-f:include/uapi/linux/input.h
-f:include/uapi/linux/io_uring.h
-f:include/uapi/linux/io_uring/mock_file.h
-f:include/uapi/linux/ioam6.h
-f:include/uapi/linux/ioam6_genl.h
-f:include/uapi/linux/ioam6_iptunnel.h
-f:include/uapi/linux/ioctl.h
-f:include/uapi/linux/iommufd.h
-f:include/uapi/linux/ioprio.h
-f:include/uapi/linux/ip.h
-f:include/uapi/linux/ip6_tunnel.h
-f:include/uapi/linux/ip_vs.h
-f:include/uapi/linux/ipc.h
-f:include/uapi/linux/ipmi.h
-f:include/uapi/linux/ipmi_bmc.h
-f:include/uapi/linux/ipmi_msgdefs.h
-f:include/uapi/linux/ipmi_ssif_bmc.h
-f:include/uapi/linux/ipsec.h
-f:include/uapi/linux/ipv6.h
-f:include/uapi/linux/ipv6_route.h
-f:include/uapi/linux/irqnr.h
-f:include/uapi/linux/isdn/capicmd.h
-f:include/uapi/linux/iso_fs.h
-f:include/uapi/linux/isst_if.h
-f:include/uapi/linux/ivtv.h
-f:include/uapi/linux/ivtvfb.h
-f:include/uapi/linux/jffs2.h
-f:include/uapi/linux/joystick.h
-f:include/uapi/linux/kcm.h
-f:include/uapi/linux/kcmp.h
-f:include/uapi/linux/kcov.h
-f:include/uapi/linux/kd.h
-f:include/uapi/linux/kdev_t.h
-f:include/uapi/linux/kernel-page-flags.h
-f:include/uapi/linux/kernel.h
-f:include/uapi/linux/kernelcapi.h
-f:include/uapi/linux/kexec.h
-f:include/uapi/linux/keyboard.h
-f:include/uapi/linux/keyctl.h
-f:include/uapi/linux/kfd_ioctl.h
-f:include/uapi/linux/kfd_sysfs.h
-f:include/uapi/linux/kvm.h
-f:include/uapi/linux/kvm_para.h
-f:include/uapi/linux/l2tp.h
-f:include/uapi/linux/landlock.h
-f:include/uapi/linux/libc-compat.h
-f:include/uapi/linux/limits.h
-f:include/uapi/linux/lirc.h
-f:include/uapi/linux/llc.h
-f:include/uapi/linux/loadpin.h
-f:include/uapi/linux/lockd_netlink.h
-f:include/uapi/linux/loop.h
-f:include/uapi/linux/lp.h
-f:include/uapi/linux/lsm.h
-f:include/uapi/linux/lwtunnel.h
-f:include/uapi/linux/magic.h
-f:include/uapi/linux/major.h
-f:include/uapi/linux/map_to_14segment.h
-f:include/uapi/linux/map_to_7segment.h
-f:include/uapi/linux/matroxfb.h
-f:include/uapi/linux/max2175.h
-f:include/uapi/linux/mctp.h
-f:include/uapi/linux/mdio.h
-f:include/uapi/linux/media-bus-format.h
-f:include/uapi/linux/media.h
-f:include/uapi/linux/media/amlogic/c3-isp-config.h
-f:include/uapi/linux/media/raspberrypi/pisp_be_config.h
-f:include/uapi/linux/media/raspberrypi/pisp_common.h
-f:include/uapi/linux/media/raspberrypi/pisp_fe_config.h
-f:include/uapi/linux/media/raspberrypi/pisp_fe_statistics.h
-f:include/uapi/linux/mei.h
-f:include/uapi/linux/mei_uuid.h
-f:include/uapi/linux/membarrier.h
-f:include/uapi/linux/memfd.h
-f:include/uapi/linux/mempolicy.h
-f:include/uapi/linux/mii.h
-f:include/uapi/linux/minix_fs.h
-f:include/uapi/linux/misc/bcm_vk.h
-f:include/uapi/linux/mman.h
-f:include/uapi/linux/mmc/ioctl.h
-f:include/uapi/linux/mmtimer.h
-f:include/uapi/linux/module.h
-f:include/uapi/linux/mount.h
-f:include/uapi/linux/mpls.h
-f:include/uapi/linux/mpls_iptunnel.h
-f:include/uapi/linux/mptcp.h
-f:include/uapi/linux/mptcp_pm.h
-f:include/uapi/linux/mqueue.h
-f:include/uapi/linux/mroute.h
-f:include/uapi/linux/mroute6.h
-f:include/uapi/linux/mrp_bridge.h
-f:include/uapi/linux/msdos_fs.h
-f:include/uapi/linux/msg.h
-f:include/uapi/linux/mshv.h
-f:include/uapi/linux/mtio.h
-f:include/uapi/linux/nbd-netlink.h
-f:include/uapi/linux/nbd.h
-f:include/uapi/linux/ncsi.h
-f:include/uapi/linux/ndctl.h
-f:include/uapi/linux/neighbour.h
-f:include/uapi/linux/net.h
-f:include/uapi/linux/net_dropmon.h
-f:include/uapi/linux/net_namespace.h
-f:include/uapi/linux/net_shaper.h
-f:include/uapi/linux/net_tstamp.h
-f:include/uapi/linux/netconf.h
-f:include/uapi/linux/netdev.h
-f:include/uapi/linux/netdevice.h
-f:include/uapi/linux/netfilter.h
-f:include/uapi/linux/netfilter/ipset/ip_set.h
-f:include/uapi/linux/netfilter/ipset/ip_set_bitmap.h
-f:include/uapi/linux/netfilter/ipset/ip_set_hash.h
-f:include/uapi/linux/netfilter/ipset/ip_set_list.h
-f:include/uapi/linux/netfilter/nf_conntrack_common.h
-f:include/uapi/linux/netfilter/nf_conntrack_ftp.h
-f:include/uapi/linux/netfilter/nf_conntrack_sctp.h
-f:include/uapi/linux/netfilter/nf_conntrack_tcp.h
-f:include/uapi/linux/netfilter/nf_conntrack_tuple_common.h
-f:include/uapi/linux/netfilter/nf_log.h
-f:include/uapi/linux/netfilter/nf_nat.h
-f:include/uapi/linux/netfilter/nf_synproxy.h
-f:include/uapi/linux/netfilter/nf_tables.h
-f:include/uapi/linux/netfilter/nf_tables_compat.h
-f:include/uapi/linux/netfilter/nfnetlink.h
-f:include/uapi/linux/netfilter/nfnetlink_acct.h
-f:include/uapi/linux/netfilter/nfnetlink_compat.h
-f:include/uapi/linux/netfilter/nfnetlink_conntrack.h
-f:include/uapi/linux/netfilter/nfnetlink_cthelper.h
-f:include/uapi/linux/netfilter/nfnetlink_cttimeout.h
-f:include/uapi/linux/netfilter/nfnetlink_hook.h
-f:include/uapi/linux/netfilter/nfnetlink_log.h
-f:include/uapi/linux/netfilter/nfnetlink_osf.h
-f:include/uapi/linux/netfilter/nfnetlink_queue.h
-f:include/uapi/linux/netfilter/x_tables.h
-f:include/uapi/linux/netfilter/xt_AUDIT.h
-f:include/uapi/linux/netfilter/xt_CHECKSUM.h
-f:include/uapi/linux/netfilter/xt_CLASSIFY.h
-f:include/uapi/linux/netfilter/xt_CONNSECMARK.h
-f:include/uapi/linux/netfilter/xt_CT.h
-f:include/uapi/linux/netfilter/xt_HMARK.h
-f:include/uapi/linux/netfilter/xt_IDLETIMER.h
-f:include/uapi/linux/netfilter/xt_LED.h
-f:include/uapi/linux/netfilter/xt_LOG.h
-f:include/uapi/linux/netfilter/xt_NFLOG.h
-f:include/uapi/linux/netfilter/xt_NFQUEUE.h
-f:include/uapi/linux/netfilter/xt_SECMARK.h
-f:include/uapi/linux/netfilter/xt_SYNPROXY.h
-f:include/uapi/linux/netfilter/xt_TCPOPTSTRIP.h
-f:include/uapi/linux/netfilter/xt_TEE.h
-f:include/uapi/linux/netfilter/xt_TPROXY.h
-f:include/uapi/linux/netfilter/xt_addrtype.h
-f:include/uapi/linux/netfilter/xt_bpf.h
-f:include/uapi/linux/netfilter/xt_cgroup.h
-f:include/uapi/linux/netfilter/xt_cluster.h
-f:include/uapi/linux/netfilter/xt_comment.h
-f:include/uapi/linux/netfilter/xt_connbytes.h
-f:include/uapi/linux/netfilter/xt_connlabel.h
-f:include/uapi/linux/netfilter/xt_connlimit.h
-f:include/uapi/linux/netfilter/xt_connmark.h
-f:include/uapi/linux/netfilter/xt_conntrack.h
-f:include/uapi/linux/netfilter/xt_cpu.h
-f:include/uapi/linux/netfilter/xt_dccp.h
-f:include/uapi/linux/netfilter/xt_devgroup.h
-f:include/uapi/linux/netfilter/xt_dscp.h
-f:include/uapi/linux/netfilter/xt_ecn.h
-f:include/uapi/linux/netfilter/xt_esp.h
-f:include/uapi/linux/netfilter/xt_hashlimit.h
-f:include/uapi/linux/netfilter/xt_helper.h
-f:include/uapi/linux/netfilter/xt_ipcomp.h
-f:include/uapi/linux/netfilter/xt_iprange.h
-f:include/uapi/linux/netfilter/xt_ipvs.h
-f:include/uapi/linux/netfilter/xt_l2tp.h
-f:include/uapi/linux/netfilter/xt_length.h
-f:include/uapi/linux/netfilter/xt_limit.h
-f:include/uapi/linux/netfilter/xt_mac.h
-f:include/uapi/linux/netfilter/xt_mark.h
-f:include/uapi/linux/netfilter/xt_multiport.h
-f:include/uapi/linux/netfilter/xt_nfacct.h
-f:include/uapi/linux/netfilter/xt_osf.h
-f:include/uapi/linux/netfilter/xt_owner.h
-f:include/uapi/linux/netfilter/xt_physdev.h
-f:include/uapi/linux/netfilter/xt_pkttype.h
-f:include/uapi/linux/netfilter/xt_policy.h
-f:include/uapi/linux/netfilter/xt_quota.h
-f:include/uapi/linux/netfilter/xt_rateest.h
-f:include/uapi/linux/netfilter/xt_realm.h
-f:include/uapi/linux/netfilter/xt_recent.h
-f:include/uapi/linux/netfilter/xt_rpfilter.h
-f:include/uapi/linux/netfilter/xt_sctp.h
-f:include/uapi/linux/netfilter/xt_set.h
-f:include/uapi/linux/netfilter/xt_socket.h
-f:include/uapi/linux/netfilter/xt_state.h
-f:include/uapi/linux/netfilter/xt_statistic.h
-f:include/uapi/linux/netfilter/xt_string.h
-f:include/uapi/linux/netfilter/xt_tcpmss.h
-f:include/uapi/linux/netfilter/xt_tcpudp.h
-f:include/uapi/linux/netfilter/xt_time.h
-f:include/uapi/linux/netfilter/xt_u32.h
-f:include/uapi/linux/netfilter_arp.h
-f:include/uapi/linux/netfilter_arp/arp_tables.h
-f:include/uapi/linux/netfilter_arp/arpt_mangle.h
-f:include/uapi/linux/netfilter_bridge.h
-f:include/uapi/linux/netfilter_bridge/ebt_802_3.h
-f:include/uapi/linux/netfilter_bridge/ebt_among.h
-f:include/uapi/linux/netfilter_bridge/ebt_arp.h
-f:include/uapi/linux/netfilter_bridge/ebt_arpreply.h
-f:include/uapi/linux/netfilter_bridge/ebt_ip.h
-f:include/uapi/linux/netfilter_bridge/ebt_ip6.h
-f:include/uapi/linux/netfilter_bridge/ebt_limit.h
-f:include/uapi/linux/netfilter_bridge/ebt_log.h
-f:include/uapi/linux/netfilter_bridge/ebt_mark_m.h
-f:include/uapi/linux/netfilter_bridge/ebt_mark_t.h
-f:include/uapi/linux/netfilter_bridge/ebt_nat.h
-f:include/uapi/linux/netfilter_bridge/ebt_nflog.h
-f:include/uapi/linux/netfilter_bridge/ebt_pkttype.h
-f:include/uapi/linux/netfilter_bridge/ebt_redirect.h
-f:include/uapi/linux/netfilter_bridge/ebt_stp.h
-f:include/uapi/linux/netfilter_bridge/ebt_vlan.h
-f:include/uapi/linux/netfilter_bridge/ebtables.h
-f:include/uapi/linux/netfilter_ipv4.h
-f:include/uapi/linux/netfilter_ipv4/ip_tables.h
-f:include/uapi/linux/netfilter_ipv4/ipt_CLUSTERIP.h
-f:include/uapi/linux/netfilter_ipv4/ipt_LOG.h
-f:include/uapi/linux/netfilter_ipv4/ipt_REJECT.h
-f:include/uapi/linux/netfilter_ipv4/ipt_ah.h
-f:include/uapi/linux/netfilter_ipv4/ipt_ecn.h
-f:include/uapi/linux/netfilter_ipv4/ipt_ttl.h
-f:include/uapi/linux/netfilter_ipv6.h
-f:include/uapi/linux/netfilter_ipv6/ip6_tables.h
-f:include/uapi/linux/netfilter_ipv6/ip6t_LOG.h
-f:include/uapi/linux/netfilter_ipv6/ip6t_NPT.h
-f:include/uapi/linux/netfilter_ipv6/ip6t_REJECT.h
-f:include/uapi/linux/netfilter_ipv6/ip6t_ah.h
-f:include/uapi/linux/netfilter_ipv6/ip6t_frag.h
-f:include/uapi/linux/netfilter_ipv6/ip6t_hl.h
-f:include/uapi/linux/netfilter_ipv6/ip6t_ipv6header.h
-f:include/uapi/linux/netfilter_ipv6/ip6t_mh.h
-f:include/uapi/linux/netfilter_ipv6/ip6t_opts.h
-f:include/uapi/linux/netfilter_ipv6/ip6t_rt.h
-f:include/uapi/linux/netfilter_ipv6/ip6t_srh.h
-f:include/uapi/linux/netlink.h
-f:include/uapi/linux/netlink_diag.h
-f:include/uapi/linux/netrom.h
-f:include/uapi/linux/nexthop.h
-f:include/uapi/linux/nfc.h
-f:include/uapi/linux/nfs.h
-f:include/uapi/linux/nfs2.h
-f:include/uapi/linux/nfs3.h
-f:include/uapi/linux/nfs4.h
-f:include/uapi/linux/nfs4_mount.h
-f:include/uapi/linux/nfs_fs.h
-f:include/uapi/linux/nfs_idmap.h
-f:include/uapi/linux/nfs_mount.h
-f:include/uapi/linux/nfsacl.h
-f:include/uapi/linux/nfsd/cld.h
-f:include/uapi/linux/nfsd/debug.h
-f:include/uapi/linux/nfsd/export.h
-f:include/uapi/linux/nfsd/stats.h
-f:include/uapi/linux/nfsd_netlink.h
-f:include/uapi/linux/nilfs2_api.h
-f:include/uapi/linux/nilfs2_ondisk.h
-f:include/uapi/linux/nitro_enclaves.h
-f:include/uapi/linux/nl80211-vnd-intel.h
-f:include/uapi/linux/nl80211.h
-f:include/uapi/linux/npcm-video.h
-f:include/uapi/linux/nsfs.h
-f:include/uapi/linux/nsm.h
-f:include/uapi/linux/ntsync.h
-f:include/uapi/linux/nubus.h
-f:include/uapi/linux/nvme_ioctl.h
-f:include/uapi/linux/nvram.h
-f:include/uapi/linux/omap3isp.h
-f:include/uapi/linux/omapfb.h
-f:include/uapi/linux/oom.h
-f:include/uapi/linux/openat2.h
-f:include/uapi/linux/openvswitch.h
-f:include/uapi/linux/ovpn.h
-f:include/uapi/linux/packet_diag.h
-f:include/uapi/linux/papr_pdsm.h
-f:include/uapi/linux/param.h
-f:include/uapi/linux/parport.h
-f:include/uapi/linux/patchkey.h
-f:include/uapi/linux/pci.h
-f:include/uapi/linux/pci_regs.h
-f:include/uapi/linux/pcitest.h
-f:include/uapi/linux/perf_event.h
-f:include/uapi/linux/personality.h
-f:include/uapi/linux/pfkeyv2.h
-f:include/uapi/linux/pfrut.h
-f:include/uapi/linux/pg.h
-f:include/uapi/linux/phantom.h
-f:include/uapi/linux/phonet.h
-f:include/uapi/linux/pidfd.h
-f:include/uapi/linux/pkt_cls.h
-f:include/uapi/linux/pkt_sched.h
-f:include/uapi/linux/pktcdvd.h
-f:include/uapi/linux/pmu.h
-f:include/uapi/linux/poll.h
-f:include/uapi/linux/posix_acl.h
-f:include/uapi/linux/posix_acl_xattr.h
-f:include/uapi/linux/posix_types.h
-f:include/uapi/linux/ppdev.h
-f:include/uapi/linux/ppp-comp.h
-f:include/uapi/linux/ppp-ioctl.h
-f:include/uapi/linux/ppp_defs.h
-f:include/uapi/linux/pps.h
-f:include/uapi/linux/pps_gen.h
-f:include/uapi/linux/pr.h
-f:include/uapi/linux/prctl.h
-f:include/uapi/linux/psample.h
-f:include/uapi/linux/psci.h
-f:include/uapi/linux/psp-dbc.h
-f:include/uapi/linux/psp-sev.h
-f:include/uapi/linux/ptp_clock.h
-f:include/uapi/linux/ptrace.h
-f:include/uapi/linux/pwm.h
-f:include/uapi/linux/qemu_fw_cfg.h
-f:include/uapi/linux/qnx4_fs.h
-f:include/uapi/linux/qnxtypes.h
-f:include/uapi/linux/qrtr.h
-f:include/uapi/linux/quota.h
-f:include/uapi/linux/radeonfb.h
-f:include/uapi/linux/raid/md_p.h
-f:include/uapi/linux/raid/md_u.h
-f:include/uapi/linux/random.h
-f:include/uapi/linux/rds.h
-f:include/uapi/linux/reboot.h
-f:include/uapi/linux/remoteproc_cdev.h
-f:include/uapi/linux/resource.h
-f:include/uapi/linux/rfkill.h
-f:include/uapi/linux/rio_cm_cdev.h
-f:include/uapi/linux/rio_mport_cdev.h
-f:include/uapi/linux/rkisp1-config.h
-f:include/uapi/linux/romfs_fs.h
-f:include/uapi/linux/rose.h
-f:include/uapi/linux/route.h
-f:include/uapi/linux/rpl.h
-f:include/uapi/linux/rpl_iptunnel.h
-f:include/uapi/linux/rpmsg.h
-f:include/uapi/linux/rpmsg_types.h
-f:include/uapi/linux/rseq.h
-f:include/uapi/linux/rtc.h
-f:include/uapi/linux/rtnetlink.h
-f:include/uapi/linux/rxrpc.h
-f:include/uapi/linux/scc.h
-f:include/uapi/linux/sched.h
-f:include/uapi/linux/sched/types.h
-f:include/uapi/linux/scif_ioctl.h
-f:include/uapi/linux/screen_info.h
-f:include/uapi/linux/sctp.h
-f:include/uapi/linux/seccomp.h
-f:include/uapi/linux/securebits.h
-f:include/uapi/linux/sed-opal.h
-f:include/uapi/linux/seg6.h
-f:include/uapi/linux/seg6_genl.h
-f:include/uapi/linux/seg6_hmac.h
-f:include/uapi/linux/seg6_iptunnel.h
-f:include/uapi/linux/seg6_local.h
-f:include/uapi/linux/selinux_netlink.h
-f:include/uapi/linux/sem.h
-f:include/uapi/linux/serial.h
-f:include/uapi/linux/serial_core.h
-f:include/uapi/linux/serial_reg.h
-f:include/uapi/linux/serio.h
-f:include/uapi/linux/sev-guest.h
-f:include/uapi/linux/shm.h
-f:include/uapi/linux/signal.h
-f:include/uapi/linux/signalfd.h
-f:include/uapi/linux/smc.h
-f:include/uapi/linux/smc_diag.h
-f:include/uapi/linux/smiapp.h
-f:include/uapi/linux/snmp.h
-f:include/uapi/linux/sock_diag.h
-f:include/uapi/linux/socket.h
-f:include/uapi/linux/sockios.h
-f:include/uapi/linux/sonet.h
-f:include/uapi/linux/sonypi.h
-f:include/uapi/linux/sound.h
-f:include/uapi/linux/soundcard.h
-f:include/uapi/linux/spi/spi.h
-f:include/uapi/linux/spi/spidev.h
-f:include/uapi/linux/stat.h
-f:include/uapi/linux/stddef.h
-f:include/uapi/linux/stm.h
-f:include/uapi/linux/string.h
-f:include/uapi/linux/sunrpc/debug.h
-f:include/uapi/linux/surface_aggregator/cdev.h
-f:include/uapi/linux/surface_aggregator/dtx.h
-f:include/uapi/linux/suspend_ioctls.h
-f:include/uapi/linux/swab.h
-f:include/uapi/linux/switchtec_ioctl.h
-f:include/uapi/linux/sync_file.h
-f:include/uapi/linux/synclink.h
-f:include/uapi/linux/sysctl.h
-f:include/uapi/linux/sysinfo.h
-f:include/uapi/linux/target_core_user.h
-f:include/uapi/linux/taskstats.h
-f:include/uapi/linux/tc_act/tc_bpf.h
-f:include/uapi/linux/tc_act/tc_connmark.h
-f:include/uapi/linux/tc_act/tc_csum.h
-f:include/uapi/linux/tc_act/tc_ct.h
-f:include/uapi/linux/tc_act/tc_ctinfo.h
-f:include/uapi/linux/tc_act/tc_defact.h
-f:include/uapi/linux/tc_act/tc_gact.h
-f:include/uapi/linux/tc_act/tc_gate.h
-f:include/uapi/linux/tc_act/tc_ife.h
-f:include/uapi/linux/tc_act/tc_mirred.h
-f:include/uapi/linux/tc_act/tc_mpls.h
-f:include/uapi/linux/tc_act/tc_nat.h
-f:include/uapi/linux/tc_act/tc_pedit.h
-f:include/uapi/linux/tc_act/tc_sample.h
-f:include/uapi/linux/tc_act/tc_skbedit.h
-f:include/uapi/linux/tc_act/tc_skbmod.h
-f:include/uapi/linux/tc_act/tc_tunnel_key.h
-f:include/uapi/linux/tc_act/tc_vlan.h
-f:include/uapi/linux/tc_ematch/tc_em_cmp.h
-f:include/uapi/linux/tc_ematch/tc_em_ipt.h
-f:include/uapi/linux/tc_ematch/tc_em_meta.h
-f:include/uapi/linux/tc_ematch/tc_em_nbyte.h
-f:include/uapi/linux/tc_ematch/tc_em_text.h
-f:include/uapi/linux/tcp.h
-f:include/uapi/linux/tcp_metrics.h
-f:include/uapi/linux/tdx-guest.h
-f:include/uapi/linux/tee.h
-f:include/uapi/linux/termios.h
-f:include/uapi/linux/thermal.h
-f:include/uapi/linux/thp7312.h
-f:include/uapi/linux/time.h
-f:include/uapi/linux/time_types.h
-f:include/uapi/linux/timerfd.h
-f:include/uapi/linux/times.h
-f:include/uapi/linux/timex.h
-f:include/uapi/linux/tiocl.h
-f:include/uapi/linux/tipc.h
-f:include/uapi/linux/tipc_config.h
-f:include/uapi/linux/tipc_netlink.h
-f:include/uapi/linux/tipc_sockets_diag.h
-f:include/uapi/linux/tls.h
-f:include/uapi/linux/toshiba.h
-f:include/uapi/linux/tps6594_pfsm.h
-f:include/uapi/linux/trace_mmap.h
-f:include/uapi/linux/tty.h
-f:include/uapi/linux/tty_flags.h
-f:include/uapi/linux/types.h
-f:include/uapi/linux/ublk_cmd.h
-f:include/uapi/linux/udf_fs_i.h
-f:include/uapi/linux/udmabuf.h
-f:include/uapi/linux/udp.h
-f:include/uapi/linux/uhid.h
-f:include/uapi/linux/uinput.h
-f:include/uapi/linux/uio.h
-f:include/uapi/linux/uleds.h
-f:include/uapi/linux/ultrasound.h
-f:include/uapi/linux/um_timetravel.h
-f:include/uapi/linux/un.h
-f:include/uapi/linux/unistd.h
-f:include/uapi/linux/unix_diag.h
-f:include/uapi/linux/usb/audio.h
-f:include/uapi/linux/usb/cdc-wdm.h
-f:include/uapi/linux/usb/cdc.h
-f:include/uapi/linux/usb/ch11.h
-f:include/uapi/linux/usb/ch9.h
-f:include/uapi/linux/usb/charger.h
-f:include/uapi/linux/usb/functionfs.h
-f:include/uapi/linux/usb/g_hid.h
-f:include/uapi/linux/usb/g_printer.h
-f:include/uapi/linux/usb/g_uvc.h
-f:include/uapi/linux/usb/gadgetfs.h
-f:include/uapi/linux/usb/midi.h
-f:include/uapi/linux/usb/raw_gadget.h
-f:include/uapi/linux/usb/tmc.h
-f:include/uapi/linux/usb/video.h
-f:include/uapi/linux/usbdevice_fs.h
-f:include/uapi/linux/usbip.h
-f:include/uapi/linux/user_events.h
-f:include/uapi/linux/userfaultfd.h
-f:include/uapi/linux/userio.h
-f:include/uapi/linux/utime.h
-f:include/uapi/linux/utsname.h
-f:include/uapi/linux/uuid.h
-f:include/uapi/linux/uvcvideo.h
-f:include/uapi/linux/v4l2-common.h
-f:include/uapi/linux/v4l2-controls.h
-f:include/uapi/linux/v4l2-dv-timings.h
-f:include/uapi/linux/v4l2-mediabus.h
-f:include/uapi/linux/v4l2-subdev.h
-f:include/uapi/linux/vbox_err.h
-f:include/uapi/linux/vbox_vmmdev_types.h
-f:include/uapi/linux/vboxguest.h
-f:include/uapi/linux/vdpa.h
-f:include/uapi/linux/vduse.h
-f:include/uapi/linux/vesa.h
-f:include/uapi/linux/veth.h
-f:include/uapi/linux/vfio.h
-f:include/uapi/linux/vfio_ccw.h
-f:include/uapi/linux/vfio_zdev.h
-f:include/uapi/linux/vhost.h
-f:include/uapi/linux/vhost_types.h
-f:include/uapi/linux/videodev2.h
-f:include/uapi/linux/virtio_9p.h
-f:include/uapi/linux/virtio_balloon.h
-f:include/uapi/linux/virtio_blk.h
-f:include/uapi/linux/virtio_bt.h
-f:include/uapi/linux/virtio_config.h
-f:include/uapi/linux/virtio_console.h
-f:include/uapi/linux/virtio_crypto.h
-f:include/uapi/linux/virtio_fs.h
-f:include/uapi/linux/virtio_gpio.h
-f:include/uapi/linux/virtio_gpu.h
-f:include/uapi/linux/virtio_i2c.h
-f:include/uapi/linux/virtio_ids.h
-f:include/uapi/linux/virtio_input.h
-f:include/uapi/linux/virtio_iommu.h
-f:include/uapi/linux/virtio_mem.h
-f:include/uapi/linux/virtio_mmio.h
-f:include/uapi/linux/virtio_net.h
-f:include/uapi/linux/virtio_pci.h
-f:include/uapi/linux/virtio_pcidev.h
-f:include/uapi/linux/virtio_pmem.h
-f:include/uapi/linux/virtio_ring.h
-f:include/uapi/linux/virtio_rng.h
-f:include/uapi/linux/virtio_rtc.h
-f:include/uapi/linux/virtio_scmi.h
-f:include/uapi/linux/virtio_scsi.h
-f:include/uapi/linux/virtio_snd.h
-f:include/uapi/linux/virtio_types.h
-f:include/uapi/linux/virtio_vsock.h
-f:include/uapi/linux/vm_sockets.h
-f:include/uapi/linux/vm_sockets_diag.h
-f:include/uapi/linux/vmclock-abi.h
-f:include/uapi/linux/vmcore.h
-f:include/uapi/linux/vsockmon.h
-f:include/uapi/linux/vt.h
-f:include/uapi/linux/vtpm_proxy.h
-f:include/uapi/linux/wait.h
-f:include/uapi/linux/watch_queue.h
-f:include/uapi/linux/watchdog.h
-f:include/uapi/linux/wireguard.h
-f:include/uapi/linux/wireless.h
-f:include/uapi/linux/wmi.h
-f:include/uapi/linux/wwan.h
-f:include/uapi/linux/x25.h
-f:include/uapi/linux/xattr.h
-f:include/uapi/linux/xdp_diag.h
-f:include/uapi/linux/xfrm.h
-f:include/uapi/linux/xilinx-v4l2-controls.h
-f:include/uapi/linux/zorro.h
-f:include/uapi/linux/zorro_ids.h
-f:include/uapi/misc/amd-apml.h
-f:include/uapi/misc/fastrpc.h
-f:include/uapi/misc/mrvl_cn10k_dpi.h
-f:include/uapi/misc/ocxl.h
-f:include/uapi/misc/pvpanic.h
-f:include/uapi/misc/uacce/hisi_qm.h
-f:include/uapi/misc/uacce/uacce.h
-f:include/uapi/misc/xilinx_sdfec.h
-f:include/uapi/mtd/inftl-user.h
-f:include/uapi/mtd/mtd-abi.h
-f:include/uapi/mtd/mtd-user.h
-f:include/uapi/mtd/nftl-user.h
-f:include/uapi/mtd/ubi-user.h
-f:include/uapi/rdma/bnxt_re-abi.h
-f:include/uapi/rdma/cxgb4-abi.h
-f:include/uapi/rdma/efa-abi.h
-f:include/uapi/rdma/erdma-abi.h
-f:include/uapi/rdma/hfi/hfi1_ioctl.h
-f:include/uapi/rdma/hfi/hfi1_user.h
-f:include/uapi/rdma/hns-abi.h
-f:include/uapi/rdma/ib_user_ioctl_cmds.h
-f:include/uapi/rdma/ib_user_ioctl_verbs.h
-f:include/uapi/rdma/ib_user_mad.h
-f:include/uapi/rdma/ib_user_sa.h
-f:include/uapi/rdma/ib_user_verbs.h
-f:include/uapi/rdma/irdma-abi.h
-f:include/uapi/rdma/mana-abi.h
-f:include/uapi/rdma/mlx4-abi.h
-f:include/uapi/rdma/mlx5-abi.h
-f:include/uapi/rdma/mlx5_user_ioctl_cmds.h
-f:include/uapi/rdma/mlx5_user_ioctl_verbs.h
-f:include/uapi/rdma/mthca-abi.h
-f:include/uapi/rdma/ocrdma-abi.h
-f:include/uapi/rdma/qedr-abi.h
-f:include/uapi/rdma/rdma_netlink.h
-f:include/uapi/rdma/rdma_user_cm.h
-f:include/uapi/rdma/rdma_user_ioctl.h
-f:include/uapi/rdma/rdma_user_ioctl_cmds.h
-f:include/uapi/rdma/rdma_user_rxe.h
-f:include/uapi/rdma/rvt-abi.h
-f:include/uapi/rdma/siw-abi.h
-f:include/uapi/rdma/vmw_pvrdma-abi.h
-f:include/uapi/regulator/regulator.h
-f:include/uapi/scsi/fc/fc_els.h
-f:include/uapi/scsi/fc/fc_fs.h
-f:include/uapi/scsi/fc/fc_gs.h
-f:include/uapi/scsi/fc/fc_ns.h
-f:include/uapi/scsi/scsi_bsg_fc.h
-f:include/uapi/scsi/scsi_bsg_mpi3mr.h
-f:include/uapi/scsi/scsi_bsg_ufs.h
-f:include/uapi/scsi/scsi_netlink.h
-f:include/uapi/scsi/scsi_netlink_fc.h
-f:include/uapi/sound/asequencer.h
-f:include/uapi/sound/asoc.h
-f:include/uapi/sound/asound.h
-f:include/uapi/sound/asound_fm.h
-f:include/uapi/sound/compress_offload.h
-f:include/uapi/sound/compress_params.h
-f:include/uapi/sound/emu10k1.h
-f:include/uapi/sound/fcp.h
-f:include/uapi/sound/firewire.h
-f:include/uapi/sound/hdsp.h
-f:include/uapi/sound/hdspm.h
-f:include/uapi/sound/intel/avs/tokens.h
-f:include/uapi/sound/sb16_csp.h
-f:include/uapi/sound/scarlett2.h
-f:include/uapi/sound/sfnt_info.h
-f:include/uapi/sound/skl-tplg-interface.h
-f:include/uapi/sound/snd_ar_tokens.h
-f:include/uapi/sound/snd_sst_tokens.h
-f:include/uapi/sound/sof/abi.h
-f:include/uapi/sound/sof/fw.h
-f:include/uapi/sound/sof/header.h
-f:include/uapi/sound/sof/tokens.h
-f:include/uapi/sound/tlv.h
-f:include/uapi/sound/usb_stream.h
-f:include/uapi/video/edid.h
-f:include/uapi/video/sisfb.h
-f:include/uapi/video/uvesafb.h
-f:include/uapi/xen/evtchn.h
-f:include/uapi/xen/gntalloc.h
-f:include/uapi/xen/gntdev.h
-f:include/uapi/xen/privcmd.h
-f:include/ufs/ufs.h
-f:include/ufs/ufs_quirks.h
-f:include/ufs/ufshcd.h
-f:include/ufs/ufshci.h
-f:include/ufs/unipro.h
-f:include/vdso/align.h
-f:include/vdso/auxclock.h
-f:include/vdso/bits.h
-f:include/vdso/cache.h
-f:include/vdso/clocksource.h
-f:include/vdso/const.h
-f:include/vdso/datapage.h
-f:include/vdso/getrandom.h
-f:include/vdso/gettime.h
-f:include/vdso/helpers.h
-f:include/vdso/jiffies.h
-f:include/vdso/ktime.h
-f:include/vdso/limits.h
-f:include/vdso/math64.h
-f:include/vdso/page.h
-f:include/vdso/processor.h
-f:include/vdso/time.h
-f:include/vdso/time32.h
-f:include/vdso/time64.h
-f:include/vdso/unaligned.h
-f:include/vdso/vsyscall.h
-f:include/video/atmel_lcdc.h
-f:include/video/aty128.h
-f:include/video/broadsheetfb.h
-f:include/video/cirrus.h
-f:include/video/cmdline.h
-f:include/video/cvisionppc.h
-f:include/video/display_timing.h
-f:include/video/edid.h
-f:include/video/gbe.h
-f:include/video/hecubafb.h
-f:include/video/ili9320.h
-f:include/video/imx-ipu-image-convert.h
-f:include/video/imx-ipu-v3.h
-f:include/video/kyro.h
-f:include/video/mach64.h
-f:include/video/maxinefb.h
-f:include/video/metronomefb.h
-f:include/video/mipi_display.h
-f:include/video/mmp_disp.h
-f:include/video/neomagic.h
-f:include/video/newport.h
-f:include/video/nomodeset.h
-f:include/video/of_display_timing.h
-f:include/video/of_videomode.h
-f:include/video/omapfb_dss.h
-f:include/video/omapvrfb.h
-f:include/video/permedia2.h
-f:include/video/pixel_format.h
-f:include/video/platform_lcd.h
-f:include/video/pm3fb.h
-f:include/video/pmag-ba-fb.h
-f:include/video/pmagb-b-fb.h
-f:include/video/pxa168fb.h
-f:include/video/radeon.h
-f:include/video/s1d13xxxfb.h
-f:include/video/sa1100fb.h
-f:include/video/samsung_fimd.h
-f:include/video/sh_mobile_lcdc.h
-f:include/video/sisfb.h
-f:include/video/sstfb.h
-f:include/video/sticore.h
-f:include/video/tdfx.h
-f:include/video/tgafb.h
-f:include/video/trident.h
-f:include/video/udlfb.h
-f:include/video/uvesafb.h
-f:include/video/vga.h
-f:include/video/videomode.h
-f:include/xen/acpi.h
-f:include/xen/arm/hypercall.h
-f:include/xen/arm/hypervisor.h
-f:include/xen/arm/interface.h
-f:include/xen/arm/page.h
-f:include/xen/arm/swiotlb-xen.h
-f:include/xen/arm/xen-ops.h
-f:include/xen/balloon.h
-f:include/xen/events.h
-f:include/xen/features.h
-f:include/xen/grant_table.h
-f:include/xen/hvc-console.h
-f:include/xen/hvm.h
-f:include/xen/interface/callback.h
-f:include/xen/interface/elfnote.h
-f:include/xen/interface/event_channel.h
-f:include/xen/interface/features.h
-f:include/xen/interface/grant_table.h
-f:include/xen/interface/hvm/dm_op.h
-f:include/xen/interface/hvm/hvm_op.h
-f:include/xen/interface/hvm/hvm_vcpu.h
-f:include/xen/interface/hvm/ioreq.h
-f:include/xen/interface/hvm/params.h
-f:include/xen/interface/hvm/start_info.h
-f:include/xen/interface/io/9pfs.h
-f:include/xen/interface/io/blkif.h
-f:include/xen/interface/io/console.h
-f:include/xen/interface/io/displif.h
-f:include/xen/interface/io/fbif.h
-f:include/xen/interface/io/kbdif.h
-f:include/xen/interface/io/netif.h
-f:include/xen/interface/io/pciif.h
-f:include/xen/interface/io/protocols.h
-f:include/xen/interface/io/pvcalls.h
-f:include/xen/interface/io/ring.h
-f:include/xen/interface/io/sndif.h
-f:include/xen/interface/io/tpmif.h
-f:include/xen/interface/io/usbif.h
-f:include/xen/interface/io/vscsiif.h
-f:include/xen/interface/io/xenbus.h
-f:include/xen/interface/io/xs_wire.h
-f:include/xen/interface/memory.h
-f:include/xen/interface/nmi.h
-f:include/xen/interface/physdev.h
-f:include/xen/interface/platform.h
-f:include/xen/interface/sched.h
-f:include/xen/interface/vcpu.h
-f:include/xen/interface/version.h
-f:include/xen/interface/xen-mca.h
-f:include/xen/interface/xen.h
-f:include/xen/interface/xenpmu.h
-f:include/xen/mem-reservation.h
-f:include/xen/page.h
-f:include/xen/pci.h
-f:include/xen/platform_pci.h
-f:include/xen/swiotlb-xen.h
-f:include/xen/xen-front-pgdir-shbuf.h
-f:include/xen/xen-ops.h
-f:include/xen/xen.h
-f:include/xen/xenbus.h
-f:include/xen/xenbus_dev.h
-f:init/.gitignore
-f:init/.kunitconfig
-f:init/Kconfig
-f:init/Makefile
-f:init/calibrate.c
-f:init/do_mounts.c
-f:init/do_mounts.h
-f:init/do_mounts_initrd.c
-f:init/do_mounts_rd.c
-f:init/init_task.c
-f:init/initramfs.c
-f:init/initramfs_internal.h
-f:init/initramfs_test.c
-f:init/main.c
-f:init/noinitramfs.c
-f:init/version-timestamp.c
-f:init/version.c
-f:io_uring/Kconfig
-f:io_uring/Makefile
-f:io_uring/advise.c
-f:io_uring/advise.h
-f:io_uring/alloc_cache.c
-f:io_uring/alloc_cache.h
-f:io_uring/cancel.c
-f:io_uring/cancel.h
-f:io_uring/cmd_net.c
-f:io_uring/epoll.c
-f:io_uring/epoll.h
-f:io_uring/eventfd.c
-f:io_uring/eventfd.h
-f:io_uring/fdinfo.c
-f:io_uring/fdinfo.h
-f:io_uring/filetable.c
-f:io_uring/filetable.h
-f:io_uring/fs.c
-f:io_uring/fs.h
-f:io_uring/futex.c
-f:io_uring/futex.h
-f:io_uring/io-wq.c
-f:io_uring/io-wq.h
-f:io_uring/io_uring.c
-f:io_uring/io_uring.h
-f:io_uring/kbuf.c
-f:io_uring/kbuf.h
-f:io_uring/memmap.c
-f:io_uring/memmap.h
-f:io_uring/mock_file.c
-f:io_uring/msg_ring.c
-f:io_uring/msg_ring.h
-f:io_uring/napi.c
-f:io_uring/napi.h
-f:io_uring/net.c
-f:io_uring/net.h
-f:io_uring/nop.c
-f:io_uring/nop.h
-f:io_uring/notif.c
-f:io_uring/notif.h
-f:io_uring/opdef.c
-f:io_uring/opdef.h
-f:io_uring/openclose.c
-f:io_uring/openclose.h
-f:io_uring/poll.c
-f:io_uring/poll.h
-f:io_uring/refs.h
-f:io_uring/register.c
-f:io_uring/register.h
-f:io_uring/rsrc.c
-f:io_uring/rsrc.h
-f:io_uring/rw.c
-f:io_uring/rw.h
-f:io_uring/slist.h
-f:io_uring/splice.c
-f:io_uring/splice.h
-f:io_uring/sqpoll.c
-f:io_uring/sqpoll.h
-f:io_uring/statx.c
-f:io_uring/statx.h
-f:io_uring/sync.c
-f:io_uring/sync.h
-f:io_uring/tctx.c
-f:io_uring/tctx.h
-f:io_uring/timeout.c
-f:io_uring/timeout.h
-f:io_uring/truncate.c
-f:io_uring/truncate.h
-f:io_uring/uring_cmd.c
-f:io_uring/uring_cmd.h
-f:io_uring/waitid.c
-f:io_uring/waitid.h
-f:io_uring/xattr.c
-f:io_uring/xattr.h
-f:io_uring/zcrx.c
-f:io_uring/zcrx.h
-f:ipc/Makefile
-f:ipc/compat.c
-f:ipc/ipc_sysctl.c
-f:ipc/mq_sysctl.c
-f:ipc/mqueue.c
-f:ipc/msg.c
-f:ipc/msgutil.c
-f:ipc/namespace.c
-f:ipc/sem.c
-f:ipc/shm.c
-f:ipc/syscall.c
-f:ipc/util.c
-f:ipc/util.h
-f:kernel/.gitignore
-f:kernel/Kconfig.freezer
-f:kernel/Kconfig.hz
-f:kernel/Kconfig.kexec
-f:kernel/Kconfig.locks
-f:kernel/Kconfig.preempt
-f:kernel/Makefile
-f:kernel/acct.c
-f:kernel/async.c
-f:kernel/audit.c
-f:kernel/audit.h
-f:kernel/audit_fsnotify.c
-f:kernel/audit_tree.c
-f:kernel/audit_watch.c
-f:kernel/auditfilter.c
-f:kernel/auditsc.c
-f:kernel/backtracetest.c
-f:kernel/bounds.c
-f:kernel/bpf/Kconfig
-f:kernel/bpf/Makefile
-f:kernel/bpf/arena.c
-f:kernel/bpf/arraymap.c
-f:kernel/bpf/bloom_filter.c
-f:kernel/bpf/bpf_cgrp_storage.c
-f:kernel/bpf/bpf_inode_storage.c
-f:kernel/bpf/bpf_iter.c
-f:kernel/bpf/bpf_local_storage.c
-f:kernel/bpf/bpf_lru_list.c
-f:kernel/bpf/bpf_lru_list.h
-f:kernel/bpf/bpf_lsm.c
-f:kernel/bpf/bpf_struct_ops.c
-f:kernel/bpf/bpf_task_storage.c
-f:kernel/bpf/btf.c
-f:kernel/bpf/btf_iter.c
-f:kernel/bpf/btf_relocate.c
-f:kernel/bpf/cgroup.c
-f:kernel/bpf/cgroup_iter.c
-f:kernel/bpf/core.c
-f:kernel/bpf/cpumap.c
-f:kernel/bpf/cpumask.c
-f:kernel/bpf/crypto.c
-f:kernel/bpf/devmap.c
-f:kernel/bpf/disasm.c
-f:kernel/bpf/disasm.h
-f:kernel/bpf/dispatcher.c
-f:kernel/bpf/dmabuf_iter.c
-f:kernel/bpf/hashtab.c
-f:kernel/bpf/helpers.c
-f:kernel/bpf/inode.c
-f:kernel/bpf/kmem_cache_iter.c
-f:kernel/bpf/link_iter.c
-f:kernel/bpf/local_storage.c
-f:kernel/bpf/log.c
-f:kernel/bpf/lpm_trie.c
-f:kernel/bpf/map_in_map.c
-f:kernel/bpf/map_in_map.h
-f:kernel/bpf/map_iter.c
-f:kernel/bpf/memalloc.c
-f:kernel/bpf/mmap_unlock_work.h
-f:kernel/bpf/mprog.c
-f:kernel/bpf/net_namespace.c
-f:kernel/bpf/offload.c
-f:kernel/bpf/percpu_freelist.c
-f:kernel/bpf/percpu_freelist.h
-f:kernel/bpf/preload/.gitignore
-f:kernel/bpf/preload/Kconfig
-f:kernel/bpf/preload/Makefile
-f:kernel/bpf/preload/bpf_preload.h
-f:kernel/bpf/preload/bpf_preload_kern.c
-f:kernel/bpf/preload/iterators/.gitignore
-f:kernel/bpf/preload/iterators/Makefile
-f:kernel/bpf/preload/iterators/README
-f:kernel/bpf/preload/iterators/iterators.bpf.c
-f:kernel/bpf/preload/iterators/iterators.lskel-big-endian.h
-f:kernel/bpf/preload/iterators/iterators.lskel-little-endian.h
-f:kernel/bpf/prog_iter.c
-f:kernel/bpf/queue_stack_maps.c
-f:kernel/bpf/range_tree.c
-f:kernel/bpf/range_tree.h
-f:kernel/bpf/relo_core.c
-f:kernel/bpf/reuseport_array.c
-f:kernel/bpf/ringbuf.c
-f:kernel/bpf/rqspinlock.c
-f:kernel/bpf/rqspinlock.h
-f:kernel/bpf/stackmap.c
-f:kernel/bpf/stream.c
-f:kernel/bpf/syscall.c
-f:kernel/bpf/sysfs_btf.c
-f:kernel/bpf/task_iter.c
-f:kernel/bpf/tcx.c
-f:kernel/bpf/tnum.c
-f:kernel/bpf/token.c
-f:kernel/bpf/trampoline.c
-f:kernel/bpf/verifier.c
-f:kernel/capability.c
-f:kernel/cfi.c
-f:kernel/cgroup/Makefile
-f:kernel/cgroup/cgroup-internal.h
-f:kernel/cgroup/cgroup-v1.c
-f:kernel/cgroup/cgroup.c
-f:kernel/cgroup/cpuset-internal.h
-f:kernel/cgroup/cpuset-v1.c
-f:kernel/cgroup/cpuset.c
-f:kernel/cgroup/debug.c
-f:kernel/cgroup/dmem.c
-f:kernel/cgroup/freezer.c
-f:kernel/cgroup/legacy_freezer.c
-f:kernel/cgroup/misc.c
-f:kernel/cgroup/namespace.c
-f:kernel/cgroup/pids.c
-f:kernel/cgroup/rdma.c
-f:kernel/cgroup/rstat.c
-f:kernel/compat.c
-f:kernel/configs.c
-f:kernel/configs/debug.config
-f:kernel/configs/hardening.config
-f:kernel/configs/kvm_guest.config
-f:kernel/configs/nopm.config
-f:kernel/configs/rust.config
-f:kernel/configs/tiny-base.config
-f:kernel/configs/tiny.config
-f:kernel/configs/x86_debug.config
-f:kernel/configs/xen.config
-f:kernel/context_tracking.c
-f:kernel/cpu.c
-f:kernel/cpu_pm.c
-f:kernel/crash_core.c
-f:kernel/crash_dump_dm_crypt.c
-f:kernel/crash_reserve.c
-f:kernel/cred.c
-f:kernel/debug/Makefile
-f:kernel/debug/debug_core.c
-f:kernel/debug/debug_core.h
-f:kernel/debug/gdbstub.c
-f:kernel/debug/kdb/.gitignore
-f:kernel/debug/kdb/Makefile
-f:kernel/debug/kdb/kdb_bp.c
-f:kernel/debug/kdb/kdb_bt.c
-f:kernel/debug/kdb/kdb_cmds
-f:kernel/debug/kdb/kdb_debugger.c
-f:kernel/debug/kdb/kdb_io.c
-f:kernel/debug/kdb/kdb_keyboard.c
-f:kernel/debug/kdb/kdb_main.c
-f:kernel/debug/kdb/kdb_private.h
-f:kernel/debug/kdb/kdb_support.c
-f:kernel/delayacct.c
-f:kernel/dma.c
-f:kernel/dma/Kconfig
-f:kernel/dma/Makefile
-f:kernel/dma/coherent.c
-f:kernel/dma/contiguous.c
-f:kernel/dma/debug.c
-f:kernel/dma/debug.h
-f:kernel/dma/direct.c
-f:kernel/dma/direct.h
-f:kernel/dma/dummy.c
-f:kernel/dma/map_benchmark.c
-f:kernel/dma/mapping.c
-f:kernel/dma/ops_helpers.c
-f:kernel/dma/pool.c
-f:kernel/dma/remap.c
-f:kernel/dma/swiotlb.c
-f:kernel/elfcorehdr.c
-f:kernel/entry/Makefile
-f:kernel/entry/common.c
-f:kernel/entry/common.h
-f:kernel/entry/kvm.c
-f:kernel/entry/syscall-common.c
-f:kernel/entry/syscall_user_dispatch.c
-f:kernel/events/Makefile
-f:kernel/events/callchain.c
-f:kernel/events/core.c
-f:kernel/events/hw_breakpoint.c
-f:kernel/events/hw_breakpoint_test.c
-f:kernel/events/internal.h
-f:kernel/events/ring_buffer.c
-f:kernel/events/uprobes.c
-f:kernel/exec_domain.c
-f:kernel/exit.c
-f:kernel/exit.h
-f:kernel/extable.c
-f:kernel/fail_function.c
-f:kernel/fork.c
-f:kernel/freezer.c
-f:kernel/futex/Makefile
-f:kernel/futex/core.c
-f:kernel/futex/futex.h
-f:kernel/futex/pi.c
-f:kernel/futex/requeue.c
-f:kernel/futex/syscalls.c
-f:kernel/futex/waitwake.c
-f:kernel/gcov/Kconfig
-f:kernel/gcov/Makefile
-f:kernel/gcov/base.c
-f:kernel/gcov/clang.c
-f:kernel/gcov/fs.c
-f:kernel/gcov/gcc_4_7.c
-f:kernel/gcov/gcc_base.c
-f:kernel/gcov/gcov.h
-f:kernel/gen_kheaders.sh
-f:kernel/groups.c
-f:kernel/hung_task.c
-f:kernel/iomem.c
-f:kernel/irq/Kconfig
-f:kernel/irq/Makefile
-f:kernel/irq/affinity.c
-f:kernel/irq/autoprobe.c
-f:kernel/irq/chip.c
-f:kernel/irq/cpuhotplug.c
-f:kernel/irq/debug.h
-f:kernel/irq/debugfs.c
-f:kernel/irq/devres.c
-f:kernel/irq/dummychip.c
-f:kernel/irq/generic-chip.c
-f:kernel/irq/handle.c
-f:kernel/irq/internals.h
-f:kernel/irq/ipi-mux.c
-f:kernel/irq/ipi.c
-f:kernel/irq/irq_sim.c
-f:kernel/irq/irq_test.c
-f:kernel/irq/irqdesc.c
-f:kernel/irq/irqdomain.c
-f:kernel/irq/kexec.c
-f:kernel/irq/manage.c
-f:kernel/irq/matrix.c
-f:kernel/irq/migration.c
-f:kernel/irq/msi.c
-f:kernel/irq/pm.c
-f:kernel/irq/proc.c
-f:kernel/irq/resend.c
-f:kernel/irq/settings.h
-f:kernel/irq/spurious.c
-f:kernel/irq/timings.c
-f:kernel/irq_work.c
-f:kernel/jump_label.c
-f:kernel/kallsyms.c
-f:kernel/kallsyms_internal.h
-f:kernel/kallsyms_selftest.c
-f:kernel/kallsyms_selftest.h
-f:kernel/kcmp.c
-f:kernel/kcov.c
-f:kernel/kcsan/.kunitconfig
-f:kernel/kcsan/Makefile
-f:kernel/kcsan/core.c
-f:kernel/kcsan/debugfs.c
-f:kernel/kcsan/encoding.h
-f:kernel/kcsan/kcsan.h
-f:kernel/kcsan/kcsan_test.c
-f:kernel/kcsan/permissive.h
-f:kernel/kcsan/report.c
-f:kernel/kcsan/selftest.c
-f:kernel/kexec.c
-f:kernel/kexec_core.c
-f:kernel/kexec_elf.c
-f:kernel/kexec_file.c
-f:kernel/kexec_handover.c
-f:kernel/kexec_internal.h
-f:kernel/kheaders.c
-f:kernel/kprobes.c
-f:kernel/kstack_erase.c
-f:kernel/ksyms_common.c
-f:kernel/ksysfs.c
-f:kernel/kthread.c
-f:kernel/latencytop.c
-f:kernel/livepatch/Kconfig
-f:kernel/livepatch/Makefile
-f:kernel/livepatch/core.c
-f:kernel/livepatch/core.h
-f:kernel/livepatch/patch.c
-f:kernel/livepatch/patch.h
-f:kernel/livepatch/shadow.c
-f:kernel/livepatch/state.c
-f:kernel/livepatch/state.h
-f:kernel/livepatch/transition.c
-f:kernel/livepatch/transition.h
-f:kernel/locking/Makefile
-f:kernel/locking/irqflag-debug.c
-f:kernel/locking/lock_events.c
-f:kernel/locking/lock_events.h
-f:kernel/locking/lock_events_list.h
-f:kernel/locking/lockdep.c
-f:kernel/locking/lockdep_internals.h
-f:kernel/locking/lockdep_proc.c
-f:kernel/locking/lockdep_states.h
-f:kernel/locking/locktorture.c
-f:kernel/locking/mcs_spinlock.h
-f:kernel/locking/mutex-debug.c
-f:kernel/locking/mutex.c
-f:kernel/locking/mutex.h
-f:kernel/locking/osq_lock.c
-f:kernel/locking/percpu-rwsem.c
-f:kernel/locking/qrwlock.c
-f:kernel/locking/qspinlock.c
-f:kernel/locking/qspinlock.h
-f:kernel/locking/qspinlock_paravirt.h
-f:kernel/locking/qspinlock_stat.h
-f:kernel/locking/rtmutex.c
-f:kernel/locking/rtmutex_api.c
-f:kernel/locking/rtmutex_common.h
-f:kernel/locking/rwbase_rt.c
-f:kernel/locking/rwsem.c
-f:kernel/locking/semaphore.c
-f:kernel/locking/spinlock.c
-f:kernel/locking/spinlock_debug.c
-f:kernel/locking/spinlock_rt.c
-f:kernel/locking/test-ww_mutex.c
-f:kernel/locking/ww_mutex.h
-f:kernel/locking/ww_rt_mutex.c
-f:kernel/module/Kconfig
-f:kernel/module/Makefile
-f:kernel/module/debug_kmemleak.c
-f:kernel/module/decompress.c
-f:kernel/module/dups.c
-f:kernel/module/internal.h
-f:kernel/module/kallsyms.c
-f:kernel/module/kdb.c
-f:kernel/module/kmod.c
-f:kernel/module/livepatch.c
-f:kernel/module/main.c
-f:kernel/module/procfs.c
-f:kernel/module/signing.c
-f:kernel/module/stats.c
-f:kernel/module/strict_rwx.c
-f:kernel/module/sysfs.c
-f:kernel/module/tracking.c
-f:kernel/module/tree_lookup.c
-f:kernel/module/version.c
-f:kernel/module_signature.c
-f:kernel/notifier.c
-f:kernel/nsproxy.c
-f:kernel/padata.c
-f:kernel/panic.c
-f:kernel/params.c
-f:kernel/pid.c
-f:kernel/pid_namespace.c
-f:kernel/pid_sysctl.h
-f:kernel/power/Kconfig
-f:kernel/power/Makefile
-f:kernel/power/autosleep.c
-f:kernel/power/console.c
-f:kernel/power/energy_model.c
-f:kernel/power/hibernate.c
-f:kernel/power/main.c
-f:kernel/power/power.h
-f:kernel/power/poweroff.c
-f:kernel/power/process.c
-f:kernel/power/qos.c
-f:kernel/power/snapshot.c
-f:kernel/power/suspend.c
-f:kernel/power/suspend_test.c
-f:kernel/power/swap.c
-f:kernel/power/user.c
-f:kernel/power/wakelock.c
-f:kernel/printk/Makefile
-f:kernel/printk/braille.c
-f:kernel/printk/braille.h
-f:kernel/printk/console_cmdline.h
-f:kernel/printk/index.c
-f:kernel/printk/internal.h
-f:kernel/printk/nbcon.c
-f:kernel/printk/printk.c
-f:kernel/printk/printk_ringbuffer.c
-f:kernel/printk/printk_ringbuffer.h
-f:kernel/printk/printk_safe.c
-f:kernel/printk/sysctl.c
-f:kernel/profile.c
-f:kernel/ptrace.c
-f:kernel/range.c
-f:kernel/rcu/Kconfig
-f:kernel/rcu/Kconfig.debug
-f:kernel/rcu/Makefile
-f:kernel/rcu/rcu.h
-f:kernel/rcu/rcu_segcblist.c
-f:kernel/rcu/rcu_segcblist.h
-f:kernel/rcu/rcuscale.c
-f:kernel/rcu/rcutorture.c
-f:kernel/rcu/refscale.c
-f:kernel/rcu/srcutiny.c
-f:kernel/rcu/srcutree.c
-f:kernel/rcu/sync.c
-f:kernel/rcu/tasks.h
-f:kernel/rcu/tiny.c
-f:kernel/rcu/tree.c
-f:kernel/rcu/tree.h
-f:kernel/rcu/tree_exp.h
-f:kernel/rcu/tree_nocb.h
-f:kernel/rcu/tree_plugin.h
-f:kernel/rcu/tree_stall.h
-f:kernel/rcu/update.c
-f:kernel/reboot.c
-f:kernel/regset.c
-f:kernel/relay.c
-f:kernel/resource.c
-f:kernel/resource_kunit.c
-f:kernel/rseq.c
-f:kernel/scftorture.c
-f:kernel/sched/Makefile
-f:kernel/sched/autogroup.c
-f:kernel/sched/autogroup.h
-f:kernel/sched/build_policy.c
-f:kernel/sched/build_utility.c
-f:kernel/sched/clock.c
-f:kernel/sched/completion.c
-f:kernel/sched/core.c
-f:kernel/sched/core_sched.c
-f:kernel/sched/cpuacct.c
-f:kernel/sched/cpudeadline.c
-f:kernel/sched/cpudeadline.h
-f:kernel/sched/cpufreq.c
-f:kernel/sched/cpufreq_schedutil.c
-f:kernel/sched/cpupri.c
-f:kernel/sched/cpupri.h
-f:kernel/sched/cputime.c
-f:kernel/sched/deadline.c
-f:kernel/sched/debug.c
-f:kernel/sched/ext.c
-f:kernel/sched/ext.h
-f:kernel/sched/ext_idle.c
-f:kernel/sched/ext_idle.h
-f:kernel/sched/fair.c
-f:kernel/sched/features.h
-f:kernel/sched/idle.c
-f:kernel/sched/isolation.c
-f:kernel/sched/loadavg.c
-f:kernel/sched/membarrier.c
-f:kernel/sched/pelt.c
-f:kernel/sched/pelt.h
-f:kernel/sched/psi.c
-f:kernel/sched/rt.c
-f:kernel/sched/sched-pelt.h
-f:kernel/sched/sched.h
-f:kernel/sched/smp.h
-f:kernel/sched/stats.c
-f:kernel/sched/stats.h
-f:kernel/sched/stop_task.c
-f:kernel/sched/swait.c
-f:kernel/sched/syscalls.c
-f:kernel/sched/topology.c
-f:kernel/sched/wait.c
-f:kernel/sched/wait_bit.c
-f:kernel/scs.c
-f:kernel/seccomp.c
-f:kernel/signal.c
-f:kernel/smp.c
-f:kernel/smpboot.c
-f:kernel/smpboot.h
-f:kernel/softirq.c
-f:kernel/stacktrace.c
-f:kernel/static_call.c
-f:kernel/static_call_inline.c
-f:kernel/stop_machine.c
-f:kernel/sys.c
-f:kernel/sys_ni.c
-f:kernel/sysctl-test.c
-f:kernel/sysctl.c
-f:kernel/task_work.c
-f:kernel/taskstats.c
-f:kernel/time/Kconfig
-f:kernel/time/Makefile
-f:kernel/time/alarmtimer.c
-f:kernel/time/clockevents.c
-f:kernel/time/clocksource-wdtest.c
-f:kernel/time/clocksource.c
-f:kernel/time/hrtimer.c
-f:kernel/time/itimer.c
-f:kernel/time/jiffies.c
-f:kernel/time/namespace.c
-f:kernel/time/ntp.c
-f:kernel/time/ntp_internal.h
-f:kernel/time/posix-clock.c
-f:kernel/time/posix-cpu-timers.c
-f:kernel/time/posix-stubs.c
-f:kernel/time/posix-timers.c
-f:kernel/time/posix-timers.h
-f:kernel/time/sched_clock.c
-f:kernel/time/sleep_timeout.c
-f:kernel/time/test_udelay.c
-f:kernel/time/tick-broadcast-hrtimer.c
-f:kernel/time/tick-broadcast.c
-f:kernel/time/tick-common.c
-f:kernel/time/tick-internal.h
-f:kernel/time/tick-legacy.c
-f:kernel/time/tick-oneshot.c
-f:kernel/time/tick-sched.c
-f:kernel/time/tick-sched.h
-f:kernel/time/time.c
-f:kernel/time/time_test.c
-f:kernel/time/timeconst.bc
-f:kernel/time/timeconv.c
-f:kernel/time/timecounter.c
-f:kernel/time/timekeeping.c
-f:kernel/time/timekeeping.h
-f:kernel/time/timekeeping_debug.c
-f:kernel/time/timekeeping_internal.h
-f:kernel/time/timer.c
-f:kernel/time/timer_list.c
-f:kernel/time/timer_migration.c
-f:kernel/time/timer_migration.h
-f:kernel/time/vsyscall.c
-f:kernel/torture.c
-f:kernel/trace/Kconfig
-f:kernel/trace/Makefile
-f:kernel/trace/blktrace.c
-f:kernel/trace/bpf_trace.c
-f:kernel/trace/bpf_trace.h
-f:kernel/trace/error_report-traces.c
-f:kernel/trace/fgraph.c
-f:kernel/trace/fprobe.c
-f:kernel/trace/ftrace.c
-f:kernel/trace/ftrace_internal.h
-f:kernel/trace/kprobe_event_gen_test.c
-f:kernel/trace/pid_list.c
-f:kernel/trace/pid_list.h
-f:kernel/trace/power-traces.c
-f:kernel/trace/preemptirq_delay_test.c
-f:kernel/trace/rethook.c
-f:kernel/trace/ring_buffer.c
-f:kernel/trace/ring_buffer_benchmark.c
-f:kernel/trace/rpm-traces.c
-f:kernel/trace/rv/Kconfig
-f:kernel/trace/rv/Makefile
-f:kernel/trace/rv/monitors/nrp/Kconfig
-f:kernel/trace/rv/monitors/nrp/nrp.c
-f:kernel/trace/rv/monitors/nrp/nrp.h
-f:kernel/trace/rv/monitors/nrp/nrp_trace.h
-f:kernel/trace/rv/monitors/opid/Kconfig
-f:kernel/trace/rv/monitors/opid/opid.c
-f:kernel/trace/rv/monitors/opid/opid.h
-f:kernel/trace/rv/monitors/opid/opid_trace.h
-f:kernel/trace/rv/monitors/pagefault/Kconfig
-f:kernel/trace/rv/monitors/pagefault/pagefault.c
-f:kernel/trace/rv/monitors/pagefault/pagefault.h
-f:kernel/trace/rv/monitors/pagefault/pagefault_trace.h
-f:kernel/trace/rv/monitors/rtapp/Kconfig
-f:kernel/trace/rv/monitors/rtapp/rtapp.c
-f:kernel/trace/rv/monitors/rtapp/rtapp.h
-f:kernel/trace/rv/monitors/sched/Kconfig
-f:kernel/trace/rv/monitors/sched/sched.c
-f:kernel/trace/rv/monitors/sched/sched.h
-f:kernel/trace/rv/monitors/sco/Kconfig
-f:kernel/trace/rv/monitors/sco/sco.c
-f:kernel/trace/rv/monitors/sco/sco.h
-f:kernel/trace/rv/monitors/sco/sco_trace.h
-f:kernel/trace/rv/monitors/scpd/Kconfig
-f:kernel/trace/rv/monitors/scpd/scpd.c
-f:kernel/trace/rv/monitors/scpd/scpd.h
-f:kernel/trace/rv/monitors/scpd/scpd_trace.h
-f:kernel/trace/rv/monitors/sleep/Kconfig
-f:kernel/trace/rv/monitors/sleep/sleep.c
-f:kernel/trace/rv/monitors/sleep/sleep.h
-f:kernel/trace/rv/monitors/sleep/sleep_trace.h
-f:kernel/trace/rv/monitors/snep/Kconfig
-f:kernel/trace/rv/monitors/snep/snep.c
-f:kernel/trace/rv/monitors/snep/snep.h
-f:kernel/trace/rv/monitors/snep/snep_trace.h
-f:kernel/trace/rv/monitors/snroc/Kconfig
-f:kernel/trace/rv/monitors/snroc/snroc.c
-f:kernel/trace/rv/monitors/snroc/snroc.h
-f:kernel/trace/rv/monitors/snroc/snroc_trace.h
-f:kernel/trace/rv/monitors/sssw/Kconfig
-f:kernel/trace/rv/monitors/sssw/sssw.c
-f:kernel/trace/rv/monitors/sssw/sssw.h
-f:kernel/trace/rv/monitors/sssw/sssw_trace.h
-f:kernel/trace/rv/monitors/sts/Kconfig
-f:kernel/trace/rv/monitors/sts/sts.c
-f:kernel/trace/rv/monitors/sts/sts.h
-f:kernel/trace/rv/monitors/sts/sts_trace.h
-f:kernel/trace/rv/monitors/wip/Kconfig
-f:kernel/trace/rv/monitors/wip/wip.c
-f:kernel/trace/rv/monitors/wip/wip.h
-f:kernel/trace/rv/monitors/wip/wip_trace.h
-f:kernel/trace/rv/monitors/wwnr/Kconfig
-f:kernel/trace/rv/monitors/wwnr/wwnr.c
-f:kernel/trace/rv/monitors/wwnr/wwnr.h
-f:kernel/trace/rv/monitors/wwnr/wwnr_trace.h
-f:kernel/trace/rv/reactor_panic.c
-f:kernel/trace/rv/reactor_printk.c
-f:kernel/trace/rv/rv.c
-f:kernel/trace/rv/rv.h
-f:kernel/trace/rv/rv_reactors.c
-f:kernel/trace/rv/rv_trace.h
-f:kernel/trace/synth_event_gen_test.c
-f:kernel/trace/trace.c
-f:kernel/trace/trace.h
-f:kernel/trace/trace_benchmark.c
-f:kernel/trace/trace_benchmark.h
-f:kernel/trace/trace_boot.c
-f:kernel/trace/trace_branch.c
-f:kernel/trace/trace_btf.c
-f:kernel/trace/trace_btf.h
-f:kernel/trace/trace_clock.c
-f:kernel/trace/trace_dynevent.c
-f:kernel/trace/trace_dynevent.h
-f:kernel/trace/trace_entries.h
-f:kernel/trace/trace_eprobe.c
-f:kernel/trace/trace_event_perf.c
-f:kernel/trace/trace_events.c
-f:kernel/trace/trace_events_filter.c
-f:kernel/trace/trace_events_filter_test.h
-f:kernel/trace/trace_events_hist.c
-f:kernel/trace/trace_events_inject.c
-f:kernel/trace/trace_events_synth.c
-f:kernel/trace/trace_events_trigger.c
-f:kernel/trace/trace_events_user.c
-f:kernel/trace/trace_export.c
-f:kernel/trace/trace_fprobe.c
-f:kernel/trace/trace_functions.c
-f:kernel/trace/trace_functions_graph.c
-f:kernel/trace/trace_hwlat.c
-f:kernel/trace/trace_irqsoff.c
-f:kernel/trace/trace_kdb.c
-f:kernel/trace/trace_kprobe.c
-f:kernel/trace/trace_kprobe_selftest.c
-f:kernel/trace/trace_kprobe_selftest.h
-f:kernel/trace/trace_mmiotrace.c
-f:kernel/trace/trace_nop.c
-f:kernel/trace/trace_osnoise.c
-f:kernel/trace/trace_output.c
-f:kernel/trace/trace_output.h
-f:kernel/trace/trace_preemptirq.c
-f:kernel/trace/trace_printk.c
-f:kernel/trace/trace_probe.c
-f:kernel/trace/trace_probe.h
-f:kernel/trace/trace_probe_kernel.h
-f:kernel/trace/trace_probe_tmpl.h
-f:kernel/trace/trace_recursion_record.c
-f:kernel/trace/trace_sched_switch.c
-f:kernel/trace/trace_sched_wakeup.c
-f:kernel/trace/trace_selftest.c
-f:kernel/trace/trace_selftest_dynamic.c
-f:kernel/trace/trace_seq.c
-f:kernel/trace/trace_stack.c
-f:kernel/trace/trace_stat.c
-f:kernel/trace/trace_stat.h
-f:kernel/trace/trace_synth.h
-f:kernel/trace/trace_syscalls.c
-f:kernel/trace/trace_uprobe.c
-f:kernel/trace/tracing_map.c
-f:kernel/trace/tracing_map.h
-f:kernel/tracepoint.c
-f:kernel/tsacct.c
-f:kernel/ucount.c
-f:kernel/uid16.c
-f:kernel/uid16.h
-f:kernel/umh.c
-f:kernel/up.c
-f:kernel/user-return-notifier.c
-f:kernel/user.c
-f:kernel/user_namespace.c
-f:kernel/utsname.c
-f:kernel/utsname_sysctl.c
-f:kernel/vhost_task.c
-f:kernel/vmcore_info.c
-f:kernel/watch_queue.c
-f:kernel/watchdog.c
-f:kernel/watchdog_buddy.c
-f:kernel/watchdog_perf.c
-f:kernel/workqueue.c
-f:kernel/workqueue_internal.h
-f:lib/.gitignore
-f:lib/842/842.h
-f:lib/842/842_compress.c
-f:lib/842/842_debugfs.h
-f:lib/842/842_decompress.c
-f:lib/842/Makefile
-f:lib/Kconfig
-f:lib/Kconfig.debug
-f:lib/Kconfig.kasan
-f:lib/Kconfig.kcsan
-f:lib/Kconfig.kfence
-f:lib/Kconfig.kgdb
-f:lib/Kconfig.kmsan
-f:lib/Kconfig.ubsan
-f:lib/Makefile
-f:lib/alloc_tag.c
-f:lib/argv_split.c
-f:lib/ashldi3.c
-f:lib/ashrdi3.c
-f:lib/asn1_decoder.c
-f:lib/asn1_encoder.c
-f:lib/assoc_array.c
-f:lib/atomic64.c
-f:lib/atomic64_test.c
-f:lib/audit.c
-f:lib/base64.c
-f:lib/bcd.c
-f:lib/bch.c
-f:lib/bitmap-str.c
-f:lib/bitmap.c
-f:lib/bitrev.c
-f:lib/bootconfig-data.S
-f:lib/bootconfig.c
-f:lib/bsearch.c
-f:lib/btree.c
-f:lib/bucket_locks.c
-f:lib/bug.c
-f:lib/build_OID_registry
-f:lib/buildid.c
-f:lib/bust_spinlocks.c
-f:lib/check_signature.c
-f:lib/checksum.c
-f:lib/closure.c
-f:lib/clz_ctz.c
-f:lib/clz_tab.c
-f:lib/cmdline.c
-f:lib/cmpdi2.c
-f:lib/cmpxchg-emu.c
-f:lib/codetag.c
-f:lib/compat_audit.c
-f:lib/cpu_rmap.c
-f:lib/cpumask.c
-f:lib/crc/.gitignore
-f:lib/crc/Kconfig
-f:lib/crc/Makefile
-f:lib/crc/arm/crc-t10dif-core.S
-f:lib/crc/arm/crc-t10dif.h
-f:lib/crc/arm/crc32-core.S
-f:lib/crc/arm/crc32.h
-f:lib/crc/arm64/crc-t10dif-core.S
-f:lib/crc/arm64/crc-t10dif.h
-f:lib/crc/arm64/crc32-core.S
-f:lib/crc/arm64/crc32.h
-f:lib/crc/crc-ccitt.c
-f:lib/crc/crc-itu-t.c
-f:lib/crc/crc-t10dif-main.c
-f:lib/crc/crc16.c
-f:lib/crc/crc32-main.c
-f:lib/crc/crc4.c
-f:lib/crc/crc64-main.c
-f:lib/crc/crc7.c
-f:lib/crc/crc8.c
-f:lib/crc/gen_crc32table.c
-f:lib/crc/gen_crc64table.c
-f:lib/crc/loongarch/crc32.h
-f:lib/crc/mips/crc32.h
-f:lib/crc/powerpc/crc-t10dif.h
-f:lib/crc/powerpc/crc-vpmsum-template.S
-f:lib/crc/powerpc/crc32.h
-f:lib/crc/powerpc/crc32c-vpmsum_asm.S
-f:lib/crc/powerpc/crct10dif-vpmsum_asm.S
-f:lib/crc/riscv/crc-clmul-consts.h
-f:lib/crc/riscv/crc-clmul-template.h
-f:lib/crc/riscv/crc-clmul.h
-f:lib/crc/riscv/crc-t10dif.h
-f:lib/crc/riscv/crc16_msb.c
-f:lib/crc/riscv/crc32.h
-f:lib/crc/riscv/crc32_lsb.c
-f:lib/crc/riscv/crc32_msb.c
-f:lib/crc/riscv/crc64.h
-f:lib/crc/riscv/crc64_lsb.c
-f:lib/crc/riscv/crc64_msb.c
-f:lib/crc/s390/crc32-vx.h
-f:lib/crc/s390/crc32.h
-f:lib/crc/s390/crc32be-vx.c
-f:lib/crc/s390/crc32le-vx.c
-f:lib/crc/sparc/crc32.h
-f:lib/crc/sparc/crc32c_asm.S
-f:lib/crc/tests/Makefile
-f:lib/crc/tests/crc_kunit.c
-f:lib/crc/x86/crc-pclmul-consts.h
-f:lib/crc/x86/crc-pclmul-template.S
-f:lib/crc/x86/crc-pclmul-template.h
-f:lib/crc/x86/crc-t10dif.h
-f:lib/crc/x86/crc16-msb-pclmul.S
-f:lib/crc/x86/crc32-pclmul.S
-f:lib/crc/x86/crc32.h
-f:lib/crc/x86/crc32c-3way.S
-f:lib/crc/x86/crc64-pclmul.S
-f:lib/crc/x86/crc64.h
-f:lib/crypto/Kconfig
-f:lib/crypto/Makefile
-f:lib/crypto/aes.c
-f:lib/crypto/aescfb.c
-f:lib/crypto/aesgcm.c
-f:lib/crypto/arc4.c
-f:lib/crypto/arm/.gitignore
-f:lib/crypto/arm/Kconfig
-f:lib/crypto/arm/Makefile
-f:lib/crypto/arm/blake2s-core.S
-f:lib/crypto/arm/blake2s-glue.c
-f:lib/crypto/arm/chacha-glue.c
-f:lib/crypto/arm/chacha-neon-core.S
-f:lib/crypto/arm/chacha-scalar-core.S
-f:lib/crypto/arm/poly1305-armv4.pl
-f:lib/crypto/arm/poly1305-glue.c
-f:lib/crypto/arm/sha1-armv4-large.S
-f:lib/crypto/arm/sha1-armv7-neon.S
-f:lib/crypto/arm/sha1-ce-core.S
-f:lib/crypto/arm/sha1.h
-f:lib/crypto/arm/sha256-armv4.pl
-f:lib/crypto/arm/sha256-ce.S
-f:lib/crypto/arm/sha256.h
-f:lib/crypto/arm/sha512-armv4.pl
-f:lib/crypto/arm/sha512.h
-f:lib/crypto/arm64/.gitignore
-f:lib/crypto/arm64/Kconfig
-f:lib/crypto/arm64/Makefile
-f:lib/crypto/arm64/chacha-neon-core.S
-f:lib/crypto/arm64/chacha-neon-glue.c
-f:lib/crypto/arm64/poly1305-armv8.pl
-f:lib/crypto/arm64/poly1305-glue.c
-f:lib/crypto/arm64/sha1-ce-core.S
-f:lib/crypto/arm64/sha1.h
-f:lib/crypto/arm64/sha2-armv8.pl
-f:lib/crypto/arm64/sha256-ce.S
-f:lib/crypto/arm64/sha256.h
-f:lib/crypto/arm64/sha512-ce-core.S
-f:lib/crypto/arm64/sha512.h
-f:lib/crypto/blake2s-generic.c
-f:lib/crypto/blake2s-selftest.c
-f:lib/crypto/blake2s.c
-f:lib/crypto/chacha.c
-f:lib/crypto/chacha20poly1305-selftest.c
-f:lib/crypto/chacha20poly1305.c
-f:lib/crypto/curve25519-fiat32.c
-f:lib/crypto/curve25519-generic.c
-f:lib/crypto/curve25519-hacl64.c
-f:lib/crypto/curve25519-selftest.c
-f:lib/crypto/curve25519.c
-f:lib/crypto/des.c
-f:lib/crypto/gf128mul.c
-f:lib/crypto/hash_info.c
-f:lib/crypto/libchacha.c
-f:lib/crypto/memneq.c
-f:lib/crypto/mips/.gitignore
-f:lib/crypto/mips/Kconfig
-f:lib/crypto/mips/Makefile
-f:lib/crypto/mips/chacha-core.S
-f:lib/crypto/mips/chacha-glue.c
-f:lib/crypto/mips/poly1305-glue.c
-f:lib/crypto/mips/poly1305-mips.pl
-f:lib/crypto/mips/sha1.h
-f:lib/crypto/mips/sha256.h
-f:lib/crypto/mips/sha512.h
-f:lib/crypto/mpi/Makefile
-f:lib/crypto/mpi/generic_mpih-add1.c
-f:lib/crypto/mpi/generic_mpih-lshift.c
-f:lib/crypto/mpi/generic_mpih-mul1.c
-f:lib/crypto/mpi/generic_mpih-mul2.c
-f:lib/crypto/mpi/generic_mpih-mul3.c
-f:lib/crypto/mpi/generic_mpih-rshift.c
-f:lib/crypto/mpi/generic_mpih-sub1.c
-f:lib/crypto/mpi/longlong.h
-f:lib/crypto/mpi/mpi-add.c
-f:lib/crypto/mpi/mpi-bit.c
-f:lib/crypto/mpi/mpi-cmp.c
-f:lib/crypto/mpi/mpi-div.c
-f:lib/crypto/mpi/mpi-inline.h
-f:lib/crypto/mpi/mpi-internal.h
-f:lib/crypto/mpi/mpi-mod.c
-f:lib/crypto/mpi/mpi-mul.c
-f:lib/crypto/mpi/mpi-pow.c
-f:lib/crypto/mpi/mpi-sub-ui.c
-f:lib/crypto/mpi/mpicoder.c
-f:lib/crypto/mpi/mpih-cmp.c
-f:lib/crypto/mpi/mpih-div.c
-f:lib/crypto/mpi/mpih-mul.c
-f:lib/crypto/mpi/mpiutil.c
-f:lib/crypto/poly1305-donna32.c
-f:lib/crypto/poly1305-donna64.c
-f:lib/crypto/poly1305-generic.c
-f:lib/crypto/poly1305.c
-f:lib/crypto/powerpc/Kconfig
-f:lib/crypto/powerpc/Makefile
-f:lib/crypto/powerpc/chacha-p10-glue.c
-f:lib/crypto/powerpc/chacha-p10le-8x.S
-f:lib/crypto/powerpc/poly1305-p10-glue.c
-f:lib/crypto/powerpc/poly1305-p10le_64.S
-f:lib/crypto/powerpc/sha1-powerpc-asm.S
-f:lib/crypto/powerpc/sha1-spe-asm.S
-f:lib/crypto/powerpc/sha1.h
-f:lib/crypto/powerpc/sha256-spe-asm.S
-f:lib/crypto/powerpc/sha256.h
-f:lib/crypto/riscv/Kconfig
-f:lib/crypto/riscv/Makefile
-f:lib/crypto/riscv/chacha-riscv64-glue.c
-f:lib/crypto/riscv/chacha-riscv64-zvkb.S
-f:lib/crypto/riscv/sha256-riscv64-zvknha_or_zvknhb-zvkb.S
-f:lib/crypto/riscv/sha256.h
-f:lib/crypto/riscv/sha512-riscv64-zvknhb-zvkb.S
-f:lib/crypto/riscv/sha512.h
-f:lib/crypto/s390/Kconfig
-f:lib/crypto/s390/Makefile
-f:lib/crypto/s390/chacha-glue.c
-f:lib/crypto/s390/chacha-s390.S
-f:lib/crypto/s390/chacha-s390.h
-f:lib/crypto/s390/sha1.h
-f:lib/crypto/s390/sha256.h
-f:lib/crypto/s390/sha512.h
-f:lib/crypto/sha1.c
-f:lib/crypto/sha256.c
-f:lib/crypto/sha512.c
-f:lib/crypto/simd.c
-f:lib/crypto/sm3.c
-f:lib/crypto/sparc/sha1.h
-f:lib/crypto/sparc/sha1_asm.S
-f:lib/crypto/sparc/sha256.h
-f:lib/crypto/sparc/sha256_asm.S
-f:lib/crypto/sparc/sha512.h
-f:lib/crypto/sparc/sha512_asm.S
-f:lib/crypto/tests/Kconfig
-f:lib/crypto/tests/Makefile
-f:lib/crypto/tests/hash-test-template.h
-f:lib/crypto/tests/poly1305-testvecs.h
-f:lib/crypto/tests/poly1305_kunit.c
-f:lib/crypto/tests/sha1-testvecs.h
-f:lib/crypto/tests/sha1_kunit.c
-f:lib/crypto/tests/sha224-testvecs.h
-f:lib/crypto/tests/sha224_kunit.c
-f:lib/crypto/tests/sha256-testvecs.h
-f:lib/crypto/tests/sha256_kunit.c
-f:lib/crypto/tests/sha384-testvecs.h
-f:lib/crypto/tests/sha384_kunit.c
-f:lib/crypto/tests/sha512-testvecs.h
-f:lib/crypto/tests/sha512_kunit.c
-f:lib/crypto/utils.c
-f:lib/crypto/x86/.gitignore
-f:lib/crypto/x86/Kconfig
-f:lib/crypto/x86/Makefile
-f:lib/crypto/x86/blake2s-core.S
-f:lib/crypto/x86/blake2s-glue.c
-f:lib/crypto/x86/chacha-avx2-x86_64.S
-f:lib/crypto/x86/chacha-avx512vl-x86_64.S
-f:lib/crypto/x86/chacha-ssse3-x86_64.S
-f:lib/crypto/x86/chacha_glue.c
-f:lib/crypto/x86/poly1305-x86_64-cryptogams.pl
-f:lib/crypto/x86/poly1305_glue.c
-f:lib/crypto/x86/sha1-avx2-asm.S
-f:lib/crypto/x86/sha1-ni-asm.S
-f:lib/crypto/x86/sha1-ssse3-and-avx.S
-f:lib/crypto/x86/sha1.h
-f:lib/crypto/x86/sha256-avx-asm.S
-f:lib/crypto/x86/sha256-avx2-asm.S
-f:lib/crypto/x86/sha256-ni-asm.S
-f:lib/crypto/x86/sha256-ssse3-asm.S
-f:lib/crypto/x86/sha256.h
-f:lib/crypto/x86/sha512-avx-asm.S
-f:lib/crypto/x86/sha512-avx2-asm.S
-f:lib/crypto/x86/sha512-ssse3-asm.S
-f:lib/crypto/x86/sha512.h
-f:lib/ctype.c
-f:lib/debug_info.c
-f:lib/debug_locks.c
-f:lib/debugobjects.c
-f:lib/dec_and_lock.c
-f:lib/decompress.c
-f:lib/decompress_bunzip2.c
-f:lib/decompress_inflate.c
-f:lib/decompress_unlz4.c
-f:lib/decompress_unlzma.c
-f:lib/decompress_unlzo.c
-f:lib/decompress_unxz.c
-f:lib/decompress_unzstd.c
-f:lib/devmem_is_allowed.c
-f:lib/devres.c
-f:lib/dhry.h
-f:lib/dhry_1.c
-f:lib/dhry_2.c
-f:lib/dhry_run.c
-f:lib/digsig.c
-f:lib/dim/Makefile
-f:lib/dim/dim.c
-f:lib/dim/net_dim.c
-f:lib/dim/rdma_dim.c
-f:lib/dump_stack.c
-f:lib/dynamic_debug.c
-f:lib/dynamic_queue_limits.c
-f:lib/earlycpio.c
-f:lib/errname.c
-f:lib/error-inject.c
-f:lib/errseq.c
-f:lib/extable.c
-f:lib/fault-inject-usercopy.c
-f:lib/fault-inject.c
-f:lib/fdt.c
-f:lib/fdt_addresses.c
-f:lib/fdt_empty_tree.c
-f:lib/fdt_ro.c
-f:lib/fdt_rw.c
-f:lib/fdt_strerror.c
-f:lib/fdt_sw.c
-f:lib/fdt_wip.c
-f:lib/find_bit.c
-f:lib/find_bit_benchmark.c
-f:lib/flex_proportions.c
-f:lib/fonts/Kconfig
-f:lib/fonts/Makefile
-f:lib/fonts/font_10x18.c
-f:lib/fonts/font_6x10.c
-f:lib/fonts/font_6x11.c
-f:lib/fonts/font_6x8.c
-f:lib/fonts/font_7x14.c
-f:lib/fonts/font_8x16.c
-f:lib/fonts/font_8x8.c
-f:lib/fonts/font_acorn_8x8.c
-f:lib/fonts/font_mini_4x6.c
-f:lib/fonts/font_pearl_8x8.c
-f:lib/fonts/font_sun12x22.c
-f:lib/fonts/font_sun8x16.c
-f:lib/fonts/font_ter16x32.c
-f:lib/fonts/fonts.c
-f:lib/fw_table.c
-f:lib/genalloc.c
-f:lib/generic-radix-tree.c
-f:lib/glob.c
-f:lib/globtest.c
-f:lib/group_cpus.c
-f:lib/hexdump.c
-f:lib/hweight.c
-f:lib/idr.c
-f:lib/inflate.c
-f:lib/interval_tree.c
-f:lib/interval_tree_test.c
-f:lib/iomap.c
-f:lib/iomap_copy.c
-f:lib/iomem_copy.c
-f:lib/iommu-helper.c
-f:lib/iov_iter.c
-f:lib/irq_poll.c
-f:lib/irq_regs.c
-f:lib/is_single_threaded.c
-f:lib/kasprintf.c
-f:lib/kfifo.c
-f:lib/klist.c
-f:lib/kobject.c
-f:lib/kobject_uevent.c
-f:lib/kstrtox.c
-f:lib/kstrtox.h
-f:lib/kunit/.kunitconfig
-f:lib/kunit/Kconfig
-f:lib/kunit/Makefile
-f:lib/kunit/assert.c
-f:lib/kunit/assert_test.c
-f:lib/kunit/attributes.c
-f:lib/kunit/debugfs.c
-f:lib/kunit/debugfs.h
-f:lib/kunit/device-impl.h
-f:lib/kunit/device.c
-f:lib/kunit/executor.c
-f:lib/kunit/executor_test.c
-f:lib/kunit/hooks-impl.h
-f:lib/kunit/hooks.c
-f:lib/kunit/kunit-example-test.c
-f:lib/kunit/kunit-test.c
-f:lib/kunit/platform-test.c
-f:lib/kunit/platform.c
-f:lib/kunit/resource.c
-f:lib/kunit/static_stub.c
-f:lib/kunit/string-stream-test.c
-f:lib/kunit/string-stream.c
-f:lib/kunit/string-stream.h
-f:lib/kunit/test.c
-f:lib/kunit/try-catch-impl.h
-f:lib/kunit/try-catch.c
-f:lib/kunit/user_alloc.c
-f:lib/linear_ranges.c
-f:lib/list_debug.c
-f:lib/list_sort.c
-f:lib/llist.c
-f:lib/locking-selftest-hardirq.h
-f:lib/locking-selftest-mutex.h
-f:lib/locking-selftest-rlock-hardirq.h
-f:lib/locking-selftest-rlock-softirq.h
-f:lib/locking-selftest-rlock.h
-f:lib/locking-selftest-rsem.h
-f:lib/locking-selftest-rtmutex.h
-f:lib/locking-selftest-softirq.h
-f:lib/locking-selftest-spin-hardirq.h
-f:lib/locking-selftest-spin-softirq.h
-f:lib/locking-selftest-spin.h
-f:lib/locking-selftest-wlock-hardirq.h
-f:lib/locking-selftest-wlock-softirq.h
-f:lib/locking-selftest-wlock.h
-f:lib/locking-selftest-wsem.h
-f:lib/locking-selftest.c
-f:lib/lockref.c
-f:lib/logic_iomem.c
-f:lib/logic_pio.c
-f:lib/lru_cache.c
-f:lib/lshrdi3.c
-f:lib/lwq.c
-f:lib/lz4/Makefile
-f:lib/lz4/lz4_compress.c
-f:lib/lz4/lz4_decompress.c
-f:lib/lz4/lz4defs.h
-f:lib/lz4/lz4hc_compress.c
-f:lib/lzo/Makefile
-f:lib/lzo/lzo1x_compress.c
-f:lib/lzo/lzo1x_compress_safe.c
-f:lib/lzo/lzo1x_decompress_safe.c
-f:lib/lzo/lzodefs.h
-f:lib/maple_tree.c
-f:lib/math/Kconfig
-f:lib/math/Makefile
-f:lib/math/cordic.c
-f:lib/math/div64.c
-f:lib/math/gcd.c
-f:lib/math/int_log.c
-f:lib/math/int_pow.c
-f:lib/math/int_sqrt.c
-f:lib/math/lcm.c
-f:lib/math/prime_numbers.c
-f:lib/math/prime_numbers_private.h
-f:lib/math/rational.c
-f:lib/math/reciprocal_div.c
-f:lib/math/test_div64.c
-f:lib/math/test_mul_u64_u64_div_u64.c
-f:lib/math/tests/Makefile
-f:lib/math/tests/gcd_kunit.c
-f:lib/math/tests/int_log_kunit.c
-f:lib/math/tests/int_pow_kunit.c
-f:lib/math/tests/int_sqrt_kunit.c
-f:lib/math/tests/prime_numbers_kunit.c
-f:lib/math/tests/rational_kunit.c
-f:lib/memcat_p.c
-f:lib/memory-notifier-error-inject.c
-f:lib/memregion.c
-f:lib/memweight.c
-f:lib/min_heap.c
-f:lib/muldi3.c
-f:lib/net_utils.c
-f:lib/netdev-notifier-error-inject.c
-f:lib/nlattr.c
-f:lib/nmi_backtrace.c
-f:lib/notifier-error-inject.c
-f:lib/notifier-error-inject.h
-f:lib/objagg.c
-f:lib/objpool.c
-f:lib/of-reconfig-notifier-error-inject.c
-f:lib/oid_registry.c
-f:lib/once.c
-f:lib/packing.c
-f:lib/packing_test.c
-f:lib/parman.c
-f:lib/parser.c
-f:lib/percpu-refcount.c
-f:lib/percpu_counter.c
-f:lib/percpu_test.c
-f:lib/pldmfw/Makefile
-f:lib/pldmfw/pldmfw.c
-f:lib/pldmfw/pldmfw_private.h
-f:lib/plist.c
-f:lib/pm-notifier-error-inject.c
-f:lib/polynomial.c
-f:lib/radix-tree.c
-f:lib/radix-tree.h
-f:lib/raid6/.gitignore
-f:lib/raid6/Makefile
-f:lib/raid6/algos.c
-f:lib/raid6/altivec.uc
-f:lib/raid6/avx2.c
-f:lib/raid6/avx512.c
-f:lib/raid6/int.uc
-f:lib/raid6/loongarch.h
-f:lib/raid6/loongarch_simd.c
-f:lib/raid6/mktables.c
-f:lib/raid6/mmx.c
-f:lib/raid6/neon.c
-f:lib/raid6/neon.h
-f:lib/raid6/neon.uc
-f:lib/raid6/recov.c
-f:lib/raid6/recov_avx2.c
-f:lib/raid6/recov_avx512.c
-f:lib/raid6/recov_loongarch_simd.c
-f:lib/raid6/recov_neon.c
-f:lib/raid6/recov_neon_inner.c
-f:lib/raid6/recov_rvv.c
-f:lib/raid6/recov_s390xc.c
-f:lib/raid6/recov_ssse3.c
-f:lib/raid6/rvv.c
-f:lib/raid6/rvv.h
-f:lib/raid6/s390vx.uc
-f:lib/raid6/sse1.c
-f:lib/raid6/sse2.c
-f:lib/raid6/test/.gitignore
-f:lib/raid6/test/Makefile
-f:lib/raid6/test/test.c
-f:lib/raid6/unroll.awk
-f:lib/raid6/vpermxor.uc
-f:lib/raid6/x86.h
-f:lib/random32.c
-f:lib/ratelimit.c
-f:lib/rbtree.c
-f:lib/rbtree_test.c
-f:lib/rcuref.c
-f:lib/reed_solomon/Makefile
-f:lib/reed_solomon/decode_rs.c
-f:lib/reed_solomon/encode_rs.c
-f:lib/reed_solomon/reed_solomon.c
-f:lib/reed_solomon/test_rslib.c
-f:lib/ref_tracker.c
-f:lib/refcount.c
-f:lib/rhashtable.c
-f:lib/sbitmap.c
-f:lib/scatterlist.c
-f:lib/seq_buf.c
-f:lib/sg_pool.c
-f:lib/sg_split.c
-f:lib/siphash.c
-f:lib/smp_processor_id.c
-f:lib/sort.c
-f:lib/stackdepot.c
-f:lib/stmp_device.c
-f:lib/string.c
-f:lib/string_helpers.c
-f:lib/strncpy_from_user.c
-f:lib/strnlen_user.c
-f:lib/syscall.c
-f:lib/test-kstrtox.c
-f:lib/test_bitmap.c
-f:lib/test_bitops.c
-f:lib/test_bpf.c
-f:lib/test_debug_virtual.c
-f:lib/test_dynamic_debug.c
-f:lib/test_firmware.c
-f:lib/test_fortify/.gitignore
-f:lib/test_fortify/Makefile
-f:lib/test_fortify/read_overflow-memchr.c
-f:lib/test_fortify/read_overflow-memchr_inv.c
-f:lib/test_fortify/read_overflow-memcmp.c
-f:lib/test_fortify/read_overflow-memscan.c
-f:lib/test_fortify/read_overflow2-memcmp.c
-f:lib/test_fortify/read_overflow2-memcpy.c
-f:lib/test_fortify/read_overflow2-memmove.c
-f:lib/test_fortify/read_overflow2_field-memcpy.c
-f:lib/test_fortify/read_overflow2_field-memmove.c
-f:lib/test_fortify/test_fortify.h
-f:lib/test_fortify/test_fortify.sh
-f:lib/test_fortify/write_overflow-memcpy.c
-f:lib/test_fortify/write_overflow-memmove.c
-f:lib/test_fortify/write_overflow-memset.c
-f:lib/test_fortify/write_overflow-strcpy-lit.c
-f:lib/test_fortify/write_overflow-strcpy.c
-f:lib/test_fortify/write_overflow-strncpy-src.c
-f:lib/test_fortify/write_overflow-strncpy.c
-f:lib/test_fortify/write_overflow-strscpy.c
-f:lib/test_fortify/write_overflow_field-memcpy.c
-f:lib/test_fortify/write_overflow_field-memmove.c
-f:lib/test_fortify/write_overflow_field-memset.c
-f:lib/test_fpu.h
-f:lib/test_fpu_glue.c
-f:lib/test_fpu_impl.c
-f:lib/test_free_pages.c
-f:lib/test_hexdump.c
-f:lib/test_hmm.c
-f:lib/test_hmm_uapi.h
-f:lib/test_ida.c
-f:lib/test_kmod.c
-f:lib/test_lockup.c
-f:lib/test_maple_tree.c
-f:lib/test_memcat_p.c
-f:lib/test_meminit.c
-f:lib/test_min_heap.c
-f:lib/test_module.c
-f:lib/test_objagg.c
-f:lib/test_objpool.c
-f:lib/test_parman.c
-f:lib/test_ref_tracker.c
-f:lib/test_rhashtable.c
-f:lib/test_static_key_base.c
-f:lib/test_static_keys.c
-f:lib/test_sysctl.c
-f:lib/test_ubsan.c
-f:lib/test_uuid.c
-f:lib/test_vmalloc.c
-f:lib/test_xarray.c
-f:lib/tests/Makefile
-f:lib/tests/bitfield_kunit.c
-f:lib/tests/blackhole_dev_kunit.c
-f:lib/tests/checksum_kunit.c
-f:lib/tests/cmdline_kunit.c
-f:lib/tests/cpumask_kunit.c
-f:lib/tests/fortify_kunit.c
-f:lib/tests/hashtable_test.c
-f:lib/tests/is_signed_type_kunit.c
-f:lib/tests/kfifo_kunit.c
-f:lib/tests/kunit_iov_iter.c
-f:lib/tests/list-test.c
-f:lib/tests/longest_symbol_kunit.c
-f:lib/tests/memcpy_kunit.c
-f:lib/tests/module/.gitignore
-f:lib/tests/module/Makefile
-f:lib/tests/module/gen_test_kallsyms.sh
-f:lib/tests/overflow_kunit.c
-f:lib/tests/printf_kunit.c
-f:lib/tests/randstruct_kunit.c
-f:lib/tests/scanf_kunit.c
-f:lib/tests/seq_buf_kunit.c
-f:lib/tests/siphash_kunit.c
-f:lib/tests/slub_kunit.c
-f:lib/tests/stackinit_kunit.c
-f:lib/tests/string_helpers_kunit.c
-f:lib/tests/string_kunit.c
-f:lib/tests/test_bits.c
-f:lib/tests/test_fprobe.c
-f:lib/tests/test_hash.c
-f:lib/tests/test_kprobes.c
-f:lib/tests/test_linear_ranges.c
-f:lib/tests/test_list_sort.c
-f:lib/tests/test_ratelimit.c
-f:lib/tests/test_sort.c
-f:lib/tests/usercopy_kunit.c
-f:lib/tests/util_macros_kunit.c
-f:lib/textsearch.c
-f:lib/timerqueue.c
-f:lib/trace_readwrite.c
-f:lib/ts_bm.c
-f:lib/ts_fsm.c
-f:lib/ts_kmp.c
-f:lib/ubsan.c
-f:lib/ubsan.h
-f:lib/ucmpdi2.c
-f:lib/ucs2_string.c
-f:lib/union_find.c
-f:lib/usercopy.c
-f:lib/uuid.c
-f:lib/vdso/Kconfig
-f:lib/vdso/Makefile
-f:lib/vdso/Makefile.include
-f:lib/vdso/datastore.c
-f:lib/vdso/getrandom.c
-f:lib/vdso/gettimeofday.c
-f:lib/vsprintf.c
-f:lib/win_minmax.c
-f:lib/xarray.c
-f:lib/xxhash.c
-f:lib/xz/Kconfig
-f:lib/xz/Makefile
-f:lib/xz/xz_crc32.c
-f:lib/xz/xz_dec_bcj.c
-f:lib/xz/xz_dec_lzma2.c
-f:lib/xz/xz_dec_stream.c
-f:lib/xz/xz_dec_syms.c
-f:lib/xz/xz_dec_test.c
-f:lib/xz/xz_lzma2.h
-f:lib/xz/xz_private.h
-f:lib/xz/xz_stream.h
-f:lib/zlib_deflate/Makefile
-f:lib/zlib_deflate/deflate.c
-f:lib/zlib_deflate/deflate_syms.c
-f:lib/zlib_deflate/deftree.c
-f:lib/zlib_deflate/defutil.h
-f:lib/zlib_dfltcc/Makefile
-f:lib/zlib_dfltcc/dfltcc.c
-f:lib/zlib_dfltcc/dfltcc.h
-f:lib/zlib_dfltcc/dfltcc_deflate.c
-f:lib/zlib_dfltcc/dfltcc_deflate.h
-f:lib/zlib_dfltcc/dfltcc_inflate.c
-f:lib/zlib_dfltcc/dfltcc_inflate.h
-f:lib/zlib_dfltcc/dfltcc_util.h
-f:lib/zlib_inflate/Makefile
-f:lib/zlib_inflate/inffast.c
-f:lib/zlib_inflate/inffast.h
-f:lib/zlib_inflate/inffixed.h
-f:lib/zlib_inflate/inflate.c
-f:lib/zlib_inflate/inflate.h
-f:lib/zlib_inflate/inflate_syms.c
-f:lib/zlib_inflate/inftrees.c
-f:lib/zlib_inflate/inftrees.h
-f:lib/zlib_inflate/infutil.c
-f:lib/zlib_inflate/infutil.h
-f:lib/zstd/Makefile
-f:lib/zstd/common/allocations.h
-f:lib/zstd/common/bits.h
-f:lib/zstd/common/bitstream.h
-f:lib/zstd/common/compiler.h
-f:lib/zstd/common/cpu.h
-f:lib/zstd/common/debug.c
-f:lib/zstd/common/debug.h
-f:lib/zstd/common/entropy_common.c
-f:lib/zstd/common/error_private.c
-f:lib/zstd/common/error_private.h
-f:lib/zstd/common/fse.h
-f:lib/zstd/common/fse_decompress.c
-f:lib/zstd/common/huf.h
-f:lib/zstd/common/mem.h
-f:lib/zstd/common/portability_macros.h
-f:lib/zstd/common/zstd_common.c
-f:lib/zstd/common/zstd_deps.h
-f:lib/zstd/common/zstd_internal.h
-f:lib/zstd/compress/clevels.h
-f:lib/zstd/compress/fse_compress.c
-f:lib/zstd/compress/hist.c
-f:lib/zstd/compress/hist.h
-f:lib/zstd/compress/huf_compress.c
-f:lib/zstd/compress/zstd_compress.c
-f:lib/zstd/compress/zstd_compress_internal.h
-f:lib/zstd/compress/zstd_compress_literals.c
-f:lib/zstd/compress/zstd_compress_literals.h
-f:lib/zstd/compress/zstd_compress_sequences.c
-f:lib/zstd/compress/zstd_compress_sequences.h
-f:lib/zstd/compress/zstd_compress_superblock.c
-f:lib/zstd/compress/zstd_compress_superblock.h
-f:lib/zstd/compress/zstd_cwksp.h
-f:lib/zstd/compress/zstd_double_fast.c
-f:lib/zstd/compress/zstd_double_fast.h
-f:lib/zstd/compress/zstd_fast.c
-f:lib/zstd/compress/zstd_fast.h
-f:lib/zstd/compress/zstd_lazy.c
-f:lib/zstd/compress/zstd_lazy.h
-f:lib/zstd/compress/zstd_ldm.c
-f:lib/zstd/compress/zstd_ldm.h
-f:lib/zstd/compress/zstd_ldm_geartab.h
-f:lib/zstd/compress/zstd_opt.c
-f:lib/zstd/compress/zstd_opt.h
-f:lib/zstd/compress/zstd_preSplit.c
-f:lib/zstd/compress/zstd_preSplit.h
-f:lib/zstd/decompress/huf_decompress.c
-f:lib/zstd/decompress/zstd_ddict.c
-f:lib/zstd/decompress/zstd_ddict.h
-f:lib/zstd/decompress/zstd_decompress.c
-f:lib/zstd/decompress/zstd_decompress_block.c
-f:lib/zstd/decompress/zstd_decompress_block.h
-f:lib/zstd/decompress/zstd_decompress_internal.h
-f:lib/zstd/decompress_sources.h
-f:lib/zstd/zstd_common_module.c
-f:lib/zstd/zstd_compress_module.c
-f:lib/zstd/zstd_decompress_module.c
-f:mm/Kconfig
-f:mm/Kconfig.debug
-f:mm/Makefile
-f:mm/backing-dev.c
-f:mm/balloon_compaction.c
-f:mm/bootmem_info.c
-f:mm/cma.c
-f:mm/cma.h
-f:mm/cma_debug.c
-f:mm/cma_sysfs.c
-f:mm/compaction.c
-f:mm/damon/Kconfig
-f:mm/damon/Makefile
-f:mm/damon/core.c
-f:mm/damon/lru_sort.c
-f:mm/damon/modules-common.c
-f:mm/damon/modules-common.h
-f:mm/damon/ops-common.c
-f:mm/damon/ops-common.h
-f:mm/damon/paddr.c
-f:mm/damon/reclaim.c
-f:mm/damon/stat.c
-f:mm/damon/sysfs-common.c
-f:mm/damon/sysfs-common.h
-f:mm/damon/sysfs-schemes.c
-f:mm/damon/sysfs.c
-f:mm/damon/tests/.kunitconfig
-f:mm/damon/tests/core-kunit.h
-f:mm/damon/tests/sysfs-kunit.h
-f:mm/damon/tests/vaddr-kunit.h
-f:mm/damon/vaddr.c
-f:mm/debug.c
-f:mm/debug_page_alloc.c
-f:mm/debug_page_ref.c
-f:mm/debug_vm_pgtable.c
-f:mm/dmapool.c
-f:mm/dmapool_test.c
-f:mm/early_ioremap.c
-f:mm/execmem.c
-f:mm/fadvise.c
-f:mm/fail_page_alloc.c
-f:mm/failslab.c
-f:mm/filemap.c
-f:mm/folio-compat.c
-f:mm/gup.c
-f:mm/gup_test.c
-f:mm/gup_test.h
-f:mm/highmem.c
-f:mm/hmm.c
-f:mm/huge_memory.c
-f:mm/hugetlb.c
-f:mm/hugetlb_cgroup.c
-f:mm/hugetlb_cma.c
-f:mm/hugetlb_cma.h
-f:mm/hugetlb_vmemmap.c
-f:mm/hugetlb_vmemmap.h
-f:mm/hwpoison-inject.c
-f:mm/init-mm.c
-f:mm/internal.h
-f:mm/interval_tree.c
-f:mm/io-mapping.c
-f:mm/ioremap.c
-f:mm/kasan/Makefile
-f:mm/kasan/common.c
-f:mm/kasan/generic.c
-f:mm/kasan/hw_tags.c
-f:mm/kasan/init.c
-f:mm/kasan/kasan.h
-f:mm/kasan/kasan_test_c.c
-f:mm/kasan/kasan_test_rust.rs
-f:mm/kasan/quarantine.c
-f:mm/kasan/report.c
-f:mm/kasan/report_generic.c
-f:mm/kasan/report_hw_tags.c
-f:mm/kasan/report_sw_tags.c
-f:mm/kasan/report_tags.c
-f:mm/kasan/shadow.c
-f:mm/kasan/sw_tags.c
-f:mm/kasan/tags.c
-f:mm/kfence/.kunitconfig
-f:mm/kfence/Makefile
-f:mm/kfence/core.c
-f:mm/kfence/kfence.h
-f:mm/kfence/kfence_test.c
-f:mm/kfence/report.c
-f:mm/khugepaged.c
-f:mm/kmemleak.c
-f:mm/kmsan/Makefile
-f:mm/kmsan/core.c
-f:mm/kmsan/hooks.c
-f:mm/kmsan/init.c
-f:mm/kmsan/instrumentation.c
-f:mm/kmsan/kmsan.h
-f:mm/kmsan/kmsan_test.c
-f:mm/kmsan/report.c
-f:mm/kmsan/shadow.c
-f:mm/ksm.c
-f:mm/list_lru.c
-f:mm/maccess.c
-f:mm/madvise.c
-f:mm/mapping_dirty_helpers.c
-f:mm/memblock.c
-f:mm/memcontrol-v1.c
-f:mm/memcontrol-v1.h
-f:mm/memcontrol.c
-f:mm/memfd.c
-f:mm/memory-failure.c
-f:mm/memory-tiers.c
-f:mm/memory.c
-f:mm/memory_hotplug.c
-f:mm/mempolicy.c
-f:mm/mempool.c
-f:mm/memremap.c
-f:mm/memtest.c
-f:mm/migrate.c
-f:mm/migrate_device.c
-f:mm/mincore.c
-f:mm/mlock.c
-f:mm/mm_init.c
-f:mm/mm_slot.h
-f:mm/mmap.c
-f:mm/mmap_lock.c
-f:mm/mmu_gather.c
-f:mm/mmu_notifier.c
-f:mm/mmzone.c
-f:mm/mprotect.c
-f:mm/mremap.c
-f:mm/mseal.c
-f:mm/msync.c
-f:mm/nommu.c
-f:mm/numa.c
-f:mm/numa_emulation.c
-f:mm/numa_memblks.c
-f:mm/oom_kill.c
-f:mm/page-writeback.c
-f:mm/page_alloc.c
-f:mm/page_counter.c
-f:mm/page_ext.c
-f:mm/page_frag_cache.c
-f:mm/page_idle.c
-f:mm/page_io.c
-f:mm/page_isolation.c
-f:mm/page_owner.c
-f:mm/page_poison.c
-f:mm/page_reporting.c
-f:mm/page_reporting.h
-f:mm/page_table_check.c
-f:mm/page_vma_mapped.c
-f:mm/pagewalk.c
-f:mm/percpu-internal.h
-f:mm/percpu-km.c
-f:mm/percpu-stats.c
-f:mm/percpu-vm.c
-f:mm/percpu.c
-f:mm/pgalloc-track.h
-f:mm/pgtable-generic.c
-f:mm/process_vm_access.c
-f:mm/pt_reclaim.c
-f:mm/ptdump.c
-f:mm/readahead.c
-f:mm/rmap.c
-f:mm/rodata_test.c
-f:mm/secretmem.c
-f:mm/shmem.c
-f:mm/shmem_quota.c
-f:mm/show_mem.c
-f:mm/shrinker.c
-f:mm/shrinker_debug.c
-f:mm/shuffle.c
-f:mm/shuffle.h
-f:mm/slab.h
-f:mm/slab_common.c
-f:mm/slub.c
-f:mm/sparse-vmemmap.c
-f:mm/sparse.c
-f:mm/swap.c
-f:mm/swap.h
-f:mm/swap_cgroup.c
-f:mm/swap_state.c
-f:mm/swapfile.c
-f:mm/truncate.c
-f:mm/usercopy.c
-f:mm/userfaultfd.c
-f:mm/util.c
-f:mm/vma.c
-f:mm/vma.h
-f:mm/vma_exec.c
-f:mm/vma_init.c
-f:mm/vma_internal.h
-f:mm/vmalloc.c
-f:mm/vmpressure.c
-f:mm/vmscan.c
-f:mm/vmstat.c
-f:mm/workingset.c
-f:mm/zpdesc.h
-f:mm/zpool.c
-f:mm/zsmalloc.c
-f:mm/zswap.c
-f:net/6lowpan/6lowpan_i.h
-f:net/6lowpan/Kconfig
-f:net/6lowpan/Makefile
-f:net/6lowpan/core.c
-f:net/6lowpan/debugfs.c
-f:net/6lowpan/iphc.c
-f:net/6lowpan/ndisc.c
-f:net/6lowpan/nhc.c
-f:net/6lowpan/nhc.h
-f:net/6lowpan/nhc_dest.c
-f:net/6lowpan/nhc_fragment.c
-f:net/6lowpan/nhc_ghc_ext_dest.c
-f:net/6lowpan/nhc_ghc_ext_frag.c
-f:net/6lowpan/nhc_ghc_ext_hop.c
-f:net/6lowpan/nhc_ghc_ext_route.c
-f:net/6lowpan/nhc_ghc_icmpv6.c
-f:net/6lowpan/nhc_ghc_udp.c
-f:net/6lowpan/nhc_hop.c
-f:net/6lowpan/nhc_ipv6.c
-f:net/6lowpan/nhc_mobility.c
-f:net/6lowpan/nhc_routing.c
-f:net/6lowpan/nhc_udp.c
-f:net/802/Kconfig
-f:net/802/Makefile
-f:net/802/fc.c
-f:net/802/fddi.c
-f:net/802/garp.c
-f:net/802/hippi.c
-f:net/802/mrp.c
-f:net/802/psnap.c
-f:net/802/stp.c
-f:net/8021q/Kconfig
-f:net/8021q/Makefile
-f:net/8021q/vlan.c
-f:net/8021q/vlan.h
-f:net/8021q/vlan_core.c
-f:net/8021q/vlan_dev.c
-f:net/8021q/vlan_gvrp.c
-f:net/8021q/vlan_mvrp.c
-f:net/8021q/vlan_netlink.c
-f:net/8021q/vlanproc.c
-f:net/8021q/vlanproc.h
-f:net/9p/Kconfig
-f:net/9p/Makefile
-f:net/9p/client.c
-f:net/9p/error.c
-f:net/9p/mod.c
-f:net/9p/protocol.c
-f:net/9p/protocol.h
-f:net/9p/trans_common.c
-f:net/9p/trans_common.h
-f:net/9p/trans_fd.c
-f:net/9p/trans_rdma.c
-f:net/9p/trans_usbg.c
-f:net/9p/trans_virtio.c
-f:net/9p/trans_xen.c
-f:net/Kconfig
-f:net/Kconfig.debug
-f:net/Makefile
-f:net/appletalk/Kconfig
-f:net/appletalk/Makefile
-f:net/appletalk/aarp.c
-f:net/appletalk/atalk_proc.c
-f:net/appletalk/ddp.c
-f:net/appletalk/sysctl_net_atalk.c
-f:net/atm/Kconfig
-f:net/atm/Makefile
-f:net/atm/addr.c
-f:net/atm/addr.h
-f:net/atm/atm_misc.c
-f:net/atm/atm_sysfs.c
-f:net/atm/br2684.c
-f:net/atm/clip.c
-f:net/atm/common.c
-f:net/atm/common.h
-f:net/atm/ioctl.c
-f:net/atm/lec.c
-f:net/atm/lec.h
-f:net/atm/lec_arpc.h
-f:net/atm/mpc.c
-f:net/atm/mpc.h
-f:net/atm/mpoa_caches.c
-f:net/atm/mpoa_caches.h
-f:net/atm/mpoa_proc.c
-f:net/atm/pppoatm.c
-f:net/atm/proc.c
-f:net/atm/protocols.h
-f:net/atm/pvc.c
-f:net/atm/raw.c
-f:net/atm/resources.c
-f:net/atm/resources.h
-f:net/atm/signaling.c
-f:net/atm/signaling.h
-f:net/atm/svc.c
-f:net/ax25/Kconfig
-f:net/ax25/Makefile
-f:net/ax25/af_ax25.c
-f:net/ax25/ax25_addr.c
-f:net/ax25/ax25_dev.c
-f:net/ax25/ax25_ds_in.c
-f:net/ax25/ax25_ds_subr.c
-f:net/ax25/ax25_ds_timer.c
-f:net/ax25/ax25_iface.c
-f:net/ax25/ax25_in.c
-f:net/ax25/ax25_ip.c
-f:net/ax25/ax25_out.c
-f:net/ax25/ax25_route.c
-f:net/ax25/ax25_std_in.c
-f:net/ax25/ax25_std_subr.c
-f:net/ax25/ax25_std_timer.c
-f:net/ax25/ax25_subr.c
-f:net/ax25/ax25_timer.c
-f:net/ax25/ax25_uid.c
-f:net/ax25/sysctl_net_ax25.c
-f:net/batman-adv/Kconfig
-f:net/batman-adv/Makefile
-f:net/batman-adv/bat_algo.c
-f:net/batman-adv/bat_algo.h
-f:net/batman-adv/bat_iv_ogm.c
-f:net/batman-adv/bat_iv_ogm.h
-f:net/batman-adv/bat_v.c
-f:net/batman-adv/bat_v.h
-f:net/batman-adv/bat_v_elp.c
-f:net/batman-adv/bat_v_elp.h
-f:net/batman-adv/bat_v_ogm.c
-f:net/batman-adv/bat_v_ogm.h
-f:net/batman-adv/bitarray.c
-f:net/batman-adv/bitarray.h
-f:net/batman-adv/bridge_loop_avoidance.c
-f:net/batman-adv/bridge_loop_avoidance.h
-f:net/batman-adv/distributed-arp-table.c
-f:net/batman-adv/distributed-arp-table.h
-f:net/batman-adv/fragmentation.c
-f:net/batman-adv/fragmentation.h
-f:net/batman-adv/gateway_client.c
-f:net/batman-adv/gateway_client.h
-f:net/batman-adv/gateway_common.c
-f:net/batman-adv/gateway_common.h
-f:net/batman-adv/hard-interface.c
-f:net/batman-adv/hard-interface.h
-f:net/batman-adv/hash.c
-f:net/batman-adv/hash.h
-f:net/batman-adv/log.c
-f:net/batman-adv/log.h
-f:net/batman-adv/main.c
-f:net/batman-adv/main.h
-f:net/batman-adv/mesh-interface.c
-f:net/batman-adv/mesh-interface.h
-f:net/batman-adv/multicast.c
-f:net/batman-adv/multicast.h
-f:net/batman-adv/multicast_forw.c
-f:net/batman-adv/netlink.c
-f:net/batman-adv/netlink.h
-f:net/batman-adv/network-coding.c
-f:net/batman-adv/network-coding.h
-f:net/batman-adv/originator.c
-f:net/batman-adv/originator.h
-f:net/batman-adv/routing.c
-f:net/batman-adv/routing.h
-f:net/batman-adv/send.c
-f:net/batman-adv/send.h
-f:net/batman-adv/tp_meter.c
-f:net/batman-adv/tp_meter.h
-f:net/batman-adv/trace.c
-f:net/batman-adv/trace.h
-f:net/batman-adv/translation-table.c
-f:net/batman-adv/translation-table.h
-f:net/batman-adv/tvlv.c
-f:net/batman-adv/tvlv.h
-f:net/batman-adv/types.h
-f:net/bluetooth/6lowpan.c
-f:net/bluetooth/Kconfig
-f:net/bluetooth/Makefile
-f:net/bluetooth/af_bluetooth.c
-f:net/bluetooth/aosp.c
-f:net/bluetooth/aosp.h
-f:net/bluetooth/bnep/Kconfig
-f:net/bluetooth/bnep/Makefile
-f:net/bluetooth/bnep/bnep.h
-f:net/bluetooth/bnep/core.c
-f:net/bluetooth/bnep/netdev.c
-f:net/bluetooth/bnep/sock.c
-f:net/bluetooth/cmtp/Kconfig
-f:net/bluetooth/cmtp/Makefile
-f:net/bluetooth/cmtp/capi.c
-f:net/bluetooth/cmtp/cmtp.h
-f:net/bluetooth/cmtp/core.c
-f:net/bluetooth/cmtp/sock.c
-f:net/bluetooth/coredump.c
-f:net/bluetooth/ecdh_helper.c
-f:net/bluetooth/ecdh_helper.h
-f:net/bluetooth/eir.c
-f:net/bluetooth/eir.h
-f:net/bluetooth/hci_codec.c
-f:net/bluetooth/hci_codec.h
-f:net/bluetooth/hci_conn.c
-f:net/bluetooth/hci_core.c
-f:net/bluetooth/hci_debugfs.c
-f:net/bluetooth/hci_debugfs.h
-f:net/bluetooth/hci_drv.c
-f:net/bluetooth/hci_event.c
-f:net/bluetooth/hci_sock.c
-f:net/bluetooth/hci_sync.c
-f:net/bluetooth/hci_sysfs.c
-f:net/bluetooth/hidp/Kconfig
-f:net/bluetooth/hidp/Makefile
-f:net/bluetooth/hidp/core.c
-f:net/bluetooth/hidp/hidp.h
-f:net/bluetooth/hidp/sock.c
-f:net/bluetooth/iso.c
-f:net/bluetooth/l2cap_core.c
-f:net/bluetooth/l2cap_sock.c
-f:net/bluetooth/leds.c
-f:net/bluetooth/leds.h
-f:net/bluetooth/lib.c
-f:net/bluetooth/mgmt.c
-f:net/bluetooth/mgmt_config.c
-f:net/bluetooth/mgmt_config.h
-f:net/bluetooth/mgmt_util.c
-f:net/bluetooth/mgmt_util.h
-f:net/bluetooth/msft.c
-f:net/bluetooth/msft.h
-f:net/bluetooth/rfcomm/Kconfig
-f:net/bluetooth/rfcomm/Makefile
-f:net/bluetooth/rfcomm/core.c
-f:net/bluetooth/rfcomm/sock.c
-f:net/bluetooth/rfcomm/tty.c
-f:net/bluetooth/sco.c
-f:net/bluetooth/selftest.c
-f:net/bluetooth/selftest.h
-f:net/bluetooth/smp.c
-f:net/bluetooth/smp.h
-f:net/bpf/Makefile
-f:net/bpf/bpf_dummy_struct_ops.c
-f:net/bpf/test_run.c
-f:net/bridge/Kconfig
-f:net/bridge/Makefile
-f:net/bridge/br.c
-f:net/bridge/br_arp_nd_proxy.c
-f:net/bridge/br_cfm.c
-f:net/bridge/br_cfm_netlink.c
-f:net/bridge/br_device.c
-f:net/bridge/br_fdb.c
-f:net/bridge/br_forward.c
-f:net/bridge/br_if.c
-f:net/bridge/br_input.c
-f:net/bridge/br_ioctl.c
-f:net/bridge/br_mdb.c
-f:net/bridge/br_mrp.c
-f:net/bridge/br_mrp_netlink.c
-f:net/bridge/br_mrp_switchdev.c
-f:net/bridge/br_mst.c
-f:net/bridge/br_multicast.c
-f:net/bridge/br_multicast_eht.c
-f:net/bridge/br_netfilter_hooks.c
-f:net/bridge/br_netfilter_ipv6.c
-f:net/bridge/br_netlink.c
-f:net/bridge/br_netlink_tunnel.c
-f:net/bridge/br_nf_core.c
-f:net/bridge/br_private.h
-f:net/bridge/br_private_cfm.h
-f:net/bridge/br_private_mcast_eht.h
-f:net/bridge/br_private_mrp.h
-f:net/bridge/br_private_stp.h
-f:net/bridge/br_private_tunnel.h
-f:net/bridge/br_stp.c
-f:net/bridge/br_stp_bpdu.c
-f:net/bridge/br_stp_if.c
-f:net/bridge/br_stp_timer.c
-f:net/bridge/br_switchdev.c
-f:net/bridge/br_sysfs_br.c
-f:net/bridge/br_sysfs_if.c
-f:net/bridge/br_vlan.c
-f:net/bridge/br_vlan_options.c
-f:net/bridge/br_vlan_tunnel.c
-f:net/bridge/netfilter/Kconfig
-f:net/bridge/netfilter/Makefile
-f:net/bridge/netfilter/ebt_802_3.c
-f:net/bridge/netfilter/ebt_among.c
-f:net/bridge/netfilter/ebt_arp.c
-f:net/bridge/netfilter/ebt_arpreply.c
-f:net/bridge/netfilter/ebt_dnat.c
-f:net/bridge/netfilter/ebt_ip.c
-f:net/bridge/netfilter/ebt_ip6.c
-f:net/bridge/netfilter/ebt_limit.c
-f:net/bridge/netfilter/ebt_log.c
-f:net/bridge/netfilter/ebt_mark.c
-f:net/bridge/netfilter/ebt_mark_m.c
-f:net/bridge/netfilter/ebt_nflog.c
-f:net/bridge/netfilter/ebt_pkttype.c
-f:net/bridge/netfilter/ebt_redirect.c
-f:net/bridge/netfilter/ebt_snat.c
-f:net/bridge/netfilter/ebt_stp.c
-f:net/bridge/netfilter/ebt_vlan.c
-f:net/bridge/netfilter/ebtable_broute.c
-f:net/bridge/netfilter/ebtable_filter.c
-f:net/bridge/netfilter/ebtable_nat.c
-f:net/bridge/netfilter/ebtables.c
-f:net/bridge/netfilter/nf_conntrack_bridge.c
-f:net/bridge/netfilter/nft_meta_bridge.c
-f:net/bridge/netfilter/nft_reject_bridge.c
-f:net/caif/Kconfig
-f:net/caif/Makefile
-f:net/caif/caif_dev.c
-f:net/caif/caif_socket.c
-f:net/caif/caif_usb.c
-f:net/caif/cfcnfg.c
-f:net/caif/cfctrl.c
-f:net/caif/cfdbgl.c
-f:net/caif/cfdgml.c
-f:net/caif/cffrml.c
-f:net/caif/cfmuxl.c
-f:net/caif/cfpkt_skbuff.c
-f:net/caif/cfrfml.c
-f:net/caif/cfserl.c
-f:net/caif/cfsrvl.c
-f:net/caif/cfutill.c
-f:net/caif/cfveil.c
-f:net/caif/cfvidl.c
-f:net/caif/chnl_net.c
-f:net/can/Kconfig
-f:net/can/Makefile
-f:net/can/af_can.c
-f:net/can/af_can.h
-f:net/can/bcm.c
-f:net/can/gw.c
-f:net/can/isotp.c
-f:net/can/j1939/Kconfig
-f:net/can/j1939/Makefile
-f:net/can/j1939/address-claim.c
-f:net/can/j1939/bus.c
-f:net/can/j1939/j1939-priv.h
-f:net/can/j1939/main.c
-f:net/can/j1939/socket.c
-f:net/can/j1939/transport.c
-f:net/can/proc.c
-f:net/can/raw.c
-f:net/ceph/Kconfig
-f:net/ceph/Makefile
-f:net/ceph/armor.c
-f:net/ceph/auth.c
-f:net/ceph/auth_none.c
-f:net/ceph/auth_none.h
-f:net/ceph/auth_x.c
-f:net/ceph/auth_x.h
-f:net/ceph/auth_x_protocol.h
-f:net/ceph/buffer.c
-f:net/ceph/ceph_common.c
-f:net/ceph/ceph_hash.c
-f:net/ceph/ceph_strings.c
-f:net/ceph/cls_lock_client.c
-f:net/ceph/crush/crush.c
-f:net/ceph/crush/crush_ln_table.h
-f:net/ceph/crush/hash.c
-f:net/ceph/crush/mapper.c
-f:net/ceph/crypto.c
-f:net/ceph/crypto.h
-f:net/ceph/debugfs.c
-f:net/ceph/decode.c
-f:net/ceph/messenger.c
-f:net/ceph/messenger_v1.c
-f:net/ceph/messenger_v2.c
-f:net/ceph/mon_client.c
-f:net/ceph/msgpool.c
-f:net/ceph/osd_client.c
-f:net/ceph/osdmap.c
-f:net/ceph/pagelist.c
-f:net/ceph/pagevec.c
-f:net/ceph/snapshot.c
-f:net/ceph/string_table.c
-f:net/ceph/striper.c
-f:net/compat.c
-f:net/core/Makefile
-f:net/core/bpf_sk_storage.c
-f:net/core/datagram.c
-f:net/core/dev.c
-f:net/core/dev.h
-f:net/core/dev_addr_lists.c
-f:net/core/dev_addr_lists_test.c
-f:net/core/dev_api.c
-f:net/core/dev_ioctl.c
-f:net/core/devmem.c
-f:net/core/devmem.h
-f:net/core/drop_monitor.c
-f:net/core/dst.c
-f:net/core/dst_cache.c
-f:net/core/failover.c
-f:net/core/fib_notifier.c
-f:net/core/fib_rules.c
-f:net/core/filter.c
-f:net/core/flow_dissector.c
-f:net/core/flow_offload.c
-f:net/core/gen_estimator.c
-f:net/core/gen_stats.c
-f:net/core/gro.c
-f:net/core/gro_cells.c
-f:net/core/gso.c
-f:net/core/hotdata.c
-f:net/core/hwbm.c
-f:net/core/ieee8021q_helpers.c
-f:net/core/link_watch.c
-f:net/core/lock_debug.c
-f:net/core/lwt_bpf.c
-f:net/core/lwtunnel.c
-f:net/core/mp_dmabuf_devmem.h
-f:net/core/neighbour.c
-f:net/core/net-procfs.c
-f:net/core/net-sysfs.c
-f:net/core/net-sysfs.h
-f:net/core/net-traces.c
-f:net/core/net_namespace.c
-f:net/core/net_test.c
-f:net/core/netclassid_cgroup.c
-f:net/core/netdev-genl-gen.c
-f:net/core/netdev-genl-gen.h
-f:net/core/netdev-genl.c
-f:net/core/netdev_rx_queue.c
-f:net/core/netevent.c
-f:net/core/netmem_priv.h
-f:net/core/netpoll.c
-f:net/core/netprio_cgroup.c
-f:net/core/of_net.c
-f:net/core/page_pool.c
-f:net/core/page_pool_priv.h
-f:net/core/page_pool_user.c
-f:net/core/pktgen.c
-f:net/core/ptp_classifier.c
-f:net/core/request_sock.c
-f:net/core/rtnetlink.c
-f:net/core/scm.c
-f:net/core/secure_seq.c
-f:net/core/selftests.c
-f:net/core/skb_fault_injection.c
-f:net/core/skbuff.c
-f:net/core/skmsg.c
-f:net/core/sock.c
-f:net/core/sock_destructor.h
-f:net/core/sock_diag.c
-f:net/core/sock_map.c
-f:net/core/sock_reuseport.c
-f:net/core/stream.c
-f:net/core/sysctl_net_core.c
-f:net/core/timestamping.c
-f:net/core/tso.c
-f:net/core/utils.c
-f:net/core/xdp.c
-f:net/dcb/Kconfig
-f:net/dcb/Makefile
-f:net/dcb/dcbevent.c
-f:net/dcb/dcbnl.c
-f:net/devlink/Makefile
-f:net/devlink/core.c
-f:net/devlink/dev.c
-f:net/devlink/devl_internal.h
-f:net/devlink/dpipe.c
-f:net/devlink/health.c
-f:net/devlink/linecard.c
-f:net/devlink/netlink.c
-f:net/devlink/netlink_gen.c
-f:net/devlink/netlink_gen.h
-f:net/devlink/param.c
-f:net/devlink/port.c
-f:net/devlink/rate.c
-f:net/devlink/region.c
-f:net/devlink/resource.c
-f:net/devlink/sb.c
-f:net/devlink/trap.c
-f:net/devres.c
-f:net/dns_resolver/Kconfig
-f:net/dns_resolver/Makefile
-f:net/dns_resolver/dns_key.c
-f:net/dns_resolver/dns_query.c
-f:net/dns_resolver/internal.h
-f:net/dsa/Kconfig
-f:net/dsa/Makefile
-f:net/dsa/conduit.c
-f:net/dsa/conduit.h
-f:net/dsa/devlink.c
-f:net/dsa/devlink.h
-f:net/dsa/dsa.c
-f:net/dsa/dsa.h
-f:net/dsa/netlink.c
-f:net/dsa/netlink.h
-f:net/dsa/port.c
-f:net/dsa/port.h
-f:net/dsa/stubs.c
-f:net/dsa/switch.c
-f:net/dsa/switch.h
-f:net/dsa/tag.c
-f:net/dsa/tag.h
-f:net/dsa/tag_8021q.c
-f:net/dsa/tag_8021q.h
-f:net/dsa/tag_ar9331.c
-f:net/dsa/tag_brcm.c
-f:net/dsa/tag_dsa.c
-f:net/dsa/tag_gswip.c
-f:net/dsa/tag_hellcreek.c
-f:net/dsa/tag_ksz.c
-f:net/dsa/tag_lan9303.c
-f:net/dsa/tag_mtk.c
-f:net/dsa/tag_none.c
-f:net/dsa/tag_ocelot.c
-f:net/dsa/tag_ocelot_8021q.c
-f:net/dsa/tag_qca.c
-f:net/dsa/tag_rtl4_a.c
-f:net/dsa/tag_rtl8_4.c
-f:net/dsa/tag_rzn1_a5psw.c
-f:net/dsa/tag_sja1105.c
-f:net/dsa/tag_trailer.c
-f:net/dsa/tag_vsc73xx_8021q.c
-f:net/dsa/tag_xrs700x.c
-f:net/dsa/trace.c
-f:net/dsa/trace.h
-f:net/dsa/user.c
-f:net/dsa/user.h
-f:net/ethernet/Makefile
-f:net/ethernet/eth.c
-f:net/ethtool/Makefile
-f:net/ethtool/bitset.c
-f:net/ethtool/bitset.h
-f:net/ethtool/cabletest.c
-f:net/ethtool/channels.c
-f:net/ethtool/cmis.h
-f:net/ethtool/cmis_cdb.c
-f:net/ethtool/cmis_fw_update.c
-f:net/ethtool/coalesce.c
-f:net/ethtool/common.c
-f:net/ethtool/common.h
-f:net/ethtool/debug.c
-f:net/ethtool/eee.c
-f:net/ethtool/eeprom.c
-f:net/ethtool/features.c
-f:net/ethtool/fec.c
-f:net/ethtool/ioctl.c
-f:net/ethtool/linkinfo.c
-f:net/ethtool/linkmodes.c
-f:net/ethtool/linkstate.c
-f:net/ethtool/mm.c
-f:net/ethtool/module.c
-f:net/ethtool/module_fw.h
-f:net/ethtool/netlink.c
-f:net/ethtool/netlink.h
-f:net/ethtool/pause.c
-f:net/ethtool/phc_vclocks.c
-f:net/ethtool/phy.c
-f:net/ethtool/plca.c
-f:net/ethtool/privflags.c
-f:net/ethtool/pse-pd.c
-f:net/ethtool/rings.c
-f:net/ethtool/rss.c
-f:net/ethtool/stats.c
-f:net/ethtool/strset.c
-f:net/ethtool/ts.h
-f:net/ethtool/tsconfig.c
-f:net/ethtool/tsinfo.c
-f:net/ethtool/tunnels.c
-f:net/ethtool/wol.c
-f:net/handshake/.kunitconfig
-f:net/handshake/Makefile
-f:net/handshake/alert.c
-f:net/handshake/genl.c
-f:net/handshake/genl.h
-f:net/handshake/handshake-test.c
-f:net/handshake/handshake.h
-f:net/handshake/netlink.c
-f:net/handshake/request.c
-f:net/handshake/tlshd.c
-f:net/handshake/trace.c
-f:net/hsr/Kconfig
-f:net/hsr/Makefile
-f:net/hsr/hsr_debugfs.c
-f:net/hsr/hsr_device.c
-f:net/hsr/hsr_device.h
-f:net/hsr/hsr_forward.c
-f:net/hsr/hsr_forward.h
-f:net/hsr/hsr_framereg.c
-f:net/hsr/hsr_framereg.h
-f:net/hsr/hsr_main.c
-f:net/hsr/hsr_main.h
-f:net/hsr/hsr_netlink.c
-f:net/hsr/hsr_netlink.h
-f:net/hsr/hsr_slave.c
-f:net/hsr/hsr_slave.h
-f:net/hsr/prp_dup_discard_test.c
-f:net/ieee802154/6lowpan/6lowpan_i.h
-f:net/ieee802154/6lowpan/Kconfig
-f:net/ieee802154/6lowpan/Makefile
-f:net/ieee802154/6lowpan/core.c
-f:net/ieee802154/6lowpan/reassembly.c
-f:net/ieee802154/6lowpan/rx.c
-f:net/ieee802154/6lowpan/tx.c
-f:net/ieee802154/Kconfig
-f:net/ieee802154/Makefile
-f:net/ieee802154/core.c
-f:net/ieee802154/core.h
-f:net/ieee802154/header_ops.c
-f:net/ieee802154/ieee802154.h
-f:net/ieee802154/netlink.c
-f:net/ieee802154/nl-mac.c
-f:net/ieee802154/nl-phy.c
-f:net/ieee802154/nl802154.c
-f:net/ieee802154/nl802154.h
-f:net/ieee802154/nl_policy.c
-f:net/ieee802154/pan.c
-f:net/ieee802154/rdev-ops.h
-f:net/ieee802154/socket.c
-f:net/ieee802154/sysfs.c
-f:net/ieee802154/sysfs.h
-f:net/ieee802154/trace.c
-f:net/ieee802154/trace.h
-f:net/ife/Kconfig
-f:net/ife/Makefile
-f:net/ife/ife.c
-f:net/ipv4/Kconfig
-f:net/ipv4/Makefile
-f:net/ipv4/af_inet.c
-f:net/ipv4/ah4.c
-f:net/ipv4/arp.c
-f:net/ipv4/bpf_tcp_ca.c
-f:net/ipv4/cipso_ipv4.c
-f:net/ipv4/datagram.c
-f:net/ipv4/devinet.c
-f:net/ipv4/esp4.c
-f:net/ipv4/esp4_offload.c
-f:net/ipv4/fib_frontend.c
-f:net/ipv4/fib_lookup.h
-f:net/ipv4/fib_notifier.c
-f:net/ipv4/fib_rules.c
-f:net/ipv4/fib_semantics.c
-f:net/ipv4/fib_trie.c
-f:net/ipv4/fou_bpf.c
-f:net/ipv4/fou_core.c
-f:net/ipv4/fou_nl.c
-f:net/ipv4/fou_nl.h
-f:net/ipv4/gre_demux.c
-f:net/ipv4/gre_offload.c
-f:net/ipv4/icmp.c
-f:net/ipv4/igmp.c
-f:net/ipv4/igmp_internal.h
-f:net/ipv4/inet_connection_sock.c
-f:net/ipv4/inet_diag.c
-f:net/ipv4/inet_fragment.c
-f:net/ipv4/inet_hashtables.c
-f:net/ipv4/inet_timewait_sock.c
-f:net/ipv4/inetpeer.c
-f:net/ipv4/ip_forward.c
-f:net/ipv4/ip_fragment.c
-f:net/ipv4/ip_gre.c
-f:net/ipv4/ip_input.c
-f:net/ipv4/ip_options.c
-f:net/ipv4/ip_output.c
-f:net/ipv4/ip_sockglue.c
-f:net/ipv4/ip_tunnel.c
-f:net/ipv4/ip_tunnel_core.c
-f:net/ipv4/ip_vti.c
-f:net/ipv4/ipcomp.c
-f:net/ipv4/ipconfig.c
-f:net/ipv4/ipip.c
-f:net/ipv4/ipmr.c
-f:net/ipv4/ipmr_base.c
-f:net/ipv4/metrics.c
-f:net/ipv4/netfilter.c
-f:net/ipv4/netfilter/Kconfig
-f:net/ipv4/netfilter/Makefile
-f:net/ipv4/netfilter/arp_tables.c
-f:net/ipv4/netfilter/arpt_mangle.c
-f:net/ipv4/netfilter/arptable_filter.c
-f:net/ipv4/netfilter/ip_tables.c
-f:net/ipv4/netfilter/ipt_ECN.c
-f:net/ipv4/netfilter/ipt_REJECT.c
-f:net/ipv4/netfilter/ipt_SYNPROXY.c
-f:net/ipv4/netfilter/ipt_ah.c
-f:net/ipv4/netfilter/ipt_rpfilter.c
-f:net/ipv4/netfilter/iptable_filter.c
-f:net/ipv4/netfilter/iptable_mangle.c
-f:net/ipv4/netfilter/iptable_nat.c
-f:net/ipv4/netfilter/iptable_raw.c
-f:net/ipv4/netfilter/iptable_security.c
-f:net/ipv4/netfilter/nf_defrag_ipv4.c
-f:net/ipv4/netfilter/nf_dup_ipv4.c
-f:net/ipv4/netfilter/nf_nat_h323.c
-f:net/ipv4/netfilter/nf_nat_pptp.c
-f:net/ipv4/netfilter/nf_nat_snmp_basic.asn1
-f:net/ipv4/netfilter/nf_nat_snmp_basic_main.c
-f:net/ipv4/netfilter/nf_reject_ipv4.c
-f:net/ipv4/netfilter/nf_socket_ipv4.c
-f:net/ipv4/netfilter/nf_tproxy_ipv4.c
-f:net/ipv4/netfilter/nft_dup_ipv4.c
-f:net/ipv4/netfilter/nft_fib_ipv4.c
-f:net/ipv4/netfilter/nft_reject_ipv4.c
-f:net/ipv4/netlink.c
-f:net/ipv4/nexthop.c
-f:net/ipv4/ping.c
-f:net/ipv4/proc.c
-f:net/ipv4/protocol.c
-f:net/ipv4/raw.c
-f:net/ipv4/raw_diag.c
-f:net/ipv4/route.c
-f:net/ipv4/syncookies.c
-f:net/ipv4/sysctl_net_ipv4.c
-f:net/ipv4/tcp.c
-f:net/ipv4/tcp_ao.c
-f:net/ipv4/tcp_bbr.c
-f:net/ipv4/tcp_bic.c
-f:net/ipv4/tcp_bpf.c
-f:net/ipv4/tcp_cdg.c
-f:net/ipv4/tcp_cong.c
-f:net/ipv4/tcp_cubic.c
-f:net/ipv4/tcp_dctcp.c
-f:net/ipv4/tcp_dctcp.h
-f:net/ipv4/tcp_diag.c
-f:net/ipv4/tcp_fastopen.c
-f:net/ipv4/tcp_highspeed.c
-f:net/ipv4/tcp_htcp.c
-f:net/ipv4/tcp_hybla.c
-f:net/ipv4/tcp_illinois.c
-f:net/ipv4/tcp_input.c
-f:net/ipv4/tcp_ipv4.c
-f:net/ipv4/tcp_lp.c
-f:net/ipv4/tcp_metrics.c
-f:net/ipv4/tcp_minisocks.c
-f:net/ipv4/tcp_nv.c
-f:net/ipv4/tcp_offload.c
-f:net/ipv4/tcp_output.c
-f:net/ipv4/tcp_plb.c
-f:net/ipv4/tcp_rate.c
-f:net/ipv4/tcp_recovery.c
-f:net/ipv4/tcp_scalable.c
-f:net/ipv4/tcp_sigpool.c
-f:net/ipv4/tcp_timer.c
-f:net/ipv4/tcp_ulp.c
-f:net/ipv4/tcp_vegas.c
-f:net/ipv4/tcp_vegas.h
-f:net/ipv4/tcp_veno.c
-f:net/ipv4/tcp_westwood.c
-f:net/ipv4/tcp_yeah.c
-f:net/ipv4/tunnel4.c
-f:net/ipv4/udp.c
-f:net/ipv4/udp_bpf.c
-f:net/ipv4/udp_diag.c
-f:net/ipv4/udp_impl.h
-f:net/ipv4/udp_offload.c
-f:net/ipv4/udp_tunnel_core.c
-f:net/ipv4/udp_tunnel_nic.c
-f:net/ipv4/udp_tunnel_stub.c
-f:net/ipv4/udplite.c
-f:net/ipv4/xfrm4_input.c
-f:net/ipv4/xfrm4_output.c
-f:net/ipv4/xfrm4_policy.c
-f:net/ipv4/xfrm4_protocol.c
-f:net/ipv4/xfrm4_state.c
-f:net/ipv4/xfrm4_tunnel.c
-f:net/ipv6/Kconfig
-f:net/ipv6/Makefile
-f:net/ipv6/addrconf.c
-f:net/ipv6/addrconf_core.c
-f:net/ipv6/addrlabel.c
-f:net/ipv6/af_inet6.c
-f:net/ipv6/ah6.c
-f:net/ipv6/anycast.c
-f:net/ipv6/calipso.c
-f:net/ipv6/datagram.c
-f:net/ipv6/esp6.c
-f:net/ipv6/esp6_offload.c
-f:net/ipv6/exthdrs.c
-f:net/ipv6/exthdrs_core.c
-f:net/ipv6/exthdrs_offload.c
-f:net/ipv6/fib6_notifier.c
-f:net/ipv6/fib6_rules.c
-f:net/ipv6/fou6.c
-f:net/ipv6/icmp.c
-f:net/ipv6/ila/Makefile
-f:net/ipv6/ila/ila.h
-f:net/ipv6/ila/ila_common.c
-f:net/ipv6/ila/ila_lwt.c
-f:net/ipv6/ila/ila_main.c
-f:net/ipv6/ila/ila_xlat.c
-f:net/ipv6/inet6_connection_sock.c
-f:net/ipv6/inet6_hashtables.c
-f:net/ipv6/ioam6.c
-f:net/ipv6/ioam6_iptunnel.c
-f:net/ipv6/ip6_checksum.c
-f:net/ipv6/ip6_fib.c
-f:net/ipv6/ip6_flowlabel.c
-f:net/ipv6/ip6_gre.c
-f:net/ipv6/ip6_icmp.c
-f:net/ipv6/ip6_input.c
-f:net/ipv6/ip6_offload.c
-f:net/ipv6/ip6_offload.h
-f:net/ipv6/ip6_output.c
-f:net/ipv6/ip6_tunnel.c
-f:net/ipv6/ip6_udp_tunnel.c
-f:net/ipv6/ip6_vti.c
-f:net/ipv6/ip6mr.c
-f:net/ipv6/ipcomp6.c
-f:net/ipv6/ipv6_sockglue.c
-f:net/ipv6/mcast.c
-f:net/ipv6/mcast_snoop.c
-f:net/ipv6/mip6.c
-f:net/ipv6/ndisc.c
-f:net/ipv6/netfilter.c
-f:net/ipv6/netfilter/Kconfig
-f:net/ipv6/netfilter/Makefile
-f:net/ipv6/netfilter/ip6_tables.c
-f:net/ipv6/netfilter/ip6t_NPT.c
-f:net/ipv6/netfilter/ip6t_REJECT.c
-f:net/ipv6/netfilter/ip6t_SYNPROXY.c
-f:net/ipv6/netfilter/ip6t_ah.c
-f:net/ipv6/netfilter/ip6t_eui64.c
-f:net/ipv6/netfilter/ip6t_frag.c
-f:net/ipv6/netfilter/ip6t_hbh.c
-f:net/ipv6/netfilter/ip6t_ipv6header.c
-f:net/ipv6/netfilter/ip6t_mh.c
-f:net/ipv6/netfilter/ip6t_rpfilter.c
-f:net/ipv6/netfilter/ip6t_rt.c
-f:net/ipv6/netfilter/ip6t_srh.c
-f:net/ipv6/netfilter/ip6table_filter.c
-f:net/ipv6/netfilter/ip6table_mangle.c
-f:net/ipv6/netfilter/ip6table_nat.c
-f:net/ipv6/netfilter/ip6table_raw.c
-f:net/ipv6/netfilter/ip6table_security.c
-f:net/ipv6/netfilter/nf_conntrack_reasm.c
-f:net/ipv6/netfilter/nf_defrag_ipv6_hooks.c
-f:net/ipv6/netfilter/nf_dup_ipv6.c
-f:net/ipv6/netfilter/nf_reject_ipv6.c
-f:net/ipv6/netfilter/nf_socket_ipv6.c
-f:net/ipv6/netfilter/nf_tproxy_ipv6.c
-f:net/ipv6/netfilter/nft_dup_ipv6.c
-f:net/ipv6/netfilter/nft_fib_ipv6.c
-f:net/ipv6/netfilter/nft_reject_ipv6.c
-f:net/ipv6/output_core.c
-f:net/ipv6/ping.c
-f:net/ipv6/proc.c
-f:net/ipv6/protocol.c
-f:net/ipv6/raw.c
-f:net/ipv6/reassembly.c
-f:net/ipv6/route.c
-f:net/ipv6/rpl.c
-f:net/ipv6/rpl_iptunnel.c
-f:net/ipv6/seg6.c
-f:net/ipv6/seg6_hmac.c
-f:net/ipv6/seg6_iptunnel.c
-f:net/ipv6/seg6_local.c
-f:net/ipv6/sit.c
-f:net/ipv6/syncookies.c
-f:net/ipv6/sysctl_net_ipv6.c
-f:net/ipv6/tcp_ao.c
-f:net/ipv6/tcp_ipv6.c
-f:net/ipv6/tcpv6_offload.c
-f:net/ipv6/tunnel6.c
-f:net/ipv6/udp.c
-f:net/ipv6/udp_impl.h
-f:net/ipv6/udp_offload.c
-f:net/ipv6/udplite.c
-f:net/ipv6/xfrm6_input.c
-f:net/ipv6/xfrm6_output.c
-f:net/ipv6/xfrm6_policy.c
-f:net/ipv6/xfrm6_protocol.c
-f:net/ipv6/xfrm6_state.c
-f:net/ipv6/xfrm6_tunnel.c
-f:net/iucv/Kconfig
-f:net/iucv/Makefile
-f:net/iucv/af_iucv.c
-f:net/iucv/iucv.c
-f:net/kcm/Kconfig
-f:net/kcm/Makefile
-f:net/kcm/kcmproc.c
-f:net/kcm/kcmsock.c
-f:net/key/Makefile
-f:net/key/af_key.c
-f:net/l2tp/Kconfig
-f:net/l2tp/Makefile
-f:net/l2tp/l2tp_core.c
-f:net/l2tp/l2tp_core.h
-f:net/l2tp/l2tp_debugfs.c
-f:net/l2tp/l2tp_eth.c
-f:net/l2tp/l2tp_ip.c
-f:net/l2tp/l2tp_ip6.c
-f:net/l2tp/l2tp_netlink.c
-f:net/l2tp/l2tp_ppp.c
-f:net/l2tp/trace.h
-f:net/l3mdev/Kconfig
-f:net/l3mdev/Makefile
-f:net/l3mdev/l3mdev.c
-f:net/lapb/Kconfig
-f:net/lapb/Makefile
-f:net/lapb/lapb_iface.c
-f:net/lapb/lapb_in.c
-f:net/lapb/lapb_out.c
-f:net/lapb/lapb_subr.c
-f:net/lapb/lapb_timer.c
-f:net/llc/Kconfig
-f:net/llc/Makefile
-f:net/llc/af_llc.c
-f:net/llc/llc_c_ac.c
-f:net/llc/llc_c_ev.c
-f:net/llc/llc_c_st.c
-f:net/llc/llc_conn.c
-f:net/llc/llc_core.c
-f:net/llc/llc_if.c
-f:net/llc/llc_input.c
-f:net/llc/llc_output.c
-f:net/llc/llc_pdu.c
-f:net/llc/llc_proc.c
-f:net/llc/llc_s_ac.c
-f:net/llc/llc_s_ev.c
-f:net/llc/llc_s_st.c
-f:net/llc/llc_sap.c
-f:net/llc/llc_station.c
-f:net/llc/sysctl_net_llc.c
-f:net/mac80211/Kconfig
-f:net/mac80211/Makefile
-f:net/mac80211/aead_api.c
-f:net/mac80211/aead_api.h
-f:net/mac80211/aes_ccm.h
-f:net/mac80211/aes_cmac.c
-f:net/mac80211/aes_cmac.h
-f:net/mac80211/aes_gcm.h
-f:net/mac80211/aes_gmac.c
-f:net/mac80211/aes_gmac.h
-f:net/mac80211/agg-rx.c
-f:net/mac80211/agg-tx.c
-f:net/mac80211/airtime.c
-f:net/mac80211/cfg.c
-f:net/mac80211/chan.c
-f:net/mac80211/debug.h
-f:net/mac80211/debugfs.c
-f:net/mac80211/debugfs.h
-f:net/mac80211/debugfs_key.c
-f:net/mac80211/debugfs_key.h
-f:net/mac80211/debugfs_netdev.c
-f:net/mac80211/debugfs_netdev.h
-f:net/mac80211/debugfs_sta.c
-f:net/mac80211/debugfs_sta.h
-f:net/mac80211/driver-ops.c
-f:net/mac80211/driver-ops.h
-f:net/mac80211/drop.h
-f:net/mac80211/eht.c
-f:net/mac80211/ethtool.c
-f:net/mac80211/fils_aead.c
-f:net/mac80211/fils_aead.h
-f:net/mac80211/he.c
-f:net/mac80211/ht.c
-f:net/mac80211/ibss.c
-f:net/mac80211/ieee80211_i.h
-f:net/mac80211/iface.c
-f:net/mac80211/key.c
-f:net/mac80211/key.h
-f:net/mac80211/led.c
-f:net/mac80211/led.h
-f:net/mac80211/link.c
-f:net/mac80211/main.c
-f:net/mac80211/mesh.c
-f:net/mac80211/mesh.h
-f:net/mac80211/mesh_hwmp.c
-f:net/mac80211/mesh_pathtbl.c
-f:net/mac80211/mesh_plink.c
-f:net/mac80211/mesh_ps.c
-f:net/mac80211/mesh_sync.c
-f:net/mac80211/michael.c
-f:net/mac80211/michael.h
-f:net/mac80211/mlme.c
-f:net/mac80211/ocb.c
-f:net/mac80211/offchannel.c
-f:net/mac80211/parse.c
-f:net/mac80211/pm.c
-f:net/mac80211/rate.c
-f:net/mac80211/rate.h
-f:net/mac80211/rc80211_minstrel_ht.c
-f:net/mac80211/rc80211_minstrel_ht.h
-f:net/mac80211/rc80211_minstrel_ht_debugfs.c
-f:net/mac80211/rx.c
-f:net/mac80211/s1g.c
-f:net/mac80211/scan.c
-f:net/mac80211/spectmgmt.c
-f:net/mac80211/sta_info.c
-f:net/mac80211/sta_info.h
-f:net/mac80211/status.c
-f:net/mac80211/tdls.c
-f:net/mac80211/tests/Makefile
-f:net/mac80211/tests/chan-mode.c
-f:net/mac80211/tests/elems.c
-f:net/mac80211/tests/mfp.c
-f:net/mac80211/tests/module.c
-f:net/mac80211/tests/tpe.c
-f:net/mac80211/tests/util.c
-f:net/mac80211/tests/util.h
-f:net/mac80211/tkip.c
-f:net/mac80211/tkip.h
-f:net/mac80211/trace.c
-f:net/mac80211/trace.h
-f:net/mac80211/trace_msg.h
-f:net/mac80211/tx.c
-f:net/mac80211/util.c
-f:net/mac80211/vht.c
-f:net/mac80211/wbrf.c
-f:net/mac80211/wep.c
-f:net/mac80211/wep.h
-f:net/mac80211/wme.c
-f:net/mac80211/wme.h
-f:net/mac80211/wpa.c
-f:net/mac80211/wpa.h
-f:net/mac802154/Kconfig
-f:net/mac802154/Makefile
-f:net/mac802154/cfg.c
-f:net/mac802154/cfg.h
-f:net/mac802154/driver-ops.h
-f:net/mac802154/ieee802154_i.h
-f:net/mac802154/iface.c
-f:net/mac802154/llsec.c
-f:net/mac802154/llsec.h
-f:net/mac802154/mac_cmd.c
-f:net/mac802154/main.c
-f:net/mac802154/mib.c
-f:net/mac802154/rx.c
-f:net/mac802154/scan.c
-f:net/mac802154/trace.c
-f:net/mac802154/trace.h
-f:net/mac802154/tx.c
-f:net/mac802154/util.c
-f:net/mctp/Kconfig
-f:net/mctp/Makefile
-f:net/mctp/af_mctp.c
-f:net/mctp/device.c
-f:net/mctp/neigh.c
-f:net/mctp/route.c
-f:net/mctp/test/route-test.c
-f:net/mctp/test/sock-test.c
-f:net/mctp/test/utils.c
-f:net/mctp/test/utils.h
-f:net/mpls/Kconfig
-f:net/mpls/Makefile
-f:net/mpls/af_mpls.c
-f:net/mpls/internal.h
-f:net/mpls/mpls_gso.c
-f:net/mpls/mpls_iptunnel.c
-f:net/mptcp/Kconfig
-f:net/mptcp/Makefile
-f:net/mptcp/bpf.c
-f:net/mptcp/crypto.c
-f:net/mptcp/crypto_test.c
-f:net/mptcp/ctrl.c
-f:net/mptcp/diag.c
-f:net/mptcp/fastopen.c
-f:net/mptcp/mib.c
-f:net/mptcp/mib.h
-f:net/mptcp/mptcp_diag.c
-f:net/mptcp/mptcp_pm_gen.c
-f:net/mptcp/mptcp_pm_gen.h
-f:net/mptcp/options.c
-f:net/mptcp/pm.c
-f:net/mptcp/pm_kernel.c
-f:net/mptcp/pm_netlink.c
-f:net/mptcp/pm_userspace.c
-f:net/mptcp/protocol.c
-f:net/mptcp/protocol.h
-f:net/mptcp/sched.c
-f:net/mptcp/sockopt.c
-f:net/mptcp/subflow.c
-f:net/mptcp/syncookies.c
-f:net/mptcp/token.c
-f:net/mptcp/token_test.c
-f:net/ncsi/Kconfig
-f:net/ncsi/Makefile
-f:net/ncsi/internal.h
-f:net/ncsi/ncsi-aen.c
-f:net/ncsi/ncsi-cmd.c
-f:net/ncsi/ncsi-manage.c
-f:net/ncsi/ncsi-netlink.c
-f:net/ncsi/ncsi-netlink.h
-f:net/ncsi/ncsi-pkt.h
-f:net/ncsi/ncsi-rsp.c
-f:net/netfilter/Kconfig
-f:net/netfilter/Makefile
-f:net/netfilter/core.c
-f:net/netfilter/ipset/Kconfig
-f:net/netfilter/ipset/Makefile
-f:net/netfilter/ipset/ip_set_bitmap_gen.h
-f:net/netfilter/ipset/ip_set_bitmap_ip.c
-f:net/netfilter/ipset/ip_set_bitmap_ipmac.c
-f:net/netfilter/ipset/ip_set_bitmap_port.c
-f:net/netfilter/ipset/ip_set_core.c
-f:net/netfilter/ipset/ip_set_getport.c
-f:net/netfilter/ipset/ip_set_hash_gen.h
-f:net/netfilter/ipset/ip_set_hash_ip.c
-f:net/netfilter/ipset/ip_set_hash_ipmac.c
-f:net/netfilter/ipset/ip_set_hash_ipmark.c
-f:net/netfilter/ipset/ip_set_hash_ipport.c
-f:net/netfilter/ipset/ip_set_hash_ipportip.c
-f:net/netfilter/ipset/ip_set_hash_ipportnet.c
-f:net/netfilter/ipset/ip_set_hash_mac.c
-f:net/netfilter/ipset/ip_set_hash_net.c
-f:net/netfilter/ipset/ip_set_hash_netiface.c
-f:net/netfilter/ipset/ip_set_hash_netnet.c
-f:net/netfilter/ipset/ip_set_hash_netport.c
-f:net/netfilter/ipset/ip_set_hash_netportnet.c
-f:net/netfilter/ipset/ip_set_list_set.c
-f:net/netfilter/ipset/pfxlen.c
-f:net/netfilter/ipvs/Kconfig
-f:net/netfilter/ipvs/Makefile
-f:net/netfilter/ipvs/ip_vs_app.c
-f:net/netfilter/ipvs/ip_vs_conn.c
-f:net/netfilter/ipvs/ip_vs_core.c
-f:net/netfilter/ipvs/ip_vs_ctl.c
-f:net/netfilter/ipvs/ip_vs_dh.c
-f:net/netfilter/ipvs/ip_vs_est.c
-f:net/netfilter/ipvs/ip_vs_fo.c
-f:net/netfilter/ipvs/ip_vs_ftp.c
-f:net/netfilter/ipvs/ip_vs_lblc.c
-f:net/netfilter/ipvs/ip_vs_lblcr.c
-f:net/netfilter/ipvs/ip_vs_lc.c
-f:net/netfilter/ipvs/ip_vs_mh.c
-f:net/netfilter/ipvs/ip_vs_nfct.c
-f:net/netfilter/ipvs/ip_vs_nq.c
-f:net/netfilter/ipvs/ip_vs_ovf.c
-f:net/netfilter/ipvs/ip_vs_pe.c
-f:net/netfilter/ipvs/ip_vs_pe_sip.c
-f:net/netfilter/ipvs/ip_vs_proto.c
-f:net/netfilter/ipvs/ip_vs_proto_ah_esp.c
-f:net/netfilter/ipvs/ip_vs_proto_sctp.c
-f:net/netfilter/ipvs/ip_vs_proto_tcp.c
-f:net/netfilter/ipvs/ip_vs_proto_udp.c
-f:net/netfilter/ipvs/ip_vs_rr.c
-f:net/netfilter/ipvs/ip_vs_sched.c
-f:net/netfilter/ipvs/ip_vs_sed.c
-f:net/netfilter/ipvs/ip_vs_sh.c
-f:net/netfilter/ipvs/ip_vs_sync.c
-f:net/netfilter/ipvs/ip_vs_twos.c
-f:net/netfilter/ipvs/ip_vs_wlc.c
-f:net/netfilter/ipvs/ip_vs_wrr.c
-f:net/netfilter/ipvs/ip_vs_xmit.c
-f:net/netfilter/nf_bpf_link.c
-f:net/netfilter/nf_conncount.c
-f:net/netfilter/nf_conntrack_acct.c
-f:net/netfilter/nf_conntrack_amanda.c
-f:net/netfilter/nf_conntrack_bpf.c
-f:net/netfilter/nf_conntrack_broadcast.c
-f:net/netfilter/nf_conntrack_core.c
-f:net/netfilter/nf_conntrack_ecache.c
-f:net/netfilter/nf_conntrack_expect.c
-f:net/netfilter/nf_conntrack_extend.c
-f:net/netfilter/nf_conntrack_ftp.c
-f:net/netfilter/nf_conntrack_h323_asn1.c
-f:net/netfilter/nf_conntrack_h323_main.c
-f:net/netfilter/nf_conntrack_h323_types.c
-f:net/netfilter/nf_conntrack_helper.c
-f:net/netfilter/nf_conntrack_irc.c
-f:net/netfilter/nf_conntrack_labels.c
-f:net/netfilter/nf_conntrack_netbios_ns.c
-f:net/netfilter/nf_conntrack_netlink.c
-f:net/netfilter/nf_conntrack_ovs.c
-f:net/netfilter/nf_conntrack_pptp.c
-f:net/netfilter/nf_conntrack_proto.c
-f:net/netfilter/nf_conntrack_proto_generic.c
-f:net/netfilter/nf_conntrack_proto_gre.c
-f:net/netfilter/nf_conntrack_proto_icmp.c
-f:net/netfilter/nf_conntrack_proto_icmpv6.c
-f:net/netfilter/nf_conntrack_proto_sctp.c
-f:net/netfilter/nf_conntrack_proto_tcp.c
-f:net/netfilter/nf_conntrack_proto_udp.c
-f:net/netfilter/nf_conntrack_sane.c
-f:net/netfilter/nf_conntrack_seqadj.c
-f:net/netfilter/nf_conntrack_sip.c
-f:net/netfilter/nf_conntrack_snmp.c
-f:net/netfilter/nf_conntrack_standalone.c
-f:net/netfilter/nf_conntrack_tftp.c
-f:net/netfilter/nf_conntrack_timeout.c
-f:net/netfilter/nf_conntrack_timestamp.c
-f:net/netfilter/nf_dup_netdev.c
-f:net/netfilter/nf_flow_table_bpf.c
-f:net/netfilter/nf_flow_table_core.c
-f:net/netfilter/nf_flow_table_inet.c
-f:net/netfilter/nf_flow_table_ip.c
-f:net/netfilter/nf_flow_table_offload.c
-f:net/netfilter/nf_flow_table_procfs.c
-f:net/netfilter/nf_flow_table_xdp.c
-f:net/netfilter/nf_hooks_lwtunnel.c
-f:net/netfilter/nf_internals.h
-f:net/netfilter/nf_log.c
-f:net/netfilter/nf_log_syslog.c
-f:net/netfilter/nf_nat_amanda.c
-f:net/netfilter/nf_nat_bpf.c
-f:net/netfilter/nf_nat_core.c
-f:net/netfilter/nf_nat_ftp.c
-f:net/netfilter/nf_nat_helper.c
-f:net/netfilter/nf_nat_irc.c
-f:net/netfilter/nf_nat_masquerade.c
-f:net/netfilter/nf_nat_ovs.c
-f:net/netfilter/nf_nat_proto.c
-f:net/netfilter/nf_nat_redirect.c
-f:net/netfilter/nf_nat_sip.c
-f:net/netfilter/nf_nat_tftp.c
-f:net/netfilter/nf_queue.c
-f:net/netfilter/nf_sockopt.c
-f:net/netfilter/nf_synproxy_core.c
-f:net/netfilter/nf_tables_api.c
-f:net/netfilter/nf_tables_core.c
-f:net/netfilter/nf_tables_offload.c
-f:net/netfilter/nf_tables_trace.c
-f:net/netfilter/nfnetlink.c
-f:net/netfilter/nfnetlink_acct.c
-f:net/netfilter/nfnetlink_cthelper.c
-f:net/netfilter/nfnetlink_cttimeout.c
-f:net/netfilter/nfnetlink_hook.c
-f:net/netfilter/nfnetlink_log.c
-f:net/netfilter/nfnetlink_osf.c
-f:net/netfilter/nfnetlink_queue.c
-f:net/netfilter/nft_bitwise.c
-f:net/netfilter/nft_byteorder.c
-f:net/netfilter/nft_chain_filter.c
-f:net/netfilter/nft_chain_nat.c
-f:net/netfilter/nft_chain_route.c
-f:net/netfilter/nft_cmp.c
-f:net/netfilter/nft_compat.c
-f:net/netfilter/nft_connlimit.c
-f:net/netfilter/nft_counter.c
-f:net/netfilter/nft_ct.c
-f:net/netfilter/nft_ct_fast.c
-f:net/netfilter/nft_dup_netdev.c
-f:net/netfilter/nft_dynset.c
-f:net/netfilter/nft_exthdr.c
-f:net/netfilter/nft_fib.c
-f:net/netfilter/nft_fib_inet.c
-f:net/netfilter/nft_fib_netdev.c
-f:net/netfilter/nft_flow_offload.c
-f:net/netfilter/nft_fwd_netdev.c
-f:net/netfilter/nft_hash.c
-f:net/netfilter/nft_immediate.c
-f:net/netfilter/nft_inner.c
-f:net/netfilter/nft_last.c
-f:net/netfilter/nft_limit.c
-f:net/netfilter/nft_log.c
-f:net/netfilter/nft_lookup.c
-f:net/netfilter/nft_masq.c
-f:net/netfilter/nft_meta.c
-f:net/netfilter/nft_nat.c
-f:net/netfilter/nft_numgen.c
-f:net/netfilter/nft_objref.c
-f:net/netfilter/nft_osf.c
-f:net/netfilter/nft_payload.c
-f:net/netfilter/nft_queue.c
-f:net/netfilter/nft_quota.c
-f:net/netfilter/nft_range.c
-f:net/netfilter/nft_redir.c
-f:net/netfilter/nft_reject.c
-f:net/netfilter/nft_reject_inet.c
-f:net/netfilter/nft_reject_netdev.c
-f:net/netfilter/nft_rt.c
-f:net/netfilter/nft_set_bitmap.c
-f:net/netfilter/nft_set_hash.c
-f:net/netfilter/nft_set_pipapo.c
-f:net/netfilter/nft_set_pipapo.h
-f:net/netfilter/nft_set_pipapo_avx2.c
-f:net/netfilter/nft_set_pipapo_avx2.h
-f:net/netfilter/nft_set_rbtree.c
-f:net/netfilter/nft_socket.c
-f:net/netfilter/nft_synproxy.c
-f:net/netfilter/nft_tproxy.c
-f:net/netfilter/nft_tunnel.c
-f:net/netfilter/nft_xfrm.c
-f:net/netfilter/utils.c
-f:net/netfilter/x_tables.c
-f:net/netfilter/xt_AUDIT.c
-f:net/netfilter/xt_CHECKSUM.c
-f:net/netfilter/xt_CLASSIFY.c
-f:net/netfilter/xt_CONNSECMARK.c
-f:net/netfilter/xt_CT.c
-f:net/netfilter/xt_HMARK.c
-f:net/netfilter/xt_IDLETIMER.c
-f:net/netfilter/xt_LED.c
-f:net/netfilter/xt_LOG.c
-f:net/netfilter/xt_MASQUERADE.c
-f:net/netfilter/xt_NETMAP.c
-f:net/netfilter/xt_NFLOG.c
-f:net/netfilter/xt_NFQUEUE.c
-f:net/netfilter/xt_REDIRECT.c
-f:net/netfilter/xt_SECMARK.c
-f:net/netfilter/xt_TCPOPTSTRIP.c
-f:net/netfilter/xt_TEE.c
-f:net/netfilter/xt_TPROXY.c
-f:net/netfilter/xt_TRACE.c
-f:net/netfilter/xt_addrtype.c
-f:net/netfilter/xt_bpf.c
-f:net/netfilter/xt_cgroup.c
-f:net/netfilter/xt_cluster.c
-f:net/netfilter/xt_comment.c
-f:net/netfilter/xt_connbytes.c
-f:net/netfilter/xt_connlabel.c
-f:net/netfilter/xt_connlimit.c
-f:net/netfilter/xt_connmark.c
-f:net/netfilter/xt_conntrack.c
-f:net/netfilter/xt_cpu.c
-f:net/netfilter/xt_dccp.c
-f:net/netfilter/xt_devgroup.c
-f:net/netfilter/xt_dscp.c
-f:net/netfilter/xt_ecn.c
-f:net/netfilter/xt_esp.c
-f:net/netfilter/xt_hashlimit.c
-f:net/netfilter/xt_helper.c
-f:net/netfilter/xt_hl.c
-f:net/netfilter/xt_ipcomp.c
-f:net/netfilter/xt_iprange.c
-f:net/netfilter/xt_ipvs.c
-f:net/netfilter/xt_l2tp.c
-f:net/netfilter/xt_length.c
-f:net/netfilter/xt_limit.c
-f:net/netfilter/xt_mac.c
-f:net/netfilter/xt_mark.c
-f:net/netfilter/xt_multiport.c
-f:net/netfilter/xt_nat.c
-f:net/netfilter/xt_nfacct.c
-f:net/netfilter/xt_osf.c
-f:net/netfilter/xt_owner.c
-f:net/netfilter/xt_physdev.c
-f:net/netfilter/xt_pkttype.c
-f:net/netfilter/xt_policy.c
-f:net/netfilter/xt_quota.c
-f:net/netfilter/xt_rateest.c
-f:net/netfilter/xt_realm.c
-f:net/netfilter/xt_recent.c
-f:net/netfilter/xt_repldata.h
-f:net/netfilter/xt_sctp.c
-f:net/netfilter/xt_set.c
-f:net/netfilter/xt_socket.c
-f:net/netfilter/xt_state.c
-f:net/netfilter/xt_statistic.c
-f:net/netfilter/xt_string.c
-f:net/netfilter/xt_tcpmss.c
-f:net/netfilter/xt_tcpudp.c
-f:net/netfilter/xt_time.c
-f:net/netfilter/xt_u32.c
-f:net/netlabel/Kconfig
-f:net/netlabel/Makefile
-f:net/netlabel/netlabel_addrlist.c
-f:net/netlabel/netlabel_addrlist.h
-f:net/netlabel/netlabel_calipso.c
-f:net/netlabel/netlabel_calipso.h
-f:net/netlabel/netlabel_cipso_v4.c
-f:net/netlabel/netlabel_cipso_v4.h
-f:net/netlabel/netlabel_domainhash.c
-f:net/netlabel/netlabel_domainhash.h
-f:net/netlabel/netlabel_kapi.c
-f:net/netlabel/netlabel_mgmt.c
-f:net/netlabel/netlabel_mgmt.h
-f:net/netlabel/netlabel_unlabeled.c
-f:net/netlabel/netlabel_unlabeled.h
-f:net/netlabel/netlabel_user.c
-f:net/netlabel/netlabel_user.h
-f:net/netlink/Kconfig
-f:net/netlink/Makefile
-f:net/netlink/af_netlink.c
-f:net/netlink/af_netlink.h
-f:net/netlink/diag.c
-f:net/netlink/genetlink.c
-f:net/netlink/genetlink.h
-f:net/netlink/policy.c
-f:net/netrom/Makefile
-f:net/netrom/af_netrom.c
-f:net/netrom/nr_dev.c
-f:net/netrom/nr_in.c
-f:net/netrom/nr_loopback.c
-f:net/netrom/nr_out.c
-f:net/netrom/nr_route.c
-f:net/netrom/nr_subr.c
-f:net/netrom/nr_timer.c
-f:net/netrom/sysctl_net_netrom.c
-f:net/nfc/Kconfig
-f:net/nfc/Makefile
-f:net/nfc/af_nfc.c
-f:net/nfc/core.c
-f:net/nfc/digital.h
-f:net/nfc/digital_core.c
-f:net/nfc/digital_dep.c
-f:net/nfc/digital_technology.c
-f:net/nfc/hci/Kconfig
-f:net/nfc/hci/Makefile
-f:net/nfc/hci/command.c
-f:net/nfc/hci/core.c
-f:net/nfc/hci/hci.h
-f:net/nfc/hci/hcp.c
-f:net/nfc/hci/llc.c
-f:net/nfc/hci/llc.h
-f:net/nfc/hci/llc_nop.c
-f:net/nfc/hci/llc_shdlc.c
-f:net/nfc/llcp.h
-f:net/nfc/llcp_commands.c
-f:net/nfc/llcp_core.c
-f:net/nfc/llcp_sock.c
-f:net/nfc/nci/Kconfig
-f:net/nfc/nci/Makefile
-f:net/nfc/nci/core.c
-f:net/nfc/nci/data.c
-f:net/nfc/nci/hci.c
-f:net/nfc/nci/lib.c
-f:net/nfc/nci/ntf.c
-f:net/nfc/nci/rsp.c
-f:net/nfc/nci/spi.c
-f:net/nfc/nci/uart.c
-f:net/nfc/netlink.c
-f:net/nfc/nfc.h
-f:net/nfc/rawsock.c
-f:net/nsh/Kconfig
-f:net/nsh/Makefile
-f:net/nsh/nsh.c
-f:net/openvswitch/Kconfig
-f:net/openvswitch/Makefile
-f:net/openvswitch/actions.c
-f:net/openvswitch/conntrack.c
-f:net/openvswitch/conntrack.h
-f:net/openvswitch/datapath.c
-f:net/openvswitch/datapath.h
-f:net/openvswitch/dp_notify.c
-f:net/openvswitch/drop.h
-f:net/openvswitch/flow.c
-f:net/openvswitch/flow.h
-f:net/openvswitch/flow_netlink.c
-f:net/openvswitch/flow_netlink.h
-f:net/openvswitch/flow_table.c
-f:net/openvswitch/flow_table.h
-f:net/openvswitch/meter.c
-f:net/openvswitch/meter.h
-f:net/openvswitch/openvswitch_trace.c
-f:net/openvswitch/openvswitch_trace.h
-f:net/openvswitch/vport-geneve.c
-f:net/openvswitch/vport-gre.c
-f:net/openvswitch/vport-internal_dev.c
-f:net/openvswitch/vport-internal_dev.h
-f:net/openvswitch/vport-netdev.c
-f:net/openvswitch/vport-netdev.h
-f:net/openvswitch/vport-vxlan.c
-f:net/openvswitch/vport.c
-f:net/openvswitch/vport.h
-f:net/packet/Kconfig
-f:net/packet/Makefile
-f:net/packet/af_packet.c
-f:net/packet/diag.c
-f:net/packet/internal.h
-f:net/phonet/Kconfig
-f:net/phonet/Makefile
-f:net/phonet/af_phonet.c
-f:net/phonet/datagram.c
-f:net/phonet/pep-gprs.c
-f:net/phonet/pep.c
-f:net/phonet/pn_dev.c
-f:net/phonet/pn_netlink.c
-f:net/phonet/socket.c
-f:net/phonet/sysctl.c
-f:net/psample/Kconfig
-f:net/psample/Makefile
-f:net/psample/psample.c
-f:net/qrtr/Kconfig
-f:net/qrtr/Makefile
-f:net/qrtr/af_qrtr.c
-f:net/qrtr/mhi.c
-f:net/qrtr/ns.c
-f:net/qrtr/qrtr.h
-f:net/qrtr/smd.c
-f:net/qrtr/tun.c
-f:net/rds/Kconfig
-f:net/rds/Makefile
-f:net/rds/af_rds.c
-f:net/rds/bind.c
-f:net/rds/cong.c
-f:net/rds/connection.c
-f:net/rds/ib.c
-f:net/rds/ib.h
-f:net/rds/ib_cm.c
-f:net/rds/ib_frmr.c
-f:net/rds/ib_mr.h
-f:net/rds/ib_rdma.c
-f:net/rds/ib_recv.c
-f:net/rds/ib_ring.c
-f:net/rds/ib_send.c
-f:net/rds/ib_stats.c
-f:net/rds/ib_sysctl.c
-f:net/rds/info.c
-f:net/rds/info.h
-f:net/rds/loop.c
-f:net/rds/loop.h
-f:net/rds/message.c
-f:net/rds/page.c
-f:net/rds/rdma.c
-f:net/rds/rdma_transport.c
-f:net/rds/rdma_transport.h
-f:net/rds/rds.h
-f:net/rds/rds_single_path.h
-f:net/rds/recv.c
-f:net/rds/send.c
-f:net/rds/stats.c
-f:net/rds/sysctl.c
-f:net/rds/tcp.c
-f:net/rds/tcp.h
-f:net/rds/tcp_connect.c
-f:net/rds/tcp_listen.c
-f:net/rds/tcp_recv.c
-f:net/rds/tcp_send.c
-f:net/rds/tcp_stats.c
-f:net/rds/threads.c
-f:net/rds/transport.c
-f:net/rfkill/Kconfig
-f:net/rfkill/Makefile
-f:net/rfkill/core.c
-f:net/rfkill/input.c
-f:net/rfkill/rfkill-gpio.c
-f:net/rfkill/rfkill.h
-f:net/rose/Makefile
-f:net/rose/af_rose.c
-f:net/rose/rose_dev.c
-f:net/rose/rose_in.c
-f:net/rose/rose_link.c
-f:net/rose/rose_loopback.c
-f:net/rose/rose_out.c
-f:net/rose/rose_route.c
-f:net/rose/rose_subr.c
-f:net/rose/rose_timer.c
-f:net/rose/sysctl_net_rose.c
-f:net/rxrpc/Kconfig
-f:net/rxrpc/Makefile
-f:net/rxrpc/af_rxrpc.c
-f:net/rxrpc/ar-internal.h
-f:net/rxrpc/call_accept.c
-f:net/rxrpc/call_event.c
-f:net/rxrpc/call_object.c
-f:net/rxrpc/call_state.c
-f:net/rxrpc/conn_client.c
-f:net/rxrpc/conn_event.c
-f:net/rxrpc/conn_object.c
-f:net/rxrpc/conn_service.c
-f:net/rxrpc/input.c
-f:net/rxrpc/input_rack.c
-f:net/rxrpc/insecure.c
-f:net/rxrpc/io_thread.c
-f:net/rxrpc/key.c
-f:net/rxrpc/local_event.c
-f:net/rxrpc/local_object.c
-f:net/rxrpc/misc.c
-f:net/rxrpc/net_ns.c
-f:net/rxrpc/oob.c
-f:net/rxrpc/output.c
-f:net/rxrpc/peer_event.c
-f:net/rxrpc/peer_object.c
-f:net/rxrpc/proc.c
-f:net/rxrpc/protocol.h
-f:net/rxrpc/recvmsg.c
-f:net/rxrpc/rtt.c
-f:net/rxrpc/rxgk.c
-f:net/rxrpc/rxgk_app.c
-f:net/rxrpc/rxgk_common.h
-f:net/rxrpc/rxgk_kdf.c
-f:net/rxrpc/rxkad.c
-f:net/rxrpc/rxperf.c
-f:net/rxrpc/security.c
-f:net/rxrpc/sendmsg.c
-f:net/rxrpc/server_key.c
-f:net/rxrpc/skbuff.c
-f:net/rxrpc/sysctl.c
-f:net/rxrpc/txbuf.c
-f:net/rxrpc/utils.c
-f:net/sched/Kconfig
-f:net/sched/Makefile
-f:net/sched/act_api.c
-f:net/sched/act_bpf.c
-f:net/sched/act_connmark.c
-f:net/sched/act_csum.c
-f:net/sched/act_ct.c
-f:net/sched/act_ctinfo.c
-f:net/sched/act_gact.c
-f:net/sched/act_gate.c
-f:net/sched/act_ife.c
-f:net/sched/act_meta_mark.c
-f:net/sched/act_meta_skbprio.c
-f:net/sched/act_meta_skbtcindex.c
-f:net/sched/act_mirred.c
-f:net/sched/act_mpls.c
-f:net/sched/act_nat.c
-f:net/sched/act_pedit.c
-f:net/sched/act_police.c
-f:net/sched/act_sample.c
-f:net/sched/act_simple.c
-f:net/sched/act_skbedit.c
-f:net/sched/act_skbmod.c
-f:net/sched/act_tunnel_key.c
-f:net/sched/act_vlan.c
-f:net/sched/bpf_qdisc.c
-f:net/sched/cls_api.c
-f:net/sched/cls_basic.c
-f:net/sched/cls_bpf.c
-f:net/sched/cls_cgroup.c
-f:net/sched/cls_flow.c
-f:net/sched/cls_flower.c
-f:net/sched/cls_fw.c
-f:net/sched/cls_matchall.c
-f:net/sched/cls_route.c
-f:net/sched/cls_u32.c
-f:net/sched/em_canid.c
-f:net/sched/em_cmp.c
-f:net/sched/em_ipset.c
-f:net/sched/em_ipt.c
-f:net/sched/em_meta.c
-f:net/sched/em_nbyte.c
-f:net/sched/em_text.c
-f:net/sched/em_u32.c
-f:net/sched/ematch.c
-f:net/sched/sch_api.c
-f:net/sched/sch_blackhole.c
-f:net/sched/sch_cake.c
-f:net/sched/sch_cbs.c
-f:net/sched/sch_choke.c
-f:net/sched/sch_codel.c
-f:net/sched/sch_drr.c
-f:net/sched/sch_dualpi2.c
-f:net/sched/sch_etf.c
-f:net/sched/sch_ets.c
-f:net/sched/sch_fifo.c
-f:net/sched/sch_fq.c
-f:net/sched/sch_fq_codel.c
-f:net/sched/sch_fq_pie.c
-f:net/sched/sch_frag.c
-f:net/sched/sch_generic.c
-f:net/sched/sch_gred.c
-f:net/sched/sch_hfsc.c
-f:net/sched/sch_hhf.c
-f:net/sched/sch_htb.c
-f:net/sched/sch_ingress.c
-f:net/sched/sch_mq.c
-f:net/sched/sch_mqprio.c
-f:net/sched/sch_mqprio_lib.c
-f:net/sched/sch_mqprio_lib.h
-f:net/sched/sch_multiq.c
-f:net/sched/sch_netem.c
-f:net/sched/sch_pie.c
-f:net/sched/sch_plug.c
-f:net/sched/sch_prio.c
-f:net/sched/sch_qfq.c
-f:net/sched/sch_red.c
-f:net/sched/sch_sfb.c
-f:net/sched/sch_sfq.c
-f:net/sched/sch_skbprio.c
-f:net/sched/sch_taprio.c
-f:net/sched/sch_tbf.c
-f:net/sched/sch_teql.c
-f:net/sctp/Kconfig
-f:net/sctp/Makefile
-f:net/sctp/associola.c
-f:net/sctp/auth.c
-f:net/sctp/bind_addr.c
-f:net/sctp/chunk.c
-f:net/sctp/debug.c
-f:net/sctp/diag.c
-f:net/sctp/endpointola.c
-f:net/sctp/input.c
-f:net/sctp/inqueue.c
-f:net/sctp/ipv6.c
-f:net/sctp/objcnt.c
-f:net/sctp/offload.c
-f:net/sctp/output.c
-f:net/sctp/outqueue.c
-f:net/sctp/primitive.c
-f:net/sctp/proc.c
-f:net/sctp/protocol.c
-f:net/sctp/sm_make_chunk.c
-f:net/sctp/sm_sideeffect.c
-f:net/sctp/sm_statefuns.c
-f:net/sctp/sm_statetable.c
-f:net/sctp/socket.c
-f:net/sctp/stream.c
-f:net/sctp/stream_interleave.c
-f:net/sctp/stream_sched.c
-f:net/sctp/stream_sched_fc.c
-f:net/sctp/stream_sched_prio.c
-f:net/sctp/stream_sched_rr.c
-f:net/sctp/sysctl.c
-f:net/sctp/transport.c
-f:net/sctp/tsnmap.c
-f:net/sctp/ulpevent.c
-f:net/sctp/ulpqueue.c
-f:net/shaper/Makefile
-f:net/shaper/shaper.c
-f:net/shaper/shaper_nl_gen.c
-f:net/shaper/shaper_nl_gen.h
-f:net/smc/Kconfig
-f:net/smc/Makefile
-f:net/smc/af_smc.c
-f:net/smc/smc.h
-f:net/smc/smc_cdc.c
-f:net/smc/smc_cdc.h
-f:net/smc/smc_clc.c
-f:net/smc/smc_clc.h
-f:net/smc/smc_close.c
-f:net/smc/smc_close.h
-f:net/smc/smc_core.c
-f:net/smc/smc_core.h
-f:net/smc/smc_diag.c
-f:net/smc/smc_ib.c
-f:net/smc/smc_ib.h
-f:net/smc/smc_inet.c
-f:net/smc/smc_inet.h
-f:net/smc/smc_ism.c
-f:net/smc/smc_ism.h
-f:net/smc/smc_llc.c
-f:net/smc/smc_llc.h
-f:net/smc/smc_loopback.c
-f:net/smc/smc_loopback.h
-f:net/smc/smc_netlink.c
-f:net/smc/smc_netlink.h
-f:net/smc/smc_netns.h
-f:net/smc/smc_pnet.c
-f:net/smc/smc_pnet.h
-f:net/smc/smc_rx.c
-f:net/smc/smc_rx.h
-f:net/smc/smc_stats.c
-f:net/smc/smc_stats.h
-f:net/smc/smc_sysctl.c
-f:net/smc/smc_sysctl.h
-f:net/smc/smc_tracepoint.c
-f:net/smc/smc_tracepoint.h
-f:net/smc/smc_tx.c
-f:net/smc/smc_tx.h
-f:net/smc/smc_wr.c
-f:net/smc/smc_wr.h
-f:net/socket.c
-f:net/strparser/Kconfig
-f:net/strparser/Makefile
-f:net/strparser/strparser.c
-f:net/sunrpc/.kunitconfig
-f:net/sunrpc/Kconfig
-f:net/sunrpc/Makefile
-f:net/sunrpc/addr.c
-f:net/sunrpc/auth.c
-f:net/sunrpc/auth_gss/Makefile
-f:net/sunrpc/auth_gss/auth_gss.c
-f:net/sunrpc/auth_gss/auth_gss_internal.h
-f:net/sunrpc/auth_gss/gss_krb5_crypto.c
-f:net/sunrpc/auth_gss/gss_krb5_internal.h
-f:net/sunrpc/auth_gss/gss_krb5_keys.c
-f:net/sunrpc/auth_gss/gss_krb5_mech.c
-f:net/sunrpc/auth_gss/gss_krb5_seal.c
-f:net/sunrpc/auth_gss/gss_krb5_test.c
-f:net/sunrpc/auth_gss/gss_krb5_unseal.c
-f:net/sunrpc/auth_gss/gss_krb5_wrap.c
-f:net/sunrpc/auth_gss/gss_mech_switch.c
-f:net/sunrpc/auth_gss/gss_rpc_upcall.c
-f:net/sunrpc/auth_gss/gss_rpc_upcall.h
-f:net/sunrpc/auth_gss/gss_rpc_xdr.c
-f:net/sunrpc/auth_gss/gss_rpc_xdr.h
-f:net/sunrpc/auth_gss/svcauth_gss.c
-f:net/sunrpc/auth_gss/trace.c
-f:net/sunrpc/auth_null.c
-f:net/sunrpc/auth_tls.c
-f:net/sunrpc/auth_unix.c
-f:net/sunrpc/backchannel_rqst.c
-f:net/sunrpc/cache.c
-f:net/sunrpc/clnt.c
-f:net/sunrpc/debugfs.c
-f:net/sunrpc/fail.h
-f:net/sunrpc/netns.h
-f:net/sunrpc/rpc_pipe.c
-f:net/sunrpc/rpcb_clnt.c
-f:net/sunrpc/sched.c
-f:net/sunrpc/socklib.c
-f:net/sunrpc/socklib.h
-f:net/sunrpc/stats.c
-f:net/sunrpc/sunrpc.h
-f:net/sunrpc/sunrpc_syms.c
-f:net/sunrpc/svc.c
-f:net/sunrpc/svc_xprt.c
-f:net/sunrpc/svcauth.c
-f:net/sunrpc/svcauth_unix.c
-f:net/sunrpc/svcsock.c
-f:net/sunrpc/sysctl.c
-f:net/sunrpc/sysfs.c
-f:net/sunrpc/sysfs.h
-f:net/sunrpc/timer.c
-f:net/sunrpc/xdr.c
-f:net/sunrpc/xprt.c
-f:net/sunrpc/xprtmultipath.c
-f:net/sunrpc/xprtrdma/Makefile
-f:net/sunrpc/xprtrdma/backchannel.c
-f:net/sunrpc/xprtrdma/frwr_ops.c
-f:net/sunrpc/xprtrdma/ib_client.c
-f:net/sunrpc/xprtrdma/module.c
-f:net/sunrpc/xprtrdma/rpc_rdma.c
-f:net/sunrpc/xprtrdma/svc_rdma.c
-f:net/sunrpc/xprtrdma/svc_rdma_backchannel.c
-f:net/sunrpc/xprtrdma/svc_rdma_pcl.c
-f:net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
-f:net/sunrpc/xprtrdma/svc_rdma_rw.c
-f:net/sunrpc/xprtrdma/svc_rdma_sendto.c
-f:net/sunrpc/xprtrdma/svc_rdma_transport.c
-f:net/sunrpc/xprtrdma/transport.c
-f:net/sunrpc/xprtrdma/verbs.c
-f:net/sunrpc/xprtrdma/xprt_rdma.h
-f:net/sunrpc/xprtsock.c
-f:net/switchdev/Kconfig
-f:net/switchdev/Makefile
-f:net/switchdev/switchdev.c
-f:net/sysctl_net.c
-f:net/tipc/Kconfig
-f:net/tipc/Makefile
-f:net/tipc/addr.c
-f:net/tipc/addr.h
-f:net/tipc/bcast.c
-f:net/tipc/bcast.h
-f:net/tipc/bearer.c
-f:net/tipc/bearer.h
-f:net/tipc/core.c
-f:net/tipc/core.h
-f:net/tipc/crypto.c
-f:net/tipc/crypto.h
-f:net/tipc/diag.c
-f:net/tipc/discover.c
-f:net/tipc/discover.h
-f:net/tipc/eth_media.c
-f:net/tipc/group.c
-f:net/tipc/group.h
-f:net/tipc/ib_media.c
-f:net/tipc/link.c
-f:net/tipc/link.h
-f:net/tipc/monitor.c
-f:net/tipc/monitor.h
-f:net/tipc/msg.c
-f:net/tipc/msg.h
-f:net/tipc/name_distr.c
-f:net/tipc/name_distr.h
-f:net/tipc/name_table.c
-f:net/tipc/name_table.h
-f:net/tipc/net.c
-f:net/tipc/net.h
-f:net/tipc/netlink.c
-f:net/tipc/netlink.h
-f:net/tipc/netlink_compat.c
-f:net/tipc/node.c
-f:net/tipc/node.h
-f:net/tipc/socket.c
-f:net/tipc/socket.h
-f:net/tipc/subscr.c
-f:net/tipc/subscr.h
-f:net/tipc/sysctl.c
-f:net/tipc/topsrv.c
-f:net/tipc/topsrv.h
-f:net/tipc/trace.c
-f:net/tipc/trace.h
-f:net/tipc/udp_media.c
-f:net/tipc/udp_media.h
-f:net/tls/Kconfig
-f:net/tls/Makefile
-f:net/tls/tls.h
-f:net/tls/tls_device.c
-f:net/tls/tls_device_fallback.c
-f:net/tls/tls_main.c
-f:net/tls/tls_proc.c
-f:net/tls/tls_strp.c
-f:net/tls/tls_sw.c
-f:net/tls/tls_toe.c
-f:net/tls/trace.c
-f:net/tls/trace.h
-f:net/unix/Kconfig
-f:net/unix/Makefile
-f:net/unix/af_unix.c
-f:net/unix/af_unix.h
-f:net/unix/diag.c
-f:net/unix/garbage.c
-f:net/unix/sysctl_net_unix.c
-f:net/unix/unix_bpf.c
-f:net/vmw_vsock/Kconfig
-f:net/vmw_vsock/Makefile
-f:net/vmw_vsock/af_vsock.c
-f:net/vmw_vsock/af_vsock_tap.c
-f:net/vmw_vsock/diag.c
-f:net/vmw_vsock/hyperv_transport.c
-f:net/vmw_vsock/virtio_transport.c
-f:net/vmw_vsock/virtio_transport_common.c
-f:net/vmw_vsock/vmci_transport.c
-f:net/vmw_vsock/vmci_transport.h
-f:net/vmw_vsock/vmci_transport_notify.c
-f:net/vmw_vsock/vmci_transport_notify.h
-f:net/vmw_vsock/vmci_transport_notify_qstate.c
-f:net/vmw_vsock/vsock_addr.c
-f:net/vmw_vsock/vsock_bpf.c
-f:net/vmw_vsock/vsock_loopback.c
-f:net/wireless/.gitignore
-f:net/wireless/Kconfig
-f:net/wireless/Makefile
-f:net/wireless/ap.c
-f:net/wireless/certs/sforshee.hex
-f:net/wireless/certs/wens.hex
-f:net/wireless/chan.c
-f:net/wireless/core.c
-f:net/wireless/core.h
-f:net/wireless/debugfs.c
-f:net/wireless/debugfs.h
-f:net/wireless/ethtool.c
-f:net/wireless/ibss.c
-f:net/wireless/mesh.c
-f:net/wireless/mlme.c
-f:net/wireless/nl80211.c
-f:net/wireless/nl80211.h
-f:net/wireless/ocb.c
-f:net/wireless/of.c
-f:net/wireless/pmsr.c
-f:net/wireless/radiotap.c
-f:net/wireless/rdev-ops.h
-f:net/wireless/reg.c
-f:net/wireless/reg.h
-f:net/wireless/scan.c
-f:net/wireless/sme.c
-f:net/wireless/sysfs.c
-f:net/wireless/sysfs.h
-f:net/wireless/tests/Makefile
-f:net/wireless/tests/chan.c
-f:net/wireless/tests/fragmentation.c
-f:net/wireless/tests/module.c
-f:net/wireless/tests/scan.c
-f:net/wireless/tests/util.c
-f:net/wireless/tests/util.h
-f:net/wireless/trace.c
-f:net/wireless/trace.h
-f:net/wireless/util.c
-f:net/wireless/wext-compat.c
-f:net/wireless/wext-compat.h
-f:net/wireless/wext-core.c
-f:net/wireless/wext-priv.c
-f:net/wireless/wext-proc.c
-f:net/wireless/wext-sme.c
-f:net/x25/Kconfig
-f:net/x25/Makefile
-f:net/x25/af_x25.c
-f:net/x25/sysctl_net_x25.c
-f:net/x25/x25_dev.c
-f:net/x25/x25_facilities.c
-f:net/x25/x25_forward.c
-f:net/x25/x25_in.c
-f:net/x25/x25_link.c
-f:net/x25/x25_out.c
-f:net/x25/x25_proc.c
-f:net/x25/x25_route.c
-f:net/x25/x25_subr.c
-f:net/x25/x25_timer.c
-f:net/xdp/Kconfig
-f:net/xdp/Makefile
-f:net/xdp/xdp_umem.c
-f:net/xdp/xdp_umem.h
-f:net/xdp/xsk.c
-f:net/xdp/xsk.h
-f:net/xdp/xsk_buff_pool.c
-f:net/xdp/xsk_diag.c
-f:net/xdp/xsk_queue.c
-f:net/xdp/xsk_queue.h
-f:net/xdp/xskmap.c
-f:net/xfrm/Kconfig
-f:net/xfrm/Makefile
-f:net/xfrm/espintcp.c
-f:net/xfrm/trace_iptfs.h
-f:net/xfrm/xfrm_algo.c
-f:net/xfrm/xfrm_compat.c
-f:net/xfrm/xfrm_device.c
-f:net/xfrm/xfrm_hash.c
-f:net/xfrm/xfrm_hash.h
-f:net/xfrm/xfrm_inout.h
-f:net/xfrm/xfrm_input.c
-f:net/xfrm/xfrm_interface_bpf.c
-f:net/xfrm/xfrm_interface_core.c
-f:net/xfrm/xfrm_ipcomp.c
-f:net/xfrm/xfrm_iptfs.c
-f:net/xfrm/xfrm_nat_keepalive.c
-f:net/xfrm/xfrm_output.c
-f:net/xfrm/xfrm_policy.c
-f:net/xfrm/xfrm_proc.c
-f:net/xfrm/xfrm_replay.c
-f:net/xfrm/xfrm_state.c
-f:net/xfrm/xfrm_state_bpf.c
-f:net/xfrm/xfrm_sysctl.c
-f:net/xfrm/xfrm_user.c
-f:rust/.gitignore
-f:rust/.kunitconfig
-f:rust/Makefile
-f:rust/bindgen_parameters
-f:rust/bindings/bindings_helper.h
-f:rust/bindings/lib.rs
-f:rust/build_error.rs
-f:rust/compiler_builtins.rs
-f:rust/exports.c
-f:rust/ffi.rs
-f:rust/helpers/auxiliary.c
-f:rust/helpers/blk.c
-f:rust/helpers/bug.c
-f:rust/helpers/build_assert.c
-f:rust/helpers/build_bug.c
-f:rust/helpers/clk.c
-f:rust/helpers/completion.c
-f:rust/helpers/cpu.c
-f:rust/helpers/cpufreq.c
-f:rust/helpers/cpumask.c
-f:rust/helpers/cred.c
-f:rust/helpers/device.c
-f:rust/helpers/dma.c
-f:rust/helpers/drm.c
-f:rust/helpers/err.c
-f:rust/helpers/fs.c
-f:rust/helpers/helpers.c
-f:rust/helpers/io.c
-f:rust/helpers/jump_label.c
-f:rust/helpers/kunit.c
-f:rust/helpers/mm.c
-f:rust/helpers/mutex.c
-f:rust/helpers/of.c
-f:rust/helpers/page.c
-f:rust/helpers/pci.c
-f:rust/helpers/pid_namespace.c
-f:rust/helpers/platform.c
-f:rust/helpers/poll.c
-f:rust/helpers/property.c
-f:rust/helpers/rbtree.c
-f:rust/helpers/rcu.c
-f:rust/helpers/refcount.c
-f:rust/helpers/regulator.c
-f:rust/helpers/security.c
-f:rust/helpers/signal.c
-f:rust/helpers/slab.c
-f:rust/helpers/spinlock.c
-f:rust/helpers/sync.c
-f:rust/helpers/task.c
-f:rust/helpers/uaccess.c
-f:rust/helpers/vmalloc.c
-f:rust/helpers/wait.c
-f:rust/helpers/workqueue.c
-f:rust/helpers/xarray.c
-f:rust/kernel/.gitignore
-f:rust/kernel/acpi.rs
-f:rust/kernel/alloc.rs
-f:rust/kernel/alloc/allocator.rs
-f:rust/kernel/alloc/allocator_test.rs
-f:rust/kernel/alloc/kbox.rs
-f:rust/kernel/alloc/kvec.rs
-f:rust/kernel/alloc/kvec/errors.rs
-f:rust/kernel/alloc/layout.rs
-f:rust/kernel/auxiliary.rs
-f:rust/kernel/block.rs
-f:rust/kernel/block/mq.rs
-f:rust/kernel/block/mq/gen_disk.rs
-f:rust/kernel/block/mq/operations.rs
-f:rust/kernel/block/mq/raw_writer.rs
-f:rust/kernel/block/mq/request.rs
-f:rust/kernel/block/mq/tag_set.rs
-f:rust/kernel/build_assert.rs
-f:rust/kernel/clk.rs
-f:rust/kernel/configfs.rs
-f:rust/kernel/cpu.rs
-f:rust/kernel/cpufreq.rs
-f:rust/kernel/cpumask.rs
-f:rust/kernel/cred.rs
-f:rust/kernel/device.rs
-f:rust/kernel/device/property.rs
-f:rust/kernel/device_id.rs
-f:rust/kernel/devres.rs
-f:rust/kernel/dma.rs
-f:rust/kernel/driver.rs
-f:rust/kernel/drm/device.rs
-f:rust/kernel/drm/driver.rs
-f:rust/kernel/drm/file.rs
-f:rust/kernel/drm/gem/mod.rs
-f:rust/kernel/drm/ioctl.rs
-f:rust/kernel/drm/mod.rs
-f:rust/kernel/error.rs
-f:rust/kernel/faux.rs
-f:rust/kernel/firmware.rs
-f:rust/kernel/fs.rs
-f:rust/kernel/fs/file.rs
-f:rust/kernel/generated_arch_static_branch_asm.rs.S
-f:rust/kernel/init.rs
-f:rust/kernel/io.rs
-f:rust/kernel/io/mem.rs
-f:rust/kernel/io/resource.rs
-f:rust/kernel/ioctl.rs
-f:rust/kernel/jump_label.rs
-f:rust/kernel/kunit.rs
-f:rust/kernel/lib.rs
-f:rust/kernel/list.rs
-f:rust/kernel/list/arc.rs
-f:rust/kernel/list/arc_field.rs
-f:rust/kernel/list/impl_list_item_mod.rs
-f:rust/kernel/miscdevice.rs
-f:rust/kernel/mm.rs
-f:rust/kernel/mm/mmput_async.rs
-f:rust/kernel/mm/virt.rs
-f:rust/kernel/net.rs
-f:rust/kernel/net/phy.rs
-f:rust/kernel/net/phy/reg.rs
-f:rust/kernel/of.rs
-f:rust/kernel/opp.rs
-f:rust/kernel/page.rs
-f:rust/kernel/pci.rs
-f:rust/kernel/pid_namespace.rs
-f:rust/kernel/platform.rs
-f:rust/kernel/prelude.rs
-f:rust/kernel/print.rs
-f:rust/kernel/rbtree.rs
-f:rust/kernel/regulator.rs
-f:rust/kernel/revocable.rs
-f:rust/kernel/security.rs
-f:rust/kernel/seq_file.rs
-f:rust/kernel/sizes.rs
-f:rust/kernel/static_assert.rs
-f:rust/kernel/std_vendor.rs
-f:rust/kernel/str.rs
-f:rust/kernel/sync.rs
-f:rust/kernel/sync/arc.rs
-f:rust/kernel/sync/arc/std_vendor.rs
-f:rust/kernel/sync/completion.rs
-f:rust/kernel/sync/condvar.rs
-f:rust/kernel/sync/lock.rs
-f:rust/kernel/sync/lock/global.rs
-f:rust/kernel/sync/lock/mutex.rs
-f:rust/kernel/sync/lock/spinlock.rs
-f:rust/kernel/sync/locked_by.rs
-f:rust/kernel/sync/poll.rs
-f:rust/kernel/sync/rcu.rs
-f:rust/kernel/task.rs
-f:rust/kernel/time.rs
-f:rust/kernel/time/hrtimer.rs
-f:rust/kernel/time/hrtimer/arc.rs
-f:rust/kernel/time/hrtimer/pin.rs
-f:rust/kernel/time/hrtimer/pin_mut.rs
-f:rust/kernel/time/hrtimer/tbox.rs
-f:rust/kernel/tracepoint.rs
-f:rust/kernel/transmute.rs
-f:rust/kernel/types.rs
-f:rust/kernel/uaccess.rs
-f:rust/kernel/workqueue.rs
-f:rust/kernel/xarray.rs
-f:rust/macros/concat_idents.rs
-f:rust/macros/export.rs
-f:rust/macros/helpers.rs
-f:rust/macros/kunit.rs
-f:rust/macros/lib.rs
-f:rust/macros/module.rs
-f:rust/macros/paste.rs
-f:rust/macros/quote.rs
-f:rust/macros/vtable.rs
-f:rust/pin-init/CONTRIBUTING.md
-f:rust/pin-init/README.md
-f:rust/pin-init/examples/big_struct_in_place.rs
-f:rust/pin-init/examples/error.rs
-f:rust/pin-init/examples/linked_list.rs
-f:rust/pin-init/examples/mutex.rs
-f:rust/pin-init/examples/pthread_mutex.rs
-f:rust/pin-init/examples/static_init.rs
-f:rust/pin-init/internal/src/helpers.rs
-f:rust/pin-init/internal/src/lib.rs
-f:rust/pin-init/internal/src/pin_data.rs
-f:rust/pin-init/internal/src/pinned_drop.rs
-f:rust/pin-init/internal/src/zeroable.rs
-f:rust/pin-init/src/__internal.rs
-f:rust/pin-init/src/alloc.rs
-f:rust/pin-init/src/lib.rs
-f:rust/pin-init/src/macros.rs
-f:rust/uapi/lib.rs
-f:rust/uapi/uapi_helper.h
-f:samples/Kconfig
-f:samples/Makefile
-f:samples/acrn/Makefile
-f:samples/acrn/guest.ld
-f:samples/acrn/payload.ld
-f:samples/acrn/vm-sample.c
-f:samples/auxdisplay/.gitignore
-f:samples/auxdisplay/Makefile
-f:samples/auxdisplay/cfag12864b-example.c
-f:samples/binderfs/.gitignore
-f:samples/binderfs/Makefile
-f:samples/binderfs/binderfs_example.c
-f:samples/bpf/.gitignore
-f:samples/bpf/Makefile
-f:samples/bpf/Makefile.target
-f:samples/bpf/README.rst
-f:samples/bpf/asm_goto_workaround.h
-f:samples/bpf/bpf_insn.h
-f:samples/bpf/cookie_uid_helper_example.c
-f:samples/bpf/cpustat_kern.c
-f:samples/bpf/cpustat_user.c
-f:samples/bpf/do_hbm_test.sh
-f:samples/bpf/fds_example.c
-f:samples/bpf/gnu/stubs.h
-f:samples/bpf/hash_func01.h
-f:samples/bpf/hbm.c
-f:samples/bpf/hbm.h
-f:samples/bpf/hbm_edt_kern.c
-f:samples/bpf/hbm_kern.h
-f:samples/bpf/hbm_out_kern.c
-f:samples/bpf/ibumad_kern.c
-f:samples/bpf/ibumad_user.c
-f:samples/bpf/lathist_kern.c
-f:samples/bpf/lathist_user.c
-f:samples/bpf/lwt_len_hist.bpf.c
-f:samples/bpf/lwt_len_hist.sh
-f:samples/bpf/lwt_len_hist_user.c
-f:samples/bpf/map_perf_test.bpf.c
-f:samples/bpf/map_perf_test_user.c
-f:samples/bpf/net_shared.h
-f:samples/bpf/offwaketime.bpf.c
-f:samples/bpf/offwaketime_user.c
-f:samples/bpf/parse_ldabs.c
-f:samples/bpf/parse_simple.c
-f:samples/bpf/parse_varlen.c
-f:samples/bpf/run_cookie_uid_helper_example.sh
-f:samples/bpf/sampleip_kern.c
-f:samples/bpf/sampleip_user.c
-f:samples/bpf/sock_example.c
-f:samples/bpf/sock_example.h
-f:samples/bpf/sockex1_kern.c
-f:samples/bpf/sockex1_user.c
-f:samples/bpf/sockex2_kern.c
-f:samples/bpf/sockex2_user.c
-f:samples/bpf/sockex3_kern.c
-f:samples/bpf/sockex3_user.c
-f:samples/bpf/spintest.bpf.c
-f:samples/bpf/spintest_user.c
-f:samples/bpf/syscall_nrs.c
-f:samples/bpf/syscall_tp_kern.c
-f:samples/bpf/syscall_tp_user.c
-f:samples/bpf/task_fd_query_kern.c
-f:samples/bpf/task_fd_query_user.c
-f:samples/bpf/tc_l2_redirect.sh
-f:samples/bpf/tc_l2_redirect_kern.c
-f:samples/bpf/tc_l2_redirect_user.c
-f:samples/bpf/tcbpf1_kern.c
-f:samples/bpf/tcp_basertt_kern.c
-f:samples/bpf/tcp_bpf.readme
-f:samples/bpf/tcp_bufs_kern.c
-f:samples/bpf/tcp_clamp_kern.c
-f:samples/bpf/tcp_cong_kern.c
-f:samples/bpf/tcp_dumpstats_kern.c
-f:samples/bpf/tcp_iw_kern.c
-f:samples/bpf/tcp_rwnd_kern.c
-f:samples/bpf/tcp_synrto_kern.c
-f:samples/bpf/tcp_tos_reflect_kern.c
-f:samples/bpf/test_cls_bpf.sh
-f:samples/bpf/test_lru_dist.c
-f:samples/bpf/test_lwt_bpf.c
-f:samples/bpf/test_lwt_bpf.sh
-f:samples/bpf/test_map_in_map.bpf.c
-f:samples/bpf/test_map_in_map_user.c
-f:samples/bpf/trace_event_kern.c
-f:samples/bpf/trace_event_user.c
-f:samples/bpf/trace_output.bpf.c
-f:samples/bpf/trace_output_user.c
-f:samples/bpf/tracex1.bpf.c
-f:samples/bpf/tracex1_user.c
-f:samples/bpf/tracex3.bpf.c
-f:samples/bpf/tracex3_user.c
-f:samples/bpf/tracex4.bpf.c
-f:samples/bpf/tracex4_user.c
-f:samples/bpf/tracex5.bpf.c
-f:samples/bpf/tracex5_user.c
-f:samples/bpf/tracex6.bpf.c
-f:samples/bpf/tracex6_user.c
-f:samples/bpf/xdp2skb_meta.sh
-f:samples/bpf/xdp2skb_meta_kern.c
-f:samples/bpf/xdp_adjust_tail_kern.c
-f:samples/bpf/xdp_adjust_tail_user.c
-f:samples/bpf/xdp_fwd_kern.c
-f:samples/bpf/xdp_fwd_user.c
-f:samples/bpf/xdp_router_ipv4.bpf.c
-f:samples/bpf/xdp_router_ipv4_user.c
-f:samples/bpf/xdp_sample.bpf.c
-f:samples/bpf/xdp_sample.bpf.h
-f:samples/bpf/xdp_sample_shared.h
-f:samples/bpf/xdp_sample_user.c
-f:samples/bpf/xdp_sample_user.h
-f:samples/bpf/xdp_tx_iptunnel_common.h
-f:samples/bpf/xdp_tx_iptunnel_kern.c
-f:samples/bpf/xdp_tx_iptunnel_user.c
-f:samples/cgroup/.gitignore
-f:samples/cgroup/Makefile
-f:samples/cgroup/cgroup_event_listener.c
-f:samples/cgroup/memcg_event_listener.c
-f:samples/check-exec/.gitignore
-f:samples/check-exec/Makefile
-f:samples/check-exec/inc.c
-f:samples/check-exec/run-script-ask.sh
-f:samples/check-exec/script-ask.inc
-f:samples/check-exec/script-exec.inc
-f:samples/check-exec/script-noexec.inc
-f:samples/check-exec/set-exec.c
-f:samples/configfs/Makefile
-f:samples/configfs/configfs_sample.c
-f:samples/connector/.gitignore
-f:samples/connector/Makefile
-f:samples/connector/cn_test.c
-f:samples/connector/ucon.c
-f:samples/coresight/Makefile
-f:samples/coresight/coresight-cfg-sample.c
-f:samples/damon/Kconfig
-f:samples/damon/Makefile
-f:samples/damon/mtier.c
-f:samples/damon/prcl.c
-f:samples/damon/wsse.c
-f:samples/fanotify/.gitignore
-f:samples/fanotify/Makefile
-f:samples/fanotify/fs-monitor.c
-f:samples/fprobe/Makefile
-f:samples/fprobe/fprobe_example.c
-f:samples/ftrace/Makefile
-f:samples/ftrace/ftrace-direct-modify.c
-f:samples/ftrace/ftrace-direct-multi-modify.c
-f:samples/ftrace/ftrace-direct-multi.c
-f:samples/ftrace/ftrace-direct-too.c
-f:samples/ftrace/ftrace-direct.c
-f:samples/ftrace/ftrace-ops.c
-f:samples/ftrace/sample-trace-array.c
-f:samples/ftrace/sample-trace-array.h
-f:samples/hid/.gitignore
-f:samples/hid/Makefile
-f:samples/hid/Makefile.target
-f:samples/hid/hid_bpf_helpers.h
-f:samples/hid/hid_mouse.bpf.c
-f:samples/hid/hid_mouse.c
-f:samples/hid/hid_surface_dial.bpf.c
-f:samples/hid/hid_surface_dial.c
-f:samples/hidraw/.gitignore
-f:samples/hidraw/Makefile
-f:samples/hidraw/hid-example.c
-f:samples/hung_task/Makefile
-f:samples/hung_task/hung_task_tests.c
-f:samples/hw_breakpoint/Makefile
-f:samples/hw_breakpoint/data_breakpoint.c
-f:samples/kdb/Makefile
-f:samples/kdb/kdb_hello.c
-f:samples/kfifo/Makefile
-f:samples/kfifo/bytestream-example.c
-f:samples/kfifo/dma-example.c
-f:samples/kfifo/inttype-example.c
-f:samples/kfifo/record-example.c
-f:samples/kmemleak/Makefile
-f:samples/kmemleak/kmemleak-test.c
-f:samples/kobject/Makefile
-f:samples/kobject/kobject-example.c
-f:samples/kobject/kset-example.c
-f:samples/kprobes/Makefile
-f:samples/kprobes/kprobe_example.c
-f:samples/kprobes/kretprobe_example.c
-f:samples/landlock/.gitignore
-f:samples/landlock/Makefile
-f:samples/landlock/sandboxer.c
-f:samples/livepatch/Makefile
-f:samples/livepatch/livepatch-callbacks-busymod.c
-f:samples/livepatch/livepatch-callbacks-demo.c
-f:samples/livepatch/livepatch-callbacks-mod.c
-f:samples/livepatch/livepatch-sample.c
-f:samples/livepatch/livepatch-shadow-fix1.c
-f:samples/livepatch/livepatch-shadow-fix2.c
-f:samples/livepatch/livepatch-shadow-mod.c
-f:samples/mei/.gitignore
-f:samples/mei/Makefile
-f:samples/mei/mei-amt-version.c
-f:samples/nitro_enclaves/.gitignore
-f:samples/nitro_enclaves/Makefile
-f:samples/nitro_enclaves/ne_ioctl_sample.c
-f:samples/pfsm/.gitignore
-f:samples/pfsm/Makefile
-f:samples/pfsm/pfsm-wakeup.c
-f:samples/pidfd/.gitignore
-f:samples/pidfd/Makefile
-f:samples/pidfd/pidfd-metadata.c
-f:samples/pktgen/README.rst
-f:samples/pktgen/functions.sh
-f:samples/pktgen/parameters.sh
-f:samples/pktgen/pktgen_bench_xmit_mode_netif_receive.sh
-f:samples/pktgen/pktgen_bench_xmit_mode_queue_xmit.sh
-f:samples/pktgen/pktgen_sample01_simple.sh
-f:samples/pktgen/pktgen_sample02_multiqueue.sh
-f:samples/pktgen/pktgen_sample03_burst_single_flow.sh
-f:samples/pktgen/pktgen_sample04_many_flows.sh
-f:samples/pktgen/pktgen_sample05_flow_per_thread.sh
-f:samples/pktgen/pktgen_sample06_numa_awared_queue_irq_affinity.sh
-f:samples/qmi/Makefile
-f:samples/qmi/qmi_sample_client.c
-f:samples/rpmsg/Makefile
-f:samples/rpmsg/rpmsg_client_sample.c
-f:samples/rust/Kconfig
-f:samples/rust/Makefile
-f:samples/rust/hostprogs/.gitignore
-f:samples/rust/hostprogs/Makefile
-f:samples/rust/hostprogs/a.rs
-f:samples/rust/hostprogs/b.rs
-f:samples/rust/hostprogs/single.rs
-f:samples/rust/rust_configfs.rs
-f:samples/rust/rust_dma.rs
-f:samples/rust/rust_driver_auxiliary.rs
-f:samples/rust/rust_driver_faux.rs
-f:samples/rust/rust_driver_pci.rs
-f:samples/rust/rust_driver_platform.rs
-f:samples/rust/rust_minimal.rs
-f:samples/rust/rust_misc_device.rs
-f:samples/rust/rust_print_events.c
-f:samples/rust/rust_print_main.rs
-f:samples/seccomp/.gitignore
-f:samples/seccomp/Makefile
-f:samples/seccomp/bpf-direct.c
-f:samples/seccomp/bpf-fancy.c
-f:samples/seccomp/bpf-helper.c
-f:samples/seccomp/bpf-helper.h
-f:samples/seccomp/dropper.c
-f:samples/seccomp/user-trap.c
-f:samples/timers/.gitignore
-f:samples/timers/Makefile
-f:samples/timers/hpet_example.c
-f:samples/trace_events/Makefile
-f:samples/trace_events/trace-events-sample.c
-f:samples/trace_events/trace-events-sample.h
-f:samples/trace_events/trace_custom_sched.c
-f:samples/trace_events/trace_custom_sched.h
-f:samples/trace_printk/Makefile
-f:samples/trace_printk/trace-printk.c
-f:samples/tsm-mr/Makefile
-f:samples/tsm-mr/tsm_mr_sample.c
-f:samples/uhid/.gitignore
-f:samples/uhid/Makefile
-f:samples/uhid/uhid-example.c
-f:samples/user_events/Makefile
-f:samples/user_events/example.c
-f:samples/v4l/Makefile
-f:samples/v4l/v4l2-pci-skeleton.c
-f:samples/vfio-mdev/Makefile
-f:samples/vfio-mdev/README.rst
-f:samples/vfio-mdev/mbochs.c
-f:samples/vfio-mdev/mdpy-defs.h
-f:samples/vfio-mdev/mdpy-fb.c
-f:samples/vfio-mdev/mdpy.c
-f:samples/vfio-mdev/mtty.c
-f:samples/vfs/.gitignore
-f:samples/vfs/Makefile
-f:samples/vfs/mountinfo.c
-f:samples/vfs/samples-vfs.h
-f:samples/vfs/test-fsmount.c
-f:samples/vfs/test-list-all-mounts.c
-f:samples/vfs/test-statx.c
-f:samples/watch_queue/.gitignore
-f:samples/watch_queue/Makefile
-f:samples/watch_queue/watch_test.c
-f:samples/watchdog/.gitignore
-f:samples/watchdog/Makefile
-f:samples/watchdog/watchdog-simple.c
-f:scripts/.gitignore
-f:scripts/Kbuild.include
-f:scripts/Kconfig.include
-f:scripts/Lindent
-f:scripts/Makefile
-f:scripts/Makefile.asm-headers
-f:scripts/Makefile.autofdo
-f:scripts/Makefile.btf
-f:scripts/Makefile.build
-f:scripts/Makefile.clang
-f:scripts/Makefile.clean
-f:scripts/Makefile.compiler
-f:scripts/Makefile.debug
-f:scripts/Makefile.defconf
-f:scripts/Makefile.dtbinst
-f:scripts/Makefile.dtbs
-f:scripts/Makefile.extrawarn
-f:scripts/Makefile.gcc-plugins
-f:scripts/Makefile.headersinst
-f:scripts/Makefile.host
-f:scripts/Makefile.kasan
-f:scripts/Makefile.kcov
-f:scripts/Makefile.kcsan
-f:scripts/Makefile.kmsan
-f:scripts/Makefile.kstack_erase
-f:scripts/Makefile.lib
-f:scripts/Makefile.modfinal
-f:scripts/Makefile.modinst
-f:scripts/Makefile.modpost
-f:scripts/Makefile.package
-f:scripts/Makefile.propeller
-f:scripts/Makefile.randstruct
-f:scripts/Makefile.ubsan
-f:scripts/Makefile.userprogs
-f:scripts/Makefile.vdsoinst
-f:scripts/Makefile.vmlinux
-f:scripts/Makefile.vmlinux_o
-f:scripts/as-version.sh
-f:scripts/asn1_compiler.c
-f:scripts/atomic/atomic-tbl.sh
-f:scripts/atomic/atomics.tbl
-f:scripts/atomic/fallbacks/acquire
-f:scripts/atomic/fallbacks/add_negative
-f:scripts/atomic/fallbacks/add_unless
-f:scripts/atomic/fallbacks/andnot
-f:scripts/atomic/fallbacks/cmpxchg
-f:scripts/atomic/fallbacks/dec
-f:scripts/atomic/fallbacks/dec_and_test
-f:scripts/atomic/fallbacks/dec_if_positive
-f:scripts/atomic/fallbacks/dec_unless_positive
-f:scripts/atomic/fallbacks/fence
-f:scripts/atomic/fallbacks/fetch_add_unless
-f:scripts/atomic/fallbacks/inc
-f:scripts/atomic/fallbacks/inc_and_test
-f:scripts/atomic/fallbacks/inc_not_zero
-f:scripts/atomic/fallbacks/inc_unless_negative
-f:scripts/atomic/fallbacks/read_acquire
-f:scripts/atomic/fallbacks/release
-f:scripts/atomic/fallbacks/set_release
-f:scripts/atomic/fallbacks/sub_and_test
-f:scripts/atomic/fallbacks/try_cmpxchg
-f:scripts/atomic/fallbacks/xchg
-f:scripts/atomic/gen-atomic-fallback.sh
-f:scripts/atomic/gen-atomic-instrumented.sh
-f:scripts/atomic/gen-atomic-long.sh
-f:scripts/atomic/gen-atomics.sh
-f:scripts/atomic/kerneldoc/add
-f:scripts/atomic/kerneldoc/add_negative
-f:scripts/atomic/kerneldoc/add_unless
-f:scripts/atomic/kerneldoc/and
-f:scripts/atomic/kerneldoc/andnot
-f:scripts/atomic/kerneldoc/cmpxchg
-f:scripts/atomic/kerneldoc/dec
-f:scripts/atomic/kerneldoc/dec_and_test
-f:scripts/atomic/kerneldoc/dec_if_positive
-f:scripts/atomic/kerneldoc/dec_unless_positive
-f:scripts/atomic/kerneldoc/inc
-f:scripts/atomic/kerneldoc/inc_and_test
-f:scripts/atomic/kerneldoc/inc_not_zero
-f:scripts/atomic/kerneldoc/inc_unless_negative
-f:scripts/atomic/kerneldoc/or
-f:scripts/atomic/kerneldoc/read
-f:scripts/atomic/kerneldoc/set
-f:scripts/atomic/kerneldoc/sub
-f:scripts/atomic/kerneldoc/sub_and_test
-f:scripts/atomic/kerneldoc/try_cmpxchg
-f:scripts/atomic/kerneldoc/xchg
-f:scripts/atomic/kerneldoc/xor
-f:scripts/bash-completion/make
-f:scripts/basic/.gitignore
-f:scripts/basic/Makefile
-f:scripts/basic/fixdep.c
-f:scripts/bloat-o-meter
-f:scripts/bootgraph.pl
-f:scripts/bpf_doc.py
-f:scripts/build-version
-f:scripts/cc-can-link.sh
-f:scripts/cc-version.sh
-f:scripts/check-git
-f:scripts/check-sysctl-docs
-f:scripts/check-uapi.sh
-f:scripts/check-variable-fonts.sh
-f:scripts/check_extable.sh
-f:scripts/checkdeclares.pl
-f:scripts/checkincludes.pl
-f:scripts/checkkconfigsymbols.py
-f:scripts/checkpatch.pl
-f:scripts/checkstack.pl
-f:scripts/checksyscalls.sh
-f:scripts/checktransupdate.py
-f:scripts/checkversion.pl
-f:scripts/clang-tools/gen_compile_commands.py
-f:scripts/clang-tools/run-clang-tools.py
-f:scripts/cleanfile
-f:scripts/cleanpatch
-f:scripts/coccicheck
-f:scripts/coccinelle/api/alloc/alloc_cast.cocci
-f:scripts/coccinelle/api/alloc/pool_zalloc-simple.cocci
-f:scripts/coccinelle/api/alloc/zalloc-simple.cocci
-f:scripts/coccinelle/api/atomic_as_refcounter.cocci
-f:scripts/coccinelle/api/check_bq27xxx_data.cocci
-f:scripts/coccinelle/api/d_find_alias.cocci
-f:scripts/coccinelle/api/device_attr_show.cocci
-f:scripts/coccinelle/api/err_cast.cocci
-f:scripts/coccinelle/api/kfree_mismatch.cocci
-f:scripts/coccinelle/api/kfree_sensitive.cocci
-f:scripts/coccinelle/api/kstrdup.cocci
-f:scripts/coccinelle/api/kvmalloc.cocci
-f:scripts/coccinelle/api/memdup.cocci
-f:scripts/coccinelle/api/memdup_user.cocci
-f:scripts/coccinelle/api/platform_get_irq.cocci
-f:scripts/coccinelle/api/platform_no_drv_owner.cocci
-f:scripts/coccinelle/api/pm_runtime.cocci
-f:scripts/coccinelle/api/resource_size.cocci
-f:scripts/coccinelle/api/simple_open.cocci
-f:scripts/coccinelle/api/stream_open.cocci
-f:scripts/coccinelle/api/string_choices.cocci
-f:scripts/coccinelle/api/vma_pages.cocci
-f:scripts/coccinelle/free/clk_put.cocci
-f:scripts/coccinelle/free/devm_free.cocci
-f:scripts/coccinelle/free/ifnulldev_put.cocci
-f:scripts/coccinelle/free/ifnullfree.cocci
-f:scripts/coccinelle/free/iounmap.cocci
-f:scripts/coccinelle/free/kfree.cocci
-f:scripts/coccinelle/free/kfreeaddr.cocci
-f:scripts/coccinelle/free/pci_free_consistent.cocci
-f:scripts/coccinelle/free/put_device.cocci
-f:scripts/coccinelle/iterators/device_node_continue.cocci
-f:scripts/coccinelle/iterators/for_each_child.cocci
-f:scripts/coccinelle/iterators/itnull.cocci
-f:scripts/coccinelle/iterators/list_entry_update.cocci
-f:scripts/coccinelle/iterators/use_after_iter.cocci
-f:scripts/coccinelle/locks/call_kern.cocci
-f:scripts/coccinelle/locks/double_lock.cocci
-f:scripts/coccinelle/locks/flags.cocci
-f:scripts/coccinelle/locks/mini_lock.cocci
-f:scripts/coccinelle/misc/add_namespace.cocci
-f:scripts/coccinelle/misc/array_size.cocci
-f:scripts/coccinelle/misc/array_size_dup.cocci
-f:scripts/coccinelle/misc/badty.cocci
-f:scripts/coccinelle/misc/boolconv.cocci
-f:scripts/coccinelle/misc/cond_no_effect.cocci
-f:scripts/coccinelle/misc/cstptr.cocci
-f:scripts/coccinelle/misc/do_div.cocci
-f:scripts/coccinelle/misc/doubleinit.cocci
-f:scripts/coccinelle/misc/excluded_middle.cocci
-f:scripts/coccinelle/misc/flexible_array.cocci
-f:scripts/coccinelle/misc/ifcol.cocci
-f:scripts/coccinelle/misc/irqf_oneshot.cocci
-f:scripts/coccinelle/misc/minmax.cocci
-f:scripts/coccinelle/misc/newline_in_nl_msg.cocci
-f:scripts/coccinelle/misc/noderef.cocci
-f:scripts/coccinelle/misc/of_table.cocci
-f:scripts/coccinelle/misc/orplus.cocci
-f:scripts/coccinelle/misc/returnvar.cocci
-f:scripts/coccinelle/misc/secs_to_jiffies.cocci
-f:scripts/coccinelle/misc/semicolon.cocci
-f:scripts/coccinelle/misc/struct_size.cocci
-f:scripts/coccinelle/misc/swap.cocci
-f:scripts/coccinelle/misc/test_addr.cocci
-f:scripts/coccinelle/misc/uninitialized_var.cocci
-f:scripts/coccinelle/misc/warn.cocci
-f:scripts/coccinelle/null/badzero.cocci
-f:scripts/coccinelle/null/deref_null.cocci
-f:scripts/coccinelle/null/eno.cocci
-f:scripts/coccinelle/null/kmerr.cocci
-f:scripts/coccinelle/tests/doublebitand.cocci
-f:scripts/coccinelle/tests/doubletest.cocci
-f:scripts/coccinelle/tests/odd_ptr_err.cocci
-f:scripts/coccinelle/tests/unsigned_lesser_than_zero.cocci
-f:scripts/config
-f:scripts/const_structs.checkpatch
-f:scripts/crypto/gen-hash-testvecs.py
-f:scripts/decode_stacktrace.sh
-f:scripts/decodecode
-f:scripts/depmod.sh
-f:scripts/dev-needs.sh
-f:scripts/diffconfig
-f:scripts/documentation-file-ref-check
-f:scripts/dtc/.gitignore
-f:scripts/dtc/Makefile
-f:scripts/dtc/checks.c
-f:scripts/dtc/data.c
-f:scripts/dtc/dt-extract-compatibles
-f:scripts/dtc/dt_to_config
-f:scripts/dtc/dtc-lexer.l
-f:scripts/dtc/dtc-parser.y
-f:scripts/dtc/dtc.c
-f:scripts/dtc/dtc.h
-f:scripts/dtc/dtx_diff
-f:scripts/dtc/fdtget.c
-f:scripts/dtc/fdtoverlay.c
-f:scripts/dtc/fdtput.c
-f:scripts/dtc/flattree.c
-f:scripts/dtc/fstree.c
-f:scripts/dtc/libfdt/fdt.c
-f:scripts/dtc/libfdt/fdt.h
-f:scripts/dtc/libfdt/fdt_addresses.c
-f:scripts/dtc/libfdt/fdt_empty_tree.c
-f:scripts/dtc/libfdt/fdt_overlay.c
-f:scripts/dtc/libfdt/fdt_ro.c
-f:scripts/dtc/libfdt/fdt_rw.c
-f:scripts/dtc/libfdt/fdt_strerror.c
-f:scripts/dtc/libfdt/fdt_sw.c
-f:scripts/dtc/libfdt/fdt_wip.c
-f:scripts/dtc/libfdt/libfdt.h
-f:scripts/dtc/libfdt/libfdt_env.h
-f:scripts/dtc/libfdt/libfdt_internal.h
-f:scripts/dtc/livetree.c
-f:scripts/dtc/of_unittest_expect
-f:scripts/dtc/srcpos.c
-f:scripts/dtc/srcpos.h
-f:scripts/dtc/treesource.c
-f:scripts/dtc/update-dtc-source.sh
-f:scripts/dtc/util.c
-f:scripts/dtc/util.h
-f:scripts/dtc/version_gen.h
-f:scripts/dtc/yamltree.c
-f:scripts/dummy-tools/dummy-plugin-dir/include/plugin-version.h
-f:scripts/dummy-tools/gcc
-f:scripts/dummy-tools/ld
-f:scripts/dummy-tools/pahole
-f:scripts/extract-fwblobs
-f:scripts/extract-ikconfig
-f:scripts/extract-module-sig.pl
-f:scripts/extract-sys-certs.pl
-f:scripts/extract-vmlinux
-f:scripts/extract_xc3028.pl
-f:scripts/faddr2line
-f:scripts/file-size.sh
-f:scripts/find-unused-docs.sh
-f:scripts/gcc-plugins/.gitignore
-f:scripts/gcc-plugins/Kconfig
-f:scripts/gcc-plugins/Makefile
-f:scripts/gcc-plugins/gcc-common.h
-f:scripts/gcc-plugins/gcc-generate-gimple-pass.h
-f:scripts/gcc-plugins/gcc-generate-ipa-pass.h
-f:scripts/gcc-plugins/gcc-generate-rtl-pass.h
-f:scripts/gcc-plugins/gcc-generate-simple_ipa-pass.h
-f:scripts/gcc-plugins/latent_entropy_plugin.c
-f:scripts/gcc-plugins/randomize_layout_plugin.c
-f:scripts/gcc-plugins/stackleak_plugin.c
-f:scripts/gdb/Makefile
-f:scripts/gdb/linux/.gitignore
-f:scripts/gdb/linux/Makefile
-f:scripts/gdb/linux/__init__.py
-f:scripts/gdb/linux/clk.py
-f:scripts/gdb/linux/config.py
-f:scripts/gdb/linux/constants.py.in
-f:scripts/gdb/linux/cpus.py
-f:scripts/gdb/linux/device.py
-f:scripts/gdb/linux/dmesg.py
-f:scripts/gdb/linux/genpd.py
-f:scripts/gdb/linux/interrupts.py
-f:scripts/gdb/linux/kasan.py
-f:scripts/gdb/linux/lists.py
-f:scripts/gdb/linux/mapletree.py
-f:scripts/gdb/linux/mm.py
-f:scripts/gdb/linux/modules.py
-f:scripts/gdb/linux/page_owner.py
-f:scripts/gdb/linux/pgtable.py
-f:scripts/gdb/linux/proc.py
-f:scripts/gdb/linux/radixtree.py
-f:scripts/gdb/linux/rbtree.py
-f:scripts/gdb/linux/slab.py
-f:scripts/gdb/linux/stackdepot.py
-f:scripts/gdb/linux/symbols.py
-f:scripts/gdb/linux/tasks.py
-f:scripts/gdb/linux/timerlist.py
-f:scripts/gdb/linux/utils.py
-f:scripts/gdb/linux/vfs.py
-f:scripts/gdb/linux/vmalloc.py
-f:scripts/gdb/linux/xarray.py
-f:scripts/gdb/vmlinux-gdb.py
-f:scripts/gen-crc-consts.py
-f:scripts/gen-randstruct-seed.sh
-f:scripts/gen_packed_field_checks.c
-f:scripts/gendwarfksyms/.gitignore
-f:scripts/gendwarfksyms/Makefile
-f:scripts/gendwarfksyms/cache.c
-f:scripts/gendwarfksyms/die.c
-f:scripts/gendwarfksyms/dwarf.c
-f:scripts/gendwarfksyms/examples/kabi.h
-f:scripts/gendwarfksyms/examples/kabi_ex.c
-f:scripts/gendwarfksyms/examples/kabi_ex.h
-f:scripts/gendwarfksyms/examples/symbolptr.c
-f:scripts/gendwarfksyms/gendwarfksyms.c
-f:scripts/gendwarfksyms/gendwarfksyms.h
-f:scripts/gendwarfksyms/kabi.c
-f:scripts/gendwarfksyms/symbols.c
-f:scripts/gendwarfksyms/types.c
-f:scripts/generate_builtin_ranges.awk
-f:scripts/generate_initcall_order.pl
-f:scripts/generate_rust_analyzer.py
-f:scripts/generate_rust_target.rs
-f:scripts/genksyms/.gitignore
-f:scripts/genksyms/Makefile
-f:scripts/genksyms/genksyms.c
-f:scripts/genksyms/genksyms.h
-f:scripts/genksyms/keywords.c
-f:scripts/genksyms/lex.l
-f:scripts/genksyms/parse.y
-f:scripts/get_abi.py
-f:scripts/get_dvb_firmware
-f:scripts/get_feat.pl
-f:scripts/get_maintainer.pl
-f:scripts/gfp-translate
-f:scripts/git-resolve.sh
-f:scripts/git.orderFile
-f:scripts/head-object-list.txt
-f:scripts/headerdep.pl
-f:scripts/headers_install.sh
-f:scripts/include/array_size.h
-f:scripts/include/hash.h
-f:scripts/include/hashtable.h
-f:scripts/include/list.h
-f:scripts/include/list_types.h
-f:scripts/include/xalloc.h
-f:scripts/insert-sys-cert.c
-f:scripts/install.sh
-f:scripts/integer-wrap-ignore.scl
-f:scripts/ipe/Makefile
-f:scripts/ipe/polgen/.gitignore
-f:scripts/ipe/polgen/Makefile
-f:scripts/ipe/polgen/polgen.c
-f:scripts/jobserver-exec
-f:scripts/kallsyms.c
-f:scripts/kconfig/.gitignore
-f:scripts/kconfig/Makefile
-f:scripts/kconfig/conf.c
-f:scripts/kconfig/confdata.c
-f:scripts/kconfig/expr.c
-f:scripts/kconfig/expr.h
-f:scripts/kconfig/gconf-cfg.sh
-f:scripts/kconfig/gconf.c
-f:scripts/kconfig/gconf.glade
-f:scripts/kconfig/images.c
-f:scripts/kconfig/images.h
-f:scripts/kconfig/internal.h
-f:scripts/kconfig/lexer.l
-f:scripts/kconfig/lkc.h
-f:scripts/kconfig/lkc_proto.h
-f:scripts/kconfig/lxdialog/BIG.FAT.WARNING
-f:scripts/kconfig/lxdialog/checklist.c
-f:scripts/kconfig/lxdialog/dialog.h
-f:scripts/kconfig/lxdialog/inputbox.c
-f:scripts/kconfig/lxdialog/menubox.c
-f:scripts/kconfig/lxdialog/textbox.c
-f:scripts/kconfig/lxdialog/util.c
-f:scripts/kconfig/lxdialog/yesno.c
-f:scripts/kconfig/mconf-cfg.sh
-f:scripts/kconfig/mconf.c
-f:scripts/kconfig/menu.c
-f:scripts/kconfig/merge_config.sh
-f:scripts/kconfig/mnconf-common.c
-f:scripts/kconfig/mnconf-common.h
-f:scripts/kconfig/nconf-cfg.sh
-f:scripts/kconfig/nconf.c
-f:scripts/kconfig/nconf.gui.c
-f:scripts/kconfig/nconf.h
-f:scripts/kconfig/parser.y
-f:scripts/kconfig/preprocess.c
-f:scripts/kconfig/preprocess.h
-f:scripts/kconfig/qconf-cfg.sh
-f:scripts/kconfig/qconf.cc
-f:scripts/kconfig/qconf.h
-f:scripts/kconfig/streamline_config.pl
-f:scripts/kconfig/symbol.c
-f:scripts/kconfig/tests/auto_submenu/Kconfig
-f:scripts/kconfig/tests/auto_submenu/__init__.py
-f:scripts/kconfig/tests/auto_submenu/expected_stdout
-f:scripts/kconfig/tests/choice/Kconfig
-f:scripts/kconfig/tests/choice/__init__.py
-f:scripts/kconfig/tests/choice/alldef_expected_config
-f:scripts/kconfig/tests/choice/allmod_expected_config
-f:scripts/kconfig/tests/choice/allno_expected_config
-f:scripts/kconfig/tests/choice/allyes_expected_config
-f:scripts/kconfig/tests/choice/oldask0_expected_stdout
-f:scripts/kconfig/tests/choice_randomize/Kconfig
-f:scripts/kconfig/tests/choice_randomize/__init__.py
-f:scripts/kconfig/tests/choice_randomize/expected_config0
-f:scripts/kconfig/tests/choice_randomize/expected_config1
-f:scripts/kconfig/tests/choice_randomize/expected_config2
-f:scripts/kconfig/tests/choice_randomize2/Kconfig
-f:scripts/kconfig/tests/choice_randomize2/__init__.py
-f:scripts/kconfig/tests/choice_randomize2/expected_config0
-f:scripts/kconfig/tests/choice_randomize2/expected_config1
-f:scripts/kconfig/tests/choice_randomize2/expected_config2
-f:scripts/kconfig/tests/conftest.py
-f:scripts/kconfig/tests/err_recursive_dep/Kconfig
-f:scripts/kconfig/tests/err_recursive_dep/__init__.py
-f:scripts/kconfig/tests/err_recursive_dep/expected_stderr
-f:scripts/kconfig/tests/err_recursive_inc/Kconfig
-f:scripts/kconfig/tests/err_recursive_inc/Kconfig.inc1
-f:scripts/kconfig/tests/err_recursive_inc/Kconfig.inc2
-f:scripts/kconfig/tests/err_recursive_inc/Kconfig.inc3
-f:scripts/kconfig/tests/err_recursive_inc/__init__.py
-f:scripts/kconfig/tests/err_recursive_inc/expected_stderr
-f:scripts/kconfig/tests/new_choice_with_dep/Kconfig
-f:scripts/kconfig/tests/new_choice_with_dep/__init__.py
-f:scripts/kconfig/tests/new_choice_with_dep/config
-f:scripts/kconfig/tests/new_choice_with_dep/expected_stdout
-f:scripts/kconfig/tests/no_write_if_dep_unmet/Kconfig
-f:scripts/kconfig/tests/no_write_if_dep_unmet/__init__.py
-f:scripts/kconfig/tests/no_write_if_dep_unmet/config
-f:scripts/kconfig/tests/no_write_if_dep_unmet/expected_config
-f:scripts/kconfig/tests/preprocess/builtin_func/Kconfig
-f:scripts/kconfig/tests/preprocess/builtin_func/__init__.py
-f:scripts/kconfig/tests/preprocess/builtin_func/expected_stderr
-f:scripts/kconfig/tests/preprocess/builtin_func/expected_stdout
-f:scripts/kconfig/tests/preprocess/circular_expansion/Kconfig
-f:scripts/kconfig/tests/preprocess/circular_expansion/__init__.py
-f:scripts/kconfig/tests/preprocess/circular_expansion/expected_stderr
-f:scripts/kconfig/tests/preprocess/escape/Kconfig
-f:scripts/kconfig/tests/preprocess/escape/__init__.py
-f:scripts/kconfig/tests/preprocess/escape/expected_stderr
-f:scripts/kconfig/tests/preprocess/variable/Kconfig
-f:scripts/kconfig/tests/preprocess/variable/__init__.py
-f:scripts/kconfig/tests/preprocess/variable/expected_stderr
-f:scripts/kconfig/tests/pytest.ini
-f:scripts/kconfig/util.c
-f:scripts/kernel-doc.pl
-f:scripts/kernel-doc.py
-f:scripts/ksymoops/README
-f:scripts/ld-version.sh
-f:scripts/leaking_addresses.pl
-f:scripts/lib/abi/abi_parser.py
-f:scripts/lib/abi/abi_regex.py
-f:scripts/lib/abi/helpers.py
-f:scripts/lib/abi/system_symbols.py
-f:scripts/lib/kdoc/kdoc_files.py
-f:scripts/lib/kdoc/kdoc_item.py
-f:scripts/lib/kdoc/kdoc_output.py
-f:scripts/lib/kdoc/kdoc_parser.py
-f:scripts/lib/kdoc/kdoc_re.py
-f:scripts/link-vmlinux.sh
-f:scripts/macro_checker.py
-f:scripts/make_fit.py
-f:scripts/makelst
-f:scripts/markup_oops.pl
-f:scripts/min-tool-version.sh
-f:scripts/misc-check
-f:scripts/mkcompile_h
-f:scripts/mksysmap
-f:scripts/mkuboot.sh
-f:scripts/mod/.gitignore
-f:scripts/mod/Makefile
-f:scripts/mod/devicetable-offsets.c
-f:scripts/mod/empty.c
-f:scripts/mod/file2alias.c
-f:scripts/mod/mk_elfconfig.c
-f:scripts/mod/modpost.c
-f:scripts/mod/modpost.h
-f:scripts/mod/sumversion.c
-f:scripts/mod/symsearch.c
-f:scripts/module-common.c
-f:scripts/module.lds.S
-f:scripts/modules-check.sh
-f:scripts/nsdeps
-f:scripts/objdiff
-f:scripts/objdump-func
-f:scripts/orc_hash.sh
-f:scripts/package/PKGBUILD
-f:scripts/package/builddeb
-f:scripts/package/buildtar
-f:scripts/package/debian/copyright
-f:scripts/package/debian/rules
-f:scripts/package/gen-diff-patch
-f:scripts/package/install-extmod-build
-f:scripts/package/kernel.spec
-f:scripts/package/mkdebian
-f:scripts/package/mkspec
-f:scripts/package/snapcraft.template
-f:scripts/pahole-version.sh
-f:scripts/parse-maintainers.pl
-f:scripts/patch-kernel
-f:scripts/profile2linkerlist.pl
-f:scripts/prune-kernel
-f:scripts/recordmcount.c
-f:scripts/recordmcount.h
-f:scripts/recordmcount.pl
-f:scripts/relocs_check.sh
-f:scripts/remove-stale-files
-f:scripts/rust_is_available.sh
-f:scripts/rust_is_available_bindgen_0_66.h
-f:scripts/rust_is_available_bindgen_libclang.h
-f:scripts/rust_is_available_bindgen_libclang_concat.h
-f:scripts/rust_is_available_test.py
-f:scripts/rustc-llvm-version.sh
-f:scripts/rustc-version.sh
-f:scripts/rustdoc_test_builder.rs
-f:scripts/rustdoc_test_gen.rs
-f:scripts/selinux/Makefile
-f:scripts/selinux/README
-f:scripts/selinux/install_policy.sh
-f:scripts/selinux/mdp/.gitignore
-f:scripts/selinux/mdp/Makefile
-f:scripts/selinux/mdp/dbus_contexts
-f:scripts/selinux/mdp/mdp.c
-f:scripts/setlocalversion
-f:scripts/show_delta
-f:scripts/sign-file.c
-f:scripts/sorttable.c
-f:scripts/spdxcheck-test.sh
-f:scripts/spdxcheck.py
-f:scripts/spdxexclude
-f:scripts/spelling.txt
-f:scripts/sphinx-pre-install
-f:scripts/split-man.pl
-f:scripts/ssl-common.h
-f:scripts/stackdelta
-f:scripts/stackusage
-f:scripts/subarch.include
-f:scripts/syscall.tbl
-f:scripts/syscallhdr.sh
-f:scripts/syscallnr.sh
-f:scripts/syscalltbl.sh
-f:scripts/tags.sh
-f:scripts/test_doc_build.py
-f:scripts/tools-support-relr.sh
-f:scripts/tracing/ftrace-bisect.sh
-f:scripts/unifdef.c
-f:scripts/ver_linux
-f:scripts/verify_builtin_ranges.awk
-f:scripts/xen-hypercalls.sh
-f:scripts/xz_wrap.sh
-f:security/Kconfig
-f:security/Kconfig.hardening
-f:security/Makefile
-f:security/apparmor/.gitignore
-f:security/apparmor/Kconfig
-f:security/apparmor/Makefile
-f:security/apparmor/apparmorfs.c
-f:security/apparmor/audit.c
-f:security/apparmor/capability.c
-f:security/apparmor/crypto.c
-f:security/apparmor/domain.c
-f:security/apparmor/file.c
-f:security/apparmor/include/apparmor.h
-f:security/apparmor/include/apparmorfs.h
-f:security/apparmor/include/audit.h
-f:security/apparmor/include/capability.h
-f:security/apparmor/include/cred.h
-f:security/apparmor/include/crypto.h
-f:security/apparmor/include/domain.h
-f:security/apparmor/include/file.h
-f:security/apparmor/include/ipc.h
-f:security/apparmor/include/label.h
-f:security/apparmor/include/lib.h
-f:security/apparmor/include/match.h
-f:security/apparmor/include/mount.h
-f:security/apparmor/include/net.h
-f:security/apparmor/include/path.h
-f:security/apparmor/include/perms.h
-f:security/apparmor/include/policy.h
-f:security/apparmor/include/policy_compat.h
-f:security/apparmor/include/policy_ns.h
-f:security/apparmor/include/policy_unpack.h
-f:security/apparmor/include/procattr.h
-f:security/apparmor/include/resource.h
-f:security/apparmor/include/secid.h
-f:security/apparmor/include/sig_names.h
-f:security/apparmor/include/task.h
-f:security/apparmor/ipc.c
-f:security/apparmor/label.c
-f:security/apparmor/lib.c
-f:security/apparmor/lsm.c
-f:security/apparmor/match.c
-f:security/apparmor/mount.c
-f:security/apparmor/net.c
-f:security/apparmor/nulldfa.in
-f:security/apparmor/path.c
-f:security/apparmor/policy.c
-f:security/apparmor/policy_compat.c
-f:security/apparmor/policy_ns.c
-f:security/apparmor/policy_unpack.c
-f:security/apparmor/policy_unpack_test.c
-f:security/apparmor/procattr.c
-f:security/apparmor/resource.c
-f:security/apparmor/secid.c
-f:security/apparmor/stacksplitdfa.in
-f:security/apparmor/task.c
-f:security/bpf/Makefile
-f:security/bpf/hooks.c
-f:security/commoncap.c
-f:security/device_cgroup.c
-f:security/inode.c
-f:security/integrity/Kconfig
-f:security/integrity/Makefile
-f:security/integrity/digsig.c
-f:security/integrity/digsig_asymmetric.c
-f:security/integrity/evm/Kconfig
-f:security/integrity/evm/Makefile
-f:security/integrity/evm/evm.h
-f:security/integrity/evm/evm_crypto.c
-f:security/integrity/evm/evm_main.c
-f:security/integrity/evm/evm_posix_acl.c
-f:security/integrity/evm/evm_secfs.c
-f:security/integrity/iint.c
-f:security/integrity/ima/Kconfig
-f:security/integrity/ima/Makefile
-f:security/integrity/ima/ima.h
-f:security/integrity/ima/ima_api.c
-f:security/integrity/ima/ima_appraise.c
-f:security/integrity/ima/ima_asymmetric_keys.c
-f:security/integrity/ima/ima_crypto.c
-f:security/integrity/ima/ima_efi.c
-f:security/integrity/ima/ima_fs.c
-f:security/integrity/ima/ima_iint.c
-f:security/integrity/ima/ima_init.c
-f:security/integrity/ima/ima_kexec.c
-f:security/integrity/ima/ima_main.c
-f:security/integrity/ima/ima_modsig.c
-f:security/integrity/ima/ima_mok.c
-f:security/integrity/ima/ima_policy.c
-f:security/integrity/ima/ima_queue.c
-f:security/integrity/ima/ima_queue_keys.c
-f:security/integrity/ima/ima_template.c
-f:security/integrity/ima/ima_template_lib.c
-f:security/integrity/ima/ima_template_lib.h
-f:security/integrity/integrity.h
-f:security/integrity/integrity_audit.c
-f:security/integrity/platform_certs/efi_parser.c
-f:security/integrity/platform_certs/keyring_handler.c
-f:security/integrity/platform_certs/keyring_handler.h
-f:security/integrity/platform_certs/load_ipl_s390.c
-f:security/integrity/platform_certs/load_powerpc.c
-f:security/integrity/platform_certs/load_uefi.c
-f:security/integrity/platform_certs/machine_keyring.c
-f:security/integrity/platform_certs/platform_keyring.c
-f:security/ipe/.gitignore
-f:security/ipe/Kconfig
-f:security/ipe/Makefile
-f:security/ipe/audit.c
-f:security/ipe/audit.h
-f:security/ipe/digest.c
-f:security/ipe/digest.h
-f:security/ipe/eval.c
-f:security/ipe/eval.h
-f:security/ipe/fs.c
-f:security/ipe/fs.h
-f:security/ipe/hooks.c
-f:security/ipe/hooks.h
-f:security/ipe/ipe.c
-f:security/ipe/ipe.h
-f:security/ipe/policy.c
-f:security/ipe/policy.h
-f:security/ipe/policy_fs.c
-f:security/ipe/policy_parser.c
-f:security/ipe/policy_parser.h
-f:security/ipe/policy_tests.c
-f:security/keys/Kconfig
-f:security/keys/Makefile
-f:security/keys/big_key.c
-f:security/keys/compat.c
-f:security/keys/compat_dh.c
-f:security/keys/dh.c
-f:security/keys/encrypted-keys/Makefile
-f:security/keys/encrypted-keys/ecryptfs_format.c
-f:security/keys/encrypted-keys/ecryptfs_format.h
-f:security/keys/encrypted-keys/encrypted.c
-f:security/keys/encrypted-keys/encrypted.h
-f:security/keys/encrypted-keys/masterkey_trusted.c
-f:security/keys/gc.c
-f:security/keys/internal.h
-f:security/keys/key.c
-f:security/keys/keyctl.c
-f:security/keys/keyctl_pkey.c
-f:security/keys/keyring.c
-f:security/keys/permission.c
-f:security/keys/persistent.c
-f:security/keys/proc.c
-f:security/keys/process_keys.c
-f:security/keys/request_key.c
-f:security/keys/request_key_auth.c
-f:security/keys/sysctl.c
-f:security/keys/trusted-keys/Kconfig
-f:security/keys/trusted-keys/Makefile
-f:security/keys/trusted-keys/tpm2key.asn1
-f:security/keys/trusted-keys/trusted_caam.c
-f:security/keys/trusted-keys/trusted_core.c
-f:security/keys/trusted-keys/trusted_dcp.c
-f:security/keys/trusted-keys/trusted_tee.c
-f:security/keys/trusted-keys/trusted_tpm1.c
-f:security/keys/trusted-keys/trusted_tpm2.c
-f:security/keys/user_defined.c
-f:security/landlock/.kunitconfig
-f:security/landlock/Kconfig
-f:security/landlock/Makefile
-f:security/landlock/access.h
-f:security/landlock/audit.c
-f:security/landlock/audit.h
-f:security/landlock/common.h
-f:security/landlock/cred.c
-f:security/landlock/cred.h
-f:security/landlock/domain.c
-f:security/landlock/domain.h
-f:security/landlock/errata.h
-f:security/landlock/errata/abi-4.h
-f:security/landlock/errata/abi-6.h
-f:security/landlock/fs.c
-f:security/landlock/fs.h
-f:security/landlock/id.c
-f:security/landlock/id.h
-f:security/landlock/limits.h
-f:security/landlock/net.c
-f:security/landlock/net.h
-f:security/landlock/object.c
-f:security/landlock/object.h
-f:security/landlock/ruleset.c
-f:security/landlock/ruleset.h
-f:security/landlock/setup.c
-f:security/landlock/setup.h
-f:security/landlock/syscalls.c
-f:security/landlock/task.c
-f:security/landlock/task.h
-f:security/loadpin/Kconfig
-f:security/loadpin/Makefile
-f:security/loadpin/loadpin.c
-f:security/lockdown/Kconfig
-f:security/lockdown/Makefile
-f:security/lockdown/lockdown.c
-f:security/lsm_audit.c
-f:security/lsm_syscalls.c
-f:security/min_addr.c
-f:security/safesetid/Kconfig
-f:security/safesetid/Makefile
-f:security/safesetid/lsm.c
-f:security/safesetid/lsm.h
-f:security/safesetid/securityfs.c
-f:security/security.c
-f:security/selinux/.gitignore
-f:security/selinux/Kconfig
-f:security/selinux/Makefile
-f:security/selinux/avc.c
-f:security/selinux/genheaders.c
-f:security/selinux/hooks.c
-f:security/selinux/ibpkey.c
-f:security/selinux/ima.c
-f:security/selinux/include/audit.h
-f:security/selinux/include/avc.h
-f:security/selinux/include/avc_ss.h
-f:security/selinux/include/classmap.h
-f:security/selinux/include/conditional.h
-f:security/selinux/include/ibpkey.h
-f:security/selinux/include/ima.h
-f:security/selinux/include/initial_sid_to_string.h
-f:security/selinux/include/netif.h
-f:security/selinux/include/netlabel.h
-f:security/selinux/include/netnode.h
-f:security/selinux/include/netport.h
-f:security/selinux/include/objsec.h
-f:security/selinux/include/policycap.h
-f:security/selinux/include/policycap_names.h
-f:security/selinux/include/security.h
-f:security/selinux/include/xfrm.h
-f:security/selinux/netif.c
-f:security/selinux/netlabel.c
-f:security/selinux/netlink.c
-f:security/selinux/netnode.c
-f:security/selinux/netport.c
-f:security/selinux/nlmsgtab.c
-f:security/selinux/selinuxfs.c
-f:security/selinux/ss/avtab.c
-f:security/selinux/ss/avtab.h
-f:security/selinux/ss/conditional.c
-f:security/selinux/ss/conditional.h
-f:security/selinux/ss/constraint.h
-f:security/selinux/ss/context.c
-f:security/selinux/ss/context.h
-f:security/selinux/ss/ebitmap.c
-f:security/selinux/ss/ebitmap.h
-f:security/selinux/ss/hashtab.c
-f:security/selinux/ss/hashtab.h
-f:security/selinux/ss/mls.c
-f:security/selinux/ss/mls.h
-f:security/selinux/ss/mls_types.h
-f:security/selinux/ss/policydb.c
-f:security/selinux/ss/policydb.h
-f:security/selinux/ss/services.c
-f:security/selinux/ss/services.h
-f:security/selinux/ss/sidtab.c
-f:security/selinux/ss/sidtab.h
-f:security/selinux/ss/symtab.c
-f:security/selinux/ss/symtab.h
-f:security/selinux/status.c
-f:security/selinux/xfrm.c
-f:security/smack/Kconfig
-f:security/smack/Makefile
-f:security/smack/smack.h
-f:security/smack/smack_access.c
-f:security/smack/smack_lsm.c
-f:security/smack/smack_netfilter.c
-f:security/smack/smackfs.c
-f:security/tomoyo/.gitignore
-f:security/tomoyo/Kconfig
-f:security/tomoyo/Makefile
-f:security/tomoyo/audit.c
-f:security/tomoyo/common.c
-f:security/tomoyo/common.h
-f:security/tomoyo/condition.c
-f:security/tomoyo/domain.c
-f:security/tomoyo/environ.c
-f:security/tomoyo/file.c
-f:security/tomoyo/gc.c
-f:security/tomoyo/group.c
-f:security/tomoyo/load_policy.c
-f:security/tomoyo/memory.c
-f:security/tomoyo/mount.c
-f:security/tomoyo/network.c
-f:security/tomoyo/policy/exception_policy.conf.default
-f:security/tomoyo/realpath.c
-f:security/tomoyo/securityfs_if.c
-f:security/tomoyo/tomoyo.c
-f:security/tomoyo/util.c
-f:security/yama/Kconfig
-f:security/yama/Makefile
-f:security/yama/yama_lsm.c
-f:sound/Kconfig
-f:sound/Makefile
-f:sound/ac97/Kconfig
-f:sound/ac97/Makefile
-f:sound/ac97/ac97_core.h
-f:sound/ac97/bus.c
-f:sound/ac97/codec.c
-f:sound/ac97/snd_ac97_compat.c
-f:sound/ac97_bus.c
-f:sound/aoa/Kconfig
-f:sound/aoa/Makefile
-f:sound/aoa/aoa-gpio.h
-f:sound/aoa/aoa.h
-f:sound/aoa/codecs/Kconfig
-f:sound/aoa/codecs/Makefile
-f:sound/aoa/codecs/onyx.c
-f:sound/aoa/codecs/onyx.h
-f:sound/aoa/codecs/tas-basstreble.h
-f:sound/aoa/codecs/tas-gain-table.h
-f:sound/aoa/codecs/tas.c
-f:sound/aoa/codecs/tas.h
-f:sound/aoa/codecs/toonie.c
-f:sound/aoa/core/Makefile
-f:sound/aoa/core/alsa.c
-f:sound/aoa/core/alsa.h
-f:sound/aoa/core/core.c
-f:sound/aoa/core/gpio-feature.c
-f:sound/aoa/core/gpio-pmf.c
-f:sound/aoa/fabrics/Kconfig
-f:sound/aoa/fabrics/Makefile
-f:sound/aoa/fabrics/layout.c
-f:sound/aoa/soundbus/Kconfig
-f:sound/aoa/soundbus/Makefile
-f:sound/aoa/soundbus/core.c
-f:sound/aoa/soundbus/i2sbus/Makefile
-f:sound/aoa/soundbus/i2sbus/control.c
-f:sound/aoa/soundbus/i2sbus/core.c
-f:sound/aoa/soundbus/i2sbus/i2sbus.h
-f:sound/aoa/soundbus/i2sbus/interface.h
-f:sound/aoa/soundbus/i2sbus/pcm.c
-f:sound/aoa/soundbus/soundbus.h
-f:sound/aoa/soundbus/sysfs.c
-f:sound/arm/Kconfig
-f:sound/arm/Makefile
-f:sound/arm/aaci.c
-f:sound/arm/aaci.h
-f:sound/arm/pxa2xx-ac97-lib.c
-f:sound/arm/pxa2xx-ac97-regs.h
-f:sound/arm/pxa2xx-ac97.c
-f:sound/arm/pxa2xx-pcm-lib.c
-f:sound/atmel/Kconfig
-f:sound/atmel/Makefile
-f:sound/atmel/ac97c.c
-f:sound/atmel/ac97c.h
-f:sound/core/.kunitconfig
-f:sound/core/Kconfig
-f:sound/core/Makefile
-f:sound/core/compress_offload.c
-f:sound/core/control.c
-f:sound/core/control_compat.c
-f:sound/core/control_led.c
-f:sound/core/ctljack.c
-f:sound/core/device.c
-f:sound/core/hrtimer.c
-f:sound/core/hwdep.c
-f:sound/core/hwdep_compat.c
-f:sound/core/info.c
-f:sound/core/info_oss.c
-f:sound/core/init.c
-f:sound/core/isadma.c
-f:sound/core/jack.c
-f:sound/core/memalloc.c
-f:sound/core/memory.c
-f:sound/core/misc.c
-f:sound/core/oss/Makefile
-f:sound/core/oss/copy.c
-f:sound/core/oss/io.c
-f:sound/core/oss/linear.c
-f:sound/core/oss/mixer_oss.c
-f:sound/core/oss/mulaw.c
-f:sound/core/oss/pcm_oss.c
-f:sound/core/oss/pcm_plugin.c
-f:sound/core/oss/pcm_plugin.h
-f:sound/core/oss/rate.c
-f:sound/core/oss/route.c
-f:sound/core/pcm.c
-f:sound/core/pcm_compat.c
-f:sound/core/pcm_dmaengine.c
-f:sound/core/pcm_drm_eld.c
-f:sound/core/pcm_iec958.c
-f:sound/core/pcm_lib.c
-f:sound/core/pcm_local.h
-f:sound/core/pcm_memory.c
-f:sound/core/pcm_misc.c
-f:sound/core/pcm_native.c
-f:sound/core/pcm_param_trace.h
-f:sound/core/pcm_timer.c
-f:sound/core/pcm_trace.h
-f:sound/core/rawmidi.c
-f:sound/core/rawmidi_compat.c
-f:sound/core/seq/Kconfig
-f:sound/core/seq/Makefile
-f:sound/core/seq/oss/Makefile
-f:sound/core/seq/oss/seq_oss.c
-f:sound/core/seq/oss/seq_oss_device.h
-f:sound/core/seq/oss/seq_oss_event.c
-f:sound/core/seq/oss/seq_oss_event.h
-f:sound/core/seq/oss/seq_oss_init.c
-f:sound/core/seq/oss/seq_oss_ioctl.c
-f:sound/core/seq/oss/seq_oss_midi.c
-f:sound/core/seq/oss/seq_oss_midi.h
-f:sound/core/seq/oss/seq_oss_readq.c
-f:sound/core/seq/oss/seq_oss_readq.h
-f:sound/core/seq/oss/seq_oss_rw.c
-f:sound/core/seq/oss/seq_oss_synth.c
-f:sound/core/seq/oss/seq_oss_synth.h
-f:sound/core/seq/oss/seq_oss_timer.c
-f:sound/core/seq/oss/seq_oss_timer.h
-f:sound/core/seq/oss/seq_oss_writeq.c
-f:sound/core/seq/oss/seq_oss_writeq.h
-f:sound/core/seq/seq.c
-f:sound/core/seq/seq_clientmgr.c
-f:sound/core/seq/seq_clientmgr.h
-f:sound/core/seq/seq_compat.c
-f:sound/core/seq/seq_dummy.c
-f:sound/core/seq/seq_fifo.c
-f:sound/core/seq/seq_fifo.h
-f:sound/core/seq/seq_info.c
-f:sound/core/seq/seq_info.h
-f:sound/core/seq/seq_lock.c
-f:sound/core/seq/seq_lock.h
-f:sound/core/seq/seq_memory.c
-f:sound/core/seq/seq_memory.h
-f:sound/core/seq/seq_midi.c
-f:sound/core/seq/seq_midi_emul.c
-f:sound/core/seq/seq_midi_event.c
-f:sound/core/seq/seq_ports.c
-f:sound/core/seq/seq_ports.h
-f:sound/core/seq/seq_prioq.c
-f:sound/core/seq/seq_prioq.h
-f:sound/core/seq/seq_queue.c
-f:sound/core/seq/seq_queue.h
-f:sound/core/seq/seq_system.c
-f:sound/core/seq/seq_system.h
-f:sound/core/seq/seq_timer.c
-f:sound/core/seq/seq_timer.h
-f:sound/core/seq/seq_ump_client.c
-f:sound/core/seq/seq_ump_convert.c
-f:sound/core/seq/seq_ump_convert.h
-f:sound/core/seq/seq_virmidi.c
-f:sound/core/seq_device.c
-f:sound/core/sound.c
-f:sound/core/sound_kunit.c
-f:sound/core/sound_oss.c
-f:sound/core/timer.c
-f:sound/core/timer_compat.c
-f:sound/core/ump.c
-f:sound/core/ump_convert.c
-f:sound/core/vmaster.c
-f:sound/drivers/Kconfig
-f:sound/drivers/Makefile
-f:sound/drivers/aloop.c
-f:sound/drivers/dummy.c
-f:sound/drivers/mpu401/Makefile
-f:sound/drivers/mpu401/mpu401.c
-f:sound/drivers/mpu401/mpu401_uart.c
-f:sound/drivers/mtpav.c
-f:sound/drivers/mts64.c
-f:sound/drivers/opl3/Makefile
-f:sound/drivers/opl3/opl3_drums.c
-f:sound/drivers/opl3/opl3_lib.c
-f:sound/drivers/opl3/opl3_midi.c
-f:sound/drivers/opl3/opl3_oss.c
-f:sound/drivers/opl3/opl3_seq.c
-f:sound/drivers/opl3/opl3_synth.c
-f:sound/drivers/opl3/opl3_voice.h
-f:sound/drivers/opl4/Makefile
-f:sound/drivers/opl4/opl4_lib.c
-f:sound/drivers/opl4/opl4_local.h
-f:sound/drivers/opl4/opl4_mixer.c
-f:sound/drivers/opl4/opl4_proc.c
-f:sound/drivers/opl4/opl4_seq.c
-f:sound/drivers/opl4/opl4_synth.c
-f:sound/drivers/opl4/yrw801.c
-f:sound/drivers/pcmtest.c
-f:sound/drivers/pcsp/Makefile
-f:sound/drivers/pcsp/pcsp.c
-f:sound/drivers/pcsp/pcsp.h
-f:sound/drivers/pcsp/pcsp_input.c
-f:sound/drivers/pcsp/pcsp_input.h
-f:sound/drivers/pcsp/pcsp_lib.c
-f:sound/drivers/pcsp/pcsp_mixer.c
-f:sound/drivers/portman2x4.c
-f:sound/drivers/serial-generic.c
-f:sound/drivers/serial-u16550.c
-f:sound/drivers/virmidi.c
-f:sound/drivers/vx/Makefile
-f:sound/drivers/vx/vx_cmd.c
-f:sound/drivers/vx/vx_cmd.h
-f:sound/drivers/vx/vx_core.c
-f:sound/drivers/vx/vx_hwdep.c
-f:sound/drivers/vx/vx_mixer.c
-f:sound/drivers/vx/vx_pcm.c
-f:sound/drivers/vx/vx_uer.c
-f:sound/firewire/Kconfig
-f:sound/firewire/Makefile
-f:sound/firewire/amdtp-am824.c
-f:sound/firewire/amdtp-am824.h
-f:sound/firewire/amdtp-stream-trace.h
-f:sound/firewire/amdtp-stream.c
-f:sound/firewire/amdtp-stream.h
-f:sound/firewire/bebob/Makefile
-f:sound/firewire/bebob/bebob.c
-f:sound/firewire/bebob/bebob.h
-f:sound/firewire/bebob/bebob_command.c
-f:sound/firewire/bebob/bebob_focusrite.c
-f:sound/firewire/bebob/bebob_hwdep.c
-f:sound/firewire/bebob/bebob_maudio.c
-f:sound/firewire/bebob/bebob_midi.c
-f:sound/firewire/bebob/bebob_pcm.c
-f:sound/firewire/bebob/bebob_proc.c
-f:sound/firewire/bebob/bebob_stream.c
-f:sound/firewire/bebob/bebob_terratec.c
-f:sound/firewire/bebob/bebob_yamaha_terratec.c
-f:sound/firewire/cmp.c
-f:sound/firewire/cmp.h
-f:sound/firewire/dice/Makefile
-f:sound/firewire/dice/dice-alesis.c
-f:sound/firewire/dice/dice-extension.c
-f:sound/firewire/dice/dice-focusrite.c
-f:sound/firewire/dice/dice-harman.c
-f:sound/firewire/dice/dice-hwdep.c
-f:sound/firewire/dice/dice-interface.h
-f:sound/firewire/dice/dice-midi.c
-f:sound/firewire/dice/dice-mytek.c
-f:sound/firewire/dice/dice-pcm.c
-f:sound/firewire/dice/dice-presonus.c
-f:sound/firewire/dice/dice-proc.c
-f:sound/firewire/dice/dice-stream.c
-f:sound/firewire/dice/dice-tcelectronic.c
-f:sound/firewire/dice/dice-transaction.c
-f:sound/firewire/dice/dice-weiss.c
-f:sound/firewire/dice/dice.c
-f:sound/firewire/dice/dice.h
-f:sound/firewire/digi00x/Makefile
-f:sound/firewire/digi00x/amdtp-dot.c
-f:sound/firewire/digi00x/digi00x-hwdep.c
-f:sound/firewire/digi00x/digi00x-midi.c
-f:sound/firewire/digi00x/digi00x-pcm.c
-f:sound/firewire/digi00x/digi00x-proc.c
-f:sound/firewire/digi00x/digi00x-stream.c
-f:sound/firewire/digi00x/digi00x-transaction.c
-f:sound/firewire/digi00x/digi00x.c
-f:sound/firewire/digi00x/digi00x.h
-f:sound/firewire/fcp.c
-f:sound/firewire/fcp.h
-f:sound/firewire/fireface/Makefile
-f:sound/firewire/fireface/amdtp-ff.c
-f:sound/firewire/fireface/ff-hwdep.c
-f:sound/firewire/fireface/ff-midi.c
-f:sound/firewire/fireface/ff-pcm.c
-f:sound/firewire/fireface/ff-proc.c
-f:sound/firewire/fireface/ff-protocol-former.c
-f:sound/firewire/fireface/ff-protocol-latter.c
-f:sound/firewire/fireface/ff-stream.c
-f:sound/firewire/fireface/ff-transaction.c
-f:sound/firewire/fireface/ff.c
-f:sound/firewire/fireface/ff.h
-f:sound/firewire/fireworks/Makefile
-f:sound/firewire/fireworks/fireworks.c
-f:sound/firewire/fireworks/fireworks.h
-f:sound/firewire/fireworks/fireworks_command.c
-f:sound/firewire/fireworks/fireworks_hwdep.c
-f:sound/firewire/fireworks/fireworks_midi.c
-f:sound/firewire/fireworks/fireworks_pcm.c
-f:sound/firewire/fireworks/fireworks_proc.c
-f:sound/firewire/fireworks/fireworks_stream.c
-f:sound/firewire/fireworks/fireworks_transaction.c
-f:sound/firewire/isight.c
-f:sound/firewire/iso-resources.c
-f:sound/firewire/iso-resources.h
-f:sound/firewire/lib.c
-f:sound/firewire/lib.h
-f:sound/firewire/motu/Makefile
-f:sound/firewire/motu/amdtp-motu-trace.h
-f:sound/firewire/motu/amdtp-motu.c
-f:sound/firewire/motu/motu-command-dsp-message-parser.c
-f:sound/firewire/motu/motu-hwdep.c
-f:sound/firewire/motu/motu-midi.c
-f:sound/firewire/motu/motu-pcm.c
-f:sound/firewire/motu/motu-proc.c
-f:sound/firewire/motu/motu-protocol-v1.c
-f:sound/firewire/motu/motu-protocol-v2.c
-f:sound/firewire/motu/motu-protocol-v3.c
-f:sound/firewire/motu/motu-register-dsp-message-parser.c
-f:sound/firewire/motu/motu-stream.c
-f:sound/firewire/motu/motu-transaction.c
-f:sound/firewire/motu/motu.c
-f:sound/firewire/motu/motu.h
-f:sound/firewire/oxfw/Makefile
-f:sound/firewire/oxfw/oxfw-command.c
-f:sound/firewire/oxfw/oxfw-hwdep.c
-f:sound/firewire/oxfw/oxfw-midi.c
-f:sound/firewire/oxfw/oxfw-pcm.c
-f:sound/firewire/oxfw/oxfw-proc.c
-f:sound/firewire/oxfw/oxfw-scs1x.c
-f:sound/firewire/oxfw/oxfw-spkr.c
-f:sound/firewire/oxfw/oxfw-stream.c
-f:sound/firewire/oxfw/oxfw.c
-f:sound/firewire/oxfw/oxfw.h
-f:sound/firewire/packets-buffer.c
-f:sound/firewire/packets-buffer.h
-f:sound/firewire/tascam/Makefile
-f:sound/firewire/tascam/amdtp-tascam.c
-f:sound/firewire/tascam/tascam-hwdep.c
-f:sound/firewire/tascam/tascam-midi.c
-f:sound/firewire/tascam/tascam-pcm.c
-f:sound/firewire/tascam/tascam-proc.c
-f:sound/firewire/tascam/tascam-stream.c
-f:sound/firewire/tascam/tascam-transaction.c
-f:sound/firewire/tascam/tascam.c
-f:sound/firewire/tascam/tascam.h
-f:sound/hda/Kconfig
-f:sound/hda/Makefile
-f:sound/hda/codecs/Kconfig
-f:sound/hda/codecs/Makefile
-f:sound/hda/codecs/analog.c
-f:sound/hda/codecs/ca0110.c
-f:sound/hda/codecs/ca0132.c
-f:sound/hda/codecs/ca0132_regs.h
-f:sound/hda/codecs/cirrus/Kconfig
-f:sound/hda/codecs/cirrus/Makefile
-f:sound/hda/codecs/cirrus/cs420x.c
-f:sound/hda/codecs/cirrus/cs421x.c
-f:sound/hda/codecs/cirrus/cs8409-tables.c
-f:sound/hda/codecs/cirrus/cs8409.c
-f:sound/hda/codecs/cirrus/cs8409.h
-f:sound/hda/codecs/cm9825.c
-f:sound/hda/codecs/cmedia.c
-f:sound/hda/codecs/conexant.c
-f:sound/hda/codecs/generic.c
-f:sound/hda/codecs/generic.h
-f:sound/hda/codecs/hdmi/Kconfig
-f:sound/hda/codecs/hdmi/Makefile
-f:sound/hda/codecs/hdmi/atihdmi.c
-f:sound/hda/codecs/hdmi/eld.c
-f:sound/hda/codecs/hdmi/hdmi.c
-f:sound/hda/codecs/hdmi/hdmi_local.h
-f:sound/hda/codecs/hdmi/intelhdmi.c
-f:sound/hda/codecs/hdmi/nvhdmi-mcp.c
-f:sound/hda/codecs/hdmi/nvhdmi.c
-f:sound/hda/codecs/hdmi/simplehdmi.c
-f:sound/hda/codecs/hdmi/tegrahdmi.c
-f:sound/hda/codecs/helpers/hp_x360.c
-f:sound/hda/codecs/helpers/ideapad_hotkey_led.c
-f:sound/hda/codecs/helpers/ideapad_s740.c
-f:sound/hda/codecs/helpers/thinkpad.c
-f:sound/hda/codecs/realtek/Kconfig
-f:sound/hda/codecs/realtek/Makefile
-f:sound/hda/codecs/realtek/alc260.c
-f:sound/hda/codecs/realtek/alc262.c
-f:sound/hda/codecs/realtek/alc268.c
-f:sound/hda/codecs/realtek/alc269.c
-f:sound/hda/codecs/realtek/alc662.c
-f:sound/hda/codecs/realtek/alc680.c
-f:sound/hda/codecs/realtek/alc861.c
-f:sound/hda/codecs/realtek/alc861vd.c
-f:sound/hda/codecs/realtek/alc880.c
-f:sound/hda/codecs/realtek/alc882.c
-f:sound/hda/codecs/realtek/realtek.c
-f:sound/hda/codecs/realtek/realtek.h
-f:sound/hda/codecs/senarytech.c
-f:sound/hda/codecs/si3054.c
-f:sound/hda/codecs/side-codecs/Kconfig
-f:sound/hda/codecs/side-codecs/Makefile
-f:sound/hda/codecs/side-codecs/cirrus_scodec.c
-f:sound/hda/codecs/side-codecs/cirrus_scodec.h
-f:sound/hda/codecs/side-codecs/cirrus_scodec_test.c
-f:sound/hda/codecs/side-codecs/cs35l41_hda.c
-f:sound/hda/codecs/side-codecs/cs35l41_hda.h
-f:sound/hda/codecs/side-codecs/cs35l41_hda_i2c.c
-f:sound/hda/codecs/side-codecs/cs35l41_hda_property.c
-f:sound/hda/codecs/side-codecs/cs35l41_hda_property.h
-f:sound/hda/codecs/side-codecs/cs35l41_hda_spi.c
-f:sound/hda/codecs/side-codecs/cs35l56_hda.c
-f:sound/hda/codecs/side-codecs/cs35l56_hda.h
-f:sound/hda/codecs/side-codecs/cs35l56_hda_i2c.c
-f:sound/hda/codecs/side-codecs/cs35l56_hda_spi.c
-f:sound/hda/codecs/side-codecs/hda_component.c
-f:sound/hda/codecs/side-codecs/hda_component.h
-f:sound/hda/codecs/side-codecs/tas2781_hda.c
-f:sound/hda/codecs/side-codecs/tas2781_hda.h
-f:sound/hda/codecs/side-codecs/tas2781_hda_i2c.c
-f:sound/hda/codecs/side-codecs/tas2781_hda_spi.c
-f:sound/hda/codecs/sigmatel.c
-f:sound/hda/codecs/via.c
-f:sound/hda/common/Kconfig
-f:sound/hda/common/Makefile
-f:sound/hda/common/auto_parser.c
-f:sound/hda/common/beep.c
-f:sound/hda/common/bind.c
-f:sound/hda/common/codec.c
-f:sound/hda/common/controller.c
-f:sound/hda/common/controller_trace.h
-f:sound/hda/common/hda_auto_parser.h
-f:sound/hda/common/hda_beep.h
-f:sound/hda/common/hda_controller.h
-f:sound/hda/common/hda_jack.h
-f:sound/hda/common/hda_local.h
-f:sound/hda/common/hwdep.c
-f:sound/hda/common/jack.c
-f:sound/hda/common/proc.c
-f:sound/hda/common/sysfs.c
-f:sound/hda/controllers/Kconfig
-f:sound/hda/controllers/Makefile
-f:sound/hda/controllers/acpi.c
-f:sound/hda/controllers/intel.c
-f:sound/hda/controllers/intel.h
-f:sound/hda/controllers/intel_trace.h
-f:sound/hda/controllers/tegra.c
-f:sound/hda/core/Kconfig
-f:sound/hda/core/Makefile
-f:sound/hda/core/array.c
-f:sound/hda/core/bus.c
-f:sound/hda/core/component.c
-f:sound/hda/core/controller.c
-f:sound/hda/core/device.c
-f:sound/hda/core/ext/Makefile
-f:sound/hda/core/ext/bus.c
-f:sound/hda/core/ext/controller.c
-f:sound/hda/core/ext/stream.c
-f:sound/hda/core/hda_bus_type.c
-f:sound/hda/core/hdmi_chmap.c
-f:sound/hda/core/i915.c
-f:sound/hda/core/intel-dsp-config.c
-f:sound/hda/core/intel-nhlt.c
-f:sound/hda/core/intel-sdw-acpi.c
-f:sound/hda/core/local.h
-f:sound/hda/core/regmap.c
-f:sound/hda/core/stream.c
-f:sound/hda/core/sysfs.c
-f:sound/hda/core/trace.c
-f:sound/hda/core/trace.h
-f:sound/i2c/Makefile
-f:sound/i2c/cs8427.c
-f:sound/i2c/i2c.c
-f:sound/i2c/other/Makefile
-f:sound/i2c/other/ak4113.c
-f:sound/i2c/other/ak4114.c
-f:sound/i2c/other/ak4117.c
-f:sound/i2c/other/ak4xxx-adda.c
-f:sound/i2c/other/pt2258.c
-f:sound/i2c/tea6330t.c
-f:sound/isa/Kconfig
-f:sound/isa/Makefile
-f:sound/isa/ad1816a/Makefile
-f:sound/isa/ad1816a/ad1816a.c
-f:sound/isa/ad1816a/ad1816a_lib.c
-f:sound/isa/ad1848/Makefile
-f:sound/isa/ad1848/ad1848.c
-f:sound/isa/adlib.c
-f:sound/isa/als100.c
-f:sound/isa/azt2320.c
-f:sound/isa/cmi8328.c
-f:sound/isa/cmi8330.c
-f:sound/isa/cs423x/Makefile
-f:sound/isa/cs423x/cs4231.c
-f:sound/isa/cs423x/cs4236.c
-f:sound/isa/cs423x/cs4236_lib.c
-f:sound/isa/es1688/Makefile
-f:sound/isa/es1688/es1688.c
-f:sound/isa/es1688/es1688_lib.c
-f:sound/isa/es18xx.c
-f:sound/isa/galaxy/Makefile
-f:sound/isa/galaxy/azt1605.c
-f:sound/isa/galaxy/azt2316.c
-f:sound/isa/galaxy/galaxy.c
-f:sound/isa/gus/Makefile
-f:sound/isa/gus/gus_dma.c
-f:sound/isa/gus/gus_dram.c
-f:sound/isa/gus/gus_io.c
-f:sound/isa/gus/gus_irq.c
-f:sound/isa/gus/gus_main.c
-f:sound/isa/gus/gus_mem.c
-f:sound/isa/gus/gus_mem_proc.c
-f:sound/isa/gus/gus_mixer.c
-f:sound/isa/gus/gus_pcm.c
-f:sound/isa/gus/gus_reset.c
-f:sound/isa/gus/gus_tables.h
-f:sound/isa/gus/gus_timer.c
-f:sound/isa/gus/gus_uart.c
-f:sound/isa/gus/gus_volume.c
-f:sound/isa/gus/gusclassic.c
-f:sound/isa/gus/gusextreme.c
-f:sound/isa/gus/gusmax.c
-f:sound/isa/gus/interwave-stb.c
-f:sound/isa/gus/interwave.c
-f:sound/isa/msnd/Makefile
-f:sound/isa/msnd/msnd.c
-f:sound/isa/msnd/msnd.h
-f:sound/isa/msnd/msnd_classic.c
-f:sound/isa/msnd/msnd_classic.h
-f:sound/isa/msnd/msnd_pinnacle.c
-f:sound/isa/msnd/msnd_pinnacle.h
-f:sound/isa/msnd/msnd_pinnacle_mixer.c
-f:sound/isa/opl3sa2.c
-f:sound/isa/opti9xx/Makefile
-f:sound/isa/opti9xx/miro.c
-f:sound/isa/opti9xx/opti92x-ad1848.c
-f:sound/isa/opti9xx/opti92x-cs4231.c
-f:sound/isa/opti9xx/opti93x.c
-f:sound/isa/sb/Makefile
-f:sound/isa/sb/emu8000.c
-f:sound/isa/sb/emu8000_callback.c
-f:sound/isa/sb/emu8000_local.h
-f:sound/isa/sb/emu8000_patch.c
-f:sound/isa/sb/emu8000_pcm.c
-f:sound/isa/sb/emu8000_synth.c
-f:sound/isa/sb/jazz16.c
-f:sound/isa/sb/sb16.c
-f:sound/isa/sb/sb16_csp.c
-f:sound/isa/sb/sb16_main.c
-f:sound/isa/sb/sb8.c
-f:sound/isa/sb/sb8_main.c
-f:sound/isa/sb/sb8_midi.c
-f:sound/isa/sb/sb_common.c
-f:sound/isa/sb/sb_mixer.c
-f:sound/isa/sb/sbawe.c
-f:sound/isa/sc6000.c
-f:sound/isa/sscape.c
-f:sound/isa/wavefront/Makefile
-f:sound/isa/wavefront/wavefront.c
-f:sound/isa/wavefront/wavefront_fx.c
-f:sound/isa/wavefront/wavefront_midi.c
-f:sound/isa/wavefront/wavefront_synth.c
-f:sound/isa/wss/Makefile
-f:sound/isa/wss/wss_lib.c
-f:sound/last.c
-f:sound/mips/Kconfig
-f:sound/mips/Makefile
-f:sound/mips/ad1843.c
-f:sound/mips/hal2.c
-f:sound/mips/hal2.h
-f:sound/mips/sgio2audio.c
-f:sound/mips/snd-n64.c
-f:sound/oss/.gitignore
-f:sound/oss/dmasound/Kconfig
-f:sound/oss/dmasound/Makefile
-f:sound/oss/dmasound/dmasound.h
-f:sound/oss/dmasound/dmasound_atari.c
-f:sound/oss/dmasound/dmasound_core.c
-f:sound/oss/dmasound/dmasound_paula.c
-f:sound/oss/dmasound/dmasound_q40.c
-f:sound/parisc/Kconfig
-f:sound/parisc/Makefile
-f:sound/parisc/harmony.c
-f:sound/parisc/harmony.h
-f:sound/pci/Kconfig
-f:sound/pci/Makefile
-f:sound/pci/ac97/Makefile
-f:sound/pci/ac97/ac97_codec.c
-f:sound/pci/ac97/ac97_id.h
-f:sound/pci/ac97/ac97_local.h
-f:sound/pci/ac97/ac97_patch.c
-f:sound/pci/ac97/ac97_patch.h
-f:sound/pci/ac97/ac97_pcm.c
-f:sound/pci/ac97/ac97_proc.c
-f:sound/pci/ad1889.c
-f:sound/pci/ad1889.h
-f:sound/pci/ak4531_codec.c
-f:sound/pci/ali5451/Makefile
-f:sound/pci/ali5451/ali5451.c
-f:sound/pci/als300.c
-f:sound/pci/als4000.c
-f:sound/pci/asihpi/Makefile
-f:sound/pci/asihpi/asihpi.c
-f:sound/pci/asihpi/hpi.h
-f:sound/pci/asihpi/hpi6000.c
-f:sound/pci/asihpi/hpi6000.h
-f:sound/pci/asihpi/hpi6205.c
-f:sound/pci/asihpi/hpi6205.h
-f:sound/pci/asihpi/hpi_internal.h
-f:sound/pci/asihpi/hpi_version.h
-f:sound/pci/asihpi/hpicmn.c
-f:sound/pci/asihpi/hpicmn.h
-f:sound/pci/asihpi/hpidebug.c
-f:sound/pci/asihpi/hpidebug.h
-f:sound/pci/asihpi/hpidspcd.c
-f:sound/pci/asihpi/hpidspcd.h
-f:sound/pci/asihpi/hpifunc.c
-f:sound/pci/asihpi/hpimsginit.c
-f:sound/pci/asihpi/hpimsginit.h
-f:sound/pci/asihpi/hpimsgx.c
-f:sound/pci/asihpi/hpimsgx.h
-f:sound/pci/asihpi/hpioctl.c
-f:sound/pci/asihpi/hpioctl.h
-f:sound/pci/asihpi/hpios.c
-f:sound/pci/asihpi/hpios.h
-f:sound/pci/asihpi/hpipcida.h
-f:sound/pci/atiixp.c
-f:sound/pci/atiixp_modem.c
-f:sound/pci/au88x0/Makefile
-f:sound/pci/au88x0/au8810.c
-f:sound/pci/au88x0/au8810.h
-f:sound/pci/au88x0/au8820.c
-f:sound/pci/au88x0/au8820.h
-f:sound/pci/au88x0/au8830.c
-f:sound/pci/au88x0/au8830.h
-f:sound/pci/au88x0/au88x0.c
-f:sound/pci/au88x0/au88x0.h
-f:sound/pci/au88x0/au88x0_a3d.c
-f:sound/pci/au88x0/au88x0_a3d.h
-f:sound/pci/au88x0/au88x0_a3ddata.c
-f:sound/pci/au88x0/au88x0_core.c
-f:sound/pci/au88x0/au88x0_eq.c
-f:sound/pci/au88x0/au88x0_eq.h
-f:sound/pci/au88x0/au88x0_eqdata.c
-f:sound/pci/au88x0/au88x0_game.c
-f:sound/pci/au88x0/au88x0_mixer.c
-f:sound/pci/au88x0/au88x0_mpu401.c
-f:sound/pci/au88x0/au88x0_pcm.c
-f:sound/pci/au88x0/au88x0_synth.c
-f:sound/pci/au88x0/au88x0_wt.h
-f:sound/pci/au88x0/au88x0_xtalk.c
-f:sound/pci/au88x0/au88x0_xtalk.h
-f:sound/pci/aw2/Makefile
-f:sound/pci/aw2/aw2-alsa.c
-f:sound/pci/aw2/aw2-saa7146.c
-f:sound/pci/aw2/aw2-saa7146.h
-f:sound/pci/aw2/aw2-tsl.c
-f:sound/pci/aw2/saa7146.h
-f:sound/pci/azt3328.c
-f:sound/pci/azt3328.h
-f:sound/pci/bt87x.c
-f:sound/pci/ca0106/Makefile
-f:sound/pci/ca0106/ca0106.h
-f:sound/pci/ca0106/ca0106_main.c
-f:sound/pci/ca0106/ca0106_mixer.c
-f:sound/pci/ca0106/ca0106_proc.c
-f:sound/pci/ca0106/ca_midi.c
-f:sound/pci/ca0106/ca_midi.h
-f:sound/pci/cmipci.c
-f:sound/pci/cs4281.c
-f:sound/pci/cs46xx/Makefile
-f:sound/pci/cs46xx/cs46xx.c
-f:sound/pci/cs46xx/cs46xx.h
-f:sound/pci/cs46xx/cs46xx_dsp_scb_types.h
-f:sound/pci/cs46xx/cs46xx_dsp_spos.h
-f:sound/pci/cs46xx/cs46xx_dsp_task_types.h
-f:sound/pci/cs46xx/cs46xx_lib.c
-f:sound/pci/cs46xx/cs46xx_lib.h
-f:sound/pci/cs46xx/dsp_spos.c
-f:sound/pci/cs46xx/dsp_spos.h
-f:sound/pci/cs46xx/dsp_spos_scb_lib.c
-f:sound/pci/cs5530.c
-f:sound/pci/cs5535audio/Makefile
-f:sound/pci/cs5535audio/cs5535audio.c
-f:sound/pci/cs5535audio/cs5535audio.h
-f:sound/pci/cs5535audio/cs5535audio_olpc.c
-f:sound/pci/cs5535audio/cs5535audio_pcm.c
-f:sound/pci/cs5535audio/cs5535audio_pm.c
-f:sound/pci/ctxfi/Makefile
-f:sound/pci/ctxfi/ct20k1reg.h
-f:sound/pci/ctxfi/ct20k2reg.h
-f:sound/pci/ctxfi/ctamixer.c
-f:sound/pci/ctxfi/ctamixer.h
-f:sound/pci/ctxfi/ctatc.c
-f:sound/pci/ctxfi/ctatc.h
-f:sound/pci/ctxfi/ctdaio.c
-f:sound/pci/ctxfi/ctdaio.h
-f:sound/pci/ctxfi/cthardware.c
-f:sound/pci/ctxfi/cthardware.h
-f:sound/pci/ctxfi/cthw20k1.c
-f:sound/pci/ctxfi/cthw20k1.h
-f:sound/pci/ctxfi/cthw20k2.c
-f:sound/pci/ctxfi/cthw20k2.h
-f:sound/pci/ctxfi/ctimap.c
-f:sound/pci/ctxfi/ctimap.h
-f:sound/pci/ctxfi/ctmixer.c
-f:sound/pci/ctxfi/ctmixer.h
-f:sound/pci/ctxfi/ctpcm.c
-f:sound/pci/ctxfi/ctpcm.h
-f:sound/pci/ctxfi/ctresource.c
-f:sound/pci/ctxfi/ctresource.h
-f:sound/pci/ctxfi/ctsrc.c
-f:sound/pci/ctxfi/ctsrc.h
-f:sound/pci/ctxfi/cttimer.c
-f:sound/pci/ctxfi/cttimer.h
-f:sound/pci/ctxfi/ctvmem.c
-f:sound/pci/ctxfi/ctvmem.h
-f:sound/pci/ctxfi/xfi.c
-f:sound/pci/echoaudio/Makefile
-f:sound/pci/echoaudio/darla20.c
-f:sound/pci/echoaudio/darla20_dsp.c
-f:sound/pci/echoaudio/darla24.c
-f:sound/pci/echoaudio/darla24_dsp.c
-f:sound/pci/echoaudio/echo3g.c
-f:sound/pci/echoaudio/echo3g_dsp.c
-f:sound/pci/echoaudio/echoaudio.c
-f:sound/pci/echoaudio/echoaudio.h
-f:sound/pci/echoaudio/echoaudio_3g.c
-f:sound/pci/echoaudio/echoaudio_dsp.c
-f:sound/pci/echoaudio/echoaudio_dsp.h
-f:sound/pci/echoaudio/echoaudio_gml.c
-f:sound/pci/echoaudio/gina20.c
-f:sound/pci/echoaudio/gina20_dsp.c
-f:sound/pci/echoaudio/gina24.c
-f:sound/pci/echoaudio/gina24_dsp.c
-f:sound/pci/echoaudio/indigo.c
-f:sound/pci/echoaudio/indigo_dsp.c
-f:sound/pci/echoaudio/indigo_express_dsp.c
-f:sound/pci/echoaudio/indigodj.c
-f:sound/pci/echoaudio/indigodj_dsp.c
-f:sound/pci/echoaudio/indigodjx.c
-f:sound/pci/echoaudio/indigodjx_dsp.c
-f:sound/pci/echoaudio/indigoio.c
-f:sound/pci/echoaudio/indigoio_dsp.c
-f:sound/pci/echoaudio/indigoiox.c
-f:sound/pci/echoaudio/indigoiox_dsp.c
-f:sound/pci/echoaudio/layla20.c
-f:sound/pci/echoaudio/layla20_dsp.c
-f:sound/pci/echoaudio/layla24.c
-f:sound/pci/echoaudio/layla24_dsp.c
-f:sound/pci/echoaudio/mia.c
-f:sound/pci/echoaudio/mia_dsp.c
-f:sound/pci/echoaudio/midi.c
-f:sound/pci/echoaudio/mona.c
-f:sound/pci/echoaudio/mona_dsp.c
-f:sound/pci/emu10k1/Makefile
-f:sound/pci/emu10k1/emu10k1.c
-f:sound/pci/emu10k1/emu10k1_callback.c
-f:sound/pci/emu10k1/emu10k1_main.c
-f:sound/pci/emu10k1/emu10k1_patch.c
-f:sound/pci/emu10k1/emu10k1_synth.c
-f:sound/pci/emu10k1/emu10k1_synth_local.h
-f:sound/pci/emu10k1/emu10k1x.c
-f:sound/pci/emu10k1/emufx.c
-f:sound/pci/emu10k1/emumixer.c
-f:sound/pci/emu10k1/emumpu401.c
-f:sound/pci/emu10k1/emupcm.c
-f:sound/pci/emu10k1/emuproc.c
-f:sound/pci/emu10k1/io.c
-f:sound/pci/emu10k1/irq.c
-f:sound/pci/emu10k1/memory.c
-f:sound/pci/emu10k1/p16v.c
-f:sound/pci/emu10k1/p16v.h
-f:sound/pci/emu10k1/p17v.h
-f:sound/pci/emu10k1/timer.c
-f:sound/pci/emu10k1/tina2.h
-f:sound/pci/emu10k1/voice.c
-f:sound/pci/ens1370.c
-f:sound/pci/ens1371.c
-f:sound/pci/es1938.c
-f:sound/pci/es1968.c
-f:sound/pci/fm801.c
-f:sound/pci/ice1712/Makefile
-f:sound/pci/ice1712/ak4xxx.c
-f:sound/pci/ice1712/amp.c
-f:sound/pci/ice1712/amp.h
-f:sound/pci/ice1712/aureon.c
-f:sound/pci/ice1712/aureon.h
-f:sound/pci/ice1712/delta.c
-f:sound/pci/ice1712/delta.h
-f:sound/pci/ice1712/envy24ht.h
-f:sound/pci/ice1712/ews.c
-f:sound/pci/ice1712/ews.h
-f:sound/pci/ice1712/hoontech.c
-f:sound/pci/ice1712/hoontech.h
-f:sound/pci/ice1712/ice1712.c
-f:sound/pci/ice1712/ice1712.h
-f:sound/pci/ice1712/ice1724.c
-f:sound/pci/ice1712/juli.c
-f:sound/pci/ice1712/juli.h
-f:sound/pci/ice1712/maya44.c
-f:sound/pci/ice1712/maya44.h
-f:sound/pci/ice1712/phase.c
-f:sound/pci/ice1712/phase.h
-f:sound/pci/ice1712/pontis.c
-f:sound/pci/ice1712/pontis.h
-f:sound/pci/ice1712/prodigy192.c
-f:sound/pci/ice1712/prodigy192.h
-f:sound/pci/ice1712/prodigy_hifi.c
-f:sound/pci/ice1712/prodigy_hifi.h
-f:sound/pci/ice1712/psc724.c
-f:sound/pci/ice1712/psc724.h
-f:sound/pci/ice1712/quartet.c
-f:sound/pci/ice1712/quartet.h
-f:sound/pci/ice1712/revo.c
-f:sound/pci/ice1712/revo.h
-f:sound/pci/ice1712/se.c
-f:sound/pci/ice1712/se.h
-f:sound/pci/ice1712/stac946x.h
-f:sound/pci/ice1712/vt1720_mobo.c
-f:sound/pci/ice1712/vt1720_mobo.h
-f:sound/pci/ice1712/wm8766.c
-f:sound/pci/ice1712/wm8766.h
-f:sound/pci/ice1712/wm8776.c
-f:sound/pci/ice1712/wm8776.h
-f:sound/pci/ice1712/wtm.c
-f:sound/pci/ice1712/wtm.h
-f:sound/pci/intel8x0.c
-f:sound/pci/intel8x0m.c
-f:sound/pci/korg1212/Makefile
-f:sound/pci/korg1212/korg1212.c
-f:sound/pci/lola/Makefile
-f:sound/pci/lola/lola.c
-f:sound/pci/lola/lola.h
-f:sound/pci/lola/lola_clock.c
-f:sound/pci/lola/lola_mixer.c
-f:sound/pci/lola/lola_pcm.c
-f:sound/pci/lola/lola_proc.c
-f:sound/pci/lx6464es/Makefile
-f:sound/pci/lx6464es/lx6464es.c
-f:sound/pci/lx6464es/lx6464es.h
-f:sound/pci/lx6464es/lx_core.c
-f:sound/pci/lx6464es/lx_core.h
-f:sound/pci/lx6464es/lx_defs.h
-f:sound/pci/maestro3.c
-f:sound/pci/mixart/Makefile
-f:sound/pci/mixart/mixart.c
-f:sound/pci/mixart/mixart.h
-f:sound/pci/mixart/mixart_core.c
-f:sound/pci/mixart/mixart_core.h
-f:sound/pci/mixart/mixart_hwdep.c
-f:sound/pci/mixart/mixart_hwdep.h
-f:sound/pci/mixart/mixart_mixer.c
-f:sound/pci/mixart/mixart_mixer.h
-f:sound/pci/nm256/Makefile
-f:sound/pci/nm256/nm256.c
-f:sound/pci/nm256/nm256_coef.c
-f:sound/pci/oxygen/Makefile
-f:sound/pci/oxygen/ak4396.h
-f:sound/pci/oxygen/cm9780.h
-f:sound/pci/oxygen/cs2000.h
-f:sound/pci/oxygen/cs4245.h
-f:sound/pci/oxygen/cs4362a.h
-f:sound/pci/oxygen/cs4398.h
-f:sound/pci/oxygen/oxygen.c
-f:sound/pci/oxygen/oxygen.h
-f:sound/pci/oxygen/oxygen_io.c
-f:sound/pci/oxygen/oxygen_lib.c
-f:sound/pci/oxygen/oxygen_mixer.c
-f:sound/pci/oxygen/oxygen_pcm.c
-f:sound/pci/oxygen/oxygen_regs.h
-f:sound/pci/oxygen/pcm1796.h
-f:sound/pci/oxygen/se6x.c
-f:sound/pci/oxygen/virtuoso.c
-f:sound/pci/oxygen/wm8766.h
-f:sound/pci/oxygen/wm8776.h
-f:sound/pci/oxygen/wm8785.h
-f:sound/pci/oxygen/xonar.h
-f:sound/pci/oxygen/xonar_cs43xx.c
-f:sound/pci/oxygen/xonar_dg.c
-f:sound/pci/oxygen/xonar_dg.h
-f:sound/pci/oxygen/xonar_dg_mixer.c
-f:sound/pci/oxygen/xonar_hdmi.c
-f:sound/pci/oxygen/xonar_lib.c
-f:sound/pci/oxygen/xonar_pcm179x.c
-f:sound/pci/oxygen/xonar_wm87x6.c
-f:sound/pci/pcxhr/Makefile
-f:sound/pci/pcxhr/pcxhr.c
-f:sound/pci/pcxhr/pcxhr.h
-f:sound/pci/pcxhr/pcxhr_core.c
-f:sound/pci/pcxhr/pcxhr_core.h
-f:sound/pci/pcxhr/pcxhr_hwdep.c
-f:sound/pci/pcxhr/pcxhr_hwdep.h
-f:sound/pci/pcxhr/pcxhr_mix22.c
-f:sound/pci/pcxhr/pcxhr_mix22.h
-f:sound/pci/pcxhr/pcxhr_mixer.c
-f:sound/pci/pcxhr/pcxhr_mixer.h
-f:sound/pci/riptide/Makefile
-f:sound/pci/riptide/riptide.c
-f:sound/pci/rme32.c
-f:sound/pci/rme96.c
-f:sound/pci/rme9652/Makefile
-f:sound/pci/rme9652/hdsp.c
-f:sound/pci/rme9652/hdspm.c
-f:sound/pci/rme9652/rme9652.c
-f:sound/pci/sis7019.c
-f:sound/pci/sis7019.h
-f:sound/pci/sonicvibes.c
-f:sound/pci/trident/Makefile
-f:sound/pci/trident/trident.c
-f:sound/pci/trident/trident.h
-f:sound/pci/trident/trident_main.c
-f:sound/pci/trident/trident_memory.c
-f:sound/pci/via82xx.c
-f:sound/pci/via82xx_modem.c
-f:sound/pci/vx222/Makefile
-f:sound/pci/vx222/vx222.c
-f:sound/pci/vx222/vx222.h
-f:sound/pci/vx222/vx222_ops.c
-f:sound/pci/ymfpci/Makefile
-f:sound/pci/ymfpci/ymfpci.c
-f:sound/pci/ymfpci/ymfpci.h
-f:sound/pci/ymfpci/ymfpci_main.c
-f:sound/pcmcia/Kconfig
-f:sound/pcmcia/Makefile
-f:sound/pcmcia/pdaudiocf/Makefile
-f:sound/pcmcia/pdaudiocf/pdaudiocf.c
-f:sound/pcmcia/pdaudiocf/pdaudiocf.h
-f:sound/pcmcia/pdaudiocf/pdaudiocf_core.c
-f:sound/pcmcia/pdaudiocf/pdaudiocf_irq.c
-f:sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c
-f:sound/pcmcia/vx/Makefile
-f:sound/pcmcia/vx/vxp_mixer.c
-f:sound/pcmcia/vx/vxp_ops.c
-f:sound/pcmcia/vx/vxpocket.c
-f:sound/pcmcia/vx/vxpocket.h
-f:sound/ppc/Kconfig
-f:sound/ppc/Makefile
-f:sound/ppc/awacs.c
-f:sound/ppc/awacs.h
-f:sound/ppc/beep.c
-f:sound/ppc/burgundy.c
-f:sound/ppc/burgundy.h
-f:sound/ppc/daca.c
-f:sound/ppc/keywest.c
-f:sound/ppc/pmac.c
-f:sound/ppc/pmac.h
-f:sound/ppc/powermac.c
-f:sound/ppc/snd_ps3.c
-f:sound/ppc/snd_ps3.h
-f:sound/ppc/snd_ps3_reg.h
-f:sound/ppc/tumbler.c
-f:sound/ppc/tumbler_volume.h
-f:sound/sh/Kconfig
-f:sound/sh/Makefile
-f:sound/sh/aica.c
-f:sound/sh/aica.h
-f:sound/sh/sh_dac_audio.c
-f:sound/soc/Kconfig
-f:sound/soc/Makefile
-f:sound/soc/adi/Kconfig
-f:sound/soc/adi/Makefile
-f:sound/soc/adi/axi-i2s.c
-f:sound/soc/adi/axi-spdif.c
-f:sound/soc/amd/Kconfig
-f:sound/soc/amd/Makefile
-f:sound/soc/amd/acp-config.c
-f:sound/soc/amd/acp-da7219-max98357a.c
-f:sound/soc/amd/acp-es8336.c
-f:sound/soc/amd/acp-pcm-dma.c
-f:sound/soc/amd/acp-rt5645.c
-f:sound/soc/amd/acp.h
-f:sound/soc/amd/acp/Kconfig
-f:sound/soc/amd/acp/Makefile
-f:sound/soc/amd/acp/acp-i2s.c
-f:sound/soc/amd/acp/acp-legacy-common.c
-f:sound/soc/amd/acp/acp-legacy-mach.c
-f:sound/soc/amd/acp/acp-mach-common.c
-f:sound/soc/amd/acp/acp-mach.h
-f:sound/soc/amd/acp/acp-pci.c
-f:sound/soc/amd/acp/acp-pdm.c
-f:sound/soc/amd/acp/acp-platform.c
-f:sound/soc/amd/acp/acp-rembrandt.c
-f:sound/soc/amd/acp/acp-renoir.c
-f:sound/soc/amd/acp/acp-sdw-legacy-mach.c
-f:sound/soc/amd/acp/acp-sdw-mach-common.c
-f:sound/soc/amd/acp/acp-sdw-sof-mach.c
-f:sound/soc/amd/acp/acp-sof-mach.c
-f:sound/soc/amd/acp/acp3x-es83xx/acp3x-es83xx.c
-f:sound/soc/amd/acp/acp3x-es83xx/acp3x-es83xx.h
-f:sound/soc/amd/acp/acp63.c
-f:sound/soc/amd/acp/acp70.c
-f:sound/soc/amd/acp/acp_common.h
-f:sound/soc/amd/acp/amd-acp63-acpi-match.c
-f:sound/soc/amd/acp/amd-acp70-acpi-match.c
-f:sound/soc/amd/acp/amd-acpi-mach.c
-f:sound/soc/amd/acp/amd-sdw-acpi.c
-f:sound/soc/amd/acp/amd.h
-f:sound/soc/amd/acp/chip_offset_byte.h
-f:sound/soc/amd/acp/soc_amd_sdw_common.h
-f:sound/soc/amd/acp3x-rt5682-max9836.c
-f:sound/soc/amd/include/acp_2_2_d.h
-f:sound/soc/amd/include/acp_2_2_enum.h
-f:sound/soc/amd/include/acp_2_2_sh_mask.h
-f:sound/soc/amd/mach-config.h
-f:sound/soc/amd/ps/Makefile
-f:sound/soc/amd/ps/acp63.h
-f:sound/soc/amd/ps/pci-ps.c
-f:sound/soc/amd/ps/ps-common.c
-f:sound/soc/amd/ps/ps-mach.c
-f:sound/soc/amd/ps/ps-pdm-dma.c
-f:sound/soc/amd/ps/ps-sdw-dma.c
-f:sound/soc/amd/raven/Makefile
-f:sound/soc/amd/raven/acp3x-i2s.c
-f:sound/soc/amd/raven/acp3x-pcm-dma.c
-f:sound/soc/amd/raven/acp3x.h
-f:sound/soc/amd/raven/chip_offset_byte.h
-f:sound/soc/amd/raven/pci-acp3x.c
-f:sound/soc/amd/renoir/Makefile
-f:sound/soc/amd/renoir/acp3x-pdm-dma.c
-f:sound/soc/amd/renoir/acp3x-rn.c
-f:sound/soc/amd/renoir/rn-pci-acp3x.c
-f:sound/soc/amd/renoir/rn_acp3x.h
-f:sound/soc/amd/renoir/rn_chip_offset_byte.h
-f:sound/soc/amd/rpl/Makefile
-f:sound/soc/amd/rpl/rpl-pci-acp6x.c
-f:sound/soc/amd/rpl/rpl_acp6x.h
-f:sound/soc/amd/rpl/rpl_acp6x_chip_offset_byte.h
-f:sound/soc/amd/vangogh/Makefile
-f:sound/soc/amd/vangogh/acp5x-i2s.c
-f:sound/soc/amd/vangogh/acp5x-mach.c
-f:sound/soc/amd/vangogh/acp5x-pcm-dma.c
-f:sound/soc/amd/vangogh/acp5x.h
-f:sound/soc/amd/vangogh/pci-acp5x.c
-f:sound/soc/amd/vangogh/vg_chip_offset_byte.h
-f:sound/soc/amd/yc/Makefile
-f:sound/soc/amd/yc/acp6x-mach.c
-f:sound/soc/amd/yc/acp6x-pdm-dma.c
-f:sound/soc/amd/yc/acp6x.h
-f:sound/soc/amd/yc/acp6x_chip_offset_byte.h
-f:sound/soc/amd/yc/pci-acp6x.c
-f:sound/soc/apple/Kconfig
-f:sound/soc/apple/Makefile
-f:sound/soc/apple/mca.c
-f:sound/soc/atmel/Kconfig
-f:sound/soc/atmel/Makefile
-f:sound/soc/atmel/atmel-classd.c
-f:sound/soc/atmel/atmel-classd.h
-f:sound/soc/atmel/atmel-i2s.c
-f:sound/soc/atmel/atmel-pcm-dma.c
-f:sound/soc/atmel/atmel-pcm-pdc.c
-f:sound/soc/atmel/atmel-pcm.h
-f:sound/soc/atmel/atmel-pdmic.c
-f:sound/soc/atmel/atmel-pdmic.h
-f:sound/soc/atmel/atmel_ssc_dai.c
-f:sound/soc/atmel/atmel_ssc_dai.h
-f:sound/soc/atmel/atmel_wm8904.c
-f:sound/soc/atmel/mchp-i2s-mcc.c
-f:sound/soc/atmel/mchp-pdmc.c
-f:sound/soc/atmel/mchp-spdifrx.c
-f:sound/soc/atmel/mchp-spdiftx.c
-f:sound/soc/atmel/mikroe-proto.c
-f:sound/soc/atmel/sam9g20_wm8731.c
-f:sound/soc/atmel/sam9x5_wm8731.c
-f:sound/soc/atmel/tse850-pcm5142.c
-f:sound/soc/au1x/Kconfig
-f:sound/soc/au1x/Makefile
-f:sound/soc/au1x/ac97c.c
-f:sound/soc/au1x/db1000.c
-f:sound/soc/au1x/db1200.c
-f:sound/soc/au1x/dbdma2.c
-f:sound/soc/au1x/dma.c
-f:sound/soc/au1x/i2sc.c
-f:sound/soc/au1x/psc-ac97.c
-f:sound/soc/au1x/psc-i2s.c
-f:sound/soc/au1x/psc.h
-f:sound/soc/bcm/Kconfig
-f:sound/soc/bcm/Makefile
-f:sound/soc/bcm/bcm2835-i2s.c
-f:sound/soc/bcm/bcm63xx-i2s-whistler.c
-f:sound/soc/bcm/bcm63xx-i2s.h
-f:sound/soc/bcm/bcm63xx-pcm-whistler.c
-f:sound/soc/bcm/cygnus-pcm.c
-f:sound/soc/bcm/cygnus-ssp.c
-f:sound/soc/bcm/cygnus-ssp.h
-f:sound/soc/cirrus/Kconfig
-f:sound/soc/cirrus/Makefile
-f:sound/soc/cirrus/ep93xx-i2s.c
-f:sound/soc/cirrus/ep93xx-pcm.c
-f:sound/soc/cirrus/ep93xx-pcm.h
-f:sound/soc/codecs/88pm860x-codec.c
-f:sound/soc/codecs/88pm860x-codec.h
-f:sound/soc/codecs/Kconfig
-f:sound/soc/codecs/Makefile
-f:sound/soc/codecs/ab8500-codec.c
-f:sound/soc/codecs/ab8500-codec.h
-f:sound/soc/codecs/ac97.c
-f:sound/soc/codecs/ad1836.c
-f:sound/soc/codecs/ad1836.h
-f:sound/soc/codecs/ad193x-i2c.c
-f:sound/soc/codecs/ad193x-spi.c
-f:sound/soc/codecs/ad193x.c
-f:sound/soc/codecs/ad193x.h
-f:sound/soc/codecs/ad1980.c
-f:sound/soc/codecs/ad73311.c
-f:sound/soc/codecs/ad73311.h
-f:sound/soc/codecs/adau-utils.c
-f:sound/soc/codecs/adau-utils.h
-f:sound/soc/codecs/adau1372-i2c.c
-f:sound/soc/codecs/adau1372-spi.c
-f:sound/soc/codecs/adau1372.c
-f:sound/soc/codecs/adau1372.h
-f:sound/soc/codecs/adau1373.c
-f:sound/soc/codecs/adau1373.h
-f:sound/soc/codecs/adau1701.c
-f:sound/soc/codecs/adau1701.h
-f:sound/soc/codecs/adau1761-i2c.c
-f:sound/soc/codecs/adau1761-spi.c
-f:sound/soc/codecs/adau1761.c
-f:sound/soc/codecs/adau1761.h
-f:sound/soc/codecs/adau1781-i2c.c
-f:sound/soc/codecs/adau1781-spi.c
-f:sound/soc/codecs/adau1781.c
-f:sound/soc/codecs/adau1781.h
-f:sound/soc/codecs/adau17x1.c
-f:sound/soc/codecs/adau17x1.h
-f:sound/soc/codecs/adau1977-i2c.c
-f:sound/soc/codecs/adau1977-spi.c
-f:sound/soc/codecs/adau1977.c
-f:sound/soc/codecs/adau1977.h
-f:sound/soc/codecs/adau7002.c
-f:sound/soc/codecs/adau7118-hw.c
-f:sound/soc/codecs/adau7118-i2c.c
-f:sound/soc/codecs/adau7118.c
-f:sound/soc/codecs/adau7118.h
-f:sound/soc/codecs/adav801.c
-f:sound/soc/codecs/adav803.c
-f:sound/soc/codecs/adav80x.c
-f:sound/soc/codecs/adav80x.h
-f:sound/soc/codecs/ads117x.c
-f:sound/soc/codecs/ak4104.c
-f:sound/soc/codecs/ak4118.c
-f:sound/soc/codecs/ak4375.c
-f:sound/soc/codecs/ak4458.c
-f:sound/soc/codecs/ak4458.h
-f:sound/soc/codecs/ak4535.c
-f:sound/soc/codecs/ak4535.h
-f:sound/soc/codecs/ak4554.c
-f:sound/soc/codecs/ak4613.c
-f:sound/soc/codecs/ak4619.c
-f:sound/soc/codecs/ak4641.c
-f:sound/soc/codecs/ak4642.c
-f:sound/soc/codecs/ak4671.c
-f:sound/soc/codecs/ak4671.h
-f:sound/soc/codecs/ak5386.c
-f:sound/soc/codecs/ak5558.c
-f:sound/soc/codecs/ak5558.h
-f:sound/soc/codecs/alc5623.c
-f:sound/soc/codecs/alc5623.h
-f:sound/soc/codecs/alc5632.c
-f:sound/soc/codecs/alc5632.h
-f:sound/soc/codecs/arizona-jack.c
-f:sound/soc/codecs/arizona.c
-f:sound/soc/codecs/arizona.h
-f:sound/soc/codecs/audio-iio-aux.c
-f:sound/soc/codecs/aw8738.c
-f:sound/soc/codecs/aw87390.c
-f:sound/soc/codecs/aw87390.h
-f:sound/soc/codecs/aw88081.c
-f:sound/soc/codecs/aw88081.h
-f:sound/soc/codecs/aw88166.c
-f:sound/soc/codecs/aw88166.h
-f:sound/soc/codecs/aw88261.c
-f:sound/soc/codecs/aw88261.h
-f:sound/soc/codecs/aw88395/aw88395.c
-f:sound/soc/codecs/aw88395/aw88395.h
-f:sound/soc/codecs/aw88395/aw88395_data_type.h
-f:sound/soc/codecs/aw88395/aw88395_device.c
-f:sound/soc/codecs/aw88395/aw88395_device.h
-f:sound/soc/codecs/aw88395/aw88395_lib.c
-f:sound/soc/codecs/aw88395/aw88395_lib.h
-f:sound/soc/codecs/aw88395/aw88395_reg.h
-f:sound/soc/codecs/aw88399.c
-f:sound/soc/codecs/aw88399.h
-f:sound/soc/codecs/bd28623.c
-f:sound/soc/codecs/bt-sco.c
-f:sound/soc/codecs/chv3-codec.c
-f:sound/soc/codecs/cirrus_legacy.h
-f:sound/soc/codecs/cpcap.c
-f:sound/soc/codecs/cq93vc.c
-f:sound/soc/codecs/cros_ec_codec.c
-f:sound/soc/codecs/cs-amp-lib-test.c
-f:sound/soc/codecs/cs-amp-lib.c
-f:sound/soc/codecs/cs35l32.c
-f:sound/soc/codecs/cs35l32.h
-f:sound/soc/codecs/cs35l33.c
-f:sound/soc/codecs/cs35l33.h
-f:sound/soc/codecs/cs35l34.c
-f:sound/soc/codecs/cs35l34.h
-f:sound/soc/codecs/cs35l35.c
-f:sound/soc/codecs/cs35l35.h
-f:sound/soc/codecs/cs35l36.c
-f:sound/soc/codecs/cs35l36.h
-f:sound/soc/codecs/cs35l41-i2c.c
-f:sound/soc/codecs/cs35l41-lib.c
-f:sound/soc/codecs/cs35l41-spi.c
-f:sound/soc/codecs/cs35l41.c
-f:sound/soc/codecs/cs35l41.h
-f:sound/soc/codecs/cs35l45-i2c.c
-f:sound/soc/codecs/cs35l45-spi.c
-f:sound/soc/codecs/cs35l45-tables.c
-f:sound/soc/codecs/cs35l45.c
-f:sound/soc/codecs/cs35l45.h
-f:sound/soc/codecs/cs35l56-i2c.c
-f:sound/soc/codecs/cs35l56-sdw.c
-f:sound/soc/codecs/cs35l56-shared.c
-f:sound/soc/codecs/cs35l56-spi.c
-f:sound/soc/codecs/cs35l56.c
-f:sound/soc/codecs/cs35l56.h
-f:sound/soc/codecs/cs40l50-codec.c
-f:sound/soc/codecs/cs4234.c
-f:sound/soc/codecs/cs4234.h
-f:sound/soc/codecs/cs4265.c
-f:sound/soc/codecs/cs4265.h
-f:sound/soc/codecs/cs4270.c
-f:sound/soc/codecs/cs4271-i2c.c
-f:sound/soc/codecs/cs4271-spi.c
-f:sound/soc/codecs/cs4271.c
-f:sound/soc/codecs/cs4271.h
-f:sound/soc/codecs/cs42l42-i2c.c
-f:sound/soc/codecs/cs42l42-sdw.c
-f:sound/soc/codecs/cs42l42.c
-f:sound/soc/codecs/cs42l42.h
-f:sound/soc/codecs/cs42l43-jack.c
-f:sound/soc/codecs/cs42l43-sdw.c
-f:sound/soc/codecs/cs42l43.c
-f:sound/soc/codecs/cs42l43.h
-f:sound/soc/codecs/cs42l51-i2c.c
-f:sound/soc/codecs/cs42l51.c
-f:sound/soc/codecs/cs42l51.h
-f:sound/soc/codecs/cs42l52.c
-f:sound/soc/codecs/cs42l52.h
-f:sound/soc/codecs/cs42l56.c
-f:sound/soc/codecs/cs42l56.h
-f:sound/soc/codecs/cs42l73.c
-f:sound/soc/codecs/cs42l73.h
-f:sound/soc/codecs/cs42l83-i2c.c
-f:sound/soc/codecs/cs42l84.c
-f:sound/soc/codecs/cs42l84.h
-f:sound/soc/codecs/cs42xx8-i2c.c
-f:sound/soc/codecs/cs42xx8.c
-f:sound/soc/codecs/cs42xx8.h
-f:sound/soc/codecs/cs43130.c
-f:sound/soc/codecs/cs43130.h
-f:sound/soc/codecs/cs4341.c
-f:sound/soc/codecs/cs4349.c
-f:sound/soc/codecs/cs4349.h
-f:sound/soc/codecs/cs47l15.c
-f:sound/soc/codecs/cs47l24.c
-f:sound/soc/codecs/cs47l24.h
-f:sound/soc/codecs/cs47l35.c
-f:sound/soc/codecs/cs47l85.c
-f:sound/soc/codecs/cs47l90.c
-f:sound/soc/codecs/cs47l92.c
-f:sound/soc/codecs/cs48l32-tables.c
-f:sound/soc/codecs/cs48l32.c
-f:sound/soc/codecs/cs48l32.h
-f:sound/soc/codecs/cs530x-i2c.c
-f:sound/soc/codecs/cs530x.c
-f:sound/soc/codecs/cs530x.h
-f:sound/soc/codecs/cs53l30.c
-f:sound/soc/codecs/cs53l30.h
-f:sound/soc/codecs/cx20442.c
-f:sound/soc/codecs/cx20442.h
-f:sound/soc/codecs/cx2072x.c
-f:sound/soc/codecs/cx2072x.h
-f:sound/soc/codecs/da7210.c
-f:sound/soc/codecs/da7213.c
-f:sound/soc/codecs/da7213.h
-f:sound/soc/codecs/da7218.c
-f:sound/soc/codecs/da7218.h
-f:sound/soc/codecs/da7219-aad.c
-f:sound/soc/codecs/da7219-aad.h
-f:sound/soc/codecs/da7219.c
-f:sound/soc/codecs/da7219.h
-f:sound/soc/codecs/da732x.c
-f:sound/soc/codecs/da732x.h
-f:sound/soc/codecs/da732x_reg.h
-f:sound/soc/codecs/da9055.c
-f:sound/soc/codecs/dmic.c
-f:sound/soc/codecs/es7134.c
-f:sound/soc/codecs/es7241.c
-f:sound/soc/codecs/es8311.c
-f:sound/soc/codecs/es8311.h
-f:sound/soc/codecs/es8316.c
-f:sound/soc/codecs/es8316.h
-f:sound/soc/codecs/es8323.c
-f:sound/soc/codecs/es8323.h
-f:sound/soc/codecs/es8326.c
-f:sound/soc/codecs/es8326.h
-f:sound/soc/codecs/es8328-i2c.c
-f:sound/soc/codecs/es8328-spi.c
-f:sound/soc/codecs/es8328.c
-f:sound/soc/codecs/es8328.h
-f:sound/soc/codecs/es8375.c
-f:sound/soc/codecs/es8375.h
-f:sound/soc/codecs/es8389.c
-f:sound/soc/codecs/es8389.h
-f:sound/soc/codecs/es83xx-dsm-common.c
-f:sound/soc/codecs/es83xx-dsm-common.h
-f:sound/soc/codecs/framer-codec.c
-f:sound/soc/codecs/gtm601.c
-f:sound/soc/codecs/hda-dai.c
-f:sound/soc/codecs/hda.c
-f:sound/soc/codecs/hda.h
-f:sound/soc/codecs/hdac_hda.c
-f:sound/soc/codecs/hdac_hda.h
-f:sound/soc/codecs/hdac_hdmi.c
-f:sound/soc/codecs/hdmi-codec.c
-f:sound/soc/codecs/ics43432.c
-f:sound/soc/codecs/idt821034.c
-f:sound/soc/codecs/inno_rk3036.c
-f:sound/soc/codecs/inno_rk3036.h
-f:sound/soc/codecs/isabelle.c
-f:sound/soc/codecs/isabelle.h
-f:sound/soc/codecs/jz4725b.c
-f:sound/soc/codecs/jz4740.c
-f:sound/soc/codecs/jz4760.c
-f:sound/soc/codecs/jz4770.c
-f:sound/soc/codecs/lm4857.c
-f:sound/soc/codecs/lm49453.c
-f:sound/soc/codecs/lm49453.h
-f:sound/soc/codecs/lochnagar-sc.c
-f:sound/soc/codecs/lpass-macro-common.c
-f:sound/soc/codecs/lpass-macro-common.h
-f:sound/soc/codecs/lpass-rx-macro.c
-f:sound/soc/codecs/lpass-tx-macro.c
-f:sound/soc/codecs/lpass-va-macro.c
-f:sound/soc/codecs/lpass-wsa-macro.c
-f:sound/soc/codecs/lpass-wsa-macro.h
-f:sound/soc/codecs/madera.c
-f:sound/soc/codecs/madera.h
-f:sound/soc/codecs/max9759.c
-f:sound/soc/codecs/max9768.c
-f:sound/soc/codecs/max98088.c
-f:sound/soc/codecs/max98088.h
-f:sound/soc/codecs/max98090.c
-f:sound/soc/codecs/max98090.h
-f:sound/soc/codecs/max98095.c
-f:sound/soc/codecs/max98095.h
-f:sound/soc/codecs/max98357a.c
-f:sound/soc/codecs/max98363.c
-f:sound/soc/codecs/max98363.h
-f:sound/soc/codecs/max98371.c
-f:sound/soc/codecs/max98371.h
-f:sound/soc/codecs/max98373-i2c.c
-f:sound/soc/codecs/max98373-sdw.c
-f:sound/soc/codecs/max98373-sdw.h
-f:sound/soc/codecs/max98373.c
-f:sound/soc/codecs/max98373.h
-f:sound/soc/codecs/max98388.c
-f:sound/soc/codecs/max98388.h
-f:sound/soc/codecs/max98390.c
-f:sound/soc/codecs/max98390.h
-f:sound/soc/codecs/max98396.c
-f:sound/soc/codecs/max98396.h
-f:sound/soc/codecs/max9850.c
-f:sound/soc/codecs/max9850.h
-f:sound/soc/codecs/max98504.c
-f:sound/soc/codecs/max98504.h
-f:sound/soc/codecs/max98520.c
-f:sound/soc/codecs/max98520.h
-f:sound/soc/codecs/max9860.c
-f:sound/soc/codecs/max9860.h
-f:sound/soc/codecs/max9867.c
-f:sound/soc/codecs/max9867.h
-f:sound/soc/codecs/max9877.c
-f:sound/soc/codecs/max9877.h
-f:sound/soc/codecs/max98925.c
-f:sound/soc/codecs/max98925.h
-f:sound/soc/codecs/max98926.c
-f:sound/soc/codecs/max98926.h
-f:sound/soc/codecs/max98927.c
-f:sound/soc/codecs/max98927.h
-f:sound/soc/codecs/mc13783.c
-f:sound/soc/codecs/mc13783.h
-f:sound/soc/codecs/ml26124.c
-f:sound/soc/codecs/ml26124.h
-f:sound/soc/codecs/msm8916-wcd-analog.c
-f:sound/soc/codecs/msm8916-wcd-digital.c
-f:sound/soc/codecs/mt6351.c
-f:sound/soc/codecs/mt6351.h
-f:sound/soc/codecs/mt6357.c
-f:sound/soc/codecs/mt6357.h
-f:sound/soc/codecs/mt6358.c
-f:sound/soc/codecs/mt6358.h
-f:sound/soc/codecs/mt6359-accdet.c
-f:sound/soc/codecs/mt6359-accdet.h
-f:sound/soc/codecs/mt6359.c
-f:sound/soc/codecs/mt6359.h
-f:sound/soc/codecs/mt6660.c
-f:sound/soc/codecs/mt6660.h
-f:sound/soc/codecs/nau8315.c
-f:sound/soc/codecs/nau8325.c
-f:sound/soc/codecs/nau8325.h
-f:sound/soc/codecs/nau8540.c
-f:sound/soc/codecs/nau8540.h
-f:sound/soc/codecs/nau8810.c
-f:sound/soc/codecs/nau8810.h
-f:sound/soc/codecs/nau8821.c
-f:sound/soc/codecs/nau8821.h
-f:sound/soc/codecs/nau8822.c
-f:sound/soc/codecs/nau8822.h
-f:sound/soc/codecs/nau8824.c
-f:sound/soc/codecs/nau8824.h
-f:sound/soc/codecs/nau8825.c
-f:sound/soc/codecs/nau8825.h
-f:sound/soc/codecs/ntp8835.c
-f:sound/soc/codecs/ntp8918.c
-f:sound/soc/codecs/ntpfw.c
-f:sound/soc/codecs/ntpfw.h
-f:sound/soc/codecs/pcm1681.c
-f:sound/soc/codecs/pcm1789-i2c.c
-f:sound/soc/codecs/pcm1789.c
-f:sound/soc/codecs/pcm1789.h
-f:sound/soc/codecs/pcm179x-i2c.c
-f:sound/soc/codecs/pcm179x-spi.c
-f:sound/soc/codecs/pcm179x.c
-f:sound/soc/codecs/pcm179x.h
-f:sound/soc/codecs/pcm186x-i2c.c
-f:sound/soc/codecs/pcm186x-spi.c
-f:sound/soc/codecs/pcm186x.c
-f:sound/soc/codecs/pcm186x.h
-f:sound/soc/codecs/pcm3008.c
-f:sound/soc/codecs/pcm3060-i2c.c
-f:sound/soc/codecs/pcm3060-spi.c
-f:sound/soc/codecs/pcm3060.c
-f:sound/soc/codecs/pcm3060.h
-f:sound/soc/codecs/pcm3168a-i2c.c
-f:sound/soc/codecs/pcm3168a-spi.c
-f:sound/soc/codecs/pcm3168a.c
-f:sound/soc/codecs/pcm3168a.h
-f:sound/soc/codecs/pcm5102a.c
-f:sound/soc/codecs/pcm512x-i2c.c
-f:sound/soc/codecs/pcm512x-spi.c
-f:sound/soc/codecs/pcm512x.c
-f:sound/soc/codecs/pcm512x.h
-f:sound/soc/codecs/pcm6240.c
-f:sound/soc/codecs/pcm6240.h
-f:sound/soc/codecs/peb2466.c
-f:sound/soc/codecs/rk3308_codec.c
-f:sound/soc/codecs/rk3308_codec.h
-f:sound/soc/codecs/rk3328_codec.c
-f:sound/soc/codecs/rk3328_codec.h
-f:sound/soc/codecs/rk817_codec.c
-f:sound/soc/codecs/rl6231.c
-f:sound/soc/codecs/rl6231.h
-f:sound/soc/codecs/rl6347a.c
-f:sound/soc/codecs/rl6347a.h
-f:sound/soc/codecs/rt-sdw-common.c
-f:sound/soc/codecs/rt-sdw-common.h
-f:sound/soc/codecs/rt1011.c
-f:sound/soc/codecs/rt1011.h
-f:sound/soc/codecs/rt1015.c
-f:sound/soc/codecs/rt1015.h
-f:sound/soc/codecs/rt1015p.c
-f:sound/soc/codecs/rt1016.c
-f:sound/soc/codecs/rt1016.h
-f:sound/soc/codecs/rt1017-sdca-sdw.c
-f:sound/soc/codecs/rt1017-sdca-sdw.h
-f:sound/soc/codecs/rt1019.c
-f:sound/soc/codecs/rt1019.h
-f:sound/soc/codecs/rt1305.c
-f:sound/soc/codecs/rt1305.h
-f:sound/soc/codecs/rt1308-sdw.c
-f:sound/soc/codecs/rt1308-sdw.h
-f:sound/soc/codecs/rt1308.c
-f:sound/soc/codecs/rt1308.h
-f:sound/soc/codecs/rt1316-sdw.c
-f:sound/soc/codecs/rt1316-sdw.h
-f:sound/soc/codecs/rt1318-sdw.c
-f:sound/soc/codecs/rt1318-sdw.h
-f:sound/soc/codecs/rt1318.c
-f:sound/soc/codecs/rt1318.h
-f:sound/soc/codecs/rt1320-sdw.c
-f:sound/soc/codecs/rt1320-sdw.h
-f:sound/soc/codecs/rt274.c
-f:sound/soc/codecs/rt274.h
-f:sound/soc/codecs/rt286.c
-f:sound/soc/codecs/rt286.h
-f:sound/soc/codecs/rt298.c
-f:sound/soc/codecs/rt298.h
-f:sound/soc/codecs/rt5514-spi.c
-f:sound/soc/codecs/rt5514-spi.h
-f:sound/soc/codecs/rt5514.c
-f:sound/soc/codecs/rt5514.h
-f:sound/soc/codecs/rt5616.c
-f:sound/soc/codecs/rt5616.h
-f:sound/soc/codecs/rt5631.c
-f:sound/soc/codecs/rt5631.h
-f:sound/soc/codecs/rt5640.c
-f:sound/soc/codecs/rt5640.h
-f:sound/soc/codecs/rt5645.c
-f:sound/soc/codecs/rt5645.h
-f:sound/soc/codecs/rt5651.c
-f:sound/soc/codecs/rt5651.h
-f:sound/soc/codecs/rt5659.c
-f:sound/soc/codecs/rt5659.h
-f:sound/soc/codecs/rt5660.c
-f:sound/soc/codecs/rt5660.h
-f:sound/soc/codecs/rt5663.c
-f:sound/soc/codecs/rt5663.h
-f:sound/soc/codecs/rt5665.c
-f:sound/soc/codecs/rt5665.h
-f:sound/soc/codecs/rt5668.c
-f:sound/soc/codecs/rt5668.h
-f:sound/soc/codecs/rt5670-dsp.h
-f:sound/soc/codecs/rt5670.c
-f:sound/soc/codecs/rt5670.h
-f:sound/soc/codecs/rt5677-spi.c
-f:sound/soc/codecs/rt5677-spi.h
-f:sound/soc/codecs/rt5677.c
-f:sound/soc/codecs/rt5677.h
-f:sound/soc/codecs/rt5682-i2c.c
-f:sound/soc/codecs/rt5682-sdw.c
-f:sound/soc/codecs/rt5682.c
-f:sound/soc/codecs/rt5682.h
-f:sound/soc/codecs/rt5682s.c
-f:sound/soc/codecs/rt5682s.h
-f:sound/soc/codecs/rt700-sdw.c
-f:sound/soc/codecs/rt700-sdw.h
-f:sound/soc/codecs/rt700.c
-f:sound/soc/codecs/rt700.h
-f:sound/soc/codecs/rt711-sdca-sdw.c
-f:sound/soc/codecs/rt711-sdca-sdw.h
-f:sound/soc/codecs/rt711-sdca.c
-f:sound/soc/codecs/rt711-sdca.h
-f:sound/soc/codecs/rt711-sdw.c
-f:sound/soc/codecs/rt711-sdw.h
-f:sound/soc/codecs/rt711.c
-f:sound/soc/codecs/rt711.h
-f:sound/soc/codecs/rt712-sdca-dmic.c
-f:sound/soc/codecs/rt712-sdca-dmic.h
-f:sound/soc/codecs/rt712-sdca-sdw.c
-f:sound/soc/codecs/rt712-sdca-sdw.h
-f:sound/soc/codecs/rt712-sdca.c
-f:sound/soc/codecs/rt712-sdca.h
-f:sound/soc/codecs/rt715-sdca-sdw.c
-f:sound/soc/codecs/rt715-sdca-sdw.h
-f:sound/soc/codecs/rt715-sdca.c
-f:sound/soc/codecs/rt715-sdca.h
-f:sound/soc/codecs/rt715-sdw.c
-f:sound/soc/codecs/rt715-sdw.h
-f:sound/soc/codecs/rt715.c
-f:sound/soc/codecs/rt715.h
-f:sound/soc/codecs/rt721-sdca-sdw.c
-f:sound/soc/codecs/rt721-sdca-sdw.h
-f:sound/soc/codecs/rt721-sdca.c
-f:sound/soc/codecs/rt721-sdca.h
-f:sound/soc/codecs/rt722-sdca-sdw.c
-f:sound/soc/codecs/rt722-sdca-sdw.h
-f:sound/soc/codecs/rt722-sdca.c
-f:sound/soc/codecs/rt722-sdca.h
-f:sound/soc/codecs/rt9120.c
-f:sound/soc/codecs/rt9123.c
-f:sound/soc/codecs/rt9123p.c
-f:sound/soc/codecs/rtq9124.c
-f:sound/soc/codecs/rtq9128.c
-f:sound/soc/codecs/sdw-mockup.c
-f:sound/soc/codecs/sgtl5000.c
-f:sound/soc/codecs/sgtl5000.h
-f:sound/soc/codecs/si476x.c
-f:sound/soc/codecs/sigmadsp-i2c.c
-f:sound/soc/codecs/sigmadsp-regmap.c
-f:sound/soc/codecs/sigmadsp.c
-f:sound/soc/codecs/sigmadsp.h
-f:sound/soc/codecs/simple-amplifier.c
-f:sound/soc/codecs/simple-mux.c
-f:sound/soc/codecs/sma1303.c
-f:sound/soc/codecs/sma1303.h
-f:sound/soc/codecs/sma1307.c
-f:sound/soc/codecs/sma1307.h
-f:sound/soc/codecs/spdif_receiver.c
-f:sound/soc/codecs/spdif_transmitter.c
-f:sound/soc/codecs/src4xxx-i2c.c
-f:sound/soc/codecs/src4xxx.c
-f:sound/soc/codecs/src4xxx.h
-f:sound/soc/codecs/ssm2305.c
-f:sound/soc/codecs/ssm2518.c
-f:sound/soc/codecs/ssm2518.h
-f:sound/soc/codecs/ssm2602-i2c.c
-f:sound/soc/codecs/ssm2602-spi.c
-f:sound/soc/codecs/ssm2602.c
-f:sound/soc/codecs/ssm2602.h
-f:sound/soc/codecs/ssm3515.c
-f:sound/soc/codecs/ssm4567.c
-f:sound/soc/codecs/sta32x.c
-f:sound/soc/codecs/sta32x.h
-f:sound/soc/codecs/sta350.c
-f:sound/soc/codecs/sta350.h
-f:sound/soc/codecs/sta529.c
-f:sound/soc/codecs/stac9766.c
-f:sound/soc/codecs/sti-sas.c
-f:sound/soc/codecs/tas2552.c
-f:sound/soc/codecs/tas2552.h
-f:sound/soc/codecs/tas2562.c
-f:sound/soc/codecs/tas2562.h
-f:sound/soc/codecs/tas2764-quirks.h
-f:sound/soc/codecs/tas2764.c
-f:sound/soc/codecs/tas2764.h
-f:sound/soc/codecs/tas2770.c
-f:sound/soc/codecs/tas2770.h
-f:sound/soc/codecs/tas2780.c
-f:sound/soc/codecs/tas2780.h
-f:sound/soc/codecs/tas2781-comlib-i2c.c
-f:sound/soc/codecs/tas2781-comlib.c
-f:sound/soc/codecs/tas2781-fmwlib.c
-f:sound/soc/codecs/tas2781-i2c.c
-f:sound/soc/codecs/tas5086.c
-f:sound/soc/codecs/tas571x.c
-f:sound/soc/codecs/tas571x.h
-f:sound/soc/codecs/tas5720.c
-f:sound/soc/codecs/tas5720.h
-f:sound/soc/codecs/tas5805m.c
-f:sound/soc/codecs/tas6424.c
-f:sound/soc/codecs/tas6424.h
-f:sound/soc/codecs/tda7419.c
-f:sound/soc/codecs/tfa9879.c
-f:sound/soc/codecs/tfa9879.h
-f:sound/soc/codecs/tfa989x.c
-f:sound/soc/codecs/tlv320adc3xxx.c
-f:sound/soc/codecs/tlv320adcx140.c
-f:sound/soc/codecs/tlv320adcx140.h
-f:sound/soc/codecs/tlv320aic23-i2c.c
-f:sound/soc/codecs/tlv320aic23-spi.c
-f:sound/soc/codecs/tlv320aic23.c
-f:sound/soc/codecs/tlv320aic23.h
-f:sound/soc/codecs/tlv320aic26.c
-f:sound/soc/codecs/tlv320aic26.h
-f:sound/soc/codecs/tlv320aic31xx.c
-f:sound/soc/codecs/tlv320aic31xx.h
-f:sound/soc/codecs/tlv320aic32x4-clk.c
-f:sound/soc/codecs/tlv320aic32x4-i2c.c
-f:sound/soc/codecs/tlv320aic32x4-spi.c
-f:sound/soc/codecs/tlv320aic32x4.c
-f:sound/soc/codecs/tlv320aic32x4.h
-f:sound/soc/codecs/tlv320aic3x-i2c.c
-f:sound/soc/codecs/tlv320aic3x-spi.c
-f:sound/soc/codecs/tlv320aic3x.c
-f:sound/soc/codecs/tlv320aic3x.h
-f:sound/soc/codecs/tlv320dac33.c
-f:sound/soc/codecs/tlv320dac33.h
-f:sound/soc/codecs/tpa6130a2.c
-f:sound/soc/codecs/tpa6130a2.h
-f:sound/soc/codecs/ts3a227e.c
-f:sound/soc/codecs/ts3a227e.h
-f:sound/soc/codecs/tscs42xx.c
-f:sound/soc/codecs/tscs42xx.h
-f:sound/soc/codecs/tscs454.c
-f:sound/soc/codecs/tscs454.h
-f:sound/soc/codecs/twl4030.c
-f:sound/soc/codecs/twl6040.c
-f:sound/soc/codecs/twl6040.h
-f:sound/soc/codecs/uda1334.c
-f:sound/soc/codecs/uda1342.c
-f:sound/soc/codecs/uda1342.h
-f:sound/soc/codecs/uda1380.c
-f:sound/soc/codecs/uda1380.h
-f:sound/soc/codecs/wcd-clsh-v2.c
-f:sound/soc/codecs/wcd-clsh-v2.h
-f:sound/soc/codecs/wcd-mbhc-v2.c
-f:sound/soc/codecs/wcd-mbhc-v2.h
-f:sound/soc/codecs/wcd9335.c
-f:sound/soc/codecs/wcd9335.h
-f:sound/soc/codecs/wcd934x.c
-f:sound/soc/codecs/wcd937x-sdw.c
-f:sound/soc/codecs/wcd937x.c
-f:sound/soc/codecs/wcd937x.h
-f:sound/soc/codecs/wcd938x-sdw.c
-f:sound/soc/codecs/wcd938x.c
-f:sound/soc/codecs/wcd938x.h
-f:sound/soc/codecs/wcd939x-sdw.c
-f:sound/soc/codecs/wcd939x.c
-f:sound/soc/codecs/wcd939x.h
-f:sound/soc/codecs/wl1273.c
-f:sound/soc/codecs/wl1273.h
-f:sound/soc/codecs/wm0010.c
-f:sound/soc/codecs/wm1250-ev1.c
-f:sound/soc/codecs/wm2000.c
-f:sound/soc/codecs/wm2000.h
-f:sound/soc/codecs/wm2200.c
-f:sound/soc/codecs/wm2200.h
-f:sound/soc/codecs/wm5100-tables.c
-f:sound/soc/codecs/wm5100.c
-f:sound/soc/codecs/wm5100.h
-f:sound/soc/codecs/wm5102.c
-f:sound/soc/codecs/wm5102.h
-f:sound/soc/codecs/wm5110.c
-f:sound/soc/codecs/wm5110.h
-f:sound/soc/codecs/wm8350.c
-f:sound/soc/codecs/wm8350.h
-f:sound/soc/codecs/wm8400.c
-f:sound/soc/codecs/wm8400.h
-f:sound/soc/codecs/wm8510.c
-f:sound/soc/codecs/wm8510.h
-f:sound/soc/codecs/wm8523.c
-f:sound/soc/codecs/wm8523.h
-f:sound/soc/codecs/wm8524.c
-f:sound/soc/codecs/wm8580.c
-f:sound/soc/codecs/wm8580.h
-f:sound/soc/codecs/wm8711.c
-f:sound/soc/codecs/wm8711.h
-f:sound/soc/codecs/wm8727.c
-f:sound/soc/codecs/wm8728.c
-f:sound/soc/codecs/wm8728.h
-f:sound/soc/codecs/wm8731-i2c.c
-f:sound/soc/codecs/wm8731-spi.c
-f:sound/soc/codecs/wm8731.c
-f:sound/soc/codecs/wm8731.h
-f:sound/soc/codecs/wm8737.c
-f:sound/soc/codecs/wm8737.h
-f:sound/soc/codecs/wm8741.c
-f:sound/soc/codecs/wm8741.h
-f:sound/soc/codecs/wm8750.c
-f:sound/soc/codecs/wm8750.h
-f:sound/soc/codecs/wm8753.c
-f:sound/soc/codecs/wm8753.h
-f:sound/soc/codecs/wm8770.c
-f:sound/soc/codecs/wm8770.h
-f:sound/soc/codecs/wm8776.c
-f:sound/soc/codecs/wm8776.h
-f:sound/soc/codecs/wm8782.c
-f:sound/soc/codecs/wm8804-i2c.c
-f:sound/soc/codecs/wm8804-spi.c
-f:sound/soc/codecs/wm8804.c
-f:sound/soc/codecs/wm8804.h
-f:sound/soc/codecs/wm8900.c
-f:sound/soc/codecs/wm8900.h
-f:sound/soc/codecs/wm8903.c
-f:sound/soc/codecs/wm8903.h
-f:sound/soc/codecs/wm8904.c
-f:sound/soc/codecs/wm8904.h
-f:sound/soc/codecs/wm8940.c
-f:sound/soc/codecs/wm8940.h
-f:sound/soc/codecs/wm8955.c
-f:sound/soc/codecs/wm8955.h
-f:sound/soc/codecs/wm8958-dsp2.c
-f:sound/soc/codecs/wm8960.c
-f:sound/soc/codecs/wm8960.h
-f:sound/soc/codecs/wm8961.c
-f:sound/soc/codecs/wm8961.h
-f:sound/soc/codecs/wm8962.c
-f:sound/soc/codecs/wm8962.h
-f:sound/soc/codecs/wm8971.c
-f:sound/soc/codecs/wm8971.h
-f:sound/soc/codecs/wm8974.c
-f:sound/soc/codecs/wm8974.h
-f:sound/soc/codecs/wm8978.c
-f:sound/soc/codecs/wm8978.h
-f:sound/soc/codecs/wm8983.c
-f:sound/soc/codecs/wm8983.h
-f:sound/soc/codecs/wm8985.c
-f:sound/soc/codecs/wm8985.h
-f:sound/soc/codecs/wm8988.c
-f:sound/soc/codecs/wm8988.h
-f:sound/soc/codecs/wm8990.c
-f:sound/soc/codecs/wm8990.h
-f:sound/soc/codecs/wm8991.c
-f:sound/soc/codecs/wm8991.h
-f:sound/soc/codecs/wm8993.c
-f:sound/soc/codecs/wm8993.h
-f:sound/soc/codecs/wm8994.c
-f:sound/soc/codecs/wm8994.h
-f:sound/soc/codecs/wm8995.c
-f:sound/soc/codecs/wm8995.h
-f:sound/soc/codecs/wm8996.c
-f:sound/soc/codecs/wm8996.h
-f:sound/soc/codecs/wm8997.c
-f:sound/soc/codecs/wm8997.h
-f:sound/soc/codecs/wm8998.c
-f:sound/soc/codecs/wm8998.h
-f:sound/soc/codecs/wm9081.c
-f:sound/soc/codecs/wm9081.h
-f:sound/soc/codecs/wm9090.c
-f:sound/soc/codecs/wm9090.h
-f:sound/soc/codecs/wm9705.c
-f:sound/soc/codecs/wm9712.c
-f:sound/soc/codecs/wm9713.c
-f:sound/soc/codecs/wm9713.h
-f:sound/soc/codecs/wm_adsp.c
-f:sound/soc/codecs/wm_adsp.h
-f:sound/soc/codecs/wm_hubs.c
-f:sound/soc/codecs/wm_hubs.h
-f:sound/soc/codecs/wsa881x.c
-f:sound/soc/codecs/wsa883x.c
-f:sound/soc/codecs/wsa884x.c
-f:sound/soc/codecs/zl38060.c
-f:sound/soc/dwc/Kconfig
-f:sound/soc/dwc/Makefile
-f:sound/soc/dwc/dwc-i2s.c
-f:sound/soc/dwc/dwc-pcm.c
-f:sound/soc/dwc/local.h
-f:sound/soc/fsl/Kconfig
-f:sound/soc/fsl/Makefile
-f:sound/soc/fsl/efika-audio-fabric.c
-f:sound/soc/fsl/eukrea-tlv320.c
-f:sound/soc/fsl/fsl-asoc-card.c
-f:sound/soc/fsl/fsl_asrc.c
-f:sound/soc/fsl/fsl_asrc.h
-f:sound/soc/fsl/fsl_asrc_common.h
-f:sound/soc/fsl/fsl_asrc_dma.c
-f:sound/soc/fsl/fsl_asrc_m2m.c
-f:sound/soc/fsl/fsl_aud2htx.c
-f:sound/soc/fsl/fsl_aud2htx.h
-f:sound/soc/fsl/fsl_audmix.c
-f:sound/soc/fsl/fsl_audmix.h
-f:sound/soc/fsl/fsl_dma.c
-f:sound/soc/fsl/fsl_dma.h
-f:sound/soc/fsl/fsl_easrc.c
-f:sound/soc/fsl/fsl_easrc.h
-f:sound/soc/fsl/fsl_esai.c
-f:sound/soc/fsl/fsl_esai.h
-f:sound/soc/fsl/fsl_micfil.c
-f:sound/soc/fsl/fsl_micfil.h
-f:sound/soc/fsl/fsl_mqs.c
-f:sound/soc/fsl/fsl_qmc_audio.c
-f:sound/soc/fsl/fsl_rpmsg.c
-f:sound/soc/fsl/fsl_rpmsg.h
-f:sound/soc/fsl/fsl_sai.c
-f:sound/soc/fsl/fsl_sai.h
-f:sound/soc/fsl/fsl_spdif.c
-f:sound/soc/fsl/fsl_spdif.h
-f:sound/soc/fsl/fsl_ssi.c
-f:sound/soc/fsl/fsl_ssi.h
-f:sound/soc/fsl/fsl_ssi_dbg.c
-f:sound/soc/fsl/fsl_utils.c
-f:sound/soc/fsl/fsl_utils.h
-f:sound/soc/fsl/fsl_xcvr.c
-f:sound/soc/fsl/fsl_xcvr.h
-f:sound/soc/fsl/imx-audio-rpmsg.c
-f:sound/soc/fsl/imx-audmix.c
-f:sound/soc/fsl/imx-audmux.c
-f:sound/soc/fsl/imx-audmux.h
-f:sound/soc/fsl/imx-card.c
-f:sound/soc/fsl/imx-es8328.c
-f:sound/soc/fsl/imx-hdmi.c
-f:sound/soc/fsl/imx-pcm-dma.c
-f:sound/soc/fsl/imx-pcm-fiq.c
-f:sound/soc/fsl/imx-pcm-rpmsg.c
-f:sound/soc/fsl/imx-pcm-rpmsg.h
-f:sound/soc/fsl/imx-pcm.h
-f:sound/soc/fsl/imx-rpmsg.c
-f:sound/soc/fsl/imx-sgtl5000.c
-f:sound/soc/fsl/imx-ssi.h
-f:sound/soc/fsl/lpc3xxx-i2s.c
-f:sound/soc/fsl/lpc3xxx-i2s.h
-f:sound/soc/fsl/lpc3xxx-pcm.c
-f:sound/soc/fsl/mpc5200_dma.c
-f:sound/soc/fsl/mpc5200_dma.h
-f:sound/soc/fsl/mpc5200_psc_ac97.c
-f:sound/soc/fsl/mpc5200_psc_i2s.c
-f:sound/soc/fsl/p1022_ds.c
-f:sound/soc/fsl/p1022_rdk.c
-f:sound/soc/fsl/pcm030-audio-fabric.c
-f:sound/soc/generic/Kconfig
-f:sound/soc/generic/Makefile
-f:sound/soc/generic/audio-graph-card.c
-f:sound/soc/generic/audio-graph-card2-custom-sample.c
-f:sound/soc/generic/audio-graph-card2-custom-sample1.dtsi
-f:sound/soc/generic/audio-graph-card2-custom-sample2.dtsi
-f:sound/soc/generic/audio-graph-card2.c
-f:sound/soc/generic/simple-card-utils.c
-f:sound/soc/generic/simple-card.c
-f:sound/soc/generic/test-component.c
-f:sound/soc/google/Kconfig
-f:sound/soc/google/Makefile
-f:sound/soc/google/chv3-i2s.c
-f:sound/soc/hisilicon/Kconfig
-f:sound/soc/hisilicon/Makefile
-f:sound/soc/hisilicon/hi6210-i2s.c
-f:sound/soc/hisilicon/hi6210-i2s.h
-f:sound/soc/img/Kconfig
-f:sound/soc/img/Makefile
-f:sound/soc/img/img-i2s-in.c
-f:sound/soc/img/img-i2s-out.c
-f:sound/soc/img/img-parallel-out.c
-f:sound/soc/img/img-spdif-in.c
-f:sound/soc/img/img-spdif-out.c
-f:sound/soc/img/pistachio-internal-dac.c
-f:sound/soc/intel/Kconfig
-f:sound/soc/intel/Makefile
-f:sound/soc/intel/atom/Makefile
-f:sound/soc/intel/atom/sst-atom-controls.c
-f:sound/soc/intel/atom/sst-atom-controls.h
-f:sound/soc/intel/atom/sst-mfld-dsp.h
-f:sound/soc/intel/atom/sst-mfld-platform-compress.c
-f:sound/soc/intel/atom/sst-mfld-platform-pcm.c
-f:sound/soc/intel/atom/sst-mfld-platform.h
-f:sound/soc/intel/atom/sst/Makefile
-f:sound/soc/intel/atom/sst/sst.c
-f:sound/soc/intel/atom/sst/sst.h
-f:sound/soc/intel/atom/sst/sst_acpi.c
-f:sound/soc/intel/atom/sst/sst_drv_interface.c
-f:sound/soc/intel/atom/sst/sst_ipc.c
-f:sound/soc/intel/atom/sst/sst_loader.c
-f:sound/soc/intel/atom/sst/sst_pci.c
-f:sound/soc/intel/atom/sst/sst_pvt.c
-f:sound/soc/intel/atom/sst/sst_stream.c
-f:sound/soc/intel/avs/Makefile
-f:sound/soc/intel/avs/apl.c
-f:sound/soc/intel/avs/avs.h
-f:sound/soc/intel/avs/board_selection.c
-f:sound/soc/intel/avs/boards/Kconfig
-f:sound/soc/intel/avs/boards/Makefile
-f:sound/soc/intel/avs/boards/da7219.c
-f:sound/soc/intel/avs/boards/dmic.c
-f:sound/soc/intel/avs/boards/es8336.c
-f:sound/soc/intel/avs/boards/hdaudio.c
-f:sound/soc/intel/avs/boards/i2s_test.c
-f:sound/soc/intel/avs/boards/max98357a.c
-f:sound/soc/intel/avs/boards/max98373.c
-f:sound/soc/intel/avs/boards/max98927.c
-f:sound/soc/intel/avs/boards/nau8825.c
-f:sound/soc/intel/avs/boards/pcm3168a.c
-f:sound/soc/intel/avs/boards/probe.c
-f:sound/soc/intel/avs/boards/rt274.c
-f:sound/soc/intel/avs/boards/rt286.c
-f:sound/soc/intel/avs/boards/rt298.c
-f:sound/soc/intel/avs/boards/rt5514.c
-f:sound/soc/intel/avs/boards/rt5640.c
-f:sound/soc/intel/avs/boards/rt5663.c
-f:sound/soc/intel/avs/boards/rt5682.c
-f:sound/soc/intel/avs/boards/ssm4567.c
-f:sound/soc/intel/avs/cldma.c
-f:sound/soc/intel/avs/cldma.h
-f:sound/soc/intel/avs/cnl.c
-f:sound/soc/intel/avs/control.c
-f:sound/soc/intel/avs/control.h
-f:sound/soc/intel/avs/core.c
-f:sound/soc/intel/avs/debugfs.c
-f:sound/soc/intel/avs/dsp.c
-f:sound/soc/intel/avs/icl.c
-f:sound/soc/intel/avs/ipc.c
-f:sound/soc/intel/avs/lnl.c
-f:sound/soc/intel/avs/loader.c
-f:sound/soc/intel/avs/messages.c
-f:sound/soc/intel/avs/messages.h
-f:sound/soc/intel/avs/mtl.c
-f:sound/soc/intel/avs/path.c
-f:sound/soc/intel/avs/path.h
-f:sound/soc/intel/avs/pcm.c
-f:sound/soc/intel/avs/pcm.h
-f:sound/soc/intel/avs/probes.c
-f:sound/soc/intel/avs/ptl.c
-f:sound/soc/intel/avs/registers.h
-f:sound/soc/intel/avs/skl.c
-f:sound/soc/intel/avs/sysfs.c
-f:sound/soc/intel/avs/tgl.c
-f:sound/soc/intel/avs/topology.c
-f:sound/soc/intel/avs/topology.h
-f:sound/soc/intel/avs/trace.c
-f:sound/soc/intel/avs/trace.h
-f:sound/soc/intel/avs/utils.c
-f:sound/soc/intel/avs/utils.h
-f:sound/soc/intel/boards/Kconfig
-f:sound/soc/intel/boards/Makefile
-f:sound/soc/intel/boards/bdw-rt5650.c
-f:sound/soc/intel/boards/bdw-rt5677.c
-f:sound/soc/intel/boards/bdw_rt286.c
-f:sound/soc/intel/boards/bytcht_cx2072x.c
-f:sound/soc/intel/boards/bytcht_da7213.c
-f:sound/soc/intel/boards/bytcht_es8316.c
-f:sound/soc/intel/boards/bytcht_nocodec.c
-f:sound/soc/intel/boards/bytcr_rt5640.c
-f:sound/soc/intel/boards/bytcr_rt5651.c
-f:sound/soc/intel/boards/bytcr_wm5102.c
-f:sound/soc/intel/boards/cht_bsw_max98090_ti.c
-f:sound/soc/intel/boards/cht_bsw_nau8824.c
-f:sound/soc/intel/boards/cht_bsw_rt5645.c
-f:sound/soc/intel/boards/cht_bsw_rt5672.c
-f:sound/soc/intel/boards/ehl_rt5660.c
-f:sound/soc/intel/boards/hda_dsp_common.c
-f:sound/soc/intel/boards/hda_dsp_common.h
-f:sound/soc/intel/boards/hsw_rt5640.c
-f:sound/soc/intel/boards/skl_hda_dsp_generic.c
-f:sound/soc/intel/boards/sof_board_helpers.c
-f:sound/soc/intel/boards/sof_board_helpers.h
-f:sound/soc/intel/boards/sof_cirrus_common.c
-f:sound/soc/intel/boards/sof_cirrus_common.h
-f:sound/soc/intel/boards/sof_cs42l42.c
-f:sound/soc/intel/boards/sof_da7219.c
-f:sound/soc/intel/boards/sof_es8336.c
-f:sound/soc/intel/boards/sof_hdmi_common.h
-f:sound/soc/intel/boards/sof_maxim_common.c
-f:sound/soc/intel/boards/sof_maxim_common.h
-f:sound/soc/intel/boards/sof_nau8825.c
-f:sound/soc/intel/boards/sof_nuvoton_common.c
-f:sound/soc/intel/boards/sof_nuvoton_common.h
-f:sound/soc/intel/boards/sof_pcm512x.c
-f:sound/soc/intel/boards/sof_realtek_common.c
-f:sound/soc/intel/boards/sof_realtek_common.h
-f:sound/soc/intel/boards/sof_rt5682.c
-f:sound/soc/intel/boards/sof_sdw.c
-f:sound/soc/intel/boards/sof_sdw_common.h
-f:sound/soc/intel/boards/sof_sdw_hdmi.c
-f:sound/soc/intel/boards/sof_ssp_amp.c
-f:sound/soc/intel/boards/sof_wm8804.c
-f:sound/soc/intel/catpt/Makefile
-f:sound/soc/intel/catpt/core.h
-f:sound/soc/intel/catpt/device.c
-f:sound/soc/intel/catpt/dsp.c
-f:sound/soc/intel/catpt/ipc.c
-f:sound/soc/intel/catpt/loader.c
-f:sound/soc/intel/catpt/messages.c
-f:sound/soc/intel/catpt/messages.h
-f:sound/soc/intel/catpt/pcm.c
-f:sound/soc/intel/catpt/registers.h
-f:sound/soc/intel/catpt/sysfs.c
-f:sound/soc/intel/catpt/trace.h
-f:sound/soc/intel/common/Makefile
-f:sound/soc/intel/common/soc-acpi-intel-adl-match.c
-f:sound/soc/intel/common/soc-acpi-intel-arl-match.c
-f:sound/soc/intel/common/soc-acpi-intel-bxt-match.c
-f:sound/soc/intel/common/soc-acpi-intel-byt-match.c
-f:sound/soc/intel/common/soc-acpi-intel-cfl-match.c
-f:sound/soc/intel/common/soc-acpi-intel-cht-match.c
-f:sound/soc/intel/common/soc-acpi-intel-cml-match.c
-f:sound/soc/intel/common/soc-acpi-intel-cnl-match.c
-f:sound/soc/intel/common/soc-acpi-intel-ehl-match.c
-f:sound/soc/intel/common/soc-acpi-intel-glk-match.c
-f:sound/soc/intel/common/soc-acpi-intel-hda-match.c
-f:sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c
-f:sound/soc/intel/common/soc-acpi-intel-icl-match.c
-f:sound/soc/intel/common/soc-acpi-intel-jsl-match.c
-f:sound/soc/intel/common/soc-acpi-intel-kbl-match.c
-f:sound/soc/intel/common/soc-acpi-intel-lnl-match.c
-f:sound/soc/intel/common/soc-acpi-intel-mtl-match.c
-f:sound/soc/intel/common/soc-acpi-intel-ptl-match.c
-f:sound/soc/intel/common/soc-acpi-intel-rpl-match.c
-f:sound/soc/intel/common/soc-acpi-intel-sdca-quirks.c
-f:sound/soc/intel/common/soc-acpi-intel-sdca-quirks.h
-f:sound/soc/intel/common/soc-acpi-intel-sdw-mockup-match.c
-f:sound/soc/intel/common/soc-acpi-intel-sdw-mockup-match.h
-f:sound/soc/intel/common/soc-acpi-intel-skl-match.c
-f:sound/soc/intel/common/soc-acpi-intel-ssp-common.c
-f:sound/soc/intel/common/soc-acpi-intel-tgl-match.c
-f:sound/soc/intel/common/soc-intel-quirks.h
-f:sound/soc/intel/common/sof-function-topology-lib.c
-f:sound/soc/intel/common/sof-function-topology-lib.h
-f:sound/soc/intel/keembay/Makefile
-f:sound/soc/intel/keembay/kmb_platform.c
-f:sound/soc/intel/keembay/kmb_platform.h
-f:sound/soc/jz4740/Kconfig
-f:sound/soc/jz4740/Makefile
-f:sound/soc/jz4740/jz4740-i2s.c
-f:sound/soc/kirkwood/Kconfig
-f:sound/soc/kirkwood/Makefile
-f:sound/soc/kirkwood/armada-370-db.c
-f:sound/soc/kirkwood/kirkwood-dma.c
-f:sound/soc/kirkwood/kirkwood-i2s.c
-f:sound/soc/kirkwood/kirkwood.h
-f:sound/soc/loongson/Kconfig
-f:sound/soc/loongson/Makefile
-f:sound/soc/loongson/loongson1_ac97.c
-f:sound/soc/loongson/loongson_card.c
-f:sound/soc/loongson/loongson_dma.c
-f:sound/soc/loongson/loongson_dma.h
-f:sound/soc/loongson/loongson_i2s.c
-f:sound/soc/loongson/loongson_i2s.h
-f:sound/soc/loongson/loongson_i2s_pci.c
-f:sound/soc/loongson/loongson_i2s_plat.c
-f:sound/soc/mediatek/Kconfig
-f:sound/soc/mediatek/Makefile
-f:sound/soc/mediatek/common/Makefile
-f:sound/soc/mediatek/common/mtk-afe-fe-dai.c
-f:sound/soc/mediatek/common/mtk-afe-fe-dai.h
-f:sound/soc/mediatek/common/mtk-afe-platform-driver.c
-f:sound/soc/mediatek/common/mtk-afe-platform-driver.h
-f:sound/soc/mediatek/common/mtk-base-afe.h
-f:sound/soc/mediatek/common/mtk-btcvsd.c
-f:sound/soc/mediatek/common/mtk-dai-adda-common.c
-f:sound/soc/mediatek/common/mtk-dai-adda-common.h
-f:sound/soc/mediatek/common/mtk-dsp-sof-common.c
-f:sound/soc/mediatek/common/mtk-dsp-sof-common.h
-f:sound/soc/mediatek/common/mtk-soc-card.h
-f:sound/soc/mediatek/common/mtk-soundcard-driver.c
-f:sound/soc/mediatek/common/mtk-soundcard-driver.h
-f:sound/soc/mediatek/mt2701/Makefile
-f:sound/soc/mediatek/mt2701/mt2701-afe-clock-ctrl.c
-f:sound/soc/mediatek/mt2701/mt2701-afe-clock-ctrl.h
-f:sound/soc/mediatek/mt2701/mt2701-afe-common.h
-f:sound/soc/mediatek/mt2701/mt2701-afe-pcm.c
-f:sound/soc/mediatek/mt2701/mt2701-cs42448.c
-f:sound/soc/mediatek/mt2701/mt2701-reg.h
-f:sound/soc/mediatek/mt2701/mt2701-wm8960.c
-f:sound/soc/mediatek/mt6797/Makefile
-f:sound/soc/mediatek/mt6797/mt6797-afe-clk.c
-f:sound/soc/mediatek/mt6797/mt6797-afe-clk.h
-f:sound/soc/mediatek/mt6797/mt6797-afe-common.h
-f:sound/soc/mediatek/mt6797/mt6797-afe-pcm.c
-f:sound/soc/mediatek/mt6797/mt6797-dai-adda.c
-f:sound/soc/mediatek/mt6797/mt6797-dai-hostless.c
-f:sound/soc/mediatek/mt6797/mt6797-dai-pcm.c
-f:sound/soc/mediatek/mt6797/mt6797-interconnection.h
-f:sound/soc/mediatek/mt6797/mt6797-mt6351.c
-f:sound/soc/mediatek/mt6797/mt6797-reg.h
-f:sound/soc/mediatek/mt7986/Makefile
-f:sound/soc/mediatek/mt7986/mt7986-afe-common.h
-f:sound/soc/mediatek/mt7986/mt7986-afe-pcm.c
-f:sound/soc/mediatek/mt7986/mt7986-dai-etdm.c
-f:sound/soc/mediatek/mt7986/mt7986-reg.h
-f:sound/soc/mediatek/mt7986/mt7986-wm8960.c
-f:sound/soc/mediatek/mt8173/Makefile
-f:sound/soc/mediatek/mt8173/mt8173-afe-common.h
-f:sound/soc/mediatek/mt8173/mt8173-afe-pcm.c
-f:sound/soc/mediatek/mt8173/mt8173-max98090.c
-f:sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c
-f:sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c
-f:sound/soc/mediatek/mt8173/mt8173-rt5650.c
-f:sound/soc/mediatek/mt8183/Makefile
-f:sound/soc/mediatek/mt8183/mt8183-afe-clk.c
-f:sound/soc/mediatek/mt8183/mt8183-afe-clk.h
-f:sound/soc/mediatek/mt8183/mt8183-afe-common.h
-f:sound/soc/mediatek/mt8183/mt8183-afe-pcm.c
-f:sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
-f:sound/soc/mediatek/mt8183/mt8183-dai-adda.c
-f:sound/soc/mediatek/mt8183/mt8183-dai-hostless.c
-f:sound/soc/mediatek/mt8183/mt8183-dai-i2s.c
-f:sound/soc/mediatek/mt8183/mt8183-dai-pcm.c
-f:sound/soc/mediatek/mt8183/mt8183-dai-tdm.c
-f:sound/soc/mediatek/mt8183/mt8183-interconnection.h
-f:sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c
-f:sound/soc/mediatek/mt8183/mt8183-reg.h
-f:sound/soc/mediatek/mt8186/Makefile
-f:sound/soc/mediatek/mt8186/mt8186-afe-clk.c
-f:sound/soc/mediatek/mt8186/mt8186-afe-clk.h
-f:sound/soc/mediatek/mt8186/mt8186-afe-common.h
-f:sound/soc/mediatek/mt8186/mt8186-afe-control.c
-f:sound/soc/mediatek/mt8186/mt8186-afe-gpio.c
-f:sound/soc/mediatek/mt8186/mt8186-afe-gpio.h
-f:sound/soc/mediatek/mt8186/mt8186-afe-pcm.c
-f:sound/soc/mediatek/mt8186/mt8186-audsys-clk.c
-f:sound/soc/mediatek/mt8186/mt8186-audsys-clk.h
-f:sound/soc/mediatek/mt8186/mt8186-audsys-clkid.h
-f:sound/soc/mediatek/mt8186/mt8186-dai-adda.c
-f:sound/soc/mediatek/mt8186/mt8186-dai-hostless.c
-f:sound/soc/mediatek/mt8186/mt8186-dai-hw-gain.c
-f:sound/soc/mediatek/mt8186/mt8186-dai-i2s.c
-f:sound/soc/mediatek/mt8186/mt8186-dai-pcm.c
-f:sound/soc/mediatek/mt8186/mt8186-dai-src.c
-f:sound/soc/mediatek/mt8186/mt8186-dai-tdm.c
-f:sound/soc/mediatek/mt8186/mt8186-interconnection.h
-f:sound/soc/mediatek/mt8186/mt8186-misc-control.c
-f:sound/soc/mediatek/mt8186/mt8186-mt6366-common.c
-f:sound/soc/mediatek/mt8186/mt8186-mt6366-common.h
-f:sound/soc/mediatek/mt8186/mt8186-mt6366.c
-f:sound/soc/mediatek/mt8186/mt8186-reg.h
-f:sound/soc/mediatek/mt8188/Makefile
-f:sound/soc/mediatek/mt8188/mt8188-afe-clk.c
-f:sound/soc/mediatek/mt8188/mt8188-afe-clk.h
-f:sound/soc/mediatek/mt8188/mt8188-afe-common.h
-f:sound/soc/mediatek/mt8188/mt8188-afe-pcm.c
-f:sound/soc/mediatek/mt8188/mt8188-audsys-clk.c
-f:sound/soc/mediatek/mt8188/mt8188-audsys-clk.h
-f:sound/soc/mediatek/mt8188/mt8188-audsys-clkid.h
-f:sound/soc/mediatek/mt8188/mt8188-dai-adda.c
-f:sound/soc/mediatek/mt8188/mt8188-dai-dmic.c
-f:sound/soc/mediatek/mt8188/mt8188-dai-etdm.c
-f:sound/soc/mediatek/mt8188/mt8188-dai-pcm.c
-f:sound/soc/mediatek/mt8188/mt8188-mt6359.c
-f:sound/soc/mediatek/mt8188/mt8188-reg.h
-f:sound/soc/mediatek/mt8192/Makefile
-f:sound/soc/mediatek/mt8192/mt8192-afe-clk.c
-f:sound/soc/mediatek/mt8192/mt8192-afe-clk.h
-f:sound/soc/mediatek/mt8192/mt8192-afe-common.h
-f:sound/soc/mediatek/mt8192/mt8192-afe-control.c
-f:sound/soc/mediatek/mt8192/mt8192-afe-gpio.c
-f:sound/soc/mediatek/mt8192/mt8192-afe-gpio.h
-f:sound/soc/mediatek/mt8192/mt8192-afe-pcm.c
-f:sound/soc/mediatek/mt8192/mt8192-dai-adda.c
-f:sound/soc/mediatek/mt8192/mt8192-dai-i2s.c
-f:sound/soc/mediatek/mt8192/mt8192-dai-pcm.c
-f:sound/soc/mediatek/mt8192/mt8192-dai-tdm.c
-f:sound/soc/mediatek/mt8192/mt8192-interconnection.h
-f:sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c
-f:sound/soc/mediatek/mt8192/mt8192-reg.h
-f:sound/soc/mediatek/mt8195/Makefile
-f:sound/soc/mediatek/mt8195/mt8195-afe-clk.c
-f:sound/soc/mediatek/mt8195/mt8195-afe-clk.h
-f:sound/soc/mediatek/mt8195/mt8195-afe-common.h
-f:sound/soc/mediatek/mt8195/mt8195-afe-pcm.c
-f:sound/soc/mediatek/mt8195/mt8195-audsys-clk.c
-f:sound/soc/mediatek/mt8195/mt8195-audsys-clk.h
-f:sound/soc/mediatek/mt8195/mt8195-audsys-clkid.h
-f:sound/soc/mediatek/mt8195/mt8195-dai-adda.c
-f:sound/soc/mediatek/mt8195/mt8195-dai-etdm.c
-f:sound/soc/mediatek/mt8195/mt8195-dai-pcm.c
-f:sound/soc/mediatek/mt8195/mt8195-mt6359.c
-f:sound/soc/mediatek/mt8195/mt8195-reg.h
-f:sound/soc/mediatek/mt8365/Makefile
-f:sound/soc/mediatek/mt8365/mt8365-afe-clk.c
-f:sound/soc/mediatek/mt8365/mt8365-afe-clk.h
-f:sound/soc/mediatek/mt8365/mt8365-afe-common.h
-f:sound/soc/mediatek/mt8365/mt8365-afe-pcm.c
-f:sound/soc/mediatek/mt8365/mt8365-dai-adda.c
-f:sound/soc/mediatek/mt8365/mt8365-dai-dmic.c
-f:sound/soc/mediatek/mt8365/mt8365-dai-i2s.c
-f:sound/soc/mediatek/mt8365/mt8365-dai-pcm.c
-f:sound/soc/mediatek/mt8365/mt8365-mt6357.c
-f:sound/soc/mediatek/mt8365/mt8365-reg.h
-f:sound/soc/meson/Kconfig
-f:sound/soc/meson/Makefile
-f:sound/soc/meson/aiu-acodec-ctrl.c
-f:sound/soc/meson/aiu-codec-ctrl.c
-f:sound/soc/meson/aiu-encoder-i2s.c
-f:sound/soc/meson/aiu-encoder-spdif.c
-f:sound/soc/meson/aiu-fifo-i2s.c
-f:sound/soc/meson/aiu-fifo-spdif.c
-f:sound/soc/meson/aiu-fifo.c
-f:sound/soc/meson/aiu-fifo.h
-f:sound/soc/meson/aiu.c
-f:sound/soc/meson/aiu.h
-f:sound/soc/meson/axg-card.c
-f:sound/soc/meson/axg-fifo.c
-f:sound/soc/meson/axg-fifo.h
-f:sound/soc/meson/axg-frddr.c
-f:sound/soc/meson/axg-pdm.c
-f:sound/soc/meson/axg-spdifin.c
-f:sound/soc/meson/axg-spdifout.c
-f:sound/soc/meson/axg-tdm-formatter.c
-f:sound/soc/meson/axg-tdm-formatter.h
-f:sound/soc/meson/axg-tdm-interface.c
-f:sound/soc/meson/axg-tdm.h
-f:sound/soc/meson/axg-tdmin.c
-f:sound/soc/meson/axg-tdmout.c
-f:sound/soc/meson/axg-toddr.c
-f:sound/soc/meson/g12a-toacodec.c
-f:sound/soc/meson/g12a-tohdmitx.c
-f:sound/soc/meson/gx-card.c
-f:sound/soc/meson/meson-card-utils.c
-f:sound/soc/meson/meson-card.h
-f:sound/soc/meson/meson-codec-glue.c
-f:sound/soc/meson/meson-codec-glue.h
-f:sound/soc/meson/t9015.c
-f:sound/soc/mxs/Kconfig
-f:sound/soc/mxs/Makefile
-f:sound/soc/mxs/mxs-pcm.c
-f:sound/soc/mxs/mxs-pcm.h
-f:sound/soc/mxs/mxs-saif.c
-f:sound/soc/mxs/mxs-saif.h
-f:sound/soc/mxs/mxs-sgtl5000.c
-f:sound/soc/pxa/Kconfig
-f:sound/soc/pxa/Makefile
-f:sound/soc/pxa/mmp-sspa.c
-f:sound/soc/pxa/mmp-sspa.h
-f:sound/soc/pxa/pxa-ssp.c
-f:sound/soc/pxa/pxa-ssp.h
-f:sound/soc/pxa/pxa2xx-ac97.c
-f:sound/soc/pxa/pxa2xx-i2s.c
-f:sound/soc/pxa/pxa2xx-i2s.h
-f:sound/soc/pxa/pxa2xx-pcm.c
-f:sound/soc/pxa/spitz.c
-f:sound/soc/qcom/Kconfig
-f:sound/soc/qcom/Makefile
-f:sound/soc/qcom/apq8016_sbc.c
-f:sound/soc/qcom/apq8096.c
-f:sound/soc/qcom/common.c
-f:sound/soc/qcom/common.h
-f:sound/soc/qcom/lpass-apq8016.c
-f:sound/soc/qcom/lpass-cdc-dma.c
-f:sound/soc/qcom/lpass-cpu.c
-f:sound/soc/qcom/lpass-hdmi.c
-f:sound/soc/qcom/lpass-hdmi.h
-f:sound/soc/qcom/lpass-ipq806x.c
-f:sound/soc/qcom/lpass-lpaif-reg.h
-f:sound/soc/qcom/lpass-platform.c
-f:sound/soc/qcom/lpass-sc7180.c
-f:sound/soc/qcom/lpass-sc7280.c
-f:sound/soc/qcom/lpass.h
-f:sound/soc/qcom/qdsp6/Makefile
-f:sound/soc/qcom/qdsp6/audioreach.c
-f:sound/soc/qcom/qdsp6/audioreach.h
-f:sound/soc/qcom/qdsp6/q6adm.c
-f:sound/soc/qcom/qdsp6/q6adm.h
-f:sound/soc/qcom/qdsp6/q6afe-clocks.c
-f:sound/soc/qcom/qdsp6/q6afe-dai.c
-f:sound/soc/qcom/qdsp6/q6afe.c
-f:sound/soc/qcom/qdsp6/q6afe.h
-f:sound/soc/qcom/qdsp6/q6apm-dai.c
-f:sound/soc/qcom/qdsp6/q6apm-lpass-dais.c
-f:sound/soc/qcom/qdsp6/q6apm.c
-f:sound/soc/qcom/qdsp6/q6apm.h
-f:sound/soc/qcom/qdsp6/q6asm-dai.c
-f:sound/soc/qcom/qdsp6/q6asm.c
-f:sound/soc/qcom/qdsp6/q6asm.h
-f:sound/soc/qcom/qdsp6/q6core.c
-f:sound/soc/qcom/qdsp6/q6core.h
-f:sound/soc/qcom/qdsp6/q6dsp-common.c
-f:sound/soc/qcom/qdsp6/q6dsp-common.h
-f:sound/soc/qcom/qdsp6/q6dsp-errno.h
-f:sound/soc/qcom/qdsp6/q6dsp-lpass-clocks.c
-f:sound/soc/qcom/qdsp6/q6dsp-lpass-clocks.h
-f:sound/soc/qcom/qdsp6/q6dsp-lpass-ports.c
-f:sound/soc/qcom/qdsp6/q6dsp-lpass-ports.h
-f:sound/soc/qcom/qdsp6/q6prm-clocks.c
-f:sound/soc/qcom/qdsp6/q6prm.c
-f:sound/soc/qcom/qdsp6/q6prm.h
-f:sound/soc/qcom/qdsp6/q6routing.c
-f:sound/soc/qcom/qdsp6/q6routing.h
-f:sound/soc/qcom/qdsp6/q6usb.c
-f:sound/soc/qcom/qdsp6/topology.c
-f:sound/soc/qcom/sc7180.c
-f:sound/soc/qcom/sc7280.c
-f:sound/soc/qcom/sc8280xp.c
-f:sound/soc/qcom/sdm845.c
-f:sound/soc/qcom/sdw.c
-f:sound/soc/qcom/sdw.h
-f:sound/soc/qcom/sm8250.c
-f:sound/soc/qcom/storm.c
-f:sound/soc/qcom/usb_offload_utils.c
-f:sound/soc/qcom/usb_offload_utils.h
-f:sound/soc/qcom/x1e80100.c
-f:sound/soc/renesas/Kconfig
-f:sound/soc/renesas/Makefile
-f:sound/soc/renesas/dma-sh7760.c
-f:sound/soc/renesas/fsi.c
-f:sound/soc/renesas/hac.c
-f:sound/soc/renesas/migor.c
-f:sound/soc/renesas/rcar/Makefile
-f:sound/soc/renesas/rcar/adg.c
-f:sound/soc/renesas/rcar/cmd.c
-f:sound/soc/renesas/rcar/core.c
-f:sound/soc/renesas/rcar/ctu.c
-f:sound/soc/renesas/rcar/debugfs.c
-f:sound/soc/renesas/rcar/dma.c
-f:sound/soc/renesas/rcar/dvc.c
-f:sound/soc/renesas/rcar/gen.c
-f:sound/soc/renesas/rcar/mix.c
-f:sound/soc/renesas/rcar/msiof.c
-f:sound/soc/renesas/rcar/rsnd.h
-f:sound/soc/renesas/rcar/src.c
-f:sound/soc/renesas/rcar/ssi.c
-f:sound/soc/renesas/rcar/ssiu.c
-f:sound/soc/renesas/rz-ssi.c
-f:sound/soc/renesas/sh7760-ac97.c
-f:sound/soc/renesas/siu.h
-f:sound/soc/renesas/siu_dai.c
-f:sound/soc/renesas/siu_pcm.c
-f:sound/soc/renesas/ssi.c
-f:sound/soc/rockchip/Kconfig
-f:sound/soc/rockchip/Makefile
-f:sound/soc/rockchip/rk3288_hdmi_analog.c
-f:sound/soc/rockchip/rk3399_gru_sound.c
-f:sound/soc/rockchip/rockchip_i2s.c
-f:sound/soc/rockchip/rockchip_i2s.h
-f:sound/soc/rockchip/rockchip_i2s_tdm.c
-f:sound/soc/rockchip/rockchip_i2s_tdm.h
-f:sound/soc/rockchip/rockchip_max98090.c
-f:sound/soc/rockchip/rockchip_pdm.c
-f:sound/soc/rockchip/rockchip_pdm.h
-f:sound/soc/rockchip/rockchip_rt5645.c
-f:sound/soc/rockchip/rockchip_sai.c
-f:sound/soc/rockchip/rockchip_sai.h
-f:sound/soc/rockchip/rockchip_spdif.c
-f:sound/soc/rockchip/rockchip_spdif.h
-f:sound/soc/samsung/Kconfig
-f:sound/soc/samsung/Makefile
-f:sound/soc/samsung/aries_wm8994.c
-f:sound/soc/samsung/arndale.c
-f:sound/soc/samsung/bells.c
-f:sound/soc/samsung/dma.h
-f:sound/soc/samsung/dmaengine.c
-f:sound/soc/samsung/i2s-regs.h
-f:sound/soc/samsung/i2s.c
-f:sound/soc/samsung/i2s.h
-f:sound/soc/samsung/idma.c
-f:sound/soc/samsung/idma.h
-f:sound/soc/samsung/littlemill.c
-f:sound/soc/samsung/lowland.c
-f:sound/soc/samsung/midas_wm1811.c
-f:sound/soc/samsung/odroid.c
-f:sound/soc/samsung/pcm.c
-f:sound/soc/samsung/pcm.h
-f:sound/soc/samsung/smdk_spdif.c
-f:sound/soc/samsung/smdk_wm8994.c
-f:sound/soc/samsung/smdk_wm8994pcm.c
-f:sound/soc/samsung/snow.c
-f:sound/soc/samsung/spdif.c
-f:sound/soc/samsung/spdif.h
-f:sound/soc/samsung/speyside.c
-f:sound/soc/samsung/tm2_wm5110.c
-f:sound/soc/samsung/tobermory.c
-f:sound/soc/sdca/Kconfig
-f:sound/soc/sdca/Makefile
-f:sound/soc/sdca/sdca_asoc.c
-f:sound/soc/sdca/sdca_device.c
-f:sound/soc/sdca/sdca_functions.c
-f:sound/soc/sdca/sdca_hid.c
-f:sound/soc/sdca/sdca_interrupts.c
-f:sound/soc/sdca/sdca_regmap.c
-f:sound/soc/sdw_utils/Kconfig
-f:sound/soc/sdw_utils/Makefile
-f:sound/soc/sdw_utils/soc_sdw_bridge_cs35l56.c
-f:sound/soc/sdw_utils/soc_sdw_cs42l42.c
-f:sound/soc/sdw_utils/soc_sdw_cs42l43.c
-f:sound/soc/sdw_utils/soc_sdw_cs_amp.c
-f:sound/soc/sdw_utils/soc_sdw_dmic.c
-f:sound/soc/sdw_utils/soc_sdw_maxim.c
-f:sound/soc/sdw_utils/soc_sdw_rt5682.c
-f:sound/soc/sdw_utils/soc_sdw_rt700.c
-f:sound/soc/sdw_utils/soc_sdw_rt711.c
-f:sound/soc/sdw_utils/soc_sdw_rt_amp.c
-f:sound/soc/sdw_utils/soc_sdw_rt_amp_coeff_tables.h
-f:sound/soc/sdw_utils/soc_sdw_rt_dmic.c
-f:sound/soc/sdw_utils/soc_sdw_rt_mf_sdca.c
-f:sound/soc/sdw_utils/soc_sdw_rt_sdca_jack_common.c
-f:sound/soc/sdw_utils/soc_sdw_utils.c
-f:sound/soc/soc-ac97.c
-f:sound/soc/soc-acpi.c
-f:sound/soc/soc-card-test.c
-f:sound/soc/soc-card.c
-f:sound/soc/soc-component.c
-f:sound/soc/soc-compress.c
-f:sound/soc/soc-core.c
-f:sound/soc/soc-dai.c
-f:sound/soc/soc-dapm.c
-f:sound/soc/soc-devres.c
-f:sound/soc/soc-generic-dmaengine-pcm.c
-f:sound/soc/soc-jack.c
-f:sound/soc/soc-link.c
-f:sound/soc/soc-ops-test.c
-f:sound/soc/soc-ops.c
-f:sound/soc/soc-pcm.c
-f:sound/soc/soc-topology-test.c
-f:sound/soc/soc-topology.c
-f:sound/soc/soc-usb.c
-f:sound/soc/soc-utils-test.c
-f:sound/soc/soc-utils.c
-f:sound/soc/sof/Kconfig
-f:sound/soc/sof/Makefile
-f:sound/soc/sof/amd/Kconfig
-f:sound/soc/sof/amd/Makefile
-f:sound/soc/sof/amd/acp-common.c
-f:sound/soc/sof/amd/acp-dsp-offset.h
-f:sound/soc/sof/amd/acp-ipc.c
-f:sound/soc/sof/amd/acp-loader.c
-f:sound/soc/sof/amd/acp-pcm.c
-f:sound/soc/sof/amd/acp-probes.c
-f:sound/soc/sof/amd/acp-stream.c
-f:sound/soc/sof/amd/acp-trace.c
-f:sound/soc/sof/amd/acp.c
-f:sound/soc/sof/amd/acp.h
-f:sound/soc/sof/amd/acp63.c
-f:sound/soc/sof/amd/acp70.c
-f:sound/soc/sof/amd/pci-acp63.c
-f:sound/soc/sof/amd/pci-acp70.c
-f:sound/soc/sof/amd/pci-rmb.c
-f:sound/soc/sof/amd/pci-rn.c
-f:sound/soc/sof/amd/pci-vangogh.c
-f:sound/soc/sof/amd/rembrandt.c
-f:sound/soc/sof/amd/renoir.c
-f:sound/soc/sof/amd/vangogh.c
-f:sound/soc/sof/compress.c
-f:sound/soc/sof/control.c
-f:sound/soc/sof/core.c
-f:sound/soc/sof/debug.c
-f:sound/soc/sof/fw-file-profile.c
-f:sound/soc/sof/imx/Kconfig
-f:sound/soc/sof/imx/Makefile
-f:sound/soc/sof/imx/imx-common.c
-f:sound/soc/sof/imx/imx-common.h
-f:sound/soc/sof/imx/imx8.c
-f:sound/soc/sof/imx/imx9.c
-f:sound/soc/sof/intel/Kconfig
-f:sound/soc/sof/intel/Makefile
-f:sound/soc/sof/intel/apl.c
-f:sound/soc/sof/intel/atom.c
-f:sound/soc/sof/intel/atom.h
-f:sound/soc/sof/intel/bdw.c
-f:sound/soc/sof/intel/byt.c
-f:sound/soc/sof/intel/cnl.c
-f:sound/soc/sof/intel/ext_manifest.h
-f:sound/soc/sof/intel/hda-bus.c
-f:sound/soc/sof/intel/hda-codec.c
-f:sound/soc/sof/intel/hda-common-ops.c
-f:sound/soc/sof/intel/hda-ctrl.c
-f:sound/soc/sof/intel/hda-dai-ops.c
-f:sound/soc/sof/intel/hda-dai.c
-f:sound/soc/sof/intel/hda-dsp.c
-f:sound/soc/sof/intel/hda-ipc.c
-f:sound/soc/sof/intel/hda-ipc.h
-f:sound/soc/sof/intel/hda-loader-skl.c
-f:sound/soc/sof/intel/hda-loader.c
-f:sound/soc/sof/intel/hda-mlink.c
-f:sound/soc/sof/intel/hda-pcm.c
-f:sound/soc/sof/intel/hda-probes.c
-f:sound/soc/sof/intel/hda-sdw-bpt.c
-f:sound/soc/sof/intel/hda-stream.c
-f:sound/soc/sof/intel/hda-trace.c
-f:sound/soc/sof/intel/hda.c
-f:sound/soc/sof/intel/hda.h
-f:sound/soc/sof/intel/icl.c
-f:sound/soc/sof/intel/lnl.c
-f:sound/soc/sof/intel/lnl.h
-f:sound/soc/sof/intel/mtl.c
-f:sound/soc/sof/intel/mtl.h
-f:sound/soc/sof/intel/pci-apl.c
-f:sound/soc/sof/intel/pci-cnl.c
-f:sound/soc/sof/intel/pci-icl.c
-f:sound/soc/sof/intel/pci-lnl.c
-f:sound/soc/sof/intel/pci-mtl.c
-f:sound/soc/sof/intel/pci-ptl.c
-f:sound/soc/sof/intel/pci-skl.c
-f:sound/soc/sof/intel/pci-tgl.c
-f:sound/soc/sof/intel/pci-tng.c
-f:sound/soc/sof/intel/ptl.c
-f:sound/soc/sof/intel/ptl.h
-f:sound/soc/sof/intel/shim.h
-f:sound/soc/sof/intel/skl.c
-f:sound/soc/sof/intel/telemetry.c
-f:sound/soc/sof/intel/telemetry.h
-f:sound/soc/sof/intel/tgl.c
-f:sound/soc/sof/intel/tracepoints.c
-f:sound/soc/sof/iomem-utils.c
-f:sound/soc/sof/ipc.c
-f:sound/soc/sof/ipc3-control.c
-f:sound/soc/sof/ipc3-dtrace.c
-f:sound/soc/sof/ipc3-loader.c
-f:sound/soc/sof/ipc3-pcm.c
-f:sound/soc/sof/ipc3-priv.h
-f:sound/soc/sof/ipc3-topology.c
-f:sound/soc/sof/ipc3.c
-f:sound/soc/sof/ipc4-control.c
-f:sound/soc/sof/ipc4-fw-reg.h
-f:sound/soc/sof/ipc4-loader.c
-f:sound/soc/sof/ipc4-mtrace.c
-f:sound/soc/sof/ipc4-pcm.c
-f:sound/soc/sof/ipc4-priv.h
-f:sound/soc/sof/ipc4-telemetry.c
-f:sound/soc/sof/ipc4-telemetry.h
-f:sound/soc/sof/ipc4-topology.c
-f:sound/soc/sof/ipc4-topology.h
-f:sound/soc/sof/ipc4.c
-f:sound/soc/sof/loader.c
-f:sound/soc/sof/mediatek/Kconfig
-f:sound/soc/sof/mediatek/Makefile
-f:sound/soc/sof/mediatek/adsp_helper.h
-f:sound/soc/sof/mediatek/mt8186/Makefile
-f:sound/soc/sof/mediatek/mt8186/mt8186-clk.c
-f:sound/soc/sof/mediatek/mt8186/mt8186-clk.h
-f:sound/soc/sof/mediatek/mt8186/mt8186-loader.c
-f:sound/soc/sof/mediatek/mt8186/mt8186.c
-f:sound/soc/sof/mediatek/mt8186/mt8186.h
-f:sound/soc/sof/mediatek/mt8195/Makefile
-f:sound/soc/sof/mediatek/mt8195/mt8195-clk.c
-f:sound/soc/sof/mediatek/mt8195/mt8195-clk.h
-f:sound/soc/sof/mediatek/mt8195/mt8195-loader.c
-f:sound/soc/sof/mediatek/mt8195/mt8195.c
-f:sound/soc/sof/mediatek/mt8195/mt8195.h
-f:sound/soc/sof/mediatek/mtk-adsp-common.c
-f:sound/soc/sof/mediatek/mtk-adsp-common.h
-f:sound/soc/sof/nocodec.c
-f:sound/soc/sof/ops.c
-f:sound/soc/sof/ops.h
-f:sound/soc/sof/pcm.c
-f:sound/soc/sof/pm.c
-f:sound/soc/sof/sof-acpi-dev.c
-f:sound/soc/sof/sof-acpi-dev.h
-f:sound/soc/sof/sof-audio.c
-f:sound/soc/sof/sof-audio.h
-f:sound/soc/sof/sof-client-ipc-flood-test.c
-f:sound/soc/sof/sof-client-ipc-kernel-injector.c
-f:sound/soc/sof/sof-client-ipc-msg-injector.c
-f:sound/soc/sof/sof-client-probes-ipc3.c
-f:sound/soc/sof/sof-client-probes-ipc4.c
-f:sound/soc/sof/sof-client-probes.c
-f:sound/soc/sof/sof-client-probes.h
-f:sound/soc/sof/sof-client.c
-f:sound/soc/sof/sof-client.h
-f:sound/soc/sof/sof-of-dev.c
-f:sound/soc/sof/sof-of-dev.h
-f:sound/soc/sof/sof-pci-dev.c
-f:sound/soc/sof/sof-pci-dev.h
-f:sound/soc/sof/sof-priv.h
-f:sound/soc/sof/sof-utils.c
-f:sound/soc/sof/sof-utils.h
-f:sound/soc/sof/stream-ipc.c
-f:sound/soc/sof/topology.c
-f:sound/soc/sof/trace.c
-f:sound/soc/sof/xtensa/Kconfig
-f:sound/soc/sof/xtensa/Makefile
-f:sound/soc/sof/xtensa/core.c
-f:sound/soc/spear/Kconfig
-f:sound/soc/spear/Makefile
-f:sound/soc/spear/spdif_in.c
-f:sound/soc/spear/spdif_in_regs.h
-f:sound/soc/spear/spdif_out.c
-f:sound/soc/spear/spdif_out_regs.h
-f:sound/soc/spear/spear_pcm.c
-f:sound/soc/spear/spear_pcm.h
-f:sound/soc/sprd/Kconfig
-f:sound/soc/sprd/Makefile
-f:sound/soc/sprd/sprd-mcdt.c
-f:sound/soc/sprd/sprd-mcdt.h
-f:sound/soc/sprd/sprd-pcm-compress.c
-f:sound/soc/sprd/sprd-pcm-dma.c
-f:sound/soc/sprd/sprd-pcm-dma.h
-f:sound/soc/starfive/Kconfig
-f:sound/soc/starfive/Makefile
-f:sound/soc/starfive/jh7110_pwmdac.c
-f:sound/soc/starfive/jh7110_tdm.c
-f:sound/soc/sti/Kconfig
-f:sound/soc/sti/Makefile
-f:sound/soc/sti/sti_uniperif.c
-f:sound/soc/sti/uniperif.h
-f:sound/soc/sti/uniperif_player.c
-f:sound/soc/sti/uniperif_reader.c
-f:sound/soc/stm/Kconfig
-f:sound/soc/stm/Makefile
-f:sound/soc/stm/stm32_adfsdm.c
-f:sound/soc/stm/stm32_i2s.c
-f:sound/soc/stm/stm32_sai.c
-f:sound/soc/stm/stm32_sai.h
-f:sound/soc/stm/stm32_sai_sub.c
-f:sound/soc/stm/stm32_spdifrx.c
-f:sound/soc/sunxi/Kconfig
-f:sound/soc/sunxi/Makefile
-f:sound/soc/sunxi/sun4i-codec.c
-f:sound/soc/sunxi/sun4i-i2s.c
-f:sound/soc/sunxi/sun4i-spdif.c
-f:sound/soc/sunxi/sun50i-codec-analog.c
-f:sound/soc/sunxi/sun50i-dmic.c
-f:sound/soc/sunxi/sun8i-adda-pr-regmap.c
-f:sound/soc/sunxi/sun8i-adda-pr-regmap.h
-f:sound/soc/sunxi/sun8i-codec-analog.c
-f:sound/soc/sunxi/sun8i-codec.c
-f:sound/soc/tegra/Kconfig
-f:sound/soc/tegra/Makefile
-f:sound/soc/tegra/tegra186_asrc.c
-f:sound/soc/tegra/tegra186_asrc.h
-f:sound/soc/tegra/tegra186_dspk.c
-f:sound/soc/tegra/tegra186_dspk.h
-f:sound/soc/tegra/tegra20_ac97.c
-f:sound/soc/tegra/tegra20_ac97.h
-f:sound/soc/tegra/tegra20_das.c
-f:sound/soc/tegra/tegra20_i2s.c
-f:sound/soc/tegra/tegra20_i2s.h
-f:sound/soc/tegra/tegra20_spdif.c
-f:sound/soc/tegra/tegra20_spdif.h
-f:sound/soc/tegra/tegra210_admaif.c
-f:sound/soc/tegra/tegra210_admaif.h
-f:sound/soc/tegra/tegra210_adx.c
-f:sound/soc/tegra/tegra210_adx.h
-f:sound/soc/tegra/tegra210_ahub.c
-f:sound/soc/tegra/tegra210_ahub.h
-f:sound/soc/tegra/tegra210_amx.c
-f:sound/soc/tegra/tegra210_amx.h
-f:sound/soc/tegra/tegra210_dmic.c
-f:sound/soc/tegra/tegra210_dmic.h
-f:sound/soc/tegra/tegra210_i2s.c
-f:sound/soc/tegra/tegra210_i2s.h
-f:sound/soc/tegra/tegra210_mbdrc.c
-f:sound/soc/tegra/tegra210_mbdrc.h
-f:sound/soc/tegra/tegra210_mixer.c
-f:sound/soc/tegra/tegra210_mixer.h
-f:sound/soc/tegra/tegra210_mvc.c
-f:sound/soc/tegra/tegra210_mvc.h
-f:sound/soc/tegra/tegra210_ope.c
-f:sound/soc/tegra/tegra210_ope.h
-f:sound/soc/tegra/tegra210_peq.c
-f:sound/soc/tegra/tegra210_peq.h
-f:sound/soc/tegra/tegra210_sfc.c
-f:sound/soc/tegra/tegra210_sfc.h
-f:sound/soc/tegra/tegra30_ahub.c
-f:sound/soc/tegra/tegra30_ahub.h
-f:sound/soc/tegra/tegra30_i2s.c
-f:sound/soc/tegra/tegra30_i2s.h
-f:sound/soc/tegra/tegra_asoc_machine.c
-f:sound/soc/tegra/tegra_asoc_machine.h
-f:sound/soc/tegra/tegra_audio_graph_card.c
-f:sound/soc/tegra/tegra_cif.h
-f:sound/soc/tegra/tegra_isomgr_bw.c
-f:sound/soc/tegra/tegra_isomgr_bw.h
-f:sound/soc/tegra/tegra_pcm.c
-f:sound/soc/tegra/tegra_pcm.h
-f:sound/soc/tegra/tegra_wm8903.c
-f:sound/soc/ti/Kconfig
-f:sound/soc/ti/Makefile
-f:sound/soc/ti/ams-delta.c
-f:sound/soc/ti/davinci-evm.c
-f:sound/soc/ti/davinci-i2s.c
-f:sound/soc/ti/davinci-i2s.h
-f:sound/soc/ti/davinci-mcasp.c
-f:sound/soc/ti/davinci-mcasp.h
-f:sound/soc/ti/edma-pcm.c
-f:sound/soc/ti/edma-pcm.h
-f:sound/soc/ti/j721e-evm.c
-f:sound/soc/ti/n810.c
-f:sound/soc/ti/omap-abe-twl6040.c
-f:sound/soc/ti/omap-dmic.c
-f:sound/soc/ti/omap-dmic.h
-f:sound/soc/ti/omap-hdmi.c
-f:sound/soc/ti/omap-mcbsp-priv.h
-f:sound/soc/ti/omap-mcbsp-st.c
-f:sound/soc/ti/omap-mcbsp.c
-f:sound/soc/ti/omap-mcbsp.h
-f:sound/soc/ti/omap-mcpdm.c
-f:sound/soc/ti/omap-mcpdm.h
-f:sound/soc/ti/omap-twl4030.c
-f:sound/soc/ti/omap3pandora.c
-f:sound/soc/ti/osk5912.c
-f:sound/soc/ti/rx51.c
-f:sound/soc/ti/sdma-pcm.c
-f:sound/soc/ti/sdma-pcm.h
-f:sound/soc/ti/udma-pcm.c
-f:sound/soc/ti/udma-pcm.h
-f:sound/soc/uniphier/Kconfig
-f:sound/soc/uniphier/Makefile
-f:sound/soc/uniphier/aio-compress.c
-f:sound/soc/uniphier/aio-core.c
-f:sound/soc/uniphier/aio-cpu.c
-f:sound/soc/uniphier/aio-dma.c
-f:sound/soc/uniphier/aio-ld11.c
-f:sound/soc/uniphier/aio-pxs2.c
-f:sound/soc/uniphier/aio-reg.h
-f:sound/soc/uniphier/aio.h
-f:sound/soc/uniphier/evea.c
-f:sound/soc/ux500/Kconfig
-f:sound/soc/ux500/Makefile
-f:sound/soc/ux500/mop500.c
-f:sound/soc/ux500/mop500_ab8500.c
-f:sound/soc/ux500/mop500_ab8500.h
-f:sound/soc/ux500/ux500_msp_dai.c
-f:sound/soc/ux500/ux500_msp_dai.h
-f:sound/soc/ux500/ux500_msp_i2s.c
-f:sound/soc/ux500/ux500_msp_i2s.h
-f:sound/soc/ux500/ux500_pcm.c
-f:sound/soc/ux500/ux500_pcm.h
-f:sound/soc/xilinx/Kconfig
-f:sound/soc/xilinx/Makefile
-f:sound/soc/xilinx/xlnx_formatter_pcm.c
-f:sound/soc/xilinx/xlnx_i2s.c
-f:sound/soc/xilinx/xlnx_spdif.c
-f:sound/soc/xtensa/Kconfig
-f:sound/soc/xtensa/Makefile
-f:sound/soc/xtensa/xtfpga-i2s.c
-f:sound/sound_core.c
-f:sound/sparc/Kconfig
-f:sound/sparc/Makefile
-f:sound/sparc/amd7930.c
-f:sound/sparc/cs4231.c
-f:sound/sparc/dbri.c
-f:sound/spi/Kconfig
-f:sound/spi/Makefile
-f:sound/spi/at73c213.c
-f:sound/spi/at73c213.h
-f:sound/synth/Kconfig
-f:sound/synth/Makefile
-f:sound/synth/emux/Makefile
-f:sound/synth/emux/emux.c
-f:sound/synth/emux/emux_effect.c
-f:sound/synth/emux/emux_hwdep.c
-f:sound/synth/emux/emux_nrpn.c
-f:sound/synth/emux/emux_oss.c
-f:sound/synth/emux/emux_proc.c
-f:sound/synth/emux/emux_seq.c
-f:sound/synth/emux/emux_synth.c
-f:sound/synth/emux/emux_voice.h
-f:sound/synth/emux/soundfont.c
-f:sound/synth/util_mem.c
-f:sound/usb/6fire/Makefile
-f:sound/usb/6fire/chip.c
-f:sound/usb/6fire/chip.h
-f:sound/usb/6fire/comm.c
-f:sound/usb/6fire/comm.h
-f:sound/usb/6fire/common.h
-f:sound/usb/6fire/control.c
-f:sound/usb/6fire/control.h
-f:sound/usb/6fire/firmware.c
-f:sound/usb/6fire/firmware.h
-f:sound/usb/6fire/midi.c
-f:sound/usb/6fire/midi.h
-f:sound/usb/6fire/pcm.c
-f:sound/usb/6fire/pcm.h
-f:sound/usb/Kconfig
-f:sound/usb/Makefile
-f:sound/usb/bcd2000/Makefile
-f:sound/usb/bcd2000/bcd2000.c
-f:sound/usb/caiaq/Makefile
-f:sound/usb/caiaq/audio.c
-f:sound/usb/caiaq/audio.h
-f:sound/usb/caiaq/control.c
-f:sound/usb/caiaq/control.h
-f:sound/usb/caiaq/device.c
-f:sound/usb/caiaq/device.h
-f:sound/usb/caiaq/input.c
-f:sound/usb/caiaq/input.h
-f:sound/usb/caiaq/midi.c
-f:sound/usb/caiaq/midi.h
-f:sound/usb/card.c
-f:sound/usb/card.h
-f:sound/usb/clock.c
-f:sound/usb/clock.h
-f:sound/usb/endpoint.c
-f:sound/usb/endpoint.h
-f:sound/usb/fcp.c
-f:sound/usb/fcp.h
-f:sound/usb/format.c
-f:sound/usb/format.h
-f:sound/usb/helper.c
-f:sound/usb/helper.h
-f:sound/usb/hiface/Makefile
-f:sound/usb/hiface/chip.c
-f:sound/usb/hiface/chip.h
-f:sound/usb/hiface/pcm.c
-f:sound/usb/hiface/pcm.h
-f:sound/usb/implicit.c
-f:sound/usb/implicit.h
-f:sound/usb/line6/Kconfig
-f:sound/usb/line6/Makefile
-f:sound/usb/line6/capture.c
-f:sound/usb/line6/capture.h
-f:sound/usb/line6/driver.c
-f:sound/usb/line6/driver.h
-f:sound/usb/line6/midi.c
-f:sound/usb/line6/midi.h
-f:sound/usb/line6/midibuf.c
-f:sound/usb/line6/midibuf.h
-f:sound/usb/line6/pcm.c
-f:sound/usb/line6/pcm.h
-f:sound/usb/line6/playback.c
-f:sound/usb/line6/playback.h
-f:sound/usb/line6/pod.c
-f:sound/usb/line6/podhd.c
-f:sound/usb/line6/toneport.c
-f:sound/usb/line6/variax.c
-f:sound/usb/media.c
-f:sound/usb/media.h
-f:sound/usb/midi.c
-f:sound/usb/midi.h
-f:sound/usb/midi2.c
-f:sound/usb/midi2.h
-f:sound/usb/misc/Makefile
-f:sound/usb/misc/ua101.c
-f:sound/usb/mixer.c
-f:sound/usb/mixer.h
-f:sound/usb/mixer_maps.c
-f:sound/usb/mixer_quirks.c
-f:sound/usb/mixer_quirks.h
-f:sound/usb/mixer_s1810c.c
-f:sound/usb/mixer_s1810c.h
-f:sound/usb/mixer_scarlett.c
-f:sound/usb/mixer_scarlett.h
-f:sound/usb/mixer_scarlett2.c
-f:sound/usb/mixer_scarlett2.h
-f:sound/usb/mixer_us16x08.c
-f:sound/usb/mixer_us16x08.h
-f:sound/usb/pcm.c
-f:sound/usb/pcm.h
-f:sound/usb/power.c
-f:sound/usb/power.h
-f:sound/usb/proc.c
-f:sound/usb/proc.h
-f:sound/usb/qcom/Makefile
-f:sound/usb/qcom/mixer_usb_offload.c
-f:sound/usb/qcom/mixer_usb_offload.h
-f:sound/usb/qcom/qc_audio_offload.c
-f:sound/usb/qcom/usb_audio_qmi_v01.c
-f:sound/usb/qcom/usb_audio_qmi_v01.h
-f:sound/usb/quirks-table.h
-f:sound/usb/quirks.c
-f:sound/usb/quirks.h
-f:sound/usb/stream.c
-f:sound/usb/stream.h
-f:sound/usb/usbaudio.h
-f:sound/usb/usx2y/Makefile
-f:sound/usb/usx2y/us122l.c
-f:sound/usb/usx2y/us122l.h
-f:sound/usb/usx2y/usX2Yhwdep.c
-f:sound/usb/usx2y/usX2Yhwdep.h
-f:sound/usb/usx2y/usb_stream.c
-f:sound/usb/usx2y/usb_stream.h
-f:sound/usb/usx2y/usbus428ctldefs.h
-f:sound/usb/usx2y/usbusx2y.c
-f:sound/usb/usx2y/usbusx2y.h
-f:sound/usb/usx2y/usbusx2yaudio.c
-f:sound/usb/usx2y/usx2y.h
-f:sound/usb/usx2y/usx2yhwdeppcm.c
-f:sound/usb/usx2y/usx2yhwdeppcm.h
-f:sound/usb/validate.c
-f:sound/virtio/Kconfig
-f:sound/virtio/Makefile
-f:sound/virtio/virtio_card.c
-f:sound/virtio/virtio_card.h
-f:sound/virtio/virtio_chmap.c
-f:sound/virtio/virtio_ctl_msg.c
-f:sound/virtio/virtio_ctl_msg.h
-f:sound/virtio/virtio_jack.c
-f:sound/virtio/virtio_kctl.c
-f:sound/virtio/virtio_pcm.c
-f:sound/virtio/virtio_pcm.h
-f:sound/virtio/virtio_pcm_msg.c
-f:sound/virtio/virtio_pcm_ops.c
-f:sound/x86/Kconfig
-f:sound/x86/Makefile
-f:sound/x86/intel_hdmi_audio.c
-f:sound/x86/intel_hdmi_audio.h
-f:sound/x86/intel_hdmi_lpe_audio.h
-f:sound/xen/Kconfig
-f:sound/xen/Makefile
-f:sound/xen/xen_snd_front.c
-f:sound/xen/xen_snd_front.h
-f:sound/xen/xen_snd_front_alsa.c
-f:sound/xen/xen_snd_front_alsa.h
-f:sound/xen/xen_snd_front_cfg.c
-f:sound/xen/xen_snd_front_cfg.h
-f:sound/xen/xen_snd_front_evtchnl.c
-f:sound/xen/xen_snd_front_evtchnl.h
-f:tools/Makefile
-f:tools/accounting/.gitignore
-f:tools/accounting/Makefile
-f:tools/accounting/getdelays.c
-f:tools/accounting/procacct.c
-f:tools/arch/alpha/include/asm/barrier.h
-f:tools/arch/alpha/include/uapi/asm/bitsperlong.h
-f:tools/arch/alpha/include/uapi/asm/errno.h
-f:tools/arch/alpha/include/uapi/asm/mman.h
-f:tools/arch/arc/include/uapi/asm/mman.h
-f:tools/arch/arc/include/uapi/asm/unistd.h
-f:tools/arch/arm/include/asm/barrier.h
-f:tools/arch/arm/include/uapi/asm/kvm.h
-f:tools/arch/arm/include/uapi/asm/mman.h
-f:tools/arch/arm/include/uapi/asm/perf_regs.h
-f:tools/arch/arm64/include/.gitignore
-f:tools/arch/arm64/include/asm/barrier.h
-f:tools/arch/arm64/include/asm/brk-imm.h
-f:tools/arch/arm64/include/asm/cputype.h
-f:tools/arch/arm64/include/asm/esr.h
-f:tools/arch/arm64/include/asm/gpr-num.h
-f:tools/arch/arm64/include/asm/sysreg.h
-f:tools/arch/arm64/include/uapi/asm/bitsperlong.h
-f:tools/arch/arm64/include/uapi/asm/kvm.h
-f:tools/arch/arm64/include/uapi/asm/mman.h
-f:tools/arch/arm64/include/uapi/asm/perf_regs.h
-f:tools/arch/arm64/include/uapi/asm/unistd.h
-f:tools/arch/arm64/tools/Makefile
-f:tools/arch/csky/include/uapi/asm/perf_regs.h
-f:tools/arch/hexagon/include/uapi/asm/mman.h
-f:tools/arch/hexagon/include/uapi/asm/unistd.h
-f:tools/arch/loongarch/include/asm/inst.h
-f:tools/arch/loongarch/include/asm/orc_types.h
-f:tools/arch/loongarch/include/uapi/asm/perf_regs.h
-f:tools/arch/loongarch/include/uapi/asm/unistd.h
-f:tools/arch/microblaze/include/uapi/asm/mman.h
-f:tools/arch/mips/include/asm/barrier.h
-f:tools/arch/mips/include/asm/errno.h
-f:tools/arch/mips/include/uapi/asm/bitsperlong.h
-f:tools/arch/mips/include/uapi/asm/errno.h
-f:tools/arch/mips/include/uapi/asm/kvm.h
-f:tools/arch/mips/include/uapi/asm/mman.h
-f:tools/arch/mips/include/uapi/asm/perf_regs.h
-f:tools/arch/parisc/include/uapi/asm/bitsperlong.h
-f:tools/arch/parisc/include/uapi/asm/errno.h
-f:tools/arch/parisc/include/uapi/asm/mman.h
-f:tools/arch/powerpc/include/asm/barrier.h
-f:tools/arch/powerpc/include/uapi/asm/bitsperlong.h
-f:tools/arch/powerpc/include/uapi/asm/errno.h
-f:tools/arch/powerpc/include/uapi/asm/kvm.h
-f:tools/arch/powerpc/include/uapi/asm/mman.h
-f:tools/arch/powerpc/include/uapi/asm/perf_regs.h
-f:tools/arch/riscv/include/asm/barrier.h
-f:tools/arch/riscv/include/asm/csr.h
-f:tools/arch/riscv/include/asm/fence.h
-f:tools/arch/riscv/include/asm/vdso/processor.h
-f:tools/arch/riscv/include/uapi/asm/bitsperlong.h
-f:tools/arch/riscv/include/uapi/asm/perf_regs.h
-f:tools/arch/riscv/include/uapi/asm/unistd.h
-f:tools/arch/s390/include/asm/barrier.h
-f:tools/arch/s390/include/uapi/asm/bitsperlong.h
-f:tools/arch/s390/include/uapi/asm/kvm.h
-f:tools/arch/s390/include/uapi/asm/kvm_perf.h
-f:tools/arch/s390/include/uapi/asm/mman.h
-f:tools/arch/s390/include/uapi/asm/perf_regs.h
-f:tools/arch/s390/include/uapi/asm/sie.h
-f:tools/arch/sh/include/asm/barrier.h
-f:tools/arch/sh/include/uapi/asm/mman.h
-f:tools/arch/sparc/include/asm/barrier.h
-f:tools/arch/sparc/include/asm/barrier_32.h
-f:tools/arch/sparc/include/asm/barrier_64.h
-f:tools/arch/sparc/include/uapi/asm/bitsperlong.h
-f:tools/arch/sparc/include/uapi/asm/errno.h
-f:tools/arch/sparc/include/uapi/asm/mman.h
-f:tools/arch/x86/dell-uart-backlight-emulator/.gitignore
-f:tools/arch/x86/dell-uart-backlight-emulator/Makefile
-f:tools/arch/x86/dell-uart-backlight-emulator/README
-f:tools/arch/x86/dell-uart-backlight-emulator/dell-uart-backlight-emulator.c
-f:tools/arch/x86/include/asm/amd/ibs.h
-f:tools/arch/x86/include/asm/asm.h
-f:tools/arch/x86/include/asm/atomic.h
-f:tools/arch/x86/include/asm/barrier.h
-f:tools/arch/x86/include/asm/cmpxchg.h
-f:tools/arch/x86/include/asm/cpufeatures.h
-f:tools/arch/x86/include/asm/emulate_prefix.h
-f:tools/arch/x86/include/asm/inat.h
-f:tools/arch/x86/include/asm/inat_types.h
-f:tools/arch/x86/include/asm/insn.h
-f:tools/arch/x86/include/asm/msr-index.h
-f:tools/arch/x86/include/asm/nops.h
-f:tools/arch/x86/include/asm/orc_types.h
-f:tools/arch/x86/include/asm/pvclock-abi.h
-f:tools/arch/x86/include/asm/pvclock.h
-f:tools/arch/x86/include/asm/rmwcc.h
-f:tools/arch/x86/include/uapi/asm/bitsperlong.h
-f:tools/arch/x86/include/uapi/asm/errno.h
-f:tools/arch/x86/include/uapi/asm/kvm.h
-f:tools/arch/x86/include/uapi/asm/kvm_perf.h
-f:tools/arch/x86/include/uapi/asm/mman.h
-f:tools/arch/x86/include/uapi/asm/perf_regs.h
-f:tools/arch/x86/include/uapi/asm/svm.h
-f:tools/arch/x86/include/uapi/asm/unistd.h
-f:tools/arch/x86/include/uapi/asm/unistd_32.h
-f:tools/arch/x86/include/uapi/asm/unistd_64.h
-f:tools/arch/x86/include/uapi/asm/vmx.h
-f:tools/arch/x86/intel_sdsi/Makefile
-f:tools/arch/x86/intel_sdsi/intel_sdsi.c
-f:tools/arch/x86/kcpuid/.gitignore
-f:tools/arch/x86/kcpuid/Makefile
-f:tools/arch/x86/kcpuid/cpuid.csv
-f:tools/arch/x86/kcpuid/kcpuid.c
-f:tools/arch/x86/lib/inat.c
-f:tools/arch/x86/lib/insn.c
-f:tools/arch/x86/lib/memcpy_64.S
-f:tools/arch/x86/lib/memset_64.S
-f:tools/arch/x86/lib/x86-opcode-map.txt
-f:tools/arch/x86/tools/gen-insn-attr-x86.awk
-f:tools/arch/xtensa/include/asm/barrier.h
-f:tools/arch/xtensa/include/uapi/asm/mman.h
-f:tools/bootconfig/.gitignore
-f:tools/bootconfig/Makefile
-f:tools/bootconfig/include/linux/bootconfig.h
-f:tools/bootconfig/main.c
-f:tools/bootconfig/samples/bad-array-space-comment.bconf
-f:tools/bootconfig/samples/bad-array.bconf
-f:tools/bootconfig/samples/bad-dotword.bconf
-f:tools/bootconfig/samples/bad-empty.bconf
-f:tools/bootconfig/samples/bad-keyerror.bconf
-f:tools/bootconfig/samples/bad-longkey.bconf
-f:tools/bootconfig/samples/bad-manywords.bconf
-f:tools/bootconfig/samples/bad-no-keyword.bconf
-f:tools/bootconfig/samples/bad-nonprintable.bconf
-f:tools/bootconfig/samples/bad-samekey.bconf
-f:tools/bootconfig/samples/bad-spaceword.bconf
-f:tools/bootconfig/samples/bad-tree.bconf
-f:tools/bootconfig/samples/bad-value.bconf
-f:tools/bootconfig/samples/escaped.bconf
-f:tools/bootconfig/samples/good-array-space-comment.bconf
-f:tools/bootconfig/samples/good-comment-after-value.bconf
-f:tools/bootconfig/samples/good-mixed-append.bconf
-f:tools/bootconfig/samples/good-mixed-kv1.bconf
-f:tools/bootconfig/samples/good-mixed-kv2.bconf
-f:tools/bootconfig/samples/good-mixed-kv3.bconf
-f:tools/bootconfig/samples/good-mixed-override.bconf
-f:tools/bootconfig/samples/good-override.bconf
-f:tools/bootconfig/samples/good-printables.bconf
-f:tools/bootconfig/samples/good-simple.bconf
-f:tools/bootconfig/samples/good-single.bconf
-f:tools/bootconfig/samples/good-space-after-value.bconf
-f:tools/bootconfig/samples/good-tree.bconf
-f:tools/bootconfig/scripts/bconf2ftrace.sh
-f:tools/bootconfig/scripts/ftrace.sh
-f:tools/bootconfig/scripts/ftrace2bconf.sh
-f:tools/bootconfig/scripts/xbc.sh
-f:tools/bootconfig/test-bootconfig.sh
-f:tools/bpf/.gitignore
-f:tools/bpf/Makefile
-f:tools/bpf/bpf_asm.c
-f:tools/bpf/bpf_dbg.c
-f:tools/bpf/bpf_exp.l
-f:tools/bpf/bpf_exp.y
-f:tools/bpf/bpf_jit_disasm.c
-f:tools/bpf/bpftool/.gitignore
-f:tools/bpf/bpftool/Documentation/Makefile
-f:tools/bpf/bpftool/Documentation/bpftool-btf.rst
-f:tools/bpf/bpftool/Documentation/bpftool-cgroup.rst
-f:tools/bpf/bpftool/Documentation/bpftool-feature.rst
-f:tools/bpf/bpftool/Documentation/bpftool-gen.rst
-f:tools/bpf/bpftool/Documentation/bpftool-iter.rst
-f:tools/bpf/bpftool/Documentation/bpftool-link.rst
-f:tools/bpf/bpftool/Documentation/bpftool-map.rst
-f:tools/bpf/bpftool/Documentation/bpftool-net.rst
-f:tools/bpf/bpftool/Documentation/bpftool-perf.rst
-f:tools/bpf/bpftool/Documentation/bpftool-prog.rst
-f:tools/bpf/bpftool/Documentation/bpftool-struct_ops.rst
-f:tools/bpf/bpftool/Documentation/bpftool.rst
-f:tools/bpf/bpftool/Documentation/common_options.rst
-f:tools/bpf/bpftool/Documentation/substitutions.rst
-f:tools/bpf/bpftool/Makefile
-f:tools/bpf/bpftool/bash-completion/bpftool
-f:tools/bpf/bpftool/btf.c
-f:tools/bpf/bpftool/btf_dumper.c
-f:tools/bpf/bpftool/cfg.c
-f:tools/bpf/bpftool/cfg.h
-f:tools/bpf/bpftool/cgroup.c
-f:tools/bpf/bpftool/common.c
-f:tools/bpf/bpftool/feature.c
-f:tools/bpf/bpftool/gen.c
-f:tools/bpf/bpftool/iter.c
-f:tools/bpf/bpftool/jit_disasm.c
-f:tools/bpf/bpftool/json_writer.c
-f:tools/bpf/bpftool/json_writer.h
-f:tools/bpf/bpftool/link.c
-f:tools/bpf/bpftool/main.c
-f:tools/bpf/bpftool/main.h
-f:tools/bpf/bpftool/map.c
-f:tools/bpf/bpftool/map_perf_ring.c
-f:tools/bpf/bpftool/net.c
-f:tools/bpf/bpftool/netlink_dumper.c
-f:tools/bpf/bpftool/netlink_dumper.h
-f:tools/bpf/bpftool/perf.c
-f:tools/bpf/bpftool/pids.c
-f:tools/bpf/bpftool/prog.c
-f:tools/bpf/bpftool/skeleton/pid_iter.bpf.c
-f:tools/bpf/bpftool/skeleton/pid_iter.h
-f:tools/bpf/bpftool/skeleton/profiler.bpf.c
-f:tools/bpf/bpftool/struct_ops.c
-f:tools/bpf/bpftool/tracelog.c
-f:tools/bpf/bpftool/xlated_dumper.c
-f:tools/bpf/bpftool/xlated_dumper.h
-f:tools/bpf/resolve_btfids/.gitignore
-f:tools/bpf/resolve_btfids/Build
-f:tools/bpf/resolve_btfids/Makefile
-f:tools/bpf/resolve_btfids/main.c
-f:tools/bpf/runqslower/.gitignore
-f:tools/bpf/runqslower/Makefile
-f:tools/bpf/runqslower/runqslower.bpf.c
-f:tools/bpf/runqslower/runqslower.c
-f:tools/bpf/runqslower/runqslower.h
-f:tools/build/.gitignore
-f:tools/build/Build.include
-f:tools/build/Documentation/Build.txt
-f:tools/build/Makefile
-f:tools/build/Makefile.build
-f:tools/build/Makefile.feature
-f:tools/build/Makefile.include
-f:tools/build/feature/.gitignore
-f:tools/build/feature/Makefile
-f:tools/build/feature/test-all.c
-f:tools/build/feature/test-backtrace.c
-f:tools/build/feature/test-bionic.c
-f:tools/build/feature/test-bpf.c
-f:tools/build/feature/test-clang-bpf-co-re.c
-f:tools/build/feature/test-compile.c
-f:tools/build/feature/test-cplus-demangle.c
-f:tools/build/feature/test-cxa-demangle.cpp
-f:tools/build/feature/test-disassembler-four-args.c
-f:tools/build/feature/test-disassembler-init-styled.c
-f:tools/build/feature/test-eventfd.c
-f:tools/build/feature/test-file-handle.c
-f:tools/build/feature/test-fortify-source.c
-f:tools/build/feature/test-get_cpuid.c
-f:tools/build/feature/test-get_current_dir_name.c
-f:tools/build/feature/test-gettid.c
-f:tools/build/feature/test-glibc.c
-f:tools/build/feature/test-gtk2-infobar.c
-f:tools/build/feature/test-gtk2.c
-f:tools/build/feature/test-hello.c
-f:tools/build/feature/test-jvmti-cmlr.c
-f:tools/build/feature/test-jvmti.c
-f:tools/build/feature/test-libaio.c
-f:tools/build/feature/test-libbabeltrace.c
-f:tools/build/feature/test-libbfd-buildid.c
-f:tools/build/feature/test-libbfd.c
-f:tools/build/feature/test-libbpf.c
-f:tools/build/feature/test-libcap.c
-f:tools/build/feature/test-libcapstone.c
-f:tools/build/feature/test-libcpupower.c
-f:tools/build/feature/test-libcrypto.c
-f:tools/build/feature/test-libdebuginfod.c
-f:tools/build/feature/test-libdw.c
-f:tools/build/feature/test-libelf-gelf_getnote.c
-f:tools/build/feature/test-libelf-getphdrnum.c
-f:tools/build/feature/test-libelf-getshdrstrndx.c
-f:tools/build/feature/test-libelf-zstd.c
-f:tools/build/feature/test-libelf.c
-f:tools/build/feature/test-libnuma.c
-f:tools/build/feature/test-libopencsd.c
-f:tools/build/feature/test-libperl.c
-f:tools/build/feature/test-libpfm4.c
-f:tools/build/feature/test-libpython.c
-f:tools/build/feature/test-libslang-include-subdir.c
-f:tools/build/feature/test-libslang.c
-f:tools/build/feature/test-libtraceevent.c
-f:tools/build/feature/test-libtracefs.c
-f:tools/build/feature/test-libunwind-aarch64.c
-f:tools/build/feature/test-libunwind-arm.c
-f:tools/build/feature/test-libunwind-debug-frame-aarch64.c
-f:tools/build/feature/test-libunwind-debug-frame-arm.c
-f:tools/build/feature/test-libunwind-debug-frame.c
-f:tools/build/feature/test-libunwind-x86.c
-f:tools/build/feature/test-libunwind-x86_64.c
-f:tools/build/feature/test-libunwind.c
-f:tools/build/feature/test-libzstd.c
-f:tools/build/feature/test-llvm-perf.cpp
-f:tools/build/feature/test-llvm.cpp
-f:tools/build/feature/test-lzma.c
-f:tools/build/feature/test-numa_num_possible_cpus.c
-f:tools/build/feature/test-pthread-attr-setaffinity-np.c
-f:tools/build/feature/test-pthread-barrier.c
-f:tools/build/feature/test-reallocarray.c
-f:tools/build/feature/test-scandirat.c
-f:tools/build/feature/test-sched_getcpu.c
-f:tools/build/feature/test-sdt.c
-f:tools/build/feature/test-setns.c
-f:tools/build/feature/test-stackprotector-all.c
-f:tools/build/feature/test-timerfd.c
-f:tools/build/feature/test-zlib.c
-f:tools/build/fixdep.c
-f:tools/build/tests/ex/Build
-f:tools/build/tests/ex/Makefile
-f:tools/build/tests/ex/a.c
-f:tools/build/tests/ex/arch/Build
-f:tools/build/tests/ex/arch/e.c
-f:tools/build/tests/ex/arch/f.c
-f:tools/build/tests/ex/b.c
-f:tools/build/tests/ex/c.c
-f:tools/build/tests/ex/d.c
-f:tools/build/tests/ex/empty/Build
-f:tools/build/tests/ex/empty2/README
-f:tools/build/tests/ex/ex.c
-f:tools/build/tests/ex/inc.c
-f:tools/build/tests/run.sh
-f:tools/certs/print-cert-tbs-hash.sh
-f:tools/cgroup/.gitignore
-f:tools/cgroup/iocost_coef_gen.py
-f:tools/cgroup/iocost_monitor.py
-f:tools/cgroup/memcg_shrinker.py
-f:tools/cgroup/memcg_slabinfo.py
-f:tools/counter/.gitignore
-f:tools/counter/Build
-f:tools/counter/Makefile
-f:tools/counter/counter_example.c
-f:tools/counter/counter_watch_events.c
-f:tools/crypto/ccp/.gitignore
-f:tools/crypto/ccp/Makefile
-f:tools/crypto/ccp/dbc.c
-f:tools/crypto/ccp/dbc.py
-f:tools/crypto/ccp/dbc_cli.py
-f:tools/crypto/ccp/test_dbc.py
-f:tools/crypto/tcrypt/tcrypt_speed_compare.py
-f:tools/debugging/Makefile
-f:tools/debugging/kernel-chktaint
-f:tools/firewire/Makefile
-f:tools/firewire/decode-fcp.c
-f:tools/firewire/list.h
-f:tools/firewire/nosy-dump.c
-f:tools/firewire/nosy-dump.h
-f:tools/firmware/Makefile
-f:tools/firmware/ihex2fw.c
-f:tools/gpio/.gitignore
-f:tools/gpio/Build
-f:tools/gpio/Makefile
-f:tools/gpio/gpio-event-mon.c
-f:tools/gpio/gpio-hammer.c
-f:tools/gpio/gpio-sloppy-logic-analyzer.sh
-f:tools/gpio/gpio-utils.c
-f:tools/gpio/gpio-utils.h
-f:tools/gpio/gpio-watch.c
-f:tools/gpio/lsgpio.c
-f:tools/hv/.gitignore
-f:tools/hv/Build
-f:tools/hv/Makefile
-f:tools/hv/hv_fcopy_uio_daemon.c
-f:tools/hv/hv_get_dhcp_info.sh
-f:tools/hv/hv_get_dns_info.sh
-f:tools/hv/hv_kvp_daemon.c
-f:tools/hv/hv_set_ifconfig.sh
-f:tools/hv/hv_vss_daemon.c
-f:tools/hv/lsvmbus
-f:tools/hv/vmbus_bufring.c
-f:tools/hv/vmbus_bufring.h
-f:tools/hv/vmbus_testing
-f:tools/iio/.gitignore
-f:tools/iio/Build
-f:tools/iio/Makefile
-f:tools/iio/iio_event_monitor.c
-f:tools/iio/iio_generic_buffer.c
-f:tools/iio/iio_utils.c
-f:tools/iio/iio_utils.h
-f:tools/iio/lsiio.c
-f:tools/include/asm-generic/atomic-gcc.h
-f:tools/include/asm-generic/barrier.h
-f:tools/include/asm-generic/bitops.h
-f:tools/include/asm-generic/bitops/__ffs.h
-f:tools/include/asm-generic/bitops/__ffz.h
-f:tools/include/asm-generic/bitops/__fls.h
-f:tools/include/asm-generic/bitops/arch_hweight.h
-f:tools/include/asm-generic/bitops/atomic.h
-f:tools/include/asm-generic/bitops/const_hweight.h
-f:tools/include/asm-generic/bitops/fls.h
-f:tools/include/asm-generic/bitops/fls64.h
-f:tools/include/asm-generic/bitops/hweight.h
-f:tools/include/asm-generic/bitops/non-atomic.h
-f:tools/include/asm-generic/bitsperlong.h
-f:tools/include/asm-generic/hugetlb_encode.h
-f:tools/include/asm/alternative.h
-f:tools/include/asm/atomic.h
-f:tools/include/asm/barrier.h
-f:tools/include/asm/bug.h
-f:tools/include/asm/export.h
-f:tools/include/asm/rwonce.h
-f:tools/include/asm/sections.h
-f:tools/include/asm/timex.h
-f:tools/include/generated/asm-offsets.h
-f:tools/include/generated/asm/cpucap-defs.h
-f:tools/include/generated/asm/sysreg-defs.h
-f:tools/include/io_uring/mini_liburing.h
-f:tools/include/linux/align.h
-f:tools/include/linux/arm-smccc.h
-f:tools/include/linux/atomic.h
-f:tools/include/linux/bitfield.h
-f:tools/include/linux/bitmap.h
-f:tools/include/linux/bitops.h
-f:tools/include/linux/bits.h
-f:tools/include/linux/btf_ids.h
-f:tools/include/linux/bug.h
-f:tools/include/linux/build_bug.h
-f:tools/include/linux/cache.h
-f:tools/include/linux/cfi_types.h
-f:tools/include/linux/compiler-gcc.h
-f:tools/include/linux/compiler.h
-f:tools/include/linux/compiler_types.h
-f:tools/include/linux/const.h
-f:tools/include/linux/container_of.h
-f:tools/include/linux/coresight-pmu.h
-f:tools/include/linux/ctype.h
-f:tools/include/linux/debugfs.h
-f:tools/include/linux/delay.h
-f:tools/include/linux/err.h
-f:tools/include/linux/export.h
-f:tools/include/linux/filter.h
-f:tools/include/linux/find.h
-f:tools/include/linux/ftrace.h
-f:tools/include/linux/gfp.h
-f:tools/include/linux/gfp_types.h
-f:tools/include/linux/hash.h
-f:tools/include/linux/hashtable.h
-f:tools/include/linux/init.h
-f:tools/include/linux/interrupt.h
-f:tools/include/linux/interval_tree_generic.h
-f:tools/include/linux/io.h
-f:tools/include/linux/jhash.h
-f:tools/include/linux/kallsyms.h
-f:tools/include/linux/kasan-tags.h
-f:tools/include/linux/kconfig.h
-f:tools/include/linux/kern_levels.h
-f:tools/include/linux/kernel.h
-f:tools/include/linux/linkage.h
-f:tools/include/linux/list.h
-f:tools/include/linux/list_sort.h
-f:tools/include/linux/log2.h
-f:tools/include/linux/math.h
-f:tools/include/linux/math64.h
-f:tools/include/linux/mm.h
-f:tools/include/linux/module.h
-f:tools/include/linux/moduleparam.h
-f:tools/include/linux/mutex.h
-f:tools/include/linux/nmi.h
-f:tools/include/linux/numa.h
-f:tools/include/linux/objtool_types.h
-f:tools/include/linux/overflow.h
-f:tools/include/linux/panic.h
-f:tools/include/linux/pfn.h
-f:tools/include/linux/poison.h
-f:tools/include/linux/prandom.h
-f:tools/include/linux/rbtree.h
-f:tools/include/linux/rbtree_augmented.h
-f:tools/include/linux/rcu.h
-f:tools/include/linux/refcount.h
-f:tools/include/linux/ring_buffer.h
-f:tools/include/linux/rwsem.h
-f:tools/include/linux/sched/clock.h
-f:tools/include/linux/sched/mm.h
-f:tools/include/linux/sched/task.h
-f:tools/include/linux/seq_file.h
-f:tools/include/linux/sizes.h
-f:tools/include/linux/slab.h
-f:tools/include/linux/spinlock.h
-f:tools/include/linux/static_call_types.h
-f:tools/include/linux/string.h
-f:tools/include/linux/stringify.h
-f:tools/include/linux/time64.h
-f:tools/include/linux/types.h
-f:tools/include/linux/unaligned.h
-f:tools/include/linux/unaligned/packed_struct.h
-f:tools/include/linux/zalloc.h
-f:tools/include/nolibc/.gitignore
-f:tools/include/nolibc/Makefile
-f:tools/include/nolibc/arch-arm.h
-f:tools/include/nolibc/arch-arm64.h
-f:tools/include/nolibc/arch-loongarch.h
-f:tools/include/nolibc/arch-m68k.h
-f:tools/include/nolibc/arch-mips.h
-f:tools/include/nolibc/arch-powerpc.h
-f:tools/include/nolibc/arch-riscv.h
-f:tools/include/nolibc/arch-s390.h
-f:tools/include/nolibc/arch-sh.h
-f:tools/include/nolibc/arch-sparc.h
-f:tools/include/nolibc/arch-x86.h
-f:tools/include/nolibc/arch.h
-f:tools/include/nolibc/compiler.h
-f:tools/include/nolibc/crt.h
-f:tools/include/nolibc/ctype.h
-f:tools/include/nolibc/dirent.h
-f:tools/include/nolibc/elf.h
-f:tools/include/nolibc/errno.h
-f:tools/include/nolibc/fcntl.h
-f:tools/include/nolibc/getopt.h
-f:tools/include/nolibc/limits.h
-f:tools/include/nolibc/math.h
-f:tools/include/nolibc/nolibc.h
-f:tools/include/nolibc/poll.h
-f:tools/include/nolibc/sched.h
-f:tools/include/nolibc/signal.h
-f:tools/include/nolibc/stackprotector.h
-f:tools/include/nolibc/std.h
-f:tools/include/nolibc/stdarg.h
-f:tools/include/nolibc/stdbool.h
-f:tools/include/nolibc/stddef.h
-f:tools/include/nolibc/stdint.h
-f:tools/include/nolibc/stdio.h
-f:tools/include/nolibc/stdlib.h
-f:tools/include/nolibc/string.h
-f:tools/include/nolibc/sys.h
-f:tools/include/nolibc/sys/auxv.h
-f:tools/include/nolibc/sys/ioctl.h
-f:tools/include/nolibc/sys/mman.h
-f:tools/include/nolibc/sys/mount.h
-f:tools/include/nolibc/sys/prctl.h
-f:tools/include/nolibc/sys/random.h
-f:tools/include/nolibc/sys/reboot.h
-f:tools/include/nolibc/sys/resource.h
-f:tools/include/nolibc/sys/stat.h
-f:tools/include/nolibc/sys/syscall.h
-f:tools/include/nolibc/sys/sysmacros.h
-f:tools/include/nolibc/sys/time.h
-f:tools/include/nolibc/sys/timerfd.h
-f:tools/include/nolibc/sys/types.h
-f:tools/include/nolibc/sys/utsname.h
-f:tools/include/nolibc/sys/wait.h
-f:tools/include/nolibc/time.h
-f:tools/include/nolibc/types.h
-f:tools/include/nolibc/unistd.h
-f:tools/include/perf/arm_pmuv3.h
-f:tools/include/tools/be_byteshift.h
-f:tools/include/tools/config.h
-f:tools/include/tools/dis-asm-compat.h
-f:tools/include/tools/endian.h
-f:tools/include/tools/le_byteshift.h
-f:tools/include/tools/libc_compat.h
-f:tools/include/trace/events/lock.h
-f:tools/include/uapi/README
-f:tools/include/uapi/asm-generic/bitsperlong.h
-f:tools/include/uapi/asm-generic/bpf_perf_event.h
-f:tools/include/uapi/asm-generic/errno-base.h
-f:tools/include/uapi/asm-generic/errno.h
-f:tools/include/uapi/asm-generic/ioctls.h
-f:tools/include/uapi/asm-generic/mman-common-tools.h
-f:tools/include/uapi/asm-generic/mman-common.h
-f:tools/include/uapi/asm-generic/mman.h
-f:tools/include/uapi/asm-generic/socket.h
-f:tools/include/uapi/asm-generic/unistd.h
-f:tools/include/uapi/asm/bitsperlong.h
-f:tools/include/uapi/asm/bpf_perf_event.h
-f:tools/include/uapi/asm/errno.h
-f:tools/include/uapi/drm/drm.h
-f:tools/include/uapi/drm/i915_drm.h
-f:tools/include/uapi/linux/bits.h
-f:tools/include/uapi/linux/bpf.h
-f:tools/include/uapi/linux/bpf_common.h
-f:tools/include/uapi/linux/bpf_perf_event.h
-f:tools/include/uapi/linux/btf.h
-f:tools/include/uapi/linux/const.h
-f:tools/include/uapi/linux/coredump.h
-f:tools/include/uapi/linux/elf.h
-f:tools/include/uapi/linux/erspan.h
-f:tools/include/uapi/linux/fadvise.h
-f:tools/include/uapi/linux/fanotify.h
-f:tools/include/uapi/linux/filter.h
-f:tools/include/uapi/linux/fs.h
-f:tools/include/uapi/linux/fscrypt.h
-f:tools/include/uapi/linux/hw_breakpoint.h
-f:tools/include/uapi/linux/if_link.h
-f:tools/include/uapi/linux/if_tun.h
-f:tools/include/uapi/linux/if_xdp.h
-f:tools/include/uapi/linux/in.h
-f:tools/include/uapi/linux/io_uring.h
-f:tools/include/uapi/linux/kcmp.h
-f:tools/include/uapi/linux/kvm.h
-f:tools/include/uapi/linux/memfd.h
-f:tools/include/uapi/linux/mman.h
-f:tools/include/uapi/linux/mount.h
-f:tools/include/uapi/linux/netdev.h
-f:tools/include/uapi/linux/netlink.h
-f:tools/include/uapi/linux/nsfs.h
-f:tools/include/uapi/linux/perf_event.h
-f:tools/include/uapi/linux/pkt_cls.h
-f:tools/include/uapi/linux/pkt_sched.h
-f:tools/include/uapi/linux/prctl.h
-f:tools/include/uapi/linux/seccomp.h
-f:tools/include/uapi/linux/seg6.h
-f:tools/include/uapi/linux/seg6_local.h
-f:tools/include/uapi/linux/stat.h
-f:tools/include/uapi/linux/stddef.h
-f:tools/include/uapi/linux/tc_act/tc_bpf.h
-f:tools/include/uapi/linux/tcp.h
-f:tools/include/uapi/linux/tls.h
-f:tools/include/uapi/linux/types.h
-f:tools/include/uapi/linux/userfaultfd.h
-f:tools/include/vdso/bits.h
-f:tools/include/vdso/const.h
-f:tools/include/vdso/unaligned.h
-f:tools/kvm/kvm_stat/Makefile
-f:tools/kvm/kvm_stat/kvm_stat
-f:tools/kvm/kvm_stat/kvm_stat.service
-f:tools/kvm/kvm_stat/kvm_stat.txt
-f:tools/laptop/dslm/.gitignore
-f:tools/laptop/dslm/Makefile
-f:tools/laptop/dslm/dslm.c
-f:tools/laptop/freefall/Makefile
-f:tools/laptop/freefall/freefall.c
-f:tools/leds/.gitignore
-f:tools/leds/Makefile
-f:tools/leds/get_led_device_info.sh
-f:tools/leds/led_hw_brightness_mon.c
-f:tools/leds/uledmon.c
-f:tools/lib/api/Build
-f:tools/lib/api/Makefile
-f:tools/lib/api/cpu.c
-f:tools/lib/api/cpu.h
-f:tools/lib/api/debug-internal.h
-f:tools/lib/api/debug.c
-f:tools/lib/api/debug.h
-f:tools/lib/api/fd/Build
-f:tools/lib/api/fd/array.c
-f:tools/lib/api/fd/array.h
-f:tools/lib/api/fs/Build
-f:tools/lib/api/fs/cgroup.c
-f:tools/lib/api/fs/fs.c
-f:tools/lib/api/fs/fs.h
-f:tools/lib/api/fs/tracing_path.c
-f:tools/lib/api/fs/tracing_path.h
-f:tools/lib/api/io.h
-f:tools/lib/api/io_dir.h
-f:tools/lib/argv_split.c
-f:tools/lib/bitmap.c
-f:tools/lib/bpf/.gitignore
-f:tools/lib/bpf/Build
-f:tools/lib/bpf/Makefile
-f:tools/lib/bpf/bpf.c
-f:tools/lib/bpf/bpf.h
-f:tools/lib/bpf/bpf_core_read.h
-f:tools/lib/bpf/bpf_endian.h
-f:tools/lib/bpf/bpf_gen_internal.h
-f:tools/lib/bpf/bpf_helpers.h
-f:tools/lib/bpf/bpf_prog_linfo.c
-f:tools/lib/bpf/bpf_tracing.h
-f:tools/lib/bpf/btf.c
-f:tools/lib/bpf/btf.h
-f:tools/lib/bpf/btf_dump.c
-f:tools/lib/bpf/btf_iter.c
-f:tools/lib/bpf/btf_relocate.c
-f:tools/lib/bpf/elf.c
-f:tools/lib/bpf/features.c
-f:tools/lib/bpf/gen_loader.c
-f:tools/lib/bpf/hashmap.c
-f:tools/lib/bpf/hashmap.h
-f:tools/lib/bpf/libbpf.c
-f:tools/lib/bpf/libbpf.h
-f:tools/lib/bpf/libbpf.map
-f:tools/lib/bpf/libbpf.pc.template
-f:tools/lib/bpf/libbpf_common.h
-f:tools/lib/bpf/libbpf_errno.c
-f:tools/lib/bpf/libbpf_internal.h
-f:tools/lib/bpf/libbpf_legacy.h
-f:tools/lib/bpf/libbpf_probes.c
-f:tools/lib/bpf/libbpf_version.h
-f:tools/lib/bpf/linker.c
-f:tools/lib/bpf/netlink.c
-f:tools/lib/bpf/nlattr.c
-f:tools/lib/bpf/nlattr.h
-f:tools/lib/bpf/relo_core.c
-f:tools/lib/bpf/relo_core.h
-f:tools/lib/bpf/ringbuf.c
-f:tools/lib/bpf/skel_internal.h
-f:tools/lib/bpf/str_error.c
-f:tools/lib/bpf/str_error.h
-f:tools/lib/bpf/strset.c
-f:tools/lib/bpf/strset.h
-f:tools/lib/bpf/usdt.bpf.h
-f:tools/lib/bpf/usdt.c
-f:tools/lib/bpf/zip.c
-f:tools/lib/bpf/zip.h
-f:tools/lib/cmdline.c
-f:tools/lib/ctype.c
-f:tools/lib/find_bit.c
-f:tools/lib/hweight.c
-f:tools/lib/list_sort.c
-f:tools/lib/perf/.gitignore
-f:tools/lib/perf/Build
-f:tools/lib/perf/Documentation/Makefile
-f:tools/lib/perf/Documentation/asciidoc.conf
-f:tools/lib/perf/Documentation/examples/counting.c
-f:tools/lib/perf/Documentation/examples/sampling.c
-f:tools/lib/perf/Documentation/libperf-counting.txt
-f:tools/lib/perf/Documentation/libperf-sampling.txt
-f:tools/lib/perf/Documentation/libperf.txt
-f:tools/lib/perf/Documentation/manpage-1.72.xsl
-f:tools/lib/perf/Documentation/manpage-base.xsl
-f:tools/lib/perf/Documentation/manpage-bold-literal.xsl
-f:tools/lib/perf/Documentation/manpage-normal.xsl
-f:tools/lib/perf/Documentation/manpage-suppress-sp.xsl
-f:tools/lib/perf/Makefile
-f:tools/lib/perf/core.c
-f:tools/lib/perf/cpumap.c
-f:tools/lib/perf/evlist.c
-f:tools/lib/perf/evsel.c
-f:tools/lib/perf/include/internal/cpumap.h
-f:tools/lib/perf/include/internal/evlist.h
-f:tools/lib/perf/include/internal/evsel.h
-f:tools/lib/perf/include/internal/lib.h
-f:tools/lib/perf/include/internal/mmap.h
-f:tools/lib/perf/include/internal/rc_check.h
-f:tools/lib/perf/include/internal/tests.h
-f:tools/lib/perf/include/internal/threadmap.h
-f:tools/lib/perf/include/internal/xyarray.h
-f:tools/lib/perf/include/perf/bpf_perf.h
-f:tools/lib/perf/include/perf/core.h
-f:tools/lib/perf/include/perf/cpumap.h
-f:tools/lib/perf/include/perf/event.h
-f:tools/lib/perf/include/perf/evlist.h
-f:tools/lib/perf/include/perf/evsel.h
-f:tools/lib/perf/include/perf/mmap.h
-f:tools/lib/perf/include/perf/threadmap.h
-f:tools/lib/perf/internal.h
-f:tools/lib/perf/lib.c
-f:tools/lib/perf/libperf.map
-f:tools/lib/perf/libperf.pc.template
-f:tools/lib/perf/mmap.c
-f:tools/lib/perf/tests/Build
-f:tools/lib/perf/tests/main.c
-f:tools/lib/perf/tests/test-cpumap.c
-f:tools/lib/perf/tests/test-evlist.c
-f:tools/lib/perf/tests/test-evsel.c
-f:tools/lib/perf/tests/test-threadmap.c
-f:tools/lib/perf/tests/tests.h
-f:tools/lib/perf/threadmap.c
-f:tools/lib/perf/xyarray.c
-f:tools/lib/rbtree.c
-f:tools/lib/slab.c
-f:tools/lib/str_error_r.c
-f:tools/lib/string.c
-f:tools/lib/subcmd/Build
-f:tools/lib/subcmd/Makefile
-f:tools/lib/subcmd/exec-cmd.c
-f:tools/lib/subcmd/exec-cmd.h
-f:tools/lib/subcmd/help.c
-f:tools/lib/subcmd/help.h
-f:tools/lib/subcmd/pager.c
-f:tools/lib/subcmd/pager.h
-f:tools/lib/subcmd/parse-options.c
-f:tools/lib/subcmd/parse-options.h
-f:tools/lib/subcmd/run-command.c
-f:tools/lib/subcmd/run-command.h
-f:tools/lib/subcmd/sigchain.c
-f:tools/lib/subcmd/sigchain.h
-f:tools/lib/subcmd/subcmd-config.c
-f:tools/lib/subcmd/subcmd-config.h
-f:tools/lib/subcmd/subcmd-util.h
-f:tools/lib/symbol/Build
-f:tools/lib/symbol/Makefile
-f:tools/lib/symbol/kallsyms.c
-f:tools/lib/symbol/kallsyms.h
-f:tools/lib/thermal/.gitignore
-f:tools/lib/thermal/Build
-f:tools/lib/thermal/Makefile
-f:tools/lib/thermal/commands.c
-f:tools/lib/thermal/events.c
-f:tools/lib/thermal/include/thermal.h
-f:tools/lib/thermal/libthermal.map
-f:tools/lib/thermal/libthermal.pc.template
-f:tools/lib/thermal/sampling.c
-f:tools/lib/thermal/thermal.c
-f:tools/lib/thermal/thermal_nl.c
-f:tools/lib/thermal/thermal_nl.h
-f:tools/lib/vsprintf.c
-f:tools/lib/zalloc.c
-f:tools/memory-model/.gitignore
-f:tools/memory-model/Documentation/README
-f:tools/memory-model/Documentation/access-marking.txt
-f:tools/memory-model/Documentation/cheatsheet.txt
-f:tools/memory-model/Documentation/control-dependencies.txt
-f:tools/memory-model/Documentation/explanation.txt
-f:tools/memory-model/Documentation/glossary.txt
-f:tools/memory-model/Documentation/herd-representation.txt
-f:tools/memory-model/Documentation/litmus-tests.txt
-f:tools/memory-model/Documentation/locking.txt
-f:tools/memory-model/Documentation/ordering.txt
-f:tools/memory-model/Documentation/recipes.txt
-f:tools/memory-model/Documentation/references.txt
-f:tools/memory-model/Documentation/simple.txt
-f:tools/memory-model/README
-f:tools/memory-model/linux-kernel.bell
-f:tools/memory-model/linux-kernel.cat
-f:tools/memory-model/linux-kernel.cfg
-f:tools/memory-model/linux-kernel.def
-f:tools/memory-model/litmus-tests/.gitignore
-f:tools/memory-model/litmus-tests/CoRR+poonceonce+Once.litmus
-f:tools/memory-model/litmus-tests/CoRW+poonceonce+Once.litmus
-f:tools/memory-model/litmus-tests/CoWR+poonceonce+Once.litmus
-f:tools/memory-model/litmus-tests/CoWW+poonceonce.litmus
-f:tools/memory-model/litmus-tests/IRIW+fencembonceonces+OnceOnce.litmus
-f:tools/memory-model/litmus-tests/IRIW+poonceonces+OnceOnce.litmus
-f:tools/memory-model/litmus-tests/ISA2+pooncelock+pooncelock+pombonce.litmus
-f:tools/memory-model/litmus-tests/ISA2+poonceonces.litmus
-f:tools/memory-model/litmus-tests/ISA2+pooncerelease+poacquirerelease+poacquireonce.litmus
-f:tools/memory-model/litmus-tests/LB+fencembonceonce+ctrlonceonce.litmus
-f:tools/memory-model/litmus-tests/LB+poacquireonce+pooncerelease.litmus
-f:tools/memory-model/litmus-tests/LB+poonceonces.litmus
-f:tools/memory-model/litmus-tests/LB+unlocklockonceonce+poacquireonce.litmus
-f:tools/memory-model/litmus-tests/MP+fencewmbonceonce+fencermbonceonce.litmus
-f:tools/memory-model/litmus-tests/MP+onceassign+derefonce.litmus
-f:tools/memory-model/litmus-tests/MP+polockmbonce+poacquiresilsil.litmus
-f:tools/memory-model/litmus-tests/MP+polockonce+poacquiresilsil.litmus
-f:tools/memory-model/litmus-tests/MP+polocks.litmus
-f:tools/memory-model/litmus-tests/MP+poonceonces.litmus
-f:tools/memory-model/litmus-tests/MP+pooncerelease+poacquireonce.litmus
-f:tools/memory-model/litmus-tests/MP+porevlocks.litmus
-f:tools/memory-model/litmus-tests/MP+unlocklockonceonce+fencermbonceonce.litmus
-f:tools/memory-model/litmus-tests/R+fencembonceonces.litmus
-f:tools/memory-model/litmus-tests/R+poonceonces.litmus
-f:tools/memory-model/litmus-tests/README
-f:tools/memory-model/litmus-tests/S+fencewmbonceonce+poacquireonce.litmus
-f:tools/memory-model/litmus-tests/S+poonceonces.litmus
-f:tools/memory-model/litmus-tests/SB+fencembonceonces.litmus
-f:tools/memory-model/litmus-tests/SB+poonceonces.litmus
-f:tools/memory-model/litmus-tests/SB+rfionceonce-poonceonces.litmus
-f:tools/memory-model/litmus-tests/WRC+poonceonces+Once.litmus
-f:tools/memory-model/litmus-tests/WRC+pooncerelease+fencermbonceonce+Once.litmus
-f:tools/memory-model/litmus-tests/Z6.0+pooncelock+pooncelock+pombonce.litmus
-f:tools/memory-model/litmus-tests/Z6.0+pooncerelease+poacquirerelease+fencembonceonce.litmus
-f:tools/memory-model/litmus-tests/dep+plain.litmus
-f:tools/memory-model/lock.cat
-f:tools/memory-model/scripts/README
-f:tools/memory-model/scripts/checkalllitmus.sh
-f:tools/memory-model/scripts/checkghlitmus.sh
-f:tools/memory-model/scripts/checklitmus.sh
-f:tools/memory-model/scripts/checklitmushist.sh
-f:tools/memory-model/scripts/checktheselitmus.sh
-f:tools/memory-model/scripts/cmplitmushist.sh
-f:tools/memory-model/scripts/hwfnseg.sh
-f:tools/memory-model/scripts/initlitmushist.sh
-f:tools/memory-model/scripts/judgelitmus.sh
-f:tools/memory-model/scripts/newlitmushist.sh
-f:tools/memory-model/scripts/parseargs.sh
-f:tools/memory-model/scripts/runlitmus.sh
-f:tools/memory-model/scripts/runlitmushist.sh
-f:tools/memory-model/scripts/simpletest.sh
-f:tools/mm/.gitignore
-f:tools/mm/Makefile
-f:tools/mm/page-types.c
-f:tools/mm/page_owner_sort.c
-f:tools/mm/show_page_info.py
-f:tools/mm/slabinfo-gnuplot.sh
-f:tools/mm/slabinfo.c
-f:tools/mm/thp_swap_allocator_test.c
-f:tools/mm/thpmaps
-f:tools/net/sunrpc/extract.sh
-f:tools/net/sunrpc/xdrgen/.gitignore
-f:tools/net/sunrpc/xdrgen/README
-f:tools/net/sunrpc/xdrgen/__init__.py
-f:tools/net/sunrpc/xdrgen/generators/__init__.py
-f:tools/net/sunrpc/xdrgen/generators/constant.py
-f:tools/net/sunrpc/xdrgen/generators/enum.py
-f:tools/net/sunrpc/xdrgen/generators/header_bottom.py
-f:tools/net/sunrpc/xdrgen/generators/header_top.py
-f:tools/net/sunrpc/xdrgen/generators/pointer.py
-f:tools/net/sunrpc/xdrgen/generators/program.py
-f:tools/net/sunrpc/xdrgen/generators/source_top.py
-f:tools/net/sunrpc/xdrgen/generators/struct.py
-f:tools/net/sunrpc/xdrgen/generators/typedef.py
-f:tools/net/sunrpc/xdrgen/generators/union.py
-f:tools/net/sunrpc/xdrgen/grammars/xdr.lark
-f:tools/net/sunrpc/xdrgen/subcmds/__init__.py
-f:tools/net/sunrpc/xdrgen/subcmds/declarations.py
-f:tools/net/sunrpc/xdrgen/subcmds/definitions.py
-f:tools/net/sunrpc/xdrgen/subcmds/lint.py
-f:tools/net/sunrpc/xdrgen/subcmds/source.py
-f:tools/net/sunrpc/xdrgen/templates/C/constants/definition.j2
-f:tools/net/sunrpc/xdrgen/templates/C/enum/declaration/enum.j2
-f:tools/net/sunrpc/xdrgen/templates/C/enum/decoder/enum.j2
-f:tools/net/sunrpc/xdrgen/templates/C/enum/decoder/enum_be.j2
-f:tools/net/sunrpc/xdrgen/templates/C/enum/definition/close.j2
-f:tools/net/sunrpc/xdrgen/templates/C/enum/definition/close_be.j2
-f:tools/net/sunrpc/xdrgen/templates/C/enum/definition/enumerator.j2
-f:tools/net/sunrpc/xdrgen/templates/C/enum/definition/open.j2
-f:tools/net/sunrpc/xdrgen/templates/C/enum/encoder/enum.j2
-f:tools/net/sunrpc/xdrgen/templates/C/enum/encoder/enum_be.j2
-f:tools/net/sunrpc/xdrgen/templates/C/enum/maxsize/enum.j2
-f:tools/net/sunrpc/xdrgen/templates/C/header_bottom/declaration/header.j2
-f:tools/net/sunrpc/xdrgen/templates/C/header_bottom/definition/header.j2
-f:tools/net/sunrpc/xdrgen/templates/C/header_top/declaration/header.j2
-f:tools/net/sunrpc/xdrgen/templates/C/header_top/definition/header.j2
-f:tools/net/sunrpc/xdrgen/templates/C/pointer/declaration/close.j2
-f:tools/net/sunrpc/xdrgen/templates/C/pointer/decoder/basic.j2
-f:tools/net/sunrpc/xdrgen/templates/C/pointer/decoder/close.j2
-f:tools/net/sunrpc/xdrgen/templates/C/pointer/decoder/fixed_length_array.j2
-f:tools/net/sunrpc/xdrgen/templates/C/pointer/decoder/fixed_length_opaque.j2
-f:tools/net/sunrpc/xdrgen/templates/C/pointer/decoder/open.j2
-f:tools/net/sunrpc/xdrgen/templates/C/pointer/decoder/optional_data.j2
-f:tools/net/sunrpc/xdrgen/templates/C/pointer/decoder/string.j2
-f:tools/net/sunrpc/xdrgen/templates/C/pointer/decoder/variable_length_array.j2
-f:tools/net/sunrpc/xdrgen/templates/C/pointer/decoder/variable_length_opaque.j2
-f:tools/net/sunrpc/xdrgen/templates/C/pointer/definition/basic.j2
-f:tools/net/sunrpc/xdrgen/templates/C/pointer/definition/close.j2
-f:tools/net/sunrpc/xdrgen/templates/C/pointer/definition/fixed_length_array.j2
-f:tools/net/sunrpc/xdrgen/templates/C/pointer/definition/fixed_length_opaque.j2
-f:tools/net/sunrpc/xdrgen/templates/C/pointer/definition/open.j2
-f:tools/net/sunrpc/xdrgen/templates/C/pointer/definition/optional_data.j2
-f:tools/net/sunrpc/xdrgen/templates/C/pointer/definition/string.j2
-f:tools/net/sunrpc/xdrgen/templates/C/pointer/definition/variable_length_array.j2
-f:tools/net/sunrpc/xdrgen/templates/C/pointer/definition/variable_length_opaque.j2
-f:tools/net/sunrpc/xdrgen/templates/C/pointer/encoder/basic.j2
-f:tools/net/sunrpc/xdrgen/templates/C/pointer/encoder/close.j2
-f:tools/net/sunrpc/xdrgen/templates/C/pointer/encoder/fixed_length_array.j2
-f:tools/net/sunrpc/xdrgen/templates/C/pointer/encoder/fixed_length_opaque.j2
-f:tools/net/sunrpc/xdrgen/templates/C/pointer/encoder/open.j2
-f:tools/net/sunrpc/xdrgen/templates/C/pointer/encoder/optional_data.j2
-f:tools/net/sunrpc/xdrgen/templates/C/pointer/encoder/string.j2
-f:tools/net/sunrpc/xdrgen/templates/C/pointer/encoder/variable_length_array.j2
-f:tools/net/sunrpc/xdrgen/templates/C/pointer/encoder/variable_length_opaque.j2
-f:tools/net/sunrpc/xdrgen/templates/C/pointer/maxsize/pointer.j2
-f:tools/net/sunrpc/xdrgen/templates/C/program/declaration/argument.j2
-f:tools/net/sunrpc/xdrgen/templates/C/program/declaration/result.j2
-f:tools/net/sunrpc/xdrgen/templates/C/program/decoder/argument.j2
-f:tools/net/sunrpc/xdrgen/templates/C/program/decoder/result.j2
-f:tools/net/sunrpc/xdrgen/templates/C/program/definition/close.j2
-f:tools/net/sunrpc/xdrgen/templates/C/program/definition/open.j2
-f:tools/net/sunrpc/xdrgen/templates/C/program/definition/procedure.j2
-f:tools/net/sunrpc/xdrgen/templates/C/program/encoder/argument.j2
-f:tools/net/sunrpc/xdrgen/templates/C/program/encoder/result.j2
-f:tools/net/sunrpc/xdrgen/templates/C/source_top/client.j2
-f:tools/net/sunrpc/xdrgen/templates/C/source_top/server.j2
-f:tools/net/sunrpc/xdrgen/templates/C/struct/declaration/close.j2
-f:tools/net/sunrpc/xdrgen/templates/C/struct/decoder/basic.j2
-f:tools/net/sunrpc/xdrgen/templates/C/struct/decoder/close.j2
-f:tools/net/sunrpc/xdrgen/templates/C/struct/decoder/fixed_length_array.j2
-f:tools/net/sunrpc/xdrgen/templates/C/struct/decoder/fixed_length_opaque.j2
-f:tools/net/sunrpc/xdrgen/templates/C/struct/decoder/open.j2
-f:tools/net/sunrpc/xdrgen/templates/C/struct/decoder/optional_data.j2
-f:tools/net/sunrpc/xdrgen/templates/C/struct/decoder/string.j2
-f:tools/net/sunrpc/xdrgen/templates/C/struct/decoder/variable_length_array.j2
-f:tools/net/sunrpc/xdrgen/templates/C/struct/decoder/variable_length_opaque.j2
-f:tools/net/sunrpc/xdrgen/templates/C/struct/definition/basic.j2
-f:tools/net/sunrpc/xdrgen/templates/C/struct/definition/close.j2
-f:tools/net/sunrpc/xdrgen/templates/C/struct/definition/fixed_length_array.j2
-f:tools/net/sunrpc/xdrgen/templates/C/struct/definition/fixed_length_opaque.j2
-f:tools/net/sunrpc/xdrgen/templates/C/struct/definition/open.j2
-f:tools/net/sunrpc/xdrgen/templates/C/struct/definition/optional_data.j2
-f:tools/net/sunrpc/xdrgen/templates/C/struct/definition/string.j2
-f:tools/net/sunrpc/xdrgen/templates/C/struct/definition/variable_length_array.j2
-f:tools/net/sunrpc/xdrgen/templates/C/struct/definition/variable_length_opaque.j2
-f:tools/net/sunrpc/xdrgen/templates/C/struct/encoder/basic.j2
-f:tools/net/sunrpc/xdrgen/templates/C/struct/encoder/close.j2
-f:tools/net/sunrpc/xdrgen/templates/C/struct/encoder/fixed_length_array.j2
-f:tools/net/sunrpc/xdrgen/templates/C/struct/encoder/fixed_length_opaque.j2
-f:tools/net/sunrpc/xdrgen/templates/C/struct/encoder/open.j2
-f:tools/net/sunrpc/xdrgen/templates/C/struct/encoder/optional_data.j2
-f:tools/net/sunrpc/xdrgen/templates/C/struct/encoder/string.j2
-f:tools/net/sunrpc/xdrgen/templates/C/struct/encoder/variable_length_array.j2
-f:tools/net/sunrpc/xdrgen/templates/C/struct/encoder/variable_length_opaque.j2
-f:tools/net/sunrpc/xdrgen/templates/C/struct/maxsize/struct.j2
-f:tools/net/sunrpc/xdrgen/templates/C/typedef/declaration/basic.j2
-f:tools/net/sunrpc/xdrgen/templates/C/typedef/declaration/fixed_length_array.j2
-f:tools/net/sunrpc/xdrgen/templates/C/typedef/declaration/fixed_length_opaque.j2
-f:tools/net/sunrpc/xdrgen/templates/C/typedef/declaration/string.j2
-f:tools/net/sunrpc/xdrgen/templates/C/typedef/declaration/variable_length_array.j2
-f:tools/net/sunrpc/xdrgen/templates/C/typedef/declaration/variable_length_opaque.j2
-f:tools/net/sunrpc/xdrgen/templates/C/typedef/decoder/basic.j2
-f:tools/net/sunrpc/xdrgen/templates/C/typedef/decoder/fixed_length_array.j2
-f:tools/net/sunrpc/xdrgen/templates/C/typedef/decoder/fixed_length_opaque.j2
-f:tools/net/sunrpc/xdrgen/templates/C/typedef/decoder/string.j2
-f:tools/net/sunrpc/xdrgen/templates/C/typedef/decoder/variable_length_array.j2
-f:tools/net/sunrpc/xdrgen/templates/C/typedef/decoder/variable_length_opaque.j2
-f:tools/net/sunrpc/xdrgen/templates/C/typedef/definition/basic.j2
-f:tools/net/sunrpc/xdrgen/templates/C/typedef/definition/fixed_length_array.j2
-f:tools/net/sunrpc/xdrgen/templates/C/typedef/definition/fixed_length_opaque.j2
-f:tools/net/sunrpc/xdrgen/templates/C/typedef/definition/string.j2
-f:tools/net/sunrpc/xdrgen/templates/C/typedef/definition/variable_length_array.j2
-f:tools/net/sunrpc/xdrgen/templates/C/typedef/definition/variable_length_opaque.j2
-f:tools/net/sunrpc/xdrgen/templates/C/typedef/encoder/basic.j2
-f:tools/net/sunrpc/xdrgen/templates/C/typedef/encoder/fixed_length_array.j2
-f:tools/net/sunrpc/xdrgen/templates/C/typedef/encoder/fixed_length_opaque.j2
-f:tools/net/sunrpc/xdrgen/templates/C/typedef/encoder/string.j2
-f:tools/net/sunrpc/xdrgen/templates/C/typedef/encoder/variable_length_array.j2
-f:tools/net/sunrpc/xdrgen/templates/C/typedef/encoder/variable_length_opaque.j2
-f:tools/net/sunrpc/xdrgen/templates/C/typedef/maxsize/basic.j2
-f:tools/net/sunrpc/xdrgen/templates/C/typedef/maxsize/fixed_length_opaque.j2
-f:tools/net/sunrpc/xdrgen/templates/C/typedef/maxsize/string.j2
-f:tools/net/sunrpc/xdrgen/templates/C/typedef/maxsize/variable_length_array.j2
-f:tools/net/sunrpc/xdrgen/templates/C/typedef/maxsize/variable_length_opaque.j2
-f:tools/net/sunrpc/xdrgen/templates/C/union/decoder/basic.j2
-f:tools/net/sunrpc/xdrgen/templates/C/union/decoder/break.j2
-f:tools/net/sunrpc/xdrgen/templates/C/union/decoder/case_spec.j2
-f:tools/net/sunrpc/xdrgen/templates/C/union/decoder/case_spec_be.j2
-f:tools/net/sunrpc/xdrgen/templates/C/union/decoder/close.j2
-f:tools/net/sunrpc/xdrgen/templates/C/union/decoder/default_spec.j2
-f:tools/net/sunrpc/xdrgen/templates/C/union/decoder/open.j2
-f:tools/net/sunrpc/xdrgen/templates/C/union/decoder/optional_data.j2
-f:tools/net/sunrpc/xdrgen/templates/C/union/decoder/string.j2
-f:tools/net/sunrpc/xdrgen/templates/C/union/decoder/switch_spec.j2
-f:tools/net/sunrpc/xdrgen/templates/C/union/decoder/variable_length_array.j2
-f:tools/net/sunrpc/xdrgen/templates/C/union/decoder/variable_length_opaque.j2
-f:tools/net/sunrpc/xdrgen/templates/C/union/decoder/void.j2
-f:tools/net/sunrpc/xdrgen/templates/C/union/definition/case_spec.j2
-f:tools/net/sunrpc/xdrgen/templates/C/union/definition/close.j2
-f:tools/net/sunrpc/xdrgen/templates/C/union/definition/default_spec.j2
-f:tools/net/sunrpc/xdrgen/templates/C/union/definition/open.j2
-f:tools/net/sunrpc/xdrgen/templates/C/union/definition/switch_spec.j2
-f:tools/net/sunrpc/xdrgen/templates/C/union/encoder/basic.j2
-f:tools/net/sunrpc/xdrgen/templates/C/union/encoder/break.j2
-f:tools/net/sunrpc/xdrgen/templates/C/union/encoder/case_spec.j2
-f:tools/net/sunrpc/xdrgen/templates/C/union/encoder/case_spec_be.j2
-f:tools/net/sunrpc/xdrgen/templates/C/union/encoder/close.j2
-f:tools/net/sunrpc/xdrgen/templates/C/union/encoder/default_spec.j2
-f:tools/net/sunrpc/xdrgen/templates/C/union/encoder/open.j2
-f:tools/net/sunrpc/xdrgen/templates/C/union/encoder/switch_spec.j2
-f:tools/net/sunrpc/xdrgen/templates/C/union/encoder/void.j2
-f:tools/net/sunrpc/xdrgen/templates/C/union/maxsize/union.j2
-f:tools/net/sunrpc/xdrgen/tests/test.x
-f:tools/net/sunrpc/xdrgen/xdr_ast.py
-f:tools/net/sunrpc/xdrgen/xdr_parse.py
-f:tools/net/sunrpc/xdrgen/xdrgen
-f:tools/net/ynl/Makefile
-f:tools/net/ynl/Makefile.deps
-f:tools/net/ynl/generated/.gitignore
-f:tools/net/ynl/generated/Makefile
-f:tools/net/ynl/lib/.gitignore
-f:tools/net/ynl/lib/Makefile
-f:tools/net/ynl/lib/ynl-priv.h
-f:tools/net/ynl/lib/ynl.c
-f:tools/net/ynl/lib/ynl.h
-f:tools/net/ynl/pyproject.toml
-f:tools/net/ynl/pyynl/.gitignore
-f:tools/net/ynl/pyynl/__init__.py
-f:tools/net/ynl/pyynl/cli.py
-f:tools/net/ynl/pyynl/ethtool.py
-f:tools/net/ynl/pyynl/lib/__init__.py
-f:tools/net/ynl/pyynl/lib/nlspec.py
-f:tools/net/ynl/pyynl/lib/ynl.py
-f:tools/net/ynl/pyynl/ynl_gen_c.py
-f:tools/net/ynl/pyynl/ynl_gen_rst.py
-f:tools/net/ynl/requirements.txt
-f:tools/net/ynl/samples/.gitignore
-f:tools/net/ynl/samples/Makefile
-f:tools/net/ynl/samples/devlink.c
-f:tools/net/ynl/samples/ethtool.c
-f:tools/net/ynl/samples/netdev.c
-f:tools/net/ynl/samples/ovs.c
-f:tools/net/ynl/samples/page-pool.c
-f:tools/net/ynl/samples/rt-addr.c
-f:tools/net/ynl/samples/rt-link.c
-f:tools/net/ynl/samples/rt-route.c
-f:tools/net/ynl/samples/tc.c
-f:tools/net/ynl/ynl-regen.sh
-f:tools/objtool/.gitignore
-f:tools/objtool/Build
-f:tools/objtool/Documentation/objtool.txt
-f:tools/objtool/Makefile
-f:tools/objtool/arch/loongarch/Build
-f:tools/objtool/arch/loongarch/decode.c
-f:tools/objtool/arch/loongarch/include/arch/cfi_regs.h
-f:tools/objtool/arch/loongarch/include/arch/elf.h
-f:tools/objtool/arch/loongarch/include/arch/special.h
-f:tools/objtool/arch/loongarch/orc.c
-f:tools/objtool/arch/loongarch/special.c
-f:tools/objtool/arch/powerpc/Build
-f:tools/objtool/arch/powerpc/decode.c
-f:tools/objtool/arch/powerpc/include/arch/cfi_regs.h
-f:tools/objtool/arch/powerpc/include/arch/elf.h
-f:tools/objtool/arch/powerpc/include/arch/special.h
-f:tools/objtool/arch/powerpc/special.c
-f:tools/objtool/arch/x86/Build
-f:tools/objtool/arch/x86/decode.c
-f:tools/objtool/arch/x86/include/arch/cfi_regs.h
-f:tools/objtool/arch/x86/include/arch/elf.h
-f:tools/objtool/arch/x86/include/arch/special.h
-f:tools/objtool/arch/x86/orc.c
-f:tools/objtool/arch/x86/special.c
-f:tools/objtool/builtin-check.c
-f:tools/objtool/check.c
-f:tools/objtool/elf.c
-f:tools/objtool/include/objtool/arch.h
-f:tools/objtool/include/objtool/builtin.h
-f:tools/objtool/include/objtool/cfi.h
-f:tools/objtool/include/objtool/check.h
-f:tools/objtool/include/objtool/elf.h
-f:tools/objtool/include/objtool/endianness.h
-f:tools/objtool/include/objtool/objtool.h
-f:tools/objtool/include/objtool/orc.h
-f:tools/objtool/include/objtool/special.h
-f:tools/objtool/include/objtool/warn.h
-f:tools/objtool/noreturns.h
-f:tools/objtool/objtool.c
-f:tools/objtool/orc_dump.c
-f:tools/objtool/orc_gen.c
-f:tools/objtool/special.c
-f:tools/objtool/sync-check.sh
-f:tools/objtool/weak.c
-f:tools/pcmcia/.gitignore
-f:tools/pcmcia/Makefile
-f:tools/pcmcia/crc32hash.c
-f:tools/perf/.gitignore
-f:tools/perf/Build
-f:tools/perf/CREDITS
-f:tools/perf/Documentation/Build.txt
-f:tools/perf/Documentation/Makefile
-f:tools/perf/Documentation/android.txt
-f:tools/perf/Documentation/arm-coresight.txt
-f:tools/perf/Documentation/asciidoc.conf
-f:tools/perf/Documentation/asciidoctor-extensions.rb
-f:tools/perf/Documentation/build-docdep.perl
-f:tools/perf/Documentation/build-xed.txt
-f:tools/perf/Documentation/callchain-overhead-calculation.txt
-f:tools/perf/Documentation/cat-texi.perl
-f:tools/perf/Documentation/cpu-and-latency-overheads.txt
-f:tools/perf/Documentation/db-export.txt
-f:tools/perf/Documentation/examples.txt
-f:tools/perf/Documentation/guest-files.txt
-f:tools/perf/Documentation/guestmount.txt
-f:tools/perf/Documentation/intel-bts.txt
-f:tools/perf/Documentation/intel-hybrid.txt
-f:tools/perf/Documentation/intel-pt.txt
-f:tools/perf/Documentation/itrace.txt
-f:tools/perf/Documentation/jit-interface.txt
-f:tools/perf/Documentation/jitdump-specification.txt
-f:tools/perf/Documentation/manpage-1.72.xsl
-f:tools/perf/Documentation/manpage-base.xsl
-f:tools/perf/Documentation/manpage-bold-literal.xsl
-f:tools/perf/Documentation/manpage-normal.xsl
-f:tools/perf/Documentation/manpage-suppress-sp.xsl
-f:tools/perf/Documentation/perf-amd-ibs.txt
-f:tools/perf/Documentation/perf-annotate.txt
-f:tools/perf/Documentation/perf-archive.txt
-f:tools/perf/Documentation/perf-arm-spe.txt
-f:tools/perf/Documentation/perf-bench.txt
-f:tools/perf/Documentation/perf-buildid-cache.txt
-f:tools/perf/Documentation/perf-buildid-list.txt
-f:tools/perf/Documentation/perf-c2c.txt
-f:tools/perf/Documentation/perf-check.txt
-f:tools/perf/Documentation/perf-config.txt
-f:tools/perf/Documentation/perf-daemon.txt
-f:tools/perf/Documentation/perf-data.txt
-f:tools/perf/Documentation/perf-diff.txt
-f:tools/perf/Documentation/perf-dlfilter.txt
-f:tools/perf/Documentation/perf-evlist.txt
-f:tools/perf/Documentation/perf-ftrace.txt
-f:tools/perf/Documentation/perf-help.txt
-f:tools/perf/Documentation/perf-inject.txt
-f:tools/perf/Documentation/perf-intel-pt.txt
-f:tools/perf/Documentation/perf-iostat.txt
-f:tools/perf/Documentation/perf-kallsyms.txt
-f:tools/perf/Documentation/perf-kmem.txt
-f:tools/perf/Documentation/perf-kvm.txt
-f:tools/perf/Documentation/perf-kwork.txt
-f:tools/perf/Documentation/perf-list.txt
-f:tools/perf/Documentation/perf-lock.txt
-f:tools/perf/Documentation/perf-mem.txt
-f:tools/perf/Documentation/perf-probe.txt
-f:tools/perf/Documentation/perf-record.txt
-f:tools/perf/Documentation/perf-report.txt
-f:tools/perf/Documentation/perf-sched.txt
-f:tools/perf/Documentation/perf-script-perl.txt
-f:tools/perf/Documentation/perf-script-python.txt
-f:tools/perf/Documentation/perf-script.txt
-f:tools/perf/Documentation/perf-stat.txt
-f:tools/perf/Documentation/perf-test.txt
-f:tools/perf/Documentation/perf-timechart.txt
-f:tools/perf/Documentation/perf-top.txt
-f:tools/perf/Documentation/perf-trace.txt
-f:tools/perf/Documentation/perf-version.txt
-f:tools/perf/Documentation/perf.data-directory-format.txt
-f:tools/perf/Documentation/perf.data-file-format.txt
-f:tools/perf/Documentation/perf.txt
-f:tools/perf/Documentation/perfconfig.example
-f:tools/perf/Documentation/security.txt
-f:tools/perf/Documentation/tips.txt
-f:tools/perf/Documentation/topdown.txt
-f:tools/perf/MANIFEST
-f:tools/perf/Makefile
-f:tools/perf/Makefile.config
-f:tools/perf/Makefile.perf
-f:tools/perf/arch/Build
-f:tools/perf/arch/alpha/Build
-f:tools/perf/arch/alpha/entry/syscalls/syscall.tbl
-f:tools/perf/arch/arc/annotate/instructions.c
-f:tools/perf/arch/arm/Build
-f:tools/perf/arch/arm/Makefile
-f:tools/perf/arch/arm/annotate/instructions.c
-f:tools/perf/arch/arm/entry/syscalls/syscall.tbl
-f:tools/perf/arch/arm/include/arch-tests.h
-f:tools/perf/arch/arm/include/dwarf-regs-table.h
-f:tools/perf/arch/arm/include/perf_regs.h
-f:tools/perf/arch/arm/tests/Build
-f:tools/perf/arch/arm/tests/arch-tests.c
-f:tools/perf/arch/arm/tests/dwarf-unwind.c
-f:tools/perf/arch/arm/tests/regs_load.S
-f:tools/perf/arch/arm/tests/vectors-page.c
-f:tools/perf/arch/arm/util/Build
-f:tools/perf/arch/arm/util/auxtrace.c
-f:tools/perf/arch/arm/util/cs-etm.c
-f:tools/perf/arch/arm/util/cs-etm.h
-f:tools/perf/arch/arm/util/perf_regs.c
-f:tools/perf/arch/arm/util/pmu.c
-f:tools/perf/arch/arm/util/unwind-libdw.c
-f:tools/perf/arch/arm/util/unwind-libunwind.c
-f:tools/perf/arch/arm64/Build
-f:tools/perf/arch/arm64/Makefile
-f:tools/perf/arch/arm64/annotate/instructions.c
-f:tools/perf/arch/arm64/entry/syscalls/syscall_32.tbl
-f:tools/perf/arch/arm64/include/arch-tests.h
-f:tools/perf/arch/arm64/include/dwarf-regs-table.h
-f:tools/perf/arch/arm64/include/perf_regs.h
-f:tools/perf/arch/arm64/tests/Build
-f:tools/perf/arch/arm64/tests/arch-tests.c
-f:tools/perf/arch/arm64/tests/cpuid-match.c
-f:tools/perf/arch/arm64/tests/dwarf-unwind.c
-f:tools/perf/arch/arm64/tests/regs_load.S
-f:tools/perf/arch/arm64/util/Build
-f:tools/perf/arch/arm64/util/arm-spe.c
-f:tools/perf/arch/arm64/util/arm64_exception_types.h
-f:tools/perf/arch/arm64/util/header.c
-f:tools/perf/arch/arm64/util/hisi-ptt.c
-f:tools/perf/arch/arm64/util/kvm-stat.c
-f:tools/perf/arch/arm64/util/machine.c
-f:tools/perf/arch/arm64/util/mem-events.c
-f:tools/perf/arch/arm64/util/mem-events.h
-f:tools/perf/arch/arm64/util/perf_regs.c
-f:tools/perf/arch/arm64/util/pmu.c
-f:tools/perf/arch/arm64/util/tsc.c
-f:tools/perf/arch/arm64/util/unwind-libdw.c
-f:tools/perf/arch/arm64/util/unwind-libunwind.c
-f:tools/perf/arch/common.c
-f:tools/perf/arch/common.h
-f:tools/perf/arch/csky/Build
-f:tools/perf/arch/csky/annotate/instructions.c
-f:tools/perf/arch/csky/include/perf_regs.h
-f:tools/perf/arch/csky/util/Build
-f:tools/perf/arch/csky/util/perf_regs.c
-f:tools/perf/arch/csky/util/unwind-libdw.c
-f:tools/perf/arch/loongarch/Build
-f:tools/perf/arch/loongarch/Makefile
-f:tools/perf/arch/loongarch/annotate/instructions.c
-f:tools/perf/arch/loongarch/include/dwarf-regs-table.h
-f:tools/perf/arch/loongarch/include/perf_regs.h
-f:tools/perf/arch/loongarch/util/Build
-f:tools/perf/arch/loongarch/util/header.c
-f:tools/perf/arch/loongarch/util/kvm-stat.c
-f:tools/perf/arch/loongarch/util/perf_regs.c
-f:tools/perf/arch/loongarch/util/unwind-libdw.c
-f:tools/perf/arch/loongarch/util/unwind-libunwind.c
-f:tools/perf/arch/mips/Build
-f:tools/perf/arch/mips/annotate/instructions.c
-f:tools/perf/arch/mips/entry/syscalls/syscall_n64.tbl
-f:tools/perf/arch/mips/include/dwarf-regs-table.h
-f:tools/perf/arch/mips/include/perf_regs.h
-f:tools/perf/arch/mips/util/Build
-f:tools/perf/arch/mips/util/perf_regs.c
-f:tools/perf/arch/mips/util/unwind-libunwind.c
-f:tools/perf/arch/parisc/Build
-f:tools/perf/arch/parisc/entry/syscalls/syscall.tbl
-f:tools/perf/arch/powerpc/Build
-f:tools/perf/arch/powerpc/Makefile
-f:tools/perf/arch/powerpc/annotate/instructions.c
-f:tools/perf/arch/powerpc/entry/syscalls/syscall.tbl
-f:tools/perf/arch/powerpc/include/arch-tests.h
-f:tools/perf/arch/powerpc/include/dwarf-regs-table.h
-f:tools/perf/arch/powerpc/include/perf_regs.h
-f:tools/perf/arch/powerpc/tests/Build
-f:tools/perf/arch/powerpc/tests/arch-tests.c
-f:tools/perf/arch/powerpc/tests/dwarf-unwind.c
-f:tools/perf/arch/powerpc/tests/regs_load.S
-f:tools/perf/arch/powerpc/util/Build
-f:tools/perf/arch/powerpc/util/book3s_hcalls.h
-f:tools/perf/arch/powerpc/util/book3s_hv_exits.h
-f:tools/perf/arch/powerpc/util/event.c
-f:tools/perf/arch/powerpc/util/evsel.c
-f:tools/perf/arch/powerpc/util/header.c
-f:tools/perf/arch/powerpc/util/kvm-stat.c
-f:tools/perf/arch/powerpc/util/mem-events.c
-f:tools/perf/arch/powerpc/util/mem-events.h
-f:tools/perf/arch/powerpc/util/perf_regs.c
-f:tools/perf/arch/powerpc/util/pmu.c
-f:tools/perf/arch/powerpc/util/skip-callchain-idx.c
-f:tools/perf/arch/powerpc/util/sym-handling.c
-f:tools/perf/arch/powerpc/util/unwind-libdw.c
-f:tools/perf/arch/powerpc/util/unwind-libunwind.c
-f:tools/perf/arch/powerpc/util/utils_header.h
-f:tools/perf/arch/riscv/Build
-f:tools/perf/arch/riscv/Makefile
-f:tools/perf/arch/riscv/include/dwarf-regs-table.h
-f:tools/perf/arch/riscv/include/perf_regs.h
-f:tools/perf/arch/riscv/util/Build
-f:tools/perf/arch/riscv/util/header.c
-f:tools/perf/arch/riscv/util/kvm-stat.c
-f:tools/perf/arch/riscv/util/perf_regs.c
-f:tools/perf/arch/riscv/util/riscv_trap_types.h
-f:tools/perf/arch/riscv/util/unwind-libdw.c
-f:tools/perf/arch/riscv64/annotate/instructions.c
-f:tools/perf/arch/s390/Build
-f:tools/perf/arch/s390/Makefile
-f:tools/perf/arch/s390/annotate/instructions.c
-f:tools/perf/arch/s390/entry/syscalls/syscall.tbl
-f:tools/perf/arch/s390/include/dwarf-regs-table.h
-f:tools/perf/arch/s390/include/perf_regs.h
-f:tools/perf/arch/s390/util/Build
-f:tools/perf/arch/s390/util/auxtrace.c
-f:tools/perf/arch/s390/util/header.c
-f:tools/perf/arch/s390/util/kvm-stat.c
-f:tools/perf/arch/s390/util/machine.c
-f:tools/perf/arch/s390/util/perf_regs.c
-f:tools/perf/arch/s390/util/pmu.c
-f:tools/perf/arch/s390/util/unwind-libdw.c
-f:tools/perf/arch/sh/entry/syscalls/syscall.tbl
-f:tools/perf/arch/sh/include/dwarf-regs-table.h
-f:tools/perf/arch/sparc/Makefile
-f:tools/perf/arch/sparc/annotate/instructions.c
-f:tools/perf/arch/sparc/entry/syscalls/syscall.tbl
-f:tools/perf/arch/sparc/include/dwarf-regs-table.h
-f:tools/perf/arch/x86/Build
-f:tools/perf/arch/x86/Makefile
-f:tools/perf/arch/x86/annotate/instructions.c
-f:tools/perf/arch/x86/entry/syscalls/syscall_32.tbl
-f:tools/perf/arch/x86/entry/syscalls/syscall_64.tbl
-f:tools/perf/arch/x86/include/arch-tests.h
-f:tools/perf/arch/x86/include/dwarf-regs-table.h
-f:tools/perf/arch/x86/include/perf_regs.h
-f:tools/perf/arch/x86/tests/Build
-f:tools/perf/arch/x86/tests/amd-ibs-period.c
-f:tools/perf/arch/x86/tests/amd-ibs-via-core-pmu.c
-f:tools/perf/arch/x86/tests/arch-tests.c
-f:tools/perf/arch/x86/tests/bp-modify.c
-f:tools/perf/arch/x86/tests/dwarf-unwind.c
-f:tools/perf/arch/x86/tests/gen-insn-x86-dat.awk
-f:tools/perf/arch/x86/tests/gen-insn-x86-dat.sh
-f:tools/perf/arch/x86/tests/hybrid.c
-f:tools/perf/arch/x86/tests/insn-x86-dat-32.c
-f:tools/perf/arch/x86/tests/insn-x86-dat-64.c
-f:tools/perf/arch/x86/tests/insn-x86-dat-src.c
-f:tools/perf/arch/x86/tests/insn-x86.c
-f:tools/perf/arch/x86/tests/intel-pt-test.c
-f:tools/perf/arch/x86/tests/regs_load.S
-f:tools/perf/arch/x86/tests/sample-parsing.c
-f:tools/perf/arch/x86/util/Build
-f:tools/perf/arch/x86/util/archinsn.c
-f:tools/perf/arch/x86/util/auxtrace.c
-f:tools/perf/arch/x86/util/cpuid.h
-f:tools/perf/arch/x86/util/event.c
-f:tools/perf/arch/x86/util/evlist.c
-f:tools/perf/arch/x86/util/evsel.c
-f:tools/perf/arch/x86/util/evsel.h
-f:tools/perf/arch/x86/util/header.c
-f:tools/perf/arch/x86/util/intel-bts.c
-f:tools/perf/arch/x86/util/intel-pt.c
-f:tools/perf/arch/x86/util/iostat.c
-f:tools/perf/arch/x86/util/kvm-stat.c
-f:tools/perf/arch/x86/util/machine.c
-f:tools/perf/arch/x86/util/mem-events.c
-f:tools/perf/arch/x86/util/mem-events.h
-f:tools/perf/arch/x86/util/perf_regs.c
-f:tools/perf/arch/x86/util/pmu.c
-f:tools/perf/arch/x86/util/topdown.c
-f:tools/perf/arch/x86/util/topdown.h
-f:tools/perf/arch/x86/util/tsc.c
-f:tools/perf/arch/x86/util/unwind-libdw.c
-f:tools/perf/arch/x86/util/unwind-libunwind.c
-f:tools/perf/arch/xtensa/entry/syscalls/syscall.tbl
-f:tools/perf/arch/xtensa/include/dwarf-regs-table.h
-f:tools/perf/bench/Build
-f:tools/perf/bench/bench.h
-f:tools/perf/bench/breakpoint.c
-f:tools/perf/bench/epoll-ctl.c
-f:tools/perf/bench/epoll-wait.c
-f:tools/perf/bench/evlist-open-close.c
-f:tools/perf/bench/find-bit-bench.c
-f:tools/perf/bench/futex-hash.c
-f:tools/perf/bench/futex-lock-pi.c
-f:tools/perf/bench/futex-requeue.c
-f:tools/perf/bench/futex-wake-parallel.c
-f:tools/perf/bench/futex-wake.c
-f:tools/perf/bench/futex.c
-f:tools/perf/bench/futex.h
-f:tools/perf/bench/inject-buildid.c
-f:tools/perf/bench/kallsyms-parse.c
-f:tools/perf/bench/mem-functions.c
-f:tools/perf/bench/mem-memcpy-arch.h
-f:tools/perf/bench/mem-memcpy-x86-64-asm-def.h
-f:tools/perf/bench/mem-memcpy-x86-64-asm.S
-f:tools/perf/bench/mem-memset-arch.h
-f:tools/perf/bench/mem-memset-x86-64-asm-def.h
-f:tools/perf/bench/mem-memset-x86-64-asm.S
-f:tools/perf/bench/numa.c
-f:tools/perf/bench/pmu-scan.c
-f:tools/perf/bench/sched-messaging.c
-f:tools/perf/bench/sched-pipe.c
-f:tools/perf/bench/sched-seccomp-notify.c
-f:tools/perf/bench/synthesize.c
-f:tools/perf/bench/syscall.c
-f:tools/perf/bench/uprobe.c
-f:tools/perf/builtin-annotate.c
-f:tools/perf/builtin-bench.c
-f:tools/perf/builtin-buildid-cache.c
-f:tools/perf/builtin-buildid-list.c
-f:tools/perf/builtin-c2c.c
-f:tools/perf/builtin-check.c
-f:tools/perf/builtin-config.c
-f:tools/perf/builtin-daemon.c
-f:tools/perf/builtin-data.c
-f:tools/perf/builtin-diff.c
-f:tools/perf/builtin-evlist.c
-f:tools/perf/builtin-ftrace.c
-f:tools/perf/builtin-help.c
-f:tools/perf/builtin-inject.c
-f:tools/perf/builtin-kallsyms.c
-f:tools/perf/builtin-kmem.c
-f:tools/perf/builtin-kvm.c
-f:tools/perf/builtin-kwork.c
-f:tools/perf/builtin-list.c
-f:tools/perf/builtin-lock.c
-f:tools/perf/builtin-mem.c
-f:tools/perf/builtin-probe.c
-f:tools/perf/builtin-record.c
-f:tools/perf/builtin-report.c
-f:tools/perf/builtin-sched.c
-f:tools/perf/builtin-script.c
-f:tools/perf/builtin-stat.c
-f:tools/perf/builtin-timechart.c
-f:tools/perf/builtin-top.c
-f:tools/perf/builtin-trace.c
-f:tools/perf/builtin-version.c
-f:tools/perf/builtin.h
-f:tools/perf/check-header_ignore_hunks/lib/list_sort.c
-f:tools/perf/check-headers.sh
-f:tools/perf/command-list.txt
-f:tools/perf/design.txt
-f:tools/perf/dlfilters/dlfilter-show-cycles.c
-f:tools/perf/dlfilters/dlfilter-test-api-v0.c
-f:tools/perf/dlfilters/dlfilter-test-api-v2.c
-f:tools/perf/include/perf/perf_dlfilter.h
-f:tools/perf/jvmti/Build
-f:tools/perf/jvmti/jvmti_agent.c
-f:tools/perf/jvmti/jvmti_agent.h
-f:tools/perf/jvmti/libjvmti.c
-f:tools/perf/perf-archive.sh
-f:tools/perf/perf-completion.sh
-f:tools/perf/perf-iostat.sh
-f:tools/perf/perf-read-vdso.c
-f:tools/perf/perf-sys.h
-f:tools/perf/perf.c
-f:tools/perf/perf.h
-f:tools/perf/pmu-events/Build
-f:tools/perf/pmu-events/README
-f:tools/perf/pmu-events/arch/arm64/ampere/ampereone/branch.json
-f:tools/perf/pmu-events/arch/arm64/ampere/ampereone/bus.json
-f:tools/perf/pmu-events/arch/arm64/ampere/ampereone/cache.json
-f:tools/perf/pmu-events/arch/arm64/ampere/ampereone/core-imp-def.json
-f:tools/perf/pmu-events/arch/arm64/ampere/ampereone/exception.json
-f:tools/perf/pmu-events/arch/arm64/ampere/ampereone/instruction.json
-f:tools/perf/pmu-events/arch/arm64/ampere/ampereone/intrinsic.json
-f:tools/perf/pmu-events/arch/arm64/ampere/ampereone/memory.json
-f:tools/perf/pmu-events/arch/arm64/ampere/ampereone/metrics.json
-f:tools/perf/pmu-events/arch/arm64/ampere/ampereone/pipeline.json
-f:tools/perf/pmu-events/arch/arm64/ampere/ampereone/spe.json
-f:tools/perf/pmu-events/arch/arm64/ampere/ampereonex/branch.json
-f:tools/perf/pmu-events/arch/arm64/ampere/ampereonex/bus.json
-f:tools/perf/pmu-events/arch/arm64/ampere/ampereonex/cache.json
-f:tools/perf/pmu-events/arch/arm64/ampere/ampereonex/core-imp-def.json
-f:tools/perf/pmu-events/arch/arm64/ampere/ampereonex/exception.json
-f:tools/perf/pmu-events/arch/arm64/ampere/ampereonex/instruction.json
-f:tools/perf/pmu-events/arch/arm64/ampere/ampereonex/intrinsic.json
-f:tools/perf/pmu-events/arch/arm64/ampere/ampereonex/memory.json
-f:tools/perf/pmu-events/arch/arm64/ampere/ampereonex/metrics.json
-f:tools/perf/pmu-events/arch/arm64/ampere/ampereonex/mmu.json
-f:tools/perf/pmu-events/arch/arm64/ampere/ampereonex/pipeline.json
-f:tools/perf/pmu-events/arch/arm64/ampere/ampereonex/spe.json
-f:tools/perf/pmu-events/arch/arm64/ampere/emag/branch.json
-f:tools/perf/pmu-events/arch/arm64/ampere/emag/bus.json
-f:tools/perf/pmu-events/arch/arm64/ampere/emag/cache.json
-f:tools/perf/pmu-events/arch/arm64/ampere/emag/clock.json
-f:tools/perf/pmu-events/arch/arm64/ampere/emag/exception.json
-f:tools/perf/pmu-events/arch/arm64/ampere/emag/instruction.json
-f:tools/perf/pmu-events/arch/arm64/ampere/emag/intrinsic.json
-f:tools/perf/pmu-events/arch/arm64/ampere/emag/memory.json
-f:tools/perf/pmu-events/arch/arm64/ampere/emag/pipeline.json
-f:tools/perf/pmu-events/arch/arm64/arm/cmn/sys/cmn.json
-f:tools/perf/pmu-events/arch/arm64/arm/cmn/sys/metric.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a34/branch.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a34/bus.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a34/cache.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a34/exception.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a34/instruction.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a34/memory.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a35/branch.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a35/bus.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a35/cache.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a35/exception.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a35/instruction.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a35/memory.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a510/branch.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a510/bus.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a510/cache.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a510/exception.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a510/instruction.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a510/memory.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a510/pipeline.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a510/pmu.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a510/trace.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a53/branch.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a53/bus.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a53/cache.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a53/memory.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a53/other.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a53/pipeline.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a55/branch.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a55/bus.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a55/cache.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a55/exception.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a55/instruction.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a55/memory.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a55/pipeline.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a57-a72/branch.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a57-a72/bus.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a57-a72/cache.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a57-a72/exception.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a57-a72/instruction.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a57-a72/memory.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a65-e1/branch.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a65-e1/bus.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a65-e1/cache.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a65-e1/dpu.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a65-e1/exception.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a65-e1/ifu.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a65-e1/instruction.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a65-e1/memory.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a65-e1/pipeline.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a710/branch.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a710/bus.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a710/cache.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a710/exception.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a710/instruction.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a710/memory.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a710/pipeline.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a710/trace.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a73/branch.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a73/bus.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a73/cache.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a73/etm.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a73/exception.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a73/instruction.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a73/memory.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a73/mmu.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a73/pipeline.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a75/branch.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a75/bus.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a75/cache.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a75/etm.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a75/exception.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a75/instruction.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a75/memory.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a75/mmu.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a75/pipeline.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a76/branch.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a76/bus.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a76/cache.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a76/exception.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a76/instruction.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a76/memory.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a76/pipeline.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a77/branch.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a77/bus.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a77/cache.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a77/exception.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a77/instruction.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a77/memory.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a77/pipeline.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a78/branch.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a78/bus.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a78/cache.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a78/exception.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a78/instruction.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a78/memory.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-a78/pipeline.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-x1/branch.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-x1/bus.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-x1/cache.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-x1/exception.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-x1/instruction.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-x1/memory.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-x1/pipeline.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-x2/branch.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-x2/bus.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-x2/cache.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-x2/exception.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-x2/instruction.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-x2/memory.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-x2/pipeline.json
-f:tools/perf/pmu-events/arch/arm64/arm/cortex-x2/trace.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n1/bus.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n1/exception.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n1/general.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n1/l1d_cache.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n1/l1i_cache.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n1/l2_cache.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n1/l3_cache.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n1/ll_cache.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n1/memory.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n1/metrics.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n1/retired.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n1/spe.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n1/spec_operation.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n1/stall.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n1/tlb.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/bus.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/exception.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/fp_operation.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/general.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/l1d_cache.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/l1i_cache.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/l2_cache.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/l3_cache.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/ll_cache.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/memory.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/metrics.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/retired.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/spe.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/spec_operation.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/stall.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/sve.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/tlb.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/trace.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/bus.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/exception.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/fp_operation.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/general.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/l1d_cache.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/l1i_cache.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/l2_cache.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/l3_cache.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/ll_cache.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/memory.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/metrics.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/retired.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/spe.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/spec_operation.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/stall.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/sve.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/tlb.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-n3/trace.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/bus.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/exception.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/fp_operation.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/general.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/l1d_cache.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/l1i_cache.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/l2_cache.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/l3_cache.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/ll_cache.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/memory.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/metrics.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/retired.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/spe.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/spec_operation.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/stall.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/sve.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/tlb.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/brbe.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/bus.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/exception.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/fp_operation.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/general.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/l1d_cache.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/l1i_cache.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/l2_cache.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/ll_cache.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/memory.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/metrics.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/retired.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/spe.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/spec_operation.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/stall.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/sve.json
-f:tools/perf/pmu-events/arch/arm64/arm/neoverse-v3/tlb.json
-f:tools/perf/pmu-events/arch/arm64/cavium/thunderx2/core-imp-def.json
-f:tools/perf/pmu-events/arch/arm64/common-and-microarch.json
-f:tools/perf/pmu-events/arch/arm64/freescale/imx8mm/sys/ddrc.json
-f:tools/perf/pmu-events/arch/arm64/freescale/imx8mm/sys/metrics.json
-f:tools/perf/pmu-events/arch/arm64/freescale/imx8mn/sys/ddrc.json
-f:tools/perf/pmu-events/arch/arm64/freescale/imx8mn/sys/metrics.json
-f:tools/perf/pmu-events/arch/arm64/freescale/imx8mp/sys/ddrc.json
-f:tools/perf/pmu-events/arch/arm64/freescale/imx8mp/sys/metrics.json
-f:tools/perf/pmu-events/arch/arm64/freescale/imx8mq/sys/ddrc.json
-f:tools/perf/pmu-events/arch/arm64/freescale/imx8mq/sys/metrics.json
-f:tools/perf/pmu-events/arch/arm64/freescale/imx91/sys/ddrc.json
-f:tools/perf/pmu-events/arch/arm64/freescale/imx91/sys/metrics.json
-f:tools/perf/pmu-events/arch/arm64/freescale/imx93/sys/ddrc.json
-f:tools/perf/pmu-events/arch/arm64/freescale/imx93/sys/metrics.json
-f:tools/perf/pmu-events/arch/arm64/freescale/imx95/sys/ddrc.json
-f:tools/perf/pmu-events/arch/arm64/freescale/imx95/sys/metrics.json
-f:tools/perf/pmu-events/arch/arm64/fujitsu/a64fx/branch.json
-f:tools/perf/pmu-events/arch/arm64/fujitsu/a64fx/bus.json
-f:tools/perf/pmu-events/arch/arm64/fujitsu/a64fx/cache.json
-f:tools/perf/pmu-events/arch/arm64/fujitsu/a64fx/cycle.json
-f:tools/perf/pmu-events/arch/arm64/fujitsu/a64fx/exception.json
-f:tools/perf/pmu-events/arch/arm64/fujitsu/a64fx/instruction.json
-f:tools/perf/pmu-events/arch/arm64/fujitsu/a64fx/memory.json
-f:tools/perf/pmu-events/arch/arm64/fujitsu/a64fx/other.json
-f:tools/perf/pmu-events/arch/arm64/fujitsu/a64fx/pipeline.json
-f:tools/perf/pmu-events/arch/arm64/fujitsu/a64fx/sve.json
-f:tools/perf/pmu-events/arch/arm64/fujitsu/monaka/core-imp-def.json
-f:tools/perf/pmu-events/arch/arm64/fujitsu/monaka/cycle_accounting.json
-f:tools/perf/pmu-events/arch/arm64/fujitsu/monaka/energy.json
-f:tools/perf/pmu-events/arch/arm64/fujitsu/monaka/exception.json
-f:tools/perf/pmu-events/arch/arm64/fujitsu/monaka/fp_operation.json
-f:tools/perf/pmu-events/arch/arm64/fujitsu/monaka/gcycle.json
-f:tools/perf/pmu-events/arch/arm64/fujitsu/monaka/general.json
-f:tools/perf/pmu-events/arch/arm64/fujitsu/monaka/hwpf.json
-f:tools/perf/pmu-events/arch/arm64/fujitsu/monaka/l1d_cache.json
-f:tools/perf/pmu-events/arch/arm64/fujitsu/monaka/l1i_cache.json
-f:tools/perf/pmu-events/arch/arm64/fujitsu/monaka/l2_cache.json
-f:tools/perf/pmu-events/arch/arm64/fujitsu/monaka/l3_cache.json
-f:tools/perf/pmu-events/arch/arm64/fujitsu/monaka/ll_cache.json
-f:tools/perf/pmu-events/arch/arm64/fujitsu/monaka/memory.json
-f:tools/perf/pmu-events/arch/arm64/fujitsu/monaka/pipeline.json
-f:tools/perf/pmu-events/arch/arm64/fujitsu/monaka/pmu.json
-f:tools/perf/pmu-events/arch/arm64/fujitsu/monaka/retired.json
-f:tools/perf/pmu-events/arch/arm64/fujitsu/monaka/spec_operation.json
-f:tools/perf/pmu-events/arch/arm64/fujitsu/monaka/stall.json
-f:tools/perf/pmu-events/arch/arm64/fujitsu/monaka/sve.json
-f:tools/perf/pmu-events/arch/arm64/fujitsu/monaka/tlb.json
-f:tools/perf/pmu-events/arch/arm64/fujitsu/monaka/trace.json
-f:tools/perf/pmu-events/arch/arm64/hisilicon/hip08/core-imp-def.json
-f:tools/perf/pmu-events/arch/arm64/hisilicon/hip08/metrics.json
-f:tools/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-ddrc.json
-f:tools/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-hha.json
-f:tools/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-l3c.json
-f:tools/perf/pmu-events/arch/arm64/hisilicon/hip09/sys/uncore-cpa.json
-f:tools/perf/pmu-events/arch/arm64/mapfile.csv
-f:tools/perf/pmu-events/arch/arm64/recommended.json
-f:tools/perf/pmu-events/arch/arm64/sbsa.json
-f:tools/perf/pmu-events/arch/arm64/thead/yitian710/sys/ali_drw.json
-f:tools/perf/pmu-events/arch/arm64/thead/yitian710/sys/metrics.json
-f:tools/perf/pmu-events/arch/common/common/tool.json
-f:tools/perf/pmu-events/arch/nds32/mapfile.csv
-f:tools/perf/pmu-events/arch/nds32/n13/atcpmu.json
-f:tools/perf/pmu-events/arch/powerpc/compat/generic-events.json
-f:tools/perf/pmu-events/arch/powerpc/mapfile.csv
-f:tools/perf/pmu-events/arch/powerpc/power10/cache.json
-f:tools/perf/pmu-events/arch/powerpc/power10/datasource.json
-f:tools/perf/pmu-events/arch/powerpc/power10/floating_point.json
-f:tools/perf/pmu-events/arch/powerpc/power10/frontend.json
-f:tools/perf/pmu-events/arch/powerpc/power10/locks.json
-f:tools/perf/pmu-events/arch/powerpc/power10/marked.json
-f:tools/perf/pmu-events/arch/powerpc/power10/memory.json
-f:tools/perf/pmu-events/arch/powerpc/power10/metrics.json
-f:tools/perf/pmu-events/arch/powerpc/power10/nest_metrics.json
-f:tools/perf/pmu-events/arch/powerpc/power10/others.json
-f:tools/perf/pmu-events/arch/powerpc/power10/pipeline.json
-f:tools/perf/pmu-events/arch/powerpc/power10/pmc.json
-f:tools/perf/pmu-events/arch/powerpc/power10/translation.json
-f:tools/perf/pmu-events/arch/powerpc/power8/cache.json
-f:tools/perf/pmu-events/arch/powerpc/power8/floating-point.json
-f:tools/perf/pmu-events/arch/powerpc/power8/frontend.json
-f:tools/perf/pmu-events/arch/powerpc/power8/marked.json
-f:tools/perf/pmu-events/arch/powerpc/power8/memory.json
-f:tools/perf/pmu-events/arch/powerpc/power8/metrics.json
-f:tools/perf/pmu-events/arch/powerpc/power8/other.json
-f:tools/perf/pmu-events/arch/powerpc/power8/pipeline.json
-f:tools/perf/pmu-events/arch/powerpc/power8/pmc.json
-f:tools/perf/pmu-events/arch/powerpc/power8/translation.json
-f:tools/perf/pmu-events/arch/powerpc/power9/cache.json
-f:tools/perf/pmu-events/arch/powerpc/power9/floating-point.json
-f:tools/perf/pmu-events/arch/powerpc/power9/frontend.json
-f:tools/perf/pmu-events/arch/powerpc/power9/marked.json
-f:tools/perf/pmu-events/arch/powerpc/power9/memory.json
-f:tools/perf/pmu-events/arch/powerpc/power9/metrics.json
-f:tools/perf/pmu-events/arch/powerpc/power9/nest_metrics.json
-f:tools/perf/pmu-events/arch/powerpc/power9/other.json
-f:tools/perf/pmu-events/arch/powerpc/power9/pipeline.json
-f:tools/perf/pmu-events/arch/powerpc/power9/pmc.json
-f:tools/perf/pmu-events/arch/powerpc/power9/translation.json
-f:tools/perf/pmu-events/arch/riscv/andes/ax45/firmware.json
-f:tools/perf/pmu-events/arch/riscv/andes/ax45/instructions.json
-f:tools/perf/pmu-events/arch/riscv/andes/ax45/memory.json
-f:tools/perf/pmu-events/arch/riscv/andes/ax45/microarch.json
-f:tools/perf/pmu-events/arch/riscv/mapfile.csv
-f:tools/perf/pmu-events/arch/riscv/riscv-sbi-firmware.json
-f:tools/perf/pmu-events/arch/riscv/sifive/bullet-07/cycle-and-instruction-count.json
-f:tools/perf/pmu-events/arch/riscv/sifive/bullet-07/microarch.json
-f:tools/perf/pmu-events/arch/riscv/sifive/bullet-07/watchpoint.json
-f:tools/perf/pmu-events/arch/riscv/sifive/bullet-0d/microarch.json
-f:tools/perf/pmu-events/arch/riscv/sifive/bullet/firmware.json
-f:tools/perf/pmu-events/arch/riscv/sifive/bullet/instruction.json
-f:tools/perf/pmu-events/arch/riscv/sifive/bullet/memory.json
-f:tools/perf/pmu-events/arch/riscv/sifive/bullet/microarch.json
-f:tools/perf/pmu-events/arch/riscv/sifive/p550/memory.json
-f:tools/perf/pmu-events/arch/riscv/sifive/p650/memory.json
-f:tools/perf/pmu-events/arch/riscv/sifive/p650/microarch.json
-f:tools/perf/pmu-events/arch/riscv/starfive/dubhe-80/common.json
-f:tools/perf/pmu-events/arch/riscv/starfive/dubhe-80/firmware.json
-f:tools/perf/pmu-events/arch/riscv/thead/c900-legacy/cache.json
-f:tools/perf/pmu-events/arch/riscv/thead/c900-legacy/firmware.json
-f:tools/perf/pmu-events/arch/riscv/thead/c900-legacy/instruction.json
-f:tools/perf/pmu-events/arch/riscv/thead/c900-legacy/microarch.json
-f:tools/perf/pmu-events/arch/s390/cf_z10/basic.json
-f:tools/perf/pmu-events/arch/s390/cf_z10/crypto.json
-f:tools/perf/pmu-events/arch/s390/cf_z10/extended.json
-f:tools/perf/pmu-events/arch/s390/cf_z13/basic.json
-f:tools/perf/pmu-events/arch/s390/cf_z13/crypto.json
-f:tools/perf/pmu-events/arch/s390/cf_z13/extended.json
-f:tools/perf/pmu-events/arch/s390/cf_z13/transaction.json
-f:tools/perf/pmu-events/arch/s390/cf_z14/basic.json
-f:tools/perf/pmu-events/arch/s390/cf_z14/crypto.json
-f:tools/perf/pmu-events/arch/s390/cf_z14/extended.json
-f:tools/perf/pmu-events/arch/s390/cf_z14/transaction.json
-f:tools/perf/pmu-events/arch/s390/cf_z15/basic.json
-f:tools/perf/pmu-events/arch/s390/cf_z15/crypto6.json
-f:tools/perf/pmu-events/arch/s390/cf_z15/extended.json
-f:tools/perf/pmu-events/arch/s390/cf_z15/transaction.json
-f:tools/perf/pmu-events/arch/s390/cf_z16/basic.json
-f:tools/perf/pmu-events/arch/s390/cf_z16/crypto6.json
-f:tools/perf/pmu-events/arch/s390/cf_z16/extended.json
-f:tools/perf/pmu-events/arch/s390/cf_z16/pai_crypto.json
-f:tools/perf/pmu-events/arch/s390/cf_z16/pai_ext.json
-f:tools/perf/pmu-events/arch/s390/cf_z16/transaction.json
-f:tools/perf/pmu-events/arch/s390/cf_z196/basic.json
-f:tools/perf/pmu-events/arch/s390/cf_z196/crypto.json
-f:tools/perf/pmu-events/arch/s390/cf_z196/extended.json
-f:tools/perf/pmu-events/arch/s390/cf_zec12/basic.json
-f:tools/perf/pmu-events/arch/s390/cf_zec12/crypto.json
-f:tools/perf/pmu-events/arch/s390/cf_zec12/extended.json
-f:tools/perf/pmu-events/arch/s390/cf_zec12/transaction.json
-f:tools/perf/pmu-events/arch/s390/mapfile.csv
-f:tools/perf/pmu-events/arch/test/arch-std-events.json
-f:tools/perf/pmu-events/arch/test/test_soc/cpu/branch.json
-f:tools/perf/pmu-events/arch/test/test_soc/cpu/cache.json
-f:tools/perf/pmu-events/arch/test/test_soc/cpu/metrics.json
-f:tools/perf/pmu-events/arch/test/test_soc/cpu/other.json
-f:tools/perf/pmu-events/arch/test/test_soc/cpu/uncore.json
-f:tools/perf/pmu-events/arch/test/test_soc/sys/uncore.json
-f:tools/perf/pmu-events/arch/x86/alderlake/adl-metrics.json
-f:tools/perf/pmu-events/arch/x86/alderlake/cache.json
-f:tools/perf/pmu-events/arch/x86/alderlake/floating-point.json
-f:tools/perf/pmu-events/arch/x86/alderlake/frontend.json
-f:tools/perf/pmu-events/arch/x86/alderlake/memory.json
-f:tools/perf/pmu-events/arch/x86/alderlake/metricgroups.json
-f:tools/perf/pmu-events/arch/x86/alderlake/other.json
-f:tools/perf/pmu-events/arch/x86/alderlake/pipeline.json
-f:tools/perf/pmu-events/arch/x86/alderlake/uncore-interconnect.json
-f:tools/perf/pmu-events/arch/x86/alderlake/uncore-memory.json
-f:tools/perf/pmu-events/arch/x86/alderlake/uncore-other.json
-f:tools/perf/pmu-events/arch/x86/alderlake/virtual-memory.json
-f:tools/perf/pmu-events/arch/x86/alderlaken/adln-metrics.json
-f:tools/perf/pmu-events/arch/x86/alderlaken/cache.json
-f:tools/perf/pmu-events/arch/x86/alderlaken/floating-point.json
-f:tools/perf/pmu-events/arch/x86/alderlaken/frontend.json
-f:tools/perf/pmu-events/arch/x86/alderlaken/memory.json
-f:tools/perf/pmu-events/arch/x86/alderlaken/metricgroups.json
-f:tools/perf/pmu-events/arch/x86/alderlaken/other.json
-f:tools/perf/pmu-events/arch/x86/alderlaken/pipeline.json
-f:tools/perf/pmu-events/arch/x86/alderlaken/uncore-interconnect.json
-f:tools/perf/pmu-events/arch/x86/alderlaken/uncore-memory.json
-f:tools/perf/pmu-events/arch/x86/alderlaken/uncore-other.json
-f:tools/perf/pmu-events/arch/x86/alderlaken/virtual-memory.json
-f:tools/perf/pmu-events/arch/x86/amdzen1/branch.json
-f:tools/perf/pmu-events/arch/x86/amdzen1/cache.json
-f:tools/perf/pmu-events/arch/x86/amdzen1/core.json
-f:tools/perf/pmu-events/arch/x86/amdzen1/data-fabric.json
-f:tools/perf/pmu-events/arch/x86/amdzen1/floating-point.json
-f:tools/perf/pmu-events/arch/x86/amdzen1/memory.json
-f:tools/perf/pmu-events/arch/x86/amdzen1/other.json
-f:tools/perf/pmu-events/arch/x86/amdzen1/recommended.json
-f:tools/perf/pmu-events/arch/x86/amdzen2/branch.json
-f:tools/perf/pmu-events/arch/x86/amdzen2/cache.json
-f:tools/perf/pmu-events/arch/x86/amdzen2/core.json
-f:tools/perf/pmu-events/arch/x86/amdzen2/data-fabric.json
-f:tools/perf/pmu-events/arch/x86/amdzen2/floating-point.json
-f:tools/perf/pmu-events/arch/x86/amdzen2/memory.json
-f:tools/perf/pmu-events/arch/x86/amdzen2/other.json
-f:tools/perf/pmu-events/arch/x86/amdzen2/recommended.json
-f:tools/perf/pmu-events/arch/x86/amdzen3/branch.json
-f:tools/perf/pmu-events/arch/x86/amdzen3/cache.json
-f:tools/perf/pmu-events/arch/x86/amdzen3/core.json
-f:tools/perf/pmu-events/arch/x86/amdzen3/data-fabric.json
-f:tools/perf/pmu-events/arch/x86/amdzen3/floating-point.json
-f:tools/perf/pmu-events/arch/x86/amdzen3/memory.json
-f:tools/perf/pmu-events/arch/x86/amdzen3/other.json
-f:tools/perf/pmu-events/arch/x86/amdzen3/recommended.json
-f:tools/perf/pmu-events/arch/x86/amdzen4/branch.json
-f:tools/perf/pmu-events/arch/x86/amdzen4/cache.json
-f:tools/perf/pmu-events/arch/x86/amdzen4/core.json
-f:tools/perf/pmu-events/arch/x86/amdzen4/data-fabric.json
-f:tools/perf/pmu-events/arch/x86/amdzen4/floating-point.json
-f:tools/perf/pmu-events/arch/x86/amdzen4/memory-controller.json
-f:tools/perf/pmu-events/arch/x86/amdzen4/memory.json
-f:tools/perf/pmu-events/arch/x86/amdzen4/other.json
-f:tools/perf/pmu-events/arch/x86/amdzen4/pipeline.json
-f:tools/perf/pmu-events/arch/x86/amdzen4/recommended.json
-f:tools/perf/pmu-events/arch/x86/amdzen5/branch-prediction.json
-f:tools/perf/pmu-events/arch/x86/amdzen5/data-fabric.json
-f:tools/perf/pmu-events/arch/x86/amdzen5/decode.json
-f:tools/perf/pmu-events/arch/x86/amdzen5/execution.json
-f:tools/perf/pmu-events/arch/x86/amdzen5/floating-point.json
-f:tools/perf/pmu-events/arch/x86/amdzen5/inst-cache.json
-f:tools/perf/pmu-events/arch/x86/amdzen5/l2-cache.json
-f:tools/perf/pmu-events/arch/x86/amdzen5/l3-cache.json
-f:tools/perf/pmu-events/arch/x86/amdzen5/load-store.json
-f:tools/perf/pmu-events/arch/x86/amdzen5/memory-controller.json
-f:tools/perf/pmu-events/arch/x86/amdzen5/pipeline.json
-f:tools/perf/pmu-events/arch/x86/amdzen5/recommended.json
-f:tools/perf/pmu-events/arch/x86/arrowlake/arl-metrics.json
-f:tools/perf/pmu-events/arch/x86/arrowlake/cache.json
-f:tools/perf/pmu-events/arch/x86/arrowlake/floating-point.json
-f:tools/perf/pmu-events/arch/x86/arrowlake/frontend.json
-f:tools/perf/pmu-events/arch/x86/arrowlake/memory.json
-f:tools/perf/pmu-events/arch/x86/arrowlake/metricgroups.json
-f:tools/perf/pmu-events/arch/x86/arrowlake/other.json
-f:tools/perf/pmu-events/arch/x86/arrowlake/pipeline.json
-f:tools/perf/pmu-events/arch/x86/arrowlake/uncore-cache.json
-f:tools/perf/pmu-events/arch/x86/arrowlake/uncore-interconnect.json
-f:tools/perf/pmu-events/arch/x86/arrowlake/uncore-memory.json
-f:tools/perf/pmu-events/arch/x86/arrowlake/uncore-other.json
-f:tools/perf/pmu-events/arch/x86/arrowlake/virtual-memory.json
-f:tools/perf/pmu-events/arch/x86/bonnell/cache.json
-f:tools/perf/pmu-events/arch/x86/bonnell/counter.json
-f:tools/perf/pmu-events/arch/x86/bonnell/floating-point.json
-f:tools/perf/pmu-events/arch/x86/bonnell/frontend.json
-f:tools/perf/pmu-events/arch/x86/bonnell/memory.json
-f:tools/perf/pmu-events/arch/x86/bonnell/other.json
-f:tools/perf/pmu-events/arch/x86/bonnell/pipeline.json
-f:tools/perf/pmu-events/arch/x86/bonnell/virtual-memory.json
-f:tools/perf/pmu-events/arch/x86/broadwell/bdw-metrics.json
-f:tools/perf/pmu-events/arch/x86/broadwell/cache.json
-f:tools/perf/pmu-events/arch/x86/broadwell/counter.json
-f:tools/perf/pmu-events/arch/x86/broadwell/floating-point.json
-f:tools/perf/pmu-events/arch/x86/broadwell/frontend.json
-f:tools/perf/pmu-events/arch/x86/broadwell/memory.json
-f:tools/perf/pmu-events/arch/x86/broadwell/metricgroups.json
-f:tools/perf/pmu-events/arch/x86/broadwell/other.json
-f:tools/perf/pmu-events/arch/x86/broadwell/pipeline.json
-f:tools/perf/pmu-events/arch/x86/broadwell/uncore-cache.json
-f:tools/perf/pmu-events/arch/x86/broadwell/uncore-interconnect.json
-f:tools/perf/pmu-events/arch/x86/broadwell/virtual-memory.json
-f:tools/perf/pmu-events/arch/x86/broadwellde/bdwde-metrics.json
-f:tools/perf/pmu-events/arch/x86/broadwellde/cache.json
-f:tools/perf/pmu-events/arch/x86/broadwellde/counter.json
-f:tools/perf/pmu-events/arch/x86/broadwellde/floating-point.json
-f:tools/perf/pmu-events/arch/x86/broadwellde/frontend.json
-f:tools/perf/pmu-events/arch/x86/broadwellde/memory.json
-f:tools/perf/pmu-events/arch/x86/broadwellde/metricgroups.json
-f:tools/perf/pmu-events/arch/x86/broadwellde/other.json
-f:tools/perf/pmu-events/arch/x86/broadwellde/pipeline.json
-f:tools/perf/pmu-events/arch/x86/broadwellde/uncore-cache.json
-f:tools/perf/pmu-events/arch/x86/broadwellde/uncore-interconnect.json
-f:tools/perf/pmu-events/arch/x86/broadwellde/uncore-io.json
-f:tools/perf/pmu-events/arch/x86/broadwellde/uncore-memory.json
-f:tools/perf/pmu-events/arch/x86/broadwellde/uncore-power.json
-f:tools/perf/pmu-events/arch/x86/broadwellde/virtual-memory.json
-f:tools/perf/pmu-events/arch/x86/broadwellx/bdx-metrics.json
-f:tools/perf/pmu-events/arch/x86/broadwellx/cache.json
-f:tools/perf/pmu-events/arch/x86/broadwellx/counter.json
-f:tools/perf/pmu-events/arch/x86/broadwellx/floating-point.json
-f:tools/perf/pmu-events/arch/x86/broadwellx/frontend.json
-f:tools/perf/pmu-events/arch/x86/broadwellx/memory.json
-f:tools/perf/pmu-events/arch/x86/broadwellx/metricgroups.json
-f:tools/perf/pmu-events/arch/x86/broadwellx/other.json
-f:tools/perf/pmu-events/arch/x86/broadwellx/pipeline.json
-f:tools/perf/pmu-events/arch/x86/broadwellx/uncore-cache.json
-f:tools/perf/pmu-events/arch/x86/broadwellx/uncore-interconnect.json
-f:tools/perf/pmu-events/arch/x86/broadwellx/uncore-io.json
-f:tools/perf/pmu-events/arch/x86/broadwellx/uncore-memory.json
-f:tools/perf/pmu-events/arch/x86/broadwellx/uncore-power.json
-f:tools/perf/pmu-events/arch/x86/broadwellx/virtual-memory.json
-f:tools/perf/pmu-events/arch/x86/cascadelakex/cache.json
-f:tools/perf/pmu-events/arch/x86/cascadelakex/clx-metrics.json
-f:tools/perf/pmu-events/arch/x86/cascadelakex/counter.json
-f:tools/perf/pmu-events/arch/x86/cascadelakex/floating-point.json
-f:tools/perf/pmu-events/arch/x86/cascadelakex/frontend.json
-f:tools/perf/pmu-events/arch/x86/cascadelakex/memory.json
-f:tools/perf/pmu-events/arch/x86/cascadelakex/metricgroups.json
-f:tools/perf/pmu-events/arch/x86/cascadelakex/other.json
-f:tools/perf/pmu-events/arch/x86/cascadelakex/pipeline.json
-f:tools/perf/pmu-events/arch/x86/cascadelakex/uncore-cache.json
-f:tools/perf/pmu-events/arch/x86/cascadelakex/uncore-interconnect.json
-f:tools/perf/pmu-events/arch/x86/cascadelakex/uncore-io.json
-f:tools/perf/pmu-events/arch/x86/cascadelakex/uncore-memory.json
-f:tools/perf/pmu-events/arch/x86/cascadelakex/uncore-power.json
-f:tools/perf/pmu-events/arch/x86/cascadelakex/virtual-memory.json
-f:tools/perf/pmu-events/arch/x86/clearwaterforest/cache.json
-f:tools/perf/pmu-events/arch/x86/clearwaterforest/counter.json
-f:tools/perf/pmu-events/arch/x86/clearwaterforest/frontend.json
-f:tools/perf/pmu-events/arch/x86/clearwaterforest/memory.json
-f:tools/perf/pmu-events/arch/x86/clearwaterforest/pipeline.json
-f:tools/perf/pmu-events/arch/x86/clearwaterforest/virtual-memory.json
-f:tools/perf/pmu-events/arch/x86/elkhartlake/cache.json
-f:tools/perf/pmu-events/arch/x86/elkhartlake/counter.json
-f:tools/perf/pmu-events/arch/x86/elkhartlake/ehl-metrics.json
-f:tools/perf/pmu-events/arch/x86/elkhartlake/floating-point.json
-f:tools/perf/pmu-events/arch/x86/elkhartlake/frontend.json
-f:tools/perf/pmu-events/arch/x86/elkhartlake/memory.json
-f:tools/perf/pmu-events/arch/x86/elkhartlake/other.json
-f:tools/perf/pmu-events/arch/x86/elkhartlake/pipeline.json
-f:tools/perf/pmu-events/arch/x86/elkhartlake/virtual-memory.json
-f:tools/perf/pmu-events/arch/x86/emeraldrapids/cache.json
-f:tools/perf/pmu-events/arch/x86/emeraldrapids/counter.json
-f:tools/perf/pmu-events/arch/x86/emeraldrapids/emr-metrics.json
-f:tools/perf/pmu-events/arch/x86/emeraldrapids/floating-point.json
-f:tools/perf/pmu-events/arch/x86/emeraldrapids/frontend.json
-f:tools/perf/pmu-events/arch/x86/emeraldrapids/memory.json
-f:tools/perf/pmu-events/arch/x86/emeraldrapids/metricgroups.json
-f:tools/perf/pmu-events/arch/x86/emeraldrapids/other.json
-f:tools/perf/pmu-events/arch/x86/emeraldrapids/pipeline.json
-f:tools/perf/pmu-events/arch/x86/emeraldrapids/uncore-cache.json
-f:tools/perf/pmu-events/arch/x86/emeraldrapids/uncore-cxl.json
-f:tools/perf/pmu-events/arch/x86/emeraldrapids/uncore-interconnect.json
-f:tools/perf/pmu-events/arch/x86/emeraldrapids/uncore-io.json
-f:tools/perf/pmu-events/arch/x86/emeraldrapids/uncore-memory.json
-f:tools/perf/pmu-events/arch/x86/emeraldrapids/uncore-power.json
-f:tools/perf/pmu-events/arch/x86/emeraldrapids/virtual-memory.json
-f:tools/perf/pmu-events/arch/x86/goldmont/cache.json
-f:tools/perf/pmu-events/arch/x86/goldmont/counter.json
-f:tools/perf/pmu-events/arch/x86/goldmont/floating-point.json
-f:tools/perf/pmu-events/arch/x86/goldmont/frontend.json
-f:tools/perf/pmu-events/arch/x86/goldmont/memory.json
-f:tools/perf/pmu-events/arch/x86/goldmont/other.json
-f:tools/perf/pmu-events/arch/x86/goldmont/pipeline.json
-f:tools/perf/pmu-events/arch/x86/goldmont/virtual-memory.json
-f:tools/perf/pmu-events/arch/x86/goldmontplus/cache.json
-f:tools/perf/pmu-events/arch/x86/goldmontplus/counter.json
-f:tools/perf/pmu-events/arch/x86/goldmontplus/floating-point.json
-f:tools/perf/pmu-events/arch/x86/goldmontplus/frontend.json
-f:tools/perf/pmu-events/arch/x86/goldmontplus/memory.json
-f:tools/perf/pmu-events/arch/x86/goldmontplus/other.json
-f:tools/perf/pmu-events/arch/x86/goldmontplus/pipeline.json
-f:tools/perf/pmu-events/arch/x86/goldmontplus/virtual-memory.json
-f:tools/perf/pmu-events/arch/x86/grandridge/cache.json
-f:tools/perf/pmu-events/arch/x86/grandridge/counter.json
-f:tools/perf/pmu-events/arch/x86/grandridge/floating-point.json
-f:tools/perf/pmu-events/arch/x86/grandridge/frontend.json
-f:tools/perf/pmu-events/arch/x86/grandridge/grr-metrics.json
-f:tools/perf/pmu-events/arch/x86/grandridge/memory.json
-f:tools/perf/pmu-events/arch/x86/grandridge/metricgroups.json
-f:tools/perf/pmu-events/arch/x86/grandridge/other.json
-f:tools/perf/pmu-events/arch/x86/grandridge/pipeline.json
-f:tools/perf/pmu-events/arch/x86/grandridge/uncore-cache.json
-f:tools/perf/pmu-events/arch/x86/grandridge/uncore-interconnect.json
-f:tools/perf/pmu-events/arch/x86/grandridge/uncore-io.json
-f:tools/perf/pmu-events/arch/x86/grandridge/uncore-memory.json
-f:tools/perf/pmu-events/arch/x86/grandridge/uncore-power.json
-f:tools/perf/pmu-events/arch/x86/grandridge/virtual-memory.json
-f:tools/perf/pmu-events/arch/x86/graniterapids/cache.json
-f:tools/perf/pmu-events/arch/x86/graniterapids/counter.json
-f:tools/perf/pmu-events/arch/x86/graniterapids/floating-point.json
-f:tools/perf/pmu-events/arch/x86/graniterapids/frontend.json
-f:tools/perf/pmu-events/arch/x86/graniterapids/gnr-metrics.json
-f:tools/perf/pmu-events/arch/x86/graniterapids/memory.json
-f:tools/perf/pmu-events/arch/x86/graniterapids/metricgroups.json
-f:tools/perf/pmu-events/arch/x86/graniterapids/other.json
-f:tools/perf/pmu-events/arch/x86/graniterapids/pipeline.json
-f:tools/perf/pmu-events/arch/x86/graniterapids/uncore-cache.json
-f:tools/perf/pmu-events/arch/x86/graniterapids/uncore-cxl.json
-f:tools/perf/pmu-events/arch/x86/graniterapids/uncore-interconnect.json
-f:tools/perf/pmu-events/arch/x86/graniterapids/uncore-io.json
-f:tools/perf/pmu-events/arch/x86/graniterapids/uncore-memory.json
-f:tools/perf/pmu-events/arch/x86/graniterapids/uncore-power.json
-f:tools/perf/pmu-events/arch/x86/graniterapids/virtual-memory.json
-f:tools/perf/pmu-events/arch/x86/haswell/cache.json
-f:tools/perf/pmu-events/arch/x86/haswell/counter.json
-f:tools/perf/pmu-events/arch/x86/haswell/floating-point.json
-f:tools/perf/pmu-events/arch/x86/haswell/frontend.json
-f:tools/perf/pmu-events/arch/x86/haswell/hsw-metrics.json
-f:tools/perf/pmu-events/arch/x86/haswell/memory.json
-f:tools/perf/pmu-events/arch/x86/haswell/metricgroups.json
-f:tools/perf/pmu-events/arch/x86/haswell/other.json
-f:tools/perf/pmu-events/arch/x86/haswell/pipeline.json
-f:tools/perf/pmu-events/arch/x86/haswell/uncore-cache.json
-f:tools/perf/pmu-events/arch/x86/haswell/uncore-interconnect.json
-f:tools/perf/pmu-events/arch/x86/haswell/virtual-memory.json
-f:tools/perf/pmu-events/arch/x86/haswellx/cache.json
-f:tools/perf/pmu-events/arch/x86/haswellx/counter.json
-f:tools/perf/pmu-events/arch/x86/haswellx/floating-point.json
-f:tools/perf/pmu-events/arch/x86/haswellx/frontend.json
-f:tools/perf/pmu-events/arch/x86/haswellx/hsx-metrics.json
-f:tools/perf/pmu-events/arch/x86/haswellx/memory.json
-f:tools/perf/pmu-events/arch/x86/haswellx/metricgroups.json
-f:tools/perf/pmu-events/arch/x86/haswellx/other.json
-f:tools/perf/pmu-events/arch/x86/haswellx/pipeline.json
-f:tools/perf/pmu-events/arch/x86/haswellx/uncore-cache.json
-f:tools/perf/pmu-events/arch/x86/haswellx/uncore-interconnect.json
-f:tools/perf/pmu-events/arch/x86/haswellx/uncore-io.json
-f:tools/perf/pmu-events/arch/x86/haswellx/uncore-memory.json
-f:tools/perf/pmu-events/arch/x86/haswellx/uncore-power.json
-f:tools/perf/pmu-events/arch/x86/haswellx/virtual-memory.json
-f:tools/perf/pmu-events/arch/x86/icelake/cache.json
-f:tools/perf/pmu-events/arch/x86/icelake/counter.json
-f:tools/perf/pmu-events/arch/x86/icelake/floating-point.json
-f:tools/perf/pmu-events/arch/x86/icelake/frontend.json
-f:tools/perf/pmu-events/arch/x86/icelake/icl-metrics.json
-f:tools/perf/pmu-events/arch/x86/icelake/memory.json
-f:tools/perf/pmu-events/arch/x86/icelake/metricgroups.json
-f:tools/perf/pmu-events/arch/x86/icelake/other.json
-f:tools/perf/pmu-events/arch/x86/icelake/pipeline.json
-f:tools/perf/pmu-events/arch/x86/icelake/uncore-interconnect.json
-f:tools/perf/pmu-events/arch/x86/icelake/uncore-other.json
-f:tools/perf/pmu-events/arch/x86/icelake/virtual-memory.json
-f:tools/perf/pmu-events/arch/x86/icelakex/cache.json
-f:tools/perf/pmu-events/arch/x86/icelakex/counter.json
-f:tools/perf/pmu-events/arch/x86/icelakex/floating-point.json
-f:tools/perf/pmu-events/arch/x86/icelakex/frontend.json
-f:tools/perf/pmu-events/arch/x86/icelakex/icx-metrics.json
-f:tools/perf/pmu-events/arch/x86/icelakex/memory.json
-f:tools/perf/pmu-events/arch/x86/icelakex/metricgroups.json
-f:tools/perf/pmu-events/arch/x86/icelakex/other.json
-f:tools/perf/pmu-events/arch/x86/icelakex/pipeline.json
-f:tools/perf/pmu-events/arch/x86/icelakex/uncore-cache.json
-f:tools/perf/pmu-events/arch/x86/icelakex/uncore-interconnect.json
-f:tools/perf/pmu-events/arch/x86/icelakex/uncore-io.json
-f:tools/perf/pmu-events/arch/x86/icelakex/uncore-memory.json
-f:tools/perf/pmu-events/arch/x86/icelakex/uncore-power.json
-f:tools/perf/pmu-events/arch/x86/icelakex/virtual-memory.json
-f:tools/perf/pmu-events/arch/x86/ivybridge/cache.json
-f:tools/perf/pmu-events/arch/x86/ivybridge/counter.json
-f:tools/perf/pmu-events/arch/x86/ivybridge/floating-point.json
-f:tools/perf/pmu-events/arch/x86/ivybridge/frontend.json
-f:tools/perf/pmu-events/arch/x86/ivybridge/ivb-metrics.json
-f:tools/perf/pmu-events/arch/x86/ivybridge/memory.json
-f:tools/perf/pmu-events/arch/x86/ivybridge/metricgroups.json
-f:tools/perf/pmu-events/arch/x86/ivybridge/other.json
-f:tools/perf/pmu-events/arch/x86/ivybridge/pipeline.json
-f:tools/perf/pmu-events/arch/x86/ivybridge/uncore-cache.json
-f:tools/perf/pmu-events/arch/x86/ivybridge/uncore-interconnect.json
-f:tools/perf/pmu-events/arch/x86/ivybridge/virtual-memory.json
-f:tools/perf/pmu-events/arch/x86/ivytown/cache.json
-f:tools/perf/pmu-events/arch/x86/ivytown/counter.json
-f:tools/perf/pmu-events/arch/x86/ivytown/floating-point.json
-f:tools/perf/pmu-events/arch/x86/ivytown/frontend.json
-f:tools/perf/pmu-events/arch/x86/ivytown/ivt-metrics.json
-f:tools/perf/pmu-events/arch/x86/ivytown/memory.json
-f:tools/perf/pmu-events/arch/x86/ivytown/metricgroups.json
-f:tools/perf/pmu-events/arch/x86/ivytown/other.json
-f:tools/perf/pmu-events/arch/x86/ivytown/pipeline.json
-f:tools/perf/pmu-events/arch/x86/ivytown/uncore-cache.json
-f:tools/perf/pmu-events/arch/x86/ivytown/uncore-interconnect.json
-f:tools/perf/pmu-events/arch/x86/ivytown/uncore-io.json
-f:tools/perf/pmu-events/arch/x86/ivytown/uncore-memory.json
-f:tools/perf/pmu-events/arch/x86/ivytown/uncore-power.json
-f:tools/perf/pmu-events/arch/x86/ivytown/virtual-memory.json
-f:tools/perf/pmu-events/arch/x86/jaketown/cache.json
-f:tools/perf/pmu-events/arch/x86/jaketown/counter.json
-f:tools/perf/pmu-events/arch/x86/jaketown/floating-point.json
-f:tools/perf/pmu-events/arch/x86/jaketown/frontend.json
-f:tools/perf/pmu-events/arch/x86/jaketown/jkt-metrics.json
-f:tools/perf/pmu-events/arch/x86/jaketown/memory.json
-f:tools/perf/pmu-events/arch/x86/jaketown/metricgroups.json
-f:tools/perf/pmu-events/arch/x86/jaketown/other.json
-f:tools/perf/pmu-events/arch/x86/jaketown/pipeline.json
-f:tools/perf/pmu-events/arch/x86/jaketown/uncore-cache.json
-f:tools/perf/pmu-events/arch/x86/jaketown/uncore-interconnect.json
-f:tools/perf/pmu-events/arch/x86/jaketown/uncore-io.json
-f:tools/perf/pmu-events/arch/x86/jaketown/uncore-memory.json
-f:tools/perf/pmu-events/arch/x86/jaketown/uncore-power.json
-f:tools/perf/pmu-events/arch/x86/jaketown/virtual-memory.json
-f:tools/perf/pmu-events/arch/x86/knightslanding/cache.json
-f:tools/perf/pmu-events/arch/x86/knightslanding/counter.json
-f:tools/perf/pmu-events/arch/x86/knightslanding/floating-point.json
-f:tools/perf/pmu-events/arch/x86/knightslanding/frontend.json
-f:tools/perf/pmu-events/arch/x86/knightslanding/memory.json
-f:tools/perf/pmu-events/arch/x86/knightslanding/pipeline.json
-f:tools/perf/pmu-events/arch/x86/knightslanding/uncore-cache.json
-f:tools/perf/pmu-events/arch/x86/knightslanding/uncore-io.json
-f:tools/perf/pmu-events/arch/x86/knightslanding/uncore-memory.json
-f:tools/perf/pmu-events/arch/x86/knightslanding/virtual-memory.json
-f:tools/perf/pmu-events/arch/x86/lunarlake/cache.json
-f:tools/perf/pmu-events/arch/x86/lunarlake/floating-point.json
-f:tools/perf/pmu-events/arch/x86/lunarlake/frontend.json
-f:tools/perf/pmu-events/arch/x86/lunarlake/lnl-metrics.json
-f:tools/perf/pmu-events/arch/x86/lunarlake/memory.json
-f:tools/perf/pmu-events/arch/x86/lunarlake/metricgroups.json
-f:tools/perf/pmu-events/arch/x86/lunarlake/other.json
-f:tools/perf/pmu-events/arch/x86/lunarlake/pipeline.json
-f:tools/perf/pmu-events/arch/x86/lunarlake/uncore-memory.json
-f:tools/perf/pmu-events/arch/x86/lunarlake/virtual-memory.json
-f:tools/perf/pmu-events/arch/x86/mapfile.csv
-f:tools/perf/pmu-events/arch/x86/meteorlake/cache.json
-f:tools/perf/pmu-events/arch/x86/meteorlake/floating-point.json
-f:tools/perf/pmu-events/arch/x86/meteorlake/frontend.json
-f:tools/perf/pmu-events/arch/x86/meteorlake/memory.json
-f:tools/perf/pmu-events/arch/x86/meteorlake/metricgroups.json
-f:tools/perf/pmu-events/arch/x86/meteorlake/mtl-metrics.json
-f:tools/perf/pmu-events/arch/x86/meteorlake/other.json
-f:tools/perf/pmu-events/arch/x86/meteorlake/pipeline.json
-f:tools/perf/pmu-events/arch/x86/meteorlake/uncore-cache.json
-f:tools/perf/pmu-events/arch/x86/meteorlake/uncore-interconnect.json
-f:tools/perf/pmu-events/arch/x86/meteorlake/uncore-memory.json
-f:tools/perf/pmu-events/arch/x86/meteorlake/uncore-other.json
-f:tools/perf/pmu-events/arch/x86/meteorlake/virtual-memory.json
-f:tools/perf/pmu-events/arch/x86/nehalemep/cache.json
-f:tools/perf/pmu-events/arch/x86/nehalemep/counter.json
-f:tools/perf/pmu-events/arch/x86/nehalemep/floating-point.json
-f:tools/perf/pmu-events/arch/x86/nehalemep/frontend.json
-f:tools/perf/pmu-events/arch/x86/nehalemep/memory.json
-f:tools/perf/pmu-events/arch/x86/nehalemep/other.json
-f:tools/perf/pmu-events/arch/x86/nehalemep/pipeline.json
-f:tools/perf/pmu-events/arch/x86/nehalemep/virtual-memory.json
-f:tools/perf/pmu-events/arch/x86/nehalemex/cache.json
-f:tools/perf/pmu-events/arch/x86/nehalemex/counter.json
-f:tools/perf/pmu-events/arch/x86/nehalemex/floating-point.json
-f:tools/perf/pmu-events/arch/x86/nehalemex/frontend.json
-f:tools/perf/pmu-events/arch/x86/nehalemex/memory.json
-f:tools/perf/pmu-events/arch/x86/nehalemex/other.json
-f:tools/perf/pmu-events/arch/x86/nehalemex/pipeline.json
-f:tools/perf/pmu-events/arch/x86/nehalemex/virtual-memory.json
-f:tools/perf/pmu-events/arch/x86/rocketlake/cache.json
-f:tools/perf/pmu-events/arch/x86/rocketlake/counter.json
-f:tools/perf/pmu-events/arch/x86/rocketlake/floating-point.json
-f:tools/perf/pmu-events/arch/x86/rocketlake/frontend.json
-f:tools/perf/pmu-events/arch/x86/rocketlake/memory.json
-f:tools/perf/pmu-events/arch/x86/rocketlake/metricgroups.json
-f:tools/perf/pmu-events/arch/x86/rocketlake/other.json
-f:tools/perf/pmu-events/arch/x86/rocketlake/pipeline.json
-f:tools/perf/pmu-events/arch/x86/rocketlake/rkl-metrics.json
-f:tools/perf/pmu-events/arch/x86/rocketlake/uncore-interconnect.json
-f:tools/perf/pmu-events/arch/x86/rocketlake/uncore-other.json
-f:tools/perf/pmu-events/arch/x86/rocketlake/virtual-memory.json
-f:tools/perf/pmu-events/arch/x86/sandybridge/cache.json
-f:tools/perf/pmu-events/arch/x86/sandybridge/counter.json
-f:tools/perf/pmu-events/arch/x86/sandybridge/floating-point.json
-f:tools/perf/pmu-events/arch/x86/sandybridge/frontend.json
-f:tools/perf/pmu-events/arch/x86/sandybridge/memory.json
-f:tools/perf/pmu-events/arch/x86/sandybridge/metricgroups.json
-f:tools/perf/pmu-events/arch/x86/sandybridge/other.json
-f:tools/perf/pmu-events/arch/x86/sandybridge/pipeline.json
-f:tools/perf/pmu-events/arch/x86/sandybridge/snb-metrics.json
-f:tools/perf/pmu-events/arch/x86/sandybridge/uncore-cache.json
-f:tools/perf/pmu-events/arch/x86/sandybridge/uncore-interconnect.json
-f:tools/perf/pmu-events/arch/x86/sandybridge/virtual-memory.json
-f:tools/perf/pmu-events/arch/x86/sapphirerapids/cache.json
-f:tools/perf/pmu-events/arch/x86/sapphirerapids/counter.json
-f:tools/perf/pmu-events/arch/x86/sapphirerapids/floating-point.json
-f:tools/perf/pmu-events/arch/x86/sapphirerapids/frontend.json
-f:tools/perf/pmu-events/arch/x86/sapphirerapids/memory.json
-f:tools/perf/pmu-events/arch/x86/sapphirerapids/metricgroups.json
-f:tools/perf/pmu-events/arch/x86/sapphirerapids/other.json
-f:tools/perf/pmu-events/arch/x86/sapphirerapids/pipeline.json
-f:tools/perf/pmu-events/arch/x86/sapphirerapids/spr-metrics.json
-f:tools/perf/pmu-events/arch/x86/sapphirerapids/uncore-cache.json
-f:tools/perf/pmu-events/arch/x86/sapphirerapids/uncore-cxl.json
-f:tools/perf/pmu-events/arch/x86/sapphirerapids/uncore-interconnect.json
-f:tools/perf/pmu-events/arch/x86/sapphirerapids/uncore-io.json
-f:tools/perf/pmu-events/arch/x86/sapphirerapids/uncore-memory.json
-f:tools/perf/pmu-events/arch/x86/sapphirerapids/uncore-power.json
-f:tools/perf/pmu-events/arch/x86/sapphirerapids/virtual-memory.json
-f:tools/perf/pmu-events/arch/x86/sierraforest/cache.json
-f:tools/perf/pmu-events/arch/x86/sierraforest/counter.json
-f:tools/perf/pmu-events/arch/x86/sierraforest/floating-point.json
-f:tools/perf/pmu-events/arch/x86/sierraforest/frontend.json
-f:tools/perf/pmu-events/arch/x86/sierraforest/memory.json
-f:tools/perf/pmu-events/arch/x86/sierraforest/metricgroups.json
-f:tools/perf/pmu-events/arch/x86/sierraforest/other.json
-f:tools/perf/pmu-events/arch/x86/sierraforest/pipeline.json
-f:tools/perf/pmu-events/arch/x86/sierraforest/srf-metrics.json
-f:tools/perf/pmu-events/arch/x86/sierraforest/uncore-cache.json
-f:tools/perf/pmu-events/arch/x86/sierraforest/uncore-cxl.json
-f:tools/perf/pmu-events/arch/x86/sierraforest/uncore-interconnect.json
-f:tools/perf/pmu-events/arch/x86/sierraforest/uncore-io.json
-f:tools/perf/pmu-events/arch/x86/sierraforest/uncore-memory.json
-f:tools/perf/pmu-events/arch/x86/sierraforest/uncore-power.json
-f:tools/perf/pmu-events/arch/x86/sierraforest/virtual-memory.json
-f:tools/perf/pmu-events/arch/x86/silvermont/cache.json
-f:tools/perf/pmu-events/arch/x86/silvermont/counter.json
-f:tools/perf/pmu-events/arch/x86/silvermont/floating-point.json
-f:tools/perf/pmu-events/arch/x86/silvermont/frontend.json
-f:tools/perf/pmu-events/arch/x86/silvermont/memory.json
-f:tools/perf/pmu-events/arch/x86/silvermont/other.json
-f:tools/perf/pmu-events/arch/x86/silvermont/pipeline.json
-f:tools/perf/pmu-events/arch/x86/silvermont/virtual-memory.json
-f:tools/perf/pmu-events/arch/x86/skylake/cache.json
-f:tools/perf/pmu-events/arch/x86/skylake/counter.json
-f:tools/perf/pmu-events/arch/x86/skylake/floating-point.json
-f:tools/perf/pmu-events/arch/x86/skylake/frontend.json
-f:tools/perf/pmu-events/arch/x86/skylake/memory.json
-f:tools/perf/pmu-events/arch/x86/skylake/metricgroups.json
-f:tools/perf/pmu-events/arch/x86/skylake/other.json
-f:tools/perf/pmu-events/arch/x86/skylake/pipeline.json
-f:tools/perf/pmu-events/arch/x86/skylake/skl-metrics.json
-f:tools/perf/pmu-events/arch/x86/skylake/uncore-cache.json
-f:tools/perf/pmu-events/arch/x86/skylake/uncore-interconnect.json
-f:tools/perf/pmu-events/arch/x86/skylake/virtual-memory.json
-f:tools/perf/pmu-events/arch/x86/skylakex/cache.json
-f:tools/perf/pmu-events/arch/x86/skylakex/counter.json
-f:tools/perf/pmu-events/arch/x86/skylakex/floating-point.json
-f:tools/perf/pmu-events/arch/x86/skylakex/frontend.json
-f:tools/perf/pmu-events/arch/x86/skylakex/memory.json
-f:tools/perf/pmu-events/arch/x86/skylakex/metricgroups.json
-f:tools/perf/pmu-events/arch/x86/skylakex/other.json
-f:tools/perf/pmu-events/arch/x86/skylakex/pipeline.json
-f:tools/perf/pmu-events/arch/x86/skylakex/skx-metrics.json
-f:tools/perf/pmu-events/arch/x86/skylakex/uncore-cache.json
-f:tools/perf/pmu-events/arch/x86/skylakex/uncore-interconnect.json
-f:tools/perf/pmu-events/arch/x86/skylakex/uncore-io.json
-f:tools/perf/pmu-events/arch/x86/skylakex/uncore-memory.json
-f:tools/perf/pmu-events/arch/x86/skylakex/uncore-power.json
-f:tools/perf/pmu-events/arch/x86/skylakex/virtual-memory.json
-f:tools/perf/pmu-events/arch/x86/snowridgex/cache.json
-f:tools/perf/pmu-events/arch/x86/snowridgex/counter.json
-f:tools/perf/pmu-events/arch/x86/snowridgex/floating-point.json
-f:tools/perf/pmu-events/arch/x86/snowridgex/frontend.json
-f:tools/perf/pmu-events/arch/x86/snowridgex/memory.json
-f:tools/perf/pmu-events/arch/x86/snowridgex/other.json
-f:tools/perf/pmu-events/arch/x86/snowridgex/pipeline.json
-f:tools/perf/pmu-events/arch/x86/snowridgex/uncore-cache.json
-f:tools/perf/pmu-events/arch/x86/snowridgex/uncore-interconnect.json
-f:tools/perf/pmu-events/arch/x86/snowridgex/uncore-io.json
-f:tools/perf/pmu-events/arch/x86/snowridgex/uncore-memory.json
-f:tools/perf/pmu-events/arch/x86/snowridgex/uncore-power.json
-f:tools/perf/pmu-events/arch/x86/snowridgex/virtual-memory.json
-f:tools/perf/pmu-events/arch/x86/tigerlake/cache.json
-f:tools/perf/pmu-events/arch/x86/tigerlake/counter.json
-f:tools/perf/pmu-events/arch/x86/tigerlake/floating-point.json
-f:tools/perf/pmu-events/arch/x86/tigerlake/frontend.json
-f:tools/perf/pmu-events/arch/x86/tigerlake/memory.json
-f:tools/perf/pmu-events/arch/x86/tigerlake/metricgroups.json
-f:tools/perf/pmu-events/arch/x86/tigerlake/other.json
-f:tools/perf/pmu-events/arch/x86/tigerlake/pipeline.json
-f:tools/perf/pmu-events/arch/x86/tigerlake/tgl-metrics.json
-f:tools/perf/pmu-events/arch/x86/tigerlake/uncore-interconnect.json
-f:tools/perf/pmu-events/arch/x86/tigerlake/uncore-memory.json
-f:tools/perf/pmu-events/arch/x86/tigerlake/uncore-other.json
-f:tools/perf/pmu-events/arch/x86/tigerlake/virtual-memory.json
-f:tools/perf/pmu-events/arch/x86/westmereep-dp/cache.json
-f:tools/perf/pmu-events/arch/x86/westmereep-dp/counter.json
-f:tools/perf/pmu-events/arch/x86/westmereep-dp/floating-point.json
-f:tools/perf/pmu-events/arch/x86/westmereep-dp/frontend.json
-f:tools/perf/pmu-events/arch/x86/westmereep-dp/memory.json
-f:tools/perf/pmu-events/arch/x86/westmereep-dp/other.json
-f:tools/perf/pmu-events/arch/x86/westmereep-dp/pipeline.json
-f:tools/perf/pmu-events/arch/x86/westmereep-dp/virtual-memory.json
-f:tools/perf/pmu-events/arch/x86/westmereep-sp/cache.json
-f:tools/perf/pmu-events/arch/x86/westmereep-sp/counter.json
-f:tools/perf/pmu-events/arch/x86/westmereep-sp/floating-point.json
-f:tools/perf/pmu-events/arch/x86/westmereep-sp/frontend.json
-f:tools/perf/pmu-events/arch/x86/westmereep-sp/memory.json
-f:tools/perf/pmu-events/arch/x86/westmereep-sp/other.json
-f:tools/perf/pmu-events/arch/x86/westmereep-sp/pipeline.json
-f:tools/perf/pmu-events/arch/x86/westmereep-sp/virtual-memory.json
-f:tools/perf/pmu-events/arch/x86/westmereex/cache.json
-f:tools/perf/pmu-events/arch/x86/westmereex/counter.json
-f:tools/perf/pmu-events/arch/x86/westmereex/floating-point.json
-f:tools/perf/pmu-events/arch/x86/westmereex/frontend.json
-f:tools/perf/pmu-events/arch/x86/westmereex/memory.json
-f:tools/perf/pmu-events/arch/x86/westmereex/other.json
-f:tools/perf/pmu-events/arch/x86/westmereex/pipeline.json
-f:tools/perf/pmu-events/arch/x86/westmereex/virtual-memory.json
-f:tools/perf/pmu-events/empty-pmu-events.c
-f:tools/perf/pmu-events/jevents.py
-f:tools/perf/pmu-events/metric.py
-f:tools/perf/pmu-events/metric_test.py
-f:tools/perf/pmu-events/models.py
-f:tools/perf/pmu-events/pmu-events.h
-f:tools/perf/python/counting.py
-f:tools/perf/python/tracepoint.py
-f:tools/perf/python/twatch.py
-f:tools/perf/scripts/Build
-f:tools/perf/scripts/perl/Perf-Trace-Util/Build
-f:tools/perf/scripts/perl/Perf-Trace-Util/Context.c
-f:tools/perf/scripts/perl/Perf-Trace-Util/Context.xs
-f:tools/perf/scripts/perl/Perf-Trace-Util/Makefile.PL
-f:tools/perf/scripts/perl/Perf-Trace-Util/README
-f:tools/perf/scripts/perl/Perf-Trace-Util/lib/Perf/Trace/Context.pm
-f:tools/perf/scripts/perl/Perf-Trace-Util/lib/Perf/Trace/Core.pm
-f:tools/perf/scripts/perl/Perf-Trace-Util/lib/Perf/Trace/Util.pm
-f:tools/perf/scripts/perl/Perf-Trace-Util/typemap
-f:tools/perf/scripts/perl/bin/check-perf-trace-record
-f:tools/perf/scripts/perl/bin/failed-syscalls-record
-f:tools/perf/scripts/perl/bin/failed-syscalls-report
-f:tools/perf/scripts/perl/bin/rw-by-file-record
-f:tools/perf/scripts/perl/bin/rw-by-file-report
-f:tools/perf/scripts/perl/bin/rw-by-pid-record
-f:tools/perf/scripts/perl/bin/rw-by-pid-report
-f:tools/perf/scripts/perl/bin/rwtop-record
-f:tools/perf/scripts/perl/bin/rwtop-report
-f:tools/perf/scripts/perl/bin/wakeup-latency-record
-f:tools/perf/scripts/perl/bin/wakeup-latency-report
-f:tools/perf/scripts/perl/check-perf-trace.pl
-f:tools/perf/scripts/perl/failed-syscalls.pl
-f:tools/perf/scripts/perl/rw-by-file.pl
-f:tools/perf/scripts/perl/rw-by-pid.pl
-f:tools/perf/scripts/perl/rwtop.pl
-f:tools/perf/scripts/perl/wakeup-latency.pl
-f:tools/perf/scripts/python/Perf-Trace-Util/Build
-f:tools/perf/scripts/python/Perf-Trace-Util/Context.c
-f:tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Core.py
-f:tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/EventClass.py
-f:tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/SchedGui.py
-f:tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Util.py
-f:tools/perf/scripts/python/arm-cs-trace-disasm.py
-f:tools/perf/scripts/python/bin/compaction-times-record
-f:tools/perf/scripts/python/bin/compaction-times-report
-f:tools/perf/scripts/python/bin/event_analyzing_sample-record
-f:tools/perf/scripts/python/bin/event_analyzing_sample-report
-f:tools/perf/scripts/python/bin/export-to-postgresql-record
-f:tools/perf/scripts/python/bin/export-to-postgresql-report
-f:tools/perf/scripts/python/bin/export-to-sqlite-record
-f:tools/perf/scripts/python/bin/export-to-sqlite-report
-f:tools/perf/scripts/python/bin/failed-syscalls-by-pid-record
-f:tools/perf/scripts/python/bin/failed-syscalls-by-pid-report
-f:tools/perf/scripts/python/bin/flamegraph-record
-f:tools/perf/scripts/python/bin/flamegraph-report
-f:tools/perf/scripts/python/bin/futex-contention-record
-f:tools/perf/scripts/python/bin/futex-contention-report
-f:tools/perf/scripts/python/bin/gecko-record
-f:tools/perf/scripts/python/bin/gecko-report
-f:tools/perf/scripts/python/bin/intel-pt-events-record
-f:tools/perf/scripts/python/bin/intel-pt-events-report
-f:tools/perf/scripts/python/bin/mem-phys-addr-record
-f:tools/perf/scripts/python/bin/mem-phys-addr-report
-f:tools/perf/scripts/python/bin/net_dropmonitor-record
-f:tools/perf/scripts/python/bin/net_dropmonitor-report
-f:tools/perf/scripts/python/bin/netdev-times-record
-f:tools/perf/scripts/python/bin/netdev-times-report
-f:tools/perf/scripts/python/bin/powerpc-hcalls-record
-f:tools/perf/scripts/python/bin/powerpc-hcalls-report
-f:tools/perf/scripts/python/bin/sched-migration-record
-f:tools/perf/scripts/python/bin/sched-migration-report
-f:tools/perf/scripts/python/bin/sctop-record
-f:tools/perf/scripts/python/bin/sctop-report
-f:tools/perf/scripts/python/bin/stackcollapse-record
-f:tools/perf/scripts/python/bin/stackcollapse-report
-f:tools/perf/scripts/python/bin/syscall-counts-by-pid-record
-f:tools/perf/scripts/python/bin/syscall-counts-by-pid-report
-f:tools/perf/scripts/python/bin/syscall-counts-record
-f:tools/perf/scripts/python/bin/syscall-counts-report
-f:tools/perf/scripts/python/bin/task-analyzer-record
-f:tools/perf/scripts/python/bin/task-analyzer-report
-f:tools/perf/scripts/python/check-perf-trace.py
-f:tools/perf/scripts/python/compaction-times.py
-f:tools/perf/scripts/python/event_analyzing_sample.py
-f:tools/perf/scripts/python/export-to-postgresql.py
-f:tools/perf/scripts/python/export-to-sqlite.py
-f:tools/perf/scripts/python/exported-sql-viewer.py
-f:tools/perf/scripts/python/failed-syscalls-by-pid.py
-f:tools/perf/scripts/python/flamegraph.py
-f:tools/perf/scripts/python/futex-contention.py
-f:tools/perf/scripts/python/gecko.py
-f:tools/perf/scripts/python/intel-pt-events.py
-f:tools/perf/scripts/python/libxed.py
-f:tools/perf/scripts/python/mem-phys-addr.py
-f:tools/perf/scripts/python/net_dropmonitor.py
-f:tools/perf/scripts/python/netdev-times.py
-f:tools/perf/scripts/python/parallel-perf.py
-f:tools/perf/scripts/python/powerpc-hcalls.py
-f:tools/perf/scripts/python/sched-migration.py
-f:tools/perf/scripts/python/sctop.py
-f:tools/perf/scripts/python/stackcollapse.py
-f:tools/perf/scripts/python/stat-cpi.py
-f:tools/perf/scripts/python/syscall-counts-by-pid.py
-f:tools/perf/scripts/python/syscall-counts.py
-f:tools/perf/scripts/python/task-analyzer.py
-f:tools/perf/tests/Build
-f:tools/perf/tests/api-io.c
-f:tools/perf/tests/backward-ring-buffer.c
-f:tools/perf/tests/bitmap.c
-f:tools/perf/tests/bp_account.c
-f:tools/perf/tests/bp_signal.c
-f:tools/perf/tests/bp_signal_overflow.c
-f:tools/perf/tests/builtin-test.c
-f:tools/perf/tests/code-reading.c
-f:tools/perf/tests/config-fragments/README
-f:tools/perf/tests/config-fragments/arm64
-f:tools/perf/tests/config-fragments/config
-f:tools/perf/tests/cpumap.c
-f:tools/perf/tests/demangle-java-test.c
-f:tools/perf/tests/demangle-ocaml-test.c
-f:tools/perf/tests/demangle-rust-v0-test.c
-f:tools/perf/tests/dlfilter-test.c
-f:tools/perf/tests/dso-data.c
-f:tools/perf/tests/dwarf-unwind.c
-f:tools/perf/tests/event-times.c
-f:tools/perf/tests/event_groups.c
-f:tools/perf/tests/event_update.c
-f:tools/perf/tests/evsel-roundtrip-name.c
-f:tools/perf/tests/evsel-tp-sched.c
-f:tools/perf/tests/expand-cgroup.c
-f:tools/perf/tests/expr.c
-f:tools/perf/tests/fdarray.c
-f:tools/perf/tests/genelf.c
-f:tools/perf/tests/hists_common.c
-f:tools/perf/tests/hists_common.h
-f:tools/perf/tests/hists_cumulate.c
-f:tools/perf/tests/hists_filter.c
-f:tools/perf/tests/hists_link.c
-f:tools/perf/tests/hists_output.c
-f:tools/perf/tests/hwmon_pmu.c
-f:tools/perf/tests/is_printable_array.c
-f:tools/perf/tests/keep-tracking.c
-f:tools/perf/tests/kmod-path.c
-f:tools/perf/tests/make
-f:tools/perf/tests/maps.c
-f:tools/perf/tests/mem.c
-f:tools/perf/tests/mem2node.c
-f:tools/perf/tests/mmap-basic.c
-f:tools/perf/tests/mmap-thread-lookup.c
-f:tools/perf/tests/openat-syscall-all-cpus.c
-f:tools/perf/tests/openat-syscall-tp-fields.c
-f:tools/perf/tests/openat-syscall.c
-f:tools/perf/tests/parse-events.c
-f:tools/perf/tests/parse-metric.c
-f:tools/perf/tests/parse-no-sample-id-all.c
-f:tools/perf/tests/pe-file-parsing.c
-f:tools/perf/tests/pe-file.c
-f:tools/perf/tests/pe-file.exe
-f:tools/perf/tests/pe-file.exe.debug
-f:tools/perf/tests/perf-hooks.c
-f:tools/perf/tests/perf-record.c
-f:tools/perf/tests/perf-targz-src-pkg
-f:tools/perf/tests/perf-time-to-tsc.c
-f:tools/perf/tests/pfm.c
-f:tools/perf/tests/pmu-events.c
-f:tools/perf/tests/pmu.c
-f:tools/perf/tests/python-use.c
-f:tools/perf/tests/sample-parsing.c
-f:tools/perf/tests/sdt.c
-f:tools/perf/tests/shell/amd-ibs-swfilt.sh
-f:tools/perf/tests/shell/annotate.sh
-f:tools/perf/tests/shell/attr.sh
-f:tools/perf/tests/shell/attr/README
-f:tools/perf/tests/shell/attr/base-record
-f:tools/perf/tests/shell/attr/base-record-spe
-f:tools/perf/tests/shell/attr/base-stat
-f:tools/perf/tests/shell/attr/system-wide-dummy
-f:tools/perf/tests/shell/attr/test-record-C0
-f:tools/perf/tests/shell/attr/test-record-basic
-f:tools/perf/tests/shell/attr/test-record-branch-any
-f:tools/perf/tests/shell/attr/test-record-branch-filter-any
-f:tools/perf/tests/shell/attr/test-record-branch-filter-any_call
-f:tools/perf/tests/shell/attr/test-record-branch-filter-any_ret
-f:tools/perf/tests/shell/attr/test-record-branch-filter-hv
-f:tools/perf/tests/shell/attr/test-record-branch-filter-ind_call
-f:tools/perf/tests/shell/attr/test-record-branch-filter-k
-f:tools/perf/tests/shell/attr/test-record-branch-filter-u
-f:tools/perf/tests/shell/attr/test-record-count
-f:tools/perf/tests/shell/attr/test-record-data
-f:tools/perf/tests/shell/attr/test-record-dummy-C0
-f:tools/perf/tests/shell/attr/test-record-freq
-f:tools/perf/tests/shell/attr/test-record-graph-default
-f:tools/perf/tests/shell/attr/test-record-graph-default-aarch64
-f:tools/perf/tests/shell/attr/test-record-graph-dwarf
-f:tools/perf/tests/shell/attr/test-record-graph-fp
-f:tools/perf/tests/shell/attr/test-record-graph-fp-aarch64
-f:tools/perf/tests/shell/attr/test-record-group-sampling
-f:tools/perf/tests/shell/attr/test-record-group-sampling1
-f:tools/perf/tests/shell/attr/test-record-group-sampling2
-f:tools/perf/tests/shell/attr/test-record-group1
-f:tools/perf/tests/shell/attr/test-record-group2
-f:tools/perf/tests/shell/attr/test-record-group3
-f:tools/perf/tests/shell/attr/test-record-no-buffering
-f:tools/perf/tests/shell/attr/test-record-no-inherit
-f:tools/perf/tests/shell/attr/test-record-no-samples
-f:tools/perf/tests/shell/attr/test-record-period
-f:tools/perf/tests/shell/attr/test-record-pfm-period
-f:tools/perf/tests/shell/attr/test-record-raw
-f:tools/perf/tests/shell/attr/test-record-spe-period
-f:tools/perf/tests/shell/attr/test-record-spe-period-term
-f:tools/perf/tests/shell/attr/test-record-spe-physical-address
-f:tools/perf/tests/shell/attr/test-record-user-regs-no-sve-aarch64
-f:tools/perf/tests/shell/attr/test-record-user-regs-old-sve-aarch64
-f:tools/perf/tests/shell/attr/test-record-user-regs-sve-aarch64
-f:tools/perf/tests/shell/attr/test-stat-C0
-f:tools/perf/tests/shell/attr/test-stat-basic
-f:tools/perf/tests/shell/attr/test-stat-default
-f:tools/perf/tests/shell/attr/test-stat-detailed-1
-f:tools/perf/tests/shell/attr/test-stat-detailed-2
-f:tools/perf/tests/shell/attr/test-stat-detailed-3
-f:tools/perf/tests/shell/attr/test-stat-group1
-f:tools/perf/tests/shell/attr/test-stat-no-inherit
-f:tools/perf/tests/shell/base_probe/test_adding_blacklisted.sh
-f:tools/perf/tests/shell/base_probe/test_adding_kernel.sh
-f:tools/perf/tests/shell/base_probe/test_basic.sh
-f:tools/perf/tests/shell/base_probe/test_invalid_options.sh
-f:tools/perf/tests/shell/base_probe/test_line_semantics.sh
-f:tools/perf/tests/shell/base_report/setup.sh
-f:tools/perf/tests/shell/base_report/stderr-whitelist.txt
-f:tools/perf/tests/shell/base_report/test_basic.sh
-f:tools/perf/tests/shell/buildid.sh
-f:tools/perf/tests/shell/common/check_all_lines_matched.pl
-f:tools/perf/tests/shell/common/check_all_patterns_found.pl
-f:tools/perf/tests/shell/common/check_errors_whitelisted.pl
-f:tools/perf/tests/shell/common/check_no_patterns_found.pl
-f:tools/perf/tests/shell/common/init.sh
-f:tools/perf/tests/shell/common/patterns.sh
-f:tools/perf/tests/shell/common/settings.sh
-f:tools/perf/tests/shell/coresight/Makefile
-f:tools/perf/tests/shell/coresight/Makefile.miniconfig
-f:tools/perf/tests/shell/coresight/asm_pure_loop.sh
-f:tools/perf/tests/shell/coresight/asm_pure_loop/.gitignore
-f:tools/perf/tests/shell/coresight/asm_pure_loop/Makefile
-f:tools/perf/tests/shell/coresight/asm_pure_loop/asm_pure_loop.S
-f:tools/perf/tests/shell/coresight/memcpy_thread/.gitignore
-f:tools/perf/tests/shell/coresight/memcpy_thread/Makefile
-f:tools/perf/tests/shell/coresight/memcpy_thread/memcpy_thread.c
-f:tools/perf/tests/shell/coresight/memcpy_thread_16k_10.sh
-f:tools/perf/tests/shell/coresight/thread_loop/.gitignore
-f:tools/perf/tests/shell/coresight/thread_loop/Makefile
-f:tools/perf/tests/shell/coresight/thread_loop/thread_loop.c
-f:tools/perf/tests/shell/coresight/thread_loop_check_tid_10.sh
-f:tools/perf/tests/shell/coresight/thread_loop_check_tid_2.sh
-f:tools/perf/tests/shell/coresight/unroll_loop_thread/.gitignore
-f:tools/perf/tests/shell/coresight/unroll_loop_thread/Makefile
-f:tools/perf/tests/shell/coresight/unroll_loop_thread/unroll_loop_thread.c
-f:tools/perf/tests/shell/coresight/unroll_loop_thread_10.sh
-f:tools/perf/tests/shell/daemon.sh
-f:tools/perf/tests/shell/diff.sh
-f:tools/perf/tests/shell/ftrace.sh
-f:tools/perf/tests/shell/lib/attr.py
-f:tools/perf/tests/shell/lib/coresight.sh
-f:tools/perf/tests/shell/lib/perf_has_symbol.sh
-f:tools/perf/tests/shell/lib/perf_json_output_lint.py
-f:tools/perf/tests/shell/lib/perf_metric_validation.py
-f:tools/perf/tests/shell/lib/perf_metric_validation_rules.json
-f:tools/perf/tests/shell/lib/probe.sh
-f:tools/perf/tests/shell/lib/probe_vfs_getname.sh
-f:tools/perf/tests/shell/lib/setup_python.sh
-f:tools/perf/tests/shell/lib/stat_output.sh
-f:tools/perf/tests/shell/lib/waiting.sh
-f:tools/perf/tests/shell/list.sh
-f:tools/perf/tests/shell/lock_contention.sh
-f:tools/perf/tests/shell/perf-report-hierarchy.sh
-f:tools/perf/tests/shell/perftool-testsuite_probe.sh
-f:tools/perf/tests/shell/perftool-testsuite_report.sh
-f:tools/perf/tests/shell/pipe_test.sh
-f:tools/perf/tests/shell/probe_vfs_getname.sh
-f:tools/perf/tests/shell/record+probe_libc_inet_pton.sh
-f:tools/perf/tests/shell/record+script_probe_vfs_getname.sh
-f:tools/perf/tests/shell/record+zstd_comp_decomp.sh
-f:tools/perf/tests/shell/record.sh
-f:tools/perf/tests/shell/record_bpf_filter.sh
-f:tools/perf/tests/shell/record_lbr.sh
-f:tools/perf/tests/shell/record_offcpu.sh
-f:tools/perf/tests/shell/record_sideband.sh
-f:tools/perf/tests/shell/script.sh
-f:tools/perf/tests/shell/stat+csv_output.sh
-f:tools/perf/tests/shell/stat+csv_summary.sh
-f:tools/perf/tests/shell/stat+event_uniquifying.sh
-f:tools/perf/tests/shell/stat+json_output.sh
-f:tools/perf/tests/shell/stat+shadow_stat.sh
-f:tools/perf/tests/shell/stat+std_output.sh
-f:tools/perf/tests/shell/stat.sh
-f:tools/perf/tests/shell/stat_all_metricgroups.sh
-f:tools/perf/tests/shell/stat_all_metrics.sh
-f:tools/perf/tests/shell/stat_all_pfm.sh
-f:tools/perf/tests/shell/stat_all_pmu.sh
-f:tools/perf/tests/shell/stat_bpf_counters.sh
-f:tools/perf/tests/shell/stat_bpf_counters_cgrp.sh
-f:tools/perf/tests/shell/stat_metrics_values.sh
-f:tools/perf/tests/shell/test_arm_callgraph_fp.sh
-f:tools/perf/tests/shell/test_arm_coresight.sh
-f:tools/perf/tests/shell/test_arm_coresight_disasm.sh
-f:tools/perf/tests/shell/test_arm_spe.sh
-f:tools/perf/tests/shell/test_arm_spe_fork.sh
-f:tools/perf/tests/shell/test_brstack.sh
-f:tools/perf/tests/shell/test_data_symbol.sh
-f:tools/perf/tests/shell/test_intel_pt.sh
-f:tools/perf/tests/shell/test_java_symbol.sh
-f:tools/perf/tests/shell/test_perf_data_converter_json.sh
-f:tools/perf/tests/shell/test_stat_intel_tpebs.sh
-f:tools/perf/tests/shell/test_task_analyzer.sh
-f:tools/perf/tests/shell/test_uprobe_from_different_cu.sh
-f:tools/perf/tests/shell/trace+probe_vfs_getname.sh
-f:tools/perf/tests/shell/trace_btf_enum.sh
-f:tools/perf/tests/shell/trace_btf_general.sh
-f:tools/perf/tests/shell/trace_exit_race.sh
-f:tools/perf/tests/shell/trace_record_replay.sh
-f:tools/perf/tests/shell/trace_summary.sh
-f:tools/perf/tests/sigtrap.c
-f:tools/perf/tests/stat.c
-f:tools/perf/tests/sw-clock.c
-f:tools/perf/tests/switch-tracking.c
-f:tools/perf/tests/symbols.c
-f:tools/perf/tests/task-exit.c
-f:tools/perf/tests/tests-scripts.c
-f:tools/perf/tests/tests-scripts.h
-f:tools/perf/tests/tests.h
-f:tools/perf/tests/thread-map.c
-f:tools/perf/tests/thread-maps-share.c
-f:tools/perf/tests/time-utils-test.c
-f:tools/perf/tests/tool_pmu.c
-f:tools/perf/tests/topology.c
-f:tools/perf/tests/unit_number__scnprintf.c
-f:tools/perf/tests/util.c
-f:tools/perf/tests/vmlinux-kallsyms.c
-f:tools/perf/tests/workloads/Build
-f:tools/perf/tests/workloads/brstack.c
-f:tools/perf/tests/workloads/datasym.c
-f:tools/perf/tests/workloads/landlock.c
-f:tools/perf/tests/workloads/leafloop.c
-f:tools/perf/tests/workloads/noploop.c
-f:tools/perf/tests/workloads/sqrtloop.c
-f:tools/perf/tests/workloads/thloop.c
-f:tools/perf/tests/wp.c
-f:tools/perf/trace/beauty/Build
-f:tools/perf/trace/beauty/arch/x86/include/asm/irq_vectors.h
-f:tools/perf/trace/beauty/arch/x86/include/uapi/asm/prctl.h
-f:tools/perf/trace/beauty/arch_errno_names.c
-f:tools/perf/trace/beauty/arch_errno_names.sh
-f:tools/perf/trace/beauty/arch_prctl.c
-f:tools/perf/trace/beauty/beauty.h
-f:tools/perf/trace/beauty/clone.c
-f:tools/perf/trace/beauty/clone.sh
-f:tools/perf/trace/beauty/drm_ioctl.sh
-f:tools/perf/trace/beauty/eventfd.c
-f:tools/perf/trace/beauty/fadvise.sh
-f:tools/perf/trace/beauty/fcntl.c
-f:tools/perf/trace/beauty/flock.c
-f:tools/perf/trace/beauty/fs_at_flags.c
-f:tools/perf/trace/beauty/fs_at_flags.sh
-f:tools/perf/trace/beauty/fsconfig.sh
-f:tools/perf/trace/beauty/fsmount.c
-f:tools/perf/trace/beauty/fsmount.sh
-f:tools/perf/trace/beauty/fspick.c
-f:tools/perf/trace/beauty/fspick.sh
-f:tools/perf/trace/beauty/futex_op.c
-f:tools/perf/trace/beauty/futex_val3.c
-f:tools/perf/trace/beauty/include/linux/socket.h
-f:tools/perf/trace/beauty/include/uapi/linux/fcntl.h
-f:tools/perf/trace/beauty/include/uapi/linux/fs.h
-f:tools/perf/trace/beauty/include/uapi/linux/mount.h
-f:tools/perf/trace/beauty/include/uapi/linux/prctl.h
-f:tools/perf/trace/beauty/include/uapi/linux/sched.h
-f:tools/perf/trace/beauty/include/uapi/linux/stat.h
-f:tools/perf/trace/beauty/include/uapi/linux/usbdevice_fs.h
-f:tools/perf/trace/beauty/include/uapi/linux/vhost.h
-f:tools/perf/trace/beauty/include/uapi/sound/asound.h
-f:tools/perf/trace/beauty/ioctl.c
-f:tools/perf/trace/beauty/kcmp.c
-f:tools/perf/trace/beauty/kcmp_type.sh
-f:tools/perf/trace/beauty/kvm_ioctl.sh
-f:tools/perf/trace/beauty/madvise_behavior.sh
-f:tools/perf/trace/beauty/mmap.c
-f:tools/perf/trace/beauty/mmap_flags.sh
-f:tools/perf/trace/beauty/mmap_prot.sh
-f:tools/perf/trace/beauty/mode_t.c
-f:tools/perf/trace/beauty/mount_flags.c
-f:tools/perf/trace/beauty/mount_flags.sh
-f:tools/perf/trace/beauty/move_mount.c
-f:tools/perf/trace/beauty/move_mount_flags.sh
-f:tools/perf/trace/beauty/mremap_flags.sh
-f:tools/perf/trace/beauty/msg_flags.c
-f:tools/perf/trace/beauty/open_flags.c
-f:tools/perf/trace/beauty/perf_event_open.c
-f:tools/perf/trace/beauty/perf_ioctl.sh
-f:tools/perf/trace/beauty/pid.c
-f:tools/perf/trace/beauty/pkey_alloc.c
-f:tools/perf/trace/beauty/pkey_alloc_access_rights.sh
-f:tools/perf/trace/beauty/prctl.c
-f:tools/perf/trace/beauty/prctl_option.sh
-f:tools/perf/trace/beauty/rename_flags.sh
-f:tools/perf/trace/beauty/renameat.c
-f:tools/perf/trace/beauty/sched_policy.c
-f:tools/perf/trace/beauty/seccomp.c
-f:tools/perf/trace/beauty/signum.c
-f:tools/perf/trace/beauty/sndrv_ctl_ioctl.sh
-f:tools/perf/trace/beauty/sndrv_pcm_ioctl.sh
-f:tools/perf/trace/beauty/sockaddr.c
-f:tools/perf/trace/beauty/sockaddr.sh
-f:tools/perf/trace/beauty/socket.c
-f:tools/perf/trace/beauty/socket.sh
-f:tools/perf/trace/beauty/socket_type.c
-f:tools/perf/trace/beauty/statx.c
-f:tools/perf/trace/beauty/statx_mask.sh
-f:tools/perf/trace/beauty/sync_file_range.c
-f:tools/perf/trace/beauty/sync_file_range.sh
-f:tools/perf/trace/beauty/syscalltbl.sh
-f:tools/perf/trace/beauty/timespec.c
-f:tools/perf/trace/beauty/tracepoints/Build
-f:tools/perf/trace/beauty/tracepoints/x86_irq_vectors.c
-f:tools/perf/trace/beauty/tracepoints/x86_irq_vectors.sh
-f:tools/perf/trace/beauty/tracepoints/x86_msr.c
-f:tools/perf/trace/beauty/tracepoints/x86_msr.sh
-f:tools/perf/trace/beauty/usbdevfs_ioctl.sh
-f:tools/perf/trace/beauty/vhost_virtio_ioctl.sh
-f:tools/perf/trace/beauty/waitid_options.c
-f:tools/perf/trace/beauty/x86_arch_prctl.sh
-f:tools/perf/trace/strace/groups/file
-f:tools/perf/trace/strace/groups/string
-f:tools/perf/ui/Build
-f:tools/perf/ui/browser.c
-f:tools/perf/ui/browser.h
-f:tools/perf/ui/browsers/Build
-f:tools/perf/ui/browsers/annotate-data.c
-f:tools/perf/ui/browsers/annotate.c
-f:tools/perf/ui/browsers/header.c
-f:tools/perf/ui/browsers/hists.c
-f:tools/perf/ui/browsers/hists.h
-f:tools/perf/ui/browsers/map.c
-f:tools/perf/ui/browsers/map.h
-f:tools/perf/ui/browsers/res_sample.c
-f:tools/perf/ui/browsers/scripts.c
-f:tools/perf/ui/gtk/Build
-f:tools/perf/ui/gtk/annotate.c
-f:tools/perf/ui/gtk/browser.c
-f:tools/perf/ui/gtk/gtk.h
-f:tools/perf/ui/gtk/helpline.c
-f:tools/perf/ui/gtk/hists.c
-f:tools/perf/ui/gtk/progress.c
-f:tools/perf/ui/gtk/setup.c
-f:tools/perf/ui/gtk/util.c
-f:tools/perf/ui/helpline.c
-f:tools/perf/ui/helpline.h
-f:tools/perf/ui/hist.c
-f:tools/perf/ui/keysyms.c
-f:tools/perf/ui/keysyms.h
-f:tools/perf/ui/libslang.h
-f:tools/perf/ui/progress.c
-f:tools/perf/ui/progress.h
-f:tools/perf/ui/setup.c
-f:tools/perf/ui/stdio/hist.c
-f:tools/perf/ui/tui/Build
-f:tools/perf/ui/tui/helpline.c
-f:tools/perf/ui/tui/progress.c
-f:tools/perf/ui/tui/setup.c
-f:tools/perf/ui/tui/tui.h
-f:tools/perf/ui/tui/util.c
-f:tools/perf/ui/ui.h
-f:tools/perf/ui/util.c
-f:tools/perf/ui/util.h
-f:tools/perf/util/Build
-f:tools/perf/util/PERF-VERSION-GEN
-f:tools/perf/util/addr_location.c
-f:tools/perf/util/addr_location.h
-f:tools/perf/util/affinity.c
-f:tools/perf/util/affinity.h
-f:tools/perf/util/amd-sample-raw.c
-f:tools/perf/util/annotate-data.c
-f:tools/perf/util/annotate-data.h
-f:tools/perf/util/annotate.c
-f:tools/perf/util/annotate.h
-f:tools/perf/util/archinsn.h
-f:tools/perf/util/arm-spe-decoder/Build
-f:tools/perf/util/arm-spe-decoder/arm-spe-decoder.c
-f:tools/perf/util/arm-spe-decoder/arm-spe-decoder.h
-f:tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c
-f:tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.h
-f:tools/perf/util/arm-spe.c
-f:tools/perf/util/arm-spe.h
-f:tools/perf/util/arm64-frame-pointer-unwind-support.c
-f:tools/perf/util/arm64-frame-pointer-unwind-support.h
-f:tools/perf/util/auxtrace.c
-f:tools/perf/util/auxtrace.h
-f:tools/perf/util/block-info.c
-f:tools/perf/util/block-info.h
-f:tools/perf/util/block-range.c
-f:tools/perf/util/block-range.h
-f:tools/perf/util/bpf-event.c
-f:tools/perf/util/bpf-event.h
-f:tools/perf/util/bpf-filter.c
-f:tools/perf/util/bpf-filter.h
-f:tools/perf/util/bpf-filter.l
-f:tools/perf/util/bpf-filter.y
-f:tools/perf/util/bpf-trace-summary.c
-f:tools/perf/util/bpf-utils.c
-f:tools/perf/util/bpf-utils.h
-f:tools/perf/util/bpf_counter.c
-f:tools/perf/util/bpf_counter.h
-f:tools/perf/util/bpf_counter_cgroup.c
-f:tools/perf/util/bpf_ftrace.c
-f:tools/perf/util/bpf_kwork.c
-f:tools/perf/util/bpf_kwork_top.c
-f:tools/perf/util/bpf_lock_contention.c
-f:tools/perf/util/bpf_map.c
-f:tools/perf/util/bpf_map.h
-f:tools/perf/util/bpf_off_cpu.c
-f:tools/perf/util/bpf_skel/.gitignore
-f:tools/perf/util/bpf_skel/augmented_raw_syscalls.bpf.c
-f:tools/perf/util/bpf_skel/bench_uprobe.bpf.c
-f:tools/perf/util/bpf_skel/bperf_cgroup.bpf.c
-f:tools/perf/util/bpf_skel/bperf_follower.bpf.c
-f:tools/perf/util/bpf_skel/bperf_leader.bpf.c
-f:tools/perf/util/bpf_skel/bperf_u.h
-f:tools/perf/util/bpf_skel/bpf_prog_profiler.bpf.c
-f:tools/perf/util/bpf_skel/func_latency.bpf.c
-f:tools/perf/util/bpf_skel/kwork_top.bpf.c
-f:tools/perf/util/bpf_skel/kwork_trace.bpf.c
-f:tools/perf/util/bpf_skel/lock_contention.bpf.c
-f:tools/perf/util/bpf_skel/lock_data.h
-f:tools/perf/util/bpf_skel/off_cpu.bpf.c
-f:tools/perf/util/bpf_skel/sample-filter.h
-f:tools/perf/util/bpf_skel/sample_filter.bpf.c
-f:tools/perf/util/bpf_skel/syscall_summary.bpf.c
-f:tools/perf/util/bpf_skel/syscall_summary.h
-f:tools/perf/util/bpf_skel/vmlinux/.gitignore
-f:tools/perf/util/bpf_skel/vmlinux/vmlinux.h
-f:tools/perf/util/branch.c
-f:tools/perf/util/branch.h
-f:tools/perf/util/btf.c
-f:tools/perf/util/btf.h
-f:tools/perf/util/build-id.c
-f:tools/perf/util/build-id.h
-f:tools/perf/util/cache.h
-f:tools/perf/util/cacheline.c
-f:tools/perf/util/cacheline.h
-f:tools/perf/util/call-path.c
-f:tools/perf/util/call-path.h
-f:tools/perf/util/callchain.c
-f:tools/perf/util/callchain.h
-f:tools/perf/util/cap.c
-f:tools/perf/util/cap.h
-f:tools/perf/util/cgroup.c
-f:tools/perf/util/cgroup.h
-f:tools/perf/util/clockid.c
-f:tools/perf/util/clockid.h
-f:tools/perf/util/cloexec.c
-f:tools/perf/util/cloexec.h
-f:tools/perf/util/color.c
-f:tools/perf/util/color.h
-f:tools/perf/util/color_config.c
-f:tools/perf/util/comm.c
-f:tools/perf/util/comm.h
-f:tools/perf/util/compress.h
-f:tools/perf/util/config.c
-f:tools/perf/util/config.h
-f:tools/perf/util/copyfile.c
-f:tools/perf/util/copyfile.h
-f:tools/perf/util/counts.c
-f:tools/perf/util/counts.h
-f:tools/perf/util/cpu-set-sched.h
-f:tools/perf/util/cpumap.c
-f:tools/perf/util/cpumap.h
-f:tools/perf/util/cputopo.c
-f:tools/perf/util/cputopo.h
-f:tools/perf/util/cs-etm-base.c
-f:tools/perf/util/cs-etm-decoder/Build
-f:tools/perf/util/cs-etm-decoder/cs-etm-decoder.c
-f:tools/perf/util/cs-etm-decoder/cs-etm-decoder.h
-f:tools/perf/util/cs-etm.c
-f:tools/perf/util/cs-etm.h
-f:tools/perf/util/data-convert-bt.c
-f:tools/perf/util/data-convert-json.c
-f:tools/perf/util/data-convert.h
-f:tools/perf/util/data.c
-f:tools/perf/util/data.h
-f:tools/perf/util/db-export.c
-f:tools/perf/util/db-export.h
-f:tools/perf/util/debug.c
-f:tools/perf/util/debug.h
-f:tools/perf/util/debuginfo.c
-f:tools/perf/util/debuginfo.h
-f:tools/perf/util/demangle-cxx.cpp
-f:tools/perf/util/demangle-cxx.h
-f:tools/perf/util/demangle-java.c
-f:tools/perf/util/demangle-java.h
-f:tools/perf/util/demangle-ocaml.c
-f:tools/perf/util/demangle-ocaml.h
-f:tools/perf/util/demangle-rust-v0.c
-f:tools/perf/util/demangle-rust-v0.h
-f:tools/perf/util/disasm.c
-f:tools/perf/util/disasm.h
-f:tools/perf/util/disasm_bpf.c
-f:tools/perf/util/disasm_bpf.h
-f:tools/perf/util/dlfilter.c
-f:tools/perf/util/dlfilter.h
-f:tools/perf/util/dso.c
-f:tools/perf/util/dso.h
-f:tools/perf/util/dsos.c
-f:tools/perf/util/dsos.h
-f:tools/perf/util/dump-insn.c
-f:tools/perf/util/dump-insn.h
-f:tools/perf/util/dwarf-aux.c
-f:tools/perf/util/dwarf-aux.h
-f:tools/perf/util/dwarf-regs-csky.c
-f:tools/perf/util/dwarf-regs-powerpc.c
-f:tools/perf/util/dwarf-regs-x86.c
-f:tools/perf/util/dwarf-regs.c
-f:tools/perf/util/env.c
-f:tools/perf/util/env.h
-f:tools/perf/util/event.c
-f:tools/perf/util/event.h
-f:tools/perf/util/events_stats.h
-f:tools/perf/util/evlist.c
-f:tools/perf/util/evlist.h
-f:tools/perf/util/evsel.c
-f:tools/perf/util/evsel.h
-f:tools/perf/util/evsel_config.h
-f:tools/perf/util/evsel_fprintf.c
-f:tools/perf/util/evsel_fprintf.h
-f:tools/perf/util/evswitch.c
-f:tools/perf/util/evswitch.h
-f:tools/perf/util/expr.c
-f:tools/perf/util/expr.h
-f:tools/perf/util/expr.l
-f:tools/perf/util/expr.y
-f:tools/perf/util/find-map.c
-f:tools/perf/util/fncache.c
-f:tools/perf/util/fncache.h
-f:tools/perf/util/ftrace.h
-f:tools/perf/util/genelf.c
-f:tools/perf/util/genelf.h
-f:tools/perf/util/genelf_debug.c
-f:tools/perf/util/generate-cmdlist.sh
-f:tools/perf/util/get_current_dir_name.c
-f:tools/perf/util/get_current_dir_name.h
-f:tools/perf/util/hashmap.c
-f:tools/perf/util/hashmap.h
-f:tools/perf/util/header.c
-f:tools/perf/util/header.h
-f:tools/perf/util/help-unknown-cmd.c
-f:tools/perf/util/help-unknown-cmd.h
-f:tools/perf/util/hisi-ptt-decoder/Build
-f:tools/perf/util/hisi-ptt-decoder/hisi-ptt-pkt-decoder.c
-f:tools/perf/util/hisi-ptt-decoder/hisi-ptt-pkt-decoder.h
-f:tools/perf/util/hisi-ptt.c
-f:tools/perf/util/hisi-ptt.h
-f:tools/perf/util/hist.c
-f:tools/perf/util/hist.h
-f:tools/perf/util/hwmon_pmu.c
-f:tools/perf/util/hwmon_pmu.h
-f:tools/perf/util/include/asm/asm-offsets.h
-f:tools/perf/util/include/asm/cpufeature.h
-f:tools/perf/util/include/asm/dwarf2.h
-f:tools/perf/util/include/asm/swab.h
-f:tools/perf/util/include/asm/system.h
-f:tools/perf/util/include/asm/uaccess.h
-f:tools/perf/util/include/dwarf-regs.h
-f:tools/perf/util/include/linux/linkage.h
-f:tools/perf/util/intel-bts.c
-f:tools/perf/util/intel-bts.h
-f:tools/perf/util/intel-pt-decoder/Build
-f:tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
-f:tools/perf/util/intel-pt-decoder/intel-pt-decoder.h
-f:tools/perf/util/intel-pt-decoder/intel-pt-insn-decoder.c
-f:tools/perf/util/intel-pt-decoder/intel-pt-insn-decoder.h
-f:tools/perf/util/intel-pt-decoder/intel-pt-log.c
-f:tools/perf/util/intel-pt-decoder/intel-pt-log.h
-f:tools/perf/util/intel-pt-decoder/intel-pt-pkt-decoder.c
-f:tools/perf/util/intel-pt-decoder/intel-pt-pkt-decoder.h
-f:tools/perf/util/intel-pt.c
-f:tools/perf/util/intel-pt.h
-f:tools/perf/util/intel-tpebs.c
-f:tools/perf/util/intel-tpebs.h
-f:tools/perf/util/intlist.c
-f:tools/perf/util/intlist.h
-f:tools/perf/util/iostat.c
-f:tools/perf/util/iostat.h
-f:tools/perf/util/jit.h
-f:tools/perf/util/jitdump.c
-f:tools/perf/util/jitdump.h
-f:tools/perf/util/kvm-stat.c
-f:tools/perf/util/kvm-stat.h
-f:tools/perf/util/kwork.h
-f:tools/perf/util/levenshtein.c
-f:tools/perf/util/levenshtein.h
-f:tools/perf/util/libunwind/arm64.c
-f:tools/perf/util/libunwind/x86_32.c
-f:tools/perf/util/llvm-c-helpers.cpp
-f:tools/perf/util/llvm-c-helpers.h
-f:tools/perf/util/lock-contention.c
-f:tools/perf/util/lock-contention.h
-f:tools/perf/util/lzma.c
-f:tools/perf/util/machine.c
-f:tools/perf/util/machine.h
-f:tools/perf/util/map.c
-f:tools/perf/util/map.h
-f:tools/perf/util/map_symbol.c
-f:tools/perf/util/map_symbol.h
-f:tools/perf/util/maps.c
-f:tools/perf/util/maps.h
-f:tools/perf/util/mem-events.c
-f:tools/perf/util/mem-events.h
-f:tools/perf/util/mem-info.c
-f:tools/perf/util/mem-info.h
-f:tools/perf/util/mem2node.c
-f:tools/perf/util/mem2node.h
-f:tools/perf/util/memswap.c
-f:tools/perf/util/memswap.h
-f:tools/perf/util/metricgroup.c
-f:tools/perf/util/metricgroup.h
-f:tools/perf/util/mmap.c
-f:tools/perf/util/mmap.h
-f:tools/perf/util/mutex.c
-f:tools/perf/util/mutex.h
-f:tools/perf/util/namespaces.c
-f:tools/perf/util/namespaces.h
-f:tools/perf/util/off_cpu.h
-f:tools/perf/util/ordered-events.c
-f:tools/perf/util/ordered-events.h
-f:tools/perf/util/parse-branch-options.c
-f:tools/perf/util/parse-branch-options.h
-f:tools/perf/util/parse-events.c
-f:tools/perf/util/parse-events.h
-f:tools/perf/util/parse-events.l
-f:tools/perf/util/parse-events.y
-f:tools/perf/util/parse-regs-options.c
-f:tools/perf/util/parse-regs-options.h
-f:tools/perf/util/parse-sublevel-options.c
-f:tools/perf/util/parse-sublevel-options.h
-f:tools/perf/util/path.c
-f:tools/perf/util/path.h
-f:tools/perf/util/perf-hooks-list.h
-f:tools/perf/util/perf-hooks.c
-f:tools/perf/util/perf-hooks.h
-f:tools/perf/util/perf-regs-arch/Build
-f:tools/perf/util/perf-regs-arch/perf_regs_aarch64.c
-f:tools/perf/util/perf-regs-arch/perf_regs_arm.c
-f:tools/perf/util/perf-regs-arch/perf_regs_csky.c
-f:tools/perf/util/perf-regs-arch/perf_regs_loongarch.c
-f:tools/perf/util/perf-regs-arch/perf_regs_mips.c
-f:tools/perf/util/perf-regs-arch/perf_regs_powerpc.c
-f:tools/perf/util/perf-regs-arch/perf_regs_riscv.c
-f:tools/perf/util/perf-regs-arch/perf_regs_s390.c
-f:tools/perf/util/perf-regs-arch/perf_regs_x86.c
-f:tools/perf/util/perf_api_probe.c
-f:tools/perf/util/perf_api_probe.h
-f:tools/perf/util/perf_event_attr_fprintf.c
-f:tools/perf/util/perf_regs.c
-f:tools/perf/util/perf_regs.h
-f:tools/perf/util/pfm.c
-f:tools/perf/util/pfm.h
-f:tools/perf/util/pmu.c
-f:tools/perf/util/pmu.h
-f:tools/perf/util/pmu.l
-f:tools/perf/util/pmu.y
-f:tools/perf/util/pmus.c
-f:tools/perf/util/pmus.h
-f:tools/perf/util/print-events.c
-f:tools/perf/util/print-events.h
-f:tools/perf/util/print_binary.c
-f:tools/perf/util/print_binary.h
-f:tools/perf/util/print_insn.c
-f:tools/perf/util/print_insn.h
-f:tools/perf/util/probe-event.c
-f:tools/perf/util/probe-event.h
-f:tools/perf/util/probe-file.c
-f:tools/perf/util/probe-file.h
-f:tools/perf/util/probe-finder.c
-f:tools/perf/util/probe-finder.h
-f:tools/perf/util/pstack.c
-f:tools/perf/util/pstack.h
-f:tools/perf/util/python.c
-f:tools/perf/util/rblist.c
-f:tools/perf/util/rblist.h
-f:tools/perf/util/record.c
-f:tools/perf/util/record.h
-f:tools/perf/util/rlimit.c
-f:tools/perf/util/rlimit.h
-f:tools/perf/util/rwsem.c
-f:tools/perf/util/rwsem.h
-f:tools/perf/util/s390-cpumcf-kernel.h
-f:tools/perf/util/s390-cpumsf-kernel.h
-f:tools/perf/util/s390-cpumsf.c
-f:tools/perf/util/s390-cpumsf.h
-f:tools/perf/util/s390-sample-raw.c
-f:tools/perf/util/sample-raw.c
-f:tools/perf/util/sample-raw.h
-f:tools/perf/util/sample.c
-f:tools/perf/util/sample.h
-f:tools/perf/util/scripting-engines/Build
-f:tools/perf/util/scripting-engines/trace-event-perl.c
-f:tools/perf/util/scripting-engines/trace-event-python.c
-f:tools/perf/util/session.c
-f:tools/perf/util/session.h
-f:tools/perf/util/setns.c
-f:tools/perf/util/setup.py
-f:tools/perf/util/sharded_mutex.c
-f:tools/perf/util/sharded_mutex.h
-f:tools/perf/util/sideband_evlist.c
-f:tools/perf/util/smt.c
-f:tools/perf/util/smt.h
-f:tools/perf/util/sort.c
-f:tools/perf/util/sort.h
-f:tools/perf/util/spark.c
-f:tools/perf/util/spark.h
-f:tools/perf/util/srccode.c
-f:tools/perf/util/srccode.h
-f:tools/perf/util/srcline.c
-f:tools/perf/util/srcline.h
-f:tools/perf/util/stat-display.c
-f:tools/perf/util/stat-shadow.c
-f:tools/perf/util/stat.c
-f:tools/perf/util/stat.h
-f:tools/perf/util/strbuf.c
-f:tools/perf/util/strbuf.h
-f:tools/perf/util/stream.c
-f:tools/perf/util/stream.h
-f:tools/perf/util/strfilter.c
-f:tools/perf/util/strfilter.h
-f:tools/perf/util/string.c
-f:tools/perf/util/string2.h
-f:tools/perf/util/strlist.c
-f:tools/perf/util/strlist.h
-f:tools/perf/util/svghelper.c
-f:tools/perf/util/svghelper.h
-f:tools/perf/util/symbol-elf.c
-f:tools/perf/util/symbol-minimal.c
-f:tools/perf/util/symbol.c
-f:tools/perf/util/symbol.h
-f:tools/perf/util/symbol_conf.h
-f:tools/perf/util/symbol_fprintf.c
-f:tools/perf/util/symsrc.h
-f:tools/perf/util/synthetic-events.c
-f:tools/perf/util/synthetic-events.h
-f:tools/perf/util/syscalltbl.c
-f:tools/perf/util/syscalltbl.h
-f:tools/perf/util/target.c
-f:tools/perf/util/target.h
-f:tools/perf/util/term.c
-f:tools/perf/util/term.h
-f:tools/perf/util/thread-stack.c
-f:tools/perf/util/thread-stack.h
-f:tools/perf/util/thread.c
-f:tools/perf/util/thread.h
-f:tools/perf/util/thread_map.c
-f:tools/perf/util/thread_map.h
-f:tools/perf/util/threads.c
-f:tools/perf/util/threads.h
-f:tools/perf/util/time-utils.c
-f:tools/perf/util/time-utils.h
-f:tools/perf/util/tool.c
-f:tools/perf/util/tool.h
-f:tools/perf/util/tool_pmu.c
-f:tools/perf/util/tool_pmu.h
-f:tools/perf/util/top.c
-f:tools/perf/util/top.h
-f:tools/perf/util/topdown.c
-f:tools/perf/util/topdown.h
-f:tools/perf/util/trace-event-info.c
-f:tools/perf/util/trace-event-parse.c
-f:tools/perf/util/trace-event-read.c
-f:tools/perf/util/trace-event-scripting.c
-f:tools/perf/util/trace-event.c
-f:tools/perf/util/trace-event.h
-f:tools/perf/util/trace.h
-f:tools/perf/util/trace_augment.h
-f:tools/perf/util/tracepoint.c
-f:tools/perf/util/tracepoint.h
-f:tools/perf/util/trigger.h
-f:tools/perf/util/tsc.c
-f:tools/perf/util/tsc.h
-f:tools/perf/util/units.c
-f:tools/perf/util/units.h
-f:tools/perf/util/unwind-libdw.c
-f:tools/perf/util/unwind-libdw.h
-f:tools/perf/util/unwind-libunwind-local.c
-f:tools/perf/util/unwind-libunwind.c
-f:tools/perf/util/unwind.h
-f:tools/perf/util/usage.c
-f:tools/perf/util/util.c
-f:tools/perf/util/util.h
-f:tools/perf/util/values.c
-f:tools/perf/util/values.h
-f:tools/perf/util/vdso.c
-f:tools/perf/util/vdso.h
-f:tools/perf/util/zlib.c
-f:tools/perf/util/zstd.c
-f:tools/power/acpi/.gitignore
-f:tools/power/acpi/Makefile
-f:tools/power/acpi/Makefile.config
-f:tools/power/acpi/Makefile.rules
-f:tools/power/acpi/common/cmfsize.c
-f:tools/power/acpi/common/getopt.c
-f:tools/power/acpi/man/acpidump.8
-f:tools/power/acpi/man/pfrut.8
-f:tools/power/acpi/os_specific/service_layers/oslinuxtbl.c
-f:tools/power/acpi/os_specific/service_layers/osunixdir.c
-f:tools/power/acpi/os_specific/service_layers/osunixmap.c
-f:tools/power/acpi/os_specific/service_layers/osunixxf.c
-f:tools/power/acpi/tools/acpidbg/Makefile
-f:tools/power/acpi/tools/acpidbg/acpidbg.c
-f:tools/power/acpi/tools/acpidump/Makefile
-f:tools/power/acpi/tools/acpidump/acpidump.h
-f:tools/power/acpi/tools/acpidump/apdump.c
-f:tools/power/acpi/tools/acpidump/apfiles.c
-f:tools/power/acpi/tools/acpidump/apmain.c
-f:tools/power/acpi/tools/ec/Makefile
-f:tools/power/acpi/tools/ec/ec_access.c
-f:tools/power/acpi/tools/pfrut/Makefile
-f:tools/power/acpi/tools/pfrut/pfrut.c
-f:tools/power/cpupower/.gitignore
-f:tools/power/cpupower/Makefile
-f:tools/power/cpupower/README
-f:tools/power/cpupower/TODO
-f:tools/power/cpupower/bench/Makefile
-f:tools/power/cpupower/bench/README-BENCH
-f:tools/power/cpupower/bench/benchmark.c
-f:tools/power/cpupower/bench/benchmark.h
-f:tools/power/cpupower/bench/config.h
-f:tools/power/cpupower/bench/cpufreq-bench_plot.sh
-f:tools/power/cpupower/bench/cpufreq-bench_script.sh
-f:tools/power/cpupower/bench/example.cfg
-f:tools/power/cpupower/bench/main.c
-f:tools/power/cpupower/bench/parse.c
-f:tools/power/cpupower/bench/parse.h
-f:tools/power/cpupower/bench/system.c
-f:tools/power/cpupower/bench/system.h
-f:tools/power/cpupower/bindings/python/.gitignore
-f:tools/power/cpupower/bindings/python/Makefile
-f:tools/power/cpupower/bindings/python/README
-f:tools/power/cpupower/bindings/python/raw_pylibcpupower.swg
-f:tools/power/cpupower/bindings/python/test_raw_pylibcpupower.py
-f:tools/power/cpupower/cpupower-completion.sh
-f:tools/power/cpupower/cpupower-service.conf
-f:tools/power/cpupower/cpupower.service.in
-f:tools/power/cpupower/cpupower.sh
-f:tools/power/cpupower/debug/i386/Makefile
-f:tools/power/cpupower/debug/i386/centrino-decode.c
-f:tools/power/cpupower/debug/i386/dump_psb.c
-f:tools/power/cpupower/debug/i386/intel_gsic.c
-f:tools/power/cpupower/debug/i386/powernow-k8-decode.c
-f:tools/power/cpupower/debug/kernel/Makefile
-f:tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c
-f:tools/power/cpupower/debug/x86_64/Makefile
-f:tools/power/cpupower/lib/acpi_cppc.c
-f:tools/power/cpupower/lib/acpi_cppc.h
-f:tools/power/cpupower/lib/cpufreq.c
-f:tools/power/cpupower/lib/cpufreq.h
-f:tools/power/cpupower/lib/cpuidle.c
-f:tools/power/cpupower/lib/cpuidle.h
-f:tools/power/cpupower/lib/cpupower.c
-f:tools/power/cpupower/lib/cpupower.h
-f:tools/power/cpupower/lib/cpupower_intern.h
-f:tools/power/cpupower/lib/powercap.c
-f:tools/power/cpupower/lib/powercap.h
-f:tools/power/cpupower/man/cpupower-frequency-info.1
-f:tools/power/cpupower/man/cpupower-frequency-set.1
-f:tools/power/cpupower/man/cpupower-idle-info.1
-f:tools/power/cpupower/man/cpupower-idle-set.1
-f:tools/power/cpupower/man/cpupower-info.1
-f:tools/power/cpupower/man/cpupower-monitor.1
-f:tools/power/cpupower/man/cpupower-powercap-info.1
-f:tools/power/cpupower/man/cpupower-set.1
-f:tools/power/cpupower/man/cpupower.1
-f:tools/power/cpupower/po/cs.po
-f:tools/power/cpupower/po/de.po
-f:tools/power/cpupower/po/fr.po
-f:tools/power/cpupower/po/it.po
-f:tools/power/cpupower/po/ka.po
-f:tools/power/cpupower/po/pt.po
-f:tools/power/cpupower/po/zh_CN.po
-f:tools/power/cpupower/utils/builtin.h
-f:tools/power/cpupower/utils/cpufreq-info.c
-f:tools/power/cpupower/utils/cpufreq-set.c
-f:tools/power/cpupower/utils/cpuidle-info.c
-f:tools/power/cpupower/utils/cpuidle-set.c
-f:tools/power/cpupower/utils/cpupower-info.c
-f:tools/power/cpupower/utils/cpupower-set.c
-f:tools/power/cpupower/utils/cpupower.c
-f:tools/power/cpupower/utils/helpers/amd.c
-f:tools/power/cpupower/utils/helpers/bitmask.c
-f:tools/power/cpupower/utils/helpers/bitmask.h
-f:tools/power/cpupower/utils/helpers/cpuid.c
-f:tools/power/cpupower/utils/helpers/helpers.h
-f:tools/power/cpupower/utils/helpers/misc.c
-f:tools/power/cpupower/utils/helpers/msr.c
-f:tools/power/cpupower/utils/helpers/pci.c
-f:tools/power/cpupower/utils/helpers/sysfs.c
-f:tools/power/cpupower/utils/helpers/sysfs.h
-f:tools/power/cpupower/utils/helpers/topology.c
-f:tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c
-f:tools/power/cpupower/utils/idle_monitor/cpuidle_sysfs.c
-f:tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c
-f:tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h
-f:tools/power/cpupower/utils/idle_monitor/hsw_ext_idle.c
-f:tools/power/cpupower/utils/idle_monitor/idle_monitors.def
-f:tools/power/cpupower/utils/idle_monitor/idle_monitors.h
-f:tools/power/cpupower/utils/idle_monitor/mperf_monitor.c
-f:tools/power/cpupower/utils/idle_monitor/nhm_idle.c
-f:tools/power/cpupower/utils/idle_monitor/rapl_monitor.c
-f:tools/power/cpupower/utils/idle_monitor/snb_idle.c
-f:tools/power/cpupower/utils/powercap-info.c
-f:tools/power/cpupower/utils/version-gen.sh
-f:tools/power/pm-graph/.gitignore
-f:tools/power/pm-graph/Makefile
-f:tools/power/pm-graph/README
-f:tools/power/pm-graph/bootgraph.8
-f:tools/power/pm-graph/bootgraph.py
-f:tools/power/pm-graph/config/cgskip.txt
-f:tools/power/pm-graph/config/custom-timeline-functions.cfg
-f:tools/power/pm-graph/config/example.cfg
-f:tools/power/pm-graph/config/freeze-callgraph.cfg
-f:tools/power/pm-graph/config/freeze-dev.cfg
-f:tools/power/pm-graph/config/freeze.cfg
-f:tools/power/pm-graph/config/standby-callgraph.cfg
-f:tools/power/pm-graph/config/standby-dev.cfg
-f:tools/power/pm-graph/config/standby.cfg
-f:tools/power/pm-graph/config/suspend-callgraph.cfg
-f:tools/power/pm-graph/config/suspend-dev.cfg
-f:tools/power/pm-graph/config/suspend-x2-proc.cfg
-f:tools/power/pm-graph/config/suspend.cfg
-f:tools/power/pm-graph/install_latest_from_github.sh
-f:tools/power/pm-graph/sleepgraph.8
-f:tools/power/pm-graph/sleepgraph.py
-f:tools/power/x86/amd_pstate_tracer/amd_pstate_trace.py
-f:tools/power/x86/intel-speed-select/.gitignore
-f:tools/power/x86/intel-speed-select/Build
-f:tools/power/x86/intel-speed-select/Makefile
-f:tools/power/x86/intel-speed-select/hfi-events.c
-f:tools/power/x86/intel-speed-select/isst-config.c
-f:tools/power/x86/intel-speed-select/isst-core-mbox.c
-f:tools/power/x86/intel-speed-select/isst-core-tpmi.c
-f:tools/power/x86/intel-speed-select/isst-core.c
-f:tools/power/x86/intel-speed-select/isst-daemon.c
-f:tools/power/x86/intel-speed-select/isst-display.c
-f:tools/power/x86/intel-speed-select/isst.h
-f:tools/power/x86/intel_pstate_tracer/intel_pstate_tracer.py
-f:tools/power/x86/turbostat/.gitignore
-f:tools/power/x86/turbostat/Makefile
-f:tools/power/x86/turbostat/turbostat.8
-f:tools/power/x86/turbostat/turbostat.c
-f:tools/power/x86/x86_energy_perf_policy/Makefile
-f:tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.8
-f:tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.c
-f:tools/rcu/extract-stall.sh
-f:tools/rcu/rcu-cbs.py
-f:tools/rcu/rcu-updaters.sh
-f:tools/sched/dl_bw_dump.py
-f:tools/sched/root_domains_dump.py
-f:tools/sched_ext/.gitignore
-f:tools/sched_ext/Makefile
-f:tools/sched_ext/README.md
-f:tools/sched_ext/include/bpf-compat/gnu/stubs.h
-f:tools/sched_ext/include/scx/common.bpf.h
-f:tools/sched_ext/include/scx/common.h
-f:tools/sched_ext/include/scx/compat.bpf.h
-f:tools/sched_ext/include/scx/compat.h
-f:tools/sched_ext/include/scx/enum_defs.autogen.h
-f:tools/sched_ext/include/scx/enums.autogen.bpf.h
-f:tools/sched_ext/include/scx/enums.autogen.h
-f:tools/sched_ext/include/scx/enums.bpf.h
-f:tools/sched_ext/include/scx/enums.h
-f:tools/sched_ext/include/scx/user_exit_info.h
-f:tools/sched_ext/scx_central.bpf.c
-f:tools/sched_ext/scx_central.c
-f:tools/sched_ext/scx_flatcg.bpf.c
-f:tools/sched_ext/scx_flatcg.c
-f:tools/sched_ext/scx_flatcg.h
-f:tools/sched_ext/scx_qmap.bpf.c
-f:tools/sched_ext/scx_qmap.c
-f:tools/sched_ext/scx_show_state.py
-f:tools/sched_ext/scx_simple.bpf.c
-f:tools/sched_ext/scx_simple.c
-f:tools/scripts/Makefile.arch
-f:tools/scripts/Makefile.include
-f:tools/scripts/syscall.tbl
-f:tools/scripts/utilities.mak
-f:tools/sound/dapm-graph
-f:tools/spi/.gitignore
-f:tools/spi/Build
-f:tools/spi/Makefile
-f:tools/spi/spidev_fdx.c
-f:tools/spi/spidev_test.c
-f:tools/testing/crypto/chacha20-s390/Makefile
-f:tools/testing/crypto/chacha20-s390/run-tests.sh
-f:tools/testing/crypto/chacha20-s390/test-cipher.c
-f:tools/testing/cxl/Kbuild
-f:tools/testing/cxl/config_check.c
-f:tools/testing/cxl/cxl_acpi_test.c
-f:tools/testing/cxl/cxl_core_exports.c
-f:tools/testing/cxl/cxl_core_test.c
-f:tools/testing/cxl/cxl_mem_test.c
-f:tools/testing/cxl/cxl_pmem_test.c
-f:tools/testing/cxl/cxl_port_test.c
-f:tools/testing/cxl/mock_acpi.c
-f:tools/testing/cxl/test/Kbuild
-f:tools/testing/cxl/test/cxl.c
-f:tools/testing/cxl/test/mem.c
-f:tools/testing/cxl/test/mock.c
-f:tools/testing/cxl/test/mock.h
-f:tools/testing/cxl/watermark.h
-f:tools/testing/fault-injection/failcmd.sh
-f:tools/testing/ktest/compare-ktest-sample.pl
-f:tools/testing/ktest/config-bisect.pl
-f:tools/testing/ktest/examples/README
-f:tools/testing/ktest/examples/bootconfigs/boottrace.bconf
-f:tools/testing/ktest/examples/bootconfigs/config-bootconfig
-f:tools/testing/ktest/examples/bootconfigs/functiongraph.bconf
-f:tools/testing/ktest/examples/bootconfigs/tracing.bconf
-f:tools/testing/ktest/examples/bootconfigs/verify-boottrace.sh
-f:tools/testing/ktest/examples/bootconfigs/verify-functiongraph.sh
-f:tools/testing/ktest/examples/bootconfigs/verify-tracing.sh
-f:tools/testing/ktest/examples/crosstests.conf
-f:tools/testing/ktest/examples/include/bisect.conf
-f:tools/testing/ktest/examples/include/bootconfig.conf
-f:tools/testing/ktest/examples/include/defaults.conf
-f:tools/testing/ktest/examples/include/min-config.conf
-f:tools/testing/ktest/examples/include/patchcheck.conf
-f:tools/testing/ktest/examples/include/tests.conf
-f:tools/testing/ktest/examples/kvm.conf
-f:tools/testing/ktest/examples/snowball.conf
-f:tools/testing/ktest/examples/test.conf
-f:tools/testing/ktest/examples/vmware.conf
-f:tools/testing/ktest/ktest.pl
-f:tools/testing/ktest/sample.conf
-f:tools/testing/kunit/.gitignore
-f:tools/testing/kunit/configs/all_tests.config
-f:tools/testing/kunit/configs/arch_uml.config
-f:tools/testing/kunit/configs/coverage_uml.config
-f:tools/testing/kunit/configs/default.config
-f:tools/testing/kunit/kunit.py
-f:tools/testing/kunit/kunit_config.py
-f:tools/testing/kunit/kunit_json.py
-f:tools/testing/kunit/kunit_kernel.py
-f:tools/testing/kunit/kunit_parser.py
-f:tools/testing/kunit/kunit_printer.py
-f:tools/testing/kunit/kunit_tool_test.py
-f:tools/testing/kunit/mypy.ini
-f:tools/testing/kunit/qemu_config.py
-f:tools/testing/kunit/qemu_configs/alpha.py
-f:tools/testing/kunit/qemu_configs/arm.py
-f:tools/testing/kunit/qemu_configs/arm64.py
-f:tools/testing/kunit/qemu_configs/i386.py
-f:tools/testing/kunit/qemu_configs/loongarch.py
-f:tools/testing/kunit/qemu_configs/m68k.py
-f:tools/testing/kunit/qemu_configs/powerpc.py
-f:tools/testing/kunit/qemu_configs/powerpc32.py
-f:tools/testing/kunit/qemu_configs/powerpcle.py
-f:tools/testing/kunit/qemu_configs/riscv.py
-f:tools/testing/kunit/qemu_configs/riscv32.py
-f:tools/testing/kunit/qemu_configs/s390.py
-f:tools/testing/kunit/qemu_configs/sh.py
-f:tools/testing/kunit/qemu_configs/sparc.py
-f:tools/testing/kunit/qemu_configs/sparc64.py
-f:tools/testing/kunit/qemu_configs/x86_64.py
-f:tools/testing/kunit/run_checks.py
-f:tools/testing/kunit/test_data/test_config_printk_time.log
-f:tools/testing/kunit/test_data/test_insufficient_memory.log
-f:tools/testing/kunit/test_data/test_interrupted_tap_output.log
-f:tools/testing/kunit/test_data/test_is_test_passed-all_passed.log
-f:tools/testing/kunit/test_data/test_is_test_passed-all_passed_nested.log
-f:tools/testing/kunit/test_data/test_is_test_passed-failure.log
-f:tools/testing/kunit/test_data/test_is_test_passed-kselftest.log
-f:tools/testing/kunit/test_data/test_is_test_passed-missing_plan.log
-f:tools/testing/kunit/test_data/test_is_test_passed-no_tests_no_plan.log
-f:tools/testing/kunit/test_data/test_is_test_passed-no_tests_run_no_header.log
-f:tools/testing/kunit/test_data/test_is_test_passed-no_tests_run_with_header.log
-f:tools/testing/kunit/test_data/test_kernel_panic_interrupt.log
-f:tools/testing/kunit/test_data/test_multiple_prefixes.log
-f:tools/testing/kunit/test_data/test_output_isolated_correctly.log
-f:tools/testing/kunit/test_data/test_output_with_prefix_isolated_correctly.log
-f:tools/testing/kunit/test_data/test_parse_attributes.log
-f:tools/testing/kunit/test_data/test_parse_ktap_output.log
-f:tools/testing/kunit/test_data/test_parse_subtest_header.log
-f:tools/testing/kunit/test_data/test_pound_no_prefix.log
-f:tools/testing/kunit/test_data/test_pound_sign.log
-f:tools/testing/kunit/test_data/test_read_from_file.kconfig
-f:tools/testing/kunit/test_data/test_skip_all_tests.log
-f:tools/testing/kunit/test_data/test_skip_tests.log
-f:tools/testing/kunit/test_data/test_strip_hyphen.log
-f:tools/testing/memblock/.gitignore
-f:tools/testing/memblock/Makefile
-f:tools/testing/memblock/README
-f:tools/testing/memblock/TODO
-f:tools/testing/memblock/asm/dma.h
-f:tools/testing/memblock/internal.h
-f:tools/testing/memblock/lib/slab.c
-f:tools/testing/memblock/linux/kernel.h
-f:tools/testing/memblock/linux/kmemleak.h
-f:tools/testing/memblock/linux/memory_hotplug.h
-f:tools/testing/memblock/linux/mmzone.h
-f:tools/testing/memblock/linux/mutex.h
-f:tools/testing/memblock/linux/printk.h
-f:tools/testing/memblock/main.c
-f:tools/testing/memblock/mmzone.c
-f:tools/testing/memblock/scripts/Makefile.include
-f:tools/testing/memblock/tests/alloc_api.c
-f:tools/testing/memblock/tests/alloc_api.h
-f:tools/testing/memblock/tests/alloc_exact_nid_api.c
-f:tools/testing/memblock/tests/alloc_exact_nid_api.h
-f:tools/testing/memblock/tests/alloc_helpers_api.c
-f:tools/testing/memblock/tests/alloc_helpers_api.h
-f:tools/testing/memblock/tests/alloc_nid_api.c
-f:tools/testing/memblock/tests/alloc_nid_api.h
-f:tools/testing/memblock/tests/basic_api.c
-f:tools/testing/memblock/tests/basic_api.h
-f:tools/testing/memblock/tests/common.c
-f:tools/testing/memblock/tests/common.h
-f:tools/testing/nvdimm/Kbuild
-f:tools/testing/nvdimm/Makefile
-f:tools/testing/nvdimm/acpi_nfit_test.c
-f:tools/testing/nvdimm/config_check.c
-f:tools/testing/nvdimm/dax-dev.c
-f:tools/testing/nvdimm/dax_pmem_test.c
-f:tools/testing/nvdimm/device_dax_test.c
-f:tools/testing/nvdimm/libnvdimm_test.c
-f:tools/testing/nvdimm/pmem-dax.c
-f:tools/testing/nvdimm/pmem_test.c
-f:tools/testing/nvdimm/test/Kbuild
-f:tools/testing/nvdimm/test/iomap.c
-f:tools/testing/nvdimm/test/ndtest.c
-f:tools/testing/nvdimm/test/ndtest.h
-f:tools/testing/nvdimm/test/nfit.c
-f:tools/testing/nvdimm/test/nfit_test.h
-f:tools/testing/nvdimm/watermark.h
-f:tools/testing/radix-tree/.gitignore
-f:tools/testing/radix-tree/Makefile
-f:tools/testing/radix-tree/benchmark.c
-f:tools/testing/radix-tree/idr-test.c
-f:tools/testing/radix-tree/iteration_check.c
-f:tools/testing/radix-tree/iteration_check_2.c
-f:tools/testing/radix-tree/main.c
-f:tools/testing/radix-tree/maple.c
-f:tools/testing/radix-tree/multiorder.c
-f:tools/testing/radix-tree/regression.h
-f:tools/testing/radix-tree/regression1.c
-f:tools/testing/radix-tree/regression2.c
-f:tools/testing/radix-tree/regression3.c
-f:tools/testing/radix-tree/regression4.c
-f:tools/testing/radix-tree/tag_check.c
-f:tools/testing/radix-tree/test.c
-f:tools/testing/radix-tree/test.h
-f:tools/testing/radix-tree/xarray.c
-f:tools/testing/rbtree/Makefile
-f:tools/testing/rbtree/interval_tree_test.c
-f:tools/testing/rbtree/rbtree_test.c
-f:tools/testing/rbtree/test.h
-f:tools/testing/scatterlist/Makefile
-f:tools/testing/scatterlist/linux/mm.h
-f:tools/testing/scatterlist/main.c
-f:tools/testing/selftests/.gitignore
-f:tools/testing/selftests/Makefile
-f:tools/testing/selftests/acct/.gitignore
-f:tools/testing/selftests/acct/Makefile
-f:tools/testing/selftests/acct/acct_syscall.c
-f:tools/testing/selftests/alsa/.gitignore
-f:tools/testing/selftests/alsa/Makefile
-f:tools/testing/selftests/alsa/alsa-local.h
-f:tools/testing/selftests/alsa/conf.c
-f:tools/testing/selftests/alsa/conf.d/Lenovo_ThinkPad_P1_Gen2.conf
-f:tools/testing/selftests/alsa/global-timer.c
-f:tools/testing/selftests/alsa/mixer-test.c
-f:tools/testing/selftests/alsa/pcm-test.c
-f:tools/testing/selftests/alsa/pcm-test.conf
-f:tools/testing/selftests/alsa/test-pcmtest-driver.c
-f:tools/testing/selftests/alsa/utimer-test.c
-f:tools/testing/selftests/amd-pstate/Makefile
-f:tools/testing/selftests/amd-pstate/basic.sh
-f:tools/testing/selftests/amd-pstate/config
-f:tools/testing/selftests/amd-pstate/gitsource.sh
-f:tools/testing/selftests/amd-pstate/run.sh
-f:tools/testing/selftests/amd-pstate/tbench.sh
-f:tools/testing/selftests/arm64/Makefile
-f:tools/testing/selftests/arm64/README
-f:tools/testing/selftests/arm64/abi/.gitignore
-f:tools/testing/selftests/arm64/abi/Makefile
-f:tools/testing/selftests/arm64/abi/hwcap.c
-f:tools/testing/selftests/arm64/abi/ptrace.c
-f:tools/testing/selftests/arm64/abi/syscall-abi-asm.S
-f:tools/testing/selftests/arm64/abi/syscall-abi.c
-f:tools/testing/selftests/arm64/abi/syscall-abi.h
-f:tools/testing/selftests/arm64/abi/tpidr2.c
-f:tools/testing/selftests/arm64/bti/.gitignore
-f:tools/testing/selftests/arm64/bti/Makefile
-f:tools/testing/selftests/arm64/bti/assembler.h
-f:tools/testing/selftests/arm64/bti/btitest.h
-f:tools/testing/selftests/arm64/bti/signal.c
-f:tools/testing/selftests/arm64/bti/signal.h
-f:tools/testing/selftests/arm64/bti/start.S
-f:tools/testing/selftests/arm64/bti/syscall.S
-f:tools/testing/selftests/arm64/bti/system.c
-f:tools/testing/selftests/arm64/bti/system.h
-f:tools/testing/selftests/arm64/bti/test.c
-f:tools/testing/selftests/arm64/bti/teststubs.S
-f:tools/testing/selftests/arm64/bti/trampoline.S
-f:tools/testing/selftests/arm64/fp/.gitignore
-f:tools/testing/selftests/arm64/fp/Makefile
-f:tools/testing/selftests/arm64/fp/README
-f:tools/testing/selftests/arm64/fp/TODO
-f:tools/testing/selftests/arm64/fp/asm-offsets.h
-f:tools/testing/selftests/arm64/fp/asm-utils.S
-f:tools/testing/selftests/arm64/fp/assembler.h
-f:tools/testing/selftests/arm64/fp/fp-pidbench.S
-f:tools/testing/selftests/arm64/fp/fp-ptrace-asm.S
-f:tools/testing/selftests/arm64/fp/fp-ptrace.c
-f:tools/testing/selftests/arm64/fp/fp-ptrace.h
-f:tools/testing/selftests/arm64/fp/fp-stress.c
-f:tools/testing/selftests/arm64/fp/fpsimd-stress
-f:tools/testing/selftests/arm64/fp/fpsimd-test.S
-f:tools/testing/selftests/arm64/fp/kernel-test.c
-f:tools/testing/selftests/arm64/fp/rdvl-sme.c
-f:tools/testing/selftests/arm64/fp/rdvl-sve.c
-f:tools/testing/selftests/arm64/fp/rdvl.S
-f:tools/testing/selftests/arm64/fp/rdvl.h
-f:tools/testing/selftests/arm64/fp/sme-inst.h
-f:tools/testing/selftests/arm64/fp/ssve-stress
-f:tools/testing/selftests/arm64/fp/sve-probe-vls.c
-f:tools/testing/selftests/arm64/fp/sve-ptrace.c
-f:tools/testing/selftests/arm64/fp/sve-stress
-f:tools/testing/selftests/arm64/fp/sve-test.S
-f:tools/testing/selftests/arm64/fp/vec-syscfg.c
-f:tools/testing/selftests/arm64/fp/vlset.c
-f:tools/testing/selftests/arm64/fp/za-fork-asm.S
-f:tools/testing/selftests/arm64/fp/za-fork.c
-f:tools/testing/selftests/arm64/fp/za-ptrace.c
-f:tools/testing/selftests/arm64/fp/za-stress
-f:tools/testing/selftests/arm64/fp/za-test.S
-f:tools/testing/selftests/arm64/fp/zt-ptrace.c
-f:tools/testing/selftests/arm64/fp/zt-test.S
-f:tools/testing/selftests/arm64/gcs/.gitignore
-f:tools/testing/selftests/arm64/gcs/Makefile
-f:tools/testing/selftests/arm64/gcs/asm-offsets.h
-f:tools/testing/selftests/arm64/gcs/basic-gcs.c
-f:tools/testing/selftests/arm64/gcs/gcs-locking.c
-f:tools/testing/selftests/arm64/gcs/gcs-stress-thread.S
-f:tools/testing/selftests/arm64/gcs/gcs-stress.c
-f:tools/testing/selftests/arm64/gcs/gcs-util.h
-f:tools/testing/selftests/arm64/gcs/gcspushm.S
-f:tools/testing/selftests/arm64/gcs/gcsstr.S
-f:tools/testing/selftests/arm64/gcs/libc-gcs.c
-f:tools/testing/selftests/arm64/mte/.gitignore
-f:tools/testing/selftests/arm64/mte/Makefile
-f:tools/testing/selftests/arm64/mte/check_buffer_fill.c
-f:tools/testing/selftests/arm64/mte/check_child_memory.c
-f:tools/testing/selftests/arm64/mte/check_gcr_el1_cswitch.c
-f:tools/testing/selftests/arm64/mte/check_hugetlb_options.c
-f:tools/testing/selftests/arm64/mte/check_ksm_options.c
-f:tools/testing/selftests/arm64/mte/check_mmap_options.c
-f:tools/testing/selftests/arm64/mte/check_prctl.c
-f:tools/testing/selftests/arm64/mte/check_tags_inclusion.c
-f:tools/testing/selftests/arm64/mte/check_user_mem.c
-f:tools/testing/selftests/arm64/mte/mte_common_util.c
-f:tools/testing/selftests/arm64/mte/mte_common_util.h
-f:tools/testing/selftests/arm64/mte/mte_def.h
-f:tools/testing/selftests/arm64/mte/mte_helper.S
-f:tools/testing/selftests/arm64/pauth/.gitignore
-f:tools/testing/selftests/arm64/pauth/Makefile
-f:tools/testing/selftests/arm64/pauth/exec_target.c
-f:tools/testing/selftests/arm64/pauth/helper.c
-f:tools/testing/selftests/arm64/pauth/helper.h
-f:tools/testing/selftests/arm64/pauth/pac.c
-f:tools/testing/selftests/arm64/pauth/pac_corruptor.S
-f:tools/testing/selftests/arm64/signal/.gitignore
-f:tools/testing/selftests/arm64/signal/Makefile
-f:tools/testing/selftests/arm64/signal/README
-f:tools/testing/selftests/arm64/signal/signals.S
-f:tools/testing/selftests/arm64/signal/sve_helpers.c
-f:tools/testing/selftests/arm64/signal/sve_helpers.h
-f:tools/testing/selftests/arm64/signal/test_signals.c
-f:tools/testing/selftests/arm64/signal/test_signals.h
-f:tools/testing/selftests/arm64/signal/test_signals_utils.c
-f:tools/testing/selftests/arm64/signal/test_signals_utils.h
-f:tools/testing/selftests/arm64/signal/testcases/TODO
-f:tools/testing/selftests/arm64/signal/testcases/fake_sigreturn_bad_magic.c
-f:tools/testing/selftests/arm64/signal/testcases/fake_sigreturn_bad_size.c
-f:tools/testing/selftests/arm64/signal/testcases/fake_sigreturn_bad_size_for_magic0.c
-f:tools/testing/selftests/arm64/signal/testcases/fake_sigreturn_duplicated_fpsimd.c
-f:tools/testing/selftests/arm64/signal/testcases/fake_sigreturn_misaligned_sp.c
-f:tools/testing/selftests/arm64/signal/testcases/fake_sigreturn_missing_fpsimd.c
-f:tools/testing/selftests/arm64/signal/testcases/fake_sigreturn_sme_change_vl.c
-f:tools/testing/selftests/arm64/signal/testcases/fake_sigreturn_sve_change_vl.c
-f:tools/testing/selftests/arm64/signal/testcases/fpmr_siginfo.c
-f:tools/testing/selftests/arm64/signal/testcases/gcs_exception_fault.c
-f:tools/testing/selftests/arm64/signal/testcases/gcs_frame.c
-f:tools/testing/selftests/arm64/signal/testcases/gcs_write_fault.c
-f:tools/testing/selftests/arm64/signal/testcases/mangle_pstate_invalid_compat_toggle.c
-f:tools/testing/selftests/arm64/signal/testcases/mangle_pstate_invalid_daif_bits.c
-f:tools/testing/selftests/arm64/signal/testcases/mangle_pstate_invalid_mode_el1h.c
-f:tools/testing/selftests/arm64/signal/testcases/mangle_pstate_invalid_mode_el1t.c
-f:tools/testing/selftests/arm64/signal/testcases/mangle_pstate_invalid_mode_el2h.c
-f:tools/testing/selftests/arm64/signal/testcases/mangle_pstate_invalid_mode_el2t.c
-f:tools/testing/selftests/arm64/signal/testcases/mangle_pstate_invalid_mode_el3h.c
-f:tools/testing/selftests/arm64/signal/testcases/mangle_pstate_invalid_mode_el3t.c
-f:tools/testing/selftests/arm64/signal/testcases/mangle_pstate_invalid_mode_template.h
-f:tools/testing/selftests/arm64/signal/testcases/poe_siginfo.c
-f:tools/testing/selftests/arm64/signal/testcases/sme_trap_no_sm.c
-f:tools/testing/selftests/arm64/signal/testcases/sme_trap_non_streaming.c
-f:tools/testing/selftests/arm64/signal/testcases/sme_trap_za.c
-f:tools/testing/selftests/arm64/signal/testcases/sme_vl.c
-f:tools/testing/selftests/arm64/signal/testcases/ssve_regs.c
-f:tools/testing/selftests/arm64/signal/testcases/ssve_za_regs.c
-f:tools/testing/selftests/arm64/signal/testcases/sve_regs.c
-f:tools/testing/selftests/arm64/signal/testcases/sve_vl.c
-f:tools/testing/selftests/arm64/signal/testcases/testcases.c
-f:tools/testing/selftests/arm64/signal/testcases/testcases.h
-f:tools/testing/selftests/arm64/signal/testcases/tpidr2_restore.c
-f:tools/testing/selftests/arm64/signal/testcases/tpidr2_siginfo.c
-f:tools/testing/selftests/arm64/signal/testcases/za_no_regs.c
-f:tools/testing/selftests/arm64/signal/testcases/za_regs.c
-f:tools/testing/selftests/arm64/signal/testcases/zt_no_regs.c
-f:tools/testing/selftests/arm64/signal/testcases/zt_regs.c
-f:tools/testing/selftests/arm64/tags/.gitignore
-f:tools/testing/selftests/arm64/tags/Makefile
-f:tools/testing/selftests/arm64/tags/tags_test.c
-f:tools/testing/selftests/bpf/.gitignore
-f:tools/testing/selftests/bpf/DENYLIST
-f:tools/testing/selftests/bpf/DENYLIST.riscv64
-f:tools/testing/selftests/bpf/DENYLIST.s390x
-f:tools/testing/selftests/bpf/Makefile
-f:tools/testing/selftests/bpf/Makefile.docs
-f:tools/testing/selftests/bpf/README.rst
-f:tools/testing/selftests/bpf/autoconf_helper.h
-f:tools/testing/selftests/bpf/bench.c
-f:tools/testing/selftests/bpf/bench.h
-f:tools/testing/selftests/bpf/benchs/bench_bloom_filter_map.c
-f:tools/testing/selftests/bpf/benchs/bench_bpf_crypto.c
-f:tools/testing/selftests/bpf/benchs/bench_bpf_hashmap_full_update.c
-f:tools/testing/selftests/bpf/benchs/bench_bpf_hashmap_lookup.c
-f:tools/testing/selftests/bpf/benchs/bench_bpf_loop.c
-f:tools/testing/selftests/bpf/benchs/bench_count.c
-f:tools/testing/selftests/bpf/benchs/bench_htab_mem.c
-f:tools/testing/selftests/bpf/benchs/bench_local_storage.c
-f:tools/testing/selftests/bpf/benchs/bench_local_storage_create.c
-f:tools/testing/selftests/bpf/benchs/bench_local_storage_rcu_tasks_trace.c
-f:tools/testing/selftests/bpf/benchs/bench_rename.c
-f:tools/testing/selftests/bpf/benchs/bench_ringbufs.c
-f:tools/testing/selftests/bpf/benchs/bench_sockmap.c
-f:tools/testing/selftests/bpf/benchs/bench_strncmp.c
-f:tools/testing/selftests/bpf/benchs/bench_trigger.c
-f:tools/testing/selftests/bpf/benchs/run_bench_bloom_filter_map.sh
-f:tools/testing/selftests/bpf/benchs/run_bench_bpf_hashmap_full_update.sh
-f:tools/testing/selftests/bpf/benchs/run_bench_bpf_loop.sh
-f:tools/testing/selftests/bpf/benchs/run_bench_htab_mem.sh
-f:tools/testing/selftests/bpf/benchs/run_bench_local_storage.sh
-f:tools/testing/selftests/bpf/benchs/run_bench_local_storage_rcu_tasks_trace.sh
-f:tools/testing/selftests/bpf/benchs/run_bench_rename.sh
-f:tools/testing/selftests/bpf/benchs/run_bench_ringbufs.sh
-f:tools/testing/selftests/bpf/benchs/run_bench_strncmp.sh
-f:tools/testing/selftests/bpf/benchs/run_bench_trigger.sh
-f:tools/testing/selftests/bpf/benchs/run_bench_uprobes.sh
-f:tools/testing/selftests/bpf/benchs/run_common.sh
-f:tools/testing/selftests/bpf/bpf_arena_alloc.h
-f:tools/testing/selftests/bpf/bpf_arena_common.h
-f:tools/testing/selftests/bpf/bpf_arena_htab.h
-f:tools/testing/selftests/bpf/bpf_arena_list.h
-f:tools/testing/selftests/bpf/bpf_atomic.h
-f:tools/testing/selftests/bpf/bpf_experimental.h
-f:tools/testing/selftests/bpf/bpf_kfuncs.h
-f:tools/testing/selftests/bpf/bpf_legacy.h
-f:tools/testing/selftests/bpf/bpf_rand.h
-f:tools/testing/selftests/bpf/bpf_sockopt_helpers.h
-f:tools/testing/selftests/bpf/bpf_util.h
-f:tools/testing/selftests/bpf/btf_helpers.c
-f:tools/testing/selftests/bpf/btf_helpers.h
-f:tools/testing/selftests/bpf/cap_helpers.c
-f:tools/testing/selftests/bpf/cap_helpers.h
-f:tools/testing/selftests/bpf/cgroup_getset_retval_hooks.h
-f:tools/testing/selftests/bpf/cgroup_helpers.c
-f:tools/testing/selftests/bpf/cgroup_helpers.h
-f:tools/testing/selftests/bpf/cgroup_tcp_skb.h
-f:tools/testing/selftests/bpf/config
-f:tools/testing/selftests/bpf/config.aarch64
-f:tools/testing/selftests/bpf/config.ppc64el
-f:tools/testing/selftests/bpf/config.riscv64
-f:tools/testing/selftests/bpf/config.s390x
-f:tools/testing/selftests/bpf/config.vm
-f:tools/testing/selftests/bpf/config.x86_64
-f:tools/testing/selftests/bpf/disasm_helpers.c
-f:tools/testing/selftests/bpf/disasm_helpers.h
-f:tools/testing/selftests/bpf/flow_dissector_load.c
-f:tools/testing/selftests/bpf/flow_dissector_load.h
-f:tools/testing/selftests/bpf/generate_udp_fragments.py
-f:tools/testing/selftests/bpf/gnu/stubs.h
-f:tools/testing/selftests/bpf/ima_setup.sh
-f:tools/testing/selftests/bpf/io_helpers.c
-f:tools/testing/selftests/bpf/io_helpers.h
-f:tools/testing/selftests/bpf/ip_check_defrag_frags.h
-f:tools/testing/selftests/bpf/jit_disasm_helpers.c
-f:tools/testing/selftests/bpf/jit_disasm_helpers.h
-f:tools/testing/selftests/bpf/liburandom_read.map
-f:tools/testing/selftests/bpf/map_tests/.gitignore
-f:tools/testing/selftests/bpf/map_tests/array_map_batch_ops.c
-f:tools/testing/selftests/bpf/map_tests/htab_map_batch_ops.c
-f:tools/testing/selftests/bpf/map_tests/lpm_trie_map_basic_ops.c
-f:tools/testing/selftests/bpf/map_tests/lpm_trie_map_batch_ops.c
-f:tools/testing/selftests/bpf/map_tests/lpm_trie_map_get_next_key.c
-f:tools/testing/selftests/bpf/map_tests/map_in_map_batch_ops.c
-f:tools/testing/selftests/bpf/map_tests/map_percpu_stats.c
-f:tools/testing/selftests/bpf/map_tests/sk_storage_map.c
-f:tools/testing/selftests/bpf/map_tests/task_storage_map.c
-f:tools/testing/selftests/bpf/netcnt_common.h
-f:tools/testing/selftests/bpf/netlink_helpers.c
-f:tools/testing/selftests/bpf/netlink_helpers.h
-f:tools/testing/selftests/bpf/network_helpers.c
-f:tools/testing/selftests/bpf/network_helpers.h
-f:tools/testing/selftests/bpf/prog_tests/.gitignore
-f:tools/testing/selftests/bpf/prog_tests/access_variable_array.c
-f:tools/testing/selftests/bpf/prog_tests/align.c
-f:tools/testing/selftests/bpf/prog_tests/arena_atomics.c
-f:tools/testing/selftests/bpf/prog_tests/arena_htab.c
-f:tools/testing/selftests/bpf/prog_tests/arena_list.c
-f:tools/testing/selftests/bpf/prog_tests/arena_spin_lock.c
-f:tools/testing/selftests/bpf/prog_tests/arg_parsing.c
-f:tools/testing/selftests/bpf/prog_tests/assign_reuse.c
-f:tools/testing/selftests/bpf/prog_tests/async_stack_depth.c
-f:tools/testing/selftests/bpf/prog_tests/atomic_bounds.c
-f:tools/testing/selftests/bpf/prog_tests/atomics.c
-f:tools/testing/selftests/bpf/prog_tests/attach_probe.c
-f:tools/testing/selftests/bpf/prog_tests/autoattach.c
-f:tools/testing/selftests/bpf/prog_tests/autoload.c
-f:tools/testing/selftests/bpf/prog_tests/bad_struct_ops.c
-f:tools/testing/selftests/bpf/prog_tests/bind_perm.c
-f:tools/testing/selftests/bpf/prog_tests/bloom_filter_map.c
-f:tools/testing/selftests/bpf/prog_tests/bpf_cookie.c
-f:tools/testing/selftests/bpf/prog_tests/bpf_iter.c
-f:tools/testing/selftests/bpf/prog_tests/bpf_iter_setsockopt.c
-f:tools/testing/selftests/bpf/prog_tests/bpf_iter_setsockopt_unix.c
-f:tools/testing/selftests/bpf/prog_tests/bpf_loop.c
-f:tools/testing/selftests/bpf/prog_tests/bpf_mod_race.c
-f:tools/testing/selftests/bpf/prog_tests/bpf_nf.c
-f:tools/testing/selftests/bpf/prog_tests/bpf_obj_id.c
-f:tools/testing/selftests/bpf/prog_tests/bpf_obj_pinning.c
-f:tools/testing/selftests/bpf/prog_tests/bpf_qdisc.c
-f:tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c
-f:tools/testing/selftests/bpf/prog_tests/bpf_verif_scale.c
-f:tools/testing/selftests/bpf/prog_tests/btf.c
-f:tools/testing/selftests/bpf/prog_tests/btf_dedup_split.c
-f:tools/testing/selftests/bpf/prog_tests/btf_distill.c
-f:tools/testing/selftests/bpf/prog_tests/btf_dump.c
-f:tools/testing/selftests/bpf/prog_tests/btf_endian.c
-f:tools/testing/selftests/bpf/prog_tests/btf_field_iter.c
-f:tools/testing/selftests/bpf/prog_tests/btf_map_in_map.c
-f:tools/testing/selftests/bpf/prog_tests/btf_module.c
-f:tools/testing/selftests/bpf/prog_tests/btf_skc_cls_ingress.c
-f:tools/testing/selftests/bpf/prog_tests/btf_split.c
-f:tools/testing/selftests/bpf/prog_tests/btf_sysfs.c
-f:tools/testing/selftests/bpf/prog_tests/btf_tag.c
-f:tools/testing/selftests/bpf/prog_tests/btf_write.c
-f:tools/testing/selftests/bpf/prog_tests/build_id.c
-f:tools/testing/selftests/bpf/prog_tests/cb_refs.c
-f:tools/testing/selftests/bpf/prog_tests/cg_storage_multi.c
-f:tools/testing/selftests/bpf/prog_tests/cgroup1_hierarchy.c
-f:tools/testing/selftests/bpf/prog_tests/cgroup_ancestor.c
-f:tools/testing/selftests/bpf/prog_tests/cgroup_attach_autodetach.c
-f:tools/testing/selftests/bpf/prog_tests/cgroup_attach_multi.c
-f:tools/testing/selftests/bpf/prog_tests/cgroup_attach_override.c
-f:tools/testing/selftests/bpf/prog_tests/cgroup_dev.c
-f:tools/testing/selftests/bpf/prog_tests/cgroup_get_current_cgroup_id.c
-f:tools/testing/selftests/bpf/prog_tests/cgroup_getset_retval.c
-f:tools/testing/selftests/bpf/prog_tests/cgroup_hierarchical_stats.c
-f:tools/testing/selftests/bpf/prog_tests/cgroup_iter.c
-f:tools/testing/selftests/bpf/prog_tests/cgroup_link.c
-f:tools/testing/selftests/bpf/prog_tests/cgroup_mprog_opts.c
-f:tools/testing/selftests/bpf/prog_tests/cgroup_mprog_ordering.c
-f:tools/testing/selftests/bpf/prog_tests/cgroup_preorder.c
-f:tools/testing/selftests/bpf/prog_tests/cgroup_skb_direct_packet_access.c
-f:tools/testing/selftests/bpf/prog_tests/cgroup_skb_sk_lookup.c
-f:tools/testing/selftests/bpf/prog_tests/cgroup_storage.c
-f:tools/testing/selftests/bpf/prog_tests/cgroup_tcp_skb.c
-f:tools/testing/selftests/bpf/prog_tests/cgroup_v1v2.c
-f:tools/testing/selftests/bpf/prog_tests/cgroup_xattr.c
-f:tools/testing/selftests/bpf/prog_tests/cgrp_kfunc.c
-f:tools/testing/selftests/bpf/prog_tests/cgrp_local_storage.c
-f:tools/testing/selftests/bpf/prog_tests/check_mtu.c
-f:tools/testing/selftests/bpf/prog_tests/cls_redirect.c
-f:tools/testing/selftests/bpf/prog_tests/compute_live_registers.c
-f:tools/testing/selftests/bpf/prog_tests/connect_force_port.c
-f:tools/testing/selftests/bpf/prog_tests/connect_ping.c
-f:tools/testing/selftests/bpf/prog_tests/core_autosize.c
-f:tools/testing/selftests/bpf/prog_tests/core_extern.c
-f:tools/testing/selftests/bpf/prog_tests/core_kern.c
-f:tools/testing/selftests/bpf/prog_tests/core_kern_overflow.c
-f:tools/testing/selftests/bpf/prog_tests/core_read_macros.c
-f:tools/testing/selftests/bpf/prog_tests/core_reloc.c
-f:tools/testing/selftests/bpf/prog_tests/core_reloc_raw.c
-f:tools/testing/selftests/bpf/prog_tests/core_retro.c
-f:tools/testing/selftests/bpf/prog_tests/cpu_mask.c
-f:tools/testing/selftests/bpf/prog_tests/cpumask.c
-f:tools/testing/selftests/bpf/prog_tests/crypto_sanity.c
-f:tools/testing/selftests/bpf/prog_tests/ctx_rewrite.c
-f:tools/testing/selftests/bpf/prog_tests/custom_sec_handlers.c
-f:tools/testing/selftests/bpf/prog_tests/d_path.c
-f:tools/testing/selftests/bpf/prog_tests/decap_sanity.c
-f:tools/testing/selftests/bpf/prog_tests/deny_namespace.c
-f:tools/testing/selftests/bpf/prog_tests/dmabuf_iter.c
-f:tools/testing/selftests/bpf/prog_tests/dummy_st_ops.c
-f:tools/testing/selftests/bpf/prog_tests/dynptr.c
-f:tools/testing/selftests/bpf/prog_tests/empty_skb.c
-f:tools/testing/selftests/bpf/prog_tests/enable_stats.c
-f:tools/testing/selftests/bpf/prog_tests/endian.c
-f:tools/testing/selftests/bpf/prog_tests/exceptions.c
-f:tools/testing/selftests/bpf/prog_tests/exhandler.c
-f:tools/testing/selftests/bpf/prog_tests/fd_array.c
-f:tools/testing/selftests/bpf/prog_tests/fd_htab_lookup.c
-f:tools/testing/selftests/bpf/prog_tests/fentry_fexit.c
-f:tools/testing/selftests/bpf/prog_tests/fentry_test.c
-f:tools/testing/selftests/bpf/prog_tests/fexit_bpf2bpf.c
-f:tools/testing/selftests/bpf/prog_tests/fexit_sleep.c
-f:tools/testing/selftests/bpf/prog_tests/fexit_stress.c
-f:tools/testing/selftests/bpf/prog_tests/fexit_test.c
-f:tools/testing/selftests/bpf/prog_tests/fib_lookup.c
-f:tools/testing/selftests/bpf/prog_tests/fill_link_info.c
-f:tools/testing/selftests/bpf/prog_tests/find_vma.c
-f:tools/testing/selftests/bpf/prog_tests/flow_dissector.c
-f:tools/testing/selftests/bpf/prog_tests/flow_dissector_classification.c
-f:tools/testing/selftests/bpf/prog_tests/flow_dissector_load_bytes.c
-f:tools/testing/selftests/bpf/prog_tests/flow_dissector_reattach.c
-f:tools/testing/selftests/bpf/prog_tests/for_each.c
-f:tools/testing/selftests/bpf/prog_tests/free_timer.c
-f:tools/testing/selftests/bpf/prog_tests/fs_kfuncs.c
-f:tools/testing/selftests/bpf/prog_tests/get_branch_snapshot.c
-f:tools/testing/selftests/bpf/prog_tests/get_func_args_test.c
-f:tools/testing/selftests/bpf/prog_tests/get_func_ip_test.c
-f:tools/testing/selftests/bpf/prog_tests/get_stack_raw_tp.c
-f:tools/testing/selftests/bpf/prog_tests/get_stackid_cannot_attach.c
-f:tools/testing/selftests/bpf/prog_tests/global_data.c
-f:tools/testing/selftests/bpf/prog_tests/global_data_init.c
-f:tools/testing/selftests/bpf/prog_tests/global_func_args.c
-f:tools/testing/selftests/bpf/prog_tests/global_func_dead_code.c
-f:tools/testing/selftests/bpf/prog_tests/global_map_resize.c
-f:tools/testing/selftests/bpf/prog_tests/hash_large_key.c
-f:tools/testing/selftests/bpf/prog_tests/hashmap.c
-f:tools/testing/selftests/bpf/prog_tests/helper_restricted.c
-f:tools/testing/selftests/bpf/prog_tests/htab_reuse.c
-f:tools/testing/selftests/bpf/prog_tests/htab_update.c
-f:tools/testing/selftests/bpf/prog_tests/inner_array_lookup.c
-f:tools/testing/selftests/bpf/prog_tests/ip_check_defrag.c
-f:tools/testing/selftests/bpf/prog_tests/iters.c
-f:tools/testing/selftests/bpf/prog_tests/jeq_infer_not_null.c
-f:tools/testing/selftests/bpf/prog_tests/jit_probe_mem.c
-f:tools/testing/selftests/bpf/prog_tests/kernel_flag.c
-f:tools/testing/selftests/bpf/prog_tests/kfree_skb.c
-f:tools/testing/selftests/bpf/prog_tests/kfunc_call.c
-f:tools/testing/selftests/bpf/prog_tests/kfunc_dynptr_param.c
-f:tools/testing/selftests/bpf/prog_tests/kfunc_module_order.c
-f:tools/testing/selftests/bpf/prog_tests/kfunc_param_nullable.c
-f:tools/testing/selftests/bpf/prog_tests/kmem_cache_iter.c
-f:tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c
-f:tools/testing/selftests/bpf/prog_tests/kprobe_multi_testmod_test.c
-f:tools/testing/selftests/bpf/prog_tests/kptr_xchg_inline.c
-f:tools/testing/selftests/bpf/prog_tests/ksyms.c
-f:tools/testing/selftests/bpf/prog_tests/ksyms_btf.c
-f:tools/testing/selftests/bpf/prog_tests/ksyms_module.c
-f:tools/testing/selftests/bpf/prog_tests/l4lb_all.c
-f:tools/testing/selftests/bpf/prog_tests/legacy_printk.c
-f:tools/testing/selftests/bpf/prog_tests/libbpf_get_fd_by_id_opts.c
-f:tools/testing/selftests/bpf/prog_tests/libbpf_probes.c
-f:tools/testing/selftests/bpf/prog_tests/libbpf_str.c
-f:tools/testing/selftests/bpf/prog_tests/link_pinning.c
-f:tools/testing/selftests/bpf/prog_tests/linked_funcs.c
-f:tools/testing/selftests/bpf/prog_tests/linked_list.c
-f:tools/testing/selftests/bpf/prog_tests/linked_maps.c
-f:tools/testing/selftests/bpf/prog_tests/linked_vars.c
-f:tools/testing/selftests/bpf/prog_tests/load_bytes_relative.c
-f:tools/testing/selftests/bpf/prog_tests/local_kptr_stash.c
-f:tools/testing/selftests/bpf/prog_tests/log_buf.c
-f:tools/testing/selftests/bpf/prog_tests/log_fixup.c
-f:tools/testing/selftests/bpf/prog_tests/lookup_and_delete.c
-f:tools/testing/selftests/bpf/prog_tests/lookup_key.c
-f:tools/testing/selftests/bpf/prog_tests/lru_bug.c
-f:tools/testing/selftests/bpf/prog_tests/lsm_cgroup.c
-f:tools/testing/selftests/bpf/prog_tests/lwt_helpers.h
-f:tools/testing/selftests/bpf/prog_tests/lwt_ip_encap.c
-f:tools/testing/selftests/bpf/prog_tests/lwt_redirect.c
-f:tools/testing/selftests/bpf/prog_tests/lwt_reroute.c
-f:tools/testing/selftests/bpf/prog_tests/lwt_seg6local.c
-f:tools/testing/selftests/bpf/prog_tests/map_btf.c
-f:tools/testing/selftests/bpf/prog_tests/map_in_map.c
-f:tools/testing/selftests/bpf/prog_tests/map_init.c
-f:tools/testing/selftests/bpf/prog_tests/map_kptr.c
-f:tools/testing/selftests/bpf/prog_tests/map_lock.c
-f:tools/testing/selftests/bpf/prog_tests/map_lookup_percpu_elem.c
-f:tools/testing/selftests/bpf/prog_tests/map_ops.c
-f:tools/testing/selftests/bpf/prog_tests/map_ptr.c
-f:tools/testing/selftests/bpf/prog_tests/mem_rdonly_untrusted.c
-f:tools/testing/selftests/bpf/prog_tests/metadata.c
-f:tools/testing/selftests/bpf/prog_tests/migrate_reuseport.c
-f:tools/testing/selftests/bpf/prog_tests/missed.c
-f:tools/testing/selftests/bpf/prog_tests/mmap.c
-f:tools/testing/selftests/bpf/prog_tests/modify_return.c
-f:tools/testing/selftests/bpf/prog_tests/module_attach.c
-f:tools/testing/selftests/bpf/prog_tests/module_fentry_shadow.c
-f:tools/testing/selftests/bpf/prog_tests/mptcp.c
-f:tools/testing/selftests/bpf/prog_tests/nested_trust.c
-f:tools/testing/selftests/bpf/prog_tests/net_timestamping.c
-f:tools/testing/selftests/bpf/prog_tests/netcnt.c
-f:tools/testing/selftests/bpf/prog_tests/netfilter_link_attach.c
-f:tools/testing/selftests/bpf/prog_tests/netns_cookie.c
-f:tools/testing/selftests/bpf/prog_tests/ns_current_pid_tgid.c
-f:tools/testing/selftests/bpf/prog_tests/obj_name.c
-f:tools/testing/selftests/bpf/prog_tests/parse_tcp_hdr_opt.c
-f:tools/testing/selftests/bpf/prog_tests/pe_preserve_elems.c
-f:tools/testing/selftests/bpf/prog_tests/percpu_alloc.c
-f:tools/testing/selftests/bpf/prog_tests/perf_branches.c
-f:tools/testing/selftests/bpf/prog_tests/perf_buffer.c
-f:tools/testing/selftests/bpf/prog_tests/perf_event_stackmap.c
-f:tools/testing/selftests/bpf/prog_tests/perf_link.c
-f:tools/testing/selftests/bpf/prog_tests/perf_skip.c
-f:tools/testing/selftests/bpf/prog_tests/pinning.c
-f:tools/testing/selftests/bpf/prog_tests/pkt_access.c
-f:tools/testing/selftests/bpf/prog_tests/pkt_md_access.c
-f:tools/testing/selftests/bpf/prog_tests/preempt_lock.c
-f:tools/testing/selftests/bpf/prog_tests/preempted_bpf_ma_op.c
-f:tools/testing/selftests/bpf/prog_tests/prepare.c
-f:tools/testing/selftests/bpf/prog_tests/pro_epilogue.c
-f:tools/testing/selftests/bpf/prog_tests/probe_read_user_str.c
-f:tools/testing/selftests/bpf/prog_tests/probe_user.c
-f:tools/testing/selftests/bpf/prog_tests/prog_array_init.c
-f:tools/testing/selftests/bpf/prog_tests/prog_run_opts.c
-f:tools/testing/selftests/bpf/prog_tests/prog_tests_framework.c
-f:tools/testing/selftests/bpf/prog_tests/ptr_untrusted.c
-f:tools/testing/selftests/bpf/prog_tests/queue_stack_map.c
-f:tools/testing/selftests/bpf/prog_tests/raw_tp_null.c
-f:tools/testing/selftests/bpf/prog_tests/raw_tp_test_run.c
-f:tools/testing/selftests/bpf/prog_tests/raw_tp_writable_reject_nbd_invalid.c
-f:tools/testing/selftests/bpf/prog_tests/raw_tp_writable_test_run.c
-f:tools/testing/selftests/bpf/prog_tests/rbtree.c
-f:tools/testing/selftests/bpf/prog_tests/rcu_read_lock.c
-f:tools/testing/selftests/bpf/prog_tests/rdonly_maps.c
-f:tools/testing/selftests/bpf/prog_tests/read_vsyscall.c
-f:tools/testing/selftests/bpf/prog_tests/recursion.c
-f:tools/testing/selftests/bpf/prog_tests/recursive_attach.c
-f:tools/testing/selftests/bpf/prog_tests/refcounted_kptr.c
-f:tools/testing/selftests/bpf/prog_tests/reference_tracking.c
-f:tools/testing/selftests/bpf/prog_tests/reg_bounds.c
-f:tools/testing/selftests/bpf/prog_tests/res_spin_lock.c
-f:tools/testing/selftests/bpf/prog_tests/resolve_btfids.c
-f:tools/testing/selftests/bpf/prog_tests/ringbuf.c
-f:tools/testing/selftests/bpf/prog_tests/ringbuf_multi.c
-f:tools/testing/selftests/bpf/prog_tests/section_names.c
-f:tools/testing/selftests/bpf/prog_tests/select_reuseport.c
-f:tools/testing/selftests/bpf/prog_tests/send_signal.c
-f:tools/testing/selftests/bpf/prog_tests/send_signal_sched_switch.c
-f:tools/testing/selftests/bpf/prog_tests/setget_sockopt.c
-f:tools/testing/selftests/bpf/prog_tests/signal_pending.c
-f:tools/testing/selftests/bpf/prog_tests/sk_assign.c
-f:tools/testing/selftests/bpf/prog_tests/sk_lookup.c
-f:tools/testing/selftests/bpf/prog_tests/sk_storage_omem_uncharge.c
-f:tools/testing/selftests/bpf/prog_tests/sk_storage_tracing.c
-f:tools/testing/selftests/bpf/prog_tests/skb_ctx.c
-f:tools/testing/selftests/bpf/prog_tests/skb_helpers.c
-f:tools/testing/selftests/bpf/prog_tests/skb_load_bytes.c
-f:tools/testing/selftests/bpf/prog_tests/skc_to_unix_sock.c
-f:tools/testing/selftests/bpf/prog_tests/skeleton.c
-f:tools/testing/selftests/bpf/prog_tests/snprintf.c
-f:tools/testing/selftests/bpf/prog_tests/snprintf_btf.c
-f:tools/testing/selftests/bpf/prog_tests/sock_addr.c
-f:tools/testing/selftests/bpf/prog_tests/sock_create.c
-f:tools/testing/selftests/bpf/prog_tests/sock_destroy.c
-f:tools/testing/selftests/bpf/prog_tests/sock_fields.c
-f:tools/testing/selftests/bpf/prog_tests/sock_iter_batch.c
-f:tools/testing/selftests/bpf/prog_tests/sock_post_bind.c
-f:tools/testing/selftests/bpf/prog_tests/socket_cookie.c
-f:tools/testing/selftests/bpf/prog_tests/socket_helpers.h
-f:tools/testing/selftests/bpf/prog_tests/sockmap_basic.c
-f:tools/testing/selftests/bpf/prog_tests/sockmap_helpers.h
-f:tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c
-f:tools/testing/selftests/bpf/prog_tests/sockmap_listen.c
-f:tools/testing/selftests/bpf/prog_tests/sockmap_redir.c
-f:tools/testing/selftests/bpf/prog_tests/sockmap_strp.c
-f:tools/testing/selftests/bpf/prog_tests/sockopt.c
-f:tools/testing/selftests/bpf/prog_tests/sockopt_inherit.c
-f:tools/testing/selftests/bpf/prog_tests/sockopt_multi.c
-f:tools/testing/selftests/bpf/prog_tests/sockopt_qos_to_cc.c
-f:tools/testing/selftests/bpf/prog_tests/sockopt_sk.c
-f:tools/testing/selftests/bpf/prog_tests/spin_lock.c
-f:tools/testing/selftests/bpf/prog_tests/stack_var_off.c
-f:tools/testing/selftests/bpf/prog_tests/stacktrace_build_id.c
-f:tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c
-f:tools/testing/selftests/bpf/prog_tests/stacktrace_map.c
-f:tools/testing/selftests/bpf/prog_tests/stacktrace_map_raw_tp.c
-f:tools/testing/selftests/bpf/prog_tests/stacktrace_map_skip.c
-f:tools/testing/selftests/bpf/prog_tests/static_linked.c
-f:tools/testing/selftests/bpf/prog_tests/stream.c
-f:tools/testing/selftests/bpf/prog_tests/string_kfuncs.c
-f:tools/testing/selftests/bpf/prog_tests/struct_ops_autocreate.c
-f:tools/testing/selftests/bpf/prog_tests/struct_ops_private_stack.c
-f:tools/testing/selftests/bpf/prog_tests/subprogs.c
-f:tools/testing/selftests/bpf/prog_tests/subprogs_extable.c
-f:tools/testing/selftests/bpf/prog_tests/subskeleton.c
-f:tools/testing/selftests/bpf/prog_tests/summarization.c
-f:tools/testing/selftests/bpf/prog_tests/syscall.c
-f:tools/testing/selftests/bpf/prog_tests/tailcalls.c
-f:tools/testing/selftests/bpf/prog_tests/task_fd_query_rawtp.c
-f:tools/testing/selftests/bpf/prog_tests/task_fd_query_tp.c
-f:tools/testing/selftests/bpf/prog_tests/task_kfunc.c
-f:tools/testing/selftests/bpf/prog_tests/task_local_storage.c
-f:tools/testing/selftests/bpf/prog_tests/task_pt_regs.c
-f:tools/testing/selftests/bpf/prog_tests/task_under_cgroup.c
-f:tools/testing/selftests/bpf/prog_tests/tc_bpf.c
-f:tools/testing/selftests/bpf/prog_tests/tc_change_tail.c
-f:tools/testing/selftests/bpf/prog_tests/tc_helpers.h
-f:tools/testing/selftests/bpf/prog_tests/tc_links.c
-f:tools/testing/selftests/bpf/prog_tests/tc_netkit.c
-f:tools/testing/selftests/bpf/prog_tests/tc_opts.c
-f:tools/testing/selftests/bpf/prog_tests/tc_redirect.c
-f:tools/testing/selftests/bpf/prog_tests/tcp_custom_syncookie.c
-f:tools/testing/selftests/bpf/prog_tests/tcp_estats.c
-f:tools/testing/selftests/bpf/prog_tests/tcp_hdr_options.c
-f:tools/testing/selftests/bpf/prog_tests/tcp_rtt.c
-f:tools/testing/selftests/bpf/prog_tests/tcpbpf_user.c
-f:tools/testing/selftests/bpf/prog_tests/test_bpf_ma.c
-f:tools/testing/selftests/bpf/prog_tests/test_bpf_syscall_macro.c
-f:tools/testing/selftests/bpf/prog_tests/test_bpffs.c
-f:tools/testing/selftests/bpf/prog_tests/test_bprm_opts.c
-f:tools/testing/selftests/bpf/prog_tests/test_btf_ext.c
-f:tools/testing/selftests/bpf/prog_tests/test_csum_diff.c
-f:tools/testing/selftests/bpf/prog_tests/test_global_funcs.c
-f:tools/testing/selftests/bpf/prog_tests/test_ima.c
-f:tools/testing/selftests/bpf/prog_tests/test_ldsx_insn.c
-f:tools/testing/selftests/bpf/prog_tests/test_local_storage.c
-f:tools/testing/selftests/bpf/prog_tests/test_lsm.c
-f:tools/testing/selftests/bpf/prog_tests/test_mmap_inner_array.c
-f:tools/testing/selftests/bpf/prog_tests/test_overhead.c
-f:tools/testing/selftests/bpf/prog_tests/test_profiler.c
-f:tools/testing/selftests/bpf/prog_tests/test_skb_pkt_end.c
-f:tools/testing/selftests/bpf/prog_tests/test_strncmp.c
-f:tools/testing/selftests/bpf/prog_tests/test_struct_ops_kptr_return.c
-f:tools/testing/selftests/bpf/prog_tests/test_struct_ops_maybe_null.c
-f:tools/testing/selftests/bpf/prog_tests/test_struct_ops_module.c
-f:tools/testing/selftests/bpf/prog_tests/test_struct_ops_multi_pages.c
-f:tools/testing/selftests/bpf/prog_tests/test_struct_ops_no_cfi.c
-f:tools/testing/selftests/bpf/prog_tests/test_struct_ops_refcounted.c
-f:tools/testing/selftests/bpf/prog_tests/test_sysctl.c
-f:tools/testing/selftests/bpf/prog_tests/test_tunnel.c
-f:tools/testing/selftests/bpf/prog_tests/test_veristat.c
-f:tools/testing/selftests/bpf/prog_tests/test_xdp_veth.c
-f:tools/testing/selftests/bpf/prog_tests/time_tai.c
-f:tools/testing/selftests/bpf/prog_tests/timer.c
-f:tools/testing/selftests/bpf/prog_tests/timer_crash.c
-f:tools/testing/selftests/bpf/prog_tests/timer_lockup.c
-f:tools/testing/selftests/bpf/prog_tests/timer_mim.c
-f:tools/testing/selftests/bpf/prog_tests/token.c
-f:tools/testing/selftests/bpf/prog_tests/tp_attach_query.c
-f:tools/testing/selftests/bpf/prog_tests/tp_btf_nullable.c
-f:tools/testing/selftests/bpf/prog_tests/trace_ext.c
-f:tools/testing/selftests/bpf/prog_tests/trace_printk.c
-f:tools/testing/selftests/bpf/prog_tests/trace_vprintk.c
-f:tools/testing/selftests/bpf/prog_tests/tracing_failure.c
-f:tools/testing/selftests/bpf/prog_tests/tracing_struct.c
-f:tools/testing/selftests/bpf/prog_tests/trampoline_count.c
-f:tools/testing/selftests/bpf/prog_tests/type_cast.c
-f:tools/testing/selftests/bpf/prog_tests/udp_limit.c
-f:tools/testing/selftests/bpf/prog_tests/uninit_stack.c
-f:tools/testing/selftests/bpf/prog_tests/unpriv_bpf_disabled.c
-f:tools/testing/selftests/bpf/prog_tests/uprobe.c
-f:tools/testing/selftests/bpf/prog_tests/uprobe_autoattach.c
-f:tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c
-f:tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c
-f:tools/testing/selftests/bpf/prog_tests/uretprobe_stack.c
-f:tools/testing/selftests/bpf/prog_tests/usdt.c
-f:tools/testing/selftests/bpf/prog_tests/user_ringbuf.c
-f:tools/testing/selftests/bpf/prog_tests/varlen.c
-f:tools/testing/selftests/bpf/prog_tests/verif_stats.c
-f:tools/testing/selftests/bpf/prog_tests/verifier.c
-f:tools/testing/selftests/bpf/prog_tests/verifier_kfunc_prog_types.c
-f:tools/testing/selftests/bpf/prog_tests/verifier_log.c
-f:tools/testing/selftests/bpf/prog_tests/verify_pkcs7_sig.c
-f:tools/testing/selftests/bpf/prog_tests/vmlinux.c
-f:tools/testing/selftests/bpf/prog_tests/vrf_socket_lookup.c
-f:tools/testing/selftests/bpf/prog_tests/wq.c
-f:tools/testing/selftests/bpf/prog_tests/xdp.c
-f:tools/testing/selftests/bpf/prog_tests/xdp_adjust_frags.c
-f:tools/testing/selftests/bpf/prog_tests/xdp_adjust_tail.c
-f:tools/testing/selftests/bpf/prog_tests/xdp_attach.c
-f:tools/testing/selftests/bpf/prog_tests/xdp_bonding.c
-f:tools/testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c
-f:tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c
-f:tools/testing/selftests/bpf/prog_tests/xdp_cpumap_attach.c
-f:tools/testing/selftests/bpf/prog_tests/xdp_dev_bound_only.c
-f:tools/testing/selftests/bpf/prog_tests/xdp_devmap_attach.c
-f:tools/testing/selftests/bpf/prog_tests/xdp_do_redirect.c
-f:tools/testing/selftests/bpf/prog_tests/xdp_flowtable.c
-f:tools/testing/selftests/bpf/prog_tests/xdp_info.c
-f:tools/testing/selftests/bpf/prog_tests/xdp_link.c
-f:tools/testing/selftests/bpf/prog_tests/xdp_metadata.c
-f:tools/testing/selftests/bpf/prog_tests/xdp_noinline.c
-f:tools/testing/selftests/bpf/prog_tests/xdp_perf.c
-f:tools/testing/selftests/bpf/prog_tests/xdp_synproxy.c
-f:tools/testing/selftests/bpf/prog_tests/xdp_vlan.c
-f:tools/testing/selftests/bpf/prog_tests/xdpwall.c
-f:tools/testing/selftests/bpf/prog_tests/xfrm_info.c
-f:tools/testing/selftests/bpf/progs/access_map_in_map.c
-f:tools/testing/selftests/bpf/progs/arena_atomics.c
-f:tools/testing/selftests/bpf/progs/arena_htab.c
-f:tools/testing/selftests/bpf/progs/arena_htab_asm.c
-f:tools/testing/selftests/bpf/progs/arena_list.c
-f:tools/testing/selftests/bpf/progs/arena_spin_lock.c
-f:tools/testing/selftests/bpf/progs/async_stack_depth.c
-f:tools/testing/selftests/bpf/progs/atomic_bounds.c
-f:tools/testing/selftests/bpf/progs/atomics.c
-f:tools/testing/selftests/bpf/progs/bad_struct_ops.c
-f:tools/testing/selftests/bpf/progs/bad_struct_ops2.c
-f:tools/testing/selftests/bpf/progs/bench_local_storage_create.c
-f:tools/testing/selftests/bpf/progs/bench_sockmap_prog.c
-f:tools/testing/selftests/bpf/progs/bind4_prog.c
-f:tools/testing/selftests/bpf/progs/bind6_prog.c
-f:tools/testing/selftests/bpf/progs/bind_perm.c
-f:tools/testing/selftests/bpf/progs/bind_prog.h
-f:tools/testing/selftests/bpf/progs/bloom_filter_bench.c
-f:tools/testing/selftests/bpf/progs/bloom_filter_map.c
-f:tools/testing/selftests/bpf/progs/bpf_arena_spin_lock.h
-f:tools/testing/selftests/bpf/progs/bpf_cc_cubic.c
-f:tools/testing/selftests/bpf/progs/bpf_compiler.h
-f:tools/testing/selftests/bpf/progs/bpf_cubic.c
-f:tools/testing/selftests/bpf/progs/bpf_dctcp.c
-f:tools/testing/selftests/bpf/progs/bpf_dctcp_release.c
-f:tools/testing/selftests/bpf/progs/bpf_flow.c
-f:tools/testing/selftests/bpf/progs/bpf_hashmap_full_update_bench.c
-f:tools/testing/selftests/bpf/progs/bpf_hashmap_lookup.c
-f:tools/testing/selftests/bpf/progs/bpf_iter_bpf_array_map.c
-f:tools/testing/selftests/bpf/progs/bpf_iter_bpf_hash_map.c
-f:tools/testing/selftests/bpf/progs/bpf_iter_bpf_link.c
-f:tools/testing/selftests/bpf/progs/bpf_iter_bpf_map.c
-f:tools/testing/selftests/bpf/progs/bpf_iter_bpf_percpu_array_map.c
-f:tools/testing/selftests/bpf/progs/bpf_iter_bpf_percpu_hash_map.c
-f:tools/testing/selftests/bpf/progs/bpf_iter_bpf_sk_storage_helpers.c
-f:tools/testing/selftests/bpf/progs/bpf_iter_bpf_sk_storage_map.c
-f:tools/testing/selftests/bpf/progs/bpf_iter_ipv6_route.c
-f:tools/testing/selftests/bpf/progs/bpf_iter_ksym.c
-f:tools/testing/selftests/bpf/progs/bpf_iter_map_elem.c
-f:tools/testing/selftests/bpf/progs/bpf_iter_netlink.c
-f:tools/testing/selftests/bpf/progs/bpf_iter_setsockopt.c
-f:tools/testing/selftests/bpf/progs/bpf_iter_setsockopt_unix.c
-f:tools/testing/selftests/bpf/progs/bpf_iter_sockmap.c
-f:tools/testing/selftests/bpf/progs/bpf_iter_task_btf.c
-f:tools/testing/selftests/bpf/progs/bpf_iter_task_file.c
-f:tools/testing/selftests/bpf/progs/bpf_iter_task_stack.c
-f:tools/testing/selftests/bpf/progs/bpf_iter_task_vmas.c
-f:tools/testing/selftests/bpf/progs/bpf_iter_tasks.c
-f:tools/testing/selftests/bpf/progs/bpf_iter_tcp4.c
-f:tools/testing/selftests/bpf/progs/bpf_iter_tcp6.c
-f:tools/testing/selftests/bpf/progs/bpf_iter_test_kern1.c
-f:tools/testing/selftests/bpf/progs/bpf_iter_test_kern2.c
-f:tools/testing/selftests/bpf/progs/bpf_iter_test_kern3.c
-f:tools/testing/selftests/bpf/progs/bpf_iter_test_kern4.c
-f:tools/testing/selftests/bpf/progs/bpf_iter_test_kern5.c
-f:tools/testing/selftests/bpf/progs/bpf_iter_test_kern6.c
-f:tools/testing/selftests/bpf/progs/bpf_iter_test_kern_common.h
-f:tools/testing/selftests/bpf/progs/bpf_iter_udp4.c
-f:tools/testing/selftests/bpf/progs/bpf_iter_udp6.c
-f:tools/testing/selftests/bpf/progs/bpf_iter_unix.c
-f:tools/testing/selftests/bpf/progs/bpf_iter_vma_offset.c
-f:tools/testing/selftests/bpf/progs/bpf_loop.c
-f:tools/testing/selftests/bpf/progs/bpf_loop_bench.c
-f:tools/testing/selftests/bpf/progs/bpf_misc.h
-f:tools/testing/selftests/bpf/progs/bpf_mod_race.c
-f:tools/testing/selftests/bpf/progs/bpf_qdisc_common.h
-f:tools/testing/selftests/bpf/progs/bpf_qdisc_fail__incompl_ops.c
-f:tools/testing/selftests/bpf/progs/bpf_qdisc_fifo.c
-f:tools/testing/selftests/bpf/progs/bpf_qdisc_fq.c
-f:tools/testing/selftests/bpf/progs/bpf_syscall_macro.c
-f:tools/testing/selftests/bpf/progs/bpf_tcp_nogpl.c
-f:tools/testing/selftests/bpf/progs/bpf_tracing_net.h
-f:tools/testing/selftests/bpf/progs/bprm_opts.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_arrays.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___diff_arr_dim.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___diff_arr_val_sz.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___equiv_zero_sz_arr.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___err_bad_signed_arr_elem_sz.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___err_bad_zero_sz_arr.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___err_non_array.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___err_too_shallow.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___err_too_small.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___err_wrong_val_type.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_arrays___fixed_arr.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_bitfields.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_bitfields___bit_sz_change.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_bitfields___bitfield_vs_int.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_bitfields___err_too_big_bitfield.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_bitfields___just_big_enough.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_enum64val.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_enum64val___diff.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_enum64val___err_missing.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_enum64val___val3_missing.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_enumval.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_enumval___diff.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_enumval___err_missing.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_enumval___val3_missing.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_existence.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_existence___minimal.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_existence___wrong_field_defs.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_flavors.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_flavors__err_wrong_name.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_ints.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_ints___bool.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_ints___reverse_sign.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_misc.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_mods.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_mods___mod_swap.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_mods___typedefs.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_nesting.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_nesting___anon_embed.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_nesting___dup_compat_types.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_nesting___err_array_container.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_nesting___err_array_field.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_nesting___err_dup_incompat_types.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_nesting___err_missing_container.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_nesting___err_missing_field.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_nesting___err_nonstruct_container.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_nesting___err_partial_match_dups.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_nesting___err_too_deep.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_nesting___extra_nesting.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_nesting___struct_union_mixup.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_primitives.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_primitives___diff_enum_def.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_primitives___diff_func_proto.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_primitives___diff_ptr_type.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_primitives___err_non_enum.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_primitives___err_non_int.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_primitives___err_non_ptr.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_ptr_as_arr.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_ptr_as_arr___diff_sz.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_size.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_size___diff_offs.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_size___diff_sz.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_size___err_ambiguous.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_type_based.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_type_based___all_missing.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_type_based___diff.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_type_based___diff_sz.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_type_based___fn_wrong_args.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_type_based___incompat.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_type_id.c
-f:tools/testing/selftests/bpf/progs/btf__core_reloc_type_id___missing_targets.c
-f:tools/testing/selftests/bpf/progs/btf_data.c
-f:tools/testing/selftests/bpf/progs/btf_dump_test_case_bitfields.c
-f:tools/testing/selftests/bpf/progs/btf_dump_test_case_multidim.c
-f:tools/testing/selftests/bpf/progs/btf_dump_test_case_namespacing.c
-f:tools/testing/selftests/bpf/progs/btf_dump_test_case_ordering.c
-f:tools/testing/selftests/bpf/progs/btf_dump_test_case_packing.c
-f:tools/testing/selftests/bpf/progs/btf_dump_test_case_padding.c
-f:tools/testing/selftests/bpf/progs/btf_dump_test_case_syntax.c
-f:tools/testing/selftests/bpf/progs/btf_ptr.h
-f:tools/testing/selftests/bpf/progs/btf_type_tag.c
-f:tools/testing/selftests/bpf/progs/btf_type_tag_percpu.c
-f:tools/testing/selftests/bpf/progs/btf_type_tag_user.c
-f:tools/testing/selftests/bpf/progs/cb_refs.c
-f:tools/testing/selftests/bpf/progs/cg_storage_multi.h
-f:tools/testing/selftests/bpf/progs/cg_storage_multi_egress_only.c
-f:tools/testing/selftests/bpf/progs/cg_storage_multi_isolated.c
-f:tools/testing/selftests/bpf/progs/cg_storage_multi_shared.c
-f:tools/testing/selftests/bpf/progs/cgroup_ancestor.c
-f:tools/testing/selftests/bpf/progs/cgroup_getset_retval_getsockopt.c
-f:tools/testing/selftests/bpf/progs/cgroup_getset_retval_hooks.c
-f:tools/testing/selftests/bpf/progs/cgroup_getset_retval_setsockopt.c
-f:tools/testing/selftests/bpf/progs/cgroup_hierarchical_stats.c
-f:tools/testing/selftests/bpf/progs/cgroup_iter.c
-f:tools/testing/selftests/bpf/progs/cgroup_mprog.c
-f:tools/testing/selftests/bpf/progs/cgroup_preorder.c
-f:tools/testing/selftests/bpf/progs/cgroup_read_xattr.c
-f:tools/testing/selftests/bpf/progs/cgroup_skb_direct_packet_access.c
-f:tools/testing/selftests/bpf/progs/cgroup_skb_sk_lookup_kern.c
-f:tools/testing/selftests/bpf/progs/cgroup_storage.c
-f:tools/testing/selftests/bpf/progs/cgroup_tcp_skb.c
-f:tools/testing/selftests/bpf/progs/cgrp_kfunc_common.h
-f:tools/testing/selftests/bpf/progs/cgrp_kfunc_failure.c
-f:tools/testing/selftests/bpf/progs/cgrp_kfunc_success.c
-f:tools/testing/selftests/bpf/progs/cgrp_ls_attach_cgroup.c
-f:tools/testing/selftests/bpf/progs/cgrp_ls_negative.c
-f:tools/testing/selftests/bpf/progs/cgrp_ls_recursion.c
-f:tools/testing/selftests/bpf/progs/cgrp_ls_sleepable.c
-f:tools/testing/selftests/bpf/progs/cgrp_ls_tp_btf.c
-f:tools/testing/selftests/bpf/progs/compute_live_registers.c
-f:tools/testing/selftests/bpf/progs/connect4_dropper.c
-f:tools/testing/selftests/bpf/progs/connect4_prog.c
-f:tools/testing/selftests/bpf/progs/connect6_prog.c
-f:tools/testing/selftests/bpf/progs/connect_force_port4.c
-f:tools/testing/selftests/bpf/progs/connect_force_port6.c
-f:tools/testing/selftests/bpf/progs/connect_ping.c
-f:tools/testing/selftests/bpf/progs/connect_unix_prog.c
-f:tools/testing/selftests/bpf/progs/core_kern.c
-f:tools/testing/selftests/bpf/progs/core_kern_overflow.c
-f:tools/testing/selftests/bpf/progs/core_reloc_types.h
-f:tools/testing/selftests/bpf/progs/cpumask_common.h
-f:tools/testing/selftests/bpf/progs/cpumask_failure.c
-f:tools/testing/selftests/bpf/progs/cpumask_success.c
-f:tools/testing/selftests/bpf/progs/crypto_basic.c
-f:tools/testing/selftests/bpf/progs/crypto_bench.c
-f:tools/testing/selftests/bpf/progs/crypto_common.h
-f:tools/testing/selftests/bpf/progs/crypto_sanity.c
-f:tools/testing/selftests/bpf/progs/csum_diff_test.c
-f:tools/testing/selftests/bpf/progs/decap_sanity.c
-f:tools/testing/selftests/bpf/progs/dev_cgroup.c
-f:tools/testing/selftests/bpf/progs/dmabuf_iter.c
-f:tools/testing/selftests/bpf/progs/dummy_st_ops_fail.c
-f:tools/testing/selftests/bpf/progs/dummy_st_ops_success.c
-f:tools/testing/selftests/bpf/progs/dynptr_fail.c
-f:tools/testing/selftests/bpf/progs/dynptr_success.c
-f:tools/testing/selftests/bpf/progs/empty_skb.c
-f:tools/testing/selftests/bpf/progs/epilogue_exit.c
-f:tools/testing/selftests/bpf/progs/epilogue_tailcall.c
-f:tools/testing/selftests/bpf/progs/err.h
-f:tools/testing/selftests/bpf/progs/exceptions.c
-f:tools/testing/selftests/bpf/progs/exceptions_assert.c
-f:tools/testing/selftests/bpf/progs/exceptions_ext.c
-f:tools/testing/selftests/bpf/progs/exceptions_fail.c
-f:tools/testing/selftests/bpf/progs/exhandler_kern.c
-f:tools/testing/selftests/bpf/progs/fd_htab_lookup.c
-f:tools/testing/selftests/bpf/progs/fentry_many_args.c
-f:tools/testing/selftests/bpf/progs/fentry_recursive.c
-f:tools/testing/selftests/bpf/progs/fentry_recursive_target.c
-f:tools/testing/selftests/bpf/progs/fentry_test.c
-f:tools/testing/selftests/bpf/progs/fexit_bpf2bpf.c
-f:tools/testing/selftests/bpf/progs/fexit_bpf2bpf_simple.c
-f:tools/testing/selftests/bpf/progs/fexit_many_args.c
-f:tools/testing/selftests/bpf/progs/fexit_sleep.c
-f:tools/testing/selftests/bpf/progs/fexit_test.c
-f:tools/testing/selftests/bpf/progs/fib_lookup.c
-f:tools/testing/selftests/bpf/progs/find_vma.c
-f:tools/testing/selftests/bpf/progs/find_vma_fail1.c
-f:tools/testing/selftests/bpf/progs/find_vma_fail2.c
-f:tools/testing/selftests/bpf/progs/fmod_ret_freplace.c
-f:tools/testing/selftests/bpf/progs/for_each_array_map_elem.c
-f:tools/testing/selftests/bpf/progs/for_each_hash_map_elem.c
-f:tools/testing/selftests/bpf/progs/for_each_hash_modify.c
-f:tools/testing/selftests/bpf/progs/for_each_map_elem_write_key.c
-f:tools/testing/selftests/bpf/progs/for_each_multi_maps.c
-f:tools/testing/selftests/bpf/progs/free_timer.c
-f:tools/testing/selftests/bpf/progs/freplace_attach_probe.c
-f:tools/testing/selftests/bpf/progs/freplace_cls_redirect.c
-f:tools/testing/selftests/bpf/progs/freplace_connect4.c
-f:tools/testing/selftests/bpf/progs/freplace_connect_v4_prog.c
-f:tools/testing/selftests/bpf/progs/freplace_dead_global_func.c
-f:tools/testing/selftests/bpf/progs/freplace_get_constant.c
-f:tools/testing/selftests/bpf/progs/freplace_global_func.c
-f:tools/testing/selftests/bpf/progs/freplace_progmap.c
-f:tools/testing/selftests/bpf/progs/freplace_unreliable_prog.c
-f:tools/testing/selftests/bpf/progs/get_branch_snapshot.c
-f:tools/testing/selftests/bpf/progs/get_cgroup_id_kern.c
-f:tools/testing/selftests/bpf/progs/get_func_args_test.c
-f:tools/testing/selftests/bpf/progs/get_func_ip_test.c
-f:tools/testing/selftests/bpf/progs/get_func_ip_uprobe_test.c
-f:tools/testing/selftests/bpf/progs/getpeername4_prog.c
-f:tools/testing/selftests/bpf/progs/getpeername6_prog.c
-f:tools/testing/selftests/bpf/progs/getpeername_unix_prog.c
-f:tools/testing/selftests/bpf/progs/getsockname4_prog.c
-f:tools/testing/selftests/bpf/progs/getsockname6_prog.c
-f:tools/testing/selftests/bpf/progs/getsockname_unix_prog.c
-f:tools/testing/selftests/bpf/progs/htab_mem_bench.c
-f:tools/testing/selftests/bpf/progs/htab_reuse.c
-f:tools/testing/selftests/bpf/progs/htab_update.c
-f:tools/testing/selftests/bpf/progs/ima.c
-f:tools/testing/selftests/bpf/progs/inner_array_lookup.c
-f:tools/testing/selftests/bpf/progs/ip_check_defrag.c
-f:tools/testing/selftests/bpf/progs/irq.c
-f:tools/testing/selftests/bpf/progs/iters.c
-f:tools/testing/selftests/bpf/progs/iters_css.c
-f:tools/testing/selftests/bpf/progs/iters_css_task.c
-f:tools/testing/selftests/bpf/progs/iters_looping.c
-f:tools/testing/selftests/bpf/progs/iters_num.c
-f:tools/testing/selftests/bpf/progs/iters_state_safety.c
-f:tools/testing/selftests/bpf/progs/iters_task.c
-f:tools/testing/selftests/bpf/progs/iters_task_failure.c
-f:tools/testing/selftests/bpf/progs/iters_task_vma.c
-f:tools/testing/selftests/bpf/progs/iters_testmod.c
-f:tools/testing/selftests/bpf/progs/iters_testmod_seq.c
-f:tools/testing/selftests/bpf/progs/jeq_infer_not_null_fail.c
-f:tools/testing/selftests/bpf/progs/jit_probe_mem.c
-f:tools/testing/selftests/bpf/progs/kfree_skb.c
-f:tools/testing/selftests/bpf/progs/kfunc_call_destructive.c
-f:tools/testing/selftests/bpf/progs/kfunc_call_fail.c
-f:tools/testing/selftests/bpf/progs/kfunc_call_race.c
-f:tools/testing/selftests/bpf/progs/kfunc_call_test.c
-f:tools/testing/selftests/bpf/progs/kfunc_call_test_subprog.c
-f:tools/testing/selftests/bpf/progs/kfunc_module_order.c
-f:tools/testing/selftests/bpf/progs/kmem_cache_iter.c
-f:tools/testing/selftests/bpf/progs/kprobe_multi.c
-f:tools/testing/selftests/bpf/progs/kprobe_multi_empty.c
-f:tools/testing/selftests/bpf/progs/kprobe_multi_override.c
-f:tools/testing/selftests/bpf/progs/kprobe_multi_session.c
-f:tools/testing/selftests/bpf/progs/kprobe_multi_session_cookie.c
-f:tools/testing/selftests/bpf/progs/kprobe_multi_verifier.c
-f:tools/testing/selftests/bpf/progs/kptr_xchg_inline.c
-f:tools/testing/selftests/bpf/progs/ksym_race.c
-f:tools/testing/selftests/bpf/progs/linked_funcs1.c
-f:tools/testing/selftests/bpf/progs/linked_funcs2.c
-f:tools/testing/selftests/bpf/progs/linked_list.c
-f:tools/testing/selftests/bpf/progs/linked_list.h
-f:tools/testing/selftests/bpf/progs/linked_list_fail.c
-f:tools/testing/selftests/bpf/progs/linked_list_peek.c
-f:tools/testing/selftests/bpf/progs/linked_maps1.c
-f:tools/testing/selftests/bpf/progs/linked_maps2.c
-f:tools/testing/selftests/bpf/progs/linked_vars1.c
-f:tools/testing/selftests/bpf/progs/linked_vars2.c
-f:tools/testing/selftests/bpf/progs/load_bytes_relative.c
-f:tools/testing/selftests/bpf/progs/local_kptr_stash.c
-f:tools/testing/selftests/bpf/progs/local_kptr_stash_fail.c
-f:tools/testing/selftests/bpf/progs/local_storage.c
-f:tools/testing/selftests/bpf/progs/local_storage_bench.c
-f:tools/testing/selftests/bpf/progs/local_storage_rcu_tasks_trace_bench.c
-f:tools/testing/selftests/bpf/progs/loop1.c
-f:tools/testing/selftests/bpf/progs/loop2.c
-f:tools/testing/selftests/bpf/progs/loop3.c
-f:tools/testing/selftests/bpf/progs/loop4.c
-f:tools/testing/selftests/bpf/progs/loop5.c
-f:tools/testing/selftests/bpf/progs/loop6.c
-f:tools/testing/selftests/bpf/progs/lru_bug.c
-f:tools/testing/selftests/bpf/progs/lsm.c
-f:tools/testing/selftests/bpf/progs/lsm_cgroup.c
-f:tools/testing/selftests/bpf/progs/lsm_cgroup_nonvoid.c
-f:tools/testing/selftests/bpf/progs/lsm_tailcall.c
-f:tools/testing/selftests/bpf/progs/map_in_map_btf.c
-f:tools/testing/selftests/bpf/progs/map_kptr.c
-f:tools/testing/selftests/bpf/progs/map_kptr_fail.c
-f:tools/testing/selftests/bpf/progs/map_percpu_stats.c
-f:tools/testing/selftests/bpf/progs/map_ptr_kern.c
-f:tools/testing/selftests/bpf/progs/mem_rdonly_untrusted.c
-f:tools/testing/selftests/bpf/progs/metadata_unused.c
-f:tools/testing/selftests/bpf/progs/metadata_used.c
-f:tools/testing/selftests/bpf/progs/missed_kprobe.c
-f:tools/testing/selftests/bpf/progs/missed_kprobe_recursion.c
-f:tools/testing/selftests/bpf/progs/missed_tp_recursion.c
-f:tools/testing/selftests/bpf/progs/mmap_inner_array.c
-f:tools/testing/selftests/bpf/progs/modify_return.c
-f:tools/testing/selftests/bpf/progs/mptcp_bpf.h
-f:tools/testing/selftests/bpf/progs/mptcp_sock.c
-f:tools/testing/selftests/bpf/progs/mptcp_subflow.c
-f:tools/testing/selftests/bpf/progs/mptcpify.c
-f:tools/testing/selftests/bpf/progs/nested_acquire.c
-f:tools/testing/selftests/bpf/progs/nested_trust_common.h
-f:tools/testing/selftests/bpf/progs/nested_trust_failure.c
-f:tools/testing/selftests/bpf/progs/nested_trust_success.c
-f:tools/testing/selftests/bpf/progs/net_timestamping.c
-f:tools/testing/selftests/bpf/progs/netcnt_prog.c
-f:tools/testing/selftests/bpf/progs/netif_receive_skb.c
-f:tools/testing/selftests/bpf/progs/netns_cookie_prog.c
-f:tools/testing/selftests/bpf/progs/normal_map_btf.c
-f:tools/testing/selftests/bpf/progs/percpu_alloc_array.c
-f:tools/testing/selftests/bpf/progs/percpu_alloc_cgrp_local_storage.c
-f:tools/testing/selftests/bpf/progs/percpu_alloc_fail.c
-f:tools/testing/selftests/bpf/progs/perf_event_stackmap.c
-f:tools/testing/selftests/bpf/progs/perfbuf_bench.c
-f:tools/testing/selftests/bpf/progs/preempt_lock.c
-f:tools/testing/selftests/bpf/progs/preempted_bpf_ma_op.c
-f:tools/testing/selftests/bpf/progs/prepare.c
-f:tools/testing/selftests/bpf/progs/priv_freplace_prog.c
-f:tools/testing/selftests/bpf/progs/priv_map.c
-f:tools/testing/selftests/bpf/progs/priv_prog.c
-f:tools/testing/selftests/bpf/progs/pro_epilogue.c
-f:tools/testing/selftests/bpf/progs/pro_epilogue_goto_start.c
-f:tools/testing/selftests/bpf/progs/pro_epilogue_with_kfunc.c
-f:tools/testing/selftests/bpf/progs/profiler.h
-f:tools/testing/selftests/bpf/progs/profiler.inc.h
-f:tools/testing/selftests/bpf/progs/profiler1.c
-f:tools/testing/selftests/bpf/progs/profiler2.c
-f:tools/testing/selftests/bpf/progs/profiler3.c
-f:tools/testing/selftests/bpf/progs/pyperf.h
-f:tools/testing/selftests/bpf/progs/pyperf100.c
-f:tools/testing/selftests/bpf/progs/pyperf180.c
-f:tools/testing/selftests/bpf/progs/pyperf50.c
-f:tools/testing/selftests/bpf/progs/pyperf600.c
-f:tools/testing/selftests/bpf/progs/pyperf600_bpf_loop.c
-f:tools/testing/selftests/bpf/progs/pyperf600_iter.c
-f:tools/testing/selftests/bpf/progs/pyperf600_nounroll.c
-f:tools/testing/selftests/bpf/progs/pyperf_global.c
-f:tools/testing/selftests/bpf/progs/pyperf_subprogs.c
-f:tools/testing/selftests/bpf/progs/raw_tp_null.c
-f:tools/testing/selftests/bpf/progs/raw_tp_null_fail.c
-f:tools/testing/selftests/bpf/progs/rbtree.c
-f:tools/testing/selftests/bpf/progs/rbtree_btf_fail__add_wrong_type.c
-f:tools/testing/selftests/bpf/progs/rbtree_btf_fail__wrong_node_type.c
-f:tools/testing/selftests/bpf/progs/rbtree_fail.c
-f:tools/testing/selftests/bpf/progs/rbtree_search.c
-f:tools/testing/selftests/bpf/progs/rcu_read_lock.c
-f:tools/testing/selftests/bpf/progs/rcu_tasks_trace_gp.c
-f:tools/testing/selftests/bpf/progs/read_bpf_task_storage_busy.c
-f:tools/testing/selftests/bpf/progs/read_cgroupfs_xattr.c
-f:tools/testing/selftests/bpf/progs/read_vsyscall.c
-f:tools/testing/selftests/bpf/progs/recursion.c
-f:tools/testing/selftests/bpf/progs/recvmsg4_prog.c
-f:tools/testing/selftests/bpf/progs/recvmsg6_prog.c
-f:tools/testing/selftests/bpf/progs/recvmsg_unix_prog.c
-f:tools/testing/selftests/bpf/progs/refcounted_kptr.c
-f:tools/testing/selftests/bpf/progs/refcounted_kptr_fail.c
-f:tools/testing/selftests/bpf/progs/res_spin_lock.c
-f:tools/testing/selftests/bpf/progs/res_spin_lock_fail.c
-f:tools/testing/selftests/bpf/progs/ringbuf_bench.c
-f:tools/testing/selftests/bpf/progs/security_bpf_map.c
-f:tools/testing/selftests/bpf/progs/sendmsg4_prog.c
-f:tools/testing/selftests/bpf/progs/sendmsg6_prog.c
-f:tools/testing/selftests/bpf/progs/sendmsg_unix_prog.c
-f:tools/testing/selftests/bpf/progs/set_global_vars.c
-f:tools/testing/selftests/bpf/progs/setget_sockopt.c
-f:tools/testing/selftests/bpf/progs/sk_storage_omem_uncharge.c
-f:tools/testing/selftests/bpf/progs/skb_load_bytes.c
-f:tools/testing/selftests/bpf/progs/skb_pkt_end.c
-f:tools/testing/selftests/bpf/progs/sock_addr_kern.c
-f:tools/testing/selftests/bpf/progs/sock_destroy_prog.c
-f:tools/testing/selftests/bpf/progs/sock_destroy_prog_fail.c
-f:tools/testing/selftests/bpf/progs/sock_iter_batch.c
-f:tools/testing/selftests/bpf/progs/socket_cookie_prog.c
-f:tools/testing/selftests/bpf/progs/sockmap_parse_prog.c
-f:tools/testing/selftests/bpf/progs/sockmap_tcp_msg_prog.c
-f:tools/testing/selftests/bpf/progs/sockmap_verdict_prog.c
-f:tools/testing/selftests/bpf/progs/sockopt_inherit.c
-f:tools/testing/selftests/bpf/progs/sockopt_multi.c
-f:tools/testing/selftests/bpf/progs/sockopt_qos_to_cc.c
-f:tools/testing/selftests/bpf/progs/sockopt_sk.c
-f:tools/testing/selftests/bpf/progs/stacktrace_map_skip.c
-f:tools/testing/selftests/bpf/progs/stream.c
-f:tools/testing/selftests/bpf/progs/stream_fail.c
-f:tools/testing/selftests/bpf/progs/string_kfuncs_failure1.c
-f:tools/testing/selftests/bpf/progs/string_kfuncs_failure2.c
-f:tools/testing/selftests/bpf/progs/string_kfuncs_success.c
-f:tools/testing/selftests/bpf/progs/strncmp_bench.c
-f:tools/testing/selftests/bpf/progs/strncmp_test.c
-f:tools/testing/selftests/bpf/progs/strobemeta.c
-f:tools/testing/selftests/bpf/progs/strobemeta.h
-f:tools/testing/selftests/bpf/progs/strobemeta_bpf_loop.c
-f:tools/testing/selftests/bpf/progs/strobemeta_nounroll1.c
-f:tools/testing/selftests/bpf/progs/strobemeta_nounroll2.c
-f:tools/testing/selftests/bpf/progs/strobemeta_subprogs.c
-f:tools/testing/selftests/bpf/progs/struct_ops_autocreate.c
-f:tools/testing/selftests/bpf/progs/struct_ops_autocreate2.c
-f:tools/testing/selftests/bpf/progs/struct_ops_detach.c
-f:tools/testing/selftests/bpf/progs/struct_ops_forgotten_cb.c
-f:tools/testing/selftests/bpf/progs/struct_ops_kptr_return.c
-f:tools/testing/selftests/bpf/progs/struct_ops_kptr_return_fail__invalid_scalar.c
-f:tools/testing/selftests/bpf/progs/struct_ops_kptr_return_fail__local_kptr.c
-f:tools/testing/selftests/bpf/progs/struct_ops_kptr_return_fail__nonzero_offset.c
-f:tools/testing/selftests/bpf/progs/struct_ops_kptr_return_fail__wrong_type.c
-f:tools/testing/selftests/bpf/progs/struct_ops_maybe_null.c
-f:tools/testing/selftests/bpf/progs/struct_ops_maybe_null_fail.c
-f:tools/testing/selftests/bpf/progs/struct_ops_module.c
-f:tools/testing/selftests/bpf/progs/struct_ops_multi_pages.c
-f:tools/testing/selftests/bpf/progs/struct_ops_nulled_out_cb.c
-f:tools/testing/selftests/bpf/progs/struct_ops_private_stack.c
-f:tools/testing/selftests/bpf/progs/struct_ops_private_stack_fail.c
-f:tools/testing/selftests/bpf/progs/struct_ops_private_stack_recur.c
-f:tools/testing/selftests/bpf/progs/struct_ops_refcounted.c
-f:tools/testing/selftests/bpf/progs/struct_ops_refcounted_fail__global_subprog.c
-f:tools/testing/selftests/bpf/progs/struct_ops_refcounted_fail__ref_leak.c
-f:tools/testing/selftests/bpf/progs/struct_ops_refcounted_fail__tail_call.c
-f:tools/testing/selftests/bpf/progs/summarization.c
-f:tools/testing/selftests/bpf/progs/summarization_freplace.c
-f:tools/testing/selftests/bpf/progs/syscall.c
-f:tools/testing/selftests/bpf/progs/tailcall1.c
-f:tools/testing/selftests/bpf/progs/tailcall2.c
-f:tools/testing/selftests/bpf/progs/tailcall3.c
-f:tools/testing/selftests/bpf/progs/tailcall4.c
-f:tools/testing/selftests/bpf/progs/tailcall5.c
-f:tools/testing/selftests/bpf/progs/tailcall6.c
-f:tools/testing/selftests/bpf/progs/tailcall_bpf2bpf1.c
-f:tools/testing/selftests/bpf/progs/tailcall_bpf2bpf2.c
-f:tools/testing/selftests/bpf/progs/tailcall_bpf2bpf3.c
-f:tools/testing/selftests/bpf/progs/tailcall_bpf2bpf4.c
-f:tools/testing/selftests/bpf/progs/tailcall_bpf2bpf6.c
-f:tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_fentry.c
-f:tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_fexit.c
-f:tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_hierarchy1.c
-f:tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_hierarchy2.c
-f:tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_hierarchy3.c
-f:tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_hierarchy_fentry.c
-f:tools/testing/selftests/bpf/progs/tailcall_fail.c
-f:tools/testing/selftests/bpf/progs/tailcall_freplace.c
-f:tools/testing/selftests/bpf/progs/tailcall_poke.c
-f:tools/testing/selftests/bpf/progs/task_kfunc_common.h
-f:tools/testing/selftests/bpf/progs/task_kfunc_failure.c
-f:tools/testing/selftests/bpf/progs/task_kfunc_success.c
-f:tools/testing/selftests/bpf/progs/task_local_storage.c
-f:tools/testing/selftests/bpf/progs/task_local_storage_exit_creds.c
-f:tools/testing/selftests/bpf/progs/task_ls_recursion.c
-f:tools/testing/selftests/bpf/progs/task_ls_uptr.c
-f:tools/testing/selftests/bpf/progs/task_storage_nodeadlock.c
-f:tools/testing/selftests/bpf/progs/tc_bpf2bpf.c
-f:tools/testing/selftests/bpf/progs/tc_dummy.c
-f:tools/testing/selftests/bpf/progs/tcp_ca_incompl_cong_ops.c
-f:tools/testing/selftests/bpf/progs/tcp_ca_kfunc.c
-f:tools/testing/selftests/bpf/progs/tcp_ca_unsupp_cong_op.c
-f:tools/testing/selftests/bpf/progs/tcp_ca_update.c
-f:tools/testing/selftests/bpf/progs/tcp_ca_write_sk_pacing.c
-f:tools/testing/selftests/bpf/progs/tcp_rtt.c
-f:tools/testing/selftests/bpf/progs/test_access_variable_array.c
-f:tools/testing/selftests/bpf/progs/test_assign_reuse.c
-f:tools/testing/selftests/bpf/progs/test_attach_kprobe_sleepable.c
-f:tools/testing/selftests/bpf/progs/test_attach_probe.c
-f:tools/testing/selftests/bpf/progs/test_attach_probe_manual.c
-f:tools/testing/selftests/bpf/progs/test_autoattach.c
-f:tools/testing/selftests/bpf/progs/test_autoload.c
-f:tools/testing/selftests/bpf/progs/test_bpf_cookie.c
-f:tools/testing/selftests/bpf/progs/test_bpf_ma.c
-f:tools/testing/selftests/bpf/progs/test_bpf_nf.c
-f:tools/testing/selftests/bpf/progs/test_bpf_nf_fail.c
-f:tools/testing/selftests/bpf/progs/test_btf_decl_tag.c
-f:tools/testing/selftests/bpf/progs/test_btf_ext.c
-f:tools/testing/selftests/bpf/progs/test_btf_map_in_map.c
-f:tools/testing/selftests/bpf/progs/test_btf_newkv.c
-f:tools/testing/selftests/bpf/progs/test_btf_nokv.c
-f:tools/testing/selftests/bpf/progs/test_btf_skc_cls_ingress.c
-f:tools/testing/selftests/bpf/progs/test_build_id.c
-f:tools/testing/selftests/bpf/progs/test_cgroup1_hierarchy.c
-f:tools/testing/selftests/bpf/progs/test_cgroup_link.c
-f:tools/testing/selftests/bpf/progs/test_check_mtu.c
-f:tools/testing/selftests/bpf/progs/test_cls_redirect.c
-f:tools/testing/selftests/bpf/progs/test_cls_redirect.h
-f:tools/testing/selftests/bpf/progs/test_cls_redirect_dynptr.c
-f:tools/testing/selftests/bpf/progs/test_cls_redirect_subprogs.c
-f:tools/testing/selftests/bpf/progs/test_core_autosize.c
-f:tools/testing/selftests/bpf/progs/test_core_extern.c
-f:tools/testing/selftests/bpf/progs/test_core_read_macros.c
-f:tools/testing/selftests/bpf/progs/test_core_reloc_arrays.c
-f:tools/testing/selftests/bpf/progs/test_core_reloc_bitfields_direct.c
-f:tools/testing/selftests/bpf/progs/test_core_reloc_bitfields_probed.c
-f:tools/testing/selftests/bpf/progs/test_core_reloc_enum64val.c
-f:tools/testing/selftests/bpf/progs/test_core_reloc_enumval.c
-f:tools/testing/selftests/bpf/progs/test_core_reloc_existence.c
-f:tools/testing/selftests/bpf/progs/test_core_reloc_flavors.c
-f:tools/testing/selftests/bpf/progs/test_core_reloc_ints.c
-f:tools/testing/selftests/bpf/progs/test_core_reloc_kernel.c
-f:tools/testing/selftests/bpf/progs/test_core_reloc_misc.c
-f:tools/testing/selftests/bpf/progs/test_core_reloc_mods.c
-f:tools/testing/selftests/bpf/progs/test_core_reloc_module.c
-f:tools/testing/selftests/bpf/progs/test_core_reloc_nesting.c
-f:tools/testing/selftests/bpf/progs/test_core_reloc_primitives.c
-f:tools/testing/selftests/bpf/progs/test_core_reloc_ptr_as_arr.c
-f:tools/testing/selftests/bpf/progs/test_core_reloc_size.c
-f:tools/testing/selftests/bpf/progs/test_core_reloc_type_based.c
-f:tools/testing/selftests/bpf/progs/test_core_reloc_type_id.c
-f:tools/testing/selftests/bpf/progs/test_core_retro.c
-f:tools/testing/selftests/bpf/progs/test_custom_sec_handlers.c
-f:tools/testing/selftests/bpf/progs/test_d_path.c
-f:tools/testing/selftests/bpf/progs/test_d_path_check_rdonly_mem.c
-f:tools/testing/selftests/bpf/progs/test_d_path_check_types.c
-f:tools/testing/selftests/bpf/progs/test_deny_namespace.c
-f:tools/testing/selftests/bpf/progs/test_enable_stats.c
-f:tools/testing/selftests/bpf/progs/test_endian.c
-f:tools/testing/selftests/bpf/progs/test_fill_link_info.c
-f:tools/testing/selftests/bpf/progs/test_fsverity.c
-f:tools/testing/selftests/bpf/progs/test_get_stack_rawtp.c
-f:tools/testing/selftests/bpf/progs/test_get_stack_rawtp_err.c
-f:tools/testing/selftests/bpf/progs/test_get_xattr.c
-f:tools/testing/selftests/bpf/progs/test_global_data.c
-f:tools/testing/selftests/bpf/progs/test_global_func1.c
-f:tools/testing/selftests/bpf/progs/test_global_func10.c
-f:tools/testing/selftests/bpf/progs/test_global_func11.c
-f:tools/testing/selftests/bpf/progs/test_global_func12.c
-f:tools/testing/selftests/bpf/progs/test_global_func13.c
-f:tools/testing/selftests/bpf/progs/test_global_func14.c
-f:tools/testing/selftests/bpf/progs/test_global_func15.c
-f:tools/testing/selftests/bpf/progs/test_global_func16.c
-f:tools/testing/selftests/bpf/progs/test_global_func17.c
-f:tools/testing/selftests/bpf/progs/test_global_func2.c
-f:tools/testing/selftests/bpf/progs/test_global_func3.c
-f:tools/testing/selftests/bpf/progs/test_global_func4.c
-f:tools/testing/selftests/bpf/progs/test_global_func5.c
-f:tools/testing/selftests/bpf/progs/test_global_func6.c
-f:tools/testing/selftests/bpf/progs/test_global_func7.c
-f:tools/testing/selftests/bpf/progs/test_global_func8.c
-f:tools/testing/selftests/bpf/progs/test_global_func9.c
-f:tools/testing/selftests/bpf/progs/test_global_func_args.c
-f:tools/testing/selftests/bpf/progs/test_global_func_ctx_args.c
-f:tools/testing/selftests/bpf/progs/test_global_map_resize.c
-f:tools/testing/selftests/bpf/progs/test_hash_large_key.c
-f:tools/testing/selftests/bpf/progs/test_helper_restricted.c
-f:tools/testing/selftests/bpf/progs/test_jhash.h
-f:tools/testing/selftests/bpf/progs/test_kernel_flag.c
-f:tools/testing/selftests/bpf/progs/test_kfunc_dynptr_param.c
-f:tools/testing/selftests/bpf/progs/test_kfunc_param_nullable.c
-f:tools/testing/selftests/bpf/progs/test_ksyms.c
-f:tools/testing/selftests/bpf/progs/test_ksyms_btf.c
-f:tools/testing/selftests/bpf/progs/test_ksyms_btf_null_check.c
-f:tools/testing/selftests/bpf/progs/test_ksyms_btf_write_check.c
-f:tools/testing/selftests/bpf/progs/test_ksyms_module.c
-f:tools/testing/selftests/bpf/progs/test_ksyms_weak.c
-f:tools/testing/selftests/bpf/progs/test_l4lb.c
-f:tools/testing/selftests/bpf/progs/test_l4lb_noinline.c
-f:tools/testing/selftests/bpf/progs/test_l4lb_noinline_dynptr.c
-f:tools/testing/selftests/bpf/progs/test_ldsx_insn.c
-f:tools/testing/selftests/bpf/progs/test_legacy_printk.c
-f:tools/testing/selftests/bpf/progs/test_libbpf_get_fd_by_id_opts.c
-f:tools/testing/selftests/bpf/progs/test_link_pinning.c
-f:tools/testing/selftests/bpf/progs/test_lirc_mode2_kern.c
-f:tools/testing/selftests/bpf/progs/test_log_buf.c
-f:tools/testing/selftests/bpf/progs/test_log_fixup.c
-f:tools/testing/selftests/bpf/progs/test_lookup_and_delete.c
-f:tools/testing/selftests/bpf/progs/test_lookup_key.c
-f:tools/testing/selftests/bpf/progs/test_lwt_ip_encap.c
-f:tools/testing/selftests/bpf/progs/test_lwt_redirect.c
-f:tools/testing/selftests/bpf/progs/test_lwt_reroute.c
-f:tools/testing/selftests/bpf/progs/test_lwt_seg6local.c
-f:tools/testing/selftests/bpf/progs/test_map_in_map.c
-f:tools/testing/selftests/bpf/progs/test_map_in_map_invalid.c
-f:tools/testing/selftests/bpf/progs/test_map_init.c
-f:tools/testing/selftests/bpf/progs/test_map_lock.c
-f:tools/testing/selftests/bpf/progs/test_map_lookup_percpu_elem.c
-f:tools/testing/selftests/bpf/progs/test_map_ops.c
-f:tools/testing/selftests/bpf/progs/test_migrate_reuseport.c
-f:tools/testing/selftests/bpf/progs/test_misc_tcp_hdr_options.c
-f:tools/testing/selftests/bpf/progs/test_mmap.c
-f:tools/testing/selftests/bpf/progs/test_module_attach.c
-f:tools/testing/selftests/bpf/progs/test_netfilter_link_attach.c
-f:tools/testing/selftests/bpf/progs/test_ns_current_pid_tgid.c
-f:tools/testing/selftests/bpf/progs/test_obj_id.c
-f:tools/testing/selftests/bpf/progs/test_overhead.c
-f:tools/testing/selftests/bpf/progs/test_parse_tcp_hdr_opt.c
-f:tools/testing/selftests/bpf/progs/test_parse_tcp_hdr_opt_dynptr.c
-f:tools/testing/selftests/bpf/progs/test_pe_preserve_elems.c
-f:tools/testing/selftests/bpf/progs/test_perf_branches.c
-f:tools/testing/selftests/bpf/progs/test_perf_buffer.c
-f:tools/testing/selftests/bpf/progs/test_perf_link.c
-f:tools/testing/selftests/bpf/progs/test_perf_skip.c
-f:tools/testing/selftests/bpf/progs/test_pinning.c
-f:tools/testing/selftests/bpf/progs/test_pinning_invalid.c
-f:tools/testing/selftests/bpf/progs/test_pkt_access.c
-f:tools/testing/selftests/bpf/progs/test_pkt_md_access.c
-f:tools/testing/selftests/bpf/progs/test_probe_read_user_str.c
-f:tools/testing/selftests/bpf/progs/test_probe_user.c
-f:tools/testing/selftests/bpf/progs/test_prog_array_init.c
-f:tools/testing/selftests/bpf/progs/test_ptr_untrusted.c
-f:tools/testing/selftests/bpf/progs/test_queue_map.c
-f:tools/testing/selftests/bpf/progs/test_queue_stack_map.h
-f:tools/testing/selftests/bpf/progs/test_raw_tp_test_run.c
-f:tools/testing/selftests/bpf/progs/test_rdonly_maps.c
-f:tools/testing/selftests/bpf/progs/test_ringbuf.c
-f:tools/testing/selftests/bpf/progs/test_ringbuf_map_key.c
-f:tools/testing/selftests/bpf/progs/test_ringbuf_multi.c
-f:tools/testing/selftests/bpf/progs/test_ringbuf_n.c
-f:tools/testing/selftests/bpf/progs/test_ringbuf_write.c
-f:tools/testing/selftests/bpf/progs/test_seg6_loop.c
-f:tools/testing/selftests/bpf/progs/test_select_reuseport_kern.c
-f:tools/testing/selftests/bpf/progs/test_send_signal_kern.c
-f:tools/testing/selftests/bpf/progs/test_set_remove_xattr.c
-f:tools/testing/selftests/bpf/progs/test_sig_in_xattr.c
-f:tools/testing/selftests/bpf/progs/test_siphash.h
-f:tools/testing/selftests/bpf/progs/test_sk_assign.c
-f:tools/testing/selftests/bpf/progs/test_sk_assign_libbpf.c
-f:tools/testing/selftests/bpf/progs/test_sk_lookup.c
-f:tools/testing/selftests/bpf/progs/test_sk_lookup_kern.c
-f:tools/testing/selftests/bpf/progs/test_sk_storage_trace_itself.c
-f:tools/testing/selftests/bpf/progs/test_sk_storage_tracing.c
-f:tools/testing/selftests/bpf/progs/test_skb_ctx.c
-f:tools/testing/selftests/bpf/progs/test_skb_helpers.c
-f:tools/testing/selftests/bpf/progs/test_skc_to_unix_sock.c
-f:tools/testing/selftests/bpf/progs/test_skeleton.c
-f:tools/testing/selftests/bpf/progs/test_skmsg_load_helpers.c
-f:tools/testing/selftests/bpf/progs/test_snprintf.c
-f:tools/testing/selftests/bpf/progs/test_snprintf_single.c
-f:tools/testing/selftests/bpf/progs/test_sock_fields.c
-f:tools/testing/selftests/bpf/progs/test_sockhash_kern.c
-f:tools/testing/selftests/bpf/progs/test_sockmap_change_tail.c
-f:tools/testing/selftests/bpf/progs/test_sockmap_drop_prog.c
-f:tools/testing/selftests/bpf/progs/test_sockmap_invalid_update.c
-f:tools/testing/selftests/bpf/progs/test_sockmap_kern.c
-f:tools/testing/selftests/bpf/progs/test_sockmap_kern.h
-f:tools/testing/selftests/bpf/progs/test_sockmap_ktls.c
-f:tools/testing/selftests/bpf/progs/test_sockmap_listen.c
-f:tools/testing/selftests/bpf/progs/test_sockmap_pass_prog.c
-f:tools/testing/selftests/bpf/progs/test_sockmap_progs_query.c
-f:tools/testing/selftests/bpf/progs/test_sockmap_redir.c
-f:tools/testing/selftests/bpf/progs/test_sockmap_skb_verdict_attach.c
-f:tools/testing/selftests/bpf/progs/test_sockmap_strp.c
-f:tools/testing/selftests/bpf/progs/test_sockmap_update.c
-f:tools/testing/selftests/bpf/progs/test_spin_lock.c
-f:tools/testing/selftests/bpf/progs/test_spin_lock_fail.c
-f:tools/testing/selftests/bpf/progs/test_stack_map.c
-f:tools/testing/selftests/bpf/progs/test_stack_var_off.c
-f:tools/testing/selftests/bpf/progs/test_stacktrace_build_id.c
-f:tools/testing/selftests/bpf/progs/test_stacktrace_map.c
-f:tools/testing/selftests/bpf/progs/test_static_linked1.c
-f:tools/testing/selftests/bpf/progs/test_static_linked2.c
-f:tools/testing/selftests/bpf/progs/test_subprogs.c
-f:tools/testing/selftests/bpf/progs/test_subprogs_extable.c
-f:tools/testing/selftests/bpf/progs/test_subprogs_unused.c
-f:tools/testing/selftests/bpf/progs/test_subskeleton.c
-f:tools/testing/selftests/bpf/progs/test_subskeleton_lib.c
-f:tools/testing/selftests/bpf/progs/test_subskeleton_lib2.c
-f:tools/testing/selftests/bpf/progs/test_sysctl_loop1.c
-f:tools/testing/selftests/bpf/progs/test_sysctl_loop2.c
-f:tools/testing/selftests/bpf/progs/test_sysctl_prog.c
-f:tools/testing/selftests/bpf/progs/test_task_pt_regs.c
-f:tools/testing/selftests/bpf/progs/test_task_under_cgroup.c
-f:tools/testing/selftests/bpf/progs/test_tc_bpf.c
-f:tools/testing/selftests/bpf/progs/test_tc_change_tail.c
-f:tools/testing/selftests/bpf/progs/test_tc_dtime.c
-f:tools/testing/selftests/bpf/progs/test_tc_edt.c
-f:tools/testing/selftests/bpf/progs/test_tc_link.c
-f:tools/testing/selftests/bpf/progs/test_tc_neigh.c
-f:tools/testing/selftests/bpf/progs/test_tc_neigh_fib.c
-f:tools/testing/selftests/bpf/progs/test_tc_peer.c
-f:tools/testing/selftests/bpf/progs/test_tc_tunnel.c
-f:tools/testing/selftests/bpf/progs/test_tcp_custom_syncookie.c
-f:tools/testing/selftests/bpf/progs/test_tcp_custom_syncookie.h
-f:tools/testing/selftests/bpf/progs/test_tcp_estats.c
-f:tools/testing/selftests/bpf/progs/test_tcp_hdr_options.c
-f:tools/testing/selftests/bpf/progs/test_tcpbpf_kern.c
-f:tools/testing/selftests/bpf/progs/test_tcpnotify_kern.c
-f:tools/testing/selftests/bpf/progs/test_time_tai.c
-f:tools/testing/selftests/bpf/progs/test_tp_btf_nullable.c
-f:tools/testing/selftests/bpf/progs/test_trace_ext.c
-f:tools/testing/selftests/bpf/progs/test_trace_ext_tracing.c
-f:tools/testing/selftests/bpf/progs/test_tracepoint.c
-f:tools/testing/selftests/bpf/progs/test_trampoline_count.c
-f:tools/testing/selftests/bpf/progs/test_tunnel_kern.c
-f:tools/testing/selftests/bpf/progs/test_unpriv_bpf_disabled.c
-f:tools/testing/selftests/bpf/progs/test_uprobe.c
-f:tools/testing/selftests/bpf/progs/test_uprobe_autoattach.c
-f:tools/testing/selftests/bpf/progs/test_urandom_usdt.c
-f:tools/testing/selftests/bpf/progs/test_usdt.c
-f:tools/testing/selftests/bpf/progs/test_usdt_multispec.c
-f:tools/testing/selftests/bpf/progs/test_user_ringbuf.h
-f:tools/testing/selftests/bpf/progs/test_varlen.c
-f:tools/testing/selftests/bpf/progs/test_verif_scale1.c
-f:tools/testing/selftests/bpf/progs/test_verif_scale2.c
-f:tools/testing/selftests/bpf/progs/test_verif_scale3.c
-f:tools/testing/selftests/bpf/progs/test_verify_pkcs7_sig.c
-f:tools/testing/selftests/bpf/progs/test_vmlinux.c
-f:tools/testing/selftests/bpf/progs/test_xdp.c
-f:tools/testing/selftests/bpf/progs/test_xdp_adjust_tail_grow.c
-f:tools/testing/selftests/bpf/progs/test_xdp_adjust_tail_shrink.c
-f:tools/testing/selftests/bpf/progs/test_xdp_attach_fail.c
-f:tools/testing/selftests/bpf/progs/test_xdp_bpf2bpf.c
-f:tools/testing/selftests/bpf/progs/test_xdp_context_test_run.c
-f:tools/testing/selftests/bpf/progs/test_xdp_devmap_helpers.c
-f:tools/testing/selftests/bpf/progs/test_xdp_do_redirect.c
-f:tools/testing/selftests/bpf/progs/test_xdp_dynptr.c
-f:tools/testing/selftests/bpf/progs/test_xdp_link.c
-f:tools/testing/selftests/bpf/progs/test_xdp_loop.c
-f:tools/testing/selftests/bpf/progs/test_xdp_meta.c
-f:tools/testing/selftests/bpf/progs/test_xdp_noinline.c
-f:tools/testing/selftests/bpf/progs/test_xdp_update_frags.c
-f:tools/testing/selftests/bpf/progs/test_xdp_vlan.c
-f:tools/testing/selftests/bpf/progs/test_xdp_with_cpumap_frags_helpers.c
-f:tools/testing/selftests/bpf/progs/test_xdp_with_cpumap_helpers.c
-f:tools/testing/selftests/bpf/progs/test_xdp_with_devmap_frags_helpers.c
-f:tools/testing/selftests/bpf/progs/test_xdp_with_devmap_helpers.c
-f:tools/testing/selftests/bpf/progs/timer.c
-f:tools/testing/selftests/bpf/progs/timer_crash.c
-f:tools/testing/selftests/bpf/progs/timer_failure.c
-f:tools/testing/selftests/bpf/progs/timer_lockup.c
-f:tools/testing/selftests/bpf/progs/timer_mim.c
-f:tools/testing/selftests/bpf/progs/timer_mim_reject.c
-f:tools/testing/selftests/bpf/progs/token_lsm.c
-f:tools/testing/selftests/bpf/progs/trace_dummy_st_ops.c
-f:tools/testing/selftests/bpf/progs/trace_printk.c
-f:tools/testing/selftests/bpf/progs/trace_vprintk.c
-f:tools/testing/selftests/bpf/progs/tracing_failure.c
-f:tools/testing/selftests/bpf/progs/tracing_struct.c
-f:tools/testing/selftests/bpf/progs/tracing_struct_many_args.c
-f:tools/testing/selftests/bpf/progs/trigger_bench.c
-f:tools/testing/selftests/bpf/progs/twfw.c
-f:tools/testing/selftests/bpf/progs/type_cast.c
-f:tools/testing/selftests/bpf/progs/udp_limit.c
-f:tools/testing/selftests/bpf/progs/uninit_stack.c
-f:tools/testing/selftests/bpf/progs/unsupported_ops.c
-f:tools/testing/selftests/bpf/progs/update_map_in_htab.c
-f:tools/testing/selftests/bpf/progs/uprobe_multi.c
-f:tools/testing/selftests/bpf/progs/uprobe_multi_bench.c
-f:tools/testing/selftests/bpf/progs/uprobe_multi_consumers.c
-f:tools/testing/selftests/bpf/progs/uprobe_multi_pid_filter.c
-f:tools/testing/selftests/bpf/progs/uprobe_multi_session.c
-f:tools/testing/selftests/bpf/progs/uprobe_multi_session_cookie.c
-f:tools/testing/selftests/bpf/progs/uprobe_multi_session_recursive.c
-f:tools/testing/selftests/bpf/progs/uprobe_multi_session_single.c
-f:tools/testing/selftests/bpf/progs/uprobe_multi_usdt.c
-f:tools/testing/selftests/bpf/progs/uprobe_multi_verifier.c
-f:tools/testing/selftests/bpf/progs/uprobe_syscall.c
-f:tools/testing/selftests/bpf/progs/uprobe_syscall_executed.c
-f:tools/testing/selftests/bpf/progs/uptr_failure.c
-f:tools/testing/selftests/bpf/progs/uptr_map_failure.c
-f:tools/testing/selftests/bpf/progs/uptr_update_failure.c
-f:tools/testing/selftests/bpf/progs/uretprobe_stack.c
-f:tools/testing/selftests/bpf/progs/user_ringbuf_fail.c
-f:tools/testing/selftests/bpf/progs/user_ringbuf_success.c
-f:tools/testing/selftests/bpf/progs/verifier_and.c
-f:tools/testing/selftests/bpf/progs/verifier_arena.c
-f:tools/testing/selftests/bpf/progs/verifier_arena_large.c
-f:tools/testing/selftests/bpf/progs/verifier_array_access.c
-f:tools/testing/selftests/bpf/progs/verifier_basic_stack.c
-f:tools/testing/selftests/bpf/progs/verifier_bitfield_write.c
-f:tools/testing/selftests/bpf/progs/verifier_bits_iter.c
-f:tools/testing/selftests/bpf/progs/verifier_bounds.c
-f:tools/testing/selftests/bpf/progs/verifier_bounds_deduction.c
-f:tools/testing/selftests/bpf/progs/verifier_bounds_deduction_non_const.c
-f:tools/testing/selftests/bpf/progs/verifier_bounds_mix_sign_unsign.c
-f:tools/testing/selftests/bpf/progs/verifier_bpf_fastcall.c
-f:tools/testing/selftests/bpf/progs/verifier_bpf_get_stack.c
-f:tools/testing/selftests/bpf/progs/verifier_bpf_trap.c
-f:tools/testing/selftests/bpf/progs/verifier_bswap.c
-f:tools/testing/selftests/bpf/progs/verifier_btf_ctx_access.c
-f:tools/testing/selftests/bpf/progs/verifier_btf_unreliable_prog.c
-f:tools/testing/selftests/bpf/progs/verifier_cfg.c
-f:tools/testing/selftests/bpf/progs/verifier_cgroup_inv_retcode.c
-f:tools/testing/selftests/bpf/progs/verifier_cgroup_skb.c
-f:tools/testing/selftests/bpf/progs/verifier_cgroup_storage.c
-f:tools/testing/selftests/bpf/progs/verifier_const.c
-f:tools/testing/selftests/bpf/progs/verifier_const_or.c
-f:tools/testing/selftests/bpf/progs/verifier_ctx.c
-f:tools/testing/selftests/bpf/progs/verifier_ctx_sk_msg.c
-f:tools/testing/selftests/bpf/progs/verifier_d_path.c
-f:tools/testing/selftests/bpf/progs/verifier_direct_packet_access.c
-f:tools/testing/selftests/bpf/progs/verifier_direct_stack_access_wraparound.c
-f:tools/testing/selftests/bpf/progs/verifier_div0.c
-f:tools/testing/selftests/bpf/progs/verifier_div_overflow.c
-f:tools/testing/selftests/bpf/progs/verifier_global_ptr_args.c
-f:tools/testing/selftests/bpf/progs/verifier_global_subprogs.c
-f:tools/testing/selftests/bpf/progs/verifier_gotol.c
-f:tools/testing/selftests/bpf/progs/verifier_helper_access_var_len.c
-f:tools/testing/selftests/bpf/progs/verifier_helper_packet_access.c
-f:tools/testing/selftests/bpf/progs/verifier_helper_restricted.c
-f:tools/testing/selftests/bpf/progs/verifier_helper_value_access.c
-f:tools/testing/selftests/bpf/progs/verifier_int_ptr.c
-f:tools/testing/selftests/bpf/progs/verifier_iterating_callbacks.c
-f:tools/testing/selftests/bpf/progs/verifier_jeq_infer_not_null.c
-f:tools/testing/selftests/bpf/progs/verifier_jit_convergence.c
-f:tools/testing/selftests/bpf/progs/verifier_kfunc_prog_types.c
-f:tools/testing/selftests/bpf/progs/verifier_ld_ind.c
-f:tools/testing/selftests/bpf/progs/verifier_ldsx.c
-f:tools/testing/selftests/bpf/progs/verifier_leak_ptr.c
-f:tools/testing/selftests/bpf/progs/verifier_linked_scalars.c
-f:tools/testing/selftests/bpf/progs/verifier_load_acquire.c
-f:tools/testing/selftests/bpf/progs/verifier_loops1.c
-f:tools/testing/selftests/bpf/progs/verifier_lsm.c
-f:tools/testing/selftests/bpf/progs/verifier_lwt.c
-f:tools/testing/selftests/bpf/progs/verifier_map_in_map.c
-f:tools/testing/selftests/bpf/progs/verifier_map_ptr.c
-f:tools/testing/selftests/bpf/progs/verifier_map_ptr_mixing.c
-f:tools/testing/selftests/bpf/progs/verifier_map_ret_val.c
-f:tools/testing/selftests/bpf/progs/verifier_masking.c
-f:tools/testing/selftests/bpf/progs/verifier_may_goto_1.c
-f:tools/testing/selftests/bpf/progs/verifier_may_goto_2.c
-f:tools/testing/selftests/bpf/progs/verifier_meta_access.c
-f:tools/testing/selftests/bpf/progs/verifier_movsx.c
-f:tools/testing/selftests/bpf/progs/verifier_mtu.c
-f:tools/testing/selftests/bpf/progs/verifier_netfilter_ctx.c
-f:tools/testing/selftests/bpf/progs/verifier_netfilter_retcode.c
-f:tools/testing/selftests/bpf/progs/verifier_or_jmp32_k.c
-f:tools/testing/selftests/bpf/progs/verifier_precision.c
-f:tools/testing/selftests/bpf/progs/verifier_prevent_map_lookup.c
-f:tools/testing/selftests/bpf/progs/verifier_private_stack.c
-f:tools/testing/selftests/bpf/progs/verifier_raw_stack.c
-f:tools/testing/selftests/bpf/progs/verifier_raw_tp_writable.c
-f:tools/testing/selftests/bpf/progs/verifier_ref_tracking.c
-f:tools/testing/selftests/bpf/progs/verifier_reg_equal.c
-f:tools/testing/selftests/bpf/progs/verifier_regalloc.c
-f:tools/testing/selftests/bpf/progs/verifier_ringbuf.c
-f:tools/testing/selftests/bpf/progs/verifier_runtime_jit.c
-f:tools/testing/selftests/bpf/progs/verifier_scalar_ids.c
-f:tools/testing/selftests/bpf/progs/verifier_sdiv.c
-f:tools/testing/selftests/bpf/progs/verifier_search_pruning.c
-f:tools/testing/selftests/bpf/progs/verifier_sock.c
-f:tools/testing/selftests/bpf/progs/verifier_sock_addr.c
-f:tools/testing/selftests/bpf/progs/verifier_sockmap_mutate.c
-f:tools/testing/selftests/bpf/progs/verifier_spill_fill.c
-f:tools/testing/selftests/bpf/progs/verifier_spin_lock.c
-f:tools/testing/selftests/bpf/progs/verifier_stack_ptr.c
-f:tools/testing/selftests/bpf/progs/verifier_store_release.c
-f:tools/testing/selftests/bpf/progs/verifier_subprog_precision.c
-f:tools/testing/selftests/bpf/progs/verifier_subreg.c
-f:tools/testing/selftests/bpf/progs/verifier_tailcall.c
-f:tools/testing/selftests/bpf/progs/verifier_tailcall_jit.c
-f:tools/testing/selftests/bpf/progs/verifier_typedef.c
-f:tools/testing/selftests/bpf/progs/verifier_uninit.c
-f:tools/testing/selftests/bpf/progs/verifier_unpriv.c
-f:tools/testing/selftests/bpf/progs/verifier_unpriv_perf.c
-f:tools/testing/selftests/bpf/progs/verifier_value.c
-f:tools/testing/selftests/bpf/progs/verifier_value_adj_spill.c
-f:tools/testing/selftests/bpf/progs/verifier_value_illegal_alu.c
-f:tools/testing/selftests/bpf/progs/verifier_value_or_null.c
-f:tools/testing/selftests/bpf/progs/verifier_value_ptr_arith.c
-f:tools/testing/selftests/bpf/progs/verifier_var_off.c
-f:tools/testing/selftests/bpf/progs/verifier_vfs_accept.c
-f:tools/testing/selftests/bpf/progs/verifier_vfs_reject.c
-f:tools/testing/selftests/bpf/progs/verifier_xadd.c
-f:tools/testing/selftests/bpf/progs/verifier_xdp.c
-f:tools/testing/selftests/bpf/progs/verifier_xdp_direct_packet_access.c
-f:tools/testing/selftests/bpf/progs/vrf_socket_lookup.c
-f:tools/testing/selftests/bpf/progs/wq.c
-f:tools/testing/selftests/bpf/progs/wq_failures.c
-f:tools/testing/selftests/bpf/progs/xdp_dummy.c
-f:tools/testing/selftests/bpf/progs/xdp_features.c
-f:tools/testing/selftests/bpf/progs/xdp_flowtable.c
-f:tools/testing/selftests/bpf/progs/xdp_hw_metadata.c
-f:tools/testing/selftests/bpf/progs/xdp_metadata.c
-f:tools/testing/selftests/bpf/progs/xdp_metadata2.c
-f:tools/testing/selftests/bpf/progs/xdp_redirect_map.c
-f:tools/testing/selftests/bpf/progs/xdp_redirect_multi_kern.c
-f:tools/testing/selftests/bpf/progs/xdp_synproxy_kern.c
-f:tools/testing/selftests/bpf/progs/xdp_tx.c
-f:tools/testing/selftests/bpf/progs/xdping_kern.c
-f:tools/testing/selftests/bpf/progs/xdpwall.c
-f:tools/testing/selftests/bpf/progs/xfrm_info.c
-f:tools/testing/selftests/bpf/progs/xsk_xdp_progs.c
-f:tools/testing/selftests/bpf/sdt-config.h
-f:tools/testing/selftests/bpf/sdt.h
-f:tools/testing/selftests/bpf/settings
-f:tools/testing/selftests/bpf/task_local_storage_helpers.h
-f:tools/testing/selftests/bpf/test_bpftool.py
-f:tools/testing/selftests/bpf/test_bpftool.sh
-f:tools/testing/selftests/bpf/test_bpftool_build.sh
-f:tools/testing/selftests/bpf/test_bpftool_map.sh
-f:tools/testing/selftests/bpf/test_bpftool_metadata.sh
-f:tools/testing/selftests/bpf/test_bpftool_synctypes.py
-f:tools/testing/selftests/bpf/test_btf.h
-f:tools/testing/selftests/bpf/test_cpp.cpp
-f:tools/testing/selftests/bpf/test_doc_build.sh
-f:tools/testing/selftests/bpf/test_ftrace.sh
-f:tools/testing/selftests/bpf/test_iptunnel_common.h
-f:tools/testing/selftests/bpf/test_kmod.sh
-f:tools/testing/selftests/bpf/test_kmods/.gitignore
-f:tools/testing/selftests/bpf/test_kmods/Makefile
-f:tools/testing/selftests/bpf/test_kmods/bpf_test_modorder_x.c
-f:tools/testing/selftests/bpf/test_kmods/bpf_test_modorder_y.c
-f:tools/testing/selftests/bpf/test_kmods/bpf_test_no_cfi.c
-f:tools/testing/selftests/bpf/test_kmods/bpf_testmod-events.h
-f:tools/testing/selftests/bpf/test_kmods/bpf_testmod.c
-f:tools/testing/selftests/bpf/test_kmods/bpf_testmod.h
-f:tools/testing/selftests/bpf/test_kmods/bpf_testmod_kfunc.h
-f:tools/testing/selftests/bpf/test_lirc_mode2.sh
-f:tools/testing/selftests/bpf/test_lirc_mode2_user.c
-f:tools/testing/selftests/bpf/test_loader.c
-f:tools/testing/selftests/bpf/test_lru_map.c
-f:tools/testing/selftests/bpf/test_maps.c
-f:tools/testing/selftests/bpf/test_maps.h
-f:tools/testing/selftests/bpf/test_progs.c
-f:tools/testing/selftests/bpf/test_progs.h
-f:tools/testing/selftests/bpf/test_select_reuseport_common.h
-f:tools/testing/selftests/bpf/test_sockmap.c
-f:tools/testing/selftests/bpf/test_tag.c
-f:tools/testing/selftests/bpf/test_tc_edt.sh
-f:tools/testing/selftests/bpf/test_tc_tunnel.sh
-f:tools/testing/selftests/bpf/test_tcp_hdr_options.h
-f:tools/testing/selftests/bpf/test_tcpbpf.h
-f:tools/testing/selftests/bpf/test_tcpnotify.h
-f:tools/testing/selftests/bpf/test_tcpnotify_user.c
-f:tools/testing/selftests/bpf/test_verifier.c
-f:tools/testing/selftests/bpf/test_xdp_features.sh
-f:tools/testing/selftests/bpf/test_xdping.sh
-f:tools/testing/selftests/bpf/test_xsk.sh
-f:tools/testing/selftests/bpf/testing_helpers.c
-f:tools/testing/selftests/bpf/testing_helpers.h
-f:tools/testing/selftests/bpf/trace_helpers.c
-f:tools/testing/selftests/bpf/trace_helpers.h
-f:tools/testing/selftests/bpf/unpriv_helpers.c
-f:tools/testing/selftests/bpf/unpriv_helpers.h
-f:tools/testing/selftests/bpf/uprobe_multi.c
-f:tools/testing/selftests/bpf/uprobe_multi.ld
-f:tools/testing/selftests/bpf/uptr_test_common.h
-f:tools/testing/selftests/bpf/urandom_read.c
-f:tools/testing/selftests/bpf/urandom_read_aux.c
-f:tools/testing/selftests/bpf/urandom_read_lib1.c
-f:tools/testing/selftests/bpf/urandom_read_lib2.c
-f:tools/testing/selftests/bpf/verifier/.gitignore
-f:tools/testing/selftests/bpf/verifier/atomic_and.c
-f:tools/testing/selftests/bpf/verifier/atomic_bounds.c
-f:tools/testing/selftests/bpf/verifier/atomic_cmpxchg.c
-f:tools/testing/selftests/bpf/verifier/atomic_fetch.c
-f:tools/testing/selftests/bpf/verifier/atomic_fetch_add.c
-f:tools/testing/selftests/bpf/verifier/atomic_invalid.c
-f:tools/testing/selftests/bpf/verifier/atomic_or.c
-f:tools/testing/selftests/bpf/verifier/atomic_xchg.c
-f:tools/testing/selftests/bpf/verifier/atomic_xor.c
-f:tools/testing/selftests/bpf/verifier/basic.c
-f:tools/testing/selftests/bpf/verifier/basic_call.c
-f:tools/testing/selftests/bpf/verifier/basic_instr.c
-f:tools/testing/selftests/bpf/verifier/basic_stx_ldx.c
-f:tools/testing/selftests/bpf/verifier/bpf_loop_inline.c
-f:tools/testing/selftests/bpf/verifier/bpf_st_mem.c
-f:tools/testing/selftests/bpf/verifier/calls.c
-f:tools/testing/selftests/bpf/verifier/ctx_sk_lookup.c
-f:tools/testing/selftests/bpf/verifier/ctx_skb.c
-f:tools/testing/selftests/bpf/verifier/dead_code.c
-f:tools/testing/selftests/bpf/verifier/direct_value_access.c
-f:tools/testing/selftests/bpf/verifier/event_output.c
-f:tools/testing/selftests/bpf/verifier/jit.c
-f:tools/testing/selftests/bpf/verifier/jmp32.c
-f:tools/testing/selftests/bpf/verifier/jset.c
-f:tools/testing/selftests/bpf/verifier/jump.c
-f:tools/testing/selftests/bpf/verifier/junk_insn.c
-f:tools/testing/selftests/bpf/verifier/ld_abs.c
-f:tools/testing/selftests/bpf/verifier/ld_dw.c
-f:tools/testing/selftests/bpf/verifier/ld_imm64.c
-f:tools/testing/selftests/bpf/verifier/map_kptr.c
-f:tools/testing/selftests/bpf/verifier/perf_event_sample_period.c
-f:tools/testing/selftests/bpf/verifier/precise.c
-f:tools/testing/selftests/bpf/verifier/scale.c
-f:tools/testing/selftests/bpf/verifier/sleepable.c
-f:tools/testing/selftests/bpf/verifier/wide_access.c
-f:tools/testing/selftests/bpf/verify_sig_setup.sh
-f:tools/testing/selftests/bpf/veristat.c
-f:tools/testing/selftests/bpf/veristat.cfg
-f:tools/testing/selftests/bpf/vmtest.sh
-f:tools/testing/selftests/bpf/xdp_features.c
-f:tools/testing/selftests/bpf/xdp_features.h
-f:tools/testing/selftests/bpf/xdp_hw_metadata.c
-f:tools/testing/selftests/bpf/xdp_metadata.h
-f:tools/testing/selftests/bpf/xdp_synproxy.c
-f:tools/testing/selftests/bpf/xdping.c
-f:tools/testing/selftests/bpf/xdping.h
-f:tools/testing/selftests/bpf/xsk.c
-f:tools/testing/selftests/bpf/xsk.h
-f:tools/testing/selftests/bpf/xsk_prereqs.sh
-f:tools/testing/selftests/bpf/xsk_xdp_common.h
-f:tools/testing/selftests/bpf/xskxceiver.c
-f:tools/testing/selftests/bpf/xskxceiver.h
-f:tools/testing/selftests/breakpoints/.gitignore
-f:tools/testing/selftests/breakpoints/Makefile
-f:tools/testing/selftests/breakpoints/breakpoint_test.c
-f:tools/testing/selftests/breakpoints/breakpoint_test_arm64.c
-f:tools/testing/selftests/breakpoints/step_after_suspend_test.c
-f:tools/testing/selftests/cachestat/.gitignore
-f:tools/testing/selftests/cachestat/Makefile
-f:tools/testing/selftests/cachestat/test_cachestat.c
-f:tools/testing/selftests/capabilities/.gitignore
-f:tools/testing/selftests/capabilities/Makefile
-f:tools/testing/selftests/capabilities/test_execve.c
-f:tools/testing/selftests/capabilities/validate_cap.c
-f:tools/testing/selftests/cgroup/.gitignore
-f:tools/testing/selftests/cgroup/Makefile
-f:tools/testing/selftests/cgroup/config
-f:tools/testing/selftests/cgroup/lib/cgroup_util.c
-f:tools/testing/selftests/cgroup/lib/include/cgroup_util.h
-f:tools/testing/selftests/cgroup/lib/libcgroup.mk
-f:tools/testing/selftests/cgroup/memcg_protection.m
-f:tools/testing/selftests/cgroup/test_core.c
-f:tools/testing/selftests/cgroup/test_cpu.c
-f:tools/testing/selftests/cgroup/test_cpuset.c
-f:tools/testing/selftests/cgroup/test_cpuset_prs.sh
-f:tools/testing/selftests/cgroup/test_cpuset_v1_base.sh
-f:tools/testing/selftests/cgroup/test_cpuset_v1_hp.sh
-f:tools/testing/selftests/cgroup/test_freezer.c
-f:tools/testing/selftests/cgroup/test_hugetlb_memcg.c
-f:tools/testing/selftests/cgroup/test_kill.c
-f:tools/testing/selftests/cgroup/test_kmem.c
-f:tools/testing/selftests/cgroup/test_memcontrol.c
-f:tools/testing/selftests/cgroup/test_pids.c
-f:tools/testing/selftests/cgroup/test_stress.sh
-f:tools/testing/selftests/cgroup/test_zswap.c
-f:tools/testing/selftests/cgroup/wait_inotify.c
-f:tools/testing/selftests/cgroup/with_stress.sh
-f:tools/testing/selftests/clone3/.gitignore
-f:tools/testing/selftests/clone3/Makefile
-f:tools/testing/selftests/clone3/clone3.c
-f:tools/testing/selftests/clone3/clone3_cap_checkpoint_restore.c
-f:tools/testing/selftests/clone3/clone3_clear_sighand.c
-f:tools/testing/selftests/clone3/clone3_selftests.h
-f:tools/testing/selftests/clone3/clone3_set_tid.c
-f:tools/testing/selftests/connector/.gitignore
-f:tools/testing/selftests/connector/Makefile
-f:tools/testing/selftests/connector/proc_filter.c
-f:tools/testing/selftests/core/.gitignore
-f:tools/testing/selftests/core/Makefile
-f:tools/testing/selftests/core/close_range_test.c
-f:tools/testing/selftests/core/unshare_test.c
-f:tools/testing/selftests/coredump/Makefile
-f:tools/testing/selftests/coredump/README.rst
-f:tools/testing/selftests/coredump/config
-f:tools/testing/selftests/coredump/stackdump
-f:tools/testing/selftests/coredump/stackdump_test.c
-f:tools/testing/selftests/cpu-hotplug/Makefile
-f:tools/testing/selftests/cpu-hotplug/cpu-on-off-test.sh
-f:tools/testing/selftests/cpufreq/.gitignore
-f:tools/testing/selftests/cpufreq/Makefile
-f:tools/testing/selftests/cpufreq/config
-f:tools/testing/selftests/cpufreq/cpu.sh
-f:tools/testing/selftests/cpufreq/cpufreq.sh
-f:tools/testing/selftests/cpufreq/governor.sh
-f:tools/testing/selftests/cpufreq/main.sh
-f:tools/testing/selftests/cpufreq/module.sh
-f:tools/testing/selftests/cpufreq/special-tests.sh
-f:tools/testing/selftests/damon/.gitignore
-f:tools/testing/selftests/damon/Makefile
-f:tools/testing/selftests/damon/_common.sh
-f:tools/testing/selftests/damon/_damon_sysfs.py
-f:tools/testing/selftests/damon/access_memory.c
-f:tools/testing/selftests/damon/access_memory_even.c
-f:tools/testing/selftests/damon/config
-f:tools/testing/selftests/damon/damon_nr_regions.py
-f:tools/testing/selftests/damon/damos_apply_interval.py
-f:tools/testing/selftests/damon/damos_quota.py
-f:tools/testing/selftests/damon/damos_quota_goal.py
-f:tools/testing/selftests/damon/damos_tried_regions.py
-f:tools/testing/selftests/damon/drgn_dump_damon_status.py
-f:tools/testing/selftests/damon/lru_sort.sh
-f:tools/testing/selftests/damon/reclaim.sh
-f:tools/testing/selftests/damon/sysfs.py
-f:tools/testing/selftests/damon/sysfs.sh
-f:tools/testing/selftests/damon/sysfs_memcg_path_leak.sh
-f:tools/testing/selftests/damon/sysfs_update_removed_scheme_dir.sh
-f:tools/testing/selftests/damon/sysfs_update_schemes_tried_regions_hang.py
-f:tools/testing/selftests/damon/sysfs_update_schemes_tried_regions_wss_estimation.py
-f:tools/testing/selftests/devices/error_logs/Makefile
-f:tools/testing/selftests/devices/error_logs/test_device_error_logs.py
-f:tools/testing/selftests/devices/probe/Makefile
-f:tools/testing/selftests/devices/probe/boards/Dell Inc.,XPS 13 9300.yaml
-f:tools/testing/selftests/devices/probe/boards/google,spherion.yaml
-f:tools/testing/selftests/devices/probe/test_discoverable_devices.py
-f:tools/testing/selftests/dma/Makefile
-f:tools/testing/selftests/dma/config
-f:tools/testing/selftests/dma/dma_map_benchmark.c
-f:tools/testing/selftests/dmabuf-heaps/.gitignore
-f:tools/testing/selftests/dmabuf-heaps/Makefile
-f:tools/testing/selftests/dmabuf-heaps/config
-f:tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c
-f:tools/testing/selftests/drivers/.gitignore
-f:tools/testing/selftests/drivers/dma-buf/Makefile
-f:tools/testing/selftests/drivers/dma-buf/config
-f:tools/testing/selftests/drivers/dma-buf/udmabuf.c
-f:tools/testing/selftests/drivers/gpu/drm_mm.sh
-f:tools/testing/selftests/drivers/gpu/i915.sh
-f:tools/testing/selftests/drivers/net/.gitignore
-f:tools/testing/selftests/drivers/net/Makefile
-f:tools/testing/selftests/drivers/net/README.rst
-f:tools/testing/selftests/drivers/net/bonding/Makefile
-f:tools/testing/selftests/drivers/net/bonding/bond-arp-interval-causes-panic.sh
-f:tools/testing/selftests/drivers/net/bonding/bond-break-lacpdu-tx.sh
-f:tools/testing/selftests/drivers/net/bonding/bond-eth-type-change.sh
-f:tools/testing/selftests/drivers/net/bonding/bond-lladdr-target.sh
-f:tools/testing/selftests/drivers/net/bonding/bond_macvlan_ipvlan.sh
-f:tools/testing/selftests/drivers/net/bonding/bond_options.sh
-f:tools/testing/selftests/drivers/net/bonding/bond_topo_2d1c.sh
-f:tools/testing/selftests/drivers/net/bonding/bond_topo_3d1c.sh
-f:tools/testing/selftests/drivers/net/bonding/config
-f:tools/testing/selftests/drivers/net/bonding/dev_addr_lists.sh
-f:tools/testing/selftests/drivers/net/bonding/lag_lib.sh
-f:tools/testing/selftests/drivers/net/bonding/mode-1-recovery-updelay.sh
-f:tools/testing/selftests/drivers/net/bonding/mode-2-recovery-updelay.sh
-f:tools/testing/selftests/drivers/net/bonding/settings
-f:tools/testing/selftests/drivers/net/config
-f:tools/testing/selftests/drivers/net/dsa/Makefile
-f:tools/testing/selftests/drivers/net/dsa/forwarding.config
-f:tools/testing/selftests/drivers/net/dsa/run_net_forwarding_test.sh
-f:tools/testing/selftests/drivers/net/dsa/test_bridge_fdb_stress.sh
-f:tools/testing/selftests/drivers/net/hds.py
-f:tools/testing/selftests/drivers/net/hw/.gitignore
-f:tools/testing/selftests/drivers/net/hw/Makefile
-f:tools/testing/selftests/drivers/net/hw/config
-f:tools/testing/selftests/drivers/net/hw/csum.py
-f:tools/testing/selftests/drivers/net/hw/devlink_port_split.py
-f:tools/testing/selftests/drivers/net/hw/devlink_rate_tc_bw.py
-f:tools/testing/selftests/drivers/net/hw/devmem.py
-f:tools/testing/selftests/drivers/net/hw/ethtool.sh
-f:tools/testing/selftests/drivers/net/hw/ethtool_extended_state.sh
-f:tools/testing/selftests/drivers/net/hw/ethtool_lib.sh
-f:tools/testing/selftests/drivers/net/hw/ethtool_mm.sh
-f:tools/testing/selftests/drivers/net/hw/ethtool_rmon.sh
-f:tools/testing/selftests/drivers/net/hw/hw_stats_l3.sh
-f:tools/testing/selftests/drivers/net/hw/hw_stats_l3_gre.sh
-f:tools/testing/selftests/drivers/net/hw/iou-zcrx.c
-f:tools/testing/selftests/drivers/net/hw/iou-zcrx.py
-f:tools/testing/selftests/drivers/net/hw/irq.py
-f:tools/testing/selftests/drivers/net/hw/lib/py/__init__.py
-f:tools/testing/selftests/drivers/net/hw/loopback.sh
-f:tools/testing/selftests/drivers/net/hw/ncdevmem.c
-f:tools/testing/selftests/drivers/net/hw/pp_alloc_fail.py
-f:tools/testing/selftests/drivers/net/hw/rss_api.py
-f:tools/testing/selftests/drivers/net/hw/rss_ctx.py
-f:tools/testing/selftests/drivers/net/hw/rss_input_xfrm.py
-f:tools/testing/selftests/drivers/net/hw/settings
-f:tools/testing/selftests/drivers/net/hw/tso.py
-f:tools/testing/selftests/drivers/net/hw/xsk_reconfig.py
-f:tools/testing/selftests/drivers/net/lib/py/__init__.py
-f:tools/testing/selftests/drivers/net/lib/py/env.py
-f:tools/testing/selftests/drivers/net/lib/py/load.py
-f:tools/testing/selftests/drivers/net/lib/py/remote.py
-f:tools/testing/selftests/drivers/net/lib/py/remote_netns.py
-f:tools/testing/selftests/drivers/net/lib/py/remote_ssh.py
-f:tools/testing/selftests/drivers/net/lib/sh/lib_netcons.sh
-f:tools/testing/selftests/drivers/net/microchip/ksz9477_qos.sh
-f:tools/testing/selftests/drivers/net/mlxsw/blackhole_routes.sh
-f:tools/testing/selftests/drivers/net/mlxsw/devlink_linecard.sh
-f:tools/testing/selftests/drivers/net/mlxsw/devlink_trap.sh
-f:tools/testing/selftests/drivers/net/mlxsw/devlink_trap_acl_drops.sh
-f:tools/testing/selftests/drivers/net/mlxsw/devlink_trap_control.sh
-f:tools/testing/selftests/drivers/net/mlxsw/devlink_trap_l2_drops.sh
-f:tools/testing/selftests/drivers/net/mlxsw/devlink_trap_l3_drops.sh
-f:tools/testing/selftests/drivers/net/mlxsw/devlink_trap_l3_exceptions.sh
-f:tools/testing/selftests/drivers/net/mlxsw/devlink_trap_policer.sh
-f:tools/testing/selftests/drivers/net/mlxsw/devlink_trap_tunnel_ipip.sh
-f:tools/testing/selftests/drivers/net/mlxsw/devlink_trap_tunnel_ipip6.sh
-f:tools/testing/selftests/drivers/net/mlxsw/devlink_trap_tunnel_vxlan.sh
-f:tools/testing/selftests/drivers/net/mlxsw/devlink_trap_tunnel_vxlan_ipv6.sh
-f:tools/testing/selftests/drivers/net/mlxsw/egress_vid_classification.sh
-f:tools/testing/selftests/drivers/net/mlxsw/ethtool_lanes.sh
-f:tools/testing/selftests/drivers/net/mlxsw/extack.sh
-f:tools/testing/selftests/drivers/net/mlxsw/fib.sh
-f:tools/testing/selftests/drivers/net/mlxsw/fib_offload.sh
-f:tools/testing/selftests/drivers/net/mlxsw/hw_stats_l3.sh
-f:tools/testing/selftests/drivers/net/mlxsw/ingress_rif_conf_1d.sh
-f:tools/testing/selftests/drivers/net/mlxsw/ingress_rif_conf_1q.sh
-f:tools/testing/selftests/drivers/net/mlxsw/ingress_rif_conf_vxlan.sh
-f:tools/testing/selftests/drivers/net/mlxsw/mirror_gre.sh
-f:tools/testing/selftests/drivers/net/mlxsw/mirror_gre_scale.sh
-f:tools/testing/selftests/drivers/net/mlxsw/mlxsw_lib.sh
-f:tools/testing/selftests/drivers/net/mlxsw/one_armed_router.sh
-f:tools/testing/selftests/drivers/net/mlxsw/pci_reset.sh
-f:tools/testing/selftests/drivers/net/mlxsw/port_range_occ.sh
-f:tools/testing/selftests/drivers/net/mlxsw/port_range_scale.sh
-f:tools/testing/selftests/drivers/net/mlxsw/port_scale.sh
-f:tools/testing/selftests/drivers/net/mlxsw/q_in_q_veto.sh
-f:tools/testing/selftests/drivers/net/mlxsw/qos_defprio.sh
-f:tools/testing/selftests/drivers/net/mlxsw/qos_dscp_bridge.sh
-f:tools/testing/selftests/drivers/net/mlxsw/qos_dscp_router.sh
-f:tools/testing/selftests/drivers/net/mlxsw/qos_ets_strict.sh
-f:tools/testing/selftests/drivers/net/mlxsw/qos_headroom.sh
-f:tools/testing/selftests/drivers/net/mlxsw/qos_lib.sh
-f:tools/testing/selftests/drivers/net/mlxsw/qos_max_descriptors.sh
-f:tools/testing/selftests/drivers/net/mlxsw/qos_mc_aware.sh
-f:tools/testing/selftests/drivers/net/mlxsw/qos_pfc.sh
-f:tools/testing/selftests/drivers/net/mlxsw/rif_bridge.sh
-f:tools/testing/selftests/drivers/net/mlxsw/rif_counter_scale.sh
-f:tools/testing/selftests/drivers/net/mlxsw/rif_lag.sh
-f:tools/testing/selftests/drivers/net/mlxsw/rif_lag_vlan.sh
-f:tools/testing/selftests/drivers/net/mlxsw/rif_mac_profile_scale.sh
-f:tools/testing/selftests/drivers/net/mlxsw/rif_mac_profiles.sh
-f:tools/testing/selftests/drivers/net/mlxsw/rif_mac_profiles_occ.sh
-f:tools/testing/selftests/drivers/net/mlxsw/router_bridge_lag.sh
-f:tools/testing/selftests/drivers/net/mlxsw/router_scale.sh
-f:tools/testing/selftests/drivers/net/mlxsw/rtnetlink.sh
-f:tools/testing/selftests/drivers/net/mlxsw/sch_ets.sh
-f:tools/testing/selftests/drivers/net/mlxsw/sch_offload.sh
-f:tools/testing/selftests/drivers/net/mlxsw/sch_red_core.sh
-f:tools/testing/selftests/drivers/net/mlxsw/sch_red_ets.sh
-f:tools/testing/selftests/drivers/net/mlxsw/sch_red_prio.sh
-f:tools/testing/selftests/drivers/net/mlxsw/sch_red_root.sh
-f:tools/testing/selftests/drivers/net/mlxsw/sch_tbf_ets.sh
-f:tools/testing/selftests/drivers/net/mlxsw/sch_tbf_prio.sh
-f:tools/testing/selftests/drivers/net/mlxsw/sch_tbf_root.sh
-f:tools/testing/selftests/drivers/net/mlxsw/sharedbuffer.sh
-f:tools/testing/selftests/drivers/net/mlxsw/sharedbuffer_configuration.py
-f:tools/testing/selftests/drivers/net/mlxsw/spectrum-2/mirror_gre_scale.sh
-f:tools/testing/selftests/drivers/net/mlxsw/spectrum-2/port_scale.sh
-f:tools/testing/selftests/drivers/net/mlxsw/spectrum-2/resource_scale.sh
-f:tools/testing/selftests/drivers/net/mlxsw/spectrum-2/rif_mac_profile_scale.sh
-f:tools/testing/selftests/drivers/net/mlxsw/spectrum-2/router_scale.sh
-f:tools/testing/selftests/drivers/net/mlxsw/spectrum-2/tc_flower.sh
-f:tools/testing/selftests/drivers/net/mlxsw/spectrum-2/tc_flower_scale.sh
-f:tools/testing/selftests/drivers/net/mlxsw/spectrum-2/tc_police_scale.sh
-f:tools/testing/selftests/drivers/net/mlxsw/spectrum-2/vxlan_flooding_ipv6.sh
-f:tools/testing/selftests/drivers/net/mlxsw/spectrum/devlink_lib_spectrum.sh
-f:tools/testing/selftests/drivers/net/mlxsw/spectrum/devlink_resources.sh
-f:tools/testing/selftests/drivers/net/mlxsw/spectrum/mirror_gre_scale.sh
-f:tools/testing/selftests/drivers/net/mlxsw/spectrum/port_range_scale.sh
-f:tools/testing/selftests/drivers/net/mlxsw/spectrum/port_scale.sh
-f:tools/testing/selftests/drivers/net/mlxsw/spectrum/q_in_vni_veto.sh
-f:tools/testing/selftests/drivers/net/mlxsw/spectrum/resource_scale.sh
-f:tools/testing/selftests/drivers/net/mlxsw/spectrum/rif_counter_scale.sh
-f:tools/testing/selftests/drivers/net/mlxsw/spectrum/rif_mac_profile_scale.sh
-f:tools/testing/selftests/drivers/net/mlxsw/spectrum/router_scale.sh
-f:tools/testing/selftests/drivers/net/mlxsw/spectrum/tc_flower_scale.sh
-f:tools/testing/selftests/drivers/net/mlxsw/spectrum/tc_police_scale.sh
-f:tools/testing/selftests/drivers/net/mlxsw/spectrum/vxlan_flooding_ipv6.sh
-f:tools/testing/selftests/drivers/net/mlxsw/tc_action_hw_stats.sh
-f:tools/testing/selftests/drivers/net/mlxsw/tc_flower_scale.sh
-f:tools/testing/selftests/drivers/net/mlxsw/tc_police_occ.sh
-f:tools/testing/selftests/drivers/net/mlxsw/tc_police_scale.sh
-f:tools/testing/selftests/drivers/net/mlxsw/tc_restrictions.sh
-f:tools/testing/selftests/drivers/net/mlxsw/tc_sample.sh
-f:tools/testing/selftests/drivers/net/mlxsw/vxlan.sh
-f:tools/testing/selftests/drivers/net/mlxsw/vxlan_fdb_veto.sh
-f:tools/testing/selftests/drivers/net/mlxsw/vxlan_fdb_veto_ipv6.sh
-f:tools/testing/selftests/drivers/net/mlxsw/vxlan_flooding.sh
-f:tools/testing/selftests/drivers/net/mlxsw/vxlan_ipv6.sh
-f:tools/testing/selftests/drivers/net/napi_id.py
-f:tools/testing/selftests/drivers/net/napi_id_helper.c
-f:tools/testing/selftests/drivers/net/netcons_basic.sh
-f:tools/testing/selftests/drivers/net/netcons_cmdline.sh
-f:tools/testing/selftests/drivers/net/netcons_fragmented_msg.sh
-f:tools/testing/selftests/drivers/net/netcons_overflow.sh
-f:tools/testing/selftests/drivers/net/netcons_sysdata.sh
-f:tools/testing/selftests/drivers/net/netdevsim/Makefile
-f:tools/testing/selftests/drivers/net/netdevsim/config
-f:tools/testing/selftests/drivers/net/netdevsim/devlink.sh
-f:tools/testing/selftests/drivers/net/netdevsim/devlink_in_netns.sh
-f:tools/testing/selftests/drivers/net/netdevsim/devlink_trap.sh
-f:tools/testing/selftests/drivers/net/netdevsim/ethtool-coalesce.sh
-f:tools/testing/selftests/drivers/net/netdevsim/ethtool-common.sh
-f:tools/testing/selftests/drivers/net/netdevsim/ethtool-features.sh
-f:tools/testing/selftests/drivers/net/netdevsim/ethtool-fec.sh
-f:tools/testing/selftests/drivers/net/netdevsim/ethtool-pause.sh
-f:tools/testing/selftests/drivers/net/netdevsim/ethtool-ring.sh
-f:tools/testing/selftests/drivers/net/netdevsim/fib.sh
-f:tools/testing/selftests/drivers/net/netdevsim/fib_notifications.sh
-f:tools/testing/selftests/drivers/net/netdevsim/hw_stats_l3.sh
-f:tools/testing/selftests/drivers/net/netdevsim/macsec-offload.sh
-f:tools/testing/selftests/drivers/net/netdevsim/nexthop.sh
-f:tools/testing/selftests/drivers/net/netdevsim/peer.sh
-f:tools/testing/selftests/drivers/net/netdevsim/psample.sh
-f:tools/testing/selftests/drivers/net/netdevsim/settings
-f:tools/testing/selftests/drivers/net/netdevsim/tc-mq-visibility.sh
-f:tools/testing/selftests/drivers/net/netdevsim/udp_tunnel_nic.sh
-f:tools/testing/selftests/drivers/net/netpoll_basic.py
-f:tools/testing/selftests/drivers/net/ocelot/basic_qos.sh
-f:tools/testing/selftests/drivers/net/ocelot/psfp.sh
-f:tools/testing/selftests/drivers/net/ocelot/tc_flower_chains.sh
-f:tools/testing/selftests/drivers/net/ping.py
-f:tools/testing/selftests/drivers/net/queues.py
-f:tools/testing/selftests/drivers/net/shaper.py
-f:tools/testing/selftests/drivers/net/stats.py
-f:tools/testing/selftests/drivers/net/team/Makefile
-f:tools/testing/selftests/drivers/net/team/config
-f:tools/testing/selftests/drivers/net/team/dev_addr_lists.sh
-f:tools/testing/selftests/drivers/net/team/propagation.sh
-f:tools/testing/selftests/drivers/net/virtio_net/Makefile
-f:tools/testing/selftests/drivers/net/virtio_net/basic_features.sh
-f:tools/testing/selftests/drivers/net/virtio_net/config
-f:tools/testing/selftests/drivers/net/virtio_net/virtio_net_common.sh
-f:tools/testing/selftests/drivers/net/xdp.py
-f:tools/testing/selftests/drivers/ntsync/.gitignore
-f:tools/testing/selftests/drivers/ntsync/Makefile
-f:tools/testing/selftests/drivers/ntsync/config
-f:tools/testing/selftests/drivers/ntsync/ntsync.c
-f:tools/testing/selftests/drivers/platform/x86/intel/ifs/Makefile
-f:tools/testing/selftests/drivers/platform/x86/intel/ifs/test_ifs.sh
-f:tools/testing/selftests/drivers/s390x/uvdevice/Makefile
-f:tools/testing/selftests/drivers/s390x/uvdevice/config
-f:tools/testing/selftests/drivers/s390x/uvdevice/test_uvdevice.c
-f:tools/testing/selftests/drivers/sdsi/sdsi.sh
-f:tools/testing/selftests/drivers/sdsi/sdsi_test.py
-f:tools/testing/selftests/drivers/usb/usbip/usbip_test.sh
-f:tools/testing/selftests/dt/.gitignore
-f:tools/testing/selftests/dt/Makefile
-f:tools/testing/selftests/dt/compatible_ignore_list
-f:tools/testing/selftests/dt/test_unprobed_devices.sh
-f:tools/testing/selftests/efivarfs/.gitignore
-f:tools/testing/selftests/efivarfs/Makefile
-f:tools/testing/selftests/efivarfs/config
-f:tools/testing/selftests/efivarfs/create-read.c
-f:tools/testing/selftests/efivarfs/efivarfs.sh
-f:tools/testing/selftests/efivarfs/open-unlink.c
-f:tools/testing/selftests/exec/.gitignore
-f:tools/testing/selftests/exec/Makefile
-f:tools/testing/selftests/exec/binfmt_script.py
-f:tools/testing/selftests/exec/check-exec-tests.sh
-f:tools/testing/selftests/exec/check-exec.c
-f:tools/testing/selftests/exec/config
-f:tools/testing/selftests/exec/execveat.c
-f:tools/testing/selftests/exec/false.c
-f:tools/testing/selftests/exec/load_address.c
-f:tools/testing/selftests/exec/non-regular.c
-f:tools/testing/selftests/exec/null-argv.c
-f:tools/testing/selftests/exec/recursion-depth.c
-f:tools/testing/selftests/fchmodat2/.gitignore
-f:tools/testing/selftests/fchmodat2/Makefile
-f:tools/testing/selftests/fchmodat2/fchmodat2_test.c
-f:tools/testing/selftests/filelock/Makefile
-f:tools/testing/selftests/filelock/ofdlocks.c
-f:tools/testing/selftests/filesystems/.gitignore
-f:tools/testing/selftests/filesystems/Makefile
-f:tools/testing/selftests/filesystems/anon_inode_test.c
-f:tools/testing/selftests/filesystems/binderfs/.gitignore
-f:tools/testing/selftests/filesystems/binderfs/Makefile
-f:tools/testing/selftests/filesystems/binderfs/binderfs_test.c
-f:tools/testing/selftests/filesystems/binderfs/config
-f:tools/testing/selftests/filesystems/devpts_pts.c
-f:tools/testing/selftests/filesystems/dnotify_test.c
-f:tools/testing/selftests/filesystems/epoll/.gitignore
-f:tools/testing/selftests/filesystems/epoll/Makefile
-f:tools/testing/selftests/filesystems/epoll/epoll_wakeup_test.c
-f:tools/testing/selftests/filesystems/eventfd/.gitignore
-f:tools/testing/selftests/filesystems/eventfd/Makefile
-f:tools/testing/selftests/filesystems/eventfd/eventfd_test.c
-f:tools/testing/selftests/filesystems/fat/.gitignore
-f:tools/testing/selftests/filesystems/fat/Makefile
-f:tools/testing/selftests/filesystems/fat/config
-f:tools/testing/selftests/filesystems/fat/rename_exchange.c
-f:tools/testing/selftests/filesystems/fat/run_fat_tests.sh
-f:tools/testing/selftests/filesystems/file_stressor.c
-f:tools/testing/selftests/filesystems/kernfs_test.c
-f:tools/testing/selftests/filesystems/mount-notify/.gitignore
-f:tools/testing/selftests/filesystems/mount-notify/Makefile
-f:tools/testing/selftests/filesystems/mount-notify/mount-notify_test.c
-f:tools/testing/selftests/filesystems/mount-notify/mount-notify_test_ns.c
-f:tools/testing/selftests/filesystems/nsfs/.gitignore
-f:tools/testing/selftests/filesystems/nsfs/Makefile
-f:tools/testing/selftests/filesystems/nsfs/config
-f:tools/testing/selftests/filesystems/nsfs/iterate_mntns.c
-f:tools/testing/selftests/filesystems/nsfs/owner.c
-f:tools/testing/selftests/filesystems/nsfs/pidns.c
-f:tools/testing/selftests/filesystems/overlayfs/.gitignore
-f:tools/testing/selftests/filesystems/overlayfs/Makefile
-f:tools/testing/selftests/filesystems/overlayfs/dev_in_maps.c
-f:tools/testing/selftests/filesystems/overlayfs/log.h
-f:tools/testing/selftests/filesystems/overlayfs/set_layers_via_fds.c
-f:tools/testing/selftests/filesystems/statmount/.gitignore
-f:tools/testing/selftests/filesystems/statmount/Makefile
-f:tools/testing/selftests/filesystems/statmount/listmount_test.c
-f:tools/testing/selftests/filesystems/statmount/statmount.h
-f:tools/testing/selftests/filesystems/statmount/statmount_test.c
-f:tools/testing/selftests/filesystems/statmount/statmount_test_ns.c
-f:tools/testing/selftests/filesystems/utils.c
-f:tools/testing/selftests/filesystems/utils.h
-f:tools/testing/selftests/filesystems/wrappers.h
-f:tools/testing/selftests/firmware/.gitignore
-f:tools/testing/selftests/firmware/Makefile
-f:tools/testing/selftests/firmware/config
-f:tools/testing/selftests/firmware/fw_fallback.sh
-f:tools/testing/selftests/firmware/fw_filesystem.sh
-f:tools/testing/selftests/firmware/fw_lib.sh
-f:tools/testing/selftests/firmware/fw_namespace.c
-f:tools/testing/selftests/firmware/fw_run_tests.sh
-f:tools/testing/selftests/firmware/fw_upload.sh
-f:tools/testing/selftests/firmware/settings
-f:tools/testing/selftests/fpu/.gitignore
-f:tools/testing/selftests/fpu/Makefile
-f:tools/testing/selftests/fpu/run_test_fpu.sh
-f:tools/testing/selftests/fpu/test_fpu.c
-f:tools/testing/selftests/ftrace/.gitignore
-f:tools/testing/selftests/ftrace/Makefile
-f:tools/testing/selftests/ftrace/README
-f:tools/testing/selftests/ftrace/config
-f:tools/testing/selftests/ftrace/ftracetest
-f:tools/testing/selftests/ftrace/ftracetest-ktap
-f:tools/testing/selftests/ftrace/poll.c
-f:tools/testing/selftests/ftrace/samples/fail.tc
-f:tools/testing/selftests/ftrace/samples/pass.tc
-f:tools/testing/selftests/ftrace/samples/unresolved.tc
-f:tools/testing/selftests/ftrace/samples/unsupported.tc
-f:tools/testing/selftests/ftrace/samples/untested.tc
-f:tools/testing/selftests/ftrace/samples/xfail.tc
-f:tools/testing/selftests/ftrace/settings
-f:tools/testing/selftests/ftrace/test.d/00basic/basic1.tc
-f:tools/testing/selftests/ftrace/test.d/00basic/basic2.tc
-f:tools/testing/selftests/ftrace/test.d/00basic/basic3.tc
-f:tools/testing/selftests/ftrace/test.d/00basic/basic4.tc
-f:tools/testing/selftests/ftrace/test.d/00basic/mount_options.tc
-f:tools/testing/selftests/ftrace/test.d/00basic/ringbuffer_size.tc
-f:tools/testing/selftests/ftrace/test.d/00basic/ringbuffer_subbuf_size.tc
-f:tools/testing/selftests/ftrace/test.d/00basic/snapshot.tc
-f:tools/testing/selftests/ftrace/test.d/00basic/snapshot1.tc
-f:tools/testing/selftests/ftrace/test.d/00basic/test_ownership.tc
-f:tools/testing/selftests/ftrace/test.d/00basic/trace_marker.tc
-f:tools/testing/selftests/ftrace/test.d/00basic/trace_pipe.tc
-f:tools/testing/selftests/ftrace/test.d/direct/ftrace-direct.tc
-f:tools/testing/selftests/ftrace/test.d/direct/kprobe-direct.tc
-f:tools/testing/selftests/ftrace/test.d/dynevent/add_remove_btfarg.tc
-f:tools/testing/selftests/ftrace/test.d/dynevent/add_remove_eprobe.tc
-f:tools/testing/selftests/ftrace/test.d/dynevent/add_remove_fprobe.tc
-f:tools/testing/selftests/ftrace/test.d/dynevent/add_remove_fprobe_repeat.tc
-f:tools/testing/selftests/ftrace/test.d/dynevent/add_remove_kprobe.tc
-f:tools/testing/selftests/ftrace/test.d/dynevent/add_remove_synth.tc
-f:tools/testing/selftests/ftrace/test.d/dynevent/add_remove_tprobe.tc
-f:tools/testing/selftests/ftrace/test.d/dynevent/add_remove_tprobe_module.tc
-f:tools/testing/selftests/ftrace/test.d/dynevent/add_remove_uprobe.tc
-f:tools/testing/selftests/ftrace/test.d/dynevent/clear_select_events.tc
-f:tools/testing/selftests/ftrace/test.d/dynevent/dynevent_limitations.tc
-f:tools/testing/selftests/ftrace/test.d/dynevent/eprobes_syntax_errors.tc
-f:tools/testing/selftests/ftrace/test.d/dynevent/fprobe_args_vfs.tc
-f:tools/testing/selftests/ftrace/test.d/dynevent/fprobe_entry_arg.tc
-f:tools/testing/selftests/ftrace/test.d/dynevent/fprobe_syntax_errors.tc
-f:tools/testing/selftests/ftrace/test.d/dynevent/generic_clear_event.tc
-f:tools/testing/selftests/ftrace/test.d/dynevent/test_duplicates.tc
-f:tools/testing/selftests/ftrace/test.d/dynevent/tprobe_syntax_errors.tc
-f:tools/testing/selftests/ftrace/test.d/event/event-enable.tc
-f:tools/testing/selftests/ftrace/test.d/event/event-mod.tc
-f:tools/testing/selftests/ftrace/test.d/event/event-no-pid.tc
-f:tools/testing/selftests/ftrace/test.d/event/event-pid.tc
-f:tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc
-f:tools/testing/selftests/ftrace/test.d/event/toplevel-enable.tc
-f:tools/testing/selftests/ftrace/test.d/event/trace_printk.tc
-f:tools/testing/selftests/ftrace/test.d/filter/event-filter-function.tc
-f:tools/testing/selftests/ftrace/test.d/ftrace/fgraph-filter-stack.tc
-f:tools/testing/selftests/ftrace/test.d/ftrace/fgraph-filter.tc
-f:tools/testing/selftests/ftrace/test.d/ftrace/fgraph-multi-filter.tc
-f:tools/testing/selftests/ftrace/test.d/ftrace/fgraph-multi.tc
-f:tools/testing/selftests/ftrace/test.d/ftrace/fgraph-profiler.tc
-f:tools/testing/selftests/ftrace/test.d/ftrace/fgraph-retval.tc
-f:tools/testing/selftests/ftrace/test.d/ftrace/func-filter-glob.tc
-f:tools/testing/selftests/ftrace/test.d/ftrace/func-filter-notrace-pid.tc
-f:tools/testing/selftests/ftrace/test.d/ftrace/func-filter-pid.tc
-f:tools/testing/selftests/ftrace/test.d/ftrace/func-filter-stacktrace.tc
-f:tools/testing/selftests/ftrace/test.d/ftrace/func_cpumask.tc
-f:tools/testing/selftests/ftrace/test.d/ftrace/func_event_triggers.tc
-f:tools/testing/selftests/ftrace/test.d/ftrace/func_hotplug.tc
-f:tools/testing/selftests/ftrace/test.d/ftrace/func_mod_trace.tc
-f:tools/testing/selftests/ftrace/test.d/ftrace/func_profile_stat.tc
-f:tools/testing/selftests/ftrace/test.d/ftrace/func_profiler.tc
-f:tools/testing/selftests/ftrace/test.d/ftrace/func_set_ftrace_file.tc
-f:tools/testing/selftests/ftrace/test.d/ftrace/func_stack_tracer.tc
-f:tools/testing/selftests/ftrace/test.d/ftrace/func_traceonoff_triggers.tc
-f:tools/testing/selftests/ftrace/test.d/ftrace/tracing-error-log.tc
-f:tools/testing/selftests/ftrace/test.d/functions
-f:tools/testing/selftests/ftrace/test.d/instances/instance-event.tc
-f:tools/testing/selftests/ftrace/test.d/instances/instance.tc
-f:tools/testing/selftests/ftrace/test.d/kprobe/add_and_remove.tc
-f:tools/testing/selftests/ftrace/test.d/kprobe/busy_check.tc
-f:tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args.tc
-f:tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_char.tc
-f:tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_comm.tc
-f:tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_string.tc
-f:tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_symbol.tc
-f:tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_syntax.tc
-f:tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_type.tc
-f:tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_user.tc
-f:tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_vfs.tc
-f:tools/testing/selftests/ftrace/test.d/kprobe/kprobe_eventname.tc
-f:tools/testing/selftests/ftrace/test.d/kprobe/kprobe_ftrace.tc
-f:tools/testing/selftests/ftrace/test.d/kprobe/kprobe_insn_boundary.tc
-f:tools/testing/selftests/ftrace/test.d/kprobe/kprobe_module.tc
-f:tools/testing/selftests/ftrace/test.d/kprobe/kprobe_multiprobe.tc
-f:tools/testing/selftests/ftrace/test.d/kprobe/kprobe_non_uniq_symbol.tc
-f:tools/testing/selftests/ftrace/test.d/kprobe/kprobe_opt_types.tc
-f:tools/testing/selftests/ftrace/test.d/kprobe/kprobe_syntax_errors.tc
-f:tools/testing/selftests/ftrace/test.d/kprobe/kretprobe_args.tc
-f:tools/testing/selftests/ftrace/test.d/kprobe/kretprobe_entry_arg.tc
-f:tools/testing/selftests/ftrace/test.d/kprobe/kretprobe_maxactive.tc
-f:tools/testing/selftests/ftrace/test.d/kprobe/kretprobe_return_suffix.tc
-f:tools/testing/selftests/ftrace/test.d/kprobe/multiple_kprobes.tc
-f:tools/testing/selftests/ftrace/test.d/kprobe/probepoint.tc
-f:tools/testing/selftests/ftrace/test.d/kprobe/profile.tc
-f:tools/testing/selftests/ftrace/test.d/kprobe/uprobe_syntax_errors.tc
-f:tools/testing/selftests/ftrace/test.d/preemptirq/irqsoff_tracer.tc
-f:tools/testing/selftests/ftrace/test.d/selftest/bashisms.tc
-f:tools/testing/selftests/ftrace/test.d/template
-f:tools/testing/selftests/ftrace/test.d/tracer/wakeup.tc
-f:tools/testing/selftests/ftrace/test.d/tracer/wakeup_rt.tc
-f:tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-action-hist-xfail.tc
-f:tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-field-variable-support.tc
-f:tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-inter-event-combined-hist.tc
-f:tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-multi-actions-accept.tc
-f:tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onchange-action-hist.tc
-f:tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-action-hist.tc
-f:tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-onmax-action-hist.tc
-f:tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmax-action-hist.tc
-f:tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-snapshot-action-hist.tc
-f:tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-eprobe.tc
-f:tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-createremove.tc
-f:tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-dynstring.tc
-f:tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-stack-legacy.tc
-f:tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-stack.tc
-f:tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-syntax.tc
-f:tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic_event_syntax_errors.tc
-f:tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-trace-action-hist.tc
-f:tools/testing/selftests/ftrace/test.d/trigger/trigger-eventonoff.tc
-f:tools/testing/selftests/ftrace/test.d/trigger/trigger-filter.tc
-f:tools/testing/selftests/ftrace/test.d/trigger/trigger-hist-expressions.tc
-f:tools/testing/selftests/ftrace/test.d/trigger/trigger-hist-mod.tc
-f:tools/testing/selftests/ftrace/test.d/trigger/trigger-hist-poll.tc
-f:tools/testing/selftests/ftrace/test.d/trigger/trigger-hist-syntax-errors.tc
-f:tools/testing/selftests/ftrace/test.d/trigger/trigger-hist.tc
-f:tools/testing/selftests/ftrace/test.d/trigger/trigger-multihist.tc
-f:tools/testing/selftests/ftrace/test.d/trigger/trigger-snapshot.tc
-f:tools/testing/selftests/ftrace/test.d/trigger/trigger-stacktrace.tc
-f:tools/testing/selftests/ftrace/test.d/trigger/trigger-trace-marker-hist.tc
-f:tools/testing/selftests/ftrace/test.d/trigger/trigger-trace-marker-snapshot.tc
-f:tools/testing/selftests/ftrace/test.d/trigger/trigger-trace-marker-synthetic-kernel.tc
-f:tools/testing/selftests/ftrace/test.d/trigger/trigger-trace-marker-synthetic.tc
-f:tools/testing/selftests/ftrace/test.d/trigger/trigger-traceonoff.tc
-f:tools/testing/selftests/futex/Makefile
-f:tools/testing/selftests/futex/README
-f:tools/testing/selftests/futex/functional/.gitignore
-f:tools/testing/selftests/futex/functional/Makefile
-f:tools/testing/selftests/futex/functional/futex_numa.c
-f:tools/testing/selftests/futex/functional/futex_numa_mpol.c
-f:tools/testing/selftests/futex/functional/futex_priv_hash.c
-f:tools/testing/selftests/futex/functional/futex_requeue.c
-f:tools/testing/selftests/futex/functional/futex_requeue_pi.c
-f:tools/testing/selftests/futex/functional/futex_requeue_pi_mismatched_ops.c
-f:tools/testing/selftests/futex/functional/futex_requeue_pi_signal_restart.c
-f:tools/testing/selftests/futex/functional/futex_wait.c
-f:tools/testing/selftests/futex/functional/futex_wait_private_mapped_file.c
-f:tools/testing/selftests/futex/functional/futex_wait_timeout.c
-f:tools/testing/selftests/futex/functional/futex_wait_uninitialized_heap.c
-f:tools/testing/selftests/futex/functional/futex_wait_wouldblock.c
-f:tools/testing/selftests/futex/functional/futex_waitv.c
-f:tools/testing/selftests/futex/functional/run.sh
-f:tools/testing/selftests/futex/include/atomic.h
-f:tools/testing/selftests/futex/include/futex2test.h
-f:tools/testing/selftests/futex/include/futextest.h
-f:tools/testing/selftests/futex/include/logging.h
-f:tools/testing/selftests/futex/run.sh
-f:tools/testing/selftests/gen_kselftest_tar.sh
-f:tools/testing/selftests/gpio/.gitignore
-f:tools/testing/selftests/gpio/Makefile
-f:tools/testing/selftests/gpio/config
-f:tools/testing/selftests/gpio/gpio-aggregator.sh
-f:tools/testing/selftests/gpio/gpio-chip-info.c
-f:tools/testing/selftests/gpio/gpio-line-name.c
-f:tools/testing/selftests/gpio/gpio-mockup-cdev.c
-f:tools/testing/selftests/gpio/gpio-mockup-sysfs.sh
-f:tools/testing/selftests/gpio/gpio-mockup.sh
-f:tools/testing/selftests/gpio/gpio-sim.sh
-f:tools/testing/selftests/hid/.gitignore
-f:tools/testing/selftests/hid/Makefile
-f:tools/testing/selftests/hid/config
-f:tools/testing/selftests/hid/config.common
-f:tools/testing/selftests/hid/config.x86_64
-f:tools/testing/selftests/hid/hid-apple.sh
-f:tools/testing/selftests/hid/hid-core.sh
-f:tools/testing/selftests/hid/hid-gamepad.sh
-f:tools/testing/selftests/hid/hid-ite.sh
-f:tools/testing/selftests/hid/hid-keyboard.sh
-f:tools/testing/selftests/hid/hid-mouse.sh
-f:tools/testing/selftests/hid/hid-multitouch.sh
-f:tools/testing/selftests/hid/hid-sony.sh
-f:tools/testing/selftests/hid/hid-tablet.sh
-f:tools/testing/selftests/hid/hid-usb_crash.sh
-f:tools/testing/selftests/hid/hid-wacom.sh
-f:tools/testing/selftests/hid/hid_bpf.c
-f:tools/testing/selftests/hid/hid_common.h
-f:tools/testing/selftests/hid/hidraw.c
-f:tools/testing/selftests/hid/progs/hid.c
-f:tools/testing/selftests/hid/progs/hid_bpf_helpers.h
-f:tools/testing/selftests/hid/run-hid-tools-tests.sh
-f:tools/testing/selftests/hid/settings
-f:tools/testing/selftests/hid/tests/__init__.py
-f:tools/testing/selftests/hid/tests/base.py
-f:tools/testing/selftests/hid/tests/base_device.py
-f:tools/testing/selftests/hid/tests/base_gamepad.py
-f:tools/testing/selftests/hid/tests/conftest.py
-f:tools/testing/selftests/hid/tests/descriptors_wacom.py
-f:tools/testing/selftests/hid/tests/test_apple_keyboard.py
-f:tools/testing/selftests/hid/tests/test_gamepad.py
-f:tools/testing/selftests/hid/tests/test_hid_core.py
-f:tools/testing/selftests/hid/tests/test_ite_keyboard.py
-f:tools/testing/selftests/hid/tests/test_keyboard.py
-f:tools/testing/selftests/hid/tests/test_mouse.py
-f:tools/testing/selftests/hid/tests/test_multitouch.py
-f:tools/testing/selftests/hid/tests/test_sony.py
-f:tools/testing/selftests/hid/tests/test_tablet.py
-f:tools/testing/selftests/hid/tests/test_usb_crash.py
-f:tools/testing/selftests/hid/tests/test_wacom_generic.py
-f:tools/testing/selftests/hid/vmtest.sh
-f:tools/testing/selftests/ia64/.gitignore
-f:tools/testing/selftests/ia64/Makefile
-f:tools/testing/selftests/ia64/aliasing-test.c
-f:tools/testing/selftests/intel_pstate/.gitignore
-f:tools/testing/selftests/intel_pstate/Makefile
-f:tools/testing/selftests/intel_pstate/aperf.c
-f:tools/testing/selftests/intel_pstate/msr.c
-f:tools/testing/selftests/intel_pstate/run.sh
-f:tools/testing/selftests/iommu/.gitignore
-f:tools/testing/selftests/iommu/Makefile
-f:tools/testing/selftests/iommu/config
-f:tools/testing/selftests/iommu/iommufd.c
-f:tools/testing/selftests/iommu/iommufd_fail_nth.c
-f:tools/testing/selftests/iommu/iommufd_utils.h
-f:tools/testing/selftests/ipc/.gitignore
-f:tools/testing/selftests/ipc/Makefile
-f:tools/testing/selftests/ipc/config
-f:tools/testing/selftests/ipc/msgque.c
-f:tools/testing/selftests/ir/.gitignore
-f:tools/testing/selftests/ir/Makefile
-f:tools/testing/selftests/ir/ir_loopback.c
-f:tools/testing/selftests/ir/ir_loopback.sh
-f:tools/testing/selftests/kcmp/.gitignore
-f:tools/testing/selftests/kcmp/Makefile
-f:tools/testing/selftests/kcmp/kcmp_test.c
-f:tools/testing/selftests/kexec/Makefile
-f:tools/testing/selftests/kexec/config
-f:tools/testing/selftests/kexec/kexec_common_lib.sh
-f:tools/testing/selftests/kexec/test_kexec_file_load.sh
-f:tools/testing/selftests/kexec/test_kexec_jump.c
-f:tools/testing/selftests/kexec/test_kexec_jump.sh
-f:tools/testing/selftests/kexec/test_kexec_load.sh
-f:tools/testing/selftests/kmod/Makefile
-f:tools/testing/selftests/kmod/config
-f:tools/testing/selftests/kmod/kmod.sh
-f:tools/testing/selftests/kselftest.h
-f:tools/testing/selftests/kselftest/ksft.py
-f:tools/testing/selftests/kselftest/ktap_helpers.sh
-f:tools/testing/selftests/kselftest/module.sh
-f:tools/testing/selftests/kselftest/prefix.pl
-f:tools/testing/selftests/kselftest/runner.sh
-f:tools/testing/selftests/kselftest_deps.sh
-f:tools/testing/selftests/kselftest_harness.h
-f:tools/testing/selftests/kselftest_harness/.gitignore
-f:tools/testing/selftests/kselftest_harness/Makefile
-f:tools/testing/selftests/kselftest_harness/harness-selftest.c
-f:tools/testing/selftests/kselftest_harness/harness-selftest.expected
-f:tools/testing/selftests/kselftest_harness/harness-selftest.sh
-f:tools/testing/selftests/kselftest_install.sh
-f:tools/testing/selftests/kselftest_module.h
-f:tools/testing/selftests/kvm/.gitignore
-f:tools/testing/selftests/kvm/Makefile
-f:tools/testing/selftests/kvm/Makefile.kvm
-f:tools/testing/selftests/kvm/access_tracking_perf_test.c
-f:tools/testing/selftests/kvm/arch_timer.c
-f:tools/testing/selftests/kvm/arm64/aarch32_id_regs.c
-f:tools/testing/selftests/kvm/arm64/arch_timer.c
-f:tools/testing/selftests/kvm/arm64/arch_timer_edge_cases.c
-f:tools/testing/selftests/kvm/arm64/debug-exceptions.c
-f:tools/testing/selftests/kvm/arm64/external_aborts.c
-f:tools/testing/selftests/kvm/arm64/get-reg-list.c
-f:tools/testing/selftests/kvm/arm64/host_sve.c
-f:tools/testing/selftests/kvm/arm64/hypercalls.c
-f:tools/testing/selftests/kvm/arm64/no-vgic-v3.c
-f:tools/testing/selftests/kvm/arm64/page_fault_test.c
-f:tools/testing/selftests/kvm/arm64/psci_test.c
-f:tools/testing/selftests/kvm/arm64/set_id_regs.c
-f:tools/testing/selftests/kvm/arm64/smccc_filter.c
-f:tools/testing/selftests/kvm/arm64/vcpu_width_config.c
-f:tools/testing/selftests/kvm/arm64/vgic_init.c
-f:tools/testing/selftests/kvm/arm64/vgic_irq.c
-f:tools/testing/selftests/kvm/arm64/vgic_lpi_stress.c
-f:tools/testing/selftests/kvm/arm64/vpmu_counter_access.c
-f:tools/testing/selftests/kvm/coalesced_io_test.c
-f:tools/testing/selftests/kvm/config
-f:tools/testing/selftests/kvm/demand_paging_test.c
-f:tools/testing/selftests/kvm/dirty_log_perf_test.c
-f:tools/testing/selftests/kvm/dirty_log_test.c
-f:tools/testing/selftests/kvm/get-reg-list.c
-f:tools/testing/selftests/kvm/guest_memfd_test.c
-f:tools/testing/selftests/kvm/guest_print_test.c
-f:tools/testing/selftests/kvm/hardware_disable_test.c
-f:tools/testing/selftests/kvm/include/arm64/arch_timer.h
-f:tools/testing/selftests/kvm/include/arm64/delay.h
-f:tools/testing/selftests/kvm/include/arm64/gic.h
-f:tools/testing/selftests/kvm/include/arm64/gic_v3.h
-f:tools/testing/selftests/kvm/include/arm64/gic_v3_its.h
-f:tools/testing/selftests/kvm/include/arm64/kvm_util_arch.h
-f:tools/testing/selftests/kvm/include/arm64/processor.h
-f:tools/testing/selftests/kvm/include/arm64/spinlock.h
-f:tools/testing/selftests/kvm/include/arm64/ucall.h
-f:tools/testing/selftests/kvm/include/arm64/vgic.h
-f:tools/testing/selftests/kvm/include/guest_modes.h
-f:tools/testing/selftests/kvm/include/kvm_test_harness.h
-f:tools/testing/selftests/kvm/include/kvm_util.h
-f:tools/testing/selftests/kvm/include/kvm_util_types.h
-f:tools/testing/selftests/kvm/include/loongarch/kvm_util_arch.h
-f:tools/testing/selftests/kvm/include/loongarch/processor.h
-f:tools/testing/selftests/kvm/include/loongarch/ucall.h
-f:tools/testing/selftests/kvm/include/lru_gen_util.h
-f:tools/testing/selftests/kvm/include/memstress.h
-f:tools/testing/selftests/kvm/include/numaif.h
-f:tools/testing/selftests/kvm/include/riscv/arch_timer.h
-f:tools/testing/selftests/kvm/include/riscv/kvm_util_arch.h
-f:tools/testing/selftests/kvm/include/riscv/processor.h
-f:tools/testing/selftests/kvm/include/riscv/sbi.h
-f:tools/testing/selftests/kvm/include/riscv/ucall.h
-f:tools/testing/selftests/kvm/include/s390/debug_print.h
-f:tools/testing/selftests/kvm/include/s390/diag318_test_handler.h
-f:tools/testing/selftests/kvm/include/s390/facility.h
-f:tools/testing/selftests/kvm/include/s390/kvm_util_arch.h
-f:tools/testing/selftests/kvm/include/s390/processor.h
-f:tools/testing/selftests/kvm/include/s390/sie.h
-f:tools/testing/selftests/kvm/include/s390/ucall.h
-f:tools/testing/selftests/kvm/include/sparsebit.h
-f:tools/testing/selftests/kvm/include/test_util.h
-f:tools/testing/selftests/kvm/include/timer_test.h
-f:tools/testing/selftests/kvm/include/ucall_common.h
-f:tools/testing/selftests/kvm/include/userfaultfd_util.h
-f:tools/testing/selftests/kvm/include/x86/apic.h
-f:tools/testing/selftests/kvm/include/x86/evmcs.h
-f:tools/testing/selftests/kvm/include/x86/hyperv.h
-f:tools/testing/selftests/kvm/include/x86/kvm_util_arch.h
-f:tools/testing/selftests/kvm/include/x86/mce.h
-f:tools/testing/selftests/kvm/include/x86/pmu.h
-f:tools/testing/selftests/kvm/include/x86/processor.h
-f:tools/testing/selftests/kvm/include/x86/sev.h
-f:tools/testing/selftests/kvm/include/x86/svm.h
-f:tools/testing/selftests/kvm/include/x86/svm_util.h
-f:tools/testing/selftests/kvm/include/x86/ucall.h
-f:tools/testing/selftests/kvm/include/x86/vmx.h
-f:tools/testing/selftests/kvm/irqfd_test.c
-f:tools/testing/selftests/kvm/kvm_binary_stats_test.c
-f:tools/testing/selftests/kvm/kvm_create_max_vcpus.c
-f:tools/testing/selftests/kvm/kvm_page_table_test.c
-f:tools/testing/selftests/kvm/lib/arm64/gic.c
-f:tools/testing/selftests/kvm/lib/arm64/gic_private.h
-f:tools/testing/selftests/kvm/lib/arm64/gic_v3.c
-f:tools/testing/selftests/kvm/lib/arm64/gic_v3_its.c
-f:tools/testing/selftests/kvm/lib/arm64/handlers.S
-f:tools/testing/selftests/kvm/lib/arm64/processor.c
-f:tools/testing/selftests/kvm/lib/arm64/spinlock.c
-f:tools/testing/selftests/kvm/lib/arm64/ucall.c
-f:tools/testing/selftests/kvm/lib/arm64/vgic.c
-f:tools/testing/selftests/kvm/lib/assert.c
-f:tools/testing/selftests/kvm/lib/elf.c
-f:tools/testing/selftests/kvm/lib/guest_modes.c
-f:tools/testing/selftests/kvm/lib/guest_sprintf.c
-f:tools/testing/selftests/kvm/lib/io.c
-f:tools/testing/selftests/kvm/lib/kvm_util.c
-f:tools/testing/selftests/kvm/lib/loongarch/exception.S
-f:tools/testing/selftests/kvm/lib/loongarch/processor.c
-f:tools/testing/selftests/kvm/lib/loongarch/ucall.c
-f:tools/testing/selftests/kvm/lib/lru_gen_util.c
-f:tools/testing/selftests/kvm/lib/memstress.c
-f:tools/testing/selftests/kvm/lib/rbtree.c
-f:tools/testing/selftests/kvm/lib/riscv/handlers.S
-f:tools/testing/selftests/kvm/lib/riscv/processor.c
-f:tools/testing/selftests/kvm/lib/riscv/ucall.c
-f:tools/testing/selftests/kvm/lib/s390/diag318_test_handler.c
-f:tools/testing/selftests/kvm/lib/s390/facility.c
-f:tools/testing/selftests/kvm/lib/s390/processor.c
-f:tools/testing/selftests/kvm/lib/s390/ucall.c
-f:tools/testing/selftests/kvm/lib/sparsebit.c
-f:tools/testing/selftests/kvm/lib/string_override.c
-f:tools/testing/selftests/kvm/lib/test_util.c
-f:tools/testing/selftests/kvm/lib/ucall_common.c
-f:tools/testing/selftests/kvm/lib/userfaultfd_util.c
-f:tools/testing/selftests/kvm/lib/x86/apic.c
-f:tools/testing/selftests/kvm/lib/x86/handlers.S
-f:tools/testing/selftests/kvm/lib/x86/hyperv.c
-f:tools/testing/selftests/kvm/lib/x86/memstress.c
-f:tools/testing/selftests/kvm/lib/x86/pmu.c
-f:tools/testing/selftests/kvm/lib/x86/processor.c
-f:tools/testing/selftests/kvm/lib/x86/sev.c
-f:tools/testing/selftests/kvm/lib/x86/svm.c
-f:tools/testing/selftests/kvm/lib/x86/ucall.c
-f:tools/testing/selftests/kvm/lib/x86/vmx.c
-f:tools/testing/selftests/kvm/memslot_modification_stress_test.c
-f:tools/testing/selftests/kvm/memslot_perf_test.c
-f:tools/testing/selftests/kvm/mmu_stress_test.c
-f:tools/testing/selftests/kvm/pre_fault_memory_test.c
-f:tools/testing/selftests/kvm/riscv/arch_timer.c
-f:tools/testing/selftests/kvm/riscv/ebreak_test.c
-f:tools/testing/selftests/kvm/riscv/get-reg-list.c
-f:tools/testing/selftests/kvm/riscv/sbi_pmu_test.c
-f:tools/testing/selftests/kvm/rseq_test.c
-f:tools/testing/selftests/kvm/s390/cmma_test.c
-f:tools/testing/selftests/kvm/s390/config
-f:tools/testing/selftests/kvm/s390/cpumodel_subfuncs_test.c
-f:tools/testing/selftests/kvm/s390/debug_test.c
-f:tools/testing/selftests/kvm/s390/memop.c
-f:tools/testing/selftests/kvm/s390/resets.c
-f:tools/testing/selftests/kvm/s390/shared_zeropage_test.c
-f:tools/testing/selftests/kvm/s390/sync_regs_test.c
-f:tools/testing/selftests/kvm/s390/tprot.c
-f:tools/testing/selftests/kvm/s390/ucontrol_test.c
-f:tools/testing/selftests/kvm/set_memory_region_test.c
-f:tools/testing/selftests/kvm/settings
-f:tools/testing/selftests/kvm/steal_time.c
-f:tools/testing/selftests/kvm/system_counter_offset_test.c
-f:tools/testing/selftests/kvm/x86/amx_test.c
-f:tools/testing/selftests/kvm/x86/aperfmperf_test.c
-f:tools/testing/selftests/kvm/x86/apic_bus_clock_test.c
-f:tools/testing/selftests/kvm/x86/cpuid_test.c
-f:tools/testing/selftests/kvm/x86/cr4_cpuid_sync_test.c
-f:tools/testing/selftests/kvm/x86/debug_regs.c
-f:tools/testing/selftests/kvm/x86/dirty_log_page_splitting_test.c
-f:tools/testing/selftests/kvm/x86/exit_on_emulation_failure_test.c
-f:tools/testing/selftests/kvm/x86/fastops_test.c
-f:tools/testing/selftests/kvm/x86/feature_msrs_test.c
-f:tools/testing/selftests/kvm/x86/fix_hypercall_test.c
-f:tools/testing/selftests/kvm/x86/flds_emulation.h
-f:tools/testing/selftests/kvm/x86/hwcr_msr_test.c
-f:tools/testing/selftests/kvm/x86/hyperv_clock.c
-f:tools/testing/selftests/kvm/x86/hyperv_cpuid.c
-f:tools/testing/selftests/kvm/x86/hyperv_evmcs.c
-f:tools/testing/selftests/kvm/x86/hyperv_extended_hypercalls.c
-f:tools/testing/selftests/kvm/x86/hyperv_features.c
-f:tools/testing/selftests/kvm/x86/hyperv_ipi.c
-f:tools/testing/selftests/kvm/x86/hyperv_svm_test.c
-f:tools/testing/selftests/kvm/x86/hyperv_tlb_flush.c
-f:tools/testing/selftests/kvm/x86/kvm_buslock_test.c
-f:tools/testing/selftests/kvm/x86/kvm_clock_test.c
-f:tools/testing/selftests/kvm/x86/kvm_pv_test.c
-f:tools/testing/selftests/kvm/x86/max_vcpuid_cap_test.c
-f:tools/testing/selftests/kvm/x86/monitor_mwait_test.c
-f:tools/testing/selftests/kvm/x86/nested_emulation_test.c
-f:tools/testing/selftests/kvm/x86/nested_exceptions_test.c
-f:tools/testing/selftests/kvm/x86/nx_huge_pages_test.c
-f:tools/testing/selftests/kvm/x86/nx_huge_pages_test.sh
-f:tools/testing/selftests/kvm/x86/platform_info_test.c
-f:tools/testing/selftests/kvm/x86/pmu_counters_test.c
-f:tools/testing/selftests/kvm/x86/pmu_event_filter_test.c
-f:tools/testing/selftests/kvm/x86/private_mem_conversions_test.c
-f:tools/testing/selftests/kvm/x86/private_mem_kvm_exits_test.c
-f:tools/testing/selftests/kvm/x86/recalc_apic_map_test.c
-f:tools/testing/selftests/kvm/x86/set_boot_cpu_id.c
-f:tools/testing/selftests/kvm/x86/set_sregs_test.c
-f:tools/testing/selftests/kvm/x86/sev_init2_tests.c
-f:tools/testing/selftests/kvm/x86/sev_migrate_tests.c
-f:tools/testing/selftests/kvm/x86/sev_smoke_test.c
-f:tools/testing/selftests/kvm/x86/smaller_maxphyaddr_emulation_test.c
-f:tools/testing/selftests/kvm/x86/smm_test.c
-f:tools/testing/selftests/kvm/x86/state_test.c
-f:tools/testing/selftests/kvm/x86/svm_int_ctl_test.c
-f:tools/testing/selftests/kvm/x86/svm_nested_shutdown_test.c
-f:tools/testing/selftests/kvm/x86/svm_nested_soft_inject_test.c
-f:tools/testing/selftests/kvm/x86/svm_vmcall_test.c
-f:tools/testing/selftests/kvm/x86/sync_regs_test.c
-f:tools/testing/selftests/kvm/x86/triple_fault_event_test.c
-f:tools/testing/selftests/kvm/x86/tsc_msrs_test.c
-f:tools/testing/selftests/kvm/x86/tsc_scaling_sync.c
-f:tools/testing/selftests/kvm/x86/ucna_injection_test.c
-f:tools/testing/selftests/kvm/x86/userspace_io_test.c
-f:tools/testing/selftests/kvm/x86/userspace_msr_exit_test.c
-f:tools/testing/selftests/kvm/x86/vmx_apic_access_test.c
-f:tools/testing/selftests/kvm/x86/vmx_close_while_nested_test.c
-f:tools/testing/selftests/kvm/x86/vmx_dirty_log_test.c
-f:tools/testing/selftests/kvm/x86/vmx_exception_with_invalid_guest_state.c
-f:tools/testing/selftests/kvm/x86/vmx_invalid_nested_guest_state.c
-f:tools/testing/selftests/kvm/x86/vmx_msrs_test.c
-f:tools/testing/selftests/kvm/x86/vmx_nested_tsc_scaling_test.c
-f:tools/testing/selftests/kvm/x86/vmx_pmu_caps_test.c
-f:tools/testing/selftests/kvm/x86/vmx_preemption_timer_test.c
-f:tools/testing/selftests/kvm/x86/vmx_set_nested_state_test.c
-f:tools/testing/selftests/kvm/x86/vmx_tsc_adjust_test.c
-f:tools/testing/selftests/kvm/x86/xapic_ipi_test.c
-f:tools/testing/selftests/kvm/x86/xapic_state_test.c
-f:tools/testing/selftests/kvm/x86/xcr0_cpuid_test.c
-f:tools/testing/selftests/kvm/x86/xen_shinfo_test.c
-f:tools/testing/selftests/kvm/x86/xen_vmcall_test.c
-f:tools/testing/selftests/kvm/x86/xss_msr_test.c
-f:tools/testing/selftests/landlock/.gitignore
-f:tools/testing/selftests/landlock/Makefile
-f:tools/testing/selftests/landlock/audit.h
-f:tools/testing/selftests/landlock/audit_test.c
-f:tools/testing/selftests/landlock/base_test.c
-f:tools/testing/selftests/landlock/common.h
-f:tools/testing/selftests/landlock/config
-f:tools/testing/selftests/landlock/config.um
-f:tools/testing/selftests/landlock/fs_test.c
-f:tools/testing/selftests/landlock/net_test.c
-f:tools/testing/selftests/landlock/ptrace_test.c
-f:tools/testing/selftests/landlock/sandbox-and-launch.c
-f:tools/testing/selftests/landlock/scoped_abstract_unix_test.c
-f:tools/testing/selftests/landlock/scoped_base_variants.h
-f:tools/testing/selftests/landlock/scoped_common.h
-f:tools/testing/selftests/landlock/scoped_multiple_domain_variants.h
-f:tools/testing/selftests/landlock/scoped_signal_test.c
-f:tools/testing/selftests/landlock/scoped_test.c
-f:tools/testing/selftests/landlock/true.c
-f:tools/testing/selftests/landlock/wait-pipe-sandbox.c
-f:tools/testing/selftests/landlock/wait-pipe.c
-f:tools/testing/selftests/landlock/wrappers.h
-f:tools/testing/selftests/lib.mk
-f:tools/testing/selftests/lib/Makefile
-f:tools/testing/selftests/lib/bitmap.sh
-f:tools/testing/selftests/lib/config
-f:tools/testing/selftests/livepatch/.gitignore
-f:tools/testing/selftests/livepatch/Makefile
-f:tools/testing/selftests/livepatch/README
-f:tools/testing/selftests/livepatch/config
-f:tools/testing/selftests/livepatch/functions.sh
-f:tools/testing/selftests/livepatch/settings
-f:tools/testing/selftests/livepatch/test-callbacks.sh
-f:tools/testing/selftests/livepatch/test-ftrace.sh
-f:tools/testing/selftests/livepatch/test-kprobe.sh
-f:tools/testing/selftests/livepatch/test-livepatch.sh
-f:tools/testing/selftests/livepatch/test-shadow-vars.sh
-f:tools/testing/selftests/livepatch/test-state.sh
-f:tools/testing/selftests/livepatch/test-syscall.sh
-f:tools/testing/selftests/livepatch/test-sysfs.sh
-f:tools/testing/selftests/livepatch/test_klp-call_getpid.c
-f:tools/testing/selftests/livepatch/test_modules/Makefile
-f:tools/testing/selftests/livepatch/test_modules/test_klp_atomic_replace.c
-f:tools/testing/selftests/livepatch/test_modules/test_klp_callbacks_busy.c
-f:tools/testing/selftests/livepatch/test_modules/test_klp_callbacks_demo.c
-f:tools/testing/selftests/livepatch/test_modules/test_klp_callbacks_demo2.c
-f:tools/testing/selftests/livepatch/test_modules/test_klp_callbacks_mod.c
-f:tools/testing/selftests/livepatch/test_modules/test_klp_kprobe.c
-f:tools/testing/selftests/livepatch/test_modules/test_klp_livepatch.c
-f:tools/testing/selftests/livepatch/test_modules/test_klp_shadow_vars.c
-f:tools/testing/selftests/livepatch/test_modules/test_klp_state.c
-f:tools/testing/selftests/livepatch/test_modules/test_klp_state2.c
-f:tools/testing/selftests/livepatch/test_modules/test_klp_state3.c
-f:tools/testing/selftests/livepatch/test_modules/test_klp_syscall.c
-f:tools/testing/selftests/lkdtm/.gitignore
-f:tools/testing/selftests/lkdtm/Makefile
-f:tools/testing/selftests/lkdtm/config
-f:tools/testing/selftests/lkdtm/run.sh
-f:tools/testing/selftests/lkdtm/stack-entropy.sh
-f:tools/testing/selftests/lkdtm/tests.txt
-f:tools/testing/selftests/locking/Makefile
-f:tools/testing/selftests/locking/ww_mutex.sh
-f:tools/testing/selftests/lsm/.gitignore
-f:tools/testing/selftests/lsm/Makefile
-f:tools/testing/selftests/lsm/common.c
-f:tools/testing/selftests/lsm/common.h
-f:tools/testing/selftests/lsm/config
-f:tools/testing/selftests/lsm/lsm_get_self_attr_test.c
-f:tools/testing/selftests/lsm/lsm_list_modules_test.c
-f:tools/testing/selftests/lsm/lsm_set_self_attr_test.c
-f:tools/testing/selftests/media_tests/.gitignore
-f:tools/testing/selftests/media_tests/Makefile
-f:tools/testing/selftests/media_tests/bind_unbind_sample.sh
-f:tools/testing/selftests/media_tests/media_dev_allocator.sh
-f:tools/testing/selftests/media_tests/media_device_open.c
-f:tools/testing/selftests/media_tests/media_device_test.c
-f:tools/testing/selftests/media_tests/open_loop_test.sh
-f:tools/testing/selftests/media_tests/regression_test.txt
-f:tools/testing/selftests/media_tests/video_device_test.c
-f:tools/testing/selftests/membarrier/.gitignore
-f:tools/testing/selftests/membarrier/Makefile
-f:tools/testing/selftests/membarrier/membarrier_test_impl.h
-f:tools/testing/selftests/membarrier/membarrier_test_multi_thread.c
-f:tools/testing/selftests/membarrier/membarrier_test_single_thread.c
-f:tools/testing/selftests/memfd/.gitignore
-f:tools/testing/selftests/memfd/Makefile
-f:tools/testing/selftests/memfd/common.c
-f:tools/testing/selftests/memfd/common.h
-f:tools/testing/selftests/memfd/config
-f:tools/testing/selftests/memfd/fuse_mnt.c
-f:tools/testing/selftests/memfd/fuse_test.c
-f:tools/testing/selftests/memfd/memfd_test.c
-f:tools/testing/selftests/memfd/run_fuse_test.sh
-f:tools/testing/selftests/memfd/run_hugetlbfs_test.sh
-f:tools/testing/selftests/memory-hotplug/Makefile
-f:tools/testing/selftests/memory-hotplug/config
-f:tools/testing/selftests/memory-hotplug/mem-on-off-test.sh
-f:tools/testing/selftests/mincore/.gitignore
-f:tools/testing/selftests/mincore/Makefile
-f:tools/testing/selftests/mincore/mincore_selftest.c
-f:tools/testing/selftests/mm/.gitignore
-f:tools/testing/selftests/mm/Makefile
-f:tools/testing/selftests/mm/charge_reserved_hugetlb.sh
-f:tools/testing/selftests/mm/check_config.sh
-f:tools/testing/selftests/mm/compaction_test.c
-f:tools/testing/selftests/mm/config
-f:tools/testing/selftests/mm/cow.c
-f:tools/testing/selftests/mm/droppable.c
-f:tools/testing/selftests/mm/guard-regions.c
-f:tools/testing/selftests/mm/gup_longterm.c
-f:tools/testing/selftests/mm/gup_test.c
-f:tools/testing/selftests/mm/hmm-tests.c
-f:tools/testing/selftests/mm/hugepage-mmap.c
-f:tools/testing/selftests/mm/hugepage-mremap.c
-f:tools/testing/selftests/mm/hugepage-shm.c
-f:tools/testing/selftests/mm/hugepage-vmemmap.c
-f:tools/testing/selftests/mm/hugetlb-madvise.c
-f:tools/testing/selftests/mm/hugetlb-read-hwpoison.c
-f:tools/testing/selftests/mm/hugetlb-soft-offline.c
-f:tools/testing/selftests/mm/hugetlb_dio.c
-f:tools/testing/selftests/mm/hugetlb_fault_after_madv.c
-f:tools/testing/selftests/mm/hugetlb_madv_vs_map.c
-f:tools/testing/selftests/mm/hugetlb_reparenting_test.sh
-f:tools/testing/selftests/mm/khugepaged.c
-f:tools/testing/selftests/mm/ksm_functional_tests.c
-f:tools/testing/selftests/mm/ksm_tests.c
-f:tools/testing/selftests/mm/madv_populate.c
-f:tools/testing/selftests/mm/map_fixed_noreplace.c
-f:tools/testing/selftests/mm/map_hugetlb.c
-f:tools/testing/selftests/mm/map_populate.c
-f:tools/testing/selftests/mm/mdwe_test.c
-f:tools/testing/selftests/mm/memfd_secret.c
-f:tools/testing/selftests/mm/merge.c
-f:tools/testing/selftests/mm/migration.c
-f:tools/testing/selftests/mm/mkdirty.c
-f:tools/testing/selftests/mm/mlock-random-test.c
-f:tools/testing/selftests/mm/mlock2-tests.c
-f:tools/testing/selftests/mm/mlock2.h
-f:tools/testing/selftests/mm/mrelease_test.c
-f:tools/testing/selftests/mm/mremap_dontunmap.c
-f:tools/testing/selftests/mm/mremap_test.c
-f:tools/testing/selftests/mm/mseal_helpers.h
-f:tools/testing/selftests/mm/mseal_test.c
-f:tools/testing/selftests/mm/on-fault-limit.c
-f:tools/testing/selftests/mm/page_frag/Makefile
-f:tools/testing/selftests/mm/page_frag/page_frag_test.c
-f:tools/testing/selftests/mm/pagemap_ioctl.c
-f:tools/testing/selftests/mm/pfnmap.c
-f:tools/testing/selftests/mm/pkey-arm64.h
-f:tools/testing/selftests/mm/pkey-helpers.h
-f:tools/testing/selftests/mm/pkey-powerpc.h
-f:tools/testing/selftests/mm/pkey-x86.h
-f:tools/testing/selftests/mm/pkey_sighandler_tests.c
-f:tools/testing/selftests/mm/pkey_util.c
-f:tools/testing/selftests/mm/protection_keys.c
-f:tools/testing/selftests/mm/run_vmtests.sh
-f:tools/testing/selftests/mm/settings
-f:tools/testing/selftests/mm/soft-dirty.c
-f:tools/testing/selftests/mm/split_huge_page_test.c
-f:tools/testing/selftests/mm/test_hmm.sh
-f:tools/testing/selftests/mm/test_page_frag.sh
-f:tools/testing/selftests/mm/test_vmalloc.sh
-f:tools/testing/selftests/mm/thp_settings.c
-f:tools/testing/selftests/mm/thp_settings.h
-f:tools/testing/selftests/mm/thuge-gen.c
-f:tools/testing/selftests/mm/transhuge-stress.c
-f:tools/testing/selftests/mm/uffd-common.c
-f:tools/testing/selftests/mm/uffd-common.h
-f:tools/testing/selftests/mm/uffd-stress.c
-f:tools/testing/selftests/mm/uffd-unit-tests.c
-f:tools/testing/selftests/mm/uffd-wp-mremap.c
-f:tools/testing/selftests/mm/va_high_addr_switch.c
-f:tools/testing/selftests/mm/va_high_addr_switch.sh
-f:tools/testing/selftests/mm/virtual_address_range.c
-f:tools/testing/selftests/mm/vm_util.c
-f:tools/testing/selftests/mm/vm_util.h
-f:tools/testing/selftests/mm/write_hugetlb_memory.sh
-f:tools/testing/selftests/mm/write_to_hugetlbfs.c
-f:tools/testing/selftests/module/Makefile
-f:tools/testing/selftests/module/config
-f:tools/testing/selftests/module/find_symbol.sh
-f:tools/testing/selftests/mount/.gitignore
-f:tools/testing/selftests/mount/Makefile
-f:tools/testing/selftests/mount/config
-f:tools/testing/selftests/mount/nosymfollow-test.c
-f:tools/testing/selftests/mount/run_nosymfollow.sh
-f:tools/testing/selftests/mount/run_unprivileged_remount.sh
-f:tools/testing/selftests/mount/unprivileged-remount-test.c
-f:tools/testing/selftests/mount_setattr/.gitignore
-f:tools/testing/selftests/mount_setattr/Makefile
-f:tools/testing/selftests/mount_setattr/config
-f:tools/testing/selftests/mount_setattr/mount_setattr_test.c
-f:tools/testing/selftests/move_mount_set_group/.gitignore
-f:tools/testing/selftests/move_mount_set_group/Makefile
-f:tools/testing/selftests/move_mount_set_group/config
-f:tools/testing/selftests/move_mount_set_group/move_mount_set_group_test.c
-f:tools/testing/selftests/mqueue/.gitignore
-f:tools/testing/selftests/mqueue/Makefile
-f:tools/testing/selftests/mqueue/mq_open_tests.c
-f:tools/testing/selftests/mqueue/mq_perf_tests.c
-f:tools/testing/selftests/mqueue/setting
-f:tools/testing/selftests/mseal_system_mappings/.gitignore
-f:tools/testing/selftests/mseal_system_mappings/Makefile
-f:tools/testing/selftests/mseal_system_mappings/config
-f:tools/testing/selftests/mseal_system_mappings/sysmap_is_sealed.c
-f:tools/testing/selftests/nci/.gitignore
-f:tools/testing/selftests/nci/Makefile
-f:tools/testing/selftests/nci/config
-f:tools/testing/selftests/nci/nci_dev.c
-f:tools/testing/selftests/net/.gitignore
-f:tools/testing/selftests/net/Makefile
-f:tools/testing/selftests/net/af_unix/Makefile
-f:tools/testing/selftests/net/af_unix/config
-f:tools/testing/selftests/net/af_unix/diag_uid.c
-f:tools/testing/selftests/net/af_unix/msg_oob.c
-f:tools/testing/selftests/net/af_unix/scm_inq.c
-f:tools/testing/selftests/net/af_unix/scm_pidfd.c
-f:tools/testing/selftests/net/af_unix/scm_rights.c
-f:tools/testing/selftests/net/af_unix/unix_connect.c
-f:tools/testing/selftests/net/altnames.sh
-f:tools/testing/selftests/net/amt.sh
-f:tools/testing/selftests/net/arp_ndisc_evict_nocarrier.sh
-f:tools/testing/selftests/net/arp_ndisc_untracked_subnets.sh
-f:tools/testing/selftests/net/bareudp.sh
-f:tools/testing/selftests/net/bench/Makefile
-f:tools/testing/selftests/net/bench/page_pool/Makefile
-f:tools/testing/selftests/net/bench/page_pool/bench_page_pool_simple.c
-f:tools/testing/selftests/net/bench/page_pool/time_bench.c
-f:tools/testing/selftests/net/bench/page_pool/time_bench.h
-f:tools/testing/selftests/net/bench/test_bench_page_pool.sh
-f:tools/testing/selftests/net/big_tcp.sh
-f:tools/testing/selftests/net/bind_bhash.c
-f:tools/testing/selftests/net/bind_bhash.sh
-f:tools/testing/selftests/net/bind_timewait.c
-f:tools/testing/selftests/net/bind_wildcard.c
-f:tools/testing/selftests/net/bpf.mk
-f:tools/testing/selftests/net/bpf_offload.py
-f:tools/testing/selftests/net/broadcast_pmtu.sh
-f:tools/testing/selftests/net/busy_poll_test.sh
-f:tools/testing/selftests/net/busy_poller.c
-f:tools/testing/selftests/net/can/.gitignore
-f:tools/testing/selftests/net/can/Makefile
-f:tools/testing/selftests/net/can/test_raw_filter.c
-f:tools/testing/selftests/net/can/test_raw_filter.sh
-f:tools/testing/selftests/net/cmsg_ip.sh
-f:tools/testing/selftests/net/cmsg_sender.c
-f:tools/testing/selftests/net/cmsg_so_mark.sh
-f:tools/testing/selftests/net/cmsg_so_priority.sh
-f:tools/testing/selftests/net/cmsg_time.sh
-f:tools/testing/selftests/net/config
-f:tools/testing/selftests/net/drop_monitor_tests.sh
-f:tools/testing/selftests/net/epoll_busy_poll.c
-f:tools/testing/selftests/net/fcnal-test.sh
-f:tools/testing/selftests/net/fdb_flush.sh
-f:tools/testing/selftests/net/fdb_notify.sh
-f:tools/testing/selftests/net/fib-onlink-tests.sh
-f:tools/testing/selftests/net/fib_nexthop_multiprefix.sh
-f:tools/testing/selftests/net/fib_nexthop_nongw.sh
-f:tools/testing/selftests/net/fib_nexthops.sh
-f:tools/testing/selftests/net/fib_rule_tests.sh
-f:tools/testing/selftests/net/fib_tests.sh
-f:tools/testing/selftests/net/fin_ack_lat.c
-f:tools/testing/selftests/net/fin_ack_lat.sh
-f:tools/testing/selftests/net/forwarding/.gitignore
-f:tools/testing/selftests/net/forwarding/Makefile
-f:tools/testing/selftests/net/forwarding/README
-f:tools/testing/selftests/net/forwarding/bridge_fdb_learning_limit.sh
-f:tools/testing/selftests/net/forwarding/bridge_igmp.sh
-f:tools/testing/selftests/net/forwarding/bridge_locked_port.sh
-f:tools/testing/selftests/net/forwarding/bridge_mdb.sh
-f:tools/testing/selftests/net/forwarding/bridge_mdb_host.sh
-f:tools/testing/selftests/net/forwarding/bridge_mdb_max.sh
-f:tools/testing/selftests/net/forwarding/bridge_mdb_port_down.sh
-f:tools/testing/selftests/net/forwarding/bridge_mld.sh
-f:tools/testing/selftests/net/forwarding/bridge_port_isolation.sh
-f:tools/testing/selftests/net/forwarding/bridge_sticky_fdb.sh
-f:tools/testing/selftests/net/forwarding/bridge_vlan_aware.sh
-f:tools/testing/selftests/net/forwarding/bridge_vlan_mcast.sh
-f:tools/testing/selftests/net/forwarding/bridge_vlan_unaware.sh
-f:tools/testing/selftests/net/forwarding/config
-f:tools/testing/selftests/net/forwarding/custom_multipath_hash.sh
-f:tools/testing/selftests/net/forwarding/devlink_lib.sh
-f:tools/testing/selftests/net/forwarding/dual_vxlan_bridge.sh
-f:tools/testing/selftests/net/forwarding/fib_offload_lib.sh
-f:tools/testing/selftests/net/forwarding/forwarding.config.sample
-f:tools/testing/selftests/net/forwarding/gre_custom_multipath_hash.sh
-f:tools/testing/selftests/net/forwarding/gre_inner_v4_multipath.sh
-f:tools/testing/selftests/net/forwarding/gre_inner_v6_multipath.sh
-f:tools/testing/selftests/net/forwarding/gre_multipath.sh
-f:tools/testing/selftests/net/forwarding/gre_multipath_nh.sh
-f:tools/testing/selftests/net/forwarding/gre_multipath_nh_res.sh
-f:tools/testing/selftests/net/forwarding/ip6_forward_instats_vrf.sh
-f:tools/testing/selftests/net/forwarding/ip6gre_custom_multipath_hash.sh
-f:tools/testing/selftests/net/forwarding/ip6gre_flat.sh
-f:tools/testing/selftests/net/forwarding/ip6gre_flat_key.sh
-f:tools/testing/selftests/net/forwarding/ip6gre_flat_keys.sh
-f:tools/testing/selftests/net/forwarding/ip6gre_hier.sh
-f:tools/testing/selftests/net/forwarding/ip6gre_hier_key.sh
-f:tools/testing/selftests/net/forwarding/ip6gre_hier_keys.sh
-f:tools/testing/selftests/net/forwarding/ip6gre_inner_v4_multipath.sh
-f:tools/testing/selftests/net/forwarding/ip6gre_inner_v6_multipath.sh
-f:tools/testing/selftests/net/forwarding/ip6gre_lib.sh
-f:tools/testing/selftests/net/forwarding/ipip_flat_gre.sh
-f:tools/testing/selftests/net/forwarding/ipip_flat_gre_key.sh
-f:tools/testing/selftests/net/forwarding/ipip_flat_gre_keys.sh
-f:tools/testing/selftests/net/forwarding/ipip_hier_gre.sh
-f:tools/testing/selftests/net/forwarding/ipip_hier_gre_key.sh
-f:tools/testing/selftests/net/forwarding/ipip_hier_gre_keys.sh
-f:tools/testing/selftests/net/forwarding/ipip_lib.sh
-f:tools/testing/selftests/net/forwarding/lib.sh
-f:tools/testing/selftests/net/forwarding/lib_sh_test.sh
-f:tools/testing/selftests/net/forwarding/local_termination.sh
-f:tools/testing/selftests/net/forwarding/min_max_mtu.sh
-f:tools/testing/selftests/net/forwarding/mirror_gre.sh
-f:tools/testing/selftests/net/forwarding/mirror_gre_bound.sh
-f:tools/testing/selftests/net/forwarding/mirror_gre_bridge_1d.sh
-f:tools/testing/selftests/net/forwarding/mirror_gre_bridge_1d_vlan.sh
-f:tools/testing/selftests/net/forwarding/mirror_gre_bridge_1q.sh
-f:tools/testing/selftests/net/forwarding/mirror_gre_bridge_1q_lag.sh
-f:tools/testing/selftests/net/forwarding/mirror_gre_changes.sh
-f:tools/testing/selftests/net/forwarding/mirror_gre_flower.sh
-f:tools/testing/selftests/net/forwarding/mirror_gre_lag_lacp.sh
-f:tools/testing/selftests/net/forwarding/mirror_gre_lib.sh
-f:tools/testing/selftests/net/forwarding/mirror_gre_neigh.sh
-f:tools/testing/selftests/net/forwarding/mirror_gre_nh.sh
-f:tools/testing/selftests/net/forwarding/mirror_gre_topo_lib.sh
-f:tools/testing/selftests/net/forwarding/mirror_gre_vlan.sh
-f:tools/testing/selftests/net/forwarding/mirror_gre_vlan_bridge_1q.sh
-f:tools/testing/selftests/net/forwarding/mirror_lib.sh
-f:tools/testing/selftests/net/forwarding/mirror_topo_lib.sh
-f:tools/testing/selftests/net/forwarding/mirror_vlan.sh
-f:tools/testing/selftests/net/forwarding/no_forwarding.sh
-f:tools/testing/selftests/net/forwarding/pedit_dsfield.sh
-f:tools/testing/selftests/net/forwarding/pedit_ip.sh
-f:tools/testing/selftests/net/forwarding/pedit_l4port.sh
-f:tools/testing/selftests/net/forwarding/q_in_vni.sh
-f:tools/testing/selftests/net/forwarding/q_in_vni_ipv6.sh
-f:tools/testing/selftests/net/forwarding/router.sh
-f:tools/testing/selftests/net/forwarding/router_bridge.sh
-f:tools/testing/selftests/net/forwarding/router_bridge_1d.sh
-f:tools/testing/selftests/net/forwarding/router_bridge_1d_lag.sh
-f:tools/testing/selftests/net/forwarding/router_bridge_lag.sh
-f:tools/testing/selftests/net/forwarding/router_bridge_pvid_vlan_upper.sh
-f:tools/testing/selftests/net/forwarding/router_bridge_vlan.sh
-f:tools/testing/selftests/net/forwarding/router_bridge_vlan_upper.sh
-f:tools/testing/selftests/net/forwarding/router_bridge_vlan_upper_pvid.sh
-f:tools/testing/selftests/net/forwarding/router_broadcast.sh
-f:tools/testing/selftests/net/forwarding/router_mpath_nh.sh
-f:tools/testing/selftests/net/forwarding/router_mpath_nh_lib.sh
-f:tools/testing/selftests/net/forwarding/router_mpath_nh_res.sh
-f:tools/testing/selftests/net/forwarding/router_mpath_seed.sh
-f:tools/testing/selftests/net/forwarding/router_multicast.sh
-f:tools/testing/selftests/net/forwarding/router_multipath.sh
-f:tools/testing/selftests/net/forwarding/router_nh.sh
-f:tools/testing/selftests/net/forwarding/router_vid_1.sh
-f:tools/testing/selftests/net/forwarding/sch_ets.sh
-f:tools/testing/selftests/net/forwarding/sch_ets_core.sh
-f:tools/testing/selftests/net/forwarding/sch_ets_tests.sh
-f:tools/testing/selftests/net/forwarding/sch_red.sh
-f:tools/testing/selftests/net/forwarding/sch_tbf_core.sh
-f:tools/testing/selftests/net/forwarding/sch_tbf_ets.sh
-f:tools/testing/selftests/net/forwarding/sch_tbf_etsprio.sh
-f:tools/testing/selftests/net/forwarding/sch_tbf_prio.sh
-f:tools/testing/selftests/net/forwarding/sch_tbf_root.sh
-f:tools/testing/selftests/net/forwarding/settings
-f:tools/testing/selftests/net/forwarding/skbedit_priority.sh
-f:tools/testing/selftests/net/forwarding/tc_actions.sh
-f:tools/testing/selftests/net/forwarding/tc_chains.sh
-f:tools/testing/selftests/net/forwarding/tc_common.sh
-f:tools/testing/selftests/net/forwarding/tc_flower.sh
-f:tools/testing/selftests/net/forwarding/tc_flower_cfm.sh
-f:tools/testing/selftests/net/forwarding/tc_flower_l2_miss.sh
-f:tools/testing/selftests/net/forwarding/tc_flower_port_range.sh
-f:tools/testing/selftests/net/forwarding/tc_flower_router.sh
-f:tools/testing/selftests/net/forwarding/tc_mpls_l2vpn.sh
-f:tools/testing/selftests/net/forwarding/tc_police.sh
-f:tools/testing/selftests/net/forwarding/tc_shblocks.sh
-f:tools/testing/selftests/net/forwarding/tc_taprio.sh
-f:tools/testing/selftests/net/forwarding/tc_tunnel_key.sh
-f:tools/testing/selftests/net/forwarding/tc_vlan_modify.sh
-f:tools/testing/selftests/net/forwarding/tsn_lib.sh
-f:tools/testing/selftests/net/forwarding/vxlan_asymmetric.sh
-f:tools/testing/selftests/net/forwarding/vxlan_asymmetric_ipv6.sh
-f:tools/testing/selftests/net/forwarding/vxlan_bridge_1d.sh
-f:tools/testing/selftests/net/forwarding/vxlan_bridge_1d_ipv6.sh
-f:tools/testing/selftests/net/forwarding/vxlan_bridge_1d_port_8472.sh
-f:tools/testing/selftests/net/forwarding/vxlan_bridge_1d_port_8472_ipv6.sh
-f:tools/testing/selftests/net/forwarding/vxlan_bridge_1q.sh
-f:tools/testing/selftests/net/forwarding/vxlan_bridge_1q_ipv6.sh
-f:tools/testing/selftests/net/forwarding/vxlan_bridge_1q_mc_ul.sh
-f:tools/testing/selftests/net/forwarding/vxlan_bridge_1q_port_8472.sh
-f:tools/testing/selftests/net/forwarding/vxlan_bridge_1q_port_8472_ipv6.sh
-f:tools/testing/selftests/net/forwarding/vxlan_reserved.sh
-f:tools/testing/selftests/net/forwarding/vxlan_symmetric.sh
-f:tools/testing/selftests/net/forwarding/vxlan_symmetric_ipv6.sh
-f:tools/testing/selftests/net/fq_band_pktlimit.sh
-f:tools/testing/selftests/net/gre_gso.sh
-f:tools/testing/selftests/net/gre_ipv6_lladdr.sh
-f:tools/testing/selftests/net/gro.c
-f:tools/testing/selftests/net/gro.sh
-f:tools/testing/selftests/net/hsr/Makefile
-f:tools/testing/selftests/net/hsr/config
-f:tools/testing/selftests/net/hsr/hsr_common.sh
-f:tools/testing/selftests/net/hsr/hsr_ping.sh
-f:tools/testing/selftests/net/hsr/hsr_redbox.sh
-f:tools/testing/selftests/net/hsr/settings
-f:tools/testing/selftests/net/hwtstamp_config.c
-f:tools/testing/selftests/net/icmp.sh
-f:tools/testing/selftests/net/icmp_redirect.sh
-f:tools/testing/selftests/net/in_netns.sh
-f:tools/testing/selftests/net/io_uring_zerocopy_tx.c
-f:tools/testing/selftests/net/io_uring_zerocopy_tx.sh
-f:tools/testing/selftests/net/ioam6.sh
-f:tools/testing/selftests/net/ioam6_parser.c
-f:tools/testing/selftests/net/ip6_gre_headroom.sh
-f:tools/testing/selftests/net/ip_defrag.c
-f:tools/testing/selftests/net/ip_defrag.sh
-f:tools/testing/selftests/net/ip_local_port_range.c
-f:tools/testing/selftests/net/ip_local_port_range.sh
-f:tools/testing/selftests/net/ipsec.c
-f:tools/testing/selftests/net/ipv6_flowlabel.c
-f:tools/testing/selftests/net/ipv6_flowlabel.sh
-f:tools/testing/selftests/net/ipv6_flowlabel_mgr.c
-f:tools/testing/selftests/net/ipv6_force_forwarding.sh
-f:tools/testing/selftests/net/ipv6_route_update_soft_lockup.sh
-f:tools/testing/selftests/net/l2_tos_ttl_inherit.sh
-f:tools/testing/selftests/net/l2tp.sh
-f:tools/testing/selftests/net/lib.sh
-f:tools/testing/selftests/net/lib/.gitignore
-f:tools/testing/selftests/net/lib/Makefile
-f:tools/testing/selftests/net/lib/csum.c
-f:tools/testing/selftests/net/lib/ksft.h
-f:tools/testing/selftests/net/lib/py/__init__.py
-f:tools/testing/selftests/net/lib/py/consts.py
-f:tools/testing/selftests/net/lib/py/ksft.py
-f:tools/testing/selftests/net/lib/py/netns.py
-f:tools/testing/selftests/net/lib/py/nsim.py
-f:tools/testing/selftests/net/lib/py/utils.py
-f:tools/testing/selftests/net/lib/py/ynl.py
-f:tools/testing/selftests/net/lib/sh/defer.sh
-f:tools/testing/selftests/net/lib/xdp_dummy.bpf.c
-f:tools/testing/selftests/net/lib/xdp_helper.c
-f:tools/testing/selftests/net/lib/xdp_native.bpf.c
-f:tools/testing/selftests/net/link_netns.py
-f:tools/testing/selftests/net/lwt_dst_cache_ref_loop.sh
-f:tools/testing/selftests/net/mptcp/.gitignore
-f:tools/testing/selftests/net/mptcp/Makefile
-f:tools/testing/selftests/net/mptcp/config
-f:tools/testing/selftests/net/mptcp/diag.sh
-f:tools/testing/selftests/net/mptcp/mptcp_connect.c
-f:tools/testing/selftests/net/mptcp/mptcp_connect.sh
-f:tools/testing/selftests/net/mptcp/mptcp_connect_checksum.sh
-f:tools/testing/selftests/net/mptcp/mptcp_connect_mmap.sh
-f:tools/testing/selftests/net/mptcp/mptcp_connect_sendfile.sh
-f:tools/testing/selftests/net/mptcp/mptcp_diag.c
-f:tools/testing/selftests/net/mptcp/mptcp_inq.c
-f:tools/testing/selftests/net/mptcp/mptcp_join.sh
-f:tools/testing/selftests/net/mptcp/mptcp_lib.sh
-f:tools/testing/selftests/net/mptcp/mptcp_sockopt.c
-f:tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
-f:tools/testing/selftests/net/mptcp/pm_netlink.sh
-f:tools/testing/selftests/net/mptcp/pm_nl_ctl.c
-f:tools/testing/selftests/net/mptcp/settings
-f:tools/testing/selftests/net/mptcp/simult_flows.sh
-f:tools/testing/selftests/net/mptcp/userspace_pm.sh
-f:tools/testing/selftests/net/msg_zerocopy.c
-f:tools/testing/selftests/net/msg_zerocopy.sh
-f:tools/testing/selftests/net/nat6to4.bpf.c
-f:tools/testing/selftests/net/nat6to4.sh
-f:tools/testing/selftests/net/ndisc_unsolicited_na_test.sh
-f:tools/testing/selftests/net/netdev-l2addr.sh
-f:tools/testing/selftests/net/netdevice.sh
-f:tools/testing/selftests/net/netfilter/.gitignore
-f:tools/testing/selftests/net/netfilter/Makefile
-f:tools/testing/selftests/net/netfilter/audit_logread.c
-f:tools/testing/selftests/net/netfilter/br_netfilter.sh
-f:tools/testing/selftests/net/netfilter/br_netfilter_queue.sh
-f:tools/testing/selftests/net/netfilter/bridge_brouter.sh
-f:tools/testing/selftests/net/netfilter/config
-f:tools/testing/selftests/net/netfilter/connect_close.c
-f:tools/testing/selftests/net/netfilter/conntrack_clash.sh
-f:tools/testing/selftests/net/netfilter/conntrack_dump_flush.c
-f:tools/testing/selftests/net/netfilter/conntrack_dump_flush.sh
-f:tools/testing/selftests/net/netfilter/conntrack_icmp_related.sh
-f:tools/testing/selftests/net/netfilter/conntrack_ipip_mtu.sh
-f:tools/testing/selftests/net/netfilter/conntrack_resize.sh
-f:tools/testing/selftests/net/netfilter/conntrack_reverse_clash.c
-f:tools/testing/selftests/net/netfilter/conntrack_reverse_clash.sh
-f:tools/testing/selftests/net/netfilter/conntrack_sctp_collision.sh
-f:tools/testing/selftests/net/netfilter/conntrack_tcp_unreplied.sh
-f:tools/testing/selftests/net/netfilter/conntrack_vrf.sh
-f:tools/testing/selftests/net/netfilter/ipvs.sh
-f:tools/testing/selftests/net/netfilter/lib.sh
-f:tools/testing/selftests/net/netfilter/nf_conntrack_packetdrill.sh
-f:tools/testing/selftests/net/netfilter/nf_nat_edemux.sh
-f:tools/testing/selftests/net/netfilter/nf_queue.c
-f:tools/testing/selftests/net/netfilter/nft_audit.sh
-f:tools/testing/selftests/net/netfilter/nft_concat_range.sh
-f:tools/testing/selftests/net/netfilter/nft_concat_range_perf.sh
-f:tools/testing/selftests/net/netfilter/nft_conntrack_helper.sh
-f:tools/testing/selftests/net/netfilter/nft_fib.sh
-f:tools/testing/selftests/net/netfilter/nft_flowtable.sh
-f:tools/testing/selftests/net/netfilter/nft_interface_stress.sh
-f:tools/testing/selftests/net/netfilter/nft_meta.sh
-f:tools/testing/selftests/net/netfilter/nft_nat.sh
-f:tools/testing/selftests/net/netfilter/nft_nat_zones.sh
-f:tools/testing/selftests/net/netfilter/nft_queue.sh
-f:tools/testing/selftests/net/netfilter/nft_synproxy.sh
-f:tools/testing/selftests/net/netfilter/nft_tproxy_tcp.sh
-f:tools/testing/selftests/net/netfilter/nft_tproxy_udp.sh
-f:tools/testing/selftests/net/netfilter/nft_zones_many.sh
-f:tools/testing/selftests/net/netfilter/packetdrill/common.sh
-f:tools/testing/selftests/net/netfilter/packetdrill/conntrack_ack_loss_stall.pkt
-f:tools/testing/selftests/net/netfilter/packetdrill/conntrack_inexact_rst.pkt
-f:tools/testing/selftests/net/netfilter/packetdrill/conntrack_rst_invalid.pkt
-f:tools/testing/selftests/net/netfilter/packetdrill/conntrack_syn_challenge_ack.pkt
-f:tools/testing/selftests/net/netfilter/packetdrill/conntrack_synack_old.pkt
-f:tools/testing/selftests/net/netfilter/packetdrill/conntrack_synack_reuse.pkt
-f:tools/testing/selftests/net/netfilter/rpath.sh
-f:tools/testing/selftests/net/netfilter/sctp_collision.c
-f:tools/testing/selftests/net/netfilter/settings
-f:tools/testing/selftests/net/netfilter/udpclash.c
-f:tools/testing/selftests/net/netfilter/vxlan_mtu_frag.sh
-f:tools/testing/selftests/net/netfilter/xt_string.sh
-f:tools/testing/selftests/net/netlink-dumps.c
-f:tools/testing/selftests/net/netns-name.sh
-f:tools/testing/selftests/net/netns-sysctl.sh
-f:tools/testing/selftests/net/nettest.c
-f:tools/testing/selftests/net/nl_netdev.py
-f:tools/testing/selftests/net/openvswitch/Makefile
-f:tools/testing/selftests/net/openvswitch/openvswitch.sh
-f:tools/testing/selftests/net/openvswitch/ovs-dpctl.py
-f:tools/testing/selftests/net/openvswitch/settings
-f:tools/testing/selftests/net/ovpn/.gitignore
-f:tools/testing/selftests/net/ovpn/Makefile
-f:tools/testing/selftests/net/ovpn/common.sh
-f:tools/testing/selftests/net/ovpn/config
-f:tools/testing/selftests/net/ovpn/data64.key
-f:tools/testing/selftests/net/ovpn/ovpn-cli.c
-f:tools/testing/selftests/net/ovpn/tcp_peers.txt
-f:tools/testing/selftests/net/ovpn/test-chachapoly.sh
-f:tools/testing/selftests/net/ovpn/test-close-socket-tcp.sh
-f:tools/testing/selftests/net/ovpn/test-close-socket.sh
-f:tools/testing/selftests/net/ovpn/test-float.sh
-f:tools/testing/selftests/net/ovpn/test-large-mtu.sh
-f:tools/testing/selftests/net/ovpn/test-tcp.sh
-f:tools/testing/selftests/net/ovpn/test.sh
-f:tools/testing/selftests/net/ovpn/udp_peers.txt
-f:tools/testing/selftests/net/packetdrill/Makefile
-f:tools/testing/selftests/net/packetdrill/config
-f:tools/testing/selftests/net/packetdrill/defaults.sh
-f:tools/testing/selftests/net/packetdrill/ksft_runner.sh
-f:tools/testing/selftests/net/packetdrill/set_sysctls.py
-f:tools/testing/selftests/net/packetdrill/tcp_blocking_blocking-accept.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_blocking_blocking-connect.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_blocking_blocking-read.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_blocking_blocking-write.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_close_close-local-close-then-remote-fin.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_close_close-on-syn-sent.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_close_close-remote-fin-then-close.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_dsack_mult.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_ecn_ecn-uses-ect0.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_eor_no-coalesce-large.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_eor_no-coalesce-retrans.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_eor_no-coalesce-small.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_eor_no-coalesce-subsequent.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_fast_recovery_prr-ss-10pkt-lost-1.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_fast_recovery_prr-ss-30pkt-lost-1_4-11_16.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_fast_recovery_prr-ss-30pkt-lost1_4.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_fast_recovery_prr-ss-ack-below-snd_una-cubic.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_inq_client.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_inq_server.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_limited_transmit_limited-transmit-no-sack.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_limited_transmit_limited-transmit-sack.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_md5_md5-only-on-client-ack.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_nagle_https_client.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_nagle_sendmsg_msg_more.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_nagle_sockopt_cork_nodelay.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_ooo-before-and-after-accept.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_ooo_rcv_mss.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_rcv_big_endseq.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_rcv_toobig.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_sack_sack-route-refresh-ip-tos.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_sack_sack-shift-sacked-2-6-8-3-9-nofack.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_sack_sack-shift-sacked-7-3-4-8-9-fack.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_sack_sack-shift-sacked-7-5-6-8-9-fack.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_sendfile_sendfile-simple.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_slow_start_slow-start-ack-per-1pkt.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_slow_start_slow-start-ack-per-2pkt-send-5pkt.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_slow_start_slow-start-ack-per-2pkt-send-6pkt.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_slow_start_slow-start-ack-per-2pkt.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_slow_start_slow-start-ack-per-4pkt.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_slow_start_slow-start-after-idle.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_slow_start_slow-start-after-win-update.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_slow_start_slow-start-app-limited-9-packets-out.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_slow_start_slow-start-app-limited.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_slow_start_slow-start-fq-ack-per-2pkt.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_splice_tcp_splice_loop_test.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_syscall_bad_arg_fastopen-invalid-buf-ptr.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_syscall_bad_arg_sendmsg-empty-iov.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_syscall_bad_arg_syscall-invalid-buf-ptr.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_tcp_info_tcp-info-last_data_recv.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_tcp_info_tcp-info-rwnd-limited.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_tcp_info_tcp-info-sndbuf-limited.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_timestamping_client-only-last-byte.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_timestamping_partial.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_timestamping_server.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_ts_recent_fin_tsval.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_ts_recent_invalid_ack.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_ts_recent_reset_tsval.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_user_timeout_user-timeout-probe.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_user_timeout_user_timeout.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_validate_validate-established-no-flags.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_zerocopy_basic.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_zerocopy_batch.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_zerocopy_client.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_zerocopy_closed.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_zerocopy_epoll_edge.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_zerocopy_epoll_exclusive.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_zerocopy_epoll_oneshot.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_zerocopy_fastopen-client.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_zerocopy_fastopen-server.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_zerocopy_maxfrags.pkt
-f:tools/testing/selftests/net/packetdrill/tcp_zerocopy_small.pkt
-f:tools/testing/selftests/net/pmtu.sh
-f:tools/testing/selftests/net/proc_net_pktgen.c
-f:tools/testing/selftests/net/psock_fanout.c
-f:tools/testing/selftests/net/psock_lib.h
-f:tools/testing/selftests/net/psock_snd.c
-f:tools/testing/selftests/net/psock_snd.sh
-f:tools/testing/selftests/net/psock_tpacket.c
-f:tools/testing/selftests/net/rds/.gitignore
-f:tools/testing/selftests/net/rds/Makefile
-f:tools/testing/selftests/net/rds/README.txt
-f:tools/testing/selftests/net/rds/config.sh
-f:tools/testing/selftests/net/rds/run.sh
-f:tools/testing/selftests/net/rds/test.py
-f:tools/testing/selftests/net/reuseaddr_conflict.c
-f:tools/testing/selftests/net/reuseaddr_ports_exhausted.c
-f:tools/testing/selftests/net/reuseaddr_ports_exhausted.sh
-f:tools/testing/selftests/net/reuseport_addr_any.c
-f:tools/testing/selftests/net/reuseport_addr_any.sh
-f:tools/testing/selftests/net/reuseport_bpf.c
-f:tools/testing/selftests/net/reuseport_bpf_cpu.c
-f:tools/testing/selftests/net/reuseport_bpf_numa.c
-f:tools/testing/selftests/net/reuseport_dualstack.c
-f:tools/testing/selftests/net/route_localnet.sh
-f:tools/testing/selftests/net/rps_default_mask.sh
-f:tools/testing/selftests/net/rtnetlink.py
-f:tools/testing/selftests/net/rtnetlink.sh
-f:tools/testing/selftests/net/rtnetlink_notification.sh
-f:tools/testing/selftests/net/run_afpackettests
-f:tools/testing/selftests/net/run_netsocktests
-f:tools/testing/selftests/net/rxtimestamp.c
-f:tools/testing/selftests/net/rxtimestamp.sh
-f:tools/testing/selftests/net/sample_map_ret0.bpf.c
-f:tools/testing/selftests/net/sample_ret0.bpf.c
-f:tools/testing/selftests/net/sctp_hello.c
-f:tools/testing/selftests/net/sctp_vrf.sh
-f:tools/testing/selftests/net/settings
-f:tools/testing/selftests/net/setup_loopback.sh
-f:tools/testing/selftests/net/setup_veth.sh
-f:tools/testing/selftests/net/sk_bind_sendto_listen.c
-f:tools/testing/selftests/net/sk_connect_zero_addr.c
-f:tools/testing/selftests/net/sk_so_peek_off.c
-f:tools/testing/selftests/net/skf_net_off.c
-f:tools/testing/selftests/net/skf_net_off.sh
-f:tools/testing/selftests/net/so_incoming_cpu.c
-f:tools/testing/selftests/net/so_netns_cookie.c
-f:tools/testing/selftests/net/so_rcv_listener.c
-f:tools/testing/selftests/net/so_txtime.c
-f:tools/testing/selftests/net/so_txtime.sh
-f:tools/testing/selftests/net/socket.c
-f:tools/testing/selftests/net/srv6_end_dt46_l3vpn_test.sh
-f:tools/testing/selftests/net/srv6_end_dt4_l3vpn_test.sh
-f:tools/testing/selftests/net/srv6_end_dt6_l3vpn_test.sh
-f:tools/testing/selftests/net/srv6_end_dx4_netfilter_test.sh
-f:tools/testing/selftests/net/srv6_end_dx6_netfilter_test.sh
-f:tools/testing/selftests/net/srv6_end_flavors_test.sh
-f:tools/testing/selftests/net/srv6_end_next_csid_l3vpn_test.sh
-f:tools/testing/selftests/net/srv6_end_x_next_csid_l3vpn_test.sh
-f:tools/testing/selftests/net/srv6_hencap_red_l3vpn_test.sh
-f:tools/testing/selftests/net/srv6_hl2encap_red_l2vpn_test.sh
-f:tools/testing/selftests/net/stress_reuseport_listen.c
-f:tools/testing/selftests/net/stress_reuseport_listen.sh
-f:tools/testing/selftests/net/tap.c
-f:tools/testing/selftests/net/tcp_ao/.gitignore
-f:tools/testing/selftests/net/tcp_ao/Makefile
-f:tools/testing/selftests/net/tcp_ao/bench-lookups.c
-f:tools/testing/selftests/net/tcp_ao/config
-f:tools/testing/selftests/net/tcp_ao/connect-deny.c
-f:tools/testing/selftests/net/tcp_ao/connect.c
-f:tools/testing/selftests/net/tcp_ao/icmps-discard.c
-f:tools/testing/selftests/net/tcp_ao/key-management.c
-f:tools/testing/selftests/net/tcp_ao/lib/aolib.h
-f:tools/testing/selftests/net/tcp_ao/lib/ftrace-tcp.c
-f:tools/testing/selftests/net/tcp_ao/lib/ftrace.c
-f:tools/testing/selftests/net/tcp_ao/lib/kconfig.c
-f:tools/testing/selftests/net/tcp_ao/lib/netlink.c
-f:tools/testing/selftests/net/tcp_ao/lib/proc.c
-f:tools/testing/selftests/net/tcp_ao/lib/repair.c
-f:tools/testing/selftests/net/tcp_ao/lib/setup.c
-f:tools/testing/selftests/net/tcp_ao/lib/sock.c
-f:tools/testing/selftests/net/tcp_ao/lib/utils.c
-f:tools/testing/selftests/net/tcp_ao/restore.c
-f:tools/testing/selftests/net/tcp_ao/rst.c
-f:tools/testing/selftests/net/tcp_ao/self-connect.c
-f:tools/testing/selftests/net/tcp_ao/seq-ext.c
-f:tools/testing/selftests/net/tcp_ao/setsockopt-closed.c
-f:tools/testing/selftests/net/tcp_ao/settings
-f:tools/testing/selftests/net/tcp_ao/unsigned-md5.c
-f:tools/testing/selftests/net/tcp_fastopen_backup_key.c
-f:tools/testing/selftests/net/tcp_fastopen_backup_key.sh
-f:tools/testing/selftests/net/tcp_inq.c
-f:tools/testing/selftests/net/tcp_mmap.c
-f:tools/testing/selftests/net/test_bpf.sh
-f:tools/testing/selftests/net/test_bridge_backup_port.sh
-f:tools/testing/selftests/net/test_bridge_neigh_suppress.sh
-f:tools/testing/selftests/net/test_ingress_egress_chaining.sh
-f:tools/testing/selftests/net/test_neigh.sh
-f:tools/testing/selftests/net/test_so_rcv.sh
-f:tools/testing/selftests/net/test_vxlan_fdb_changelink.sh
-f:tools/testing/selftests/net/test_vxlan_mdb.sh
-f:tools/testing/selftests/net/test_vxlan_nolocalbypass.sh
-f:tools/testing/selftests/net/test_vxlan_under_vrf.sh
-f:tools/testing/selftests/net/test_vxlan_vnifiltering.sh
-f:tools/testing/selftests/net/tfo.c
-f:tools/testing/selftests/net/tfo_passive.sh
-f:tools/testing/selftests/net/timestamping.c
-f:tools/testing/selftests/net/tls.c
-f:tools/testing/selftests/net/toeplitz.c
-f:tools/testing/selftests/net/toeplitz.sh
-f:tools/testing/selftests/net/toeplitz_client.sh
-f:tools/testing/selftests/net/traceroute.sh
-f:tools/testing/selftests/net/tun.c
-f:tools/testing/selftests/net/txring_overwrite.c
-f:tools/testing/selftests/net/txtimestamp.c
-f:tools/testing/selftests/net/txtimestamp.sh
-f:tools/testing/selftests/net/udpgro.sh
-f:tools/testing/selftests/net/udpgro_bench.sh
-f:tools/testing/selftests/net/udpgro_frglist.sh
-f:tools/testing/selftests/net/udpgro_fwd.sh
-f:tools/testing/selftests/net/udpgso.c
-f:tools/testing/selftests/net/udpgso.sh
-f:tools/testing/selftests/net/udpgso_bench.sh
-f:tools/testing/selftests/net/udpgso_bench_rx.c
-f:tools/testing/selftests/net/udpgso_bench_tx.c
-f:tools/testing/selftests/net/unicast_extensions.sh
-f:tools/testing/selftests/net/veth.sh
-f:tools/testing/selftests/net/vlan_bridge_binding.sh
-f:tools/testing/selftests/net/vlan_hw_filter.sh
-f:tools/testing/selftests/net/vrf-xfrm-tests.sh
-f:tools/testing/selftests/net/vrf_route_leaking.sh
-f:tools/testing/selftests/net/vrf_strict_mode_test.sh
-f:tools/testing/selftests/net/xfrm_policy.sh
-f:tools/testing/selftests/net/xfrm_policy_add_speed.sh
-f:tools/testing/selftests/net/ynl.mk
-f:tools/testing/selftests/nolibc/.gitignore
-f:tools/testing/selftests/nolibc/Makefile
-f:tools/testing/selftests/nolibc/Makefile.include
-f:tools/testing/selftests/nolibc/Makefile.nolibc
-f:tools/testing/selftests/nolibc/nolibc-test-linkage.c
-f:tools/testing/selftests/nolibc/nolibc-test-linkage.h
-f:tools/testing/selftests/nolibc/nolibc-test.c
-f:tools/testing/selftests/nolibc/run-tests.sh
-f:tools/testing/selftests/ntb/ntb_test.sh
-f:tools/testing/selftests/openat2/.gitignore
-f:tools/testing/selftests/openat2/Makefile
-f:tools/testing/selftests/openat2/helpers.c
-f:tools/testing/selftests/openat2/helpers.h
-f:tools/testing/selftests/openat2/openat2_test.c
-f:tools/testing/selftests/openat2/rename_attack_test.c
-f:tools/testing/selftests/openat2/resolve_test.c
-f:tools/testing/selftests/pci_endpoint/.gitignore
-f:tools/testing/selftests/pci_endpoint/Makefile
-f:tools/testing/selftests/pci_endpoint/config
-f:tools/testing/selftests/pci_endpoint/pci_endpoint_test.c
-f:tools/testing/selftests/pcie_bwctrl/Makefile
-f:tools/testing/selftests/pcie_bwctrl/set_pcie_cooling_state.sh
-f:tools/testing/selftests/pcie_bwctrl/set_pcie_speed.sh
-f:tools/testing/selftests/perf_events/.gitignore
-f:tools/testing/selftests/perf_events/Makefile
-f:tools/testing/selftests/perf_events/config
-f:tools/testing/selftests/perf_events/remove_on_exec.c
-f:tools/testing/selftests/perf_events/settings
-f:tools/testing/selftests/perf_events/sigtrap_threads.c
-f:tools/testing/selftests/perf_events/watermark_signal.c
-f:tools/testing/selftests/pid_namespace/.gitignore
-f:tools/testing/selftests/pid_namespace/Makefile
-f:tools/testing/selftests/pid_namespace/config
-f:tools/testing/selftests/pid_namespace/pid_max.c
-f:tools/testing/selftests/pid_namespace/regression_enomem.c
-f:tools/testing/selftests/pidfd/.gitignore
-f:tools/testing/selftests/pidfd/Makefile
-f:tools/testing/selftests/pidfd/config
-f:tools/testing/selftests/pidfd/pidfd.h
-f:tools/testing/selftests/pidfd/pidfd_bind_mount.c
-f:tools/testing/selftests/pidfd/pidfd_exec_helper.c
-f:tools/testing/selftests/pidfd/pidfd_fdinfo_test.c
-f:tools/testing/selftests/pidfd/pidfd_file_handle_test.c
-f:tools/testing/selftests/pidfd/pidfd_getfd_test.c
-f:tools/testing/selftests/pidfd/pidfd_info_test.c
-f:tools/testing/selftests/pidfd/pidfd_open_test.c
-f:tools/testing/selftests/pidfd/pidfd_poll_test.c
-f:tools/testing/selftests/pidfd/pidfd_setattr_test.c
-f:tools/testing/selftests/pidfd/pidfd_setns_test.c
-f:tools/testing/selftests/pidfd/pidfd_test.c
-f:tools/testing/selftests/pidfd/pidfd_wait.c
-f:tools/testing/selftests/pidfd/pidfd_xattr_test.c
-f:tools/testing/selftests/power_supply/Makefile
-f:tools/testing/selftests/power_supply/helpers.sh
-f:tools/testing/selftests/power_supply/test_power_supply_properties.sh
-f:tools/testing/selftests/powerpc/Makefile
-f:tools/testing/selftests/powerpc/alignment/.gitignore
-f:tools/testing/selftests/powerpc/alignment/Makefile
-f:tools/testing/selftests/powerpc/alignment/alignment_handler.c
-f:tools/testing/selftests/powerpc/alignment/copy_first_unaligned.c
-f:tools/testing/selftests/powerpc/alignment/settings
-f:tools/testing/selftests/powerpc/benchmarks/.gitignore
-f:tools/testing/selftests/powerpc/benchmarks/Makefile
-f:tools/testing/selftests/powerpc/benchmarks/context_switch.c
-f:tools/testing/selftests/powerpc/benchmarks/exec_target.c
-f:tools/testing/selftests/powerpc/benchmarks/fork.c
-f:tools/testing/selftests/powerpc/benchmarks/futex_bench.c
-f:tools/testing/selftests/powerpc/benchmarks/gettimeofday.c
-f:tools/testing/selftests/powerpc/benchmarks/mmap_bench.c
-f:tools/testing/selftests/powerpc/benchmarks/null_syscall.c
-f:tools/testing/selftests/powerpc/benchmarks/settings
-f:tools/testing/selftests/powerpc/cache_shape/.gitignore
-f:tools/testing/selftests/powerpc/cache_shape/Makefile
-f:tools/testing/selftests/powerpc/cache_shape/cache_shape.c
-f:tools/testing/selftests/powerpc/cache_shape/settings
-f:tools/testing/selftests/powerpc/copyloops/.gitignore
-f:tools/testing/selftests/powerpc/copyloops/Makefile
-f:tools/testing/selftests/powerpc/copyloops/asm/asm-compat.h
-f:tools/testing/selftests/powerpc/copyloops/asm/feature-fixups.h
-f:tools/testing/selftests/powerpc/copyloops/asm/kasan.h
-f:tools/testing/selftests/powerpc/copyloops/asm/ppc_asm.h
-f:tools/testing/selftests/powerpc/copyloops/asm/processor.h
-f:tools/testing/selftests/powerpc/copyloops/copy_tofrom_user_reference.S
-f:tools/testing/selftests/powerpc/copyloops/exc_validate.c
-f:tools/testing/selftests/powerpc/copyloops/linux/export.h
-f:tools/testing/selftests/powerpc/copyloops/memcpy_stubs.S
-f:tools/testing/selftests/powerpc/copyloops/memmove_validate.c
-f:tools/testing/selftests/powerpc/copyloops/settings
-f:tools/testing/selftests/powerpc/copyloops/stubs.S
-f:tools/testing/selftests/powerpc/copyloops/validate.c
-f:tools/testing/selftests/powerpc/dexcr/.gitignore
-f:tools/testing/selftests/powerpc/dexcr/Makefile
-f:tools/testing/selftests/powerpc/dexcr/chdexcr.c
-f:tools/testing/selftests/powerpc/dexcr/dexcr.c
-f:tools/testing/selftests/powerpc/dexcr/dexcr.h
-f:tools/testing/selftests/powerpc/dexcr/dexcr_test.c
-f:tools/testing/selftests/powerpc/dexcr/hashchk_test.c
-f:tools/testing/selftests/powerpc/dexcr/lsdexcr.c
-f:tools/testing/selftests/powerpc/dexcr/settings
-f:tools/testing/selftests/powerpc/dscr/.gitignore
-f:tools/testing/selftests/powerpc/dscr/Makefile
-f:tools/testing/selftests/powerpc/dscr/dscr.h
-f:tools/testing/selftests/powerpc/dscr/dscr_default_test.c
-f:tools/testing/selftests/powerpc/dscr/dscr_explicit_test.c
-f:tools/testing/selftests/powerpc/dscr/dscr_inherit_exec_test.c
-f:tools/testing/selftests/powerpc/dscr/dscr_inherit_test.c
-f:tools/testing/selftests/powerpc/dscr/dscr_sysfs_test.c
-f:tools/testing/selftests/powerpc/dscr/dscr_sysfs_thread_test.c
-f:tools/testing/selftests/powerpc/dscr/dscr_user_test.c
-f:tools/testing/selftests/powerpc/dscr/settings
-f:tools/testing/selftests/powerpc/eeh/Makefile
-f:tools/testing/selftests/powerpc/eeh/eeh-basic.sh
-f:tools/testing/selftests/powerpc/eeh/eeh-functions.sh
-f:tools/testing/selftests/powerpc/eeh/eeh-vf-aware.sh
-f:tools/testing/selftests/powerpc/eeh/eeh-vf-unaware.sh
-f:tools/testing/selftests/powerpc/eeh/settings
-f:tools/testing/selftests/powerpc/flags.mk
-f:tools/testing/selftests/powerpc/harness.c
-f:tools/testing/selftests/powerpc/include/basic_asm.h
-f:tools/testing/selftests/powerpc/include/fpu_asm.h
-f:tools/testing/selftests/powerpc/include/gpr_asm.h
-f:tools/testing/selftests/powerpc/include/instructions.h
-f:tools/testing/selftests/powerpc/include/pkeys.h
-f:tools/testing/selftests/powerpc/include/reg.h
-f:tools/testing/selftests/powerpc/include/subunit.h
-f:tools/testing/selftests/powerpc/include/utils.h
-f:tools/testing/selftests/powerpc/include/vmx_asm.h
-f:tools/testing/selftests/powerpc/include/vsx_asm.h
-f:tools/testing/selftests/powerpc/lib/reg.S
-f:tools/testing/selftests/powerpc/lib/settings
-f:tools/testing/selftests/powerpc/math/.gitignore
-f:tools/testing/selftests/powerpc/math/Makefile
-f:tools/testing/selftests/powerpc/math/fpu.h
-f:tools/testing/selftests/powerpc/math/fpu_asm.S
-f:tools/testing/selftests/powerpc/math/fpu_denormal.c
-f:tools/testing/selftests/powerpc/math/fpu_preempt.c
-f:tools/testing/selftests/powerpc/math/fpu_signal.c
-f:tools/testing/selftests/powerpc/math/fpu_syscall.c
-f:tools/testing/selftests/powerpc/math/mma.S
-f:tools/testing/selftests/powerpc/math/mma.c
-f:tools/testing/selftests/powerpc/math/settings
-f:tools/testing/selftests/powerpc/math/vmx_asm.S
-f:tools/testing/selftests/powerpc/math/vmx_preempt.c
-f:tools/testing/selftests/powerpc/math/vmx_signal.c
-f:tools/testing/selftests/powerpc/math/vmx_syscall.c
-f:tools/testing/selftests/powerpc/math/vsx_asm.S
-f:tools/testing/selftests/powerpc/math/vsx_preempt.c
-f:tools/testing/selftests/powerpc/mce/.gitignore
-f:tools/testing/selftests/powerpc/mce/Makefile
-f:tools/testing/selftests/powerpc/mce/inject-ra-err.c
-f:tools/testing/selftests/powerpc/mce/settings
-f:tools/testing/selftests/powerpc/mm/.gitignore
-f:tools/testing/selftests/powerpc/mm/Makefile
-f:tools/testing/selftests/powerpc/mm/bad_accesses.c
-f:tools/testing/selftests/powerpc/mm/exec_prot.c
-f:tools/testing/selftests/powerpc/mm/hugetlb_vs_thp_test.c
-f:tools/testing/selftests/powerpc/mm/large_vm_fork_separation.c
-f:tools/testing/selftests/powerpc/mm/large_vm_gpr_corruption.c
-f:tools/testing/selftests/powerpc/mm/pkey_exec_prot.c
-f:tools/testing/selftests/powerpc/mm/pkey_siginfo.c
-f:tools/testing/selftests/powerpc/mm/prot_sao.c
-f:tools/testing/selftests/powerpc/mm/segv_errors.c
-f:tools/testing/selftests/powerpc/mm/settings
-f:tools/testing/selftests/powerpc/mm/stack_expansion_ldst.c
-f:tools/testing/selftests/powerpc/mm/stack_expansion_signal.c
-f:tools/testing/selftests/powerpc/mm/stress_code_patching.sh
-f:tools/testing/selftests/powerpc/mm/subpage_prot.c
-f:tools/testing/selftests/powerpc/mm/tlbie_test.c
-f:tools/testing/selftests/powerpc/mm/wild_bctr.c
-f:tools/testing/selftests/powerpc/nx-gzip/.gitignore
-f:tools/testing/selftests/powerpc/nx-gzip/99-nx-gzip.rules
-f:tools/testing/selftests/powerpc/nx-gzip/Makefile
-f:tools/testing/selftests/powerpc/nx-gzip/README
-f:tools/testing/selftests/powerpc/nx-gzip/gunz_test.c
-f:tools/testing/selftests/powerpc/nx-gzip/gzfht_test.c
-f:tools/testing/selftests/powerpc/nx-gzip/gzip_vas.c
-f:tools/testing/selftests/powerpc/nx-gzip/include/copy-paste.h
-f:tools/testing/selftests/powerpc/nx-gzip/include/crb.h
-f:tools/testing/selftests/powerpc/nx-gzip/include/nx.h
-f:tools/testing/selftests/powerpc/nx-gzip/include/nx_dbg.h
-f:tools/testing/selftests/powerpc/nx-gzip/include/nxu.h
-f:tools/testing/selftests/powerpc/nx-gzip/nx-gzip-test.sh
-f:tools/testing/selftests/powerpc/nx-gzip/settings
-f:tools/testing/selftests/powerpc/papr_attributes/.gitignore
-f:tools/testing/selftests/powerpc/papr_attributes/Makefile
-f:tools/testing/selftests/powerpc/papr_attributes/attr_test.c
-f:tools/testing/selftests/powerpc/papr_attributes/settings
-f:tools/testing/selftests/powerpc/papr_sysparm/.gitignore
-f:tools/testing/selftests/powerpc/papr_sysparm/Makefile
-f:tools/testing/selftests/powerpc/papr_sysparm/papr_sysparm.c
-f:tools/testing/selftests/powerpc/papr_sysparm/settings
-f:tools/testing/selftests/powerpc/papr_vpd/.gitignore
-f:tools/testing/selftests/powerpc/papr_vpd/Makefile
-f:tools/testing/selftests/powerpc/papr_vpd/papr_vpd.c
-f:tools/testing/selftests/powerpc/papr_vpd/settings
-f:tools/testing/selftests/powerpc/pmu/.gitignore
-f:tools/testing/selftests/powerpc/pmu/Makefile
-f:tools/testing/selftests/powerpc/pmu/branch_loops.S
-f:tools/testing/selftests/powerpc/pmu/count_instructions.c
-f:tools/testing/selftests/powerpc/pmu/count_stcx_fail.c
-f:tools/testing/selftests/powerpc/pmu/ebb/.gitignore
-f:tools/testing/selftests/powerpc/pmu/ebb/Makefile
-f:tools/testing/selftests/powerpc/pmu/ebb/back_to_back_ebbs_test.c
-f:tools/testing/selftests/powerpc/pmu/ebb/busy_loop.S
-f:tools/testing/selftests/powerpc/pmu/ebb/close_clears_pmcc_test.c
-f:tools/testing/selftests/powerpc/pmu/ebb/cpu_event_pinned_vs_ebb_test.c
-f:tools/testing/selftests/powerpc/pmu/ebb/cpu_event_vs_ebb_test.c
-f:tools/testing/selftests/powerpc/pmu/ebb/cycles_test.c
-f:tools/testing/selftests/powerpc/pmu/ebb/cycles_with_freeze_test.c
-f:tools/testing/selftests/powerpc/pmu/ebb/cycles_with_mmcr2_test.c
-f:tools/testing/selftests/powerpc/pmu/ebb/ebb.c
-f:tools/testing/selftests/powerpc/pmu/ebb/ebb.h
-f:tools/testing/selftests/powerpc/pmu/ebb/ebb_handler.S
-f:tools/testing/selftests/powerpc/pmu/ebb/ebb_on_child_test.c
-f:tools/testing/selftests/powerpc/pmu/ebb/ebb_on_willing_child_test.c
-f:tools/testing/selftests/powerpc/pmu/ebb/ebb_vs_cpu_event_test.c
-f:tools/testing/selftests/powerpc/pmu/ebb/event_attributes_test.c
-f:tools/testing/selftests/powerpc/pmu/ebb/fork_cleanup_test.c
-f:tools/testing/selftests/powerpc/pmu/ebb/instruction_count_test.c
-f:tools/testing/selftests/powerpc/pmu/ebb/lost_exception_test.c
-f:tools/testing/selftests/powerpc/pmu/ebb/multi_counter_test.c
-f:tools/testing/selftests/powerpc/pmu/ebb/multi_ebb_procs_test.c
-f:tools/testing/selftests/powerpc/pmu/ebb/no_handler_test.c
-f:tools/testing/selftests/powerpc/pmu/ebb/pmae_handling_test.c
-f:tools/testing/selftests/powerpc/pmu/ebb/pmc56_overflow_test.c
-f:tools/testing/selftests/powerpc/pmu/ebb/reg_access_test.c
-f:tools/testing/selftests/powerpc/pmu/ebb/regs_access_pmccext_test.c
-f:tools/testing/selftests/powerpc/pmu/ebb/task_event_pinned_vs_ebb_test.c
-f:tools/testing/selftests/powerpc/pmu/ebb/task_event_vs_ebb_test.c
-f:tools/testing/selftests/powerpc/pmu/ebb/trace.c
-f:tools/testing/selftests/powerpc/pmu/ebb/trace.h
-f:tools/testing/selftests/powerpc/pmu/event.c
-f:tools/testing/selftests/powerpc/pmu/event.h
-f:tools/testing/selftests/powerpc/pmu/event_code_tests/.gitignore
-f:tools/testing/selftests/powerpc/pmu/event_code_tests/Makefile
-f:tools/testing/selftests/powerpc/pmu/event_code_tests/blacklisted_events_test.c
-f:tools/testing/selftests/powerpc/pmu/event_code_tests/event_alternatives_tests_p10.c
-f:tools/testing/selftests/powerpc/pmu/event_code_tests/event_alternatives_tests_p9.c
-f:tools/testing/selftests/powerpc/pmu/event_code_tests/generic_events_valid_test.c
-f:tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_cache_test.c
-f:tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_l2l3_sel_test.c
-f:tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_mmcra_sample_test.c
-f:tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_pmc56_test.c
-f:tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_pmc_count_test.c
-f:tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_radix_scope_qual_test.c
-f:tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_repeat_test.c
-f:tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_thresh_cmp_test.c
-f:tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_thresh_ctl_test.c
-f:tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_thresh_sel_test.c
-f:tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_unit_test.c
-f:tools/testing/selftests/powerpc/pmu/event_code_tests/group_pmc56_exclude_constraints_test.c
-f:tools/testing/selftests/powerpc/pmu/event_code_tests/hw_cache_event_type_test.c
-f:tools/testing/selftests/powerpc/pmu/event_code_tests/invalid_event_code_test.c
-f:tools/testing/selftests/powerpc/pmu/event_code_tests/reserved_bits_mmcra_sample_elig_mode_test.c
-f:tools/testing/selftests/powerpc/pmu/event_code_tests/reserved_bits_mmcra_thresh_ctl_test.c
-f:tools/testing/selftests/powerpc/pmu/l3_bank_test.c
-f:tools/testing/selftests/powerpc/pmu/lib.c
-f:tools/testing/selftests/powerpc/pmu/lib.h
-f:tools/testing/selftests/powerpc/pmu/loop.S
-f:tools/testing/selftests/powerpc/pmu/per_event_excludes.c
-f:tools/testing/selftests/powerpc/pmu/sampling_tests/.gitignore
-f:tools/testing/selftests/powerpc/pmu/sampling_tests/Makefile
-f:tools/testing/selftests/powerpc/pmu/sampling_tests/bhrb_filter_map_test.c
-f:tools/testing/selftests/powerpc/pmu/sampling_tests/bhrb_no_crash_wo_pmu_test.c
-f:tools/testing/selftests/powerpc/pmu/sampling_tests/check_extended_reg_test.c
-f:tools/testing/selftests/powerpc/pmu/sampling_tests/intr_regs_no_crash_wo_pmu_test.c
-f:tools/testing/selftests/powerpc/pmu/sampling_tests/misc.c
-f:tools/testing/selftests/powerpc/pmu/sampling_tests/misc.h
-f:tools/testing/selftests/powerpc/pmu/sampling_tests/mmcr0_cc56run_test.c
-f:tools/testing/selftests/powerpc/pmu/sampling_tests/mmcr0_exceptionbits_test.c
-f:tools/testing/selftests/powerpc/pmu/sampling_tests/mmcr0_fc56_pmc1ce_test.c
-f:tools/testing/selftests/powerpc/pmu/sampling_tests/mmcr0_fc56_pmc56_test.c
-f:tools/testing/selftests/powerpc/pmu/sampling_tests/mmcr0_pmccext_test.c
-f:tools/testing/selftests/powerpc/pmu/sampling_tests/mmcr0_pmcjce_test.c
-f:tools/testing/selftests/powerpc/pmu/sampling_tests/mmcr1_comb_test.c
-f:tools/testing/selftests/powerpc/pmu/sampling_tests/mmcr1_sel_unit_cache_test.c
-f:tools/testing/selftests/powerpc/pmu/sampling_tests/mmcr2_fcs_fch_test.c
-f:tools/testing/selftests/powerpc/pmu/sampling_tests/mmcr2_l2l3_test.c
-f:tools/testing/selftests/powerpc/pmu/sampling_tests/mmcr3_src_test.c
-f:tools/testing/selftests/powerpc/pmu/sampling_tests/mmcra_bhrb_any_test.c
-f:tools/testing/selftests/powerpc/pmu/sampling_tests/mmcra_bhrb_cond_test.c
-f:tools/testing/selftests/powerpc/pmu/sampling_tests/mmcra_bhrb_disable_no_branch_test.c
-f:tools/testing/selftests/powerpc/pmu/sampling_tests/mmcra_bhrb_disable_test.c
-f:tools/testing/selftests/powerpc/pmu/sampling_tests/mmcra_bhrb_ind_call_test.c
-f:tools/testing/selftests/powerpc/pmu/sampling_tests/mmcra_thresh_cmp_test.c
-f:tools/testing/selftests/powerpc/pmu/sampling_tests/mmcra_thresh_marked_sample_test.c
-f:tools/testing/selftests/powerpc/pmu/settings
-f:tools/testing/selftests/powerpc/primitives/.gitignore
-f:tools/testing/selftests/powerpc/primitives/Makefile
-f:tools/testing/selftests/powerpc/primitives/asm/firmware.h
-f:tools/testing/selftests/powerpc/primitives/asm/ppc-opcode.h
-f:tools/testing/selftests/powerpc/primitives/asm/processor.h
-f:tools/testing/selftests/powerpc/primitives/linux/bitops.h
-f:tools/testing/selftests/powerpc/primitives/linux/stringify.h
-f:tools/testing/selftests/powerpc/primitives/load_unaligned_zeropad.c
-f:tools/testing/selftests/powerpc/primitives/settings
-f:tools/testing/selftests/powerpc/ptrace/.gitignore
-f:tools/testing/selftests/powerpc/ptrace/Makefile
-f:tools/testing/selftests/powerpc/ptrace/child.h
-f:tools/testing/selftests/powerpc/ptrace/core-pkey.c
-f:tools/testing/selftests/powerpc/ptrace/perf-hwbreak.c
-f:tools/testing/selftests/powerpc/ptrace/ptrace-gpr.S
-f:tools/testing/selftests/powerpc/ptrace/ptrace-gpr.c
-f:tools/testing/selftests/powerpc/ptrace/ptrace-gpr.h
-f:tools/testing/selftests/powerpc/ptrace/ptrace-hwbreak.c
-f:tools/testing/selftests/powerpc/ptrace/ptrace-perf-asm.S
-f:tools/testing/selftests/powerpc/ptrace/ptrace-perf-hwbreak.c
-f:tools/testing/selftests/powerpc/ptrace/ptrace-pkey.c
-f:tools/testing/selftests/powerpc/ptrace/ptrace-syscall.c
-f:tools/testing/selftests/powerpc/ptrace/ptrace-tar.c
-f:tools/testing/selftests/powerpc/ptrace/ptrace-tar.h
-f:tools/testing/selftests/powerpc/ptrace/ptrace-tm-gpr.c
-f:tools/testing/selftests/powerpc/ptrace/ptrace-tm-spd-gpr.c
-f:tools/testing/selftests/powerpc/ptrace/ptrace-tm-spd-tar.c
-f:tools/testing/selftests/powerpc/ptrace/ptrace-tm-spd-vsx.c
-f:tools/testing/selftests/powerpc/ptrace/ptrace-tm-spr.c
-f:tools/testing/selftests/powerpc/ptrace/ptrace-tm-tar.c
-f:tools/testing/selftests/powerpc/ptrace/ptrace-tm-vsx.c
-f:tools/testing/selftests/powerpc/ptrace/ptrace-vsx.c
-f:tools/testing/selftests/powerpc/ptrace/ptrace-vsx.h
-f:tools/testing/selftests/powerpc/ptrace/ptrace.h
-f:tools/testing/selftests/powerpc/ptrace/settings
-f:tools/testing/selftests/powerpc/scripts/hmi.sh
-f:tools/testing/selftests/powerpc/scripts/settings
-f:tools/testing/selftests/powerpc/security/.gitignore
-f:tools/testing/selftests/powerpc/security/Makefile
-f:tools/testing/selftests/powerpc/security/branch_loops.S
-f:tools/testing/selftests/powerpc/security/entry_flush.c
-f:tools/testing/selftests/powerpc/security/flush_utils.c
-f:tools/testing/selftests/powerpc/security/flush_utils.h
-f:tools/testing/selftests/powerpc/security/mitigation-patching.sh
-f:tools/testing/selftests/powerpc/security/rfi_flush.c
-f:tools/testing/selftests/powerpc/security/settings
-f:tools/testing/selftests/powerpc/security/spectre_v2.c
-f:tools/testing/selftests/powerpc/security/uaccess_flush.c
-f:tools/testing/selftests/powerpc/signal/.gitignore
-f:tools/testing/selftests/powerpc/signal/Makefile
-f:tools/testing/selftests/powerpc/signal/settings
-f:tools/testing/selftests/powerpc/signal/sig_sc_double_restart.c
-f:tools/testing/selftests/powerpc/signal/sigfuz.c
-f:tools/testing/selftests/powerpc/signal/signal.S
-f:tools/testing/selftests/powerpc/signal/signal.c
-f:tools/testing/selftests/powerpc/signal/signal_tm.c
-f:tools/testing/selftests/powerpc/signal/sigreturn_kernel.c
-f:tools/testing/selftests/powerpc/signal/sigreturn_unaligned.c
-f:tools/testing/selftests/powerpc/signal/sigreturn_vdso.c
-f:tools/testing/selftests/powerpc/stringloops/.gitignore
-f:tools/testing/selftests/powerpc/stringloops/Makefile
-f:tools/testing/selftests/powerpc/stringloops/asm/cache.h
-f:tools/testing/selftests/powerpc/stringloops/asm/ppc-opcode.h
-f:tools/testing/selftests/powerpc/stringloops/asm/ppc_asm.h
-f:tools/testing/selftests/powerpc/stringloops/linux/export.h
-f:tools/testing/selftests/powerpc/stringloops/memcmp.c
-f:tools/testing/selftests/powerpc/stringloops/settings
-f:tools/testing/selftests/powerpc/stringloops/string.c
-f:tools/testing/selftests/powerpc/stringloops/strlen.c
-f:tools/testing/selftests/powerpc/switch_endian/.gitignore
-f:tools/testing/selftests/powerpc/switch_endian/Makefile
-f:tools/testing/selftests/powerpc/switch_endian/check.S
-f:tools/testing/selftests/powerpc/switch_endian/common.h
-f:tools/testing/selftests/powerpc/switch_endian/settings
-f:tools/testing/selftests/powerpc/switch_endian/switch_endian_test.S
-f:tools/testing/selftests/powerpc/syscalls/.gitignore
-f:tools/testing/selftests/powerpc/syscalls/Makefile
-f:tools/testing/selftests/powerpc/syscalls/ipc.h
-f:tools/testing/selftests/powerpc/syscalls/ipc_unmuxed.c
-f:tools/testing/selftests/powerpc/syscalls/rtas_filter.c
-f:tools/testing/selftests/powerpc/syscalls/settings
-f:tools/testing/selftests/powerpc/tm/.gitignore
-f:tools/testing/selftests/powerpc/tm/Makefile
-f:tools/testing/selftests/powerpc/tm/settings
-f:tools/testing/selftests/powerpc/tm/tm-exec.c
-f:tools/testing/selftests/powerpc/tm/tm-fork.c
-f:tools/testing/selftests/powerpc/tm/tm-poison.c
-f:tools/testing/selftests/powerpc/tm/tm-resched-dscr.c
-f:tools/testing/selftests/powerpc/tm/tm-signal-context-chk-fpu.c
-f:tools/testing/selftests/powerpc/tm/tm-signal-context-chk-gpr.c
-f:tools/testing/selftests/powerpc/tm/tm-signal-context-chk-vmx.c
-f:tools/testing/selftests/powerpc/tm/tm-signal-context-chk-vsx.c
-f:tools/testing/selftests/powerpc/tm/tm-signal-context-force-tm.c
-f:tools/testing/selftests/powerpc/tm/tm-signal-msr-resv.c
-f:tools/testing/selftests/powerpc/tm/tm-signal-pagefault.c
-f:tools/testing/selftests/powerpc/tm/tm-signal-sigreturn-nt.c
-f:tools/testing/selftests/powerpc/tm/tm-signal-stack.c
-f:tools/testing/selftests/powerpc/tm/tm-signal.S
-f:tools/testing/selftests/powerpc/tm/tm-sigreturn.c
-f:tools/testing/selftests/powerpc/tm/tm-syscall-asm.S
-f:tools/testing/selftests/powerpc/tm/tm-syscall.c
-f:tools/testing/selftests/powerpc/tm/tm-tar.c
-f:tools/testing/selftests/powerpc/tm/tm-tmspr.c
-f:tools/testing/selftests/powerpc/tm/tm-trap.c
-f:tools/testing/selftests/powerpc/tm/tm-unavailable.c
-f:tools/testing/selftests/powerpc/tm/tm-vmx-unavail.c
-f:tools/testing/selftests/powerpc/tm/tm-vmxcopy.c
-f:tools/testing/selftests/powerpc/tm/tm.h
-f:tools/testing/selftests/powerpc/utils.c
-f:tools/testing/selftests/powerpc/vphn/.gitignore
-f:tools/testing/selftests/powerpc/vphn/Makefile
-f:tools/testing/selftests/powerpc/vphn/settings
-f:tools/testing/selftests/powerpc/vphn/test-vphn.c
-f:tools/testing/selftests/prctl/.gitignore
-f:tools/testing/selftests/prctl/Makefile
-f:tools/testing/selftests/prctl/config
-f:tools/testing/selftests/prctl/disable-tsc-ctxt-sw-stress-test.c
-f:tools/testing/selftests/prctl/disable-tsc-on-off-stress-test.c
-f:tools/testing/selftests/prctl/disable-tsc-test.c
-f:tools/testing/selftests/prctl/set-anon-vma-name-test.c
-f:tools/testing/selftests/prctl/set-process-name.c
-f:tools/testing/selftests/proc/.gitignore
-f:tools/testing/selftests/proc/Makefile
-f:tools/testing/selftests/proc/config
-f:tools/testing/selftests/proc/fd-001-lookup.c
-f:tools/testing/selftests/proc/fd-002-posix-eq.c
-f:tools/testing/selftests/proc/fd-003-kthread.c
-f:tools/testing/selftests/proc/proc-2-is-kthread.c
-f:tools/testing/selftests/proc/proc-empty-vm.c
-f:tools/testing/selftests/proc/proc-fsconfig-hidepid.c
-f:tools/testing/selftests/proc/proc-loadavg-001.c
-f:tools/testing/selftests/proc/proc-maps-race.c
-f:tools/testing/selftests/proc/proc-multiple-procfs.c
-f:tools/testing/selftests/proc/proc-pid-vm.c
-f:tools/testing/selftests/proc/proc-self-isnt-kthread.c
-f:tools/testing/selftests/proc/proc-self-map-files-001.c
-f:tools/testing/selftests/proc/proc-self-map-files-002.c
-f:tools/testing/selftests/proc/proc-self-syscall.c
-f:tools/testing/selftests/proc/proc-self-wchan.c
-f:tools/testing/selftests/proc/proc-subset-pid.c
-f:tools/testing/selftests/proc/proc-tid0.c
-f:tools/testing/selftests/proc/proc-uptime-001.c
-f:tools/testing/selftests/proc/proc-uptime-002.c
-f:tools/testing/selftests/proc/proc-uptime.h
-f:tools/testing/selftests/proc/proc.h
-f:tools/testing/selftests/proc/read.c
-f:tools/testing/selftests/proc/self.c
-f:tools/testing/selftests/proc/setns-dcache.c
-f:tools/testing/selftests/proc/setns-sysvipc.c
-f:tools/testing/selftests/proc/thread-self.c
-f:tools/testing/selftests/pstore/.gitignore
-f:tools/testing/selftests/pstore/Makefile
-f:tools/testing/selftests/pstore/common_tests
-f:tools/testing/selftests/pstore/config
-f:tools/testing/selftests/pstore/pstore_crash_test
-f:tools/testing/selftests/pstore/pstore_post_reboot_tests
-f:tools/testing/selftests/pstore/pstore_tests
-f:tools/testing/selftests/ptp/.gitignore
-f:tools/testing/selftests/ptp/Makefile
-f:tools/testing/selftests/ptp/phc.sh
-f:tools/testing/selftests/ptp/ptpchmaskfmt.sh
-f:tools/testing/selftests/ptp/testptp.c
-f:tools/testing/selftests/ptp/testptp.mk
-f:tools/testing/selftests/ptrace/.gitignore
-f:tools/testing/selftests/ptrace/Makefile
-f:tools/testing/selftests/ptrace/get_set_sud.c
-f:tools/testing/selftests/ptrace/get_syscall_info.c
-f:tools/testing/selftests/ptrace/peeksiginfo.c
-f:tools/testing/selftests/ptrace/set_syscall_info.c
-f:tools/testing/selftests/ptrace/vmaccess.c
-f:tools/testing/selftests/rcutorture/.gitignore
-f:tools/testing/selftests/rcutorture/Makefile
-f:tools/testing/selftests/rcutorture/bin/config2csv.sh
-f:tools/testing/selftests/rcutorture/bin/configNR_CPUS.sh
-f:tools/testing/selftests/rcutorture/bin/config_override.sh
-f:tools/testing/selftests/rcutorture/bin/configcheck.sh
-f:tools/testing/selftests/rcutorture/bin/configinit.sh
-f:tools/testing/selftests/rcutorture/bin/console-badness.sh
-f:tools/testing/selftests/rcutorture/bin/cpus2use.sh
-f:tools/testing/selftests/rcutorture/bin/functions.sh
-f:tools/testing/selftests/rcutorture/bin/jitter.sh
-f:tools/testing/selftests/rcutorture/bin/jitterstart.sh
-f:tools/testing/selftests/rcutorture/bin/jitterstop.sh
-f:tools/testing/selftests/rcutorture/bin/kcsan-collapse.sh
-f:tools/testing/selftests/rcutorture/bin/kvm-again.sh
-f:tools/testing/selftests/rcutorture/bin/kvm-assign-cpus.sh
-f:tools/testing/selftests/rcutorture/bin/kvm-build.sh
-f:tools/testing/selftests/rcutorture/bin/kvm-check-branches.sh
-f:tools/testing/selftests/rcutorture/bin/kvm-end-run-stats.sh
-f:tools/testing/selftests/rcutorture/bin/kvm-find-errors.sh
-f:tools/testing/selftests/rcutorture/bin/kvm-get-cpus-script.sh
-f:tools/testing/selftests/rcutorture/bin/kvm-recheck-lock.sh
-f:tools/testing/selftests/rcutorture/bin/kvm-recheck-rcu.sh
-f:tools/testing/selftests/rcutorture/bin/kvm-recheck-rcuscale-ftrace.sh
-f:tools/testing/selftests/rcutorture/bin/kvm-recheck-rcuscale.sh
-f:tools/testing/selftests/rcutorture/bin/kvm-recheck-refscale.sh
-f:tools/testing/selftests/rcutorture/bin/kvm-recheck-scf.sh
-f:tools/testing/selftests/rcutorture/bin/kvm-recheck.sh
-f:tools/testing/selftests/rcutorture/bin/kvm-remote-noreap.sh
-f:tools/testing/selftests/rcutorture/bin/kvm-remote.sh
-f:tools/testing/selftests/rcutorture/bin/kvm-test-1-run-batch.sh
-f:tools/testing/selftests/rcutorture/bin/kvm-test-1-run-qemu.sh
-f:tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh
-f:tools/testing/selftests/rcutorture/bin/kvm-transform.sh
-f:tools/testing/selftests/rcutorture/bin/kvm.sh
-f:tools/testing/selftests/rcutorture/bin/mkinitrd.sh
-f:tools/testing/selftests/rcutorture/bin/mktestid.sh
-f:tools/testing/selftests/rcutorture/bin/parse-build.sh
-f:tools/testing/selftests/rcutorture/bin/parse-console.sh
-f:tools/testing/selftests/rcutorture/bin/srcu_lockdep.sh
-f:tools/testing/selftests/rcutorture/bin/torture.sh
-f:tools/testing/selftests/rcutorture/configs/lock/BUSTED
-f:tools/testing/selftests/rcutorture/configs/lock/BUSTED.boot
-f:tools/testing/selftests/rcutorture/configs/lock/CFLIST
-f:tools/testing/selftests/rcutorture/configs/lock/CFcommon
-f:tools/testing/selftests/rcutorture/configs/lock/LOCK01
-f:tools/testing/selftests/rcutorture/configs/lock/LOCK02
-f:tools/testing/selftests/rcutorture/configs/lock/LOCK02.boot
-f:tools/testing/selftests/rcutorture/configs/lock/LOCK03
-f:tools/testing/selftests/rcutorture/configs/lock/LOCK03.boot
-f:tools/testing/selftests/rcutorture/configs/lock/LOCK04
-f:tools/testing/selftests/rcutorture/configs/lock/LOCK04.boot
-f:tools/testing/selftests/rcutorture/configs/lock/LOCK05
-f:tools/testing/selftests/rcutorture/configs/lock/LOCK05.boot
-f:tools/testing/selftests/rcutorture/configs/lock/LOCK06
-f:tools/testing/selftests/rcutorture/configs/lock/LOCK06.boot
-f:tools/testing/selftests/rcutorture/configs/lock/LOCK07
-f:tools/testing/selftests/rcutorture/configs/lock/LOCK07.boot
-f:tools/testing/selftests/rcutorture/configs/lock/LOCK08
-f:tools/testing/selftests/rcutorture/configs/lock/LOCK08.boot
-f:tools/testing/selftests/rcutorture/configs/lock/LOCK09
-f:tools/testing/selftests/rcutorture/configs/lock/LOCK09.boot
-f:tools/testing/selftests/rcutorture/configs/lock/ver_functions.sh
-f:tools/testing/selftests/rcutorture/configs/rcu/BUSTED
-f:tools/testing/selftests/rcutorture/configs/rcu/BUSTED-BOOST
-f:tools/testing/selftests/rcutorture/configs/rcu/BUSTED-BOOST.boot
-f:tools/testing/selftests/rcutorture/configs/rcu/BUSTED.boot
-f:tools/testing/selftests/rcutorture/configs/rcu/CFLIST
-f:tools/testing/selftests/rcutorture/configs/rcu/CFcommon
-f:tools/testing/selftests/rcutorture/configs/rcu/CFcommon.i686
-f:tools/testing/selftests/rcutorture/configs/rcu/CFcommon.ppc64le
-f:tools/testing/selftests/rcutorture/configs/rcu/CFcommon.x86_64
-f:tools/testing/selftests/rcutorture/configs/rcu/RUDE01
-f:tools/testing/selftests/rcutorture/configs/rcu/RUDE01.boot
-f:tools/testing/selftests/rcutorture/configs/rcu/SRCU-N
-f:tools/testing/selftests/rcutorture/configs/rcu/SRCU-N.boot
-f:tools/testing/selftests/rcutorture/configs/rcu/SRCU-P
-f:tools/testing/selftests/rcutorture/configs/rcu/SRCU-P.boot
-f:tools/testing/selftests/rcutorture/configs/rcu/SRCU-T
-f:tools/testing/selftests/rcutorture/configs/rcu/SRCU-T.boot
-f:tools/testing/selftests/rcutorture/configs/rcu/SRCU-U
-f:tools/testing/selftests/rcutorture/configs/rcu/SRCU-U.boot
-f:tools/testing/selftests/rcutorture/configs/rcu/TASKS01
-f:tools/testing/selftests/rcutorture/configs/rcu/TASKS01.boot
-f:tools/testing/selftests/rcutorture/configs/rcu/TASKS02
-f:tools/testing/selftests/rcutorture/configs/rcu/TASKS02.boot
-f:tools/testing/selftests/rcutorture/configs/rcu/TASKS03
-f:tools/testing/selftests/rcutorture/configs/rcu/TASKS03.boot
-f:tools/testing/selftests/rcutorture/configs/rcu/TINY01
-f:tools/testing/selftests/rcutorture/configs/rcu/TINY02
-f:tools/testing/selftests/rcutorture/configs/rcu/TINY02.boot
-f:tools/testing/selftests/rcutorture/configs/rcu/TRACE01
-f:tools/testing/selftests/rcutorture/configs/rcu/TRACE01.boot
-f:tools/testing/selftests/rcutorture/configs/rcu/TRACE02
-f:tools/testing/selftests/rcutorture/configs/rcu/TRACE02.boot
-f:tools/testing/selftests/rcutorture/configs/rcu/TREE01
-f:tools/testing/selftests/rcutorture/configs/rcu/TREE01.boot
-f:tools/testing/selftests/rcutorture/configs/rcu/TREE02
-f:tools/testing/selftests/rcutorture/configs/rcu/TREE02.boot
-f:tools/testing/selftests/rcutorture/configs/rcu/TREE03
-f:tools/testing/selftests/rcutorture/configs/rcu/TREE03.boot
-f:tools/testing/selftests/rcutorture/configs/rcu/TREE04
-f:tools/testing/selftests/rcutorture/configs/rcu/TREE04.boot
-f:tools/testing/selftests/rcutorture/configs/rcu/TREE05
-f:tools/testing/selftests/rcutorture/configs/rcu/TREE05.boot
-f:tools/testing/selftests/rcutorture/configs/rcu/TREE06
-f:tools/testing/selftests/rcutorture/configs/rcu/TREE06.boot
-f:tools/testing/selftests/rcutorture/configs/rcu/TREE07
-f:tools/testing/selftests/rcutorture/configs/rcu/TREE07.boot
-f:tools/testing/selftests/rcutorture/configs/rcu/TREE08
-f:tools/testing/selftests/rcutorture/configs/rcu/TREE08.boot
-f:tools/testing/selftests/rcutorture/configs/rcu/TREE09
-f:tools/testing/selftests/rcutorture/configs/rcu/TREE10
-f:tools/testing/selftests/rcutorture/configs/rcu/TREE10.boot
-f:tools/testing/selftests/rcutorture/configs/rcu/TRIVIAL
-f:tools/testing/selftests/rcutorture/configs/rcu/TRIVIAL.boot
-f:tools/testing/selftests/rcutorture/configs/rcu/ver_functions.sh
-f:tools/testing/selftests/rcutorture/configs/rcuscale/CFLIST
-f:tools/testing/selftests/rcutorture/configs/rcuscale/CFcommon
-f:tools/testing/selftests/rcutorture/configs/rcuscale/TINY
-f:tools/testing/selftests/rcutorture/configs/rcuscale/TRACE01
-f:tools/testing/selftests/rcutorture/configs/rcuscale/TRACE01.boot
-f:tools/testing/selftests/rcutorture/configs/rcuscale/TREE
-f:tools/testing/selftests/rcutorture/configs/rcuscale/TREE54
-f:tools/testing/selftests/rcutorture/configs/rcuscale/ver_functions.sh
-f:tools/testing/selftests/rcutorture/configs/refscale/CFLIST
-f:tools/testing/selftests/rcutorture/configs/refscale/CFcommon
-f:tools/testing/selftests/rcutorture/configs/refscale/NOPREEMPT
-f:tools/testing/selftests/rcutorture/configs/refscale/PREEMPT
-f:tools/testing/selftests/rcutorture/configs/refscale/TINY
-f:tools/testing/selftests/rcutorture/configs/refscale/ver_functions.sh
-f:tools/testing/selftests/rcutorture/configs/scf/CFLIST
-f:tools/testing/selftests/rcutorture/configs/scf/CFcommon
-f:tools/testing/selftests/rcutorture/configs/scf/NOPREEMPT
-f:tools/testing/selftests/rcutorture/configs/scf/NOPREEMPT.boot
-f:tools/testing/selftests/rcutorture/configs/scf/PREEMPT
-f:tools/testing/selftests/rcutorture/configs/scf/ver_functions.sh
-f:tools/testing/selftests/rcutorture/doc/TINY_RCU.txt
-f:tools/testing/selftests/rcutorture/doc/TREE_RCU-kconfig.txt
-f:tools/testing/selftests/rcutorture/doc/initrd.txt
-f:tools/testing/selftests/rcutorture/doc/rcu-test-image.txt
-f:tools/testing/selftests/resctrl/.gitignore
-f:tools/testing/selftests/resctrl/Makefile
-f:tools/testing/selftests/resctrl/README
-f:tools/testing/selftests/resctrl/cache.c
-f:tools/testing/selftests/resctrl/cat_test.c
-f:tools/testing/selftests/resctrl/cmt_test.c
-f:tools/testing/selftests/resctrl/config
-f:tools/testing/selftests/resctrl/fill_buf.c
-f:tools/testing/selftests/resctrl/mba_test.c
-f:tools/testing/selftests/resctrl/mbm_test.c
-f:tools/testing/selftests/resctrl/resctrl.h
-f:tools/testing/selftests/resctrl/resctrl_tests.c
-f:tools/testing/selftests/resctrl/resctrl_val.c
-f:tools/testing/selftests/resctrl/resctrlfs.c
-f:tools/testing/selftests/resctrl/settings
-f:tools/testing/selftests/ring-buffer/.gitignore
-f:tools/testing/selftests/ring-buffer/Makefile
-f:tools/testing/selftests/ring-buffer/config
-f:tools/testing/selftests/ring-buffer/map_test.c
-f:tools/testing/selftests/riscv/Makefile
-f:tools/testing/selftests/riscv/abi/.gitignore
-f:tools/testing/selftests/riscv/abi/Makefile
-f:tools/testing/selftests/riscv/abi/pointer_masking.c
-f:tools/testing/selftests/riscv/hwprobe/.gitignore
-f:tools/testing/selftests/riscv/hwprobe/Makefile
-f:tools/testing/selftests/riscv/hwprobe/cbo.c
-f:tools/testing/selftests/riscv/hwprobe/hwprobe.c
-f:tools/testing/selftests/riscv/hwprobe/hwprobe.h
-f:tools/testing/selftests/riscv/hwprobe/sys_hwprobe.S
-f:tools/testing/selftests/riscv/hwprobe/which-cpus.c
-f:tools/testing/selftests/riscv/mm/.gitignore
-f:tools/testing/selftests/riscv/mm/Makefile
-f:tools/testing/selftests/riscv/mm/mmap_bottomup.c
-f:tools/testing/selftests/riscv/mm/mmap_default.c
-f:tools/testing/selftests/riscv/mm/mmap_test.h
-f:tools/testing/selftests/riscv/mm/run_mmap.sh
-f:tools/testing/selftests/riscv/sigreturn/.gitignore
-f:tools/testing/selftests/riscv/sigreturn/Makefile
-f:tools/testing/selftests/riscv/sigreturn/sigreturn.c
-f:tools/testing/selftests/riscv/vector/.gitignore
-f:tools/testing/selftests/riscv/vector/Makefile
-f:tools/testing/selftests/riscv/vector/v_exec_initval_nolibc.c
-f:tools/testing/selftests/riscv/vector/v_helpers.c
-f:tools/testing/selftests/riscv/vector/v_helpers.h
-f:tools/testing/selftests/riscv/vector/v_initval.c
-f:tools/testing/selftests/riscv/vector/vstate_exec_nolibc.c
-f:tools/testing/selftests/riscv/vector/vstate_prctl.c
-f:tools/testing/selftests/rlimits/.gitignore
-f:tools/testing/selftests/rlimits/Makefile
-f:tools/testing/selftests/rlimits/config
-f:tools/testing/selftests/rlimits/rlimits-per-userns.c
-f:tools/testing/selftests/rseq/.gitignore
-f:tools/testing/selftests/rseq/Makefile
-f:tools/testing/selftests/rseq/basic_percpu_ops_test.c
-f:tools/testing/selftests/rseq/basic_test.c
-f:tools/testing/selftests/rseq/compiler.h
-f:tools/testing/selftests/rseq/param_test.c
-f:tools/testing/selftests/rseq/rseq-abi.h
-f:tools/testing/selftests/rseq/rseq-arm-bits.h
-f:tools/testing/selftests/rseq/rseq-arm.h
-f:tools/testing/selftests/rseq/rseq-arm64-bits.h
-f:tools/testing/selftests/rseq/rseq-arm64.h
-f:tools/testing/selftests/rseq/rseq-bits-reset.h
-f:tools/testing/selftests/rseq/rseq-bits-template.h
-f:tools/testing/selftests/rseq/rseq-generic-thread-pointer.h
-f:tools/testing/selftests/rseq/rseq-mips-bits.h
-f:tools/testing/selftests/rseq/rseq-mips.h
-f:tools/testing/selftests/rseq/rseq-or1k-bits.h
-f:tools/testing/selftests/rseq/rseq-or1k-thread-pointer.h
-f:tools/testing/selftests/rseq/rseq-or1k.h
-f:tools/testing/selftests/rseq/rseq-ppc-bits.h
-f:tools/testing/selftests/rseq/rseq-ppc-thread-pointer.h
-f:tools/testing/selftests/rseq/rseq-ppc.h
-f:tools/testing/selftests/rseq/rseq-riscv-bits.h
-f:tools/testing/selftests/rseq/rseq-riscv.h
-f:tools/testing/selftests/rseq/rseq-s390-bits.h
-f:tools/testing/selftests/rseq/rseq-s390.h
-f:tools/testing/selftests/rseq/rseq-thread-pointer.h
-f:tools/testing/selftests/rseq/rseq-x86-bits.h
-f:tools/testing/selftests/rseq/rseq-x86-thread-pointer.h
-f:tools/testing/selftests/rseq/rseq-x86.h
-f:tools/testing/selftests/rseq/rseq.c
-f:tools/testing/selftests/rseq/rseq.h
-f:tools/testing/selftests/rseq/run_param_test.sh
-f:tools/testing/selftests/rseq/run_syscall_errors_test.sh
-f:tools/testing/selftests/rseq/settings
-f:tools/testing/selftests/rseq/syscall_errors_test.c
-f:tools/testing/selftests/rtc/.gitignore
-f:tools/testing/selftests/rtc/Makefile
-f:tools/testing/selftests/rtc/rtctest.c
-f:tools/testing/selftests/rtc/settings
-f:tools/testing/selftests/run_kselftest.sh
-f:tools/testing/selftests/rust/Makefile
-f:tools/testing/selftests/rust/config
-f:tools/testing/selftests/rust/test_probe_samples.sh
-f:tools/testing/selftests/safesetid/.gitignore
-f:tools/testing/selftests/safesetid/Makefile
-f:tools/testing/selftests/safesetid/config
-f:tools/testing/selftests/safesetid/safesetid-test.c
-f:tools/testing/selftests/safesetid/safesetid-test.sh
-f:tools/testing/selftests/sched/.gitignore
-f:tools/testing/selftests/sched/Makefile
-f:tools/testing/selftests/sched/config
-f:tools/testing/selftests/sched/cs_prctl_test.c
-f:tools/testing/selftests/sched_ext/.gitignore
-f:tools/testing/selftests/sched_ext/Makefile
-f:tools/testing/selftests/sched_ext/allowed_cpus.bpf.c
-f:tools/testing/selftests/sched_ext/allowed_cpus.c
-f:tools/testing/selftests/sched_ext/config
-f:tools/testing/selftests/sched_ext/create_dsq.bpf.c
-f:tools/testing/selftests/sched_ext/create_dsq.c
-f:tools/testing/selftests/sched_ext/ddsp_bogus_dsq_fail.bpf.c
-f:tools/testing/selftests/sched_ext/ddsp_bogus_dsq_fail.c
-f:tools/testing/selftests/sched_ext/ddsp_vtimelocal_fail.bpf.c
-f:tools/testing/selftests/sched_ext/ddsp_vtimelocal_fail.c
-f:tools/testing/selftests/sched_ext/dsp_local_on.bpf.c
-f:tools/testing/selftests/sched_ext/dsp_local_on.c
-f:tools/testing/selftests/sched_ext/enq_last_no_enq_fails.bpf.c
-f:tools/testing/selftests/sched_ext/enq_last_no_enq_fails.c
-f:tools/testing/selftests/sched_ext/enq_select_cpu.bpf.c
-f:tools/testing/selftests/sched_ext/enq_select_cpu.c
-f:tools/testing/selftests/sched_ext/exit.bpf.c
-f:tools/testing/selftests/sched_ext/exit.c
-f:tools/testing/selftests/sched_ext/exit_test.h
-f:tools/testing/selftests/sched_ext/hotplug.bpf.c
-f:tools/testing/selftests/sched_ext/hotplug.c
-f:tools/testing/selftests/sched_ext/hotplug_test.h
-f:tools/testing/selftests/sched_ext/init_enable_count.bpf.c
-f:tools/testing/selftests/sched_ext/init_enable_count.c
-f:tools/testing/selftests/sched_ext/maximal.bpf.c
-f:tools/testing/selftests/sched_ext/maximal.c
-f:tools/testing/selftests/sched_ext/maybe_null.bpf.c
-f:tools/testing/selftests/sched_ext/maybe_null.c
-f:tools/testing/selftests/sched_ext/maybe_null_fail_dsp.bpf.c
-f:tools/testing/selftests/sched_ext/maybe_null_fail_yld.bpf.c
-f:tools/testing/selftests/sched_ext/minimal.bpf.c
-f:tools/testing/selftests/sched_ext/minimal.c
-f:tools/testing/selftests/sched_ext/numa.bpf.c
-f:tools/testing/selftests/sched_ext/numa.c
-f:tools/testing/selftests/sched_ext/prog_run.bpf.c
-f:tools/testing/selftests/sched_ext/prog_run.c
-f:tools/testing/selftests/sched_ext/reload_loop.c
-f:tools/testing/selftests/sched_ext/runner.c
-f:tools/testing/selftests/sched_ext/scx_test.h
-f:tools/testing/selftests/sched_ext/select_cpu_dfl.bpf.c
-f:tools/testing/selftests/sched_ext/select_cpu_dfl.c
-f:tools/testing/selftests/sched_ext/select_cpu_dfl_nodispatch.bpf.c
-f:tools/testing/selftests/sched_ext/select_cpu_dfl_nodispatch.c
-f:tools/testing/selftests/sched_ext/select_cpu_dispatch.bpf.c
-f:tools/testing/selftests/sched_ext/select_cpu_dispatch.c
-f:tools/testing/selftests/sched_ext/select_cpu_dispatch_bad_dsq.bpf.c
-f:tools/testing/selftests/sched_ext/select_cpu_dispatch_bad_dsq.c
-f:tools/testing/selftests/sched_ext/select_cpu_dispatch_dbl_dsp.bpf.c
-f:tools/testing/selftests/sched_ext/select_cpu_dispatch_dbl_dsp.c
-f:tools/testing/selftests/sched_ext/select_cpu_vtime.bpf.c
-f:tools/testing/selftests/sched_ext/select_cpu_vtime.c
-f:tools/testing/selftests/sched_ext/test_example.c
-f:tools/testing/selftests/sched_ext/util.c
-f:tools/testing/selftests/sched_ext/util.h
-f:tools/testing/selftests/seccomp/.gitignore
-f:tools/testing/selftests/seccomp/Makefile
-f:tools/testing/selftests/seccomp/config
-f:tools/testing/selftests/seccomp/seccomp_benchmark.c
-f:tools/testing/selftests/seccomp/seccomp_bpf.c
-f:tools/testing/selftests/seccomp/settings
-f:tools/testing/selftests/sgx/.gitignore
-f:tools/testing/selftests/sgx/Makefile
-f:tools/testing/selftests/sgx/call.S
-f:tools/testing/selftests/sgx/defines.h
-f:tools/testing/selftests/sgx/load.c
-f:tools/testing/selftests/sgx/main.c
-f:tools/testing/selftests/sgx/main.h
-f:tools/testing/selftests/sgx/sign_key.S
-f:tools/testing/selftests/sgx/sign_key.pem
-f:tools/testing/selftests/sgx/sigstruct.c
-f:tools/testing/selftests/sgx/test_encl.c
-f:tools/testing/selftests/sgx/test_encl.lds
-f:tools/testing/selftests/sgx/test_encl_bootstrap.S
-f:tools/testing/selftests/signal/.gitignore
-f:tools/testing/selftests/signal/Makefile
-f:tools/testing/selftests/signal/current_stack_pointer.h
-f:tools/testing/selftests/signal/mangle_uc_sigmask.c
-f:tools/testing/selftests/signal/sas.c
-f:tools/testing/selftests/size/.gitignore
-f:tools/testing/selftests/size/Makefile
-f:tools/testing/selftests/size/get_size.c
-f:tools/testing/selftests/sparc64/Makefile
-f:tools/testing/selftests/sparc64/drivers/.gitignore
-f:tools/testing/selftests/sparc64/drivers/Makefile
-f:tools/testing/selftests/sparc64/drivers/adi-test.c
-f:tools/testing/selftests/sparc64/drivers/drivers_test.sh
-f:tools/testing/selftests/sparc64/run.sh
-f:tools/testing/selftests/splice/.gitignore
-f:tools/testing/selftests/splice/Makefile
-f:tools/testing/selftests/splice/config
-f:tools/testing/selftests/splice/default_file_splice_read.c
-f:tools/testing/selftests/splice/default_file_splice_read.sh
-f:tools/testing/selftests/splice/settings
-f:tools/testing/selftests/splice/short_splice_read.sh
-f:tools/testing/selftests/splice/splice_read.c
-f:tools/testing/selftests/static_keys/Makefile
-f:tools/testing/selftests/static_keys/config
-f:tools/testing/selftests/static_keys/test_static_keys.sh
-f:tools/testing/selftests/sync/.gitignore
-f:tools/testing/selftests/sync/Makefile
-f:tools/testing/selftests/sync/config
-f:tools/testing/selftests/sync/sw_sync.h
-f:tools/testing/selftests/sync/sync.c
-f:tools/testing/selftests/sync/sync.h
-f:tools/testing/selftests/sync/sync_alloc.c
-f:tools/testing/selftests/sync/sync_fence.c
-f:tools/testing/selftests/sync/sync_merge.c
-f:tools/testing/selftests/sync/sync_stress_consumer.c
-f:tools/testing/selftests/sync/sync_stress_merge.c
-f:tools/testing/selftests/sync/sync_stress_parallelism.c
-f:tools/testing/selftests/sync/sync_test.c
-f:tools/testing/selftests/sync/sync_wait.c
-f:tools/testing/selftests/sync/synctest.h
-f:tools/testing/selftests/syscall_user_dispatch/.gitignore
-f:tools/testing/selftests/syscall_user_dispatch/Makefile
-f:tools/testing/selftests/syscall_user_dispatch/config
-f:tools/testing/selftests/syscall_user_dispatch/sud_benchmark.c
-f:tools/testing/selftests/syscall_user_dispatch/sud_test.c
-f:tools/testing/selftests/sysctl/Makefile
-f:tools/testing/selftests/sysctl/config
-f:tools/testing/selftests/sysctl/sysctl.sh
-f:tools/testing/selftests/tc-testing/.gitignore
-f:tools/testing/selftests/tc-testing/Makefile
-f:tools/testing/selftests/tc-testing/README
-f:tools/testing/selftests/tc-testing/TODO.txt
-f:tools/testing/selftests/tc-testing/TdcPlugin.py
-f:tools/testing/selftests/tc-testing/TdcResults.py
-f:tools/testing/selftests/tc-testing/action-ebpf
-f:tools/testing/selftests/tc-testing/action.c
-f:tools/testing/selftests/tc-testing/config
-f:tools/testing/selftests/tc-testing/creating-plugins/AddingPlugins.txt
-f:tools/testing/selftests/tc-testing/creating-testcases/AddingTestCases.txt
-f:tools/testing/selftests/tc-testing/creating-testcases/example.json
-f:tools/testing/selftests/tc-testing/creating-testcases/scapy-example.json
-f:tools/testing/selftests/tc-testing/creating-testcases/template.json
-f:tools/testing/selftests/tc-testing/plugin-lib/README-PLUGINS
-f:tools/testing/selftests/tc-testing/plugin-lib/nsPlugin.py
-f:tools/testing/selftests/tc-testing/plugin-lib/rootPlugin.py
-f:tools/testing/selftests/tc-testing/plugin-lib/scapyPlugin.py
-f:tools/testing/selftests/tc-testing/plugin-lib/valgrindPlugin.py
-f:tools/testing/selftests/tc-testing/plugins/__init__.py
-f:tools/testing/selftests/tc-testing/scripts/sfq_rejects_limit_1.py
-f:tools/testing/selftests/tc-testing/scripts/taprio_wait_for_admin.sh
-f:tools/testing/selftests/tc-testing/settings
-f:tools/testing/selftests/tc-testing/tc-tests/actions/bpf.json
-f:tools/testing/selftests/tc-testing/tc-tests/actions/connmark.json
-f:tools/testing/selftests/tc-testing/tc-tests/actions/csum.json
-f:tools/testing/selftests/tc-testing/tc-tests/actions/ct.json
-f:tools/testing/selftests/tc-testing/tc-tests/actions/ctinfo.json
-f:tools/testing/selftests/tc-testing/tc-tests/actions/gact.json
-f:tools/testing/selftests/tc-testing/tc-tests/actions/gate.json
-f:tools/testing/selftests/tc-testing/tc-tests/actions/ife.json
-f:tools/testing/selftests/tc-testing/tc-tests/actions/mirred.json
-f:tools/testing/selftests/tc-testing/tc-tests/actions/mpls.json
-f:tools/testing/selftests/tc-testing/tc-tests/actions/nat.json
-f:tools/testing/selftests/tc-testing/tc-tests/actions/pedit.json
-f:tools/testing/selftests/tc-testing/tc-tests/actions/police.json
-f:tools/testing/selftests/tc-testing/tc-tests/actions/sample.json
-f:tools/testing/selftests/tc-testing/tc-tests/actions/simple.json
-f:tools/testing/selftests/tc-testing/tc-tests/actions/skbedit.json
-f:tools/testing/selftests/tc-testing/tc-tests/actions/skbmod.json
-f:tools/testing/selftests/tc-testing/tc-tests/actions/tunnel_key.json
-f:tools/testing/selftests/tc-testing/tc-tests/actions/vlan.json
-f:tools/testing/selftests/tc-testing/tc-tests/filters/basic.json
-f:tools/testing/selftests/tc-testing/tc-tests/filters/bpf.json
-f:tools/testing/selftests/tc-testing/tc-tests/filters/cgroup.json
-f:tools/testing/selftests/tc-testing/tc-tests/filters/flow.json
-f:tools/testing/selftests/tc-testing/tc-tests/filters/flower.json
-f:tools/testing/selftests/tc-testing/tc-tests/filters/fw.json
-f:tools/testing/selftests/tc-testing/tc-tests/filters/matchall.json
-f:tools/testing/selftests/tc-testing/tc-tests/filters/route.json
-f:tools/testing/selftests/tc-testing/tc-tests/filters/u32.json
-f:tools/testing/selftests/tc-testing/tc-tests/infra/actions.json
-f:tools/testing/selftests/tc-testing/tc-tests/infra/filter.json
-f:tools/testing/selftests/tc-testing/tc-tests/infra/qdiscs.json
-f:tools/testing/selftests/tc-testing/tc-tests/qdiscs/cake.json
-f:tools/testing/selftests/tc-testing/tc-tests/qdiscs/cbs.json
-f:tools/testing/selftests/tc-testing/tc-tests/qdiscs/choke.json
-f:tools/testing/selftests/tc-testing/tc-tests/qdiscs/codel.json
-f:tools/testing/selftests/tc-testing/tc-tests/qdiscs/drr.json
-f:tools/testing/selftests/tc-testing/tc-tests/qdiscs/dualpi2.json
-f:tools/testing/selftests/tc-testing/tc-tests/qdiscs/etf.json
-f:tools/testing/selftests/tc-testing/tc-tests/qdiscs/ets.json
-f:tools/testing/selftests/tc-testing/tc-tests/qdiscs/fifo.json
-f:tools/testing/selftests/tc-testing/tc-tests/qdiscs/fq.json
-f:tools/testing/selftests/tc-testing/tc-tests/qdiscs/fq_codel.json
-f:tools/testing/selftests/tc-testing/tc-tests/qdiscs/fq_pie.json
-f:tools/testing/selftests/tc-testing/tc-tests/qdiscs/gred.json
-f:tools/testing/selftests/tc-testing/tc-tests/qdiscs/hfsc.json
-f:tools/testing/selftests/tc-testing/tc-tests/qdiscs/hhf.json
-f:tools/testing/selftests/tc-testing/tc-tests/qdiscs/htb.json
-f:tools/testing/selftests/tc-testing/tc-tests/qdiscs/ingress.json
-f:tools/testing/selftests/tc-testing/tc-tests/qdiscs/mq.json
-f:tools/testing/selftests/tc-testing/tc-tests/qdiscs/mqprio.json
-f:tools/testing/selftests/tc-testing/tc-tests/qdiscs/multiq.json
-f:tools/testing/selftests/tc-testing/tc-tests/qdiscs/netem.json
-f:tools/testing/selftests/tc-testing/tc-tests/qdiscs/pfifo_fast.json
-f:tools/testing/selftests/tc-testing/tc-tests/qdiscs/pie.json
-f:tools/testing/selftests/tc-testing/tc-tests/qdiscs/plug.json
-f:tools/testing/selftests/tc-testing/tc-tests/qdiscs/prio.json
-f:tools/testing/selftests/tc-testing/tc-tests/qdiscs/qfq.json
-f:tools/testing/selftests/tc-testing/tc-tests/qdiscs/red.json
-f:tools/testing/selftests/tc-testing/tc-tests/qdiscs/sfb.json
-f:tools/testing/selftests/tc-testing/tc-tests/qdiscs/sfq.json
-f:tools/testing/selftests/tc-testing/tc-tests/qdiscs/skbprio.json
-f:tools/testing/selftests/tc-testing/tc-tests/qdiscs/taprio.json
-f:tools/testing/selftests/tc-testing/tc-tests/qdiscs/tbf.json
-f:tools/testing/selftests/tc-testing/tc-tests/qdiscs/teql.json
-f:tools/testing/selftests/tc-testing/tdc.py
-f:tools/testing/selftests/tc-testing/tdc.sh
-f:tools/testing/selftests/tc-testing/tdc_batch.py
-f:tools/testing/selftests/tc-testing/tdc_config.py
-f:tools/testing/selftests/tc-testing/tdc_config_local_template.py
-f:tools/testing/selftests/tc-testing/tdc_helper.py
-f:tools/testing/selftests/tc-testing/tdc_multibatch.py
-f:tools/testing/selftests/tdx/.gitignore
-f:tools/testing/selftests/tdx/Makefile
-f:tools/testing/selftests/tdx/config
-f:tools/testing/selftests/tdx/tdx_guest_test.c
-f:tools/testing/selftests/thermal/intel/power_floor/.gitignore
-f:tools/testing/selftests/thermal/intel/power_floor/Makefile
-f:tools/testing/selftests/thermal/intel/power_floor/power_floor_test.c
-f:tools/testing/selftests/thermal/intel/workload_hint/.gitignore
-f:tools/testing/selftests/thermal/intel/workload_hint/Makefile
-f:tools/testing/selftests/thermal/intel/workload_hint/workload_hint_test.c
-f:tools/testing/selftests/timens/.gitignore
-f:tools/testing/selftests/timens/Makefile
-f:tools/testing/selftests/timens/clock_nanosleep.c
-f:tools/testing/selftests/timens/config
-f:tools/testing/selftests/timens/exec.c
-f:tools/testing/selftests/timens/futex.c
-f:tools/testing/selftests/timens/gettime_perf.c
-f:tools/testing/selftests/timens/log.h
-f:tools/testing/selftests/timens/procfs.c
-f:tools/testing/selftests/timens/timens.c
-f:tools/testing/selftests/timens/timens.h
-f:tools/testing/selftests/timens/timer.c
-f:tools/testing/selftests/timens/timerfd.c
-f:tools/testing/selftests/timens/vfork_exec.c
-f:tools/testing/selftests/timers/.gitignore
-f:tools/testing/selftests/timers/Makefile
-f:tools/testing/selftests/timers/adjtick.c
-f:tools/testing/selftests/timers/alarmtimer-suspend.c
-f:tools/testing/selftests/timers/change_skew.c
-f:tools/testing/selftests/timers/clocksource-switch.c
-f:tools/testing/selftests/timers/freq-step.c
-f:tools/testing/selftests/timers/inconsistency-check.c
-f:tools/testing/selftests/timers/leap-a-day.c
-f:tools/testing/selftests/timers/leapcrash.c
-f:tools/testing/selftests/timers/mqueue-lat.c
-f:tools/testing/selftests/timers/nanosleep.c
-f:tools/testing/selftests/timers/nsleep-lat.c
-f:tools/testing/selftests/timers/posix_timers.c
-f:tools/testing/selftests/timers/raw_skew.c
-f:tools/testing/selftests/timers/rtcpie.c
-f:tools/testing/selftests/timers/set-2038.c
-f:tools/testing/selftests/timers/set-tai.c
-f:tools/testing/selftests/timers/set-timer-lat.c
-f:tools/testing/selftests/timers/set-tz.c
-f:tools/testing/selftests/timers/settings
-f:tools/testing/selftests/timers/skew_consistency.c
-f:tools/testing/selftests/timers/threadtest.c
-f:tools/testing/selftests/timers/valid-adjtimex.c
-f:tools/testing/selftests/tmpfs/.gitignore
-f:tools/testing/selftests/tmpfs/Makefile
-f:tools/testing/selftests/tmpfs/bug-link-o-tmpfile.c
-f:tools/testing/selftests/tpm2/.gitignore
-f:tools/testing/selftests/tpm2/Makefile
-f:tools/testing/selftests/tpm2/settings
-f:tools/testing/selftests/tpm2/test_async.sh
-f:tools/testing/selftests/tpm2/test_smoke.sh
-f:tools/testing/selftests/tpm2/test_space.sh
-f:tools/testing/selftests/tpm2/tpm2.py
-f:tools/testing/selftests/tpm2/tpm2_tests.py
-f:tools/testing/selftests/tty/.gitignore
-f:tools/testing/selftests/tty/Makefile
-f:tools/testing/selftests/tty/tty_tstamp_update.c
-f:tools/testing/selftests/turbostat/added_perf_counters.py
-f:tools/testing/selftests/turbostat/defcolumns.py
-f:tools/testing/selftests/turbostat/smi_aperf_mperf.py
-f:tools/testing/selftests/ublk/.gitignore
-f:tools/testing/selftests/ublk/Makefile
-f:tools/testing/selftests/ublk/common.c
-f:tools/testing/selftests/ublk/config
-f:tools/testing/selftests/ublk/fault_inject.c
-f:tools/testing/selftests/ublk/file_backed.c
-f:tools/testing/selftests/ublk/kublk.c
-f:tools/testing/selftests/ublk/kublk.h
-f:tools/testing/selftests/ublk/null.c
-f:tools/testing/selftests/ublk/stripe.c
-f:tools/testing/selftests/ublk/test_common.sh
-f:tools/testing/selftests/ublk/test_generic_01.sh
-f:tools/testing/selftests/ublk/test_generic_02.sh
-f:tools/testing/selftests/ublk/test_generic_03.sh
-f:tools/testing/selftests/ublk/test_generic_04.sh
-f:tools/testing/selftests/ublk/test_generic_05.sh
-f:tools/testing/selftests/ublk/test_generic_06.sh
-f:tools/testing/selftests/ublk/test_generic_07.sh
-f:tools/testing/selftests/ublk/test_generic_08.sh
-f:tools/testing/selftests/ublk/test_generic_09.sh
-f:tools/testing/selftests/ublk/test_generic_10.sh
-f:tools/testing/selftests/ublk/test_generic_11.sh
-f:tools/testing/selftests/ublk/test_generic_12.sh
-f:tools/testing/selftests/ublk/test_loop_01.sh
-f:tools/testing/selftests/ublk/test_loop_02.sh
-f:tools/testing/selftests/ublk/test_loop_03.sh
-f:tools/testing/selftests/ublk/test_loop_04.sh
-f:tools/testing/selftests/ublk/test_loop_05.sh
-f:tools/testing/selftests/ublk/test_null_01.sh
-f:tools/testing/selftests/ublk/test_null_02.sh
-f:tools/testing/selftests/ublk/test_stress_01.sh
-f:tools/testing/selftests/ublk/test_stress_02.sh
-f:tools/testing/selftests/ublk/test_stress_03.sh
-f:tools/testing/selftests/ublk/test_stress_04.sh
-f:tools/testing/selftests/ublk/test_stress_05.sh
-f:tools/testing/selftests/ublk/test_stripe_01.sh
-f:tools/testing/selftests/ublk/test_stripe_02.sh
-f:tools/testing/selftests/ublk/test_stripe_03.sh
-f:tools/testing/selftests/ublk/test_stripe_04.sh
-f:tools/testing/selftests/ublk/trace/count_ios_per_tid.bt
-f:tools/testing/selftests/ublk/trace/seq_io.bt
-f:tools/testing/selftests/ublk/ublk_dep.h
-f:tools/testing/selftests/ublk/utils.h
-f:tools/testing/selftests/uevent/.gitignore
-f:tools/testing/selftests/uevent/Makefile
-f:tools/testing/selftests/uevent/config
-f:tools/testing/selftests/uevent/uevent_filtering.c
-f:tools/testing/selftests/user_events/.gitignore
-f:tools/testing/selftests/user_events/Makefile
-f:tools/testing/selftests/user_events/abi_test.c
-f:tools/testing/selftests/user_events/config
-f:tools/testing/selftests/user_events/dyn_test.c
-f:tools/testing/selftests/user_events/ftrace_test.c
-f:tools/testing/selftests/user_events/perf_test.c
-f:tools/testing/selftests/user_events/settings
-f:tools/testing/selftests/user_events/user_events_selftests.h
-f:tools/testing/selftests/vDSO/.gitignore
-f:tools/testing/selftests/vDSO/Makefile
-f:tools/testing/selftests/vDSO/parse_vdso.c
-f:tools/testing/selftests/vDSO/parse_vdso.h
-f:tools/testing/selftests/vDSO/vdso_call.h
-f:tools/testing/selftests/vDSO/vdso_config.h
-f:tools/testing/selftests/vDSO/vdso_test_abi.c
-f:tools/testing/selftests/vDSO/vdso_test_chacha.c
-f:tools/testing/selftests/vDSO/vdso_test_clock_getres.c
-f:tools/testing/selftests/vDSO/vdso_test_correctness.c
-f:tools/testing/selftests/vDSO/vdso_test_getcpu.c
-f:tools/testing/selftests/vDSO/vdso_test_getrandom.c
-f:tools/testing/selftests/vDSO/vdso_test_gettimeofday.c
-f:tools/testing/selftests/vDSO/vgetrandom-chacha.S
-f:tools/testing/selftests/vsock/.gitignore
-f:tools/testing/selftests/vsock/Makefile
-f:tools/testing/selftests/vsock/config
-f:tools/testing/selftests/vsock/settings
-f:tools/testing/selftests/vsock/vmtest.sh
-f:tools/testing/selftests/watchdog/.gitignore
-f:tools/testing/selftests/watchdog/Makefile
-f:tools/testing/selftests/watchdog/watchdog-test.c
-f:tools/testing/selftests/wireguard/netns.sh
-f:tools/testing/selftests/wireguard/qemu/.gitignore
-f:tools/testing/selftests/wireguard/qemu/Makefile
-f:tools/testing/selftests/wireguard/qemu/arch/aarch64.config
-f:tools/testing/selftests/wireguard/qemu/arch/aarch64_be.config
-f:tools/testing/selftests/wireguard/qemu/arch/arm.config
-f:tools/testing/selftests/wireguard/qemu/arch/armeb.config
-f:tools/testing/selftests/wireguard/qemu/arch/i686.config
-f:tools/testing/selftests/wireguard/qemu/arch/m68k.config
-f:tools/testing/selftests/wireguard/qemu/arch/mips.config
-f:tools/testing/selftests/wireguard/qemu/arch/mips64.config
-f:tools/testing/selftests/wireguard/qemu/arch/mips64el.config
-f:tools/testing/selftests/wireguard/qemu/arch/mipsel.config
-f:tools/testing/selftests/wireguard/qemu/arch/powerpc.config
-f:tools/testing/selftests/wireguard/qemu/arch/powerpc64.config
-f:tools/testing/selftests/wireguard/qemu/arch/powerpc64le.config
-f:tools/testing/selftests/wireguard/qemu/arch/riscv32.config
-f:tools/testing/selftests/wireguard/qemu/arch/riscv64.config
-f:tools/testing/selftests/wireguard/qemu/arch/s390x.config
-f:tools/testing/selftests/wireguard/qemu/arch/um.config
-f:tools/testing/selftests/wireguard/qemu/arch/x86_64.config
-f:tools/testing/selftests/wireguard/qemu/debug.config
-f:tools/testing/selftests/wireguard/qemu/init.c
-f:tools/testing/selftests/wireguard/qemu/kernel.config
-f:tools/testing/selftests/x86/.gitignore
-f:tools/testing/selftests/x86/Makefile
-f:tools/testing/selftests/x86/amx.c
-f:tools/testing/selftests/x86/apx.c
-f:tools/testing/selftests/x86/avx.c
-f:tools/testing/selftests/x86/bugs/Makefile
-f:tools/testing/selftests/x86/bugs/common.py
-f:tools/testing/selftests/x86/bugs/its_indirect_alignment.py
-f:tools/testing/selftests/x86/bugs/its_permutations.py
-f:tools/testing/selftests/x86/bugs/its_ret_alignment.py
-f:tools/testing/selftests/x86/bugs/its_sysfs.py
-f:tools/testing/selftests/x86/check_cc.sh
-f:tools/testing/selftests/x86/check_initial_reg_state.c
-f:tools/testing/selftests/x86/clang_helpers_32.S
-f:tools/testing/selftests/x86/clang_helpers_64.S
-f:tools/testing/selftests/x86/corrupt_xstate_header.c
-f:tools/testing/selftests/x86/entry_from_vm86.c
-f:tools/testing/selftests/x86/fsgsbase.c
-f:tools/testing/selftests/x86/fsgsbase_restore.c
-f:tools/testing/selftests/x86/helpers.h
-f:tools/testing/selftests/x86/ioperm.c
-f:tools/testing/selftests/x86/iopl.c
-f:tools/testing/selftests/x86/lam.c
-f:tools/testing/selftests/x86/ldt_gdt.c
-f:tools/testing/selftests/x86/mov_ss_trap.c
-f:tools/testing/selftests/x86/nx_stack.c
-f:tools/testing/selftests/x86/ptrace_syscall.c
-f:tools/testing/selftests/x86/raw_syscall_helper_32.S
-f:tools/testing/selftests/x86/sigaltstack.c
-f:tools/testing/selftests/x86/sigreturn.c
-f:tools/testing/selftests/x86/sigtrap_loop.c
-f:tools/testing/selftests/x86/single_step_syscall.c
-f:tools/testing/selftests/x86/srso.c
-f:tools/testing/selftests/x86/syscall_arg_fault.c
-f:tools/testing/selftests/x86/syscall_nt.c
-f:tools/testing/selftests/x86/syscall_numbering.c
-f:tools/testing/selftests/x86/sysret_rip.c
-f:tools/testing/selftests/x86/sysret_ss_attrs.c
-f:tools/testing/selftests/x86/test_FCMOV.c
-f:tools/testing/selftests/x86/test_FCOMI.c
-f:tools/testing/selftests/x86/test_FISTTP.c
-f:tools/testing/selftests/x86/test_mremap_vdso.c
-f:tools/testing/selftests/x86/test_shadow_stack.c
-f:tools/testing/selftests/x86/test_syscall_vdso.c
-f:tools/testing/selftests/x86/test_vsyscall.c
-f:tools/testing/selftests/x86/thunks.S
-f:tools/testing/selftests/x86/thunks_32.S
-f:tools/testing/selftests/x86/trivial_32bit_program.c
-f:tools/testing/selftests/x86/trivial_64bit_program.c
-f:tools/testing/selftests/x86/trivial_program.c
-f:tools/testing/selftests/x86/unwind_vdso.c
-f:tools/testing/selftests/x86/vdso_restorer.c
-f:tools/testing/selftests/x86/xstate.c
-f:tools/testing/selftests/x86/xstate.h
-f:tools/testing/selftests/zram/.gitignore
-f:tools/testing/selftests/zram/Makefile
-f:tools/testing/selftests/zram/README
-f:tools/testing/selftests/zram/config
-f:tools/testing/selftests/zram/zram.sh
-f:tools/testing/selftests/zram/zram01.sh
-f:tools/testing/selftests/zram/zram02.sh
-f:tools/testing/selftests/zram/zram_lib.sh
-f:tools/testing/shared/autoconf.h
-f:tools/testing/shared/interval_tree-shim.c
-f:tools/testing/shared/linux.c
-f:tools/testing/shared/linux/bug.h
-f:tools/testing/shared/linux/cleanup.h
-f:tools/testing/shared/linux/cpu.h
-f:tools/testing/shared/linux/idr.h
-f:tools/testing/shared/linux/interval_tree.h
-f:tools/testing/shared/linux/interval_tree_generic.h
-f:tools/testing/shared/linux/kconfig.h
-f:tools/testing/shared/linux/kernel.h
-f:tools/testing/shared/linux/kmemleak.h
-f:tools/testing/shared/linux/local_lock.h
-f:tools/testing/shared/linux/lockdep.h
-f:tools/testing/shared/linux/maple_tree.h
-f:tools/testing/shared/linux/percpu.h
-f:tools/testing/shared/linux/preempt.h
-f:tools/testing/shared/linux/radix-tree.h
-f:tools/testing/shared/linux/rbtree.h
-f:tools/testing/shared/linux/rbtree_augmented.h
-f:tools/testing/shared/linux/rbtree_types.h
-f:tools/testing/shared/linux/rcupdate.h
-f:tools/testing/shared/linux/xarray.h
-f:tools/testing/shared/maple-shared.h
-f:tools/testing/shared/maple-shim.c
-f:tools/testing/shared/rbtree-shim.c
-f:tools/testing/shared/shared.h
-f:tools/testing/shared/shared.mk
-f:tools/testing/shared/trace/events/maple_tree.h
-f:tools/testing/shared/xarray-shared.c
-f:tools/testing/shared/xarray-shared.h
-f:tools/testing/vma/.gitignore
-f:tools/testing/vma/Makefile
-f:tools/testing/vma/linux/atomic.h
-f:tools/testing/vma/linux/mmzone.h
-f:tools/testing/vma/vma.c
-f:tools/testing/vma/vma_internal.h
-f:tools/testing/vsock/.gitignore
-f:tools/testing/vsock/Makefile
-f:tools/testing/vsock/README
-f:tools/testing/vsock/control.c
-f:tools/testing/vsock/control.h
-f:tools/testing/vsock/msg_zerocopy_common.c
-f:tools/testing/vsock/msg_zerocopy_common.h
-f:tools/testing/vsock/timeout.c
-f:tools/testing/vsock/timeout.h
-f:tools/testing/vsock/util.c
-f:tools/testing/vsock/util.h
-f:tools/testing/vsock/vsock_diag_test.c
-f:tools/testing/vsock/vsock_perf.c
-f:tools/testing/vsock/vsock_test.c
-f:tools/testing/vsock/vsock_test_zerocopy.c
-f:tools/testing/vsock/vsock_test_zerocopy.h
-f:tools/testing/vsock/vsock_uring_test.c
-f:tools/thermal/lib/Build
-f:tools/thermal/lib/Makefile
-f:tools/thermal/lib/libthermal_tools.pc.template
-f:tools/thermal/lib/log.c
-f:tools/thermal/lib/log.h
-f:tools/thermal/lib/mainloop.c
-f:tools/thermal/lib/mainloop.h
-f:tools/thermal/lib/thermal-tools.h
-f:tools/thermal/lib/uptimeofday.c
-f:tools/thermal/lib/uptimeofday.h
-f:tools/thermal/thermal-engine/Build
-f:tools/thermal/thermal-engine/Makefile
-f:tools/thermal/thermal-engine/thermal-engine.c
-f:tools/thermal/thermometer/Build
-f:tools/thermal/thermometer/Makefile
-f:tools/thermal/thermometer/thermometer.8
-f:tools/thermal/thermometer/thermometer.c
-f:tools/thermal/thermometer/thermometer.conf
-f:tools/thermal/tmon/.gitignore
-f:tools/thermal/tmon/Makefile
-f:tools/thermal/tmon/README
-f:tools/thermal/tmon/pid.c
-f:tools/thermal/tmon/sysfs.c
-f:tools/thermal/tmon/tmon.8
-f:tools/thermal/tmon/tmon.c
-f:tools/thermal/tmon/tmon.h
-f:tools/thermal/tmon/tui.c
-f:tools/time/udelay_test.sh
-f:tools/tracing/Makefile
-f:tools/tracing/latency/.gitignore
-f:tools/tracing/latency/Build
-f:tools/tracing/latency/Makefile
-f:tools/tracing/latency/Makefile.config
-f:tools/tracing/latency/latency-collector.c
-f:tools/tracing/rtla/.gitignore
-f:tools/tracing/rtla/Build
-f:tools/tracing/rtla/Makefile
-f:tools/tracing/rtla/Makefile.config
-f:tools/tracing/rtla/Makefile.rtla
-f:tools/tracing/rtla/Makefile.standalone
-f:tools/tracing/rtla/README.txt
-f:tools/tracing/rtla/sample/timerlat_load.py
-f:tools/tracing/rtla/src/Build
-f:tools/tracing/rtla/src/osnoise.c
-f:tools/tracing/rtla/src/osnoise.h
-f:tools/tracing/rtla/src/osnoise_hist.c
-f:tools/tracing/rtla/src/osnoise_top.c
-f:tools/tracing/rtla/src/rtla.c
-f:tools/tracing/rtla/src/timerlat.bpf.c
-f:tools/tracing/rtla/src/timerlat.c
-f:tools/tracing/rtla/src/timerlat.h
-f:tools/tracing/rtla/src/timerlat_aa.c
-f:tools/tracing/rtla/src/timerlat_aa.h
-f:tools/tracing/rtla/src/timerlat_bpf.c
-f:tools/tracing/rtla/src/timerlat_bpf.h
-f:tools/tracing/rtla/src/timerlat_hist.c
-f:tools/tracing/rtla/src/timerlat_top.c
-f:tools/tracing/rtla/src/timerlat_u.c
-f:tools/tracing/rtla/src/timerlat_u.h
-f:tools/tracing/rtla/src/trace.c
-f:tools/tracing/rtla/src/trace.h
-f:tools/tracing/rtla/src/utils.c
-f:tools/tracing/rtla/src/utils.h
-f:tools/tracing/rtla/tests/engine.sh
-f:tools/tracing/rtla/tests/hwnoise.t
-f:tools/tracing/rtla/tests/osnoise.t
-f:tools/tracing/rtla/tests/timerlat.t
-f:tools/usb/.gitignore
-f:tools/usb/Build
-f:tools/usb/Makefile
-f:tools/usb/ffs-aio-example/multibuff/device_app/aio_multibuff.c
-f:tools/usb/ffs-aio-example/multibuff/host_app/Makefile
-f:tools/usb/ffs-aio-example/multibuff/host_app/test.c
-f:tools/usb/ffs-aio-example/simple/device_app/aio_simple.c
-f:tools/usb/ffs-aio-example/simple/host_app/Makefile
-f:tools/usb/ffs-aio-example/simple/host_app/test.c
-f:tools/usb/ffs-test.c
-f:tools/usb/hcd-tests.sh
-f:tools/usb/p9_fwd.py
-f:tools/usb/testusb.c
-f:tools/usb/usbip/.gitignore
-f:tools/usb/usbip/AUTHORS
-f:tools/usb/usbip/COPYING
-f:tools/usb/usbip/INSTALL
-f:tools/usb/usbip/Makefile.am
-f:tools/usb/usbip/README
-f:tools/usb/usbip/autogen.sh
-f:tools/usb/usbip/cleanup.sh
-f:tools/usb/usbip/configure.ac
-f:tools/usb/usbip/doc/usbip.8
-f:tools/usb/usbip/doc/usbipd.8
-f:tools/usb/usbip/libsrc/Makefile.am
-f:tools/usb/usbip/libsrc/list.h
-f:tools/usb/usbip/libsrc/names.c
-f:tools/usb/usbip/libsrc/names.h
-f:tools/usb/usbip/libsrc/sysfs_utils.c
-f:tools/usb/usbip/libsrc/sysfs_utils.h
-f:tools/usb/usbip/libsrc/usbip_common.c
-f:tools/usb/usbip/libsrc/usbip_common.h
-f:tools/usb/usbip/libsrc/usbip_device_driver.c
-f:tools/usb/usbip/libsrc/usbip_device_driver.h
-f:tools/usb/usbip/libsrc/usbip_host_common.c
-f:tools/usb/usbip/libsrc/usbip_host_common.h
-f:tools/usb/usbip/libsrc/usbip_host_driver.c
-f:tools/usb/usbip/libsrc/usbip_host_driver.h
-f:tools/usb/usbip/libsrc/vhci_driver.c
-f:tools/usb/usbip/libsrc/vhci_driver.h
-f:tools/usb/usbip/src/Makefile.am
-f:tools/usb/usbip/src/usbip.c
-f:tools/usb/usbip/src/usbip.h
-f:tools/usb/usbip/src/usbip_attach.c
-f:tools/usb/usbip/src/usbip_bind.c
-f:tools/usb/usbip/src/usbip_detach.c
-f:tools/usb/usbip/src/usbip_list.c
-f:tools/usb/usbip/src/usbip_network.c
-f:tools/usb/usbip/src/usbip_network.h
-f:tools/usb/usbip/src/usbip_port.c
-f:tools/usb/usbip/src/usbip_unbind.c
-f:tools/usb/usbip/src/usbipd.c
-f:tools/usb/usbip/src/utils.c
-f:tools/usb/usbip/src/utils.h
-f:tools/usb/usbip/vudc/vudc_server_example.sh
-f:tools/verification/models/rtapp/pagefault.ltl
-f:tools/verification/models/rtapp/sleep.ltl
-f:tools/verification/models/sched/nrp.dot
-f:tools/verification/models/sched/opid.dot
-f:tools/verification/models/sched/sco.dot
-f:tools/verification/models/sched/scpd.dot
-f:tools/verification/models/sched/snep.dot
-f:tools/verification/models/sched/snroc.dot
-f:tools/verification/models/sched/sssw.dot
-f:tools/verification/models/sched/sts.dot
-f:tools/verification/models/wip.dot
-f:tools/verification/models/wwnr.dot
-f:tools/verification/rv/.gitignore
-f:tools/verification/rv/Build
-f:tools/verification/rv/Makefile
-f:tools/verification/rv/Makefile.config
-f:tools/verification/rv/Makefile.rv
-f:tools/verification/rv/README.txt
-f:tools/verification/rv/include/in_kernel.h
-f:tools/verification/rv/include/rv.h
-f:tools/verification/rv/include/trace.h
-f:tools/verification/rv/include/utils.h
-f:tools/verification/rv/src/Build
-f:tools/verification/rv/src/in_kernel.c
-f:tools/verification/rv/src/rv.c
-f:tools/verification/rv/src/trace.c
-f:tools/verification/rv/src/utils.c
-f:tools/verification/rvgen/.gitignore
-f:tools/verification/rvgen/Makefile
-f:tools/verification/rvgen/__main__.py
-f:tools/verification/rvgen/dot2c
-f:tools/verification/rvgen/rvgen/automata.py
-f:tools/verification/rvgen/rvgen/container.py
-f:tools/verification/rvgen/rvgen/dot2c.py
-f:tools/verification/rvgen/rvgen/dot2k.py
-f:tools/verification/rvgen/rvgen/generator.py
-f:tools/verification/rvgen/rvgen/ltl2ba.py
-f:tools/verification/rvgen/rvgen/ltl2k.py
-f:tools/verification/rvgen/rvgen/templates/Kconfig
-f:tools/verification/rvgen/rvgen/templates/container/Kconfig
-f:tools/verification/rvgen/rvgen/templates/container/main.c
-f:tools/verification/rvgen/rvgen/templates/container/main.h
-f:tools/verification/rvgen/rvgen/templates/dot2k/main.c
-f:tools/verification/rvgen/rvgen/templates/dot2k/trace.h
-f:tools/verification/rvgen/rvgen/templates/ltl2k/main.c
-f:tools/verification/rvgen/rvgen/templates/ltl2k/trace.h
-f:tools/virtio/.gitignore
-f:tools/virtio/Makefile
-f:tools/virtio/asm/barrier.h
-f:tools/virtio/crypto/hash.h
-f:tools/virtio/generated/autoconf.h
-f:tools/virtio/linux/bug.h
-f:tools/virtio/linux/build_bug.h
-f:tools/virtio/linux/compiler.h
-f:tools/virtio/linux/cpumask.h
-f:tools/virtio/linux/device.h
-f:tools/virtio/linux/dma-mapping.h
-f:tools/virtio/linux/err.h
-f:tools/virtio/linux/export.h
-f:tools/virtio/linux/gfp.h
-f:tools/virtio/linux/hrtimer.h
-f:tools/virtio/linux/irqreturn.h
-f:tools/virtio/linux/kernel.h
-f:tools/virtio/linux/kmemleak.h
-f:tools/virtio/linux/kmsan.h
-f:tools/virtio/linux/mm_types.h
-f:tools/virtio/linux/module.h
-f:tools/virtio/linux/printk.h
-f:tools/virtio/linux/ratelimit.h
-f:tools/virtio/linux/scatterlist.h
-f:tools/virtio/linux/slab.h
-f:tools/virtio/linux/spinlock.h
-f:tools/virtio/linux/thread_info.h
-f:tools/virtio/linux/topology.h
-f:tools/virtio/linux/uaccess.h
-f:tools/virtio/linux/uio.h
-f:tools/virtio/linux/virtio.h
-f:tools/virtio/linux/virtio_byteorder.h
-f:tools/virtio/linux/virtio_config.h
-f:tools/virtio/linux/virtio_ring.h
-f:tools/virtio/linux/vringh.h
-f:tools/virtio/ringtest/.gitignore
-f:tools/virtio/ringtest/Makefile
-f:tools/virtio/ringtest/README
-f:tools/virtio/ringtest/main.c
-f:tools/virtio/ringtest/main.h
-f:tools/virtio/ringtest/noring.c
-f:tools/virtio/ringtest/ptr_ring.c
-f:tools/virtio/ringtest/ring.c
-f:tools/virtio/ringtest/run-on-all.sh
-f:tools/virtio/ringtest/virtio_ring_0_9.c
-f:tools/virtio/ringtest/virtio_ring_inorder.c
-f:tools/virtio/ringtest/virtio_ring_poll.c
-f:tools/virtio/uapi/linux/uio.h
-f:tools/virtio/uapi/linux/virtio_config.h
-f:tools/virtio/uapi/linux/virtio_ring.h
-f:tools/virtio/uapi/linux/virtio_types.h
-f:tools/virtio/vhost_net_test.c
-f:tools/virtio/vhost_test/Makefile
-f:tools/virtio/vhost_test/vhost_test.c
-f:tools/virtio/virtio-trace/Makefile
-f:tools/virtio/virtio-trace/README
-f:tools/virtio/virtio-trace/trace-agent-ctl.c
-f:tools/virtio/virtio-trace/trace-agent-rw.c
-f:tools/virtio/virtio-trace/trace-agent.c
-f:tools/virtio/virtio-trace/trace-agent.h
-f:tools/virtio/virtio_test.c
-f:tools/virtio/vringh_test.c
-f:tools/virtio/xen/xen.h
-f:tools/wmi/Makefile
-f:tools/wmi/dell-smbios-example.c
-f:tools/workqueue/wq_dump.py
-f:tools/workqueue/wq_monitor.py
-f:tools/writeback/wb_monitor.py
-f:usr/.gitignore
-f:usr/Kconfig
-f:usr/Makefile
-f:usr/default_cpio_list
-f:usr/dummy-include/stdbool.h
-f:usr/dummy-include/stdlib.h
-f:usr/gen_init_cpio.c
-f:usr/gen_initramfs.sh
-f:usr/include/.gitignore
-f:usr/include/Makefile
-f:usr/include/headers_check.pl
-f:usr/initramfs_data.S
-f:virt/Makefile
-f:virt/kvm/Kconfig
-f:virt/kvm/Makefile.kvm
-f:virt/kvm/async_pf.c
-f:virt/kvm/async_pf.h
-f:virt/kvm/binary_stats.c
-f:virt/kvm/coalesced_mmio.c
-f:virt/kvm/coalesced_mmio.h
-f:virt/kvm/dirty_ring.c
-f:virt/kvm/eventfd.c
-f:virt/kvm/guest_memfd.c
-f:virt/kvm/irqchip.c
-f:virt/kvm/kvm_main.c
-f:virt/kvm/kvm_mm.h
-f:virt/kvm/pfncache.c
-f:virt/kvm/vfio.c
-f:virt/kvm/vfio.h
-f:virt/lib/Kconfig
-f:virt/lib/Makefile
-f:virt/lib/irqbypass.c
diff --git a/crates/project_panel/benches/sorting.rs b/crates/project_panel/benches/sorting.rs
deleted file mode 100644
index df6740d346..0000000000
--- a/crates/project_panel/benches/sorting.rs
+++ /dev/null
@@ -1,83 +0,0 @@
-use criterion::{Criterion, criterion_group, criterion_main};
-use project::{Entry, EntryKind, GitEntry, ProjectEntryId};
-use project_panel::par_sort_worktree_entries_with_mode;
-use settings::ProjectPanelSortMode;
-use std::sync::Arc;
-use util::rel_path::RelPath;
-
-fn load_linux_repo_snapshot() -> Vec<GitEntry> {
-    let file = std::fs::read_to_string(concat!(
-        env!("CARGO_MANIFEST_DIR"),
-        "/benches/linux_repo_snapshot.txt"
-    ))
-    .expect("Failed to read file");
-    file.lines()
-        .filter_map(|line| {
-            let kind = match line.chars().next() {
-                Some('f') => EntryKind::File,
-                Some('d') => EntryKind::Dir,
-                _ => return None,
-            };
-
-            let entry = Entry {
-                kind,
-                path: Arc::from(RelPath::unix(&(line.trim_end()[2..])).unwrap()),
-                id: ProjectEntryId::default(),
-                size: 0,
-                inode: 0,
-                mtime: None,
-                canonical_path: None,
-                is_ignored: false,
-                is_always_included: false,
-                is_external: false,
-                is_private: false,
-                is_hidden: false,
-                char_bag: Default::default(),
-                is_fifo: false,
-            };
-            Some(GitEntry {
-                entry,
-                git_summary: Default::default(),
-            })
-        })
-        .collect()
-}
-fn criterion_benchmark(c: &mut Criterion) {
-    let snapshot = load_linux_repo_snapshot();
-
-    c.bench_function("Sort linux worktree snapshot", |b| {
-        b.iter_batched(
-            || snapshot.clone(),
-            |mut snapshot| {
-                par_sort_worktree_entries_with_mode(
-                    &mut snapshot,
-                    ProjectPanelSortMode::DirectoriesFirst,
-                )
-            },
-            criterion::BatchSize::LargeInput,
-        );
-    });
-
-    c.bench_function("Sort linux worktree snapshot (Mixed)", |b| {
-        b.iter_batched(
-            || snapshot.clone(),
-            |mut snapshot| {
-                par_sort_worktree_entries_with_mode(&mut snapshot, ProjectPanelSortMode::Mixed)
-            },
-            criterion::BatchSize::LargeInput,
-        );
-    });
-
-    c.bench_function("Sort linux worktree snapshot (FilesFirst)", |b| {
-        b.iter_batched(
-            || snapshot.clone(),
-            |mut snapshot| {
-                par_sort_worktree_entries_with_mode(&mut snapshot, ProjectPanelSortMode::FilesFirst)
-            },
-            criterion::BatchSize::LargeInput,
-        );
-    });
-}
-
-criterion_group!(benches, criterion_benchmark);
-criterion_main!(benches);
diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
deleted file mode 100644
index ea667ecbb4..0000000000
--- a/crates/project_panel/src/project_panel.rs
+++ /dev/null
@@ -1,6275 +0,0 @@
-mod project_panel_settings;
-mod utils;
-
-use anyhow::{Context as _, Result};
-use client::{ErrorCode, ErrorExt};
-use collections::{BTreeSet, HashMap, hash_map};
-use command_palette_hooks::CommandPaletteFilter;
-use db::kvp::KEY_VALUE_STORE;
-use editor::{
-    Editor, EditorEvent, MultiBufferOffset,
-    items::{
-        entry_diagnostic_aware_icon_decoration_and_color,
-        entry_diagnostic_aware_icon_name_and_color, entry_git_aware_label_color,
-    },
-};
-use file_icons::FileIcons;
-use git;
-use git::status::GitSummary;
-use git_ui;
-use git_ui::file_diff_view::FileDiffView;
-use gpui::{
-    Action, AnyElement, App, AsyncWindowContext, Bounds, ClipboardItem, Context, CursorStyle,
-    DismissEvent, Div, DragMoveEvent, Entity, EventEmitter, ExternalPaths, FocusHandle, Focusable,
-    Hsla, InteractiveElement, KeyContext, ListHorizontalSizingBehavior, ListSizingBehavior,
-    Modifiers, ModifiersChangedEvent, MouseButton, MouseDownEvent, ParentElement, Pixels, Point,
-    PromptLevel, Render, ScrollStrategy, Stateful, Styled, Subscription, Task,
-    UniformListScrollHandle, WeakEntity, Window, actions, anchored, deferred, div, hsla,
-    linear_color_stop, linear_gradient, point, px, size, transparent_white, uniform_list,
-};
-use language::DiagnosticSeverity;
-use menu::{Confirm, SelectFirst, SelectLast, SelectNext, SelectPrevious};
-use project::{
-    Entry, EntryKind, Fs, GitEntry, GitEntryRef, GitTraversal, Project, ProjectEntryId,
-    ProjectPath, Worktree, WorktreeId,
-    git_store::{GitStoreEvent, RepositoryEvent, git_traversal::ChildEntriesGitIter},
-    project_settings::GoToDiagnosticSeverityFilter,
-};
-use project_panel_settings::ProjectPanelSettings;
-use rayon::slice::ParallelSliceMut;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use settings::{
-    DockSide, ProjectPanelEntrySpacing, Settings, SettingsStore, ShowDiagnostics, ShowIndentGuides,
-    update_settings_file,
-};
-use smallvec::SmallVec;
-use std::{any::TypeId, time::Instant};
-use std::{
-    cell::OnceCell,
-    cmp,
-    collections::HashSet,
-    ops::Range,
-    path::{Path, PathBuf},
-    sync::Arc,
-    time::Duration,
-};
-use theme::ThemeSettings;
-use ui::{
-    Color, ContextMenu, DecoratedIcon, Divider, Icon, IconDecoration, IconDecorationKind,
-    IndentGuideColors, IndentGuideLayout, KeyBinding, Label, LabelSize, ListItem, ListItemSpacing,
-    ScrollAxes, ScrollableHandle, Scrollbars, StickyCandidate, Tooltip, WithScrollbar, prelude::*,
-    v_flex,
-};
-use util::{ResultExt, TakeUntilExt, TryFutureExt, maybe, paths::compare_paths, rel_path::RelPath};
-use workspace::{
-    DraggedSelection, OpenInTerminal, OpenOptions, OpenVisible, PreviewTabsSettings, SelectedEntry,
-    SplitDirection, Workspace,
-    dock::{DockPosition, Panel, PanelEvent},
-    notifications::{DetachAndPromptErr, NotifyResultExt, NotifyTaskExt},
-};
-use worktree::CreatedEntry;
-use zed_actions::{project_panel::ToggleFocus, workspace::OpenWithSystem};
-
-const PROJECT_PANEL_KEY: &str = "ProjectPanel";
-const NEW_ENTRY_ID: ProjectEntryId = ProjectEntryId::MAX;
-
-struct VisibleEntriesForWorktree {
-    worktree_id: WorktreeId,
-    entries: Vec<GitEntry>,
-    index: OnceCell<HashSet<Arc<RelPath>>>,
-}
-
-struct State {
-    last_worktree_root_id: Option<ProjectEntryId>,
-    /// Maps from leaf project entry ID to the currently selected ancestor.
-    /// Relevant only for auto-fold dirs, where a single project panel entry may actually consist of several
-    /// project entries (and all non-leaf nodes are guaranteed to be directories).
-    ancestors: HashMap<ProjectEntryId, FoldedAncestors>,
-    visible_entries: Vec<VisibleEntriesForWorktree>,
-    max_width_item_index: Option<usize>,
-    // Currently selected leaf entry (see auto-folding for a definition of that) in a file tree
-    selection: Option<SelectedEntry>,
-    edit_state: Option<EditState>,
-    unfolded_dir_ids: HashSet<ProjectEntryId>,
-    expanded_dir_ids: HashMap<WorktreeId, Vec<ProjectEntryId>>,
-}
-
-impl State {
-    fn derive(old: &Self) -> Self {
-        Self {
-            last_worktree_root_id: None,
-            ancestors: Default::default(),
-            visible_entries: Default::default(),
-            max_width_item_index: None,
-            edit_state: old.edit_state.clone(),
-            unfolded_dir_ids: old.unfolded_dir_ids.clone(),
-            selection: old.selection,
-            expanded_dir_ids: old.expanded_dir_ids.clone(),
-        }
-    }
-}
-
-pub struct ProjectPanel {
-    project: Entity<Project>,
-    fs: Arc<dyn Fs>,
-    focus_handle: FocusHandle,
-    scroll_handle: UniformListScrollHandle,
-    // An update loop that keeps incrementing/decrementing scroll offset while there is a dragged entry that's
-    // hovered over the start/end of a list.
-    hover_scroll_task: Option<Task<()>>,
-    rendered_entries_len: usize,
-    folded_directory_drag_target: Option<FoldedDirectoryDragTarget>,
-    drag_target_entry: Option<DragTarget>,
-    marked_entries: Vec<SelectedEntry>,
-    context_menu: Option<(Entity<ContextMenu>, Point<Pixels>, Subscription)>,
-    filename_editor: Entity<Editor>,
-    clipboard: Option<ClipboardEntry>,
-    _dragged_entry_destination: Option<Arc<Path>>,
-    workspace: WeakEntity<Workspace>,
-    width: Option<Pixels>,
-    pending_serialization: Task<Option<()>>,
-    diagnostics: HashMap<(WorktreeId, Arc<RelPath>), DiagnosticSeverity>,
-    diagnostic_summary_update: Task<()>,
-    // We keep track of the mouse down state on entries so we don't flash the UI
-    // in case a user clicks to open a file.
-    mouse_down: bool,
-    hover_expand_task: Option<Task<()>>,
-    previous_drag_position: Option<Point<Pixels>>,
-    sticky_items_count: usize,
-    last_reported_update: Instant,
-    update_visible_entries_task: UpdateVisibleEntriesTask,
-    state: State,
-}
-
-struct UpdateVisibleEntriesTask {
-    _visible_entries_task: Task<()>,
-    focus_filename_editor: bool,
-    autoscroll: bool,
-}
-
-impl Default for UpdateVisibleEntriesTask {
-    fn default() -> Self {
-        UpdateVisibleEntriesTask {
-            _visible_entries_task: Task::ready(()),
-            focus_filename_editor: Default::default(),
-            autoscroll: Default::default(),
-        }
-    }
-}
-
-enum DragTarget {
-    /// Dragging on an entry
-    Entry {
-        /// The entry currently under the mouse cursor during a drag operation
-        entry_id: ProjectEntryId,
-        /// Highlight this entry along with all of its children
-        highlight_entry_id: ProjectEntryId,
-    },
-    /// Dragging on background
-    Background,
-}
-
-#[derive(Copy, Clone, Debug)]
-struct FoldedDirectoryDragTarget {
-    entry_id: ProjectEntryId,
-    index: usize,
-    /// Whether we are dragging over the delimiter rather than the component itself.
-    is_delimiter_target: bool,
-}
-
-#[derive(Clone, Debug)]
-enum ValidationState {
-    None,
-    Warning(String),
-    Error(String),
-}
-
-#[derive(Clone, Debug)]
-struct EditState {
-    worktree_id: WorktreeId,
-    entry_id: ProjectEntryId,
-    leaf_entry_id: Option<ProjectEntryId>,
-    is_dir: bool,
-    depth: usize,
-    processing_filename: Option<Arc<RelPath>>,
-    previously_focused: Option<SelectedEntry>,
-    validation_state: ValidationState,
-}
-
-impl EditState {
-    fn is_new_entry(&self) -> bool {
-        self.leaf_entry_id.is_none()
-    }
-}
-
-#[derive(Clone, Debug)]
-enum ClipboardEntry {
-    Copied(BTreeSet<SelectedEntry>),
-    Cut(BTreeSet<SelectedEntry>),
-}
-
-#[derive(Debug, PartialEq, Eq, Clone)]
-struct EntryDetails {
-    filename: String,
-    icon: Option<SharedString>,
-    path: Arc<RelPath>,
-    depth: usize,
-    kind: EntryKind,
-    is_ignored: bool,
-    is_expanded: bool,
-    is_selected: bool,
-    is_marked: bool,
-    is_editing: bool,
-    is_processing: bool,
-    is_cut: bool,
-    sticky: Option<StickyDetails>,
-    filename_text_color: Color,
-    diagnostic_severity: Option<DiagnosticSeverity>,
-    git_status: GitSummary,
-    is_private: bool,
-    worktree_id: WorktreeId,
-    canonical_path: Option<Arc<Path>>,
-}
-
-#[derive(Debug, PartialEq, Eq, Clone)]
-struct StickyDetails {
-    sticky_index: usize,
-}
-
-/// Permanently deletes the selected file or directory.
-#[derive(PartialEq, Clone, Default, Debug, Deserialize, JsonSchema, Action)]
-#[action(namespace = project_panel)]
-#[serde(deny_unknown_fields)]
-struct Delete {
-    #[serde(default)]
-    pub skip_prompt: bool,
-}
-
-/// Moves the selected file or directory to the system trash.
-#[derive(PartialEq, Clone, Default, Debug, Deserialize, JsonSchema, Action)]
-#[action(namespace = project_panel)]
-#[serde(deny_unknown_fields)]
-struct Trash {
-    #[serde(default)]
-    pub skip_prompt: bool,
-}
-
-/// Selects the next entry with diagnostics.
-#[derive(PartialEq, Clone, Default, Debug, Deserialize, JsonSchema, Action)]
-#[action(namespace = project_panel)]
-#[serde(deny_unknown_fields)]
-struct SelectNextDiagnostic {
-    #[serde(default)]
-    pub severity: GoToDiagnosticSeverityFilter,
-}
-
-/// Selects the previous entry with diagnostics.
-#[derive(PartialEq, Clone, Default, Debug, Deserialize, JsonSchema, Action)]
-#[action(namespace = project_panel)]
-#[serde(deny_unknown_fields)]
-struct SelectPrevDiagnostic {
-    #[serde(default)]
-    pub severity: GoToDiagnosticSeverityFilter,
-}
-
-actions!(
-    project_panel,
-    [
-        /// Expands the selected entry in the project tree.
-        ExpandSelectedEntry,
-        /// Collapses the selected entry in the project tree.
-        CollapseSelectedEntry,
-        /// Collapses all entries in the project tree.
-        CollapseAllEntries,
-        /// Creates a new directory.
-        NewDirectory,
-        /// Creates a new file.
-        NewFile,
-        /// Copies the selected file or directory.
-        Copy,
-        /// Duplicates the selected file or directory.
-        Duplicate,
-        /// Reveals the selected item in the system file manager.
-        RevealInFileManager,
-        /// Removes the selected folder from the project.
-        RemoveFromProject,
-        /// Cuts the selected file or directory.
-        Cut,
-        /// Pastes the previously cut or copied item.
-        Paste,
-        /// Renames the selected file or directory.
-        Rename,
-        /// Opens the selected file in the editor.
-        Open,
-        /// Opens the selected file in a permanent tab.
-        OpenPermanent,
-        /// Opens the selected file in a vertical split.
-        OpenSplitVertical,
-        /// Opens the selected file in a horizontal split.
-        OpenSplitHorizontal,
-        /// Toggles visibility of git-ignored files.
-        ToggleHideGitIgnore,
-        /// Toggles visibility of hidden files.
-        ToggleHideHidden,
-        /// Starts a new search in the selected directory.
-        NewSearchInDirectory,
-        /// Unfolds the selected directory.
-        UnfoldDirectory,
-        /// Folds the selected directory.
-        FoldDirectory,
-        /// Scroll half a page upwards
-        ScrollUp,
-        /// Scroll half a page downwards
-        ScrollDown,
-        /// Scroll until the cursor displays at the center
-        ScrollCursorCenter,
-        /// Scroll until the cursor displays at the top
-        ScrollCursorTop,
-        /// Scroll until the cursor displays at the bottom
-        ScrollCursorBottom,
-        /// Selects the parent directory.
-        SelectParent,
-        /// Selects the next entry with git changes.
-        SelectNextGitEntry,
-        /// Selects the previous entry with git changes.
-        SelectPrevGitEntry,
-        /// Selects the next directory.
-        SelectNextDirectory,
-        /// Selects the previous directory.
-        SelectPrevDirectory,
-        /// Opens a diff view to compare two marked files.
-        CompareMarkedFiles,
-    ]
-);
-
-#[derive(Clone, Debug, Default)]
-struct FoldedAncestors {
-    current_ancestor_depth: usize,
-    ancestors: Vec<ProjectEntryId>,
-}
-
-impl FoldedAncestors {
-    fn max_ancestor_depth(&self) -> usize {
-        self.ancestors.len()
-    }
-
-    /// Note: This returns None for last item in ancestors list
-    fn active_ancestor(&self) -> Option<ProjectEntryId> {
-        if self.current_ancestor_depth == 0 {
-            return None;
-        }
-        self.ancestors.get(self.current_ancestor_depth).copied()
-    }
-
-    fn active_index(&self) -> usize {
-        self.max_ancestor_depth()
-            .saturating_sub(1)
-            .saturating_sub(self.current_ancestor_depth)
-    }
-
-    fn active_component(&self, file_name: &str) -> Option<String> {
-        Path::new(file_name)
-            .components()
-            .nth(self.active_index())
-            .map(|comp| comp.as_os_str().to_string_lossy().into_owned())
-    }
-}
-
-pub fn init(cx: &mut App) {
-    cx.observe_new(|workspace: &mut Workspace, _, _| {
-        workspace.register_action(|workspace, _: &ToggleFocus, window, cx| {
-            workspace.toggle_panel_focus::<ProjectPanel>(window, cx);
-        });
-
-        workspace.register_action(|workspace, _: &ToggleHideGitIgnore, _, cx| {
-            let fs = workspace.app_state().fs.clone();
-            update_settings_file(fs, cx, move |setting, _| {
-                setting.project_panel.get_or_insert_default().hide_gitignore = Some(
-                    !setting
-                        .project_panel
-                        .get_or_insert_default()
-                        .hide_gitignore
-                        .unwrap_or(false),
-                );
-            })
-        });
-
-        workspace.register_action(|workspace, _: &ToggleHideHidden, _, cx| {
-            let fs = workspace.app_state().fs.clone();
-            update_settings_file(fs, cx, move |setting, _| {
-                setting.project_panel.get_or_insert_default().hide_hidden = Some(
-                    !setting
-                        .project_panel
-                        .get_or_insert_default()
-                        .hide_hidden
-                        .unwrap_or(false),
-                );
-            })
-        });
-
-        workspace.register_action(|workspace, action: &CollapseAllEntries, window, cx| {
-            if let Some(panel) = workspace.panel::<ProjectPanel>(cx) {
-                panel.update(cx, |panel, cx| {
-                    panel.collapse_all_entries(action, window, cx);
-                });
-            }
-        });
-
-        workspace.register_action(|workspace, action: &Rename, window, cx| {
-            workspace.open_panel::<ProjectPanel>(window, cx);
-            if let Some(panel) = workspace.panel::<ProjectPanel>(cx) {
-                panel.update(cx, |panel, cx| {
-                    if let Some(first_marked) = panel.marked_entries.first() {
-                        let first_marked = *first_marked;
-                        panel.marked_entries.clear();
-                        panel.state.selection = Some(first_marked);
-                    }
-                    panel.rename(action, window, cx);
-                });
-            }
-        });
-
-        workspace.register_action(|workspace, action: &Duplicate, window, cx| {
-            workspace.open_panel::<ProjectPanel>(window, cx);
-            if let Some(panel) = workspace.panel::<ProjectPanel>(cx) {
-                panel.update(cx, |panel, cx| {
-                    panel.duplicate(action, window, cx);
-                });
-            }
-        });
-
-        workspace.register_action(|workspace, action: &Delete, window, cx| {
-            if let Some(panel) = workspace.panel::<ProjectPanel>(cx) {
-                panel.update(cx, |panel, cx| panel.delete(action, window, cx));
-            }
-        });
-
-        workspace.register_action(|workspace, _: &git::FileHistory, window, cx| {
-            // First try to get from project panel if it's focused
-            if let Some(panel) = workspace.panel::<ProjectPanel>(cx) {
-                let maybe_project_path = panel.read(cx).state.selection.and_then(|selection| {
-                    let project = workspace.project().read(cx);
-                    let worktree = project.worktree_for_id(selection.worktree_id, cx)?;
-                    let entry = worktree.read(cx).entry_for_id(selection.entry_id)?;
-                    if entry.is_file() {
-                        Some(ProjectPath {
-                            worktree_id: selection.worktree_id,
-                            path: entry.path.clone(),
-                        })
-                    } else {
-                        None
-                    }
-                });
-
-                if let Some(project_path) = maybe_project_path {
-                    let project = workspace.project();
-                    let git_store = project.read(cx).git_store();
-                    if let Some((repo, repo_path)) = git_store
-                        .read(cx)
-                        .repository_and_path_for_project_path(&project_path, cx)
-                    {
-                        git_ui::file_history_view::FileHistoryView::open(
-                            repo_path,
-                            git_store.downgrade(),
-                            repo.downgrade(),
-                            workspace.weak_handle(),
-                            window,
-                            cx,
-                        );
-                        return;
-                    }
-                }
-            }
-
-            // Fallback: try to get from active editor
-            if let Some(active_item) = workspace.active_item(cx)
-                && let Some(editor) = active_item.downcast::<Editor>()
-                && let Some(buffer) = editor.read(cx).buffer().read(cx).as_singleton()
-                && let Some(file) = buffer.read(cx).file()
-            {
-                let worktree_id = file.worktree_id(cx);
-                let project_path = ProjectPath {
-                    worktree_id,
-                    path: file.path().clone(),
-                };
-                let project = workspace.project();
-                let git_store = project.read(cx).git_store();
-                if let Some((repo, repo_path)) = git_store
-                    .read(cx)
-                    .repository_and_path_for_project_path(&project_path, cx)
-                {
-                    git_ui::file_history_view::FileHistoryView::open(
-                        repo_path,
-                        git_store.downgrade(),
-                        repo.downgrade(),
-                        workspace.weak_handle(),
-                        window,
-                        cx,
-                    );
-                }
-            }
-        });
-    })
-    .detach();
-}
-
-#[derive(Debug)]
-pub enum Event {
-    OpenedEntry {
-        entry_id: ProjectEntryId,
-        focus_opened_item: bool,
-        allow_preview: bool,
-    },
-    SplitEntry {
-        entry_id: ProjectEntryId,
-        allow_preview: bool,
-        split_direction: Option<SplitDirection>,
-    },
-    Focus,
-}
-
-#[derive(Serialize, Deserialize)]
-struct SerializedProjectPanel {
-    width: Option<Pixels>,
-}
-
-struct DraggedProjectEntryView {
-    selection: SelectedEntry,
-    icon: Option<SharedString>,
-    filename: String,
-    click_offset: Point<Pixels>,
-    selections: Arc<[SelectedEntry]>,
-}
-
-struct ItemColors {
-    default: Hsla,
-    hover: Hsla,
-    drag_over: Hsla,
-    marked: Hsla,
-    focused: Hsla,
-}
-
-fn get_item_color(is_sticky: bool, cx: &App) -> ItemColors {
-    let colors = cx.theme().colors();
-
-    ItemColors {
-        default: if is_sticky {
-            colors.panel_overlay_background
-        } else {
-            colors.panel_background
-        },
-        hover: if is_sticky {
-            colors.panel_overlay_hover
-        } else {
-            colors.element_hover
-        },
-        marked: colors.element_selected,
-        focused: colors.panel_focused_border,
-        drag_over: colors.drop_target_background,
-    }
-}
-
-impl ProjectPanel {
-    fn new(
-        workspace: &mut Workspace,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) -> Entity<Self> {
-        let project = workspace.project().clone();
-        let git_store = project.read(cx).git_store().clone();
-        let path_style = project.read(cx).path_style(cx);
-        let project_panel = cx.new(|cx| {
-            let focus_handle = cx.focus_handle();
-            cx.on_focus(&focus_handle, window, Self::focus_in).detach();
-
-            cx.subscribe_in(
-                &git_store,
-                window,
-                |this, _, event, window, cx| match event {
-                    GitStoreEvent::RepositoryUpdated(_, RepositoryEvent::StatusesChanged, _)
-                    | GitStoreEvent::RepositoryAdded
-                    | GitStoreEvent::RepositoryRemoved(_) => {
-                        this.update_visible_entries(None, false, false, window, cx);
-                        cx.notify();
-                    }
-                    _ => {}
-                },
-            )
-            .detach();
-
-            cx.subscribe_in(
-                &project,
-                window,
-                |this, project, event, window, cx| match event {
-                    project::Event::ActiveEntryChanged(Some(entry_id)) => {
-                        if ProjectPanelSettings::get_global(cx).auto_reveal_entries {
-                            this.reveal_entry(project.clone(), *entry_id, true, window, cx)
-                                .ok();
-                        }
-                    }
-                    project::Event::ActiveEntryChanged(None) => {
-                        let is_active_item_file_diff_view = this
-                            .workspace
-                            .upgrade()
-                            .and_then(|ws| ws.read(cx).active_item(cx))
-                            .map(|item| {
-                                item.act_as_type(TypeId::of::<FileDiffView>(), cx).is_some()
-                            })
-                            .unwrap_or(false);
-                        if !is_active_item_file_diff_view {
-                            this.marked_entries.clear();
-                        }
-                    }
-                    project::Event::RevealInProjectPanel(entry_id) => {
-                        if let Some(()) = this
-                            .reveal_entry(project.clone(), *entry_id, false, window, cx)
-                            .log_err()
-                        {
-                            cx.emit(PanelEvent::Activate);
-                        }
-                    }
-                    project::Event::ActivateProjectPanel => {
-                        cx.emit(PanelEvent::Activate);
-                    }
-                    project::Event::DiskBasedDiagnosticsFinished { .. }
-                    | project::Event::DiagnosticsUpdated { .. } => {
-                        if ProjectPanelSettings::get_global(cx).show_diagnostics
-                            != ShowDiagnostics::Off
-                        {
-                            this.diagnostic_summary_update = cx.spawn(async move |this, cx| {
-                                cx.background_executor()
-                                    .timer(Duration::from_millis(30))
-                                    .await;
-                                this.update(cx, |this, cx| {
-                                    this.update_diagnostics(cx);
-                                    cx.notify();
-                                })
-                                .log_err();
-                            });
-                        }
-                    }
-                    project::Event::WorktreeRemoved(id) => {
-                        this.state.expanded_dir_ids.remove(id);
-                        this.update_visible_entries(None, false, false, window, cx);
-                        cx.notify();
-                    }
-                    project::Event::WorktreeUpdatedEntries(_, _)
-                    | project::Event::WorktreeAdded(_)
-                    | project::Event::WorktreeOrderChanged => {
-                        this.update_visible_entries(None, false, false, window, cx);
-                        cx.notify();
-                    }
-                    project::Event::ExpandedAllForEntry(worktree_id, entry_id) => {
-                        if let Some((worktree, expanded_dir_ids)) = project
-                            .read(cx)
-                            .worktree_for_id(*worktree_id, cx)
-                            .zip(this.state.expanded_dir_ids.get_mut(worktree_id))
-                        {
-                            let worktree = worktree.read(cx);
-
-                            let Some(entry) = worktree.entry_for_id(*entry_id) else {
-                                return;
-                            };
-                            let include_ignored_dirs = !entry.is_ignored;
-
-                            let mut dirs_to_expand = vec![*entry_id];
-                            while let Some(current_id) = dirs_to_expand.pop() {
-                                let Some(current_entry) = worktree.entry_for_id(current_id) else {
-                                    continue;
-                                };
-                                for child in worktree.child_entries(&current_entry.path) {
-                                    if !child.is_dir() || (include_ignored_dirs && child.is_ignored)
-                                    {
-                                        continue;
-                                    }
-
-                                    dirs_to_expand.push(child.id);
-
-                                    if let Err(ix) = expanded_dir_ids.binary_search(&child.id) {
-                                        expanded_dir_ids.insert(ix, child.id);
-                                    }
-                                    this.state.unfolded_dir_ids.insert(child.id);
-                                }
-                            }
-                            this.update_visible_entries(None, false, false, window, cx);
-                            cx.notify();
-                        }
-                    }
-                    _ => {}
-                },
-            )
-            .detach();
-
-            let trash_action = [TypeId::of::<Trash>()];
-            let is_remote = project.read(cx).is_remote();
-
-            // Make sure the trash option is never displayed anywhere on remote
-            // hosts since they may not support trashing. May want to dynamically
-            // detect this in the future.
-            if is_remote {
-                CommandPaletteFilter::update_global(cx, |filter, _cx| {
-                    filter.hide_action_types(&trash_action);
-                });
-            }
-
-            let filename_editor = cx.new(|cx| Editor::single_line(window, cx));
-
-            cx.subscribe_in(
-                &filename_editor,
-                window,
-                |project_panel, _, editor_event, window, cx| match editor_event {
-                    EditorEvent::BufferEdited => {
-                        project_panel.populate_validation_error(cx);
-                        project_panel.autoscroll(cx);
-                    }
-                    EditorEvent::SelectionsChanged { .. } => {
-                        project_panel.autoscroll(cx);
-                    }
-                    EditorEvent::Blurred => {
-                        if project_panel
-                            .state
-                            .edit_state
-                            .as_ref()
-                            .is_some_and(|state| state.processing_filename.is_none())
-                        {
-                            match project_panel.confirm_edit(false, window, cx) {
-                                Some(task) => {
-                                    task.detach_and_notify_err(window, cx);
-                                }
-                                None => {
-                                    project_panel.state.edit_state = None;
-                                    project_panel
-                                        .update_visible_entries(None, false, false, window, cx);
-                                    cx.notify();
-                                }
-                            }
-                        }
-                    }
-                    _ => {}
-                },
-            )
-            .detach();
-
-            cx.observe_global::<FileIcons>(|_, cx| {
-                cx.notify();
-            })
-            .detach();
-
-            let mut project_panel_settings = *ProjectPanelSettings::get_global(cx);
-            cx.observe_global_in::<SettingsStore>(window, move |this, window, cx| {
-                let new_settings = *ProjectPanelSettings::get_global(cx);
-                if project_panel_settings != new_settings {
-                    if project_panel_settings.hide_gitignore != new_settings.hide_gitignore {
-                        this.update_visible_entries(None, false, false, window, cx);
-                    }
-                    if project_panel_settings.hide_root != new_settings.hide_root {
-                        this.update_visible_entries(None, false, false, window, cx);
-                    }
-                    if project_panel_settings.hide_hidden != new_settings.hide_hidden {
-                        this.update_visible_entries(None, false, false, window, cx);
-                    }
-                    if project_panel_settings.sort_mode != new_settings.sort_mode {
-                        this.update_visible_entries(None, false, false, window, cx);
-                    }
-                    if project_panel_settings.sticky_scroll && !new_settings.sticky_scroll {
-                        this.sticky_items_count = 0;
-                    }
-                    project_panel_settings = new_settings;
-                    this.update_diagnostics(cx);
-                    cx.notify();
-                }
-            })
-            .detach();
-
-            let scroll_handle = UniformListScrollHandle::new();
-            let mut this = Self {
-                project: project.clone(),
-                hover_scroll_task: None,
-                fs: workspace.app_state().fs.clone(),
-                focus_handle,
-                rendered_entries_len: 0,
-                folded_directory_drag_target: None,
-                drag_target_entry: None,
-
-                marked_entries: Default::default(),
-                context_menu: None,
-                filename_editor,
-                clipboard: None,
-                _dragged_entry_destination: None,
-                workspace: workspace.weak_handle(),
-                width: None,
-                pending_serialization: Task::ready(None),
-                diagnostics: Default::default(),
-                diagnostic_summary_update: Task::ready(()),
-                scroll_handle,
-                mouse_down: false,
-                hover_expand_task: None,
-                previous_drag_position: None,
-                sticky_items_count: 0,
-                last_reported_update: Instant::now(),
-                state: State {
-                    max_width_item_index: None,
-                    edit_state: None,
-                    selection: None,
-                    last_worktree_root_id: Default::default(),
-                    visible_entries: Default::default(),
-                    ancestors: Default::default(),
-                    expanded_dir_ids: Default::default(),
-                    unfolded_dir_ids: Default::default(),
-                },
-                update_visible_entries_task: Default::default(),
-            };
-            this.update_visible_entries(None, false, false, window, cx);
-
-            this
-        });
-
-        cx.subscribe_in(&project_panel, window, {
-            let project_panel = project_panel.downgrade();
-            move |workspace, _, event, window, cx| match event {
-                &Event::OpenedEntry {
-                    entry_id,
-                    focus_opened_item,
-                    allow_preview,
-                } => {
-                    if let Some(worktree) = project.read(cx).worktree_for_entry(entry_id, cx)
-                        && let Some(entry) = worktree.read(cx).entry_for_id(entry_id) {
-                            let file_path = entry.path.clone();
-                            let worktree_id = worktree.read(cx).id();
-                            let entry_id = entry.id;
-                            let is_via_ssh = project.read(cx).is_via_remote_server();
-
-                            workspace
-                                .open_path_preview(
-                                    ProjectPath {
-                                        worktree_id,
-                                        path: file_path.clone(),
-                                    },
-                                    None,
-                                    focus_opened_item,
-                                    allow_preview,
-                                    true,
-                                    window, cx,
-                                )
-                                .detach_and_prompt_err("Failed to open file", window, cx, move |e, _, _| {
-                                    match e.error_code() {
-                                        ErrorCode::Disconnected => if is_via_ssh {
-                                            Some("Disconnected from SSH host".to_string())
-                                        } else {
-                                            Some("Disconnected from remote project".to_string())
-                                        },
-                                        ErrorCode::UnsharedItem => Some(format!(
-                                            "{} is not shared by the host. This could be because it has been marked as `private`",
-                                            file_path.display(path_style)
-                                        )),
-                                        // See note in worktree.rs where this error originates. Returning Some in this case prevents
-                                        // the error popup from saying "Try Again", which is a red herring in this case
-                                        ErrorCode::Internal if e.to_string().contains("File is too large to load") => Some(e.to_string()),
-                                        _ => None,
-                                    }
-                                });
-
-                            if let Some(project_panel) = project_panel.upgrade() {
-                                // Always select and mark the entry, regardless of whether it is opened or not.
-                                project_panel.update(cx, |project_panel, _| {
-                                    let entry = SelectedEntry { worktree_id, entry_id };
-                                    project_panel.marked_entries.clear();
-                                    project_panel.marked_entries.push(entry);
-                                    project_panel.state.selection = Some(entry);
-                                });
-                                if !focus_opened_item {
-                                    let focus_handle = project_panel.read(cx).focus_handle.clone();
-                                    window.focus(&focus_handle);
-                                }
-                            }
-                        }
-                }
-                &Event::SplitEntry {
-                    entry_id,
-                    allow_preview,
-                    split_direction,
-                } => {
-                    if let Some(worktree) = project.read(cx).worktree_for_entry(entry_id, cx)
-                        && let Some(entry) = worktree.read(cx).entry_for_id(entry_id) {
-                            workspace
-                                .split_path_preview(
-                                    ProjectPath {
-                                        worktree_id: worktree.read(cx).id(),
-                                        path: entry.path.clone(),
-                                    },
-                                    allow_preview,
-                                    split_direction,
-                                    window, cx,
-                                )
-                                .detach_and_log_err(cx);
-                        }
-                }
-
-                _ => {}
-            }
-        })
-        .detach();
-
-        project_panel
-    }
-
-    pub async fn load(
-        workspace: WeakEntity<Workspace>,
-        mut cx: AsyncWindowContext,
-    ) -> Result<Entity<Self>> {
-        let serialized_panel = match workspace
-            .read_with(&cx, |workspace, _| {
-                ProjectPanel::serialization_key(workspace)
-            })
-            .ok()
-            .flatten()
-        {
-            Some(serialization_key) => cx
-                .background_spawn(async move { KEY_VALUE_STORE.read_kvp(&serialization_key) })
-                .await
-                .context("loading project panel")
-                .log_err()
-                .flatten()
-                .map(|panel| serde_json::from_str::<SerializedProjectPanel>(&panel))
-                .transpose()
-                .log_err()
-                .flatten(),
-            None => None,
-        };
-
-        workspace.update_in(&mut cx, |workspace, window, cx| {
-            let panel = ProjectPanel::new(workspace, window, cx);
-            if let Some(serialized_panel) = serialized_panel {
-                panel.update(cx, |panel, cx| {
-                    panel.width = serialized_panel.width.map(|px| px.round());
-                    cx.notify();
-                });
-            }
-            panel
-        })
-    }
-
-    fn update_diagnostics(&mut self, cx: &mut Context<Self>) {
-        let mut diagnostics: HashMap<(WorktreeId, Arc<RelPath>), DiagnosticSeverity> =
-            Default::default();
-        let show_diagnostics_setting = ProjectPanelSettings::get_global(cx).show_diagnostics;
-
-        if show_diagnostics_setting != ShowDiagnostics::Off {
-            self.project
-                .read(cx)
-                .diagnostic_summaries(false, cx)
-                .filter_map(|(path, _, diagnostic_summary)| {
-                    if diagnostic_summary.error_count > 0 {
-                        Some((path, DiagnosticSeverity::ERROR))
-                    } else if show_diagnostics_setting == ShowDiagnostics::All
-                        && diagnostic_summary.warning_count > 0
-                    {
-                        Some((path, DiagnosticSeverity::WARNING))
-                    } else {
-                        None
-                    }
-                })
-                .for_each(|(project_path, diagnostic_severity)| {
-                    let ancestors = project_path.path.ancestors().collect::<Vec<_>>();
-                    for path in ancestors.into_iter().rev() {
-                        Self::update_strongest_diagnostic_severity(
-                            &mut diagnostics,
-                            &project_path,
-                            path.into(),
-                            diagnostic_severity,
-                        );
-                    }
-                });
-        }
-        self.diagnostics = diagnostics;
-    }
-
-    fn update_strongest_diagnostic_severity(
-        diagnostics: &mut HashMap<(WorktreeId, Arc<RelPath>), DiagnosticSeverity>,
-        project_path: &ProjectPath,
-        path_buffer: Arc<RelPath>,
-        diagnostic_severity: DiagnosticSeverity,
-    ) {
-        diagnostics
-            .entry((project_path.worktree_id, path_buffer))
-            .and_modify(|strongest_diagnostic_severity| {
-                *strongest_diagnostic_severity =
-                    cmp::min(*strongest_diagnostic_severity, diagnostic_severity);
-            })
-            .or_insert(diagnostic_severity);
-    }
-
-    fn serialization_key(workspace: &Workspace) -> Option<String> {
-        workspace
-            .database_id()
-            .map(|id| i64::from(id).to_string())
-            .or(workspace.session_id())
-            .map(|id| format!("{}-{:?}", PROJECT_PANEL_KEY, id))
-    }
-
-    fn serialize(&mut self, cx: &mut Context<Self>) {
-        let Some(serialization_key) = self
-            .workspace
-            .read_with(cx, |workspace, _| {
-                ProjectPanel::serialization_key(workspace)
-            })
-            .ok()
-            .flatten()
-        else {
-            return;
-        };
-        let width = self.width;
-        self.pending_serialization = cx.background_spawn(
-            async move {
-                KEY_VALUE_STORE
-                    .write_kvp(
-                        serialization_key,
-                        serde_json::to_string(&SerializedProjectPanel { width })?,
-                    )
-                    .await?;
-                anyhow::Ok(())
-            }
-            .log_err(),
-        );
-    }
-
-    fn focus_in(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if !self.focus_handle.contains_focused(window, cx) {
-            cx.emit(Event::Focus);
-        }
-    }
-
-    fn deploy_context_menu(
-        &mut self,
-        position: Point<Pixels>,
-        entry_id: ProjectEntryId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let project = self.project.read(cx);
-
-        let worktree_id = if let Some(id) = project.worktree_id_for_entry(entry_id, cx) {
-            id
-        } else {
-            return;
-        };
-
-        self.state.selection = Some(SelectedEntry {
-            worktree_id,
-            entry_id,
-        });
-
-        if let Some((worktree, entry)) = self.selected_sub_entry(cx) {
-            let auto_fold_dirs = ProjectPanelSettings::get_global(cx).auto_fold_dirs;
-            let worktree = worktree.read(cx);
-            let is_root = Some(entry) == worktree.root_entry();
-            let is_dir = entry.is_dir();
-            let is_foldable = auto_fold_dirs && self.is_foldable(entry, worktree);
-            let is_unfoldable = auto_fold_dirs && self.is_unfoldable(entry, worktree);
-            let is_read_only = project.is_read_only(cx);
-            let is_remote = project.is_remote();
-            let is_local = project.is_local();
-
-            let settings = ProjectPanelSettings::get_global(cx);
-            let visible_worktrees_count = project.visible_worktrees(cx).count();
-            let should_hide_rename = is_root
-                && (cfg!(target_os = "windows")
-                    || (settings.hide_root && visible_worktrees_count == 1));
-            let should_show_compare = !is_dir && self.file_abs_paths_to_diff(cx).is_some();
-
-            let has_git_repo = !is_dir && {
-                let project_path = project::ProjectPath {
-                    worktree_id,
-                    path: entry.path.clone(),
-                };
-                project
-                    .git_store()
-                    .read(cx)
-                    .repository_and_path_for_project_path(&project_path, cx)
-                    .is_some()
-            };
-
-            let context_menu = ContextMenu::build(window, cx, |menu, _, _| {
-                menu.context(self.focus_handle.clone()).map(|menu| {
-                    if is_read_only {
-                        menu.when(is_dir, |menu| {
-                            menu.action("Search Inside", Box::new(NewSearchInDirectory))
-                        })
-                    } else {
-                        menu.action("New File", Box::new(NewFile))
-                            .action("New Folder", Box::new(NewDirectory))
-                            .separator()
-                            .when(is_local && cfg!(target_os = "macos"), |menu| {
-                                menu.action("Reveal in Finder", Box::new(RevealInFileManager))
-                            })
-                            .when(is_local && cfg!(not(target_os = "macos")), |menu| {
-                                menu.action("Reveal in File Manager", Box::new(RevealInFileManager))
-                            })
-                            .when(is_local, |menu| {
-                                menu.action("Open in Default App", Box::new(OpenWithSystem))
-                            })
-                            .action("Open in Terminal", Box::new(OpenInTerminal))
-                            .when(is_dir, |menu| {
-                                menu.separator()
-                                    .action("Find in Folder…", Box::new(NewSearchInDirectory))
-                            })
-                            .when(is_unfoldable, |menu| {
-                                menu.action("Unfold Directory", Box::new(UnfoldDirectory))
-                            })
-                            .when(is_foldable, |menu| {
-                                menu.action("Fold Directory", Box::new(FoldDirectory))
-                            })
-                            .when(should_show_compare, |menu| {
-                                menu.separator()
-                                    .action("Compare marked files", Box::new(CompareMarkedFiles))
-                            })
-                            .separator()
-                            .action("Cut", Box::new(Cut))
-                            .action("Copy", Box::new(Copy))
-                            .action("Duplicate", Box::new(Duplicate))
-                            // TODO: Paste should always be visible, cbut disabled when clipboard is empty
-                            .action_disabled_when(
-                                self.clipboard.as_ref().is_none(),
-                                "Paste",
-                                Box::new(Paste),
-                            )
-                            .separator()
-                            .action("Copy Path", Box::new(zed_actions::workspace::CopyPath))
-                            .action(
-                                "Copy Relative Path",
-                                Box::new(zed_actions::workspace::CopyRelativePath),
-                            )
-                            .when(has_git_repo, |menu| {
-                                menu.separator()
-                                    .action("View File History", Box::new(git::FileHistory))
-                            })
-                            .when(!should_hide_rename, |menu| {
-                                menu.separator().action("Rename", Box::new(Rename))
-                            })
-                            .when(!is_root && !is_remote, |menu| {
-                                menu.action("Trash", Box::new(Trash { skip_prompt: false }))
-                            })
-                            .when(!is_root, |menu| {
-                                menu.action("Delete", Box::new(Delete { skip_prompt: false }))
-                            })
-                            .when(!is_remote && is_root, |menu| {
-                                menu.separator()
-                                    .action(
-                                        "Add Folder to Project…",
-                                        Box::new(workspace::AddFolderToProject),
-                                    )
-                                    .action("Remove from Project", Box::new(RemoveFromProject))
-                            })
-                            .when(is_root, |menu| {
-                                menu.separator()
-                                    .action("Collapse All", Box::new(CollapseAllEntries))
-                            })
-                    }
-                })
-            });
-
-            window.focus(&context_menu.focus_handle(cx));
-            let subscription = cx.subscribe(&context_menu, |this, _, _: &DismissEvent, cx| {
-                this.context_menu.take();
-                cx.notify();
-            });
-            self.context_menu = Some((context_menu, position, subscription));
-        }
-
-        cx.notify();
-    }
-
-    fn is_unfoldable(&self, entry: &Entry, worktree: &Worktree) -> bool {
-        if !entry.is_dir() || self.state.unfolded_dir_ids.contains(&entry.id) {
-            return false;
-        }
-
-        if let Some(parent_path) = entry.path.parent() {
-            let snapshot = worktree.snapshot();
-            let mut child_entries = snapshot.child_entries(parent_path);
-            if let Some(child) = child_entries.next()
-                && child_entries.next().is_none()
-            {
-                return child.kind.is_dir();
-            }
-        };
-        false
-    }
-
-    fn is_foldable(&self, entry: &Entry, worktree: &Worktree) -> bool {
-        if entry.is_dir() {
-            let snapshot = worktree.snapshot();
-
-            let mut child_entries = snapshot.child_entries(&entry.path);
-            if let Some(child) = child_entries.next()
-                && child_entries.next().is_none()
-            {
-                return child.kind.is_dir();
-            }
-        }
-        false
-    }
-
-    fn expand_selected_entry(
-        &mut self,
-        _: &ExpandSelectedEntry,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some((worktree, entry)) = self.selected_entry(cx) {
-            if let Some(folded_ancestors) = self.state.ancestors.get_mut(&entry.id)
-                && folded_ancestors.current_ancestor_depth > 0
-            {
-                folded_ancestors.current_ancestor_depth -= 1;
-                cx.notify();
-                return;
-            }
-            if entry.is_dir() {
-                let worktree_id = worktree.id();
-                let entry_id = entry.id;
-                let expanded_dir_ids = if let Some(expanded_dir_ids) =
-                    self.state.expanded_dir_ids.get_mut(&worktree_id)
-                {
-                    expanded_dir_ids
-                } else {
-                    return;
-                };
-
-                match expanded_dir_ids.binary_search(&entry_id) {
-                    Ok(_) => self.select_next(&SelectNext, window, cx),
-                    Err(ix) => {
-                        self.project.update(cx, |project, cx| {
-                            project.expand_entry(worktree_id, entry_id, cx);
-                        });
-
-                        expanded_dir_ids.insert(ix, entry_id);
-                        self.update_visible_entries(None, false, false, window, cx);
-                        cx.notify();
-                    }
-                }
-            }
-        }
-    }
-
-    fn collapse_selected_entry(
-        &mut self,
-        _: &CollapseSelectedEntry,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some((worktree, entry)) = self.selected_entry_handle(cx) else {
-            return;
-        };
-        self.collapse_entry(entry.clone(), worktree, window, cx)
-    }
-
-    fn collapse_entry(
-        &mut self,
-        entry: Entry,
-        worktree: Entity<Worktree>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let worktree = worktree.read(cx);
-        if let Some(folded_ancestors) = self.state.ancestors.get_mut(&entry.id)
-            && folded_ancestors.current_ancestor_depth + 1 < folded_ancestors.max_ancestor_depth()
-        {
-            folded_ancestors.current_ancestor_depth += 1;
-            cx.notify();
-            return;
-        }
-        let worktree_id = worktree.id();
-        let expanded_dir_ids =
-            if let Some(expanded_dir_ids) = self.state.expanded_dir_ids.get_mut(&worktree_id) {
-                expanded_dir_ids
-            } else {
-                return;
-            };
-
-        let mut entry = &entry;
-        loop {
-            let entry_id = entry.id;
-            match expanded_dir_ids.binary_search(&entry_id) {
-                Ok(ix) => {
-                    expanded_dir_ids.remove(ix);
-                    self.update_visible_entries(
-                        Some((worktree_id, entry_id)),
-                        false,
-                        false,
-                        window,
-                        cx,
-                    );
-                    cx.notify();
-                    break;
-                }
-                Err(_) => {
-                    if let Some(parent_entry) =
-                        entry.path.parent().and_then(|p| worktree.entry_for_path(p))
-                    {
-                        entry = parent_entry;
-                    } else {
-                        break;
-                    }
-                }
-            }
-        }
-    }
-
-    pub fn collapse_all_entries(
-        &mut self,
-        _: &CollapseAllEntries,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        // By keeping entries for fully collapsed worktrees, we avoid expanding them within update_visible_entries
-        // (which is it's default behavior when there's no entry for a worktree in expanded_dir_ids).
-        let multiple_worktrees = self.project.read(cx).worktrees(cx).count() > 1;
-        let project = self.project.read(cx);
-
-        self.state
-            .expanded_dir_ids
-            .iter_mut()
-            .for_each(|(worktree_id, expanded_entries)| {
-                if multiple_worktrees {
-                    *expanded_entries = Default::default();
-                    return;
-                }
-
-                let root_entry_id = project
-                    .worktree_for_id(*worktree_id, cx)
-                    .map(|worktree| worktree.read(cx).snapshot())
-                    .and_then(|worktree_snapshot| {
-                        worktree_snapshot.root_entry().map(|entry| entry.id)
-                    });
-
-                match root_entry_id {
-                    Some(id) => {
-                        expanded_entries.retain(|entry_id| entry_id == &id);
-                    }
-                    None => *expanded_entries = Default::default(),
-                };
-            });
-
-        self.update_visible_entries(None, false, false, window, cx);
-        cx.notify();
-    }
-
-    fn toggle_expanded(
-        &mut self,
-        entry_id: ProjectEntryId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(worktree_id) = self.project.read(cx).worktree_id_for_entry(entry_id, cx)
-            && let Some(expanded_dir_ids) = self.state.expanded_dir_ids.get_mut(&worktree_id)
-        {
-            self.project.update(cx, |project, cx| {
-                match expanded_dir_ids.binary_search(&entry_id) {
-                    Ok(ix) => {
-                        expanded_dir_ids.remove(ix);
-                    }
-                    Err(ix) => {
-                        project.expand_entry(worktree_id, entry_id, cx);
-                        expanded_dir_ids.insert(ix, entry_id);
-                    }
-                }
-            });
-            self.update_visible_entries(Some((worktree_id, entry_id)), false, false, window, cx);
-            window.focus(&self.focus_handle);
-            cx.notify();
-        }
-    }
-
-    fn toggle_expand_all(
-        &mut self,
-        entry_id: ProjectEntryId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(worktree_id) = self.project.read(cx).worktree_id_for_entry(entry_id, cx)
-            && let Some(expanded_dir_ids) = self.state.expanded_dir_ids.get_mut(&worktree_id)
-        {
-            match expanded_dir_ids.binary_search(&entry_id) {
-                Ok(_ix) => {
-                    self.collapse_all_for_entry(worktree_id, entry_id, cx);
-                }
-                Err(_ix) => {
-                    self.expand_all_for_entry(worktree_id, entry_id, cx);
-                }
-            }
-            self.update_visible_entries(Some((worktree_id, entry_id)), false, false, window, cx);
-            window.focus(&self.focus_handle);
-            cx.notify();
-        }
-    }
-
-    fn expand_all_for_entry(
-        &mut self,
-        worktree_id: WorktreeId,
-        entry_id: ProjectEntryId,
-        cx: &mut Context<Self>,
-    ) {
-        self.project.update(cx, |project, cx| {
-            if let Some((worktree, expanded_dir_ids)) = project
-                .worktree_for_id(worktree_id, cx)
-                .zip(self.state.expanded_dir_ids.get_mut(&worktree_id))
-            {
-                if let Some(task) = project.expand_all_for_entry(worktree_id, entry_id, cx) {
-                    task.detach();
-                }
-
-                let worktree = worktree.read(cx);
-
-                if let Some(mut entry) = worktree.entry_for_id(entry_id) {
-                    loop {
-                        if let Err(ix) = expanded_dir_ids.binary_search(&entry.id) {
-                            expanded_dir_ids.insert(ix, entry.id);
-                        }
-
-                        if let Some(parent_entry) =
-                            entry.path.parent().and_then(|p| worktree.entry_for_path(p))
-                        {
-                            entry = parent_entry;
-                        } else {
-                            break;
-                        }
-                    }
-                }
-            }
-        });
-    }
-
-    fn collapse_all_for_entry(
-        &mut self,
-        worktree_id: WorktreeId,
-        entry_id: ProjectEntryId,
-        cx: &mut Context<Self>,
-    ) {
-        self.project.update(cx, |project, cx| {
-            if let Some((worktree, expanded_dir_ids)) = project
-                .worktree_for_id(worktree_id, cx)
-                .zip(self.state.expanded_dir_ids.get_mut(&worktree_id))
-            {
-                let worktree = worktree.read(cx);
-                let mut dirs_to_collapse = vec![entry_id];
-                let auto_fold_enabled = ProjectPanelSettings::get_global(cx).auto_fold_dirs;
-                while let Some(current_id) = dirs_to_collapse.pop() {
-                    let Some(current_entry) = worktree.entry_for_id(current_id) else {
-                        continue;
-                    };
-                    if let Ok(ix) = expanded_dir_ids.binary_search(&current_id) {
-                        expanded_dir_ids.remove(ix);
-                    }
-                    if auto_fold_enabled {
-                        self.state.unfolded_dir_ids.remove(&current_id);
-                    }
-                    for child in worktree.child_entries(&current_entry.path) {
-                        if child.is_dir() {
-                            dirs_to_collapse.push(child.id);
-                        }
-                    }
-                }
-            }
-        });
-    }
-
-    fn select_previous(&mut self, _: &SelectPrevious, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(edit_state) = &self.state.edit_state
-            && edit_state.processing_filename.is_none()
-        {
-            self.filename_editor.update(cx, |editor, cx| {
-                editor.move_to_beginning_of_line(
-                    &editor::actions::MoveToBeginningOfLine {
-                        stop_at_soft_wraps: false,
-                        stop_at_indent: false,
-                    },
-                    window,
-                    cx,
-                );
-            });
-            return;
-        }
-        if let Some(selection) = self.state.selection {
-            let (mut worktree_ix, mut entry_ix, _) =
-                self.index_for_selection(selection).unwrap_or_default();
-            if entry_ix > 0 {
-                entry_ix -= 1;
-            } else if worktree_ix > 0 {
-                worktree_ix -= 1;
-                entry_ix = self.state.visible_entries[worktree_ix].entries.len() - 1;
-            } else {
-                return;
-            }
-
-            let VisibleEntriesForWorktree {
-                worktree_id,
-                entries,
-                ..
-            } = &self.state.visible_entries[worktree_ix];
-            let selection = SelectedEntry {
-                worktree_id: *worktree_id,
-                entry_id: entries[entry_ix].id,
-            };
-            self.state.selection = Some(selection);
-            if window.modifiers().shift {
-                self.marked_entries.push(selection);
-            }
-            self.autoscroll(cx);
-            cx.notify();
-        } else {
-            self.select_first(&SelectFirst {}, window, cx);
-        }
-    }
-
-    fn confirm(&mut self, _: &Confirm, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(task) = self.confirm_edit(true, window, cx) {
-            task.detach_and_notify_err(window, cx);
-        }
-    }
-
-    fn open(&mut self, _: &Open, window: &mut Window, cx: &mut Context<Self>) {
-        let preview_tabs_enabled =
-            PreviewTabsSettings::get_global(cx).enable_preview_from_project_panel;
-        self.open_internal(true, !preview_tabs_enabled, None, window, cx);
-    }
-
-    fn open_permanent(&mut self, _: &OpenPermanent, window: &mut Window, cx: &mut Context<Self>) {
-        self.open_internal(false, true, None, window, cx);
-    }
-
-    fn open_split_vertical(
-        &mut self,
-        _: &OpenSplitVertical,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.open_internal(false, true, Some(SplitDirection::vertical(cx)), window, cx);
-    }
-
-    fn open_split_horizontal(
-        &mut self,
-        _: &OpenSplitHorizontal,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.open_internal(
-            false,
-            true,
-            Some(SplitDirection::horizontal(cx)),
-            window,
-            cx,
-        );
-    }
-
-    fn open_internal(
-        &mut self,
-        allow_preview: bool,
-        focus_opened_item: bool,
-        split_direction: Option<SplitDirection>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some((_, entry)) = self.selected_entry(cx) {
-            if entry.is_file() {
-                if split_direction.is_some() {
-                    self.split_entry(entry.id, allow_preview, split_direction, cx);
-                } else {
-                    self.open_entry(entry.id, focus_opened_item, allow_preview, cx);
-                }
-                cx.notify();
-            } else {
-                self.toggle_expanded(entry.id, window, cx);
-            }
-        }
-    }
-
-    fn populate_validation_error(&mut self, cx: &mut Context<Self>) {
-        let edit_state = match self.state.edit_state.as_mut() {
-            Some(state) => state,
-            None => return,
-        };
-        let filename = self.filename_editor.read(cx).text(cx);
-        if !filename.is_empty() {
-            if filename.is_empty() {
-                edit_state.validation_state =
-                    ValidationState::Error("File or directory name cannot be empty.".to_string());
-                cx.notify();
-                return;
-            }
-
-            let trimmed_filename = filename.trim();
-            if trimmed_filename != filename {
-                edit_state.validation_state = ValidationState::Warning(
-                    "File or directory name contains leading or trailing whitespace.".to_string(),
-                );
-                cx.notify();
-                return;
-            }
-            let trimmed_filename = trimmed_filename.trim_start_matches('/');
-
-            let Ok(filename) = RelPath::unix(trimmed_filename) else {
-                edit_state.validation_state = ValidationState::Warning(
-                    "File or directory name contains leading or trailing whitespace.".to_string(),
-                );
-                cx.notify();
-                return;
-            };
-
-            if let Some(worktree) = self
-                .project
-                .read(cx)
-                .worktree_for_id(edit_state.worktree_id, cx)
-                && let Some(entry) = worktree.read(cx).entry_for_id(edit_state.entry_id)
-            {
-                let mut already_exists = false;
-                if edit_state.is_new_entry() {
-                    let new_path = entry.path.join(filename);
-                    if worktree.read(cx).entry_for_path(&new_path).is_some() {
-                        already_exists = true;
-                    }
-                } else {
-                    let new_path = if let Some(parent) = entry.path.clone().parent() {
-                        parent.join(&filename)
-                    } else {
-                        filename.into()
-                    };
-                    if let Some(existing) = worktree.read(cx).entry_for_path(&new_path)
-                        && existing.id != entry.id
-                    {
-                        already_exists = true;
-                    }
-                };
-                if already_exists {
-                    edit_state.validation_state = ValidationState::Error(format!(
-                        "File or directory '{}' already exists at location. Please choose a different name.",
-                        filename.as_unix_str()
-                    ));
-                    cx.notify();
-                    return;
-                }
-            }
-        }
-        edit_state.validation_state = ValidationState::None;
-        cx.notify();
-    }
-
-    fn confirm_edit(
-        &mut self,
-        refocus: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Task<Result<()>>> {
-        let edit_state = self.state.edit_state.as_mut()?;
-        let worktree_id = edit_state.worktree_id;
-        let is_new_entry = edit_state.is_new_entry();
-        let mut filename = self.filename_editor.read(cx).text(cx);
-        let path_style = self.project.read(cx).path_style(cx);
-        if path_style.is_windows() {
-            // on windows, trailing dots are ignored in paths
-            // this can cause project panel to create a new entry with a trailing dot
-            // while the actual one without the dot gets populated by the file watcher
-            while let Some(trimmed) = filename.strip_suffix('.') {
-                filename = trimmed.to_string();
-            }
-        }
-        if filename.trim().is_empty() {
-            return None;
-        }
-
-        let filename_indicates_dir = if path_style.is_windows() {
-            filename.ends_with('/') || filename.ends_with('\\')
-        } else {
-            filename.ends_with('/')
-        };
-        let filename = if path_style.is_windows() {
-            filename.trim_start_matches(&['/', '\\'])
-        } else {
-            filename.trim_start_matches('/')
-        };
-        let filename = RelPath::new(filename.as_ref(), path_style).ok()?.into_arc();
-
-        edit_state.is_dir =
-            edit_state.is_dir || (edit_state.is_new_entry() && filename_indicates_dir);
-        let is_dir = edit_state.is_dir;
-        let worktree = self.project.read(cx).worktree_for_id(worktree_id, cx)?;
-        let entry = worktree.read(cx).entry_for_id(edit_state.entry_id)?.clone();
-
-        let edit_task;
-        let edited_entry_id;
-        if is_new_entry {
-            self.state.selection = Some(SelectedEntry {
-                worktree_id,
-                entry_id: NEW_ENTRY_ID,
-            });
-            let new_path = entry.path.join(&filename);
-            if worktree.read(cx).entry_for_path(&new_path).is_some() {
-                return None;
-            }
-
-            edited_entry_id = NEW_ENTRY_ID;
-            edit_task = self.project.update(cx, |project, cx| {
-                project.create_entry((worktree_id, new_path), is_dir, cx)
-            });
-        } else {
-            let new_path = if let Some(parent) = entry.path.clone().parent() {
-                parent.join(&filename)
-            } else {
-                filename.clone()
-            };
-            if let Some(existing) = worktree.read(cx).entry_for_path(&new_path) {
-                if existing.id == entry.id && refocus {
-                    window.focus(&self.focus_handle);
-                }
-                return None;
-            }
-            edited_entry_id = entry.id;
-            edit_task = self.project.update(cx, |project, cx| {
-                project.rename_entry(entry.id, (worktree_id, new_path).into(), cx)
-            });
-        };
-
-        if refocus {
-            window.focus(&self.focus_handle);
-        }
-        edit_state.processing_filename = Some(filename);
-        cx.notify();
-
-        Some(cx.spawn_in(window, async move |project_panel, cx| {
-            let new_entry = edit_task.await;
-            project_panel.update(cx, |project_panel, cx| {
-                project_panel.state.edit_state = None;
-                cx.notify();
-            })?;
-
-            match new_entry {
-                Err(e) => {
-                    project_panel
-                        .update_in(cx, |project_panel, window, cx| {
-                            project_panel.marked_entries.clear();
-                            project_panel.update_visible_entries(None, false, false, window, cx);
-                        })
-                        .ok();
-                    Err(e)?;
-                }
-                Ok(CreatedEntry::Included(new_entry)) => {
-                    project_panel.update_in(cx, |project_panel, window, cx| {
-                        if let Some(selection) = &mut project_panel.state.selection
-                            && selection.entry_id == edited_entry_id
-                        {
-                            selection.worktree_id = worktree_id;
-                            selection.entry_id = new_entry.id;
-                            project_panel.marked_entries.clear();
-                            project_panel.expand_to_selection(cx);
-                        }
-                        project_panel.update_visible_entries(None, false, false, window, cx);
-                        if is_new_entry && !is_dir {
-                            let settings = ProjectPanelSettings::get_global(cx);
-                            if settings.auto_open.should_open_on_create() {
-                                project_panel.open_entry(new_entry.id, true, false, cx);
-                            }
-                        }
-                        cx.notify();
-                    })?;
-                }
-                Ok(CreatedEntry::Excluded { abs_path }) => {
-                    if let Some(open_task) = project_panel
-                        .update_in(cx, |project_panel, window, cx| {
-                            project_panel.marked_entries.clear();
-                            project_panel.update_visible_entries(None, false, false, window, cx);
-
-                            if is_dir {
-                                project_panel.project.update(cx, |_, cx| {
-                                    cx.emit(project::Event::Toast {
-                                        notification_id: "excluded-directory".into(),
-                                        message: format!(
-                                            concat!(
-                                                "Created an excluded directory at {:?}.\n",
-                                                "Alter `file_scan_exclusions` in the settings ",
-                                                "to show it in the panel"
-                                            ),
-                                            abs_path
-                                        ),
-                                    })
-                                });
-                                None
-                            } else {
-                                project_panel
-                                    .workspace
-                                    .update(cx, |workspace, cx| {
-                                        workspace.open_abs_path(
-                                            abs_path,
-                                            OpenOptions {
-                                                visible: Some(OpenVisible::All),
-                                                ..Default::default()
-                                            },
-                                            window,
-                                            cx,
-                                        )
-                                    })
-                                    .ok()
-                            }
-                        })
-                        .ok()
-                        .flatten()
-                    {
-                        let _ = open_task.await?;
-                    }
-                }
-            }
-            Ok(())
-        }))
-    }
-
-    fn cancel(&mut self, _: &menu::Cancel, window: &mut Window, cx: &mut Context<Self>) {
-        if cx.stop_active_drag(window) {
-            self.drag_target_entry.take();
-            self.hover_expand_task.take();
-            return;
-        }
-
-        let previous_edit_state = self.state.edit_state.take();
-        self.update_visible_entries(None, false, false, window, cx);
-        self.marked_entries.clear();
-
-        if let Some(previously_focused) =
-            previous_edit_state.and_then(|edit_state| edit_state.previously_focused)
-        {
-            self.state.selection = Some(previously_focused);
-            self.autoscroll(cx);
-        }
-
-        window.focus(&self.focus_handle);
-        cx.notify();
-    }
-
-    fn open_entry(
-        &mut self,
-        entry_id: ProjectEntryId,
-        focus_opened_item: bool,
-        allow_preview: bool,
-
-        cx: &mut Context<Self>,
-    ) {
-        cx.emit(Event::OpenedEntry {
-            entry_id,
-            focus_opened_item,
-            allow_preview,
-        });
-    }
-
-    fn split_entry(
-        &mut self,
-        entry_id: ProjectEntryId,
-        allow_preview: bool,
-        split_direction: Option<SplitDirection>,
-
-        cx: &mut Context<Self>,
-    ) {
-        cx.emit(Event::SplitEntry {
-            entry_id,
-            allow_preview,
-            split_direction,
-        });
-    }
-
-    fn new_file(&mut self, _: &NewFile, window: &mut Window, cx: &mut Context<Self>) {
-        self.add_entry(false, window, cx)
-    }
-
-    fn new_directory(&mut self, _: &NewDirectory, window: &mut Window, cx: &mut Context<Self>) {
-        self.add_entry(true, window, cx)
-    }
-
-    fn add_entry(&mut self, is_dir: bool, window: &mut Window, cx: &mut Context<Self>) {
-        let Some((worktree_id, entry_id)) = self
-            .state
-            .selection
-            .map(|entry| (entry.worktree_id, entry.entry_id))
-            .or_else(|| {
-                let entry_id = self.state.last_worktree_root_id?;
-                let worktree_id = self
-                    .project
-                    .read(cx)
-                    .worktree_for_entry(entry_id, cx)?
-                    .read(cx)
-                    .id();
-
-                self.state.selection = Some(SelectedEntry {
-                    worktree_id,
-                    entry_id,
-                });
-
-                Some((worktree_id, entry_id))
-            })
-        else {
-            return;
-        };
-
-        let directory_id;
-        let new_entry_id = self.resolve_entry(entry_id);
-        if let Some((worktree, expanded_dir_ids)) = self
-            .project
-            .read(cx)
-            .worktree_for_id(worktree_id, cx)
-            .zip(self.state.expanded_dir_ids.get_mut(&worktree_id))
-        {
-            let worktree = worktree.read(cx);
-            if let Some(mut entry) = worktree.entry_for_id(new_entry_id) {
-                loop {
-                    if entry.is_dir() {
-                        if let Err(ix) = expanded_dir_ids.binary_search(&entry.id) {
-                            expanded_dir_ids.insert(ix, entry.id);
-                        }
-                        directory_id = entry.id;
-                        break;
-                    } else {
-                        if let Some(parent_path) = entry.path.parent()
-                            && let Some(parent_entry) = worktree.entry_for_path(parent_path)
-                        {
-                            entry = parent_entry;
-                            continue;
-                        }
-                        return;
-                    }
-                }
-            } else {
-                return;
-            };
-        } else {
-            return;
-        };
-
-        self.marked_entries.clear();
-        self.state.edit_state = Some(EditState {
-            worktree_id,
-            entry_id: directory_id,
-            leaf_entry_id: None,
-            is_dir,
-            processing_filename: None,
-            previously_focused: self.state.selection,
-            depth: 0,
-            validation_state: ValidationState::None,
-        });
-        self.filename_editor.update(cx, |editor, cx| {
-            editor.clear(window, cx);
-        });
-        self.update_visible_entries(Some((worktree_id, NEW_ENTRY_ID)), true, true, window, cx);
-        cx.notify();
-    }
-
-    fn unflatten_entry_id(&self, leaf_entry_id: ProjectEntryId) -> ProjectEntryId {
-        if let Some(ancestors) = self.state.ancestors.get(&leaf_entry_id) {
-            ancestors
-                .ancestors
-                .get(ancestors.current_ancestor_depth)
-                .copied()
-                .unwrap_or(leaf_entry_id)
-        } else {
-            leaf_entry_id
-        }
-    }
-
-    fn rename_impl(
-        &mut self,
-        selection: Option<Range<usize>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(SelectedEntry {
-            worktree_id,
-            entry_id,
-        }) = self.state.selection
-            && let Some(worktree) = self.project.read(cx).worktree_for_id(worktree_id, cx)
-        {
-            let sub_entry_id = self.unflatten_entry_id(entry_id);
-            if let Some(entry) = worktree.read(cx).entry_for_id(sub_entry_id) {
-                #[cfg(target_os = "windows")]
-                if Some(entry) == worktree.read(cx).root_entry() {
-                    return;
-                }
-
-                if Some(entry) == worktree.read(cx).root_entry() {
-                    let settings = ProjectPanelSettings::get_global(cx);
-                    let visible_worktrees_count =
-                        self.project.read(cx).visible_worktrees(cx).count();
-                    if settings.hide_root && visible_worktrees_count == 1 {
-                        return;
-                    }
-                }
-
-                self.state.edit_state = Some(EditState {
-                    worktree_id,
-                    entry_id: sub_entry_id,
-                    leaf_entry_id: Some(entry_id),
-                    is_dir: entry.is_dir(),
-                    processing_filename: None,
-                    previously_focused: None,
-                    depth: 0,
-                    validation_state: ValidationState::None,
-                });
-                let file_name = entry.path.file_name().unwrap_or_default().to_string();
-                let selection = selection.unwrap_or_else(|| {
-                    let file_stem = entry.path.file_stem().map(|s| s.to_string());
-                    let selection_end =
-                        file_stem.map_or(file_name.len(), |file_stem| file_stem.len());
-                    0..selection_end
-                });
-                self.filename_editor.update(cx, |editor, cx| {
-                    editor.set_text(file_name, window, cx);
-                    editor.change_selections(Default::default(), window, cx, |s| {
-                        s.select_ranges([
-                            MultiBufferOffset(selection.start)..MultiBufferOffset(selection.end)
-                        ])
-                    });
-                });
-                self.update_visible_entries(None, true, true, window, cx);
-                cx.notify();
-            }
-        }
-    }
-
-    fn rename(&mut self, _: &Rename, window: &mut Window, cx: &mut Context<Self>) {
-        self.rename_impl(None, window, cx);
-    }
-
-    fn trash(&mut self, action: &Trash, window: &mut Window, cx: &mut Context<Self>) {
-        self.remove(true, action.skip_prompt, window, cx);
-    }
-
-    fn delete(&mut self, action: &Delete, window: &mut Window, cx: &mut Context<Self>) {
-        self.remove(false, action.skip_prompt, window, cx);
-    }
-
-    fn remove(
-        &mut self,
-        trash: bool,
-        skip_prompt: bool,
-        window: &mut Window,
-        cx: &mut Context<ProjectPanel>,
-    ) {
-        maybe!({
-            let items_to_delete = self.disjoint_entries(cx);
-            if items_to_delete.is_empty() {
-                return None;
-            }
-            let project = self.project.read(cx);
-
-            let mut dirty_buffers = 0;
-            let file_paths = items_to_delete
-                .iter()
-                .filter_map(|selection| {
-                    let project_path = project.path_for_entry(selection.entry_id, cx)?;
-                    dirty_buffers +=
-                        project.dirty_buffers(cx).any(|path| path == project_path) as usize;
-                    Some((
-                        selection.entry_id,
-                        project_path.path.file_name()?.to_string(),
-                    ))
-                })
-                .collect::<Vec<_>>();
-            if file_paths.is_empty() {
-                return None;
-            }
-            let answer = if !skip_prompt {
-                let operation = if trash { "Trash" } else { "Delete" };
-                let prompt = match file_paths.first() {
-                    Some((_, path)) if file_paths.len() == 1 => {
-                        let unsaved_warning = if dirty_buffers > 0 {
-                            "\n\nIt has unsaved changes, which will be lost."
-                        } else {
-                            ""
-                        };
-
-                        format!("{operation} {path}?{unsaved_warning}")
-                    }
-                    _ => {
-                        const CUTOFF_POINT: usize = 10;
-                        let names = if file_paths.len() > CUTOFF_POINT {
-                            let truncated_path_counts = file_paths.len() - CUTOFF_POINT;
-                            let mut paths = file_paths
-                                .iter()
-                                .map(|(_, path)| path.clone())
-                                .take(CUTOFF_POINT)
-                                .collect::<Vec<_>>();
-                            paths.truncate(CUTOFF_POINT);
-                            if truncated_path_counts == 1 {
-                                paths.push(".. 1 file not shown".into());
-                            } else {
-                                paths.push(format!(".. {} files not shown", truncated_path_counts));
-                            }
-                            paths
-                        } else {
-                            file_paths.iter().map(|(_, path)| path.clone()).collect()
-                        };
-                        let unsaved_warning = if dirty_buffers == 0 {
-                            String::new()
-                        } else if dirty_buffers == 1 {
-                            "\n\n1 of these has unsaved changes, which will be lost.".to_string()
-                        } else {
-                            format!(
-                                "\n\n{dirty_buffers} of these have unsaved changes, which will be lost."
-                            )
-                        };
-
-                        format!(
-                            "Do you want to {} the following {} files?\n{}{unsaved_warning}",
-                            operation.to_lowercase(),
-                            file_paths.len(),
-                            names.join("\n")
-                        )
-                    }
-                };
-                Some(window.prompt(PromptLevel::Info, &prompt, None, &[operation, "Cancel"], cx))
-            } else {
-                None
-            };
-            let next_selection = self.find_next_selection_after_deletion(items_to_delete, cx);
-            cx.spawn_in(window, async move |panel, cx| {
-                if let Some(answer) = answer
-                    && answer.await != Ok(0)
-                {
-                    return anyhow::Ok(());
-                }
-                for (entry_id, _) in file_paths {
-                    panel
-                        .update(cx, |panel, cx| {
-                            panel
-                                .project
-                                .update(cx, |project, cx| project.delete_entry(entry_id, trash, cx))
-                                .context("no such entry")
-                        })??
-                        .await?;
-                }
-                panel.update_in(cx, |panel, window, cx| {
-                    if let Some(next_selection) = next_selection {
-                        panel.update_visible_entries(
-                            Some((next_selection.worktree_id, next_selection.entry_id)),
-                            false,
-                            true,
-                            window,
-                            cx,
-                        );
-                    } else {
-                        panel.select_last(&SelectLast {}, window, cx);
-                    }
-                })?;
-                Ok(())
-            })
-            .detach_and_log_err(cx);
-            Some(())
-        });
-    }
-
-    fn find_next_selection_after_deletion(
-        &self,
-        sanitized_entries: BTreeSet<SelectedEntry>,
-        cx: &mut Context<Self>,
-    ) -> Option<SelectedEntry> {
-        if sanitized_entries.is_empty() {
-            return None;
-        }
-        let project = self.project.read(cx);
-        let (worktree_id, worktree) = sanitized_entries
-            .iter()
-            .map(|entry| entry.worktree_id)
-            .filter_map(|id| project.worktree_for_id(id, cx).map(|w| (id, w.read(cx))))
-            .max_by(|(_, a), (_, b)| a.root_name().cmp(b.root_name()))?;
-        let git_store = project.git_store().read(cx);
-
-        let marked_entries_in_worktree = sanitized_entries
-            .iter()
-            .filter(|e| e.worktree_id == worktree_id)
-            .collect::<HashSet<_>>();
-        let latest_entry = marked_entries_in_worktree
-            .iter()
-            .max_by(|a, b| {
-                match (
-                    worktree.entry_for_id(a.entry_id),
-                    worktree.entry_for_id(b.entry_id),
-                ) {
-                    (Some(a), Some(b)) => compare_paths(
-                        (a.path.as_std_path(), a.is_file()),
-                        (b.path.as_std_path(), b.is_file()),
-                    ),
-                    _ => cmp::Ordering::Equal,
-                }
-            })
-            .and_then(|e| worktree.entry_for_id(e.entry_id))?;
-
-        let parent_path = latest_entry.path.parent()?;
-        let parent_entry = worktree.entry_for_path(parent_path)?;
-
-        // Remove all siblings that are being deleted except the last marked entry
-        let repo_snapshots = git_store.repo_snapshots(cx);
-        let worktree_snapshot = worktree.snapshot();
-        let hide_gitignore = ProjectPanelSettings::get_global(cx).hide_gitignore;
-        let mut siblings: Vec<_> =
-            ChildEntriesGitIter::new(&repo_snapshots, &worktree_snapshot, parent_path)
-                .filter(|sibling| {
-                    (sibling.id == latest_entry.id)
-                        || (!marked_entries_in_worktree.contains(&&SelectedEntry {
-                            worktree_id,
-                            entry_id: sibling.id,
-                        }) && (!hide_gitignore || !sibling.is_ignored))
-                })
-                .map(|entry| entry.to_owned())
-                .collect();
-
-        let mode = ProjectPanelSettings::get_global(cx).sort_mode;
-        sort_worktree_entries_with_mode(&mut siblings, mode);
-        let sibling_entry_index = siblings
-            .iter()
-            .position(|sibling| sibling.id == latest_entry.id)?;
-
-        if let Some(next_sibling) = sibling_entry_index
-            .checked_add(1)
-            .and_then(|i| siblings.get(i))
-        {
-            return Some(SelectedEntry {
-                worktree_id,
-                entry_id: next_sibling.id,
-            });
-        }
-        if let Some(prev_sibling) = sibling_entry_index
-            .checked_sub(1)
-            .and_then(|i| siblings.get(i))
-        {
-            return Some(SelectedEntry {
-                worktree_id,
-                entry_id: prev_sibling.id,
-            });
-        }
-        // No neighbour sibling found, fall back to parent
-        Some(SelectedEntry {
-            worktree_id,
-            entry_id: parent_entry.id,
-        })
-    }
-
-    fn unfold_directory(
-        &mut self,
-        _: &UnfoldDirectory,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some((worktree, entry)) = self.selected_entry(cx) {
-            self.state.unfolded_dir_ids.insert(entry.id);
-
-            let snapshot = worktree.snapshot();
-            let mut parent_path = entry.path.parent();
-            while let Some(path) = parent_path {
-                if let Some(parent_entry) = worktree.entry_for_path(path) {
-                    let mut children_iter = snapshot.child_entries(path);
-
-                    if children_iter.by_ref().take(2).count() > 1 {
-                        break;
-                    }
-
-                    self.state.unfolded_dir_ids.insert(parent_entry.id);
-                    parent_path = path.parent();
-                } else {
-                    break;
-                }
-            }
-
-            self.update_visible_entries(None, false, true, window, cx);
-            cx.notify();
-        }
-    }
-
-    fn fold_directory(&mut self, _: &FoldDirectory, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some((worktree, entry)) = self.selected_entry(cx) {
-            self.state.unfolded_dir_ids.remove(&entry.id);
-
-            let snapshot = worktree.snapshot();
-            let mut path = &*entry.path;
-            loop {
-                let mut child_entries_iter = snapshot.child_entries(path);
-                if let Some(child) = child_entries_iter.next() {
-                    if child_entries_iter.next().is_none() && child.is_dir() {
-                        self.state.unfolded_dir_ids.remove(&child.id);
-                        path = &*child.path;
-                    } else {
-                        break;
-                    }
-                } else {
-                    break;
-                }
-            }
-
-            self.update_visible_entries(None, false, true, window, cx);
-            cx.notify();
-        }
-    }
-
-    fn scroll_up(&mut self, _: &ScrollUp, window: &mut Window, cx: &mut Context<Self>) {
-        for _ in 0..self.rendered_entries_len / 2 {
-            window.dispatch_action(SelectPrevious.boxed_clone(), cx);
-        }
-    }
-
-    fn scroll_down(&mut self, _: &ScrollDown, window: &mut Window, cx: &mut Context<Self>) {
-        for _ in 0..self.rendered_entries_len / 2 {
-            window.dispatch_action(SelectNext.boxed_clone(), cx);
-        }
-    }
-
-    fn scroll_cursor_center(
-        &mut self,
-        _: &ScrollCursorCenter,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some((_, _, index)) = self
-            .state
-            .selection
-            .and_then(|s| self.index_for_selection(s))
-        {
-            self.scroll_handle
-                .scroll_to_item_strict(index, ScrollStrategy::Center);
-            cx.notify();
-        }
-    }
-
-    fn scroll_cursor_top(&mut self, _: &ScrollCursorTop, _: &mut Window, cx: &mut Context<Self>) {
-        if let Some((_, _, index)) = self
-            .state
-            .selection
-            .and_then(|s| self.index_for_selection(s))
-        {
-            self.scroll_handle
-                .scroll_to_item_strict(index, ScrollStrategy::Top);
-            cx.notify();
-        }
-    }
-
-    fn scroll_cursor_bottom(
-        &mut self,
-        _: &ScrollCursorBottom,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some((_, _, index)) = self
-            .state
-            .selection
-            .and_then(|s| self.index_for_selection(s))
-        {
-            self.scroll_handle
-                .scroll_to_item_strict(index, ScrollStrategy::Bottom);
-            cx.notify();
-        }
-    }
-
-    fn select_next(&mut self, _: &SelectNext, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(edit_state) = &self.state.edit_state
-            && edit_state.processing_filename.is_none()
-        {
-            self.filename_editor.update(cx, |editor, cx| {
-                editor.move_to_end_of_line(
-                    &editor::actions::MoveToEndOfLine {
-                        stop_at_soft_wraps: false,
-                    },
-                    window,
-                    cx,
-                );
-            });
-            return;
-        }
-        if let Some(selection) = self.state.selection {
-            let (mut worktree_ix, mut entry_ix, _) =
-                self.index_for_selection(selection).unwrap_or_default();
-            if let Some(worktree_entries) = self
-                .state
-                .visible_entries
-                .get(worktree_ix)
-                .map(|v| &v.entries)
-            {
-                if entry_ix + 1 < worktree_entries.len() {
-                    entry_ix += 1;
-                } else {
-                    worktree_ix += 1;
-                    entry_ix = 0;
-                }
-            }
-
-            if let Some(VisibleEntriesForWorktree {
-                worktree_id,
-                entries,
-                ..
-            }) = self.state.visible_entries.get(worktree_ix)
-                && let Some(entry) = entries.get(entry_ix)
-            {
-                let selection = SelectedEntry {
-                    worktree_id: *worktree_id,
-                    entry_id: entry.id,
-                };
-                self.state.selection = Some(selection);
-                if window.modifiers().shift {
-                    self.marked_entries.push(selection);
-                }
-
-                self.autoscroll(cx);
-                cx.notify();
-            }
-        } else {
-            self.select_first(&SelectFirst {}, window, cx);
-        }
-    }
-
-    fn select_prev_diagnostic(
-        &mut self,
-        action: &SelectPrevDiagnostic,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let selection = self.find_entry(
-            self.state.selection.as_ref(),
-            true,
-            |entry, worktree_id| {
-                self.state.selection.is_none_or(|selection| {
-                    if selection.worktree_id == worktree_id {
-                        selection.entry_id != entry.id
-                    } else {
-                        true
-                    }
-                }) && entry.is_file()
-                    && self
-                        .diagnostics
-                        .get(&(worktree_id, entry.path.clone()))
-                        .is_some_and(|severity| action.severity.matches(*severity))
-            },
-            cx,
-        );
-
-        if let Some(selection) = selection {
-            self.state.selection = Some(selection);
-            self.expand_entry(selection.worktree_id, selection.entry_id, cx);
-            self.update_visible_entries(
-                Some((selection.worktree_id, selection.entry_id)),
-                false,
-                true,
-                window,
-                cx,
-            );
-            cx.notify();
-        }
-    }
-
-    fn select_next_diagnostic(
-        &mut self,
-        action: &SelectNextDiagnostic,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let selection = self.find_entry(
-            self.state.selection.as_ref(),
-            false,
-            |entry, worktree_id| {
-                self.state.selection.is_none_or(|selection| {
-                    if selection.worktree_id == worktree_id {
-                        selection.entry_id != entry.id
-                    } else {
-                        true
-                    }
-                }) && entry.is_file()
-                    && self
-                        .diagnostics
-                        .get(&(worktree_id, entry.path.clone()))
-                        .is_some_and(|severity| action.severity.matches(*severity))
-            },
-            cx,
-        );
-
-        if let Some(selection) = selection {
-            self.state.selection = Some(selection);
-            self.expand_entry(selection.worktree_id, selection.entry_id, cx);
-            self.update_visible_entries(
-                Some((selection.worktree_id, selection.entry_id)),
-                false,
-                true,
-                window,
-                cx,
-            );
-            cx.notify();
-        }
-    }
-
-    fn select_prev_git_entry(
-        &mut self,
-        _: &SelectPrevGitEntry,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let selection = self.find_entry(
-            self.state.selection.as_ref(),
-            true,
-            |entry, worktree_id| {
-                (self.state.selection.is_none()
-                    || self.state.selection.is_some_and(|selection| {
-                        if selection.worktree_id == worktree_id {
-                            selection.entry_id != entry.id
-                        } else {
-                            true
-                        }
-                    }))
-                    && entry.is_file()
-                    && entry.git_summary.index.modified + entry.git_summary.worktree.modified > 0
-            },
-            cx,
-        );
-
-        if let Some(selection) = selection {
-            self.state.selection = Some(selection);
-            self.expand_entry(selection.worktree_id, selection.entry_id, cx);
-            self.update_visible_entries(
-                Some((selection.worktree_id, selection.entry_id)),
-                false,
-                true,
-                window,
-                cx,
-            );
-            cx.notify();
-        }
-    }
-
-    fn select_prev_directory(
-        &mut self,
-        _: &SelectPrevDirectory,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let selection = self.find_visible_entry(
-            self.state.selection.as_ref(),
-            true,
-            |entry, worktree_id| {
-                self.state.selection.is_none_or(|selection| {
-                    if selection.worktree_id == worktree_id {
-                        selection.entry_id != entry.id
-                    } else {
-                        true
-                    }
-                }) && entry.is_dir()
-            },
-            cx,
-        );
-
-        if let Some(selection) = selection {
-            self.state.selection = Some(selection);
-            self.autoscroll(cx);
-            cx.notify();
-        }
-    }
-
-    fn select_next_directory(
-        &mut self,
-        _: &SelectNextDirectory,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let selection = self.find_visible_entry(
-            self.state.selection.as_ref(),
-            false,
-            |entry, worktree_id| {
-                self.state.selection.is_none_or(|selection| {
-                    if selection.worktree_id == worktree_id {
-                        selection.entry_id != entry.id
-                    } else {
-                        true
-                    }
-                }) && entry.is_dir()
-            },
-            cx,
-        );
-
-        if let Some(selection) = selection {
-            self.state.selection = Some(selection);
-            self.autoscroll(cx);
-            cx.notify();
-        }
-    }
-
-    fn select_next_git_entry(
-        &mut self,
-        _: &SelectNextGitEntry,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let selection = self.find_entry(
-            self.state.selection.as_ref(),
-            false,
-            |entry, worktree_id| {
-                self.state.selection.is_none_or(|selection| {
-                    if selection.worktree_id == worktree_id {
-                        selection.entry_id != entry.id
-                    } else {
-                        true
-                    }
-                }) && entry.is_file()
-                    && entry.git_summary.index.modified + entry.git_summary.worktree.modified > 0
-            },
-            cx,
-        );
-
-        if let Some(selection) = selection {
-            self.state.selection = Some(selection);
-            self.expand_entry(selection.worktree_id, selection.entry_id, cx);
-            self.update_visible_entries(
-                Some((selection.worktree_id, selection.entry_id)),
-                false,
-                true,
-                window,
-                cx,
-            );
-            cx.notify();
-        }
-    }
-
-    fn select_parent(&mut self, _: &SelectParent, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some((worktree, entry)) = self.selected_sub_entry(cx) {
-            if let Some(parent) = entry.path.parent() {
-                let worktree = worktree.read(cx);
-                if let Some(parent_entry) = worktree.entry_for_path(parent) {
-                    self.state.selection = Some(SelectedEntry {
-                        worktree_id: worktree.id(),
-                        entry_id: parent_entry.id,
-                    });
-                    self.autoscroll(cx);
-                    cx.notify();
-                }
-            }
-        } else {
-            self.select_first(&SelectFirst {}, window, cx);
-        }
-    }
-
-    fn select_first(&mut self, _: &SelectFirst, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(VisibleEntriesForWorktree {
-            worktree_id,
-            entries,
-            ..
-        }) = self.state.visible_entries.first()
-            && let Some(entry) = entries.first()
-        {
-            let selection = SelectedEntry {
-                worktree_id: *worktree_id,
-                entry_id: entry.id,
-            };
-            self.state.selection = Some(selection);
-            if window.modifiers().shift {
-                self.marked_entries.push(selection);
-            }
-            self.autoscroll(cx);
-            cx.notify();
-        }
-    }
-
-    fn select_last(&mut self, _: &SelectLast, _: &mut Window, cx: &mut Context<Self>) {
-        if let Some(VisibleEntriesForWorktree {
-            worktree_id,
-            entries,
-            ..
-        }) = self.state.visible_entries.last()
-        {
-            let worktree = self.project.read(cx).worktree_for_id(*worktree_id, cx);
-            if let (Some(worktree), Some(entry)) = (worktree, entries.last()) {
-                let worktree = worktree.read(cx);
-                if let Some(entry) = worktree.entry_for_id(entry.id) {
-                    let selection = SelectedEntry {
-                        worktree_id: *worktree_id,
-                        entry_id: entry.id,
-                    };
-                    self.state.selection = Some(selection);
-                    self.autoscroll(cx);
-                    cx.notify();
-                }
-            }
-        }
-    }
-
-    fn autoscroll(&mut self, cx: &mut Context<Self>) {
-        if let Some((_, _, index)) = self
-            .state
-            .selection
-            .and_then(|s| self.index_for_selection(s))
-        {
-            self.scroll_handle.scroll_to_item_with_offset(
-                index,
-                ScrollStrategy::Center,
-                self.sticky_items_count,
-            );
-            cx.notify();
-        }
-    }
-
-    fn cut(&mut self, _: &Cut, _: &mut Window, cx: &mut Context<Self>) {
-        let entries = self.disjoint_entries(cx);
-        if !entries.is_empty() {
-            self.clipboard = Some(ClipboardEntry::Cut(entries));
-            cx.notify();
-        }
-    }
-
-    fn copy(&mut self, _: &Copy, _: &mut Window, cx: &mut Context<Self>) {
-        let entries = self.disjoint_entries(cx);
-        if !entries.is_empty() {
-            self.clipboard = Some(ClipboardEntry::Copied(entries));
-            cx.notify();
-        }
-    }
-
-    fn create_paste_path(
-        &self,
-        source: &SelectedEntry,
-        (worktree, target_entry): (Entity<Worktree>, &Entry),
-        cx: &App,
-    ) -> Option<(Arc<RelPath>, Option<Range<usize>>)> {
-        let mut new_path = target_entry.path.to_rel_path_buf();
-        // If we're pasting into a file, or a directory into itself, go up one level.
-        if target_entry.is_file() || (target_entry.is_dir() && target_entry.id == source.entry_id) {
-            new_path.pop();
-        }
-        let clipboard_entry_file_name = self
-            .project
-            .read(cx)
-            .path_for_entry(source.entry_id, cx)?
-            .path
-            .file_name()?
-            .to_string();
-        new_path.push(RelPath::unix(&clipboard_entry_file_name).unwrap());
-        let extension = new_path.extension().map(|s| s.to_string());
-        let file_name_without_extension = new_path.file_stem()?.to_string();
-        let file_name_len = file_name_without_extension.len();
-        let mut disambiguation_range = None;
-        let mut ix = 0;
-        {
-            let worktree = worktree.read(cx);
-            while worktree.entry_for_path(&new_path).is_some() {
-                new_path.pop();
-
-                let mut new_file_name = file_name_without_extension.to_string();
-
-                let disambiguation = " copy";
-                let mut disambiguation_len = disambiguation.len();
-
-                new_file_name.push_str(disambiguation);
-
-                if ix > 0 {
-                    let extra_disambiguation = format!(" {}", ix);
-                    disambiguation_len += extra_disambiguation.len();
-                    new_file_name.push_str(&extra_disambiguation);
-                }
-                if let Some(extension) = extension.as_ref() {
-                    new_file_name.push_str(".");
-                    new_file_name.push_str(extension);
-                }
-
-                new_path.push(RelPath::unix(&new_file_name).unwrap());
-
-                disambiguation_range = Some(file_name_len..(file_name_len + disambiguation_len));
-                ix += 1;
-            }
-        }
-        Some((new_path.as_rel_path().into(), disambiguation_range))
-    }
-
-    fn paste(&mut self, _: &Paste, window: &mut Window, cx: &mut Context<Self>) {
-        maybe!({
-            let (worktree, entry) = self.selected_entry_handle(cx)?;
-            let entry = entry.clone();
-            let worktree_id = worktree.read(cx).id();
-            let clipboard_entries = self
-                .clipboard
-                .as_ref()
-                .filter(|clipboard| !clipboard.items().is_empty())?;
-
-            enum PasteTask {
-                Rename(Task<Result<CreatedEntry>>),
-                Copy(Task<Result<Option<Entry>>>),
-            }
-
-            let mut paste_tasks = Vec::new();
-            let mut disambiguation_range = None;
-            let clip_is_cut = clipboard_entries.is_cut();
-            for clipboard_entry in clipboard_entries.items() {
-                let (new_path, new_disambiguation_range) =
-                    self.create_paste_path(clipboard_entry, self.selected_sub_entry(cx)?, cx)?;
-                let clip_entry_id = clipboard_entry.entry_id;
-                let task = if clipboard_entries.is_cut() {
-                    let task = self.project.update(cx, |project, cx| {
-                        project.rename_entry(clip_entry_id, (worktree_id, new_path).into(), cx)
-                    });
-                    PasteTask::Rename(task)
-                } else {
-                    let task = self.project.update(cx, |project, cx| {
-                        project.copy_entry(clip_entry_id, (worktree_id, new_path).into(), cx)
-                    });
-                    PasteTask::Copy(task)
-                };
-                paste_tasks.push(task);
-                disambiguation_range = new_disambiguation_range.or(disambiguation_range);
-            }
-
-            let item_count = paste_tasks.len();
-
-            cx.spawn_in(window, async move |project_panel, cx| {
-                let mut last_succeed = None;
-                for task in paste_tasks {
-                    match task {
-                        PasteTask::Rename(task) => {
-                            if let Some(CreatedEntry::Included(entry)) =
-                                task.await.notify_async_err(cx)
-                            {
-                                last_succeed = Some(entry);
-                            }
-                        }
-                        PasteTask::Copy(task) => {
-                            if let Some(Some(entry)) = task.await.notify_async_err(cx) {
-                                last_succeed = Some(entry);
-                            }
-                        }
-                    }
-                }
-                // update selection
-                if let Some(entry) = last_succeed {
-                    project_panel
-                        .update_in(cx, |project_panel, window, cx| {
-                            project_panel.state.selection = Some(SelectedEntry {
-                                worktree_id,
-                                entry_id: entry.id,
-                            });
-
-                            if item_count == 1 {
-                                // open entry if not dir, setting is enabled, and only focus if rename is not pending
-                                if !entry.is_dir() {
-                                    let settings = ProjectPanelSettings::get_global(cx);
-                                    if settings.auto_open.should_open_on_paste() {
-                                        project_panel.open_entry(
-                                            entry.id,
-                                            disambiguation_range.is_none(),
-                                            false,
-                                            cx,
-                                        );
-                                    }
-                                }
-
-                                // if only one entry was pasted and it was disambiguated, open the rename editor
-                                if disambiguation_range.is_some() {
-                                    cx.defer_in(window, |this, window, cx| {
-                                        this.rename_impl(disambiguation_range, window, cx);
-                                    });
-                                }
-                            }
-                        })
-                        .ok();
-                }
-
-                anyhow::Ok(())
-            })
-            .detach_and_log_err(cx);
-
-            if clip_is_cut {
-                // Convert the clipboard cut entry to a copy entry after the first paste.
-                self.clipboard = self.clipboard.take().map(ClipboardEntry::into_copy_entry);
-            }
-
-            self.expand_entry(worktree_id, entry.id, cx);
-            Some(())
-        });
-    }
-
-    fn duplicate(&mut self, _: &Duplicate, window: &mut Window, cx: &mut Context<Self>) {
-        self.copy(&Copy {}, window, cx);
-        self.paste(&Paste {}, window, cx);
-    }
-
-    fn copy_path(
-        &mut self,
-        _: &zed_actions::workspace::CopyPath,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let abs_file_paths = {
-            let project = self.project.read(cx);
-            self.effective_entries()
-                .into_iter()
-                .filter_map(|entry| {
-                    let entry_path = project.path_for_entry(entry.entry_id, cx)?.path;
-                    Some(
-                        project
-                            .worktree_for_id(entry.worktree_id, cx)?
-                            .read(cx)
-                            .absolutize(&entry_path)
-                            .to_string_lossy()
-                            .to_string(),
-                    )
-                })
-                .collect::<Vec<_>>()
-        };
-        if !abs_file_paths.is_empty() {
-            cx.write_to_clipboard(ClipboardItem::new_string(abs_file_paths.join("\n")));
-        }
-    }
-
-    fn copy_relative_path(
-        &mut self,
-        _: &zed_actions::workspace::CopyRelativePath,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let path_style = self.project.read(cx).path_style(cx);
-        let file_paths = {
-            let project = self.project.read(cx);
-            self.effective_entries()
-                .into_iter()
-                .filter_map(|entry| {
-                    Some(
-                        project
-                            .path_for_entry(entry.entry_id, cx)?
-                            .path
-                            .display(path_style)
-                            .into_owned(),
-                    )
-                })
-                .collect::<Vec<_>>()
-        };
-        if !file_paths.is_empty() {
-            cx.write_to_clipboard(ClipboardItem::new_string(file_paths.join("\n")));
-        }
-    }
-
-    fn reveal_in_finder(
-        &mut self,
-        _: &RevealInFileManager,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some((worktree, entry)) = self.selected_sub_entry(cx) {
-            cx.reveal_path(&worktree.read(cx).absolutize(&entry.path));
-        }
-    }
-
-    fn remove_from_project(
-        &mut self,
-        _: &RemoveFromProject,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        for entry in self.effective_entries().iter() {
-            let worktree_id = entry.worktree_id;
-            self.project
-                .update(cx, |project, cx| project.remove_worktree(worktree_id, cx));
-        }
-    }
-
-    fn file_abs_paths_to_diff(&self, cx: &Context<Self>) -> Option<(PathBuf, PathBuf)> {
-        let mut selections_abs_path = self
-            .marked_entries
-            .iter()
-            .filter_map(|entry| {
-                let project = self.project.read(cx);
-                let worktree = project.worktree_for_id(entry.worktree_id, cx)?;
-                let entry = worktree.read(cx).entry_for_id(entry.entry_id)?;
-                if !entry.is_file() {
-                    return None;
-                }
-                Some(worktree.read(cx).absolutize(&entry.path))
-            })
-            .rev();
-
-        let last_path = selections_abs_path.next()?;
-        let previous_to_last = selections_abs_path.next()?;
-        Some((previous_to_last, last_path))
-    }
-
-    fn compare_marked_files(
-        &mut self,
-        _: &CompareMarkedFiles,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let selected_files = self.file_abs_paths_to_diff(cx);
-        if let Some((file_path1, file_path2)) = selected_files {
-            self.workspace
-                .update(cx, |workspace, cx| {
-                    FileDiffView::open(file_path1, file_path2, workspace, window, cx)
-                        .detach_and_log_err(cx);
-                })
-                .ok();
-        }
-    }
-
-    fn open_system(&mut self, _: &OpenWithSystem, _: &mut Window, cx: &mut Context<Self>) {
-        if let Some((worktree, entry)) = self.selected_entry(cx) {
-            let abs_path = worktree.absolutize(&entry.path);
-            cx.open_with_system(&abs_path);
-        }
-    }
-
-    fn open_in_terminal(
-        &mut self,
-        _: &OpenInTerminal,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some((worktree, entry)) = self.selected_sub_entry(cx) {
-            let abs_path = match &entry.canonical_path {
-                Some(canonical_path) => canonical_path.to_path_buf(),
-                None => worktree.read(cx).absolutize(&entry.path),
-            };
-
-            let working_directory = if entry.is_dir() {
-                Some(abs_path)
-            } else {
-                abs_path.parent().map(|path| path.to_path_buf())
-            };
-            if let Some(working_directory) = working_directory {
-                window.dispatch_action(
-                    workspace::OpenTerminal { working_directory }.boxed_clone(),
-                    cx,
-                )
-            }
-        }
-    }
-
-    pub fn new_search_in_directory(
-        &mut self,
-        _: &NewSearchInDirectory,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some((worktree, entry)) = self.selected_sub_entry(cx) {
-            let dir_path = if entry.is_dir() {
-                entry.path.clone()
-            } else {
-                // entry is a file, use its parent directory
-                match entry.path.parent() {
-                    Some(parent) => Arc::from(parent),
-                    None => {
-                        // File at root, open search with empty filter
-                        self.workspace
-                            .update(cx, |workspace, cx| {
-                                search::ProjectSearchView::new_search_in_directory(
-                                    workspace,
-                                    RelPath::empty(),
-                                    window,
-                                    cx,
-                                );
-                            })
-                            .ok();
-                        return;
-                    }
-                }
-            };
-
-            let include_root = self.project.read(cx).visible_worktrees(cx).count() > 1;
-            let dir_path = if include_root {
-                worktree.read(cx).root_name().join(&dir_path)
-            } else {
-                dir_path
-            };
-
-            self.workspace
-                .update(cx, |workspace, cx| {
-                    search::ProjectSearchView::new_search_in_directory(
-                        workspace, &dir_path, window, cx,
-                    );
-                })
-                .ok();
-        }
-    }
-
-    fn move_entry(
-        &mut self,
-        entry_to_move: ProjectEntryId,
-        destination: ProjectEntryId,
-        destination_is_file: bool,
-        cx: &mut Context<Self>,
-    ) {
-        if self
-            .project
-            .read(cx)
-            .entry_is_worktree_root(entry_to_move, cx)
-        {
-            self.move_worktree_root(entry_to_move, destination, cx)
-        } else {
-            self.move_worktree_entry(entry_to_move, destination, destination_is_file, cx)
-        }
-    }
-
-    fn move_worktree_root(
-        &mut self,
-        entry_to_move: ProjectEntryId,
-        destination: ProjectEntryId,
-        cx: &mut Context<Self>,
-    ) {
-        self.project.update(cx, |project, cx| {
-            let Some(worktree_to_move) = project.worktree_for_entry(entry_to_move, cx) else {
-                return;
-            };
-            let Some(destination_worktree) = project.worktree_for_entry(destination, cx) else {
-                return;
-            };
-
-            let worktree_id = worktree_to_move.read(cx).id();
-            let destination_id = destination_worktree.read(cx).id();
-
-            project
-                .move_worktree(worktree_id, destination_id, cx)
-                .log_err();
-        });
-    }
-
-    fn move_worktree_entry(
-        &mut self,
-        entry_to_move: ProjectEntryId,
-        destination_entry: ProjectEntryId,
-        destination_is_file: bool,
-        cx: &mut Context<Self>,
-    ) {
-        if entry_to_move == destination_entry {
-            return;
-        }
-
-        let destination_worktree = self.project.update(cx, |project, cx| {
-            let source_path = project.path_for_entry(entry_to_move, cx)?;
-            let destination_path = project.path_for_entry(destination_entry, cx)?;
-            let destination_worktree_id = destination_path.worktree_id;
-
-            let mut destination_path = destination_path.path.as_ref();
-            if destination_is_file {
-                destination_path = destination_path.parent()?;
-            }
-
-            let mut new_path = destination_path.to_rel_path_buf();
-            new_path.push(RelPath::unix(source_path.path.file_name()?).unwrap());
-            if new_path.as_rel_path() != source_path.path.as_ref() {
-                let task = project.rename_entry(
-                    entry_to_move,
-                    (destination_worktree_id, new_path).into(),
-                    cx,
-                );
-                cx.foreground_executor().spawn(task).detach_and_log_err(cx);
-            }
-
-            project.worktree_id_for_entry(destination_entry, cx)
-        });
-
-        if let Some(destination_worktree) = destination_worktree {
-            self.expand_entry(destination_worktree, destination_entry, cx);
-        }
-    }
-
-    fn index_for_selection(&self, selection: SelectedEntry) -> Option<(usize, usize, usize)> {
-        self.index_for_entry(selection.entry_id, selection.worktree_id)
-    }
-
-    fn disjoint_entries(&self, cx: &App) -> BTreeSet<SelectedEntry> {
-        let marked_entries = self.effective_entries();
-        let mut sanitized_entries = BTreeSet::new();
-        if marked_entries.is_empty() {
-            return sanitized_entries;
-        }
-
-        let project = self.project.read(cx);
-        let marked_entries_by_worktree: HashMap<WorktreeId, Vec<SelectedEntry>> = marked_entries
-            .into_iter()
-            .filter(|entry| !project.entry_is_worktree_root(entry.entry_id, cx))
-            .fold(HashMap::default(), |mut map, entry| {
-                map.entry(entry.worktree_id).or_default().push(entry);
-                map
-            });
-
-        for (worktree_id, marked_entries) in marked_entries_by_worktree {
-            if let Some(worktree) = project.worktree_for_id(worktree_id, cx) {
-                let worktree = worktree.read(cx);
-                let marked_dir_paths = marked_entries
-                    .iter()
-                    .filter_map(|entry| {
-                        worktree.entry_for_id(entry.entry_id).and_then(|entry| {
-                            if entry.is_dir() {
-                                Some(entry.path.as_ref())
-                            } else {
-                                None
-                            }
-                        })
-                    })
-                    .collect::<BTreeSet<_>>();
-
-                sanitized_entries.extend(marked_entries.into_iter().filter(|entry| {
-                    let Some(entry_info) = worktree.entry_for_id(entry.entry_id) else {
-                        return false;
-                    };
-                    let entry_path = entry_info.path.as_ref();
-                    let inside_marked_dir = marked_dir_paths.iter().any(|&marked_dir_path| {
-                        entry_path != marked_dir_path && entry_path.starts_with(marked_dir_path)
-                    });
-                    !inside_marked_dir
-                }));
-            }
-        }
-
-        sanitized_entries
-    }
-
-    fn effective_entries(&self) -> BTreeSet<SelectedEntry> {
-        if let Some(selection) = self.state.selection {
-            let selection = SelectedEntry {
-                entry_id: self.resolve_entry(selection.entry_id),
-                worktree_id: selection.worktree_id,
-            };
-
-            // Default to using just the selected item when nothing is marked.
-            if self.marked_entries.is_empty() {
-                return BTreeSet::from([selection]);
-            }
-
-            // Allow operating on the selected item even when something else is marked,
-            // making it easier to perform one-off actions without clearing a mark.
-            if self.marked_entries.len() == 1 && !self.marked_entries.contains(&selection) {
-                return BTreeSet::from([selection]);
-            }
-        }
-
-        // Return only marked entries since we've already handled special cases where
-        // only selection should take precedence. At this point, marked entries may or
-        // may not include the current selection, which is intentional.
-        self.marked_entries
-            .iter()
-            .map(|entry| SelectedEntry {
-                entry_id: self.resolve_entry(entry.entry_id),
-                worktree_id: entry.worktree_id,
-            })
-            .collect::<BTreeSet<_>>()
-    }
-
-    /// Finds the currently selected subentry for a given leaf entry id. If a given entry
-    /// has no ancestors, the project entry ID that's passed in is returned as-is.
-    fn resolve_entry(&self, id: ProjectEntryId) -> ProjectEntryId {
-        self.state
-            .ancestors
-            .get(&id)
-            .and_then(|ancestors| ancestors.active_ancestor())
-            .unwrap_or(id)
-    }
-
-    pub fn selected_entry<'a>(&self, cx: &'a App) -> Option<(&'a Worktree, &'a project::Entry)> {
-        let (worktree, entry) = self.selected_entry_handle(cx)?;
-        Some((worktree.read(cx), entry))
-    }
-
-    /// Compared to selected_entry, this function resolves to the currently
-    /// selected subentry if dir auto-folding is enabled.
-    fn selected_sub_entry<'a>(
-        &self,
-        cx: &'a App,
-    ) -> Option<(Entity<Worktree>, &'a project::Entry)> {
-        let (worktree, mut entry) = self.selected_entry_handle(cx)?;
-
-        let resolved_id = self.resolve_entry(entry.id);
-        if resolved_id != entry.id {
-            let worktree = worktree.read(cx);
-            entry = worktree.entry_for_id(resolved_id)?;
-        }
-        Some((worktree, entry))
-    }
-    fn selected_entry_handle<'a>(
-        &self,
-        cx: &'a App,
-    ) -> Option<(Entity<Worktree>, &'a project::Entry)> {
-        let selection = self.state.selection?;
-        let project = self.project.read(cx);
-        let worktree = project.worktree_for_id(selection.worktree_id, cx)?;
-        let entry = worktree.read(cx).entry_for_id(selection.entry_id)?;
-        Some((worktree, entry))
-    }
-
-    fn expand_to_selection(&mut self, cx: &mut Context<Self>) -> Option<()> {
-        let (worktree, entry) = self.selected_entry(cx)?;
-        let expanded_dir_ids = self
-            .state
-            .expanded_dir_ids
-            .entry(worktree.id())
-            .or_default();
-
-        for path in entry.path.ancestors() {
-            let Some(entry) = worktree.entry_for_path(path) else {
-                continue;
-            };
-            if entry.is_dir()
-                && let Err(idx) = expanded_dir_ids.binary_search(&entry.id)
-            {
-                expanded_dir_ids.insert(idx, entry.id);
-            }
-        }
-
-        Some(())
-    }
-
-    fn create_new_git_entry(
-        parent_entry: &Entry,
-        git_summary: GitSummary,
-        new_entry_kind: EntryKind,
-    ) -> GitEntry {
-        GitEntry {
-            entry: Entry {
-                id: NEW_ENTRY_ID,
-                kind: new_entry_kind,
-                path: parent_entry.path.join(RelPath::unix("\0").unwrap()),
-                inode: 0,
-                mtime: parent_entry.mtime,
-                size: parent_entry.size,
-                is_ignored: parent_entry.is_ignored,
-                is_hidden: parent_entry.is_hidden,
-                is_external: false,
-                is_private: false,
-                is_always_included: parent_entry.is_always_included,
-                canonical_path: parent_entry.canonical_path.clone(),
-                char_bag: parent_entry.char_bag,
-                is_fifo: parent_entry.is_fifo,
-            },
-            git_summary,
-        }
-    }
-
-    fn update_visible_entries(
-        &mut self,
-        new_selected_entry: Option<(WorktreeId, ProjectEntryId)>,
-        focus_filename_editor: bool,
-        autoscroll: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let now = Instant::now();
-        let settings = ProjectPanelSettings::get_global(cx);
-        let auto_collapse_dirs = settings.auto_fold_dirs;
-        let hide_gitignore = settings.hide_gitignore;
-        let sort_mode = settings.sort_mode;
-        let project = self.project.read(cx);
-        let repo_snapshots = project.git_store().read(cx).repo_snapshots(cx);
-
-        let old_ancestors = self.state.ancestors.clone();
-        let mut new_state = State::derive(&self.state);
-        new_state.last_worktree_root_id = project
-            .visible_worktrees(cx)
-            .next_back()
-            .and_then(|worktree| worktree.read(cx).root_entry())
-            .map(|entry| entry.id);
-        let mut max_width_item = None;
-
-        let visible_worktrees: Vec<_> = project
-            .visible_worktrees(cx)
-            .map(|worktree| worktree.read(cx).snapshot())
-            .collect();
-        let hide_root = settings.hide_root && visible_worktrees.len() == 1;
-        let hide_hidden = settings.hide_hidden;
-
-        let visible_entries_task = cx.spawn_in(window, async move |this, cx| {
-            let new_state = cx
-                .background_spawn(async move {
-                    for worktree_snapshot in visible_worktrees {
-                        let worktree_id = worktree_snapshot.id();
-
-                        let expanded_dir_ids = match new_state.expanded_dir_ids.entry(worktree_id) {
-                            hash_map::Entry::Occupied(e) => e.into_mut(),
-                            hash_map::Entry::Vacant(e) => {
-                                // The first time a worktree's root entry becomes available,
-                                // mark that root entry as expanded.
-                                if let Some(entry) = worktree_snapshot.root_entry() {
-                                    e.insert(vec![entry.id]).as_slice()
-                                } else {
-                                    &[]
-                                }
-                            }
-                        };
-
-                        let mut new_entry_parent_id = None;
-                        let mut new_entry_kind = EntryKind::Dir;
-                        if let Some(edit_state) = &new_state.edit_state
-                            && edit_state.worktree_id == worktree_id
-                            && edit_state.is_new_entry()
-                        {
-                            new_entry_parent_id = Some(edit_state.entry_id);
-                            new_entry_kind = if edit_state.is_dir {
-                                EntryKind::Dir
-                            } else {
-                                EntryKind::File
-                            };
-                        }
-
-                        let mut visible_worktree_entries = Vec::new();
-                        let mut entry_iter =
-                            GitTraversal::new(&repo_snapshots, worktree_snapshot.entries(true, 0));
-                        let mut auto_folded_ancestors = vec![];
-                        let worktree_abs_path = worktree_snapshot.abs_path();
-                        while let Some(entry) = entry_iter.entry() {
-                            if hide_root && Some(entry.entry) == worktree_snapshot.root_entry() {
-                                if new_entry_parent_id == Some(entry.id) {
-                                    visible_worktree_entries.push(Self::create_new_git_entry(
-                                        entry.entry,
-                                        entry.git_summary,
-                                        new_entry_kind,
-                                    ));
-                                    new_entry_parent_id = None;
-                                }
-                                entry_iter.advance();
-                                continue;
-                            }
-                            if auto_collapse_dirs && entry.kind.is_dir() {
-                                auto_folded_ancestors.push(entry.id);
-                                if !new_state.unfolded_dir_ids.contains(&entry.id)
-                                    && let Some(root_path) = worktree_snapshot.root_entry()
-                                {
-                                    let mut child_entries =
-                                        worktree_snapshot.child_entries(&entry.path);
-                                    if let Some(child) = child_entries.next()
-                                        && entry.path != root_path.path
-                                        && child_entries.next().is_none()
-                                        && child.kind.is_dir()
-                                    {
-                                        entry_iter.advance();
-
-                                        continue;
-                                    }
-                                }
-                                let depth = old_ancestors
-                                    .get(&entry.id)
-                                    .map(|ancestor| ancestor.current_ancestor_depth)
-                                    .unwrap_or_default()
-                                    .min(auto_folded_ancestors.len());
-                                if let Some(edit_state) = &mut new_state.edit_state
-                                    && edit_state.entry_id == entry.id
-                                {
-                                    edit_state.depth = depth;
-                                }
-                                let mut ancestors = std::mem::take(&mut auto_folded_ancestors);
-                                if ancestors.len() > 1 {
-                                    ancestors.reverse();
-                                    new_state.ancestors.insert(
-                                        entry.id,
-                                        FoldedAncestors {
-                                            current_ancestor_depth: depth,
-                                            ancestors,
-                                        },
-                                    );
-                                }
-                            }
-                            auto_folded_ancestors.clear();
-                            if (!hide_gitignore || !entry.is_ignored)
-                                && (!hide_hidden || !entry.is_hidden)
-                            {
-                                visible_worktree_entries.push(entry.to_owned());
-                            }
-                            let precedes_new_entry = if let Some(new_entry_id) = new_entry_parent_id
-                            {
-                                entry.id == new_entry_id || {
-                                    new_state.ancestors.get(&entry.id).is_some_and(|entries| {
-                                        entries.ancestors.contains(&new_entry_id)
-                                    })
-                                }
-                            } else {
-                                false
-                            };
-                            if precedes_new_entry
-                                && (!hide_gitignore || !entry.is_ignored)
-                                && (!hide_hidden || !entry.is_hidden)
-                            {
-                                visible_worktree_entries.push(Self::create_new_git_entry(
-                                    entry.entry,
-                                    entry.git_summary,
-                                    new_entry_kind,
-                                ));
-                            }
-
-                            let (depth, chars) = if Some(entry.entry)
-                                == worktree_snapshot.root_entry()
-                            {
-                                let Some(path_name) = worktree_abs_path.file_name() else {
-                                    continue;
-                                };
-                                let depth = 0;
-                                (depth, path_name.to_string_lossy().chars().count())
-                            } else if entry.is_file() {
-                                let Some(path_name) = entry
-                                    .path
-                                    .file_name()
-                                    .with_context(|| {
-                                        format!("Non-root entry has no file name: {entry:?}")
-                                    })
-                                    .log_err()
-                                else {
-                                    continue;
-                                };
-                                let depth = entry.path.ancestors().count() - 1;
-                                (depth, path_name.chars().count())
-                            } else {
-                                let path = new_state
-                                    .ancestors
-                                    .get(&entry.id)
-                                    .and_then(|ancestors| {
-                                        let outermost_ancestor = ancestors.ancestors.last()?;
-                                        let root_folded_entry = worktree_snapshot
-                                            .entry_for_id(*outermost_ancestor)?
-                                            .path
-                                            .as_ref();
-                                        entry.path.strip_prefix(root_folded_entry).ok().and_then(
-                                            |suffix| {
-                                                Some(
-                                                    RelPath::unix(root_folded_entry.file_name()?)
-                                                        .unwrap()
-                                                        .join(suffix),
-                                                )
-                                            },
-                                        )
-                                    })
-                                    .or_else(|| {
-                                        entry.path.file_name().map(|file_name| {
-                                            RelPath::unix(file_name).unwrap().into()
-                                        })
-                                    })
-                                    .unwrap_or_else(|| entry.path.clone());
-                                let depth = path.components().count();
-                                (depth, path.as_unix_str().chars().count())
-                            };
-                            let width_estimate =
-                                item_width_estimate(depth, chars, entry.canonical_path.is_some());
-
-                            match max_width_item.as_mut() {
-                                Some((id, worktree_id, width)) => {
-                                    if *width < width_estimate {
-                                        *id = entry.id;
-                                        *worktree_id = worktree_snapshot.id();
-                                        *width = width_estimate;
-                                    }
-                                }
-                                None => {
-                                    max_width_item =
-                                        Some((entry.id, worktree_snapshot.id(), width_estimate))
-                                }
-                            }
-
-                            if expanded_dir_ids.binary_search(&entry.id).is_err()
-                                && entry_iter.advance_to_sibling()
-                            {
-                                continue;
-                            }
-                            entry_iter.advance();
-                        }
-
-                        par_sort_worktree_entries_with_mode(
-                            &mut visible_worktree_entries,
-                            sort_mode,
-                        );
-                        new_state.visible_entries.push(VisibleEntriesForWorktree {
-                            worktree_id,
-                            entries: visible_worktree_entries,
-                            index: OnceCell::new(),
-                        })
-                    }
-                    if let Some((project_entry_id, worktree_id, _)) = max_width_item {
-                        let mut visited_worktrees_length = 0;
-                        let index = new_state
-                            .visible_entries
-                            .iter()
-                            .find_map(|visible_entries| {
-                                if worktree_id == visible_entries.worktree_id {
-                                    visible_entries
-                                        .entries
-                                        .iter()
-                                        .position(|entry| entry.id == project_entry_id)
-                                } else {
-                                    visited_worktrees_length += visible_entries.entries.len();
-                                    None
-                                }
-                            });
-                        if let Some(index) = index {
-                            new_state.max_width_item_index = Some(visited_worktrees_length + index);
-                        }
-                    }
-                    new_state
-                })
-                .await;
-            this.update_in(cx, |this, window, cx| {
-                let current_selection = this.state.selection;
-                this.state = new_state;
-                if let Some((worktree_id, entry_id)) = new_selected_entry {
-                    this.state.selection = Some(SelectedEntry {
-                        worktree_id,
-                        entry_id,
-                    });
-                } else {
-                    this.state.selection = current_selection;
-                }
-                let elapsed = now.elapsed();
-                if this.last_reported_update.elapsed() > Duration::from_secs(3600) {
-                    telemetry::event!(
-                        "Project Panel Updated",
-                        elapsed_ms = elapsed.as_millis() as u64,
-                        worktree_entries = this
-                            .state
-                            .visible_entries
-                            .iter()
-                            .map(|worktree| worktree.entries.len())
-                            .sum::<usize>(),
-                    )
-                }
-                if this.update_visible_entries_task.focus_filename_editor {
-                    this.update_visible_entries_task.focus_filename_editor = false;
-                    this.filename_editor.update(cx, |editor, cx| {
-                        window.focus(&editor.focus_handle(cx));
-                    });
-                }
-                if this.update_visible_entries_task.autoscroll {
-                    this.update_visible_entries_task.autoscroll = false;
-                    this.autoscroll(cx);
-                }
-                cx.notify();
-            })
-            .ok();
-        });
-
-        self.update_visible_entries_task = UpdateVisibleEntriesTask {
-            _visible_entries_task: visible_entries_task,
-            focus_filename_editor: focus_filename_editor
-                || self.update_visible_entries_task.focus_filename_editor,
-            autoscroll: autoscroll || self.update_visible_entries_task.autoscroll,
-        };
-    }
-
-    fn expand_entry(
-        &mut self,
-        worktree_id: WorktreeId,
-        entry_id: ProjectEntryId,
-        cx: &mut Context<Self>,
-    ) {
-        self.project.update(cx, |project, cx| {
-            if let Some((worktree, expanded_dir_ids)) = project
-                .worktree_for_id(worktree_id, cx)
-                .zip(self.state.expanded_dir_ids.get_mut(&worktree_id))
-            {
-                project.expand_entry(worktree_id, entry_id, cx);
-                let worktree = worktree.read(cx);
-
-                if let Some(mut entry) = worktree.entry_for_id(entry_id) {
-                    loop {
-                        if let Err(ix) = expanded_dir_ids.binary_search(&entry.id) {
-                            expanded_dir_ids.insert(ix, entry.id);
-                        }
-
-                        if let Some(parent_entry) =
-                            entry.path.parent().and_then(|p| worktree.entry_for_path(p))
-                        {
-                            entry = parent_entry;
-                        } else {
-                            break;
-                        }
-                    }
-                }
-            }
-        });
-    }
-
-    fn drop_external_files(
-        &mut self,
-        paths: &[PathBuf],
-        entry_id: ProjectEntryId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let mut paths: Vec<Arc<Path>> = paths.iter().map(|path| Arc::from(path.clone())).collect();
-
-        let open_file_after_drop = paths.len() == 1 && paths[0].is_file();
-
-        let Some((target_directory, worktree, fs)) = maybe!({
-            let project = self.project.read(cx);
-            let fs = project.fs().clone();
-            let worktree = project.worktree_for_entry(entry_id, cx)?;
-            let entry = worktree.read(cx).entry_for_id(entry_id)?;
-            let path = entry.path.clone();
-            let target_directory = if entry.is_dir() {
-                path
-            } else {
-                path.parent()?.into()
-            };
-            Some((target_directory, worktree, fs))
-        }) else {
-            return;
-        };
-
-        let mut paths_to_replace = Vec::new();
-        for path in &paths {
-            if let Some(name) = path.file_name()
-                && let Some(name) = name.to_str()
-            {
-                let target_path = target_directory.join(RelPath::unix(name).unwrap());
-                if worktree.read(cx).entry_for_path(&target_path).is_some() {
-                    paths_to_replace.push((name.to_string(), path.clone()));
-                }
-            }
-        }
-
-        cx.spawn_in(window, async move |this, cx| {
-            async move {
-                for (filename, original_path) in &paths_to_replace {
-                    let prompt_message = format!(
-                        concat!(
-                            "A file or folder with name {} ",
-                            "already exists in the destination folder. ",
-                            "Do you want to replace it?"
-                        ),
-                        filename
-                    );
-                    let answer = cx
-                        .update(|window, cx| {
-                            window.prompt(
-                                PromptLevel::Info,
-                                &prompt_message,
-                                None,
-                                &["Replace", "Cancel"],
-                                cx,
-                            )
-                        })?
-                        .await?;
-
-                    if answer == 1
-                        && let Some(item_idx) = paths.iter().position(|p| p == original_path)
-                    {
-                        paths.remove(item_idx);
-                    }
-                }
-
-                if paths.is_empty() {
-                    return Ok(());
-                }
-
-                let task = worktree.update(cx, |worktree, cx| {
-                    worktree.copy_external_entries(target_directory, paths, fs, cx)
-                })?;
-
-                let opened_entries = task
-                    .await
-                    .with_context(|| "failed to copy external paths")?;
-                this.update(cx, |this, cx| {
-                    if open_file_after_drop && !opened_entries.is_empty() {
-                        let settings = ProjectPanelSettings::get_global(cx);
-                        if settings.auto_open.should_open_on_drop() {
-                            this.open_entry(opened_entries[0], true, false, cx);
-                        }
-                    }
-                })
-            }
-            .log_err()
-            .await
-        })
-        .detach();
-    }
-
-    fn refresh_drag_cursor_style(
-        &self,
-        modifiers: &Modifiers,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(existing_cursor) = cx.active_drag_cursor_style() {
-            let new_cursor = if Self::is_copy_modifier_set(modifiers) {
-                CursorStyle::DragCopy
-            } else {
-                CursorStyle::PointingHand
-            };
-            if existing_cursor != new_cursor {
-                cx.set_active_drag_cursor_style(new_cursor, window);
-            }
-        }
-    }
-
-    fn is_copy_modifier_set(modifiers: &Modifiers) -> bool {
-        cfg!(target_os = "macos") && modifiers.alt
-            || cfg!(not(target_os = "macos")) && modifiers.control
-    }
-
-    fn drag_onto(
-        &mut self,
-        selections: &DraggedSelection,
-        target_entry_id: ProjectEntryId,
-        is_file: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if Self::is_copy_modifier_set(&window.modifiers()) {
-            let _ = maybe!({
-                let project = self.project.read(cx);
-                let target_worktree = project.worktree_for_entry(target_entry_id, cx)?;
-                let worktree_id = target_worktree.read(cx).id();
-                let target_entry = target_worktree
-                    .read(cx)
-                    .entry_for_id(target_entry_id)?
-                    .clone();
-
-                let mut copy_tasks = Vec::new();
-                let mut disambiguation_range = None;
-                for selection in selections.items() {
-                    let (new_path, new_disambiguation_range) = self.create_paste_path(
-                        selection,
-                        (target_worktree.clone(), &target_entry),
-                        cx,
-                    )?;
-
-                    let task = self.project.update(cx, |project, cx| {
-                        project.copy_entry(selection.entry_id, (worktree_id, new_path).into(), cx)
-                    });
-                    copy_tasks.push(task);
-                    disambiguation_range = new_disambiguation_range.or(disambiguation_range);
-                }
-
-                let item_count = copy_tasks.len();
-
-                cx.spawn_in(window, async move |project_panel, cx| {
-                    let mut last_succeed = None;
-                    for task in copy_tasks.into_iter() {
-                        if let Some(Some(entry)) = task.await.log_err() {
-                            last_succeed = Some(entry.id);
-                        }
-                    }
-                    // update selection
-                    if let Some(entry_id) = last_succeed {
-                        project_panel
-                            .update_in(cx, |project_panel, window, cx| {
-                                project_panel.state.selection = Some(SelectedEntry {
-                                    worktree_id,
-                                    entry_id,
-                                });
-
-                                // if only one entry was dragged and it was disambiguated, open the rename editor
-                                if item_count == 1 && disambiguation_range.is_some() {
-                                    project_panel.rename_impl(disambiguation_range, window, cx);
-                                }
-                            })
-                            .ok();
-                    }
-                })
-                .detach();
-                Some(())
-            });
-        } else {
-            for selection in selections.items() {
-                self.move_entry(selection.entry_id, target_entry_id, is_file, cx);
-            }
-        }
-    }
-
-    fn index_for_entry(
-        &self,
-        entry_id: ProjectEntryId,
-        worktree_id: WorktreeId,
-    ) -> Option<(usize, usize, usize)> {
-        let mut total_ix = 0;
-        for (worktree_ix, visible) in self.state.visible_entries.iter().enumerate() {
-            if worktree_id != visible.worktree_id {
-                total_ix += visible.entries.len();
-                continue;
-            }
-
-            return visible
-                .entries
-                .iter()
-                .enumerate()
-                .find(|(_, entry)| entry.id == entry_id)
-                .map(|(ix, _)| (worktree_ix, ix, total_ix + ix));
-        }
-        None
-    }
-
-    fn entry_at_index(&self, index: usize) -> Option<(WorktreeId, GitEntryRef<'_>)> {
-        let mut offset = 0;
-        for worktree in &self.state.visible_entries {
-            let current_len = worktree.entries.len();
-            if index < offset + current_len {
-                return worktree
-                    .entries
-                    .get(index - offset)
-                    .map(|entry| (worktree.worktree_id, entry.to_ref()));
-            }
-            offset += current_len;
-        }
-        None
-    }
-
-    fn iter_visible_entries(
-        &self,
-        range: Range<usize>,
-        window: &mut Window,
-        cx: &mut Context<ProjectPanel>,
-        mut callback: impl FnMut(
-            &Entry,
-            usize,
-            &HashSet<Arc<RelPath>>,
-            &mut Window,
-            &mut Context<ProjectPanel>,
-        ),
-    ) {
-        let mut ix = 0;
-        for visible in &self.state.visible_entries {
-            if ix >= range.end {
-                return;
-            }
-
-            if ix + visible.entries.len() <= range.start {
-                ix += visible.entries.len();
-                continue;
-            }
-
-            let end_ix = range.end.min(ix + visible.entries.len());
-            let entry_range = range.start.saturating_sub(ix)..end_ix - ix;
-            let entries = visible
-                .index
-                .get_or_init(|| visible.entries.iter().map(|e| e.path.clone()).collect());
-            let base_index = ix + entry_range.start;
-            for (i, entry) in visible.entries[entry_range].iter().enumerate() {
-                let global_index = base_index + i;
-                callback(entry, global_index, entries, window, cx);
-            }
-            ix = end_ix;
-        }
-    }
-
-    fn for_each_visible_entry(
-        &self,
-        range: Range<usize>,
-        window: &mut Window,
-        cx: &mut Context<ProjectPanel>,
-        mut callback: impl FnMut(ProjectEntryId, EntryDetails, &mut Window, &mut Context<ProjectPanel>),
-    ) {
-        let mut ix = 0;
-        for visible in &self.state.visible_entries {
-            if ix >= range.end {
-                return;
-            }
-
-            if ix + visible.entries.len() <= range.start {
-                ix += visible.entries.len();
-                continue;
-            }
-
-            let end_ix = range.end.min(ix + visible.entries.len());
-            let git_status_setting = {
-                let settings = ProjectPanelSettings::get_global(cx);
-                settings.git_status
-            };
-            if let Some(worktree) = self
-                .project
-                .read(cx)
-                .worktree_for_id(visible.worktree_id, cx)
-            {
-                let snapshot = worktree.read(cx).snapshot();
-                let root_name = snapshot.root_name();
-
-                let entry_range = range.start.saturating_sub(ix)..end_ix - ix;
-                let entries = visible
-                    .index
-                    .get_or_init(|| visible.entries.iter().map(|e| e.path.clone()).collect());
-                for entry in visible.entries[entry_range].iter() {
-                    let status = git_status_setting
-                        .then_some(entry.git_summary)
-                        .unwrap_or_default();
-
-                    let mut details = self.details_for_entry(
-                        entry,
-                        visible.worktree_id,
-                        root_name,
-                        entries,
-                        status,
-                        None,
-                        window,
-                        cx,
-                    );
-
-                    if let Some(edit_state) = &self.state.edit_state {
-                        let is_edited_entry = if edit_state.is_new_entry() {
-                            entry.id == NEW_ENTRY_ID
-                        } else {
-                            entry.id == edit_state.entry_id
-                                || self.state.ancestors.get(&entry.id).is_some_and(
-                                    |auto_folded_dirs| {
-                                        auto_folded_dirs.ancestors.contains(&edit_state.entry_id)
-                                    },
-                                )
-                        };
-
-                        if is_edited_entry {
-                            if let Some(processing_filename) = &edit_state.processing_filename {
-                                details.is_processing = true;
-                                if let Some(ancestors) = edit_state
-                                    .leaf_entry_id
-                                    .and_then(|entry| self.state.ancestors.get(&entry))
-                                {
-                                    let position = ancestors.ancestors.iter().position(|entry_id| *entry_id == edit_state.entry_id).expect("Edited sub-entry should be an ancestor of selected leaf entry") + 1;
-                                    let all_components = ancestors.ancestors.len();
-
-                                    let prefix_components = all_components - position;
-                                    let suffix_components = position.checked_sub(1);
-                                    let mut previous_components =
-                                        Path::new(&details.filename).components();
-                                    let mut new_path = previous_components
-                                        .by_ref()
-                                        .take(prefix_components)
-                                        .collect::<PathBuf>();
-                                    if let Some(last_component) =
-                                        processing_filename.components().next_back()
-                                    {
-                                        new_path.push(last_component);
-                                        previous_components.next();
-                                    }
-
-                                    if suffix_components.is_some() {
-                                        new_path.push(previous_components);
-                                    }
-                                    if let Some(str) = new_path.to_str() {
-                                        details.filename.clear();
-                                        details.filename.push_str(str);
-                                    }
-                                } else {
-                                    details.filename.clear();
-                                    details.filename.push_str(processing_filename.as_unix_str());
-                                }
-                            } else {
-                                if edit_state.is_new_entry() {
-                                    details.filename.clear();
-                                }
-                                details.is_editing = true;
-                            }
-                        }
-                    }
-
-                    callback(entry.id, details, window, cx);
-                }
-            }
-            ix = end_ix;
-        }
-    }
-
-    fn find_entry_in_worktree(
-        &self,
-        worktree_id: WorktreeId,
-        reverse_search: bool,
-        only_visible_entries: bool,
-        predicate: impl Fn(GitEntryRef, WorktreeId) -> bool,
-        cx: &mut Context<Self>,
-    ) -> Option<GitEntry> {
-        if only_visible_entries {
-            let entries = self
-                .state
-                .visible_entries
-                .iter()
-                .find_map(|visible| {
-                    if worktree_id == visible.worktree_id {
-                        Some(&visible.entries)
-                    } else {
-                        None
-                    }
-                })?
-                .clone();
-
-            return utils::ReversibleIterable::new(entries.iter(), reverse_search)
-                .find(|ele| predicate(ele.to_ref(), worktree_id))
-                .cloned();
-        }
-
-        let repo_snapshots = self
-            .project
-            .read(cx)
-            .git_store()
-            .read(cx)
-            .repo_snapshots(cx);
-        let worktree = self.project.read(cx).worktree_for_id(worktree_id, cx)?;
-        worktree.read_with(cx, |tree, _| {
-            utils::ReversibleIterable::new(
-                GitTraversal::new(&repo_snapshots, tree.entries(true, 0usize)),
-                reverse_search,
-            )
-            .find_single_ended(|ele| predicate(*ele, worktree_id))
-            .map(|ele| ele.to_owned())
-        })
-    }
-
-    fn find_entry(
-        &self,
-        start: Option<&SelectedEntry>,
-        reverse_search: bool,
-        predicate: impl Fn(GitEntryRef, WorktreeId) -> bool,
-        cx: &mut Context<Self>,
-    ) -> Option<SelectedEntry> {
-        let mut worktree_ids: Vec<_> = self
-            .state
-            .visible_entries
-            .iter()
-            .map(|worktree| worktree.worktree_id)
-            .collect();
-        let repo_snapshots = self
-            .project
-            .read(cx)
-            .git_store()
-            .read(cx)
-            .repo_snapshots(cx);
-
-        let mut last_found: Option<SelectedEntry> = None;
-
-        if let Some(start) = start {
-            let worktree = self
-                .project
-                .read(cx)
-                .worktree_for_id(start.worktree_id, cx)?
-                .read(cx);
-
-            let search = {
-                let entry = worktree.entry_for_id(start.entry_id)?;
-                let root_entry = worktree.root_entry()?;
-                let tree_id = worktree.id();
-
-                let mut first_iter = GitTraversal::new(
-                    &repo_snapshots,
-                    worktree.traverse_from_path(true, true, true, entry.path.as_ref()),
-                );
-
-                if reverse_search {
-                    first_iter.next();
-                }
-
-                let first = first_iter
-                    .enumerate()
-                    .take_until(|(count, entry)| entry.entry == root_entry && *count != 0usize)
-                    .map(|(_, entry)| entry)
-                    .find(|ele| predicate(*ele, tree_id))
-                    .map(|ele| ele.to_owned());
-
-                let second_iter =
-                    GitTraversal::new(&repo_snapshots, worktree.entries(true, 0usize));
-
-                let second = if reverse_search {
-                    second_iter
-                        .take_until(|ele| ele.id == start.entry_id)
-                        .filter(|ele| predicate(*ele, tree_id))
-                        .last()
-                        .map(|ele| ele.to_owned())
-                } else {
-                    second_iter
-                        .take_while(|ele| ele.id != start.entry_id)
-                        .filter(|ele| predicate(*ele, tree_id))
-                        .last()
-                        .map(|ele| ele.to_owned())
-                };
-
-                if reverse_search {
-                    Some((second, first))
-                } else {
-                    Some((first, second))
-                }
-            };
-
-            if let Some((first, second)) = search {
-                let first = first.map(|entry| SelectedEntry {
-                    worktree_id: start.worktree_id,
-                    entry_id: entry.id,
-                });
-
-                let second = second.map(|entry| SelectedEntry {
-                    worktree_id: start.worktree_id,
-                    entry_id: entry.id,
-                });
-
-                if first.is_some() {
-                    return first;
-                }
-                last_found = second;
-
-                let idx = worktree_ids
-                    .iter()
-                    .enumerate()
-                    .find(|(_, ele)| **ele == start.worktree_id)
-                    .map(|(idx, _)| idx);
-
-                if let Some(idx) = idx {
-                    worktree_ids.rotate_left(idx + 1usize);
-                    worktree_ids.pop();
-                }
-            }
-        }
-
-        for tree_id in worktree_ids.into_iter() {
-            if let Some(found) =
-                self.find_entry_in_worktree(tree_id, reverse_search, false, &predicate, cx)
-            {
-                return Some(SelectedEntry {
-                    worktree_id: tree_id,
-                    entry_id: found.id,
-                });
-            }
-        }
-
-        last_found
-    }
-
-    fn find_visible_entry(
-        &self,
-        start: Option<&SelectedEntry>,
-        reverse_search: bool,
-        predicate: impl Fn(GitEntryRef, WorktreeId) -> bool,
-        cx: &mut Context<Self>,
-    ) -> Option<SelectedEntry> {
-        let mut worktree_ids: Vec<_> = self
-            .state
-            .visible_entries
-            .iter()
-            .map(|worktree| worktree.worktree_id)
-            .collect();
-
-        let mut last_found: Option<SelectedEntry> = None;
-
-        if let Some(start) = start {
-            let entries = self
-                .state
-                .visible_entries
-                .iter()
-                .find(|worktree| worktree.worktree_id == start.worktree_id)
-                .map(|worktree| &worktree.entries)?;
-
-            let mut start_idx = entries
-                .iter()
-                .enumerate()
-                .find(|(_, ele)| ele.id == start.entry_id)
-                .map(|(idx, _)| idx)?;
-
-            if reverse_search {
-                start_idx = start_idx.saturating_add(1usize);
-            }
-
-            let (left, right) = entries.split_at_checked(start_idx)?;
-
-            let (first_iter, second_iter) = if reverse_search {
-                (
-                    utils::ReversibleIterable::new(left.iter(), reverse_search),
-                    utils::ReversibleIterable::new(right.iter(), reverse_search),
-                )
-            } else {
-                (
-                    utils::ReversibleIterable::new(right.iter(), reverse_search),
-                    utils::ReversibleIterable::new(left.iter(), reverse_search),
-                )
-            };
-
-            let first_search = first_iter.find(|ele| predicate(ele.to_ref(), start.worktree_id));
-            let second_search = second_iter.find(|ele| predicate(ele.to_ref(), start.worktree_id));
-
-            if first_search.is_some() {
-                return first_search.map(|entry| SelectedEntry {
-                    worktree_id: start.worktree_id,
-                    entry_id: entry.id,
-                });
-            }
-
-            last_found = second_search.map(|entry| SelectedEntry {
-                worktree_id: start.worktree_id,
-                entry_id: entry.id,
-            });
-
-            let idx = worktree_ids
-                .iter()
-                .enumerate()
-                .find(|(_, ele)| **ele == start.worktree_id)
-                .map(|(idx, _)| idx);
-
-            if let Some(idx) = idx {
-                worktree_ids.rotate_left(idx + 1usize);
-                worktree_ids.pop();
-            }
-        }
-
-        for tree_id in worktree_ids.into_iter() {
-            if let Some(found) =
-                self.find_entry_in_worktree(tree_id, reverse_search, true, &predicate, cx)
-            {
-                return Some(SelectedEntry {
-                    worktree_id: tree_id,
-                    entry_id: found.id,
-                });
-            }
-        }
-
-        last_found
-    }
-
-    fn calculate_depth_and_difference(
-        entry: &Entry,
-        visible_worktree_entries: &HashSet<Arc<RelPath>>,
-    ) -> (usize, usize) {
-        let (depth, difference) = entry
-            .path
-            .ancestors()
-            .skip(1) // Skip the entry itself
-            .find_map(|ancestor| {
-                if let Some(parent_entry) = visible_worktree_entries.get(ancestor) {
-                    let entry_path_components_count = entry.path.components().count();
-                    let parent_path_components_count = parent_entry.components().count();
-                    let difference = entry_path_components_count - parent_path_components_count;
-                    let depth = parent_entry
-                        .ancestors()
-                        .skip(1)
-                        .filter(|ancestor| visible_worktree_entries.contains(*ancestor))
-                        .count();
-                    Some((depth + 1, difference))
-                } else {
-                    None
-                }
-            })
-            .unwrap_or_else(|| (0, entry.path.components().count()));
-
-        (depth, difference)
-    }
-
-    fn highlight_entry_for_external_drag(
-        &self,
-        target_entry: &Entry,
-        target_worktree: &Worktree,
-    ) -> Option<ProjectEntryId> {
-        // Always highlight directory or parent directory if it's file
-        if target_entry.is_dir() {
-            Some(target_entry.id)
-        } else {
-            target_entry
-                .path
-                .parent()
-                .and_then(|parent_path| target_worktree.entry_for_path(parent_path))
-                .map(|parent_entry| parent_entry.id)
-        }
-    }
-
-    fn highlight_entry_for_selection_drag(
-        &self,
-        target_entry: &Entry,
-        target_worktree: &Worktree,
-        drag_state: &DraggedSelection,
-        cx: &Context<Self>,
-    ) -> Option<ProjectEntryId> {
-        let target_parent_path = target_entry.path.parent();
-
-        // In case of single item drag, we do not highlight existing
-        // directory which item belongs too
-        if drag_state.items().count() == 1
-            && drag_state.active_selection.worktree_id == target_worktree.id()
-        {
-            let active_entry_path = self
-                .project
-                .read(cx)
-                .path_for_entry(drag_state.active_selection.entry_id, cx)?;
-
-            if let Some(active_parent_path) = active_entry_path.path.parent() {
-                // Do not highlight active entry parent
-                if active_parent_path == target_entry.path.as_ref() {
-                    return None;
-                }
-
-                // Do not highlight active entry sibling files
-                if Some(active_parent_path) == target_parent_path && target_entry.is_file() {
-                    return None;
-                }
-            }
-        }
-
-        // Always highlight directory or parent directory if it's file
-        if target_entry.is_dir() {
-            Some(target_entry.id)
-        } else {
-            target_parent_path
-                .and_then(|parent_path| target_worktree.entry_for_path(parent_path))
-                .map(|parent_entry| parent_entry.id)
-        }
-    }
-
-    fn should_highlight_background_for_selection_drag(
-        &self,
-        drag_state: &DraggedSelection,
-        last_root_id: ProjectEntryId,
-        cx: &App,
-    ) -> bool {
-        // Always highlight for multiple entries
-        if drag_state.items().count() > 1 {
-            return true;
-        }
-
-        // Since root will always have empty relative path
-        if let Some(entry_path) = self
-            .project
-            .read(cx)
-            .path_for_entry(drag_state.active_selection.entry_id, cx)
-        {
-            if let Some(parent_path) = entry_path.path.parent() {
-                if !parent_path.is_empty() {
-                    return true;
-                }
-            }
-        }
-
-        // If parent is empty, check if different worktree
-        if let Some(last_root_worktree_id) = self
-            .project
-            .read(cx)
-            .worktree_id_for_entry(last_root_id, cx)
-        {
-            if drag_state.active_selection.worktree_id != last_root_worktree_id {
-                return true;
-            }
-        }
-
-        false
-    }
-
-    fn render_entry(
-        &self,
-        entry_id: ProjectEntryId,
-        details: EntryDetails,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Stateful<Div> {
-        const GROUP_NAME: &str = "project_entry";
-
-        let kind = details.kind;
-        let is_sticky = details.sticky.is_some();
-        let sticky_index = details.sticky.as_ref().map(|this| this.sticky_index);
-        let settings = ProjectPanelSettings::get_global(cx);
-        let show_editor = details.is_editing && !details.is_processing;
-
-        let selection = SelectedEntry {
-            worktree_id: details.worktree_id,
-            entry_id,
-        };
-
-        let is_marked = self.marked_entries.contains(&selection);
-        let is_active = self
-            .state
-            .selection
-            .is_some_and(|selection| selection.entry_id == entry_id);
-
-        let file_name = details.filename.clone();
-
-        let mut icon = details.icon.clone();
-        if settings.file_icons && show_editor && details.kind.is_file() {
-            let filename = self.filename_editor.read(cx).text(cx);
-            if filename.len() > 2 {
-                icon = FileIcons::get_icon(Path::new(&filename), cx);
-            }
-        }
-
-        let filename_text_color = details.filename_text_color;
-        let diagnostic_severity = details.diagnostic_severity;
-        let item_colors = get_item_color(is_sticky, cx);
-
-        let canonical_path = details
-            .canonical_path
-            .as_ref()
-            .map(|f| f.to_string_lossy().into_owned());
-        let path_style = self.project.read(cx).path_style(cx);
-        let path = details.path.clone();
-        let path_for_external_paths = path.clone();
-        let path_for_dragged_selection = path.clone();
-
-        let depth = details.depth;
-        let worktree_id = details.worktree_id;
-        let dragged_selection = DraggedSelection {
-            active_selection: SelectedEntry {
-                worktree_id: selection.worktree_id,
-                entry_id: self.resolve_entry(selection.entry_id),
-            },
-            marked_selections: Arc::from(self.marked_entries.clone()),
-        };
-
-        let bg_color = if is_marked {
-            item_colors.marked
-        } else {
-            item_colors.default
-        };
-
-        let bg_hover_color = if is_marked {
-            item_colors.marked
-        } else {
-            item_colors.hover
-        };
-
-        let validation_color_and_message = if show_editor {
-            match self
-                .state
-                .edit_state
-                .as_ref()
-                .map_or(ValidationState::None, |e| e.validation_state.clone())
-            {
-                ValidationState::Error(msg) => Some((Color::Error.color(cx), msg)),
-                ValidationState::Warning(msg) => Some((Color::Warning.color(cx), msg)),
-                ValidationState::None => None,
-            }
-        } else {
-            None
-        };
-
-        let border_color =
-            if !self.mouse_down && is_active && self.focus_handle.contains_focused(window, cx) {
-                match validation_color_and_message {
-                    Some((color, _)) => color,
-                    None => item_colors.focused,
-                }
-            } else {
-                bg_color
-            };
-
-        let border_hover_color =
-            if !self.mouse_down && is_active && self.focus_handle.contains_focused(window, cx) {
-                match validation_color_and_message {
-                    Some((color, _)) => color,
-                    None => item_colors.focused,
-                }
-            } else {
-                bg_hover_color
-            };
-
-        let folded_directory_drag_target = self.folded_directory_drag_target;
-        let is_highlighted = {
-            if let Some(highlight_entry_id) =
-                self.drag_target_entry
-                    .as_ref()
-                    .and_then(|drag_target| match drag_target {
-                        DragTarget::Entry {
-                            highlight_entry_id, ..
-                        } => Some(*highlight_entry_id),
-                        DragTarget::Background => self.state.last_worktree_root_id,
-                    })
-            {
-                // Highlight if same entry or it's children
-                if entry_id == highlight_entry_id {
-                    true
-                } else {
-                    maybe!({
-                        let worktree = self.project.read(cx).worktree_for_id(worktree_id, cx)?;
-                        let highlight_entry = worktree.read(cx).entry_for_id(highlight_entry_id)?;
-                        Some(path.starts_with(&highlight_entry.path))
-                    })
-                    .unwrap_or(false)
-                }
-            } else {
-                false
-            }
-        };
-
-        let id: ElementId = if is_sticky {
-            SharedString::from(format!("project_panel_sticky_item_{}", entry_id.to_usize())).into()
-        } else {
-            (entry_id.to_proto() as usize).into()
-        };
-
-        div()
-            .id(id.clone())
-            .relative()
-            .group(GROUP_NAME)
-            .cursor_pointer()
-            .rounded_none()
-            .bg(bg_color)
-            .border_1()
-            .border_r_2()
-            .border_color(border_color)
-            .hover(|style| style.bg(bg_hover_color).border_color(border_hover_color))
-            .when(is_sticky, |this| {
-                this.block_mouse_except_scroll()
-            })
-            .when(!is_sticky, |this| {
-                this
-                .when(is_highlighted && folded_directory_drag_target.is_none(), |this| this.border_color(transparent_white()).bg(item_colors.drag_over))
-                .when(settings.drag_and_drop, |this| this
-                .on_drag_move::<ExternalPaths>(cx.listener(
-                    move |this, event: &DragMoveEvent<ExternalPaths>, _, cx| {
-                        let is_current_target = this.drag_target_entry.as_ref()
-                             .and_then(|entry| match entry {
-                                 DragTarget::Entry { entry_id: target_id, .. } => Some(*target_id),
-                                 DragTarget::Background { .. } => None,
-                             }) == Some(entry_id);
-
-                        if !event.bounds.contains(&event.event.position) {
-                            // Entry responsible for setting drag target is also responsible to
-                            // clear it up after drag is out of bounds
-                            if is_current_target {
-                                this.drag_target_entry = None;
-                            }
-                            return;
-                        }
-
-                        if is_current_target {
-                            return;
-                        }
-
-                        this.marked_entries.clear();
-
-                        let Some((entry_id, highlight_entry_id)) = maybe!({
-                            let target_worktree = this.project.read(cx).worktree_for_id(selection.worktree_id, cx)?.read(cx);
-                            let target_entry = target_worktree.entry_for_path(&path_for_external_paths)?;
-                            let highlight_entry_id = this.highlight_entry_for_external_drag(target_entry, target_worktree)?;
-                            Some((target_entry.id, highlight_entry_id))
-                        }) else {
-                            return;
-                        };
-
-                        this.drag_target_entry = Some(DragTarget::Entry {
-                            entry_id,
-                            highlight_entry_id,
-                        });
-
-                    },
-                ))
-                .on_drop(cx.listener(
-                    move |this, external_paths: &ExternalPaths, window, cx| {
-                        this.drag_target_entry = None;
-                        this.hover_scroll_task.take();
-                        this.drop_external_files(external_paths.paths(), entry_id, window, cx);
-                        cx.stop_propagation();
-                    },
-                ))
-                .on_drag_move::<DraggedSelection>(cx.listener(
-                    move |this, event: &DragMoveEvent<DraggedSelection>, window, cx| {
-                        let is_current_target = this.drag_target_entry.as_ref()
-                             .and_then(|entry| match entry {
-                                 DragTarget::Entry { entry_id: target_id, .. } => Some(*target_id),
-                                 DragTarget::Background { .. } => None,
-                             }) == Some(entry_id);
-
-                        if !event.bounds.contains(&event.event.position) {
-                            // Entry responsible for setting drag target is also responsible to
-                            // clear it up after drag is out of bounds
-                            if is_current_target {
-                                this.drag_target_entry = None;
-                            }
-                            return;
-                        }
-
-                        if is_current_target {
-                            return;
-                        }
-
-                        let drag_state = event.drag(cx);
-
-                        if drag_state.items().count() == 1 {
-                            this.marked_entries.clear();
-                            this.marked_entries.push(drag_state.active_selection);
-                        }
-
-                        let Some((entry_id, highlight_entry_id)) = maybe!({
-                            let target_worktree = this.project.read(cx).worktree_for_id(selection.worktree_id, cx)?.read(cx);
-                            let target_entry = target_worktree.entry_for_path(&path_for_dragged_selection)?;
-                            let highlight_entry_id = this.highlight_entry_for_selection_drag(target_entry, target_worktree, drag_state, cx)?;
-                            Some((target_entry.id, highlight_entry_id))
-                        }) else {
-                            return;
-                        };
-
-                        this.drag_target_entry = Some(DragTarget::Entry {
-                            entry_id,
-                            highlight_entry_id,
-                        });
-
-                        this.hover_expand_task.take();
-
-                        if !kind.is_dir()
-                            || this
-                                .state
-                                .expanded_dir_ids
-                                .get(&details.worktree_id)
-                                .is_some_and(|ids| ids.binary_search(&entry_id).is_ok())
-                        {
-                            return;
-                        }
-
-                        let bounds = event.bounds;
-                        this.hover_expand_task =
-                            Some(cx.spawn_in(window, async move |this, cx| {
-                                cx.background_executor()
-                                    .timer(Duration::from_millis(500))
-                                    .await;
-                                this.update_in(cx, |this, window, cx| {
-                                    this.hover_expand_task.take();
-                                    if this.drag_target_entry.as_ref().and_then(|entry| match entry {
-                                        DragTarget::Entry { entry_id: target_id, .. } => Some(*target_id),
-                                        DragTarget::Background { .. } => None,
-                                    }) == Some(entry_id)
-                                        && bounds.contains(&window.mouse_position())
-                                    {
-                                        this.expand_entry(worktree_id, entry_id, cx);
-                                        this.update_visible_entries(
-                                            Some((worktree_id, entry_id)),
-                                            false,
-                                            false,
-                                            window,
-                                            cx,
-                                        );
-                                        cx.notify();
-                                    }
-                                })
-                                .ok();
-                            }));
-                    },
-                ))
-                .on_drag(
-                    dragged_selection,
-                    {
-                        let active_component = self.state.ancestors.get(&entry_id).and_then(|ancestors| ancestors.active_component(&details.filename));
-                        move |selection, click_offset, _window, cx| {
-                            let filename = active_component.as_ref().unwrap_or_else(|| &details.filename);
-                            cx.new(|_| DraggedProjectEntryView {
-                                icon: details.icon.clone(),
-                                filename: filename.clone(),
-                                click_offset,
-                                selection: selection.active_selection,
-                                selections: selection.marked_selections.clone(),
-                            })
-                        }
-                    }
-                )
-                .on_drop(
-                    cx.listener(move |this, selections: &DraggedSelection, window, cx| {
-                        this.drag_target_entry = None;
-                        this.hover_scroll_task.take();
-                        this.hover_expand_task.take();
-                        if folded_directory_drag_target.is_some() {
-                            return;
-                        }
-                        this.drag_onto(selections, entry_id, kind.is_file(), window, cx);
-                    }),
-                ))
-            })
-            .on_mouse_down(
-                MouseButton::Left,
-                cx.listener(move |this, _, _, cx| {
-                    this.mouse_down = true;
-                    cx.propagate();
-                }),
-            )
-            .on_click(
-                cx.listener(move |project_panel, event: &gpui::ClickEvent, window, cx| {
-                    if event.is_right_click() || event.first_focus()
-                        || show_editor
-                    {
-                        return;
-                    }
-                    if event.standard_click() {
-                        project_panel.mouse_down = false;
-                    }
-                    cx.stop_propagation();
-
-                    if let Some(selection) = project_panel.state.selection.filter(|_| event.modifiers().shift) {
-                        let current_selection = project_panel.index_for_selection(selection);
-                        let clicked_entry = SelectedEntry {
-                            entry_id,
-                            worktree_id,
-                        };
-                        let target_selection = project_panel.index_for_selection(clicked_entry);
-                        if let Some(((_, _, source_index), (_, _, target_index))) =
-                            current_selection.zip(target_selection)
-                        {
-                            let range_start = source_index.min(target_index);
-                            let range_end = source_index.max(target_index) + 1;
-                            let mut new_selections = Vec::new();
-                            project_panel.for_each_visible_entry(
-                                range_start..range_end,
-                                window,
-                                cx,
-                                |entry_id, details, _, _| {
-                                    new_selections.push(SelectedEntry {
-                                        entry_id,
-                                        worktree_id: details.worktree_id,
-                                    });
-                                },
-                            );
-
-                            for selection in &new_selections {
-                                if !project_panel.marked_entries.contains(selection) {
-                                    project_panel.marked_entries.push(*selection);
-                                }
-                            }
-
-                            project_panel.state.selection = Some(clicked_entry);
-                            if !project_panel.marked_entries.contains(&clicked_entry) {
-                                project_panel.marked_entries.push(clicked_entry);
-                            }
-                        }
-                    } else if event.modifiers().secondary() {
-                        if event.click_count() > 1 {
-                            project_panel.split_entry(entry_id, false, None, cx);
-                        } else {
-                            project_panel.state.selection = Some(selection);
-                            if let Some(position) = project_panel.marked_entries.iter().position(|e| *e == selection) {
-                                project_panel.marked_entries.remove(position);
-                            } else {
-                                project_panel.marked_entries.push(selection);
-                            }
-                        }
-                    } else if kind.is_dir() {
-                        project_panel.marked_entries.clear();
-                        if is_sticky
-                            && let Some((_, _, index)) = project_panel.index_for_entry(entry_id, worktree_id) {
-                                project_panel.scroll_handle.scroll_to_item_strict_with_offset(index, ScrollStrategy::Top, sticky_index.unwrap_or(0));
-                                cx.notify();
-                                // move down by 1px so that clicked item
-                                // don't count as sticky anymore
-                                cx.on_next_frame(window, |_, window, cx| {
-                                    cx.on_next_frame(window, |this, _, cx| {
-                                        let mut offset = this.scroll_handle.offset();
-                                        offset.y += px(1.);
-                                        this.scroll_handle.set_offset(offset);
-                                        cx.notify();
-                                    });
-                                });
-                                return;
-                            }
-                        if event.modifiers().alt {
-                            project_panel.toggle_expand_all(entry_id, window, cx);
-                        } else {
-                            project_panel.toggle_expanded(entry_id, window, cx);
-                        }
-                    } else {
-                        let preview_tabs_enabled = PreviewTabsSettings::get_global(cx).enable_preview_from_project_panel;
-                        let click_count = event.click_count();
-                        let focus_opened_item = click_count > 1;
-                        let allow_preview = preview_tabs_enabled && click_count == 1;
-                        project_panel.open_entry(entry_id, focus_opened_item, allow_preview, cx);
-                    }
-                }),
-            )
-            .child(
-                ListItem::new(id)
-                    .indent_level(depth)
-                    .indent_step_size(px(settings.indent_size))
-                    .spacing(match settings.entry_spacing {
-                        ProjectPanelEntrySpacing::Comfortable => ListItemSpacing::Dense,
-                        ProjectPanelEntrySpacing::Standard => {
-                            ListItemSpacing::ExtraDense
-                        }
-                    })
-                    .selectable(false)
-                    .when_some(canonical_path, |this, path| {
-                        this.end_slot::<AnyElement>(
-                            div()
-                                .id("symlink_icon")
-                                .pr_3()
-                                .tooltip(move |_window, cx| {
-                                    Tooltip::with_meta(
-                                        path.to_string(),
-                                        None,
-                                        "Symbolic Link",
-                                        cx,
-                                    )
-                                })
-                                .child(
-                                    Icon::new(IconName::ArrowUpRight)
-                                        .size(IconSize::Indicator)
-                                        .color(filename_text_color),
-                                )
-                                .into_any_element(),
-                        )
-                    })
-                    .child(if let Some(icon) = &icon {
-                        if let Some((_, decoration_color)) =
-                            entry_diagnostic_aware_icon_decoration_and_color(diagnostic_severity)
-                        {
-                            let is_warning = diagnostic_severity
-                                .map(|severity| matches!(severity, DiagnosticSeverity::WARNING))
-                                .unwrap_or(false);
-                            div().child(
-                                DecoratedIcon::new(
-                                    Icon::from_path(icon.clone()).color(Color::Muted),
-                                    Some(
-                                        IconDecoration::new(
-                                            if kind.is_file() {
-                                                if is_warning {
-                                                    IconDecorationKind::Triangle
-                                                } else {
-                                                    IconDecorationKind::X
-                                                }
-                                            } else {
-                                                IconDecorationKind::Dot
-                                            },
-                                            bg_color,
-                                            cx,
-                                        )
-                                        .group_name(Some(GROUP_NAME.into()))
-                                        .knockout_hover_color(bg_hover_color)
-                                        .color(decoration_color.color(cx))
-                                        .position(Point {
-                                            x: px(-2.),
-                                            y: px(-2.),
-                                        }),
-                                    ),
-                                )
-                                .into_any_element(),
-                            )
-                        } else {
-                            h_flex().child(Icon::from_path(icon.to_string()).color(Color::Muted))
-                        }
-                    } else if let Some((icon_name, color)) =
-                        entry_diagnostic_aware_icon_name_and_color(diagnostic_severity)
-                    {
-                        h_flex()
-                            .size(IconSize::default().rems())
-                            .child(Icon::new(icon_name).color(color).size(IconSize::Small))
-                    } else {
-                        h_flex()
-                            .size(IconSize::default().rems())
-                            .invisible()
-                            .flex_none()
-                    })
-                    .child(
-                        if let (Some(editor), true) = (Some(&self.filename_editor), show_editor) {
-                            h_flex().h_6().w_full().child(editor.clone())
-                        } else {
-                            h_flex().h_6().map(|mut this| {
-                                if let Some(folded_ancestors) = self.state.ancestors.get(&entry_id) {
-                                    let components = Path::new(&file_name)
-                                        .components()
-                                        .map(|comp| comp.as_os_str().to_string_lossy().into_owned())
-                                        .collect::<Vec<_>>();
-                                    let active_index = folded_ancestors.active_index();
-                                    let components_len = components.len();
-                                    let delimiter = SharedString::new(path_style.primary_separator());
-                                    for (index, component) in components.iter().enumerate() {
-                                        if index != 0 {
-                                                let delimiter_target_index = index - 1;
-                                                let target_entry_id = folded_ancestors.ancestors.get(components_len - 1 - delimiter_target_index).cloned();
-                                                this = this.child(
-                                                    div()
-                                                    .when(!is_sticky, |div| {
-                                                        div
-                                                            .when(settings.drag_and_drop, |div| div
-                                                            .on_drop(cx.listener(move |this, selections: &DraggedSelection, window, cx| {
-                                                            this.hover_scroll_task.take();
-                                                            this.drag_target_entry = None;
-                                                            this.folded_directory_drag_target = None;
-                                                            if let Some(target_entry_id) = target_entry_id {
-                                                                this.drag_onto(selections, target_entry_id, kind.is_file(), window, cx);
-                                                            }
-                                                        }))
-                                                        .on_drag_move(cx.listener(
-                                                            move |this, event: &DragMoveEvent<DraggedSelection>, _, _| {
-                                                                if event.bounds.contains(&event.event.position) {
-                                                                    this.folded_directory_drag_target = Some(
-                                                                        FoldedDirectoryDragTarget {
-                                                                            entry_id,
-                                                                            index: delimiter_target_index,
-                                                                            is_delimiter_target: true,
-                                                                        }
-                                                                    );
-                                                                } else {
-                                                                    let is_current_target = this.folded_directory_drag_target
-                                                                        .is_some_and(|target|
-                                                                            target.entry_id == entry_id &&
-                                                                            target.index == delimiter_target_index &&
-                                                                            target.is_delimiter_target
-                                                                        );
-                                                                    if is_current_target {
-                                                                        this.folded_directory_drag_target = None;
-                                                                    }
-                                                                }
-
-                                                            },
-                                                        )))
-                                                    })
-                                                    .child(
-                                                        Label::new(delimiter.clone())
-                                                            .single_line()
-                                                            .color(filename_text_color)
-                                                    )
-                                                );
-                                        }
-                                        let id = SharedString::from(format!(
-                                            "project_panel_path_component_{}_{index}",
-                                            entry_id.to_usize()
-                                        ));
-                                        let label = div()
-                                            .id(id)
-                                            .when(!is_sticky,| div| {
-                                                div
-                                                .when(index != components_len - 1, |div|{
-                                                    let target_entry_id = folded_ancestors.ancestors.get(components_len - 1 - index).cloned();
-                                                    div
-                                                    .when(settings.drag_and_drop, |div| div
-                                                    .on_drag_move(cx.listener(
-                                                        move |this, event: &DragMoveEvent<DraggedSelection>, _, _| {
-                                                        if event.bounds.contains(&event.event.position) {
-                                                                this.folded_directory_drag_target = Some(
-                                                                    FoldedDirectoryDragTarget {
-                                                                        entry_id,
-                                                                        index,
-                                                                        is_delimiter_target: false,
-                                                                    }
-                                                                );
-                                                            } else {
-                                                                let is_current_target = this.folded_directory_drag_target
-                                                                    .as_ref()
-                                                                    .is_some_and(|target|
-                                                                        target.entry_id == entry_id &&
-                                                                        target.index == index &&
-                                                                        !target.is_delimiter_target
-                                                                    );
-                                                                if is_current_target {
-                                                                    this.folded_directory_drag_target = None;
-                                                                }
-                                                            }
-                                                        },
-                                                    ))
-                                                    .on_drop(cx.listener(move |this, selections: &DraggedSelection, window,cx| {
-                                                        this.hover_scroll_task.take();
-                                                        this.drag_target_entry = None;
-                                                        this.folded_directory_drag_target = None;
-                                                        if let Some(target_entry_id) = target_entry_id {
-                                                            this.drag_onto(selections, target_entry_id, kind.is_file(), window, cx);
-                                                        }
-                                                    }))
-                                                    .when(folded_directory_drag_target.is_some_and(|target|
-                                                        target.entry_id == entry_id &&
-                                                        target.index == index
-                                                    ), |this| {
-                                                        this.bg(item_colors.drag_over)
-                                                    }))
-                                                })
-                                            })
-                                            .on_mouse_down(
-                                                MouseButton::Left,
-                                                cx.listener(move |this, _, _, cx| {
-                                                    if index != active_index
-                                                        && let Some(folds) =
-                                                            this.state.ancestors.get_mut(&entry_id)
-                                                        {
-                                                            folds.current_ancestor_depth =
-                                                                components_len - 1 - index;
-                                                            cx.notify();
-                                                        }
-                                                }),
-                                            )
-                                            .child(
-                                                Label::new(component)
-                                                    .single_line()
-                                                    .color(filename_text_color)
-                                                    .when(
-                                                        index == active_index
-                                                            && (is_active || is_marked),
-                                                        |this| this.underline(),
-                                                    ),
-                                            );
-
-                                        this = this.child(label);
-                                    }
-
-                                    this
-                                } else {
-                                    this.child(
-                                        Label::new(file_name)
-                                            .single_line()
-                                            .color(filename_text_color),
-                                    )
-                                }
-                            })
-                        },
-                    )
-                    .on_secondary_mouse_down(cx.listener(
-                        move |this, event: &MouseDownEvent, window, cx| {
-                            // Stop propagation to prevent the catch-all context menu for the project
-                            // panel from being deployed.
-                            cx.stop_propagation();
-                            // Some context menu actions apply to all marked entries. If the user
-                            // right-clicks on an entry that is not marked, they may not realize the
-                            // action applies to multiple entries. To avoid inadvertent changes, all
-                            // entries are unmarked.
-                            if !this.marked_entries.contains(&selection) {
-                                this.marked_entries.clear();
-                            }
-                            this.deploy_context_menu(event.position, entry_id, window, cx);
-                        },
-                    ))
-                    .overflow_x(),
-            )
-            .when_some(
-                validation_color_and_message,
-                |this, (color, message)| {
-                    this
-                    .relative()
-                    .child(
-                        deferred(
-                            div()
-                            .occlude()
-                            .absolute()
-                            .top_full()
-                            .left(px(-1.)) // Used px over rem so that it doesn't change with font size
-                            .right(px(-0.5))
-                            .py_1()
-                            .px_2()
-                            .border_1()
-                            .border_color(color)
-                            .bg(cx.theme().colors().background)
-                            .child(
-                                Label::new(message)
-                                .color(Color::from(color))
-                                .size(LabelSize::Small)
-                            )
-                        )
-                    )
-                }
-            )
-    }
-
-    fn details_for_entry(
-        &self,
-        entry: &Entry,
-        worktree_id: WorktreeId,
-        root_name: &RelPath,
-        entries_paths: &HashSet<Arc<RelPath>>,
-        git_status: GitSummary,
-        sticky: Option<StickyDetails>,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> EntryDetails {
-        let (show_file_icons, show_folder_icons) = {
-            let settings = ProjectPanelSettings::get_global(cx);
-            (settings.file_icons, settings.folder_icons)
-        };
-
-        let expanded_entry_ids = self
-            .state
-            .expanded_dir_ids
-            .get(&worktree_id)
-            .map(Vec::as_slice)
-            .unwrap_or(&[]);
-        let is_expanded = expanded_entry_ids.binary_search(&entry.id).is_ok();
-
-        let icon = match entry.kind {
-            EntryKind::File => {
-                if show_file_icons {
-                    FileIcons::get_icon(entry.path.as_std_path(), cx)
-                } else {
-                    None
-                }
-            }
-            _ => {
-                if show_folder_icons {
-                    FileIcons::get_folder_icon(is_expanded, entry.path.as_std_path(), cx)
-                } else {
-                    FileIcons::get_chevron_icon(is_expanded, cx)
-                }
-            }
-        };
-
-        let path_style = self.project.read(cx).path_style(cx);
-        let (depth, difference) =
-            ProjectPanel::calculate_depth_and_difference(entry, entries_paths);
-
-        let filename = if difference > 1 {
-            entry
-                .path
-                .last_n_components(difference)
-                .map_or(String::new(), |suffix| {
-                    suffix.display(path_style).to_string()
-                })
-        } else {
-            entry
-                .path
-                .file_name()
-                .map(|name| name.to_string())
-                .unwrap_or_else(|| root_name.as_unix_str().to_string())
-        };
-
-        let selection = SelectedEntry {
-            worktree_id,
-            entry_id: entry.id,
-        };
-        let is_marked = self.marked_entries.contains(&selection);
-        let is_selected = self.state.selection == Some(selection);
-
-        let diagnostic_severity = self
-            .diagnostics
-            .get(&(worktree_id, entry.path.clone()))
-            .cloned();
-
-        let filename_text_color =
-            entry_git_aware_label_color(git_status, entry.is_ignored, is_marked);
-
-        let is_cut = self
-            .clipboard
-            .as_ref()
-            .is_some_and(|e| e.is_cut() && e.items().contains(&selection));
-
-        EntryDetails {
-            filename,
-            icon,
-            path: entry.path.clone(),
-            depth,
-            kind: entry.kind,
-            is_ignored: entry.is_ignored,
-            is_expanded,
-            is_selected,
-            is_marked,
-            is_editing: false,
-            is_processing: false,
-            is_cut,
-            sticky,
-            filename_text_color,
-            diagnostic_severity,
-            git_status,
-            is_private: entry.is_private,
-            worktree_id,
-            canonical_path: entry.canonical_path.clone(),
-        }
-    }
-
-    fn dispatch_context(&self, window: &Window, cx: &Context<Self>) -> KeyContext {
-        let mut dispatch_context = KeyContext::new_with_defaults();
-        dispatch_context.add("ProjectPanel");
-        dispatch_context.add("menu");
-
-        let identifier = if self.filename_editor.focus_handle(cx).is_focused(window) {
-            "editing"
-        } else {
-            "not_editing"
-        };
-
-        dispatch_context.add(identifier);
-        dispatch_context
-    }
-
-    fn reveal_entry(
-        &mut self,
-        project: Entity<Project>,
-        entry_id: ProjectEntryId,
-        skip_ignored: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Result<()> {
-        let worktree = project
-            .read(cx)
-            .worktree_for_entry(entry_id, cx)
-            .context("can't reveal a non-existent entry in the project panel")?;
-        let worktree = worktree.read(cx);
-        if skip_ignored
-            && worktree
-                .entry_for_id(entry_id)
-                .is_none_or(|entry| entry.is_ignored && !entry.is_always_included)
-        {
-            anyhow::bail!("can't reveal an ignored entry in the project panel");
-        }
-        let is_active_item_file_diff_view = self
-            .workspace
-            .upgrade()
-            .and_then(|ws| ws.read(cx).active_item(cx))
-            .map(|item| item.act_as_type(TypeId::of::<FileDiffView>(), cx).is_some())
-            .unwrap_or(false);
-        if is_active_item_file_diff_view {
-            return Ok(());
-        }
-
-        let worktree_id = worktree.id();
-        self.expand_entry(worktree_id, entry_id, cx);
-        self.update_visible_entries(Some((worktree_id, entry_id)), false, true, window, cx);
-        self.marked_entries.clear();
-        self.marked_entries.push(SelectedEntry {
-            worktree_id,
-            entry_id,
-        });
-        cx.notify();
-        Ok(())
-    }
-
-    fn find_active_indent_guide(
-        &self,
-        indent_guides: &[IndentGuideLayout],
-        cx: &App,
-    ) -> Option<usize> {
-        let (worktree, entry) = self.selected_entry(cx)?;
-
-        // Find the parent entry of the indent guide, this will either be the
-        // expanded folder we have selected, or the parent of the currently
-        // selected file/collapsed directory
-        let mut entry = entry;
-        loop {
-            let is_expanded_dir = entry.is_dir()
-                && self
-                    .state
-                    .expanded_dir_ids
-                    .get(&worktree.id())
-                    .map(|ids| ids.binary_search(&entry.id).is_ok())
-                    .unwrap_or(false);
-            if is_expanded_dir {
-                break;
-            }
-            entry = worktree.entry_for_path(&entry.path.parent()?)?;
-        }
-
-        let (active_indent_range, depth) = {
-            let (worktree_ix, child_offset, ix) = self.index_for_entry(entry.id, worktree.id())?;
-            let child_paths = &self.state.visible_entries[worktree_ix].entries;
-            let mut child_count = 0;
-            let depth = entry.path.ancestors().count();
-            while let Some(entry) = child_paths.get(child_offset + child_count + 1) {
-                if entry.path.ancestors().count() <= depth {
-                    break;
-                }
-                child_count += 1;
-            }
-
-            let start = ix + 1;
-            let end = start + child_count;
-
-            let visible_worktree = &self.state.visible_entries[worktree_ix];
-            let visible_worktree_entries = visible_worktree.index.get_or_init(|| {
-                visible_worktree
-                    .entries
-                    .iter()
-                    .map(|e| e.path.clone())
-                    .collect()
-            });
-
-            // Calculate the actual depth of the entry, taking into account that directories can be auto-folded.
-            let (depth, _) = Self::calculate_depth_and_difference(entry, visible_worktree_entries);
-            (start..end, depth)
-        };
-
-        let candidates = indent_guides
-            .iter()
-            .enumerate()
-            .filter(|(_, indent_guide)| indent_guide.offset.x == depth);
-
-        for (i, indent) in candidates {
-            // Find matches that are either an exact match, partially on screen, or inside the enclosing indent
-            if active_indent_range.start <= indent.offset.y + indent.length
-                && indent.offset.y <= active_indent_range.end
-            {
-                return Some(i);
-            }
-        }
-        None
-    }
-
-    fn render_sticky_entries(
-        &self,
-        child: StickyProjectPanelCandidate,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> SmallVec<[AnyElement; 8]> {
-        let project = self.project.read(cx);
-
-        let Some((worktree_id, entry_ref)) = self.entry_at_index(child.index) else {
-            return SmallVec::new();
-        };
-
-        let Some(visible) = self
-            .state
-            .visible_entries
-            .iter()
-            .find(|worktree| worktree.worktree_id == worktree_id)
-        else {
-            return SmallVec::new();
-        };
-
-        let Some(worktree) = project.worktree_for_id(worktree_id, cx) else {
-            return SmallVec::new();
-        };
-        let worktree = worktree.read(cx).snapshot();
-
-        let paths = visible
-            .index
-            .get_or_init(|| visible.entries.iter().map(|e| e.path.clone()).collect());
-
-        let mut sticky_parents = Vec::new();
-        let mut current_path = entry_ref.path.clone();
-
-        'outer: loop {
-            if let Some(parent_path) = current_path.parent() {
-                for ancestor_path in parent_path.ancestors() {
-                    if paths.contains(ancestor_path)
-                        && let Some(parent_entry) = worktree.entry_for_path(ancestor_path)
-                    {
-                        sticky_parents.push(parent_entry.clone());
-                        current_path = parent_entry.path.clone();
-                        continue 'outer;
-                    }
-                }
-            }
-            break 'outer;
-        }
-
-        if sticky_parents.is_empty() {
-            return SmallVec::new();
-        }
-
-        sticky_parents.reverse();
-
-        let panel_settings = ProjectPanelSettings::get_global(cx);
-        let git_status_enabled = panel_settings.git_status;
-        let root_name = worktree.root_name();
-
-        let git_summaries_by_id = if git_status_enabled {
-            visible
-                .entries
-                .iter()
-                .map(|e| (e.id, e.git_summary))
-                .collect::<HashMap<_, _>>()
-        } else {
-            Default::default()
-        };
-
-        // already checked if non empty above
-        let last_item_index = sticky_parents.len() - 1;
-        sticky_parents
-            .iter()
-            .enumerate()
-            .map(|(index, entry)| {
-                let git_status = git_summaries_by_id
-                    .get(&entry.id)
-                    .copied()
-                    .unwrap_or_default();
-                let sticky_details = Some(StickyDetails {
-                    sticky_index: index,
-                });
-                let details = self.details_for_entry(
-                    entry,
-                    worktree_id,
-                    root_name,
-                    paths,
-                    git_status,
-                    sticky_details,
-                    window,
-                    cx,
-                );
-                self.render_entry(entry.id, details, window, cx)
-                    .when(index == last_item_index, |this| {
-                        let shadow_color_top = hsla(0.0, 0.0, 0.0, 0.1);
-                        let shadow_color_bottom = hsla(0.0, 0.0, 0.0, 0.);
-                        let sticky_shadow = div()
-                            .absolute()
-                            .left_0()
-                            .bottom_neg_1p5()
-                            .h_1p5()
-                            .w_full()
-                            .bg(linear_gradient(
-                                0.,
-                                linear_color_stop(shadow_color_top, 1.),
-                                linear_color_stop(shadow_color_bottom, 0.),
-                            ));
-                        this.child(sticky_shadow)
-                    })
-                    .into_any()
-            })
-            .collect()
-    }
-}
-
-#[derive(Clone)]
-struct StickyProjectPanelCandidate {
-    index: usize,
-    depth: usize,
-}
-
-impl StickyCandidate for StickyProjectPanelCandidate {
-    fn depth(&self) -> usize {
-        self.depth
-    }
-}
-
-fn item_width_estimate(depth: usize, item_text_chars: usize, is_symlink: bool) -> usize {
-    const ICON_SIZE_FACTOR: usize = 2;
-    let mut item_width = depth * ICON_SIZE_FACTOR + item_text_chars;
-    if is_symlink {
-        item_width += ICON_SIZE_FACTOR;
-    }
-    item_width
-}
-
-impl Render for ProjectPanel {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let has_worktree = !self.state.visible_entries.is_empty();
-        let project = self.project.read(cx);
-        let panel_settings = ProjectPanelSettings::get_global(cx);
-        let indent_size = panel_settings.indent_size;
-        let show_indent_guides = panel_settings.indent_guides.show == ShowIndentGuides::Always;
-        let show_sticky_entries = {
-            if panel_settings.sticky_scroll {
-                let is_scrollable = self.scroll_handle.is_scrollable();
-                let is_scrolled = self.scroll_handle.offset().y < px(0.);
-                is_scrollable && is_scrolled
-            } else {
-                false
-            }
-        };
-
-        let is_local = project.is_local();
-
-        if has_worktree {
-            let item_count = self
-                .state
-                .visible_entries
-                .iter()
-                .map(|worktree| worktree.entries.len())
-                .sum();
-
-            fn handle_drag_move<T: 'static>(
-                this: &mut ProjectPanel,
-                e: &DragMoveEvent<T>,
-                window: &mut Window,
-                cx: &mut Context<ProjectPanel>,
-            ) {
-                if let Some(previous_position) = this.previous_drag_position {
-                    // Refresh cursor only when an actual drag happens,
-                    // because modifiers are not updated when the cursor is not moved.
-                    if e.event.position != previous_position {
-                        this.refresh_drag_cursor_style(&e.event.modifiers, window, cx);
-                    }
-                }
-                this.previous_drag_position = Some(e.event.position);
-
-                if !e.bounds.contains(&e.event.position) {
-                    this.drag_target_entry = None;
-                    return;
-                }
-                this.hover_scroll_task.take();
-                let panel_height = e.bounds.size.height;
-                if panel_height <= px(0.) {
-                    return;
-                }
-
-                let event_offset = e.event.position.y - e.bounds.origin.y;
-                // How far along in the project panel is our cursor? (0. is the top of a list, 1. is the bottom)
-                let hovered_region_offset = event_offset / panel_height;
-
-                // We want the scrolling to be a bit faster when the cursor is closer to the edge of a list.
-                // These pixels offsets were picked arbitrarily.
-                let vertical_scroll_offset = if hovered_region_offset <= 0.05 {
-                    8.
-                } else if hovered_region_offset <= 0.15 {
-                    5.
-                } else if hovered_region_offset >= 0.95 {
-                    -8.
-                } else if hovered_region_offset >= 0.85 {
-                    -5.
-                } else {
-                    return;
-                };
-                let adjustment = point(px(0.), px(vertical_scroll_offset));
-                this.hover_scroll_task = Some(cx.spawn_in(window, async move |this, cx| {
-                    loop {
-                        let should_stop_scrolling = this
-                            .update(cx, |this, cx| {
-                                this.hover_scroll_task.as_ref()?;
-                                let handle = this.scroll_handle.0.borrow_mut();
-                                let offset = handle.base_handle.offset();
-
-                                handle.base_handle.set_offset(offset + adjustment);
-                                cx.notify();
-                                Some(())
-                            })
-                            .ok()
-                            .flatten()
-                            .is_some();
-                        if should_stop_scrolling {
-                            return;
-                        }
-                        cx.background_executor()
-                            .timer(Duration::from_millis(16))
-                            .await;
-                    }
-                }));
-            }
-            h_flex()
-                .id("project-panel")
-                .group("project-panel")
-                .when(panel_settings.drag_and_drop, |this| {
-                    this.on_drag_move(cx.listener(handle_drag_move::<ExternalPaths>))
-                        .on_drag_move(cx.listener(handle_drag_move::<DraggedSelection>))
-                })
-                .size_full()
-                .relative()
-                .on_modifiers_changed(cx.listener(
-                    |this, event: &ModifiersChangedEvent, window, cx| {
-                        this.refresh_drag_cursor_style(&event.modifiers, window, cx);
-                    },
-                ))
-                .key_context(self.dispatch_context(window, cx))
-                .on_action(cx.listener(Self::scroll_up))
-                .on_action(cx.listener(Self::scroll_down))
-                .on_action(cx.listener(Self::scroll_cursor_center))
-                .on_action(cx.listener(Self::scroll_cursor_top))
-                .on_action(cx.listener(Self::scroll_cursor_bottom))
-                .on_action(cx.listener(Self::select_next))
-                .on_action(cx.listener(Self::select_previous))
-                .on_action(cx.listener(Self::select_first))
-                .on_action(cx.listener(Self::select_last))
-                .on_action(cx.listener(Self::select_parent))
-                .on_action(cx.listener(Self::select_next_git_entry))
-                .on_action(cx.listener(Self::select_prev_git_entry))
-                .on_action(cx.listener(Self::select_next_diagnostic))
-                .on_action(cx.listener(Self::select_prev_diagnostic))
-                .on_action(cx.listener(Self::select_next_directory))
-                .on_action(cx.listener(Self::select_prev_directory))
-                .on_action(cx.listener(Self::expand_selected_entry))
-                .on_action(cx.listener(Self::collapse_selected_entry))
-                .on_action(cx.listener(Self::collapse_all_entries))
-                .on_action(cx.listener(Self::open))
-                .on_action(cx.listener(Self::open_permanent))
-                .on_action(cx.listener(Self::open_split_vertical))
-                .on_action(cx.listener(Self::open_split_horizontal))
-                .on_action(cx.listener(Self::confirm))
-                .on_action(cx.listener(Self::cancel))
-                .on_action(cx.listener(Self::copy_path))
-                .on_action(cx.listener(Self::copy_relative_path))
-                .on_action(cx.listener(Self::new_search_in_directory))
-                .on_action(cx.listener(Self::unfold_directory))
-                .on_action(cx.listener(Self::fold_directory))
-                .on_action(cx.listener(Self::remove_from_project))
-                .on_action(cx.listener(Self::compare_marked_files))
-                .when(!project.is_read_only(cx), |el| {
-                    el.on_action(cx.listener(Self::new_file))
-                        .on_action(cx.listener(Self::new_directory))
-                        .on_action(cx.listener(Self::rename))
-                        .on_action(cx.listener(Self::delete))
-                        .on_action(cx.listener(Self::cut))
-                        .on_action(cx.listener(Self::copy))
-                        .on_action(cx.listener(Self::paste))
-                        .on_action(cx.listener(Self::duplicate))
-                        .when(!project.is_remote(), |el| {
-                            el.on_action(cx.listener(Self::trash))
-                        })
-                })
-                .when(project.is_local(), |el| {
-                    el.on_action(cx.listener(Self::reveal_in_finder))
-                        .on_action(cx.listener(Self::open_system))
-                        .on_action(cx.listener(Self::open_in_terminal))
-                })
-                .when(project.is_via_remote_server(), |el| {
-                    el.on_action(cx.listener(Self::open_in_terminal))
-                })
-                .track_focus(&self.focus_handle(cx))
-                .child(
-                    v_flex()
-                        .child(
-                            uniform_list("entries", item_count, {
-                                cx.processor(|this, range: Range<usize>, window, cx| {
-                                    this.rendered_entries_len = range.end - range.start;
-                                    let mut items = Vec::with_capacity(this.rendered_entries_len);
-                                    this.for_each_visible_entry(
-                                        range,
-                                        window,
-                                        cx,
-                                        |id, details, window, cx| {
-                                            items.push(this.render_entry(id, details, window, cx));
-                                        },
-                                    );
-                                    items
-                                })
-                            })
-                            .when(show_indent_guides, |list| {
-                                list.with_decoration(
-                                    ui::indent_guides(
-                                        px(indent_size),
-                                        IndentGuideColors::panel(cx),
-                                    )
-                                    .with_compute_indents_fn(
-                                        cx.entity(),
-                                        |this, range, window, cx| {
-                                            let mut items =
-                                                SmallVec::with_capacity(range.end - range.start);
-                                            this.iter_visible_entries(
-                                                range,
-                                                window,
-                                                cx,
-                                                |entry, _, entries, _, _| {
-                                                    let (depth, _) =
-                                                        Self::calculate_depth_and_difference(
-                                                            entry, entries,
-                                                        );
-                                                    items.push(depth);
-                                                },
-                                            );
-                                            items
-                                        },
-                                    )
-                                    .on_click(cx.listener(
-                                        |this,
-                                         active_indent_guide: &IndentGuideLayout,
-                                         window,
-                                         cx| {
-                                            if window.modifiers().secondary() {
-                                                let ix = active_indent_guide.offset.y;
-                                                let Some((target_entry, worktree)) = maybe!({
-                                                    let (worktree_id, entry) =
-                                                        this.entry_at_index(ix)?;
-                                                    let worktree = this
-                                                        .project
-                                                        .read(cx)
-                                                        .worktree_for_id(worktree_id, cx)?;
-                                                    let target_entry = worktree
-                                                        .read(cx)
-                                                        .entry_for_path(&entry.path.parent()?)?;
-                                                    Some((target_entry, worktree))
-                                                }) else {
-                                                    return;
-                                                };
-
-                                                this.collapse_entry(
-                                                    target_entry.clone(),
-                                                    worktree,
-                                                    window,
-                                                    cx,
-                                                );
-                                            }
-                                        },
-                                    ))
-                                    .with_render_fn(
-                                        cx.entity(),
-                                        move |this, params, _, cx| {
-                                            const LEFT_OFFSET: Pixels = px(14.);
-                                            const PADDING_Y: Pixels = px(4.);
-                                            const HITBOX_OVERDRAW: Pixels = px(3.);
-
-                                            let active_indent_guide_index = this
-                                                .find_active_indent_guide(
-                                                    &params.indent_guides,
-                                                    cx,
-                                                );
-
-                                            let indent_size = params.indent_size;
-                                            let item_height = params.item_height;
-
-                                            params
-                                                .indent_guides
-                                                .into_iter()
-                                                .enumerate()
-                                                .map(|(idx, layout)| {
-                                                    let offset = if layout.continues_offscreen {
-                                                        px(0.)
-                                                    } else {
-                                                        PADDING_Y
-                                                    };
-                                                    let bounds = Bounds::new(
-                                                        point(
-                                                            layout.offset.x * indent_size
-                                                                + LEFT_OFFSET,
-                                                            layout.offset.y * item_height + offset,
-                                                        ),
-                                                        size(
-                                                            px(1.),
-                                                            layout.length * item_height
-                                                                - offset * 2.,
-                                                        ),
-                                                    );
-                                                    ui::RenderedIndentGuide {
-                                                        bounds,
-                                                        layout,
-                                                        is_active: Some(idx)
-                                                            == active_indent_guide_index,
-                                                        hitbox: Some(Bounds::new(
-                                                            point(
-                                                                bounds.origin.x - HITBOX_OVERDRAW,
-                                                                bounds.origin.y,
-                                                            ),
-                                                            size(
-                                                                bounds.size.width
-                                                                    + HITBOX_OVERDRAW * 2.,
-                                                                bounds.size.height,
-                                                            ),
-                                                        )),
-                                                    }
-                                                })
-                                                .collect()
-                                        },
-                                    ),
-                                )
-                            })
-                            .when(show_sticky_entries, |list| {
-                                let sticky_items = ui::sticky_items(
-                                    cx.entity(),
-                                    |this, range, window, cx| {
-                                        let mut items =
-                                            SmallVec::with_capacity(range.end - range.start);
-                                        this.iter_visible_entries(
-                                            range,
-                                            window,
-                                            cx,
-                                            |entry, index, entries, _, _| {
-                                                let (depth, _) =
-                                                    Self::calculate_depth_and_difference(
-                                                        entry, entries,
-                                                    );
-                                                let candidate =
-                                                    StickyProjectPanelCandidate { index, depth };
-                                                items.push(candidate);
-                                            },
-                                        );
-                                        items
-                                    },
-                                    |this, marker_entry, window, cx| {
-                                        let sticky_entries =
-                                            this.render_sticky_entries(marker_entry, window, cx);
-                                        this.sticky_items_count = sticky_entries.len();
-                                        sticky_entries
-                                    },
-                                );
-                                list.with_decoration(if show_indent_guides {
-                                    sticky_items.with_decoration(
-                                        ui::indent_guides(
-                                            px(indent_size),
-                                            IndentGuideColors::panel(cx),
-                                        )
-                                        .with_render_fn(
-                                            cx.entity(),
-                                            move |_, params, _, _| {
-                                                const LEFT_OFFSET: Pixels = px(14.);
-
-                                                let indent_size = params.indent_size;
-                                                let item_height = params.item_height;
-
-                                                params
-                                                    .indent_guides
-                                                    .into_iter()
-                                                    .map(|layout| {
-                                                        let bounds = Bounds::new(
-                                                            point(
-                                                                layout.offset.x * indent_size
-                                                                    + LEFT_OFFSET,
-                                                                layout.offset.y * item_height,
-                                                            ),
-                                                            size(
-                                                                px(1.),
-                                                                layout.length * item_height,
-                                                            ),
-                                                        );
-                                                        ui::RenderedIndentGuide {
-                                                            bounds,
-                                                            layout,
-                                                            is_active: false,
-                                                            hitbox: None,
-                                                        }
-                                                    })
-                                                    .collect()
-                                            },
-                                        ),
-                                    )
-                                } else {
-                                    sticky_items
-                                })
-                            })
-                            .with_sizing_behavior(ListSizingBehavior::Infer)
-                            .with_horizontal_sizing_behavior(
-                                ListHorizontalSizingBehavior::Unconstrained,
-                            )
-                            .with_width_from_item(self.state.max_width_item_index)
-                            .track_scroll(&self.scroll_handle),
-                        )
-                        .child(
-                            div()
-                                .id("project-panel-blank-area")
-                                .block_mouse_except_scroll()
-                                .flex_grow()
-                                .when(
-                                    self.drag_target_entry.as_ref().is_some_and(
-                                        |entry| match entry {
-                                            DragTarget::Background => true,
-                                            DragTarget::Entry {
-                                                highlight_entry_id, ..
-                                            } => self.state.last_worktree_root_id.is_some_and(
-                                                |root_id| *highlight_entry_id == root_id,
-                                            ),
-                                        },
-                                    ),
-                                    |div| div.bg(cx.theme().colors().drop_target_background),
-                                )
-                                .on_drag_move::<ExternalPaths>(cx.listener(
-                                    move |this, event: &DragMoveEvent<ExternalPaths>, _, _| {
-                                        let Some(_last_root_id) = this.state.last_worktree_root_id
-                                        else {
-                                            return;
-                                        };
-                                        if event.bounds.contains(&event.event.position) {
-                                            this.drag_target_entry = Some(DragTarget::Background);
-                                        } else {
-                                            if this.drag_target_entry.as_ref().is_some_and(|e| {
-                                                matches!(e, DragTarget::Background)
-                                            }) {
-                                                this.drag_target_entry = None;
-                                            }
-                                        }
-                                    },
-                                ))
-                                .on_drag_move::<DraggedSelection>(cx.listener(
-                                    move |this, event: &DragMoveEvent<DraggedSelection>, _, cx| {
-                                        let Some(last_root_id) = this.state.last_worktree_root_id
-                                        else {
-                                            return;
-                                        };
-                                        if event.bounds.contains(&event.event.position) {
-                                            let drag_state = event.drag(cx);
-                                            if this.should_highlight_background_for_selection_drag(
-                                                &drag_state,
-                                                last_root_id,
-                                                cx,
-                                            ) {
-                                                this.drag_target_entry =
-                                                    Some(DragTarget::Background);
-                                            }
-                                        } else {
-                                            if this.drag_target_entry.as_ref().is_some_and(|e| {
-                                                matches!(e, DragTarget::Background)
-                                            }) {
-                                                this.drag_target_entry = None;
-                                            }
-                                        }
-                                    },
-                                ))
-                                .on_drop(cx.listener(
-                                    move |this, external_paths: &ExternalPaths, window, cx| {
-                                        this.drag_target_entry = None;
-                                        this.hover_scroll_task.take();
-                                        if let Some(entry_id) = this.state.last_worktree_root_id {
-                                            this.drop_external_files(
-                                                external_paths.paths(),
-                                                entry_id,
-                                                window,
-                                                cx,
-                                            );
-                                        }
-                                        cx.stop_propagation();
-                                    },
-                                ))
-                                .on_drop(cx.listener(
-                                    move |this, selections: &DraggedSelection, window, cx| {
-                                        this.drag_target_entry = None;
-                                        this.hover_scroll_task.take();
-                                        if let Some(entry_id) = this.state.last_worktree_root_id {
-                                            this.drag_onto(selections, entry_id, false, window, cx);
-                                        }
-                                        cx.stop_propagation();
-                                    },
-                                ))
-                                .on_click(cx.listener(|this, event, window, cx| {
-                                    if matches!(event, gpui::ClickEvent::Keyboard(_)) {
-                                        return;
-                                    }
-                                    cx.stop_propagation();
-                                    this.state.selection = None;
-                                    this.marked_entries.clear();
-                                    this.focus_handle(cx).focus(window);
-                                }))
-                                .on_mouse_down(
-                                    MouseButton::Right,
-                                    cx.listener(move |this, event: &MouseDownEvent, window, cx| {
-                                        // When deploying the context menu anywhere below the last project entry,
-                                        // act as if the user clicked the root of the last worktree.
-                                        if let Some(entry_id) = this.state.last_worktree_root_id {
-                                            this.deploy_context_menu(
-                                                event.position,
-                                                entry_id,
-                                                window,
-                                                cx,
-                                            );
-                                        }
-                                    }),
-                                )
-                                .when(!project.is_read_only(cx), |el| {
-                                    el.on_click(cx.listener(
-                                        |this, event: &gpui::ClickEvent, window, cx| {
-                                            if event.click_count() > 1
-                                                && let Some(entry_id) =
-                                                    this.state.last_worktree_root_id
-                                            {
-                                                let project = this.project.read(cx);
-
-                                                let worktree_id = if let Some(worktree) =
-                                                    project.worktree_for_entry(entry_id, cx)
-                                                {
-                                                    worktree.read(cx).id()
-                                                } else {
-                                                    return;
-                                                };
-
-                                                this.state.selection = Some(SelectedEntry {
-                                                    worktree_id,
-                                                    entry_id,
-                                                });
-
-                                                this.new_file(&NewFile, window, cx);
-                                            }
-                                        },
-                                    ))
-                                }),
-                        )
-                        .size_full(),
-                )
-                .custom_scrollbars(
-                    Scrollbars::for_settings::<ProjectPanelSettings>()
-                        .tracked_scroll_handle(&self.scroll_handle)
-                        .with_track_along(
-                            ScrollAxes::Horizontal,
-                            cx.theme().colors().panel_background,
-                        )
-                        .notify_content(),
-                    window,
-                    cx,
-                )
-                .children(self.context_menu.as_ref().map(|(menu, position, _)| {
-                    deferred(
-                        anchored()
-                            .position(*position)
-                            .anchor(gpui::Corner::TopLeft)
-                            .child(menu.clone()),
-                    )
-                    .with_priority(3)
-                }))
-        } else {
-            let focus_handle = self.focus_handle(cx);
-
-            v_flex()
-                .id("empty-project_panel")
-                .p_4()
-                .size_full()
-                .items_center()
-                .justify_center()
-                .gap_1()
-                .track_focus(&self.focus_handle(cx))
-                .child(
-                    Button::new("open_project", "Open Project")
-                        .full_width()
-                        .key_binding(KeyBinding::for_action_in(
-                            &workspace::Open,
-                            &focus_handle,
-                            cx,
-                        ))
-                        .on_click(cx.listener(|this, _, window, cx| {
-                            this.workspace
-                                .update(cx, |_, cx| {
-                                    window.dispatch_action(workspace::Open.boxed_clone(), cx);
-                                })
-                                .log_err();
-                        })),
-                )
-                .child(
-                    h_flex()
-                        .w_1_2()
-                        .gap_2()
-                        .child(Divider::horizontal())
-                        .child(Label::new("or").size(LabelSize::XSmall).color(Color::Muted))
-                        .child(Divider::horizontal()),
-                )
-                .child(
-                    Button::new("clone_repo", "Clone Repository")
-                        .full_width()
-                        .on_click(cx.listener(|this, _, window, cx| {
-                            this.workspace
-                                .update(cx, |_, cx| {
-                                    window.dispatch_action(git::Clone.boxed_clone(), cx);
-                                })
-                                .log_err();
-                        })),
-                )
-                .when(is_local, |div| {
-                    div.when(panel_settings.drag_and_drop, |div| {
-                        div.drag_over::<ExternalPaths>(|style, _, _, cx| {
-                            style.bg(cx.theme().colors().drop_target_background)
-                        })
-                        .on_drop(cx.listener(
-                            move |this, external_paths: &ExternalPaths, window, cx| {
-                                this.drag_target_entry = None;
-                                this.hover_scroll_task.take();
-                                if let Some(task) = this
-                                    .workspace
-                                    .update(cx, |workspace, cx| {
-                                        workspace.open_workspace_for_paths(
-                                            true,
-                                            external_paths.paths().to_owned(),
-                                            window,
-                                            cx,
-                                        )
-                                    })
-                                    .log_err()
-                                {
-                                    task.detach_and_log_err(cx);
-                                }
-                                cx.stop_propagation();
-                            },
-                        ))
-                    })
-                })
-        }
-    }
-}
-
-impl Render for DraggedProjectEntryView {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let ui_font = ThemeSettings::get_global(cx).ui_font.clone();
-        h_flex()
-            .font(ui_font)
-            .pl(self.click_offset.x + px(12.))
-            .pt(self.click_offset.y + px(12.))
-            .child(
-                div()
-                    .flex()
-                    .gap_1()
-                    .items_center()
-                    .py_1()
-                    .px_2()
-                    .rounded_lg()
-                    .bg(cx.theme().colors().background)
-                    .map(|this| {
-                        if self.selections.len() > 1 && self.selections.contains(&self.selection) {
-                            this.child(Label::new(format!("{} entries", self.selections.len())))
-                        } else {
-                            this.child(if let Some(icon) = &self.icon {
-                                div().child(Icon::from_path(icon.clone()))
-                            } else {
-                                div()
-                            })
-                            .child(Label::new(self.filename.clone()))
-                        }
-                    }),
-            )
-    }
-}
-
-impl EventEmitter<Event> for ProjectPanel {}
-
-impl EventEmitter<PanelEvent> for ProjectPanel {}
-
-impl Panel for ProjectPanel {
-    fn position(&self, _: &Window, cx: &App) -> DockPosition {
-        match ProjectPanelSettings::get_global(cx).dock {
-            DockSide::Left => DockPosition::Left,
-            DockSide::Right => DockPosition::Right,
-        }
-    }
-
-    fn position_is_valid(&self, position: DockPosition) -> bool {
-        matches!(position, DockPosition::Left | DockPosition::Right)
-    }
-
-    fn set_position(&mut self, position: DockPosition, _: &mut Window, cx: &mut Context<Self>) {
-        settings::update_settings_file(self.fs.clone(), cx, move |settings, _| {
-            let dock = match position {
-                DockPosition::Left | DockPosition::Bottom => DockSide::Left,
-                DockPosition::Right => DockSide::Right,
-            };
-            settings.project_panel.get_or_insert_default().dock = Some(dock);
-        });
-    }
-
-    fn size(&self, _: &Window, cx: &App) -> Pixels {
-        self.width
-            .unwrap_or_else(|| ProjectPanelSettings::get_global(cx).default_width)
-    }
-
-    fn set_size(&mut self, size: Option<Pixels>, window: &mut Window, cx: &mut Context<Self>) {
-        self.width = size;
-        cx.notify();
-        cx.defer_in(window, |this, _, cx| {
-            this.serialize(cx);
-        });
-    }
-
-    fn icon(&self, _: &Window, cx: &App) -> Option<IconName> {
-        ProjectPanelSettings::get_global(cx)
-            .button
-            .then_some(IconName::FileTree)
-    }
-
-    fn icon_tooltip(&self, _window: &Window, _cx: &App) -> Option<&'static str> {
-        Some("Project Panel")
-    }
-
-    fn toggle_action(&self) -> Box<dyn Action> {
-        Box::new(ToggleFocus)
-    }
-
-    fn persistent_name() -> &'static str {
-        "Project Panel"
-    }
-
-    fn panel_key() -> &'static str {
-        PROJECT_PANEL_KEY
-    }
-
-    fn starts_open(&self, _: &Window, cx: &App) -> bool {
-        if !ProjectPanelSettings::get_global(cx).starts_open {
-            return false;
-        }
-
-        let project = &self.project.read(cx);
-        project.visible_worktrees(cx).any(|tree| {
-            tree.read(cx)
-                .root_entry()
-                .is_some_and(|entry| entry.is_dir())
-        })
-    }
-
-    fn activation_priority(&self) -> u32 {
-        0
-    }
-}
-
-impl Focusable for ProjectPanel {
-    fn focus_handle(&self, _cx: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl ClipboardEntry {
-    fn is_cut(&self) -> bool {
-        matches!(self, Self::Cut { .. })
-    }
-
-    fn items(&self) -> &BTreeSet<SelectedEntry> {
-        match self {
-            ClipboardEntry::Copied(entries) | ClipboardEntry::Cut(entries) => entries,
-        }
-    }
-
-    fn into_copy_entry(self) -> Self {
-        match self {
-            ClipboardEntry::Copied(_) => self,
-            ClipboardEntry::Cut(entries) => ClipboardEntry::Copied(entries),
-        }
-    }
-}
-
-#[inline]
-fn cmp_directories_first(a: &Entry, b: &Entry) -> cmp::Ordering {
-    util::paths::compare_rel_paths((&a.path, a.is_file()), (&b.path, b.is_file()))
-}
-
-#[inline]
-fn cmp_mixed(a: &Entry, b: &Entry) -> cmp::Ordering {
-    util::paths::compare_rel_paths_mixed((&a.path, a.is_file()), (&b.path, b.is_file()))
-}
-
-#[inline]
-fn cmp_files_first(a: &Entry, b: &Entry) -> cmp::Ordering {
-    util::paths::compare_rel_paths_files_first((&a.path, a.is_file()), (&b.path, b.is_file()))
-}
-
-#[inline]
-fn cmp_with_mode(a: &Entry, b: &Entry, mode: &settings::ProjectPanelSortMode) -> cmp::Ordering {
-    match mode {
-        settings::ProjectPanelSortMode::DirectoriesFirst => cmp_directories_first(a, b),
-        settings::ProjectPanelSortMode::Mixed => cmp_mixed(a, b),
-        settings::ProjectPanelSortMode::FilesFirst => cmp_files_first(a, b),
-    }
-}
-
-pub fn sort_worktree_entries_with_mode(
-    entries: &mut [impl AsRef<Entry>],
-    mode: settings::ProjectPanelSortMode,
-) {
-    entries.sort_by(|lhs, rhs| cmp_with_mode(lhs.as_ref(), rhs.as_ref(), &mode));
-}
-
-pub fn par_sort_worktree_entries_with_mode(
-    entries: &mut Vec<GitEntry>,
-    mode: settings::ProjectPanelSortMode,
-) {
-    entries.par_sort_by(|lhs, rhs| cmp_with_mode(lhs, rhs, &mode));
-}
-
-#[cfg(test)]
-mod project_panel_tests;
diff --git a/crates/project_panel/src/project_panel_settings.rs b/crates/project_panel/src/project_panel_settings.rs
deleted file mode 100644
index b031627034..0000000000
--- a/crates/project_panel/src/project_panel_settings.rs
+++ /dev/null
@@ -1,124 +0,0 @@
-use editor::EditorSettings;
-use gpui::Pixels;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use settings::{
-    DockSide, ProjectPanelEntrySpacing, ProjectPanelSortMode, RegisterSetting, Settings,
-    ShowDiagnostics, ShowIndentGuides,
-};
-use ui::{
-    px,
-    scrollbars::{ScrollbarVisibility, ShowScrollbar},
-};
-
-#[derive(Deserialize, Debug, Clone, Copy, PartialEq, RegisterSetting)]
-pub struct ProjectPanelSettings {
-    pub button: bool,
-    pub hide_gitignore: bool,
-    pub default_width: Pixels,
-    pub dock: DockSide,
-    pub entry_spacing: ProjectPanelEntrySpacing,
-    pub file_icons: bool,
-    pub folder_icons: bool,
-    pub git_status: bool,
-    pub indent_size: f32,
-    pub indent_guides: IndentGuidesSettings,
-    pub sticky_scroll: bool,
-    pub auto_reveal_entries: bool,
-    pub auto_fold_dirs: bool,
-    pub starts_open: bool,
-    pub scrollbar: ScrollbarSettings,
-    pub show_diagnostics: ShowDiagnostics,
-    pub hide_root: bool,
-    pub hide_hidden: bool,
-    pub drag_and_drop: bool,
-    pub auto_open: AutoOpenSettings,
-    pub sort_mode: ProjectPanelSortMode,
-}
-
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
-pub struct IndentGuidesSettings {
-    pub show: ShowIndentGuides,
-}
-
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
-pub struct ScrollbarSettings {
-    /// When to show the scrollbar in the project panel.
-    ///
-    /// Default: inherits editor scrollbar settings
-    pub show: Option<ShowScrollbar>,
-}
-
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
-pub struct AutoOpenSettings {
-    pub on_create: bool,
-    pub on_paste: bool,
-    pub on_drop: bool,
-}
-
-impl AutoOpenSettings {
-    #[inline]
-    pub fn should_open_on_create(self) -> bool {
-        self.on_create
-    }
-
-    #[inline]
-    pub fn should_open_on_paste(self) -> bool {
-        self.on_paste
-    }
-
-    #[inline]
-    pub fn should_open_on_drop(self) -> bool {
-        self.on_drop
-    }
-}
-
-impl ScrollbarVisibility for ProjectPanelSettings {
-    fn visibility(&self, cx: &ui::App) -> ShowScrollbar {
-        self.scrollbar
-            .show
-            .unwrap_or_else(|| EditorSettings::get_global(cx).scrollbar.show)
-    }
-}
-
-impl Settings for ProjectPanelSettings {
-    fn from_settings(content: &settings::SettingsContent) -> Self {
-        let project_panel = content.project_panel.clone().unwrap();
-        Self {
-            button: project_panel.button.unwrap(),
-            hide_gitignore: project_panel.hide_gitignore.unwrap(),
-            default_width: px(project_panel.default_width.unwrap()),
-            dock: project_panel.dock.unwrap(),
-            entry_spacing: project_panel.entry_spacing.unwrap(),
-            file_icons: project_panel.file_icons.unwrap(),
-            folder_icons: project_panel.folder_icons.unwrap(),
-            git_status: project_panel.git_status.unwrap(),
-            indent_size: project_panel.indent_size.unwrap(),
-            indent_guides: IndentGuidesSettings {
-                show: project_panel.indent_guides.unwrap().show.unwrap(),
-            },
-            sticky_scroll: project_panel.sticky_scroll.unwrap(),
-            auto_reveal_entries: project_panel.auto_reveal_entries.unwrap(),
-            auto_fold_dirs: project_panel.auto_fold_dirs.unwrap(),
-            starts_open: project_panel.starts_open.unwrap(),
-            scrollbar: ScrollbarSettings {
-                show: project_panel.scrollbar.unwrap().show.map(Into::into),
-            },
-            show_diagnostics: project_panel.show_diagnostics.unwrap(),
-            hide_root: project_panel.hide_root.unwrap(),
-            hide_hidden: project_panel.hide_hidden.unwrap(),
-            drag_and_drop: project_panel.drag_and_drop.unwrap(),
-            auto_open: {
-                let auto_open = project_panel.auto_open.unwrap();
-                AutoOpenSettings {
-                    on_create: auto_open.on_create.unwrap(),
-                    on_paste: auto_open.on_paste.unwrap(),
-                    on_drop: auto_open.on_drop.unwrap(),
-                }
-            },
-            sort_mode: project_panel
-                .sort_mode
-                .unwrap_or(ProjectPanelSortMode::DirectoriesFirst),
-        }
-    }
-}
diff --git a/crates/project_panel/src/project_panel_tests.rs b/crates/project_panel/src/project_panel_tests.rs
deleted file mode 100644
index 3f54e01927..0000000000
--- a/crates/project_panel/src/project_panel_tests.rs
+++ /dev/null
@@ -1,8195 +0,0 @@
-use super::*;
-use collections::HashSet;
-use editor::MultiBufferOffset;
-use gpui::{Empty, Entity, TestAppContext, VisualTestContext, WindowHandle};
-use pretty_assertions::assert_eq;
-use project::FakeFs;
-use serde_json::json;
-use settings::{ProjectPanelAutoOpenSettings, SettingsStore};
-use std::path::{Path, PathBuf};
-use util::{path, paths::PathStyle, rel_path::rel_path};
-use workspace::{
-    AppState, ItemHandle, Pane,
-    item::{Item, ProjectItem},
-    register_project_item,
-};
-
-#[gpui::test]
-async fn test_visible_list(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/root1",
-        json!({
-            ".dockerignore": "",
-            ".git": {
-                "HEAD": "",
-            },
-            "a": {
-                "0": { "q": "", "r": "", "s": "" },
-                "1": { "t": "", "u": "" },
-                "2": { "v": "", "w": "", "x": "", "y": "" },
-            },
-            "b": {
-                "3": { "Q": "" },
-                "4": { "R": "", "S": "", "T": "", "U": "" },
-            },
-            "C": {
-                "5": {},
-                "6": { "V": "", "W": "" },
-                "7": { "X": "" },
-                "8": { "Y": {}, "Z": "" }
-            }
-        }),
-    )
-    .await;
-    fs.insert_tree(
-        "/root2",
-        json!({
-            "d": {
-                "9": ""
-            },
-            "e": {}
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/root1".as_ref(), "/root2".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..50, cx),
-        &[
-            "v root1",
-            "    > .git",
-            "    > a",
-            "    > b",
-            "    > C",
-            "      .dockerignore",
-            "v root2",
-            "    > d",
-            "    > e",
-        ]
-    );
-
-    toggle_expand_dir(&panel, "root1/b", cx);
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..50, cx),
-        &[
-            "v root1",
-            "    > .git",
-            "    > a",
-            "    v b  <== selected",
-            "        > 3",
-            "        > 4",
-            "    > C",
-            "      .dockerignore",
-            "v root2",
-            "    > d",
-            "    > e",
-        ]
-    );
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 6..9, cx),
-        &[
-            //
-            "    > C",
-            "      .dockerignore",
-            "v root2",
-        ]
-    );
-}
-
-#[gpui::test]
-async fn test_opening_file(cx: &mut gpui::TestAppContext) {
-    init_test_with_editor(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/src"),
-        json!({
-            "test": {
-                "first.rs": "// First Rust file",
-                "second.rs": "// Second Rust file",
-                "third.rs": "// Third Rust file",
-            }
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), [path!("/src").as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    toggle_expand_dir(&panel, "src/test", cx);
-    select_path(&panel, "src/test/first.rs", cx);
-    panel.update_in(cx, |panel, window, cx| panel.open(&Open, window, cx));
-    cx.executor().run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v src",
-            "    v test",
-            "          first.rs  <== selected  <== marked",
-            "          second.rs",
-            "          third.rs"
-        ]
-    );
-    ensure_single_file_is_opened(&workspace, "test/first.rs", cx);
-
-    select_path(&panel, "src/test/second.rs", cx);
-    panel.update_in(cx, |panel, window, cx| panel.open(&Open, window, cx));
-    cx.executor().run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v src",
-            "    v test",
-            "          first.rs",
-            "          second.rs  <== selected  <== marked",
-            "          third.rs"
-        ]
-    );
-    ensure_single_file_is_opened(&workspace, "test/second.rs", cx);
-}
-
-#[gpui::test]
-async fn test_exclusions_in_visible_list(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-    cx.update(|cx| {
-        cx.update_global::<SettingsStore, _>(|store, cx| {
-            store.update_user_settings(cx, |settings| {
-                settings.project.worktree.file_scan_exclusions =
-                    Some(vec!["**/.git".to_string(), "**/4/**".to_string()]);
-            });
-        });
-    });
-
-    let fs = FakeFs::new(cx.background_executor.clone());
-    fs.insert_tree(
-        "/root1",
-        json!({
-            ".dockerignore": "",
-            ".git": {
-                "HEAD": "",
-            },
-            "a": {
-                "0": { "q": "", "r": "", "s": "" },
-                "1": { "t": "", "u": "" },
-                "2": { "v": "", "w": "", "x": "", "y": "" },
-            },
-            "b": {
-                "3": { "Q": "" },
-                "4": { "R": "", "S": "", "T": "", "U": "" },
-            },
-            "C": {
-                "5": {},
-                "6": { "V": "", "W": "" },
-                "7": { "X": "" },
-                "8": { "Y": {}, "Z": "" }
-            }
-        }),
-    )
-    .await;
-    fs.insert_tree(
-        "/root2",
-        json!({
-            "d": {
-                "4": ""
-            },
-            "e": {}
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/root1".as_ref(), "/root2".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..50, cx),
-        &[
-            "v root1",
-            "    > a",
-            "    > b",
-            "    > C",
-            "      .dockerignore",
-            "v root2",
-            "    > d",
-            "    > e",
-        ]
-    );
-
-    toggle_expand_dir(&panel, "root1/b", cx);
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..50, cx),
-        &[
-            "v root1",
-            "    > a",
-            "    v b  <== selected",
-            "        > 3",
-            "    > C",
-            "      .dockerignore",
-            "v root2",
-            "    > d",
-            "    > e",
-        ]
-    );
-
-    toggle_expand_dir(&panel, "root2/d", cx);
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..50, cx),
-        &[
-            "v root1",
-            "    > a",
-            "    v b",
-            "        > 3",
-            "    > C",
-            "      .dockerignore",
-            "v root2",
-            "    v d  <== selected",
-            "    > e",
-        ]
-    );
-
-    toggle_expand_dir(&panel, "root2/e", cx);
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..50, cx),
-        &[
-            "v root1",
-            "    > a",
-            "    v b",
-            "        > 3",
-            "    > C",
-            "      .dockerignore",
-            "v root2",
-            "    v d",
-            "    v e  <== selected",
-        ]
-    );
-}
-
-#[gpui::test]
-async fn test_auto_collapse_dir_paths(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/root1"),
-        json!({
-            "dir_1": {
-                "nested_dir_1": {
-                    "nested_dir_2": {
-                        "nested_dir_3": {
-                            "file_a.java": "// File contents",
-                            "file_b.java": "// File contents",
-                            "file_c.java": "// File contents",
-                            "nested_dir_4": {
-                                "nested_dir_5": {
-                                    "file_d.java": "// File contents",
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }),
-    )
-    .await;
-    fs.insert_tree(
-        path!("/root2"),
-        json!({
-            "dir_2": {
-                "file_1.java": "// File contents",
-            }
-        }),
-    )
-    .await;
-
-    // Test 1: Multiple worktrees with auto_fold_dirs = true
-    let project = Project::test(
-        fs.clone(),
-        [path!("/root1").as_ref(), path!("/root2").as_ref()],
-        cx,
-    )
-    .await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    cx.update(|_, cx| {
-        let settings = *ProjectPanelSettings::get_global(cx);
-        ProjectPanelSettings::override_global(
-            ProjectPanelSettings {
-                auto_fold_dirs: true,
-                sort_mode: settings::ProjectPanelSortMode::DirectoriesFirst,
-                ..settings
-            },
-            cx,
-        );
-    });
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v root1",
-            "    > dir_1/nested_dir_1/nested_dir_2/nested_dir_3",
-            "v root2",
-            "    > dir_2",
-        ]
-    );
-
-    toggle_expand_dir(
-        &panel,
-        "root1/dir_1/nested_dir_1/nested_dir_2/nested_dir_3",
-        cx,
-    );
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v root1",
-            "    v dir_1/nested_dir_1/nested_dir_2/nested_dir_3  <== selected",
-            "        > nested_dir_4/nested_dir_5",
-            "          file_a.java",
-            "          file_b.java",
-            "          file_c.java",
-            "v root2",
-            "    > dir_2",
-        ]
-    );
-
-    toggle_expand_dir(
-        &panel,
-        "root1/dir_1/nested_dir_1/nested_dir_2/nested_dir_3/nested_dir_4/nested_dir_5",
-        cx,
-    );
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v root1",
-            "    v dir_1/nested_dir_1/nested_dir_2/nested_dir_3",
-            "        v nested_dir_4/nested_dir_5  <== selected",
-            "              file_d.java",
-            "          file_a.java",
-            "          file_b.java",
-            "          file_c.java",
-            "v root2",
-            "    > dir_2",
-        ]
-    );
-    toggle_expand_dir(&panel, "root2/dir_2", cx);
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v root1",
-            "    v dir_1/nested_dir_1/nested_dir_2/nested_dir_3",
-            "        v nested_dir_4/nested_dir_5",
-            "              file_d.java",
-            "          file_a.java",
-            "          file_b.java",
-            "          file_c.java",
-            "v root2",
-            "    v dir_2  <== selected",
-            "          file_1.java",
-        ]
-    );
-
-    // Test 2: Single worktree with auto_fold_dirs = true and hide_root = true
-    {
-        let project = Project::test(fs.clone(), [path!("/root1").as_ref()], cx).await;
-        let workspace =
-            cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let cx = &mut VisualTestContext::from_window(*workspace, cx);
-        cx.update(|_, cx| {
-            let settings = *ProjectPanelSettings::get_global(cx);
-            ProjectPanelSettings::override_global(
-                ProjectPanelSettings {
-                    auto_fold_dirs: true,
-                    hide_root: true,
-                    ..settings
-                },
-                cx,
-            );
-        });
-        let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-        cx.run_until_parked();
-        assert_eq!(
-            visible_entries_as_strings(&panel, 0..10, cx),
-            &["> dir_1/nested_dir_1/nested_dir_2/nested_dir_3"],
-            "Single worktree with hide_root=true should hide root and show auto-folded paths"
-        );
-
-        toggle_expand_dir(
-            &panel,
-            "root1/dir_1/nested_dir_1/nested_dir_2/nested_dir_3",
-            cx,
-        );
-        assert_eq!(
-            visible_entries_as_strings(&panel, 0..10, cx),
-            &[
-                "v dir_1/nested_dir_1/nested_dir_2/nested_dir_3  <== selected",
-                "    > nested_dir_4/nested_dir_5",
-                "      file_a.java",
-                "      file_b.java",
-                "      file_c.java",
-            ],
-            "Expanded auto-folded path with hidden root should show contents without root prefix"
-        );
-
-        toggle_expand_dir(
-            &panel,
-            "root1/dir_1/nested_dir_1/nested_dir_2/nested_dir_3/nested_dir_4/nested_dir_5",
-            cx,
-        );
-        assert_eq!(
-            visible_entries_as_strings(&panel, 0..10, cx),
-            &[
-                "v dir_1/nested_dir_1/nested_dir_2/nested_dir_3",
-                "    v nested_dir_4/nested_dir_5  <== selected",
-                "          file_d.java",
-                "      file_a.java",
-                "      file_b.java",
-                "      file_c.java",
-            ],
-            "Nested expansion with hidden root should maintain proper indentation"
-        );
-    }
-}
-
-#[gpui::test(iterations = 30)]
-async fn test_editing_files(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/root1",
-        json!({
-            ".dockerignore": "",
-            ".git": {
-                "HEAD": "",
-            },
-            "a": {
-                "0": { "q": "", "r": "", "s": "" },
-                "1": { "t": "", "u": "" },
-                "2": { "v": "", "w": "", "x": "", "y": "" },
-            },
-            "b": {
-                "3": { "Q": "" },
-                "4": { "R": "", "S": "", "T": "", "U": "" },
-            },
-            "C": {
-                "5": {},
-                "6": { "V": "", "W": "" },
-                "7": { "X": "" },
-                "8": { "Y": {}, "Z": "" }
-            }
-        }),
-    )
-    .await;
-    fs.insert_tree(
-        "/root2",
-        json!({
-            "d": {
-                "9": ""
-            },
-            "e": {}
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/root1".as_ref(), "/root2".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace
-        .update(cx, |workspace, window, cx| {
-            let panel = ProjectPanel::new(workspace, window, cx);
-            workspace.add_panel(panel.clone(), window, cx);
-            panel
-        })
-        .unwrap();
-    cx.run_until_parked();
-
-    select_path(&panel, "root1", cx);
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v root1  <== selected",
-            "    > .git",
-            "    > a",
-            "    > b",
-            "    > C",
-            "      .dockerignore",
-            "v root2",
-            "    > d",
-            "    > e",
-        ]
-    );
-
-    // Add a file with the root folder selected. The filename editor is placed
-    // before the first file in the root folder.
-    panel.update_in(cx, |panel, window, cx| panel.new_file(&NewFile, window, cx));
-    cx.run_until_parked();
-    panel.update_in(cx, |panel, window, cx| {
-        assert!(panel.filename_editor.read(cx).is_focused(window));
-    });
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v root1",
-            "    > .git",
-            "    > a",
-            "    > b",
-            "    > C",
-            "      [EDITOR: '']  <== selected",
-            "      .dockerignore",
-            "v root2",
-            "    > d",
-            "    > e",
-        ]
-    );
-
-    let confirm = panel.update_in(cx, |panel, window, cx| {
-        panel.filename_editor.update(cx, |editor, cx| {
-            editor.set_text("the-new-filename", window, cx)
-        });
-        panel.confirm_edit(true, window, cx).unwrap()
-    });
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v root1",
-            "    > .git",
-            "    > a",
-            "    > b",
-            "    > C",
-            "      [PROCESSING: 'the-new-filename']  <== selected",
-            "      .dockerignore",
-            "v root2",
-            "    > d",
-            "    > e",
-        ]
-    );
-
-    confirm.await.unwrap();
-    cx.run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v root1",
-            "    > .git",
-            "    > a",
-            "    > b",
-            "    > C",
-            "      .dockerignore",
-            "      the-new-filename  <== selected  <== marked",
-            "v root2",
-            "    > d",
-            "    > e",
-        ]
-    );
-
-    select_path(&panel, "root1/b", cx);
-    panel.update_in(cx, |panel, window, cx| panel.new_file(&NewFile, window, cx));
-    cx.run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v root1",
-            "    > .git",
-            "    > a",
-            "    v b",
-            "        > 3",
-            "        > 4",
-            "          [EDITOR: '']  <== selected",
-            "    > C",
-            "      .dockerignore",
-            "      the-new-filename",
-        ]
-    );
-
-    panel
-        .update_in(cx, |panel, window, cx| {
-            panel.filename_editor.update(cx, |editor, cx| {
-                editor.set_text("another-filename.txt", window, cx)
-            });
-            panel.confirm_edit(true, window, cx).unwrap()
-        })
-        .await
-        .unwrap();
-    cx.run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v root1",
-            "    > .git",
-            "    > a",
-            "    v b",
-            "        > 3",
-            "        > 4",
-            "          another-filename.txt  <== selected  <== marked",
-            "    > C",
-            "      .dockerignore",
-            "      the-new-filename",
-        ]
-    );
-
-    select_path(&panel, "root1/b/another-filename.txt", cx);
-    panel.update_in(cx, |panel, window, cx| panel.rename(&Rename, window, cx));
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v root1",
-            "    > .git",
-            "    > a",
-            "    v b",
-            "        > 3",
-            "        > 4",
-            "          [EDITOR: 'another-filename.txt']  <== selected  <== marked",
-            "    > C",
-            "      .dockerignore",
-            "      the-new-filename",
-        ]
-    );
-
-    let confirm = panel.update_in(cx, |panel, window, cx| {
-        panel.filename_editor.update(cx, |editor, cx| {
-            let file_name_selections = editor
-                .selections
-                .all::<MultiBufferOffset>(&editor.display_snapshot(cx));
-            assert_eq!(
-                file_name_selections.len(),
-                1,
-                "File editing should have a single selection, but got: {file_name_selections:?}"
-            );
-            let file_name_selection = &file_name_selections[0];
-            assert_eq!(
-                file_name_selection.start,
-                MultiBufferOffset(0),
-                "Should select the file name from the start"
-            );
-            assert_eq!(
-                file_name_selection.end,
-                MultiBufferOffset("another-filename".len()),
-                "Should not select file extension"
-            );
-
-            editor.set_text("a-different-filename.tar.gz", window, cx)
-        });
-        panel.confirm_edit(true, window, cx).unwrap()
-    });
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v root1",
-            "    > .git",
-            "    > a",
-            "    v b",
-            "        > 3",
-            "        > 4",
-            "          [PROCESSING: 'a-different-filename.tar.gz']  <== selected  <== marked",
-            "    > C",
-            "      .dockerignore",
-            "      the-new-filename",
-        ]
-    );
-
-    confirm.await.unwrap();
-    cx.run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v root1",
-            "    > .git",
-            "    > a",
-            "    v b",
-            "        > 3",
-            "        > 4",
-            "          a-different-filename.tar.gz  <== selected",
-            "    > C",
-            "      .dockerignore",
-            "      the-new-filename",
-        ]
-    );
-
-    panel.update_in(cx, |panel, window, cx| panel.rename(&Rename, window, cx));
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v root1",
-            "    > .git",
-            "    > a",
-            "    v b",
-            "        > 3",
-            "        > 4",
-            "          [EDITOR: 'a-different-filename.tar.gz']  <== selected",
-            "    > C",
-            "      .dockerignore",
-            "      the-new-filename",
-        ]
-    );
-
-    panel.update_in(cx, |panel, window, cx| {
-            panel.filename_editor.update(cx, |editor, cx| {
-                let file_name_selections = editor.selections.all::<MultiBufferOffset>(&editor.display_snapshot(cx));
-                assert_eq!(file_name_selections.len(), 1, "File editing should have a single selection, but got: {file_name_selections:?}");
-                let file_name_selection = &file_name_selections[0];
-                assert_eq!(file_name_selection.start, MultiBufferOffset(0), "Should select the file name from the start");
-                assert_eq!(file_name_selection.end, MultiBufferOffset("a-different-filename.tar".len()), "Should not select file extension, but still may select anything up to the last dot..");
-
-            });
-            panel.cancel(&menu::Cancel, window, cx)
-        });
-    cx.run_until_parked();
-    panel.update_in(cx, |panel, window, cx| {
-        panel.new_directory(&NewDirectory, window, cx)
-    });
-    cx.run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v root1",
-            "    > .git",
-            "    > a",
-            "    v b",
-            "        > [EDITOR: '']  <== selected",
-            "        > 3",
-            "        > 4",
-            "          a-different-filename.tar.gz",
-            "    > C",
-            "      .dockerignore",
-        ]
-    );
-
-    let confirm = panel.update_in(cx, |panel, window, cx| {
-        panel
-            .filename_editor
-            .update(cx, |editor, cx| editor.set_text("new-dir", window, cx));
-        panel.confirm_edit(true, window, cx).unwrap()
-    });
-    panel.update_in(cx, |panel, window, cx| {
-        panel.select_next(&Default::default(), window, cx)
-    });
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v root1",
-            "    > .git",
-            "    > a",
-            "    v b",
-            "        > [PROCESSING: 'new-dir']",
-            "        > 3  <== selected",
-            "        > 4",
-            "          a-different-filename.tar.gz",
-            "    > C",
-            "      .dockerignore",
-        ]
-    );
-
-    confirm.await.unwrap();
-    cx.run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v root1",
-            "    > .git",
-            "    > a",
-            "    v b",
-            "        > 3  <== selected",
-            "        > 4",
-            "        > new-dir",
-            "          a-different-filename.tar.gz",
-            "    > C",
-            "      .dockerignore",
-        ]
-    );
-
-    panel.update_in(cx, |panel, window, cx| {
-        panel.rename(&Default::default(), window, cx)
-    });
-    cx.run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v root1",
-            "    > .git",
-            "    > a",
-            "    v b",
-            "        > [EDITOR: '3']  <== selected",
-            "        > 4",
-            "        > new-dir",
-            "          a-different-filename.tar.gz",
-            "    > C",
-            "      .dockerignore",
-        ]
-    );
-
-    // Dismiss the rename editor when it loses focus.
-    workspace.update(cx, |_, window, _| window.blur()).unwrap();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v root1",
-            "    > .git",
-            "    > a",
-            "    v b",
-            "        > 3  <== selected",
-            "        > 4",
-            "        > new-dir",
-            "          a-different-filename.tar.gz",
-            "    > C",
-            "      .dockerignore",
-        ]
-    );
-
-    // Test empty filename and filename with only whitespace
-    panel.update_in(cx, |panel, window, cx| panel.new_file(&NewFile, window, cx));
-    cx.run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v root1",
-            "    > .git",
-            "    > a",
-            "    v b",
-            "        v 3",
-            "              [EDITOR: '']  <== selected",
-            "              Q",
-            "        > 4",
-            "        > new-dir",
-            "          a-different-filename.tar.gz",
-        ]
-    );
-    panel.update_in(cx, |panel, window, cx| {
-        panel.filename_editor.update(cx, |editor, cx| {
-            editor.set_text("", window, cx);
-        });
-        assert!(panel.confirm_edit(true, window, cx).is_none());
-        panel.filename_editor.update(cx, |editor, cx| {
-            editor.set_text("   ", window, cx);
-        });
-        assert!(panel.confirm_edit(true, window, cx).is_none());
-        panel.cancel(&menu::Cancel, window, cx);
-        panel.update_visible_entries(None, false, false, window, cx);
-    });
-    cx.run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v root1",
-            "    > .git",
-            "    > a",
-            "    v b",
-            "        v 3  <== selected",
-            "              Q",
-            "        > 4",
-            "        > new-dir",
-            "          a-different-filename.tar.gz",
-            "    > C",
-        ]
-    );
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_adding_directories_via_file(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/root1",
-        json!({
-            ".dockerignore": "",
-            ".git": {
-                "HEAD": "",
-            },
-            "a": {
-                "0": { "q": "", "r": "", "s": "" },
-                "1": { "t": "", "u": "" },
-                "2": { "v": "", "w": "", "x": "", "y": "" },
-            },
-            "b": {
-                "3": { "Q": "" },
-                "4": { "R": "", "S": "", "T": "", "U": "" },
-            },
-            "C": {
-                "5": {},
-                "6": { "V": "", "W": "" },
-                "7": { "X": "" },
-                "8": { "Y": {}, "Z": "" }
-            }
-        }),
-    )
-    .await;
-    fs.insert_tree(
-        "/root2",
-        json!({
-            "d": {
-                "9": ""
-            },
-            "e": {}
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/root1".as_ref(), "/root2".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace
-        .update(cx, |workspace, window, cx| {
-            let panel = ProjectPanel::new(workspace, window, cx);
-            workspace.add_panel(panel.clone(), window, cx);
-            panel
-        })
-        .unwrap();
-    cx.run_until_parked();
-
-    select_path(&panel, "root1", cx);
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v root1  <== selected",
-            "    > .git",
-            "    > a",
-            "    > b",
-            "    > C",
-            "      .dockerignore",
-            "v root2",
-            "    > d",
-            "    > e",
-        ]
-    );
-
-    // Add a file with the root folder selected. The filename editor is placed
-    // before the first file in the root folder.
-    panel.update_in(cx, |panel, window, cx| panel.new_file(&NewFile, window, cx));
-    cx.run_until_parked();
-    panel.update_in(cx, |panel, window, cx| {
-        assert!(panel.filename_editor.read(cx).is_focused(window));
-    });
-    cx.run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v root1",
-            "    > .git",
-            "    > a",
-            "    > b",
-            "    > C",
-            "      [EDITOR: '']  <== selected",
-            "      .dockerignore",
-            "v root2",
-            "    > d",
-            "    > e",
-        ]
-    );
-
-    let confirm = panel.update_in(cx, |panel, window, cx| {
-        panel.filename_editor.update(cx, |editor, cx| {
-            editor.set_text("/bdir1/dir2/the-new-filename", window, cx)
-        });
-        panel.confirm_edit(true, window, cx).unwrap()
-    });
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v root1",
-            "    > .git",
-            "    > a",
-            "    > b",
-            "    > C",
-            "      [PROCESSING: 'bdir1/dir2/the-new-filename']  <== selected",
-            "      .dockerignore",
-            "v root2",
-            "    > d",
-            "    > e",
-        ]
-    );
-
-    confirm.await.unwrap();
-    cx.run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..13, cx),
-        &[
-            "v root1",
-            "    > .git",
-            "    > a",
-            "    > b",
-            "    v bdir1",
-            "        v dir2",
-            "              the-new-filename  <== selected  <== marked",
-            "    > C",
-            "      .dockerignore",
-            "v root2",
-            "    > d",
-            "    > e",
-        ]
-    );
-}
-
-#[gpui::test]
-async fn test_adding_directory_via_file(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/root1"),
-        json!({
-            ".dockerignore": "",
-            ".git": {
-                "HEAD": "",
-            },
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), [path!("/root1").as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace
-        .update(cx, |workspace, window, cx| {
-            let panel = ProjectPanel::new(workspace, window, cx);
-            workspace.add_panel(panel.clone(), window, cx);
-            panel
-        })
-        .unwrap();
-    cx.run_until_parked();
-
-    select_path(&panel, "root1", cx);
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &["v root1  <== selected", "    > .git", "      .dockerignore",]
-    );
-
-    // Add a file with the root folder selected. The filename editor is placed
-    // before the first file in the root folder.
-    panel.update_in(cx, |panel, window, cx| panel.new_file(&NewFile, window, cx));
-    cx.run_until_parked();
-    panel.update_in(cx, |panel, window, cx| {
-        assert!(panel.filename_editor.read(cx).is_focused(window));
-    });
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v root1",
-            "    > .git",
-            "      [EDITOR: '']  <== selected",
-            "      .dockerignore",
-        ]
-    );
-
-    let confirm = panel.update_in(cx, |panel, window, cx| {
-        // If we want to create a subdirectory, there should be no prefix slash.
-        panel
-            .filename_editor
-            .update(cx, |editor, cx| editor.set_text("new_dir/", window, cx));
-        panel.confirm_edit(true, window, cx).unwrap()
-    });
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v root1",
-            "    > .git",
-            "      [PROCESSING: 'new_dir']  <== selected",
-            "      .dockerignore",
-        ]
-    );
-
-    confirm.await.unwrap();
-    cx.run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v root1",
-            "    > .git",
-            "    v new_dir  <== selected",
-            "      .dockerignore",
-        ]
-    );
-
-    // Test filename with whitespace
-    select_path(&panel, "root1", cx);
-    panel.update_in(cx, |panel, window, cx| panel.new_file(&NewFile, window, cx));
-    let confirm = panel.update_in(cx, |panel, window, cx| {
-        // If we want to create a subdirectory, there should be no prefix slash.
-        panel
-            .filename_editor
-            .update(cx, |editor, cx| editor.set_text("new dir 2/", window, cx));
-        panel.confirm_edit(true, window, cx).unwrap()
-    });
-    confirm.await.unwrap();
-    cx.run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v root1",
-            "    > .git",
-            "    v new dir 2  <== selected",
-            "    v new_dir",
-            "      .dockerignore",
-        ]
-    );
-
-    // Test filename ends with "\"
-    #[cfg(target_os = "windows")]
-    {
-        select_path(&panel, "root1", cx);
-        panel.update_in(cx, |panel, window, cx| panel.new_file(&NewFile, window, cx));
-        let confirm = panel.update_in(cx, |panel, window, cx| {
-            // If we want to create a subdirectory, there should be no prefix slash.
-            panel
-                .filename_editor
-                .update(cx, |editor, cx| editor.set_text("new_dir_3\\", window, cx));
-            panel.confirm_edit(true, window, cx).unwrap()
-        });
-        confirm.await.unwrap();
-        cx.run_until_parked();
-        assert_eq!(
-            visible_entries_as_strings(&panel, 0..10, cx),
-            &[
-                "v root1",
-                "    > .git",
-                "    v new dir 2",
-                "    v new_dir",
-                "    v new_dir_3  <== selected",
-                "      .dockerignore",
-            ]
-        );
-    }
-}
-
-#[gpui::test]
-async fn test_copy_paste(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/root1",
-        json!({
-            "one.two.txt": "",
-            "one.txt": ""
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/root1".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    panel.update_in(cx, |panel, window, cx| {
-        panel.select_next(&Default::default(), window, cx);
-        panel.select_next(&Default::default(), window, cx);
-    });
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..50, cx),
-        &[
-            //
-            "v root1",
-            "      one.txt  <== selected",
-            "      one.two.txt",
-        ]
-    );
-
-    // Regression test - file name is created correctly when
-    // the copied file's name contains multiple dots.
-    panel.update_in(cx, |panel, window, cx| {
-        panel.copy(&Default::default(), window, cx);
-        panel.paste(&Default::default(), window, cx);
-    });
-    cx.executor().run_until_parked();
-    panel.update_in(cx, |panel, window, cx| {
-        assert!(panel.filename_editor.read(cx).is_focused(window));
-    });
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..50, cx),
-        &[
-            //
-            "v root1",
-            "      one.txt",
-            "      [EDITOR: 'one copy.txt']  <== selected  <== marked",
-            "      one.two.txt",
-        ]
-    );
-
-    panel.update_in(cx, |panel, window, cx| {
-        panel.filename_editor.update(cx, |editor, cx| {
-            let file_name_selections = editor
-                .selections
-                .all::<MultiBufferOffset>(&editor.display_snapshot(cx));
-            assert_eq!(
-                file_name_selections.len(),
-                1,
-                "File editing should have a single selection, but got: {file_name_selections:?}"
-            );
-            let file_name_selection = &file_name_selections[0];
-            assert_eq!(
-                file_name_selection.start,
-                MultiBufferOffset("one".len()),
-                "Should select the file name disambiguation after the original file name"
-            );
-            assert_eq!(
-                file_name_selection.end,
-                MultiBufferOffset("one copy".len()),
-                "Should select the file name disambiguation until the extension"
-            );
-        });
-        assert!(panel.confirm_edit(true, window, cx).is_none());
-    });
-
-    panel.update_in(cx, |panel, window, cx| {
-        panel.paste(&Default::default(), window, cx);
-    });
-    cx.executor().run_until_parked();
-    panel.update_in(cx, |panel, window, cx| {
-        assert!(panel.filename_editor.read(cx).is_focused(window));
-    });
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..50, cx),
-        &[
-            //
-            "v root1",
-            "      one.txt",
-            "      one copy.txt",
-            "      [EDITOR: 'one copy 1.txt']  <== selected  <== marked",
-            "      one.two.txt",
-        ]
-    );
-
-    panel.update_in(cx, |panel, window, cx| {
-        assert!(panel.confirm_edit(true, window, cx).is_none())
-    });
-}
-
-#[gpui::test]
-async fn test_cut_paste(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/root",
-        json!({
-            "one.txt": "",
-            "two.txt": "",
-            "a": {},
-            "b": {}
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/root".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    select_path_with_mark(&panel, "root/one.txt", cx);
-    select_path_with_mark(&panel, "root/two.txt", cx);
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..50, cx),
-        &[
-            "v root",
-            "    > a",
-            "    > b",
-            "      one.txt  <== marked",
-            "      two.txt  <== selected  <== marked",
-        ]
-    );
-
-    panel.update_in(cx, |panel, window, cx| {
-        panel.cut(&Default::default(), window, cx);
-    });
-
-    select_path(&panel, "root/a", cx);
-
-    panel.update_in(cx, |panel, window, cx| {
-        panel.paste(&Default::default(), window, cx);
-        panel.update_visible_entries(None, false, false, window, cx);
-    });
-    cx.executor().run_until_parked();
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..50, cx),
-        &[
-            "v root",
-            "    v a",
-            "          one.txt  <== marked",
-            "          two.txt  <== selected  <== marked",
-            "    > b",
-        ],
-        "Cut entries should be moved on first paste."
-    );
-
-    panel.update_in(cx, |panel, window, cx| {
-        panel.cancel(&menu::Cancel {}, window, cx)
-    });
-    cx.executor().run_until_parked();
-
-    select_path(&panel, "root/b", cx);
-
-    panel.update_in(cx, |panel, window, cx| {
-        panel.paste(&Default::default(), window, cx);
-    });
-    cx.executor().run_until_parked();
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..50, cx),
-        &[
-            "v root",
-            "    v a",
-            "          one.txt",
-            "          two.txt",
-            "    v b",
-            "          one.txt",
-            "          two.txt  <== selected",
-        ],
-        "Cut entries should only be copied for the second paste!"
-    );
-}
-
-#[gpui::test]
-async fn test_cut_paste_between_different_worktrees(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/root1",
-        json!({
-            "one.txt": "",
-            "two.txt": "",
-            "three.txt": "",
-            "a": {
-                "0": { "q": "", "r": "", "s": "" },
-                "1": { "t": "", "u": "" },
-                "2": { "v": "", "w": "", "x": "", "y": "" },
-            },
-        }),
-    )
-    .await;
-
-    fs.insert_tree(
-        "/root2",
-        json!({
-            "one.txt": "",
-            "two.txt": "",
-            "four.txt": "",
-            "b": {
-                "3": { "Q": "" },
-                "4": { "R": "", "S": "", "T": "", "U": "" },
-            },
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/root1".as_ref(), "/root2".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    select_path(&panel, "root1/three.txt", cx);
-    panel.update_in(cx, |panel, window, cx| {
-        panel.cut(&Default::default(), window, cx);
-    });
-
-    select_path(&panel, "root2/one.txt", cx);
-    panel.update_in(cx, |panel, window, cx| {
-        panel.select_next(&Default::default(), window, cx);
-        panel.paste(&Default::default(), window, cx);
-    });
-    cx.executor().run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..50, cx),
-        &[
-            //
-            "v root1",
-            "    > a",
-            "      one.txt",
-            "      two.txt",
-            "v root2",
-            "    > b",
-            "      four.txt",
-            "      one.txt",
-            "      three.txt  <== selected  <== marked",
-            "      two.txt",
-        ]
-    );
-
-    select_path(&panel, "root1/a", cx);
-    panel.update_in(cx, |panel, window, cx| {
-        panel.cut(&Default::default(), window, cx);
-    });
-    select_path(&panel, "root2/two.txt", cx);
-    panel.update_in(cx, |panel, window, cx| {
-        panel.select_next(&Default::default(), window, cx);
-        panel.paste(&Default::default(), window, cx);
-    });
-
-    cx.executor().run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..50, cx),
-        &[
-            //
-            "v root1",
-            "      one.txt",
-            "      two.txt",
-            "v root2",
-            "    > a  <== selected",
-            "    > b",
-            "      four.txt",
-            "      one.txt",
-            "      three.txt  <== marked",
-            "      two.txt",
-        ]
-    );
-}
-
-#[gpui::test]
-async fn test_copy_paste_between_different_worktrees(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/root1",
-        json!({
-            "one.txt": "",
-            "two.txt": "",
-            "three.txt": "",
-            "a": {
-                "0": { "q": "", "r": "", "s": "" },
-                "1": { "t": "", "u": "" },
-                "2": { "v": "", "w": "", "x": "", "y": "" },
-            },
-        }),
-    )
-    .await;
-
-    fs.insert_tree(
-        "/root2",
-        json!({
-            "one.txt": "",
-            "two.txt": "",
-            "four.txt": "",
-            "b": {
-                "3": { "Q": "" },
-                "4": { "R": "", "S": "", "T": "", "U": "" },
-            },
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/root1".as_ref(), "/root2".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    select_path(&panel, "root1/three.txt", cx);
-    panel.update_in(cx, |panel, window, cx| {
-        panel.copy(&Default::default(), window, cx);
-    });
-
-    select_path(&panel, "root2/one.txt", cx);
-    panel.update_in(cx, |panel, window, cx| {
-        panel.select_next(&Default::default(), window, cx);
-        panel.paste(&Default::default(), window, cx);
-    });
-    cx.executor().run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..50, cx),
-        &[
-            //
-            "v root1",
-            "    > a",
-            "      one.txt",
-            "      three.txt",
-            "      two.txt",
-            "v root2",
-            "    > b",
-            "      four.txt",
-            "      one.txt",
-            "      three.txt  <== selected  <== marked",
-            "      two.txt",
-        ]
-    );
-
-    select_path(&panel, "root1/three.txt", cx);
-    panel.update_in(cx, |panel, window, cx| {
-        panel.copy(&Default::default(), window, cx);
-    });
-    select_path(&panel, "root2/two.txt", cx);
-    panel.update_in(cx, |panel, window, cx| {
-        panel.select_next(&Default::default(), window, cx);
-        panel.paste(&Default::default(), window, cx);
-    });
-
-    cx.executor().run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..50, cx),
-        &[
-            //
-            "v root1",
-            "    > a",
-            "      one.txt",
-            "      three.txt",
-            "      two.txt",
-            "v root2",
-            "    > b",
-            "      four.txt",
-            "      one.txt",
-            "      three.txt",
-            "      [EDITOR: 'three copy.txt']  <== selected  <== marked",
-            "      two.txt",
-        ]
-    );
-
-    panel.update_in(cx, |panel, window, cx| {
-        panel.cancel(&menu::Cancel {}, window, cx)
-    });
-    cx.executor().run_until_parked();
-
-    select_path(&panel, "root1/a", cx);
-    panel.update_in(cx, |panel, window, cx| {
-        panel.copy(&Default::default(), window, cx);
-    });
-    select_path(&panel, "root2/two.txt", cx);
-    panel.update_in(cx, |panel, window, cx| {
-        panel.select_next(&Default::default(), window, cx);
-        panel.paste(&Default::default(), window, cx);
-    });
-
-    cx.executor().run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..50, cx),
-        &[
-            //
-            "v root1",
-            "    > a",
-            "      one.txt",
-            "      three.txt",
-            "      two.txt",
-            "v root2",
-            "    > a  <== selected",
-            "    > b",
-            "      four.txt",
-            "      one.txt",
-            "      three.txt",
-            "      three copy.txt",
-            "      two.txt",
-        ]
-    );
-}
-
-#[gpui::test]
-async fn test_copy_paste_directory(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/root",
-        json!({
-            "a": {
-                "one.txt": "",
-                "two.txt": "",
-                "inner_dir": {
-                    "three.txt": "",
-                    "four.txt": "",
-                }
-            },
-            "b": {}
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/root".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    select_path(&panel, "root/a", cx);
-    panel.update_in(cx, |panel, window, cx| {
-        panel.copy(&Default::default(), window, cx);
-        panel.select_next(&Default::default(), window, cx);
-        panel.paste(&Default::default(), window, cx);
-    });
-    cx.executor().run_until_parked();
-
-    let pasted_dir = find_project_entry(&panel, "root/b/a", cx);
-    assert_ne!(pasted_dir, None, "Pasted directory should have an entry");
-
-    let pasted_dir_file = find_project_entry(&panel, "root/b/a/one.txt", cx);
-    assert_ne!(
-        pasted_dir_file, None,
-        "Pasted directory file should have an entry"
-    );
-
-    let pasted_dir_inner_dir = find_project_entry(&panel, "root/b/a/inner_dir", cx);
-    assert_ne!(
-        pasted_dir_inner_dir, None,
-        "Directories inside pasted directory should have an entry"
-    );
-
-    toggle_expand_dir(&panel, "root/b/a", cx);
-    toggle_expand_dir(&panel, "root/b/a/inner_dir", cx);
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..50, cx),
-        &[
-            //
-            "v root",
-            "    > a",
-            "    v b",
-            "        v a",
-            "            v inner_dir  <== selected",
-            "                  four.txt",
-            "                  three.txt",
-            "              one.txt",
-            "              two.txt",
-        ]
-    );
-
-    select_path(&panel, "root", cx);
-    panel.update_in(cx, |panel, window, cx| {
-        panel.paste(&Default::default(), window, cx)
-    });
-    cx.executor().run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..50, cx),
-        &[
-            //
-            "v root",
-            "    > a",
-            "    > [EDITOR: 'a copy']  <== selected",
-            "    v b",
-            "        v a",
-            "            v inner_dir",
-            "                  four.txt",
-            "                  three.txt",
-            "              one.txt",
-            "              two.txt"
-        ]
-    );
-
-    let confirm = panel.update_in(cx, |panel, window, cx| {
-        panel
-            .filename_editor
-            .update(cx, |editor, cx| editor.set_text("c", window, cx));
-        panel.confirm_edit(true, window, cx).unwrap()
-    });
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..50, cx),
-        &[
-            //
-            "v root",
-            "    > a",
-            "    > [PROCESSING: 'c']  <== selected",
-            "    v b",
-            "        v a",
-            "            v inner_dir",
-            "                  four.txt",
-            "                  three.txt",
-            "              one.txt",
-            "              two.txt"
-        ]
-    );
-
-    confirm.await.unwrap();
-
-    panel.update_in(cx, |panel, window, cx| {
-        panel.paste(&Default::default(), window, cx)
-    });
-    cx.executor().run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..50, cx),
-        &[
-            //
-            "v root",
-            "    > a",
-            "    v b",
-            "        v a",
-            "            v inner_dir",
-            "                  four.txt",
-            "                  three.txt",
-            "              one.txt",
-            "              two.txt",
-            "    v c",
-            "        > a  <== selected",
-            "        > inner_dir",
-            "          one.txt",
-            "          two.txt",
-        ]
-    );
-}
-
-#[gpui::test]
-async fn test_copy_paste_directory_with_sibling_file(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/test",
-        json!({
-            "dir1": {
-                "a.txt": "",
-                "b.txt": "",
-            },
-            "dir2": {},
-            "c.txt": "",
-            "d.txt": "",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/test".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    toggle_expand_dir(&panel, "test/dir1", cx);
-
-    cx.simulate_modifiers_change(gpui::Modifiers {
-        control: true,
-        ..Default::default()
-    });
-
-    select_path_with_mark(&panel, "test/dir1", cx);
-    select_path_with_mark(&panel, "test/c.txt", cx);
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..15, cx),
-        &[
-            "v test",
-            "    v dir1  <== marked",
-            "          a.txt",
-            "          b.txt",
-            "    > dir2",
-            "      c.txt  <== selected  <== marked",
-            "      d.txt",
-        ],
-        "Initial state before copying dir1 and c.txt"
-    );
-
-    panel.update_in(cx, |panel, window, cx| {
-        panel.copy(&Default::default(), window, cx);
-    });
-    select_path(&panel, "test/dir2", cx);
-    panel.update_in(cx, |panel, window, cx| {
-        panel.paste(&Default::default(), window, cx);
-    });
-    cx.executor().run_until_parked();
-
-    toggle_expand_dir(&panel, "test/dir2/dir1", cx);
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..15, cx),
-        &[
-            "v test",
-            "    v dir1  <== marked",
-            "          a.txt",
-            "          b.txt",
-            "    v dir2",
-            "        v dir1  <== selected",
-            "              a.txt",
-            "              b.txt",
-            "          c.txt",
-            "      c.txt  <== marked",
-            "      d.txt",
-        ],
-        "Should copy dir1 as well as c.txt into dir2"
-    );
-
-    // Disambiguating multiple files should not open the rename editor.
-    select_path(&panel, "test/dir2", cx);
-    panel.update_in(cx, |panel, window, cx| {
-        panel.paste(&Default::default(), window, cx);
-    });
-    cx.executor().run_until_parked();
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..15, cx),
-        &[
-            "v test",
-            "    v dir1  <== marked",
-            "          a.txt",
-            "          b.txt",
-            "    v dir2",
-            "        v dir1",
-            "              a.txt",
-            "              b.txt",
-            "        > dir1 copy  <== selected",
-            "          c.txt",
-            "          c copy.txt",
-            "      c.txt  <== marked",
-            "      d.txt",
-        ],
-        "Should copy dir1 as well as c.txt into dir2 and disambiguate them without opening the rename editor"
-    );
-}
-
-#[gpui::test]
-async fn test_copy_paste_nested_and_root_entries(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/test",
-        json!({
-            "dir1": {
-                "a.txt": "",
-                "b.txt": "",
-            },
-            "dir2": {},
-            "c.txt": "",
-            "d.txt": "",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/test".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    toggle_expand_dir(&panel, "test/dir1", cx);
-
-    cx.simulate_modifiers_change(gpui::Modifiers {
-        control: true,
-        ..Default::default()
-    });
-
-    select_path_with_mark(&panel, "test/dir1/a.txt", cx);
-    select_path_with_mark(&panel, "test/dir1", cx);
-    select_path_with_mark(&panel, "test/c.txt", cx);
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..15, cx),
-        &[
-            "v test",
-            "    v dir1  <== marked",
-            "          a.txt  <== marked",
-            "          b.txt",
-            "    > dir2",
-            "      c.txt  <== selected  <== marked",
-            "      d.txt",
-        ],
-        "Initial state before copying a.txt, dir1 and c.txt"
-    );
-
-    panel.update_in(cx, |panel, window, cx| {
-        panel.copy(&Default::default(), window, cx);
-    });
-    select_path(&panel, "test/dir2", cx);
-    panel.update_in(cx, |panel, window, cx| {
-        panel.paste(&Default::default(), window, cx);
-    });
-    cx.executor().run_until_parked();
-
-    toggle_expand_dir(&panel, "test/dir2/dir1", cx);
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &[
-            "v test",
-            "    v dir1  <== marked",
-            "          a.txt  <== marked",
-            "          b.txt",
-            "    v dir2",
-            "        v dir1  <== selected",
-            "              a.txt",
-            "              b.txt",
-            "          c.txt",
-            "      c.txt  <== marked",
-            "      d.txt",
-        ],
-        "Should copy dir1 and c.txt into dir2. a.txt is already present in copied dir1."
-    );
-}
-
-#[gpui::test]
-async fn test_remove_opened_file(cx: &mut gpui::TestAppContext) {
-    init_test_with_editor(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/src"),
-        json!({
-            "test": {
-                "first.rs": "// First Rust file",
-                "second.rs": "// Second Rust file",
-                "third.rs": "// Third Rust file",
-            }
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), [path!("/src").as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    toggle_expand_dir(&panel, "src/test", cx);
-    select_path(&panel, "src/test/first.rs", cx);
-    panel.update_in(cx, |panel, window, cx| panel.open(&Open, window, cx));
-    cx.executor().run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v src",
-            "    v test",
-            "          first.rs  <== selected  <== marked",
-            "          second.rs",
-            "          third.rs"
-        ]
-    );
-    ensure_single_file_is_opened(&workspace, "test/first.rs", cx);
-
-    submit_deletion(&panel, cx);
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v src",
-            "    v test",
-            "          second.rs  <== selected",
-            "          third.rs"
-        ],
-        "Project panel should have no deleted file, no other file is selected in it"
-    );
-    ensure_no_open_items_and_panes(&workspace, cx);
-
-    panel.update_in(cx, |panel, window, cx| panel.open(&Open, window, cx));
-    cx.executor().run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v src",
-            "    v test",
-            "          second.rs  <== selected  <== marked",
-            "          third.rs"
-        ]
-    );
-    ensure_single_file_is_opened(&workspace, "test/second.rs", cx);
-
-    workspace
-        .update(cx, |workspace, window, cx| {
-            let active_items = workspace
-                .panes()
-                .iter()
-                .filter_map(|pane| pane.read(cx).active_item())
-                .collect::<Vec<_>>();
-            assert_eq!(active_items.len(), 1);
-            let open_editor = active_items
-                .into_iter()
-                .next()
-                .unwrap()
-                .downcast::<Editor>()
-                .expect("Open item should be an editor");
-            open_editor.update(cx, |editor, cx| {
-                editor.set_text("Another text!", window, cx)
-            });
-        })
-        .unwrap();
-    submit_deletion_skipping_prompt(&panel, cx);
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &["v src", "    v test", "          third.rs  <== selected"],
-        "Project panel should have no deleted file, with one last file remaining"
-    );
-    ensure_no_open_items_and_panes(&workspace, cx);
-}
-
-#[gpui::test]
-async fn test_auto_open_new_file_when_enabled(cx: &mut gpui::TestAppContext) {
-    init_test_with_editor(cx);
-    set_auto_open_settings(
-        cx,
-        ProjectPanelAutoOpenSettings {
-            on_create: Some(true),
-            ..Default::default()
-        },
-    );
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(path!("/root"), json!({})).await;
-
-    let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    panel.update_in(cx, |panel, window, cx| panel.new_file(&NewFile, window, cx));
-    cx.run_until_parked();
-    panel
-        .update_in(cx, |panel, window, cx| {
-            panel.filename_editor.update(cx, |editor, cx| {
-                editor.set_text("auto-open.rs", window, cx);
-            });
-            panel.confirm_edit(true, window, cx).unwrap()
-        })
-        .await
-        .unwrap();
-    cx.run_until_parked();
-
-    ensure_single_file_is_opened(&workspace, "auto-open.rs", cx);
-}
-
-#[gpui::test]
-async fn test_auto_open_new_file_when_disabled(cx: &mut gpui::TestAppContext) {
-    init_test_with_editor(cx);
-    set_auto_open_settings(
-        cx,
-        ProjectPanelAutoOpenSettings {
-            on_create: Some(false),
-            ..Default::default()
-        },
-    );
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(path!("/root"), json!({})).await;
-
-    let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    panel.update_in(cx, |panel, window, cx| panel.new_file(&NewFile, window, cx));
-    cx.run_until_parked();
-    panel
-        .update_in(cx, |panel, window, cx| {
-            panel.filename_editor.update(cx, |editor, cx| {
-                editor.set_text("manual-open.rs", window, cx);
-            });
-            panel.confirm_edit(true, window, cx).unwrap()
-        })
-        .await
-        .unwrap();
-    cx.run_until_parked();
-
-    ensure_no_open_items_and_panes(&workspace, cx);
-}
-
-#[gpui::test]
-async fn test_auto_open_on_paste_when_enabled(cx: &mut gpui::TestAppContext) {
-    init_test_with_editor(cx);
-    set_auto_open_settings(
-        cx,
-        ProjectPanelAutoOpenSettings {
-            on_paste: Some(true),
-            ..Default::default()
-        },
-    );
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/root"),
-        json!({
-            "src": {
-                "original.rs": ""
-            },
-            "target": {}
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    toggle_expand_dir(&panel, "root/src", cx);
-    toggle_expand_dir(&panel, "root/target", cx);
-
-    select_path(&panel, "root/src/original.rs", cx);
-    panel.update_in(cx, |panel, window, cx| {
-        panel.copy(&Default::default(), window, cx);
-    });
-
-    select_path(&panel, "root/target", cx);
-    panel.update_in(cx, |panel, window, cx| {
-        panel.paste(&Default::default(), window, cx);
-    });
-    cx.executor().run_until_parked();
-
-    ensure_single_file_is_opened(&workspace, "target/original.rs", cx);
-}
-
-#[gpui::test]
-async fn test_auto_open_on_paste_when_disabled(cx: &mut gpui::TestAppContext) {
-    init_test_with_editor(cx);
-    set_auto_open_settings(
-        cx,
-        ProjectPanelAutoOpenSettings {
-            on_paste: Some(false),
-            ..Default::default()
-        },
-    );
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/root"),
-        json!({
-            "src": {
-                "original.rs": ""
-            },
-            "target": {}
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    toggle_expand_dir(&panel, "root/src", cx);
-    toggle_expand_dir(&panel, "root/target", cx);
-
-    select_path(&panel, "root/src/original.rs", cx);
-    panel.update_in(cx, |panel, window, cx| {
-        panel.copy(&Default::default(), window, cx);
-    });
-
-    select_path(&panel, "root/target", cx);
-    panel.update_in(cx, |panel, window, cx| {
-        panel.paste(&Default::default(), window, cx);
-    });
-    cx.executor().run_until_parked();
-
-    ensure_no_open_items_and_panes(&workspace, cx);
-    assert!(
-        find_project_entry(&panel, "root/target/original.rs", cx).is_some(),
-        "Pasted entry should exist even when auto-open is disabled"
-    );
-}
-
-#[gpui::test]
-async fn test_auto_open_on_drop_when_enabled(cx: &mut gpui::TestAppContext) {
-    init_test_with_editor(cx);
-    set_auto_open_settings(
-        cx,
-        ProjectPanelAutoOpenSettings {
-            on_drop: Some(true),
-            ..Default::default()
-        },
-    );
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(path!("/root"), json!({})).await;
-
-    let temp_dir = tempfile::tempdir().unwrap();
-    let external_path = temp_dir.path().join("dropped.rs");
-    std::fs::write(&external_path, "// dropped").unwrap();
-    fs.insert_tree_from_real_fs(temp_dir.path(), temp_dir.path())
-        .await;
-
-    let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    let root_entry = find_project_entry(&panel, "root", cx).unwrap();
-    panel.update_in(cx, |panel, window, cx| {
-        panel.drop_external_files(std::slice::from_ref(&external_path), root_entry, window, cx);
-    });
-    cx.executor().run_until_parked();
-
-    ensure_single_file_is_opened(&workspace, "dropped.rs", cx);
-}
-
-#[gpui::test]
-async fn test_auto_open_on_drop_when_disabled(cx: &mut gpui::TestAppContext) {
-    init_test_with_editor(cx);
-    set_auto_open_settings(
-        cx,
-        ProjectPanelAutoOpenSettings {
-            on_drop: Some(false),
-            ..Default::default()
-        },
-    );
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(path!("/root"), json!({})).await;
-
-    let temp_dir = tempfile::tempdir().unwrap();
-    let external_path = temp_dir.path().join("manual.rs");
-    std::fs::write(&external_path, "// dropped").unwrap();
-    fs.insert_tree_from_real_fs(temp_dir.path(), temp_dir.path())
-        .await;
-
-    let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    let root_entry = find_project_entry(&panel, "root", cx).unwrap();
-    panel.update_in(cx, |panel, window, cx| {
-        panel.drop_external_files(std::slice::from_ref(&external_path), root_entry, window, cx);
-    });
-    cx.executor().run_until_parked();
-
-    ensure_no_open_items_and_panes(&workspace, cx);
-    assert!(
-        find_project_entry(&panel, "root/manual.rs", cx).is_some(),
-        "Dropped entry should exist even when auto-open is disabled"
-    );
-}
-
-#[gpui::test]
-async fn test_create_duplicate_items(cx: &mut gpui::TestAppContext) {
-    init_test_with_editor(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/src",
-        json!({
-            "test": {
-                "first.rs": "// First Rust file",
-                "second.rs": "// Second Rust file",
-                "third.rs": "// Third Rust file",
-            }
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/src".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace
-        .update(cx, |workspace, window, cx| {
-            let panel = ProjectPanel::new(workspace, window, cx);
-            workspace.add_panel(panel.clone(), window, cx);
-            panel
-        })
-        .unwrap();
-    cx.run_until_parked();
-
-    select_path(&panel, "src", cx);
-    panel.update_in(cx, |panel, window, cx| panel.confirm(&Confirm, window, cx));
-    cx.executor().run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            //
-            "v src  <== selected",
-            "    > test"
-        ]
-    );
-    panel.update_in(cx, |panel, window, cx| {
-        panel.new_directory(&NewDirectory, window, cx)
-    });
-    cx.run_until_parked();
-    panel.update_in(cx, |panel, window, cx| {
-        assert!(panel.filename_editor.read(cx).is_focused(window));
-    });
-    cx.executor().run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            //
-            "v src",
-            "    > [EDITOR: '']  <== selected",
-            "    > test"
-        ]
-    );
-    panel.update_in(cx, |panel, window, cx| {
-        panel
-            .filename_editor
-            .update(cx, |editor, cx| editor.set_text("test", window, cx));
-        assert!(
-            panel.confirm_edit(true, window, cx).is_none(),
-            "Should not allow to confirm on conflicting new directory name"
-        );
-    });
-    cx.executor().run_until_parked();
-    panel.update_in(cx, |panel, window, cx| {
-        assert!(
-            panel.state.edit_state.is_some(),
-            "Edit state should not be None after conflicting new directory name"
-        );
-        panel.cancel(&menu::Cancel, window, cx);
-        panel.update_visible_entries(None, false, false, window, cx);
-    });
-    cx.run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            //
-            "v src  <== selected",
-            "    > test"
-        ],
-        "File list should be unchanged after failed folder create confirmation"
-    );
-
-    select_path(&panel, "src/test", cx);
-    panel.update_in(cx, |panel, window, cx| panel.confirm(&Confirm, window, cx));
-    cx.executor().run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            //
-            "v src",
-            "    > test  <== selected"
-        ]
-    );
-    panel.update_in(cx, |panel, window, cx| panel.new_file(&NewFile, window, cx));
-    cx.run_until_parked();
-    panel.update_in(cx, |panel, window, cx| {
-        assert!(panel.filename_editor.read(cx).is_focused(window));
-    });
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v src",
-            "    v test",
-            "          [EDITOR: '']  <== selected",
-            "          first.rs",
-            "          second.rs",
-            "          third.rs"
-        ]
-    );
-    panel.update_in(cx, |panel, window, cx| {
-        panel
-            .filename_editor
-            .update(cx, |editor, cx| editor.set_text("first.rs", window, cx));
-        assert!(
-            panel.confirm_edit(true, window, cx).is_none(),
-            "Should not allow to confirm on conflicting new file name"
-        );
-    });
-    cx.executor().run_until_parked();
-    panel.update_in(cx, |panel, window, cx| {
-        assert!(
-            panel.state.edit_state.is_some(),
-            "Edit state should not be None after conflicting new file name"
-        );
-        panel.cancel(&menu::Cancel, window, cx);
-        panel.update_visible_entries(None, false, false, window, cx);
-    });
-    cx.run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v src",
-            "    v test  <== selected",
-            "          first.rs",
-            "          second.rs",
-            "          third.rs"
-        ],
-        "File list should be unchanged after failed file create confirmation"
-    );
-
-    select_path(&panel, "src/test/first.rs", cx);
-    panel.update_in(cx, |panel, window, cx| panel.confirm(&Confirm, window, cx));
-    cx.executor().run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v src",
-            "    v test",
-            "          first.rs  <== selected",
-            "          second.rs",
-            "          third.rs"
-        ],
-    );
-    panel.update_in(cx, |panel, window, cx| panel.rename(&Rename, window, cx));
-    cx.executor().run_until_parked();
-    panel.update_in(cx, |panel, window, cx| {
-        assert!(panel.filename_editor.read(cx).is_focused(window));
-    });
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v src",
-            "    v test",
-            "          [EDITOR: 'first.rs']  <== selected",
-            "          second.rs",
-            "          third.rs"
-        ]
-    );
-    panel.update_in(cx, |panel, window, cx| {
-        panel
-            .filename_editor
-            .update(cx, |editor, cx| editor.set_text("second.rs", window, cx));
-        assert!(
-            panel.confirm_edit(true, window, cx).is_none(),
-            "Should not allow to confirm on conflicting file rename"
-        )
-    });
-    cx.executor().run_until_parked();
-    panel.update_in(cx, |panel, window, cx| {
-        assert!(
-            panel.state.edit_state.is_some(),
-            "Edit state should not be None after conflicting file rename"
-        );
-        panel.cancel(&menu::Cancel, window, cx);
-    });
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v src",
-            "    v test",
-            "          first.rs  <== selected",
-            "          second.rs",
-            "          third.rs"
-        ],
-        "File list should be unchanged after failed rename confirmation"
-    );
-}
-
-// NOTE: This test is skipped on Windows, because on Windows,
-// when it triggers the lsp store it converts `/src/test/first copy.txt` into an uri
-// but it fails with message `"/src\\test\\first copy.txt" is not parseable as an URI`
-#[gpui::test]
-#[cfg_attr(target_os = "windows", ignore)]
-async fn test_create_duplicate_items_and_check_history(cx: &mut gpui::TestAppContext) {
-    init_test_with_editor(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/src",
-        json!({
-            "test": {
-                "first.txt": "// First Txt file",
-                "second.txt": "// Second Txt file",
-                "third.txt": "// Third Txt file",
-            }
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/src".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace
-        .update(cx, |workspace, window, cx| {
-            let panel = ProjectPanel::new(workspace, window, cx);
-            workspace.add_panel(panel.clone(), window, cx);
-            panel
-        })
-        .unwrap();
-    cx.run_until_parked();
-
-    select_path(&panel, "src", cx);
-    panel.update_in(cx, |panel, window, cx| panel.confirm(&Confirm, window, cx));
-    cx.executor().run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            //
-            "v src  <== selected",
-            "    > test"
-        ]
-    );
-    panel.update_in(cx, |panel, window, cx| {
-        panel.new_directory(&NewDirectory, window, cx)
-    });
-    cx.run_until_parked();
-    panel.update_in(cx, |panel, window, cx| {
-        assert!(panel.filename_editor.read(cx).is_focused(window));
-    });
-    cx.executor().run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            //
-            "v src",
-            "    > [EDITOR: '']  <== selected",
-            "    > test"
-        ]
-    );
-    panel.update_in(cx, |panel, window, cx| {
-        panel
-            .filename_editor
-            .update(cx, |editor, cx| editor.set_text("test", window, cx));
-        assert!(
-            panel.confirm_edit(true, window, cx).is_none(),
-            "Should not allow to confirm on conflicting new directory name"
-        );
-    });
-    cx.executor().run_until_parked();
-    panel.update_in(cx, |panel, window, cx| {
-        assert!(
-            panel.state.edit_state.is_some(),
-            "Edit state should not be None after conflicting new directory name"
-        );
-        panel.cancel(&menu::Cancel, window, cx);
-        panel.update_visible_entries(None, false, false, window, cx);
-    });
-    cx.run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            //
-            "v src  <== selected",
-            "    > test"
-        ],
-        "File list should be unchanged after failed folder create confirmation"
-    );
-
-    select_path(&panel, "src/test", cx);
-    panel.update_in(cx, |panel, window, cx| panel.confirm(&Confirm, window, cx));
-    cx.executor().run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            //
-            "v src",
-            "    > test  <== selected"
-        ]
-    );
-    panel.update_in(cx, |panel, window, cx| panel.new_file(&NewFile, window, cx));
-    cx.run_until_parked();
-    panel.update_in(cx, |panel, window, cx| {
-        assert!(panel.filename_editor.read(cx).is_focused(window));
-    });
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v src",
-            "    v test",
-            "          [EDITOR: '']  <== selected",
-            "          first.txt",
-            "          second.txt",
-            "          third.txt"
-        ]
-    );
-    panel.update_in(cx, |panel, window, cx| {
-        panel
-            .filename_editor
-            .update(cx, |editor, cx| editor.set_text("first.txt", window, cx));
-        assert!(
-            panel.confirm_edit(true, window, cx).is_none(),
-            "Should not allow to confirm on conflicting new file name"
-        );
-    });
-    cx.executor().run_until_parked();
-    panel.update_in(cx, |panel, window, cx| {
-        assert!(
-            panel.state.edit_state.is_some(),
-            "Edit state should not be None after conflicting new file name"
-        );
-        panel.cancel(&menu::Cancel, window, cx);
-        panel.update_visible_entries(None, false, false, window, cx);
-    });
-    cx.run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v src",
-            "    v test  <== selected",
-            "          first.txt",
-            "          second.txt",
-            "          third.txt"
-        ],
-        "File list should be unchanged after failed file create confirmation"
-    );
-
-    select_path(&panel, "src/test/first.txt", cx);
-    panel.update_in(cx, |panel, window, cx| panel.confirm(&Confirm, window, cx));
-    cx.executor().run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v src",
-            "    v test",
-            "          first.txt  <== selected",
-            "          second.txt",
-            "          third.txt"
-        ],
-    );
-    panel.update_in(cx, |panel, window, cx| panel.rename(&Rename, window, cx));
-    cx.executor().run_until_parked();
-    panel.update_in(cx, |panel, window, cx| {
-        assert!(panel.filename_editor.read(cx).is_focused(window));
-    });
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v src",
-            "    v test",
-            "          [EDITOR: 'first.txt']  <== selected",
-            "          second.txt",
-            "          third.txt"
-        ]
-    );
-    panel.update_in(cx, |panel, window, cx| {
-        panel
-            .filename_editor
-            .update(cx, |editor, cx| editor.set_text("second.txt", window, cx));
-        assert!(
-            panel.confirm_edit(true, window, cx).is_none(),
-            "Should not allow to confirm on conflicting file rename"
-        )
-    });
-    cx.executor().run_until_parked();
-    panel.update_in(cx, |panel, window, cx| {
-        assert!(
-            panel.state.edit_state.is_some(),
-            "Edit state should not be None after conflicting file rename"
-        );
-        panel.cancel(&menu::Cancel, window, cx);
-    });
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v src",
-            "    v test",
-            "          first.txt  <== selected",
-            "          second.txt",
-            "          third.txt"
-        ],
-        "File list should be unchanged after failed rename confirmation"
-    );
-    panel.update_in(cx, |panel, window, cx| panel.open(&Open, window, cx));
-    cx.executor().run_until_parked();
-    // Try to duplicate and check history
-    panel.update_in(cx, |panel, window, cx| {
-        panel.duplicate(&Duplicate, window, cx)
-    });
-    cx.executor().run_until_parked();
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v src",
-            "    v test",
-            "          first.txt",
-            "          [EDITOR: 'first copy.txt']  <== selected  <== marked",
-            "          second.txt",
-            "          third.txt"
-        ],
-    );
-
-    let confirm = panel.update_in(cx, |panel, window, cx| {
-        panel
-            .filename_editor
-            .update(cx, |editor, cx| editor.set_text("fourth.txt", window, cx));
-        panel.confirm_edit(true, window, cx).unwrap()
-    });
-    confirm.await.unwrap();
-    cx.executor().run_until_parked();
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v src",
-            "    v test",
-            "          first.txt",
-            "          fourth.txt  <== selected",
-            "          second.txt",
-            "          third.txt"
-        ],
-        "File list should be different after rename confirmation"
-    );
-
-    panel.update_in(cx, |panel, window, cx| {
-        panel.update_visible_entries(None, false, false, window, cx);
-    });
-    cx.executor().run_until_parked();
-
-    select_path(&panel, "src/test/first.txt", cx);
-    panel.update_in(cx, |panel, window, cx| panel.open(&Open, window, cx));
-    cx.executor().run_until_parked();
-
-    workspace
-        .read_with(cx, |this, cx| {
-            assert!(
-                this.recent_navigation_history_iter(cx)
-                    .any(|(project_path, abs_path)| {
-                        project_path.path == Arc::from(rel_path("test/fourth.txt"))
-                            && abs_path == Some(PathBuf::from(path!("/src/test/fourth.txt")))
-                    })
-            );
-        })
-        .unwrap();
-}
-
-// NOTE: This test is skipped on Windows, because on Windows,
-// when it triggers the lsp store it converts `/src/test/first.txt` into an uri
-// but it fails with message `"/src\\test\\first.txt" is not parseable as an URI`
-#[gpui::test]
-#[cfg_attr(target_os = "windows", ignore)]
-async fn test_rename_item_and_check_history(cx: &mut gpui::TestAppContext) {
-    init_test_with_editor(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/src",
-        json!({
-            "test": {
-                "first.txt": "// First Txt file",
-                "second.txt": "// Second Txt file",
-                "third.txt": "// Third Txt file",
-            }
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/src".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace
-        .update(cx, |workspace, window, cx| {
-            let panel = ProjectPanel::new(workspace, window, cx);
-            workspace.add_panel(panel.clone(), window, cx);
-            panel
-        })
-        .unwrap();
-    cx.run_until_parked();
-
-    select_path(&panel, "src", cx);
-    panel.update_in(cx, |panel, window, cx| panel.confirm(&Confirm, window, cx));
-    cx.executor().run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            //
-            "v src  <== selected",
-            "    > test"
-        ]
-    );
-
-    select_path(&panel, "src/test", cx);
-    panel.update_in(cx, |panel, window, cx| panel.confirm(&Confirm, window, cx));
-    cx.executor().run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            //
-            "v src",
-            "    > test  <== selected"
-        ]
-    );
-    panel.update_in(cx, |panel, window, cx| panel.new_file(&NewFile, window, cx));
-    cx.run_until_parked();
-    panel.update_in(cx, |panel, window, cx| {
-        assert!(panel.filename_editor.read(cx).is_focused(window));
-    });
-
-    select_path(&panel, "src/test/first.txt", cx);
-    panel.update_in(cx, |panel, window, cx| panel.open(&Open, window, cx));
-    cx.executor().run_until_parked();
-
-    panel.update_in(cx, |panel, window, cx| panel.rename(&Rename, window, cx));
-    cx.executor().run_until_parked();
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v src",
-            "    v test",
-            "          [EDITOR: 'first.txt']  <== selected  <== marked",
-            "          second.txt",
-            "          third.txt"
-        ],
-    );
-
-    let confirm = panel.update_in(cx, |panel, window, cx| {
-        panel
-            .filename_editor
-            .update(cx, |editor, cx| editor.set_text("fourth.txt", window, cx));
-        panel.confirm_edit(true, window, cx).unwrap()
-    });
-    confirm.await.unwrap();
-    cx.executor().run_until_parked();
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v src",
-            "    v test",
-            "          fourth.txt  <== selected",
-            "          second.txt",
-            "          third.txt"
-        ],
-        "File list should be different after rename confirmation"
-    );
-
-    panel.update_in(cx, |panel, window, cx| {
-        panel.update_visible_entries(None, false, false, window, cx);
-    });
-    cx.executor().run_until_parked();
-
-    select_path(&panel, "src/test/second.txt", cx);
-    panel.update_in(cx, |panel, window, cx| panel.open(&Open, window, cx));
-    cx.executor().run_until_parked();
-
-    workspace
-        .read_with(cx, |this, cx| {
-            assert!(
-                this.recent_navigation_history_iter(cx)
-                    .any(|(project_path, abs_path)| {
-                        project_path.path == Arc::from(rel_path("test/fourth.txt"))
-                            && abs_path == Some(PathBuf::from(path!("/src/test/fourth.txt")))
-                    })
-            );
-        })
-        .unwrap();
-}
-
-#[gpui::test]
-async fn test_select_git_entry(cx: &mut gpui::TestAppContext) {
-    init_test_with_editor(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/root"),
-        json!({
-            "tree1": {
-                ".git": {},
-                "dir1": {
-                    "modified1.txt": "1",
-                    "unmodified1.txt": "1",
-                    "modified2.txt": "1",
-                },
-                "dir2": {
-                    "modified3.txt": "1",
-                    "unmodified2.txt": "1",
-                },
-                "modified4.txt": "1",
-                "unmodified3.txt": "1",
-            },
-            "tree2": {
-                ".git": {},
-                "dir3": {
-                    "modified5.txt": "1",
-                    "unmodified4.txt": "1",
-                },
-                "modified6.txt": "1",
-                "unmodified5.txt": "1",
-            }
-        }),
-    )
-    .await;
-
-    // Mark files as git modified
-    fs.set_head_and_index_for_repo(
-        path!("/root/tree1/.git").as_ref(),
-        &[
-            ("dir1/modified1.txt", "modified".into()),
-            ("dir1/modified2.txt", "modified".into()),
-            ("modified4.txt", "modified".into()),
-            ("dir2/modified3.txt", "modified".into()),
-        ],
-    );
-    fs.set_head_and_index_for_repo(
-        path!("/root/tree2/.git").as_ref(),
-        &[
-            ("dir3/modified5.txt", "modified".into()),
-            ("modified6.txt", "modified".into()),
-        ],
-    );
-
-    let project = Project::test(
-        fs.clone(),
-        [path!("/root/tree1").as_ref(), path!("/root/tree2").as_ref()],
-        cx,
-    )
-    .await;
-
-    let (scan1_complete, scan2_complete) = project.update(cx, |project, cx| {
-        let mut worktrees = project.worktrees(cx);
-        let worktree1 = worktrees.next().unwrap();
-        let worktree2 = worktrees.next().unwrap();
-        (
-            worktree1.read(cx).as_local().unwrap().scan_complete(),
-            worktree2.read(cx).as_local().unwrap().scan_complete(),
-        )
-    });
-    scan1_complete.await;
-    scan2_complete.await;
-    cx.run_until_parked();
-
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    // Check initial state
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..15, cx),
-        &[
-            "v tree1",
-            "    > .git",
-            "    > dir1",
-            "    > dir2",
-            "      modified4.txt",
-            "      unmodified3.txt",
-            "v tree2",
-            "    > .git",
-            "    > dir3",
-            "      modified6.txt",
-            "      unmodified5.txt"
-        ],
-    );
-
-    // Test selecting next modified entry
-    panel.update_in(cx, |panel, window, cx| {
-        panel.select_next_git_entry(&SelectNextGitEntry, window, cx);
-    });
-    cx.run_until_parked();
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..6, cx),
-        &[
-            "v tree1",
-            "    > .git",
-            "    v dir1",
-            "          modified1.txt  <== selected",
-            "          modified2.txt",
-            "          unmodified1.txt",
-        ],
-    );
-
-    panel.update_in(cx, |panel, window, cx| {
-        panel.select_next_git_entry(&SelectNextGitEntry, window, cx);
-    });
-    cx.run_until_parked();
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..6, cx),
-        &[
-            "v tree1",
-            "    > .git",
-            "    v dir1",
-            "          modified1.txt",
-            "          modified2.txt  <== selected",
-            "          unmodified1.txt",
-        ],
-    );
-
-    panel.update_in(cx, |panel, window, cx| {
-        panel.select_next_git_entry(&SelectNextGitEntry, window, cx);
-    });
-    cx.run_until_parked();
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 6..9, cx),
-        &[
-            "    v dir2",
-            "          modified3.txt  <== selected",
-            "          unmodified2.txt",
-        ],
-    );
-
-    panel.update_in(cx, |panel, window, cx| {
-        panel.select_next_git_entry(&SelectNextGitEntry, window, cx);
-    });
-    cx.run_until_parked();
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 9..11, cx),
-        &["      modified4.txt  <== selected", "      unmodified3.txt",],
-    );
-
-    panel.update_in(cx, |panel, window, cx| {
-        panel.select_next_git_entry(&SelectNextGitEntry, window, cx);
-    });
-    cx.run_until_parked();
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 13..16, cx),
-        &[
-            "    v dir3",
-            "          modified5.txt  <== selected",
-            "          unmodified4.txt",
-        ],
-    );
-
-    panel.update_in(cx, |panel, window, cx| {
-        panel.select_next_git_entry(&SelectNextGitEntry, window, cx);
-    });
-    cx.run_until_parked();
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 16..18, cx),
-        &["      modified6.txt  <== selected", "      unmodified5.txt",],
-    );
-
-    // Wraps around to first modified file
-    panel.update_in(cx, |panel, window, cx| {
-        panel.select_next_git_entry(&SelectNextGitEntry, window, cx);
-    });
-    cx.run_until_parked();
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..18, cx),
-        &[
-            "v tree1",
-            "    > .git",
-            "    v dir1",
-            "          modified1.txt  <== selected",
-            "          modified2.txt",
-            "          unmodified1.txt",
-            "    v dir2",
-            "          modified3.txt",
-            "          unmodified2.txt",
-            "      modified4.txt",
-            "      unmodified3.txt",
-            "v tree2",
-            "    > .git",
-            "    v dir3",
-            "          modified5.txt",
-            "          unmodified4.txt",
-            "      modified6.txt",
-            "      unmodified5.txt",
-        ],
-    );
-
-    // Wraps around again to last modified file
-    panel.update_in(cx, |panel, window, cx| {
-        panel.select_prev_git_entry(&SelectPrevGitEntry, window, cx);
-    });
-    cx.run_until_parked();
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 16..18, cx),
-        &["      modified6.txt  <== selected", "      unmodified5.txt",],
-    );
-
-    panel.update_in(cx, |panel, window, cx| {
-        panel.select_prev_git_entry(&SelectPrevGitEntry, window, cx);
-    });
-    cx.run_until_parked();
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 13..16, cx),
-        &[
-            "    v dir3",
-            "          modified5.txt  <== selected",
-            "          unmodified4.txt",
-        ],
-    );
-
-    panel.update_in(cx, |panel, window, cx| {
-        panel.select_prev_git_entry(&SelectPrevGitEntry, window, cx);
-    });
-    cx.run_until_parked();
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 9..11, cx),
-        &["      modified4.txt  <== selected", "      unmodified3.txt",],
-    );
-
-    panel.update_in(cx, |panel, window, cx| {
-        panel.select_prev_git_entry(&SelectPrevGitEntry, window, cx);
-    });
-    cx.run_until_parked();
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 6..9, cx),
-        &[
-            "    v dir2",
-            "          modified3.txt  <== selected",
-            "          unmodified2.txt",
-        ],
-    );
-
-    panel.update_in(cx, |panel, window, cx| {
-        panel.select_prev_git_entry(&SelectPrevGitEntry, window, cx);
-    });
-    cx.run_until_parked();
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..6, cx),
-        &[
-            "v tree1",
-            "    > .git",
-            "    v dir1",
-            "          modified1.txt",
-            "          modified2.txt  <== selected",
-            "          unmodified1.txt",
-        ],
-    );
-
-    panel.update_in(cx, |panel, window, cx| {
-        panel.select_prev_git_entry(&SelectPrevGitEntry, window, cx);
-    });
-    cx.run_until_parked();
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..6, cx),
-        &[
-            "v tree1",
-            "    > .git",
-            "    v dir1",
-            "          modified1.txt  <== selected",
-            "          modified2.txt",
-            "          unmodified1.txt",
-        ],
-    );
-}
-
-#[gpui::test]
-async fn test_select_directory(cx: &mut gpui::TestAppContext) {
-    init_test_with_editor(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/project_root",
-        json!({
-            "dir_1": {
-                "nested_dir": {
-                    "file_a.py": "# File contents",
-                }
-            },
-            "file_1.py": "# File contents",
-            "dir_2": {
-
-            },
-            "dir_3": {
-
-            },
-            "file_2.py": "# File contents",
-            "dir_4": {
-
-            },
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/project_root".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    panel.update_in(cx, |panel, window, cx| panel.open(&Open, window, cx));
-    cx.executor().run_until_parked();
-    select_path(&panel, "project_root/dir_1", cx);
-    cx.executor().run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v project_root",
-            "    > dir_1  <== selected",
-            "    > dir_2",
-            "    > dir_3",
-            "    > dir_4",
-            "      file_1.py",
-            "      file_2.py",
-        ]
-    );
-    panel.update_in(cx, |panel, window, cx| {
-        panel.select_prev_directory(&SelectPrevDirectory, window, cx)
-    });
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v project_root  <== selected",
-            "    > dir_1",
-            "    > dir_2",
-            "    > dir_3",
-            "    > dir_4",
-            "      file_1.py",
-            "      file_2.py",
-        ]
-    );
-
-    panel.update_in(cx, |panel, window, cx| {
-        panel.select_prev_directory(&SelectPrevDirectory, window, cx)
-    });
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v project_root",
-            "    > dir_1",
-            "    > dir_2",
-            "    > dir_3",
-            "    > dir_4  <== selected",
-            "      file_1.py",
-            "      file_2.py",
-        ]
-    );
-
-    panel.update_in(cx, |panel, window, cx| {
-        panel.select_next_directory(&SelectNextDirectory, window, cx)
-    });
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v project_root  <== selected",
-            "    > dir_1",
-            "    > dir_2",
-            "    > dir_3",
-            "    > dir_4",
-            "      file_1.py",
-            "      file_2.py",
-        ]
-    );
-}
-
-#[gpui::test]
-async fn test_select_first_last(cx: &mut gpui::TestAppContext) {
-    init_test_with_editor(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/project_root",
-        json!({
-            "dir_1": {
-                "nested_dir": {
-                    "file_a.py": "# File contents",
-                }
-            },
-            "file_1.py": "# File contents",
-            "file_2.py": "# File contents",
-            "zdir_2": {
-                "nested_dir2": {
-                    "file_b.py": "# File contents",
-                }
-            },
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/project_root".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v project_root",
-            "    > dir_1",
-            "    > zdir_2",
-            "      file_1.py",
-            "      file_2.py",
-        ]
-    );
-    panel.update_in(cx, |panel, window, cx| {
-        panel.select_first(&SelectFirst, window, cx)
-    });
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v project_root  <== selected",
-            "    > dir_1",
-            "    > zdir_2",
-            "      file_1.py",
-            "      file_2.py",
-        ]
-    );
-
-    panel.update_in(cx, |panel, window, cx| {
-        panel.select_last(&SelectLast, window, cx)
-    });
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v project_root",
-            "    > dir_1",
-            "    > zdir_2",
-            "      file_1.py",
-            "      file_2.py  <== selected",
-        ]
-    );
-
-    cx.update(|_, cx| {
-        let settings = *ProjectPanelSettings::get_global(cx);
-        ProjectPanelSettings::override_global(
-            ProjectPanelSettings {
-                hide_root: true,
-                ..settings
-            },
-            cx,
-        );
-    });
-
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    #[rustfmt::skip]
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "> dir_1",
-            "> zdir_2",
-            "  file_1.py",
-            "  file_2.py",
-        ],
-        "With hide_root=true, root should be hidden"
-    );
-
-    panel.update_in(cx, |panel, window, cx| {
-        panel.select_first(&SelectFirst, window, cx)
-    });
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "> dir_1  <== selected",
-            "> zdir_2",
-            "  file_1.py",
-            "  file_2.py",
-        ],
-        "With hide_root=true, first entry should be dir_1, not the hidden root"
-    );
-}
-
-#[gpui::test]
-async fn test_dir_toggle_collapse(cx: &mut gpui::TestAppContext) {
-    init_test_with_editor(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/project_root",
-        json!({
-            "dir_1": {
-                "nested_dir": {
-                    "file_a.py": "# File contents",
-                }
-            },
-            "file_1.py": "# File contents",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/project_root".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    panel.update_in(cx, |panel, window, cx| panel.open(&Open, window, cx));
-    cx.executor().run_until_parked();
-    select_path(&panel, "project_root/dir_1", cx);
-    panel.update_in(cx, |panel, window, cx| panel.open(&Open, window, cx));
-    select_path(&panel, "project_root/dir_1/nested_dir", cx);
-    panel.update_in(cx, |panel, window, cx| panel.open(&Open, window, cx));
-    panel.update_in(cx, |panel, window, cx| panel.open(&Open, window, cx));
-    cx.executor().run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v project_root",
-            "    v dir_1",
-            "        > nested_dir  <== selected",
-            "      file_1.py",
-        ]
-    );
-}
-
-#[gpui::test]
-async fn test_collapse_all_entries(cx: &mut gpui::TestAppContext) {
-    init_test_with_editor(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/project_root",
-        json!({
-            "dir_1": {
-                "nested_dir": {
-                    "file_a.py": "# File contents",
-                    "file_b.py": "# File contents",
-                    "file_c.py": "# File contents",
-                },
-                "file_1.py": "# File contents",
-                "file_2.py": "# File contents",
-                "file_3.py": "# File contents",
-            },
-            "dir_2": {
-                "file_1.py": "# File contents",
-                "file_2.py": "# File contents",
-                "file_3.py": "# File contents",
-            }
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/project_root".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    panel.update_in(cx, |panel, window, cx| {
-        panel.collapse_all_entries(&CollapseAllEntries, window, cx)
-    });
-    cx.executor().run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &["v project_root", "    > dir_1", "    > dir_2",]
-    );
-
-    // Open dir_1 and make sure nested_dir was collapsed when running collapse_all_entries
-    toggle_expand_dir(&panel, "project_root/dir_1", cx);
-    cx.executor().run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v project_root",
-            "    v dir_1  <== selected",
-            "        > nested_dir",
-            "          file_1.py",
-            "          file_2.py",
-            "          file_3.py",
-            "    > dir_2",
-        ]
-    );
-}
-
-#[gpui::test]
-async fn test_collapse_all_entries_multiple_worktrees(cx: &mut gpui::TestAppContext) {
-    init_test_with_editor(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    let worktree_content = json!({
-        "dir_1": {
-            "file_1.py": "# File contents",
-        },
-        "dir_2": {
-            "file_1.py": "# File contents",
-        }
-    });
-
-    fs.insert_tree("/project_root_1", worktree_content.clone())
-        .await;
-    fs.insert_tree("/project_root_2", worktree_content).await;
-
-    let project = Project::test(
-        fs.clone(),
-        ["/project_root_1".as_ref(), "/project_root_2".as_ref()],
-        cx,
-    )
-    .await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    panel.update_in(cx, |panel, window, cx| {
-        panel.collapse_all_entries(&CollapseAllEntries, window, cx)
-    });
-    cx.executor().run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &["> project_root_1", "> project_root_2",]
-    );
-}
-
-#[gpui::test]
-async fn test_collapse_all_entries_with_collapsed_root(cx: &mut gpui::TestAppContext) {
-    init_test_with_editor(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/project_root",
-        json!({
-            "dir_1": {
-                "nested_dir": {
-                    "file_a.py": "# File contents",
-                    "file_b.py": "# File contents",
-                    "file_c.py": "# File contents",
-                },
-                "file_1.py": "# File contents",
-                "file_2.py": "# File contents",
-                "file_3.py": "# File contents",
-            },
-            "dir_2": {
-                "file_1.py": "# File contents",
-                "file_2.py": "# File contents",
-                "file_3.py": "# File contents",
-            }
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/project_root".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    // Open project_root/dir_1 to ensure that a nested directory is expanded
-    toggle_expand_dir(&panel, "project_root/dir_1", cx);
-    cx.executor().run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v project_root",
-            "    v dir_1  <== selected",
-            "        > nested_dir",
-            "          file_1.py",
-            "          file_2.py",
-            "          file_3.py",
-            "    > dir_2",
-        ]
-    );
-
-    // Close root directory
-    toggle_expand_dir(&panel, "project_root", cx);
-    cx.executor().run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &["> project_root  <== selected"]
-    );
-
-    // Run collapse_all_entries and make sure root is not expanded
-    panel.update_in(cx, |panel, window, cx| {
-        panel.collapse_all_entries(&CollapseAllEntries, window, cx)
-    });
-    cx.executor().run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &["> project_root  <== selected"]
-    );
-}
-
-#[gpui::test]
-async fn test_new_file_move(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.as_fake().insert_tree(path!("/root"), json!({})).await;
-    let project = Project::test(fs, [path!("/root").as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    // Make a new buffer with no backing file
-    workspace
-        .update(cx, |workspace, window, cx| {
-            Editor::new_file(workspace, &Default::default(), window, cx)
-        })
-        .unwrap();
-
-    cx.executor().run_until_parked();
-
-    // "Save as" the buffer, creating a new backing file for it
-    let save_task = workspace
-        .update(cx, |workspace, window, cx| {
-            workspace.save_active_item(workspace::SaveIntent::Save, window, cx)
-        })
-        .unwrap();
-
-    cx.executor().run_until_parked();
-    cx.simulate_new_path_selection(|_| Some(PathBuf::from(path!("/root/new"))));
-    save_task.await.unwrap();
-
-    // Rename the file
-    select_path(&panel, "root/new", cx);
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &["v root", "      new  <== selected  <== marked"]
-    );
-    panel.update_in(cx, |panel, window, cx| panel.rename(&Rename, window, cx));
-    panel.update_in(cx, |panel, window, cx| {
-        panel
-            .filename_editor
-            .update(cx, |editor, cx| editor.set_text("newer", window, cx));
-    });
-    panel.update_in(cx, |panel, window, cx| panel.confirm(&Confirm, window, cx));
-
-    cx.executor().run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &["v root", "      newer  <== selected"]
-    );
-
-    workspace
-        .update(cx, |workspace, window, cx| {
-            workspace.save_active_item(workspace::SaveIntent::Save, window, cx)
-        })
-        .unwrap()
-        .await
-        .unwrap();
-
-    cx.executor().run_until_parked();
-    // assert that saving the file doesn't restore "new"
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &["v root", "      newer  <== selected"]
-    );
-}
-
-// NOTE: This test is skipped on Windows, because on Windows, unlike on Unix,
-// you can't rename a directory which some program has already open. This is a
-// limitation of the Windows. Since Zed will have the root open, it will hold an open handle
-// to it, and thus renaming it will fail on Windows.
-// See: https://stackoverflow.com/questions/41365318/access-is-denied-when-renaming-folder
-// See: https://learn.microsoft.com/en-us/windows-hardware/drivers/ddi/ntifs/ns-ntifs-_file_rename_information
-#[gpui::test]
-#[cfg_attr(target_os = "windows", ignore)]
-async fn test_rename_root_of_worktree(cx: &mut gpui::TestAppContext) {
-    init_test_with_editor(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/root1",
-        json!({
-            "dir1": {
-                "file1.txt": "content 1",
-            },
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/root1".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    toggle_expand_dir(&panel, "root1/dir1", cx);
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &["v root1", "    v dir1  <== selected", "          file1.txt",],
-        "Initial state with worktrees"
-    );
-
-    select_path(&panel, "root1", cx);
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &["v root1  <== selected", "    v dir1", "          file1.txt",],
-    );
-
-    // Rename root1 to new_root1
-    panel.update_in(cx, |panel, window, cx| panel.rename(&Rename, window, cx));
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &[
-            "v [EDITOR: 'root1']  <== selected",
-            "    v dir1",
-            "          file1.txt",
-        ],
-    );
-
-    let confirm = panel.update_in(cx, |panel, window, cx| {
-        panel
-            .filename_editor
-            .update(cx, |editor, cx| editor.set_text("new_root1", window, cx));
-        panel.confirm_edit(true, window, cx).unwrap()
-    });
-    confirm.await.unwrap();
-    cx.run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &[
-            "v new_root1  <== selected",
-            "    v dir1",
-            "          file1.txt",
-        ],
-        "Should update worktree name"
-    );
-
-    // Ensure internal paths have been updated
-    select_path(&panel, "new_root1/dir1/file1.txt", cx);
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &[
-            "v new_root1",
-            "    v dir1",
-            "          file1.txt  <== selected",
-        ],
-        "Files in renamed worktree are selectable"
-    );
-}
-
-#[gpui::test]
-async fn test_rename_with_hide_root(cx: &mut gpui::TestAppContext) {
-    init_test_with_editor(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/root1",
-        json!({
-            "dir1": { "file1.txt": "content" },
-            "file2.txt": "content",
-        }),
-    )
-    .await;
-    fs.insert_tree("/root2", json!({ "file3.txt": "content" }))
-        .await;
-
-    // Test 1: Single worktree, hide_root=true - rename should be blocked
-    {
-        let project = Project::test(fs.clone(), ["/root1".as_ref()], cx).await;
-        let workspace =
-            cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-        cx.update(|_, cx| {
-            let settings = *ProjectPanelSettings::get_global(cx);
-            ProjectPanelSettings::override_global(
-                ProjectPanelSettings {
-                    hide_root: true,
-                    ..settings
-                },
-                cx,
-            );
-        });
-
-        let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-        cx.run_until_parked();
-
-        panel.update(cx, |panel, cx| {
-            let project = panel.project.read(cx);
-            let worktree = project.visible_worktrees(cx).next().unwrap();
-            let root_entry = worktree.read(cx).root_entry().unwrap();
-            panel.state.selection = Some(SelectedEntry {
-                worktree_id: worktree.read(cx).id(),
-                entry_id: root_entry.id,
-            });
-        });
-
-        panel.update_in(cx, |panel, window, cx| panel.rename(&Rename, window, cx));
-
-        assert!(
-            panel.read_with(cx, |panel, _| panel.state.edit_state.is_none()),
-            "Rename should be blocked when hide_root=true with single worktree"
-        );
-    }
-
-    // Test 2: Multiple worktrees, hide_root=true - rename should work
-    {
-        let project = Project::test(fs.clone(), ["/root1".as_ref(), "/root2".as_ref()], cx).await;
-        let workspace =
-            cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-        cx.update(|_, cx| {
-            let settings = *ProjectPanelSettings::get_global(cx);
-            ProjectPanelSettings::override_global(
-                ProjectPanelSettings {
-                    hide_root: true,
-                    ..settings
-                },
-                cx,
-            );
-        });
-
-        let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-        cx.run_until_parked();
-
-        select_path(&panel, "root1", cx);
-        panel.update_in(cx, |panel, window, cx| panel.rename(&Rename, window, cx));
-
-        #[cfg(target_os = "windows")]
-        assert!(
-            panel.read_with(cx, |panel, _| panel.state.edit_state.is_none()),
-            "Rename should be blocked on Windows even with multiple worktrees"
-        );
-
-        #[cfg(not(target_os = "windows"))]
-        {
-            assert!(
-                panel.read_with(cx, |panel, _| panel.state.edit_state.is_some()),
-                "Rename should work with multiple worktrees on non-Windows when hide_root=true"
-            );
-            panel.update_in(cx, |panel, window, cx| {
-                panel.cancel(&menu::Cancel, window, cx)
-            });
-        }
-    }
-}
-
-#[gpui::test]
-async fn test_multiple_marked_entries(cx: &mut gpui::TestAppContext) {
-    init_test_with_editor(cx);
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/project_root",
-        json!({
-            "dir_1": {
-                "nested_dir": {
-                    "file_a.py": "# File contents",
-                }
-            },
-            "file_1.py": "# File contents",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/project_root".as_ref()], cx).await;
-    let worktree_id = cx.update(|cx| project.read(cx).worktrees(cx).next().unwrap().read(cx).id());
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    cx.update(|window, cx| {
-        panel.update(cx, |this, cx| {
-            this.select_next(&Default::default(), window, cx);
-            this.expand_selected_entry(&Default::default(), window, cx);
-        })
-    });
-    cx.run_until_parked();
-
-    cx.update(|window, cx| {
-        panel.update(cx, |this, cx| {
-            this.expand_selected_entry(&Default::default(), window, cx);
-        })
-    });
-    cx.run_until_parked();
-
-    cx.update(|window, cx| {
-        panel.update(cx, |this, cx| {
-            this.select_next(&Default::default(), window, cx);
-            this.expand_selected_entry(&Default::default(), window, cx);
-        })
-    });
-    cx.run_until_parked();
-
-    cx.update(|window, cx| {
-        panel.update(cx, |this, cx| {
-            this.select_next(&Default::default(), window, cx);
-        })
-    });
-    cx.run_until_parked();
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v project_root",
-            "    v dir_1",
-            "        v nested_dir",
-            "              file_a.py  <== selected",
-            "      file_1.py",
-        ]
-    );
-    let modifiers_with_shift = gpui::Modifiers {
-        shift: true,
-        ..Default::default()
-    };
-    cx.run_until_parked();
-    cx.simulate_modifiers_change(modifiers_with_shift);
-    cx.update(|window, cx| {
-        panel.update(cx, |this, cx| {
-            this.select_next(&Default::default(), window, cx);
-        })
-    });
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v project_root",
-            "    v dir_1",
-            "        v nested_dir",
-            "              file_a.py",
-            "      file_1.py  <== selected  <== marked",
-        ]
-    );
-    cx.update(|window, cx| {
-        panel.update(cx, |this, cx| {
-            this.select_previous(&Default::default(), window, cx);
-        })
-    });
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v project_root",
-            "    v dir_1",
-            "        v nested_dir",
-            "              file_a.py  <== selected  <== marked",
-            "      file_1.py  <== marked",
-        ]
-    );
-    cx.update(|window, cx| {
-        panel.update(cx, |this, cx| {
-            let drag = DraggedSelection {
-                active_selection: this.state.selection.unwrap(),
-                marked_selections: this.marked_entries.clone().into(),
-            };
-            let target_entry = this
-                .project
-                .read(cx)
-                .entry_for_path(&(worktree_id, rel_path("")).into(), cx)
-                .unwrap();
-            this.drag_onto(&drag, target_entry.id, false, window, cx);
-        });
-    });
-    cx.run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v project_root",
-            "    v dir_1",
-            "        v nested_dir",
-            "      file_1.py  <== marked",
-            "      file_a.py  <== selected  <== marked",
-        ]
-    );
-    // ESC clears out all marks
-    cx.update(|window, cx| {
-        panel.update(cx, |this, cx| {
-            this.cancel(&menu::Cancel, window, cx);
-        })
-    });
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v project_root",
-            "    v dir_1",
-            "        v nested_dir",
-            "      file_1.py",
-            "      file_a.py  <== selected",
-        ]
-    );
-    // ESC clears out all marks
-    cx.update(|window, cx| {
-        panel.update(cx, |this, cx| {
-            this.select_previous(&SelectPrevious, window, cx);
-            this.select_next(&SelectNext, window, cx);
-        })
-    });
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v project_root",
-            "    v dir_1",
-            "        v nested_dir",
-            "      file_1.py  <== marked",
-            "      file_a.py  <== selected  <== marked",
-        ]
-    );
-    cx.simulate_modifiers_change(Default::default());
-    cx.update(|window, cx| {
-        panel.update(cx, |this, cx| {
-            this.cut(&Cut, window, cx);
-            this.select_previous(&SelectPrevious, window, cx);
-            this.select_previous(&SelectPrevious, window, cx);
-
-            this.paste(&Paste, window, cx);
-            this.update_visible_entries(None, false, false, window, cx);
-        })
-    });
-    cx.run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v project_root",
-            "    v dir_1",
-            "        v nested_dir",
-            "              file_1.py  <== marked",
-            "              file_a.py  <== selected  <== marked",
-        ]
-    );
-    cx.simulate_modifiers_change(modifiers_with_shift);
-    cx.update(|window, cx| {
-        panel.update(cx, |this, cx| {
-            this.expand_selected_entry(&Default::default(), window, cx);
-            this.select_next(&SelectNext, window, cx);
-            this.select_next(&SelectNext, window, cx);
-        })
-    });
-    submit_deletion(&panel, cx);
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v project_root",
-            "    v dir_1",
-            "        v nested_dir  <== selected",
-        ]
-    );
-}
-
-#[gpui::test]
-async fn test_dragged_selection_resolve_entry(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/root",
-        json!({
-            "a": {
-                "b": {
-                    "c": {
-                        "d": {}
-                    }
-                }
-            },
-            "target_destination": {}
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/root".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-    cx.update(|_, cx| {
-        let settings = *ProjectPanelSettings::get_global(cx);
-        ProjectPanelSettings::override_global(
-            ProjectPanelSettings {
-                auto_fold_dirs: true,
-                ..settings
-            },
-            cx,
-        );
-    });
-
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    // Case 1: Move last dir 'd' - should move only 'd', leaving 'a/b/c'
-    select_path(&panel, "root/a/b/c/d", cx);
-    panel.update_in(cx, |panel, window, cx| {
-        let drag = DraggedSelection {
-            active_selection: SelectedEntry {
-                worktree_id: panel.state.selection.as_ref().unwrap().worktree_id,
-                entry_id: panel.resolve_entry(panel.state.selection.as_ref().unwrap().entry_id),
-            },
-            marked_selections: Arc::new([*panel.state.selection.as_ref().unwrap()]),
-        };
-        let target_entry = panel
-            .project
-            .read(cx)
-            .visible_worktrees(cx)
-            .next()
-            .unwrap()
-            .read(cx)
-            .entry_for_path(rel_path("target_destination"))
-            .unwrap();
-        panel.drag_onto(&drag, target_entry.id, false, window, cx);
-    });
-    cx.executor().run_until_parked();
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v root",
-            "    > a/b/c",
-            "    > target_destination/d  <== selected"
-        ],
-        "Moving last empty directory 'd' should leave 'a/b/c' and move only 'd'"
-    );
-
-    // Reset
-    select_path(&panel, "root/target_destination/d", cx);
-    panel.update_in(cx, |panel, window, cx| {
-        let drag = DraggedSelection {
-            active_selection: SelectedEntry {
-                worktree_id: panel.state.selection.as_ref().unwrap().worktree_id,
-                entry_id: panel.resolve_entry(panel.state.selection.as_ref().unwrap().entry_id),
-            },
-            marked_selections: Arc::new([*panel.state.selection.as_ref().unwrap()]),
-        };
-        let target_entry = panel
-            .project
-            .read(cx)
-            .visible_worktrees(cx)
-            .next()
-            .unwrap()
-            .read(cx)
-            .entry_for_path(rel_path("a/b/c"))
-            .unwrap();
-        panel.drag_onto(&drag, target_entry.id, false, window, cx);
-    });
-    cx.executor().run_until_parked();
-
-    // Case 2: Move middle dir 'b' - should move 'b/c/d', leaving only 'a'
-    select_path(&panel, "root/a/b", cx);
-    panel.update_in(cx, |panel, window, cx| {
-        let drag = DraggedSelection {
-            active_selection: SelectedEntry {
-                worktree_id: panel.state.selection.as_ref().unwrap().worktree_id,
-                entry_id: panel.resolve_entry(panel.state.selection.as_ref().unwrap().entry_id),
-            },
-            marked_selections: Arc::new([*panel.state.selection.as_ref().unwrap()]),
-        };
-        let target_entry = panel
-            .project
-            .read(cx)
-            .visible_worktrees(cx)
-            .next()
-            .unwrap()
-            .read(cx)
-            .entry_for_path(rel_path("target_destination"))
-            .unwrap();
-        panel.drag_onto(&drag, target_entry.id, false, window, cx);
-    });
-    cx.executor().run_until_parked();
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &["v root", "    v a", "    > target_destination/b/c/d"],
-        "Moving middle directory 'b' should leave only 'a' and move 'b/c/d'"
-    );
-
-    // Reset
-    select_path(&panel, "root/target_destination/b", cx);
-    panel.update_in(cx, |panel, window, cx| {
-        let drag = DraggedSelection {
-            active_selection: SelectedEntry {
-                worktree_id: panel.state.selection.as_ref().unwrap().worktree_id,
-                entry_id: panel.resolve_entry(panel.state.selection.as_ref().unwrap().entry_id),
-            },
-            marked_selections: Arc::new([*panel.state.selection.as_ref().unwrap()]),
-        };
-        let target_entry = panel
-            .project
-            .read(cx)
-            .visible_worktrees(cx)
-            .next()
-            .unwrap()
-            .read(cx)
-            .entry_for_path(rel_path("a"))
-            .unwrap();
-        panel.drag_onto(&drag, target_entry.id, false, window, cx);
-    });
-    cx.executor().run_until_parked();
-
-    // Case 3: Move first dir 'a' - should move whole 'a/b/c/d'
-    select_path(&panel, "root/a", cx);
-    panel.update_in(cx, |panel, window, cx| {
-        let drag = DraggedSelection {
-            active_selection: SelectedEntry {
-                worktree_id: panel.state.selection.as_ref().unwrap().worktree_id,
-                entry_id: panel.resolve_entry(panel.state.selection.as_ref().unwrap().entry_id),
-            },
-            marked_selections: Arc::new([*panel.state.selection.as_ref().unwrap()]),
-        };
-        let target_entry = panel
-            .project
-            .read(cx)
-            .visible_worktrees(cx)
-            .next()
-            .unwrap()
-            .read(cx)
-            .entry_for_path(rel_path("target_destination"))
-            .unwrap();
-        panel.drag_onto(&drag, target_entry.id, false, window, cx);
-    });
-    cx.executor().run_until_parked();
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &["v root", "    > target_destination/a/b/c/d"],
-        "Moving first directory 'a' should move whole 'a/b/c/d' chain"
-    );
-}
-
-#[gpui::test]
-async fn test_drag_entries_between_different_worktrees(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/root_a",
-        json!({
-            "src": {
-                "lib.rs": "",
-                "main.rs": ""
-            },
-            "docs": {
-                "guide.md": ""
-            },
-            "multi": {
-                "alpha.txt": "",
-                "beta.txt": ""
-            }
-        }),
-    )
-    .await;
-    fs.insert_tree(
-        "/root_b",
-        json!({
-            "dst": {
-                "existing.md": ""
-            },
-            "target.txt": ""
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/root_a".as_ref(), "/root_b".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    // Case 1: move a file onto a directory in another worktree.
-    select_path(&panel, "root_a/src/main.rs", cx);
-    drag_selection_to(&panel, "root_b/dst", false, cx);
-    assert!(
-        find_project_entry(&panel, "root_b/dst/main.rs", cx).is_some(),
-        "Dragged file should appear under destination worktree"
-    );
-    assert_eq!(
-        find_project_entry(&panel, "root_a/src/main.rs", cx),
-        None,
-        "Dragged file should be removed from the source worktree"
-    );
-
-    // Case 2: drop a file onto another worktree file so it lands in the parent directory.
-    select_path(&panel, "root_a/docs/guide.md", cx);
-    drag_selection_to(&panel, "root_b/dst/existing.md", true, cx);
-    assert!(
-        find_project_entry(&panel, "root_b/dst/guide.md", cx).is_some(),
-        "Dropping onto a file should place the entry beside the target file"
-    );
-    assert_eq!(
-        find_project_entry(&panel, "root_a/docs/guide.md", cx),
-        None,
-        "Source file should be removed after the move"
-    );
-
-    // Case 3: move an entire directory.
-    select_path(&panel, "root_a/src", cx);
-    drag_selection_to(&panel, "root_b/dst", false, cx);
-    assert!(
-        find_project_entry(&panel, "root_b/dst/src/lib.rs", cx).is_some(),
-        "Dragging a directory should move its nested contents"
-    );
-    assert_eq!(
-        find_project_entry(&panel, "root_a/src", cx),
-        None,
-        "Directory should no longer exist in the source worktree"
-    );
-
-    // Case 4: multi-selection drag between worktrees.
-    panel.update(cx, |panel, _| panel.marked_entries.clear());
-    select_path_with_mark(&panel, "root_a/multi/alpha.txt", cx);
-    select_path_with_mark(&panel, "root_a/multi/beta.txt", cx);
-    drag_selection_to(&panel, "root_b/dst", false, cx);
-    assert!(
-        find_project_entry(&panel, "root_b/dst/alpha.txt", cx).is_some()
-            && find_project_entry(&panel, "root_b/dst/beta.txt", cx).is_some(),
-        "All marked entries should move to the destination worktree"
-    );
-    assert_eq!(
-        find_project_entry(&panel, "root_a/multi/alpha.txt", cx),
-        None,
-        "Marked entries should be removed from the origin worktree"
-    );
-    assert_eq!(
-        find_project_entry(&panel, "root_a/multi/beta.txt", cx),
-        None,
-        "Marked entries should be removed from the origin worktree"
-    );
-}
-
-#[gpui::test]
-async fn test_autoreveal_and_gitignored_files(cx: &mut gpui::TestAppContext) {
-    init_test_with_editor(cx);
-    cx.update(|cx| {
-        cx.update_global::<SettingsStore, _>(|store, cx| {
-            store.update_user_settings(cx, |settings| {
-                settings.project.worktree.file_scan_exclusions = Some(Vec::new());
-                settings
-                    .project_panel
-                    .get_or_insert_default()
-                    .auto_reveal_entries = Some(false);
-            });
-        })
-    });
-
-    let fs = FakeFs::new(cx.background_executor.clone());
-    fs.insert_tree(
-        "/project_root",
-        json!({
-            ".git": {},
-            ".gitignore": "**/gitignored_dir",
-            "dir_1": {
-                "file_1.py": "# File 1_1 contents",
-                "file_2.py": "# File 1_2 contents",
-                "file_3.py": "# File 1_3 contents",
-                "gitignored_dir": {
-                    "file_a.py": "# File contents",
-                    "file_b.py": "# File contents",
-                    "file_c.py": "# File contents",
-                },
-            },
-            "dir_2": {
-                "file_1.py": "# File 2_1 contents",
-                "file_2.py": "# File 2_2 contents",
-                "file_3.py": "# File 2_3 contents",
-            }
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/project_root".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &[
-            "v project_root",
-            "    > .git",
-            "    > dir_1",
-            "    > dir_2",
-            "      .gitignore",
-        ]
-    );
-
-    let dir_1_file = find_project_entry(&panel, "project_root/dir_1/file_1.py", cx)
-        .expect("dir 1 file is not ignored and should have an entry");
-    let dir_2_file = find_project_entry(&panel, "project_root/dir_2/file_1.py", cx)
-        .expect("dir 2 file is not ignored and should have an entry");
-    let gitignored_dir_file =
-        find_project_entry(&panel, "project_root/dir_1/gitignored_dir/file_a.py", cx);
-    assert_eq!(
-        gitignored_dir_file, None,
-        "File in the gitignored dir should not have an entry before its dir is toggled"
-    );
-
-    toggle_expand_dir(&panel, "project_root/dir_1", cx);
-    toggle_expand_dir(&panel, "project_root/dir_1/gitignored_dir", cx);
-    cx.executor().run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &[
-            "v project_root",
-            "    > .git",
-            "    v dir_1",
-            "        v gitignored_dir  <== selected",
-            "              file_a.py",
-            "              file_b.py",
-            "              file_c.py",
-            "          file_1.py",
-            "          file_2.py",
-            "          file_3.py",
-            "    > dir_2",
-            "      .gitignore",
-        ],
-        "Should show gitignored dir file list in the project panel"
-    );
-    let gitignored_dir_file =
-        find_project_entry(&panel, "project_root/dir_1/gitignored_dir/file_a.py", cx)
-            .expect("after gitignored dir got opened, a file entry should be present");
-
-    toggle_expand_dir(&panel, "project_root/dir_1/gitignored_dir", cx);
-    toggle_expand_dir(&panel, "project_root/dir_1", cx);
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &[
-            "v project_root",
-            "    > .git",
-            "    > dir_1  <== selected",
-            "    > dir_2",
-            "      .gitignore",
-        ],
-        "Should hide all dir contents again and prepare for the auto reveal test"
-    );
-
-    for file_entry in [dir_1_file, dir_2_file, gitignored_dir_file] {
-        panel.update(cx, |panel, cx| {
-            panel.project.update(cx, |_, cx| {
-                cx.emit(project::Event::ActiveEntryChanged(Some(file_entry)))
-            })
-        });
-        cx.run_until_parked();
-        assert_eq!(
-            visible_entries_as_strings(&panel, 0..20, cx),
-            &[
-                "v project_root",
-                "    > .git",
-                "    > dir_1  <== selected",
-                "    > dir_2",
-                "      .gitignore",
-            ],
-            "When no auto reveal is enabled, the selected entry should not be revealed in the project panel"
-        );
-    }
-
-    cx.update(|_, cx| {
-        cx.update_global::<SettingsStore, _>(|store, cx| {
-            store.update_user_settings(cx, |settings| {
-                settings
-                    .project_panel
-                    .get_or_insert_default()
-                    .auto_reveal_entries = Some(true)
-            });
-        })
-    });
-
-    panel.update(cx, |panel, cx| {
-        panel.project.update(cx, |_, cx| {
-            cx.emit(project::Event::ActiveEntryChanged(Some(dir_1_file)))
-        })
-    });
-    cx.run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &[
-            "v project_root",
-            "    > .git",
-            "    v dir_1",
-            "        > gitignored_dir",
-            "          file_1.py  <== selected  <== marked",
-            "          file_2.py",
-            "          file_3.py",
-            "    > dir_2",
-            "      .gitignore",
-        ],
-        "When auto reveal is enabled, not ignored dir_1 entry should be revealed"
-    );
-
-    panel.update(cx, |panel, cx| {
-        panel.project.update(cx, |_, cx| {
-            cx.emit(project::Event::ActiveEntryChanged(Some(dir_2_file)))
-        })
-    });
-    cx.run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &[
-            "v project_root",
-            "    > .git",
-            "    v dir_1",
-            "        > gitignored_dir",
-            "          file_1.py",
-            "          file_2.py",
-            "          file_3.py",
-            "    v dir_2",
-            "          file_1.py  <== selected  <== marked",
-            "          file_2.py",
-            "          file_3.py",
-            "      .gitignore",
-        ],
-        "When auto reveal is enabled, not ignored dir_2 entry should be revealed"
-    );
-
-    panel.update(cx, |panel, cx| {
-        panel.project.update(cx, |_, cx| {
-            cx.emit(project::Event::ActiveEntryChanged(Some(
-                gitignored_dir_file,
-            )))
-        })
-    });
-    cx.run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &[
-            "v project_root",
-            "    > .git",
-            "    v dir_1",
-            "        > gitignored_dir",
-            "          file_1.py",
-            "          file_2.py",
-            "          file_3.py",
-            "    v dir_2",
-            "          file_1.py  <== selected  <== marked",
-            "          file_2.py",
-            "          file_3.py",
-            "      .gitignore",
-        ],
-        "When auto reveal is enabled, a gitignored selected entry should not be revealed in the project panel"
-    );
-
-    panel.update(cx, |panel, cx| {
-        panel.project.update(cx, |_, cx| {
-            cx.emit(project::Event::RevealInProjectPanel(gitignored_dir_file))
-        })
-    });
-    cx.run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &[
-            "v project_root",
-            "    > .git",
-            "    v dir_1",
-            "        v gitignored_dir",
-            "              file_a.py  <== selected  <== marked",
-            "              file_b.py",
-            "              file_c.py",
-            "          file_1.py",
-            "          file_2.py",
-            "          file_3.py",
-            "    v dir_2",
-            "          file_1.py",
-            "          file_2.py",
-            "          file_3.py",
-            "      .gitignore",
-        ],
-        "When a gitignored entry is explicitly revealed, it should be shown in the project tree"
-    );
-}
-
-#[gpui::test]
-async fn test_gitignored_and_always_included(cx: &mut gpui::TestAppContext) {
-    init_test_with_editor(cx);
-    cx.update(|cx| {
-        cx.update_global::<SettingsStore, _>(|store, cx| {
-            store.update_user_settings(cx, |settings| {
-                settings.project.worktree.file_scan_exclusions = Some(Vec::new());
-                settings.project.worktree.file_scan_inclusions =
-                    Some(vec!["always_included_but_ignored_dir/*".to_string()]);
-                settings
-                    .project_panel
-                    .get_or_insert_default()
-                    .auto_reveal_entries = Some(false)
-            });
-        })
-    });
-
-    let fs = FakeFs::new(cx.background_executor.clone());
-    fs.insert_tree(
-        "/project_root",
-        json!({
-            ".git": {},
-            ".gitignore": "**/gitignored_dir\n/always_included_but_ignored_dir",
-            "dir_1": {
-                "file_1.py": "# File 1_1 contents",
-                "file_2.py": "# File 1_2 contents",
-                "file_3.py": "# File 1_3 contents",
-                "gitignored_dir": {
-                    "file_a.py": "# File contents",
-                    "file_b.py": "# File contents",
-                    "file_c.py": "# File contents",
-                },
-            },
-            "dir_2": {
-                "file_1.py": "# File 2_1 contents",
-                "file_2.py": "# File 2_2 contents",
-                "file_3.py": "# File 2_3 contents",
-            },
-            "always_included_but_ignored_dir": {
-                "file_a.py": "# File contents",
-                "file_b.py": "# File contents",
-                "file_c.py": "# File contents",
-            },
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/project_root".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &[
-            "v project_root",
-            "    > .git",
-            "    > always_included_but_ignored_dir",
-            "    > dir_1",
-            "    > dir_2",
-            "      .gitignore",
-        ]
-    );
-
-    let gitignored_dir_file =
-        find_project_entry(&panel, "project_root/dir_1/gitignored_dir/file_a.py", cx);
-    let always_included_but_ignored_dir_file = find_project_entry(
-        &panel,
-        "project_root/always_included_but_ignored_dir/file_a.py",
-        cx,
-    )
-    .expect("file that is .gitignored but set to always be included should have an entry");
-    assert_eq!(
-        gitignored_dir_file, None,
-        "File in the gitignored dir should not have an entry unless its directory is toggled"
-    );
-
-    toggle_expand_dir(&panel, "project_root/dir_1", cx);
-    cx.run_until_parked();
-    cx.update(|_, cx| {
-        cx.update_global::<SettingsStore, _>(|store, cx| {
-            store.update_user_settings(cx, |settings| {
-                settings
-                    .project_panel
-                    .get_or_insert_default()
-                    .auto_reveal_entries = Some(true)
-            });
-        })
-    });
-
-    panel.update(cx, |panel, cx| {
-        panel.project.update(cx, |_, cx| {
-            cx.emit(project::Event::ActiveEntryChanged(Some(
-                always_included_but_ignored_dir_file,
-            )))
-        })
-    });
-    cx.run_until_parked();
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &[
-            "v project_root",
-            "    > .git",
-            "    v always_included_but_ignored_dir",
-            "          file_a.py  <== selected  <== marked",
-            "          file_b.py",
-            "          file_c.py",
-            "    v dir_1",
-            "        > gitignored_dir",
-            "          file_1.py",
-            "          file_2.py",
-            "          file_3.py",
-            "    > dir_2",
-            "      .gitignore",
-        ],
-        "When auto reveal is enabled, a gitignored but always included selected entry should be revealed in the project panel"
-    );
-}
-
-#[gpui::test]
-async fn test_explicit_reveal(cx: &mut gpui::TestAppContext) {
-    init_test_with_editor(cx);
-    cx.update(|cx| {
-        cx.update_global::<SettingsStore, _>(|store, cx| {
-            store.update_user_settings(cx, |settings| {
-                settings.project.worktree.file_scan_exclusions = Some(Vec::new());
-                settings
-                    .project_panel
-                    .get_or_insert_default()
-                    .auto_reveal_entries = Some(false)
-            });
-        })
-    });
-
-    let fs = FakeFs::new(cx.background_executor.clone());
-    fs.insert_tree(
-        "/project_root",
-        json!({
-            ".git": {},
-            ".gitignore": "**/gitignored_dir",
-            "dir_1": {
-                "file_1.py": "# File 1_1 contents",
-                "file_2.py": "# File 1_2 contents",
-                "file_3.py": "# File 1_3 contents",
-                "gitignored_dir": {
-                    "file_a.py": "# File contents",
-                    "file_b.py": "# File contents",
-                    "file_c.py": "# File contents",
-                },
-            },
-            "dir_2": {
-                "file_1.py": "# File 2_1 contents",
-                "file_2.py": "# File 2_2 contents",
-                "file_3.py": "# File 2_3 contents",
-            }
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/project_root".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &[
-            "v project_root",
-            "    > .git",
-            "    > dir_1",
-            "    > dir_2",
-            "      .gitignore",
-        ]
-    );
-
-    let dir_1_file = find_project_entry(&panel, "project_root/dir_1/file_1.py", cx)
-        .expect("dir 1 file is not ignored and should have an entry");
-    let dir_2_file = find_project_entry(&panel, "project_root/dir_2/file_1.py", cx)
-        .expect("dir 2 file is not ignored and should have an entry");
-    let gitignored_dir_file =
-        find_project_entry(&panel, "project_root/dir_1/gitignored_dir/file_a.py", cx);
-    assert_eq!(
-        gitignored_dir_file, None,
-        "File in the gitignored dir should not have an entry before its dir is toggled"
-    );
-
-    toggle_expand_dir(&panel, "project_root/dir_1", cx);
-    toggle_expand_dir(&panel, "project_root/dir_1/gitignored_dir", cx);
-    cx.run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &[
-            "v project_root",
-            "    > .git",
-            "    v dir_1",
-            "        v gitignored_dir  <== selected",
-            "              file_a.py",
-            "              file_b.py",
-            "              file_c.py",
-            "          file_1.py",
-            "          file_2.py",
-            "          file_3.py",
-            "    > dir_2",
-            "      .gitignore",
-        ],
-        "Should show gitignored dir file list in the project panel"
-    );
-    let gitignored_dir_file =
-        find_project_entry(&panel, "project_root/dir_1/gitignored_dir/file_a.py", cx)
-            .expect("after gitignored dir got opened, a file entry should be present");
-
-    toggle_expand_dir(&panel, "project_root/dir_1/gitignored_dir", cx);
-    toggle_expand_dir(&panel, "project_root/dir_1", cx);
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &[
-            "v project_root",
-            "    > .git",
-            "    > dir_1  <== selected",
-            "    > dir_2",
-            "      .gitignore",
-        ],
-        "Should hide all dir contents again and prepare for the explicit reveal test"
-    );
-
-    for file_entry in [dir_1_file, dir_2_file, gitignored_dir_file] {
-        panel.update(cx, |panel, cx| {
-            panel.project.update(cx, |_, cx| {
-                cx.emit(project::Event::ActiveEntryChanged(Some(file_entry)))
-            })
-        });
-        cx.run_until_parked();
-        assert_eq!(
-            visible_entries_as_strings(&panel, 0..20, cx),
-            &[
-                "v project_root",
-                "    > .git",
-                "    > dir_1  <== selected",
-                "    > dir_2",
-                "      .gitignore",
-            ],
-            "When no auto reveal is enabled, the selected entry should not be revealed in the project panel"
-        );
-    }
-
-    panel.update(cx, |panel, cx| {
-        panel.project.update(cx, |_, cx| {
-            cx.emit(project::Event::RevealInProjectPanel(dir_1_file))
-        })
-    });
-    cx.run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &[
-            "v project_root",
-            "    > .git",
-            "    v dir_1",
-            "        > gitignored_dir",
-            "          file_1.py  <== selected  <== marked",
-            "          file_2.py",
-            "          file_3.py",
-            "    > dir_2",
-            "      .gitignore",
-        ],
-        "With no auto reveal, explicit reveal should show the dir_1 entry in the project panel"
-    );
-
-    panel.update(cx, |panel, cx| {
-        panel.project.update(cx, |_, cx| {
-            cx.emit(project::Event::RevealInProjectPanel(dir_2_file))
-        })
-    });
-    cx.run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &[
-            "v project_root",
-            "    > .git",
-            "    v dir_1",
-            "        > gitignored_dir",
-            "          file_1.py",
-            "          file_2.py",
-            "          file_3.py",
-            "    v dir_2",
-            "          file_1.py  <== selected  <== marked",
-            "          file_2.py",
-            "          file_3.py",
-            "      .gitignore",
-        ],
-        "With no auto reveal, explicit reveal should show the dir_2 entry in the project panel"
-    );
-
-    panel.update(cx, |panel, cx| {
-        panel.project.update(cx, |_, cx| {
-            cx.emit(project::Event::RevealInProjectPanel(gitignored_dir_file))
-        })
-    });
-    cx.run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &[
-            "v project_root",
-            "    > .git",
-            "    v dir_1",
-            "        v gitignored_dir",
-            "              file_a.py  <== selected  <== marked",
-            "              file_b.py",
-            "              file_c.py",
-            "          file_1.py",
-            "          file_2.py",
-            "          file_3.py",
-            "    v dir_2",
-            "          file_1.py",
-            "          file_2.py",
-            "          file_3.py",
-            "      .gitignore",
-        ],
-        "With no auto reveal, explicit reveal should show the gitignored entry in the project panel"
-    );
-}
-
-#[gpui::test]
-async fn test_creating_excluded_entries(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-    cx.update(|cx| {
-        cx.update_global::<SettingsStore, _>(|store, cx| {
-            store.update_user_settings(cx, |settings| {
-                settings.project.worktree.file_scan_exclusions =
-                    Some(vec!["excluded_dir".to_string(), "**/.git".to_string()]);
-            });
-        });
-    });
-
-    cx.update(|cx| {
-        register_project_item::<TestProjectItemView>(cx);
-    });
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/root1",
-        json!({
-            ".dockerignore": "",
-            ".git": {
-                "HEAD": "",
-            },
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/root1".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace
-        .update(cx, |workspace, window, cx| {
-            let panel = ProjectPanel::new(workspace, window, cx);
-            workspace.add_panel(panel.clone(), window, cx);
-            panel
-        })
-        .unwrap();
-    cx.run_until_parked();
-
-    select_path(&panel, "root1", cx);
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &["v root1  <== selected", "      .dockerignore",]
-    );
-    workspace
-        .update(cx, |workspace, _, cx| {
-            assert!(
-                workspace.active_item(cx).is_none(),
-                "Should have no active items in the beginning"
-            );
-        })
-        .unwrap();
-
-    let excluded_file_path = ".git/COMMIT_EDITMSG";
-    let excluded_dir_path = "excluded_dir";
-
-    panel.update_in(cx, |panel, window, cx| panel.new_file(&NewFile, window, cx));
-    cx.run_until_parked();
-    panel.update_in(cx, |panel, window, cx| {
-        assert!(panel.filename_editor.read(cx).is_focused(window));
-    });
-    panel
-        .update_in(cx, |panel, window, cx| {
-            panel.filename_editor.update(cx, |editor, cx| {
-                editor.set_text(excluded_file_path, window, cx)
-            });
-            panel.confirm_edit(true, window, cx).unwrap()
-        })
-        .await
-        .unwrap();
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..13, cx),
-        &["v root1", "      .dockerignore"],
-        "Excluded dir should not be shown after opening a file in it"
-    );
-    panel.update_in(cx, |panel, window, cx| {
-        assert!(
-            !panel.filename_editor.read(cx).is_focused(window),
-            "Should have closed the file name editor"
-        );
-    });
-    workspace
-        .update(cx, |workspace, _, cx| {
-            let active_entry_path = workspace
-                .active_item(cx)
-                .expect("should have opened and activated the excluded item")
-                .act_as::<TestProjectItemView>(cx)
-                .expect("should have opened the corresponding project item for the excluded item")
-                .read(cx)
-                .path
-                .clone();
-            assert_eq!(
-                active_entry_path.path.as_ref(),
-                rel_path(excluded_file_path),
-                "Should open the excluded file"
-            );
-
-            assert!(
-                workspace.notification_ids().is_empty(),
-                "Should have no notifications after opening an excluded file"
-            );
-        })
-        .unwrap();
-    assert!(
-        fs.is_file(Path::new("/root1/.git/COMMIT_EDITMSG")).await,
-        "Should have created the excluded file"
-    );
-
-    select_path(&panel, "root1", cx);
-    panel.update_in(cx, |panel, window, cx| {
-        panel.new_directory(&NewDirectory, window, cx)
-    });
-    cx.run_until_parked();
-    panel.update_in(cx, |panel, window, cx| {
-        assert!(panel.filename_editor.read(cx).is_focused(window));
-    });
-    panel
-        .update_in(cx, |panel, window, cx| {
-            panel.filename_editor.update(cx, |editor, cx| {
-                editor.set_text(excluded_file_path, window, cx)
-            });
-            panel.confirm_edit(true, window, cx).unwrap()
-        })
-        .await
-        .unwrap();
-    cx.run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..13, cx),
-        &["v root1", "      .dockerignore"],
-        "Should not change the project panel after trying to create an excluded directorya directory with the same name as the excluded file"
-    );
-    panel.update_in(cx, |panel, window, cx| {
-        assert!(
-            !panel.filename_editor.read(cx).is_focused(window),
-            "Should have closed the file name editor"
-        );
-    });
-    workspace
-        .update(cx, |workspace, _, cx| {
-            let notifications = workspace.notification_ids();
-            assert_eq!(
-                notifications.len(),
-                1,
-                "Should receive one notification with the error message"
-            );
-            workspace.dismiss_notification(notifications.first().unwrap(), cx);
-            assert!(workspace.notification_ids().is_empty());
-        })
-        .unwrap();
-
-    select_path(&panel, "root1", cx);
-    panel.update_in(cx, |panel, window, cx| {
-        panel.new_directory(&NewDirectory, window, cx)
-    });
-    cx.run_until_parked();
-
-    panel.update_in(cx, |panel, window, cx| {
-        assert!(panel.filename_editor.read(cx).is_focused(window));
-    });
-
-    panel
-        .update_in(cx, |panel, window, cx| {
-            panel.filename_editor.update(cx, |editor, cx| {
-                editor.set_text(excluded_dir_path, window, cx)
-            });
-            panel.confirm_edit(true, window, cx).unwrap()
-        })
-        .await
-        .unwrap();
-
-    cx.run_until_parked();
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..13, cx),
-        &["v root1", "      .dockerignore"],
-        "Should not change the project panel after trying to create an excluded directory"
-    );
-    panel.update_in(cx, |panel, window, cx| {
-        assert!(
-            !panel.filename_editor.read(cx).is_focused(window),
-            "Should have closed the file name editor"
-        );
-    });
-    workspace
-        .update(cx, |workspace, _, cx| {
-            let notifications = workspace.notification_ids();
-            assert_eq!(
-                notifications.len(),
-                1,
-                "Should receive one notification explaining that no directory is actually shown"
-            );
-            workspace.dismiss_notification(notifications.first().unwrap(), cx);
-            assert!(workspace.notification_ids().is_empty());
-        })
-        .unwrap();
-    assert!(
-        fs.is_dir(Path::new("/root1/excluded_dir")).await,
-        "Should have created the excluded directory"
-    );
-}
-
-#[gpui::test]
-async fn test_selection_restored_when_creation_cancelled(cx: &mut gpui::TestAppContext) {
-    init_test_with_editor(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/src",
-        json!({
-            "test": {
-                "first.rs": "// First Rust file",
-                "second.rs": "// Second Rust file",
-                "third.rs": "// Third Rust file",
-            }
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/src".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace
-        .update(cx, |workspace, window, cx| {
-            let panel = ProjectPanel::new(workspace, window, cx);
-            workspace.add_panel(panel.clone(), window, cx);
-            panel
-        })
-        .unwrap();
-    cx.run_until_parked();
-
-    select_path(&panel, "src", cx);
-    panel.update_in(cx, |panel, window, cx| panel.confirm(&Confirm, window, cx));
-    cx.executor().run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            //
-            "v src  <== selected",
-            "    > test"
-        ]
-    );
-    panel.update_in(cx, |panel, window, cx| {
-        panel.new_directory(&NewDirectory, window, cx)
-    });
-    cx.executor().run_until_parked();
-    panel.update_in(cx, |panel, window, cx| {
-        assert!(panel.filename_editor.read(cx).is_focused(window));
-    });
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            //
-            "v src",
-            "    > [EDITOR: '']  <== selected",
-            "    > test"
-        ]
-    );
-
-    panel.update_in(cx, |panel, window, cx| {
-        panel.cancel(&menu::Cancel, window, cx);
-        panel.update_visible_entries(None, false, false, window, cx);
-    });
-    cx.executor().run_until_parked();
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            //
-            "v src  <== selected",
-            "    > test"
-        ]
-    );
-}
-
-#[gpui::test]
-async fn test_basic_file_deletion_scenarios(cx: &mut gpui::TestAppContext) {
-    init_test_with_editor(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/root",
-        json!({
-            "dir1": {
-                "subdir1": {},
-                "file1.txt": "",
-                "file2.txt": "",
-            },
-            "dir2": {
-                "subdir2": {},
-                "file3.txt": "",
-                "file4.txt": "",
-            },
-            "file5.txt": "",
-            "file6.txt": "",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/root".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    toggle_expand_dir(&panel, "root/dir1", cx);
-    toggle_expand_dir(&panel, "root/dir2", cx);
-
-    // Test Case 1: Delete middle file in directory
-    select_path(&panel, "root/dir1/file1.txt", cx);
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..15, cx),
-        &[
-            "v root",
-            "    v dir1",
-            "        > subdir1",
-            "          file1.txt  <== selected",
-            "          file2.txt",
-            "    v dir2",
-            "        > subdir2",
-            "          file3.txt",
-            "          file4.txt",
-            "      file5.txt",
-            "      file6.txt",
-        ],
-        "Initial state before deleting middle file"
-    );
-
-    submit_deletion(&panel, cx);
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..15, cx),
-        &[
-            "v root",
-            "    v dir1",
-            "        > subdir1",
-            "          file2.txt  <== selected",
-            "    v dir2",
-            "        > subdir2",
-            "          file3.txt",
-            "          file4.txt",
-            "      file5.txt",
-            "      file6.txt",
-        ],
-        "Should select next file after deleting middle file"
-    );
-
-    // Test Case 2: Delete last file in directory
-    submit_deletion(&panel, cx);
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..15, cx),
-        &[
-            "v root",
-            "    v dir1",
-            "        > subdir1  <== selected",
-            "    v dir2",
-            "        > subdir2",
-            "          file3.txt",
-            "          file4.txt",
-            "      file5.txt",
-            "      file6.txt",
-        ],
-        "Should select next directory when last file is deleted"
-    );
-
-    // Test Case 3: Delete root level file
-    select_path(&panel, "root/file6.txt", cx);
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..15, cx),
-        &[
-            "v root",
-            "    v dir1",
-            "        > subdir1",
-            "    v dir2",
-            "        > subdir2",
-            "          file3.txt",
-            "          file4.txt",
-            "      file5.txt",
-            "      file6.txt  <== selected",
-        ],
-        "Initial state before deleting root level file"
-    );
-
-    submit_deletion(&panel, cx);
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..15, cx),
-        &[
-            "v root",
-            "    v dir1",
-            "        > subdir1",
-            "    v dir2",
-            "        > subdir2",
-            "          file3.txt",
-            "          file4.txt",
-            "      file5.txt  <== selected",
-        ],
-        "Should select prev entry at root level"
-    );
-}
-
-#[gpui::test]
-async fn test_deletion_gitignored(cx: &mut gpui::TestAppContext) {
-    init_test_with_editor(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/root"),
-        json!({
-            "aa": "// Testing 1",
-            "bb": "// Testing 2",
-            "cc": "// Testing 3",
-            "dd": "// Testing 4",
-            "ee": "// Testing 5",
-            "ff": "// Testing 6",
-            "gg": "// Testing 7",
-            "hh": "// Testing 8",
-            "ii": "// Testing 8",
-            ".gitignore": "bb\ndd\nee\nff\nii\n'",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-    // Test 1: Auto selection with one gitignored file next to the deleted file
-    cx.update(|_, cx| {
-        let settings = *ProjectPanelSettings::get_global(cx);
-        ProjectPanelSettings::override_global(
-            ProjectPanelSettings {
-                hide_gitignore: true,
-                ..settings
-            },
-            cx,
-        );
-    });
-
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    select_path(&panel, "root/aa", cx);
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v root",
-            "      .gitignore",
-            "      aa  <== selected",
-            "      cc",
-            "      gg",
-            "      hh"
-        ],
-        "Initial state should hide files on .gitignore"
-    );
-
-    submit_deletion(&panel, cx);
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v root",
-            "      .gitignore",
-            "      cc  <== selected",
-            "      gg",
-            "      hh"
-        ],
-        "Should select next entry not on .gitignore"
-    );
-
-    // Test 2: Auto selection with many gitignored files next to the deleted file
-    submit_deletion(&panel, cx);
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v root",
-            "      .gitignore",
-            "      gg  <== selected",
-            "      hh"
-        ],
-        "Should select next entry not on .gitignore"
-    );
-
-    // Test 3: Auto selection of entry before deleted file
-    select_path(&panel, "root/hh", cx);
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v root",
-            "      .gitignore",
-            "      gg",
-            "      hh  <== selected"
-        ],
-        "Should select next entry not on .gitignore"
-    );
-    submit_deletion(&panel, cx);
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &["v root", "      .gitignore", "      gg  <== selected"],
-        "Should select next entry not on .gitignore"
-    );
-}
-
-#[gpui::test]
-async fn test_nested_deletion_gitignore(cx: &mut gpui::TestAppContext) {
-    init_test_with_editor(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/root"),
-        json!({
-            "dir1": {
-                "file1": "// Testing",
-                "file2": "// Testing",
-                "file3": "// Testing"
-            },
-            "aa": "// Testing",
-            ".gitignore": "file1\nfile3\n",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-    cx.update(|_, cx| {
-        let settings = *ProjectPanelSettings::get_global(cx);
-        ProjectPanelSettings::override_global(
-            ProjectPanelSettings {
-                hide_gitignore: true,
-                ..settings
-            },
-            cx,
-        );
-    });
-
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    // Test 1: Visible items should exclude files on gitignore
-    toggle_expand_dir(&panel, "root/dir1", cx);
-    select_path(&panel, "root/dir1/file2", cx);
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v root",
-            "    v dir1",
-            "          file2  <== selected",
-            "      .gitignore",
-            "      aa"
-        ],
-        "Initial state should hide files on .gitignore"
-    );
-    submit_deletion(&panel, cx);
-
-    // Test 2: Auto selection should go to the parent
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..10, cx),
-        &[
-            "v root",
-            "    v dir1  <== selected",
-            "      .gitignore",
-            "      aa"
-        ],
-        "Initial state should hide files on .gitignore"
-    );
-}
-
-#[gpui::test]
-async fn test_complex_selection_scenarios(cx: &mut gpui::TestAppContext) {
-    init_test_with_editor(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/root",
-        json!({
-            "dir1": {
-                "subdir1": {
-                    "a.txt": "",
-                    "b.txt": ""
-                },
-                "file1.txt": "",
-            },
-            "dir2": {
-                "subdir2": {
-                    "c.txt": "",
-                    "d.txt": ""
-                },
-                "file2.txt": "",
-            },
-            "file3.txt": "",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/root".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    toggle_expand_dir(&panel, "root/dir1", cx);
-    toggle_expand_dir(&panel, "root/dir1/subdir1", cx);
-    toggle_expand_dir(&panel, "root/dir2", cx);
-    toggle_expand_dir(&panel, "root/dir2/subdir2", cx);
-
-    // Test Case 1: Select and delete nested directory with parent
-    cx.simulate_modifiers_change(gpui::Modifiers {
-        control: true,
-        ..Default::default()
-    });
-    select_path_with_mark(&panel, "root/dir1/subdir1", cx);
-    select_path_with_mark(&panel, "root/dir1", cx);
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..15, cx),
-        &[
-            "v root",
-            "    v dir1  <== selected  <== marked",
-            "        v subdir1  <== marked",
-            "              a.txt",
-            "              b.txt",
-            "          file1.txt",
-            "    v dir2",
-            "        v subdir2",
-            "              c.txt",
-            "              d.txt",
-            "          file2.txt",
-            "      file3.txt",
-        ],
-        "Initial state before deleting nested directory with parent"
-    );
-
-    submit_deletion(&panel, cx);
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..15, cx),
-        &[
-            "v root",
-            "    v dir2  <== selected",
-            "        v subdir2",
-            "              c.txt",
-            "              d.txt",
-            "          file2.txt",
-            "      file3.txt",
-        ],
-        "Should select next directory after deleting directory with parent"
-    );
-
-    // Test Case 2: Select mixed files and directories across levels
-    select_path_with_mark(&panel, "root/dir2/subdir2/c.txt", cx);
-    select_path_with_mark(&panel, "root/dir2/file2.txt", cx);
-    select_path_with_mark(&panel, "root/file3.txt", cx);
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..15, cx),
-        &[
-            "v root",
-            "    v dir2",
-            "        v subdir2",
-            "              c.txt  <== marked",
-            "              d.txt",
-            "          file2.txt  <== marked",
-            "      file3.txt  <== selected  <== marked",
-        ],
-        "Initial state before deleting"
-    );
-
-    submit_deletion(&panel, cx);
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..15, cx),
-        &[
-            "v root",
-            "    v dir2  <== selected",
-            "        v subdir2",
-            "              d.txt",
-        ],
-        "Should select sibling directory"
-    );
-}
-
-#[gpui::test]
-async fn test_delete_all_files_and_directories(cx: &mut gpui::TestAppContext) {
-    init_test_with_editor(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/root",
-        json!({
-            "dir1": {
-                "subdir1": {
-                    "a.txt": "",
-                    "b.txt": ""
-                },
-                "file1.txt": "",
-            },
-            "dir2": {
-                "subdir2": {
-                    "c.txt": "",
-                    "d.txt": ""
-                },
-                "file2.txt": "",
-            },
-            "file3.txt": "",
-            "file4.txt": "",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/root".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    toggle_expand_dir(&panel, "root/dir1", cx);
-    toggle_expand_dir(&panel, "root/dir1/subdir1", cx);
-    toggle_expand_dir(&panel, "root/dir2", cx);
-    toggle_expand_dir(&panel, "root/dir2/subdir2", cx);
-
-    // Test Case 1: Select all root files and directories
-    cx.simulate_modifiers_change(gpui::Modifiers {
-        control: true,
-        ..Default::default()
-    });
-    select_path_with_mark(&panel, "root/dir1", cx);
-    select_path_with_mark(&panel, "root/dir2", cx);
-    select_path_with_mark(&panel, "root/file3.txt", cx);
-    select_path_with_mark(&panel, "root/file4.txt", cx);
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &[
-            "v root",
-            "    v dir1  <== marked",
-            "        v subdir1",
-            "              a.txt",
-            "              b.txt",
-            "          file1.txt",
-            "    v dir2  <== marked",
-            "        v subdir2",
-            "              c.txt",
-            "              d.txt",
-            "          file2.txt",
-            "      file3.txt  <== marked",
-            "      file4.txt  <== selected  <== marked",
-        ],
-        "State before deleting all contents"
-    );
-
-    submit_deletion(&panel, cx);
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &["v root  <== selected"],
-        "Only empty root directory should remain after deleting all contents"
-    );
-}
-
-#[gpui::test]
-async fn test_nested_selection_deletion(cx: &mut gpui::TestAppContext) {
-    init_test_with_editor(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/root",
-        json!({
-            "dir1": {
-                "subdir1": {
-                    "file_a.txt": "content a",
-                    "file_b.txt": "content b",
-                },
-                "subdir2": {
-                    "file_c.txt": "content c",
-                },
-                "file1.txt": "content 1",
-            },
-            "dir2": {
-                "file2.txt": "content 2",
-            },
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/root".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    toggle_expand_dir(&panel, "root/dir1", cx);
-    toggle_expand_dir(&panel, "root/dir1/subdir1", cx);
-    toggle_expand_dir(&panel, "root/dir2", cx);
-    cx.simulate_modifiers_change(gpui::Modifiers {
-        control: true,
-        ..Default::default()
-    });
-
-    // Test Case 1: Select parent directory, subdirectory, and a file inside the subdirectory
-    select_path_with_mark(&panel, "root/dir1", cx);
-    select_path_with_mark(&panel, "root/dir1/subdir1", cx);
-    select_path_with_mark(&panel, "root/dir1/subdir1/file_a.txt", cx);
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &[
-            "v root",
-            "    v dir1  <== marked",
-            "        v subdir1  <== marked",
-            "              file_a.txt  <== selected  <== marked",
-            "              file_b.txt",
-            "        > subdir2",
-            "          file1.txt",
-            "    v dir2",
-            "          file2.txt",
-        ],
-        "State with parent dir, subdir, and file selected"
-    );
-    submit_deletion(&panel, cx);
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &["v root", "    v dir2  <== selected", "          file2.txt",],
-        "Only dir2 should remain after deletion"
-    );
-}
-
-#[gpui::test]
-async fn test_multiple_worktrees_deletion(cx: &mut gpui::TestAppContext) {
-    init_test_with_editor(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    // First worktree
-    fs.insert_tree(
-        "/root1",
-        json!({
-            "dir1": {
-                "file1.txt": "content 1",
-                "file2.txt": "content 2",
-            },
-            "dir2": {
-                "file3.txt": "content 3",
-            },
-        }),
-    )
-    .await;
-
-    // Second worktree
-    fs.insert_tree(
-        "/root2",
-        json!({
-            "dir3": {
-                "file4.txt": "content 4",
-                "file5.txt": "content 5",
-            },
-            "file6.txt": "content 6",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/root1".as_ref(), "/root2".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    // Expand all directories for testing
-    toggle_expand_dir(&panel, "root1/dir1", cx);
-    toggle_expand_dir(&panel, "root1/dir2", cx);
-    toggle_expand_dir(&panel, "root2/dir3", cx);
-
-    // Test Case 1: Delete files across different worktrees
-    cx.simulate_modifiers_change(gpui::Modifiers {
-        control: true,
-        ..Default::default()
-    });
-    select_path_with_mark(&panel, "root1/dir1/file1.txt", cx);
-    select_path_with_mark(&panel, "root2/dir3/file4.txt", cx);
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &[
-            "v root1",
-            "    v dir1",
-            "          file1.txt  <== marked",
-            "          file2.txt",
-            "    v dir2",
-            "          file3.txt",
-            "v root2",
-            "    v dir3",
-            "          file4.txt  <== selected  <== marked",
-            "          file5.txt",
-            "      file6.txt",
-        ],
-        "Initial state with files selected from different worktrees"
-    );
-
-    submit_deletion(&panel, cx);
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &[
-            "v root1",
-            "    v dir1",
-            "          file2.txt",
-            "    v dir2",
-            "          file3.txt",
-            "v root2",
-            "    v dir3",
-            "          file5.txt  <== selected",
-            "      file6.txt",
-        ],
-        "Should select next file in the last worktree after deletion"
-    );
-
-    // Test Case 2: Delete directories from different worktrees
-    select_path_with_mark(&panel, "root1/dir1", cx);
-    select_path_with_mark(&panel, "root2/dir3", cx);
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &[
-            "v root1",
-            "    v dir1  <== marked",
-            "          file2.txt",
-            "    v dir2",
-            "          file3.txt",
-            "v root2",
-            "    v dir3  <== selected  <== marked",
-            "          file5.txt",
-            "      file6.txt",
-        ],
-        "State with directories marked from different worktrees"
-    );
-
-    submit_deletion(&panel, cx);
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &[
-            "v root1",
-            "    v dir2",
-            "          file3.txt",
-            "v root2",
-            "      file6.txt  <== selected",
-        ],
-        "Should select remaining file in last worktree after directory deletion"
-    );
-
-    // Test Case 4: Delete all remaining files except roots
-    select_path_with_mark(&panel, "root1/dir2/file3.txt", cx);
-    select_path_with_mark(&panel, "root2/file6.txt", cx);
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &[
-            "v root1",
-            "    v dir2",
-            "          file3.txt  <== marked",
-            "v root2",
-            "      file6.txt  <== selected  <== marked",
-        ],
-        "State with all remaining files marked"
-    );
-
-    submit_deletion(&panel, cx);
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &["v root1", "    v dir2", "v root2  <== selected"],
-        "Second parent root should be selected after deleting"
-    );
-}
-
-#[gpui::test]
-async fn test_selection_vs_marked_entries_priority(cx: &mut gpui::TestAppContext) {
-    init_test_with_editor(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/root",
-        json!({
-            "dir1": {
-                "file1.txt": "",
-                "file2.txt": "",
-                "file3.txt": "",
-            },
-            "dir2": {
-                "file4.txt": "",
-                "file5.txt": "",
-            },
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/root".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    toggle_expand_dir(&panel, "root/dir1", cx);
-    toggle_expand_dir(&panel, "root/dir2", cx);
-
-    cx.simulate_modifiers_change(gpui::Modifiers {
-        control: true,
-        ..Default::default()
-    });
-
-    select_path_with_mark(&panel, "root/dir1/file2.txt", cx);
-    select_path(&panel, "root/dir1/file1.txt", cx);
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..15, cx),
-        &[
-            "v root",
-            "    v dir1",
-            "          file1.txt  <== selected",
-            "          file2.txt  <== marked",
-            "          file3.txt",
-            "    v dir2",
-            "          file4.txt",
-            "          file5.txt",
-        ],
-        "Initial state with one marked entry and different selection"
-    );
-
-    // Delete should operate on the selected entry (file1.txt)
-    submit_deletion(&panel, cx);
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..15, cx),
-        &[
-            "v root",
-            "    v dir1",
-            "          file2.txt  <== selected  <== marked",
-            "          file3.txt",
-            "    v dir2",
-            "          file4.txt",
-            "          file5.txt",
-        ],
-        "Should delete selected file, not marked file"
-    );
-
-    select_path_with_mark(&panel, "root/dir1/file3.txt", cx);
-    select_path_with_mark(&panel, "root/dir2/file4.txt", cx);
-    select_path(&panel, "root/dir2/file5.txt", cx);
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..15, cx),
-        &[
-            "v root",
-            "    v dir1",
-            "          file2.txt  <== marked",
-            "          file3.txt  <== marked",
-            "    v dir2",
-            "          file4.txt  <== marked",
-            "          file5.txt  <== selected",
-        ],
-        "Initial state with multiple marked entries and different selection"
-    );
-
-    // Delete should operate on all marked entries, ignoring the selection
-    submit_deletion(&panel, cx);
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..15, cx),
-        &[
-            "v root",
-            "    v dir1",
-            "    v dir2",
-            "          file5.txt  <== selected",
-        ],
-        "Should delete all marked files, leaving only the selected file"
-    );
-}
-
-#[gpui::test]
-async fn test_selection_fallback_to_next_highest_worktree(cx: &mut gpui::TestAppContext) {
-    init_test_with_editor(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/root_b",
-        json!({
-            "dir1": {
-                "file1.txt": "content 1",
-                "file2.txt": "content 2",
-            },
-        }),
-    )
-    .await;
-
-    fs.insert_tree(
-        "/root_c",
-        json!({
-            "dir2": {},
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/root_b".as_ref(), "/root_c".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    toggle_expand_dir(&panel, "root_b/dir1", cx);
-    toggle_expand_dir(&panel, "root_c/dir2", cx);
-
-    cx.simulate_modifiers_change(gpui::Modifiers {
-        control: true,
-        ..Default::default()
-    });
-    select_path_with_mark(&panel, "root_b/dir1/file1.txt", cx);
-    select_path_with_mark(&panel, "root_b/dir1/file2.txt", cx);
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &[
-            "v root_b",
-            "    v dir1",
-            "          file1.txt  <== marked",
-            "          file2.txt  <== selected  <== marked",
-            "v root_c",
-            "    v dir2",
-        ],
-        "Initial state with files marked in root_b"
-    );
-
-    submit_deletion(&panel, cx);
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &[
-            "v root_b",
-            "    v dir1  <== selected",
-            "v root_c",
-            "    v dir2",
-        ],
-        "After deletion in root_b as it's last deletion, selection should be in root_b"
-    );
-
-    select_path_with_mark(&panel, "root_c/dir2", cx);
-
-    submit_deletion(&panel, cx);
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &["v root_b", "    v dir1", "v root_c  <== selected",],
-        "After deleting from root_c, it should remain in root_c"
-    );
-}
-
-fn toggle_expand_dir(panel: &Entity<ProjectPanel>, path: &str, cx: &mut VisualTestContext) {
-    let path = rel_path(path);
-    panel.update_in(cx, |panel, window, cx| {
-        for worktree in panel.project.read(cx).worktrees(cx).collect::<Vec<_>>() {
-            let worktree = worktree.read(cx);
-            if let Ok(relative_path) = path.strip_prefix(worktree.root_name()) {
-                let entry_id = worktree.entry_for_path(relative_path).unwrap().id;
-                panel.toggle_expanded(entry_id, window, cx);
-                return;
-            }
-        }
-        panic!("no worktree for path {:?}", path);
-    });
-    cx.run_until_parked();
-}
-
-#[gpui::test]
-async fn test_expand_all_for_entry(cx: &mut gpui::TestAppContext) {
-    init_test_with_editor(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/root"),
-        json!({
-            ".gitignore": "**/ignored_dir\n**/ignored_nested",
-            "dir1": {
-                "empty1": {
-                    "empty2": {
-                        "empty3": {
-                            "file.txt": ""
-                        }
-                    }
-                },
-                "subdir1": {
-                    "file1.txt": "",
-                    "file2.txt": "",
-                    "ignored_nested": {
-                        "ignored_file.txt": ""
-                    }
-                },
-                "ignored_dir": {
-                    "subdir": {
-                        "deep_file.txt": ""
-                    }
-                }
-            }
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-    // Test 1: When auto-fold is enabled
-    cx.update(|_, cx| {
-        let settings = *ProjectPanelSettings::get_global(cx);
-        ProjectPanelSettings::override_global(
-            ProjectPanelSettings {
-                auto_fold_dirs: true,
-                ..settings
-            },
-            cx,
-        );
-    });
-
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &["v root", "    > dir1", "      .gitignore",],
-        "Initial state should show collapsed root structure"
-    );
-
-    toggle_expand_dir(&panel, "root/dir1", cx);
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &[
-            "v root",
-            "    v dir1  <== selected",
-            "        > empty1/empty2/empty3",
-            "        > ignored_dir",
-            "        > subdir1",
-            "      .gitignore",
-        ],
-        "Should show first level with auto-folded dirs and ignored dir visible"
-    );
-
-    let entry_id = find_project_entry(&panel, "root/dir1", cx).unwrap();
-    panel.update_in(cx, |panel, window, cx| {
-        let project = panel.project.read(cx);
-        let worktree = project.worktrees(cx).next().unwrap().read(cx);
-        panel.expand_all_for_entry(worktree.id(), entry_id, cx);
-        panel.update_visible_entries(None, false, false, window, cx);
-    });
-    cx.run_until_parked();
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &[
-            "v root",
-            "    v dir1  <== selected",
-            "        v empty1",
-            "            v empty2",
-            "                v empty3",
-            "                      file.txt",
-            "        > ignored_dir",
-            "        v subdir1",
-            "            > ignored_nested",
-            "              file1.txt",
-            "              file2.txt",
-            "      .gitignore",
-        ],
-        "After expand_all with auto-fold: should not expand ignored_dir, should expand folded dirs, and should not expand ignored_nested"
-    );
-
-    // Test 2: When auto-fold is disabled
-    cx.update(|_, cx| {
-        let settings = *ProjectPanelSettings::get_global(cx);
-        ProjectPanelSettings::override_global(
-            ProjectPanelSettings {
-                auto_fold_dirs: false,
-                ..settings
-            },
-            cx,
-        );
-    });
-
-    panel.update_in(cx, |panel, window, cx| {
-        panel.collapse_all_entries(&CollapseAllEntries, window, cx);
-    });
-
-    toggle_expand_dir(&panel, "root/dir1", cx);
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &[
-            "v root",
-            "    v dir1  <== selected",
-            "        > empty1",
-            "        > ignored_dir",
-            "        > subdir1",
-            "      .gitignore",
-        ],
-        "With auto-fold disabled: should show all directories separately"
-    );
-
-    let entry_id = find_project_entry(&panel, "root/dir1", cx).unwrap();
-    panel.update_in(cx, |panel, window, cx| {
-        let project = panel.project.read(cx);
-        let worktree = project.worktrees(cx).next().unwrap().read(cx);
-        panel.expand_all_for_entry(worktree.id(), entry_id, cx);
-        panel.update_visible_entries(None, false, false, window, cx);
-    });
-    cx.run_until_parked();
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &[
-            "v root",
-            "    v dir1  <== selected",
-            "        v empty1",
-            "            v empty2",
-            "                v empty3",
-            "                      file.txt",
-            "        > ignored_dir",
-            "        v subdir1",
-            "            > ignored_nested",
-            "              file1.txt",
-            "              file2.txt",
-            "      .gitignore",
-        ],
-        "After expand_all without auto-fold: should expand all dirs normally, \
-         expand ignored_dir itself but not its subdirs, and not expand ignored_nested"
-    );
-
-    // Test 3: When explicitly called on ignored directory
-    let ignored_dir_entry = find_project_entry(&panel, "root/dir1/ignored_dir", cx).unwrap();
-    panel.update_in(cx, |panel, window, cx| {
-        let project = panel.project.read(cx);
-        let worktree = project.worktrees(cx).next().unwrap().read(cx);
-        panel.expand_all_for_entry(worktree.id(), ignored_dir_entry, cx);
-        panel.update_visible_entries(None, false, false, window, cx);
-    });
-    cx.run_until_parked();
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &[
-            "v root",
-            "    v dir1  <== selected",
-            "        v empty1",
-            "            v empty2",
-            "                v empty3",
-            "                      file.txt",
-            "        v ignored_dir",
-            "            v subdir",
-            "                  deep_file.txt",
-            "        v subdir1",
-            "            > ignored_nested",
-            "              file1.txt",
-            "              file2.txt",
-            "      .gitignore",
-        ],
-        "After expand_all on ignored_dir: should expand all contents of the ignored directory"
-    );
-}
-
-#[gpui::test]
-async fn test_collapse_all_for_entry(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/root"),
-        json!({
-            "dir1": {
-                "subdir1": {
-                    "nested1": {
-                        "file1.txt": "",
-                        "file2.txt": ""
-                    },
-                },
-                "subdir2": {
-                    "file4.txt": ""
-                }
-            },
-            "dir2": {
-                "single_file": {
-                    "file5.txt": ""
-                }
-            }
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-    // Test 1: Basic collapsing
-    {
-        let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-        cx.run_until_parked();
-
-        toggle_expand_dir(&panel, "root/dir1", cx);
-        toggle_expand_dir(&panel, "root/dir1/subdir1", cx);
-        toggle_expand_dir(&panel, "root/dir1/subdir1/nested1", cx);
-        toggle_expand_dir(&panel, "root/dir1/subdir2", cx);
-
-        assert_eq!(
-            visible_entries_as_strings(&panel, 0..20, cx),
-            &[
-                "v root",
-                "    v dir1",
-                "        v subdir1",
-                "            v nested1",
-                "                  file1.txt",
-                "                  file2.txt",
-                "        v subdir2  <== selected",
-                "              file4.txt",
-                "    > dir2",
-            ],
-            "Initial state with everything expanded"
-        );
-
-        let entry_id = find_project_entry(&panel, "root/dir1", cx).unwrap();
-        panel.update_in(cx, |panel, window, cx| {
-            let project = panel.project.read(cx);
-            let worktree = project.worktrees(cx).next().unwrap().read(cx);
-            panel.collapse_all_for_entry(worktree.id(), entry_id, cx);
-            panel.update_visible_entries(None, false, false, window, cx);
-        });
-        cx.run_until_parked();
-
-        assert_eq!(
-            visible_entries_as_strings(&panel, 0..20, cx),
-            &["v root", "    > dir1", "    > dir2",],
-            "All subdirs under dir1 should be collapsed"
-        );
-    }
-
-    // Test 2: With auto-fold enabled
-    {
-        cx.update(|_, cx| {
-            let settings = *ProjectPanelSettings::get_global(cx);
-            ProjectPanelSettings::override_global(
-                ProjectPanelSettings {
-                    auto_fold_dirs: true,
-                    ..settings
-                },
-                cx,
-            );
-        });
-
-        let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-        cx.run_until_parked();
-
-        toggle_expand_dir(&panel, "root/dir1", cx);
-        toggle_expand_dir(&panel, "root/dir1/subdir1", cx);
-        toggle_expand_dir(&panel, "root/dir1/subdir1/nested1", cx);
-
-        assert_eq!(
-            visible_entries_as_strings(&panel, 0..20, cx),
-            &[
-                "v root",
-                "    v dir1",
-                "        v subdir1/nested1  <== selected",
-                "              file1.txt",
-                "              file2.txt",
-                "        > subdir2",
-                "    > dir2/single_file",
-            ],
-            "Initial state with some dirs expanded"
-        );
-
-        let entry_id = find_project_entry(&panel, "root/dir1", cx).unwrap();
-        panel.update(cx, |panel, cx| {
-            let project = panel.project.read(cx);
-            let worktree = project.worktrees(cx).next().unwrap().read(cx);
-            panel.collapse_all_for_entry(worktree.id(), entry_id, cx);
-        });
-
-        toggle_expand_dir(&panel, "root/dir1", cx);
-
-        assert_eq!(
-            visible_entries_as_strings(&panel, 0..20, cx),
-            &[
-                "v root",
-                "    v dir1  <== selected",
-                "        > subdir1/nested1",
-                "        > subdir2",
-                "    > dir2/single_file",
-            ],
-            "Subdirs should be collapsed and folded with auto-fold enabled"
-        );
-    }
-
-    // Test 3: With auto-fold disabled
-    {
-        cx.update(|_, cx| {
-            let settings = *ProjectPanelSettings::get_global(cx);
-            ProjectPanelSettings::override_global(
-                ProjectPanelSettings {
-                    auto_fold_dirs: false,
-                    ..settings
-                },
-                cx,
-            );
-        });
-
-        let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-        cx.run_until_parked();
-
-        toggle_expand_dir(&panel, "root/dir1", cx);
-        toggle_expand_dir(&panel, "root/dir1/subdir1", cx);
-        toggle_expand_dir(&panel, "root/dir1/subdir1/nested1", cx);
-
-        assert_eq!(
-            visible_entries_as_strings(&panel, 0..20, cx),
-            &[
-                "v root",
-                "    v dir1",
-                "        v subdir1",
-                "            v nested1  <== selected",
-                "                  file1.txt",
-                "                  file2.txt",
-                "        > subdir2",
-                "    > dir2",
-            ],
-            "Initial state with some dirs expanded and auto-fold disabled"
-        );
-
-        let entry_id = find_project_entry(&panel, "root/dir1", cx).unwrap();
-        panel.update(cx, |panel, cx| {
-            let project = panel.project.read(cx);
-            let worktree = project.worktrees(cx).next().unwrap().read(cx);
-            panel.collapse_all_for_entry(worktree.id(), entry_id, cx);
-        });
-
-        toggle_expand_dir(&panel, "root/dir1", cx);
-
-        assert_eq!(
-            visible_entries_as_strings(&panel, 0..20, cx),
-            &[
-                "v root",
-                "    v dir1  <== selected",
-                "        > subdir1",
-                "        > subdir2",
-                "    > dir2",
-            ],
-            "Subdirs should be collapsed but not folded with auto-fold disabled"
-        );
-    }
-}
-
-#[gpui::test]
-async fn test_create_entries_without_selection(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/root"),
-        json!({
-            "dir1": {
-                "file1.txt": "",
-            },
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-    let panel = workspace
-        .update(cx, |workspace, window, cx| {
-            let panel = ProjectPanel::new(workspace, window, cx);
-            workspace.add_panel(panel.clone(), window, cx);
-            panel
-        })
-        .unwrap();
-    cx.run_until_parked();
-
-    #[rustfmt::skip]
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &[
-            "v root",
-            "    > dir1",
-        ],
-        "Initial state with nothing selected"
-    );
-
-    panel.update_in(cx, |panel, window, cx| {
-        panel.new_file(&NewFile, window, cx);
-    });
-    cx.run_until_parked();
-    panel.update_in(cx, |panel, window, cx| {
-        assert!(panel.filename_editor.read(cx).is_focused(window));
-    });
-    panel
-        .update_in(cx, |panel, window, cx| {
-            panel.filename_editor.update(cx, |editor, cx| {
-                editor.set_text("hello_from_no_selections", window, cx)
-            });
-            panel.confirm_edit(true, window, cx).unwrap()
-        })
-        .await
-        .unwrap();
-    cx.run_until_parked();
-    #[rustfmt::skip]
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &[
-            "v root",
-            "    > dir1",
-            "      hello_from_no_selections  <== selected  <== marked",
-        ],
-        "A new file is created under the root directory"
-    );
-}
-
-#[gpui::test]
-async fn test_create_entries_without_selection_hide_root(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/root"),
-        json!({
-            "existing_dir": {
-                "existing_file.txt": "",
-            },
-            "existing_file.txt": "",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-    cx.update(|_, cx| {
-        let settings = *ProjectPanelSettings::get_global(cx);
-        ProjectPanelSettings::override_global(
-            ProjectPanelSettings {
-                hide_root: true,
-                ..settings
-            },
-            cx,
-        );
-    });
-
-    let panel = workspace
-        .update(cx, |workspace, window, cx| {
-            let panel = ProjectPanel::new(workspace, window, cx);
-            workspace.add_panel(panel.clone(), window, cx);
-            panel
-        })
-        .unwrap();
-    cx.run_until_parked();
-
-    #[rustfmt::skip]
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &[
-            "> existing_dir",
-            "  existing_file.txt",
-        ],
-        "Initial state with hide_root=true, root should be hidden and nothing selected"
-    );
-
-    panel.update(cx, |panel, _| {
-        assert!(
-            panel.state.selection.is_none(),
-            "Should have no selection initially"
-        );
-    });
-
-    // Test 1: Create new file when no entry is selected
-    panel.update_in(cx, |panel, window, cx| {
-        panel.new_file(&NewFile, window, cx);
-    });
-    cx.run_until_parked();
-    panel.update_in(cx, |panel, window, cx| {
-        assert!(panel.filename_editor.read(cx).is_focused(window));
-    });
-    cx.run_until_parked();
-    #[rustfmt::skip]
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &[
-            "> existing_dir",
-            "  [EDITOR: '']  <== selected",
-            "  existing_file.txt",
-        ],
-        "Editor should appear at root level when hide_root=true and no selection"
-    );
-
-    let confirm = panel.update_in(cx, |panel, window, cx| {
-        panel.filename_editor.update(cx, |editor, cx| {
-            editor.set_text("new_file_at_root.txt", window, cx)
-        });
-        panel.confirm_edit(true, window, cx).unwrap()
-    });
-    confirm.await.unwrap();
-    cx.run_until_parked();
-
-    #[rustfmt::skip]
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &[
-            "> existing_dir",
-            "  existing_file.txt",
-            "  new_file_at_root.txt  <== selected  <== marked",
-        ],
-        "New file should be created at root level and visible without root prefix"
-    );
-
-    assert!(
-        fs.is_file(Path::new("/root/new_file_at_root.txt")).await,
-        "File should be created in the actual root directory"
-    );
-
-    // Test 2: Create new directory when no entry is selected
-    panel.update(cx, |panel, _| {
-        panel.state.selection = None;
-    });
-
-    panel.update_in(cx, |panel, window, cx| {
-        panel.new_directory(&NewDirectory, window, cx);
-    });
-    cx.run_until_parked();
-
-    panel.update_in(cx, |panel, window, cx| {
-        assert!(panel.filename_editor.read(cx).is_focused(window));
-    });
-
-    #[rustfmt::skip]
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &[
-            "> [EDITOR: '']  <== selected",
-            "> existing_dir",
-            "  existing_file.txt",
-            "  new_file_at_root.txt",
-        ],
-        "Directory editor should appear at root level when hide_root=true and no selection"
-    );
-
-    let confirm = panel.update_in(cx, |panel, window, cx| {
-        panel.filename_editor.update(cx, |editor, cx| {
-            editor.set_text("new_dir_at_root", window, cx)
-        });
-        panel.confirm_edit(true, window, cx).unwrap()
-    });
-    confirm.await.unwrap();
-    cx.run_until_parked();
-
-    #[rustfmt::skip]
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &[
-            "> existing_dir",
-            "v new_dir_at_root  <== selected",
-            "  existing_file.txt",
-            "  new_file_at_root.txt",
-        ],
-        "New directory should be created at root level and visible without root prefix"
-    );
-
-    assert!(
-        fs.is_dir(Path::new("/root/new_dir_at_root")).await,
-        "Directory should be created in the actual root directory"
-    );
-}
-
-#[cfg(windows)]
-#[gpui::test]
-async fn test_create_entry_with_trailing_dot_windows(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        path!("/root"),
-        json!({
-            "dir1": {
-                "file1.txt": "",
-            },
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-    let panel = workspace
-        .update(cx, |workspace, window, cx| {
-            let panel = ProjectPanel::new(workspace, window, cx);
-            workspace.add_panel(panel.clone(), window, cx);
-            panel
-        })
-        .unwrap();
-    cx.run_until_parked();
-
-    #[rustfmt::skip]
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &[
-            "v root",
-            "    > dir1",
-        ],
-        "Initial state with nothing selected"
-    );
-
-    panel.update_in(cx, |panel, window, cx| {
-        panel.new_file(&NewFile, window, cx);
-    });
-    cx.run_until_parked();
-    panel.update_in(cx, |panel, window, cx| {
-        assert!(panel.filename_editor.read(cx).is_focused(window));
-    });
-    panel
-        .update_in(cx, |panel, window, cx| {
-            panel
-                .filename_editor
-                .update(cx, |editor, cx| editor.set_text("foo.", window, cx));
-            panel.confirm_edit(true, window, cx).unwrap()
-        })
-        .await
-        .unwrap();
-    cx.run_until_parked();
-    #[rustfmt::skip]
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..20, cx),
-        &[
-            "v root",
-            "    > dir1",
-            "      foo  <== selected  <== marked",
-        ],
-        "A new file is created under the root directory without the trailing dot"
-    );
-}
-
-#[gpui::test]
-async fn test_highlight_entry_for_external_drag(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/root",
-        json!({
-            "dir1": {
-                "file1.txt": "",
-                "dir2": {
-                    "file2.txt": ""
-                }
-            },
-            "file3.txt": ""
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/root".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    panel.update(cx, |panel, cx| {
-        let project = panel.project.read(cx);
-        let worktree = project.visible_worktrees(cx).next().unwrap();
-        let worktree = worktree.read(cx);
-
-        // Test 1: Target is a directory, should highlight the directory itself
-        let dir_entry = worktree.entry_for_path(rel_path("dir1")).unwrap();
-        let result = panel.highlight_entry_for_external_drag(dir_entry, worktree);
-        assert_eq!(
-            result,
-            Some(dir_entry.id),
-            "Should highlight directory itself"
-        );
-
-        // Test 2: Target is nested file, should highlight immediate parent
-        let nested_file = worktree
-            .entry_for_path(rel_path("dir1/dir2/file2.txt"))
-            .unwrap();
-        let nested_parent = worktree.entry_for_path(rel_path("dir1/dir2")).unwrap();
-        let result = panel.highlight_entry_for_external_drag(nested_file, worktree);
-        assert_eq!(
-            result,
-            Some(nested_parent.id),
-            "Should highlight immediate parent"
-        );
-
-        // Test 3: Target is root level file, should highlight root
-        let root_file = worktree.entry_for_path(rel_path("file3.txt")).unwrap();
-        let result = panel.highlight_entry_for_external_drag(root_file, worktree);
-        assert_eq!(
-            result,
-            Some(worktree.root_entry().unwrap().id),
-            "Root level file should return None"
-        );
-
-        // Test 4: Target is root itself, should highlight root
-        let root_entry = worktree.root_entry().unwrap();
-        let result = panel.highlight_entry_for_external_drag(root_entry, worktree);
-        assert_eq!(
-            result,
-            Some(root_entry.id),
-            "Root level file should return None"
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_highlight_entry_for_selection_drag(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/root",
-        json!({
-            "parent_dir": {
-                "child_file.txt": "",
-                "sibling_file.txt": "",
-                "child_dir": {
-                    "nested_file.txt": ""
-                }
-            },
-            "other_dir": {
-                "other_file.txt": ""
-            }
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/root".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    panel.update(cx, |panel, cx| {
-        let project = panel.project.read(cx);
-        let worktree = project.visible_worktrees(cx).next().unwrap();
-        let worktree_id = worktree.read(cx).id();
-        let worktree = worktree.read(cx);
-
-        let parent_dir = worktree.entry_for_path(rel_path("parent_dir")).unwrap();
-        let child_file = worktree
-            .entry_for_path(rel_path("parent_dir/child_file.txt"))
-            .unwrap();
-        let sibling_file = worktree
-            .entry_for_path(rel_path("parent_dir/sibling_file.txt"))
-            .unwrap();
-        let child_dir = worktree
-            .entry_for_path(rel_path("parent_dir/child_dir"))
-            .unwrap();
-        let other_dir = worktree.entry_for_path(rel_path("other_dir")).unwrap();
-        let other_file = worktree
-            .entry_for_path(rel_path("other_dir/other_file.txt"))
-            .unwrap();
-
-        // Test 1: Single item drag, don't highlight parent directory
-        let dragged_selection = DraggedSelection {
-            active_selection: SelectedEntry {
-                worktree_id,
-                entry_id: child_file.id,
-            },
-            marked_selections: Arc::new([SelectedEntry {
-                worktree_id,
-                entry_id: child_file.id,
-            }]),
-        };
-        let result =
-            panel.highlight_entry_for_selection_drag(parent_dir, worktree, &dragged_selection, cx);
-        assert_eq!(result, None, "Should not highlight parent of dragged item");
-
-        // Test 2: Single item drag, don't highlight sibling files
-        let result = panel.highlight_entry_for_selection_drag(
-            sibling_file,
-            worktree,
-            &dragged_selection,
-            cx,
-        );
-        assert_eq!(result, None, "Should not highlight sibling files");
-
-        // Test 3: Single item drag, highlight unrelated directory
-        let result =
-            panel.highlight_entry_for_selection_drag(other_dir, worktree, &dragged_selection, cx);
-        assert_eq!(
-            result,
-            Some(other_dir.id),
-            "Should highlight unrelated directory"
-        );
-
-        // Test 4: Single item drag, highlight sibling directory
-        let result =
-            panel.highlight_entry_for_selection_drag(child_dir, worktree, &dragged_selection, cx);
-        assert_eq!(
-            result,
-            Some(child_dir.id),
-            "Should highlight sibling directory"
-        );
-
-        // Test 5: Multiple items drag, highlight parent directory
-        let dragged_selection = DraggedSelection {
-            active_selection: SelectedEntry {
-                worktree_id,
-                entry_id: child_file.id,
-            },
-            marked_selections: Arc::new([
-                SelectedEntry {
-                    worktree_id,
-                    entry_id: child_file.id,
-                },
-                SelectedEntry {
-                    worktree_id,
-                    entry_id: sibling_file.id,
-                },
-            ]),
-        };
-        let result =
-            panel.highlight_entry_for_selection_drag(parent_dir, worktree, &dragged_selection, cx);
-        assert_eq!(
-            result,
-            Some(parent_dir.id),
-            "Should highlight parent with multiple items"
-        );
-
-        // Test 6: Target is file in different directory, highlight parent
-        let result =
-            panel.highlight_entry_for_selection_drag(other_file, worktree, &dragged_selection, cx);
-        assert_eq!(
-            result,
-            Some(other_dir.id),
-            "Should highlight parent of target file"
-        );
-
-        // Test 7: Target is directory, always highlight
-        let result =
-            panel.highlight_entry_for_selection_drag(child_dir, worktree, &dragged_selection, cx);
-        assert_eq!(
-            result,
-            Some(child_dir.id),
-            "Should always highlight directories"
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_highlight_entry_for_selection_drag_cross_worktree(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/root1",
-        json!({
-            "src": {
-                "main.rs": "",
-                "lib.rs": ""
-            }
-        }),
-    )
-    .await;
-    fs.insert_tree(
-        "/root2",
-        json!({
-            "src": {
-                "main.rs": "",
-                "test.rs": ""
-            }
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/root1".as_ref(), "/root2".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    panel.update(cx, |panel, cx| {
-        let project = panel.project.read(cx);
-        let worktrees: Vec<_> = project.visible_worktrees(cx).collect();
-
-        let worktree_a = &worktrees[0];
-        let main_rs_from_a = worktree_a
-            .read(cx)
-            .entry_for_path(rel_path("src/main.rs"))
-            .unwrap();
-
-        let worktree_b = &worktrees[1];
-        let src_dir_from_b = worktree_b.read(cx).entry_for_path(rel_path("src")).unwrap();
-        let main_rs_from_b = worktree_b
-            .read(cx)
-            .entry_for_path(rel_path("src/main.rs"))
-            .unwrap();
-
-        // Test dragging file from worktree A onto parent of file with same relative path in worktree B
-        let dragged_selection = DraggedSelection {
-            active_selection: SelectedEntry {
-                worktree_id: worktree_a.read(cx).id(),
-                entry_id: main_rs_from_a.id,
-            },
-            marked_selections: Arc::new([SelectedEntry {
-                worktree_id: worktree_a.read(cx).id(),
-                entry_id: main_rs_from_a.id,
-            }]),
-        };
-
-        let result = panel.highlight_entry_for_selection_drag(
-            src_dir_from_b,
-            worktree_b.read(cx),
-            &dragged_selection,
-            cx,
-        );
-        assert_eq!(
-            result,
-            Some(src_dir_from_b.id),
-            "Should highlight target directory from different worktree even with same relative path"
-        );
-
-        // Test dragging file from worktree A onto file with same relative path in worktree B
-        let result = panel.highlight_entry_for_selection_drag(
-            main_rs_from_b,
-            worktree_b.read(cx),
-            &dragged_selection,
-            cx,
-        );
-        assert_eq!(
-            result,
-            Some(src_dir_from_b.id),
-            "Should highlight parent of target file from different worktree"
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_should_highlight_background_for_selection_drag(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/root1",
-        json!({
-            "parent_dir": {
-                "child_file.txt": "",
-                "nested_dir": {
-                    "nested_file.txt": ""
-                }
-            },
-            "root_file.txt": ""
-        }),
-    )
-    .await;
-
-    fs.insert_tree(
-        "/root2",
-        json!({
-            "other_dir": {
-                "other_file.txt": ""
-            }
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/root1".as_ref(), "/root2".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    panel.update(cx, |panel, cx| {
-        let project = panel.project.read(cx);
-        let worktrees: Vec<_> = project.visible_worktrees(cx).collect();
-        let worktree1 = worktrees[0].read(cx);
-        let worktree2 = worktrees[1].read(cx);
-        let worktree1_id = worktree1.id();
-        let _worktree2_id = worktree2.id();
-
-        let root1_entry = worktree1.root_entry().unwrap();
-        let root2_entry = worktree2.root_entry().unwrap();
-        let _parent_dir = worktree1.entry_for_path(rel_path("parent_dir")).unwrap();
-        let child_file = worktree1
-            .entry_for_path(rel_path("parent_dir/child_file.txt"))
-            .unwrap();
-        let nested_file = worktree1
-            .entry_for_path(rel_path("parent_dir/nested_dir/nested_file.txt"))
-            .unwrap();
-        let root_file = worktree1.entry_for_path(rel_path("root_file.txt")).unwrap();
-
-        // Test 1: Multiple entries - should always highlight background
-        let multiple_dragged_selection = DraggedSelection {
-            active_selection: SelectedEntry {
-                worktree_id: worktree1_id,
-                entry_id: child_file.id,
-            },
-            marked_selections: Arc::new([
-                SelectedEntry {
-                    worktree_id: worktree1_id,
-                    entry_id: child_file.id,
-                },
-                SelectedEntry {
-                    worktree_id: worktree1_id,
-                    entry_id: nested_file.id,
-                },
-            ]),
-        };
-
-        let result = panel.should_highlight_background_for_selection_drag(
-            &multiple_dragged_selection,
-            root1_entry.id,
-            cx,
-        );
-        assert!(result, "Should highlight background for multiple entries");
-
-        // Test 2: Single entry with non-empty parent path - should highlight background
-        let nested_dragged_selection = DraggedSelection {
-            active_selection: SelectedEntry {
-                worktree_id: worktree1_id,
-                entry_id: nested_file.id,
-            },
-            marked_selections: Arc::new([SelectedEntry {
-                worktree_id: worktree1_id,
-                entry_id: nested_file.id,
-            }]),
-        };
-
-        let result = panel.should_highlight_background_for_selection_drag(
-            &nested_dragged_selection,
-            root1_entry.id,
-            cx,
-        );
-        assert!(result, "Should highlight background for nested file");
-
-        // Test 3: Single entry at root level, same worktree - should NOT highlight background
-        let root_file_dragged_selection = DraggedSelection {
-            active_selection: SelectedEntry {
-                worktree_id: worktree1_id,
-                entry_id: root_file.id,
-            },
-            marked_selections: Arc::new([SelectedEntry {
-                worktree_id: worktree1_id,
-                entry_id: root_file.id,
-            }]),
-        };
-
-        let result = panel.should_highlight_background_for_selection_drag(
-            &root_file_dragged_selection,
-            root1_entry.id,
-            cx,
-        );
-        assert!(
-            !result,
-            "Should NOT highlight background for root file in same worktree"
-        );
-
-        // Test 4: Single entry at root level, different worktree - should highlight background
-        let result = panel.should_highlight_background_for_selection_drag(
-            &root_file_dragged_selection,
-            root2_entry.id,
-            cx,
-        );
-        assert!(
-            result,
-            "Should highlight background for root file from different worktree"
-        );
-
-        // Test 5: Single entry in subdirectory - should highlight background
-        let child_file_dragged_selection = DraggedSelection {
-            active_selection: SelectedEntry {
-                worktree_id: worktree1_id,
-                entry_id: child_file.id,
-            },
-            marked_selections: Arc::new([SelectedEntry {
-                worktree_id: worktree1_id,
-                entry_id: child_file.id,
-            }]),
-        };
-
-        let result = panel.should_highlight_background_for_selection_drag(
-            &child_file_dragged_selection,
-            root1_entry.id,
-            cx,
-        );
-        assert!(
-            result,
-            "Should highlight background for file with non-empty parent path"
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_hide_root(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/root1",
-        json!({
-            "dir1": {
-                "file1.txt": "content",
-                "file2.txt": "content",
-            },
-            "dir2": {
-                "file3.txt": "content",
-            },
-            "file4.txt": "content",
-        }),
-    )
-    .await;
-
-    fs.insert_tree(
-        "/root2",
-        json!({
-            "dir3": {
-                "file5.txt": "content",
-            },
-            "file6.txt": "content",
-        }),
-    )
-    .await;
-
-    // Test 1: Single worktree with hide_root = false
-    {
-        let project = Project::test(fs.clone(), ["/root1".as_ref()], cx).await;
-        let workspace =
-            cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-        cx.update(|_, cx| {
-            let settings = *ProjectPanelSettings::get_global(cx);
-            ProjectPanelSettings::override_global(
-                ProjectPanelSettings {
-                    hide_root: false,
-                    ..settings
-                },
-                cx,
-            );
-        });
-
-        let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-        cx.run_until_parked();
-
-        #[rustfmt::skip]
-        assert_eq!(
-            visible_entries_as_strings(&panel, 0..10, cx),
-            &[
-                "v root1",
-                "    > dir1",
-                "    > dir2",
-                "      file4.txt",
-            ],
-            "With hide_root=false and single worktree, root should be visible"
-        );
-    }
-
-    // Test 2: Single worktree with hide_root = true
-    {
-        let project = Project::test(fs.clone(), ["/root1".as_ref()], cx).await;
-        let workspace =
-            cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-        // Set hide_root to true
-        cx.update(|_, cx| {
-            let settings = *ProjectPanelSettings::get_global(cx);
-            ProjectPanelSettings::override_global(
-                ProjectPanelSettings {
-                    hide_root: true,
-                    ..settings
-                },
-                cx,
-            );
-        });
-
-        let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-        cx.run_until_parked();
-
-        assert_eq!(
-            visible_entries_as_strings(&panel, 0..10, cx),
-            &["> dir1", "> dir2", "  file4.txt",],
-            "With hide_root=true and single worktree, root should be hidden"
-        );
-
-        // Test expanding directories still works without root
-        toggle_expand_dir(&panel, "root1/dir1", cx);
-        assert_eq!(
-            visible_entries_as_strings(&panel, 0..10, cx),
-            &[
-                "v dir1  <== selected",
-                "      file1.txt",
-                "      file2.txt",
-                "> dir2",
-                "  file4.txt",
-            ],
-            "Should be able to expand directories even when root is hidden"
-        );
-    }
-
-    // Test 3: Multiple worktrees with hide_root = true
-    {
-        let project = Project::test(fs.clone(), ["/root1".as_ref(), "/root2".as_ref()], cx).await;
-        let workspace =
-            cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-        // Set hide_root to true
-        cx.update(|_, cx| {
-            let settings = *ProjectPanelSettings::get_global(cx);
-            ProjectPanelSettings::override_global(
-                ProjectPanelSettings {
-                    hide_root: true,
-                    ..settings
-                },
-                cx,
-            );
-        });
-
-        let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-        cx.run_until_parked();
-
-        assert_eq!(
-            visible_entries_as_strings(&panel, 0..10, cx),
-            &[
-                "v root1",
-                "    > dir1",
-                "    > dir2",
-                "      file4.txt",
-                "v root2",
-                "    > dir3",
-                "      file6.txt",
-            ],
-            "With hide_root=true and multiple worktrees, roots should still be visible"
-        );
-    }
-
-    // Test 4: Multiple worktrees with hide_root = false
-    {
-        let project = Project::test(fs.clone(), ["/root1".as_ref(), "/root2".as_ref()], cx).await;
-        let workspace =
-            cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-        cx.update(|_, cx| {
-            let settings = *ProjectPanelSettings::get_global(cx);
-            ProjectPanelSettings::override_global(
-                ProjectPanelSettings {
-                    hide_root: false,
-                    ..settings
-                },
-                cx,
-            );
-        });
-
-        let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-        cx.run_until_parked();
-
-        assert_eq!(
-            visible_entries_as_strings(&panel, 0..10, cx),
-            &[
-                "v root1",
-                "    > dir1",
-                "    > dir2",
-                "      file4.txt",
-                "v root2",
-                "    > dir3",
-                "      file6.txt",
-            ],
-            "With hide_root=false and multiple worktrees, roots should be visible"
-        );
-    }
-}
-
-#[gpui::test]
-async fn test_compare_selected_files(cx: &mut gpui::TestAppContext) {
-    init_test_with_editor(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/root",
-        json!({
-            "file1.txt": "content of file1",
-            "file2.txt": "content of file2",
-            "dir1": {
-                "file3.txt": "content of file3"
-            }
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/root".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    let file1_path = "root/file1.txt";
-    let file2_path = "root/file2.txt";
-    select_path_with_mark(&panel, file1_path, cx);
-    select_path_with_mark(&panel, file2_path, cx);
-
-    panel.update_in(cx, |panel, window, cx| {
-        panel.compare_marked_files(&CompareMarkedFiles, window, cx);
-    });
-    cx.executor().run_until_parked();
-
-    workspace
-        .update(cx, |workspace, _, cx| {
-            let active_items = workspace
-                .panes()
-                .iter()
-                .filter_map(|pane| pane.read(cx).active_item())
-                .collect::<Vec<_>>();
-            assert_eq!(active_items.len(), 1);
-            let diff_view = active_items
-                .into_iter()
-                .next()
-                .unwrap()
-                .downcast::<FileDiffView>()
-                .expect("Open item should be an FileDiffView");
-            assert_eq!(diff_view.tab_content_text(0, cx), "file1.txt ↔ file2.txt");
-            assert_eq!(
-                diff_view.tab_tooltip_text(cx).unwrap(),
-                format!(
-                    "{} ↔ {}",
-                    rel_path(file1_path).display(PathStyle::local()),
-                    rel_path(file2_path).display(PathStyle::local())
-                )
-            );
-        })
-        .unwrap();
-
-    let file1_entry_id = find_project_entry(&panel, file1_path, cx).unwrap();
-    let file2_entry_id = find_project_entry(&panel, file2_path, cx).unwrap();
-    let worktree_id = panel.update(cx, |panel, cx| {
-        panel
-            .project
-            .read(cx)
-            .worktrees(cx)
-            .next()
-            .unwrap()
-            .read(cx)
-            .id()
-    });
-
-    let expected_entries = [
-        SelectedEntry {
-            worktree_id,
-            entry_id: file1_entry_id,
-        },
-        SelectedEntry {
-            worktree_id,
-            entry_id: file2_entry_id,
-        },
-    ];
-    panel.update(cx, |panel, _cx| {
-        assert_eq!(
-            &panel.marked_entries, &expected_entries,
-            "Should keep marked entries after comparison"
-        );
-    });
-
-    panel.update(cx, |panel, cx| {
-        panel.project.update(cx, |_, cx| {
-            cx.emit(project::Event::RevealInProjectPanel(file2_entry_id))
-        })
-    });
-
-    panel.update(cx, |panel, _cx| {
-        assert_eq!(
-            &panel.marked_entries, &expected_entries,
-            "Marked entries should persist after focusing back on the project panel"
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_compare_files_context_menu(cx: &mut gpui::TestAppContext) {
-    init_test_with_editor(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/root",
-        json!({
-            "file1.txt": "content of file1",
-            "file2.txt": "content of file2",
-            "dir1": {},
-            "dir2": {
-                "file3.txt": "content of file3"
-            }
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/root".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    // Test 1: When only one file is selected, there should be no compare option
-    select_path(&panel, "root/file1.txt", cx);
-
-    let selected_files = panel.update(cx, |panel, cx| panel.file_abs_paths_to_diff(cx));
-    assert_eq!(
-        selected_files, None,
-        "Should not have compare option when only one file is selected"
-    );
-
-    // Test 2: When multiple files are selected, there should be a compare option
-    select_path_with_mark(&panel, "root/file1.txt", cx);
-    select_path_with_mark(&panel, "root/file2.txt", cx);
-
-    let selected_files = panel.update(cx, |panel, cx| panel.file_abs_paths_to_diff(cx));
-    assert!(
-        selected_files.is_some(),
-        "Should have files selected for comparison"
-    );
-    if let Some((file1, file2)) = selected_files {
-        assert!(
-            file1.to_string_lossy().ends_with("file1.txt")
-                && file2.to_string_lossy().ends_with("file2.txt"),
-            "Should have file1.txt and file2.txt as the selected files when multi-selecting"
-        );
-    }
-
-    // Test 3: Selecting a directory shouldn't count as a comparable file
-    select_path_with_mark(&panel, "root/dir1", cx);
-
-    let selected_files = panel.update(cx, |panel, cx| panel.file_abs_paths_to_diff(cx));
-    assert!(
-        selected_files.is_some(),
-        "Directory selection should not affect comparable files"
-    );
-    if let Some((file1, file2)) = selected_files {
-        assert!(
-            file1.to_string_lossy().ends_with("file1.txt")
-                && file2.to_string_lossy().ends_with("file2.txt"),
-            "Selecting a directory should not affect the number of comparable files"
-        );
-    }
-
-    // Test 4: Selecting one more file
-    select_path_with_mark(&panel, "root/dir2/file3.txt", cx);
-
-    let selected_files = panel.update(cx, |panel, cx| panel.file_abs_paths_to_diff(cx));
-    assert!(
-        selected_files.is_some(),
-        "Directory selection should not affect comparable files"
-    );
-    if let Some((file1, file2)) = selected_files {
-        assert!(
-            file1.to_string_lossy().ends_with("file2.txt")
-                && file2.to_string_lossy().ends_with("file3.txt"),
-            "Selecting a directory should not affect the number of comparable files"
-        );
-    }
-}
-
-#[gpui::test]
-async fn test_hide_hidden_entries(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/root",
-        json!({
-            ".hidden-file.txt": "hidden file content",
-            "visible-file.txt": "visible file content",
-            ".hidden-parent-dir": {
-                "nested-dir": {
-                    "file.txt": "file content",
-                }
-            },
-            "visible-dir": {
-                "file-in-visible.txt": "file content",
-                "nested": {
-                    ".hidden-nested-dir": {
-                        ".double-hidden-dir": {
-                            "deep-file-1.txt": "deep content 1",
-                            "deep-file-2.txt": "deep content 2"
-                        },
-                        "hidden-nested-file-1.txt": "hidden nested 1",
-                        "hidden-nested-file-2.txt": "hidden nested 2"
-                    },
-                    "visible-nested-file.txt": "visible nested content"
-                }
-            }
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/root".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-    cx.update(|_, cx| {
-        let settings = *ProjectPanelSettings::get_global(cx);
-        ProjectPanelSettings::override_global(
-            ProjectPanelSettings {
-                hide_hidden: false,
-                ..settings
-            },
-            cx,
-        );
-    });
-
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    toggle_expand_dir(&panel, "root/.hidden-parent-dir", cx);
-    toggle_expand_dir(&panel, "root/.hidden-parent-dir/nested-dir", cx);
-    toggle_expand_dir(&panel, "root/visible-dir", cx);
-    toggle_expand_dir(&panel, "root/visible-dir/nested", cx);
-    toggle_expand_dir(&panel, "root/visible-dir/nested/.hidden-nested-dir", cx);
-    toggle_expand_dir(
-        &panel,
-        "root/visible-dir/nested/.hidden-nested-dir/.double-hidden-dir",
-        cx,
-    );
-
-    let expanded = [
-        "v root",
-        "    v .hidden-parent-dir",
-        "        v nested-dir",
-        "              file.txt",
-        "    v visible-dir",
-        "        v nested",
-        "            v .hidden-nested-dir",
-        "                v .double-hidden-dir  <== selected",
-        "                      deep-file-1.txt",
-        "                      deep-file-2.txt",
-        "                  hidden-nested-file-1.txt",
-        "                  hidden-nested-file-2.txt",
-        "              visible-nested-file.txt",
-        "          file-in-visible.txt",
-        "      .hidden-file.txt",
-        "      visible-file.txt",
-    ];
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..30, cx),
-        &expanded,
-        "With hide_hidden=false, contents of hidden nested directory should be visible"
-    );
-
-    cx.update(|_, cx| {
-        let settings = *ProjectPanelSettings::get_global(cx);
-        ProjectPanelSettings::override_global(
-            ProjectPanelSettings {
-                hide_hidden: true,
-                ..settings
-            },
-            cx,
-        );
-    });
-
-    panel.update_in(cx, |panel, window, cx| {
-        panel.update_visible_entries(None, false, false, window, cx);
-    });
-    cx.run_until_parked();
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..30, cx),
-        &[
-            "v root",
-            "    v visible-dir",
-            "        v nested",
-            "              visible-nested-file.txt",
-            "          file-in-visible.txt",
-            "      visible-file.txt",
-        ],
-        "With hide_hidden=false, contents of hidden nested directory should be visible"
-    );
-
-    panel.update_in(cx, |panel, window, cx| {
-        let settings = *ProjectPanelSettings::get_global(cx);
-        ProjectPanelSettings::override_global(
-            ProjectPanelSettings {
-                hide_hidden: false,
-                ..settings
-            },
-            cx,
-        );
-        panel.update_visible_entries(None, false, false, window, cx);
-    });
-    cx.run_until_parked();
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..30, cx),
-        &expanded,
-        "With hide_hidden=false, deeply nested hidden directories and their contents should be visible"
-    );
-}
-
-fn select_path(panel: &Entity<ProjectPanel>, path: &str, cx: &mut VisualTestContext) {
-    let path = rel_path(path);
-    panel.update_in(cx, |panel, window, cx| {
-        for worktree in panel.project.read(cx).worktrees(cx).collect::<Vec<_>>() {
-            let worktree = worktree.read(cx);
-            if let Ok(relative_path) = path.strip_prefix(worktree.root_name()) {
-                let entry_id = worktree.entry_for_path(relative_path).unwrap().id;
-                panel.update_visible_entries(
-                    Some((worktree.id(), entry_id)),
-                    false,
-                    false,
-                    window,
-                    cx,
-                );
-                return;
-            }
-        }
-        panic!("no worktree for path {:?}", path);
-    });
-    cx.run_until_parked();
-}
-
-fn select_path_with_mark(panel: &Entity<ProjectPanel>, path: &str, cx: &mut VisualTestContext) {
-    let path = rel_path(path);
-    panel.update(cx, |panel, cx| {
-        for worktree in panel.project.read(cx).worktrees(cx).collect::<Vec<_>>() {
-            let worktree = worktree.read(cx);
-            if let Ok(relative_path) = path.strip_prefix(worktree.root_name()) {
-                let entry_id = worktree.entry_for_path(relative_path).unwrap().id;
-                let entry = crate::SelectedEntry {
-                    worktree_id: worktree.id(),
-                    entry_id,
-                };
-                if !panel.marked_entries.contains(&entry) {
-                    panel.marked_entries.push(entry);
-                }
-                panel.state.selection = Some(entry);
-                return;
-            }
-        }
-        panic!("no worktree for path {:?}", path);
-    });
-}
-
-fn drag_selection_to(
-    panel: &Entity<ProjectPanel>,
-    target_path: &str,
-    is_file: bool,
-    cx: &mut VisualTestContext,
-) {
-    let target_entry = find_project_entry(panel, target_path, cx)
-        .unwrap_or_else(|| panic!("no entry for target path {target_path:?}"));
-
-    panel.update_in(cx, |panel, window, cx| {
-        let selection = panel
-            .state
-            .selection
-            .expect("a selection is required before dragging");
-        let drag = DraggedSelection {
-            active_selection: SelectedEntry {
-                worktree_id: selection.worktree_id,
-                entry_id: panel.resolve_entry(selection.entry_id),
-            },
-            marked_selections: Arc::from(panel.marked_entries.clone()),
-        };
-        panel.drag_onto(&drag, target_entry, is_file, window, cx);
-    });
-    cx.executor().run_until_parked();
-}
-
-fn find_project_entry(
-    panel: &Entity<ProjectPanel>,
-    path: &str,
-    cx: &mut VisualTestContext,
-) -> Option<ProjectEntryId> {
-    let path = rel_path(path);
-    panel.update(cx, |panel, cx| {
-        for worktree in panel.project.read(cx).worktrees(cx).collect::<Vec<_>>() {
-            let worktree = worktree.read(cx);
-            if let Ok(relative_path) = path.strip_prefix(worktree.root_name()) {
-                return worktree.entry_for_path(relative_path).map(|entry| entry.id);
-            }
-        }
-        panic!("no worktree for path {path:?}");
-    })
-}
-
-fn visible_entries_as_strings(
-    panel: &Entity<ProjectPanel>,
-    range: Range<usize>,
-    cx: &mut VisualTestContext,
-) -> Vec<String> {
-    let mut result = Vec::new();
-    let mut project_entries = HashSet::default();
-    let mut has_editor = false;
-
-    panel.update_in(cx, |panel, window, cx| {
-        panel.for_each_visible_entry(range, window, cx, |project_entry, details, _, _| {
-            if details.is_editing {
-                assert!(!has_editor, "duplicate editor entry");
-                has_editor = true;
-            } else {
-                assert!(
-                    project_entries.insert(project_entry),
-                    "duplicate project entry {:?} {:?}",
-                    project_entry,
-                    details
-                );
-            }
-
-            let indent = "    ".repeat(details.depth);
-            let icon = if details.kind.is_dir() {
-                if details.is_expanded { "v " } else { "> " }
-            } else {
-                "  "
-            };
-            #[cfg(windows)]
-            let filename = details.filename.replace("\\", "/");
-            #[cfg(not(windows))]
-            let filename = details.filename;
-            let name = if details.is_editing {
-                format!("[EDITOR: '{}']", filename)
-            } else if details.is_processing {
-                format!("[PROCESSING: '{}']", filename)
-            } else {
-                filename
-            };
-            let selected = if details.is_selected {
-                "  <== selected"
-            } else {
-                ""
-            };
-            let marked = if details.is_marked {
-                "  <== marked"
-            } else {
-                ""
-            };
-
-            result.push(format!("{indent}{icon}{name}{selected}{marked}"));
-        });
-    });
-
-    result
-}
-
-/// Test that missing sort_mode field defaults to DirectoriesFirst
-#[gpui::test]
-async fn test_sort_mode_default_fallback(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    // Verify that when sort_mode is not specified, it defaults to DirectoriesFirst
-    let default_settings = cx.read(|cx| *ProjectPanelSettings::get_global(cx));
-    assert_eq!(
-        default_settings.sort_mode,
-        settings::ProjectPanelSortMode::DirectoriesFirst,
-        "sort_mode should default to DirectoriesFirst"
-    );
-}
-
-/// Test sort modes: DirectoriesFirst (default) vs Mixed
-#[gpui::test]
-async fn test_sort_mode_directories_first(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/root",
-        json!({
-            "zebra.txt": "",
-            "Apple": {},
-            "banana.rs": "",
-            "Carrot": {},
-            "aardvark.txt": "",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/root".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    // Default sort mode should be DirectoriesFirst
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..50, cx),
-        &[
-            "v root",
-            "    > Apple",
-            "    > Carrot",
-            "      aardvark.txt",
-            "      banana.rs",
-            "      zebra.txt",
-        ]
-    );
-}
-
-#[gpui::test]
-async fn test_sort_mode_mixed(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/root",
-        json!({
-            "Zebra.txt": "",
-            "apple": {},
-            "Banana.rs": "",
-            "carrot": {},
-            "Aardvark.txt": "",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/root".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-    // Switch to Mixed mode
-    cx.update(|_, cx| {
-        cx.update_global::<SettingsStore, _>(|store, cx| {
-            store.update_user_settings(cx, |settings| {
-                settings.project_panel.get_or_insert_default().sort_mode =
-                    Some(settings::ProjectPanelSortMode::Mixed);
-            });
-        });
-    });
-
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    // Mixed mode: case-insensitive sorting
-    // Aardvark < apple < Banana < carrot < Zebra (all case-insensitive)
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..50, cx),
-        &[
-            "v root",
-            "      Aardvark.txt",
-            "    > apple",
-            "      Banana.rs",
-            "    > carrot",
-            "      Zebra.txt",
-        ]
-    );
-}
-
-#[gpui::test]
-async fn test_sort_mode_files_first(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/root",
-        json!({
-            "Zebra.txt": "",
-            "apple": {},
-            "Banana.rs": "",
-            "carrot": {},
-            "Aardvark.txt": "",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/root".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-
-    // Switch to FilesFirst mode
-    cx.update(|_, cx| {
-        cx.update_global::<SettingsStore, _>(|store, cx| {
-            store.update_user_settings(cx, |settings| {
-                settings.project_panel.get_or_insert_default().sort_mode =
-                    Some(settings::ProjectPanelSortMode::FilesFirst);
-            });
-        });
-    });
-
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    // FilesFirst mode: files first, then directories (both case-insensitive)
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..50, cx),
-        &[
-            "v root",
-            "      Aardvark.txt",
-            "      Banana.rs",
-            "      Zebra.txt",
-            "    > apple",
-            "    > carrot",
-        ]
-    );
-}
-
-#[gpui::test]
-async fn test_sort_mode_toggle(cx: &mut gpui::TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(cx.executor());
-    fs.insert_tree(
-        "/root",
-        json!({
-            "file2.txt": "",
-            "dir1": {},
-            "file1.txt": "",
-        }),
-    )
-    .await;
-
-    let project = Project::test(fs.clone(), ["/root".as_ref()], cx).await;
-    let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-    let cx = &mut VisualTestContext::from_window(*workspace, cx);
-    let panel = workspace.update(cx, ProjectPanel::new).unwrap();
-    cx.run_until_parked();
-
-    // Initially DirectoriesFirst
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..50, cx),
-        &["v root", "    > dir1", "      file1.txt", "      file2.txt",]
-    );
-
-    // Toggle to Mixed
-    cx.update(|_, cx| {
-        cx.update_global::<SettingsStore, _>(|store, cx| {
-            store.update_user_settings(cx, |settings| {
-                settings.project_panel.get_or_insert_default().sort_mode =
-                    Some(settings::ProjectPanelSortMode::Mixed);
-            });
-        });
-    });
-    cx.run_until_parked();
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..50, cx),
-        &["v root", "    > dir1", "      file1.txt", "      file2.txt",]
-    );
-
-    // Toggle back to DirectoriesFirst
-    cx.update(|_, cx| {
-        cx.update_global::<SettingsStore, _>(|store, cx| {
-            store.update_user_settings(cx, |settings| {
-                settings.project_panel.get_or_insert_default().sort_mode =
-                    Some(settings::ProjectPanelSortMode::DirectoriesFirst);
-            });
-        });
-    });
-    cx.run_until_parked();
-
-    assert_eq!(
-        visible_entries_as_strings(&panel, 0..50, cx),
-        &["v root", "    > dir1", "      file1.txt", "      file2.txt",]
-    );
-}
-
-fn init_test(cx: &mut TestAppContext) {
-    cx.update(|cx| {
-        let settings_store = SettingsStore::test(cx);
-        cx.set_global(settings_store);
-        theme::init(theme::LoadThemes::JustBase, cx);
-        crate::init(cx);
-
-        cx.update_global::<SettingsStore, _>(|store, cx| {
-            store.update_user_settings(cx, |settings| {
-                settings
-                    .project_panel
-                    .get_or_insert_default()
-                    .auto_fold_dirs = Some(false);
-                settings.project.worktree.file_scan_exclusions = Some(Vec::new());
-            });
-        });
-    });
-}
-
-fn init_test_with_editor(cx: &mut TestAppContext) {
-    cx.update(|cx| {
-        let app_state = AppState::test(cx);
-        theme::init(theme::LoadThemes::JustBase, cx);
-        editor::init(cx);
-        crate::init(cx);
-        workspace::init(app_state, cx);
-
-        cx.update_global::<SettingsStore, _>(|store, cx| {
-            store.update_user_settings(cx, |settings| {
-                settings
-                    .project_panel
-                    .get_or_insert_default()
-                    .auto_fold_dirs = Some(false);
-                settings.project.worktree.file_scan_exclusions = Some(Vec::new())
-            });
-        });
-    });
-}
-
-fn set_auto_open_settings(
-    cx: &mut TestAppContext,
-    auto_open_settings: ProjectPanelAutoOpenSettings,
-) {
-    cx.update(|cx| {
-        cx.update_global::<SettingsStore, _>(|store, cx| {
-            store.update_user_settings(cx, |settings| {
-                settings.project_panel.get_or_insert_default().auto_open = Some(auto_open_settings);
-            });
-        })
-    });
-}
-
-fn ensure_single_file_is_opened(
-    window: &WindowHandle<Workspace>,
-    expected_path: &str,
-    cx: &mut TestAppContext,
-) {
-    window
-        .update(cx, |workspace, _, cx| {
-            let worktrees = workspace.worktrees(cx).collect::<Vec<_>>();
-            assert_eq!(worktrees.len(), 1);
-            let worktree_id = worktrees[0].read(cx).id();
-
-            let open_project_paths = workspace
-                .panes()
-                .iter()
-                .filter_map(|pane| pane.read(cx).active_item()?.project_path(cx))
-                .collect::<Vec<_>>();
-            assert_eq!(
-                open_project_paths,
-                vec![ProjectPath {
-                    worktree_id,
-                    path: Arc::from(rel_path(expected_path))
-                }],
-                "Should have opened file, selected in project panel"
-            );
-        })
-        .unwrap();
-}
-
-fn submit_deletion(panel: &Entity<ProjectPanel>, cx: &mut VisualTestContext) {
-    assert!(
-        !cx.has_pending_prompt(),
-        "Should have no prompts before the deletion"
-    );
-    panel.update_in(cx, |panel, window, cx| {
-        panel.delete(&Delete { skip_prompt: false }, window, cx)
-    });
-    assert!(
-        cx.has_pending_prompt(),
-        "Should have a prompt after the deletion"
-    );
-    cx.simulate_prompt_answer("Delete");
-    assert!(
-        !cx.has_pending_prompt(),
-        "Should have no prompts after prompt was replied to"
-    );
-    cx.executor().run_until_parked();
-}
-
-fn submit_deletion_skipping_prompt(panel: &Entity<ProjectPanel>, cx: &mut VisualTestContext) {
-    assert!(
-        !cx.has_pending_prompt(),
-        "Should have no prompts before the deletion"
-    );
-    panel.update_in(cx, |panel, window, cx| {
-        panel.delete(&Delete { skip_prompt: true }, window, cx)
-    });
-    assert!(!cx.has_pending_prompt(), "Should have received no prompts");
-    cx.executor().run_until_parked();
-}
-
-fn ensure_no_open_items_and_panes(workspace: &WindowHandle<Workspace>, cx: &mut VisualTestContext) {
-    assert!(
-        !cx.has_pending_prompt(),
-        "Should have no prompts after deletion operation closes the file"
-    );
-    workspace
-        .read_with(cx, |workspace, cx| {
-            let open_project_paths = workspace
-                .panes()
-                .iter()
-                .filter_map(|pane| pane.read(cx).active_item()?.project_path(cx))
-                .collect::<Vec<_>>();
-            assert!(
-                open_project_paths.is_empty(),
-                "Deleted file's buffer should be closed, but got open files: {open_project_paths:?}"
-            );
-        })
-        .unwrap();
-}
-
-struct TestProjectItemView {
-    focus_handle: FocusHandle,
-    path: ProjectPath,
-}
-
-struct TestProjectItem {
-    path: ProjectPath,
-}
-
-impl project::ProjectItem for TestProjectItem {
-    fn try_open(
-        _project: &Entity<Project>,
-        path: &ProjectPath,
-        cx: &mut App,
-    ) -> Option<Task<anyhow::Result<Entity<Self>>>> {
-        let path = path.clone();
-        Some(cx.spawn(async move |cx| cx.new(|_| Self { path })))
-    }
-
-    fn entry_id(&self, _: &App) -> Option<ProjectEntryId> {
-        None
-    }
-
-    fn project_path(&self, _: &App) -> Option<ProjectPath> {
-        Some(self.path.clone())
-    }
-
-    fn is_dirty(&self) -> bool {
-        false
-    }
-}
-
-impl ProjectItem for TestProjectItemView {
-    type Item = TestProjectItem;
-
-    fn for_project_item(
-        _: Entity<Project>,
-        _: Option<&Pane>,
-        project_item: Entity<Self::Item>,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self
-    where
-        Self: Sized,
-    {
-        Self {
-            path: project_item.update(cx, |project_item, _| project_item.path.clone()),
-            focus_handle: cx.focus_handle(),
-        }
-    }
-}
-
-impl Item for TestProjectItemView {
-    type Event = ();
-
-    fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString {
-        "Test".into()
-    }
-}
-
-impl EventEmitter<()> for TestProjectItemView {}
-
-impl Focusable for TestProjectItemView {
-    fn focus_handle(&self, _: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl Render for TestProjectItemView {
-    fn render(&mut self, _window: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
-        Empty
-    }
-}
diff --git a/crates/project_panel/src/utils.rs b/crates/project_panel/src/utils.rs
deleted file mode 100644
index 486def9b84..0000000000
--- a/crates/project_panel/src/utils.rs
+++ /dev/null
@@ -1,42 +0,0 @@
-pub(crate) struct ReversibleIterable<It> {
-    pub(crate) it: It,
-    pub(crate) reverse: bool,
-}
-
-impl<T> ReversibleIterable<T> {
-    pub(crate) fn new(it: T, reverse: bool) -> Self {
-        Self { it, reverse }
-    }
-}
-
-impl<It, Item> ReversibleIterable<It>
-where
-    It: Iterator<Item = Item>,
-{
-    pub(crate) fn find_single_ended<F>(mut self, pred: F) -> Option<Item>
-    where
-        F: FnMut(&Item) -> bool,
-    {
-        if self.reverse {
-            self.it.filter(pred).last()
-        } else {
-            self.it.find(pred)
-        }
-    }
-}
-
-impl<It, Item> ReversibleIterable<It>
-where
-    It: DoubleEndedIterator<Item = Item>,
-{
-    pub(crate) fn find<F>(mut self, mut pred: F) -> Option<Item>
-    where
-        F: FnMut(&Item) -> bool,
-    {
-        if self.reverse {
-            self.it.rfind(|x| pred(x))
-        } else {
-            self.it.find(|x| pred(x))
-        }
-    }
-}
diff --git a/crates/project_symbols/Cargo.toml b/crates/project_symbols/Cargo.toml
deleted file mode 100644
index 83e3cb587d..0000000000
--- a/crates/project_symbols/Cargo.toml
+++ /dev/null
@@ -1,40 +0,0 @@
-[package]
-name = "project_symbols"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/project_symbols.rs"
-doctest = false
-
-[dependencies]
-anyhow.workspace = true
-editor.workspace = true
-fuzzy.workspace = true
-gpui.workspace = true
-ordered-float.workspace = true
-picker.workspace = true
-project.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-theme.workspace = true
-util.workspace = true
-workspace.workspace = true
-
-[dev-dependencies]
-editor = { workspace = true, features = ["test-support"] }
-futures.workspace = true
-gpui = { workspace = true, features = ["test-support"] }
-language = { workspace = true, features = ["test-support"] }
-lsp = { workspace = true, features = ["test-support"] }
-project = { workspace = true, features = ["test-support"] }
-release_channel.workspace = true
-semver.workspace = true
-settings = { workspace = true, features = ["test-support"] }
-theme = { workspace = true, features = ["test-support"] }
-workspace = { workspace = true, features = ["test-support"] }
diff --git a/crates/project_symbols/LICENSE-GPL b/crates/project_symbols/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/project_symbols/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/project_symbols/src/project_symbols.rs b/crates/project_symbols/src/project_symbols.rs
deleted file mode 100644
index d96de4b876..0000000000
--- a/crates/project_symbols/src/project_symbols.rs
+++ /dev/null
@@ -1,463 +0,0 @@
-use editor::{Bias, Editor, SelectionEffects, scroll::Autoscroll, styled_runs_for_code_label};
-use fuzzy::{StringMatch, StringMatchCandidate};
-use gpui::{
-    App, Context, DismissEvent, Entity, HighlightStyle, ParentElement, StyledText, Task, TextStyle,
-    WeakEntity, Window, relative, rems,
-};
-use ordered_float::OrderedFloat;
-use picker::{Picker, PickerDelegate};
-use project::{Project, Symbol, lsp_store::SymbolLocation};
-use settings::Settings;
-use std::{cmp::Reverse, sync::Arc};
-use theme::{ActiveTheme, ThemeSettings};
-use util::ResultExt;
-use workspace::{
-    Workspace,
-    ui::{LabelLike, ListItem, ListItemSpacing, prelude::*},
-};
-
-pub fn init(cx: &mut App) {
-    cx.observe_new(
-        |workspace: &mut Workspace, _window, _: &mut Context<Workspace>| {
-            workspace.register_action(
-                |workspace, _: &workspace::ToggleProjectSymbols, window, cx| {
-                    let project = workspace.project().clone();
-                    let handle = cx.entity().downgrade();
-                    workspace.toggle_modal(window, cx, move |window, cx| {
-                        let delegate = ProjectSymbolsDelegate::new(handle, project);
-                        Picker::uniform_list(delegate, window, cx).width(rems(34.))
-                    })
-                },
-            );
-        },
-    )
-    .detach();
-}
-
-pub type ProjectSymbols = Entity<Picker<ProjectSymbolsDelegate>>;
-
-pub struct ProjectSymbolsDelegate {
-    workspace: WeakEntity<Workspace>,
-    project: Entity<Project>,
-    selected_match_index: usize,
-    symbols: Vec<Symbol>,
-    visible_match_candidates: Vec<StringMatchCandidate>,
-    external_match_candidates: Vec<StringMatchCandidate>,
-    show_worktree_root_name: bool,
-    matches: Vec<StringMatch>,
-}
-
-impl ProjectSymbolsDelegate {
-    fn new(workspace: WeakEntity<Workspace>, project: Entity<Project>) -> Self {
-        Self {
-            workspace,
-            project,
-            selected_match_index: 0,
-            symbols: Default::default(),
-            visible_match_candidates: Default::default(),
-            external_match_candidates: Default::default(),
-            matches: Default::default(),
-            show_worktree_root_name: false,
-        }
-    }
-
-    fn filter(&mut self, query: &str, window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        const MAX_MATCHES: usize = 100;
-        let mut visible_matches = cx.background_executor().block(fuzzy::match_strings(
-            &self.visible_match_candidates,
-            query,
-            false,
-            true,
-            MAX_MATCHES,
-            &Default::default(),
-            cx.background_executor().clone(),
-        ));
-        let mut external_matches = cx.background_executor().block(fuzzy::match_strings(
-            &self.external_match_candidates,
-            query,
-            false,
-            true,
-            MAX_MATCHES - visible_matches.len().min(MAX_MATCHES),
-            &Default::default(),
-            cx.background_executor().clone(),
-        ));
-        let sort_key_for_match = |mat: &StringMatch| {
-            let symbol = &self.symbols[mat.candidate_id];
-            (Reverse(OrderedFloat(mat.score)), symbol.label.filter_text())
-        };
-
-        visible_matches.sort_unstable_by_key(sort_key_for_match);
-        external_matches.sort_unstable_by_key(sort_key_for_match);
-        let mut matches = visible_matches;
-        matches.append(&mut external_matches);
-
-        for mat in &mut matches {
-            let symbol = &self.symbols[mat.candidate_id];
-            let filter_start = symbol.label.filter_range.start;
-            for position in &mut mat.positions {
-                *position += filter_start;
-            }
-        }
-
-        self.matches = matches;
-        self.set_selected_index(0, window, cx);
-    }
-}
-
-impl PickerDelegate for ProjectSymbolsDelegate {
-    type ListItem = ListItem;
-    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
-        "Search project symbols...".into()
-    }
-
-    fn confirm(&mut self, secondary: bool, window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        if let Some(symbol) = self
-            .matches
-            .get(self.selected_match_index)
-            .map(|mat| self.symbols[mat.candidate_id].clone())
-        {
-            let buffer = self.project.update(cx, |project, cx| {
-                project.open_buffer_for_symbol(&symbol, cx)
-            });
-            let symbol = symbol.clone();
-            let workspace = self.workspace.clone();
-            cx.spawn_in(window, async move |_, cx| {
-                let buffer = buffer.await?;
-                workspace.update_in(cx, |workspace, window, cx| {
-                    let position = buffer
-                        .read(cx)
-                        .clip_point_utf16(symbol.range.start, Bias::Left);
-                    let pane = if secondary {
-                        workspace.adjacent_pane(window, cx)
-                    } else {
-                        workspace.active_pane().clone()
-                    };
-
-                    let editor = workspace.open_project_item::<Editor>(
-                        pane, buffer, true, true, true, true, window, cx,
-                    );
-
-                    editor.update(cx, |editor, cx| {
-                        editor.change_selections(
-                            SelectionEffects::scroll(Autoscroll::center()),
-                            window,
-                            cx,
-                            |s| s.select_ranges([position..position]),
-                        );
-                    });
-                })?;
-                anyhow::Ok(())
-            })
-            .detach_and_log_err(cx);
-            cx.emit(DismissEvent);
-        }
-    }
-
-    fn dismissed(&mut self, _window: &mut Window, _cx: &mut Context<Picker<Self>>) {}
-
-    fn match_count(&self) -> usize {
-        self.matches.len()
-    }
-
-    fn selected_index(&self) -> usize {
-        self.selected_match_index
-    }
-
-    fn set_selected_index(
-        &mut self,
-        ix: usize,
-        _window: &mut Window,
-        _cx: &mut Context<Picker<Self>>,
-    ) {
-        self.selected_match_index = ix;
-    }
-
-    fn update_matches(
-        &mut self,
-        query: String,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Task<()> {
-        self.filter(&query, window, cx);
-        self.show_worktree_root_name = self.project.read(cx).visible_worktrees(cx).count() > 1;
-        let symbols = self
-            .project
-            .update(cx, |project, cx| project.symbols(&query, cx));
-        cx.spawn_in(window, async move |this, cx| {
-            let symbols = symbols.await.log_err();
-            if let Some(symbols) = symbols {
-                this.update_in(cx, |this, window, cx| {
-                    let delegate = &mut this.delegate;
-                    let project = delegate.project.read(cx);
-                    let (visible_match_candidates, external_match_candidates) = symbols
-                        .iter()
-                        .enumerate()
-                        .map(|(id, symbol)| {
-                            StringMatchCandidate::new(id, symbol.label.filter_text())
-                        })
-                        .partition(|candidate| {
-                            if let SymbolLocation::InProject(path) = &symbols[candidate.id].path {
-                                project
-                                    .entry_for_path(path, cx)
-                                    .is_some_and(|e| !e.is_ignored)
-                            } else {
-                                false
-                            }
-                        });
-
-                    delegate.visible_match_candidates = visible_match_candidates;
-                    delegate.external_match_candidates = external_match_candidates;
-                    delegate.symbols = symbols;
-                    delegate.filter(&query, window, cx);
-                })
-                .log_err();
-            }
-        })
-    }
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        _window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<Self::ListItem> {
-        let path_style = self.project.read(cx).path_style(cx);
-        let string_match = &self.matches.get(ix)?;
-        let symbol = &self.symbols.get(string_match.candidate_id)?;
-        let theme = cx.theme();
-        let local_player = theme.players().local();
-        let syntax_runs = styled_runs_for_code_label(&symbol.label, theme.syntax(), &local_player);
-
-        let path = match &symbol.path {
-            SymbolLocation::InProject(project_path) => {
-                let project = self.project.read(cx);
-                let mut path = project_path.path.clone();
-                if self.show_worktree_root_name
-                    && let Some(worktree) = project.worktree_for_id(project_path.worktree_id, cx)
-                {
-                    path = worktree.read(cx).root_name().join(&path);
-                }
-                path.display(path_style).into_owned().into()
-            }
-            SymbolLocation::OutsideProject {
-                abs_path,
-                signature: _,
-            } => abs_path.to_string_lossy(),
-        };
-        let label = symbol.label.text.clone();
-        let path = path.to_string();
-
-        let settings = ThemeSettings::get_global(cx);
-
-        let text_style = TextStyle {
-            color: cx.theme().colors().text,
-            font_family: settings.buffer_font.family.clone(),
-            font_features: settings.buffer_font.features.clone(),
-            font_fallbacks: settings.buffer_font.fallbacks.clone(),
-            font_size: settings.buffer_font_size(cx).into(),
-            font_weight: settings.buffer_font.weight,
-            line_height: relative(1.),
-            ..Default::default()
-        };
-
-        let highlight_style = HighlightStyle {
-            background_color: Some(cx.theme().colors().text_accent.alpha(0.3)),
-            ..Default::default()
-        };
-        let custom_highlights = string_match
-            .positions
-            .iter()
-            .map(|pos| (*pos..pos + 1, highlight_style));
-
-        let highlights = gpui::combine_highlights(custom_highlights, syntax_runs);
-
-        Some(
-            ListItem::new(ix)
-                .inset(true)
-                .spacing(ListItemSpacing::Sparse)
-                .toggle_state(selected)
-                .child(
-                    v_flex()
-                        .child(LabelLike::new().child(
-                            StyledText::new(label).with_default_highlights(&text_style, highlights),
-                        ))
-                        .child(Label::new(path).size(LabelSize::Small).color(Color::Muted)),
-                ),
-        )
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use futures::StreamExt;
-    use gpui::{TestAppContext, VisualContext};
-    use language::{FakeLspAdapter, Language, LanguageConfig, LanguageMatcher};
-    use lsp::OneOf;
-    use project::FakeFs;
-    use serde_json::json;
-    use settings::SettingsStore;
-    use std::{path::Path, sync::Arc};
-    use util::path;
-
-    #[gpui::test]
-    async fn test_project_symbols(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(path!("/dir"), json!({ "test.rs": "" }))
-            .await;
-
-        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-
-        let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-        language_registry.add(Arc::new(Language::new(
-            LanguageConfig {
-                name: "Rust".into(),
-                matcher: LanguageMatcher {
-                    path_suffixes: vec!["rs".to_string()],
-                    ..Default::default()
-                },
-                ..Default::default()
-            },
-            None,
-        )));
-        let mut fake_servers = language_registry.register_fake_lsp(
-            "Rust",
-            FakeLspAdapter {
-                capabilities: lsp::ServerCapabilities {
-                    workspace_symbol_provider: Some(OneOf::Left(true)),
-                    ..Default::default()
-                },
-                ..Default::default()
-            },
-        );
-
-        let _buffer = project
-            .update(cx, |project, cx| {
-                project.open_local_buffer_with_lsp(path!("/dir/test.rs"), cx)
-            })
-            .await
-            .unwrap();
-
-        // Set up fake language server to return fuzzy matches against
-        // a fixed set of symbol names.
-        let fake_symbols = [
-            symbol("one", path!("/external")),
-            symbol("ton", path!("/dir/test.rs")),
-            symbol("uno", path!("/dir/test.rs")),
-        ];
-        let fake_server = fake_servers.next().await.unwrap();
-        fake_server.set_request_handler::<lsp::WorkspaceSymbolRequest, _, _>(
-            move |params: lsp::WorkspaceSymbolParams, cx| {
-                let executor = cx.background_executor().clone();
-                let fake_symbols = fake_symbols.clone();
-                async move {
-                    let candidates = fake_symbols
-                        .iter()
-                        .enumerate()
-                        .map(|(id, symbol)| StringMatchCandidate::new(id, &symbol.name))
-                        .collect::<Vec<_>>();
-                    let matches = if params.query.is_empty() {
-                        Vec::new()
-                    } else {
-                        fuzzy::match_strings(
-                            &candidates,
-                            &params.query,
-                            true,
-                            true,
-                            100,
-                            &Default::default(),
-                            executor.clone(),
-                        )
-                        .await
-                    };
-
-                    Ok(Some(lsp::WorkspaceSymbolResponse::Flat(
-                        matches
-                            .into_iter()
-                            .map(|mat| fake_symbols[mat.candidate_id].clone())
-                            .collect(),
-                    )))
-                }
-            },
-        );
-
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-        // Create the project symbols view.
-        let symbols = cx.new_window_entity(|window, cx| {
-            Picker::uniform_list(
-                ProjectSymbolsDelegate::new(workspace.downgrade(), project.clone()),
-                window,
-                cx,
-            )
-        });
-
-        // Spawn multiples updates before the first update completes,
-        // such that in the end, there are no matches. Testing for regression:
-        // https://github.com/zed-industries/zed/issues/861
-        symbols.update_in(cx, |p, window, cx| {
-            p.update_matches("o".to_string(), window, cx);
-            p.update_matches("on".to_string(), window, cx);
-            p.update_matches("onex".to_string(), window, cx);
-        });
-
-        cx.run_until_parked();
-        symbols.read_with(cx, |symbols, _| {
-            assert_eq!(symbols.delegate.matches.len(), 0);
-        });
-
-        // Spawn more updates such that in the end, there are matches.
-        symbols.update_in(cx, |p, window, cx| {
-            p.update_matches("one".to_string(), window, cx);
-            p.update_matches("on".to_string(), window, cx);
-        });
-
-        cx.run_until_parked();
-        symbols.read_with(cx, |symbols, _| {
-            let delegate = &symbols.delegate;
-            assert_eq!(delegate.matches.len(), 2);
-            assert_eq!(delegate.matches[0].string, "ton");
-            assert_eq!(delegate.matches[1].string, "one");
-        });
-
-        // Spawn more updates such that in the end, there are again no matches.
-        symbols.update_in(cx, |p, window, cx| {
-            p.update_matches("o".to_string(), window, cx);
-            p.update_matches("".to_string(), window, cx);
-        });
-
-        cx.run_until_parked();
-        symbols.read_with(cx, |symbols, _| {
-            assert_eq!(symbols.delegate.matches.len(), 0);
-        });
-    }
-
-    fn init_test(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let store = SettingsStore::test(cx);
-            cx.set_global(store);
-            theme::init(theme::LoadThemes::JustBase, cx);
-            release_channel::init(semver::Version::new(0, 0, 0), cx);
-            editor::init(cx);
-        });
-    }
-
-    fn symbol(name: &str, path: impl AsRef<Path>) -> lsp::SymbolInformation {
-        #[allow(deprecated)]
-        lsp::SymbolInformation {
-            name: name.to_string(),
-            kind: lsp::SymbolKind::FUNCTION,
-            tags: None,
-            deprecated: None,
-            container_name: None,
-            location: lsp::Location::new(
-                lsp::Uri::from_file_path(path.as_ref()).unwrap(),
-                lsp::Range::new(lsp::Position::new(0, 0), lsp::Position::new(0, 0)),
-            ),
-        }
-    }
-}
diff --git a/crates/prompt_store/Cargo.toml b/crates/prompt_store/Cargo.toml
deleted file mode 100644
index 13bacbfad3..0000000000
--- a/crates/prompt_store/Cargo.toml
+++ /dev/null
@@ -1,33 +0,0 @@
-[package]
-name = "prompt_store"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/prompt_store.rs"
-
-[dependencies]
-anyhow.workspace = true
-assets.workspace = true
-chrono.workspace = true
-collections.workspace = true
-fs.workspace = true
-futures.workspace = true
-fuzzy.workspace = true
-gpui.workspace = true
-handlebars.workspace = true
-heed.workspace = true
-language.workspace = true
-log.workspace = true
-parking_lot.workspace = true
-paths.workspace = true
-rope.workspace = true
-serde.workspace = true
-text.workspace = true
-util.workspace = true
-uuid.workspace = true
diff --git a/crates/prompt_store/LICENSE-GPL b/crates/prompt_store/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/prompt_store/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/prompt_store/src/prompt_store.rs b/crates/prompt_store/src/prompt_store.rs
deleted file mode 100644
index fb087ce34d..0000000000
--- a/crates/prompt_store/src/prompt_store.rs
+++ /dev/null
@@ -1,471 +0,0 @@
-mod prompts;
-
-use anyhow::{Context as _, Result, anyhow};
-use chrono::{DateTime, Utc};
-use collections::HashMap;
-use futures::FutureExt as _;
-use futures::future::Shared;
-use fuzzy::StringMatchCandidate;
-use gpui::{
-    App, AppContext, Context, Entity, EventEmitter, Global, ReadGlobal, SharedString, Task,
-};
-use heed::{
-    Database, RoTxn,
-    types::{SerdeBincode, SerdeJson, Str},
-};
-use parking_lot::RwLock;
-pub use prompts::*;
-use rope::Rope;
-use serde::{Deserialize, Serialize};
-use std::{
-    cmp::Reverse,
-    future::Future,
-    path::PathBuf,
-    sync::{Arc, atomic::AtomicBool},
-};
-use text::LineEnding;
-use util::ResultExt;
-use uuid::Uuid;
-
-/// Init starts loading the PromptStore in the background and assigns
-/// a shared future to a global.
-pub fn init(cx: &mut App) {
-    let db_path = paths::prompts_dir().join("prompts-library-db.0.mdb");
-    let prompt_store_task = PromptStore::new(db_path, cx);
-    let prompt_store_entity_task = cx
-        .spawn(async move |cx| {
-            prompt_store_task
-                .await
-                .and_then(|prompt_store| cx.new(|_cx| prompt_store))
-                .map_err(Arc::new)
-        })
-        .shared();
-    cx.set_global(GlobalPromptStore(prompt_store_entity_task))
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct PromptMetadata {
-    pub id: PromptId,
-    pub title: Option<SharedString>,
-    pub default: bool,
-    pub saved_at: DateTime<Utc>,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
-#[serde(tag = "kind")]
-pub enum PromptId {
-    User { uuid: UserPromptId },
-    EditWorkflow,
-}
-
-impl PromptId {
-    pub fn new() -> PromptId {
-        UserPromptId::new().into()
-    }
-
-    pub fn is_built_in(&self) -> bool {
-        !matches!(self, PromptId::User { .. })
-    }
-}
-
-impl From<UserPromptId> for PromptId {
-    fn from(uuid: UserPromptId) -> Self {
-        PromptId::User { uuid }
-    }
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
-#[serde(transparent)]
-pub struct UserPromptId(pub Uuid);
-
-impl UserPromptId {
-    pub fn new() -> UserPromptId {
-        UserPromptId(Uuid::new_v4())
-    }
-}
-
-impl From<Uuid> for UserPromptId {
-    fn from(uuid: Uuid) -> Self {
-        UserPromptId(uuid)
-    }
-}
-
-impl std::fmt::Display for PromptId {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            PromptId::User { uuid } => write!(f, "{}", uuid.0),
-            PromptId::EditWorkflow => write!(f, "Edit workflow"),
-        }
-    }
-}
-
-pub struct PromptStore {
-    env: heed::Env,
-    metadata_cache: RwLock<MetadataCache>,
-    metadata: Database<SerdeJson<PromptId>, SerdeJson<PromptMetadata>>,
-    bodies: Database<SerdeJson<PromptId>, Str>,
-}
-
-pub struct PromptsUpdatedEvent;
-
-impl EventEmitter<PromptsUpdatedEvent> for PromptStore {}
-
-#[derive(Default)]
-struct MetadataCache {
-    metadata: Vec<PromptMetadata>,
-    metadata_by_id: HashMap<PromptId, PromptMetadata>,
-}
-
-impl MetadataCache {
-    fn from_db(
-        db: Database<SerdeJson<PromptId>, SerdeJson<PromptMetadata>>,
-        txn: &RoTxn,
-    ) -> Result<Self> {
-        let mut cache = MetadataCache::default();
-        for result in db.iter(txn)? {
-            let (prompt_id, metadata) = result?;
-            cache.metadata.push(metadata.clone());
-            cache.metadata_by_id.insert(prompt_id, metadata);
-        }
-        cache.sort();
-        Ok(cache)
-    }
-
-    fn insert(&mut self, metadata: PromptMetadata) {
-        self.metadata_by_id.insert(metadata.id, metadata.clone());
-        if let Some(old_metadata) = self.metadata.iter_mut().find(|m| m.id == metadata.id) {
-            *old_metadata = metadata;
-        } else {
-            self.metadata.push(metadata);
-        }
-        self.sort();
-    }
-
-    fn remove(&mut self, id: PromptId) {
-        self.metadata.retain(|metadata| metadata.id != id);
-        self.metadata_by_id.remove(&id);
-    }
-
-    fn sort(&mut self) {
-        self.metadata.sort_unstable_by(|a, b| {
-            a.title
-                .cmp(&b.title)
-                .then_with(|| b.saved_at.cmp(&a.saved_at))
-        });
-    }
-}
-
-impl PromptStore {
-    pub fn global(cx: &App) -> impl Future<Output = Result<Entity<Self>>> + use<> {
-        let store = GlobalPromptStore::global(cx).0.clone();
-        async move { store.await.map_err(|err| anyhow!(err)) }
-    }
-
-    pub fn new(db_path: PathBuf, cx: &App) -> Task<Result<Self>> {
-        cx.background_spawn(async move {
-            std::fs::create_dir_all(&db_path)?;
-
-            let db_env = unsafe {
-                heed::EnvOpenOptions::new()
-                    .map_size(1024 * 1024 * 1024) // 1GB
-                    .max_dbs(4) // Metadata and bodies (possibly v1 of both as well)
-                    .open(db_path)?
-            };
-
-            let mut txn = db_env.write_txn()?;
-            let metadata = db_env.create_database(&mut txn, Some("metadata.v2"))?;
-            let bodies = db_env.create_database(&mut txn, Some("bodies.v2"))?;
-
-            // Remove edit workflow prompt, as we decided to opt into it using
-            // a slash command instead.
-            metadata.delete(&mut txn, &PromptId::EditWorkflow).ok();
-            bodies.delete(&mut txn, &PromptId::EditWorkflow).ok();
-
-            txn.commit()?;
-
-            Self::upgrade_dbs(&db_env, metadata, bodies).log_err();
-
-            let txn = db_env.read_txn()?;
-            let metadata_cache = MetadataCache::from_db(metadata, &txn)?;
-            txn.commit()?;
-
-            Ok(PromptStore {
-                env: db_env,
-                metadata_cache: RwLock::new(metadata_cache),
-                metadata,
-                bodies,
-            })
-        })
-    }
-
-    fn upgrade_dbs(
-        env: &heed::Env,
-        metadata_db: heed::Database<SerdeJson<PromptId>, SerdeJson<PromptMetadata>>,
-        bodies_db: heed::Database<SerdeJson<PromptId>, Str>,
-    ) -> Result<()> {
-        #[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize, Hash)]
-        pub struct PromptIdV1(Uuid);
-
-        #[derive(Clone, Debug, Serialize, Deserialize)]
-        pub struct PromptMetadataV1 {
-            pub id: PromptIdV1,
-            pub title: Option<SharedString>,
-            pub default: bool,
-            pub saved_at: DateTime<Utc>,
-        }
-
-        let mut txn = env.write_txn()?;
-        let Some(bodies_v1_db) = env
-            .open_database::<SerdeBincode<PromptIdV1>, SerdeBincode<String>>(
-                &txn,
-                Some("bodies"),
-            )?
-        else {
-            return Ok(());
-        };
-        let mut bodies_v1 = bodies_v1_db
-            .iter(&txn)?
-            .collect::<heed::Result<HashMap<_, _>>>()?;
-
-        let Some(metadata_v1_db) = env
-            .open_database::<SerdeBincode<PromptIdV1>, SerdeBincode<PromptMetadataV1>>(
-                &txn,
-                Some("metadata"),
-            )?
-        else {
-            return Ok(());
-        };
-        let metadata_v1 = metadata_v1_db
-            .iter(&txn)?
-            .collect::<heed::Result<HashMap<_, _>>>()?;
-
-        for (prompt_id_v1, metadata_v1) in metadata_v1 {
-            let prompt_id_v2 = UserPromptId(prompt_id_v1.0).into();
-            let Some(body_v1) = bodies_v1.remove(&prompt_id_v1) else {
-                continue;
-            };
-
-            if metadata_db
-                .get(&txn, &prompt_id_v2)?
-                .is_none_or(|metadata_v2| metadata_v1.saved_at > metadata_v2.saved_at)
-            {
-                metadata_db.put(
-                    &mut txn,
-                    &prompt_id_v2,
-                    &PromptMetadata {
-                        id: prompt_id_v2,
-                        title: metadata_v1.title.clone(),
-                        default: metadata_v1.default,
-                        saved_at: metadata_v1.saved_at,
-                    },
-                )?;
-                bodies_db.put(&mut txn, &prompt_id_v2, &body_v1)?;
-            }
-        }
-
-        txn.commit()?;
-
-        Ok(())
-    }
-
-    pub fn load(&self, id: PromptId, cx: &App) -> Task<Result<String>> {
-        let env = self.env.clone();
-        let bodies = self.bodies;
-        cx.background_spawn(async move {
-            let txn = env.read_txn()?;
-            let mut prompt = bodies.get(&txn, &id)?.context("prompt not found")?.into();
-            LineEnding::normalize(&mut prompt);
-            Ok(prompt)
-        })
-    }
-
-    pub fn all_prompt_metadata(&self) -> Vec<PromptMetadata> {
-        self.metadata_cache.read().metadata.clone()
-    }
-
-    pub fn default_prompt_metadata(&self) -> Vec<PromptMetadata> {
-        return self
-            .metadata_cache
-            .read()
-            .metadata
-            .iter()
-            .filter(|metadata| metadata.default)
-            .cloned()
-            .collect::<Vec<_>>();
-    }
-
-    pub fn delete(&self, id: PromptId, cx: &Context<Self>) -> Task<Result<()>> {
-        self.metadata_cache.write().remove(id);
-
-        let db_connection = self.env.clone();
-        let bodies = self.bodies;
-        let metadata = self.metadata;
-
-        let task = cx.background_spawn(async move {
-            let mut txn = db_connection.write_txn()?;
-
-            metadata.delete(&mut txn, &id)?;
-            bodies.delete(&mut txn, &id)?;
-
-            txn.commit()?;
-            anyhow::Ok(())
-        });
-
-        cx.spawn(async move |this, cx| {
-            task.await?;
-            this.update(cx, |_, cx| cx.emit(PromptsUpdatedEvent)).ok();
-            anyhow::Ok(())
-        })
-    }
-
-    /// Returns the number of prompts in the store.
-    pub fn prompt_count(&self) -> usize {
-        self.metadata_cache.read().metadata.len()
-    }
-
-    pub fn metadata(&self, id: PromptId) -> Option<PromptMetadata> {
-        self.metadata_cache.read().metadata_by_id.get(&id).cloned()
-    }
-
-    pub fn first(&self) -> Option<PromptMetadata> {
-        self.metadata_cache.read().metadata.first().cloned()
-    }
-
-    pub fn id_for_title(&self, title: &str) -> Option<PromptId> {
-        let metadata_cache = self.metadata_cache.read();
-        let metadata = metadata_cache
-            .metadata
-            .iter()
-            .find(|metadata| metadata.title.as_ref().map(|title| &***title) == Some(title))?;
-        Some(metadata.id)
-    }
-
-    pub fn search(
-        &self,
-        query: String,
-        cancellation_flag: Arc<AtomicBool>,
-        cx: &App,
-    ) -> Task<Vec<PromptMetadata>> {
-        let cached_metadata = self.metadata_cache.read().metadata.clone();
-        let executor = cx.background_executor().clone();
-        cx.background_spawn(async move {
-            let mut matches = if query.is_empty() {
-                cached_metadata
-            } else {
-                let candidates = cached_metadata
-                    .iter()
-                    .enumerate()
-                    .filter_map(|(ix, metadata)| {
-                        Some(StringMatchCandidate::new(ix, metadata.title.as_ref()?))
-                    })
-                    .collect::<Vec<_>>();
-                let matches = fuzzy::match_strings(
-                    &candidates,
-                    &query,
-                    false,
-                    true,
-                    100,
-                    &cancellation_flag,
-                    executor,
-                )
-                .await;
-                matches
-                    .into_iter()
-                    .map(|mat| cached_metadata[mat.candidate_id].clone())
-                    .collect()
-            };
-            matches.sort_by_key(|metadata| Reverse(metadata.default));
-            matches
-        })
-    }
-
-    pub fn save(
-        &self,
-        id: PromptId,
-        title: Option<SharedString>,
-        default: bool,
-        body: Rope,
-        cx: &Context<Self>,
-    ) -> Task<Result<()>> {
-        if id.is_built_in() {
-            return Task::ready(Err(anyhow!("built-in prompts cannot be saved")));
-        }
-
-        let prompt_metadata = PromptMetadata {
-            id,
-            title,
-            default,
-            saved_at: Utc::now(),
-        };
-        self.metadata_cache.write().insert(prompt_metadata.clone());
-
-        let db_connection = self.env.clone();
-        let bodies = self.bodies;
-        let metadata = self.metadata;
-
-        let task = cx.background_spawn(async move {
-            let mut txn = db_connection.write_txn()?;
-
-            metadata.put(&mut txn, &id, &prompt_metadata)?;
-            bodies.put(&mut txn, &id, &body.to_string())?;
-
-            txn.commit()?;
-
-            anyhow::Ok(())
-        });
-
-        cx.spawn(async move |this, cx| {
-            task.await?;
-            this.update(cx, |_, cx| cx.emit(PromptsUpdatedEvent)).ok();
-            anyhow::Ok(())
-        })
-    }
-
-    pub fn save_metadata(
-        &self,
-        id: PromptId,
-        mut title: Option<SharedString>,
-        default: bool,
-        cx: &Context<Self>,
-    ) -> Task<Result<()>> {
-        let mut cache = self.metadata_cache.write();
-
-        if id.is_built_in() {
-            title = cache
-                .metadata_by_id
-                .get(&id)
-                .and_then(|metadata| metadata.title.clone());
-        }
-
-        let prompt_metadata = PromptMetadata {
-            id,
-            title,
-            default,
-            saved_at: Utc::now(),
-        };
-
-        cache.insert(prompt_metadata.clone());
-
-        let db_connection = self.env.clone();
-        let metadata = self.metadata;
-
-        let task = cx.background_spawn(async move {
-            let mut txn = db_connection.write_txn()?;
-            metadata.put(&mut txn, &id, &prompt_metadata)?;
-            txn.commit()?;
-
-            anyhow::Ok(())
-        });
-
-        cx.spawn(async move |this, cx| {
-            task.await?;
-            this.update(cx, |_, cx| cx.emit(PromptsUpdatedEvent)).ok();
-            anyhow::Ok(())
-        })
-    }
-}
-
-/// Wraps a shared future to a prompt store so it can be assigned as a context global.
-pub struct GlobalPromptStore(Shared<Task<Result<Entity<PromptStore>, Arc<anyhow::Error>>>>);
-
-impl Global for GlobalPromptStore {}
diff --git a/crates/prompt_store/src/prompts.rs b/crates/prompt_store/src/prompts.rs
deleted file mode 100644
index d6a172218a..0000000000
--- a/crates/prompt_store/src/prompts.rs
+++ /dev/null
@@ -1,476 +0,0 @@
-use anyhow::Result;
-use assets::Assets;
-use fs::Fs;
-use futures::StreamExt;
-use gpui::{App, AppContext as _, AssetSource};
-use handlebars::{Handlebars, RenderError};
-use language::{BufferSnapshot, LanguageName, Point};
-use parking_lot::Mutex;
-use serde::Serialize;
-use std::{
-    ops::Range,
-    path::{Path, PathBuf},
-    sync::Arc,
-    time::Duration,
-};
-use text::LineEnding;
-use util::{
-    ResultExt, get_default_system_shell_preferring_bash, rel_path::RelPath, shell::ShellKind,
-};
-
-use crate::UserPromptId;
-
-#[derive(Default, Debug, Clone, Serialize)]
-pub struct ProjectContext {
-    pub worktrees: Vec<WorktreeContext>,
-    /// Whether any worktree has a rules_file. Provided as a field because handlebars can't do this.
-    pub has_rules: bool,
-    pub user_rules: Vec<UserRulesContext>,
-    /// `!user_rules.is_empty()` - provided as a field because handlebars can't do this.
-    pub has_user_rules: bool,
-    pub os: String,
-    pub arch: String,
-    pub shell: String,
-}
-
-impl ProjectContext {
-    pub fn new(worktrees: Vec<WorktreeContext>, default_user_rules: Vec<UserRulesContext>) -> Self {
-        let has_rules = worktrees
-            .iter()
-            .any(|worktree| worktree.rules_file.is_some());
-        Self {
-            worktrees,
-            has_rules,
-            has_user_rules: !default_user_rules.is_empty(),
-            user_rules: default_user_rules,
-            os: std::env::consts::OS.to_string(),
-            arch: std::env::consts::ARCH.to_string(),
-            shell: ShellKind::new(&get_default_system_shell_preferring_bash(), cfg!(windows))
-                .to_string(),
-        }
-    }
-}
-
-#[derive(Debug, Clone, Serialize)]
-pub struct UserRulesContext {
-    pub uuid: UserPromptId,
-    pub title: Option<String>,
-    pub contents: String,
-}
-
-#[derive(Debug, Clone, Eq, PartialEq, Serialize)]
-pub struct WorktreeContext {
-    pub root_name: String,
-    pub abs_path: Arc<Path>,
-    pub rules_file: Option<RulesFileContext>,
-}
-
-#[derive(Debug, Clone, Eq, PartialEq, Serialize)]
-pub struct RulesFileContext {
-    pub path_in_worktree: Arc<RelPath>,
-    pub text: String,
-    // This used for opening rules files. TODO: Since it isn't related to prompt templating, this
-    // should be moved elsewhere.
-    #[serde(skip)]
-    pub project_entry_id: usize,
-}
-
-#[derive(Serialize)]
-pub struct ContentPromptDiagnosticContext {
-    pub line_number: usize,
-    pub error_message: String,
-    pub code_content: String,
-}
-
-#[derive(Serialize)]
-pub struct ContentPromptContext {
-    pub content_type: String,
-    pub language_name: Option<String>,
-    pub is_insert: bool,
-    pub is_truncated: bool,
-    pub document_content: String,
-    pub user_prompt: String,
-    pub rewrite_section: Option<String>,
-    pub diagnostic_errors: Vec<ContentPromptDiagnosticContext>,
-}
-
-#[derive(Serialize)]
-pub struct ContentPromptContextV2 {
-    pub content_type: String,
-    pub language_name: Option<String>,
-    pub is_truncated: bool,
-    pub document_content: String,
-    pub rewrite_section: Option<String>,
-    pub diagnostic_errors: Vec<ContentPromptDiagnosticContext>,
-}
-
-#[derive(Serialize)]
-pub struct TerminalAssistantPromptContext {
-    pub os: String,
-    pub arch: String,
-    pub shell: Option<String>,
-    pub working_directory: Option<String>,
-    pub latest_output: Vec<String>,
-    pub user_prompt: String,
-}
-
-pub struct PromptLoadingParams<'a> {
-    pub fs: Arc<dyn Fs>,
-    pub repo_path: Option<PathBuf>,
-    pub cx: &'a gpui::App,
-}
-
-pub struct PromptBuilder {
-    handlebars: Arc<Mutex<Handlebars<'static>>>,
-}
-
-impl PromptBuilder {
-    pub fn load(fs: Arc<dyn Fs>, stdout_is_a_pty: bool, cx: &mut App) -> Arc<Self> {
-        Self::new(Some(PromptLoadingParams {
-            fs: fs.clone(),
-            repo_path: stdout_is_a_pty
-                .then(|| std::env::current_dir().log_err())
-                .flatten(),
-            cx,
-        }))
-        .log_err()
-        .map(Arc::new)
-        .unwrap_or_else(|| Arc::new(Self::new(None).unwrap()))
-    }
-
-    pub fn new(loading_params: Option<PromptLoadingParams>) -> Result<Self> {
-        let mut handlebars = Handlebars::new();
-        Self::register_built_in_templates(&mut handlebars)?;
-
-        let handlebars = Arc::new(Mutex::new(handlebars));
-
-        if let Some(params) = loading_params {
-            Self::watch_fs_for_template_overrides(params, handlebars.clone());
-        }
-
-        Ok(Self { handlebars })
-    }
-
-    /// Watches the filesystem for changes to prompt template overrides.
-    ///
-    /// This function sets up a file watcher on the prompt templates directory. It performs
-    /// an initial scan of the directory and registers any existing template overrides.
-    /// Then it continuously monitors for changes, reloading templates as they are
-    /// modified or added.
-    ///
-    /// If the templates directory doesn't exist initially, it waits for it to be created.
-    /// If the directory is removed, it restores the built-in templates and waits for the
-    /// directory to be recreated.
-    ///
-    /// # Arguments
-    ///
-    /// * `params` - A `PromptLoadingParams` struct containing the filesystem, repository path,
-    ///   and application context.
-    /// * `handlebars` - An `Arc<Mutex<Handlebars>>` for registering and updating templates.
-    fn watch_fs_for_template_overrides(
-        params: PromptLoadingParams,
-        handlebars: Arc<Mutex<Handlebars<'static>>>,
-    ) {
-        let templates_dir = paths::prompt_overrides_dir(params.repo_path.as_deref());
-        params.cx.background_spawn(async move {
-            let Some(parent_dir) = templates_dir.parent() else {
-                return;
-            };
-
-            let mut found_dir_once = false;
-            loop {
-                // Check if the templates directory exists and handle its status
-                // If it exists, log its presence and check if it's a symlink
-                // If it doesn't exist:
-                //   - Log that we're using built-in prompts
-                //   - Check if it's a broken symlink and log if so
-                //   - Set up a watcher to detect when it's created
-                // After the first check, set the `found_dir_once` flag
-                // This allows us to avoid logging when looping back around after deleting the prompt overrides directory.
-                let dir_status = params.fs.is_dir(&templates_dir).await;
-                let symlink_status = params.fs.read_link(&templates_dir).await.ok();
-                if dir_status {
-                    let mut log_message = format!("Prompt template overrides directory found at {}", templates_dir.display());
-                    if let Some(target) = symlink_status {
-                        log_message.push_str(" -> ");
-                        log_message.push_str(&target.display().to_string());
-                    }
-                    log::trace!("{}.", log_message);
-                } else {
-                    if !found_dir_once {
-                        log::trace!("No prompt template overrides directory found at {}. Using built-in prompts.", templates_dir.display());
-                        if let Some(target) = symlink_status {
-                            log::trace!("Symlink found pointing to {}, but target is invalid.", target.display());
-                        }
-                    }
-
-                    if params.fs.is_dir(parent_dir).await {
-                        let (mut changes, _watcher) = params.fs.watch(parent_dir, Duration::from_secs(1)).await;
-                        while let Some(changed_paths) = changes.next().await {
-                            if changed_paths.iter().any(|p| &p.path == &templates_dir) {
-                                let mut log_message = format!("Prompt template overrides directory detected at {}", templates_dir.display());
-                                if let Ok(target) = params.fs.read_link(&templates_dir).await {
-                                    log_message.push_str(" -> ");
-                                    log_message.push_str(&target.display().to_string());
-                                }
-                                log::trace!("{}.", log_message);
-                                break;
-                            }
-                        }
-                    } else {
-                        return;
-                    }
-                }
-
-                found_dir_once = true;
-
-                // Initial scan of the prompt overrides directory
-                if let Ok(mut entries) = params.fs.read_dir(&templates_dir).await {
-                    while let Some(Ok(file_path)) = entries.next().await {
-                        if file_path.to_string_lossy().ends_with(".hbs")
-                            && let Ok(content) = params.fs.load(&file_path).await {
-                                let file_name = file_path.file_stem().unwrap().to_string_lossy();
-                                log::debug!("Registering prompt template override: {}", file_name);
-                                handlebars.lock().register_template_string(&file_name, content).log_err();
-                            }
-                    }
-                }
-
-                // Watch both the parent directory and the template overrides directory:
-                // - Monitor the parent directory to detect if the template overrides directory is deleted.
-                // - Monitor the template overrides directory to re-register templates when they change.
-                // Combine both watch streams into a single stream.
-                let (parent_changes, parent_watcher) = params.fs.watch(parent_dir, Duration::from_secs(1)).await;
-                let (changes, watcher) = params.fs.watch(&templates_dir, Duration::from_secs(1)).await;
-                let mut combined_changes = futures::stream::select(changes, parent_changes);
-
-                while let Some(changed_paths) = combined_changes.next().await {
-                    if changed_paths.iter().any(|p| &p.path == &templates_dir)
-                        && !params.fs.is_dir(&templates_dir).await {
-                            log::info!("Prompt template overrides directory removed. Restoring built-in prompt templates.");
-                            Self::register_built_in_templates(&mut handlebars.lock()).log_err();
-                            break;
-                        }
-                    for event in changed_paths {
-                        if event.path.starts_with(&templates_dir) && event.path.extension().is_some_and(|ext| ext == "hbs") {
-                            log::info!("Reloading prompt template override: {}", event.path.display());
-                            if let Some(content) = params.fs.load(&event.path).await.log_err() {
-                                let file_name = event.path.file_stem().unwrap().to_string_lossy();
-                                handlebars.lock().register_template_string(&file_name, content).log_err();
-                            }
-                        }
-                    }
-                }
-
-                drop(watcher);
-                drop(parent_watcher);
-            }
-        })
-            .detach();
-    }
-
-    fn register_built_in_templates(handlebars: &mut Handlebars) -> Result<()> {
-        for path in Assets.list("prompts")? {
-            if let Some(id) = path
-                .split('/')
-                .next_back()
-                .and_then(|s| s.strip_suffix(".hbs"))
-                && let Some(prompt) = Assets.load(path.as_ref()).log_err().flatten()
-            {
-                log::debug!("Registering built-in prompt template: {}", id);
-                let prompt = String::from_utf8_lossy(prompt.as_ref());
-                handlebars.register_template_string(id, LineEnding::normalize_cow(prompt))?
-            }
-        }
-
-        Ok(())
-    }
-
-    pub fn generate_inline_transformation_prompt_v2(
-        &self,
-        language_name: Option<&LanguageName>,
-        buffer: BufferSnapshot,
-        range: Range<usize>,
-    ) -> Result<String, RenderError> {
-        let content_type = match language_name.as_ref().map(|l| l.as_ref()) {
-            None | Some("Markdown" | "Plain Text") => "text",
-            Some(_) => "code",
-        };
-
-        const MAX_CTX: usize = 50000;
-        let is_insert = range.is_empty();
-        let mut is_truncated = false;
-
-        let before_range = 0..range.start;
-        let truncated_before = if before_range.len() > MAX_CTX {
-            is_truncated = true;
-            let start = buffer.clip_offset(range.start - MAX_CTX, text::Bias::Right);
-            start..range.start
-        } else {
-            before_range
-        };
-
-        let after_range = range.end..buffer.len();
-        let truncated_after = if after_range.len() > MAX_CTX {
-            is_truncated = true;
-            let end = buffer.clip_offset(range.end + MAX_CTX, text::Bias::Left);
-            range.end..end
-        } else {
-            after_range
-        };
-
-        let mut document_content = String::new();
-        for chunk in buffer.text_for_range(truncated_before) {
-            document_content.push_str(chunk);
-        }
-        if is_insert {
-            document_content.push_str("<insert_here></insert_here>");
-        } else {
-            document_content.push_str("<rewrite_this>\n");
-            for chunk in buffer.text_for_range(range.clone()) {
-                document_content.push_str(chunk);
-            }
-            document_content.push_str("\n</rewrite_this>");
-        }
-        for chunk in buffer.text_for_range(truncated_after) {
-            document_content.push_str(chunk);
-        }
-
-        let rewrite_section = if !is_insert {
-            let mut section = String::new();
-            for chunk in buffer.text_for_range(range.clone()) {
-                section.push_str(chunk);
-            }
-            Some(section)
-        } else {
-            None
-        };
-        let diagnostics = buffer.diagnostics_in_range::<_, Point>(range, false);
-        let diagnostic_errors: Vec<ContentPromptDiagnosticContext> = diagnostics
-            .map(|entry| {
-                let start = entry.range.start;
-                ContentPromptDiagnosticContext {
-                    line_number: (start.row + 1) as usize,
-                    error_message: entry.diagnostic.message.clone(),
-                    code_content: buffer.text_for_range(entry.range).collect(),
-                }
-            })
-            .collect();
-
-        let context = ContentPromptContextV2 {
-            content_type: content_type.to_string(),
-            language_name: language_name.map(|s| s.to_string()),
-            is_truncated,
-            document_content,
-            rewrite_section,
-            diagnostic_errors,
-        };
-        self.handlebars.lock().render("content_prompt_v2", &context)
-    }
-
-    pub fn generate_inline_transformation_prompt(
-        &self,
-        user_prompt: String,
-        language_name: Option<&LanguageName>,
-        buffer: BufferSnapshot,
-        range: Range<usize>,
-    ) -> Result<String, RenderError> {
-        let content_type = match language_name.as_ref().map(|l| l.as_ref()) {
-            None | Some("Markdown" | "Plain Text") => "text",
-            Some(_) => "code",
-        };
-
-        const MAX_CTX: usize = 50000;
-        let is_insert = range.is_empty();
-        let mut is_truncated = false;
-
-        let before_range = 0..range.start;
-        let truncated_before = if before_range.len() > MAX_CTX {
-            is_truncated = true;
-            let start = buffer.clip_offset(range.start - MAX_CTX, text::Bias::Right);
-            start..range.start
-        } else {
-            before_range
-        };
-
-        let after_range = range.end..buffer.len();
-        let truncated_after = if after_range.len() > MAX_CTX {
-            is_truncated = true;
-            let end = buffer.clip_offset(range.end + MAX_CTX, text::Bias::Left);
-            range.end..end
-        } else {
-            after_range
-        };
-
-        let mut document_content = String::new();
-        for chunk in buffer.text_for_range(truncated_before) {
-            document_content.push_str(chunk);
-        }
-        if is_insert {
-            document_content.push_str("<insert_here></insert_here>");
-        } else {
-            document_content.push_str("<rewrite_this>\n");
-            for chunk in buffer.text_for_range(range.clone()) {
-                document_content.push_str(chunk);
-            }
-            document_content.push_str("\n</rewrite_this>");
-        }
-        for chunk in buffer.text_for_range(truncated_after) {
-            document_content.push_str(chunk);
-        }
-
-        let rewrite_section = if !is_insert {
-            let mut section = String::new();
-            for chunk in buffer.text_for_range(range.clone()) {
-                section.push_str(chunk);
-            }
-            Some(section)
-        } else {
-            None
-        };
-        let diagnostics = buffer.diagnostics_in_range::<_, Point>(range, false);
-        let diagnostic_errors: Vec<ContentPromptDiagnosticContext> = diagnostics
-            .map(|entry| {
-                let start = entry.range.start;
-                ContentPromptDiagnosticContext {
-                    line_number: (start.row + 1) as usize,
-                    error_message: entry.diagnostic.message.clone(),
-                    code_content: buffer.text_for_range(entry.range).collect(),
-                }
-            })
-            .collect();
-
-        let context = ContentPromptContext {
-            content_type: content_type.to_string(),
-            language_name: language_name.map(|s| s.to_string()),
-            is_insert,
-            is_truncated,
-            document_content,
-            user_prompt,
-            rewrite_section,
-            diagnostic_errors,
-        };
-        self.handlebars.lock().render("content_prompt", &context)
-    }
-
-    pub fn generate_terminal_assistant_prompt(
-        &self,
-        user_prompt: &str,
-        shell: Option<&str>,
-        working_directory: Option<&str>,
-        latest_output: &[String],
-    ) -> Result<String, RenderError> {
-        let context = TerminalAssistantPromptContext {
-            os: std::env::consts::OS.to_string(),
-            arch: std::env::consts::ARCH.to_string(),
-            shell: shell.map(|s| s.to_string()),
-            working_directory: working_directory.map(|s| s.to_string()),
-            latest_output: latest_output.to_vec(),
-            user_prompt: user_prompt.to_string(),
-        };
-
-        self.handlebars
-            .lock()
-            .render("terminal_assistant_prompt", &context)
-    }
-}
diff --git a/crates/proto/Cargo.toml b/crates/proto/Cargo.toml
deleted file mode 100644
index 5b5b8b985c..0000000000
--- a/crates/proto/Cargo.toml
+++ /dev/null
@@ -1,29 +0,0 @@
-[package]
-description = "Shared protocol for communication between the Zed app and the zed.dev server"
-edition.workspace = true
-name = "proto"
-version = "0.1.0"
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[features]
-test-support = ["collections/test-support"]
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/proto.rs"
-doctest = false
-
-[dependencies]
-anyhow.workspace = true
-prost.workspace = true
-serde.workspace = true
-
-[build-dependencies]
-prost-build.workspace = true
-
-[dev-dependencies]
-collections = { workspace = true, features = ["test-support"] }
-typed-path = "0.11"
diff --git a/crates/proto/LICENSE-GPL b/crates/proto/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/proto/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/proto/build.rs b/crates/proto/build.rs
deleted file mode 100644
index 184d0e53d5..0000000000
--- a/crates/proto/build.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-fn main() {
-    println!("cargo:rerun-if-changed=proto");
-    let mut build = prost_build::Config::new();
-    build
-        .type_attribute(".", "#[derive(serde::Serialize, serde::Deserialize)]")
-        .type_attribute("ProjectPath", "#[derive(Hash, Eq)]")
-        .type_attribute("Anchor", "#[derive(Hash, Eq)]")
-        .compile_protos(&["proto/zed.proto"], &["proto"])
-        .unwrap();
-}
diff --git a/crates/proto/proto/ai.proto b/crates/proto/proto/ai.proto
deleted file mode 100644
index 2216446a82..0000000000
--- a/crates/proto/proto/ai.proto
+++ /dev/null
@@ -1,220 +0,0 @@
-syntax = "proto3";
-package zed.messages;
-
-import "buffer.proto";
-import "task.proto";
-
-message Context {
-    repeated ContextOperation operations = 1;
-}
-
-message ContextMetadata {
-    string context_id = 1;
-    optional string summary = 2;
-}
-
-message ContextMessageStatus {
-    oneof variant {
-        Done done = 1;
-        Pending pending = 2;
-        Error error = 3;
-        Canceled canceled = 4;
-    }
-
-    message Done {}
-
-    message Pending {}
-
-    message Error {
-        string message = 1;
-    }
-
-    message Canceled {}
-}
-
-message ContextMessage {
-    LamportTimestamp id = 1;
-    Anchor start = 2;
-    LanguageModelRole role = 3;
-    ContextMessageStatus status = 4;
-}
-
-message SlashCommandOutputSection {
-    AnchorRange range = 1;
-    string icon_name = 2;
-    string label = 3;
-    optional string metadata = 4;
-}
-
-message ThoughtProcessOutputSection {
-    AnchorRange range = 1;
-}
-
-message ContextOperation {
-    oneof variant {
-        InsertMessage insert_message = 1;
-        UpdateMessage update_message = 2;
-        UpdateSummary update_summary = 3;
-        BufferOperation buffer_operation = 5;
-        SlashCommandStarted slash_command_started = 6;
-        SlashCommandOutputSectionAdded slash_command_output_section_added = 7;
-        SlashCommandCompleted slash_command_completed = 8;
-        ThoughtProcessOutputSectionAdded thought_process_output_section_added = 9;
-    }
-
-    reserved 4;
-
-    message InsertMessage {
-        ContextMessage message = 1;
-        repeated VectorClockEntry version = 2;
-    }
-
-    message UpdateMessage {
-        LamportTimestamp message_id = 1;
-        LanguageModelRole role = 2;
-        ContextMessageStatus status = 3;
-        LamportTimestamp timestamp = 4;
-        repeated VectorClockEntry version = 5;
-    }
-
-    message UpdateSummary {
-        string summary = 1;
-        bool done = 2;
-        LamportTimestamp timestamp = 3;
-        repeated VectorClockEntry version = 4;
-    }
-
-    message SlashCommandStarted {
-        LamportTimestamp id = 1;
-        AnchorRange output_range = 2;
-        string name = 3;
-        repeated VectorClockEntry version = 4;
-    }
-
-    message SlashCommandOutputSectionAdded {
-        LamportTimestamp timestamp = 1;
-        SlashCommandOutputSection section = 2;
-        repeated VectorClockEntry version = 3;
-    }
-
-    message SlashCommandCompleted {
-        LamportTimestamp id = 1;
-        LamportTimestamp timestamp = 3;
-        optional string error_message = 4;
-        repeated VectorClockEntry version = 5;
-    }
-
-    message ThoughtProcessOutputSectionAdded {
-        LamportTimestamp timestamp = 1;
-        ThoughtProcessOutputSection section = 2;
-        repeated VectorClockEntry version = 3;
-    }
-
-    message BufferOperation {
-        Operation operation = 1;
-    }
-}
-
-message AdvertiseContexts {
-    uint64 project_id = 1;
-    repeated ContextMetadata contexts = 2;
-}
-
-message OpenContext {
-    uint64 project_id = 1;
-    string context_id = 2;
-}
-
-message OpenContextResponse {
-    Context context = 1;
-}
-
-message CreateContext {
-    uint64 project_id = 1;
-}
-
-message CreateContextResponse {
-    string context_id = 1;
-    Context context = 2;
-}
-
-message UpdateContext {
-    uint64 project_id = 1;
-    string context_id = 2;
-    ContextOperation operation = 3;
-}
-
-message ContextVersion {
-    string context_id = 1;
-    repeated VectorClockEntry context_version = 2;
-    repeated VectorClockEntry buffer_version = 3;
-}
-
-message SynchronizeContexts {
-    uint64 project_id = 1;
-    repeated ContextVersion contexts = 2;
-}
-
-message SynchronizeContextsResponse {
-    repeated ContextVersion contexts = 1;
-}
-
-enum LanguageModelRole {
-    LanguageModelUser = 0;
-    LanguageModelAssistant = 1;
-    LanguageModelSystem = 2;
-    reserved 3;
-}
-
-message GetAgentServerCommand {
-    uint64 project_id = 1;
-    string name = 2;
-    optional string root_dir = 3;
-}
-
-message AgentServerCommand {
-    string path = 1;
-    repeated string args = 2;
-    map<string, string> env = 3;
-    string root_dir = 4;
-
-    optional SpawnInTerminal login = 5;
-}
-
-message ExternalAgentsUpdated {
-    uint64 project_id = 1;
-    repeated string names = 2;
-}
-
-message ExternalExtensionAgentTarget {
-    string archive = 1;
-    string cmd = 2;
-    repeated string args = 3;
-    optional string sha256 = 4;
-    map<string, string> env = 5;
-}
-
-message ExternalExtensionAgent {
-    string name = 1;
-    optional string icon_path = 2;
-    string extension_id = 3;
-    map<string, ExternalExtensionAgentTarget> targets = 4;
-    map<string, string> env = 5;
-}
-
-message ExternalExtensionAgentsUpdated {
-    uint64 project_id = 1;
-    repeated ExternalExtensionAgent agents = 2;
-}
-
-message ExternalAgentLoadingStatusUpdated {
-    uint64 project_id = 1;
-    string name = 2;
-    string status = 3;
-}
-
-message NewExternalAgentVersionAvailable {
-    uint64 project_id = 1;
-    string name = 2;
-    string version = 3;
-}
diff --git a/crates/proto/proto/app.proto b/crates/proto/proto/app.proto
deleted file mode 100644
index 889086e200..0000000000
--- a/crates/proto/proto/app.proto
+++ /dev/null
@@ -1,76 +0,0 @@
-syntax = "proto3";
-package zed.messages;
-
-message UpdateInviteInfo {
-    string url = 1;
-    uint32 count = 2;
-}
-
-message ShutdownRemoteServer {}
-
-message Toast {
-    uint64 project_id = 1;
-    string notification_id = 2;
-    string message = 3;
-}
-
-message HideToast {
-    uint64 project_id = 1;
-    string notification_id = 2;
-}
-
-message OpenServerSettings {
-    uint64 project_id = 1;
-}
-
-message GetCrashFiles {
-}
-
-message GetCrashFilesResponse {
-    repeated CrashReport crashes = 1;
-    reserved 2; // old panics
-}
-
-message CrashReport {
-    reserved 1, 2;
-    string metadata = 3;
-    bytes minidump_contents = 4;
-}
-
-message Extension {
-    string id = 1;
-    string version = 2;
-    bool dev = 3;
-}
-
-message SyncExtensions {
-    repeated Extension extensions = 1;
-}
-
-message SyncExtensionsResponse {
-    string tmp_dir = 1;
-    repeated Extension missing_extensions = 2;
-}
-
-message InstallExtension {
-    Extension extension = 1;
-    string tmp_dir = 2;
-}
-
-message AskPassRequest {
-    uint64 project_id = 1;
-    reserved 2;
-    uint64 repository_id = 3;
-    uint64 askpass_id = 4;
-    string prompt = 5;
-}
-
-message AskPassResponse {
-    string response = 1;
-}
-
-message GetSupermavenApiKey {}
-
-message GetSupermavenApiKeyResponse {
-    string api_key = 1;
-}
diff --git a/crates/proto/proto/buf.yaml b/crates/proto/proto/buf.yaml
deleted file mode 100644
index 93e819b2f7..0000000000
--- a/crates/proto/proto/buf.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-version: v1
-breaking:
-  use:
-    - WIRE
diff --git a/crates/proto/proto/buffer.proto b/crates/proto/proto/buffer.proto
deleted file mode 100644
index 486716b36a..0000000000
--- a/crates/proto/proto/buffer.proto
+++ /dev/null
@@ -1,315 +0,0 @@
-syntax = "proto3";
-package zed.messages;
-
-import "core.proto";
-import "worktree.proto";
-
-message OpenNewBuffer {
-    uint64 project_id = 1;
-}
-
-message OpenBufferResponse {
-    uint64 buffer_id = 1;
-}
-
-message CreateBufferForPeer {
-    uint64 project_id = 1;
-    PeerId peer_id = 2;
-    oneof variant {
-        BufferState state = 3;
-        BufferChunk chunk = 4;
-    }
-}
-
-message UpdateBuffer {
-    uint64 project_id = 1;
-    uint64 buffer_id = 2;
-    repeated Operation operations = 3;
-}
-
-message OpenBufferByPath {
-    uint64 project_id = 1;
-    uint64 worktree_id = 2;
-    string path = 3;
-}
-
-message OpenBufferById {
-    uint64 project_id = 1;
-    uint64 id = 2;
-}
-
-message UpdateBufferFile {
-    uint64 project_id = 1;
-    uint64 buffer_id = 2;
-    File file = 3;
-}
-
-message SaveBuffer {
-    uint64 project_id = 1;
-    uint64 buffer_id = 2;
-    repeated VectorClockEntry version = 3;
-    optional ProjectPath new_path = 4;
-}
-
-message CloseBuffer {
-    uint64 project_id = 1;
-    uint64 buffer_id = 2;
-}
-
-message BufferSaved {
-    uint64 project_id = 1;
-    uint64 buffer_id = 2;
-    repeated VectorClockEntry version = 3;
-    Timestamp mtime = 4;
-    reserved 5;
-}
-
-message BufferReloaded {
-    uint64 project_id = 1;
-    uint64 buffer_id = 2;
-    repeated VectorClockEntry version = 3;
-    Timestamp mtime = 4;
-    reserved 5;
-    LineEnding line_ending = 6;
-}
-
-message ReloadBuffers {
-    uint64 project_id = 1;
-    repeated uint64 buffer_ids = 2;
-}
-
-message ReloadBuffersResponse {
-    ProjectTransaction transaction = 1;
-}
-
-message SynchronizeBuffers {
-    uint64 project_id = 1;
-    repeated BufferVersion buffers = 2;
-}
-
-message SynchronizeBuffersResponse {
-    repeated BufferVersion buffers = 1;
-}
-
-message BufferVersion {
-    uint64 id = 1;
-    repeated VectorClockEntry version = 2;
-}
-
-message BufferState {
-    uint64 id = 1;
-    optional File file = 2;
-    string base_text = 3;
-    LineEnding line_ending = 5;
-    repeated VectorClockEntry saved_version = 6;
-    Timestamp saved_mtime = 8;
-
-    reserved 7;
-    reserved 4;
-}
-
-message BufferChunk {
-    uint64 buffer_id = 1;
-    repeated Operation operations = 2;
-    bool is_last = 3;
-}
-
-enum LineEnding {
-    Unix = 0;
-    Windows = 1;
-}
-
-message VectorClockEntry {
-    uint32 replica_id = 1;
-    uint32 timestamp = 2;
-}
-
-message UndoMapEntry {
-    uint32 replica_id = 1;
-    uint32 local_timestamp = 2;
-    repeated UndoCount counts = 3;
-}
-
-message UndoCount {
-    uint32 replica_id = 1;
-    uint32 lamport_timestamp = 2;
-    uint32 count = 3;
-}
-
-message Operation {
-    oneof variant {
-        Edit edit = 1;
-        Undo undo = 2;
-        UpdateSelections update_selections = 3;
-        UpdateDiagnostics update_diagnostics = 4;
-        UpdateCompletionTriggers update_completion_triggers = 5;
-        UpdateLineEnding update_line_ending = 6;
-    }
-
-    message Edit {
-        uint32 replica_id = 1;
-        uint32 lamport_timestamp = 2;
-        repeated VectorClockEntry version = 3;
-        repeated Range ranges = 4;
-        repeated string new_text = 5;
-    }
-
-    message Undo {
-        uint32 replica_id = 1;
-        uint32 lamport_timestamp = 2;
-        repeated VectorClockEntry version = 3;
-        repeated UndoCount counts = 4;
-    }
-
-    message UpdateSelections {
-        uint32 replica_id = 1;
-        uint32 lamport_timestamp = 2;
-        repeated Selection selections = 3;
-        bool line_mode = 4;
-        CursorShape cursor_shape = 5;
-    }
-
-    message UpdateCompletionTriggers {
-        uint32 replica_id = 1;
-        uint32 lamport_timestamp = 2;
-        repeated string triggers = 3;
-        uint64 language_server_id = 4;
-    }
-
-    message UpdateLineEnding {
-        uint32 replica_id = 1;
-        uint32 lamport_timestamp = 2;
-        LineEnding line_ending = 3;
-    }
-}
-
-message ProjectTransaction {
-    repeated uint64 buffer_ids = 1;
-    repeated Transaction transactions = 2;
-}
-
-message Transaction {
-    LamportTimestamp id = 1;
-    repeated LamportTimestamp edit_ids = 2;
-    repeated VectorClockEntry start = 3;
-}
-
-message LamportTimestamp {
-    uint32 replica_id = 1;
-    uint32 value = 2;
-}
-
-message Range {
-    uint64 start = 1;
-    uint64 end = 2;
-}
-
-message Selection {
-    uint64 id = 1;
-    EditorAnchor start = 2;
-    EditorAnchor end = 3;
-    bool reversed = 4;
-}
-
-message EditorAnchor {
-    uint64 excerpt_id = 1;
-    Anchor anchor = 2;
-}
-
-enum CursorShape {
-    CursorBar = 0;
-    CursorBlock = 1;
-    CursorUnderscore = 2;
-    CursorHollow = 3;
-}
-
-message UpdateDiagnostics {
-    uint32 replica_id = 1;
-    uint32 lamport_timestamp = 2;
-    uint64 server_id = 3;
-    repeated Diagnostic diagnostics = 4;
-}
-
-message Anchor {
-    uint32 replica_id = 1;
-    uint32 timestamp = 2;
-    uint64 offset = 3;
-    Bias bias = 4;
-    optional uint64 buffer_id = 5;
-}
-
-message AnchorRange {
-    Anchor start = 1;
-    Anchor end = 2;
-}
-
-message Location {
-    uint64 buffer_id = 1;
-    Anchor start = 2;
-    Anchor end = 3;
-}
-
-enum Bias {
-    Left = 0;
-    Right = 1;
-}
-
-message Diagnostic {
-    Anchor start = 1;
-    Anchor end = 2;
-    optional string source = 3;
-    optional string registration_id = 17;
-
-    enum SourceKind {
-        Pulled = 0;
-        Pushed = 1;
-        Other = 2;
-    }
-
-    SourceKind source_kind = 16;
-    Severity severity = 4;
-    string message = 5;
-    optional string code = 6;
-    uint64 group_id = 7;
-    bool is_primary = 8;
-
-    reserved 9;
-
-    bool is_disk_based = 10;
-    bool is_unnecessary = 11;
-    bool underline = 15;
-
-    enum Severity {
-        None = 0;
-        Error = 1;
-        Warning = 2;
-        Information = 3;
-        Hint = 4;
-    }
-    optional string data = 12;
-    optional string code_description = 13;
-    optional string markdown = 14;
-}
-
-message SearchQuery {
-    string query = 2;
-    bool regex = 3;
-    bool whole_word = 4;
-    bool case_sensitive = 5;
-    repeated string files_to_include = 10;
-    repeated string files_to_exclude = 11;
-    bool match_full_paths = 9;
-    bool include_ignored = 8;
-    string files_to_include_legacy = 6;
-    string files_to_exclude_legacy = 7;
-}
-
-message FindSearchCandidates {
-    uint64 project_id = 1;
-    SearchQuery query = 2;
-    uint64 limit = 3;
-}
-
-message FindSearchCandidatesResponse {
-    repeated uint64 buffer_ids = 1;
-}
diff --git a/crates/proto/proto/call.proto b/crates/proto/proto/call.proto
deleted file mode 100644
index 9e801515af..0000000000
--- a/crates/proto/proto/call.proto
+++ /dev/null
@@ -1,427 +0,0 @@
-syntax = "proto3";
-package zed.messages;
-
-import "core.proto";
-import "worktree.proto";
-import "buffer.proto";
-import "lsp.proto";
-import "channel.proto";
-import "git.proto";
-
-message CreateRoom {}
-
-message CreateRoomResponse {
-    Room room = 1;
-    optional LiveKitConnectionInfo live_kit_connection_info = 2;
-}
-
-message JoinRoom {
-    uint64 id = 1;
-}
-
-message JoinRoomResponse {
-    Room room = 1;
-    optional uint64 channel_id = 2;
-    optional LiveKitConnectionInfo live_kit_connection_info = 3;
-}
-
-message RejoinRoom {
-    uint64 id = 1;
-    repeated UpdateProject reshared_projects = 2;
-    repeated RejoinProject rejoined_projects = 3;
-}
-
-message RejoinRemoteProjects {
-    repeated RejoinProject rejoined_projects = 1;
-}
-
-message RejoinRemoteProjectsResponse {
-    repeated RejoinedProject rejoined_projects = 1;
-}
-
-message RejoinProject {
-    uint64 id = 1;
-    repeated RejoinWorktree worktrees = 2;
-    repeated RejoinRepository repositories = 3;
-}
-
-message RejoinWorktree {
-    uint64 id = 1;
-    uint64 scan_id = 2;
-}
-
-message RejoinRepository {
-    uint64 id = 1;
-    uint64 scan_id = 2;
-}
-
-message RejoinRoomResponse {
-    Room room = 1;
-    repeated ResharedProject reshared_projects = 2;
-    repeated RejoinedProject rejoined_projects = 3;
-}
-
-message ResharedProject {
-    uint64 id = 1;
-    repeated Collaborator collaborators = 2;
-}
-
-message RejoinedProject {
-    uint64 id = 1;
-    repeated WorktreeMetadata worktrees = 2;
-    repeated Collaborator collaborators = 3;
-    repeated LanguageServer language_servers = 4;
-    repeated string language_server_capabilities = 5;
-}
-
-message LeaveRoom {}
-
-message Room {
-    uint64 id = 1;
-    repeated Participant participants = 2;
-    repeated PendingParticipant pending_participants = 3;
-    repeated Follower followers = 4;
-    string livekit_room = 5;
-}
-
-message Participant {
-    uint64 user_id = 1;
-    PeerId peer_id = 2;
-    repeated ParticipantProject projects = 3;
-    ParticipantLocation location = 4;
-    uint32 participant_index = 5;
-    ChannelRole role = 6;
-    reserved 7;
-}
-
-message PendingParticipant {
-    uint64 user_id = 1;
-    uint64 calling_user_id = 2;
-    optional uint64 initial_project_id = 3;
-}
-
-message ParticipantProject {
-    uint64 id = 1;
-    repeated string worktree_root_names = 2;
-}
-
-message Follower {
-    PeerId leader_id = 1;
-    PeerId follower_id = 2;
-    uint64 project_id = 3;
-}
-
-message ParticipantLocation {
-    oneof variant {
-        SharedProject shared_project = 1;
-        UnsharedProject unshared_project = 2;
-        External external = 3;
-    }
-
-    message SharedProject {
-        uint64 id = 1;
-    }
-
-    message UnsharedProject {}
-
-    message External {}
-}
-
-message Call {
-    uint64 room_id = 1;
-    uint64 called_user_id = 2;
-    optional uint64 initial_project_id = 3;
-}
-
-message IncomingCall {
-    uint64 room_id = 1;
-    uint64 calling_user_id = 2;
-    repeated uint64 participant_user_ids = 3;
-    optional ParticipantProject initial_project = 4;
-}
-
-message CallCanceled {
-    uint64 room_id = 1;
-}
-
-message CancelCall {
-    uint64 room_id = 1;
-    uint64 called_user_id = 2;
-}
-
-message DeclineCall {
-    uint64 room_id = 1;
-}
-
-message UpdateParticipantLocation {
-    uint64 room_id = 1;
-    ParticipantLocation location = 2;
-}
-
-message RoomUpdated {
-    Room room = 1;
-}
-
-message LiveKitConnectionInfo {
-    string server_url = 1;
-    string token = 2;
-    bool can_publish = 3;
-}
-
-message ShareProject {
-    uint64 room_id = 1;
-    repeated WorktreeMetadata worktrees = 2;
-    reserved 3;
-    bool is_ssh_project = 4;
-    optional bool windows_paths = 5;
-}
-
-message ShareProjectResponse {
-    uint64 project_id = 1;
-}
-
-message UnshareProject {
-    uint64 project_id = 1;
-}
-
-message UpdateProject {
-    uint64 project_id = 1;
-    repeated WorktreeMetadata worktrees = 2;
-}
-
-message JoinProject {
-    uint64 project_id = 1;
-    optional string committer_email = 2;
-    optional string committer_name = 3;
-}
-
-message JoinProjectResponse {
-    uint64 project_id = 5;
-    uint32 replica_id = 1;
-    repeated WorktreeMetadata worktrees = 2;
-    repeated Collaborator collaborators = 3;
-    repeated LanguageServer language_servers = 4;
-    repeated string language_server_capabilities = 8;
-    ChannelRole role = 6;
-    bool windows_paths = 9;
-    reserved 7;
-}
-
-message LeaveProject {
-    uint64 project_id = 1;
-}
-
-message UpdateWorktree {
-    uint64 project_id = 1;
-    uint64 worktree_id = 2;
-    string root_name = 3;
-    repeated Entry updated_entries = 4;
-    repeated uint64 removed_entries = 5;
-    repeated RepositoryEntry updated_repositories = 6; // deprecated
-    repeated uint64 removed_repositories = 7; // deprecated
-    uint64 scan_id = 8;
-    bool is_last_update = 9;
-    string abs_path = 10;
-}
-
-// deprecated
-message RepositoryEntry {
-    uint64 repository_id = 1;
-    reserved 2;
-    repeated StatusEntry updated_statuses = 3;
-    repeated string removed_statuses = 4;
-    repeated string current_merge_conflicts = 5;
-    optional Branch branch_summary = 6;
-}
-
-message AddProjectCollaborator {
-    uint64 project_id = 1;
-    Collaborator collaborator = 2;
-}
-
-message UpdateProjectCollaborator {
-    uint64 project_id = 1;
-    PeerId old_peer_id = 2;
-    PeerId new_peer_id = 3;
-}
-
-message RemoveProjectCollaborator {
-    uint64 project_id = 1;
-    PeerId peer_id = 2;
-}
-
-message GetUsers {
-    repeated uint64 user_ids = 1;
-}
-
-message FuzzySearchUsers {
-    string query = 1;
-}
-
-message UsersResponse {
-    repeated User users = 1;
-}
-
-message RequestContact {
-    uint64 responder_id = 1;
-}
-
-message RemoveContact {
-    uint64 user_id = 1;
-}
-
-message RespondToContactRequest {
-    uint64 requester_id = 1;
-    ContactRequestResponse response = 2;
-}
-
-enum ContactRequestResponse {
-    Accept = 0;
-    Decline = 1;
-    Block = 2;
-    Dismiss = 3;
-}
-
-message UpdateContacts {
-    repeated Contact contacts = 1;
-    repeated uint64 remove_contacts = 2;
-    repeated IncomingContactRequest incoming_requests = 3;
-    repeated uint64 remove_incoming_requests = 4;
-    repeated uint64 outgoing_requests = 5;
-    repeated uint64 remove_outgoing_requests = 6;
-}
-
-message ShowContacts {}
-
-message IncomingContactRequest {
-    uint64 requester_id = 1;
-}
-
-message Follow {
-    uint64 room_id = 1;
-    optional uint64 project_id = 2;
-    PeerId leader_id = 3;
-}
-
-message FollowResponse {
-    View active_view = 3;
-    // TODO: Remove after version 0.145.x stabilizes.
-    optional ViewId active_view_id = 1;
-    repeated View views = 2;
-}
-
-message UpdateFollowers {
-    uint64 room_id = 1;
-    optional uint64 project_id = 2;
-    reserved 3;
-    oneof variant {
-        View create_view = 5;
-        // TODO: Remove after version 0.145.x stabilizes.
-        UpdateActiveView update_active_view = 4;
-        UpdateView update_view = 6;
-    }
-}
-
-message Unfollow {
-    uint64 room_id = 1;
-    optional uint64 project_id = 2;
-    PeerId leader_id = 3;
-}
-
-message ViewId {
-    PeerId creator = 1;
-    uint64 id = 2;
-}
-
-message UpdateActiveView {
-    optional ViewId id = 1;
-    optional PeerId leader_id = 2;
-    View view = 3;
-}
-
-enum PanelId {
-    AssistantPanel = 0;
-    DebugPanel = 1;
-}
-
-message UpdateView {
-    ViewId id = 1;
-    optional PeerId leader_id = 2;
-
-    oneof variant {
-        Editor editor = 3;
-    }
-
-    message Editor {
-        repeated ExcerptInsertion inserted_excerpts = 1;
-        repeated uint64 deleted_excerpts = 2;
-        repeated Selection selections = 3;
-        optional Selection pending_selection = 4;
-        EditorAnchor scroll_top_anchor = 5;
-        reserved 6;
-        reserved 7;
-        double scroll_x = 8;
-        double scroll_y = 9;
-    }
-}
-
-message View {
-    ViewId id = 1;
-    optional PeerId leader_id = 2;
-    optional PanelId panel_id = 6;
-
-    oneof variant {
-        Editor editor = 3;
-        ChannelView channel_view = 4;
-        ContextEditor context_editor = 5;
-    }
-
-    message Editor {
-        bool singleton = 1;
-        optional string title = 2;
-        repeated Excerpt excerpts = 3;
-        repeated Selection selections = 4;
-        optional Selection pending_selection = 5;
-        EditorAnchor scroll_top_anchor = 6;
-        reserved 7;
-        reserved 8;
-        double scroll_x = 9;
-        double scroll_y = 10;
-    }
-
-    message ChannelView {
-        uint64 channel_id = 1;
-        Editor editor = 2;
-    }
-
-    message ContextEditor {
-        string context_id = 1;
-        Editor editor = 2;
-    }
-}
-
-message ExcerptInsertion {
-    Excerpt excerpt = 1;
-    optional uint64 previous_excerpt_id = 2;
-}
-
-message Excerpt {
-    uint64 id = 1;
-    uint64 buffer_id = 2;
-    Anchor context_start = 3;
-    Anchor context_end = 4;
-    Anchor primary_start = 5;
-    Anchor primary_end = 6;
-}
-
-message Contact {
-    uint64 user_id = 1;
-    bool online = 2;
-    bool busy = 3;
-}
-
-message SetRoomParticipantRole {
-    uint64 room_id = 1;
-    uint64 user_id = 2;
-    ChannelRole role = 3;
-}
diff --git a/crates/proto/proto/channel.proto b/crates/proto/proto/channel.proto
deleted file mode 100644
index cada21cd5b..0000000000
--- a/crates/proto/proto/channel.proto
+++ /dev/null
@@ -1,294 +0,0 @@
-syntax = "proto3";
-package zed.messages;
-
-import "core.proto";
-import "buffer.proto";
-
-message Channel {
-    uint64 id = 1;
-    string name = 2;
-    ChannelVisibility visibility = 3;
-    int32 channel_order = 4;
-    repeated uint64 parent_path = 5;
-}
-
-enum ChannelVisibility {
-    Public = 0;
-    Members = 1;
-}
-
-message UpdateChannels {
-    repeated Channel channels = 1;
-    repeated uint64 delete_channels = 4;
-    repeated Channel channel_invitations = 5;
-    repeated uint64 remove_channel_invitations = 6;
-    repeated ChannelParticipants channel_participants = 7;
-    repeated ChannelBufferVersion latest_channel_buffer_versions = 9;
-
-    reserved 8;
-    reserved 10 to 15;
-}
-
-message UpdateUserChannels {
-    repeated ChannelBufferVersion observed_channel_buffer_version = 2;
-    repeated ChannelMembership channel_memberships = 3;
-
-    reserved 1;
-}
-
-message ChannelMembership {
-    uint64 channel_id = 1;
-    ChannelRole role = 2;
-}
-
-message ChannelMessageId {
-    uint64 channel_id = 1;
-    uint64 message_id = 2;
-}
-
-message ChannelPermission {
-    uint64 channel_id = 1;
-    ChannelRole role = 3;
-}
-
-message ChannelParticipants {
-    uint64 channel_id = 1;
-    repeated uint64 participant_user_ids = 2;
-}
-
-message JoinChannel {
-    uint64 channel_id = 1;
-}
-
-message DeleteChannel {
-    uint64 channel_id = 1;
-}
-
-message GetChannelMembers {
-    uint64 channel_id = 1;
-    string query = 2;
-    uint64 limit = 3;
-}
-
-message GetChannelMembersResponse {
-    repeated ChannelMember members = 1;
-    repeated User users = 2;
-}
-
-message ChannelMember {
-    uint64 user_id = 1;
-    Kind kind = 3;
-    ChannelRole role = 4;
-
-    enum Kind {
-        Member = 0;
-        Invitee = 1;
-    }
-}
-
-message SubscribeToChannels {}
-
-message CreateChannel {
-    string name = 1;
-    optional uint64 parent_id = 2;
-}
-
-message CreateChannelResponse {
-    Channel channel = 1;
-    optional uint64 parent_id = 2;
-}
-
-message InviteChannelMember {
-    uint64 channel_id = 1;
-    uint64 user_id = 2;
-    ChannelRole role = 4;
-}
-
-message RemoveChannelMember {
-    uint64 channel_id = 1;
-    uint64 user_id = 2;
-}
-
-enum ChannelRole {
-    Admin = 0;
-    Member = 1;
-    Guest = 2;
-    Banned = 3;
-    Talker = 4;
-}
-
-message SetChannelMemberRole {
-    uint64 channel_id = 1;
-    uint64 user_id = 2;
-    ChannelRole role = 3;
-}
-
-message SetChannelVisibility {
-    uint64 channel_id = 1;
-    ChannelVisibility visibility = 2;
-}
-
-message RenameChannel {
-    uint64 channel_id = 1;
-    string name = 2;
-}
-
-message RenameChannelResponse {
-    Channel channel = 1;
-}
-
-message JoinChannelChat {
-    uint64 channel_id = 1;
-}
-
-message JoinChannelChatResponse {
-    repeated ChannelMessage messages = 1;
-    bool done = 2;
-}
-
-message LeaveChannelChat {
-    uint64 channel_id = 1;
-}
-
-message SendChannelMessage {
-    uint64 channel_id = 1;
-    string body = 2;
-    Nonce nonce = 3;
-    repeated ChatMention mentions = 4;
-    optional uint64 reply_to_message_id = 5;
-}
-
-message RemoveChannelMessage {
-    uint64 channel_id = 1;
-    uint64 message_id = 2;
-}
-
-message UpdateChannelMessage {
-    uint64 channel_id = 1;
-    uint64 message_id = 2;
-    Nonce nonce = 4;
-    string body = 5;
-    repeated ChatMention mentions = 6;
-}
-
-message AckChannelMessage {
-    uint64 channel_id = 1;
-    uint64 message_id = 2;
-}
-
-message SendChannelMessageResponse {
-    ChannelMessage message = 1;
-}
-
-message ChannelMessageSent {
-    uint64 channel_id = 1;
-    ChannelMessage message = 2;
-}
-
-message ChannelMessageUpdate {
-    uint64 channel_id = 1;
-    ChannelMessage message = 2;
-}
-
-message GetChannelMessages {
-    uint64 channel_id = 1;
-    uint64 before_message_id = 2;
-}
-
-message GetChannelMessagesResponse {
-    repeated ChannelMessage messages = 1;
-    bool done = 2;
-}
-
-message GetChannelMessagesById {
-    repeated uint64 message_ids = 1;
-}
-
-message MoveChannel {
-    uint64 channel_id = 1;
-    uint64 to = 2;
-}
-
-message ReorderChannel {
-    uint64 channel_id = 1;
-    enum Direction {
-        Up = 0;
-        Down = 1;
-    }
-    Direction direction = 2;
-}
-
-message JoinChannelBuffer {
-    uint64 channel_id = 1;
-}
-
-message ChannelBufferVersion {
-    uint64 channel_id = 1;
-    repeated VectorClockEntry version = 2;
-    uint64 epoch = 3;
-}
-
-message UpdateChannelBufferCollaborators {
-    uint64 channel_id = 1;
-    repeated Collaborator collaborators = 2;
-}
-
-message UpdateChannelBuffer {
-    uint64 channel_id = 1;
-    repeated Operation operations = 2;
-}
-
-message ChannelMessage {
-    uint64 id = 1;
-    string body = 2;
-    uint64 timestamp = 3;
-    uint64 sender_id = 4;
-    Nonce nonce = 5;
-    repeated ChatMention mentions = 6;
-    optional uint64 reply_to_message_id = 7;
-    optional uint64 edited_at = 8;
-}
-
-message ChatMention {
-    Range range = 1;
-    uint64 user_id = 2;
-}
-
-message RejoinChannelBuffers {
-    repeated ChannelBufferVersion buffers = 1;
-}
-
-message RejoinChannelBuffersResponse {
-    repeated RejoinedChannelBuffer buffers = 1;
-}
-
-message AckBufferOperation {
-    uint64 buffer_id = 1;
-    uint64 epoch = 2;
-    repeated VectorClockEntry version = 3;
-}
-
-message JoinChannelBufferResponse {
-    uint64 buffer_id = 1;
-    uint32 replica_id = 2;
-    string base_text = 3;
-    repeated Operation operations = 4;
-    repeated Collaborator collaborators = 5;
-    uint64 epoch = 6;
-}
-
-message RejoinedChannelBuffer {
-    uint64 channel_id = 1;
-    repeated VectorClockEntry version = 2;
-    repeated Operation operations = 3;
-    repeated Collaborator collaborators = 4;
-}
-
-message LeaveChannelBuffer {
-    uint64 channel_id = 1;
-}
-
-message RespondToChannelInvite {
-    uint64 channel_id = 1;
-    bool accept = 2;
-}
diff --git a/crates/proto/proto/core.proto b/crates/proto/proto/core.proto
deleted file mode 100644
index 121ea74912..0000000000
--- a/crates/proto/proto/core.proto
+++ /dev/null
@@ -1,29 +0,0 @@
-syntax = "proto3";
-package zed.messages;
-
-message PeerId {
-    uint32 owner_id = 1;
-    uint32 id = 2;
-}
-
-message User {
-    reserved 4;
-    uint64 id = 1;
-    string github_login = 2;
-    string avatar_url = 3;
-    optional string name = 5;
-}
-
-message Nonce {
-    uint64 upper_half = 1;
-    uint64 lower_half = 2;
-}
-
-message Collaborator {
-    PeerId peer_id = 1;
-    uint32 replica_id = 2;
-    uint64 user_id = 3;
-    bool is_host = 4;
-    optional string committer_name = 5;
-    optional string committer_email = 6;
-}
diff --git a/crates/proto/proto/debugger.proto b/crates/proto/proto/debugger.proto
deleted file mode 100644
index dcfb91c77d..0000000000
--- a/crates/proto/proto/debugger.proto
+++ /dev/null
@@ -1,555 +0,0 @@
-syntax = "proto3";
-package zed.messages;
-
-import "core.proto";
-import "buffer.proto";
-import "task.proto";
-
-enum BreakpointState {
-    Enabled = 0;
-    Disabled = 1;
-}
-
-message Breakpoint {
-    Anchor position = 1;
-    BreakpointState state = 2;
-    reserved 3;
-    optional string message = 4;
-    optional string condition = 5;
-    optional string hit_condition = 6;
-    map<uint64, BreakpointSessionState> session_state = 7;
-}
-
-message BreakpointSessionState {
-    uint64 id = 1;
-    bool verified = 2;
-}
-
-message BreakpointsForFile {
-    uint64 project_id = 1;
-    string path = 2;
-    repeated Breakpoint breakpoints = 3;
-}
-
-message ToggleBreakpoint {
-    uint64 project_id = 1;
-    string path = 2;
-    Breakpoint breakpoint = 3;
-}
-
-enum DapThreadStatus {
-    Running = 0;
-    Stopped = 1;
-    Exited = 2;
-    Ended = 3;
-}
-
-enum VariablesArgumentsFilter {
-    Indexed = 0;
-    Named = 1;
-}
-
-message ValueFormat {
-    optional bool hex = 1;
-}
-
-message VariablesRequest {
-    uint64 project_id = 1;
-    uint64 client_id = 2;
-    uint64 variables_reference = 3;
-    optional VariablesArgumentsFilter filter = 4;
-    optional uint64 start = 5;
-    optional uint64 count = 6;
-    optional ValueFormat format = 7;
-}
-
-enum SteppingGranularity {
-    Statement = 0;
-    Line = 1;
-    Instruction = 2;
-}
-
-message DapLocationsRequest {
-    uint64 project_id = 1;
-    uint64 session_id = 2;
-    uint64 location_reference = 3;
-}
-
-message DapLocationsResponse {
-    DapSource source = 1;
-    uint64 line = 2;
-    optional uint64 column = 3;
-    optional uint64 end_line = 4;
-    optional uint64 end_column = 5;
-}
-
-enum DapEvaluateContext {
-    Repl = 0;
-    Watch = 1;
-    Hover = 2;
-    Clipboard = 3;
-    EvaluateVariables = 4;
-    EvaluateUnknown = 5;
-}
-
-message DapEvaluateRequest {
-    uint64 project_id = 1;
-    uint64 client_id = 2;
-    string expression = 3;
-    optional uint64 frame_id = 4;
-    optional DapEvaluateContext context = 5;
-}
-
-message DapEvaluateResponse {
-    string result = 1;
-    optional string evaluate_type = 2;
-    uint64 variable_reference = 3;
-    optional uint64 named_variables = 4;
-    optional uint64 indexed_variables = 5;
-    optional string memory_reference = 6;
-}
-
-
-message DapCompletionRequest {
-    uint64 project_id = 1;
-    uint64 client_id = 2;
-    string query = 3;
-    optional uint64 frame_id = 4;
-    optional uint64 line = 5;
-    uint64 column = 6;
-}
-
-enum DapCompletionItemType {
-    Method = 0;
-    Function = 1;
-    Constructor = 2;
-    Field = 3;
-    Variable = 4;
-    Class = 5;
-    Interface = 6;
-    Module = 7;
-    Property = 8;
-    Unit = 9;
-    Value = 10;
-    Enum = 11;
-    Keyword = 12;
-    Snippet = 13;
-    Text = 14;
-    Color = 15;
-    CompletionItemFile = 16;
-    Reference = 17;
-    Customcolor = 19;
-}
-
-message DapCompletionItem {
-    string label = 1;
-    optional string text = 2;
-    optional string sort_text = 3;
-    optional string detail = 4;
-    optional DapCompletionItemType typ = 5;
-    optional uint64 start = 6;
-    optional uint64 length = 7;
-    optional uint64 selection_start = 8;
-    optional uint64 selection_length = 9;
-}
-
-message DapCompletionResponse {
-    uint64 client_id = 1;
-    repeated DapCompletionItem completions = 2;
-}
-
-message DapScopesRequest {
-    uint64 project_id = 1;
-    uint64 client_id = 2;
-    uint64 stack_frame_id = 3;
-}
-
-message DapScopesResponse {
-    repeated DapScope scopes = 1;
-}
-
-message DapSetVariableValueRequest {
-    uint64 project_id = 1;
-    uint64 client_id = 2;
-    string name = 3;
-    string value = 4;
-    uint64 variables_reference = 5;
-}
-
-message DapSetVariableValueResponse {
-    uint64 client_id = 1;
-    string value = 2;
-    optional string variable_type = 3;
-    optional uint64 variables_reference = 4;
-    optional uint64 named_variables = 5;
-    optional uint64 indexed_variables = 6;
-    optional string memory_reference = 7;
-}
-
-message DapPauseRequest {
-    uint64 project_id = 1;
-    uint64 client_id = 2;
-    int64 thread_id = 3;
-}
-
-message DapDisconnectRequest {
-    uint64 project_id = 1;
-    uint64 client_id = 2;
-    optional bool restart = 3;
-    optional bool terminate_debuggee = 4;
-    optional bool suspend_debuggee = 5;
-}
-
-message DapTerminateThreadsRequest {
-    uint64 project_id = 1;
-    uint64 client_id = 2;
-    repeated int64 thread_ids = 3;
-}
-
-message DapThreadsRequest {
-    uint64 project_id = 1;
-    uint64 client_id = 2;
-}
-
-message DapThreadsResponse {
-    repeated DapThread threads = 1;
-}
-
-message DapTerminateRequest {
-    uint64 project_id = 1;
-    uint64 client_id = 2;
-    optional bool restart = 3;
-}
-
-message DapRestartRequest {
-    uint64 project_id = 1;
-    uint64 client_id = 2;
-    bytes raw_args = 3;
-}
-
-message DapRestartStackFrameRequest {
-    uint64 project_id = 1;
-    uint64 client_id = 2;
-    uint64 stack_frame_id = 3;
-}
-
-message ToggleIgnoreBreakpoints {
-    uint64 project_id = 1;
-    uint32 session_id = 2;
-}
-
-message IgnoreBreakpointState {
-    uint64 project_id = 1;
-    uint64 session_id = 2;
-    bool ignore = 3;
-}
-
-message DapNextRequest {
-    uint64 project_id = 1;
-    uint64 client_id = 2;
-    int64 thread_id = 3;
-    optional bool single_thread = 4;
-    optional SteppingGranularity granularity = 5;
-}
-
-message DapStepInRequest {
-    uint64 project_id = 1;
-    uint64 client_id = 2;
-    int64 thread_id = 3;
-    optional uint64 target_id = 4;
-    optional bool single_thread = 5;
-    optional SteppingGranularity granularity = 6;
-}
-
-message DapStepOutRequest {
-    uint64 project_id = 1;
-    uint64 client_id = 2;
-    int64 thread_id = 3;
-    optional bool single_thread = 4;
-    optional SteppingGranularity granularity = 5;
-}
-
-message DapStepBackRequest {
-    uint64 project_id = 1;
-    uint64 client_id = 2;
-    int64 thread_id = 3;
-    optional bool single_thread = 4;
-    optional SteppingGranularity granularity = 5;
-}
-
-message DapContinueRequest {
-    uint64 project_id = 1;
-    uint64 client_id = 2;
-    int64 thread_id = 3;
-    optional bool single_thread = 4;
-}
-
-message DapContinueResponse {
-    uint64 client_id = 1;
-    optional bool all_threads_continued = 2;
-}
-
-message DapModulesRequest {
-    uint64 project_id = 1;
-    uint64 client_id = 2;
-}
-
-message DapModulesResponse {
-    uint64 client_id = 1;
-    repeated DapModule modules = 2;
-}
-
-message DapLoadedSourcesRequest {
-    uint64 project_id = 1;
-    uint64 client_id = 2;
-}
-
-message DapLoadedSourcesResponse {
-    uint64 client_id = 1;
-    repeated DapSource sources = 2;
-}
-
-message DapStackTraceRequest {
-    uint64 project_id = 1;
-    uint64 client_id = 2;
-    int64 thread_id = 3;
-    optional uint64 start_frame = 4;
-    optional uint64 stack_trace_levels = 5;
-}
-
-message DapStackTraceResponse {
-    repeated DapStackFrame frames = 1;
-}
-
-message DapStackFrame {
-    uint64 id = 1;
-    string name = 2;
-    optional DapSource source = 3;
-    uint64 line = 4;
-    uint64 column = 5;
-    optional uint64 end_line = 6;
-    optional uint64 end_column = 7;
-    optional bool can_restart = 8;
-    optional string instruction_pointer_reference = 9;
-    optional DapModuleId module_id = 10;
-    optional DapStackPresentationHint presentation_hint = 11;
-}
-
-message DebuggerLoadedSourceList {
-    uint64 client_id = 1;
-    repeated DapSource sources = 2;
-}
-
-message DapVariables {
-    uint64 client_id = 1;
-    repeated DapVariable variables = 2;
-}
-
-// Remote Debugging: Dap Types
-message DapVariable {
-    string name = 1;
-    string value = 2;
-    optional string type = 3;
-    // optional DapVariablePresentationHint presentation_hint = 4;
-    optional string evaluate_name = 5;
-    uint64 variables_reference = 6;
-    optional uint64 named_variables = 7;
-    optional uint64 indexed_variables = 8;
-    optional string memory_reference = 9;
-}
-
-message DapThread {
-    int64 id = 1;
-    string name = 2;
-}
-
-message DapScope {
-    string name = 1;
-    optional DapScopePresentationHint presentation_hint = 2;
-    uint64 variables_reference = 3;
-    optional uint64 named_variables = 4;
-    optional uint64 indexed_variables = 5;
-    bool expensive = 6;
-    optional DapSource source = 7;
-    optional uint64 line = 8;
-    optional uint64 column = 9;
-    optional uint64 end_line = 10;
-    optional uint64 end_column = 11;
-}
-
-message DapSource {
-    optional string name = 1;
-    optional string path = 2;
-    optional uint64 source_reference = 3;
-    optional DapSourcePresentationHint presentation_hint = 4;
-    optional string origin = 5;
-    repeated DapSource sources = 6;
-    optional bytes adapter_data = 7;
-    repeated DapChecksum checksums = 8;
-}
-
-enum DapOutputCategory {
-    ConsoleOutput = 0;
-    Important = 1;
-    Stdout = 2;
-    Stderr = 3;
-    Unknown = 4;
-}
-
-enum DapOutputEventGroup {
-    Start = 0;
-    StartCollapsed = 1;
-    End = 2;
-}
-
-message DapOutputEvent {
-    string output = 1;
-    optional DapOutputCategory category = 2;
-    optional uint64 variables_reference = 3;
-    optional DapOutputEventGroup group = 4;
-    optional DapSource source = 5;
-    optional uint32 line = 6;
-    optional uint32 column = 7;
-}
-
-enum DapChecksumAlgorithm {
-    CHECKSUM_ALGORITHM_UNSPECIFIED = 0;
-    MD5 = 1;
-    SHA1 = 2;
-    SHA256 = 3;
-    TIMESTAMP = 4;
-}
-
-message DapChecksum {
-    DapChecksumAlgorithm algorithm = 1;
-    string checksum = 2;
-}
-
-enum DapScopePresentationHint {
-    Arguments = 0;
-    Locals = 1;
-    Registers = 2;
-    ReturnValue = 3;
-    ScopeUnknown = 4;
-}
-
-enum DapSourcePresentationHint {
-    SourceNormal = 0;
-    Emphasize = 1;
-    Deemphasize = 2;
-    SourceUnknown = 3;
-}
-
-enum DapStackPresentationHint {
-    StackNormal = 0;
-    Label = 1;
-    Subtle = 2;
-    StackUnknown = 3;
-}
-message DapModule {
-    DapModuleId id = 1;
-    string name = 2;
-    optional string path = 3;
-    optional bool is_optimized = 4;
-    optional bool is_user_code = 5;
-    optional string version = 6;
-    optional string symbol_status = 7;
-    optional string symbol_file_path = 8;
-    optional string date_time_stamp = 9;
-    optional string address_range = 10;
-}
-
-message DebugTaskDefinition {
-    string adapter = 1;
-    string label = 2;
-    string config = 3;
-    optional TcpHost tcp_connection = 4;
-}
-
-message TcpHost {
-    optional uint32 port = 1;
-    optional string host = 2;
-    optional uint64 timeout = 3;
-}
-
-message DebugLaunchRequest {
-    string program = 1;
-    optional string cwd = 2;
-    repeated string args = 3;
-    map<string, string> env = 4;
-}
-
-message DebugAttachRequest {
-    uint32 process_id = 1;
-}
-
-message DapModuleId {
-    oneof id {
-        uint32 number = 1;
-        string string = 2;
-    }
-}
-
-message GetDebugAdapterBinary {
-    uint64 project_id = 1;
-    uint64 session_id = 3;
-    DebugTaskDefinition definition = 2;
-    uint64 worktree_id = 4;
-}
-
-message DebugAdapterBinary {
-    optional string command = 1;
-    repeated string arguments = 2;
-    map<string, string> envs = 3;
-    optional string cwd = 4;
-    optional TcpHost connection = 5;
-    string configuration = 7;
-    LaunchType launch_type = 8;
-    enum LaunchType {
-        Attach = 0;
-        Launch = 1;
-    }
-}
-
-message RunDebugLocators {
-    uint64 project_id = 1;
-    SpawnInTerminal build_command = 2;
-    string locator = 3;
-}
-
-message DebugRequest {
-    oneof request {
-        DebugLaunchRequest debug_launch_request = 1;
-        DebugAttachRequest debug_attach_request = 2;
-    }
-}
-
-message DebugScenario {
-    string label = 1;
-    string adapter = 2;
-    reserved 3;
-    DebugRequest request = 4;
-    optional TcpHost connection = 5;
-    optional bool stop_on_entry = 6;
-    optional string configuration = 7;
-}
-
-message LogToDebugConsole {
-    uint64 project_id = 1;
-    uint64 session_id = 2;
-    string message = 3;
-}
-
-message GetProcesses {
-    uint64 project_id = 1;
-}
-
-message GetProcessesResponse {
-    repeated ProcessInfo processes = 1;
-}
-
-message ProcessInfo {
-    uint32 pid = 1;
-    string name = 2;
-    repeated string command = 3;
-}
diff --git a/crates/proto/proto/git.proto b/crates/proto/proto/git.proto
deleted file mode 100644
index d1e56f4f8c..0000000000
--- a/crates/proto/proto/git.proto
+++ /dev/null
@@ -1,589 +0,0 @@
-syntax = "proto3";
-package zed.messages;
-
-import "worktree.proto";
-import "buffer.proto";
-
-message GitBranchesResponse {
-    repeated Branch branches = 1;
-}
-
-message UpdateDiffBases {
-    uint64 project_id = 1;
-    uint64 buffer_id = 2;
-
-    enum Mode {
-        // No collaborator is using the unstaged diff.
-        HEAD_ONLY = 0;
-        // No collaborator is using the diff from HEAD.
-        INDEX_ONLY = 1;
-        // Both the unstaged and uncommitted diffs are demanded,
-        // and the contents of the index and HEAD are the same for this path.
-        INDEX_MATCHES_HEAD = 2;
-        // Both the unstaged and uncommitted diffs are demanded,
-        // and the contents of the index and HEAD differ for this path,
-        // where None means the path doesn't exist in that state of the repo.
-        INDEX_AND_HEAD = 3;
-    }
-
-    optional string staged_text = 3;
-    optional string committed_text = 4;
-    Mode mode = 5;
-}
-
-message OpenUnstagedDiff {
-    uint64 project_id = 1;
-    uint64 buffer_id = 2;
-}
-
-message OpenUnstagedDiffResponse {
-    optional string staged_text = 1;
-}
-
-message OpenUncommittedDiff {
-    uint64 project_id = 1;
-    uint64 buffer_id = 2;
-}
-
-message OpenUncommittedDiffResponse {
-    enum Mode {
-        INDEX_MATCHES_HEAD = 0;
-        INDEX_AND_HEAD = 1;
-    }
-    optional string staged_text = 1;
-    optional string committed_text = 2;
-    Mode mode = 3;
-}
-
-message SetIndexText {
-    uint64 project_id = 1;
-    reserved 2;
-    uint64 repository_id = 3;
-    string path = 4;
-    optional string text = 5;
-}
-
-message GetPermalinkToLine {
-    uint64 project_id = 1;
-    uint64 buffer_id = 2;
-    Range selection = 3;
-}
-
-message GetPermalinkToLineResponse {
-    string permalink = 1;
-}
-
-message Branch {
-    bool is_head = 1;
-    string ref_name = 2;
-    optional uint64 unix_timestamp = 3;
-    optional GitUpstream upstream = 4;
-    optional CommitSummary most_recent_commit = 5;
-}
-
-message GitUpstream {
-    string ref_name = 1;
-    optional UpstreamTracking tracking = 2;
-}
-
-message UpstreamTracking {
-    uint64 ahead = 1;
-    uint64 behind = 2;
-}
-
-message CommitSummary {
-    string sha = 1;
-    string subject = 2;
-    int64 commit_timestamp = 3;
-    string author_name = 4;
-}
-
-message GitBranches {
-    uint64 project_id = 1;
-    ProjectPath repository = 2;
-}
-
-
-message UpdateGitBranch {
-    uint64 project_id = 1;
-    string branch_name = 2;
-    ProjectPath repository = 3;
-}
-
-message UpdateRepository {
-    uint64 project_id = 1;
-    uint64 id = 2;
-    string abs_path = 3;
-    repeated uint64 entry_ids = 4;
-    optional Branch branch_summary = 5;
-    repeated StatusEntry updated_statuses = 6;
-    repeated string removed_statuses = 7;
-    repeated string current_merge_conflicts = 8;
-    uint64 scan_id = 9;
-    bool is_last_update = 10;
-    optional GitCommitDetails head_commit_details = 11;
-    optional string merge_message = 12;
-    repeated StashEntry stash_entries = 13;
-    optional string remote_upstream_url = 14;
-    optional string remote_origin_url = 15;
-}
-
-message RemoveRepository {
-    uint64 project_id = 1;
-    uint64 id = 2;
-}
-
-enum GitStatus {
-    Added = 0;
-    Modified = 1;
-    Conflict = 2;
-    Deleted = 3;
-    Updated = 4;
-    TypeChanged = 5;
-    Renamed = 6;
-    Copied = 7;
-    Unmodified = 8;
-}
-
-message GitFileStatus {
-    oneof variant {
-        Untracked untracked = 1;
-        Ignored ignored = 2;
-        Unmerged unmerged = 3;
-        Tracked tracked = 4;
-    }
-
-    message Untracked {}
-    message Ignored {}
-    message Unmerged {
-        GitStatus first_head = 1;
-        GitStatus second_head = 2;
-    }
-    message Tracked {
-        GitStatus index_status = 1;
-        GitStatus worktree_status = 2;
-    }
-}
-
-message GitGetBranches {
-    uint64 project_id = 1;
-    reserved 2;
-    uint64 repository_id = 3;
-}
-
-message GitCreateBranch {
-    uint64 project_id = 1;
-    reserved 2;
-    uint64 repository_id = 3;
-    string branch_name = 4;
-}
-
-message GitChangeBranch {
-    uint64 project_id = 1;
-    reserved 2;
-    uint64 repository_id = 3;
-    string branch_name = 4;
-}
-
-message GitRenameBranch {
-    uint64 project_id = 1;
-    uint64 repository_id = 2;
-    string branch = 3;
-    string new_name = 4;
-}
-
-message GitCreateRemote {
-    uint64 project_id = 1;
-    uint64 repository_id = 2;
-    string remote_name = 3;
-    string remote_url = 4;
-}
-
-message GitRemoveRemote {
-    uint64 project_id = 1;
-    uint64 repository_id = 2;
-    string remote_name = 3;
-}
-
-message GitDeleteBranch {
-    uint64 project_id = 1;
-    uint64 repository_id = 2;
-    string branch_name = 3;
-}
-
-message GitDiff {
-    uint64 project_id = 1;
-    reserved 2;
-    uint64 repository_id = 3;
-    DiffType diff_type = 4;
-
-    enum DiffType {
-        HEAD_TO_WORKTREE = 0;
-        HEAD_TO_INDEX = 1;
-    }
-}
-
-message GitDiffResponse {
-    string diff = 1;
-}
-
-message GitInit {
-    uint64 project_id = 1;
-    string abs_path = 2;
-    string fallback_branch_name = 3;
-}
-
-message GitClone {
-    uint64 project_id = 1;
-    string abs_path = 2;
-    string remote_repo = 3;
-}
-
-message GitCloneResponse {
-    bool success = 1;
-}
-
-message CheckForPushedCommits {
-    uint64 project_id = 1;
-    reserved 2;
-    uint64 repository_id = 3;
-}
-
-message CheckForPushedCommitsResponse {
-  repeated string pushed_to = 1;
-}
-
-message GitShow {
-    uint64 project_id = 1;
-    reserved 2;
-    uint64 repository_id = 3;
-    string commit = 4;
-}
-
-message GitCommitDetails {
-    string sha = 1;
-    string message = 2;
-    int64 commit_timestamp = 3;
-    string author_email = 4;
-    string author_name = 5;
-}
-
-message LoadCommitDiff {
-    uint64 project_id = 1;
-    reserved 2;
-    uint64 repository_id = 3;
-    string commit = 4;
-}
-
-message LoadCommitDiffResponse {
-    repeated CommitFile files = 1;
-}
-
-message CommitFile {
-    string path = 1;
-    optional string old_text = 2;
-    optional string new_text = 3;
-}
-
-message GitReset {
-    uint64 project_id = 1;
-    reserved 2;
-    uint64 repository_id = 3;
-    string commit = 4;
-    ResetMode mode = 5;
-    enum ResetMode {
-        SOFT = 0;
-        MIXED = 1;
-    }
-}
-
-message GitCheckoutFiles {
-    uint64 project_id = 1;
-    reserved 2;
-    uint64 repository_id = 3;
-    string commit = 4;
-    repeated string paths = 5;
-}
-
-message GitFileHistory {
-    uint64 project_id = 1;
-    reserved 2;
-    uint64 repository_id = 3;
-    string path = 4;
-    uint64 skip = 5;
-    optional uint64 limit = 6;
-}
-
-message GitFileHistoryResponse {
-    repeated FileHistoryEntry entries = 1;
-    string path = 2;
-}
-
-message FileHistoryEntry {
-    string sha = 1;
-    string subject = 2;
-    string message = 3;
-    int64 commit_timestamp = 4;
-    string author_name = 5;
-    string author_email = 6;
-}
-
-// Move to `git.proto` once collab's min version is >=0.171.0.
-message StatusEntry {
-    string repo_path = 1;
-    // Can be removed once collab's min version is >=0.171.0.
-    GitStatus simple_status = 2;
-    GitFileStatus status = 3;
-}
-
-message StashEntry {
-    bytes oid = 1;
-    string message = 2;
-    optional string branch = 3;
-    uint64 index = 4;
-    int64 timestamp = 5;
-}
-
-message Stage {
-    uint64 project_id = 1;
-    reserved 2;
-    uint64 repository_id = 3;
-    repeated string paths = 4;
-}
-
-message Unstage {
-    uint64 project_id = 1;
-    reserved 2;
-    uint64 repository_id = 3;
-    repeated string paths = 4;
-}
-
-message Stash {
-    uint64 project_id = 1;
-    uint64 repository_id = 2;
-    repeated string paths = 3;
-}
-
-message StashPop {
-    uint64 project_id = 1;
-    uint64 repository_id = 2;
-    optional uint64 stash_index = 3;
-}
-
-message StashApply {
-    uint64 project_id = 1;
-    uint64 repository_id = 2;
-    optional uint64 stash_index = 3;
-}
-
-message StashDrop {
-    uint64 project_id = 1;
-    uint64 repository_id = 2;
-    optional uint64 stash_index = 3;
-}
-
-message Commit {
-    uint64 project_id = 1;
-    reserved 2;
-    uint64 repository_id = 3;
-    optional string name = 4;
-    optional string email = 5;
-    string message = 6;
-    optional CommitOptions options = 7;
-    reserved 8;
-    uint64 askpass_id = 9;
-
-    message CommitOptions {
-        bool amend = 1;
-        bool signoff = 2;
-    }
-}
-
-message OpenCommitMessageBuffer {
-    uint64 project_id = 1;
-    reserved 2;
-    uint64 repository_id = 3;
-}
-
-message Push {
-    uint64 project_id = 1;
-    reserved 2;
-    uint64 repository_id = 3;
-    string remote_name = 4;
-    string branch_name = 5;
-    optional PushOptions options = 6;
-    uint64 askpass_id = 7;
-
-    enum PushOptions {
-        SET_UPSTREAM = 0;
-        FORCE = 1;
-    }
-}
-
-message Fetch {
-    uint64 project_id = 1;
-    reserved 2;
-    uint64 repository_id = 3;
-    uint64 askpass_id = 4;
-    optional string remote = 5;
-}
-
-message GetRemotes {
-    uint64 project_id = 1;
-    reserved 2;
-    uint64 repository_id = 3;
-    optional string branch_name = 4;
-    bool is_push = 5;
-}
-
-message GetRemotesResponse {
-    repeated Remote remotes = 1;
-
-    message Remote {
-        string name = 1;
-    }
-}
-
-message Pull {
-    uint64 project_id = 1;
-    reserved 2;
-    uint64 repository_id = 3;
-    string remote_name = 4;
-    optional string branch_name = 5;
-    uint64 askpass_id = 6;
-    bool rebase = 7;
-}
-
-message RemoteMessageResponse {
-    string stdout = 1;
-    string stderr = 2;
-}
-
-message BlameBuffer {
-    uint64 project_id = 1;
-    uint64 buffer_id = 2;
-    repeated VectorClockEntry version = 3;
-}
-
-message BlameEntry {
-    bytes sha = 1;
-
-    uint32 start_line = 2;
-    uint32 end_line = 3;
-    uint32 original_line_number = 4;
-
-    optional string author = 5;
-    optional string author_mail = 6;
-    optional int64 author_time = 7;
-    optional string author_tz = 8;
-
-    optional string committer = 9;
-    optional string committer_mail = 10;
-    optional int64 committer_time = 11;
-    optional string committer_tz = 12;
-
-    optional string summary = 13;
-    optional string previous = 14;
-
-    string filename = 15;
-}
-
-message CommitMessage {
-    bytes oid = 1;
-    string message = 2;
-}
-
-message CommitPermalink {
-    bytes oid = 1;
-    string permalink = 2;
-}
-
-message BlameBufferResponse {
-    message BlameResponse {
-        repeated BlameEntry entries = 1;
-        repeated CommitMessage messages = 2;
-        reserved 3;
-        reserved 4;
-    }
-
-    optional BlameResponse blame_response = 5;
-
-    reserved 1 to 4;
-}
-
-message GetDefaultBranch {
-    uint64 project_id = 1;
-    uint64 repository_id = 2;
-}
-
-message GetDefaultBranchResponse {
-    optional string branch = 1;
-}
-
-message GetTreeDiff {
-    uint64 project_id = 1;
-    uint64 repository_id = 2;
-    bool is_merge = 3;
-    string base = 4;
-    string head = 5;
-}
-
-message GetTreeDiffResponse {
-    repeated TreeDiffStatus entries = 1;
-}
-
-message TreeDiffStatus {
-    enum Status {
-        ADDED = 0;
-        MODIFIED = 1;
-        DELETED = 2;
-    }
-
-    Status status = 1;
-    string path = 2;
-    optional string oid = 3;
-}
-
-message GetBlobContent {
-    uint64 project_id = 1;
-    uint64 repository_id = 2;
-    string oid =3;
-}
-
-message GetBlobContentResponse {
-    string content = 1;
-}
-
-message GitGetWorktrees {
-    uint64 project_id = 1;
-    uint64 repository_id = 2;
-}
-
-message GitWorktreesResponse {
-    repeated Worktree worktrees = 1;
-}
-
-message Worktree {
-    string path = 1;
-    string ref_name = 2;
-    string sha = 3;
-}
-
-message GitCreateWorktree {
-    uint64 project_id = 1;
-    uint64 repository_id = 2;
-    string name = 3;
-    string directory = 4;
-    optional string commit = 5;
-}
-
-message RunGitHook {
-    enum GitHook {
-        PRE_COMMIT = 0;
-        reserved 1;
-    }
-
-    uint64 project_id = 1;
-    uint64 repository_id = 2;
-    GitHook hook = 3;
-}
diff --git a/crates/proto/proto/image.proto b/crates/proto/proto/image.proto
deleted file mode 100644
index e3232e6847..0000000000
--- a/crates/proto/proto/image.proto
+++ /dev/null
@@ -1,36 +0,0 @@
-syntax = "proto3";
-package zed.messages;
-
-import "core.proto";
-import "worktree.proto";
-
-message OpenImageByPath {
-    uint64 project_id = 1;
-    uint64 worktree_id = 2;
-    string path = 3;
-}
-
-message OpenImageResponse {
-    uint64 image_id = 1;
-}
-
-message CreateImageForPeer {
-    uint64 project_id = 1;
-    PeerId peer_id = 2;
-    oneof variant {
-        ImageState state = 3;
-        ImageChunk chunk = 4;
-    }
-}
-
-message ImageState {
-    uint64 id = 1;
-    optional File file = 2;
-    uint64 content_size = 3;
-    string format = 4; // e.g., "png", "jpeg", "webp", etc.
-}
-
-message ImageChunk {
-    uint64 image_id = 1;
-    bytes data = 2;
-}
diff --git a/crates/proto/proto/lsp.proto b/crates/proto/proto/lsp.proto
deleted file mode 100644
index 7717cacdef..0000000000
--- a/crates/proto/proto/lsp.proto
+++ /dev/null
@@ -1,971 +0,0 @@
-syntax = "proto3";
-package zed.messages;
-
-import "core.proto";
-import "worktree.proto";
-import "buffer.proto";
-
-message GetDefinition {
-     uint64 project_id = 1;
-     uint64 buffer_id = 2;
-     Anchor position = 3;
-     repeated VectorClockEntry version = 4;
-}
-
-message GetDefinitionResponse {
-    repeated LocationLink links = 1;
-}
-
-message GetDeclaration {
-     uint64 project_id = 1;
-     uint64 buffer_id = 2;
-     Anchor position = 3;
-     repeated VectorClockEntry version = 4;
-}
-
-message GetDeclarationResponse {
-    repeated LocationLink links = 1;
-}
-
-message GetTypeDefinition {
-     uint64 project_id = 1;
-     uint64 buffer_id = 2;
-     Anchor position = 3;
-     repeated VectorClockEntry version = 4;
- }
-
-message GetTypeDefinitionResponse {
-    repeated LocationLink links = 1;
-}
-message GetImplementation {
-     uint64 project_id = 1;
-     uint64 buffer_id = 2;
-     Anchor position = 3;
-     repeated VectorClockEntry version = 4;
- }
-
-message GetImplementationResponse {
-    repeated LocationLink links = 1;
-}
-
-message GetReferences {
-     uint64 project_id = 1;
-     uint64 buffer_id = 2;
-     Anchor position = 3;
-     repeated VectorClockEntry version = 4;
- }
-
-message GetReferencesResponse {
-    repeated Location locations = 1;
-}
-
-message GetDocumentHighlights {
-     uint64 project_id = 1;
-     uint64 buffer_id = 2;
-     Anchor position = 3;
-     repeated VectorClockEntry version = 4;
- }
-
-message GetDocumentHighlightsResponse {
-    repeated DocumentHighlight highlights = 1;
-}
-
-message LocationLink {
-    optional Location origin = 1;
-    Location target = 2;
-}
-
-message DocumentHighlight {
-    Kind kind = 1;
-    Anchor start = 2;
-    Anchor end = 3;
-
-    enum Kind {
-        Text = 0;
-        Read = 1;
-        Write = 2;
-    }
-}
-
-message GetProjectSymbols {
-    uint64 project_id = 1;
-    string query = 2;
-}
-
-message GetProjectSymbolsResponse {
-    repeated Symbol symbols = 4;
-}
-
-message Symbol {
-    uint64 source_worktree_id = 1;
-    uint64 worktree_id = 2;
-    string language_server_name = 3;
-    string name = 4;
-    int32 kind = 5;
-    string path = 6;
-    // Cannot use generate anchors for unopened files,
-    // so we are forced to use point coords instead
-    PointUtf16 start = 7;
-    PointUtf16 end = 8;
-    bytes signature = 9;
-    uint64 language_server_id = 10;
-}
-
-message GetDocumentSymbols {
-    uint64 project_id = 1;
-    uint64 buffer_id = 2;
-    repeated VectorClockEntry version = 3;
-}
-
-message GetDocumentSymbolsResponse {
-    repeated DocumentSymbol symbols = 1;
-}
-
-message DocumentSymbol {
-    string name = 1;
-    int32 kind = 2;
-    // Cannot use generate anchors for unopened files,
-    // so we are forced to use point coords instead
-    PointUtf16 start = 3;
-    PointUtf16 end = 4;
-    PointUtf16 selection_start = 5;
-    PointUtf16 selection_end = 6;
-    repeated DocumentSymbol children = 7;
-}
-
-message InlayHints {
-    uint64 project_id = 1;
-    uint64 buffer_id = 2;
-    Anchor start = 3;
-    Anchor end = 4;
-    repeated VectorClockEntry version = 5;
-}
-
-message InlayHintsResponse {
-    repeated InlayHint hints = 1;
-    repeated VectorClockEntry version = 2;
-}
-
-message PointUtf16 {
-    uint32 row = 1;
-    uint32 column = 2;
-}
-
-message LspExtExpandMacro {
-    uint64 project_id = 1;
-    uint64 buffer_id = 2;
-    Anchor position = 3;
-}
-
-message LspExtExpandMacroResponse {
-    string name = 1;
-    string expansion = 2;
-}
-
-message LspExtOpenDocs {
-    uint64 project_id = 1;
-    uint64 buffer_id = 2;
-    Anchor position = 3;
-}
-
-message LspExtOpenDocsResponse {
-    optional string web = 1;
-    optional string local = 2;
-}
-
-message LspExtSwitchSourceHeader {
-    uint64 project_id = 1;
-    uint64 buffer_id = 2;
-}
-
-message LspExtSwitchSourceHeaderResponse {
-    string target_file = 1;
-}
-
-message LspExtGoToParentModule {
-    uint64 project_id = 1;
-    uint64 buffer_id = 2;
-    Anchor position = 3;
-}
-
-message LspExtGoToParentModuleResponse {
-    repeated LocationLink links = 1;
-}
-
-message GetCompletionsResponse {
-    repeated Completion completions = 1;
-    repeated VectorClockEntry version = 2;
-    // `!is_complete`, inverted for a default of `is_complete = true`
-    bool can_reuse = 3;
-}
-
-message ApplyCompletionAdditionalEdits {
-    uint64 project_id = 1;
-    uint64 buffer_id = 2;
-    Completion completion = 3;
-}
-
-message ApplyCompletionAdditionalEditsResponse {
-    Transaction transaction = 1;
-}
-
-message Completion {
-    Anchor old_replace_start = 1;
-    Anchor old_replace_end = 2;
-    string new_text = 3;
-    uint64 server_id = 4;
-    bytes lsp_completion = 5;
-    bool resolved = 6;
-    Source source = 7;
-    optional bytes lsp_defaults = 8;
-    optional Anchor buffer_word_start = 9;
-    optional Anchor buffer_word_end = 10;
-    Anchor old_insert_start = 11;
-    Anchor old_insert_end = 12;
-    optional string sort_text = 13;
-
-    enum Source {
-        Lsp = 0;
-        Custom = 1;
-        BufferWord = 2;
-        Dap = 3;
-    }
-}
-
-message GetCodeActions {
-    uint64 project_id = 1;
-    uint64 buffer_id = 2;
-    Anchor start = 3;
-    Anchor end = 4;
-    repeated VectorClockEntry version = 5;
-}
-
-message GetCodeActionsResponse {
-    repeated CodeAction actions = 1;
-    repeated VectorClockEntry version = 2;
-}
-
-message GetSignatureHelp {
-    uint64 project_id = 1;
-    uint64 buffer_id = 2;
-    Anchor position = 3;
-    repeated VectorClockEntry version = 4;
-}
-
-message GetSignatureHelpResponse {
-    optional SignatureHelp signature_help = 1;
-}
-
-message SignatureHelp {
-    repeated SignatureInformation signatures = 1;
-    optional uint32 active_signature = 2;
-    optional uint32 active_parameter = 3;
-}
-
-message SignatureInformation {
-    string label = 1;
-    optional Documentation documentation = 2;
-    repeated ParameterInformation parameters = 3;
-    optional uint32 active_parameter = 4;
-}
-
-message Documentation {
-    oneof content {
-        string value = 1;
-        MarkupContent markup_content = 2;
-    }
-}
-
-enum MarkupKind {
-    PlainText = 0;
-    Markdown = 1;
-}
-
-message ParameterInformation {
-    oneof label {
-        string simple = 1;
-        LabelOffsets label_offsets = 2;
-    }
-    optional Documentation documentation = 3;
-}
-
-message LabelOffsets {
-    uint32 start = 1;
-    uint32 end = 2;
-}
-
-message GetHover {
-    uint64 project_id = 1;
-    uint64 buffer_id = 2;
-    Anchor position = 3;
-    repeated VectorClockEntry version = 5;
-}
-
-message GetHoverResponse {
-    optional Anchor start = 1;
-    optional Anchor end = 2;
-    repeated HoverBlock contents = 3;
-}
-
-message HoverBlock {
-    string text = 1;
-    optional string language = 2;
-    bool is_markdown = 3;
-}
-
-message ApplyCodeAction {
-    uint64 project_id = 1;
-    uint64 buffer_id = 2;
-    CodeAction action = 3;
-}
-
-message ApplyCodeActionResponse {
-    ProjectTransaction transaction = 1;
-}
-
-message PrepareRename {
-    uint64 project_id = 1;
-    uint64 buffer_id = 2;
-    Anchor position = 3;
-    repeated VectorClockEntry version = 4;
-}
-
-message PrepareRenameResponse {
-    bool can_rename = 1;
-    Anchor start = 2;
-    Anchor end = 3;
-    repeated VectorClockEntry version = 4;
-    bool only_unprepared_rename_supported = 5;
-}
-
-message PerformRename {
-    uint64 project_id = 1;
-    uint64 buffer_id = 2;
-    Anchor position = 3;
-    string new_name = 4;
-    repeated VectorClockEntry version = 5;
-}
-
-message OnTypeFormatting {
-    uint64 project_id = 1;
-    uint64 buffer_id = 2;
-    Anchor position = 3;
-    string trigger = 4;
-    repeated VectorClockEntry version = 5;
-}
-
-message OnTypeFormattingResponse {
-    Transaction transaction = 1;
-}
-
-
-message LinkedEditingRange {
-    uint64 project_id = 1;
-    uint64 buffer_id = 2;
-    Anchor position = 3;
-    repeated VectorClockEntry version = 4;
-}
-
-message LinkedEditingRangeResponse {
-    repeated AnchorRange items = 1;
-    repeated VectorClockEntry version = 4;
-}
-
-message InlayHint {
-    Anchor position = 1;
-    InlayHintLabel label = 2;
-    optional string kind = 3;
-    bool padding_left = 4;
-    bool padding_right = 5;
-    InlayHintTooltip tooltip = 6;
-    ResolveState resolve_state = 7;
-}
-
-message InlayHintLabel {
-    oneof label {
-        string value = 1;
-        InlayHintLabelParts label_parts = 2;
-    }
-}
-
-message InlayHintLabelParts {
-    repeated InlayHintLabelPart parts = 1;
-}
-
-message InlayHintLabelPart {
-    string value = 1;
-    InlayHintLabelPartTooltip tooltip = 2;
-    optional string location_url = 3;
-    PointUtf16 location_range_start = 4;
-    PointUtf16 location_range_end = 5;
-    optional uint64 language_server_id = 6;
-}
-
-message InlayHintTooltip {
-    oneof content {
-        string value = 1;
-        MarkupContent markup_content = 2;
-    }
-}
-
-message InlayHintLabelPartTooltip {
-    oneof content {
-        string value = 1;
-        MarkupContent markup_content = 2;
-    }
-}
-
-message ResolveState {
-    State state = 1;
-    LspResolveState lsp_resolve_state = 2;
-
-    enum State {
-        Resolved = 0;
-        CanResolve = 1;
-        Resolving = 2;
-    }
-
-    message LspResolveState {
-        optional string value = 1;
-        uint64 server_id = 2;
-    }
-}
-
-// This type is used to resolve more than just
-// the documentation, but for backwards-compatibility
-// reasons we can't rename the type.
-message ResolveCompletionDocumentation {
-    uint64 project_id = 1;
-    uint64 language_server_id = 2;
-    bytes lsp_completion = 3;
-    uint64 buffer_id = 4;
-}
-
-message ResolveCompletionDocumentationResponse {
-    string documentation = 1;
-    bool documentation_is_markdown = 2;
-    Anchor old_replace_start = 3;
-    Anchor old_replace_end = 4;
-    string new_text = 5;
-    bytes lsp_completion = 6;
-    Anchor old_insert_start = 7;
-    Anchor old_insert_end = 8;
-}
-
-message ResolveInlayHint {
-    uint64 project_id = 1;
-    uint64 buffer_id = 2;
-    uint64 language_server_id = 3;
-    InlayHint hint = 4;
-}
-
-message ResolveInlayHintResponse {
-    InlayHint hint = 1;
-}
-
-message RefreshInlayHints {
-    uint64 project_id = 1;
-    uint64 server_id = 2;
-    optional uint64 request_id = 3;
-}
-
-message CodeLens {
-    bytes lsp_lens = 1;
-}
-
-message GetCodeLens {
-    uint64 project_id = 1;
-    uint64 buffer_id = 2;
-    repeated VectorClockEntry version = 3;
-}
-
-message GetCodeLensResponse {
-    repeated CodeAction lens_actions = 1;
-    repeated VectorClockEntry version = 2;
-}
-
-message RefreshCodeLens {
-    uint64 project_id = 1;
-}
-
-message MarkupContent {
-    bool is_markdown = 1;
-    string value = 2;
-}
-
-message PerformRenameResponse {
-    ProjectTransaction transaction = 2;
-}
-
-message CodeAction {
-    uint64 server_id = 1;
-    Anchor start = 2;
-    Anchor end = 3;
-    bytes lsp_action = 4;
-    Kind kind = 5;
-    bool resolved = 6;
-    enum Kind {
-        Action = 0;
-        Command = 1;
-        CodeLens = 2;
-    }
-}
-
-message LanguageServer {
-    uint64 id = 1;
-    string name = 2;
-    optional uint64 worktree_id = 3;
-}
-
-message StartLanguageServer {
-    uint64 project_id = 1;
-    LanguageServer server = 2;
-    string capabilities = 3;
-}
-
-message UpdateDiagnosticSummary {
-    uint64 project_id = 1;
-    uint64 worktree_id = 2;
-    DiagnosticSummary summary = 3;
-    repeated DiagnosticSummary more_summaries = 4;
-}
-
-message DiagnosticSummary {
-    string path = 1;
-    uint64 language_server_id = 2;
-    uint32 error_count = 3;
-    uint32 warning_count = 4;
-}
-
-message UpdateLanguageServer {
-    uint64 project_id = 1;
-    uint64 language_server_id = 2;
-    optional string server_name = 8;
-    oneof variant {
-        LspWorkStart work_start = 3;
-        LspWorkProgress work_progress = 4;
-        LspWorkEnd work_end = 5;
-        LspDiskBasedDiagnosticsUpdating disk_based_diagnostics_updating = 6;
-        LspDiskBasedDiagnosticsUpdated disk_based_diagnostics_updated = 7;
-        StatusUpdate status_update = 9;
-        RegisteredForBuffer registered_for_buffer = 10;
-        ServerMetadataUpdated metadata_updated = 11;
-    }
-}
-
-message ProgressToken {
-    oneof value {
-        int32 number = 1;
-        string string = 2;
-    }
-}
-
-message LspWorkStart {
-    reserved 1;
-    optional string title = 4;
-    optional string message = 2;
-    optional uint32 percentage = 3;
-    optional bool is_cancellable = 5;
-    ProgressToken token = 6;
-}
-
-message LspWorkProgress {
-    reserved 1;
-    optional string message = 2;
-    optional uint32 percentage = 3;
-    optional bool is_cancellable = 4;
-    ProgressToken token = 5;
-}
-
-message LspWorkEnd {
-    reserved 1;
-    ProgressToken token = 2;
-}
-
-message LspDiskBasedDiagnosticsUpdating {}
-
-message LspDiskBasedDiagnosticsUpdated {}
-
-message StatusUpdate {
-    optional string message = 1;
-    oneof status {
-        ServerBinaryStatus binary = 2;
-        ServerHealth health = 3;
-    }
-}
-
-enum ServerHealth {
-    OK = 0;
-    WARNING = 1;
-    ERROR = 2;
-}
-
-enum ServerBinaryStatus {
-    NONE = 0;
-    CHECKING_FOR_UPDATE = 1;
-    DOWNLOADING = 2;
-    STARTING = 3;
-    STOPPING = 4;
-    STOPPED = 5;
-    FAILED = 6;
-}
-
-message RegisteredForBuffer {
-    string buffer_abs_path = 1;
-    uint64 buffer_id = 2;
-}
-
-message LanguageServerBinaryInfo {
-    string path = 1;
-    repeated string arguments = 2;
-}
-
-message ServerMetadataUpdated {
-    optional string capabilities = 1;
-    optional LanguageServerBinaryInfo binary = 2;
-    optional string configuration = 3;
-    repeated string workspace_folders = 4;
-}
-
-message LanguageServerLog {
-    uint64 project_id = 1;
-    uint64 language_server_id = 2;
-    string message = 3;
-    oneof log_type {
-        LogMessage log = 4;
-        TraceMessage trace = 5;
-        RpcMessage rpc = 6;
-    }
-}
-
-message LogMessage {
-    LogLevel level = 1;
-
-    enum LogLevel {
-        LOG = 0;
-        INFO = 1;
-        WARNING = 2;
-        ERROR = 3;
-    }
-}
-
-message TraceMessage {
-    optional string verbose_info = 1;
-}
-
-message RpcMessage {
-    Kind kind = 1;
-
-    enum Kind {
-        RECEIVED = 0;
-        SENT = 1;
-    }
-}
-
-message LspLogTrace {
-    optional string message = 1;
-}
-
-message ApplyCodeActionKind {
-    uint64 project_id = 1;
-    string kind = 2;
-    repeated uint64 buffer_ids = 3;
-}
-
-message ApplyCodeActionKindResponse {
-    ProjectTransaction transaction = 1;
-}
-
-message RegisterBufferWithLanguageServers {
-    uint64 project_id = 1;
-    uint64 buffer_id = 2;
-    repeated LanguageServerSelector only_servers = 3;
-}
-
-enum FormatTrigger {
-    Save = 0;
-    Manual = 1;
-}
-
-message OpenBufferForSymbol {
-    uint64 project_id = 1;
-    Symbol symbol = 2;
-}
-
-message OpenBufferForSymbolResponse {
-    uint64 buffer_id = 1;
-}
-
-message FormatBuffers {
-    uint64 project_id = 1;
-    FormatTrigger trigger = 2;
-    repeated uint64 buffer_ids = 3;
-}
-
-message FormatBuffersResponse {
-    ProjectTransaction transaction = 1;
-}
-
-message GetCompletions {
-    uint64 project_id = 1;
-    uint64 buffer_id = 2;
-    Anchor position = 3;
-    repeated VectorClockEntry version = 4;
-    optional uint64 server_id = 5;
-}
-
-message CancelLanguageServerWork {
-    uint64 project_id = 1;
-
-    oneof work {
-        Buffers buffers = 2;
-        LanguageServerWork language_server_work = 3;
-    }
-
-    message Buffers {
-        repeated uint64 buffer_ids = 2;
-    }
-
-    message LanguageServerWork {
-        uint64 language_server_id = 1;
-        reserved 2;
-        optional ProgressToken token = 3;
-    }
-}
-
-message LanguageServerPromptRequest {
-    uint64 project_id = 1;
-
-    oneof level {
-        Info info = 2;
-        Warning warning = 3;
-        Critical critical = 4;
-    }
-
-    message Info {}
-    message Warning {}
-    message Critical {}
-
-    string message = 5;
-    repeated string actions = 6;
-    string lsp_name = 7;
-}
-
-message LanguageServerPromptResponse {
-    optional uint64 action_response = 1;
-}
-
-message GetDocumentColor {
-    uint64 project_id = 1;
-    uint64 buffer_id = 2;
-    repeated VectorClockEntry version = 3;
-
-}
-
-message GetDocumentColorResponse {
-    repeated ColorInformation colors = 1;
-    repeated VectorClockEntry version = 2;
-
-}
-
-message ColorInformation {
-    PointUtf16 lsp_range_start = 1;
-    PointUtf16 lsp_range_end = 2;
-    float red = 3;
-    float green = 4;
-    float blue = 5;
-    float alpha = 6;
-}
-
-message GetColorPresentation {
-    uint64 project_id = 1;
-    uint64 buffer_id = 2;
-    ColorInformation color = 3;
-    uint64 server_id = 4;
-}
-
-message GetColorPresentationResponse {
-    repeated ColorPresentation presentations = 1;
-}
-
-message ColorPresentation {
-    string label = 1;
-    optional TextEdit text_edit = 2;
-    repeated TextEdit additional_text_edits = 3;
-}
-
-message TextEdit {
-    string new_text = 1;
-    PointUtf16 lsp_range_start = 2;
-    PointUtf16 lsp_range_end = 3;
-}
-
-message LspQuery {
-    uint64 project_id = 1;
-    uint64 lsp_request_id = 2;
-    optional uint64 server_id = 15;
-    oneof request {
-        GetReferences get_references = 3;
-        GetDocumentColor get_document_color = 4;
-        GetHover get_hover = 5;
-        GetCodeActions get_code_actions = 6;
-        GetSignatureHelp get_signature_help = 7;
-        GetCodeLens get_code_lens = 8;
-        GetDocumentDiagnostics get_document_diagnostics = 9;
-        GetDefinition get_definition = 10;
-        GetDeclaration get_declaration = 11;
-        GetTypeDefinition get_type_definition = 12;
-        GetImplementation get_implementation = 13;
-        InlayHints inlay_hints = 14;
-    }
-}
-
-message LspQueryResponse {
-    uint64 project_id = 1;
-    uint64 lsp_request_id = 2;
-    repeated LspResponse responses = 3;
-}
-
-message LspResponse {
-    oneof response {
-        GetHoverResponse get_hover_response = 1;
-        GetCodeActionsResponse get_code_actions_response = 2;
-        GetSignatureHelpResponse get_signature_help_response = 3;
-        GetCodeLensResponse get_code_lens_response = 4;
-        GetDocumentDiagnosticsResponse get_document_diagnostics_response = 5;
-        GetDocumentColorResponse get_document_color_response = 6;
-        GetDefinitionResponse get_definition_response = 8;
-        GetDeclarationResponse get_declaration_response = 9;
-        GetTypeDefinitionResponse get_type_definition_response = 10;
-        GetImplementationResponse get_implementation_response = 11;
-        GetReferencesResponse get_references_response = 12;
-        InlayHintsResponse inlay_hints_response = 13;
-    }
-    uint64 server_id = 7;
-}
-
-message AllLanguageServers {}
-
-message LanguageServerSelector {
-    oneof selector {
-        uint64 server_id = 1;
-        string name = 2;
-    }
-}
-
-message RestartLanguageServers {
-    uint64 project_id = 1;
-    repeated uint64 buffer_ids = 2;
-    repeated LanguageServerSelector only_servers = 3;
-    bool all = 4;
-}
-
-message StopLanguageServers {
-    uint64 project_id = 1;
-    repeated uint64 buffer_ids = 2;
-    repeated LanguageServerSelector also_servers = 3;
-    bool all = 4;
-}
-
-message LspExtRunnables {
-    uint64 project_id = 1;
-    uint64 buffer_id = 2;
-    optional Anchor position = 3;
-}
-
-message LspExtRunnablesResponse {
-    repeated LspRunnable runnables = 1;
-}
-
-message LspRunnable {
-    bytes task_template = 1;
-    optional LocationLink location = 2;
-}
-
-message LspExtCancelFlycheck {
-    uint64 project_id = 1;
-    uint64 language_server_id = 2;
-}
-
-message LspExtRunFlycheck {
-    uint64 project_id = 1;
-    optional uint64 buffer_id = 2;
-    uint64 language_server_id = 3;
-    bool current_file_only = 4;
-}
-
-message LspExtClearFlycheck {
-    uint64 project_id = 1;
-    uint64 language_server_id = 2;
-}
-
-message LspDiagnosticRelatedInformation {
-    optional string location_url = 1;
-    PointUtf16 location_range_start = 2;
-    PointUtf16 location_range_end = 3;
-    string message = 4;
-}
-
-enum LspDiagnosticTag {
-    None = 0;
-    Unnecessary = 1;
-    Deprecated = 2;
-}
-
-message LspDiagnostic {
-    PointUtf16 start = 1;
-    PointUtf16 end = 2;
-    Severity severity = 3;
-    optional string code = 4;
-    optional string code_description = 5;
-    optional string source = 6;
-    string message = 7;
-    repeated LspDiagnosticRelatedInformation related_information = 8;
-    repeated LspDiagnosticTag tags = 9;
-    optional string data = 10;
-
-    enum Severity {
-        None = 0;
-        Error = 1;
-        Warning = 2;
-        Information = 3;
-        Hint = 4;
-    }
-}
-
-message GetDocumentDiagnostics {
-    uint64 project_id = 1;
-    uint64 buffer_id = 2;
-    repeated VectorClockEntry version = 3;
-}
-
-message GetDocumentDiagnosticsResponse {
-    repeated PulledDiagnostics pulled_diagnostics = 1;
-}
-
-message PulledDiagnostics {
-    uint64 server_id = 1;
-    string uri = 2;
-    optional string result_id = 3;
-    bool changed = 4;
-    repeated LspDiagnostic diagnostics = 5;
-    optional string registration_id = 6;
-}
-
-message PullWorkspaceDiagnostics {
-    uint64 project_id = 1;
-    uint64 server_id = 2;
-}
-
-message ToggleLspLogs {
-    uint64 project_id = 1;
-    LogType log_type = 2;
-    uint64 server_id = 3;
-    bool enabled = 4;
-
-    enum LogType {
-        LOG = 0;
-        TRACE = 1;
-        RPC = 2;
-    }
-}
diff --git a/crates/proto/proto/notification.proto b/crates/proto/proto/notification.proto
deleted file mode 100644
index ebd3d7fe44..0000000000
--- a/crates/proto/proto/notification.proto
+++ /dev/null
@@ -1,37 +0,0 @@
-syntax = "proto3";
-package zed.messages;
-
-message GetNotifications {
-    optional uint64 before_id = 1;
-}
-
-message AddNotification {
-    Notification notification = 1;
-}
-
-message GetNotificationsResponse {
-    repeated Notification notifications = 1;
-    bool done = 2;
-}
-
-message DeleteNotification {
-    uint64 notification_id = 1;
-}
-
-message UpdateNotification {
-    Notification notification = 1;
-}
-
-message MarkNotificationRead {
-    uint64 notification_id = 1;
-}
-
-message Notification {
-    uint64 id = 1;
-    uint64 timestamp = 2;
-    string kind = 3;
-    optional uint64 entity_id = 4;
-    string content = 5;
-    bool is_read = 6;
-    optional bool response = 7;
-}
diff --git a/crates/proto/proto/task.proto b/crates/proto/proto/task.proto
deleted file mode 100644
index 1844087d62..0000000000
--- a/crates/proto/proto/task.proto
+++ /dev/null
@@ -1,60 +0,0 @@
-syntax = "proto3";
-package zed.messages;
-
-import "buffer.proto";
-
-message TaskContextForLocation {
-    uint64 project_id = 1;
-    Location location = 2;
-    map<string, string> task_variables = 3;
-}
-
-message TaskContext {
-    optional string cwd = 1;
-    map<string, string> task_variables = 2;
-    map<string, string> project_env = 3;
-}
-
-message Shell {
-    message WithArguments {
-        string program = 1;
-        repeated string args = 2;
-    }
-
-    oneof shell_type {
-        System system = 1;
-        string program = 2;
-        WithArguments with_arguments = 3;
-    }
-}
-
-message System {}
-
-enum RevealStrategy {
-    RevealAlways = 0;
-    RevealNever = 1;
-}
-
-enum HideStrategy {
-    HideAlways = 0;
-    HideNever = 1;
-    HideOnSuccess = 2;
-}
-
-message SpawnInTerminal {
-    string label = 1;
-    optional string command = 2;
-    repeated string args = 3;
-    map<string, string> env = 4;
-    optional string cwd = 5;
-}
-
-message GetDirectoryEnvironment {
-    uint64 project_id = 1;
-    Shell shell = 2;
-    string directory = 3;
-}
-
-message DirectoryEnvironment {
-    map<string, string> environment = 1;
-}
diff --git a/crates/proto/proto/toolchain.proto b/crates/proto/proto/toolchain.proto
deleted file mode 100644
index b190322ca0..0000000000
--- a/crates/proto/proto/toolchain.proto
+++ /dev/null
@@ -1,59 +0,0 @@
-syntax = "proto3";
-package zed.messages;
-
-message ListToolchains {
-    uint64 project_id = 1;
-    uint64 worktree_id = 2;
-    string language_name = 3;
-    optional string path = 4;
-}
-
-message Toolchain {
-    string name = 1;
-    string path = 2;
-    string raw_json = 3;
-}
-
-message ToolchainGroup {
-    uint64 start_index = 1;
-    string name = 2;
-}
-
-message ListToolchainsResponse {
-    repeated Toolchain toolchains = 1;
-    bool has_values = 2;
-    repeated ToolchainGroup groups = 3;
-    optional string relative_worktree_path = 4;
-}
-
-message ActivateToolchain {
-    uint64 project_id = 1;
-    uint64 worktree_id = 2;
-    Toolchain toolchain = 3;
-    string language_name = 4;
-    optional string path = 5;
-}
-
-message ActiveToolchain {
-    uint64 project_id = 1;
-    uint64 worktree_id = 2;
-    string language_name = 3;
-    optional string path = 4;
-}
-
-message ActiveToolchainResponse {
-    optional Toolchain toolchain = 1;
-}
-
-message ResolveToolchain {
-    uint64 project_id = 1;
-    string abs_path = 2;
-    string language_name = 3;
-}
-
-message ResolveToolchainResponse {
-    oneof response {
-        Toolchain toolchain = 1;
-        string error = 2;
-    }
-}
diff --git a/crates/proto/proto/worktree.proto b/crates/proto/proto/worktree.proto
deleted file mode 100644
index 9ab9e95438..0000000000
--- a/crates/proto/proto/worktree.proto
+++ /dev/null
@@ -1,160 +0,0 @@
-syntax = "proto3";
-package zed.messages;
-
-message Timestamp {
-    uint64 seconds = 1;
-    uint32 nanos = 2;
-}
-
-message File {
-    uint64 worktree_id = 1;
-    optional uint64 entry_id = 2;
-    string path = 3;
-    Timestamp mtime = 4;
-    bool is_deleted = 5;
-}
-
-message Entry {
-    uint64 id = 1;
-    bool is_dir = 2;
-    string path = 3;
-    uint64 inode = 4;
-    Timestamp mtime = 5;
-    bool is_ignored = 7;
-    bool is_external = 8;
-    reserved 6;
-    reserved 9;
-    bool is_fifo = 10;
-    optional uint64 size = 11;
-    optional string canonical_path = 12;
-    bool is_hidden = 13;
-}
-
-message AddWorktree {
-    string path = 1;
-    uint64 project_id = 2;
-    bool visible = 3;
-}
-
-message AddWorktreeResponse {
-    uint64 worktree_id = 1;
-    string canonicalized_path = 2;
-}
-
-message RemoveWorktree {
-    uint64 worktree_id = 1;
-}
-
-message GetPathMetadata {
-    uint64 project_id = 1;
-    string path = 2;
-}
-
-message GetPathMetadataResponse {
-    bool exists = 1;
-    string path = 2;
-    bool is_dir = 3;
-}
-
-message WorktreeMetadata {
-    uint64 id = 1;
-    string root_name = 2;
-    bool visible = 3;
-    string abs_path = 4;
-}
-
-message ProjectPath {
-    uint64 worktree_id = 1;
-    string path = 2;
-}
-
-message ListRemoteDirectoryConfig {
-    bool is_dir = 1;
-}
-
-message ListRemoteDirectory {
-    uint64 dev_server_id = 1;
-    string path = 2;
-    ListRemoteDirectoryConfig config = 3;
-}
-
-message EntryInfo {
-    bool is_dir = 1;
-}
-
-message ListRemoteDirectoryResponse {
-    repeated string entries = 1;
-    repeated EntryInfo entry_info = 2;
-}
-
-message CreateProjectEntry {
-    uint64 project_id = 1;
-    uint64 worktree_id = 2;
-    string path = 3;
-    bool is_directory = 4;
-    optional bytes content = 5;
-}
-
-message RenameProjectEntry {
-    uint64 project_id = 1;
-    uint64 entry_id = 2;
-    string new_path = 3;
-    uint64 new_worktree_id = 4;
-}
-
-message CopyProjectEntry {
-    uint64 project_id = 1;
-    uint64 entry_id = 2;
-    string new_path = 3;
-    uint64 new_worktree_id = 5;
-    reserved 4;
-}
-
-message DeleteProjectEntry {
-    uint64 project_id = 1;
-    uint64 entry_id = 2;
-    bool use_trash = 3;
-}
-
-message ExpandProjectEntry {
-    uint64 project_id = 1;
-    uint64 entry_id = 2;
-}
-
-message ExpandProjectEntryResponse {
-    uint64 worktree_scan_id = 1;
-}
-
-message ExpandAllForProjectEntry {
-    uint64 project_id = 1;
-    uint64 entry_id = 2;
-}
-
-message ExpandAllForProjectEntryResponse {
-    uint64 worktree_scan_id = 1;
-}
-
-message ProjectEntryResponse {
-    optional Entry entry = 1;
-    uint64 worktree_scan_id = 2;
-}
-
-message UpdateWorktreeSettings {
-    uint64 project_id = 1;
-    uint64 worktree_id = 2;
-    string path = 3;
-    optional string content = 4;
-    optional LocalSettingsKind kind = 5;
-}
-
-enum LocalSettingsKind {
-    Settings = 0;
-    Tasks = 1;
-    Editorconfig = 2;
-    Debug = 3;
-}
-
-message UpdateUserSettings {
-    uint64 project_id = 1;
-    string contents = 2;
-}
diff --git a/crates/proto/proto/zed.proto b/crates/proto/proto/zed.proto
deleted file mode 100644
index 8e26a26a43..0000000000
--- a/crates/proto/proto/zed.proto
+++ /dev/null
@@ -1,527 +0,0 @@
-syntax = "proto3";
-package zed.messages;
-
-import "ai.proto";
-import "app.proto";
-import "buffer.proto";
-import "call.proto";
-import "channel.proto";
-import "core.proto";
-import "debugger.proto";
-import "git.proto";
-import "image.proto";
-import "lsp.proto";
-import "notification.proto";
-import "task.proto";
-import "toolchain.proto";
-import "worktree.proto";
-
-// Looking for a number? Search "// current max"
-
-message Envelope {
-    uint32 id = 1;
-    optional uint32 responding_to = 2;
-    optional PeerId original_sender_id = 3;
-    optional uint32 ack_id = 266;
-
-    oneof payload {
-        Hello hello = 4;
-        Ack ack = 5;
-        Error error = 6;
-        Ping ping = 7;
-        Test test = 8;
-        EndStream end_stream = 165;
-
-        CreateRoom create_room = 9;
-        CreateRoomResponse create_room_response = 10;
-        JoinRoom join_room = 11;
-        JoinRoomResponse join_room_response = 12;
-        RejoinRoom rejoin_room = 13;
-        RejoinRoomResponse rejoin_room_response = 14;
-        LeaveRoom leave_room = 15;
-        Call call = 16;
-        IncomingCall incoming_call = 17;
-        CallCanceled call_canceled = 18;
-        CancelCall cancel_call = 19;
-        DeclineCall decline_call = 20;
-        UpdateParticipantLocation update_participant_location = 21;
-        RoomUpdated room_updated = 22;
-
-        ShareProject share_project = 23;
-        ShareProjectResponse share_project_response = 24;
-        UnshareProject unshare_project = 25;
-        JoinProject join_project = 26;
-        JoinProjectResponse join_project_response = 27;
-        LeaveProject leave_project = 28;
-        AddProjectCollaborator add_project_collaborator = 29;
-        UpdateProjectCollaborator update_project_collaborator = 30;
-        RemoveProjectCollaborator remove_project_collaborator = 31;
-
-        GetDefinition get_definition = 32;
-        GetDefinitionResponse get_definition_response = 33;
-        GetDeclaration get_declaration = 237;
-        GetDeclarationResponse get_declaration_response = 238;
-        GetTypeDefinition get_type_definition = 34;
-        GetTypeDefinitionResponse get_type_definition_response = 35;
-
-        GetReferences get_references = 36;
-        GetReferencesResponse get_references_response = 37;
-        GetDocumentHighlights get_document_highlights = 38;
-        GetDocumentHighlightsResponse get_document_highlights_response = 39;
-        GetProjectSymbols get_project_symbols = 40;
-        GetProjectSymbolsResponse get_project_symbols_response = 41;
-        OpenBufferForSymbol open_buffer_for_symbol = 42;
-        OpenBufferForSymbolResponse open_buffer_for_symbol_response = 43;
-
-        UpdateProject update_project = 44;
-        UpdateWorktree update_worktree = 45;
-
-        CreateProjectEntry create_project_entry = 46;
-        RenameProjectEntry rename_project_entry = 47;
-        CopyProjectEntry copy_project_entry = 48;
-        DeleteProjectEntry delete_project_entry = 49;
-        ProjectEntryResponse project_entry_response = 50;
-        ExpandProjectEntry expand_project_entry = 51;
-        ExpandProjectEntryResponse expand_project_entry_response = 52;
-        ExpandAllForProjectEntry expand_all_for_project_entry = 291;
-        ExpandAllForProjectEntryResponse expand_all_for_project_entry_response = 292;
-        UpdateDiagnosticSummary update_diagnostic_summary = 53;
-        StartLanguageServer start_language_server = 54;
-        UpdateLanguageServer update_language_server = 55;
-
-        OpenBufferById open_buffer_by_id = 56;
-        OpenBufferByPath open_buffer_by_path = 57;
-        OpenBufferResponse open_buffer_response = 58;
-        CreateBufferForPeer create_buffer_for_peer = 59;
-        UpdateBuffer update_buffer = 60;
-        UpdateBufferFile update_buffer_file = 61;
-        SaveBuffer save_buffer = 62;
-        BufferSaved buffer_saved = 63;
-        BufferReloaded buffer_reloaded = 64;
-        ReloadBuffers reload_buffers = 65;
-        ReloadBuffersResponse reload_buffers_response = 66;
-        SynchronizeBuffers synchronize_buffers = 67;
-        SynchronizeBuffersResponse synchronize_buffers_response = 68;
-        FormatBuffers format_buffers = 69;
-        FormatBuffersResponse format_buffers_response = 70;
-        GetCompletions get_completions = 71;
-        GetCompletionsResponse get_completions_response = 72;
-        ResolveCompletionDocumentation resolve_completion_documentation = 73;
-        ResolveCompletionDocumentationResponse resolve_completion_documentation_response = 74;
-        ApplyCompletionAdditionalEdits apply_completion_additional_edits = 75;
-        ApplyCompletionAdditionalEditsResponse apply_completion_additional_edits_response = 76;
-        GetCodeActions get_code_actions = 77;
-        GetCodeActionsResponse get_code_actions_response = 78;
-        GetHover get_hover = 79;
-        GetHoverResponse get_hover_response = 80;
-        ApplyCodeAction apply_code_action = 81;
-        ApplyCodeActionResponse apply_code_action_response = 82;
-        PrepareRename prepare_rename = 83;
-        PrepareRenameResponse prepare_rename_response = 84;
-        PerformRename perform_rename = 85;
-        PerformRenameResponse perform_rename_response = 86;
-
-        UpdateContacts update_contacts = 89;
-        UpdateInviteInfo update_invite_info = 90;
-        ShowContacts show_contacts = 91;
-
-        GetUsers get_users = 92;
-        FuzzySearchUsers fuzzy_search_users = 93;
-        UsersResponse users_response = 94;
-        RequestContact request_contact = 95;
-        RespondToContactRequest respond_to_contact_request = 96;
-        RemoveContact remove_contact = 97;
-
-        Follow follow = 98;
-        FollowResponse follow_response = 99;
-        UpdateFollowers update_followers = 100;
-        Unfollow unfollow = 101;
-        UpdateDiffBases update_diff_bases = 104;
-
-        OnTypeFormatting on_type_formatting = 105;
-        OnTypeFormattingResponse on_type_formatting_response = 106;
-
-        UpdateWorktreeSettings update_worktree_settings = 107;
-
-        InlayHints inlay_hints = 108;
-        InlayHintsResponse inlay_hints_response = 109;
-        ResolveInlayHint resolve_inlay_hint = 110;
-        ResolveInlayHintResponse resolve_inlay_hint_response = 111;
-        RefreshInlayHints refresh_inlay_hints = 112;
-
-        CreateChannel create_channel = 113;
-        CreateChannelResponse create_channel_response = 114;
-        InviteChannelMember invite_channel_member = 115;
-        RemoveChannelMember remove_channel_member = 116;
-        RespondToChannelInvite respond_to_channel_invite = 117;
-        UpdateChannels update_channels = 118;
-        JoinChannel join_channel = 119;
-        DeleteChannel delete_channel = 120;
-        GetChannelMembers get_channel_members = 121;
-        GetChannelMembersResponse get_channel_members_response = 122;
-        SetChannelMemberRole set_channel_member_role = 123;
-        RenameChannel rename_channel = 124;
-        RenameChannelResponse rename_channel_response = 125;
-        SubscribeToChannels subscribe_to_channels = 207;
-
-        JoinChannelBuffer join_channel_buffer = 126;
-        JoinChannelBufferResponse join_channel_buffer_response = 127;
-        UpdateChannelBuffer update_channel_buffer = 128;
-        LeaveChannelBuffer leave_channel_buffer = 129;
-        UpdateChannelBufferCollaborators update_channel_buffer_collaborators = 130;
-        RejoinChannelBuffers rejoin_channel_buffers = 131;
-        RejoinChannelBuffersResponse rejoin_channel_buffers_response = 132;
-        AckBufferOperation ack_buffer_operation = 133;
-
-        JoinChannelChat join_channel_chat = 134;
-        JoinChannelChatResponse join_channel_chat_response = 135;
-        LeaveChannelChat leave_channel_chat = 136;
-        SendChannelMessage send_channel_message = 137;
-        SendChannelMessageResponse send_channel_message_response = 138;
-        ChannelMessageSent channel_message_sent = 139;
-        GetChannelMessages get_channel_messages = 140;
-        GetChannelMessagesResponse get_channel_messages_response = 141;
-        RemoveChannelMessage remove_channel_message = 142;
-        AckChannelMessage ack_channel_message = 143;
-        GetChannelMessagesById get_channel_messages_by_id = 144;
-
-        MoveChannel move_channel = 147;
-        ReorderChannel reorder_channel = 349;
-        SetChannelVisibility set_channel_visibility = 148;
-
-        AddNotification add_notification = 149;
-        GetNotifications get_notifications = 150;
-        GetNotificationsResponse get_notifications_response = 151;
-        DeleteNotification delete_notification = 152;
-        MarkNotificationRead mark_notification_read = 153;
-        LspExtExpandMacro lsp_ext_expand_macro = 154;
-        LspExtExpandMacroResponse lsp_ext_expand_macro_response = 155;
-        SetRoomParticipantRole set_room_participant_role = 156;
-
-        UpdateUserChannels update_user_channels = 157;
-
-        GetImplementation get_implementation = 162;
-        GetImplementationResponse get_implementation_response = 163;
-
-        UpdateChannelMessage update_channel_message = 170;
-        ChannelMessageUpdate channel_message_update = 171;
-
-        BlameBuffer blame_buffer = 172;
-        BlameBufferResponse blame_buffer_response = 173;
-
-        UpdateNotification update_notification = 174;
-
-        RestartLanguageServers restart_language_servers = 208;
-
-        RejoinRemoteProjects rejoin_remote_projects = 186;
-        RejoinRemoteProjectsResponse rejoin_remote_projects_response = 187;
-
-        OpenNewBuffer open_new_buffer = 196;
-
-        GetSupermavenApiKey get_supermaven_api_key = 198;
-        GetSupermavenApiKeyResponse get_supermaven_api_key_response = 199;
-
-        TaskContextForLocation task_context_for_location = 203;
-        TaskContext task_context = 204;
-
-        LinkedEditingRange linked_editing_range = 209;
-        LinkedEditingRangeResponse linked_editing_range_response = 210;
-
-        AdvertiseContexts advertise_contexts = 211;
-        OpenContext open_context = 212;
-        OpenContextResponse open_context_response = 213;
-        CreateContext create_context = 232;
-        CreateContextResponse create_context_response = 233;
-        UpdateContext update_context = 214;
-        SynchronizeContexts synchronize_contexts = 215;
-        SynchronizeContextsResponse synchronize_contexts_response = 216;
-
-        GetSignatureHelp get_signature_help = 217;
-        GetSignatureHelpResponse get_signature_help_response = 218;
-
-        ListRemoteDirectory list_remote_directory = 219;
-        ListRemoteDirectoryResponse list_remote_directory_response = 220;
-        AddWorktree add_worktree = 222;
-        AddWorktreeResponse add_worktree_response = 223;
-
-        LspExtSwitchSourceHeader lsp_ext_switch_source_header = 241;
-        LspExtSwitchSourceHeaderResponse lsp_ext_switch_source_header_response = 242;
-
-        FindSearchCandidates find_search_candidates = 243;
-        FindSearchCandidatesResponse find_search_candidates_response = 244;
-
-        CloseBuffer close_buffer = 245;
-
-        ShutdownRemoteServer shutdown_remote_server = 257;
-
-        RemoveWorktree remove_worktree = 258;
-
-        LanguageServerLog language_server_log = 260;
-
-        Toast toast = 261;
-        HideToast hide_toast = 262;
-
-        OpenServerSettings open_server_settings = 263;
-
-        GetPermalinkToLine get_permalink_to_line = 264;
-        GetPermalinkToLineResponse get_permalink_to_line_response = 265;
-
-        FlushBufferedMessages flush_buffered_messages = 267;
-
-        LanguageServerPromptRequest language_server_prompt_request = 268;
-        LanguageServerPromptResponse language_server_prompt_response = 269;
-
-        GitBranchesResponse git_branches_response = 271;
-
-        UpdateGitBranch update_git_branch = 272;
-
-        ListToolchains list_toolchains = 273;
-        ListToolchainsResponse list_toolchains_response = 274;
-        ActivateToolchain activate_toolchain = 275;
-        ActiveToolchain active_toolchain = 276;
-        ActiveToolchainResponse active_toolchain_response = 277;
-
-        GetPathMetadata get_path_metadata = 278;
-        GetPathMetadataResponse get_path_metadata_response = 279;
-
-        CancelLanguageServerWork cancel_language_server_work = 282;
-
-        LspExtOpenDocs lsp_ext_open_docs = 283;
-        LspExtOpenDocsResponse lsp_ext_open_docs_response = 284;
-
-        SyncExtensions sync_extensions = 285;
-        SyncExtensionsResponse sync_extensions_response = 286;
-        InstallExtension install_extension = 287;
-
-        OpenUnstagedDiff open_unstaged_diff = 288;
-        OpenUnstagedDiffResponse open_unstaged_diff_response = 289;
-
-        RegisterBufferWithLanguageServers register_buffer_with_language_servers = 290;
-
-        Stage stage = 293;
-        Unstage unstage = 294;
-        Commit commit = 295;
-        OpenCommitMessageBuffer open_commit_message_buffer = 296;
-
-        OpenUncommittedDiff open_uncommitted_diff = 297;
-        OpenUncommittedDiffResponse open_uncommitted_diff_response = 298;
-
-        SetIndexText set_index_text = 299;
-
-        GitShow git_show = 300;
-        GitReset git_reset = 301;
-        GitCommitDetails git_commit_details = 302;
-        GitCheckoutFiles git_checkout_files = 303;
-
-        Push push = 304;
-        Fetch fetch = 305;
-        GetRemotes get_remotes = 306;
-        GetRemotesResponse get_remotes_response = 307;
-        Pull pull = 308;
-
-        ApplyCodeActionKind apply_code_action_kind = 309;
-        ApplyCodeActionKindResponse apply_code_action_kind_response = 310;
-
-        RemoteMessageResponse remote_message_response = 311;
-
-        GitGetBranches git_get_branches = 312;
-        GitCreateBranch git_create_branch = 313;
-        GitChangeBranch git_change_branch = 314;
-
-        CheckForPushedCommits check_for_pushed_commits = 315;
-        CheckForPushedCommitsResponse check_for_pushed_commits_response = 316;
-
-        AskPassRequest ask_pass_request = 317;
-        AskPassResponse ask_pass_response = 318;
-
-        GitDiff git_diff = 319;
-        GitDiffResponse git_diff_response = 320;
-        GitInit git_init = 321;
-
-        CodeLens code_lens = 322;
-        GetCodeLens get_code_lens = 323;
-        GetCodeLensResponse get_code_lens_response = 324;
-        RefreshCodeLens refresh_code_lens = 325;
-
-        ToggleBreakpoint toggle_breakpoint = 326;
-        BreakpointsForFile breakpoints_for_file = 327;
-
-        UpdateRepository update_repository = 328;
-        RemoveRepository remove_repository = 329;
-
-        GetDocumentSymbols get_document_symbols = 330;
-        GetDocumentSymbolsResponse get_document_symbols_response = 331;
-
-        LoadCommitDiff load_commit_diff = 334;
-        LoadCommitDiffResponse load_commit_diff_response = 335;
-
-        StopLanguageServers stop_language_servers = 336;
-
-        LspExtRunnables lsp_ext_runnables = 337;
-        LspExtRunnablesResponse lsp_ext_runnables_response = 338;
-
-        GetDebugAdapterBinary get_debug_adapter_binary = 339;
-        DebugAdapterBinary debug_adapter_binary = 340;
-        RunDebugLocators run_debug_locators = 341;
-        DebugRequest debug_request = 342;
-
-        LspExtGoToParentModule lsp_ext_go_to_parent_module = 343;
-        LspExtGoToParentModuleResponse lsp_ext_go_to_parent_module_response = 344;
-        LspExtCancelFlycheck lsp_ext_cancel_flycheck = 345;
-        LspExtRunFlycheck lsp_ext_run_flycheck = 346;
-        LspExtClearFlycheck lsp_ext_clear_flycheck = 347;
-
-        LogToDebugConsole log_to_debug_console = 348;
-
-        GetDocumentDiagnostics get_document_diagnostics = 350;
-        GetDocumentDiagnosticsResponse get_document_diagnostics_response = 351;
-        PullWorkspaceDiagnostics pull_workspace_diagnostics = 352;
-
-        GetDocumentColor get_document_color = 353;
-        GetDocumentColorResponse get_document_color_response = 354;
-        GetColorPresentation get_color_presentation = 355;
-        GetColorPresentationResponse get_color_presentation_response = 356;
-
-        Stash stash = 357;
-        StashPop stash_pop = 358;
-
-        GetDefaultBranch get_default_branch = 359;
-        GetDefaultBranchResponse get_default_branch_response = 360;
-
-        GetCrashFiles get_crash_files = 361;
-        GetCrashFilesResponse get_crash_files_response = 362;
-
-        GitClone git_clone = 363;
-        GitCloneResponse git_clone_response = 364;
-
-        LspQuery lsp_query = 365;
-        LspQueryResponse lsp_query_response = 366;
-        ToggleLspLogs toggle_lsp_logs = 367;
-
-        UpdateUserSettings update_user_settings = 368;
-
-        GetProcesses get_processes = 369;
-        GetProcessesResponse get_processes_response = 370;
-
-        ResolveToolchain resolve_toolchain = 371;
-        ResolveToolchainResponse resolve_toolchain_response = 372;
-
-        GetAgentServerCommand get_agent_server_command = 373;
-        AgentServerCommand agent_server_command = 374;
-
-        ExternalAgentsUpdated external_agents_updated = 375;
-        ExternalAgentLoadingStatusUpdated external_agent_loading_status_updated = 376;
-        NewExternalAgentVersionAvailable new_external_agent_version_available = 377;
-
-        StashDrop stash_drop = 378;
-        StashApply stash_apply = 379;
-
-        GitRenameBranch git_rename_branch = 380;
-
-        RemoteStarted remote_started = 381;
-
-        GetDirectoryEnvironment get_directory_environment = 382;
-        DirectoryEnvironment directory_environment = 383;
-
-        GetTreeDiff get_tree_diff = 384;
-        GetTreeDiffResponse get_tree_diff_response = 385;
-
-        GetBlobContent get_blob_content = 386;
-        GetBlobContentResponse get_blob_content_response = 387;
-
-        GitWorktreesResponse git_worktrees_response = 388;
-        GitGetWorktrees git_get_worktrees = 389;
-        GitCreateWorktree git_create_worktree = 390;
-
-        OpenImageByPath open_image_by_path = 391;
-        OpenImageResponse open_image_response = 392;
-        CreateImageForPeer create_image_for_peer = 393;
-
-
-        GitFileHistory git_file_history = 397;
-        GitFileHistoryResponse git_file_history_response = 398;
-
-        RunGitHook run_git_hook = 399;
-
-        GitDeleteBranch git_delete_branch = 400;
-
-        ExternalExtensionAgentsUpdated external_extension_agents_updated = 401;
-
-        GitCreateRemote git_create_remote = 402;
-        GitRemoveRemote git_remove_remote = 403;// current max
-    }
-
-    reserved 87 to 88, 396;
-    reserved 102 to 103;
-    reserved 158 to 161;
-    reserved 164;
-    reserved 166 to 169;
-    reserved 175 to 185;
-    reserved 188;
-    reserved 189 to 192;
-    reserved 193 to 195;
-    reserved 197;
-    reserved 200 to 202;
-    reserved 205 to 206;
-    reserved 221;
-    reserved 224 to 229;
-    reserved 230 to 231;
-    reserved 234 to 236;
-    reserved 239 to 240;
-    reserved 246;
-    reserved 247 to 254;
-    reserved 255 to 256;
-    reserved 259;
-    reserved 270;
-    reserved 280 to 281;
-    reserved 332 to 333;
-    reserved 394 to 395;
-}
-
-message Hello {
-    PeerId peer_id = 1;
-}
-
-message Ping {}
-
-message Ack {}
-
-message Error {
-    string message = 1;
-    ErrorCode code = 2;
-    repeated string tags = 3;
-}
-
-enum ErrorCode {
-    Internal = 0;
-    NoSuchChannel = 1;
-    Disconnected = 2;
-    SignedOut = 3;
-    UpgradeRequired = 4;
-    Forbidden = 5;
-    NeedsCla = 7;
-    NotARootChannel = 8;
-    BadPublicNesting = 9;
-    CircularNesting = 10;
-    WrongMoveTarget = 11;
-    UnsharedItem = 12;
-    NoSuchProject = 13;
-    DevServerProjectPathDoesNotExist = 16;
-    RemoteUpgradeRequired = 17;
-    RateLimitExceeded = 18;
-    CommitFailed = 19;
-    reserved 6;
-    reserved 14 to 15;
-}
-
-message EndStream {}
-
-message Test {
-    uint64 id = 1;
-}
-
-message FlushBufferedMessages {}
-
-message FlushBufferedMessagesResponse {}
-
-message RemoteStarted {}
diff --git a/crates/proto/src/error.rs b/crates/proto/src/error.rs
deleted file mode 100644
index d83b0fc499..0000000000
--- a/crates/proto/src/error.rs
+++ /dev/null
@@ -1,250 +0,0 @@
-/// Some helpers for structured error handling.
-///
-/// The helpers defined here allow you to pass type-safe error codes from
-/// the collab server to the client; and provide a mechanism for additional
-/// structured data alongside the message.
-///
-/// When returning an error, it can be as simple as:
-///
-/// `return Err(Error::Forbidden.into())`
-///
-/// If you'd like to log more context, you can set a message. These messages
-/// show up in our logs, but are not shown visibly to users.
-///
-/// `return Err(Error::Forbidden.message("not an admin").into())`
-///
-/// If you'd like to provide enough context that the UI can render a good error
-/// message (or would be helpful to see in a structured format in the logs), you
-/// can use .with_tag():
-///
-/// `return Err(Error::WrongReleaseChannel.with_tag("required", "stable").into())`
-///
-/// When handling an error you can use .error_code() to match which error it was
-/// and .error_tag() to read any tags.
-///
-/// ```ignore
-/// use proto::{ErrorCode, ErrorExt};
-///
-/// match err.error_code() {
-///   ErrorCode::Forbidden => alert("I'm sorry I can't do that."),
-///   ErrorCode::WrongReleaseChannel =>
-///     alert(format!("You need to be on the {} release channel.", err.error_tag("required").unwrap())),
-///   ErrorCode::Internal => alert("Sorry, something went wrong"),
-/// }
-/// ```
-///
-pub use crate::ErrorCode;
-
-/// ErrorCodeExt provides some helpers for structured error handling.
-///
-/// The primary implementation is on the proto::ErrorCode to easily convert
-/// that into an anyhow::Error, which we use pervasively.
-///
-/// The RpcError struct provides support for further metadata if needed.
-pub trait ErrorCodeExt {
-    /// Return an anyhow::Error containing this.
-    /// (useful in places where .into() doesn't have enough type information)
-    fn anyhow(self) -> anyhow::Error;
-
-    /// Add a message to the error (by default the error code is used)
-    fn message(self, msg: String) -> RpcError;
-
-    /// Add a tag to the error. Tags are key value pairs that can be used
-    /// to send semi-structured data along with the error.
-    fn with_tag(self, k: &str, v: &str) -> RpcError;
-}
-
-impl ErrorCodeExt for ErrorCode {
-    fn anyhow(self) -> anyhow::Error {
-        self.into()
-    }
-
-    fn message(self, msg: String) -> RpcError {
-        let err: RpcError = self.into();
-        err.message(msg)
-    }
-
-    fn with_tag(self, k: &str, v: &str) -> RpcError {
-        let err: RpcError = self.into();
-        err.with_tag(k, v)
-    }
-}
-
-/// ErrorExt provides helpers for structured error handling.
-///
-/// The primary implementation is on the anyhow::Error, which is
-/// what we use throughout our codebase. Though under the hood this
-pub trait ErrorExt {
-    /// error_code() returns the ErrorCode (or ErrorCode::Internal if there is none)
-    fn error_code(&self) -> ErrorCode;
-    /// error_tag() returns the value of the tag with the given key, if any.
-    fn error_tag(&self, k: &str) -> Option<&str>;
-    /// to_proto() converts the error into a crate::Error
-    fn to_proto(&self) -> crate::Error;
-    /// Clones the error and turns into an [anyhow::Error].
-    fn cloned(&self) -> anyhow::Error;
-}
-
-impl ErrorExt for anyhow::Error {
-    fn error_code(&self) -> ErrorCode {
-        if let Some(rpc_error) = self.downcast_ref::<RpcError>() {
-            rpc_error.code
-        } else {
-            ErrorCode::Internal
-        }
-    }
-
-    fn error_tag(&self, k: &str) -> Option<&str> {
-        if let Some(rpc_error) = self.downcast_ref::<RpcError>() {
-            rpc_error.error_tag(k)
-        } else {
-            None
-        }
-    }
-
-    fn to_proto(&self) -> crate::Error {
-        if let Some(rpc_error) = self.downcast_ref::<RpcError>() {
-            rpc_error.to_proto()
-        } else {
-            ErrorCode::Internal
-                .message(
-                    format!("{self:#}")
-                        .lines()
-                        .fold(String::new(), |mut message, line| {
-                            if !message.is_empty() {
-                                message.push(' ');
-                            }
-                            message.push_str(line);
-                            message
-                        }),
-                )
-                .to_proto()
-        }
-    }
-
-    fn cloned(&self) -> anyhow::Error {
-        if let Some(rpc_error) = self.downcast_ref::<RpcError>() {
-            rpc_error.cloned()
-        } else {
-            anyhow::anyhow!("{self:#}")
-        }
-    }
-}
-
-impl From<ErrorCode> for anyhow::Error {
-    fn from(value: ErrorCode) -> Self {
-        RpcError {
-            request: None,
-            code: value,
-            msg: format!("{:?}", value),
-            tags: Default::default(),
-        }
-        .into()
-    }
-}
-
-#[derive(Clone, Debug)]
-pub struct RpcError {
-    request: Option<String>,
-    msg: String,
-    code: ErrorCode,
-    tags: Vec<String>,
-}
-
-/// RpcError is a structured error type that is returned by the collab server.
-/// In addition to a message, it lets you set a specific ErrorCode, and attach
-/// small amounts of metadata to help the client handle the error appropriately.
-///
-/// This struct is not typically used directly, as we pass anyhow::Error around
-/// in the app; however it is useful for chaining .message() and .with_tag() on
-/// ErrorCode.
-impl RpcError {
-    /// from_proto converts a crate::Error into an anyhow::Error containing
-    /// an RpcError.
-    pub fn from_proto(error: &crate::Error, request: &str) -> anyhow::Error {
-        RpcError {
-            request: Some(request.to_string()),
-            code: error.code(),
-            msg: error.message.clone(),
-            tags: error.tags.clone(),
-        }
-        .into()
-    }
-}
-
-impl ErrorCodeExt for RpcError {
-    fn message(mut self, msg: String) -> RpcError {
-        self.msg = msg;
-        self
-    }
-
-    fn with_tag(mut self, k: &str, v: &str) -> RpcError {
-        self.tags.push(format!("{}={}", k, v));
-        self
-    }
-
-    fn anyhow(self) -> anyhow::Error {
-        self.into()
-    }
-}
-
-impl ErrorExt for RpcError {
-    fn error_tag(&self, k: &str) -> Option<&str> {
-        for tag in &self.tags {
-            let mut parts = tag.split('=');
-            if let Some(key) = parts.next()
-                && key == k
-            {
-                return parts.next();
-            }
-        }
-        None
-    }
-
-    fn error_code(&self) -> ErrorCode {
-        self.code
-    }
-
-    fn to_proto(&self) -> crate::Error {
-        crate::Error {
-            code: self.code as i32,
-            message: self.msg.clone(),
-            tags: self.tags.clone(),
-        }
-    }
-
-    fn cloned(&self) -> anyhow::Error {
-        self.clone().into()
-    }
-}
-
-impl std::error::Error for RpcError {
-    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
-        None
-    }
-}
-
-impl std::fmt::Display for RpcError {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        if let Some(request) = &self.request {
-            write!(f, "RPC request {} failed: {}", request, self.msg)?
-        } else {
-            write!(f, "{}", self.msg)?
-        }
-        for tag in &self.tags {
-            write!(f, " {}", tag)?
-        }
-        Ok(())
-    }
-}
-
-impl From<ErrorCode> for RpcError {
-    fn from(code: ErrorCode) -> Self {
-        RpcError {
-            request: None,
-            code,
-            msg: format!("{:?}", code),
-            tags: Default::default(),
-        }
-    }
-}
diff --git a/crates/proto/src/macros.rs b/crates/proto/src/macros.rs
deleted file mode 100644
index 59e984d7db..0000000000
--- a/crates/proto/src/macros.rs
+++ /dev/null
@@ -1,100 +0,0 @@
-#[macro_export]
-macro_rules! messages {
-    ($(($name:ident, $priority:ident)),* $(,)?) => {
-        pub fn build_typed_envelope(sender_id: PeerId, received_at: std::time::Instant, envelope: Envelope) -> Option<Box<dyn AnyTypedEnvelope>> {
-            match envelope.payload {
-                $(Some(envelope::Payload::$name(payload)) => {
-                    Some(Box::new(TypedEnvelope {
-                        sender_id,
-                        original_sender_id: envelope.original_sender_id,
-                        message_id: envelope.id,
-                        payload,
-                        received_at,
-                    }))
-                }, )*
-                _ => None
-            }
-        }
-
-        $(
-            impl EnvelopedMessage for $name {
-                const NAME: &'static str = std::stringify!($name);
-                const PRIORITY: MessagePriority = MessagePriority::$priority;
-
-                fn into_envelope(
-                    self,
-                    id: u32,
-                    responding_to: Option<u32>,
-                    original_sender_id: Option<PeerId>,
-                ) -> Envelope {
-                    Envelope {
-                        id,
-                        responding_to,
-                        original_sender_id,
-                        payload: Some(envelope::Payload::$name(self)),
-                        ack_id: None,
-                    }
-                }
-
-                fn from_envelope(envelope: Envelope) -> Option<Self> {
-                    if let Some(envelope::Payload::$name(msg)) = envelope.payload {
-                        Some(msg)
-                    } else {
-                        None
-                    }
-                }
-            }
-        )*
-    };
-}
-
-#[macro_export]
-macro_rules! request_messages {
-    ($(($request_name:ident, $response_name:ident)),* $(,)?) => {
-        $(impl RequestMessage for $request_name {
-            type Response = $response_name;
-        })*
-    };
-}
-
-#[macro_export]
-macro_rules! entity_messages {
-    ({$id_field:ident, $entity_type:ty}, $($name:ident),* $(,)?) => {
-        $(impl EntityMessage for $name {
-            type Entity = $entity_type;
-
-            fn remote_entity_id(&self) -> u64 {
-                self.$id_field
-            }
-        })*
-    };
-}
-
-#[macro_export]
-macro_rules! lsp_messages {
-    ($(($request_name:ident, $response_name:ident, $stop_previous_requests:expr)),* $(,)?) => {
-        $(impl LspRequestMessage for $request_name {
-            type Response = $response_name;
-
-            fn to_proto_query(self) -> $crate::lsp_query::Request {
-                $crate::lsp_query::Request::$request_name(self)
-            }
-
-            fn response_to_proto_query(response: Self::Response) -> $crate::lsp_response::Response {
-                $crate::lsp_response::Response::$response_name(response)
-            }
-
-            fn buffer_id(&self) -> u64 {
-                self.buffer_id
-            }
-
-            fn buffer_version(&self) -> &[$crate::VectorClockEntry] {
-                &self.version
-            }
-
-            fn stop_previous_requests() -> bool {
-                $stop_previous_requests
-            }
-        })*
-    };
-}
diff --git a/crates/proto/src/proto.rs b/crates/proto/src/proto.rs
deleted file mode 100644
index 455f947046..0000000000
--- a/crates/proto/src/proto.rs
+++ /dev/null
@@ -1,923 +0,0 @@
-#![allow(non_snake_case)]
-
-pub mod error;
-mod macros;
-mod typed_envelope;
-
-pub use error::*;
-pub use prost::{DecodeError, Message};
-use std::{
-    cmp,
-    fmt::Debug,
-    iter, mem,
-    time::{Duration, SystemTime, UNIX_EPOCH},
-};
-pub use typed_envelope::*;
-
-include!(concat!(env!("OUT_DIR"), "/zed.messages.rs"));
-
-pub const REMOTE_SERVER_PEER_ID: PeerId = PeerId { owner_id: 0, id: 0 };
-pub const REMOTE_SERVER_PROJECT_ID: u64 = 0;
-
-messages!(
-    (Ack, Foreground),
-    (AckBufferOperation, Background),
-    (AckChannelMessage, Background),
-    (ActivateToolchain, Foreground),
-    (ActiveToolchain, Foreground),
-    (ActiveToolchainResponse, Foreground),
-    (ResolveToolchain, Background),
-    (ResolveToolchainResponse, Background),
-    (AddNotification, Foreground),
-    (AddProjectCollaborator, Foreground),
-    (AddWorktree, Foreground),
-    (AddWorktreeResponse, Foreground),
-    (AdvertiseContexts, Foreground),
-    (ApplyCodeAction, Background),
-    (ApplyCodeActionResponse, Background),
-    (ApplyCompletionAdditionalEdits, Background),
-    (ApplyCompletionAdditionalEditsResponse, Background),
-    (BlameBuffer, Foreground),
-    (BlameBufferResponse, Foreground),
-    (BufferReloaded, Foreground),
-    (BufferSaved, Foreground),
-    (Call, Foreground),
-    (CallCanceled, Foreground),
-    (CancelCall, Foreground),
-    (CancelLanguageServerWork, Foreground),
-    (ChannelMessageSent, Foreground),
-    (ChannelMessageUpdate, Foreground),
-    (CloseBuffer, Foreground),
-    (Commit, Background),
-    (RunGitHook, Background),
-    (CopyProjectEntry, Foreground),
-    (CreateBufferForPeer, Foreground),
-    (CreateImageForPeer, Foreground),
-    (CreateChannel, Foreground),
-    (CreateChannelResponse, Foreground),
-    (CreateContext, Foreground),
-    (CreateContextResponse, Foreground),
-    (CreateProjectEntry, Foreground),
-    (CreateRoom, Foreground),
-    (CreateRoomResponse, Foreground),
-    (DeclineCall, Foreground),
-    (DeleteChannel, Foreground),
-    (DeleteNotification, Foreground),
-    (DeleteProjectEntry, Foreground),
-    (EndStream, Foreground),
-    (Error, Foreground),
-    (ExpandProjectEntry, Foreground),
-    (ExpandProjectEntryResponse, Foreground),
-    (FindSearchCandidatesResponse, Background),
-    (FindSearchCandidates, Background),
-    (FlushBufferedMessages, Foreground),
-    (ExpandAllForProjectEntry, Foreground),
-    (ExpandAllForProjectEntryResponse, Foreground),
-    (Follow, Foreground),
-    (FollowResponse, Foreground),
-    (ApplyCodeActionKind, Foreground),
-    (ApplyCodeActionKindResponse, Foreground),
-    (FormatBuffers, Foreground),
-    (FormatBuffersResponse, Foreground),
-    (FuzzySearchUsers, Foreground),
-    (GetChannelMembers, Foreground),
-    (GetChannelMembersResponse, Foreground),
-    (GetChannelMessages, Background),
-    (GetChannelMessagesById, Background),
-    (GetChannelMessagesResponse, Background),
-    (GetCodeActions, Background),
-    (GetCodeActionsResponse, Background),
-    (GetCompletions, Background),
-    (GetCompletionsResponse, Background),
-    (GetDeclaration, Background),
-    (GetDeclarationResponse, Background),
-    (GetDefinition, Background),
-    (GetDefinitionResponse, Background),
-    (GetDocumentHighlights, Background),
-    (GetDocumentHighlightsResponse, Background),
-    (GetDocumentSymbols, Background),
-    (GetDocumentSymbolsResponse, Background),
-    (GetHover, Background),
-    (GetHoverResponse, Background),
-    (GetNotifications, Foreground),
-    (GetNotificationsResponse, Foreground),
-    (GetCrashFiles, Background),
-    (GetCrashFilesResponse, Background),
-    (GetPathMetadata, Background),
-    (GetPathMetadataResponse, Background),
-    (GetPermalinkToLine, Foreground),
-    (GetProcesses, Background),
-    (GetProcessesResponse, Background),
-    (GetPermalinkToLineResponse, Foreground),
-    (GetProjectSymbols, Background),
-    (GetProjectSymbolsResponse, Background),
-    (GetReferences, Background),
-    (GetReferencesResponse, Background),
-    (GetSignatureHelp, Background),
-    (GetSignatureHelpResponse, Background),
-    (GetSupermavenApiKey, Background),
-    (GetSupermavenApiKeyResponse, Background),
-    (GetTypeDefinition, Background),
-    (GetTypeDefinitionResponse, Background),
-    (GetImplementation, Background),
-    (GetImplementationResponse, Background),
-    (OpenUnstagedDiff, Foreground),
-    (OpenUnstagedDiffResponse, Foreground),
-    (OpenUncommittedDiff, Foreground),
-    (OpenUncommittedDiffResponse, Foreground),
-    (GetUsers, Foreground),
-    (GitGetBranches, Background),
-    (GitBranchesResponse, Background),
-    (Hello, Foreground),
-    (HideToast, Background),
-    (IncomingCall, Foreground),
-    (InlayHints, Background),
-    (InlayHintsResponse, Background),
-    (InstallExtension, Background),
-    (InviteChannelMember, Foreground),
-    (JoinChannel, Foreground),
-    (JoinChannelBuffer, Foreground),
-    (JoinChannelBufferResponse, Foreground),
-    (JoinChannelChat, Foreground),
-    (JoinChannelChatResponse, Foreground),
-    (JoinProject, Foreground),
-    (JoinProjectResponse, Foreground),
-    (JoinRoom, Foreground),
-    (JoinRoomResponse, Foreground),
-    (LanguageServerLog, Foreground),
-    (LanguageServerPromptRequest, Foreground),
-    (LanguageServerPromptResponse, Foreground),
-    (LeaveChannelBuffer, Background),
-    (LeaveChannelChat, Foreground),
-    (LeaveProject, Foreground),
-    (LeaveRoom, Foreground),
-    (LinkedEditingRange, Background),
-    (LinkedEditingRangeResponse, Background),
-    (ListRemoteDirectory, Background),
-    (ListRemoteDirectoryResponse, Background),
-    (ListToolchains, Foreground),
-    (ListToolchainsResponse, Foreground),
-    (LoadCommitDiff, Foreground),
-    (LoadCommitDiffResponse, Foreground),
-    (LspExtExpandMacro, Background),
-    (LspExtExpandMacroResponse, Background),
-    (LspExtOpenDocs, Background),
-    (LspExtOpenDocsResponse, Background),
-    (LspExtRunnables, Background),
-    (LspExtRunnablesResponse, Background),
-    (LspExtSwitchSourceHeader, Background),
-    (LspExtSwitchSourceHeaderResponse, Background),
-    (LspExtGoToParentModule, Background),
-    (LspExtGoToParentModuleResponse, Background),
-    (LspExtCancelFlycheck, Background),
-    (LspExtRunFlycheck, Background),
-    (LspExtClearFlycheck, Background),
-    (MarkNotificationRead, Foreground),
-    (MoveChannel, Foreground),
-    (ReorderChannel, Foreground),
-    (LspQuery, Background),
-    (LspQueryResponse, Background),
-    (OnTypeFormatting, Background),
-    (OnTypeFormattingResponse, Background),
-    (OpenBufferById, Background),
-    (OpenBufferByPath, Background),
-    (OpenImageByPath, Background),
-    (OpenBufferForSymbol, Background),
-    (OpenBufferForSymbolResponse, Background),
-    (OpenBufferResponse, Background),
-    (OpenImageResponse, Background),
-    (OpenCommitMessageBuffer, Background),
-    (OpenContext, Foreground),
-    (OpenContextResponse, Foreground),
-    (OpenNewBuffer, Foreground),
-    (OpenServerSettings, Foreground),
-    (PerformRename, Background),
-    (PerformRenameResponse, Background),
-    (Ping, Foreground),
-    (PrepareRename, Background),
-    (PrepareRenameResponse, Background),
-    (ProjectEntryResponse, Foreground),
-    (RefreshInlayHints, Foreground),
-    (RegisterBufferWithLanguageServers, Background),
-    (RejoinChannelBuffers, Foreground),
-    (RejoinChannelBuffersResponse, Foreground),
-    (RejoinRemoteProjects, Foreground),
-    (RejoinRemoteProjectsResponse, Foreground),
-    (RejoinRoom, Foreground),
-    (RejoinRoomResponse, Foreground),
-    (ReloadBuffers, Foreground),
-    (ReloadBuffersResponse, Foreground),
-    (RemoveChannelMember, Foreground),
-    (RemoveChannelMessage, Foreground),
-    (RemoveContact, Foreground),
-    (RemoveProjectCollaborator, Foreground),
-    (RemoveWorktree, Foreground),
-    (RenameChannel, Foreground),
-    (RenameChannelResponse, Foreground),
-    (RenameProjectEntry, Foreground),
-    (RequestContact, Foreground),
-    (ResolveCompletionDocumentation, Background),
-    (ResolveCompletionDocumentationResponse, Background),
-    (ResolveInlayHint, Background),
-    (ResolveInlayHintResponse, Background),
-    (GetDocumentColor, Background),
-    (GetDocumentColorResponse, Background),
-    (GetColorPresentation, Background),
-    (GetColorPresentationResponse, Background),
-    (RefreshCodeLens, Background),
-    (GetCodeLens, Background),
-    (GetCodeLensResponse, Background),
-    (RespondToChannelInvite, Foreground),
-    (RespondToContactRequest, Foreground),
-    (RestartLanguageServers, Foreground),
-    (StopLanguageServers, Background),
-    (RoomUpdated, Foreground),
-    (SaveBuffer, Foreground),
-    (SendChannelMessage, Background),
-    (SendChannelMessageResponse, Background),
-    (SetChannelMemberRole, Foreground),
-    (SetChannelVisibility, Foreground),
-    (SetRoomParticipantRole, Foreground),
-    (ShareProject, Foreground),
-    (ShareProjectResponse, Foreground),
-    (ShowContacts, Foreground),
-    (ShutdownRemoteServer, Foreground),
-    (Stage, Background),
-    (StartLanguageServer, Foreground),
-    (SubscribeToChannels, Foreground),
-    (SyncExtensions, Background),
-    (SyncExtensionsResponse, Background),
-    (BreakpointsForFile, Background),
-    (ToggleBreakpoint, Foreground),
-    (SynchronizeBuffers, Foreground),
-    (SynchronizeBuffersResponse, Foreground),
-    (SynchronizeContexts, Foreground),
-    (SynchronizeContextsResponse, Foreground),
-    (TaskContext, Background),
-    (TaskContextForLocation, Background),
-    (Test, Foreground),
-    (Toast, Background),
-    (Unfollow, Foreground),
-    (UnshareProject, Foreground),
-    (Unstage, Background),
-    (Stash, Background),
-    (StashPop, Background),
-    (StashApply, Background),
-    (StashDrop, Background),
-    (UpdateBuffer, Foreground),
-    (UpdateBufferFile, Foreground),
-    (UpdateChannelBuffer, Foreground),
-    (UpdateChannelBufferCollaborators, Foreground),
-    (UpdateChannelMessage, Foreground),
-    (UpdateChannels, Foreground),
-    (UpdateContacts, Foreground),
-    (UpdateContext, Foreground),
-    (UpdateDiagnosticSummary, Foreground),
-    (UpdateDiffBases, Foreground),
-    (UpdateFollowers, Foreground),
-    (UpdateGitBranch, Background),
-    (UpdateInviteInfo, Foreground),
-    (UpdateLanguageServer, Foreground),
-    (UpdateNotification, Foreground),
-    (UpdateParticipantLocation, Foreground),
-    (UpdateProject, Foreground),
-    (UpdateProjectCollaborator, Foreground),
-    (UpdateUserChannels, Foreground),
-    (UpdateWorktree, Foreground),
-    (UpdateWorktreeSettings, Foreground),
-    (UpdateUserSettings, Background),
-    (UpdateRepository, Foreground),
-    (RemoveRepository, Foreground),
-    (UsersResponse, Foreground),
-    (GitReset, Background),
-    (GitDeleteBranch, Background),
-    (GitCheckoutFiles, Background),
-    (GitShow, Background),
-    (GitCommitDetails, Background),
-    (GitFileHistory, Background),
-    (GitFileHistoryResponse, Background),
-    (SetIndexText, Background),
-    (Push, Background),
-    (Fetch, Background),
-    (GetRemotes, Background),
-    (GetRemotesResponse, Background),
-    (Pull, Background),
-    (RemoteMessageResponse, Background),
-    (AskPassRequest, Background),
-    (AskPassResponse, Background),
-    (GitCreateRemote, Background),
-    (GitRemoveRemote, Background),
-    (GitCreateBranch, Background),
-    (GitChangeBranch, Background),
-    (GitRenameBranch, Background),
-    (CheckForPushedCommits, Background),
-    (CheckForPushedCommitsResponse, Background),
-    (GitDiff, Background),
-    (GitDiffResponse, Background),
-    (GitInit, Background),
-    (GetDebugAdapterBinary, Background),
-    (DebugAdapterBinary, Background),
-    (RunDebugLocators, Background),
-    (DebugRequest, Background),
-    (LogToDebugConsole, Background),
-    (GetDocumentDiagnostics, Background),
-    (GetDocumentDiagnosticsResponse, Background),
-    (PullWorkspaceDiagnostics, Background),
-    (GetDefaultBranch, Background),
-    (GetDefaultBranchResponse, Background),
-    (GetTreeDiff, Background),
-    (GetTreeDiffResponse, Background),
-    (GetBlobContent, Background),
-    (GetBlobContentResponse, Background),
-    (GitClone, Background),
-    (GitCloneResponse, Background),
-    (ToggleLspLogs, Background),
-    (GetDirectoryEnvironment, Background),
-    (DirectoryEnvironment, Background),
-    (GetAgentServerCommand, Background),
-    (AgentServerCommand, Background),
-    (ExternalAgentsUpdated, Background),
-    (ExternalExtensionAgentsUpdated, Background),
-    (ExternalAgentLoadingStatusUpdated, Background),
-    (NewExternalAgentVersionAvailable, Background),
-    (RemoteStarted, Background),
-    (GitGetWorktrees, Background),
-    (GitWorktreesResponse, Background),
-    (GitCreateWorktree, Background)
-);
-
-request_messages!(
-    (ApplyCodeAction, ApplyCodeActionResponse),
-    (
-        ApplyCompletionAdditionalEdits,
-        ApplyCompletionAdditionalEditsResponse
-    ),
-    (Call, Ack),
-    (CancelCall, Ack),
-    (Commit, Ack),
-    (RunGitHook, Ack),
-    (CopyProjectEntry, ProjectEntryResponse),
-    (CreateChannel, CreateChannelResponse),
-    (CreateProjectEntry, ProjectEntryResponse),
-    (CreateRoom, CreateRoomResponse),
-    (DeclineCall, Ack),
-    (DeleteChannel, Ack),
-    (DeleteProjectEntry, ProjectEntryResponse),
-    (ExpandProjectEntry, ExpandProjectEntryResponse),
-    (ExpandAllForProjectEntry, ExpandAllForProjectEntryResponse),
-    (Follow, FollowResponse),
-    (ApplyCodeActionKind, ApplyCodeActionKindResponse),
-    (FormatBuffers, FormatBuffersResponse),
-    (FuzzySearchUsers, UsersResponse),
-    (GetChannelMembers, GetChannelMembersResponse),
-    (GetChannelMessages, GetChannelMessagesResponse),
-    (GetChannelMessagesById, GetChannelMessagesResponse),
-    (GetCodeActions, GetCodeActionsResponse),
-    (GetCompletions, GetCompletionsResponse),
-    (GetDefinition, GetDefinitionResponse),
-    (GetDeclaration, GetDeclarationResponse),
-    (GetImplementation, GetImplementationResponse),
-    (GetDocumentHighlights, GetDocumentHighlightsResponse),
-    (GetDocumentSymbols, GetDocumentSymbolsResponse),
-    (GetHover, GetHoverResponse),
-    (GetNotifications, GetNotificationsResponse),
-    (GetProjectSymbols, GetProjectSymbolsResponse),
-    (GetReferences, GetReferencesResponse),
-    (GetSignatureHelp, GetSignatureHelpResponse),
-    (OpenUnstagedDiff, OpenUnstagedDiffResponse),
-    (OpenUncommittedDiff, OpenUncommittedDiffResponse),
-    (GetSupermavenApiKey, GetSupermavenApiKeyResponse),
-    (GetTypeDefinition, GetTypeDefinitionResponse),
-    (LinkedEditingRange, LinkedEditingRangeResponse),
-    (ListRemoteDirectory, ListRemoteDirectoryResponse),
-    (GetUsers, UsersResponse),
-    (IncomingCall, Ack),
-    (InlayHints, InlayHintsResponse),
-    (GetCodeLens, GetCodeLensResponse),
-    (InviteChannelMember, Ack),
-    (JoinChannel, JoinRoomResponse),
-    (JoinChannelBuffer, JoinChannelBufferResponse),
-    (JoinChannelChat, JoinChannelChatResponse),
-    (JoinProject, JoinProjectResponse),
-    (JoinRoom, JoinRoomResponse),
-    (LeaveChannelBuffer, Ack),
-    (LeaveRoom, Ack),
-    (LoadCommitDiff, LoadCommitDiffResponse),
-    (MarkNotificationRead, Ack),
-    (MoveChannel, Ack),
-    (OnTypeFormatting, OnTypeFormattingResponse),
-    (OpenBufferById, OpenBufferResponse),
-    (OpenBufferByPath, OpenBufferResponse),
-    (OpenImageByPath, OpenImageResponse),
-    (OpenBufferForSymbol, OpenBufferForSymbolResponse),
-    (OpenCommitMessageBuffer, OpenBufferResponse),
-    (OpenNewBuffer, OpenBufferResponse),
-    (PerformRename, PerformRenameResponse),
-    (Ping, Ack),
-    (PrepareRename, PrepareRenameResponse),
-    (RefreshInlayHints, Ack),
-    (RefreshCodeLens, Ack),
-    (RejoinChannelBuffers, RejoinChannelBuffersResponse),
-    (RejoinRoom, RejoinRoomResponse),
-    (ReloadBuffers, ReloadBuffersResponse),
-    (RemoveChannelMember, Ack),
-    (RemoveChannelMessage, Ack),
-    (UpdateChannelMessage, Ack),
-    (RemoveContact, Ack),
-    (RenameChannel, RenameChannelResponse),
-    (RenameProjectEntry, ProjectEntryResponse),
-    (ReorderChannel, Ack),
-    (RequestContact, Ack),
-    (
-        ResolveCompletionDocumentation,
-        ResolveCompletionDocumentationResponse
-    ),
-    (ResolveInlayHint, ResolveInlayHintResponse),
-    (GetDocumentColor, GetDocumentColorResponse),
-    (GetColorPresentation, GetColorPresentationResponse),
-    (RespondToChannelInvite, Ack),
-    (RespondToContactRequest, Ack),
-    (SaveBuffer, BufferSaved),
-    (Stage, Ack),
-    (FindSearchCandidates, FindSearchCandidatesResponse),
-    (SendChannelMessage, SendChannelMessageResponse),
-    (SetChannelMemberRole, Ack),
-    (SetChannelVisibility, Ack),
-    (ShareProject, ShareProjectResponse),
-    (SynchronizeBuffers, SynchronizeBuffersResponse),
-    (TaskContextForLocation, TaskContext),
-    (Test, Test),
-    (Unstage, Ack),
-    (Stash, Ack),
-    (StashPop, Ack),
-    (StashApply, Ack),
-    (StashDrop, Ack),
-    (UpdateBuffer, Ack),
-    (UpdateParticipantLocation, Ack),
-    (UpdateProject, Ack),
-    (UpdateWorktree, Ack),
-    (UpdateRepository, Ack),
-    (RemoveRepository, Ack),
-    (LspExtExpandMacro, LspExtExpandMacroResponse),
-    (LspExtOpenDocs, LspExtOpenDocsResponse),
-    (LspExtRunnables, LspExtRunnablesResponse),
-    (SetRoomParticipantRole, Ack),
-    (BlameBuffer, BlameBufferResponse),
-    (RejoinRemoteProjects, RejoinRemoteProjectsResponse),
-    (LspQuery, Ack),
-    (LspQueryResponse, Ack),
-    (RestartLanguageServers, Ack),
-    (StopLanguageServers, Ack),
-    (OpenContext, OpenContextResponse),
-    (CreateContext, CreateContextResponse),
-    (SynchronizeContexts, SynchronizeContextsResponse),
-    (LspExtSwitchSourceHeader, LspExtSwitchSourceHeaderResponse),
-    (LspExtGoToParentModule, LspExtGoToParentModuleResponse),
-    (LspExtCancelFlycheck, Ack),
-    (LspExtRunFlycheck, Ack),
-    (LspExtClearFlycheck, Ack),
-    (AddWorktree, AddWorktreeResponse),
-    (ShutdownRemoteServer, Ack),
-    (RemoveWorktree, Ack),
-    (OpenServerSettings, OpenBufferResponse),
-    (GetPermalinkToLine, GetPermalinkToLineResponse),
-    (FlushBufferedMessages, Ack),
-    (LanguageServerPromptRequest, LanguageServerPromptResponse),
-    (GitGetBranches, GitBranchesResponse),
-    (UpdateGitBranch, Ack),
-    (ListToolchains, ListToolchainsResponse),
-    (ActivateToolchain, Ack),
-    (ActiveToolchain, ActiveToolchainResponse),
-    (ResolveToolchain, ResolveToolchainResponse),
-    (GetPathMetadata, GetPathMetadataResponse),
-    (GetCrashFiles, GetCrashFilesResponse),
-    (CancelLanguageServerWork, Ack),
-    (SyncExtensions, SyncExtensionsResponse),
-    (InstallExtension, Ack),
-    (RegisterBufferWithLanguageServers, Ack),
-    (GitShow, GitCommitDetails),
-    (GitFileHistory, GitFileHistoryResponse),
-    (GitReset, Ack),
-    (GitDeleteBranch, Ack),
-    (GitCheckoutFiles, Ack),
-    (SetIndexText, Ack),
-    (Push, RemoteMessageResponse),
-    (Fetch, RemoteMessageResponse),
-    (GetRemotes, GetRemotesResponse),
-    (Pull, RemoteMessageResponse),
-    (AskPassRequest, AskPassResponse),
-    (GitCreateRemote, Ack),
-    (GitRemoveRemote, Ack),
-    (GitCreateBranch, Ack),
-    (GitChangeBranch, Ack),
-    (GitRenameBranch, Ack),
-    (CheckForPushedCommits, CheckForPushedCommitsResponse),
-    (GitDiff, GitDiffResponse),
-    (GitInit, Ack),
-    (ToggleBreakpoint, Ack),
-    (GetDebugAdapterBinary, DebugAdapterBinary),
-    (RunDebugLocators, DebugRequest),
-    (GetDocumentDiagnostics, GetDocumentDiagnosticsResponse),
-    (PullWorkspaceDiagnostics, Ack),
-    (GetDefaultBranch, GetDefaultBranchResponse),
-    (GetBlobContent, GetBlobContentResponse),
-    (GetTreeDiff, GetTreeDiffResponse),
-    (GitClone, GitCloneResponse),
-    (ToggleLspLogs, Ack),
-    (GetDirectoryEnvironment, DirectoryEnvironment),
-    (GetProcesses, GetProcessesResponse),
-    (GetAgentServerCommand, AgentServerCommand),
-    (RemoteStarted, Ack),
-    (GitGetWorktrees, GitWorktreesResponse),
-    (GitCreateWorktree, Ack)
-);
-
-lsp_messages!(
-    (GetReferences, GetReferencesResponse, true),
-    (GetDocumentColor, GetDocumentColorResponse, true),
-    (GetHover, GetHoverResponse, true),
-    (GetCodeActions, GetCodeActionsResponse, true),
-    (GetSignatureHelp, GetSignatureHelpResponse, true),
-    (GetCodeLens, GetCodeLensResponse, true),
-    (GetDocumentDiagnostics, GetDocumentDiagnosticsResponse, true),
-    (GetDefinition, GetDefinitionResponse, true),
-    (GetDeclaration, GetDeclarationResponse, true),
-    (GetTypeDefinition, GetTypeDefinitionResponse, true),
-    (GetImplementation, GetImplementationResponse, true),
-    (InlayHints, InlayHintsResponse, false),
-);
-
-entity_messages!(
-    {project_id, ShareProject},
-    AddProjectCollaborator,
-    AddWorktree,
-    ApplyCodeAction,
-    ApplyCompletionAdditionalEdits,
-    BlameBuffer,
-    BufferReloaded,
-    BufferSaved,
-    CloseBuffer,
-    Commit,
-    RunGitHook,
-    GetColorPresentation,
-    CopyProjectEntry,
-    CreateBufferForPeer,
-    CreateImageForPeer,
-    CreateProjectEntry,
-    GetDocumentColor,
-    DeleteProjectEntry,
-    ExpandProjectEntry,
-    ExpandAllForProjectEntry,
-    FindSearchCandidates,
-    ApplyCodeActionKind,
-    FormatBuffers,
-    GetCodeActions,
-    GetCodeLens,
-    GetCompletions,
-    GetDefinition,
-    GetDeclaration,
-    GetImplementation,
-    GetDocumentHighlights,
-    GetDocumentSymbols,
-    GetHover,
-    GetProjectSymbols,
-    GetReferences,
-    GetSignatureHelp,
-    OpenUnstagedDiff,
-    OpenUncommittedDiff,
-    GetTypeDefinition,
-    InlayHints,
-    JoinProject,
-    LeaveProject,
-    LinkedEditingRange,
-    LoadCommitDiff,
-    LspQuery,
-    LspQueryResponse,
-    RestartLanguageServers,
-    StopLanguageServers,
-    OnTypeFormatting,
-    OpenNewBuffer,
-    OpenBufferById,
-    OpenBufferByPath,
-    OpenImageByPath,
-    OpenBufferForSymbol,
-    OpenCommitMessageBuffer,
-    PerformRename,
-    PrepareRename,
-    RefreshInlayHints,
-    RefreshCodeLens,
-    ReloadBuffers,
-    RemoveProjectCollaborator,
-    RenameProjectEntry,
-    ResolveCompletionDocumentation,
-    ResolveInlayHint,
-    SaveBuffer,
-    Stage,
-    StartLanguageServer,
-    SynchronizeBuffers,
-    TaskContextForLocation,
-    UnshareProject,
-    Unstage,
-    Stash,
-    StashPop,
-    StashApply,
-    StashDrop,
-    UpdateBuffer,
-    UpdateBufferFile,
-    UpdateDiagnosticSummary,
-    UpdateDiffBases,
-    UpdateLanguageServer,
-    UpdateProject,
-    UpdateProjectCollaborator,
-    UpdateWorktree,
-    UpdateRepository,
-    RemoveRepository,
-    UpdateWorktreeSettings,
-    UpdateUserSettings,
-    LspExtExpandMacro,
-    LspExtOpenDocs,
-    LspExtRunnables,
-    AdvertiseContexts,
-    OpenContext,
-    CreateContext,
-    UpdateContext,
-    SynchronizeContexts,
-    LspExtSwitchSourceHeader,
-    LspExtGoToParentModule,
-    LspExtCancelFlycheck,
-    LspExtRunFlycheck,
-    LspExtClearFlycheck,
-    LanguageServerLog,
-    Toast,
-    HideToast,
-    OpenServerSettings,
-    GetPermalinkToLine,
-    LanguageServerPromptRequest,
-    GitGetBranches,
-    UpdateGitBranch,
-    ListToolchains,
-    ActivateToolchain,
-    ActiveToolchain,
-    ResolveToolchain,
-    GetPathMetadata,
-    GetProcesses,
-    CancelLanguageServerWork,
-    RegisterBufferWithLanguageServers,
-    GitShow,
-    GitFileHistory,
-    GitReset,
-    GitDeleteBranch,
-    GitCheckoutFiles,
-    SetIndexText,
-    ToggleLspLogs,
-    GetDirectoryEnvironment,
-
-    Push,
-    Fetch,
-    GetRemotes,
-    Pull,
-    AskPassRequest,
-    GitChangeBranch,
-    GitRenameBranch,
-    GitCreateBranch,
-    GitCreateRemote,
-    GitRemoveRemote,
-    CheckForPushedCommits,
-    GitDiff,
-    GitInit,
-    BreakpointsForFile,
-    ToggleBreakpoint,
-    RunDebugLocators,
-    GetDebugAdapterBinary,
-    LogToDebugConsole,
-    GetDocumentDiagnostics,
-    PullWorkspaceDiagnostics,
-    GetDefaultBranch,
-    GetTreeDiff,
-    GetBlobContent,
-    GitClone,
-    GetAgentServerCommand,
-    ExternalAgentsUpdated,
-    ExternalExtensionAgentsUpdated,
-    ExternalAgentLoadingStatusUpdated,
-    NewExternalAgentVersionAvailable,
-    GitGetWorktrees,
-    GitCreateWorktree
-);
-
-entity_messages!(
-    {channel_id, Channel},
-    ChannelMessageSent,
-    ChannelMessageUpdate,
-    RemoveChannelMessage,
-    UpdateChannelMessage,
-    UpdateChannelBuffer,
-    UpdateChannelBufferCollaborators,
-);
-
-impl From<Timestamp> for SystemTime {
-    fn from(val: Timestamp) -> Self {
-        UNIX_EPOCH
-            .checked_add(Duration::new(val.seconds, val.nanos))
-            .unwrap()
-    }
-}
-
-impl From<SystemTime> for Timestamp {
-    fn from(time: SystemTime) -> Self {
-        let duration = time.duration_since(UNIX_EPOCH).unwrap_or_default();
-        Self {
-            seconds: duration.as_secs(),
-            nanos: duration.subsec_nanos(),
-        }
-    }
-}
-
-impl From<u128> for Nonce {
-    fn from(nonce: u128) -> Self {
-        let upper_half = (nonce >> 64) as u64;
-        let lower_half = nonce as u64;
-        Self {
-            upper_half,
-            lower_half,
-        }
-    }
-}
-
-impl From<Nonce> for u128 {
-    fn from(nonce: Nonce) -> Self {
-        let upper_half = (nonce.upper_half as u128) << 64;
-        let lower_half = nonce.lower_half as u128;
-        upper_half | lower_half
-    }
-}
-
-#[cfg(any(test, feature = "test-support"))]
-pub const MAX_WORKTREE_UPDATE_MAX_CHUNK_SIZE: usize = 2;
-#[cfg(not(any(test, feature = "test-support")))]
-pub const MAX_WORKTREE_UPDATE_MAX_CHUNK_SIZE: usize = 256;
-
-pub fn split_worktree_update(mut message: UpdateWorktree) -> impl Iterator<Item = UpdateWorktree> {
-    let mut done = false;
-
-    iter::from_fn(move || {
-        if done {
-            return None;
-        }
-
-        let updated_entries_chunk_size = cmp::min(
-            message.updated_entries.len(),
-            MAX_WORKTREE_UPDATE_MAX_CHUNK_SIZE,
-        );
-        let updated_entries: Vec<_> = message
-            .updated_entries
-            .drain(..updated_entries_chunk_size)
-            .collect();
-
-        let removed_entries_chunk_size = cmp::min(
-            message.removed_entries.len(),
-            MAX_WORKTREE_UPDATE_MAX_CHUNK_SIZE,
-        );
-        let removed_entries = message
-            .removed_entries
-            .drain(..removed_entries_chunk_size)
-            .collect();
-
-        let mut updated_repositories = Vec::new();
-        let mut limit = MAX_WORKTREE_UPDATE_MAX_CHUNK_SIZE;
-        while let Some(repo) = message.updated_repositories.first_mut() {
-            let updated_statuses_limit = cmp::min(repo.updated_statuses.len(), limit);
-            let removed_statuses_limit = cmp::min(repo.removed_statuses.len(), limit);
-
-            updated_repositories.push(RepositoryEntry {
-                repository_id: repo.repository_id,
-                branch_summary: repo.branch_summary.clone(),
-                updated_statuses: repo
-                    .updated_statuses
-                    .drain(..updated_statuses_limit)
-                    .collect(),
-                removed_statuses: repo
-                    .removed_statuses
-                    .drain(..removed_statuses_limit)
-                    .collect(),
-                current_merge_conflicts: repo.current_merge_conflicts.clone(),
-            });
-            if repo.removed_statuses.is_empty() && repo.updated_statuses.is_empty() {
-                message.updated_repositories.remove(0);
-            }
-            limit = limit.saturating_sub(removed_statuses_limit + updated_statuses_limit);
-            if limit == 0 {
-                break;
-            }
-        }
-
-        done = message.updated_entries.is_empty()
-            && message.removed_entries.is_empty()
-            && message.updated_repositories.is_empty();
-
-        let removed_repositories = if done {
-            mem::take(&mut message.removed_repositories)
-        } else {
-            Default::default()
-        };
-
-        Some(UpdateWorktree {
-            project_id: message.project_id,
-            worktree_id: message.worktree_id,
-            root_name: message.root_name.clone(),
-            abs_path: message.abs_path.clone(),
-            updated_entries,
-            removed_entries,
-            scan_id: message.scan_id,
-            is_last_update: done && message.is_last_update,
-            updated_repositories,
-            removed_repositories,
-        })
-    })
-}
-
-pub fn split_repository_update(
-    mut update: UpdateRepository,
-) -> impl Iterator<Item = UpdateRepository> {
-    let mut updated_statuses_iter = mem::take(&mut update.updated_statuses).into_iter().fuse();
-    let mut removed_statuses_iter = mem::take(&mut update.removed_statuses).into_iter().fuse();
-    std::iter::from_fn({
-        let update = update.clone();
-        move || {
-            let updated_statuses = updated_statuses_iter
-                .by_ref()
-                .take(MAX_WORKTREE_UPDATE_MAX_CHUNK_SIZE)
-                .collect::<Vec<_>>();
-            let removed_statuses = removed_statuses_iter
-                .by_ref()
-                .take(MAX_WORKTREE_UPDATE_MAX_CHUNK_SIZE)
-                .collect::<Vec<_>>();
-            if updated_statuses.is_empty() && removed_statuses.is_empty() {
-                return None;
-            }
-            Some(UpdateRepository {
-                updated_statuses,
-                removed_statuses,
-                is_last_update: false,
-                ..update.clone()
-            })
-        }
-    })
-    .chain([UpdateRepository {
-        updated_statuses: Vec::new(),
-        removed_statuses: Vec::new(),
-        is_last_update: true,
-        ..update
-    }])
-}
-
-impl LspQuery {
-    pub fn query_name_and_write_permissions(&self) -> (&str, bool) {
-        match self.request {
-            Some(lsp_query::Request::GetHover(_)) => ("GetHover", false),
-            Some(lsp_query::Request::GetCodeActions(_)) => ("GetCodeActions", true),
-            Some(lsp_query::Request::GetSignatureHelp(_)) => ("GetSignatureHelp", false),
-            Some(lsp_query::Request::GetCodeLens(_)) => ("GetCodeLens", true),
-            Some(lsp_query::Request::GetDocumentDiagnostics(_)) => {
-                ("GetDocumentDiagnostics", false)
-            }
-            Some(lsp_query::Request::GetDefinition(_)) => ("GetDefinition", false),
-            Some(lsp_query::Request::GetDeclaration(_)) => ("GetDeclaration", false),
-            Some(lsp_query::Request::GetTypeDefinition(_)) => ("GetTypeDefinition", false),
-            Some(lsp_query::Request::GetImplementation(_)) => ("GetImplementation", false),
-            Some(lsp_query::Request::GetReferences(_)) => ("GetReferences", false),
-            Some(lsp_query::Request::GetDocumentColor(_)) => ("GetDocumentColor", false),
-            Some(lsp_query::Request::InlayHints(_)) => ("InlayHints", false),
-            None => ("<unknown>", true),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_converting_peer_id_from_and_to_u64() {
-        let peer_id = PeerId {
-            owner_id: 10,
-            id: 3,
-        };
-        assert_eq!(PeerId::from_u64(peer_id.as_u64()), peer_id);
-        let peer_id = PeerId {
-            owner_id: u32::MAX,
-            id: 3,
-        };
-        assert_eq!(PeerId::from_u64(peer_id.as_u64()), peer_id);
-        let peer_id = PeerId {
-            owner_id: 10,
-            id: u32::MAX,
-        };
-        assert_eq!(PeerId::from_u64(peer_id.as_u64()), peer_id);
-        let peer_id = PeerId {
-            owner_id: u32::MAX,
-            id: u32::MAX,
-        };
-        assert_eq!(PeerId::from_u64(peer_id.as_u64()), peer_id);
-    }
-}
diff --git a/crates/proto/src/typed_envelope.rs b/crates/proto/src/typed_envelope.rs
deleted file mode 100644
index a7a8a1c7a2..0000000000
--- a/crates/proto/src/typed_envelope.rs
+++ /dev/null
@@ -1,210 +0,0 @@
-use crate::{Envelope, PeerId};
-use anyhow::{Context as _, Result};
-use serde::Serialize;
-use std::{
-    any::{Any, TypeId},
-    cmp,
-    fmt::{self, Debug},
-};
-use std::{marker::PhantomData, time::Instant};
-
-pub trait EnvelopedMessage: Clone + Debug + Serialize + Sized + Send + Sync + 'static {
-    const NAME: &'static str;
-    const PRIORITY: MessagePriority;
-    fn into_envelope(
-        self,
-        id: u32,
-        responding_to: Option<u32>,
-        original_sender_id: Option<PeerId>,
-    ) -> Envelope;
-    fn from_envelope(envelope: Envelope) -> Option<Self>;
-}
-
-pub trait EntityMessage: EnvelopedMessage {
-    type Entity;
-    fn remote_entity_id(&self) -> u64;
-}
-
-pub trait RequestMessage: EnvelopedMessage {
-    type Response: EnvelopedMessage;
-}
-
-/// A trait to bind LSP request and responses for the proto layer.
-/// Should be used for every LSP request that has to traverse through the proto layer.
-///
-/// `lsp_messages` macro in the same crate provides a convenient way to implement this.
-pub trait LspRequestMessage: EnvelopedMessage {
-    type Response: EnvelopedMessage;
-
-    fn to_proto_query(self) -> crate::lsp_query::Request;
-
-    fn response_to_proto_query(response: Self::Response) -> crate::lsp_response::Response;
-
-    fn buffer_id(&self) -> u64;
-
-    fn buffer_version(&self) -> &[crate::VectorClockEntry];
-
-    /// Whether to deduplicate the requests, or keep the previous ones running when another
-    /// request of the same kind is processed.
-    fn stop_previous_requests() -> bool;
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct LspRequestId(pub u64);
-
-/// A response from a single language server.
-/// There could be multiple responses for a single LSP request,
-/// from different servers.
-pub struct ProtoLspResponse<R> {
-    pub server_id: u64,
-    pub response: R,
-}
-
-impl ProtoLspResponse<Box<dyn AnyTypedEnvelope>> {
-    pub fn into_response<T: LspRequestMessage>(self) -> Result<ProtoLspResponse<T::Response>> {
-        let envelope = self
-            .response
-            .into_any()
-            .downcast::<TypedEnvelope<T::Response>>()
-            .map_err(|_| {
-                anyhow::anyhow!(
-                    "cannot downcast LspResponse to {} for message {}",
-                    T::Response::NAME,
-                    T::NAME,
-                )
-            })?;
-
-        Ok(ProtoLspResponse {
-            server_id: self.server_id,
-            response: envelope.payload,
-        })
-    }
-}
-
-pub trait AnyTypedEnvelope: Any + Send + Sync {
-    fn payload_type_id(&self) -> TypeId;
-    fn payload_type_name(&self) -> &'static str;
-    fn into_any(self: Box<Self>) -> Box<dyn Any + Send + Sync>;
-    fn is_background(&self) -> bool;
-    fn original_sender_id(&self) -> Option<PeerId>;
-    fn sender_id(&self) -> PeerId;
-    fn message_id(&self) -> u32;
-}
-
-pub enum MessagePriority {
-    Foreground,
-    Background,
-}
-
-impl<T: EnvelopedMessage> AnyTypedEnvelope for TypedEnvelope<T> {
-    fn payload_type_id(&self) -> TypeId {
-        TypeId::of::<T>()
-    }
-
-    fn payload_type_name(&self) -> &'static str {
-        T::NAME
-    }
-
-    fn into_any(self: Box<Self>) -> Box<dyn Any + Send + Sync> {
-        self
-    }
-
-    fn is_background(&self) -> bool {
-        matches!(T::PRIORITY, MessagePriority::Background)
-    }
-
-    fn original_sender_id(&self) -> Option<PeerId> {
-        self.original_sender_id
-    }
-
-    fn sender_id(&self) -> PeerId {
-        self.sender_id
-    }
-
-    fn message_id(&self) -> u32 {
-        self.message_id
-    }
-}
-
-impl PeerId {
-    pub fn from_u64(peer_id: u64) -> Self {
-        let owner_id = (peer_id >> 32) as u32;
-        let id = peer_id as u32;
-        Self { owner_id, id }
-    }
-
-    pub fn as_u64(self) -> u64 {
-        ((self.owner_id as u64) << 32) | (self.id as u64)
-    }
-}
-
-impl Copy for PeerId {}
-
-impl Eq for PeerId {}
-
-impl Ord for PeerId {
-    fn cmp(&self, other: &Self) -> cmp::Ordering {
-        self.owner_id
-            .cmp(&other.owner_id)
-            .then_with(|| self.id.cmp(&other.id))
-    }
-}
-
-impl PartialOrd for PeerId {
-    fn partial_cmp(&self, other: &Self) -> Option<cmp::Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-impl std::hash::Hash for PeerId {
-    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-        self.owner_id.hash(state);
-        self.id.hash(state);
-    }
-}
-
-impl fmt::Display for PeerId {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}/{}", self.owner_id, self.id)
-    }
-}
-
-pub struct Receipt<T> {
-    pub sender_id: PeerId,
-    pub message_id: u32,
-    payload_type: PhantomData<T>,
-}
-
-impl<T> Clone for Receipt<T> {
-    fn clone(&self) -> Self {
-        *self
-    }
-}
-
-impl<T> Copy for Receipt<T> {}
-
-#[derive(Clone, Debug)]
-pub struct TypedEnvelope<T> {
-    pub sender_id: PeerId,
-    pub original_sender_id: Option<PeerId>,
-    pub message_id: u32,
-    pub payload: T,
-    pub received_at: Instant,
-}
-
-impl<T> TypedEnvelope<T> {
-    pub fn original_sender_id(&self) -> Result<PeerId> {
-        self.original_sender_id
-            .context("missing original_sender_id")
-    }
-}
-
-impl<T: RequestMessage> TypedEnvelope<T> {
-    pub fn receipt(&self) -> Receipt<T> {
-        Receipt {
-            sender_id: self.sender_id,
-            message_id: self.message_id,
-            payload_type: PhantomData,
-        }
-    }
-}
diff --git a/crates/recent_projects/Cargo.toml b/crates/recent_projects/Cargo.toml
deleted file mode 100644
index feaf511b81..0000000000
--- a/crates/recent_projects/Cargo.toml
+++ /dev/null
@@ -1,62 +0,0 @@
-[package]
-name = "recent_projects"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/recent_projects.rs"
-doctest = false
-
-[dependencies]
-anyhow.workspace = true
-askpass.workspace = true
-auto_update.workspace = true
-db.workspace = true
-editor.workspace = true
-extension_host.workspace = true
-file_finder.workspace = true
-futures.workspace = true
-fuzzy.workspace = true
-gpui.workspace = true
-language.workspace = true
-log.workspace = true
-markdown.workspace = true
-menu.workspace = true
-node_runtime.workspace = true
-ordered-float.workspace = true
-paths.workspace = true
-picker.workspace = true
-project.workspace = true
-release_channel.workspace = true
-remote.workspace = true
-semver.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-smol.workspace = true
-task.workspace = true
-telemetry.workspace = true
-theme.workspace = true
-ui.workspace = true
-util.workspace = true
-workspace.workspace = true
-worktree.workspace = true
-zed_actions.workspace = true
-indoc.workspace = true
-
-[target.'cfg(target_os = "windows")'.dependencies]
-windows-registry = "0.6.0"
-
-[dev-dependencies]
-dap.workspace = true
-editor = { workspace = true, features = ["test-support"] }
-language = { workspace = true, features = ["test-support"] }
-project = { workspace = true, features = ["test-support"] }
-serde_json.workspace = true
-settings = { workspace = true, features = ["test-support"] }
-workspace = { workspace = true, features = ["test-support"] }
diff --git a/crates/recent_projects/LICENSE-GPL b/crates/recent_projects/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/recent_projects/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/recent_projects/src/dev_container.rs b/crates/recent_projects/src/dev_container.rs
deleted file mode 100644
index 0e6b8b381d..0000000000
--- a/crates/recent_projects/src/dev_container.rs
+++ /dev/null
@@ -1,295 +0,0 @@
-use std::path::{Path, PathBuf};
-use std::sync::Arc;
-
-use gpui::AsyncWindowContext;
-use node_runtime::NodeRuntime;
-use serde::Deserialize;
-use settings::DevContainerConnection;
-use smol::fs;
-use workspace::Workspace;
-
-use crate::remote_connections::Connection;
-
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct DevContainerUp {
-    _outcome: String,
-    container_id: String,
-    _remote_user: String,
-    remote_workspace_folder: String,
-}
-
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct DevContainerConfiguration {
-    name: Option<String>,
-}
-
-#[derive(Debug, Deserialize)]
-struct DevContainerConfigurationOutput {
-    configuration: DevContainerConfiguration,
-}
-
-#[cfg(not(target_os = "windows"))]
-fn dev_container_cli() -> String {
-    "devcontainer".to_string()
-}
-
-#[cfg(target_os = "windows")]
-fn dev_container_cli() -> String {
-    "devcontainer.cmd".to_string()
-}
-
-async fn check_for_docker() -> Result<(), DevContainerError> {
-    let mut command = util::command::new_smol_command("docker");
-    command.arg("--version");
-
-    match command.output().await {
-        Ok(_) => Ok(()),
-        Err(e) => {
-            log::error!("Unable to find docker in $PATH: {:?}", e);
-            Err(DevContainerError::DockerNotAvailable)
-        }
-    }
-}
-
-async fn ensure_devcontainer_cli(node_runtime: NodeRuntime) -> Result<PathBuf, DevContainerError> {
-    let mut command = util::command::new_smol_command(&dev_container_cli());
-    command.arg("--version");
-
-    if let Err(e) = command.output().await {
-        log::error!(
-            "Unable to find devcontainer CLI in $PATH. Checking for a zed installed version. Error: {:?}",
-            e
-        );
-
-        let datadir_cli_path = paths::devcontainer_dir()
-            .join("node_modules")
-            .join(".bin")
-            .join(&dev_container_cli());
-
-        let mut command =
-            util::command::new_smol_command(&datadir_cli_path.as_os_str().display().to_string());
-        command.arg("--version");
-
-        if let Err(e) = command.output().await {
-            log::error!(
-                "Unable to find devcontainer CLI in Data dir. Will try to install. Error: {:?}",
-                e
-            );
-        } else {
-            log::info!("Found devcontainer CLI in Data dir");
-            return Ok(datadir_cli_path.clone());
-        }
-
-        if let Err(e) = fs::create_dir_all(paths::devcontainer_dir()).await {
-            log::error!("Unable to create devcontainer directory. Error: {:?}", e);
-            return Err(DevContainerError::DevContainerCliNotAvailable);
-        }
-
-        if let Err(e) = node_runtime
-            .npm_install_packages(
-                &paths::devcontainer_dir(),
-                &[("@devcontainers/cli", "latest")],
-            )
-            .await
-        {
-            log::error!(
-                "Unable to install devcontainer CLI to data directory. Error: {:?}",
-                e
-            );
-            return Err(DevContainerError::DevContainerCliNotAvailable);
-        };
-
-        let mut command = util::command::new_smol_command(&datadir_cli_path.display().to_string());
-        command.arg("--version");
-        if let Err(e) = command.output().await {
-            log::error!(
-                "Unable to find devcontainer cli after NPM install. Error: {:?}",
-                e
-            );
-            Err(DevContainerError::DevContainerCliNotAvailable)
-        } else {
-            Ok(datadir_cli_path)
-        }
-    } else {
-        log::info!("Found devcontainer cli on $PATH, using it");
-        Ok(PathBuf::from(&dev_container_cli()))
-    }
-}
-
-async fn devcontainer_up(
-    path_to_cli: &PathBuf,
-    path: Arc<Path>,
-) -> Result<DevContainerUp, DevContainerError> {
-    let mut command = util::command::new_smol_command(path_to_cli.display().to_string());
-    command.arg("up");
-    command.arg("--workspace-folder");
-    command.arg(path.display().to_string());
-
-    match command.output().await {
-        Ok(output) => {
-            if output.status.success() {
-                let raw = String::from_utf8_lossy(&output.stdout);
-                serde_json::from_str::<DevContainerUp>(&raw).map_err(|e| {
-                    log::error!(
-                        "Unable to parse response from 'devcontainer up' command, error: {:?}",
-                        e
-                    );
-                    DevContainerError::DevContainerParseFailed
-                })
-            } else {
-                log::error!(
-                    "Non-success status running devcontainer up for workspace: out: {:?}, err: {:?}",
-                    String::from_utf8_lossy(&output.stdout),
-                    String::from_utf8_lossy(&output.stderr)
-                );
-                Err(DevContainerError::DevContainerUpFailed)
-            }
-        }
-        Err(e) => {
-            log::error!("Error running devcontainer up: {:?}", e);
-            Err(DevContainerError::DevContainerUpFailed)
-        }
-    }
-}
-
-async fn devcontainer_read_configuration(
-    path_to_cli: &PathBuf,
-    path: Arc<Path>,
-) -> Result<DevContainerConfigurationOutput, DevContainerError> {
-    let mut command = util::command::new_smol_command(path_to_cli.display().to_string());
-    command.arg("read-configuration");
-    command.arg("--workspace-folder");
-    command.arg(path.display().to_string());
-    match command.output().await {
-        Ok(output) => {
-            if output.status.success() {
-                let raw = String::from_utf8_lossy(&output.stdout);
-                serde_json::from_str::<DevContainerConfigurationOutput>(&raw).map_err(|e| {
-                    log::error!(
-                        "Unable to parse response from 'devcontainer read-configuration' command, error: {:?}",
-                        e
-                    );
-                    DevContainerError::DevContainerParseFailed
-                })
-            } else {
-                log::error!(
-                    "Non-success status running devcontainer read-configuration for workspace: out: {:?}, err: {:?}",
-                    String::from_utf8_lossy(&output.stdout),
-                    String::from_utf8_lossy(&output.stderr)
-                );
-                Err(DevContainerError::DevContainerUpFailed)
-            }
-        }
-        Err(e) => {
-            log::error!("Error running devcontainer read-configuration: {:?}", e);
-            Err(DevContainerError::DevContainerUpFailed)
-        }
-    }
-}
-
-// Name the project with two fallbacks
-async fn get_project_name(
-    path_to_cli: &PathBuf,
-    path: Arc<Path>,
-    remote_workspace_folder: String,
-    container_id: String,
-) -> Result<String, DevContainerError> {
-    if let Ok(dev_container_configuration) =
-        devcontainer_read_configuration(path_to_cli, path).await
-        && let Some(name) = dev_container_configuration.configuration.name
-    {
-        // Ideally, name the project after the name defined in devcontainer.json
-        Ok(name)
-    } else {
-        // Otherwise, name the project after the remote workspace folder name
-        Ok(Path::new(&remote_workspace_folder)
-            .file_name()
-            .and_then(|name| name.to_str())
-            .map(|string| string.into())
-            // Finally, name the project after the container ID as a last resort
-            .unwrap_or_else(|| container_id.clone()))
-    }
-}
-
-fn project_directory(cx: &mut AsyncWindowContext) -> Option<Arc<Path>> {
-    let Some(workspace) = cx.window_handle().downcast::<Workspace>() else {
-        return None;
-    };
-
-    match workspace.update(cx, |workspace, _, cx| {
-        workspace.project().read(cx).active_project_directory(cx)
-    }) {
-        Ok(dir) => dir,
-        Err(e) => {
-            log::error!("Error getting project directory from workspace: {:?}", e);
-            None
-        }
-    }
-}
-
-pub(crate) async fn start_dev_container(
-    cx: &mut AsyncWindowContext,
-    node_runtime: NodeRuntime,
-) -> Result<(Connection, String), DevContainerError> {
-    check_for_docker().await?;
-
-    let path_to_devcontainer_cli = ensure_devcontainer_cli(node_runtime).await?;
-
-    let Some(directory) = project_directory(cx) else {
-        return Err(DevContainerError::DevContainerNotFound);
-    };
-
-    if let Ok(DevContainerUp {
-        container_id,
-        remote_workspace_folder,
-        ..
-    }) = devcontainer_up(&path_to_devcontainer_cli, directory.clone()).await
-    {
-        let project_name = get_project_name(
-            &path_to_devcontainer_cli,
-            directory,
-            remote_workspace_folder.clone(),
-            container_id.clone(),
-        )
-        .await?;
-
-        let connection = Connection::DevContainer(DevContainerConnection {
-            name: project_name.into(),
-            container_id: container_id.into(),
-        });
-
-        Ok((connection, remote_workspace_folder))
-    } else {
-        Err(DevContainerError::DevContainerUpFailed)
-    }
-}
-
-#[derive(Debug)]
-pub(crate) enum DevContainerError {
-    DockerNotAvailable,
-    DevContainerCliNotAvailable,
-    DevContainerUpFailed,
-    DevContainerNotFound,
-    DevContainerParseFailed,
-}
-
-#[cfg(test)]
-mod test {
-
-    use crate::dev_container::DevContainerUp;
-
-    #[test]
-    fn should_parse_from_devcontainer_json() {
-        let json = r#"{"outcome":"success","containerId":"826abcac45afd412abff083ab30793daff2f3c8ce2c831df728baf39933cb37a","remoteUser":"vscode","remoteWorkspaceFolder":"/workspaces/zed"}"#;
-        let up: DevContainerUp = serde_json::from_str(json).unwrap();
-        assert_eq!(up._outcome, "success");
-        assert_eq!(
-            up.container_id,
-            "826abcac45afd412abff083ab30793daff2f3c8ce2c831df728baf39933cb37a"
-        );
-        assert_eq!(up._remote_user, "vscode");
-        assert_eq!(up.remote_workspace_folder, "/workspaces/zed");
-    }
-}
diff --git a/crates/recent_projects/src/dev_container_suggest.rs b/crates/recent_projects/src/dev_container_suggest.rs
deleted file mode 100644
index 1e50080ea1..0000000000
--- a/crates/recent_projects/src/dev_container_suggest.rs
+++ /dev/null
@@ -1,106 +0,0 @@
-use db::kvp::KEY_VALUE_STORE;
-use gpui::{SharedString, Window};
-use project::{Project, WorktreeId};
-use std::sync::LazyLock;
-use ui::prelude::*;
-use util::rel_path::RelPath;
-use workspace::Workspace;
-use workspace::notifications::NotificationId;
-use workspace::notifications::simple_message_notification::MessageNotification;
-use worktree::UpdatedEntriesSet;
-
-const DEV_CONTAINER_SUGGEST_KEY: &str = "dev_container_suggest_dismissed";
-
-fn devcontainer_path() -> &'static RelPath {
-    static PATH: LazyLock<&'static RelPath> =
-        LazyLock::new(|| RelPath::unix(".devcontainer").expect("valid path"));
-    *PATH
-}
-
-fn project_devcontainer_key(project_path: &str) -> String {
-    format!("{}_{}", DEV_CONTAINER_SUGGEST_KEY, project_path)
-}
-
-pub fn suggest_on_worktree_updated(
-    worktree_id: WorktreeId,
-    updated_entries: &UpdatedEntriesSet,
-    project: &gpui::Entity<Project>,
-    window: &mut Window,
-    cx: &mut Context<Workspace>,
-) {
-    let devcontainer_updated = updated_entries
-        .iter()
-        .any(|(path, _, _)| path.as_ref() == devcontainer_path());
-
-    if !devcontainer_updated {
-        return;
-    }
-
-    let Some(worktree) = project.read(cx).worktree_for_id(worktree_id, cx) else {
-        return;
-    };
-
-    let worktree = worktree.read(cx);
-
-    if !worktree.is_local() {
-        return;
-    }
-
-    let has_devcontainer = worktree
-        .entry_for_path(devcontainer_path())
-        .is_some_and(|entry| entry.is_dir());
-
-    if !has_devcontainer {
-        return;
-    }
-
-    let abs_path = worktree.abs_path();
-    let project_path = abs_path.to_string_lossy().to_string();
-    let key_for_dismiss = project_devcontainer_key(&project_path);
-
-    let already_dismissed = KEY_VALUE_STORE
-        .read_kvp(&key_for_dismiss)
-        .ok()
-        .flatten()
-        .is_some();
-
-    if already_dismissed {
-        return;
-    }
-
-    cx.on_next_frame(window, move |workspace, _window, cx| {
-        struct DevContainerSuggestionNotification;
-
-        let notification_id = NotificationId::composite::<DevContainerSuggestionNotification>(
-            SharedString::from(project_path.clone()),
-        );
-
-        workspace.show_notification(notification_id, cx, |cx| {
-            cx.new(move |cx| {
-                MessageNotification::new(
-                    "This project contains a Dev Container configuration file. Would you like to re-open it in a container?",
-                    cx,
-                )
-                .primary_message("Yes, Open in Container")
-                .primary_icon(IconName::Check)
-                .primary_icon_color(Color::Success)
-                .primary_on_click({
-                    move |window, cx| {
-                        window.dispatch_action(Box::new(zed_actions::OpenDevContainer), cx);
-                    }
-                })
-                .secondary_message("Don't Show Again")
-                .secondary_icon(IconName::Close)
-                .secondary_icon_color(Color::Error)
-                .secondary_on_click({
-                    move |_window, cx| {
-                        let key = key_for_dismiss.clone();
-                        db::write_and_log(cx, move || {
-                            KEY_VALUE_STORE.write_kvp(key, "dismissed".to_string())
-                        });
-                    }
-                })
-            })
-        });
-    });
-}
diff --git a/crates/recent_projects/src/disconnected_overlay.rs b/crates/recent_projects/src/disconnected_overlay.rs
deleted file mode 100644
index c97f7062a8..0000000000
--- a/crates/recent_projects/src/disconnected_overlay.rs
+++ /dev/null
@@ -1,205 +0,0 @@
-use gpui::{ClickEvent, DismissEvent, EventEmitter, FocusHandle, Focusable, Render, WeakEntity};
-use project::project_settings::ProjectSettings;
-use remote::RemoteConnectionOptions;
-use settings::Settings;
-use ui::{
-    Button, ButtonCommon, ButtonStyle, Clickable, Context, ElevationIndex, FluentBuilder, Headline,
-    HeadlineSize, IconName, IconPosition, InteractiveElement, IntoElement, Label, Modal,
-    ModalFooter, ModalHeader, ParentElement, Section, Styled, StyledExt, Window, div, h_flex, rems,
-};
-use workspace::{ModalView, OpenOptions, Workspace, notifications::DetachAndPromptErr};
-
-use crate::open_remote_project;
-
-enum Host {
-    CollabGuestProject,
-    RemoteServerProject(RemoteConnectionOptions),
-}
-
-pub struct DisconnectedOverlay {
-    workspace: WeakEntity<Workspace>,
-    host: Host,
-    focus_handle: FocusHandle,
-    finished: bool,
-}
-
-impl EventEmitter<DismissEvent> for DisconnectedOverlay {}
-impl Focusable for DisconnectedOverlay {
-    fn focus_handle(&self, _cx: &gpui::App) -> gpui::FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-impl ModalView for DisconnectedOverlay {
-    fn on_before_dismiss(
-        &mut self,
-        _window: &mut Window,
-        _: &mut Context<Self>,
-    ) -> workspace::DismissDecision {
-        workspace::DismissDecision::Dismiss(self.finished)
-    }
-    fn fade_out_background(&self) -> bool {
-        true
-    }
-}
-
-impl DisconnectedOverlay {
-    pub fn register(
-        workspace: &mut Workspace,
-        window: Option<&mut Window>,
-        cx: &mut Context<Workspace>,
-    ) {
-        let Some(window) = window else {
-            return;
-        };
-        cx.subscribe_in(
-            workspace.project(),
-            window,
-            |workspace, project, event, window, cx| {
-                if !matches!(
-                    event,
-                    project::Event::DisconnectedFromHost
-                        | project::Event::DisconnectedFromSshRemote
-                ) {
-                    return;
-                }
-                let handle = cx.entity().downgrade();
-
-                let remote_connection_options = project.read(cx).remote_connection_options(cx);
-                let host = if let Some(ssh_connection_options) = remote_connection_options {
-                    Host::RemoteServerProject(ssh_connection_options)
-                } else {
-                    Host::CollabGuestProject
-                };
-
-                workspace.toggle_modal(window, cx, |_, cx| DisconnectedOverlay {
-                    finished: false,
-                    workspace: handle,
-                    host,
-                    focus_handle: cx.focus_handle(),
-                });
-            },
-        )
-        .detach();
-    }
-
-    fn handle_reconnect(&mut self, _: &ClickEvent, window: &mut Window, cx: &mut Context<Self>) {
-        self.finished = true;
-        cx.emit(DismissEvent);
-
-        if let Host::RemoteServerProject(ssh_connection_options) = &self.host {
-            self.reconnect_to_remote_project(ssh_connection_options.clone(), window, cx);
-        }
-    }
-
-    fn reconnect_to_remote_project(
-        &self,
-        connection_options: RemoteConnectionOptions,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(workspace) = self.workspace.upgrade() else {
-            return;
-        };
-
-        let Some(window_handle) = window.window_handle().downcast::<Workspace>() else {
-            return;
-        };
-
-        let app_state = workspace.read(cx).app_state().clone();
-        let paths = workspace
-            .read(cx)
-            .root_paths(cx)
-            .iter()
-            .map(|path| path.to_path_buf())
-            .collect();
-
-        cx.spawn_in(window, async move |_, cx| {
-            open_remote_project(
-                connection_options,
-                paths,
-                app_state,
-                OpenOptions {
-                    replace_window: Some(window_handle),
-                    ..Default::default()
-                },
-                cx,
-            )
-            .await?;
-            Ok(())
-        })
-        .detach_and_prompt_err("Failed to reconnect", window, cx, |_, _, _| None);
-    }
-
-    fn cancel(&mut self, _: &menu::Cancel, _: &mut Window, cx: &mut Context<Self>) {
-        self.finished = true;
-        cx.emit(DismissEvent)
-    }
-}
-
-impl Render for DisconnectedOverlay {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let can_reconnect = matches!(self.host, Host::RemoteServerProject(_));
-
-        let message = match &self.host {
-            Host::CollabGuestProject => {
-                "Your connection to the remote project has been lost.".to_string()
-            }
-            Host::RemoteServerProject(options) => {
-                let autosave = if ProjectSettings::get_global(cx)
-                    .session
-                    .restore_unsaved_buffers
-                {
-                    "\nUnsaved changes are stored locally."
-                } else {
-                    ""
-                };
-                format!(
-                    "Your connection to {} has been lost.{}",
-                    options.display_name(),
-                    autosave
-                )
-            }
-        };
-
-        div()
-            .track_focus(&self.focus_handle(cx))
-            .elevation_3(cx)
-            .on_action(cx.listener(Self::cancel))
-            .occlude()
-            .w(rems(24.))
-            .max_h(rems(40.))
-            .child(
-                Modal::new("disconnected", None)
-                    .header(
-                        ModalHeader::new()
-                            .show_dismiss_button(true)
-                            .child(Headline::new("Disconnected").size(HeadlineSize::Small)),
-                    )
-                    .section(Section::new().child(Label::new(message)))
-                    .footer(
-                        ModalFooter::new().end_slot(
-                            h_flex()
-                                .gap_2()
-                                .child(
-                                    Button::new("close-window", "Close Window")
-                                        .style(ButtonStyle::Filled)
-                                        .layer(ElevationIndex::ModalSurface)
-                                        .on_click(cx.listener(move |_, _, window, _| {
-                                            window.remove_window();
-                                        })),
-                                )
-                                .when(can_reconnect, |el| {
-                                    el.child(
-                                        Button::new("reconnect", "Reconnect")
-                                            .style(ButtonStyle::Filled)
-                                            .layer(ElevationIndex::ModalSurface)
-                                            .icon(IconName::ArrowCircle)
-                                            .icon_position(IconPosition::Start)
-                                            .on_click(cx.listener(Self::handle_reconnect)),
-                                    )
-                                }),
-                        ),
-                    ),
-            )
-    }
-}
diff --git a/crates/recent_projects/src/recent_projects.rs b/crates/recent_projects/src/recent_projects.rs
deleted file mode 100644
index 435933a880..0000000000
--- a/crates/recent_projects/src/recent_projects.rs
+++ /dev/null
@@ -1,1043 +0,0 @@
-mod dev_container;
-mod dev_container_suggest;
-pub mod disconnected_overlay;
-mod remote_connections;
-mod remote_servers;
-mod ssh_config;
-
-use std::path::PathBuf;
-
-#[cfg(target_os = "windows")]
-mod wsl_picker;
-
-use remote::RemoteConnectionOptions;
-pub use remote_connections::{RemoteConnectionModal, connect, open_remote_project};
-
-use disconnected_overlay::DisconnectedOverlay;
-use fuzzy::{StringMatch, StringMatchCandidate};
-use gpui::{
-    Action, AnyElement, App, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable,
-    Subscription, Task, WeakEntity, Window,
-};
-use ordered_float::OrderedFloat;
-use picker::{
-    Picker, PickerDelegate,
-    highlighted_match_with_paths::{HighlightedMatch, HighlightedMatchWithPaths},
-};
-pub use remote_connections::SshSettings;
-pub use remote_servers::RemoteServerProjects;
-use settings::Settings;
-use std::{path::Path, sync::Arc};
-use ui::{KeyBinding, ListItem, ListItemSpacing, Tooltip, prelude::*, tooltip_container};
-use util::{ResultExt, paths::PathExt};
-use workspace::{
-    CloseIntent, HistoryManager, ModalView, OpenOptions, PathList, SerializedWorkspaceLocation,
-    WORKSPACE_DB, Workspace, WorkspaceId, notifications::DetachAndPromptErr,
-    with_active_or_new_workspace,
-};
-use zed_actions::{OpenDevContainer, OpenRecent, OpenRemote};
-
-pub fn init(cx: &mut App) {
-    #[cfg(target_os = "windows")]
-    cx.on_action(|open_wsl: &zed_actions::wsl_actions::OpenFolderInWsl, cx| {
-        let create_new_window = open_wsl.create_new_window;
-        with_active_or_new_workspace(cx, move |workspace, window, cx| {
-            use gpui::PathPromptOptions;
-            use project::DirectoryLister;
-
-            let paths = workspace.prompt_for_open_path(
-                PathPromptOptions {
-                    files: true,
-                    directories: true,
-                    multiple: false,
-                    prompt: None,
-                },
-                DirectoryLister::Local(
-                    workspace.project().clone(),
-                    workspace.app_state().fs.clone(),
-                ),
-                window,
-                cx,
-            );
-
-            cx.spawn_in(window, async move |workspace, cx| {
-                use util::paths::SanitizedPath;
-
-                let Some(paths) = paths.await.log_err().flatten() else {
-                    return;
-                };
-
-                let paths = paths
-                    .into_iter()
-                    .filter_map(|path| SanitizedPath::new(&path).local_to_wsl())
-                    .collect::<Vec<_>>();
-
-                if paths.is_empty() {
-                    let message = indoc::indoc! { r#"
-                        Invalid path specified when trying to open a folder inside WSL.
-
-                        Please note that Zed currently does not support opening network share folders inside wsl.
-                    "#};
-
-                    let _ = cx.prompt(gpui::PromptLevel::Critical, "Invalid path", Some(&message), &["Ok"]).await;
-                    return;
-                }
-
-                workspace.update_in(cx, |workspace, window, cx| {
-                    workspace.toggle_modal(window, cx, |window, cx| {
-                        crate::wsl_picker::WslOpenModal::new(paths, create_new_window, window, cx)
-                    });
-                }).log_err();
-            })
-            .detach();
-        });
-    });
-
-    #[cfg(target_os = "windows")]
-    cx.on_action(|open_wsl: &zed_actions::wsl_actions::OpenWsl, cx| {
-        let create_new_window = open_wsl.create_new_window;
-        with_active_or_new_workspace(cx, move |workspace, window, cx| {
-            let handle = cx.entity().downgrade();
-            let fs = workspace.project().read(cx).fs().clone();
-            workspace.toggle_modal(window, cx, |window, cx| {
-                RemoteServerProjects::wsl(create_new_window, fs, window, handle, cx)
-            });
-        });
-    });
-
-    #[cfg(target_os = "windows")]
-    cx.on_action(|open_wsl: &remote::OpenWslPath, cx| {
-        let open_wsl = open_wsl.clone();
-        with_active_or_new_workspace(cx, move |workspace, window, cx| {
-            let fs = workspace.project().read(cx).fs().clone();
-            add_wsl_distro(fs, &open_wsl.distro, cx);
-            let open_options = OpenOptions {
-                replace_window: window.window_handle().downcast::<Workspace>(),
-                ..Default::default()
-            };
-
-            let app_state = workspace.app_state().clone();
-
-            cx.spawn_in(window, async move |_, cx| {
-                open_remote_project(
-                    RemoteConnectionOptions::Wsl(open_wsl.distro.clone()),
-                    open_wsl.paths,
-                    app_state,
-                    open_options,
-                    cx,
-                )
-                .await
-            })
-            .detach();
-        });
-    });
-
-    cx.on_action(|open_recent: &OpenRecent, cx| {
-        let create_new_window = open_recent.create_new_window;
-        with_active_or_new_workspace(cx, move |workspace, window, cx| {
-            let Some(recent_projects) = workspace.active_modal::<RecentProjects>(cx) else {
-                let focus_handle = workspace.focus_handle(cx);
-                RecentProjects::open(workspace, create_new_window, window, focus_handle, cx);
-                return;
-            };
-
-            recent_projects.update(cx, |recent_projects, cx| {
-                recent_projects
-                    .picker
-                    .update(cx, |picker, cx| picker.cycle_selection(window, cx))
-            });
-        });
-    });
-    cx.on_action(|open_remote: &OpenRemote, cx| {
-        let from_existing_connection = open_remote.from_existing_connection;
-        let create_new_window = open_remote.create_new_window;
-        with_active_or_new_workspace(cx, move |workspace, window, cx| {
-            if from_existing_connection {
-                cx.propagate();
-                return;
-            }
-            let handle = cx.entity().downgrade();
-            let fs = workspace.project().read(cx).fs().clone();
-            workspace.toggle_modal(window, cx, |window, cx| {
-                RemoteServerProjects::new(create_new_window, fs, window, handle, cx)
-            })
-        });
-    });
-
-    cx.observe_new(DisconnectedOverlay::register).detach();
-
-    cx.on_action(|_: &OpenDevContainer, cx| {
-        with_active_or_new_workspace(cx, move |workspace, window, cx| {
-            let app_state = workspace.app_state().clone();
-            let replace_window = window.window_handle().downcast::<Workspace>();
-
-            cx.spawn_in(window, async move |_, mut cx| {
-                let (connection, starting_dir) = match dev_container::start_dev_container(
-                    &mut cx,
-                    app_state.node_runtime.clone(),
-                )
-                .await
-                {
-                    Ok((c, s)) => (c, s),
-                    Err(e) => {
-                        log::error!("Failed to start Dev Container: {:?}", e);
-                        cx.prompt(
-                            gpui::PromptLevel::Critical,
-                            "Failed to start Dev Container",
-                            Some(&format!("{:?}", e)),
-                            &["Ok"],
-                        )
-                        .await
-                        .ok();
-                        return;
-                    }
-                };
-
-                let result = open_remote_project(
-                    connection.into(),
-                    vec![starting_dir].into_iter().map(PathBuf::from).collect(),
-                    app_state,
-                    OpenOptions {
-                        replace_window,
-                        ..OpenOptions::default()
-                    },
-                    &mut cx,
-                )
-                .await;
-
-                if let Err(e) = result {
-                    log::error!("Failed to connect: {e:#}");
-                    cx.prompt(
-                        gpui::PromptLevel::Critical,
-                        "Failed to connect",
-                        Some(&e.to_string()),
-                        &["Ok"],
-                    )
-                    .await
-                    .ok();
-                }
-            })
-            .detach();
-
-            let fs = workspace.project().read(cx).fs().clone();
-            let handle = cx.entity().downgrade();
-            workspace.toggle_modal(window, cx, |window, cx| {
-                RemoteServerProjects::new_dev_container(fs, window, handle, cx)
-            });
-        });
-    });
-
-    // Subscribe to worktree additions to suggest opening the project in a dev container
-    cx.observe_new(
-        |workspace: &mut Workspace, window: Option<&mut Window>, cx: &mut Context<Workspace>| {
-            let Some(window) = window else {
-                return;
-            };
-            cx.subscribe_in(
-                workspace.project(),
-                window,
-                move |_, project, event, window, cx| {
-                    if let project::Event::WorktreeUpdatedEntries(worktree_id, updated_entries) =
-                        event
-                    {
-                        dev_container_suggest::suggest_on_worktree_updated(
-                            *worktree_id,
-                            updated_entries,
-                            project,
-                            window,
-                            cx,
-                        );
-                    }
-                },
-            )
-            .detach();
-        },
-    )
-    .detach();
-}
-
-#[cfg(target_os = "windows")]
-pub fn add_wsl_distro(
-    fs: Arc<dyn project::Fs>,
-    connection_options: &remote::WslConnectionOptions,
-    cx: &App,
-) {
-    use gpui::ReadGlobal;
-    use settings::SettingsStore;
-
-    let distro_name = SharedString::from(&connection_options.distro_name);
-    let user = connection_options.user.clone();
-    SettingsStore::global(cx).update_settings_file(fs, move |setting, _| {
-        let connections = setting
-            .remote
-            .wsl_connections
-            .get_or_insert(Default::default());
-
-        if !connections
-            .iter()
-            .any(|conn| conn.distro_name == distro_name && conn.user == user)
-        {
-            use std::collections::BTreeSet;
-
-            connections.push(settings::WslConnection {
-                distro_name,
-                user,
-                projects: BTreeSet::new(),
-            })
-        }
-    });
-}
-
-pub struct RecentProjects {
-    pub picker: Entity<Picker<RecentProjectsDelegate>>,
-    rem_width: f32,
-    _subscription: Subscription,
-}
-
-impl ModalView for RecentProjects {}
-
-impl RecentProjects {
-    fn new(
-        delegate: RecentProjectsDelegate,
-        rem_width: f32,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let picker = cx.new(|cx| {
-            // We want to use a list when we render paths, because the items can have different heights (multiple paths).
-            if delegate.render_paths {
-                Picker::list(delegate, window, cx)
-            } else {
-                Picker::uniform_list(delegate, window, cx)
-            }
-        });
-        let _subscription = cx.subscribe(&picker, |_, _, _, cx| cx.emit(DismissEvent));
-        // We do not want to block the UI on a potentially lengthy call to DB, so we're gonna swap
-        // out workspace locations once the future runs to completion.
-        cx.spawn_in(window, async move |this, cx| {
-            let workspaces = WORKSPACE_DB
-                .recent_workspaces_on_disk()
-                .await
-                .log_err()
-                .unwrap_or_default();
-            this.update_in(cx, move |this, window, cx| {
-                this.picker.update(cx, move |picker, cx| {
-                    picker.delegate.set_workspaces(workspaces);
-                    picker.update_matches(picker.query(cx), window, cx)
-                })
-            })
-            .ok()
-        })
-        .detach();
-        Self {
-            picker,
-            rem_width,
-            _subscription,
-        }
-    }
-
-    pub fn open(
-        workspace: &mut Workspace,
-        create_new_window: bool,
-        window: &mut Window,
-        focus_handle: FocusHandle,
-        cx: &mut Context<Workspace>,
-    ) {
-        let weak = cx.entity().downgrade();
-        workspace.toggle_modal(window, cx, |window, cx| {
-            let delegate = RecentProjectsDelegate::new(weak, create_new_window, true, focus_handle);
-
-            Self::new(delegate, 34., window, cx)
-        })
-    }
-}
-
-impl EventEmitter<DismissEvent> for RecentProjects {}
-
-impl Focusable for RecentProjects {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        self.picker.focus_handle(cx)
-    }
-}
-
-impl Render for RecentProjects {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .key_context("RecentProjects")
-            .w(rems(self.rem_width))
-            .child(self.picker.clone())
-            .on_mouse_down_out(cx.listener(|this, _, window, cx| {
-                this.picker.update(cx, |this, cx| {
-                    this.cancel(&Default::default(), window, cx);
-                })
-            }))
-    }
-}
-
-pub struct RecentProjectsDelegate {
-    workspace: WeakEntity<Workspace>,
-    workspaces: Vec<(WorkspaceId, SerializedWorkspaceLocation, PathList)>,
-    selected_match_index: usize,
-    matches: Vec<StringMatch>,
-    render_paths: bool,
-    create_new_window: bool,
-    // Flag to reset index when there is a new query vs not reset index when user delete an item
-    reset_selected_match_index: bool,
-    has_any_non_local_projects: bool,
-    focus_handle: FocusHandle,
-}
-
-impl RecentProjectsDelegate {
-    fn new(
-        workspace: WeakEntity<Workspace>,
-        create_new_window: bool,
-        render_paths: bool,
-        focus_handle: FocusHandle,
-    ) -> Self {
-        Self {
-            workspace,
-            workspaces: Vec::new(),
-            selected_match_index: 0,
-            matches: Default::default(),
-            create_new_window,
-            render_paths,
-            reset_selected_match_index: true,
-            has_any_non_local_projects: false,
-            focus_handle,
-        }
-    }
-
-    pub fn set_workspaces(
-        &mut self,
-        workspaces: Vec<(WorkspaceId, SerializedWorkspaceLocation, PathList)>,
-    ) {
-        self.workspaces = workspaces;
-        self.has_any_non_local_projects = !self
-            .workspaces
-            .iter()
-            .all(|(_, location, _)| matches!(location, SerializedWorkspaceLocation::Local));
-    }
-}
-impl EventEmitter<DismissEvent> for RecentProjectsDelegate {}
-impl PickerDelegate for RecentProjectsDelegate {
-    type ListItem = ListItem;
-
-    fn placeholder_text(&self, window: &mut Window, _: &mut App) -> Arc<str> {
-        let (create_window, reuse_window) = if self.create_new_window {
-            (
-                window.keystroke_text_for(&menu::Confirm),
-                window.keystroke_text_for(&menu::SecondaryConfirm),
-            )
-        } else {
-            (
-                window.keystroke_text_for(&menu::SecondaryConfirm),
-                window.keystroke_text_for(&menu::Confirm),
-            )
-        };
-        Arc::from(format!(
-            "{reuse_window} reuses this window, {create_window} opens a new one",
-        ))
-    }
-
-    fn match_count(&self) -> usize {
-        self.matches.len()
-    }
-
-    fn selected_index(&self) -> usize {
-        self.selected_match_index
-    }
-
-    fn set_selected_index(
-        &mut self,
-        ix: usize,
-        _window: &mut Window,
-        _cx: &mut Context<Picker<Self>>,
-    ) {
-        self.selected_match_index = ix;
-    }
-
-    fn update_matches(
-        &mut self,
-        query: String,
-        _: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> gpui::Task<()> {
-        let query = query.trim_start();
-        let smart_case = query.chars().any(|c| c.is_uppercase());
-        let candidates = self
-            .workspaces
-            .iter()
-            .enumerate()
-            .filter(|(_, (id, _, _))| !self.is_current_workspace(*id, cx))
-            .map(|(id, (_, _, paths))| {
-                let combined_string = paths
-                    .ordered_paths()
-                    .map(|path| path.compact().to_string_lossy().into_owned())
-                    .collect::<Vec<_>>()
-                    .join("");
-                StringMatchCandidate::new(id, &combined_string)
-            })
-            .collect::<Vec<_>>();
-        self.matches = smol::block_on(fuzzy::match_strings(
-            candidates.as_slice(),
-            query,
-            smart_case,
-            true,
-            100,
-            &Default::default(),
-            cx.background_executor().clone(),
-        ));
-        self.matches.sort_unstable_by(|a, b| {
-            b.score
-                .partial_cmp(&a.score) // Descending score
-                .unwrap_or(std::cmp::Ordering::Equal)
-                .then_with(|| a.candidate_id.cmp(&b.candidate_id)) // Ascending candidate_id for ties
-        });
-
-        if self.reset_selected_match_index {
-            self.selected_match_index = self
-                .matches
-                .iter()
-                .enumerate()
-                .rev()
-                .max_by_key(|(_, m)| OrderedFloat(m.score))
-                .map(|(ix, _)| ix)
-                .unwrap_or(0);
-        }
-        self.reset_selected_match_index = true;
-        Task::ready(())
-    }
-
-    fn confirm(&mut self, secondary: bool, window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        if let Some((selected_match, workspace)) = self
-            .matches
-            .get(self.selected_index())
-            .zip(self.workspace.upgrade())
-        {
-            let (candidate_workspace_id, candidate_workspace_location, candidate_workspace_paths) =
-                &self.workspaces[selected_match.candidate_id];
-            let replace_current_window = if self.create_new_window {
-                secondary
-            } else {
-                !secondary
-            };
-            workspace.update(cx, |workspace, cx| {
-                if workspace.database_id() == Some(*candidate_workspace_id) {
-                    return;
-                }
-                match candidate_workspace_location.clone() {
-                    SerializedWorkspaceLocation::Local => {
-                        let paths = candidate_workspace_paths.paths().to_vec();
-                        if replace_current_window {
-                            cx.spawn_in(window, async move |workspace, cx| {
-                                let continue_replacing = workspace
-                                    .update_in(cx, |workspace, window, cx| {
-                                        workspace.prepare_to_close(
-                                            CloseIntent::ReplaceWindow,
-                                            window,
-                                            cx,
-                                        )
-                                    })?
-                                    .await?;
-                                if continue_replacing {
-                                    workspace
-                                        .update_in(cx, |workspace, window, cx| {
-                                            workspace
-                                                .open_workspace_for_paths(true, paths, window, cx)
-                                        })?
-                                        .await
-                                } else {
-                                    Ok(())
-                                }
-                            })
-                        } else {
-                            workspace.open_workspace_for_paths(false, paths, window, cx)
-                        }
-                    }
-                    SerializedWorkspaceLocation::Remote(mut connection) => {
-                        let app_state = workspace.app_state().clone();
-
-                        let replace_window = if replace_current_window {
-                            window.window_handle().downcast::<Workspace>()
-                        } else {
-                            None
-                        };
-
-                        let open_options = OpenOptions {
-                            replace_window,
-                            ..Default::default()
-                        };
-
-                        if let RemoteConnectionOptions::Ssh(connection) = &mut connection {
-                            SshSettings::get_global(cx)
-                                .fill_connection_options_from_settings(connection);
-                        };
-
-                        let paths = candidate_workspace_paths.paths().to_vec();
-
-                        cx.spawn_in(window, async move |_, cx| {
-                            open_remote_project(
-                                connection.clone(),
-                                paths,
-                                app_state,
-                                open_options,
-                                cx,
-                            )
-                            .await
-                        })
-                    }
-                }
-                .detach_and_prompt_err(
-                    "Failed to open project",
-                    window,
-                    cx,
-                    |_, _, _| None,
-                );
-            });
-            cx.emit(DismissEvent);
-        }
-    }
-
-    fn dismissed(&mut self, _window: &mut Window, _: &mut Context<Picker<Self>>) {}
-
-    fn no_matches_text(&self, _window: &mut Window, _cx: &mut App) -> Option<SharedString> {
-        let text = if self.workspaces.is_empty() {
-            "Recently opened projects will show up here".into()
-        } else {
-            "No matches".into()
-        };
-        Some(text)
-    }
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<Self::ListItem> {
-        let hit = self.matches.get(ix)?;
-
-        let (_, location, paths) = self.workspaces.get(hit.candidate_id)?;
-
-        let mut path_start_offset = 0;
-
-        let (match_labels, paths): (Vec<_>, Vec<_>) = paths
-            .ordered_paths()
-            .map(|p| p.compact())
-            .map(|path| {
-                let highlighted_text =
-                    highlights_for_path(path.as_ref(), &hit.positions, path_start_offset);
-                path_start_offset += highlighted_text.1.text.len();
-                highlighted_text
-            })
-            .unzip();
-
-        let prefix = match &location {
-            SerializedWorkspaceLocation::Remote(options) => {
-                Some(SharedString::from(options.display_name()))
-            }
-            _ => None,
-        };
-
-        let highlighted_match = HighlightedMatchWithPaths {
-            prefix,
-            match_label: HighlightedMatch::join(match_labels.into_iter().flatten(), ", "),
-            paths,
-        };
-
-        let focus_handle = self.focus_handle.clone();
-
-        let secondary_actions = h_flex()
-            .gap_px()
-            .child(
-                IconButton::new("open_new_window", IconName::ArrowUpRight)
-                    .icon_size(IconSize::XSmall)
-                    .tooltip({
-                        move |_, cx| {
-                            Tooltip::for_action_in(
-                                "Open Project in New Window",
-                                &menu::SecondaryConfirm,
-                                &focus_handle,
-                                cx,
-                            )
-                        }
-                    })
-                    .on_click(cx.listener(move |this, _event, window, cx| {
-                        cx.stop_propagation();
-                        window.prevent_default();
-                        this.delegate.set_selected_index(ix, window, cx);
-                        this.delegate.confirm(true, window, cx);
-                    })),
-            )
-            .child(
-                IconButton::new("delete", IconName::Close)
-                    .icon_size(IconSize::Small)
-                    .tooltip(Tooltip::text("Delete from Recent Projects"))
-                    .on_click(cx.listener(move |this, _event, window, cx| {
-                        cx.stop_propagation();
-                        window.prevent_default();
-
-                        this.delegate.delete_recent_project(ix, window, cx)
-                    })),
-            )
-            .into_any_element();
-
-        Some(
-            ListItem::new(ix)
-                .toggle_state(selected)
-                .inset(true)
-                .spacing(ListItemSpacing::Sparse)
-                .child(
-                    h_flex()
-                        .id("projecy_info_container")
-                        .gap_3()
-                        .flex_grow()
-                        .when(self.has_any_non_local_projects, |this| {
-                            this.child(match location {
-                                SerializedWorkspaceLocation::Local => Icon::new(IconName::Screen)
-                                    .color(Color::Muted)
-                                    .into_any_element(),
-                                SerializedWorkspaceLocation::Remote(options) => {
-                                    Icon::new(match options {
-                                        RemoteConnectionOptions::Ssh { .. } => IconName::Server,
-                                        RemoteConnectionOptions::Wsl { .. } => IconName::Linux,
-                                        RemoteConnectionOptions::Docker(_) => IconName::Box,
-                                    })
-                                    .color(Color::Muted)
-                                    .into_any_element()
-                                }
-                            })
-                        })
-                        .child({
-                            let mut highlighted = highlighted_match.clone();
-                            if !self.render_paths {
-                                highlighted.paths.clear();
-                            }
-                            highlighted.render(window, cx)
-                        })
-                        .tooltip(move |_, cx| {
-                            let tooltip_highlighted_location = highlighted_match.clone();
-                            cx.new(|_| MatchTooltip {
-                                highlighted_location: tooltip_highlighted_location,
-                            })
-                            .into()
-                        }),
-                )
-                .map(|el| {
-                    if self.selected_index() == ix {
-                        el.end_slot(secondary_actions)
-                    } else {
-                        el.end_hover_slot(secondary_actions)
-                    }
-                }),
-        )
-    }
-
-    fn render_footer(&self, _: &mut Window, cx: &mut Context<Picker<Self>>) -> Option<AnyElement> {
-        Some(
-            h_flex()
-                .w_full()
-                .p_2()
-                .gap_2()
-                .justify_end()
-                .border_t_1()
-                .border_color(cx.theme().colors().border_variant)
-                .child(
-                    Button::new("remote", "Open Remote Folder")
-                        .key_binding(KeyBinding::for_action(
-                            &OpenRemote {
-                                from_existing_connection: false,
-                                create_new_window: false,
-                            },
-                            cx,
-                        ))
-                        .on_click(|_, window, cx| {
-                            window.dispatch_action(
-                                OpenRemote {
-                                    from_existing_connection: false,
-                                    create_new_window: false,
-                                }
-                                .boxed_clone(),
-                                cx,
-                            )
-                        }),
-                )
-                .child(
-                    Button::new("local", "Open Local Folder")
-                        .key_binding(KeyBinding::for_action(&workspace::Open, cx))
-                        .on_click(|_, window, cx| {
-                            window.dispatch_action(workspace::Open.boxed_clone(), cx)
-                        }),
-                )
-                .into_any(),
-        )
-    }
-}
-
-// Compute the highlighted text for the name and path
-fn highlights_for_path(
-    path: &Path,
-    match_positions: &Vec<usize>,
-    path_start_offset: usize,
-) -> (Option<HighlightedMatch>, HighlightedMatch) {
-    let path_string = path.to_string_lossy();
-    let path_text = path_string.to_string();
-    let path_byte_len = path_text.len();
-    // Get the subset of match highlight positions that line up with the given path.
-    // Also adjusts them to start at the path start
-    let path_positions = match_positions
-        .iter()
-        .copied()
-        .skip_while(|position| *position < path_start_offset)
-        .take_while(|position| *position < path_start_offset + path_byte_len)
-        .map(|position| position - path_start_offset)
-        .collect::<Vec<_>>();
-
-    // Again subset the highlight positions to just those that line up with the file_name
-    // again adjusted to the start of the file_name
-    let file_name_text_and_positions = path.file_name().map(|file_name| {
-        let file_name_text = file_name.to_string_lossy().into_owned();
-        let file_name_start_byte = path_byte_len - file_name_text.len();
-        let highlight_positions = path_positions
-            .iter()
-            .copied()
-            .skip_while(|position| *position < file_name_start_byte)
-            .take_while(|position| *position < file_name_start_byte + file_name_text.len())
-            .map(|position| position - file_name_start_byte)
-            .collect::<Vec<_>>();
-        HighlightedMatch {
-            text: file_name_text,
-            highlight_positions,
-            color: Color::Default,
-        }
-    });
-
-    (
-        file_name_text_and_positions,
-        HighlightedMatch {
-            text: path_text,
-            highlight_positions: path_positions,
-            color: Color::Default,
-        },
-    )
-}
-impl RecentProjectsDelegate {
-    fn delete_recent_project(
-        &self,
-        ix: usize,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) {
-        if let Some(selected_match) = self.matches.get(ix) {
-            let (workspace_id, _, _) = self.workspaces[selected_match.candidate_id];
-            cx.spawn_in(window, async move |this, cx| {
-                let _ = WORKSPACE_DB.delete_workspace_by_id(workspace_id).await;
-                let workspaces = WORKSPACE_DB
-                    .recent_workspaces_on_disk()
-                    .await
-                    .unwrap_or_default();
-                this.update_in(cx, move |picker, window, cx| {
-                    picker.delegate.set_workspaces(workspaces);
-                    picker
-                        .delegate
-                        .set_selected_index(ix.saturating_sub(1), window, cx);
-                    picker.delegate.reset_selected_match_index = false;
-                    picker.update_matches(picker.query(cx), window, cx);
-                    // After deleting a project, we want to update the history manager to reflect the change.
-                    // But we do not emit a update event when user opens a project, because it's handled in `workspace::load_workspace`.
-                    if let Some(history_manager) = HistoryManager::global(cx) {
-                        history_manager
-                            .update(cx, |this, cx| this.delete_history(workspace_id, cx));
-                    }
-                })
-            })
-            .detach();
-        }
-    }
-
-    fn is_current_workspace(
-        &self,
-        workspace_id: WorkspaceId,
-        cx: &mut Context<Picker<Self>>,
-    ) -> bool {
-        if let Some(workspace) = self.workspace.upgrade() {
-            let workspace = workspace.read(cx);
-            if Some(workspace_id) == workspace.database_id() {
-                return true;
-            }
-        }
-
-        false
-    }
-}
-struct MatchTooltip {
-    highlighted_location: HighlightedMatchWithPaths,
-}
-
-impl Render for MatchTooltip {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        tooltip_container(cx, |div, _| {
-            self.highlighted_location.render_paths_children(div)
-        })
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::path::PathBuf;
-
-    use editor::Editor;
-    use gpui::{TestAppContext, UpdateGlobal, WindowHandle};
-
-    use serde_json::json;
-    use settings::SettingsStore;
-    use util::path;
-    use workspace::{AppState, open_paths};
-
-    use super::*;
-
-    #[gpui::test]
-    async fn test_prompts_on_dirty_before_submit(cx: &mut TestAppContext) {
-        let app_state = init_test(cx);
-
-        cx.update(|cx| {
-            SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |settings| {
-                    settings
-                        .session
-                        .get_or_insert_default()
-                        .restore_unsaved_buffers = Some(false)
-                });
-            });
-        });
-
-        app_state
-            .fs
-            .as_fake()
-            .insert_tree(
-                path!("/dir"),
-                json!({
-                    "main.ts": "a"
-                }),
-            )
-            .await;
-        cx.update(|cx| {
-            open_paths(
-                &[PathBuf::from(path!("/dir/main.ts"))],
-                app_state,
-                workspace::OpenOptions::default(),
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-        assert_eq!(cx.update(|cx| cx.windows().len()), 1);
-
-        let workspace = cx.update(|cx| cx.windows()[0].downcast::<Workspace>().unwrap());
-        workspace
-            .update(cx, |workspace, _, _| assert!(!workspace.is_edited()))
-            .unwrap();
-
-        let editor = workspace
-            .read_with(cx, |workspace, cx| {
-                workspace
-                    .active_item(cx)
-                    .unwrap()
-                    .downcast::<Editor>()
-                    .unwrap()
-            })
-            .unwrap();
-        workspace
-            .update(cx, |_, window, cx| {
-                editor.update(cx, |editor, cx| editor.insert("EDIT", window, cx));
-            })
-            .unwrap();
-        workspace
-            .update(cx, |workspace, _, _| assert!(workspace.is_edited(), "After inserting more text into the editor without saving, we should have a dirty project"))
-            .unwrap();
-
-        let recent_projects_picker = open_recent_projects(&workspace, cx);
-        workspace
-            .update(cx, |_, _, cx| {
-                recent_projects_picker.update(cx, |picker, cx| {
-                    assert_eq!(picker.query(cx), "");
-                    let delegate = &mut picker.delegate;
-                    delegate.matches = vec![StringMatch {
-                        candidate_id: 0,
-                        score: 1.0,
-                        positions: Vec::new(),
-                        string: "fake candidate".to_string(),
-                    }];
-                    delegate.set_workspaces(vec![(
-                        WorkspaceId::default(),
-                        SerializedWorkspaceLocation::Local,
-                        PathList::new(&[path!("/test/path")]),
-                    )]);
-                });
-            })
-            .unwrap();
-
-        assert!(
-            !cx.has_pending_prompt(),
-            "Should have no pending prompt on dirty project before opening the new recent project"
-        );
-        cx.dispatch_action(*workspace, menu::Confirm);
-        workspace
-            .update(cx, |workspace, _, cx| {
-                assert!(
-                    workspace.active_modal::<RecentProjects>(cx).is_none(),
-                    "Should remove the modal after selecting new recent project"
-                )
-            })
-            .unwrap();
-        assert!(
-            cx.has_pending_prompt(),
-            "Dirty workspace should prompt before opening the new recent project"
-        );
-        cx.simulate_prompt_answer("Cancel");
-        assert!(
-            !cx.has_pending_prompt(),
-            "Should have no pending prompt after cancelling"
-        );
-        workspace
-            .update(cx, |workspace, _, _| {
-                assert!(
-                    workspace.is_edited(),
-                    "Should be in the same dirty project after cancelling"
-                )
-            })
-            .unwrap();
-    }
-
-    fn open_recent_projects(
-        workspace: &WindowHandle<Workspace>,
-        cx: &mut TestAppContext,
-    ) -> Entity<Picker<RecentProjectsDelegate>> {
-        cx.dispatch_action(
-            (*workspace).into(),
-            OpenRecent {
-                create_new_window: false,
-            },
-        );
-        workspace
-            .update(cx, |workspace, _, cx| {
-                workspace
-                    .active_modal::<RecentProjects>(cx)
-                    .unwrap()
-                    .read(cx)
-                    .picker
-                    .clone()
-            })
-            .unwrap()
-    }
-
-    fn init_test(cx: &mut TestAppContext) -> Arc<AppState> {
-        cx.update(|cx| {
-            let state = AppState::test(cx);
-            crate::init(cx);
-            editor::init(cx);
-            state
-        })
-    }
-}
diff --git a/crates/recent_projects/src/remote_connections.rs b/crates/recent_projects/src/remote_connections.rs
deleted file mode 100644
index c0a655d19e..0000000000
--- a/crates/recent_projects/src/remote_connections.rs
+++ /dev/null
@@ -1,880 +0,0 @@
-use std::{
-    path::{Path, PathBuf},
-    sync::Arc,
-};
-
-use anyhow::{Context as _, Result};
-use askpass::EncryptedPassword;
-use auto_update::AutoUpdater;
-use editor::Editor;
-use extension_host::ExtensionStore;
-use futures::channel::oneshot;
-use gpui::{
-    AnyWindowHandle, App, AsyncApp, DismissEvent, Entity, EventEmitter, Focusable, FontFeatures,
-    ParentElement as _, PromptLevel, Render, SharedString, Task, TextStyleRefinement, WeakEntity,
-};
-
-use language::{CursorShape, Point};
-use markdown::{Markdown, MarkdownElement, MarkdownStyle};
-use release_channel::ReleaseChannel;
-use remote::{
-    ConnectionIdentifier, DockerConnectionOptions, RemoteClient, RemoteConnection,
-    RemoteConnectionOptions, RemotePlatform, SshConnectionOptions,
-};
-use semver::Version;
-pub use settings::SshConnection;
-use settings::{DevContainerConnection, ExtendingVec, RegisterSetting, Settings, WslConnection};
-use theme::ThemeSettings;
-use ui::{
-    ActiveTheme, Color, CommonAnimationExt, Context, InteractiveElement, IntoElement, KeyBinding,
-    LabelCommon, ListItem, Styled, Window, prelude::*,
-};
-use util::paths::PathWithPosition;
-use workspace::{AppState, ModalView, Workspace};
-
-#[derive(RegisterSetting)]
-pub struct SshSettings {
-    pub ssh_connections: ExtendingVec<SshConnection>,
-    pub wsl_connections: ExtendingVec<WslConnection>,
-    /// Whether to read ~/.ssh/config for ssh connection sources.
-    pub read_ssh_config: bool,
-}
-
-impl SshSettings {
-    pub fn ssh_connections(&self) -> impl Iterator<Item = SshConnection> + use<> {
-        self.ssh_connections.clone().0.into_iter()
-    }
-
-    pub fn wsl_connections(&self) -> impl Iterator<Item = WslConnection> + use<> {
-        self.wsl_connections.clone().0.into_iter()
-    }
-
-    pub fn fill_connection_options_from_settings(&self, options: &mut SshConnectionOptions) {
-        for conn in self.ssh_connections() {
-            if conn.host == options.host
-                && conn.username == options.username
-                && conn.port == options.port
-            {
-                options.nickname = conn.nickname;
-                options.upload_binary_over_ssh = conn.upload_binary_over_ssh.unwrap_or_default();
-                options.args = Some(conn.args);
-                options.port_forwards = conn.port_forwards;
-                break;
-            }
-        }
-    }
-
-    pub fn connection_options_for(
-        &self,
-        host: String,
-        port: Option<u16>,
-        username: Option<String>,
-    ) -> SshConnectionOptions {
-        let mut options = SshConnectionOptions {
-            host,
-            port,
-            username,
-            ..Default::default()
-        };
-        self.fill_connection_options_from_settings(&mut options);
-        options
-    }
-}
-
-#[derive(Clone, PartialEq)]
-pub enum Connection {
-    Ssh(SshConnection),
-    Wsl(WslConnection),
-    DevContainer(DevContainerConnection),
-}
-
-impl From<Connection> for RemoteConnectionOptions {
-    fn from(val: Connection) -> Self {
-        match val {
-            Connection::Ssh(conn) => RemoteConnectionOptions::Ssh(conn.into()),
-            Connection::Wsl(conn) => RemoteConnectionOptions::Wsl(conn.into()),
-            Connection::DevContainer(conn) => {
-                RemoteConnectionOptions::Docker(DockerConnectionOptions {
-                    name: conn.name.to_string(),
-                    container_id: conn.container_id.to_string(),
-                    upload_binary_over_docker_exec: false,
-                })
-            }
-        }
-    }
-}
-
-impl From<SshConnection> for Connection {
-    fn from(val: SshConnection) -> Self {
-        Connection::Ssh(val)
-    }
-}
-
-impl From<WslConnection> for Connection {
-    fn from(val: WslConnection) -> Self {
-        Connection::Wsl(val)
-    }
-}
-
-impl Settings for SshSettings {
-    fn from_settings(content: &settings::SettingsContent) -> Self {
-        let remote = &content.remote;
-        Self {
-            ssh_connections: remote.ssh_connections.clone().unwrap_or_default().into(),
-            wsl_connections: remote.wsl_connections.clone().unwrap_or_default().into(),
-            read_ssh_config: remote.read_ssh_config.unwrap(),
-        }
-    }
-}
-
-pub struct RemoteConnectionPrompt {
-    connection_string: SharedString,
-    nickname: Option<SharedString>,
-    is_wsl: bool,
-    is_devcontainer: bool,
-    status_message: Option<SharedString>,
-    prompt: Option<(Entity<Markdown>, oneshot::Sender<EncryptedPassword>)>,
-    cancellation: Option<oneshot::Sender<()>>,
-    editor: Entity<Editor>,
-}
-
-impl Drop for RemoteConnectionPrompt {
-    fn drop(&mut self) {
-        if let Some(cancel) = self.cancellation.take() {
-            cancel.send(()).ok();
-        }
-    }
-}
-
-pub struct RemoteConnectionModal {
-    pub prompt: Entity<RemoteConnectionPrompt>,
-    paths: Vec<PathBuf>,
-    finished: bool,
-}
-
-impl RemoteConnectionPrompt {
-    pub(crate) fn new(
-        connection_string: String,
-        nickname: Option<String>,
-        is_wsl: bool,
-        is_devcontainer: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        Self {
-            connection_string: connection_string.into(),
-            nickname: nickname.map(|nickname| nickname.into()),
-            is_wsl,
-            is_devcontainer,
-            editor: cx.new(|cx| Editor::single_line(window, cx)),
-            status_message: None,
-            cancellation: None,
-            prompt: None,
-        }
-    }
-
-    pub fn set_cancellation_tx(&mut self, tx: oneshot::Sender<()>) {
-        self.cancellation = Some(tx);
-    }
-
-    fn set_prompt(
-        &mut self,
-        prompt: String,
-        tx: oneshot::Sender<EncryptedPassword>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let theme = ThemeSettings::get_global(cx);
-
-        let refinement = TextStyleRefinement {
-            font_family: Some(theme.buffer_font.family.clone()),
-            font_features: Some(FontFeatures::disable_ligatures()),
-            font_size: Some(theme.buffer_font_size(cx).into()),
-            color: Some(cx.theme().colors().editor_foreground),
-            background_color: Some(gpui::transparent_black()),
-            ..Default::default()
-        };
-
-        self.editor.update(cx, |editor, cx| {
-            if prompt.contains("yes/no") {
-                editor.set_masked(false, cx);
-            } else {
-                editor.set_masked(true, cx);
-            }
-            editor.set_text_style_refinement(refinement);
-            editor.set_cursor_shape(CursorShape::Block, cx);
-        });
-
-        let markdown = cx.new(|cx| Markdown::new_text(prompt.into(), cx));
-        self.prompt = Some((markdown, tx));
-        self.status_message.take();
-        window.focus(&self.editor.focus_handle(cx));
-        cx.notify();
-    }
-
-    pub fn set_status(&mut self, status: Option<String>, cx: &mut Context<Self>) {
-        self.status_message = status.map(|s| s.into());
-        cx.notify();
-    }
-
-    pub fn confirm(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some((_, tx)) = self.prompt.take() {
-            self.status_message = Some("Connecting".into());
-
-            self.editor.update(cx, |editor, cx| {
-                let pw = editor.text(cx);
-                if let Ok(secure) = EncryptedPassword::try_from(pw.as_ref()) {
-                    tx.send(secure).ok();
-                }
-                editor.clear(window, cx);
-            });
-        }
-    }
-}
-
-impl Render for RemoteConnectionPrompt {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let theme = ThemeSettings::get_global(cx);
-
-        let mut text_style = window.text_style();
-        let refinement = TextStyleRefinement {
-            font_family: Some(theme.buffer_font.family.clone()),
-            font_features: Some(FontFeatures::disable_ligatures()),
-            font_size: Some(theme.buffer_font_size(cx).into()),
-            color: Some(cx.theme().colors().editor_foreground),
-            background_color: Some(gpui::transparent_black()),
-            ..Default::default()
-        };
-
-        text_style.refine(&refinement);
-        let markdown_style = MarkdownStyle {
-            base_text_style: text_style,
-            selection_background_color: cx.theme().colors().element_selection_background,
-            ..Default::default()
-        };
-
-        v_flex()
-            .key_context("PasswordPrompt")
-            .p_2()
-            .size_full()
-            .text_buffer(cx)
-            .when_some(self.status_message.clone(), |el, status_message| {
-                el.child(
-                    h_flex()
-                        .gap_2()
-                        .child(
-                            Icon::new(IconName::ArrowCircle)
-                                .color(Color::Muted)
-                                .with_rotate_animation(2),
-                        )
-                        .child(
-                            div()
-                                .text_ellipsis()
-                                .overflow_x_hidden()
-                                .child(format!("{}…", status_message)),
-                        ),
-                )
-            })
-            .when_some(self.prompt.as_ref(), |el, prompt| {
-                el.child(
-                    div()
-                        .size_full()
-                        .overflow_hidden()
-                        .child(MarkdownElement::new(prompt.0.clone(), markdown_style))
-                        .child(self.editor.clone()),
-                )
-                .when(window.capslock().on, |el| {
-                    el.child(Label::new("⚠️ ⇪ is on"))
-                })
-            })
-    }
-}
-
-impl RemoteConnectionModal {
-    pub fn new(
-        connection_options: &RemoteConnectionOptions,
-        paths: Vec<PathBuf>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let (connection_string, nickname, is_wsl, is_devcontainer) = match connection_options {
-            RemoteConnectionOptions::Ssh(options) => (
-                options.connection_string(),
-                options.nickname.clone(),
-                false,
-                false,
-            ),
-            RemoteConnectionOptions::Wsl(options) => {
-                (options.distro_name.clone(), None, true, false)
-            }
-            RemoteConnectionOptions::Docker(options) => (options.name.clone(), None, false, true),
-        };
-        Self {
-            prompt: cx.new(|cx| {
-                RemoteConnectionPrompt::new(
-                    connection_string,
-                    nickname,
-                    is_wsl,
-                    is_devcontainer,
-                    window,
-                    cx,
-                )
-            }),
-            finished: false,
-            paths,
-        }
-    }
-
-    fn confirm(&mut self, _: &menu::Confirm, window: &mut Window, cx: &mut Context<Self>) {
-        self.prompt
-            .update(cx, |prompt, cx| prompt.confirm(window, cx))
-    }
-
-    pub fn finished(&mut self, cx: &mut Context<Self>) {
-        self.finished = true;
-        cx.emit(DismissEvent);
-    }
-
-    fn dismiss(&mut self, _: &menu::Cancel, _: &mut Window, cx: &mut Context<Self>) {
-        if let Some(tx) = self
-            .prompt
-            .update(cx, |prompt, _cx| prompt.cancellation.take())
-        {
-            tx.send(()).ok();
-        }
-        self.finished(cx);
-    }
-}
-
-pub(crate) struct SshConnectionHeader {
-    pub(crate) connection_string: SharedString,
-    pub(crate) paths: Vec<PathBuf>,
-    pub(crate) nickname: Option<SharedString>,
-    pub(crate) is_wsl: bool,
-    pub(crate) is_devcontainer: bool,
-}
-
-impl RenderOnce for SshConnectionHeader {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let theme = cx.theme();
-
-        let mut header_color = theme.colors().text;
-        header_color.fade_out(0.96);
-
-        let (main_label, meta_label) = if let Some(nickname) = self.nickname {
-            (nickname, Some(format!("({})", self.connection_string)))
-        } else {
-            (self.connection_string, None)
-        };
-
-        let icon = if self.is_wsl {
-            IconName::Linux
-        } else if self.is_devcontainer {
-            IconName::Box
-        } else {
-            IconName::Server
-        };
-
-        h_flex()
-            .px(DynamicSpacing::Base12.rems(cx))
-            .pt(DynamicSpacing::Base08.rems(cx))
-            .pb(DynamicSpacing::Base04.rems(cx))
-            .rounded_t_sm()
-            .w_full()
-            .gap_1p5()
-            .child(Icon::new(icon).size(IconSize::Small))
-            .child(
-                h_flex()
-                    .gap_1()
-                    .overflow_x_hidden()
-                    .child(
-                        div()
-                            .max_w_96()
-                            .overflow_x_hidden()
-                            .text_ellipsis()
-                            .child(Headline::new(main_label).size(HeadlineSize::XSmall)),
-                    )
-                    .children(
-                        meta_label.map(|label| {
-                            Label::new(label).color(Color::Muted).size(LabelSize::Small)
-                        }),
-                    )
-                    .child(div().overflow_x_hidden().text_ellipsis().children(
-                        self.paths.into_iter().map(|path| {
-                            Label::new(path.to_string_lossy().into_owned())
-                                .size(LabelSize::Small)
-                                .color(Color::Muted)
-                        }),
-                    )),
-            )
-    }
-}
-
-impl Render for RemoteConnectionModal {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl ui::IntoElement {
-        let nickname = self.prompt.read(cx).nickname.clone();
-        let connection_string = self.prompt.read(cx).connection_string.clone();
-        let is_wsl = self.prompt.read(cx).is_wsl;
-        let is_devcontainer = self.prompt.read(cx).is_devcontainer;
-
-        let theme = cx.theme().clone();
-        let body_color = theme.colors().editor_background;
-
-        v_flex()
-            .elevation_3(cx)
-            .w(rems(34.))
-            .border_1()
-            .border_color(theme.colors().border)
-            .key_context("SshConnectionModal")
-            .track_focus(&self.focus_handle(cx))
-            .on_action(cx.listener(Self::dismiss))
-            .on_action(cx.listener(Self::confirm))
-            .child(
-                SshConnectionHeader {
-                    paths: self.paths.clone(),
-                    connection_string,
-                    nickname,
-                    is_wsl,
-                    is_devcontainer,
-                }
-                .render(window, cx),
-            )
-            .child(
-                div()
-                    .w_full()
-                    .bg(body_color)
-                    .border_y_1()
-                    .border_color(theme.colors().border_variant)
-                    .child(self.prompt.clone()),
-            )
-            .child(
-                div().w_full().py_1().child(
-                    ListItem::new("li-devcontainer-go-back")
-                        .inset(true)
-                        .spacing(ui::ListItemSpacing::Sparse)
-                        .start_slot(Icon::new(IconName::Close).color(Color::Muted))
-                        .child(Label::new("Cancel"))
-                        .end_slot(
-                            KeyBinding::for_action_in(&menu::Cancel, &self.focus_handle(cx), cx)
-                                .size(rems_from_px(12.)),
-                        )
-                        .on_click(cx.listener(|this, _, window, cx| {
-                            this.dismiss(&menu::Cancel, window, cx);
-                        })),
-                ),
-            )
-    }
-}
-
-impl Focusable for RemoteConnectionModal {
-    fn focus_handle(&self, cx: &gpui::App) -> gpui::FocusHandle {
-        self.prompt.read(cx).editor.focus_handle(cx)
-    }
-}
-
-impl EventEmitter<DismissEvent> for RemoteConnectionModal {}
-
-impl ModalView for RemoteConnectionModal {
-    fn on_before_dismiss(
-        &mut self,
-        _window: &mut Window,
-        _: &mut Context<Self>,
-    ) -> workspace::DismissDecision {
-        workspace::DismissDecision::Dismiss(self.finished)
-    }
-
-    fn fade_out_background(&self) -> bool {
-        true
-    }
-}
-
-#[derive(Clone)]
-pub struct RemoteClientDelegate {
-    window: AnyWindowHandle,
-    ui: WeakEntity<RemoteConnectionPrompt>,
-    known_password: Option<EncryptedPassword>,
-}
-
-impl remote::RemoteClientDelegate for RemoteClientDelegate {
-    fn ask_password(
-        &self,
-        prompt: String,
-        tx: oneshot::Sender<EncryptedPassword>,
-        cx: &mut AsyncApp,
-    ) {
-        let mut known_password = self.known_password.clone();
-        if let Some(password) = known_password.take() {
-            tx.send(password).ok();
-        } else {
-            self.window
-                .update(cx, |_, window, cx| {
-                    self.ui.update(cx, |modal, cx| {
-                        modal.set_prompt(prompt, tx, window, cx);
-                    })
-                })
-                .ok();
-        }
-    }
-
-    fn set_status(&self, status: Option<&str>, cx: &mut AsyncApp) {
-        self.update_status(status, cx)
-    }
-
-    fn download_server_binary_locally(
-        &self,
-        platform: RemotePlatform,
-        release_channel: ReleaseChannel,
-        version: Option<Version>,
-        cx: &mut AsyncApp,
-    ) -> Task<anyhow::Result<PathBuf>> {
-        let this = self.clone();
-        cx.spawn(async move |cx| {
-            AutoUpdater::download_remote_server_release(
-                release_channel,
-                version.clone(),
-                platform.os,
-                platform.arch,
-                move |status, cx| this.set_status(Some(status), cx),
-                cx,
-            )
-            .await
-            .with_context(|| {
-                format!(
-                    "Downloading remote server binary (version: {}, os: {}, arch: {})",
-                    version
-                        .as_ref()
-                        .map(|v| format!("{}", v))
-                        .unwrap_or("unknown".to_string()),
-                    platform.os,
-                    platform.arch,
-                )
-            })
-        })
-    }
-
-    fn get_download_url(
-        &self,
-        platform: RemotePlatform,
-        release_channel: ReleaseChannel,
-        version: Option<Version>,
-        cx: &mut AsyncApp,
-    ) -> Task<Result<Option<String>>> {
-        cx.spawn(async move |cx| {
-            AutoUpdater::get_remote_server_release_url(
-                release_channel,
-                version,
-                platform.os,
-                platform.arch,
-                cx,
-            )
-            .await
-        })
-    }
-}
-
-impl RemoteClientDelegate {
-    fn update_status(&self, status: Option<&str>, cx: &mut AsyncApp) {
-        self.window
-            .update(cx, |_, _, cx| {
-                self.ui.update(cx, |modal, cx| {
-                    modal.set_status(status.map(|s| s.to_string()), cx);
-                })
-            })
-            .ok();
-    }
-}
-
-pub fn connect(
-    unique_identifier: ConnectionIdentifier,
-    connection_options: RemoteConnectionOptions,
-    ui: Entity<RemoteConnectionPrompt>,
-    window: &mut Window,
-    cx: &mut App,
-) -> Task<Result<Option<Entity<RemoteClient>>>> {
-    let window = window.window_handle();
-    let known_password = match &connection_options {
-        RemoteConnectionOptions::Ssh(ssh_connection_options) => ssh_connection_options
-            .password
-            .as_deref()
-            .and_then(|pw| pw.try_into().ok()),
-        _ => None,
-    };
-    let (tx, rx) = oneshot::channel();
-    ui.update(cx, |ui, _cx| ui.set_cancellation_tx(tx));
-
-    let delegate = Arc::new(RemoteClientDelegate {
-        window,
-        ui: ui.downgrade(),
-        known_password,
-    });
-
-    cx.spawn(async move |cx| {
-        let connection = remote::connect(connection_options, delegate.clone(), cx).await?;
-        cx.update(|cx| remote::RemoteClient::new(unique_identifier, connection, rx, delegate, cx))?
-            .await
-    })
-}
-
-pub async fn open_remote_project(
-    connection_options: RemoteConnectionOptions,
-    paths: Vec<PathBuf>,
-    app_state: Arc<AppState>,
-    open_options: workspace::OpenOptions,
-    cx: &mut AsyncApp,
-) -> Result<()> {
-    let created_new_window = open_options.replace_window.is_none();
-    let window = if let Some(window) = open_options.replace_window {
-        window
-    } else {
-        let workspace_position = cx
-            .update(|cx| {
-                // todo: These paths are wrong they may have column and line information
-                workspace::remote_workspace_position_from_db(connection_options.clone(), &paths, cx)
-            })?
-            .await
-            .context("fetching ssh workspace position from db")?;
-
-        let mut options =
-            cx.update(|cx| (app_state.build_window_options)(workspace_position.display, cx))?;
-        options.window_bounds = workspace_position.window_bounds;
-
-        cx.open_window(options, |window, cx| {
-            let project = project::Project::local(
-                app_state.client.clone(),
-                app_state.node_runtime.clone(),
-                app_state.user_store.clone(),
-                app_state.languages.clone(),
-                app_state.fs.clone(),
-                None,
-                cx,
-            );
-            cx.new(|cx| {
-                let mut workspace = Workspace::new(None, project, app_state.clone(), window, cx);
-                workspace.centered_layout = workspace_position.centered_layout;
-                workspace
-            })
-        })?
-    };
-
-    loop {
-        let (cancel_tx, cancel_rx) = oneshot::channel();
-        let delegate = window.update(cx, {
-            let paths = paths.clone();
-            let connection_options = connection_options.clone();
-            move |workspace, window, cx| {
-                window.activate_window();
-                workspace.toggle_modal(window, cx, |window, cx| {
-                    RemoteConnectionModal::new(&connection_options, paths, window, cx)
-                });
-
-                let ui = workspace
-                    .active_modal::<RemoteConnectionModal>(cx)?
-                    .read(cx)
-                    .prompt
-                    .clone();
-
-                ui.update(cx, |ui, _cx| {
-                    ui.set_cancellation_tx(cancel_tx);
-                });
-
-                Some(Arc::new(RemoteClientDelegate {
-                    window: window.window_handle(),
-                    ui: ui.downgrade(),
-                    known_password: if let RemoteConnectionOptions::Ssh(options) =
-                        &connection_options
-                    {
-                        options
-                            .password
-                            .as_deref()
-                            .and_then(|pw| EncryptedPassword::try_from(pw).ok())
-                    } else {
-                        None
-                    },
-                }))
-            }
-        })?;
-
-        let Some(delegate) = delegate else { break };
-
-        let remote_connection =
-            match remote::connect(connection_options.clone(), delegate.clone(), cx).await {
-                Ok(connection) => connection,
-                Err(e) => {
-                    window
-                        .update(cx, |workspace, _, cx| {
-                            if let Some(ui) = workspace.active_modal::<RemoteConnectionModal>(cx) {
-                                ui.update(cx, |modal, cx| modal.finished(cx))
-                            }
-                        })
-                        .ok();
-                    log::error!("Failed to open project: {e:#}");
-                    let response = window
-                        .update(cx, |_, window, cx| {
-                            window.prompt(
-                                PromptLevel::Critical,
-                                match connection_options {
-                                    RemoteConnectionOptions::Ssh(_) => "Failed to connect over SSH",
-                                    RemoteConnectionOptions::Wsl(_) => "Failed to connect to WSL",
-                                    RemoteConnectionOptions::Docker(_) => {
-                                        "Failed to connect to Dev Container"
-                                    }
-                                },
-                                Some(&format!("{e:#}")),
-                                &["Retry", "Cancel"],
-                                cx,
-                            )
-                        })?
-                        .await;
-
-                    if response == Ok(0) {
-                        continue;
-                    }
-
-                    if created_new_window {
-                        window
-                            .update(cx, |_, window, _| window.remove_window())
-                            .ok();
-                    }
-                    break;
-                }
-            };
-
-        let (paths, paths_with_positions) =
-            determine_paths_with_positions(&remote_connection, paths.clone()).await;
-
-        let opened_items = cx
-            .update(|cx| {
-                workspace::open_remote_project_with_new_connection(
-                    window,
-                    remote_connection,
-                    cancel_rx,
-                    delegate.clone(),
-                    app_state.clone(),
-                    paths.clone(),
-                    cx,
-                )
-            })?
-            .await;
-
-        window
-            .update(cx, |workspace, _, cx| {
-                if let Some(ui) = workspace.active_modal::<RemoteConnectionModal>(cx) {
-                    ui.update(cx, |modal, cx| modal.finished(cx))
-                }
-            })
-            .ok();
-
-        match opened_items {
-            Err(e) => {
-                log::error!("Failed to open project: {e:#}");
-                let response = window
-                    .update(cx, |_, window, cx| {
-                        window.prompt(
-                            PromptLevel::Critical,
-                            match connection_options {
-                                RemoteConnectionOptions::Ssh(_) => "Failed to connect over SSH",
-                                RemoteConnectionOptions::Wsl(_) => "Failed to connect to WSL",
-                                RemoteConnectionOptions::Docker(_) => {
-                                    "Failed to connect to Dev Container"
-                                }
-                            },
-                            Some(&format!("{e:#}")),
-                            &["Retry", "Cancel"],
-                            cx,
-                        )
-                    })?
-                    .await;
-                if response == Ok(0) {
-                    continue;
-                }
-
-                if created_new_window {
-                    window
-                        .update(cx, |_, window, _| window.remove_window())
-                        .ok();
-                }
-            }
-
-            Ok(items) => {
-                for (item, path) in items.into_iter().zip(paths_with_positions) {
-                    let Some(item) = item else {
-                        continue;
-                    };
-                    let Some(row) = path.row else {
-                        continue;
-                    };
-                    if let Some(active_editor) = item.downcast::<Editor>() {
-                        window
-                            .update(cx, |_, window, cx| {
-                                active_editor.update(cx, |editor, cx| {
-                                    let row = row.saturating_sub(1);
-                                    let col = path.column.unwrap_or(0).saturating_sub(1);
-                                    editor.go_to_singleton_buffer_point(
-                                        Point::new(row, col),
-                                        window,
-                                        cx,
-                                    );
-                                });
-                            })
-                            .ok();
-                    }
-                }
-            }
-        }
-
-        window
-            .update(cx, |workspace, _, cx| {
-                if let Some(client) = workspace.project().read(cx).remote_client() {
-                    ExtensionStore::global(cx)
-                        .update(cx, |store, cx| store.register_remote_client(client, cx));
-                }
-            })
-            .ok();
-
-        break;
-    }
-
-    // Already showed the error to the user
-    Ok(())
-}
-
-pub(crate) async fn determine_paths_with_positions(
-    remote_connection: &Arc<dyn RemoteConnection>,
-    mut paths: Vec<PathBuf>,
-) -> (Vec<PathBuf>, Vec<PathWithPosition>) {
-    let mut paths_with_positions = Vec::<PathWithPosition>::new();
-    for path in &mut paths {
-        if let Some(path_str) = path.to_str() {
-            let path_with_position = PathWithPosition::parse_str(&path_str);
-            if path_with_position.row.is_some() {
-                if !path_exists(&remote_connection, &path).await {
-                    *path = path_with_position.path.clone();
-                    paths_with_positions.push(path_with_position);
-                    continue;
-                }
-            }
-        }
-        paths_with_positions.push(PathWithPosition::from_path(path.clone()))
-    }
-    (paths, paths_with_positions)
-}
-
-async fn path_exists(connection: &Arc<dyn RemoteConnection>, path: &Path) -> bool {
-    let Ok(command) = connection.build_command(
-        Some("test".to_string()),
-        &["-e".to_owned(), path.to_string_lossy().to_string()],
-        &Default::default(),
-        None,
-        None,
-    ) else {
-        return false;
-    };
-    let Ok(mut child) = util::command::new_smol_command(command.program)
-        .args(command.args)
-        .envs(command.env)
-        .spawn()
-    else {
-        return false;
-    };
-    child.status().await.is_ok_and(|status| status.success())
-}
diff --git a/crates/recent_projects/src/remote_servers.rs b/crates/recent_projects/src/remote_servers.rs
deleted file mode 100644
index 32a4ef1a81..0000000000
--- a/crates/recent_projects/src/remote_servers.rs
+++ /dev/null
@@ -1,2787 +0,0 @@
-use crate::{
-    dev_container::start_dev_container,
-    remote_connections::{
-        Connection, RemoteConnectionModal, RemoteConnectionPrompt, SshConnection,
-        SshConnectionHeader, SshSettings, connect, determine_paths_with_positions,
-        open_remote_project,
-    },
-    ssh_config::parse_ssh_config_hosts,
-};
-use editor::Editor;
-use file_finder::OpenPathDelegate;
-use futures::{FutureExt, channel::oneshot, future::Shared, select};
-use gpui::{
-    AnyElement, App, ClickEvent, ClipboardItem, Context, DismissEvent, Entity, EventEmitter,
-    FocusHandle, Focusable, PromptLevel, ScrollHandle, Subscription, Task, WeakEntity, Window,
-    canvas,
-};
-use language::Point;
-use log::info;
-use paths::{global_ssh_config_file, user_ssh_config_file};
-use picker::Picker;
-use project::{Fs, Project};
-use remote::{
-    RemoteClient, RemoteConnectionOptions, SshConnectionOptions, WslConnectionOptions,
-    remote_client::ConnectionIdentifier,
-};
-use settings::{
-    RemoteProject, RemoteSettingsContent, Settings as _, SettingsStore, update_settings_file,
-    watch_config_file,
-};
-use smol::stream::StreamExt as _;
-use std::{
-    borrow::Cow,
-    collections::BTreeSet,
-    path::PathBuf,
-    rc::Rc,
-    sync::{
-        Arc,
-        atomic::{self, AtomicUsize},
-    },
-};
-use ui::{
-    CommonAnimationExt, IconButtonShape, KeyBinding, List, ListItem, ListSeparator, Modal,
-    ModalHeader, Navigable, NavigableEntry, Section, Tooltip, WithScrollbar, prelude::*,
-};
-use util::{
-    ResultExt,
-    paths::{PathStyle, RemotePathBuf},
-    rel_path::RelPath,
-};
-use workspace::{
-    ModalView, OpenOptions, Toast, Workspace,
-    notifications::{DetachAndPromptErr, NotificationId},
-    open_remote_project_with_existing_connection,
-};
-
-pub struct RemoteServerProjects {
-    mode: Mode,
-    focus_handle: FocusHandle,
-    workspace: WeakEntity<Workspace>,
-    retained_connections: Vec<Entity<RemoteClient>>,
-    ssh_config_updates: Task<()>,
-    ssh_config_servers: BTreeSet<SharedString>,
-    create_new_window: bool,
-    _subscription: Subscription,
-}
-
-struct CreateRemoteServer {
-    address_editor: Entity<Editor>,
-    address_error: Option<SharedString>,
-    ssh_prompt: Option<Entity<RemoteConnectionPrompt>>,
-    _creating: Option<Task<Option<()>>>,
-}
-
-impl CreateRemoteServer {
-    fn new(window: &mut Window, cx: &mut App) -> Self {
-        let address_editor = cx.new(|cx| Editor::single_line(window, cx));
-        address_editor.update(cx, |this, cx| {
-            this.focus_handle(cx).focus(window);
-        });
-        Self {
-            address_editor,
-            address_error: None,
-            ssh_prompt: None,
-            _creating: None,
-        }
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
-enum DevContainerCreationProgress {
-    Initial,
-    Creating,
-    Error(String),
-}
-
-#[derive(Clone)]
-struct CreateRemoteDevContainer {
-    // 3 Navigable Options
-    // - Create from devcontainer.json
-    // - Edit devcontainer.json
-    // - Go back
-    entries: [NavigableEntry; 3],
-    progress: DevContainerCreationProgress,
-}
-
-impl CreateRemoteDevContainer {
-    fn new(window: &mut Window, cx: &mut Context<RemoteServerProjects>) -> Self {
-        let entries = std::array::from_fn(|_| NavigableEntry::focusable(cx));
-        entries[0].focus_handle.focus(window);
-        Self {
-            entries,
-            progress: DevContainerCreationProgress::Initial,
-        }
-    }
-
-    fn progress(&mut self, progress: DevContainerCreationProgress) -> Self {
-        self.progress = progress;
-        self.clone()
-    }
-}
-
-#[cfg(target_os = "windows")]
-struct AddWslDistro {
-    picker: Entity<Picker<crate::wsl_picker::WslPickerDelegate>>,
-    connection_prompt: Option<Entity<RemoteConnectionPrompt>>,
-    _creating: Option<Task<()>>,
-}
-
-#[cfg(target_os = "windows")]
-impl AddWslDistro {
-    fn new(window: &mut Window, cx: &mut Context<RemoteServerProjects>) -> Self {
-        use crate::wsl_picker::{WslDistroSelected, WslPickerDelegate, WslPickerDismissed};
-
-        let delegate = WslPickerDelegate::new();
-        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx).modal(false));
-
-        cx.subscribe_in(
-            &picker,
-            window,
-            |this, _, _: &WslDistroSelected, window, cx| {
-                this.confirm(&menu::Confirm, window, cx);
-            },
-        )
-        .detach();
-
-        cx.subscribe_in(
-            &picker,
-            window,
-            |this, _, _: &WslPickerDismissed, window, cx| {
-                this.cancel(&menu::Cancel, window, cx);
-            },
-        )
-        .detach();
-
-        AddWslDistro {
-            picker,
-            connection_prompt: None,
-            _creating: None,
-        }
-    }
-}
-
-enum ProjectPickerData {
-    Ssh {
-        connection_string: SharedString,
-        nickname: Option<SharedString>,
-    },
-    Wsl {
-        distro_name: SharedString,
-    },
-}
-
-struct ProjectPicker {
-    data: ProjectPickerData,
-    picker: Entity<Picker<OpenPathDelegate>>,
-    _path_task: Shared<Task<Option<()>>>,
-}
-
-struct EditNicknameState {
-    index: SshServerIndex,
-    editor: Entity<Editor>,
-}
-
-impl EditNicknameState {
-    fn new(index: SshServerIndex, window: &mut Window, cx: &mut App) -> Self {
-        let this = Self {
-            index,
-            editor: cx.new(|cx| Editor::single_line(window, cx)),
-        };
-        let starting_text = SshSettings::get_global(cx)
-            .ssh_connections()
-            .nth(index.0)
-            .and_then(|state| state.nickname)
-            .filter(|text| !text.is_empty());
-        this.editor.update(cx, |this, cx| {
-            this.set_placeholder_text("Add a nickname for this server", window, cx);
-            if let Some(starting_text) = starting_text {
-                this.set_text(starting_text, window, cx);
-            }
-        });
-        this.editor.focus_handle(cx).focus(window);
-        this
-    }
-}
-
-impl Focusable for ProjectPicker {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        self.picker.focus_handle(cx)
-    }
-}
-
-impl ProjectPicker {
-    fn new(
-        create_new_window: bool,
-        index: ServerIndex,
-        connection: RemoteConnectionOptions,
-        project: Entity<Project>,
-        home_dir: RemotePathBuf,
-        path_style: PathStyle,
-        workspace: WeakEntity<Workspace>,
-        window: &mut Window,
-        cx: &mut Context<RemoteServerProjects>,
-    ) -> Entity<Self> {
-        let (tx, rx) = oneshot::channel();
-        let lister = project::DirectoryLister::Project(project.clone());
-        let delegate = file_finder::OpenPathDelegate::new(tx, lister, false, path_style);
-
-        let picker = cx.new(|cx| {
-            let picker = Picker::uniform_list(delegate, window, cx)
-                .width(rems(34.))
-                .modal(false);
-            picker.set_query(home_dir.to_string(), window, cx);
-            picker
-        });
-
-        let data = match &connection {
-            RemoteConnectionOptions::Ssh(connection) => ProjectPickerData::Ssh {
-                connection_string: connection.connection_string().into(),
-                nickname: connection.nickname.clone().map(|nick| nick.into()),
-            },
-            RemoteConnectionOptions::Wsl(connection) => ProjectPickerData::Wsl {
-                distro_name: connection.distro_name.clone().into(),
-            },
-            RemoteConnectionOptions::Docker(_) => ProjectPickerData::Ssh {
-                // Not implemented as a project picker at this time
-                connection_string: "".into(),
-                nickname: None,
-            },
-        };
-        let _path_task = cx
-            .spawn_in(window, {
-                let workspace = workspace;
-                async move |this, cx| {
-                    let Ok(Some(paths)) = rx.await else {
-                        workspace
-                            .update_in(cx, |workspace, window, cx| {
-                                let fs = workspace.project().read(cx).fs().clone();
-                                let weak = cx.entity().downgrade();
-                                workspace.toggle_modal(window, cx, |window, cx| {
-                                    RemoteServerProjects::new(
-                                        create_new_window,
-                                        fs,
-                                        window,
-                                        weak,
-                                        cx,
-                                    )
-                                });
-                            })
-                            .log_err()?;
-                        return None;
-                    };
-
-                    let app_state = workspace
-                        .read_with(cx, |workspace, _| workspace.app_state().clone())
-                        .ok()?;
-
-                    let remote_connection = project
-                        .read_with(cx, |project, cx| {
-                            project.remote_client()?.read(cx).connection()
-                        })
-                        .ok()??;
-
-                    let (paths, paths_with_positions) =
-                        determine_paths_with_positions(&remote_connection, paths).await;
-
-                    cx.update(|_, cx| {
-                        let fs = app_state.fs.clone();
-                        update_settings_file(fs, cx, {
-                            let paths = paths
-                                .iter()
-                                .map(|path| path.to_string_lossy().into_owned())
-                                .collect();
-                            move |settings, _| match index {
-                                ServerIndex::Ssh(index) => {
-                                    if let Some(server) = settings
-                                        .remote
-                                        .ssh_connections
-                                        .as_mut()
-                                        .and_then(|connections| connections.get_mut(index.0))
-                                    {
-                                        server.projects.insert(RemoteProject { paths });
-                                    };
-                                }
-                                ServerIndex::Wsl(index) => {
-                                    if let Some(server) = settings
-                                        .remote
-                                        .wsl_connections
-                                        .as_mut()
-                                        .and_then(|connections| connections.get_mut(index.0))
-                                    {
-                                        server.projects.insert(RemoteProject { paths });
-                                    };
-                                }
-                            }
-                        });
-                    })
-                    .log_err();
-
-                    let options = cx
-                        .update(|_, cx| (app_state.build_window_options)(None, cx))
-                        .log_err()?;
-                    let window = cx
-                        .open_window(options, |window, cx| {
-                            cx.new(|cx| {
-                                telemetry::event!("SSH Project Created");
-                                Workspace::new(None, project.clone(), app_state.clone(), window, cx)
-                            })
-                        })
-                        .log_err()?;
-
-                    let items = open_remote_project_with_existing_connection(
-                        connection, project, paths, app_state, window, cx,
-                    )
-                    .await
-                    .log_err();
-
-                    if let Some(items) = items {
-                        for (item, path) in items.into_iter().zip(paths_with_positions) {
-                            let Some(item) = item else {
-                                continue;
-                            };
-                            let Some(row) = path.row else {
-                                continue;
-                            };
-                            if let Some(active_editor) = item.downcast::<Editor>() {
-                                window
-                                    .update(cx, |_, window, cx| {
-                                        active_editor.update(cx, |editor, cx| {
-                                            let row = row.saturating_sub(1);
-                                            let col = path.column.unwrap_or(0).saturating_sub(1);
-                                            editor.go_to_singleton_buffer_point(
-                                                Point::new(row, col),
-                                                window,
-                                                cx,
-                                            );
-                                        });
-                                    })
-                                    .ok();
-                            }
-                        }
-                    }
-
-                    this.update(cx, |_, cx| {
-                        cx.emit(DismissEvent);
-                    })
-                    .ok();
-                    Some(())
-                }
-            })
-            .shared();
-        cx.new(|_| Self {
-            _path_task,
-            picker,
-            data,
-        })
-    }
-}
-
-impl gpui::Render for ProjectPicker {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .child(match &self.data {
-                ProjectPickerData::Ssh {
-                    connection_string,
-                    nickname,
-                } => SshConnectionHeader {
-                    connection_string: connection_string.clone(),
-                    paths: Default::default(),
-                    nickname: nickname.clone(),
-                    is_wsl: false,
-                    is_devcontainer: false,
-                }
-                .render(window, cx),
-                ProjectPickerData::Wsl { distro_name } => SshConnectionHeader {
-                    connection_string: distro_name.clone(),
-                    paths: Default::default(),
-                    nickname: None,
-                    is_wsl: true,
-                    is_devcontainer: false,
-                }
-                .render(window, cx),
-            })
-            .child(
-                div()
-                    .border_t_1()
-                    .border_color(cx.theme().colors().border_variant)
-                    .child(self.picker.clone()),
-            )
-    }
-}
-
-#[repr(transparent)]
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-struct SshServerIndex(usize);
-impl std::fmt::Display for SshServerIndex {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        self.0.fmt(f)
-    }
-}
-
-#[repr(transparent)]
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-struct WslServerIndex(usize);
-impl std::fmt::Display for WslServerIndex {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        self.0.fmt(f)
-    }
-}
-
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-enum ServerIndex {
-    Ssh(SshServerIndex),
-    Wsl(WslServerIndex),
-}
-impl From<SshServerIndex> for ServerIndex {
-    fn from(index: SshServerIndex) -> Self {
-        Self::Ssh(index)
-    }
-}
-impl From<WslServerIndex> for ServerIndex {
-    fn from(index: WslServerIndex) -> Self {
-        Self::Wsl(index)
-    }
-}
-
-#[derive(Clone)]
-enum RemoteEntry {
-    Project {
-        open_folder: NavigableEntry,
-        projects: Vec<(NavigableEntry, RemoteProject)>,
-        configure: NavigableEntry,
-        connection: Connection,
-        index: ServerIndex,
-    },
-    SshConfig {
-        open_folder: NavigableEntry,
-        host: SharedString,
-    },
-}
-
-impl RemoteEntry {
-    fn is_from_zed(&self) -> bool {
-        matches!(self, Self::Project { .. })
-    }
-
-    fn connection(&self) -> Cow<'_, Connection> {
-        match self {
-            Self::Project { connection, .. } => Cow::Borrowed(connection),
-            Self::SshConfig { host, .. } => Cow::Owned(
-                SshConnection {
-                    host: host.clone(),
-                    ..SshConnection::default()
-                }
-                .into(),
-            ),
-        }
-    }
-}
-
-#[derive(Clone)]
-struct DefaultState {
-    scroll_handle: ScrollHandle,
-    add_new_server: NavigableEntry,
-    add_new_devcontainer: NavigableEntry,
-    add_new_wsl: NavigableEntry,
-    servers: Vec<RemoteEntry>,
-}
-
-impl DefaultState {
-    fn new(ssh_config_servers: &BTreeSet<SharedString>, cx: &mut App) -> Self {
-        let handle = ScrollHandle::new();
-        let add_new_server = NavigableEntry::new(&handle, cx);
-        let add_new_devcontainer = NavigableEntry::new(&handle, cx);
-        let add_new_wsl = NavigableEntry::new(&handle, cx);
-
-        let ssh_settings = SshSettings::get_global(cx);
-        let read_ssh_config = ssh_settings.read_ssh_config;
-
-        let ssh_servers = ssh_settings
-            .ssh_connections()
-            .enumerate()
-            .map(|(index, connection)| {
-                let open_folder = NavigableEntry::new(&handle, cx);
-                let configure = NavigableEntry::new(&handle, cx);
-                let projects = connection
-                    .projects
-                    .iter()
-                    .map(|project| (NavigableEntry::new(&handle, cx), project.clone()))
-                    .collect();
-                RemoteEntry::Project {
-                    open_folder,
-                    configure,
-                    projects,
-                    index: ServerIndex::Ssh(SshServerIndex(index)),
-                    connection: connection.into(),
-                }
-            });
-
-        let wsl_servers = ssh_settings
-            .wsl_connections()
-            .enumerate()
-            .map(|(index, connection)| {
-                let open_folder = NavigableEntry::new(&handle, cx);
-                let configure = NavigableEntry::new(&handle, cx);
-                let projects = connection
-                    .projects
-                    .iter()
-                    .map(|project| (NavigableEntry::new(&handle, cx), project.clone()))
-                    .collect();
-                RemoteEntry::Project {
-                    open_folder,
-                    configure,
-                    projects,
-                    index: ServerIndex::Wsl(WslServerIndex(index)),
-                    connection: connection.into(),
-                }
-            });
-
-        let mut servers = ssh_servers.chain(wsl_servers).collect::<Vec<RemoteEntry>>();
-
-        if read_ssh_config {
-            let mut extra_servers_from_config = ssh_config_servers.clone();
-            for server in &servers {
-                if let RemoteEntry::Project {
-                    connection: Connection::Ssh(ssh_options),
-                    ..
-                } = server
-                {
-                    extra_servers_from_config.remove(&SharedString::new(ssh_options.host.clone()));
-                }
-            }
-            servers.extend(extra_servers_from_config.into_iter().map(|host| {
-                RemoteEntry::SshConfig {
-                    open_folder: NavigableEntry::new(&handle, cx),
-                    host,
-                }
-            }));
-        }
-
-        Self {
-            scroll_handle: handle,
-            add_new_server,
-            add_new_devcontainer,
-            add_new_wsl,
-            servers,
-        }
-    }
-}
-
-#[derive(Clone)]
-enum ViewServerOptionsState {
-    Ssh {
-        connection: SshConnectionOptions,
-        server_index: SshServerIndex,
-        entries: [NavigableEntry; 4],
-    },
-    Wsl {
-        connection: WslConnectionOptions,
-        server_index: WslServerIndex,
-        entries: [NavigableEntry; 2],
-    },
-}
-
-impl ViewServerOptionsState {
-    fn entries(&self) -> &[NavigableEntry] {
-        match self {
-            Self::Ssh { entries, .. } => entries,
-            Self::Wsl { entries, .. } => entries,
-        }
-    }
-}
-
-enum Mode {
-    Default(DefaultState),
-    ViewServerOptions(ViewServerOptionsState),
-    EditNickname(EditNicknameState),
-    ProjectPicker(Entity<ProjectPicker>),
-    CreateRemoteServer(CreateRemoteServer),
-    CreateRemoteDevContainer(CreateRemoteDevContainer),
-    #[cfg(target_os = "windows")]
-    AddWslDistro(AddWslDistro),
-}
-
-impl Mode {
-    fn default_mode(ssh_config_servers: &BTreeSet<SharedString>, cx: &mut App) -> Self {
-        Self::Default(DefaultState::new(ssh_config_servers, cx))
-    }
-}
-
-impl RemoteServerProjects {
-    #[cfg(target_os = "windows")]
-    pub fn wsl(
-        create_new_window: bool,
-        fs: Arc<dyn Fs>,
-        window: &mut Window,
-        workspace: WeakEntity<Workspace>,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        Self::new_inner(
-            Mode::AddWslDistro(AddWslDistro::new(window, cx)),
-            create_new_window,
-            fs,
-            window,
-            workspace,
-            cx,
-        )
-    }
-
-    pub fn new(
-        create_new_window: bool,
-        fs: Arc<dyn Fs>,
-        window: &mut Window,
-        workspace: WeakEntity<Workspace>,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        Self::new_inner(
-            Mode::default_mode(&BTreeSet::new(), cx),
-            create_new_window,
-            fs,
-            window,
-            workspace,
-            cx,
-        )
-    }
-
-    /// Creates a new RemoteServerProjects modal that opens directly in dev container creation mode.
-    /// Used when suggesting dev container connection from toast notification.
-    pub fn new_dev_container(
-        fs: Arc<dyn Fs>,
-        window: &mut Window,
-        workspace: WeakEntity<Workspace>,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        Self::new_inner(
-            Mode::CreateRemoteDevContainer(
-                CreateRemoteDevContainer::new(window, cx)
-                    .progress(DevContainerCreationProgress::Creating),
-            ),
-            false,
-            fs,
-            window,
-            workspace,
-            cx,
-        )
-    }
-
-    fn new_inner(
-        mode: Mode,
-        create_new_window: bool,
-        fs: Arc<dyn Fs>,
-        window: &mut Window,
-        workspace: WeakEntity<Workspace>,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let focus_handle = cx.focus_handle();
-        let mut read_ssh_config = SshSettings::get_global(cx).read_ssh_config;
-        let ssh_config_updates = if read_ssh_config {
-            spawn_ssh_config_watch(fs.clone(), cx)
-        } else {
-            Task::ready(())
-        };
-
-        let mut base_style = window.text_style();
-        base_style.refine(&gpui::TextStyleRefinement {
-            color: Some(cx.theme().colors().editor_foreground),
-            ..Default::default()
-        });
-
-        let _subscription =
-            cx.observe_global_in::<SettingsStore>(window, move |recent_projects, _, cx| {
-                let new_read_ssh_config = SshSettings::get_global(cx).read_ssh_config;
-                if read_ssh_config != new_read_ssh_config {
-                    read_ssh_config = new_read_ssh_config;
-                    if read_ssh_config {
-                        recent_projects.ssh_config_updates = spawn_ssh_config_watch(fs.clone(), cx);
-                    } else {
-                        recent_projects.ssh_config_servers.clear();
-                        recent_projects.ssh_config_updates = Task::ready(());
-                    }
-                }
-            });
-
-        Self {
-            mode,
-            focus_handle,
-            workspace,
-            retained_connections: Vec::new(),
-            ssh_config_updates,
-            ssh_config_servers: BTreeSet::new(),
-            create_new_window,
-            _subscription,
-        }
-    }
-
-    fn project_picker(
-        create_new_window: bool,
-        index: ServerIndex,
-        connection_options: remote::RemoteConnectionOptions,
-        project: Entity<Project>,
-        home_dir: RemotePathBuf,
-        path_style: PathStyle,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-        workspace: WeakEntity<Workspace>,
-    ) -> Self {
-        let fs = project.read(cx).fs().clone();
-        let mut this = Self::new(create_new_window, fs, window, workspace.clone(), cx);
-        this.mode = Mode::ProjectPicker(ProjectPicker::new(
-            create_new_window,
-            index,
-            connection_options,
-            project,
-            home_dir,
-            path_style,
-            workspace,
-            window,
-            cx,
-        ));
-        cx.notify();
-
-        this
-    }
-
-    fn create_ssh_server(
-        &mut self,
-        editor: Entity<Editor>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let input = get_text(&editor, cx);
-        if input.is_empty() {
-            return;
-        }
-
-        let connection_options = match SshConnectionOptions::parse_command_line(&input) {
-            Ok(c) => c,
-            Err(e) => {
-                self.mode = Mode::CreateRemoteServer(CreateRemoteServer {
-                    address_editor: editor,
-                    address_error: Some(format!("could not parse: {:?}", e).into()),
-                    ssh_prompt: None,
-                    _creating: None,
-                });
-                return;
-            }
-        };
-        let ssh_prompt = cx.new(|cx| {
-            RemoteConnectionPrompt::new(
-                connection_options.connection_string(),
-                connection_options.nickname.clone(),
-                false,
-                false,
-                window,
-                cx,
-            )
-        });
-
-        let connection = connect(
-            ConnectionIdentifier::setup(),
-            RemoteConnectionOptions::Ssh(connection_options.clone()),
-            ssh_prompt.clone(),
-            window,
-            cx,
-        )
-        .prompt_err("Failed to connect", window, cx, |_, _, _| None);
-
-        let address_editor = editor.clone();
-        let creating = cx.spawn_in(window, async move |this, cx| {
-            match connection.await {
-                Some(Some(client)) => this
-                    .update_in(cx, |this, window, cx| {
-                        info!("ssh server created");
-                        telemetry::event!("SSH Server Created");
-                        this.retained_connections.push(client);
-                        this.add_ssh_server(connection_options, cx);
-                        this.mode = Mode::default_mode(&this.ssh_config_servers, cx);
-                        this.focus_handle(cx).focus(window);
-                        cx.notify()
-                    })
-                    .log_err(),
-                _ => this
-                    .update(cx, |this, cx| {
-                        address_editor.update(cx, |this, _| {
-                            this.set_read_only(false);
-                        });
-                        this.mode = Mode::CreateRemoteServer(CreateRemoteServer {
-                            address_editor,
-                            address_error: None,
-                            ssh_prompt: None,
-                            _creating: None,
-                        });
-                        cx.notify()
-                    })
-                    .log_err(),
-            };
-            None
-        });
-
-        editor.update(cx, |this, _| {
-            this.set_read_only(true);
-        });
-        self.mode = Mode::CreateRemoteServer(CreateRemoteServer {
-            address_editor: editor,
-            address_error: None,
-            ssh_prompt: Some(ssh_prompt),
-            _creating: Some(creating),
-        });
-    }
-
-    #[cfg(target_os = "windows")]
-    fn connect_wsl_distro(
-        &mut self,
-        picker: Entity<Picker<crate::wsl_picker::WslPickerDelegate>>,
-        distro: String,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let connection_options = WslConnectionOptions {
-            distro_name: distro,
-            user: None,
-        };
-
-        let prompt = cx.new(|cx| {
-            RemoteConnectionPrompt::new(
-                connection_options.distro_name.clone(),
-                None,
-                true,
-                false,
-                window,
-                cx,
-            )
-        });
-        let connection = connect(
-            ConnectionIdentifier::setup(),
-            connection_options.clone().into(),
-            prompt.clone(),
-            window,
-            cx,
-        )
-        .prompt_err("Failed to connect", window, cx, |_, _, _| None);
-
-        let wsl_picker = picker.clone();
-        let creating = cx.spawn_in(window, async move |this, cx| {
-            match connection.await {
-                Some(Some(client)) => this.update_in(cx, |this, window, cx| {
-                    telemetry::event!("WSL Distro Added");
-                    this.retained_connections.push(client);
-                    let Some(fs) = this
-                        .workspace
-                        .read_with(cx, |workspace, cx| {
-                            workspace.project().read(cx).fs().clone()
-                        })
-                        .log_err()
-                    else {
-                        return;
-                    };
-
-                    crate::add_wsl_distro(fs, &connection_options, cx);
-                    this.mode = Mode::default_mode(&BTreeSet::new(), cx);
-                    this.focus_handle(cx).focus(window);
-                    cx.notify();
-                }),
-                _ => this.update(cx, |this, cx| {
-                    this.mode = Mode::AddWslDistro(AddWslDistro {
-                        picker: wsl_picker,
-                        connection_prompt: None,
-                        _creating: None,
-                    });
-                    cx.notify();
-                }),
-            }
-            .log_err();
-        });
-
-        self.mode = Mode::AddWslDistro(AddWslDistro {
-            picker,
-            connection_prompt: Some(prompt),
-            _creating: Some(creating),
-        });
-    }
-
-    fn view_server_options(
-        &mut self,
-        (server_index, connection): (ServerIndex, RemoteConnectionOptions),
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.mode = Mode::ViewServerOptions(match (server_index, connection) {
-            (ServerIndex::Ssh(server_index), RemoteConnectionOptions::Ssh(connection)) => {
-                ViewServerOptionsState::Ssh {
-                    connection,
-                    server_index,
-                    entries: std::array::from_fn(|_| NavigableEntry::focusable(cx)),
-                }
-            }
-            (ServerIndex::Wsl(server_index), RemoteConnectionOptions::Wsl(connection)) => {
-                ViewServerOptionsState::Wsl {
-                    connection,
-                    server_index,
-                    entries: std::array::from_fn(|_| NavigableEntry::focusable(cx)),
-                }
-            }
-            _ => {
-                log::error!("server index and connection options mismatch");
-                self.mode = Mode::default_mode(&BTreeSet::default(), cx);
-                return;
-            }
-        });
-        self.focus_handle(cx).focus(window);
-        cx.notify();
-    }
-
-    fn view_in_progress_dev_container(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.mode = Mode::CreateRemoteDevContainer(
-            CreateRemoteDevContainer::new(window, cx)
-                .progress(DevContainerCreationProgress::Creating),
-        );
-        self.focus_handle(cx).focus(window);
-        cx.notify();
-    }
-
-    fn create_remote_project(
-        &mut self,
-        index: ServerIndex,
-        connection_options: RemoteConnectionOptions,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(workspace) = self.workspace.upgrade() else {
-            return;
-        };
-
-        let create_new_window = self.create_new_window;
-        workspace.update(cx, |_, cx| {
-            cx.defer_in(window, move |workspace, window, cx| {
-                let app_state = workspace.app_state().clone();
-                workspace.toggle_modal(window, cx, |window, cx| {
-                    RemoteConnectionModal::new(&connection_options, Vec::new(), window, cx)
-                });
-                let prompt = workspace
-                    .active_modal::<RemoteConnectionModal>(cx)
-                    .unwrap()
-                    .read(cx)
-                    .prompt
-                    .clone();
-
-                let connect = connect(
-                    ConnectionIdentifier::setup(),
-                    connection_options.clone(),
-                    prompt,
-                    window,
-                    cx,
-                )
-                .prompt_err("Failed to connect", window, cx, |_, _, _| None);
-
-                cx.spawn_in(window, async move |workspace, cx| {
-                    let session = connect.await;
-
-                    workspace.update(cx, |workspace, cx| {
-                        if let Some(prompt) = workspace.active_modal::<RemoteConnectionModal>(cx) {
-                            prompt.update(cx, |prompt, cx| prompt.finished(cx))
-                        }
-                    })?;
-
-                    let Some(Some(session)) = session else {
-                        return workspace.update_in(cx, |workspace, window, cx| {
-                            let weak = cx.entity().downgrade();
-                            let fs = workspace.project().read(cx).fs().clone();
-                            workspace.toggle_modal(window, cx, |window, cx| {
-                                RemoteServerProjects::new(create_new_window, fs, window, weak, cx)
-                            });
-                        });
-                    };
-
-                    let (path_style, project) = cx.update(|_, cx| {
-                        (
-                            session.read(cx).path_style(),
-                            project::Project::remote(
-                                session,
-                                app_state.client.clone(),
-                                app_state.node_runtime.clone(),
-                                app_state.user_store.clone(),
-                                app_state.languages.clone(),
-                                app_state.fs.clone(),
-                                cx,
-                            ),
-                        )
-                    })?;
-
-                    let home_dir = project
-                        .read_with(cx, |project, cx| project.resolve_abs_path("~", cx))?
-                        .await
-                        .and_then(|path| path.into_abs_path())
-                        .map(|path| RemotePathBuf::new(path, path_style))
-                        .unwrap_or_else(|| match path_style {
-                            PathStyle::Posix => RemotePathBuf::from_str("/", PathStyle::Posix),
-                            PathStyle::Windows => {
-                                RemotePathBuf::from_str("C:\\", PathStyle::Windows)
-                            }
-                        });
-
-                    workspace
-                        .update_in(cx, |workspace, window, cx| {
-                            let weak = cx.entity().downgrade();
-                            workspace.toggle_modal(window, cx, |window, cx| {
-                                RemoteServerProjects::project_picker(
-                                    create_new_window,
-                                    index,
-                                    connection_options,
-                                    project,
-                                    home_dir,
-                                    path_style,
-                                    window,
-                                    cx,
-                                    weak,
-                                )
-                            });
-                        })
-                        .ok();
-                    Ok(())
-                })
-                .detach();
-            })
-        })
-    }
-
-    fn confirm(&mut self, _: &menu::Confirm, window: &mut Window, cx: &mut Context<Self>) {
-        match &self.mode {
-            Mode::Default(_) | Mode::ViewServerOptions(_) => {}
-            Mode::ProjectPicker(_) => {}
-            Mode::CreateRemoteServer(state) => {
-                if let Some(prompt) = state.ssh_prompt.as_ref() {
-                    prompt.update(cx, |prompt, cx| {
-                        prompt.confirm(window, cx);
-                    });
-                    return;
-                }
-
-                self.create_ssh_server(state.address_editor.clone(), window, cx);
-            }
-            Mode::CreateRemoteDevContainer(_) => {}
-            Mode::EditNickname(state) => {
-                let text = Some(state.editor.read(cx).text(cx)).filter(|text| !text.is_empty());
-                let index = state.index;
-                self.update_settings_file(cx, move |setting, _| {
-                    if let Some(connections) = setting.ssh_connections.as_mut()
-                        && let Some(connection) = connections.get_mut(index.0)
-                    {
-                        connection.nickname = text;
-                    }
-                });
-                self.mode = Mode::default_mode(&self.ssh_config_servers, cx);
-                self.focus_handle.focus(window);
-            }
-            #[cfg(target_os = "windows")]
-            Mode::AddWslDistro(state) => {
-                let delegate = &state.picker.read(cx).delegate;
-                let distro = delegate.selected_distro().unwrap();
-                self.connect_wsl_distro(state.picker.clone(), distro, window, cx);
-            }
-        }
-    }
-
-    fn cancel(&mut self, _: &menu::Cancel, window: &mut Window, cx: &mut Context<Self>) {
-        match &self.mode {
-            Mode::Default(_) => cx.emit(DismissEvent),
-            Mode::CreateRemoteServer(state) if state.ssh_prompt.is_some() => {
-                let new_state = CreateRemoteServer::new(window, cx);
-                let old_prompt = state.address_editor.read(cx).text(cx);
-                new_state.address_editor.update(cx, |this, cx| {
-                    this.set_text(old_prompt, window, cx);
-                });
-
-                self.mode = Mode::CreateRemoteServer(new_state);
-                cx.notify();
-            }
-            _ => {
-                self.mode = Mode::default_mode(&self.ssh_config_servers, cx);
-                self.focus_handle(cx).focus(window);
-                cx.notify();
-            }
-        }
-    }
-
-    fn render_remote_connection(
-        &mut self,
-        ix: usize,
-        remote_server: RemoteEntry,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let connection = remote_server.connection().into_owned();
-
-        let (main_label, aux_label, is_wsl) = match &connection {
-            Connection::Ssh(connection) => {
-                if let Some(nickname) = connection.nickname.clone() {
-                    let aux_label = SharedString::from(format!("({})", connection.host));
-                    (nickname.into(), Some(aux_label), false)
-                } else {
-                    (connection.host.clone(), None, false)
-                }
-            }
-            Connection::Wsl(wsl_connection_options) => {
-                (wsl_connection_options.distro_name.clone(), None, true)
-            }
-            Connection::DevContainer(dev_container_options) => {
-                (dev_container_options.name.clone(), None, false)
-            }
-        };
-        v_flex()
-            .w_full()
-            .child(ListSeparator)
-            .child(
-                h_flex()
-                    .group("ssh-server")
-                    .w_full()
-                    .pt_0p5()
-                    .px_3()
-                    .gap_1()
-                    .overflow_hidden()
-                    .child(
-                        h_flex()
-                            .gap_1()
-                            .max_w_96()
-                            .overflow_hidden()
-                            .text_ellipsis()
-                            .when(is_wsl, |this| {
-                                this.child(
-                                    Label::new("WSL:")
-                                        .size(LabelSize::Small)
-                                        .color(Color::Muted),
-                                )
-                            })
-                            .child(
-                                Label::new(main_label)
-                                    .size(LabelSize::Small)
-                                    .color(Color::Muted),
-                            ),
-                    )
-                    .children(
-                        aux_label.map(|label| {
-                            Label::new(label).size(LabelSize::Small).color(Color::Muted)
-                        }),
-                    ),
-            )
-            .child(match &remote_server {
-                RemoteEntry::Project {
-                    open_folder,
-                    projects,
-                    configure,
-                    connection,
-                    index,
-                } => {
-                    let index = *index;
-                    List::new()
-                        .empty_message("No projects.")
-                        .children(projects.iter().enumerate().map(|(pix, p)| {
-                            v_flex().gap_0p5().child(self.render_remote_project(
-                                index,
-                                remote_server.clone(),
-                                pix,
-                                p,
-                                window,
-                                cx,
-                            ))
-                        }))
-                        .child(
-                            h_flex()
-                                .id(("new-remote-project-container", ix))
-                                .track_focus(&open_folder.focus_handle)
-                                .anchor_scroll(open_folder.scroll_anchor.clone())
-                                .on_action(cx.listener({
-                                    let connection = connection.clone();
-                                    move |this, _: &menu::Confirm, window, cx| {
-                                        this.create_remote_project(
-                                            index,
-                                            connection.clone().into(),
-                                            window,
-                                            cx,
-                                        );
-                                    }
-                                }))
-                                .child(
-                                    ListItem::new(("new-remote-project", ix))
-                                        .toggle_state(
-                                            open_folder.focus_handle.contains_focused(window, cx),
-                                        )
-                                        .inset(true)
-                                        .spacing(ui::ListItemSpacing::Sparse)
-                                        .start_slot(Icon::new(IconName::Plus).color(Color::Muted))
-                                        .child(Label::new("Open Folder"))
-                                        .on_click(cx.listener({
-                                            let connection = connection.clone();
-                                            move |this, _, window, cx| {
-                                                this.create_remote_project(
-                                                    index,
-                                                    connection.clone().into(),
-                                                    window,
-                                                    cx,
-                                                );
-                                            }
-                                        })),
-                                ),
-                        )
-                        .child(
-                            h_flex()
-                                .id(("server-options-container", ix))
-                                .track_focus(&configure.focus_handle)
-                                .anchor_scroll(configure.scroll_anchor.clone())
-                                .on_action(cx.listener({
-                                    let connection = connection.clone();
-                                    move |this, _: &menu::Confirm, window, cx| {
-                                        this.view_server_options(
-                                            (index, connection.clone().into()),
-                                            window,
-                                            cx,
-                                        );
-                                    }
-                                }))
-                                .child(
-                                    ListItem::new(("server-options", ix))
-                                        .toggle_state(
-                                            configure.focus_handle.contains_focused(window, cx),
-                                        )
-                                        .inset(true)
-                                        .spacing(ui::ListItemSpacing::Sparse)
-                                        .start_slot(
-                                            Icon::new(IconName::Settings).color(Color::Muted),
-                                        )
-                                        .child(Label::new("View Server Options"))
-                                        .on_click(cx.listener({
-                                            let ssh_connection = connection.clone();
-                                            move |this, _, window, cx| {
-                                                this.view_server_options(
-                                                    (index, ssh_connection.clone().into()),
-                                                    window,
-                                                    cx,
-                                                );
-                                            }
-                                        })),
-                                ),
-                        )
-                }
-                RemoteEntry::SshConfig { open_folder, host } => List::new().child(
-                    h_flex()
-                        .id(("new-remote-project-container", ix))
-                        .track_focus(&open_folder.focus_handle)
-                        .anchor_scroll(open_folder.scroll_anchor.clone())
-                        .on_action(cx.listener({
-                            let connection = connection.clone();
-                            let host = host.clone();
-                            move |this, _: &menu::Confirm, window, cx| {
-                                let new_ix = this.create_host_from_ssh_config(&host, cx);
-                                this.create_remote_project(
-                                    new_ix.into(),
-                                    connection.clone().into(),
-                                    window,
-                                    cx,
-                                );
-                            }
-                        }))
-                        .child(
-                            ListItem::new(("new-remote-project", ix))
-                                .toggle_state(open_folder.focus_handle.contains_focused(window, cx))
-                                .inset(true)
-                                .spacing(ui::ListItemSpacing::Sparse)
-                                .start_slot(Icon::new(IconName::Plus).color(Color::Muted))
-                                .child(Label::new("Open Folder"))
-                                .on_click(cx.listener({
-                                    let host = host.clone();
-                                    move |this, _, window, cx| {
-                                        let new_ix = this.create_host_from_ssh_config(&host, cx);
-                                        this.create_remote_project(
-                                            new_ix.into(),
-                                            connection.clone().into(),
-                                            window,
-                                            cx,
-                                        );
-                                    }
-                                })),
-                        ),
-                ),
-            })
-    }
-
-    fn render_remote_project(
-        &mut self,
-        server_ix: ServerIndex,
-        server: RemoteEntry,
-        ix: usize,
-        (navigation, project): &(NavigableEntry, RemoteProject),
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let create_new_window = self.create_new_window;
-        let is_from_zed = server.is_from_zed();
-        let element_id_base = SharedString::from(format!(
-            "remote-project-{}",
-            match server_ix {
-                ServerIndex::Ssh(index) => format!("ssh-{index}"),
-                ServerIndex::Wsl(index) => format!("wsl-{index}"),
-            }
-        ));
-        let container_element_id_base =
-            SharedString::from(format!("remote-project-container-{element_id_base}"));
-
-        let callback = Rc::new({
-            let project = project.clone();
-            move |remote_server_projects: &mut Self,
-                  secondary_confirm: bool,
-                  window: &mut Window,
-                  cx: &mut Context<Self>| {
-                let Some(app_state) = remote_server_projects
-                    .workspace
-                    .read_with(cx, |workspace, _| workspace.app_state().clone())
-                    .log_err()
-                else {
-                    return;
-                };
-                let project = project.clone();
-                let server = server.connection().into_owned();
-                cx.emit(DismissEvent);
-
-                let replace_window = match (create_new_window, secondary_confirm) {
-                    (true, false) | (false, true) => None,
-                    (true, true) | (false, false) => window.window_handle().downcast::<Workspace>(),
-                };
-
-                cx.spawn_in(window, async move |_, cx| {
-                    let result = open_remote_project(
-                        server.into(),
-                        project.paths.into_iter().map(PathBuf::from).collect(),
-                        app_state,
-                        OpenOptions {
-                            replace_window,
-                            ..OpenOptions::default()
-                        },
-                        cx,
-                    )
-                    .await;
-                    if let Err(e) = result {
-                        log::error!("Failed to connect: {e:#}");
-                        cx.prompt(
-                            gpui::PromptLevel::Critical,
-                            "Failed to connect",
-                            Some(&e.to_string()),
-                            &["Ok"],
-                        )
-                        .await
-                        .ok();
-                    }
-                })
-                .detach();
-            }
-        });
-
-        div()
-            .id((container_element_id_base, ix))
-            .track_focus(&navigation.focus_handle)
-            .anchor_scroll(navigation.scroll_anchor.clone())
-            .on_action(cx.listener({
-                let callback = callback.clone();
-                move |this, _: &menu::Confirm, window, cx| {
-                    callback(this, false, window, cx);
-                }
-            }))
-            .on_action(cx.listener({
-                let callback = callback.clone();
-                move |this, _: &menu::SecondaryConfirm, window, cx| {
-                    callback(this, true, window, cx);
-                }
-            }))
-            .child(
-                ListItem::new((element_id_base, ix))
-                    .toggle_state(navigation.focus_handle.contains_focused(window, cx))
-                    .inset(true)
-                    .spacing(ui::ListItemSpacing::Sparse)
-                    .start_slot(
-                        Icon::new(IconName::Folder)
-                            .color(Color::Muted)
-                            .size(IconSize::Small),
-                    )
-                    .child(Label::new(project.paths.join(", ")))
-                    .on_click(cx.listener(move |this, e: &ClickEvent, window, cx| {
-                        let secondary_confirm = e.modifiers().platform;
-                        callback(this, secondary_confirm, window, cx)
-                    }))
-                    .when(is_from_zed, |server_list_item| {
-                        server_list_item.end_hover_slot::<AnyElement>(Some(
-                            div()
-                                .mr_2()
-                                .child({
-                                    let project = project.clone();
-                                    // Right-margin to offset it from the Scrollbar
-                                    IconButton::new("remove-remote-project", IconName::Trash)
-                                        .icon_size(IconSize::Small)
-                                        .shape(IconButtonShape::Square)
-                                        .size(ButtonSize::Large)
-                                        .tooltip(Tooltip::text("Delete Remote Project"))
-                                        .on_click(cx.listener(move |this, _, _, cx| {
-                                            this.delete_remote_project(server_ix, &project, cx)
-                                        }))
-                                })
-                                .into_any_element(),
-                        ))
-                    }),
-            )
-    }
-
-    fn update_settings_file(
-        &mut self,
-        cx: &mut Context<Self>,
-        f: impl FnOnce(&mut RemoteSettingsContent, &App) + Send + Sync + 'static,
-    ) {
-        let Some(fs) = self
-            .workspace
-            .read_with(cx, |workspace, _| workspace.app_state().fs.clone())
-            .log_err()
-        else {
-            return;
-        };
-        update_settings_file(fs, cx, move |setting, cx| f(&mut setting.remote, cx));
-    }
-
-    fn delete_ssh_server(&mut self, server: SshServerIndex, cx: &mut Context<Self>) {
-        self.update_settings_file(cx, move |setting, _| {
-            if let Some(connections) = setting.ssh_connections.as_mut() {
-                connections.remove(server.0);
-            }
-        });
-    }
-
-    fn delete_remote_project(
-        &mut self,
-        server: ServerIndex,
-        project: &RemoteProject,
-        cx: &mut Context<Self>,
-    ) {
-        match server {
-            ServerIndex::Ssh(server) => {
-                self.delete_ssh_project(server, project, cx);
-            }
-            ServerIndex::Wsl(server) => {
-                self.delete_wsl_project(server, project, cx);
-            }
-        }
-    }
-
-    fn delete_ssh_project(
-        &mut self,
-        server: SshServerIndex,
-        project: &RemoteProject,
-        cx: &mut Context<Self>,
-    ) {
-        let project = project.clone();
-        self.update_settings_file(cx, move |setting, _| {
-            if let Some(server) = setting
-                .ssh_connections
-                .as_mut()
-                .and_then(|connections| connections.get_mut(server.0))
-            {
-                server.projects.remove(&project);
-            }
-        });
-    }
-
-    fn delete_wsl_project(
-        &mut self,
-        server: WslServerIndex,
-        project: &RemoteProject,
-        cx: &mut Context<Self>,
-    ) {
-        let project = project.clone();
-        self.update_settings_file(cx, move |setting, _| {
-            if let Some(server) = setting
-                .wsl_connections
-                .as_mut()
-                .and_then(|connections| connections.get_mut(server.0))
-            {
-                server.projects.remove(&project);
-            }
-        });
-    }
-
-    fn delete_wsl_distro(&mut self, server: WslServerIndex, cx: &mut Context<Self>) {
-        self.update_settings_file(cx, move |setting, _| {
-            if let Some(connections) = setting.wsl_connections.as_mut() {
-                connections.remove(server.0);
-            }
-        });
-    }
-
-    fn add_ssh_server(
-        &mut self,
-        connection_options: remote::SshConnectionOptions,
-        cx: &mut Context<Self>,
-    ) {
-        self.update_settings_file(cx, move |setting, _| {
-            setting
-                .ssh_connections
-                .get_or_insert(Default::default())
-                .push(SshConnection {
-                    host: SharedString::from(connection_options.host),
-                    username: connection_options.username,
-                    port: connection_options.port,
-                    projects: BTreeSet::new(),
-                    nickname: None,
-                    args: connection_options.args.unwrap_or_default(),
-                    upload_binary_over_ssh: None,
-                    port_forwards: connection_options.port_forwards,
-                })
-        });
-    }
-
-    fn edit_in_dev_container_json(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let Some(workspace) = self.workspace.upgrade() else {
-            cx.emit(DismissEvent);
-            cx.notify();
-            return;
-        };
-
-        workspace.update(cx, |workspace, cx| {
-            let project = workspace.project().clone();
-
-            let worktree = project
-                .read(cx)
-                .visible_worktrees(cx)
-                .find_map(|tree| tree.read(cx).root_entry()?.is_dir().then_some(tree));
-
-            if let Some(worktree) = worktree {
-                let tree_id = worktree.read(cx).id();
-                let devcontainer_path = RelPath::unix(".devcontainer/devcontainer.json").unwrap();
-                cx.spawn_in(window, async move |workspace, cx| {
-                    workspace
-                        .update_in(cx, |workspace, window, cx| {
-                            workspace.open_path(
-                                (tree_id, devcontainer_path),
-                                None,
-                                true,
-                                window,
-                                cx,
-                            )
-                        })?
-                        .await
-                })
-                .detach();
-            } else {
-                return;
-            }
-        });
-        cx.emit(DismissEvent);
-        cx.notify();
-    }
-
-    fn open_dev_container(&self, window: &mut Window, cx: &mut Context<Self>) {
-        let Some(app_state) = self
-            .workspace
-            .read_with(cx, |workspace, _| workspace.app_state().clone())
-            .log_err()
-        else {
-            return;
-        };
-
-        let replace_window = window.window_handle().downcast::<Workspace>();
-
-        cx.spawn_in(window, async move |entity, cx| {
-            let (connection, starting_dir) =
-                match start_dev_container(cx, app_state.node_runtime.clone()).await {
-                    Ok((c, s)) => (c, s),
-                    Err(e) => {
-                        log::error!("Failed to start dev container: {:?}", e);
-                        entity
-                            .update_in(cx, |remote_server_projects, window, cx| {
-                                remote_server_projects.mode = Mode::CreateRemoteDevContainer(
-                                    CreateRemoteDevContainer::new(window, cx).progress(
-                                        DevContainerCreationProgress::Error(format!("{:?}", e)),
-                                    ),
-                                );
-                            })
-                            .log_err();
-                        return;
-                    }
-                };
-            entity
-                .update(cx, |_, cx| {
-                    cx.emit(DismissEvent);
-                })
-                .log_err();
-
-            let result = open_remote_project(
-                connection.into(),
-                vec![starting_dir].into_iter().map(PathBuf::from).collect(),
-                app_state,
-                OpenOptions {
-                    replace_window,
-                    ..OpenOptions::default()
-                },
-                cx,
-            )
-            .await;
-            if let Err(e) = result {
-                log::error!("Failed to connect: {e:#}");
-                cx.prompt(
-                    gpui::PromptLevel::Critical,
-                    "Failed to connect",
-                    Some(&e.to_string()),
-                    &["Ok"],
-                )
-                .await
-                .ok();
-            }
-        })
-        .detach();
-    }
-
-    fn render_create_dev_container(
-        &self,
-        state: &CreateRemoteDevContainer,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        match &state.progress {
-            DevContainerCreationProgress::Error(message) => {
-                self.focus_handle(cx).focus(window);
-                return div()
-                    .track_focus(&self.focus_handle(cx))
-                    .size_full()
-                    .child(
-                        v_flex()
-                            .py_1()
-                            .child(
-                                ListItem::new("Error")
-                                    .inset(true)
-                                    .selectable(false)
-                                    .spacing(ui::ListItemSpacing::Sparse)
-                                    .start_slot(Icon::new(IconName::XCircle).color(Color::Error))
-                                    .child(Label::new("Error Creating Dev Container:"))
-                                    .child(Label::new(message).buffer_font(cx)),
-                            )
-                            .child(ListSeparator)
-                            .child(
-                                div()
-                                    .id("devcontainer-go-back")
-                                    .track_focus(&state.entries[0].focus_handle)
-                                    .on_action(cx.listener(
-                                        |this, _: &menu::Confirm, window, cx| {
-                                            this.mode =
-                                                Mode::default_mode(&this.ssh_config_servers, cx);
-                                            cx.focus_self(window);
-                                            cx.notify();
-                                        },
-                                    ))
-                                    .child(
-                                        ListItem::new("li-devcontainer-go-back")
-                                            .toggle_state(
-                                                state.entries[0]
-                                                    .focus_handle
-                                                    .contains_focused(window, cx),
-                                            )
-                                            .inset(true)
-                                            .spacing(ui::ListItemSpacing::Sparse)
-                                            .start_slot(
-                                                Icon::new(IconName::ArrowLeft).color(Color::Muted),
-                                            )
-                                            .child(Label::new("Go Back"))
-                                            .end_slot(
-                                                KeyBinding::for_action_in(
-                                                    &menu::Cancel,
-                                                    &self.focus_handle,
-                                                    cx,
-                                                )
-                                                .size(rems_from_px(12.)),
-                                            )
-                                            .on_click(cx.listener(|this, _, window, cx| {
-                                                let state =
-                                                    CreateRemoteDevContainer::new(window, cx);
-                                                this.mode = Mode::CreateRemoteDevContainer(state);
-
-                                                cx.notify();
-                                            })),
-                                    ),
-                            ),
-                    )
-                    .into_any_element();
-            }
-            _ => {}
-        };
-
-        let mut view = Navigable::new(
-            div()
-                .track_focus(&self.focus_handle(cx))
-                .size_full()
-                .child(
-                    v_flex()
-                        .pb_1()
-                        .child(
-                            ModalHeader::new()
-                                .child(Headline::new("Dev Containers").size(HeadlineSize::XSmall)),
-                        )
-                        .child(ListSeparator)
-                        .child(
-                            div()
-                                .id("confirm-create-from-devcontainer-json")
-                                .track_focus(&state.entries[0].focus_handle)
-                                .on_action(cx.listener({
-                                    move |this, _: &menu::Confirm, window, cx| {
-                                        this.open_dev_container(window, cx);
-                                        this.view_in_progress_dev_container(window, cx);
-                                    }
-                                }))
-                                .map(|this| {
-                                    if state.progress == DevContainerCreationProgress::Creating {
-                                        this.child(
-                                            ListItem::new("creating")
-                                                .inset(true)
-                                                .spacing(ui::ListItemSpacing::Sparse)
-                                                .disabled(true)
-                                                .start_slot(
-                                                    Icon::new(IconName::ArrowCircle)
-                                                        .color(Color::Muted)
-                                                        .with_rotate_animation(2),
-                                                )
-                                                .child(
-                                                    h_flex()
-                                                        .opacity(0.6)
-                                                        .gap_1()
-                                                        .child(Label::new("Creating From"))
-                                                        .child(
-                                                            Label::new("devcontainer.json")
-                                                                .buffer_font(cx),
-                                                        )
-                                                        .child(LoadingLabel::new("")),
-                                                ),
-                                        )
-                                    } else {
-                                        this.child(
-                                            ListItem::new(
-                                                "li-confirm-create-from-devcontainer-json",
-                                            )
-                                            .toggle_state(
-                                                state.entries[0]
-                                                    .focus_handle
-                                                    .contains_focused(window, cx),
-                                            )
-                                            .inset(true)
-                                            .spacing(ui::ListItemSpacing::Sparse)
-                                            .start_slot(
-                                                Icon::new(IconName::Plus).color(Color::Muted),
-                                            )
-                                            .child(
-                                                h_flex()
-                                                    .gap_1()
-                                                    .child(Label::new("Open or Create New From"))
-                                                    .child(
-                                                        Label::new("devcontainer.json")
-                                                            .buffer_font(cx),
-                                                    ),
-                                            )
-                                            .on_click(
-                                                cx.listener({
-                                                    move |this, _, window, cx| {
-                                                        this.open_dev_container(window, cx);
-                                                        this.view_in_progress_dev_container(
-                                                            window, cx,
-                                                        );
-                                                        cx.notify();
-                                                    }
-                                                }),
-                                            ),
-                                        )
-                                    }
-                                }),
-                        )
-                        .child(
-                            div()
-                                .id("edit-devcontainer-json")
-                                .track_focus(&state.entries[1].focus_handle)
-                                .on_action(cx.listener(|this, _: &menu::Confirm, window, cx| {
-                                    this.edit_in_dev_container_json(window, cx);
-                                }))
-                                .child(
-                                    ListItem::new("li-edit-devcontainer-json")
-                                        .toggle_state(
-                                            state.entries[1]
-                                                .focus_handle
-                                                .contains_focused(window, cx),
-                                        )
-                                        .inset(true)
-                                        .spacing(ui::ListItemSpacing::Sparse)
-                                        .start_slot(Icon::new(IconName::Pencil).color(Color::Muted))
-                                        .child(
-                                            h_flex().gap_1().child(Label::new("Edit")).child(
-                                                Label::new("devcontainer.json").buffer_font(cx),
-                                            ),
-                                        )
-                                        .on_click(cx.listener(move |this, _, window, cx| {
-                                            this.edit_in_dev_container_json(window, cx);
-                                        })),
-                                ),
-                        )
-                        .child(ListSeparator)
-                        .child(
-                            div()
-                                .id("devcontainer-go-back")
-                                .track_focus(&state.entries[2].focus_handle)
-                                .on_action(cx.listener(|this, _: &menu::Confirm, window, cx| {
-                                    this.mode = Mode::default_mode(&this.ssh_config_servers, cx);
-                                    cx.focus_self(window);
-                                    cx.notify();
-                                }))
-                                .child(
-                                    ListItem::new("li-devcontainer-go-back")
-                                        .toggle_state(
-                                            state.entries[2]
-                                                .focus_handle
-                                                .contains_focused(window, cx),
-                                        )
-                                        .inset(true)
-                                        .spacing(ui::ListItemSpacing::Sparse)
-                                        .start_slot(
-                                            Icon::new(IconName::ArrowLeft).color(Color::Muted),
-                                        )
-                                        .child(Label::new("Go Back"))
-                                        .end_slot(
-                                            KeyBinding::for_action_in(
-                                                &menu::Cancel,
-                                                &self.focus_handle,
-                                                cx,
-                                            )
-                                            .size(rems_from_px(12.)),
-                                        )
-                                        .on_click(cx.listener(|this, _, window, cx| {
-                                            this.mode =
-                                                Mode::default_mode(&this.ssh_config_servers, cx);
-                                            cx.focus_self(window);
-                                            cx.notify()
-                                        })),
-                                ),
-                        ),
-                )
-                .into_any_element(),
-        );
-
-        view = view.entry(state.entries[0].clone());
-        view = view.entry(state.entries[1].clone());
-        view = view.entry(state.entries[2].clone());
-
-        view.render(window, cx).into_any_element()
-    }
-
-    fn render_create_remote_server(
-        &self,
-        state: &CreateRemoteServer,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let ssh_prompt = state.ssh_prompt.clone();
-
-        state.address_editor.update(cx, |editor, cx| {
-            if editor.text(cx).is_empty() {
-                editor.set_placeholder_text("ssh user@example -p 2222", window, cx);
-            }
-        });
-
-        let theme = cx.theme();
-
-        v_flex()
-            .track_focus(&self.focus_handle(cx))
-            .id("create-remote-server")
-            .overflow_hidden()
-            .size_full()
-            .flex_1()
-            .child(
-                div()
-                    .p_2()
-                    .border_b_1()
-                    .border_color(theme.colors().border_variant)
-                    .child(state.address_editor.clone()),
-            )
-            .child(
-                h_flex()
-                    .bg(theme.colors().editor_background)
-                    .rounded_b_sm()
-                    .w_full()
-                    .map(|this| {
-                        if let Some(ssh_prompt) = ssh_prompt {
-                            this.child(h_flex().w_full().child(ssh_prompt))
-                        } else if let Some(address_error) = &state.address_error {
-                            this.child(
-                                h_flex().p_2().w_full().gap_2().child(
-                                    Label::new(address_error.clone())
-                                        .size(LabelSize::Small)
-                                        .color(Color::Error),
-                                ),
-                            )
-                        } else {
-                            this.child(
-                                h_flex()
-                                    .p_2()
-                                    .w_full()
-                                    .gap_1()
-                                    .child(
-                                        Label::new(
-                                            "Enter the command you use to SSH into this server.",
-                                        )
-                                        .color(Color::Muted)
-                                        .size(LabelSize::Small),
-                                    )
-                                    .child(
-                                        Button::new("learn-more", "Learn More")
-                                            .label_size(LabelSize::Small)
-                                            .icon(IconName::ArrowUpRight)
-                                            .icon_size(IconSize::XSmall)
-                                            .on_click(|_, _, cx| {
-                                                cx.open_url(
-                                                    "https://zed.dev/docs/remote-development",
-                                                );
-                                            }),
-                                    ),
-                            )
-                        }
-                    }),
-            )
-    }
-
-    #[cfg(target_os = "windows")]
-    fn render_add_wsl_distro(
-        &self,
-        state: &AddWslDistro,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let connection_prompt = state.connection_prompt.clone();
-
-        state.picker.update(cx, |picker, cx| {
-            picker.focus_handle(cx).focus(window);
-        });
-
-        v_flex()
-            .id("add-wsl-distro")
-            .overflow_hidden()
-            .size_full()
-            .flex_1()
-            .map(|this| {
-                if let Some(connection_prompt) = connection_prompt {
-                    this.child(connection_prompt)
-                } else {
-                    this.child(state.picker.clone())
-                }
-            })
-    }
-
-    fn render_view_options(
-        &mut self,
-        options: ViewServerOptionsState,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let last_entry = options.entries().last().unwrap();
-
-        let mut view = Navigable::new(
-            div()
-                .track_focus(&self.focus_handle(cx))
-                .size_full()
-                .child(match &options {
-                    ViewServerOptionsState::Ssh { connection, .. } => SshConnectionHeader {
-                        connection_string: connection.host.clone().into(),
-                        paths: Default::default(),
-                        nickname: connection.nickname.clone().map(|s| s.into()),
-                        is_wsl: false,
-                        is_devcontainer: false,
-                    }
-                    .render(window, cx)
-                    .into_any_element(),
-                    ViewServerOptionsState::Wsl { connection, .. } => SshConnectionHeader {
-                        connection_string: connection.distro_name.clone().into(),
-                        paths: Default::default(),
-                        nickname: None,
-                        is_wsl: true,
-                        is_devcontainer: false,
-                    }
-                    .render(window, cx)
-                    .into_any_element(),
-                })
-                .child(
-                    v_flex()
-                        .pb_1()
-                        .child(ListSeparator)
-                        .map(|this| match &options {
-                            ViewServerOptionsState::Ssh {
-                                connection,
-                                entries,
-                                server_index,
-                            } => this.child(self.render_edit_ssh(
-                                connection,
-                                *server_index,
-                                entries,
-                                window,
-                                cx,
-                            )),
-                            ViewServerOptionsState::Wsl {
-                                connection,
-                                entries,
-                                server_index,
-                            } => this.child(self.render_edit_wsl(
-                                connection,
-                                *server_index,
-                                entries,
-                                window,
-                                cx,
-                            )),
-                        })
-                        .child(ListSeparator)
-                        .child({
-                            div()
-                                .id("ssh-options-copy-server-address")
-                                .track_focus(&last_entry.focus_handle)
-                                .on_action(cx.listener(|this, _: &menu::Confirm, window, cx| {
-                                    this.mode = Mode::default_mode(&this.ssh_config_servers, cx);
-                                    cx.focus_self(window);
-                                    cx.notify();
-                                }))
-                                .child(
-                                    ListItem::new("go-back")
-                                        .toggle_state(
-                                            last_entry.focus_handle.contains_focused(window, cx),
-                                        )
-                                        .inset(true)
-                                        .spacing(ui::ListItemSpacing::Sparse)
-                                        .start_slot(
-                                            Icon::new(IconName::ArrowLeft).color(Color::Muted),
-                                        )
-                                        .child(Label::new("Go Back"))
-                                        .on_click(cx.listener(|this, _, window, cx| {
-                                            this.mode =
-                                                Mode::default_mode(&this.ssh_config_servers, cx);
-                                            cx.focus_self(window);
-                                            cx.notify()
-                                        })),
-                                )
-                        }),
-                )
-                .into_any_element(),
-        );
-
-        for entry in options.entries() {
-            view = view.entry(entry.clone());
-        }
-
-        view.render(window, cx).into_any_element()
-    }
-
-    fn render_edit_wsl(
-        &self,
-        connection: &WslConnectionOptions,
-        index: WslServerIndex,
-        entries: &[NavigableEntry],
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let distro_name = SharedString::new(connection.distro_name.clone());
-
-        v_flex().child({
-            fn remove_wsl_distro(
-                remote_servers: Entity<RemoteServerProjects>,
-                index: WslServerIndex,
-                distro_name: SharedString,
-                window: &mut Window,
-                cx: &mut App,
-            ) {
-                let prompt_message = format!("Remove WSL distro `{}`?", distro_name);
-
-                let confirmation = window.prompt(
-                    PromptLevel::Warning,
-                    &prompt_message,
-                    None,
-                    &["Yes, remove it", "No, keep it"],
-                    cx,
-                );
-
-                cx.spawn(async move |cx| {
-                    if confirmation.await.ok() == Some(0) {
-                        remote_servers
-                            .update(cx, |this, cx| {
-                                this.delete_wsl_distro(index, cx);
-                            })
-                            .ok();
-                        remote_servers
-                            .update(cx, |this, cx| {
-                                this.mode = Mode::default_mode(&this.ssh_config_servers, cx);
-                                cx.notify();
-                            })
-                            .ok();
-                    }
-                    anyhow::Ok(())
-                })
-                .detach_and_log_err(cx);
-            }
-            div()
-                .id("wsl-options-remove-distro")
-                .track_focus(&entries[0].focus_handle)
-                .on_action(cx.listener({
-                    let distro_name = distro_name.clone();
-                    move |_, _: &menu::Confirm, window, cx| {
-                        remove_wsl_distro(cx.entity(), index, distro_name.clone(), window, cx);
-                        cx.focus_self(window);
-                    }
-                }))
-                .child(
-                    ListItem::new("remove-distro")
-                        .toggle_state(entries[0].focus_handle.contains_focused(window, cx))
-                        .inset(true)
-                        .spacing(ui::ListItemSpacing::Sparse)
-                        .start_slot(Icon::new(IconName::Trash).color(Color::Error))
-                        .child(Label::new("Remove Distro").color(Color::Error))
-                        .on_click(cx.listener(move |_, _, window, cx| {
-                            remove_wsl_distro(cx.entity(), index, distro_name.clone(), window, cx);
-                            cx.focus_self(window);
-                        })),
-                )
-        })
-    }
-
-    fn render_edit_ssh(
-        &self,
-        connection: &SshConnectionOptions,
-        index: SshServerIndex,
-        entries: &[NavigableEntry],
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let connection_string = SharedString::new(connection.host.clone());
-
-        v_flex()
-            .child({
-                let label = if connection.nickname.is_some() {
-                    "Edit Nickname"
-                } else {
-                    "Add Nickname to Server"
-                };
-                div()
-                    .id("ssh-options-add-nickname")
-                    .track_focus(&entries[0].focus_handle)
-                    .on_action(cx.listener(move |this, _: &menu::Confirm, window, cx| {
-                        this.mode = Mode::EditNickname(EditNicknameState::new(index, window, cx));
-                        cx.notify();
-                    }))
-                    .child(
-                        ListItem::new("add-nickname")
-                            .toggle_state(entries[0].focus_handle.contains_focused(window, cx))
-                            .inset(true)
-                            .spacing(ui::ListItemSpacing::Sparse)
-                            .start_slot(Icon::new(IconName::Pencil).color(Color::Muted))
-                            .child(Label::new(label))
-                            .on_click(cx.listener(move |this, _, window, cx| {
-                                this.mode =
-                                    Mode::EditNickname(EditNicknameState::new(index, window, cx));
-                                cx.notify();
-                            })),
-                    )
-            })
-            .child({
-                let workspace = self.workspace.clone();
-                fn callback(
-                    workspace: WeakEntity<Workspace>,
-                    connection_string: SharedString,
-                    cx: &mut App,
-                ) {
-                    cx.write_to_clipboard(ClipboardItem::new_string(connection_string.to_string()));
-                    workspace
-                        .update(cx, |this, cx| {
-                            struct SshServerAddressCopiedToClipboard;
-                            let notification = format!(
-                                "Copied server address ({}) to clipboard",
-                                connection_string
-                            );
-
-                            this.show_toast(
-                                Toast::new(
-                                    NotificationId::composite::<SshServerAddressCopiedToClipboard>(
-                                        connection_string.clone(),
-                                    ),
-                                    notification,
-                                )
-                                .autohide(),
-                                cx,
-                            );
-                        })
-                        .ok();
-                }
-                div()
-                    .id("ssh-options-copy-server-address")
-                    .track_focus(&entries[1].focus_handle)
-                    .on_action({
-                        let connection_string = connection_string.clone();
-                        let workspace = self.workspace.clone();
-                        move |_: &menu::Confirm, _, cx| {
-                            callback(workspace.clone(), connection_string.clone(), cx);
-                        }
-                    })
-                    .child(
-                        ListItem::new("copy-server-address")
-                            .toggle_state(entries[1].focus_handle.contains_focused(window, cx))
-                            .inset(true)
-                            .spacing(ui::ListItemSpacing::Sparse)
-                            .start_slot(Icon::new(IconName::Copy).color(Color::Muted))
-                            .child(Label::new("Copy Server Address"))
-                            .end_hover_slot(
-                                Label::new(connection_string.clone()).color(Color::Muted),
-                            )
-                            .on_click({
-                                let connection_string = connection_string.clone();
-                                move |_, _, cx| {
-                                    callback(workspace.clone(), connection_string.clone(), cx);
-                                }
-                            }),
-                    )
-            })
-            .child({
-                fn remove_ssh_server(
-                    remote_servers: Entity<RemoteServerProjects>,
-                    index: SshServerIndex,
-                    connection_string: SharedString,
-                    window: &mut Window,
-                    cx: &mut App,
-                ) {
-                    let prompt_message = format!("Remove server `{}`?", connection_string);
-
-                    let confirmation = window.prompt(
-                        PromptLevel::Warning,
-                        &prompt_message,
-                        None,
-                        &["Yes, remove it", "No, keep it"],
-                        cx,
-                    );
-
-                    cx.spawn(async move |cx| {
-                        if confirmation.await.ok() == Some(0) {
-                            remote_servers
-                                .update(cx, |this, cx| {
-                                    this.delete_ssh_server(index, cx);
-                                })
-                                .ok();
-                            remote_servers
-                                .update(cx, |this, cx| {
-                                    this.mode = Mode::default_mode(&this.ssh_config_servers, cx);
-                                    cx.notify();
-                                })
-                                .ok();
-                        }
-                        anyhow::Ok(())
-                    })
-                    .detach_and_log_err(cx);
-                }
-                div()
-                    .id("ssh-options-copy-server-address")
-                    .track_focus(&entries[2].focus_handle)
-                    .on_action(cx.listener({
-                        let connection_string = connection_string.clone();
-                        move |_, _: &menu::Confirm, window, cx| {
-                            remove_ssh_server(
-                                cx.entity(),
-                                index,
-                                connection_string.clone(),
-                                window,
-                                cx,
-                            );
-                            cx.focus_self(window);
-                        }
-                    }))
-                    .child(
-                        ListItem::new("remove-server")
-                            .toggle_state(entries[2].focus_handle.contains_focused(window, cx))
-                            .inset(true)
-                            .spacing(ui::ListItemSpacing::Sparse)
-                            .start_slot(Icon::new(IconName::Trash).color(Color::Error))
-                            .child(Label::new("Remove Server").color(Color::Error))
-                            .on_click(cx.listener(move |_, _, window, cx| {
-                                remove_ssh_server(
-                                    cx.entity(),
-                                    index,
-                                    connection_string.clone(),
-                                    window,
-                                    cx,
-                                );
-                                cx.focus_self(window);
-                            })),
-                    )
-            })
-    }
-
-    fn render_edit_nickname(
-        &self,
-        state: &EditNicknameState,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let Some(connection) = SshSettings::get_global(cx)
-            .ssh_connections()
-            .nth(state.index.0)
-        else {
-            return v_flex()
-                .id("ssh-edit-nickname")
-                .track_focus(&self.focus_handle(cx));
-        };
-
-        let connection_string = connection.host.clone();
-        let nickname = connection.nickname.map(|s| s.into());
-
-        v_flex()
-            .id("ssh-edit-nickname")
-            .track_focus(&self.focus_handle(cx))
-            .child(
-                SshConnectionHeader {
-                    connection_string,
-                    paths: Default::default(),
-                    nickname,
-                    is_wsl: false,
-                    is_devcontainer: false,
-                }
-                .render(window, cx),
-            )
-            .child(
-                h_flex()
-                    .p_2()
-                    .border_t_1()
-                    .border_color(cx.theme().colors().border_variant)
-                    .child(state.editor.clone()),
-            )
-    }
-
-    fn render_default(
-        &mut self,
-        mut state: DefaultState,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let ssh_settings = SshSettings::get_global(cx);
-        let mut should_rebuild = false;
-
-        let ssh_connections_changed = ssh_settings.ssh_connections.0.iter().ne(state
-            .servers
-            .iter()
-            .filter_map(|server| match server {
-                RemoteEntry::Project {
-                    connection: Connection::Ssh(connection),
-                    ..
-                } => Some(connection),
-                _ => None,
-            }));
-
-        let wsl_connections_changed = ssh_settings.wsl_connections.0.iter().ne(state
-            .servers
-            .iter()
-            .filter_map(|server| match server {
-                RemoteEntry::Project {
-                    connection: Connection::Wsl(connection),
-                    ..
-                } => Some(connection),
-                _ => None,
-            }));
-
-        if ssh_connections_changed || wsl_connections_changed {
-            should_rebuild = true;
-        };
-
-        if !should_rebuild && ssh_settings.read_ssh_config {
-            let current_ssh_hosts: BTreeSet<SharedString> = state
-                .servers
-                .iter()
-                .filter_map(|server| match server {
-                    RemoteEntry::SshConfig { host, .. } => Some(host.clone()),
-                    _ => None,
-                })
-                .collect();
-            let mut expected_ssh_hosts = self.ssh_config_servers.clone();
-            for server in &state.servers {
-                if let RemoteEntry::Project {
-                    connection: Connection::Ssh(connection),
-                    ..
-                } = server
-                {
-                    expected_ssh_hosts.remove(&connection.host);
-                }
-            }
-            should_rebuild = current_ssh_hosts != expected_ssh_hosts;
-        }
-
-        if should_rebuild {
-            self.mode = Mode::default_mode(&self.ssh_config_servers, cx);
-            if let Mode::Default(new_state) = &self.mode {
-                state = new_state.clone();
-            }
-        }
-
-        let connect_button = div()
-            .id("ssh-connect-new-server-container")
-            .track_focus(&state.add_new_server.focus_handle)
-            .anchor_scroll(state.add_new_server.scroll_anchor.clone())
-            .child(
-                ListItem::new("register-remote-server-button")
-                    .toggle_state(
-                        state
-                            .add_new_server
-                            .focus_handle
-                            .contains_focused(window, cx),
-                    )
-                    .inset(true)
-                    .spacing(ui::ListItemSpacing::Sparse)
-                    .start_slot(Icon::new(IconName::Plus).color(Color::Muted))
-                    .child(Label::new("Connect SSH Server"))
-                    .on_click(cx.listener(|this, _, window, cx| {
-                        let state = CreateRemoteServer::new(window, cx);
-                        this.mode = Mode::CreateRemoteServer(state);
-
-                        cx.notify();
-                    })),
-            )
-            .on_action(cx.listener(|this, _: &menu::Confirm, window, cx| {
-                let state = CreateRemoteServer::new(window, cx);
-                this.mode = Mode::CreateRemoteServer(state);
-
-                cx.notify();
-            }));
-
-        let connect_dev_container_button = div()
-            .id("connect-new-dev-container")
-            .track_focus(&state.add_new_devcontainer.focus_handle)
-            .anchor_scroll(state.add_new_devcontainer.scroll_anchor.clone())
-            .child(
-                ListItem::new("register-dev-container-button")
-                    .toggle_state(
-                        state
-                            .add_new_devcontainer
-                            .focus_handle
-                            .contains_focused(window, cx),
-                    )
-                    .inset(true)
-                    .spacing(ui::ListItemSpacing::Sparse)
-                    .start_slot(Icon::new(IconName::Plus).color(Color::Muted))
-                    .child(Label::new("Connect Dev Container"))
-                    .on_click(cx.listener(|this, _, window, cx| {
-                        let state = CreateRemoteDevContainer::new(window, cx);
-                        this.mode = Mode::CreateRemoteDevContainer(state);
-
-                        cx.notify();
-                    })),
-            )
-            .on_action(cx.listener(|this, _: &menu::Confirm, window, cx| {
-                let state = CreateRemoteDevContainer::new(window, cx);
-                this.mode = Mode::CreateRemoteDevContainer(state);
-
-                cx.notify();
-            }));
-
-        #[cfg(target_os = "windows")]
-        let wsl_connect_button = div()
-            .id("wsl-connect-new-server")
-            .track_focus(&state.add_new_wsl.focus_handle)
-            .anchor_scroll(state.add_new_wsl.scroll_anchor.clone())
-            .child(
-                ListItem::new("wsl-add-new-server")
-                    .toggle_state(state.add_new_wsl.focus_handle.contains_focused(window, cx))
-                    .inset(true)
-                    .spacing(ui::ListItemSpacing::Sparse)
-                    .start_slot(Icon::new(IconName::Plus).color(Color::Muted))
-                    .child(Label::new("Add WSL Distro"))
-                    .on_click(cx.listener(|this, _, window, cx| {
-                        let state = AddWslDistro::new(window, cx);
-                        this.mode = Mode::AddWslDistro(state);
-
-                        cx.notify();
-                    })),
-            )
-            .on_action(cx.listener(|this, _: &menu::Confirm, window, cx| {
-                let state = AddWslDistro::new(window, cx);
-                this.mode = Mode::AddWslDistro(state);
-
-                cx.notify();
-            }));
-
-        let has_open_project = self
-            .workspace
-            .upgrade()
-            .map(|workspace| {
-                workspace
-                    .read(cx)
-                    .project()
-                    .read(cx)
-                    .visible_worktrees(cx)
-                    .next()
-                    .is_some()
-            })
-            .unwrap_or(false);
-
-        let modal_section = v_flex()
-            .track_focus(&self.focus_handle(cx))
-            .id("ssh-server-list")
-            .overflow_y_scroll()
-            .track_scroll(&state.scroll_handle)
-            .size_full()
-            .child(connect_button)
-            .when(has_open_project, |this| {
-                this.child(connect_dev_container_button)
-            });
-
-        #[cfg(target_os = "windows")]
-        let modal_section = modal_section.child(wsl_connect_button);
-        #[cfg(not(target_os = "windows"))]
-        let modal_section = modal_section;
-
-        let mut modal_section = Navigable::new(
-            modal_section
-                .child(
-                    List::new()
-                        .empty_message(
-                            h_flex()
-                                .size_full()
-                                .p_2()
-                                .justify_center()
-                                .border_t_1()
-                                .border_color(cx.theme().colors().border_variant)
-                                .child(
-                                    Label::new("No remote servers registered yet.")
-                                        .color(Color::Muted),
-                                )
-                                .into_any_element(),
-                        )
-                        .children(state.servers.iter().enumerate().map(|(ix, connection)| {
-                            self.render_remote_connection(ix, connection.clone(), window, cx)
-                                .into_any_element()
-                        })),
-                )
-                .into_any_element(),
-        )
-        .entry(state.add_new_server.clone());
-
-        if has_open_project {
-            modal_section = modal_section.entry(state.add_new_devcontainer.clone());
-        }
-
-        if cfg!(target_os = "windows") {
-            modal_section = modal_section.entry(state.add_new_wsl.clone());
-        }
-
-        for server in &state.servers {
-            match server {
-                RemoteEntry::Project {
-                    open_folder,
-                    projects,
-                    configure,
-                    ..
-                } => {
-                    for (navigation_state, _) in projects {
-                        modal_section = modal_section.entry(navigation_state.clone());
-                    }
-                    modal_section = modal_section
-                        .entry(open_folder.clone())
-                        .entry(configure.clone());
-                }
-                RemoteEntry::SshConfig { open_folder, .. } => {
-                    modal_section = modal_section.entry(open_folder.clone());
-                }
-            }
-        }
-        let mut modal_section = modal_section.render(window, cx).into_any_element();
-
-        let (create_window, reuse_window) = if self.create_new_window {
-            (
-                window.keystroke_text_for(&menu::Confirm),
-                window.keystroke_text_for(&menu::SecondaryConfirm),
-            )
-        } else {
-            (
-                window.keystroke_text_for(&menu::SecondaryConfirm),
-                window.keystroke_text_for(&menu::Confirm),
-            )
-        };
-        let placeholder_text = Arc::from(format!(
-            "{reuse_window} reuses this window, {create_window} opens a new one",
-        ));
-
-        Modal::new("remote-projects", None)
-            .header(
-                ModalHeader::new()
-                    .child(Headline::new("Remote Projects").size(HeadlineSize::XSmall))
-                    .child(
-                        Label::new(placeholder_text)
-                            .color(Color::Muted)
-                            .size(LabelSize::XSmall),
-                    ),
-            )
-            .section(
-                Section::new().padded(false).child(
-                    v_flex()
-                        .min_h(rems(20.))
-                        .size_full()
-                        .relative()
-                        .child(ListSeparator)
-                        .child(
-                            canvas(
-                                |bounds, window, cx| {
-                                    modal_section.prepaint_as_root(
-                                        bounds.origin,
-                                        bounds.size.into(),
-                                        window,
-                                        cx,
-                                    );
-                                    modal_section
-                                },
-                                |_, mut modal_section, window, cx| {
-                                    modal_section.paint(window, cx);
-                                },
-                            )
-                            .size_full(),
-                        )
-                        .vertical_scrollbar_for(&state.scroll_handle, window, cx),
-                ),
-            )
-            .into_any_element()
-    }
-
-    fn create_host_from_ssh_config(
-        &mut self,
-        ssh_config_host: &SharedString,
-        cx: &mut Context<'_, Self>,
-    ) -> SshServerIndex {
-        let new_ix = Arc::new(AtomicUsize::new(0));
-
-        let update_new_ix = new_ix.clone();
-        self.update_settings_file(cx, move |settings, _| {
-            update_new_ix.store(
-                settings
-                    .ssh_connections
-                    .as_ref()
-                    .map_or(0, |connections| connections.len()),
-                atomic::Ordering::Release,
-            );
-        });
-
-        self.add_ssh_server(
-            SshConnectionOptions {
-                host: ssh_config_host.to_string(),
-                ..SshConnectionOptions::default()
-            },
-            cx,
-        );
-        self.mode = Mode::default_mode(&self.ssh_config_servers, cx);
-        SshServerIndex(new_ix.load(atomic::Ordering::Acquire))
-    }
-}
-
-fn spawn_ssh_config_watch(fs: Arc<dyn Fs>, cx: &Context<RemoteServerProjects>) -> Task<()> {
-    let mut user_ssh_config_watcher =
-        watch_config_file(cx.background_executor(), fs.clone(), user_ssh_config_file());
-    let mut global_ssh_config_watcher = global_ssh_config_file()
-        .map(|it| watch_config_file(cx.background_executor(), fs, it.to_owned()))
-        .unwrap_or_else(|| futures::channel::mpsc::unbounded().1);
-
-    cx.spawn(async move |remote_server_projects, cx| {
-        let mut global_hosts = BTreeSet::default();
-        let mut user_hosts = BTreeSet::default();
-        let mut running_receivers = 2;
-
-        loop {
-            select! {
-                new_global_file_contents = global_ssh_config_watcher.next().fuse() => {
-                    match new_global_file_contents {
-                        Some(new_global_file_contents) => {
-                            global_hosts = parse_ssh_config_hosts(&new_global_file_contents);
-                            if remote_server_projects.update(cx, |remote_server_projects, cx| {
-                                remote_server_projects.ssh_config_servers = global_hosts.iter().chain(user_hosts.iter()).map(SharedString::from).collect();
-                                cx.notify();
-                            }).is_err() {
-                                return;
-                            }
-                        },
-                        None => {
-                            running_receivers -= 1;
-                            if running_receivers == 0 {
-                                return;
-                            }
-                        }
-                    }
-                },
-                new_user_file_contents = user_ssh_config_watcher.next().fuse() => {
-                    match new_user_file_contents {
-                        Some(new_user_file_contents) => {
-                            user_hosts = parse_ssh_config_hosts(&new_user_file_contents);
-                            if remote_server_projects.update(cx, |remote_server_projects, cx| {
-                                remote_server_projects.ssh_config_servers = global_hosts.iter().chain(user_hosts.iter()).map(SharedString::from).collect();
-                                cx.notify();
-                            }).is_err() {
-                                return;
-                            }
-                        },
-                        None => {
-                            running_receivers -= 1;
-                            if running_receivers == 0 {
-                                return;
-                            }
-                        }
-                    }
-                },
-            }
-        }
-    })
-}
-
-fn get_text(element: &Entity<Editor>, cx: &mut App) -> String {
-    element.read(cx).text(cx).trim().to_string()
-}
-
-impl ModalView for RemoteServerProjects {}
-
-impl Focusable for RemoteServerProjects {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        match &self.mode {
-            Mode::ProjectPicker(picker) => picker.focus_handle(cx),
-            _ => self.focus_handle.clone(),
-        }
-    }
-}
-
-impl EventEmitter<DismissEvent> for RemoteServerProjects {}
-
-impl Render for RemoteServerProjects {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        div()
-            .elevation_3(cx)
-            .w(rems(34.))
-            .key_context("RemoteServerModal")
-            .on_action(cx.listener(Self::cancel))
-            .on_action(cx.listener(Self::confirm))
-            .capture_any_mouse_down(cx.listener(|this, _, window, cx| {
-                this.focus_handle(cx).focus(window);
-            }))
-            .on_mouse_down_out(cx.listener(|this, _, _, cx| {
-                if matches!(this.mode, Mode::Default(_)) {
-                    cx.emit(DismissEvent)
-                }
-            }))
-            .child(match &self.mode {
-                Mode::Default(state) => self
-                    .render_default(state.clone(), window, cx)
-                    .into_any_element(),
-                Mode::ViewServerOptions(state) => self
-                    .render_view_options(state.clone(), window, cx)
-                    .into_any_element(),
-                Mode::ProjectPicker(element) => element.clone().into_any_element(),
-                Mode::CreateRemoteServer(state) => self
-                    .render_create_remote_server(state, window, cx)
-                    .into_any_element(),
-                Mode::CreateRemoteDevContainer(state) => self
-                    .render_create_dev_container(state, window, cx)
-                    .into_any_element(),
-                Mode::EditNickname(state) => self
-                    .render_edit_nickname(state, window, cx)
-                    .into_any_element(),
-                #[cfg(target_os = "windows")]
-                Mode::AddWslDistro(state) => self
-                    .render_add_wsl_distro(state, window, cx)
-                    .into_any_element(),
-            })
-    }
-}
diff --git a/crates/recent_projects/src/ssh_config.rs b/crates/recent_projects/src/ssh_config.rs
deleted file mode 100644
index f381818205..0000000000
--- a/crates/recent_projects/src/ssh_config.rs
+++ /dev/null
@@ -1,96 +0,0 @@
-use std::collections::BTreeSet;
-
-pub fn parse_ssh_config_hosts(config: &str) -> BTreeSet<String> {
-    let mut hosts = BTreeSet::new();
-    let mut needs_another_line = false;
-    for line in config.lines() {
-        let line = line.trim_start();
-        if let Some(line) = line.strip_prefix("Host") {
-            match line.chars().next() {
-                Some('\\') => {
-                    needs_another_line = true;
-                }
-                Some('\n' | '\r') => {
-                    needs_another_line = false;
-                }
-                Some(c) if c.is_whitespace() => {
-                    parse_hosts_from(line, &mut hosts);
-                }
-                Some(_) | None => {
-                    needs_another_line = false;
-                }
-            };
-
-            if needs_another_line {
-                parse_hosts_from(line, &mut hosts);
-                needs_another_line = line.trim_end().ends_with('\\');
-            } else {
-                needs_another_line = false;
-            }
-        } else if needs_another_line {
-            needs_another_line = line.trim_end().ends_with('\\');
-            parse_hosts_from(line, &mut hosts);
-        } else {
-            needs_another_line = false;
-        }
-    }
-
-    hosts
-}
-
-fn parse_hosts_from(line: &str, hosts: &mut BTreeSet<String>) {
-    hosts.extend(
-        line.split_whitespace()
-            .filter(|field| !field.starts_with("!"))
-            .filter(|field| !field.contains("*"))
-            .filter(|field| !field.is_empty())
-            .map(|field| field.to_owned()),
-    );
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_thank_you_bjorn3() {
-        let hosts = "
-            Host *
-              AddKeysToAgent yes
-              UseKeychain yes
-              IdentityFile ~/.ssh/id_ed25519
-
-            Host whatever.*
-            User another
-
-            Host !not_this
-            User not_me
-
-            Host something
-        HostName whatever.tld
-
-        Host linux bsd host3
-          User bjorn
-
-        Host rpi
-          user rpi
-          hostname rpi.local
-
-        Host \
-               somehost \
-        anotherhost
-        Hostname 192.168.3.3";
-
-        let expected_hosts = BTreeSet::from_iter([
-            "something".to_owned(),
-            "linux".to_owned(),
-            "host3".to_owned(),
-            "bsd".to_owned(),
-            "rpi".to_owned(),
-            "somehost".to_owned(),
-            "anotherhost".to_owned(),
-        ]);
-
-        assert_eq!(expected_hosts, parse_ssh_config_hosts(hosts));
-    }
-}
diff --git a/crates/recent_projects/src/wsl_picker.rs b/crates/recent_projects/src/wsl_picker.rs
deleted file mode 100644
index e386b723fa..0000000000
--- a/crates/recent_projects/src/wsl_picker.rs
+++ /dev/null
@@ -1,295 +0,0 @@
-use std::{path::PathBuf, sync::Arc};
-
-use gpui::{AppContext, DismissEvent, Entity, EventEmitter, Focusable, Subscription, Task};
-use picker::Picker;
-use remote::{RemoteConnectionOptions, WslConnectionOptions};
-use ui::{
-    App, Context, HighlightedLabel, Icon, IconName, InteractiveElement, ListItem, ParentElement,
-    Render, Styled, StyledExt, Toggleable, Window, div, h_flex, rems, v_flex,
-};
-use util::ResultExt as _;
-use workspace::{ModalView, Workspace};
-
-use crate::open_remote_project;
-
-#[derive(Clone, Debug)]
-pub struct WslDistroSelected {
-    pub secondary: bool,
-    pub distro: String,
-}
-
-#[derive(Clone, Debug)]
-pub struct WslPickerDismissed;
-
-pub(crate) struct WslPickerDelegate {
-    selected_index: usize,
-    distro_list: Option<Vec<String>>,
-    matches: Vec<fuzzy::StringMatch>,
-}
-
-impl WslPickerDelegate {
-    pub fn new() -> Self {
-        WslPickerDelegate {
-            selected_index: 0,
-            distro_list: None,
-            matches: Vec::new(),
-        }
-    }
-
-    pub fn selected_distro(&self) -> Option<String> {
-        self.matches
-            .get(self.selected_index)
-            .map(|m| m.string.clone())
-    }
-}
-
-impl WslPickerDelegate {
-    fn fetch_distros() -> anyhow::Result<Vec<String>> {
-        use anyhow::Context;
-        use windows_registry::CURRENT_USER;
-
-        let lxss_key = CURRENT_USER
-            .open("Software\\Microsoft\\Windows\\CurrentVersion\\Lxss")
-            .context("failed to get lxss wsl key")?;
-
-        let distros = lxss_key
-            .keys()
-            .context("failed to get wsl distros")?
-            .filter_map(|key| {
-                lxss_key
-                    .open(&key)
-                    .context("failed to open subkey for distro")
-                    .log_err()
-            })
-            .filter_map(|distro| distro.get_string("DistributionName").ok())
-            .collect::<Vec<_>>();
-
-        Ok(distros)
-    }
-}
-
-impl EventEmitter<WslDistroSelected> for Picker<WslPickerDelegate> {}
-
-impl EventEmitter<WslPickerDismissed> for Picker<WslPickerDelegate> {}
-
-impl picker::PickerDelegate for WslPickerDelegate {
-    type ListItem = ListItem;
-
-    fn match_count(&self) -> usize {
-        self.matches.len()
-    }
-
-    fn selected_index(&self) -> usize {
-        self.selected_index
-    }
-
-    fn set_selected_index(
-        &mut self,
-        ix: usize,
-        _window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) {
-        self.selected_index = ix;
-        cx.notify();
-    }
-
-    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
-        Arc::from("Enter WSL distro name")
-    }
-
-    fn update_matches(
-        &mut self,
-        query: String,
-        _window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Task<()> {
-        use fuzzy::StringMatchCandidate;
-
-        let needs_fetch = self.distro_list.is_none();
-        if needs_fetch {
-            let distros = Self::fetch_distros().log_err();
-            self.distro_list = distros;
-        }
-
-        if let Some(distro_list) = &self.distro_list {
-            use ordered_float::OrderedFloat;
-
-            let candidates = distro_list
-                .iter()
-                .enumerate()
-                .map(|(id, distro)| StringMatchCandidate::new(id, distro))
-                .collect::<Vec<_>>();
-
-            let query = query.trim_start();
-            let smart_case = query.chars().any(|c| c.is_uppercase());
-            self.matches = smol::block_on(fuzzy::match_strings(
-                candidates.as_slice(),
-                query,
-                smart_case,
-                true,
-                100,
-                &Default::default(),
-                cx.background_executor().clone(),
-            ));
-            self.matches.sort_unstable_by_key(|m| m.candidate_id);
-
-            self.selected_index = self
-                .matches
-                .iter()
-                .enumerate()
-                .rev()
-                .max_by_key(|(_, m)| OrderedFloat(m.score))
-                .map(|(index, _)| index)
-                .unwrap_or(0);
-        }
-
-        Task::ready(())
-    }
-
-    fn confirm(&mut self, secondary: bool, _window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        if let Some(distro) = self.matches.get(self.selected_index) {
-            cx.emit(WslDistroSelected {
-                secondary,
-                distro: distro.string.clone(),
-            });
-        }
-    }
-
-    fn dismissed(&mut self, _window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        cx.emit(WslPickerDismissed);
-    }
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        _: &mut Window,
-        _: &mut Context<Picker<Self>>,
-    ) -> Option<Self::ListItem> {
-        let matched = self.matches.get(ix)?;
-        Some(
-            ListItem::new(ix)
-                .toggle_state(selected)
-                .inset(true)
-                .spacing(ui::ListItemSpacing::Sparse)
-                .child(
-                    h_flex()
-                        .flex_grow()
-                        .gap_3()
-                        .child(Icon::new(IconName::Linux))
-                        .child(v_flex().child(HighlightedLabel::new(
-                            matched.string.clone(),
-                            matched.positions.clone(),
-                        ))),
-                ),
-        )
-    }
-}
-
-pub(crate) struct WslOpenModal {
-    paths: Vec<PathBuf>,
-    create_new_window: bool,
-    picker: Entity<Picker<WslPickerDelegate>>,
-    _subscriptions: [Subscription; 2],
-}
-
-impl WslOpenModal {
-    pub fn new(
-        paths: Vec<PathBuf>,
-        create_new_window: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let delegate = WslPickerDelegate::new();
-        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx).modal(false));
-
-        let selected = cx.subscribe_in(
-            &picker,
-            window,
-            |this, _, event: &WslDistroSelected, window, cx| {
-                this.confirm(&event.distro, event.secondary, window, cx);
-            },
-        );
-
-        let dismissed = cx.subscribe_in(
-            &picker,
-            window,
-            |this, _, _: &WslPickerDismissed, window, cx| {
-                this.cancel(&menu::Cancel, window, cx);
-            },
-        );
-
-        WslOpenModal {
-            paths,
-            create_new_window,
-            picker,
-            _subscriptions: [selected, dismissed],
-        }
-    }
-
-    fn confirm(
-        &mut self,
-        distro: &str,
-        secondary: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let app_state = workspace::AppState::global(cx);
-        let Some(app_state) = app_state.upgrade() else {
-            return;
-        };
-
-        let connection_options = RemoteConnectionOptions::Wsl(WslConnectionOptions {
-            distro_name: distro.to_string(),
-            user: None,
-        });
-
-        let replace_current_window = match self.create_new_window {
-            true => secondary,
-            false => !secondary,
-        };
-        let replace_window = match replace_current_window {
-            true => window.window_handle().downcast::<Workspace>(),
-            false => None,
-        };
-
-        let paths = self.paths.clone();
-        let open_options = workspace::OpenOptions {
-            replace_window,
-            ..Default::default()
-        };
-
-        cx.emit(DismissEvent);
-        cx.spawn_in(window, async move |_, cx| {
-            open_remote_project(connection_options, paths, app_state, open_options, cx).await
-        })
-        .detach();
-    }
-
-    fn cancel(&mut self, _: &menu::Cancel, _: &mut Window, cx: &mut Context<Self>) {
-        cx.emit(DismissEvent);
-    }
-}
-
-impl ModalView for WslOpenModal {}
-
-impl Focusable for WslOpenModal {
-    fn focus_handle(&self, cx: &App) -> gpui::FocusHandle {
-        self.picker.focus_handle(cx)
-    }
-}
-
-impl EventEmitter<DismissEvent> for WslOpenModal {}
-
-impl Render for WslOpenModal {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl ui::IntoElement {
-        div()
-            .on_mouse_down_out(cx.listener(|_, _, _, cx| cx.emit(DismissEvent)))
-            .on_action(cx.listener(Self::cancel))
-            .elevation_3(cx)
-            .w(rems(34.))
-            .flex_1()
-            .overflow_hidden()
-            .child(self.picker.clone())
-    }
-}
diff --git a/crates/release_channel/Cargo.toml b/crates/release_channel/Cargo.toml
deleted file mode 100644
index 54a8afff8c..0000000000
--- a/crates/release_channel/Cargo.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-[package]
-name = "release_channel"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[dependencies]
-gpui.workspace = true
-semver.workspace = true
diff --git a/crates/release_channel/LICENSE-GPL b/crates/release_channel/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/release_channel/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/release_channel/src/lib.rs b/crates/release_channel/src/lib.rs
deleted file mode 100644
index 65201ccc46..0000000000
--- a/crates/release_channel/src/lib.rs
+++ /dev/null
@@ -1,232 +0,0 @@
-//! Provides constructs for the Zed app version and release channel.
-
-#![deny(missing_docs)]
-
-use std::{env, str::FromStr, sync::LazyLock};
-
-use gpui::{App, Global};
-use semver::Version;
-
-/// stable | dev | nightly | preview
-pub static RELEASE_CHANNEL_NAME: LazyLock<String> = LazyLock::new(|| {
-    if cfg!(debug_assertions) {
-        env::var("ZED_RELEASE_CHANNEL")
-            .unwrap_or_else(|_| include_str!("../../zed/RELEASE_CHANNEL").trim().to_string())
-    } else {
-        include_str!("../../zed/RELEASE_CHANNEL").trim().to_string()
-    }
-});
-
-#[doc(hidden)]
-pub static RELEASE_CHANNEL: LazyLock<ReleaseChannel> =
-    LazyLock::new(|| match ReleaseChannel::from_str(&RELEASE_CHANNEL_NAME) {
-        Ok(channel) => channel,
-        _ => panic!("invalid release channel {}", *RELEASE_CHANNEL_NAME),
-    });
-
-/// The app identifier for the current release channel, Windows only.
-#[cfg(target_os = "windows")]
-pub fn app_identifier() -> &'static str {
-    match *RELEASE_CHANNEL {
-        ReleaseChannel::Dev => "Zed-Editor-Dev",
-        ReleaseChannel::Nightly => "Zed-Editor-Nightly",
-        ReleaseChannel::Preview => "Zed-Editor-Preview",
-        ReleaseChannel::Stable => "Zed-Editor-Stable",
-    }
-}
-
-/// The Git commit SHA that Zed was built at.
-#[derive(Clone, Eq, Debug, PartialEq)]
-pub struct AppCommitSha(String);
-
-struct GlobalAppCommitSha(AppCommitSha);
-
-impl Global for GlobalAppCommitSha {}
-
-impl AppCommitSha {
-    /// Creates a new [`AppCommitSha`].
-    pub fn new(sha: String) -> Self {
-        AppCommitSha(sha)
-    }
-
-    /// Returns the global [`AppCommitSha`], if one is set.
-    pub fn try_global(cx: &App) -> Option<AppCommitSha> {
-        cx.try_global::<GlobalAppCommitSha>()
-            .map(|sha| sha.0.clone())
-    }
-
-    /// Sets the global [`AppCommitSha`].
-    pub fn set_global(sha: AppCommitSha, cx: &mut App) {
-        cx.set_global(GlobalAppCommitSha(sha))
-    }
-
-    /// Returns the full commit SHA.
-    pub fn full(&self) -> String {
-        self.0.to_string()
-    }
-
-    /// Returns the short (7 character) commit SHA.
-    pub fn short(&self) -> String {
-        self.0.chars().take(7).collect()
-    }
-}
-
-struct GlobalAppVersion(Version);
-
-impl Global for GlobalAppVersion {}
-
-/// The version of Zed.
-pub struct AppVersion;
-
-impl AppVersion {
-    /// Load the app version from env.
-    pub fn load(
-        pkg_version: &str,
-        build_id: Option<&str>,
-        commit_sha: Option<AppCommitSha>,
-    ) -> Version {
-        let mut version: Version = if let Ok(from_env) = env::var("ZED_APP_VERSION") {
-            from_env.parse().expect("invalid ZED_APP_VERSION")
-        } else {
-            pkg_version.parse().expect("invalid version in Cargo.toml")
-        };
-        let mut pre = String::from(RELEASE_CHANNEL.dev_name());
-
-        if let Some(build_id) = build_id {
-            pre.push('.');
-            pre.push_str(&build_id);
-        }
-
-        if let Some(sha) = commit_sha {
-            pre.push('.');
-            pre.push_str(&sha.0);
-        }
-        if let Ok(build) = semver::BuildMetadata::new(&pre) {
-            version.build = build;
-        }
-
-        version
-    }
-
-    /// Returns the global version number.
-    pub fn global(cx: &App) -> Version {
-        if cx.has_global::<GlobalAppVersion>() {
-            cx.global::<GlobalAppVersion>().0.clone()
-        } else {
-            Version::new(0, 0, 0)
-        }
-    }
-}
-
-/// A Zed release channel.
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Default)]
-pub enum ReleaseChannel {
-    /// The development release channel.
-    ///
-    /// Used for local debug builds of Zed.
-    #[default]
-    Dev,
-
-    /// The Nightly release channel.
-    Nightly,
-
-    /// The Preview release channel.
-    Preview,
-
-    /// The Stable release channel.
-    Stable,
-}
-
-struct GlobalReleaseChannel(ReleaseChannel);
-
-impl Global for GlobalReleaseChannel {}
-
-/// Initializes the release channel.
-pub fn init(app_version: Version, cx: &mut App) {
-    cx.set_global(GlobalAppVersion(app_version));
-    cx.set_global(GlobalReleaseChannel(*RELEASE_CHANNEL))
-}
-
-/// Initializes the release channel for tests that rely on fake release channel.
-pub fn init_test(app_version: Version, release_channel: ReleaseChannel, cx: &mut App) {
-    cx.set_global(GlobalAppVersion(app_version));
-    cx.set_global(GlobalReleaseChannel(release_channel))
-}
-
-impl ReleaseChannel {
-    /// Returns the global [`ReleaseChannel`].
-    pub fn global(cx: &App) -> Self {
-        cx.global::<GlobalReleaseChannel>().0
-    }
-
-    /// Returns the global [`ReleaseChannel`], if one is set.
-    pub fn try_global(cx: &App) -> Option<Self> {
-        cx.try_global::<GlobalReleaseChannel>()
-            .map(|channel| channel.0)
-    }
-
-    /// Returns whether we want to poll for updates for this [`ReleaseChannel`]
-    pub fn poll_for_updates(&self) -> bool {
-        !matches!(self, ReleaseChannel::Dev)
-    }
-
-    /// Returns the display name for this [`ReleaseChannel`].
-    pub fn display_name(&self) -> &'static str {
-        match self {
-            ReleaseChannel::Dev => "Zed Dev",
-            ReleaseChannel::Nightly => "Zed Nightly",
-            ReleaseChannel::Preview => "Zed Preview",
-            ReleaseChannel::Stable => "Zed",
-        }
-    }
-
-    /// Returns the programmatic name for this [`ReleaseChannel`].
-    pub fn dev_name(&self) -> &'static str {
-        match self {
-            ReleaseChannel::Dev => "dev",
-            ReleaseChannel::Nightly => "nightly",
-            ReleaseChannel::Preview => "preview",
-            ReleaseChannel::Stable => "stable",
-        }
-    }
-
-    /// Returns the application ID that's used by Wayland as application ID
-    /// and WM_CLASS on X11.
-    /// This also has to match the bundle identifier for Zed on macOS.
-    pub fn app_id(&self) -> &'static str {
-        match self {
-            ReleaseChannel::Dev => "dev.zed.Zed-Dev",
-            ReleaseChannel::Nightly => "dev.zed.Zed-Nightly",
-            ReleaseChannel::Preview => "dev.zed.Zed-Preview",
-            ReleaseChannel::Stable => "dev.zed.Zed",
-        }
-    }
-
-    /// Returns the query parameter for this [`ReleaseChannel`].
-    pub fn release_query_param(&self) -> Option<&'static str> {
-        match self {
-            Self::Dev => None,
-            Self::Nightly => Some("nightly=1"),
-            Self::Preview => Some("preview=1"),
-            Self::Stable => None,
-        }
-    }
-}
-
-/// Error indicating that release channel string does not match any known release channel names.
-#[derive(Copy, Clone, Debug, Hash, PartialEq)]
-pub struct InvalidReleaseChannel;
-
-impl FromStr for ReleaseChannel {
-    type Err = InvalidReleaseChannel;
-
-    fn from_str(channel: &str) -> Result<Self, Self::Err> {
-        Ok(match channel {
-            "dev" => ReleaseChannel::Dev,
-            "nightly" => ReleaseChannel::Nightly,
-            "preview" => ReleaseChannel::Preview,
-            "stable" => ReleaseChannel::Stable,
-            _ => return Err(InvalidReleaseChannel),
-        })
-    }
-}
diff --git a/crates/remote/Cargo.toml b/crates/remote/Cargo.toml
deleted file mode 100644
index ae32cd5cb1..0000000000
--- a/crates/remote/Cargo.toml
+++ /dev/null
@@ -1,48 +0,0 @@
-[package]
-name = "remote"
-description = "Client-side subsystem for remote editing"
-edition.workspace = true
-version = "0.1.0"
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/remote.rs"
-doctest = false
-
-[features]
-default = []
-test-support = ["fs/test-support"]
-
-[dependencies]
-anyhow.workspace = true
-askpass.workspace = true
-async-trait.workspace = true
-collections.workspace = true
-fs.workspace = true
-futures.workspace = true
-gpui.workspace = true
-log.workspace = true
-parking_lot.workspace = true
-paths.workspace = true
-prost.workspace = true
-release_channel.workspace = true
-rpc = { workspace = true, features = ["gpui"] }
-schemars.workspace = true
-semver.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-smol.workspace = true
-tempfile.workspace = true
-thiserror.workspace = true
-urlencoding.workspace = true
-util.workspace = true
-which.workspace = true
-
-[dev-dependencies]
-gpui = { workspace = true, features = ["test-support"] }
-fs = { workspace = true, features = ["test-support"] }
diff --git a/crates/remote/LICENSE-GPL b/crates/remote/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/remote/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/remote/src/json_log.rs b/crates/remote/src/json_log.rs
deleted file mode 100644
index 96cebbb355..0000000000
--- a/crates/remote/src/json_log.rs
+++ /dev/null
@@ -1,59 +0,0 @@
-use log::{Level, Log, Record};
-use serde::{Deserialize, Serialize};
-
-#[derive(Deserialize, Debug, Serialize)]
-pub struct LogRecord<'a> {
-    pub level: usize,
-    pub module_path: Option<&'a str>,
-    pub file: Option<&'a str>,
-    pub line: Option<u32>,
-    pub message: String,
-}
-
-impl<'a> LogRecord<'a> {
-    pub fn new(record: &'a Record<'a>) -> Self {
-        Self {
-            level: serialize_level(record.level()),
-            module_path: record.module_path(),
-            file: record.file(),
-            line: record.line(),
-            message: record.args().to_string(),
-        }
-    }
-
-    pub fn log(&'a self, logger: &dyn Log) {
-        if let Some(level) = deserialize_level(self.level) {
-            logger.log(
-                &log::Record::builder()
-                    .module_path(self.module_path)
-                    .target("remote_server")
-                    .args(format_args!("{}", self.message))
-                    .file(self.file)
-                    .line(self.line)
-                    .level(level)
-                    .build(),
-            )
-        }
-    }
-}
-
-fn serialize_level(level: Level) -> usize {
-    match level {
-        Level::Error => 1,
-        Level::Warn => 2,
-        Level::Info => 3,
-        Level::Debug => 4,
-        Level::Trace => 5,
-    }
-}
-
-fn deserialize_level(level: usize) -> Option<Level> {
-    match level {
-        1 => Some(Level::Error),
-        2 => Some(Level::Warn),
-        3 => Some(Level::Info),
-        4 => Some(Level::Debug),
-        5 => Some(Level::Trace),
-        _ => None,
-    }
-}
diff --git a/crates/remote/src/protocol.rs b/crates/remote/src/protocol.rs
deleted file mode 100644
index 867a31b164..0000000000
--- a/crates/remote/src/protocol.rs
+++ /dev/null
@@ -1,76 +0,0 @@
-use anyhow::Result;
-use futures::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt};
-use prost::Message as _;
-use rpc::proto::Envelope;
-
-#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
-pub struct MessageId(pub u32);
-
-pub type MessageLen = u32;
-pub const MESSAGE_LEN_SIZE: usize = size_of::<MessageLen>();
-
-pub fn message_len_from_buffer(buffer: &[u8]) -> MessageLen {
-    MessageLen::from_le_bytes(buffer.try_into().unwrap())
-}
-
-pub async fn read_message_with_len<S: AsyncRead + Unpin>(
-    stream: &mut S,
-    buffer: &mut Vec<u8>,
-    message_len: MessageLen,
-) -> Result<Envelope> {
-    buffer.resize(message_len as usize, 0);
-    stream.read_exact(buffer).await?;
-    Ok(Envelope::decode(buffer.as_slice())?)
-}
-
-pub async fn read_message<S: AsyncRead + Unpin>(
-    stream: &mut S,
-    buffer: &mut Vec<u8>,
-) -> Result<Envelope> {
-    buffer.resize(MESSAGE_LEN_SIZE, 0);
-    stream.read_exact(buffer).await?;
-
-    let len = message_len_from_buffer(buffer);
-
-    read_message_with_len(stream, buffer, len).await
-}
-
-pub async fn write_message<S: AsyncWrite + Unpin>(
-    stream: &mut S,
-    buffer: &mut Vec<u8>,
-    message: Envelope,
-) -> Result<()> {
-    let message_len = message.encoded_len() as u32;
-    stream
-        .write_all(message_len.to_le_bytes().as_slice())
-        .await?;
-    buffer.clear();
-    buffer.reserve(message_len as usize);
-    message.encode(buffer)?;
-    stream.write_all(buffer).await?;
-    Ok(())
-}
-
-pub async fn write_size_prefixed_buffer<S: AsyncWrite + Unpin>(
-    stream: &mut S,
-    buffer: &mut Vec<u8>,
-) -> Result<()> {
-    let len = buffer.len() as u32;
-    stream.write_all(len.to_le_bytes().as_slice()).await?;
-    stream.write_all(buffer).await?;
-    Ok(())
-}
-
-pub async fn read_message_raw<S: AsyncRead + Unpin>(
-    stream: &mut S,
-    buffer: &mut Vec<u8>,
-) -> Result<()> {
-    buffer.resize(MESSAGE_LEN_SIZE, 0);
-    stream.read_exact(buffer).await?;
-
-    let message_len = message_len_from_buffer(buffer);
-    buffer.resize(message_len as usize, 0);
-    stream.read_exact(buffer).await?;
-
-    Ok(())
-}
diff --git a/crates/remote/src/proxy.rs b/crates/remote/src/proxy.rs
deleted file mode 100644
index d715d5ecf6..0000000000
--- a/crates/remote/src/proxy.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-use thiserror::Error;
-
-#[derive(Error, Debug)]
-pub enum ProxyLaunchError {
-    #[error("Attempted reconnect, but server not running.")]
-    ServerNotRunning,
-}
-
-impl ProxyLaunchError {
-    pub fn to_exit_code(&self) -> i32 {
-        match self {
-            // We're using 90 as the exit code, because 0-78 are often taken
-            // by shells and other conventions and >128 also has certain meanings
-            // in certain contexts.
-            Self::ServerNotRunning => 90,
-        }
-    }
-
-    pub fn from_exit_code(exit_code: i32) -> Option<Self> {
-        match exit_code {
-            90 => Some(Self::ServerNotRunning),
-            _ => None,
-        }
-    }
-}
diff --git a/crates/remote/src/remote.rs b/crates/remote/src/remote.rs
deleted file mode 100644
index 51b71c988a..0000000000
--- a/crates/remote/src/remote.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-pub mod json_log;
-pub mod protocol;
-pub mod proxy;
-pub mod remote_client;
-mod transport;
-
-#[cfg(target_os = "windows")]
-pub use remote_client::OpenWslPath;
-pub use remote_client::{
-    ConnectionIdentifier, ConnectionState, RemoteClient, RemoteClientDelegate, RemoteClientEvent,
-    RemoteConnection, RemoteConnectionOptions, RemotePlatform, connect,
-};
-pub use transport::docker::DockerConnectionOptions;
-pub use transport::ssh::{SshConnectionOptions, SshPortForwardOption};
-pub use transport::wsl::WslConnectionOptions;
diff --git a/crates/remote/src/remote_client.rs b/crates/remote/src/remote_client.rs
deleted file mode 100644
index e8fa4fe4a3..0000000000
--- a/crates/remote/src/remote_client.rs
+++ /dev/null
@@ -1,1714 +0,0 @@
-use crate::{
-    SshConnectionOptions,
-    protocol::MessageId,
-    proxy::ProxyLaunchError,
-    transport::{
-        docker::{DockerConnectionOptions, DockerExecConnection},
-        ssh::SshRemoteConnection,
-        wsl::{WslConnectionOptions, WslRemoteConnection},
-    },
-};
-use anyhow::{Context as _, Result, anyhow};
-use askpass::EncryptedPassword;
-use async_trait::async_trait;
-use collections::HashMap;
-use futures::{
-    Future, FutureExt as _, StreamExt as _,
-    channel::{
-        mpsc::{self, Sender, UnboundedReceiver, UnboundedSender},
-        oneshot,
-    },
-    future::{BoxFuture, Shared},
-    select, select_biased,
-};
-use gpui::{
-    App, AppContext as _, AsyncApp, BackgroundExecutor, BorrowAppContext, Context, Entity,
-    EventEmitter, FutureExt, Global, Task, WeakEntity,
-};
-use parking_lot::Mutex;
-
-use release_channel::ReleaseChannel;
-use rpc::{
-    AnyProtoClient, ErrorExt, ProtoClient, ProtoMessageHandlerSet, RpcError,
-    proto::{self, Envelope, EnvelopedMessage, PeerId, RequestMessage, build_typed_envelope},
-};
-use semver::Version;
-use std::{
-    collections::VecDeque,
-    fmt,
-    ops::ControlFlow,
-    path::PathBuf,
-    sync::{
-        Arc, Weak,
-        atomic::{AtomicU32, AtomicU64, Ordering::SeqCst},
-    },
-    time::{Duration, Instant},
-};
-use util::{
-    ResultExt,
-    paths::{PathStyle, RemotePathBuf},
-};
-
-#[derive(Copy, Clone, Debug)]
-pub struct RemotePlatform {
-    pub os: &'static str,
-    pub arch: &'static str,
-}
-
-#[derive(Clone, Debug)]
-pub struct CommandTemplate {
-    pub program: String,
-    pub args: Vec<String>,
-    pub env: HashMap<String, String>,
-}
-
-pub trait RemoteClientDelegate: Send + Sync {
-    fn ask_password(
-        &self,
-        prompt: String,
-        tx: oneshot::Sender<EncryptedPassword>,
-        cx: &mut AsyncApp,
-    );
-    fn get_download_url(
-        &self,
-        platform: RemotePlatform,
-        release_channel: ReleaseChannel,
-        version: Option<Version>,
-        cx: &mut AsyncApp,
-    ) -> Task<Result<Option<String>>>;
-    fn download_server_binary_locally(
-        &self,
-        platform: RemotePlatform,
-        release_channel: ReleaseChannel,
-        version: Option<Version>,
-        cx: &mut AsyncApp,
-    ) -> Task<Result<PathBuf>>;
-    fn set_status(&self, status: Option<&str>, cx: &mut AsyncApp);
-}
-
-const MAX_MISSED_HEARTBEATS: usize = 5;
-const HEARTBEAT_INTERVAL: Duration = Duration::from_secs(5);
-const HEARTBEAT_TIMEOUT: Duration = Duration::from_secs(5);
-const INITIAL_CONNECTION_TIMEOUT: Duration = Duration::from_secs(60);
-
-const MAX_RECONNECT_ATTEMPTS: usize = 3;
-
-enum State {
-    Connecting,
-    Connected {
-        remote_connection: Arc<dyn RemoteConnection>,
-        delegate: Arc<dyn RemoteClientDelegate>,
-
-        multiplex_task: Task<Result<()>>,
-        heartbeat_task: Task<Result<()>>,
-    },
-    HeartbeatMissed {
-        missed_heartbeats: usize,
-
-        ssh_connection: Arc<dyn RemoteConnection>,
-        delegate: Arc<dyn RemoteClientDelegate>,
-
-        multiplex_task: Task<Result<()>>,
-        heartbeat_task: Task<Result<()>>,
-    },
-    Reconnecting,
-    ReconnectFailed {
-        ssh_connection: Arc<dyn RemoteConnection>,
-        delegate: Arc<dyn RemoteClientDelegate>,
-
-        error: anyhow::Error,
-        attempts: usize,
-    },
-    ReconnectExhausted,
-    ServerNotRunning,
-}
-
-impl fmt::Display for State {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Self::Connecting => write!(f, "connecting"),
-            Self::Connected { .. } => write!(f, "connected"),
-            Self::Reconnecting => write!(f, "reconnecting"),
-            Self::ReconnectFailed { .. } => write!(f, "reconnect failed"),
-            Self::ReconnectExhausted => write!(f, "reconnect exhausted"),
-            Self::HeartbeatMissed { .. } => write!(f, "heartbeat missed"),
-            Self::ServerNotRunning { .. } => write!(f, "server not running"),
-        }
-    }
-}
-
-impl State {
-    fn remote_connection(&self) -> Option<Arc<dyn RemoteConnection>> {
-        match self {
-            Self::Connected {
-                remote_connection: ssh_connection,
-                ..
-            } => Some(ssh_connection.clone()),
-            Self::HeartbeatMissed { ssh_connection, .. } => Some(ssh_connection.clone()),
-            Self::ReconnectFailed { ssh_connection, .. } => Some(ssh_connection.clone()),
-            _ => None,
-        }
-    }
-
-    fn can_reconnect(&self) -> bool {
-        match self {
-            Self::Connected { .. }
-            | Self::HeartbeatMissed { .. }
-            | Self::ReconnectFailed { .. } => true,
-            State::Connecting
-            | State::Reconnecting
-            | State::ReconnectExhausted
-            | State::ServerNotRunning => false,
-        }
-    }
-
-    fn is_reconnect_failed(&self) -> bool {
-        matches!(self, Self::ReconnectFailed { .. })
-    }
-
-    fn is_reconnect_exhausted(&self) -> bool {
-        matches!(self, Self::ReconnectExhausted { .. })
-    }
-
-    fn is_server_not_running(&self) -> bool {
-        matches!(self, Self::ServerNotRunning)
-    }
-
-    fn is_reconnecting(&self) -> bool {
-        matches!(self, Self::Reconnecting { .. })
-    }
-
-    fn heartbeat_recovered(self) -> Self {
-        match self {
-            Self::HeartbeatMissed {
-                ssh_connection,
-                delegate,
-                multiplex_task,
-                heartbeat_task,
-                ..
-            } => Self::Connected {
-                remote_connection: ssh_connection,
-                delegate,
-                multiplex_task,
-                heartbeat_task,
-            },
-            _ => self,
-        }
-    }
-
-    fn heartbeat_missed(self) -> Self {
-        match self {
-            Self::Connected {
-                remote_connection: ssh_connection,
-                delegate,
-                multiplex_task,
-                heartbeat_task,
-            } => Self::HeartbeatMissed {
-                missed_heartbeats: 1,
-                ssh_connection,
-                delegate,
-                multiplex_task,
-                heartbeat_task,
-            },
-            Self::HeartbeatMissed {
-                missed_heartbeats,
-                ssh_connection,
-                delegate,
-                multiplex_task,
-                heartbeat_task,
-            } => Self::HeartbeatMissed {
-                missed_heartbeats: missed_heartbeats + 1,
-                ssh_connection,
-                delegate,
-                multiplex_task,
-                heartbeat_task,
-            },
-            _ => self,
-        }
-    }
-}
-
-/// The state of the ssh connection.
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum ConnectionState {
-    Connecting,
-    Connected,
-    HeartbeatMissed,
-    Reconnecting,
-    Disconnected,
-}
-
-impl From<&State> for ConnectionState {
-    fn from(value: &State) -> Self {
-        match value {
-            State::Connecting => Self::Connecting,
-            State::Connected { .. } => Self::Connected,
-            State::Reconnecting | State::ReconnectFailed { .. } => Self::Reconnecting,
-            State::HeartbeatMissed { .. } => Self::HeartbeatMissed,
-            State::ReconnectExhausted => Self::Disconnected,
-            State::ServerNotRunning => Self::Disconnected,
-        }
-    }
-}
-
-pub struct RemoteClient {
-    client: Arc<ChannelClient>,
-    unique_identifier: String,
-    connection_options: RemoteConnectionOptions,
-    path_style: PathStyle,
-    state: Option<State>,
-}
-
-#[derive(Debug)]
-pub enum RemoteClientEvent {
-    Disconnected,
-}
-
-impl EventEmitter<RemoteClientEvent> for RemoteClient {}
-
-/// Identifies the socket on the remote server so that reconnects
-/// can re-join the same project.
-pub enum ConnectionIdentifier {
-    Setup(u64),
-    Workspace(i64),
-}
-
-static NEXT_ID: AtomicU64 = AtomicU64::new(1);
-
-impl ConnectionIdentifier {
-    pub fn setup() -> Self {
-        Self::Setup(NEXT_ID.fetch_add(1, SeqCst))
-    }
-
-    // This string gets used in a socket name, and so must be relatively short.
-    // The total length of:
-    //   /home/{username}/.local/share/zed/server_state/{name}/stdout.sock
-    // Must be less than about 100 characters
-    //   https://unix.stackexchange.com/questions/367008/why-is-socket-path-length-limited-to-a-hundred-chars
-    // So our strings should be at most 20 characters or so.
-    fn to_string(&self, cx: &App) -> String {
-        let identifier_prefix = match ReleaseChannel::global(cx) {
-            ReleaseChannel::Stable => "".to_string(),
-            release_channel => format!("{}-", release_channel.dev_name()),
-        };
-        match self {
-            Self::Setup(setup_id) => format!("{identifier_prefix}setup-{setup_id}"),
-            Self::Workspace(workspace_id) => {
-                format!("{identifier_prefix}workspace-{workspace_id}",)
-            }
-        }
-    }
-}
-
-pub async fn connect(
-    connection_options: RemoteConnectionOptions,
-    delegate: Arc<dyn RemoteClientDelegate>,
-    cx: &mut AsyncApp,
-) -> Result<Arc<dyn RemoteConnection>> {
-    cx.update(|cx| {
-        cx.update_default_global(|pool: &mut ConnectionPool, cx| {
-            pool.connect(connection_options.clone(), delegate.clone(), cx)
-        })
-    })?
-    .await
-    .map_err(|e| e.cloned())
-}
-
-impl RemoteClient {
-    pub fn new(
-        unique_identifier: ConnectionIdentifier,
-        remote_connection: Arc<dyn RemoteConnection>,
-        cancellation: oneshot::Receiver<()>,
-        delegate: Arc<dyn RemoteClientDelegate>,
-        cx: &mut App,
-    ) -> Task<Result<Option<Entity<Self>>>> {
-        let unique_identifier = unique_identifier.to_string(cx);
-        cx.spawn(async move |cx| {
-            let success = Box::pin(async move {
-                let (outgoing_tx, outgoing_rx) = mpsc::unbounded::<Envelope>();
-                let (incoming_tx, incoming_rx) = mpsc::unbounded::<Envelope>();
-                let (connection_activity_tx, connection_activity_rx) = mpsc::channel::<()>(1);
-
-                let client = cx.update(|cx| {
-                    ChannelClient::new(
-                        incoming_rx,
-                        outgoing_tx,
-                        cx,
-                        "client",
-                        remote_connection.has_wsl_interop(),
-                    )
-                })?;
-
-                let path_style = remote_connection.path_style();
-                let this = cx.new(|_| Self {
-                    client: client.clone(),
-                    unique_identifier: unique_identifier.clone(),
-                    connection_options: remote_connection.connection_options(),
-                    path_style,
-                    state: Some(State::Connecting),
-                })?;
-
-                let io_task = remote_connection.start_proxy(
-                    unique_identifier,
-                    false,
-                    incoming_tx,
-                    outgoing_rx,
-                    connection_activity_tx,
-                    delegate.clone(),
-                    cx,
-                );
-
-                let ready = client
-                    .wait_for_remote_started()
-                    .with_timeout(INITIAL_CONNECTION_TIMEOUT, cx.background_executor())
-                    .await;
-                match ready {
-                    Ok(Some(_)) => {}
-                    Ok(None) => {
-                        let mut error = "remote client exited before becoming ready".to_owned();
-                        if let Some(status) = io_task.now_or_never() {
-                            match status {
-                                Ok(exit_code) => {
-                                    error.push_str(&format!(", exit_code={exit_code:?}"))
-                                }
-                                Err(e) => error.push_str(&format!(", error={e:?}")),
-                            }
-                        }
-                        let error = anyhow::anyhow!("{error}");
-                        log::error!("failed to establish connection: {}", error);
-                        return Err(error);
-                    }
-                    Err(_) => {
-                        let mut error =
-                            "remote client did not become ready within the timeout".to_owned();
-                        if let Some(status) = io_task.now_or_never() {
-                            match status {
-                                Ok(exit_code) => {
-                                    error.push_str(&format!(", exit_code={exit_code:?}"))
-                                }
-                                Err(e) => error.push_str(&format!(", error={e:?}")),
-                            }
-                        }
-                        let error = anyhow::anyhow!("{error}");
-                        log::error!("failed to establish connection: {}", error);
-                        return Err(error);
-                    }
-                }
-                let multiplex_task = Self::monitor(this.downgrade(), io_task, cx);
-                if let Err(error) = client.ping(HEARTBEAT_TIMEOUT).await {
-                    log::error!("failed to establish connection: {}", error);
-                    return Err(error);
-                }
-
-                let heartbeat_task = Self::heartbeat(this.downgrade(), connection_activity_rx, cx);
-
-                this.update(cx, |this, _| {
-                    this.state = Some(State::Connected {
-                        remote_connection,
-                        delegate,
-                        multiplex_task,
-                        heartbeat_task,
-                    });
-                })?;
-
-                Ok(Some(this))
-            });
-
-            select! {
-                _ = cancellation.fuse() => {
-                    Ok(None)
-                }
-                result = success.fuse() =>  result
-            }
-        })
-    }
-
-    pub fn proto_client_from_channels(
-        incoming_rx: mpsc::UnboundedReceiver<Envelope>,
-        outgoing_tx: mpsc::UnboundedSender<Envelope>,
-        cx: &App,
-        name: &'static str,
-        has_wsl_interop: bool,
-    ) -> AnyProtoClient {
-        ChannelClient::new(incoming_rx, outgoing_tx, cx, name, has_wsl_interop).into()
-    }
-
-    pub fn shutdown_processes<T: RequestMessage>(
-        &mut self,
-        shutdown_request: Option<T>,
-        executor: BackgroundExecutor,
-    ) -> Option<impl Future<Output = ()> + use<T>> {
-        let state = self.state.take()?;
-        log::info!("shutting down ssh processes");
-
-        let State::Connected {
-            multiplex_task,
-            heartbeat_task,
-            remote_connection: ssh_connection,
-            delegate,
-        } = state
-        else {
-            return None;
-        };
-
-        let client = self.client.clone();
-
-        Some(async move {
-            if let Some(shutdown_request) = shutdown_request {
-                client.send(shutdown_request).log_err();
-                // We wait 50ms instead of waiting for a response, because
-                // waiting for a response would require us to wait on the main thread
-                // which we want to avoid in an `on_app_quit` callback.
-                executor.timer(Duration::from_millis(50)).await;
-            }
-
-            // Drop `multiplex_task` because it owns our ssh_proxy_process, which is a
-            // child of master_process.
-            drop(multiplex_task);
-            // Now drop the rest of state, which kills master process.
-            drop(heartbeat_task);
-            drop(ssh_connection);
-            drop(delegate);
-        })
-    }
-
-    fn reconnect(&mut self, cx: &mut Context<Self>) -> Result<()> {
-        let can_reconnect = self
-            .state
-            .as_ref()
-            .map(|state| state.can_reconnect())
-            .unwrap_or(false);
-        if !can_reconnect {
-            log::info!("aborting reconnect, because not in state that allows reconnecting");
-            let error = if let Some(state) = self.state.as_ref() {
-                format!("invalid state, cannot reconnect while in state {state}")
-            } else {
-                "no state set".to_string()
-            };
-            anyhow::bail!(error);
-        }
-
-        let state = self.state.take().unwrap();
-        let (attempts, remote_connection, delegate) = match state {
-            State::Connected {
-                remote_connection: ssh_connection,
-                delegate,
-                multiplex_task,
-                heartbeat_task,
-            }
-            | State::HeartbeatMissed {
-                ssh_connection,
-                delegate,
-                multiplex_task,
-                heartbeat_task,
-                ..
-            } => {
-                drop(multiplex_task);
-                drop(heartbeat_task);
-                (0, ssh_connection, delegate)
-            }
-            State::ReconnectFailed {
-                attempts,
-                ssh_connection,
-                delegate,
-                ..
-            } => (attempts, ssh_connection, delegate),
-            State::Connecting
-            | State::Reconnecting
-            | State::ReconnectExhausted
-            | State::ServerNotRunning => unreachable!(),
-        };
-
-        let attempts = attempts + 1;
-        if attempts > MAX_RECONNECT_ATTEMPTS {
-            log::error!(
-                "Failed to reconnect to after {} attempts, giving up",
-                MAX_RECONNECT_ATTEMPTS
-            );
-            self.set_state(State::ReconnectExhausted, cx);
-            return Ok(());
-        }
-
-        self.set_state(State::Reconnecting, cx);
-
-        log::info!("Trying to reconnect to ssh server... Attempt {}", attempts);
-
-        let unique_identifier = self.unique_identifier.clone();
-        let client = self.client.clone();
-        let reconnect_task = cx.spawn(async move |this, cx| {
-            macro_rules! failed {
-                ($error:expr, $attempts:expr, $ssh_connection:expr, $delegate:expr) => {
-                    delegate.set_status(Some(&format!("{error:#}", error = $error)), cx);
-                    return State::ReconnectFailed {
-                        error: anyhow!($error),
-                        attempts: $attempts,
-                        ssh_connection: $ssh_connection,
-                        delegate: $delegate,
-                    };
-                };
-            }
-
-            if let Err(error) = remote_connection
-                .kill()
-                .await
-                .context("Failed to kill ssh process")
-            {
-                failed!(error, attempts, remote_connection, delegate);
-            };
-
-            let connection_options = remote_connection.connection_options();
-
-            let (outgoing_tx, outgoing_rx) = mpsc::unbounded::<Envelope>();
-            let (incoming_tx, incoming_rx) = mpsc::unbounded::<Envelope>();
-            let (connection_activity_tx, connection_activity_rx) = mpsc::channel::<()>(1);
-
-            let (ssh_connection, io_task) = match async {
-                let ssh_connection = cx
-                    .update_global(|pool: &mut ConnectionPool, cx| {
-                        pool.connect(connection_options, delegate.clone(), cx)
-                    })?
-                    .await
-                    .map_err(|error| error.cloned())?;
-
-                let io_task = ssh_connection.start_proxy(
-                    unique_identifier,
-                    true,
-                    incoming_tx,
-                    outgoing_rx,
-                    connection_activity_tx,
-                    delegate.clone(),
-                    cx,
-                );
-                anyhow::Ok((ssh_connection, io_task))
-            }
-            .await
-            {
-                Ok((ssh_connection, io_task)) => (ssh_connection, io_task),
-                Err(error) => {
-                    failed!(error, attempts, remote_connection, delegate);
-                }
-            };
-
-            let multiplex_task = Self::monitor(this.clone(), io_task, cx);
-            client.reconnect(incoming_rx, outgoing_tx, cx);
-
-            if let Err(error) = client.resync(HEARTBEAT_TIMEOUT).await {
-                failed!(error, attempts, ssh_connection, delegate);
-            };
-
-            State::Connected {
-                remote_connection: ssh_connection,
-                delegate,
-                multiplex_task,
-                heartbeat_task: Self::heartbeat(this.clone(), connection_activity_rx, cx),
-            }
-        });
-
-        cx.spawn(async move |this, cx| {
-            let new_state = reconnect_task.await;
-            this.update(cx, |this, cx| {
-                this.try_set_state(cx, |old_state| {
-                    if old_state.is_reconnecting() {
-                        match &new_state {
-                            State::Connecting
-                            | State::Reconnecting
-                            | State::HeartbeatMissed { .. }
-                            | State::ServerNotRunning => {}
-                            State::Connected { .. } => {
-                                log::info!("Successfully reconnected");
-                            }
-                            State::ReconnectFailed {
-                                error, attempts, ..
-                            } => {
-                                log::error!(
-                                    "Reconnect attempt {} failed: {:?}. Starting new attempt...",
-                                    attempts,
-                                    error
-                                );
-                            }
-                            State::ReconnectExhausted => {
-                                log::error!("Reconnect attempt failed and all attempts exhausted");
-                            }
-                        }
-                        Some(new_state)
-                    } else {
-                        None
-                    }
-                });
-
-                if this.state_is(State::is_reconnect_failed) {
-                    this.reconnect(cx)
-                } else if this.state_is(State::is_reconnect_exhausted) {
-                    Ok(())
-                } else {
-                    log::debug!("State has transition from Reconnecting into new state while attempting reconnect.");
-                    Ok(())
-                }
-            })
-        })
-        .detach_and_log_err(cx);
-
-        Ok(())
-    }
-
-    fn heartbeat(
-        this: WeakEntity<Self>,
-        mut connection_activity_rx: mpsc::Receiver<()>,
-        cx: &mut AsyncApp,
-    ) -> Task<Result<()>> {
-        let Ok(client) = this.read_with(cx, |this, _| this.client.clone()) else {
-            return Task::ready(Err(anyhow!("SshRemoteClient lost")));
-        };
-
-        cx.spawn(async move |cx| {
-            let mut missed_heartbeats = 0;
-
-            let keepalive_timer = cx.background_executor().timer(HEARTBEAT_INTERVAL).fuse();
-            futures::pin_mut!(keepalive_timer);
-
-            loop {
-                select_biased! {
-                    result = connection_activity_rx.next().fuse() => {
-                        if result.is_none() {
-                            log::warn!("ssh heartbeat: connection activity channel has been dropped. stopping.");
-                            return Ok(());
-                        }
-
-                        if missed_heartbeats != 0 {
-                            missed_heartbeats = 0;
-                            let _ =this.update(cx, |this, cx| {
-                                this.handle_heartbeat_result(missed_heartbeats, cx)
-                            })?;
-                        }
-                    }
-                    _ = keepalive_timer => {
-                        log::debug!("Sending heartbeat to server...");
-
-                        let result = select_biased! {
-                            _ = connection_activity_rx.next().fuse() => {
-                                Ok(())
-                            }
-                            ping_result = client.ping(HEARTBEAT_TIMEOUT).fuse() => {
-                                ping_result
-                            }
-                        };
-
-                        if result.is_err() {
-                            missed_heartbeats += 1;
-                            log::warn!(
-                                "No heartbeat from server after {:?}. Missed heartbeat {} out of {}.",
-                                HEARTBEAT_TIMEOUT,
-                                missed_heartbeats,
-                                MAX_MISSED_HEARTBEATS
-                            );
-                        } else if missed_heartbeats != 0 {
-                            missed_heartbeats = 0;
-                        } else {
-                            continue;
-                        }
-
-                        let result = this.update(cx, |this, cx| {
-                            this.handle_heartbeat_result(missed_heartbeats, cx)
-                        })?;
-                        if result.is_break() {
-                            return Ok(());
-                        }
-                    }
-                }
-
-                keepalive_timer.set(cx.background_executor().timer(HEARTBEAT_INTERVAL).fuse());
-            }
-        })
-    }
-
-    fn handle_heartbeat_result(
-        &mut self,
-        missed_heartbeats: usize,
-        cx: &mut Context<Self>,
-    ) -> ControlFlow<()> {
-        let state = self.state.take().unwrap();
-        let next_state = if missed_heartbeats > 0 {
-            state.heartbeat_missed()
-        } else {
-            state.heartbeat_recovered()
-        };
-
-        self.set_state(next_state, cx);
-
-        if missed_heartbeats >= MAX_MISSED_HEARTBEATS {
-            log::error!(
-                "Missed last {} heartbeats. Reconnecting...",
-                missed_heartbeats
-            );
-
-            self.reconnect(cx)
-                .context("failed to start reconnect process after missing heartbeats")
-                .log_err();
-            ControlFlow::Break(())
-        } else {
-            ControlFlow::Continue(())
-        }
-    }
-
-    fn monitor(
-        this: WeakEntity<Self>,
-        io_task: Task<Result<i32>>,
-        cx: &AsyncApp,
-    ) -> Task<Result<()>> {
-        cx.spawn(async move |cx| {
-            let result = io_task.await;
-
-            match result {
-                Ok(exit_code) => {
-                    if let Some(error) = ProxyLaunchError::from_exit_code(exit_code) {
-                        match error {
-                            ProxyLaunchError::ServerNotRunning => {
-                                log::error!("failed to reconnect because server is not running");
-                                this.update(cx, |this, cx| {
-                                    this.set_state(State::ServerNotRunning, cx);
-                                })?;
-                            }
-                        }
-                    } else if exit_code > 0 {
-                        log::error!("proxy process terminated unexpectedly");
-                        this.update(cx, |this, cx| {
-                            this.reconnect(cx).ok();
-                        })?;
-                    }
-                }
-                Err(error) => {
-                    log::warn!("ssh io task died with error: {:?}. reconnecting...", error);
-                    this.update(cx, |this, cx| {
-                        this.reconnect(cx).ok();
-                    })?;
-                }
-            }
-
-            Ok(())
-        })
-    }
-
-    fn state_is(&self, check: impl FnOnce(&State) -> bool) -> bool {
-        self.state.as_ref().is_some_and(check)
-    }
-
-    fn try_set_state(&mut self, cx: &mut Context<Self>, map: impl FnOnce(&State) -> Option<State>) {
-        let new_state = self.state.as_ref().and_then(map);
-        if let Some(new_state) = new_state {
-            self.state.replace(new_state);
-            cx.notify();
-        }
-    }
-
-    fn set_state(&mut self, state: State, cx: &mut Context<Self>) {
-        log::info!("setting state to '{}'", &state);
-
-        let is_reconnect_exhausted = state.is_reconnect_exhausted();
-        let is_server_not_running = state.is_server_not_running();
-        self.state.replace(state);
-
-        if is_reconnect_exhausted || is_server_not_running {
-            cx.emit(RemoteClientEvent::Disconnected);
-        }
-        cx.notify();
-    }
-
-    pub fn shell(&self) -> Option<String> {
-        Some(self.remote_connection()?.shell())
-    }
-
-    pub fn default_system_shell(&self) -> Option<String> {
-        Some(self.remote_connection()?.default_system_shell())
-    }
-
-    pub fn shares_network_interface(&self) -> bool {
-        self.remote_connection()
-            .map_or(false, |connection| connection.shares_network_interface())
-    }
-
-    pub fn build_command(
-        &self,
-        program: Option<String>,
-        args: &[String],
-        env: &HashMap<String, String>,
-        working_dir: Option<String>,
-        port_forward: Option<(u16, String, u16)>,
-    ) -> Result<CommandTemplate> {
-        let Some(connection) = self.remote_connection() else {
-            return Err(anyhow!("no ssh connection"));
-        };
-        connection.build_command(program, args, env, working_dir, port_forward)
-    }
-
-    pub fn build_forward_ports_command(
-        &self,
-        forwards: Vec<(u16, String, u16)>,
-    ) -> Result<CommandTemplate> {
-        let Some(connection) = self.remote_connection() else {
-            return Err(anyhow!("no ssh connection"));
-        };
-        connection.build_forward_ports_command(forwards)
-    }
-
-    pub fn upload_directory(
-        &self,
-        src_path: PathBuf,
-        dest_path: RemotePathBuf,
-        cx: &App,
-    ) -> Task<Result<()>> {
-        let Some(connection) = self.remote_connection() else {
-            return Task::ready(Err(anyhow!("no ssh connection")));
-        };
-        connection.upload_directory(src_path, dest_path, cx)
-    }
-
-    pub fn proto_client(&self) -> AnyProtoClient {
-        self.client.clone().into()
-    }
-
-    pub fn connection_options(&self) -> RemoteConnectionOptions {
-        self.connection_options.clone()
-    }
-
-    pub fn connection(&self) -> Option<Arc<dyn RemoteConnection>> {
-        if let State::Connected {
-            remote_connection, ..
-        } = self.state.as_ref()?
-        {
-            Some(remote_connection.clone())
-        } else {
-            None
-        }
-    }
-
-    pub fn connection_state(&self) -> ConnectionState {
-        self.state
-            .as_ref()
-            .map(ConnectionState::from)
-            .unwrap_or(ConnectionState::Disconnected)
-    }
-
-    pub fn is_disconnected(&self) -> bool {
-        self.connection_state() == ConnectionState::Disconnected
-    }
-
-    pub fn path_style(&self) -> PathStyle {
-        self.path_style
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn simulate_disconnect(&self, client_cx: &mut App) -> Task<()> {
-        let opts = self.connection_options();
-        client_cx.spawn(async move |cx| {
-            let connection = cx
-                .update_global(|c: &mut ConnectionPool, _| {
-                    if let Some(ConnectionPoolEntry::Connecting(c)) = c.connections.get(&opts) {
-                        c.clone()
-                    } else {
-                        panic!("missing test connection")
-                    }
-                })
-                .unwrap()
-                .await
-                .unwrap();
-
-            connection.simulate_disconnect(cx);
-        })
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn fake_server(
-        client_cx: &mut gpui::TestAppContext,
-        server_cx: &mut gpui::TestAppContext,
-    ) -> (RemoteConnectionOptions, AnyProtoClient) {
-        let port = client_cx
-            .update(|cx| cx.default_global::<ConnectionPool>().connections.len() as u16 + 1);
-        let opts = RemoteConnectionOptions::Ssh(SshConnectionOptions {
-            host: "<fake>".to_string(),
-            port: Some(port),
-            ..Default::default()
-        });
-        let (outgoing_tx, _) = mpsc::unbounded::<Envelope>();
-        let (_, incoming_rx) = mpsc::unbounded::<Envelope>();
-        let server_client = server_cx
-            .update(|cx| ChannelClient::new(incoming_rx, outgoing_tx, cx, "fake-server", false));
-        let connection: Arc<dyn RemoteConnection> = Arc::new(fake::FakeRemoteConnection {
-            connection_options: opts.clone(),
-            server_cx: fake::SendableCx::new(server_cx),
-            server_channel: server_client.clone(),
-        });
-
-        client_cx.update(|cx| {
-            cx.update_default_global(|c: &mut ConnectionPool, cx| {
-                c.connections.insert(
-                    opts.clone(),
-                    ConnectionPoolEntry::Connecting(
-                        cx.background_spawn({
-                            let connection = connection.clone();
-                            async move { Ok(connection.clone()) }
-                        })
-                        .shared(),
-                    ),
-                );
-            })
-        });
-
-        (opts, server_client.into())
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub async fn fake_client(
-        opts: RemoteConnectionOptions,
-        client_cx: &mut gpui::TestAppContext,
-    ) -> Entity<Self> {
-        let (_tx, rx) = oneshot::channel();
-        let mut cx = client_cx.to_async();
-        let connection = connect(opts, Arc::new(fake::Delegate), &mut cx)
-            .await
-            .unwrap();
-        client_cx
-            .update(|cx| {
-                Self::new(
-                    ConnectionIdentifier::setup(),
-                    connection,
-                    rx,
-                    Arc::new(fake::Delegate),
-                    cx,
-                )
-            })
-            .await
-            .unwrap()
-            .unwrap()
-    }
-
-    fn remote_connection(&self) -> Option<Arc<dyn RemoteConnection>> {
-        self.state
-            .as_ref()
-            .and_then(|state| state.remote_connection())
-    }
-}
-
-enum ConnectionPoolEntry {
-    Connecting(Shared<Task<Result<Arc<dyn RemoteConnection>, Arc<anyhow::Error>>>>),
-    Connected(Weak<dyn RemoteConnection>),
-}
-
-#[derive(Default)]
-struct ConnectionPool {
-    connections: HashMap<RemoteConnectionOptions, ConnectionPoolEntry>,
-}
-
-impl Global for ConnectionPool {}
-
-impl ConnectionPool {
-    pub fn connect(
-        &mut self,
-        opts: RemoteConnectionOptions,
-        delegate: Arc<dyn RemoteClientDelegate>,
-        cx: &mut App,
-    ) -> Shared<Task<Result<Arc<dyn RemoteConnection>, Arc<anyhow::Error>>>> {
-        let connection = self.connections.get(&opts);
-        match connection {
-            Some(ConnectionPoolEntry::Connecting(task)) => {
-                delegate.set_status(
-                    Some("Waiting for existing connection attempt"),
-                    &mut cx.to_async(),
-                );
-                return task.clone();
-            }
-            Some(ConnectionPoolEntry::Connected(ssh)) => {
-                if let Some(ssh) = ssh.upgrade()
-                    && !ssh.has_been_killed()
-                {
-                    return Task::ready(Ok(ssh)).shared();
-                }
-                self.connections.remove(&opts);
-            }
-            None => {}
-        }
-
-        let task = cx
-            .spawn({
-                let opts = opts.clone();
-                let delegate = delegate.clone();
-                async move |cx| {
-                    let connection = match opts.clone() {
-                        RemoteConnectionOptions::Ssh(opts) => {
-                            SshRemoteConnection::new(opts, delegate, cx)
-                                .await
-                                .map(|connection| Arc::new(connection) as Arc<dyn RemoteConnection>)
-                        }
-                        RemoteConnectionOptions::Wsl(opts) => {
-                            WslRemoteConnection::new(opts, delegate, cx)
-                                .await
-                                .map(|connection| Arc::new(connection) as Arc<dyn RemoteConnection>)
-                        }
-                        RemoteConnectionOptions::Docker(opts) => {
-                            DockerExecConnection::new(opts, delegate, cx)
-                                .await
-                                .map(|connection| Arc::new(connection) as Arc<dyn RemoteConnection>)
-                        }
-                    };
-
-                    cx.update_global(|pool: &mut Self, _| {
-                        debug_assert!(matches!(
-                            pool.connections.get(&opts),
-                            Some(ConnectionPoolEntry::Connecting(_))
-                        ));
-                        match connection {
-                            Ok(connection) => {
-                                pool.connections.insert(
-                                    opts.clone(),
-                                    ConnectionPoolEntry::Connected(Arc::downgrade(&connection)),
-                                );
-                                Ok(connection)
-                            }
-                            Err(error) => {
-                                pool.connections.remove(&opts);
-                                Err(Arc::new(error))
-                            }
-                        }
-                    })?
-                }
-            })
-            .shared();
-
-        self.connections
-            .insert(opts.clone(), ConnectionPoolEntry::Connecting(task.clone()));
-        task
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub enum RemoteConnectionOptions {
-    Ssh(SshConnectionOptions),
-    Wsl(WslConnectionOptions),
-    Docker(DockerConnectionOptions),
-}
-
-impl RemoteConnectionOptions {
-    pub fn display_name(&self) -> String {
-        match self {
-            RemoteConnectionOptions::Ssh(opts) => opts.host.clone(),
-            RemoteConnectionOptions::Wsl(opts) => opts.distro_name.clone(),
-            RemoteConnectionOptions::Docker(opts) => opts.name.clone(),
-        }
-    }
-}
-
-impl From<SshConnectionOptions> for RemoteConnectionOptions {
-    fn from(opts: SshConnectionOptions) -> Self {
-        RemoteConnectionOptions::Ssh(opts)
-    }
-}
-
-impl From<WslConnectionOptions> for RemoteConnectionOptions {
-    fn from(opts: WslConnectionOptions) -> Self {
-        RemoteConnectionOptions::Wsl(opts)
-    }
-}
-
-#[cfg(target_os = "windows")]
-/// Open a wsl path (\\wsl.localhost\<distro>\path)
-#[derive(Debug, Clone, PartialEq, Eq, gpui::Action)]
-#[action(namespace = workspace, no_json, no_register)]
-pub struct OpenWslPath {
-    pub distro: WslConnectionOptions,
-    pub paths: Vec<PathBuf>,
-}
-
-#[async_trait(?Send)]
-pub trait RemoteConnection: Send + Sync {
-    fn start_proxy(
-        &self,
-        unique_identifier: String,
-        reconnect: bool,
-        incoming_tx: UnboundedSender<Envelope>,
-        outgoing_rx: UnboundedReceiver<Envelope>,
-        connection_activity_tx: Sender<()>,
-        delegate: Arc<dyn RemoteClientDelegate>,
-        cx: &mut AsyncApp,
-    ) -> Task<Result<i32>>;
-    fn upload_directory(
-        &self,
-        src_path: PathBuf,
-        dest_path: RemotePathBuf,
-        cx: &App,
-    ) -> Task<Result<()>>;
-    async fn kill(&self) -> Result<()>;
-    fn has_been_killed(&self) -> bool;
-    fn shares_network_interface(&self) -> bool {
-        false
-    }
-    fn build_command(
-        &self,
-        program: Option<String>,
-        args: &[String],
-        env: &HashMap<String, String>,
-        working_dir: Option<String>,
-        port_forward: Option<(u16, String, u16)>,
-    ) -> Result<CommandTemplate>;
-    fn build_forward_ports_command(
-        &self,
-        forwards: Vec<(u16, String, u16)>,
-    ) -> Result<CommandTemplate>;
-    fn connection_options(&self) -> RemoteConnectionOptions;
-    fn path_style(&self) -> PathStyle;
-    fn shell(&self) -> String;
-    fn default_system_shell(&self) -> String;
-    fn has_wsl_interop(&self) -> bool;
-
-    #[cfg(any(test, feature = "test-support"))]
-    fn simulate_disconnect(&self, _: &AsyncApp) {}
-}
-
-type ResponseChannels = Mutex<HashMap<MessageId, oneshot::Sender<(Envelope, oneshot::Sender<()>)>>>;
-
-struct Signal<T> {
-    tx: Mutex<Option<oneshot::Sender<T>>>,
-    rx: Shared<Task<Option<T>>>,
-}
-
-impl<T: Send + Clone + 'static> Signal<T> {
-    pub fn new(cx: &App) -> Self {
-        let (tx, rx) = oneshot::channel();
-
-        let task = cx
-            .background_executor()
-            .spawn(async move { rx.await.ok() })
-            .shared();
-
-        Self {
-            tx: Mutex::new(Some(tx)),
-            rx: task,
-        }
-    }
-
-    fn set(&self, value: T) {
-        if let Some(tx) = self.tx.lock().take() {
-            let _ = tx.send(value);
-        }
-    }
-
-    fn wait(&self) -> Shared<Task<Option<T>>> {
-        self.rx.clone()
-    }
-}
-
-struct ChannelClient {
-    next_message_id: AtomicU32,
-    outgoing_tx: Mutex<mpsc::UnboundedSender<Envelope>>,
-    buffer: Mutex<VecDeque<Envelope>>,
-    response_channels: ResponseChannels,
-    message_handlers: Mutex<ProtoMessageHandlerSet>,
-    max_received: AtomicU32,
-    name: &'static str,
-    task: Mutex<Task<Result<()>>>,
-    remote_started: Signal<()>,
-    has_wsl_interop: bool,
-}
-
-impl ChannelClient {
-    fn new(
-        incoming_rx: mpsc::UnboundedReceiver<Envelope>,
-        outgoing_tx: mpsc::UnboundedSender<Envelope>,
-        cx: &App,
-        name: &'static str,
-        has_wsl_interop: bool,
-    ) -> Arc<Self> {
-        Arc::new_cyclic(|this| Self {
-            outgoing_tx: Mutex::new(outgoing_tx),
-            next_message_id: AtomicU32::new(0),
-            max_received: AtomicU32::new(0),
-            response_channels: ResponseChannels::default(),
-            message_handlers: Default::default(),
-            buffer: Mutex::new(VecDeque::new()),
-            name,
-            task: Mutex::new(Self::start_handling_messages(
-                this.clone(),
-                incoming_rx,
-                &cx.to_async(),
-            )),
-            remote_started: Signal::new(cx),
-            has_wsl_interop,
-        })
-    }
-
-    fn wait_for_remote_started(&self) -> Shared<Task<Option<()>>> {
-        self.remote_started.wait()
-    }
-
-    fn start_handling_messages(
-        this: Weak<Self>,
-        mut incoming_rx: mpsc::UnboundedReceiver<Envelope>,
-        cx: &AsyncApp,
-    ) -> Task<Result<()>> {
-        cx.spawn(async move |cx| {
-            if let Some(this) = this.upgrade() {
-                let envelope = proto::RemoteStarted {}.into_envelope(0, None, None);
-                this.outgoing_tx.lock().unbounded_send(envelope).ok();
-            };
-
-            let peer_id = PeerId { owner_id: 0, id: 0 };
-            while let Some(incoming) = incoming_rx.next().await {
-                let Some(this) = this.upgrade() else {
-                    return anyhow::Ok(());
-                };
-                if let Some(ack_id) = incoming.ack_id {
-                    let mut buffer = this.buffer.lock();
-                    while buffer.front().is_some_and(|msg| msg.id <= ack_id) {
-                        buffer.pop_front();
-                    }
-                }
-                if let Some(proto::envelope::Payload::FlushBufferedMessages(_)) = &incoming.payload
-                {
-                    log::debug!(
-                        "{}:ssh message received. name:FlushBufferedMessages",
-                        this.name
-                    );
-                    {
-                        let buffer = this.buffer.lock();
-                        for envelope in buffer.iter() {
-                            this.outgoing_tx
-                                .lock()
-                                .unbounded_send(envelope.clone())
-                                .ok();
-                        }
-                    }
-                    let mut envelope = proto::Ack {}.into_envelope(0, Some(incoming.id), None);
-                    envelope.id = this.next_message_id.fetch_add(1, SeqCst);
-                    this.outgoing_tx.lock().unbounded_send(envelope).ok();
-                    continue;
-                }
-
-                if let Some(proto::envelope::Payload::RemoteStarted(_)) = &incoming.payload {
-                    this.remote_started.set(());
-                    let mut envelope = proto::Ack {}.into_envelope(0, Some(incoming.id), None);
-                    envelope.id = this.next_message_id.fetch_add(1, SeqCst);
-                    this.outgoing_tx.lock().unbounded_send(envelope).ok();
-                    continue;
-                }
-
-                this.max_received.store(incoming.id, SeqCst);
-
-                if let Some(request_id) = incoming.responding_to {
-                    let request_id = MessageId(request_id);
-                    let sender = this.response_channels.lock().remove(&request_id);
-                    if let Some(sender) = sender {
-                        let (tx, rx) = oneshot::channel();
-                        if incoming.payload.is_some() {
-                            sender.send((incoming, tx)).ok();
-                        }
-                        rx.await.ok();
-                    }
-                } else if let Some(envelope) =
-                    build_typed_envelope(peer_id, Instant::now(), incoming)
-                {
-                    let type_name = envelope.payload_type_name();
-                    let message_id = envelope.message_id();
-                    if let Some(future) = ProtoMessageHandlerSet::handle_message(
-                        &this.message_handlers,
-                        envelope,
-                        this.clone().into(),
-                        cx.clone(),
-                    ) {
-                        log::debug!("{}:ssh message received. name:{type_name}", this.name);
-                        cx.foreground_executor()
-                            .spawn(async move {
-                                match future.await {
-                                    Ok(_) => {
-                                        log::debug!(
-                                            "{}:ssh message handled. name:{type_name}",
-                                            this.name
-                                        );
-                                    }
-                                    Err(error) => {
-                                        log::error!(
-                                            "{}:error handling message. type:{}, error:{:#}",
-                                            this.name,
-                                            type_name,
-                                            format!("{error:#}").lines().fold(
-                                                String::new(),
-                                                |mut message, line| {
-                                                    if !message.is_empty() {
-                                                        message.push(' ');
-                                                    }
-                                                    message.push_str(line);
-                                                    message
-                                                }
-                                            )
-                                        );
-                                    }
-                                }
-                            })
-                            .detach()
-                    } else {
-                        log::error!("{}:unhandled ssh message name:{type_name}", this.name);
-                        if let Err(e) = AnyProtoClient::from(this.clone()).send_response(
-                            message_id,
-                            anyhow::anyhow!("no handler registered for {type_name}").to_proto(),
-                        ) {
-                            log::error!(
-                                "{}:error sending error response for {type_name}:{e:#}",
-                                this.name
-                            );
-                        }
-                    }
-                }
-            }
-            anyhow::Ok(())
-        })
-    }
-
-    fn reconnect(
-        self: &Arc<Self>,
-        incoming_rx: UnboundedReceiver<Envelope>,
-        outgoing_tx: UnboundedSender<Envelope>,
-        cx: &AsyncApp,
-    ) {
-        *self.outgoing_tx.lock() = outgoing_tx;
-        *self.task.lock() = Self::start_handling_messages(Arc::downgrade(self), incoming_rx, cx);
-    }
-
-    fn request<T: RequestMessage>(
-        &self,
-        payload: T,
-    ) -> impl 'static + Future<Output = Result<T::Response>> {
-        self.request_internal(payload, true)
-    }
-
-    fn request_internal<T: RequestMessage>(
-        &self,
-        payload: T,
-        use_buffer: bool,
-    ) -> impl 'static + Future<Output = Result<T::Response>> {
-        log::debug!("ssh request start. name:{}", T::NAME);
-        let response =
-            self.request_dynamic(payload.into_envelope(0, None, None), T::NAME, use_buffer);
-        async move {
-            let response = response.await?;
-            log::debug!("ssh request finish. name:{}", T::NAME);
-            T::Response::from_envelope(response).context("received a response of the wrong type")
-        }
-    }
-
-    async fn resync(&self, timeout: Duration) -> Result<()> {
-        smol::future::or(
-            async {
-                self.request_internal(proto::FlushBufferedMessages {}, false)
-                    .await?;
-
-                for envelope in self.buffer.lock().iter() {
-                    self.outgoing_tx
-                        .lock()
-                        .unbounded_send(envelope.clone())
-                        .ok();
-                }
-                Ok(())
-            },
-            async {
-                smol::Timer::after(timeout).await;
-                anyhow::bail!("Timed out resyncing remote client")
-            },
-        )
-        .await
-    }
-
-    async fn ping(&self, timeout: Duration) -> Result<()> {
-        smol::future::or(
-            async {
-                self.request(proto::Ping {}).await?;
-                Ok(())
-            },
-            async {
-                smol::Timer::after(timeout).await;
-                anyhow::bail!("Timed out pinging remote client")
-            },
-        )
-        .await
-    }
-
-    fn send<T: EnvelopedMessage>(&self, payload: T) -> Result<()> {
-        log::debug!("ssh send name:{}", T::NAME);
-        self.send_dynamic(payload.into_envelope(0, None, None))
-    }
-
-    fn request_dynamic(
-        &self,
-        mut envelope: proto::Envelope,
-        type_name: &'static str,
-        use_buffer: bool,
-    ) -> impl 'static + Future<Output = Result<proto::Envelope>> {
-        envelope.id = self.next_message_id.fetch_add(1, SeqCst);
-        let (tx, rx) = oneshot::channel();
-        let mut response_channels_lock = self.response_channels.lock();
-        response_channels_lock.insert(MessageId(envelope.id), tx);
-        drop(response_channels_lock);
-
-        let result = if use_buffer {
-            self.send_buffered(envelope)
-        } else {
-            self.send_unbuffered(envelope)
-        };
-        async move {
-            if let Err(error) = &result {
-                log::error!("failed to send message: {error}");
-                anyhow::bail!("failed to send message: {error}");
-            }
-
-            let response = rx.await.context("connection lost")?.0;
-            if let Some(proto::envelope::Payload::Error(error)) = &response.payload {
-                return Err(RpcError::from_proto(error, type_name));
-            }
-            Ok(response)
-        }
-    }
-
-    pub fn send_dynamic(&self, mut envelope: proto::Envelope) -> Result<()> {
-        envelope.id = self.next_message_id.fetch_add(1, SeqCst);
-        self.send_buffered(envelope)
-    }
-
-    fn send_buffered(&self, mut envelope: proto::Envelope) -> Result<()> {
-        envelope.ack_id = Some(self.max_received.load(SeqCst));
-        self.buffer.lock().push_back(envelope.clone());
-        // ignore errors on send (happen while we're reconnecting)
-        // assume that the global "disconnected" overlay is sufficient.
-        self.outgoing_tx.lock().unbounded_send(envelope).ok();
-        Ok(())
-    }
-
-    fn send_unbuffered(&self, mut envelope: proto::Envelope) -> Result<()> {
-        envelope.ack_id = Some(self.max_received.load(SeqCst));
-        self.outgoing_tx.lock().unbounded_send(envelope).ok();
-        Ok(())
-    }
-}
-
-impl ProtoClient for ChannelClient {
-    fn request(
-        &self,
-        envelope: proto::Envelope,
-        request_type: &'static str,
-    ) -> BoxFuture<'static, Result<proto::Envelope>> {
-        self.request_dynamic(envelope, request_type, true).boxed()
-    }
-
-    fn send(&self, envelope: proto::Envelope, _message_type: &'static str) -> Result<()> {
-        self.send_dynamic(envelope)
-    }
-
-    fn send_response(&self, envelope: Envelope, _message_type: &'static str) -> anyhow::Result<()> {
-        self.send_dynamic(envelope)
-    }
-
-    fn message_handler_set(&self) -> &Mutex<ProtoMessageHandlerSet> {
-        &self.message_handlers
-    }
-
-    fn is_via_collab(&self) -> bool {
-        false
-    }
-
-    fn has_wsl_interop(&self) -> bool {
-        self.has_wsl_interop
-    }
-}
-
-#[cfg(any(test, feature = "test-support"))]
-mod fake {
-    use super::{ChannelClient, RemoteClientDelegate, RemoteConnection, RemotePlatform};
-    use crate::remote_client::{CommandTemplate, RemoteConnectionOptions};
-    use anyhow::Result;
-    use askpass::EncryptedPassword;
-    use async_trait::async_trait;
-    use collections::HashMap;
-    use futures::{
-        FutureExt, SinkExt, StreamExt,
-        channel::{
-            mpsc::{self, Sender},
-            oneshot,
-        },
-        select_biased,
-    };
-    use gpui::{App, AppContext as _, AsyncApp, Task, TestAppContext};
-    use release_channel::ReleaseChannel;
-    use rpc::proto::Envelope;
-    use semver::Version;
-    use std::{path::PathBuf, sync::Arc};
-    use util::paths::{PathStyle, RemotePathBuf};
-
-    pub(super) struct FakeRemoteConnection {
-        pub(super) connection_options: RemoteConnectionOptions,
-        pub(super) server_channel: Arc<ChannelClient>,
-        pub(super) server_cx: SendableCx,
-    }
-
-    pub(super) struct SendableCx(AsyncApp);
-    impl SendableCx {
-        // SAFETY: When run in test mode, GPUI is always single threaded.
-        pub(super) fn new(cx: &TestAppContext) -> Self {
-            Self(cx.to_async())
-        }
-
-        // SAFETY: Enforce that we're on the main thread by requiring a valid AsyncApp
-        fn get(&self, _: &AsyncApp) -> AsyncApp {
-            self.0.clone()
-        }
-    }
-
-    // SAFETY: There is no way to access a SendableCx from a different thread, see [`SendableCx::new`] and [`SendableCx::get`]
-    unsafe impl Send for SendableCx {}
-    unsafe impl Sync for SendableCx {}
-
-    #[async_trait(?Send)]
-    impl RemoteConnection for FakeRemoteConnection {
-        async fn kill(&self) -> Result<()> {
-            Ok(())
-        }
-
-        fn has_been_killed(&self) -> bool {
-            false
-        }
-
-        fn build_command(
-            &self,
-            program: Option<String>,
-            args: &[String],
-            env: &HashMap<String, String>,
-            _: Option<String>,
-            _: Option<(u16, String, u16)>,
-        ) -> Result<CommandTemplate> {
-            let ssh_program = program.unwrap_or_else(|| "sh".to_string());
-            let mut ssh_args = Vec::new();
-            ssh_args.push(ssh_program);
-            ssh_args.extend(args.iter().cloned());
-            Ok(CommandTemplate {
-                program: "ssh".into(),
-                args: ssh_args,
-                env: env.clone(),
-            })
-        }
-
-        fn build_forward_ports_command(
-            &self,
-            forwards: Vec<(u16, String, u16)>,
-        ) -> anyhow::Result<CommandTemplate> {
-            Ok(CommandTemplate {
-                program: "ssh".into(),
-                args: std::iter::once("-N".to_owned())
-                    .chain(forwards.into_iter().map(|(local_port, host, remote_port)| {
-                        format!("{local_port}:{host}:{remote_port}")
-                    }))
-                    .collect(),
-                env: Default::default(),
-            })
-        }
-
-        fn upload_directory(
-            &self,
-            _src_path: PathBuf,
-            _dest_path: RemotePathBuf,
-            _cx: &App,
-        ) -> Task<Result<()>> {
-            unreachable!()
-        }
-
-        fn connection_options(&self) -> RemoteConnectionOptions {
-            self.connection_options.clone()
-        }
-
-        fn simulate_disconnect(&self, cx: &AsyncApp) {
-            let (outgoing_tx, _) = mpsc::unbounded::<Envelope>();
-            let (_, incoming_rx) = mpsc::unbounded::<Envelope>();
-            self.server_channel
-                .reconnect(incoming_rx, outgoing_tx, &self.server_cx.get(cx));
-        }
-
-        fn start_proxy(
-            &self,
-            _unique_identifier: String,
-            _reconnect: bool,
-            mut client_incoming_tx: mpsc::UnboundedSender<Envelope>,
-            mut client_outgoing_rx: mpsc::UnboundedReceiver<Envelope>,
-            mut connection_activity_tx: Sender<()>,
-            _delegate: Arc<dyn RemoteClientDelegate>,
-            cx: &mut AsyncApp,
-        ) -> Task<Result<i32>> {
-            let (mut server_incoming_tx, server_incoming_rx) = mpsc::unbounded::<Envelope>();
-            let (server_outgoing_tx, mut server_outgoing_rx) = mpsc::unbounded::<Envelope>();
-
-            self.server_channel.reconnect(
-                server_incoming_rx,
-                server_outgoing_tx,
-                &self.server_cx.get(cx),
-            );
-
-            cx.background_spawn(async move {
-                loop {
-                    select_biased! {
-                        server_to_client = server_outgoing_rx.next().fuse() => {
-                            let Some(server_to_client) = server_to_client else {
-                                return Ok(1)
-                            };
-                            connection_activity_tx.try_send(()).ok();
-                            client_incoming_tx.send(server_to_client).await.ok();
-                        }
-                        client_to_server = client_outgoing_rx.next().fuse() => {
-                            let Some(client_to_server) = client_to_server else {
-                                return Ok(1)
-                            };
-                            server_incoming_tx.send(client_to_server).await.ok();
-                        }
-                    }
-                }
-            })
-        }
-
-        fn path_style(&self) -> PathStyle {
-            PathStyle::local()
-        }
-
-        fn shell(&self) -> String {
-            "sh".to_owned()
-        }
-
-        fn default_system_shell(&self) -> String {
-            "sh".to_owned()
-        }
-
-        fn has_wsl_interop(&self) -> bool {
-            false
-        }
-    }
-
-    pub(super) struct Delegate;
-
-    impl RemoteClientDelegate for Delegate {
-        fn ask_password(&self, _: String, _: oneshot::Sender<EncryptedPassword>, _: &mut AsyncApp) {
-            unreachable!()
-        }
-
-        fn download_server_binary_locally(
-            &self,
-            _: RemotePlatform,
-            _: ReleaseChannel,
-            _: Option<Version>,
-            _: &mut AsyncApp,
-        ) -> Task<Result<PathBuf>> {
-            unreachable!()
-        }
-
-        fn get_download_url(
-            &self,
-            _platform: RemotePlatform,
-            _release_channel: ReleaseChannel,
-            _version: Option<Version>,
-            _cx: &mut AsyncApp,
-        ) -> Task<Result<Option<String>>> {
-            unreachable!()
-        }
-
-        fn set_status(&self, _: Option<&str>, _: &mut AsyncApp) {}
-    }
-}
diff --git a/crates/remote/src/transport.rs b/crates/remote/src/transport.rs
deleted file mode 100644
index 4cafbf60ee..0000000000
--- a/crates/remote/src/transport.rs
+++ /dev/null
@@ -1,428 +0,0 @@
-use crate::{
-    RemotePlatform,
-    json_log::LogRecord,
-    protocol::{MESSAGE_LEN_SIZE, message_len_from_buffer, read_message_with_len, write_message},
-};
-use anyhow::{Context as _, Result};
-use futures::{
-    AsyncReadExt as _, FutureExt as _, StreamExt as _,
-    channel::mpsc::{Sender, UnboundedReceiver, UnboundedSender},
-};
-use gpui::{AppContext as _, AsyncApp, Task};
-use rpc::proto::Envelope;
-use smol::process::Child;
-
-pub mod docker;
-pub mod ssh;
-pub mod wsl;
-
-/// Parses the output of `uname -sm` to determine the remote platform.
-/// Takes the last line to skip possible shell initialization output.
-fn parse_platform(output: &str) -> Result<RemotePlatform> {
-    let output = output.trim();
-    let uname = output.rsplit_once('\n').map_or(output, |(_, last)| last);
-    let Some((os, arch)) = uname.split_once(" ") else {
-        anyhow::bail!("unknown uname: {uname:?}")
-    };
-
-    let os = match os {
-        "Darwin" => "macos",
-        "Linux" => "linux",
-        _ => anyhow::bail!(
-            "Prebuilt remote servers are not yet available for {os:?}. See https://zed.dev/docs/remote-development"
-        ),
-    };
-
-    // exclude armv5,6,7 as they are 32-bit.
-    let arch = if arch.starts_with("armv8")
-        || arch.starts_with("armv9")
-        || arch.starts_with("arm64")
-        || arch.starts_with("aarch64")
-    {
-        "aarch64"
-    } else if arch.starts_with("x86") {
-        "x86_64"
-    } else {
-        anyhow::bail!(
-            "Prebuilt remote servers are not yet available for {arch:?}. See https://zed.dev/docs/remote-development"
-        )
-    };
-
-    Ok(RemotePlatform { os, arch })
-}
-
-/// Parses the output of `echo $SHELL` to determine the remote shell.
-/// Takes the last line to skip possible shell initialization output.
-fn parse_shell(output: &str, fallback_shell: &str) -> String {
-    let output = output.trim();
-    let shell = output.rsplit_once('\n').map_or(output, |(_, last)| last);
-    if shell.is_empty() {
-        log::error!("$SHELL is not set, falling back to {fallback_shell}");
-        fallback_shell.to_owned()
-    } else {
-        shell.to_owned()
-    }
-}
-
-fn handle_rpc_messages_over_child_process_stdio(
-    mut remote_proxy_process: Child,
-    incoming_tx: UnboundedSender<Envelope>,
-    mut outgoing_rx: UnboundedReceiver<Envelope>,
-    mut connection_activity_tx: Sender<()>,
-    cx: &AsyncApp,
-) -> Task<Result<i32>> {
-    let mut child_stderr = remote_proxy_process.stderr.take().unwrap();
-    let mut child_stdout = remote_proxy_process.stdout.take().unwrap();
-    let mut child_stdin = remote_proxy_process.stdin.take().unwrap();
-
-    let mut stdin_buffer = Vec::new();
-    let mut stdout_buffer = Vec::new();
-    let mut stderr_buffer = Vec::new();
-    let mut stderr_offset = 0;
-
-    let stdin_task = cx.background_spawn(async move {
-        while let Some(outgoing) = outgoing_rx.next().await {
-            write_message(&mut child_stdin, &mut stdin_buffer, outgoing).await?;
-        }
-        anyhow::Ok(())
-    });
-
-    let stdout_task = cx.background_spawn({
-        let mut connection_activity_tx = connection_activity_tx.clone();
-        async move {
-            loop {
-                stdout_buffer.resize(MESSAGE_LEN_SIZE, 0);
-                let len = child_stdout.read(&mut stdout_buffer).await?;
-
-                if len == 0 {
-                    return anyhow::Ok(());
-                }
-
-                if len < MESSAGE_LEN_SIZE {
-                    child_stdout.read_exact(&mut stdout_buffer[len..]).await?;
-                }
-
-                let message_len = message_len_from_buffer(&stdout_buffer);
-                let envelope =
-                    read_message_with_len(&mut child_stdout, &mut stdout_buffer, message_len)
-                        .await?;
-                connection_activity_tx.try_send(()).ok();
-                incoming_tx.unbounded_send(envelope).ok();
-            }
-        }
-    });
-
-    let stderr_task: Task<anyhow::Result<()>> = cx.background_spawn(async move {
-        loop {
-            stderr_buffer.resize(stderr_offset + 1024, 0);
-
-            let len = child_stderr
-                .read(&mut stderr_buffer[stderr_offset..])
-                .await?;
-            if len == 0 {
-                return anyhow::Ok(());
-            }
-
-            stderr_offset += len;
-            let mut start_ix = 0;
-            while let Some(ix) = stderr_buffer[start_ix..stderr_offset]
-                .iter()
-                .position(|b| b == &b'\n')
-            {
-                let line_ix = start_ix + ix;
-                let content = &stderr_buffer[start_ix..line_ix];
-                start_ix = line_ix + 1;
-                if let Ok(record) = serde_json::from_slice::<LogRecord>(content) {
-                    record.log(log::logger())
-                } else {
-                    eprintln!("(remote) {}", String::from_utf8_lossy(content));
-                }
-            }
-            stderr_buffer.drain(0..start_ix);
-            stderr_offset -= start_ix;
-
-            connection_activity_tx.try_send(()).ok();
-        }
-    });
-
-    cx.background_spawn(async move {
-        let result = futures::select! {
-            result = stdin_task.fuse() => {
-                result.context("stdin")
-            }
-            result = stdout_task.fuse() => {
-                result.context("stdout")
-            }
-            result = stderr_task.fuse() => {
-                result.context("stderr")
-            }
-        };
-        let status = remote_proxy_process.status().await?.code().unwrap_or(1);
-        match result {
-            Ok(_) => Ok(status),
-            Err(error) => Err(error),
-        }
-    })
-}
-
-#[cfg(debug_assertions)]
-async fn build_remote_server_from_source(
-    platform: &crate::RemotePlatform,
-    delegate: &dyn crate::RemoteClientDelegate,
-    cx: &mut AsyncApp,
-) -> Result<Option<std::path::PathBuf>> {
-    use smol::process::{Command, Stdio};
-    use std::env::VarError;
-    use std::path::Path;
-    use util::command::new_smol_command;
-
-    // By default, we make building remote server from source opt-out and we do not force artifact compression
-    // for quicker builds.
-    let build_remote_server =
-        std::env::var("ZED_BUILD_REMOTE_SERVER").unwrap_or("nocompress".into());
-
-    if let "false" | "no" | "off" | "0" = &*build_remote_server {
-        return Ok(None);
-    }
-
-    async fn run_cmd(command: &mut Command) -> Result<()> {
-        let output = command
-            .kill_on_drop(true)
-            .stderr(Stdio::inherit())
-            .output()
-            .await?;
-        anyhow::ensure!(
-            output.status.success(),
-            "Failed to run command: {command:?}"
-        );
-        Ok(())
-    }
-
-    let use_musl = !build_remote_server.contains("nomusl");
-    let triple = format!(
-        "{}-{}",
-        platform.arch,
-        match platform.os {
-            "linux" =>
-                if use_musl {
-                    "unknown-linux-musl"
-                } else {
-                    "unknown-linux-gnu"
-                },
-            "macos" => "apple-darwin",
-            _ => anyhow::bail!("can't cross compile for: {:?}", platform),
-        }
-    );
-    let mut rust_flags = match std::env::var("RUSTFLAGS") {
-        Ok(val) => val,
-        Err(VarError::NotPresent) => String::new(),
-        Err(e) => {
-            log::error!("Failed to get env var `RUSTFLAGS` value: {e}");
-            String::new()
-        }
-    };
-    if platform.os == "linux" && use_musl {
-        rust_flags.push_str(" -C target-feature=+crt-static");
-
-        if let Ok(path) = std::env::var("ZED_ZSTD_MUSL_LIB") {
-            rust_flags.push_str(&format!(" -C link-arg=-L{path}"));
-        }
-    }
-    if build_remote_server.contains("mold") {
-        rust_flags.push_str(" -C link-arg=-fuse-ld=mold");
-    }
-
-    if platform.arch == std::env::consts::ARCH && platform.os == std::env::consts::OS {
-        delegate.set_status(Some("Building remote server binary from source"), cx);
-        log::info!("building remote server binary from source");
-        run_cmd(
-            new_smol_command("cargo")
-                .current_dir(concat!(env!("CARGO_MANIFEST_DIR"), "/../.."))
-                .args([
-                    "build",
-                    "--package",
-                    "remote_server",
-                    "--features",
-                    "debug-embed",
-                    "--target-dir",
-                    "target/remote_server",
-                    "--target",
-                    &triple,
-                ])
-                .env("RUSTFLAGS", &rust_flags),
-        )
-        .await?;
-    } else {
-        if which("zig", cx).await?.is_none() {
-            anyhow::bail!(if cfg!(not(windows)) {
-                "zig not found on $PATH, install zig (see https://ziglang.org/learn/getting-started or use zigup)"
-            } else {
-                "zig not found on $PATH, install zig (use `winget install -e --id zig.zig` or see https://ziglang.org/learn/getting-started or use zigup)"
-            });
-        }
-
-        let rustup = which("rustup", cx)
-            .await?
-            .context("rustup not found on $PATH, install rustup (see https://rustup.rs/)")?;
-        delegate.set_status(Some("Adding rustup target for cross-compilation"), cx);
-        log::info!("adding rustup target");
-        run_cmd(
-            new_smol_command(rustup)
-                .args(["target", "add"])
-                .arg(&triple),
-        )
-        .await?;
-
-        if which("cargo-zigbuild", cx).await?.is_none() {
-            delegate.set_status(Some("Installing cargo-zigbuild for cross-compilation"), cx);
-            log::info!("installing cargo-zigbuild");
-            run_cmd(new_smol_command("cargo").args(["install", "--locked", "cargo-zigbuild"]))
-                .await?;
-        }
-
-        delegate.set_status(
-            Some(&format!(
-                "Building remote binary from source for {triple} with Zig"
-            )),
-            cx,
-        );
-        log::info!("building remote binary from source for {triple} with Zig");
-        run_cmd(
-            new_smol_command("cargo")
-                .args([
-                    "zigbuild",
-                    "--package",
-                    "remote_server",
-                    "--features",
-                    "debug-embed",
-                    "--target-dir",
-                    "target/remote_server",
-                    "--target",
-                    &triple,
-                ])
-                .env("RUSTFLAGS", &rust_flags),
-        )
-        .await?;
-    };
-    let bin_path = Path::new("target")
-        .join("remote_server")
-        .join(&triple)
-        .join("debug")
-        .join("remote_server");
-
-    let path = if !build_remote_server.contains("nocompress") {
-        delegate.set_status(Some("Compressing binary"), cx);
-
-        #[cfg(not(target_os = "windows"))]
-        {
-            run_cmd(new_smol_command("gzip").args(["-f", &bin_path.to_string_lossy()])).await?;
-        }
-
-        #[cfg(target_os = "windows")]
-        {
-            // On Windows, we use 7z to compress the binary
-
-            let seven_zip = which("7z.exe",cx)
-                .await?
-                .context("7z.exe not found on $PATH, install it (e.g. with `winget install -e --id 7zip.7zip`) or, if you don't want this behaviour, set $env:ZED_BUILD_REMOTE_SERVER=\"nocompress\"")?;
-            let gz_path = format!("target/remote_server/{}/debug/remote_server.gz", triple);
-            if smol::fs::metadata(&gz_path).await.is_ok() {
-                smol::fs::remove_file(&gz_path).await?;
-            }
-            run_cmd(new_smol_command(seven_zip).args([
-                "a",
-                "-tgzip",
-                &gz_path,
-                &bin_path.to_string_lossy(),
-            ]))
-            .await?;
-        }
-
-        let mut archive_path = bin_path;
-        archive_path.set_extension("gz");
-        std::env::current_dir()?.join(archive_path)
-    } else {
-        bin_path
-    };
-
-    Ok(Some(path))
-}
-
-#[cfg(debug_assertions)]
-async fn which(
-    binary_name: impl AsRef<str>,
-    cx: &mut AsyncApp,
-) -> Result<Option<std::path::PathBuf>> {
-    let binary_name = binary_name.as_ref().to_string();
-    let binary_name_cloned = binary_name.clone();
-    let res = cx
-        .background_spawn(async move { which::which(binary_name_cloned) })
-        .await;
-    match res {
-        Ok(path) => Ok(Some(path)),
-        Err(which::Error::CannotFindBinaryPath) => Ok(None),
-        Err(err) => Err(anyhow::anyhow!(
-            "Failed to run 'which' to find the binary '{binary_name}': {err}"
-        )),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_parse_platform() {
-        let result = parse_platform("Linux x86_64\n").unwrap();
-        assert_eq!(result.os, "linux");
-        assert_eq!(result.arch, "x86_64");
-
-        let result = parse_platform("Darwin arm64\n").unwrap();
-        assert_eq!(result.os, "macos");
-        assert_eq!(result.arch, "aarch64");
-
-        let result = parse_platform("Linux x86_64").unwrap();
-        assert_eq!(result.os, "linux");
-        assert_eq!(result.arch, "x86_64");
-
-        let result = parse_platform("some shell init output\nLinux aarch64\n").unwrap();
-        assert_eq!(result.os, "linux");
-        assert_eq!(result.arch, "aarch64");
-
-        let result = parse_platform("some shell init output\nLinux aarch64").unwrap();
-        assert_eq!(result.os, "linux");
-        assert_eq!(result.arch, "aarch64");
-
-        assert_eq!(parse_platform("Linux armv8l\n").unwrap().arch, "aarch64");
-        assert_eq!(parse_platform("Linux aarch64\n").unwrap().arch, "aarch64");
-        assert_eq!(parse_platform("Linux x86_64\n").unwrap().arch, "x86_64");
-
-        let result = parse_platform(
-            r#"Linux x86_64 - What you're referring to as Linux, is in fact, GNU/Linux...\n"#,
-        )
-        .unwrap();
-        assert_eq!(result.os, "linux");
-        assert_eq!(result.arch, "x86_64");
-
-        assert!(parse_platform("Windows x86_64\n").is_err());
-        assert!(parse_platform("Linux armv7l\n").is_err());
-    }
-
-    #[test]
-    fn test_parse_shell() {
-        assert_eq!(parse_shell("/bin/bash\n", "sh"), "/bin/bash");
-        assert_eq!(parse_shell("/bin/zsh\n", "sh"), "/bin/zsh");
-
-        assert_eq!(parse_shell("/bin/bash", "sh"), "/bin/bash");
-        assert_eq!(
-            parse_shell("some shell init output\n/bin/bash\n", "sh"),
-            "/bin/bash"
-        );
-        assert_eq!(
-            parse_shell("some shell init output\n/bin/bash", "sh"),
-            "/bin/bash"
-        );
-        assert_eq!(parse_shell("", "sh"), "sh");
-        assert_eq!(parse_shell("\n", "sh"), "sh");
-    }
-}
diff --git a/crates/remote/src/transport/docker.rs b/crates/remote/src/transport/docker.rs
deleted file mode 100644
index 09f5935ec6..0000000000
--- a/crates/remote/src/transport/docker.rs
+++ /dev/null
@@ -1,757 +0,0 @@
-use anyhow::Context;
-use anyhow::Result;
-use anyhow::anyhow;
-use async_trait::async_trait;
-use collections::HashMap;
-use parking_lot::Mutex;
-use release_channel::{AppCommitSha, AppVersion, ReleaseChannel};
-use semver::Version as SemanticVersion;
-use std::time::Instant;
-use std::{
-    path::{Path, PathBuf},
-    process::Stdio,
-    sync::Arc,
-};
-use util::ResultExt;
-use util::shell::ShellKind;
-use util::{
-    paths::{PathStyle, RemotePathBuf},
-    rel_path::RelPath,
-};
-
-use futures::channel::mpsc::{Sender, UnboundedReceiver, UnboundedSender};
-use gpui::{App, AppContext, AsyncApp, Task};
-use rpc::proto::Envelope;
-
-use crate::{
-    RemoteClientDelegate, RemoteConnection, RemoteConnectionOptions, RemotePlatform,
-    remote_client::CommandTemplate,
-};
-
-#[derive(Debug, Default, Clone, PartialEq, Eq, Hash)]
-pub struct DockerConnectionOptions {
-    pub name: String,
-    pub container_id: String,
-    pub upload_binary_over_docker_exec: bool,
-}
-
-pub(crate) struct DockerExecConnection {
-    proxy_process: Mutex<Option<u32>>,
-    remote_dir_for_server: String,
-    remote_binary_relpath: Option<Arc<RelPath>>,
-    connection_options: DockerConnectionOptions,
-    remote_platform: Option<RemotePlatform>,
-    path_style: Option<PathStyle>,
-    shell: Option<String>,
-}
-
-impl DockerExecConnection {
-    pub async fn new(
-        connection_options: DockerConnectionOptions,
-        delegate: Arc<dyn RemoteClientDelegate>,
-        cx: &mut AsyncApp,
-    ) -> Result<Self> {
-        let mut this = Self {
-            proxy_process: Mutex::new(None),
-            remote_dir_for_server: "/".to_string(),
-            remote_binary_relpath: None,
-            connection_options,
-            remote_platform: None,
-            path_style: None,
-            shell: None,
-        };
-        let (release_channel, version, commit) = cx.update(|cx| {
-            (
-                ReleaseChannel::global(cx),
-                AppVersion::global(cx),
-                AppCommitSha::try_global(cx),
-            )
-        })?;
-        let remote_platform = this.check_remote_platform().await?;
-
-        this.path_style = match remote_platform.os {
-            "windows" => Some(PathStyle::Windows),
-            _ => Some(PathStyle::Posix),
-        };
-
-        this.remote_platform = Some(remote_platform);
-
-        this.shell = Some(this.discover_shell().await);
-
-        this.remote_dir_for_server = this.docker_user_home_dir().await?.trim().to_string();
-
-        this.remote_binary_relpath = Some(
-            this.ensure_server_binary(
-                &delegate,
-                release_channel,
-                version,
-                &this.remote_dir_for_server,
-                commit,
-                cx,
-            )
-            .await?,
-        );
-
-        Ok(this)
-    }
-
-    async fn discover_shell(&self) -> String {
-        let default_shell = "sh";
-        match self
-            .run_docker_exec("sh", None, &Default::default(), &["-c", "echo $SHELL"])
-            .await
-        {
-            Ok(shell) => match shell.trim() {
-                "" => {
-                    log::error!("$SHELL is not set, falling back to {default_shell}");
-                    default_shell.to_owned()
-                }
-                shell => shell.to_owned(),
-            },
-            Err(e) => {
-                log::error!("Failed to get shell: {e}");
-                default_shell.to_owned()
-            }
-        }
-    }
-
-    async fn check_remote_platform(&self) -> Result<RemotePlatform> {
-        let uname = self
-            .run_docker_exec("uname", None, &Default::default(), &["-sm"])
-            .await?;
-        let Some((os, arch)) = uname.split_once(" ") else {
-            anyhow::bail!("unknown uname: {uname:?}")
-        };
-
-        let os = match os.trim() {
-            "Darwin" => "macos",
-            "Linux" => "linux",
-            _ => anyhow::bail!(
-                "Prebuilt remote servers are not yet available for {os:?}. See https://zed.dev/docs/remote-development"
-            ),
-        };
-        // exclude armv5,6,7 as they are 32-bit.
-        let arch = if arch.starts_with("armv8")
-            || arch.starts_with("armv9")
-            || arch.starts_with("arm64")
-            || arch.starts_with("aarch64")
-        {
-            "aarch64"
-        } else if arch.starts_with("x86") {
-            "x86_64"
-        } else {
-            anyhow::bail!(
-                "Prebuilt remote servers are not yet available for {arch:?}. See https://zed.dev/docs/remote-development"
-            )
-        };
-
-        Ok(RemotePlatform { os, arch })
-    }
-
-    async fn ensure_server_binary(
-        &self,
-        delegate: &Arc<dyn RemoteClientDelegate>,
-        release_channel: ReleaseChannel,
-        version: SemanticVersion,
-        remote_dir_for_server: &str,
-        commit: Option<AppCommitSha>,
-        cx: &mut AsyncApp,
-    ) -> Result<Arc<RelPath>> {
-        let remote_platform = if self.remote_platform.is_some() {
-            self.remote_platform.unwrap()
-        } else {
-            anyhow::bail!("No remote platform defined; cannot proceed.")
-        };
-
-        let version_str = match release_channel {
-            ReleaseChannel::Nightly => {
-                let commit = commit.map(|s| s.full()).unwrap_or_default();
-                format!("{}-{}", version, commit)
-            }
-            ReleaseChannel::Dev => "build".to_string(),
-            _ => version.to_string(),
-        };
-        let binary_name = format!(
-            "zed-remote-server-{}-{}",
-            release_channel.dev_name(),
-            version_str
-        );
-        let dst_path =
-            paths::remote_server_dir_relative().join(RelPath::unix(&binary_name).unwrap());
-
-        #[cfg(debug_assertions)]
-        if let Some(remote_server_path) =
-            super::build_remote_server_from_source(&remote_platform, delegate.as_ref(), cx).await?
-        {
-            let tmp_path = paths::remote_server_dir_relative().join(
-                RelPath::unix(&format!(
-                    "download-{}-{}",
-                    std::process::id(),
-                    remote_server_path.file_name().unwrap().to_string_lossy()
-                ))
-                .unwrap(),
-            );
-            self.upload_local_server_binary(
-                &remote_server_path,
-                &tmp_path,
-                &remote_dir_for_server,
-                delegate,
-                cx,
-            )
-            .await?;
-            self.extract_server_binary(&dst_path, &tmp_path, &remote_dir_for_server, delegate, cx)
-                .await?;
-            return Ok(dst_path);
-        }
-
-        if self
-            .run_docker_exec(
-                &dst_path.display(self.path_style()),
-                Some(&remote_dir_for_server),
-                &Default::default(),
-                &["version"],
-            )
-            .await
-            .is_ok()
-        {
-            return Ok(dst_path);
-        }
-
-        let wanted_version = cx.update(|cx| match release_channel {
-            ReleaseChannel::Nightly => Ok(None),
-            ReleaseChannel::Dev => {
-                anyhow::bail!(
-                    "ZED_BUILD_REMOTE_SERVER is not set and no remote server exists at ({:?})",
-                    dst_path
-                )
-            }
-            _ => Ok(Some(AppVersion::global(cx))),
-        })??;
-
-        let tmp_path_gz = paths::remote_server_dir_relative().join(
-            RelPath::unix(&format!(
-                "{}-download-{}.gz",
-                binary_name,
-                std::process::id()
-            ))
-            .unwrap(),
-        );
-        if !self.connection_options.upload_binary_over_docker_exec
-            && let Some(url) = delegate
-                .get_download_url(remote_platform, release_channel, wanted_version.clone(), cx)
-                .await?
-        {
-            match self
-                .download_binary_on_server(&url, &tmp_path_gz, &remote_dir_for_server, delegate, cx)
-                .await
-            {
-                Ok(_) => {
-                    self.extract_server_binary(
-                        &dst_path,
-                        &tmp_path_gz,
-                        &remote_dir_for_server,
-                        delegate,
-                        cx,
-                    )
-                    .await
-                    .context("extracting server binary")?;
-                    return Ok(dst_path);
-                }
-                Err(e) => {
-                    log::error!(
-                        "Failed to download binary on server, attempting to download locally and then upload it the server: {e:#}",
-                    )
-                }
-            }
-        }
-
-        let src_path = delegate
-            .download_server_binary_locally(remote_platform, release_channel, wanted_version, cx)
-            .await
-            .context("downloading server binary locally")?;
-        self.upload_local_server_binary(
-            &src_path,
-            &tmp_path_gz,
-            &remote_dir_for_server,
-            delegate,
-            cx,
-        )
-        .await
-        .context("uploading server binary")?;
-        self.extract_server_binary(
-            &dst_path,
-            &tmp_path_gz,
-            &remote_dir_for_server,
-            delegate,
-            cx,
-        )
-        .await
-        .context("extracting server binary")?;
-        Ok(dst_path)
-    }
-
-    async fn docker_user_home_dir(&self) -> Result<String> {
-        let inner_program = self.shell();
-        self.run_docker_exec(
-            &inner_program,
-            None,
-            &Default::default(),
-            &["-c", "echo $HOME"],
-        )
-        .await
-    }
-
-    async fn extract_server_binary(
-        &self,
-        dst_path: &RelPath,
-        tmp_path: &RelPath,
-        remote_dir_for_server: &str,
-        delegate: &Arc<dyn RemoteClientDelegate>,
-        cx: &mut AsyncApp,
-    ) -> Result<()> {
-        delegate.set_status(Some("Extracting remote development server"), cx);
-        let server_mode = 0o755;
-
-        let shell_kind = ShellKind::Posix;
-        let orig_tmp_path = tmp_path.display(self.path_style());
-        let server_mode = format!("{:o}", server_mode);
-        let server_mode = shell_kind
-            .try_quote(&server_mode)
-            .context("shell quoting")?;
-        let dst_path = dst_path.display(self.path_style());
-        let dst_path = shell_kind.try_quote(&dst_path).context("shell quoting")?;
-        let script = if let Some(tmp_path) = orig_tmp_path.strip_suffix(".gz") {
-            let orig_tmp_path = shell_kind
-                .try_quote(&orig_tmp_path)
-                .context("shell quoting")?;
-            let tmp_path = shell_kind.try_quote(&tmp_path).context("shell quoting")?;
-            format!(
-                "gunzip -f {orig_tmp_path} && chmod {server_mode} {tmp_path} && mv {tmp_path} {dst_path}",
-            )
-        } else {
-            let orig_tmp_path = shell_kind
-                .try_quote(&orig_tmp_path)
-                .context("shell quoting")?;
-            format!("chmod {server_mode} {orig_tmp_path} && mv {orig_tmp_path} {dst_path}",)
-        };
-        let args = shell_kind.args_for_shell(false, script.to_string());
-        self.run_docker_exec(
-            "sh",
-            Some(&remote_dir_for_server),
-            &Default::default(),
-            &args,
-        )
-        .await
-        .log_err();
-        Ok(())
-    }
-
-    async fn upload_local_server_binary(
-        &self,
-        src_path: &Path,
-        tmp_path_gz: &RelPath,
-        remote_dir_for_server: &str,
-        delegate: &Arc<dyn RemoteClientDelegate>,
-        cx: &mut AsyncApp,
-    ) -> Result<()> {
-        if let Some(parent) = tmp_path_gz.parent() {
-            self.run_docker_exec(
-                "mkdir",
-                Some(remote_dir_for_server),
-                &Default::default(),
-                &["-p", parent.display(self.path_style()).as_ref()],
-            )
-            .await?;
-        }
-
-        let src_stat = smol::fs::metadata(&src_path).await?;
-        let size = src_stat.len();
-
-        let t0 = Instant::now();
-        delegate.set_status(Some("Uploading remote development server"), cx);
-        log::info!(
-            "uploading remote development server to {:?} ({}kb)",
-            tmp_path_gz,
-            size / 1024
-        );
-        self.upload_file(src_path, tmp_path_gz, remote_dir_for_server)
-            .await
-            .context("failed to upload server binary")?;
-        log::info!("uploaded remote development server in {:?}", t0.elapsed());
-        Ok(())
-    }
-
-    async fn upload_file(
-        &self,
-        src_path: &Path,
-        dest_path: &RelPath,
-        remote_dir_for_server: &str,
-    ) -> Result<()> {
-        log::debug!("uploading file {:?} to {:?}", src_path, dest_path);
-
-        let src_path_display = src_path.display().to_string();
-        let dest_path_str = dest_path.display(self.path_style());
-
-        let mut command = util::command::new_smol_command("docker");
-        command.arg("cp");
-        command.arg("-a");
-        command.arg(&src_path_display);
-        command.arg(format!(
-            "{}:{}/{}",
-            &self.connection_options.container_id, remote_dir_for_server, dest_path_str
-        ));
-
-        let output = command.output().await?;
-
-        if output.status.success() {
-            return Ok(());
-        }
-
-        let stderr = String::from_utf8_lossy(&output.stderr);
-        log::debug!(
-            "failed to upload file via docker cp {src_path_display} -> {dest_path_str}: {stderr}",
-        );
-        anyhow::bail!(
-            "failed to upload file via docker cp {} -> {}: {}",
-            src_path_display,
-            dest_path_str,
-            stderr,
-        );
-    }
-
-    async fn run_docker_command(
-        &self,
-        subcommand: &str,
-        args: &[impl AsRef<str>],
-    ) -> Result<String> {
-        let mut command = util::command::new_smol_command("docker");
-        command.arg(subcommand);
-        for arg in args {
-            command.arg(arg.as_ref());
-        }
-        let output = command.output().await?;
-        anyhow::ensure!(
-            output.status.success(),
-            "failed to run command {command:?}: {}",
-            String::from_utf8_lossy(&output.stderr)
-        );
-        Ok(String::from_utf8_lossy(&output.stdout).to_string())
-    }
-
-    async fn run_docker_exec(
-        &self,
-        inner_program: &str,
-        working_directory: Option<&str>,
-        env: &HashMap<String, String>,
-        program_args: &[impl AsRef<str>],
-    ) -> Result<String> {
-        let mut args = match working_directory {
-            Some(dir) => vec!["-w".to_string(), dir.to_string()],
-            None => vec![],
-        };
-
-        for (k, v) in env.iter() {
-            args.push("-e".to_string());
-            let env_declaration = format!("{}={}", k, v);
-            args.push(env_declaration);
-        }
-
-        args.push(self.connection_options.container_id.clone());
-        args.push(inner_program.to_string());
-
-        for arg in program_args {
-            args.push(arg.as_ref().to_owned());
-        }
-        self.run_docker_command("exec", args.as_ref()).await
-    }
-
-    async fn download_binary_on_server(
-        &self,
-        url: &str,
-        tmp_path_gz: &RelPath,
-        remote_dir_for_server: &str,
-        delegate: &Arc<dyn RemoteClientDelegate>,
-        cx: &mut AsyncApp,
-    ) -> Result<()> {
-        if let Some(parent) = tmp_path_gz.parent() {
-            self.run_docker_exec(
-                "mkdir",
-                Some(remote_dir_for_server),
-                &Default::default(),
-                &["-p", parent.display(self.path_style()).as_ref()],
-            )
-            .await?;
-        }
-
-        delegate.set_status(Some("Downloading remote development server on host"), cx);
-
-        match self
-            .run_docker_exec(
-                "curl",
-                Some(remote_dir_for_server),
-                &Default::default(),
-                &[
-                    "-f",
-                    "-L",
-                    url,
-                    "-o",
-                    &tmp_path_gz.display(self.path_style()),
-                ],
-            )
-            .await
-        {
-            Ok(_) => {}
-            Err(e) => {
-                if self
-                    .run_docker_exec("which", None, &Default::default(), &["curl"])
-                    .await
-                    .is_ok()
-                {
-                    return Err(e);
-                }
-
-                log::info!("curl is not available, trying wget");
-                match self
-                    .run_docker_exec(
-                        "wget",
-                        Some(remote_dir_for_server),
-                        &Default::default(),
-                        &[url, "-O", &tmp_path_gz.display(self.path_style())],
-                    )
-                    .await
-                {
-                    Ok(_) => {}
-                    Err(e) => {
-                        if self
-                            .run_docker_exec("which", None, &Default::default(), &["wget"])
-                            .await
-                            .is_ok()
-                        {
-                            return Err(e);
-                        } else {
-                            anyhow::bail!("Neither curl nor wget is available");
-                        }
-                    }
-                }
-            }
-        }
-        Ok(())
-    }
-
-    fn kill_inner(&self) -> Result<()> {
-        if let Some(pid) = self.proxy_process.lock().take() {
-            if let Ok(_) = util::command::new_smol_command("kill")
-                .arg(pid.to_string())
-                .spawn()
-            {
-                Ok(())
-            } else {
-                Err(anyhow::anyhow!("Failed to kill process"))
-            }
-        } else {
-            Ok(())
-        }
-    }
-}
-
-#[async_trait(?Send)]
-impl RemoteConnection for DockerExecConnection {
-    fn has_wsl_interop(&self) -> bool {
-        false
-    }
-    fn start_proxy(
-        &self,
-        unique_identifier: String,
-        reconnect: bool,
-        incoming_tx: UnboundedSender<Envelope>,
-        outgoing_rx: UnboundedReceiver<Envelope>,
-        connection_activity_tx: Sender<()>,
-        delegate: Arc<dyn RemoteClientDelegate>,
-        cx: &mut AsyncApp,
-    ) -> Task<Result<i32>> {
-        // We'll try connecting anew every time we open a devcontainer, so proactively try to kill any old connections.
-        if !self.has_been_killed() {
-            if let Err(e) = self.kill_inner() {
-                return Task::ready(Err(e));
-            };
-        }
-
-        delegate.set_status(Some("Starting proxy"), cx);
-
-        let Some(remote_binary_relpath) = self.remote_binary_relpath.clone() else {
-            return Task::ready(Err(anyhow!("Remote binary path not set")));
-        };
-
-        let mut docker_args = vec![
-            "exec".to_string(),
-            "-w".to_string(),
-            self.remote_dir_for_server.clone(),
-            "-i".to_string(),
-            self.connection_options.container_id.to_string(),
-        ];
-        for env_var in ["RUST_LOG", "RUST_BACKTRACE", "ZED_GENERATE_MINIDUMPS"] {
-            if let Some(value) = std::env::var(env_var).ok() {
-                docker_args.push("-e".to_string());
-                docker_args.push(format!("{}='{}'", env_var, value));
-            }
-        }
-        let val = remote_binary_relpath
-            .display(self.path_style())
-            .into_owned();
-        docker_args.push(val);
-        docker_args.push("proxy".to_string());
-        docker_args.push("--identifier".to_string());
-        docker_args.push(unique_identifier);
-        if reconnect {
-            docker_args.push("--reconnect".to_string());
-        }
-        let mut command = util::command::new_smol_command("docker");
-        command
-            .kill_on_drop(true)
-            .stdin(Stdio::piped())
-            .stdout(Stdio::piped())
-            .stderr(Stdio::piped())
-            .args(docker_args);
-
-        let Ok(child) = command.spawn() else {
-            return Task::ready(Err(anyhow::anyhow!(
-                "Failed to start remote server process"
-            )));
-        };
-
-        let mut proxy_process = self.proxy_process.lock();
-        *proxy_process = Some(child.id());
-
-        super::handle_rpc_messages_over_child_process_stdio(
-            child,
-            incoming_tx,
-            outgoing_rx,
-            connection_activity_tx,
-            cx,
-        )
-    }
-
-    fn upload_directory(
-        &self,
-        src_path: PathBuf,
-        dest_path: RemotePathBuf,
-        cx: &App,
-    ) -> Task<Result<()>> {
-        let dest_path_str = dest_path.to_string();
-        let src_path_display = src_path.display().to_string();
-
-        let mut command = util::command::new_smol_command("docker");
-        command.arg("cp");
-        command.arg("-a"); // Archive mode is required to assign the file ownership to the default docker exec user
-        command.arg(src_path_display);
-        command.arg(format!(
-            "{}:{}",
-            self.connection_options.container_id, dest_path_str
-        ));
-
-        cx.background_spawn(async move {
-            let output = command.output().await?;
-
-            if output.status.success() {
-                Ok(())
-            } else {
-                Err(anyhow::anyhow!("Failed to upload directory"))
-            }
-        })
-    }
-
-    async fn kill(&self) -> Result<()> {
-        self.kill_inner()
-    }
-
-    fn has_been_killed(&self) -> bool {
-        self.proxy_process.lock().is_none()
-    }
-
-    fn build_command(
-        &self,
-        program: Option<String>,
-        args: &[String],
-        env: &HashMap<String, String>,
-        working_dir: Option<String>,
-        _port_forward: Option<(u16, String, u16)>,
-    ) -> Result<CommandTemplate> {
-        let mut parsed_working_dir = None;
-
-        let path_style = self.path_style();
-
-        if let Some(working_dir) = working_dir {
-            let working_dir = RemotePathBuf::new(working_dir, path_style).to_string();
-
-            const TILDE_PREFIX: &'static str = "~/";
-            if working_dir.starts_with(TILDE_PREFIX) {
-                let working_dir = working_dir.trim_start_matches("~").trim_start_matches("/");
-                parsed_working_dir = Some(format!("$HOME/{working_dir}"));
-            } else {
-                parsed_working_dir = Some(working_dir);
-            }
-        }
-
-        let mut inner_program = Vec::new();
-
-        if let Some(program) = program {
-            inner_program.push(program);
-            for arg in args {
-                inner_program.push(arg.clone());
-            }
-        } else {
-            inner_program.push(self.shell());
-            inner_program.push("-l".to_string());
-        };
-
-        let mut docker_args = vec!["exec".to_string()];
-
-        if let Some(parsed_working_dir) = parsed_working_dir {
-            docker_args.push("-w".to_string());
-            docker_args.push(parsed_working_dir);
-        }
-
-        for (k, v) in env.iter() {
-            docker_args.push("-e".to_string());
-            docker_args.push(format!("{}={}", k, v));
-        }
-
-        docker_args.push("-it".to_string());
-        docker_args.push(self.connection_options.container_id.to_string());
-
-        docker_args.append(&mut inner_program);
-
-        Ok(CommandTemplate {
-            program: "docker".to_string(),
-            args: docker_args,
-            // Docker-exec pipes in environment via the "-e" argument
-            env: Default::default(),
-        })
-    }
-
-    fn build_forward_ports_command(
-        &self,
-        _forwards: Vec<(u16, String, u16)>,
-    ) -> Result<CommandTemplate> {
-        Err(anyhow::anyhow!("Not currently supported for docker_exec"))
-    }
-
-    fn connection_options(&self) -> RemoteConnectionOptions {
-        RemoteConnectionOptions::Docker(self.connection_options.clone())
-    }
-
-    fn path_style(&self) -> PathStyle {
-        self.path_style.unwrap_or(PathStyle::Posix)
-    }
-
-    fn shell(&self) -> String {
-        match &self.shell {
-            Some(shell) => shell.clone(),
-            None => self.default_system_shell(),
-        }
-    }
-
-    fn default_system_shell(&self) -> String {
-        String::from("/bin/sh")
-    }
-}
diff --git a/crates/remote/src/transport/ssh.rs b/crates/remote/src/transport/ssh.rs
deleted file mode 100644
index 9412549f20..0000000000
--- a/crates/remote/src/transport/ssh.rs
+++ /dev/null
@@ -1,1501 +0,0 @@
-use crate::{
-    RemoteClientDelegate, RemotePlatform,
-    remote_client::{CommandTemplate, RemoteConnection, RemoteConnectionOptions},
-    transport::{parse_platform, parse_shell},
-};
-use anyhow::{Context as _, Result, anyhow};
-use async_trait::async_trait;
-use collections::HashMap;
-use futures::{
-    AsyncReadExt as _, FutureExt as _,
-    channel::mpsc::{Sender, UnboundedReceiver, UnboundedSender},
-    select_biased,
-};
-use gpui::{App, AppContext as _, AsyncApp, Task};
-use parking_lot::Mutex;
-use paths::remote_server_dir_relative;
-use release_channel::{AppVersion, ReleaseChannel};
-use rpc::proto::Envelope;
-use semver::Version;
-pub use settings::SshPortForwardOption;
-use smol::{
-    fs,
-    process::{self, Child, Stdio},
-};
-use std::{
-    path::{Path, PathBuf},
-    sync::Arc,
-    time::Instant,
-};
-use tempfile::TempDir;
-use util::{
-    paths::{PathStyle, RemotePathBuf},
-    rel_path::RelPath,
-    shell::{Shell, ShellKind},
-    shell_builder::ShellBuilder,
-};
-
-pub(crate) struct SshRemoteConnection {
-    socket: SshSocket,
-    master_process: Mutex<Option<MasterProcess>>,
-    remote_binary_path: Option<Arc<RelPath>>,
-    ssh_platform: RemotePlatform,
-    ssh_path_style: PathStyle,
-    ssh_shell: String,
-    ssh_shell_kind: ShellKind,
-    ssh_default_system_shell: String,
-    _temp_dir: TempDir,
-}
-
-#[derive(Debug, Default, Clone, PartialEq, Eq, Hash)]
-pub struct SshConnectionOptions {
-    pub host: String,
-    pub username: Option<String>,
-    pub port: Option<u16>,
-    pub password: Option<String>,
-    pub args: Option<Vec<String>>,
-    pub port_forwards: Option<Vec<SshPortForwardOption>>,
-
-    pub nickname: Option<String>,
-    pub upload_binary_over_ssh: bool,
-}
-
-impl From<settings::SshConnection> for SshConnectionOptions {
-    fn from(val: settings::SshConnection) -> Self {
-        SshConnectionOptions {
-            host: val.host.into(),
-            username: val.username,
-            port: val.port,
-            password: None,
-            args: Some(val.args),
-            nickname: val.nickname,
-            upload_binary_over_ssh: val.upload_binary_over_ssh.unwrap_or_default(),
-            port_forwards: val.port_forwards,
-        }
-    }
-}
-
-struct SshSocket {
-    connection_options: SshConnectionOptions,
-    #[cfg(not(target_os = "windows"))]
-    socket_path: std::path::PathBuf,
-    envs: HashMap<String, String>,
-    #[cfg(target_os = "windows")]
-    _proxy: askpass::PasswordProxy,
-}
-
-struct MasterProcess {
-    process: Child,
-}
-
-#[cfg(not(target_os = "windows"))]
-impl MasterProcess {
-    pub fn new(
-        askpass_script_path: &std::ffi::OsStr,
-        additional_args: Vec<String>,
-        socket_path: &std::path::Path,
-        url: &str,
-    ) -> Result<Self> {
-        let args = [
-            "-N",
-            "-o",
-            "ControlPersist=no",
-            "-o",
-            "ControlMaster=yes",
-            "-o",
-        ];
-
-        let mut master_process = util::command::new_smol_command("ssh");
-        master_process
-            .kill_on_drop(true)
-            .stdin(Stdio::null())
-            .stdout(Stdio::piped())
-            .stderr(Stdio::piped())
-            .env("SSH_ASKPASS_REQUIRE", "force")
-            .env("SSH_ASKPASS", askpass_script_path)
-            .args(additional_args)
-            .args(args);
-
-        master_process.arg(format!("ControlPath={}", socket_path.display()));
-
-        let process = master_process.arg(&url).spawn()?;
-
-        Ok(MasterProcess { process })
-    }
-
-    pub async fn wait_connected(&mut self) -> Result<()> {
-        let Some(mut stdout) = self.process.stdout.take() else {
-            anyhow::bail!("ssh process stdout capture failed");
-        };
-
-        let mut output = Vec::new();
-        stdout.read_to_end(&mut output).await?;
-        Ok(())
-    }
-}
-
-#[cfg(target_os = "windows")]
-impl MasterProcess {
-    const CONNECTION_ESTABLISHED_MAGIC: &str = "ZED_SSH_CONNECTION_ESTABLISHED";
-
-    pub fn new(
-        askpass_script_path: &std::ffi::OsStr,
-        additional_args: Vec<String>,
-        url: &str,
-    ) -> Result<Self> {
-        // On Windows, `ControlMaster` and `ControlPath` are not supported:
-        // https://github.com/PowerShell/Win32-OpenSSH/issues/405
-        // https://github.com/PowerShell/Win32-OpenSSH/wiki/Project-Scope
-        //
-        // Using an ugly workaround to detect connection establishment
-        // -N doesn't work with JumpHosts as windows openssh never closes stdin in that case
-        let args = [
-            "-t",
-            &format!("echo '{}'; exec $0", Self::CONNECTION_ESTABLISHED_MAGIC),
-        ];
-
-        let mut master_process = util::command::new_smol_command("ssh");
-        master_process
-            .kill_on_drop(true)
-            .stdin(Stdio::null())
-            .stdout(Stdio::piped())
-            .stderr(Stdio::piped())
-            .env("SSH_ASKPASS_REQUIRE", "force")
-            .env("SSH_ASKPASS", askpass_script_path)
-            .args(additional_args)
-            .arg(url)
-            .args(args);
-
-        let process = master_process.spawn()?;
-
-        Ok(MasterProcess { process })
-    }
-
-    pub async fn wait_connected(&mut self) -> Result<()> {
-        use smol::io::AsyncBufReadExt;
-
-        let Some(stdout) = self.process.stdout.take() else {
-            anyhow::bail!("ssh process stdout capture failed");
-        };
-
-        let mut reader = smol::io::BufReader::new(stdout);
-
-        let mut line = String::new();
-
-        loop {
-            let n = reader.read_line(&mut line).await?;
-            if n == 0 {
-                anyhow::bail!("ssh process exited before connection established");
-            }
-
-            if line.contains(Self::CONNECTION_ESTABLISHED_MAGIC) {
-                return Ok(());
-            }
-        }
-    }
-}
-
-impl AsRef<Child> for MasterProcess {
-    fn as_ref(&self) -> &Child {
-        &self.process
-    }
-}
-
-impl AsMut<Child> for MasterProcess {
-    fn as_mut(&mut self) -> &mut Child {
-        &mut self.process
-    }
-}
-
-#[async_trait(?Send)]
-impl RemoteConnection for SshRemoteConnection {
-    async fn kill(&self) -> Result<()> {
-        let Some(mut process) = self.master_process.lock().take() else {
-            return Ok(());
-        };
-        process.as_mut().kill().ok();
-        process.as_mut().status().await?;
-        Ok(())
-    }
-
-    fn has_been_killed(&self) -> bool {
-        self.master_process.lock().is_none()
-    }
-
-    fn connection_options(&self) -> RemoteConnectionOptions {
-        RemoteConnectionOptions::Ssh(self.socket.connection_options.clone())
-    }
-
-    fn shell(&self) -> String {
-        self.ssh_shell.clone()
-    }
-
-    fn default_system_shell(&self) -> String {
-        self.ssh_default_system_shell.clone()
-    }
-
-    fn build_command(
-        &self,
-        input_program: Option<String>,
-        input_args: &[String],
-        input_env: &HashMap<String, String>,
-        working_dir: Option<String>,
-        port_forward: Option<(u16, String, u16)>,
-    ) -> Result<CommandTemplate> {
-        let Self {
-            ssh_path_style,
-            socket,
-            ssh_shell_kind,
-            ssh_shell,
-            ..
-        } = self;
-        let env = socket.envs.clone();
-        build_command(
-            input_program,
-            input_args,
-            input_env,
-            working_dir,
-            port_forward,
-            env,
-            *ssh_path_style,
-            ssh_shell,
-            *ssh_shell_kind,
-            socket.ssh_args(),
-        )
-    }
-
-    fn build_forward_ports_command(
-        &self,
-        forwards: Vec<(u16, String, u16)>,
-    ) -> Result<CommandTemplate> {
-        let Self { socket, .. } = self;
-        let mut args = socket.ssh_args();
-        args.push("-N".into());
-        for (local_port, host, remote_port) in forwards {
-            args.push("-L".into());
-            args.push(format!("{local_port}:{host}:{remote_port}"));
-        }
-        Ok(CommandTemplate {
-            program: "ssh".into(),
-            args,
-            env: Default::default(),
-        })
-    }
-
-    fn upload_directory(
-        &self,
-        src_path: PathBuf,
-        dest_path: RemotePathBuf,
-        cx: &App,
-    ) -> Task<Result<()>> {
-        let dest_path_str = dest_path.to_string();
-        let src_path_display = src_path.display().to_string();
-
-        let mut sftp_command = self.build_sftp_command();
-        let mut scp_command =
-            self.build_scp_command(&src_path, &dest_path_str, Some(&["-C", "-r"]));
-
-        cx.background_spawn(async move {
-            // We will try SFTP first, and if that fails, we will fall back to SCP.
-            // If SCP fails also, we give up and return an error.
-            // The reason we allow a fallback from SFTP to SCP is that if the user has to specify a password,
-            // depending on the implementation of SSH stack, SFTP may disable interactive password prompts in batch mode.
-            // This is for example the case on Windows as evidenced by this implementation snippet:
-            // https://github.com/PowerShell/openssh-portable/blob/b8c08ef9da9450a94a9c5ef717d96a7bd83f3332/sshconnect2.c#L417
-            if Self::is_sftp_available().await {
-                log::debug!("using SFTP for directory upload");
-                let mut child = sftp_command.spawn()?;
-                if let Some(mut stdin) = child.stdin.take() {
-                    use futures::AsyncWriteExt;
-                    let sftp_batch = format!("put -r \"{src_path_display}\" \"{dest_path_str}\"\n");
-                    stdin.write_all(sftp_batch.as_bytes()).await?;
-                    stdin.flush().await?;
-                }
-
-                let output = child.output().await?;
-                if output.status.success() {
-                    return Ok(());
-                }
-
-                let stderr = String::from_utf8_lossy(&output.stderr);
-                log::debug!("failed to upload directory via SFTP {src_path_display} -> {dest_path_str}: {stderr}");
-            }
-
-            log::debug!("using SCP for directory upload");
-            let output = scp_command.output().await?;
-
-            if output.status.success() {
-                return Ok(());
-            }
-
-            let stderr = String::from_utf8_lossy(&output.stderr);
-            log::debug!("failed to upload directory via SCP {src_path_display} -> {dest_path_str}: {stderr}");
-
-            anyhow::bail!(
-                "failed to upload directory via SFTP/SCP {} -> {}: {}",
-                src_path_display,
-                dest_path_str,
-                stderr,
-            );
-        })
-    }
-
-    fn start_proxy(
-        &self,
-        unique_identifier: String,
-        reconnect: bool,
-        incoming_tx: UnboundedSender<Envelope>,
-        outgoing_rx: UnboundedReceiver<Envelope>,
-        connection_activity_tx: Sender<()>,
-        delegate: Arc<dyn RemoteClientDelegate>,
-        cx: &mut AsyncApp,
-    ) -> Task<Result<i32>> {
-        delegate.set_status(Some("Starting proxy"), cx);
-
-        let Some(remote_binary_path) = self.remote_binary_path.clone() else {
-            return Task::ready(Err(anyhow!("Remote binary path not set")));
-        };
-
-        let mut proxy_args = vec![];
-        for env_var in ["RUST_LOG", "RUST_BACKTRACE", "ZED_GENERATE_MINIDUMPS"] {
-            if let Some(value) = std::env::var(env_var).ok() {
-                proxy_args.push(format!("{}='{}'", env_var, value));
-            }
-        }
-        proxy_args.push(remote_binary_path.display(self.path_style()).into_owned());
-        proxy_args.push("proxy".to_owned());
-        proxy_args.push("--identifier".to_owned());
-        proxy_args.push(unique_identifier);
-
-        if reconnect {
-            proxy_args.push("--reconnect".to_owned());
-        }
-
-        let ssh_proxy_process = match self
-            .socket
-            .ssh_command(self.ssh_shell_kind, "env", &proxy_args, false)
-            // IMPORTANT: we kill this process when we drop the task that uses it.
-            .kill_on_drop(true)
-            .spawn()
-        {
-            Ok(process) => process,
-            Err(error) => {
-                return Task::ready(Err(anyhow!("failed to spawn remote server: {}", error)));
-            }
-        };
-
-        super::handle_rpc_messages_over_child_process_stdio(
-            ssh_proxy_process,
-            incoming_tx,
-            outgoing_rx,
-            connection_activity_tx,
-            cx,
-        )
-    }
-
-    fn path_style(&self) -> PathStyle {
-        self.ssh_path_style
-    }
-
-    fn has_wsl_interop(&self) -> bool {
-        false
-    }
-}
-
-impl SshRemoteConnection {
-    pub(crate) async fn new(
-        connection_options: SshConnectionOptions,
-        delegate: Arc<dyn RemoteClientDelegate>,
-        cx: &mut AsyncApp,
-    ) -> Result<Self> {
-        use askpass::AskPassResult;
-
-        let url = connection_options.ssh_url();
-
-        let temp_dir = tempfile::Builder::new()
-            .prefix("zed-ssh-session")
-            .tempdir()?;
-        let askpass_delegate = askpass::AskPassDelegate::new(cx, {
-            let delegate = delegate.clone();
-            move |prompt, tx, cx| delegate.ask_password(prompt, tx, cx)
-        });
-
-        let mut askpass =
-            askpass::AskPassSession::new(cx.background_executor(), askpass_delegate).await?;
-
-        delegate.set_status(Some("Connecting"), cx);
-
-        // Start the master SSH process, which does not do anything except for establish
-        // the connection and keep it open, allowing other ssh commands to reuse it
-        // via a control socket.
-        #[cfg(not(target_os = "windows"))]
-        let socket_path = temp_dir.path().join("ssh.sock");
-
-        #[cfg(target_os = "windows")]
-        let mut master_process = MasterProcess::new(
-            askpass.script_path().as_ref(),
-            connection_options.additional_args(),
-            &url,
-        )?;
-        #[cfg(not(target_os = "windows"))]
-        let mut master_process = MasterProcess::new(
-            askpass.script_path().as_ref(),
-            connection_options.additional_args(),
-            &socket_path,
-            &url,
-        )?;
-
-        let result = select_biased! {
-            result = askpass.run().fuse() => {
-                match result {
-                    AskPassResult::CancelledByUser => {
-                        master_process.as_mut().kill().ok();
-                        anyhow::bail!("SSH connection canceled")
-                    }
-                    AskPassResult::Timedout => {
-                        anyhow::bail!("connecting to host timed out")
-                    }
-                }
-            }
-            _ = master_process.wait_connected().fuse() => {
-                anyhow::Ok(())
-            }
-        };
-
-        if let Err(e) = result {
-            return Err(e.context("Failed to connect to host"));
-        }
-
-        if master_process.as_mut().try_status()?.is_some() {
-            let mut output = Vec::new();
-            output.clear();
-            let mut stderr = master_process.as_mut().stderr.take().unwrap();
-            stderr.read_to_end(&mut output).await?;
-
-            let error_message = format!(
-                "failed to connect: {}",
-                String::from_utf8_lossy(&output).trim()
-            );
-            anyhow::bail!(error_message);
-        }
-
-        #[cfg(not(target_os = "windows"))]
-        let socket = SshSocket::new(connection_options, socket_path).await?;
-        #[cfg(target_os = "windows")]
-        let socket = SshSocket::new(
-            connection_options,
-            askpass
-                .get_password()
-                .or_else(|| askpass::EncryptedPassword::try_from("").ok())
-                .context("Failed to fetch askpass password")?,
-            cx.background_executor().clone(),
-        )
-        .await?;
-        drop(askpass);
-
-        let ssh_shell = socket.shell().await;
-        log::info!("Remote shell discovered: {}", ssh_shell);
-        let ssh_platform = socket.platform(ShellKind::new(&ssh_shell, false)).await?;
-        log::info!("Remote platform discovered: {:?}", ssh_platform);
-        let ssh_path_style = match ssh_platform.os {
-            "windows" => PathStyle::Windows,
-            _ => PathStyle::Posix,
-        };
-        let ssh_default_system_shell = String::from("/bin/sh");
-        let ssh_shell_kind = ShellKind::new(
-            &ssh_shell,
-            match ssh_platform.os {
-                "windows" => true,
-                _ => false,
-            },
-        );
-
-        let mut this = Self {
-            socket,
-            master_process: Mutex::new(Some(master_process)),
-            _temp_dir: temp_dir,
-            remote_binary_path: None,
-            ssh_path_style,
-            ssh_platform,
-            ssh_shell,
-            ssh_shell_kind,
-            ssh_default_system_shell,
-        };
-
-        let (release_channel, version) =
-            cx.update(|cx| (ReleaseChannel::global(cx), AppVersion::global(cx)))?;
-        this.remote_binary_path = Some(
-            this.ensure_server_binary(&delegate, release_channel, version, cx)
-                .await?,
-        );
-
-        Ok(this)
-    }
-
-    async fn ensure_server_binary(
-        &self,
-        delegate: &Arc<dyn RemoteClientDelegate>,
-        release_channel: ReleaseChannel,
-        version: Version,
-        cx: &mut AsyncApp,
-    ) -> Result<Arc<RelPath>> {
-        let version_str = match release_channel {
-            ReleaseChannel::Dev => "build".to_string(),
-            _ => version.to_string(),
-        };
-        let binary_name = format!(
-            "zed-remote-server-{}-{}",
-            release_channel.dev_name(),
-            version_str
-        );
-        let dst_path =
-            paths::remote_server_dir_relative().join(RelPath::unix(&binary_name).unwrap());
-
-        #[cfg(debug_assertions)]
-        if let Some(remote_server_path) =
-            super::build_remote_server_from_source(&self.ssh_platform, delegate.as_ref(), cx)
-                .await?
-        {
-            let tmp_path = paths::remote_server_dir_relative().join(
-                RelPath::unix(&format!(
-                    "download-{}-{}",
-                    std::process::id(),
-                    remote_server_path.file_name().unwrap().to_string_lossy()
-                ))
-                .unwrap(),
-            );
-            self.upload_local_server_binary(&remote_server_path, &tmp_path, delegate, cx)
-                .await?;
-            self.extract_server_binary(&dst_path, &tmp_path, delegate, cx)
-                .await?;
-            return Ok(dst_path);
-        }
-
-        if self
-            .socket
-            .run_command(
-                self.ssh_shell_kind,
-                &dst_path.display(self.path_style()),
-                &["version"],
-                true,
-            )
-            .await
-            .is_ok()
-        {
-            return Ok(dst_path);
-        }
-
-        let wanted_version = cx.update(|cx| match release_channel {
-            ReleaseChannel::Nightly => Ok(None),
-            ReleaseChannel::Dev => {
-                anyhow::bail!(
-                    "ZED_BUILD_REMOTE_SERVER is not set and no remote server exists at ({:?})",
-                    dst_path
-                )
-            }
-            _ => Ok(Some(AppVersion::global(cx))),
-        })??;
-
-        let tmp_path_gz = remote_server_dir_relative().join(
-            RelPath::unix(&format!(
-                "{}-download-{}.gz",
-                binary_name,
-                std::process::id()
-            ))
-            .unwrap(),
-        );
-        if !self.socket.connection_options.upload_binary_over_ssh
-            && let Some(url) = delegate
-                .get_download_url(
-                    self.ssh_platform,
-                    release_channel,
-                    wanted_version.clone(),
-                    cx,
-                )
-                .await?
-        {
-            match self
-                .download_binary_on_server(&url, &tmp_path_gz, delegate, cx)
-                .await
-            {
-                Ok(_) => {
-                    self.extract_server_binary(&dst_path, &tmp_path_gz, delegate, cx)
-                        .await
-                        .context("extracting server binary")?;
-                    return Ok(dst_path);
-                }
-                Err(e) => {
-                    log::error!(
-                        "Failed to download binary on server, attempting to download locally and then upload it the server: {e:#}",
-                    )
-                }
-            }
-        }
-
-        let src_path = delegate
-            .download_server_binary_locally(
-                self.ssh_platform,
-                release_channel,
-                wanted_version.clone(),
-                cx,
-            )
-            .await
-            .context("downloading server binary locally")?;
-        self.upload_local_server_binary(&src_path, &tmp_path_gz, delegate, cx)
-            .await
-            .context("uploading server binary")?;
-        self.extract_server_binary(&dst_path, &tmp_path_gz, delegate, cx)
-            .await
-            .context("extracting server binary")?;
-        Ok(dst_path)
-    }
-
-    async fn download_binary_on_server(
-        &self,
-        url: &str,
-        tmp_path_gz: &RelPath,
-        delegate: &Arc<dyn RemoteClientDelegate>,
-        cx: &mut AsyncApp,
-    ) -> Result<()> {
-        if let Some(parent) = tmp_path_gz.parent() {
-            self.socket
-                .run_command(
-                    self.ssh_shell_kind,
-                    "mkdir",
-                    &["-p", parent.display(self.path_style()).as_ref()],
-                    true,
-                )
-                .await?;
-        }
-
-        delegate.set_status(Some("Downloading remote development server on host"), cx);
-
-        const CONNECT_TIMEOUT_SECS: &str = "10";
-
-        match self
-            .socket
-            .run_command(
-                self.ssh_shell_kind,
-                "curl",
-                &[
-                    "-f",
-                    "-L",
-                    "--connect-timeout",
-                    CONNECT_TIMEOUT_SECS,
-                    url,
-                    "-o",
-                    &tmp_path_gz.display(self.path_style()),
-                ],
-                true,
-            )
-            .await
-        {
-            Ok(_) => {}
-            Err(e) => {
-                if self
-                    .socket
-                    .run_command(self.ssh_shell_kind, "which", &["curl"], true)
-                    .await
-                    .is_ok()
-                {
-                    return Err(e);
-                }
-
-                log::info!("curl is not available, trying wget");
-                match self
-                    .socket
-                    .run_command(
-                        self.ssh_shell_kind,
-                        "wget",
-                        &[
-                            "--connect-timeout",
-                            CONNECT_TIMEOUT_SECS,
-                            "--tries",
-                            "1",
-                            url,
-                            "-O",
-                            &tmp_path_gz.display(self.path_style()),
-                        ],
-                        true,
-                    )
-                    .await
-                {
-                    Ok(_) => {}
-                    Err(e) => {
-                        if self
-                            .socket
-                            .run_command(self.ssh_shell_kind, "which", &["wget"], true)
-                            .await
-                            .is_ok()
-                        {
-                            return Err(e);
-                        } else {
-                            anyhow::bail!("Neither curl nor wget is available");
-                        }
-                    }
-                }
-            }
-        }
-
-        Ok(())
-    }
-
-    async fn upload_local_server_binary(
-        &self,
-        src_path: &Path,
-        tmp_path_gz: &RelPath,
-        delegate: &Arc<dyn RemoteClientDelegate>,
-        cx: &mut AsyncApp,
-    ) -> Result<()> {
-        if let Some(parent) = tmp_path_gz.parent() {
-            self.socket
-                .run_command(
-                    self.ssh_shell_kind,
-                    "mkdir",
-                    &["-p", parent.display(self.path_style()).as_ref()],
-                    true,
-                )
-                .await?;
-        }
-
-        let src_stat = fs::metadata(&src_path).await?;
-        let size = src_stat.len();
-
-        let t0 = Instant::now();
-        delegate.set_status(Some("Uploading remote development server"), cx);
-        log::info!(
-            "uploading remote development server to {:?} ({}kb)",
-            tmp_path_gz,
-            size / 1024
-        );
-        self.upload_file(src_path, tmp_path_gz)
-            .await
-            .context("failed to upload server binary")?;
-        log::info!("uploaded remote development server in {:?}", t0.elapsed());
-        Ok(())
-    }
-
-    async fn extract_server_binary(
-        &self,
-        dst_path: &RelPath,
-        tmp_path: &RelPath,
-        delegate: &Arc<dyn RemoteClientDelegate>,
-        cx: &mut AsyncApp,
-    ) -> Result<()> {
-        delegate.set_status(Some("Extracting remote development server"), cx);
-        let server_mode = 0o755;
-
-        let shell_kind = ShellKind::Posix;
-        let orig_tmp_path = tmp_path.display(self.path_style());
-        let server_mode = format!("{:o}", server_mode);
-        let server_mode = shell_kind
-            .try_quote(&server_mode)
-            .context("shell quoting")?;
-        let dst_path = dst_path.display(self.path_style());
-        let dst_path = shell_kind.try_quote(&dst_path).context("shell quoting")?;
-        let script = if let Some(tmp_path) = orig_tmp_path.strip_suffix(".gz") {
-            let orig_tmp_path = shell_kind
-                .try_quote(&orig_tmp_path)
-                .context("shell quoting")?;
-            let tmp_path = shell_kind.try_quote(&tmp_path).context("shell quoting")?;
-            format!(
-                "gunzip -f {orig_tmp_path} && chmod {server_mode} {tmp_path} && mv {tmp_path} {dst_path}",
-            )
-        } else {
-            let orig_tmp_path = shell_kind
-                .try_quote(&orig_tmp_path)
-                .context("shell quoting")?;
-            format!("chmod {server_mode} {orig_tmp_path} && mv {orig_tmp_path} {dst_path}",)
-        };
-        let args = shell_kind.args_for_shell(false, script.to_string());
-        self.socket
-            .run_command(shell_kind, "sh", &args, true)
-            .await?;
-        Ok(())
-    }
-
-    fn build_scp_command(
-        &self,
-        src_path: &Path,
-        dest_path_str: &str,
-        args: Option<&[&str]>,
-    ) -> process::Command {
-        let mut command = util::command::new_smol_command("scp");
-        self.socket.ssh_options(&mut command, false).args(
-            self.socket
-                .connection_options
-                .port
-                .map(|port| vec!["-P".to_string(), port.to_string()])
-                .unwrap_or_default(),
-        );
-        if let Some(args) = args {
-            command.args(args);
-        }
-        command.arg(src_path).arg(format!(
-            "{}:{}",
-            self.socket.connection_options.scp_url(),
-            dest_path_str
-        ));
-        command
-    }
-
-    fn build_sftp_command(&self) -> process::Command {
-        let mut command = util::command::new_smol_command("sftp");
-        self.socket.ssh_options(&mut command, false).args(
-            self.socket
-                .connection_options
-                .port
-                .map(|port| vec!["-P".to_string(), port.to_string()])
-                .unwrap_or_default(),
-        );
-        command.arg("-b").arg("-");
-        command.arg(self.socket.connection_options.scp_url());
-        command.stdin(Stdio::piped());
-        command
-    }
-
-    async fn upload_file(&self, src_path: &Path, dest_path: &RelPath) -> Result<()> {
-        log::debug!("uploading file {:?} to {:?}", src_path, dest_path);
-
-        let src_path_display = src_path.display().to_string();
-        let dest_path_str = dest_path.display(self.path_style());
-
-        // We will try SFTP first, and if that fails, we will fall back to SCP.
-        // If SCP fails also, we give up and return an error.
-        // The reason we allow a fallback from SFTP to SCP is that if the user has to specify a password,
-        // depending on the implementation of SSH stack, SFTP may disable interactive password prompts in batch mode.
-        // This is for example the case on Windows as evidenced by this implementation snippet:
-        // https://github.com/PowerShell/openssh-portable/blob/b8c08ef9da9450a94a9c5ef717d96a7bd83f3332/sshconnect2.c#L417
-        if Self::is_sftp_available().await {
-            log::debug!("using SFTP for file upload");
-            let mut command = self.build_sftp_command();
-            let sftp_batch = format!("put {src_path_display} {dest_path_str}\n");
-
-            let mut child = command.spawn()?;
-            if let Some(mut stdin) = child.stdin.take() {
-                use futures::AsyncWriteExt;
-                stdin.write_all(sftp_batch.as_bytes()).await?;
-                stdin.flush().await?;
-            }
-
-            let output = child.output().await?;
-            if output.status.success() {
-                return Ok(());
-            }
-
-            let stderr = String::from_utf8_lossy(&output.stderr);
-            log::debug!(
-                "failed to upload file via SFTP {src_path_display} -> {dest_path_str}: {stderr}"
-            );
-        }
-
-        log::debug!("using SCP for file upload");
-        let mut command = self.build_scp_command(src_path, &dest_path_str, None);
-        let output = command.output().await?;
-
-        if output.status.success() {
-            return Ok(());
-        }
-
-        let stderr = String::from_utf8_lossy(&output.stderr);
-        log::debug!(
-            "failed to upload file via SCP {src_path_display} -> {dest_path_str}: {stderr}",
-        );
-        anyhow::bail!(
-            "failed to upload file via STFP/SCP {} -> {}: {}",
-            src_path_display,
-            dest_path_str,
-            stderr,
-        );
-    }
-
-    async fn is_sftp_available() -> bool {
-        which::which("sftp").is_ok()
-    }
-}
-
-impl SshSocket {
-    #[cfg(not(target_os = "windows"))]
-    async fn new(options: SshConnectionOptions, socket_path: PathBuf) -> Result<Self> {
-        Ok(Self {
-            connection_options: options,
-            envs: HashMap::default(),
-            socket_path,
-        })
-    }
-
-    #[cfg(target_os = "windows")]
-    async fn new(
-        options: SshConnectionOptions,
-        password: askpass::EncryptedPassword,
-        executor: gpui::BackgroundExecutor,
-    ) -> Result<Self> {
-        let mut envs = HashMap::default();
-        let get_password =
-            move |_| Task::ready(std::ops::ControlFlow::Continue(Ok(password.clone())));
-
-        let _proxy = askpass::PasswordProxy::new(get_password, executor).await?;
-        envs.insert("SSH_ASKPASS_REQUIRE".into(), "force".into());
-        envs.insert(
-            "SSH_ASKPASS".into(),
-            _proxy.script_path().as_ref().display().to_string(),
-        );
-
-        Ok(Self {
-            connection_options: options,
-            envs,
-            _proxy,
-        })
-    }
-
-    // :WARNING: ssh unquotes arguments when executing on the remote :WARNING:
-    // e.g. $ ssh host sh -c 'ls -l' is equivalent to $ ssh host sh -c ls -l
-    // and passes -l as an argument to sh, not to ls.
-    // Furthermore, some setups (e.g. Coder) will change directory when SSH'ing
-    // into a machine. You must use `cd` to get back to $HOME.
-    // You need to do it like this: $ ssh host "cd; sh -c 'ls -l /tmp'"
-    fn ssh_command(
-        &self,
-        shell_kind: ShellKind,
-        program: &str,
-        args: &[impl AsRef<str>],
-        allow_pseudo_tty: bool,
-    ) -> process::Command {
-        let mut command = util::command::new_smol_command("ssh");
-        let program = shell_kind.prepend_command_prefix(program);
-        let mut to_run = shell_kind
-            .try_quote_prefix_aware(&program)
-            .expect("shell quoting")
-            .into_owned();
-        for arg in args {
-            // We're trying to work with: sh, bash, zsh, fish, tcsh, ...?
-            debug_assert!(
-                !arg.as_ref().contains('\n'),
-                "multiline arguments do not work in all shells"
-            );
-            to_run.push(' ');
-            to_run.push_str(&shell_kind.try_quote(arg.as_ref()).expect("shell quoting"));
-        }
-        let separator = shell_kind.sequential_commands_separator();
-        let to_run = format!("cd{separator} {to_run}");
-        self.ssh_options(&mut command, true)
-            .arg(self.connection_options.ssh_url());
-        if !allow_pseudo_tty {
-            command.arg("-T");
-        }
-        command.arg(to_run);
-        log::debug!("ssh {:?}", command);
-        command
-    }
-
-    async fn run_command(
-        &self,
-        shell_kind: ShellKind,
-        program: &str,
-        args: &[impl AsRef<str>],
-        allow_pseudo_tty: bool,
-    ) -> Result<String> {
-        let mut command = self.ssh_command(shell_kind, program, args, allow_pseudo_tty);
-        let output = command.output().await?;
-        anyhow::ensure!(
-            output.status.success(),
-            "failed to run command {command:?}: {}",
-            String::from_utf8_lossy(&output.stderr)
-        );
-        Ok(String::from_utf8_lossy(&output.stdout).to_string())
-    }
-
-    #[cfg(not(target_os = "windows"))]
-    fn ssh_options<'a>(
-        &self,
-        command: &'a mut process::Command,
-        include_port_forwards: bool,
-    ) -> &'a mut process::Command {
-        let args = if include_port_forwards {
-            self.connection_options.additional_args()
-        } else {
-            self.connection_options.additional_args_for_scp()
-        };
-
-        command
-            .stdin(Stdio::piped())
-            .stdout(Stdio::piped())
-            .stderr(Stdio::piped())
-            .args(args)
-            .args(["-o", "ControlMaster=no", "-o"])
-            .arg(format!("ControlPath={}", self.socket_path.display()))
-    }
-
-    #[cfg(target_os = "windows")]
-    fn ssh_options<'a>(
-        &self,
-        command: &'a mut process::Command,
-        include_port_forwards: bool,
-    ) -> &'a mut process::Command {
-        let args = if include_port_forwards {
-            self.connection_options.additional_args()
-        } else {
-            self.connection_options.additional_args_for_scp()
-        };
-
-        command
-            .stdin(Stdio::piped())
-            .stdout(Stdio::piped())
-            .stderr(Stdio::piped())
-            .args(args)
-            .envs(self.envs.clone())
-    }
-
-    // On Windows, we need to use `SSH_ASKPASS` to provide the password to ssh.
-    // On Linux, we use the `ControlPath` option to create a socket file that ssh can use to
-    #[cfg(not(target_os = "windows"))]
-    fn ssh_args(&self) -> Vec<String> {
-        let mut arguments = self.connection_options.additional_args();
-        arguments.extend(vec![
-            "-o".to_string(),
-            "ControlMaster=no".to_string(),
-            "-o".to_string(),
-            format!("ControlPath={}", self.socket_path.display()),
-            self.connection_options.ssh_url(),
-        ]);
-        arguments
-    }
-
-    #[cfg(target_os = "windows")]
-    fn ssh_args(&self) -> Vec<String> {
-        let mut arguments = self.connection_options.additional_args();
-        arguments.push(self.connection_options.ssh_url());
-        arguments
-    }
-
-    async fn platform(&self, shell: ShellKind) -> Result<RemotePlatform> {
-        let output = self.run_command(shell, "uname", &["-sm"], false).await?;
-        parse_platform(&output)
-    }
-
-    async fn shell(&self) -> String {
-        const DEFAULT_SHELL: &str = "sh";
-        match self
-            .run_command(ShellKind::Posix, "sh", &["-c", "echo $SHELL"], false)
-            .await
-        {
-            Ok(output) => parse_shell(&output, DEFAULT_SHELL),
-            Err(e) => {
-                log::error!("Failed to detect remote shell: {e}");
-                DEFAULT_SHELL.to_owned()
-            }
-        }
-    }
-}
-
-fn parse_port_number(port_str: &str) -> Result<u16> {
-    port_str
-        .parse()
-        .with_context(|| format!("parsing port number: {port_str}"))
-}
-
-fn parse_port_forward_spec(spec: &str) -> Result<SshPortForwardOption> {
-    let parts: Vec<&str> = spec.split(':').collect();
-
-    match parts.len() {
-        4 => {
-            let local_port = parse_port_number(parts[1])?;
-            let remote_port = parse_port_number(parts[3])?;
-
-            Ok(SshPortForwardOption {
-                local_host: Some(parts[0].to_string()),
-                local_port,
-                remote_host: Some(parts[2].to_string()),
-                remote_port,
-            })
-        }
-        3 => {
-            let local_port = parse_port_number(parts[0])?;
-            let remote_port = parse_port_number(parts[2])?;
-
-            Ok(SshPortForwardOption {
-                local_host: None,
-                local_port,
-                remote_host: Some(parts[1].to_string()),
-                remote_port,
-            })
-        }
-        _ => anyhow::bail!("Invalid port forward format"),
-    }
-}
-
-impl SshConnectionOptions {
-    pub fn parse_command_line(input: &str) -> Result<Self> {
-        let input = input.trim_start_matches("ssh ");
-        let mut hostname: Option<String> = None;
-        let mut username: Option<String> = None;
-        let mut port: Option<u16> = None;
-        let mut args = Vec::new();
-        let mut port_forwards: Vec<SshPortForwardOption> = Vec::new();
-
-        // disallowed: -E, -e, -F, -f, -G, -g, -M, -N, -n, -O, -q, -S, -s, -T, -t, -V, -v, -W
-        const ALLOWED_OPTS: &[&str] = &[
-            "-4", "-6", "-A", "-a", "-C", "-K", "-k", "-X", "-x", "-Y", "-y",
-        ];
-        const ALLOWED_ARGS: &[&str] = &[
-            "-B", "-b", "-c", "-D", "-F", "-I", "-i", "-J", "-l", "-m", "-o", "-P", "-p", "-R",
-            "-w",
-        ];
-
-        let mut tokens = ShellKind::Posix
-            .split(input)
-            .context("invalid input")?
-            .into_iter();
-
-        'outer: while let Some(arg) = tokens.next() {
-            if ALLOWED_OPTS.contains(&(&arg as &str)) {
-                args.push(arg.to_string());
-                continue;
-            }
-            if arg == "-p" {
-                port = tokens.next().and_then(|arg| arg.parse().ok());
-                continue;
-            } else if let Some(p) = arg.strip_prefix("-p") {
-                port = p.parse().ok();
-                continue;
-            }
-            if arg == "-l" {
-                username = tokens.next();
-                continue;
-            } else if let Some(l) = arg.strip_prefix("-l") {
-                username = Some(l.to_string());
-                continue;
-            }
-            if arg == "-L" || arg.starts_with("-L") {
-                let forward_spec = if arg == "-L" {
-                    tokens.next()
-                } else {
-                    Some(arg.strip_prefix("-L").unwrap().to_string())
-                };
-
-                if let Some(spec) = forward_spec {
-                    port_forwards.push(parse_port_forward_spec(&spec)?);
-                } else {
-                    anyhow::bail!("Missing port forward format");
-                }
-            }
-
-            for a in ALLOWED_ARGS {
-                if arg == *a {
-                    args.push(arg);
-                    if let Some(next) = tokens.next() {
-                        args.push(next);
-                    }
-                    continue 'outer;
-                } else if arg.starts_with(a) {
-                    args.push(arg);
-                    continue 'outer;
-                }
-            }
-            if arg.starts_with("-") || hostname.is_some() {
-                anyhow::bail!("unsupported argument: {:?}", arg);
-            }
-            let mut input = &arg as &str;
-            // Destination might be: username1@username2@ip2@ip1
-            if let Some((u, rest)) = input.rsplit_once('@') {
-                input = rest;
-                username = Some(u.to_string());
-            }
-            if let Some((rest, p)) = input.split_once(':') {
-                input = rest;
-                port = p.parse().ok()
-            }
-            hostname = Some(input.to_string())
-        }
-
-        let Some(hostname) = hostname else {
-            anyhow::bail!("missing hostname");
-        };
-
-        let port_forwards = match port_forwards.len() {
-            0 => None,
-            _ => Some(port_forwards),
-        };
-
-        Ok(Self {
-            host: hostname,
-            username,
-            port,
-            port_forwards,
-            args: Some(args),
-            password: None,
-            nickname: None,
-            upload_binary_over_ssh: false,
-        })
-    }
-
-    pub fn ssh_url(&self) -> String {
-        let mut result = String::from("ssh://");
-        if let Some(username) = &self.username {
-            // Username might be: username1@username2@ip2
-            let username = urlencoding::encode(username);
-            result.push_str(&username);
-            result.push('@');
-        }
-        result.push_str(&self.host);
-        if let Some(port) = self.port {
-            result.push(':');
-            result.push_str(&port.to_string());
-        }
-        result
-    }
-
-    pub fn additional_args_for_scp(&self) -> Vec<String> {
-        self.args.iter().flatten().cloned().collect::<Vec<String>>()
-    }
-
-    pub fn additional_args(&self) -> Vec<String> {
-        let mut args = self.additional_args_for_scp();
-
-        if let Some(forwards) = &self.port_forwards {
-            args.extend(forwards.iter().map(|pf| {
-                let local_host = match &pf.local_host {
-                    Some(host) => host,
-                    None => "localhost",
-                };
-                let remote_host = match &pf.remote_host {
-                    Some(host) => host,
-                    None => "localhost",
-                };
-
-                format!(
-                    "-L{}:{}:{}:{}",
-                    local_host, pf.local_port, remote_host, pf.remote_port
-                )
-            }));
-        }
-
-        args
-    }
-
-    fn scp_url(&self) -> String {
-        if let Some(username) = &self.username {
-            format!("{}@{}", username, self.host)
-        } else {
-            self.host.clone()
-        }
-    }
-
-    pub fn connection_string(&self) -> String {
-        let host = if let Some(username) = &self.username {
-            format!("{}@{}", username, self.host)
-        } else {
-            self.host.clone()
-        };
-        if let Some(port) = &self.port {
-            format!("{}:{}", host, port)
-        } else {
-            host
-        }
-    }
-}
-
-fn build_command(
-    input_program: Option<String>,
-    input_args: &[String],
-    input_env: &HashMap<String, String>,
-    working_dir: Option<String>,
-    port_forward: Option<(u16, String, u16)>,
-    ssh_env: HashMap<String, String>,
-    ssh_path_style: PathStyle,
-    ssh_shell: &str,
-    ssh_shell_kind: ShellKind,
-    ssh_args: Vec<String>,
-) -> Result<CommandTemplate> {
-    use std::fmt::Write as _;
-
-    let mut exec = String::new();
-    if let Some(working_dir) = working_dir {
-        let working_dir = RemotePathBuf::new(working_dir, ssh_path_style).to_string();
-
-        // shlex will wrap the command in single quotes (''), disabling ~ expansion,
-        // replace with something that works
-        const TILDE_PREFIX: &'static str = "~/";
-        if working_dir.starts_with(TILDE_PREFIX) {
-            let working_dir = working_dir.trim_start_matches("~").trim_start_matches("/");
-            write!(
-                exec,
-                "cd \"$HOME/{working_dir}\" {} ",
-                ssh_shell_kind.sequential_and_commands_separator()
-            )?;
-        } else {
-            write!(
-                exec,
-                "cd \"{working_dir}\" {} ",
-                ssh_shell_kind.sequential_and_commands_separator()
-            )?;
-        }
-    } else {
-        write!(
-            exec,
-            "cd {} ",
-            ssh_shell_kind.sequential_and_commands_separator()
-        )?;
-    };
-    write!(exec, "exec env ")?;
-
-    for (k, v) in input_env.iter() {
-        write!(
-            exec,
-            "{}={} ",
-            k,
-            ssh_shell_kind.try_quote(v).context("shell quoting")?
-        )?;
-    }
-
-    if let Some(input_program) = input_program {
-        write!(
-            exec,
-            "{}",
-            ssh_shell_kind
-                .try_quote_prefix_aware(&input_program)
-                .context("shell quoting")?
-        )?;
-        for arg in input_args {
-            let arg = ssh_shell_kind.try_quote(&arg).context("shell quoting")?;
-            write!(exec, " {}", &arg)?;
-        }
-    } else {
-        write!(exec, "{ssh_shell} -l")?;
-    };
-    let (command, command_args) = ShellBuilder::new(&Shell::Program(ssh_shell.to_owned()), false)
-        .build(Some(exec.clone()), &[]);
-
-    let mut args = Vec::new();
-    args.extend(ssh_args);
-
-    if let Some((local_port, host, remote_port)) = port_forward {
-        args.push("-L".into());
-        args.push(format!("{local_port}:{host}:{remote_port}"));
-    }
-
-    args.push("-t".into());
-    args.push(command);
-    args.extend(command_args);
-
-    Ok(CommandTemplate {
-        program: "ssh".into(),
-        args,
-        env: ssh_env,
-    })
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_build_command() -> Result<()> {
-        let mut input_env = HashMap::default();
-        input_env.insert("INPUT_VA".to_string(), "val".to_string());
-        let mut env = HashMap::default();
-        env.insert("SSH_VAR".to_string(), "ssh-val".to_string());
-
-        let command = build_command(
-            Some("remote_program".to_string()),
-            &["arg1".to_string(), "arg2".to_string()],
-            &input_env,
-            Some("~/work".to_string()),
-            None,
-            env.clone(),
-            PathStyle::Posix,
-            "/bin/fish",
-            ShellKind::Fish,
-            vec!["-p".to_string(), "2222".to_string()],
-        )?;
-
-        assert_eq!(command.program, "ssh");
-        assert_eq!(
-            command.args.iter().map(String::as_str).collect::<Vec<_>>(),
-            [
-                "-p",
-                "2222",
-                "-t",
-                "/bin/fish",
-                "-i",
-                "-c",
-                "cd \"$HOME/work\" && exec env INPUT_VA=val remote_program arg1 arg2"
-            ]
-        );
-        assert_eq!(command.env, env);
-
-        let mut input_env = HashMap::default();
-        input_env.insert("INPUT_VA".to_string(), "val".to_string());
-        let mut env = HashMap::default();
-        env.insert("SSH_VAR".to_string(), "ssh-val".to_string());
-
-        let command = build_command(
-            None,
-            &["arg1".to_string(), "arg2".to_string()],
-            &input_env,
-            None,
-            Some((1, "foo".to_owned(), 2)),
-            env.clone(),
-            PathStyle::Posix,
-            "/bin/fish",
-            ShellKind::Fish,
-            vec!["-p".to_string(), "2222".to_string()],
-        )?;
-
-        assert_eq!(command.program, "ssh");
-        assert_eq!(
-            command.args.iter().map(String::as_str).collect::<Vec<_>>(),
-            [
-                "-p",
-                "2222",
-                "-L",
-                "1:foo:2",
-                "-t",
-                "/bin/fish",
-                "-i",
-                "-c",
-                "cd && exec env INPUT_VA=val /bin/fish -l"
-            ]
-        );
-        assert_eq!(command.env, env);
-
-        Ok(())
-    }
-
-    #[test]
-    fn scp_args_exclude_port_forward_flags() {
-        let options = SshConnectionOptions {
-            host: "example.com".into(),
-            args: Some(vec![
-                "-p".to_string(),
-                "2222".to_string(),
-                "-o".to_string(),
-                "StrictHostKeyChecking=no".to_string(),
-            ]),
-            port_forwards: Some(vec![SshPortForwardOption {
-                local_host: Some("127.0.0.1".to_string()),
-                local_port: 8080,
-                remote_host: Some("127.0.0.1".to_string()),
-                remote_port: 80,
-            }]),
-            ..Default::default()
-        };
-
-        let ssh_args = options.additional_args();
-        assert!(
-            ssh_args.iter().any(|arg| arg.starts_with("-L")),
-            "expected ssh args to include port-forward: {ssh_args:?}"
-        );
-
-        let scp_args = options.additional_args_for_scp();
-        assert_eq!(
-            scp_args,
-            vec![
-                "-p".to_string(),
-                "2222".to_string(),
-                "-o".to_string(),
-                "StrictHostKeyChecking=no".to_string(),
-            ]
-        );
-    }
-}
diff --git a/crates/remote/src/transport/wsl.rs b/crates/remote/src/transport/wsl.rs
deleted file mode 100644
index d27648e678..0000000000
--- a/crates/remote/src/transport/wsl.rs
+++ /dev/null
@@ -1,607 +0,0 @@
-use crate::{
-    RemoteClientDelegate, RemotePlatform,
-    remote_client::{CommandTemplate, RemoteConnection, RemoteConnectionOptions},
-    transport::{parse_platform, parse_shell},
-};
-use anyhow::{Context, Result, anyhow, bail};
-use async_trait::async_trait;
-use collections::HashMap;
-use futures::channel::mpsc::{Sender, UnboundedReceiver, UnboundedSender};
-use gpui::{App, AppContext as _, AsyncApp, Task};
-use release_channel::{AppVersion, ReleaseChannel};
-use rpc::proto::Envelope;
-use semver::Version;
-use smol::{fs, process};
-use std::{
-    ffi::OsStr,
-    fmt::Write as _,
-    path::{Path, PathBuf},
-    process::Stdio,
-    sync::Arc,
-    time::Instant,
-};
-use util::{
-    paths::{PathStyle, RemotePathBuf},
-    rel_path::RelPath,
-    shell::{Shell, ShellKind},
-    shell_builder::ShellBuilder,
-};
-
-#[derive(Debug, Clone, PartialEq, Eq, Hash, serde::Deserialize, schemars::JsonSchema)]
-pub struct WslConnectionOptions {
-    pub distro_name: String,
-    pub user: Option<String>,
-}
-
-impl From<settings::WslConnection> for WslConnectionOptions {
-    fn from(val: settings::WslConnection) -> Self {
-        WslConnectionOptions {
-            distro_name: val.distro_name.into(),
-            user: val.user,
-        }
-    }
-}
-
-#[derive(Debug)]
-pub(crate) struct WslRemoteConnection {
-    remote_binary_path: Option<Arc<RelPath>>,
-    platform: RemotePlatform,
-    shell: String,
-    shell_kind: ShellKind,
-    default_system_shell: String,
-    has_wsl_interop: bool,
-    connection_options: WslConnectionOptions,
-}
-
-impl WslRemoteConnection {
-    pub(crate) async fn new(
-        connection_options: WslConnectionOptions,
-        delegate: Arc<dyn RemoteClientDelegate>,
-        cx: &mut AsyncApp,
-    ) -> Result<Self> {
-        log::info!(
-            "Connecting to WSL distro {} with user {:?}",
-            connection_options.distro_name,
-            connection_options.user
-        );
-        let (release_channel, version) =
-            cx.update(|cx| (ReleaseChannel::global(cx), AppVersion::global(cx)))?;
-
-        let mut this = Self {
-            connection_options,
-            remote_binary_path: None,
-            platform: RemotePlatform { os: "", arch: "" },
-            shell: String::new(),
-            shell_kind: ShellKind::Posix,
-            default_system_shell: String::from("/bin/sh"),
-            has_wsl_interop: false,
-        };
-        delegate.set_status(Some("Detecting WSL environment"), cx);
-        this.shell = this
-            .detect_shell()
-            .await
-            .context("failed detecting shell")?;
-        log::info!("Remote shell discovered: {}", this.shell);
-        this.shell_kind = ShellKind::new(&this.shell, false);
-        this.has_wsl_interop = this.detect_has_wsl_interop().await.unwrap_or_default();
-        log::info!(
-            "Remote has wsl interop {}",
-            if this.has_wsl_interop {
-                "enabled"
-            } else {
-                "disabled"
-            }
-        );
-        this.platform = this
-            .detect_platform()
-            .await
-            .context("failed detecting platform")?;
-        log::info!("Remote platform discovered: {:?}", this.platform);
-        this.remote_binary_path = Some(
-            this.ensure_server_binary(&delegate, release_channel, version, cx)
-                .await
-                .context("failed ensuring server binary")?,
-        );
-        log::debug!("Detected WSL environment: {this:#?}");
-
-        Ok(this)
-    }
-
-    async fn detect_platform(&self) -> Result<RemotePlatform> {
-        let program = self.shell_kind.prepend_command_prefix("uname");
-        let output = self.run_wsl_command_with_output(&program, &["-sm"]).await?;
-        parse_platform(&output)
-    }
-
-    async fn detect_shell(&self) -> Result<String> {
-        const DEFAULT_SHELL: &str = "sh";
-        match self
-            .run_wsl_command_with_output("sh", &["-c", "echo $SHELL"])
-            .await
-        {
-            Ok(output) => Ok(parse_shell(&output, DEFAULT_SHELL)),
-            Err(e) => {
-                log::error!("Failed to detect remote shell: {e}");
-                Ok(DEFAULT_SHELL.to_owned())
-            }
-        }
-    }
-
-    async fn detect_has_wsl_interop(&self) -> Result<bool> {
-        Ok(self
-            .run_wsl_command_with_output("cat", &["/proc/sys/fs/binfmt_misc/WSLInterop"])
-            .await
-            .inspect_err(|err| log::error!("Failed to detect wsl interop: {err}"))?
-            .contains("enabled"))
-    }
-
-    async fn windows_path_to_wsl_path(&self, source: &Path) -> Result<String> {
-        windows_path_to_wsl_path_impl(&self.connection_options, source).await
-    }
-
-    async fn run_wsl_command_with_output(&self, program: &str, args: &[&str]) -> Result<String> {
-        run_wsl_command_with_output_impl(&self.connection_options, program, args).await
-    }
-
-    async fn run_wsl_command(&self, program: &str, args: &[&str]) -> Result<()> {
-        run_wsl_command_impl(&self.connection_options, program, args, false)
-            .await
-            .map(|_| ())
-    }
-
-    async fn ensure_server_binary(
-        &self,
-        delegate: &Arc<dyn RemoteClientDelegate>,
-        release_channel: ReleaseChannel,
-        version: Version,
-        cx: &mut AsyncApp,
-    ) -> Result<Arc<RelPath>> {
-        let version_str = match release_channel {
-            ReleaseChannel::Dev => "build".to_string(),
-            _ => version.to_string(),
-        };
-
-        let binary_name = format!(
-            "zed-remote-server-{}-{}",
-            release_channel.dev_name(),
-            version_str
-        );
-
-        let dst_path =
-            paths::remote_wsl_server_dir_relative().join(RelPath::unix(&binary_name).unwrap());
-
-        if let Some(parent) = dst_path.parent() {
-            let parent = parent.display(PathStyle::Posix);
-            let mkdir = self.shell_kind.prepend_command_prefix("mkdir");
-            self.run_wsl_command(&mkdir, &["-p", &parent])
-                .await
-                .map_err(|e| anyhow!("Failed to create directory: {}", e))?;
-        }
-
-        #[cfg(debug_assertions)]
-        if let Some(remote_server_path) =
-            super::build_remote_server_from_source(&self.platform, delegate.as_ref(), cx).await?
-        {
-            let tmp_path = paths::remote_wsl_server_dir_relative().join(
-                &RelPath::unix(&format!(
-                    "download-{}-{}",
-                    std::process::id(),
-                    remote_server_path.file_name().unwrap().to_string_lossy()
-                ))
-                .unwrap(),
-            );
-            self.upload_file(&remote_server_path, &tmp_path, delegate, cx)
-                .await?;
-            self.extract_and_install(&tmp_path, &dst_path, delegate, cx)
-                .await?;
-            return Ok(dst_path);
-        }
-
-        if self
-            .run_wsl_command(&dst_path.display(PathStyle::Posix), &["version"])
-            .await
-            .is_ok()
-        {
-            return Ok(dst_path);
-        }
-
-        let wanted_version = match release_channel {
-            ReleaseChannel::Nightly | ReleaseChannel::Dev => None,
-            _ => Some(cx.update(|cx| AppVersion::global(cx))?),
-        };
-
-        let src_path = delegate
-            .download_server_binary_locally(self.platform, release_channel, wanted_version, cx)
-            .await?;
-
-        let tmp_path = format!(
-            "{}.{}.gz",
-            dst_path.display(PathStyle::Posix),
-            std::process::id()
-        );
-        let tmp_path = RelPath::unix(&tmp_path).unwrap();
-
-        self.upload_file(&src_path, &tmp_path, delegate, cx).await?;
-        self.extract_and_install(&tmp_path, &dst_path, delegate, cx)
-            .await?;
-
-        Ok(dst_path)
-    }
-
-    async fn upload_file(
-        &self,
-        src_path: &Path,
-        dst_path: &RelPath,
-        delegate: &Arc<dyn RemoteClientDelegate>,
-        cx: &mut AsyncApp,
-    ) -> Result<()> {
-        delegate.set_status(Some("Uploading remote server"), cx);
-
-        if let Some(parent) = dst_path.parent() {
-            let parent = parent.display(PathStyle::Posix);
-            let mkdir = self.shell_kind.prepend_command_prefix("mkdir");
-            self.run_wsl_command(&mkdir, &["-p", &parent])
-                .await
-                .context("Failed to create directory when uploading file")?;
-        }
-
-        let t0 = Instant::now();
-        let src_stat = fs::metadata(&src_path)
-            .await
-            .with_context(|| format!("source path does not exist: {}", src_path.display()))?;
-        let size = src_stat.len();
-        log::info!(
-            "uploading remote server to WSL {:?} ({}kb)",
-            dst_path,
-            size / 1024
-        );
-
-        let src_path_in_wsl = self.windows_path_to_wsl_path(src_path).await?;
-        let cp = self.shell_kind.prepend_command_prefix("cp");
-        self.run_wsl_command(
-            &cp,
-            &["-f", &src_path_in_wsl, &dst_path.display(PathStyle::Posix)],
-        )
-        .await
-        .map_err(|e| {
-            anyhow!(
-                "Failed to copy file {}({}) to WSL {:?}: {}",
-                src_path.display(),
-                src_path_in_wsl,
-                dst_path,
-                e
-            )
-        })?;
-
-        log::info!("uploaded remote server in {:?}", t0.elapsed());
-        Ok(())
-    }
-
-    async fn extract_and_install(
-        &self,
-        tmp_path: &RelPath,
-        dst_path: &RelPath,
-        delegate: &Arc<dyn RemoteClientDelegate>,
-        cx: &mut AsyncApp,
-    ) -> Result<()> {
-        delegate.set_status(Some("Extracting remote server"), cx);
-
-        let tmp_path_str = tmp_path.display(PathStyle::Posix);
-        let dst_path_str = dst_path.display(PathStyle::Posix);
-
-        // Build extraction script with proper error handling
-        let script = if tmp_path_str.ends_with(".gz") {
-            let uncompressed = tmp_path_str.trim_end_matches(".gz");
-            format!(
-                "set -e; gunzip -f '{}' && chmod 755 '{}' && mv -f '{}' '{}'",
-                tmp_path_str, uncompressed, uncompressed, dst_path_str
-            )
-        } else {
-            format!(
-                "set -e; chmod 755 '{}' && mv -f '{}' '{}'",
-                tmp_path_str, tmp_path_str, dst_path_str
-            )
-        };
-
-        self.run_wsl_command("sh", &["-c", &script])
-            .await
-            .map_err(|e| anyhow!("Failed to extract server binary: {}", e))?;
-        Ok(())
-    }
-}
-
-#[async_trait(?Send)]
-impl RemoteConnection for WslRemoteConnection {
-    fn start_proxy(
-        &self,
-        unique_identifier: String,
-        reconnect: bool,
-        incoming_tx: UnboundedSender<Envelope>,
-        outgoing_rx: UnboundedReceiver<Envelope>,
-        connection_activity_tx: Sender<()>,
-        delegate: Arc<dyn RemoteClientDelegate>,
-        cx: &mut AsyncApp,
-    ) -> Task<Result<i32>> {
-        delegate.set_status(Some("Starting proxy"), cx);
-
-        let Some(remote_binary_path) = &self.remote_binary_path else {
-            return Task::ready(Err(anyhow!("Remote binary path not set")));
-        };
-
-        let mut proxy_args = vec![];
-        for env_var in ["RUST_LOG", "RUST_BACKTRACE", "ZED_GENERATE_MINIDUMPS"] {
-            if let Some(value) = std::env::var(env_var).ok() {
-                // We don't quote the value here as it seems excessive and may result in invalid envs for the
-                // proxy server. For example, `RUST_LOG='debug'` will result in a warning "invalid logging spec 'debug'', ignoring it"
-                // in the proxy server. Therefore, we pass the env vars as is.
-                proxy_args.push(format!("{}={}", env_var, value));
-            }
-        }
-
-        proxy_args.push(remote_binary_path.display(PathStyle::Posix).into_owned());
-        proxy_args.push("proxy".to_owned());
-        proxy_args.push("--identifier".to_owned());
-        proxy_args.push(unique_identifier);
-
-        if reconnect {
-            proxy_args.push("--reconnect".to_owned());
-        }
-
-        let proxy_process =
-            match wsl_command_impl(&self.connection_options, "env", &proxy_args, false)
-                .kill_on_drop(true)
-                .spawn()
-            {
-                Ok(process) => process,
-                Err(error) => {
-                    return Task::ready(Err(anyhow!("failed to spawn remote server: {}", error)));
-                }
-            };
-
-        super::handle_rpc_messages_over_child_process_stdio(
-            proxy_process,
-            incoming_tx,
-            outgoing_rx,
-            connection_activity_tx,
-            cx,
-        )
-    }
-
-    fn upload_directory(
-        &self,
-        src_path: PathBuf,
-        dest_path: RemotePathBuf,
-        cx: &App,
-    ) -> Task<Result<()>> {
-        cx.background_spawn({
-            let options = self.connection_options.clone();
-            async move {
-                let wsl_src = windows_path_to_wsl_path_impl(&options, &src_path).await?;
-
-                run_wsl_command_impl(
-                    &options,
-                    "cp",
-                    &["-r", &wsl_src, &dest_path.to_string()],
-                    true,
-                )
-                .await
-                .map_err(|e| {
-                    anyhow!(
-                        "failed to upload directory {} -> {}: {}",
-                        src_path.display(),
-                        dest_path,
-                        e
-                    )
-                })?;
-
-                Ok(())
-            }
-        })
-    }
-
-    async fn kill(&self) -> Result<()> {
-        Ok(())
-    }
-
-    fn has_been_killed(&self) -> bool {
-        false
-    }
-
-    fn shares_network_interface(&self) -> bool {
-        true
-    }
-
-    fn build_command(
-        &self,
-        program: Option<String>,
-        args: &[String],
-        env: &HashMap<String, String>,
-        working_dir: Option<String>,
-        port_forward: Option<(u16, String, u16)>,
-    ) -> Result<CommandTemplate> {
-        if port_forward.is_some() {
-            bail!("WSL shares the network interface with the host system");
-        }
-
-        let shell_kind = self.shell_kind;
-        let working_dir = working_dir
-            .map(|working_dir| RemotePathBuf::new(working_dir, PathStyle::Posix).to_string())
-            .unwrap_or("~".to_string());
-
-        let mut exec = String::from("exec env ");
-
-        for (k, v) in env.iter() {
-            write!(
-                exec,
-                "{}={} ",
-                k,
-                shell_kind.try_quote(v).context("shell quoting")?
-            )?;
-        }
-
-        if let Some(program) = program {
-            write!(
-                exec,
-                "{}",
-                shell_kind
-                    .try_quote_prefix_aware(&program)
-                    .context("shell quoting")?
-            )?;
-            for arg in args {
-                let arg = shell_kind.try_quote(&arg).context("shell quoting")?;
-                write!(exec, " {}", &arg)?;
-            }
-        } else {
-            write!(&mut exec, "{} -l", self.shell)?;
-        }
-        let (command, args) =
-            ShellBuilder::new(&Shell::Program(self.shell.clone()), false).build(Some(exec), &[]);
-
-        let mut wsl_args = if let Some(user) = &self.connection_options.user {
-            vec![
-                "--distribution".to_string(),
-                self.connection_options.distro_name.clone(),
-                "--user".to_string(),
-                user.clone(),
-                "--cd".to_string(),
-                working_dir,
-                "--".to_string(),
-                command,
-            ]
-        } else {
-            vec![
-                "--distribution".to_string(),
-                self.connection_options.distro_name.clone(),
-                "--cd".to_string(),
-                working_dir,
-                "--".to_string(),
-                command,
-            ]
-        };
-        wsl_args.extend(args);
-
-        Ok(CommandTemplate {
-            program: "wsl.exe".to_string(),
-            args: wsl_args,
-            env: HashMap::default(),
-        })
-    }
-
-    fn build_forward_ports_command(
-        &self,
-        _: Vec<(u16, String, u16)>,
-    ) -> anyhow::Result<CommandTemplate> {
-        Err(anyhow!("WSL shares a network interface with the host"))
-    }
-
-    fn connection_options(&self) -> RemoteConnectionOptions {
-        RemoteConnectionOptions::Wsl(self.connection_options.clone())
-    }
-
-    fn path_style(&self) -> PathStyle {
-        PathStyle::Posix
-    }
-
-    fn shell(&self) -> String {
-        self.shell.clone()
-    }
-
-    fn default_system_shell(&self) -> String {
-        self.default_system_shell.clone()
-    }
-
-    fn has_wsl_interop(&self) -> bool {
-        self.has_wsl_interop
-    }
-}
-
-/// `wslpath` is a executable available in WSL, it's a linux binary.
-/// So it doesn't support Windows style paths.
-async fn sanitize_path(path: &Path) -> Result<String> {
-    let path = smol::fs::canonicalize(path)
-        .await
-        .with_context(|| format!("Failed to canonicalize path {}", path.display()))?;
-    let path_str = path.to_string_lossy();
-
-    let sanitized = path_str.strip_prefix(r"\\?\").unwrap_or(&path_str);
-    Ok(sanitized.replace('\\', "/"))
-}
-
-async fn run_wsl_command_with_output_impl(
-    options: &WslConnectionOptions,
-    program: &str,
-    args: &[&str],
-) -> Result<String> {
-    match run_wsl_command_impl(options, program, args, true).await {
-        Ok(res) => Ok(res),
-        Err(exec_err) => match run_wsl_command_impl(options, program, args, false).await {
-            Ok(res) => Ok(res),
-            Err(e) => Err(e.context(exec_err)),
-        },
-    }
-}
-
-async fn windows_path_to_wsl_path_impl(
-    options: &WslConnectionOptions,
-    source: &Path,
-) -> Result<String> {
-    let source = sanitize_path(source).await?;
-    run_wsl_command_with_output_impl(options, "wslpath", &["-u", &source]).await
-}
-
-async fn run_wsl_command_impl(
-    options: &WslConnectionOptions,
-    program: &str,
-    args: &[&str],
-    exec: bool,
-) -> Result<String> {
-    let mut command = wsl_command_impl(options, program, args, exec);
-    let output = command
-        .output()
-        .await
-        .with_context(|| format!("Failed to run command '{:?}'", command))?;
-
-    if !output.status.success() {
-        return Err(anyhow!(
-            "Command '{:?}' failed: {}",
-            command,
-            String::from_utf8_lossy(&output.stderr).trim()
-        ));
-    }
-
-    Ok(String::from_utf8_lossy(&output.stdout).trim().to_owned())
-}
-
-/// Creates a new `wsl.exe` command that runs the given program with the given arguments.
-///
-/// If `exec` is true, the command will be executed in the WSL environment without spawning a new shell.
-fn wsl_command_impl(
-    options: &WslConnectionOptions,
-    program: &str,
-    args: &[impl AsRef<OsStr>],
-    exec: bool,
-) -> process::Command {
-    let mut command = util::command::new_smol_command("wsl.exe");
-
-    if let Some(user) = &options.user {
-        command.arg("--user").arg(user);
-    }
-
-    command
-        .stdin(Stdio::piped())
-        .stdout(Stdio::piped())
-        .stderr(Stdio::piped())
-        .arg("--distribution")
-        .arg(&options.distro_name)
-        .arg("--cd")
-        .arg("~");
-
-    if exec {
-        command.arg("--exec");
-    }
-
-    command.arg(program).args(args);
-
-    log::debug!("wsl {:?}", command);
-    command
-}
diff --git a/crates/remote_server/Cargo.toml b/crates/remote_server/Cargo.toml
deleted file mode 100644
index 114dc777c1..0000000000
--- a/crates/remote_server/Cargo.toml
+++ /dev/null
@@ -1,109 +0,0 @@
-[package]
-name = "remote_server"
-description = "Daemon used for remote editing"
-edition.workspace = true
-version = "0.1.0"
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/remote_server.rs"
-doctest = false
-
-[[bin]]
-name = "remote_server"
-
-[features]
-default = []
-debug-embed = ["dep:rust-embed"]
-test-support = ["fs/test-support"]
-
-[dependencies]
-anyhow.workspace = true
-askpass.workspace = true
-clap.workspace = true
-client.workspace = true
-dap_adapters.workspace = true
-debug_adapter_extension.workspace = true
-env_logger.workspace = true
-extension.workspace = true
-extension_host.workspace = true
-fs.workspace = true
-futures.workspace = true
-git.workspace = true
-git_hosting_providers.workspace = true
-git2 = { workspace = true, features = ["vendored-libgit2"] }
-gpui.workspace = true
-gpui_tokio.workspace = true
-http_client.workspace = true
-image.workspace = true
-json_schema_store.workspace = true
-language.workspace = true
-language_extension.workspace = true
-languages.workspace = true
-log.workspace = true
-lsp.workspace = true
-node_runtime.workspace = true
-paths.workspace = true
-project.workspace = true
-proto.workspace = true
-release_channel.workspace = true
-remote.workspace = true
-reqwest_client.workspace = true
-rpc.workspace = true
-rust-embed = { workspace = true, optional = true, features = ["debug-embed"] }
-semver.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-shellexpand.workspace = true
-smol.workspace = true
-sysinfo.workspace = true
-task.workspace = true
-util.workspace = true
-watch.workspace = true
-worktree.workspace = true
-thiserror.workspace = true
-rayon.workspace = true
-
-[target.'cfg(not(windows))'.dependencies]
-crashes.workspace = true
-crash-handler.workspace = true
-fork.workspace = true
-libc.workspace = true
-minidumper.workspace = true
-
-[dev-dependencies]
-action_log.workspace = true
-agent = { workspace = true, features = ["test-support"] }
-client = { workspace = true, features = ["test-support"] }
-clock = { workspace = true, features = ["test-support"] }
-collections.workspace = true
-dap = { workspace = true, features = ["test-support"] }
-editor = { workspace = true, features = ["test-support"] }
-workspace = { workspace = true, features = ["test-support"] }
-fs = { workspace = true, features = ["test-support"] }
-gpui = { workspace = true, features = ["test-support"] }
-http_client = { workspace = true, features = ["test-support"] }
-language = { workspace = true, features = ["test-support"] }
-node_runtime = { workspace = true, features = ["test-support"] }
-pretty_assertions.workspace = true
-project = { workspace = true, features = ["test-support"] }
-remote = { workspace = true, features = ["test-support"] }
-theme = { workspace = true, features = ["test-support"] }
-language_model = { workspace = true, features = ["test-support"] }
-lsp = { workspace = true, features = ["test-support"] }
-prompt_store.workspace = true
-unindent.workspace = true
-serde_json.workspace = true
-zlog.workspace = true
-
-[build-dependencies]
-cargo_toml.workspace = true
-toml.workspace = true
-
-[package.metadata.cargo-machete]
-ignored = ["git2", "rust-embed", "paths"]
diff --git a/crates/remote_server/LICENSE-GPL b/crates/remote_server/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/remote_server/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/remote_server/build.rs b/crates/remote_server/build.rs
deleted file mode 100644
index 3ad13d3d6e..0000000000
--- a/crates/remote_server/build.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-#![allow(clippy::disallowed_methods, reason = "build scripts are exempt")]
-use std::process::Command;
-
-const ZED_MANIFEST: &str = include_str!("../zed/Cargo.toml");
-
-fn main() {
-    let zed_cargo_toml: cargo_toml::Manifest =
-        toml::from_str(ZED_MANIFEST).expect("failed to parse zed Cargo.toml");
-    println!(
-        "cargo:rustc-env=ZED_PKG_VERSION={}",
-        zed_cargo_toml.package.unwrap().version.unwrap()
-    );
-    println!(
-        "cargo:rustc-env=TARGET={}",
-        std::env::var("TARGET").unwrap()
-    );
-
-    // Populate git sha environment variable if git is available
-    println!("cargo:rerun-if-changed=../../.git/logs/HEAD");
-    if let Some(output) = Command::new("git")
-        .args(["rev-parse", "HEAD"])
-        .output()
-        .ok()
-        .filter(|output| output.status.success())
-    {
-        let git_sha = String::from_utf8_lossy(&output.stdout);
-        let git_sha = git_sha.trim();
-
-        println!("cargo:rustc-env=ZED_COMMIT_SHA={git_sha}");
-    }
-    if let Some(build_identifier) = option_env!("GITHUB_RUN_NUMBER") {
-        println!("cargo:rustc-env=ZED_BUILD_ID={build_identifier}");
-    }
-}
diff --git a/crates/remote_server/src/headless_project.rs b/crates/remote_server/src/headless_project.rs
deleted file mode 100644
index 361e74579c..0000000000
--- a/crates/remote_server/src/headless_project.rs
+++ /dev/null
@@ -1,893 +0,0 @@
-use anyhow::{Context as _, Result, anyhow};
-use language::File;
-use lsp::LanguageServerId;
-
-use extension::ExtensionHostProxy;
-use extension_host::headless_host::HeadlessExtensionStore;
-use fs::Fs;
-use gpui::{App, AppContext as _, AsyncApp, Context, Entity, PromptLevel};
-use http_client::HttpClient;
-use language::{Buffer, BufferEvent, LanguageRegistry, proto::serialize_operation};
-use node_runtime::NodeRuntime;
-use project::{
-    LspStore, LspStoreEvent, ManifestTree, PrettierStore, ProjectEnvironment, ProjectPath,
-    ToolchainStore, WorktreeId,
-    agent_server_store::AgentServerStore,
-    buffer_store::{BufferStore, BufferStoreEvent},
-    debugger::{breakpoint_store::BreakpointStore, dap_store::DapStore},
-    git_store::GitStore,
-    image_store::ImageId,
-    lsp_store::log_store::{self, GlobalLogStore, LanguageServerKind, LogKind},
-    project_settings::SettingsObserver,
-    search::SearchQuery,
-    task_store::TaskStore,
-    worktree_store::WorktreeStore,
-};
-use rpc::{
-    AnyProtoClient, TypedEnvelope,
-    proto::{self, REMOTE_SERVER_PEER_ID, REMOTE_SERVER_PROJECT_ID},
-};
-
-use settings::initial_server_settings_content;
-use smol::stream::StreamExt;
-use std::{
-    num::NonZeroU64,
-    path::{Path, PathBuf},
-    sync::{
-        Arc,
-        atomic::{AtomicU64, AtomicUsize, Ordering},
-    },
-};
-use sysinfo::{ProcessRefreshKind, RefreshKind, System, UpdateKind};
-use util::{ResultExt, paths::PathStyle, rel_path::RelPath};
-use worktree::Worktree;
-
-pub struct HeadlessProject {
-    pub fs: Arc<dyn Fs>,
-    pub session: AnyProtoClient,
-    pub worktree_store: Entity<WorktreeStore>,
-    pub buffer_store: Entity<BufferStore>,
-    pub lsp_store: Entity<LspStore>,
-    pub task_store: Entity<TaskStore>,
-    pub dap_store: Entity<DapStore>,
-    pub agent_server_store: Entity<AgentServerStore>,
-    pub settings_observer: Entity<SettingsObserver>,
-    pub next_entry_id: Arc<AtomicUsize>,
-    pub languages: Arc<LanguageRegistry>,
-    pub extensions: Entity<HeadlessExtensionStore>,
-    pub git_store: Entity<GitStore>,
-    pub environment: Entity<ProjectEnvironment>,
-    // Used mostly to keep alive the toolchain store for RPC handlers.
-    // Local variant is used within LSP store, but that's a separate entity.
-    pub _toolchain_store: Entity<ToolchainStore>,
-}
-
-pub struct HeadlessAppState {
-    pub session: AnyProtoClient,
-    pub fs: Arc<dyn Fs>,
-    pub http_client: Arc<dyn HttpClient>,
-    pub node_runtime: NodeRuntime,
-    pub languages: Arc<LanguageRegistry>,
-    pub extension_host_proxy: Arc<ExtensionHostProxy>,
-}
-
-impl HeadlessProject {
-    pub fn init(cx: &mut App) {
-        settings::init(cx);
-        log_store::init(true, cx);
-    }
-
-    pub fn new(
-        HeadlessAppState {
-            session,
-            fs,
-            http_client,
-            node_runtime,
-            languages,
-            extension_host_proxy: proxy,
-        }: HeadlessAppState,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        debug_adapter_extension::init(proxy.clone(), cx);
-        languages::init(languages.clone(), fs.clone(), node_runtime.clone(), cx);
-
-        let worktree_store = cx.new(|cx| {
-            let mut store = WorktreeStore::local(true, fs.clone());
-            store.shared(REMOTE_SERVER_PROJECT_ID, session.clone(), cx);
-            store
-        });
-
-        let environment =
-            cx.new(|cx| ProjectEnvironment::new(None, worktree_store.downgrade(), None, true, cx));
-        let manifest_tree = ManifestTree::new(worktree_store.clone(), cx);
-        let toolchain_store = cx.new(|cx| {
-            ToolchainStore::local(
-                languages.clone(),
-                worktree_store.clone(),
-                environment.clone(),
-                manifest_tree.clone(),
-                fs.clone(),
-                cx,
-            )
-        });
-
-        let buffer_store = cx.new(|cx| {
-            let mut buffer_store = BufferStore::local(worktree_store.clone(), cx);
-            buffer_store.shared(REMOTE_SERVER_PROJECT_ID, session.clone(), cx);
-            buffer_store
-        });
-
-        let breakpoint_store =
-            cx.new(|_| BreakpointStore::local(worktree_store.clone(), buffer_store.clone()));
-
-        let dap_store = cx.new(|cx| {
-            let mut dap_store = DapStore::new_local(
-                http_client.clone(),
-                node_runtime.clone(),
-                fs.clone(),
-                environment.clone(),
-                toolchain_store.read(cx).as_language_toolchain_store(),
-                worktree_store.clone(),
-                breakpoint_store.clone(),
-                true,
-                cx,
-            );
-            dap_store.shared(REMOTE_SERVER_PROJECT_ID, session.clone(), cx);
-            dap_store
-        });
-
-        let git_store = cx.new(|cx| {
-            let mut store = GitStore::local(
-                &worktree_store,
-                buffer_store.clone(),
-                environment.clone(),
-                fs.clone(),
-                cx,
-            );
-            store.shared(REMOTE_SERVER_PROJECT_ID, session.clone(), cx);
-            store
-        });
-
-        let prettier_store = cx.new(|cx| {
-            PrettierStore::new(
-                node_runtime.clone(),
-                fs.clone(),
-                languages.clone(),
-                worktree_store.clone(),
-                cx,
-            )
-        });
-
-        let task_store = cx.new(|cx| {
-            let mut task_store = TaskStore::local(
-                buffer_store.downgrade(),
-                worktree_store.clone(),
-                toolchain_store.read(cx).as_language_toolchain_store(),
-                environment.clone(),
-                cx,
-            );
-            task_store.shared(REMOTE_SERVER_PROJECT_ID, session.clone(), cx);
-            task_store
-        });
-        let settings_observer = cx.new(|cx| {
-            let mut observer = SettingsObserver::new_local(
-                fs.clone(),
-                worktree_store.clone(),
-                task_store.clone(),
-                cx,
-            );
-            observer.shared(REMOTE_SERVER_PROJECT_ID, session.clone(), cx);
-            observer
-        });
-
-        let lsp_store = cx.new(|cx| {
-            let mut lsp_store = LspStore::new_local(
-                buffer_store.clone(),
-                worktree_store.clone(),
-                prettier_store.clone(),
-                toolchain_store
-                    .read(cx)
-                    .as_local_store()
-                    .expect("Toolchain store to be local")
-                    .clone(),
-                environment.clone(),
-                manifest_tree,
-                languages.clone(),
-                http_client.clone(),
-                fs.clone(),
-                cx,
-            );
-            lsp_store.shared(REMOTE_SERVER_PROJECT_ID, session.clone(), cx);
-            lsp_store
-        });
-
-        let agent_server_store = cx.new(|cx| {
-            let mut agent_server_store = AgentServerStore::local(
-                node_runtime.clone(),
-                fs.clone(),
-                environment.clone(),
-                http_client.clone(),
-                cx,
-            );
-            agent_server_store.shared(REMOTE_SERVER_PROJECT_ID, session.clone(), cx);
-            agent_server_store
-        });
-
-        cx.subscribe(&lsp_store, Self::on_lsp_store_event).detach();
-        language_extension::init(
-            language_extension::LspAccess::ViaLspStore(lsp_store.clone()),
-            proxy.clone(),
-            languages.clone(),
-        );
-
-        cx.subscribe(&buffer_store, |_this, _buffer_store, event, cx| {
-            if let BufferStoreEvent::BufferAdded(buffer) = event {
-                cx.subscribe(buffer, Self::on_buffer_event).detach();
-            }
-        })
-        .detach();
-
-        let extensions = HeadlessExtensionStore::new(
-            fs.clone(),
-            http_client.clone(),
-            paths::remote_extensions_dir().to_path_buf(),
-            proxy,
-            node_runtime,
-            cx,
-        );
-
-        // local_machine -> ssh handlers
-        session.subscribe_to_entity(REMOTE_SERVER_PROJECT_ID, &worktree_store);
-        session.subscribe_to_entity(REMOTE_SERVER_PROJECT_ID, &buffer_store);
-        session.subscribe_to_entity(REMOTE_SERVER_PROJECT_ID, &cx.entity());
-        session.subscribe_to_entity(REMOTE_SERVER_PROJECT_ID, &lsp_store);
-        session.subscribe_to_entity(REMOTE_SERVER_PROJECT_ID, &task_store);
-        session.subscribe_to_entity(REMOTE_SERVER_PROJECT_ID, &toolchain_store);
-        session.subscribe_to_entity(REMOTE_SERVER_PROJECT_ID, &dap_store);
-        session.subscribe_to_entity(REMOTE_SERVER_PROJECT_ID, &settings_observer);
-        session.subscribe_to_entity(REMOTE_SERVER_PROJECT_ID, &git_store);
-        session.subscribe_to_entity(REMOTE_SERVER_PROJECT_ID, &agent_server_store);
-
-        session.add_request_handler(cx.weak_entity(), Self::handle_list_remote_directory);
-        session.add_request_handler(cx.weak_entity(), Self::handle_get_path_metadata);
-        session.add_request_handler(cx.weak_entity(), Self::handle_shutdown_remote_server);
-        session.add_request_handler(cx.weak_entity(), Self::handle_ping);
-        session.add_request_handler(cx.weak_entity(), Self::handle_get_processes);
-
-        session.add_entity_request_handler(Self::handle_add_worktree);
-        session.add_request_handler(cx.weak_entity(), Self::handle_remove_worktree);
-
-        session.add_entity_request_handler(Self::handle_open_buffer_by_path);
-        session.add_entity_request_handler(Self::handle_open_new_buffer);
-        session.add_entity_request_handler(Self::handle_find_search_candidates);
-        session.add_entity_request_handler(Self::handle_open_server_settings);
-        session.add_entity_request_handler(Self::handle_get_directory_environment);
-        session.add_entity_message_handler(Self::handle_toggle_lsp_logs);
-        session.add_entity_request_handler(Self::handle_open_image_by_path);
-
-        session.add_entity_request_handler(BufferStore::handle_update_buffer);
-        session.add_entity_message_handler(BufferStore::handle_close_buffer);
-
-        session.add_request_handler(
-            extensions.downgrade(),
-            HeadlessExtensionStore::handle_sync_extensions,
-        );
-        session.add_request_handler(
-            extensions.downgrade(),
-            HeadlessExtensionStore::handle_install_extension,
-        );
-
-        BufferStore::init(&session);
-        WorktreeStore::init(&session);
-        SettingsObserver::init(&session);
-        LspStore::init(&session);
-        TaskStore::init(Some(&session));
-        ToolchainStore::init(&session);
-        DapStore::init(&session, cx);
-        // todo(debugger): Re init breakpoint store when we set it up for collab
-        // BreakpointStore::init(&client);
-        GitStore::init(&session);
-        AgentServerStore::init_headless(&session);
-
-        HeadlessProject {
-            next_entry_id: Default::default(),
-            session,
-            settings_observer,
-            fs,
-            worktree_store,
-            buffer_store,
-            lsp_store,
-            task_store,
-            dap_store,
-            agent_server_store,
-            languages,
-            extensions,
-            git_store,
-            environment,
-            _toolchain_store: toolchain_store,
-        }
-    }
-
-    fn on_buffer_event(
-        &mut self,
-        buffer: Entity<Buffer>,
-        event: &BufferEvent,
-        cx: &mut Context<Self>,
-    ) {
-        if let BufferEvent::Operation {
-            operation,
-            is_local: true,
-        } = event
-        {
-            cx.background_spawn(self.session.request(proto::UpdateBuffer {
-                project_id: REMOTE_SERVER_PROJECT_ID,
-                buffer_id: buffer.read(cx).remote_id().to_proto(),
-                operations: vec![serialize_operation(operation)],
-            }))
-            .detach()
-        }
-    }
-
-    fn on_lsp_store_event(
-        &mut self,
-        lsp_store: Entity<LspStore>,
-        event: &LspStoreEvent,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            LspStoreEvent::LanguageServerAdded(id, name, worktree_id) => {
-                let log_store = cx
-                    .try_global::<GlobalLogStore>()
-                    .map(|lsp_logs| lsp_logs.0.clone());
-                if let Some(log_store) = log_store {
-                    log_store.update(cx, |log_store, cx| {
-                        log_store.add_language_server(
-                            LanguageServerKind::LocalSsh {
-                                lsp_store: self.lsp_store.downgrade(),
-                            },
-                            *id,
-                            Some(name.clone()),
-                            *worktree_id,
-                            lsp_store.read(cx).language_server_for_id(*id),
-                            cx,
-                        );
-                    });
-                }
-            }
-            LspStoreEvent::LanguageServerRemoved(id) => {
-                let log_store = cx
-                    .try_global::<GlobalLogStore>()
-                    .map(|lsp_logs| lsp_logs.0.clone());
-                if let Some(log_store) = log_store {
-                    log_store.update(cx, |log_store, cx| {
-                        log_store.remove_language_server(*id, cx);
-                    });
-                }
-            }
-            LspStoreEvent::LanguageServerUpdate {
-                language_server_id,
-                name,
-                message,
-            } => {
-                self.session
-                    .send(proto::UpdateLanguageServer {
-                        project_id: REMOTE_SERVER_PROJECT_ID,
-                        server_name: name.as_ref().map(|name| name.to_string()),
-                        language_server_id: language_server_id.to_proto(),
-                        variant: Some(message.clone()),
-                    })
-                    .log_err();
-            }
-            LspStoreEvent::Notification(message) => {
-                self.session
-                    .send(proto::Toast {
-                        project_id: REMOTE_SERVER_PROJECT_ID,
-                        notification_id: "lsp".to_string(),
-                        message: message.clone(),
-                    })
-                    .log_err();
-            }
-            LspStoreEvent::LanguageServerPrompt(prompt) => {
-                let request = self.session.request(proto::LanguageServerPromptRequest {
-                    project_id: REMOTE_SERVER_PROJECT_ID,
-                    actions: prompt
-                        .actions
-                        .iter()
-                        .map(|action| action.title.to_string())
-                        .collect(),
-                    level: Some(prompt_to_proto(prompt)),
-                    lsp_name: prompt.lsp_name.clone(),
-                    message: prompt.message.clone(),
-                });
-                let prompt = prompt.clone();
-                cx.background_spawn(async move {
-                    let response = request.await?;
-                    if let Some(action_response) = response.action_response {
-                        prompt.respond(action_response as usize).await;
-                    }
-                    anyhow::Ok(())
-                })
-                .detach();
-            }
-            _ => {}
-        }
-    }
-
-    pub async fn handle_add_worktree(
-        this: Entity<Self>,
-        message: TypedEnvelope<proto::AddWorktree>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::AddWorktreeResponse> {
-        use client::ErrorCodeExt;
-        let fs = this.read_with(&cx, |this, _| this.fs.clone())?;
-        let path = PathBuf::from(shellexpand::tilde(&message.payload.path).to_string());
-
-        let canonicalized = match fs.canonicalize(&path).await {
-            Ok(path) => path,
-            Err(e) => {
-                let mut parent = path
-                    .parent()
-                    .ok_or(e)
-                    .with_context(|| format!("{path:?} does not exist"))?;
-                if parent == Path::new("") {
-                    parent = util::paths::home_dir();
-                }
-                let parent = fs.canonicalize(parent).await.map_err(|_| {
-                    anyhow!(
-                        proto::ErrorCode::DevServerProjectPathDoesNotExist
-                            .with_tag("path", path.to_string_lossy().as_ref())
-                    )
-                })?;
-                parent.join(path.file_name().unwrap())
-            }
-        };
-
-        let worktree = this
-            .read_with(&cx.clone(), |this, _| {
-                Worktree::local(
-                    Arc::from(canonicalized.as_path()),
-                    message.payload.visible,
-                    this.fs.clone(),
-                    this.next_entry_id.clone(),
-                    true,
-                    &mut cx,
-                )
-            })?
-            .await?;
-
-        let response = this.read_with(&cx, |_, cx| {
-            let worktree = worktree.read(cx);
-            proto::AddWorktreeResponse {
-                worktree_id: worktree.id().to_proto(),
-                canonicalized_path: canonicalized.to_string_lossy().into_owned(),
-            }
-        })?;
-
-        // We spawn this asynchronously, so that we can send the response back
-        // *before* `worktree_store.add()` can send out UpdateProject requests
-        // to the client about the new worktree.
-        //
-        // That lets the client manage the reference/handles of the newly-added
-        // worktree, before getting interrupted by an UpdateProject request.
-        //
-        // This fixes the problem of the client sending the AddWorktree request,
-        // headless project sending out a project update, client receiving it
-        // and immediately dropping the reference of the new client, causing it
-        // to be dropped on the headless project, and the client only then
-        // receiving a response to AddWorktree.
-        cx.spawn(async move |cx| {
-            this.update(cx, |this, cx| {
-                this.worktree_store.update(cx, |worktree_store, cx| {
-                    worktree_store.add(&worktree, cx);
-                });
-            })
-            .log_err();
-        })
-        .detach();
-
-        Ok(response)
-    }
-
-    pub async fn handle_remove_worktree(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::RemoveWorktree>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::Ack> {
-        let worktree_id = WorktreeId::from_proto(envelope.payload.worktree_id);
-        this.update(&mut cx, |this, cx| {
-            this.worktree_store.update(cx, |worktree_store, cx| {
-                worktree_store.remove_worktree(worktree_id, cx);
-            });
-        })?;
-        Ok(proto::Ack {})
-    }
-
-    pub async fn handle_open_buffer_by_path(
-        this: Entity<Self>,
-        message: TypedEnvelope<proto::OpenBufferByPath>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::OpenBufferResponse> {
-        let worktree_id = WorktreeId::from_proto(message.payload.worktree_id);
-        let path = RelPath::from_proto(&message.payload.path)?;
-        let (buffer_store, buffer) = this.update(&mut cx, |this, cx| {
-            let buffer_store = this.buffer_store.clone();
-            let buffer = this.buffer_store.update(cx, |buffer_store, cx| {
-                buffer_store.open_buffer(ProjectPath { worktree_id, path }, cx)
-            });
-            anyhow::Ok((buffer_store, buffer))
-        })??;
-
-        let buffer = buffer.await?;
-        let buffer_id = buffer.read_with(&cx, |b, _| b.remote_id())?;
-        buffer_store.update(&mut cx, |buffer_store, cx| {
-            buffer_store
-                .create_buffer_for_peer(&buffer, REMOTE_SERVER_PEER_ID, cx)
-                .detach_and_log_err(cx);
-        })?;
-
-        Ok(proto::OpenBufferResponse {
-            buffer_id: buffer_id.to_proto(),
-        })
-    }
-
-    pub async fn handle_open_image_by_path(
-        this: Entity<Self>,
-        message: TypedEnvelope<proto::OpenImageByPath>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::OpenImageResponse> {
-        static NEXT_ID: AtomicU64 = AtomicU64::new(1);
-        let worktree_id = WorktreeId::from_proto(message.payload.worktree_id);
-        let path = RelPath::from_proto(&message.payload.path)?;
-        let project_id = message.payload.project_id;
-        use proto::create_image_for_peer::Variant;
-
-        let (worktree_store, session) = this.read_with(&cx, |this, _| {
-            (this.worktree_store.clone(), this.session.clone())
-        })?;
-
-        let worktree = worktree_store
-            .read_with(&cx, |store, cx| store.worktree_for_id(worktree_id, cx))?
-            .context("worktree not found")?;
-
-        let load_task = worktree.update(&mut cx, |worktree, cx| {
-            worktree.load_binary_file(path.as_ref(), cx)
-        })?;
-
-        let loaded_file = load_task.await?;
-        let content = loaded_file.content;
-        let file = loaded_file.file;
-
-        let proto_file = worktree.read_with(&cx, |_worktree, cx| file.to_proto(cx))?;
-        let image_id =
-            ImageId::from(NonZeroU64::new(NEXT_ID.fetch_add(1, Ordering::Relaxed)).unwrap());
-
-        let format = image::guess_format(&content)
-            .map(|f| format!("{:?}", f).to_lowercase())
-            .unwrap_or_else(|_| "unknown".to_string());
-
-        let state = proto::ImageState {
-            id: image_id.to_proto(),
-            file: Some(proto_file),
-            content_size: content.len() as u64,
-            format,
-        };
-
-        session.send(proto::CreateImageForPeer {
-            project_id,
-            peer_id: Some(REMOTE_SERVER_PEER_ID),
-            variant: Some(Variant::State(state)),
-        })?;
-
-        const CHUNK_SIZE: usize = 1024 * 1024; // 1MB chunks
-        for chunk in content.chunks(CHUNK_SIZE) {
-            session.send(proto::CreateImageForPeer {
-                project_id,
-                peer_id: Some(REMOTE_SERVER_PEER_ID),
-                variant: Some(Variant::Chunk(proto::ImageChunk {
-                    image_id: image_id.to_proto(),
-                    data: chunk.to_vec(),
-                })),
-            })?;
-        }
-
-        Ok(proto::OpenImageResponse {
-            image_id: image_id.to_proto(),
-        })
-    }
-
-    pub async fn handle_open_new_buffer(
-        this: Entity<Self>,
-        _message: TypedEnvelope<proto::OpenNewBuffer>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::OpenBufferResponse> {
-        let (buffer_store, buffer) = this.update(&mut cx, |this, cx| {
-            let buffer_store = this.buffer_store.clone();
-            let buffer = this
-                .buffer_store
-                .update(cx, |buffer_store, cx| buffer_store.create_buffer(true, cx));
-            anyhow::Ok((buffer_store, buffer))
-        })??;
-
-        let buffer = buffer.await?;
-        let buffer_id = buffer.read_with(&cx, |b, _| b.remote_id())?;
-        buffer_store.update(&mut cx, |buffer_store, cx| {
-            buffer_store
-                .create_buffer_for_peer(&buffer, REMOTE_SERVER_PEER_ID, cx)
-                .detach_and_log_err(cx);
-        })?;
-
-        Ok(proto::OpenBufferResponse {
-            buffer_id: buffer_id.to_proto(),
-        })
-    }
-
-    async fn handle_toggle_lsp_logs(
-        _: Entity<Self>,
-        envelope: TypedEnvelope<proto::ToggleLspLogs>,
-        cx: AsyncApp,
-    ) -> Result<()> {
-        let server_id = LanguageServerId::from_proto(envelope.payload.server_id);
-        cx.update(|cx| {
-            let log_store = cx
-                .try_global::<GlobalLogStore>()
-                .map(|global_log_store| global_log_store.0.clone())
-                .context("lsp logs store is missing")?;
-            let toggled_log_kind =
-                match proto::toggle_lsp_logs::LogType::from_i32(envelope.payload.log_type)
-                    .context("invalid log type")?
-                {
-                    proto::toggle_lsp_logs::LogType::Log => LogKind::Logs,
-                    proto::toggle_lsp_logs::LogType::Trace => LogKind::Trace,
-                    proto::toggle_lsp_logs::LogType::Rpc => LogKind::Rpc,
-                };
-            log_store.update(cx, |log_store, _| {
-                log_store.toggle_lsp_logs(server_id, envelope.payload.enabled, toggled_log_kind);
-            });
-            anyhow::Ok(())
-        })??;
-
-        Ok(())
-    }
-
-    async fn handle_open_server_settings(
-        this: Entity<Self>,
-        _: TypedEnvelope<proto::OpenServerSettings>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::OpenBufferResponse> {
-        let settings_path = paths::settings_file();
-        let (worktree, path) = this
-            .update(&mut cx, |this, cx| {
-                this.worktree_store.update(cx, |worktree_store, cx| {
-                    worktree_store.find_or_create_worktree(settings_path, false, cx)
-                })
-            })?
-            .await?;
-
-        let (buffer, buffer_store) = this.update(&mut cx, |this, cx| {
-            let buffer = this.buffer_store.update(cx, |buffer_store, cx| {
-                buffer_store.open_buffer(
-                    ProjectPath {
-                        worktree_id: worktree.read(cx).id(),
-                        path: path,
-                    },
-                    cx,
-                )
-            });
-
-            (buffer, this.buffer_store.clone())
-        })?;
-
-        let buffer = buffer.await?;
-
-        let buffer_id = cx.update(|cx| {
-            if buffer.read(cx).is_empty() {
-                buffer.update(cx, |buffer, cx| {
-                    buffer.edit([(0..0, initial_server_settings_content())], None, cx)
-                });
-            }
-
-            let buffer_id = buffer.read(cx).remote_id();
-
-            buffer_store.update(cx, |buffer_store, cx| {
-                buffer_store
-                    .create_buffer_for_peer(&buffer, REMOTE_SERVER_PEER_ID, cx)
-                    .detach_and_log_err(cx);
-            });
-
-            buffer_id
-        })?;
-
-        Ok(proto::OpenBufferResponse {
-            buffer_id: buffer_id.to_proto(),
-        })
-    }
-
-    async fn handle_find_search_candidates(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::FindSearchCandidates>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::FindSearchCandidatesResponse> {
-        let message = envelope.payload;
-        let query = SearchQuery::from_proto(
-            message.query.context("missing query field")?,
-            PathStyle::local(),
-        )?;
-        let results = this.update(&mut cx, |this, cx| {
-            project::Search::local(
-                this.fs.clone(),
-                this.buffer_store.clone(),
-                this.worktree_store.clone(),
-                message.limit as _,
-                cx,
-            )
-            .into_handle(query, cx)
-            .matching_buffers(cx)
-        })?;
-
-        let mut response = proto::FindSearchCandidatesResponse {
-            buffer_ids: Vec::new(),
-        };
-
-        let buffer_store = this.read_with(&cx, |this, _| this.buffer_store.clone())?;
-
-        while let Ok(buffer) = results.recv().await {
-            let buffer_id = buffer.read_with(&cx, |this, _| this.remote_id())?;
-            response.buffer_ids.push(buffer_id.to_proto());
-            buffer_store
-                .update(&mut cx, |buffer_store, cx| {
-                    buffer_store.create_buffer_for_peer(&buffer, REMOTE_SERVER_PEER_ID, cx)
-                })?
-                .await?;
-        }
-
-        Ok(response)
-    }
-
-    async fn handle_list_remote_directory(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::ListRemoteDirectory>,
-        cx: AsyncApp,
-    ) -> Result<proto::ListRemoteDirectoryResponse> {
-        let fs = cx.read_entity(&this, |this, _| this.fs.clone())?;
-        let expanded = PathBuf::from(shellexpand::tilde(&envelope.payload.path).to_string());
-        let check_info = envelope
-            .payload
-            .config
-            .as_ref()
-            .is_some_and(|config| config.is_dir);
-
-        let mut entries = Vec::new();
-        let mut entry_info = Vec::new();
-        let mut response = fs.read_dir(&expanded).await?;
-        while let Some(path) = response.next().await {
-            let path = path?;
-            if let Some(file_name) = path.file_name() {
-                entries.push(file_name.to_string_lossy().into_owned());
-                if check_info {
-                    let is_dir = fs.is_dir(&path).await;
-                    entry_info.push(proto::EntryInfo { is_dir });
-                }
-            }
-        }
-        Ok(proto::ListRemoteDirectoryResponse {
-            entries,
-            entry_info,
-        })
-    }
-
-    async fn handle_get_path_metadata(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::GetPathMetadata>,
-        cx: AsyncApp,
-    ) -> Result<proto::GetPathMetadataResponse> {
-        let fs = cx.read_entity(&this, |this, _| this.fs.clone())?;
-        let expanded = PathBuf::from(shellexpand::tilde(&envelope.payload.path).to_string());
-
-        let metadata = fs.metadata(&expanded).await?;
-        let is_dir = metadata.map(|metadata| metadata.is_dir).unwrap_or(false);
-
-        Ok(proto::GetPathMetadataResponse {
-            exists: metadata.is_some(),
-            is_dir,
-            path: expanded.to_string_lossy().into_owned(),
-        })
-    }
-
-    async fn handle_shutdown_remote_server(
-        _this: Entity<Self>,
-        _envelope: TypedEnvelope<proto::ShutdownRemoteServer>,
-        cx: AsyncApp,
-    ) -> Result<proto::Ack> {
-        cx.spawn(async move |cx| {
-            cx.update(|cx| {
-                // TODO: This is a hack, because in a headless project, shutdown isn't executed
-                // when calling quit, but it should be.
-                cx.shutdown();
-                cx.quit();
-            })
-        })
-        .detach();
-
-        Ok(proto::Ack {})
-    }
-
-    pub async fn handle_ping(
-        _this: Entity<Self>,
-        _envelope: TypedEnvelope<proto::Ping>,
-        _cx: AsyncApp,
-    ) -> Result<proto::Ack> {
-        log::debug!("Received ping from client");
-        Ok(proto::Ack {})
-    }
-
-    async fn handle_get_processes(
-        _this: Entity<Self>,
-        _envelope: TypedEnvelope<proto::GetProcesses>,
-        _cx: AsyncApp,
-    ) -> Result<proto::GetProcessesResponse> {
-        let mut processes = Vec::new();
-        let refresh_kind = RefreshKind::nothing().with_processes(
-            ProcessRefreshKind::nothing()
-                .without_tasks()
-                .with_cmd(UpdateKind::Always),
-        );
-
-        for process in System::new_with_specifics(refresh_kind)
-            .processes()
-            .values()
-        {
-            let name = process.name().to_string_lossy().into_owned();
-            let command = process
-                .cmd()
-                .iter()
-                .map(|s| s.to_string_lossy().into_owned())
-                .collect::<Vec<_>>();
-
-            processes.push(proto::ProcessInfo {
-                pid: process.pid().as_u32(),
-                name,
-                command,
-            });
-        }
-
-        processes.sort_by_key(|p| p.name.clone());
-
-        Ok(proto::GetProcessesResponse { processes })
-    }
-
-    async fn handle_get_directory_environment(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::GetDirectoryEnvironment>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::DirectoryEnvironment> {
-        let shell = task::shell_from_proto(envelope.payload.shell.context("missing shell")?)?;
-        let directory = PathBuf::from(envelope.payload.directory);
-        let environment = this
-            .update(&mut cx, |this, cx| {
-                this.environment.update(cx, |environment, cx| {
-                    environment.local_directory_environment(&shell, directory.into(), cx)
-                })
-            })?
-            .await
-            .context("failed to get directory environment")?
-            .into_iter()
-            .collect();
-        Ok(proto::DirectoryEnvironment { environment })
-    }
-}
-
-fn prompt_to_proto(
-    prompt: &project::LanguageServerPromptRequest,
-) -> proto::language_server_prompt_request::Level {
-    match prompt.level {
-        PromptLevel::Info => proto::language_server_prompt_request::Level::Info(
-            proto::language_server_prompt_request::Info {},
-        ),
-        PromptLevel::Warning => proto::language_server_prompt_request::Level::Warning(
-            proto::language_server_prompt_request::Warning {},
-        ),
-        PromptLevel::Critical => proto::language_server_prompt_request::Level::Critical(
-            proto::language_server_prompt_request::Critical {},
-        ),
-    }
-}
diff --git a/crates/remote_server/src/main.rs b/crates/remote_server/src/main.rs
deleted file mode 100644
index 368c7cb639..0000000000
--- a/crates/remote_server/src/main.rs
+++ /dev/null
@@ -1,55 +0,0 @@
-#![cfg_attr(target_os = "windows", allow(unused, dead_code))]
-
-use clap::Parser;
-use remote_server::Commands;
-use std::path::PathBuf;
-
-#[derive(Parser)]
-#[command(disable_version_flag = true)]
-struct Cli {
-    #[command(subcommand)]
-    command: Option<Commands>,
-    /// Used for SSH/Git password authentication, to remove the need for netcat as a dependency,
-    /// by having Zed act like netcat communicating over a Unix socket.
-    #[arg(long, hide = true)]
-    askpass: Option<String>,
-    /// Used for recording minidumps on crashes by having the server run a separate
-    /// process communicating over a socket.
-    #[arg(long, hide = true)]
-    crash_handler: Option<PathBuf>,
-    /// Used for loading the environment from the project.
-    #[arg(long, hide = true)]
-    printenv: bool,
-}
-
-#[cfg(windows)]
-fn main() {
-    unimplemented!()
-}
-
-#[cfg(not(windows))]
-fn main() -> anyhow::Result<()> {
-    let cli = Cli::parse();
-
-    if let Some(socket_path) = &cli.askpass {
-        askpass::main(socket_path);
-        return Ok(());
-    }
-
-    if let Some(socket) = &cli.crash_handler {
-        crashes::crash_server(socket.as_path());
-        return Ok(());
-    }
-
-    if cli.printenv {
-        util::shell_env::print_env();
-        return Ok(());
-    }
-
-    if let Some(command) = cli.command {
-        remote_server::run(command)
-    } else {
-        eprintln!("usage: remote <run|proxy|version>");
-        std::process::exit(1);
-    }
-}
diff --git a/crates/remote_server/src/remote_editing_tests.rs b/crates/remote_server/src/remote_editing_tests.rs
deleted file mode 100644
index a91d1d055d..0000000000
--- a/crates/remote_server/src/remote_editing_tests.rs
+++ /dev/null
@@ -1,1981 +0,0 @@
-/// todo(windows)
-/// The tests in this file assume that server_cx is running on Windows too.
-/// We neead to find a way to test Windows-Non-Windows interactions.
-use crate::headless_project::HeadlessProject;
-use agent::{AgentTool, ReadFileTool, ReadFileToolInput, Templates, Thread, ToolCallEventStream};
-use client::{Client, UserStore};
-use clock::FakeSystemClock;
-use collections::{HashMap, HashSet};
-use language_model::{LanguageModelToolResultContent, fake_provider::FakeLanguageModel};
-use prompt_store::ProjectContext;
-
-use extension::ExtensionHostProxy;
-use fs::{FakeFs, Fs};
-use gpui::{AppContext as _, Entity, SharedString, TestAppContext};
-use http_client::{BlockedHttpClient, FakeHttpClient};
-use language::{
-    Buffer, FakeLspAdapter, LanguageConfig, LanguageMatcher, LanguageRegistry, LineEnding,
-    language_settings::{AllLanguageSettings, language_settings},
-};
-use lsp::{CompletionContext, CompletionResponse, CompletionTriggerKind, LanguageServerName};
-use node_runtime::NodeRuntime;
-use project::{
-    ProgressToken, Project,
-    agent_server_store::AgentServerCommand,
-    search::{SearchQuery, SearchResult},
-};
-use remote::RemoteClient;
-use serde_json::json;
-use settings::{Settings, SettingsLocation, SettingsStore, initial_server_settings_content};
-use smol::stream::StreamExt;
-use std::{
-    path::{Path, PathBuf},
-    sync::Arc,
-};
-use unindent::Unindent as _;
-use util::{path, rel_path::rel_path};
-
-#[gpui::test]
-async fn test_basic_remote_editing(cx: &mut TestAppContext, server_cx: &mut TestAppContext) {
-    let fs = FakeFs::new(server_cx.executor());
-    fs.insert_tree(
-        path!("/code"),
-        json!({
-            "project1": {
-                ".git": {},
-                "README.md": "# project 1",
-                "src": {
-                    "lib.rs": "fn one() -> usize { 1 }"
-                }
-            },
-            "project2": {
-                "README.md": "# project 2",
-            },
-        }),
-    )
-    .await;
-    fs.set_index_for_repo(
-        Path::new(path!("/code/project1/.git")),
-        &[("src/lib.rs", "fn one() -> usize { 0 }".into())],
-    );
-
-    let (project, _headless) = init_test(&fs, cx, server_cx).await;
-    let (worktree, _) = project
-        .update(cx, |project, cx| {
-            project.find_or_create_worktree(path!("/code/project1"), true, cx)
-        })
-        .await
-        .unwrap();
-
-    // The client sees the worktree's contents.
-    cx.executor().run_until_parked();
-    let worktree_id = worktree.read_with(cx, |worktree, _| worktree.id());
-    worktree.update(cx, |worktree, _cx| {
-        assert_eq!(
-            worktree.paths().collect::<Vec<_>>(),
-            vec![
-                rel_path("README.md"),
-                rel_path("src"),
-                rel_path("src/lib.rs"),
-            ]
-        );
-    });
-
-    // The user opens a buffer in the remote worktree. The buffer's
-    // contents are loaded from the remote filesystem.
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_buffer((worktree_id, rel_path("src/lib.rs")), cx)
-        })
-        .await
-        .unwrap();
-    let diff = project
-        .update(cx, |project, cx| {
-            project.open_unstaged_diff(buffer.clone(), cx)
-        })
-        .await
-        .unwrap();
-
-    diff.update(cx, |diff, _| {
-        assert_eq!(diff.base_text_string().unwrap(), "fn one() -> usize { 0 }");
-    });
-
-    buffer.update(cx, |buffer, cx| {
-        assert_eq!(buffer.text(), "fn one() -> usize { 1 }");
-        let ix = buffer.text().find('1').unwrap();
-        buffer.edit([(ix..ix + 1, "100")], None, cx);
-    });
-
-    // The user saves the buffer. The new contents are written to the
-    // remote filesystem.
-    project
-        .update(cx, |project, cx| project.save_buffer(buffer.clone(), cx))
-        .await
-        .unwrap();
-    assert_eq!(
-        fs.load("/code/project1/src/lib.rs".as_ref()).await.unwrap(),
-        "fn one() -> usize { 100 }"
-    );
-
-    // A new file is created in the remote filesystem. The user
-    // sees the new file.
-    fs.save(
-        path!("/code/project1/src/main.rs").as_ref(),
-        &"fn main() {}".into(),
-        Default::default(),
-    )
-    .await
-    .unwrap();
-    cx.executor().run_until_parked();
-    worktree.update(cx, |worktree, _cx| {
-        assert_eq!(
-            worktree.paths().collect::<Vec<_>>(),
-            vec![
-                rel_path("README.md"),
-                rel_path("src"),
-                rel_path("src/lib.rs"),
-                rel_path("src/main.rs"),
-            ]
-        );
-    });
-
-    // A file that is currently open in a buffer is renamed.
-    fs.rename(
-        path!("/code/project1/src/lib.rs").as_ref(),
-        path!("/code/project1/src/lib2.rs").as_ref(),
-        Default::default(),
-    )
-    .await
-    .unwrap();
-    cx.executor().run_until_parked();
-    buffer.update(cx, |buffer, _| {
-        assert_eq!(&**buffer.file().unwrap().path(), rel_path("src/lib2.rs"));
-    });
-
-    fs.set_index_for_repo(
-        Path::new(path!("/code/project1/.git")),
-        &[("src/lib2.rs", "fn one() -> usize { 100 }".into())],
-    );
-    cx.executor().run_until_parked();
-    diff.update(cx, |diff, _| {
-        assert_eq!(
-            diff.base_text_string().unwrap(),
-            "fn one() -> usize { 100 }"
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_remote_project_search(cx: &mut TestAppContext, server_cx: &mut TestAppContext) {
-    let fs = FakeFs::new(server_cx.executor());
-    fs.insert_tree(
-        path!("/code"),
-        json!({
-            "project1": {
-                ".git": {},
-                "README.md": "# project 1",
-                "src": {
-                    "lib.rs": "fn one() -> usize { 1 }"
-                }
-            },
-        }),
-    )
-    .await;
-
-    let (project, headless) = init_test(&fs, cx, server_cx).await;
-
-    project
-        .update(cx, |project, cx| {
-            project.find_or_create_worktree(path!("/code/project1"), true, cx)
-        })
-        .await
-        .unwrap();
-
-    cx.run_until_parked();
-
-    async fn do_search(project: &Entity<Project>, mut cx: TestAppContext) -> Entity<Buffer> {
-        let receiver = project.update(&mut cx, |project, cx| {
-            project.search(
-                SearchQuery::text(
-                    "project",
-                    false,
-                    true,
-                    false,
-                    Default::default(),
-                    Default::default(),
-                    false,
-                    None,
-                )
-                .unwrap(),
-                cx,
-            )
-        });
-
-        let first_response = receiver.recv().await.unwrap();
-        let SearchResult::Buffer { buffer, .. } = first_response else {
-            panic!("incorrect result");
-        };
-        buffer.update(&mut cx, |buffer, cx| {
-            assert_eq!(
-                buffer.file().unwrap().full_path(cx).to_string_lossy(),
-                path!("project1/README.md")
-            )
-        });
-
-        assert!(receiver.recv().await.is_err());
-        buffer
-    }
-
-    let buffer = do_search(&project, cx.clone()).await;
-
-    // test that the headless server is tracking which buffers we have open correctly.
-    cx.run_until_parked();
-    headless.update(server_cx, |headless, cx| {
-        assert!(headless.buffer_store.read(cx).has_shared_buffers())
-    });
-    do_search(&project, cx.clone()).await;
-
-    cx.update(|_| {
-        drop(buffer);
-    });
-    cx.run_until_parked();
-    headless.update(server_cx, |headless, cx| {
-        assert!(!headless.buffer_store.read(cx).has_shared_buffers())
-    });
-
-    do_search(&project, cx.clone()).await;
-}
-
-#[gpui::test]
-async fn test_remote_settings(cx: &mut TestAppContext, server_cx: &mut TestAppContext) {
-    let fs = FakeFs::new(server_cx.executor());
-    fs.insert_tree(
-        "/code",
-        json!({
-            "project1": {
-                ".git": {},
-                "README.md": "# project 1",
-                "src": {
-                    "lib.rs": "fn one() -> usize { 1 }"
-                }
-            },
-        }),
-    )
-    .await;
-
-    let (project, headless) = init_test(&fs, cx, server_cx).await;
-
-    cx.update_global(|settings_store: &mut SettingsStore, cx| {
-        settings_store.set_user_settings(
-            r#"{"languages":{"Rust":{"language_servers":["from-local-settings"]}}}"#,
-            cx,
-        )
-    })
-    .unwrap();
-
-    cx.run_until_parked();
-
-    server_cx.read(|cx| {
-        assert_eq!(
-            AllLanguageSettings::get_global(cx)
-                .language(None, Some(&"Rust".into()), cx)
-                .language_servers,
-            ["from-local-settings"],
-            "User language settings should be synchronized with the server settings"
-        )
-    });
-
-    server_cx
-        .update_global(|settings_store: &mut SettingsStore, cx| {
-            settings_store.set_server_settings(
-                r#"{"languages":{"Rust":{"language_servers":["from-server-settings"]}}}"#,
-                cx,
-            )
-        })
-        .unwrap();
-
-    cx.run_until_parked();
-
-    server_cx.read(|cx| {
-        assert_eq!(
-            AllLanguageSettings::get_global(cx)
-                .language(None, Some(&"Rust".into()), cx)
-                .language_servers,
-            ["from-server-settings".to_string()],
-            "Server language settings should take precedence over the user settings"
-        )
-    });
-
-    fs.insert_tree(
-        "/code/project1/.zed",
-        json!({
-            "settings.json": r#"
-                  {
-                    "languages": {"Rust":{"language_servers":["override-rust-analyzer"]}},
-                    "lsp": {
-                      "override-rust-analyzer": {
-                        "binary": {
-                          "path": "~/.cargo/bin/rust-analyzer"
-                        }
-                      }
-                    }
-                  }"#
-        }),
-    )
-    .await;
-
-    let worktree_id = project
-        .update(cx, |project, cx| {
-            project.find_or_create_worktree("/code/project1", true, cx)
-        })
-        .await
-        .unwrap()
-        .0
-        .read_with(cx, |worktree, _| worktree.id());
-
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_buffer((worktree_id, rel_path("src/lib.rs")), cx)
-        })
-        .await
-        .unwrap();
-    cx.run_until_parked();
-
-    server_cx.read(|cx| {
-        let worktree_id = headless
-            .read(cx)
-            .worktree_store
-            .read(cx)
-            .worktrees()
-            .next()
-            .unwrap()
-            .read(cx)
-            .id();
-        assert_eq!(
-            AllLanguageSettings::get(
-                Some(SettingsLocation {
-                    worktree_id,
-                    path: rel_path("src/lib.rs")
-                }),
-                cx
-            )
-            .language(None, Some(&"Rust".into()), cx)
-            .language_servers,
-            ["override-rust-analyzer".to_string()]
-        )
-    });
-
-    cx.read(|cx| {
-        let file = buffer.read(cx).file();
-        assert_eq!(
-            language_settings(Some("Rust".into()), file, cx).language_servers,
-            ["override-rust-analyzer".to_string()]
-        )
-    });
-}
-
-#[gpui::test]
-async fn test_remote_lsp(cx: &mut TestAppContext, server_cx: &mut TestAppContext) {
-    let fs = FakeFs::new(server_cx.executor());
-    fs.insert_tree(
-        path!("/code"),
-        json!({
-            "project1": {
-                ".git": {},
-                "README.md": "# project 1",
-                "src": {
-                    "lib.rs": "fn one() -> usize { 1 }"
-                }
-            },
-        }),
-    )
-    .await;
-
-    let (project, headless) = init_test(&fs, cx, server_cx).await;
-
-    fs.insert_tree(
-        path!("/code/project1/.zed"),
-        json!({
-            "settings.json": r#"
-          {
-            "languages": {"Rust":{"language_servers":["rust-analyzer", "fake-analyzer"]}},
-            "lsp": {
-              "rust-analyzer": {
-                "binary": {
-                  "path": "~/.cargo/bin/rust-analyzer"
-                }
-              },
-              "fake-analyzer": {
-               "binary": {
-                "path": "~/.cargo/bin/rust-analyzer"
-               }
-              }
-            }
-          }"#
-        }),
-    )
-    .await;
-
-    cx.update_entity(&project, |project, _| {
-        project.languages().register_test_language(LanguageConfig {
-            name: "Rust".into(),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["rs".into()],
-                ..Default::default()
-            },
-            ..Default::default()
-        });
-        project.languages().register_fake_lsp_adapter(
-            "Rust",
-            FakeLspAdapter {
-                name: "rust-analyzer",
-                capabilities: lsp::ServerCapabilities {
-                    completion_provider: Some(lsp::CompletionOptions::default()),
-                    rename_provider: Some(lsp::OneOf::Left(true)),
-                    ..lsp::ServerCapabilities::default()
-                },
-                ..FakeLspAdapter::default()
-            },
-        );
-        project.languages().register_fake_lsp_adapter(
-            "Rust",
-            FakeLspAdapter {
-                name: "fake-analyzer",
-                capabilities: lsp::ServerCapabilities {
-                    completion_provider: Some(lsp::CompletionOptions::default()),
-                    rename_provider: Some(lsp::OneOf::Left(true)),
-                    ..lsp::ServerCapabilities::default()
-                },
-                ..FakeLspAdapter::default()
-            },
-        )
-    });
-
-    let mut fake_lsp = server_cx.update(|cx| {
-        headless.read(cx).languages.register_fake_lsp_server(
-            LanguageServerName("rust-analyzer".into()),
-            lsp::ServerCapabilities {
-                completion_provider: Some(lsp::CompletionOptions::default()),
-                rename_provider: Some(lsp::OneOf::Left(true)),
-                ..lsp::ServerCapabilities::default()
-            },
-            None,
-        )
-    });
-
-    let mut fake_second_lsp = server_cx.update(|cx| {
-        headless.read(cx).languages.register_fake_lsp_adapter(
-            "Rust",
-            FakeLspAdapter {
-                name: "fake-analyzer",
-                capabilities: lsp::ServerCapabilities {
-                    completion_provider: Some(lsp::CompletionOptions::default()),
-                    rename_provider: Some(lsp::OneOf::Left(true)),
-                    ..lsp::ServerCapabilities::default()
-                },
-                ..FakeLspAdapter::default()
-            },
-        );
-        headless.read(cx).languages.register_fake_lsp_server(
-            LanguageServerName("fake-analyzer".into()),
-            lsp::ServerCapabilities {
-                completion_provider: Some(lsp::CompletionOptions::default()),
-                rename_provider: Some(lsp::OneOf::Left(true)),
-                ..lsp::ServerCapabilities::default()
-            },
-            None,
-        )
-    });
-
-    cx.run_until_parked();
-
-    let worktree_id = project
-        .update(cx, |project, cx| {
-            project.find_or_create_worktree(path!("/code/project1"), true, cx)
-        })
-        .await
-        .unwrap()
-        .0
-        .read_with(cx, |worktree, _| worktree.id());
-
-    // Wait for the settings to synchronize
-    cx.run_until_parked();
-
-    let (buffer, _handle) = project
-        .update(cx, |project, cx| {
-            project.open_buffer_with_lsp((worktree_id, rel_path("src/lib.rs")), cx)
-        })
-        .await
-        .unwrap();
-    cx.run_until_parked();
-
-    let fake_lsp = fake_lsp.next().await.unwrap();
-    let fake_second_lsp = fake_second_lsp.next().await.unwrap();
-
-    cx.read(|cx| {
-        let file = buffer.read(cx).file();
-        assert_eq!(
-            language_settings(Some("Rust".into()), file, cx).language_servers,
-            ["rust-analyzer".to_string(), "fake-analyzer".to_string()]
-        )
-    });
-
-    let buffer_id = cx.read(|cx| {
-        let buffer = buffer.read(cx);
-        assert_eq!(buffer.language().unwrap().name(), "Rust".into());
-        buffer.remote_id()
-    });
-
-    server_cx.read(|cx| {
-        let buffer = headless
-            .read(cx)
-            .buffer_store
-            .read(cx)
-            .get(buffer_id)
-            .unwrap();
-
-        assert_eq!(buffer.read(cx).language().unwrap().name(), "Rust".into());
-    });
-
-    server_cx.read(|cx| {
-        let lsp_store = headless.read(cx).lsp_store.read(cx);
-        assert_eq!(lsp_store.as_local().unwrap().language_servers.len(), 2);
-    });
-
-    fake_lsp.set_request_handler::<lsp::request::Completion, _, _>(|_, _| async move {
-        Ok(Some(CompletionResponse::Array(vec![lsp::CompletionItem {
-            label: "boop".to_string(),
-            ..Default::default()
-        }])))
-    });
-
-    fake_second_lsp.set_request_handler::<lsp::request::Completion, _, _>(|_, _| async move {
-        Ok(Some(CompletionResponse::Array(vec![lsp::CompletionItem {
-            label: "beep".to_string(),
-            ..Default::default()
-        }])))
-    });
-
-    let result = project
-        .update(cx, |project, cx| {
-            project.completions(
-                &buffer,
-                0,
-                CompletionContext {
-                    trigger_kind: CompletionTriggerKind::INVOKED,
-                    trigger_character: None,
-                },
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-
-    assert_eq!(
-        result
-            .into_iter()
-            .flat_map(|response| response.completions)
-            .map(|c| c.label.text)
-            .collect::<Vec<_>>(),
-        vec!["boop".to_string(), "beep".to_string()]
-    );
-
-    fake_lsp.set_request_handler::<lsp::request::Rename, _, _>(|_, _| async move {
-        Ok(Some(lsp::WorkspaceEdit {
-            changes: Some(
-                [(
-                    lsp::Uri::from_file_path(path!("/code/project1/src/lib.rs")).unwrap(),
-                    vec![lsp::TextEdit::new(
-                        lsp::Range::new(lsp::Position::new(0, 3), lsp::Position::new(0, 6)),
-                        "two".to_string(),
-                    )],
-                )]
-                .into_iter()
-                .collect(),
-            ),
-            ..Default::default()
-        }))
-    });
-
-    project
-        .update(cx, |project, cx| {
-            project.perform_rename(buffer.clone(), 3, "two".to_string(), cx)
-        })
-        .await
-        .unwrap();
-
-    cx.run_until_parked();
-    buffer.update(cx, |buffer, _| {
-        assert_eq!(buffer.text(), "fn two() -> usize { 1 }")
-    })
-}
-
-#[gpui::test]
-async fn test_remote_cancel_language_server_work(
-    cx: &mut TestAppContext,
-    server_cx: &mut TestAppContext,
-) {
-    let fs = FakeFs::new(server_cx.executor());
-    fs.insert_tree(
-        path!("/code"),
-        json!({
-            "project1": {
-                ".git": {},
-                "README.md": "# project 1",
-                "src": {
-                    "lib.rs": "fn one() -> usize { 1 }"
-                }
-            },
-        }),
-    )
-    .await;
-
-    let (project, headless) = init_test(&fs, cx, server_cx).await;
-
-    fs.insert_tree(
-        path!("/code/project1/.zed"),
-        json!({
-            "settings.json": r#"
-          {
-            "languages": {"Rust":{"language_servers":["rust-analyzer"]}},
-            "lsp": {
-              "rust-analyzer": {
-                "binary": {
-                  "path": "~/.cargo/bin/rust-analyzer"
-                }
-              }
-            }
-          }"#
-        }),
-    )
-    .await;
-
-    cx.update_entity(&project, |project, _| {
-        project.languages().register_test_language(LanguageConfig {
-            name: "Rust".into(),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["rs".into()],
-                ..Default::default()
-            },
-            ..Default::default()
-        });
-        project.languages().register_fake_lsp_adapter(
-            "Rust",
-            FakeLspAdapter {
-                name: "rust-analyzer",
-                ..Default::default()
-            },
-        )
-    });
-
-    let mut fake_lsp = server_cx.update(|cx| {
-        headless.read(cx).languages.register_fake_lsp_server(
-            LanguageServerName("rust-analyzer".into()),
-            Default::default(),
-            None,
-        )
-    });
-
-    cx.run_until_parked();
-
-    let worktree_id = project
-        .update(cx, |project, cx| {
-            project.find_or_create_worktree(path!("/code/project1"), true, cx)
-        })
-        .await
-        .unwrap()
-        .0
-        .read_with(cx, |worktree, _| worktree.id());
-
-    cx.run_until_parked();
-
-    let (buffer, _handle) = project
-        .update(cx, |project, cx| {
-            project.open_buffer_with_lsp((worktree_id, rel_path("src/lib.rs")), cx)
-        })
-        .await
-        .unwrap();
-
-    cx.run_until_parked();
-
-    let mut fake_lsp = fake_lsp.next().await.unwrap();
-
-    // Cancelling all language server work for a given buffer
-    {
-        // Two operations, one cancellable and one not.
-        fake_lsp
-            .start_progress_with(
-                "another-token",
-                lsp::WorkDoneProgressBegin {
-                    cancellable: Some(false),
-                    ..Default::default()
-                },
-            )
-            .await;
-
-        let progress_token = "the-progress-token";
-        fake_lsp
-            .start_progress_with(
-                progress_token,
-                lsp::WorkDoneProgressBegin {
-                    cancellable: Some(true),
-                    ..Default::default()
-                },
-            )
-            .await;
-
-        cx.executor().run_until_parked();
-
-        project.update(cx, |project, cx| {
-            project.cancel_language_server_work_for_buffers([buffer.clone()], cx)
-        });
-
-        cx.executor().run_until_parked();
-
-        // Verify the cancellation was received on the server side
-        let cancel_notification = fake_lsp
-            .receive_notification::<lsp::notification::WorkDoneProgressCancel>()
-            .await;
-        assert_eq!(
-            cancel_notification.token,
-            lsp::NumberOrString::String(progress_token.into())
-        );
-    }
-
-    // Cancelling work by server_id and token
-    {
-        let server_id = fake_lsp.server.server_id();
-        let progress_token = "the-progress-token";
-
-        fake_lsp
-            .start_progress_with(
-                progress_token,
-                lsp::WorkDoneProgressBegin {
-                    cancellable: Some(true),
-                    ..Default::default()
-                },
-            )
-            .await;
-
-        cx.executor().run_until_parked();
-
-        project.update(cx, |project, cx| {
-            project.cancel_language_server_work(
-                server_id,
-                Some(ProgressToken::String(SharedString::from(progress_token))),
-                cx,
-            )
-        });
-
-        cx.executor().run_until_parked();
-
-        // Verify the cancellation was received on the server side
-        let cancel_notification = fake_lsp
-            .receive_notification::<lsp::notification::WorkDoneProgressCancel>()
-            .await;
-        assert_eq!(
-            cancel_notification.token,
-            lsp::NumberOrString::String(progress_token.to_owned())
-        );
-    }
-}
-
-#[gpui::test]
-async fn test_remote_reload(cx: &mut TestAppContext, server_cx: &mut TestAppContext) {
-    let fs = FakeFs::new(server_cx.executor());
-    fs.insert_tree(
-        path!("/code"),
-        json!({
-            "project1": {
-                ".git": {},
-                "README.md": "# project 1",
-                "src": {
-                    "lib.rs": "fn one() -> usize { 1 }"
-                }
-            },
-        }),
-    )
-    .await;
-
-    let (project, _headless) = init_test(&fs, cx, server_cx).await;
-    let (worktree, _) = project
-        .update(cx, |project, cx| {
-            project.find_or_create_worktree(path!("/code/project1"), true, cx)
-        })
-        .await
-        .unwrap();
-
-    let worktree_id = cx.update(|cx| worktree.read(cx).id());
-
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_buffer((worktree_id, rel_path("src/lib.rs")), cx)
-        })
-        .await
-        .unwrap();
-
-    fs.save(
-        &PathBuf::from(path!("/code/project1/src/lib.rs")),
-        &("bangles".to_string().into()),
-        LineEnding::Unix,
-    )
-    .await
-    .unwrap();
-
-    cx.run_until_parked();
-
-    buffer.update(cx, |buffer, cx| {
-        assert_eq!(buffer.text(), "bangles");
-        buffer.edit([(0..0, "a")], None, cx);
-    });
-
-    fs.save(
-        &PathBuf::from(path!("/code/project1/src/lib.rs")),
-        &("bloop".to_string().into()),
-        LineEnding::Unix,
-    )
-    .await
-    .unwrap();
-
-    cx.run_until_parked();
-    cx.update(|cx| {
-        assert!(buffer.read(cx).has_conflict());
-    });
-
-    project
-        .update(cx, |project, cx| {
-            project.reload_buffers([buffer.clone()].into_iter().collect(), false, cx)
-        })
-        .await
-        .unwrap();
-    cx.run_until_parked();
-
-    cx.update(|cx| {
-        assert!(!buffer.read(cx).has_conflict());
-    });
-}
-
-#[gpui::test]
-async fn test_remote_resolve_path_in_buffer(
-    cx: &mut TestAppContext,
-    server_cx: &mut TestAppContext,
-) {
-    let fs = FakeFs::new(server_cx.executor());
-    // Even though we are not testing anything from project1, it is necessary to test if project2 is picking up correct worktree
-    fs.insert_tree(
-        path!("/code"),
-        json!({
-            "project1": {
-                ".git": {},
-                "README.md": "# project 1",
-                "src": {
-                    "lib.rs": "fn one() -> usize { 1 }"
-                }
-            },
-            "project2": {
-                ".git": {},
-                "README.md": "# project 2",
-                "src": {
-                    "lib.rs": "fn two() -> usize { 2 }"
-                }
-            }
-        }),
-    )
-    .await;
-
-    let (project, _headless) = init_test(&fs, cx, server_cx).await;
-
-    let _ = project
-        .update(cx, |project, cx| {
-            project.find_or_create_worktree(path!("/code/project1"), true, cx)
-        })
-        .await
-        .unwrap();
-
-    let (worktree2, _) = project
-        .update(cx, |project, cx| {
-            project.find_or_create_worktree(path!("/code/project2"), true, cx)
-        })
-        .await
-        .unwrap();
-
-    let worktree2_id = cx.update(|cx| worktree2.read(cx).id());
-
-    cx.run_until_parked();
-
-    let buffer2 = project
-        .update(cx, |project, cx| {
-            project.open_buffer((worktree2_id, rel_path("src/lib.rs")), cx)
-        })
-        .await
-        .unwrap();
-
-    let path = project
-        .update(cx, |project, cx| {
-            project.resolve_path_in_buffer(path!("/code/project2/README.md"), &buffer2, cx)
-        })
-        .await
-        .unwrap();
-    assert!(path.is_file());
-    assert_eq!(path.abs_path().unwrap(), path!("/code/project2/README.md"));
-
-    let path = project
-        .update(cx, |project, cx| {
-            project.resolve_path_in_buffer("../README.md", &buffer2, cx)
-        })
-        .await
-        .unwrap();
-    assert!(path.is_file());
-    assert_eq!(
-        path.project_path().unwrap().clone(),
-        (worktree2_id, rel_path("README.md")).into()
-    );
-
-    let path = project
-        .update(cx, |project, cx| {
-            project.resolve_path_in_buffer("../src", &buffer2, cx)
-        })
-        .await
-        .unwrap();
-    assert_eq!(
-        path.project_path().unwrap().clone(),
-        (worktree2_id, rel_path("src")).into()
-    );
-    assert!(path.is_dir());
-}
-
-#[gpui::test]
-async fn test_remote_resolve_abs_path(cx: &mut TestAppContext, server_cx: &mut TestAppContext) {
-    let fs = FakeFs::new(server_cx.executor());
-    fs.insert_tree(
-        path!("/code"),
-        json!({
-            "project1": {
-                ".git": {},
-                "README.md": "# project 1",
-                "src": {
-                    "lib.rs": "fn one() -> usize { 1 }"
-                }
-            },
-        }),
-    )
-    .await;
-
-    let (project, _headless) = init_test(&fs, cx, server_cx).await;
-
-    let path = project
-        .update(cx, |project, cx| {
-            project.resolve_abs_path(path!("/code/project1/README.md"), cx)
-        })
-        .await
-        .unwrap();
-
-    assert!(path.is_file());
-    assert_eq!(path.abs_path().unwrap(), path!("/code/project1/README.md"));
-
-    let path = project
-        .update(cx, |project, cx| {
-            project.resolve_abs_path(path!("/code/project1/src"), cx)
-        })
-        .await
-        .unwrap();
-
-    assert!(path.is_dir());
-    assert_eq!(path.abs_path().unwrap(), path!("/code/project1/src"));
-
-    let path = project
-        .update(cx, |project, cx| {
-            project.resolve_abs_path(path!("/code/project1/DOESNOTEXIST"), cx)
-        })
-        .await;
-    assert!(path.is_none());
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_canceling_buffer_opening(cx: &mut TestAppContext, server_cx: &mut TestAppContext) {
-    let fs = FakeFs::new(server_cx.executor());
-    fs.insert_tree(
-        "/code",
-        json!({
-            "project1": {
-                ".git": {},
-                "README.md": "# project 1",
-                "src": {
-                    "lib.rs": "fn one() -> usize { 1 }"
-                }
-            },
-        }),
-    )
-    .await;
-
-    let (project, _headless) = init_test(&fs, cx, server_cx).await;
-    let (worktree, _) = project
-        .update(cx, |project, cx| {
-            project.find_or_create_worktree("/code/project1", true, cx)
-        })
-        .await
-        .unwrap();
-    let worktree_id = worktree.read_with(cx, |tree, _| tree.id());
-
-    // Open a buffer on the client but cancel after a random amount of time.
-    let buffer = project.update(cx, |p, cx| {
-        p.open_buffer((worktree_id, rel_path("src/lib.rs")), cx)
-    });
-    cx.executor().simulate_random_delay().await;
-    drop(buffer);
-
-    // Try opening the same buffer again as the client, and ensure we can
-    // still do it despite the cancellation above.
-    let buffer = project
-        .update(cx, |p, cx| {
-            p.open_buffer((worktree_id, rel_path("src/lib.rs")), cx)
-        })
-        .await
-        .unwrap();
-
-    buffer.read_with(cx, |buf, _| {
-        assert_eq!(buf.text(), "fn one() -> usize { 1 }")
-    });
-}
-
-#[gpui::test]
-async fn test_adding_then_removing_then_adding_worktrees(
-    cx: &mut TestAppContext,
-    server_cx: &mut TestAppContext,
-) {
-    let fs = FakeFs::new(server_cx.executor());
-    fs.insert_tree(
-        path!("/code"),
-        json!({
-            "project1": {
-                ".git": {},
-                "README.md": "# project 1",
-                "src": {
-                    "lib.rs": "fn one() -> usize { 1 }"
-                }
-            },
-            "project2": {
-                "README.md": "# project 2",
-            },
-        }),
-    )
-    .await;
-
-    let (project, _headless) = init_test(&fs, cx, server_cx).await;
-    let (_worktree, _) = project
-        .update(cx, |project, cx| {
-            project.find_or_create_worktree(path!("/code/project1"), true, cx)
-        })
-        .await
-        .unwrap();
-
-    let (worktree_2, _) = project
-        .update(cx, |project, cx| {
-            project.find_or_create_worktree(path!("/code/project2"), true, cx)
-        })
-        .await
-        .unwrap();
-    let worktree_id_2 = worktree_2.read_with(cx, |tree, _| tree.id());
-
-    project.update(cx, |project, cx| project.remove_worktree(worktree_id_2, cx));
-
-    let (worktree_2, _) = project
-        .update(cx, |project, cx| {
-            project.find_or_create_worktree(path!("/code/project2"), true, cx)
-        })
-        .await
-        .unwrap();
-
-    cx.run_until_parked();
-    worktree_2.update(cx, |worktree, _cx| {
-        assert!(worktree.is_visible());
-        let entries = worktree.entries(true, 0).collect::<Vec<_>>();
-        assert_eq!(entries.len(), 2);
-        assert_eq!(entries[1].path.as_unix_str(), "README.md")
-    })
-}
-
-#[gpui::test]
-async fn test_open_server_settings(cx: &mut TestAppContext, server_cx: &mut TestAppContext) {
-    let fs = FakeFs::new(server_cx.executor());
-    fs.insert_tree(
-        path!("/code"),
-        json!({
-            "project1": {
-                ".git": {},
-                "README.md": "# project 1",
-                "src": {
-                    "lib.rs": "fn one() -> usize { 1 }"
-                }
-            },
-        }),
-    )
-    .await;
-
-    let (project, _headless) = init_test(&fs, cx, server_cx).await;
-    let buffer = project.update(cx, |project, cx| project.open_server_settings(cx));
-    cx.executor().run_until_parked();
-
-    let buffer = buffer.await.unwrap();
-
-    cx.update(|cx| {
-        assert_eq!(
-            buffer.read(cx).text(),
-            initial_server_settings_content()
-                .to_string()
-                .replace("\r\n", "\n")
-        )
-    })
-}
-
-#[gpui::test(iterations = 20)]
-async fn test_reconnect(cx: &mut TestAppContext, server_cx: &mut TestAppContext) {
-    let fs = FakeFs::new(server_cx.executor());
-    fs.insert_tree(
-        path!("/code"),
-        json!({
-            "project1": {
-                ".git": {},
-                "README.md": "# project 1",
-                "src": {
-                    "lib.rs": "fn one() -> usize { 1 }"
-                }
-            },
-        }),
-    )
-    .await;
-
-    let (project, _headless) = init_test(&fs, cx, server_cx).await;
-
-    let (worktree, _) = project
-        .update(cx, |project, cx| {
-            project.find_or_create_worktree(path!("/code/project1"), true, cx)
-        })
-        .await
-        .unwrap();
-
-    let worktree_id = worktree.read_with(cx, |worktree, _| worktree.id());
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_buffer((worktree_id, rel_path("src/lib.rs")), cx)
-        })
-        .await
-        .unwrap();
-
-    buffer.update(cx, |buffer, cx| {
-        assert_eq!(buffer.text(), "fn one() -> usize { 1 }");
-        let ix = buffer.text().find('1').unwrap();
-        buffer.edit([(ix..ix + 1, "100")], None, cx);
-    });
-
-    let client = cx.read(|cx| project.read(cx).remote_client().unwrap());
-    client
-        .update(cx, |client, cx| client.simulate_disconnect(cx))
-        .detach();
-
-    project
-        .update(cx, |project, cx| project.save_buffer(buffer.clone(), cx))
-        .await
-        .unwrap();
-
-    assert_eq!(
-        fs.load(path!("/code/project1/src/lib.rs").as_ref())
-            .await
-            .unwrap(),
-        "fn one() -> usize { 100 }"
-    );
-}
-
-#[gpui::test]
-async fn test_remote_root_rename(cx: &mut TestAppContext, server_cx: &mut TestAppContext) {
-    let fs = FakeFs::new(server_cx.executor());
-    fs.insert_tree(
-        "/code",
-        json!({
-            "project1": {
-                ".git": {},
-                "README.md": "# project 1",
-            },
-        }),
-    )
-    .await;
-
-    let (project, _) = init_test(&fs, cx, server_cx).await;
-
-    let (worktree, _) = project
-        .update(cx, |project, cx| {
-            project.find_or_create_worktree("/code/project1", true, cx)
-        })
-        .await
-        .unwrap();
-
-    cx.run_until_parked();
-
-    fs.rename(
-        &PathBuf::from("/code/project1"),
-        &PathBuf::from("/code/project2"),
-        Default::default(),
-    )
-    .await
-    .unwrap();
-
-    cx.run_until_parked();
-    worktree.update(cx, |worktree, _| {
-        assert_eq!(worktree.root_name(), "project2")
-    })
-}
-
-#[gpui::test]
-async fn test_remote_rename_entry(cx: &mut TestAppContext, server_cx: &mut TestAppContext) {
-    let fs = FakeFs::new(server_cx.executor());
-    fs.insert_tree(
-        "/code",
-        json!({
-            "project1": {
-                ".git": {},
-                "README.md": "# project 1",
-            },
-        }),
-    )
-    .await;
-
-    let (project, _) = init_test(&fs, cx, server_cx).await;
-    let (worktree, _) = project
-        .update(cx, |project, cx| {
-            project.find_or_create_worktree("/code/project1", true, cx)
-        })
-        .await
-        .unwrap();
-
-    cx.run_until_parked();
-
-    let entry = project
-        .update(cx, |project, cx| {
-            let worktree = worktree.read(cx);
-            let entry = worktree.entry_for_path(rel_path("README.md")).unwrap();
-            project.rename_entry(entry.id, (worktree.id(), rel_path("README.rst")).into(), cx)
-        })
-        .await
-        .unwrap()
-        .into_included()
-        .unwrap();
-
-    cx.run_until_parked();
-
-    worktree.update(cx, |worktree, _| {
-        assert_eq!(
-            worktree.entry_for_path(rel_path("README.rst")).unwrap().id,
-            entry.id
-        )
-    });
-}
-
-#[gpui::test]
-async fn test_copy_file_into_remote_project(
-    cx: &mut TestAppContext,
-    server_cx: &mut TestAppContext,
-) {
-    let remote_fs = FakeFs::new(server_cx.executor());
-    remote_fs
-        .insert_tree(
-            path!("/code"),
-            json!({
-                "project1": {
-                    ".git": {},
-                    "README.md": "# project 1",
-                    "src": {
-                        "main.rs": ""
-                    }
-                },
-            }),
-        )
-        .await;
-
-    let (project, _) = init_test(&remote_fs, cx, server_cx).await;
-    let (worktree, _) = project
-        .update(cx, |project, cx| {
-            project.find_or_create_worktree(path!("/code/project1"), true, cx)
-        })
-        .await
-        .unwrap();
-
-    cx.run_until_parked();
-
-    let local_fs = project
-        .read_with(cx, |project, _| project.fs().clone())
-        .as_fake();
-    local_fs
-        .insert_tree(
-            path!("/local-code"),
-            json!({
-                "dir1": {
-                    "file1": "file 1 content",
-                    "dir2": {
-                        "file2": "file 2 content",
-                        "dir3": {
-                            "file3": ""
-                        },
-                        "dir4": {}
-                    },
-                    "dir5": {}
-                },
-                "file4": "file 4 content"
-            }),
-        )
-        .await;
-
-    worktree
-        .update(cx, |worktree, cx| {
-            worktree.copy_external_entries(
-                rel_path("src").into(),
-                vec![
-                    Path::new(path!("/local-code/dir1/file1")).into(),
-                    Path::new(path!("/local-code/dir1/dir2")).into(),
-                ],
-                local_fs.clone(),
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-
-    assert_eq!(
-        remote_fs.paths(true),
-        vec![
-            PathBuf::from(path!("/")),
-            PathBuf::from(path!("/code")),
-            PathBuf::from(path!("/code/project1")),
-            PathBuf::from(path!("/code/project1/.git")),
-            PathBuf::from(path!("/code/project1/README.md")),
-            PathBuf::from(path!("/code/project1/src")),
-            PathBuf::from(path!("/code/project1/src/dir2")),
-            PathBuf::from(path!("/code/project1/src/file1")),
-            PathBuf::from(path!("/code/project1/src/main.rs")),
-            PathBuf::from(path!("/code/project1/src/dir2/dir3")),
-            PathBuf::from(path!("/code/project1/src/dir2/dir4")),
-            PathBuf::from(path!("/code/project1/src/dir2/file2")),
-            PathBuf::from(path!("/code/project1/src/dir2/dir3/file3")),
-        ]
-    );
-    assert_eq!(
-        remote_fs
-            .load(path!("/code/project1/src/file1").as_ref())
-            .await
-            .unwrap(),
-        "file 1 content"
-    );
-    assert_eq!(
-        remote_fs
-            .load(path!("/code/project1/src/dir2/file2").as_ref())
-            .await
-            .unwrap(),
-        "file 2 content"
-    );
-    assert_eq!(
-        remote_fs
-            .load(path!("/code/project1/src/dir2/dir3/file3").as_ref())
-            .await
-            .unwrap(),
-        ""
-    );
-}
-
-#[gpui::test]
-async fn test_remote_git_diffs(cx: &mut TestAppContext, server_cx: &mut TestAppContext) {
-    let text_2 = "
-        fn one() -> usize {
-            1
-        }
-    "
-    .unindent();
-    let text_1 = "
-        fn one() -> usize {
-            0
-        }
-    "
-    .unindent();
-
-    let fs = FakeFs::new(server_cx.executor());
-    fs.insert_tree(
-        "/code",
-        json!({
-            "project1": {
-                ".git": {},
-                "src": {
-                    "lib.rs": text_2
-                },
-                "README.md": "# project 1",
-            },
-        }),
-    )
-    .await;
-    fs.set_index_for_repo(
-        Path::new("/code/project1/.git"),
-        &[("src/lib.rs", text_1.clone())],
-    );
-    fs.set_head_for_repo(
-        Path::new("/code/project1/.git"),
-        &[("src/lib.rs", text_1.clone())],
-        "deadbeef",
-    );
-
-    let (project, _headless) = init_test(&fs, cx, server_cx).await;
-    let (worktree, _) = project
-        .update(cx, |project, cx| {
-            project.find_or_create_worktree("/code/project1", true, cx)
-        })
-        .await
-        .unwrap();
-    let worktree_id = cx.update(|cx| worktree.read(cx).id());
-    cx.executor().run_until_parked();
-
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_buffer((worktree_id, rel_path("src/lib.rs")), cx)
-        })
-        .await
-        .unwrap();
-    let diff = project
-        .update(cx, |project, cx| {
-            project.open_uncommitted_diff(buffer.clone(), cx)
-        })
-        .await
-        .unwrap();
-
-    diff.read_with(cx, |diff, cx| {
-        assert_eq!(diff.base_text_string().unwrap(), text_1);
-        assert_eq!(
-            diff.secondary_diff()
-                .unwrap()
-                .read(cx)
-                .base_text_string()
-                .unwrap(),
-            text_1
-        );
-    });
-
-    // stage the current buffer's contents
-    fs.set_index_for_repo(
-        Path::new("/code/project1/.git"),
-        &[("src/lib.rs", text_2.clone())],
-    );
-
-    cx.executor().run_until_parked();
-    diff.read_with(cx, |diff, cx| {
-        assert_eq!(diff.base_text_string().unwrap(), text_1);
-        assert_eq!(
-            diff.secondary_diff()
-                .unwrap()
-                .read(cx)
-                .base_text_string()
-                .unwrap(),
-            text_2
-        );
-    });
-
-    // commit the current buffer's contents
-    fs.set_head_for_repo(
-        Path::new("/code/project1/.git"),
-        &[("src/lib.rs", text_2.clone())],
-        "deadbeef",
-    );
-
-    cx.executor().run_until_parked();
-    diff.read_with(cx, |diff, cx| {
-        assert_eq!(diff.base_text_string().unwrap(), text_2);
-        assert_eq!(
-            diff.secondary_diff()
-                .unwrap()
-                .read(cx)
-                .base_text_string()
-                .unwrap(),
-            text_2
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_remote_git_diffs_when_recv_update_repository_delay(
-    cx: &mut TestAppContext,
-    server_cx: &mut TestAppContext,
-) {
-    cx.update(|cx| {
-        let settings_store = SettingsStore::test(cx);
-        cx.set_global(settings_store);
-        theme::init(theme::LoadThemes::JustBase, cx);
-        release_channel::init(semver::Version::new(0, 0, 0), cx);
-        editor::init(cx);
-    });
-
-    use editor::Editor;
-    use gpui::VisualContext;
-    let text_2 = "
-        fn one() -> usize {
-            1
-        }
-    "
-    .unindent();
-    let text_1 = "
-        fn one() -> usize {
-            0
-        }
-    "
-    .unindent();
-
-    let fs = FakeFs::new(server_cx.executor());
-    fs.insert_tree(
-        path!("/code"),
-        json!({
-            "project1": {
-                "src": {
-                    "lib.rs": text_2
-                },
-                "README.md": "# project 1",
-            },
-        }),
-    )
-    .await;
-
-    let (project, _headless) = init_test(&fs, cx, server_cx).await;
-    let (worktree, _) = project
-        .update(cx, |project, cx| {
-            project.find_or_create_worktree(path!("/code/project1"), true, cx)
-        })
-        .await
-        .unwrap();
-    let worktree_id = cx.update(|cx| worktree.read(cx).id());
-    let buffer = project
-        .update(cx, |project, cx| {
-            project.open_buffer((worktree_id, rel_path("src/lib.rs")), cx)
-        })
-        .await
-        .unwrap();
-    let buffer_id = cx.update(|cx| buffer.read(cx).remote_id());
-
-    let cx = cx.add_empty_window();
-    let editor = cx.new_window_entity(|window, cx| {
-        Editor::for_buffer(buffer, Some(project.clone()), window, cx)
-    });
-
-    // Remote server will send proto::UpdateRepository after the instance of Editor create.
-    fs.insert_tree(
-        path!("/code"),
-        json!({
-            "project1": {
-                ".git": {},
-            },
-        }),
-    )
-    .await;
-
-    fs.set_index_for_repo(
-        Path::new(path!("/code/project1/.git")),
-        &[("src/lib.rs", text_1.clone())],
-    );
-    fs.set_head_for_repo(
-        Path::new(path!("/code/project1/.git")),
-        &[("src/lib.rs", text_1.clone())],
-        "sha",
-    );
-
-    cx.executor().run_until_parked();
-    let diff = editor
-        .read_with(cx, |editor, cx| {
-            editor
-                .buffer()
-                .read_with(cx, |buffer, _| buffer.diff_for(buffer_id))
-        })
-        .unwrap();
-
-    diff.read_with(cx, |diff, cx| {
-        assert_eq!(diff.base_text_string().unwrap(), text_1);
-        assert_eq!(
-            diff.secondary_diff()
-                .unwrap()
-                .read(cx)
-                .base_text_string()
-                .unwrap(),
-            text_1
-        );
-    });
-
-    // stage the current buffer's contents
-    fs.set_index_for_repo(
-        Path::new(path!("/code/project1/.git")),
-        &[("src/lib.rs", text_2.clone())],
-    );
-
-    cx.executor().run_until_parked();
-    diff.read_with(cx, |diff, cx| {
-        assert_eq!(diff.base_text_string().unwrap(), text_1);
-        assert_eq!(
-            diff.secondary_diff()
-                .unwrap()
-                .read(cx)
-                .base_text_string()
-                .unwrap(),
-            text_2
-        );
-    });
-
-    // commit the current buffer's contents
-    fs.set_head_for_repo(
-        Path::new(path!("/code/project1/.git")),
-        &[("src/lib.rs", text_2.clone())],
-        "sha",
-    );
-
-    cx.executor().run_until_parked();
-    diff.read_with(cx, |diff, cx| {
-        assert_eq!(diff.base_text_string().unwrap(), text_2);
-        assert_eq!(
-            diff.secondary_diff()
-                .unwrap()
-                .read(cx)
-                .base_text_string()
-                .unwrap(),
-            text_2
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_remote_git_branches(cx: &mut TestAppContext, server_cx: &mut TestAppContext) {
-    let fs = FakeFs::new(server_cx.executor());
-    fs.insert_tree(
-        path!("/code"),
-        json!({
-            "project1": {
-                ".git": {},
-                "README.md": "# project 1",
-            },
-        }),
-    )
-    .await;
-
-    let (project, headless_project) = init_test(&fs, cx, server_cx).await;
-    let branches = ["main", "dev", "feature-1"];
-    let branches_set = branches
-        .iter()
-        .map(ToString::to_string)
-        .collect::<HashSet<_>>();
-    fs.insert_branches(Path::new(path!("/code/project1/.git")), &branches);
-
-    let (_worktree, _) = project
-        .update(cx, |project, cx| {
-            project.find_or_create_worktree(path!("/code/project1"), true, cx)
-        })
-        .await
-        .unwrap();
-    // Give the worktree a bit of time to index the file system
-    cx.run_until_parked();
-
-    let repository = project.update(cx, |project, cx| project.active_repository(cx).unwrap());
-
-    let remote_branches = repository
-        .update(cx, |repository, _| repository.branches())
-        .await
-        .unwrap()
-        .unwrap();
-
-    let new_branch = branches[2];
-
-    let remote_branches = remote_branches
-        .into_iter()
-        .map(|branch| branch.name().to_string())
-        .collect::<HashSet<_>>();
-
-    assert_eq!(&remote_branches, &branches_set);
-
-    cx.update(|cx| {
-        repository.update(cx, |repository, _cx| {
-            repository.change_branch(new_branch.to_string())
-        })
-    })
-    .await
-    .unwrap()
-    .unwrap();
-
-    cx.run_until_parked();
-
-    let server_branch = server_cx.update(|cx| {
-        headless_project.update(cx, |headless_project, cx| {
-            headless_project.git_store.update(cx, |git_store, cx| {
-                git_store
-                    .repositories()
-                    .values()
-                    .next()
-                    .unwrap()
-                    .read(cx)
-                    .branch
-                    .as_ref()
-                    .unwrap()
-                    .clone()
-            })
-        })
-    });
-
-    assert_eq!(server_branch.name(), branches[2]);
-
-    // Also try creating a new branch
-    cx.update(|cx| {
-        repository.update(cx, |repo, _cx| {
-            repo.create_branch("totally-new-branch".to_string(), None)
-        })
-    })
-    .await
-    .unwrap()
-    .unwrap();
-
-    cx.update(|cx| {
-        repository.update(cx, |repo, _cx| {
-            repo.change_branch("totally-new-branch".to_string())
-        })
-    })
-    .await
-    .unwrap()
-    .unwrap();
-
-    cx.run_until_parked();
-
-    let server_branch = server_cx.update(|cx| {
-        headless_project.update(cx, |headless_project, cx| {
-            headless_project.git_store.update(cx, |git_store, cx| {
-                git_store
-                    .repositories()
-                    .values()
-                    .next()
-                    .unwrap()
-                    .read(cx)
-                    .branch
-                    .as_ref()
-                    .unwrap()
-                    .clone()
-            })
-        })
-    });
-
-    assert_eq!(server_branch.name(), "totally-new-branch");
-}
-
-#[gpui::test]
-async fn test_remote_agent_fs_tool_calls(cx: &mut TestAppContext, server_cx: &mut TestAppContext) {
-    let fs = FakeFs::new(server_cx.executor());
-    fs.insert_tree(
-        path!("/project"),
-        json!({
-            "a.txt": "A",
-            "b.txt": "B",
-        }),
-    )
-    .await;
-
-    let (project, _headless_project) = init_test(&fs, cx, server_cx).await;
-    project
-        .update(cx, |project, cx| {
-            project.find_or_create_worktree(path!("/project"), true, cx)
-        })
-        .await
-        .unwrap();
-
-    let action_log = cx.new(|_| action_log::ActionLog::new(project.clone()));
-
-    // Create a minimal thread for the ReadFileTool
-    let context_server_registry =
-        cx.new(|cx| agent::ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
-    let model = Arc::new(FakeLanguageModel::default());
-    let thread = cx.new(|cx| {
-        Thread::new(
-            project.clone(),
-            cx.new(|_cx| ProjectContext::default()),
-            context_server_registry,
-            Templates::new(),
-            Some(model),
-            cx,
-        )
-    });
-
-    let input = ReadFileToolInput {
-        path: "project/b.txt".into(),
-        start_line: None,
-        end_line: None,
-    };
-    let read_tool = Arc::new(ReadFileTool::new(thread.downgrade(), project, action_log));
-    let (event_stream, _) = ToolCallEventStream::test();
-
-    let exists_result = cx.update(|cx| read_tool.clone().run(input, event_stream.clone(), cx));
-    let output = exists_result.await.unwrap();
-    assert_eq!(output, LanguageModelToolResultContent::Text("B".into()));
-
-    let input = ReadFileToolInput {
-        path: "project/c.txt".into(),
-        start_line: None,
-        end_line: None,
-    };
-    let does_not_exist_result = cx.update(|cx| read_tool.run(input, event_stream, cx));
-    does_not_exist_result.await.unwrap_err();
-}
-
-#[gpui::test]
-async fn test_remote_external_agent_server(
-    cx: &mut TestAppContext,
-    server_cx: &mut TestAppContext,
-) {
-    let fs = FakeFs::new(server_cx.executor());
-    fs.insert_tree(path!("/project"), json!({})).await;
-
-    let (project, _headless_project) = init_test(&fs, cx, server_cx).await;
-    project
-        .update(cx, |project, cx| {
-            project.find_or_create_worktree(path!("/project"), true, cx)
-        })
-        .await
-        .unwrap();
-    let names = project.update(cx, |project, cx| {
-        project
-            .agent_server_store()
-            .read(cx)
-            .external_agents()
-            .map(|name| name.to_string())
-            .collect::<Vec<_>>()
-    });
-    pretty_assertions::assert_eq!(names, ["codex", "gemini", "claude"]);
-    server_cx.update_global::<SettingsStore, _>(|settings_store, cx| {
-        settings_store
-            .set_server_settings(
-                &json!({
-                    "agent_servers": {
-                        "foo": {
-                            "type": "custom",
-                            "command": "foo-cli",
-                            "args": ["--flag"],
-                            "env": {
-                                "VAR": "val"
-                            }
-                        }
-                    }
-                })
-                .to_string(),
-                cx,
-            )
-            .unwrap();
-    });
-    server_cx.run_until_parked();
-    cx.run_until_parked();
-    let names = project.update(cx, |project, cx| {
-        project
-            .agent_server_store()
-            .read(cx)
-            .external_agents()
-            .map(|name| name.to_string())
-            .collect::<Vec<_>>()
-    });
-    pretty_assertions::assert_eq!(names, ["gemini", "codex", "claude", "foo"]);
-    let (command, root, login) = project
-        .update(cx, |project, cx| {
-            project.agent_server_store().update(cx, |store, cx| {
-                store
-                    .get_external_agent(&"foo".into())
-                    .unwrap()
-                    .get_command(
-                        None,
-                        HashMap::from_iter([("OTHER_VAR".into(), "other-val".into())]),
-                        None,
-                        None,
-                        &mut cx.to_async(),
-                    )
-            })
-        })
-        .await
-        .unwrap();
-    assert_eq!(
-        command,
-        AgentServerCommand {
-            path: "ssh".into(),
-            args: vec!["foo-cli".into(), "--flag".into()],
-            env: Some(HashMap::from_iter([
-                ("VAR".into(), "val".into()),
-                ("OTHER_VAR".into(), "other-val".into())
-            ]))
-        }
-    );
-    assert_eq!(&PathBuf::from(root), paths::home_dir());
-    assert!(login.is_none());
-}
-
-pub async fn init_test(
-    server_fs: &Arc<FakeFs>,
-    cx: &mut TestAppContext,
-    server_cx: &mut TestAppContext,
-) -> (Entity<Project>, Entity<HeadlessProject>) {
-    let server_fs = server_fs.clone();
-    cx.update(|cx| {
-        release_channel::init(semver::Version::new(0, 0, 0), cx);
-    });
-    server_cx.update(|cx| {
-        release_channel::init(semver::Version::new(0, 0, 0), cx);
-    });
-    init_logger();
-
-    let (opts, ssh_server_client) = RemoteClient::fake_server(cx, server_cx);
-    let http_client = Arc::new(BlockedHttpClient);
-    let node_runtime = NodeRuntime::unavailable();
-    let languages = Arc::new(LanguageRegistry::new(cx.executor()));
-    let proxy = Arc::new(ExtensionHostProxy::new());
-    server_cx.update(HeadlessProject::init);
-    let headless = server_cx.new(|cx| {
-        HeadlessProject::new(
-            crate::HeadlessAppState {
-                session: ssh_server_client,
-                fs: server_fs.clone(),
-                http_client,
-                node_runtime,
-                languages,
-                extension_host_proxy: proxy,
-            },
-            cx,
-        )
-    });
-
-    let ssh = RemoteClient::fake_client(opts, cx).await;
-    let project = build_project(ssh, cx);
-    project
-        .update(cx, {
-            let headless = headless.clone();
-            |_, cx| cx.on_release(|_, _| drop(headless))
-        })
-        .detach();
-    (project, headless)
-}
-
-fn init_logger() {
-    zlog::init_test();
-}
-
-fn build_project(ssh: Entity<RemoteClient>, cx: &mut TestAppContext) -> Entity<Project> {
-    cx.update(|cx| {
-        if !cx.has_global::<SettingsStore>() {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-        }
-    });
-
-    let client = cx.update(|cx| {
-        Client::new(
-            Arc::new(FakeSystemClock::new()),
-            FakeHttpClient::with_404_response(),
-            cx,
-        )
-    });
-
-    let node = NodeRuntime::unavailable();
-    let user_store = cx.new(|cx| UserStore::new(client.clone(), cx));
-    let languages = Arc::new(LanguageRegistry::test(cx.executor()));
-    let fs = FakeFs::new(cx.executor());
-
-    cx.update(|cx| {
-        Project::init(&client, cx);
-    });
-
-    cx.update(|cx| Project::remote(ssh, client, node, user_store, languages, fs, cx))
-}
diff --git a/crates/remote_server/src/remote_server.rs b/crates/remote_server/src/remote_server.rs
deleted file mode 100644
index 98e8744b11..0000000000
--- a/crates/remote_server/src/remote_server.rs
+++ /dev/null
@@ -1,87 +0,0 @@
-mod headless_project;
-
-#[cfg(not(windows))]
-pub mod unix;
-
-#[cfg(test)]
-mod remote_editing_tests;
-
-use clap::Subcommand;
-use std::path::PathBuf;
-
-pub use headless_project::{HeadlessAppState, HeadlessProject};
-
-#[derive(Subcommand)]
-pub enum Commands {
-    Run {
-        #[arg(long)]
-        log_file: PathBuf,
-        #[arg(long)]
-        pid_file: PathBuf,
-        #[arg(long)]
-        stdin_socket: PathBuf,
-        #[arg(long)]
-        stdout_socket: PathBuf,
-        #[arg(long)]
-        stderr_socket: PathBuf,
-    },
-    Proxy {
-        #[arg(long)]
-        reconnect: bool,
-        #[arg(long)]
-        identifier: String,
-    },
-    Version,
-}
-
-#[cfg(not(windows))]
-pub fn run(command: Commands) -> anyhow::Result<()> {
-    use anyhow::Context;
-    use release_channel::{RELEASE_CHANNEL, ReleaseChannel};
-    use unix::{ExecuteProxyError, execute_proxy, execute_run};
-
-    match command {
-        Commands::Run {
-            log_file,
-            pid_file,
-            stdin_socket,
-            stdout_socket,
-            stderr_socket,
-        } => execute_run(
-            log_file,
-            pid_file,
-            stdin_socket,
-            stdout_socket,
-            stderr_socket,
-        ),
-        Commands::Proxy {
-            identifier,
-            reconnect,
-        } => execute_proxy(identifier, reconnect)
-            .inspect_err(|err| {
-                if let ExecuteProxyError::ServerNotRunning(err) = err {
-                    std::process::exit(err.to_exit_code());
-                }
-            })
-            .context("running proxy on the remote server"),
-        Commands::Version => {
-            let release_channel = *RELEASE_CHANNEL;
-            match release_channel {
-                ReleaseChannel::Stable | ReleaseChannel::Preview => {
-                    println!("{}", env!("ZED_PKG_VERSION"))
-                }
-                ReleaseChannel::Nightly | ReleaseChannel::Dev => {
-                    let commit_sha =
-                        option_env!("ZED_COMMIT_SHA").unwrap_or(release_channel.dev_name());
-                    let build_id = option_env!("ZED_BUILD_ID");
-                    if let Some(build_id) = build_id {
-                        println!("{}+{}", build_id, commit_sha)
-                    } else {
-                        println!("{commit_sha}");
-                    }
-                }
-            };
-            Ok(())
-        }
-    }
-}
diff --git a/crates/remote_server/src/unix.rs b/crates/remote_server/src/unix.rs
deleted file mode 100644
index 8adeaa5947..0000000000
--- a/crates/remote_server/src/unix.rs
+++ /dev/null
@@ -1,1045 +0,0 @@
-use crate::HeadlessProject;
-use crate::headless_project::HeadlessAppState;
-use anyhow::{Context as _, Result, anyhow};
-use client::ProxySettings;
-use util::ResultExt;
-
-use extension::ExtensionHostProxy;
-use fs::{Fs, RealFs};
-use futures::channel::{mpsc, oneshot};
-use futures::{AsyncRead, AsyncWrite, AsyncWriteExt, FutureExt, SinkExt, select, select_biased};
-use git::GitHostingProviderRegistry;
-use gpui::{App, AppContext as _, Context, Entity, UpdateGlobal as _};
-use gpui_tokio::Tokio;
-use http_client::{Url, read_proxy_from_env};
-use language::LanguageRegistry;
-use node_runtime::{NodeBinaryOptions, NodeRuntime};
-use paths::logs_dir;
-use project::project_settings::ProjectSettings;
-use util::command::new_smol_command;
-
-use proto::CrashReport;
-use release_channel::{AppCommitSha, AppVersion, RELEASE_CHANNEL, ReleaseChannel};
-use remote::RemoteClient;
-use remote::{
-    json_log::LogRecord,
-    protocol::{read_message, write_message},
-    proxy::ProxyLaunchError,
-};
-use reqwest_client::ReqwestClient;
-use rpc::proto::{self, Envelope, REMOTE_SERVER_PROJECT_ID};
-use rpc::{AnyProtoClient, TypedEnvelope};
-use settings::{Settings, SettingsStore, watch_config_file};
-use smol::Async;
-use smol::channel::{Receiver, Sender};
-use smol::io::AsyncReadExt;
-use smol::{net::unix::UnixListener, stream::StreamExt as _};
-use std::{
-    env,
-    ffi::OsStr,
-    fs::File,
-    io::Write,
-    mem,
-    ops::ControlFlow,
-    path::{Path, PathBuf},
-    process::ExitStatus,
-    str::FromStr,
-    sync::{Arc, LazyLock},
-};
-use thiserror::Error;
-
-pub static VERSION: LazyLock<String> = LazyLock::new(|| match *RELEASE_CHANNEL {
-    ReleaseChannel::Stable | ReleaseChannel::Preview => env!("ZED_PKG_VERSION").to_owned(),
-    ReleaseChannel::Nightly | ReleaseChannel::Dev => {
-        let commit_sha = option_env!("ZED_COMMIT_SHA").unwrap_or("missing-zed-commit-sha");
-        let build_identifier = option_env!("ZED_BUILD_ID");
-        if let Some(build_id) = build_identifier {
-            format!("{build_id}+{commit_sha}")
-        } else {
-            commit_sha.to_owned()
-        }
-    }
-});
-
-fn init_logging_proxy() {
-    env_logger::builder()
-        .format(|buf, record| {
-            let mut log_record = LogRecord::new(record);
-            log_record.message = format!("(remote proxy) {}", log_record.message);
-            serde_json::to_writer(&mut *buf, &log_record)?;
-            buf.write_all(b"\n")?;
-            Ok(())
-        })
-        .init();
-}
-
-fn init_logging_server(log_file_path: PathBuf) -> Result<Receiver<Vec<u8>>> {
-    struct MultiWrite {
-        file: File,
-        channel: Sender<Vec<u8>>,
-        buffer: Vec<u8>,
-    }
-
-    impl Write for MultiWrite {
-        fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
-            let written = self.file.write(buf)?;
-            self.buffer.extend_from_slice(&buf[..written]);
-            Ok(written)
-        }
-
-        fn flush(&mut self) -> std::io::Result<()> {
-            self.channel
-                .send_blocking(self.buffer.clone())
-                .map_err(std::io::Error::other)?;
-            self.buffer.clear();
-            self.file.flush()
-        }
-    }
-
-    let log_file = std::fs::OpenOptions::new()
-        .create(true)
-        .append(true)
-        .open(&log_file_path)
-        .context("Failed to open log file in append mode")?;
-
-    let (tx, rx) = smol::channel::unbounded();
-
-    let target = Box::new(MultiWrite {
-        file: log_file,
-        channel: tx,
-        buffer: Vec::new(),
-    });
-
-    env_logger::Builder::new()
-        .filter_level(log::LevelFilter::Info)
-        .parse_default_env()
-        .target(env_logger::Target::Pipe(target))
-        .format(|buf, record| {
-            let mut log_record = LogRecord::new(record);
-            log_record.message = format!("(remote server) {}", log_record.message);
-            serde_json::to_writer(&mut *buf, &log_record)?;
-            buf.write_all(b"\n")?;
-            Ok(())
-        })
-        .init();
-
-    Ok(rx)
-}
-
-fn handle_crash_files_requests(project: &Entity<HeadlessProject>, client: &AnyProtoClient) {
-    client.add_request_handler(
-        project.downgrade(),
-        |_, _: TypedEnvelope<proto::GetCrashFiles>, _cx| async move {
-            let mut legacy_panics = Vec::new();
-            let mut crashes = Vec::new();
-            let mut children = smol::fs::read_dir(paths::logs_dir()).await?;
-            while let Some(child) = children.next().await {
-                let child = child?;
-                let child_path = child.path();
-
-                let extension = child_path.extension();
-                if extension == Some(OsStr::new("panic")) {
-                    let filename = if let Some(filename) = child_path.file_name() {
-                        filename.to_string_lossy()
-                    } else {
-                        continue;
-                    };
-
-                    if !filename.starts_with("zed") {
-                        continue;
-                    }
-
-                    let file_contents = smol::fs::read_to_string(&child_path)
-                        .await
-                        .context("error reading panic file")?;
-
-                    legacy_panics.push(file_contents);
-                    smol::fs::remove_file(&child_path)
-                        .await
-                        .context("error removing panic")
-                        .log_err();
-                } else if extension == Some(OsStr::new("dmp")) {
-                    let mut json_path = child_path.clone();
-                    json_path.set_extension("json");
-                    if let Ok(json_content) = smol::fs::read_to_string(&json_path).await {
-                        crashes.push(CrashReport {
-                            metadata: json_content,
-                            minidump_contents: smol::fs::read(&child_path).await?,
-                        });
-                        smol::fs::remove_file(&child_path).await.log_err();
-                        smol::fs::remove_file(&json_path).await.log_err();
-                    } else {
-                        log::error!("Couldn't find json metadata for crash: {child_path:?}");
-                    }
-                }
-            }
-
-            anyhow::Ok(proto::GetCrashFilesResponse { crashes })
-        },
-    );
-}
-
-struct ServerListeners {
-    stdin: UnixListener,
-    stdout: UnixListener,
-    stderr: UnixListener,
-}
-
-impl ServerListeners {
-    pub fn new(stdin_path: PathBuf, stdout_path: PathBuf, stderr_path: PathBuf) -> Result<Self> {
-        Ok(Self {
-            stdin: UnixListener::bind(stdin_path).context("failed to bind stdin socket")?,
-            stdout: UnixListener::bind(stdout_path).context("failed to bind stdout socket")?,
-            stderr: UnixListener::bind(stderr_path).context("failed to bind stderr socket")?,
-        })
-    }
-}
-
-fn start_server(
-    listeners: ServerListeners,
-    log_rx: Receiver<Vec<u8>>,
-    cx: &mut App,
-    is_wsl_interop: bool,
-) -> AnyProtoClient {
-    // This is the server idle timeout. If no connection comes in this timeout, the server will shut down.
-    const IDLE_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(10 * 60);
-
-    let (incoming_tx, incoming_rx) = mpsc::unbounded::<Envelope>();
-    let (outgoing_tx, mut outgoing_rx) = mpsc::unbounded::<Envelope>();
-    let (app_quit_tx, mut app_quit_rx) = mpsc::unbounded::<()>();
-
-    cx.on_app_quit(move |_| {
-        let mut app_quit_tx = app_quit_tx.clone();
-        async move {
-            log::info!("app quitting. sending signal to server main loop");
-            app_quit_tx.send(()).await.ok();
-        }
-    })
-    .detach();
-
-    cx.spawn(async move |cx| {
-        let mut stdin_incoming = listeners.stdin.incoming();
-        let mut stdout_incoming = listeners.stdout.incoming();
-        let mut stderr_incoming = listeners.stderr.incoming();
-
-        loop {
-            let streams = futures::future::join3(stdin_incoming.next(), stdout_incoming.next(), stderr_incoming.next());
-
-            log::info!("accepting new connections");
-            let result = select! {
-                streams = streams.fuse() => {
-                    let (Some(Ok(stdin_stream)), Some(Ok(stdout_stream)), Some(Ok(stderr_stream))) = streams else {
-                        break;
-                    };
-                    anyhow::Ok((stdin_stream, stdout_stream, stderr_stream))
-                }
-                _ = futures::FutureExt::fuse(smol::Timer::after(IDLE_TIMEOUT)) => {
-                    log::warn!("timed out waiting for new connections after {:?}. exiting.", IDLE_TIMEOUT);
-                    cx.update(|cx| {
-                        // TODO: This is a hack, because in a headless project, shutdown isn't executed
-                        // when calling quit, but it should be.
-                        cx.shutdown();
-                        cx.quit();
-                    })?;
-                    break;
-                }
-                _ = app_quit_rx.next().fuse() => {
-                    break;
-                }
-            };
-
-            let Ok((mut stdin_stream, mut stdout_stream, mut stderr_stream)) = result else {
-                break;
-            };
-
-            let mut input_buffer = Vec::new();
-            let mut output_buffer = Vec::new();
-
-            let (mut stdin_msg_tx, mut stdin_msg_rx) = mpsc::unbounded::<Envelope>();
-            cx.background_spawn(async move {
-                while let Ok(msg) = read_message(&mut stdin_stream, &mut input_buffer).await {
-                    if (stdin_msg_tx.send(msg).await).is_err() {
-                        break;
-                    }
-                }
-            }).detach();
-
-            loop {
-
-                select_biased! {
-                    _ = app_quit_rx.next().fuse() => {
-                        return anyhow::Ok(());
-                    }
-
-                    stdin_message = stdin_msg_rx.next().fuse() => {
-                        let Some(message) = stdin_message else {
-                            log::warn!("error reading message on stdin. exiting.");
-                            break;
-                        };
-                        if let Err(error) = incoming_tx.unbounded_send(message) {
-                            log::error!("failed to send message to application: {error:?}. exiting.");
-                            return Err(anyhow!(error));
-                        }
-                    }
-
-                    outgoing_message  = outgoing_rx.next().fuse() => {
-                        let Some(message) = outgoing_message else {
-                            log::error!("stdout handler, no message");
-                            break;
-                        };
-
-                        if let Err(error) =
-                            write_message(&mut stdout_stream, &mut output_buffer, message).await
-                        {
-                            log::error!("failed to write stdout message: {:?}", error);
-                            break;
-                        }
-                        if let Err(error) = stdout_stream.flush().await {
-                            log::error!("failed to flush stdout message: {:?}", error);
-                            break;
-                        }
-                    }
-
-                    log_message = log_rx.recv().fuse() => {
-                        if let Ok(log_message) = log_message {
-                            if let Err(error) = stderr_stream.write_all(&log_message).await {
-                                log::error!("failed to write log message to stderr: {:?}", error);
-                                break;
-                            }
-                            if let Err(error) = stderr_stream.flush().await {
-                                log::error!("failed to flush stderr stream: {:?}", error);
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        anyhow::Ok(())
-    })
-    .detach();
-
-    RemoteClient::proto_client_from_channels(incoming_rx, outgoing_tx, cx, "server", is_wsl_interop)
-}
-
-fn init_paths() -> anyhow::Result<()> {
-    for path in [
-        paths::config_dir(),
-        paths::extensions_dir(),
-        paths::languages_dir(),
-        paths::logs_dir(),
-        paths::temp_dir(),
-        paths::hang_traces_dir(),
-        paths::remote_extensions_dir(),
-        paths::remote_extensions_uploads_dir(),
-    ]
-    .iter()
-    {
-        std::fs::create_dir_all(path).with_context(|| format!("creating directory {path:?}"))?;
-    }
-    Ok(())
-}
-
-pub fn execute_run(
-    log_file: PathBuf,
-    pid_file: PathBuf,
-    stdin_socket: PathBuf,
-    stdout_socket: PathBuf,
-    stderr_socket: PathBuf,
-) -> Result<()> {
-    init_paths()?;
-
-    match daemonize()? {
-        ControlFlow::Break(_) => return Ok(()),
-        ControlFlow::Continue(_) => {}
-    }
-
-    let app = gpui::Application::headless();
-    let id = std::process::id().to_string();
-    app.background_executor()
-        .spawn(crashes::init(crashes::InitCrashHandler {
-            session_id: id,
-            zed_version: VERSION.to_owned(),
-            binary: "zed-remote-server".to_string(),
-            release_channel: release_channel::RELEASE_CHANNEL_NAME.clone(),
-            commit_sha: option_env!("ZED_COMMIT_SHA").unwrap_or("no_sha").to_owned(),
-        }))
-        .detach();
-    let log_rx = init_logging_server(log_file)?;
-    log::info!(
-        "starting up. pid_file: {:?}, stdin_socket: {:?}, stdout_socket: {:?}, stderr_socket: {:?}",
-        pid_file,
-        stdin_socket,
-        stdout_socket,
-        stderr_socket
-    );
-
-    write_pid_file(&pid_file)
-        .with_context(|| format!("failed to write pid file: {:?}", &pid_file))?;
-
-    let listeners = ServerListeners::new(stdin_socket, stdout_socket, stderr_socket)?;
-
-    rayon::ThreadPoolBuilder::new()
-        .num_threads(std::thread::available_parallelism().map_or(1, |n| n.get().div_ceil(2)))
-        .stack_size(10 * 1024 * 1024)
-        .thread_name(|ix| format!("RayonWorker{}", ix))
-        .build_global()
-        .unwrap();
-
-    let (shell_env_loaded_tx, shell_env_loaded_rx) = oneshot::channel();
-    app.background_executor()
-        .spawn(async {
-            util::load_login_shell_environment().await.log_err();
-            shell_env_loaded_tx.send(()).ok();
-        })
-        .detach();
-
-    let git_hosting_provider_registry = Arc::new(GitHostingProviderRegistry::new());
-    app.run(move |cx| {
-        settings::init(cx);
-        let app_commit_sha = option_env!("ZED_COMMIT_SHA").map(|s| AppCommitSha::new(s.to_owned()));
-        let app_version = AppVersion::load(
-            env!("ZED_PKG_VERSION"),
-            option_env!("ZED_BUILD_ID"),
-            app_commit_sha,
-        );
-        release_channel::init(app_version, cx);
-        gpui_tokio::init(cx);
-
-        HeadlessProject::init(cx);
-
-        let is_wsl_interop = if cfg!(target_os = "linux") {
-            // See: https://learn.microsoft.com/en-us/windows/wsl/filesystems#disable-interoperability
-            matches!(std::fs::read_to_string("/proc/sys/fs/binfmt_misc/WSLInterop"), Ok(s) if s.contains("enabled"))
-        } else {
-            false
-        };
-
-        log::info!("gpui app started, initializing server");
-        let session = start_server(listeners, log_rx, cx, is_wsl_interop);
-
-        GitHostingProviderRegistry::set_global(git_hosting_provider_registry, cx);
-        git_hosting_providers::init(cx);
-        dap_adapters::init(cx);
-
-        extension::init(cx);
-        let extension_host_proxy = ExtensionHostProxy::global(cx);
-
-        json_schema_store::init(cx);
-
-        let project = cx.new(|cx| {
-            let fs = Arc::new(RealFs::new(None, cx.background_executor().clone()));
-            let node_settings_rx = initialize_settings(session.clone(), fs.clone(), cx);
-
-            let proxy_url = read_proxy_settings(cx);
-
-            let http_client = {
-                let _guard = Tokio::handle(cx).enter();
-                Arc::new(
-                    ReqwestClient::proxy_and_user_agent(
-                        proxy_url,
-                        &format!(
-                            "Zed-Server/{} ({}; {})",
-                            env!("CARGO_PKG_VERSION"),
-                            std::env::consts::OS,
-                            std::env::consts::ARCH
-                        ),
-                    )
-                    .expect("Could not start HTTP client"),
-                )
-            };
-
-            let node_runtime = NodeRuntime::new(
-                http_client.clone(),
-                Some(shell_env_loaded_rx),
-                node_settings_rx,
-            );
-
-            let mut languages = LanguageRegistry::new(cx.background_executor().clone());
-            languages.set_language_server_download_dir(paths::languages_dir().clone());
-            let languages = Arc::new(languages);
-
-            HeadlessProject::new(
-                HeadlessAppState {
-                    session: session.clone(),
-                    fs,
-                    http_client,
-                    node_runtime,
-                    languages,
-                    extension_host_proxy,
-                },
-                cx,
-            )
-        });
-
-        handle_crash_files_requests(&project, &session);
-
-        cx.background_spawn(async move { cleanup_old_binaries() })
-            .detach();
-
-        mem::forget(project);
-    });
-    log::info!("gpui app is shut down. quitting.");
-    Ok(())
-}
-
-#[derive(Debug, Error)]
-pub(crate) enum ServerPathError {
-    #[error("Failed to create server_dir `{path}`")]
-    CreateServerDir {
-        #[source]
-        source: std::io::Error,
-        path: PathBuf,
-    },
-    #[error("Failed to create logs_dir `{path}`")]
-    CreateLogsDir {
-        #[source]
-        source: std::io::Error,
-        path: PathBuf,
-    },
-}
-
-#[derive(Clone, Debug)]
-struct ServerPaths {
-    log_file: PathBuf,
-    pid_file: PathBuf,
-    stdin_socket: PathBuf,
-    stdout_socket: PathBuf,
-    stderr_socket: PathBuf,
-}
-
-impl ServerPaths {
-    fn new(identifier: &str) -> Result<Self, ServerPathError> {
-        let server_dir = paths::remote_server_state_dir().join(identifier);
-        std::fs::create_dir_all(&server_dir).map_err(|source| {
-            ServerPathError::CreateServerDir {
-                source,
-                path: server_dir.clone(),
-            }
-        })?;
-        let log_dir = logs_dir();
-        std::fs::create_dir_all(log_dir).map_err(|source| ServerPathError::CreateLogsDir {
-            source: source,
-            path: log_dir.clone(),
-        })?;
-
-        let pid_file = server_dir.join("server.pid");
-        let stdin_socket = server_dir.join("stdin.sock");
-        let stdout_socket = server_dir.join("stdout.sock");
-        let stderr_socket = server_dir.join("stderr.sock");
-        let log_file = logs_dir().join(format!("server-{}.log", identifier));
-
-        Ok(Self {
-            pid_file,
-            stdin_socket,
-            stdout_socket,
-            stderr_socket,
-            log_file,
-        })
-    }
-}
-
-#[derive(Debug, Error)]
-pub(crate) enum ExecuteProxyError {
-    #[error("Failed to init server paths")]
-    ServerPath(#[from] ServerPathError),
-
-    #[error(transparent)]
-    ServerNotRunning(#[from] ProxyLaunchError),
-
-    #[error("Failed to check PidFile '{path}'")]
-    CheckPidFile {
-        #[source]
-        source: CheckPidError,
-        path: PathBuf,
-    },
-
-    #[error("Failed to kill existing server with pid '{pid}'")]
-    KillRunningServer {
-        #[source]
-        source: std::io::Error,
-        pid: u32,
-    },
-
-    #[error("failed to spawn server")]
-    SpawnServer(#[source] SpawnServerError),
-
-    #[error("stdin_task failed")]
-    StdinTask(#[source] anyhow::Error),
-    #[error("stdout_task failed")]
-    StdoutTask(#[source] anyhow::Error),
-    #[error("stderr_task failed")]
-    StderrTask(#[source] anyhow::Error),
-}
-
-pub(crate) fn execute_proxy(
-    identifier: String,
-    is_reconnecting: bool,
-) -> Result<(), ExecuteProxyError> {
-    init_logging_proxy();
-
-    let server_paths = ServerPaths::new(&identifier)?;
-
-    let id = std::process::id().to_string();
-    smol::spawn(crashes::init(crashes::InitCrashHandler {
-        session_id: id,
-        zed_version: VERSION.to_owned(),
-        binary: "zed-remote-server".to_string(),
-        release_channel: release_channel::RELEASE_CHANNEL_NAME.clone(),
-        commit_sha: option_env!("ZED_COMMIT_SHA").unwrap_or("no_sha").to_owned(),
-    }))
-    .detach();
-
-    log::info!("starting proxy process. PID: {}", std::process::id());
-    smol::block_on(async {
-        let server_pid = check_pid_file(&server_paths.pid_file)
-            .await
-            .map_err(|source| ExecuteProxyError::CheckPidFile {
-                source,
-                path: server_paths.pid_file.clone(),
-            })?;
-        let server_running = server_pid.is_some();
-        if is_reconnecting {
-            if !server_running {
-                log::error!("attempted to reconnect, but no server running");
-                return Err(ExecuteProxyError::ServerNotRunning(
-                    ProxyLaunchError::ServerNotRunning,
-                ));
-            }
-        } else {
-            if let Some(pid) = server_pid {
-                log::info!(
-                    "proxy found server already running with PID {}. Killing process and cleaning up files...",
-                    pid
-                );
-                kill_running_server(pid, &server_paths).await?;
-            }
-
-            spawn_server(&server_paths)
-                .await
-                .map_err(ExecuteProxyError::SpawnServer)?;
-        };
-        Ok(())
-    })?;
-
-    let stdin_task = smol::spawn(async move {
-        let stdin = Async::new(std::io::stdin())?;
-        let stream = smol::net::unix::UnixStream::connect(&server_paths.stdin_socket).await?;
-        handle_io(stdin, stream, "stdin").await
-    });
-
-    let stdout_task: smol::Task<Result<()>> = smol::spawn(async move {
-        let stdout = Async::new(std::io::stdout())?;
-        let stream = smol::net::unix::UnixStream::connect(&server_paths.stdout_socket).await?;
-        handle_io(stream, stdout, "stdout").await
-    });
-
-    let stderr_task: smol::Task<Result<()>> = smol::spawn(async move {
-        let mut stderr = Async::new(std::io::stderr())?;
-        let mut stream = smol::net::unix::UnixStream::connect(&server_paths.stderr_socket).await?;
-        let mut stderr_buffer = vec![0; 2048];
-        loop {
-            match stream
-                .read(&mut stderr_buffer)
-                .await
-                .context("reading stderr")?
-            {
-                0 => {
-                    let error =
-                        std::io::Error::new(std::io::ErrorKind::UnexpectedEof, "stderr closed");
-                    Err(anyhow!(error))?;
-                }
-                n => {
-                    stderr.write_all(&stderr_buffer[..n]).await?;
-                    stderr.flush().await?;
-                }
-            }
-        }
-    });
-
-    if let Err(forwarding_result) = smol::block_on(async move {
-        futures::select! {
-            result = stdin_task.fuse() => result.map_err(ExecuteProxyError::StdinTask),
-            result = stdout_task.fuse() => result.map_err(ExecuteProxyError::StdoutTask),
-            result = stderr_task.fuse() => result.map_err(ExecuteProxyError::StderrTask),
-        }
-    }) {
-        log::error!(
-            "encountered error while forwarding messages: {:?}, terminating...",
-            forwarding_result
-        );
-        return Err(forwarding_result);
-    }
-
-    Ok(())
-}
-
-async fn kill_running_server(pid: u32, paths: &ServerPaths) -> Result<(), ExecuteProxyError> {
-    log::info!("killing existing server with PID {}", pid);
-    new_smol_command("kill")
-        .arg(pid.to_string())
-        .output()
-        .await
-        .map_err(|source| ExecuteProxyError::KillRunningServer { source, pid })?;
-
-    for file in [
-        &paths.pid_file,
-        &paths.stdin_socket,
-        &paths.stdout_socket,
-        &paths.stderr_socket,
-    ] {
-        log::debug!("cleaning up file {:?} before starting new server", file);
-        std::fs::remove_file(file).ok();
-    }
-    Ok(())
-}
-
-#[derive(Debug, Error)]
-pub(crate) enum SpawnServerError {
-    #[error("failed to remove stdin socket")]
-    RemoveStdinSocket(#[source] std::io::Error),
-
-    #[error("failed to remove stdout socket")]
-    RemoveStdoutSocket(#[source] std::io::Error),
-
-    #[error("failed to remove stderr socket")]
-    RemoveStderrSocket(#[source] std::io::Error),
-
-    #[error("failed to get current_exe")]
-    CurrentExe(#[source] std::io::Error),
-
-    #[error("failed to launch server process")]
-    ProcessStatus(#[source] std::io::Error),
-
-    #[error("failed to launch and detach server process: {status}\n{paths}")]
-    LaunchStatus { status: ExitStatus, paths: String },
-}
-
-async fn spawn_server(paths: &ServerPaths) -> Result<(), SpawnServerError> {
-    if paths.stdin_socket.exists() {
-        std::fs::remove_file(&paths.stdin_socket).map_err(SpawnServerError::RemoveStdinSocket)?;
-    }
-    if paths.stdout_socket.exists() {
-        std::fs::remove_file(&paths.stdout_socket).map_err(SpawnServerError::RemoveStdoutSocket)?;
-    }
-    if paths.stderr_socket.exists() {
-        std::fs::remove_file(&paths.stderr_socket).map_err(SpawnServerError::RemoveStderrSocket)?;
-    }
-
-    let binary_name = std::env::current_exe().map_err(SpawnServerError::CurrentExe)?;
-    let mut server_process = new_smol_command(binary_name);
-    server_process
-        .arg("run")
-        .arg("--log-file")
-        .arg(&paths.log_file)
-        .arg("--pid-file")
-        .arg(&paths.pid_file)
-        .arg("--stdin-socket")
-        .arg(&paths.stdin_socket)
-        .arg("--stdout-socket")
-        .arg(&paths.stdout_socket)
-        .arg("--stderr-socket")
-        .arg(&paths.stderr_socket);
-
-    let status = server_process
-        .status()
-        .await
-        .map_err(SpawnServerError::ProcessStatus)?;
-
-    if !status.success() {
-        return Err(SpawnServerError::LaunchStatus {
-            status,
-            paths: format!(
-                "log file: {:?}, pid file: {:?}",
-                paths.log_file, paths.pid_file,
-            ),
-        });
-    }
-
-    let mut total_time_waited = std::time::Duration::from_secs(0);
-    let wait_duration = std::time::Duration::from_millis(20);
-    while !paths.stdout_socket.exists()
-        || !paths.stdin_socket.exists()
-        || !paths.stderr_socket.exists()
-    {
-        log::debug!("waiting for server to be ready to accept connections...");
-        std::thread::sleep(wait_duration);
-        total_time_waited += wait_duration;
-    }
-
-    log::info!(
-        "server ready to accept connections. total time waited: {:?}",
-        total_time_waited
-    );
-
-    Ok(())
-}
-
-#[derive(Debug, Error)]
-#[error("Failed to remove PID file for missing process (pid `{pid}`")]
-pub(crate) struct CheckPidError {
-    #[source]
-    source: std::io::Error,
-    pid: u32,
-}
-
-async fn check_pid_file(path: &Path) -> Result<Option<u32>, CheckPidError> {
-    let Some(pid) = std::fs::read_to_string(&path)
-        .ok()
-        .and_then(|contents| contents.parse::<u32>().ok())
-    else {
-        return Ok(None);
-    };
-
-    log::debug!("Checking if process with PID {} exists...", pid);
-    match new_smol_command("kill")
-        .arg("-0")
-        .arg(pid.to_string())
-        .output()
-        .await
-    {
-        Ok(output) if output.status.success() => {
-            log::debug!(
-                "Process with PID {} exists. NOT spawning new server, but attaching to existing one.",
-                pid
-            );
-            Ok(Some(pid))
-        }
-        _ => {
-            log::debug!(
-                "Found PID file, but process with that PID does not exist. Removing PID file."
-            );
-            std::fs::remove_file(&path).map_err(|source| CheckPidError { source, pid })?;
-            Ok(None)
-        }
-    }
-}
-
-fn write_pid_file(path: &Path) -> Result<()> {
-    if path.exists() {
-        std::fs::remove_file(path)?;
-    }
-    let pid = std::process::id().to_string();
-    log::debug!("writing PID {} to file {:?}", pid, path);
-    std::fs::write(path, pid).context("Failed to write PID file")
-}
-
-async fn handle_io<R, W>(mut reader: R, mut writer: W, socket_name: &str) -> Result<()>
-where
-    R: AsyncRead + Unpin,
-    W: AsyncWrite + Unpin,
-{
-    use remote::protocol::{read_message_raw, write_size_prefixed_buffer};
-
-    let mut buffer = Vec::new();
-    loop {
-        read_message_raw(&mut reader, &mut buffer)
-            .await
-            .with_context(|| format!("failed to read message from {}", socket_name))?;
-        write_size_prefixed_buffer(&mut writer, &mut buffer)
-            .await
-            .with_context(|| format!("failed to write message to {}", socket_name))?;
-        writer.flush().await?;
-        buffer.clear();
-    }
-}
-
-fn initialize_settings(
-    session: AnyProtoClient,
-    fs: Arc<dyn Fs>,
-    cx: &mut App,
-) -> watch::Receiver<Option<NodeBinaryOptions>> {
-    let user_settings_file_rx =
-        watch_config_file(cx.background_executor(), fs, paths::settings_file().clone());
-
-    handle_settings_file_changes(user_settings_file_rx, cx, {
-        move |err, _cx| {
-            if let Some(e) = err {
-                log::info!("Server settings failed to change: {}", e);
-
-                session
-                    .send(proto::Toast {
-                        project_id: REMOTE_SERVER_PROJECT_ID,
-                        notification_id: "server-settings-failed".to_string(),
-                        message: format!(
-                            "Error in settings on remote host {:?}: {}",
-                            paths::settings_file(),
-                            e
-                        ),
-                    })
-                    .log_err();
-            } else {
-                session
-                    .send(proto::HideToast {
-                        project_id: REMOTE_SERVER_PROJECT_ID,
-                        notification_id: "server-settings-failed".to_string(),
-                    })
-                    .log_err();
-            }
-        }
-    });
-
-    let (mut tx, rx) = watch::channel(None);
-    let mut node_settings = None;
-    cx.observe_global::<SettingsStore>(move |cx| {
-        let new_node_settings = &ProjectSettings::get_global(cx).node;
-        if Some(new_node_settings) != node_settings.as_ref() {
-            log::info!("Got new node settings: {new_node_settings:?}");
-            let options = NodeBinaryOptions {
-                allow_path_lookup: !new_node_settings.ignore_system_version,
-                // TODO: Implement this setting
-                allow_binary_download: true,
-                use_paths: new_node_settings.path.as_ref().map(|node_path| {
-                    let node_path = PathBuf::from(shellexpand::tilde(node_path).as_ref());
-                    let npm_path = new_node_settings
-                        .npm_path
-                        .as_ref()
-                        .map(|path| PathBuf::from(shellexpand::tilde(&path).as_ref()));
-                    (
-                        node_path.clone(),
-                        npm_path.unwrap_or_else(|| {
-                            let base_path = PathBuf::new();
-                            node_path.parent().unwrap_or(&base_path).join("npm")
-                        }),
-                    )
-                }),
-            };
-            node_settings = Some(new_node_settings.clone());
-            tx.send(Some(options)).ok();
-        }
-    })
-    .detach();
-
-    rx
-}
-
-pub fn handle_settings_file_changes(
-    mut server_settings_file: mpsc::UnboundedReceiver<String>,
-    cx: &mut App,
-    settings_changed: impl Fn(Option<anyhow::Error>, &mut App) + 'static,
-) {
-    let server_settings_content = cx
-        .background_executor()
-        .block(server_settings_file.next())
-        .unwrap();
-    SettingsStore::update_global(cx, |store, cx| {
-        store
-            .set_server_settings(&server_settings_content, cx)
-            .log_err();
-    });
-    cx.spawn(async move |cx| {
-        while let Some(server_settings_content) = server_settings_file.next().await {
-            let result = cx.update_global(|store: &mut SettingsStore, cx| {
-                let result = store.set_server_settings(&server_settings_content, cx);
-                if let Err(err) = &result {
-                    log::error!("Failed to load server settings: {err}");
-                }
-                settings_changed(result.err(), cx);
-                cx.refresh_windows();
-            });
-            if result.is_err() {
-                break; // App dropped
-            }
-        }
-    })
-    .detach();
-}
-
-fn read_proxy_settings(cx: &mut Context<HeadlessProject>) -> Option<Url> {
-    let proxy_str = ProxySettings::get_global(cx).proxy.to_owned();
-
-    proxy_str
-        .as_ref()
-        .and_then(|input: &String| {
-            input
-                .parse::<Url>()
-                .inspect_err(|e| log::error!("Error parsing proxy settings: {}", e))
-                .ok()
-        })
-        .or_else(read_proxy_from_env)
-}
-
-fn daemonize() -> Result<ControlFlow<()>> {
-    match fork::fork().map_err(|e| anyhow!("failed to call fork with error code {e}"))? {
-        fork::Fork::Parent(_) => {
-            return Ok(ControlFlow::Break(()));
-        }
-        fork::Fork::Child => {}
-    }
-
-    // Once we've detached from the parent, we want to close stdout/stderr/stdin
-    // so that the outer SSH process is not attached to us in any way anymore.
-    unsafe { redirect_standard_streams() }?;
-
-    Ok(ControlFlow::Continue(()))
-}
-
-unsafe fn redirect_standard_streams() -> Result<()> {
-    let devnull_fd = unsafe { libc::open(b"/dev/null\0" as *const [u8; 10] as _, libc::O_RDWR) };
-    anyhow::ensure!(devnull_fd != -1, "failed to open /dev/null");
-
-    let process_stdio = |name, fd| {
-        let reopened_fd = unsafe { libc::dup2(devnull_fd, fd) };
-        anyhow::ensure!(
-            reopened_fd != -1,
-            format!("failed to redirect {} to /dev/null", name)
-        );
-        Ok(())
-    };
-
-    process_stdio("stdin", libc::STDIN_FILENO)?;
-    process_stdio("stdout", libc::STDOUT_FILENO)?;
-    process_stdio("stderr", libc::STDERR_FILENO)?;
-
-    anyhow::ensure!(
-        unsafe { libc::close(devnull_fd) != -1 },
-        "failed to close /dev/null fd after redirecting"
-    );
-
-    Ok(())
-}
-
-fn cleanup_old_binaries() -> Result<()> {
-    let server_dir = paths::remote_server_dir_relative();
-    let release_channel = release_channel::RELEASE_CHANNEL.dev_name();
-    let prefix = format!("zed-remote-server-{}-", release_channel);
-
-    for entry in std::fs::read_dir(server_dir.as_std_path())? {
-        let path = entry?.path();
-
-        if let Some(file_name) = path.file_name()
-            && let Some(version) = file_name.to_string_lossy().strip_prefix(&prefix)
-            && !is_new_version(version)
-            && !is_file_in_use(file_name)
-        {
-            log::info!("removing old remote server binary: {:?}", path);
-            std::fs::remove_file(&path)?;
-        }
-    }
-
-    Ok(())
-}
-
-fn is_new_version(version: &str) -> bool {
-    semver::Version::from_str(version)
-        .ok()
-        .zip(semver::Version::from_str(env!("ZED_PKG_VERSION")).ok())
-        .is_some_and(|(version, current_version)| version >= current_version)
-}
-
-fn is_file_in_use(file_name: &OsStr) -> bool {
-    let info = sysinfo::System::new_with_specifics(sysinfo::RefreshKind::nothing().with_processes(
-        sysinfo::ProcessRefreshKind::nothing().with_exe(sysinfo::UpdateKind::Always),
-    ));
-
-    for process in info.processes().values() {
-        if process
-            .exe()
-            .is_some_and(|exe| exe.file_name().is_some_and(|name| name == file_name))
-        {
-            return true;
-        }
-    }
-
-    false
-}
diff --git a/crates/repl/Cargo.toml b/crates/repl/Cargo.toml
deleted file mode 100644
index 14040ba484..0000000000
--- a/crates/repl/Cargo.toml
+++ /dev/null
@@ -1,70 +0,0 @@
-[package]
-name = "repl"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/repl.rs"
-doctest = false
-
-[dependencies]
-alacritty_terminal.workspace = true
-anyhow.workspace = true
-async-dispatcher.workspace = true
-async-tungstenite = { workspace = true, features = ["tokio", "tokio-rustls-manual-roots", "tokio-runtime"] }
-base64.workspace = true
-client.workspace = true
-collections.workspace = true
-command_palette_hooks.workspace = true
-editor.workspace = true
-feature_flags.workspace = true
-file_icons.workspace = true
-futures.workspace = true
-gpui.workspace = true
-http_client.workspace = true
-image.workspace = true
-jupyter-websocket-client.workspace = true
-jupyter-protocol.workspace = true
-language.workspace = true
-log.workspace = true
-markdown_preview.workspace = true
-menu.workspace = true
-multi_buffer.workspace = true
-nbformat.workspace = true
-project.workspace = true
-runtimelib.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-smol.workspace = true
-telemetry.workspace = true
-terminal.workspace = true
-terminal_view.workspace = true
-theme.workspace = true
-ui.workspace = true
-util.workspace = true
-uuid.workspace = true
-workspace.workspace = true
-picker.workspace = true
-
-[dev-dependencies]
-editor = { workspace = true, features = ["test-support"] }
-env_logger.workspace = true
-gpui = { workspace = true, features = ["test-support"] }
-http_client = { workspace = true, features = ["test-support"] }
-indoc.workspace = true
-language = { workspace = true, features = ["test-support"] }
-languages = { workspace = true, features = ["test-support"] }
-project = { workspace = true, features = ["test-support"] }
-settings = { workspace = true, features = ["test-support"] }
-terminal_view = { workspace = true, features = ["test-support"] }
-theme = { workspace = true, features = ["test-support"] }
-tree-sitter-md.workspace = true
-tree-sitter-typescript.workspace = true
-tree-sitter-python.workspace = true
-util = { workspace = true, features = ["test-support"] }
diff --git a/crates/repl/LICENSE-GPL b/crates/repl/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/repl/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/repl/src/components.rs b/crates/repl/src/components.rs
deleted file mode 100644
index 53236bc6a8..0000000000
--- a/crates/repl/src/components.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-mod kernel_list_item;
-mod kernel_options;
-
-pub use kernel_list_item::*;
-pub use kernel_options::*;
diff --git a/crates/repl/src/components/kernel_list_item.rs b/crates/repl/src/components/kernel_list_item.rs
deleted file mode 100644
index 467407fbd2..0000000000
--- a/crates/repl/src/components/kernel_list_item.rs
+++ /dev/null
@@ -1,60 +0,0 @@
-use gpui::AnyElement;
-use ui::{Indicator, ListItem, prelude::*};
-
-use crate::KernelSpecification;
-
-#[derive(IntoElement)]
-pub struct KernelListItem {
-    kernel_specification: KernelSpecification,
-    status_color: Color,
-    buttons: Vec<AnyElement>,
-    children: Vec<AnyElement>,
-}
-
-impl KernelListItem {
-    pub fn new(kernel_specification: KernelSpecification) -> Self {
-        Self {
-            kernel_specification,
-            status_color: Color::Disabled,
-            buttons: Vec::new(),
-            children: Vec::new(),
-        }
-    }
-
-    pub fn status_color(mut self, color: Color) -> Self {
-        self.status_color = color;
-        self
-    }
-
-    pub fn button(mut self, button: impl IntoElement) -> Self {
-        self.buttons.push(button.into_any_element());
-        self
-    }
-
-    pub fn buttons(mut self, buttons: impl IntoIterator<Item = impl IntoElement>) -> Self {
-        self.buttons
-            .extend(buttons.into_iter().map(|button| button.into_any_element()));
-        self
-    }
-}
-
-impl ParentElement for KernelListItem {
-    fn extend(&mut self, elements: impl IntoIterator<Item = AnyElement>) {
-        self.children.extend(elements);
-    }
-}
-
-impl RenderOnce for KernelListItem {
-    fn render(self, _window: &mut Window, _cx: &mut App) -> impl IntoElement {
-        ListItem::new(self.kernel_specification.name())
-            .selectable(false)
-            .start_slot(
-                h_flex()
-                    .size_3()
-                    .justify_center()
-                    .child(Indicator::dot().color(self.status_color)),
-            )
-            .children(self.children)
-            .end_slot(h_flex().gap_2().children(self.buttons))
-    }
-}
diff --git a/crates/repl/src/components/kernel_options.rs b/crates/repl/src/components/kernel_options.rs
deleted file mode 100644
index bceefd08cc..0000000000
--- a/crates/repl/src/components/kernel_options.rs
+++ /dev/null
@@ -1,283 +0,0 @@
-use crate::KERNEL_DOCS_URL;
-use crate::kernels::KernelSpecification;
-use crate::repl_store::ReplStore;
-
-use gpui::AnyView;
-use gpui::DismissEvent;
-
-use gpui::FontWeight;
-use picker::Picker;
-use picker::PickerDelegate;
-use project::WorktreeId;
-
-use std::sync::Arc;
-use ui::ListItemSpacing;
-
-use gpui::SharedString;
-use gpui::Task;
-use ui::{ListItem, PopoverMenu, PopoverMenuHandle, PopoverTrigger, prelude::*};
-
-type OnSelect = Box<dyn Fn(KernelSpecification, &mut Window, &mut App)>;
-
-#[derive(IntoElement)]
-pub struct KernelSelector<T, TT>
-where
-    T: PopoverTrigger + ButtonCommon,
-    TT: Fn(&mut Window, &mut App) -> AnyView + 'static,
-{
-    handle: Option<PopoverMenuHandle<Picker<KernelPickerDelegate>>>,
-    on_select: OnSelect,
-    trigger: T,
-    tooltip: TT,
-    info_text: Option<SharedString>,
-    worktree_id: WorktreeId,
-}
-
-pub struct KernelPickerDelegate {
-    all_kernels: Vec<KernelSpecification>,
-    filtered_kernels: Vec<KernelSpecification>,
-    selected_kernelspec: Option<KernelSpecification>,
-    on_select: OnSelect,
-}
-
-// Helper function to truncate long paths
-fn truncate_path(path: &SharedString, max_length: usize) -> SharedString {
-    if path.len() <= max_length {
-        path.to_string().into()
-    } else {
-        let truncated = path.chars().rev().take(max_length - 3).collect::<String>();
-        format!("...{}", truncated.chars().rev().collect::<String>()).into()
-    }
-}
-
-impl<T, TT> KernelSelector<T, TT>
-where
-    T: PopoverTrigger + ButtonCommon,
-    TT: Fn(&mut Window, &mut App) -> AnyView + 'static,
-{
-    pub fn new(on_select: OnSelect, worktree_id: WorktreeId, trigger: T, tooltip: TT) -> Self {
-        KernelSelector {
-            on_select,
-            handle: None,
-            trigger,
-            tooltip,
-            info_text: None,
-            worktree_id,
-        }
-    }
-
-    pub fn with_handle(mut self, handle: PopoverMenuHandle<Picker<KernelPickerDelegate>>) -> Self {
-        self.handle = Some(handle);
-        self
-    }
-
-    pub fn with_info_text(mut self, text: impl Into<SharedString>) -> Self {
-        self.info_text = Some(text.into());
-        self
-    }
-}
-
-impl PickerDelegate for KernelPickerDelegate {
-    type ListItem = ListItem;
-
-    fn match_count(&self) -> usize {
-        self.filtered_kernels.len()
-    }
-
-    fn selected_index(&self) -> usize {
-        if let Some(kernelspec) = self.selected_kernelspec.as_ref() {
-            self.filtered_kernels
-                .iter()
-                .position(|k| k == kernelspec)
-                .unwrap_or(0)
-        } else {
-            0
-        }
-    }
-
-    fn set_selected_index(&mut self, ix: usize, _: &mut Window, cx: &mut Context<Picker<Self>>) {
-        self.selected_kernelspec = self.filtered_kernels.get(ix).cloned();
-        cx.notify();
-    }
-
-    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
-        "Select a kernel...".into()
-    }
-
-    fn update_matches(
-        &mut self,
-        query: String,
-        _window: &mut Window,
-        _cx: &mut Context<Picker<Self>>,
-    ) -> Task<()> {
-        let all_kernels = self.all_kernels.clone();
-
-        if query.is_empty() {
-            self.filtered_kernels = all_kernels;
-            return Task::ready(());
-        }
-
-        self.filtered_kernels = if query.is_empty() {
-            all_kernels
-        } else {
-            all_kernels
-                .into_iter()
-                .filter(|kernel| kernel.name().to_lowercase().contains(&query.to_lowercase()))
-                .collect()
-        };
-
-        Task::ready(())
-    }
-
-    fn confirm(&mut self, _secondary: bool, window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        if let Some(kernelspec) = &self.selected_kernelspec {
-            (self.on_select)(kernelspec.clone(), window, cx);
-            cx.emit(DismissEvent);
-        }
-    }
-
-    fn dismissed(&mut self, _window: &mut Window, _cx: &mut Context<Picker<Self>>) {}
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        _: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<Self::ListItem> {
-        let kernelspec = self.filtered_kernels.get(ix)?;
-        let is_selected = self.selected_kernelspec.as_ref() == Some(kernelspec);
-        let icon = kernelspec.icon(cx);
-
-        let (name, kernel_type, path_or_url) = match kernelspec {
-            KernelSpecification::Jupyter(_) => (kernelspec.name(), "Jupyter", None),
-            KernelSpecification::PythonEnv(_) => (
-                kernelspec.name(),
-                "Python Env",
-                Some(truncate_path(&kernelspec.path(), 42)),
-            ),
-            KernelSpecification::Remote(_) => (
-                kernelspec.name(),
-                "Remote",
-                Some(truncate_path(&kernelspec.path(), 42)),
-            ),
-        };
-
-        Some(
-            ListItem::new(ix)
-                .inset(true)
-                .spacing(ListItemSpacing::Sparse)
-                .toggle_state(selected)
-                .child(
-                    h_flex()
-                        .w_full()
-                        .gap_3()
-                        .child(icon.color(Color::Default).size(IconSize::Medium))
-                        .child(
-                            v_flex()
-                                .flex_grow()
-                                .gap_0p5()
-                                .child(
-                                    h_flex()
-                                        .justify_between()
-                                        .child(
-                                            div().w_48().text_ellipsis().child(
-                                                Label::new(name)
-                                                    .weight(FontWeight::MEDIUM)
-                                                    .size(LabelSize::Default),
-                                            ),
-                                        )
-                                        .when_some(path_or_url, |flex, path| {
-                                            flex.text_ellipsis().child(
-                                                Label::new(path)
-                                                    .size(LabelSize::Small)
-                                                    .color(Color::Muted),
-                                            )
-                                        }),
-                                )
-                                .child(
-                                    h_flex()
-                                        .gap_1()
-                                        .child(
-                                            Label::new(kernelspec.language())
-                                                .size(LabelSize::Small)
-                                                .color(Color::Muted),
-                                        )
-                                        .child(
-                                            Label::new(kernel_type)
-                                                .size(LabelSize::Small)
-                                                .color(Color::Muted),
-                                        ),
-                                ),
-                        ),
-                )
-                .when(is_selected, |item| {
-                    item.end_slot(
-                        Icon::new(IconName::Check)
-                            .color(Color::Accent)
-                            .size(IconSize::Small),
-                    )
-                }),
-        )
-    }
-
-    fn render_footer(
-        &self,
-        _: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<gpui::AnyElement> {
-        Some(
-            h_flex()
-                .w_full()
-                .border_t_1()
-                .border_color(cx.theme().colors().border_variant)
-                .p_1()
-                .gap_4()
-                .child(
-                    Button::new("kernel-docs", "Kernel Docs")
-                        .icon(IconName::ArrowUpRight)
-                        .icon_size(IconSize::Small)
-                        .icon_color(Color::Muted)
-                        .icon_position(IconPosition::End)
-                        .on_click(move |_, _, cx| cx.open_url(KERNEL_DOCS_URL)),
-                )
-                .into_any(),
-        )
-    }
-}
-
-impl<T, TT> RenderOnce for KernelSelector<T, TT>
-where
-    T: PopoverTrigger + ButtonCommon,
-    TT: Fn(&mut Window, &mut App) -> AnyView + 'static,
-{
-    fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let store = ReplStore::global(cx).read(cx);
-
-        let all_kernels: Vec<KernelSpecification> = store
-            .kernel_specifications_for_worktree(self.worktree_id)
-            .cloned()
-            .collect();
-
-        let selected_kernelspec = store.active_kernelspec(self.worktree_id, None, cx);
-
-        let delegate = KernelPickerDelegate {
-            on_select: self.on_select,
-            all_kernels: all_kernels.clone(),
-            filtered_kernels: all_kernels,
-            selected_kernelspec,
-        };
-
-        let picker_view = cx.new(|cx| {
-            Picker::uniform_list(delegate, window, cx)
-                .width(rems(30.))
-                .max_height(Some(rems(20.).into()))
-        });
-
-        PopoverMenu::new("kernel-switcher")
-            .menu(move |_window, _cx| Some(picker_view.clone()))
-            .trigger_with_tooltip(self.trigger, self.tooltip)
-            .attach(gpui::Corner::BottomLeft)
-            .when_some(self.handle, |menu, handle| menu.with_handle(handle))
-    }
-}
diff --git a/crates/repl/src/jupyter_settings.rs b/crates/repl/src/jupyter_settings.rs
deleted file mode 100644
index 0adf80dc66..0000000000
--- a/crates/repl/src/jupyter_settings.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-use collections::HashMap;
-
-use editor::EditorSettings;
-use gpui::App;
-use settings::{RegisterSetting, Settings};
-
-#[derive(Debug, Default, RegisterSetting)]
-pub struct JupyterSettings {
-    pub kernel_selections: HashMap<String, String>,
-}
-
-impl JupyterSettings {
-    pub fn enabled(cx: &App) -> bool {
-        // In order to avoid a circular dependency between `editor` and `repl` crates,
-        // we put the `enable` flag on its settings.
-        // This allows the editor to set up context for key bindings/actions.
-        EditorSettings::jupyter_enabled(cx)
-    }
-}
-
-impl Settings for JupyterSettings {
-    fn from_settings(content: &settings::SettingsContent) -> Self {
-        let jupyter = content.editor.jupyter.clone().unwrap();
-        Self {
-            kernel_selections: jupyter.kernel_selections.unwrap_or_default(),
-        }
-    }
-}
diff --git a/crates/repl/src/kernels/mod.rs b/crates/repl/src/kernels/mod.rs
deleted file mode 100644
index ab8f27121e..0000000000
--- a/crates/repl/src/kernels/mod.rs
+++ /dev/null
@@ -1,259 +0,0 @@
-mod native_kernel;
-use std::{fmt::Debug, future::Future, path::PathBuf};
-
-use futures::{
-    channel::mpsc::{self, Receiver},
-    future::Shared,
-    stream,
-};
-use gpui::{App, Entity, Task, Window};
-use language::LanguageName;
-pub use native_kernel::*;
-
-mod remote_kernels;
-use project::{Project, ProjectPath, Toolchains, WorktreeId};
-pub use remote_kernels::*;
-
-use anyhow::Result;
-use jupyter_protocol::JupyterKernelspec;
-use runtimelib::{ExecutionState, JupyterMessage, KernelInfoReply};
-use ui::{Icon, IconName, SharedString};
-use util::rel_path::RelPath;
-
-pub type JupyterMessageChannel = stream::SelectAll<Receiver<JupyterMessage>>;
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum KernelSpecification {
-    Remote(RemoteKernelSpecification),
-    Jupyter(LocalKernelSpecification),
-    PythonEnv(LocalKernelSpecification),
-}
-
-impl KernelSpecification {
-    pub fn name(&self) -> SharedString {
-        match self {
-            Self::Jupyter(spec) => spec.name.clone().into(),
-            Self::PythonEnv(spec) => spec.name.clone().into(),
-            Self::Remote(spec) => spec.name.clone().into(),
-        }
-    }
-
-    pub fn type_name(&self) -> SharedString {
-        match self {
-            Self::Jupyter(_) => "Jupyter".into(),
-            Self::PythonEnv(_) => "Python Environment".into(),
-            Self::Remote(_) => "Remote".into(),
-        }
-    }
-
-    pub fn path(&self) -> SharedString {
-        SharedString::from(match self {
-            Self::Jupyter(spec) => spec.path.to_string_lossy().into_owned(),
-            Self::PythonEnv(spec) => spec.path.to_string_lossy().into_owned(),
-            Self::Remote(spec) => spec.url.to_string(),
-        })
-    }
-
-    pub fn language(&self) -> SharedString {
-        SharedString::from(match self {
-            Self::Jupyter(spec) => spec.kernelspec.language.clone(),
-            Self::PythonEnv(spec) => spec.kernelspec.language.clone(),
-            Self::Remote(spec) => spec.kernelspec.language.clone(),
-        })
-    }
-
-    pub fn icon(&self, cx: &App) -> Icon {
-        let lang_name = match self {
-            Self::Jupyter(spec) => spec.kernelspec.language.clone(),
-            Self::PythonEnv(spec) => spec.kernelspec.language.clone(),
-            Self::Remote(spec) => spec.kernelspec.language.clone(),
-        };
-
-        file_icons::FileIcons::get(cx)
-            .get_icon_for_type(&lang_name.to_lowercase(), cx)
-            .map(Icon::from_path)
-            .unwrap_or(Icon::new(IconName::ReplNeutral))
-    }
-}
-
-pub fn python_env_kernel_specifications(
-    project: &Entity<Project>,
-    worktree_id: WorktreeId,
-    cx: &mut App,
-) -> impl Future<Output = Result<Vec<KernelSpecification>>> + use<> {
-    let python_language = LanguageName::new_static("Python");
-    let toolchains = project.read(cx).available_toolchains(
-        ProjectPath {
-            worktree_id,
-            path: RelPath::empty().into(),
-        },
-        python_language,
-        cx,
-    );
-    let background_executor = cx.background_executor().clone();
-
-    async move {
-        let (toolchains, user_toolchains) = if let Some(Toolchains {
-            toolchains,
-            root_path: _,
-            user_toolchains,
-        }) = toolchains.await
-        {
-            (toolchains, user_toolchains)
-        } else {
-            return Ok(Vec::new());
-        };
-
-        let kernelspecs = user_toolchains
-            .into_values()
-            .flatten()
-            .chain(toolchains.toolchains)
-            .map(|toolchain| {
-                background_executor.spawn(async move {
-                    let python_path = toolchain.path.to_string();
-
-                    // Check if ipykernel is installed
-                    let ipykernel_check = util::command::new_smol_command(&python_path)
-                        .args(&["-c", "import ipykernel"])
-                        .output()
-                        .await;
-
-                    if ipykernel_check.is_ok() && ipykernel_check.unwrap().status.success() {
-                        // Create a default kernelspec for this environment
-                        let default_kernelspec = JupyterKernelspec {
-                            argv: vec![
-                                python_path.clone(),
-                                "-m".to_string(),
-                                "ipykernel_launcher".to_string(),
-                                "-f".to_string(),
-                                "{connection_file}".to_string(),
-                            ],
-                            display_name: toolchain.name.to_string(),
-                            language: "python".to_string(),
-                            interrupt_mode: None,
-                            metadata: None,
-                            env: None,
-                        };
-
-                        Some(KernelSpecification::PythonEnv(LocalKernelSpecification {
-                            name: toolchain.name.to_string(),
-                            path: PathBuf::from(&python_path),
-                            kernelspec: default_kernelspec,
-                        }))
-                    } else {
-                        None
-                    }
-                })
-            });
-
-        let kernel_specs = futures::future::join_all(kernelspecs)
-            .await
-            .into_iter()
-            .flatten()
-            .collect();
-
-        anyhow::Ok(kernel_specs)
-    }
-}
-
-pub trait RunningKernel: Send + Debug {
-    fn request_tx(&self) -> mpsc::Sender<JupyterMessage>;
-    fn working_directory(&self) -> &PathBuf;
-    fn execution_state(&self) -> &ExecutionState;
-    fn set_execution_state(&mut self, state: ExecutionState);
-    fn kernel_info(&self) -> Option<&KernelInfoReply>;
-    fn set_kernel_info(&mut self, info: KernelInfoReply);
-    fn force_shutdown(&mut self, window: &mut Window, cx: &mut App) -> Task<anyhow::Result<()>>;
-}
-
-#[derive(Debug, Clone)]
-pub enum KernelStatus {
-    Idle,
-    Busy,
-    Starting,
-    Error,
-    ShuttingDown,
-    Shutdown,
-    Restarting,
-}
-
-impl KernelStatus {
-    pub fn is_connected(&self) -> bool {
-        matches!(self, KernelStatus::Idle | KernelStatus::Busy)
-    }
-}
-
-impl ToString for KernelStatus {
-    fn to_string(&self) -> String {
-        match self {
-            KernelStatus::Idle => "Idle".to_string(),
-            KernelStatus::Busy => "Busy".to_string(),
-            KernelStatus::Starting => "Starting".to_string(),
-            KernelStatus::Error => "Error".to_string(),
-            KernelStatus::ShuttingDown => "Shutting Down".to_string(),
-            KernelStatus::Shutdown => "Shutdown".to_string(),
-            KernelStatus::Restarting => "Restarting".to_string(),
-        }
-    }
-}
-
-#[derive(Debug)]
-pub enum Kernel {
-    RunningKernel(Box<dyn RunningKernel>),
-    StartingKernel(Shared<Task<()>>),
-    ErroredLaunch(String),
-    ShuttingDown,
-    Shutdown,
-    Restarting,
-}
-
-impl From<&Kernel> for KernelStatus {
-    fn from(kernel: &Kernel) -> Self {
-        match kernel {
-            Kernel::RunningKernel(kernel) => match kernel.execution_state() {
-                ExecutionState::Idle => KernelStatus::Idle,
-                ExecutionState::Busy => KernelStatus::Busy,
-                ExecutionState::Unknown => KernelStatus::Error,
-                ExecutionState::Starting => KernelStatus::Starting,
-                ExecutionState::Restarting => KernelStatus::Restarting,
-                ExecutionState::Terminating => KernelStatus::ShuttingDown,
-                ExecutionState::AutoRestarting => KernelStatus::Restarting,
-                ExecutionState::Dead => KernelStatus::Error,
-                ExecutionState::Other(_) => KernelStatus::Error,
-            },
-            Kernel::StartingKernel(_) => KernelStatus::Starting,
-            Kernel::ErroredLaunch(_) => KernelStatus::Error,
-            Kernel::ShuttingDown => KernelStatus::ShuttingDown,
-            Kernel::Shutdown => KernelStatus::Shutdown,
-            Kernel::Restarting => KernelStatus::Restarting,
-        }
-    }
-}
-
-impl Kernel {
-    pub fn status(&self) -> KernelStatus {
-        self.into()
-    }
-
-    pub fn set_execution_state(&mut self, status: &ExecutionState) {
-        if let Kernel::RunningKernel(running_kernel) = self {
-            running_kernel.set_execution_state(status.clone());
-        }
-    }
-
-    pub fn set_kernel_info(&mut self, kernel_info: &KernelInfoReply) {
-        if let Kernel::RunningKernel(running_kernel) = self {
-            running_kernel.set_kernel_info(kernel_info.clone());
-        }
-    }
-
-    pub fn is_shutting_down(&self) -> bool {
-        match self {
-            Kernel::Restarting | Kernel::ShuttingDown => true,
-            Kernel::RunningKernel(_)
-            | Kernel::StartingKernel(_)
-            | Kernel::ErroredLaunch(_)
-            | Kernel::Shutdown => false,
-        }
-    }
-}
diff --git a/crates/repl/src/kernels/native_kernel.rs b/crates/repl/src/kernels/native_kernel.rs
deleted file mode 100644
index 8630768dec..0000000000
--- a/crates/repl/src/kernels/native_kernel.rs
+++ /dev/null
@@ -1,542 +0,0 @@
-use anyhow::{Context as _, Result};
-use futures::{
-    AsyncBufReadExt as _, SinkExt as _,
-    channel::mpsc::{self},
-    io::BufReader,
-    stream::{FuturesUnordered, SelectAll, StreamExt},
-};
-use gpui::{App, AppContext as _, Entity, EntityId, Task, Window};
-use jupyter_protocol::{
-    ExecutionState, JupyterKernelspec, JupyterMessage, JupyterMessageContent, KernelInfoReply,
-    connection_info::{ConnectionInfo, Transport},
-};
-use project::Fs;
-use runtimelib::dirs;
-use smol::{net::TcpListener, process::Command};
-use std::{
-    env,
-    fmt::Debug,
-    net::{IpAddr, Ipv4Addr, SocketAddr},
-    path::PathBuf,
-    sync::Arc,
-};
-use uuid::Uuid;
-
-use crate::Session;
-
-use super::RunningKernel;
-
-#[derive(Debug, Clone)]
-pub struct LocalKernelSpecification {
-    pub name: String,
-    pub path: PathBuf,
-    pub kernelspec: JupyterKernelspec,
-}
-
-impl PartialEq for LocalKernelSpecification {
-    fn eq(&self, other: &Self) -> bool {
-        self.name == other.name && self.path == other.path
-    }
-}
-
-impl Eq for LocalKernelSpecification {}
-
-impl LocalKernelSpecification {
-    #[must_use]
-    fn command(&self, connection_path: &PathBuf) -> Result<Command> {
-        let argv = &self.kernelspec.argv;
-
-        anyhow::ensure!(!argv.is_empty(), "Empty argv in kernelspec {}", self.name);
-        anyhow::ensure!(argv.len() >= 2, "Invalid argv in kernelspec {}", self.name);
-        anyhow::ensure!(
-            argv.iter().any(|arg| arg == "{connection_file}"),
-            "Missing 'connection_file' in argv in kernelspec {}",
-            self.name
-        );
-
-        let mut cmd = util::command::new_smol_command(&argv[0]);
-
-        for arg in &argv[1..] {
-            if arg == "{connection_file}" {
-                cmd.arg(connection_path);
-            } else {
-                cmd.arg(arg);
-            }
-        }
-
-        if let Some(env) = &self.kernelspec.env {
-            cmd.envs(env);
-        }
-
-        Ok(cmd)
-    }
-}
-
-// Find a set of open ports. This creates a listener with port set to 0. The listener will be closed at the end when it goes out of scope.
-// There's a race condition between closing the ports and usage by a kernel, but it's inherent to the Jupyter protocol.
-async fn peek_ports(ip: IpAddr) -> Result<[u16; 5]> {
-    let mut addr_zeroport: SocketAddr = SocketAddr::new(ip, 0);
-    addr_zeroport.set_port(0);
-    let mut ports: [u16; 5] = [0; 5];
-    for i in 0..5 {
-        let listener = TcpListener::bind(addr_zeroport).await?;
-        let addr = listener.local_addr()?;
-        ports[i] = addr.port();
-    }
-    Ok(ports)
-}
-
-pub struct NativeRunningKernel {
-    pub process: smol::process::Child,
-    connection_path: PathBuf,
-    _process_status_task: Option<Task<()>>,
-    pub working_directory: PathBuf,
-    pub request_tx: mpsc::Sender<JupyterMessage>,
-    pub execution_state: ExecutionState,
-    pub kernel_info: Option<KernelInfoReply>,
-}
-
-impl Debug for NativeRunningKernel {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("RunningKernel")
-            .field("process", &self.process)
-            .finish()
-    }
-}
-
-impl NativeRunningKernel {
-    pub fn new(
-        kernel_specification: LocalKernelSpecification,
-        entity_id: EntityId,
-        working_directory: PathBuf,
-        fs: Arc<dyn Fs>,
-        // todo: convert to weak view
-        session: Entity<Session>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<Box<dyn RunningKernel>>> {
-        window.spawn(cx, async move |cx| {
-            let ip = IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1));
-            let ports = peek_ports(ip).await?;
-
-            let connection_info = ConnectionInfo {
-                transport: Transport::TCP,
-                ip: ip.to_string(),
-                stdin_port: ports[0],
-                control_port: ports[1],
-                hb_port: ports[2],
-                shell_port: ports[3],
-                iopub_port: ports[4],
-                signature_scheme: "hmac-sha256".to_string(),
-                key: uuid::Uuid::new_v4().to_string(),
-                kernel_name: Some(format!("zed-{}", kernel_specification.name)),
-            };
-
-            let runtime_dir = dirs::runtime_dir();
-            fs.create_dir(&runtime_dir)
-                .await
-                .with_context(|| format!("Failed to create jupyter runtime dir {runtime_dir:?}"))?;
-            let connection_path = runtime_dir.join(format!("kernel-zed-{entity_id}.json"));
-            let content = serde_json::to_string(&connection_info)?;
-            fs.atomic_write(connection_path.clone(), content).await?;
-
-            let mut cmd = kernel_specification.command(&connection_path)?;
-
-            let mut process = cmd
-                .current_dir(&working_directory)
-                .stdout(std::process::Stdio::piped())
-                .stderr(std::process::Stdio::piped())
-                .stdin(std::process::Stdio::piped())
-                .kill_on_drop(true)
-                .spawn()
-                .context("failed to start the kernel process")?;
-
-            let session_id = Uuid::new_v4().to_string();
-
-            let mut iopub_socket =
-                runtimelib::create_client_iopub_connection(&connection_info, "", &session_id)
-                    .await?;
-            let mut shell_socket =
-                runtimelib::create_client_shell_connection(&connection_info, &session_id).await?;
-            let mut control_socket =
-                runtimelib::create_client_control_connection(&connection_info, &session_id).await?;
-
-            let (request_tx, mut request_rx) =
-                futures::channel::mpsc::channel::<JupyterMessage>(100);
-
-            let (mut control_reply_tx, control_reply_rx) = futures::channel::mpsc::channel(100);
-            let (mut shell_reply_tx, shell_reply_rx) = futures::channel::mpsc::channel(100);
-
-            let mut messages_rx = SelectAll::new();
-            messages_rx.push(control_reply_rx);
-            messages_rx.push(shell_reply_rx);
-
-            cx.spawn({
-                let session = session.clone();
-
-                async move |cx| {
-                    while let Some(message) = messages_rx.next().await {
-                        session
-                            .update_in(cx, |session, window, cx| {
-                                session.route(&message, window, cx);
-                            })
-                            .ok();
-                    }
-                }
-            })
-            .detach();
-
-            // iopub task
-            let iopub_task = cx.spawn({
-                let session = session.clone();
-
-                async move |cx| -> anyhow::Result<()> {
-                    loop {
-                        let message = iopub_socket.read().await?;
-                        session
-                            .update_in(cx, |session, window, cx| {
-                                session.route(&message, window, cx);
-                            })
-                            .ok();
-                    }
-                }
-            });
-
-            let (mut control_request_tx, mut control_request_rx) =
-                futures::channel::mpsc::channel(100);
-            let (mut shell_request_tx, mut shell_request_rx) = futures::channel::mpsc::channel(100);
-
-            let routing_task = cx.background_spawn({
-                async move {
-                    while let Some(message) = request_rx.next().await {
-                        match message.content {
-                            JupyterMessageContent::DebugRequest(_)
-                            | JupyterMessageContent::InterruptRequest(_)
-                            | JupyterMessageContent::ShutdownRequest(_) => {
-                                control_request_tx.send(message).await?;
-                            }
-                            _ => {
-                                shell_request_tx.send(message).await?;
-                            }
-                        }
-                    }
-                    anyhow::Ok(())
-                }
-            });
-
-            let shell_task = cx.background_spawn({
-                async move {
-                    while let Some(message) = shell_request_rx.next().await {
-                        shell_socket.send(message).await.ok();
-                        let reply = shell_socket.read().await?;
-                        shell_reply_tx.send(reply).await?;
-                    }
-                    anyhow::Ok(())
-                }
-            });
-
-            let control_task = cx.background_spawn({
-                async move {
-                    while let Some(message) = control_request_rx.next().await {
-                        control_socket.send(message).await.ok();
-                        let reply = control_socket.read().await?;
-                        control_reply_tx.send(reply).await?;
-                    }
-                    anyhow::Ok(())
-                }
-            });
-
-            let stderr = process.stderr.take();
-
-            cx.spawn(async move |_cx| {
-                if stderr.is_none() {
-                    return;
-                }
-                let reader = BufReader::new(stderr.unwrap());
-                let mut lines = reader.lines();
-                while let Some(Ok(line)) = lines.next().await {
-                    log::error!("kernel: {}", line);
-                }
-            })
-            .detach();
-
-            let stdout = process.stdout.take();
-
-            cx.spawn(async move |_cx| {
-                if stdout.is_none() {
-                    return;
-                }
-                let reader = BufReader::new(stdout.unwrap());
-                let mut lines = reader.lines();
-                while let Some(Ok(line)) = lines.next().await {
-                    log::info!("kernel: {}", line);
-                }
-            })
-            .detach();
-
-            cx.spawn({
-                let session = session.clone();
-                async move |cx| {
-                    async fn with_name(
-                        name: &'static str,
-                        task: Task<Result<()>>,
-                    ) -> (&'static str, Result<()>) {
-                        (name, task.await)
-                    }
-
-                    let mut tasks = FuturesUnordered::new();
-                    tasks.push(with_name("iopub task", iopub_task));
-                    tasks.push(with_name("shell task", shell_task));
-                    tasks.push(with_name("control task", control_task));
-                    tasks.push(with_name("routing task", routing_task));
-
-                    while let Some((name, result)) = tasks.next().await {
-                        if let Err(err) = result {
-                            log::error!("kernel: handling failed for {name}: {err:?}");
-
-                            session
-                                .update(cx, |session, cx| {
-                                    session.kernel_errored(
-                                        format!("handling failed for {name}: {err}"),
-                                        cx,
-                                    );
-                                    cx.notify();
-                                })
-                                .ok();
-                        }
-                    }
-                }
-            })
-            .detach();
-
-            let status = process.status();
-
-            let process_status_task = cx.spawn(async move |cx| {
-                let error_message = match status.await {
-                    Ok(status) => {
-                        if status.success() {
-                            log::info!("kernel process exited successfully");
-                            return;
-                        }
-
-                        format!("kernel process exited with status: {:?}", status)
-                    }
-                    Err(err) => {
-                        format!("kernel process exited with error: {:?}", err)
-                    }
-                };
-
-                log::error!("{}", error_message);
-
-                session
-                    .update(cx, |session, cx| {
-                        session.kernel_errored(error_message, cx);
-
-                        cx.notify();
-                    })
-                    .ok();
-            });
-
-            anyhow::Ok(Box::new(Self {
-                process,
-                request_tx,
-                working_directory,
-                _process_status_task: Some(process_status_task),
-                connection_path,
-                execution_state: ExecutionState::Idle,
-                kernel_info: None,
-            }) as Box<dyn RunningKernel>)
-        })
-    }
-}
-
-impl RunningKernel for NativeRunningKernel {
-    fn request_tx(&self) -> mpsc::Sender<JupyterMessage> {
-        self.request_tx.clone()
-    }
-
-    fn working_directory(&self) -> &PathBuf {
-        &self.working_directory
-    }
-
-    fn execution_state(&self) -> &ExecutionState {
-        &self.execution_state
-    }
-
-    fn set_execution_state(&mut self, state: ExecutionState) {
-        self.execution_state = state;
-    }
-
-    fn kernel_info(&self) -> Option<&KernelInfoReply> {
-        self.kernel_info.as_ref()
-    }
-
-    fn set_kernel_info(&mut self, info: KernelInfoReply) {
-        self.kernel_info = Some(info);
-    }
-
-    fn force_shutdown(&mut self, _window: &mut Window, _cx: &mut App) -> Task<anyhow::Result<()>> {
-        self._process_status_task.take();
-        self.request_tx.close_channel();
-        Task::ready(self.process.kill().context("killing the kernel process"))
-    }
-}
-
-impl Drop for NativeRunningKernel {
-    fn drop(&mut self) {
-        std::fs::remove_file(&self.connection_path).ok();
-        self.request_tx.close_channel();
-        self.process.kill().ok();
-    }
-}
-
-async fn read_kernelspec_at(
-    // Path should be a directory to a jupyter kernelspec, as in
-    // /usr/local/share/jupyter/kernels/python3
-    kernel_dir: PathBuf,
-    fs: &dyn Fs,
-) -> Result<LocalKernelSpecification> {
-    let path = kernel_dir;
-    let kernel_name = if let Some(kernel_name) = path.file_name() {
-        kernel_name.to_string_lossy().into_owned()
-    } else {
-        anyhow::bail!("Invalid kernelspec directory: {path:?}");
-    };
-
-    if !fs.is_dir(path.as_path()).await {
-        anyhow::bail!("Not a directory: {path:?}");
-    }
-
-    let expected_kernel_json = path.join("kernel.json");
-    let spec = fs.load(expected_kernel_json.as_path()).await?;
-    let spec = serde_json::from_str::<JupyterKernelspec>(&spec)?;
-
-    Ok(LocalKernelSpecification {
-        name: kernel_name,
-        path,
-        kernelspec: spec,
-    })
-}
-
-/// Read a directory of kernelspec directories
-async fn read_kernels_dir(path: PathBuf, fs: &dyn Fs) -> Result<Vec<LocalKernelSpecification>> {
-    let mut kernelspec_dirs = fs.read_dir(&path).await?;
-
-    let mut valid_kernelspecs = Vec::new();
-    while let Some(path) = kernelspec_dirs.next().await {
-        match path {
-            Ok(path) => {
-                if fs.is_dir(path.as_path()).await
-                    && let Ok(kernelspec) = read_kernelspec_at(path, fs).await
-                {
-                    valid_kernelspecs.push(kernelspec);
-                }
-            }
-            Err(err) => log::warn!("Error reading kernelspec directory: {err:?}"),
-        }
-    }
-
-    Ok(valid_kernelspecs)
-}
-
-pub async fn local_kernel_specifications(fs: Arc<dyn Fs>) -> Result<Vec<LocalKernelSpecification>> {
-    let mut data_dirs = dirs::data_dirs();
-
-    // Pick up any kernels from conda or conda environment
-    if let Ok(conda_prefix) = env::var("CONDA_PREFIX") {
-        let conda_prefix = PathBuf::from(conda_prefix);
-        let conda_data_dir = conda_prefix.join("share").join("jupyter");
-        data_dirs.push(conda_data_dir);
-    }
-
-    // Search for kernels inside the base python environment
-    let command = util::command::new_smol_command("python")
-        .arg("-c")
-        .arg("import sys; print(sys.prefix)")
-        .output()
-        .await;
-
-    if let Ok(command) = command
-        && command.status.success()
-    {
-        let python_prefix = String::from_utf8(command.stdout);
-        if let Ok(python_prefix) = python_prefix {
-            let python_prefix = PathBuf::from(python_prefix.trim());
-            let python_data_dir = python_prefix.join("share").join("jupyter");
-            data_dirs.push(python_data_dir);
-        }
-    }
-
-    let kernel_dirs = data_dirs
-        .iter()
-        .map(|dir| dir.join("kernels"))
-        .map(|path| read_kernels_dir(path, fs.as_ref()))
-        .collect::<Vec<_>>();
-
-    let kernel_dirs = futures::future::join_all(kernel_dirs).await;
-    let kernel_dirs = kernel_dirs
-        .into_iter()
-        .filter_map(Result::ok)
-        .flatten()
-        .collect::<Vec<_>>();
-
-    Ok(kernel_dirs)
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use std::path::PathBuf;
-
-    use gpui::TestAppContext;
-    use project::FakeFs;
-    use serde_json::json;
-
-    #[gpui::test]
-    async fn test_get_kernelspecs(cx: &mut TestAppContext) {
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            "/jupyter",
-            json!({
-                ".zed": {
-                    "settings.json": r#"{ "tab_size": 8 }"#,
-                    "tasks.json": r#"[{
-                        "label": "cargo check",
-                        "command": "cargo",
-                        "args": ["check", "--all"]
-                    },]"#,
-                },
-                "kernels": {
-                    "python": {
-                        "kernel.json": r#"{
-                            "display_name": "Python 3",
-                            "language": "python",
-                            "argv": ["python3", "-m", "ipykernel_launcher", "-f", "{connection_file}"],
-                            "env": {}
-                        }"#
-                    },
-                    "deno": {
-                        "kernel.json": r#"{
-                            "display_name": "Deno",
-                            "language": "typescript",
-                            "argv": ["deno", "run", "--unstable", "--allow-net", "--allow-read", "https://deno.land/std/http/file_server.ts", "{connection_file}"],
-                            "env": {}
-                        }"#
-                    }
-                },
-            }),
-        )
-        .await;
-
-        let mut kernels = read_kernels_dir(PathBuf::from("/jupyter/kernels"), fs.as_ref())
-            .await
-            .unwrap();
-
-        kernels.sort_by(|a, b| a.name.cmp(&b.name));
-
-        assert_eq!(
-            kernels.iter().map(|c| c.name.clone()).collect::<Vec<_>>(),
-            vec!["deno", "python"]
-        );
-    }
-}
diff --git a/crates/repl/src/kernels/remote_kernels.rs b/crates/repl/src/kernels/remote_kernels.rs
deleted file mode 100644
index 6bc8b0d1b1..0000000000
--- a/crates/repl/src/kernels/remote_kernels.rs
+++ /dev/null
@@ -1,294 +0,0 @@
-use futures::{SinkExt as _, channel::mpsc};
-use gpui::{App, AppContext as _, Entity, Task, Window};
-use http_client::{AsyncBody, HttpClient, Request};
-use jupyter_protocol::{ExecutionState, JupyterKernelspec, JupyterMessage, KernelInfoReply};
-
-use async_tungstenite::tokio::connect_async;
-use async_tungstenite::tungstenite::{client::IntoClientRequest, http::HeaderValue};
-
-use futures::StreamExt;
-use smol::io::AsyncReadExt as _;
-
-use crate::Session;
-
-use super::RunningKernel;
-use anyhow::Result;
-use jupyter_websocket_client::{
-    JupyterWebSocket, JupyterWebSocketReader, JupyterWebSocketWriter, KernelLaunchRequest,
-    KernelSpecsResponse, RemoteServer,
-};
-use std::{fmt::Debug, sync::Arc};
-
-#[derive(Debug, Clone)]
-pub struct RemoteKernelSpecification {
-    pub name: String,
-    pub url: String,
-    pub token: String,
-    pub kernelspec: JupyterKernelspec,
-}
-
-pub async fn launch_remote_kernel(
-    remote_server: &RemoteServer,
-    http_client: Arc<dyn HttpClient>,
-    kernel_name: &str,
-    _path: &str,
-) -> Result<String> {
-    //
-    let kernel_launch_request = KernelLaunchRequest {
-        name: kernel_name.to_string(),
-        // Note: since the path we have locally may not be the same as the one on the remote server,
-        // we don't send it. We'll have to evaluate this decision along the way.
-        path: None,
-    };
-
-    let kernel_launch_request = serde_json::to_string(&kernel_launch_request)?;
-
-    let request = Request::builder()
-        .method("POST")
-        .uri(&remote_server.api_url("/kernels"))
-        .header("Authorization", format!("token {}", remote_server.token))
-        .body(AsyncBody::from(kernel_launch_request))?;
-
-    let response = http_client.send(request).await?;
-
-    if !response.status().is_success() {
-        let mut body = String::new();
-        response.into_body().read_to_string(&mut body).await?;
-        anyhow::bail!("Failed to launch kernel: {body}");
-    }
-
-    let mut body = String::new();
-    response.into_body().read_to_string(&mut body).await?;
-
-    let response: jupyter_websocket_client::Kernel = serde_json::from_str(&body)?;
-
-    Ok(response.id)
-}
-
-pub async fn list_remote_kernelspecs(
-    remote_server: RemoteServer,
-    http_client: Arc<dyn HttpClient>,
-) -> Result<Vec<RemoteKernelSpecification>> {
-    let url = remote_server.api_url("/kernelspecs");
-
-    let request = Request::builder()
-        .method("GET")
-        .uri(&url)
-        .header("Authorization", format!("token {}", remote_server.token))
-        .body(AsyncBody::default())?;
-
-    let response = http_client.send(request).await?;
-
-    anyhow::ensure!(
-        response.status().is_success(),
-        "Failed to fetch kernel specs: {}",
-        response.status()
-    );
-    let mut body = response.into_body();
-
-    let mut body_bytes = Vec::new();
-    body.read_to_end(&mut body_bytes).await?;
-
-    let kernel_specs: KernelSpecsResponse = serde_json::from_slice(&body_bytes)?;
-
-    let remote_kernelspecs = kernel_specs
-        .kernelspecs
-        .into_iter()
-        .map(|(name, spec)| RemoteKernelSpecification {
-            name,
-            url: remote_server.base_url.clone(),
-            token: remote_server.token.clone(),
-            kernelspec: spec.spec,
-        })
-        .collect::<Vec<RemoteKernelSpecification>>();
-
-    anyhow::ensure!(!remote_kernelspecs.is_empty(), "No kernel specs found");
-    Ok(remote_kernelspecs)
-}
-
-impl PartialEq for RemoteKernelSpecification {
-    fn eq(&self, other: &Self) -> bool {
-        self.name == other.name && self.url == other.url
-    }
-}
-
-impl Eq for RemoteKernelSpecification {}
-
-pub struct RemoteRunningKernel {
-    remote_server: RemoteServer,
-    _receiving_task: Task<Result<()>>,
-    _routing_task: Task<Result<()>>,
-    http_client: Arc<dyn HttpClient>,
-    pub working_directory: std::path::PathBuf,
-    pub request_tx: mpsc::Sender<JupyterMessage>,
-    pub execution_state: ExecutionState,
-    pub kernel_info: Option<KernelInfoReply>,
-    pub kernel_id: String,
-}
-
-impl RemoteRunningKernel {
-    pub fn new(
-        kernelspec: RemoteKernelSpecification,
-        working_directory: std::path::PathBuf,
-        session: Entity<Session>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<Box<dyn RunningKernel>>> {
-        let remote_server = RemoteServer {
-            base_url: kernelspec.url,
-            token: kernelspec.token,
-        };
-
-        let http_client = cx.http_client();
-
-        window.spawn(cx, async move |cx| {
-            let kernel_id = launch_remote_kernel(
-                &remote_server,
-                http_client.clone(),
-                &kernelspec.name,
-                working_directory.to_str().unwrap_or_default(),
-            )
-            .await?;
-
-            let ws_url = format!(
-                "{}/api/kernels/{}/channels?token={}",
-                remote_server.base_url.replace("http", "ws"),
-                kernel_id,
-                remote_server.token
-            );
-
-            let mut req: Request<()> = ws_url.into_client_request()?;
-            let headers = req.headers_mut();
-
-            headers.insert(
-                "User-Agent",
-                HeaderValue::from_str(&format!(
-                    "Zed/{} ({}; {})",
-                    "repl",
-                    std::env::consts::OS,
-                    std::env::consts::ARCH
-                ))?,
-            );
-
-            let response = connect_async(req).await;
-
-            let (ws_stream, _response) = response?;
-
-            let kernel_socket = JupyterWebSocket { inner: ws_stream };
-
-            let (mut w, mut r): (JupyterWebSocketWriter, JupyterWebSocketReader) =
-                kernel_socket.split();
-
-            let (request_tx, mut request_rx) =
-                futures::channel::mpsc::channel::<JupyterMessage>(100);
-
-            let routing_task = cx.background_spawn({
-                async move {
-                    while let Some(message) = request_rx.next().await {
-                        w.send(message).await.ok();
-                    }
-                    Ok(())
-                }
-            });
-
-            let receiving_task = cx.spawn({
-                let session = session.clone();
-
-                async move |cx| {
-                    while let Some(message) = r.next().await {
-                        match message {
-                            Ok(message) => {
-                                session
-                                    .update_in(cx, |session, window, cx| {
-                                        session.route(&message, window, cx);
-                                    })
-                                    .ok();
-                            }
-                            Err(e) => {
-                                log::error!("Error receiving message: {:?}", e);
-                            }
-                        }
-                    }
-                    Ok(())
-                }
-            });
-
-            anyhow::Ok(Box::new(Self {
-                _routing_task: routing_task,
-                _receiving_task: receiving_task,
-                remote_server,
-                working_directory,
-                request_tx,
-                // todo(kyle): pull this from the kernel API to start with
-                execution_state: ExecutionState::Idle,
-                kernel_info: None,
-                kernel_id,
-                http_client: http_client.clone(),
-            }) as Box<dyn RunningKernel>)
-        })
-    }
-}
-
-impl Debug for RemoteRunningKernel {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("RemoteRunningKernel")
-            // custom debug that keeps tokens out of logs
-            .field("remote_server url", &self.remote_server.base_url)
-            .field("working_directory", &self.working_directory)
-            .field("request_tx", &self.request_tx)
-            .field("execution_state", &self.execution_state)
-            .field("kernel_info", &self.kernel_info)
-            .finish()
-    }
-}
-
-impl RunningKernel for RemoteRunningKernel {
-    fn request_tx(&self) -> futures::channel::mpsc::Sender<runtimelib::JupyterMessage> {
-        self.request_tx.clone()
-    }
-
-    fn working_directory(&self) -> &std::path::PathBuf {
-        &self.working_directory
-    }
-
-    fn execution_state(&self) -> &runtimelib::ExecutionState {
-        &self.execution_state
-    }
-
-    fn set_execution_state(&mut self, state: runtimelib::ExecutionState) {
-        self.execution_state = state;
-    }
-
-    fn kernel_info(&self) -> Option<&runtimelib::KernelInfoReply> {
-        self.kernel_info.as_ref()
-    }
-
-    fn set_kernel_info(&mut self, info: runtimelib::KernelInfoReply) {
-        self.kernel_info = Some(info);
-    }
-
-    fn force_shutdown(&mut self, window: &mut Window, cx: &mut App) -> Task<anyhow::Result<()>> {
-        let url = self
-            .remote_server
-            .api_url(&format!("/kernels/{}", self.kernel_id));
-        let token = self.remote_server.token.clone();
-        let http_client = self.http_client.clone();
-
-        window.spawn(cx, async move |_| {
-            let request = Request::builder()
-                .method("DELETE")
-                .uri(&url)
-                .header("Authorization", format!("token {}", token))
-                .body(AsyncBody::default())?;
-
-            let response = http_client.send(request).await?;
-
-            anyhow::ensure!(
-                response.status().is_success(),
-                "Failed to shutdown kernel: {}",
-                response.status()
-            );
-            Ok(())
-        })
-    }
-}
diff --git a/crates/repl/src/notebook.rs b/crates/repl/src/notebook.rs
deleted file mode 100644
index 9c6738f799..0000000000
--- a/crates/repl/src/notebook.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-mod cell;
-mod notebook_ui;
-pub use cell::*;
-pub use notebook_ui::*;
diff --git a/crates/repl/src/notebook/cell.rs b/crates/repl/src/notebook/cell.rs
deleted file mode 100644
index 87b8e1d55a..0000000000
--- a/crates/repl/src/notebook/cell.rs
+++ /dev/null
@@ -1,746 +0,0 @@
-#![allow(unused, dead_code)]
-use std::sync::Arc;
-
-use editor::{Editor, EditorMode, MultiBuffer};
-use futures::future::Shared;
-use gpui::{
-    App, Entity, Hsla, RetainAllImageCache, Task, TextStyleRefinement, image_cache, prelude::*,
-};
-use language::{Buffer, Language, LanguageRegistry};
-use markdown_preview::{markdown_parser::parse_markdown, markdown_renderer::render_markdown_block};
-use nbformat::v4::{CellId, CellMetadata, CellType};
-use settings::Settings as _;
-use theme::ThemeSettings;
-use ui::{IconButtonShape, prelude::*};
-use util::ResultExt;
-
-use crate::{
-    notebook::{CODE_BLOCK_INSET, GUTTER_WIDTH},
-    outputs::{Output, plain::TerminalOutput, user_error::ErrorView},
-};
-
-#[derive(Copy, Clone, PartialEq, PartialOrd)]
-pub enum CellPosition {
-    First,
-    Middle,
-    Last,
-}
-
-pub enum CellControlType {
-    RunCell,
-    RerunCell,
-    ClearCell,
-    CellOptions,
-    CollapseCell,
-    ExpandCell,
-}
-
-impl CellControlType {
-    fn icon_name(&self) -> IconName {
-        match self {
-            CellControlType::RunCell => IconName::PlayFilled,
-            CellControlType::RerunCell => IconName::ArrowCircle,
-            CellControlType::ClearCell => IconName::ListX,
-            CellControlType::CellOptions => IconName::Ellipsis,
-            CellControlType::CollapseCell => IconName::ChevronDown,
-            CellControlType::ExpandCell => IconName::ChevronRight,
-        }
-    }
-}
-
-pub struct CellControl {
-    button: IconButton,
-}
-
-impl CellControl {
-    fn new(id: impl Into<SharedString>, control_type: CellControlType) -> Self {
-        let icon_name = control_type.icon_name();
-        let id = id.into();
-        let button = IconButton::new(id, icon_name)
-            .icon_size(IconSize::Small)
-            .shape(IconButtonShape::Square);
-        Self { button }
-    }
-}
-
-impl Clickable for CellControl {
-    fn on_click(
-        self,
-        handler: impl Fn(&gpui::ClickEvent, &mut Window, &mut App) + 'static,
-    ) -> Self {
-        let button = self.button.on_click(handler);
-        Self { button }
-    }
-
-    fn cursor_style(self, _cursor_style: gpui::CursorStyle) -> Self {
-        self
-    }
-}
-
-/// A notebook cell
-#[derive(Clone)]
-pub enum Cell {
-    Code(Entity<CodeCell>),
-    Markdown(Entity<MarkdownCell>),
-    Raw(Entity<RawCell>),
-}
-
-fn convert_outputs(
-    outputs: &Vec<nbformat::v4::Output>,
-    window: &mut Window,
-    cx: &mut App,
-) -> Vec<Output> {
-    outputs
-        .iter()
-        .map(|output| match output {
-            nbformat::v4::Output::Stream { text, .. } => Output::Stream {
-                content: cx.new(|cx| TerminalOutput::from(&text.0, window, cx)),
-            },
-            nbformat::v4::Output::DisplayData(display_data) => {
-                Output::new(&display_data.data, None, window, cx)
-            }
-            nbformat::v4::Output::ExecuteResult(execute_result) => {
-                Output::new(&execute_result.data, None, window, cx)
-            }
-            nbformat::v4::Output::Error(error) => Output::ErrorOutput(ErrorView {
-                ename: error.ename.clone(),
-                evalue: error.evalue.clone(),
-                traceback: cx
-                    .new(|cx| TerminalOutput::from(&error.traceback.join("\n"), window, cx)),
-            }),
-        })
-        .collect()
-}
-
-impl Cell {
-    pub fn load(
-        cell: &nbformat::v4::Cell,
-        languages: &Arc<LanguageRegistry>,
-        notebook_language: Shared<Task<Option<Arc<Language>>>>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Self {
-        match cell {
-            nbformat::v4::Cell::Markdown {
-                id,
-                metadata,
-                source,
-                ..
-            } => {
-                let source = source.join("");
-
-                let entity = cx.new(|cx| {
-                    let markdown_parsing_task = {
-                        let languages = languages.clone();
-                        let source = source.clone();
-
-                        cx.spawn_in(window, async move |this, cx| {
-                            let parsed_markdown = cx
-                                .background_spawn(async move {
-                                    parse_markdown(&source, None, Some(languages)).await
-                                })
-                                .await;
-
-                            this.update(cx, |cell: &mut MarkdownCell, _| {
-                                cell.parsed_markdown = Some(parsed_markdown);
-                            })
-                            .log_err();
-                        })
-                    };
-
-                    MarkdownCell {
-                        markdown_parsing_task,
-                        image_cache: RetainAllImageCache::new(cx),
-                        languages: languages.clone(),
-                        id: id.clone(),
-                        metadata: metadata.clone(),
-                        source: source.clone(),
-                        parsed_markdown: None,
-                        selected: false,
-                        cell_position: None,
-                    }
-                });
-
-                Cell::Markdown(entity)
-            }
-            nbformat::v4::Cell::Code {
-                id,
-                metadata,
-                execution_count,
-                source,
-                outputs,
-            } => Cell::Code(cx.new(|cx| {
-                let text = source.join("");
-
-                let buffer = cx.new(|cx| Buffer::local(text.clone(), cx));
-                let multi_buffer = cx.new(|cx| MultiBuffer::singleton(buffer.clone(), cx));
-
-                let editor_view = cx.new(|cx| {
-                    let mut editor = Editor::new(
-                        EditorMode::AutoHeight {
-                            min_lines: 1,
-                            max_lines: Some(1024),
-                        },
-                        multi_buffer,
-                        None,
-                        window,
-                        cx,
-                    );
-
-                    let theme = ThemeSettings::get_global(cx);
-
-                    let refinement = TextStyleRefinement {
-                        font_family: Some(theme.buffer_font.family.clone()),
-                        font_size: Some(theme.buffer_font_size(cx).into()),
-                        color: Some(cx.theme().colors().editor_foreground),
-                        background_color: Some(gpui::transparent_black()),
-                        ..Default::default()
-                    };
-
-                    editor.set_text(text, window, cx);
-                    editor.set_show_gutter(false, cx);
-                    editor.set_text_style_refinement(refinement);
-
-                    // editor.set_read_only(true);
-                    editor
-                });
-
-                let buffer = buffer.clone();
-                let language_task = cx.spawn_in(window, async move |this, cx| {
-                    let language = notebook_language.await;
-
-                    buffer.update(cx, |buffer, cx| {
-                        buffer.set_language(language.clone(), cx);
-                    });
-                });
-
-                CodeCell {
-                    id: id.clone(),
-                    metadata: metadata.clone(),
-                    execution_count: *execution_count,
-                    source: source.join(""),
-                    editor: editor_view,
-                    outputs: convert_outputs(outputs, window, cx),
-                    selected: false,
-                    language_task,
-                    cell_position: None,
-                }
-            })),
-            nbformat::v4::Cell::Raw {
-                id,
-                metadata,
-                source,
-            } => Cell::Raw(cx.new(|_| RawCell {
-                id: id.clone(),
-                metadata: metadata.clone(),
-                source: source.join(""),
-                selected: false,
-                cell_position: None,
-            })),
-        }
-    }
-}
-
-pub trait RenderableCell: Render {
-    const CELL_TYPE: CellType;
-
-    fn id(&self) -> &CellId;
-    fn cell_type(&self) -> CellType;
-    fn metadata(&self) -> &CellMetadata;
-    fn source(&self) -> &String;
-    fn selected(&self) -> bool;
-    fn set_selected(&mut self, selected: bool) -> &mut Self;
-    fn selected_bg_color(&self, window: &mut Window, cx: &mut Context<Self>) -> Hsla {
-        if self.selected() {
-            let mut color = cx.theme().colors().icon_accent;
-            color.fade_out(0.9);
-            color
-        } else {
-            // TODO: this is wrong
-            cx.theme().colors().tab_bar_background
-        }
-    }
-    fn control(&self, _window: &mut Window, _cx: &mut Context<Self>) -> Option<CellControl> {
-        None
-    }
-
-    fn cell_position_spacer(
-        &self,
-        is_first: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<impl IntoElement> {
-        let cell_position = self.cell_position();
-
-        if (cell_position == Some(&CellPosition::First) && is_first)
-            || (cell_position == Some(&CellPosition::Last) && !is_first)
-        {
-            Some(div().flex().w_full().h(DynamicSpacing::Base12.px(cx)))
-        } else {
-            None
-        }
-    }
-
-    fn gutter(&self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let is_selected = self.selected();
-
-        div()
-            .relative()
-            .h_full()
-            .w(px(GUTTER_WIDTH))
-            .child(
-                div()
-                    .w(px(GUTTER_WIDTH))
-                    .flex()
-                    .flex_none()
-                    .justify_center()
-                    .h_full()
-                    .child(
-                        div()
-                            .flex_none()
-                            .w(px(1.))
-                            .h_full()
-                            .when(is_selected, |this| this.bg(cx.theme().colors().icon_accent))
-                            .when(!is_selected, |this| this.bg(cx.theme().colors().border)),
-                    ),
-            )
-            .when_some(self.control(window, cx), |this, control| {
-                this.child(
-                    div()
-                        .absolute()
-                        .top(px(CODE_BLOCK_INSET - 2.0))
-                        .left_0()
-                        .flex()
-                        .flex_none()
-                        .w(px(GUTTER_WIDTH))
-                        .h(px(GUTTER_WIDTH + 12.0))
-                        .items_center()
-                        .justify_center()
-                        .bg(cx.theme().colors().tab_bar_background)
-                        .child(control.button),
-                )
-            })
-    }
-
-    fn cell_position(&self) -> Option<&CellPosition>;
-    fn set_cell_position(&mut self, position: CellPosition) -> &mut Self;
-}
-
-pub trait RunnableCell: RenderableCell {
-    fn execution_count(&self) -> Option<i32>;
-    fn set_execution_count(&mut self, count: i32) -> &mut Self;
-    fn run(&mut self, window: &mut Window, cx: &mut Context<Self>) -> ();
-}
-
-pub struct MarkdownCell {
-    id: CellId,
-    metadata: CellMetadata,
-    image_cache: Entity<RetainAllImageCache>,
-    source: String,
-    parsed_markdown: Option<markdown_preview::markdown_elements::ParsedMarkdown>,
-    markdown_parsing_task: Task<()>,
-    selected: bool,
-    cell_position: Option<CellPosition>,
-    languages: Arc<LanguageRegistry>,
-}
-
-impl RenderableCell for MarkdownCell {
-    const CELL_TYPE: CellType = CellType::Markdown;
-
-    fn id(&self) -> &CellId {
-        &self.id
-    }
-
-    fn cell_type(&self) -> CellType {
-        CellType::Markdown
-    }
-
-    fn metadata(&self) -> &CellMetadata {
-        &self.metadata
-    }
-
-    fn source(&self) -> &String {
-        &self.source
-    }
-
-    fn selected(&self) -> bool {
-        self.selected
-    }
-
-    fn set_selected(&mut self, selected: bool) -> &mut Self {
-        self.selected = selected;
-        self
-    }
-
-    fn control(&self, _window: &mut Window, _: &mut Context<Self>) -> Option<CellControl> {
-        None
-    }
-
-    fn cell_position(&self) -> Option<&CellPosition> {
-        self.cell_position.as_ref()
-    }
-
-    fn set_cell_position(&mut self, cell_position: CellPosition) -> &mut Self {
-        self.cell_position = Some(cell_position);
-        self
-    }
-}
-
-impl Render for MarkdownCell {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let Some(parsed) = self.parsed_markdown.as_ref() else {
-            return div();
-        };
-
-        let mut markdown_render_context =
-            markdown_preview::markdown_renderer::RenderContext::new(None, window, cx);
-
-        v_flex()
-            .size_full()
-            // TODO: Move base cell render into trait impl so we don't have to repeat this
-            .children(self.cell_position_spacer(true, window, cx))
-            .child(
-                h_flex()
-                    .w_full()
-                    .pr_6()
-                    .rounded_xs()
-                    .items_start()
-                    .gap(DynamicSpacing::Base08.rems(cx))
-                    .bg(self.selected_bg_color(window, cx))
-                    .child(self.gutter(window, cx))
-                    .child(
-                        v_flex()
-                            .image_cache(self.image_cache.clone())
-                            .size_full()
-                            .flex_1()
-                            .p_3()
-                            .font_ui(cx)
-                            .text_size(TextSize::Default.rems(cx))
-                            .children(parsed.children.iter().map(|child| {
-                                div().relative().child(div().relative().child(
-                                    render_markdown_block(child, &mut markdown_render_context),
-                                ))
-                            })),
-                    ),
-            )
-            // TODO: Move base cell render into trait impl so we don't have to repeat this
-            .children(self.cell_position_spacer(false, window, cx))
-    }
-}
-
-pub struct CodeCell {
-    id: CellId,
-    metadata: CellMetadata,
-    execution_count: Option<i32>,
-    source: String,
-    editor: Entity<editor::Editor>,
-    outputs: Vec<Output>,
-    selected: bool,
-    cell_position: Option<CellPosition>,
-    language_task: Task<()>,
-}
-
-impl CodeCell {
-    pub fn is_dirty(&self, cx: &App) -> bool {
-        self.editor.read(cx).buffer().read(cx).is_dirty(cx)
-    }
-    pub fn has_outputs(&self) -> bool {
-        !self.outputs.is_empty()
-    }
-
-    pub fn clear_outputs(&mut self) {
-        self.outputs.clear();
-    }
-
-    fn output_control(&self) -> Option<CellControlType> {
-        if self.has_outputs() {
-            Some(CellControlType::ClearCell)
-        } else {
-            None
-        }
-    }
-
-    pub fn gutter_output(&self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let is_selected = self.selected();
-
-        div()
-            .relative()
-            .h_full()
-            .w(px(GUTTER_WIDTH))
-            .child(
-                div()
-                    .w(px(GUTTER_WIDTH))
-                    .flex()
-                    .flex_none()
-                    .justify_center()
-                    .h_full()
-                    .child(
-                        div()
-                            .flex_none()
-                            .w(px(1.))
-                            .h_full()
-                            .when(is_selected, |this| this.bg(cx.theme().colors().icon_accent))
-                            .when(!is_selected, |this| this.bg(cx.theme().colors().border)),
-                    ),
-            )
-            .when(self.has_outputs(), |this| {
-                this.child(
-                    div()
-                        .absolute()
-                        .top(px(CODE_BLOCK_INSET - 2.0))
-                        .left_0()
-                        .flex()
-                        .flex_none()
-                        .w(px(GUTTER_WIDTH))
-                        .h(px(GUTTER_WIDTH + 12.0))
-                        .items_center()
-                        .justify_center()
-                        .bg(cx.theme().colors().tab_bar_background)
-                        .child(IconButton::new("control", IconName::Ellipsis)),
-                )
-            })
-    }
-}
-
-impl RenderableCell for CodeCell {
-    const CELL_TYPE: CellType = CellType::Code;
-
-    fn id(&self) -> &CellId {
-        &self.id
-    }
-
-    fn cell_type(&self) -> CellType {
-        CellType::Code
-    }
-
-    fn metadata(&self) -> &CellMetadata {
-        &self.metadata
-    }
-
-    fn source(&self) -> &String {
-        &self.source
-    }
-
-    fn control(&self, window: &mut Window, cx: &mut Context<Self>) -> Option<CellControl> {
-        let cell_control = if self.has_outputs() {
-            CellControl::new("rerun-cell", CellControlType::RerunCell)
-        } else {
-            CellControl::new("run-cell", CellControlType::RunCell)
-                .on_click(cx.listener(move |this, _, window, cx| this.run(window, cx)))
-        };
-
-        Some(cell_control)
-    }
-
-    fn selected(&self) -> bool {
-        self.selected
-    }
-
-    fn set_selected(&mut self, selected: bool) -> &mut Self {
-        self.selected = selected;
-        self
-    }
-
-    fn cell_position(&self) -> Option<&CellPosition> {
-        self.cell_position.as_ref()
-    }
-
-    fn set_cell_position(&mut self, cell_position: CellPosition) -> &mut Self {
-        self.cell_position = Some(cell_position);
-        self
-    }
-}
-
-impl RunnableCell for CodeCell {
-    fn run(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        println!("Running code cell: {}", self.id);
-    }
-
-    fn execution_count(&self) -> Option<i32> {
-        self.execution_count
-            .and_then(|count| if count > 0 { Some(count) } else { None })
-    }
-
-    fn set_execution_count(&mut self, count: i32) -> &mut Self {
-        self.execution_count = Some(count);
-        self
-    }
-}
-
-impl Render for CodeCell {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .size_full()
-            // TODO: Move base cell render into trait impl so we don't have to repeat this
-            .children(self.cell_position_spacer(true, window, cx))
-            // Editor portion
-            .child(
-                h_flex()
-                    .w_full()
-                    .pr_6()
-                    .rounded_xs()
-                    .items_start()
-                    .gap(DynamicSpacing::Base08.rems(cx))
-                    .bg(self.selected_bg_color(window, cx))
-                    .child(self.gutter(window, cx))
-                    .child(
-                        div().py_1p5().w_full().child(
-                            div()
-                                .flex()
-                                .size_full()
-                                .flex_1()
-                                .py_3()
-                                .px_5()
-                                .rounded_lg()
-                                .border_1()
-                                .border_color(cx.theme().colors().border)
-                                .bg(cx.theme().colors().editor_background)
-                                .child(div().w_full().child(self.editor.clone())),
-                        ),
-                    ),
-            )
-            // Output portion
-            .child(
-                h_flex()
-                    .w_full()
-                    .pr_6()
-                    .rounded_xs()
-                    .items_start()
-                    .gap(DynamicSpacing::Base08.rems(cx))
-                    .bg(self.selected_bg_color(window, cx))
-                    .child(self.gutter_output(window, cx))
-                    .child(
-                        div().py_1p5().w_full().child(
-                            div()
-                                .flex()
-                                .size_full()
-                                .flex_1()
-                                .py_3()
-                                .px_5()
-                                .rounded_lg()
-                                .border_1()
-                                // .border_color(cx.theme().colors().border)
-                                // .bg(cx.theme().colors().editor_background)
-                                .child(div().w_full().children(self.outputs.iter().map(
-                                    |output| {
-                                        let content = match output {
-                                            Output::Plain { content, .. } => {
-                                                Some(content.clone().into_any_element())
-                                            }
-                                            Output::Markdown { content, .. } => {
-                                                Some(content.clone().into_any_element())
-                                            }
-                                            Output::Stream { content, .. } => {
-                                                Some(content.clone().into_any_element())
-                                            }
-                                            Output::Image { content, .. } => {
-                                                Some(content.clone().into_any_element())
-                                            }
-                                            Output::Message(message) => Some(
-                                                div().child(message.clone()).into_any_element(),
-                                            ),
-                                            Output::Table { content, .. } => {
-                                                Some(content.clone().into_any_element())
-                                            }
-                                            Output::ErrorOutput(error_view) => {
-                                                error_view.render(window, cx)
-                                            }
-                                            Output::ClearOutputWaitMarker => None,
-                                        };
-
-                                        div()
-                                            // .w_full()
-                                            // .mt_3()
-                                            // .p_3()
-                                            // .rounded_sm()
-                                            // .bg(cx.theme().colors().editor_background)
-                                            // .border(px(1.))
-                                            // .border_color(cx.theme().colors().border)
-                                            // .shadow_xs()
-                                            .children(content)
-                                    },
-                                ))),
-                        ),
-                    ),
-            )
-            // TODO: Move base cell render into trait impl so we don't have to repeat this
-            .children(self.cell_position_spacer(false, window, cx))
-    }
-}
-
-pub struct RawCell {
-    id: CellId,
-    metadata: CellMetadata,
-    source: String,
-    selected: bool,
-    cell_position: Option<CellPosition>,
-}
-
-impl RenderableCell for RawCell {
-    const CELL_TYPE: CellType = CellType::Raw;
-
-    fn id(&self) -> &CellId {
-        &self.id
-    }
-
-    fn cell_type(&self) -> CellType {
-        CellType::Raw
-    }
-
-    fn metadata(&self) -> &CellMetadata {
-        &self.metadata
-    }
-
-    fn source(&self) -> &String {
-        &self.source
-    }
-
-    fn selected(&self) -> bool {
-        self.selected
-    }
-
-    fn set_selected(&mut self, selected: bool) -> &mut Self {
-        self.selected = selected;
-        self
-    }
-
-    fn cell_position(&self) -> Option<&CellPosition> {
-        self.cell_position.as_ref()
-    }
-
-    fn set_cell_position(&mut self, cell_position: CellPosition) -> &mut Self {
-        self.cell_position = Some(cell_position);
-        self
-    }
-}
-
-impl Render for RawCell {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .size_full()
-            // TODO: Move base cell render into trait impl so we don't have to repeat this
-            .children(self.cell_position_spacer(true, window, cx))
-            .child(
-                h_flex()
-                    .w_full()
-                    .pr_2()
-                    .rounded_xs()
-                    .items_start()
-                    .gap(DynamicSpacing::Base08.rems(cx))
-                    .bg(self.selected_bg_color(window, cx))
-                    .child(self.gutter(window, cx))
-                    .child(
-                        div()
-                            .flex()
-                            .size_full()
-                            .flex_1()
-                            .p_3()
-                            .font_ui(cx)
-                            .text_size(TextSize::Default.rems(cx))
-                            .child(self.source.clone()),
-                    ),
-            )
-            // TODO: Move base cell render into trait impl so we don't have to repeat this
-            .children(self.cell_position_spacer(false, window, cx))
-    }
-}
diff --git a/crates/repl/src/notebook/notebook_ui.rs b/crates/repl/src/notebook/notebook_ui.rs
deleted file mode 100644
index 07c6e9c8aa..0000000000
--- a/crates/repl/src/notebook/notebook_ui.rs
+++ /dev/null
@@ -1,836 +0,0 @@
-#![allow(unused, dead_code)]
-use std::future::Future;
-use std::{path::PathBuf, sync::Arc};
-
-use anyhow::{Context as _, Result};
-use client::proto::ViewId;
-use collections::HashMap;
-use feature_flags::{FeatureFlagAppExt as _, NotebookFeatureFlag};
-use futures::FutureExt;
-use futures::future::Shared;
-use gpui::{
-    AnyElement, App, Entity, EventEmitter, FocusHandle, Focusable, ListScrollEvent, ListState,
-    Point, Task, actions, list, prelude::*,
-};
-use language::{Language, LanguageRegistry};
-use project::{Project, ProjectEntryId, ProjectPath};
-use ui::{Tooltip, prelude::*};
-use workspace::item::{ItemEvent, SaveOptions, TabContentParams};
-use workspace::searchable::SearchableItemHandle;
-use workspace::{Item, ItemHandle, Pane, ProjectItem, ToolbarItemLocation};
-use workspace::{ToolbarItemEvent, ToolbarItemView};
-
-use super::{Cell, CellPosition, RenderableCell};
-
-use nbformat::v4::CellId;
-use nbformat::v4::Metadata as NotebookMetadata;
-
-actions!(
-    notebook,
-    [
-        /// Opens a Jupyter notebook file.
-        OpenNotebook,
-        /// Runs all cells in the notebook.
-        RunAll,
-        /// Clears all cell outputs.
-        ClearOutputs,
-        /// Moves the current cell up.
-        MoveCellUp,
-        /// Moves the current cell down.
-        MoveCellDown,
-        /// Adds a new markdown cell.
-        AddMarkdownBlock,
-        /// Adds a new code cell.
-        AddCodeBlock,
-    ]
-);
-
-pub(crate) const MAX_TEXT_BLOCK_WIDTH: f32 = 9999.0;
-pub(crate) const SMALL_SPACING_SIZE: f32 = 8.0;
-pub(crate) const MEDIUM_SPACING_SIZE: f32 = 12.0;
-pub(crate) const LARGE_SPACING_SIZE: f32 = 16.0;
-pub(crate) const GUTTER_WIDTH: f32 = 19.0;
-pub(crate) const CODE_BLOCK_INSET: f32 = MEDIUM_SPACING_SIZE;
-pub(crate) const CONTROL_SIZE: f32 = 20.0;
-
-pub fn init(cx: &mut App) {
-    if cx.has_flag::<NotebookFeatureFlag>() || std::env::var("LOCAL_NOTEBOOK_DEV").is_ok() {
-        workspace::register_project_item::<NotebookEditor>(cx);
-    }
-
-    cx.observe_flag::<NotebookFeatureFlag, _>({
-        move |is_enabled, cx| {
-            if is_enabled {
-                workspace::register_project_item::<NotebookEditor>(cx);
-            } else {
-                // todo: there is no way to unregister a project item, so if the feature flag
-                // gets turned off they need to restart Zed.
-            }
-        }
-    })
-    .detach();
-}
-
-pub struct NotebookEditor {
-    languages: Arc<LanguageRegistry>,
-    project: Entity<Project>,
-
-    focus_handle: FocusHandle,
-    notebook_item: Entity<NotebookItem>,
-
-    remote_id: Option<ViewId>,
-    cell_list: ListState,
-
-    selected_cell_index: usize,
-    cell_order: Vec<CellId>,
-    cell_map: HashMap<CellId, Cell>,
-}
-
-impl NotebookEditor {
-    pub fn new(
-        project: Entity<Project>,
-        notebook_item: Entity<NotebookItem>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let focus_handle = cx.focus_handle();
-
-        let languages = project.read(cx).languages().clone();
-        let language_name = notebook_item.read(cx).language_name();
-
-        let notebook_language = notebook_item.read(cx).notebook_language();
-        let notebook_language = cx
-            .spawn_in(window, async move |_, _| notebook_language.await)
-            .shared();
-
-        let mut cell_order = vec![]; // Vec<CellId>
-        let mut cell_map = HashMap::default(); // HashMap<CellId, Cell>
-
-        for (index, cell) in notebook_item
-            .read(cx)
-            .notebook
-            .clone()
-            .cells
-            .iter()
-            .enumerate()
-        {
-            let cell_id = cell.id();
-            cell_order.push(cell_id.clone());
-            cell_map.insert(
-                cell_id.clone(),
-                Cell::load(cell, &languages, notebook_language.clone(), window, cx),
-            );
-        }
-
-        let notebook_handle = cx.entity().downgrade();
-        let cell_count = cell_order.len();
-
-        let this = cx.entity();
-        let cell_list = ListState::new(cell_count, gpui::ListAlignment::Top, px(1000.));
-
-        Self {
-            project,
-            languages: languages.clone(),
-            focus_handle,
-            notebook_item,
-            remote_id: None,
-            cell_list,
-            selected_cell_index: 0,
-            cell_order: cell_order.clone(),
-            cell_map: cell_map.clone(),
-        }
-    }
-
-    fn has_outputs(&self, window: &mut Window, cx: &mut Context<Self>) -> bool {
-        self.cell_map.values().any(|cell| {
-            if let Cell::Code(code_cell) = cell {
-                code_cell.read(cx).has_outputs()
-            } else {
-                false
-            }
-        })
-    }
-
-    fn clear_outputs(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        for cell in self.cell_map.values() {
-            if let Cell::Code(code_cell) = cell {
-                code_cell.update(cx, |cell, _cx| {
-                    cell.clear_outputs();
-                });
-            }
-        }
-    }
-
-    fn run_cells(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        println!("Cells would all run here, if that was implemented!");
-    }
-
-    fn open_notebook(&mut self, _: &OpenNotebook, _window: &mut Window, _cx: &mut Context<Self>) {
-        println!("Open notebook triggered");
-    }
-
-    fn move_cell_up(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        println!("Move cell up triggered");
-    }
-
-    fn move_cell_down(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        println!("Move cell down triggered");
-    }
-
-    fn add_markdown_block(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        println!("Add markdown block triggered");
-    }
-
-    fn add_code_block(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        println!("Add code block triggered");
-    }
-
-    fn cell_count(&self) -> usize {
-        self.cell_map.len()
-    }
-
-    fn selected_index(&self) -> usize {
-        self.selected_cell_index
-    }
-
-    pub fn set_selected_index(
-        &mut self,
-        index: usize,
-        jump_to_index: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        // let previous_index = self.selected_cell_index;
-        self.selected_cell_index = index;
-        let current_index = self.selected_cell_index;
-
-        // in the future we may have some `on_cell_change` event that we want to fire here
-
-        if jump_to_index {
-            self.jump_to_cell(current_index, window, cx);
-        }
-    }
-
-    pub fn select_next(
-        &mut self,
-        _: &menu::SelectNext,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let count = self.cell_count();
-        if count > 0 {
-            let index = self.selected_index();
-            let ix = if index == count - 1 {
-                count - 1
-            } else {
-                index + 1
-            };
-            self.set_selected_index(ix, true, window, cx);
-            cx.notify();
-        }
-    }
-
-    pub fn select_previous(
-        &mut self,
-        _: &menu::SelectPrevious,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let count = self.cell_count();
-        if count > 0 {
-            let index = self.selected_index();
-            let ix = if index == 0 { 0 } else { index - 1 };
-            self.set_selected_index(ix, true, window, cx);
-            cx.notify();
-        }
-    }
-
-    pub fn select_first(
-        &mut self,
-        _: &menu::SelectFirst,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let count = self.cell_count();
-        if count > 0 {
-            self.set_selected_index(0, true, window, cx);
-            cx.notify();
-        }
-    }
-
-    pub fn select_last(
-        &mut self,
-        _: &menu::SelectLast,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let count = self.cell_count();
-        if count > 0 {
-            self.set_selected_index(count - 1, true, window, cx);
-            cx.notify();
-        }
-    }
-
-    fn jump_to_cell(&mut self, index: usize, _window: &mut Window, _cx: &mut Context<Self>) {
-        self.cell_list.scroll_to_reveal_item(index);
-    }
-
-    fn button_group(window: &mut Window, cx: &mut Context<Self>) -> Div {
-        v_flex()
-            .gap(DynamicSpacing::Base04.rems(cx))
-            .items_center()
-            .w(px(CONTROL_SIZE + 4.0))
-            .overflow_hidden()
-            .rounded(px(5.))
-            .bg(cx.theme().colors().title_bar_background)
-            .p_px()
-            .border_1()
-            .border_color(cx.theme().colors().border)
-    }
-
-    fn render_notebook_control(
-        id: impl Into<SharedString>,
-        icon: IconName,
-        _window: &mut Window,
-        _cx: &mut Context<Self>,
-    ) -> IconButton {
-        let id: ElementId = ElementId::Name(id.into());
-        IconButton::new(id, icon).width(px(CONTROL_SIZE))
-    }
-
-    fn render_notebook_controls(
-        &self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let has_outputs = self.has_outputs(window, cx);
-
-        v_flex()
-            .max_w(px(CONTROL_SIZE + 4.0))
-            .items_center()
-            .gap(DynamicSpacing::Base16.rems(cx))
-            .justify_between()
-            .flex_none()
-            .h_full()
-            .py(DynamicSpacing::Base12.px(cx))
-            .child(
-                v_flex()
-                    .gap(DynamicSpacing::Base08.rems(cx))
-                    .child(
-                        Self::button_group(window, cx)
-                            .child(
-                                Self::render_notebook_control(
-                                    "run-all-cells",
-                                    IconName::PlayFilled,
-                                    window,
-                                    cx,
-                                )
-                                .tooltip(move |window, cx| {
-                                    Tooltip::for_action("Execute all cells", &RunAll, cx)
-                                })
-                                .on_click(|_, window, cx| {
-                                    window.dispatch_action(Box::new(RunAll), cx);
-                                }),
-                            )
-                            .child(
-                                Self::render_notebook_control(
-                                    "clear-all-outputs",
-                                    IconName::ListX,
-                                    window,
-                                    cx,
-                                )
-                                .disabled(!has_outputs)
-                                .tooltip(move |window, cx| {
-                                    Tooltip::for_action("Clear all outputs", &ClearOutputs, cx)
-                                })
-                                .on_click(|_, window, cx| {
-                                    window.dispatch_action(Box::new(ClearOutputs), cx);
-                                }),
-                            ),
-                    )
-                    .child(
-                        Self::button_group(window, cx)
-                            .child(
-                                Self::render_notebook_control(
-                                    "move-cell-up",
-                                    IconName::ArrowUp,
-                                    window,
-                                    cx,
-                                )
-                                .tooltip(move |window, cx| {
-                                    Tooltip::for_action("Move cell up", &MoveCellUp, cx)
-                                })
-                                .on_click(|_, window, cx| {
-                                    window.dispatch_action(Box::new(MoveCellUp), cx);
-                                }),
-                            )
-                            .child(
-                                Self::render_notebook_control(
-                                    "move-cell-down",
-                                    IconName::ArrowDown,
-                                    window,
-                                    cx,
-                                )
-                                .tooltip(move |window, cx| {
-                                    Tooltip::for_action("Move cell down", &MoveCellDown, cx)
-                                })
-                                .on_click(|_, window, cx| {
-                                    window.dispatch_action(Box::new(MoveCellDown), cx);
-                                }),
-                            ),
-                    )
-                    .child(
-                        Self::button_group(window, cx)
-                            .child(
-                                Self::render_notebook_control(
-                                    "new-markdown-cell",
-                                    IconName::Plus,
-                                    window,
-                                    cx,
-                                )
-                                .tooltip(move |window, cx| {
-                                    Tooltip::for_action("Add markdown block", &AddMarkdownBlock, cx)
-                                })
-                                .on_click(|_, window, cx| {
-                                    window.dispatch_action(Box::new(AddMarkdownBlock), cx);
-                                }),
-                            )
-                            .child(
-                                Self::render_notebook_control(
-                                    "new-code-cell",
-                                    IconName::Code,
-                                    window,
-                                    cx,
-                                )
-                                .tooltip(move |window, cx| {
-                                    Tooltip::for_action("Add code block", &AddCodeBlock, cx)
-                                })
-                                .on_click(|_, window, cx| {
-                                    window.dispatch_action(Box::new(AddCodeBlock), cx);
-                                }),
-                            ),
-                    ),
-            )
-            .child(
-                v_flex()
-                    .gap(DynamicSpacing::Base08.rems(cx))
-                    .items_center()
-                    .child(Self::render_notebook_control(
-                        "more-menu",
-                        IconName::Ellipsis,
-                        window,
-                        cx,
-                    ))
-                    .child(
-                        Self::button_group(window, cx)
-                            .child(IconButton::new("repl", IconName::ReplNeutral)),
-                    ),
-            )
-    }
-
-    fn cell_position(&self, index: usize) -> CellPosition {
-        match index {
-            0 => CellPosition::First,
-            index if index == self.cell_count() - 1 => CellPosition::Last,
-            _ => CellPosition::Middle,
-        }
-    }
-
-    fn render_cell(
-        &self,
-        index: usize,
-        cell: &Cell,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let cell_position = self.cell_position(index);
-
-        let is_selected = index == self.selected_cell_index;
-
-        match cell {
-            Cell::Code(cell) => {
-                cell.update(cx, |cell, _cx| {
-                    cell.set_selected(is_selected)
-                        .set_cell_position(cell_position);
-                });
-                cell.clone().into_any_element()
-            }
-            Cell::Markdown(cell) => {
-                cell.update(cx, |cell, _cx| {
-                    cell.set_selected(is_selected)
-                        .set_cell_position(cell_position);
-                });
-                cell.clone().into_any_element()
-            }
-            Cell::Raw(cell) => {
-                cell.update(cx, |cell, _cx| {
-                    cell.set_selected(is_selected)
-                        .set_cell_position(cell_position);
-                });
-                cell.clone().into_any_element()
-            }
-        }
-    }
-}
-
-impl Render for NotebookEditor {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        div()
-            .key_context("notebook")
-            .track_focus(&self.focus_handle)
-            .on_action(cx.listener(|this, &OpenNotebook, window, cx| {
-                this.open_notebook(&OpenNotebook, window, cx)
-            }))
-            .on_action(
-                cx.listener(|this, &ClearOutputs, window, cx| this.clear_outputs(window, cx)),
-            )
-            .on_action(cx.listener(|this, &RunAll, window, cx| this.run_cells(window, cx)))
-            .on_action(cx.listener(|this, &MoveCellUp, window, cx| this.move_cell_up(window, cx)))
-            .on_action(
-                cx.listener(|this, &MoveCellDown, window, cx| this.move_cell_down(window, cx)),
-            )
-            .on_action(cx.listener(|this, &AddMarkdownBlock, window, cx| {
-                this.add_markdown_block(window, cx)
-            }))
-            .on_action(
-                cx.listener(|this, &AddCodeBlock, window, cx| this.add_code_block(window, cx)),
-            )
-            .on_action(cx.listener(Self::select_next))
-            .on_action(cx.listener(Self::select_previous))
-            .on_action(cx.listener(Self::select_first))
-            .on_action(cx.listener(Self::select_last))
-            .flex()
-            .items_start()
-            .size_full()
-            .overflow_hidden()
-            .px(DynamicSpacing::Base12.px(cx))
-            .gap(DynamicSpacing::Base12.px(cx))
-            .bg(cx.theme().colors().tab_bar_background)
-            .child(
-                v_flex()
-                    .id("notebook-cells")
-                    .flex_1()
-                    .size_full()
-                    .overflow_y_scroll()
-                    .child(list(
-                        self.cell_list.clone(),
-                        cx.processor(|this, ix, window, cx| {
-                            this.cell_order
-                                .get(ix)
-                                .and_then(|cell_id| this.cell_map.get(cell_id))
-                                .map(|cell| {
-                                    this.render_cell(ix, cell, window, cx).into_any_element()
-                                })
-                                .unwrap_or_else(|| div().into_any())
-                        }),
-                    ))
-                    .size_full(),
-            )
-            .child(self.render_notebook_controls(window, cx))
-    }
-}
-
-impl Focusable for NotebookEditor {
-    fn focus_handle(&self, _: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-// Intended to be a NotebookBuffer
-pub struct NotebookItem {
-    path: PathBuf,
-    project_path: ProjectPath,
-    languages: Arc<LanguageRegistry>,
-    // Raw notebook data
-    notebook: nbformat::v4::Notebook,
-    // Store our version of the notebook in memory (cell_order, cell_map)
-    id: ProjectEntryId,
-}
-
-impl project::ProjectItem for NotebookItem {
-    fn try_open(
-        project: &Entity<Project>,
-        path: &ProjectPath,
-        cx: &mut App,
-    ) -> Option<Task<anyhow::Result<Entity<Self>>>> {
-        let path = path.clone();
-        let project = project.clone();
-        let fs = project.read(cx).fs().clone();
-        let languages = project.read(cx).languages().clone();
-
-        if path.path.extension().unwrap_or_default() == "ipynb" {
-            Some(cx.spawn(async move |cx| {
-                let abs_path = project
-                    .read_with(cx, |project, cx| project.absolute_path(&path, cx))?
-                    .with_context(|| format!("finding the absolute path of {path:?}"))?;
-
-                // todo: watch for changes to the file
-                let file_content = fs.load(abs_path.as_path()).await?;
-                let notebook = nbformat::parse_notebook(&file_content);
-
-                let notebook = match notebook {
-                    Ok(nbformat::Notebook::V4(notebook)) => notebook,
-                    // 4.1 - 4.4 are converted to 4.5
-                    Ok(nbformat::Notebook::Legacy(legacy_notebook)) => {
-                        // TODO: Decide if we want to mutate the notebook by including Cell IDs
-                        // and any other conversions
-
-                        nbformat::upgrade_legacy_notebook(legacy_notebook)?
-                    }
-                    // Bad notebooks and notebooks v4.0 and below are not supported
-                    Err(e) => {
-                        anyhow::bail!("Failed to parse notebook: {:?}", e);
-                    }
-                };
-
-                let id = project
-                    .update(cx, |project, cx| {
-                        project.entry_for_path(&path, cx).map(|entry| entry.id)
-                    })?
-                    .context("Entry not found")?;
-
-                cx.new(|_| NotebookItem {
-                    path: abs_path,
-                    project_path: path,
-                    languages,
-                    notebook,
-                    id,
-                })
-            }))
-        } else {
-            None
-        }
-    }
-
-    fn entry_id(&self, _: &App) -> Option<ProjectEntryId> {
-        Some(self.id)
-    }
-
-    fn project_path(&self, _: &App) -> Option<ProjectPath> {
-        Some(self.project_path.clone())
-    }
-
-    fn is_dirty(&self) -> bool {
-        false
-    }
-}
-
-impl NotebookItem {
-    pub fn language_name(&self) -> Option<String> {
-        self.notebook
-            .metadata
-            .language_info
-            .as_ref()
-            .map(|l| l.name.clone())
-            .or(self
-                .notebook
-                .metadata
-                .kernelspec
-                .as_ref()
-                .and_then(|spec| spec.language.clone()))
-    }
-
-    pub fn notebook_language(&self) -> impl Future<Output = Option<Arc<Language>>> + use<> {
-        let language_name = self.language_name();
-        let languages = self.languages.clone();
-
-        async move {
-            if let Some(language_name) = language_name {
-                languages.language_for_name(&language_name).await.ok()
-            } else {
-                None
-            }
-        }
-    }
-}
-
-impl EventEmitter<()> for NotebookEditor {}
-
-// pub struct NotebookControls {
-//     pane_focused: bool,
-//     active_item: Option<Box<dyn ItemHandle>>,
-//     // subscription: Option<Subscription>,
-// }
-
-// impl NotebookControls {
-//     pub fn new() -> Self {
-//         Self {
-//             pane_focused: false,
-//             active_item: Default::default(),
-//             // subscription: Default::default(),
-//         }
-//     }
-// }
-
-// impl EventEmitter<ToolbarItemEvent> for NotebookControls {}
-
-// impl Render for NotebookControls {
-//     fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-//         div().child("notebook controls")
-//     }
-// }
-
-// impl ToolbarItemView for NotebookControls {
-//     fn set_active_pane_item(
-//         &mut self,
-//         active_pane_item: Option<&dyn workspace::ItemHandle>,
-//         window: &mut Window, cx: &mut Context<Self>,
-//     ) -> workspace::ToolbarItemLocation {
-//         cx.notify();
-//         self.active_item = None;
-
-//         let Some(item) = active_pane_item else {
-//             return ToolbarItemLocation::Hidden;
-//         };
-
-//         ToolbarItemLocation::PrimaryLeft
-//     }
-
-//     fn pane_focus_update(&mut self, pane_focused: bool, _window: &mut Window, _cx: &mut Context<Self>) {
-//         self.pane_focused = pane_focused;
-//     }
-// }
-
-impl Item for NotebookEditor {
-    type Event = ();
-
-    fn can_split(&self) -> bool {
-        true
-    }
-
-    fn clone_on_split(
-        &self,
-        _workspace_id: Option<workspace::WorkspaceId>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Option<Entity<Self>>>
-    where
-        Self: Sized,
-    {
-        Task::ready(Some(cx.new(|cx| {
-            Self::new(self.project.clone(), self.notebook_item.clone(), window, cx)
-        })))
-    }
-
-    fn buffer_kind(&self, _: &App) -> workspace::item::ItemBufferKind {
-        workspace::item::ItemBufferKind::Singleton
-    }
-
-    fn for_each_project_item(
-        &self,
-        cx: &App,
-        f: &mut dyn FnMut(gpui::EntityId, &dyn project::ProjectItem),
-    ) {
-        f(self.notebook_item.entity_id(), self.notebook_item.read(cx))
-    }
-
-    fn tab_content(&self, params: TabContentParams, window: &Window, cx: &App) -> AnyElement {
-        Label::new(self.tab_content_text(params.detail.unwrap_or(0), cx))
-            .single_line()
-            .color(params.text_color())
-            .when(params.preview, |this| this.italic())
-            .into_any_element()
-    }
-
-    fn tab_content_text(&self, _detail: usize, cx: &App) -> SharedString {
-        let path = &self.notebook_item.read(cx).path;
-        let title = path
-            .file_name()
-            .unwrap_or_else(|| path.as_os_str())
-            .to_string_lossy()
-            .to_string();
-        title.into()
-    }
-
-    fn tab_icon(&self, _window: &Window, _cx: &App) -> Option<Icon> {
-        Some(IconName::Book.into())
-    }
-
-    fn show_toolbar(&self) -> bool {
-        false
-    }
-
-    // TODO
-    fn pixel_position_of_cursor(&self, _: &App) -> Option<Point<Pixels>> {
-        None
-    }
-
-    // TODO
-    fn as_searchable(&self, _: &Entity<Self>, _: &App) -> Option<Box<dyn SearchableItemHandle>> {
-        None
-    }
-
-    fn set_nav_history(
-        &mut self,
-        _: workspace::ItemNavHistory,
-        _window: &mut Window,
-        _: &mut Context<Self>,
-    ) {
-        // TODO
-    }
-
-    // TODO
-    fn can_save(&self, _cx: &App) -> bool {
-        false
-    }
-    // TODO
-    fn save(
-        &mut self,
-        _options: SaveOptions,
-        _project: Entity<Project>,
-        _window: &mut Window,
-        _cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        unimplemented!("save() must be implemented if can_save() returns true")
-    }
-
-    // TODO
-    fn save_as(
-        &mut self,
-        _project: Entity<Project>,
-        _path: ProjectPath,
-        _window: &mut Window,
-        _cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        unimplemented!("save_as() must be implemented if can_save() returns true")
-    }
-    // TODO
-    fn reload(
-        &mut self,
-        _project: Entity<Project>,
-        _window: &mut Window,
-        _cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        unimplemented!("reload() must be implemented if can_save() returns true")
-    }
-
-    fn is_dirty(&self, cx: &App) -> bool {
-        self.cell_map.values().any(|cell| {
-            if let Cell::Code(code_cell) = cell {
-                code_cell.read(cx).is_dirty(cx)
-            } else {
-                false
-            }
-        })
-    }
-}
-
-// TODO: Implement this to allow us to persist to the database, etc:
-// impl SerializableItem for NotebookEditor {}
-
-impl ProjectItem for NotebookEditor {
-    type Item = NotebookItem;
-
-    fn for_project_item(
-        project: Entity<Project>,
-        _: Option<&Pane>,
-        item: Entity<Self::Item>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self
-    where
-        Self: Sized,
-    {
-        Self::new(project, item, window, cx)
-    }
-}
diff --git a/crates/repl/src/outputs.rs b/crates/repl/src/outputs.rs
deleted file mode 100644
index b99562393a..0000000000
--- a/crates/repl/src/outputs.rs
+++ /dev/null
@@ -1,617 +0,0 @@
-//! # REPL Output Module
-//!
-//! This module provides the core functionality for handling and displaying
-//! various types of output from Jupyter kernels.
-//!
-//! ## Key Components
-//!
-//! - `OutputContent`: An enum that encapsulates different types of output content.
-//! - `ExecutionView`: Manages the display of outputs for a single execution.
-//! - `ExecutionStatus`: Represents the current status of an execution.
-//!
-//! ## Output Types
-//!
-//! The module supports several output types, including:
-//! - Plain text
-//! - Markdown
-//! - Images (PNG and JPEG)
-//! - Tables
-//! - Error messages
-//!
-//! ## Clipboard Support
-//!
-//! Most output types implement the `SupportsClipboard` trait, allowing
-//! users to easily copy output content to the system clipboard.
-//!
-//! ## Rendering
-//!
-//! The module provides rendering capabilities for each output type,
-//! ensuring proper display within the REPL interface.
-//!
-//! ## Jupyter Integration
-//!
-//! This module is designed to work with Jupyter message protocols,
-//! interpreting and displaying various types of Jupyter output.
-
-use editor::{Editor, MultiBuffer};
-use gpui::{AnyElement, ClipboardItem, Entity, Render, WeakEntity};
-use language::Buffer;
-use runtimelib::{ExecutionState, JupyterMessageContent, MimeBundle, MimeType};
-use ui::{
-    ButtonStyle, CommonAnimationExt, Context, IconButton, IconName, IntoElement, Styled, Tooltip,
-    Window, div, h_flex, prelude::*, v_flex,
-};
-
-mod image;
-use image::ImageView;
-
-mod markdown;
-use markdown::MarkdownView;
-
-mod table;
-use table::TableView;
-
-pub mod plain;
-use plain::TerminalOutput;
-
-pub(crate) mod user_error;
-use user_error::ErrorView;
-use workspace::Workspace;
-
-/// When deciding what to render from a collection of mediatypes, we need to rank them in order of importance
-fn rank_mime_type(mimetype: &MimeType) -> usize {
-    match mimetype {
-        MimeType::DataTable(_) => 6,
-        MimeType::Png(_) => 4,
-        MimeType::Jpeg(_) => 3,
-        MimeType::Markdown(_) => 2,
-        MimeType::Plain(_) => 1,
-        // All other media types are not supported in Zed at this time
-        _ => 0,
-    }
-}
-
-pub(crate) trait OutputContent {
-    fn clipboard_content(&self, window: &Window, cx: &App) -> Option<ClipboardItem>;
-    fn has_clipboard_content(&self, _window: &Window, _cx: &App) -> bool {
-        false
-    }
-    fn has_buffer_content(&self, _window: &Window, _cx: &App) -> bool {
-        false
-    }
-    fn buffer_content(&mut self, _window: &mut Window, _cx: &mut App) -> Option<Entity<Buffer>> {
-        None
-    }
-}
-
-impl<V: OutputContent + 'static> OutputContent for Entity<V> {
-    fn clipboard_content(&self, window: &Window, cx: &App) -> Option<ClipboardItem> {
-        self.read(cx).clipboard_content(window, cx)
-    }
-
-    fn has_clipboard_content(&self, window: &Window, cx: &App) -> bool {
-        self.read(cx).has_clipboard_content(window, cx)
-    }
-
-    fn has_buffer_content(&self, window: &Window, cx: &App) -> bool {
-        self.read(cx).has_buffer_content(window, cx)
-    }
-
-    fn buffer_content(&mut self, window: &mut Window, cx: &mut App) -> Option<Entity<Buffer>> {
-        self.update(cx, |item, cx| item.buffer_content(window, cx))
-    }
-}
-
-pub enum Output {
-    Plain {
-        content: Entity<TerminalOutput>,
-        display_id: Option<String>,
-    },
-    Stream {
-        content: Entity<TerminalOutput>,
-    },
-    Image {
-        content: Entity<ImageView>,
-        display_id: Option<String>,
-    },
-    ErrorOutput(ErrorView),
-    Message(String),
-    Table {
-        content: Entity<TableView>,
-        display_id: Option<String>,
-    },
-    Markdown {
-        content: Entity<MarkdownView>,
-        display_id: Option<String>,
-    },
-    ClearOutputWaitMarker,
-}
-
-impl Output {
-    fn render_output_controls<V: OutputContent + 'static>(
-        v: Entity<V>,
-        workspace: WeakEntity<Workspace>,
-        window: &mut Window,
-        cx: &mut Context<ExecutionView>,
-    ) -> Option<AnyElement> {
-        if !v.has_clipboard_content(window, cx) && !v.has_buffer_content(window, cx) {
-            return None;
-        }
-
-        Some(
-            h_flex()
-                .pl_1()
-                .when(v.has_clipboard_content(window, cx), |el| {
-                    let v = v.clone();
-                    el.child(
-                        IconButton::new(ElementId::Name("copy-output".into()), IconName::Copy)
-                            .style(ButtonStyle::Transparent)
-                            .tooltip(Tooltip::text("Copy Output"))
-                            .on_click(move |_, window, cx| {
-                                let clipboard_content = v.clipboard_content(window, cx);
-
-                                if let Some(clipboard_content) = clipboard_content.as_ref() {
-                                    cx.write_to_clipboard(clipboard_content.clone());
-                                }
-                            }),
-                    )
-                })
-                .when(v.has_buffer_content(window, cx), |el| {
-                    let v = v.clone();
-                    el.child(
-                        IconButton::new(
-                            ElementId::Name("open-in-buffer".into()),
-                            IconName::FileTextOutlined,
-                        )
-                        .style(ButtonStyle::Transparent)
-                        .tooltip(Tooltip::text("Open in Buffer"))
-                        .on_click({
-                            let workspace = workspace.clone();
-                            move |_, window, cx| {
-                                let buffer_content =
-                                    v.update(cx, |item, cx| item.buffer_content(window, cx));
-
-                                if let Some(buffer_content) = buffer_content.as_ref() {
-                                    let buffer = buffer_content.clone();
-                                    let editor = Box::new(cx.new(|cx| {
-                                        let multibuffer = cx.new(|cx| {
-                                            let mut multi_buffer =
-                                                MultiBuffer::singleton(buffer.clone(), cx);
-
-                                            multi_buffer.set_title("REPL Output".to_string(), cx);
-                                            multi_buffer
-                                        });
-
-                                        Editor::for_multibuffer(multibuffer, None, window, cx)
-                                    }));
-                                    workspace
-                                        .update(cx, |workspace, cx| {
-                                            workspace.add_item_to_active_pane(
-                                                editor, None, true, window, cx,
-                                            );
-                                        })
-                                        .ok();
-                                }
-                            }
-                        }),
-                    )
-                })
-                .into_any_element(),
-        )
-    }
-
-    pub fn render(
-        &self,
-        workspace: WeakEntity<Workspace>,
-        window: &mut Window,
-        cx: &mut Context<ExecutionView>,
-    ) -> impl IntoElement + use<> {
-        let content = match self {
-            Self::Plain { content, .. } => Some(content.clone().into_any_element()),
-            Self::Markdown { content, .. } => Some(content.clone().into_any_element()),
-            Self::Stream { content, .. } => Some(content.clone().into_any_element()),
-            Self::Image { content, .. } => Some(content.clone().into_any_element()),
-            Self::Message(message) => Some(div().child(message.clone()).into_any_element()),
-            Self::Table { content, .. } => Some(content.clone().into_any_element()),
-            Self::ErrorOutput(error_view) => error_view.render(window, cx),
-            Self::ClearOutputWaitMarker => None,
-        };
-
-        h_flex()
-            .id("output-content")
-            .w_full()
-            .overflow_x_scroll()
-            .items_start()
-            .child(div().flex_1().children(content))
-            .children(match self {
-                Self::Plain { content, .. } => {
-                    Self::render_output_controls(content.clone(), workspace, window, cx)
-                }
-                Self::Markdown { content, .. } => {
-                    Self::render_output_controls(content.clone(), workspace, window, cx)
-                }
-                Self::Stream { content, .. } => {
-                    Self::render_output_controls(content.clone(), workspace, window, cx)
-                }
-                Self::Image { content, .. } => {
-                    Self::render_output_controls(content.clone(), workspace, window, cx)
-                }
-                Self::ErrorOutput(err) => {
-                    // Add buttons for the traceback section
-                    Some(
-                        h_flex()
-                            .pl_1()
-                            .child(
-                                IconButton::new(
-                                    ElementId::Name("copy-full-error-traceback".into()),
-                                    IconName::Copy,
-                                )
-                                .style(ButtonStyle::Transparent)
-                                .tooltip(Tooltip::text("Copy Full Error"))
-                                .on_click({
-                                    let ename = err.ename.clone();
-                                    let evalue = err.evalue.clone();
-                                    let traceback = err.traceback.clone();
-                                    move |_, _window, cx| {
-                                        let traceback_text = traceback.read(cx).full_text();
-                                        let full_error =
-                                            format!("{}: {}\n{}", ename, evalue, traceback_text);
-                                        let clipboard_content =
-                                            ClipboardItem::new_string(full_error);
-                                        cx.write_to_clipboard(clipboard_content);
-                                    }
-                                }),
-                            )
-                            .child(
-                                IconButton::new(
-                                    ElementId::Name("open-full-error-in-buffer-traceback".into()),
-                                    IconName::FileTextOutlined,
-                                )
-                                .style(ButtonStyle::Transparent)
-                                .tooltip(Tooltip::text("Open Full Error in Buffer"))
-                                .on_click({
-                                    let ename = err.ename.clone();
-                                    let evalue = err.evalue.clone();
-                                    let traceback = err.traceback.clone();
-                                    move |_, window, cx| {
-                                        if let Some(workspace) = workspace.upgrade() {
-                                            let traceback_text = traceback.read(cx).full_text();
-                                            let full_error = format!(
-                                                "{}: {}\n{}",
-                                                ename, evalue, traceback_text
-                                            );
-                                            let buffer = cx.new(|cx| {
-                                                let mut buffer = Buffer::local(full_error, cx)
-                                                    .with_language(
-                                                        language::PLAIN_TEXT.clone(),
-                                                        cx,
-                                                    );
-                                                buffer.set_capability(
-                                                    language::Capability::ReadOnly,
-                                                    cx,
-                                                );
-                                                buffer
-                                            });
-                                            let editor = Box::new(cx.new(|cx| {
-                                                let multibuffer = cx.new(|cx| {
-                                                    let mut multi_buffer =
-                                                        MultiBuffer::singleton(buffer.clone(), cx);
-                                                    multi_buffer
-                                                        .set_title("Full Error".to_string(), cx);
-                                                    multi_buffer
-                                                });
-                                                Editor::for_multibuffer(
-                                                    multibuffer,
-                                                    None,
-                                                    window,
-                                                    cx,
-                                                )
-                                            }));
-                                            workspace.update(cx, |workspace, cx| {
-                                                workspace.add_item_to_active_pane(
-                                                    editor, None, true, window, cx,
-                                                );
-                                            });
-                                        }
-                                    }
-                                }),
-                            )
-                            .into_any_element(),
-                    )
-                }
-                Self::Message(_) => None,
-                Self::Table { content, .. } => {
-                    Self::render_output_controls(content.clone(), workspace, window, cx)
-                }
-                Self::ClearOutputWaitMarker => None,
-            })
-    }
-
-    pub fn display_id(&self) -> Option<String> {
-        match self {
-            Output::Plain { display_id, .. } => display_id.clone(),
-            Output::Stream { .. } => None,
-            Output::Image { display_id, .. } => display_id.clone(),
-            Output::ErrorOutput(_) => None,
-            Output::Message(_) => None,
-            Output::Table { display_id, .. } => display_id.clone(),
-            Output::Markdown { display_id, .. } => display_id.clone(),
-            Output::ClearOutputWaitMarker => None,
-        }
-    }
-
-    pub fn new(
-        data: &MimeBundle,
-        display_id: Option<String>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Self {
-        match data.richest(rank_mime_type) {
-            Some(MimeType::Plain(text)) => Output::Plain {
-                content: cx.new(|cx| TerminalOutput::from(text, window, cx)),
-                display_id,
-            },
-            Some(MimeType::Markdown(text)) => {
-                let content = cx.new(|cx| MarkdownView::from(text.clone(), cx));
-                Output::Markdown {
-                    content,
-                    display_id,
-                }
-            }
-            Some(MimeType::Png(data)) | Some(MimeType::Jpeg(data)) => match ImageView::from(data) {
-                Ok(view) => Output::Image {
-                    content: cx.new(|_| view),
-                    display_id,
-                },
-                Err(error) => Output::Message(format!("Failed to load image: {}", error)),
-            },
-            Some(MimeType::DataTable(data)) => Output::Table {
-                content: cx.new(|cx| TableView::new(data, window, cx)),
-                display_id,
-            },
-            // Any other media types are not supported
-            _ => Output::Message("Unsupported media type".to_string()),
-        }
-    }
-}
-
-#[derive(Default, Clone, Debug)]
-pub enum ExecutionStatus {
-    #[default]
-    Unknown,
-    ConnectingToKernel,
-    Queued,
-    Executing,
-    Finished,
-    ShuttingDown,
-    Shutdown,
-    KernelErrored(String),
-    Restarting,
-}
-
-/// An ExecutionView shows the outputs of an execution.
-/// It can hold zero or more outputs, which the user
-/// sees as "the output" for a single execution.
-pub struct ExecutionView {
-    #[allow(unused)]
-    workspace: WeakEntity<Workspace>,
-    pub outputs: Vec<Output>,
-    pub status: ExecutionStatus,
-}
-
-impl ExecutionView {
-    pub fn new(
-        status: ExecutionStatus,
-        workspace: WeakEntity<Workspace>,
-        _cx: &mut Context<Self>,
-    ) -> Self {
-        Self {
-            workspace,
-            outputs: Default::default(),
-            status,
-        }
-    }
-
-    /// Accept a Jupyter message belonging to this execution
-    pub fn push_message(
-        &mut self,
-        message: &JupyterMessageContent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let output: Output = match message {
-            JupyterMessageContent::ExecuteResult(result) => Output::new(
-                &result.data,
-                result.transient.as_ref().and_then(|t| t.display_id.clone()),
-                window,
-                cx,
-            ),
-            JupyterMessageContent::DisplayData(result) => Output::new(
-                &result.data,
-                result.transient.as_ref().and_then(|t| t.display_id.clone()),
-                window,
-                cx,
-            ),
-            JupyterMessageContent::StreamContent(result) => {
-                // Previous stream data will combine together, handling colors, carriage returns, etc
-                if let Some(new_terminal) = self.apply_terminal_text(&result.text, window, cx) {
-                    new_terminal
-                } else {
-                    return;
-                }
-            }
-            JupyterMessageContent::ErrorOutput(result) => {
-                let terminal =
-                    cx.new(|cx| TerminalOutput::from(&result.traceback.join("\n"), window, cx));
-
-                Output::ErrorOutput(ErrorView {
-                    ename: result.ename.clone(),
-                    evalue: result.evalue.clone(),
-                    traceback: terminal,
-                })
-            }
-            JupyterMessageContent::ExecuteReply(reply) => {
-                for payload in reply.payload.iter() {
-                    if let runtimelib::Payload::Page { data, .. } = payload {
-                        let output = Output::new(data, None, window, cx);
-                        self.outputs.push(output);
-                    }
-                }
-                cx.notify();
-                return;
-            }
-            JupyterMessageContent::ClearOutput(options) => {
-                if !options.wait {
-                    self.outputs.clear();
-                    cx.notify();
-                    return;
-                }
-
-                // Create a marker to clear the output after we get in a new output
-                Output::ClearOutputWaitMarker
-            }
-            JupyterMessageContent::Status(status) => {
-                match status.execution_state {
-                    ExecutionState::Busy => {
-                        self.status = ExecutionStatus::Executing;
-                    }
-                    ExecutionState::Idle => self.status = ExecutionStatus::Finished,
-                    ExecutionState::Unknown => self.status = ExecutionStatus::Unknown,
-                    ExecutionState::Starting => self.status = ExecutionStatus::ConnectingToKernel,
-                    ExecutionState::Restarting => self.status = ExecutionStatus::Restarting,
-                    ExecutionState::Terminating => self.status = ExecutionStatus::ShuttingDown,
-                    ExecutionState::AutoRestarting => self.status = ExecutionStatus::Restarting,
-                    ExecutionState::Dead => self.status = ExecutionStatus::Shutdown,
-                    ExecutionState::Other(_) => self.status = ExecutionStatus::Unknown,
-                }
-                cx.notify();
-                return;
-            }
-            _msg => {
-                return;
-            }
-        };
-
-        // Check for a clear output marker as the previous output, so we can clear it out
-        if let Some(output) = self.outputs.last()
-            && let Output::ClearOutputWaitMarker = output
-        {
-            self.outputs.clear();
-        }
-
-        self.outputs.push(output);
-
-        cx.notify();
-    }
-
-    pub fn update_display_data(
-        &mut self,
-        data: &MimeBundle,
-        display_id: &str,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let mut any = false;
-
-        self.outputs.iter_mut().for_each(|output| {
-            if let Some(other_display_id) = output.display_id().as_ref()
-                && other_display_id == display_id
-            {
-                *output = Output::new(data, Some(display_id.to_owned()), window, cx);
-                any = true;
-            }
-        });
-
-        if any {
-            cx.notify();
-        }
-    }
-
-    fn apply_terminal_text(
-        &mut self,
-        text: &str,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Output> {
-        if let Some(last_output) = self.outputs.last_mut()
-            && let Output::Stream {
-                content: last_stream,
-            } = last_output
-        {
-            // Don't need to add a new output, we already have a terminal output
-            // and can just update the most recent terminal output
-            last_stream.update(cx, |last_stream, cx| {
-                last_stream.append_text(text, cx);
-                cx.notify();
-            });
-            return None;
-        }
-
-        Some(Output::Stream {
-            content: cx.new(|cx| TerminalOutput::from(text, window, cx)),
-        })
-    }
-}
-
-impl Render for ExecutionView {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let status = match &self.status {
-            ExecutionStatus::ConnectingToKernel => Label::new("Connecting to kernel...")
-                .color(Color::Muted)
-                .into_any_element(),
-            ExecutionStatus::Executing => h_flex()
-                .gap_2()
-                .child(
-                    Icon::new(IconName::ArrowCircle)
-                        .size(IconSize::Small)
-                        .color(Color::Muted)
-                        .with_rotate_animation(3),
-                )
-                .child(Label::new("Executing...").color(Color::Muted))
-                .into_any_element(),
-            ExecutionStatus::Finished => Icon::new(IconName::Check)
-                .size(IconSize::Small)
-                .into_any_element(),
-            ExecutionStatus::Unknown => Label::new("Unknown status")
-                .color(Color::Muted)
-                .into_any_element(),
-            ExecutionStatus::ShuttingDown => Label::new("Kernel shutting down...")
-                .color(Color::Muted)
-                .into_any_element(),
-            ExecutionStatus::Restarting => Label::new("Kernel restarting...")
-                .color(Color::Muted)
-                .into_any_element(),
-            ExecutionStatus::Shutdown => Label::new("Kernel shutdown")
-                .color(Color::Muted)
-                .into_any_element(),
-            ExecutionStatus::Queued => Label::new("Queued...")
-                .color(Color::Muted)
-                .into_any_element(),
-            ExecutionStatus::KernelErrored(error) => Label::new(format!("Kernel error: {}", error))
-                .color(Color::Error)
-                .into_any_element(),
-        };
-
-        if self.outputs.is_empty() {
-            return v_flex()
-                .min_h(window.line_height())
-                .justify_center()
-                .child(status)
-                .into_any_element();
-        }
-
-        div()
-            .w_full()
-            .children(
-                self.outputs
-                    .iter()
-                    .map(|output| output.render(self.workspace.clone(), window, cx)),
-            )
-            .children(match self.status {
-                ExecutionStatus::Executing => vec![status],
-                ExecutionStatus::Queued => vec![status],
-                _ => vec![],
-            })
-            .into_any_element()
-    }
-}
diff --git a/crates/repl/src/outputs/image.rs b/crates/repl/src/outputs/image.rs
deleted file mode 100644
index fefdbec2fa..0000000000
--- a/crates/repl/src/outputs/image.rs
+++ /dev/null
@@ -1,98 +0,0 @@
-use anyhow::Result;
-use base64::{
-    Engine as _, alphabet,
-    engine::{DecodePaddingMode, GeneralPurpose, GeneralPurposeConfig},
-};
-use gpui::{App, ClipboardItem, Image, ImageFormat, RenderImage, Window, img};
-use std::sync::Arc;
-use ui::{IntoElement, Styled, div, prelude::*};
-
-use crate::outputs::OutputContent;
-
-/// ImageView renders an image inline in an editor, adapting to the line height to fit the image.
-pub struct ImageView {
-    clipboard_image: Arc<Image>,
-    height: u32,
-    width: u32,
-    image: Arc<RenderImage>,
-}
-
-pub const STANDARD_INDIFFERENT: GeneralPurpose = GeneralPurpose::new(
-    &alphabet::STANDARD,
-    GeneralPurposeConfig::new()
-        .with_encode_padding(false)
-        .with_decode_padding_mode(DecodePaddingMode::Indifferent),
-);
-
-impl ImageView {
-    pub fn from(base64_encoded_data: &str) -> Result<Self> {
-        let filtered =
-            base64_encoded_data.replace(&[' ', '\n', '\t', '\r', '\x0b', '\x0c'][..], "");
-        let bytes = STANDARD_INDIFFERENT.decode(filtered)?;
-
-        let format = image::guess_format(&bytes)?;
-
-        let mut data = image::load_from_memory_with_format(&bytes, format)?.into_rgba8();
-
-        // Convert from RGBA to BGRA.
-        for pixel in data.chunks_exact_mut(4) {
-            pixel.swap(0, 2);
-        }
-
-        let height = data.height();
-        let width = data.width();
-
-        let gpui_image_data = RenderImage::new(vec![image::Frame::new(data)]);
-
-        let format = match format {
-            image::ImageFormat::Png => ImageFormat::Png,
-            image::ImageFormat::Jpeg => ImageFormat::Jpeg,
-            image::ImageFormat::Gif => ImageFormat::Gif,
-            image::ImageFormat::WebP => ImageFormat::Webp,
-            image::ImageFormat::Tiff => ImageFormat::Tiff,
-            image::ImageFormat::Bmp => ImageFormat::Bmp,
-            image::ImageFormat::Ico => ImageFormat::Ico,
-            format => {
-                anyhow::bail!("unsupported image format {format:?}");
-            }
-        };
-
-        // Convert back to a GPUI image for use with the clipboard
-        let clipboard_image = Arc::new(Image::from_bytes(format, bytes));
-
-        Ok(ImageView {
-            clipboard_image,
-            height,
-            width,
-            image: Arc::new(gpui_image_data),
-        })
-    }
-}
-
-impl Render for ImageView {
-    fn render(&mut self, window: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
-        let line_height = window.line_height();
-
-        let (height, width) = if self.height as f32 / f32::from(line_height) == u8::MAX as f32 {
-            let height = u8::MAX as f32 * line_height;
-            let width = self.width as f32 * height / self.height as f32;
-            (height, width)
-        } else {
-            (self.height.into(), self.width.into())
-        };
-
-        let image = self.image.clone();
-
-        div().h(height).w(width).child(img(image))
-    }
-}
-
-impl OutputContent for ImageView {
-    fn clipboard_content(&self, _window: &Window, _cx: &App) -> Option<ClipboardItem> {
-        Some(ClipboardItem::new_image(self.clipboard_image.as_ref()))
-    }
-
-    fn has_clipboard_content(&self, _window: &Window, _cx: &App) -> bool {
-        true
-    }
-}
diff --git a/crates/repl/src/outputs/markdown.rs b/crates/repl/src/outputs/markdown.rs
deleted file mode 100644
index bd88f4e159..0000000000
--- a/crates/repl/src/outputs/markdown.rs
+++ /dev/null
@@ -1,93 +0,0 @@
-use anyhow::Result;
-use gpui::{
-    App, ClipboardItem, Context, Entity, RetainAllImageCache, Task, Window, div, prelude::*,
-};
-use language::Buffer;
-use markdown_preview::{
-    markdown_elements::ParsedMarkdown, markdown_parser::parse_markdown,
-    markdown_renderer::render_markdown_block,
-};
-use ui::v_flex;
-
-use crate::outputs::OutputContent;
-
-pub struct MarkdownView {
-    raw_text: String,
-    image_cache: Entity<RetainAllImageCache>,
-    contents: Option<ParsedMarkdown>,
-    parsing_markdown_task: Option<Task<Result<()>>>,
-}
-
-impl MarkdownView {
-    pub fn from(text: String, cx: &mut Context<Self>) -> Self {
-        let parsed = {
-            let text = text.clone();
-            cx.background_spawn(async move { parse_markdown(&text.clone(), None, None).await })
-        };
-        let task = cx.spawn(async move |markdown_view, cx| {
-            let content = parsed.await;
-
-            markdown_view.update(cx, |markdown, cx| {
-                markdown.parsing_markdown_task.take();
-                markdown.contents = Some(content);
-                cx.notify();
-            })
-        });
-
-        Self {
-            raw_text: text,
-            image_cache: RetainAllImageCache::new(cx),
-            contents: None,
-            parsing_markdown_task: Some(task),
-        }
-    }
-}
-
-impl OutputContent for MarkdownView {
-    fn clipboard_content(&self, _window: &Window, _cx: &App) -> Option<ClipboardItem> {
-        Some(ClipboardItem::new_string(self.raw_text.clone()))
-    }
-
-    fn has_clipboard_content(&self, _window: &Window, _cx: &App) -> bool {
-        true
-    }
-
-    fn has_buffer_content(&self, _window: &Window, _cx: &App) -> bool {
-        true
-    }
-
-    fn buffer_content(&mut self, _: &mut Window, cx: &mut App) -> Option<Entity<Buffer>> {
-        let buffer = cx.new(|cx| {
-            // TODO: Bring in the language registry so we can set the language to markdown
-            let mut buffer = Buffer::local(self.raw_text.clone(), cx)
-                .with_language(language::PLAIN_TEXT.clone(), cx);
-            buffer.set_capability(language::Capability::ReadOnly, cx);
-            buffer
-        });
-        Some(buffer)
-    }
-}
-
-impl Render for MarkdownView {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let Some(parsed) = self.contents.as_ref() else {
-            return div().into_any_element();
-        };
-
-        let mut markdown_render_context =
-            markdown_preview::markdown_renderer::RenderContext::new(None, window, cx);
-
-        v_flex()
-            .image_cache(self.image_cache.clone())
-            .gap_3()
-            .py_4()
-            .children(parsed.children.iter().map(|child| {
-                div().relative().child(
-                    div()
-                        .relative()
-                        .child(render_markdown_block(child, &mut markdown_render_context)),
-                )
-            }))
-            .into_any_element()
-    }
-}
diff --git a/crates/repl/src/outputs/plain.rs b/crates/repl/src/outputs/plain.rs
deleted file mode 100644
index 54e4983b9f..0000000000
--- a/crates/repl/src/outputs/plain.rs
+++ /dev/null
@@ -1,351 +0,0 @@
-//! # Plain Text Output
-//!
-//! This module provides functionality for rendering plain text output in a terminal-like format.
-//! It uses the Alacritty terminal emulator backend to process and display text, supporting
-//! ANSI escape sequences for formatting, colors, and other terminal features.
-//!
-//! The main component of this module is the `TerminalOutput` struct, which handles the parsing
-//! and rendering of text input, simulating a basic terminal environment within REPL output.
-//!
-//! This module is used for displaying:
-//!
-//! - Standard output (stdout)
-//! - Standard error (stderr)
-//! - Plain text content
-//! - Error tracebacks
-//!
-
-use alacritty_terminal::{
-    event::VoidListener,
-    grid::Dimensions as _,
-    index::{Column, Line, Point},
-    term::Config,
-    vte::ansi::Processor,
-};
-use gpui::{Bounds, ClipboardItem, Entity, FontStyle, TextStyle, WhiteSpace, canvas, size};
-use language::Buffer;
-use settings::Settings as _;
-use terminal::terminal_settings::TerminalSettings;
-use terminal_view::terminal_element::TerminalElement;
-use theme::ThemeSettings;
-use ui::{IntoElement, prelude::*};
-
-use crate::outputs::OutputContent;
-use crate::repl_settings::ReplSettings;
-
-/// The `TerminalOutput` struct handles the parsing and rendering of text input,
-/// simulating a basic terminal environment within REPL output.
-///
-/// `TerminalOutput` is designed to handle various types of text-based output, including:
-///
-/// * stdout (standard output)
-/// * stderr (standard error)
-/// * text/plain content
-/// * error tracebacks
-///
-/// It uses the Alacritty terminal emulator backend to process and render text,
-/// supporting ANSI escape sequences for text formatting and colors.
-///
-pub struct TerminalOutput {
-    full_buffer: Option<Entity<Buffer>>,
-    /// ANSI escape sequence processor for parsing input text.
-    parser: Processor,
-    /// Alacritty terminal instance that manages the terminal state and content.
-    handler: alacritty_terminal::Term<VoidListener>,
-}
-
-/// Returns the default text style for the terminal output.
-pub fn text_style(window: &mut Window, cx: &mut App) -> TextStyle {
-    let settings = ThemeSettings::get_global(cx).clone();
-
-    let font_size = settings.buffer_font_size(cx).into();
-    let font_family = settings.buffer_font.family;
-    let font_features = settings.buffer_font.features;
-    let font_weight = settings.buffer_font.weight;
-    let font_fallbacks = settings.buffer_font.fallbacks;
-
-    let theme = cx.theme();
-
-    TextStyle {
-        font_family,
-        font_features,
-        font_weight,
-        font_fallbacks,
-        font_size,
-        font_style: FontStyle::Normal,
-        line_height: window.line_height().into(),
-        background_color: Some(theme.colors().terminal_ansi_background),
-        white_space: WhiteSpace::Normal,
-        // These are going to be overridden per-cell
-        color: theme.colors().terminal_foreground,
-        ..Default::default()
-    }
-}
-
-/// Returns the default terminal size for the terminal output.
-pub fn terminal_size(window: &mut Window, cx: &mut App) -> terminal::TerminalBounds {
-    let text_style = text_style(window, cx);
-    let text_system = window.text_system();
-
-    let line_height = window.line_height();
-
-    let font_pixels = text_style.font_size.to_pixels(window.rem_size());
-    let font_id = text_system.resolve_font(&text_style.font());
-
-    let cell_width = text_system
-        .advance(font_id, font_pixels, 'w')
-        .unwrap()
-        .width;
-
-    let num_lines = ReplSettings::get_global(cx).max_lines;
-    let columns = ReplSettings::get_global(cx).max_columns;
-
-    // Reversed math from terminal::TerminalSize to get pixel width according to terminal width
-    let width = columns as f32 * cell_width;
-    let height = num_lines as f32 * window.line_height();
-
-    terminal::TerminalBounds {
-        cell_width,
-        line_height,
-        bounds: Bounds {
-            origin: gpui::Point::default(),
-            size: size(width, height),
-        },
-    }
-}
-
-impl TerminalOutput {
-    /// Creates a new `TerminalOutput` instance.
-    ///
-    /// This method initializes a new terminal emulator with default configuration
-    /// and sets up the necessary components for handling terminal events and rendering.
-    ///
-    pub fn new(window: &mut Window, cx: &mut App) -> Self {
-        let term = alacritty_terminal::Term::new(
-            Config::default(),
-            &terminal_size(window, cx),
-            VoidListener,
-        );
-
-        Self {
-            parser: Processor::new(),
-            handler: term,
-            full_buffer: None,
-        }
-    }
-
-    /// Creates a new `TerminalOutput` instance with initial content.
-    ///
-    /// Initializes a new terminal output and populates it with the provided text.
-    ///
-    /// # Arguments
-    ///
-    /// * `text` - A string slice containing the initial text for the terminal output.
-    /// * `cx` - A mutable reference to the `WindowContext` for initialization.
-    ///
-    /// # Returns
-    ///
-    /// A new instance of `TerminalOutput` containing the provided text.
-    pub fn from(text: &str, window: &mut Window, cx: &mut App) -> Self {
-        let mut output = Self::new(window, cx);
-        output.append_text(text, cx);
-        output
-    }
-
-    /// Appends text to the terminal output.
-    ///
-    /// Processes each byte of the input text, handling newline characters specially
-    /// to ensure proper cursor movement. Uses the ANSI parser to process the input
-    /// and update the terminal state.
-    ///
-    /// As an example, if the user runs the following Python code in this REPL:
-    ///
-    /// ```python
-    /// import time
-    /// print("Hello,", end="")
-    /// time.sleep(1)
-    /// print(" world!")
-    /// ```
-    ///
-    /// Then append_text will be called twice, with the following arguments:
-    ///
-    /// ```ignore
-    /// terminal_output.append_text("Hello,");
-    /// terminal_output.append_text(" world!");
-    /// ```
-    /// Resulting in a single output of "Hello, world!".
-    ///
-    /// # Arguments
-    ///
-    /// * `text` - A string slice containing the text to be appended.
-    pub fn append_text(&mut self, text: &str, cx: &mut App) {
-        for byte in text.as_bytes() {
-            if *byte == b'\n' {
-                // Dirty (?) hack to move the cursor down
-                self.parser.advance(&mut self.handler, &[b'\r']);
-                self.parser.advance(&mut self.handler, &[b'\n']);
-            } else {
-                self.parser.advance(&mut self.handler, &[*byte]);
-            }
-        }
-
-        // This will keep the buffer up to date, though with some terminal codes it won't be perfect
-        if let Some(buffer) = self.full_buffer.as_ref() {
-            buffer.update(cx, |buffer, cx| {
-                buffer.edit([(buffer.len()..buffer.len(), text)], None, cx);
-            });
-        }
-    }
-
-    pub fn full_text(&self) -> String {
-        fn sanitize(mut line: String) -> Option<String> {
-            line.retain(|ch| ch != '\u{0}' && ch != '\r');
-            if line.trim().is_empty() {
-                return None;
-            }
-            let trimmed = line.trim_end_matches([' ', '\t']);
-            Some(trimmed.to_owned())
-        }
-
-        let mut lines = Vec::new();
-
-        // Get the total number of lines, including history
-        let total_lines = self.handler.grid().total_lines();
-        let visible_lines = self.handler.screen_lines();
-        let history_lines = total_lines - visible_lines;
-
-        // Capture history lines in correct order (oldest to newest)
-        for line in (0..history_lines).rev() {
-            let line_index = Line(-(line as i32) - 1);
-            let start = Point::new(line_index, Column(0));
-            let end = Point::new(line_index, Column(self.handler.columns() - 1));
-            if let Some(cleaned) = sanitize(self.handler.bounds_to_string(start, end)) {
-                lines.push(cleaned);
-            }
-        }
-
-        // Capture visible lines
-        for line in 0..visible_lines {
-            let line_index = Line(line as i32);
-            let start = Point::new(line_index, Column(0));
-            let end = Point::new(line_index, Column(self.handler.columns() - 1));
-            if let Some(cleaned) = sanitize(self.handler.bounds_to_string(start, end)) {
-                lines.push(cleaned);
-            }
-        }
-
-        if lines.is_empty() {
-            String::new()
-        } else {
-            let mut full_text = lines.join("\n");
-            full_text.push('\n');
-            full_text
-        }
-    }
-}
-
-impl Render for TerminalOutput {
-    /// Renders the terminal output as a GPUI element.
-    ///
-    /// Converts the current terminal state into a renderable GPUI element. It handles
-    /// the layout of the terminal grid, calculates the dimensions of the output, and
-    /// creates a canvas element that paints the terminal cells and background rectangles.
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let text_style = text_style(window, cx);
-        let text_system = window.text_system();
-
-        let grid = self
-            .handler
-            .renderable_content()
-            .display_iter
-            .map(|ic| terminal::IndexedCell {
-                point: ic.point,
-                cell: ic.cell.clone(),
-            });
-        let minimum_contrast = TerminalSettings::get_global(cx).minimum_contrast;
-        let (rects, batched_text_runs) =
-            TerminalElement::layout_grid(grid, 0, &text_style, None, minimum_contrast, cx);
-
-        // lines are 0-indexed, so we must add 1 to get the number of lines
-        let text_line_height = text_style.line_height_in_pixels(window.rem_size());
-        let num_lines = batched_text_runs
-            .iter()
-            .map(|b| b.start_point.line)
-            .max()
-            .unwrap_or(0)
-            + 1;
-        let height = num_lines as f32 * text_line_height;
-
-        let font_pixels = text_style.font_size.to_pixels(window.rem_size());
-        let font_id = text_system.resolve_font(&text_style.font());
-
-        let cell_width = text_system
-            .advance(font_id, font_pixels, 'w')
-            .map(|advance| advance.width)
-            .unwrap_or(Pixels::ZERO);
-
-        canvas(
-            // prepaint
-            move |_bounds, _, _| {},
-            // paint
-            move |bounds, _, window, cx| {
-                for rect in rects {
-                    rect.paint(
-                        bounds.origin,
-                        &terminal::TerminalBounds {
-                            cell_width,
-                            line_height: text_line_height,
-                            bounds,
-                        },
-                        window,
-                    );
-                }
-
-                for batch in batched_text_runs {
-                    batch.paint(
-                        bounds.origin,
-                        &terminal::TerminalBounds {
-                            cell_width,
-                            line_height: text_line_height,
-                            bounds,
-                        },
-                        window,
-                        cx,
-                    );
-                }
-            },
-        )
-        // We must set the height explicitly for the editor block to size itself correctly
-        .h(height)
-    }
-}
-
-impl OutputContent for TerminalOutput {
-    fn clipboard_content(&self, _window: &Window, _cx: &App) -> Option<ClipboardItem> {
-        Some(ClipboardItem::new_string(self.full_text()))
-    }
-
-    fn has_clipboard_content(&self, _window: &Window, _cx: &App) -> bool {
-        true
-    }
-
-    fn has_buffer_content(&self, _window: &Window, _cx: &App) -> bool {
-        true
-    }
-
-    fn buffer_content(&mut self, _: &mut Window, cx: &mut App) -> Option<Entity<Buffer>> {
-        if self.full_buffer.as_ref().is_some() {
-            return self.full_buffer.clone();
-        }
-
-        let buffer = cx.new(|cx| {
-            let mut buffer =
-                Buffer::local(self.full_text(), cx).with_language(language::PLAIN_TEXT.clone(), cx);
-            buffer.set_capability(language::Capability::ReadOnly, cx);
-            buffer
-        });
-
-        self.full_buffer = Some(buffer.clone());
-        Some(buffer)
-    }
-}
diff --git a/crates/repl/src/outputs/table.rs b/crates/repl/src/outputs/table.rs
deleted file mode 100644
index f6bf30f394..0000000000
--- a/crates/repl/src/outputs/table.rs
+++ /dev/null
@@ -1,290 +0,0 @@
-//! # Table Output for REPL
-//!
-//! This module provides functionality to render tabular data in Zed's REPL output.
-//!
-//! It supports the [Frictionless Data Table Schema](https://specs.frictionlessdata.io/table-schema/)
-//! for data interchange, implemented by Pandas in Python and Polars for Deno.
-//!
-//! # Python Example
-//!
-//! Tables can be created and displayed in two main ways:
-//!
-//! 1. Using raw JSON data conforming to the Tabular Data Resource specification.
-//! 2. Using Pandas DataFrames (in Python kernels).
-//!
-//! ## Raw JSON Method
-//!
-//! To create a table using raw JSON, you need to provide a JSON object that conforms
-//! to the Tabular Data Resource specification. Here's an example:
-//!
-//! ```json
-//! {
-//!     "schema": {
-//!         "fields": [
-//!             {"name": "id", "type": "integer"},
-//!             {"name": "name", "type": "string"},
-//!             {"name": "age", "type": "integer"}
-//!         ]
-//!     },
-//!     "data": [
-//!         {"id": 1, "name": "Alice", "age": 30},
-//!         {"id": 2, "name": "Bob", "age": 28},
-//!         {"id": 3, "name": "Charlie", "age": 35}
-//!     ]
-//! }
-//! ```
-//!
-//! ## Pandas Method
-//!
-//! To create a table using Pandas in a Python kernel, you can use the following steps:
-//!
-//! ```python
-//! import pandas as pd
-//!
-//! # Enable table schema output
-//! pd.set_option('display.html.table_schema', True)
-//!
-//! # Create a DataFrame
-//! df = pd.DataFrame({
-//!     'id': [1, 2, 3],
-//!     'name': ['Alice', 'Bob', 'Charlie'],
-//!     'age': [30, 28, 35]
-//! })
-//!
-//! # Display the DataFrame
-//! display(df)
-//! ```
-use gpui::{AnyElement, ClipboardItem, TextRun};
-use runtimelib::datatable::TableSchema;
-use runtimelib::media::datatable::TabularDataResource;
-use serde_json::Value;
-use settings::Settings;
-use theme::ThemeSettings;
-use ui::{IntoElement, Styled, div, prelude::*, v_flex};
-use util::markdown::MarkdownEscaped;
-
-use crate::outputs::OutputContent;
-
-/// TableView renders a static table inline in a buffer.
-///
-/// It uses the <https://specs.frictionlessdata.io/tabular-data-resource/>
-/// specification for data interchange.
-pub struct TableView {
-    pub table: TabularDataResource,
-    pub widths: Vec<Pixels>,
-    cached_clipboard_content: ClipboardItem,
-}
-
-fn cell_content(row: &Value, field: &str) -> String {
-    match row.get(field) {
-        Some(Value::String(s)) => s.clone(),
-        Some(Value::Number(n)) => n.to_string(),
-        Some(Value::Bool(b)) => b.to_string(),
-        Some(Value::Array(arr)) => format!("{:?}", arr),
-        Some(Value::Object(obj)) => format!("{:?}", obj),
-        Some(Value::Null) | None => String::new(),
-    }
-}
-
-// Declare constant for the padding multiple on the line height
-const TABLE_Y_PADDING_MULTIPLE: f32 = 0.5;
-
-impl TableView {
-    pub fn new(table: &TabularDataResource, window: &mut Window, cx: &mut App) -> Self {
-        let mut widths = Vec::with_capacity(table.schema.fields.len());
-
-        let text_system = window.text_system();
-        let text_style = window.text_style();
-        let text_font = ThemeSettings::get_global(cx).buffer_font.clone();
-        let font_size = ThemeSettings::get_global(cx).buffer_font_size(cx);
-        let mut runs = [TextRun {
-            len: 0,
-            font: text_font,
-            color: text_style.color,
-            ..Default::default()
-        }];
-
-        for field in table.schema.fields.iter() {
-            runs[0].len = field.name.len();
-            let mut width = text_system
-                .layout_line(&field.name, font_size, &runs, None)
-                .width;
-
-            let Some(data) = table.data.as_ref() else {
-                widths.push(width);
-                continue;
-            };
-
-            for row in data {
-                let content = cell_content(row, &field.name);
-                runs[0].len = content.len();
-                let cell_width = window
-                    .text_system()
-                    .layout_line(&content, font_size, &runs, None)
-                    .width;
-
-                width = width.max(cell_width)
-            }
-
-            widths.push(width)
-        }
-
-        let cached_clipboard_content = Self::create_clipboard_content(table);
-
-        Self {
-            table: table.clone(),
-            widths,
-            cached_clipboard_content: ClipboardItem::new_string(cached_clipboard_content),
-        }
-    }
-
-    fn create_clipboard_content(table: &TabularDataResource) -> String {
-        let data = match table.data.as_ref() {
-            Some(data) => data,
-            None => &Vec::new(),
-        };
-        let schema = table.schema.clone();
-
-        let mut markdown = format!(
-            "| {} |\n",
-            table
-                .schema
-                .fields
-                .iter()
-                .map(|field| field.name.clone())
-                .collect::<Vec<_>>()
-                .join(" | ")
-        );
-
-        markdown.push_str("|---");
-        for _ in 1..table.schema.fields.len() {
-            markdown.push_str("|---");
-        }
-        markdown.push_str("|\n");
-
-        let body = data
-            .iter()
-            .map(|record: &Value| {
-                let row_content = schema
-                    .fields
-                    .iter()
-                    .map(|field| MarkdownEscaped(&cell_content(record, &field.name)).to_string())
-                    .collect::<Vec<_>>();
-
-                row_content.join(" | ")
-            })
-            .collect::<Vec<String>>();
-
-        for row in body {
-            markdown.push_str(&format!("| {} |\n", row));
-        }
-
-        markdown
-    }
-
-    pub fn render_row(
-        &self,
-        schema: &TableSchema,
-        is_header: bool,
-        row: &Value,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> AnyElement {
-        let theme = cx.theme();
-
-        let line_height = window.line_height();
-
-        let row_cells = schema
-            .fields
-            .iter()
-            .zip(self.widths.iter())
-            .map(|(field, width)| {
-                let container = match field.field_type {
-                    runtimelib::datatable::FieldType::String => div(),
-
-                    runtimelib::datatable::FieldType::Number
-                    | runtimelib::datatable::FieldType::Integer
-                    | runtimelib::datatable::FieldType::Date
-                    | runtimelib::datatable::FieldType::Time
-                    | runtimelib::datatable::FieldType::Datetime
-                    | runtimelib::datatable::FieldType::Year
-                    | runtimelib::datatable::FieldType::Duration
-                    | runtimelib::datatable::FieldType::Yearmonth => v_flex().items_end(),
-
-                    _ => div(),
-                };
-
-                let value = cell_content(row, &field.name);
-
-                let mut cell = container
-                    .min_w(*width + px(22.))
-                    .w(*width + px(22.))
-                    .child(value)
-                    .px_2()
-                    .py((TABLE_Y_PADDING_MULTIPLE / 2.0) * line_height)
-                    .border_color(theme.colors().border);
-
-                if is_header {
-                    cell = cell.border_1().bg(theme.colors().border_focused)
-                } else {
-                    cell = cell.border_1()
-                }
-                cell
-            })
-            .collect::<Vec<_>>();
-
-        let mut total_width = px(0.);
-        for width in self.widths.iter() {
-            // Width fudge factor: border + 2 (heading), padding
-            total_width += *width + px(22.);
-        }
-
-        h_flex()
-            .w(total_width)
-            .children(row_cells)
-            .into_any_element()
-    }
-}
-
-impl Render for TableView {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let data = match &self.table.data {
-            Some(data) => data,
-            None => return div().into_any_element(),
-        };
-
-        let mut headings = serde_json::Map::new();
-        for field in &self.table.schema.fields {
-            headings.insert(field.name.clone(), Value::String(field.name.clone()));
-        }
-        let header = self.render_row(
-            &self.table.schema,
-            true,
-            &Value::Object(headings),
-            window,
-            cx,
-        );
-
-        let body = data
-            .iter()
-            .map(|row| self.render_row(&self.table.schema, false, row, window, cx));
-
-        v_flex()
-            .id("table")
-            .overflow_x_scroll()
-            .w_full()
-            .child(header)
-            .children(body)
-            .into_any_element()
-    }
-}
-
-impl OutputContent for TableView {
-    fn clipboard_content(&self, _window: &Window, _cx: &App) -> Option<ClipboardItem> {
-        Some(self.cached_clipboard_content.clone())
-    }
-
-    fn has_clipboard_content(&self, _window: &Window, _cx: &App) -> bool {
-        true
-    }
-}
diff --git a/crates/repl/src/outputs/user_error.rs b/crates/repl/src/outputs/user_error.rs
deleted file mode 100644
index 4218b417c5..0000000000
--- a/crates/repl/src/outputs/user_error.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-use gpui::{AnyElement, App, Entity, FontWeight, Window};
-use ui::{Label, h_flex, prelude::*, v_flex};
-
-use crate::outputs::plain::TerminalOutput;
-
-/// Userspace error from the kernel
-#[derive(Clone)]
-pub struct ErrorView {
-    pub ename: String,
-    pub evalue: String,
-    pub traceback: Entity<TerminalOutput>,
-}
-
-impl ErrorView {
-    pub fn render(&self, window: &mut Window, cx: &mut App) -> Option<AnyElement> {
-        let theme = cx.theme();
-
-        let padding = window.line_height() / 2.;
-
-        Some(
-            v_flex()
-                .gap_3()
-                .child(
-                    h_flex()
-                        .font_buffer(cx)
-                        .child(
-                            Label::new(format!("{}: ", self.ename.clone()))
-                                .color(Color::Error)
-                                .weight(FontWeight::BOLD),
-                        )
-                        .child(Label::new(self.evalue.clone()).weight(FontWeight::BOLD)),
-                )
-                .child(
-                    div()
-                        .w_full()
-                        .px(padding)
-                        .py(padding)
-                        .border_l_1()
-                        .border_color(theme.status().error_border)
-                        .child(self.traceback.clone()),
-                )
-                .into_any_element(),
-        )
-    }
-}
diff --git a/crates/repl/src/repl.rs b/crates/repl/src/repl.rs
deleted file mode 100644
index 346cca0211..0000000000
--- a/crates/repl/src/repl.rs
+++ /dev/null
@@ -1,61 +0,0 @@
-pub mod components;
-mod jupyter_settings;
-pub mod kernels;
-pub mod notebook;
-mod outputs;
-mod repl_editor;
-mod repl_sessions_ui;
-mod repl_settings;
-mod repl_store;
-mod session;
-
-use std::{sync::Arc, time::Duration};
-
-use async_dispatcher::{Dispatcher, Runnable, set_dispatcher};
-use gpui::{App, PlatformDispatcher, Priority, RunnableVariant};
-use project::Fs;
-pub use runtimelib::ExecutionState;
-
-pub use crate::jupyter_settings::JupyterSettings;
-pub use crate::kernels::{Kernel, KernelSpecification, KernelStatus};
-pub use crate::repl_editor::*;
-pub use crate::repl_sessions_ui::{
-    ClearOutputs, Interrupt, ReplSessionsPage, Restart, Run, Sessions, Shutdown,
-};
-pub use crate::repl_settings::ReplSettings;
-use crate::repl_store::ReplStore;
-pub use crate::session::Session;
-
-pub const KERNEL_DOCS_URL: &str = "https://zed.dev/docs/repl#changing-kernels";
-
-pub fn init(fs: Arc<dyn Fs>, cx: &mut App) {
-    set_dispatcher(zed_dispatcher(cx));
-    repl_sessions_ui::init(cx);
-    ReplStore::init(fs, cx);
-}
-
-fn zed_dispatcher(cx: &mut App) -> impl Dispatcher {
-    struct ZedDispatcher {
-        dispatcher: Arc<dyn PlatformDispatcher>,
-    }
-
-    // PlatformDispatcher is _super_ close to the same interface we put in
-    // async-dispatcher, except for the task label in dispatch. Later we should
-    // just make that consistent so we have this dispatcher ready to go for
-    // other crates in Zed.
-    impl Dispatcher for ZedDispatcher {
-        fn dispatch(&self, runnable: Runnable) {
-            self.dispatcher
-                .dispatch(RunnableVariant::Compat(runnable), None, Priority::default());
-        }
-
-        fn dispatch_after(&self, duration: Duration, runnable: Runnable) {
-            self.dispatcher
-                .dispatch_after(duration, RunnableVariant::Compat(runnable));
-        }
-    }
-
-    ZedDispatcher {
-        dispatcher: cx.background_executor().dispatcher.clone(),
-    }
-}
diff --git a/crates/repl/src/repl_editor.rs b/crates/repl/src/repl_editor.rs
deleted file mode 100644
index 9e52637ab7..0000000000
--- a/crates/repl/src/repl_editor.rs
+++ /dev/null
@@ -1,824 +0,0 @@
-//! REPL operations on an [`Editor`].
-
-use std::ops::Range;
-use std::sync::Arc;
-
-use anyhow::{Context as _, Result};
-use editor::{Editor, MultiBufferOffset};
-use gpui::{App, Entity, WeakEntity, Window, prelude::*};
-use language::{BufferSnapshot, Language, LanguageName, Point};
-use project::{ProjectItem as _, WorktreeId};
-
-use crate::repl_store::ReplStore;
-use crate::session::SessionEvent;
-use crate::{
-    ClearOutputs, Interrupt, JupyterSettings, KernelSpecification, Restart, Session, Shutdown,
-};
-
-pub fn assign_kernelspec(
-    kernel_specification: KernelSpecification,
-    weak_editor: WeakEntity<Editor>,
-    window: &mut Window,
-    cx: &mut App,
-) -> Result<()> {
-    let store = ReplStore::global(cx);
-    if !store.read(cx).is_enabled() {
-        return Ok(());
-    }
-
-    let worktree_id = crate::repl_editor::worktree_id_for_editor(weak_editor.clone(), cx)
-        .context("editor is not in a worktree")?;
-
-    store.update(cx, |store, cx| {
-        store.set_active_kernelspec(worktree_id, kernel_specification.clone(), cx);
-    });
-
-    let fs = store.read(cx).fs().clone();
-
-    if let Some(session) = store.read(cx).get_session(weak_editor.entity_id()).cloned() {
-        // Drop previous session, start new one
-        session.update(cx, |session, cx| {
-            session.clear_outputs(cx);
-            session.shutdown(window, cx);
-            cx.notify();
-        });
-    }
-
-    let session =
-        cx.new(|cx| Session::new(weak_editor.clone(), fs, kernel_specification, window, cx));
-
-    weak_editor
-        .update(cx, |_editor, cx| {
-            cx.notify();
-
-            cx.subscribe(&session, {
-                let store = store.clone();
-                move |_this, _session, event, cx| match event {
-                    SessionEvent::Shutdown(shutdown_event) => {
-                        store.update(cx, |store, _cx| {
-                            store.remove_session(shutdown_event.entity_id());
-                        });
-                    }
-                }
-            })
-            .detach();
-        })
-        .ok();
-
-    store.update(cx, |store, _cx| {
-        store.insert_session(weak_editor.entity_id(), session.clone());
-    });
-
-    Ok(())
-}
-
-pub fn run(
-    editor: WeakEntity<Editor>,
-    move_down: bool,
-    window: &mut Window,
-    cx: &mut App,
-) -> Result<()> {
-    let store = ReplStore::global(cx);
-    if !store.read(cx).is_enabled() {
-        return Ok(());
-    }
-
-    let editor = editor.upgrade().context("editor was dropped")?;
-    let selected_range = editor
-        .update(cx, |editor, cx| {
-            editor
-                .selections
-                .newest_adjusted(&editor.display_snapshot(cx))
-        })
-        .range();
-    let multibuffer = editor.read(cx).buffer().clone();
-    let Some(buffer) = multibuffer.read(cx).as_singleton() else {
-        return Ok(());
-    };
-
-    let Some(project_path) = buffer.read(cx).project_path(cx) else {
-        return Ok(());
-    };
-
-    let (runnable_ranges, next_cell_point) =
-        runnable_ranges(&buffer.read(cx).snapshot(), selected_range, cx);
-
-    for runnable_range in runnable_ranges {
-        let Some(language) = multibuffer.read(cx).language_at(runnable_range.start, cx) else {
-            continue;
-        };
-
-        let kernel_specification = store
-            .read(cx)
-            .active_kernelspec(project_path.worktree_id, Some(language.clone()), cx)
-            .with_context(|| format!("No kernel found for language: {}", language.name()))?;
-
-        let fs = store.read(cx).fs().clone();
-
-        let session = if let Some(session) = store.read(cx).get_session(editor.entity_id()).cloned()
-        {
-            session
-        } else {
-            let weak_editor = editor.downgrade();
-            let session =
-                cx.new(|cx| Session::new(weak_editor, fs, kernel_specification, window, cx));
-
-            editor.update(cx, |_editor, cx| {
-                cx.notify();
-
-                cx.subscribe(&session, {
-                    let store = store.clone();
-                    move |_this, _session, event, cx| match event {
-                        SessionEvent::Shutdown(shutdown_event) => {
-                            store.update(cx, |store, _cx| {
-                                store.remove_session(shutdown_event.entity_id());
-                            });
-                        }
-                    }
-                })
-                .detach();
-            });
-
-            store.update(cx, |store, _cx| {
-                store.insert_session(editor.entity_id(), session.clone());
-            });
-
-            session
-        };
-
-        let selected_text;
-        let anchor_range;
-        let next_cursor;
-        {
-            let snapshot = multibuffer.read(cx).read(cx);
-            selected_text = snapshot
-                .text_for_range(runnable_range.clone())
-                .collect::<String>();
-            anchor_range = snapshot.anchor_before(runnable_range.start)
-                ..snapshot.anchor_after(runnable_range.end);
-            next_cursor = next_cell_point.map(|point| snapshot.anchor_after(point));
-        }
-
-        session.update(cx, |session, cx| {
-            session.execute(
-                selected_text,
-                anchor_range,
-                next_cursor,
-                move_down,
-                window,
-                cx,
-            );
-        });
-    }
-
-    anyhow::Ok(())
-}
-
-pub enum SessionSupport {
-    ActiveSession(Entity<Session>),
-    Inactive(KernelSpecification),
-    RequiresSetup(LanguageName),
-    Unsupported,
-}
-
-pub fn worktree_id_for_editor(editor: WeakEntity<Editor>, cx: &mut App) -> Option<WorktreeId> {
-    editor.upgrade().and_then(|editor| {
-        editor
-            .read(cx)
-            .buffer()
-            .read(cx)
-            .as_singleton()?
-            .read(cx)
-            .project_path(cx)
-            .map(|path| path.worktree_id)
-    })
-}
-
-pub fn session(editor: WeakEntity<Editor>, cx: &mut App) -> SessionSupport {
-    let store = ReplStore::global(cx);
-    let entity_id = editor.entity_id();
-
-    if let Some(session) = store.read(cx).get_session(entity_id).cloned() {
-        return SessionSupport::ActiveSession(session);
-    };
-
-    let Some(language) = get_language(editor.clone(), cx) else {
-        return SessionSupport::Unsupported;
-    };
-
-    let worktree_id = worktree_id_for_editor(editor, cx);
-
-    let Some(worktree_id) = worktree_id else {
-        return SessionSupport::Unsupported;
-    };
-
-    let kernelspec = store
-        .read(cx)
-        .active_kernelspec(worktree_id, Some(language.clone()), cx);
-
-    match kernelspec {
-        Some(kernelspec) => SessionSupport::Inactive(kernelspec),
-        None => {
-            // For language_supported, need to check available kernels for language
-            if language_supported(&language, cx) {
-                SessionSupport::RequiresSetup(language.name())
-            } else {
-                SessionSupport::Unsupported
-            }
-        }
-    }
-}
-
-pub fn clear_outputs(editor: WeakEntity<Editor>, cx: &mut App) {
-    let store = ReplStore::global(cx);
-    let entity_id = editor.entity_id();
-    let Some(session) = store.read(cx).get_session(entity_id).cloned() else {
-        return;
-    };
-    session.update(cx, |session, cx| {
-        session.clear_outputs(cx);
-        cx.notify();
-    });
-}
-
-pub fn interrupt(editor: WeakEntity<Editor>, cx: &mut App) {
-    let store = ReplStore::global(cx);
-    let entity_id = editor.entity_id();
-    let Some(session) = store.read(cx).get_session(entity_id).cloned() else {
-        return;
-    };
-
-    session.update(cx, |session, cx| {
-        session.interrupt(cx);
-        cx.notify();
-    });
-}
-
-pub fn shutdown(editor: WeakEntity<Editor>, window: &mut Window, cx: &mut App) {
-    let store = ReplStore::global(cx);
-    let entity_id = editor.entity_id();
-    let Some(session) = store.read(cx).get_session(entity_id).cloned() else {
-        return;
-    };
-
-    session.update(cx, |session, cx| {
-        session.shutdown(window, cx);
-        cx.notify();
-    });
-}
-
-pub fn restart(editor: WeakEntity<Editor>, window: &mut Window, cx: &mut App) {
-    let Some(editor) = editor.upgrade() else {
-        return;
-    };
-
-    let entity_id = editor.entity_id();
-
-    let Some(session) = ReplStore::global(cx)
-        .read(cx)
-        .get_session(entity_id)
-        .cloned()
-    else {
-        return;
-    };
-
-    session.update(cx, |session, cx| {
-        session.restart(window, cx);
-        cx.notify();
-    });
-}
-
-pub fn setup_editor_session_actions(editor: &mut Editor, editor_handle: WeakEntity<Editor>) {
-    editor
-        .register_action({
-            let editor_handle = editor_handle.clone();
-            move |_: &ClearOutputs, _, cx| {
-                if !JupyterSettings::enabled(cx) {
-                    return;
-                }
-
-                crate::clear_outputs(editor_handle.clone(), cx);
-            }
-        })
-        .detach();
-
-    editor
-        .register_action({
-            let editor_handle = editor_handle.clone();
-            move |_: &Interrupt, _, cx| {
-                if !JupyterSettings::enabled(cx) {
-                    return;
-                }
-
-                crate::interrupt(editor_handle.clone(), cx);
-            }
-        })
-        .detach();
-
-    editor
-        .register_action({
-            let editor_handle = editor_handle.clone();
-            move |_: &Shutdown, window, cx| {
-                if !JupyterSettings::enabled(cx) {
-                    return;
-                }
-
-                crate::shutdown(editor_handle.clone(), window, cx);
-            }
-        })
-        .detach();
-
-    editor
-        .register_action({
-            let editor_handle = editor_handle;
-            move |_: &Restart, window, cx| {
-                if !JupyterSettings::enabled(cx) {
-                    return;
-                }
-
-                crate::restart(editor_handle.clone(), window, cx);
-            }
-        })
-        .detach();
-}
-
-fn cell_range(buffer: &BufferSnapshot, start_row: u32, end_row: u32) -> Range<Point> {
-    let mut snippet_end_row = end_row;
-    while buffer.is_line_blank(snippet_end_row) && snippet_end_row > start_row {
-        snippet_end_row -= 1;
-    }
-    Point::new(start_row, 0)..Point::new(snippet_end_row, buffer.line_len(snippet_end_row))
-}
-
-// Returns the ranges of the snippets in the buffer and the next point for moving the cursor to
-fn jupytext_cells(
-    buffer: &BufferSnapshot,
-    range: Range<Point>,
-) -> (Vec<Range<Point>>, Option<Point>) {
-    let mut current_row = range.start.row;
-
-    let Some(language) = buffer.language() else {
-        return (Vec::new(), None);
-    };
-
-    let default_scope = language.default_scope();
-    let comment_prefixes = default_scope.line_comment_prefixes();
-    if comment_prefixes.is_empty() {
-        return (Vec::new(), None);
-    }
-
-    let jupytext_prefixes = comment_prefixes
-        .iter()
-        .map(|comment_prefix| format!("{comment_prefix}%%"))
-        .collect::<Vec<_>>();
-
-    let mut snippet_start_row = None;
-    loop {
-        if jupytext_prefixes
-            .iter()
-            .any(|prefix| buffer.contains_str_at(Point::new(current_row, 0), prefix))
-        {
-            snippet_start_row = Some(current_row);
-            break;
-        } else if current_row > 0 {
-            current_row -= 1;
-        } else {
-            break;
-        }
-    }
-
-    let mut snippets = Vec::new();
-    if let Some(mut snippet_start_row) = snippet_start_row {
-        for current_row in range.start.row + 1..=buffer.max_point().row {
-            if jupytext_prefixes
-                .iter()
-                .any(|prefix| buffer.contains_str_at(Point::new(current_row, 0), prefix))
-            {
-                snippets.push(cell_range(buffer, snippet_start_row, current_row - 1));
-
-                if current_row <= range.end.row {
-                    snippet_start_row = current_row;
-                } else {
-                    // Return our snippets as well as the next point for moving the cursor to
-                    return (snippets, Some(Point::new(current_row, 0)));
-                }
-            }
-        }
-
-        // Go to the end of the buffer (no more jupytext cells found)
-        snippets.push(cell_range(
-            buffer,
-            snippet_start_row,
-            buffer.max_point().row,
-        ));
-    }
-
-    (snippets, None)
-}
-
-fn runnable_ranges(
-    buffer: &BufferSnapshot,
-    range: Range<Point>,
-    cx: &mut App,
-) -> (Vec<Range<Point>>, Option<Point>) {
-    if let Some(language) = buffer.language()
-        && language.name() == "Markdown".into()
-    {
-        return (markdown_code_blocks(buffer, range, cx), None);
-    }
-
-    let (jupytext_snippets, next_cursor) = jupytext_cells(buffer, range.clone());
-    if !jupytext_snippets.is_empty() {
-        return (jupytext_snippets, next_cursor);
-    }
-
-    let snippet_range = cell_range(buffer, range.start.row, range.end.row);
-    let start_language = buffer.language_at(snippet_range.start);
-    let end_language = buffer.language_at(snippet_range.end);
-
-    if start_language
-        .zip(end_language)
-        .is_some_and(|(start, end)| start == end)
-    {
-        (vec![snippet_range], None)
-    } else {
-        (Vec::new(), None)
-    }
-}
-
-// We allow markdown code blocks to end in a trailing newline in order to render the output
-// below the final code fence. This is different than our behavior for selections and Jupytext cells.
-fn markdown_code_blocks(
-    buffer: &BufferSnapshot,
-    range: Range<Point>,
-    cx: &mut App,
-) -> Vec<Range<Point>> {
-    buffer
-        .injections_intersecting_range(range)
-        .filter(|(_, language)| language_supported(language, cx))
-        .map(|(content_range, _)| {
-            buffer.offset_to_point(content_range.start)..buffer.offset_to_point(content_range.end)
-        })
-        .collect()
-}
-
-fn language_supported(language: &Arc<Language>, cx: &mut App) -> bool {
-    let store = ReplStore::global(cx);
-    let store_read = store.read(cx);
-
-    // Since we're just checking for general language support, we only need to look at
-    // the pure Jupyter kernels - these are all the globally available ones
-    store_read.pure_jupyter_kernel_specifications().any(|spec| {
-        // Convert to lowercase for case-insensitive comparison since kernels might report "python" while our language is "Python"
-        spec.language().as_ref().to_lowercase() == language.name().as_ref().to_lowercase()
-    })
-}
-
-fn get_language(editor: WeakEntity<Editor>, cx: &mut App) -> Option<Arc<Language>> {
-    editor
-        .update(cx, |editor, cx| {
-            let display_snapshot = editor.display_snapshot(cx);
-            let selection = editor
-                .selections
-                .newest::<MultiBufferOffset>(&display_snapshot);
-            display_snapshot
-                .buffer_snapshot()
-                .language_at(selection.head())
-                .cloned()
-        })
-        .ok()
-        .flatten()
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use gpui::App;
-    use indoc::indoc;
-    use language::{Buffer, Language, LanguageConfig, LanguageRegistry};
-
-    #[gpui::test]
-    fn test_snippet_ranges(cx: &mut App) {
-        // Create a test language
-        let test_language = Arc::new(Language::new(
-            LanguageConfig {
-                name: "TestLang".into(),
-                line_comments: vec!["# ".into()],
-                ..Default::default()
-            },
-            None,
-        ));
-
-        let buffer = cx.new(|cx| {
-            Buffer::local(
-                indoc! { r#"
-                    print(1 + 1)
-                    print(2 + 2)
-
-                    print(4 + 4)
-
-
-                "# },
-                cx,
-            )
-            .with_language(test_language, cx)
-        });
-        let snapshot = buffer.read(cx).snapshot();
-
-        // Single-point selection
-        let (snippets, _) = runnable_ranges(&snapshot, Point::new(0, 4)..Point::new(0, 4), cx);
-        let snippets = snippets
-            .into_iter()
-            .map(|range| snapshot.text_for_range(range).collect::<String>())
-            .collect::<Vec<_>>();
-        assert_eq!(snippets, vec!["print(1 + 1)"]);
-
-        // Multi-line selection
-        let (snippets, _) = runnable_ranges(&snapshot, Point::new(0, 5)..Point::new(2, 0), cx);
-        let snippets = snippets
-            .into_iter()
-            .map(|range| snapshot.text_for_range(range).collect::<String>())
-            .collect::<Vec<_>>();
-        assert_eq!(
-            snippets,
-            vec![indoc! { r#"
-                print(1 + 1)
-                print(2 + 2)"# }]
-        );
-
-        // Trimming multiple trailing blank lines
-        let (snippets, _) = runnable_ranges(&snapshot, Point::new(0, 5)..Point::new(5, 0), cx);
-
-        let snippets = snippets
-            .into_iter()
-            .map(|range| snapshot.text_for_range(range).collect::<String>())
-            .collect::<Vec<_>>();
-        assert_eq!(
-            snippets,
-            vec![indoc! { r#"
-                print(1 + 1)
-                print(2 + 2)
-
-                print(4 + 4)"# }]
-        );
-    }
-
-    #[gpui::test]
-    fn test_jupytext_snippet_ranges(cx: &mut App) {
-        // Create a test language
-        let test_language = Arc::new(Language::new(
-            LanguageConfig {
-                name: "TestLang".into(),
-                line_comments: vec!["# ".into()],
-                ..Default::default()
-            },
-            None,
-        ));
-
-        let buffer = cx.new(|cx| {
-            Buffer::local(
-                indoc! { r#"
-                    # Hello!
-                    # %% [markdown]
-                    # This is some arithmetic
-                    print(1 + 1)
-                    print(2 + 2)
-
-                    # %%
-                    print(3 + 3)
-                    print(4 + 4)
-
-                    print(5 + 5)
-
-
-
-                "# },
-                cx,
-            )
-            .with_language(test_language, cx)
-        });
-        let snapshot = buffer.read(cx).snapshot();
-
-        // Jupytext snippet surrounding an empty selection
-        let (snippets, _) = runnable_ranges(&snapshot, Point::new(2, 5)..Point::new(2, 5), cx);
-
-        let snippets = snippets
-            .into_iter()
-            .map(|range| snapshot.text_for_range(range).collect::<String>())
-            .collect::<Vec<_>>();
-        assert_eq!(
-            snippets,
-            vec![indoc! { r#"
-                # %% [markdown]
-                # This is some arithmetic
-                print(1 + 1)
-                print(2 + 2)"# }]
-        );
-
-        // Jupytext snippets intersecting a non-empty selection
-        let (snippets, _) = runnable_ranges(&snapshot, Point::new(2, 5)..Point::new(6, 2), cx);
-        let snippets = snippets
-            .into_iter()
-            .map(|range| snapshot.text_for_range(range).collect::<String>())
-            .collect::<Vec<_>>();
-        assert_eq!(
-            snippets,
-            vec![
-                indoc! { r#"
-                    # %% [markdown]
-                    # This is some arithmetic
-                    print(1 + 1)
-                    print(2 + 2)"#
-                },
-                indoc! { r#"
-                    # %%
-                    print(3 + 3)
-                    print(4 + 4)
-
-                    print(5 + 5)"#
-                }
-            ]
-        );
-    }
-
-    #[gpui::test]
-    fn test_markdown_code_blocks(cx: &mut App) {
-        use crate::kernels::LocalKernelSpecification;
-        use jupyter_protocol::JupyterKernelspec;
-
-        // Initialize settings
-        settings::init(cx);
-        editor::init(cx);
-
-        // Initialize the ReplStore with a fake filesystem
-        let fs = Arc::new(project::RealFs::new(None, cx.background_executor().clone()));
-        ReplStore::init(fs, cx);
-
-        // Add mock kernel specifications for TypeScript and Python
-        let store = ReplStore::global(cx);
-        store.update(cx, |store, cx| {
-            let typescript_spec = KernelSpecification::Jupyter(LocalKernelSpecification {
-                name: "typescript".into(),
-                kernelspec: JupyterKernelspec {
-                    argv: vec![],
-                    display_name: "TypeScript".into(),
-                    language: "typescript".into(),
-                    interrupt_mode: None,
-                    metadata: None,
-                    env: None,
-                },
-                path: std::path::PathBuf::new(),
-            });
-
-            let python_spec = KernelSpecification::Jupyter(LocalKernelSpecification {
-                name: "python".into(),
-                kernelspec: JupyterKernelspec {
-                    argv: vec![],
-                    display_name: "Python".into(),
-                    language: "python".into(),
-                    interrupt_mode: None,
-                    metadata: None,
-                    env: None,
-                },
-                path: std::path::PathBuf::new(),
-            });
-
-            store.set_kernel_specs_for_testing(vec![typescript_spec, python_spec], cx);
-        });
-
-        let markdown = languages::language("markdown", tree_sitter_md::LANGUAGE.into());
-        let typescript = languages::language(
-            "typescript",
-            tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into(),
-        );
-        let python = languages::language("python", tree_sitter_python::LANGUAGE.into());
-        let language_registry = Arc::new(LanguageRegistry::new(cx.background_executor().clone()));
-        language_registry.add(markdown.clone());
-        language_registry.add(typescript);
-        language_registry.add(python);
-
-        // Two code blocks intersecting with selection
-        let buffer = cx.new(|cx| {
-            let mut buffer = Buffer::local(
-                indoc! { r#"
-                    Hey this is Markdown!
-
-                    ```typescript
-                    let foo = 999;
-                    console.log(foo + 1999);
-                    ```
-
-                    ```typescript
-                    console.log("foo")
-                    ```
-                    "#
-                },
-                cx,
-            );
-            buffer.set_language_registry(language_registry.clone());
-            buffer.set_language(Some(markdown.clone()), cx);
-            buffer
-        });
-        let snapshot = buffer.read(cx).snapshot();
-
-        let (snippets, _) = runnable_ranges(&snapshot, Point::new(3, 5)..Point::new(8, 5), cx);
-        let snippets = snippets
-            .into_iter()
-            .map(|range| snapshot.text_for_range(range).collect::<String>())
-            .collect::<Vec<_>>();
-
-        assert_eq!(
-            snippets,
-            vec![
-                indoc! { r#"
-                    let foo = 999;
-                    console.log(foo + 1999);
-                    "#
-                },
-                "console.log(\"foo\")\n"
-            ]
-        );
-
-        // Three code blocks intersecting with selection
-        let buffer = cx.new(|cx| {
-            let mut buffer = Buffer::local(
-                indoc! { r#"
-                    Hey this is Markdown!
-
-                    ```typescript
-                    let foo = 999;
-                    console.log(foo + 1999);
-                    ```
-
-                    ```ts
-                    console.log("foo")
-                    ```
-
-                    ```typescript
-                    console.log("another code block")
-                    ```
-                "# },
-                cx,
-            );
-            buffer.set_language_registry(language_registry.clone());
-            buffer.set_language(Some(markdown.clone()), cx);
-            buffer
-        });
-        let snapshot = buffer.read(cx).snapshot();
-
-        let (snippets, _) = runnable_ranges(&snapshot, Point::new(3, 5)..Point::new(12, 5), cx);
-        let snippets = snippets
-            .into_iter()
-            .map(|range| snapshot.text_for_range(range).collect::<String>())
-            .collect::<Vec<_>>();
-
-        assert_eq!(
-            snippets,
-            vec![
-                indoc! { r#"
-                    let foo = 999;
-                    console.log(foo + 1999);
-                    "#
-                },
-                "console.log(\"foo\")\n",
-                "console.log(\"another code block\")\n",
-            ]
-        );
-
-        // Python code block
-        let buffer = cx.new(|cx| {
-            let mut buffer = Buffer::local(
-                indoc! { r#"
-                    Hey this is Markdown!
-
-                    ```python
-                    print("hello there")
-                    print("hello there")
-                    print("hello there")
-                    ```
-                "# },
-                cx,
-            );
-            buffer.set_language_registry(language_registry.clone());
-            buffer.set_language(Some(markdown.clone()), cx);
-            buffer
-        });
-        let snapshot = buffer.read(cx).snapshot();
-
-        let (snippets, _) = runnable_ranges(&snapshot, Point::new(4, 5)..Point::new(5, 5), cx);
-        let snippets = snippets
-            .into_iter()
-            .map(|range| snapshot.text_for_range(range).collect::<String>())
-            .collect::<Vec<_>>();
-
-        assert_eq!(
-            snippets,
-            vec![indoc! { r#"
-                print("hello there")
-                print("hello there")
-                print("hello there")
-                "#
-            },]
-        );
-    }
-}
diff --git a/crates/repl/src/repl_sessions_ui.rs b/crates/repl/src/repl_sessions_ui.rs
deleted file mode 100644
index d8bd8869f2..0000000000
--- a/crates/repl/src/repl_sessions_ui.rs
+++ /dev/null
@@ -1,282 +0,0 @@
-use editor::Editor;
-use gpui::{
-    AnyElement, App, Entity, EventEmitter, FocusHandle, Focusable, Subscription, actions,
-    prelude::*,
-};
-use project::ProjectItem as _;
-use ui::{ButtonLike, ElevationIndex, KeyBinding, prelude::*};
-use util::ResultExt as _;
-use workspace::item::ItemEvent;
-use workspace::{Workspace, item::Item};
-
-use crate::jupyter_settings::JupyterSettings;
-use crate::repl_store::ReplStore;
-
-actions!(
-    repl,
-    [
-        /// Runs the current cell and advances to the next one.
-        Run,
-        /// Runs the current cell without advancing.
-        RunInPlace,
-        /// Clears all outputs in the REPL.
-        ClearOutputs,
-        /// Opens the REPL sessions panel.
-        Sessions,
-        /// Interrupts the currently running kernel.
-        Interrupt,
-        /// Shuts down the current kernel.
-        Shutdown,
-        /// Restarts the current kernel.
-        Restart,
-        /// Refreshes the list of available kernelspecs.
-        RefreshKernelspecs
-    ]
-);
-
-pub fn init(cx: &mut App) {
-    cx.observe_new(
-        |workspace: &mut Workspace, _window, _cx: &mut Context<Workspace>| {
-            workspace.register_action(|workspace, _: &Sessions, window, cx| {
-                let existing = workspace
-                    .active_pane()
-                    .read(cx)
-                    .items()
-                    .find_map(|item| item.downcast::<ReplSessionsPage>());
-
-                if let Some(existing) = existing {
-                    workspace.activate_item(&existing, true, true, window, cx);
-                } else {
-                    let repl_sessions_page = ReplSessionsPage::new(window, cx);
-                    workspace.add_item_to_active_pane(
-                        Box::new(repl_sessions_page),
-                        None,
-                        true,
-                        window,
-                        cx,
-                    )
-                }
-            });
-
-            workspace.register_action(|_workspace, _: &RefreshKernelspecs, _, cx| {
-                let store = ReplStore::global(cx);
-                store.update(cx, |store, cx| {
-                    store.refresh_kernelspecs(cx).detach();
-                });
-            });
-        },
-    )
-    .detach();
-
-    cx.observe_new(
-        move |editor: &mut Editor, window, cx: &mut Context<Editor>| {
-            let Some(window) = window else {
-                return;
-            };
-
-            if !editor.use_modal_editing() || !editor.buffer().read(cx).is_singleton() {
-                return;
-            }
-
-            cx.defer_in(window, |editor, window, cx| {
-                let workspace = Workspace::for_window(window, cx);
-                let project = workspace.map(|workspace| workspace.read(cx).project().clone());
-
-                let is_local_project = project
-                    .as_ref()
-                    .map(|project| project.read(cx).is_local())
-                    .unwrap_or(false);
-
-                if !is_local_project {
-                    return;
-                }
-
-                let buffer = editor.buffer().read(cx).as_singleton();
-
-                let language = buffer
-                    .as_ref()
-                    .and_then(|buffer| buffer.read(cx).language());
-
-                let project_path = buffer.and_then(|buffer| buffer.read(cx).project_path(cx));
-
-                let editor_handle = cx.entity().downgrade();
-
-                if let Some(language) = language
-                    && language.name() == "Python".into()
-                    && let (Some(project_path), Some(project)) = (project_path, project)
-                {
-                    let store = ReplStore::global(cx);
-                    store.update(cx, |store, cx| {
-                        store
-                            .refresh_python_kernelspecs(project_path.worktree_id, &project, cx)
-                            .detach_and_log_err(cx);
-                    });
-                }
-
-                editor
-                    .register_action({
-                        let editor_handle = editor_handle.clone();
-                        move |_: &Run, window, cx| {
-                            if !JupyterSettings::enabled(cx) {
-                                return;
-                            }
-
-                            crate::run(editor_handle.clone(), true, window, cx).log_err();
-                        }
-                    })
-                    .detach();
-
-                editor
-                    .register_action({
-                        move |_: &RunInPlace, window, cx| {
-                            if !JupyterSettings::enabled(cx) {
-                                return;
-                            }
-
-                            crate::run(editor_handle.clone(), false, window, cx).log_err();
-                        }
-                    })
-                    .detach();
-            });
-        },
-    )
-    .detach();
-}
-
-pub struct ReplSessionsPage {
-    focus_handle: FocusHandle,
-    _subscriptions: Vec<Subscription>,
-}
-
-impl ReplSessionsPage {
-    pub fn new(window: &mut Window, cx: &mut Context<Workspace>) -> Entity<Self> {
-        cx.new(|cx| {
-            let focus_handle = cx.focus_handle();
-
-            let subscriptions = vec![
-                cx.on_focus_in(&focus_handle, window, |_this, _window, cx| cx.notify()),
-                cx.on_focus_out(&focus_handle, window, |_this, _event, _window, cx| {
-                    cx.notify()
-                }),
-            ];
-
-            Self {
-                focus_handle,
-                _subscriptions: subscriptions,
-            }
-        })
-    }
-}
-
-impl EventEmitter<ItemEvent> for ReplSessionsPage {}
-
-impl Focusable for ReplSessionsPage {
-    fn focus_handle(&self, _cx: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl Item for ReplSessionsPage {
-    type Event = ItemEvent;
-
-    fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString {
-        "REPL Sessions".into()
-    }
-
-    fn telemetry_event_text(&self) -> Option<&'static str> {
-        Some("REPL Session Started")
-    }
-
-    fn show_toolbar(&self) -> bool {
-        false
-    }
-
-    fn to_item_events(event: &Self::Event, mut f: impl FnMut(workspace::item::ItemEvent)) {
-        f(*event)
-    }
-}
-
-impl Render for ReplSessionsPage {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let store = ReplStore::global(cx);
-
-        let (kernel_specifications, sessions) = store.update(cx, |store, _cx| {
-            (
-                store
-                    .pure_jupyter_kernel_specifications()
-                    .cloned()
-                    .collect::<Vec<_>>(),
-                store.sessions().cloned().collect::<Vec<_>>(),
-            )
-        });
-
-        // When there are no kernel specifications, show a link to the Zed docs explaining how to
-        // install kernels. It can be assumed they don't have a running kernel if we have no
-        // specifications.
-        if kernel_specifications.is_empty() {
-            let instructions = "To start interactively running code in your editor, you need to install and configure Jupyter kernels.";
-
-            return ReplSessionsContainer::new("No Jupyter Kernels Available")
-                .child(Label::new(instructions))
-                .child(
-                    h_flex().w_full().p_4().justify_center().gap_2().child(
-                        ButtonLike::new("install-kernels")
-                            .style(ButtonStyle::Filled)
-                            .size(ButtonSize::Large)
-                            .layer(ElevationIndex::ModalSurface)
-                            .child(Label::new("Install Kernels"))
-                            .on_click(move |_, _, cx| {
-                                cx.open_url(
-                                    "https://zed.dev/docs/repl#language-specific-instructions",
-                                )
-                            }),
-                    ),
-                );
-        }
-
-        // When there are no sessions, show the command to run code in an editor
-        if sessions.is_empty() {
-            let instructions = "To run code in a Jupyter kernel, select some code and use the 'repl::Run' command.";
-
-            return ReplSessionsContainer::new("No Jupyter Kernel Sessions").child(
-                v_flex()
-                    .child(Label::new(instructions))
-                    .child(KeyBinding::for_action(&Run, cx)),
-            );
-        }
-
-        ReplSessionsContainer::new("Jupyter Kernel Sessions").children(sessions)
-    }
-}
-
-#[derive(IntoElement)]
-struct ReplSessionsContainer {
-    title: SharedString,
-    children: Vec<AnyElement>,
-}
-
-impl ReplSessionsContainer {
-    pub fn new(title: impl Into<SharedString>) -> Self {
-        Self {
-            title: title.into(),
-            children: Vec::new(),
-        }
-    }
-}
-
-impl ParentElement for ReplSessionsContainer {
-    fn extend(&mut self, elements: impl IntoIterator<Item = AnyElement>) {
-        self.children.extend(elements)
-    }
-}
-
-impl RenderOnce for ReplSessionsContainer {
-    fn render(self, _window: &mut Window, _cx: &mut App) -> impl IntoElement {
-        v_flex()
-            .p_4()
-            .gap_2()
-            .size_full()
-            .child(Label::new(self.title).size(LabelSize::Large))
-            .children(self.children)
-    }
-}
diff --git a/crates/repl/src/repl_settings.rs b/crates/repl/src/repl_settings.rs
deleted file mode 100644
index 9faed72e55..0000000000
--- a/crates/repl/src/repl_settings.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-use settings::{RegisterSetting, Settings};
-
-/// Settings for configuring REPL display and behavior.
-#[derive(Clone, Debug, RegisterSetting)]
-pub struct ReplSettings {
-    /// Maximum number of lines to keep in REPL's scrollback buffer.
-    /// Clamped with [4, 256] range.
-    ///
-    /// Default: 32
-    pub max_lines: usize,
-    /// Maximum number of columns to keep in REPL's scrollback buffer.
-    /// Clamped with [20, 512] range.
-    ///
-    /// Default: 128
-    pub max_columns: usize,
-}
-
-impl Settings for ReplSettings {
-    fn from_settings(content: &settings::SettingsContent) -> Self {
-        let repl = content.repl.as_ref().unwrap();
-
-        Self {
-            max_lines: repl.max_lines.unwrap(),
-            max_columns: repl.max_columns.unwrap(),
-        }
-    }
-}
diff --git a/crates/repl/src/repl_store.rs b/crates/repl/src/repl_store.rs
deleted file mode 100644
index a5dc7b6c7b..0000000000
--- a/crates/repl/src/repl_store.rs
+++ /dev/null
@@ -1,292 +0,0 @@
-use std::sync::Arc;
-
-use anyhow::{Context as _, Result};
-use collections::HashMap;
-use command_palette_hooks::CommandPaletteFilter;
-use gpui::{App, Context, Entity, EntityId, Global, Subscription, Task, prelude::*};
-use jupyter_websocket_client::RemoteServer;
-use language::Language;
-use project::{Fs, Project, WorktreeId};
-use settings::{Settings, SettingsStore};
-
-use crate::kernels::{
-    list_remote_kernelspecs, local_kernel_specifications, python_env_kernel_specifications,
-};
-use crate::{JupyterSettings, KernelSpecification, Session};
-
-struct GlobalReplStore(Entity<ReplStore>);
-
-impl Global for GlobalReplStore {}
-
-pub struct ReplStore {
-    fs: Arc<dyn Fs>,
-    enabled: bool,
-    sessions: HashMap<EntityId, Entity<Session>>,
-    kernel_specifications: Vec<KernelSpecification>,
-    selected_kernel_for_worktree: HashMap<WorktreeId, KernelSpecification>,
-    kernel_specifications_for_worktree: HashMap<WorktreeId, Vec<KernelSpecification>>,
-    _subscriptions: Vec<Subscription>,
-}
-
-impl ReplStore {
-    const NAMESPACE: &'static str = "repl";
-
-    pub(crate) fn init(fs: Arc<dyn Fs>, cx: &mut App) {
-        let store = cx.new(move |cx| Self::new(fs, cx));
-
-        store
-            .update(cx, |store, cx| store.refresh_kernelspecs(cx))
-            .detach_and_log_err(cx);
-
-        cx.set_global(GlobalReplStore(store))
-    }
-
-    pub fn global(cx: &App) -> Entity<Self> {
-        cx.global::<GlobalReplStore>().0.clone()
-    }
-
-    pub fn new(fs: Arc<dyn Fs>, cx: &mut Context<Self>) -> Self {
-        let subscriptions = vec![cx.observe_global::<SettingsStore>(move |this, cx| {
-            this.set_enabled(JupyterSettings::enabled(cx), cx);
-        })];
-
-        let this = Self {
-            fs,
-            enabled: JupyterSettings::enabled(cx),
-            sessions: HashMap::default(),
-            kernel_specifications: Vec::new(),
-            _subscriptions: subscriptions,
-            kernel_specifications_for_worktree: HashMap::default(),
-            selected_kernel_for_worktree: HashMap::default(),
-        };
-        this.on_enabled_changed(cx);
-        this
-    }
-
-    pub fn fs(&self) -> &Arc<dyn Fs> {
-        &self.fs
-    }
-
-    pub fn is_enabled(&self) -> bool {
-        self.enabled
-    }
-
-    pub fn kernel_specifications_for_worktree(
-        &self,
-        worktree_id: WorktreeId,
-    ) -> impl Iterator<Item = &KernelSpecification> {
-        self.kernel_specifications_for_worktree
-            .get(&worktree_id)
-            .into_iter()
-            .flat_map(|specs| specs.iter())
-            .chain(self.kernel_specifications.iter())
-    }
-
-    pub fn pure_jupyter_kernel_specifications(&self) -> impl Iterator<Item = &KernelSpecification> {
-        self.kernel_specifications.iter()
-    }
-
-    pub fn sessions(&self) -> impl Iterator<Item = &Entity<Session>> {
-        self.sessions.values()
-    }
-
-    fn set_enabled(&mut self, enabled: bool, cx: &mut Context<Self>) {
-        if self.enabled == enabled {
-            return;
-        }
-
-        self.enabled = enabled;
-        self.on_enabled_changed(cx);
-    }
-
-    fn on_enabled_changed(&self, cx: &mut Context<Self>) {
-        if !self.enabled {
-            CommandPaletteFilter::update_global(cx, |filter, _cx| {
-                filter.hide_namespace(Self::NAMESPACE);
-            });
-
-            return;
-        }
-
-        CommandPaletteFilter::update_global(cx, |filter, _cx| {
-            filter.show_namespace(Self::NAMESPACE);
-        });
-
-        cx.notify();
-    }
-
-    pub fn refresh_python_kernelspecs(
-        &mut self,
-        worktree_id: WorktreeId,
-        project: &Entity<Project>,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let kernel_specifications = python_env_kernel_specifications(project, worktree_id, cx);
-        cx.spawn(async move |this, cx| {
-            let kernel_specifications = kernel_specifications
-                .await
-                .context("getting python kernelspecs")?;
-
-            this.update(cx, |this, cx| {
-                this.kernel_specifications_for_worktree
-                    .insert(worktree_id, kernel_specifications);
-                cx.notify();
-            })
-        })
-    }
-
-    fn get_remote_kernel_specifications(
-        &self,
-        cx: &mut Context<Self>,
-    ) -> Option<Task<Result<Vec<KernelSpecification>>>> {
-        match (
-            std::env::var("JUPYTER_SERVER"),
-            std::env::var("JUPYTER_TOKEN"),
-        ) {
-            (Ok(server), Ok(token)) => {
-                let remote_server = RemoteServer {
-                    base_url: server,
-                    token,
-                };
-                let http_client = cx.http_client();
-                Some(cx.spawn(async move |_, _| {
-                    list_remote_kernelspecs(remote_server, http_client)
-                        .await
-                        .map(|specs| specs.into_iter().map(KernelSpecification::Remote).collect())
-                }))
-            }
-            _ => None,
-        }
-    }
-
-    pub fn refresh_kernelspecs(&mut self, cx: &mut Context<Self>) -> Task<Result<()>> {
-        let local_kernel_specifications = local_kernel_specifications(self.fs.clone());
-
-        let remote_kernel_specifications = self.get_remote_kernel_specifications(cx);
-
-        let all_specs = cx.background_spawn(async move {
-            let mut all_specs = local_kernel_specifications
-                .await?
-                .into_iter()
-                .map(KernelSpecification::Jupyter)
-                .collect::<Vec<_>>();
-
-            if let Some(remote_task) = remote_kernel_specifications
-                && let Ok(remote_specs) = remote_task.await
-            {
-                all_specs.extend(remote_specs);
-            }
-
-            anyhow::Ok(all_specs)
-        });
-
-        cx.spawn(async move |this, cx| {
-            let all_specs = all_specs.await;
-
-            if let Ok(specs) = all_specs {
-                this.update(cx, |this, cx| {
-                    this.kernel_specifications = specs;
-                    cx.notify();
-                })
-                .ok();
-            }
-
-            anyhow::Ok(())
-        })
-    }
-
-    pub fn set_active_kernelspec(
-        &mut self,
-        worktree_id: WorktreeId,
-        kernelspec: KernelSpecification,
-        _cx: &mut Context<Self>,
-    ) {
-        self.selected_kernel_for_worktree
-            .insert(worktree_id, kernelspec);
-    }
-
-    pub fn active_kernelspec(
-        &self,
-        worktree_id: WorktreeId,
-        language_at_cursor: Option<Arc<Language>>,
-        cx: &App,
-    ) -> Option<KernelSpecification> {
-        let selected_kernelspec = self.selected_kernel_for_worktree.get(&worktree_id).cloned();
-
-        if let Some(language_at_cursor) = language_at_cursor {
-            selected_kernelspec.or_else(|| {
-                self.kernelspec_legacy_by_lang_only(worktree_id, language_at_cursor, cx)
-            })
-        } else {
-            selected_kernelspec
-        }
-    }
-
-    fn kernelspec_legacy_by_lang_only(
-        &self,
-        worktree_id: WorktreeId,
-        language_at_cursor: Arc<Language>,
-        cx: &App,
-    ) -> Option<KernelSpecification> {
-        let settings = JupyterSettings::get_global(cx);
-        let selected_kernel = settings
-            .kernel_selections
-            .get(language_at_cursor.code_fence_block_name().as_ref());
-
-        let found_by_name = self
-            .kernel_specifications_for_worktree(worktree_id)
-            .find(|runtime_specification| {
-                if let (Some(selected), KernelSpecification::Jupyter(runtime_specification)) =
-                    (selected_kernel, runtime_specification)
-                {
-                    // Top priority is the selected kernel
-                    return runtime_specification.name.to_lowercase() == selected.to_lowercase();
-                }
-                false
-            })
-            .cloned();
-
-        if let Some(found_by_name) = found_by_name {
-            return Some(found_by_name);
-        }
-
-        self.kernel_specifications_for_worktree(worktree_id)
-            .find(|kernel_option| match kernel_option {
-                KernelSpecification::Jupyter(runtime_specification) => {
-                    runtime_specification.kernelspec.language.to_lowercase()
-                        == language_at_cursor.code_fence_block_name().to_lowercase()
-                }
-                KernelSpecification::PythonEnv(runtime_specification) => {
-                    runtime_specification.kernelspec.language.to_lowercase()
-                        == language_at_cursor.code_fence_block_name().to_lowercase()
-                }
-                KernelSpecification::Remote(remote_spec) => {
-                    remote_spec.kernelspec.language.to_lowercase()
-                        == language_at_cursor.code_fence_block_name().to_lowercase()
-                }
-            })
-            .cloned()
-    }
-
-    pub fn get_session(&self, entity_id: EntityId) -> Option<&Entity<Session>> {
-        self.sessions.get(&entity_id)
-    }
-
-    pub fn insert_session(&mut self, entity_id: EntityId, session: Entity<Session>) {
-        self.sessions.insert(entity_id, session);
-    }
-
-    pub fn remove_session(&mut self, entity_id: EntityId) {
-        self.sessions.remove(&entity_id);
-    }
-
-    #[cfg(test)]
-    pub fn set_kernel_specs_for_testing(
-        &mut self,
-        specs: Vec<KernelSpecification>,
-        cx: &mut Context<Self>,
-    ) {
-        self.kernel_specifications = specs;
-        cx.notify();
-    }
-}
diff --git a/crates/repl/src/session.rs b/crates/repl/src/session.rs
deleted file mode 100644
index 1fa0bfec35..0000000000
--- a/crates/repl/src/session.rs
+++ /dev/null
@@ -1,702 +0,0 @@
-use crate::components::KernelListItem;
-use crate::kernels::RemoteRunningKernel;
-use crate::setup_editor_session_actions;
-use crate::{
-    KernelStatus,
-    kernels::{Kernel, KernelSpecification, NativeRunningKernel},
-    outputs::{ExecutionStatus, ExecutionView},
-};
-use anyhow::Context as _;
-use collections::{HashMap, HashSet};
-use editor::SelectionEffects;
-use editor::{
-    Anchor, AnchorRangeExt as _, Editor, MultiBuffer, ToPoint,
-    display_map::{
-        BlockContext, BlockId, BlockPlacement, BlockProperties, BlockStyle, CustomBlockId,
-        RenderBlock,
-    },
-    scroll::Autoscroll,
-};
-use futures::FutureExt as _;
-use gpui::{
-    Context, Entity, EventEmitter, Render, Subscription, Task, WeakEntity, Window, div, prelude::*,
-};
-use language::Point;
-use project::Fs;
-use runtimelib::{
-    ExecuteRequest, ExecutionState, InterruptRequest, JupyterMessage, JupyterMessageContent,
-    ShutdownRequest,
-};
-use std::{env::temp_dir, ops::Range, sync::Arc, time::Duration};
-use theme::ActiveTheme;
-use ui::{IconButtonShape, Tooltip, prelude::*};
-use util::ResultExt as _;
-
-pub struct Session {
-    fs: Arc<dyn Fs>,
-    editor: WeakEntity<Editor>,
-    pub kernel: Kernel,
-    blocks: HashMap<String, EditorBlock>,
-    pub kernel_specification: KernelSpecification,
-    _buffer_subscription: Subscription,
-}
-
-struct EditorBlock {
-    code_range: Range<Anchor>,
-    invalidation_anchor: Anchor,
-    block_id: CustomBlockId,
-    execution_view: Entity<ExecutionView>,
-}
-
-type CloseBlockFn =
-    Arc<dyn for<'a> Fn(CustomBlockId, &'a mut Window, &mut App) + Send + Sync + 'static>;
-
-impl EditorBlock {
-    fn new(
-        editor: WeakEntity<Editor>,
-        code_range: Range<Anchor>,
-        status: ExecutionStatus,
-        on_close: CloseBlockFn,
-        cx: &mut Context<Session>,
-    ) -> anyhow::Result<Self> {
-        let editor = editor.upgrade().context("editor is not open")?;
-        let workspace = editor.read(cx).workspace().context("workspace dropped")?;
-
-        let execution_view = cx.new(|cx| ExecutionView::new(status, workspace.downgrade(), cx));
-
-        let (block_id, invalidation_anchor) = editor.update(cx, |editor, cx| {
-            let buffer = editor.buffer().clone();
-            let buffer_snapshot = buffer.read(cx).snapshot(cx);
-            let end_point = code_range.end.to_point(&buffer_snapshot);
-            let next_row_start = end_point + Point::new(1, 0);
-            if next_row_start > buffer_snapshot.max_point() {
-                buffer.update(cx, |buffer, cx| {
-                    buffer.edit(
-                        [(
-                            buffer_snapshot.max_point()..buffer_snapshot.max_point(),
-                            "\n",
-                        )],
-                        None,
-                        cx,
-                    )
-                });
-            }
-
-            let invalidation_anchor = buffer.read(cx).read(cx).anchor_before(next_row_start);
-            let block = BlockProperties {
-                placement: BlockPlacement::Below(code_range.end),
-                // Take up at least one height for status, allow the editor to determine the real height based on the content from render
-                height: Some(1),
-                style: BlockStyle::Sticky,
-                render: Self::create_output_area_renderer(execution_view.clone(), on_close.clone()),
-                priority: 0,
-            };
-
-            let block_id = editor.insert_blocks([block], None, cx)[0];
-            (block_id, invalidation_anchor)
-        });
-
-        anyhow::Ok(Self {
-            code_range,
-            invalidation_anchor,
-            block_id,
-            execution_view,
-        })
-    }
-
-    fn handle_message(
-        &mut self,
-        message: &JupyterMessage,
-        window: &mut Window,
-        cx: &mut Context<Session>,
-    ) {
-        self.execution_view.update(cx, |execution_view, cx| {
-            execution_view.push_message(&message.content, window, cx);
-        });
-    }
-
-    fn create_output_area_renderer(
-        execution_view: Entity<ExecutionView>,
-        on_close: CloseBlockFn,
-    ) -> RenderBlock {
-        Arc::new(move |cx: &mut BlockContext| {
-            let execution_view = execution_view.clone();
-            let text_style = crate::outputs::plain::text_style(cx.window, cx.app);
-
-            let editor_margins = cx.margins;
-            let gutter = editor_margins.gutter;
-
-            let block_id = cx.block_id;
-            let on_close = on_close.clone();
-
-            let rem_size = cx.window.rem_size();
-
-            let text_line_height = text_style.line_height_in_pixels(rem_size);
-
-            let close_button = h_flex()
-                .flex_none()
-                .items_center()
-                .justify_center()
-                .absolute()
-                .top(text_line_height / 2.)
-                .right(
-                    // 2px is a magic number to nudge the button just a bit closer to
-                    // the line number start
-                    gutter.full_width() / 2.0 - text_line_height / 2.0 - px(2.),
-                )
-                .w(text_line_height)
-                .h(text_line_height)
-                .child(
-                    IconButton::new("close_output_area", IconName::Close)
-                        .icon_size(IconSize::Small)
-                        .icon_color(Color::Muted)
-                        .size(ButtonSize::Compact)
-                        .shape(IconButtonShape::Square)
-                        .tooltip(Tooltip::text("Close output area"))
-                        .on_click(move |_, window, cx| {
-                            if let BlockId::Custom(block_id) = block_id {
-                                (on_close)(block_id, window, cx)
-                            }
-                        }),
-                );
-
-            div()
-                .id(cx.block_id)
-                .block_mouse_except_scroll()
-                .flex()
-                .items_start()
-                .min_h(text_line_height)
-                .w_full()
-                .border_y_1()
-                .border_color(cx.theme().colors().border)
-                .bg(cx.theme().colors().background)
-                .child(
-                    div()
-                        .relative()
-                        .w(gutter.full_width())
-                        .h(text_line_height * 2)
-                        .child(close_button),
-                )
-                .child(
-                    div()
-                        .flex_1()
-                        .size_full()
-                        .py(text_line_height / 2.)
-                        .mr(editor_margins.right)
-                        .pr_2()
-                        .child(execution_view),
-                )
-                .into_any_element()
-        })
-    }
-}
-
-impl Session {
-    pub fn new(
-        editor: WeakEntity<Editor>,
-        fs: Arc<dyn Fs>,
-        kernel_specification: KernelSpecification,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let subscription = match editor.upgrade() {
-            Some(editor) => {
-                let buffer = editor.read(cx).buffer().clone();
-                cx.subscribe(&buffer, Self::on_buffer_event)
-            }
-            None => Subscription::new(|| {}),
-        };
-
-        let editor_handle = editor.clone();
-
-        editor
-            .update(cx, |editor, _cx| {
-                setup_editor_session_actions(editor, editor_handle);
-            })
-            .ok();
-
-        let mut session = Self {
-            fs,
-            editor,
-            kernel: Kernel::StartingKernel(Task::ready(()).shared()),
-            blocks: HashMap::default(),
-            kernel_specification,
-            _buffer_subscription: subscription,
-        };
-
-        session.start_kernel(window, cx);
-        session
-    }
-
-    fn start_kernel(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let kernel_language = self.kernel_specification.language();
-        let entity_id = self.editor.entity_id();
-        let working_directory = self
-            .editor
-            .upgrade()
-            .and_then(|editor| editor.read(cx).working_directory(cx))
-            .unwrap_or_else(temp_dir);
-
-        telemetry::event!(
-            "Kernel Status Changed",
-            kernel_language,
-            kernel_status = KernelStatus::Starting.to_string(),
-            repl_session_id = cx.entity_id().to_string(),
-        );
-
-        let session_view = cx.entity();
-
-        let kernel = match self.kernel_specification.clone() {
-            KernelSpecification::Jupyter(kernel_specification)
-            | KernelSpecification::PythonEnv(kernel_specification) => NativeRunningKernel::new(
-                kernel_specification,
-                entity_id,
-                working_directory,
-                self.fs.clone(),
-                session_view,
-                window,
-                cx,
-            ),
-            KernelSpecification::Remote(remote_kernel_specification) => RemoteRunningKernel::new(
-                remote_kernel_specification,
-                working_directory,
-                session_view,
-                window,
-                cx,
-            ),
-        };
-
-        let pending_kernel = cx
-            .spawn(async move |this, cx| {
-                let kernel = kernel.await;
-
-                match kernel {
-                    Ok(kernel) => {
-                        this.update(cx, |session, cx| {
-                            session.kernel(Kernel::RunningKernel(kernel), cx);
-                        })
-                        .ok();
-                    }
-                    Err(err) => {
-                        this.update(cx, |session, cx| {
-                            session.kernel_errored(err.to_string(), cx);
-                        })
-                        .ok();
-                    }
-                }
-            })
-            .shared();
-
-        self.kernel(Kernel::StartingKernel(pending_kernel), cx);
-        cx.notify();
-    }
-
-    pub fn kernel_errored(&mut self, error_message: String, cx: &mut Context<Self>) {
-        self.kernel(Kernel::ErroredLaunch(error_message.clone()), cx);
-
-        self.blocks.values().for_each(|block| {
-            block.execution_view.update(cx, |execution_view, cx| {
-                match execution_view.status {
-                    ExecutionStatus::Finished => {
-                        // Do nothing when the output was good
-                    }
-                    _ => {
-                        // All other cases, set the status to errored
-                        execution_view.status =
-                            ExecutionStatus::KernelErrored(error_message.clone())
-                    }
-                }
-                cx.notify();
-            });
-        });
-    }
-
-    fn on_buffer_event(
-        &mut self,
-        buffer: Entity<MultiBuffer>,
-        event: &multi_buffer::Event,
-        cx: &mut Context<Self>,
-    ) {
-        if let multi_buffer::Event::Edited { .. } = event {
-            let snapshot = buffer.read(cx).snapshot(cx);
-
-            let mut blocks_to_remove: HashSet<CustomBlockId> = HashSet::default();
-
-            self.blocks.retain(|_id, block| {
-                if block.invalidation_anchor.is_valid(&snapshot) {
-                    true
-                } else {
-                    blocks_to_remove.insert(block.block_id);
-                    false
-                }
-            });
-
-            if !blocks_to_remove.is_empty() {
-                self.editor
-                    .update(cx, |editor, cx| {
-                        editor.remove_blocks(blocks_to_remove, None, cx);
-                    })
-                    .ok();
-                cx.notify();
-            }
-        }
-    }
-
-    fn send(&mut self, message: JupyterMessage, _cx: &mut Context<Self>) -> anyhow::Result<()> {
-        if let Kernel::RunningKernel(kernel) = &mut self.kernel {
-            kernel.request_tx().try_send(message).ok();
-        }
-
-        anyhow::Ok(())
-    }
-
-    pub fn clear_outputs(&mut self, cx: &mut Context<Self>) {
-        let blocks_to_remove: HashSet<CustomBlockId> =
-            self.blocks.values().map(|block| block.block_id).collect();
-
-        self.editor
-            .update(cx, |editor, cx| {
-                editor.remove_blocks(blocks_to_remove, None, cx);
-            })
-            .ok();
-
-        self.blocks.clear();
-    }
-
-    pub fn execute(
-        &mut self,
-        code: String,
-        anchor_range: Range<Anchor>,
-        next_cell: Option<Anchor>,
-        move_down: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(editor) = self.editor.upgrade() else {
-            return;
-        };
-
-        if code.is_empty() {
-            return;
-        }
-
-        let execute_request = ExecuteRequest {
-            code,
-            ..ExecuteRequest::default()
-        };
-
-        let message: JupyterMessage = execute_request.into();
-
-        let mut blocks_to_remove: HashSet<CustomBlockId> = HashSet::default();
-
-        let buffer = editor.read(cx).buffer().read(cx).snapshot(cx);
-
-        self.blocks.retain(|_key, block| {
-            if anchor_range.overlaps(&block.code_range, &buffer) {
-                blocks_to_remove.insert(block.block_id);
-                false
-            } else {
-                true
-            }
-        });
-
-        self.editor
-            .update(cx, |editor, cx| {
-                editor.remove_blocks(blocks_to_remove, None, cx);
-            })
-            .ok();
-
-        let status = match &self.kernel {
-            Kernel::Restarting => ExecutionStatus::Restarting,
-            Kernel::RunningKernel(_) => ExecutionStatus::Queued,
-            Kernel::StartingKernel(_) => ExecutionStatus::ConnectingToKernel,
-            Kernel::ErroredLaunch(error) => ExecutionStatus::KernelErrored(error.clone()),
-            Kernel::ShuttingDown => ExecutionStatus::ShuttingDown,
-            Kernel::Shutdown => ExecutionStatus::Shutdown,
-        };
-
-        let parent_message_id = message.header.msg_id.clone();
-        let session_view = cx.entity().downgrade();
-        let weak_editor = self.editor.clone();
-
-        let on_close: CloseBlockFn = Arc::new(
-            move |block_id: CustomBlockId, _: &mut Window, cx: &mut App| {
-                if let Some(session) = session_view.upgrade() {
-                    session.update(cx, |session, cx| {
-                        session.blocks.remove(&parent_message_id);
-                        cx.notify();
-                    });
-                }
-
-                if let Some(editor) = weak_editor.upgrade() {
-                    editor.update(cx, |editor, cx| {
-                        let mut block_ids = HashSet::default();
-                        block_ids.insert(block_id);
-                        editor.remove_blocks(block_ids, None, cx);
-                    });
-                }
-            },
-        );
-
-        let Ok(editor_block) =
-            EditorBlock::new(self.editor.clone(), anchor_range, status, on_close, cx)
-        else {
-            return;
-        };
-
-        let new_cursor_pos = if let Some(next_cursor) = next_cell {
-            next_cursor
-        } else {
-            editor_block.invalidation_anchor
-        };
-
-        self.blocks
-            .insert(message.header.msg_id.clone(), editor_block);
-
-        match &self.kernel {
-            Kernel::RunningKernel(_) => {
-                self.send(message, cx).ok();
-            }
-            Kernel::StartingKernel(task) => {
-                // Queue up the execution as a task to run after the kernel starts
-                let task = task.clone();
-
-                cx.spawn(async move |this, cx| {
-                    task.await;
-                    this.update(cx, |session, cx| {
-                        session.send(message, cx).ok();
-                    })
-                    .ok();
-                })
-                .detach();
-            }
-            _ => {}
-        }
-
-        if move_down {
-            editor.update(cx, move |editor, cx| {
-                editor.change_selections(
-                    SelectionEffects::scroll(Autoscroll::top_relative(8)),
-                    window,
-                    cx,
-                    |selections| {
-                        selections.select_ranges([new_cursor_pos..new_cursor_pos]);
-                    },
-                );
-            });
-        }
-    }
-
-    pub fn route(&mut self, message: &JupyterMessage, window: &mut Window, cx: &mut Context<Self>) {
-        let parent_message_id = match message.parent_header.as_ref() {
-            Some(header) => &header.msg_id,
-            None => return,
-        };
-
-        match &message.content {
-            JupyterMessageContent::Status(status) => {
-                self.kernel.set_execution_state(&status.execution_state);
-
-                telemetry::event!(
-                    "Kernel Status Changed",
-                    kernel_language = self.kernel_specification.language(),
-                    kernel_status = KernelStatus::from(&self.kernel).to_string(),
-                    repl_session_id = cx.entity_id().to_string(),
-                );
-
-                cx.notify();
-            }
-            JupyterMessageContent::KernelInfoReply(reply) => {
-                self.kernel.set_kernel_info(reply);
-                cx.notify();
-            }
-            JupyterMessageContent::UpdateDisplayData(update) => {
-                let display_id = if let Some(display_id) = update.transient.display_id.clone() {
-                    display_id
-                } else {
-                    return;
-                };
-
-                self.blocks.iter_mut().for_each(|(_, block)| {
-                    block.execution_view.update(cx, |execution_view, cx| {
-                        execution_view.update_display_data(&update.data, &display_id, window, cx);
-                    });
-                });
-                return;
-            }
-            _ => {}
-        }
-
-        if let Some(block) = self.blocks.get_mut(parent_message_id) {
-            block.handle_message(message, window, cx);
-        }
-    }
-
-    pub fn interrupt(&mut self, cx: &mut Context<Self>) {
-        match &mut self.kernel {
-            Kernel::RunningKernel(_kernel) => {
-                self.send(InterruptRequest {}.into(), cx).ok();
-            }
-            Kernel::StartingKernel(_task) => {
-                // NOTE: If we switch to a literal queue instead of chaining on to the task, clear all queued executions
-            }
-            _ => {}
-        }
-    }
-
-    pub fn kernel(&mut self, kernel: Kernel, cx: &mut Context<Self>) {
-        if let Kernel::Shutdown = kernel {
-            cx.emit(SessionEvent::Shutdown(self.editor.clone()));
-        }
-
-        let kernel_status = KernelStatus::from(&kernel).to_string();
-        let kernel_language = self.kernel_specification.language();
-
-        telemetry::event!(
-            "Kernel Status Changed",
-            kernel_language,
-            kernel_status,
-            repl_session_id = cx.entity_id().to_string(),
-        );
-
-        self.kernel = kernel;
-    }
-
-    pub fn shutdown(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let kernel = std::mem::replace(&mut self.kernel, Kernel::ShuttingDown);
-
-        match kernel {
-            Kernel::RunningKernel(mut kernel) => {
-                let mut request_tx = kernel.request_tx();
-
-                let forced = kernel.force_shutdown(window, cx);
-
-                cx.spawn(async move |this, cx| {
-                    let message: JupyterMessage = ShutdownRequest { restart: false }.into();
-                    request_tx.try_send(message).ok();
-
-                    forced.await.log_err();
-
-                    // Give the kernel a bit of time to clean up
-                    cx.background_executor().timer(Duration::from_secs(3)).await;
-
-                    this.update(cx, |session, cx| {
-                        session.clear_outputs(cx);
-                        session.kernel(Kernel::Shutdown, cx);
-                        cx.notify();
-                    })
-                    .ok();
-                })
-                .detach();
-            }
-            _ => {
-                self.kernel(Kernel::Shutdown, cx);
-            }
-        }
-        cx.notify();
-    }
-
-    pub fn restart(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let kernel = std::mem::replace(&mut self.kernel, Kernel::Restarting);
-
-        match kernel {
-            Kernel::Restarting => {
-                // Do nothing if already restarting
-            }
-            Kernel::RunningKernel(mut kernel) => {
-                let mut request_tx = kernel.request_tx();
-
-                let forced = kernel.force_shutdown(window, cx);
-
-                cx.spawn_in(window, async move |this, cx| {
-                    // Send shutdown request with restart flag
-                    log::debug!("restarting kernel");
-                    let message: JupyterMessage = ShutdownRequest { restart: true }.into();
-                    request_tx.try_send(message).ok();
-
-                    // Wait for kernel to shutdown
-                    cx.background_executor().timer(Duration::from_secs(1)).await;
-
-                    // Force kill the kernel if it hasn't shut down
-                    forced.await.log_err();
-
-                    // Start a new kernel
-                    this.update_in(cx, |session, window, cx| {
-                        // TODO: Differentiate between restart and restart+clear-outputs
-                        session.clear_outputs(cx);
-                        session.start_kernel(window, cx);
-                    })
-                    .ok();
-                })
-                .detach();
-            }
-            _ => {
-                self.clear_outputs(cx);
-                self.start_kernel(window, cx);
-            }
-        }
-        cx.notify();
-    }
-}
-
-pub enum SessionEvent {
-    Shutdown(WeakEntity<Editor>),
-}
-
-impl EventEmitter<SessionEvent> for Session {}
-
-impl Render for Session {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let (status_text, interrupt_button) = match &self.kernel {
-            Kernel::RunningKernel(kernel) => (
-                kernel
-                    .kernel_info()
-                    .as_ref()
-                    .map(|info| info.language_info.name.clone()),
-                Some(
-                    Button::new("interrupt", "Interrupt")
-                        .style(ButtonStyle::Subtle)
-                        .on_click(cx.listener(move |session, _, _, cx| {
-                            session.interrupt(cx);
-                        })),
-                ),
-            ),
-            Kernel::StartingKernel(_) => (Some("Starting".into()), None),
-            Kernel::ErroredLaunch(err) => (Some(format!("Error: {err}")), None),
-            Kernel::ShuttingDown => (Some("Shutting Down".into()), None),
-            Kernel::Shutdown => (Some("Shutdown".into()), None),
-            Kernel::Restarting => (Some("Restarting".into()), None),
-        };
-
-        KernelListItem::new(self.kernel_specification.clone())
-            .status_color(match &self.kernel {
-                Kernel::RunningKernel(kernel) => match kernel.execution_state() {
-                    ExecutionState::Idle => Color::Success,
-                    ExecutionState::Busy => Color::Modified,
-                    ExecutionState::Unknown => Color::Modified,
-                    ExecutionState::Starting => Color::Modified,
-                    ExecutionState::Restarting => Color::Modified,
-                    ExecutionState::Terminating => Color::Disabled,
-                    ExecutionState::AutoRestarting => Color::Modified,
-                    ExecutionState::Dead => Color::Disabled,
-                    ExecutionState::Other(_) => Color::Modified,
-                },
-                Kernel::StartingKernel(_) => Color::Modified,
-                Kernel::ErroredLaunch(_) => Color::Error,
-                Kernel::ShuttingDown => Color::Modified,
-                Kernel::Shutdown => Color::Disabled,
-                Kernel::Restarting => Color::Modified,
-            })
-            .child(Label::new(self.kernel_specification.name()))
-            .children(status_text.map(|status_text| Label::new(format!("({status_text})"))))
-            .button(
-                Button::new("shutdown", "Shutdown")
-                    .style(ButtonStyle::Subtle)
-                    .disabled(self.kernel.is_shutting_down())
-                    .on_click(cx.listener(move |session, _, window, cx| {
-                        session.shutdown(window, cx);
-                    })),
-            )
-            .buttons(interrupt_button)
-    }
-}
diff --git a/crates/rich_text/Cargo.toml b/crates/rich_text/Cargo.toml
deleted file mode 100644
index 17bd8d2a4b..0000000000
--- a/crates/rich_text/Cargo.toml
+++ /dev/null
@@ -1,29 +0,0 @@
-[package]
-name = "rich_text"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/rich_text.rs"
-doctest = false
-
-[features]
-test-support = [
-    "gpui/test-support",
-    "util/test-support",
-]
-
-[dependencies]
-futures.workspace = true
-gpui.workspace = true
-language.workspace = true
-linkify.workspace = true
-pulldown-cmark.workspace = true
-theme.workspace = true
-ui.workspace = true
-util.workspace = true
diff --git a/crates/rich_text/LICENSE-GPL b/crates/rich_text/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/rich_text/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/rich_text/src/rich_text.rs b/crates/rich_text/src/rich_text.rs
deleted file mode 100644
index 2af9988f03..0000000000
--- a/crates/rich_text/src/rich_text.rs
+++ /dev/null
@@ -1,418 +0,0 @@
-use futures::FutureExt;
-use gpui::{
-    AnyElement, AnyView, App, ElementId, FontStyle, FontWeight, HighlightStyle, InteractiveText,
-    IntoElement, SharedString, StrikethroughStyle, StyledText, UnderlineStyle, Window,
-};
-use language::{HighlightId, Language, LanguageRegistry};
-use std::{ops::Range, sync::Arc};
-use theme::ActiveTheme;
-use ui::LinkPreview;
-use util::RangeExt;
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum Highlight {
-    Code,
-    Id(HighlightId),
-    InlineCode(bool),
-    Highlight(HighlightStyle),
-    Mention,
-    SelfMention,
-}
-
-impl From<HighlightStyle> for Highlight {
-    fn from(style: HighlightStyle) -> Self {
-        Self::Highlight(style)
-    }
-}
-
-impl From<HighlightId> for Highlight {
-    fn from(style: HighlightId) -> Self {
-        Self::Id(style)
-    }
-}
-
-#[derive(Clone, Default)]
-pub struct RichText {
-    pub text: SharedString,
-    pub highlights: Vec<(Range<usize>, Highlight)>,
-    pub link_ranges: Vec<Range<usize>>,
-    pub link_urls: Arc<[String]>,
-
-    pub custom_ranges: Vec<Range<usize>>,
-    custom_ranges_tooltip_fn:
-        Option<Arc<dyn Fn(usize, Range<usize>, &mut Window, &mut App) -> Option<AnyView>>>,
-}
-
-/// Allows one to specify extra links to the rendered markdown, which can be used
-/// for e.g. mentions.
-#[derive(Debug)]
-pub struct Mention {
-    pub range: Range<usize>,
-    pub is_self_mention: bool,
-}
-
-impl RichText {
-    pub fn new(
-        block: String,
-        mentions: &[Mention],
-        language_registry: &Arc<LanguageRegistry>,
-    ) -> Self {
-        let mut text = String::new();
-        let mut highlights = Vec::new();
-        let mut link_ranges = Vec::new();
-        let mut link_urls = Vec::new();
-        render_markdown_mut(
-            &block,
-            mentions,
-            language_registry,
-            None,
-            &mut text,
-            &mut highlights,
-            &mut link_ranges,
-            &mut link_urls,
-        );
-        text.truncate(text.trim_end().len());
-
-        RichText {
-            text: SharedString::from(text),
-            link_urls: link_urls.into(),
-            link_ranges,
-            highlights,
-            custom_ranges: Vec::new(),
-            custom_ranges_tooltip_fn: None,
-        }
-    }
-
-    pub fn set_tooltip_builder_for_custom_ranges(
-        &mut self,
-        f: impl Fn(usize, Range<usize>, &mut Window, &mut App) -> Option<AnyView> + 'static,
-    ) {
-        self.custom_ranges_tooltip_fn = Some(Arc::new(f));
-    }
-
-    pub fn element(&self, id: ElementId, window: &mut Window, cx: &mut App) -> AnyElement {
-        let theme = cx.theme();
-        let code_background = theme.colors().surface_background;
-
-        InteractiveText::new(
-            id,
-            StyledText::new(self.text.clone()).with_default_highlights(
-                &window.text_style(),
-                self.highlights.iter().map(|(range, highlight)| {
-                    (
-                        range.clone(),
-                        match highlight {
-                            Highlight::Code => HighlightStyle {
-                                background_color: Some(code_background),
-                                ..Default::default()
-                            },
-                            Highlight::Id(id) => HighlightStyle {
-                                background_color: Some(code_background),
-                                ..id.style(theme.syntax()).unwrap_or_default()
-                            },
-                            Highlight::InlineCode(link) => {
-                                if *link {
-                                    HighlightStyle {
-                                        background_color: Some(code_background),
-                                        underline: Some(UnderlineStyle {
-                                            thickness: 1.0.into(),
-                                            ..Default::default()
-                                        }),
-                                        ..Default::default()
-                                    }
-                                } else {
-                                    HighlightStyle {
-                                        background_color: Some(code_background),
-                                        ..Default::default()
-                                    }
-                                }
-                            }
-                            Highlight::Highlight(highlight) => *highlight,
-                            Highlight::Mention => HighlightStyle {
-                                font_weight: Some(FontWeight::BOLD),
-                                ..Default::default()
-                            },
-                            Highlight::SelfMention => HighlightStyle {
-                                font_weight: Some(FontWeight::BOLD),
-                                ..Default::default()
-                            },
-                        },
-                    )
-                }),
-            ),
-        )
-        .on_click(self.link_ranges.clone(), {
-            let link_urls = self.link_urls.clone();
-            move |ix, _, cx| {
-                let url = &link_urls[ix];
-                if url.starts_with("http") {
-                    cx.open_url(url);
-                }
-            }
-        })
-        .tooltip({
-            let link_ranges = self.link_ranges.clone();
-            let link_urls = self.link_urls.clone();
-            let custom_tooltip_ranges = self.custom_ranges.clone();
-            let custom_tooltip_fn = self.custom_ranges_tooltip_fn.clone();
-            move |idx, window, cx| {
-                for (ix, range) in link_ranges.iter().enumerate() {
-                    if range.contains(&idx) {
-                        return Some(LinkPreview::new(&link_urls[ix], cx));
-                    }
-                }
-                for range in &custom_tooltip_ranges {
-                    if range.contains(&idx)
-                        && let Some(f) = &custom_tooltip_fn
-                    {
-                        return f(idx, range.clone(), window, cx);
-                    }
-                }
-                None
-            }
-        })
-        .into_any_element()
-    }
-}
-
-pub fn render_markdown_mut(
-    block: &str,
-    mut mentions: &[Mention],
-    language_registry: &Arc<LanguageRegistry>,
-    language: Option<&Arc<Language>>,
-    text: &mut String,
-    highlights: &mut Vec<(Range<usize>, Highlight)>,
-    link_ranges: &mut Vec<Range<usize>>,
-    link_urls: &mut Vec<String>,
-) {
-    use pulldown_cmark::{CodeBlockKind, Event, Options, Parser, Tag, TagEnd};
-
-    let mut bold_depth = 0;
-    let mut italic_depth = 0;
-    let mut strikethrough_depth = 0;
-    let mut link_url = None;
-    let mut current_language = None;
-    let mut list_stack = Vec::new();
-
-    let mut options = Options::all();
-    options.remove(pulldown_cmark::Options::ENABLE_DEFINITION_LIST);
-
-    for (event, source_range) in Parser::new_ext(block, options).into_offset_iter() {
-        let prev_len = text.len();
-        match event {
-            Event::Text(t) => {
-                if let Some(language) = &current_language {
-                    render_code(text, highlights, t.as_ref(), language);
-                } else {
-                    while let Some(mention) = mentions.first() {
-                        if !source_range.contains_inclusive(&mention.range) {
-                            break;
-                        }
-                        mentions = &mentions[1..];
-                        let range = (prev_len + mention.range.start - source_range.start)
-                            ..(prev_len + mention.range.end - source_range.start);
-                        highlights.push((
-                            range.clone(),
-                            if mention.is_self_mention {
-                                Highlight::SelfMention
-                            } else {
-                                Highlight::Mention
-                            },
-                        ));
-                    }
-
-                    text.push_str(t.as_ref());
-                    let mut style = HighlightStyle::default();
-                    if bold_depth > 0 {
-                        style.font_weight = Some(FontWeight::BOLD);
-                    }
-                    if italic_depth > 0 {
-                        style.font_style = Some(FontStyle::Italic);
-                    }
-                    if strikethrough_depth > 0 {
-                        style.strikethrough = Some(StrikethroughStyle {
-                            thickness: 1.0.into(),
-                            ..Default::default()
-                        });
-                    }
-                    let last_run_len = if let Some(link_url) = link_url.clone() {
-                        link_ranges.push(prev_len..text.len());
-                        link_urls.push(link_url);
-                        style.underline = Some(UnderlineStyle {
-                            thickness: 1.0.into(),
-                            ..Default::default()
-                        });
-                        prev_len
-                    } else {
-                        // Manually scan for links
-                        let mut finder = linkify::LinkFinder::new();
-                        finder.kinds(&[linkify::LinkKind::Url]);
-                        let mut last_link_len = prev_len;
-                        for link in finder.links(&t) {
-                            let start = link.start();
-                            let end = link.end();
-                            let range = (prev_len + start)..(prev_len + end);
-                            link_ranges.push(range.clone());
-                            link_urls.push(link.as_str().to_string());
-
-                            // If there is a style before we match a link, we have to add this to the highlighted ranges
-                            if style != HighlightStyle::default() && last_link_len < link.start() {
-                                highlights.push((
-                                    last_link_len..link.start(),
-                                    Highlight::Highlight(style),
-                                ));
-                            }
-
-                            highlights.push((
-                                range,
-                                Highlight::Highlight(HighlightStyle {
-                                    underline: Some(UnderlineStyle {
-                                        thickness: 1.0.into(),
-                                        ..Default::default()
-                                    }),
-                                    ..style
-                                }),
-                            ));
-
-                            last_link_len = end;
-                        }
-                        last_link_len
-                    };
-
-                    if style != HighlightStyle::default() && last_run_len < text.len() {
-                        let mut new_highlight = true;
-                        if let Some((last_range, last_style)) = highlights.last_mut()
-                            && last_range.end == last_run_len
-                            && last_style == &Highlight::Highlight(style)
-                        {
-                            last_range.end = text.len();
-                            new_highlight = false;
-                        }
-                        if new_highlight {
-                            highlights
-                                .push((last_run_len..text.len(), Highlight::Highlight(style)));
-                        }
-                    }
-                }
-            }
-            Event::Code(t) => {
-                text.push_str(t.as_ref());
-                let is_link = link_url.is_some();
-
-                if let Some(link_url) = link_url.clone() {
-                    link_ranges.push(prev_len..text.len());
-                    link_urls.push(link_url);
-                }
-
-                highlights.push((prev_len..text.len(), Highlight::InlineCode(is_link)))
-            }
-            Event::Start(tag) => match tag {
-                Tag::Paragraph => new_paragraph(text, &mut list_stack),
-                Tag::Heading { .. } => {
-                    new_paragraph(text, &mut list_stack);
-                    bold_depth += 1;
-                }
-                Tag::CodeBlock(kind) => {
-                    new_paragraph(text, &mut list_stack);
-                    current_language = if let CodeBlockKind::Fenced(language) = kind {
-                        language_registry
-                            .language_for_name(language.as_ref())
-                            .now_or_never()
-                            .and_then(Result::ok)
-                    } else {
-                        language.cloned()
-                    }
-                }
-                Tag::Emphasis => italic_depth += 1,
-                Tag::Strong => bold_depth += 1,
-                Tag::Strikethrough => strikethrough_depth += 1,
-                Tag::Link { dest_url, .. } => link_url = Some(dest_url.to_string()),
-                Tag::List(number) => {
-                    list_stack.push((number, false));
-                }
-                Tag::Item => {
-                    let len = list_stack.len();
-                    if let Some((list_number, has_content)) = list_stack.last_mut() {
-                        *has_content = false;
-                        if !text.is_empty() && !text.ends_with('\n') {
-                            text.push('\n');
-                        }
-                        for _ in 0..len - 1 {
-                            text.push_str("  ");
-                        }
-                        if let Some(number) = list_number {
-                            text.push_str(&format!("{}. ", number));
-                            *number += 1;
-                            *has_content = false;
-                        } else {
-                            text.push_str("- ");
-                        }
-                    }
-                }
-                _ => {}
-            },
-            Event::End(tag) => match tag {
-                TagEnd::Heading(_) => bold_depth -= 1,
-                TagEnd::CodeBlock => current_language = None,
-                TagEnd::Emphasis => italic_depth -= 1,
-                TagEnd::Strong => bold_depth -= 1,
-                TagEnd::Strikethrough => strikethrough_depth -= 1,
-                TagEnd::Link => link_url = None,
-                TagEnd::List(_) => drop(list_stack.pop()),
-                _ => {}
-            },
-            Event::HardBreak => text.push('\n'),
-            Event::SoftBreak => text.push('\n'),
-            _ => {}
-        }
-    }
-}
-
-pub fn render_code(
-    text: &mut String,
-    highlights: &mut Vec<(Range<usize>, Highlight)>,
-    content: &str,
-    language: &Arc<Language>,
-) {
-    let prev_len = text.len();
-    text.push_str(content);
-    let mut offset = 0;
-    for (range, highlight_id) in language.highlight_text(&content.into(), 0..content.len()) {
-        if range.start > offset {
-            highlights.push((prev_len + offset..prev_len + range.start, Highlight::Code));
-        }
-        highlights.push((
-            prev_len + range.start..prev_len + range.end,
-            Highlight::Id(highlight_id),
-        ));
-        offset = range.end;
-    }
-    if offset < content.len() {
-        highlights.push((prev_len + offset..prev_len + content.len(), Highlight::Code));
-    }
-}
-
-pub fn new_paragraph(text: &mut String, list_stack: &mut Vec<(Option<u64>, bool)>) {
-    let mut is_subsequent_paragraph_of_list = false;
-    if let Some((_, has_content)) = list_stack.last_mut() {
-        if *has_content {
-            is_subsequent_paragraph_of_list = true;
-        } else {
-            *has_content = true;
-            return;
-        }
-    }
-
-    if !text.is_empty() {
-        if !text.ends_with('\n') {
-            text.push('\n');
-        }
-        text.push('\n');
-    }
-    for _ in 0..list_stack.len().saturating_sub(1) {
-        text.push_str("  ");
-    }
-    if is_subsequent_paragraph_of_list {
-        text.push_str("  ");
-    }
-}
diff --git a/crates/rope/Cargo.toml b/crates/rope/Cargo.toml
deleted file mode 100644
index 9f0fc2be8a..0000000000
--- a/crates/rope/Cargo.toml
+++ /dev/null
@@ -1,37 +0,0 @@
-[package]
-name = "rope"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/rope.rs"
-
-[dependencies]
-arrayvec = "0.7.1"
-log.workspace = true
-rayon.workspace = true
-sum_tree.workspace = true
-unicode-segmentation.workspace = true
-util.workspace = true
-ztracing.workspace = true
-tracing.workspace = true
-
-[dev-dependencies]
-ctor.workspace = true
-gpui = { workspace = true, features = ["test-support"] }
-rand.workspace = true
-util = { workspace = true, features = ["test-support"] }
-criterion.workspace = true
-zlog.workspace = true
-
-[[bench]]
-name = "rope_benchmark"
-harness = false
-
-[package.metadata.cargo-machete]
-ignored = ["tracing"]
diff --git a/crates/rope/LICENSE-GPL b/crates/rope/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/rope/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/rope/benches/rope_benchmark.rs b/crates/rope/benches/rope_benchmark.rs
deleted file mode 100644
index 8599328aac..0000000000
--- a/crates/rope/benches/rope_benchmark.rs
+++ /dev/null
@@ -1,273 +0,0 @@
-use std::ops::Range;
-
-use criterion::{
-    BatchSize, BenchmarkId, Criterion, Throughput, black_box, criterion_group, criterion_main,
-};
-use rand::prelude::*;
-use rand::rngs::StdRng;
-use rope::{Point, Rope};
-use sum_tree::Bias;
-use util::RandomCharIter;
-
-/// Returns a biased random string whose UTF-8 length is close to but no more than `len` bytes.
-///
-/// The string is biased towards characters expected to occur in text or likely to exercise edge
-/// cases.
-fn generate_random_text(rng: &mut StdRng, len: usize) -> String {
-    let mut str = String::with_capacity(len);
-    let mut chars = RandomCharIter::new(rng);
-    loop {
-        let ch = chars.next().unwrap();
-        if str.len() + ch.len_utf8() > len {
-            break;
-        }
-        str.push(ch);
-    }
-    str
-}
-
-fn generate_random_rope(rng: &mut StdRng, text_len: usize) -> Rope {
-    let text = generate_random_text(rng, text_len);
-    let mut rope = Rope::new();
-    rope.push(&text);
-    rope
-}
-
-fn generate_random_rope_ranges(rng: &mut StdRng, rope: &Rope) -> Vec<Range<usize>> {
-    let range_max_len = 50;
-    let num_ranges = rope.len() / range_max_len;
-
-    let mut ranges = Vec::new();
-    let mut start = 0;
-    for _ in 0..num_ranges {
-        let range_start = rope.clip_offset(
-            rng.random_range(start..=(start + range_max_len)),
-            sum_tree::Bias::Left,
-        );
-        let range_end = rope.clip_offset(
-            rng.random_range(range_start..(range_start + range_max_len)),
-            sum_tree::Bias::Right,
-        );
-
-        let range = range_start..range_end;
-        if !range.is_empty() {
-            ranges.push(range);
-        }
-
-        start = range_end + 1;
-    }
-
-    ranges
-}
-
-fn generate_random_rope_points(rng: &mut StdRng, rope: &Rope) -> Vec<Point> {
-    let num_points = rope.len() / 10;
-
-    let mut points = Vec::new();
-    for _ in 0..num_points {
-        points.push(rope.offset_to_point(rng.random_range(0..rope.len())));
-    }
-    points
-}
-
-fn rope_benchmarks(c: &mut Criterion) {
-    static SEED: u64 = 9999;
-    static KB: usize = 1024;
-
-    let sizes = [4 * KB, 64 * KB];
-
-    let mut group = c.benchmark_group("push");
-    for size in sizes.iter() {
-        group.throughput(Throughput::Bytes(*size as u64));
-        group.bench_with_input(BenchmarkId::from_parameter(size), &size, |b, &size| {
-            let mut rng = StdRng::seed_from_u64(SEED);
-            let text = generate_random_text(&mut rng, *size);
-
-            b.iter(|| {
-                let mut rope = Rope::new();
-                for _ in 0..10 {
-                    rope.push(&text);
-                }
-            });
-        });
-    }
-    group.finish();
-
-    let mut group = c.benchmark_group("append");
-    for size in sizes.iter() {
-        group.throughput(Throughput::Bytes(*size as u64));
-        group.bench_with_input(BenchmarkId::from_parameter(size), &size, |b, &size| {
-            let mut rng = StdRng::seed_from_u64(SEED);
-            let mut random_ropes = Vec::new();
-            for _ in 0..5 {
-                let rope = generate_random_rope(&mut rng, *size);
-                random_ropes.push(rope);
-            }
-
-            b.iter(|| {
-                let mut rope_b = Rope::new();
-                for rope in &random_ropes {
-                    rope_b.append(rope.clone())
-                }
-            });
-        });
-    }
-    group.finish();
-
-    let mut group = c.benchmark_group("slice");
-    for size in sizes.iter() {
-        group.throughput(Throughput::Bytes(*size as u64));
-        group.bench_with_input(BenchmarkId::from_parameter(size), &size, |b, &size| {
-            let mut rng = StdRng::seed_from_u64(SEED);
-            let rope = generate_random_rope(&mut rng, *size);
-
-            b.iter_batched(
-                || generate_random_rope_ranges(&mut rng, &rope),
-                |ranges| {
-                    for range in ranges.iter() {
-                        rope.slice(range.clone());
-                    }
-                },
-                BatchSize::SmallInput,
-            );
-        });
-    }
-    group.finish();
-
-    let mut group = c.benchmark_group("bytes_in_range");
-    for size in sizes.iter() {
-        group.throughput(Throughput::Bytes(*size as u64));
-        group.bench_with_input(BenchmarkId::from_parameter(size), &size, |b, &size| {
-            let mut rng = StdRng::seed_from_u64(SEED);
-            let rope = generate_random_rope(&mut rng, *size);
-
-            b.iter_batched(
-                || generate_random_rope_ranges(&mut rng, &rope),
-                |ranges| {
-                    for range in ranges.iter() {
-                        let bytes = rope.bytes_in_range(range.clone());
-                        assert!(bytes.into_iter().count() > 0);
-                    }
-                },
-                BatchSize::SmallInput,
-            );
-        });
-    }
-    group.finish();
-
-    let mut group = c.benchmark_group("chars");
-    for size in sizes.iter() {
-        group.throughput(Throughput::Bytes(*size as u64));
-        group.bench_with_input(BenchmarkId::from_parameter(size), &size, |b, &size| {
-            let mut rng = StdRng::seed_from_u64(SEED);
-            let rope = generate_random_rope(&mut rng, *size);
-
-            b.iter(|| {
-                let chars = rope.chars().count();
-                assert!(chars > 0);
-            });
-        });
-    }
-    group.finish();
-
-    let mut group = c.benchmark_group("clip_point");
-    for size in sizes.iter() {
-        group.throughput(Throughput::Bytes(*size as u64));
-        group.bench_with_input(BenchmarkId::from_parameter(size), &size, |b, &size| {
-            let mut rng = StdRng::seed_from_u64(SEED);
-            let rope = generate_random_rope(&mut rng, *size);
-
-            b.iter_batched(
-                || generate_random_rope_points(&mut rng, &rope),
-                |offsets| {
-                    for offset in offsets.iter() {
-                        black_box(rope.clip_point(*offset, Bias::Left));
-                        black_box(rope.clip_point(*offset, Bias::Right));
-                    }
-                },
-                BatchSize::SmallInput,
-            );
-        });
-    }
-    group.finish();
-
-    let mut group = c.benchmark_group("point_to_offset");
-    for size in sizes.iter() {
-        group.throughput(Throughput::Bytes(*size as u64));
-        group.bench_with_input(BenchmarkId::from_parameter(size), &size, |b, &size| {
-            let mut rng = StdRng::seed_from_u64(SEED);
-            let rope = generate_random_rope(&mut rng, *size);
-
-            b.iter_batched(
-                || generate_random_rope_points(&mut rng, &rope),
-                |offsets| {
-                    for offset in offsets.iter() {
-                        black_box(rope.point_to_offset(*offset));
-                    }
-                },
-                BatchSize::SmallInput,
-            );
-        });
-    }
-    group.finish();
-
-    let mut group = c.benchmark_group("cursor");
-    for size in sizes.iter() {
-        group.throughput(Throughput::Bytes(*size as u64));
-        group.bench_with_input(BenchmarkId::from_parameter(size), &size, |b, &size| {
-            let mut rng = StdRng::seed_from_u64(SEED);
-            let rope = generate_random_rope(&mut rng, *size);
-
-            b.iter_batched(
-                || {
-                    let num_points = rope.len() / 10;
-
-                    let mut points = Vec::new();
-                    for _ in 0..num_points {
-                        points.push(rng.random_range(0..rope.len()));
-                    }
-                    points
-                },
-                |offsets| {
-                    for offset in offsets.iter() {
-                        black_box(rope.cursor(*offset));
-                    }
-                },
-                BatchSize::SmallInput,
-            );
-        });
-    }
-    group.finish();
-
-    let mut group = c.benchmark_group("append many");
-    group.throughput(Throughput::Bytes(128 * 100_000));
-
-    group.bench_function("small to large", |b| {
-        b.iter(|| {
-            let mut rope = Rope::new();
-            let small = Rope::from("A".repeat(128));
-            for _ in 0..100_000 {
-                rope.append(small.clone());
-            }
-            assert_eq!(rope.len(), 128 * 100_000);
-        });
-    });
-
-    group.bench_function("large to small", |b| {
-        b.iter(|| {
-            let mut rope = Rope::new();
-            let small = Rope::from("A".repeat(128));
-            for _ in 0..100_000 {
-                let large = rope;
-                rope = small.clone();
-                rope.append(large);
-            }
-            assert_eq!(rope.len(), 128 * 100_000);
-        });
-    });
-
-    group.finish();
-}
-
-criterion_group!(benches, rope_benchmarks);
-criterion_main!(benches);
diff --git a/crates/rope/src/chunk.rs b/crates/rope/src/chunk.rs
deleted file mode 100644
index a2a8e8d58d..0000000000
--- a/crates/rope/src/chunk.rs
+++ /dev/null
@@ -1,1141 +0,0 @@
-use crate::{OffsetUtf16, Point, PointUtf16, TextSummary, Unclipped};
-use arrayvec::ArrayString;
-use std::{cmp, ops::Range};
-use sum_tree::Bias;
-use unicode_segmentation::GraphemeCursor;
-use util::debug_panic;
-
-#[cfg(not(all(test, not(rust_analyzer))))]
-pub(crate) type Bitmap = u128;
-#[cfg(all(test, not(rust_analyzer)))]
-pub(crate) type Bitmap = u16;
-
-pub(crate) const MIN_BASE: usize = MAX_BASE / 2;
-pub(crate) const MAX_BASE: usize = Bitmap::BITS as usize;
-
-#[derive(Clone, Debug, Default)]
-pub struct Chunk {
-    /// If bit[i] is set, then the character at index i is the start of a UTF-8 character in the
-    /// text.
-    chars: Bitmap,
-    /// The number of set bits is the number of UTF-16 code units it would take to represent the
-    /// text.
-    ///
-    /// Bit[i] is set if text[i] is the start of a UTF-8 character. If the character would
-    /// take two UTF-16 code units, then bit[i+1] is also set. (Rust chars never take more
-    /// than two UTF-16 code units.)
-    chars_utf16: Bitmap,
-    /// If bit[i] is set, then the character at index i is an ascii newline.
-    newlines: Bitmap,
-    /// If bit[i] is set, then the character at index i is an ascii tab.
-    tabs: Bitmap,
-    pub text: ArrayString<MAX_BASE>,
-}
-
-#[inline(always)]
-const fn saturating_shl_mask(offset: u32) -> Bitmap {
-    (1 as Bitmap).unbounded_shl(offset).wrapping_sub(1)
-}
-
-#[inline(always)]
-const fn saturating_shr_mask(offset: u32) -> Bitmap {
-    !Bitmap::MAX.unbounded_shr(offset)
-}
-
-impl Chunk {
-    pub const MASK_BITS: usize = Bitmap::BITS as usize;
-
-    #[inline(always)]
-    pub fn new(text: &str) -> Self {
-        let mut this = Chunk::default();
-        this.push_str(text);
-        this
-    }
-
-    #[inline(always)]
-    pub fn push_str(&mut self, text: &str) {
-        for (char_ix, c) in text.char_indices() {
-            let ix = self.text.len() + char_ix;
-            self.chars |= 1 << ix;
-            self.chars_utf16 |= 1 << ix;
-            self.chars_utf16 |= (c.len_utf16() as Bitmap) << ix;
-            self.newlines |= ((c == '\n') as Bitmap) << ix;
-            self.tabs |= ((c == '\t') as Bitmap) << ix;
-        }
-        self.text.push_str(text);
-    }
-
-    #[inline(always)]
-    pub fn append(&mut self, slice: ChunkSlice) {
-        if slice.is_empty() {
-            return;
-        };
-
-        let base_ix = self.text.len();
-        self.chars |= slice.chars << base_ix;
-        self.chars_utf16 |= slice.chars_utf16 << base_ix;
-        self.newlines |= slice.newlines << base_ix;
-        self.tabs |= slice.tabs << base_ix;
-        self.text.push_str(slice.text);
-    }
-
-    #[inline(always)]
-    pub fn as_slice(&self) -> ChunkSlice<'_> {
-        ChunkSlice {
-            chars: self.chars,
-            chars_utf16: self.chars_utf16,
-            newlines: self.newlines,
-            tabs: self.tabs,
-            text: &self.text,
-        }
-    }
-
-    #[inline(always)]
-    pub fn slice(&self, range: Range<usize>) -> ChunkSlice<'_> {
-        self.as_slice().slice(range)
-    }
-
-    #[inline(always)]
-    pub fn chars(&self) -> Bitmap {
-        self.chars
-    }
-
-    pub fn tabs(&self) -> Bitmap {
-        self.tabs
-    }
-
-    #[inline(always)]
-    pub fn is_char_boundary(&self, offset: usize) -> bool {
-        (1 as Bitmap).unbounded_shl(offset as u32) & self.chars != 0 || offset == self.text.len()
-    }
-
-    pub fn floor_char_boundary(&self, index: usize) -> usize {
-        if index >= self.text.len() {
-            self.text.len()
-        } else {
-            let mut i = index;
-            while i > 0 {
-                if util::is_utf8_char_boundary(self.text.as_bytes()[i]) {
-                    break;
-                }
-                i -= 1;
-            }
-
-            i
-        }
-    }
-
-    #[track_caller]
-    #[inline(always)]
-    pub fn assert_char_boundary<const PANIC: bool>(&self, offset: usize) -> bool {
-        if self.is_char_boundary(offset) {
-            return true;
-        }
-        if PANIC {
-            panic_char_boundary(&self.text, offset);
-        } else {
-            log_err_char_boundary(&self.text, offset);
-            false
-        }
-    }
-}
-
-#[derive(Clone, Copy, Debug)]
-pub struct ChunkSlice<'a> {
-    chars: Bitmap,
-    chars_utf16: Bitmap,
-    newlines: Bitmap,
-    tabs: Bitmap,
-    text: &'a str,
-}
-
-impl Into<Chunk> for ChunkSlice<'_> {
-    fn into(self) -> Chunk {
-        Chunk {
-            chars: self.chars,
-            chars_utf16: self.chars_utf16,
-            newlines: self.newlines,
-            tabs: self.tabs,
-            text: self.text.try_into().unwrap(),
-        }
-    }
-}
-
-impl<'a> ChunkSlice<'a> {
-    #[inline(always)]
-    pub fn is_empty(&self) -> bool {
-        self.text.is_empty()
-    }
-
-    #[inline(always)]
-    pub fn is_char_boundary(&self, offset: usize) -> bool {
-        (1 as Bitmap).unbounded_shl(offset as u32) & self.chars != 0 || offset == self.text.len()
-    }
-
-    #[inline(always)]
-    pub fn split_at(self, mid: usize) -> (ChunkSlice<'a>, ChunkSlice<'a>) {
-        if mid == MAX_BASE {
-            let left = self;
-            let right = ChunkSlice {
-                chars: 0,
-                chars_utf16: 0,
-                newlines: 0,
-                tabs: 0,
-                text: "",
-            };
-            (left, right)
-        } else {
-            let mask = ((1 as Bitmap) << mid) - 1;
-            let (left_text, right_text) = self.text.split_at(mid);
-            let left = ChunkSlice {
-                chars: self.chars & mask,
-                chars_utf16: self.chars_utf16 & mask,
-                newlines: self.newlines & mask,
-                tabs: self.tabs & mask,
-                text: left_text,
-            };
-            let right = ChunkSlice {
-                chars: self.chars >> mid,
-                chars_utf16: self.chars_utf16 >> mid,
-                newlines: self.newlines >> mid,
-                tabs: self.tabs >> mid,
-                text: right_text,
-            };
-            (left, right)
-        }
-    }
-
-    #[inline(always)]
-    pub fn slice(self, mut range: Range<usize>) -> Self {
-        if range.start == MAX_BASE {
-            Self {
-                chars: 0,
-                chars_utf16: 0,
-                newlines: 0,
-                tabs: 0,
-                text: "",
-            }
-        } else {
-            if !self.assert_char_boundary::<false>(range.start) {
-                range.start = self.text.ceil_char_boundary(range.start);
-            }
-            if !self.assert_char_boundary::<false>(range.end) {
-                range.end = if range.end < range.start {
-                    range.start
-                } else {
-                    self.text.floor_char_boundary(range.end)
-                };
-            }
-            let mask = (1 as Bitmap)
-                .unbounded_shl(range.end as u32)
-                .wrapping_sub(1);
-            Self {
-                chars: (self.chars & mask) >> range.start,
-                chars_utf16: (self.chars_utf16 & mask) >> range.start,
-                newlines: (self.newlines & mask) >> range.start,
-                tabs: (self.tabs & mask) >> range.start,
-                text: &self.text[range],
-            }
-        }
-    }
-
-    #[inline(always)]
-    pub fn text_summary(&self) -> TextSummary {
-        let mut chars = 0;
-        let (longest_row, longest_row_chars) = self.longest_row(&mut chars);
-        TextSummary {
-            len: self.len(),
-            chars,
-            len_utf16: self.len_utf16(),
-            lines: self.lines(),
-            first_line_chars: self.first_line_chars(),
-            last_line_chars: self.last_line_chars(),
-            last_line_len_utf16: self.last_line_len_utf16(),
-            longest_row,
-            longest_row_chars,
-        }
-    }
-
-    /// Get length in bytes
-    #[inline(always)]
-    pub fn len(&self) -> usize {
-        self.text.len()
-    }
-
-    /// Get length in UTF-16 code units
-    #[inline(always)]
-    pub fn len_utf16(&self) -> OffsetUtf16 {
-        OffsetUtf16(self.chars_utf16.count_ones() as usize)
-    }
-
-    /// Get point representing number of lines and length of last line
-    #[inline(always)]
-    pub fn lines(&self) -> Point {
-        let row = self.newlines.count_ones();
-        let column = self.newlines.leading_zeros() - (Bitmap::BITS - self.text.len() as u32);
-        Point::new(row, column)
-    }
-
-    /// Get number of chars in first line
-    #[inline(always)]
-    pub fn first_line_chars(&self) -> u32 {
-        (self.chars & saturating_shl_mask(self.newlines.trailing_zeros())).count_ones()
-    }
-
-    /// Get number of chars in last line
-    #[inline(always)]
-    pub fn last_line_chars(&self) -> u32 {
-        (self.chars & saturating_shr_mask(self.newlines.leading_zeros())).count_ones()
-    }
-
-    /// Get number of UTF-16 code units in last line
-    #[inline(always)]
-    pub fn last_line_len_utf16(&self) -> u32 {
-        (self.chars_utf16 & saturating_shr_mask(self.newlines.leading_zeros())).count_ones()
-    }
-
-    /// Get the longest row in the chunk and its length in characters.
-    /// Calculate the total number of characters in the chunk along the way.
-    #[inline(always)]
-    pub fn longest_row(&self, total_chars: &mut usize) -> (u32, u32) {
-        let mut chars = self.chars;
-        let mut newlines = self.newlines;
-        *total_chars = 0;
-        let mut row = 0;
-        let mut longest_row = 0;
-        let mut longest_row_chars = 0;
-        while newlines > 0 {
-            let newline_ix = newlines.trailing_zeros();
-            let row_chars = (chars & ((1 << newline_ix) - 1)).count_ones() as u8;
-            *total_chars += usize::from(row_chars);
-            if row_chars > longest_row_chars {
-                longest_row = row;
-                longest_row_chars = row_chars;
-            }
-
-            newlines >>= newline_ix;
-            newlines >>= 1;
-            chars >>= newline_ix;
-            chars >>= 1;
-            row += 1;
-            *total_chars += 1;
-        }
-
-        let row_chars = chars.count_ones() as u8;
-        *total_chars += usize::from(row_chars);
-        if row_chars > longest_row_chars {
-            (row, row_chars as u32)
-        } else {
-            (longest_row, longest_row_chars as u32)
-        }
-    }
-
-    #[inline(always)]
-    pub fn offset_to_point(&self, offset: usize) -> Point {
-        let mask = (1 as Bitmap).unbounded_shl(offset as u32).wrapping_sub(1);
-        let row = (self.newlines & mask).count_ones();
-        let newline_ix = Bitmap::BITS - (self.newlines & mask).leading_zeros();
-        let column = (offset - newline_ix as usize) as u32;
-        Point::new(row, column)
-    }
-
-    #[inline(always)]
-    pub fn point_to_offset(&self, point: Point) -> usize {
-        if point.row > self.lines().row {
-            debug_panic!(
-                "point {:?} extends beyond rows for string {:?}",
-                point,
-                self.text
-            );
-            return self.len();
-        }
-
-        let row_offset_range = self.offset_range_for_row(point.row);
-        if point.column > row_offset_range.len() as u32 {
-            debug_panic!(
-                "point {:?} extends beyond row for string {:?}",
-                point,
-                self.text
-            );
-            row_offset_range.end
-        } else {
-            row_offset_range.start + point.column as usize
-        }
-    }
-
-    #[track_caller]
-    #[inline(always)]
-    pub fn assert_char_boundary<const PANIC: bool>(&self, offset: usize) -> bool {
-        if self.is_char_boundary(offset) {
-            return true;
-        }
-        if PANIC {
-            panic_char_boundary(self.text, offset);
-        } else {
-            log_err_char_boundary(self.text, offset);
-            false
-        }
-    }
-
-    pub fn floor_char_boundary(&self, index: usize) -> usize {
-        self.text.floor_char_boundary(index)
-    }
-
-    #[inline(always)]
-    pub fn point_to_offset_utf16(&self, point: Point) -> OffsetUtf16 {
-        if point.row > self.lines().row {
-            debug_panic!(
-                "point {:?} extends beyond rows for string {:?}",
-                point,
-                self.text
-            );
-            return self.len_utf16();
-        }
-        self.offset_to_offset_utf16(self.point_to_offset(point))
-    }
-
-    #[inline(always)]
-    pub fn offset_to_offset_utf16(&self, offset: usize) -> OffsetUtf16 {
-        let mask = (1 as Bitmap).unbounded_shl(offset as u32).wrapping_sub(1);
-        OffsetUtf16((self.chars_utf16 & mask).count_ones() as usize)
-    }
-
-    #[inline(always)]
-    pub fn offset_utf16_to_offset(&self, target: OffsetUtf16) -> usize {
-        if target.0 == 0 {
-            0
-        } else {
-            #[cfg(not(test))]
-            let chars_utf16 = self.chars_utf16;
-            #[cfg(test)]
-            let chars_utf16 = self.chars_utf16 as u128;
-            let ix = nth_set_bit(chars_utf16, target.0) + 1;
-            if ix == MAX_BASE {
-                MAX_BASE
-            } else {
-                let utf8_additional_len = cmp::min(
-                    (self.chars_utf16 >> ix).trailing_zeros() as usize,
-                    self.text.len() - ix,
-                );
-                ix + utf8_additional_len
-            }
-        }
-    }
-
-    #[inline(always)]
-    pub fn offset_to_point_utf16(&self, offset: usize) -> PointUtf16 {
-        let mask = saturating_shl_mask(offset as u32);
-        let row = (self.newlines & saturating_shl_mask(offset as u32)).count_ones();
-        let newline_ix = Bitmap::BITS - (self.newlines & mask).leading_zeros();
-        let column = if newline_ix as usize == MAX_BASE {
-            0
-        } else {
-            ((self.chars_utf16 & mask) >> newline_ix).count_ones()
-        };
-        PointUtf16::new(row, column)
-    }
-
-    #[inline(always)]
-    pub fn point_to_point_utf16(&self, point: Point) -> PointUtf16 {
-        self.offset_to_point_utf16(self.point_to_offset(point))
-    }
-
-    #[inline(always)]
-    pub fn point_utf16_to_offset(&self, point: PointUtf16, clip: bool) -> usize {
-        let lines = self.lines();
-        if point.row > lines.row {
-            if !clip {
-                debug_panic!(
-                    "point {:?} is beyond this chunk's extent {:?}",
-                    point,
-                    self.text
-                );
-            }
-            return self.len();
-        }
-
-        let row_offset_range = self.offset_range_for_row(point.row);
-        let line = self.slice(row_offset_range.clone());
-        if point.column > line.last_line_len_utf16() {
-            if !clip {
-                debug_panic!(
-                    "point {:?} is beyond the end of the line in chunk {:?}",
-                    point,
-                    self.text
-                );
-            }
-            return line.len();
-        }
-
-        let mut offset = row_offset_range.start;
-        if point.column > 0 {
-            offset += line.offset_utf16_to_offset(OffsetUtf16(point.column as usize));
-            if !self.text.is_char_boundary(offset) {
-                offset -= 1;
-                while !self.text.is_char_boundary(offset) {
-                    offset -= 1;
-                }
-                if !clip {
-                    debug_panic!(
-                        "point {:?} is within character in chunk {:?}",
-                        point,
-                        self.text,
-                    );
-                }
-            }
-        }
-        offset
-    }
-
-    #[inline(always)]
-    pub fn unclipped_point_utf16_to_point(&self, point: Unclipped<PointUtf16>) -> Point {
-        let max_point = self.lines();
-        if point.0.row > max_point.row {
-            return max_point;
-        }
-
-        let row_offset_range = self.offset_range_for_row(point.0.row);
-        let line = self.slice(row_offset_range);
-        if point.0.column == 0 {
-            Point::new(point.0.row, 0)
-        } else if point.0.column >= line.len_utf16().0 as u32 {
-            Point::new(point.0.row, line.len() as u32)
-        } else {
-            let mut column = line.offset_utf16_to_offset(OffsetUtf16(point.0.column as usize));
-            while !line.text.is_char_boundary(column) {
-                column -= 1;
-            }
-            Point::new(point.0.row, column as u32)
-        }
-    }
-
-    #[inline(always)]
-    pub fn clip_point(&self, point: Point, bias: Bias) -> Point {
-        let max_point = self.lines();
-        if point.row > max_point.row {
-            return max_point;
-        }
-
-        let line = self.slice(self.offset_range_for_row(point.row));
-        if point.column == 0 {
-            point
-        } else if point.column >= line.len() as u32 {
-            Point::new(point.row, line.len() as u32)
-        } else {
-            let mut column = point.column as usize;
-            let bytes = line.text.as_bytes();
-            if bytes[column - 1] < 128 && bytes[column] < 128 {
-                return Point::new(point.row, column as u32);
-            }
-
-            let mut grapheme_cursor = GraphemeCursor::new(column, bytes.len(), true);
-            loop {
-                if line.is_char_boundary(column)
-                    && grapheme_cursor.is_boundary(line.text, 0).unwrap_or(false)
-                {
-                    break;
-                }
-
-                match bias {
-                    Bias::Left => column -= 1,
-                    Bias::Right => column += 1,
-                }
-                grapheme_cursor.set_cursor(column);
-            }
-            Point::new(point.row, column as u32)
-        }
-    }
-
-    #[inline(always)]
-    pub fn clip_point_utf16(&self, point: Unclipped<PointUtf16>, bias: Bias) -> PointUtf16 {
-        let max_point = self.lines();
-        if point.0.row > max_point.row {
-            PointUtf16::new(max_point.row, self.last_line_len_utf16())
-        } else {
-            let line = self.slice(self.offset_range_for_row(point.0.row));
-            let column = line.clip_offset_utf16(OffsetUtf16(point.0.column as usize), bias);
-            PointUtf16::new(point.0.row, column.0 as u32)
-        }
-    }
-
-    #[inline(always)]
-    pub fn clip_offset_utf16(&self, target: OffsetUtf16, bias: Bias) -> OffsetUtf16 {
-        if target == OffsetUtf16::default() {
-            OffsetUtf16::default()
-        } else if target >= self.len_utf16() {
-            self.len_utf16()
-        } else {
-            let mut offset = self.offset_utf16_to_offset(target);
-            while !self.text.is_char_boundary(offset) {
-                if bias == Bias::Left {
-                    offset -= 1;
-                } else {
-                    offset += 1;
-                }
-            }
-            self.offset_to_offset_utf16(offset)
-        }
-    }
-
-    #[inline(always)]
-    fn offset_range_for_row(&self, row: u32) -> Range<usize> {
-        let row_start = if row > 0 {
-            #[cfg(not(test))]
-            let newlines = self.newlines;
-            #[cfg(test)]
-            let newlines = self.newlines as u128;
-            nth_set_bit(newlines, row as usize) + 1
-        } else {
-            0
-        };
-        let row_len = if row_start == MAX_BASE {
-            0
-        } else {
-            cmp::min(
-                (self.newlines >> row_start).trailing_zeros(),
-                (self.text.len() - row_start) as u32,
-            )
-        };
-        row_start..row_start + row_len as usize
-    }
-
-    #[inline(always)]
-    pub fn tabs(&self) -> Tabs {
-        Tabs {
-            tabs: self.tabs,
-            chars: self.chars,
-        }
-    }
-}
-
-pub struct Tabs {
-    tabs: Bitmap,
-    chars: Bitmap,
-}
-
-#[derive(Debug, PartialEq, Eq)]
-pub struct TabPosition {
-    pub byte_offset: usize,
-    pub char_offset: usize,
-}
-
-impl Iterator for Tabs {
-    type Item = TabPosition;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        if self.tabs == 0 {
-            return None;
-        }
-
-        let tab_offset = self.tabs.trailing_zeros() as usize;
-        let chars_mask = (1 << tab_offset) - 1;
-        let char_offset = (self.chars & chars_mask).count_ones() as usize;
-
-        // Since tabs are 1 byte the tab offset is the same as the byte offset
-        let position = TabPosition {
-            byte_offset: tab_offset,
-            char_offset,
-        };
-        // Remove the tab we've just seen
-        self.tabs ^= 1 << tab_offset;
-
-        Some(position)
-    }
-}
-
-/// Finds the n-th bit that is set to 1.
-#[inline(always)]
-fn nth_set_bit(v: u128, n: usize) -> usize {
-    let low = v as u64;
-    let high = (v >> 64) as u64;
-
-    let low_count = low.count_ones() as usize;
-    if n > low_count {
-        64 + nth_set_bit_u64(high, (n - low_count) as u64) as usize
-    } else {
-        nth_set_bit_u64(low, n as u64) as usize
-    }
-}
-
-#[cold]
-#[inline(never)]
-#[track_caller]
-fn panic_char_boundary(text: &str, offset: usize) -> ! {
-    if offset > text.len() {
-        panic!(
-            "byte index {} is out of bounds of `{:?}` (length: {})",
-            offset,
-            text,
-            text.len()
-        );
-    }
-    // find the character
-    let char_start = text.floor_char_boundary(offset);
-    // `char_start` must be less than len and a char boundary
-    let ch = text.get(char_start..).unwrap().chars().next().unwrap();
-    let char_range = char_start..char_start + ch.len_utf8();
-    panic!(
-        "byte index {} is not a char boundary; it is inside {:?} (bytes {:?})",
-        offset, ch, char_range,
-    );
-}
-
-#[cold]
-#[inline(never)]
-#[track_caller]
-fn log_err_char_boundary(text: &str, offset: usize) {
-    if offset > text.len() {
-        log::error!(
-            "byte index {} is out of bounds of `{:?}` (length: {})",
-            offset,
-            text,
-            text.len()
-        );
-    }
-    // find the character
-    let char_start = text.floor_char_boundary(offset);
-    // `char_start` must be less than len and a char boundary
-    let ch = text.get(char_start..).unwrap().chars().next().unwrap();
-    let char_range = char_start..char_start + ch.len_utf8();
-    log::error!(
-        "byte index {} is not a char boundary; it is inside {:?} (bytes {:?})",
-        offset,
-        ch,
-        char_range,
-    );
-}
-
-#[inline(always)]
-fn nth_set_bit_u64(v: u64, mut n: u64) -> u64 {
-    let v = v.reverse_bits();
-    let mut s: u64 = 64;
-
-    // Parallel bit count intermediates
-    let a = v - ((v >> 1) & (u64::MAX / 3));
-    let b = (a & (u64::MAX / 5)) + ((a >> 2) & (u64::MAX / 5));
-    let c = (b + (b >> 4)) & (u64::MAX / 0x11);
-    let d = (c + (c >> 8)) & (u64::MAX / 0x101);
-
-    // Branchless select
-    let t = (d >> 32) + (d >> 48);
-    s -= (t.wrapping_sub(n) & 256) >> 3;
-    n -= t & (t.wrapping_sub(n) >> 8);
-
-    let t = (d >> (s - 16)) & 0xff;
-    s -= (t.wrapping_sub(n) & 256) >> 4;
-    n -= t & (t.wrapping_sub(n) >> 8);
-
-    let t = (c >> (s - 8)) & 0xf;
-    s -= (t.wrapping_sub(n) & 256) >> 5;
-    n -= t & (t.wrapping_sub(n) >> 8);
-
-    let t = (b >> (s - 4)) & 0x7;
-    s -= (t.wrapping_sub(n) & 256) >> 6;
-    n -= t & (t.wrapping_sub(n) >> 8);
-
-    let t = (a >> (s - 2)) & 0x3;
-    s -= (t.wrapping_sub(n) & 256) >> 7;
-    n -= t & (t.wrapping_sub(n) >> 8);
-
-    let t = (v >> (s - 1)) & 0x1;
-    s -= (t.wrapping_sub(n) & 256) >> 8;
-
-    65 - s - 1
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use rand::prelude::*;
-    use util::RandomCharIter;
-
-    #[gpui::test(iterations = 100)]
-    fn test_random_chunks(mut rng: StdRng) {
-        let text = random_string_with_utf8_len(&mut rng, MAX_BASE);
-        log::info!("Chunk: {:?}", text);
-        let chunk = Chunk::new(&text);
-        verify_chunk(chunk.as_slice(), &text);
-
-        // Verify Chunk::chars() bitmap
-        let expected_chars = char_offsets(&text)
-            .into_iter()
-            .inspect(|i| assert!(*i < MAX_BASE))
-            .fold(0 as Bitmap, |acc, i| acc | (1 << i));
-        assert_eq!(chunk.chars(), expected_chars);
-
-        for _ in 0..10 {
-            let mut start = rng.random_range(0..=chunk.text.len());
-            let mut end = rng.random_range(start..=chunk.text.len());
-            while !chunk.text.is_char_boundary(start) {
-                start -= 1;
-            }
-            while !chunk.text.is_char_boundary(end) {
-                end -= 1;
-            }
-            let range = start..end;
-            log::info!("Range: {:?}", range);
-            let text_slice = &text[range.clone()];
-            let chunk_slice = chunk.slice(range);
-            verify_chunk(chunk_slice, text_slice);
-        }
-    }
-
-    #[gpui::test(iterations = 100)]
-    fn test_split_chunk_slice(mut rng: StdRng) {
-        let text = &random_string_with_utf8_len(&mut rng, MAX_BASE);
-        let chunk = Chunk::new(text);
-        let offset = char_offsets_with_end(text)
-            .into_iter()
-            .choose(&mut rng)
-            .unwrap();
-        let (a, b) = chunk.as_slice().split_at(offset);
-        let (a_str, b_str) = text.split_at(offset);
-        verify_chunk(a, a_str);
-        verify_chunk(b, b_str);
-    }
-
-    #[gpui::test(iterations = 1000)]
-    fn test_nth_set_bit_random(mut rng: StdRng) {
-        let set_count = rng.random_range(0..=128);
-        let mut set_bits = (0..128).choose_multiple(&mut rng, set_count);
-        set_bits.sort();
-        let mut n = 0;
-        for ix in set_bits.iter().copied() {
-            n |= 1 << ix;
-        }
-
-        for (mut ix, position) in set_bits.into_iter().enumerate() {
-            ix += 1;
-            assert_eq!(
-                nth_set_bit(n, ix),
-                position,
-                "nth_set_bit({:0128b}, {})",
-                n,
-                ix
-            );
-        }
-    }
-
-    /// Returns a (biased) random string whose UTF-8 length is no more than `len`.
-    fn random_string_with_utf8_len(rng: &mut StdRng, len: usize) -> String {
-        let mut str = String::new();
-        let mut chars = RandomCharIter::new(rng);
-        loop {
-            let ch = chars.next().unwrap();
-            if str.len() + ch.len_utf8() > len {
-                break;
-            }
-            str.push(ch);
-        }
-        str
-    }
-
-    #[gpui::test(iterations = 1000)]
-    fn test_append_random_strings(mut rng: StdRng) {
-        let len1 = rng.random_range(0..=MAX_BASE);
-        let len2 = rng.random_range(0..=MAX_BASE).saturating_sub(len1);
-        let str1 = random_string_with_utf8_len(&mut rng, len1);
-        let str2 = random_string_with_utf8_len(&mut rng, len2);
-        let mut chunk1 = Chunk::new(&str1);
-        let chunk2 = Chunk::new(&str2);
-        let char_offsets = char_offsets_with_end(&str2);
-        let start_index = rng.random_range(0..char_offsets.len());
-        let start_offset = char_offsets[start_index];
-        let end_offset = char_offsets[rng.random_range(start_index..char_offsets.len())];
-        chunk1.append(chunk2.slice(start_offset..end_offset));
-        verify_chunk(chunk1.as_slice(), &(str1 + &str2[start_offset..end_offset]));
-    }
-
-    /// Return the byte offsets for each character in a string.
-    ///
-    /// These are valid offsets to split the string.
-    fn char_offsets(text: &str) -> Vec<usize> {
-        text.char_indices().map(|(i, _c)| i).collect()
-    }
-
-    /// Return the byte offsets for each character in a string, plus the offset
-    /// past the end of the string.
-    fn char_offsets_with_end(text: &str) -> Vec<usize> {
-        let mut v = char_offsets(text);
-        v.push(text.len());
-        v
-    }
-
-    fn verify_chunk(chunk: ChunkSlice<'_>, text: &str) {
-        let mut offset = 0;
-        let mut offset_utf16 = OffsetUtf16(0);
-        let mut point = Point::zero();
-        let mut point_utf16 = PointUtf16::zero();
-
-        log::info!("Verifying chunk {:?}", text);
-        assert_eq!(chunk.offset_to_point(0), Point::zero());
-
-        let mut expected_tab_positions = Vec::new();
-
-        for (char_offset, c) in text.chars().enumerate() {
-            let expected_point = chunk.offset_to_point(offset);
-            assert_eq!(point, expected_point, "mismatch at offset {}", offset);
-            assert_eq!(
-                chunk.point_to_offset(point),
-                offset,
-                "mismatch at point {:?}",
-                point
-            );
-            assert_eq!(
-                chunk.offset_to_offset_utf16(offset),
-                offset_utf16,
-                "mismatch at offset {}",
-                offset
-            );
-            assert_eq!(
-                chunk.offset_utf16_to_offset(offset_utf16),
-                offset,
-                "mismatch at offset_utf16 {:?}",
-                offset_utf16
-            );
-            assert_eq!(
-                chunk.point_to_point_utf16(point),
-                point_utf16,
-                "mismatch at point {:?}",
-                point
-            );
-            assert_eq!(
-                chunk.point_utf16_to_offset(point_utf16, false),
-                offset,
-                "mismatch at point_utf16 {:?}",
-                point_utf16
-            );
-            assert_eq!(
-                chunk.unclipped_point_utf16_to_point(Unclipped(point_utf16)),
-                point,
-                "mismatch for unclipped_point_utf16_to_point at {:?}",
-                point_utf16
-            );
-
-            assert_eq!(
-                chunk.clip_point(point, Bias::Left),
-                point,
-                "incorrect left clip at {:?}",
-                point
-            );
-            assert_eq!(
-                chunk.clip_point(point, Bias::Right),
-                point,
-                "incorrect right clip at {:?}",
-                point
-            );
-
-            for i in 1..c.len_utf8() {
-                let test_point = Point::new(point.row, point.column + i as u32);
-                assert_eq!(
-                    chunk.clip_point(test_point, Bias::Left),
-                    point,
-                    "incorrect left clip within multi-byte char at {:?}",
-                    test_point
-                );
-                assert_eq!(
-                    chunk.clip_point(test_point, Bias::Right),
-                    Point::new(point.row, point.column + c.len_utf8() as u32),
-                    "incorrect right clip within multi-byte char at {:?}",
-                    test_point
-                );
-            }
-
-            for i in 1..c.len_utf16() {
-                let test_point = Unclipped(PointUtf16::new(
-                    point_utf16.row,
-                    point_utf16.column + i as u32,
-                ));
-                assert_eq!(
-                    chunk.unclipped_point_utf16_to_point(test_point),
-                    point,
-                    "incorrect unclipped_point_utf16_to_point within multi-byte char at {:?}",
-                    test_point
-                );
-                assert_eq!(
-                    chunk.clip_point_utf16(test_point, Bias::Left),
-                    point_utf16,
-                    "incorrect left clip_point_utf16 within multi-byte char at {:?}",
-                    test_point
-                );
-                assert_eq!(
-                    chunk.clip_point_utf16(test_point, Bias::Right),
-                    PointUtf16::new(point_utf16.row, point_utf16.column + c.len_utf16() as u32),
-                    "incorrect right clip_point_utf16 within multi-byte char at {:?}",
-                    test_point
-                );
-
-                let test_offset = OffsetUtf16(offset_utf16.0 + i);
-                assert_eq!(
-                    chunk.clip_offset_utf16(test_offset, Bias::Left),
-                    offset_utf16,
-                    "incorrect left clip_offset_utf16 within multi-byte char at {:?}",
-                    test_offset
-                );
-                assert_eq!(
-                    chunk.clip_offset_utf16(test_offset, Bias::Right),
-                    OffsetUtf16(offset_utf16.0 + c.len_utf16()),
-                    "incorrect right clip_offset_utf16 within multi-byte char at {:?}",
-                    test_offset
-                );
-            }
-
-            if c == '\n' {
-                point.row += 1;
-                point.column = 0;
-                point_utf16.row += 1;
-                point_utf16.column = 0;
-            } else {
-                point.column += c.len_utf8() as u32;
-                point_utf16.column += c.len_utf16() as u32;
-            }
-
-            if c == '\t' {
-                expected_tab_positions.push(TabPosition {
-                    byte_offset: offset,
-                    char_offset,
-                });
-            }
-
-            offset += c.len_utf8();
-            offset_utf16.0 += c.len_utf16();
-        }
-
-        let final_point = chunk.offset_to_point(offset);
-        assert_eq!(point, final_point, "mismatch at final offset {}", offset);
-        assert_eq!(
-            chunk.point_to_offset(point),
-            offset,
-            "mismatch at point {:?}",
-            point
-        );
-        assert_eq!(
-            chunk.offset_to_offset_utf16(offset),
-            offset_utf16,
-            "mismatch at offset {}",
-            offset
-        );
-        assert_eq!(
-            chunk.offset_utf16_to_offset(offset_utf16),
-            offset,
-            "mismatch at offset_utf16 {:?}",
-            offset_utf16
-        );
-        assert_eq!(
-            chunk.point_to_point_utf16(point),
-            point_utf16,
-            "mismatch at final point {:?}",
-            point
-        );
-        assert_eq!(
-            chunk.point_utf16_to_offset(point_utf16, false),
-            offset,
-            "mismatch at final point_utf16 {:?}",
-            point_utf16
-        );
-        assert_eq!(
-            chunk.unclipped_point_utf16_to_point(Unclipped(point_utf16)),
-            point,
-            "mismatch for unclipped_point_utf16_to_point at final point {:?}",
-            point_utf16
-        );
-        assert_eq!(
-            chunk.clip_point(point, Bias::Left),
-            point,
-            "incorrect left clip at final point {:?}",
-            point
-        );
-        assert_eq!(
-            chunk.clip_point(point, Bias::Right),
-            point,
-            "incorrect right clip at final point {:?}",
-            point
-        );
-        assert_eq!(
-            chunk.clip_point_utf16(Unclipped(point_utf16), Bias::Left),
-            point_utf16,
-            "incorrect left clip_point_utf16 at final point {:?}",
-            point_utf16
-        );
-        assert_eq!(
-            chunk.clip_point_utf16(Unclipped(point_utf16), Bias::Right),
-            point_utf16,
-            "incorrect right clip_point_utf16 at final point {:?}",
-            point_utf16
-        );
-        assert_eq!(
-            chunk.clip_offset_utf16(offset_utf16, Bias::Left),
-            offset_utf16,
-            "incorrect left clip_offset_utf16 at final offset {:?}",
-            offset_utf16
-        );
-        assert_eq!(
-            chunk.clip_offset_utf16(offset_utf16, Bias::Right),
-            offset_utf16,
-            "incorrect right clip_offset_utf16 at final offset {:?}",
-            offset_utf16
-        );
-
-        // Verify length methods
-        assert_eq!(chunk.len(), text.len());
-        assert_eq!(
-            chunk.len_utf16().0,
-            text.chars().map(|c| c.len_utf16()).sum::<usize>()
-        );
-
-        // Verify line counting
-        let lines = chunk.lines();
-        let mut newline_count = 0;
-        let mut last_line_len = 0;
-        for c in text.chars() {
-            if c == '\n' {
-                newline_count += 1;
-                last_line_len = 0;
-            } else {
-                last_line_len += c.len_utf8() as u32;
-            }
-        }
-        assert_eq!(lines, Point::new(newline_count, last_line_len));
-
-        // Verify first/last line chars
-        if !text.is_empty() {
-            let first_line = text.split('\n').next().unwrap();
-            assert_eq!(chunk.first_line_chars(), first_line.chars().count() as u32);
-
-            let last_line = text.split('\n').next_back().unwrap();
-            assert_eq!(chunk.last_line_chars(), last_line.chars().count() as u32);
-            assert_eq!(
-                chunk.last_line_len_utf16(),
-                last_line.chars().map(|c| c.len_utf16() as u32).sum::<u32>()
-            );
-        }
-
-        // Verify longest row
-        let (longest_row, longest_chars) = chunk.longest_row(&mut 0);
-        let mut max_chars = 0;
-        let mut current_row = 0;
-        let mut current_chars = 0;
-        let mut max_row = 0;
-
-        for c in text.chars() {
-            if c == '\n' {
-                if current_chars > max_chars {
-                    max_chars = current_chars;
-                    max_row = current_row;
-                }
-                current_row += 1;
-                current_chars = 0;
-            } else {
-                current_chars += 1;
-            }
-        }
-
-        if current_chars > max_chars {
-            max_chars = current_chars;
-            max_row = current_row;
-        }
-
-        assert_eq!((max_row, max_chars as u32), (longest_row, longest_chars));
-        assert_eq!(chunk.tabs().collect::<Vec<_>>(), expected_tab_positions);
-    }
-}
diff --git a/crates/rope/src/offset_utf16.rs b/crates/rope/src/offset_utf16.rs
deleted file mode 100644
index 1223fbbe38..0000000000
--- a/crates/rope/src/offset_utf16.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-use std::ops::{Add, AddAssign, Sub};
-
-#[derive(Copy, Clone, Debug, Default, Eq, PartialEq, Ord, PartialOrd)]
-pub struct OffsetUtf16(pub usize);
-
-impl<'a> Add<&'a Self> for OffsetUtf16 {
-    type Output = Self;
-
-    fn add(self, other: &'a Self) -> Self::Output {
-        Self(self.0 + other.0)
-    }
-}
-
-impl Add for OffsetUtf16 {
-    type Output = Self;
-
-    fn add(self, other: Self) -> Self::Output {
-        Self(self.0 + other.0)
-    }
-}
-
-impl<'a> Sub<&'a Self> for OffsetUtf16 {
-    type Output = Self;
-
-    fn sub(self, other: &'a Self) -> Self::Output {
-        debug_assert!(*other <= self);
-        Self(self.0 - other.0)
-    }
-}
-
-impl Sub for OffsetUtf16 {
-    type Output = OffsetUtf16;
-
-    fn sub(self, other: Self) -> Self::Output {
-        Self(self.0 - other.0)
-    }
-}
-
-impl<'a> AddAssign<&'a Self> for OffsetUtf16 {
-    fn add_assign(&mut self, other: &'a Self) {
-        self.0 += other.0;
-    }
-}
-
-impl AddAssign<Self> for OffsetUtf16 {
-    fn add_assign(&mut self, other: Self) {
-        self.0 += other.0;
-    }
-}
diff --git a/crates/rope/src/point.rs b/crates/rope/src/point.rs
deleted file mode 100644
index a2491f6b0e..0000000000
--- a/crates/rope/src/point.rs
+++ /dev/null
@@ -1,146 +0,0 @@
-use std::{
-    cmp::Ordering,
-    fmt::{self, Debug},
-    ops::{Add, AddAssign, Range, Sub},
-};
-
-/// A zero-indexed point in a text buffer consisting of a row and column.
-#[derive(Clone, Copy, Default, Eq, PartialEq, Hash)]
-pub struct Point {
-    pub row: u32,
-    pub column: u32,
-}
-
-impl Debug for Point {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "Point({}:{})", self.row, self.column)
-    }
-}
-
-impl Point {
-    pub const MAX: Self = Self {
-        row: u32::MAX,
-        column: u32::MAX,
-    };
-
-    pub fn new(row: u32, column: u32) -> Self {
-        Point { row, column }
-    }
-
-    pub fn row_range(range: Range<u32>) -> Range<Self> {
-        Point {
-            row: range.start,
-            column: 0,
-        }..Point {
-            row: range.end,
-            column: 0,
-        }
-    }
-
-    pub fn zero() -> Self {
-        Point::new(0, 0)
-    }
-
-    pub fn parse_str(s: &str) -> Self {
-        let mut point = Self::zero();
-        for (row, line) in s.split('\n').enumerate() {
-            point.row = row as u32;
-            point.column = line.len() as u32;
-        }
-        point
-    }
-
-    pub fn is_zero(&self) -> bool {
-        self.row == 0 && self.column == 0
-    }
-
-    pub fn saturating_sub(self, other: Self) -> Self {
-        if self < other {
-            Self::zero()
-        } else {
-            self - other
-        }
-    }
-}
-
-impl<'a> Add<&'a Self> for Point {
-    type Output = Point;
-
-    fn add(self, other: &'a Self) -> Self::Output {
-        self + *other
-    }
-}
-
-impl Add for Point {
-    type Output = Point;
-
-    fn add(self, other: Self) -> Self::Output {
-        if other.row == 0 {
-            Point::new(self.row, self.column + other.column)
-        } else {
-            Point::new(self.row + other.row, other.column)
-        }
-    }
-}
-
-impl<'a> Sub<&'a Self> for Point {
-    type Output = Point;
-
-    fn sub(self, other: &'a Self) -> Self::Output {
-        self - *other
-    }
-}
-
-impl Sub for Point {
-    type Output = Point;
-
-    fn sub(self, other: Self) -> Self::Output {
-        debug_assert!(other <= self);
-
-        if self.row == other.row {
-            Point::new(0, self.column - other.column)
-        } else {
-            Point::new(self.row - other.row, self.column)
-        }
-    }
-}
-
-impl<'a> AddAssign<&'a Self> for Point {
-    fn add_assign(&mut self, other: &'a Self) {
-        *self += *other;
-    }
-}
-
-impl AddAssign<Self> for Point {
-    fn add_assign(&mut self, other: Self) {
-        if other.row == 0 {
-            self.column += other.column;
-        } else {
-            self.row += other.row;
-            self.column = other.column;
-        }
-    }
-}
-
-impl PartialOrd for Point {
-    fn partial_cmp(&self, other: &Point) -> Option<Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-impl Ord for Point {
-    #[cfg(target_pointer_width = "64")]
-    fn cmp(&self, other: &Point) -> Ordering {
-        let a = ((self.row as usize) << 32) | self.column as usize;
-        let b = ((other.row as usize) << 32) | other.column as usize;
-        a.cmp(&b)
-    }
-
-    #[cfg(target_pointer_width = "32")]
-    fn cmp(&self, other: &Point) -> Ordering {
-        match self.row.cmp(&other.row) {
-            Ordering::Equal => self.column.cmp(&other.column),
-            comparison @ _ => comparison,
-        }
-    }
-}
diff --git a/crates/rope/src/point_utf16.rs b/crates/rope/src/point_utf16.rs
deleted file mode 100644
index 096c2defa4..0000000000
--- a/crates/rope/src/point_utf16.rs
+++ /dev/null
@@ -1,119 +0,0 @@
-use std::{
-    cmp::Ordering,
-    ops::{Add, AddAssign, Sub},
-};
-
-#[derive(Clone, Copy, Default, Eq, PartialEq, Debug, Hash)]
-pub struct PointUtf16 {
-    pub row: u32,
-    pub column: u32,
-}
-
-impl PointUtf16 {
-    pub const MAX: Self = Self {
-        row: u32::MAX,
-        column: u32::MAX,
-    };
-
-    pub fn new(row: u32, column: u32) -> Self {
-        PointUtf16 { row, column }
-    }
-
-    pub fn zero() -> Self {
-        PointUtf16::new(0, 0)
-    }
-
-    pub fn is_zero(&self) -> bool {
-        self.row == 0 && self.column == 0
-    }
-
-    pub fn saturating_sub(self, other: Self) -> Self {
-        if self < other {
-            Self::zero()
-        } else {
-            self - other
-        }
-    }
-}
-
-impl<'a> Add<&'a Self> for PointUtf16 {
-    type Output = PointUtf16;
-
-    fn add(self, other: &'a Self) -> Self::Output {
-        self + *other
-    }
-}
-
-impl Add for PointUtf16 {
-    type Output = PointUtf16;
-
-    fn add(self, other: Self) -> Self::Output {
-        if other.row == 0 {
-            PointUtf16::new(self.row, self.column + other.column)
-        } else {
-            PointUtf16::new(self.row + other.row, other.column)
-        }
-    }
-}
-
-impl<'a> Sub<&'a Self> for PointUtf16 {
-    type Output = PointUtf16;
-
-    fn sub(self, other: &'a Self) -> Self::Output {
-        self - *other
-    }
-}
-
-impl Sub for PointUtf16 {
-    type Output = PointUtf16;
-
-    fn sub(self, other: Self) -> Self::Output {
-        debug_assert!(other <= self);
-
-        if self.row == other.row {
-            PointUtf16::new(0, self.column - other.column)
-        } else {
-            PointUtf16::new(self.row - other.row, self.column)
-        }
-    }
-}
-
-impl<'a> AddAssign<&'a Self> for PointUtf16 {
-    fn add_assign(&mut self, other: &'a Self) {
-        *self += *other;
-    }
-}
-
-impl AddAssign<Self> for PointUtf16 {
-    fn add_assign(&mut self, other: Self) {
-        if other.row == 0 {
-            self.column += other.column;
-        } else {
-            self.row += other.row;
-            self.column = other.column;
-        }
-    }
-}
-
-impl PartialOrd for PointUtf16 {
-    fn partial_cmp(&self, other: &PointUtf16) -> Option<Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-impl Ord for PointUtf16 {
-    #[cfg(target_pointer_width = "64")]
-    fn cmp(&self, other: &PointUtf16) -> Ordering {
-        let a = ((self.row as usize) << 32) | self.column as usize;
-        let b = ((other.row as usize) << 32) | other.column as usize;
-        a.cmp(&b)
-    }
-
-    #[cfg(target_pointer_width = "32")]
-    fn cmp(&self, other: &PointUtf16) -> Ordering {
-        match self.row.cmp(&other.row) {
-            Ordering::Equal => self.column.cmp(&other.column),
-            comparison @ _ => comparison,
-        }
-    }
-}
diff --git a/crates/rope/src/rope.rs b/crates/rope/src/rope.rs
deleted file mode 100644
index 50f9ba044d..0000000000
--- a/crates/rope/src/rope.rs
+++ /dev/null
@@ -1,2247 +0,0 @@
-mod chunk;
-mod offset_utf16;
-mod point;
-mod point_utf16;
-mod unclipped;
-
-use arrayvec::ArrayVec;
-use rayon::iter::{IntoParallelIterator, ParallelIterator as _};
-use std::{
-    cmp, fmt, io, mem,
-    ops::{self, AddAssign, Range},
-    str,
-};
-use sum_tree::{Bias, Dimension, Dimensions, SumTree};
-use ztracing::instrument;
-
-pub use chunk::{Chunk, ChunkSlice};
-pub use offset_utf16::OffsetUtf16;
-pub use point::Point;
-pub use point_utf16::PointUtf16;
-pub use unclipped::Unclipped;
-
-use crate::chunk::Bitmap;
-
-#[derive(Clone, Default)]
-pub struct Rope {
-    chunks: SumTree<Chunk>,
-}
-
-impl Rope {
-    pub fn new() -> Self {
-        Self::default()
-    }
-
-    /// Checks that `index`-th byte is the first byte in a UTF-8 code point
-    /// sequence or the end of the string.
-    ///
-    /// The start and end of the string (when `index == self.len()`) are
-    /// considered to be boundaries.
-    ///
-    /// Returns `false` if `index` is greater than `self.len()`.
-    pub fn is_char_boundary(&self, offset: usize) -> bool {
-        if self.chunks.is_empty() {
-            return offset == 0;
-        }
-        let (start, _, item) = self.chunks.find::<usize, _>((), &offset, Bias::Left);
-        let chunk_offset = offset - start;
-        item.map(|chunk| chunk.is_char_boundary(chunk_offset))
-            .unwrap_or(false)
-    }
-
-    #[track_caller]
-    #[inline(always)]
-    pub fn assert_char_boundary<const PANIC: bool>(&self, offset: usize) -> bool {
-        if self.chunks.is_empty() && offset == 0 {
-            return true;
-        }
-        let (start, _, item) = self.chunks.find::<usize, _>((), &offset, Bias::Left);
-        match item {
-            Some(chunk) => {
-                let chunk_offset = offset - start;
-                chunk.assert_char_boundary::<PANIC>(chunk_offset)
-            }
-            None if PANIC => {
-                panic!(
-                    "byte index {} is out of bounds of rope (length: {})",
-                    offset,
-                    self.len()
-                );
-            }
-            None => {
-                log::error!(
-                    "byte index {} is out of bounds of rope (length: {})",
-                    offset,
-                    self.len()
-                );
-                false
-            }
-        }
-    }
-
-    pub fn floor_char_boundary(&self, index: usize) -> usize {
-        if index >= self.len() {
-            self.len()
-        } else {
-            let (start, _, item) = self.chunks.find::<usize, _>((), &index, Bias::Left);
-            let chunk_offset = index - start;
-            let lower_idx = item.map(|chunk| chunk.text.floor_char_boundary(chunk_offset));
-            lower_idx.map_or_else(|| self.len(), |idx| start + idx)
-        }
-    }
-
-    pub fn ceil_char_boundary(&self, index: usize) -> usize {
-        if index > self.len() {
-            self.len()
-        } else {
-            let (start, _, item) = self.chunks.find::<usize, _>((), &index, Bias::Left);
-            let chunk_offset = index - start;
-            let upper_idx = item.map(|chunk| chunk.text.ceil_char_boundary(chunk_offset));
-            upper_idx.map_or_else(|| self.len(), |idx| start + idx)
-        }
-    }
-
-    pub fn append(&mut self, rope: Rope) {
-        if let Some(chunk) = rope.chunks.first()
-            && (self
-                .chunks
-                .last()
-                .is_some_and(|c| c.text.len() < chunk::MIN_BASE)
-                || chunk.text.len() < chunk::MIN_BASE)
-        {
-            self.push_chunk(chunk.as_slice());
-
-            let mut chunks = rope.chunks.cursor::<()>(());
-            chunks.next();
-            chunks.next();
-            self.chunks.append(chunks.suffix(), ());
-        } else {
-            self.chunks.append(rope.chunks, ());
-        }
-        self.check_invariants();
-    }
-
-    pub fn replace(&mut self, range: Range<usize>, text: &str) {
-        let mut new_rope = Rope::new();
-        let mut cursor = self.cursor(0);
-        new_rope.append(cursor.slice(range.start));
-        cursor.seek_forward(range.end);
-        new_rope.push(text);
-        new_rope.append(cursor.suffix());
-        *self = new_rope;
-    }
-
-    pub fn slice(&self, range: Range<usize>) -> Rope {
-        let mut cursor = self.cursor(0);
-        cursor.seek_forward(range.start);
-        cursor.slice(range.end)
-    }
-
-    pub fn slice_rows(&self, range: Range<u32>) -> Rope {
-        // This would be more efficient with a forward advance after the first, but it's fine.
-        let start = self.point_to_offset(Point::new(range.start, 0));
-        let end = self.point_to_offset(Point::new(range.end, 0));
-        self.slice(start..end)
-    }
-
-    pub fn push(&mut self, mut text: &str) {
-        self.chunks.update_last(
-            |last_chunk| {
-                let split_ix = if last_chunk.text.len() + text.len() <= chunk::MAX_BASE {
-                    text.len()
-                } else {
-                    let mut split_ix = cmp::min(
-                        chunk::MIN_BASE.saturating_sub(last_chunk.text.len()),
-                        text.len(),
-                    );
-                    while !text.is_char_boundary(split_ix) {
-                        split_ix += 1;
-                    }
-                    split_ix
-                };
-
-                let (suffix, remainder) = text.split_at(split_ix);
-                last_chunk.push_str(suffix);
-                text = remainder;
-            },
-            (),
-        );
-
-        #[cfg(all(test, not(rust_analyzer)))]
-        const NUM_CHUNKS: usize = 16;
-        #[cfg(not(all(test, not(rust_analyzer))))]
-        const NUM_CHUNKS: usize = 4;
-
-        // We accommodate for NUM_CHUNKS chunks of size MAX_BASE
-        // but given the chunk boundary can land within a character
-        // we need to accommodate for the worst case where every chunk gets cut short by up to 4 bytes
-        if text.len() > NUM_CHUNKS * chunk::MAX_BASE - NUM_CHUNKS * 4 {
-            return self.push_large(text);
-        }
-        // 16 is enough as otherwise we will hit the branch above
-        let mut new_chunks = ArrayVec::<_, NUM_CHUNKS>::new();
-
-        while !text.is_empty() {
-            let mut split_ix = cmp::min(chunk::MAX_BASE, text.len());
-            while !text.is_char_boundary(split_ix) {
-                split_ix -= 1;
-            }
-            let (chunk, remainder) = text.split_at(split_ix);
-            new_chunks.push(chunk);
-            text = remainder;
-        }
-        self.chunks
-            .extend(new_chunks.into_iter().map(Chunk::new), ());
-
-        self.check_invariants();
-    }
-
-    /// A copy of `push` specialized for working with large quantities of text.
-    fn push_large(&mut self, mut text: &str) {
-        // To avoid frequent reallocs when loading large swaths of file contents,
-        // we estimate worst-case `new_chunks` capacity;
-        // Chunk is a fixed-capacity buffer. If a character falls on
-        // chunk boundary, we push it off to the following chunk (thus leaving a small bit of capacity unfilled in current chunk).
-        // Worst-case chunk count when loading a file is then a case where every chunk ends up with that unused capacity.
-        // Since we're working with UTF-8, each character is at most 4 bytes wide. It follows then that the worst case is where
-        // a chunk ends with 3 bytes of a 4-byte character. These 3 bytes end up being stored in the following chunk, thus wasting
-        // 3 bytes of storage in current chunk.
-        // For example, a 1024-byte string can occupy between 32 (full ASCII, 1024/32) and 36 (full 4-byte UTF-8, 1024 / 29 rounded up) chunks.
-        const MIN_CHUNK_SIZE: usize = chunk::MAX_BASE - 3;
-
-        // We also round up the capacity up by one, for a good measure; we *really* don't want to realloc here, as we assume that the # of characters
-        // we're working with there is large.
-        let capacity = text.len().div_ceil(MIN_CHUNK_SIZE);
-        let mut new_chunks = Vec::with_capacity(capacity);
-
-        while !text.is_empty() {
-            let mut split_ix = cmp::min(chunk::MAX_BASE, text.len());
-            while !text.is_char_boundary(split_ix) {
-                split_ix -= 1;
-            }
-            let (chunk, remainder) = text.split_at(split_ix);
-            new_chunks.push(chunk);
-            text = remainder;
-        }
-
-        #[cfg(all(test, not(rust_analyzer)))]
-        const PARALLEL_THRESHOLD: usize = 4;
-        #[cfg(not(all(test, not(rust_analyzer))))]
-        const PARALLEL_THRESHOLD: usize = 4 * (2 * sum_tree::TREE_BASE);
-
-        if new_chunks.len() >= PARALLEL_THRESHOLD {
-            self.chunks
-                .par_extend(new_chunks.into_par_iter().map(Chunk::new), ());
-        } else {
-            self.chunks
-                .extend(new_chunks.into_iter().map(Chunk::new), ());
-        }
-
-        self.check_invariants();
-    }
-
-    fn push_chunk(&mut self, mut chunk: ChunkSlice) {
-        self.chunks.update_last(
-            |last_chunk| {
-                let split_ix = if last_chunk.text.len() + chunk.len() <= chunk::MAX_BASE {
-                    chunk.len()
-                } else {
-                    let mut split_ix = cmp::min(
-                        chunk::MIN_BASE.saturating_sub(last_chunk.text.len()),
-                        chunk.len(),
-                    );
-                    while !chunk.is_char_boundary(split_ix) {
-                        split_ix += 1;
-                    }
-                    split_ix
-                };
-
-                let (suffix, remainder) = chunk.split_at(split_ix);
-                last_chunk.append(suffix);
-                chunk = remainder;
-            },
-            (),
-        );
-
-        if !chunk.is_empty() {
-            self.chunks.push(chunk.into(), ());
-        }
-    }
-
-    pub fn push_front(&mut self, text: &str) {
-        let suffix = mem::replace(self, Rope::from(text));
-        self.append(suffix);
-    }
-
-    fn check_invariants(&self) {
-        #[cfg(test)]
-        {
-            // Ensure all chunks except maybe the last one are not underflowing.
-            // Allow some wiggle room for multibyte characters at chunk boundaries.
-            let mut chunks = self.chunks.cursor::<()>(()).peekable();
-            while let Some(chunk) = chunks.next() {
-                if chunks.peek().is_some() {
-                    assert!(chunk.text.len() + 3 >= chunk::MIN_BASE);
-                }
-            }
-        }
-    }
-
-    pub fn summary(&self) -> TextSummary {
-        self.chunks.summary().text
-    }
-
-    pub fn len(&self) -> usize {
-        self.chunks.extent(())
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.len() == 0
-    }
-
-    pub fn max_point(&self) -> Point {
-        self.chunks.extent(())
-    }
-
-    pub fn max_point_utf16(&self) -> PointUtf16 {
-        self.chunks.extent(())
-    }
-
-    pub fn cursor(&self, offset: usize) -> Cursor<'_> {
-        Cursor::new(self, offset)
-    }
-
-    pub fn chars(&self) -> impl Iterator<Item = char> + '_ {
-        self.chars_at(0)
-    }
-
-    pub fn chars_at(&self, start: usize) -> impl Iterator<Item = char> + '_ {
-        self.chunks_in_range(start..self.len()).flat_map(str::chars)
-    }
-
-    pub fn reversed_chars_at(&self, start: usize) -> impl Iterator<Item = char> + '_ {
-        self.reversed_chunks_in_range(0..start)
-            .flat_map(|chunk| chunk.chars().rev())
-    }
-
-    pub fn bytes_in_range(&self, range: Range<usize>) -> Bytes<'_> {
-        Bytes::new(self, range, false)
-    }
-
-    pub fn reversed_bytes_in_range(&self, range: Range<usize>) -> Bytes<'_> {
-        Bytes::new(self, range, true)
-    }
-
-    pub fn chunks(&self) -> Chunks<'_> {
-        self.chunks_in_range(0..self.len())
-    }
-
-    pub fn chunks_in_range(&self, range: Range<usize>) -> Chunks<'_> {
-        Chunks::new(self, range, false)
-    }
-
-    pub fn reversed_chunks_in_range(&self, range: Range<usize>) -> Chunks<'_> {
-        Chunks::new(self, range, true)
-    }
-
-    pub fn offset_to_offset_utf16(&self, offset: usize) -> OffsetUtf16 {
-        if offset >= self.summary().len {
-            return self.summary().len_utf16;
-        }
-        let (start, _, item) =
-            self.chunks
-                .find::<Dimensions<usize, OffsetUtf16>, _>((), &offset, Bias::Left);
-        let overshoot = offset - start.0;
-        start.1
-            + item.map_or(Default::default(), |chunk| {
-                chunk.as_slice().offset_to_offset_utf16(overshoot)
-            })
-    }
-
-    pub fn offset_utf16_to_offset(&self, offset: OffsetUtf16) -> usize {
-        if offset >= self.summary().len_utf16 {
-            return self.summary().len;
-        }
-        let (start, _, item) =
-            self.chunks
-                .find::<Dimensions<OffsetUtf16, usize>, _>((), &offset, Bias::Left);
-        let overshoot = offset - start.0;
-        start.1
-            + item.map_or(Default::default(), |chunk| {
-                chunk.as_slice().offset_utf16_to_offset(overshoot)
-            })
-    }
-
-    pub fn offset_to_point(&self, offset: usize) -> Point {
-        if offset >= self.summary().len {
-            return self.summary().lines;
-        }
-        let (start, _, item) =
-            self.chunks
-                .find::<Dimensions<usize, Point>, _>((), &offset, Bias::Left);
-        let overshoot = offset - start.0;
-        start.1
-            + item.map_or(Point::zero(), |chunk| {
-                chunk.as_slice().offset_to_point(overshoot)
-            })
-    }
-
-    pub fn offset_to_point_utf16(&self, offset: usize) -> PointUtf16 {
-        if offset >= self.summary().len {
-            return self.summary().lines_utf16();
-        }
-        let (start, _, item) =
-            self.chunks
-                .find::<Dimensions<usize, PointUtf16>, _>((), &offset, Bias::Left);
-        let overshoot = offset - start.0;
-        start.1
-            + item.map_or(PointUtf16::zero(), |chunk| {
-                chunk.as_slice().offset_to_point_utf16(overshoot)
-            })
-    }
-
-    pub fn point_to_point_utf16(&self, point: Point) -> PointUtf16 {
-        if point >= self.summary().lines {
-            return self.summary().lines_utf16();
-        }
-        let (start, _, item) =
-            self.chunks
-                .find::<Dimensions<Point, PointUtf16>, _>((), &point, Bias::Left);
-        let overshoot = point - start.0;
-        start.1
-            + item.map_or(PointUtf16::zero(), |chunk| {
-                chunk.as_slice().point_to_point_utf16(overshoot)
-            })
-    }
-
-    pub fn point_utf16_to_point(&self, point: PointUtf16) -> Point {
-        if point >= self.summary().lines_utf16() {
-            return self.summary().lines;
-        }
-        let mut cursor = self.chunks.cursor::<Dimensions<PointUtf16, Point>>(());
-        cursor.seek(&point, Bias::Left);
-        let overshoot = point - cursor.start().0;
-        cursor.start().1
-            + cursor.item().map_or(Point::zero(), |chunk| {
-                chunk
-                    .as_slice()
-                    .offset_to_point(chunk.as_slice().point_utf16_to_offset(overshoot, false))
-            })
-    }
-
-    #[instrument(skip_all)]
-    pub fn point_to_offset(&self, point: Point) -> usize {
-        if point >= self.summary().lines {
-            return self.summary().len;
-        }
-        let (start, _, item) =
-            self.chunks
-                .find::<Dimensions<Point, usize>, _>((), &point, Bias::Left);
-        let overshoot = point - start.0;
-        start.1 + item.map_or(0, |chunk| chunk.as_slice().point_to_offset(overshoot))
-    }
-
-    pub fn point_to_offset_utf16(&self, point: Point) -> OffsetUtf16 {
-        if point >= self.summary().lines {
-            return self.summary().len_utf16;
-        }
-        let mut cursor = self.chunks.cursor::<Dimensions<Point, OffsetUtf16>>(());
-        cursor.seek(&point, Bias::Left);
-        let overshoot = point - cursor.start().0;
-        cursor.start().1
-            + cursor.item().map_or(OffsetUtf16(0), |chunk| {
-                chunk.as_slice().point_to_offset_utf16(overshoot)
-            })
-    }
-
-    pub fn point_utf16_to_offset(&self, point: PointUtf16) -> usize {
-        self.point_utf16_to_offset_impl(point, false)
-    }
-
-    pub fn point_utf16_to_offset_utf16(&self, point: PointUtf16) -> OffsetUtf16 {
-        self.point_utf16_to_offset_utf16_impl(point, false)
-    }
-
-    pub fn unclipped_point_utf16_to_offset(&self, point: Unclipped<PointUtf16>) -> usize {
-        self.point_utf16_to_offset_impl(point.0, true)
-    }
-
-    fn point_utf16_to_offset_impl(&self, point: PointUtf16, clip: bool) -> usize {
-        if point >= self.summary().lines_utf16() {
-            return self.summary().len;
-        }
-        let (start, _, item) =
-            self.chunks
-                .find::<Dimensions<PointUtf16, usize>, _>((), &point, Bias::Left);
-        let overshoot = point - start.0;
-        start.1
-            + item.map_or(0, |chunk| {
-                chunk.as_slice().point_utf16_to_offset(overshoot, clip)
-            })
-    }
-
-    fn point_utf16_to_offset_utf16_impl(&self, point: PointUtf16, clip: bool) -> OffsetUtf16 {
-        if point >= self.summary().lines_utf16() {
-            return self.summary().len_utf16;
-        }
-        let mut cursor = self
-            .chunks
-            .cursor::<Dimensions<PointUtf16, OffsetUtf16>>(());
-        cursor.seek(&point, Bias::Left);
-        let overshoot = point - cursor.start().0;
-        cursor.start().1
-            + cursor.item().map_or(OffsetUtf16(0), |chunk| {
-                chunk
-                    .as_slice()
-                    .offset_to_offset_utf16(chunk.as_slice().point_utf16_to_offset(overshoot, clip))
-            })
-    }
-
-    pub fn unclipped_point_utf16_to_point(&self, point: Unclipped<PointUtf16>) -> Point {
-        if point.0 >= self.summary().lines_utf16() {
-            return self.summary().lines;
-        }
-        let (start, _, item) =
-            self.chunks
-                .find::<Dimensions<PointUtf16, Point>, _>((), &point.0, Bias::Left);
-        let overshoot = Unclipped(point.0 - start.0);
-        start.1
-            + item.map_or(Point::zero(), |chunk| {
-                chunk.as_slice().unclipped_point_utf16_to_point(overshoot)
-            })
-    }
-
-    pub fn clip_offset(&self, offset: usize, bias: Bias) -> usize {
-        match bias {
-            Bias::Left => self.floor_char_boundary(offset),
-            Bias::Right => self.ceil_char_boundary(offset),
-        }
-    }
-
-    pub fn clip_offset_utf16(&self, offset: OffsetUtf16, bias: Bias) -> OffsetUtf16 {
-        let (start, _, item) = self.chunks.find::<OffsetUtf16, _>((), &offset, Bias::Right);
-        if let Some(chunk) = item {
-            let overshoot = offset - start;
-            start + chunk.as_slice().clip_offset_utf16(overshoot, bias)
-        } else {
-            self.summary().len_utf16
-        }
-    }
-
-    pub fn clip_point(&self, point: Point, bias: Bias) -> Point {
-        let (start, _, item) = self.chunks.find::<Point, _>((), &point, Bias::Right);
-        if let Some(chunk) = item {
-            let overshoot = point - start;
-            start + chunk.as_slice().clip_point(overshoot, bias)
-        } else {
-            self.summary().lines
-        }
-    }
-
-    pub fn clip_point_utf16(&self, point: Unclipped<PointUtf16>, bias: Bias) -> PointUtf16 {
-        let (start, _, item) = self.chunks.find::<PointUtf16, _>((), &point.0, Bias::Right);
-        if let Some(chunk) = item {
-            let overshoot = Unclipped(point.0 - start);
-            start + chunk.as_slice().clip_point_utf16(overshoot, bias)
-        } else {
-            self.summary().lines_utf16()
-        }
-    }
-
-    pub fn line_len(&self, row: u32) -> u32 {
-        self.clip_point(Point::new(row, u32::MAX), Bias::Left)
-            .column
-    }
-}
-
-impl<'a> From<&'a str> for Rope {
-    fn from(text: &'a str) -> Self {
-        let mut rope = Self::new();
-        rope.push(text);
-        rope
-    }
-}
-
-impl<'a> FromIterator<&'a str> for Rope {
-    fn from_iter<T: IntoIterator<Item = &'a str>>(iter: T) -> Self {
-        let mut rope = Rope::new();
-        for chunk in iter {
-            rope.push(chunk);
-        }
-        rope
-    }
-}
-
-impl From<String> for Rope {
-    #[inline(always)]
-    fn from(text: String) -> Self {
-        Rope::from(text.as_str())
-    }
-}
-
-impl From<&String> for Rope {
-    #[inline(always)]
-    fn from(text: &String) -> Self {
-        Rope::from(text.as_str())
-    }
-}
-
-impl fmt::Display for Rope {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        for chunk in self.chunks() {
-            write!(f, "{}", chunk)?;
-        }
-        Ok(())
-    }
-}
-
-impl fmt::Debug for Rope {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        use std::fmt::Write as _;
-
-        write!(f, "\"")?;
-        let mut format_string = String::new();
-        for chunk in self.chunks() {
-            write!(&mut format_string, "{:?}", chunk)?;
-            write!(f, "{}", &format_string[1..format_string.len() - 1])?;
-            format_string.clear();
-        }
-        write!(f, "\"")?;
-        Ok(())
-    }
-}
-
-pub struct Cursor<'a> {
-    rope: &'a Rope,
-    chunks: sum_tree::Cursor<'a, 'static, Chunk, usize>,
-    offset: usize,
-}
-
-impl<'a> Cursor<'a> {
-    pub fn new(rope: &'a Rope, offset: usize) -> Self {
-        let mut chunks = rope.chunks.cursor(());
-        chunks.seek(&offset, Bias::Right);
-        Self {
-            rope,
-            chunks,
-            offset,
-        }
-    }
-
-    pub fn seek_forward(&mut self, end_offset: usize) {
-        debug_assert!(end_offset >= self.offset);
-
-        self.chunks.seek_forward(&end_offset, Bias::Right);
-        self.offset = end_offset;
-    }
-
-    pub fn slice(&mut self, end_offset: usize) -> Rope {
-        debug_assert!(
-            end_offset >= self.offset,
-            "cannot slice backwards from {} to {}",
-            self.offset,
-            end_offset
-        );
-
-        let mut slice = Rope::new();
-        if let Some(start_chunk) = self.chunks.item() {
-            let start_ix = self.offset - self.chunks.start();
-            let end_ix = cmp::min(end_offset, self.chunks.end()) - self.chunks.start();
-            slice.push_chunk(start_chunk.slice(start_ix..end_ix));
-        }
-
-        if end_offset > self.chunks.end() {
-            self.chunks.next();
-            slice.append(Rope {
-                chunks: self.chunks.slice(&end_offset, Bias::Right),
-            });
-            if let Some(end_chunk) = self.chunks.item() {
-                let end_ix = end_offset - self.chunks.start();
-                slice.push_chunk(end_chunk.slice(0..end_ix));
-            }
-        }
-
-        self.offset = end_offset;
-        slice
-    }
-
-    pub fn summary<D: TextDimension>(&mut self, end_offset: usize) -> D {
-        debug_assert!(end_offset >= self.offset);
-
-        let mut summary = D::zero(());
-        if let Some(start_chunk) = self.chunks.item() {
-            let start_ix = self.offset - self.chunks.start();
-            let end_ix = cmp::min(end_offset, self.chunks.end()) - self.chunks.start();
-            summary.add_assign(&D::from_chunk(start_chunk.slice(start_ix..end_ix)));
-        }
-
-        if end_offset > self.chunks.end() {
-            self.chunks.next();
-            summary.add_assign(&self.chunks.summary(&end_offset, Bias::Right));
-            if let Some(end_chunk) = self.chunks.item() {
-                let end_ix = end_offset - self.chunks.start();
-                summary.add_assign(&D::from_chunk(end_chunk.slice(0..end_ix)));
-            }
-        }
-
-        self.offset = end_offset;
-        summary
-    }
-
-    pub fn suffix(mut self) -> Rope {
-        self.slice(self.rope.chunks.extent(()))
-    }
-
-    pub fn offset(&self) -> usize {
-        self.offset
-    }
-}
-
-pub struct ChunkBitmaps<'a> {
-    /// A slice of text up to 128 bytes in size
-    pub text: &'a str,
-    /// Bitmap of character locations in text. LSB ordered
-    pub chars: Bitmap,
-    /// Bitmap of tab locations in text. LSB ordered
-    pub tabs: Bitmap,
-}
-
-#[derive(Clone)]
-pub struct Chunks<'a> {
-    chunks: sum_tree::Cursor<'a, 'static, Chunk, usize>,
-    range: Range<usize>,
-    offset: usize,
-    reversed: bool,
-}
-
-impl<'a> Chunks<'a> {
-    pub fn new(rope: &'a Rope, range: Range<usize>, reversed: bool) -> Self {
-        let mut chunks = rope.chunks.cursor(());
-        let offset = if reversed {
-            chunks.seek(&range.end, Bias::Left);
-            range.end
-        } else {
-            chunks.seek(&range.start, Bias::Right);
-            range.start
-        };
-        let chunk_offset = offset - chunks.start();
-        if let Some(chunk) = chunks.item() {
-            chunk.assert_char_boundary::<true>(chunk_offset);
-        }
-        Self {
-            chunks,
-            range,
-            offset,
-            reversed,
-        }
-    }
-
-    fn offset_is_valid(&self) -> bool {
-        if self.reversed {
-            if self.offset <= self.range.start || self.offset > self.range.end {
-                return false;
-            }
-        } else if self.offset < self.range.start || self.offset >= self.range.end {
-            return false;
-        }
-
-        true
-    }
-
-    pub fn offset(&self) -> usize {
-        self.offset
-    }
-
-    pub fn seek(&mut self, mut offset: usize) {
-        offset = offset.clamp(self.range.start, self.range.end);
-
-        if self.reversed {
-            if offset > self.chunks.end() {
-                self.chunks.seek_forward(&offset, Bias::Left);
-            } else if offset <= *self.chunks.start() {
-                self.chunks.seek(&offset, Bias::Left);
-            }
-        } else {
-            if offset >= self.chunks.end() {
-                self.chunks.seek_forward(&offset, Bias::Right);
-            } else if offset < *self.chunks.start() {
-                self.chunks.seek(&offset, Bias::Right);
-            }
-        };
-
-        self.offset = offset;
-    }
-
-    pub fn set_range(&mut self, range: Range<usize>) {
-        self.range = range.clone();
-        self.seek(range.start);
-    }
-
-    /// Moves this cursor to the start of the next line in the rope.
-    ///
-    /// This method advances the cursor to the beginning of the next line.
-    /// If the cursor is already at the end of the rope, this method does nothing.
-    /// Reversed chunks iterators are not currently supported and will panic.
-    ///
-    /// Returns `true` if the cursor was successfully moved to the next line start,
-    /// or `false` if the cursor was already at the end of the rope.
-    pub fn next_line(&mut self) -> bool {
-        assert!(!self.reversed);
-
-        let mut found = false;
-        if let Some(chunk) = self.peek() {
-            if let Some(newline_ix) = chunk.find('\n') {
-                self.offset += newline_ix + 1;
-                found = self.offset <= self.range.end;
-            } else {
-                self.chunks
-                    .search_forward(|summary| summary.text.lines.row > 0);
-                self.offset = *self.chunks.start();
-
-                if let Some(newline_ix) = self.peek().and_then(|chunk| chunk.find('\n')) {
-                    self.offset += newline_ix + 1;
-                    found = self.offset <= self.range.end;
-                } else {
-                    self.offset = self.chunks.end();
-                }
-            }
-
-            if self.offset == self.chunks.end() {
-                self.next();
-            }
-        }
-
-        if self.offset > self.range.end {
-            self.offset = cmp::min(self.offset, self.range.end);
-            self.chunks.seek(&self.offset, Bias::Right);
-        }
-
-        found
-    }
-
-    /// Move this cursor to the preceding position in the rope that starts a new line.
-    /// Reversed chunks iterators are not currently supported and will panic.
-    ///
-    /// If this cursor is not on the start of a line, it will be moved to the start of
-    /// its current line. Otherwise it will be moved to the start of the previous line.
-    /// It updates the cursor's position and returns true if a previous line was found,
-    /// or false if the cursor was already at the start of the rope.
-    pub fn prev_line(&mut self) -> bool {
-        assert!(!self.reversed);
-
-        let initial_offset = self.offset;
-
-        if self.offset == *self.chunks.start() {
-            self.chunks.prev();
-        }
-
-        if let Some(chunk) = self.chunks.item() {
-            let mut end_ix = self.offset - *self.chunks.start();
-            if chunk.text.as_bytes()[end_ix - 1] == b'\n' {
-                end_ix -= 1;
-            }
-
-            if let Some(newline_ix) = chunk.text[..end_ix].rfind('\n') {
-                self.offset = *self.chunks.start() + newline_ix + 1;
-                if self.offset_is_valid() {
-                    return true;
-                }
-            }
-        }
-
-        self.chunks
-            .search_backward(|summary| summary.text.lines.row > 0);
-        self.offset = *self.chunks.start();
-        if let Some(chunk) = self.chunks.item()
-            && let Some(newline_ix) = chunk.text.rfind('\n')
-        {
-            self.offset += newline_ix + 1;
-            if self.offset_is_valid() {
-                if self.offset == self.chunks.end() {
-                    self.chunks.next();
-                }
-
-                return true;
-            }
-        }
-
-        if !self.offset_is_valid() || self.chunks.item().is_none() {
-            self.offset = self.range.start;
-            self.chunks.seek(&self.offset, Bias::Right);
-        }
-
-        self.offset < initial_offset && self.offset == 0
-    }
-
-    pub fn peek(&self) -> Option<&'a str> {
-        if !self.offset_is_valid() {
-            return None;
-        }
-
-        let chunk = self.chunks.item()?;
-        let chunk_start = *self.chunks.start();
-        let slice_range = if self.reversed {
-            let slice_start = cmp::max(chunk_start, self.range.start) - chunk_start;
-            let slice_end = self.offset - chunk_start;
-            slice_start..slice_end
-        } else {
-            let slice_start = self.offset - chunk_start;
-            let slice_end = cmp::min(self.chunks.end(), self.range.end) - chunk_start;
-            slice_start..slice_end
-        };
-
-        Some(&chunk.text[slice_range])
-    }
-
-    /// Returns bitmaps that represent character positions and tab positions
-    pub fn peek_with_bitmaps(&self) -> Option<ChunkBitmaps<'a>> {
-        if !self.offset_is_valid() {
-            return None;
-        }
-
-        let chunk = self.chunks.item()?;
-        let chunk_start = *self.chunks.start();
-        let slice_range = if self.reversed {
-            let slice_start = cmp::max(chunk_start, self.range.start) - chunk_start;
-            let slice_end = self.offset - chunk_start;
-            slice_start..slice_end
-        } else {
-            let slice_start = self.offset - chunk_start;
-            let slice_end = cmp::min(self.chunks.end(), self.range.end) - chunk_start;
-            slice_start..slice_end
-        };
-        let chunk_start_offset = slice_range.start;
-        let slice_text = &chunk.text[slice_range];
-
-        // Shift the tabs to align with our slice window
-        let shifted_tabs = chunk.tabs() >> chunk_start_offset;
-        let shifted_chars = chunk.chars() >> chunk_start_offset;
-
-        Some(ChunkBitmaps {
-            text: slice_text,
-            chars: shifted_chars,
-            tabs: shifted_tabs,
-        })
-    }
-
-    pub fn lines(self) -> Lines<'a> {
-        let reversed = self.reversed;
-        Lines {
-            chunks: self,
-            current_line: String::new(),
-            done: false,
-            reversed,
-        }
-    }
-
-    pub fn equals_str(&self, other: &str) -> bool {
-        let chunk = self.clone();
-        if chunk.reversed {
-            let mut offset = other.len();
-            for chunk in chunk {
-                if other[0..offset].ends_with(chunk) {
-                    offset -= chunk.len();
-                } else {
-                    return false;
-                }
-            }
-            if offset != 0 {
-                return false;
-            }
-        } else {
-            let mut offset = 0;
-            for chunk in chunk {
-                if offset >= other.len() {
-                    return false;
-                }
-                if other[offset..].starts_with(chunk) {
-                    offset += chunk.len();
-                } else {
-                    return false;
-                }
-            }
-            if offset != other.len() {
-                return false;
-            }
-        }
-
-        true
-    }
-}
-
-pub struct ChunkWithBitmaps<'a>(pub Chunks<'a>);
-
-impl<'a> Iterator for ChunkWithBitmaps<'a> {
-    /// text, chars bitmap, tabs bitmap
-    type Item = ChunkBitmaps<'a>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        let chunk_bitmaps = self.0.peek_with_bitmaps()?;
-        if self.0.reversed {
-            self.0.offset -= chunk_bitmaps.text.len();
-            if self.0.offset <= *self.0.chunks.start() {
-                self.0.chunks.prev();
-            }
-        } else {
-            self.0.offset += chunk_bitmaps.text.len();
-            if self.0.offset >= self.0.chunks.end() {
-                self.0.chunks.next();
-            }
-        }
-
-        Some(chunk_bitmaps)
-    }
-}
-
-impl<'a> Iterator for Chunks<'a> {
-    type Item = &'a str;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        let chunk = self.peek()?;
-        if self.reversed {
-            self.offset -= chunk.len();
-            if self.offset <= *self.chunks.start() {
-                self.chunks.prev();
-            }
-        } else {
-            self.offset += chunk.len();
-            if self.offset >= self.chunks.end() {
-                self.chunks.next();
-            }
-        }
-
-        Some(chunk)
-    }
-}
-
-pub struct Bytes<'a> {
-    chunks: sum_tree::Cursor<'a, 'static, Chunk, usize>,
-    range: Range<usize>,
-    reversed: bool,
-}
-
-impl<'a> Bytes<'a> {
-    pub fn new(rope: &'a Rope, range: Range<usize>, reversed: bool) -> Self {
-        let mut chunks = rope.chunks.cursor(());
-        if reversed {
-            chunks.seek(&range.end, Bias::Left);
-        } else {
-            chunks.seek(&range.start, Bias::Right);
-        }
-        Self {
-            chunks,
-            range,
-            reversed,
-        }
-    }
-
-    pub fn peek(&self) -> Option<&'a [u8]> {
-        let chunk = self.chunks.item()?;
-        if self.reversed && self.range.start >= self.chunks.end() {
-            return None;
-        }
-        let chunk_start = *self.chunks.start();
-        if self.range.end <= chunk_start {
-            return None;
-        }
-        let start = self.range.start.saturating_sub(chunk_start);
-        let end = self.range.end - chunk_start;
-        Some(&chunk.text.as_bytes()[start..chunk.text.len().min(end)])
-    }
-}
-
-impl<'a> Iterator for Bytes<'a> {
-    type Item = &'a [u8];
-
-    fn next(&mut self) -> Option<Self::Item> {
-        let result = self.peek();
-        if result.is_some() {
-            if self.reversed {
-                self.chunks.prev();
-            } else {
-                self.chunks.next();
-            }
-        }
-        result
-    }
-}
-
-impl io::Read for Bytes<'_> {
-    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        if let Some(chunk) = self.peek() {
-            let len = cmp::min(buf.len(), chunk.len());
-            if self.reversed {
-                buf[..len].copy_from_slice(&chunk[chunk.len() - len..]);
-                buf[..len].reverse();
-                self.range.end -= len;
-            } else {
-                buf[..len].copy_from_slice(&chunk[..len]);
-                self.range.start += len;
-            }
-
-            if len == chunk.len() {
-                if self.reversed {
-                    self.chunks.prev();
-                } else {
-                    self.chunks.next();
-                }
-            }
-            Ok(len)
-        } else {
-            Ok(0)
-        }
-    }
-}
-
-pub struct Lines<'a> {
-    chunks: Chunks<'a>,
-    current_line: String,
-    done: bool,
-    reversed: bool,
-}
-
-impl<'a> Lines<'a> {
-    pub fn next(&mut self) -> Option<&str> {
-        if self.done {
-            return None;
-        }
-
-        self.current_line.clear();
-
-        while let Some(chunk) = self.chunks.peek() {
-            let chunk_lines = chunk.split('\n');
-            if self.reversed {
-                let mut chunk_lines = chunk_lines.rev().peekable();
-                if let Some(chunk_line) = chunk_lines.next() {
-                    let done = chunk_lines.peek().is_some();
-                    if done {
-                        self.chunks
-                            .seek(self.chunks.offset() - chunk_line.len() - "\n".len());
-                        if self.current_line.is_empty() {
-                            return Some(chunk_line);
-                        }
-                    }
-                    self.current_line.insert_str(0, chunk_line);
-                    if done {
-                        return Some(&self.current_line);
-                    }
-                }
-            } else {
-                let mut chunk_lines = chunk_lines.peekable();
-                if let Some(chunk_line) = chunk_lines.next() {
-                    let done = chunk_lines.peek().is_some();
-                    if done {
-                        self.chunks
-                            .seek(self.chunks.offset() + chunk_line.len() + "\n".len());
-                        if self.current_line.is_empty() {
-                            return Some(chunk_line);
-                        }
-                    }
-                    self.current_line.push_str(chunk_line);
-                    if done {
-                        return Some(&self.current_line);
-                    }
-                }
-            }
-
-            self.chunks.next();
-        }
-
-        self.done = true;
-        Some(&self.current_line)
-    }
-
-    pub fn seek(&mut self, offset: usize) {
-        self.chunks.seek(offset);
-        self.current_line.clear();
-        self.done = false;
-    }
-
-    pub fn offset(&self) -> usize {
-        self.chunks.offset()
-    }
-}
-
-impl sum_tree::Item for Chunk {
-    type Summary = ChunkSummary;
-
-    fn summary(&self, _cx: ()) -> Self::Summary {
-        ChunkSummary {
-            text: self.as_slice().text_summary(),
-        }
-    }
-}
-
-#[derive(Clone, Debug, Default, Eq, PartialEq)]
-pub struct ChunkSummary {
-    text: TextSummary,
-}
-
-impl sum_tree::ContextLessSummary for ChunkSummary {
-    fn zero() -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, summary: &Self) {
-        self.text += &summary.text;
-    }
-}
-
-/// Summary of a string of text.
-#[derive(Copy, Clone, Debug, Default, Eq, PartialEq)]
-pub struct TextSummary {
-    /// Length in bytes.
-    pub len: usize,
-    /// Length in UTF-8.
-    pub chars: usize,
-    /// Length in UTF-16 code units
-    pub len_utf16: OffsetUtf16,
-    /// A point representing the number of lines and the length of the last line.
-    ///
-    /// In other words, it marks the point after the last byte in the text, (if
-    /// EOF was a character, this would be its position).
-    pub lines: Point,
-    /// How many `char`s are in the first line
-    pub first_line_chars: u32,
-    /// How many `char`s are in the last line
-    pub last_line_chars: u32,
-    /// How many UTF-16 code units are in the last line
-    pub last_line_len_utf16: u32,
-    /// The row idx of the longest row
-    pub longest_row: u32,
-    /// How many `char`s are in the longest row
-    pub longest_row_chars: u32,
-}
-
-impl TextSummary {
-    pub fn lines_utf16(&self) -> PointUtf16 {
-        PointUtf16 {
-            row: self.lines.row,
-            column: self.last_line_len_utf16,
-        }
-    }
-
-    pub fn newline() -> Self {
-        Self {
-            len: 1,
-            chars: 1,
-            len_utf16: OffsetUtf16(1),
-            first_line_chars: 0,
-            last_line_chars: 0,
-            last_line_len_utf16: 0,
-            lines: Point::new(1, 0),
-            longest_row: 0,
-            longest_row_chars: 0,
-        }
-    }
-
-    pub fn add_newline(&mut self) {
-        self.len += 1;
-        self.len_utf16 += OffsetUtf16(self.len_utf16.0 + 1);
-        self.last_line_chars = 0;
-        self.last_line_len_utf16 = 0;
-        self.lines += Point::new(1, 0);
-    }
-}
-
-impl<'a> From<&'a str> for TextSummary {
-    fn from(text: &'a str) -> Self {
-        let mut len_utf16 = OffsetUtf16(0);
-        let mut lines = Point::new(0, 0);
-        let mut first_line_chars = 0;
-        let mut last_line_chars = 0;
-        let mut last_line_len_utf16 = 0;
-        let mut longest_row = 0;
-        let mut longest_row_chars = 0;
-        let mut chars = 0;
-        for c in text.chars() {
-            chars += 1;
-            len_utf16.0 += c.len_utf16();
-
-            if c == '\n' {
-                lines += Point::new(1, 0);
-                last_line_len_utf16 = 0;
-                last_line_chars = 0;
-            } else {
-                lines.column += c.len_utf8() as u32;
-                last_line_len_utf16 += c.len_utf16() as u32;
-                last_line_chars += 1;
-            }
-
-            if lines.row == 0 {
-                first_line_chars = last_line_chars;
-            }
-
-            if last_line_chars > longest_row_chars {
-                longest_row = lines.row;
-                longest_row_chars = last_line_chars;
-            }
-        }
-
-        TextSummary {
-            len: text.len(),
-            chars,
-            len_utf16,
-            lines,
-            first_line_chars,
-            last_line_chars,
-            last_line_len_utf16,
-            longest_row,
-            longest_row_chars,
-        }
-    }
-}
-
-impl sum_tree::ContextLessSummary for TextSummary {
-    fn zero() -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, summary: &Self) {
-        *self += summary;
-    }
-}
-
-impl ops::Add<Self> for TextSummary {
-    type Output = Self;
-
-    fn add(mut self, rhs: Self) -> Self::Output {
-        AddAssign::add_assign(&mut self, &rhs);
-        self
-    }
-}
-
-impl<'a> ops::AddAssign<&'a Self> for TextSummary {
-    fn add_assign(&mut self, other: &'a Self) {
-        let joined_chars = self.last_line_chars + other.first_line_chars;
-        if joined_chars > self.longest_row_chars {
-            self.longest_row = self.lines.row;
-            self.longest_row_chars = joined_chars;
-        }
-        if other.longest_row_chars > self.longest_row_chars {
-            self.longest_row = self.lines.row + other.longest_row;
-            self.longest_row_chars = other.longest_row_chars;
-        }
-
-        if self.lines.row == 0 {
-            self.first_line_chars += other.first_line_chars;
-        }
-
-        if other.lines.row == 0 {
-            self.last_line_chars += other.first_line_chars;
-            self.last_line_len_utf16 += other.last_line_len_utf16;
-        } else {
-            self.last_line_chars = other.last_line_chars;
-            self.last_line_len_utf16 = other.last_line_len_utf16;
-        }
-
-        self.chars += other.chars;
-        self.len += other.len;
-        self.len_utf16 += other.len_utf16;
-        self.lines += other.lines;
-    }
-}
-
-impl ops::AddAssign<Self> for TextSummary {
-    fn add_assign(&mut self, other: Self) {
-        *self += &other;
-    }
-}
-
-pub trait TextDimension:
-    'static + Clone + Copy + Default + for<'a> Dimension<'a, ChunkSummary> + std::fmt::Debug
-{
-    fn from_text_summary(summary: &TextSummary) -> Self;
-    fn from_chunk(chunk: ChunkSlice) -> Self;
-    fn add_assign(&mut self, other: &Self);
-}
-
-impl<D1: TextDimension, D2: TextDimension> TextDimension for Dimensions<D1, D2, ()> {
-    fn from_text_summary(summary: &TextSummary) -> Self {
-        Dimensions(
-            D1::from_text_summary(summary),
-            D2::from_text_summary(summary),
-            (),
-        )
-    }
-
-    fn from_chunk(chunk: ChunkSlice) -> Self {
-        Dimensions(D1::from_chunk(chunk), D2::from_chunk(chunk), ())
-    }
-
-    fn add_assign(&mut self, other: &Self) {
-        self.0.add_assign(&other.0);
-        self.1.add_assign(&other.1);
-    }
-}
-
-impl<'a> sum_tree::Dimension<'a, ChunkSummary> for TextSummary {
-    fn zero(_cx: ()) -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, summary: &'a ChunkSummary, _: ()) {
-        *self += &summary.text;
-    }
-}
-
-impl TextDimension for TextSummary {
-    fn from_text_summary(summary: &TextSummary) -> Self {
-        *summary
-    }
-
-    fn from_chunk(chunk: ChunkSlice) -> Self {
-        chunk.text_summary()
-    }
-
-    fn add_assign(&mut self, other: &Self) {
-        *self += other;
-    }
-}
-
-impl<'a> sum_tree::Dimension<'a, ChunkSummary> for usize {
-    fn zero(_cx: ()) -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, summary: &'a ChunkSummary, _: ()) {
-        *self += summary.text.len;
-    }
-}
-
-impl TextDimension for usize {
-    fn from_text_summary(summary: &TextSummary) -> Self {
-        summary.len
-    }
-
-    fn from_chunk(chunk: ChunkSlice) -> Self {
-        chunk.len()
-    }
-
-    fn add_assign(&mut self, other: &Self) {
-        *self += other;
-    }
-}
-
-impl<'a> sum_tree::Dimension<'a, ChunkSummary> for OffsetUtf16 {
-    fn zero(_cx: ()) -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, summary: &'a ChunkSummary, _: ()) {
-        *self += summary.text.len_utf16;
-    }
-}
-
-impl TextDimension for OffsetUtf16 {
-    fn from_text_summary(summary: &TextSummary) -> Self {
-        summary.len_utf16
-    }
-
-    fn from_chunk(chunk: ChunkSlice) -> Self {
-        chunk.len_utf16()
-    }
-
-    fn add_assign(&mut self, other: &Self) {
-        *self += other;
-    }
-}
-
-impl<'a> sum_tree::Dimension<'a, ChunkSummary> for Point {
-    fn zero(_cx: ()) -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, summary: &'a ChunkSummary, _: ()) {
-        *self += summary.text.lines;
-    }
-}
-
-impl TextDimension for Point {
-    fn from_text_summary(summary: &TextSummary) -> Self {
-        summary.lines
-    }
-
-    fn from_chunk(chunk: ChunkSlice) -> Self {
-        chunk.lines()
-    }
-
-    fn add_assign(&mut self, other: &Self) {
-        *self += other;
-    }
-}
-
-impl<'a> sum_tree::Dimension<'a, ChunkSummary> for PointUtf16 {
-    fn zero(_cx: ()) -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, summary: &'a ChunkSummary, _: ()) {
-        *self += summary.text.lines_utf16();
-    }
-}
-
-impl TextDimension for PointUtf16 {
-    fn from_text_summary(summary: &TextSummary) -> Self {
-        summary.lines_utf16()
-    }
-
-    fn from_chunk(chunk: ChunkSlice) -> Self {
-        PointUtf16 {
-            row: chunk.lines().row,
-            column: chunk.last_line_len_utf16(),
-        }
-    }
-
-    fn add_assign(&mut self, other: &Self) {
-        *self += other;
-    }
-}
-
-/// A pair of text dimensions in which only the first dimension is used for comparison,
-/// but both dimensions are updated during addition and subtraction.
-#[derive(Clone, Copy, Debug)]
-pub struct DimensionPair<K, V> {
-    pub key: K,
-    pub value: Option<V>,
-}
-
-impl<K: Default, V: Default> Default for DimensionPair<K, V> {
-    fn default() -> Self {
-        Self {
-            key: Default::default(),
-            value: Some(Default::default()),
-        }
-    }
-}
-
-impl<K, V> cmp::Ord for DimensionPair<K, V>
-where
-    K: cmp::Ord,
-{
-    fn cmp(&self, other: &Self) -> cmp::Ordering {
-        self.key.cmp(&other.key)
-    }
-}
-
-impl<K, V> cmp::PartialOrd for DimensionPair<K, V>
-where
-    K: cmp::PartialOrd,
-{
-    fn partial_cmp(&self, other: &Self) -> Option<cmp::Ordering> {
-        self.key.partial_cmp(&other.key)
-    }
-}
-
-impl<K, V> cmp::PartialEq for DimensionPair<K, V>
-where
-    K: cmp::PartialEq,
-{
-    fn eq(&self, other: &Self) -> bool {
-        self.key.eq(&other.key)
-    }
-}
-
-impl<R, R2, K, V> ops::Sub for DimensionPair<K, V>
-where
-    K: ops::Sub<K, Output = R>,
-    V: ops::Sub<V, Output = R2>,
-{
-    type Output = DimensionPair<R, R2>;
-
-    fn sub(self, rhs: Self) -> Self::Output {
-        DimensionPair {
-            key: self.key - rhs.key,
-            value: self.value.zip(rhs.value).map(|(a, b)| a - b),
-        }
-    }
-}
-
-impl<R, R2, K, V> ops::AddAssign<DimensionPair<R, R2>> for DimensionPair<K, V>
-where
-    K: ops::AddAssign<R>,
-    V: ops::AddAssign<R2>,
-{
-    fn add_assign(&mut self, rhs: DimensionPair<R, R2>) {
-        self.key += rhs.key;
-        if let Some(value) = &mut self.value {
-            if let Some(other_value) = rhs.value {
-                *value += other_value;
-            } else {
-                self.value.take();
-            }
-        }
-    }
-}
-
-impl<D> std::ops::AddAssign<DimensionPair<Point, D>> for Point {
-    fn add_assign(&mut self, rhs: DimensionPair<Point, D>) {
-        *self += rhs.key;
-    }
-}
-
-impl<K, V> cmp::Eq for DimensionPair<K, V> where K: cmp::Eq {}
-
-impl<'a, K, V, S> sum_tree::Dimension<'a, S> for DimensionPair<K, V>
-where
-    S: sum_tree::Summary,
-    K: sum_tree::Dimension<'a, S>,
-    V: sum_tree::Dimension<'a, S>,
-{
-    fn zero(cx: S::Context<'_>) -> Self {
-        Self {
-            key: K::zero(cx),
-            value: Some(V::zero(cx)),
-        }
-    }
-
-    fn add_summary(&mut self, summary: &'a S, cx: S::Context<'_>) {
-        self.key.add_summary(summary, cx);
-        if let Some(value) = &mut self.value {
-            value.add_summary(summary, cx);
-        }
-    }
-}
-
-impl<K, V> TextDimension for DimensionPair<K, V>
-where
-    K: TextDimension,
-    V: TextDimension,
-{
-    fn add_assign(&mut self, other: &Self) {
-        self.key.add_assign(&other.key);
-        if let Some(value) = &mut self.value {
-            if let Some(other_value) = other.value.as_ref() {
-                value.add_assign(other_value);
-            } else {
-                self.value.take();
-            }
-        }
-    }
-
-    fn from_chunk(chunk: ChunkSlice) -> Self {
-        Self {
-            key: K::from_chunk(chunk),
-            value: Some(V::from_chunk(chunk)),
-        }
-    }
-
-    fn from_text_summary(summary: &TextSummary) -> Self {
-        Self {
-            key: K::from_text_summary(summary),
-            value: Some(V::from_text_summary(summary)),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use Bias::{Left, Right};
-    use rand::prelude::*;
-    use std::{cmp::Ordering, env, io::Read};
-    use util::RandomCharIter;
-
-    #[ctor::ctor]
-    fn init_logger() {
-        zlog::init_test();
-    }
-
-    #[test]
-    fn test_all_4_byte_chars() {
-        let mut rope = Rope::new();
-        let text = "🏀".repeat(256);
-        rope.push(&text);
-        assert_eq!(rope.text(), text);
-    }
-
-    #[test]
-    fn test_clip() {
-        let rope = Rope::from("🧘");
-
-        assert_eq!(rope.clip_offset(1, Bias::Left), 0);
-        assert_eq!(rope.clip_offset(1, Bias::Right), 4);
-        assert_eq!(rope.clip_offset(5, Bias::Right), 4);
-
-        assert_eq!(
-            rope.clip_point(Point::new(0, 1), Bias::Left),
-            Point::new(0, 0)
-        );
-        assert_eq!(
-            rope.clip_point(Point::new(0, 1), Bias::Right),
-            Point::new(0, 4)
-        );
-        assert_eq!(
-            rope.clip_point(Point::new(0, 5), Bias::Right),
-            Point::new(0, 4)
-        );
-
-        assert_eq!(
-            rope.clip_point_utf16(Unclipped(PointUtf16::new(0, 1)), Bias::Left),
-            PointUtf16::new(0, 0)
-        );
-        assert_eq!(
-            rope.clip_point_utf16(Unclipped(PointUtf16::new(0, 1)), Bias::Right),
-            PointUtf16::new(0, 2)
-        );
-        assert_eq!(
-            rope.clip_point_utf16(Unclipped(PointUtf16::new(0, 3)), Bias::Right),
-            PointUtf16::new(0, 2)
-        );
-
-        assert_eq!(
-            rope.clip_offset_utf16(OffsetUtf16(1), Bias::Left),
-            OffsetUtf16(0)
-        );
-        assert_eq!(
-            rope.clip_offset_utf16(OffsetUtf16(1), Bias::Right),
-            OffsetUtf16(2)
-        );
-        assert_eq!(
-            rope.clip_offset_utf16(OffsetUtf16(3), Bias::Right),
-            OffsetUtf16(2)
-        );
-    }
-
-    #[test]
-    fn test_prev_next_line() {
-        let rope = Rope::from("abc\ndef\nghi\njkl");
-
-        let mut chunks = rope.chunks();
-        assert_eq!(chunks.peek().unwrap().chars().next().unwrap(), 'a');
-
-        assert!(chunks.next_line());
-        assert_eq!(chunks.peek().unwrap().chars().next().unwrap(), 'd');
-
-        assert!(chunks.next_line());
-        assert_eq!(chunks.peek().unwrap().chars().next().unwrap(), 'g');
-
-        assert!(chunks.next_line());
-        assert_eq!(chunks.peek().unwrap().chars().next().unwrap(), 'j');
-
-        assert!(!chunks.next_line());
-        assert_eq!(chunks.peek(), None);
-
-        assert!(chunks.prev_line());
-        assert_eq!(chunks.peek().unwrap().chars().next().unwrap(), 'j');
-
-        assert!(chunks.prev_line());
-        assert_eq!(chunks.peek().unwrap().chars().next().unwrap(), 'g');
-
-        assert!(chunks.prev_line());
-        assert_eq!(chunks.peek().unwrap().chars().next().unwrap(), 'd');
-
-        assert!(chunks.prev_line());
-        assert_eq!(chunks.peek().unwrap().chars().next().unwrap(), 'a');
-
-        assert!(!chunks.prev_line());
-        assert_eq!(chunks.peek().unwrap().chars().next().unwrap(), 'a');
-
-        // Only return true when the cursor has moved to the start of a line
-        let mut chunks = rope.chunks_in_range(5..7);
-        chunks.seek(6);
-        assert!(!chunks.prev_line());
-        assert_eq!(chunks.peek().unwrap().chars().next().unwrap(), 'e');
-
-        assert!(!chunks.next_line());
-        assert_eq!(chunks.peek(), None);
-    }
-
-    #[test]
-    fn test_lines() {
-        let rope = Rope::from("abc\ndefg\nhi");
-        let mut lines = rope.chunks().lines();
-        assert_eq!(lines.next(), Some("abc"));
-        assert_eq!(lines.next(), Some("defg"));
-        assert_eq!(lines.next(), Some("hi"));
-        assert_eq!(lines.next(), None);
-
-        let rope = Rope::from("abc\ndefg\nhi\n");
-        let mut lines = rope.chunks().lines();
-        assert_eq!(lines.next(), Some("abc"));
-        assert_eq!(lines.next(), Some("defg"));
-        assert_eq!(lines.next(), Some("hi"));
-        assert_eq!(lines.next(), Some(""));
-        assert_eq!(lines.next(), None);
-
-        let rope = Rope::from("abc\ndefg\nhi");
-        let mut lines = rope.reversed_chunks_in_range(0..rope.len()).lines();
-        assert_eq!(lines.next(), Some("hi"));
-        assert_eq!(lines.next(), Some("defg"));
-        assert_eq!(lines.next(), Some("abc"));
-        assert_eq!(lines.next(), None);
-
-        let rope = Rope::from("abc\ndefg\nhi\n");
-        let mut lines = rope.reversed_chunks_in_range(0..rope.len()).lines();
-        assert_eq!(lines.next(), Some(""));
-        assert_eq!(lines.next(), Some("hi"));
-        assert_eq!(lines.next(), Some("defg"));
-        assert_eq!(lines.next(), Some("abc"));
-        assert_eq!(lines.next(), None);
-
-        let rope = Rope::from("abc\nlonger line test\nhi");
-        let mut lines = rope.chunks().lines();
-        assert_eq!(lines.next(), Some("abc"));
-        assert_eq!(lines.next(), Some("longer line test"));
-        assert_eq!(lines.next(), Some("hi"));
-        assert_eq!(lines.next(), None);
-
-        let rope = Rope::from("abc\nlonger line test\nhi");
-        let mut lines = rope.reversed_chunks_in_range(0..rope.len()).lines();
-        assert_eq!(lines.next(), Some("hi"));
-        assert_eq!(lines.next(), Some("longer line test"));
-        assert_eq!(lines.next(), Some("abc"));
-        assert_eq!(lines.next(), None);
-    }
-
-    #[gpui::test(iterations = 100)]
-    fn test_random_rope(mut rng: StdRng) {
-        let operations = env::var("OPERATIONS")
-            .map(|i| i.parse().expect("invalid `OPERATIONS` variable"))
-            .unwrap_or(10);
-
-        let mut expected = String::new();
-        let mut actual = Rope::new();
-        for _ in 0..operations {
-            let end_ix = clip_offset(&expected, rng.random_range(0..=expected.len()), Right);
-            let start_ix = clip_offset(&expected, rng.random_range(0..=end_ix), Left);
-            let len = rng.random_range(0..=64);
-            let new_text: String = RandomCharIter::new(&mut rng).take(len).collect();
-
-            let mut new_actual = Rope::new();
-            let mut cursor = actual.cursor(0);
-            new_actual.append(cursor.slice(start_ix));
-            new_actual.push(&new_text);
-            cursor.seek_forward(end_ix);
-            new_actual.append(cursor.suffix());
-            actual = new_actual;
-
-            expected.replace_range(start_ix..end_ix, &new_text);
-
-            assert_eq!(actual.text(), expected);
-            log::info!("text: {:?}", expected);
-
-            for _ in 0..5 {
-                let end_ix = clip_offset(&expected, rng.random_range(0..=expected.len()), Right);
-                let start_ix = clip_offset(&expected, rng.random_range(0..=end_ix), Left);
-
-                let actual_text = actual.chunks_in_range(start_ix..end_ix).collect::<String>();
-                assert_eq!(actual_text, &expected[start_ix..end_ix]);
-
-                let mut actual_text = String::new();
-                actual
-                    .bytes_in_range(start_ix..end_ix)
-                    .read_to_string(&mut actual_text)
-                    .unwrap();
-                assert_eq!(actual_text, &expected[start_ix..end_ix]);
-
-                assert_eq!(
-                    actual
-                        .reversed_chunks_in_range(start_ix..end_ix)
-                        .collect::<Vec<&str>>()
-                        .into_iter()
-                        .rev()
-                        .collect::<String>(),
-                    &expected[start_ix..end_ix]
-                );
-
-                let mut expected_line_starts: Vec<_> = expected[start_ix..end_ix]
-                    .match_indices('\n')
-                    .map(|(index, _)| start_ix + index + 1)
-                    .collect();
-
-                let mut chunks = actual.chunks_in_range(start_ix..end_ix);
-
-                let mut actual_line_starts = Vec::new();
-                while chunks.next_line() {
-                    actual_line_starts.push(chunks.offset());
-                }
-                assert_eq!(
-                    actual_line_starts,
-                    expected_line_starts,
-                    "actual line starts != expected line starts when using next_line() for {:?} ({:?})",
-                    &expected[start_ix..end_ix],
-                    start_ix..end_ix
-                );
-
-                if start_ix < end_ix
-                    && (start_ix == 0 || expected.as_bytes()[start_ix - 1] == b'\n')
-                {
-                    expected_line_starts.insert(0, start_ix);
-                }
-                // Remove the last index if it starts at the end of the range.
-                if expected_line_starts.last() == Some(&end_ix) {
-                    expected_line_starts.pop();
-                }
-
-                let mut actual_line_starts = Vec::new();
-                while chunks.prev_line() {
-                    actual_line_starts.push(chunks.offset());
-                }
-                actual_line_starts.reverse();
-                assert_eq!(
-                    actual_line_starts,
-                    expected_line_starts,
-                    "actual line starts != expected line starts when using prev_line() for {:?} ({:?})",
-                    &expected[start_ix..end_ix],
-                    start_ix..end_ix
-                );
-
-                // Check that next_line/prev_line work correctly from random positions
-                let mut offset = rng.random_range(start_ix..=end_ix);
-                while !expected.is_char_boundary(offset) {
-                    offset -= 1;
-                }
-                chunks.seek(offset);
-
-                for _ in 0..5 {
-                    if rng.random() {
-                        let expected_next_line_start = expected[offset..end_ix]
-                            .find('\n')
-                            .map(|newline_ix| offset + newline_ix + 1);
-
-                        let moved = chunks.next_line();
-                        assert_eq!(
-                            moved,
-                            expected_next_line_start.is_some(),
-                            "unexpected result from next_line after seeking to {} in range {:?} ({:?})",
-                            offset,
-                            start_ix..end_ix,
-                            &expected[start_ix..end_ix]
-                        );
-                        if let Some(expected_next_line_start) = expected_next_line_start {
-                            assert_eq!(
-                                chunks.offset(),
-                                expected_next_line_start,
-                                "invalid position after seeking to {} in range {:?} ({:?})",
-                                offset,
-                                start_ix..end_ix,
-                                &expected[start_ix..end_ix]
-                            );
-                        } else {
-                            assert_eq!(
-                                chunks.offset(),
-                                end_ix,
-                                "invalid position after seeking to {} in range {:?} ({:?})",
-                                offset,
-                                start_ix..end_ix,
-                                &expected[start_ix..end_ix]
-                            );
-                        }
-                    } else {
-                        let search_end = if offset > 0 && expected.as_bytes()[offset - 1] == b'\n' {
-                            offset - 1
-                        } else {
-                            offset
-                        };
-
-                        let expected_prev_line_start = expected[..search_end]
-                            .rfind('\n')
-                            .and_then(|newline_ix| {
-                                let line_start_ix = newline_ix + 1;
-                                if line_start_ix >= start_ix {
-                                    Some(line_start_ix)
-                                } else {
-                                    None
-                                }
-                            })
-                            .or({
-                                if offset > 0 && start_ix == 0 {
-                                    Some(0)
-                                } else {
-                                    None
-                                }
-                            });
-
-                        let moved = chunks.prev_line();
-                        assert_eq!(
-                            moved,
-                            expected_prev_line_start.is_some(),
-                            "unexpected result from prev_line after seeking to {} in range {:?} ({:?})",
-                            offset,
-                            start_ix..end_ix,
-                            &expected[start_ix..end_ix]
-                        );
-                        if let Some(expected_prev_line_start) = expected_prev_line_start {
-                            assert_eq!(
-                                chunks.offset(),
-                                expected_prev_line_start,
-                                "invalid position after seeking to {} in range {:?} ({:?})",
-                                offset,
-                                start_ix..end_ix,
-                                &expected[start_ix..end_ix]
-                            );
-                        } else {
-                            assert_eq!(
-                                chunks.offset(),
-                                start_ix,
-                                "invalid position after seeking to {} in range {:?} ({:?})",
-                                offset,
-                                start_ix..end_ix,
-                                &expected[start_ix..end_ix]
-                            );
-                        }
-                    }
-
-                    assert!((start_ix..=end_ix).contains(&chunks.offset()));
-                    if rng.random() {
-                        offset = rng.random_range(start_ix..=end_ix);
-                        while !expected.is_char_boundary(offset) {
-                            offset -= 1;
-                        }
-                        chunks.seek(offset);
-                    } else {
-                        chunks.next();
-                        offset = chunks.offset();
-                        assert!((start_ix..=end_ix).contains(&chunks.offset()));
-                    }
-                }
-            }
-
-            let mut offset_utf16 = OffsetUtf16(0);
-            let mut point = Point::new(0, 0);
-            let mut point_utf16 = PointUtf16::new(0, 0);
-            for (ix, ch) in expected.char_indices().chain(Some((expected.len(), '\0'))) {
-                assert_eq!(actual.offset_to_point(ix), point, "offset_to_point({})", ix);
-                assert_eq!(
-                    actual.offset_to_point_utf16(ix),
-                    point_utf16,
-                    "offset_to_point_utf16({})",
-                    ix
-                );
-                assert_eq!(
-                    actual.point_to_offset(point),
-                    ix,
-                    "point_to_offset({:?})",
-                    point
-                );
-                assert_eq!(
-                    actual.point_utf16_to_offset(point_utf16),
-                    ix,
-                    "point_utf16_to_offset({:?})",
-                    point_utf16
-                );
-                assert_eq!(
-                    actual.offset_to_offset_utf16(ix),
-                    offset_utf16,
-                    "offset_to_offset_utf16({:?})",
-                    ix
-                );
-                assert_eq!(
-                    actual.offset_utf16_to_offset(offset_utf16),
-                    ix,
-                    "offset_utf16_to_offset({:?})",
-                    offset_utf16
-                );
-                if ch == '\n' {
-                    point += Point::new(1, 0);
-                    point_utf16 += PointUtf16::new(1, 0);
-                } else {
-                    point.column += ch.len_utf8() as u32;
-                    point_utf16.column += ch.len_utf16() as u32;
-                }
-                offset_utf16.0 += ch.len_utf16();
-            }
-
-            let mut offset_utf16 = OffsetUtf16(0);
-            let mut point_utf16 = Unclipped(PointUtf16::zero());
-            for unit in expected.encode_utf16() {
-                let left_offset = actual.clip_offset_utf16(offset_utf16, Bias::Left);
-                let right_offset = actual.clip_offset_utf16(offset_utf16, Bias::Right);
-                assert!(right_offset >= left_offset);
-                // Ensure translating UTF-16 offsets to UTF-8 offsets doesn't panic.
-                actual.offset_utf16_to_offset(left_offset);
-                actual.offset_utf16_to_offset(right_offset);
-
-                let left_point = actual.clip_point_utf16(point_utf16, Bias::Left);
-                let right_point = actual.clip_point_utf16(point_utf16, Bias::Right);
-                assert!(right_point >= left_point);
-                // Ensure translating valid UTF-16 points to offsets doesn't panic.
-                actual.point_utf16_to_offset(left_point);
-                actual.point_utf16_to_offset(right_point);
-
-                offset_utf16.0 += 1;
-                if unit == b'\n' as u16 {
-                    point_utf16.0 += PointUtf16::new(1, 0);
-                } else {
-                    point_utf16.0 += PointUtf16::new(0, 1);
-                }
-            }
-
-            for _ in 0..5 {
-                let end_ix = clip_offset(&expected, rng.random_range(0..=expected.len()), Right);
-                let start_ix = clip_offset(&expected, rng.random_range(0..=end_ix), Left);
-                assert_eq!(
-                    actual.cursor(start_ix).summary::<TextSummary>(end_ix),
-                    TextSummary::from(&expected[start_ix..end_ix])
-                );
-            }
-
-            let mut expected_longest_rows = Vec::new();
-            let mut longest_line_len = -1_isize;
-            for (row, line) in expected.split('\n').enumerate() {
-                let row = row as u32;
-                assert_eq!(
-                    actual.line_len(row),
-                    line.len() as u32,
-                    "invalid line len for row {}",
-                    row
-                );
-
-                let line_char_count = line.chars().count() as isize;
-                match line_char_count.cmp(&longest_line_len) {
-                    Ordering::Less => {}
-                    Ordering::Equal => expected_longest_rows.push(row),
-                    Ordering::Greater => {
-                        longest_line_len = line_char_count;
-                        expected_longest_rows.clear();
-                        expected_longest_rows.push(row);
-                    }
-                }
-            }
-
-            let longest_row = actual.summary().longest_row;
-            assert!(
-                expected_longest_rows.contains(&longest_row),
-                "incorrect longest row {}. expected {:?} with length {}",
-                longest_row,
-                expected_longest_rows,
-                longest_line_len,
-            );
-        }
-    }
-
-    #[test]
-    fn test_chunks_equals_str() {
-        let text = "This is a multi-chunk\n& multi-line test string!";
-        let rope = Rope::from(text);
-        for start in 0..text.len() {
-            for end in start..text.len() {
-                let range = start..end;
-                let correct_substring = &text[start..end];
-
-                // Test that correct range returns true
-                assert!(
-                    rope.chunks_in_range(range.clone())
-                        .equals_str(correct_substring)
-                );
-                assert!(
-                    rope.reversed_chunks_in_range(range.clone())
-                        .equals_str(correct_substring)
-                );
-
-                // Test that all other ranges return false (unless they happen to match)
-                for other_start in 0..text.len() {
-                    for other_end in other_start..text.len() {
-                        if other_start == start && other_end == end {
-                            continue;
-                        }
-                        let other_substring = &text[other_start..other_end];
-
-                        // Only assert false if the substrings are actually different
-                        if other_substring == correct_substring {
-                            continue;
-                        }
-                        assert!(
-                            !rope
-                                .chunks_in_range(range.clone())
-                                .equals_str(other_substring)
-                        );
-                        assert!(
-                            !rope
-                                .reversed_chunks_in_range(range.clone())
-                                .equals_str(other_substring)
-                        );
-                    }
-                }
-            }
-        }
-
-        let rope = Rope::from("");
-        assert!(rope.chunks_in_range(0..0).equals_str(""));
-        assert!(rope.reversed_chunks_in_range(0..0).equals_str(""));
-        assert!(!rope.chunks_in_range(0..0).equals_str("foo"));
-        assert!(!rope.reversed_chunks_in_range(0..0).equals_str("foo"));
-    }
-
-    #[test]
-    fn test_is_char_boundary() {
-        let fixture = "地";
-        let rope = Rope::from("地");
-        for b in 0..=fixture.len() {
-            assert_eq!(rope.is_char_boundary(b), fixture.is_char_boundary(b));
-        }
-        let fixture = "";
-        let rope = Rope::from("");
-        for b in 0..=fixture.len() {
-            assert_eq!(rope.is_char_boundary(b), fixture.is_char_boundary(b));
-        }
-        let fixture = "🔴🟠🟡🟢🔵🟣⚫️⚪️🟤\n🏳️‍⚧️🏁🏳️‍🌈🏴‍☠️⛳️📬📭🏴🏳️🚩";
-        let rope = Rope::from("🔴🟠🟡🟢🔵🟣⚫️⚪️🟤\n🏳️‍⚧️🏁🏳️‍🌈🏴‍☠️⛳️📬📭🏴🏳️🚩");
-        for b in 0..=fixture.len() {
-            assert_eq!(rope.is_char_boundary(b), fixture.is_char_boundary(b));
-        }
-    }
-
-    #[test]
-    fn test_floor_char_boundary() {
-        let fixture = "地";
-        let rope = Rope::from("地");
-        for b in 0..=fixture.len() {
-            assert_eq!(rope.floor_char_boundary(b), fixture.floor_char_boundary(b));
-        }
-
-        let fixture = "";
-        let rope = Rope::from("");
-        for b in 0..=fixture.len() {
-            assert_eq!(rope.floor_char_boundary(b), fixture.floor_char_boundary(b));
-        }
-
-        let fixture = "🔴🟠🟡🟢🔵🟣⚫️⚪️🟤\n🏳️‍⚧️🏁🏳️‍🌈🏴‍☠️⛳️📬📭🏴🏳️🚩";
-        let rope = Rope::from("🔴🟠🟡🟢🔵🟣⚫️⚪️🟤\n🏳️‍⚧️🏁🏳️‍🌈🏴‍☠️⛳️📬📭🏴🏳️🚩");
-        for b in 0..=fixture.len() {
-            assert_eq!(rope.floor_char_boundary(b), fixture.floor_char_boundary(b));
-        }
-    }
-
-    #[test]
-    fn test_ceil_char_boundary() {
-        let fixture = "地";
-        let rope = Rope::from("地");
-        for b in 0..=fixture.len() {
-            assert_eq!(rope.ceil_char_boundary(b), fixture.ceil_char_boundary(b));
-        }
-
-        let fixture = "";
-        let rope = Rope::from("");
-        for b in 0..=fixture.len() {
-            assert_eq!(rope.ceil_char_boundary(b), fixture.ceil_char_boundary(b));
-        }
-
-        let fixture = "🔴🟠🟡🟢🔵🟣⚫️⚪️🟤\n🏳️‍⚧️🏁🏳️‍🌈🏴‍☠️⛳️📬📭🏴🏳️🚩";
-        let rope = Rope::from("🔴🟠🟡🟢🔵🟣⚫️⚪️🟤\n🏳️‍⚧️🏁🏳️‍🌈🏴‍☠️⛳️📬📭🏴🏳️🚩");
-        for b in 0..=fixture.len() {
-            assert_eq!(rope.ceil_char_boundary(b), fixture.ceil_char_boundary(b));
-        }
-    }
-
-    fn clip_offset(text: &str, mut offset: usize, bias: Bias) -> usize {
-        while !text.is_char_boundary(offset) {
-            match bias {
-                Bias::Left => offset -= 1,
-                Bias::Right => offset += 1,
-            }
-        }
-        offset
-    }
-
-    impl Rope {
-        fn text(&self) -> String {
-            let mut text = String::new();
-            for chunk in self.chunks.cursor::<()>(()) {
-                text.push_str(&chunk.text);
-            }
-            text
-        }
-    }
-}
diff --git a/crates/rope/src/unclipped.rs b/crates/rope/src/unclipped.rs
deleted file mode 100644
index abf82504ea..0000000000
--- a/crates/rope/src/unclipped.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-use crate::ChunkSummary;
-use std::ops::{Add, AddAssign, Sub, SubAssign};
-
-#[derive(Debug, Default, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct Unclipped<T>(pub T);
-
-impl<T> From<T> for Unclipped<T> {
-    fn from(value: T) -> Self {
-        Unclipped(value)
-    }
-}
-
-impl<'a, T: sum_tree::Dimension<'a, ChunkSummary>> sum_tree::Dimension<'a, ChunkSummary>
-    for Unclipped<T>
-{
-    fn zero(_: ()) -> Self {
-        Self(T::zero(()))
-    }
-
-    fn add_summary(&mut self, summary: &'a ChunkSummary, _: ()) {
-        self.0.add_summary(summary, ());
-    }
-}
-
-impl<T: Add<T, Output = T>> Add<Unclipped<T>> for Unclipped<T> {
-    type Output = Unclipped<T>;
-
-    fn add(self, rhs: Unclipped<T>) -> Self::Output {
-        Unclipped(self.0 + rhs.0)
-    }
-}
-
-impl<T: Sub<T, Output = T>> Sub<Unclipped<T>> for Unclipped<T> {
-    type Output = Unclipped<T>;
-
-    fn sub(self, rhs: Unclipped<T>) -> Self::Output {
-        Unclipped(self.0 - rhs.0)
-    }
-}
-
-impl<T: AddAssign<T>> AddAssign<Unclipped<T>> for Unclipped<T> {
-    fn add_assign(&mut self, rhs: Unclipped<T>) {
-        self.0 += rhs.0;
-    }
-}
-
-impl<T: SubAssign<T>> SubAssign<Unclipped<T>> for Unclipped<T> {
-    fn sub_assign(&mut self, rhs: Unclipped<T>) {
-        self.0 -= rhs.0;
-    }
-}
diff --git a/crates/rpc/Cargo.toml b/crates/rpc/Cargo.toml
deleted file mode 100644
index 10ebde26b6..0000000000
--- a/crates/rpc/Cargo.toml
+++ /dev/null
@@ -1,44 +0,0 @@
-[package]
-description = "Shared logic for communication between the Zed app and the zed.dev server"
-edition.workspace = true
-name = "rpc"
-version = "0.1.0"
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/rpc.rs"
-doctest = false
-
-[features]
-gpui = ["dep:gpui"]
-test-support = ["collections/test-support", "gpui/test-support", "proto/test-support"]
-
-[dependencies]
-anyhow.workspace = true
-async-tungstenite.workspace = true
-base64.workspace = true
-chrono.workspace = true
-collections.workspace = true
-futures.workspace = true
-gpui = { workspace = true, optional = true }
-parking_lot.workspace = true
-proto.workspace = true
-rand.workspace = true
-rsa.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-sha2.workspace = true
-strum.workspace = true
-tracing = { version = "0.1.34", features = ["log"] }
-util.workspace = true
-zstd.workspace = true
-
-[dev-dependencies]
-collections = { workspace = true, features = ["test-support"] }
-gpui = { workspace = true, features = ["test-support"] }
-proto = { workspace = true, features = ["test-support"] }
-zlog.workspace = true
diff --git a/crates/rpc/LICENSE-GPL b/crates/rpc/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/rpc/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/rpc/src/auth.rs b/crates/rpc/src/auth.rs
deleted file mode 100644
index 3829f3d36b..0000000000
--- a/crates/rpc/src/auth.rs
+++ /dev/null
@@ -1,240 +0,0 @@
-use anyhow::{Context as _, Result};
-use base64::prelude::*;
-use rand::prelude::*;
-use rsa::pkcs1::{DecodeRsaPublicKey, EncodeRsaPublicKey};
-use rsa::traits::PaddingScheme;
-use rsa::{Oaep, Pkcs1v15Encrypt, RsaPrivateKey, RsaPublicKey};
-use sha2::Sha256;
-use std::convert::TryFrom;
-
-fn oaep_sha256_padding() -> impl PaddingScheme {
-    Oaep::new::<Sha256>()
-}
-
-#[derive(Debug, PartialEq, Eq, Clone, Copy)]
-pub enum EncryptionFormat {
-    /// The original encryption format.
-    ///
-    /// This is using [`Pkcs1v15Encrypt`], which is vulnerable to side-channel attacks.
-    /// As such, we're in the process of phasing it out.
-    ///
-    /// See [here](https://people.redhat.com/~hkario/marvin/) for more details.
-    V0,
-
-    /// The new encryption key format using Optimal Asymmetric Encryption Padding (OAEP) with a SHA-256 digest.
-    V1,
-}
-
-pub struct PublicKey(RsaPublicKey);
-
-pub struct PrivateKey(RsaPrivateKey);
-
-/// Generate a public and private key for asymmetric encryption.
-pub fn keypair() -> Result<(PublicKey, PrivateKey)> {
-    let mut rng = RsaRngCompat::new();
-    let bits = 2048;
-    let private_key = RsaPrivateKey::new(&mut rng, bits)?;
-    let public_key = RsaPublicKey::from(&private_key);
-    Ok((PublicKey(public_key), PrivateKey(private_key)))
-}
-
-/// Generate a random 64-character base64 string.
-pub fn random_token() -> String {
-    let mut rng = rand::rng();
-    let mut token_bytes = [0; 48];
-    for byte in token_bytes.iter_mut() {
-        *byte = rng.random();
-    }
-    BASE64_URL_SAFE.encode(token_bytes)
-}
-
-impl PublicKey {
-    /// Convert a string to a base64-encoded string that can only be decoded with the corresponding
-    /// private key.
-    pub fn encrypt_string(&self, string: &str, format: EncryptionFormat) -> Result<String> {
-        let mut rng = RsaRngCompat::new();
-        let bytes = string.as_bytes();
-        let encrypted_bytes = match format {
-            EncryptionFormat::V0 => self.0.encrypt(&mut rng, Pkcs1v15Encrypt, bytes),
-            EncryptionFormat::V1 => self.0.encrypt(&mut rng, oaep_sha256_padding(), bytes),
-        }
-        .context("failed to encrypt string with public key")?;
-        let encrypted_string = BASE64_URL_SAFE.encode(&encrypted_bytes);
-        Ok(encrypted_string)
-    }
-}
-
-impl PrivateKey {
-    /// Decrypt a base64-encoded string that was encrypted by the corresponding public key.
-    pub fn decrypt_string(&self, encrypted_string: &str) -> Result<String> {
-        let encrypted_bytes = BASE64_URL_SAFE
-            .decode(encrypted_string)
-            .context("failed to base64-decode encrypted string")?;
-        let bytes = self
-            .0
-            .decrypt(oaep_sha256_padding(), &encrypted_bytes)
-            .or_else(|_err| {
-                // If we failed to decrypt using the new format, try decrypting with the old
-                // one to handle mismatches between the client and server.
-                self.0.decrypt(Pkcs1v15Encrypt, &encrypted_bytes)
-            })
-            .context("failed to decrypt string with private key")?;
-        let string = String::from_utf8(bytes).context("decrypted content was not valid utf8")?;
-        Ok(string)
-    }
-}
-
-impl TryFrom<PublicKey> for String {
-    type Error = anyhow::Error;
-    fn try_from(key: PublicKey) -> Result<Self> {
-        let bytes = key
-            .0
-            .to_pkcs1_der()
-            .context("failed to serialize public key")?;
-        let string = BASE64_URL_SAFE.encode(&bytes);
-        Ok(string)
-    }
-}
-
-impl TryFrom<String> for PublicKey {
-    type Error = anyhow::Error;
-    fn try_from(value: String) -> Result<Self> {
-        let bytes = BASE64_URL_SAFE
-            .decode(&value)
-            .context("failed to base64-decode public key string")?;
-        let key = Self(RsaPublicKey::from_pkcs1_der(&bytes).context("failed to parse public key")?);
-        Ok(key)
-    }
-}
-
-// TODO: remove once we rsa v0.10 is released.
-struct RsaRngCompat(rand::rngs::ThreadRng);
-
-impl RsaRngCompat {
-    fn new() -> Self {
-        Self(rand::rng())
-    }
-}
-
-impl rsa::signature::rand_core::RngCore for RsaRngCompat {
-    fn next_u32(&mut self) -> u32 {
-        self.0.next_u32()
-    }
-
-    fn next_u64(&mut self) -> u64 {
-        self.0.next_u64()
-    }
-
-    fn fill_bytes(&mut self, dest: &mut [u8]) {
-        self.0.fill_bytes(dest);
-    }
-
-    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), rsa::signature::rand_core::Error> {
-        self.fill_bytes(dest);
-        Ok(())
-    }
-}
-
-impl rsa::signature::rand_core::CryptoRng for RsaRngCompat {}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_generate_encrypt_and_decrypt_token() {
-        // CLIENT:
-        // * generate a keypair for asymmetric encryption
-        // * serialize the public key to send it to the server.
-        let (public, private) = keypair().unwrap();
-        let public_string = String::try_from(public).unwrap();
-        assert_printable(&public_string);
-
-        // SERVER:
-        // * parse the public key
-        // * generate a random token.
-        // * encrypt the token using the public key.
-        let public = PublicKey::try_from(public_string).unwrap();
-        let token = random_token();
-        let encrypted_token = public.encrypt_string(&token, EncryptionFormat::V1).unwrap();
-        assert_eq!(token.len(), 64);
-        assert_ne!(encrypted_token, token);
-        assert_printable(&token);
-        assert_printable(&encrypted_token);
-
-        // CLIENT:
-        // * decrypt the token using the private key.
-        let decrypted_token = private.decrypt_string(&encrypted_token).unwrap();
-        assert_eq!(decrypted_token, token);
-    }
-
-    #[test]
-    fn test_generate_encrypt_and_decrypt_token_with_v0_encryption_format() {
-        // CLIENT:
-        // * generate a keypair for asymmetric encryption
-        // * serialize the public key to send it to the server.
-        let (public, private) = keypair().unwrap();
-        let public_string = String::try_from(public).unwrap();
-        assert_printable(&public_string);
-
-        // SERVER:
-        // * parse the public key
-        // * generate a random token.
-        // * encrypt the token using the public key.
-        let public = PublicKey::try_from(public_string).unwrap();
-        let token = random_token();
-        let encrypted_token = public.encrypt_string(&token, EncryptionFormat::V0).unwrap();
-        assert_eq!(token.len(), 64);
-        assert_ne!(encrypted_token, token);
-        assert_printable(&token);
-        assert_printable(&encrypted_token);
-
-        // CLIENT:
-        // * decrypt the token using the private key.
-        let decrypted_token = private.decrypt_string(&encrypted_token).unwrap();
-        assert_eq!(decrypted_token, token);
-    }
-
-    #[test]
-    fn test_encode_and_decode_base64_public_key() {
-        // A base64-encoded public key.
-        //
-        // We're using a literal string to ensure that encoding and decoding works across differences in implementations.
-        let encoded_public_key = "MIGJAoGBAMPvufou8wOuUIF1Wlkbtn0ZMM9nC55QJ06nTZvgMfZv5esFVU9-cQO_JC1P9ZoEcMDJweFERnQuQLqzsrMDLFbkdgL128ZU43WOLiQraxaICFIZsPUeTtWMKp2D5bPWsNxs-lnCma7vCAry6fpXuj5AKQdk7cTZJNucgvZQ0uUfAgMBAAE=".to_string();
-
-        // Make sure we can parse the public key.
-        let public_key = PublicKey::try_from(encoded_public_key.clone()).unwrap();
-
-        // Make sure we re-encode to the same format.
-        assert_eq!(encoded_public_key, String::try_from(public_key).unwrap());
-    }
-
-    #[test]
-    fn test_tokens_are_always_url_safe() {
-        for _ in 0..5 {
-            let token = random_token();
-            let (public_key, _) = keypair().unwrap();
-            let encrypted_token = public_key
-                .encrypt_string(&token, EncryptionFormat::V1)
-                .unwrap();
-            let public_key_str = String::try_from(public_key).unwrap();
-
-            assert_printable(&token);
-            assert_printable(&public_key_str);
-            assert_printable(&encrypted_token);
-        }
-    }
-
-    fn assert_printable(token: &str) {
-        for c in token.chars() {
-            assert!(
-                c.is_ascii_graphic(),
-                "token {:?} has non-printable char {}",
-                token,
-                c
-            );
-            assert_ne!(c, '/', "token {:?} is not URL-safe", token);
-            assert_ne!(c, '&', "token {:?} is not URL-safe", token);
-        }
-    }
-}
diff --git a/crates/rpc/src/conn.rs b/crates/rpc/src/conn.rs
deleted file mode 100644
index e598e5f7bc..0000000000
--- a/crates/rpc/src/conn.rs
+++ /dev/null
@@ -1,102 +0,0 @@
-use async_tungstenite::tungstenite::Message as WebSocketMessage;
-use futures::{SinkExt as _, StreamExt as _};
-
-pub struct Connection {
-    pub(crate) tx:
-        Box<dyn 'static + Send + Unpin + futures::Sink<WebSocketMessage, Error = anyhow::Error>>,
-    pub(crate) rx:
-        Box<dyn 'static + Send + Unpin + futures::Stream<Item = anyhow::Result<WebSocketMessage>>>,
-}
-
-impl Connection {
-    pub fn new<S>(stream: S) -> Self
-    where
-        S: 'static
-            + Send
-            + Unpin
-            + futures::Sink<WebSocketMessage, Error = anyhow::Error>
-            + futures::Stream<Item = anyhow::Result<WebSocketMessage>>,
-    {
-        let (tx, rx) = stream.split();
-        Self {
-            tx: Box::new(tx),
-            rx: Box::new(rx),
-        }
-    }
-
-    pub async fn send(&mut self, message: WebSocketMessage) -> anyhow::Result<()> {
-        self.tx.send(message).await
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn in_memory(
-        executor: gpui::BackgroundExecutor,
-    ) -> (Self, Self, std::sync::Arc<std::sync::atomic::AtomicBool>) {
-        use std::sync::{
-            Arc,
-            atomic::{AtomicBool, Ordering::SeqCst},
-        };
-
-        let killed = Arc::new(AtomicBool::new(false));
-        let (a_tx, a_rx) = channel(killed.clone(), executor.clone());
-        let (b_tx, b_rx) = channel(killed.clone(), executor);
-        return (
-            Self { tx: a_tx, rx: b_rx },
-            Self { tx: b_tx, rx: a_rx },
-            killed,
-        );
-
-        #[allow(clippy::type_complexity)]
-        fn channel(
-            killed: Arc<AtomicBool>,
-            executor: gpui::BackgroundExecutor,
-        ) -> (
-            Box<dyn Send + Unpin + futures::Sink<WebSocketMessage, Error = anyhow::Error>>,
-            Box<dyn Send + Unpin + futures::Stream<Item = anyhow::Result<WebSocketMessage>>>,
-        ) {
-            use anyhow::anyhow;
-            use futures::channel::mpsc;
-            use std::io::Error;
-
-            let (tx, rx) = mpsc::unbounded::<WebSocketMessage>();
-
-            let tx = tx.sink_map_err(|error| anyhow!(error)).with({
-                let killed = killed.clone();
-                let executor = executor.clone();
-                move |msg| {
-                    let killed = killed.clone();
-                    let executor = executor.clone();
-                    Box::pin(async move {
-                        executor.simulate_random_delay().await;
-
-                        // Writes to a half-open TCP connection will error.
-                        if killed.load(SeqCst) {
-                            std::io::Result::Err(Error::other("connection lost"))?;
-                        }
-
-                        Ok(msg)
-                    })
-                }
-            });
-
-            let rx = rx.then({
-                move |msg| {
-                    let killed = killed.clone();
-                    let executor = executor.clone();
-                    Box::pin(async move {
-                        executor.simulate_random_delay().await;
-
-                        // Reads from a half-open TCP connection will hang.
-                        if killed.load(SeqCst) {
-                            futures::future::pending::<()>().await;
-                        }
-
-                        Ok(msg)
-                    })
-                }
-            });
-
-            (Box::new(tx), Box::new(rx))
-        }
-    }
-}
diff --git a/crates/rpc/src/extension.rs b/crates/rpc/src/extension.rs
deleted file mode 100644
index 1b00312bad..0000000000
--- a/crates/rpc/src/extension.rs
+++ /dev/null
@@ -1,64 +0,0 @@
-use std::collections::BTreeSet;
-use std::sync::Arc;
-
-use chrono::{DateTime, Utc};
-use serde::{Deserialize, Serialize};
-use strum::EnumString;
-
-#[derive(Clone, Serialize, Deserialize, Debug, PartialEq)]
-pub struct ExtensionApiManifest {
-    pub name: String,
-    pub version: Arc<str>,
-    pub description: Option<String>,
-    pub authors: Vec<String>,
-    pub repository: String,
-    pub schema_version: Option<i32>,
-    pub wasm_api_version: Option<String>,
-    #[serde(default)]
-    pub provides: BTreeSet<ExtensionProvides>,
-}
-
-#[derive(
-    Debug,
-    PartialEq,
-    Eq,
-    PartialOrd,
-    Ord,
-    Hash,
-    Clone,
-    Copy,
-    Serialize,
-    Deserialize,
-    EnumString,
-    strum::Display,
-    strum::EnumIter,
-)]
-#[serde(rename_all = "kebab-case")]
-#[strum(serialize_all = "kebab-case")]
-pub enum ExtensionProvides {
-    Themes,
-    IconThemes,
-    Languages,
-    Grammars,
-    LanguageServers,
-    ContextServers,
-    AgentServers,
-    SlashCommands,
-    IndexedDocsProviders,
-    Snippets,
-    DebugAdapters,
-}
-
-#[derive(Clone, Serialize, Deserialize, Debug, PartialEq)]
-pub struct ExtensionMetadata {
-    pub id: Arc<str>,
-    #[serde(flatten)]
-    pub manifest: ExtensionApiManifest,
-    pub published_at: DateTime<Utc>,
-    pub download_count: u64,
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct GetExtensionsResponse {
-    pub data: Vec<ExtensionMetadata>,
-}
diff --git a/crates/rpc/src/macros.rs b/crates/rpc/src/macros.rs
deleted file mode 100644
index f85889a97b..0000000000
--- a/crates/rpc/src/macros.rs
+++ /dev/null
@@ -1,73 +0,0 @@
-#[macro_export]
-macro_rules! messages {
-    ($(($name:ident, $priority:ident)),* $(,)?) => {
-        pub fn build_typed_envelope(sender_id: ConnectionId, received_at: Instant, envelope: Envelope) -> Option<Box<dyn AnyTypedEnvelope>> {
-            match envelope.payload {
-                $(Some(envelope::Payload::$name(payload)) => {
-                    Some(Box::new(TypedEnvelope {
-                        sender_id,
-                        original_sender_id: envelope.original_sender_id.map(|original_sender| PeerId {
-                            owner_id: original_sender.owner_id,
-                            id: original_sender.id
-                        }),
-                        message_id: envelope.id,
-                        payload,
-                        received_at,
-                    }))
-                }, )*
-                _ => None
-            }
-        }
-
-        $(
-            impl EnvelopedMessage for $name {
-                const NAME: &'static str = std::stringify!($name);
-                const PRIORITY: MessagePriority = MessagePriority::$priority;
-
-                fn into_envelope(
-                    self,
-                    id: u32,
-                    responding_to: Option<u32>,
-                    original_sender_id: Option<PeerId>,
-                ) -> Envelope {
-                    Envelope {
-                        id,
-                        responding_to,
-                        original_sender_id,
-                        payload: Some(envelope::Payload::$name(self)),
-                    }
-                }
-
-                fn from_envelope(envelope: Envelope) -> Option<Self> {
-                    if let Some(envelope::Payload::$name(msg)) = envelope.payload {
-                        Some(msg)
-                    } else {
-                        None
-                    }
-                }
-            }
-        )*
-    };
-}
-
-#[macro_export]
-macro_rules! request_messages {
-    ($(($request_name:ident, $response_name:ident)),* $(,)?) => {
-        $(impl RequestMessage for $request_name {
-            type Response = $response_name;
-        })*
-    };
-}
-
-#[macro_export]
-macro_rules! entity_messages {
-    ({$id_field:ident, $entity_type:ty}, $($name:ident),* $(,)?) => {
-        $(impl EntityMessage for $name {
-            type Entity = $entity_type;
-
-            fn remote_entity_id(&self) -> u64 {
-                self.$id_field
-            }
-        })*
-    };
-}
diff --git a/crates/rpc/src/message_stream.rs b/crates/rpc/src/message_stream.rs
deleted file mode 100644
index 023e916df3..0000000000
--- a/crates/rpc/src/message_stream.rs
+++ /dev/null
@@ -1,143 +0,0 @@
-#![allow(non_snake_case)]
-
-pub use ::proto::*;
-
-use async_tungstenite::tungstenite::Message as WebSocketMessage;
-use futures::{SinkExt as _, StreamExt as _};
-use proto::Message as _;
-use std::time::Instant;
-use std::{fmt::Debug, io};
-use zstd::zstd_safe::WriteBuf;
-
-const KIB: usize = 1024;
-const MIB: usize = KIB * 1024;
-const MAX_BUFFER_LEN: usize = MIB;
-
-/// A stream of protobuf messages.
-pub struct MessageStream<S> {
-    stream: S,
-    encoding_buffer: Vec<u8>,
-}
-
-#[derive(Debug)]
-pub enum Message {
-    Envelope(Envelope),
-    Ping,
-    Pong,
-}
-
-impl<S> MessageStream<S> {
-    pub fn new(stream: S) -> Self {
-        Self {
-            stream,
-            encoding_buffer: Vec::new(),
-        }
-    }
-}
-
-impl<S> MessageStream<S>
-where
-    S: futures::Sink<WebSocketMessage, Error = anyhow::Error> + Unpin,
-{
-    pub async fn write(&mut self, message: Message) -> anyhow::Result<()> {
-        #[cfg(any(test, feature = "test-support"))]
-        const COMPRESSION_LEVEL: i32 = -7;
-
-        #[cfg(not(any(test, feature = "test-support")))]
-        const COMPRESSION_LEVEL: i32 = 4;
-
-        match message {
-            Message::Envelope(message) => {
-                self.encoding_buffer.reserve(message.encoded_len());
-                message
-                    .encode(&mut self.encoding_buffer)
-                    .map_err(io::Error::from)?;
-                let buffer =
-                    zstd::stream::encode_all(self.encoding_buffer.as_slice(), COMPRESSION_LEVEL)
-                        .unwrap();
-
-                self.encoding_buffer.clear();
-                self.encoding_buffer.shrink_to(MAX_BUFFER_LEN);
-                self.stream
-                    .send(WebSocketMessage::Binary(buffer.into()))
-                    .await?;
-            }
-            Message::Ping => {
-                self.stream
-                    .send(WebSocketMessage::Ping(Default::default()))
-                    .await?;
-            }
-            Message::Pong => {
-                self.stream
-                    .send(WebSocketMessage::Pong(Default::default()))
-                    .await?;
-            }
-        }
-
-        Ok(())
-    }
-}
-
-impl<S> MessageStream<S>
-where
-    S: futures::Stream<Item = anyhow::Result<WebSocketMessage>> + Unpin,
-{
-    pub async fn read(&mut self) -> anyhow::Result<(Message, Instant)> {
-        while let Some(bytes) = self.stream.next().await {
-            let received_at = Instant::now();
-            match bytes? {
-                WebSocketMessage::Binary(bytes) => {
-                    zstd::stream::copy_decode(bytes.as_slice(), &mut self.encoding_buffer)?;
-                    let envelope = Envelope::decode(self.encoding_buffer.as_slice())
-                        .map_err(io::Error::from)?;
-
-                    self.encoding_buffer.clear();
-                    self.encoding_buffer.shrink_to(MAX_BUFFER_LEN);
-                    return Ok((Message::Envelope(envelope), received_at));
-                }
-                WebSocketMessage::Ping(_) => return Ok((Message::Ping, received_at)),
-                WebSocketMessage::Pong(_) => return Ok((Message::Pong, received_at)),
-                WebSocketMessage::Close(_) => break,
-                _ => {}
-            }
-        }
-        anyhow::bail!("connection closed");
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[gpui::test]
-    async fn test_buffer_size() {
-        let (tx, rx) = futures::channel::mpsc::unbounded();
-        let mut sink = MessageStream::new(tx.sink_map_err(|_| anyhow::anyhow!("")));
-        sink.write(Message::Envelope(Envelope {
-            payload: Some(envelope::Payload::UpdateWorktree(UpdateWorktree {
-                root_name: "abcdefg".repeat(10),
-                ..Default::default()
-            })),
-            ..Default::default()
-        }))
-        .await
-        .unwrap();
-        assert!(sink.encoding_buffer.capacity() <= MAX_BUFFER_LEN);
-        sink.write(Message::Envelope(Envelope {
-            payload: Some(envelope::Payload::UpdateWorktree(UpdateWorktree {
-                root_name: "abcdefg".repeat(1000000),
-                ..Default::default()
-            })),
-            ..Default::default()
-        }))
-        .await
-        .unwrap();
-        assert!(sink.encoding_buffer.capacity() <= MAX_BUFFER_LEN);
-
-        let mut stream = MessageStream::new(rx.map(anyhow::Ok));
-        stream.read().await.unwrap();
-        assert!(stream.encoding_buffer.capacity() <= MAX_BUFFER_LEN);
-        stream.read().await.unwrap();
-        assert!(stream.encoding_buffer.capacity() <= MAX_BUFFER_LEN);
-    }
-}
diff --git a/crates/rpc/src/notification.rs b/crates/rpc/src/notification.rs
deleted file mode 100644
index 50364c7387..0000000000
--- a/crates/rpc/src/notification.rs
+++ /dev/null
@@ -1,99 +0,0 @@
-use crate::proto;
-use serde::{Deserialize, Serialize};
-use serde_json::{Value, map};
-use strum::VariantNames;
-
-const KIND: &str = "kind";
-const ENTITY_ID: &str = "entity_id";
-
-/// A notification that can be stored, associated with a given recipient.
-///
-/// This struct is stored in the collab database as JSON, so it shouldn't be
-/// changed in a backward-incompatible way. For example, when renaming a
-/// variant, add a serde alias for the old name.
-///
-/// Most notification types have a special field which is aliased to
-/// `entity_id`. This field is stored in its own database column, and can
-/// be used to query the notification.
-#[derive(Debug, Clone, PartialEq, Eq, VariantNames, Serialize, Deserialize)]
-#[serde(tag = "kind")]
-pub enum Notification {
-    ContactRequest {
-        #[serde(rename = "entity_id")]
-        sender_id: u64,
-    },
-    ContactRequestAccepted {
-        #[serde(rename = "entity_id")]
-        responder_id: u64,
-    },
-    ChannelInvitation {
-        #[serde(rename = "entity_id")]
-        channel_id: u64,
-        channel_name: String,
-        inviter_id: u64,
-    },
-}
-
-impl Notification {
-    pub fn to_proto(&self) -> proto::Notification {
-        let mut value = serde_json::to_value(self).unwrap();
-        let mut entity_id = None;
-        let value = value.as_object_mut().unwrap();
-        let Some(Value::String(kind)) = value.remove(KIND) else {
-            unreachable!("kind is the enum tag")
-        };
-        if let map::Entry::Occupied(e) = value.entry(ENTITY_ID)
-            && e.get().is_u64()
-        {
-            entity_id = e.remove().as_u64();
-        }
-        proto::Notification {
-            kind,
-            entity_id,
-            content: serde_json::to_string(&value).unwrap(),
-            ..Default::default()
-        }
-    }
-
-    pub fn from_proto(notification: &proto::Notification) -> Option<Self> {
-        let mut value = serde_json::from_str::<Value>(&notification.content).ok()?;
-        let object = value.as_object_mut()?;
-        object.insert(KIND.into(), notification.kind.to_string().into());
-        if let Some(entity_id) = notification.entity_id {
-            object.insert(ENTITY_ID.into(), entity_id.into());
-        }
-        serde_json::from_value(value).ok()
-    }
-
-    pub fn all_variant_names() -> &'static [&'static str] {
-        Self::VARIANTS
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::Notification;
-
-    #[test]
-    fn test_notification() {
-        // Notifications can be serialized and deserialized.
-        for notification in [
-            Notification::ContactRequest { sender_id: 1 },
-            Notification::ContactRequestAccepted { responder_id: 2 },
-            Notification::ChannelInvitation {
-                channel_id: 100,
-                channel_name: "the-channel".into(),
-                inviter_id: 50,
-            },
-        ] {
-            let message = notification.to_proto();
-            let deserialized = Notification::from_proto(&message).unwrap();
-            assert_eq!(deserialized, notification);
-        }
-
-        // When notifications are serialized, the `kind` and `actor_id` fields are
-        // stored separately, and do not appear redundantly in the JSON.
-        let notification = Notification::ContactRequest { sender_id: 1 };
-        assert_eq!(notification.to_proto().content, "{}");
-    }
-}
diff --git a/crates/rpc/src/peer.rs b/crates/rpc/src/peer.rs
deleted file mode 100644
index 73be0f19fe..0000000000
--- a/crates/rpc/src/peer.rs
+++ /dev/null
@@ -1,1055 +0,0 @@
-use super::{
-    Connection,
-    message_stream::{Message, MessageStream},
-    proto::{
-        self, AnyTypedEnvelope, EnvelopedMessage, PeerId, Receipt, RequestMessage, TypedEnvelope,
-    },
-};
-use anyhow::{Context as _, Result, anyhow};
-use collections::HashMap;
-use futures::{
-    FutureExt, SinkExt, Stream, StreamExt, TryFutureExt,
-    channel::{mpsc, oneshot},
-    stream::BoxStream,
-};
-use parking_lot::{Mutex, RwLock};
-use proto::{ErrorCode, ErrorCodeExt, ErrorExt, RpcError};
-use serde::{Serialize, ser::SerializeStruct};
-use std::{
-    fmt, future,
-    future::Future,
-    sync::atomic::Ordering::SeqCst,
-    sync::{
-        Arc,
-        atomic::{self, AtomicU32},
-    },
-    time::Duration,
-    time::Instant,
-};
-
-#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Debug, Serialize)]
-pub struct ConnectionId {
-    pub owner_id: u32,
-    pub id: u32,
-}
-
-impl From<ConnectionId> for PeerId {
-    fn from(id: ConnectionId) -> Self {
-        PeerId {
-            owner_id: id.owner_id,
-            id: id.id,
-        }
-    }
-}
-
-impl From<PeerId> for ConnectionId {
-    fn from(peer_id: PeerId) -> Self {
-        Self {
-            owner_id: peer_id.owner_id,
-            id: peer_id.id,
-        }
-    }
-}
-
-impl fmt::Display for ConnectionId {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}/{}", self.owner_id, self.id)
-    }
-}
-
-pub struct Peer {
-    epoch: AtomicU32,
-    pub connections: RwLock<HashMap<ConnectionId, ConnectionState>>,
-    next_connection_id: AtomicU32,
-}
-
-#[derive(Clone, Serialize)]
-pub struct ConnectionState {
-    #[serde(skip)]
-    outgoing_tx: mpsc::UnboundedSender<Message>,
-    next_message_id: Arc<AtomicU32>,
-    #[allow(clippy::type_complexity)]
-    #[serde(skip)]
-    response_channels: Arc<
-        Mutex<
-            Option<
-                HashMap<
-                    u32,
-                    oneshot::Sender<(proto::Envelope, std::time::Instant, oneshot::Sender<()>)>,
-                >,
-            >,
-        >,
-    >,
-    #[allow(clippy::type_complexity)]
-    #[serde(skip)]
-    stream_response_channels: Arc<
-        Mutex<
-            Option<
-                HashMap<u32, mpsc::UnboundedSender<(Result<proto::Envelope>, oneshot::Sender<()>)>>,
-            >,
-        >,
-    >,
-}
-
-const KEEPALIVE_INTERVAL: Duration = Duration::from_secs(1);
-const WRITE_TIMEOUT: Duration = Duration::from_secs(2);
-pub const RECEIVE_TIMEOUT: Duration = Duration::from_secs(10);
-
-impl Peer {
-    pub fn new(epoch: u32) -> Arc<Self> {
-        Arc::new(Self {
-            epoch: AtomicU32::new(epoch),
-            connections: Default::default(),
-            next_connection_id: Default::default(),
-        })
-    }
-
-    pub fn epoch(&self) -> u32 {
-        self.epoch.load(SeqCst)
-    }
-
-    pub fn add_connection<F, Fut, Out>(
-        self: &Arc<Self>,
-        connection: Connection,
-        create_timer: F,
-    ) -> (
-        ConnectionId,
-        impl Future<Output = anyhow::Result<()>> + Send + use<F, Fut, Out>,
-        BoxStream<'static, Box<dyn AnyTypedEnvelope>>,
-    )
-    where
-        F: Send + Fn(Duration) -> Fut,
-        Fut: Send + Future<Output = Out>,
-        Out: Send,
-    {
-        // For outgoing messages, use an unbounded channel so that application code
-        // can always send messages without yielding. For incoming messages, use a
-        // bounded channel so that other peers will receive backpressure if they send
-        // messages faster than this peer can process them.
-        #[cfg(any(test, feature = "test-support"))]
-        const INCOMING_BUFFER_SIZE: usize = 1;
-        #[cfg(not(any(test, feature = "test-support")))]
-        const INCOMING_BUFFER_SIZE: usize = 256;
-        let (mut incoming_tx, incoming_rx) = mpsc::channel(INCOMING_BUFFER_SIZE);
-        let (outgoing_tx, mut outgoing_rx) = mpsc::unbounded();
-
-        let connection_id = ConnectionId {
-            owner_id: self.epoch.load(SeqCst),
-            id: self.next_connection_id.fetch_add(1, SeqCst),
-        };
-        let connection_state = ConnectionState {
-            outgoing_tx,
-            next_message_id: Default::default(),
-            response_channels: Arc::new(Mutex::new(Some(Default::default()))),
-            stream_response_channels: Arc::new(Mutex::new(Some(Default::default()))),
-        };
-        let mut writer = MessageStream::new(connection.tx);
-        let mut reader = MessageStream::new(connection.rx);
-
-        let this = self.clone();
-        let response_channels = connection_state.response_channels.clone();
-        let stream_response_channels = connection_state.stream_response_channels.clone();
-
-        let handle_io = async move {
-            tracing::trace!(%connection_id, "handle io future: start");
-
-            let _end_connection = util::defer(|| {
-                response_channels.lock().take();
-                if let Some(channels) = stream_response_channels.lock().take() {
-                    for channel in channels.values() {
-                        let _ = channel.unbounded_send((
-                            Err(anyhow!("connection closed")),
-                            oneshot::channel().0,
-                        ));
-                    }
-                }
-                this.connections.write().remove(&connection_id);
-                tracing::trace!(%connection_id, "handle io future: end");
-            });
-
-            // Send messages on this frequency so the connection isn't closed.
-            let keepalive_timer = create_timer(KEEPALIVE_INTERVAL).fuse();
-            futures::pin_mut!(keepalive_timer);
-
-            // Disconnect if we don't receive messages at least this frequently.
-            let receive_timeout = create_timer(RECEIVE_TIMEOUT).fuse();
-            futures::pin_mut!(receive_timeout);
-
-            loop {
-                tracing::trace!(%connection_id, "outer loop iteration start");
-                let read_message = reader.read().fuse();
-                futures::pin_mut!(read_message);
-
-                loop {
-                    tracing::trace!(%connection_id, "inner loop iteration start");
-                    futures::select_biased! {
-                        outgoing = outgoing_rx.next().fuse() => match outgoing {
-                            Some(outgoing) => {
-                                tracing::trace!(%connection_id, "outgoing rpc message: writing");
-                                futures::select_biased! {
-                                    result = writer.write(outgoing).fuse() => {
-                                        tracing::trace!(%connection_id, "outgoing rpc message: done writing");
-                                        result.context("failed to write RPC message")?;
-                                        tracing::trace!(%connection_id, "keepalive interval: resetting after sending message");
-                                        keepalive_timer.set(create_timer(KEEPALIVE_INTERVAL).fuse());
-                                    }
-                                    _ = create_timer(WRITE_TIMEOUT).fuse() => {
-                                        tracing::trace!(%connection_id, "outgoing rpc message: writing timed out");
-                                        anyhow::bail!("timed out writing message");
-                                    }
-                                }
-                            }
-                            None => {
-                                tracing::trace!(%connection_id, "outgoing rpc message: channel closed");
-                                return Ok(())
-                            },
-                        },
-                        _ = keepalive_timer => {
-                            tracing::trace!(%connection_id, "keepalive interval: pinging");
-                            futures::select_biased! {
-                                result = writer.write(Message::Ping).fuse() => {
-                                    tracing::trace!(%connection_id, "keepalive interval: done pinging");
-                                    result.context("failed to send keepalive")?;
-                                    tracing::trace!(%connection_id, "keepalive interval: resetting after pinging");
-                                    keepalive_timer.set(create_timer(KEEPALIVE_INTERVAL).fuse());
-                                }
-                                _ = create_timer(WRITE_TIMEOUT).fuse() => {
-                                    tracing::trace!(%connection_id, "keepalive interval: pinging timed out");
-                                    anyhow::bail!("timed out sending keepalive");
-                                }
-                            }
-                        }
-                        incoming = read_message => {
-                            let incoming = incoming.context("error reading rpc message from socket")?;
-                            tracing::trace!(%connection_id, "incoming rpc message: received");
-                            tracing::trace!(%connection_id, "receive timeout: resetting");
-                            receive_timeout.set(create_timer(RECEIVE_TIMEOUT).fuse());
-                            if let (Message::Envelope(incoming), received_at) = incoming {
-                                tracing::trace!(%connection_id, "incoming rpc message: processing");
-                                futures::select_biased! {
-                                    result = incoming_tx.send((incoming, received_at)).fuse() => match result {
-                                        Ok(_) => {
-                                            tracing::trace!(%connection_id, "incoming rpc message: processed");
-                                        }
-                                        Err(_) => {
-                                            tracing::trace!(%connection_id, "incoming rpc message: channel closed");
-                                            return Ok(())
-                                        }
-                                    },
-                                    _ = create_timer(WRITE_TIMEOUT).fuse() => {
-                                        tracing::trace!(%connection_id, "incoming rpc message: processing timed out");
-                                        anyhow::bail!("timed out processing incoming message");
-                                    }
-                                }
-                            }
-                            break;
-                        },
-                        _ = receive_timeout => {
-                            tracing::trace!(%connection_id, "receive timeout: delay between messages too long");
-                            anyhow::bail!("delay between messages too long");
-                        }
-                    }
-                }
-            }
-        };
-
-        let response_channels = connection_state.response_channels.clone();
-        let stream_response_channels = connection_state.stream_response_channels.clone();
-        self.connections
-            .write()
-            .insert(connection_id, connection_state);
-
-        let incoming_rx = incoming_rx.filter_map(move |(incoming, received_at)| {
-            let response_channels = response_channels.clone();
-            let stream_response_channels = stream_response_channels.clone();
-            async move {
-                let message_id = incoming.id;
-                tracing::trace!(?incoming, "incoming message future: start");
-                let _end = util::defer(move || {
-                    tracing::trace!(%connection_id, message_id, "incoming message future: end");
-                });
-
-                if let Some(responding_to) = incoming.responding_to {
-                    tracing::trace!(
-                        %connection_id,
-                        message_id,
-                        responding_to,
-                        "incoming response: received"
-                    );
-                    let response_channel =
-                        response_channels.lock().as_mut()?.remove(&responding_to);
-                    let stream_response_channel = stream_response_channels
-                        .lock()
-                        .as_ref()?
-                        .get(&responding_to)
-                        .cloned();
-
-                    if let Some(tx) = response_channel {
-                        let requester_resumed = oneshot::channel();
-                        if let Err(error) = tx.send((incoming, received_at, requester_resumed.0)) {
-                            tracing::trace!(
-                                %connection_id,
-                                message_id,
-                                responding_to = responding_to,
-                                ?error,
-                                "incoming response: request future dropped",
-                            );
-                        }
-
-                        tracing::trace!(
-                            %connection_id,
-                            message_id,
-                            responding_to,
-                            "incoming response: waiting to resume requester"
-                        );
-                        let _ = requester_resumed.1.await;
-                        tracing::trace!(
-                            %connection_id,
-                            message_id,
-                            responding_to,
-                            "incoming response: requester resumed"
-                        );
-                    } else if let Some(tx) = stream_response_channel {
-                        let requester_resumed = oneshot::channel();
-                        if let Err(error) = tx.unbounded_send((Ok(incoming), requester_resumed.0)) {
-                            tracing::debug!(
-                                %connection_id,
-                                message_id,
-                                responding_to = responding_to,
-                                ?error,
-                                "incoming stream response: request future dropped",
-                            );
-                        }
-
-                        tracing::debug!(
-                            %connection_id,
-                            message_id,
-                            responding_to,
-                            "incoming stream response: waiting to resume requester"
-                        );
-                        let _ = requester_resumed.1.await;
-                        tracing::debug!(
-                            %connection_id,
-                            message_id,
-                            responding_to,
-                            "incoming stream response: requester resumed"
-                        );
-                    } else {
-                        let message_type = proto::build_typed_envelope(
-                            connection_id.into(),
-                            received_at,
-                            incoming,
-                        )
-                        .map(|p| p.payload_type_name());
-                        tracing::warn!(
-                            %connection_id,
-                            message_id,
-                            responding_to,
-                            message_type,
-                            "incoming response: unknown request"
-                        );
-                    }
-
-                    None
-                } else {
-                    tracing::trace!(%connection_id, message_id, "incoming message: received");
-                    proto::build_typed_envelope(connection_id.into(), received_at, incoming)
-                        .or_else(|| {
-                            tracing::error!(
-                                %connection_id,
-                                message_id,
-                                "unable to construct a typed envelope"
-                            );
-                            None
-                        })
-                }
-            }
-        });
-        (connection_id, handle_io, incoming_rx.boxed())
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn add_test_connection(
-        self: &Arc<Self>,
-        connection: Connection,
-        executor: gpui::BackgroundExecutor,
-    ) -> (
-        ConnectionId,
-        impl Future<Output = anyhow::Result<()>> + Send + use<>,
-        BoxStream<'static, Box<dyn AnyTypedEnvelope>>,
-    ) {
-        self.add_connection(connection, move |duration| executor.timer(duration))
-    }
-
-    pub fn disconnect(&self, connection_id: ConnectionId) {
-        self.connections.write().remove(&connection_id);
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn reset(&self, epoch: u32) {
-        self.next_connection_id.store(0, SeqCst);
-        self.epoch.store(epoch, SeqCst);
-    }
-
-    pub fn teardown(&self) {
-        self.connections.write().clear();
-    }
-
-    /// Make a request and wait for a response.
-    pub fn request<T: RequestMessage>(
-        &self,
-        receiver_id: ConnectionId,
-        request: T,
-    ) -> impl Future<Output = Result<T::Response>> + use<T> {
-        self.request_internal(None, receiver_id, request)
-            .map_ok(|envelope| envelope.payload)
-    }
-
-    pub fn request_envelope<T: RequestMessage>(
-        &self,
-        receiver_id: ConnectionId,
-        request: T,
-    ) -> impl Future<Output = Result<TypedEnvelope<T::Response>>> + use<T> {
-        self.request_internal(None, receiver_id, request)
-    }
-
-    pub fn forward_request<T: RequestMessage>(
-        &self,
-        sender_id: ConnectionId,
-        receiver_id: ConnectionId,
-        request: T,
-    ) -> impl Future<Output = Result<T::Response>> {
-        self.request_internal(Some(sender_id), receiver_id, request)
-            .map_ok(|envelope| envelope.payload)
-    }
-
-    fn request_internal<T: RequestMessage>(
-        &self,
-        original_sender_id: Option<ConnectionId>,
-        receiver_id: ConnectionId,
-        request: T,
-    ) -> impl Future<Output = Result<TypedEnvelope<T::Response>>> + use<T> {
-        let envelope = request.into_envelope(0, None, original_sender_id.map(Into::into));
-        let response = self.request_dynamic(receiver_id, envelope, T::NAME);
-        async move {
-            let (response, received_at) = response.await?;
-            Ok(TypedEnvelope {
-                message_id: response.id,
-                sender_id: receiver_id.into(),
-                original_sender_id: response.original_sender_id,
-                payload: T::Response::from_envelope(response)
-                    .context("received response of the wrong type")?,
-                received_at,
-            })
-        }
-    }
-
-    /// Make a request and wait for a response.
-    ///
-    /// The caller must make sure to deserialize the response into the request's
-    /// response type. This interface is only useful in trait objects, where
-    /// generics can't be used. If you have a concrete type, use `request`.
-    pub fn request_dynamic(
-        &self,
-        receiver_id: ConnectionId,
-        mut envelope: proto::Envelope,
-        type_name: &'static str,
-    ) -> impl Future<Output = Result<(proto::Envelope, Instant)>> + use<> {
-        let (tx, rx) = oneshot::channel();
-        let send = self.connection_state(receiver_id).and_then(|connection| {
-            envelope.id = connection.next_message_id.fetch_add(1, SeqCst);
-            connection
-                .response_channels
-                .lock()
-                .as_mut()
-                .context("connection was closed")?
-                .insert(envelope.id, tx);
-            connection
-                .outgoing_tx
-                .unbounded_send(Message::Envelope(envelope))
-                .context("connection was closed")?;
-            Ok(())
-        });
-        async move {
-            send?;
-            let (response, received_at, _barrier) = rx.await.context("connection was closed")?;
-            if let Some(proto::envelope::Payload::Error(error)) = &response.payload {
-                return Err(RpcError::from_proto(error, type_name));
-            }
-            Ok((response, received_at))
-        }
-    }
-
-    pub fn request_stream<T: RequestMessage>(
-        &self,
-        receiver_id: ConnectionId,
-        request: T,
-    ) -> impl Future<Output = Result<impl Unpin + Stream<Item = Result<T::Response>>>> {
-        let (tx, rx) = mpsc::unbounded();
-        let send = self.connection_state(receiver_id).and_then(|connection| {
-            let message_id = connection.next_message_id.fetch_add(1, SeqCst);
-            let stream_response_channels = connection.stream_response_channels.clone();
-            stream_response_channels
-                .lock()
-                .as_mut()
-                .context("connection was closed")?
-                .insert(message_id, tx);
-            connection
-                .outgoing_tx
-                .unbounded_send(Message::Envelope(
-                    request.into_envelope(message_id, None, None),
-                ))
-                .context("connection was closed")?;
-            Ok((message_id, stream_response_channels))
-        });
-
-        async move {
-            let (message_id, stream_response_channels) = send?;
-            let stream_response_channels = Arc::downgrade(&stream_response_channels);
-
-            Ok(rx.filter_map(move |(response, _barrier)| {
-                let stream_response_channels = stream_response_channels.clone();
-                future::ready(match response {
-                    Ok(response) => {
-                        if let Some(proto::envelope::Payload::Error(error)) = &response.payload {
-                            Some(Err(RpcError::from_proto(error, T::NAME)))
-                        } else if let Some(proto::envelope::Payload::EndStream(_)) =
-                            &response.payload
-                        {
-                            // Remove the transmitting end of the response channel to end the stream.
-                            if let Some(channels) = stream_response_channels.upgrade()
-                                && let Some(channels) = channels.lock().as_mut()
-                            {
-                                channels.remove(&message_id);
-                            }
-                            None
-                        } else {
-                            Some(
-                                T::Response::from_envelope(response)
-                                    .context("received response of the wrong type"),
-                            )
-                        }
-                    }
-                    Err(error) => Some(Err(error)),
-                })
-            }))
-        }
-    }
-
-    pub fn send<T: EnvelopedMessage>(&self, receiver_id: ConnectionId, message: T) -> Result<()> {
-        let connection = self.connection_state(receiver_id)?;
-        let message_id = connection
-            .next_message_id
-            .fetch_add(1, atomic::Ordering::SeqCst);
-        connection.outgoing_tx.unbounded_send(Message::Envelope(
-            message.into_envelope(message_id, None, None),
-        ))?;
-        Ok(())
-    }
-
-    pub fn send_dynamic(&self, receiver_id: ConnectionId, message: proto::Envelope) -> Result<()> {
-        let connection = self.connection_state(receiver_id)?;
-        connection
-            .outgoing_tx
-            .unbounded_send(Message::Envelope(message))?;
-        Ok(())
-    }
-
-    pub fn forward_send<T: EnvelopedMessage>(
-        &self,
-        sender_id: ConnectionId,
-        receiver_id: ConnectionId,
-        message: T,
-    ) -> Result<()> {
-        let connection = self.connection_state(receiver_id)?;
-        let message_id = connection
-            .next_message_id
-            .fetch_add(1, atomic::Ordering::SeqCst);
-        connection
-            .outgoing_tx
-            .unbounded_send(Message::Envelope(message.into_envelope(
-                message_id,
-                None,
-                Some(sender_id.into()),
-            )))?;
-        Ok(())
-    }
-
-    pub fn respond<T: RequestMessage>(
-        &self,
-        receipt: Receipt<T>,
-        response: T::Response,
-    ) -> Result<()> {
-        let connection = self.connection_state(receipt.sender_id.into())?;
-        let message_id = connection
-            .next_message_id
-            .fetch_add(1, atomic::Ordering::SeqCst);
-        connection
-            .outgoing_tx
-            .unbounded_send(Message::Envelope(response.into_envelope(
-                message_id,
-                Some(receipt.message_id),
-                None,
-            )))?;
-        Ok(())
-    }
-
-    pub fn end_stream<T: RequestMessage>(&self, receipt: Receipt<T>) -> Result<()> {
-        let connection = self.connection_state(receipt.sender_id.into())?;
-        let message_id = connection
-            .next_message_id
-            .fetch_add(1, atomic::Ordering::SeqCst);
-
-        let message = proto::EndStream {};
-
-        connection
-            .outgoing_tx
-            .unbounded_send(Message::Envelope(message.into_envelope(
-                message_id,
-                Some(receipt.message_id),
-                None,
-            )))?;
-        Ok(())
-    }
-
-    pub fn respond_with_error<T: RequestMessage>(
-        &self,
-        receipt: Receipt<T>,
-        response: proto::Error,
-    ) -> Result<()> {
-        let connection = self.connection_state(receipt.sender_id.into())?;
-        let message_id = connection
-            .next_message_id
-            .fetch_add(1, atomic::Ordering::SeqCst);
-        connection
-            .outgoing_tx
-            .unbounded_send(Message::Envelope(response.into_envelope(
-                message_id,
-                Some(receipt.message_id),
-                None,
-            )))?;
-        Ok(())
-    }
-
-    pub fn respond_with_unhandled_message(
-        &self,
-        sender_id: ConnectionId,
-        request_message_id: u32,
-        message_type_name: &'static str,
-    ) -> Result<()> {
-        let connection = self.connection_state(sender_id)?;
-        let response = ErrorCode::Internal
-            .message(format!("message {} was not handled", message_type_name))
-            .to_proto();
-        let message_id = connection
-            .next_message_id
-            .fetch_add(1, atomic::Ordering::SeqCst);
-        connection
-            .outgoing_tx
-            .unbounded_send(Message::Envelope(response.into_envelope(
-                message_id,
-                Some(request_message_id),
-                None,
-            )))?;
-        Ok(())
-    }
-
-    fn connection_state(&self, connection_id: ConnectionId) -> Result<ConnectionState> {
-        let connections = self.connections.read();
-        let connection = connections
-            .get(&connection_id)
-            .with_context(|| format!("no such connection: {connection_id}"))?;
-        Ok(connection.clone())
-    }
-}
-
-impl Serialize for Peer {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        let mut state = serializer.serialize_struct("Peer", 2)?;
-        state.serialize_field("connections", &*self.connections.read())?;
-        state.end()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use async_tungstenite::tungstenite::Message as WebSocketMessage;
-    use gpui::TestAppContext;
-
-    fn init_logger() {
-        zlog::init_test();
-    }
-
-    #[gpui::test(iterations = 50)]
-    async fn test_request_response(cx: &mut TestAppContext) {
-        init_logger();
-
-        let executor = cx.executor();
-
-        // create 2 clients connected to 1 server
-        let server = Peer::new(0);
-        let client1 = Peer::new(0);
-        let client2 = Peer::new(0);
-
-        let (client1_to_server_conn, server_to_client_1_conn, _kill) =
-            Connection::in_memory(cx.executor());
-        let (client1_conn_id, io_task1, client1_incoming) =
-            client1.add_test_connection(client1_to_server_conn, cx.executor());
-        let (_, io_task2, server_incoming1) =
-            server.add_test_connection(server_to_client_1_conn, cx.executor());
-
-        let (client2_to_server_conn, server_to_client_2_conn, _kill) =
-            Connection::in_memory(cx.executor());
-        let (client2_conn_id, io_task3, client2_incoming) =
-            client2.add_test_connection(client2_to_server_conn, cx.executor());
-        let (_, io_task4, server_incoming2) =
-            server.add_test_connection(server_to_client_2_conn, cx.executor());
-
-        executor.spawn(io_task1).detach();
-        executor.spawn(io_task2).detach();
-        executor.spawn(io_task3).detach();
-        executor.spawn(io_task4).detach();
-        executor
-            .spawn(handle_messages(server_incoming1, server.clone()))
-            .detach();
-        executor
-            .spawn(handle_messages(client1_incoming, client1.clone()))
-            .detach();
-        executor
-            .spawn(handle_messages(server_incoming2, server.clone()))
-            .detach();
-        executor
-            .spawn(handle_messages(client2_incoming, client2.clone()))
-            .detach();
-
-        assert_eq!(
-            client1
-                .request(client1_conn_id, proto::Ping {},)
-                .await
-                .unwrap(),
-            proto::Ack {}
-        );
-
-        assert_eq!(
-            client2
-                .request(client2_conn_id, proto::Ping {},)
-                .await
-                .unwrap(),
-            proto::Ack {}
-        );
-
-        assert_eq!(
-            client1
-                .request(client1_conn_id, proto::Test { id: 1 },)
-                .await
-                .unwrap(),
-            proto::Test { id: 1 }
-        );
-
-        assert_eq!(
-            client2
-                .request(client2_conn_id, proto::Test { id: 2 })
-                .await
-                .unwrap(),
-            proto::Test { id: 2 }
-        );
-
-        client1.disconnect(client1_conn_id);
-        client2.disconnect(client1_conn_id);
-
-        async fn handle_messages(
-            mut messages: BoxStream<'static, Box<dyn AnyTypedEnvelope>>,
-            peer: Arc<Peer>,
-        ) -> Result<()> {
-            while let Some(envelope) = messages.next().await {
-                let envelope = envelope.into_any();
-                if let Some(envelope) = envelope.downcast_ref::<TypedEnvelope<proto::Ping>>() {
-                    let receipt = envelope.receipt();
-                    peer.respond(receipt, proto::Ack {})?
-                } else if let Some(envelope) = envelope.downcast_ref::<TypedEnvelope<proto::Test>>()
-                {
-                    peer.respond(envelope.receipt(), envelope.payload.clone())?
-                } else {
-                    panic!("unknown message type");
-                }
-            }
-
-            Ok(())
-        }
-    }
-
-    #[gpui::test(iterations = 50)]
-    async fn test_order_of_response_and_incoming(cx: &mut TestAppContext) {
-        let executor = cx.executor();
-        let server = Peer::new(0);
-        let client = Peer::new(0);
-
-        let (client_to_server_conn, server_to_client_conn, _kill) =
-            Connection::in_memory(executor.clone());
-        let (client_to_server_conn_id, io_task1, mut client_incoming) =
-            client.add_test_connection(client_to_server_conn, executor.clone());
-
-        let (server_to_client_conn_id, io_task2, mut server_incoming) =
-            server.add_test_connection(server_to_client_conn, executor.clone());
-
-        executor.spawn(io_task1).detach();
-        executor.spawn(io_task2).detach();
-
-        executor
-            .spawn(async move {
-                let future = server_incoming.next().await;
-                let request = future
-                    .unwrap()
-                    .into_any()
-                    .downcast::<TypedEnvelope<proto::Ping>>()
-                    .unwrap();
-
-                server
-                    .send(
-                        server_to_client_conn_id,
-                        ErrorCode::Internal
-                            .message("message 1".to_string())
-                            .to_proto(),
-                    )
-                    .unwrap();
-                server
-                    .send(
-                        server_to_client_conn_id,
-                        ErrorCode::Internal
-                            .message("message 2".to_string())
-                            .to_proto(),
-                    )
-                    .unwrap();
-                server.respond(request.receipt(), proto::Ack {}).unwrap();
-
-                // Prevent the connection from being dropped
-                server_incoming.next().await;
-            })
-            .detach();
-
-        let events = Arc::new(Mutex::new(Vec::new()));
-
-        let response = client.request(client_to_server_conn_id, proto::Ping {});
-        let response_task = executor.spawn({
-            let events = events.clone();
-            async move {
-                response.await.unwrap();
-                events.lock().push("response".to_string());
-            }
-        });
-
-        executor
-            .spawn({
-                let events = events.clone();
-                async move {
-                    let incoming1 = client_incoming
-                        .next()
-                        .await
-                        .unwrap()
-                        .into_any()
-                        .downcast::<TypedEnvelope<proto::Error>>()
-                        .unwrap();
-                    events.lock().push(incoming1.payload.message);
-                    let incoming2 = client_incoming
-                        .next()
-                        .await
-                        .unwrap()
-                        .into_any()
-                        .downcast::<TypedEnvelope<proto::Error>>()
-                        .unwrap();
-                    events.lock().push(incoming2.payload.message);
-
-                    // Prevent the connection from being dropped
-                    client_incoming.next().await;
-                }
-            })
-            .detach();
-
-        response_task.await;
-        assert_eq!(
-            &*events.lock(),
-            &[
-                "message 1".to_string(),
-                "message 2".to_string(),
-                "response".to_string()
-            ]
-        );
-    }
-
-    #[gpui::test(iterations = 50)]
-    async fn test_dropping_request_before_completion(cx: &mut TestAppContext) {
-        let executor = cx.executor();
-        let server = Peer::new(0);
-        let client = Peer::new(0);
-
-        let (client_to_server_conn, server_to_client_conn, _kill) =
-            Connection::in_memory(cx.executor());
-        let (client_to_server_conn_id, io_task1, mut client_incoming) =
-            client.add_test_connection(client_to_server_conn, cx.executor());
-        let (server_to_client_conn_id, io_task2, mut server_incoming) =
-            server.add_test_connection(server_to_client_conn, cx.executor());
-
-        executor.spawn(io_task1).detach();
-        executor.spawn(io_task2).detach();
-
-        executor
-            .spawn(async move {
-                let request1 = server_incoming
-                    .next()
-                    .await
-                    .unwrap()
-                    .into_any()
-                    .downcast::<TypedEnvelope<proto::Ping>>()
-                    .unwrap();
-                let request2 = server_incoming
-                    .next()
-                    .await
-                    .unwrap()
-                    .into_any()
-                    .downcast::<TypedEnvelope<proto::Ping>>()
-                    .unwrap();
-
-                server
-                    .send(
-                        server_to_client_conn_id,
-                        ErrorCode::Internal
-                            .message("message 1".to_string())
-                            .to_proto(),
-                    )
-                    .unwrap();
-                server
-                    .send(
-                        server_to_client_conn_id,
-                        ErrorCode::Internal
-                            .message("message 2".to_string())
-                            .to_proto(),
-                    )
-                    .unwrap();
-                server.respond(request1.receipt(), proto::Ack {}).unwrap();
-                server.respond(request2.receipt(), proto::Ack {}).unwrap();
-
-                // Prevent the connection from being dropped
-                server_incoming.next().await;
-            })
-            .detach();
-
-        let events = Arc::new(Mutex::new(Vec::new()));
-
-        let request1 = client.request(client_to_server_conn_id, proto::Ping {});
-        let request1_task = executor.spawn(request1);
-        let request2 = client.request(client_to_server_conn_id, proto::Ping {});
-        let request2_task = executor.spawn({
-            let events = events.clone();
-            async move {
-                request2.await.unwrap();
-                events.lock().push("response 2".to_string());
-            }
-        });
-
-        executor
-            .spawn({
-                let events = events.clone();
-                async move {
-                    let incoming1 = client_incoming
-                        .next()
-                        .await
-                        .unwrap()
-                        .into_any()
-                        .downcast::<TypedEnvelope<proto::Error>>()
-                        .unwrap();
-                    events.lock().push(incoming1.payload.message);
-                    let incoming2 = client_incoming
-                        .next()
-                        .await
-                        .unwrap()
-                        .into_any()
-                        .downcast::<TypedEnvelope<proto::Error>>()
-                        .unwrap();
-                    events.lock().push(incoming2.payload.message);
-
-                    // Prevent the connection from being dropped
-                    client_incoming.next().await;
-                }
-            })
-            .detach();
-
-        // Allow the request to make some progress before dropping it.
-        cx.executor().simulate_random_delay().await;
-        drop(request1_task);
-
-        request2_task.await;
-        assert_eq!(
-            &*events.lock(),
-            &[
-                "message 1".to_string(),
-                "message 2".to_string(),
-                "response 2".to_string()
-            ]
-        );
-    }
-
-    #[gpui::test(iterations = 50)]
-    async fn test_disconnect(cx: &mut TestAppContext) {
-        let executor = cx.executor();
-
-        let (client_conn, mut server_conn, _kill) = Connection::in_memory(executor.clone());
-
-        let client = Peer::new(0);
-        let (connection_id, io_handler, mut incoming) =
-            client.add_test_connection(client_conn, executor.clone());
-
-        let (io_ended_tx, io_ended_rx) = oneshot::channel();
-        executor
-            .spawn(async move {
-                io_handler.await.ok();
-                io_ended_tx.send(()).unwrap();
-            })
-            .detach();
-
-        let (messages_ended_tx, messages_ended_rx) = oneshot::channel();
-        executor
-            .spawn(async move {
-                incoming.next().await;
-                messages_ended_tx.send(()).unwrap();
-            })
-            .detach();
-
-        client.disconnect(connection_id);
-
-        let _ = io_ended_rx.await;
-        let _ = messages_ended_rx.await;
-        assert!(
-            server_conn
-                .send(WebSocketMessage::Binary(vec![].into()))
-                .await
-                .is_err()
-        );
-    }
-
-    #[gpui::test(iterations = 50)]
-    async fn test_io_error(cx: &mut TestAppContext) {
-        let executor = cx.executor();
-        let (client_conn, mut server_conn, _kill) = Connection::in_memory(executor.clone());
-
-        let client = Peer::new(0);
-        let (connection_id, io_handler, mut incoming) =
-            client.add_test_connection(client_conn, executor.clone());
-        executor.spawn(io_handler).detach();
-        executor
-            .spawn(async move { incoming.next().await })
-            .detach();
-
-        let response = executor.spawn(client.request(connection_id, proto::Ping {}));
-        let _request = server_conn.rx.next().await.unwrap().unwrap();
-
-        drop(server_conn);
-        assert_eq!(
-            response.await.unwrap_err().to_string(),
-            "connection was closed"
-        );
-    }
-}
diff --git a/crates/rpc/src/proto_client.rs b/crates/rpc/src/proto_client.rs
deleted file mode 100644
index 3850ff5820..0000000000
--- a/crates/rpc/src/proto_client.rs
+++ /dev/null
@@ -1,531 +0,0 @@
-use anyhow::{Context, Result};
-use collections::HashMap;
-use futures::{
-    Future, FutureExt as _,
-    channel::oneshot,
-    future::{BoxFuture, LocalBoxFuture},
-};
-use gpui::{AnyEntity, AnyWeakEntity, AsyncApp, BackgroundExecutor, Entity, FutureExt as _};
-use parking_lot::Mutex;
-use proto::{
-    AnyTypedEnvelope, EntityMessage, Envelope, EnvelopedMessage, LspRequestId, LspRequestMessage,
-    RequestMessage, TypedEnvelope, error::ErrorExt as _,
-};
-use std::{
-    any::{Any, TypeId},
-    sync::{
-        Arc, OnceLock,
-        atomic::{self, AtomicU64},
-    },
-    time::Duration,
-};
-
-#[derive(Clone)]
-pub struct AnyProtoClient(Arc<State>);
-
-type RequestIds = Arc<
-    Mutex<
-        HashMap<
-            LspRequestId,
-            oneshot::Sender<
-                Result<
-                    Option<TypedEnvelope<Vec<proto::ProtoLspResponse<Box<dyn AnyTypedEnvelope>>>>>,
-                >,
-            >,
-        >,
-    >,
->;
-
-static NEXT_LSP_REQUEST_ID: OnceLock<Arc<AtomicU64>> = OnceLock::new();
-static REQUEST_IDS: OnceLock<RequestIds> = OnceLock::new();
-
-struct State {
-    client: Arc<dyn ProtoClient>,
-    next_lsp_request_id: Arc<AtomicU64>,
-    request_ids: RequestIds,
-}
-
-pub trait ProtoClient: Send + Sync {
-    fn request(
-        &self,
-        envelope: Envelope,
-        request_type: &'static str,
-    ) -> BoxFuture<'static, Result<Envelope>>;
-
-    fn send(&self, envelope: Envelope, message_type: &'static str) -> Result<()>;
-
-    fn send_response(&self, envelope: Envelope, message_type: &'static str) -> Result<()>;
-
-    fn message_handler_set(&self) -> &parking_lot::Mutex<ProtoMessageHandlerSet>;
-
-    fn is_via_collab(&self) -> bool;
-    fn has_wsl_interop(&self) -> bool;
-}
-
-#[derive(Default)]
-pub struct ProtoMessageHandlerSet {
-    pub entity_types_by_message_type: HashMap<TypeId, TypeId>,
-    pub entities_by_type_and_remote_id: HashMap<(TypeId, u64), EntityMessageSubscriber>,
-    pub entity_id_extractors: HashMap<TypeId, fn(&dyn AnyTypedEnvelope) -> u64>,
-    pub entities_by_message_type: HashMap<TypeId, AnyWeakEntity>,
-    pub message_handlers: HashMap<TypeId, ProtoMessageHandler>,
-}
-
-pub type ProtoMessageHandler = Arc<
-    dyn Send
-        + Sync
-        + Fn(
-            AnyEntity,
-            Box<dyn AnyTypedEnvelope>,
-            AnyProtoClient,
-            AsyncApp,
-        ) -> LocalBoxFuture<'static, Result<()>>,
->;
-
-impl ProtoMessageHandlerSet {
-    pub fn clear(&mut self) {
-        self.message_handlers.clear();
-        self.entities_by_message_type.clear();
-        self.entities_by_type_and_remote_id.clear();
-        self.entity_id_extractors.clear();
-    }
-
-    fn add_message_handler(
-        &mut self,
-        message_type_id: TypeId,
-        entity: gpui::AnyWeakEntity,
-        handler: ProtoMessageHandler,
-    ) {
-        self.entities_by_message_type
-            .insert(message_type_id, entity);
-        let prev_handler = self.message_handlers.insert(message_type_id, handler);
-        if prev_handler.is_some() {
-            panic!("registered handler for the same message twice");
-        }
-    }
-
-    fn add_entity_message_handler(
-        &mut self,
-        message_type_id: TypeId,
-        entity_type_id: TypeId,
-        entity_id_extractor: fn(&dyn AnyTypedEnvelope) -> u64,
-        handler: ProtoMessageHandler,
-    ) {
-        self.entity_id_extractors
-            .entry(message_type_id)
-            .or_insert(entity_id_extractor);
-        self.entity_types_by_message_type
-            .insert(message_type_id, entity_type_id);
-        let prev_handler = self.message_handlers.insert(message_type_id, handler);
-        if prev_handler.is_some() {
-            panic!("registered handler for the same message twice");
-        }
-    }
-
-    pub fn handle_message(
-        this: &parking_lot::Mutex<Self>,
-        message: Box<dyn AnyTypedEnvelope>,
-        client: AnyProtoClient,
-        cx: AsyncApp,
-    ) -> Option<LocalBoxFuture<'static, Result<()>>> {
-        let payload_type_id = message.payload_type_id();
-        let mut this = this.lock();
-        let handler = this.message_handlers.get(&payload_type_id)?.clone();
-        let entity = if let Some(entity) = this.entities_by_message_type.get(&payload_type_id) {
-            entity.upgrade()?
-        } else {
-            let extract_entity_id = *this.entity_id_extractors.get(&payload_type_id)?;
-            let entity_type_id = *this.entity_types_by_message_type.get(&payload_type_id)?;
-            let entity_id = (extract_entity_id)(message.as_ref());
-            match this
-                .entities_by_type_and_remote_id
-                .get_mut(&(entity_type_id, entity_id))?
-            {
-                EntityMessageSubscriber::Pending(pending) => {
-                    pending.push(message);
-                    return None;
-                }
-                EntityMessageSubscriber::Entity { handle } => handle.upgrade()?,
-            }
-        };
-        drop(this);
-        Some(handler(entity, message, client, cx))
-    }
-}
-
-pub enum EntityMessageSubscriber {
-    Entity { handle: AnyWeakEntity },
-    Pending(Vec<Box<dyn AnyTypedEnvelope>>),
-}
-
-impl std::fmt::Debug for EntityMessageSubscriber {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            EntityMessageSubscriber::Entity { handle } => f
-                .debug_struct("EntityMessageSubscriber::Entity")
-                .field("handle", handle)
-                .finish(),
-            EntityMessageSubscriber::Pending(vec) => f
-                .debug_struct("EntityMessageSubscriber::Pending")
-                .field(
-                    "envelopes",
-                    &vec.iter()
-                        .map(|envelope| envelope.payload_type_name())
-                        .collect::<Vec<_>>(),
-                )
-                .finish(),
-        }
-    }
-}
-
-impl<T> From<Arc<T>> for AnyProtoClient
-where
-    T: ProtoClient + 'static,
-{
-    fn from(client: Arc<T>) -> Self {
-        Self::new(client)
-    }
-}
-
-impl AnyProtoClient {
-    pub fn new<T: ProtoClient + 'static>(client: Arc<T>) -> Self {
-        Self(Arc::new(State {
-            client,
-            next_lsp_request_id: NEXT_LSP_REQUEST_ID
-                .get_or_init(|| Arc::new(AtomicU64::new(0)))
-                .clone(),
-            request_ids: REQUEST_IDS.get_or_init(RequestIds::default).clone(),
-        }))
-    }
-
-    pub fn is_via_collab(&self) -> bool {
-        self.0.client.is_via_collab()
-    }
-
-    pub fn request<T: RequestMessage>(
-        &self,
-        request: T,
-    ) -> impl Future<Output = Result<T::Response>> + use<T> {
-        let envelope = request.into_envelope(0, None, None);
-        let response = self.0.client.request(envelope, T::NAME);
-        async move {
-            T::Response::from_envelope(response.await?)
-                .context("received response of the wrong type")
-        }
-    }
-
-    pub fn send<T: EnvelopedMessage>(&self, request: T) -> Result<()> {
-        let envelope = request.into_envelope(0, None, None);
-        self.0.client.send(envelope, T::NAME)
-    }
-
-    pub fn send_response<T: EnvelopedMessage>(&self, request_id: u32, request: T) -> Result<()> {
-        let envelope = request.into_envelope(0, Some(request_id), None);
-        self.0.client.send(envelope, T::NAME)
-    }
-
-    pub fn request_lsp<T>(
-        &self,
-        project_id: u64,
-        server_id: Option<u64>,
-        timeout: Duration,
-        executor: BackgroundExecutor,
-        request: T,
-    ) -> impl Future<
-        Output = Result<Option<TypedEnvelope<Vec<proto::ProtoLspResponse<T::Response>>>>>,
-    > + use<T>
-    where
-        T: LspRequestMessage,
-    {
-        let new_id = LspRequestId(
-            self.0
-                .next_lsp_request_id
-                .fetch_add(1, atomic::Ordering::Acquire),
-        );
-        let (tx, rx) = oneshot::channel();
-        {
-            self.0.request_ids.lock().insert(new_id, tx);
-        }
-
-        let query = proto::LspQuery {
-            project_id,
-            server_id,
-            lsp_request_id: new_id.0,
-            request: Some(request.to_proto_query()),
-        };
-        let request = self.request(query);
-        let request_ids = self.0.request_ids.clone();
-        async move {
-            match request.await {
-                Ok(_request_enqueued) => {}
-                Err(e) => {
-                    request_ids.lock().remove(&new_id);
-                    return Err(e).context("sending LSP proto request");
-                }
-            }
-
-            let response = rx.with_timeout(timeout, &executor).await;
-            {
-                request_ids.lock().remove(&new_id);
-            }
-            match response {
-                Ok(Ok(response)) => {
-                    let response = response
-                        .context("waiting for LSP proto response")?
-                        .map(|response| {
-                            anyhow::Ok(TypedEnvelope {
-                                payload: response
-                                    .payload
-                                    .into_iter()
-                                    .map(|lsp_response| lsp_response.into_response::<T>())
-                                    .collect::<Result<Vec<_>>>()?,
-                                sender_id: response.sender_id,
-                                original_sender_id: response.original_sender_id,
-                                message_id: response.message_id,
-                                received_at: response.received_at,
-                            })
-                        })
-                        .transpose()
-                        .context("converting LSP proto response")?;
-                    Ok(response)
-                }
-                Err(_cancelled_due_timeout) => Ok(None),
-                Ok(Err(_channel_dropped)) => Ok(None),
-            }
-        }
-    }
-
-    pub fn send_lsp_response<T: LspRequestMessage>(
-        &self,
-        project_id: u64,
-        lsp_request_id: LspRequestId,
-        server_responses: HashMap<u64, T::Response>,
-    ) -> Result<()> {
-        self.send(proto::LspQueryResponse {
-            project_id,
-            lsp_request_id: lsp_request_id.0,
-            responses: server_responses
-                .into_iter()
-                .map(|(server_id, response)| proto::LspResponse {
-                    server_id,
-                    response: Some(T::response_to_proto_query(response)),
-                })
-                .collect(),
-        })
-    }
-
-    pub fn handle_lsp_response(&self, mut envelope: TypedEnvelope<proto::LspQueryResponse>) {
-        let request_id = LspRequestId(envelope.payload.lsp_request_id);
-        let mut response_senders = self.0.request_ids.lock();
-        if let Some(tx) = response_senders.remove(&request_id) {
-            let responses = envelope.payload.responses.drain(..).collect::<Vec<_>>();
-            tx.send(Ok(Some(proto::TypedEnvelope {
-                sender_id: envelope.sender_id,
-                original_sender_id: envelope.original_sender_id,
-                message_id: envelope.message_id,
-                received_at: envelope.received_at,
-                payload: responses
-                    .into_iter()
-                    .filter_map(|response| {
-                        use proto::lsp_response::Response;
-
-                        let server_id = response.server_id;
-                        let response = match response.response? {
-                            Response::GetReferencesResponse(response) => {
-                                to_any_envelope(&envelope, response)
-                            }
-                            Response::GetDocumentColorResponse(response) => {
-                                to_any_envelope(&envelope, response)
-                            }
-                            Response::GetHoverResponse(response) => {
-                                to_any_envelope(&envelope, response)
-                            }
-                            Response::GetCodeActionsResponse(response) => {
-                                to_any_envelope(&envelope, response)
-                            }
-                            Response::GetSignatureHelpResponse(response) => {
-                                to_any_envelope(&envelope, response)
-                            }
-                            Response::GetCodeLensResponse(response) => {
-                                to_any_envelope(&envelope, response)
-                            }
-                            Response::GetDocumentDiagnosticsResponse(response) => {
-                                to_any_envelope(&envelope, response)
-                            }
-                            Response::GetDefinitionResponse(response) => {
-                                to_any_envelope(&envelope, response)
-                            }
-                            Response::GetDeclarationResponse(response) => {
-                                to_any_envelope(&envelope, response)
-                            }
-                            Response::GetTypeDefinitionResponse(response) => {
-                                to_any_envelope(&envelope, response)
-                            }
-                            Response::GetImplementationResponse(response) => {
-                                to_any_envelope(&envelope, response)
-                            }
-                            Response::InlayHintsResponse(response) => {
-                                to_any_envelope(&envelope, response)
-                            }
-                        };
-                        Some(proto::ProtoLspResponse {
-                            server_id,
-                            response,
-                        })
-                    })
-                    .collect(),
-            })))
-            .ok();
-        }
-    }
-
-    pub fn add_request_handler<M, E, H, F>(&self, entity: gpui::WeakEntity<E>, handler: H)
-    where
-        M: RequestMessage,
-        E: 'static,
-        H: 'static + Sync + Fn(Entity<E>, TypedEnvelope<M>, AsyncApp) -> F + Send + Sync,
-        F: 'static + Future<Output = Result<M::Response>>,
-    {
-        self.0
-            .client
-            .message_handler_set()
-            .lock()
-            .add_message_handler(
-                TypeId::of::<M>(),
-                entity.into(),
-                Arc::new(move |entity, envelope, client, cx| {
-                    let entity = entity.downcast::<E>().unwrap();
-                    let envelope = envelope.into_any().downcast::<TypedEnvelope<M>>().unwrap();
-                    let request_id = envelope.message_id();
-                    handler(entity, *envelope, cx)
-                        .then(move |result| async move {
-                            match result {
-                                Ok(response) => {
-                                    client.send_response(request_id, response)?;
-                                    Ok(())
-                                }
-                                Err(error) => {
-                                    client.send_response(request_id, error.to_proto())?;
-                                    Err(error)
-                                }
-                            }
-                        })
-                        .boxed_local()
-                }),
-            )
-    }
-
-    pub fn add_entity_request_handler<M, E, H, F>(&self, handler: H)
-    where
-        M: EnvelopedMessage + RequestMessage + EntityMessage,
-        E: 'static,
-        H: 'static + Sync + Send + Fn(gpui::Entity<E>, TypedEnvelope<M>, AsyncApp) -> F,
-        F: 'static + Future<Output = Result<M::Response>>,
-    {
-        let message_type_id = TypeId::of::<M>();
-        let entity_type_id = TypeId::of::<E>();
-        let entity_id_extractor = |envelope: &dyn AnyTypedEnvelope| {
-            (envelope as &dyn Any)
-                .downcast_ref::<TypedEnvelope<M>>()
-                .unwrap()
-                .payload
-                .remote_entity_id()
-        };
-        self.0
-            .client
-            .message_handler_set()
-            .lock()
-            .add_entity_message_handler(
-                message_type_id,
-                entity_type_id,
-                entity_id_extractor,
-                Arc::new(move |entity, envelope, client, cx| {
-                    let entity = entity.downcast::<E>().unwrap();
-                    let envelope = envelope.into_any().downcast::<TypedEnvelope<M>>().unwrap();
-                    let request_id = envelope.message_id();
-                    handler(entity, *envelope, cx)
-                        .then(move |result| async move {
-                            match result {
-                                Ok(response) => {
-                                    client.send_response(request_id, response)?;
-                                    Ok(())
-                                }
-                                Err(error) => {
-                                    client.send_response(request_id, error.to_proto())?;
-                                    Err(error)
-                                }
-                            }
-                        })
-                        .boxed_local()
-                }),
-            );
-    }
-
-    pub fn add_entity_message_handler<M, E, H, F>(&self, handler: H)
-    where
-        M: EnvelopedMessage + EntityMessage,
-        E: 'static,
-        H: 'static + Sync + Send + Fn(gpui::Entity<E>, TypedEnvelope<M>, AsyncApp) -> F,
-        F: 'static + Future<Output = Result<()>>,
-    {
-        let message_type_id = TypeId::of::<M>();
-        let entity_type_id = TypeId::of::<E>();
-        let entity_id_extractor = |envelope: &dyn AnyTypedEnvelope| {
-            (envelope as &dyn Any)
-                .downcast_ref::<TypedEnvelope<M>>()
-                .unwrap()
-                .payload
-                .remote_entity_id()
-        };
-        self.0
-            .client
-            .message_handler_set()
-            .lock()
-            .add_entity_message_handler(
-                message_type_id,
-                entity_type_id,
-                entity_id_extractor,
-                Arc::new(move |entity, envelope, _, cx| {
-                    let entity = entity.downcast::<E>().unwrap();
-                    let envelope = envelope.into_any().downcast::<TypedEnvelope<M>>().unwrap();
-                    handler(entity, *envelope, cx).boxed_local()
-                }),
-            );
-    }
-
-    pub fn subscribe_to_entity<E: 'static>(&self, remote_id: u64, entity: &Entity<E>) {
-        let id = (TypeId::of::<E>(), remote_id);
-
-        let mut message_handlers = self.0.client.message_handler_set().lock();
-        if message_handlers
-            .entities_by_type_and_remote_id
-            .contains_key(&id)
-        {
-            panic!("already subscribed to entity");
-        }
-
-        message_handlers.entities_by_type_and_remote_id.insert(
-            id,
-            EntityMessageSubscriber::Entity {
-                handle: entity.downgrade().into(),
-            },
-        );
-    }
-
-    pub fn has_wsl_interop(&self) -> bool {
-        self.0.client.has_wsl_interop()
-    }
-}
-
-fn to_any_envelope<T: EnvelopedMessage>(
-    envelope: &TypedEnvelope<proto::LspQueryResponse>,
-    response: T,
-) -> Box<dyn AnyTypedEnvelope> {
-    Box::new(proto::TypedEnvelope {
-        sender_id: envelope.sender_id,
-        original_sender_id: envelope.original_sender_id,
-        message_id: envelope.message_id,
-        received_at: envelope.received_at,
-        payload: response,
-    }) as Box<_>
-}
diff --git a/crates/rpc/src/rpc.rs b/crates/rpc/src/rpc.rs
deleted file mode 100644
index ad1ebb757c..0000000000
--- a/crates/rpc/src/rpc.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-pub mod auth;
-mod conn;
-mod extension;
-mod message_stream;
-mod notification;
-mod peer;
-
-pub use conn::Connection;
-pub use extension::*;
-pub use notification::*;
-pub use peer::*;
-pub use proto;
-pub use proto::{Receipt, TypedEnvelope, error::*};
-mod macros;
-
-#[cfg(feature = "gpui")]
-mod proto_client;
-#[cfg(feature = "gpui")]
-pub use proto_client::*;
-
-pub const PROTOCOL_VERSION: u32 = 68;
diff --git a/crates/rules_library/Cargo.toml b/crates/rules_library/Cargo.toml
deleted file mode 100644
index d2fdd765e0..0000000000
--- a/crates/rules_library/Cargo.toml
+++ /dev/null
@@ -1,34 +0,0 @@
-[package]
-name = "rules_library"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/rules_library.rs"
-
-[dependencies]
-anyhow.workspace = true
-collections.workspace = true
-editor.workspace = true
-gpui.workspace = true
-language.workspace = true
-language_model.workspace = true
-log.workspace = true
-menu.workspace = true
-picker.workspace = true
-prompt_store.workspace = true
-release_channel.workspace = true
-rope.workspace = true
-serde.workspace = true
-settings.workspace = true
-theme.workspace = true
-title_bar.workspace = true
-ui.workspace = true
-util.workspace = true
-workspace.workspace = true
-zed_actions.workspace = true
diff --git a/crates/rules_library/LICENSE-GPL b/crates/rules_library/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/rules_library/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/rules_library/src/rules_library.rs b/crates/rules_library/src/rules_library.rs
deleted file mode 100644
index 09b7e0b539..0000000000
--- a/crates/rules_library/src/rules_library.rs
+++ /dev/null
@@ -1,1431 +0,0 @@
-use anyhow::Result;
-use collections::{HashMap, HashSet};
-use editor::{CompletionProvider, SelectionEffects};
-use editor::{CurrentLineHighlight, Editor, EditorElement, EditorEvent, EditorStyle, actions::Tab};
-use gpui::{
-    Action, App, Bounds, DEFAULT_ADDITIONAL_WINDOW_SIZE, Entity, EventEmitter, Focusable,
-    PromptLevel, Subscription, Task, TextStyle, TitlebarOptions, WindowBounds, WindowHandle,
-    WindowOptions, actions, point, size, transparent_black,
-};
-use language::{Buffer, LanguageRegistry, language_settings::SoftWrap};
-use language_model::{
-    ConfiguredModel, LanguageModelRegistry, LanguageModelRequest, LanguageModelRequestMessage, Role,
-};
-use picker::{Picker, PickerDelegate};
-use release_channel::ReleaseChannel;
-use rope::Rope;
-use settings::Settings;
-use std::rc::Rc;
-use std::sync::Arc;
-use std::sync::atomic::AtomicBool;
-use std::time::Duration;
-use theme::ThemeSettings;
-use title_bar::platform_title_bar::PlatformTitleBar;
-use ui::{
-    Divider, KeyBinding, ListItem, ListItemSpacing, ListSubHeader, Render, Tooltip, prelude::*,
-};
-use util::{ResultExt, TryFutureExt};
-use workspace::{Workspace, WorkspaceSettings, client_side_decorations};
-use zed_actions::assistant::InlineAssist;
-
-use prompt_store::*;
-
-pub fn init(cx: &mut App) {
-    prompt_store::init(cx);
-}
-
-actions!(
-    rules_library,
-    [
-        /// Creates a new rule in the rules library.
-        NewRule,
-        /// Deletes the selected rule.
-        DeleteRule,
-        /// Duplicates the selected rule.
-        DuplicateRule,
-        /// Toggles whether the selected rule is a default rule.
-        ToggleDefaultRule
-    ]
-);
-
-const BUILT_IN_TOOLTIP_TEXT: &str = concat!(
-    "This rule supports special functionality.\n",
-    "It's read-only, but you can remove it from your default rules."
-);
-
-pub trait InlineAssistDelegate {
-    fn assist(
-        &self,
-        prompt_editor: &Entity<Editor>,
-        initial_prompt: Option<String>,
-        window: &mut Window,
-        cx: &mut Context<RulesLibrary>,
-    );
-
-    /// Returns whether the Agent panel was focused.
-    fn focus_agent_panel(
-        &self,
-        workspace: &mut Workspace,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) -> bool;
-}
-
-/// This function opens a new rules library window if one doesn't exist already.
-/// If one exists, it brings it to the foreground.
-///
-/// Note that, when opening a new window, this waits for the PromptStore to be
-/// initialized. If it was initialized successfully, it returns a window handle
-/// to a rules library.
-pub fn open_rules_library(
-    language_registry: Arc<LanguageRegistry>,
-    inline_assist_delegate: Box<dyn InlineAssistDelegate>,
-    make_completion_provider: Rc<dyn Fn() -> Rc<dyn CompletionProvider>>,
-    prompt_to_select: Option<PromptId>,
-    cx: &mut App,
-) -> Task<Result<WindowHandle<RulesLibrary>>> {
-    let store = PromptStore::global(cx);
-    cx.spawn(async move |cx| {
-        // We query windows in spawn so that all windows have been returned to GPUI
-        let existing_window = cx
-            .update(|cx| {
-                let existing_window = cx
-                    .windows()
-                    .into_iter()
-                    .find_map(|window| window.downcast::<RulesLibrary>());
-                if let Some(existing_window) = existing_window {
-                    existing_window
-                        .update(cx, |rules_library, window, cx| {
-                            if let Some(prompt_to_select) = prompt_to_select {
-                                rules_library.load_rule(prompt_to_select, true, window, cx);
-                            }
-                            window.activate_window()
-                        })
-                        .ok();
-
-                    Some(existing_window)
-                } else {
-                    None
-                }
-            })
-            .ok()
-            .flatten();
-
-        if let Some(existing_window) = existing_window {
-            return Ok(existing_window);
-        }
-
-        let store = store.await?;
-        cx.update(|cx| {
-            let app_id = ReleaseChannel::global(cx).app_id();
-            let bounds = Bounds::centered(None, size(px(1024.0), px(768.0)), cx);
-            let window_decorations = match std::env::var("ZED_WINDOW_DECORATIONS") {
-                Ok(val) if val == "server" => gpui::WindowDecorations::Server,
-                Ok(val) if val == "client" => gpui::WindowDecorations::Client,
-                _ => match WorkspaceSettings::get_global(cx).window_decorations {
-                    settings::WindowDecorations::Server => gpui::WindowDecorations::Server,
-                    settings::WindowDecorations::Client => gpui::WindowDecorations::Client,
-                },
-            };
-            cx.open_window(
-                WindowOptions {
-                    titlebar: Some(TitlebarOptions {
-                        title: Some("Rules Library".into()),
-                        appears_transparent: true,
-                        traffic_light_position: Some(point(px(12.0), px(12.0))),
-                    }),
-                    app_id: Some(app_id.to_owned()),
-                    window_bounds: Some(WindowBounds::Windowed(bounds)),
-                    window_background: cx.theme().window_background_appearance(),
-                    window_decorations: Some(window_decorations),
-                    window_min_size: Some(DEFAULT_ADDITIONAL_WINDOW_SIZE),
-                    kind: gpui::WindowKind::Floating,
-                    ..Default::default()
-                },
-                |window, cx| {
-                    cx.new(|cx| {
-                        RulesLibrary::new(
-                            store,
-                            language_registry,
-                            inline_assist_delegate,
-                            make_completion_provider,
-                            prompt_to_select,
-                            window,
-                            cx,
-                        )
-                    })
-                },
-            )
-        })?
-    })
-}
-
-pub struct RulesLibrary {
-    title_bar: Option<Entity<PlatformTitleBar>>,
-    store: Entity<PromptStore>,
-    language_registry: Arc<LanguageRegistry>,
-    rule_editors: HashMap<PromptId, RuleEditor>,
-    active_rule_id: Option<PromptId>,
-    picker: Entity<Picker<RulePickerDelegate>>,
-    pending_load: Task<()>,
-    inline_assist_delegate: Box<dyn InlineAssistDelegate>,
-    make_completion_provider: Rc<dyn Fn() -> Rc<dyn CompletionProvider>>,
-    _subscriptions: Vec<Subscription>,
-}
-
-struct RuleEditor {
-    title_editor: Entity<Editor>,
-    body_editor: Entity<Editor>,
-    token_count: Option<u64>,
-    pending_token_count: Task<Option<()>>,
-    next_title_and_body_to_save: Option<(String, Rope)>,
-    pending_save: Option<Task<Option<()>>>,
-    _subscriptions: Vec<Subscription>,
-}
-
-enum RulePickerEntry {
-    Header(SharedString),
-    Rule(PromptMetadata),
-    Separator,
-}
-
-struct RulePickerDelegate {
-    store: Entity<PromptStore>,
-    selected_index: usize,
-    filtered_entries: Vec<RulePickerEntry>,
-}
-
-enum RulePickerEvent {
-    Selected { prompt_id: PromptId },
-    Confirmed { prompt_id: PromptId },
-    Deleted { prompt_id: PromptId },
-    ToggledDefault { prompt_id: PromptId },
-}
-
-impl EventEmitter<RulePickerEvent> for Picker<RulePickerDelegate> {}
-
-impl PickerDelegate for RulePickerDelegate {
-    type ListItem = AnyElement;
-
-    fn match_count(&self) -> usize {
-        self.filtered_entries.len()
-    }
-
-    fn no_matches_text(&self, _window: &mut Window, cx: &mut App) -> Option<SharedString> {
-        let text = if self.store.read(cx).prompt_count() == 0 {
-            "No rules.".into()
-        } else {
-            "No rules found matching your search.".into()
-        };
-        Some(text)
-    }
-
-    fn selected_index(&self) -> usize {
-        self.selected_index
-    }
-
-    fn set_selected_index(&mut self, ix: usize, _: &mut Window, cx: &mut Context<Picker<Self>>) {
-        self.selected_index = ix.min(self.filtered_entries.len().saturating_sub(1));
-
-        if let Some(RulePickerEntry::Rule(rule)) = self.filtered_entries.get(self.selected_index) {
-            cx.emit(RulePickerEvent::Selected { prompt_id: rule.id });
-        }
-
-        cx.notify();
-    }
-
-    fn can_select(&mut self, ix: usize, _: &mut Window, _: &mut Context<Picker<Self>>) -> bool {
-        match self.filtered_entries.get(ix) {
-            Some(RulePickerEntry::Rule(_)) => true,
-            Some(RulePickerEntry::Header(_)) | Some(RulePickerEntry::Separator) | None => false,
-        }
-    }
-
-    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
-        "Search…".into()
-    }
-
-    fn update_matches(
-        &mut self,
-        query: String,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Task<()> {
-        let cancellation_flag = Arc::new(AtomicBool::default());
-        let search = self.store.read(cx).search(query, cancellation_flag, cx);
-
-        let prev_prompt_id = self
-            .filtered_entries
-            .get(self.selected_index)
-            .and_then(|entry| {
-                if let RulePickerEntry::Rule(rule) = entry {
-                    Some(rule.id)
-                } else {
-                    None
-                }
-            });
-
-        cx.spawn_in(window, async move |this, cx| {
-            let (filtered_entries, selected_index) = cx
-                .background_spawn(async move {
-                    let matches = search.await;
-
-                    let (default_rules, non_default_rules): (Vec<_>, Vec<_>) =
-                        matches.iter().partition(|rule| rule.default);
-
-                    let mut filtered_entries = Vec::new();
-
-                    if !default_rules.is_empty() {
-                        filtered_entries.push(RulePickerEntry::Header("Default Rules".into()));
-
-                        for rule in default_rules {
-                            filtered_entries.push(RulePickerEntry::Rule(rule.clone()));
-                        }
-
-                        filtered_entries.push(RulePickerEntry::Separator);
-                    }
-
-                    for rule in non_default_rules {
-                        filtered_entries.push(RulePickerEntry::Rule(rule.clone()));
-                    }
-
-                    let selected_index = prev_prompt_id
-                        .and_then(|prev_prompt_id| {
-                            filtered_entries.iter().position(|entry| {
-                                if let RulePickerEntry::Rule(rule) = entry {
-                                    rule.id == prev_prompt_id
-                                } else {
-                                    false
-                                }
-                            })
-                        })
-                        .unwrap_or_else(|| {
-                            filtered_entries
-                                .iter()
-                                .position(|entry| matches!(entry, RulePickerEntry::Rule(_)))
-                                .unwrap_or(0)
-                        });
-
-                    (filtered_entries, selected_index)
-                })
-                .await;
-
-            this.update_in(cx, |this, window, cx| {
-                this.delegate.filtered_entries = filtered_entries;
-                this.set_selected_index(
-                    selected_index,
-                    Some(picker::Direction::Down),
-                    true,
-                    window,
-                    cx,
-                );
-                cx.notify();
-            })
-            .ok();
-        })
-    }
-
-    fn confirm(&mut self, _secondary: bool, _: &mut Window, cx: &mut Context<Picker<Self>>) {
-        if let Some(RulePickerEntry::Rule(rule)) = self.filtered_entries.get(self.selected_index) {
-            cx.emit(RulePickerEvent::Confirmed { prompt_id: rule.id });
-        }
-    }
-
-    fn dismissed(&mut self, _window: &mut Window, _cx: &mut Context<Picker<Self>>) {}
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        _: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<Self::ListItem> {
-        match self.filtered_entries.get(ix)? {
-            RulePickerEntry::Header(title) => Some(
-                ListSubHeader::new(title.clone())
-                    .end_slot(
-                        IconButton::new("info", IconName::Info)
-                            .style(ButtonStyle::Transparent)
-                            .icon_size(IconSize::Small)
-                            .icon_color(Color::Muted)
-                            .tooltip(Tooltip::text(
-                                "Default Rules are attached by default with every new thread.",
-                            ))
-                            .into_any_element(),
-                    )
-                    .inset(true)
-                    .into_any_element(),
-            ),
-            RulePickerEntry::Separator => Some(
-                h_flex()
-                    .py_1()
-                    .child(Divider::horizontal())
-                    .into_any_element(),
-            ),
-            RulePickerEntry::Rule(rule) => {
-                let default = rule.default;
-                let prompt_id = rule.id;
-
-                Some(
-                    ListItem::new(ix)
-                        .inset(true)
-                        .spacing(ListItemSpacing::Sparse)
-                        .toggle_state(selected)
-                        .child(
-                            Label::new(rule.title.clone().unwrap_or("Untitled".into()))
-                                .truncate()
-                                .mr_10(),
-                        )
-                        .end_slot::<IconButton>(default.then(|| {
-                            IconButton::new("toggle-default-rule", IconName::Paperclip)
-                                .toggle_state(true)
-                                .icon_color(Color::Accent)
-                                .icon_size(IconSize::Small)
-                                .tooltip(Tooltip::text("Remove from Default Rules"))
-                                .on_click(cx.listener(move |_, _, _, cx| {
-                                    cx.emit(RulePickerEvent::ToggledDefault { prompt_id })
-                                }))
-                        }))
-                        .end_hover_slot(
-                            h_flex()
-                                .child(if prompt_id.is_built_in() {
-                                    div()
-                                        .id("built-in-rule")
-                                        .child(Icon::new(IconName::FileLock).color(Color::Muted))
-                                        .tooltip(move |_window, cx| {
-                                            Tooltip::with_meta(
-                                                "Built-in rule",
-                                                None,
-                                                BUILT_IN_TOOLTIP_TEXT,
-                                                cx,
-                                            )
-                                        })
-                                        .into_any()
-                                } else {
-                                    IconButton::new("delete-rule", IconName::Trash)
-                                        .icon_color(Color::Muted)
-                                        .icon_size(IconSize::Small)
-                                        .tooltip(Tooltip::text("Delete Rule"))
-                                        .on_click(cx.listener(move |_, _, _, cx| {
-                                            cx.emit(RulePickerEvent::Deleted { prompt_id })
-                                        }))
-                                        .into_any_element()
-                                })
-                                .child(
-                                    IconButton::new("toggle-default-rule", IconName::Plus)
-                                        .selected_icon(IconName::Dash)
-                                        .toggle_state(default)
-                                        .icon_size(IconSize::Small)
-                                        .icon_color(if default {
-                                            Color::Accent
-                                        } else {
-                                            Color::Muted
-                                        })
-                                        .map(|this| {
-                                            if default {
-                                                this.tooltip(Tooltip::text(
-                                                    "Remove from Default Rules",
-                                                ))
-                                            } else {
-                                                this.tooltip(move |_window, cx| {
-                                                    Tooltip::with_meta(
-                                                        "Add to Default Rules",
-                                                        None,
-                                                        "Always included in every thread.",
-                                                        cx,
-                                                    )
-                                                })
-                                            }
-                                        })
-                                        .on_click(cx.listener(move |_, _, _, cx| {
-                                            cx.emit(RulePickerEvent::ToggledDefault { prompt_id })
-                                        })),
-                                ),
-                        )
-                        .into_any_element(),
-                )
-            }
-        }
-    }
-
-    fn render_editor(
-        &self,
-        editor: &Entity<Editor>,
-        _: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Div {
-        h_flex()
-            .py_1()
-            .px_1p5()
-            .mx_1()
-            .gap_1p5()
-            .rounded_sm()
-            .bg(cx.theme().colors().editor_background)
-            .border_1()
-            .border_color(cx.theme().colors().border)
-            .child(Icon::new(IconName::MagnifyingGlass).color(Color::Muted))
-            .child(editor.clone())
-    }
-}
-
-impl RulesLibrary {
-    fn new(
-        store: Entity<PromptStore>,
-        language_registry: Arc<LanguageRegistry>,
-        inline_assist_delegate: Box<dyn InlineAssistDelegate>,
-        make_completion_provider: Rc<dyn Fn() -> Rc<dyn CompletionProvider>>,
-        rule_to_select: Option<PromptId>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let (_selected_index, _matches) = if let Some(rule_to_select) = rule_to_select {
-            let matches = store.read(cx).all_prompt_metadata();
-            let selected_index = matches
-                .iter()
-                .enumerate()
-                .find(|(_, metadata)| metadata.id == rule_to_select)
-                .map_or(0, |(ix, _)| ix);
-            (selected_index, matches)
-        } else {
-            (0, vec![])
-        };
-
-        let picker_delegate = RulePickerDelegate {
-            store: store.clone(),
-            selected_index: 0,
-            filtered_entries: Vec::new(),
-        };
-
-        let picker = cx.new(|cx| {
-            let picker = Picker::list(picker_delegate, window, cx)
-                .modal(false)
-                .max_height(None);
-            picker.focus(window, cx);
-            picker
-        });
-
-        Self {
-            title_bar: if !cfg!(target_os = "macos") {
-                Some(cx.new(|cx| PlatformTitleBar::new("rules-library-title-bar", cx)))
-            } else {
-                None
-            },
-            store,
-            language_registry,
-            rule_editors: HashMap::default(),
-            active_rule_id: None,
-            pending_load: Task::ready(()),
-            inline_assist_delegate,
-            make_completion_provider,
-            _subscriptions: vec![cx.subscribe_in(&picker, window, Self::handle_picker_event)],
-            picker,
-        }
-    }
-
-    fn handle_picker_event(
-        &mut self,
-        _: &Entity<Picker<RulePickerDelegate>>,
-        event: &RulePickerEvent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            RulePickerEvent::Selected { prompt_id } => {
-                self.load_rule(*prompt_id, false, window, cx);
-            }
-            RulePickerEvent::Confirmed { prompt_id } => {
-                self.load_rule(*prompt_id, true, window, cx);
-            }
-            RulePickerEvent::ToggledDefault { prompt_id } => {
-                self.toggle_default_for_rule(*prompt_id, window, cx);
-            }
-            RulePickerEvent::Deleted { prompt_id } => {
-                self.delete_rule(*prompt_id, window, cx);
-            }
-        }
-    }
-
-    pub fn new_rule(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        // If we already have an untitled rule, use that instead
-        // of creating a new one.
-        if let Some(metadata) = self.store.read(cx).first()
-            && metadata.title.is_none()
-        {
-            self.load_rule(metadata.id, true, window, cx);
-            return;
-        }
-
-        let prompt_id = PromptId::new();
-        let save = self.store.update(cx, |store, cx| {
-            store.save(prompt_id, None, false, "".into(), cx)
-        });
-        self.picker
-            .update(cx, |picker, cx| picker.refresh(window, cx));
-        cx.spawn_in(window, async move |this, cx| {
-            save.await?;
-            this.update_in(cx, |this, window, cx| {
-                this.load_rule(prompt_id, true, window, cx)
-            })
-        })
-        .detach_and_log_err(cx);
-    }
-
-    pub fn save_rule(&mut self, prompt_id: PromptId, window: &mut Window, cx: &mut Context<Self>) {
-        const SAVE_THROTTLE: Duration = Duration::from_millis(500);
-
-        if prompt_id.is_built_in() {
-            return;
-        }
-
-        let rule_metadata = self.store.read(cx).metadata(prompt_id).unwrap();
-        let rule_editor = self.rule_editors.get_mut(&prompt_id).unwrap();
-        let title = rule_editor.title_editor.read(cx).text(cx);
-        let body = rule_editor.body_editor.update(cx, |editor, cx| {
-            editor
-                .buffer()
-                .read(cx)
-                .as_singleton()
-                .unwrap()
-                .read(cx)
-                .as_rope()
-                .clone()
-        });
-
-        let store = self.store.clone();
-        let executor = cx.background_executor().clone();
-
-        rule_editor.next_title_and_body_to_save = Some((title, body));
-        if rule_editor.pending_save.is_none() {
-            rule_editor.pending_save = Some(cx.spawn_in(window, async move |this, cx| {
-                async move {
-                    loop {
-                        let title_and_body = this.update(cx, |this, _| {
-                            this.rule_editors
-                                .get_mut(&prompt_id)?
-                                .next_title_and_body_to_save
-                                .take()
-                        })?;
-
-                        if let Some((title, body)) = title_and_body {
-                            let title = if title.trim().is_empty() {
-                                None
-                            } else {
-                                Some(SharedString::from(title))
-                            };
-                            cx.update(|_window, cx| {
-                                store.update(cx, |store, cx| {
-                                    store.save(prompt_id, title, rule_metadata.default, body, cx)
-                                })
-                            })?
-                            .await
-                            .log_err();
-                            this.update_in(cx, |this, window, cx| {
-                                this.picker
-                                    .update(cx, |picker, cx| picker.refresh(window, cx));
-                                cx.notify();
-                            })?;
-
-                            executor.timer(SAVE_THROTTLE).await;
-                        } else {
-                            break;
-                        }
-                    }
-
-                    this.update(cx, |this, _cx| {
-                        if let Some(rule_editor) = this.rule_editors.get_mut(&prompt_id) {
-                            rule_editor.pending_save = None;
-                        }
-                    })
-                }
-                .log_err()
-                .await
-            }));
-        }
-    }
-
-    pub fn delete_active_rule(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(active_rule_id) = self.active_rule_id {
-            self.delete_rule(active_rule_id, window, cx);
-        }
-    }
-
-    pub fn duplicate_active_rule(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(active_rule_id) = self.active_rule_id {
-            self.duplicate_rule(active_rule_id, window, cx);
-        }
-    }
-
-    pub fn toggle_default_for_active_rule(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(active_rule_id) = self.active_rule_id {
-            self.toggle_default_for_rule(active_rule_id, window, cx);
-        }
-    }
-
-    pub fn toggle_default_for_rule(
-        &mut self,
-        prompt_id: PromptId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.store.update(cx, move |store, cx| {
-            if let Some(rule_metadata) = store.metadata(prompt_id) {
-                store
-                    .save_metadata(prompt_id, rule_metadata.title, !rule_metadata.default, cx)
-                    .detach_and_log_err(cx);
-            }
-        });
-        self.picker
-            .update(cx, |picker, cx| picker.refresh(window, cx));
-        cx.notify();
-    }
-
-    pub fn load_rule(
-        &mut self,
-        prompt_id: PromptId,
-        focus: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(rule_editor) = self.rule_editors.get(&prompt_id) {
-            if focus {
-                rule_editor
-                    .body_editor
-                    .update(cx, |editor, cx| window.focus(&editor.focus_handle(cx)));
-            }
-            self.set_active_rule(Some(prompt_id), window, cx);
-        } else if let Some(rule_metadata) = self.store.read(cx).metadata(prompt_id) {
-            let language_registry = self.language_registry.clone();
-            let rule = self.store.read(cx).load(prompt_id, cx);
-            let make_completion_provider = self.make_completion_provider.clone();
-            self.pending_load = cx.spawn_in(window, async move |this, cx| {
-                let rule = rule.await;
-                let markdown = language_registry.language_for_name("Markdown").await;
-                this.update_in(cx, |this, window, cx| match rule {
-                    Ok(rule) => {
-                        let title_editor = cx.new(|cx| {
-                            let mut editor = Editor::single_line(window, cx);
-                            editor.set_placeholder_text("Untitled", window, cx);
-                            editor.set_text(rule_metadata.title.unwrap_or_default(), window, cx);
-                            if prompt_id.is_built_in() {
-                                editor.set_read_only(true);
-                                editor.set_show_edit_predictions(Some(false), window, cx);
-                            }
-                            editor
-                        });
-                        let body_editor = cx.new(|cx| {
-                            let buffer = cx.new(|cx| {
-                                let mut buffer = Buffer::local(rule, cx);
-                                buffer.set_language(markdown.log_err(), cx);
-                                buffer.set_language_registry(language_registry);
-                                buffer
-                            });
-
-                            let mut editor = Editor::for_buffer(buffer, None, window, cx);
-                            if prompt_id.is_built_in() {
-                                editor.set_read_only(true);
-                                editor.set_show_edit_predictions(Some(false), window, cx);
-                            }
-                            editor.set_soft_wrap_mode(SoftWrap::EditorWidth, cx);
-                            editor.set_show_gutter(false, cx);
-                            editor.set_show_wrap_guides(false, cx);
-                            editor.set_show_indent_guides(false, cx);
-                            editor.set_use_modal_editing(true);
-                            editor.set_current_line_highlight(Some(CurrentLineHighlight::None));
-                            editor.set_completion_provider(Some(make_completion_provider()));
-                            if focus {
-                                window.focus(&editor.focus_handle(cx));
-                            }
-                            editor
-                        });
-                        let _subscriptions = vec![
-                            cx.subscribe_in(
-                                &title_editor,
-                                window,
-                                move |this, editor, event, window, cx| {
-                                    this.handle_rule_title_editor_event(
-                                        prompt_id, editor, event, window, cx,
-                                    )
-                                },
-                            ),
-                            cx.subscribe_in(
-                                &body_editor,
-                                window,
-                                move |this, editor, event, window, cx| {
-                                    this.handle_rule_body_editor_event(
-                                        prompt_id, editor, event, window, cx,
-                                    )
-                                },
-                            ),
-                        ];
-                        this.rule_editors.insert(
-                            prompt_id,
-                            RuleEditor {
-                                title_editor,
-                                body_editor,
-                                next_title_and_body_to_save: None,
-                                pending_save: None,
-                                token_count: None,
-                                pending_token_count: Task::ready(None),
-                                _subscriptions,
-                            },
-                        );
-                        this.set_active_rule(Some(prompt_id), window, cx);
-                        this.count_tokens(prompt_id, window, cx);
-                    }
-                    Err(error) => {
-                        // TODO: we should show the error in the UI.
-                        log::error!("error while loading rule: {:?}", error);
-                    }
-                })
-                .ok();
-            });
-        }
-    }
-
-    fn set_active_rule(
-        &mut self,
-        prompt_id: Option<PromptId>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.active_rule_id = prompt_id;
-        self.picker.update(cx, |picker, cx| {
-            if let Some(prompt_id) = prompt_id {
-                if picker
-                    .delegate
-                    .filtered_entries
-                    .get(picker.delegate.selected_index())
-                    .is_none_or(|old_selected_prompt| {
-                        if let RulePickerEntry::Rule(rule) = old_selected_prompt {
-                            rule.id != prompt_id
-                        } else {
-                            true
-                        }
-                    })
-                    && let Some(ix) = picker.delegate.filtered_entries.iter().position(|mat| {
-                        if let RulePickerEntry::Rule(rule) = mat {
-                            rule.id == prompt_id
-                        } else {
-                            false
-                        }
-                    })
-                {
-                    picker.set_selected_index(ix, None, true, window, cx);
-                }
-            } else {
-                picker.focus(window, cx);
-            }
-        });
-        cx.notify();
-    }
-
-    pub fn delete_rule(
-        &mut self,
-        prompt_id: PromptId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(metadata) = self.store.read(cx).metadata(prompt_id) {
-            let confirmation = window.prompt(
-                PromptLevel::Warning,
-                &format!(
-                    "Are you sure you want to delete {}",
-                    metadata.title.unwrap_or("Untitled".into())
-                ),
-                None,
-                &["Delete", "Cancel"],
-                cx,
-            );
-
-            cx.spawn_in(window, async move |this, cx| {
-                if confirmation.await.ok() == Some(0) {
-                    this.update_in(cx, |this, window, cx| {
-                        if this.active_rule_id == Some(prompt_id) {
-                            this.set_active_rule(None, window, cx);
-                        }
-                        this.rule_editors.remove(&prompt_id);
-                        this.store
-                            .update(cx, |store, cx| store.delete(prompt_id, cx))
-                            .detach_and_log_err(cx);
-                        this.picker
-                            .update(cx, |picker, cx| picker.refresh(window, cx));
-                        cx.notify();
-                    })?;
-                }
-                anyhow::Ok(())
-            })
-            .detach_and_log_err(cx);
-        }
-    }
-
-    pub fn duplicate_rule(
-        &mut self,
-        prompt_id: PromptId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(rule) = self.rule_editors.get(&prompt_id) {
-            const DUPLICATE_SUFFIX: &str = " copy";
-            let title_to_duplicate = rule.title_editor.read(cx).text(cx);
-            let existing_titles = self
-                .rule_editors
-                .iter()
-                .filter(|&(&id, _)| id != prompt_id)
-                .map(|(_, rule_editor)| rule_editor.title_editor.read(cx).text(cx))
-                .filter(|title| title.starts_with(&title_to_duplicate))
-                .collect::<HashSet<_>>();
-
-            let title = if existing_titles.is_empty() {
-                title_to_duplicate + DUPLICATE_SUFFIX
-            } else {
-                let mut i = 1;
-                loop {
-                    let new_title = format!("{title_to_duplicate}{DUPLICATE_SUFFIX} {i}");
-                    if !existing_titles.contains(&new_title) {
-                        break new_title;
-                    }
-                    i += 1;
-                }
-            };
-
-            let new_id = PromptId::new();
-            let body = rule.body_editor.read(cx).text(cx);
-            let save = self.store.update(cx, |store, cx| {
-                store.save(new_id, Some(title.into()), false, body.into(), cx)
-            });
-            self.picker
-                .update(cx, |picker, cx| picker.refresh(window, cx));
-            cx.spawn_in(window, async move |this, cx| {
-                save.await?;
-                this.update_in(cx, |rules_library, window, cx| {
-                    rules_library.load_rule(new_id, true, window, cx)
-                })
-            })
-            .detach_and_log_err(cx);
-        }
-    }
-
-    fn focus_active_rule(&mut self, _: &Tab, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(active_rule) = self.active_rule_id {
-            self.rule_editors[&active_rule]
-                .body_editor
-                .update(cx, |editor, cx| window.focus(&editor.focus_handle(cx)));
-            cx.stop_propagation();
-        }
-    }
-
-    fn focus_picker(&mut self, _: &menu::Cancel, window: &mut Window, cx: &mut Context<Self>) {
-        self.picker
-            .update(cx, |picker, cx| picker.focus(window, cx));
-    }
-
-    pub fn inline_assist(
-        &mut self,
-        action: &InlineAssist,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(active_rule_id) = self.active_rule_id else {
-            cx.propagate();
-            return;
-        };
-
-        let rule_editor = &self.rule_editors[&active_rule_id].body_editor;
-        let Some(ConfiguredModel { provider, .. }) =
-            LanguageModelRegistry::read_global(cx).inline_assistant_model()
-        else {
-            return;
-        };
-
-        let initial_prompt = action.prompt.clone();
-        if provider.is_authenticated(cx) {
-            self.inline_assist_delegate
-                .assist(rule_editor, initial_prompt, window, cx);
-        } else {
-            for window in cx.windows() {
-                if let Some(workspace) = window.downcast::<Workspace>() {
-                    let panel = workspace
-                        .update(cx, |workspace, window, cx| {
-                            window.activate_window();
-                            self.inline_assist_delegate
-                                .focus_agent_panel(workspace, window, cx)
-                        })
-                        .ok();
-                    if panel == Some(true) {
-                        return;
-                    }
-                }
-            }
-        }
-    }
-
-    fn move_down_from_title(
-        &mut self,
-        _: &editor::actions::MoveDown,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(rule_id) = self.active_rule_id
-            && let Some(rule_editor) = self.rule_editors.get(&rule_id)
-        {
-            window.focus(&rule_editor.body_editor.focus_handle(cx));
-        }
-    }
-
-    fn move_up_from_body(
-        &mut self,
-        _: &editor::actions::MoveUp,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(rule_id) = self.active_rule_id
-            && let Some(rule_editor) = self.rule_editors.get(&rule_id)
-        {
-            window.focus(&rule_editor.title_editor.focus_handle(cx));
-        }
-    }
-
-    fn handle_rule_title_editor_event(
-        &mut self,
-        prompt_id: PromptId,
-        title_editor: &Entity<Editor>,
-        event: &EditorEvent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            EditorEvent::BufferEdited => {
-                self.save_rule(prompt_id, window, cx);
-                self.count_tokens(prompt_id, window, cx);
-            }
-            EditorEvent::Blurred => {
-                title_editor.update(cx, |title_editor, cx| {
-                    title_editor.change_selections(
-                        SelectionEffects::no_scroll(),
-                        window,
-                        cx,
-                        |selections| {
-                            let cursor = selections.oldest_anchor().head();
-                            selections.select_anchor_ranges([cursor..cursor]);
-                        },
-                    );
-                });
-            }
-            _ => {}
-        }
-    }
-
-    fn handle_rule_body_editor_event(
-        &mut self,
-        prompt_id: PromptId,
-        body_editor: &Entity<Editor>,
-        event: &EditorEvent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            EditorEvent::BufferEdited => {
-                self.save_rule(prompt_id, window, cx);
-                self.count_tokens(prompt_id, window, cx);
-            }
-            EditorEvent::Blurred => {
-                body_editor.update(cx, |body_editor, cx| {
-                    body_editor.change_selections(
-                        SelectionEffects::no_scroll(),
-                        window,
-                        cx,
-                        |selections| {
-                            let cursor = selections.oldest_anchor().head();
-                            selections.select_anchor_ranges([cursor..cursor]);
-                        },
-                    );
-                });
-            }
-            _ => {}
-        }
-    }
-
-    fn count_tokens(&mut self, prompt_id: PromptId, window: &mut Window, cx: &mut Context<Self>) {
-        let Some(ConfiguredModel { model, .. }) =
-            LanguageModelRegistry::read_global(cx).default_model()
-        else {
-            return;
-        };
-        if let Some(rule) = self.rule_editors.get_mut(&prompt_id) {
-            let editor = &rule.body_editor.read(cx);
-            let buffer = &editor.buffer().read(cx).as_singleton().unwrap().read(cx);
-            let body = buffer.as_rope().clone();
-            rule.pending_token_count = cx.spawn_in(window, async move |this, cx| {
-                async move {
-                    const DEBOUNCE_TIMEOUT: Duration = Duration::from_secs(1);
-
-                    cx.background_executor().timer(DEBOUNCE_TIMEOUT).await;
-                    let token_count = cx
-                        .update(|_, cx| {
-                            model.count_tokens(
-                                LanguageModelRequest {
-                                    thread_id: None,
-                                    prompt_id: None,
-                                    intent: None,
-                                    mode: None,
-                                    messages: vec![LanguageModelRequestMessage {
-                                        role: Role::System,
-                                        content: vec![body.to_string().into()],
-                                        cache: false,
-                                        reasoning_details: None,
-                                    }],
-                                    tools: Vec::new(),
-                                    tool_choice: None,
-                                    stop: Vec::new(),
-                                    temperature: None,
-                                    thinking_allowed: true,
-                                },
-                                cx,
-                            )
-                        })?
-                        .await?;
-
-                    this.update(cx, |this, cx| {
-                        let rule_editor = this.rule_editors.get_mut(&prompt_id).unwrap();
-                        rule_editor.token_count = Some(token_count);
-                        cx.notify();
-                    })
-                }
-                .log_err()
-                .await
-            });
-        }
-    }
-
-    fn render_rule_list(&mut self, cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .id("rule-list")
-            .capture_action(cx.listener(Self::focus_active_rule))
-            .px_1p5()
-            .h_full()
-            .w_64()
-            .overflow_x_hidden()
-            .bg(cx.theme().colors().panel_background)
-            .map(|this| {
-                if cfg!(target_os = "macos") {
-                    this.child(
-                        h_flex()
-                            .p(DynamicSpacing::Base04.rems(cx))
-                            .h_9()
-                            .w_full()
-                            .flex_none()
-                            .justify_end()
-                            .child(
-                                IconButton::new("new-rule", IconName::Plus)
-                                    .tooltip(move |_window, cx| {
-                                        Tooltip::for_action("New Rule", &NewRule, cx)
-                                    })
-                                    .on_click(|_, window, cx| {
-                                        window.dispatch_action(Box::new(NewRule), cx);
-                                    }),
-                            ),
-                    )
-                } else {
-                    this.child(
-                        h_flex().p_1().w_full().child(
-                            Button::new("new-rule", "New Rule")
-                                .full_width()
-                                .style(ButtonStyle::Outlined)
-                                .icon(IconName::Plus)
-                                .icon_size(IconSize::Small)
-                                .icon_position(IconPosition::Start)
-                                .icon_color(Color::Muted)
-                                .on_click(|_, window, cx| {
-                                    window.dispatch_action(Box::new(NewRule), cx);
-                                }),
-                        ),
-                    )
-                }
-            })
-            .child(div().flex_grow().child(self.picker.clone()))
-    }
-
-    fn render_active_rule_editor(
-        &self,
-        editor: &Entity<Editor>,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let settings = ThemeSettings::get_global(cx);
-
-        div()
-            .w_full()
-            .on_action(cx.listener(Self::move_down_from_title))
-            .pl_1()
-            .border_1()
-            .border_color(transparent_black())
-            .rounded_sm()
-            .group_hover("active-editor-header", |this| {
-                this.border_color(cx.theme().colors().border_variant)
-            })
-            .child(EditorElement::new(
-                &editor,
-                EditorStyle {
-                    background: cx.theme().system().transparent,
-                    local_player: cx.theme().players().local(),
-                    text: TextStyle {
-                        color: cx.theme().colors().editor_foreground,
-                        font_family: settings.ui_font.family.clone(),
-                        font_features: settings.ui_font.features.clone(),
-                        font_size: HeadlineSize::Large.rems().into(),
-                        font_weight: settings.ui_font.weight,
-                        line_height: relative(settings.buffer_line_height.value()),
-                        ..Default::default()
-                    },
-                    scrollbar_width: Pixels::ZERO,
-                    syntax: cx.theme().syntax().clone(),
-                    status: cx.theme().status().clone(),
-                    inlay_hints_style: editor::make_inlay_hints_style(cx),
-                    edit_prediction_styles: editor::make_suggestion_styles(cx),
-                    ..EditorStyle::default()
-                },
-            ))
-    }
-
-    fn render_active_rule(&mut self, cx: &mut Context<RulesLibrary>) -> gpui::Stateful<Div> {
-        div()
-            .id("rule-editor")
-            .h_full()
-            .flex_grow()
-            .border_l_1()
-            .border_color(cx.theme().colors().border)
-            .bg(cx.theme().colors().editor_background)
-            .children(self.active_rule_id.and_then(|prompt_id| {
-                let rule_metadata = self.store.read(cx).metadata(prompt_id)?;
-                let rule_editor = &self.rule_editors[&prompt_id];
-                let focus_handle = rule_editor.body_editor.focus_handle(cx);
-                let model = LanguageModelRegistry::read_global(cx)
-                    .default_model()
-                    .map(|default| default.model);
-
-                Some(
-                    v_flex()
-                        .id("rule-editor-inner")
-                        .size_full()
-                        .relative()
-                        .overflow_hidden()
-                        .on_click(cx.listener(move |_, _, window, _| {
-                            window.focus(&focus_handle);
-                        }))
-                        .child(
-                            h_flex()
-                                .group("active-editor-header")
-                                .pt_2()
-                                .pl_1p5()
-                                .pr_2p5()
-                                .gap_2()
-                                .justify_between()
-                                .child(
-                                    self.render_active_rule_editor(&rule_editor.title_editor, cx),
-                                )
-                                .child(
-                                    h_flex()
-                                        .h_full()
-                                        .flex_shrink_0()
-                                        .children(rule_editor.token_count.map(|token_count| {
-                                            let token_count: SharedString =
-                                                token_count.to_string().into();
-                                            let label_token_count: SharedString =
-                                                token_count.to_string().into();
-
-                                            div()
-                                                .id("token_count")
-                                                .mr_1()
-                                                .flex_shrink_0()
-                                                .tooltip(move |_window, cx| {
-                                                    Tooltip::with_meta(
-                                                        "Token Estimation",
-                                                        None,
-                                                        format!(
-                                                            "Model: {}",
-                                                            model
-                                                                .as_ref()
-                                                                .map(|model| model.name().0)
-                                                                .unwrap_or_default()
-                                                        ),
-                                                        cx,
-                                                    )
-                                                })
-                                                .child(
-                                                    Label::new(format!(
-                                                        "{} tokens",
-                                                        label_token_count
-                                                    ))
-                                                    .color(Color::Muted),
-                                                )
-                                        }))
-                                        .child(if prompt_id.is_built_in() {
-                                            div()
-                                                .id("built-in-rule")
-                                                .child(
-                                                    Icon::new(IconName::FileLock)
-                                                        .color(Color::Muted),
-                                                )
-                                                .tooltip(move |_window, cx| {
-                                                    Tooltip::with_meta(
-                                                        "Built-in rule",
-                                                        None,
-                                                        BUILT_IN_TOOLTIP_TEXT,
-                                                        cx,
-                                                    )
-                                                })
-                                                .into_any()
-                                        } else {
-                                            IconButton::new("delete-rule", IconName::Trash)
-                                                .tooltip(move |_window, cx| {
-                                                    Tooltip::for_action(
-                                                        "Delete Rule",
-                                                        &DeleteRule,
-                                                        cx,
-                                                    )
-                                                })
-                                                .on_click(|_, window, cx| {
-                                                    window
-                                                        .dispatch_action(Box::new(DeleteRule), cx);
-                                                })
-                                                .into_any_element()
-                                        })
-                                        .child(
-                                            IconButton::new("duplicate-rule", IconName::BookCopy)
-                                                .tooltip(move |_window, cx| {
-                                                    Tooltip::for_action(
-                                                        "Duplicate Rule",
-                                                        &DuplicateRule,
-                                                        cx,
-                                                    )
-                                                })
-                                                .on_click(|_, window, cx| {
-                                                    window.dispatch_action(
-                                                        Box::new(DuplicateRule),
-                                                        cx,
-                                                    );
-                                                }),
-                                        )
-                                        .child(
-                                            IconButton::new(
-                                                "toggle-default-rule",
-                                                IconName::Paperclip,
-                                            )
-                                            .toggle_state(rule_metadata.default)
-                                            .icon_color(if rule_metadata.default {
-                                                Color::Accent
-                                            } else {
-                                                Color::Muted
-                                            })
-                                            .map(|this| {
-                                                if rule_metadata.default {
-                                                    this.tooltip(Tooltip::text(
-                                                        "Remove from Default Rules",
-                                                    ))
-                                                } else {
-                                                    this.tooltip(move |_window, cx| {
-                                                        Tooltip::with_meta(
-                                                            "Add to Default Rules",
-                                                            None,
-                                                            "Always included in every thread.",
-                                                            cx,
-                                                        )
-                                                    })
-                                                }
-                                            })
-                                            .on_click(
-                                                |_, window, cx| {
-                                                    window.dispatch_action(
-                                                        Box::new(ToggleDefaultRule),
-                                                        cx,
-                                                    );
-                                                },
-                                            ),
-                                        ),
-                                ),
-                        )
-                        .child(
-                            div()
-                                .on_action(cx.listener(Self::focus_picker))
-                                .on_action(cx.listener(Self::inline_assist))
-                                .on_action(cx.listener(Self::move_up_from_body))
-                                .h_full()
-                                .flex_grow()
-                                .child(
-                                    h_flex()
-                                        .py_2()
-                                        .pl_2p5()
-                                        .h_full()
-                                        .flex_1()
-                                        .child(rule_editor.body_editor.clone()),
-                                ),
-                        ),
-                )
-            }))
-    }
-}
-
-impl Render for RulesLibrary {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let ui_font = theme::setup_ui_font(window, cx);
-        let theme = cx.theme().clone();
-
-        client_side_decorations(
-            v_flex()
-                .id("rules-library")
-                .key_context("RulesLibrary")
-                .on_action(cx.listener(|this, &NewRule, window, cx| this.new_rule(window, cx)))
-                .on_action(
-                    cx.listener(|this, &DeleteRule, window, cx| {
-                        this.delete_active_rule(window, cx)
-                    }),
-                )
-                .on_action(cx.listener(|this, &DuplicateRule, window, cx| {
-                    this.duplicate_active_rule(window, cx)
-                }))
-                .on_action(cx.listener(|this, &ToggleDefaultRule, window, cx| {
-                    this.toggle_default_for_active_rule(window, cx)
-                }))
-                .size_full()
-                .overflow_hidden()
-                .font(ui_font)
-                .text_color(theme.colors().text)
-                .children(self.title_bar.clone())
-                .bg(theme.colors().background)
-                .child(
-                    h_flex()
-                        .flex_1()
-                        .when(!cfg!(target_os = "macos"), |this| {
-                            this.border_t_1().border_color(cx.theme().colors().border)
-                        })
-                        .child(self.render_rule_list(cx))
-                        .map(|el| {
-                            if self.store.read(cx).prompt_count() == 0 {
-                                el.child(
-                                    v_flex()
-                                        .h_full()
-                                        .flex_1()
-                                        .items_center()
-                                        .justify_center()
-                                        .border_l_1()
-                                        .border_color(cx.theme().colors().border)
-                                        .bg(cx.theme().colors().editor_background)
-                                        .child(
-                                            Button::new("create-rule", "New Rule")
-                                                .style(ButtonStyle::Outlined)
-                                                .key_binding(KeyBinding::for_action(&NewRule, cx))
-                                                .on_click(|_, window, cx| {
-                                                    window
-                                                        .dispatch_action(NewRule.boxed_clone(), cx)
-                                                }),
-                                        ),
-                                )
-                            } else {
-                                el.child(self.render_active_rule(cx))
-                            }
-                        }),
-                ),
-            window,
-            cx,
-        )
-    }
-}
diff --git a/crates/schema_generator/Cargo.toml b/crates/schema_generator/Cargo.toml
deleted file mode 100644
index 865f76f4af..0000000000
--- a/crates/schema_generator/Cargo.toml
+++ /dev/null
@@ -1,18 +0,0 @@
-[package]
-name = "schema_generator"
-version = "0.1.0"
-publish.workspace = true
-edition.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[dependencies]
-anyhow.workspace = true
-clap = { workspace = true, features = ["derive"] }
-env_logger.workspace = true
-schemars = { workspace = true, features = ["indexmap2"] }
-serde.workspace = true
-serde_json.workspace = true
-theme.workspace = true
diff --git a/crates/schema_generator/LICENSE-GPL b/crates/schema_generator/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/schema_generator/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/schema_generator/README.md b/crates/schema_generator/README.md
deleted file mode 100644
index f8ef5bc234..0000000000
--- a/crates/schema_generator/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Zed Schema Generator
-
-Prints various Zed schemas to stdout.
-
-## Usage
-
-```sh
-cargo run -p schema_generator -- --help
-
-cargo run -p schema_generator -- theme
-cargo run -p schema_generator -- icon_theme
-```
diff --git a/crates/schema_generator/src/main.rs b/crates/schema_generator/src/main.rs
deleted file mode 100644
index a7e406a1a9..0000000000
--- a/crates/schema_generator/src/main.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-use anyhow::Result;
-use clap::{Parser, ValueEnum};
-use schemars::schema_for;
-use theme::{IconThemeFamilyContent, ThemeFamilyContent};
-
-#[derive(Parser, Debug)]
-pub struct Args {
-    #[arg(value_enum)]
-    pub schema_type: SchemaType,
-}
-
-#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, ValueEnum)]
-#[clap(rename_all = "snake_case")]
-pub enum SchemaType {
-    Theme,
-    IconTheme,
-}
-
-fn main() -> Result<()> {
-    env_logger::init();
-
-    let args = Args::parse();
-
-    match args.schema_type {
-        SchemaType::Theme => {
-            let schema = schema_for!(ThemeFamilyContent);
-            println!("{}", serde_json::to_string_pretty(&schema)?);
-        }
-        SchemaType::IconTheme => {
-            let schema = schema_for!(IconThemeFamilyContent);
-            println!("{}", serde_json::to_string_pretty(&schema)?);
-        }
-    }
-
-    Ok(())
-}
diff --git a/crates/search/Cargo.toml b/crates/search/Cargo.toml
deleted file mode 100644
index 02eb611fc2..0000000000
--- a/crates/search/Cargo.toml
+++ /dev/null
@@ -1,61 +0,0 @@
-[package]
-name = "search"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[features]
-test-support = [
-    "client/test-support",
-    "editor/test-support",
-    "gpui/test-support",
-    "workspace/test-support",
-]
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/search.rs"
-doctest = false
-
-[dependencies]
-anyhow.workspace = true
-any_vec.workspace = true
-bitflags.workspace = true
-collections.workspace = true
-editor.workspace = true
-futures.workspace = true
-gpui.workspace = true
-language.workspace = true
-menu.workspace = true
-project.workspace = true
-schemars.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-smol.workspace = true
-theme.workspace = true
-ui.workspace = true
-util.workspace = true
-util_macros.workspace = true
-workspace.workspace = true
-zed_actions.workspace = true
-itertools.workspace = true
-ztracing.workspace = true
-tracing.workspace = true
-
-[dev-dependencies]
-client = { workspace = true, features = ["test-support"] }
-editor = { workspace = true, features = ["test-support"] }
-gpui = { workspace = true, features = ["test-support"] }
-language = { workspace = true, features = ["test-support"] }
-lsp.workspace = true
-pretty_assertions.workspace = true
-unindent.workspace = true
-workspace = { workspace = true, features = ["test-support"] }
-
-[package.metadata.cargo-machete]
-ignored = ["tracing"]
-
diff --git a/crates/search/LICENSE-GPL b/crates/search/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/search/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/search/src/buffer_search.rs b/crates/search/src/buffer_search.rs
deleted file mode 100644
index a9c26ac9ba..0000000000
--- a/crates/search/src/buffer_search.rs
+++ /dev/null
@@ -1,3118 +0,0 @@
-mod registrar;
-
-use crate::{
-    FocusSearch, NextHistoryQuery, PreviousHistoryQuery, ReplaceAll, ReplaceNext, SearchOption,
-    SearchOptions, SearchSource, SelectAllMatches, SelectNextMatch, SelectPreviousMatch,
-    ToggleCaseSensitive, ToggleRegex, ToggleReplace, ToggleSelection, ToggleWholeWord,
-    search_bar::{ActionButtonState, input_base_styles, render_action_button, render_text_input},
-};
-use any_vec::AnyVec;
-use anyhow::Context as _;
-use collections::HashMap;
-use editor::{
-    DisplayPoint, Editor, EditorSettings, MultiBufferOffset,
-    actions::{Backtab, Tab},
-};
-use futures::channel::oneshot;
-use gpui::{
-    Action, App, ClickEvent, Context, Entity, EventEmitter, Focusable, InteractiveElement as _,
-    IntoElement, KeyContext, ParentElement as _, Render, ScrollHandle, Styled, Subscription, Task,
-    Window, actions, div,
-};
-use language::{Language, LanguageRegistry};
-use project::{
-    search::SearchQuery,
-    search_history::{SearchHistory, SearchHistoryCursor},
-};
-use schemars::JsonSchema;
-use serde::Deserialize;
-use settings::Settings;
-use std::sync::Arc;
-use zed_actions::{outline::ToggleOutline, workspace::CopyPath, workspace::CopyRelativePath};
-
-use ui::{
-    BASE_REM_SIZE_IN_PX, IconButton, IconButtonShape, IconName, Tooltip, h_flex, prelude::*,
-    utils::SearchInputWidth,
-};
-use util::{ResultExt, paths::PathMatcher};
-use workspace::{
-    ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView, Workspace,
-    item::ItemHandle,
-    searchable::{
-        Direction, FilteredSearchRange, SearchEvent, SearchableItemHandle, WeakSearchableItemHandle,
-    },
-};
-
-pub use registrar::DivRegistrar;
-use registrar::{ForDeployed, ForDismissed, SearchActionsRegistrar, WithResults};
-
-const MAX_BUFFER_SEARCH_HISTORY_SIZE: usize = 50;
-
-/// Opens the buffer search interface with the specified configuration.
-#[derive(PartialEq, Clone, Deserialize, JsonSchema, Action)]
-#[action(namespace = buffer_search)]
-#[serde(deny_unknown_fields)]
-pub struct Deploy {
-    #[serde(default = "util::serde::default_true")]
-    pub focus: bool,
-    #[serde(default)]
-    pub replace_enabled: bool,
-    #[serde(default)]
-    pub selection_search_enabled: bool,
-}
-
-actions!(
-    buffer_search,
-    [
-        /// Deploys the search and replace interface.
-        DeployReplace,
-        /// Dismisses the search bar.
-        Dismiss,
-        /// Focuses back on the editor.
-        FocusEditor
-    ]
-);
-
-impl Deploy {
-    pub fn find() -> Self {
-        Self {
-            focus: true,
-            replace_enabled: false,
-            selection_search_enabled: false,
-        }
-    }
-
-    pub fn replace() -> Self {
-        Self {
-            focus: true,
-            replace_enabled: true,
-            selection_search_enabled: false,
-        }
-    }
-}
-
-pub enum Event {
-    UpdateLocation,
-}
-
-pub fn init(cx: &mut App) {
-    cx.observe_new(|workspace: &mut Workspace, _, _| BufferSearchBar::register(workspace))
-        .detach();
-}
-
-pub struct BufferSearchBar {
-    query_editor: Entity<Editor>,
-    query_editor_focused: bool,
-    replacement_editor: Entity<Editor>,
-    replacement_editor_focused: bool,
-    active_searchable_item: Option<Box<dyn SearchableItemHandle>>,
-    active_match_index: Option<usize>,
-    active_searchable_item_subscription: Option<Subscription>,
-    active_search: Option<Arc<SearchQuery>>,
-    searchable_items_with_matches: HashMap<Box<dyn WeakSearchableItemHandle>, AnyVec<dyn Send>>,
-    pending_search: Option<Task<()>>,
-    search_options: SearchOptions,
-    default_options: SearchOptions,
-    configured_options: SearchOptions,
-    query_error: Option<String>,
-    dismissed: bool,
-    search_history: SearchHistory,
-    search_history_cursor: SearchHistoryCursor,
-    replace_enabled: bool,
-    selection_search_enabled: Option<FilteredSearchRange>,
-    scroll_handle: ScrollHandle,
-    editor_scroll_handle: ScrollHandle,
-    editor_needed_width: Pixels,
-    regex_language: Option<Arc<Language>>,
-}
-
-impl EventEmitter<Event> for BufferSearchBar {}
-impl EventEmitter<workspace::ToolbarItemEvent> for BufferSearchBar {}
-impl Render for BufferSearchBar {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        if self.dismissed {
-            return div().id("search_bar");
-        }
-
-        let focus_handle = self.focus_handle(cx);
-
-        let narrow_mode =
-            self.scroll_handle.bounds().size.width / window.rem_size() < 340. / BASE_REM_SIZE_IN_PX;
-        let hide_inline_icons = self.editor_needed_width
-            > self.editor_scroll_handle.bounds().size.width - window.rem_size() * 6.;
-
-        let workspace::searchable::SearchOptions {
-            case,
-            word,
-            regex,
-            replacement,
-            selection,
-            find_in_results,
-        } = self.supported_options(cx);
-
-        self.query_editor.update(cx, |query_editor, cx| {
-            if query_editor.placeholder_text(cx).is_none() {
-                query_editor.set_placeholder_text("Search…", window, cx);
-            }
-        });
-
-        self.replacement_editor.update(cx, |editor, cx| {
-            editor.set_placeholder_text("Replace with…", window, cx);
-        });
-
-        let mut color_override = None;
-        let match_text = self
-            .active_searchable_item
-            .as_ref()
-            .and_then(|searchable_item| {
-                if self.query(cx).is_empty() {
-                    return None;
-                }
-                let matches_count = self
-                    .searchable_items_with_matches
-                    .get(&searchable_item.downgrade())
-                    .map(AnyVec::len)
-                    .unwrap_or(0);
-                if let Some(match_ix) = self.active_match_index {
-                    Some(format!("{}/{}", match_ix + 1, matches_count))
-                } else {
-                    color_override = Some(Color::Error); // No matches found
-                    None
-                }
-            })
-            .unwrap_or_else(|| "0/0".to_string());
-        let should_show_replace_input = self.replace_enabled && replacement;
-        let in_replace = self.replacement_editor.focus_handle(cx).is_focused(window);
-
-        let theme_colors = cx.theme().colors();
-        let query_border = if self.query_error.is_some() {
-            Color::Error.color(cx)
-        } else {
-            theme_colors.border
-        };
-        let replacement_border = theme_colors.border;
-
-        let container_width = window.viewport_size().width;
-        let input_width = SearchInputWidth::calc_width(container_width);
-
-        let input_base_styles =
-            |border_color| input_base_styles(border_color, |div| div.w(input_width));
-
-        let query_column = input_base_styles(query_border)
-            .id("editor-scroll")
-            .track_scroll(&self.editor_scroll_handle)
-            .child(render_text_input(&self.query_editor, color_override, cx))
-            .when(!hide_inline_icons, |div| {
-                div.child(
-                    h_flex()
-                        .gap_1()
-                        .when(case, |div| {
-                            div.child(SearchOption::CaseSensitive.as_button(
-                                self.search_options,
-                                SearchSource::Buffer,
-                                focus_handle.clone(),
-                            ))
-                        })
-                        .when(word, |div| {
-                            div.child(SearchOption::WholeWord.as_button(
-                                self.search_options,
-                                SearchSource::Buffer,
-                                focus_handle.clone(),
-                            ))
-                        })
-                        .when(regex, |div| {
-                            div.child(SearchOption::Regex.as_button(
-                                self.search_options,
-                                SearchSource::Buffer,
-                                focus_handle.clone(),
-                            ))
-                        }),
-                )
-            });
-
-        let mode_column = h_flex()
-            .gap_1()
-            .min_w_64()
-            .when(replacement, |this| {
-                this.child(render_action_button(
-                    "buffer-search-bar-toggle",
-                    IconName::Replace,
-                    self.replace_enabled.then_some(ActionButtonState::Toggled),
-                    "Toggle Replace",
-                    &ToggleReplace,
-                    focus_handle.clone(),
-                ))
-            })
-            .when(selection, |this| {
-                this.child(
-                    IconButton::new(
-                        "buffer-search-bar-toggle-search-selection-button",
-                        IconName::Quote,
-                    )
-                    .style(ButtonStyle::Subtle)
-                    .shape(IconButtonShape::Square)
-                    .when(self.selection_search_enabled.is_some(), |button| {
-                        button.style(ButtonStyle::Filled)
-                    })
-                    .on_click(cx.listener(|this, _: &ClickEvent, window, cx| {
-                        this.toggle_selection(&ToggleSelection, window, cx);
-                    }))
-                    .toggle_state(self.selection_search_enabled.is_some())
-                    .tooltip({
-                        let focus_handle = focus_handle.clone();
-                        move |_window, cx| {
-                            Tooltip::for_action_in(
-                                "Toggle Search Selection",
-                                &ToggleSelection,
-                                &focus_handle,
-                                cx,
-                            )
-                        }
-                    }),
-                )
-            })
-            .when(!find_in_results, |el| {
-                let query_focus = self.query_editor.focus_handle(cx);
-                let matches_column = h_flex()
-                    .pl_2()
-                    .ml_2()
-                    .border_l_1()
-                    .border_color(theme_colors.border_variant)
-                    .child(render_action_button(
-                        "buffer-search-nav-button",
-                        ui::IconName::ChevronLeft,
-                        self.active_match_index
-                            .is_none()
-                            .then_some(ActionButtonState::Disabled),
-                        "Select Previous Match",
-                        &SelectPreviousMatch,
-                        query_focus.clone(),
-                    ))
-                    .child(render_action_button(
-                        "buffer-search-nav-button",
-                        ui::IconName::ChevronRight,
-                        self.active_match_index
-                            .is_none()
-                            .then_some(ActionButtonState::Disabled),
-                        "Select Next Match",
-                        &SelectNextMatch,
-                        query_focus.clone(),
-                    ))
-                    .when(!narrow_mode, |this| {
-                        this.child(div().ml_2().min_w(rems_from_px(40.)).child(
-                            Label::new(match_text).size(LabelSize::Small).color(
-                                if self.active_match_index.is_some() {
-                                    Color::Default
-                                } else {
-                                    Color::Disabled
-                                },
-                            ),
-                        ))
-                    });
-
-                el.child(render_action_button(
-                    "buffer-search-nav-button",
-                    IconName::SelectAll,
-                    Default::default(),
-                    "Select All Matches",
-                    &SelectAllMatches,
-                    query_focus,
-                ))
-                .child(matches_column)
-            })
-            .when(find_in_results, |el| {
-                el.child(render_action_button(
-                    "buffer-search",
-                    IconName::Close,
-                    Default::default(),
-                    "Close Search Bar",
-                    &Dismiss,
-                    focus_handle.clone(),
-                ))
-            });
-
-        let search_line = h_flex()
-            .w_full()
-            .gap_2()
-            .when(find_in_results, |el| {
-                el.child(Label::new("Find in results").color(Color::Hint))
-            })
-            .child(query_column)
-            .child(mode_column);
-
-        let replace_line =
-            should_show_replace_input.then(|| {
-                let replace_column = input_base_styles(replacement_border)
-                    .child(render_text_input(&self.replacement_editor, None, cx));
-                let focus_handle = self.replacement_editor.read(cx).focus_handle(cx);
-
-                let replace_actions = h_flex()
-                    .min_w_64()
-                    .gap_1()
-                    .child(render_action_button(
-                        "buffer-search-replace-button",
-                        IconName::ReplaceNext,
-                        Default::default(),
-                        "Replace Next Match",
-                        &ReplaceNext,
-                        focus_handle.clone(),
-                    ))
-                    .child(render_action_button(
-                        "buffer-search-replace-button",
-                        IconName::ReplaceAll,
-                        Default::default(),
-                        "Replace All Matches",
-                        &ReplaceAll,
-                        focus_handle,
-                    ));
-                h_flex()
-                    .w_full()
-                    .gap_2()
-                    .child(replace_column)
-                    .child(replace_actions)
-            });
-
-        let mut key_context = KeyContext::new_with_defaults();
-        key_context.add("BufferSearchBar");
-        if in_replace {
-            key_context.add("in_replace");
-        }
-
-        let query_error_line = self.query_error.as_ref().map(|error| {
-            Label::new(error)
-                .size(LabelSize::Small)
-                .color(Color::Error)
-                .mt_neg_1()
-                .ml_2()
-        });
-
-        let search_line =
-            h_flex()
-                .relative()
-                .child(search_line)
-                .when(!narrow_mode && !find_in_results, |div| {
-                    div.child(h_flex().absolute().right_0().child(render_action_button(
-                        "buffer-search",
-                        IconName::Close,
-                        Default::default(),
-                        "Close Search Bar",
-                        &Dismiss,
-                        focus_handle.clone(),
-                    )))
-                    .w_full()
-                });
-        v_flex()
-            .id("buffer_search")
-            .gap_2()
-            .py(px(1.0))
-            .w_full()
-            .track_scroll(&self.scroll_handle)
-            .key_context(key_context)
-            .capture_action(cx.listener(Self::tab))
-            .capture_action(cx.listener(Self::backtab))
-            .on_action(cx.listener(Self::previous_history_query))
-            .on_action(cx.listener(Self::next_history_query))
-            .on_action(cx.listener(Self::dismiss))
-            .on_action(cx.listener(Self::select_next_match))
-            .on_action(cx.listener(Self::select_prev_match))
-            .on_action(cx.listener(|this, _: &ToggleOutline, window, cx| {
-                if let Some(active_searchable_item) = &mut this.active_searchable_item {
-                    active_searchable_item.relay_action(Box::new(ToggleOutline), window, cx);
-                }
-            }))
-            .on_action(cx.listener(|this, _: &CopyPath, window, cx| {
-                if let Some(active_searchable_item) = &mut this.active_searchable_item {
-                    active_searchable_item.relay_action(Box::new(CopyPath), window, cx);
-                }
-            }))
-            .on_action(cx.listener(|this, _: &CopyRelativePath, window, cx| {
-                if let Some(active_searchable_item) = &mut this.active_searchable_item {
-                    active_searchable_item.relay_action(Box::new(CopyRelativePath), window, cx);
-                }
-            }))
-            .when(replacement, |this| {
-                this.on_action(cx.listener(Self::toggle_replace))
-                    .on_action(cx.listener(Self::replace_next))
-                    .on_action(cx.listener(Self::replace_all))
-            })
-            .when(case, |this| {
-                this.on_action(cx.listener(Self::toggle_case_sensitive))
-            })
-            .when(word, |this| {
-                this.on_action(cx.listener(Self::toggle_whole_word))
-            })
-            .when(regex, |this| {
-                this.on_action(cx.listener(Self::toggle_regex))
-            })
-            .when(selection, |this| {
-                this.on_action(cx.listener(Self::toggle_selection))
-            })
-            .child(search_line)
-            .children(query_error_line)
-            .children(replace_line)
-    }
-}
-
-impl Focusable for BufferSearchBar {
-    fn focus_handle(&self, cx: &App) -> gpui::FocusHandle {
-        self.query_editor.focus_handle(cx)
-    }
-}
-
-impl ToolbarItemView for BufferSearchBar {
-    fn contribute_context(&self, context: &mut KeyContext, _cx: &App) {
-        if !self.dismissed {
-            context.add("buffer_search_deployed");
-        }
-    }
-
-    fn set_active_pane_item(
-        &mut self,
-        item: Option<&dyn ItemHandle>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> ToolbarItemLocation {
-        cx.notify();
-        self.active_searchable_item_subscription.take();
-        self.active_searchable_item.take();
-
-        self.pending_search.take();
-
-        if let Some(searchable_item_handle) =
-            item.and_then(|item| item.to_searchable_item_handle(cx))
-        {
-            let this = cx.entity().downgrade();
-
-            self.active_searchable_item_subscription =
-                Some(searchable_item_handle.subscribe_to_search_events(
-                    window,
-                    cx,
-                    Box::new(move |search_event, window, cx| {
-                        if let Some(this) = this.upgrade() {
-                            this.update(cx, |this, cx| {
-                                this.on_active_searchable_item_event(search_event, window, cx)
-                            });
-                        }
-                    }),
-                ));
-
-            let is_project_search = searchable_item_handle.supported_options(cx).find_in_results;
-            self.active_searchable_item = Some(searchable_item_handle);
-            drop(self.update_matches(true, false, window, cx));
-            if !self.dismissed {
-                if is_project_search {
-                    self.dismiss(&Default::default(), window, cx);
-                } else {
-                    return ToolbarItemLocation::Secondary;
-                }
-            }
-        }
-        ToolbarItemLocation::Hidden
-    }
-}
-
-impl BufferSearchBar {
-    pub fn query_editor_focused(&self) -> bool {
-        self.query_editor_focused
-    }
-
-    pub fn register(registrar: &mut impl SearchActionsRegistrar) {
-        registrar.register_handler(ForDeployed(|this, _: &FocusSearch, window, cx| {
-            this.query_editor.focus_handle(cx).focus(window);
-            this.select_query(window, cx);
-        }));
-        registrar.register_handler(ForDeployed(
-            |this, action: &ToggleCaseSensitive, window, cx| {
-                if this.supported_options(cx).case {
-                    this.toggle_case_sensitive(action, window, cx);
-                }
-            },
-        ));
-        registrar.register_handler(ForDeployed(|this, action: &ToggleWholeWord, window, cx| {
-            if this.supported_options(cx).word {
-                this.toggle_whole_word(action, window, cx);
-            }
-        }));
-        registrar.register_handler(ForDeployed(|this, action: &ToggleRegex, window, cx| {
-            if this.supported_options(cx).regex {
-                this.toggle_regex(action, window, cx);
-            }
-        }));
-        registrar.register_handler(ForDeployed(|this, action: &ToggleSelection, window, cx| {
-            if this.supported_options(cx).selection {
-                this.toggle_selection(action, window, cx);
-            } else {
-                cx.propagate();
-            }
-        }));
-        registrar.register_handler(ForDeployed(|this, action: &ToggleReplace, window, cx| {
-            if this.supported_options(cx).replacement {
-                this.toggle_replace(action, window, cx);
-            } else {
-                cx.propagate();
-            }
-        }));
-        registrar.register_handler(WithResults(|this, action: &SelectNextMatch, window, cx| {
-            if this.supported_options(cx).find_in_results {
-                cx.propagate();
-            } else {
-                this.select_next_match(action, window, cx);
-            }
-        }));
-        registrar.register_handler(WithResults(
-            |this, action: &SelectPreviousMatch, window, cx| {
-                if this.supported_options(cx).find_in_results {
-                    cx.propagate();
-                } else {
-                    this.select_prev_match(action, window, cx);
-                }
-            },
-        ));
-        registrar.register_handler(WithResults(
-            |this, action: &SelectAllMatches, window, cx| {
-                if this.supported_options(cx).find_in_results {
-                    cx.propagate();
-                } else {
-                    this.select_all_matches(action, window, cx);
-                }
-            },
-        ));
-        registrar.register_handler(ForDeployed(
-            |this, _: &editor::actions::Cancel, window, cx| {
-                this.dismiss(&Dismiss, window, cx);
-            },
-        ));
-        registrar.register_handler(ForDeployed(|this, _: &Dismiss, window, cx| {
-            this.dismiss(&Dismiss, window, cx);
-        }));
-
-        // register deploy buffer search for both search bar states, since we want to focus into the search bar
-        // when the deploy action is triggered in the buffer.
-        registrar.register_handler(ForDeployed(|this, deploy, window, cx| {
-            this.deploy(deploy, window, cx);
-        }));
-        registrar.register_handler(ForDismissed(|this, deploy, window, cx| {
-            this.deploy(deploy, window, cx);
-        }));
-        registrar.register_handler(ForDeployed(|this, _: &DeployReplace, window, cx| {
-            if this.supported_options(cx).find_in_results {
-                cx.propagate();
-            } else {
-                this.deploy(&Deploy::replace(), window, cx);
-            }
-        }));
-        registrar.register_handler(ForDismissed(|this, _: &DeployReplace, window, cx| {
-            if this.supported_options(cx).find_in_results {
-                cx.propagate();
-            } else {
-                this.deploy(&Deploy::replace(), window, cx);
-            }
-        }));
-    }
-
-    pub fn new(
-        languages: Option<Arc<LanguageRegistry>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let query_editor = cx.new(|cx| {
-            let mut editor = Editor::single_line(window, cx);
-            editor.set_use_autoclose(false);
-            editor
-        });
-        cx.subscribe_in(&query_editor, window, Self::on_query_editor_event)
-            .detach();
-        let replacement_editor = cx.new(|cx| Editor::single_line(window, cx));
-        cx.subscribe(&replacement_editor, Self::on_replacement_editor_event)
-            .detach();
-
-        let search_options = SearchOptions::from_settings(&EditorSettings::get_global(cx).search);
-        if let Some(languages) = languages {
-            let query_buffer = query_editor
-                .read(cx)
-                .buffer()
-                .read(cx)
-                .as_singleton()
-                .expect("query editor should be backed by a singleton buffer");
-            query_buffer
-                .read(cx)
-                .set_language_registry(languages.clone());
-
-            cx.spawn(async move |buffer_search_bar, cx| {
-                let regex_language = languages
-                    .language_for_name("regex")
-                    .await
-                    .context("loading regex language")?;
-                buffer_search_bar
-                    .update(cx, |buffer_search_bar, cx| {
-                        buffer_search_bar.regex_language = Some(regex_language);
-                        buffer_search_bar.adjust_query_regex_language(cx);
-                    })
-                    .ok();
-                anyhow::Ok(())
-            })
-            .detach_and_log_err(cx);
-        }
-
-        Self {
-            query_editor,
-            query_editor_focused: false,
-            replacement_editor,
-            replacement_editor_focused: false,
-            active_searchable_item: None,
-            active_searchable_item_subscription: None,
-            active_match_index: None,
-            searchable_items_with_matches: Default::default(),
-            default_options: search_options,
-            configured_options: search_options,
-            search_options,
-            pending_search: None,
-            query_error: None,
-            dismissed: true,
-            search_history: SearchHistory::new(
-                Some(MAX_BUFFER_SEARCH_HISTORY_SIZE),
-                project::search_history::QueryInsertionBehavior::ReplacePreviousIfContains,
-            ),
-            search_history_cursor: Default::default(),
-            active_search: None,
-            replace_enabled: false,
-            selection_search_enabled: None,
-            scroll_handle: ScrollHandle::new(),
-            editor_scroll_handle: ScrollHandle::new(),
-            editor_needed_width: px(0.),
-            regex_language: None,
-        }
-    }
-
-    pub fn is_dismissed(&self) -> bool {
-        self.dismissed
-    }
-
-    pub fn dismiss(&mut self, _: &Dismiss, window: &mut Window, cx: &mut Context<Self>) {
-        self.dismissed = true;
-        self.query_error = None;
-        self.sync_select_next_case_sensitivity(cx);
-
-        for searchable_item in self.searchable_items_with_matches.keys() {
-            if let Some(searchable_item) =
-                WeakSearchableItemHandle::upgrade(searchable_item.as_ref(), cx)
-            {
-                searchable_item.clear_matches(window, cx);
-            }
-        }
-        if let Some(active_editor) = self.active_searchable_item.as_mut() {
-            self.selection_search_enabled = None;
-            self.replace_enabled = false;
-            active_editor.search_bar_visibility_changed(false, window, cx);
-            active_editor.toggle_filtered_search_ranges(None, window, cx);
-            let handle = active_editor.item_focus_handle(cx);
-            self.focus(&handle, window);
-        }
-
-        cx.emit(Event::UpdateLocation);
-        cx.emit(ToolbarItemEvent::ChangeLocation(
-            ToolbarItemLocation::Hidden,
-        ));
-        cx.notify();
-    }
-
-    pub fn deploy(&mut self, deploy: &Deploy, window: &mut Window, cx: &mut Context<Self>) -> bool {
-        let filtered_search_range = if deploy.selection_search_enabled {
-            Some(FilteredSearchRange::Default)
-        } else {
-            None
-        };
-        if self.show(window, cx) {
-            if let Some(active_item) = self.active_searchable_item.as_mut() {
-                active_item.toggle_filtered_search_ranges(filtered_search_range, window, cx);
-            }
-            self.search_suggested(window, cx);
-            self.smartcase(window, cx);
-            self.sync_select_next_case_sensitivity(cx);
-            self.replace_enabled = deploy.replace_enabled;
-            self.selection_search_enabled = if deploy.selection_search_enabled {
-                Some(FilteredSearchRange::Default)
-            } else {
-                None
-            };
-            if deploy.focus {
-                let mut handle = self.query_editor.focus_handle(cx);
-                let mut select_query = true;
-                if deploy.replace_enabled && handle.is_focused(window) {
-                    handle = self.replacement_editor.focus_handle(cx);
-                    select_query = false;
-                };
-
-                if select_query {
-                    self.select_query(window, cx);
-                }
-
-                window.focus(&handle);
-            }
-            return true;
-        }
-
-        cx.propagate();
-        false
-    }
-
-    pub fn toggle(&mut self, action: &Deploy, window: &mut Window, cx: &mut Context<Self>) {
-        if self.is_dismissed() {
-            self.deploy(action, window, cx);
-        } else {
-            self.dismiss(&Dismiss, window, cx);
-        }
-    }
-
-    pub fn show(&mut self, window: &mut Window, cx: &mut Context<Self>) -> bool {
-        let Some(handle) = self.active_searchable_item.as_ref() else {
-            return false;
-        };
-
-        let configured_options =
-            SearchOptions::from_settings(&EditorSettings::get_global(cx).search);
-        let settings_changed = configured_options != self.configured_options;
-
-        if self.dismissed && settings_changed {
-            // Only update configuration options when search bar is dismissed,
-            // so we don't miss updates even after calling show twice
-            self.configured_options = configured_options;
-            self.search_options = configured_options;
-            self.default_options = configured_options;
-        }
-
-        self.dismissed = false;
-        self.adjust_query_regex_language(cx);
-        handle.search_bar_visibility_changed(true, window, cx);
-        cx.notify();
-        cx.emit(Event::UpdateLocation);
-        cx.emit(ToolbarItemEvent::ChangeLocation(
-            ToolbarItemLocation::Secondary,
-        ));
-        true
-    }
-
-    fn supported_options(&self, cx: &mut Context<Self>) -> workspace::searchable::SearchOptions {
-        self.active_searchable_item
-            .as_ref()
-            .map(|item| item.supported_options(cx))
-            .unwrap_or_default()
-    }
-
-    pub fn search_suggested(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let search = self.query_suggestion(window, cx).map(|suggestion| {
-            self.search(&suggestion, Some(self.default_options), true, window, cx)
-        });
-
-        if let Some(search) = search {
-            cx.spawn_in(window, async move |this, cx| {
-                if search.await.is_ok() {
-                    this.update_in(cx, |this, window, cx| {
-                        this.activate_current_match(window, cx)
-                    })
-                } else {
-                    Ok(())
-                }
-            })
-            .detach_and_log_err(cx);
-        }
-    }
-
-    pub fn activate_current_match(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(match_ix) = self.active_match_index
-            && let Some(active_searchable_item) = self.active_searchable_item.as_ref()
-            && let Some(matches) = self
-                .searchable_items_with_matches
-                .get(&active_searchable_item.downgrade())
-        {
-            active_searchable_item.activate_match(match_ix, matches, window, cx)
-        }
-    }
-
-    pub fn select_query(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.query_editor.update(cx, |query_editor, cx| {
-            query_editor.select_all(&Default::default(), window, cx);
-        });
-    }
-
-    pub fn query(&self, cx: &App) -> String {
-        self.query_editor.read(cx).text(cx)
-    }
-
-    pub fn replacement(&self, cx: &mut App) -> String {
-        self.replacement_editor.read(cx).text(cx)
-    }
-
-    pub fn query_suggestion(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<String> {
-        self.active_searchable_item
-            .as_ref()
-            .map(|searchable_item| searchable_item.query_suggestion(window, cx))
-            .filter(|suggestion| !suggestion.is_empty())
-    }
-
-    pub fn set_replacement(&mut self, replacement: Option<&str>, cx: &mut Context<Self>) {
-        if replacement.is_none() {
-            self.replace_enabled = false;
-            return;
-        }
-        self.replace_enabled = true;
-        self.replacement_editor
-            .update(cx, |replacement_editor, cx| {
-                replacement_editor
-                    .buffer()
-                    .update(cx, |replacement_buffer, cx| {
-                        let len = replacement_buffer.len(cx);
-                        replacement_buffer.edit(
-                            [(MultiBufferOffset(0)..len, replacement.unwrap())],
-                            None,
-                            cx,
-                        );
-                    });
-            });
-    }
-
-    pub fn focus_replace(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.focus(&self.replacement_editor.focus_handle(cx), window);
-        cx.notify();
-    }
-
-    pub fn search(
-        &mut self,
-        query: &str,
-        options: Option<SearchOptions>,
-        add_to_history: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> oneshot::Receiver<()> {
-        let options = options.unwrap_or(self.default_options);
-        let updated = query != self.query(cx) || self.search_options != options;
-        if updated {
-            self.query_editor.update(cx, |query_editor, cx| {
-                query_editor.buffer().update(cx, |query_buffer, cx| {
-                    let len = query_buffer.len(cx);
-                    query_buffer.edit([(MultiBufferOffset(0)..len, query)], None, cx);
-                });
-            });
-            self.set_search_options(options, cx);
-            self.clear_matches(window, cx);
-            cx.notify();
-        }
-        self.update_matches(!updated, add_to_history, window, cx)
-    }
-
-    pub fn focus_editor(&mut self, _: &FocusEditor, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(active_editor) = self.active_searchable_item.as_ref() {
-            let handle = active_editor.item_focus_handle(cx);
-            window.focus(&handle);
-        }
-    }
-
-    pub fn toggle_search_option(
-        &mut self,
-        search_option: SearchOptions,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.search_options.toggle(search_option);
-        self.default_options = self.search_options;
-        drop(self.update_matches(false, false, window, cx));
-        self.adjust_query_regex_language(cx);
-        self.sync_select_next_case_sensitivity(cx);
-        cx.notify();
-    }
-
-    pub fn has_search_option(&mut self, search_option: SearchOptions) -> bool {
-        self.search_options.contains(search_option)
-    }
-
-    pub fn enable_search_option(
-        &mut self,
-        search_option: SearchOptions,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if !self.search_options.contains(search_option) {
-            self.toggle_search_option(search_option, window, cx)
-        }
-    }
-
-    pub fn set_search_within_selection(
-        &mut self,
-        search_within_selection: Option<FilteredSearchRange>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<oneshot::Receiver<()>> {
-        let active_item = self.active_searchable_item.as_mut()?;
-        self.selection_search_enabled = search_within_selection;
-        active_item.toggle_filtered_search_ranges(self.selection_search_enabled, window, cx);
-        cx.notify();
-        Some(self.update_matches(false, false, window, cx))
-    }
-
-    pub fn set_search_options(&mut self, search_options: SearchOptions, cx: &mut Context<Self>) {
-        self.search_options = search_options;
-        self.adjust_query_regex_language(cx);
-        self.sync_select_next_case_sensitivity(cx);
-        cx.notify();
-    }
-
-    pub fn clear_search_within_ranges(
-        &mut self,
-        search_options: SearchOptions,
-        cx: &mut Context<Self>,
-    ) {
-        self.search_options = search_options;
-        self.adjust_query_regex_language(cx);
-        cx.notify();
-    }
-
-    fn select_next_match(
-        &mut self,
-        _: &SelectNextMatch,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.select_match(Direction::Next, 1, window, cx);
-    }
-
-    fn select_prev_match(
-        &mut self,
-        _: &SelectPreviousMatch,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.select_match(Direction::Prev, 1, window, cx);
-    }
-
-    pub fn select_all_matches(
-        &mut self,
-        _: &SelectAllMatches,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if !self.dismissed
-            && self.active_match_index.is_some()
-            && let Some(searchable_item) = self.active_searchable_item.as_ref()
-            && let Some(matches) = self
-                .searchable_items_with_matches
-                .get(&searchable_item.downgrade())
-        {
-            searchable_item.select_matches(matches, window, cx);
-            self.focus_editor(&FocusEditor, window, cx);
-        }
-    }
-
-    pub fn select_match(
-        &mut self,
-        direction: Direction,
-        count: usize,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(index) = self.active_match_index
-            && let Some(searchable_item) = self.active_searchable_item.as_ref()
-            && let Some(matches) = self
-                .searchable_items_with_matches
-                .get(&searchable_item.downgrade())
-                .filter(|matches| !matches.is_empty())
-        {
-            // If 'wrapscan' is disabled, searches do not wrap around the end of the file.
-            if !EditorSettings::get_global(cx).search_wrap
-                && ((direction == Direction::Next && index + count >= matches.len())
-                    || (direction == Direction::Prev && index < count))
-            {
-                crate::show_no_more_matches(window, cx);
-                return;
-            }
-            let new_match_index = searchable_item
-                .match_index_for_direction(matches, index, direction, count, window, cx);
-
-            searchable_item.update_matches(matches, Some(new_match_index), window, cx);
-            searchable_item.activate_match(new_match_index, matches, window, cx);
-        }
-    }
-
-    pub fn select_first_match(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(searchable_item) = self.active_searchable_item.as_ref()
-            && let Some(matches) = self
-                .searchable_items_with_matches
-                .get(&searchable_item.downgrade())
-        {
-            if matches.is_empty() {
-                return;
-            }
-            searchable_item.update_matches(matches, Some(0), window, cx);
-            searchable_item.activate_match(0, matches, window, cx);
-        }
-    }
-
-    pub fn select_last_match(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(searchable_item) = self.active_searchable_item.as_ref()
-            && let Some(matches) = self
-                .searchable_items_with_matches
-                .get(&searchable_item.downgrade())
-        {
-            if matches.is_empty() {
-                return;
-            }
-            let new_match_index = matches.len() - 1;
-            searchable_item.update_matches(matches, Some(new_match_index), window, cx);
-            searchable_item.activate_match(new_match_index, matches, window, cx);
-        }
-    }
-
-    fn on_query_editor_event(
-        &mut self,
-        editor: &Entity<Editor>,
-        event: &editor::EditorEvent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            editor::EditorEvent::Focused => self.query_editor_focused = true,
-            editor::EditorEvent::Blurred => self.query_editor_focused = false,
-            editor::EditorEvent::Edited { .. } => {
-                self.smartcase(window, cx);
-                self.clear_matches(window, cx);
-                let search = self.update_matches(false, true, window, cx);
-
-                let width = editor.update(cx, |editor, cx| {
-                    let text_layout_details = editor.text_layout_details(window);
-                    let snapshot = editor.snapshot(window, cx).display_snapshot;
-
-                    snapshot.x_for_display_point(snapshot.max_point(), &text_layout_details)
-                        - snapshot.x_for_display_point(DisplayPoint::zero(), &text_layout_details)
-                });
-                self.editor_needed_width = width;
-                cx.notify();
-
-                cx.spawn_in(window, async move |this, cx| {
-                    if search.await.is_ok() {
-                        this.update_in(cx, |this, window, cx| {
-                            this.activate_current_match(window, cx)
-                        })
-                    } else {
-                        Ok(())
-                    }
-                })
-                .detach_and_log_err(cx);
-            }
-            _ => {}
-        }
-    }
-
-    fn on_replacement_editor_event(
-        &mut self,
-        _: Entity<Editor>,
-        event: &editor::EditorEvent,
-        _: &mut Context<Self>,
-    ) {
-        match event {
-            editor::EditorEvent::Focused => self.replacement_editor_focused = true,
-            editor::EditorEvent::Blurred => self.replacement_editor_focused = false,
-            _ => {}
-        }
-    }
-
-    fn on_active_searchable_item_event(
-        &mut self,
-        event: &SearchEvent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            SearchEvent::MatchesInvalidated => {
-                drop(self.update_matches(false, false, window, cx));
-            }
-            SearchEvent::ActiveMatchChanged => self.update_match_index(window, cx),
-        }
-    }
-
-    fn toggle_case_sensitive(
-        &mut self,
-        _: &ToggleCaseSensitive,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.toggle_search_option(SearchOptions::CASE_SENSITIVE, window, cx)
-    }
-
-    fn toggle_whole_word(
-        &mut self,
-        _: &ToggleWholeWord,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.toggle_search_option(SearchOptions::WHOLE_WORD, window, cx)
-    }
-
-    fn toggle_selection(
-        &mut self,
-        _: &ToggleSelection,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.set_search_within_selection(
-            if let Some(_) = self.selection_search_enabled {
-                None
-            } else {
-                Some(FilteredSearchRange::Default)
-            },
-            window,
-            cx,
-        );
-    }
-
-    fn toggle_regex(&mut self, _: &ToggleRegex, window: &mut Window, cx: &mut Context<Self>) {
-        self.toggle_search_option(SearchOptions::REGEX, window, cx)
-    }
-
-    fn clear_active_searchable_item_matches(&mut self, window: &mut Window, cx: &mut App) {
-        if let Some(active_searchable_item) = self.active_searchable_item.as_ref() {
-            self.active_match_index = None;
-            self.searchable_items_with_matches
-                .remove(&active_searchable_item.downgrade());
-            active_searchable_item.clear_matches(window, cx);
-        }
-    }
-
-    pub fn has_active_match(&self) -> bool {
-        self.active_match_index.is_some()
-    }
-
-    fn clear_matches(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let mut active_item_matches = None;
-        for (searchable_item, matches) in self.searchable_items_with_matches.drain() {
-            if let Some(searchable_item) =
-                WeakSearchableItemHandle::upgrade(searchable_item.as_ref(), cx)
-            {
-                if Some(&searchable_item) == self.active_searchable_item.as_ref() {
-                    active_item_matches = Some((searchable_item.downgrade(), matches));
-                } else {
-                    searchable_item.clear_matches(window, cx);
-                }
-            }
-        }
-
-        self.searchable_items_with_matches
-            .extend(active_item_matches);
-    }
-
-    fn update_matches(
-        &mut self,
-        reuse_existing_query: bool,
-        add_to_history: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> oneshot::Receiver<()> {
-        let (done_tx, done_rx) = oneshot::channel();
-        let query = self.query(cx);
-        self.pending_search.take();
-
-        if let Some(active_searchable_item) = self.active_searchable_item.as_ref() {
-            self.query_error = None;
-            if query.is_empty() {
-                self.clear_active_searchable_item_matches(window, cx);
-                let _ = done_tx.send(());
-                cx.notify();
-            } else {
-                let query: Arc<_> = if let Some(search) =
-                    self.active_search.take().filter(|_| reuse_existing_query)
-                {
-                    search
-                } else {
-                    // Value doesn't matter, we only construct empty matchers with it
-
-                    if self.search_options.contains(SearchOptions::REGEX) {
-                        match SearchQuery::regex(
-                            query,
-                            self.search_options.contains(SearchOptions::WHOLE_WORD),
-                            self.search_options.contains(SearchOptions::CASE_SENSITIVE),
-                            false,
-                            self.search_options
-                                .contains(SearchOptions::ONE_MATCH_PER_LINE),
-                            PathMatcher::default(),
-                            PathMatcher::default(),
-                            false,
-                            None,
-                        ) {
-                            Ok(query) => query.with_replacement(self.replacement(cx)),
-                            Err(e) => {
-                                self.query_error = Some(e.to_string());
-                                self.clear_active_searchable_item_matches(window, cx);
-                                cx.notify();
-                                return done_rx;
-                            }
-                        }
-                    } else {
-                        match SearchQuery::text(
-                            query,
-                            self.search_options.contains(SearchOptions::WHOLE_WORD),
-                            self.search_options.contains(SearchOptions::CASE_SENSITIVE),
-                            false,
-                            PathMatcher::default(),
-                            PathMatcher::default(),
-                            false,
-                            None,
-                        ) {
-                            Ok(query) => query.with_replacement(self.replacement(cx)),
-                            Err(e) => {
-                                self.query_error = Some(e.to_string());
-                                self.clear_active_searchable_item_matches(window, cx);
-                                cx.notify();
-                                return done_rx;
-                            }
-                        }
-                    }
-                    .into()
-                };
-
-                self.active_search = Some(query.clone());
-                let query_text = query.as_str().to_string();
-
-                let matches = active_searchable_item.find_matches(query, window, cx);
-
-                let active_searchable_item = active_searchable_item.downgrade();
-                self.pending_search = Some(cx.spawn_in(window, async move |this, cx| {
-                    let matches = matches.await;
-
-                    this.update_in(cx, |this, window, cx| {
-                        if let Some(active_searchable_item) =
-                            WeakSearchableItemHandle::upgrade(active_searchable_item.as_ref(), cx)
-                        {
-                            this.searchable_items_with_matches
-                                .insert(active_searchable_item.downgrade(), matches);
-
-                            this.update_match_index(window, cx);
-                            if add_to_history {
-                                this.search_history
-                                    .add(&mut this.search_history_cursor, query_text);
-                            }
-                            if !this.dismissed {
-                                let matches = this
-                                    .searchable_items_with_matches
-                                    .get(&active_searchable_item.downgrade())
-                                    .unwrap();
-                                if matches.is_empty() {
-                                    active_searchable_item.clear_matches(window, cx);
-                                } else {
-                                    active_searchable_item.update_matches(
-                                        matches,
-                                        this.active_match_index,
-                                        window,
-                                        cx,
-                                    );
-                                }
-                                let _ = done_tx.send(());
-                            }
-                            cx.notify();
-                        }
-                    })
-                    .log_err();
-                }));
-            }
-        }
-        done_rx
-    }
-
-    fn reverse_direction_if_backwards(&self, direction: Direction) -> Direction {
-        if self.search_options.contains(SearchOptions::BACKWARDS) {
-            direction.opposite()
-        } else {
-            direction
-        }
-    }
-
-    pub fn update_match_index(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let direction = self.reverse_direction_if_backwards(Direction::Next);
-        let new_index = self
-            .active_searchable_item
-            .as_ref()
-            .and_then(|searchable_item| {
-                let matches = self
-                    .searchable_items_with_matches
-                    .get(&searchable_item.downgrade())?;
-                searchable_item.active_match_index(direction, matches, window, cx)
-            });
-        if new_index != self.active_match_index {
-            self.active_match_index = new_index;
-            if !self.dismissed {
-                if let Some(searchable_item) = self.active_searchable_item.as_ref() {
-                    if let Some(matches) = self
-                        .searchable_items_with_matches
-                        .get(&searchable_item.downgrade())
-                    {
-                        if !matches.is_empty() {
-                            searchable_item.update_matches(matches, new_index, window, cx);
-                        }
-                    }
-                }
-            }
-            cx.notify();
-        }
-    }
-
-    fn tab(&mut self, _: &Tab, window: &mut Window, cx: &mut Context<Self>) {
-        self.cycle_field(Direction::Next, window, cx);
-    }
-
-    fn backtab(&mut self, _: &Backtab, window: &mut Window, cx: &mut Context<Self>) {
-        self.cycle_field(Direction::Prev, window, cx);
-    }
-    fn cycle_field(&mut self, direction: Direction, window: &mut Window, cx: &mut Context<Self>) {
-        let mut handles = vec![self.query_editor.focus_handle(cx)];
-        if self.replace_enabled {
-            handles.push(self.replacement_editor.focus_handle(cx));
-        }
-        if let Some(item) = self.active_searchable_item.as_ref() {
-            handles.push(item.item_focus_handle(cx));
-        }
-        let current_index = match handles.iter().position(|focus| focus.is_focused(window)) {
-            Some(index) => index,
-            None => return,
-        };
-
-        let new_index = match direction {
-            Direction::Next => (current_index + 1) % handles.len(),
-            Direction::Prev if current_index == 0 => handles.len() - 1,
-            Direction::Prev => (current_index - 1) % handles.len(),
-        };
-        let next_focus_handle = &handles[new_index];
-        self.focus(next_focus_handle, window);
-        cx.stop_propagation();
-    }
-
-    fn next_history_query(
-        &mut self,
-        _: &NextHistoryQuery,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(new_query) = self
-            .search_history
-            .next(&mut self.search_history_cursor)
-            .map(str::to_string)
-        {
-            drop(self.search(&new_query, Some(self.search_options), false, window, cx));
-        } else {
-            self.search_history_cursor.reset();
-            drop(self.search("", Some(self.search_options), false, window, cx));
-        }
-    }
-
-    fn previous_history_query(
-        &mut self,
-        _: &PreviousHistoryQuery,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.query(cx).is_empty()
-            && let Some(new_query) = self
-                .search_history
-                .current(&self.search_history_cursor)
-                .map(str::to_string)
-        {
-            drop(self.search(&new_query, Some(self.search_options), false, window, cx));
-            return;
-        }
-
-        if let Some(new_query) = self
-            .search_history
-            .previous(&mut self.search_history_cursor)
-            .map(str::to_string)
-        {
-            drop(self.search(&new_query, Some(self.search_options), false, window, cx));
-        }
-    }
-
-    fn focus(&self, handle: &gpui::FocusHandle, window: &mut Window) {
-        window.invalidate_character_coordinates();
-        window.focus(handle);
-    }
-
-    fn toggle_replace(&mut self, _: &ToggleReplace, window: &mut Window, cx: &mut Context<Self>) {
-        if self.active_searchable_item.is_some() {
-            self.replace_enabled = !self.replace_enabled;
-            let handle = if self.replace_enabled {
-                self.replacement_editor.focus_handle(cx)
-            } else {
-                self.query_editor.focus_handle(cx)
-            };
-            self.focus(&handle, window);
-            cx.notify();
-        }
-    }
-
-    fn replace_next(&mut self, _: &ReplaceNext, window: &mut Window, cx: &mut Context<Self>) {
-        let mut should_propagate = true;
-        if !self.dismissed
-            && self.active_search.is_some()
-            && let Some(searchable_item) = self.active_searchable_item.as_ref()
-            && let Some(query) = self.active_search.as_ref()
-            && let Some(matches) = self
-                .searchable_items_with_matches
-                .get(&searchable_item.downgrade())
-        {
-            if let Some(active_index) = self.active_match_index {
-                let query = query
-                    .as_ref()
-                    .clone()
-                    .with_replacement(self.replacement(cx));
-                searchable_item.replace(matches.at(active_index), &query, window, cx);
-                self.select_next_match(&SelectNextMatch, window, cx);
-            }
-            should_propagate = false;
-        }
-        if !should_propagate {
-            cx.stop_propagation();
-        }
-    }
-
-    pub fn replace_all(&mut self, _: &ReplaceAll, window: &mut Window, cx: &mut Context<Self>) {
-        if !self.dismissed
-            && self.active_search.is_some()
-            && let Some(searchable_item) = self.active_searchable_item.as_ref()
-            && let Some(query) = self.active_search.as_ref()
-            && let Some(matches) = self
-                .searchable_items_with_matches
-                .get(&searchable_item.downgrade())
-        {
-            let query = query
-                .as_ref()
-                .clone()
-                .with_replacement(self.replacement(cx));
-            searchable_item.replace_all(&mut matches.iter(), &query, window, cx);
-        }
-    }
-
-    pub fn match_exists(&mut self, window: &mut Window, cx: &mut Context<Self>) -> bool {
-        self.update_match_index(window, cx);
-        self.active_match_index.is_some()
-    }
-
-    pub fn should_use_smartcase_search(&mut self, cx: &mut Context<Self>) -> bool {
-        EditorSettings::get_global(cx).use_smartcase_search
-    }
-
-    pub fn is_contains_uppercase(&mut self, str: &String) -> bool {
-        str.chars().any(|c| c.is_uppercase())
-    }
-
-    fn smartcase(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if self.should_use_smartcase_search(cx) {
-            let query = self.query(cx);
-            if !query.is_empty() {
-                let is_case = self.is_contains_uppercase(&query);
-                if self.has_search_option(SearchOptions::CASE_SENSITIVE) != is_case {
-                    self.toggle_search_option(SearchOptions::CASE_SENSITIVE, window, cx);
-                }
-            }
-        }
-    }
-
-    fn adjust_query_regex_language(&self, cx: &mut App) {
-        let enable = self.search_options.contains(SearchOptions::REGEX);
-        let query_buffer = self
-            .query_editor
-            .read(cx)
-            .buffer()
-            .read(cx)
-            .as_singleton()
-            .expect("query editor should be backed by a singleton buffer");
-
-        if enable {
-            if let Some(regex_language) = self.regex_language.clone() {
-                query_buffer.update(cx, |query_buffer, cx| {
-                    query_buffer.set_language(Some(regex_language), cx);
-                })
-            }
-        } else {
-            query_buffer.update(cx, |query_buffer, cx| {
-                query_buffer.set_language(None, cx);
-            })
-        }
-    }
-
-    /// Updates the searchable item's case sensitivity option to match the
-    /// search bar's current case sensitivity setting. This ensures that
-    /// editor's `select_next`/ `select_previous` operations respect the buffer
-    /// search bar's search options.
-    ///
-    /// Clears the case sensitivity when the search bar is dismissed so that
-    /// only the editor's settings are respected.
-    fn sync_select_next_case_sensitivity(&self, cx: &mut Context<Self>) {
-        let case_sensitive = match self.dismissed {
-            true => None,
-            false => Some(self.search_options.contains(SearchOptions::CASE_SENSITIVE)),
-        };
-
-        if let Some(active_searchable_item) = self.active_searchable_item.as_ref() {
-            active_searchable_item.set_search_is_case_sensitive(case_sensitive, cx);
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::ops::Range;
-
-    use super::*;
-    use editor::{
-        DisplayPoint, Editor, MultiBuffer, SearchSettings, SelectionEffects,
-        display_map::DisplayRow, test::editor_test_context::EditorTestContext,
-    };
-    use gpui::{Hsla, TestAppContext, UpdateGlobal, VisualTestContext};
-    use language::{Buffer, Point};
-    use settings::{SearchSettingsContent, SettingsStore};
-    use smol::stream::StreamExt as _;
-    use unindent::Unindent as _;
-    use util_macros::perf;
-
-    fn init_globals(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let store = settings::SettingsStore::test(cx);
-            cx.set_global(store);
-            editor::init(cx);
-
-            theme::init(theme::LoadThemes::JustBase, cx);
-            crate::init(cx);
-        });
-    }
-
-    fn init_test(
-        cx: &mut TestAppContext,
-    ) -> (
-        Entity<Editor>,
-        Entity<BufferSearchBar>,
-        &mut VisualTestContext,
-    ) {
-        init_globals(cx);
-        let buffer = cx.new(|cx| {
-            Buffer::local(
-                r#"
-                A regular expression (shortened as regex or regexp;[1] also referred to as
-                rational expression[2][3]) is a sequence of characters that specifies a search
-                pattern in text. Usually such patterns are used by string-searching algorithms
-                for "find" or "find and replace" operations on strings, or for input validation.
-                "#
-                .unindent(),
-                cx,
-            )
-        });
-        let mut editor = None;
-        let window = cx.add_window(|window, cx| {
-            let default_key_bindings = settings::KeymapFile::load_asset_allow_partial_failure(
-                "keymaps/default-macos.json",
-                cx,
-            )
-            .unwrap();
-            cx.bind_keys(default_key_bindings);
-            editor = Some(cx.new(|cx| Editor::for_buffer(buffer.clone(), None, window, cx)));
-            let mut search_bar = BufferSearchBar::new(None, window, cx);
-            search_bar.set_active_pane_item(Some(&editor.clone().unwrap()), window, cx);
-            search_bar.show(window, cx);
-            search_bar
-        });
-        let search_bar = window.root(cx).unwrap();
-
-        let cx = VisualTestContext::from_window(*window, cx).into_mut();
-
-        (editor.unwrap(), search_bar, cx)
-    }
-
-    #[perf]
-    #[gpui::test]
-    async fn test_search_simple(cx: &mut TestAppContext) {
-        let (editor, search_bar, cx) = init_test(cx);
-        let display_points_of = |background_highlights: Vec<(Range<DisplayPoint>, Hsla)>| {
-            background_highlights
-                .into_iter()
-                .map(|(range, _)| range)
-                .collect::<Vec<_>>()
-        };
-        // Search for a string that appears with different casing.
-        // By default, search is case-insensitive.
-        search_bar
-            .update_in(cx, |search_bar, window, cx| {
-                search_bar.search("us", None, true, window, cx)
-            })
-            .await
-            .unwrap();
-        editor.update_in(cx, |editor, window, cx| {
-            assert_eq!(
-                display_points_of(editor.all_text_background_highlights(window, cx)),
-                &[
-                    DisplayPoint::new(DisplayRow(2), 17)..DisplayPoint::new(DisplayRow(2), 19),
-                    DisplayPoint::new(DisplayRow(2), 43)..DisplayPoint::new(DisplayRow(2), 45),
-                ]
-            );
-        });
-
-        // Switch to a case sensitive search.
-        search_bar.update_in(cx, |search_bar, window, cx| {
-            search_bar.toggle_search_option(SearchOptions::CASE_SENSITIVE, window, cx);
-        });
-        let mut editor_notifications = cx.notifications(&editor);
-        editor_notifications.next().await;
-        editor.update_in(cx, |editor, window, cx| {
-            assert_eq!(
-                display_points_of(editor.all_text_background_highlights(window, cx)),
-                &[DisplayPoint::new(DisplayRow(2), 43)..DisplayPoint::new(DisplayRow(2), 45),]
-            );
-        });
-
-        // Search for a string that appears both as a whole word and
-        // within other words. By default, all results are found.
-        search_bar
-            .update_in(cx, |search_bar, window, cx| {
-                search_bar.search("or", None, true, window, cx)
-            })
-            .await
-            .unwrap();
-        editor.update_in(cx, |editor, window, cx| {
-            assert_eq!(
-                display_points_of(editor.all_text_background_highlights(window, cx)),
-                &[
-                    DisplayPoint::new(DisplayRow(0), 24)..DisplayPoint::new(DisplayRow(0), 26),
-                    DisplayPoint::new(DisplayRow(0), 41)..DisplayPoint::new(DisplayRow(0), 43),
-                    DisplayPoint::new(DisplayRow(2), 71)..DisplayPoint::new(DisplayRow(2), 73),
-                    DisplayPoint::new(DisplayRow(3), 1)..DisplayPoint::new(DisplayRow(3), 3),
-                    DisplayPoint::new(DisplayRow(3), 11)..DisplayPoint::new(DisplayRow(3), 13),
-                    DisplayPoint::new(DisplayRow(3), 56)..DisplayPoint::new(DisplayRow(3), 58),
-                    DisplayPoint::new(DisplayRow(3), 60)..DisplayPoint::new(DisplayRow(3), 62),
-                ]
-            );
-        });
-
-        // Switch to a whole word search.
-        search_bar.update_in(cx, |search_bar, window, cx| {
-            search_bar.toggle_search_option(SearchOptions::WHOLE_WORD, window, cx);
-        });
-        let mut editor_notifications = cx.notifications(&editor);
-        editor_notifications.next().await;
-        editor.update_in(cx, |editor, window, cx| {
-            assert_eq!(
-                display_points_of(editor.all_text_background_highlights(window, cx)),
-                &[
-                    DisplayPoint::new(DisplayRow(0), 41)..DisplayPoint::new(DisplayRow(0), 43),
-                    DisplayPoint::new(DisplayRow(3), 11)..DisplayPoint::new(DisplayRow(3), 13),
-                    DisplayPoint::new(DisplayRow(3), 56)..DisplayPoint::new(DisplayRow(3), 58),
-                ]
-            );
-        });
-
-        editor.update_in(cx, |editor, window, cx| {
-            editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                s.select_display_ranges([
-                    DisplayPoint::new(DisplayRow(0), 0)..DisplayPoint::new(DisplayRow(0), 0)
-                ])
-            });
-        });
-        search_bar.update_in(cx, |search_bar, window, cx| {
-            assert_eq!(search_bar.active_match_index, Some(0));
-            search_bar.select_next_match(&SelectNextMatch, window, cx);
-            assert_eq!(
-                editor.update(cx, |editor, cx| editor
-                    .selections
-                    .display_ranges(&editor.display_snapshot(cx))),
-                [DisplayPoint::new(DisplayRow(0), 41)..DisplayPoint::new(DisplayRow(0), 43)]
-            );
-        });
-        search_bar.read_with(cx, |search_bar, _| {
-            assert_eq!(search_bar.active_match_index, Some(0));
-        });
-
-        search_bar.update_in(cx, |search_bar, window, cx| {
-            search_bar.select_next_match(&SelectNextMatch, window, cx);
-            assert_eq!(
-                editor.update(cx, |editor, cx| editor
-                    .selections
-                    .display_ranges(&editor.display_snapshot(cx))),
-                [DisplayPoint::new(DisplayRow(3), 11)..DisplayPoint::new(DisplayRow(3), 13)]
-            );
-        });
-        search_bar.read_with(cx, |search_bar, _| {
-            assert_eq!(search_bar.active_match_index, Some(1));
-        });
-
-        search_bar.update_in(cx, |search_bar, window, cx| {
-            search_bar.select_next_match(&SelectNextMatch, window, cx);
-            assert_eq!(
-                editor.update(cx, |editor, cx| editor
-                    .selections
-                    .display_ranges(&editor.display_snapshot(cx))),
-                [DisplayPoint::new(DisplayRow(3), 56)..DisplayPoint::new(DisplayRow(3), 58)]
-            );
-        });
-        search_bar.read_with(cx, |search_bar, _| {
-            assert_eq!(search_bar.active_match_index, Some(2));
-        });
-
-        search_bar.update_in(cx, |search_bar, window, cx| {
-            search_bar.select_next_match(&SelectNextMatch, window, cx);
-            assert_eq!(
-                editor.update(cx, |editor, cx| editor
-                    .selections
-                    .display_ranges(&editor.display_snapshot(cx))),
-                [DisplayPoint::new(DisplayRow(0), 41)..DisplayPoint::new(DisplayRow(0), 43)]
-            );
-        });
-        search_bar.read_with(cx, |search_bar, _| {
-            assert_eq!(search_bar.active_match_index, Some(0));
-        });
-
-        search_bar.update_in(cx, |search_bar, window, cx| {
-            search_bar.select_prev_match(&SelectPreviousMatch, window, cx);
-            assert_eq!(
-                editor.update(cx, |editor, cx| editor
-                    .selections
-                    .display_ranges(&editor.display_snapshot(cx))),
-                [DisplayPoint::new(DisplayRow(3), 56)..DisplayPoint::new(DisplayRow(3), 58)]
-            );
-        });
-        search_bar.read_with(cx, |search_bar, _| {
-            assert_eq!(search_bar.active_match_index, Some(2));
-        });
-
-        search_bar.update_in(cx, |search_bar, window, cx| {
-            search_bar.select_prev_match(&SelectPreviousMatch, window, cx);
-            assert_eq!(
-                editor.update(cx, |editor, cx| editor
-                    .selections
-                    .display_ranges(&editor.display_snapshot(cx))),
-                [DisplayPoint::new(DisplayRow(3), 11)..DisplayPoint::new(DisplayRow(3), 13)]
-            );
-        });
-        search_bar.read_with(cx, |search_bar, _| {
-            assert_eq!(search_bar.active_match_index, Some(1));
-        });
-
-        search_bar.update_in(cx, |search_bar, window, cx| {
-            search_bar.select_prev_match(&SelectPreviousMatch, window, cx);
-            assert_eq!(
-                editor.update(cx, |editor, cx| editor
-                    .selections
-                    .display_ranges(&editor.display_snapshot(cx))),
-                [DisplayPoint::new(DisplayRow(0), 41)..DisplayPoint::new(DisplayRow(0), 43)]
-            );
-        });
-        search_bar.read_with(cx, |search_bar, _| {
-            assert_eq!(search_bar.active_match_index, Some(0));
-        });
-
-        // Park the cursor in between matches and ensure that going to the previous match selects
-        // the closest match to the left.
-        editor.update_in(cx, |editor, window, cx| {
-            editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                s.select_display_ranges([
-                    DisplayPoint::new(DisplayRow(1), 0)..DisplayPoint::new(DisplayRow(1), 0)
-                ])
-            });
-        });
-        search_bar.update_in(cx, |search_bar, window, cx| {
-            assert_eq!(search_bar.active_match_index, Some(1));
-            search_bar.select_prev_match(&SelectPreviousMatch, window, cx);
-            assert_eq!(
-                editor.update(cx, |editor, cx| editor
-                    .selections
-                    .display_ranges(&editor.display_snapshot(cx))),
-                [DisplayPoint::new(DisplayRow(0), 41)..DisplayPoint::new(DisplayRow(0), 43)]
-            );
-        });
-        search_bar.read_with(cx, |search_bar, _| {
-            assert_eq!(search_bar.active_match_index, Some(0));
-        });
-
-        // Park the cursor in between matches and ensure that going to the next match selects the
-        // closest match to the right.
-        editor.update_in(cx, |editor, window, cx| {
-            editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                s.select_display_ranges([
-                    DisplayPoint::new(DisplayRow(1), 0)..DisplayPoint::new(DisplayRow(1), 0)
-                ])
-            });
-        });
-        search_bar.update_in(cx, |search_bar, window, cx| {
-            assert_eq!(search_bar.active_match_index, Some(1));
-            search_bar.select_next_match(&SelectNextMatch, window, cx);
-            assert_eq!(
-                editor.update(cx, |editor, cx| editor
-                    .selections
-                    .display_ranges(&editor.display_snapshot(cx))),
-                [DisplayPoint::new(DisplayRow(3), 11)..DisplayPoint::new(DisplayRow(3), 13)]
-            );
-        });
-        search_bar.read_with(cx, |search_bar, _| {
-            assert_eq!(search_bar.active_match_index, Some(1));
-        });
-
-        // Park the cursor after the last match and ensure that going to the previous match selects
-        // the last match.
-        editor.update_in(cx, |editor, window, cx| {
-            editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                s.select_display_ranges([
-                    DisplayPoint::new(DisplayRow(3), 60)..DisplayPoint::new(DisplayRow(3), 60)
-                ])
-            });
-        });
-        search_bar.update_in(cx, |search_bar, window, cx| {
-            assert_eq!(search_bar.active_match_index, Some(2));
-            search_bar.select_prev_match(&SelectPreviousMatch, window, cx);
-            assert_eq!(
-                editor.update(cx, |editor, cx| editor
-                    .selections
-                    .display_ranges(&editor.display_snapshot(cx))),
-                [DisplayPoint::new(DisplayRow(3), 56)..DisplayPoint::new(DisplayRow(3), 58)]
-            );
-        });
-        search_bar.read_with(cx, |search_bar, _| {
-            assert_eq!(search_bar.active_match_index, Some(2));
-        });
-
-        // Park the cursor after the last match and ensure that going to the next match selects the
-        // first match.
-        editor.update_in(cx, |editor, window, cx| {
-            editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                s.select_display_ranges([
-                    DisplayPoint::new(DisplayRow(3), 60)..DisplayPoint::new(DisplayRow(3), 60)
-                ])
-            });
-        });
-        search_bar.update_in(cx, |search_bar, window, cx| {
-            assert_eq!(search_bar.active_match_index, Some(2));
-            search_bar.select_next_match(&SelectNextMatch, window, cx);
-            assert_eq!(
-                editor.update(cx, |editor, cx| editor
-                    .selections
-                    .display_ranges(&editor.display_snapshot(cx))),
-                [DisplayPoint::new(DisplayRow(0), 41)..DisplayPoint::new(DisplayRow(0), 43)]
-            );
-        });
-        search_bar.read_with(cx, |search_bar, _| {
-            assert_eq!(search_bar.active_match_index, Some(0));
-        });
-
-        // Park the cursor before the first match and ensure that going to the previous match
-        // selects the last match.
-        editor.update_in(cx, |editor, window, cx| {
-            editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                s.select_display_ranges([
-                    DisplayPoint::new(DisplayRow(0), 0)..DisplayPoint::new(DisplayRow(0), 0)
-                ])
-            });
-        });
-        search_bar.update_in(cx, |search_bar, window, cx| {
-            assert_eq!(search_bar.active_match_index, Some(0));
-            search_bar.select_prev_match(&SelectPreviousMatch, window, cx);
-            assert_eq!(
-                editor.update(cx, |editor, cx| editor
-                    .selections
-                    .display_ranges(&editor.display_snapshot(cx))),
-                [DisplayPoint::new(DisplayRow(3), 56)..DisplayPoint::new(DisplayRow(3), 58)]
-            );
-        });
-        search_bar.read_with(cx, |search_bar, _| {
-            assert_eq!(search_bar.active_match_index, Some(2));
-        });
-    }
-
-    fn display_points_of(
-        background_highlights: Vec<(Range<DisplayPoint>, Hsla)>,
-    ) -> Vec<Range<DisplayPoint>> {
-        background_highlights
-            .into_iter()
-            .map(|(range, _)| range)
-            .collect::<Vec<_>>()
-    }
-
-    #[perf]
-    #[gpui::test]
-    async fn test_search_option_handling(cx: &mut TestAppContext) {
-        let (editor, search_bar, cx) = init_test(cx);
-
-        // show with options should make current search case sensitive
-        search_bar
-            .update_in(cx, |search_bar, window, cx| {
-                search_bar.show(window, cx);
-                search_bar.search("us", Some(SearchOptions::CASE_SENSITIVE), true, window, cx)
-            })
-            .await
-            .unwrap();
-        editor.update_in(cx, |editor, window, cx| {
-            assert_eq!(
-                display_points_of(editor.all_text_background_highlights(window, cx)),
-                &[DisplayPoint::new(DisplayRow(2), 43)..DisplayPoint::new(DisplayRow(2), 45),]
-            );
-        });
-
-        // search_suggested should restore default options
-        search_bar.update_in(cx, |search_bar, window, cx| {
-            search_bar.search_suggested(window, cx);
-            assert_eq!(search_bar.search_options, SearchOptions::NONE)
-        });
-
-        // toggling a search option should update the defaults
-        search_bar
-            .update_in(cx, |search_bar, window, cx| {
-                search_bar.search(
-                    "regex",
-                    Some(SearchOptions::CASE_SENSITIVE),
-                    true,
-                    window,
-                    cx,
-                )
-            })
-            .await
-            .unwrap();
-        search_bar.update_in(cx, |search_bar, window, cx| {
-            search_bar.toggle_search_option(SearchOptions::WHOLE_WORD, window, cx)
-        });
-        let mut editor_notifications = cx.notifications(&editor);
-        editor_notifications.next().await;
-        editor.update_in(cx, |editor, window, cx| {
-            assert_eq!(
-                display_points_of(editor.all_text_background_highlights(window, cx)),
-                &[DisplayPoint::new(DisplayRow(0), 35)..DisplayPoint::new(DisplayRow(0), 40),]
-            );
-        });
-
-        // defaults should still include whole word
-        search_bar.update_in(cx, |search_bar, window, cx| {
-            search_bar.search_suggested(window, cx);
-            assert_eq!(
-                search_bar.search_options,
-                SearchOptions::CASE_SENSITIVE | SearchOptions::WHOLE_WORD
-            )
-        });
-    }
-
-    #[perf]
-    #[gpui::test]
-    async fn test_search_select_all_matches(cx: &mut TestAppContext) {
-        init_globals(cx);
-        let buffer_text = r#"
-        A regular expression (shortened as regex or regexp;[1] also referred to as
-        rational expression[2][3]) is a sequence of characters that specifies a search
-        pattern in text. Usually such patterns are used by string-searching algorithms
-        for "find" or "find and replace" operations on strings, or for input validation.
-        "#
-        .unindent();
-        let expected_query_matches_count = buffer_text
-            .chars()
-            .filter(|c| c.eq_ignore_ascii_case(&'a'))
-            .count();
-        assert!(
-            expected_query_matches_count > 1,
-            "Should pick a query with multiple results"
-        );
-        let buffer = cx.new(|cx| Buffer::local(buffer_text, cx));
-        let window = cx.add_window(|_, _| gpui::Empty);
-
-        let editor = window.build_entity(cx, |window, cx| {
-            Editor::for_buffer(buffer.clone(), None, window, cx)
-        });
-
-        let search_bar = window.build_entity(cx, |window, cx| {
-            let mut search_bar = BufferSearchBar::new(None, window, cx);
-            search_bar.set_active_pane_item(Some(&editor), window, cx);
-            search_bar.show(window, cx);
-            search_bar
-        });
-
-        window
-            .update(cx, |_, window, cx| {
-                search_bar.update(cx, |search_bar, cx| {
-                    search_bar.search("a", None, true, window, cx)
-                })
-            })
-            .unwrap()
-            .await
-            .unwrap();
-        let initial_selections = window
-            .update(cx, |_, window, cx| {
-                search_bar.update(cx, |search_bar, cx| {
-                    let handle = search_bar.query_editor.focus_handle(cx);
-                    window.focus(&handle);
-                    search_bar.activate_current_match(window, cx);
-                });
-                assert!(
-                    !editor.read(cx).is_focused(window),
-                    "Initially, the editor should not be focused"
-                );
-                let initial_selections = editor.update(cx, |editor, cx| {
-                    let initial_selections = editor.selections.display_ranges(&editor.display_snapshot(cx));
-                    assert_eq!(
-                        initial_selections.len(), 1,
-                        "Expected to have only one selection before adding carets to all matches, but got: {initial_selections:?}",
-                    );
-                    initial_selections
-                });
-                search_bar.update(cx, |search_bar, cx| {
-                    assert_eq!(search_bar.active_match_index, Some(0));
-                    let handle = search_bar.query_editor.focus_handle(cx);
-                    window.focus(&handle);
-                    search_bar.select_all_matches(&SelectAllMatches, window, cx);
-                });
-                assert!(
-                    editor.read(cx).is_focused(window),
-                    "Should focus editor after successful SelectAllMatches"
-                );
-                search_bar.update(cx, |search_bar, cx| {
-                    let all_selections =
-                        editor.update(cx, |editor, cx| editor.selections.display_ranges(&editor.display_snapshot(cx)));
-                    assert_eq!(
-                        all_selections.len(),
-                        expected_query_matches_count,
-                        "Should select all `a` characters in the buffer, but got: {all_selections:?}"
-                    );
-                    assert_eq!(
-                        search_bar.active_match_index,
-                        Some(0),
-                        "Match index should not change after selecting all matches"
-                    );
-                });
-
-                search_bar.update(cx, |this, cx| this.select_next_match(&SelectNextMatch, window, cx));
-                initial_selections
-            }).unwrap();
-
-        window
-            .update(cx, |_, window, cx| {
-                assert!(
-                    editor.read(cx).is_focused(window),
-                    "Should still have editor focused after SelectNextMatch"
-                );
-                search_bar.update(cx, |search_bar, cx| {
-                    let all_selections = editor.update(cx, |editor, cx| {
-                        editor
-                            .selections
-                            .display_ranges(&editor.display_snapshot(cx))
-                    });
-                    assert_eq!(
-                        all_selections.len(),
-                        1,
-                        "On next match, should deselect items and select the next match"
-                    );
-                    assert_ne!(
-                        all_selections, initial_selections,
-                        "Next match should be different from the first selection"
-                    );
-                    assert_eq!(
-                        search_bar.active_match_index,
-                        Some(1),
-                        "Match index should be updated to the next one"
-                    );
-                    let handle = search_bar.query_editor.focus_handle(cx);
-                    window.focus(&handle);
-                    search_bar.select_all_matches(&SelectAllMatches, window, cx);
-                });
-            })
-            .unwrap();
-        window
-            .update(cx, |_, window, cx| {
-                assert!(
-                    editor.read(cx).is_focused(window),
-                    "Should focus editor after successful SelectAllMatches"
-                );
-                search_bar.update(cx, |search_bar, cx| {
-                    let all_selections =
-                        editor.update(cx, |editor, cx| editor.selections.display_ranges(&editor.display_snapshot(cx)));
-                    assert_eq!(
-                    all_selections.len(),
-                    expected_query_matches_count,
-                    "Should select all `a` characters in the buffer, but got: {all_selections:?}"
-                );
-                    assert_eq!(
-                        search_bar.active_match_index,
-                        Some(1),
-                        "Match index should not change after selecting all matches"
-                    );
-                });
-                search_bar.update(cx, |search_bar, cx| {
-                    search_bar.select_prev_match(&SelectPreviousMatch, window, cx);
-                });
-            })
-            .unwrap();
-        let last_match_selections = window
-            .update(cx, |_, window, cx| {
-                assert!(
-                    editor.read(cx).is_focused(window),
-                    "Should still have editor focused after SelectPreviousMatch"
-                );
-
-                search_bar.update(cx, |search_bar, cx| {
-                    let all_selections = editor.update(cx, |editor, cx| {
-                        editor
-                            .selections
-                            .display_ranges(&editor.display_snapshot(cx))
-                    });
-                    assert_eq!(
-                        all_selections.len(),
-                        1,
-                        "On previous match, should deselect items and select the previous item"
-                    );
-                    assert_eq!(
-                        all_selections, initial_selections,
-                        "Previous match should be the same as the first selection"
-                    );
-                    assert_eq!(
-                        search_bar.active_match_index,
-                        Some(0),
-                        "Match index should be updated to the previous one"
-                    );
-                    all_selections
-                })
-            })
-            .unwrap();
-
-        window
-            .update(cx, |_, window, cx| {
-                search_bar.update(cx, |search_bar, cx| {
-                    let handle = search_bar.query_editor.focus_handle(cx);
-                    window.focus(&handle);
-                    search_bar.search("abas_nonexistent_match", None, true, window, cx)
-                })
-            })
-            .unwrap()
-            .await
-            .unwrap();
-        window
-            .update(cx, |_, window, cx| {
-                search_bar.update(cx, |search_bar, cx| {
-                    search_bar.select_all_matches(&SelectAllMatches, window, cx);
-                });
-                assert!(
-                    editor.update(cx, |this, _cx| !this.is_focused(window)),
-                    "Should not switch focus to editor if SelectAllMatches does not find any matches"
-                );
-                search_bar.update(cx, |search_bar, cx| {
-                    let all_selections =
-                        editor.update(cx, |editor, cx| editor.selections.display_ranges(&editor.display_snapshot(cx)));
-                    assert_eq!(
-                        all_selections, last_match_selections,
-                        "Should not select anything new if there are no matches"
-                    );
-                    assert!(
-                        search_bar.active_match_index.is_none(),
-                        "For no matches, there should be no active match index"
-                    );
-                });
-            })
-            .unwrap();
-    }
-
-    #[perf]
-    #[gpui::test]
-    async fn test_search_query_with_match_whole_word(cx: &mut TestAppContext) {
-        init_globals(cx);
-        let buffer_text = r#"
-        self.buffer.update(cx, |buffer, cx| {
-            buffer.edit(
-                edits,
-                Some(AutoindentMode::Block {
-                    original_indent_columns,
-                }),
-                cx,
-            )
-        });
-
-        this.buffer.update(cx, |buffer, cx| {
-            buffer.edit([(end_of_line..start_of_next_line, replace)], None, cx)
-        });
-        "#
-        .unindent();
-        let buffer = cx.new(|cx| Buffer::local(buffer_text, cx));
-        let cx = cx.add_empty_window();
-
-        let editor =
-            cx.new_window_entity(|window, cx| Editor::for_buffer(buffer.clone(), None, window, cx));
-
-        let search_bar = cx.new_window_entity(|window, cx| {
-            let mut search_bar = BufferSearchBar::new(None, window, cx);
-            search_bar.set_active_pane_item(Some(&editor), window, cx);
-            search_bar.show(window, cx);
-            search_bar
-        });
-
-        search_bar
-            .update_in(cx, |search_bar, window, cx| {
-                search_bar.search(
-                    "edit\\(",
-                    Some(SearchOptions::WHOLE_WORD | SearchOptions::REGEX),
-                    true,
-                    window,
-                    cx,
-                )
-            })
-            .await
-            .unwrap();
-
-        search_bar.update_in(cx, |search_bar, window, cx| {
-            search_bar.select_all_matches(&SelectAllMatches, window, cx);
-        });
-        search_bar.update(cx, |_, cx| {
-            let all_selections = editor.update(cx, |editor, cx| {
-                editor
-                    .selections
-                    .display_ranges(&editor.display_snapshot(cx))
-            });
-            assert_eq!(
-                all_selections.len(),
-                2,
-                "Should select all `edit(` in the buffer, but got: {all_selections:?}"
-            );
-        });
-
-        search_bar
-            .update_in(cx, |search_bar, window, cx| {
-                search_bar.search(
-                    "edit(",
-                    Some(SearchOptions::WHOLE_WORD | SearchOptions::CASE_SENSITIVE),
-                    true,
-                    window,
-                    cx,
-                )
-            })
-            .await
-            .unwrap();
-
-        search_bar.update_in(cx, |search_bar, window, cx| {
-            search_bar.select_all_matches(&SelectAllMatches, window, cx);
-        });
-        search_bar.update(cx, |_, cx| {
-            let all_selections = editor.update(cx, |editor, cx| {
-                editor
-                    .selections
-                    .display_ranges(&editor.display_snapshot(cx))
-            });
-            assert_eq!(
-                all_selections.len(),
-                2,
-                "Should select all `edit(` in the buffer, but got: {all_selections:?}"
-            );
-        });
-    }
-
-    #[perf]
-    #[gpui::test]
-    async fn test_search_query_history(cx: &mut TestAppContext) {
-        let (_editor, search_bar, cx) = init_test(cx);
-
-        // Add 3 search items into the history.
-        search_bar
-            .update_in(cx, |search_bar, window, cx| {
-                search_bar.search("a", None, true, window, cx)
-            })
-            .await
-            .unwrap();
-        search_bar
-            .update_in(cx, |search_bar, window, cx| {
-                search_bar.search("b", None, true, window, cx)
-            })
-            .await
-            .unwrap();
-        search_bar
-            .update_in(cx, |search_bar, window, cx| {
-                search_bar.search("c", Some(SearchOptions::CASE_SENSITIVE), true, window, cx)
-            })
-            .await
-            .unwrap();
-        // Ensure that the latest search is active.
-        search_bar.update(cx, |search_bar, cx| {
-            assert_eq!(search_bar.query(cx), "c");
-            assert_eq!(search_bar.search_options, SearchOptions::CASE_SENSITIVE);
-        });
-
-        // Next history query after the latest should set the query to the empty string.
-        search_bar.update_in(cx, |search_bar, window, cx| {
-            search_bar.next_history_query(&NextHistoryQuery, window, cx);
-        });
-        cx.background_executor.run_until_parked();
-        search_bar.update(cx, |search_bar, cx| {
-            assert_eq!(search_bar.query(cx), "");
-            assert_eq!(search_bar.search_options, SearchOptions::CASE_SENSITIVE);
-        });
-        search_bar.update_in(cx, |search_bar, window, cx| {
-            search_bar.next_history_query(&NextHistoryQuery, window, cx);
-        });
-        cx.background_executor.run_until_parked();
-        search_bar.update(cx, |search_bar, cx| {
-            assert_eq!(search_bar.query(cx), "");
-            assert_eq!(search_bar.search_options, SearchOptions::CASE_SENSITIVE);
-        });
-
-        // First previous query for empty current query should set the query to the latest.
-        search_bar.update_in(cx, |search_bar, window, cx| {
-            search_bar.previous_history_query(&PreviousHistoryQuery, window, cx);
-        });
-        cx.background_executor.run_until_parked();
-        search_bar.update(cx, |search_bar, cx| {
-            assert_eq!(search_bar.query(cx), "c");
-            assert_eq!(search_bar.search_options, SearchOptions::CASE_SENSITIVE);
-        });
-
-        // Further previous items should go over the history in reverse order.
-        search_bar.update_in(cx, |search_bar, window, cx| {
-            search_bar.previous_history_query(&PreviousHistoryQuery, window, cx);
-        });
-        cx.background_executor.run_until_parked();
-        search_bar.update(cx, |search_bar, cx| {
-            assert_eq!(search_bar.query(cx), "b");
-            assert_eq!(search_bar.search_options, SearchOptions::CASE_SENSITIVE);
-        });
-
-        // Previous items should never go behind the first history item.
-        search_bar.update_in(cx, |search_bar, window, cx| {
-            search_bar.previous_history_query(&PreviousHistoryQuery, window, cx);
-        });
-        cx.background_executor.run_until_parked();
-        search_bar.update(cx, |search_bar, cx| {
-            assert_eq!(search_bar.query(cx), "a");
-            assert_eq!(search_bar.search_options, SearchOptions::CASE_SENSITIVE);
-        });
-        search_bar.update_in(cx, |search_bar, window, cx| {
-            search_bar.previous_history_query(&PreviousHistoryQuery, window, cx);
-        });
-        cx.background_executor.run_until_parked();
-        search_bar.update(cx, |search_bar, cx| {
-            assert_eq!(search_bar.query(cx), "a");
-            assert_eq!(search_bar.search_options, SearchOptions::CASE_SENSITIVE);
-        });
-
-        // Next items should go over the history in the original order.
-        search_bar.update_in(cx, |search_bar, window, cx| {
-            search_bar.next_history_query(&NextHistoryQuery, window, cx);
-        });
-        cx.background_executor.run_until_parked();
-        search_bar.update(cx, |search_bar, cx| {
-            assert_eq!(search_bar.query(cx), "b");
-            assert_eq!(search_bar.search_options, SearchOptions::CASE_SENSITIVE);
-        });
-
-        search_bar
-            .update_in(cx, |search_bar, window, cx| {
-                search_bar.search("ba", None, true, window, cx)
-            })
-            .await
-            .unwrap();
-        search_bar.update(cx, |search_bar, cx| {
-            assert_eq!(search_bar.query(cx), "ba");
-            assert_eq!(search_bar.search_options, SearchOptions::NONE);
-        });
-
-        // New search input should add another entry to history and move the selection to the end of the history.
-        search_bar.update_in(cx, |search_bar, window, cx| {
-            search_bar.previous_history_query(&PreviousHistoryQuery, window, cx);
-        });
-        cx.background_executor.run_until_parked();
-        search_bar.update(cx, |search_bar, cx| {
-            assert_eq!(search_bar.query(cx), "c");
-            assert_eq!(search_bar.search_options, SearchOptions::NONE);
-        });
-        search_bar.update_in(cx, |search_bar, window, cx| {
-            search_bar.previous_history_query(&PreviousHistoryQuery, window, cx);
-        });
-        cx.background_executor.run_until_parked();
-        search_bar.update(cx, |search_bar, cx| {
-            assert_eq!(search_bar.query(cx), "b");
-            assert_eq!(search_bar.search_options, SearchOptions::NONE);
-        });
-        search_bar.update_in(cx, |search_bar, window, cx| {
-            search_bar.next_history_query(&NextHistoryQuery, window, cx);
-        });
-        cx.background_executor.run_until_parked();
-        search_bar.update(cx, |search_bar, cx| {
-            assert_eq!(search_bar.query(cx), "c");
-            assert_eq!(search_bar.search_options, SearchOptions::NONE);
-        });
-        search_bar.update_in(cx, |search_bar, window, cx| {
-            search_bar.next_history_query(&NextHistoryQuery, window, cx);
-        });
-        cx.background_executor.run_until_parked();
-        search_bar.update(cx, |search_bar, cx| {
-            assert_eq!(search_bar.query(cx), "ba");
-            assert_eq!(search_bar.search_options, SearchOptions::NONE);
-        });
-        search_bar.update_in(cx, |search_bar, window, cx| {
-            search_bar.next_history_query(&NextHistoryQuery, window, cx);
-        });
-        cx.background_executor.run_until_parked();
-        search_bar.update(cx, |search_bar, cx| {
-            assert_eq!(search_bar.query(cx), "");
-            assert_eq!(search_bar.search_options, SearchOptions::NONE);
-        });
-    }
-
-    #[perf]
-    #[gpui::test]
-    async fn test_replace_simple(cx: &mut TestAppContext) {
-        let (editor, search_bar, cx) = init_test(cx);
-
-        search_bar
-            .update_in(cx, |search_bar, window, cx| {
-                search_bar.search("expression", None, true, window, cx)
-            })
-            .await
-            .unwrap();
-
-        search_bar.update_in(cx, |search_bar, window, cx| {
-            search_bar.replacement_editor.update(cx, |editor, cx| {
-                // We use $1 here as initially we should be in Text mode, where `$1` should be treated literally.
-                editor.set_text("expr$1", window, cx);
-            });
-            search_bar.replace_all(&ReplaceAll, window, cx)
-        });
-        assert_eq!(
-            editor.read_with(cx, |this, cx| { this.text(cx) }),
-            r#"
-        A regular expr$1 (shortened as regex or regexp;[1] also referred to as
-        rational expr$1[2][3]) is a sequence of characters that specifies a search
-        pattern in text. Usually such patterns are used by string-searching algorithms
-        for "find" or "find and replace" operations on strings, or for input validation.
-        "#
-            .unindent()
-        );
-
-        // Search for word boundaries and replace just a single one.
-        search_bar
-            .update_in(cx, |search_bar, window, cx| {
-                search_bar.search("or", Some(SearchOptions::WHOLE_WORD), true, window, cx)
-            })
-            .await
-            .unwrap();
-
-        search_bar.update_in(cx, |search_bar, window, cx| {
-            search_bar.replacement_editor.update(cx, |editor, cx| {
-                editor.set_text("banana", window, cx);
-            });
-            search_bar.replace_next(&ReplaceNext, window, cx)
-        });
-        // Notice how the first or in the text (shORtened) is not replaced. Neither are the remaining hits of `or` in the text.
-        assert_eq!(
-            editor.read_with(cx, |this, cx| { this.text(cx) }),
-            r#"
-        A regular expr$1 (shortened as regex banana regexp;[1] also referred to as
-        rational expr$1[2][3]) is a sequence of characters that specifies a search
-        pattern in text. Usually such patterns are used by string-searching algorithms
-        for "find" or "find and replace" operations on strings, or for input validation.
-        "#
-            .unindent()
-        );
-        // Let's turn on regex mode.
-        search_bar
-            .update_in(cx, |search_bar, window, cx| {
-                search_bar.search(
-                    "\\[([^\\]]+)\\]",
-                    Some(SearchOptions::REGEX),
-                    true,
-                    window,
-                    cx,
-                )
-            })
-            .await
-            .unwrap();
-        search_bar.update_in(cx, |search_bar, window, cx| {
-            search_bar.replacement_editor.update(cx, |editor, cx| {
-                editor.set_text("${1}number", window, cx);
-            });
-            search_bar.replace_all(&ReplaceAll, window, cx)
-        });
-        assert_eq!(
-            editor.read_with(cx, |this, cx| { this.text(cx) }),
-            r#"
-        A regular expr$1 (shortened as regex banana regexp;1number also referred to as
-        rational expr$12number3number) is a sequence of characters that specifies a search
-        pattern in text. Usually such patterns are used by string-searching algorithms
-        for "find" or "find and replace" operations on strings, or for input validation.
-        "#
-            .unindent()
-        );
-        // Now with a whole-word twist.
-        search_bar
-            .update_in(cx, |search_bar, window, cx| {
-                search_bar.search(
-                    "a\\w+s",
-                    Some(SearchOptions::REGEX | SearchOptions::WHOLE_WORD),
-                    true,
-                    window,
-                    cx,
-                )
-            })
-            .await
-            .unwrap();
-        search_bar.update_in(cx, |search_bar, window, cx| {
-            search_bar.replacement_editor.update(cx, |editor, cx| {
-                editor.set_text("things", window, cx);
-            });
-            search_bar.replace_all(&ReplaceAll, window, cx)
-        });
-        // The only word affected by this edit should be `algorithms`, even though there's a bunch
-        // of words in this text that would match this regex if not for WHOLE_WORD.
-        assert_eq!(
-            editor.read_with(cx, |this, cx| { this.text(cx) }),
-            r#"
-        A regular expr$1 (shortened as regex banana regexp;1number also referred to as
-        rational expr$12number3number) is a sequence of characters that specifies a search
-        pattern in text. Usually such patterns are used by string-searching things
-        for "find" or "find and replace" operations on strings, or for input validation.
-        "#
-            .unindent()
-        );
-    }
-
-    #[gpui::test]
-    async fn test_replace_focus(cx: &mut TestAppContext) {
-        let (editor, search_bar, cx) = init_test(cx);
-
-        editor.update_in(cx, |editor, window, cx| {
-            editor.set_text("What a bad day!", window, cx)
-        });
-
-        search_bar
-            .update_in(cx, |search_bar, window, cx| {
-                search_bar.search("bad", None, true, window, cx)
-            })
-            .await
-            .unwrap();
-
-        // Calling `toggle_replace` in the search bar ensures that the "Replace
-        // *" buttons are rendered, so we can then simulate clicking the
-        // buttons.
-        search_bar.update_in(cx, |search_bar, window, cx| {
-            search_bar.toggle_replace(&ToggleReplace, window, cx)
-        });
-
-        search_bar.update_in(cx, |search_bar, window, cx| {
-            search_bar.replacement_editor.update(cx, |editor, cx| {
-                editor.set_text("great", window, cx);
-            });
-        });
-
-        // Focus on the editor instead of the search bar, as we want to ensure
-        // that pressing the "Replace Next Match" button will work, even if the
-        // search bar is not focused.
-        cx.focus(&editor);
-
-        // We'll not simulate clicking the "Replace Next Match " button, asserting that
-        // the replacement was done.
-        let button_bounds = cx
-            .debug_bounds("ICON-ReplaceNext")
-            .expect("'Replace Next Match' button should be visible");
-        cx.simulate_click(button_bounds.center(), gpui::Modifiers::none());
-
-        assert_eq!(
-            editor.read_with(cx, |editor, cx| editor.text(cx)),
-            "What a great day!"
-        );
-    }
-
-    struct ReplacementTestParams<'a> {
-        editor: &'a Entity<Editor>,
-        search_bar: &'a Entity<BufferSearchBar>,
-        cx: &'a mut VisualTestContext,
-        search_text: &'static str,
-        search_options: Option<SearchOptions>,
-        replacement_text: &'static str,
-        replace_all: bool,
-        expected_text: String,
-    }
-
-    async fn run_replacement_test(options: ReplacementTestParams<'_>) {
-        options
-            .search_bar
-            .update_in(options.cx, |search_bar, window, cx| {
-                if let Some(options) = options.search_options {
-                    search_bar.set_search_options(options, cx);
-                }
-                search_bar.search(
-                    options.search_text,
-                    options.search_options,
-                    true,
-                    window,
-                    cx,
-                )
-            })
-            .await
-            .unwrap();
-
-        options
-            .search_bar
-            .update_in(options.cx, |search_bar, window, cx| {
-                search_bar.replacement_editor.update(cx, |editor, cx| {
-                    editor.set_text(options.replacement_text, window, cx);
-                });
-
-                if options.replace_all {
-                    search_bar.replace_all(&ReplaceAll, window, cx)
-                } else {
-                    search_bar.replace_next(&ReplaceNext, window, cx)
-                }
-            });
-
-        assert_eq!(
-            options
-                .editor
-                .read_with(options.cx, |this, cx| { this.text(cx) }),
-            options.expected_text
-        );
-    }
-
-    #[perf]
-    #[gpui::test]
-    async fn test_replace_special_characters(cx: &mut TestAppContext) {
-        let (editor, search_bar, cx) = init_test(cx);
-
-        run_replacement_test(ReplacementTestParams {
-            editor: &editor,
-            search_bar: &search_bar,
-            cx,
-            search_text: "expression",
-            search_options: None,
-            replacement_text: r"\n",
-            replace_all: true,
-            expected_text: r#"
-            A regular \n (shortened as regex or regexp;[1] also referred to as
-            rational \n[2][3]) is a sequence of characters that specifies a search
-            pattern in text. Usually such patterns are used by string-searching algorithms
-            for "find" or "find and replace" operations on strings, or for input validation.
-            "#
-            .unindent(),
-        })
-        .await;
-
-        run_replacement_test(ReplacementTestParams {
-            editor: &editor,
-            search_bar: &search_bar,
-            cx,
-            search_text: "or",
-            search_options: Some(SearchOptions::WHOLE_WORD | SearchOptions::REGEX),
-            replacement_text: r"\\\n\\\\",
-            replace_all: false,
-            expected_text: r#"
-            A regular \n (shortened as regex \
-            \\ regexp;[1] also referred to as
-            rational \n[2][3]) is a sequence of characters that specifies a search
-            pattern in text. Usually such patterns are used by string-searching algorithms
-            for "find" or "find and replace" operations on strings, or for input validation.
-            "#
-            .unindent(),
-        })
-        .await;
-
-        run_replacement_test(ReplacementTestParams {
-            editor: &editor,
-            search_bar: &search_bar,
-            cx,
-            search_text: r"(that|used) ",
-            search_options: Some(SearchOptions::REGEX),
-            replacement_text: r"$1\n",
-            replace_all: true,
-            expected_text: r#"
-            A regular \n (shortened as regex \
-            \\ regexp;[1] also referred to as
-            rational \n[2][3]) is a sequence of characters that
-            specifies a search
-            pattern in text. Usually such patterns are used
-            by string-searching algorithms
-            for "find" or "find and replace" operations on strings, or for input validation.
-            "#
-            .unindent(),
-        })
-        .await;
-    }
-
-    #[perf]
-    #[gpui::test]
-    async fn test_find_matches_in_selections_singleton_buffer_multiple_selections(
-        cx: &mut TestAppContext,
-    ) {
-        init_globals(cx);
-        let buffer = cx.new(|cx| {
-            Buffer::local(
-                r#"
-                aaa bbb aaa ccc
-                aaa bbb aaa ccc
-                aaa bbb aaa ccc
-                aaa bbb aaa ccc
-                aaa bbb aaa ccc
-                aaa bbb aaa ccc
-                "#
-                .unindent(),
-                cx,
-            )
-        });
-        let cx = cx.add_empty_window();
-        let editor =
-            cx.new_window_entity(|window, cx| Editor::for_buffer(buffer.clone(), None, window, cx));
-
-        let search_bar = cx.new_window_entity(|window, cx| {
-            let mut search_bar = BufferSearchBar::new(None, window, cx);
-            search_bar.set_active_pane_item(Some(&editor), window, cx);
-            search_bar.show(window, cx);
-            search_bar
-        });
-
-        editor.update_in(cx, |editor, window, cx| {
-            editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                s.select_ranges(vec![Point::new(1, 0)..Point::new(2, 4)])
-            })
-        });
-
-        search_bar.update_in(cx, |search_bar, window, cx| {
-            let deploy = Deploy {
-                focus: true,
-                replace_enabled: false,
-                selection_search_enabled: true,
-            };
-            search_bar.deploy(&deploy, window, cx);
-        });
-
-        cx.run_until_parked();
-
-        search_bar
-            .update_in(cx, |search_bar, window, cx| {
-                search_bar.search("aaa", None, true, window, cx)
-            })
-            .await
-            .unwrap();
-
-        editor.update(cx, |editor, cx| {
-            assert_eq!(
-                editor.search_background_highlights(cx),
-                &[
-                    Point::new(1, 0)..Point::new(1, 3),
-                    Point::new(1, 8)..Point::new(1, 11),
-                    Point::new(2, 0)..Point::new(2, 3),
-                ]
-            );
-        });
-    }
-
-    #[perf]
-    #[gpui::test]
-    async fn test_find_matches_in_selections_multiple_excerpts_buffer_multiple_selections(
-        cx: &mut TestAppContext,
-    ) {
-        init_globals(cx);
-        let text = r#"
-            aaa bbb aaa ccc
-            aaa bbb aaa ccc
-            aaa bbb aaa ccc
-            aaa bbb aaa ccc
-            aaa bbb aaa ccc
-            aaa bbb aaa ccc
-
-            aaa bbb aaa ccc
-            aaa bbb aaa ccc
-            aaa bbb aaa ccc
-            aaa bbb aaa ccc
-            aaa bbb aaa ccc
-            aaa bbb aaa ccc
-            "#
-        .unindent();
-
-        let cx = cx.add_empty_window();
-        let editor = cx.new_window_entity(|window, cx| {
-            let multibuffer = MultiBuffer::build_multi(
-                [
-                    (
-                        &text,
-                        vec![
-                            Point::new(0, 0)..Point::new(2, 0),
-                            Point::new(4, 0)..Point::new(5, 0),
-                        ],
-                    ),
-                    (&text, vec![Point::new(9, 0)..Point::new(11, 0)]),
-                ],
-                cx,
-            );
-            Editor::for_multibuffer(multibuffer, None, window, cx)
-        });
-
-        let search_bar = cx.new_window_entity(|window, cx| {
-            let mut search_bar = BufferSearchBar::new(None, window, cx);
-            search_bar.set_active_pane_item(Some(&editor), window, cx);
-            search_bar.show(window, cx);
-            search_bar
-        });
-
-        editor.update_in(cx, |editor, window, cx| {
-            editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                s.select_ranges(vec![
-                    Point::new(1, 0)..Point::new(1, 4),
-                    Point::new(5, 3)..Point::new(6, 4),
-                ])
-            })
-        });
-
-        search_bar.update_in(cx, |search_bar, window, cx| {
-            let deploy = Deploy {
-                focus: true,
-                replace_enabled: false,
-                selection_search_enabled: true,
-            };
-            search_bar.deploy(&deploy, window, cx);
-        });
-
-        cx.run_until_parked();
-
-        search_bar
-            .update_in(cx, |search_bar, window, cx| {
-                search_bar.search("aaa", None, true, window, cx)
-            })
-            .await
-            .unwrap();
-
-        editor.update(cx, |editor, cx| {
-            assert_eq!(
-                editor.search_background_highlights(cx),
-                &[
-                    Point::new(1, 0)..Point::new(1, 3),
-                    Point::new(5, 8)..Point::new(5, 11),
-                    Point::new(6, 0)..Point::new(6, 3),
-                ]
-            );
-        });
-    }
-
-    #[perf]
-    #[gpui::test]
-    async fn test_invalid_regexp_search_after_valid(cx: &mut TestAppContext) {
-        let (editor, search_bar, cx) = init_test(cx);
-        // Search using valid regexp
-        search_bar
-            .update_in(cx, |search_bar, window, cx| {
-                search_bar.enable_search_option(SearchOptions::REGEX, window, cx);
-                search_bar.search("expression", None, true, window, cx)
-            })
-            .await
-            .unwrap();
-        editor.update_in(cx, |editor, window, cx| {
-            assert_eq!(
-                display_points_of(editor.all_text_background_highlights(window, cx)),
-                &[
-                    DisplayPoint::new(DisplayRow(0), 10)..DisplayPoint::new(DisplayRow(0), 20),
-                    DisplayPoint::new(DisplayRow(1), 9)..DisplayPoint::new(DisplayRow(1), 19),
-                ],
-            );
-        });
-
-        // Now, the expression is invalid
-        search_bar
-            .update_in(cx, |search_bar, window, cx| {
-                search_bar.search("expression (", None, true, window, cx)
-            })
-            .await
-            .unwrap_err();
-        editor.update_in(cx, |editor, window, cx| {
-            assert!(
-                display_points_of(editor.all_text_background_highlights(window, cx)).is_empty(),
-            );
-        });
-    }
-
-    #[perf]
-    #[gpui::test]
-    async fn test_search_options_changes(cx: &mut TestAppContext) {
-        let (_editor, search_bar, cx) = init_test(cx);
-        update_search_settings(
-            SearchSettings {
-                button: true,
-                whole_word: false,
-                case_sensitive: false,
-                include_ignored: false,
-                regex: false,
-                center_on_match: false,
-            },
-            cx,
-        );
-
-        let deploy = Deploy {
-            focus: true,
-            replace_enabled: false,
-            selection_search_enabled: true,
-        };
-
-        search_bar.update_in(cx, |search_bar, window, cx| {
-            assert_eq!(
-                search_bar.search_options,
-                SearchOptions::NONE,
-                "Should have no search options enabled by default"
-            );
-            search_bar.toggle_search_option(SearchOptions::WHOLE_WORD, window, cx);
-            assert_eq!(
-                search_bar.search_options,
-                SearchOptions::WHOLE_WORD,
-                "Should enable the option toggled"
-            );
-            assert!(
-                !search_bar.dismissed,
-                "Search bar should be present and visible"
-            );
-            search_bar.deploy(&deploy, window, cx);
-            assert_eq!(
-                search_bar.search_options,
-                SearchOptions::WHOLE_WORD,
-                "After (re)deploying, the option should still be enabled"
-            );
-
-            search_bar.dismiss(&Dismiss, window, cx);
-            search_bar.deploy(&deploy, window, cx);
-            assert_eq!(
-                search_bar.search_options,
-                SearchOptions::WHOLE_WORD,
-                "After hiding and showing the search bar, search options should be preserved"
-            );
-
-            search_bar.toggle_search_option(SearchOptions::REGEX, window, cx);
-            search_bar.toggle_search_option(SearchOptions::WHOLE_WORD, window, cx);
-            assert_eq!(
-                search_bar.search_options,
-                SearchOptions::REGEX,
-                "Should enable the options toggled"
-            );
-            assert!(
-                !search_bar.dismissed,
-                "Search bar should be present and visible"
-            );
-            search_bar.toggle_search_option(SearchOptions::WHOLE_WORD, window, cx);
-        });
-
-        update_search_settings(
-            SearchSettings {
-                button: true,
-                whole_word: false,
-                case_sensitive: true,
-                include_ignored: false,
-                regex: false,
-                center_on_match: false,
-            },
-            cx,
-        );
-        search_bar.update_in(cx, |search_bar, window, cx| {
-            assert_eq!(
-                search_bar.search_options,
-                SearchOptions::REGEX | SearchOptions::WHOLE_WORD,
-                "Should have no search options enabled by default"
-            );
-
-            search_bar.deploy(&deploy, window, cx);
-            assert_eq!(
-                search_bar.search_options,
-                SearchOptions::REGEX | SearchOptions::WHOLE_WORD,
-                "Toggling a non-dismissed search bar with custom options should not change the default options"
-            );
-            search_bar.dismiss(&Dismiss, window, cx);
-            search_bar.deploy(&deploy, window, cx);
-            assert_eq!(
-                search_bar.configured_options,
-                SearchOptions::CASE_SENSITIVE,
-                "After a settings update and toggling the search bar, configured options should be updated"
-            );
-            assert_eq!(
-                search_bar.search_options,
-                SearchOptions::CASE_SENSITIVE,
-                "After a settings update and toggling the search bar, configured options should be used"
-            );
-        });
-
-        update_search_settings(
-            SearchSettings {
-                button: true,
-                whole_word: true,
-                case_sensitive: true,
-                include_ignored: false,
-                regex: false,
-                center_on_match: false,
-            },
-            cx,
-        );
-
-        search_bar.update_in(cx, |search_bar, window, cx| {
-            search_bar.deploy(&deploy, window, cx);
-            search_bar.dismiss(&Dismiss, window, cx);
-            search_bar.show(window, cx);
-            assert_eq!(
-                search_bar.search_options,
-                SearchOptions::CASE_SENSITIVE | SearchOptions::WHOLE_WORD,
-                "Calling deploy on an already deployed search bar should not prevent settings updates from being detected"
-            );
-        });
-    }
-
-    #[gpui::test]
-    async fn test_select_occurrence_case_sensitivity(cx: &mut TestAppContext) {
-        let (editor, search_bar, cx) = init_test(cx);
-        let mut editor_cx = EditorTestContext::for_editor_in(editor, cx).await;
-
-        // Start with case sensitive search settings.
-        let mut search_settings = SearchSettings::default();
-        search_settings.case_sensitive = true;
-        update_search_settings(search_settings, cx);
-        search_bar.update(cx, |search_bar, cx| {
-            let mut search_options = search_bar.search_options;
-            search_options.insert(SearchOptions::CASE_SENSITIVE);
-            search_bar.set_search_options(search_options, cx);
-        });
-
-        editor_cx.set_state("«ˇfoo»\nFOO\nFoo\nfoo");
-        editor_cx.update_editor(|e, window, cx| {
-            e.select_next(&Default::default(), window, cx).unwrap();
-        });
-        editor_cx.assert_editor_state("«ˇfoo»\nFOO\nFoo\n«ˇfoo»");
-
-        // Update the search bar's case sensitivite toggle, so we can later
-        // confirm that `select_next` will now be case-insensitive.
-        editor_cx.set_state("«ˇfoo»\nFOO\nFoo\nfoo");
-        search_bar.update_in(cx, |search_bar, window, cx| {
-            search_bar.toggle_case_sensitive(&Default::default(), window, cx);
-        });
-        editor_cx.update_editor(|e, window, cx| {
-            e.select_next(&Default::default(), window, cx).unwrap();
-        });
-        editor_cx.assert_editor_state("«ˇfoo»\n«ˇFOO»\nFoo\nfoo");
-
-        // Confirm that, after dismissing the search bar, only the editor's
-        // search settings actually affect the behavior of `select_next`.
-        search_bar.update_in(cx, |search_bar, window, cx| {
-            search_bar.dismiss(&Default::default(), window, cx);
-        });
-        editor_cx.set_state("«ˇfoo»\nFOO\nFoo\nfoo");
-        editor_cx.update_editor(|e, window, cx| {
-            e.select_next(&Default::default(), window, cx).unwrap();
-        });
-        editor_cx.assert_editor_state("«ˇfoo»\nFOO\nFoo\n«ˇfoo»");
-
-        // Update the editor's search settings, disabling case sensitivity, to
-        // check that the value is respected.
-        let mut search_settings = SearchSettings::default();
-        search_settings.case_sensitive = false;
-        update_search_settings(search_settings, cx);
-        editor_cx.set_state("«ˇfoo»\nFOO\nFoo\nfoo");
-        editor_cx.update_editor(|e, window, cx| {
-            e.select_next(&Default::default(), window, cx).unwrap();
-        });
-        editor_cx.assert_editor_state("«ˇfoo»\n«ˇFOO»\nFoo\nfoo");
-    }
-
-    fn update_search_settings(search_settings: SearchSettings, cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |settings| {
-                    settings.editor.search = Some(SearchSettingsContent {
-                        button: Some(search_settings.button),
-                        whole_word: Some(search_settings.whole_word),
-                        case_sensitive: Some(search_settings.case_sensitive),
-                        include_ignored: Some(search_settings.include_ignored),
-                        regex: Some(search_settings.regex),
-                        center_on_match: Some(search_settings.center_on_match),
-                    });
-                });
-            });
-        });
-    }
-}
diff --git a/crates/search/src/buffer_search/registrar.rs b/crates/search/src/buffer_search/registrar.rs
deleted file mode 100644
index 2c640e67ce..0000000000
--- a/crates/search/src/buffer_search/registrar.rs
+++ /dev/null
@@ -1,176 +0,0 @@
-use gpui::{Action, Context, Div, Entity, InteractiveElement, Window, div};
-use workspace::Workspace;
-
-use crate::BufferSearchBar;
-
-/// Registrar inverts the dependency between search and its downstream user, allowing said downstream user to register search action without knowing exactly what those actions are.
-pub trait SearchActionsRegistrar {
-    fn register_handler<A: Action>(&mut self, callback: impl ActionExecutor<A>);
-}
-
-type SearchBarActionCallback<A> =
-    fn(&mut BufferSearchBar, &A, &mut Window, &mut Context<BufferSearchBar>);
-
-type GetSearchBar<T> =
-    for<'a, 'b> fn(&'a T, &'a mut Window, &mut Context<'b, T>) -> Option<Entity<BufferSearchBar>>;
-
-/// Registers search actions on a div that can be taken out.
-pub struct DivRegistrar<'a, 'b, T: 'static> {
-    div: Option<Div>,
-    cx: &'a mut Context<'b, T>,
-    search_getter: GetSearchBar<T>,
-}
-
-impl<'a, 'b, T: 'static> DivRegistrar<'a, 'b, T> {
-    pub fn new(search_getter: GetSearchBar<T>, cx: &'a mut Context<'b, T>) -> Self {
-        Self {
-            div: Some(div()),
-            cx,
-            search_getter,
-        }
-    }
-    pub fn into_div(self) -> Div {
-        // This option is always Some; it's an option in the first place because we want to call methods
-        // on div that require ownership.
-        self.div.unwrap()
-    }
-}
-
-impl<T: 'static> SearchActionsRegistrar for DivRegistrar<'_, '_, T> {
-    fn register_handler<A: Action>(&mut self, callback: impl ActionExecutor<A>) {
-        let getter = self.search_getter;
-        self.div = self.div.take().map(|div| {
-            div.on_action(self.cx.listener(move |this, action, window, cx| {
-                let should_notify = (getter)(this, window, cx)
-                    .map(|search_bar| {
-                        search_bar.update(cx, |search_bar, cx| {
-                            callback.execute(search_bar, action, window, cx)
-                        })
-                    })
-                    .unwrap_or(false);
-                if should_notify {
-                    cx.notify();
-                } else {
-                    cx.propagate();
-                }
-            }))
-        });
-    }
-}
-
-/// Register actions for an active pane.
-impl SearchActionsRegistrar for Workspace {
-    fn register_handler<A: Action>(&mut self, callback: impl ActionExecutor<A>) {
-        self.register_action(move |workspace, action: &A, window, cx| {
-            if workspace.has_active_modal(window, cx) && !workspace.hide_modal(window, cx) {
-                cx.propagate();
-                return;
-            }
-
-            let pane = workspace.active_pane();
-            let callback = callback.clone();
-            pane.update(cx, |this, cx| {
-                this.toolbar().update(cx, move |this, cx| {
-                    if let Some(search_bar) = this.item_of_type::<BufferSearchBar>() {
-                        let should_notify = search_bar.update(cx, move |search_bar, cx| {
-                            callback.execute(search_bar, action, window, cx)
-                        });
-                        if should_notify {
-                            cx.notify();
-                        } else {
-                            cx.propagate();
-                        }
-                    }
-                })
-            });
-        });
-    }
-}
-
-type DidHandleAction = bool;
-/// Potentially executes the underlying action if some preconditions are met (e.g. buffer search bar is visible)
-pub trait ActionExecutor<A: Action>: 'static + Clone {
-    fn execute(
-        &self,
-        search_bar: &mut BufferSearchBar,
-        action: &A,
-        window: &mut Window,
-        cx: &mut Context<BufferSearchBar>,
-    ) -> DidHandleAction;
-}
-
-/// Run an action when the search bar has been dismissed from the panel.
-pub struct ForDismissed<A>(pub(super) SearchBarActionCallback<A>);
-impl<A> Clone for ForDismissed<A> {
-    fn clone(&self) -> Self {
-        Self(self.0)
-    }
-}
-
-impl<A: Action> ActionExecutor<A> for ForDismissed<A> {
-    fn execute(
-        &self,
-        search_bar: &mut BufferSearchBar,
-        action: &A,
-        window: &mut Window,
-        cx: &mut Context<BufferSearchBar>,
-    ) -> DidHandleAction {
-        if search_bar.is_dismissed() {
-            self.0(search_bar, action, window, cx);
-            true
-        } else {
-            false
-        }
-    }
-}
-
-/// Run an action when the search bar is deployed.
-pub struct ForDeployed<A>(pub(super) SearchBarActionCallback<A>);
-impl<A> Clone for ForDeployed<A> {
-    fn clone(&self) -> Self {
-        Self(self.0)
-    }
-}
-
-impl<A: Action> ActionExecutor<A> for ForDeployed<A> {
-    fn execute(
-        &self,
-        search_bar: &mut BufferSearchBar,
-        action: &A,
-        window: &mut Window,
-        cx: &mut Context<BufferSearchBar>,
-    ) -> DidHandleAction {
-        if search_bar.is_dismissed() || search_bar.active_searchable_item.is_none() {
-            false
-        } else {
-            self.0(search_bar, action, window, cx);
-            true
-        }
-    }
-}
-
-/// Run an action when the search bar has any matches, regardless of whether it
-/// is visible or not.
-pub struct WithResults<A>(pub(super) SearchBarActionCallback<A>);
-impl<A> Clone for WithResults<A> {
-    fn clone(&self) -> Self {
-        Self(self.0)
-    }
-}
-
-impl<A: Action> ActionExecutor<A> for WithResults<A> {
-    fn execute(
-        &self,
-        search_bar: &mut BufferSearchBar,
-        action: &A,
-        window: &mut Window,
-        cx: &mut Context<BufferSearchBar>,
-    ) -> DidHandleAction {
-        if search_bar.active_match_index.is_some() {
-            self.0(search_bar, action, window, cx);
-            true
-        } else {
-            false
-        }
-    }
-}
diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs
deleted file mode 100644
index a9ca77a5b8..0000000000
--- a/crates/search/src/project_search.rs
+++ /dev/null
@@ -1,4690 +0,0 @@
-use crate::{
-    BufferSearchBar, FocusSearch, NextHistoryQuery, PreviousHistoryQuery, ReplaceAll, ReplaceNext,
-    SearchOption, SearchOptions, SearchSource, SelectNextMatch, SelectPreviousMatch,
-    ToggleCaseSensitive, ToggleIncludeIgnored, ToggleRegex, ToggleReplace, ToggleWholeWord,
-    buffer_search::Deploy,
-    search_bar::{ActionButtonState, input_base_styles, render_action_button, render_text_input},
-};
-use anyhow::Context as _;
-use collections::HashMap;
-use editor::{
-    Anchor, Editor, EditorEvent, EditorSettings, MAX_TAB_TITLE_LEN, MultiBuffer, PathKey,
-    SelectionEffects,
-    actions::{Backtab, SelectAll, Tab},
-    items::active_match_index,
-    multibuffer_context_lines,
-    scroll::Autoscroll,
-};
-use futures::{StreamExt, stream::FuturesOrdered};
-use gpui::{
-    Action, AnyElement, App, Axis, Context, Entity, EntityId, EventEmitter, FocusHandle, Focusable,
-    Global, Hsla, InteractiveElement, IntoElement, KeyContext, ParentElement, Point, Render,
-    SharedString, Styled, Subscription, Task, UpdateGlobal, WeakEntity, Window, actions, div,
-};
-use itertools::Itertools;
-use language::{Buffer, Language};
-use menu::Confirm;
-use project::{
-    Project, ProjectPath,
-    search::{SearchInputKind, SearchQuery},
-    search_history::SearchHistoryCursor,
-};
-use settings::Settings;
-use std::{
-    any::{Any, TypeId},
-    mem,
-    ops::{Not, Range},
-    pin::pin,
-    sync::Arc,
-};
-use ui::{IconButtonShape, KeyBinding, Toggleable, Tooltip, prelude::*, utils::SearchInputWidth};
-use util::{ResultExt as _, paths::PathMatcher, rel_path::RelPath};
-use workspace::{
-    DeploySearch, ItemNavHistory, NewSearch, ToolbarItemEvent, ToolbarItemLocation,
-    ToolbarItemView, Workspace, WorkspaceId,
-    item::{BreadcrumbText, Item, ItemEvent, ItemHandle, SaveOptions},
-    searchable::{Direction, SearchableItem, SearchableItemHandle},
-};
-
-actions!(
-    project_search,
-    [
-        /// Searches in a new project search tab.
-        SearchInNew,
-        /// Toggles focus between the search bar and the search results.
-        ToggleFocus,
-        /// Moves to the next input field.
-        NextField,
-        /// Toggles the search filters panel.
-        ToggleFilters,
-        /// Toggles collapse/expand state of all search result excerpts.
-        ToggleAllSearchResults
-    ]
-);
-
-#[derive(Default)]
-struct ActiveSettings(HashMap<WeakEntity<Project>, ProjectSearchSettings>);
-
-impl Global for ActiveSettings {}
-
-pub fn init(cx: &mut App) {
-    cx.set_global(ActiveSettings::default());
-    cx.observe_new(|workspace: &mut Workspace, _window, _cx| {
-        register_workspace_action(workspace, move |search_bar, _: &Deploy, window, cx| {
-            search_bar.focus_search(window, cx);
-        });
-        register_workspace_action(workspace, move |search_bar, _: &FocusSearch, window, cx| {
-            search_bar.focus_search(window, cx);
-        });
-        register_workspace_action(
-            workspace,
-            move |search_bar, _: &ToggleFilters, window, cx| {
-                search_bar.toggle_filters(window, cx);
-            },
-        );
-        register_workspace_action(
-            workspace,
-            move |search_bar, _: &ToggleCaseSensitive, window, cx| {
-                search_bar.toggle_search_option(SearchOptions::CASE_SENSITIVE, window, cx);
-            },
-        );
-        register_workspace_action(
-            workspace,
-            move |search_bar, _: &ToggleWholeWord, window, cx| {
-                search_bar.toggle_search_option(SearchOptions::WHOLE_WORD, window, cx);
-            },
-        );
-        register_workspace_action(workspace, move |search_bar, _: &ToggleRegex, window, cx| {
-            search_bar.toggle_search_option(SearchOptions::REGEX, window, cx);
-        });
-        register_workspace_action(
-            workspace,
-            move |search_bar, action: &ToggleReplace, window, cx| {
-                search_bar.toggle_replace(action, window, cx)
-            },
-        );
-        register_workspace_action(
-            workspace,
-            move |search_bar, action: &SelectPreviousMatch, window, cx| {
-                search_bar.select_prev_match(action, window, cx)
-            },
-        );
-        register_workspace_action(
-            workspace,
-            move |search_bar, action: &SelectNextMatch, window, cx| {
-                search_bar.select_next_match(action, window, cx)
-            },
-        );
-
-        // Only handle search_in_new if there is a search present
-        register_workspace_action_for_present_search(workspace, |workspace, action, window, cx| {
-            ProjectSearchView::search_in_new(workspace, action, window, cx)
-        });
-
-        register_workspace_action_for_present_search(
-            workspace,
-            |workspace, action: &ToggleAllSearchResults, window, cx| {
-                if let Some(search_view) = workspace
-                    .active_item(cx)
-                    .and_then(|item| item.downcast::<ProjectSearchView>())
-                {
-                    search_view.update(cx, |search_view, cx| {
-                        search_view.toggle_all_search_results(action, window, cx);
-                    });
-                }
-            },
-        );
-
-        register_workspace_action_for_present_search(
-            workspace,
-            |workspace, _: &menu::Cancel, window, cx| {
-                if let Some(project_search_bar) = workspace
-                    .active_pane()
-                    .read(cx)
-                    .toolbar()
-                    .read(cx)
-                    .item_of_type::<ProjectSearchBar>()
-                {
-                    project_search_bar.update(cx, |project_search_bar, cx| {
-                        let search_is_focused = project_search_bar
-                            .active_project_search
-                            .as_ref()
-                            .is_some_and(|search_view| {
-                                search_view
-                                    .read(cx)
-                                    .query_editor
-                                    .read(cx)
-                                    .focus_handle(cx)
-                                    .is_focused(window)
-                            });
-                        if search_is_focused {
-                            project_search_bar.move_focus_to_results(window, cx);
-                        } else {
-                            project_search_bar.focus_search(window, cx)
-                        }
-                    });
-                } else {
-                    cx.propagate();
-                }
-            },
-        );
-
-        // Both on present and dismissed search, we need to unconditionally handle those actions to focus from the editor.
-        workspace.register_action(move |workspace, action: &DeploySearch, window, cx| {
-            if workspace.has_active_modal(window, cx) && !workspace.hide_modal(window, cx) {
-                cx.propagate();
-                return;
-            }
-            ProjectSearchView::deploy_search(workspace, action, window, cx);
-            cx.notify();
-        });
-        workspace.register_action(move |workspace, action: &NewSearch, window, cx| {
-            if workspace.has_active_modal(window, cx) && !workspace.hide_modal(window, cx) {
-                cx.propagate();
-                return;
-            }
-            ProjectSearchView::new_search(workspace, action, window, cx);
-            cx.notify();
-        });
-    })
-    .detach();
-}
-
-fn contains_uppercase(str: &str) -> bool {
-    str.chars().any(|c| c.is_uppercase())
-}
-
-pub struct ProjectSearch {
-    project: Entity<Project>,
-    excerpts: Entity<MultiBuffer>,
-    pending_search: Option<Task<Option<()>>>,
-    match_ranges: Vec<Range<Anchor>>,
-    active_query: Option<SearchQuery>,
-    last_search_query_text: Option<String>,
-    search_id: usize,
-    no_results: Option<bool>,
-    limit_reached: bool,
-    search_history_cursor: SearchHistoryCursor,
-    search_included_history_cursor: SearchHistoryCursor,
-    search_excluded_history_cursor: SearchHistoryCursor,
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-enum InputPanel {
-    Query,
-    Replacement,
-    Exclude,
-    Include,
-}
-
-pub struct ProjectSearchView {
-    workspace: WeakEntity<Workspace>,
-    focus_handle: FocusHandle,
-    entity: Entity<ProjectSearch>,
-    query_editor: Entity<Editor>,
-    replacement_editor: Entity<Editor>,
-    results_editor: Entity<Editor>,
-    search_options: SearchOptions,
-    panels_with_errors: HashMap<InputPanel, String>,
-    active_match_index: Option<usize>,
-    search_id: usize,
-    included_files_editor: Entity<Editor>,
-    excluded_files_editor: Entity<Editor>,
-    filters_enabled: bool,
-    replace_enabled: bool,
-    included_opened_only: bool,
-    regex_language: Option<Arc<Language>>,
-    results_collapsed: bool,
-    _subscriptions: Vec<Subscription>,
-}
-
-#[derive(Debug, Clone)]
-pub struct ProjectSearchSettings {
-    search_options: SearchOptions,
-    filters_enabled: bool,
-}
-
-pub struct ProjectSearchBar {
-    active_project_search: Option<Entity<ProjectSearchView>>,
-    subscription: Option<Subscription>,
-}
-
-impl ProjectSearch {
-    pub fn new(project: Entity<Project>, cx: &mut Context<Self>) -> Self {
-        let capability = project.read(cx).capability();
-
-        Self {
-            project,
-            excerpts: cx.new(|_| MultiBuffer::new(capability)),
-            pending_search: Default::default(),
-            match_ranges: Default::default(),
-            active_query: None,
-            last_search_query_text: None,
-            search_id: 0,
-            no_results: None,
-            limit_reached: false,
-            search_history_cursor: Default::default(),
-            search_included_history_cursor: Default::default(),
-            search_excluded_history_cursor: Default::default(),
-        }
-    }
-
-    fn clone(&self, cx: &mut Context<Self>) -> Entity<Self> {
-        cx.new(|cx| Self {
-            project: self.project.clone(),
-            excerpts: self
-                .excerpts
-                .update(cx, |excerpts, cx| cx.new(|cx| excerpts.clone(cx))),
-            pending_search: Default::default(),
-            match_ranges: self.match_ranges.clone(),
-            active_query: self.active_query.clone(),
-            last_search_query_text: self.last_search_query_text.clone(),
-            search_id: self.search_id,
-            no_results: self.no_results,
-            limit_reached: self.limit_reached,
-            search_history_cursor: self.search_history_cursor.clone(),
-            search_included_history_cursor: self.search_included_history_cursor.clone(),
-            search_excluded_history_cursor: self.search_excluded_history_cursor.clone(),
-        })
-    }
-    fn cursor(&self, kind: SearchInputKind) -> &SearchHistoryCursor {
-        match kind {
-            SearchInputKind::Query => &self.search_history_cursor,
-            SearchInputKind::Include => &self.search_included_history_cursor,
-            SearchInputKind::Exclude => &self.search_excluded_history_cursor,
-        }
-    }
-    fn cursor_mut(&mut self, kind: SearchInputKind) -> &mut SearchHistoryCursor {
-        match kind {
-            SearchInputKind::Query => &mut self.search_history_cursor,
-            SearchInputKind::Include => &mut self.search_included_history_cursor,
-            SearchInputKind::Exclude => &mut self.search_excluded_history_cursor,
-        }
-    }
-
-    fn search(&mut self, query: SearchQuery, cx: &mut Context<Self>) {
-        let search = self.project.update(cx, |project, cx| {
-            project
-                .search_history_mut(SearchInputKind::Query)
-                .add(&mut self.search_history_cursor, query.as_str().to_string());
-            let included = query.as_inner().files_to_include().sources().join(",");
-            if !included.is_empty() {
-                project
-                    .search_history_mut(SearchInputKind::Include)
-                    .add(&mut self.search_included_history_cursor, included);
-            }
-            let excluded = query.as_inner().files_to_exclude().sources().join(",");
-            if !excluded.is_empty() {
-                project
-                    .search_history_mut(SearchInputKind::Exclude)
-                    .add(&mut self.search_excluded_history_cursor, excluded);
-            }
-            project.search(query.clone(), cx)
-        });
-        self.last_search_query_text = Some(query.as_str().to_string());
-        self.search_id += 1;
-        self.active_query = Some(query);
-        self.match_ranges.clear();
-        self.pending_search = Some(cx.spawn(async move |project_search, cx| {
-            let mut matches = pin!(search.ready_chunks(1024));
-            project_search
-                .update(cx, |project_search, cx| {
-                    project_search.match_ranges.clear();
-                    project_search
-                        .excerpts
-                        .update(cx, |excerpts, cx| excerpts.clear(cx));
-                    project_search.no_results = Some(true);
-                    project_search.limit_reached = false;
-                })
-                .ok()?;
-
-            let mut limit_reached = false;
-            while let Some(results) = matches.next().await {
-                let (buffers_with_ranges, has_reached_limit) = cx
-                    .background_executor()
-                    .spawn(async move {
-                        let mut limit_reached = false;
-                        let mut buffers_with_ranges = Vec::with_capacity(results.len());
-                        for result in results {
-                            match result {
-                                project::search::SearchResult::Buffer { buffer, ranges } => {
-                                    buffers_with_ranges.push((buffer, ranges));
-                                }
-                                project::search::SearchResult::LimitReached => {
-                                    limit_reached = true;
-                                }
-                            }
-                        }
-                        (buffers_with_ranges, limit_reached)
-                    })
-                    .await;
-                limit_reached |= has_reached_limit;
-                let mut new_ranges = project_search
-                    .update(cx, |project_search, cx| {
-                        project_search.excerpts.update(cx, |excerpts, cx| {
-                            buffers_with_ranges
-                                .into_iter()
-                                .map(|(buffer, ranges)| {
-                                    excerpts.set_anchored_excerpts_for_path(
-                                        PathKey::for_buffer(&buffer, cx),
-                                        buffer,
-                                        ranges,
-                                        multibuffer_context_lines(cx),
-                                        cx,
-                                    )
-                                })
-                                .collect::<FuturesOrdered<_>>()
-                        })
-                    })
-                    .ok()?;
-                while let Some(new_ranges) = new_ranges.next().await {
-                    // `new_ranges.next().await` likely never gets hit while still pending so `async_task`
-                    // will not reschedule, starving other front end tasks, insert a yield point for that here
-                    smol::future::yield_now().await;
-                    project_search
-                        .update(cx, |project_search, cx| {
-                            project_search.match_ranges.extend(new_ranges);
-                            cx.notify();
-                        })
-                        .ok()?;
-                }
-            }
-
-            project_search
-                .update(cx, |project_search, cx| {
-                    if !project_search.match_ranges.is_empty() {
-                        project_search.no_results = Some(false);
-                    }
-                    project_search.limit_reached = limit_reached;
-                    project_search.pending_search.take();
-                    cx.notify();
-                })
-                .ok()?;
-
-            None
-        }));
-        cx.notify();
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum ViewEvent {
-    UpdateTab,
-    Activate,
-    EditorEvent(editor::EditorEvent),
-    Dismiss,
-}
-
-impl EventEmitter<ViewEvent> for ProjectSearchView {}
-
-impl Render for ProjectSearchView {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        if self.has_matches() {
-            div()
-                .flex_1()
-                .size_full()
-                .track_focus(&self.focus_handle(cx))
-                .child(self.results_editor.clone())
-        } else {
-            let model = self.entity.read(cx);
-            let has_no_results = model.no_results.unwrap_or(false);
-            let is_search_underway = model.pending_search.is_some();
-
-            let heading_text = if is_search_underway {
-                "Searching…"
-            } else if has_no_results {
-                "No Results"
-            } else {
-                "Search All Files"
-            };
-
-            let heading_text = div()
-                .justify_center()
-                .child(Label::new(heading_text).size(LabelSize::Large));
-
-            let page_content: Option<AnyElement> = if let Some(no_results) = model.no_results {
-                if model.pending_search.is_none() && no_results {
-                    Some(
-                        Label::new("No results found in this project for the provided query")
-                            .size(LabelSize::Small)
-                            .into_any_element(),
-                    )
-                } else {
-                    None
-                }
-            } else {
-                Some(self.landing_text_minor(cx).into_any_element())
-            };
-
-            let page_content = page_content.map(|text| div().child(text));
-
-            h_flex()
-                .size_full()
-                .items_center()
-                .justify_center()
-                .overflow_hidden()
-                .bg(cx.theme().colors().editor_background)
-                .track_focus(&self.focus_handle(cx))
-                .child(
-                    v_flex()
-                        .id("project-search-landing-page")
-                        .overflow_y_scroll()
-                        .gap_1()
-                        .child(heading_text)
-                        .children(page_content),
-                )
-        }
-    }
-}
-
-impl Focusable for ProjectSearchView {
-    fn focus_handle(&self, _: &App) -> gpui::FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl Item for ProjectSearchView {
-    type Event = ViewEvent;
-    fn tab_tooltip_text(&self, cx: &App) -> Option<SharedString> {
-        let query_text = self.query_editor.read(cx).text(cx);
-
-        query_text
-            .is_empty()
-            .not()
-            .then(|| query_text.into())
-            .or_else(|| Some("Project Search".into()))
-    }
-
-    fn act_as_type<'a>(
-        &'a self,
-        type_id: TypeId,
-        self_handle: &'a Entity<Self>,
-        _: &'a App,
-    ) -> Option<gpui::AnyEntity> {
-        if type_id == TypeId::of::<Self>() {
-            Some(self_handle.clone().into())
-        } else if type_id == TypeId::of::<Editor>() {
-            Some(self.results_editor.clone().into())
-        } else {
-            None
-        }
-    }
-    fn as_searchable(&self, _: &Entity<Self>, _: &App) -> Option<Box<dyn SearchableItemHandle>> {
-        Some(Box::new(self.results_editor.clone()))
-    }
-
-    fn deactivated(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.results_editor
-            .update(cx, |editor, cx| editor.deactivated(window, cx));
-    }
-
-    fn tab_icon(&self, _window: &Window, _cx: &App) -> Option<Icon> {
-        Some(Icon::new(IconName::MagnifyingGlass))
-    }
-
-    fn tab_content_text(&self, _detail: usize, cx: &App) -> SharedString {
-        let last_query: Option<SharedString> = self
-            .entity
-            .read(cx)
-            .last_search_query_text
-            .as_ref()
-            .map(|query| {
-                let query = query.replace('\n', "");
-                let query_text = util::truncate_and_trailoff(&query, MAX_TAB_TITLE_LEN);
-                query_text.into()
-            });
-
-        last_query
-            .filter(|query| !query.is_empty())
-            .unwrap_or_else(|| "Project Search".into())
-    }
-
-    fn telemetry_event_text(&self) -> Option<&'static str> {
-        Some("Project Search Opened")
-    }
-
-    fn for_each_project_item(
-        &self,
-        cx: &App,
-        f: &mut dyn FnMut(EntityId, &dyn project::ProjectItem),
-    ) {
-        self.results_editor.for_each_project_item(cx, f)
-    }
-
-    fn can_save(&self, _: &App) -> bool {
-        true
-    }
-
-    fn is_dirty(&self, cx: &App) -> bool {
-        self.results_editor.read(cx).is_dirty(cx)
-    }
-
-    fn has_conflict(&self, cx: &App) -> bool {
-        self.results_editor.read(cx).has_conflict(cx)
-    }
-
-    fn save(
-        &mut self,
-        options: SaveOptions,
-        project: Entity<Project>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<anyhow::Result<()>> {
-        self.results_editor
-            .update(cx, |editor, cx| editor.save(options, project, window, cx))
-    }
-
-    fn save_as(
-        &mut self,
-        _: Entity<Project>,
-        _: ProjectPath,
-        _window: &mut Window,
-        _: &mut Context<Self>,
-    ) -> Task<anyhow::Result<()>> {
-        unreachable!("save_as should not have been called")
-    }
-
-    fn reload(
-        &mut self,
-        project: Entity<Project>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<anyhow::Result<()>> {
-        self.results_editor
-            .update(cx, |editor, cx| editor.reload(project, window, cx))
-    }
-
-    fn can_split(&self) -> bool {
-        true
-    }
-
-    fn clone_on_split(
-        &self,
-        _workspace_id: Option<WorkspaceId>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Option<Entity<Self>>>
-    where
-        Self: Sized,
-    {
-        let model = self.entity.update(cx, |model, cx| model.clone(cx));
-        Task::ready(Some(cx.new(|cx| {
-            Self::new(self.workspace.clone(), model, window, cx, None)
-        })))
-    }
-
-    fn added_to_workspace(
-        &mut self,
-        workspace: &mut Workspace,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.results_editor.update(cx, |editor, cx| {
-            editor.added_to_workspace(workspace, window, cx)
-        });
-    }
-
-    fn set_nav_history(
-        &mut self,
-        nav_history: ItemNavHistory,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.results_editor.update(cx, |editor, _| {
-            editor.set_nav_history(Some(nav_history));
-        });
-    }
-
-    fn navigate(
-        &mut self,
-        data: Box<dyn Any>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> bool {
-        self.results_editor
-            .update(cx, |editor, cx| editor.navigate(data, window, cx))
-    }
-
-    fn to_item_events(event: &Self::Event, mut f: impl FnMut(ItemEvent)) {
-        match event {
-            ViewEvent::UpdateTab => {
-                f(ItemEvent::UpdateBreadcrumbs);
-                f(ItemEvent::UpdateTab);
-            }
-            ViewEvent::EditorEvent(editor_event) => {
-                Editor::to_item_events(editor_event, f);
-            }
-            ViewEvent::Dismiss => f(ItemEvent::CloseItem),
-            _ => {}
-        }
-    }
-
-    fn breadcrumb_location(&self, _: &App) -> ToolbarItemLocation {
-        if self.has_matches() {
-            ToolbarItemLocation::Secondary
-        } else {
-            ToolbarItemLocation::Hidden
-        }
-    }
-
-    fn breadcrumbs(&self, theme: &theme::Theme, cx: &App) -> Option<Vec<BreadcrumbText>> {
-        self.results_editor.breadcrumbs(theme, cx)
-    }
-
-    fn breadcrumb_prefix(
-        &self,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<gpui::AnyElement> {
-        if !self.has_matches() {
-            return None;
-        }
-
-        let is_collapsed = self.results_collapsed;
-
-        let (icon, tooltip_label) = if is_collapsed {
-            (IconName::ChevronUpDown, "Expand All Search Results")
-        } else {
-            (IconName::ChevronDownUp, "Collapse All Search Results")
-        };
-
-        let focus_handle = self.query_editor.focus_handle(cx);
-
-        Some(
-            IconButton::new("project-search-collapse-expand", icon)
-                .shape(IconButtonShape::Square)
-                .icon_size(IconSize::Small)
-                .tooltip(move |_, cx| {
-                    Tooltip::for_action_in(
-                        tooltip_label,
-                        &ToggleAllSearchResults,
-                        &focus_handle,
-                        cx,
-                    )
-                })
-                .on_click(cx.listener(|this, _, window, cx| {
-                    this.toggle_all_search_results(&ToggleAllSearchResults, window, cx);
-                }))
-                .into_any_element(),
-        )
-    }
-}
-
-impl ProjectSearchView {
-    pub fn get_matches(&self, cx: &App) -> Vec<Range<Anchor>> {
-        self.entity.read(cx).match_ranges.clone()
-    }
-
-    fn toggle_filters(&mut self, cx: &mut Context<Self>) {
-        self.filters_enabled = !self.filters_enabled;
-        ActiveSettings::update_global(cx, |settings, cx| {
-            settings.0.insert(
-                self.entity.read(cx).project.downgrade(),
-                self.current_settings(),
-            );
-        });
-    }
-
-    fn current_settings(&self) -> ProjectSearchSettings {
-        ProjectSearchSettings {
-            search_options: self.search_options,
-            filters_enabled: self.filters_enabled,
-        }
-    }
-
-    fn toggle_search_option(&mut self, option: SearchOptions, cx: &mut Context<Self>) {
-        self.search_options.toggle(option);
-        ActiveSettings::update_global(cx, |settings, cx| {
-            settings.0.insert(
-                self.entity.read(cx).project.downgrade(),
-                self.current_settings(),
-            );
-        });
-        self.adjust_query_regex_language(cx);
-    }
-
-    fn toggle_opened_only(&mut self, _window: &mut Window, _cx: &mut Context<Self>) {
-        self.included_opened_only = !self.included_opened_only;
-    }
-
-    pub fn replacement(&self, cx: &App) -> String {
-        self.replacement_editor.read(cx).text(cx)
-    }
-
-    fn replace_next(&mut self, _: &ReplaceNext, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(last_search_query_text) = &self.entity.read(cx).last_search_query_text
-            && self.query_editor.read(cx).text(cx) != *last_search_query_text
-        {
-            // search query has changed, restart search and bail
-            self.search(cx);
-            return;
-        }
-        if self.entity.read(cx).match_ranges.is_empty() {
-            return;
-        }
-        let Some(active_index) = self.active_match_index else {
-            return;
-        };
-
-        let query = self.entity.read(cx).active_query.clone();
-        if let Some(query) = query {
-            let query = query.with_replacement(self.replacement(cx));
-
-            // TODO: Do we need the clone here?
-            let mat = self.entity.read(cx).match_ranges[active_index].clone();
-            self.results_editor.update(cx, |editor, cx| {
-                editor.replace(&mat, &query, window, cx);
-            });
-            self.select_match(Direction::Next, window, cx)
-        }
-    }
-    fn replace_all(&mut self, _: &ReplaceAll, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(last_search_query_text) = &self.entity.read(cx).last_search_query_text
-            && self.query_editor.read(cx).text(cx) != *last_search_query_text
-        {
-            // search query has changed, restart search and bail
-            self.search(cx);
-            return;
-        }
-        if self.active_match_index.is_none() {
-            return;
-        }
-        let Some(query) = self.entity.read(cx).active_query.as_ref() else {
-            return;
-        };
-        let query = query.clone().with_replacement(self.replacement(cx));
-
-        let match_ranges = self
-            .entity
-            .update(cx, |model, _| mem::take(&mut model.match_ranges));
-        if match_ranges.is_empty() {
-            return;
-        }
-
-        self.results_editor.update(cx, |editor, cx| {
-            editor.replace_all(&mut match_ranges.iter(), &query, window, cx);
-        });
-
-        self.entity.update(cx, |model, _cx| {
-            model.match_ranges = match_ranges;
-        });
-    }
-
-    fn toggle_all_search_results(
-        &mut self,
-        _: &ToggleAllSearchResults,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.results_collapsed = !self.results_collapsed;
-        self.update_results_visibility(cx);
-    }
-
-    fn update_results_visibility(&mut self, cx: &mut Context<Self>) {
-        self.results_editor.update(cx, |editor, cx| {
-            let multibuffer = editor.buffer().read(cx);
-            let buffer_ids = multibuffer.excerpt_buffer_ids();
-
-            if self.results_collapsed {
-                for buffer_id in buffer_ids {
-                    editor.fold_buffer(buffer_id, cx);
-                }
-            } else {
-                for buffer_id in buffer_ids {
-                    editor.unfold_buffer(buffer_id, cx);
-                }
-            }
-        });
-        cx.notify();
-    }
-
-    pub fn new(
-        workspace: WeakEntity<Workspace>,
-        entity: Entity<ProjectSearch>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-        settings: Option<ProjectSearchSettings>,
-    ) -> Self {
-        let project;
-        let excerpts;
-        let mut replacement_text = None;
-        let mut query_text = String::new();
-        let mut subscriptions = Vec::new();
-
-        // Read in settings if available
-        let (mut options, filters_enabled) = if let Some(settings) = settings {
-            (settings.search_options, settings.filters_enabled)
-        } else {
-            let search_options =
-                SearchOptions::from_settings(&EditorSettings::get_global(cx).search);
-            (search_options, false)
-        };
-
-        {
-            let entity = entity.read(cx);
-            project = entity.project.clone();
-            excerpts = entity.excerpts.clone();
-            if let Some(active_query) = entity.active_query.as_ref() {
-                query_text = active_query.as_str().to_string();
-                replacement_text = active_query.replacement().map(ToOwned::to_owned);
-                options = SearchOptions::from_query(active_query);
-            }
-        }
-        subscriptions.push(cx.observe_in(&entity, window, |this, _, window, cx| {
-            this.entity_changed(window, cx)
-        }));
-
-        let query_editor = cx.new(|cx| {
-            let mut editor = Editor::single_line(window, cx);
-            editor.set_placeholder_text("Search all files…", window, cx);
-            editor.set_text(query_text, window, cx);
-            editor
-        });
-        // Subscribe to query_editor in order to reraise editor events for workspace item activation purposes
-        subscriptions.push(
-            cx.subscribe(&query_editor, |this, _, event: &EditorEvent, cx| {
-                if let EditorEvent::Edited { .. } = event
-                    && EditorSettings::get_global(cx).use_smartcase_search
-                {
-                    let query = this.search_query_text(cx);
-                    if !query.is_empty()
-                        && this.search_options.contains(SearchOptions::CASE_SENSITIVE)
-                            != contains_uppercase(&query)
-                    {
-                        this.toggle_search_option(SearchOptions::CASE_SENSITIVE, cx);
-                    }
-                }
-                cx.emit(ViewEvent::EditorEvent(event.clone()))
-            }),
-        );
-        let replacement_editor = cx.new(|cx| {
-            let mut editor = Editor::single_line(window, cx);
-            editor.set_placeholder_text("Replace in project…", window, cx);
-            if let Some(text) = replacement_text {
-                editor.set_text(text, window, cx);
-            }
-            editor
-        });
-        let results_editor = cx.new(|cx| {
-            let mut editor = Editor::for_multibuffer(excerpts, Some(project.clone()), window, cx);
-            editor.set_searchable(false);
-            editor.set_in_project_search(true);
-            editor
-        });
-        subscriptions.push(cx.observe(&results_editor, |_, _, cx| cx.emit(ViewEvent::UpdateTab)));
-
-        subscriptions.push(
-            cx.subscribe(&results_editor, |this, _, event: &EditorEvent, cx| {
-                if matches!(event, editor::EditorEvent::SelectionsChanged { .. }) {
-                    this.update_match_index(cx);
-                }
-                // Reraise editor events for workspace item activation purposes
-                cx.emit(ViewEvent::EditorEvent(event.clone()));
-            }),
-        );
-
-        let included_files_editor = cx.new(|cx| {
-            let mut editor = Editor::single_line(window, cx);
-            editor.set_placeholder_text("Include: crates/**/*.toml", window, cx);
-
-            editor
-        });
-        // Subscribe to include_files_editor in order to reraise editor events for workspace item activation purposes
-        subscriptions.push(
-            cx.subscribe(&included_files_editor, |_, _, event: &EditorEvent, cx| {
-                cx.emit(ViewEvent::EditorEvent(event.clone()))
-            }),
-        );
-
-        let excluded_files_editor = cx.new(|cx| {
-            let mut editor = Editor::single_line(window, cx);
-            editor.set_placeholder_text("Exclude: vendor/*, *.lock", window, cx);
-
-            editor
-        });
-        // Subscribe to excluded_files_editor in order to reraise editor events for workspace item activation purposes
-        subscriptions.push(
-            cx.subscribe(&excluded_files_editor, |_, _, event: &EditorEvent, cx| {
-                cx.emit(ViewEvent::EditorEvent(event.clone()))
-            }),
-        );
-
-        let focus_handle = cx.focus_handle();
-        subscriptions.push(cx.on_focus(&focus_handle, window, |_, window, cx| {
-            cx.on_next_frame(window, |this, window, cx| {
-                if this.focus_handle.is_focused(window) {
-                    if this.has_matches() {
-                        this.results_editor.focus_handle(cx).focus(window);
-                    } else {
-                        this.query_editor.focus_handle(cx).focus(window);
-                    }
-                }
-            });
-        }));
-
-        let languages = project.read(cx).languages().clone();
-        cx.spawn(async move |project_search_view, cx| {
-            let regex_language = languages
-                .language_for_name("regex")
-                .await
-                .context("loading regex language")?;
-            project_search_view
-                .update(cx, |project_search_view, cx| {
-                    project_search_view.regex_language = Some(regex_language);
-                    project_search_view.adjust_query_regex_language(cx);
-                })
-                .ok();
-            anyhow::Ok(())
-        })
-        .detach_and_log_err(cx);
-
-        // Check if Worktrees have all been previously indexed
-        let mut this = ProjectSearchView {
-            workspace,
-            focus_handle,
-            replacement_editor,
-            search_id: entity.read(cx).search_id,
-            entity,
-            query_editor,
-            results_editor,
-            search_options: options,
-            panels_with_errors: HashMap::default(),
-            active_match_index: None,
-            included_files_editor,
-            excluded_files_editor,
-            filters_enabled,
-            replace_enabled: false,
-            included_opened_only: false,
-            regex_language: None,
-            results_collapsed: false,
-            _subscriptions: subscriptions,
-        };
-
-        this.entity_changed(window, cx);
-        this
-    }
-
-    pub fn new_search_in_directory(
-        workspace: &mut Workspace,
-        dir_path: &RelPath,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        let filter_str = dir_path.display(workspace.path_style(cx));
-
-        let weak_workspace = cx.entity().downgrade();
-
-        let entity = cx.new(|cx| ProjectSearch::new(workspace.project().clone(), cx));
-        let search = cx.new(|cx| ProjectSearchView::new(weak_workspace, entity, window, cx, None));
-        workspace.add_item_to_active_pane(Box::new(search.clone()), None, true, window, cx);
-        search.update(cx, |search, cx| {
-            search
-                .included_files_editor
-                .update(cx, |editor, cx| editor.set_text(filter_str, window, cx));
-            search.filters_enabled = true;
-            search.focus_query_editor(window, cx)
-        });
-    }
-
-    /// Re-activate the most recently activated search in this pane or the most recent if it has been closed.
-    /// If no search exists in the workspace, create a new one.
-    pub fn deploy_search(
-        workspace: &mut Workspace,
-        action: &workspace::DeploySearch,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        let existing = workspace
-            .active_pane()
-            .read(cx)
-            .items()
-            .find_map(|item| item.downcast::<ProjectSearchView>());
-
-        Self::existing_or_new_search(workspace, existing, action, window, cx);
-    }
-
-    fn search_in_new(
-        workspace: &mut Workspace,
-        _: &SearchInNew,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        if let Some(search_view) = workspace
-            .active_item(cx)
-            .and_then(|item| item.downcast::<ProjectSearchView>())
-        {
-            let new_query = search_view.update(cx, |search_view, cx| {
-                let open_buffers = if search_view.included_opened_only {
-                    Some(search_view.open_buffers(cx, workspace))
-                } else {
-                    None
-                };
-                let new_query = search_view.build_search_query(cx, open_buffers);
-                if new_query.is_some()
-                    && let Some(old_query) = search_view.entity.read(cx).active_query.clone()
-                {
-                    search_view.query_editor.update(cx, |editor, cx| {
-                        editor.set_text(old_query.as_str(), window, cx);
-                    });
-                    search_view.search_options = SearchOptions::from_query(&old_query);
-                    search_view.adjust_query_regex_language(cx);
-                }
-                new_query
-            });
-            if let Some(new_query) = new_query {
-                let entity = cx.new(|cx| {
-                    let mut entity = ProjectSearch::new(workspace.project().clone(), cx);
-                    entity.search(new_query, cx);
-                    entity
-                });
-                let weak_workspace = cx.entity().downgrade();
-                workspace.add_item_to_active_pane(
-                    Box::new(cx.new(|cx| {
-                        ProjectSearchView::new(weak_workspace, entity, window, cx, None)
-                    })),
-                    None,
-                    true,
-                    window,
-                    cx,
-                );
-            }
-        }
-    }
-
-    // Add another search tab to the workspace.
-    fn new_search(
-        workspace: &mut Workspace,
-        _: &workspace::NewSearch,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        Self::existing_or_new_search(workspace, None, &DeploySearch::find(), window, cx)
-    }
-
-    fn existing_or_new_search(
-        workspace: &mut Workspace,
-        existing: Option<Entity<ProjectSearchView>>,
-        action: &workspace::DeploySearch,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        let query = workspace.active_item(cx).and_then(|item| {
-            if let Some(buffer_search_query) = buffer_search_query(workspace, item.as_ref(), cx) {
-                return Some(buffer_search_query);
-            }
-
-            let editor = item.act_as::<Editor>(cx)?;
-            let query = editor.query_suggestion(window, cx);
-            if query.is_empty() { None } else { Some(query) }
-        });
-
-        let search = if let Some(existing) = existing {
-            workspace.activate_item(&existing, true, true, window, cx);
-            existing
-        } else {
-            let settings = cx
-                .global::<ActiveSettings>()
-                .0
-                .get(&workspace.project().downgrade());
-
-            let settings = settings.cloned();
-
-            let weak_workspace = cx.entity().downgrade();
-
-            let project_search = cx.new(|cx| ProjectSearch::new(workspace.project().clone(), cx));
-            let project_search_view = cx.new(|cx| {
-                ProjectSearchView::new(weak_workspace, project_search, window, cx, settings)
-            });
-
-            workspace.add_item_to_active_pane(
-                Box::new(project_search_view.clone()),
-                None,
-                true,
-                window,
-                cx,
-            );
-            project_search_view
-        };
-
-        search.update(cx, |search, cx| {
-            search.replace_enabled = action.replace_enabled;
-            if let Some(query) = query {
-                search.set_query(&query, window, cx);
-            }
-            if let Some(included_files) = action.included_files.as_deref() {
-                search
-                    .included_files_editor
-                    .update(cx, |editor, cx| editor.set_text(included_files, window, cx));
-                search.filters_enabled = true;
-            }
-            if let Some(excluded_files) = action.excluded_files.as_deref() {
-                search
-                    .excluded_files_editor
-                    .update(cx, |editor, cx| editor.set_text(excluded_files, window, cx));
-                search.filters_enabled = true;
-            }
-            search.focus_query_editor(window, cx)
-        });
-    }
-
-    fn prompt_to_save_if_dirty_then_search(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<anyhow::Result<()>> {
-        let project = self.entity.read(cx).project.clone();
-
-        let can_autosave = self.results_editor.can_autosave(cx);
-        let autosave_setting = self.results_editor.workspace_settings(cx).autosave;
-
-        let will_autosave = can_autosave && autosave_setting.should_save_on_close();
-
-        let is_dirty = self.is_dirty(cx);
-
-        cx.spawn_in(window, async move |this, cx| {
-            let skip_save_on_close = this
-                .read_with(cx, |this, cx| {
-                    this.workspace.read_with(cx, |workspace, cx| {
-                        workspace::Pane::skip_save_on_close(&this.results_editor, workspace, cx)
-                    })
-                })?
-                .unwrap_or(false);
-
-            let should_prompt_to_save = !skip_save_on_close && !will_autosave && is_dirty;
-
-            let should_search = if should_prompt_to_save {
-                let options = &["Save", "Don't Save", "Cancel"];
-                let result_channel = this.update_in(cx, |_, window, cx| {
-                    window.prompt(
-                        gpui::PromptLevel::Warning,
-                        "Project search buffer contains unsaved edits. Do you want to save it?",
-                        None,
-                        options,
-                        cx,
-                    )
-                })?;
-                let result = result_channel.await?;
-                let should_save = result == 0;
-                if should_save {
-                    this.update_in(cx, |this, window, cx| {
-                        this.save(
-                            SaveOptions {
-                                format: true,
-                                autosave: false,
-                            },
-                            project,
-                            window,
-                            cx,
-                        )
-                    })?
-                    .await
-                    .log_err();
-                }
-
-                result != 2
-            } else {
-                true
-            };
-            if should_search {
-                this.update(cx, |this, cx| {
-                    this.search(cx);
-                })?;
-            }
-            anyhow::Ok(())
-        })
-    }
-
-    fn search(&mut self, cx: &mut Context<Self>) {
-        let open_buffers = if self.included_opened_only {
-            self.workspace
-                .update(cx, |workspace, cx| self.open_buffers(cx, workspace))
-                .ok()
-        } else {
-            None
-        };
-        if let Some(query) = self.build_search_query(cx, open_buffers) {
-            self.entity.update(cx, |model, cx| model.search(query, cx));
-        }
-    }
-
-    pub fn search_query_text(&self, cx: &App) -> String {
-        self.query_editor.read(cx).text(cx)
-    }
-
-    fn build_search_query(
-        &mut self,
-        cx: &mut Context<Self>,
-        open_buffers: Option<Vec<Entity<Buffer>>>,
-    ) -> Option<SearchQuery> {
-        // Do not bail early in this function, as we want to fill out `self.panels_with_errors`.
-
-        let text = self.search_query_text(cx);
-        let included_files = self
-            .filters_enabled
-            .then(|| {
-                match self.parse_path_matches(self.included_files_editor.read(cx).text(cx), cx) {
-                    Ok(included_files) => {
-                        let should_unmark_error =
-                            self.panels_with_errors.remove(&InputPanel::Include);
-                        if should_unmark_error.is_some() {
-                            cx.notify();
-                        }
-                        included_files
-                    }
-                    Err(e) => {
-                        let should_mark_error = self
-                            .panels_with_errors
-                            .insert(InputPanel::Include, e.to_string());
-                        if should_mark_error.is_none() {
-                            cx.notify();
-                        }
-                        PathMatcher::default()
-                    }
-                }
-            })
-            .unwrap_or(PathMatcher::default());
-        let excluded_files = self
-            .filters_enabled
-            .then(|| {
-                match self.parse_path_matches(self.excluded_files_editor.read(cx).text(cx), cx) {
-                    Ok(excluded_files) => {
-                        let should_unmark_error =
-                            self.panels_with_errors.remove(&InputPanel::Exclude);
-                        if should_unmark_error.is_some() {
-                            cx.notify();
-                        }
-
-                        excluded_files
-                    }
-                    Err(e) => {
-                        let should_mark_error = self
-                            .panels_with_errors
-                            .insert(InputPanel::Exclude, e.to_string());
-                        if should_mark_error.is_none() {
-                            cx.notify();
-                        }
-                        PathMatcher::default()
-                    }
-                }
-            })
-            .unwrap_or(PathMatcher::default());
-
-        // If the project contains multiple visible worktrees, we match the
-        // include/exclude patterns against full paths to allow them to be
-        // disambiguated. For single worktree projects we use worktree relative
-        // paths for convenience.
-        let match_full_paths = self
-            .entity
-            .read(cx)
-            .project
-            .read(cx)
-            .visible_worktrees(cx)
-            .count()
-            > 1;
-
-        let query = if self.search_options.contains(SearchOptions::REGEX) {
-            match SearchQuery::regex(
-                text,
-                self.search_options.contains(SearchOptions::WHOLE_WORD),
-                self.search_options.contains(SearchOptions::CASE_SENSITIVE),
-                self.search_options.contains(SearchOptions::INCLUDE_IGNORED),
-                self.search_options
-                    .contains(SearchOptions::ONE_MATCH_PER_LINE),
-                included_files,
-                excluded_files,
-                match_full_paths,
-                open_buffers,
-            ) {
-                Ok(query) => {
-                    let should_unmark_error = self.panels_with_errors.remove(&InputPanel::Query);
-                    if should_unmark_error.is_some() {
-                        cx.notify();
-                    }
-
-                    Some(query)
-                }
-                Err(e) => {
-                    let should_mark_error = self
-                        .panels_with_errors
-                        .insert(InputPanel::Query, e.to_string());
-                    if should_mark_error.is_none() {
-                        cx.notify();
-                    }
-
-                    None
-                }
-            }
-        } else {
-            match SearchQuery::text(
-                text,
-                self.search_options.contains(SearchOptions::WHOLE_WORD),
-                self.search_options.contains(SearchOptions::CASE_SENSITIVE),
-                self.search_options.contains(SearchOptions::INCLUDE_IGNORED),
-                included_files,
-                excluded_files,
-                match_full_paths,
-                open_buffers,
-            ) {
-                Ok(query) => {
-                    let should_unmark_error = self.panels_with_errors.remove(&InputPanel::Query);
-                    if should_unmark_error.is_some() {
-                        cx.notify();
-                    }
-
-                    Some(query)
-                }
-                Err(e) => {
-                    let should_mark_error = self
-                        .panels_with_errors
-                        .insert(InputPanel::Query, e.to_string());
-                    if should_mark_error.is_none() {
-                        cx.notify();
-                    }
-
-                    None
-                }
-            }
-        };
-        if !self.panels_with_errors.is_empty() {
-            return None;
-        }
-        if query.as_ref().is_some_and(|query| query.is_empty()) {
-            return None;
-        }
-        query
-    }
-
-    fn open_buffers(&self, cx: &App, workspace: &Workspace) -> Vec<Entity<Buffer>> {
-        let mut buffers = Vec::new();
-        for editor in workspace.items_of_type::<Editor>(cx) {
-            if let Some(buffer) = editor.read(cx).buffer().read(cx).as_singleton() {
-                buffers.push(buffer);
-            }
-        }
-        buffers
-    }
-
-    fn parse_path_matches(&self, text: String, cx: &App) -> anyhow::Result<PathMatcher> {
-        let path_style = self.entity.read(cx).project.read(cx).path_style(cx);
-        let queries = text
-            .split(',')
-            .map(str::trim)
-            .filter(|maybe_glob_str| !maybe_glob_str.is_empty())
-            .map(str::to_owned)
-            .collect::<Vec<_>>();
-        Ok(PathMatcher::new(&queries, path_style)?)
-    }
-
-    fn select_match(&mut self, direction: Direction, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(index) = self.active_match_index {
-            let match_ranges = self.entity.read(cx).match_ranges.clone();
-
-            if !EditorSettings::get_global(cx).search_wrap
-                && ((direction == Direction::Next && index + 1 >= match_ranges.len())
-                    || (direction == Direction::Prev && index == 0))
-            {
-                crate::show_no_more_matches(window, cx);
-                return;
-            }
-
-            let new_index = self.results_editor.update(cx, |editor, cx| {
-                editor.match_index_for_direction(&match_ranges, index, direction, 1, window, cx)
-            });
-
-            let range_to_select = match_ranges[new_index].clone();
-            self.results_editor.update(cx, |editor, cx| {
-                let range_to_select = editor.range_for_match(&range_to_select);
-                let autoscroll = if EditorSettings::get_global(cx).search.center_on_match {
-                    Autoscroll::center()
-                } else {
-                    Autoscroll::fit()
-                };
-                editor.unfold_ranges(std::slice::from_ref(&range_to_select), false, true, cx);
-                editor.change_selections(SelectionEffects::scroll(autoscroll), window, cx, |s| {
-                    s.select_ranges([range_to_select])
-                });
-            });
-            self.highlight_matches(&match_ranges, Some(new_index), cx);
-        }
-    }
-
-    fn focus_query_editor(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.query_editor.update(cx, |query_editor, cx| {
-            query_editor.select_all(&SelectAll, window, cx);
-        });
-        let editor_handle = self.query_editor.focus_handle(cx);
-        window.focus(&editor_handle);
-    }
-
-    fn set_query(&mut self, query: &str, window: &mut Window, cx: &mut Context<Self>) {
-        self.set_search_editor(SearchInputKind::Query, query, window, cx);
-        if EditorSettings::get_global(cx).use_smartcase_search
-            && !query.is_empty()
-            && self.search_options.contains(SearchOptions::CASE_SENSITIVE)
-                != contains_uppercase(query)
-        {
-            self.toggle_search_option(SearchOptions::CASE_SENSITIVE, cx)
-        }
-    }
-
-    fn set_search_editor(
-        &mut self,
-        kind: SearchInputKind,
-        text: &str,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let editor = match kind {
-            SearchInputKind::Query => &self.query_editor,
-            SearchInputKind::Include => &self.included_files_editor,
-
-            SearchInputKind::Exclude => &self.excluded_files_editor,
-        };
-        editor.update(cx, |included_editor, cx| {
-            included_editor.set_text(text, window, cx)
-        });
-    }
-
-    fn focus_results_editor(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.query_editor.update(cx, |query_editor, cx| {
-            let cursor = query_editor.selections.newest_anchor().head();
-            query_editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                s.select_ranges([cursor..cursor])
-            });
-        });
-        let results_handle = self.results_editor.focus_handle(cx);
-        window.focus(&results_handle);
-    }
-
-    fn entity_changed(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let match_ranges = self.entity.read(cx).match_ranges.clone();
-
-        if match_ranges.is_empty() {
-            self.active_match_index = None;
-            self.results_editor.update(cx, |editor, cx| {
-                editor.clear_background_highlights::<Self>(cx);
-            });
-        } else {
-            self.active_match_index = Some(0);
-            self.update_match_index(cx);
-            let prev_search_id = mem::replace(&mut self.search_id, self.entity.read(cx).search_id);
-            let is_new_search = self.search_id != prev_search_id;
-            self.results_editor.update(cx, |editor, cx| {
-                if is_new_search {
-                    let range_to_select = match_ranges
-                        .first()
-                        .map(|range| editor.range_for_match(range));
-                    editor.change_selections(Default::default(), window, cx, |s| {
-                        s.select_ranges(range_to_select)
-                    });
-                    editor.scroll(Point::default(), Some(Axis::Vertical), window, cx);
-                }
-            });
-            if is_new_search && self.query_editor.focus_handle(cx).is_focused(window) {
-                self.focus_results_editor(window, cx);
-            }
-        }
-
-        cx.emit(ViewEvent::UpdateTab);
-        cx.notify();
-    }
-
-    fn update_match_index(&mut self, cx: &mut Context<Self>) {
-        let results_editor = self.results_editor.read(cx);
-        let match_ranges = self.entity.read(cx).match_ranges.clone();
-        let new_index = active_match_index(
-            Direction::Next,
-            &match_ranges,
-            &results_editor.selections.newest_anchor().head(),
-            &results_editor.buffer().read(cx).snapshot(cx),
-        );
-        self.highlight_matches(&match_ranges, new_index, cx);
-        if self.active_match_index != new_index {
-            self.active_match_index = new_index;
-            cx.notify();
-        }
-    }
-
-    #[ztracing::instrument(skip_all)]
-    fn highlight_matches(
-        &self,
-        match_ranges: &[Range<Anchor>],
-        active_index: Option<usize>,
-        cx: &mut Context<Self>,
-    ) {
-        self.results_editor.update(cx, |editor, cx| {
-            editor.highlight_background::<Self>(
-                match_ranges,
-                move |index, theme| {
-                    if active_index == Some(*index) {
-                        theme.colors().search_active_match_background
-                    } else {
-                        theme.colors().search_match_background
-                    }
-                },
-                cx,
-            );
-        });
-    }
-
-    pub fn has_matches(&self) -> bool {
-        self.active_match_index.is_some()
-    }
-
-    fn landing_text_minor(&self, cx: &App) -> impl IntoElement {
-        let focus_handle = self.focus_handle.clone();
-        v_flex()
-            .gap_1()
-            .child(
-                Label::new("Hit enter to search. For more options:")
-                    .color(Color::Muted)
-                    .mb_2(),
-            )
-            .child(
-                Button::new("filter-paths", "Include/exclude specific paths")
-                    .icon(IconName::Filter)
-                    .icon_position(IconPosition::Start)
-                    .icon_size(IconSize::Small)
-                    .key_binding(KeyBinding::for_action_in(&ToggleFilters, &focus_handle, cx))
-                    .on_click(|_event, window, cx| {
-                        window.dispatch_action(ToggleFilters.boxed_clone(), cx)
-                    }),
-            )
-            .child(
-                Button::new("find-replace", "Find and replace")
-                    .icon(IconName::Replace)
-                    .icon_position(IconPosition::Start)
-                    .icon_size(IconSize::Small)
-                    .key_binding(KeyBinding::for_action_in(&ToggleReplace, &focus_handle, cx))
-                    .on_click(|_event, window, cx| {
-                        window.dispatch_action(ToggleReplace.boxed_clone(), cx)
-                    }),
-            )
-            .child(
-                Button::new("regex", "Match with regex")
-                    .icon(IconName::Regex)
-                    .icon_position(IconPosition::Start)
-                    .icon_size(IconSize::Small)
-                    .key_binding(KeyBinding::for_action_in(&ToggleRegex, &focus_handle, cx))
-                    .on_click(|_event, window, cx| {
-                        window.dispatch_action(ToggleRegex.boxed_clone(), cx)
-                    }),
-            )
-            .child(
-                Button::new("match-case", "Match case")
-                    .icon(IconName::CaseSensitive)
-                    .icon_position(IconPosition::Start)
-                    .icon_size(IconSize::Small)
-                    .key_binding(KeyBinding::for_action_in(
-                        &ToggleCaseSensitive,
-                        &focus_handle,
-                        cx,
-                    ))
-                    .on_click(|_event, window, cx| {
-                        window.dispatch_action(ToggleCaseSensitive.boxed_clone(), cx)
-                    }),
-            )
-            .child(
-                Button::new("match-whole-words", "Match whole words")
-                    .icon(IconName::WholeWord)
-                    .icon_position(IconPosition::Start)
-                    .icon_size(IconSize::Small)
-                    .key_binding(KeyBinding::for_action_in(
-                        &ToggleWholeWord,
-                        &focus_handle,
-                        cx,
-                    ))
-                    .on_click(|_event, window, cx| {
-                        window.dispatch_action(ToggleWholeWord.boxed_clone(), cx)
-                    }),
-            )
-    }
-
-    fn border_color_for(&self, panel: InputPanel, cx: &App) -> Hsla {
-        if self.panels_with_errors.contains_key(&panel) {
-            Color::Error.color(cx)
-        } else {
-            cx.theme().colors().border
-        }
-    }
-
-    fn move_focus_to_results(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if !self.results_editor.focus_handle(cx).is_focused(window)
-            && !self.entity.read(cx).match_ranges.is_empty()
-        {
-            cx.stop_propagation();
-            self.focus_results_editor(window, cx)
-        }
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn results_editor(&self) -> &Entity<Editor> {
-        &self.results_editor
-    }
-
-    fn adjust_query_regex_language(&self, cx: &mut App) {
-        let enable = self.search_options.contains(SearchOptions::REGEX);
-        let query_buffer = self
-            .query_editor
-            .read(cx)
-            .buffer()
-            .read(cx)
-            .as_singleton()
-            .expect("query editor should be backed by a singleton buffer");
-        if enable {
-            if let Some(regex_language) = self.regex_language.clone() {
-                query_buffer.update(cx, |query_buffer, cx| {
-                    query_buffer.set_language(Some(regex_language), cx);
-                })
-            }
-        } else {
-            query_buffer.update(cx, |query_buffer, cx| {
-                query_buffer.set_language(None, cx);
-            })
-        }
-    }
-}
-
-fn buffer_search_query(
-    workspace: &mut Workspace,
-    item: &dyn ItemHandle,
-    cx: &mut Context<Workspace>,
-) -> Option<String> {
-    let buffer_search_bar = workspace
-        .pane_for(item)
-        .and_then(|pane| {
-            pane.read(cx)
-                .toolbar()
-                .read(cx)
-                .item_of_type::<BufferSearchBar>()
-        })?
-        .read(cx);
-    if buffer_search_bar.query_editor_focused() {
-        let buffer_search_query = buffer_search_bar.query(cx);
-        if !buffer_search_query.is_empty() {
-            return Some(buffer_search_query);
-        }
-    }
-    None
-}
-
-impl Default for ProjectSearchBar {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl ProjectSearchBar {
-    pub fn new() -> Self {
-        Self {
-            active_project_search: None,
-            subscription: None,
-        }
-    }
-
-    fn confirm(&mut self, _: &Confirm, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(search_view) = self.active_project_search.as_ref() {
-            search_view.update(cx, |search_view, cx| {
-                if !search_view
-                    .replacement_editor
-                    .focus_handle(cx)
-                    .is_focused(window)
-                {
-                    cx.stop_propagation();
-                    search_view
-                        .prompt_to_save_if_dirty_then_search(window, cx)
-                        .detach_and_log_err(cx);
-                }
-            });
-        }
-    }
-
-    fn tab(&mut self, _: &Tab, window: &mut Window, cx: &mut Context<Self>) {
-        self.cycle_field(Direction::Next, window, cx);
-    }
-
-    fn backtab(&mut self, _: &Backtab, window: &mut Window, cx: &mut Context<Self>) {
-        self.cycle_field(Direction::Prev, window, cx);
-    }
-
-    fn focus_search(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(search_view) = self.active_project_search.as_ref() {
-            search_view.update(cx, |search_view, cx| {
-                search_view.query_editor.focus_handle(cx).focus(window);
-            });
-        }
-    }
-
-    fn cycle_field(&mut self, direction: Direction, window: &mut Window, cx: &mut Context<Self>) {
-        let active_project_search = match &self.active_project_search {
-            Some(active_project_search) => active_project_search,
-            None => return,
-        };
-
-        active_project_search.update(cx, |project_view, cx| {
-            let mut views = vec![project_view.query_editor.focus_handle(cx)];
-            if project_view.replace_enabled {
-                views.push(project_view.replacement_editor.focus_handle(cx));
-            }
-            if project_view.filters_enabled {
-                views.extend([
-                    project_view.included_files_editor.focus_handle(cx),
-                    project_view.excluded_files_editor.focus_handle(cx),
-                ]);
-            }
-            let current_index = match views.iter().position(|focus| focus.is_focused(window)) {
-                Some(index) => index,
-                None => return,
-            };
-
-            let new_index = match direction {
-                Direction::Next => (current_index + 1) % views.len(),
-                Direction::Prev if current_index == 0 => views.len() - 1,
-                Direction::Prev => (current_index - 1) % views.len(),
-            };
-            let next_focus_handle = &views[new_index];
-            window.focus(next_focus_handle);
-            cx.stop_propagation();
-        });
-    }
-
-    pub(crate) fn toggle_search_option(
-        &mut self,
-        option: SearchOptions,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> bool {
-        if self.active_project_search.is_none() {
-            return false;
-        }
-
-        cx.spawn_in(window, async move |this, cx| {
-            let task = this.update_in(cx, |this, window, cx| {
-                let search_view = this.active_project_search.as_ref()?;
-                search_view.update(cx, |search_view, cx| {
-                    search_view.toggle_search_option(option, cx);
-                    search_view
-                        .entity
-                        .read(cx)
-                        .active_query
-                        .is_some()
-                        .then(|| search_view.prompt_to_save_if_dirty_then_search(window, cx))
-                })
-            })?;
-            if let Some(task) = task {
-                task.await?;
-            }
-            this.update(cx, |_, cx| {
-                cx.notify();
-            })?;
-            anyhow::Ok(())
-        })
-        .detach();
-        true
-    }
-
-    fn toggle_replace(&mut self, _: &ToggleReplace, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(search) = &self.active_project_search {
-            search.update(cx, |this, cx| {
-                this.replace_enabled = !this.replace_enabled;
-                let editor_to_focus = if this.replace_enabled {
-                    this.replacement_editor.focus_handle(cx)
-                } else {
-                    this.query_editor.focus_handle(cx)
-                };
-                window.focus(&editor_to_focus);
-                cx.notify();
-            });
-        }
-    }
-
-    fn toggle_filters(&mut self, window: &mut Window, cx: &mut Context<Self>) -> bool {
-        if let Some(search_view) = self.active_project_search.as_ref() {
-            search_view.update(cx, |search_view, cx| {
-                search_view.toggle_filters(cx);
-                search_view
-                    .included_files_editor
-                    .update(cx, |_, cx| cx.notify());
-                search_view
-                    .excluded_files_editor
-                    .update(cx, |_, cx| cx.notify());
-                window.refresh();
-                cx.notify();
-            });
-            cx.notify();
-            true
-        } else {
-            false
-        }
-    }
-
-    fn toggle_opened_only(&mut self, window: &mut Window, cx: &mut Context<Self>) -> bool {
-        if self.active_project_search.is_none() {
-            return false;
-        }
-
-        cx.spawn_in(window, async move |this, cx| {
-            let task = this.update_in(cx, |this, window, cx| {
-                let search_view = this.active_project_search.as_ref()?;
-                search_view.update(cx, |search_view, cx| {
-                    search_view.toggle_opened_only(window, cx);
-                    search_view
-                        .entity
-                        .read(cx)
-                        .active_query
-                        .is_some()
-                        .then(|| search_view.prompt_to_save_if_dirty_then_search(window, cx))
-                })
-            })?;
-            if let Some(task) = task {
-                task.await?;
-            }
-            this.update(cx, |_, cx| {
-                cx.notify();
-            })?;
-            anyhow::Ok(())
-        })
-        .detach();
-        true
-    }
-
-    fn is_opened_only_enabled(&self, cx: &App) -> bool {
-        if let Some(search_view) = self.active_project_search.as_ref() {
-            search_view.read(cx).included_opened_only
-        } else {
-            false
-        }
-    }
-
-    fn move_focus_to_results(&self, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(search_view) = self.active_project_search.as_ref() {
-            search_view.update(cx, |search_view, cx| {
-                search_view.move_focus_to_results(window, cx);
-            });
-            cx.notify();
-        }
-    }
-
-    fn next_history_query(
-        &mut self,
-        _: &NextHistoryQuery,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(search_view) = self.active_project_search.as_ref() {
-            search_view.update(cx, |search_view, cx| {
-                for (editor, kind) in [
-                    (search_view.query_editor.clone(), SearchInputKind::Query),
-                    (
-                        search_view.included_files_editor.clone(),
-                        SearchInputKind::Include,
-                    ),
-                    (
-                        search_view.excluded_files_editor.clone(),
-                        SearchInputKind::Exclude,
-                    ),
-                ] {
-                    if editor.focus_handle(cx).is_focused(window) {
-                        let new_query = search_view.entity.update(cx, |model, cx| {
-                            let project = model.project.clone();
-
-                            if let Some(new_query) = project.update(cx, |project, _| {
-                                project
-                                    .search_history_mut(kind)
-                                    .next(model.cursor_mut(kind))
-                                    .map(str::to_string)
-                            }) {
-                                new_query
-                            } else {
-                                model.cursor_mut(kind).reset();
-                                String::new()
-                            }
-                        });
-                        search_view.set_search_editor(kind, &new_query, window, cx);
-                    }
-                }
-            });
-        }
-    }
-
-    fn previous_history_query(
-        &mut self,
-        _: &PreviousHistoryQuery,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(search_view) = self.active_project_search.as_ref() {
-            search_view.update(cx, |search_view, cx| {
-                for (editor, kind) in [
-                    (search_view.query_editor.clone(), SearchInputKind::Query),
-                    (
-                        search_view.included_files_editor.clone(),
-                        SearchInputKind::Include,
-                    ),
-                    (
-                        search_view.excluded_files_editor.clone(),
-                        SearchInputKind::Exclude,
-                    ),
-                ] {
-                    if editor.focus_handle(cx).is_focused(window) {
-                        if editor.read(cx).text(cx).is_empty()
-                            && let Some(new_query) = search_view
-                                .entity
-                                .read(cx)
-                                .project
-                                .read(cx)
-                                .search_history(kind)
-                                .current(search_view.entity.read(cx).cursor(kind))
-                                .map(str::to_string)
-                        {
-                            search_view.set_search_editor(kind, &new_query, window, cx);
-                            return;
-                        }
-
-                        if let Some(new_query) = search_view.entity.update(cx, |model, cx| {
-                            let project = model.project.clone();
-                            project.update(cx, |project, _| {
-                                project
-                                    .search_history_mut(kind)
-                                    .previous(model.cursor_mut(kind))
-                                    .map(str::to_string)
-                            })
-                        }) {
-                            search_view.set_search_editor(kind, &new_query, window, cx);
-                        }
-                    }
-                }
-            });
-        }
-    }
-
-    fn select_next_match(
-        &mut self,
-        _: &SelectNextMatch,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(search) = self.active_project_search.as_ref() {
-            search.update(cx, |this, cx| {
-                this.select_match(Direction::Next, window, cx);
-            })
-        }
-    }
-
-    fn select_prev_match(
-        &mut self,
-        _: &SelectPreviousMatch,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(search) = self.active_project_search.as_ref() {
-            search.update(cx, |this, cx| {
-                this.select_match(Direction::Prev, window, cx);
-            })
-        }
-    }
-}
-
-impl Render for ProjectSearchBar {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let Some(search) = self.active_project_search.clone() else {
-            return div();
-        };
-        let search = search.read(cx);
-        let focus_handle = search.focus_handle(cx);
-
-        let container_width = window.viewport_size().width;
-        let input_width = SearchInputWidth::calc_width(container_width);
-
-        let input_base_styles = |panel: InputPanel| {
-            input_base_styles(search.border_color_for(panel, cx), |div| match panel {
-                InputPanel::Query | InputPanel::Replacement => div.w(input_width),
-                InputPanel::Include | InputPanel::Exclude => div.flex_grow(),
-            })
-        };
-        let theme_colors = cx.theme().colors();
-        let project_search = search.entity.read(cx);
-        let limit_reached = project_search.limit_reached;
-
-        let color_override = match (
-            &project_search.pending_search,
-            project_search.no_results,
-            &project_search.active_query,
-            &project_search.last_search_query_text,
-        ) {
-            (None, Some(true), Some(q), Some(p)) if q.as_str() == p => Some(Color::Error),
-            _ => None,
-        };
-
-        let match_text = search
-            .active_match_index
-            .and_then(|index| {
-                let index = index + 1;
-                let match_quantity = project_search.match_ranges.len();
-                if match_quantity > 0 {
-                    debug_assert!(match_quantity >= index);
-                    if limit_reached {
-                        Some(format!("{index}/{match_quantity}+"))
-                    } else {
-                        Some(format!("{index}/{match_quantity}"))
-                    }
-                } else {
-                    None
-                }
-            })
-            .unwrap_or_else(|| "0/0".to_string());
-
-        let query_focus = search.query_editor.focus_handle(cx);
-
-        let query_column = input_base_styles(InputPanel::Query)
-            .on_action(cx.listener(|this, action, window, cx| this.confirm(action, window, cx)))
-            .on_action(cx.listener(|this, action, window, cx| {
-                this.previous_history_query(action, window, cx)
-            }))
-            .on_action(
-                cx.listener(|this, action, window, cx| this.next_history_query(action, window, cx)),
-            )
-            .child(render_text_input(&search.query_editor, color_override, cx))
-            .child(
-                h_flex()
-                    .gap_1()
-                    .child(SearchOption::CaseSensitive.as_button(
-                        search.search_options,
-                        SearchSource::Project(cx),
-                        focus_handle.clone(),
-                    ))
-                    .child(SearchOption::WholeWord.as_button(
-                        search.search_options,
-                        SearchSource::Project(cx),
-                        focus_handle.clone(),
-                    ))
-                    .child(SearchOption::Regex.as_button(
-                        search.search_options,
-                        SearchSource::Project(cx),
-                        focus_handle.clone(),
-                    )),
-            );
-
-        let matches_column = h_flex()
-            .ml_1()
-            .pl_1p5()
-            .border_l_1()
-            .border_color(theme_colors.border_variant)
-            .child(render_action_button(
-                "project-search-nav-button",
-                IconName::ChevronLeft,
-                search
-                    .active_match_index
-                    .is_none()
-                    .then_some(ActionButtonState::Disabled),
-                "Select Previous Match",
-                &SelectPreviousMatch,
-                query_focus.clone(),
-            ))
-            .child(render_action_button(
-                "project-search-nav-button",
-                IconName::ChevronRight,
-                search
-                    .active_match_index
-                    .is_none()
-                    .then_some(ActionButtonState::Disabled),
-                "Select Next Match",
-                &SelectNextMatch,
-                query_focus,
-            ))
-            .child(
-                div()
-                    .id("matches")
-                    .ml_2()
-                    .min_w(rems_from_px(40.))
-                    .child(Label::new(match_text).size(LabelSize::Small).color(
-                        if search.active_match_index.is_some() {
-                            Color::Default
-                        } else {
-                            Color::Disabled
-                        },
-                    ))
-                    .when(limit_reached, |el| {
-                        el.tooltip(Tooltip::text(
-                            "Search limits reached.\nTry narrowing your search.",
-                        ))
-                    }),
-            );
-
-        let mode_column = h_flex()
-            .gap_1()
-            .min_w_64()
-            .child(
-                IconButton::new("project-search-filter-button", IconName::Filter)
-                    .shape(IconButtonShape::Square)
-                    .tooltip(|_window, cx| {
-                        Tooltip::for_action("Toggle Filters", &ToggleFilters, cx)
-                    })
-                    .on_click(cx.listener(|this, _, window, cx| {
-                        this.toggle_filters(window, cx);
-                    }))
-                    .toggle_state(
-                        self.active_project_search
-                            .as_ref()
-                            .map(|search| search.read(cx).filters_enabled)
-                            .unwrap_or_default(),
-                    )
-                    .tooltip({
-                        let focus_handle = focus_handle.clone();
-                        move |_window, cx| {
-                            Tooltip::for_action_in(
-                                "Toggle Filters",
-                                &ToggleFilters,
-                                &focus_handle,
-                                cx,
-                            )
-                        }
-                    }),
-            )
-            .child(render_action_button(
-                "project-search",
-                IconName::Replace,
-                self.active_project_search
-                    .as_ref()
-                    .map(|search| search.read(cx).replace_enabled)
-                    .and_then(|enabled| enabled.then_some(ActionButtonState::Toggled)),
-                "Toggle Replace",
-                &ToggleReplace,
-                focus_handle.clone(),
-            ))
-            .child(matches_column);
-
-        let search_line = h_flex()
-            .w_full()
-            .gap_2()
-            .child(query_column)
-            .child(mode_column);
-
-        let replace_line = search.replace_enabled.then(|| {
-            let replace_column = input_base_styles(InputPanel::Replacement)
-                .child(render_text_input(&search.replacement_editor, None, cx));
-
-            let focus_handle = search.replacement_editor.read(cx).focus_handle(cx);
-
-            let replace_actions = h_flex()
-                .min_w_64()
-                .gap_1()
-                .child(render_action_button(
-                    "project-search-replace-button",
-                    IconName::ReplaceNext,
-                    Default::default(),
-                    "Replace Next Match",
-                    &ReplaceNext,
-                    focus_handle.clone(),
-                ))
-                .child(render_action_button(
-                    "project-search-replace-button",
-                    IconName::ReplaceAll,
-                    Default::default(),
-                    "Replace All Matches",
-                    &ReplaceAll,
-                    focus_handle,
-                ));
-
-            h_flex()
-                .w_full()
-                .gap_2()
-                .child(replace_column)
-                .child(replace_actions)
-        });
-
-        let filter_line = search.filters_enabled.then(|| {
-            let include = input_base_styles(InputPanel::Include)
-                .on_action(cx.listener(|this, action, window, cx| {
-                    this.previous_history_query(action, window, cx)
-                }))
-                .on_action(cx.listener(|this, action, window, cx| {
-                    this.next_history_query(action, window, cx)
-                }))
-                .child(render_text_input(&search.included_files_editor, None, cx));
-            let exclude = input_base_styles(InputPanel::Exclude)
-                .on_action(cx.listener(|this, action, window, cx| {
-                    this.previous_history_query(action, window, cx)
-                }))
-                .on_action(cx.listener(|this, action, window, cx| {
-                    this.next_history_query(action, window, cx)
-                }))
-                .child(render_text_input(&search.excluded_files_editor, None, cx));
-            let mode_column = h_flex()
-                .gap_1()
-                .min_w_64()
-                .child(
-                    IconButton::new("project-search-opened-only", IconName::FolderSearch)
-                        .shape(IconButtonShape::Square)
-                        .toggle_state(self.is_opened_only_enabled(cx))
-                        .tooltip(Tooltip::text("Only Search Open Files"))
-                        .on_click(cx.listener(|this, _, window, cx| {
-                            this.toggle_opened_only(window, cx);
-                        })),
-                )
-                .child(SearchOption::IncludeIgnored.as_button(
-                    search.search_options,
-                    SearchSource::Project(cx),
-                    focus_handle.clone(),
-                ));
-            h_flex()
-                .w_full()
-                .gap_2()
-                .child(
-                    h_flex()
-                        .gap_2()
-                        .w(input_width)
-                        .child(include)
-                        .child(exclude),
-                )
-                .child(mode_column)
-        });
-
-        let mut key_context = KeyContext::default();
-        key_context.add("ProjectSearchBar");
-        if search
-            .replacement_editor
-            .focus_handle(cx)
-            .is_focused(window)
-        {
-            key_context.add("in_replace");
-        }
-
-        let query_error_line = search
-            .panels_with_errors
-            .get(&InputPanel::Query)
-            .map(|error| {
-                Label::new(error)
-                    .size(LabelSize::Small)
-                    .color(Color::Error)
-                    .mt_neg_1()
-                    .ml_2()
-            });
-
-        let filter_error_line = search
-            .panels_with_errors
-            .get(&InputPanel::Include)
-            .or_else(|| search.panels_with_errors.get(&InputPanel::Exclude))
-            .map(|error| {
-                Label::new(error)
-                    .size(LabelSize::Small)
-                    .color(Color::Error)
-                    .mt_neg_1()
-                    .ml_2()
-            });
-
-        v_flex()
-            .gap_2()
-            .py(px(1.0))
-            .w_full()
-            .key_context(key_context)
-            .on_action(cx.listener(|this, _: &ToggleFocus, window, cx| {
-                this.move_focus_to_results(window, cx)
-            }))
-            .on_action(cx.listener(|this, _: &ToggleFilters, window, cx| {
-                this.toggle_filters(window, cx);
-            }))
-            .capture_action(cx.listener(Self::tab))
-            .capture_action(cx.listener(Self::backtab))
-            .on_action(cx.listener(|this, action, window, cx| this.confirm(action, window, cx)))
-            .on_action(cx.listener(|this, action, window, cx| {
-                this.toggle_replace(action, window, cx);
-            }))
-            .on_action(cx.listener(|this, _: &ToggleWholeWord, window, cx| {
-                this.toggle_search_option(SearchOptions::WHOLE_WORD, window, cx);
-            }))
-            .on_action(cx.listener(|this, _: &ToggleCaseSensitive, window, cx| {
-                this.toggle_search_option(SearchOptions::CASE_SENSITIVE, window, cx);
-            }))
-            .on_action(cx.listener(|this, action, window, cx| {
-                if let Some(search) = this.active_project_search.as_ref() {
-                    search.update(cx, |this, cx| {
-                        this.replace_next(action, window, cx);
-                    })
-                }
-            }))
-            .on_action(cx.listener(|this, action, window, cx| {
-                if let Some(search) = this.active_project_search.as_ref() {
-                    search.update(cx, |this, cx| {
-                        this.replace_all(action, window, cx);
-                    })
-                }
-            }))
-            .when(search.filters_enabled, |this| {
-                this.on_action(cx.listener(|this, _: &ToggleIncludeIgnored, window, cx| {
-                    this.toggle_search_option(SearchOptions::INCLUDE_IGNORED, window, cx);
-                }))
-            })
-            .on_action(cx.listener(Self::select_next_match))
-            .on_action(cx.listener(Self::select_prev_match))
-            .child(search_line)
-            .children(query_error_line)
-            .children(replace_line)
-            .children(filter_line)
-            .children(filter_error_line)
-    }
-}
-
-impl EventEmitter<ToolbarItemEvent> for ProjectSearchBar {}
-
-impl ToolbarItemView for ProjectSearchBar {
-    fn set_active_pane_item(
-        &mut self,
-        active_pane_item: Option<&dyn ItemHandle>,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> ToolbarItemLocation {
-        cx.notify();
-        self.subscription = None;
-        self.active_project_search = None;
-        if let Some(search) = active_pane_item.and_then(|i| i.downcast::<ProjectSearchView>()) {
-            self.subscription = Some(cx.observe(&search, |_, _, cx| cx.notify()));
-            self.active_project_search = Some(search);
-            ToolbarItemLocation::PrimaryLeft {}
-        } else {
-            ToolbarItemLocation::Hidden
-        }
-    }
-}
-
-fn register_workspace_action<A: Action>(
-    workspace: &mut Workspace,
-    callback: fn(&mut ProjectSearchBar, &A, &mut Window, &mut Context<ProjectSearchBar>),
-) {
-    workspace.register_action(move |workspace, action: &A, window, cx| {
-        if workspace.has_active_modal(window, cx) && !workspace.hide_modal(window, cx) {
-            cx.propagate();
-            return;
-        }
-
-        workspace.active_pane().update(cx, |pane, cx| {
-            pane.toolbar().update(cx, move |workspace, cx| {
-                if let Some(search_bar) = workspace.item_of_type::<ProjectSearchBar>() {
-                    search_bar.update(cx, move |search_bar, cx| {
-                        if search_bar.active_project_search.is_some() {
-                            callback(search_bar, action, window, cx);
-                            cx.notify();
-                        } else {
-                            cx.propagate();
-                        }
-                    });
-                }
-            });
-        })
-    });
-}
-
-fn register_workspace_action_for_present_search<A: Action>(
-    workspace: &mut Workspace,
-    callback: fn(&mut Workspace, &A, &mut Window, &mut Context<Workspace>),
-) {
-    workspace.register_action(move |workspace, action: &A, window, cx| {
-        if workspace.has_active_modal(window, cx) && !workspace.hide_modal(window, cx) {
-            cx.propagate();
-            return;
-        }
-
-        let should_notify = workspace
-            .active_pane()
-            .read(cx)
-            .toolbar()
-            .read(cx)
-            .item_of_type::<ProjectSearchBar>()
-            .map(|search_bar| search_bar.read(cx).active_project_search.is_some())
-            .unwrap_or(false);
-        if should_notify {
-            callback(workspace, action, window, cx);
-            cx.notify();
-        } else {
-            cx.propagate();
-        }
-    });
-}
-
-#[cfg(any(test, feature = "test-support"))]
-pub fn perform_project_search(
-    search_view: &Entity<ProjectSearchView>,
-    text: impl Into<std::sync::Arc<str>>,
-    cx: &mut gpui::VisualTestContext,
-) {
-    cx.run_until_parked();
-    search_view.update_in(cx, |search_view, window, cx| {
-        search_view.query_editor.update(cx, |query_editor, cx| {
-            query_editor.set_text(text, window, cx)
-        });
-        search_view.search(cx);
-    });
-    cx.run_until_parked();
-}
-
-#[cfg(test)]
-pub mod tests {
-    use std::{
-        ops::Deref as _,
-        path::PathBuf,
-        sync::{
-            Arc,
-            atomic::{self, AtomicUsize},
-        },
-        time::Duration,
-    };
-
-    use super::*;
-    use editor::{DisplayPoint, display_map::DisplayRow};
-    use gpui::{Action, TestAppContext, VisualTestContext, WindowHandle};
-    use language::{FakeLspAdapter, rust_lang};
-    use pretty_assertions::assert_eq;
-    use project::FakeFs;
-    use serde_json::json;
-    use settings::{
-        InlayHintSettingsContent, SettingsStore, ThemeColorsContent, ThemeStyleContent,
-    };
-    use util::{path, paths::PathStyle, rel_path::rel_path};
-    use util_macros::perf;
-    use workspace::DeploySearch;
-
-    #[perf]
-    #[gpui::test]
-    async fn test_project_search(cx: &mut TestAppContext) {
-        fn dp(row: u32, col: u32) -> DisplayPoint {
-            DisplayPoint::new(DisplayRow(row), col)
-        }
-
-        fn assert_active_match_index(
-            search_view: &WindowHandle<ProjectSearchView>,
-            cx: &mut TestAppContext,
-            expected_index: usize,
-        ) {
-            search_view
-                .update(cx, |search_view, _window, _cx| {
-                    assert_eq!(search_view.active_match_index, Some(expected_index));
-                })
-                .unwrap();
-        }
-
-        fn assert_selection_range(
-            search_view: &WindowHandle<ProjectSearchView>,
-            cx: &mut TestAppContext,
-            expected_range: Range<DisplayPoint>,
-        ) {
-            search_view
-                .update(cx, |search_view, _window, cx| {
-                    assert_eq!(
-                        search_view.results_editor.update(cx, |editor, cx| editor
-                            .selections
-                            .display_ranges(&editor.display_snapshot(cx))),
-                        [expected_range]
-                    );
-                })
-                .unwrap();
-        }
-
-        fn assert_highlights(
-            search_view: &WindowHandle<ProjectSearchView>,
-            cx: &mut TestAppContext,
-            expected_highlights: Vec<(Range<DisplayPoint>, &str)>,
-        ) {
-            search_view
-                .update(cx, |search_view, window, cx| {
-                    let match_bg = cx.theme().colors().search_match_background;
-                    let active_match_bg = cx.theme().colors().search_active_match_background;
-                    let selection_bg = cx
-                        .theme()
-                        .colors()
-                        .editor_document_highlight_bracket_background;
-
-                    let highlights: Vec<_> = expected_highlights
-                        .into_iter()
-                        .map(|(range, color_type)| {
-                            let color = match color_type {
-                                "active" => active_match_bg,
-                                "match" => match_bg,
-                                "selection" => selection_bg,
-                                _ => panic!("Unknown color type"),
-                            };
-                            (range, color)
-                        })
-                        .collect();
-
-                    assert_eq!(
-                        search_view.results_editor.update(cx, |editor, cx| editor
-                            .all_text_background_highlights(window, cx)),
-                        highlights.as_slice()
-                    );
-                })
-                .unwrap();
-        }
-
-        fn select_match(
-            search_view: &WindowHandle<ProjectSearchView>,
-            cx: &mut TestAppContext,
-            direction: Direction,
-        ) {
-            search_view
-                .update(cx, |search_view, window, cx| {
-                    search_view.select_match(direction, window, cx);
-                })
-                .unwrap();
-        }
-
-        init_test(cx);
-
-        // Override active search match color since the fallback theme uses the same color
-        // for normal search match and active one, which can make this test less robust.
-        cx.update(|cx| {
-            SettingsStore::update_global(cx, |settings, cx| {
-                settings.update_user_settings(cx, |settings| {
-                    settings.theme.experimental_theme_overrides = Some(ThemeStyleContent {
-                        colors: ThemeColorsContent {
-                            search_active_match_background: Some("#ff0000ff".to_string()),
-                            ..Default::default()
-                        },
-                        ..Default::default()
-                    });
-                });
-            });
-        });
-
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(
-            path!("/dir"),
-            json!({
-                "one.rs": "const ONE: usize = 1;",
-                "two.rs": "const TWO: usize = one::ONE + one::ONE;",
-                "three.rs": "const THREE: usize = one::ONE + two::TWO;",
-                "four.rs": "const FOUR: usize = one::ONE + three::THREE;",
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let window = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let workspace = window.root(cx).unwrap();
-        let search = cx.new(|cx| ProjectSearch::new(project.clone(), cx));
-        let search_view = cx.add_window(|window, cx| {
-            ProjectSearchView::new(workspace.downgrade(), search.clone(), window, cx, None)
-        });
-
-        perform_search(search_view, "TWO", cx);
-        cx.run_until_parked();
-
-        search_view
-            .update(cx, |search_view, _window, cx| {
-                assert_eq!(
-                    search_view
-                        .results_editor
-                        .update(cx, |editor, cx| editor.display_text(cx)),
-                    "\n\nconst THREE: usize = one::ONE + two::TWO;\n\n\nconst TWO: usize = one::ONE + one::ONE;"
-                );
-            })
-            .unwrap();
-
-        assert_active_match_index(&search_view, cx, 0);
-        assert_selection_range(&search_view, cx, dp(2, 32)..dp(2, 35));
-        assert_highlights(
-            &search_view,
-            cx,
-            vec![
-                (dp(2, 32)..dp(2, 35), "active"),
-                (dp(2, 37)..dp(2, 40), "selection"),
-                (dp(2, 37)..dp(2, 40), "match"),
-                (dp(5, 6)..dp(5, 9), "match"),
-                // TODO: we should be getting selection highlight here after project search
-                // but for some reason we are not getting it here
-            ],
-        );
-        select_match(&search_view, cx, Direction::Next);
-        cx.run_until_parked();
-
-        assert_active_match_index(&search_view, cx, 1);
-        assert_selection_range(&search_view, cx, dp(2, 37)..dp(2, 40));
-        assert_highlights(
-            &search_view,
-            cx,
-            vec![
-                (dp(2, 32)..dp(2, 35), "selection"),
-                (dp(2, 32)..dp(2, 35), "match"),
-                (dp(2, 37)..dp(2, 40), "active"),
-                (dp(5, 6)..dp(5, 9), "selection"),
-                (dp(5, 6)..dp(5, 9), "match"),
-            ],
-        );
-        select_match(&search_view, cx, Direction::Next);
-        cx.run_until_parked();
-
-        assert_active_match_index(&search_view, cx, 2);
-        assert_selection_range(&search_view, cx, dp(5, 6)..dp(5, 9));
-        assert_highlights(
-            &search_view,
-            cx,
-            vec![
-                (dp(2, 32)..dp(2, 35), "selection"),
-                (dp(2, 32)..dp(2, 35), "match"),
-                (dp(2, 37)..dp(2, 40), "selection"),
-                (dp(2, 37)..dp(2, 40), "match"),
-                (dp(5, 6)..dp(5, 9), "active"),
-            ],
-        );
-        select_match(&search_view, cx, Direction::Next);
-        cx.run_until_parked();
-
-        assert_active_match_index(&search_view, cx, 0);
-        assert_selection_range(&search_view, cx, dp(2, 32)..dp(2, 35));
-        assert_highlights(
-            &search_view,
-            cx,
-            vec![
-                (dp(2, 32)..dp(2, 35), "active"),
-                (dp(2, 37)..dp(2, 40), "selection"),
-                (dp(2, 37)..dp(2, 40), "match"),
-                (dp(5, 6)..dp(5, 9), "selection"),
-                (dp(5, 6)..dp(5, 9), "match"),
-            ],
-        );
-        select_match(&search_view, cx, Direction::Prev);
-        cx.run_until_parked();
-
-        assert_active_match_index(&search_view, cx, 2);
-        assert_selection_range(&search_view, cx, dp(5, 6)..dp(5, 9));
-        assert_highlights(
-            &search_view,
-            cx,
-            vec![
-                (dp(2, 32)..dp(2, 35), "selection"),
-                (dp(2, 32)..dp(2, 35), "match"),
-                (dp(2, 37)..dp(2, 40), "selection"),
-                (dp(2, 37)..dp(2, 40), "match"),
-                (dp(5, 6)..dp(5, 9), "active"),
-            ],
-        );
-        select_match(&search_view, cx, Direction::Prev);
-        cx.run_until_parked();
-
-        assert_active_match_index(&search_view, cx, 1);
-        assert_selection_range(&search_view, cx, dp(2, 37)..dp(2, 40));
-        assert_highlights(
-            &search_view,
-            cx,
-            vec![
-                (dp(2, 32)..dp(2, 35), "selection"),
-                (dp(2, 32)..dp(2, 35), "match"),
-                (dp(2, 37)..dp(2, 40), "active"),
-                (dp(5, 6)..dp(5, 9), "selection"),
-                (dp(5, 6)..dp(5, 9), "match"),
-            ],
-        );
-    }
-
-    #[perf]
-    #[gpui::test]
-    async fn test_deploy_project_search_focus(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(
-            "/dir",
-            json!({
-                "one.rs": "const ONE: usize = 1;",
-                "two.rs": "const TWO: usize = one::ONE + one::ONE;",
-                "three.rs": "const THREE: usize = one::ONE + two::TWO;",
-                "four.rs": "const FOUR: usize = one::ONE + three::THREE;",
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), ["/dir".as_ref()], cx).await;
-        let window = cx.add_window(|window, cx| Workspace::test_new(project, window, cx));
-        let workspace = window;
-        let search_bar = window.build_entity(cx, |_, _| ProjectSearchBar::new());
-
-        let active_item = cx.read(|cx| {
-            workspace
-                .read(cx)
-                .unwrap()
-                .active_pane()
-                .read(cx)
-                .active_item()
-                .and_then(|item| item.downcast::<ProjectSearchView>())
-        });
-        assert!(
-            active_item.is_none(),
-            "Expected no search panel to be active"
-        );
-
-        window
-            .update(cx, move |workspace, window, cx| {
-                assert_eq!(workspace.panes().len(), 1);
-                workspace.panes()[0].update(cx, |pane, cx| {
-                    pane.toolbar()
-                        .update(cx, |toolbar, cx| toolbar.add_item(search_bar, window, cx))
-                });
-
-                ProjectSearchView::deploy_search(
-                    workspace,
-                    &workspace::DeploySearch::find(),
-                    window,
-                    cx,
-                )
-            })
-            .unwrap();
-
-        let Some(search_view) = cx.read(|cx| {
-            workspace
-                .read(cx)
-                .unwrap()
-                .active_pane()
-                .read(cx)
-                .active_item()
-                .and_then(|item| item.downcast::<ProjectSearchView>())
-        }) else {
-            panic!("Search view expected to appear after new search event trigger")
-        };
-
-        cx.spawn(|mut cx| async move {
-            window
-                .update(&mut cx, |_, window, cx| {
-                    window.dispatch_action(ToggleFocus.boxed_clone(), cx)
-                })
-                .unwrap();
-        })
-        .detach();
-        cx.background_executor.run_until_parked();
-        window
-            .update(cx, |_, window, cx| {
-                search_view.update(cx, |search_view, cx| {
-                    assert!(
-                        search_view.query_editor.focus_handle(cx).is_focused(window),
-                        "Empty search view should be focused after the toggle focus event: no results panel to focus on",
-                    );
-                });
-        }).unwrap();
-
-        window
-            .update(cx, |_, window, cx| {
-                search_view.update(cx, |search_view, cx| {
-                    let query_editor = &search_view.query_editor;
-                    assert!(
-                        query_editor.focus_handle(cx).is_focused(window),
-                        "Search view should be focused after the new search view is activated",
-                    );
-                    let query_text = query_editor.read(cx).text(cx);
-                    assert!(
-                        query_text.is_empty(),
-                        "New search query should be empty but got '{query_text}'",
-                    );
-                    let results_text = search_view
-                        .results_editor
-                        .update(cx, |editor, cx| editor.display_text(cx));
-                    assert!(
-                        results_text.is_empty(),
-                        "Empty search view should have no results but got '{results_text}'"
-                    );
-                });
-            })
-            .unwrap();
-
-        window
-            .update(cx, |_, window, cx| {
-                search_view.update(cx, |search_view, cx| {
-                    search_view.query_editor.update(cx, |query_editor, cx| {
-                        query_editor.set_text("sOMETHINGtHATsURELYdOESnOTeXIST", window, cx)
-                    });
-                    search_view.search(cx);
-                });
-            })
-            .unwrap();
-        cx.background_executor.run_until_parked();
-        window
-            .update(cx, |_, window, cx| {
-                search_view.update(cx, |search_view, cx| {
-                    let results_text = search_view
-                        .results_editor
-                        .update(cx, |editor, cx| editor.display_text(cx));
-                    assert!(
-                        results_text.is_empty(),
-                        "Search view for mismatching query should have no results but got '{results_text}'"
-                    );
-                    assert!(
-                        search_view.query_editor.focus_handle(cx).is_focused(window),
-                        "Search view should be focused after mismatching query had been used in search",
-                    );
-                });
-            }).unwrap();
-
-        cx.spawn(|mut cx| async move {
-            window.update(&mut cx, |_, window, cx| {
-                window.dispatch_action(ToggleFocus.boxed_clone(), cx)
-            })
-        })
-        .detach();
-        cx.background_executor.run_until_parked();
-        window.update(cx, |_, window, cx| {
-            search_view.update(cx, |search_view, cx| {
-                assert!(
-                    search_view.query_editor.focus_handle(cx).is_focused(window),
-                    "Search view with mismatching query should be focused after the toggle focus event: still no results panel to focus on",
-                );
-            });
-        }).unwrap();
-
-        window
-            .update(cx, |_, window, cx| {
-                search_view.update(cx, |search_view, cx| {
-                    search_view.query_editor.update(cx, |query_editor, cx| {
-                        query_editor.set_text("TWO", window, cx)
-                    });
-                    search_view.search(cx);
-                });
-            })
-            .unwrap();
-        cx.background_executor.run_until_parked();
-        window.update(cx, |_, window, cx| {
-            search_view.update(cx, |search_view, cx| {
-                assert_eq!(
-                    search_view
-                        .results_editor
-                        .update(cx, |editor, cx| editor.display_text(cx)),
-                    "\n\nconst THREE: usize = one::ONE + two::TWO;\n\n\nconst TWO: usize = one::ONE + one::ONE;",
-                    "Search view results should match the query"
-                );
-                assert!(
-                    search_view.results_editor.focus_handle(cx).is_focused(window),
-                    "Search view with mismatching query should be focused after search results are available",
-                );
-            });
-        }).unwrap();
-        cx.spawn(|mut cx| async move {
-            window
-                .update(&mut cx, |_, window, cx| {
-                    window.dispatch_action(ToggleFocus.boxed_clone(), cx)
-                })
-                .unwrap();
-        })
-        .detach();
-        cx.background_executor.run_until_parked();
-        window.update(cx, |_, window, cx| {
-            search_view.update(cx, |search_view, cx| {
-                assert!(
-                    search_view.results_editor.focus_handle(cx).is_focused(window),
-                    "Search view with matching query should still have its results editor focused after the toggle focus event",
-                );
-            });
-        }).unwrap();
-
-        workspace
-            .update(cx, |workspace, window, cx| {
-                ProjectSearchView::deploy_search(
-                    workspace,
-                    &workspace::DeploySearch::find(),
-                    window,
-                    cx,
-                )
-            })
-            .unwrap();
-        window.update(cx, |_, window, cx| {
-            search_view.update(cx, |search_view, cx| {
-                assert_eq!(search_view.query_editor.read(cx).text(cx), "two", "Query should be updated to first search result after search view 2nd open in a row");
-                assert_eq!(
-                    search_view
-                        .results_editor
-                        .update(cx, |editor, cx| editor.display_text(cx)),
-                    "\n\nconst THREE: usize = one::ONE + two::TWO;\n\n\nconst TWO: usize = one::ONE + one::ONE;",
-                    "Results should be unchanged after search view 2nd open in a row"
-                );
-                assert!(
-                    search_view.query_editor.focus_handle(cx).is_focused(window),
-                    "Focus should be moved into query editor again after search view 2nd open in a row"
-                );
-            });
-        }).unwrap();
-
-        cx.spawn(|mut cx| async move {
-            window
-                .update(&mut cx, |_, window, cx| {
-                    window.dispatch_action(ToggleFocus.boxed_clone(), cx)
-                })
-                .unwrap();
-        })
-        .detach();
-        cx.background_executor.run_until_parked();
-        window.update(cx, |_, window, cx| {
-            search_view.update(cx, |search_view, cx| {
-                assert!(
-                    search_view.results_editor.focus_handle(cx).is_focused(window),
-                    "Search view with matching query should switch focus to the results editor after the toggle focus event",
-                );
-            });
-        }).unwrap();
-    }
-
-    #[perf]
-    #[gpui::test]
-    async fn test_filters_consider_toggle_state(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(
-            "/dir",
-            json!({
-                "one.rs": "const ONE: usize = 1;",
-                "two.rs": "const TWO: usize = one::ONE + one::ONE;",
-                "three.rs": "const THREE: usize = one::ONE + two::TWO;",
-                "four.rs": "const FOUR: usize = one::ONE + three::THREE;",
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), ["/dir".as_ref()], cx).await;
-        let window = cx.add_window(|window, cx| Workspace::test_new(project, window, cx));
-        let workspace = window;
-        let search_bar = window.build_entity(cx, |_, _| ProjectSearchBar::new());
-
-        window
-            .update(cx, move |workspace, window, cx| {
-                workspace.panes()[0].update(cx, |pane, cx| {
-                    pane.toolbar()
-                        .update(cx, |toolbar, cx| toolbar.add_item(search_bar, window, cx))
-                });
-
-                ProjectSearchView::deploy_search(
-                    workspace,
-                    &workspace::DeploySearch::find(),
-                    window,
-                    cx,
-                )
-            })
-            .unwrap();
-
-        let Some(search_view) = cx.read(|cx| {
-            workspace
-                .read(cx)
-                .unwrap()
-                .active_pane()
-                .read(cx)
-                .active_item()
-                .and_then(|item| item.downcast::<ProjectSearchView>())
-        }) else {
-            panic!("Search view expected to appear after new search event trigger")
-        };
-
-        cx.spawn(|mut cx| async move {
-            window
-                .update(&mut cx, |_, window, cx| {
-                    window.dispatch_action(ToggleFocus.boxed_clone(), cx)
-                })
-                .unwrap();
-        })
-        .detach();
-        cx.background_executor.run_until_parked();
-
-        window
-            .update(cx, |_, window, cx| {
-                search_view.update(cx, |search_view, cx| {
-                    search_view.query_editor.update(cx, |query_editor, cx| {
-                        query_editor.set_text("const FOUR", window, cx)
-                    });
-                    search_view.toggle_filters(cx);
-                    search_view
-                        .excluded_files_editor
-                        .update(cx, |exclude_editor, cx| {
-                            exclude_editor.set_text("four.rs", window, cx)
-                        });
-                    search_view.search(cx);
-                });
-            })
-            .unwrap();
-        cx.background_executor.run_until_parked();
-        window
-            .update(cx, |_, _, cx| {
-                search_view.update(cx, |search_view, cx| {
-                    let results_text = search_view
-                        .results_editor
-                        .update(cx, |editor, cx| editor.display_text(cx));
-                    assert!(
-                        results_text.is_empty(),
-                        "Search view for query with the only match in an excluded file should have no results but got '{results_text}'"
-                    );
-                });
-            }).unwrap();
-
-        cx.spawn(|mut cx| async move {
-            window.update(&mut cx, |_, window, cx| {
-                window.dispatch_action(ToggleFocus.boxed_clone(), cx)
-            })
-        })
-        .detach();
-        cx.background_executor.run_until_parked();
-
-        window
-            .update(cx, |_, _, cx| {
-                search_view.update(cx, |search_view, cx| {
-                    search_view.toggle_filters(cx);
-                    search_view.search(cx);
-                });
-            })
-            .unwrap();
-        cx.background_executor.run_until_parked();
-        window
-            .update(cx, |_, _, cx| {
-                search_view.update(cx, |search_view, cx| {
-                assert_eq!(
-                    search_view
-                        .results_editor
-                        .update(cx, |editor, cx| editor.display_text(cx)),
-                    "\n\nconst FOUR: usize = one::ONE + three::THREE;",
-                    "Search view results should contain the queried result in the previously excluded file with filters toggled off"
-                );
-            });
-            })
-            .unwrap();
-    }
-
-    #[perf]
-    #[gpui::test]
-    async fn test_new_project_search_focus(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(
-            path!("/dir"),
-            json!({
-                "one.rs": "const ONE: usize = 1;",
-                "two.rs": "const TWO: usize = one::ONE + one::ONE;",
-                "three.rs": "const THREE: usize = one::ONE + two::TWO;",
-                "four.rs": "const FOUR: usize = one::ONE + three::THREE;",
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let window = cx.add_window(|window, cx| Workspace::test_new(project, window, cx));
-        let workspace = window;
-        let search_bar = window.build_entity(cx, |_, _| ProjectSearchBar::new());
-
-        let active_item = cx.read(|cx| {
-            workspace
-                .read(cx)
-                .unwrap()
-                .active_pane()
-                .read(cx)
-                .active_item()
-                .and_then(|item| item.downcast::<ProjectSearchView>())
-        });
-        assert!(
-            active_item.is_none(),
-            "Expected no search panel to be active"
-        );
-
-        window
-            .update(cx, move |workspace, window, cx| {
-                assert_eq!(workspace.panes().len(), 1);
-                workspace.panes()[0].update(cx, |pane, cx| {
-                    pane.toolbar()
-                        .update(cx, |toolbar, cx| toolbar.add_item(search_bar, window, cx))
-                });
-
-                ProjectSearchView::new_search(workspace, &workspace::NewSearch, window, cx)
-            })
-            .unwrap();
-
-        let Some(search_view) = cx.read(|cx| {
-            workspace
-                .read(cx)
-                .unwrap()
-                .active_pane()
-                .read(cx)
-                .active_item()
-                .and_then(|item| item.downcast::<ProjectSearchView>())
-        }) else {
-            panic!("Search view expected to appear after new search event trigger")
-        };
-
-        cx.spawn(|mut cx| async move {
-            window
-                .update(&mut cx, |_, window, cx| {
-                    window.dispatch_action(ToggleFocus.boxed_clone(), cx)
-                })
-                .unwrap();
-        })
-        .detach();
-        cx.background_executor.run_until_parked();
-
-        window.update(cx, |_, window, cx| {
-            search_view.update(cx, |search_view, cx| {
-                    assert!(
-                        search_view.query_editor.focus_handle(cx).is_focused(window),
-                        "Empty search view should be focused after the toggle focus event: no results panel to focus on",
-                    );
-                });
-        }).unwrap();
-
-        window
-            .update(cx, |_, window, cx| {
-                search_view.update(cx, |search_view, cx| {
-                    let query_editor = &search_view.query_editor;
-                    assert!(
-                        query_editor.focus_handle(cx).is_focused(window),
-                        "Search view should be focused after the new search view is activated",
-                    );
-                    let query_text = query_editor.read(cx).text(cx);
-                    assert!(
-                        query_text.is_empty(),
-                        "New search query should be empty but got '{query_text}'",
-                    );
-                    let results_text = search_view
-                        .results_editor
-                        .update(cx, |editor, cx| editor.display_text(cx));
-                    assert!(
-                        results_text.is_empty(),
-                        "Empty search view should have no results but got '{results_text}'"
-                    );
-                });
-            })
-            .unwrap();
-
-        window
-            .update(cx, |_, window, cx| {
-                search_view.update(cx, |search_view, cx| {
-                    search_view.query_editor.update(cx, |query_editor, cx| {
-                        query_editor.set_text("sOMETHINGtHATsURELYdOESnOTeXIST", window, cx)
-                    });
-                    search_view.search(cx);
-                });
-            })
-            .unwrap();
-
-        cx.background_executor.run_until_parked();
-        window
-            .update(cx, |_, window, cx| {
-                search_view.update(cx, |search_view, cx| {
-                    let results_text = search_view
-                        .results_editor
-                        .update(cx, |editor, cx| editor.display_text(cx));
-                    assert!(
-                results_text.is_empty(),
-                "Search view for mismatching query should have no results but got '{results_text}'"
-            );
-                    assert!(
-                search_view.query_editor.focus_handle(cx).is_focused(window),
-                "Search view should be focused after mismatching query had been used in search",
-            );
-                });
-            })
-            .unwrap();
-        cx.spawn(|mut cx| async move {
-            window.update(&mut cx, |_, window, cx| {
-                window.dispatch_action(ToggleFocus.boxed_clone(), cx)
-            })
-        })
-        .detach();
-        cx.background_executor.run_until_parked();
-        window.update(cx, |_, window, cx| {
-            search_view.update(cx, |search_view, cx| {
-                    assert!(
-                        search_view.query_editor.focus_handle(cx).is_focused(window),
-                        "Search view with mismatching query should be focused after the toggle focus event: still no results panel to focus on",
-                    );
-                });
-        }).unwrap();
-
-        window
-            .update(cx, |_, window, cx| {
-                search_view.update(cx, |search_view, cx| {
-                    search_view.query_editor.update(cx, |query_editor, cx| {
-                        query_editor.set_text("TWO", window, cx)
-                    });
-                    search_view.search(cx);
-                })
-            })
-            .unwrap();
-        cx.background_executor.run_until_parked();
-        window.update(cx, |_, window, cx|
-        search_view.update(cx, |search_view, cx| {
-                assert_eq!(
-                    search_view
-                        .results_editor
-                        .update(cx, |editor, cx| editor.display_text(cx)),
-                    "\n\nconst THREE: usize = one::ONE + two::TWO;\n\n\nconst TWO: usize = one::ONE + one::ONE;",
-                    "Search view results should match the query"
-                );
-                assert!(
-                    search_view.results_editor.focus_handle(cx).is_focused(window),
-                    "Search view with mismatching query should be focused after search results are available",
-                );
-            })).unwrap();
-        cx.spawn(|mut cx| async move {
-            window
-                .update(&mut cx, |_, window, cx| {
-                    window.dispatch_action(ToggleFocus.boxed_clone(), cx)
-                })
-                .unwrap();
-        })
-        .detach();
-        cx.background_executor.run_until_parked();
-        window.update(cx, |_, window, cx| {
-            search_view.update(cx, |search_view, cx| {
-                    assert!(
-                        search_view.results_editor.focus_handle(cx).is_focused(window),
-                        "Search view with matching query should still have its results editor focused after the toggle focus event",
-                    );
-                });
-        }).unwrap();
-
-        workspace
-            .update(cx, |workspace, window, cx| {
-                ProjectSearchView::new_search(workspace, &workspace::NewSearch, window, cx)
-            })
-            .unwrap();
-        cx.background_executor.run_until_parked();
-        let Some(search_view_2) = cx.read(|cx| {
-            workspace
-                .read(cx)
-                .unwrap()
-                .active_pane()
-                .read(cx)
-                .active_item()
-                .and_then(|item| item.downcast::<ProjectSearchView>())
-        }) else {
-            panic!("Search view expected to appear after new search event trigger")
-        };
-        assert!(
-            search_view_2 != search_view,
-            "New search view should be open after `workspace::NewSearch` event"
-        );
-
-        window.update(cx, |_, window, cx| {
-            search_view.update(cx, |search_view, cx| {
-                    assert_eq!(search_view.query_editor.read(cx).text(cx), "TWO", "First search view should not have an updated query");
-                    assert_eq!(
-                        search_view
-                            .results_editor
-                            .update(cx, |editor, cx| editor.display_text(cx)),
-                        "\n\nconst THREE: usize = one::ONE + two::TWO;\n\n\nconst TWO: usize = one::ONE + one::ONE;",
-                        "Results of the first search view should not update too"
-                    );
-                    assert!(
-                        !search_view.query_editor.focus_handle(cx).is_focused(window),
-                        "Focus should be moved away from the first search view"
-                    );
-                });
-        }).unwrap();
-
-        window.update(cx, |_, window, cx| {
-            search_view_2.update(cx, |search_view_2, cx| {
-                    assert_eq!(
-                        search_view_2.query_editor.read(cx).text(cx),
-                        "two",
-                        "New search view should get the query from the text cursor was at during the event spawn (first search view's first result)"
-                    );
-                    assert_eq!(
-                        search_view_2
-                            .results_editor
-                            .update(cx, |editor, cx| editor.display_text(cx)),
-                        "",
-                        "No search results should be in the 2nd view yet, as we did not spawn a search for it"
-                    );
-                    assert!(
-                        search_view_2.query_editor.focus_handle(cx).is_focused(window),
-                        "Focus should be moved into query editor of the new window"
-                    );
-                });
-        }).unwrap();
-
-        window
-            .update(cx, |_, window, cx| {
-                search_view_2.update(cx, |search_view_2, cx| {
-                    search_view_2.query_editor.update(cx, |query_editor, cx| {
-                        query_editor.set_text("FOUR", window, cx)
-                    });
-                    search_view_2.search(cx);
-                });
-            })
-            .unwrap();
-
-        cx.background_executor.run_until_parked();
-        window.update(cx, |_, window, cx| {
-            search_view_2.update(cx, |search_view_2, cx| {
-                    assert_eq!(
-                        search_view_2
-                            .results_editor
-                            .update(cx, |editor, cx| editor.display_text(cx)),
-                        "\n\nconst FOUR: usize = one::ONE + three::THREE;",
-                        "New search view with the updated query should have new search results"
-                    );
-                    assert!(
-                        search_view_2.results_editor.focus_handle(cx).is_focused(window),
-                        "Search view with mismatching query should be focused after search results are available",
-                    );
-                });
-        }).unwrap();
-
-        cx.spawn(|mut cx| async move {
-            window
-                .update(&mut cx, |_, window, cx| {
-                    window.dispatch_action(ToggleFocus.boxed_clone(), cx)
-                })
-                .unwrap();
-        })
-        .detach();
-        cx.background_executor.run_until_parked();
-        window.update(cx, |_, window, cx| {
-            search_view_2.update(cx, |search_view_2, cx| {
-                    assert!(
-                        search_view_2.results_editor.focus_handle(cx).is_focused(window),
-                        "Search view with matching query should switch focus to the results editor after the toggle focus event",
-                    );
-                });}).unwrap();
-    }
-
-    #[perf]
-    #[gpui::test]
-    async fn test_new_project_search_in_directory(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(
-            path!("/dir"),
-            json!({
-                "a": {
-                    "one.rs": "const ONE: usize = 1;",
-                    "two.rs": "const TWO: usize = one::ONE + one::ONE;",
-                },
-                "b": {
-                    "three.rs": "const THREE: usize = one::ONE + two::TWO;",
-                    "four.rs": "const FOUR: usize = one::ONE + three::THREE;",
-                },
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), ["/dir".as_ref()], cx).await;
-        let worktree_id = project.read_with(cx, |project, cx| {
-            project.worktrees(cx).next().unwrap().read(cx).id()
-        });
-        let window = cx.add_window(|window, cx| Workspace::test_new(project, window, cx));
-        let workspace = window.root(cx).unwrap();
-        let search_bar = window.build_entity(cx, |_, _| ProjectSearchBar::new());
-
-        let active_item = cx.read(|cx| {
-            workspace
-                .read(cx)
-                .active_pane()
-                .read(cx)
-                .active_item()
-                .and_then(|item| item.downcast::<ProjectSearchView>())
-        });
-        assert!(
-            active_item.is_none(),
-            "Expected no search panel to be active"
-        );
-
-        window
-            .update(cx, move |workspace, window, cx| {
-                assert_eq!(workspace.panes().len(), 1);
-                workspace.panes()[0].update(cx, move |pane, cx| {
-                    pane.toolbar()
-                        .update(cx, |toolbar, cx| toolbar.add_item(search_bar, window, cx))
-                });
-            })
-            .unwrap();
-
-        let a_dir_entry = cx.update(|cx| {
-            workspace
-                .read(cx)
-                .project()
-                .read(cx)
-                .entry_for_path(&(worktree_id, rel_path("a")).into(), cx)
-                .expect("no entry for /a/ directory")
-                .clone()
-        });
-        assert!(a_dir_entry.is_dir());
-        window
-            .update(cx, |workspace, window, cx| {
-                ProjectSearchView::new_search_in_directory(workspace, &a_dir_entry.path, window, cx)
-            })
-            .unwrap();
-
-        let Some(search_view) = cx.read(|cx| {
-            workspace
-                .read(cx)
-                .active_pane()
-                .read(cx)
-                .active_item()
-                .and_then(|item| item.downcast::<ProjectSearchView>())
-        }) else {
-            panic!("Search view expected to appear after new search in directory event trigger")
-        };
-        cx.background_executor.run_until_parked();
-        window
-            .update(cx, |_, window, cx| {
-                search_view.update(cx, |search_view, cx| {
-                    assert!(
-                        search_view.query_editor.focus_handle(cx).is_focused(window),
-                        "On new search in directory, focus should be moved into query editor"
-                    );
-                    search_view.excluded_files_editor.update(cx, |editor, cx| {
-                        assert!(
-                            editor.display_text(cx).is_empty(),
-                            "New search in directory should not have any excluded files"
-                        );
-                    });
-                    search_view.included_files_editor.update(cx, |editor, cx| {
-                        assert_eq!(
-                            editor.display_text(cx),
-                            a_dir_entry.path.display(PathStyle::local()),
-                            "New search in directory should have included dir entry path"
-                        );
-                    });
-                });
-            })
-            .unwrap();
-        window
-            .update(cx, |_, window, cx| {
-                search_view.update(cx, |search_view, cx| {
-                    search_view.query_editor.update(cx, |query_editor, cx| {
-                        query_editor.set_text("const", window, cx)
-                    });
-                    search_view.search(cx);
-                });
-            })
-            .unwrap();
-        cx.background_executor.run_until_parked();
-        window
-            .update(cx, |_, _, cx| {
-                search_view.update(cx, |search_view, cx| {
-                    assert_eq!(
-                search_view
-                    .results_editor
-                    .update(cx, |editor, cx| editor.display_text(cx)),
-                "\n\nconst ONE: usize = 1;\n\n\nconst TWO: usize = one::ONE + one::ONE;",
-                "New search in directory should have a filter that matches a certain directory"
-            );
-                })
-            })
-            .unwrap();
-    }
-
-    #[perf]
-    #[gpui::test]
-    async fn test_search_query_history(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(
-            path!("/dir"),
-            json!({
-                "one.rs": "const ONE: usize = 1;",
-                "two.rs": "const TWO: usize = one::ONE + one::ONE;",
-                "three.rs": "const THREE: usize = one::ONE + two::TWO;",
-                "four.rs": "const FOUR: usize = one::ONE + three::THREE;",
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let window = cx.add_window(|window, cx| Workspace::test_new(project, window, cx));
-        let workspace = window.root(cx).unwrap();
-        let search_bar = window.build_entity(cx, |_, _| ProjectSearchBar::new());
-
-        window
-            .update(cx, {
-                let search_bar = search_bar.clone();
-                |workspace, window, cx| {
-                    assert_eq!(workspace.panes().len(), 1);
-                    workspace.panes()[0].update(cx, |pane, cx| {
-                        pane.toolbar()
-                            .update(cx, |toolbar, cx| toolbar.add_item(search_bar, window, cx))
-                    });
-
-                    ProjectSearchView::new_search(workspace, &workspace::NewSearch, window, cx)
-                }
-            })
-            .unwrap();
-
-        let search_view = cx.read(|cx| {
-            workspace
-                .read(cx)
-                .active_pane()
-                .read(cx)
-                .active_item()
-                .and_then(|item| item.downcast::<ProjectSearchView>())
-                .expect("Search view expected to appear after new search event trigger")
-        });
-
-        // Add 3 search items into the history + another unsubmitted one.
-        window
-            .update(cx, |_, window, cx| {
-                search_view.update(cx, |search_view, cx| {
-                    search_view.search_options = SearchOptions::CASE_SENSITIVE;
-                    search_view.query_editor.update(cx, |query_editor, cx| {
-                        query_editor.set_text("ONE", window, cx)
-                    });
-                    search_view.search(cx);
-                });
-            })
-            .unwrap();
-
-        cx.background_executor.run_until_parked();
-        window
-            .update(cx, |_, window, cx| {
-                search_view.update(cx, |search_view, cx| {
-                    search_view.query_editor.update(cx, |query_editor, cx| {
-                        query_editor.set_text("TWO", window, cx)
-                    });
-                    search_view.search(cx);
-                });
-            })
-            .unwrap();
-        cx.background_executor.run_until_parked();
-        window
-            .update(cx, |_, window, cx| {
-                search_view.update(cx, |search_view, cx| {
-                    search_view.query_editor.update(cx, |query_editor, cx| {
-                        query_editor.set_text("THREE", window, cx)
-                    });
-                    search_view.search(cx);
-                })
-            })
-            .unwrap();
-        cx.background_executor.run_until_parked();
-        window
-            .update(cx, |_, window, cx| {
-                search_view.update(cx, |search_view, cx| {
-                    search_view.query_editor.update(cx, |query_editor, cx| {
-                        query_editor.set_text("JUST_TEXT_INPUT", window, cx)
-                    });
-                })
-            })
-            .unwrap();
-        cx.background_executor.run_until_parked();
-
-        // Ensure that the latest input with search settings is active.
-        window
-            .update(cx, |_, _, cx| {
-                search_view.update(cx, |search_view, cx| {
-                    assert_eq!(
-                        search_view.query_editor.read(cx).text(cx),
-                        "JUST_TEXT_INPUT"
-                    );
-                    assert_eq!(search_view.search_options, SearchOptions::CASE_SENSITIVE);
-                });
-            })
-            .unwrap();
-
-        // Next history query after the latest should set the query to the empty string.
-        window
-            .update(cx, |_, window, cx| {
-                search_bar.update(cx, |search_bar, cx| {
-                    search_bar.focus_search(window, cx);
-                    search_bar.next_history_query(&NextHistoryQuery, window, cx);
-                })
-            })
-            .unwrap();
-        window
-            .update(cx, |_, _, cx| {
-                search_view.update(cx, |search_view, cx| {
-                    assert_eq!(search_view.query_editor.read(cx).text(cx), "");
-                    assert_eq!(search_view.search_options, SearchOptions::CASE_SENSITIVE);
-                });
-            })
-            .unwrap();
-        window
-            .update(cx, |_, window, cx| {
-                search_bar.update(cx, |search_bar, cx| {
-                    search_bar.focus_search(window, cx);
-                    search_bar.next_history_query(&NextHistoryQuery, window, cx);
-                })
-            })
-            .unwrap();
-        window
-            .update(cx, |_, _, cx| {
-                search_view.update(cx, |search_view, cx| {
-                    assert_eq!(search_view.query_editor.read(cx).text(cx), "");
-                    assert_eq!(search_view.search_options, SearchOptions::CASE_SENSITIVE);
-                });
-            })
-            .unwrap();
-
-        // First previous query for empty current query should set the query to the latest submitted one.
-        window
-            .update(cx, |_, window, cx| {
-                search_bar.update(cx, |search_bar, cx| {
-                    search_bar.focus_search(window, cx);
-                    search_bar.previous_history_query(&PreviousHistoryQuery, window, cx);
-                });
-            })
-            .unwrap();
-        window
-            .update(cx, |_, _, cx| {
-                search_view.update(cx, |search_view, cx| {
-                    assert_eq!(search_view.query_editor.read(cx).text(cx), "THREE");
-                    assert_eq!(search_view.search_options, SearchOptions::CASE_SENSITIVE);
-                });
-            })
-            .unwrap();
-
-        // Further previous items should go over the history in reverse order.
-        window
-            .update(cx, |_, window, cx| {
-                search_bar.update(cx, |search_bar, cx| {
-                    search_bar.focus_search(window, cx);
-                    search_bar.previous_history_query(&PreviousHistoryQuery, window, cx);
-                });
-            })
-            .unwrap();
-        window
-            .update(cx, |_, _, cx| {
-                search_view.update(cx, |search_view, cx| {
-                    assert_eq!(search_view.query_editor.read(cx).text(cx), "TWO");
-                    assert_eq!(search_view.search_options, SearchOptions::CASE_SENSITIVE);
-                });
-            })
-            .unwrap();
-
-        // Previous items should never go behind the first history item.
-        window
-            .update(cx, |_, window, cx| {
-                search_bar.update(cx, |search_bar, cx| {
-                    search_bar.focus_search(window, cx);
-                    search_bar.previous_history_query(&PreviousHistoryQuery, window, cx);
-                });
-            })
-            .unwrap();
-        window
-            .update(cx, |_, _, cx| {
-                search_view.update(cx, |search_view, cx| {
-                    assert_eq!(search_view.query_editor.read(cx).text(cx), "ONE");
-                    assert_eq!(search_view.search_options, SearchOptions::CASE_SENSITIVE);
-                });
-            })
-            .unwrap();
-        window
-            .update(cx, |_, window, cx| {
-                search_bar.update(cx, |search_bar, cx| {
-                    search_bar.focus_search(window, cx);
-                    search_bar.previous_history_query(&PreviousHistoryQuery, window, cx);
-                });
-            })
-            .unwrap();
-        window
-            .update(cx, |_, _, cx| {
-                search_view.update(cx, |search_view, cx| {
-                    assert_eq!(search_view.query_editor.read(cx).text(cx), "ONE");
-                    assert_eq!(search_view.search_options, SearchOptions::CASE_SENSITIVE);
-                });
-            })
-            .unwrap();
-
-        // Next items should go over the history in the original order.
-        window
-            .update(cx, |_, window, cx| {
-                search_bar.update(cx, |search_bar, cx| {
-                    search_bar.focus_search(window, cx);
-                    search_bar.next_history_query(&NextHistoryQuery, window, cx);
-                });
-            })
-            .unwrap();
-        window
-            .update(cx, |_, _, cx| {
-                search_view.update(cx, |search_view, cx| {
-                    assert_eq!(search_view.query_editor.read(cx).text(cx), "TWO");
-                    assert_eq!(search_view.search_options, SearchOptions::CASE_SENSITIVE);
-                });
-            })
-            .unwrap();
-
-        window
-            .update(cx, |_, window, cx| {
-                search_view.update(cx, |search_view, cx| {
-                    search_view.query_editor.update(cx, |query_editor, cx| {
-                        query_editor.set_text("TWO_NEW", window, cx)
-                    });
-                    search_view.search(cx);
-                });
-            })
-            .unwrap();
-        cx.background_executor.run_until_parked();
-        window
-            .update(cx, |_, _, cx| {
-                search_view.update(cx, |search_view, cx| {
-                    assert_eq!(search_view.query_editor.read(cx).text(cx), "TWO_NEW");
-                    assert_eq!(search_view.search_options, SearchOptions::CASE_SENSITIVE);
-                });
-            })
-            .unwrap();
-
-        // New search input should add another entry to history and move the selection to the end of the history.
-        window
-            .update(cx, |_, window, cx| {
-                search_bar.update(cx, |search_bar, cx| {
-                    search_bar.focus_search(window, cx);
-                    search_bar.previous_history_query(&PreviousHistoryQuery, window, cx);
-                });
-            })
-            .unwrap();
-        window
-            .update(cx, |_, _, cx| {
-                search_view.update(cx, |search_view, cx| {
-                    assert_eq!(search_view.query_editor.read(cx).text(cx), "THREE");
-                    assert_eq!(search_view.search_options, SearchOptions::CASE_SENSITIVE);
-                });
-            })
-            .unwrap();
-        window
-            .update(cx, |_, window, cx| {
-                search_bar.update(cx, |search_bar, cx| {
-                    search_bar.focus_search(window, cx);
-                    search_bar.previous_history_query(&PreviousHistoryQuery, window, cx);
-                });
-            })
-            .unwrap();
-        window
-            .update(cx, |_, _, cx| {
-                search_view.update(cx, |search_view, cx| {
-                    assert_eq!(search_view.query_editor.read(cx).text(cx), "TWO");
-                    assert_eq!(search_view.search_options, SearchOptions::CASE_SENSITIVE);
-                });
-            })
-            .unwrap();
-        window
-            .update(cx, |_, window, cx| {
-                search_bar.update(cx, |search_bar, cx| {
-                    search_bar.focus_search(window, cx);
-                    search_bar.next_history_query(&NextHistoryQuery, window, cx);
-                });
-            })
-            .unwrap();
-        window
-            .update(cx, |_, _, cx| {
-                search_view.update(cx, |search_view, cx| {
-                    assert_eq!(search_view.query_editor.read(cx).text(cx), "THREE");
-                    assert_eq!(search_view.search_options, SearchOptions::CASE_SENSITIVE);
-                });
-            })
-            .unwrap();
-        window
-            .update(cx, |_, window, cx| {
-                search_bar.update(cx, |search_bar, cx| {
-                    search_bar.focus_search(window, cx);
-                    search_bar.next_history_query(&NextHistoryQuery, window, cx);
-                });
-            })
-            .unwrap();
-        window
-            .update(cx, |_, _, cx| {
-                search_view.update(cx, |search_view, cx| {
-                    assert_eq!(search_view.query_editor.read(cx).text(cx), "TWO_NEW");
-                    assert_eq!(search_view.search_options, SearchOptions::CASE_SENSITIVE);
-                });
-            })
-            .unwrap();
-        window
-            .update(cx, |_, window, cx| {
-                search_bar.update(cx, |search_bar, cx| {
-                    search_bar.focus_search(window, cx);
-                    search_bar.next_history_query(&NextHistoryQuery, window, cx);
-                });
-            })
-            .unwrap();
-        window
-            .update(cx, |_, _, cx| {
-                search_view.update(cx, |search_view, cx| {
-                    assert_eq!(search_view.query_editor.read(cx).text(cx), "");
-                    assert_eq!(search_view.search_options, SearchOptions::CASE_SENSITIVE);
-                });
-            })
-            .unwrap();
-    }
-
-    #[perf]
-    #[gpui::test]
-    async fn test_search_query_history_with_multiple_views(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(
-            path!("/dir"),
-            json!({
-                "one.rs": "const ONE: usize = 1;",
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let worktree_id = project.update(cx, |this, cx| {
-            this.worktrees(cx).next().unwrap().read(cx).id()
-        });
-
-        let window = cx.add_window(|window, cx| Workspace::test_new(project, window, cx));
-        let workspace = window.root(cx).unwrap();
-
-        let panes: Vec<_> = window
-            .update(cx, |this, _, _| this.panes().to_owned())
-            .unwrap();
-
-        let search_bar_1 = window.build_entity(cx, |_, _| ProjectSearchBar::new());
-        let search_bar_2 = window.build_entity(cx, |_, _| ProjectSearchBar::new());
-
-        assert_eq!(panes.len(), 1);
-        let first_pane = panes.first().cloned().unwrap();
-        assert_eq!(cx.update(|cx| first_pane.read(cx).items_len()), 0);
-        window
-            .update(cx, |workspace, window, cx| {
-                workspace.open_path(
-                    (worktree_id, rel_path("one.rs")),
-                    Some(first_pane.downgrade()),
-                    true,
-                    window,
-                    cx,
-                )
-            })
-            .unwrap()
-            .await
-            .unwrap();
-        assert_eq!(cx.update(|cx| first_pane.read(cx).items_len()), 1);
-
-        // Add a project search item to the first pane
-        window
-            .update(cx, {
-                let search_bar = search_bar_1.clone();
-                |workspace, window, cx| {
-                    first_pane.update(cx, |pane, cx| {
-                        pane.toolbar()
-                            .update(cx, |toolbar, cx| toolbar.add_item(search_bar, window, cx))
-                    });
-
-                    ProjectSearchView::new_search(workspace, &workspace::NewSearch, window, cx)
-                }
-            })
-            .unwrap();
-        let search_view_1 = cx.read(|cx| {
-            workspace
-                .read(cx)
-                .active_item(cx)
-                .and_then(|item| item.downcast::<ProjectSearchView>())
-                .expect("Search view expected to appear after new search event trigger")
-        });
-
-        let second_pane = window
-            .update(cx, |workspace, window, cx| {
-                workspace.split_and_clone(
-                    first_pane.clone(),
-                    workspace::SplitDirection::Right,
-                    window,
-                    cx,
-                )
-            })
-            .unwrap()
-            .await
-            .unwrap();
-        assert_eq!(cx.update(|cx| second_pane.read(cx).items_len()), 1);
-
-        assert_eq!(cx.update(|cx| second_pane.read(cx).items_len()), 1);
-        assert_eq!(cx.update(|cx| first_pane.read(cx).items_len()), 2);
-
-        // Add a project search item to the second pane
-        window
-            .update(cx, {
-                let search_bar = search_bar_2.clone();
-                let pane = second_pane.clone();
-                move |workspace, window, cx| {
-                    assert_eq!(workspace.panes().len(), 2);
-                    pane.update(cx, |pane, cx| {
-                        pane.toolbar()
-                            .update(cx, |toolbar, cx| toolbar.add_item(search_bar, window, cx))
-                    });
-
-                    ProjectSearchView::new_search(workspace, &workspace::NewSearch, window, cx)
-                }
-            })
-            .unwrap();
-
-        let search_view_2 = cx.read(|cx| {
-            workspace
-                .read(cx)
-                .active_item(cx)
-                .and_then(|item| item.downcast::<ProjectSearchView>())
-                .expect("Search view expected to appear after new search event trigger")
-        });
-
-        cx.run_until_parked();
-        assert_eq!(cx.update(|cx| first_pane.read(cx).items_len()), 2);
-        assert_eq!(cx.update(|cx| second_pane.read(cx).items_len()), 2);
-
-        let update_search_view =
-            |search_view: &Entity<ProjectSearchView>, query: &str, cx: &mut TestAppContext| {
-                window
-                    .update(cx, |_, window, cx| {
-                        search_view.update(cx, |search_view, cx| {
-                            search_view.query_editor.update(cx, |query_editor, cx| {
-                                query_editor.set_text(query, window, cx)
-                            });
-                            search_view.search(cx);
-                        });
-                    })
-                    .unwrap();
-            };
-
-        let active_query =
-            |search_view: &Entity<ProjectSearchView>, cx: &mut TestAppContext| -> String {
-                window
-                    .update(cx, |_, _, cx| {
-                        search_view.update(cx, |search_view, cx| {
-                            search_view.query_editor.read(cx).text(cx)
-                        })
-                    })
-                    .unwrap()
-            };
-
-        let select_prev_history_item =
-            |search_bar: &Entity<ProjectSearchBar>, cx: &mut TestAppContext| {
-                window
-                    .update(cx, |_, window, cx| {
-                        search_bar.update(cx, |search_bar, cx| {
-                            search_bar.focus_search(window, cx);
-                            search_bar.previous_history_query(&PreviousHistoryQuery, window, cx);
-                        })
-                    })
-                    .unwrap();
-            };
-
-        let select_next_history_item =
-            |search_bar: &Entity<ProjectSearchBar>, cx: &mut TestAppContext| {
-                window
-                    .update(cx, |_, window, cx| {
-                        search_bar.update(cx, |search_bar, cx| {
-                            search_bar.focus_search(window, cx);
-                            search_bar.next_history_query(&NextHistoryQuery, window, cx);
-                        })
-                    })
-                    .unwrap();
-            };
-
-        update_search_view(&search_view_1, "ONE", cx);
-        cx.background_executor.run_until_parked();
-
-        update_search_view(&search_view_2, "TWO", cx);
-        cx.background_executor.run_until_parked();
-
-        assert_eq!(active_query(&search_view_1, cx), "ONE");
-        assert_eq!(active_query(&search_view_2, cx), "TWO");
-
-        // Selecting previous history item should select the query from search view 1.
-        select_prev_history_item(&search_bar_2, cx);
-        assert_eq!(active_query(&search_view_2, cx), "ONE");
-
-        // Selecting the previous history item should not change the query as it is already the first item.
-        select_prev_history_item(&search_bar_2, cx);
-        assert_eq!(active_query(&search_view_2, cx), "ONE");
-
-        // Changing the query in search view 2 should not affect the history of search view 1.
-        assert_eq!(active_query(&search_view_1, cx), "ONE");
-
-        // Deploying a new search in search view 2
-        update_search_view(&search_view_2, "THREE", cx);
-        cx.background_executor.run_until_parked();
-
-        select_next_history_item(&search_bar_2, cx);
-        assert_eq!(active_query(&search_view_2, cx), "");
-
-        select_prev_history_item(&search_bar_2, cx);
-        assert_eq!(active_query(&search_view_2, cx), "THREE");
-
-        select_prev_history_item(&search_bar_2, cx);
-        assert_eq!(active_query(&search_view_2, cx), "TWO");
-
-        select_prev_history_item(&search_bar_2, cx);
-        assert_eq!(active_query(&search_view_2, cx), "ONE");
-
-        select_prev_history_item(&search_bar_2, cx);
-        assert_eq!(active_query(&search_view_2, cx), "ONE");
-
-        // Search view 1 should now see the query from search view 2.
-        assert_eq!(active_query(&search_view_1, cx), "ONE");
-
-        select_next_history_item(&search_bar_2, cx);
-        assert_eq!(active_query(&search_view_2, cx), "TWO");
-
-        // Here is the new query from search view 2
-        select_next_history_item(&search_bar_2, cx);
-        assert_eq!(active_query(&search_view_2, cx), "THREE");
-
-        select_next_history_item(&search_bar_2, cx);
-        assert_eq!(active_query(&search_view_2, cx), "");
-
-        select_next_history_item(&search_bar_1, cx);
-        assert_eq!(active_query(&search_view_1, cx), "TWO");
-
-        select_next_history_item(&search_bar_1, cx);
-        assert_eq!(active_query(&search_view_1, cx), "THREE");
-
-        select_next_history_item(&search_bar_1, cx);
-        assert_eq!(active_query(&search_view_1, cx), "");
-    }
-
-    #[perf]
-    #[gpui::test]
-    async fn test_deploy_search_with_multiple_panes(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        // Setup 2 panes, both with a file open and one with a project search.
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(
-            path!("/dir"),
-            json!({
-                "one.rs": "const ONE: usize = 1;",
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let worktree_id = project.update(cx, |this, cx| {
-            this.worktrees(cx).next().unwrap().read(cx).id()
-        });
-        let window = cx.add_window(|window, cx| Workspace::test_new(project, window, cx));
-        let panes: Vec<_> = window
-            .update(cx, |this, _, _| this.panes().to_owned())
-            .unwrap();
-        assert_eq!(panes.len(), 1);
-        let first_pane = panes.first().cloned().unwrap();
-        assert_eq!(cx.update(|cx| first_pane.read(cx).items_len()), 0);
-        window
-            .update(cx, |workspace, window, cx| {
-                workspace.open_path(
-                    (worktree_id, rel_path("one.rs")),
-                    Some(first_pane.downgrade()),
-                    true,
-                    window,
-                    cx,
-                )
-            })
-            .unwrap()
-            .await
-            .unwrap();
-        assert_eq!(cx.update(|cx| first_pane.read(cx).items_len()), 1);
-        let second_pane = window
-            .update(cx, |workspace, window, cx| {
-                workspace.split_and_clone(
-                    first_pane.clone(),
-                    workspace::SplitDirection::Right,
-                    window,
-                    cx,
-                )
-            })
-            .unwrap()
-            .await
-            .unwrap();
-        assert_eq!(cx.update(|cx| second_pane.read(cx).items_len()), 1);
-        assert!(
-            window
-                .update(cx, |_, window, cx| second_pane
-                    .focus_handle(cx)
-                    .contains_focused(window, cx))
-                .unwrap()
-        );
-        let search_bar = window.build_entity(cx, |_, _| ProjectSearchBar::new());
-        window
-            .update(cx, {
-                let search_bar = search_bar.clone();
-                let pane = first_pane.clone();
-                move |workspace, window, cx| {
-                    assert_eq!(workspace.panes().len(), 2);
-                    pane.update(cx, move |pane, cx| {
-                        pane.toolbar()
-                            .update(cx, |toolbar, cx| toolbar.add_item(search_bar, window, cx))
-                    });
-                }
-            })
-            .unwrap();
-
-        // Add a project search item to the second pane
-        window
-            .update(cx, {
-                |workspace, window, cx| {
-                    assert_eq!(workspace.panes().len(), 2);
-                    second_pane.update(cx, |pane, cx| {
-                        pane.toolbar()
-                            .update(cx, |toolbar, cx| toolbar.add_item(search_bar, window, cx))
-                    });
-
-                    ProjectSearchView::new_search(workspace, &workspace::NewSearch, window, cx)
-                }
-            })
-            .unwrap();
-
-        cx.run_until_parked();
-        assert_eq!(cx.update(|cx| second_pane.read(cx).items_len()), 2);
-        assert_eq!(cx.update(|cx| first_pane.read(cx).items_len()), 1);
-
-        // Focus the first pane
-        window
-            .update(cx, |workspace, window, cx| {
-                assert_eq!(workspace.active_pane(), &second_pane);
-                second_pane.update(cx, |this, cx| {
-                    assert_eq!(this.active_item_index(), 1);
-                    this.activate_previous_item(&Default::default(), window, cx);
-                    assert_eq!(this.active_item_index(), 0);
-                });
-                workspace.activate_pane_in_direction(workspace::SplitDirection::Left, window, cx);
-            })
-            .unwrap();
-        window
-            .update(cx, |workspace, _, cx| {
-                assert_eq!(workspace.active_pane(), &first_pane);
-                assert_eq!(first_pane.read(cx).items_len(), 1);
-                assert_eq!(second_pane.read(cx).items_len(), 2);
-            })
-            .unwrap();
-
-        // Deploy a new search
-        cx.dispatch_action(window.into(), DeploySearch::find());
-
-        // Both panes should now have a project search in them
-        window
-            .update(cx, |workspace, window, cx| {
-                assert_eq!(workspace.active_pane(), &first_pane);
-                first_pane.read_with(cx, |this, _| {
-                    assert_eq!(this.active_item_index(), 1);
-                    assert_eq!(this.items_len(), 2);
-                });
-                second_pane.update(cx, |this, cx| {
-                    assert!(!cx.focus_handle().contains_focused(window, cx));
-                    assert_eq!(this.items_len(), 2);
-                });
-            })
-            .unwrap();
-
-        // Focus the second pane's non-search item
-        window
-            .update(cx, |_workspace, window, cx| {
-                second_pane.update(cx, |pane, cx| {
-                    pane.activate_next_item(&Default::default(), window, cx)
-                });
-            })
-            .unwrap();
-
-        // Deploy a new search
-        cx.dispatch_action(window.into(), DeploySearch::find());
-
-        // The project search view should now be focused in the second pane
-        // And the number of items should be unchanged.
-        window
-            .update(cx, |_workspace, _, cx| {
-                second_pane.update(cx, |pane, _cx| {
-                    assert!(
-                        pane.active_item()
-                            .unwrap()
-                            .downcast::<ProjectSearchView>()
-                            .is_some()
-                    );
-
-                    assert_eq!(pane.items_len(), 2);
-                });
-            })
-            .unwrap();
-    }
-
-    #[perf]
-    #[gpui::test]
-    async fn test_scroll_search_results_to_top(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        // We need many lines in the search results to be able to scroll the window
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(
-            path!("/dir"),
-            json!({
-                "1.txt": "\n\n\n\n\n A \n\n\n\n\n",
-                "2.txt": "\n\n\n\n\n A \n\n\n\n\n",
-                "3.rs": "\n\n\n\n\n A \n\n\n\n\n",
-                "4.rs": "\n\n\n\n\n A \n\n\n\n\n",
-                "5.rs": "\n\n\n\n\n A \n\n\n\n\n",
-                "6.rs": "\n\n\n\n\n A \n\n\n\n\n",
-                "7.rs": "\n\n\n\n\n A \n\n\n\n\n",
-                "8.rs": "\n\n\n\n\n A \n\n\n\n\n",
-                "9.rs": "\n\n\n\n\n A \n\n\n\n\n",
-                "a.rs": "\n\n\n\n\n A \n\n\n\n\n",
-                "b.rs": "\n\n\n\n\n B \n\n\n\n\n",
-                "c.rs": "\n\n\n\n\n B \n\n\n\n\n",
-                "d.rs": "\n\n\n\n\n B \n\n\n\n\n",
-                "e.rs": "\n\n\n\n\n B \n\n\n\n\n",
-                "f.rs": "\n\n\n\n\n B \n\n\n\n\n",
-                "g.rs": "\n\n\n\n\n B \n\n\n\n\n",
-                "h.rs": "\n\n\n\n\n B \n\n\n\n\n",
-                "i.rs": "\n\n\n\n\n B \n\n\n\n\n",
-                "j.rs": "\n\n\n\n\n B \n\n\n\n\n",
-                "k.rs": "\n\n\n\n\n B \n\n\n\n\n",
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let window = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let workspace = window.root(cx).unwrap();
-        let search = cx.new(|cx| ProjectSearch::new(project, cx));
-        let search_view = cx.add_window(|window, cx| {
-            ProjectSearchView::new(workspace.downgrade(), search.clone(), window, cx, None)
-        });
-
-        // First search
-        perform_search(search_view, "A", cx);
-        search_view
-            .update(cx, |search_view, window, cx| {
-                search_view.results_editor.update(cx, |results_editor, cx| {
-                    // Results are correct and scrolled to the top
-                    assert_eq!(
-                        results_editor.display_text(cx).match_indices(" A ").count(),
-                        10
-                    );
-                    assert_eq!(results_editor.scroll_position(cx), Point::default());
-
-                    // Scroll results all the way down
-                    results_editor.scroll(
-                        Point::new(0., f64::MAX),
-                        Some(Axis::Vertical),
-                        window,
-                        cx,
-                    );
-                });
-            })
-            .expect("unable to update search view");
-
-        // Second search
-        perform_search(search_view, "B", cx);
-        search_view
-            .update(cx, |search_view, _, cx| {
-                search_view.results_editor.update(cx, |results_editor, cx| {
-                    // Results are correct...
-                    assert_eq!(
-                        results_editor.display_text(cx).match_indices(" B ").count(),
-                        10
-                    );
-                    // ...and scrolled back to the top
-                    assert_eq!(results_editor.scroll_position(cx), Point::default());
-                });
-            })
-            .expect("unable to update search view");
-    }
-
-    #[perf]
-    #[gpui::test]
-    async fn test_buffer_search_query_reused(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(
-            path!("/dir"),
-            json!({
-                "one.rs": "const ONE: usize = 1;",
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let worktree_id = project.update(cx, |this, cx| {
-            this.worktrees(cx).next().unwrap().read(cx).id()
-        });
-        let window = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let workspace = window.root(cx).unwrap();
-        let mut cx = VisualTestContext::from_window(*window.deref(), cx);
-
-        let editor = workspace
-            .update_in(&mut cx, |workspace, window, cx| {
-                workspace.open_path((worktree_id, rel_path("one.rs")), None, true, window, cx)
-            })
-            .await
-            .unwrap()
-            .downcast::<Editor>()
-            .unwrap();
-
-        // Wait for the unstaged changes to be loaded
-        cx.run_until_parked();
-
-        let buffer_search_bar = cx.new_window_entity(|window, cx| {
-            let mut search_bar =
-                BufferSearchBar::new(Some(project.read(cx).languages().clone()), window, cx);
-            search_bar.set_active_pane_item(Some(&editor), window, cx);
-            search_bar.show(window, cx);
-            search_bar
-        });
-
-        let panes: Vec<_> = window
-            .update(&mut cx, |this, _, _| this.panes().to_owned())
-            .unwrap();
-        assert_eq!(panes.len(), 1);
-        let pane = panes.first().cloned().unwrap();
-        pane.update_in(&mut cx, |pane, window, cx| {
-            pane.toolbar().update(cx, |toolbar, cx| {
-                toolbar.add_item(buffer_search_bar.clone(), window, cx);
-            })
-        });
-
-        let buffer_search_query = "search bar query";
-        buffer_search_bar
-            .update_in(&mut cx, |buffer_search_bar, window, cx| {
-                buffer_search_bar.focus_handle(cx).focus(window);
-                buffer_search_bar.search(buffer_search_query, None, true, window, cx)
-            })
-            .await
-            .unwrap();
-
-        workspace.update_in(&mut cx, |workspace, window, cx| {
-            ProjectSearchView::new_search(workspace, &workspace::NewSearch, window, cx)
-        });
-        cx.run_until_parked();
-        let project_search_view = pane
-            .read_with(&cx, |pane, _| {
-                pane.active_item()
-                    .and_then(|item| item.downcast::<ProjectSearchView>())
-            })
-            .expect("should open a project search view after spawning a new search");
-        project_search_view.update(&mut cx, |search_view, cx| {
-            assert_eq!(
-                search_view.search_query_text(cx),
-                buffer_search_query,
-                "Project search should take the query from the buffer search bar since it got focused and had a query inside"
-            );
-        });
-    }
-
-    #[gpui::test]
-    async fn test_search_dismisses_modal(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(
-            path!("/dir"),
-            json!({
-                "one.rs": "const ONE: usize = 1;",
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let window = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-        struct EmptyModalView {
-            focus_handle: gpui::FocusHandle,
-        }
-        impl EventEmitter<gpui::DismissEvent> for EmptyModalView {}
-        impl Render for EmptyModalView {
-            fn render(&mut self, _: &mut Window, _: &mut Context<'_, Self>) -> impl IntoElement {
-                div()
-            }
-        }
-        impl Focusable for EmptyModalView {
-            fn focus_handle(&self, _cx: &App) -> gpui::FocusHandle {
-                self.focus_handle.clone()
-            }
-        }
-        impl workspace::ModalView for EmptyModalView {}
-
-        window
-            .update(cx, |workspace, window, cx| {
-                workspace.toggle_modal(window, cx, |_, cx| EmptyModalView {
-                    focus_handle: cx.focus_handle(),
-                });
-                assert!(workspace.has_active_modal(window, cx));
-            })
-            .unwrap();
-
-        cx.dispatch_action(window.into(), Deploy::find());
-
-        window
-            .update(cx, |workspace, window, cx| {
-                assert!(!workspace.has_active_modal(window, cx));
-                workspace.toggle_modal(window, cx, |_, cx| EmptyModalView {
-                    focus_handle: cx.focus_handle(),
-                });
-                assert!(workspace.has_active_modal(window, cx));
-            })
-            .unwrap();
-
-        cx.dispatch_action(window.into(), DeploySearch::find());
-
-        window
-            .update(cx, |workspace, window, cx| {
-                assert!(!workspace.has_active_modal(window, cx));
-            })
-            .unwrap();
-    }
-
-    #[perf]
-    #[gpui::test]
-    async fn test_search_with_inlays(cx: &mut TestAppContext) {
-        init_test(cx);
-        cx.update(|cx| {
-            SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |settings| {
-                    settings.project.all_languages.defaults.inlay_hints =
-                        Some(InlayHintSettingsContent {
-                            enabled: Some(true),
-                            ..InlayHintSettingsContent::default()
-                        })
-                });
-            });
-        });
-
-        let fs = FakeFs::new(cx.background_executor.clone());
-        fs.insert_tree(
-            path!("/dir"),
-            // `\n` , a trailing line on the end, is important for the test case
-            json!({
-                "main.rs": "fn main() { let a = 2; }\n",
-            }),
-        )
-        .await;
-
-        let requests_count = Arc::new(AtomicUsize::new(0));
-        let closure_requests_count = requests_count.clone();
-        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let language_registry = project.read_with(cx, |project, _| project.languages().clone());
-        let language = rust_lang();
-        language_registry.add(language);
-        let mut fake_servers = language_registry.register_fake_lsp(
-            "Rust",
-            FakeLspAdapter {
-                capabilities: lsp::ServerCapabilities {
-                    inlay_hint_provider: Some(lsp::OneOf::Left(true)),
-                    ..lsp::ServerCapabilities::default()
-                },
-                initializer: Some(Box::new(move |fake_server| {
-                    let requests_count = closure_requests_count.clone();
-                    fake_server.set_request_handler::<lsp::request::InlayHintRequest, _, _>({
-                        move |_, _| {
-                            let requests_count = requests_count.clone();
-                            async move {
-                                requests_count.fetch_add(1, atomic::Ordering::Release);
-                                Ok(Some(vec![lsp::InlayHint {
-                                    position: lsp::Position::new(0, 17),
-                                    label: lsp::InlayHintLabel::String(": i32".to_owned()),
-                                    kind: Some(lsp::InlayHintKind::TYPE),
-                                    text_edits: None,
-                                    tooltip: None,
-                                    padding_left: None,
-                                    padding_right: None,
-                                    data: None,
-                                }]))
-                            }
-                        }
-                    });
-                })),
-                ..FakeLspAdapter::default()
-            },
-        );
-
-        let window = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let workspace = window.root(cx).unwrap();
-        let search = cx.new(|cx| ProjectSearch::new(project.clone(), cx));
-        let search_view = cx.add_window(|window, cx| {
-            ProjectSearchView::new(workspace.downgrade(), search.clone(), window, cx, None)
-        });
-
-        perform_search(search_view, "let ", cx);
-        let fake_server = fake_servers.next().await.unwrap();
-        cx.executor().advance_clock(Duration::from_secs(1));
-        cx.executor().run_until_parked();
-        search_view
-            .update(cx, |search_view, _, cx| {
-                assert_eq!(
-                    search_view
-                        .results_editor
-                        .update(cx, |editor, cx| editor.display_text(cx)),
-                    "\n\nfn main() { let a: i32 = 2; }\n"
-                );
-            })
-            .unwrap();
-        assert_eq!(
-            requests_count.load(atomic::Ordering::Acquire),
-            1,
-            "New hints should have been queried",
-        );
-
-        // Can do the 2nd search without any panics
-        perform_search(search_view, "let ", cx);
-        cx.executor().advance_clock(Duration::from_secs(1));
-        cx.executor().run_until_parked();
-        search_view
-            .update(cx, |search_view, _, cx| {
-                assert_eq!(
-                    search_view
-                        .results_editor
-                        .update(cx, |editor, cx| editor.display_text(cx)),
-                    "\n\nfn main() { let a: i32 = 2; }\n"
-                );
-            })
-            .unwrap();
-        assert_eq!(
-            requests_count.load(atomic::Ordering::Acquire),
-            2,
-            "We did drop the previous buffer when cleared the old project search results, hence another query was made",
-        );
-
-        let singleton_editor = window
-            .update(cx, |workspace, window, cx| {
-                workspace.open_abs_path(
-                    PathBuf::from(path!("/dir/main.rs")),
-                    workspace::OpenOptions::default(),
-                    window,
-                    cx,
-                )
-            })
-            .unwrap()
-            .await
-            .unwrap()
-            .downcast::<Editor>()
-            .unwrap();
-        cx.executor().advance_clock(Duration::from_millis(100));
-        cx.executor().run_until_parked();
-        singleton_editor.update(cx, |editor, cx| {
-            assert_eq!(
-                editor.display_text(cx),
-                "fn main() { let a: i32 = 2; }\n",
-                "Newly opened editor should have the correct text with hints",
-            );
-        });
-        assert_eq!(
-            requests_count.load(atomic::Ordering::Acquire),
-            2,
-            "Opening the same buffer again should reuse the cached hints",
-        );
-
-        window
-            .update(cx, |_, window, cx| {
-                singleton_editor.update(cx, |editor, cx| {
-                    editor.handle_input("test", window, cx);
-                });
-            })
-            .unwrap();
-
-        cx.executor().advance_clock(Duration::from_secs(1));
-        cx.executor().run_until_parked();
-        singleton_editor.update(cx, |editor, cx| {
-            assert_eq!(
-                editor.display_text(cx),
-                "testfn main() { l: i32et a = 2; }\n",
-                "Newly opened editor should have the correct text with hints",
-            );
-        });
-        assert_eq!(
-            requests_count.load(atomic::Ordering::Acquire),
-            3,
-            "We have edited the buffer and should send a new request",
-        );
-
-        window
-            .update(cx, |_, window, cx| {
-                singleton_editor.update(cx, |editor, cx| {
-                    editor.undo(&editor::actions::Undo, window, cx);
-                });
-            })
-            .unwrap();
-        cx.executor().advance_clock(Duration::from_secs(1));
-        cx.executor().run_until_parked();
-        assert_eq!(
-            requests_count.load(atomic::Ordering::Acquire),
-            4,
-            "We have edited the buffer again and should send a new request again",
-        );
-        singleton_editor.update(cx, |editor, cx| {
-            assert_eq!(
-                editor.display_text(cx),
-                "fn main() { let a: i32 = 2; }\n",
-                "Newly opened editor should have the correct text with hints",
-            );
-        });
-        project.update(cx, |_, cx| {
-            cx.emit(project::Event::RefreshInlayHints {
-                server_id: fake_server.server.server_id(),
-                request_id: Some(1),
-            });
-        });
-        cx.executor().advance_clock(Duration::from_secs(1));
-        cx.executor().run_until_parked();
-        assert_eq!(
-            requests_count.load(atomic::Ordering::Acquire),
-            5,
-            "After a simulated server refresh request, we should have sent another request",
-        );
-
-        perform_search(search_view, "let ", cx);
-        cx.executor().advance_clock(Duration::from_secs(1));
-        cx.executor().run_until_parked();
-        assert_eq!(
-            requests_count.load(atomic::Ordering::Acquire),
-            5,
-            "New project search should reuse the cached hints",
-        );
-        search_view
-            .update(cx, |search_view, _, cx| {
-                assert_eq!(
-                    search_view
-                        .results_editor
-                        .update(cx, |editor, cx| editor.display_text(cx)),
-                    "\n\nfn main() { let a: i32 = 2; }\n"
-                );
-            })
-            .unwrap();
-    }
-
-    fn init_test(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let settings = SettingsStore::test(cx);
-            cx.set_global(settings);
-
-            theme::init(theme::LoadThemes::JustBase, cx);
-
-            editor::init(cx);
-            crate::init(cx);
-        });
-    }
-
-    fn perform_search(
-        search_view: WindowHandle<ProjectSearchView>,
-        text: impl Into<Arc<str>>,
-        cx: &mut TestAppContext,
-    ) {
-        search_view
-            .update(cx, |search_view, window, cx| {
-                search_view.query_editor.update(cx, |query_editor, cx| {
-                    query_editor.set_text(text, window, cx)
-                });
-                search_view.search(cx);
-            })
-            .unwrap();
-        // Ensure editor highlights appear after the search is done
-        cx.executor().advance_clock(
-            editor::SELECTION_HIGHLIGHT_DEBOUNCE_TIMEOUT + Duration::from_millis(100),
-        );
-        cx.background_executor.run_until_parked();
-    }
-}
diff --git a/crates/search/src/search.rs b/crates/search/src/search.rs
deleted file mode 100644
index 6663f8c318..0000000000
--- a/crates/search/src/search.rs
+++ /dev/null
@@ -1,204 +0,0 @@
-use bitflags::bitflags;
-pub use buffer_search::BufferSearchBar;
-use editor::SearchSettings;
-use gpui::{Action, App, ClickEvent, FocusHandle, IntoElement, actions};
-use project::search::SearchQuery;
-pub use project_search::ProjectSearchView;
-use ui::{ButtonStyle, IconButton, IconButtonShape};
-use ui::{Tooltip, prelude::*};
-use workspace::notifications::NotificationId;
-use workspace::{Toast, Workspace};
-
-pub use search_status_button::SEARCH_ICON;
-
-use crate::project_search::ProjectSearchBar;
-
-pub mod buffer_search;
-pub mod project_search;
-pub(crate) mod search_bar;
-pub mod search_status_button;
-
-pub fn init(cx: &mut App) {
-    menu::init();
-    buffer_search::init(cx);
-    project_search::init(cx);
-}
-
-actions!(
-    search,
-    [
-        /// Focuses on the search input field.
-        FocusSearch,
-        /// Toggles whole word matching.
-        ToggleWholeWord,
-        /// Toggles case-sensitive search.
-        ToggleCaseSensitive,
-        /// Toggles searching in ignored files.
-        ToggleIncludeIgnored,
-        /// Toggles regular expression mode.
-        ToggleRegex,
-        /// Toggles the replace interface.
-        ToggleReplace,
-        /// Toggles searching within selection only.
-        ToggleSelection,
-        /// Selects the next search match.
-        SelectNextMatch,
-        /// Selects the previous search match.
-        SelectPreviousMatch,
-        /// Selects all search matches.
-        SelectAllMatches,
-        /// Cycles through search modes.
-        CycleMode,
-        /// Navigates to the next query in search history.
-        NextHistoryQuery,
-        /// Navigates to the previous query in search history.
-        PreviousHistoryQuery,
-        /// Replaces all matches.
-        ReplaceAll,
-        /// Replaces the next match.
-        ReplaceNext,
-    ]
-);
-
-bitflags! {
-    #[derive(Debug, PartialEq, Eq, Clone, Copy, Default)]
-    pub struct SearchOptions: u8 {
-        const NONE = 0;
-        const WHOLE_WORD = 1 << SearchOption::WholeWord as u8;
-        const CASE_SENSITIVE = 1 << SearchOption::CaseSensitive as u8;
-        const INCLUDE_IGNORED = 1 << SearchOption::IncludeIgnored as u8;
-        const REGEX = 1 << SearchOption::Regex as u8;
-        const ONE_MATCH_PER_LINE = 1 << SearchOption::OneMatchPerLine as u8;
-        /// If set, reverse direction when finding the active match
-        const BACKWARDS = 1 << SearchOption::Backwards as u8;
-    }
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-#[repr(u8)]
-pub enum SearchOption {
-    WholeWord = 0,
-    CaseSensitive,
-    IncludeIgnored,
-    Regex,
-    OneMatchPerLine,
-    Backwards,
-}
-
-pub(crate) enum SearchSource<'a, 'b> {
-    Buffer,
-    Project(&'a Context<'b, ProjectSearchBar>),
-}
-
-impl SearchOption {
-    pub fn as_options(&self) -> SearchOptions {
-        SearchOptions::from_bits(1 << *self as u8).unwrap()
-    }
-
-    pub fn label(&self) -> &'static str {
-        match self {
-            SearchOption::WholeWord => "Match Whole Words",
-            SearchOption::CaseSensitive => "Match Case Sensitivity",
-            SearchOption::IncludeIgnored => "Also search files ignored by configuration",
-            SearchOption::Regex => "Use Regular Expressions",
-            SearchOption::OneMatchPerLine => "One Match Per Line",
-            SearchOption::Backwards => "Search Backwards",
-        }
-    }
-
-    pub fn icon(&self) -> ui::IconName {
-        match self {
-            SearchOption::WholeWord => ui::IconName::WholeWord,
-            SearchOption::CaseSensitive => ui::IconName::CaseSensitive,
-            SearchOption::IncludeIgnored => ui::IconName::Sliders,
-            SearchOption::Regex => ui::IconName::Regex,
-            _ => panic!("{self:?} is not a named SearchOption"),
-        }
-    }
-
-    pub fn to_toggle_action(self) -> &'static dyn Action {
-        match self {
-            SearchOption::WholeWord => &ToggleWholeWord,
-            SearchOption::CaseSensitive => &ToggleCaseSensitive,
-            SearchOption::IncludeIgnored => &ToggleIncludeIgnored,
-            SearchOption::Regex => &ToggleRegex,
-            _ => panic!("{self:?} is not a toggle action"),
-        }
-    }
-
-    pub(crate) fn as_button(
-        &self,
-        active: SearchOptions,
-        search_source: SearchSource,
-        focus_handle: FocusHandle,
-    ) -> impl IntoElement {
-        let action = self.to_toggle_action();
-        let label = self.label();
-        IconButton::new(
-            (label, matches!(search_source, SearchSource::Buffer) as u32),
-            self.icon(),
-        )
-        .map(|button| match search_source {
-            SearchSource::Buffer => {
-                let focus_handle = focus_handle.clone();
-                button.on_click(move |_: &ClickEvent, window, cx| {
-                    if !focus_handle.is_focused(window) {
-                        window.focus(&focus_handle);
-                    }
-                    window.dispatch_action(action.boxed_clone(), cx);
-                })
-            }
-            SearchSource::Project(cx) => {
-                let options = self.as_options();
-                button.on_click(cx.listener(move |this, _: &ClickEvent, window, cx| {
-                    this.toggle_search_option(options, window, cx);
-                }))
-            }
-        })
-        .style(ButtonStyle::Subtle)
-        .shape(IconButtonShape::Square)
-        .toggle_state(active.contains(self.as_options()))
-        .tooltip(move |_window, cx| Tooltip::for_action_in(label, action, &focus_handle, cx))
-    }
-}
-
-impl SearchOptions {
-    pub fn none() -> SearchOptions {
-        SearchOptions::NONE
-    }
-
-    pub fn from_query(query: &SearchQuery) -> SearchOptions {
-        let mut options = SearchOptions::NONE;
-        options.set(SearchOptions::WHOLE_WORD, query.whole_word());
-        options.set(SearchOptions::CASE_SENSITIVE, query.case_sensitive());
-        options.set(SearchOptions::INCLUDE_IGNORED, query.include_ignored());
-        options.set(SearchOptions::REGEX, query.is_regex());
-        options
-    }
-
-    pub fn from_settings(settings: &SearchSettings) -> SearchOptions {
-        let mut options = SearchOptions::NONE;
-        options.set(SearchOptions::WHOLE_WORD, settings.whole_word);
-        options.set(SearchOptions::CASE_SENSITIVE, settings.case_sensitive);
-        options.set(SearchOptions::INCLUDE_IGNORED, settings.include_ignored);
-        options.set(SearchOptions::REGEX, settings.regex);
-        options
-    }
-}
-
-pub(crate) fn show_no_more_matches(window: &mut Window, cx: &mut App) {
-    window.defer(cx, |window, cx| {
-        struct NotifType();
-        let notification_id = NotificationId::unique::<NotifType>();
-
-        let Some(workspace) = window.root::<Workspace>().flatten() else {
-            return;
-        };
-        workspace.update(cx, |workspace, cx| {
-            workspace.show_toast(
-                Toast::new(notification_id.clone(), "No more matches").autohide(),
-                cx,
-            );
-        })
-    });
-}
diff --git a/crates/search/src/search_bar.rs b/crates/search/src/search_bar.rs
deleted file mode 100644
index 13b4df9574..0000000000
--- a/crates/search/src/search_bar.rs
+++ /dev/null
@@ -1,91 +0,0 @@
-use editor::{Editor, EditorElement, EditorStyle};
-use gpui::{Action, Entity, FocusHandle, Hsla, IntoElement, TextStyle};
-use settings::Settings;
-use theme::ThemeSettings;
-use ui::{IconButton, IconButtonShape};
-use ui::{Tooltip, prelude::*};
-
-pub(super) enum ActionButtonState {
-    Disabled,
-    Toggled,
-}
-
-pub(super) fn render_action_button(
-    id_prefix: &'static str,
-    icon: ui::IconName,
-    button_state: Option<ActionButtonState>,
-    tooltip: &'static str,
-    action: &'static dyn Action,
-    focus_handle: FocusHandle,
-) -> impl IntoElement {
-    IconButton::new(
-        SharedString::from(format!("{id_prefix}-{}", action.name())),
-        icon,
-    )
-    .shape(IconButtonShape::Square)
-    .on_click({
-        let focus_handle = focus_handle.clone();
-        move |_, window, cx| {
-            if !focus_handle.is_focused(window) {
-                window.focus(&focus_handle);
-            }
-            window.dispatch_action(action.boxed_clone(), cx);
-        }
-    })
-    .tooltip(move |_window, cx| Tooltip::for_action_in(tooltip, action, &focus_handle, cx))
-    .when_some(button_state, |this, state| match state {
-        ActionButtonState::Toggled => this.toggle_state(true),
-        ActionButtonState::Disabled => this.disabled(true),
-    })
-}
-
-pub(crate) fn input_base_styles(border_color: Hsla, map: impl FnOnce(Div) -> Div) -> Div {
-    h_flex()
-        .map(map)
-        .min_w_32()
-        .h_8()
-        .pl_2()
-        .pr_1()
-        .border_1()
-        .border_color(border_color)
-        .rounded_md()
-}
-
-pub(crate) fn render_text_input(
-    editor: &Entity<Editor>,
-    color_override: Option<Color>,
-    app: &App,
-) -> impl IntoElement {
-    let (color, use_syntax) = if editor.read(app).read_only(app) {
-        (app.theme().colors().text_disabled, false)
-    } else {
-        match color_override {
-            Some(color_override) => (color_override.color(app), false),
-            None => (app.theme().colors().text, true),
-        }
-    };
-
-    let settings = ThemeSettings::get_global(app);
-    let text_style = TextStyle {
-        color,
-        font_family: settings.buffer_font.family.clone(),
-        font_features: settings.buffer_font.features.clone(),
-        font_fallbacks: settings.buffer_font.fallbacks.clone(),
-        font_size: rems(0.875).into(),
-        font_weight: settings.buffer_font.weight,
-        line_height: relative(1.3),
-        ..TextStyle::default()
-    };
-
-    let mut editor_style = EditorStyle {
-        background: app.theme().colors().toolbar_background,
-        local_player: app.theme().players().local(),
-        text: text_style,
-        ..EditorStyle::default()
-    };
-    if use_syntax {
-        editor_style.syntax = app.theme().syntax().clone();
-    }
-
-    EditorElement::new(editor, editor_style)
-}
diff --git a/crates/search/src/search_status_button.rs b/crates/search/src/search_status_button.rs
deleted file mode 100644
index 712a322c10..0000000000
--- a/crates/search/src/search_status_button.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-use editor::EditorSettings;
-use settings::Settings as _;
-use ui::{ButtonCommon, Clickable, Context, Render, Tooltip, Window, prelude::*};
-use workspace::{ItemHandle, StatusItemView};
-
-pub const SEARCH_ICON: IconName = IconName::MagnifyingGlass;
-
-pub struct SearchButton;
-
-impl SearchButton {
-    pub fn new() -> Self {
-        Self {}
-    }
-}
-
-impl Render for SearchButton {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl ui::IntoElement {
-        let button = div();
-
-        if !EditorSettings::get_global(cx).search.button {
-            return button.hidden();
-        }
-
-        button.child(
-            IconButton::new("project-search-indicator", SEARCH_ICON)
-                .icon_size(IconSize::Small)
-                .tooltip(|_window, cx| {
-                    Tooltip::for_action("Project Search", &workspace::DeploySearch::default(), cx)
-                })
-                .on_click(cx.listener(|_this, _, window, cx| {
-                    window.dispatch_action(Box::new(workspace::DeploySearch::default()), cx);
-                })),
-        )
-    }
-}
-
-impl StatusItemView for SearchButton {
-    fn set_active_pane_item(
-        &mut self,
-        _active_pane_item: Option<&dyn ItemHandle>,
-        _window: &mut Window,
-        _cx: &mut Context<Self>,
-    ) {
-    }
-}
diff --git a/crates/session/Cargo.toml b/crates/session/Cargo.toml
deleted file mode 100644
index 15c3acb8f0..0000000000
--- a/crates/session/Cargo.toml
+++ /dev/null
@@ -1,25 +0,0 @@
-[package]
-name = "session"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/session.rs"
-doctest = false
-
-[features]
-test-support = [
-    "db/test-support",
-]
-
-[dependencies]
-db.workspace = true
-gpui.workspace = true
-uuid.workspace = true
-util.workspace = true
-serde_json.workspace = true
diff --git a/crates/session/LICENSE-GPL b/crates/session/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/session/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/session/src/session.rs b/crates/session/src/session.rs
deleted file mode 100644
index fd45982bf4..0000000000
--- a/crates/session/src/session.rs
+++ /dev/null
@@ -1,127 +0,0 @@
-use std::time::Duration;
-
-use db::kvp::KEY_VALUE_STORE;
-use gpui::{App, AppContext as _, Context, Subscription, Task, WindowId};
-use util::ResultExt;
-
-pub struct Session {
-    session_id: String,
-    old_session_id: Option<String>,
-    old_window_ids: Option<Vec<WindowId>>,
-}
-
-const SESSION_ID_KEY: &str = "session_id";
-const SESSION_WINDOW_STACK_KEY: &str = "session_window_stack";
-
-impl Session {
-    pub async fn new(session_id: String) -> Self {
-        let old_session_id = KEY_VALUE_STORE.read_kvp(SESSION_ID_KEY).ok().flatten();
-
-        KEY_VALUE_STORE
-            .write_kvp(SESSION_ID_KEY.to_string(), session_id.clone())
-            .await
-            .log_err();
-
-        let old_window_ids = KEY_VALUE_STORE
-            .read_kvp(SESSION_WINDOW_STACK_KEY)
-            .ok()
-            .flatten()
-            .and_then(|json| serde_json::from_str::<Vec<u64>>(&json).ok())
-            .map(|vec| {
-                vec.into_iter()
-                    .map(WindowId::from)
-                    .collect::<Vec<WindowId>>()
-            });
-
-        Self {
-            session_id,
-            old_session_id,
-            old_window_ids,
-        }
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn test() -> Self {
-        Self {
-            session_id: uuid::Uuid::new_v4().to_string(),
-            old_session_id: None,
-            old_window_ids: None,
-        }
-    }
-
-    pub fn id(&self) -> &str {
-        &self.session_id
-    }
-}
-
-pub struct AppSession {
-    session: Session,
-    _serialization_task: Task<()>,
-    _subscriptions: Vec<Subscription>,
-}
-
-impl AppSession {
-    pub fn new(session: Session, cx: &Context<Self>) -> Self {
-        let _subscriptions = vec![cx.on_app_quit(Self::app_will_quit)];
-
-        let _serialization_task = cx.spawn(async move |_, cx| {
-            let mut current_window_stack = Vec::new();
-            loop {
-                if let Some(windows) = cx.update(|cx| window_stack(cx)).ok().flatten()
-                    && windows != current_window_stack
-                {
-                    store_window_stack(&windows).await;
-                    current_window_stack = windows;
-                }
-
-                cx.background_executor()
-                    .timer(Duration::from_millis(500))
-                    .await;
-            }
-        });
-
-        Self {
-            session,
-            _subscriptions,
-            _serialization_task,
-        }
-    }
-
-    fn app_will_quit(&mut self, cx: &mut Context<Self>) -> Task<()> {
-        if let Some(window_stack) = window_stack(cx) {
-            cx.background_spawn(async move { store_window_stack(&window_stack).await })
-        } else {
-            Task::ready(())
-        }
-    }
-
-    pub fn id(&self) -> &str {
-        self.session.id()
-    }
-
-    pub fn last_session_id(&self) -> Option<&str> {
-        self.session.old_session_id.as_deref()
-    }
-
-    pub fn last_session_window_stack(&self) -> Option<Vec<WindowId>> {
-        self.session.old_window_ids.clone()
-    }
-}
-
-fn window_stack(cx: &App) -> Option<Vec<u64>> {
-    Some(
-        cx.window_stack()?
-            .into_iter()
-            .map(|window| window.window_id().as_u64())
-            .collect(),
-    )
-}
-
-async fn store_window_stack(windows: &[u64]) {
-    if let Ok(window_ids_json) = serde_json::to_string(windows) {
-        KEY_VALUE_STORE
-            .write_kvp(SESSION_WINDOW_STACK_KEY.to_string(), window_ids_json)
-            .await
-            .log_err();
-    }
-}
diff --git a/crates/settings/Cargo.toml b/crates/settings/Cargo.toml
deleted file mode 100644
index 1f1513d621..0000000000
--- a/crates/settings/Cargo.toml
+++ /dev/null
@@ -1,50 +0,0 @@
-[package]
-name = "settings"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/settings.rs"
-doctest = false
-
-[features]
-test-support = ["gpui/test-support", "fs/test-support"]
-
-[dependencies]
-anyhow.workspace = true
-collections.workspace = true
-derive_more.workspace = true
-ec4rs.workspace = true
-fs.workspace = true
-futures.workspace = true
-gpui.workspace = true
-inventory.workspace = true
-log.workspace = true
-migrator.workspace = true
-paths.workspace = true
-release_channel.workspace = true
-rust-embed.workspace = true
-schemars.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-serde_json_lenient.workspace = true
-serde_repr.workspace = true
-settings_json.workspace = true
-settings_macros.workspace = true
-smallvec.workspace = true
-strum.workspace = true
-util.workspace = true
-zlog.workspace = true
-
-[dev-dependencies]
-fs = { workspace = true, features = ["test-support"] }
-gpui = { workspace = true, features = ["test-support"] }
-
-indoc.workspace = true
-pretty_assertions.workspace = true
-unindent.workspace = true
diff --git a/crates/settings/LICENSE-GPL b/crates/settings/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/settings/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/settings/src/base_keymap_setting.rs b/crates/settings/src/base_keymap_setting.rs
deleted file mode 100644
index 8e872dae40..0000000000
--- a/crates/settings/src/base_keymap_setting.rs
+++ /dev/null
@@ -1,135 +0,0 @@
-use std::fmt::{Display, Formatter};
-
-use crate::{self as settings, settings_content::BaseKeymapContent};
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use settings::{RegisterSetting, Settings};
-
-/// Base key bindings scheme. Base keymaps can be overridden with user keymaps.
-///
-/// Default: VSCode
-#[derive(
-    Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq, Default, RegisterSetting,
-)]
-pub enum BaseKeymap {
-    #[default]
-    VSCode,
-    JetBrains,
-    SublimeText,
-    Atom,
-    TextMate,
-    Emacs,
-    Cursor,
-    None,
-}
-
-impl From<BaseKeymapContent> for BaseKeymap {
-    fn from(value: BaseKeymapContent) -> Self {
-        match value {
-            BaseKeymapContent::VSCode => Self::VSCode,
-            BaseKeymapContent::JetBrains => Self::JetBrains,
-            BaseKeymapContent::SublimeText => Self::SublimeText,
-            BaseKeymapContent::Atom => Self::Atom,
-            BaseKeymapContent::TextMate => Self::TextMate,
-            BaseKeymapContent::Emacs => Self::Emacs,
-            BaseKeymapContent::Cursor => Self::Cursor,
-            BaseKeymapContent::None => Self::None,
-        }
-    }
-}
-impl Into<BaseKeymapContent> for BaseKeymap {
-    fn into(self) -> BaseKeymapContent {
-        match self {
-            BaseKeymap::VSCode => BaseKeymapContent::VSCode,
-            BaseKeymap::JetBrains => BaseKeymapContent::JetBrains,
-            BaseKeymap::SublimeText => BaseKeymapContent::SublimeText,
-            BaseKeymap::Atom => BaseKeymapContent::Atom,
-            BaseKeymap::TextMate => BaseKeymapContent::TextMate,
-            BaseKeymap::Emacs => BaseKeymapContent::Emacs,
-            BaseKeymap::Cursor => BaseKeymapContent::Cursor,
-            BaseKeymap::None => BaseKeymapContent::None,
-        }
-    }
-}
-
-impl Display for BaseKeymap {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        match self {
-            BaseKeymap::VSCode => write!(f, "VS Code"),
-            BaseKeymap::JetBrains => write!(f, "JetBrains"),
-            BaseKeymap::SublimeText => write!(f, "Sublime Text"),
-            BaseKeymap::Atom => write!(f, "Atom"),
-            BaseKeymap::TextMate => write!(f, "TextMate"),
-            BaseKeymap::Emacs => write!(f, "Emacs (beta)"),
-            BaseKeymap::Cursor => write!(f, "Cursor (beta)"),
-            BaseKeymap::None => write!(f, "None"),
-        }
-    }
-}
-
-impl BaseKeymap {
-    #[cfg(target_os = "macos")]
-    pub const OPTIONS: [(&'static str, Self); 7] = [
-        ("VS Code (Default)", Self::VSCode),
-        ("Atom", Self::Atom),
-        ("JetBrains", Self::JetBrains),
-        ("Sublime Text", Self::SublimeText),
-        ("Emacs (beta)", Self::Emacs),
-        ("TextMate", Self::TextMate),
-        ("Cursor", Self::Cursor),
-    ];
-
-    #[cfg(not(target_os = "macos"))]
-    pub const OPTIONS: [(&'static str, Self); 6] = [
-        ("VS Code (Default)", Self::VSCode),
-        ("Atom", Self::Atom),
-        ("JetBrains", Self::JetBrains),
-        ("Sublime Text", Self::SublimeText),
-        ("Emacs (beta)", Self::Emacs),
-        ("Cursor", Self::Cursor),
-    ];
-
-    pub fn asset_path(&self) -> Option<&'static str> {
-        #[cfg(target_os = "macos")]
-        match self {
-            BaseKeymap::JetBrains => Some("keymaps/macos/jetbrains.json"),
-            BaseKeymap::SublimeText => Some("keymaps/macos/sublime_text.json"),
-            BaseKeymap::Atom => Some("keymaps/macos/atom.json"),
-            BaseKeymap::TextMate => Some("keymaps/macos/textmate.json"),
-            BaseKeymap::Emacs => Some("keymaps/macos/emacs.json"),
-            BaseKeymap::Cursor => Some("keymaps/macos/cursor.json"),
-            BaseKeymap::VSCode => None,
-            BaseKeymap::None => None,
-        }
-
-        #[cfg(not(target_os = "macos"))]
-        match self {
-            BaseKeymap::JetBrains => Some("keymaps/linux/jetbrains.json"),
-            BaseKeymap::SublimeText => Some("keymaps/linux/sublime_text.json"),
-            BaseKeymap::Atom => Some("keymaps/linux/atom.json"),
-            BaseKeymap::Emacs => Some("keymaps/linux/emacs.json"),
-            BaseKeymap::Cursor => Some("keymaps/linux/cursor.json"),
-            BaseKeymap::TextMate => None,
-            BaseKeymap::VSCode => None,
-            BaseKeymap::None => None,
-        }
-    }
-
-    pub fn names() -> impl Iterator<Item = &'static str> {
-        Self::OPTIONS.iter().map(|(name, _)| *name)
-    }
-
-    pub fn from_names(option: &str) -> BaseKeymap {
-        Self::OPTIONS
-            .iter()
-            .copied()
-            .find_map(|(name, value)| (name == option).then_some(value))
-            .unwrap_or_default()
-    }
-}
-
-impl Settings for BaseKeymap {
-    fn from_settings(s: &crate::settings_content::SettingsContent) -> Self {
-        s.base_keymap.unwrap().into()
-    }
-}
diff --git a/crates/settings/src/editable_setting_control.rs b/crates/settings/src/editable_setting_control.rs
deleted file mode 100644
index fd9d986962..0000000000
--- a/crates/settings/src/editable_setting_control.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-use fs::Fs;
-use gpui::{App, RenderOnce, SharedString};
-
-use crate::{settings_content::SettingsContent, update_settings_file};
-
-/// A UI control that can be used to edit a setting.
-pub trait EditableSettingControl: RenderOnce {
-    /// The type of the setting value.
-    type Value: Send;
-
-    /// Returns the name of this setting.
-    fn name(&self) -> SharedString;
-
-    /// Reads the setting value from the settings.
-    fn read(cx: &App) -> Self::Value;
-
-    /// Applies the given setting file to the settings file contents.
-    ///
-    /// This will be called when writing the setting value back to the settings file.
-    fn apply(settings: &mut SettingsContent, value: Self::Value, cx: &App);
-
-    /// Writes the given setting value to the settings files.
-    fn write(value: Self::Value, cx: &App) {
-        let fs = <dyn Fs>::global(cx);
-
-        update_settings_file(fs, cx, move |settings, cx| {
-            Self::apply(settings, value, cx);
-        });
-    }
-}
diff --git a/crates/settings/src/fallible_options.rs b/crates/settings/src/fallible_options.rs
deleted file mode 100644
index e0eea451f1..0000000000
--- a/crates/settings/src/fallible_options.rs
+++ /dev/null
@@ -1,112 +0,0 @@
-use std::cell::RefCell;
-
-use serde::Deserialize;
-
-use crate::ParseStatus;
-
-thread_local! {
-    static ERRORS: RefCell<Option<Vec<anyhow::Error>>> = const { RefCell::new(None) };
-}
-
-pub(crate) fn parse_json<'de, T>(json: &'de str) -> (Option<T>, ParseStatus)
-where
-    T: Deserialize<'de>,
-{
-    ERRORS.with_borrow_mut(|errors| {
-        errors.replace(Vec::default());
-    });
-
-    let mut deserializer = serde_json_lenient::Deserializer::from_str(json);
-    let value = T::deserialize(&mut deserializer);
-    let value = match value {
-        Ok(value) => value,
-        Err(error) => {
-            return (
-                None,
-                ParseStatus::Failed {
-                    error: error.to_string(),
-                },
-            );
-        }
-    };
-
-    if let Some(errors) = ERRORS.with_borrow_mut(|errors| errors.take().filter(|e| !e.is_empty())) {
-        let error = errors
-            .into_iter()
-            .map(|e| e.to_string())
-            .flat_map(|e| ["\n".to_owned(), e])
-            .skip(1)
-            .collect::<String>();
-        return (Some(value), ParseStatus::Failed { error });
-    }
-
-    (Some(value), ParseStatus::Success)
-}
-
-pub(crate) fn deserialize<'de, D, T>(deserializer: D) -> Result<T, D::Error>
-where
-    D: serde::Deserializer<'de>,
-    T: serde::Deserialize<'de> + FallibleOption,
-{
-    match T::deserialize(deserializer) {
-        Ok(value) => Ok(value),
-        Err(e) => ERRORS.with_borrow_mut(|errors| {
-            if let Some(errors) = errors {
-                errors.push(anyhow::anyhow!("{}", e));
-                Ok(Default::default())
-            } else {
-                Err(e)
-            }
-        }),
-    }
-}
-
-pub trait FallibleOption: Default {}
-impl<T> FallibleOption for Option<T> {}
-
-#[cfg(test)]
-mod tests {
-    use serde::Deserialize;
-    use settings_macros::with_fallible_options;
-
-    use crate::ParseStatus;
-
-    #[with_fallible_options]
-    #[derive(Deserialize, Debug, PartialEq)]
-    struct Foo {
-        foo: Option<String>,
-        bar: Option<usize>,
-        baz: Option<bool>,
-    }
-
-    #[test]
-    fn test_fallible() {
-        let input = r#"
-            {"foo": "bar",
-            "bar": "foo",
-            "baz": 3,
-            }
-        "#;
-
-        let (settings, result) = crate::fallible_options::parse_json::<Foo>(&input);
-        assert_eq!(
-            settings.unwrap(),
-            Foo {
-                foo: Some("bar".into()),
-                bar: None,
-                baz: None,
-            }
-        );
-
-        assert!(crate::parse_json_with_comments::<Foo>(&input).is_err());
-
-        let ParseStatus::Failed { error } = result else {
-            panic!("Expected parse to fail")
-        };
-
-        assert_eq!(
-            error,
-            "invalid type: string \"foo\", expected usize at line 3 column 24\ninvalid type: integer `3`, expected a boolean at line 4 column 20".to_string()
-        )
-    }
-}
diff --git a/crates/settings/src/keymap_file.rs b/crates/settings/src/keymap_file.rs
deleted file mode 100644
index 2ef1dfc538..0000000000
--- a/crates/settings/src/keymap_file.rs
+++ /dev/null
@@ -1,1971 +0,0 @@
-use anyhow::{Context as _, Result};
-use collections::{BTreeMap, HashMap, IndexMap};
-use fs::Fs;
-use gpui::{
-    Action, ActionBuildError, App, InvalidKeystrokeError, KEYSTROKE_PARSE_EXPECTED_MESSAGE,
-    KeyBinding, KeyBindingContextPredicate, KeyBindingMetaIndex, KeybindingKeystroke, Keystroke,
-    NoAction, SharedString, register_action,
-};
-use schemars::{JsonSchema, json_schema};
-use serde::Deserialize;
-use serde_json::{Value, json};
-use std::borrow::Cow;
-use std::{any::TypeId, fmt::Write, rc::Rc, sync::Arc, sync::LazyLock};
-use util::ResultExt as _;
-use util::{
-    asset_str,
-    markdown::{MarkdownEscaped, MarkdownInlineCode, MarkdownString},
-    schemars::AllowTrailingCommas,
-};
-
-use crate::SettingsAssets;
-use settings_json::{
-    append_top_level_array_value_in_json_text, parse_json_with_comments,
-    replace_top_level_array_value_in_json_text,
-};
-
-pub trait KeyBindingValidator: Send + Sync {
-    fn action_type_id(&self) -> TypeId;
-    fn validate(&self, binding: &KeyBinding) -> Result<(), MarkdownString>;
-}
-
-pub struct KeyBindingValidatorRegistration(pub fn() -> Box<dyn KeyBindingValidator>);
-
-inventory::collect!(KeyBindingValidatorRegistration);
-
-pub(crate) static KEY_BINDING_VALIDATORS: LazyLock<BTreeMap<TypeId, Box<dyn KeyBindingValidator>>> =
-    LazyLock::new(|| {
-        let mut validators = BTreeMap::new();
-        for validator_registration in inventory::iter::<KeyBindingValidatorRegistration> {
-            let validator = validator_registration.0();
-            validators.insert(validator.action_type_id(), validator);
-        }
-        validators
-    });
-
-// Note that the doc comments on these are shown by json-language-server when editing the keymap, so
-// they should be considered user-facing documentation. Documentation is not handled well with
-// schemars-0.8 - when there are newlines, it is rendered as plaintext (see
-// https://github.com/GREsau/schemars/issues/38#issuecomment-2282883519). So for now these docs
-// avoid newlines.
-//
-// TODO: Update to schemars-1.0 once it's released, and add more docs as newlines would be
-// supported. Tracking issue is https://github.com/GREsau/schemars/issues/112.
-
-/// Keymap configuration consisting of sections. Each section may have a context predicate which
-/// determines whether its bindings are used.
-#[derive(Debug, Deserialize, Default, Clone, JsonSchema)]
-#[serde(transparent)]
-pub struct KeymapFile(Vec<KeymapSection>);
-
-/// Keymap section which binds keystrokes to actions.
-#[derive(Debug, Deserialize, Default, Clone, JsonSchema)]
-pub struct KeymapSection {
-    /// Determines when these bindings are active. When just a name is provided, like `Editor` or
-    /// `Workspace`, the bindings will be active in that context. Boolean expressions like `X && Y`,
-    /// `X || Y`, `!X` are also supported. Some more complex logic including checking OS and the
-    /// current file extension are also supported - see [the
-    /// documentation](https://zed.dev/docs/key-bindings#contexts) for more details.
-    #[serde(default)]
-    pub context: String,
-    /// This option enables specifying keys based on their position on a QWERTY keyboard, by using
-    /// position-equivalent mappings for some non-QWERTY keyboards. This is currently only supported
-    /// on macOS. See the documentation for more details.
-    #[serde(default)]
-    use_key_equivalents: bool,
-    /// This keymap section's bindings, as a JSON object mapping keystrokes to actions. The
-    /// keystrokes key is a string representing a sequence of keystrokes to type, where the
-    /// keystrokes are separated by whitespace. Each keystroke is a sequence of modifiers (`ctrl`,
-    /// `alt`, `shift`, `fn`, `cmd`, `super`, or `win`) followed by a key, separated by `-`. The
-    /// order of bindings does matter. When the same keystrokes are bound at the same context depth,
-    /// the binding that occurs later in the file is preferred. For displaying keystrokes in the UI,
-    /// the later binding for the same action is preferred.
-    #[serde(default)]
-    bindings: Option<IndexMap<String, KeymapAction>>,
-    #[serde(flatten)]
-    unrecognized_fields: IndexMap<String, Value>,
-    // This struct intentionally uses permissive types for its fields, rather than validating during
-    // deserialization. The purpose of this is to allow loading the portion of the keymap that doesn't
-    // have errors. The downside of this is that the errors are not reported with line+column info.
-    // Unfortunately the implementations of the `Spanned` types for preserving this information are
-    // highly inconvenient (`serde_spanned`) and in some cases don't work at all here
-    // (`json_spanned_>value`). Serde should really have builtin support for this.
-}
-
-impl KeymapSection {
-    pub fn bindings(&self) -> impl DoubleEndedIterator<Item = (&String, &KeymapAction)> {
-        self.bindings.iter().flatten()
-    }
-}
-
-/// Keymap action as a JSON value, since it can either be null for no action, or the name of the
-/// action, or an array of the name of the action and the action input.
-///
-/// Unlike the other json types involved in keymaps (including actions), this doc-comment will not
-/// be included in the generated JSON schema, as it manually defines its `JsonSchema` impl. The
-/// actual schema used for it is automatically generated in `KeymapFile::generate_json_schema`.
-#[derive(Debug, Deserialize, Default, Clone)]
-#[serde(transparent)]
-pub struct KeymapAction(Value);
-
-impl std::fmt::Display for KeymapAction {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match &self.0 {
-            Value::String(s) => write!(f, "{}", s),
-            Value::Array(arr) => {
-                let strings: Vec<String> = arr.iter().map(|v| v.to_string()).collect();
-                write!(f, "{}", strings.join(", "))
-            }
-            _ => write!(f, "{}", self.0),
-        }
-    }
-}
-
-impl JsonSchema for KeymapAction {
-    /// This is used when generating the JSON schema for the `KeymapAction` type, so that it can
-    /// reference the keymap action schema.
-    fn schema_name() -> Cow<'static, str> {
-        "KeymapAction".into()
-    }
-
-    /// This schema will be replaced with the full action schema in
-    /// `KeymapFile::generate_json_schema`.
-    fn json_schema(_: &mut schemars::SchemaGenerator) -> schemars::Schema {
-        json_schema!(true)
-    }
-}
-
-#[derive(Debug)]
-#[must_use]
-pub enum KeymapFileLoadResult {
-    Success {
-        key_bindings: Vec<KeyBinding>,
-    },
-    SomeFailedToLoad {
-        key_bindings: Vec<KeyBinding>,
-        error_message: MarkdownString,
-    },
-    JsonParseFailure {
-        error: anyhow::Error,
-    },
-}
-
-impl KeymapFile {
-    pub fn parse(content: &str) -> anyhow::Result<Self> {
-        if content.trim().is_empty() {
-            return Ok(Self(Vec::new()));
-        }
-        parse_json_with_comments::<Self>(content)
-    }
-
-    pub fn load_asset(
-        asset_path: &str,
-        source: Option<KeybindSource>,
-        cx: &App,
-    ) -> anyhow::Result<Vec<KeyBinding>> {
-        match Self::load(asset_str::<SettingsAssets>(asset_path).as_ref(), cx) {
-            KeymapFileLoadResult::Success { mut key_bindings } => match source {
-                Some(source) => Ok({
-                    for key_binding in &mut key_bindings {
-                        key_binding.set_meta(source.meta());
-                    }
-                    key_bindings
-                }),
-                None => Ok(key_bindings),
-            },
-            KeymapFileLoadResult::SomeFailedToLoad { error_message, .. } => {
-                anyhow::bail!("Error loading built-in keymap \"{asset_path}\": {error_message}",)
-            }
-            KeymapFileLoadResult::JsonParseFailure { error } => {
-                anyhow::bail!("JSON parse error in built-in keymap \"{asset_path}\": {error}")
-            }
-        }
-    }
-
-    pub fn load_asset_allow_partial_failure(
-        asset_path: &str,
-        cx: &App,
-    ) -> anyhow::Result<Vec<KeyBinding>> {
-        match Self::load(asset_str::<SettingsAssets>(asset_path).as_ref(), cx) {
-            KeymapFileLoadResult::SomeFailedToLoad {
-                key_bindings,
-                error_message,
-                ..
-            } if key_bindings.is_empty() => {
-                anyhow::bail!("Error loading built-in keymap \"{asset_path}\": {error_message}",)
-            }
-            KeymapFileLoadResult::Success { key_bindings, .. }
-            | KeymapFileLoadResult::SomeFailedToLoad { key_bindings, .. } => Ok(key_bindings),
-            KeymapFileLoadResult::JsonParseFailure { error } => {
-                anyhow::bail!("JSON parse error in built-in keymap \"{asset_path}\": {error}")
-            }
-        }
-    }
-
-    #[cfg(feature = "test-support")]
-    pub fn load_panic_on_failure(content: &str, cx: &App) -> Vec<KeyBinding> {
-        match Self::load(content, cx) {
-            KeymapFileLoadResult::Success { key_bindings, .. } => key_bindings,
-            KeymapFileLoadResult::SomeFailedToLoad { error_message, .. } => {
-                panic!("{error_message}");
-            }
-            KeymapFileLoadResult::JsonParseFailure { error } => {
-                panic!("JSON parse error: {error}");
-            }
-        }
-    }
-
-    pub fn load(content: &str, cx: &App) -> KeymapFileLoadResult {
-        let keymap_file = match Self::parse(content) {
-            Ok(keymap_file) => keymap_file,
-            Err(error) => {
-                return KeymapFileLoadResult::JsonParseFailure { error };
-            }
-        };
-
-        // Accumulate errors in order to support partial load of user keymap in the presence of
-        // errors in context and binding parsing.
-        let mut errors = Vec::new();
-        let mut key_bindings = Vec::new();
-
-        for KeymapSection {
-            context,
-            use_key_equivalents,
-            bindings,
-            unrecognized_fields,
-        } in keymap_file.0.iter()
-        {
-            let context_predicate: Option<Rc<KeyBindingContextPredicate>> = if context.is_empty() {
-                None
-            } else {
-                match KeyBindingContextPredicate::parse(context) {
-                    Ok(context_predicate) => Some(context_predicate.into()),
-                    Err(err) => {
-                        // Leading space is to separate from the message indicating which section
-                        // the error occurred in.
-                        errors.push((
-                            context,
-                            format!(" Parse error in section `context` field: {}", err),
-                        ));
-                        continue;
-                    }
-                }
-            };
-
-            let mut section_errors = String::new();
-
-            if !unrecognized_fields.is_empty() {
-                write!(
-                    section_errors,
-                    "\n\n - Unrecognized fields: {}",
-                    MarkdownInlineCode(&format!("{:?}", unrecognized_fields.keys()))
-                )
-                .unwrap();
-            }
-
-            if let Some(bindings) = bindings {
-                for (keystrokes, action) in bindings {
-                    let result = Self::load_keybinding(
-                        keystrokes,
-                        action,
-                        context_predicate.clone(),
-                        *use_key_equivalents,
-                        cx,
-                    );
-                    match result {
-                        Ok(key_binding) => {
-                            key_bindings.push(key_binding);
-                        }
-                        Err(err) => {
-                            let mut lines = err.lines();
-                            let mut indented_err = lines.next().unwrap().to_string();
-                            for line in lines {
-                                indented_err.push_str("  ");
-                                indented_err.push_str(line);
-                                indented_err.push_str("\n");
-                            }
-                            write!(
-                                section_errors,
-                                "\n\n- In binding {}, {indented_err}",
-                                MarkdownInlineCode(&format!("\"{}\"", keystrokes))
-                            )
-                            .unwrap();
-                        }
-                    }
-                }
-            }
-
-            if !section_errors.is_empty() {
-                errors.push((context, section_errors))
-            }
-        }
-
-        if errors.is_empty() {
-            KeymapFileLoadResult::Success { key_bindings }
-        } else {
-            let mut error_message = "Errors in user keymap file.\n".to_owned();
-            for (context, section_errors) in errors {
-                if context.is_empty() {
-                    let _ = write!(error_message, "\n\nIn section without context predicate:");
-                } else {
-                    let _ = write!(
-                        error_message,
-                        "\n\nIn section with {}:",
-                        MarkdownInlineCode(&format!("context = \"{}\"", context))
-                    );
-                }
-                let _ = write!(error_message, "{section_errors}");
-            }
-            KeymapFileLoadResult::SomeFailedToLoad {
-                key_bindings,
-                error_message: MarkdownString(error_message),
-            }
-        }
-    }
-
-    fn load_keybinding(
-        keystrokes: &str,
-        action: &KeymapAction,
-        context: Option<Rc<KeyBindingContextPredicate>>,
-        use_key_equivalents: bool,
-        cx: &App,
-    ) -> std::result::Result<KeyBinding, String> {
-        let (action, action_input_string) = Self::build_keymap_action(action, cx)?;
-
-        let key_binding = match KeyBinding::load(
-            keystrokes,
-            action,
-            context,
-            use_key_equivalents,
-            action_input_string.map(SharedString::from),
-            cx.keyboard_mapper().as_ref(),
-        ) {
-            Ok(key_binding) => key_binding,
-            Err(InvalidKeystrokeError { keystroke }) => {
-                return Err(format!(
-                    "invalid keystroke {}. {}",
-                    MarkdownInlineCode(&format!("\"{}\"", &keystroke)),
-                    KEYSTROKE_PARSE_EXPECTED_MESSAGE
-                ));
-            }
-        };
-
-        if let Some(validator) = KEY_BINDING_VALIDATORS.get(&key_binding.action().type_id()) {
-            match validator.validate(&key_binding) {
-                Ok(()) => Ok(key_binding),
-                Err(error) => Err(error.0),
-            }
-        } else {
-            Ok(key_binding)
-        }
-    }
-
-    pub fn parse_action(
-        action: &KeymapAction,
-    ) -> Result<Option<(&String, Option<&Value>)>, String> {
-        let name_and_input = match &action.0 {
-            Value::Array(items) => {
-                if items.len() != 2 {
-                    return Err(format!(
-                        "expected two-element array of `[name, input]`. \
-                        Instead found {}.",
-                        MarkdownInlineCode(&action.0.to_string())
-                    ));
-                }
-                let serde_json::Value::String(ref name) = items[0] else {
-                    return Err(format!(
-                        "expected two-element array of `[name, input]`, \
-                        but the first element is not a string in {}.",
-                        MarkdownInlineCode(&action.0.to_string())
-                    ));
-                };
-                Some((name, Some(&items[1])))
-            }
-            Value::String(name) => Some((name, None)),
-            Value::Null => None,
-            _ => {
-                return Err(format!(
-                    "expected two-element array of `[name, input]`. \
-                    Instead found {}.",
-                    MarkdownInlineCode(&action.0.to_string())
-                ));
-            }
-        };
-        Ok(name_and_input)
-    }
-
-    fn build_keymap_action(
-        action: &KeymapAction,
-        cx: &App,
-    ) -> std::result::Result<(Box<dyn Action>, Option<String>), String> {
-        let (build_result, action_input_string) = match Self::parse_action(action)? {
-            Some((name, action_input)) if name.as_str() == ActionSequence::name_for_type() => {
-                match action_input {
-                    Some(action_input) => (
-                        ActionSequence::build_sequence(action_input.clone(), cx),
-                        None,
-                    ),
-                    None => (Err(ActionSequence::expected_array_error()), None),
-                }
-            }
-            Some((name, Some(action_input))) => {
-                let action_input_string = action_input.to_string();
-                (
-                    cx.build_action(name, Some(action_input.clone())),
-                    Some(action_input_string),
-                )
-            }
-            Some((name, None)) => (cx.build_action(name, None), None),
-            None => (Ok(NoAction.boxed_clone()), None),
-        };
-
-        let action = match build_result {
-            Ok(action) => action,
-            Err(ActionBuildError::NotFound { name }) => {
-                return Err(format!(
-                    "didn't find an action named {}.",
-                    MarkdownInlineCode(&format!("\"{}\"", &name))
-                ));
-            }
-            Err(ActionBuildError::BuildError { name, error }) => match action_input_string {
-                Some(action_input_string) => {
-                    return Err(format!(
-                        "can't build {} action from input value {}: {}",
-                        MarkdownInlineCode(&format!("\"{}\"", &name)),
-                        MarkdownInlineCode(&action_input_string),
-                        MarkdownEscaped(&error.to_string())
-                    ));
-                }
-                None => {
-                    return Err(format!(
-                        "can't build {} action - it requires input data via [name, input]: {}",
-                        MarkdownInlineCode(&format!("\"{}\"", &name)),
-                        MarkdownEscaped(&error.to_string())
-                    ));
-                }
-            },
-        };
-
-        Ok((action, action_input_string))
-    }
-
-    /// Creates a JSON schema generator, suitable for generating json schemas
-    /// for actions
-    pub fn action_schema_generator() -> schemars::SchemaGenerator {
-        schemars::generate::SchemaSettings::draft2019_09()
-            .with_transform(AllowTrailingCommas)
-            .into_generator()
-    }
-
-    pub fn generate_json_schema_for_registered_actions(cx: &mut App) -> Value {
-        // instead of using DefaultDenyUnknownFields, actions typically use
-        // `#[serde(deny_unknown_fields)]` so that these cases are reported as parse failures. This
-        // is because the rest of the keymap will still load in these cases, whereas other settings
-        // files would not.
-        let mut generator = Self::action_schema_generator();
-
-        let action_schemas = cx.action_schemas(&mut generator);
-        let action_documentation = cx.action_documentation();
-        let deprecations = cx.deprecated_actions_to_preferred_actions();
-        let deprecation_messages = cx.action_deprecation_messages();
-        KeymapFile::generate_json_schema(
-            generator,
-            action_schemas,
-            action_documentation,
-            deprecations,
-            deprecation_messages,
-        )
-    }
-
-    fn generate_json_schema(
-        mut generator: schemars::SchemaGenerator,
-        action_schemas: Vec<(&'static str, Option<schemars::Schema>)>,
-        action_documentation: &HashMap<&'static str, &'static str>,
-        deprecations: &HashMap<&'static str, &'static str>,
-        deprecation_messages: &HashMap<&'static str, &'static str>,
-    ) -> serde_json::Value {
-        fn add_deprecation(schema: &mut schemars::Schema, message: String) {
-            schema.insert(
-                // deprecationMessage is not part of the JSON Schema spec, but
-                // json-language-server recognizes it.
-                "deprecationMessage".to_string(),
-                Value::String(message),
-            );
-        }
-
-        fn add_deprecation_preferred_name(schema: &mut schemars::Schema, new_name: &str) {
-            add_deprecation(schema, format!("Deprecated, use {new_name}"));
-        }
-
-        fn add_description(schema: &mut schemars::Schema, description: &str) {
-            schema.insert(
-                "description".to_string(),
-                Value::String(description.to_string()),
-            );
-        }
-
-        let empty_object = json_schema!({
-            "type": "object"
-        });
-
-        // This is a workaround for a json-language-server issue where it matches the first
-        // alternative that matches the value's shape and uses that for documentation.
-        //
-        // In the case of the array validations, it would even provide an error saying that the name
-        // must match the name of the first alternative.
-        let mut empty_action_name = json_schema!({
-            "type": "string",
-            "const": ""
-        });
-        let no_action_message = "No action named this.";
-        add_description(&mut empty_action_name, no_action_message);
-        add_deprecation(&mut empty_action_name, no_action_message.to_string());
-        let empty_action_name_with_input = json_schema!({
-            "type": "array",
-            "items": [
-                empty_action_name,
-                true
-            ],
-            "minItems": 2,
-            "maxItems": 2
-        });
-        let mut keymap_action_alternatives = vec![empty_action_name, empty_action_name_with_input];
-
-        let mut empty_schema_action_names = vec![];
-        for (name, action_schema) in action_schemas.into_iter() {
-            let deprecation = if name == NoAction.name() {
-                Some("null")
-            } else {
-                deprecations.get(name).copied()
-            };
-
-            // Add an alternative for plain action names.
-            let mut plain_action = json_schema!({
-                "type": "string",
-                "const": name
-            });
-            if let Some(message) = deprecation_messages.get(name) {
-                add_deprecation(&mut plain_action, message.to_string());
-            } else if let Some(new_name) = deprecation {
-                add_deprecation_preferred_name(&mut plain_action, new_name);
-            }
-            let description = action_documentation.get(name);
-            if let Some(description) = &description {
-                add_description(&mut plain_action, description);
-            }
-            keymap_action_alternatives.push(plain_action);
-
-            // Add an alternative for actions with data specified as a [name, data] array.
-            //
-            // When a struct with no deserializable fields is added by deriving `Action`, an empty
-            // object schema is produced. The action should be invoked without data in this case.
-            if let Some(schema) = action_schema
-                && schema != empty_object
-            {
-                let mut matches_action_name = json_schema!({
-                    "const": name
-                });
-                if let Some(description) = &description {
-                    add_description(&mut matches_action_name, description);
-                }
-                if let Some(message) = deprecation_messages.get(name) {
-                    add_deprecation(&mut matches_action_name, message.to_string());
-                } else if let Some(new_name) = deprecation {
-                    add_deprecation_preferred_name(&mut matches_action_name, new_name);
-                }
-                let action_with_input = json_schema!({
-                    "type": "array",
-                    "items": [matches_action_name, schema],
-                    "minItems": 2,
-                    "maxItems": 2
-                });
-                keymap_action_alternatives.push(action_with_input);
-            } else {
-                empty_schema_action_names.push(name);
-            }
-        }
-
-        if !empty_schema_action_names.is_empty() {
-            let action_names = json_schema!({ "enum": empty_schema_action_names });
-            let no_properties_allowed = json_schema!({
-                "type": "object",
-                "additionalProperties": false
-            });
-            let mut actions_with_empty_input = json_schema!({
-                "type": "array",
-                "items": [action_names, no_properties_allowed],
-                "minItems": 2,
-                "maxItems": 2
-            });
-            add_deprecation(
-                &mut actions_with_empty_input,
-                "This action does not take input - just the action name string should be used."
-                    .to_string(),
-            );
-            keymap_action_alternatives.push(actions_with_empty_input);
-        }
-
-        // Placing null first causes json-language-server to default assuming actions should be
-        // null, so place it last.
-        keymap_action_alternatives.push(json_schema!({
-            "type": "null"
-        }));
-
-        // The `KeymapSection` schema will reference the `KeymapAction` schema by name, so setting
-        // the definition of `KeymapAction` results in the full action schema being used.
-        generator.definitions_mut().insert(
-            KeymapAction::schema_name().to_string(),
-            json!({
-                "oneOf": keymap_action_alternatives
-            }),
-        );
-
-        generator.root_schema_for::<KeymapFile>().to_value()
-    }
-
-    pub fn sections(&self) -> impl DoubleEndedIterator<Item = &KeymapSection> {
-        self.0.iter()
-    }
-
-    pub async fn load_keymap_file(fs: &Arc<dyn Fs>) -> Result<String> {
-        match fs.load(paths::keymap_file()).await {
-            result @ Ok(_) => result,
-            Err(err) => {
-                if let Some(e) = err.downcast_ref::<std::io::Error>()
-                    && e.kind() == std::io::ErrorKind::NotFound
-                {
-                    return Ok(crate::initial_keymap_content().to_string());
-                }
-                Err(err)
-            }
-        }
-    }
-
-    pub fn update_keybinding<'a>(
-        mut operation: KeybindUpdateOperation<'a>,
-        mut keymap_contents: String,
-        tab_size: usize,
-        keyboard_mapper: &dyn gpui::PlatformKeyboardMapper,
-    ) -> Result<String> {
-        match operation {
-            // if trying to replace a keybinding that is not user-defined, treat it as an add operation
-            KeybindUpdateOperation::Replace {
-                target_keybind_source: target_source,
-                source,
-                target,
-            } if target_source != KeybindSource::User => {
-                operation = KeybindUpdateOperation::Add {
-                    source,
-                    from: Some(target),
-                };
-            }
-            // if trying to remove a keybinding that is not user-defined, treat it as creating a binding
-            // that binds it to `zed::NoAction`
-            KeybindUpdateOperation::Remove {
-                target,
-                target_keybind_source,
-            } if target_keybind_source != KeybindSource::User => {
-                let mut source = target.clone();
-                source.action_name = gpui::NoAction.name();
-                source.action_arguments.take();
-                operation = KeybindUpdateOperation::Add {
-                    source,
-                    from: Some(target),
-                };
-            }
-            _ => {}
-        }
-
-        // Sanity check that keymap contents are valid, even though we only use it for Replace.
-        // We don't want to modify the file if it's invalid.
-        let keymap = Self::parse(&keymap_contents).context("Failed to parse keymap")?;
-
-        if let KeybindUpdateOperation::Remove { target, .. } = operation {
-            let target_action_value = target
-                .action_value()
-                .context("Failed to generate target action JSON value")?;
-            let Some((index, keystrokes_str)) =
-                find_binding(&keymap, &target, &target_action_value, keyboard_mapper)
-            else {
-                anyhow::bail!("Failed to find keybinding to remove");
-            };
-            let is_only_binding = keymap.0[index]
-                .bindings
-                .as_ref()
-                .is_none_or(|bindings| bindings.len() == 1);
-            let key_path: &[&str] = if is_only_binding {
-                &[]
-            } else {
-                &["bindings", keystrokes_str]
-            };
-            let (replace_range, replace_value) = replace_top_level_array_value_in_json_text(
-                &keymap_contents,
-                key_path,
-                None,
-                None,
-                index,
-                tab_size,
-            );
-            keymap_contents.replace_range(replace_range, &replace_value);
-            return Ok(keymap_contents);
-        }
-
-        if let KeybindUpdateOperation::Replace { source, target, .. } = operation {
-            let target_action_value = target
-                .action_value()
-                .context("Failed to generate target action JSON value")?;
-            let source_action_value = source
-                .action_value()
-                .context("Failed to generate source action JSON value")?;
-
-            if let Some((index, keystrokes_str)) =
-                find_binding(&keymap, &target, &target_action_value, keyboard_mapper)
-            {
-                if target.context == source.context {
-                    // if we are only changing the keybinding (common case)
-                    // not the context, etc. Then just update the binding in place
-
-                    let (replace_range, replace_value) = replace_top_level_array_value_in_json_text(
-                        &keymap_contents,
-                        &["bindings", keystrokes_str],
-                        Some(&source_action_value),
-                        Some(&source.keystrokes_unparsed()),
-                        index,
-                        tab_size,
-                    );
-                    keymap_contents.replace_range(replace_range, &replace_value);
-
-                    return Ok(keymap_contents);
-                } else if keymap.0[index]
-                    .bindings
-                    .as_ref()
-                    .is_none_or(|bindings| bindings.len() == 1)
-                {
-                    // if we are replacing the only binding in the section,
-                    // just update the section in place, updating the context
-                    // and the binding
-
-                    let (replace_range, replace_value) = replace_top_level_array_value_in_json_text(
-                        &keymap_contents,
-                        &["bindings", keystrokes_str],
-                        Some(&source_action_value),
-                        Some(&source.keystrokes_unparsed()),
-                        index,
-                        tab_size,
-                    );
-                    keymap_contents.replace_range(replace_range, &replace_value);
-
-                    let (replace_range, replace_value) = replace_top_level_array_value_in_json_text(
-                        &keymap_contents,
-                        &["context"],
-                        source.context.map(Into::into).as_ref(),
-                        None,
-                        index,
-                        tab_size,
-                    );
-                    keymap_contents.replace_range(replace_range, &replace_value);
-                    return Ok(keymap_contents);
-                } else {
-                    // if we are replacing one of multiple bindings in a section
-                    // with a context change, remove the existing binding from the
-                    // section, then treat this operation as an add operation of the
-                    // new binding with the updated context.
-
-                    let (replace_range, replace_value) = replace_top_level_array_value_in_json_text(
-                        &keymap_contents,
-                        &["bindings", keystrokes_str],
-                        None,
-                        None,
-                        index,
-                        tab_size,
-                    );
-                    keymap_contents.replace_range(replace_range, &replace_value);
-                    operation = KeybindUpdateOperation::Add {
-                        source,
-                        from: Some(target),
-                    };
-                }
-            } else {
-                log::warn!(
-                    "Failed to find keybinding to update `{:?} -> {}` creating new binding for `{:?} -> {}` instead",
-                    target.keystrokes,
-                    target_action_value,
-                    source.keystrokes,
-                    source_action_value,
-                );
-                operation = KeybindUpdateOperation::Add {
-                    source,
-                    from: Some(target),
-                };
-            }
-        }
-
-        if let KeybindUpdateOperation::Add {
-            source: keybinding,
-            from,
-        } = operation
-        {
-            let mut value = serde_json::Map::with_capacity(4);
-            if let Some(context) = keybinding.context {
-                value.insert("context".to_string(), context.into());
-            }
-            let use_key_equivalents = from.and_then(|from| {
-                let action_value = from.action_value().context("Failed to serialize action value. `use_key_equivalents` on new keybinding may be incorrect.").log_err()?;
-                let (index, _) = find_binding(&keymap, &from, &action_value, keyboard_mapper)?;
-                Some(keymap.0[index].use_key_equivalents)
-            }).unwrap_or(false);
-            if use_key_equivalents {
-                value.insert("use_key_equivalents".to_string(), true.into());
-            }
-
-            value.insert("bindings".to_string(), {
-                let mut bindings = serde_json::Map::new();
-                let action = keybinding.action_value()?;
-                bindings.insert(keybinding.keystrokes_unparsed(), action);
-                bindings.into()
-            });
-
-            let (replace_range, replace_value) = append_top_level_array_value_in_json_text(
-                &keymap_contents,
-                &value.into(),
-                tab_size,
-            );
-            keymap_contents.replace_range(replace_range, &replace_value);
-        }
-        return Ok(keymap_contents);
-
-        fn find_binding<'a, 'b>(
-            keymap: &'b KeymapFile,
-            target: &KeybindUpdateTarget<'a>,
-            target_action_value: &Value,
-            keyboard_mapper: &dyn gpui::PlatformKeyboardMapper,
-        ) -> Option<(usize, &'b str)> {
-            let target_context_parsed =
-                KeyBindingContextPredicate::parse(target.context.unwrap_or("")).ok();
-            for (index, section) in keymap.sections().enumerate() {
-                let section_context_parsed =
-                    KeyBindingContextPredicate::parse(&section.context).ok();
-                if section_context_parsed != target_context_parsed {
-                    continue;
-                }
-                let Some(bindings) = &section.bindings else {
-                    continue;
-                };
-                for (keystrokes_str, action) in bindings {
-                    let Ok(keystrokes) = keystrokes_str
-                        .split_whitespace()
-                        .map(|source| {
-                            let keystroke = Keystroke::parse(source)?;
-                            Ok(KeybindingKeystroke::new_with_mapper(
-                                keystroke,
-                                false,
-                                keyboard_mapper,
-                            ))
-                        })
-                        .collect::<Result<Vec<_>, InvalidKeystrokeError>>()
-                    else {
-                        continue;
-                    };
-                    if keystrokes.len() != target.keystrokes.len()
-                        || !keystrokes
-                            .iter()
-                            .zip(target.keystrokes)
-                            .all(|(a, b)| a.inner().should_match(b))
-                    {
-                        continue;
-                    }
-                    if &action.0 != target_action_value {
-                        continue;
-                    }
-                    return Some((index, keystrokes_str));
-                }
-            }
-            None
-        }
-    }
-}
-
-#[derive(Clone, Debug)]
-pub enum KeybindUpdateOperation<'a> {
-    Replace {
-        /// Describes the keybind to create
-        source: KeybindUpdateTarget<'a>,
-        /// Describes the keybind to remove
-        target: KeybindUpdateTarget<'a>,
-        target_keybind_source: KeybindSource,
-    },
-    Add {
-        source: KeybindUpdateTarget<'a>,
-        from: Option<KeybindUpdateTarget<'a>>,
-    },
-    Remove {
-        target: KeybindUpdateTarget<'a>,
-        target_keybind_source: KeybindSource,
-    },
-}
-
-impl KeybindUpdateOperation<'_> {
-    pub fn generate_telemetry(
-        &self,
-    ) -> (
-        // The keybind that is created
-        String,
-        // The keybinding that was removed
-        String,
-        // The source of the keybinding
-        String,
-    ) {
-        let (new_binding, removed_binding, source) = match &self {
-            KeybindUpdateOperation::Replace {
-                source,
-                target,
-                target_keybind_source,
-            } => (Some(source), Some(target), Some(*target_keybind_source)),
-            KeybindUpdateOperation::Add { source, .. } => (Some(source), None, None),
-            KeybindUpdateOperation::Remove {
-                target,
-                target_keybind_source,
-            } => (None, Some(target), Some(*target_keybind_source)),
-        };
-
-        let new_binding = new_binding
-            .map(KeybindUpdateTarget::telemetry_string)
-            .unwrap_or("null".to_owned());
-        let removed_binding = removed_binding
-            .map(KeybindUpdateTarget::telemetry_string)
-            .unwrap_or("null".to_owned());
-
-        let source = source
-            .as_ref()
-            .map(KeybindSource::name)
-            .map(ToOwned::to_owned)
-            .unwrap_or("null".to_owned());
-
-        (new_binding, removed_binding, source)
-    }
-}
-
-impl<'a> KeybindUpdateOperation<'a> {
-    pub fn add(source: KeybindUpdateTarget<'a>) -> Self {
-        Self::Add { source, from: None }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct KeybindUpdateTarget<'a> {
-    pub context: Option<&'a str>,
-    pub keystrokes: &'a [KeybindingKeystroke],
-    pub action_name: &'a str,
-    pub action_arguments: Option<&'a str>,
-}
-
-impl<'a> KeybindUpdateTarget<'a> {
-    fn action_value(&self) -> Result<Value> {
-        if self.action_name == gpui::NoAction.name() {
-            return Ok(Value::Null);
-        }
-        let action_name: Value = self.action_name.into();
-        let value = match self.action_arguments {
-            Some(args) if !args.is_empty() => {
-                let args = serde_json::from_str::<Value>(args)
-                    .context("Failed to parse action arguments as JSON")?;
-                serde_json::json!([action_name, args])
-            }
-            _ => action_name,
-        };
-        Ok(value)
-    }
-
-    fn keystrokes_unparsed(&self) -> String {
-        let mut keystrokes = String::with_capacity(self.keystrokes.len() * 8);
-        for keystroke in self.keystrokes {
-            // The reason use `keystroke.unparse()` instead of `keystroke.inner.unparse()`
-            // here is that, we want the user to use `ctrl-shift-4` instead of `ctrl-$`
-            // by default on Windows.
-            keystrokes.push_str(&keystroke.unparse());
-            keystrokes.push(' ');
-        }
-        keystrokes.pop();
-        keystrokes
-    }
-
-    fn telemetry_string(&self) -> String {
-        format!(
-            "action_name: {}, context: {}, action_arguments: {}, keystrokes: {}",
-            self.action_name,
-            self.context.unwrap_or("global"),
-            self.action_arguments.unwrap_or("none"),
-            self.keystrokes_unparsed()
-        )
-    }
-}
-
-#[derive(Clone, Copy, Default, PartialEq, Eq, PartialOrd, Ord, Debug)]
-pub enum KeybindSource {
-    User,
-    Vim,
-    Base,
-    #[default]
-    Default,
-    Unknown,
-}
-
-impl KeybindSource {
-    const BASE: KeyBindingMetaIndex = KeyBindingMetaIndex(KeybindSource::Base as u32);
-    const DEFAULT: KeyBindingMetaIndex = KeyBindingMetaIndex(KeybindSource::Default as u32);
-    const VIM: KeyBindingMetaIndex = KeyBindingMetaIndex(KeybindSource::Vim as u32);
-    const USER: KeyBindingMetaIndex = KeyBindingMetaIndex(KeybindSource::User as u32);
-
-    pub fn name(&self) -> &'static str {
-        match self {
-            KeybindSource::User => "User",
-            KeybindSource::Default => "Default",
-            KeybindSource::Base => "Base",
-            KeybindSource::Vim => "Vim",
-            KeybindSource::Unknown => "Unknown",
-        }
-    }
-
-    pub fn meta(&self) -> KeyBindingMetaIndex {
-        match self {
-            KeybindSource::User => Self::USER,
-            KeybindSource::Default => Self::DEFAULT,
-            KeybindSource::Base => Self::BASE,
-            KeybindSource::Vim => Self::VIM,
-            KeybindSource::Unknown => KeyBindingMetaIndex(*self as u32),
-        }
-    }
-
-    pub fn from_meta(index: KeyBindingMetaIndex) -> Self {
-        match index {
-            Self::USER => KeybindSource::User,
-            Self::BASE => KeybindSource::Base,
-            Self::DEFAULT => KeybindSource::Default,
-            Self::VIM => KeybindSource::Vim,
-            _ => KeybindSource::Unknown,
-        }
-    }
-}
-
-impl From<KeyBindingMetaIndex> for KeybindSource {
-    fn from(index: KeyBindingMetaIndex) -> Self {
-        Self::from_meta(index)
-    }
-}
-
-impl From<KeybindSource> for KeyBindingMetaIndex {
-    fn from(source: KeybindSource) -> Self {
-        source.meta()
-    }
-}
-
-/// Runs a sequence of actions. Does not wait for asynchronous actions to complete before running
-/// the next action. Currently only works in workspace windows.
-///
-/// This action is special-cased in keymap parsing to allow it to access `App` while parsing, so
-/// that it can parse its input actions.
-pub struct ActionSequence(pub Vec<Box<dyn Action>>);
-
-register_action!(ActionSequence);
-
-impl ActionSequence {
-    fn build_sequence(
-        value: Value,
-        cx: &App,
-    ) -> std::result::Result<Box<dyn Action>, ActionBuildError> {
-        match value {
-            Value::Array(values) => {
-                let actions = values
-                    .into_iter()
-                    .enumerate()
-                    .map(|(index, action)| {
-                        match KeymapFile::build_keymap_action(&KeymapAction(action), cx) {
-                            Ok((action, _)) => Ok(action),
-                            Err(err) => {
-                                return Err(ActionBuildError::BuildError {
-                                    name: Self::name_for_type().to_string(),
-                                    error: anyhow::anyhow!(
-                                        "error at sequence index {index}: {err}"
-                                    ),
-                                });
-                            }
-                        }
-                    })
-                    .collect::<Result<Vec<_>, _>>()?;
-                Ok(Box::new(Self(actions)))
-            }
-            _ => Err(Self::expected_array_error()),
-        }
-    }
-
-    fn expected_array_error() -> ActionBuildError {
-        ActionBuildError::BuildError {
-            name: Self::name_for_type().to_string(),
-            error: anyhow::anyhow!("expected array of actions"),
-        }
-    }
-}
-
-impl Action for ActionSequence {
-    fn name(&self) -> &'static str {
-        Self::name_for_type()
-    }
-
-    fn name_for_type() -> &'static str
-    where
-        Self: Sized,
-    {
-        "action::Sequence"
-    }
-
-    fn partial_eq(&self, action: &dyn Action) -> bool {
-        action
-            .as_any()
-            .downcast_ref::<Self>()
-            .map_or(false, |other| {
-                self.0.len() == other.0.len()
-                    && self
-                        .0
-                        .iter()
-                        .zip(other.0.iter())
-                        .all(|(a, b)| a.partial_eq(b.as_ref()))
-            })
-    }
-
-    fn boxed_clone(&self) -> Box<dyn Action> {
-        Box::new(ActionSequence(
-            self.0
-                .iter()
-                .map(|action| action.boxed_clone())
-                .collect::<Vec<_>>(),
-        ))
-    }
-
-    fn build(_value: Value) -> Result<Box<dyn Action>> {
-        Err(anyhow::anyhow!(
-            "{} cannot be built directly",
-            Self::name_for_type()
-        ))
-    }
-
-    fn action_json_schema(generator: &mut schemars::SchemaGenerator) -> Option<schemars::Schema> {
-        let keymap_action_schema = generator.subschema_for::<KeymapAction>();
-        Some(json_schema!({
-            "type": "array",
-            "items": keymap_action_schema
-        }))
-    }
-
-    fn deprecated_aliases() -> &'static [&'static str] {
-        &[]
-    }
-
-    fn deprecation_message() -> Option<&'static str> {
-        None
-    }
-
-    fn documentation() -> Option<&'static str> {
-        Some(
-            "Runs a sequence of actions.\n\n\
-            NOTE: This does **not** wait for asynchronous actions to complete before running the next action.",
-        )
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use gpui::{DummyKeyboardMapper, KeybindingKeystroke, Keystroke};
-    use unindent::Unindent;
-
-    use crate::{
-        KeybindSource, KeymapFile,
-        keymap_file::{KeybindUpdateOperation, KeybindUpdateTarget},
-    };
-
-    #[test]
-    fn can_deserialize_keymap_with_trailing_comma() {
-        let json = indoc::indoc! {"[
-              // Standard macOS bindings
-              {
-                \"bindings\": {
-                  \"up\": \"menu::SelectPrevious\",
-                },
-              },
-            ]
-                  "
-        };
-        KeymapFile::parse(json).unwrap();
-    }
-
-    #[track_caller]
-    fn check_keymap_update(
-        input: impl ToString,
-        operation: KeybindUpdateOperation,
-        expected: impl ToString,
-    ) {
-        let result = KeymapFile::update_keybinding(
-            operation,
-            input.to_string(),
-            4,
-            &gpui::DummyKeyboardMapper,
-        )
-        .expect("Update succeeded");
-        pretty_assertions::assert_eq!(expected.to_string(), result);
-    }
-
-    #[track_caller]
-    fn parse_keystrokes(keystrokes: &str) -> Vec<KeybindingKeystroke> {
-        keystrokes
-            .split(' ')
-            .map(|s| {
-                KeybindingKeystroke::new_with_mapper(
-                    Keystroke::parse(s).expect("Keystrokes valid"),
-                    false,
-                    &DummyKeyboardMapper,
-                )
-            })
-            .collect()
-    }
-
-    #[test]
-    fn keymap_update() {
-        zlog::init_test();
-
-        check_keymap_update(
-            "[]",
-            KeybindUpdateOperation::add(KeybindUpdateTarget {
-                keystrokes: &parse_keystrokes("ctrl-a"),
-                action_name: "zed::SomeAction",
-                context: None,
-                action_arguments: None,
-            }),
-            r#"[
-                {
-                    "bindings": {
-                        "ctrl-a": "zed::SomeAction"
-                    }
-                }
-            ]"#
-            .unindent(),
-        );
-
-        check_keymap_update(
-            "[]",
-            KeybindUpdateOperation::add(KeybindUpdateTarget {
-                keystrokes: &parse_keystrokes("\\ a"),
-                action_name: "zed::SomeAction",
-                context: None,
-                action_arguments: None,
-            }),
-            r#"[
-                {
-                    "bindings": {
-                        "\\ a": "zed::SomeAction"
-                    }
-                }
-            ]"#
-            .unindent(),
-        );
-
-        check_keymap_update(
-            "[]",
-            KeybindUpdateOperation::add(KeybindUpdateTarget {
-                keystrokes: &parse_keystrokes("ctrl-a"),
-                action_name: "zed::SomeAction",
-                context: None,
-                action_arguments: Some(""),
-            }),
-            r#"[
-                {
-                    "bindings": {
-                        "ctrl-a": "zed::SomeAction"
-                    }
-                }
-            ]"#
-            .unindent(),
-        );
-
-        check_keymap_update(
-            r#"[
-                {
-                    "bindings": {
-                        "ctrl-a": "zed::SomeAction"
-                    }
-                }
-            ]"#
-            .unindent(),
-            KeybindUpdateOperation::add(KeybindUpdateTarget {
-                keystrokes: &parse_keystrokes("ctrl-b"),
-                action_name: "zed::SomeOtherAction",
-                context: None,
-                action_arguments: None,
-            }),
-            r#"[
-                {
-                    "bindings": {
-                        "ctrl-a": "zed::SomeAction"
-                    }
-                },
-                {
-                    "bindings": {
-                        "ctrl-b": "zed::SomeOtherAction"
-                    }
-                }
-            ]"#
-            .unindent(),
-        );
-
-        check_keymap_update(
-            r#"[
-                {
-                    "bindings": {
-                        "ctrl-a": "zed::SomeAction"
-                    }
-                }
-            ]"#
-            .unindent(),
-            KeybindUpdateOperation::add(KeybindUpdateTarget {
-                keystrokes: &parse_keystrokes("ctrl-b"),
-                action_name: "zed::SomeOtherAction",
-                context: None,
-                action_arguments: Some(r#"{"foo": "bar"}"#),
-            }),
-            r#"[
-                {
-                    "bindings": {
-                        "ctrl-a": "zed::SomeAction"
-                    }
-                },
-                {
-                    "bindings": {
-                        "ctrl-b": [
-                            "zed::SomeOtherAction",
-                            {
-                                "foo": "bar"
-                            }
-                        ]
-                    }
-                }
-            ]"#
-            .unindent(),
-        );
-
-        check_keymap_update(
-            r#"[
-                {
-                    "bindings": {
-                        "ctrl-a": "zed::SomeAction"
-                    }
-                }
-            ]"#
-            .unindent(),
-            KeybindUpdateOperation::add(KeybindUpdateTarget {
-                keystrokes: &parse_keystrokes("ctrl-b"),
-                action_name: "zed::SomeOtherAction",
-                context: Some("Zed > Editor && some_condition = true"),
-                action_arguments: Some(r#"{"foo": "bar"}"#),
-            }),
-            r#"[
-                {
-                    "bindings": {
-                        "ctrl-a": "zed::SomeAction"
-                    }
-                },
-                {
-                    "context": "Zed > Editor && some_condition = true",
-                    "bindings": {
-                        "ctrl-b": [
-                            "zed::SomeOtherAction",
-                            {
-                                "foo": "bar"
-                            }
-                        ]
-                    }
-                }
-            ]"#
-            .unindent(),
-        );
-
-        check_keymap_update(
-            r#"[
-                {
-                    "bindings": {
-                        "ctrl-a": "zed::SomeAction"
-                    }
-                }
-            ]"#
-            .unindent(),
-            KeybindUpdateOperation::Replace {
-                target: KeybindUpdateTarget {
-                    keystrokes: &parse_keystrokes("ctrl-a"),
-                    action_name: "zed::SomeAction",
-                    context: None,
-                    action_arguments: None,
-                },
-                source: KeybindUpdateTarget {
-                    keystrokes: &parse_keystrokes("ctrl-b"),
-                    action_name: "zed::SomeOtherAction",
-                    context: None,
-                    action_arguments: Some(r#"{"foo": "bar"}"#),
-                },
-                target_keybind_source: KeybindSource::Base,
-            },
-            r#"[
-                {
-                    "bindings": {
-                        "ctrl-a": "zed::SomeAction"
-                    }
-                },
-                {
-                    "bindings": {
-                        "ctrl-b": [
-                            "zed::SomeOtherAction",
-                            {
-                                "foo": "bar"
-                            }
-                        ]
-                    }
-                }
-            ]"#
-            .unindent(),
-        );
-
-        check_keymap_update(
-            r#"[
-                {
-                    "bindings": {
-                        "a": "zed::SomeAction"
-                    }
-                }
-            ]"#
-            .unindent(),
-            KeybindUpdateOperation::Replace {
-                target: KeybindUpdateTarget {
-                    keystrokes: &parse_keystrokes("a"),
-                    action_name: "zed::SomeAction",
-                    context: None,
-                    action_arguments: None,
-                },
-                source: KeybindUpdateTarget {
-                    keystrokes: &parse_keystrokes("ctrl-b"),
-                    action_name: "zed::SomeOtherAction",
-                    context: None,
-                    action_arguments: Some(r#"{"foo": "bar"}"#),
-                },
-                target_keybind_source: KeybindSource::User,
-            },
-            r#"[
-                {
-                    "bindings": {
-                        "ctrl-b": [
-                            "zed::SomeOtherAction",
-                            {
-                                "foo": "bar"
-                            }
-                        ]
-                    }
-                }
-            ]"#
-            .unindent(),
-        );
-
-        check_keymap_update(
-            r#"[
-                {
-                    "bindings": {
-                        "\\ a": "zed::SomeAction"
-                    }
-                }
-            ]"#
-            .unindent(),
-            KeybindUpdateOperation::Replace {
-                target: KeybindUpdateTarget {
-                    keystrokes: &parse_keystrokes("\\ a"),
-                    action_name: "zed::SomeAction",
-                    context: None,
-                    action_arguments: None,
-                },
-                source: KeybindUpdateTarget {
-                    keystrokes: &parse_keystrokes("\\ b"),
-                    action_name: "zed::SomeOtherAction",
-                    context: None,
-                    action_arguments: Some(r#"{"foo": "bar"}"#),
-                },
-                target_keybind_source: KeybindSource::User,
-            },
-            r#"[
-                {
-                    "bindings": {
-                        "\\ b": [
-                            "zed::SomeOtherAction",
-                            {
-                                "foo": "bar"
-                            }
-                        ]
-                    }
-                }
-            ]"#
-            .unindent(),
-        );
-
-        check_keymap_update(
-            r#"[
-                {
-                    "bindings": {
-                        "\\ a": "zed::SomeAction"
-                    }
-                }
-            ]"#
-            .unindent(),
-            KeybindUpdateOperation::Replace {
-                target: KeybindUpdateTarget {
-                    keystrokes: &parse_keystrokes("\\ a"),
-                    action_name: "zed::SomeAction",
-                    context: None,
-                    action_arguments: None,
-                },
-                source: KeybindUpdateTarget {
-                    keystrokes: &parse_keystrokes("\\ a"),
-                    action_name: "zed::SomeAction",
-                    context: None,
-                    action_arguments: None,
-                },
-                target_keybind_source: KeybindSource::User,
-            },
-            r#"[
-                {
-                    "bindings": {
-                        "\\ a": "zed::SomeAction"
-                    }
-                }
-            ]"#
-            .unindent(),
-        );
-
-        check_keymap_update(
-            r#"[
-                {
-                    "bindings": {
-                        "ctrl-a": "zed::SomeAction"
-                    }
-                }
-            ]"#
-            .unindent(),
-            KeybindUpdateOperation::Replace {
-                target: KeybindUpdateTarget {
-                    keystrokes: &parse_keystrokes("ctrl-a"),
-                    action_name: "zed::SomeNonexistentAction",
-                    context: None,
-                    action_arguments: None,
-                },
-                source: KeybindUpdateTarget {
-                    keystrokes: &parse_keystrokes("ctrl-b"),
-                    action_name: "zed::SomeOtherAction",
-                    context: None,
-                    action_arguments: None,
-                },
-                target_keybind_source: KeybindSource::User,
-            },
-            r#"[
-                {
-                    "bindings": {
-                        "ctrl-a": "zed::SomeAction"
-                    }
-                },
-                {
-                    "bindings": {
-                        "ctrl-b": "zed::SomeOtherAction"
-                    }
-                }
-            ]"#
-            .unindent(),
-        );
-
-        check_keymap_update(
-            r#"[
-                {
-                    "bindings": {
-                        // some comment
-                        "ctrl-a": "zed::SomeAction"
-                        // some other comment
-                    }
-                }
-            ]"#
-            .unindent(),
-            KeybindUpdateOperation::Replace {
-                target: KeybindUpdateTarget {
-                    keystrokes: &parse_keystrokes("ctrl-a"),
-                    action_name: "zed::SomeAction",
-                    context: None,
-                    action_arguments: None,
-                },
-                source: KeybindUpdateTarget {
-                    keystrokes: &parse_keystrokes("ctrl-b"),
-                    action_name: "zed::SomeOtherAction",
-                    context: None,
-                    action_arguments: Some(r#"{"foo": "bar"}"#),
-                },
-                target_keybind_source: KeybindSource::User,
-            },
-            r#"[
-                {
-                    "bindings": {
-                        // some comment
-                        "ctrl-b": [
-                            "zed::SomeOtherAction",
-                            {
-                                "foo": "bar"
-                            }
-                        ]
-                        // some other comment
-                    }
-                }
-            ]"#
-            .unindent(),
-        );
-
-        check_keymap_update(
-            r#"[
-                {
-                    "context": "SomeContext",
-                    "bindings": {
-                        "a": "foo::bar",
-                        "b": "baz::qux",
-                    }
-                }
-            ]"#
-            .unindent(),
-            KeybindUpdateOperation::Replace {
-                target: KeybindUpdateTarget {
-                    keystrokes: &parse_keystrokes("a"),
-                    action_name: "foo::bar",
-                    context: Some("SomeContext"),
-                    action_arguments: None,
-                },
-                source: KeybindUpdateTarget {
-                    keystrokes: &parse_keystrokes("c"),
-                    action_name: "foo::baz",
-                    context: Some("SomeOtherContext"),
-                    action_arguments: None,
-                },
-                target_keybind_source: KeybindSource::User,
-            },
-            r#"[
-                {
-                    "context": "SomeContext",
-                    "bindings": {
-                        "b": "baz::qux",
-                    }
-                },
-                {
-                    "context": "SomeOtherContext",
-                    "bindings": {
-                        "c": "foo::baz"
-                    }
-                }
-            ]"#
-            .unindent(),
-        );
-
-        check_keymap_update(
-            r#"[
-                {
-                    "context": "SomeContext",
-                    "bindings": {
-                        "a": "foo::bar",
-                    }
-                }
-            ]"#
-            .unindent(),
-            KeybindUpdateOperation::Replace {
-                target: KeybindUpdateTarget {
-                    keystrokes: &parse_keystrokes("a"),
-                    action_name: "foo::bar",
-                    context: Some("SomeContext"),
-                    action_arguments: None,
-                },
-                source: KeybindUpdateTarget {
-                    keystrokes: &parse_keystrokes("c"),
-                    action_name: "foo::baz",
-                    context: Some("SomeOtherContext"),
-                    action_arguments: None,
-                },
-                target_keybind_source: KeybindSource::User,
-            },
-            r#"[
-                {
-                    "context": "SomeOtherContext",
-                    "bindings": {
-                        "c": "foo::baz",
-                    }
-                }
-            ]"#
-            .unindent(),
-        );
-
-        check_keymap_update(
-            r#"[
-                {
-                    "context": "SomeContext",
-                    "bindings": {
-                        "a": "foo::bar",
-                        "c": "foo::baz",
-                    }
-                },
-            ]"#
-            .unindent(),
-            KeybindUpdateOperation::Remove {
-                target: KeybindUpdateTarget {
-                    context: Some("SomeContext"),
-                    keystrokes: &parse_keystrokes("a"),
-                    action_name: "foo::bar",
-                    action_arguments: None,
-                },
-                target_keybind_source: KeybindSource::User,
-            },
-            r#"[
-                {
-                    "context": "SomeContext",
-                    "bindings": {
-                        "c": "foo::baz",
-                    }
-                },
-            ]"#
-            .unindent(),
-        );
-
-        check_keymap_update(
-            r#"[
-                {
-                    "context": "SomeContext",
-                    "bindings": {
-                        "\\ a": "foo::bar",
-                        "c": "foo::baz",
-                    }
-                },
-            ]"#
-            .unindent(),
-            KeybindUpdateOperation::Remove {
-                target: KeybindUpdateTarget {
-                    context: Some("SomeContext"),
-                    keystrokes: &parse_keystrokes("\\ a"),
-                    action_name: "foo::bar",
-                    action_arguments: None,
-                },
-                target_keybind_source: KeybindSource::User,
-            },
-            r#"[
-                {
-                    "context": "SomeContext",
-                    "bindings": {
-                        "c": "foo::baz",
-                    }
-                },
-            ]"#
-            .unindent(),
-        );
-
-        check_keymap_update(
-            r#"[
-                {
-                    "context": "SomeContext",
-                    "bindings": {
-                        "a": ["foo::bar", true],
-                        "c": "foo::baz",
-                    }
-                },
-            ]"#
-            .unindent(),
-            KeybindUpdateOperation::Remove {
-                target: KeybindUpdateTarget {
-                    context: Some("SomeContext"),
-                    keystrokes: &parse_keystrokes("a"),
-                    action_name: "foo::bar",
-                    action_arguments: Some("true"),
-                },
-                target_keybind_source: KeybindSource::User,
-            },
-            r#"[
-                {
-                    "context": "SomeContext",
-                    "bindings": {
-                        "c": "foo::baz",
-                    }
-                },
-            ]"#
-            .unindent(),
-        );
-
-        check_keymap_update(
-            r#"[
-                {
-                    "context": "SomeContext",
-                    "bindings": {
-                        "b": "foo::baz",
-                    }
-                },
-                {
-                    "context": "SomeContext",
-                    "bindings": {
-                        "a": ["foo::bar", true],
-                    }
-                },
-                {
-                    "context": "SomeContext",
-                    "bindings": {
-                        "c": "foo::baz",
-                    }
-                },
-            ]"#
-            .unindent(),
-            KeybindUpdateOperation::Remove {
-                target: KeybindUpdateTarget {
-                    context: Some("SomeContext"),
-                    keystrokes: &parse_keystrokes("a"),
-                    action_name: "foo::bar",
-                    action_arguments: Some("true"),
-                },
-                target_keybind_source: KeybindSource::User,
-            },
-            r#"[
-                {
-                    "context": "SomeContext",
-                    "bindings": {
-                        "b": "foo::baz",
-                    }
-                },
-                {
-                    "context": "SomeContext",
-                    "bindings": {
-                        "c": "foo::baz",
-                    }
-                },
-            ]"#
-            .unindent(),
-        );
-        check_keymap_update(
-            r#"[
-                {
-                    "context": "SomeOtherContext",
-                    "use_key_equivalents": true,
-                    "bindings": {
-                        "b": "foo::bar",
-                    }
-                },
-            ]"#
-            .unindent(),
-            KeybindUpdateOperation::Add {
-                source: KeybindUpdateTarget {
-                    context: Some("SomeContext"),
-                    keystrokes: &parse_keystrokes("a"),
-                    action_name: "foo::baz",
-                    action_arguments: Some("true"),
-                },
-                from: Some(KeybindUpdateTarget {
-                    context: Some("SomeOtherContext"),
-                    keystrokes: &parse_keystrokes("b"),
-                    action_name: "foo::bar",
-                    action_arguments: None,
-                }),
-            },
-            r#"[
-                {
-                    "context": "SomeOtherContext",
-                    "use_key_equivalents": true,
-                    "bindings": {
-                        "b": "foo::bar",
-                    }
-                },
-                {
-                    "context": "SomeContext",
-                    "use_key_equivalents": true,
-                    "bindings": {
-                        "a": [
-                            "foo::baz",
-                            true
-                        ]
-                    }
-                }
-            ]"#
-            .unindent(),
-        );
-
-        check_keymap_update(
-            r#"[
-                {
-                    "context": "SomeOtherContext",
-                    "use_key_equivalents": true,
-                    "bindings": {
-                        "b": "foo::bar",
-                    }
-                },
-            ]"#
-            .unindent(),
-            KeybindUpdateOperation::Remove {
-                target: KeybindUpdateTarget {
-                    context: Some("SomeContext"),
-                    keystrokes: &parse_keystrokes("a"),
-                    action_name: "foo::baz",
-                    action_arguments: Some("true"),
-                },
-                target_keybind_source: KeybindSource::Default,
-            },
-            r#"[
-                {
-                    "context": "SomeOtherContext",
-                    "use_key_equivalents": true,
-                    "bindings": {
-                        "b": "foo::bar",
-                    }
-                },
-                {
-                    "context": "SomeContext",
-                    "bindings": {
-                        "a": null
-                    }
-                }
-            ]"#
-            .unindent(),
-        );
-    }
-
-    #[test]
-    fn test_keymap_remove() {
-        zlog::init_test();
-
-        check_keymap_update(
-            r#"
-            [
-              {
-                "context": "Editor",
-                "bindings": {
-                  "cmd-k cmd-u": "editor::ConvertToUpperCase",
-                  "cmd-k cmd-l": "editor::ConvertToLowerCase",
-                  "cmd-[": "pane::GoBack",
-                }
-              },
-            ]
-            "#,
-            KeybindUpdateOperation::Remove {
-                target: KeybindUpdateTarget {
-                    context: Some("Editor"),
-                    keystrokes: &parse_keystrokes("cmd-k cmd-l"),
-                    action_name: "editor::ConvertToLowerCase",
-                    action_arguments: None,
-                },
-                target_keybind_source: KeybindSource::User,
-            },
-            r#"
-            [
-              {
-                "context": "Editor",
-                "bindings": {
-                  "cmd-k cmd-u": "editor::ConvertToUpperCase",
-                  "cmd-[": "pane::GoBack",
-                }
-              },
-            ]
-            "#,
-        );
-    }
-}
diff --git a/crates/settings/src/merge_from.rs b/crates/settings/src/merge_from.rs
deleted file mode 100644
index 30ad0d3671..0000000000
--- a/crates/settings/src/merge_from.rs
+++ /dev/null
@@ -1,176 +0,0 @@
-/// Trait for recursively merging settings structures.
-///
-/// When Zed starts it loads settings from `default.json` to initialize
-/// everything. These may be further refined by loading the user's settings,
-/// and any settings profiles; and then further refined by loading any
-/// local project settings.
-///
-/// The default behaviour of merging is:
-/// * For objects with named keys (HashMap, structs, etc.). The values are merged deeply
-///   (so if the default settings has languages.JSON.prettier.allowed = true, and the user's settings has
-///    languages.JSON.tab_size = 4; the merged settings file will have both settings).
-/// * For options, a None value is ignored, but Some values are merged recursively.
-/// * For other types (including Vec), a merge overwrites the current value.
-///
-/// If you want to break the rules you can (e.g. ExtendingVec, or SaturatingBool).
-#[allow(unused)]
-pub trait MergeFrom {
-    /// Merge from a source of the same type.
-    fn merge_from(&mut self, other: &Self);
-
-    /// Merge from an optional source of the same type.
-    fn merge_from_option(&mut self, other: Option<&Self>) {
-        if let Some(other) = other {
-            self.merge_from(other);
-        }
-    }
-}
-
-macro_rules! merge_from_overwrites {
-    ($($type:ty),+) => {
-        $(
-            impl MergeFrom for $type {
-                fn merge_from(&mut self, other: &Self) {
-                    *self = other.clone();
-                }
-            }
-        )+
-    }
-}
-
-merge_from_overwrites!(
-    u16,
-    u32,
-    u64,
-    usize,
-    i16,
-    i32,
-    i64,
-    bool,
-    f64,
-    f32,
-    char,
-    std::num::NonZeroUsize,
-    std::num::NonZeroU32,
-    String,
-    std::sync::Arc<str>,
-    gpui::SharedString,
-    std::path::PathBuf,
-    gpui::Modifiers,
-    gpui::FontFeatures,
-    gpui::FontWeight
-);
-
-impl<T: Clone + MergeFrom> MergeFrom for Option<T> {
-    fn merge_from(&mut self, other: &Self) {
-        let Some(other) = other else {
-            return;
-        };
-        if let Some(this) = self {
-            this.merge_from(other);
-        } else {
-            self.replace(other.clone());
-        }
-    }
-}
-
-impl<T: Clone> MergeFrom for Vec<T> {
-    fn merge_from(&mut self, other: &Self) {
-        *self = other.clone()
-    }
-}
-
-impl<T: MergeFrom> MergeFrom for Box<T> {
-    fn merge_from(&mut self, other: &Self) {
-        self.as_mut().merge_from(other.as_ref())
-    }
-}
-
-// Implementations for collections that extend/merge their contents
-impl<K, V> MergeFrom for collections::HashMap<K, V>
-where
-    K: Clone + std::hash::Hash + Eq,
-    V: Clone + MergeFrom,
-{
-    fn merge_from(&mut self, other: &Self) {
-        for (k, v) in other {
-            if let Some(existing) = self.get_mut(k) {
-                existing.merge_from(v);
-            } else {
-                self.insert(k.clone(), v.clone());
-            }
-        }
-    }
-}
-
-impl<K, V> MergeFrom for collections::BTreeMap<K, V>
-where
-    K: Clone + std::hash::Hash + Eq + Ord,
-    V: Clone + MergeFrom,
-{
-    fn merge_from(&mut self, other: &Self) {
-        for (k, v) in other {
-            if let Some(existing) = self.get_mut(k) {
-                existing.merge_from(v);
-            } else {
-                self.insert(k.clone(), v.clone());
-            }
-        }
-    }
-}
-
-impl<K, V> MergeFrom for collections::IndexMap<K, V>
-where
-    K: std::hash::Hash + Eq + Clone,
-    // Q: ?Sized + std::hash::Hash + collections::Equivalent<K> + Eq,
-    V: Clone + MergeFrom,
-{
-    fn merge_from(&mut self, other: &Self) {
-        for (k, v) in other {
-            if let Some(existing) = self.get_mut(k) {
-                existing.merge_from(v);
-            } else {
-                self.insert(k.clone(), v.clone());
-            }
-        }
-    }
-}
-
-impl<T> MergeFrom for collections::BTreeSet<T>
-where
-    T: Clone + Ord,
-{
-    fn merge_from(&mut self, other: &Self) {
-        for item in other {
-            self.insert(item.clone());
-        }
-    }
-}
-
-impl<T> MergeFrom for collections::HashSet<T>
-where
-    T: Clone + std::hash::Hash + Eq,
-{
-    fn merge_from(&mut self, other: &Self) {
-        for item in other {
-            self.insert(item.clone());
-        }
-    }
-}
-
-impl MergeFrom for serde_json::Value {
-    fn merge_from(&mut self, other: &Self) {
-        match (self, other) {
-            (serde_json::Value::Object(this), serde_json::Value::Object(other)) => {
-                for (k, v) in other {
-                    if let Some(existing) = this.get_mut(k) {
-                        existing.merge_from(v);
-                    } else {
-                        this.insert(k.clone(), v.clone());
-                    }
-                }
-            }
-            (this, other) => *this = other.clone(),
-        }
-    }
-}
diff --git a/crates/settings/src/serde_helper.rs b/crates/settings/src/serde_helper.rs
deleted file mode 100644
index 1c1826abd4..0000000000
--- a/crates/settings/src/serde_helper.rs
+++ /dev/null
@@ -1,135 +0,0 @@
-use serde::Serializer;
-
-/// Serializes an f32 value with 2 decimal places of precision.
-///
-/// This function rounds the value to 2 decimal places and formats it as a string,
-/// then parses it back to f64 before serialization. This ensures clean JSON output
-/// without IEEE 754 floating-point artifacts.
-///
-/// # Arguments
-///
-/// * `value` - The f32 value to serialize
-/// * `serializer` - The serde serializer to use
-///
-/// # Returns
-///
-/// Result of the serialization operation
-///
-/// # Usage
-///
-/// This function can be used with Serde's `serialize_with` attribute:
-/// ```
-/// use serde::Serialize;
-/// use settings::serialize_f32_with_two_decimal_places;
-///
-/// #[derive(Serialize)]
-/// struct ExampleStruct(#[serde(serialize_with = "serialize_f32_with_two_decimal_places")] f32);
-/// ```
-pub fn serialize_f32_with_two_decimal_places<S>(
-    value: &f32,
-    serializer: S,
-) -> Result<S::Ok, S::Error>
-where
-    S: Serializer,
-{
-    let rounded = (value * 100.0).round() / 100.0;
-    let formatted = format!("{:.2}", rounded);
-    let clean_value: f64 = formatted.parse().unwrap_or(rounded as f64);
-    serializer.serialize_f64(clean_value)
-}
-
-/// Serializes an optional f32 value with 2 decimal places of precision.
-///
-/// This function handles `Option<f32>` types, serializing `Some` values with 2 decimal
-/// places of precision and `None` values as null. For `Some` values, it rounds to 2 decimal
-/// places and formats as a string, then parses back to f64 before serialization. This ensures
-/// clean JSON output without IEEE 754 floating-point artifacts.
-///
-/// # Arguments
-///
-/// * `value` - The optional f32 value to serialize
-/// * `serializer` - The serde serializer to use
-///
-/// # Returns
-///
-/// Result of the serialization operation
-///
-/// # Behavior
-///
-/// * `Some(v)` - Serializes the value rounded to 2 decimal places
-/// * `None` - Serializes as JSON null
-///
-/// # Usage
-///
-/// This function can be used with Serde's `serialize_with` attribute:
-/// ```
-/// use serde::Serialize;
-/// use settings::serialize_optional_f32_with_two_decimal_places;
-///
-/// #[derive(Serialize)]
-/// struct ExampleStruct {
-///     #[serde(serialize_with = "serialize_optional_f32_with_two_decimal_places")]
-///     optional_value: Option<f32>,
-/// }
-/// ```
-pub fn serialize_optional_f32_with_two_decimal_places<S>(
-    value: &Option<f32>,
-    serializer: S,
-) -> Result<S::Ok, S::Error>
-where
-    S: Serializer,
-{
-    match value {
-        Some(v) => {
-            let rounded = (v * 100.0).round() / 100.0;
-            let formatted = format!("{:.2}", rounded);
-            let clean_value: f64 = formatted.parse().unwrap_or(rounded as f64);
-            serializer.serialize_some(&clean_value)
-        }
-        None => serializer.serialize_none(),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use serde::{Deserialize, Serialize};
-
-    #[derive(Serialize, Deserialize)]
-    struct TestOptional {
-        #[serde(serialize_with = "serialize_optional_f32_with_two_decimal_places")]
-        value: Option<f32>,
-    }
-
-    #[derive(Serialize, Deserialize)]
-    struct TestNonOptional {
-        #[serde(serialize_with = "serialize_f32_with_two_decimal_places")]
-        value: f32,
-    }
-
-    #[test]
-    fn test_serialize_optional_f32_with_two_decimal_places() {
-        let cases = [
-            (Some(123.456789), r#"{"value":123.46}"#),
-            (Some(1.2), r#"{"value":1.2}"#),
-            (Some(300.00000), r#"{"value":300.0}"#),
-        ];
-        for (value, expected) in cases {
-            let value = TestOptional { value };
-            assert_eq!(serde_json::to_string(&value).unwrap(), expected);
-        }
-    }
-
-    #[test]
-    fn test_serialize_f32_with_two_decimal_places() {
-        let cases = [
-            (123.456789, r#"{"value":123.46}"#),
-            (1.200, r#"{"value":1.2}"#),
-            (300.00000, r#"{"value":300.0}"#),
-        ];
-        for (value, expected) in cases {
-            let value = TestNonOptional { value };
-            assert_eq!(serde_json::to_string(&value).unwrap(), expected);
-        }
-    }
-}
diff --git a/crates/settings/src/settings.rs b/crates/settings/src/settings.rs
deleted file mode 100644
index 5f07ebe52f..0000000000
--- a/crates/settings/src/settings.rs
+++ /dev/null
@@ -1,144 +0,0 @@
-mod base_keymap_setting;
-mod editable_setting_control;
-mod fallible_options;
-mod keymap_file;
-pub mod merge_from;
-mod serde_helper;
-mod settings_content;
-mod settings_file;
-mod settings_store;
-mod vscode_import;
-
-pub use settings_content::*;
-pub use settings_macros::RegisterSetting;
-
-#[doc(hidden)]
-pub mod private {
-    pub use crate::settings_store::{RegisteredSetting, SettingValue};
-    pub use inventory;
-}
-
-use gpui::{App, Global};
-use rust_embed::RustEmbed;
-use std::{borrow::Cow, fmt, str};
-use util::asset_str;
-
-pub use base_keymap_setting::*;
-pub use editable_setting_control::*;
-pub use keymap_file::{
-    KeyBindingValidator, KeyBindingValidatorRegistration, KeybindSource, KeybindUpdateOperation,
-    KeybindUpdateTarget, KeymapFile, KeymapFileLoadResult,
-};
-pub use serde_helper::*;
-pub use settings_file::*;
-pub use settings_json::*;
-pub use settings_store::{
-    InvalidSettingsError, LocalSettingsKind, MigrationStatus, ParseStatus, Settings, SettingsFile,
-    SettingsJsonSchemaParams, SettingsKey, SettingsLocation, SettingsParseResult, SettingsStore,
-};
-
-pub use vscode_import::{VsCodeSettings, VsCodeSettingsSource};
-
-pub use keymap_file::ActionSequence;
-
-#[derive(Clone, Debug, PartialEq)]
-pub struct ActiveSettingsProfileName(pub String);
-
-impl Global for ActiveSettingsProfileName {}
-
-#[derive(Copy, Clone, PartialEq, Eq, Debug, Hash, PartialOrd, Ord, serde::Serialize)]
-pub struct WorktreeId(usize);
-
-impl From<WorktreeId> for usize {
-    fn from(value: WorktreeId) -> Self {
-        value.0
-    }
-}
-
-impl WorktreeId {
-    pub fn from_usize(handle_id: usize) -> Self {
-        Self(handle_id)
-    }
-
-    pub fn from_proto(id: u64) -> Self {
-        Self(id as usize)
-    }
-
-    pub fn to_proto(self) -> u64 {
-        self.0 as u64
-    }
-
-    pub fn to_usize(self) -> usize {
-        self.0
-    }
-}
-
-impl fmt::Display for WorktreeId {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        std::fmt::Display::fmt(&self.0, f)
-    }
-}
-
-#[derive(RustEmbed)]
-#[folder = "../../assets"]
-#[include = "settings/*"]
-#[include = "keymaps/*"]
-#[exclude = "*.DS_Store"]
-pub struct SettingsAssets;
-
-pub fn init(cx: &mut App) {
-    let settings = SettingsStore::new(cx, &default_settings());
-    cx.set_global(settings);
-    SettingsStore::observe_active_settings_profile_name(cx).detach();
-}
-
-pub fn default_settings() -> Cow<'static, str> {
-    asset_str::<SettingsAssets>("settings/default.json")
-}
-
-#[cfg(target_os = "macos")]
-pub const DEFAULT_KEYMAP_PATH: &str = "keymaps/default-macos.json";
-
-#[cfg(target_os = "windows")]
-pub const DEFAULT_KEYMAP_PATH: &str = "keymaps/default-windows.json";
-
-#[cfg(not(any(target_os = "macos", target_os = "windows")))]
-pub const DEFAULT_KEYMAP_PATH: &str = "keymaps/default-linux.json";
-
-pub fn default_keymap() -> Cow<'static, str> {
-    asset_str::<SettingsAssets>(DEFAULT_KEYMAP_PATH)
-}
-
-pub const VIM_KEYMAP_PATH: &str = "keymaps/vim.json";
-
-pub fn vim_keymap() -> Cow<'static, str> {
-    asset_str::<SettingsAssets>(VIM_KEYMAP_PATH)
-}
-
-pub fn initial_user_settings_content() -> Cow<'static, str> {
-    asset_str::<SettingsAssets>("settings/initial_user_settings.json")
-}
-
-pub fn initial_server_settings_content() -> Cow<'static, str> {
-    asset_str::<SettingsAssets>("settings/initial_server_settings.json")
-}
-
-pub fn initial_project_settings_content() -> Cow<'static, str> {
-    asset_str::<SettingsAssets>("settings/initial_local_settings.json")
-}
-
-pub fn initial_keymap_content() -> Cow<'static, str> {
-    asset_str::<SettingsAssets>("keymaps/initial.json")
-}
-
-pub fn initial_tasks_content() -> Cow<'static, str> {
-    asset_str::<SettingsAssets>("settings/initial_tasks.json")
-}
-
-pub fn initial_debug_tasks_content() -> Cow<'static, str> {
-    asset_str::<SettingsAssets>("settings/initial_debug_tasks.json")
-}
-
-pub fn initial_local_debug_tasks_content() -> Cow<'static, str> {
-    asset_str::<SettingsAssets>("settings/initial_local_debug_tasks.json")
-}
diff --git a/crates/settings/src/settings_content.rs b/crates/settings/src/settings_content.rs
deleted file mode 100644
index 743e22b04d..0000000000
--- a/crates/settings/src/settings_content.rs
+++ /dev/null
@@ -1,1053 +0,0 @@
-mod agent;
-mod editor;
-mod extension;
-mod language;
-mod language_model;
-mod project;
-mod terminal;
-mod theme;
-mod workspace;
-
-pub use agent::*;
-pub use editor::*;
-pub use extension::*;
-pub use language::*;
-pub use language_model::*;
-pub use project::*;
-pub use terminal::*;
-pub use theme::*;
-pub use workspace::*;
-
-use collections::{HashMap, IndexMap};
-use gpui::{App, SharedString};
-use release_channel::ReleaseChannel;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use settings_macros::{MergeFrom, with_fallible_options};
-use std::collections::BTreeSet;
-use std::env;
-use std::sync::Arc;
-pub use util::serde::default_true;
-
-use crate::{ActiveSettingsProfileName, merge_from};
-
-#[with_fallible_options]
-#[derive(Debug, PartialEq, Default, Clone, Serialize, Deserialize, JsonSchema, MergeFrom)]
-pub struct SettingsContent {
-    #[serde(flatten)]
-    pub project: ProjectSettingsContent,
-
-    #[serde(flatten)]
-    pub theme: Box<ThemeSettingsContent>,
-
-    #[serde(flatten)]
-    pub extension: ExtensionSettingsContent,
-
-    #[serde(flatten)]
-    pub workspace: WorkspaceSettingsContent,
-
-    #[serde(flatten)]
-    pub editor: EditorSettingsContent,
-
-    #[serde(flatten)]
-    pub remote: RemoteSettingsContent,
-
-    /// Settings related to the file finder.
-    pub file_finder: Option<FileFinderSettingsContent>,
-
-    pub git_panel: Option<GitPanelSettingsContent>,
-
-    pub tabs: Option<ItemSettingsContent>,
-    pub tab_bar: Option<TabBarSettingsContent>,
-    pub status_bar: Option<StatusBarSettingsContent>,
-
-    pub preview_tabs: Option<PreviewTabsSettingsContent>,
-
-    pub agent: Option<AgentSettingsContent>,
-    pub agent_servers: Option<AllAgentServersSettings>,
-
-    /// Configuration of audio in Zed.
-    pub audio: Option<AudioSettingsContent>,
-
-    /// Whether or not to automatically check for updates.
-    ///
-    /// Default: true
-    pub auto_update: Option<bool>,
-
-    /// This base keymap settings adjusts the default keybindings in Zed to be similar
-    /// to other common code editors. By default, Zed's keymap closely follows VSCode's
-    /// keymap, with minor adjustments, this corresponds to the "VSCode" setting.
-    ///
-    /// Default: VSCode
-    pub base_keymap: Option<BaseKeymapContent>,
-
-    /// Configuration for the collab panel visual settings.
-    pub collaboration_panel: Option<PanelSettingsContent>,
-
-    pub debugger: Option<DebuggerSettingsContent>,
-
-    /// Configuration for Diagnostics-related features.
-    pub diagnostics: Option<DiagnosticsSettingsContent>,
-
-    /// Configuration for Git-related features
-    pub git: Option<GitSettings>,
-
-    /// Common language server settings.
-    pub global_lsp_settings: Option<GlobalLspSettingsContent>,
-
-    /// The settings for the image viewer.
-    pub image_viewer: Option<ImageViewerSettingsContent>,
-
-    pub repl: Option<ReplSettingsContent>,
-
-    /// Whether or not to enable Helix mode.
-    ///
-    /// Default: false
-    pub helix_mode: Option<bool>,
-
-    pub journal: Option<JournalSettingsContent>,
-
-    /// A map of log scopes to the desired log level.
-    /// Useful for filtering out noisy logs or enabling more verbose logging.
-    ///
-    /// Example: {"log": {"client": "warn"}}
-    pub log: Option<HashMap<String, String>>,
-
-    pub line_indicator_format: Option<LineIndicatorFormat>,
-
-    pub language_models: Option<AllLanguageModelSettingsContent>,
-
-    pub outline_panel: Option<OutlinePanelSettingsContent>,
-
-    pub project_panel: Option<ProjectPanelSettingsContent>,
-
-    /// Configuration for the Message Editor
-    pub message_editor: Option<MessageEditorSettings>,
-
-    /// Configuration for Node-related features
-    pub node: Option<NodeBinarySettings>,
-
-    /// Configuration for the Notification Panel
-    pub notification_panel: Option<NotificationPanelSettingsContent>,
-
-    pub proxy: Option<String>,
-
-    /// The URL of the Zed server to connect to.
-    pub server_url: Option<String>,
-
-    /// Configuration for session-related features
-    pub session: Option<SessionSettingsContent>,
-    /// Control what info is collected by Zed.
-    pub telemetry: Option<TelemetrySettingsContent>,
-
-    /// Configuration of the terminal in Zed.
-    pub terminal: Option<TerminalSettingsContent>,
-
-    pub title_bar: Option<TitleBarSettingsContent>,
-
-    /// Whether or not to enable Vim mode.
-    ///
-    /// Default: false
-    pub vim_mode: Option<bool>,
-
-    // Settings related to calls in Zed
-    pub calls: Option<CallSettingsContent>,
-
-    /// Whether to disable all AI features in Zed.
-    ///
-    /// Default: false
-    pub disable_ai: Option<SaturatingBool>,
-
-    /// Settings related to Vim mode in Zed.
-    pub vim: Option<VimSettingsContent>,
-}
-
-impl SettingsContent {
-    pub fn languages_mut(&mut self) -> &mut HashMap<SharedString, LanguageSettingsContent> {
-        &mut self.project.all_languages.languages.0
-    }
-}
-
-#[with_fallible_options]
-#[derive(Debug, Default, PartialEq, Clone, Serialize, Deserialize, JsonSchema, MergeFrom)]
-pub struct UserSettingsContent {
-    #[serde(flatten)]
-    pub content: Box<SettingsContent>,
-
-    pub dev: Option<Box<SettingsContent>>,
-    pub nightly: Option<Box<SettingsContent>>,
-    pub preview: Option<Box<SettingsContent>>,
-    pub stable: Option<Box<SettingsContent>>,
-
-    pub macos: Option<Box<SettingsContent>>,
-    pub windows: Option<Box<SettingsContent>>,
-    pub linux: Option<Box<SettingsContent>>,
-
-    #[serde(default)]
-    pub profiles: IndexMap<String, SettingsContent>,
-}
-
-pub struct ExtensionsSettingsContent {
-    pub all_languages: AllLanguageSettingsContent,
-}
-
-impl UserSettingsContent {
-    pub fn for_release_channel(&self) -> Option<&SettingsContent> {
-        match *release_channel::RELEASE_CHANNEL {
-            ReleaseChannel::Dev => self.dev.as_deref(),
-            ReleaseChannel::Nightly => self.nightly.as_deref(),
-            ReleaseChannel::Preview => self.preview.as_deref(),
-            ReleaseChannel::Stable => self.stable.as_deref(),
-        }
-    }
-
-    pub fn for_os(&self) -> Option<&SettingsContent> {
-        match env::consts::OS {
-            "macos" => self.macos.as_deref(),
-            "linux" => self.linux.as_deref(),
-            "windows" => self.windows.as_deref(),
-            _ => None,
-        }
-    }
-
-    pub fn for_profile(&self, cx: &App) -> Option<&SettingsContent> {
-        let Some(active_profile) = cx.try_global::<ActiveSettingsProfileName>() else {
-            return None;
-        };
-        self.profiles.get(&active_profile.0)
-    }
-}
-
-/// Base key bindings scheme. Base keymaps can be overridden with user keymaps.
-///
-/// Default: VSCode
-#[derive(
-    Copy,
-    Clone,
-    Debug,
-    Serialize,
-    Deserialize,
-    JsonSchema,
-    MergeFrom,
-    PartialEq,
-    Eq,
-    Default,
-    strum::VariantArray,
-)]
-pub enum BaseKeymapContent {
-    #[default]
-    VSCode,
-    JetBrains,
-    SublimeText,
-    Atom,
-    TextMate,
-    Emacs,
-    Cursor,
-    None,
-}
-
-impl strum::VariantNames for BaseKeymapContent {
-    const VARIANTS: &'static [&'static str] = &[
-        "VSCode",
-        "JetBrains",
-        "Sublime Text",
-        "Atom",
-        "TextMate",
-        "Emacs",
-        "Cursor",
-        "None",
-    ];
-}
-
-#[with_fallible_options]
-#[derive(Clone, PartialEq, Default, Serialize, Deserialize, JsonSchema, MergeFrom, Debug)]
-pub struct TitleBarSettingsContent {
-    /// Whether to show the branch icon beside branch switcher in the title bar.
-    ///
-    /// Default: false
-    pub show_branch_icon: Option<bool>,
-    /// Whether to show onboarding banners in the title bar.
-    ///
-    /// Default: true
-    pub show_onboarding_banner: Option<bool>,
-    /// Whether to show user avatar in the title bar.
-    ///
-    /// Default: true
-    pub show_user_picture: Option<bool>,
-    /// Whether to show the branch name button in the titlebar.
-    ///
-    /// Default: true
-    pub show_branch_name: Option<bool>,
-    /// Whether to show the project host and name in the titlebar.
-    ///
-    /// Default: true
-    pub show_project_items: Option<bool>,
-    /// Whether to show the sign in button in the title bar.
-    ///
-    /// Default: true
-    pub show_sign_in: Option<bool>,
-    /// Whether to show the menus in the title bar.
-    ///
-    /// Default: false
-    pub show_menus: Option<bool>,
-}
-
-/// Configuration of audio in Zed.
-#[with_fallible_options]
-#[derive(Clone, PartialEq, Default, Serialize, Deserialize, JsonSchema, MergeFrom, Debug)]
-pub struct AudioSettingsContent {
-    /// Opt into the new audio system.
-    ///
-    /// You need to rejoin a call for this setting to apply
-    #[serde(rename = "experimental.rodio_audio")]
-    pub rodio_audio: Option<bool>, // default is false
-    /// Requires 'rodio_audio: true'
-    ///
-    /// Automatically increase or decrease you microphone's volume. This affects how
-    /// loud you sound to others.
-    ///
-    /// Recommended: off (default)
-    /// Microphones are too quite in zed, until everyone is on experimental
-    /// audio and has auto speaker volume on this will make you very loud
-    /// compared to other speakers.
-    #[serde(rename = "experimental.auto_microphone_volume")]
-    pub auto_microphone_volume: Option<bool>,
-    /// Requires 'rodio_audio: true'
-    ///
-    /// Automatically increate or decrease the volume of other call members.
-    /// This only affects how things sound for you.
-    #[serde(rename = "experimental.auto_speaker_volume")]
-    pub auto_speaker_volume: Option<bool>,
-    /// Requires 'rodio_audio: true'
-    ///
-    /// Remove background noises. Works great for typing, cars, dogs, AC. Does
-    /// not work well on music.
-    #[serde(rename = "experimental.denoise")]
-    pub denoise: Option<bool>,
-    /// Requires 'rodio_audio: true'
-    ///
-    /// Use audio parameters compatible with the previous versions of
-    /// experimental audio and non-experimental audio. When this is false you
-    /// will sound strange to anyone not on the latest experimental audio. In
-    /// the future we will migrate by setting this to false
-    ///
-    /// You need to rejoin a call for this setting to apply
-    #[serde(rename = "experimental.legacy_audio_compatible")]
-    pub legacy_audio_compatible: Option<bool>,
-}
-
-/// Control what info is collected by Zed.
-#[with_fallible_options]
-#[derive(Clone, PartialEq, Eq, Serialize, Deserialize, JsonSchema, Debug, MergeFrom)]
-pub struct TelemetrySettingsContent {
-    /// Send debug info like crash reports.
-    ///
-    /// Default: true
-    pub diagnostics: Option<bool>,
-    /// Send anonymized usage data like what languages you're using Zed with.
-    ///
-    /// Default: true
-    pub metrics: Option<bool>,
-}
-
-impl Default for TelemetrySettingsContent {
-    fn default() -> Self {
-        Self {
-            diagnostics: Some(true),
-            metrics: Some(true),
-        }
-    }
-}
-
-#[with_fallible_options]
-#[derive(Default, Debug, PartialEq, Eq, Serialize, Deserialize, JsonSchema, Clone, MergeFrom)]
-pub struct DebuggerSettingsContent {
-    /// Determines the stepping granularity.
-    ///
-    /// Default: line
-    pub stepping_granularity: Option<SteppingGranularity>,
-    /// Whether the breakpoints should be reused across Zed sessions.
-    ///
-    /// Default: true
-    pub save_breakpoints: Option<bool>,
-    /// Whether to show the debug button in the status bar.
-    ///
-    /// Default: true
-    pub button: Option<bool>,
-    /// Time in milliseconds until timeout error when connecting to a TCP debug adapter
-    ///
-    /// Default: 2000ms
-    pub timeout: Option<u64>,
-    /// Whether to log messages between active debug adapters and Zed
-    ///
-    /// Default: true
-    pub log_dap_communications: Option<bool>,
-    /// Whether to format dap messages in when adding them to debug adapter logger
-    ///
-    /// Default: true
-    pub format_dap_log_messages: Option<bool>,
-    /// The dock position of the debug panel
-    ///
-    /// Default: Bottom
-    pub dock: Option<DockPosition>,
-}
-
-/// The granularity of one 'step' in the stepping requests `next`, `stepIn`, `stepOut`, and `stepBack`.
-#[derive(
-    PartialEq,
-    Eq,
-    Debug,
-    Hash,
-    Clone,
-    Copy,
-    Deserialize,
-    Serialize,
-    JsonSchema,
-    MergeFrom,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum SteppingGranularity {
-    /// The step should allow the program to run until the current statement has finished executing.
-    /// The meaning of a statement is determined by the adapter and it may be considered equivalent to a line.
-    /// For example 'for(int i = 0; i < 10; i++)' could be considered to have 3 statements 'int i = 0', 'i < 10', and 'i++'.
-    Statement,
-    /// The step should allow the program to run until the current source line has executed.
-    Line,
-    /// The step should allow one instruction to execute (e.g. one x86 instruction).
-    Instruction,
-}
-
-#[derive(
-    Copy,
-    Clone,
-    Debug,
-    Serialize,
-    Deserialize,
-    JsonSchema,
-    MergeFrom,
-    PartialEq,
-    Eq,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum DockPosition {
-    Left,
-    Bottom,
-    Right,
-}
-
-/// Settings for slash commands.
-#[with_fallible_options]
-#[derive(Deserialize, Serialize, Debug, Default, Clone, JsonSchema, MergeFrom, PartialEq, Eq)]
-pub struct SlashCommandSettings {
-    /// Settings for the `/cargo-workspace` slash command.
-    pub cargo_workspace: Option<CargoWorkspaceCommandSettings>,
-}
-
-/// Settings for the `/cargo-workspace` slash command.
-#[with_fallible_options]
-#[derive(Deserialize, Serialize, Debug, Default, Clone, JsonSchema, MergeFrom, PartialEq, Eq)]
-pub struct CargoWorkspaceCommandSettings {
-    /// Whether `/cargo-workspace` is enabled.
-    pub enabled: Option<bool>,
-}
-
-/// Configuration of voice calls in Zed.
-#[with_fallible_options]
-#[derive(Clone, PartialEq, Default, Serialize, Deserialize, JsonSchema, MergeFrom, Debug)]
-pub struct CallSettingsContent {
-    /// Whether the microphone should be muted when joining a channel or a call.
-    ///
-    /// Default: false
-    pub mute_on_join: Option<bool>,
-
-    /// Whether your current project should be shared when joining an empty channel.
-    ///
-    /// Default: false
-    pub share_on_join: Option<bool>,
-}
-
-#[with_fallible_options]
-#[derive(Clone, PartialEq, Default, Serialize, Deserialize, JsonSchema, MergeFrom, Debug)]
-pub struct GitPanelSettingsContent {
-    /// Whether to show the panel button in the status bar.
-    ///
-    /// Default: true
-    pub button: Option<bool>,
-    /// Where to dock the panel.
-    ///
-    /// Default: left
-    pub dock: Option<DockPosition>,
-    /// Default width of the panel in pixels.
-    ///
-    /// Default: 360
-    #[serde(serialize_with = "crate::serialize_optional_f32_with_two_decimal_places")]
-    pub default_width: Option<f32>,
-    /// How entry statuses are displayed.
-    ///
-    /// Default: icon
-    pub status_style: Option<StatusStyle>,
-    /// How and when the scrollbar should be displayed.
-    ///
-    /// Default: inherits editor scrollbar settings
-    pub scrollbar: Option<ScrollbarSettings>,
-
-    /// What the default branch name should be when
-    /// `init.defaultBranch` is not set in git
-    ///
-    /// Default: main
-    pub fallback_branch_name: Option<String>,
-
-    /// Whether to sort entries in the panel by path
-    /// or by status (the default).
-    ///
-    /// Default: false
-    pub sort_by_path: Option<bool>,
-
-    /// Whether to collapse untracked files in the diff panel.
-    ///
-    /// Default: false
-    pub collapse_untracked_diff: Option<bool>,
-
-    /// Whether to show entries with tree or flat view in the panel
-    ///
-    /// Default: false
-    pub tree_view: Option<bool>,
-}
-
-#[derive(
-    Default,
-    Copy,
-    Clone,
-    Debug,
-    Serialize,
-    Deserialize,
-    JsonSchema,
-    MergeFrom,
-    PartialEq,
-    Eq,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum StatusStyle {
-    #[default]
-    Icon,
-    LabelColor,
-}
-
-#[with_fallible_options]
-#[derive(
-    Copy, Clone, Default, Debug, Serialize, Deserialize, JsonSchema, MergeFrom, PartialEq, Eq,
-)]
-pub struct ScrollbarSettings {
-    pub show: Option<ShowScrollbar>,
-}
-
-#[with_fallible_options]
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, MergeFrom, Debug, PartialEq)]
-pub struct NotificationPanelSettingsContent {
-    /// Whether to show the panel button in the status bar.
-    ///
-    /// Default: true
-    pub button: Option<bool>,
-    /// Where to dock the panel.
-    ///
-    /// Default: right
-    pub dock: Option<DockPosition>,
-    /// Default width of the panel in pixels.
-    ///
-    /// Default: 300
-    #[serde(serialize_with = "crate::serialize_optional_f32_with_two_decimal_places")]
-    pub default_width: Option<f32>,
-}
-
-#[with_fallible_options]
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, MergeFrom, Debug, PartialEq)]
-pub struct PanelSettingsContent {
-    /// Whether to show the panel button in the status bar.
-    ///
-    /// Default: true
-    pub button: Option<bool>,
-    /// Where to dock the panel.
-    ///
-    /// Default: left
-    pub dock: Option<DockPosition>,
-    /// Default width of the panel in pixels.
-    ///
-    /// Default: 240
-    #[serde(serialize_with = "crate::serialize_optional_f32_with_two_decimal_places")]
-    pub default_width: Option<f32>,
-}
-
-#[with_fallible_options]
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, MergeFrom, Debug, PartialEq)]
-pub struct MessageEditorSettings {
-    /// Whether to automatically replace emoji shortcodes with emoji characters.
-    /// For example: typing `:wave:` gets replaced with `👋`.
-    ///
-    /// Default: false
-    pub auto_replace_emoji_shortcode: Option<bool>,
-}
-
-#[with_fallible_options]
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, MergeFrom, Debug, PartialEq)]
-pub struct FileFinderSettingsContent {
-    /// Whether to show file icons in the file finder.
-    ///
-    /// Default: true
-    pub file_icons: Option<bool>,
-    /// Determines how much space the file finder can take up in relation to the available window width.
-    ///
-    /// Default: small
-    pub modal_max_width: Option<FileFinderWidthContent>,
-    /// Determines whether the file finder should skip focus for the active file in search results.
-    ///
-    /// Default: true
-    pub skip_focus_for_active_in_search: Option<bool>,
-    /// Determines whether to show the git status in the file finder
-    ///
-    /// Default: true
-    pub git_status: Option<bool>,
-    /// Whether to use gitignored files when searching.
-    /// Only the file Zed had indexed will be used, not necessary all the gitignored files.
-    ///
-    /// Default: Smart
-    pub include_ignored: Option<IncludeIgnoredContent>,
-}
-
-#[derive(
-    Debug,
-    PartialEq,
-    Eq,
-    Clone,
-    Copy,
-    Default,
-    Serialize,
-    Deserialize,
-    JsonSchema,
-    MergeFrom,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum IncludeIgnoredContent {
-    /// Use all gitignored files
-    All,
-    /// Use only the files Zed had indexed
-    Indexed,
-    /// Be smart and search for ignored when called from a gitignored worktree
-    #[default]
-    Smart,
-}
-
-#[derive(
-    Debug,
-    PartialEq,
-    Eq,
-    Clone,
-    Copy,
-    Default,
-    Serialize,
-    Deserialize,
-    JsonSchema,
-    MergeFrom,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "lowercase")]
-pub enum FileFinderWidthContent {
-    #[default]
-    Small,
-    Medium,
-    Large,
-    XLarge,
-    Full,
-}
-
-#[with_fallible_options]
-#[derive(Clone, Default, Serialize, Deserialize, PartialEq, Debug, JsonSchema, MergeFrom)]
-pub struct VimSettingsContent {
-    pub default_mode: Option<ModeContent>,
-    pub toggle_relative_line_numbers: Option<bool>,
-    pub use_system_clipboard: Option<UseSystemClipboard>,
-    pub use_smartcase_find: Option<bool>,
-    pub custom_digraphs: Option<HashMap<String, Arc<str>>>,
-    pub highlight_on_yank_duration: Option<u64>,
-    pub cursor_shape: Option<CursorShapeSettings>,
-}
-
-#[derive(Copy, Clone, Default, Serialize, Deserialize, JsonSchema, MergeFrom, PartialEq, Debug)]
-#[serde(rename_all = "snake_case")]
-pub enum ModeContent {
-    #[default]
-    Normal,
-    Insert,
-}
-
-/// Controls when to use system clipboard.
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, Eq, JsonSchema, MergeFrom)]
-#[serde(rename_all = "snake_case")]
-pub enum UseSystemClipboard {
-    /// Don't use system clipboard.
-    Never,
-    /// Use system clipboard.
-    Always,
-    /// Use system clipboard for yank operations.
-    OnYank,
-}
-
-/// The settings for cursor shape.
-#[with_fallible_options]
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, Eq, JsonSchema, MergeFrom)]
-pub struct CursorShapeSettings {
-    /// Cursor shape for the normal mode.
-    ///
-    /// Default: block
-    pub normal: Option<CursorShape>,
-    /// Cursor shape for the replace mode.
-    ///
-    /// Default: underline
-    pub replace: Option<CursorShape>,
-    /// Cursor shape for the visual mode.
-    ///
-    /// Default: block
-    pub visual: Option<CursorShape>,
-    /// Cursor shape for the insert mode.
-    ///
-    /// The default value follows the primary cursor_shape.
-    pub insert: Option<CursorShape>,
-}
-
-/// Settings specific to journaling
-#[with_fallible_options]
-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, MergeFrom, PartialEq)]
-pub struct JournalSettingsContent {
-    /// The path of the directory where journal entries are stored.
-    ///
-    /// Default: `~`
-    pub path: Option<String>,
-    /// What format to display the hours in.
-    ///
-    /// Default: hour12
-    pub hour_format: Option<HourFormat>,
-}
-
-#[derive(Clone, Debug, Default, Serialize, Deserialize, JsonSchema, MergeFrom, PartialEq)]
-#[serde(rename_all = "snake_case")]
-pub enum HourFormat {
-    #[default]
-    Hour12,
-    Hour24,
-}
-
-#[with_fallible_options]
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, MergeFrom, Debug, PartialEq)]
-pub struct OutlinePanelSettingsContent {
-    /// Whether to show the outline panel button in the status bar.
-    ///
-    /// Default: true
-    pub button: Option<bool>,
-    /// Customize default width (in pixels) taken by outline panel
-    ///
-    /// Default: 240
-    #[serde(serialize_with = "crate::serialize_optional_f32_with_two_decimal_places")]
-    pub default_width: Option<f32>,
-    /// The position of outline panel
-    ///
-    /// Default: left
-    pub dock: Option<DockSide>,
-    /// Whether to show file icons in the outline panel.
-    ///
-    /// Default: true
-    pub file_icons: Option<bool>,
-    /// Whether to show folder icons or chevrons for directories in the outline panel.
-    ///
-    /// Default: true
-    pub folder_icons: Option<bool>,
-    /// Whether to show the git status in the outline panel.
-    ///
-    /// Default: true
-    pub git_status: Option<bool>,
-    /// Amount of indentation (in pixels) for nested items.
-    ///
-    /// Default: 20
-    #[serde(serialize_with = "crate::serialize_optional_f32_with_two_decimal_places")]
-    pub indent_size: Option<f32>,
-    /// Whether to reveal it in the outline panel automatically,
-    /// when a corresponding project entry becomes active.
-    /// Gitignored entries are never auto revealed.
-    ///
-    /// Default: true
-    pub auto_reveal_entries: Option<bool>,
-    /// Whether to fold directories automatically
-    /// when directory has only one directory inside.
-    ///
-    /// Default: true
-    pub auto_fold_dirs: Option<bool>,
-    /// Settings related to indent guides in the outline panel.
-    pub indent_guides: Option<IndentGuidesSettingsContent>,
-    /// Scrollbar-related settings
-    pub scrollbar: Option<ScrollbarSettingsContent>,
-    /// Default depth to expand outline items in the current file.
-    /// The default depth to which outline entries are expanded on reveal.
-    /// - Set to 0 to collapse all items that have children
-    /// - Set to 1 or higher to collapse items at that depth or deeper
-    ///
-    /// Default: 100
-    pub expand_outlines_with_depth: Option<usize>,
-}
-
-#[derive(
-    Clone,
-    Copy,
-    Debug,
-    PartialEq,
-    Eq,
-    Serialize,
-    Deserialize,
-    JsonSchema,
-    MergeFrom,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum DockSide {
-    Left,
-    Right,
-}
-
-#[derive(
-    Copy,
-    Clone,
-    Debug,
-    PartialEq,
-    Eq,
-    Deserialize,
-    Serialize,
-    JsonSchema,
-    MergeFrom,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum ShowIndentGuides {
-    Always,
-    Never,
-}
-
-#[with_fallible_options]
-#[derive(
-    Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, MergeFrom, PartialEq, Eq, Default,
-)]
-pub struct IndentGuidesSettingsContent {
-    /// When to show the scrollbar in the outline panel.
-    pub show: Option<ShowIndentGuides>,
-}
-
-#[derive(Clone, Copy, Default, PartialEq, Debug, JsonSchema, MergeFrom, Deserialize, Serialize)]
-#[serde(rename_all = "snake_case")]
-pub enum LineIndicatorFormat {
-    Short,
-    #[default]
-    Long,
-}
-
-/// The settings for the image viewer.
-#[with_fallible_options]
-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, MergeFrom, Default, PartialEq)]
-pub struct ImageViewerSettingsContent {
-    /// The unit to use for displaying image file sizes.
-    ///
-    /// Default: "binary"
-    pub unit: Option<ImageFileSizeUnit>,
-}
-
-#[with_fallible_options]
-#[derive(
-    Clone,
-    Copy,
-    Debug,
-    Serialize,
-    Deserialize,
-    JsonSchema,
-    MergeFrom,
-    Default,
-    PartialEq,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum ImageFileSizeUnit {
-    /// Displays file size in binary units (e.g., KiB, MiB).
-    #[default]
-    Binary,
-    /// Displays file size in decimal units (e.g., KB, MB).
-    Decimal,
-}
-
-#[with_fallible_options]
-#[derive(Clone, Debug, Default, Serialize, Deserialize, JsonSchema, MergeFrom, PartialEq)]
-pub struct RemoteSettingsContent {
-    pub ssh_connections: Option<Vec<SshConnection>>,
-    pub wsl_connections: Option<Vec<WslConnection>>,
-    pub dev_container_connections: Option<Vec<DevContainerConnection>>,
-    pub read_ssh_config: Option<bool>,
-}
-
-#[with_fallible_options]
-#[derive(
-    Clone, Debug, Default, Serialize, Deserialize, PartialEq, Eq, JsonSchema, MergeFrom, Hash,
-)]
-pub struct DevContainerConnection {
-    pub name: SharedString,
-    pub container_id: SharedString,
-}
-
-#[with_fallible_options]
-#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq, JsonSchema, MergeFrom)]
-pub struct SshConnection {
-    pub host: SharedString,
-    pub username: Option<String>,
-    pub port: Option<u16>,
-    #[serde(default)]
-    pub args: Vec<String>,
-    #[serde(default)]
-    pub projects: collections::BTreeSet<RemoteProject>,
-    /// Name to use for this server in UI.
-    pub nickname: Option<String>,
-    // By default Zed will download the binary to the host directly.
-    // If this is set to true, Zed will download the binary to your local machine,
-    // and then upload it over the SSH connection. Useful if your SSH server has
-    // limited outbound internet access.
-    pub upload_binary_over_ssh: Option<bool>,
-
-    pub port_forwards: Option<Vec<SshPortForwardOption>>,
-}
-
-#[derive(Clone, Default, Serialize, Deserialize, PartialEq, JsonSchema, MergeFrom, Debug)]
-pub struct WslConnection {
-    pub distro_name: SharedString,
-    pub user: Option<String>,
-    #[serde(default)]
-    pub projects: BTreeSet<RemoteProject>,
-}
-
-#[with_fallible_options]
-#[derive(
-    Clone, Debug, Default, Serialize, PartialEq, Eq, PartialOrd, Ord, Deserialize, JsonSchema,
-)]
-pub struct RemoteProject {
-    pub paths: Vec<String>,
-}
-
-#[with_fallible_options]
-#[derive(Debug, Clone, PartialEq, Eq, Hash, Deserialize, Serialize, JsonSchema, MergeFrom)]
-pub struct SshPortForwardOption {
-    pub local_host: Option<String>,
-    pub local_port: u16,
-    pub remote_host: Option<String>,
-    pub remote_port: u16,
-}
-
-/// Settings for configuring REPL display and behavior.
-#[with_fallible_options]
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, JsonSchema, MergeFrom)]
-pub struct ReplSettingsContent {
-    /// Maximum number of lines to keep in REPL's scrollback buffer.
-    /// Clamped with [4, 256] range.
-    ///
-    /// Default: 32
-    pub max_lines: Option<usize>,
-    /// Maximum number of columns to keep in REPL's scrollback buffer.
-    /// Clamped with [20, 512] range.
-    ///
-    /// Default: 128
-    pub max_columns: Option<usize>,
-}
-
-#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize, JsonSchema)]
-/// An ExtendingVec in the settings can only accumulate new values.
-///
-/// This is useful for things like private files where you only want
-/// to allow new values to be added.
-///
-/// Consider using a HashMap<String, bool> instead of this type
-/// (like auto_install_extensions) so that user settings files can both add
-/// and remove values from the set.
-pub struct ExtendingVec<T>(pub Vec<T>);
-
-impl<T> Into<Vec<T>> for ExtendingVec<T> {
-    fn into(self) -> Vec<T> {
-        self.0
-    }
-}
-impl<T> From<Vec<T>> for ExtendingVec<T> {
-    fn from(vec: Vec<T>) -> Self {
-        ExtendingVec(vec)
-    }
-}
-
-impl<T: Clone> merge_from::MergeFrom for ExtendingVec<T> {
-    fn merge_from(&mut self, other: &Self) {
-        self.0.extend_from_slice(other.0.as_slice());
-    }
-}
-
-/// A SaturatingBool in the settings can only ever be set to true,
-/// later attempts to set it to false will be ignored.
-///
-/// Used by `disable_ai`.
-#[derive(Debug, Default, Copy, Clone, PartialEq, Serialize, Deserialize, JsonSchema)]
-pub struct SaturatingBool(pub bool);
-
-impl From<bool> for SaturatingBool {
-    fn from(value: bool) -> Self {
-        SaturatingBool(value)
-    }
-}
-
-impl From<SaturatingBool> for bool {
-    fn from(value: SaturatingBool) -> bool {
-        value.0
-    }
-}
-
-impl merge_from::MergeFrom for SaturatingBool {
-    fn merge_from(&mut self, other: &Self) {
-        self.0 |= other.0
-    }
-}
-
-#[derive(
-    Copy,
-    Clone,
-    Default,
-    Debug,
-    PartialEq,
-    Eq,
-    PartialOrd,
-    Ord,
-    Serialize,
-    Deserialize,
-    MergeFrom,
-    JsonSchema,
-    derive_more::FromStr,
-)]
-#[serde(transparent)]
-pub struct DelayMs(pub u64);
-
-impl From<u64> for DelayMs {
-    fn from(n: u64) -> Self {
-        Self(n)
-    }
-}
-
-impl std::fmt::Display for DelayMs {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}ms", self.0)
-    }
-}
diff --git a/crates/settings/src/settings_content/agent.rs b/crates/settings/src/settings_content/agent.rs
deleted file mode 100644
index 2ea9f0cd57..0000000000
--- a/crates/settings/src/settings_content/agent.rs
+++ /dev/null
@@ -1,379 +0,0 @@
-use collections::{HashMap, IndexMap};
-use gpui::SharedString;
-use schemars::{JsonSchema, json_schema};
-use serde::{Deserialize, Serialize};
-use settings_macros::{MergeFrom, with_fallible_options};
-use std::{borrow::Cow, path::PathBuf, sync::Arc};
-
-use crate::DockPosition;
-
-#[with_fallible_options]
-#[derive(Clone, PartialEq, Serialize, Deserialize, JsonSchema, MergeFrom, Debug, Default)]
-pub struct AgentSettingsContent {
-    /// Whether the Agent is enabled.
-    ///
-    /// Default: true
-    pub enabled: Option<bool>,
-    /// Whether to show the agent panel button in the status bar.
-    ///
-    /// Default: true
-    pub button: Option<bool>,
-    /// Where to dock the agent panel.
-    ///
-    /// Default: right
-    pub dock: Option<DockPosition>,
-    /// Default width in pixels when the agent panel is docked to the left or right.
-    ///
-    /// Default: 640
-    #[serde(serialize_with = "crate::serialize_optional_f32_with_two_decimal_places")]
-    pub default_width: Option<f32>,
-    /// Default height in pixels when the agent panel is docked to the bottom.
-    ///
-    /// Default: 320
-    #[serde(serialize_with = "crate::serialize_optional_f32_with_two_decimal_places")]
-    pub default_height: Option<f32>,
-    /// The default model to use when creating new chats and for other features when a specific model is not specified.
-    pub default_model: Option<LanguageModelSelection>,
-    /// Model to use for the inline assistant. Defaults to default_model when not specified.
-    pub inline_assistant_model: Option<LanguageModelSelection>,
-    /// Model to use for generating git commit messages. Defaults to default_model when not specified.
-    pub commit_message_model: Option<LanguageModelSelection>,
-    /// Model to use for generating thread summaries. Defaults to default_model when not specified.
-    pub thread_summary_model: Option<LanguageModelSelection>,
-    /// Additional models with which to generate alternatives when performing inline assists.
-    pub inline_alternatives: Option<Vec<LanguageModelSelection>>,
-    /// The default profile to use in the Agent.
-    ///
-    /// Default: write
-    pub default_profile: Option<Arc<str>>,
-    /// Which view type to show by default in the agent panel.
-    ///
-    /// Default: "thread"
-    pub default_view: Option<DefaultAgentView>,
-    /// The available agent profiles.
-    pub profiles: Option<IndexMap<Arc<str>, AgentProfileContent>>,
-    /// Whenever a tool action would normally wait for your confirmation
-    /// that you allow it, always choose to allow it.
-    ///
-    /// This setting has no effect on external agents that support permission modes, such as Claude Code.
-    ///
-    /// Set `agent_servers.claude.default_mode` to `bypassPermissions`, to disable all permission requests when using Claude Code.
-    ///
-    /// Default: false
-    pub always_allow_tool_actions: Option<bool>,
-    /// Where to show a popup notification when the agent is waiting for user input.
-    ///
-    /// Default: "primary_screen"
-    pub notify_when_agent_waiting: Option<NotifyWhenAgentWaiting>,
-    /// Whether to play a sound when the agent has either completed its response, or needs user input.
-    ///
-    /// Default: false
-    pub play_sound_when_agent_done: Option<bool>,
-    /// Whether to display agent edits in single-file editors in addition to the review multibuffer pane.
-    ///
-    /// Default: true
-    pub single_file_review: Option<bool>,
-    /// Additional parameters for language model requests. When making a request
-    /// to a model, parameters will be taken from the last entry in this list
-    /// that matches the model's provider and name. In each entry, both provider
-    /// and model are optional, so that you can specify parameters for either
-    /// one.
-    ///
-    /// Default: []
-    #[serde(default)]
-    pub model_parameters: Vec<LanguageModelParameters>,
-    /// What completion mode to enable for new threads
-    ///
-    /// Default: normal
-    pub preferred_completion_mode: Option<CompletionMode>,
-    /// Whether to show thumb buttons for feedback in the agent panel.
-    ///
-    /// Default: true
-    pub enable_feedback: Option<bool>,
-    /// Whether to have edit cards in the agent panel expanded, showing a preview of the full diff.
-    ///
-    /// Default: true
-    pub expand_edit_card: Option<bool>,
-    /// Whether to have terminal cards in the agent panel expanded, showing the whole command output.
-    ///
-    /// Default: true
-    pub expand_terminal_card: Option<bool>,
-    /// Whether to always use cmd-enter (or ctrl-enter on Linux or Windows) to send messages in the agent panel.
-    ///
-    /// Default: false
-    pub use_modifier_to_send: Option<bool>,
-    /// Minimum number of lines of height the agent message editor should have.
-    ///
-    /// Default: 4
-    pub message_editor_min_lines: Option<usize>,
-}
-
-impl AgentSettingsContent {
-    pub fn set_dock(&mut self, dock: DockPosition) {
-        self.dock = Some(dock);
-    }
-
-    pub fn set_model(&mut self, language_model: LanguageModelSelection) {
-        // let model = language_model.id().0.to_string();
-        // let provider = language_model.provider_id().0.to_string();
-        // self.default_model = Some(LanguageModelSelection {
-        //     provider: provider.into(),
-        //     model,
-        // });
-        self.default_model = Some(language_model)
-    }
-
-    pub fn set_inline_assistant_model(&mut self, provider: String, model: String) {
-        self.inline_assistant_model = Some(LanguageModelSelection {
-            provider: provider.into(),
-            model,
-        });
-    }
-
-    pub fn set_commit_message_model(&mut self, provider: String, model: String) {
-        self.commit_message_model = Some(LanguageModelSelection {
-            provider: provider.into(),
-            model,
-        });
-    }
-
-    pub fn set_thread_summary_model(&mut self, provider: String, model: String) {
-        self.thread_summary_model = Some(LanguageModelSelection {
-            provider: provider.into(),
-            model,
-        });
-    }
-
-    pub fn set_always_allow_tool_actions(&mut self, allow: bool) {
-        self.always_allow_tool_actions = Some(allow);
-    }
-
-    pub fn set_play_sound_when_agent_done(&mut self, allow: bool) {
-        self.play_sound_when_agent_done = Some(allow);
-    }
-
-    pub fn set_single_file_review(&mut self, allow: bool) {
-        self.single_file_review = Some(allow);
-    }
-
-    pub fn set_use_modifier_to_send(&mut self, always_use: bool) {
-        self.use_modifier_to_send = Some(always_use);
-    }
-
-    pub fn set_profile(&mut self, profile_id: Arc<str>) {
-        self.default_profile = Some(profile_id);
-    }
-}
-
-#[with_fallible_options]
-#[derive(Debug, PartialEq, Clone, Serialize, Deserialize, JsonSchema, MergeFrom)]
-pub struct AgentProfileContent {
-    pub name: Arc<str>,
-    #[serde(default)]
-    pub tools: IndexMap<Arc<str>, bool>,
-    /// Whether all context servers are enabled by default.
-    pub enable_all_context_servers: Option<bool>,
-    #[serde(default)]
-    pub context_servers: IndexMap<Arc<str>, ContextServerPresetContent>,
-    /// The default language model selected when using this profile.
-    pub default_model: Option<LanguageModelSelection>,
-}
-
-#[with_fallible_options]
-#[derive(Debug, PartialEq, Clone, Default, Serialize, Deserialize, JsonSchema, MergeFrom)]
-pub struct ContextServerPresetContent {
-    pub tools: IndexMap<Arc<str>, bool>,
-}
-
-#[derive(Copy, Clone, Default, Debug, PartialEq, Serialize, Deserialize, JsonSchema, MergeFrom)]
-#[serde(rename_all = "snake_case")]
-pub enum DefaultAgentView {
-    #[default]
-    Thread,
-    TextThread,
-}
-
-#[derive(
-    Copy,
-    Clone,
-    Default,
-    Debug,
-    Serialize,
-    Deserialize,
-    JsonSchema,
-    MergeFrom,
-    PartialEq,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum NotifyWhenAgentWaiting {
-    #[default]
-    PrimaryScreen,
-    AllScreens,
-    Never,
-}
-
-#[with_fallible_options]
-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, MergeFrom, PartialEq)]
-pub struct LanguageModelSelection {
-    pub provider: LanguageModelProviderSetting,
-    pub model: String,
-}
-
-#[derive(Clone, Copy, Debug, Serialize, Deserialize, JsonSchema, MergeFrom, PartialEq, Default)]
-#[serde(rename_all = "snake_case")]
-pub enum CompletionMode {
-    #[default]
-    Normal,
-    #[serde(alias = "max")]
-    Burn,
-}
-
-#[with_fallible_options]
-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, MergeFrom, PartialEq)]
-pub struct LanguageModelParameters {
-    pub provider: Option<LanguageModelProviderSetting>,
-    pub model: Option<SharedString>,
-    #[serde(serialize_with = "crate::serialize_optional_f32_with_two_decimal_places")]
-    pub temperature: Option<f32>,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, MergeFrom)]
-pub struct LanguageModelProviderSetting(pub String);
-
-impl JsonSchema for LanguageModelProviderSetting {
-    fn schema_name() -> Cow<'static, str> {
-        "LanguageModelProviderSetting".into()
-    }
-
-    fn json_schema(_: &mut schemars::SchemaGenerator) -> schemars::Schema {
-        // list the builtin providers as a subset so that we still auto complete them in the settings
-        json_schema!({
-            "anyOf": [
-                {
-                    "type": "string",
-                    "enum": [
-                        "amazon-bedrock",
-                        "anthropic",
-                        "copilot_chat",
-                        "deepseek",
-                        "google",
-                        "lmstudio",
-                        "mistral",
-                        "ollama",
-                        "openai",
-                        "openrouter",
-                        "vercel",
-                        "x_ai",
-                        "zed.dev"
-                    ]
-                },
-                {
-                    "type": "string",
-                }
-            ]
-        })
-    }
-}
-
-impl From<String> for LanguageModelProviderSetting {
-    fn from(provider: String) -> Self {
-        Self(provider)
-    }
-}
-
-impl From<&str> for LanguageModelProviderSetting {
-    fn from(provider: &str) -> Self {
-        Self(provider.to_string())
-    }
-}
-
-#[with_fallible_options]
-#[derive(Default, PartialEq, Deserialize, Serialize, Clone, JsonSchema, MergeFrom, Debug)]
-pub struct AllAgentServersSettings {
-    pub gemini: Option<BuiltinAgentServerSettings>,
-    pub claude: Option<BuiltinAgentServerSettings>,
-    pub codex: Option<BuiltinAgentServerSettings>,
-
-    /// Custom agent servers configured by the user
-    #[serde(flatten)]
-    pub custom: HashMap<SharedString, CustomAgentServerSettings>,
-}
-
-#[with_fallible_options]
-#[derive(Default, Deserialize, Serialize, Clone, JsonSchema, MergeFrom, Debug, PartialEq)]
-pub struct BuiltinAgentServerSettings {
-    /// Absolute path to a binary to be used when launching this agent.
-    ///
-    /// This can be used to run a specific binary without automatic downloads or searching `$PATH`.
-    #[serde(rename = "command")]
-    pub path: Option<PathBuf>,
-    /// If a binary is specified in `command`, it will be passed these arguments.
-    pub args: Option<Vec<String>>,
-    /// If a binary is specified in `command`, it will be passed these environment variables.
-    pub env: Option<HashMap<String, String>>,
-    /// Whether to skip searching `$PATH` for an agent server binary when
-    /// launching this agent.
-    ///
-    /// This has no effect if a `command` is specified. Otherwise, when this is
-    /// `false`, Zed will search `$PATH` for an agent server binary and, if one
-    /// is found, use it for threads with this agent. If no agent binary is
-    /// found on `$PATH`, Zed will automatically install and use its own binary.
-    /// When this is `true`, Zed will not search `$PATH`, and will always use
-    /// its own binary.
-    ///
-    /// Default: true
-    pub ignore_system_version: Option<bool>,
-    /// The default mode to use for this agent.
-    ///
-    /// Note: Not only all agents support modes.
-    ///
-    /// Default: None
-    pub default_mode: Option<String>,
-    /// The default model to use for this agent.
-    ///
-    /// This should be the model ID as reported by the agent.
-    ///
-    /// Default: None
-    pub default_model: Option<String>,
-}
-
-#[with_fallible_options]
-#[derive(Deserialize, Serialize, Clone, JsonSchema, MergeFrom, Debug, PartialEq)]
-#[serde(tag = "type", rename_all = "snake_case")]
-pub enum CustomAgentServerSettings {
-    Custom {
-        #[serde(rename = "command")]
-        path: PathBuf,
-        #[serde(default)]
-        args: Vec<String>,
-        env: Option<HashMap<String, String>>,
-        /// The default mode to use for this agent.
-        ///
-        /// Note: Not only all agents support modes.
-        ///
-        /// Default: None
-        default_mode: Option<String>,
-        /// The default model to use for this agent.
-        ///
-        /// This should be the model ID as reported by the agent.
-        ///
-        /// Default: None
-        default_model: Option<String>,
-    },
-    Extension {
-        /// The default mode to use for this agent.
-        ///
-        /// Note: Not only all agents support modes.
-        ///
-        /// Default: None
-        default_mode: Option<String>,
-        /// The default model to use for this agent.
-        ///
-        /// This should be the model ID as reported by the agent.
-        ///
-        /// Default: None
-        default_model: Option<String>,
-    },
-}
diff --git a/crates/settings/src/settings_content/editor.rs b/crates/settings/src/settings_content/editor.rs
deleted file mode 100644
index 9ec5542e9b..0000000000
--- a/crates/settings/src/settings_content/editor.rs
+++ /dev/null
@@ -1,983 +0,0 @@
-use std::fmt::Display;
-use std::num;
-
-use collections::HashMap;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use settings_macros::{MergeFrom, with_fallible_options};
-
-use crate::{
-    DelayMs, DiagnosticSeverityContent, ShowScrollbar, serialize_f32_with_two_decimal_places,
-};
-
-#[with_fallible_options]
-#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize, JsonSchema, MergeFrom)]
-pub struct EditorSettingsContent {
-    /// Whether the cursor blinks in the editor.
-    ///
-    /// Default: true
-    pub cursor_blink: Option<bool>,
-    /// Cursor shape for the default editor.
-    /// Can be "bar", "block", "underline", or "hollow".
-    ///
-    /// Default: bar
-    pub cursor_shape: Option<CursorShape>,
-    /// Determines when the mouse cursor should be hidden in an editor or input box.
-    ///
-    /// Default: on_typing_and_movement
-    pub hide_mouse: Option<HideMouseMode>,
-    /// Determines how snippets are sorted relative to other completion items.
-    ///
-    /// Default: inline
-    pub snippet_sort_order: Option<SnippetSortOrder>,
-    /// How to highlight the current line in the editor.
-    ///
-    /// Default: all
-    pub current_line_highlight: Option<CurrentLineHighlight>,
-    /// Whether to highlight all occurrences of the selected text in an editor.
-    ///
-    /// Default: true
-    pub selection_highlight: Option<bool>,
-    /// Whether the text selection should have rounded corners.
-    ///
-    /// Default: true
-    pub rounded_selection: Option<bool>,
-    /// The debounce delay before querying highlights from the language
-    /// server based on the current cursor location.
-    ///
-    /// Default: 75
-    pub lsp_highlight_debounce: Option<DelayMs>,
-    /// Whether to show the informational hover box when moving the mouse
-    /// over symbols in the editor.
-    ///
-    /// Default: true
-    pub hover_popover_enabled: Option<bool>,
-    /// Time to wait in milliseconds before showing the informational hover box.
-    ///
-    /// Default: 300
-    pub hover_popover_delay: Option<DelayMs>,
-    /// Toolbar related settings
-    pub toolbar: Option<ToolbarContent>,
-    /// Scrollbar related settings
-    pub scrollbar: Option<ScrollbarContent>,
-    /// Minimap related settings
-    pub minimap: Option<MinimapContent>,
-    /// Gutter related settings
-    pub gutter: Option<GutterContent>,
-    /// Whether the editor will scroll beyond the last line.
-    ///
-    /// Default: one_page
-    pub scroll_beyond_last_line: Option<ScrollBeyondLastLine>,
-    /// The number of lines to keep above/below the cursor when auto-scrolling.
-    ///
-    /// Default: 3.
-    #[serde(serialize_with = "crate::serialize_optional_f32_with_two_decimal_places")]
-    pub vertical_scroll_margin: Option<f32>,
-    /// Whether to scroll when clicking near the edge of the visible text area.
-    ///
-    /// Default: false
-    pub autoscroll_on_clicks: Option<bool>,
-    /// The number of characters to keep on either side when scrolling with the mouse.
-    ///
-    /// Default: 5.
-    #[serde(serialize_with = "crate::serialize_optional_f32_with_two_decimal_places")]
-    pub horizontal_scroll_margin: Option<f32>,
-    /// Scroll sensitivity multiplier. This multiplier is applied
-    /// to both the horizontal and vertical delta values while scrolling.
-    ///
-    /// Default: 1.0
-    #[serde(serialize_with = "crate::serialize_optional_f32_with_two_decimal_places")]
-    pub scroll_sensitivity: Option<f32>,
-    /// Scroll sensitivity multiplier for fast scrolling. This multiplier is applied
-    /// to both the horizontal and vertical delta values while scrolling. Fast scrolling
-    /// happens when a user holds the alt or option key while scrolling.
-    ///
-    /// Default: 4.0
-    #[serde(serialize_with = "crate::serialize_optional_f32_with_two_decimal_places")]
-    pub fast_scroll_sensitivity: Option<f32>,
-    /// Settings for sticking scopes to the top of the editor.
-    ///
-    /// Default: sticky scroll is disabled
-    pub sticky_scroll: Option<StickyScrollContent>,
-    /// Whether the line numbers on editors gutter are relative or not.
-    /// When "enabled" shows relative number of buffer lines, when "wrapped" shows
-    /// relative number of display lines.
-    ///
-    /// Default: "disabled"
-    pub relative_line_numbers: Option<RelativeLineNumbers>,
-    /// When to populate a new search's query based on the text under the cursor.
-    ///
-    /// Default: always
-    pub seed_search_query_from_cursor: Option<SeedQuerySetting>,
-    pub use_smartcase_search: Option<bool>,
-    /// Determines the modifier to be used to add multiple cursors with the mouse. The open hover link mouse gestures will adapt such that it do not conflict with the multicursor modifier.
-    ///
-    /// Default: alt
-    pub multi_cursor_modifier: Option<MultiCursorModifier>,
-    /// Hide the values of variables in `private` files, as defined by the
-    /// private_files setting. This only changes the visual representation,
-    /// the values are still present in the file and can be selected / copied / pasted
-    ///
-    /// Default: false
-    pub redact_private_values: Option<bool>,
-
-    /// How many lines to expand the multibuffer excerpts by default
-    ///
-    /// Default: 3
-    pub expand_excerpt_lines: Option<u32>,
-
-    /// How many lines of context to provide in multibuffer excerpts by default
-    ///
-    /// Default: 2
-    pub excerpt_context_lines: Option<u32>,
-
-    /// Whether to enable middle-click paste on Linux
-    ///
-    /// Default: true
-    pub middle_click_paste: Option<bool>,
-
-    /// What to do when multibuffer is double clicked in some of its excerpts
-    /// (parts of singleton buffers).
-    ///
-    /// Default: select
-    pub double_click_in_multibuffer: Option<DoubleClickInMultibuffer>,
-    /// Whether the editor search results will loop
-    ///
-    /// Default: true
-    pub search_wrap: Option<bool>,
-
-    /// Defaults to use when opening a new buffer and project search items.
-    ///
-    /// Default: nothing is enabled
-    pub search: Option<SearchSettingsContent>,
-
-    /// Whether to automatically show a signature help pop-up or not.
-    ///
-    /// Default: false
-    pub auto_signature_help: Option<bool>,
-
-    /// Whether to show the signature help pop-up after completions or bracket pairs inserted.
-    ///
-    /// Default: false
-    pub show_signature_help_after_edits: Option<bool>,
-    /// The minimum APCA perceptual contrast to maintain when
-    /// rendering text over highlight backgrounds in the editor.
-    ///
-    /// Values range from 0 to 106. Set to 0 to disable adjustments.
-    /// Default: 45
-    #[schemars(range(min = 0, max = 106))]
-    pub minimum_contrast_for_highlights: Option<MinimumContrast>,
-
-    /// Whether to follow-up empty go to definition responses from the language server or not.
-    /// `FindAllReferences` allows to look up references of the same symbol instead.
-    /// `None` disables the fallback.
-    ///
-    /// Default: FindAllReferences
-    pub go_to_definition_fallback: Option<GoToDefinitionFallback>,
-
-    /// Jupyter REPL settings.
-    pub jupyter: Option<JupyterContent>,
-
-    /// Which level to use to filter out diagnostics displayed in the editor.
-    ///
-    /// Affects the editor rendering only, and does not interrupt
-    /// the functionality of diagnostics fetching and project diagnostics editor.
-    /// Which files containing diagnostic errors/warnings to mark in the tabs.
-    /// Diagnostics are only shown when file icons are also active.
-    ///
-    /// Shows all diagnostics if not specified.
-    ///
-    /// Default: warning
-    pub diagnostics_max_severity: Option<DiagnosticSeverityContent>,
-
-    /// Whether to show code action button at start of buffer line.
-    ///
-    /// Default: true
-    pub inline_code_actions: Option<bool>,
-
-    /// Drag and drop related settings
-    pub drag_and_drop_selection: Option<DragAndDropSelectionContent>,
-
-    /// How to render LSP `textDocument/documentColor` colors in the editor.
-    ///
-    /// Default: [`DocumentColorsRenderMode::Inlay`]
-    pub lsp_document_colors: Option<DocumentColorsRenderMode>,
-    /// When to show the scrollbar in the completion menu.
-    /// This setting can take four values:
-    ///
-    /// 1. Show the scrollbar if there's important information or
-    ///    follow the system's configured behavior
-    ///   "auto"
-    /// 2. Match the system's configured behavior:
-    ///    "system"
-    /// 3. Always show the scrollbar:
-    ///    "always"
-    /// 4. Never show the scrollbar:
-    ///    "never" (default)
-    pub completion_menu_scrollbar: Option<ShowScrollbar>,
-}
-
-#[derive(
-    Debug,
-    Clone,
-    Copy,
-    Serialize,
-    Deserialize,
-    JsonSchema,
-    MergeFrom,
-    PartialEq,
-    Eq,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum RelativeLineNumbers {
-    Disabled,
-    Enabled,
-    Wrapped,
-}
-
-impl RelativeLineNumbers {
-    pub fn enabled(&self) -> bool {
-        match self {
-            RelativeLineNumbers::Enabled | RelativeLineNumbers::Wrapped => true,
-            RelativeLineNumbers::Disabled => false,
-        }
-    }
-    pub fn wrapped(&self) -> bool {
-        match self {
-            RelativeLineNumbers::Enabled | RelativeLineNumbers::Disabled => false,
-            RelativeLineNumbers::Wrapped => true,
-        }
-    }
-}
-
-// Toolbar related settings
-#[with_fallible_options]
-#[derive(Debug, Clone, Default, Serialize, Deserialize, JsonSchema, MergeFrom, PartialEq, Eq)]
-pub struct ToolbarContent {
-    /// Whether to display breadcrumbs in the editor toolbar.
-    ///
-    /// Default: true
-    pub breadcrumbs: Option<bool>,
-    /// Whether to display quick action buttons in the editor toolbar.
-    ///
-    /// Default: true
-    pub quick_actions: Option<bool>,
-    /// Whether to show the selections menu in the editor toolbar.
-    ///
-    /// Default: true
-    pub selections_menu: Option<bool>,
-    /// Whether to display Agent review buttons in the editor toolbar.
-    /// Only applicable while reviewing a file edited by the Agent.
-    ///
-    /// Default: true
-    pub agent_review: Option<bool>,
-    /// Whether to display code action buttons in the editor toolbar.
-    ///
-    /// Default: false
-    pub code_actions: Option<bool>,
-}
-
-/// Scrollbar related settings
-#[with_fallible_options]
-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, MergeFrom, PartialEq, Default)]
-pub struct ScrollbarContent {
-    /// When to show the scrollbar in the editor.
-    ///
-    /// Default: auto
-    pub show: Option<ShowScrollbar>,
-    /// Whether to show git diff indicators in the scrollbar.
-    ///
-    /// Default: true
-    pub git_diff: Option<bool>,
-    /// Whether to show buffer search result indicators in the scrollbar.
-    ///
-    /// Default: true
-    pub search_results: Option<bool>,
-    /// Whether to show selected text occurrences in the scrollbar.
-    ///
-    /// Default: true
-    pub selected_text: Option<bool>,
-    /// Whether to show selected symbol occurrences in the scrollbar.
-    ///
-    /// Default: true
-    pub selected_symbol: Option<bool>,
-    /// Which diagnostic indicators to show in the scrollbar:
-    ///
-    /// Default: all
-    pub diagnostics: Option<ScrollbarDiagnostics>,
-    /// Whether to show cursor positions in the scrollbar.
-    ///
-    /// Default: true
-    pub cursors: Option<bool>,
-    /// Forcefully enable or disable the scrollbar for each axis
-    pub axes: Option<ScrollbarAxesContent>,
-}
-
-/// Sticky scroll related settings
-#[with_fallible_options]
-#[derive(Clone, Default, Debug, Serialize, Deserialize, JsonSchema, MergeFrom, PartialEq)]
-pub struct StickyScrollContent {
-    /// Whether sticky scroll is enabled.
-    ///
-    /// Default: false
-    pub enabled: Option<bool>,
-}
-
-/// Minimap related settings
-#[with_fallible_options]
-#[derive(Clone, Default, Debug, Serialize, Deserialize, JsonSchema, MergeFrom, PartialEq)]
-pub struct MinimapContent {
-    /// When to show the minimap in the editor.
-    ///
-    /// Default: never
-    pub show: Option<ShowMinimap>,
-
-    /// Where to show the minimap in the editor.
-    ///
-    /// Default: [`DisplayIn::ActiveEditor`]
-    pub display_in: Option<DisplayIn>,
-
-    /// When to show the minimap thumb.
-    ///
-    /// Default: always
-    pub thumb: Option<MinimapThumb>,
-
-    /// Defines the border style for the minimap's scrollbar thumb.
-    ///
-    /// Default: left_open
-    pub thumb_border: Option<MinimapThumbBorder>,
-
-    /// How to highlight the current line in the minimap.
-    ///
-    /// Default: inherits editor line highlights setting
-    pub current_line_highlight: Option<CurrentLineHighlight>,
-
-    /// Maximum number of columns to display in the minimap.
-    ///
-    /// Default: 80
-    pub max_width_columns: Option<num::NonZeroU32>,
-}
-
-/// Forcefully enable or disable the scrollbar for each axis
-#[with_fallible_options]
-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, MergeFrom, PartialEq, Default)]
-pub struct ScrollbarAxesContent {
-    /// When false, forcefully disables the horizontal scrollbar. Otherwise, obey other settings.
-    ///
-    /// Default: true
-    pub horizontal: Option<bool>,
-
-    /// When false, forcefully disables the vertical scrollbar. Otherwise, obey other settings.
-    ///
-    /// Default: true
-    pub vertical: Option<bool>,
-}
-
-/// Gutter related settings
-#[with_fallible_options]
-#[derive(Clone, Debug, Default, Serialize, Deserialize, JsonSchema, MergeFrom, PartialEq, Eq)]
-pub struct GutterContent {
-    /// Whether to show line numbers in the gutter.
-    ///
-    /// Default: true
-    pub line_numbers: Option<bool>,
-    /// Minimum number of characters to reserve space for in the gutter.
-    ///
-    /// Default: 4
-    pub min_line_number_digits: Option<usize>,
-    /// Whether to show runnable buttons in the gutter.
-    ///
-    /// Default: true
-    pub runnables: Option<bool>,
-    /// Whether to show breakpoints in the gutter.
-    ///
-    /// Default: true
-    pub breakpoints: Option<bool>,
-    /// Whether to show fold buttons in the gutter.
-    ///
-    /// Default: true
-    pub folds: Option<bool>,
-}
-
-/// How to render LSP `textDocument/documentColor` colors in the editor.
-#[derive(
-    Copy,
-    Clone,
-    Debug,
-    Default,
-    Serialize,
-    Deserialize,
-    PartialEq,
-    Eq,
-    JsonSchema,
-    MergeFrom,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum DocumentColorsRenderMode {
-    /// Do not query and render document colors.
-    None,
-    /// Render document colors as inlay hints near the color text.
-    #[default]
-    Inlay,
-    /// Draw a border around the color text.
-    Border,
-    /// Draw a background behind the color text.
-    Background,
-}
-
-#[derive(
-    Copy,
-    Clone,
-    Debug,
-    Serialize,
-    Deserialize,
-    PartialEq,
-    Eq,
-    JsonSchema,
-    MergeFrom,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum CurrentLineHighlight {
-    // Don't highlight the current line.
-    None,
-    // Highlight the gutter area.
-    Gutter,
-    // Highlight the editor area.
-    Line,
-    // Highlight the full line.
-    All,
-}
-
-/// When to populate a new search's query based on the text under the cursor.
-#[derive(
-    Copy,
-    Clone,
-    Debug,
-    Serialize,
-    Deserialize,
-    PartialEq,
-    Eq,
-    JsonSchema,
-    MergeFrom,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum SeedQuerySetting {
-    /// Always populate the search query with the word under the cursor.
-    Always,
-    /// Only populate the search query when there is text selected.
-    Selection,
-    /// Never populate the search query
-    Never,
-}
-
-/// What to do when multibuffer is double clicked in some of its excerpts (parts of singleton buffers).
-#[derive(
-    Default,
-    Copy,
-    Clone,
-    Debug,
-    Serialize,
-    Deserialize,
-    PartialEq,
-    Eq,
-    JsonSchema,
-    MergeFrom,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum DoubleClickInMultibuffer {
-    /// Behave as a regular buffer and select the whole word.
-    #[default]
-    Select,
-    /// Open the excerpt clicked as a new buffer in the new tab, if no `alt` modifier was pressed during double click.
-    /// Otherwise, behave as a regular buffer and select the whole word.
-    Open,
-}
-
-/// When to show the minimap thumb.
-///
-/// Default: always
-#[derive(
-    Copy,
-    Clone,
-    Debug,
-    Default,
-    Serialize,
-    Deserialize,
-    JsonSchema,
-    MergeFrom,
-    PartialEq,
-    Eq,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum MinimapThumb {
-    /// Show the minimap thumb only when the mouse is hovering over the minimap.
-    Hover,
-    /// Always show the minimap thumb.
-    #[default]
-    Always,
-}
-
-/// Defines the border style for the minimap's scrollbar thumb.
-///
-/// Default: left_open
-#[derive(
-    Copy,
-    Clone,
-    Debug,
-    Default,
-    Serialize,
-    Deserialize,
-    JsonSchema,
-    MergeFrom,
-    PartialEq,
-    Eq,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum MinimapThumbBorder {
-    /// Displays a border on all sides of the thumb.
-    Full,
-    /// Displays a border on all sides except the left side of the thumb.
-    #[default]
-    LeftOpen,
-    /// Displays a border on all sides except the right side of the thumb.
-    RightOpen,
-    /// Displays a border only on the left side of the thumb.
-    LeftOnly,
-    /// Displays the thumb without any border.
-    None,
-}
-
-/// Which diagnostic indicators to show in the scrollbar.
-///
-/// Default: all
-#[derive(
-    Copy,
-    Clone,
-    Debug,
-    Serialize,
-    Deserialize,
-    JsonSchema,
-    MergeFrom,
-    PartialEq,
-    Eq,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "lowercase")]
-pub enum ScrollbarDiagnostics {
-    /// Show all diagnostic levels: hint, information, warnings, error.
-    All,
-    /// Show only the following diagnostic levels: information, warning, error.
-    Information,
-    /// Show only the following diagnostic levels: warning, error.
-    Warning,
-    /// Show only the following diagnostic level: error.
-    Error,
-    /// Do not show diagnostics.
-    None,
-}
-
-/// The key to use for adding multiple cursors
-///
-/// Default: alt
-#[derive(
-    Copy,
-    Clone,
-    Debug,
-    Serialize,
-    Deserialize,
-    JsonSchema,
-    MergeFrom,
-    PartialEq,
-    Eq,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum MultiCursorModifier {
-    Alt,
-    #[serde(alias = "cmd", alias = "ctrl")]
-    CmdOrCtrl,
-}
-
-/// Whether the editor will scroll beyond the last line.
-///
-/// Default: one_page
-#[derive(
-    Copy,
-    Clone,
-    Debug,
-    Serialize,
-    Deserialize,
-    JsonSchema,
-    MergeFrom,
-    PartialEq,
-    Eq,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum ScrollBeyondLastLine {
-    /// The editor will not scroll beyond the last line.
-    Off,
-
-    /// The editor will scroll beyond the last line by one page.
-    OnePage,
-
-    /// The editor will scroll beyond the last line by the same number of lines as vertical_scroll_margin.
-    VerticalScrollMargin,
-}
-
-/// The shape of a selection cursor.
-#[derive(
-    Copy,
-    Clone,
-    Debug,
-    Default,
-    Serialize,
-    Deserialize,
-    PartialEq,
-    Eq,
-    JsonSchema,
-    MergeFrom,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum CursorShape {
-    /// A vertical bar
-    #[default]
-    Bar,
-    /// A block that surrounds the following character
-    Block,
-    /// An underline that runs along the following character
-    Underline,
-    /// A box drawn around the following character
-    Hollow,
-}
-
-/// What to do when go to definition yields no results.
-#[derive(
-    Copy,
-    Clone,
-    Debug,
-    Default,
-    Serialize,
-    Deserialize,
-    PartialEq,
-    Eq,
-    JsonSchema,
-    MergeFrom,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum GoToDefinitionFallback {
-    /// Disables the fallback.
-    None,
-    /// Looks up references of the same symbol instead.
-    #[default]
-    FindAllReferences,
-}
-
-/// Determines when the mouse cursor should be hidden in an editor or input box.
-///
-/// Default: on_typing_and_movement
-#[derive(
-    Copy,
-    Clone,
-    Debug,
-    Default,
-    Serialize,
-    Deserialize,
-    PartialEq,
-    Eq,
-    JsonSchema,
-    MergeFrom,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum HideMouseMode {
-    /// Never hide the mouse cursor
-    Never,
-    /// Hide only when typing
-    OnTyping,
-    /// Hide on both typing and cursor movement
-    #[default]
-    OnTypingAndMovement,
-}
-
-/// Determines how snippets are sorted relative to other completion items.
-///
-/// Default: inline
-#[derive(
-    Copy,
-    Clone,
-    Debug,
-    Default,
-    Serialize,
-    Deserialize,
-    PartialEq,
-    Eq,
-    JsonSchema,
-    MergeFrom,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum SnippetSortOrder {
-    /// Place snippets at the top of the completion list
-    Top,
-    /// Sort snippets normally using the default comparison logic
-    #[default]
-    Inline,
-    /// Place snippets at the bottom of the completion list
-    Bottom,
-    /// Do not show snippets in the completion list
-    None,
-}
-
-/// Default options for buffer and project search items.
-#[with_fallible_options]
-#[derive(Clone, Default, Debug, Serialize, Deserialize, JsonSchema, MergeFrom, PartialEq, Eq)]
-pub struct SearchSettingsContent {
-    /// Whether to show the project search button in the status bar.
-    pub button: Option<bool>,
-    /// Whether to only match on whole words.
-    pub whole_word: Option<bool>,
-    /// Whether to match case sensitively.
-    pub case_sensitive: Option<bool>,
-    /// Whether to include gitignored files in search results.
-    pub include_ignored: Option<bool>,
-    /// Whether to interpret the search query as a regular expression.
-    pub regex: Option<bool>,
-    /// Whether to center the cursor on each search match when navigating.
-    pub center_on_match: Option<bool>,
-}
-
-#[with_fallible_options]
-#[derive(Default, Clone, Debug, Serialize, Deserialize, PartialEq, Eq, JsonSchema, MergeFrom)]
-#[serde(rename_all = "snake_case")]
-pub struct JupyterContent {
-    /// Whether the Jupyter feature is enabled.
-    ///
-    /// Default: true
-    pub enabled: Option<bool>,
-
-    /// Default kernels to select for each language.
-    ///
-    /// Default: `{}`
-    pub kernel_selections: Option<HashMap<String, String>>,
-}
-
-/// Whether to allow drag and drop text selection in buffer.
-#[with_fallible_options]
-#[derive(Clone, Default, Debug, Serialize, Deserialize, JsonSchema, MergeFrom, PartialEq, Eq)]
-pub struct DragAndDropSelectionContent {
-    /// When true, enables drag and drop text selection in buffer.
-    ///
-    /// Default: true
-    pub enabled: Option<bool>,
-
-    /// The delay in milliseconds that must elapse before drag and drop is allowed. Otherwise, a new text selection is created.
-    ///
-    /// Default: 300
-    pub delay: Option<DelayMs>,
-}
-
-/// When to show the minimap in the editor.
-///
-/// Default: never
-#[derive(
-    Copy,
-    Clone,
-    Debug,
-    Default,
-    Serialize,
-    Deserialize,
-    JsonSchema,
-    MergeFrom,
-    PartialEq,
-    Eq,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum ShowMinimap {
-    /// Follow the visibility of the scrollbar.
-    Auto,
-    /// Always show the minimap.
-    Always,
-    /// Never show the minimap.
-    #[default]
-    Never,
-}
-
-/// Where to show the minimap in the editor.
-///
-/// Default: all_editors
-#[derive(
-    Copy,
-    Clone,
-    Debug,
-    Default,
-    Serialize,
-    Deserialize,
-    JsonSchema,
-    MergeFrom,
-    PartialEq,
-    Eq,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum DisplayIn {
-    /// Show on all open editors.
-    AllEditors,
-    /// Show the minimap on the active editor only.
-    #[default]
-    ActiveEditor,
-}
-
-/// Minimum APCA perceptual contrast for text over highlight backgrounds.
-///
-/// Valid range: 0.0 to 106.0
-/// Default: 45.0
-#[derive(
-    Clone,
-    Copy,
-    Debug,
-    Serialize,
-    Deserialize,
-    JsonSchema,
-    MergeFrom,
-    PartialEq,
-    PartialOrd,
-    derive_more::FromStr,
-)]
-#[serde(transparent)]
-pub struct MinimumContrast(
-    #[serde(serialize_with = "crate::serialize_f32_with_two_decimal_places")] pub f32,
-);
-
-impl Display for MinimumContrast {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{:.1}", self.0)
-    }
-}
-
-impl From<f32> for MinimumContrast {
-    fn from(x: f32) -> Self {
-        Self(x)
-    }
-}
-
-/// Opacity of the inactive panes. 0 means transparent, 1 means opaque.
-///
-/// Valid range: 0.0 to 1.0
-/// Default: 1.0
-#[derive(
-    Clone,
-    Copy,
-    Debug,
-    Serialize,
-    Deserialize,
-    JsonSchema,
-    MergeFrom,
-    PartialEq,
-    PartialOrd,
-    derive_more::FromStr,
-)]
-#[serde(transparent)]
-pub struct InactiveOpacity(
-    #[serde(serialize_with = "serialize_f32_with_two_decimal_places")] pub f32,
-);
-
-impl Display for InactiveOpacity {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{:.1}", self.0)
-    }
-}
-
-impl From<f32> for InactiveOpacity {
-    fn from(x: f32) -> Self {
-        Self(x)
-    }
-}
-
-/// Centered layout related setting (left/right).
-///
-/// Valid range: 0.0 to 0.4
-/// Default: 2.0
-#[derive(
-    Clone,
-    Copy,
-    Debug,
-    Serialize,
-    Deserialize,
-    MergeFrom,
-    PartialEq,
-    PartialOrd,
-    derive_more::FromStr,
-)]
-#[serde(transparent)]
-pub struct CenteredPaddingSettings(
-    #[serde(serialize_with = "serialize_f32_with_two_decimal_places")] pub f32,
-);
-
-impl CenteredPaddingSettings {
-    pub const MIN_PADDING: f32 = 0.0;
-    // This is an f64 so serde_json can give a type hint without random numbers in the back
-    pub const DEFAULT_PADDING: f64 = 0.2;
-    pub const MAX_PADDING: f32 = 0.4;
-}
-
-impl Display for CenteredPaddingSettings {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{:.2}", self.0)
-    }
-}
-
-impl From<f32> for CenteredPaddingSettings {
-    fn from(x: f32) -> Self {
-        Self(x)
-    }
-}
-
-impl Default for CenteredPaddingSettings {
-    fn default() -> Self {
-        Self(Self::DEFAULT_PADDING as f32)
-    }
-}
-
-impl schemars::JsonSchema for CenteredPaddingSettings {
-    fn schema_name() -> std::borrow::Cow<'static, str> {
-        "CenteredPaddingSettings".into()
-    }
-
-    fn json_schema(_: &mut schemars::SchemaGenerator) -> schemars::Schema {
-        use schemars::json_schema;
-        json_schema!({
-            "type": "number",
-            "minimum": Self::MIN_PADDING,
-            "maximum": Self::MAX_PADDING,
-            "default": Self::DEFAULT_PADDING,
-            "description": "Centered layout related setting (left/right)."
-        })
-    }
-}
diff --git a/crates/settings/src/settings_content/extension.rs b/crates/settings/src/settings_content/extension.rs
deleted file mode 100644
index 2fefd4ef38..0000000000
--- a/crates/settings/src/settings_content/extension.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-use std::sync::Arc;
-
-use collections::HashMap;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use settings_macros::{MergeFrom, with_fallible_options};
-
-#[with_fallible_options]
-#[derive(Debug, PartialEq, Clone, Default, Serialize, Deserialize, JsonSchema, MergeFrom)]
-pub struct ExtensionSettingsContent {
-    /// The extensions that should be automatically installed by Zed.
-    ///
-    /// This is used to make functionality provided by extensions (e.g., language support)
-    /// available out-of-the-box.
-    ///
-    /// Default: { "html": true }
-    #[serde(default)]
-    pub auto_install_extensions: HashMap<Arc<str>, bool>,
-    #[serde(default)]
-    pub auto_update_extensions: HashMap<Arc<str>, bool>,
-    /// The capabilities granted to extensions.
-    pub granted_extension_capabilities: Option<Vec<ExtensionCapabilityContent>>,
-}
-
-/// A capability for an extension.
-#[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize, JsonSchema)]
-#[serde(tag = "kind", rename_all = "snake_case")]
-pub enum ExtensionCapabilityContent {
-    #[serde(rename = "process:exec")]
-    ProcessExec {
-        /// The command to execute.
-        command: String,
-        /// The arguments to pass to the command. Use `*` for a single wildcard argument.
-        /// If the last element is `**`, then any trailing arguments are allowed.
-        args: Vec<String>,
-    },
-    DownloadFile {
-        host: String,
-        path: Vec<String>,
-    },
-    #[serde(rename = "npm:install")]
-    NpmInstallPackage {
-        package: String,
-    },
-}
diff --git a/crates/settings/src/settings_content/language.rs b/crates/settings/src/settings_content/language.rs
deleted file mode 100644
index 25ff60e9f4..0000000000
--- a/crates/settings/src/settings_content/language.rs
+++ /dev/null
@@ -1,1023 +0,0 @@
-use std::num::NonZeroU32;
-
-use collections::{HashMap, HashSet};
-use gpui::{Modifiers, SharedString};
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize, de::Error as _};
-use settings_macros::{MergeFrom, with_fallible_options};
-use std::sync::Arc;
-
-use crate::{ExtendingVec, merge_from};
-
-#[with_fallible_options]
-#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize, JsonSchema)]
-pub struct AllLanguageSettingsContent {
-    /// The settings for enabling/disabling features.
-    pub features: Option<FeaturesContent>,
-    /// The edit prediction settings.
-    pub edit_predictions: Option<EditPredictionSettingsContent>,
-    /// The default language settings.
-    #[serde(flatten)]
-    pub defaults: LanguageSettingsContent,
-    /// The settings for individual languages.
-    #[serde(default)]
-    pub languages: LanguageToSettingsMap,
-    /// Settings for associating file extensions and filenames
-    /// with languages.
-    pub file_types: Option<HashMap<Arc<str>, ExtendingVec<String>>>,
-}
-
-impl merge_from::MergeFrom for AllLanguageSettingsContent {
-    fn merge_from(&mut self, other: &Self) {
-        self.file_types.merge_from(&other.file_types);
-        self.features.merge_from(&other.features);
-        self.edit_predictions.merge_from(&other.edit_predictions);
-
-        // A user's global settings override the default global settings and
-        // all default language-specific settings.
-        //
-        self.defaults.merge_from(&other.defaults);
-        for language_settings in self.languages.0.values_mut() {
-            language_settings.merge_from(&other.defaults);
-        }
-
-        // A user's language-specific settings override default language-specific settings.
-        for (language_name, user_language_settings) in &other.languages.0 {
-            if let Some(existing) = self.languages.0.get_mut(language_name) {
-                existing.merge_from(&user_language_settings);
-            } else {
-                let mut new_settings = self.defaults.clone();
-                new_settings.merge_from(&user_language_settings);
-
-                self.languages.0.insert(language_name.clone(), new_settings);
-            }
-        }
-    }
-}
-
-/// The settings for enabling/disabling features.
-#[with_fallible_options]
-#[derive(Debug, Clone, PartialEq, Default, Serialize, Deserialize, JsonSchema, MergeFrom)]
-#[serde(rename_all = "snake_case")]
-pub struct FeaturesContent {
-    /// Determines which edit prediction provider to use.
-    pub edit_prediction_provider: Option<EditPredictionProvider>,
-    /// Enables the experimental edit prediction context retrieval system.
-    pub experimental_edit_prediction_context_retrieval: Option<bool>,
-}
-
-/// The provider that supplies edit predictions.
-#[derive(Copy, Clone, Debug, Default, Eq, PartialEq, Serialize, JsonSchema, MergeFrom)]
-#[serde(rename_all = "snake_case")]
-pub enum EditPredictionProvider {
-    None,
-    #[default]
-    Copilot,
-    Supermaven,
-    Zed,
-    Codestral,
-    Experimental(&'static str),
-}
-
-pub const EXPERIMENTAL_SWEEP_EDIT_PREDICTION_PROVIDER_NAME: &str = "sweep";
-pub const EXPERIMENTAL_ZETA2_EDIT_PREDICTION_PROVIDER_NAME: &str = "zeta2";
-pub const EXPERIMENTAL_MERCURY_EDIT_PREDICTION_PROVIDER_NAME: &str = "mercury";
-
-impl<'de> Deserialize<'de> for EditPredictionProvider {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        #[derive(Deserialize)]
-        #[serde(rename_all = "snake_case")]
-        pub enum Content {
-            None,
-            Copilot,
-            Supermaven,
-            Zed,
-            Codestral,
-            Experimental(String),
-        }
-
-        Ok(match Content::deserialize(deserializer)? {
-            Content::None => EditPredictionProvider::None,
-            Content::Copilot => EditPredictionProvider::Copilot,
-            Content::Supermaven => EditPredictionProvider::Supermaven,
-            Content::Zed => EditPredictionProvider::Zed,
-            Content::Codestral => EditPredictionProvider::Codestral,
-            Content::Experimental(name)
-                if name == EXPERIMENTAL_SWEEP_EDIT_PREDICTION_PROVIDER_NAME =>
-            {
-                EditPredictionProvider::Experimental(
-                    EXPERIMENTAL_SWEEP_EDIT_PREDICTION_PROVIDER_NAME,
-                )
-            }
-            Content::Experimental(name)
-                if name == EXPERIMENTAL_MERCURY_EDIT_PREDICTION_PROVIDER_NAME =>
-            {
-                EditPredictionProvider::Experimental(
-                    EXPERIMENTAL_MERCURY_EDIT_PREDICTION_PROVIDER_NAME,
-                )
-            }
-            Content::Experimental(name)
-                if name == EXPERIMENTAL_ZETA2_EDIT_PREDICTION_PROVIDER_NAME =>
-            {
-                EditPredictionProvider::Experimental(
-                    EXPERIMENTAL_ZETA2_EDIT_PREDICTION_PROVIDER_NAME,
-                )
-            }
-            Content::Experimental(name) => {
-                return Err(D::Error::custom(format!(
-                    "Unknown experimental edit prediction provider: {}",
-                    name
-                )));
-            }
-        })
-    }
-}
-
-impl EditPredictionProvider {
-    pub fn is_zed(&self) -> bool {
-        match self {
-            EditPredictionProvider::Zed => true,
-            EditPredictionProvider::None
-            | EditPredictionProvider::Copilot
-            | EditPredictionProvider::Supermaven
-            | EditPredictionProvider::Codestral
-            | EditPredictionProvider::Experimental(_) => false,
-        }
-    }
-}
-
-/// The contents of the edit prediction settings.
-#[with_fallible_options]
-#[derive(Clone, Debug, Default, Serialize, Deserialize, JsonSchema, MergeFrom, PartialEq)]
-pub struct EditPredictionSettingsContent {
-    /// A list of globs representing files that edit predictions should be disabled for.
-    /// This list adds to a pre-existing, sensible default set of globs.
-    /// Any additional ones you add are combined with them.
-    pub disabled_globs: Option<Vec<String>>,
-    /// The mode used to display edit predictions in the buffer.
-    /// Provider support required.
-    pub mode: Option<EditPredictionsMode>,
-    /// Settings specific to GitHub Copilot.
-    pub copilot: Option<CopilotSettingsContent>,
-    /// Settings specific to Codestral.
-    pub codestral: Option<CodestralSettingsContent>,
-    /// Whether edit predictions are enabled in the assistant prompt editor.
-    /// This has no effect if globally disabled.
-    pub enabled_in_text_threads: Option<bool>,
-}
-
-#[with_fallible_options]
-#[derive(Clone, Debug, Default, Serialize, Deserialize, JsonSchema, MergeFrom, PartialEq)]
-pub struct CopilotSettingsContent {
-    /// HTTP/HTTPS proxy to use for Copilot.
-    ///
-    /// Default: none
-    pub proxy: Option<String>,
-    /// Disable certificate verification for the proxy (not recommended).
-    ///
-    /// Default: false
-    pub proxy_no_verify: Option<bool>,
-    /// Enterprise URI for Copilot.
-    ///
-    /// Default: none
-    pub enterprise_uri: Option<String>,
-}
-
-#[derive(Clone, Debug, Default, Serialize, Deserialize, JsonSchema, MergeFrom, PartialEq)]
-pub struct CodestralSettingsContent {
-    /// Model to use for completions.
-    ///
-    /// Default: "codestral-latest"
-    #[serde(default)]
-    pub model: Option<String>,
-    /// Maximum tokens to generate.
-    ///
-    /// Default: 150
-    #[serde(default)]
-    pub max_tokens: Option<u32>,
-    /// Api URL to use for completions.
-    ///
-    /// Default: "https://codestral.mistral.ai"
-    #[serde(default)]
-    pub api_url: Option<String>,
-}
-
-/// The mode in which edit predictions should be displayed.
-#[derive(
-    Copy,
-    Clone,
-    Debug,
-    Default,
-    Eq,
-    PartialEq,
-    Serialize,
-    Deserialize,
-    JsonSchema,
-    MergeFrom,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum EditPredictionsMode {
-    /// If provider supports it, display inline when holding modifier key (e.g., alt).
-    /// Otherwise, eager preview is used.
-    #[serde(alias = "auto")]
-    Subtle,
-    /// Display inline when there are no language server completions available.
-    #[default]
-    #[serde(alias = "eager_preview")]
-    Eager,
-}
-
-/// Controls the soft-wrapping behavior in the editor.
-#[derive(
-    Copy,
-    Clone,
-    Debug,
-    Serialize,
-    Deserialize,
-    PartialEq,
-    Eq,
-    JsonSchema,
-    MergeFrom,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum SoftWrap {
-    /// Prefer a single line generally, unless an overly long line is encountered.
-    None,
-    /// Deprecated: use None instead. Left to avoid breaking existing users' configs.
-    /// Prefer a single line generally, unless an overly long line is encountered.
-    PreferLine,
-    /// Soft wrap lines that exceed the editor width.
-    EditorWidth,
-    /// Soft wrap lines at the preferred line length.
-    PreferredLineLength,
-    /// Soft wrap line at the preferred line length or the editor width (whichever is smaller).
-    Bounded,
-}
-
-/// The settings for a particular language.
-#[with_fallible_options]
-#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize, JsonSchema, MergeFrom)]
-pub struct LanguageSettingsContent {
-    /// How many columns a tab should occupy.
-    ///
-    /// Default: 4
-    #[schemars(range(min = 1, max = 128))]
-    pub tab_size: Option<NonZeroU32>,
-    /// Whether to indent lines using tab characters, as opposed to multiple
-    /// spaces.
-    ///
-    /// Default: false
-    pub hard_tabs: Option<bool>,
-    /// How to soft-wrap long lines of text.
-    ///
-    /// Default: none
-    pub soft_wrap: Option<SoftWrap>,
-    /// The column at which to soft-wrap lines, for buffers where soft-wrap
-    /// is enabled.
-    ///
-    /// Default: 80
-    pub preferred_line_length: Option<u32>,
-    /// Whether to show wrap guides in the editor. Setting this to true will
-    /// show a guide at the 'preferred_line_length' value if softwrap is set to
-    /// 'preferred_line_length', and will show any additional guides as specified
-    /// by the 'wrap_guides' setting.
-    ///
-    /// Default: true
-    pub show_wrap_guides: Option<bool>,
-    /// Character counts at which to show wrap guides in the editor.
-    ///
-    /// Default: []
-    pub wrap_guides: Option<Vec<usize>>,
-    /// Indent guide related settings.
-    pub indent_guides: Option<IndentGuideSettingsContent>,
-    /// Whether or not to perform a buffer format before saving.
-    ///
-    /// Default: on
-    pub format_on_save: Option<FormatOnSave>,
-    /// Whether or not to remove any trailing whitespace from lines of a buffer
-    /// before saving it.
-    ///
-    /// Default: true
-    pub remove_trailing_whitespace_on_save: Option<bool>,
-    /// Whether or not to ensure there's a single newline at the end of a buffer
-    /// when saving it.
-    ///
-    /// Default: true
-    pub ensure_final_newline_on_save: Option<bool>,
-    /// How to perform a buffer format.
-    ///
-    /// Default: auto
-    pub formatter: Option<FormatterList>,
-    /// Zed's Prettier integration settings.
-    /// Allows to enable/disable formatting with Prettier
-    /// and configure default Prettier, used when no project-level Prettier installation is found.
-    ///
-    /// Default: off
-    pub prettier: Option<PrettierSettingsContent>,
-    /// Whether to automatically close JSX tags.
-    pub jsx_tag_auto_close: Option<JsxTagAutoCloseSettingsContent>,
-    /// Whether to use language servers to provide code intelligence.
-    ///
-    /// Default: true
-    pub enable_language_server: Option<bool>,
-    /// The list of language servers to use (or disable) for this language.
-    ///
-    /// This array should consist of language server IDs, as well as the following
-    /// special tokens:
-    /// - `"!<language_server_id>"` - A language server ID prefixed with a `!` will be disabled.
-    /// - `"..."` - A placeholder to refer to the **rest** of the registered language servers for this language.
-    ///
-    /// Default: ["..."]
-    pub language_servers: Option<Vec<String>>,
-    /// Controls where the `editor::Rewrap` action is allowed for this language.
-    ///
-    /// Note: This setting has no effect in Vim mode, as rewrap is already
-    /// allowed everywhere.
-    ///
-    /// Default: "in_comments"
-    pub allow_rewrap: Option<RewrapBehavior>,
-    /// Controls whether edit predictions are shown immediately (true)
-    /// or manually by triggering `editor::ShowEditPrediction` (false).
-    ///
-    /// Default: true
-    pub show_edit_predictions: Option<bool>,
-    /// Controls whether edit predictions are shown in the given language
-    /// scopes.
-    ///
-    /// Example: ["string", "comment"]
-    ///
-    /// Default: []
-    pub edit_predictions_disabled_in: Option<Vec<String>>,
-    /// Whether to show tabs and spaces in the editor.
-    pub show_whitespaces: Option<ShowWhitespaceSetting>,
-    /// Visible characters used to render whitespace when show_whitespaces is enabled.
-    ///
-    /// Default: "•" for spaces, "→" for tabs.
-    pub whitespace_map: Option<WhitespaceMapContent>,
-    /// Whether to start a new line with a comment when a previous line is a comment as well.
-    ///
-    /// Default: true
-    pub extend_comment_on_newline: Option<bool>,
-    /// Inlay hint related settings.
-    pub inlay_hints: Option<InlayHintSettingsContent>,
-    /// Whether to automatically type closing characters for you. For example,
-    /// when you type '(', Zed will automatically add a closing ')' at the correct position.
-    ///
-    /// Default: true
-    pub use_autoclose: Option<bool>,
-    /// Whether to automatically surround text with characters for you. For example,
-    /// when you select text and type '(', Zed will automatically surround text with ().
-    ///
-    /// Default: true
-    pub use_auto_surround: Option<bool>,
-    /// Controls how the editor handles the autoclosed characters.
-    /// When set to `false`(default), skipping over and auto-removing of the closing characters
-    /// happen only for auto-inserted characters.
-    /// Otherwise(when `true`), the closing characters are always skipped over and auto-removed
-    /// no matter how they were inserted.
-    ///
-    /// Default: false
-    pub always_treat_brackets_as_autoclosed: Option<bool>,
-    /// Whether to use additional LSP queries to format (and amend) the code after
-    /// every "trigger" symbol input, defined by LSP server capabilities.
-    ///
-    /// Default: true
-    pub use_on_type_format: Option<bool>,
-    /// Which code actions to run on save before the formatter.
-    /// These are not run if formatting is off.
-    ///
-    /// Default: {} (or {"source.organizeImports": true} for Go).
-    pub code_actions_on_format: Option<HashMap<String, bool>>,
-    /// Whether to perform linked edits of associated ranges, if the language server supports it.
-    /// For example, when editing opening <html> tag, the contents of the closing </html> tag will be edited as well.
-    ///
-    /// Default: true
-    pub linked_edits: Option<bool>,
-    /// Whether indentation should be adjusted based on the context whilst typing.
-    ///
-    /// Default: true
-    pub auto_indent: Option<bool>,
-    /// Whether indentation of pasted content should be adjusted based on the context.
-    ///
-    /// Default: true
-    pub auto_indent_on_paste: Option<bool>,
-    /// Task configuration for this language.
-    ///
-    /// Default: {}
-    pub tasks: Option<LanguageTaskSettingsContent>,
-    /// Whether to pop the completions menu while typing in an editor without
-    /// explicitly requesting it.
-    ///
-    /// Default: true
-    pub show_completions_on_input: Option<bool>,
-    /// Whether to display inline and alongside documentation for items in the
-    /// completions menu.
-    ///
-    /// Default: true
-    pub show_completion_documentation: Option<bool>,
-    /// Controls how completions are processed for this language.
-    pub completions: Option<CompletionSettingsContent>,
-    /// Preferred debuggers for this language.
-    ///
-    /// Default: []
-    pub debuggers: Option<Vec<String>>,
-    /// Whether to enable word diff highlighting in the editor.
-    ///
-    /// When enabled, changed words within modified lines are highlighted
-    /// to show exactly what changed.
-    ///
-    /// Default: true
-    pub word_diff_enabled: Option<bool>,
-    /// Whether to use tree-sitter bracket queries to detect and colorize the brackets in the editor.
-    ///
-    /// Default: false
-    pub colorize_brackets: Option<bool>,
-}
-
-/// Controls how whitespace should be displayedin the editor.
-#[derive(
-    Copy,
-    Clone,
-    Debug,
-    Serialize,
-    Deserialize,
-    PartialEq,
-    Eq,
-    JsonSchema,
-    MergeFrom,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum ShowWhitespaceSetting {
-    /// Draw whitespace only for the selected text.
-    Selection,
-    /// Do not draw any tabs or spaces.
-    None,
-    /// Draw all invisible symbols.
-    All,
-    /// Draw whitespaces at boundaries only.
-    ///
-    /// For a whitespace to be on a boundary, any of the following conditions need to be met:
-    /// - It is a tab
-    /// - It is adjacent to an edge (start or end)
-    /// - It is adjacent to a whitespace (left or right)
-    Boundary,
-    /// Draw whitespaces only after non-whitespace characters.
-    Trailing,
-}
-
-#[with_fallible_options]
-#[derive(Clone, Debug, Default, Serialize, Deserialize, JsonSchema, MergeFrom, PartialEq)]
-pub struct WhitespaceMapContent {
-    pub space: Option<char>,
-    pub tab: Option<char>,
-}
-
-/// The behavior of `editor::Rewrap`.
-#[derive(
-    Debug,
-    PartialEq,
-    Clone,
-    Copy,
-    Default,
-    Serialize,
-    Deserialize,
-    JsonSchema,
-    MergeFrom,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum RewrapBehavior {
-    /// Only rewrap within comments.
-    #[default]
-    InComments,
-    /// Only rewrap within the current selection(s).
-    InSelections,
-    /// Allow rewrapping anywhere.
-    Anywhere,
-}
-
-#[with_fallible_options]
-#[derive(Default, Debug, Clone, PartialEq, Eq, Serialize, Deserialize, JsonSchema, MergeFrom)]
-pub struct JsxTagAutoCloseSettingsContent {
-    /// Enables or disables auto-closing of JSX tags.
-    pub enabled: Option<bool>,
-}
-
-/// The settings for inlay hints.
-#[with_fallible_options]
-#[derive(Clone, Default, Debug, Serialize, Deserialize, JsonSchema, MergeFrom, PartialEq, Eq)]
-pub struct InlayHintSettingsContent {
-    /// Global switch to toggle hints on and off.
-    ///
-    /// Default: false
-    pub enabled: Option<bool>,
-    /// Global switch to toggle inline values on and off when debugging.
-    ///
-    /// Default: true
-    pub show_value_hints: Option<bool>,
-    /// Whether type hints should be shown.
-    ///
-    /// Default: true
-    pub show_type_hints: Option<bool>,
-    /// Whether parameter hints should be shown.
-    ///
-    /// Default: true
-    pub show_parameter_hints: Option<bool>,
-    /// Whether other hints should be shown.
-    ///
-    /// Default: true
-    pub show_other_hints: Option<bool>,
-    /// Whether to show a background for inlay hints.
-    ///
-    /// If set to `true`, the background will use the `hint.background` color
-    /// from the current theme.
-    ///
-    /// Default: false
-    pub show_background: Option<bool>,
-    /// Whether or not to debounce inlay hints updates after buffer edits.
-    ///
-    /// Set to 0 to disable debouncing.
-    ///
-    /// Default: 700
-    pub edit_debounce_ms: Option<u64>,
-    /// Whether or not to debounce inlay hints updates after buffer scrolls.
-    ///
-    /// Set to 0 to disable debouncing.
-    ///
-    /// Default: 50
-    pub scroll_debounce_ms: Option<u64>,
-    /// Toggles inlay hints (hides or shows) when the user presses the modifiers specified.
-    /// If only a subset of the modifiers specified is pressed, hints are not toggled.
-    /// If no modifiers are specified, this is equivalent to `null`.
-    ///
-    /// Default: null
-    pub toggle_on_modifiers_press: Option<Modifiers>,
-}
-
-/// The kind of an inlay hint.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub enum InlayHintKind {
-    /// An inlay hint for a type.
-    Type,
-    /// An inlay hint for a parameter.
-    Parameter,
-}
-
-impl InlayHintKind {
-    /// Returns the [`InlayHintKind`]fromthe given name.
-    ///
-    /// Returns `None` if `name` does not match any of the expected
-    /// string representations.
-    pub fn from_name(name: &str) -> Option<Self> {
-        match name {
-            "type" => Some(InlayHintKind::Type),
-            "parameter" => Some(InlayHintKind::Parameter),
-            _ => None,
-        }
-    }
-
-    /// Returns the name of this [`InlayHintKind`].
-    pub fn name(&self) -> &'static str {
-        match self {
-            InlayHintKind::Type => "type",
-            InlayHintKind::Parameter => "parameter",
-        }
-    }
-}
-
-/// Controls how completions are processed for this language.
-#[with_fallible_options]
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, JsonSchema, MergeFrom, Default)]
-#[serde(rename_all = "snake_case")]
-pub struct CompletionSettingsContent {
-    /// Controls how words are completed.
-    /// For large documents, not all words may be fetched for completion.
-    ///
-    /// Default: `fallback`
-    pub words: Option<WordsCompletionMode>,
-    /// How many characters has to be in the completions query to automatically show the words-based completions.
-    /// Before that value, it's still possible to trigger the words-based completion manually with the corresponding editor command.
-    ///
-    /// Default: 3
-    pub words_min_length: Option<u32>,
-    /// Whether to fetch LSP completions or not.
-    ///
-    /// Default: true
-    pub lsp: Option<bool>,
-    /// When fetching LSP completions, determines how long to wait for a response of a particular server.
-    /// When set to 0, waits indefinitely.
-    ///
-    /// Default: 0
-    pub lsp_fetch_timeout_ms: Option<u64>,
-    /// Controls how LSP completions are inserted.
-    ///
-    /// Default: "replace_suffix"
-    pub lsp_insert_mode: Option<LspInsertMode>,
-}
-
-#[derive(
-    Copy,
-    Clone,
-    Debug,
-    Serialize,
-    Deserialize,
-    PartialEq,
-    Eq,
-    JsonSchema,
-    MergeFrom,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum LspInsertMode {
-    /// Replaces text before the cursor, using the `insert` range described in the LSP specification.
-    Insert,
-    /// Replaces text before and after the cursor, using the `replace` range described in the LSP specification.
-    Replace,
-    /// Behaves like `"replace"` if the text that would be replaced is a subsequence of the completion text,
-    /// and like `"insert"` otherwise.
-    ReplaceSubsequence,
-    /// Behaves like `"replace"` if the text after the cursor is a suffix of the completion, and like
-    /// `"insert"` otherwise.
-    ReplaceSuffix,
-}
-
-/// Controls how document's words are completed.
-#[derive(
-    Copy,
-    Clone,
-    Debug,
-    Serialize,
-    Deserialize,
-    PartialEq,
-    Eq,
-    JsonSchema,
-    MergeFrom,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum WordsCompletionMode {
-    /// Always fetch document's words for completions along with LSP completions.
-    Enabled,
-    /// Only if LSP response errors or times out,
-    /// use document's words to show completions.
-    Fallback,
-    /// Never fetch or complete document's words for completions.
-    /// (Word-based completions can still be queried via a separate action)
-    Disabled,
-}
-
-/// Allows to enable/disable formatting with Prettier
-/// and configure default Prettier, used when no project-level Prettier installation is found.
-/// Prettier formatting is disabled by default.
-#[with_fallible_options]
-#[derive(Default, Debug, Clone, PartialEq, Eq, Serialize, Deserialize, JsonSchema, MergeFrom)]
-pub struct PrettierSettingsContent {
-    /// Enables or disables formatting with Prettier for a given language.
-    pub allowed: Option<bool>,
-
-    /// Forces Prettier integration to use a specific parser name when formatting files with the language.
-    pub parser: Option<String>,
-
-    /// Forces Prettier integration to use specific plugins when formatting files with the language.
-    /// The default Prettier will be installed with these plugins.
-    pub plugins: Option<HashSet<String>>,
-
-    /// Default Prettier options, in the format as in package.json section for Prettier.
-    /// If project installs Prettier via its package.json, these options will be ignored.
-    #[serde(flatten)]
-    pub options: Option<HashMap<String, serde_json::Value>>,
-}
-
-/// TODO: this should just be a bool
-/// Controls the behavior of formatting files when they are saved.
-#[derive(
-    Debug,
-    Clone,
-    Copy,
-    PartialEq,
-    Eq,
-    Serialize,
-    Deserialize,
-    JsonSchema,
-    MergeFrom,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "lowercase")]
-pub enum FormatOnSave {
-    /// Files should be formatted on save.
-    On,
-    /// Files should not be formatted on save.
-    Off,
-}
-
-/// Controls which formatters should be used when formatting code.
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq, JsonSchema, MergeFrom)]
-#[serde(untagged)]
-pub enum FormatterList {
-    Single(Formatter),
-    Vec(Vec<Formatter>),
-}
-
-impl Default for FormatterList {
-    fn default() -> Self {
-        Self::Single(Formatter::default())
-    }
-}
-
-impl AsRef<[Formatter]> for FormatterList {
-    fn as_ref(&self) -> &[Formatter] {
-        match &self {
-            Self::Single(single) => std::slice::from_ref(single),
-            Self::Vec(v) => v,
-        }
-    }
-}
-
-/// Controls which formatter should be used when formatting code. If there are multiple formatters, they are executed in the order of declaration.
-#[derive(Clone, Default, Debug, Serialize, Deserialize, PartialEq, Eq, JsonSchema, MergeFrom)]
-#[serde(rename_all = "snake_case")]
-pub enum Formatter {
-    /// Format files using Zed's Prettier integration (if applicable),
-    /// or falling back to formatting via language server.
-    #[default]
-    Auto,
-    /// Format code using Zed's Prettier integration.
-    Prettier,
-    /// Format code using an external command.
-    External {
-        /// The external program to run.
-        command: Arc<str>,
-        /// The arguments to pass to the program.
-        arguments: Option<Arc<[String]>>,
-    },
-    /// Files should be formatted using a code action executed by language servers.
-    CodeAction(String),
-    /// Format code using a language server.
-    #[serde(untagged)]
-    LanguageServer(LanguageServerFormatterSpecifier),
-}
-
-#[derive(Clone, Default, Debug, Serialize, Deserialize, PartialEq, Eq, JsonSchema, MergeFrom)]
-#[serde(
-    rename_all = "snake_case",
-    // allow specifying language servers as "language_server" or {"language_server": {"name": ...}}
-    from = "LanguageServerVariantContent",
-    into = "LanguageServerVariantContent"
-)]
-pub enum LanguageServerFormatterSpecifier {
-    Specific {
-        name: String,
-    },
-    #[default]
-    Current,
-}
-
-impl From<LanguageServerVariantContent> for LanguageServerFormatterSpecifier {
-    fn from(value: LanguageServerVariantContent) -> Self {
-        match value {
-            LanguageServerVariantContent::Specific {
-                language_server: LanguageServerSpecifierContent { name: Some(name) },
-            } => Self::Specific { name },
-            _ => Self::Current,
-        }
-    }
-}
-
-impl From<LanguageServerFormatterSpecifier> for LanguageServerVariantContent {
-    fn from(value: LanguageServerFormatterSpecifier) -> Self {
-        match value {
-            LanguageServerFormatterSpecifier::Specific { name } => Self::Specific {
-                language_server: LanguageServerSpecifierContent { name: Some(name) },
-            },
-            LanguageServerFormatterSpecifier::Current => {
-                Self::Current(CurrentLanguageServerContent::LanguageServer)
-            }
-        }
-    }
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq, JsonSchema, MergeFrom)]
-#[serde(rename_all = "snake_case", untagged)]
-enum LanguageServerVariantContent {
-    /// Format code using a specific language server.
-    Specific {
-        language_server: LanguageServerSpecifierContent,
-    },
-    /// Format code using the current language server.
-    Current(CurrentLanguageServerContent),
-}
-
-#[derive(Clone, Default, Debug, Serialize, Deserialize, PartialEq, Eq, JsonSchema, MergeFrom)]
-#[serde(rename_all = "snake_case")]
-enum CurrentLanguageServerContent {
-    #[default]
-    LanguageServer,
-}
-
-#[derive(Clone, Default, Debug, Serialize, Deserialize, PartialEq, Eq, JsonSchema, MergeFrom)]
-#[serde(rename_all = "snake_case")]
-struct LanguageServerSpecifierContent {
-    /// The name of the language server to format with
-    name: Option<String>,
-}
-
-/// The settings for indent guides.
-#[with_fallible_options]
-#[derive(Default, Debug, Clone, PartialEq, Eq, Serialize, Deserialize, JsonSchema, MergeFrom)]
-pub struct IndentGuideSettingsContent {
-    /// Whether to display indent guides in the editor.
-    ///
-    /// Default: true
-    pub enabled: Option<bool>,
-    /// The width of the indent guides in pixels, between 1 and 10.
-    ///
-    /// Default: 1
-    pub line_width: Option<u32>,
-    /// The width of the active indent guide in pixels, between 1 and 10.
-    ///
-    /// Default: 1
-    pub active_line_width: Option<u32>,
-    /// Determines how indent guides are colored.
-    ///
-    /// Default: Fixed
-    pub coloring: Option<IndentGuideColoring>,
-    /// Determines how indent guide backgrounds are colored.
-    ///
-    /// Default: Disabled
-    pub background_coloring: Option<IndentGuideBackgroundColoring>,
-}
-
-/// The task settings for a particular language.
-#[with_fallible_options]
-#[derive(Debug, Clone, Default, Deserialize, PartialEq, Serialize, JsonSchema, MergeFrom)]
-pub struct LanguageTaskSettingsContent {
-    /// Extra task variables to set for a particular language.
-    pub variables: Option<HashMap<String, String>>,
-    pub enabled: Option<bool>,
-    /// Use LSP tasks over Zed language extension ones.
-    /// If no LSP tasks are returned due to error/timeout or regular execution,
-    /// Zed language extension tasks will be used instead.
-    ///
-    /// Other Zed tasks will still be shown:
-    /// * Zed task from either of the task config file
-    /// * Zed task from history (e.g. one-off task was spawned before)
-    pub prefer_lsp: Option<bool>,
-}
-
-/// Map from language name to settings.
-#[with_fallible_options]
-#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize, JsonSchema, MergeFrom)]
-pub struct LanguageToSettingsMap(pub HashMap<SharedString, LanguageSettingsContent>);
-
-/// Determines how indent guides are colored.
-#[derive(
-    Default,
-    Debug,
-    Copy,
-    Clone,
-    PartialEq,
-    Eq,
-    Serialize,
-    Deserialize,
-    JsonSchema,
-    MergeFrom,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum IndentGuideColoring {
-    /// Do not render any lines for indent guides.
-    Disabled,
-    /// Use the same color for all indentation levels.
-    #[default]
-    Fixed,
-    /// Use a different color for each indentation level.
-    IndentAware,
-}
-
-/// Determines how indent guide backgrounds are colored.
-#[derive(
-    Default,
-    Debug,
-    Copy,
-    Clone,
-    PartialEq,
-    Eq,
-    Serialize,
-    Deserialize,
-    JsonSchema,
-    MergeFrom,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum IndentGuideBackgroundColoring {
-    /// Do not render any background for indent guides.
-    #[default]
-    Disabled,
-    /// Use a different color for each indentation level.
-    IndentAware,
-}
-
-#[cfg(test)]
-mod test {
-
-    use crate::{ParseStatus, fallible_options};
-
-    use super::*;
-
-    #[test]
-    fn test_formatter_deserialization() {
-        let raw_auto = "{\"formatter\": \"auto\"}";
-        let settings: LanguageSettingsContent = serde_json::from_str(raw_auto).unwrap();
-        assert_eq!(
-            settings.formatter,
-            Some(FormatterList::Single(Formatter::Auto))
-        );
-        let raw = "{\"formatter\": \"language_server\"}";
-        let settings: LanguageSettingsContent = serde_json::from_str(raw).unwrap();
-        assert_eq!(
-            settings.formatter,
-            Some(FormatterList::Single(Formatter::LanguageServer(
-                LanguageServerFormatterSpecifier::Current
-            )))
-        );
-
-        let raw = "{\"formatter\": [{\"language_server\": {\"name\": null}}]}";
-        let settings: LanguageSettingsContent = serde_json::from_str(raw).unwrap();
-        assert_eq!(
-            settings.formatter,
-            Some(FormatterList::Vec(vec![Formatter::LanguageServer(
-                LanguageServerFormatterSpecifier::Current
-            )]))
-        );
-        let raw = "{\"formatter\": [{\"language_server\": {\"name\": null}}, \"language_server\", \"prettier\"]}";
-        let settings: LanguageSettingsContent = serde_json::from_str(raw).unwrap();
-        assert_eq!(
-            settings.formatter,
-            Some(FormatterList::Vec(vec![
-                Formatter::LanguageServer(LanguageServerFormatterSpecifier::Current),
-                Formatter::LanguageServer(LanguageServerFormatterSpecifier::Current),
-                Formatter::Prettier
-            ]))
-        );
-
-        let raw = "{\"formatter\": [{\"language_server\": {\"name\": \"ruff\"}}, \"prettier\"]}";
-        let settings: LanguageSettingsContent = serde_json::from_str(raw).unwrap();
-        assert_eq!(
-            settings.formatter,
-            Some(FormatterList::Vec(vec![
-                Formatter::LanguageServer(LanguageServerFormatterSpecifier::Specific {
-                    name: "ruff".to_string()
-                }),
-                Formatter::Prettier
-            ]))
-        );
-
-        assert_eq!(
-            serde_json::to_string(&LanguageServerFormatterSpecifier::Current).unwrap(),
-            "\"language_server\"",
-        );
-    }
-
-    #[test]
-    fn test_formatter_deserialization_invalid() {
-        let raw_auto = "{\"formatter\": {}}";
-        let (_, result) = fallible_options::parse_json::<LanguageSettingsContent>(raw_auto);
-        assert!(matches!(result, ParseStatus::Failed { .. }));
-    }
-
-    #[test]
-    fn test_prettier_options() {
-        let raw_prettier = r#"{"allowed": false, "tabWidth": 4, "semi": false}"#;
-        let result = serde_json::from_str::<PrettierSettingsContent>(raw_prettier)
-            .expect("Failed to parse prettier options");
-        assert!(
-            result
-                .options
-                .as_ref()
-                .expect("options were flattened")
-                .contains_key("semi")
-        );
-        assert!(
-            result
-                .options
-                .as_ref()
-                .expect("options were flattened")
-                .contains_key("tabWidth")
-        );
-    }
-}
diff --git a/crates/settings/src/settings_content/language_model.rs b/crates/settings/src/settings_content/language_model.rs
deleted file mode 100644
index 48f5a463a4..0000000000
--- a/crates/settings/src/settings_content/language_model.rs
+++ /dev/null
@@ -1,423 +0,0 @@
-use collections::HashMap;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use settings_macros::{MergeFrom, with_fallible_options};
-
-use std::sync::Arc;
-
-#[with_fallible_options]
-#[derive(Default, Clone, Debug, Serialize, Deserialize, PartialEq, JsonSchema, MergeFrom)]
-pub struct AllLanguageModelSettingsContent {
-    pub anthropic: Option<AnthropicSettingsContent>,
-    pub bedrock: Option<AmazonBedrockSettingsContent>,
-    pub deepseek: Option<DeepseekSettingsContent>,
-    pub google: Option<GoogleSettingsContent>,
-    pub lmstudio: Option<LmStudioSettingsContent>,
-    pub mistral: Option<MistralSettingsContent>,
-    pub ollama: Option<OllamaSettingsContent>,
-    pub open_router: Option<OpenRouterSettingsContent>,
-    pub openai: Option<OpenAiSettingsContent>,
-    pub openai_compatible: Option<HashMap<Arc<str>, OpenAiCompatibleSettingsContent>>,
-    pub vercel: Option<VercelSettingsContent>,
-    pub x_ai: Option<XAiSettingsContent>,
-    #[serde(rename = "zed.dev")]
-    pub zed_dot_dev: Option<ZedDotDevSettingsContent>,
-}
-
-#[with_fallible_options]
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, JsonSchema, MergeFrom)]
-pub struct AnthropicSettingsContent {
-    pub api_url: Option<String>,
-    pub available_models: Option<Vec<AnthropicAvailableModel>>,
-}
-
-#[with_fallible_options]
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, JsonSchema, MergeFrom)]
-pub struct AnthropicAvailableModel {
-    /// The model's name in the Anthropic API. e.g. claude-3-5-sonnet-latest, claude-3-opus-20240229, etc
-    pub name: String,
-    /// The model's name in Zed's UI, such as in the model selector dropdown menu in the assistant panel.
-    pub display_name: Option<String>,
-    /// The model's context window size.
-    pub max_tokens: u64,
-    /// A model `name` to substitute when calling tools, in case the primary model doesn't support tool calling.
-    pub tool_override: Option<String>,
-    /// Configuration of Anthropic's caching API.
-    pub cache_configuration: Option<LanguageModelCacheConfiguration>,
-    pub max_output_tokens: Option<u64>,
-    #[serde(serialize_with = "crate::serialize_optional_f32_with_two_decimal_places")]
-    pub default_temperature: Option<f32>,
-    #[serde(default)]
-    pub extra_beta_headers: Vec<String>,
-    /// The model's mode (e.g. thinking)
-    pub mode: Option<ModelMode>,
-}
-
-#[with_fallible_options]
-#[derive(Default, Clone, Debug, Serialize, Deserialize, PartialEq, JsonSchema, MergeFrom)]
-pub struct AmazonBedrockSettingsContent {
-    pub available_models: Option<Vec<BedrockAvailableModel>>,
-    pub endpoint_url: Option<String>,
-    pub region: Option<String>,
-    pub profile: Option<String>,
-    pub authentication_method: Option<BedrockAuthMethodContent>,
-    pub allow_global: Option<bool>,
-}
-
-#[with_fallible_options]
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, JsonSchema, MergeFrom)]
-pub struct BedrockAvailableModel {
-    pub name: String,
-    pub display_name: Option<String>,
-    pub max_tokens: u64,
-    pub cache_configuration: Option<LanguageModelCacheConfiguration>,
-    pub max_output_tokens: Option<u64>,
-    #[serde(serialize_with = "crate::serialize_optional_f32_with_two_decimal_places")]
-    pub default_temperature: Option<f32>,
-    pub mode: Option<ModelMode>,
-}
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, JsonSchema, MergeFrom)]
-pub enum BedrockAuthMethodContent {
-    #[serde(rename = "named_profile")]
-    NamedProfile,
-    #[serde(rename = "sso")]
-    SingleSignOn,
-    /// IMDSv2, PodIdentity, env vars, etc.
-    #[serde(rename = "default")]
-    Automatic,
-}
-
-#[with_fallible_options]
-#[derive(Default, Clone, Debug, Serialize, Deserialize, PartialEq, JsonSchema, MergeFrom)]
-pub struct OllamaSettingsContent {
-    pub api_url: Option<String>,
-    pub available_models: Option<Vec<OllamaAvailableModel>>,
-}
-
-#[with_fallible_options]
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, JsonSchema, MergeFrom)]
-pub struct OllamaAvailableModel {
-    /// The model name in the Ollama API (e.g. "llama3.2:latest")
-    pub name: String,
-    /// The model's name in Zed's UI, such as in the model selector dropdown menu in the assistant panel.
-    pub display_name: Option<String>,
-    /// The Context Length parameter to the model (aka num_ctx or n_ctx)
-    pub max_tokens: u64,
-    /// The number of seconds to keep the connection open after the last request
-    pub keep_alive: Option<KeepAlive>,
-    /// Whether the model supports tools
-    pub supports_tools: Option<bool>,
-    /// Whether the model supports vision
-    pub supports_images: Option<bool>,
-    /// Whether to enable think mode
-    pub supports_thinking: Option<bool>,
-}
-
-#[derive(Clone, Serialize, Deserialize, Debug, Eq, PartialEq, JsonSchema, MergeFrom)]
-#[serde(untagged)]
-pub enum KeepAlive {
-    /// Keep model alive for N seconds
-    Seconds(isize),
-    /// Keep model alive for a fixed duration. Accepts durations like "5m", "10m", "1h", "1d", etc.
-    Duration(String),
-}
-
-impl KeepAlive {
-    /// Keep model alive until a new model is loaded or until Ollama shuts down
-    pub fn indefinite() -> Self {
-        Self::Seconds(-1)
-    }
-}
-
-impl Default for KeepAlive {
-    fn default() -> Self {
-        Self::indefinite()
-    }
-}
-
-#[with_fallible_options]
-#[derive(Default, Clone, Debug, Serialize, Deserialize, PartialEq, JsonSchema, MergeFrom)]
-pub struct LmStudioSettingsContent {
-    pub api_url: Option<String>,
-    pub available_models: Option<Vec<LmStudioAvailableModel>>,
-}
-
-#[with_fallible_options]
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, JsonSchema, MergeFrom)]
-pub struct LmStudioAvailableModel {
-    pub name: String,
-    pub display_name: Option<String>,
-    pub max_tokens: u64,
-    pub supports_tool_calls: bool,
-    pub supports_images: bool,
-}
-
-#[with_fallible_options]
-#[derive(Default, Clone, Debug, Serialize, Deserialize, PartialEq, JsonSchema, MergeFrom)]
-pub struct DeepseekSettingsContent {
-    pub api_url: Option<String>,
-    pub available_models: Option<Vec<DeepseekAvailableModel>>,
-}
-
-#[with_fallible_options]
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, JsonSchema, MergeFrom)]
-pub struct DeepseekAvailableModel {
-    pub name: String,
-    pub display_name: Option<String>,
-    pub max_tokens: u64,
-    pub max_output_tokens: Option<u64>,
-}
-
-#[with_fallible_options]
-#[derive(Default, Clone, Debug, Serialize, Deserialize, PartialEq, JsonSchema, MergeFrom)]
-pub struct MistralSettingsContent {
-    pub api_url: Option<String>,
-    pub available_models: Option<Vec<MistralAvailableModel>>,
-}
-
-#[with_fallible_options]
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, JsonSchema, MergeFrom)]
-pub struct MistralAvailableModel {
-    pub name: String,
-    pub display_name: Option<String>,
-    pub max_tokens: u64,
-    pub max_output_tokens: Option<u64>,
-    pub max_completion_tokens: Option<u64>,
-    pub supports_tools: Option<bool>,
-    pub supports_images: Option<bool>,
-    pub supports_thinking: Option<bool>,
-}
-
-#[with_fallible_options]
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, JsonSchema, MergeFrom)]
-pub struct OpenAiSettingsContent {
-    pub api_url: Option<String>,
-    pub available_models: Option<Vec<OpenAiAvailableModel>>,
-}
-
-#[with_fallible_options]
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, JsonSchema, MergeFrom)]
-pub struct OpenAiAvailableModel {
-    pub name: String,
-    pub display_name: Option<String>,
-    pub max_tokens: u64,
-    pub max_output_tokens: Option<u64>,
-    pub max_completion_tokens: Option<u64>,
-    pub reasoning_effort: Option<OpenAiReasoningEffort>,
-}
-
-#[derive(Debug, Serialize, Deserialize, PartialEq, Clone, JsonSchema, MergeFrom)]
-#[serde(rename_all = "lowercase")]
-pub enum OpenAiReasoningEffort {
-    Minimal,
-    Low,
-    Medium,
-    High,
-}
-
-#[with_fallible_options]
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, JsonSchema, MergeFrom)]
-pub struct OpenAiCompatibleSettingsContent {
-    pub api_url: String,
-    pub available_models: Vec<OpenAiCompatibleAvailableModel>,
-}
-
-#[with_fallible_options]
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, JsonSchema, MergeFrom)]
-pub struct OpenAiCompatibleAvailableModel {
-    pub name: String,
-    pub display_name: Option<String>,
-    pub max_tokens: u64,
-    pub max_output_tokens: Option<u64>,
-    pub max_completion_tokens: Option<u64>,
-    #[serde(default)]
-    pub capabilities: OpenAiCompatibleModelCapabilities,
-}
-
-#[with_fallible_options]
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, JsonSchema, MergeFrom)]
-pub struct OpenAiCompatibleModelCapabilities {
-    pub tools: bool,
-    pub images: bool,
-    pub parallel_tool_calls: bool,
-    pub prompt_cache_key: bool,
-}
-
-impl Default for OpenAiCompatibleModelCapabilities {
-    fn default() -> Self {
-        Self {
-            tools: true,
-            images: false,
-            parallel_tool_calls: false,
-            prompt_cache_key: false,
-        }
-    }
-}
-
-#[with_fallible_options]
-#[derive(Default, Clone, Debug, Serialize, Deserialize, PartialEq, JsonSchema, MergeFrom)]
-pub struct VercelSettingsContent {
-    pub api_url: Option<String>,
-    pub available_models: Option<Vec<VercelAvailableModel>>,
-}
-
-#[with_fallible_options]
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, JsonSchema, MergeFrom)]
-pub struct VercelAvailableModel {
-    pub name: String,
-    pub display_name: Option<String>,
-    pub max_tokens: u64,
-    pub max_output_tokens: Option<u64>,
-    pub max_completion_tokens: Option<u64>,
-}
-
-#[with_fallible_options]
-#[derive(Default, Clone, Debug, Serialize, Deserialize, PartialEq, JsonSchema, MergeFrom)]
-pub struct GoogleSettingsContent {
-    pub api_url: Option<String>,
-    pub available_models: Option<Vec<GoogleAvailableModel>>,
-}
-
-#[with_fallible_options]
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, JsonSchema, MergeFrom)]
-pub struct GoogleAvailableModel {
-    pub name: String,
-    pub display_name: Option<String>,
-    pub max_tokens: u64,
-    pub mode: Option<ModelMode>,
-}
-
-#[with_fallible_options]
-#[derive(Default, Clone, Debug, Serialize, Deserialize, PartialEq, JsonSchema, MergeFrom)]
-pub struct XAiSettingsContent {
-    pub api_url: Option<String>,
-    pub available_models: Option<Vec<XaiAvailableModel>>,
-}
-
-#[with_fallible_options]
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, JsonSchema, MergeFrom)]
-pub struct XaiAvailableModel {
-    pub name: String,
-    pub display_name: Option<String>,
-    pub max_tokens: u64,
-    pub max_output_tokens: Option<u64>,
-    pub max_completion_tokens: Option<u64>,
-    pub supports_images: Option<bool>,
-    pub supports_tools: Option<bool>,
-    pub parallel_tool_calls: Option<bool>,
-}
-
-#[with_fallible_options]
-#[derive(Default, Clone, Debug, Serialize, Deserialize, PartialEq, JsonSchema, MergeFrom)]
-pub struct ZedDotDevSettingsContent {
-    pub available_models: Option<Vec<ZedDotDevAvailableModel>>,
-}
-
-#[with_fallible_options]
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, JsonSchema, MergeFrom)]
-pub struct ZedDotDevAvailableModel {
-    /// The provider of the language model.
-    pub provider: ZedDotDevAvailableProvider,
-    /// The model's name in the provider's API. e.g. claude-3-5-sonnet-20240620
-    pub name: String,
-    /// The name displayed in the UI, such as in the assistant panel model dropdown menu.
-    pub display_name: Option<String>,
-    /// The size of the context window, indicating the maximum number of tokens the model can process.
-    pub max_tokens: usize,
-    /// The maximum number of output tokens allowed by the model.
-    pub max_output_tokens: Option<u64>,
-    /// The maximum number of completion tokens allowed by the model (o1-* only)
-    pub max_completion_tokens: Option<u64>,
-    /// Override this model with a different Anthropic model for tool calls.
-    pub tool_override: Option<String>,
-    /// Indicates whether this custom model supports caching.
-    pub cache_configuration: Option<LanguageModelCacheConfiguration>,
-    /// The default temperature to use for this model.
-    #[serde(serialize_with = "crate::serialize_optional_f32_with_two_decimal_places")]
-    pub default_temperature: Option<f32>,
-    /// Any extra beta headers to provide when using the model.
-    #[serde(default)]
-    pub extra_beta_headers: Vec<String>,
-    /// The model's mode (e.g. thinking)
-    pub mode: Option<ModelMode>,
-}
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, JsonSchema, MergeFrom)]
-#[serde(rename_all = "lowercase")]
-pub enum ZedDotDevAvailableProvider {
-    Anthropic,
-    OpenAi,
-    Google,
-}
-
-#[with_fallible_options]
-#[derive(Default, Clone, Debug, Serialize, Deserialize, PartialEq, JsonSchema, MergeFrom)]
-pub struct OpenRouterSettingsContent {
-    pub api_url: Option<String>,
-    pub available_models: Option<Vec<OpenRouterAvailableModel>>,
-}
-
-#[with_fallible_options]
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, JsonSchema, MergeFrom)]
-pub struct OpenRouterAvailableModel {
-    pub name: String,
-    pub display_name: Option<String>,
-    pub max_tokens: u64,
-    pub max_output_tokens: Option<u64>,
-    pub max_completion_tokens: Option<u64>,
-    pub supports_tools: Option<bool>,
-    pub supports_images: Option<bool>,
-    pub mode: Option<ModelMode>,
-    pub provider: Option<OpenRouterProvider>,
-}
-
-#[with_fallible_options]
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, JsonSchema, MergeFrom)]
-pub struct OpenRouterProvider {
-    order: Option<Vec<String>>,
-    #[serde(default = "default_true")]
-    allow_fallbacks: bool,
-    #[serde(default)]
-    require_parameters: bool,
-    #[serde(default)]
-    data_collection: DataCollection,
-    only: Option<Vec<String>>,
-    ignore: Option<Vec<String>>,
-    quantizations: Option<Vec<String>>,
-    sort: Option<String>,
-}
-
-#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize, JsonSchema, MergeFrom)]
-#[serde(rename_all = "lowercase")]
-pub enum DataCollection {
-    #[default]
-    Allow,
-    Disallow,
-}
-
-fn default_true() -> bool {
-    true
-}
-
-/// Configuration for caching language model messages.
-#[with_fallible_options]
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, JsonSchema, MergeFrom)]
-pub struct LanguageModelCacheConfiguration {
-    pub max_cache_anchors: usize,
-    pub should_speculate: bool,
-    pub min_total_token: u64,
-}
-
-#[derive(
-    Copy, Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, JsonSchema, MergeFrom,
-)]
-#[serde(tag = "type", rename_all = "lowercase")]
-pub enum ModelMode {
-    #[default]
-    Default,
-    Thinking {
-        /// The maximum number of tokens to use for reasoning. Must be lower than the model's `max_output_tokens`.
-        budget_tokens: Option<u32>,
-    },
-}
diff --git a/crates/settings/src/settings_content/project.rs b/crates/settings/src/settings_content/project.rs
deleted file mode 100644
index 5cd708694d..0000000000
--- a/crates/settings/src/settings_content/project.rs
+++ /dev/null
@@ -1,565 +0,0 @@
-use std::{path::PathBuf, sync::Arc};
-
-use collections::{BTreeMap, HashMap};
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use settings_macros::{MergeFrom, with_fallible_options};
-use util::serde::default_true;
-
-use crate::{
-    AllLanguageSettingsContent, DelayMs, ExtendingVec, ProjectTerminalSettingsContent,
-    SlashCommandSettings,
-};
-
-#[with_fallible_options]
-#[derive(Debug, PartialEq, Clone, Default, Serialize, Deserialize, JsonSchema, MergeFrom)]
-pub struct ProjectSettingsContent {
-    #[serde(flatten)]
-    pub all_languages: AllLanguageSettingsContent,
-
-    #[serde(flatten)]
-    pub worktree: WorktreeSettingsContent,
-
-    /// Configuration for language servers.
-    ///
-    /// The following settings can be overridden for specific language servers:
-    /// - initialization_options
-    ///
-    /// To override settings for a language, add an entry for that language server's
-    /// name to the lsp value.
-    /// Default: null
-    #[serde(default)]
-    pub lsp: HashMap<Arc<str>, LspSettings>,
-
-    pub terminal: Option<ProjectTerminalSettingsContent>,
-
-    /// Configuration for Debugger-related features
-    #[serde(default)]
-    pub dap: HashMap<Arc<str>, DapSettingsContent>,
-
-    /// Settings for context servers used for AI-related features.
-    #[serde(default)]
-    pub context_servers: HashMap<Arc<str>, ContextServerSettingsContent>,
-
-    /// Configuration for how direnv configuration should be loaded
-    pub load_direnv: Option<DirenvSettings>,
-
-    /// Settings for slash commands.
-    pub slash_commands: Option<SlashCommandSettings>,
-
-    /// The list of custom Git hosting providers.
-    pub git_hosting_providers: Option<ExtendingVec<GitHostingProviderConfig>>,
-}
-
-#[with_fallible_options]
-#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize, JsonSchema, MergeFrom)]
-pub struct WorktreeSettingsContent {
-    /// The displayed name of this project. If not set or null, the root directory name
-    /// will be displayed.
-    ///
-    /// Default: null
-    pub project_name: Option<String>,
-
-    /// Whether to prevent this project from being shared in public channels.
-    ///
-    /// Default: false
-    #[serde(default)]
-    pub prevent_sharing_in_public_channels: bool,
-
-    /// Completely ignore files matching globs from `file_scan_exclusions`. Overrides
-    /// `file_scan_inclusions`.
-    ///
-    /// Default: [
-    ///   "**/.git",
-    ///   "**/.svn",
-    ///   "**/.hg",
-    ///   "**/.jj",
-    ///   "**/CVS",
-    ///   "**/.DS_Store",
-    ///   "**/Thumbs.db",
-    ///   "**/.classpath",
-    ///   "**/.settings"
-    /// ]
-    pub file_scan_exclusions: Option<Vec<String>>,
-
-    /// Always include files that match these globs when scanning for files, even if they're
-    /// ignored by git. This setting is overridden by `file_scan_exclusions`.
-    /// Default: [
-    ///  ".env*",
-    ///  "docker-compose.*.yml",
-    /// ]
-    pub file_scan_inclusions: Option<Vec<String>>,
-
-    /// Treat the files matching these globs as `.env` files.
-    /// Default: ["**/.env*", "**/*.pem", "**/*.key", "**/*.cert", "**/*.crt", "**/secrets.yml"]
-    pub private_files: Option<ExtendingVec<String>>,
-
-    /// Treat the files matching these globs as hidden files. You can hide hidden files in the project panel.
-    /// Default: ["**/.*"]
-    pub hidden_files: Option<Vec<String>>,
-}
-
-#[with_fallible_options]
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq, JsonSchema, MergeFrom, Hash)]
-#[serde(rename_all = "snake_case")]
-pub struct LspSettings {
-    pub binary: Option<BinarySettings>,
-    /// Options passed to the language server at startup.
-    ///
-    /// Ref: https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#initialize
-    ///
-    /// Consult the documentation for the specific language server to see which settings are supported.
-    pub initialization_options: Option<serde_json::Value>,
-    /// Language server settings.
-    ///
-    /// Ref: https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#workspace_configuration
-    ///
-    /// Consult the documentation for the specific language server to see which settings are supported.
-    pub settings: Option<serde_json::Value>,
-    /// If the server supports sending tasks over LSP extensions,
-    /// this setting can be used to enable or disable them in Zed.
-    /// Default: true
-    #[serde(default = "default_true")]
-    pub enable_lsp_tasks: bool,
-    pub fetch: Option<FetchSettings>,
-}
-
-impl Default for LspSettings {
-    fn default() -> Self {
-        Self {
-            binary: None,
-            initialization_options: None,
-            settings: None,
-            enable_lsp_tasks: true,
-            fetch: None,
-        }
-    }
-}
-
-#[with_fallible_options]
-#[derive(
-    Clone, Debug, Default, Serialize, Deserialize, PartialEq, Eq, JsonSchema, MergeFrom, Hash,
-)]
-pub struct BinarySettings {
-    pub path: Option<String>,
-    pub arguments: Option<Vec<String>>,
-    pub env: Option<BTreeMap<String, String>>,
-    pub ignore_system_version: Option<bool>,
-}
-
-#[with_fallible_options]
-#[derive(
-    Clone, Debug, Default, Serialize, Deserialize, PartialEq, Eq, JsonSchema, MergeFrom, Hash,
-)]
-pub struct FetchSettings {
-    // Whether to consider pre-releases for fetching
-    pub pre_release: Option<bool>,
-}
-
-/// Common language server settings.
-#[with_fallible_options]
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, JsonSchema, MergeFrom)]
-pub struct GlobalLspSettingsContent {
-    /// Whether to show the LSP servers button in the status bar.
-    ///
-    /// Default: `true`
-    pub button: Option<bool>,
-}
-
-#[with_fallible_options]
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize, JsonSchema, MergeFrom)]
-#[serde(rename_all = "snake_case")]
-pub struct DapSettingsContent {
-    pub binary: Option<String>,
-    pub args: Option<Vec<String>>,
-    pub env: Option<HashMap<String, String>>,
-}
-
-#[with_fallible_options]
-#[derive(
-    Default, Copy, Clone, PartialEq, Eq, Debug, Serialize, Deserialize, JsonSchema, MergeFrom,
-)]
-pub struct SessionSettingsContent {
-    /// Whether or not to restore unsaved buffers on restart.
-    ///
-    /// If this is true, user won't be prompted whether to save/discard
-    /// dirty files when closing the application.
-    ///
-    /// Default: true
-    pub restore_unsaved_buffers: Option<bool>,
-}
-
-#[derive(Deserialize, Serialize, Clone, PartialEq, Eq, JsonSchema, MergeFrom, Debug)]
-#[serde(untagged, rename_all = "snake_case")]
-pub enum ContextServerSettingsContent {
-    Stdio {
-        /// Whether the context server is enabled.
-        #[serde(default = "default_true")]
-        enabled: bool,
-
-        #[serde(flatten)]
-        command: ContextServerCommand,
-    },
-    Http {
-        /// Whether the context server is enabled.
-        #[serde(default = "default_true")]
-        enabled: bool,
-        /// The URL of the remote context server.
-        url: String,
-        /// Optional headers to send.
-        #[serde(skip_serializing_if = "HashMap::is_empty", default)]
-        headers: HashMap<String, String>,
-    },
-    Extension {
-        /// Whether the context server is enabled.
-        #[serde(default = "default_true")]
-        enabled: bool,
-        /// The settings for this context server specified by the extension.
-        ///
-        /// Consult the documentation for the context server to see what settings
-        /// are supported.
-        settings: serde_json::Value,
-    },
-}
-
-impl ContextServerSettingsContent {
-    pub fn set_enabled(&mut self, enabled: bool) {
-        match self {
-            ContextServerSettingsContent::Stdio {
-                enabled: custom_enabled,
-                ..
-            } => {
-                *custom_enabled = enabled;
-            }
-            ContextServerSettingsContent::Extension {
-                enabled: ext_enabled,
-                ..
-            } => *ext_enabled = enabled,
-            ContextServerSettingsContent::Http {
-                enabled: remote_enabled,
-                ..
-            } => *remote_enabled = enabled,
-        }
-    }
-}
-
-#[with_fallible_options]
-#[derive(Deserialize, Serialize, Clone, PartialEq, Eq, JsonSchema, MergeFrom)]
-pub struct ContextServerCommand {
-    #[serde(rename = "command")]
-    pub path: PathBuf,
-    pub args: Vec<String>,
-    pub env: Option<HashMap<String, String>>,
-    /// Timeout for tool calls in milliseconds. Defaults to 60000 (60 seconds) if not specified.
-    pub timeout: Option<u64>,
-}
-
-impl std::fmt::Debug for ContextServerCommand {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let filtered_env = self.env.as_ref().map(|env| {
-            env.iter()
-                .map(|(k, v)| {
-                    (
-                        k,
-                        if util::redact::should_redact(k) {
-                            "[REDACTED]"
-                        } else {
-                            v
-                        },
-                    )
-                })
-                .collect::<Vec<_>>()
-        });
-
-        f.debug_struct("ContextServerCommand")
-            .field("path", &self.path)
-            .field("args", &self.args)
-            .field("env", &filtered_env)
-            .finish()
-    }
-}
-
-#[with_fallible_options]
-#[derive(Copy, Clone, Debug, PartialEq, Default, Serialize, Deserialize, JsonSchema, MergeFrom)]
-pub struct GitSettings {
-    /// Whether or not to show the git gutter.
-    ///
-    /// Default: tracked_files
-    pub git_gutter: Option<GitGutterSetting>,
-    /// Sets the debounce threshold (in milliseconds) after which changes are reflected in the git gutter.
-    ///
-    /// Default: 0
-    pub gutter_debounce: Option<u64>,
-    /// Whether or not to show git blame data inline in
-    /// the currently focused line.
-    ///
-    /// Default: on
-    pub inline_blame: Option<InlineBlameSettings>,
-    /// Git blame settings.
-    pub blame: Option<BlameSettings>,
-    /// Which information to show in the branch picker.
-    ///
-    /// Default: on
-    pub branch_picker: Option<BranchPickerSettingsContent>,
-    /// How hunks are displayed visually in the editor.
-    ///
-    /// Default: staged_hollow
-    pub hunk_style: Option<GitHunkStyleSetting>,
-    /// How file paths are displayed in the git gutter.
-    ///
-    /// Default: file_name_first
-    pub path_style: Option<GitPathStyle>,
-}
-
-#[derive(
-    Clone,
-    Copy,
-    Debug,
-    PartialEq,
-    Default,
-    Serialize,
-    Deserialize,
-    JsonSchema,
-    MergeFrom,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum GitGutterSetting {
-    /// Show git gutter in tracked files.
-    #[default]
-    TrackedFiles,
-    /// Hide git gutter
-    Hide,
-}
-
-#[with_fallible_options]
-#[derive(Clone, Copy, Debug, PartialEq, Default, Serialize, Deserialize, JsonSchema, MergeFrom)]
-#[serde(rename_all = "snake_case")]
-pub struct InlineBlameSettings {
-    /// Whether or not to show git blame data inline in
-    /// the currently focused line.
-    ///
-    /// Default: true
-    pub enabled: Option<bool>,
-    /// Whether to only show the inline blame information
-    /// after a delay once the cursor stops moving.
-    ///
-    /// Default: 0
-    pub delay_ms: Option<DelayMs>,
-    /// The amount of padding between the end of the source line and the start
-    /// of the inline blame in units of columns.
-    ///
-    /// Default: 7
-    pub padding: Option<u32>,
-    /// The minimum column number to show the inline blame information at
-    ///
-    /// Default: 0
-    pub min_column: Option<u32>,
-    /// Whether to show commit summary as part of the inline blame.
-    ///
-    /// Default: false
-    pub show_commit_summary: Option<bool>,
-}
-
-#[with_fallible_options]
-#[derive(Clone, Copy, Debug, PartialEq, Default, Serialize, Deserialize, JsonSchema, MergeFrom)]
-#[serde(rename_all = "snake_case")]
-pub struct BlameSettings {
-    /// Whether to show the avatar of the author of the commit.
-    ///
-    /// Default: true
-    pub show_avatar: Option<bool>,
-}
-
-#[with_fallible_options]
-#[derive(Clone, Copy, PartialEq, Debug, Default, Serialize, Deserialize, JsonSchema, MergeFrom)]
-#[serde(rename_all = "snake_case")]
-pub struct BranchPickerSettingsContent {
-    /// Whether to show author name as part of the commit information.
-    ///
-    /// Default: false
-    pub show_author_name: Option<bool>,
-}
-
-#[derive(
-    Clone,
-    Copy,
-    PartialEq,
-    Debug,
-    Default,
-    Serialize,
-    Deserialize,
-    JsonSchema,
-    MergeFrom,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum GitHunkStyleSetting {
-    /// Show unstaged hunks with a filled background and staged hunks hollow.
-    #[default]
-    StagedHollow,
-    /// Show unstaged hunks hollow and staged hunks with a filled background.
-    UnstagedHollow,
-}
-
-#[with_fallible_options]
-#[derive(
-    Copy,
-    Clone,
-    Debug,
-    PartialEq,
-    Default,
-    Serialize,
-    Deserialize,
-    JsonSchema,
-    MergeFrom,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum GitPathStyle {
-    /// Show file name first, then path
-    #[default]
-    FileNameFirst,
-    /// Show full path first
-    FilePathFirst,
-}
-
-#[with_fallible_options]
-#[derive(Clone, Debug, PartialEq, Eq, Default, Serialize, Deserialize, JsonSchema, MergeFrom)]
-pub struct DiagnosticsSettingsContent {
-    /// Whether to show the project diagnostics button in the status bar.
-    pub button: Option<bool>,
-
-    /// Whether or not to include warning diagnostics.
-    pub include_warnings: Option<bool>,
-
-    /// Settings for using LSP pull diagnostics mechanism in Zed.
-    pub lsp_pull_diagnostics: Option<LspPullDiagnosticsSettingsContent>,
-
-    /// Settings for showing inline diagnostics.
-    pub inline: Option<InlineDiagnosticsSettingsContent>,
-}
-
-#[with_fallible_options]
-#[derive(
-    Clone, Copy, Debug, Default, Serialize, Deserialize, JsonSchema, MergeFrom, PartialEq, Eq,
-)]
-pub struct LspPullDiagnosticsSettingsContent {
-    /// Whether to pull for diagnostics or not.
-    ///
-    /// Default: true
-    pub enabled: Option<bool>,
-    /// Minimum time to wait before pulling diagnostics from the language server(s).
-    /// 0 turns the debounce off.
-    ///
-    /// Default: 50
-    pub debounce_ms: Option<DelayMs>,
-}
-
-#[with_fallible_options]
-#[derive(
-    Clone, Copy, Debug, PartialEq, Default, Serialize, Deserialize, JsonSchema, MergeFrom, Eq,
-)]
-pub struct InlineDiagnosticsSettingsContent {
-    /// Whether or not to show inline diagnostics
-    ///
-    /// Default: false
-    pub enabled: Option<bool>,
-    /// Whether to only show the inline diagnostics after a delay after the
-    /// last editor event.
-    ///
-    /// Default: 150
-    pub update_debounce_ms: Option<DelayMs>,
-    /// The amount of padding between the end of the source line and the start
-    /// of the inline diagnostic in units of columns.
-    ///
-    /// Default: 4
-    pub padding: Option<u32>,
-    /// The minimum column to display inline diagnostics. This setting can be
-    /// used to horizontally align inline diagnostics at some position. Lines
-    /// longer than this value will still push diagnostics further to the right.
-    ///
-    /// Default: 0
-    pub min_column: Option<u32>,
-
-    pub max_severity: Option<DiagnosticSeverityContent>,
-}
-
-#[with_fallible_options]
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize, JsonSchema, MergeFrom)]
-pub struct NodeBinarySettings {
-    /// The path to the Node binary.
-    pub path: Option<String>,
-    /// The path to the npm binary Zed should use (defaults to `.path/../npm`).
-    pub npm_path: Option<String>,
-    /// If enabled, Zed will download its own copy of Node.
-    pub ignore_system_version: Option<bool>,
-}
-
-#[derive(Clone, PartialEq, Debug, Default, Serialize, Deserialize, JsonSchema, MergeFrom)]
-#[serde(rename_all = "snake_case")]
-pub enum DirenvSettings {
-    /// Load direnv configuration through a shell hook
-    ShellHook,
-    /// Load direnv configuration directly using `direnv export json`
-    #[default]
-    Direct,
-    /// Do not load direnv configuration
-    Disabled,
-}
-
-#[derive(
-    Clone,
-    Copy,
-    Debug,
-    Eq,
-    PartialEq,
-    Ord,
-    PartialOrd,
-    Serialize,
-    Deserialize,
-    JsonSchema,
-    MergeFrom,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum DiagnosticSeverityContent {
-    // No diagnostics are shown.
-    Off,
-    Error,
-    Warning,
-    Info,
-    Hint,
-    All,
-}
-
-/// A custom Git hosting provider.
-#[with_fallible_options]
-#[derive(Debug, PartialEq, Clone, Serialize, Deserialize, JsonSchema, MergeFrom)]
-pub struct GitHostingProviderConfig {
-    /// The type of the provider.
-    ///
-    /// Must be one of `github`, `gitlab`, `bitbucket`, `gitea`, `forgejo`, or `source_hut`.
-    pub provider: GitHostingProviderKind,
-
-    /// The base URL for the provider (e.g., "https://code.corp.big.com").
-    pub base_url: String,
-
-    /// The display name for the provider (e.g., "BigCorp GitHub").
-    pub name: String,
-}
-
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, JsonSchema, MergeFrom)]
-#[serde(rename_all = "snake_case")]
-pub enum GitHostingProviderKind {
-    Github,
-    Gitlab,
-    Bitbucket,
-    Gitea,
-    Forgejo,
-    SourceHut,
-}
diff --git a/crates/settings/src/settings_content/terminal.rs b/crates/settings/src/settings_content/terminal.rs
deleted file mode 100644
index 1a30eecaa1..0000000000
--- a/crates/settings/src/settings_content/terminal.rs
+++ /dev/null
@@ -1,517 +0,0 @@
-use std::path::PathBuf;
-
-use collections::HashMap;
-use gpui::{AbsoluteLength, FontFeatures, FontWeight, SharedString, px};
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use settings_macros::{MergeFrom, with_fallible_options};
-
-use crate::FontFamilyName;
-
-#[derive(Clone, Debug, PartialEq, Default, Serialize, Deserialize, JsonSchema, MergeFrom)]
-pub struct ProjectTerminalSettingsContent {
-    /// What shell to use when opening a terminal.
-    ///
-    /// Default: system
-    pub shell: Option<Shell>,
-    /// What working directory to use when launching the terminal
-    ///
-    /// Default: current_project_directory
-    pub working_directory: Option<WorkingDirectory>,
-    /// Any key-value pairs added to this list will be added to the terminal's
-    /// environment. Use `:` to separate multiple values.
-    ///
-    /// Default: {}
-    pub env: Option<HashMap<String, String>>,
-    /// Activates the python virtual environment, if one is found, in the
-    /// terminal's working directory (as resolved by the working_directory
-    /// setting). Set this to "off" to disable this behavior.
-    ///
-    /// Default: on
-    pub detect_venv: Option<VenvSettings>,
-    /// Regexes used to identify paths for hyperlink navigation.
-    ///
-    /// Default: [
-    ///   // Python-style diagnostics
-    ///   "File \"(?<path>[^\"]+)\", line (?<line>[0-9]+)",
-    ///   // Common path syntax with optional line, column, description, trailing punctuation, or
-    ///   // surrounding symbols or quotes
-    ///   [
-    ///     "(?x)",
-    ///     "# optionally starts with 0-2 opening prefix symbols",
-    ///     "[({\\[<]{0,2}",
-    ///     "# which may be followed by an opening quote",
-    ///     "(?<quote>[\"'`])?",
-    ///     "# `path` is the shortest sequence of any non-space character",
-    ///     "(?<link>(?<path>[^ ]+?",
-    ///     "    # which may end with a line and optionally a column,",
-    ///     "    (?<line_column>:+[0-9]+(:[0-9]+)?|:?\\([0-9]+([,:][0-9]+)?\\))?",
-    ///     "))",
-    ///     "# which must be followed by a matching quote",
-    ///     "(?(<quote>)\\k<quote>)",
-    ///     "# and optionally a single closing symbol",
-    ///     "[)}\\]>]?",
-    ///     "# if line/column matched, may be followed by a description",
-    ///     "(?(<line_column>):[^ 0-9][^ ]*)?",
-    ///     "# which may be followed by trailing punctuation",
-    ///     "[.,:)}\\]>]*",
-    ///     "# and always includes trailing whitespace or end of line",
-    ///     "([ ]+|$)"
-    ///   ]
-    /// ]
-    pub path_hyperlink_regexes: Option<Vec<PathHyperlinkRegex>>,
-    /// Timeout for hover and Cmd-click path hyperlink discovery in milliseconds.
-    ///
-    /// Default: 1
-    pub path_hyperlink_timeout_ms: Option<u64>,
-}
-
-#[with_fallible_options]
-#[derive(Clone, Debug, PartialEq, Default, Serialize, Deserialize, JsonSchema, MergeFrom)]
-pub struct TerminalSettingsContent {
-    #[serde(flatten)]
-    pub project: ProjectTerminalSettingsContent,
-    /// Sets the terminal's font size.
-    ///
-    /// If this option is not included,
-    /// the terminal will default to matching the buffer's font size.
-    #[serde(serialize_with = "crate::serialize_optional_f32_with_two_decimal_places")]
-    pub font_size: Option<f32>,
-    /// Sets the terminal's font family.
-    ///
-    /// If this option is not included,
-    /// the terminal will default to matching the buffer's font family.
-    pub font_family: Option<FontFamilyName>,
-
-    /// Sets the terminal's font fallbacks.
-    ///
-    /// If this option is not included,
-    /// the terminal will default to matching the buffer's font fallbacks.
-    #[schemars(extend("uniqueItems" = true))]
-    pub font_fallbacks: Option<Vec<FontFamilyName>>,
-
-    /// Sets the terminal's line height.
-    ///
-    /// Default: comfortable
-    pub line_height: Option<TerminalLineHeight>,
-    pub font_features: Option<FontFeatures>,
-    /// Sets the terminal's font weight in CSS weight units 0-900.
-    pub font_weight: Option<FontWeight>,
-    /// Default cursor shape for the terminal.
-    /// Can be "bar", "block", "underline", or "hollow".
-    ///
-    /// Default: "block"
-    pub cursor_shape: Option<CursorShapeContent>,
-    /// Sets the cursor blinking behavior in the terminal.
-    ///
-    /// Default: terminal_controlled
-    pub blinking: Option<TerminalBlink>,
-    /// Sets whether Alternate Scroll mode (code: ?1007) is active by default.
-    /// Alternate Scroll mode converts mouse scroll events into up / down key
-    /// presses when in the alternate screen (e.g. when running applications
-    /// like vim or  less). The terminal can still set and unset this mode.
-    ///
-    /// Default: on
-    pub alternate_scroll: Option<AlternateScroll>,
-    /// Sets whether the option key behaves as the meta key.
-    ///
-    /// Default: false
-    pub option_as_meta: Option<bool>,
-    /// Whether or not selecting text in the terminal will automatically
-    /// copy to the system clipboard.
-    ///
-    /// Default: false
-    pub copy_on_select: Option<bool>,
-    /// Whether to keep the text selection after copying it to the clipboard.
-    ///
-    /// Default: true
-    pub keep_selection_on_copy: Option<bool>,
-    /// Whether to show the terminal button in the status bar.
-    ///
-    /// Default: true
-    pub button: Option<bool>,
-    pub dock: Option<TerminalDockPosition>,
-    /// Default width when the terminal is docked to the left or right.
-    ///
-    /// Default: 640
-    #[serde(serialize_with = "crate::serialize_optional_f32_with_two_decimal_places")]
-    pub default_width: Option<f32>,
-    /// Default height when the terminal is docked to the bottom.
-    ///
-    /// Default: 320
-    #[serde(serialize_with = "crate::serialize_optional_f32_with_two_decimal_places")]
-    pub default_height: Option<f32>,
-    /// The maximum number of lines to keep in the scrollback history.
-    /// Maximum allowed value is 100_000, all values above that will be treated as 100_000.
-    /// 0 disables the scrolling.
-    /// Existing terminals will not pick up this change until they are recreated.
-    /// See <a href="https://github.com/alacritty/alacritty/blob/cb3a79dbf6472740daca8440d5166c1d4af5029e/extra/man/alacritty.5.scd?plain=1#L207-L213">Alacritty documentation</a> for more information.
-    ///
-    /// Default: 10_000
-    pub max_scroll_history_lines: Option<usize>,
-    /// The multiplier for scrolling with the mouse wheel.
-    ///
-    /// Default: 1.0
-    pub scroll_multiplier: Option<f32>,
-    /// Toolbar related settings
-    pub toolbar: Option<TerminalToolbarContent>,
-    /// Scrollbar-related settings
-    pub scrollbar: Option<ScrollbarSettingsContent>,
-    /// The minimum APCA perceptual contrast between foreground and background colors.
-    ///
-    /// APCA (Accessible Perceptual Contrast Algorithm) is more accurate than WCAG 2.x,
-    /// especially for dark mode. Values range from 0 to 106.
-    ///
-    /// Based on APCA Readability Criterion (ARC) Bronze Simple Mode:
-    /// https://readtech.org/ARC/tests/bronze-simple-mode/
-    /// - 0: No contrast adjustment
-    /// - 45: Minimum for large fluent text (36px+)
-    /// - 60: Minimum for other content text
-    /// - 75: Minimum for body text
-    /// - 90: Preferred for body text
-    ///
-    /// Default: 45
-    #[serde(serialize_with = "crate::serialize_optional_f32_with_two_decimal_places")]
-    pub minimum_contrast: Option<f32>,
-}
-
-/// Shell configuration to open the terminal with.
-#[derive(
-    Clone,
-    Debug,
-    Default,
-    Serialize,
-    Deserialize,
-    PartialEq,
-    Eq,
-    JsonSchema,
-    MergeFrom,
-    strum::EnumDiscriminants,
-)]
-#[strum_discriminants(derive(strum::VariantArray, strum::VariantNames, strum::FromRepr))]
-#[serde(rename_all = "snake_case")]
-pub enum Shell {
-    /// Use the system's default terminal configuration in /etc/passwd
-    #[default]
-    System,
-    /// Use a specific program with no arguments.
-    Program(String),
-    /// Use a specific program with arguments.
-    WithArguments {
-        /// The program to run.
-        program: String,
-        /// The arguments to pass to the program.
-        args: Vec<String>,
-        /// An optional string to override the title of the terminal tab
-        title_override: Option<SharedString>,
-    },
-}
-
-#[derive(
-    Clone,
-    Debug,
-    Serialize,
-    Deserialize,
-    PartialEq,
-    Eq,
-    JsonSchema,
-    MergeFrom,
-    strum::EnumDiscriminants,
-)]
-#[strum_discriminants(derive(strum::VariantArray, strum::VariantNames, strum::FromRepr))]
-#[serde(rename_all = "snake_case")]
-pub enum WorkingDirectory {
-    /// Use the current file's project directory. Fallback to the
-    /// first project directory strategy if unsuccessful.
-    CurrentProjectDirectory,
-    /// Use the first project in this workspace's directory. Fallback to using
-    /// this platform's home directory.
-    FirstProjectDirectory,
-    /// Always use this platform's home directory (if it can be found).
-    AlwaysHome,
-    /// Always use a specific directory. This value will be shell expanded.
-    /// If this path is not a valid directory the terminal will default to
-    /// this platform's home directory  (if it can be found).
-    Always { directory: String },
-}
-
-#[with_fallible_options]
-#[derive(
-    Clone, Copy, Debug, Serialize, Deserialize, JsonSchema, MergeFrom, PartialEq, Eq, Default,
-)]
-pub struct ScrollbarSettingsContent {
-    /// When to show the scrollbar in the terminal.
-    ///
-    /// Default: inherits editor scrollbar settings
-    pub show: Option<ShowScrollbar>,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, JsonSchema, MergeFrom, Default)]
-#[serde(rename_all = "snake_case")]
-pub enum TerminalLineHeight {
-    /// Use a line height that's comfortable for reading, 1.618
-    #[default]
-    Comfortable,
-    /// Use a standard line height, 1.3. This option is useful for TUIs,
-    /// particularly if they use box characters
-    Standard,
-    /// Use a custom line height.
-    Custom(#[serde(serialize_with = "crate::serialize_f32_with_two_decimal_places")] f32),
-}
-
-impl TerminalLineHeight {
-    pub fn value(&self) -> AbsoluteLength {
-        let value = match self {
-            TerminalLineHeight::Comfortable => 1.618,
-            TerminalLineHeight::Standard => 1.3,
-            TerminalLineHeight::Custom(line_height) => f32::max(*line_height, 1.),
-        };
-        px(value).into()
-    }
-}
-
-/// When to show the scrollbar.
-///
-/// Default: auto
-#[derive(
-    Copy,
-    Clone,
-    Debug,
-    Default,
-    Serialize,
-    Deserialize,
-    JsonSchema,
-    MergeFrom,
-    PartialEq,
-    Eq,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum ShowScrollbar {
-    /// Show the scrollbar if there's important information or
-    /// follow the system's configured behavior.
-    #[default]
-    Auto,
-    /// Match the system's configured behavior.
-    System,
-    /// Always show the scrollbar.
-    Always,
-    /// Never show the scrollbar.
-    Never,
-}
-
-#[derive(
-    Clone,
-    Copy,
-    Debug,
-    Default,
-    Serialize,
-    Deserialize,
-    PartialEq,
-    Eq,
-    JsonSchema,
-    MergeFrom,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-// todo() -> combine with CursorShape
-pub enum CursorShapeContent {
-    /// Cursor is a block like `█`.
-    #[default]
-    Block,
-    /// Cursor is an underscore like `_`.
-    Underline,
-    /// Cursor is a vertical bar like `⎸`.
-    Bar,
-    /// Cursor is a hollow box like `▯`.
-    Hollow,
-}
-
-#[derive(
-    Copy,
-    Clone,
-    Debug,
-    Serialize,
-    Deserialize,
-    PartialEq,
-    Eq,
-    JsonSchema,
-    MergeFrom,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum TerminalBlink {
-    /// Never blink the cursor, ignoring the terminal mode.
-    Off,
-    /// Default the cursor blink to off, but allow the terminal to
-    /// set blinking.
-    TerminalControlled,
-    /// Always blink the cursor, ignoring the terminal mode.
-    On,
-}
-
-#[derive(
-    Clone,
-    Copy,
-    Debug,
-    Serialize,
-    Deserialize,
-    PartialEq,
-    Eq,
-    JsonSchema,
-    MergeFrom,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum AlternateScroll {
-    On,
-    Off,
-}
-
-// Toolbar related settings
-#[with_fallible_options]
-#[derive(Clone, Debug, Default, Serialize, Deserialize, JsonSchema, MergeFrom, PartialEq, Eq)]
-pub struct TerminalToolbarContent {
-    /// Whether to display the terminal title in breadcrumbs inside the terminal pane.
-    /// Only shown if the terminal title is not empty.
-    ///
-    /// The shell running in the terminal needs to be configured to emit the title.
-    /// Example: `echo -e "\e]2;New Title\007";`
-    ///
-    /// Default: true
-    pub breadcrumbs: Option<bool>,
-}
-
-#[derive(
-    Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize, JsonSchema, MergeFrom,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum CondaManager {
-    /// Automatically detect the conda manager
-    #[default]
-    Auto,
-    /// Use conda
-    Conda,
-    /// Use mamba
-    Mamba,
-    /// Use micromamba
-    Micromamba,
-}
-
-#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize, JsonSchema, MergeFrom)]
-#[serde(rename_all = "snake_case")]
-pub enum VenvSettings {
-    #[default]
-    Off,
-    On {
-        /// Default directories to search for virtual environments, relative
-        /// to the current working directory. We recommend overriding this
-        /// in your project's settings, rather than globally.
-        activate_script: Option<ActivateScript>,
-        venv_name: Option<String>,
-        directories: Option<Vec<PathBuf>>,
-        /// Preferred Conda manager to use when activating Conda environments.
-        ///
-        /// Default: auto
-        conda_manager: Option<CondaManager>,
-    },
-}
-#[with_fallible_options]
-pub struct VenvSettingsContent<'a> {
-    pub activate_script: ActivateScript,
-    pub venv_name: &'a str,
-    pub directories: &'a [PathBuf],
-    pub conda_manager: CondaManager,
-}
-
-impl VenvSettings {
-    pub fn as_option(&self) -> Option<VenvSettingsContent<'_>> {
-        match self {
-            VenvSettings::Off => None,
-            VenvSettings::On {
-                activate_script,
-                venv_name,
-                directories,
-                conda_manager,
-            } => Some(VenvSettingsContent {
-                activate_script: activate_script.unwrap_or(ActivateScript::Default),
-                venv_name: venv_name.as_deref().unwrap_or(""),
-                directories: directories.as_deref().unwrap_or(&[]),
-                conda_manager: conda_manager.unwrap_or(CondaManager::Auto),
-            }),
-        }
-    }
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, JsonSchema, MergeFrom)]
-#[serde(untagged)]
-pub enum PathHyperlinkRegex {
-    SingleLine(String),
-    MultiLine(Vec<String>),
-}
-
-#[derive(
-    Copy,
-    Clone,
-    Debug,
-    Serialize,
-    Deserialize,
-    JsonSchema,
-    MergeFrom,
-    PartialEq,
-    Eq,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum TerminalDockPosition {
-    Left,
-    Bottom,
-    Right,
-}
-
-#[derive(Clone, Copy, Debug, Default, PartialEq, Serialize, Deserialize, JsonSchema, MergeFrom)]
-#[serde(rename_all = "snake_case")]
-pub enum ActivateScript {
-    #[default]
-    Default,
-    Csh,
-    Fish,
-    Nushell,
-    PowerShell,
-    Pyenv,
-}
-
-#[cfg(test)]
-mod test {
-    use serde_json::json;
-
-    use crate::{ProjectSettingsContent, Shell, UserSettingsContent};
-
-    #[test]
-    fn test_project_settings() {
-        let project_content =
-            json!({"terminal": {"shell": {"program": "/bin/project"}}, "option_as_meta": true});
-
-        let user_content =
-            json!({"terminal": {"shell": {"program": "/bin/user"}}, "option_as_meta": false});
-
-        let user_settings = serde_json::from_value::<UserSettingsContent>(user_content).unwrap();
-        let project_settings =
-            serde_json::from_value::<ProjectSettingsContent>(project_content).unwrap();
-
-        assert_eq!(
-            user_settings.content.terminal.unwrap().project.shell,
-            Some(Shell::Program("/bin/user".to_owned()))
-        );
-        assert_eq!(user_settings.content.project.terminal, None);
-        assert_eq!(
-            project_settings.terminal.unwrap().shell,
-            Some(Shell::Program("/bin/project".to_owned()))
-        );
-    }
-}
diff --git a/crates/settings/src/settings_content/theme.rs b/crates/settings/src/settings_content/theme.rs
deleted file mode 100644
index 94045b75a1..0000000000
--- a/crates/settings/src/settings_content/theme.rs
+++ /dev/null
@@ -1,1269 +0,0 @@
-use collections::{HashMap, IndexMap};
-use gpui::{FontFallbacks, FontFeatures, FontStyle, FontWeight, SharedString};
-use schemars::{JsonSchema, JsonSchema_repr};
-use serde::{Deserialize, Deserializer, Serialize};
-use serde_json::Value;
-use serde_repr::{Deserialize_repr, Serialize_repr};
-use settings_macros::{MergeFrom, with_fallible_options};
-use std::{fmt::Display, sync::Arc};
-
-use crate::serialize_f32_with_two_decimal_places;
-
-/// Settings for rendering text in UI and text buffers.
-
-#[with_fallible_options]
-#[derive(Clone, PartialEq, Debug, Default, Serialize, Deserialize, JsonSchema, MergeFrom)]
-pub struct ThemeSettingsContent {
-    /// The default font size for text in the UI.
-    #[serde(serialize_with = "crate::serialize_optional_f32_with_two_decimal_places")]
-    pub ui_font_size: Option<f32>,
-    /// The name of a font to use for rendering in the UI.
-    pub ui_font_family: Option<FontFamilyName>,
-    /// The font fallbacks to use for rendering in the UI.
-    #[schemars(default = "default_font_fallbacks")]
-    #[schemars(extend("uniqueItems" = true))]
-    pub ui_font_fallbacks: Option<Vec<FontFamilyName>>,
-    /// The OpenType features to enable for text in the UI.
-    #[schemars(default = "default_font_features")]
-    pub ui_font_features: Option<FontFeatures>,
-    /// The weight of the UI font in CSS units from 100 to 900.
-    #[schemars(default = "default_buffer_font_weight")]
-    pub ui_font_weight: Option<FontWeight>,
-    /// The name of a font to use for rendering in text buffers.
-    pub buffer_font_family: Option<FontFamilyName>,
-    /// The font fallbacks to use for rendering in text buffers.
-    #[schemars(extend("uniqueItems" = true))]
-    pub buffer_font_fallbacks: Option<Vec<FontFamilyName>>,
-    /// The default font size for rendering in text buffers.
-    #[serde(serialize_with = "crate::serialize_optional_f32_with_two_decimal_places")]
-    pub buffer_font_size: Option<f32>,
-    /// The weight of the editor font in CSS units from 100 to 900.
-    #[schemars(default = "default_buffer_font_weight")]
-    pub buffer_font_weight: Option<FontWeight>,
-    /// The buffer's line height.
-    pub buffer_line_height: Option<BufferLineHeight>,
-    /// The OpenType features to enable for rendering in text buffers.
-    #[schemars(default = "default_font_features")]
-    pub buffer_font_features: Option<FontFeatures>,
-    /// The font size for agent responses in the agent panel. Falls back to the UI font size if unset.
-    #[serde(serialize_with = "crate::serialize_optional_f32_with_two_decimal_places")]
-    pub agent_ui_font_size: Option<f32>,
-    /// The font size for user messages in the agent panel.
-    #[serde(serialize_with = "crate::serialize_optional_f32_with_two_decimal_places")]
-    pub agent_buffer_font_size: Option<f32>,
-    /// The name of the Zed theme to use.
-    pub theme: Option<ThemeSelection>,
-    /// The name of the icon theme to use.
-    pub icon_theme: Option<IconThemeSelection>,
-
-    /// UNSTABLE: Expect many elements to be broken.
-    ///
-    // Controls the density of the UI.
-    #[serde(rename = "unstable.ui_density")]
-    pub ui_density: Option<UiDensity>,
-
-    /// How much to fade out unused code.
-    #[schemars(range(min = 0.0, max = 0.9))]
-    pub unnecessary_code_fade: Option<CodeFade>,
-
-    /// EXPERIMENTAL: Overrides for the current theme.
-    ///
-    /// These values will override the ones on the current theme specified in `theme`.
-    #[serde(rename = "experimental.theme_overrides")]
-    pub experimental_theme_overrides: Option<ThemeStyleContent>,
-
-    /// Overrides per theme
-    ///
-    /// These values will override the ones on the specified theme
-    #[serde(default)]
-    pub theme_overrides: HashMap<String, ThemeStyleContent>,
-}
-
-#[derive(
-    Clone,
-    Copy,
-    Debug,
-    Serialize,
-    Deserialize,
-    JsonSchema,
-    MergeFrom,
-    PartialEq,
-    PartialOrd,
-    derive_more::FromStr,
-)]
-#[serde(transparent)]
-pub struct CodeFade(#[serde(serialize_with = "serialize_f32_with_two_decimal_places")] pub f32);
-
-impl Display for CodeFade {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{:.2}", self.0)
-    }
-}
-
-impl From<f32> for CodeFade {
-    fn from(x: f32) -> Self {
-        Self(x)
-    }
-}
-
-fn default_font_features() -> Option<FontFeatures> {
-    Some(FontFeatures::default())
-}
-
-fn default_font_fallbacks() -> Option<FontFallbacks> {
-    Some(FontFallbacks::default())
-}
-
-fn default_buffer_font_weight() -> Option<FontWeight> {
-    Some(FontWeight::default())
-}
-
-/// Represents the selection of a theme, which can be either static or dynamic.
-#[derive(
-    Clone,
-    Debug,
-    Serialize,
-    Deserialize,
-    JsonSchema,
-    MergeFrom,
-    PartialEq,
-    Eq,
-    strum::EnumDiscriminants,
-)]
-#[strum_discriminants(derive(strum::VariantArray, strum::VariantNames, strum::FromRepr))]
-#[serde(untagged)]
-pub enum ThemeSelection {
-    /// A static theme selection, represented by a single theme name.
-    Static(ThemeName),
-    /// A dynamic theme selection, which can change based the [ThemeMode].
-    Dynamic {
-        /// The mode used to determine which theme to use.
-        #[serde(default)]
-        mode: ThemeAppearanceMode,
-        /// The theme to use for light mode.
-        light: ThemeName,
-        /// The theme to use for dark mode.
-        dark: ThemeName,
-    },
-}
-
-/// Represents the selection of an icon theme, which can be either static or dynamic.
-#[derive(
-    Clone,
-    Debug,
-    Serialize,
-    Deserialize,
-    JsonSchema,
-    MergeFrom,
-    PartialEq,
-    Eq,
-    strum::EnumDiscriminants,
-)]
-#[strum_discriminants(derive(strum::VariantArray, strum::VariantNames, strum::FromRepr))]
-#[serde(untagged)]
-pub enum IconThemeSelection {
-    /// A static icon theme selection, represented by a single icon theme name.
-    Static(IconThemeName),
-    /// A dynamic icon theme selection, which can change based on the [`ThemeMode`].
-    Dynamic {
-        /// The mode used to determine which theme to use.
-        #[serde(default)]
-        mode: ThemeAppearanceMode,
-        /// The icon theme to use for light mode.
-        light: IconThemeName,
-        /// The icon theme to use for dark mode.
-        dark: IconThemeName,
-    },
-}
-
-/// The mode use to select a theme.
-///
-/// `Light` and `Dark` will select their respective themes.
-///
-/// `System` will select the theme based on the system's appearance.
-#[derive(
-    Debug,
-    PartialEq,
-    Eq,
-    Clone,
-    Copy,
-    Default,
-    Serialize,
-    Deserialize,
-    JsonSchema,
-    MergeFrom,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum ThemeAppearanceMode {
-    /// Use the specified `light` theme.
-    Light,
-
-    /// Use the specified `dark` theme.
-    Dark,
-
-    /// Use the theme based on the system's appearance.
-    #[default]
-    System,
-}
-
-/// Specifies the density of the UI.
-/// Note: This setting is still experimental. See [this tracking issue](https://github.com/zed-industries/zed/issues/18078)
-#[derive(
-    Debug,
-    Default,
-    PartialEq,
-    Eq,
-    PartialOrd,
-    Ord,
-    Hash,
-    Clone,
-    Copy,
-    Serialize,
-    Deserialize,
-    JsonSchema,
-    MergeFrom,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum UiDensity {
-    /// A denser UI with tighter spacing and smaller elements.
-    #[serde(alias = "compact")]
-    Compact,
-    #[default]
-    #[serde(alias = "default")]
-    /// The default UI density.
-    Default,
-    #[serde(alias = "comfortable")]
-    /// A looser UI with more spacing and larger elements.
-    Comfortable,
-}
-
-impl UiDensity {
-    /// The spacing ratio of a given density.
-    /// TODO: Standardize usage throughout the app or remove
-    pub fn spacing_ratio(self) -> f32 {
-        match self {
-            UiDensity::Compact => 0.75,
-            UiDensity::Default => 1.0,
-            UiDensity::Comfortable => 1.25,
-        }
-    }
-}
-
-/// Font family name.
-#[with_fallible_options]
-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, MergeFrom, PartialEq, Eq)]
-#[serde(transparent)]
-pub struct FontFamilyName(pub Arc<str>);
-
-impl AsRef<str> for FontFamilyName {
-    fn as_ref(&self) -> &str {
-        &self.0
-    }
-}
-
-impl From<SharedString> for FontFamilyName {
-    fn from(value: SharedString) -> Self {
-        Self(Arc::from(value))
-    }
-}
-
-impl From<FontFamilyName> for SharedString {
-    fn from(value: FontFamilyName) -> Self {
-        SharedString::new(value.0)
-    }
-}
-
-impl From<String> for FontFamilyName {
-    fn from(value: String) -> Self {
-        Self(Arc::from(value))
-    }
-}
-
-impl From<FontFamilyName> for String {
-    fn from(value: FontFamilyName) -> Self {
-        value.0.to_string()
-    }
-}
-
-/// The buffer's line height.
-#[derive(
-    Clone,
-    Copy,
-    Debug,
-    Serialize,
-    Deserialize,
-    PartialEq,
-    JsonSchema,
-    MergeFrom,
-    Default,
-    strum::EnumDiscriminants,
-)]
-#[strum_discriminants(derive(strum::VariantArray, strum::VariantNames, strum::FromRepr))]
-#[serde(rename_all = "snake_case")]
-pub enum BufferLineHeight {
-    /// A less dense line height.
-    #[default]
-    Comfortable,
-    /// The default line height.
-    Standard,
-    /// A custom line height, where 1.0 is the font's height. Must be at least 1.0.
-    Custom(#[serde(deserialize_with = "deserialize_line_height")] f32),
-}
-
-fn deserialize_line_height<'de, D>(deserializer: D) -> Result<f32, D::Error>
-where
-    D: serde::Deserializer<'de>,
-{
-    let value = f32::deserialize(deserializer)?;
-    if value < 1.0 {
-        return Err(serde::de::Error::custom(
-            "buffer_line_height.custom must be at least 1.0",
-        ));
-    }
-
-    Ok(value)
-}
-
-/// The content of a serialized theme.
-#[with_fallible_options]
-#[derive(Debug, Clone, Default, Serialize, Deserialize, JsonSchema, MergeFrom, PartialEq)]
-#[serde(default)]
-pub struct ThemeStyleContent {
-    #[serde(rename = "background.appearance")]
-    pub window_background_appearance: Option<WindowBackgroundContent>,
-
-    #[serde(default)]
-    pub accents: Vec<AccentContent>,
-
-    #[serde(flatten, default)]
-    pub colors: ThemeColorsContent,
-
-    #[serde(flatten, default)]
-    pub status: StatusColorsContent,
-
-    #[serde(default)]
-    pub players: Vec<PlayerColorContent>,
-
-    /// The styles for syntax nodes.
-    #[serde(default)]
-    pub syntax: IndexMap<String, HighlightStyleContent>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, MergeFrom, PartialEq)]
-pub struct AccentContent(pub Option<SharedString>);
-
-#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, MergeFrom, PartialEq)]
-pub struct PlayerColorContent {
-    pub cursor: Option<String>,
-    pub background: Option<String>,
-    pub selection: Option<String>,
-}
-
-/// Theme name.
-#[with_fallible_options]
-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, MergeFrom, PartialEq, Eq)]
-#[serde(transparent)]
-pub struct ThemeName(pub Arc<str>);
-
-/// Icon Theme Name
-#[with_fallible_options]
-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, MergeFrom, PartialEq, Eq)]
-#[serde(transparent)]
-pub struct IconThemeName(pub Arc<str>);
-
-#[with_fallible_options]
-#[derive(Debug, Clone, Default, Serialize, Deserialize, JsonSchema, MergeFrom, PartialEq)]
-#[serde(default)]
-pub struct ThemeColorsContent {
-    /// Border color. Used for most borders, is usually a high contrast color.
-    #[serde(rename = "border")]
-    pub border: Option<String>,
-
-    /// Border color. Used for deemphasized borders, like a visual divider between two sections
-    #[serde(rename = "border.variant")]
-    pub border_variant: Option<String>,
-
-    /// Border color. Used for focused elements, like keyboard focused list item.
-    #[serde(rename = "border.focused")]
-    pub border_focused: Option<String>,
-
-    /// Border color. Used for selected elements, like an active search filter or selected checkbox.
-    #[serde(rename = "border.selected")]
-    pub border_selected: Option<String>,
-
-    /// Border color. Used for transparent borders. Used for placeholder borders when an element gains a border on state change.
-    #[serde(rename = "border.transparent")]
-    pub border_transparent: Option<String>,
-
-    /// Border color. Used for disabled elements, like a disabled input or button.
-    #[serde(rename = "border.disabled")]
-    pub border_disabled: Option<String>,
-
-    /// Background color. Used for elevated surfaces, like a context menu, popup, or dialog.
-    #[serde(rename = "elevated_surface.background")]
-    pub elevated_surface_background: Option<String>,
-
-    /// Background Color. Used for grounded surfaces like a panel or tab.
-    #[serde(rename = "surface.background")]
-    pub surface_background: Option<String>,
-
-    /// Background Color. Used for the app background and blank panels or windows.
-    #[serde(rename = "background")]
-    pub background: Option<String>,
-
-    /// Background Color. Used for the background of an element that should have a different background than the surface it's on.
-    ///
-    /// Elements might include: Buttons, Inputs, Checkboxes, Radio Buttons...
-    ///
-    /// For an element that should have the same background as the surface it's on, use `ghost_element_background`.
-    #[serde(rename = "element.background")]
-    pub element_background: Option<String>,
-
-    /// Background Color. Used for the hover state of an element that should have a different background than the surface it's on.
-    ///
-    /// Hover states are triggered by the mouse entering an element, or a finger touching an element on a touch screen.
-    #[serde(rename = "element.hover")]
-    pub element_hover: Option<String>,
-
-    /// Background Color. Used for the active state of an element that should have a different background than the surface it's on.
-    ///
-    /// Active states are triggered by the mouse button being pressed down on an element, or the Return button or other activator being pressed.
-    #[serde(rename = "element.active")]
-    pub element_active: Option<String>,
-
-    /// Background Color. Used for the selected state of an element that should have a different background than the surface it's on.
-    ///
-    /// Selected states are triggered by the element being selected (or "activated") by the user.
-    ///
-    /// This could include a selected checkbox, a toggleable button that is toggled on, etc.
-    #[serde(rename = "element.selected")]
-    pub element_selected: Option<String>,
-
-    /// Background Color. Used for the disabled state of an element that should have a different background than the surface it's on.
-    ///
-    /// Disabled states are shown when a user cannot interact with an element, like a disabled button or input.
-    #[serde(rename = "element.disabled")]
-    pub element_disabled: Option<String>,
-
-    /// Background Color. Used for the background of selections in a UI element.
-    #[serde(rename = "element.selection_background")]
-    pub element_selection_background: Option<String>,
-
-    /// Background Color. Used for the area that shows where a dragged element will be dropped.
-    #[serde(rename = "drop_target.background")]
-    pub drop_target_background: Option<String>,
-
-    /// Border Color. Used for the border that shows where a dragged element will be dropped.
-    #[serde(rename = "drop_target.border")]
-    pub drop_target_border: Option<String>,
-
-    /// Used for the background of a ghost element that should have the same background as the surface it's on.
-    ///
-    /// Elements might include: Buttons, Inputs, Checkboxes, Radio Buttons...
-    ///
-    /// For an element that should have a different background than the surface it's on, use `element_background`.
-    #[serde(rename = "ghost_element.background")]
-    pub ghost_element_background: Option<String>,
-
-    /// Background Color. Used for the hover state of a ghost element that should have the same background as the surface it's on.
-    ///
-    /// Hover states are triggered by the mouse entering an element, or a finger touching an element on a touch screen.
-    #[serde(rename = "ghost_element.hover")]
-    pub ghost_element_hover: Option<String>,
-
-    /// Background Color. Used for the active state of a ghost element that should have the same background as the surface it's on.
-    ///
-    /// Active states are triggered by the mouse button being pressed down on an element, or the Return button or other activator being pressed.
-    #[serde(rename = "ghost_element.active")]
-    pub ghost_element_active: Option<String>,
-
-    /// Background Color. Used for the selected state of a ghost element that should have the same background as the surface it's on.
-    ///
-    /// Selected states are triggered by the element being selected (or "activated") by the user.
-    ///
-    /// This could include a selected checkbox, a toggleable button that is toggled on, etc.
-    #[serde(rename = "ghost_element.selected")]
-    pub ghost_element_selected: Option<String>,
-
-    /// Background Color. Used for the disabled state of a ghost element that should have the same background as the surface it's on.
-    ///
-    /// Disabled states are shown when a user cannot interact with an element, like a disabled button or input.
-    #[serde(rename = "ghost_element.disabled")]
-    pub ghost_element_disabled: Option<String>,
-
-    /// Text Color. Default text color used for most text.
-    #[serde(rename = "text")]
-    pub text: Option<String>,
-
-    /// Text Color. Color of muted or deemphasized text. It is a subdued version of the standard text color.
-    #[serde(rename = "text.muted")]
-    pub text_muted: Option<String>,
-
-    /// Text Color. Color of the placeholder text typically shown in input fields to guide the user to enter valid data.
-    #[serde(rename = "text.placeholder")]
-    pub text_placeholder: Option<String>,
-
-    /// Text Color. Color used for text denoting disabled elements. Typically, the color is faded or grayed out to emphasize the disabled state.
-    #[serde(rename = "text.disabled")]
-    pub text_disabled: Option<String>,
-
-    /// Text Color. Color used for emphasis or highlighting certain text, like an active filter or a matched character in a search.
-    #[serde(rename = "text.accent")]
-    pub text_accent: Option<String>,
-
-    /// Fill Color. Used for the default fill color of an icon.
-    #[serde(rename = "icon")]
-    pub icon: Option<String>,
-
-    /// Fill Color. Used for the muted or deemphasized fill color of an icon.
-    ///
-    /// This might be used to show an icon in an inactive pane, or to deemphasize a series of icons to give them less visual weight.
-    #[serde(rename = "icon.muted")]
-    pub icon_muted: Option<String>,
-
-    /// Fill Color. Used for the disabled fill color of an icon.
-    ///
-    /// Disabled states are shown when a user cannot interact with an element, like a icon button.
-    #[serde(rename = "icon.disabled")]
-    pub icon_disabled: Option<String>,
-
-    /// Fill Color. Used for the placeholder fill color of an icon.
-    ///
-    /// This might be used to show an icon in an input that disappears when the user enters text.
-    #[serde(rename = "icon.placeholder")]
-    pub icon_placeholder: Option<String>,
-
-    /// Fill Color. Used for the accent fill color of an icon.
-    ///
-    /// This might be used to show when a toggleable icon button is selected.
-    #[serde(rename = "icon.accent")]
-    pub icon_accent: Option<String>,
-
-    /// Color used to accent some of the debuggers elements
-    /// Only accent breakpoint & breakpoint related symbols right now
-    #[serde(rename = "debugger.accent")]
-    pub debugger_accent: Option<String>,
-
-    #[serde(rename = "status_bar.background")]
-    pub status_bar_background: Option<String>,
-
-    #[serde(rename = "title_bar.background")]
-    pub title_bar_background: Option<String>,
-
-    #[serde(rename = "title_bar.inactive_background")]
-    pub title_bar_inactive_background: Option<String>,
-
-    #[serde(rename = "toolbar.background")]
-    pub toolbar_background: Option<String>,
-
-    #[serde(rename = "tab_bar.background")]
-    pub tab_bar_background: Option<String>,
-
-    #[serde(rename = "tab.inactive_background")]
-    pub tab_inactive_background: Option<String>,
-
-    #[serde(rename = "tab.active_background")]
-    pub tab_active_background: Option<String>,
-
-    #[serde(rename = "search.match_background")]
-    pub search_match_background: Option<String>,
-
-    #[serde(rename = "search.active_match_background")]
-    pub search_active_match_background: Option<String>,
-
-    #[serde(rename = "panel.background")]
-    pub panel_background: Option<String>,
-
-    #[serde(rename = "panel.focused_border")]
-    pub panel_focused_border: Option<String>,
-
-    #[serde(rename = "panel.indent_guide")]
-    pub panel_indent_guide: Option<String>,
-
-    #[serde(rename = "panel.indent_guide_hover")]
-    pub panel_indent_guide_hover: Option<String>,
-
-    #[serde(rename = "panel.indent_guide_active")]
-    pub panel_indent_guide_active: Option<String>,
-
-    #[serde(rename = "panel.overlay_background")]
-    pub panel_overlay_background: Option<String>,
-
-    #[serde(rename = "panel.overlay_hover")]
-    pub panel_overlay_hover: Option<String>,
-
-    #[serde(rename = "pane.focused_border")]
-    pub pane_focused_border: Option<String>,
-
-    #[serde(rename = "pane_group.border")]
-    pub pane_group_border: Option<String>,
-
-    /// The deprecated version of `scrollbar.thumb.background`.
-    ///
-    /// Don't use this field.
-    #[serde(rename = "scrollbar_thumb.background", skip_serializing)]
-    #[schemars(skip)]
-    pub deprecated_scrollbar_thumb_background: Option<String>,
-
-    /// The color of the scrollbar thumb.
-    #[serde(rename = "scrollbar.thumb.background")]
-    pub scrollbar_thumb_background: Option<String>,
-
-    /// The color of the scrollbar thumb when hovered over.
-    #[serde(rename = "scrollbar.thumb.hover_background")]
-    pub scrollbar_thumb_hover_background: Option<String>,
-
-    /// The color of the scrollbar thumb whilst being actively dragged.
-    #[serde(rename = "scrollbar.thumb.active_background")]
-    pub scrollbar_thumb_active_background: Option<String>,
-
-    /// The border color of the scrollbar thumb.
-    #[serde(rename = "scrollbar.thumb.border")]
-    pub scrollbar_thumb_border: Option<String>,
-
-    /// The background color of the scrollbar track.
-    #[serde(rename = "scrollbar.track.background")]
-    pub scrollbar_track_background: Option<String>,
-
-    /// The border color of the scrollbar track.
-    #[serde(rename = "scrollbar.track.border")]
-    pub scrollbar_track_border: Option<String>,
-
-    /// The color of the minimap thumb.
-    #[serde(rename = "minimap.thumb.background")]
-    pub minimap_thumb_background: Option<String>,
-
-    /// The color of the minimap thumb when hovered over.
-    #[serde(rename = "minimap.thumb.hover_background")]
-    pub minimap_thumb_hover_background: Option<String>,
-
-    /// The color of the minimap thumb whilst being actively dragged.
-    #[serde(rename = "minimap.thumb.active_background")]
-    pub minimap_thumb_active_background: Option<String>,
-
-    /// The border color of the minimap thumb.
-    #[serde(rename = "minimap.thumb.border")]
-    pub minimap_thumb_border: Option<String>,
-
-    #[serde(rename = "editor.foreground")]
-    pub editor_foreground: Option<String>,
-
-    #[serde(rename = "editor.background")]
-    pub editor_background: Option<String>,
-
-    #[serde(rename = "editor.gutter.background")]
-    pub editor_gutter_background: Option<String>,
-
-    #[serde(rename = "editor.subheader.background")]
-    pub editor_subheader_background: Option<String>,
-
-    #[serde(rename = "editor.active_line.background")]
-    pub editor_active_line_background: Option<String>,
-
-    #[serde(rename = "editor.highlighted_line.background")]
-    pub editor_highlighted_line_background: Option<String>,
-
-    /// Background of active line of debugger
-    #[serde(rename = "editor.debugger_active_line.background")]
-    pub editor_debugger_active_line_background: Option<String>,
-
-    /// Text Color. Used for the text of the line number in the editor gutter.
-    #[serde(rename = "editor.line_number")]
-    pub editor_line_number: Option<String>,
-
-    /// Text Color. Used for the text of the line number in the editor gutter when the line is highlighted.
-    #[serde(rename = "editor.active_line_number")]
-    pub editor_active_line_number: Option<String>,
-
-    /// Text Color. Used for the text of the line number in the editor gutter when the line is hovered over.
-    #[serde(rename = "editor.hover_line_number")]
-    pub editor_hover_line_number: Option<String>,
-
-    /// Text Color. Used to mark invisible characters in the editor.
-    ///
-    /// Example: spaces, tabs, carriage returns, etc.
-    #[serde(rename = "editor.invisible")]
-    pub editor_invisible: Option<String>,
-
-    #[serde(rename = "editor.wrap_guide")]
-    pub editor_wrap_guide: Option<String>,
-
-    #[serde(rename = "editor.active_wrap_guide")]
-    pub editor_active_wrap_guide: Option<String>,
-
-    #[serde(rename = "editor.indent_guide")]
-    pub editor_indent_guide: Option<String>,
-
-    #[serde(rename = "editor.indent_guide_active")]
-    pub editor_indent_guide_active: Option<String>,
-
-    /// Read-access of a symbol, like reading a variable.
-    ///
-    /// A document highlight is a range inside a text document which deserves
-    /// special attention. Usually a document highlight is visualized by changing
-    /// the background color of its range.
-    #[serde(rename = "editor.document_highlight.read_background")]
-    pub editor_document_highlight_read_background: Option<String>,
-
-    /// Read-access of a symbol, like reading a variable.
-    ///
-    /// A document highlight is a range inside a text document which deserves
-    /// special attention. Usually a document highlight is visualized by changing
-    /// the background color of its range.
-    #[serde(rename = "editor.document_highlight.write_background")]
-    pub editor_document_highlight_write_background: Option<String>,
-
-    /// Highlighted brackets background color.
-    ///
-    /// Matching brackets in the cursor scope are highlighted with this background color.
-    #[serde(rename = "editor.document_highlight.bracket_background")]
-    pub editor_document_highlight_bracket_background: Option<String>,
-
-    /// Terminal background color.
-    #[serde(rename = "terminal.background")]
-    pub terminal_background: Option<String>,
-
-    /// Terminal foreground color.
-    #[serde(rename = "terminal.foreground")]
-    pub terminal_foreground: Option<String>,
-
-    /// Terminal ANSI background color.
-    #[serde(rename = "terminal.ansi.background")]
-    pub terminal_ansi_background: Option<String>,
-
-    /// Bright terminal foreground color.
-    #[serde(rename = "terminal.bright_foreground")]
-    pub terminal_bright_foreground: Option<String>,
-
-    /// Dim terminal foreground color.
-    #[serde(rename = "terminal.dim_foreground")]
-    pub terminal_dim_foreground: Option<String>,
-
-    /// Black ANSI terminal color.
-    #[serde(rename = "terminal.ansi.black")]
-    pub terminal_ansi_black: Option<String>,
-
-    /// Bright black ANSI terminal color.
-    #[serde(rename = "terminal.ansi.bright_black")]
-    pub terminal_ansi_bright_black: Option<String>,
-
-    /// Dim black ANSI terminal color.
-    #[serde(rename = "terminal.ansi.dim_black")]
-    pub terminal_ansi_dim_black: Option<String>,
-
-    /// Red ANSI terminal color.
-    #[serde(rename = "terminal.ansi.red")]
-    pub terminal_ansi_red: Option<String>,
-
-    /// Bright red ANSI terminal color.
-    #[serde(rename = "terminal.ansi.bright_red")]
-    pub terminal_ansi_bright_red: Option<String>,
-
-    /// Dim red ANSI terminal color.
-    #[serde(rename = "terminal.ansi.dim_red")]
-    pub terminal_ansi_dim_red: Option<String>,
-
-    /// Green ANSI terminal color.
-    #[serde(rename = "terminal.ansi.green")]
-    pub terminal_ansi_green: Option<String>,
-
-    /// Bright green ANSI terminal color.
-    #[serde(rename = "terminal.ansi.bright_green")]
-    pub terminal_ansi_bright_green: Option<String>,
-
-    /// Dim green ANSI terminal color.
-    #[serde(rename = "terminal.ansi.dim_green")]
-    pub terminal_ansi_dim_green: Option<String>,
-
-    /// Yellow ANSI terminal color.
-    #[serde(rename = "terminal.ansi.yellow")]
-    pub terminal_ansi_yellow: Option<String>,
-
-    /// Bright yellow ANSI terminal color.
-    #[serde(rename = "terminal.ansi.bright_yellow")]
-    pub terminal_ansi_bright_yellow: Option<String>,
-
-    /// Dim yellow ANSI terminal color.
-    #[serde(rename = "terminal.ansi.dim_yellow")]
-    pub terminal_ansi_dim_yellow: Option<String>,
-
-    /// Blue ANSI terminal color.
-    #[serde(rename = "terminal.ansi.blue")]
-    pub terminal_ansi_blue: Option<String>,
-
-    /// Bright blue ANSI terminal color.
-    #[serde(rename = "terminal.ansi.bright_blue")]
-    pub terminal_ansi_bright_blue: Option<String>,
-
-    /// Dim blue ANSI terminal color.
-    #[serde(rename = "terminal.ansi.dim_blue")]
-    pub terminal_ansi_dim_blue: Option<String>,
-
-    /// Magenta ANSI terminal color.
-    #[serde(rename = "terminal.ansi.magenta")]
-    pub terminal_ansi_magenta: Option<String>,
-
-    /// Bright magenta ANSI terminal color.
-    #[serde(rename = "terminal.ansi.bright_magenta")]
-    pub terminal_ansi_bright_magenta: Option<String>,
-
-    /// Dim magenta ANSI terminal color.
-    #[serde(rename = "terminal.ansi.dim_magenta")]
-    pub terminal_ansi_dim_magenta: Option<String>,
-
-    /// Cyan ANSI terminal color.
-    #[serde(rename = "terminal.ansi.cyan")]
-    pub terminal_ansi_cyan: Option<String>,
-
-    /// Bright cyan ANSI terminal color.
-    #[serde(rename = "terminal.ansi.bright_cyan")]
-    pub terminal_ansi_bright_cyan: Option<String>,
-
-    /// Dim cyan ANSI terminal color.
-    #[serde(rename = "terminal.ansi.dim_cyan")]
-    pub terminal_ansi_dim_cyan: Option<String>,
-
-    /// White ANSI terminal color.
-    #[serde(rename = "terminal.ansi.white")]
-    pub terminal_ansi_white: Option<String>,
-
-    /// Bright white ANSI terminal color.
-    #[serde(rename = "terminal.ansi.bright_white")]
-    pub terminal_ansi_bright_white: Option<String>,
-
-    /// Dim white ANSI terminal color.
-    #[serde(rename = "terminal.ansi.dim_white")]
-    pub terminal_ansi_dim_white: Option<String>,
-
-    #[serde(rename = "link_text.hover")]
-    pub link_text_hover: Option<String>,
-
-    /// Added version control color.
-    #[serde(rename = "version_control.added")]
-    pub version_control_added: Option<String>,
-
-    /// Deleted version control color.
-    #[serde(rename = "version_control.deleted")]
-    pub version_control_deleted: Option<String>,
-
-    /// Modified version control color.
-    #[serde(rename = "version_control.modified")]
-    pub version_control_modified: Option<String>,
-
-    /// Renamed version control color.
-    #[serde(rename = "version_control.renamed")]
-    pub version_control_renamed: Option<String>,
-
-    /// Conflict version control color.
-    #[serde(rename = "version_control.conflict")]
-    pub version_control_conflict: Option<String>,
-
-    /// Ignored version control color.
-    #[serde(rename = "version_control.ignored")]
-    pub version_control_ignored: Option<String>,
-
-    /// Color for added words in word diffs.
-    #[serde(rename = "version_control.word_added")]
-    pub version_control_word_added: Option<String>,
-
-    /// Color for deleted words in word diffs.
-    #[serde(rename = "version_control.word_deleted")]
-    pub version_control_word_deleted: Option<String>,
-
-    /// Background color for row highlights of "ours" regions in merge conflicts.
-    #[serde(rename = "version_control.conflict_marker.ours")]
-    pub version_control_conflict_marker_ours: Option<String>,
-
-    /// Background color for row highlights of "theirs" regions in merge conflicts.
-    #[serde(rename = "version_control.conflict_marker.theirs")]
-    pub version_control_conflict_marker_theirs: Option<String>,
-
-    /// Deprecated in favor of `version_control_conflict_marker_ours`.
-    #[deprecated]
-    pub version_control_conflict_ours_background: Option<String>,
-
-    /// Deprecated in favor of `version_control_conflict_marker_theirs`.
-    #[deprecated]
-    pub version_control_conflict_theirs_background: Option<String>,
-
-    /// Background color for Vim Normal mode indicator.
-    #[serde(rename = "vim.normal.background")]
-    pub vim_normal_background: Option<String>,
-    /// Background color for Vim Insert mode indicator.
-    #[serde(rename = "vim.insert.background")]
-    pub vim_insert_background: Option<String>,
-    /// Background color for Vim Replace mode indicator.
-    #[serde(rename = "vim.replace.background")]
-    pub vim_replace_background: Option<String>,
-    /// Background color for Vim Visual mode indicator.
-    #[serde(rename = "vim.visual.background")]
-    pub vim_visual_background: Option<String>,
-    /// Background color for Vim Visual Line mode indicator.
-    #[serde(rename = "vim.visual_line.background")]
-    pub vim_visual_line_background: Option<String>,
-    /// Background color for Vim Visual Block mode indicator.
-    #[serde(rename = "vim.visual_block.background")]
-    pub vim_visual_block_background: Option<String>,
-    /// Background color for Vim Helix Normal mode indicator.
-    #[serde(rename = "vim.helix_normal.background")]
-    pub vim_helix_normal_background: Option<String>,
-    /// Background color for Vim Helix Select mode indicator.
-    #[serde(rename = "vim.helix_select.background")]
-    pub vim_helix_select_background: Option<String>,
-
-    /// Text color for Vim mode indicator label.
-    #[serde(rename = "vim.mode.text")]
-    pub vim_mode_text: Option<String>,
-}
-
-#[derive(Debug, Clone, Default, Serialize, Deserialize, JsonSchema, MergeFrom, PartialEq)]
-#[serde(default)]
-pub struct HighlightStyleContent {
-    pub color: Option<String>,
-
-    #[serde(
-        skip_serializing_if = "Option::is_none",
-        deserialize_with = "treat_error_as_none"
-    )]
-    pub background_color: Option<String>,
-
-    #[serde(
-        skip_serializing_if = "Option::is_none",
-        deserialize_with = "treat_error_as_none"
-    )]
-    pub font_style: Option<FontStyleContent>,
-
-    #[serde(
-        skip_serializing_if = "Option::is_none",
-        deserialize_with = "treat_error_as_none"
-    )]
-    pub font_weight: Option<FontWeightContent>,
-}
-
-impl HighlightStyleContent {
-    pub fn is_empty(&self) -> bool {
-        self.color.is_none()
-            && self.background_color.is_none()
-            && self.font_style.is_none()
-            && self.font_weight.is_none()
-    }
-}
-
-fn treat_error_as_none<'de, T, D>(deserializer: D) -> Result<Option<T>, D::Error>
-where
-    T: Deserialize<'de>,
-    D: Deserializer<'de>,
-{
-    let value: Value = Deserialize::deserialize(deserializer)?;
-    Ok(T::deserialize(value).ok())
-}
-
-#[with_fallible_options]
-#[derive(Debug, Clone, Default, Serialize, Deserialize, JsonSchema, MergeFrom, PartialEq)]
-#[serde(default)]
-pub struct StatusColorsContent {
-    /// Indicates some kind of conflict, like a file changed on disk while it was open, or
-    /// merge conflicts in a Git repository.
-    #[serde(rename = "conflict")]
-    pub conflict: Option<String>,
-
-    #[serde(rename = "conflict.background")]
-    pub conflict_background: Option<String>,
-
-    #[serde(rename = "conflict.border")]
-    pub conflict_border: Option<String>,
-
-    /// Indicates something new, like a new file added to a Git repository.
-    #[serde(rename = "created")]
-    pub created: Option<String>,
-
-    #[serde(rename = "created.background")]
-    pub created_background: Option<String>,
-
-    #[serde(rename = "created.border")]
-    pub created_border: Option<String>,
-
-    /// Indicates that something no longer exists, like a deleted file.
-    #[serde(rename = "deleted")]
-    pub deleted: Option<String>,
-
-    #[serde(rename = "deleted.background")]
-    pub deleted_background: Option<String>,
-
-    #[serde(rename = "deleted.border")]
-    pub deleted_border: Option<String>,
-
-    /// Indicates a system error, a failed operation or a diagnostic error.
-    #[serde(rename = "error")]
-    pub error: Option<String>,
-
-    #[serde(rename = "error.background")]
-    pub error_background: Option<String>,
-
-    #[serde(rename = "error.border")]
-    pub error_border: Option<String>,
-
-    /// Represents a hidden status, such as a file being hidden in a file tree.
-    #[serde(rename = "hidden")]
-    pub hidden: Option<String>,
-
-    #[serde(rename = "hidden.background")]
-    pub hidden_background: Option<String>,
-
-    #[serde(rename = "hidden.border")]
-    pub hidden_border: Option<String>,
-
-    /// Indicates a hint or some kind of additional information.
-    #[serde(rename = "hint")]
-    pub hint: Option<String>,
-
-    #[serde(rename = "hint.background")]
-    pub hint_background: Option<String>,
-
-    #[serde(rename = "hint.border")]
-    pub hint_border: Option<String>,
-
-    /// Indicates that something is deliberately ignored, such as a file or operation ignored by Git.
-    #[serde(rename = "ignored")]
-    pub ignored: Option<String>,
-
-    #[serde(rename = "ignored.background")]
-    pub ignored_background: Option<String>,
-
-    #[serde(rename = "ignored.border")]
-    pub ignored_border: Option<String>,
-
-    /// Represents informational status updates or messages.
-    #[serde(rename = "info")]
-    pub info: Option<String>,
-
-    #[serde(rename = "info.background")]
-    pub info_background: Option<String>,
-
-    #[serde(rename = "info.border")]
-    pub info_border: Option<String>,
-
-    /// Indicates a changed or altered status, like a file that has been edited.
-    #[serde(rename = "modified")]
-    pub modified: Option<String>,
-
-    #[serde(rename = "modified.background")]
-    pub modified_background: Option<String>,
-
-    #[serde(rename = "modified.border")]
-    pub modified_border: Option<String>,
-
-    /// Indicates something that is predicted, like automatic code completion, or generated code.
-    #[serde(rename = "predictive")]
-    pub predictive: Option<String>,
-
-    #[serde(rename = "predictive.background")]
-    pub predictive_background: Option<String>,
-
-    #[serde(rename = "predictive.border")]
-    pub predictive_border: Option<String>,
-
-    /// Represents a renamed status, such as a file that has been renamed.
-    #[serde(rename = "renamed")]
-    pub renamed: Option<String>,
-
-    #[serde(rename = "renamed.background")]
-    pub renamed_background: Option<String>,
-
-    #[serde(rename = "renamed.border")]
-    pub renamed_border: Option<String>,
-
-    /// Indicates a successful operation or task completion.
-    #[serde(rename = "success")]
-    pub success: Option<String>,
-
-    #[serde(rename = "success.background")]
-    pub success_background: Option<String>,
-
-    #[serde(rename = "success.border")]
-    pub success_border: Option<String>,
-
-    /// Indicates some kind of unreachable status, like a block of code that can never be reached.
-    #[serde(rename = "unreachable")]
-    pub unreachable: Option<String>,
-
-    #[serde(rename = "unreachable.background")]
-    pub unreachable_background: Option<String>,
-
-    #[serde(rename = "unreachable.border")]
-    pub unreachable_border: Option<String>,
-
-    /// Represents a warning status, like an operation that is about to fail.
-    #[serde(rename = "warning")]
-    pub warning: Option<String>,
-
-    #[serde(rename = "warning.background")]
-    pub warning_background: Option<String>,
-
-    #[serde(rename = "warning.border")]
-    pub warning_border: Option<String>,
-}
-
-/// The background appearance of the window.
-#[derive(Debug, PartialEq, Clone, Copy, Serialize, Deserialize, JsonSchema, MergeFrom)]
-#[serde(rename_all = "snake_case")]
-pub enum WindowBackgroundContent {
-    Opaque,
-    Transparent,
-    Blurred,
-}
-
-impl Into<gpui::WindowBackgroundAppearance> for WindowBackgroundContent {
-    fn into(self) -> gpui::WindowBackgroundAppearance {
-        match self {
-            WindowBackgroundContent::Opaque => gpui::WindowBackgroundAppearance::Opaque,
-            WindowBackgroundContent::Transparent => gpui::WindowBackgroundAppearance::Transparent,
-            WindowBackgroundContent::Blurred => gpui::WindowBackgroundAppearance::Blurred,
-        }
-    }
-}
-
-#[derive(Debug, Clone, Copy, Serialize, Deserialize, JsonSchema, MergeFrom, PartialEq)]
-#[serde(rename_all = "snake_case")]
-pub enum FontStyleContent {
-    Normal,
-    Italic,
-    Oblique,
-}
-
-impl From<FontStyleContent> for FontStyle {
-    fn from(value: FontStyleContent) -> Self {
-        match value {
-            FontStyleContent::Normal => FontStyle::Normal,
-            FontStyleContent::Italic => FontStyle::Italic,
-            FontStyleContent::Oblique => FontStyle::Oblique,
-        }
-    }
-}
-
-#[derive(
-    Debug, Clone, Copy, Serialize_repr, Deserialize_repr, JsonSchema_repr, PartialEq, MergeFrom,
-)]
-#[repr(u16)]
-pub enum FontWeightContent {
-    Thin = 100,
-    ExtraLight = 200,
-    Light = 300,
-    Normal = 400,
-    Medium = 500,
-    Semibold = 600,
-    Bold = 700,
-    ExtraBold = 800,
-    Black = 900,
-}
-
-impl From<FontWeightContent> for FontWeight {
-    fn from(value: FontWeightContent) -> Self {
-        match value {
-            FontWeightContent::Thin => FontWeight::THIN,
-            FontWeightContent::ExtraLight => FontWeight::EXTRA_LIGHT,
-            FontWeightContent::Light => FontWeight::LIGHT,
-            FontWeightContent::Normal => FontWeight::NORMAL,
-            FontWeightContent::Medium => FontWeight::MEDIUM,
-            FontWeightContent::Semibold => FontWeight::SEMIBOLD,
-            FontWeightContent::Bold => FontWeight::BOLD,
-            FontWeightContent::ExtraBold => FontWeight::EXTRA_BOLD,
-            FontWeightContent::Black => FontWeight::BLACK,
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use serde_json::json;
-
-    #[test]
-    fn test_buffer_line_height_deserialize_valid() {
-        assert_eq!(
-            serde_json::from_value::<BufferLineHeight>(json!("comfortable")).unwrap(),
-            BufferLineHeight::Comfortable
-        );
-        assert_eq!(
-            serde_json::from_value::<BufferLineHeight>(json!("standard")).unwrap(),
-            BufferLineHeight::Standard
-        );
-        assert_eq!(
-            serde_json::from_value::<BufferLineHeight>(json!({"custom": 1.0})).unwrap(),
-            BufferLineHeight::Custom(1.0)
-        );
-        assert_eq!(
-            serde_json::from_value::<BufferLineHeight>(json!({"custom": 1.5})).unwrap(),
-            BufferLineHeight::Custom(1.5)
-        );
-    }
-
-    #[test]
-    fn test_buffer_line_height_deserialize_invalid() {
-        assert!(
-            serde_json::from_value::<BufferLineHeight>(json!({"custom": 0.99}))
-                .err()
-                .unwrap()
-                .to_string()
-                .contains("buffer_line_height.custom must be at least 1.0")
-        );
-        assert!(
-            serde_json::from_value::<BufferLineHeight>(json!({"custom": 0.0}))
-                .err()
-                .unwrap()
-                .to_string()
-                .contains("buffer_line_height.custom must be at least 1.0")
-        );
-        assert!(
-            serde_json::from_value::<BufferLineHeight>(json!({"custom": -1.0}))
-                .err()
-                .unwrap()
-                .to_string()
-                .contains("buffer_line_height.custom must be at least 1.0")
-        );
-    }
-
-    #[test]
-    fn test_buffer_font_weight_schema_has_default() {
-        use schemars::schema_for;
-
-        let schema = schema_for!(ThemeSettingsContent);
-        let schema_value = serde_json::to_value(&schema).unwrap();
-
-        let properties = &schema_value["properties"];
-        let buffer_font_weight = &properties["buffer_font_weight"];
-
-        assert!(
-            buffer_font_weight.get("default").is_some(),
-            "buffer_font_weight should have a default value in the schema"
-        );
-
-        let default_value = &buffer_font_weight["default"];
-        assert_eq!(
-            default_value.as_f64(),
-            Some(FontWeight::NORMAL.0 as f64),
-            "buffer_font_weight default should be 400.0 (FontWeight::NORMAL)"
-        );
-
-        let defs = &schema_value["$defs"];
-        let font_weight_def = &defs["FontWeight"];
-
-        assert_eq!(
-            font_weight_def["minimum"].as_f64(),
-            Some(FontWeight::THIN.0 as f64),
-            "FontWeight should have minimum of 100.0"
-        );
-        assert_eq!(
-            font_weight_def["maximum"].as_f64(),
-            Some(FontWeight::BLACK.0 as f64),
-            "FontWeight should have maximum of 900.0"
-        );
-        assert_eq!(
-            font_weight_def["default"].as_f64(),
-            Some(FontWeight::NORMAL.0 as f64),
-            "FontWeight should have default of 400.0"
-        );
-    }
-}
diff --git a/crates/settings/src/settings_content/workspace.rs b/crates/settings/src/settings_content/workspace.rs
deleted file mode 100644
index b809a8fa85..0000000000
--- a/crates/settings/src/settings_content/workspace.rs
+++ /dev/null
@@ -1,713 +0,0 @@
-use std::num::NonZeroUsize;
-
-use collections::HashMap;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use settings_macros::{MergeFrom, with_fallible_options};
-
-use crate::{
-    CenteredPaddingSettings, DelayMs, DockPosition, DockSide, InactiveOpacity,
-    ScrollbarSettingsContent, ShowIndentGuides, serialize_optional_f32_with_two_decimal_places,
-};
-
-#[with_fallible_options]
-#[derive(Clone, Debug, PartialEq, Default, Serialize, Deserialize, JsonSchema, MergeFrom)]
-pub struct WorkspaceSettingsContent {
-    /// Active pane styling settings.
-    pub active_pane_modifiers: Option<ActivePaneModifiers>,
-    /// Layout mode for the bottom dock
-    ///
-    /// Default: contained
-    pub bottom_dock_layout: Option<BottomDockLayout>,
-    /// Direction to split horizontally.
-    ///
-    /// Default: "up"
-    pub pane_split_direction_horizontal: Option<PaneSplitDirectionHorizontal>,
-    /// Direction to split vertically.
-    ///
-    /// Default: "left"
-    pub pane_split_direction_vertical: Option<PaneSplitDirectionVertical>,
-    /// Centered layout related settings.
-    pub centered_layout: Option<CenteredLayoutSettings>,
-    /// Whether or not to prompt the user to confirm before closing the application.
-    ///
-    /// Default: false
-    pub confirm_quit: Option<bool>,
-    /// Whether or not to show the call status icon in the status bar.
-    ///
-    /// Default: true
-    pub show_call_status_icon: Option<bool>,
-    /// When to automatically save edited buffers.
-    ///
-    /// Default: off
-    pub autosave: Option<AutosaveSetting>,
-    /// Controls previous session restoration in freshly launched Zed instance.
-    /// Values: none, last_workspace, last_session
-    /// Default: last_session
-    pub restore_on_startup: Option<RestoreOnStartupBehavior>,
-    /// Whether to attempt to restore previous file's state when opening it again.
-    /// The state is stored per pane.
-    /// When disabled, defaults are applied instead of the state restoration.
-    ///
-    /// E.g. for editors, selections, folds and scroll positions are restored, if the same file is closed and, later, opened again in the same pane.
-    /// When disabled, a single selection in the very beginning of the file, zero scroll position and no folds state is used as a default.
-    ///
-    /// Default: true
-    pub restore_on_file_reopen: Option<bool>,
-    /// The size of the workspace split drop targets on the outer edges.
-    /// Given as a fraction that will be multiplied by the smaller dimension of the workspace.
-    ///
-    /// Default: `0.2` (20% of the smaller dimension of the workspace)
-    #[serde(serialize_with = "serialize_optional_f32_with_two_decimal_places")]
-    pub drop_target_size: Option<f32>,
-    /// Whether to close the window when using 'close active item' on a workspace with no tabs
-    ///
-    /// Default: auto ("on" on macOS, "off" otherwise)
-    pub when_closing_with_no_tabs: Option<CloseWindowWhenNoItems>,
-    /// Whether to use the system provided dialogs for Open and Save As.
-    /// When set to false, Zed will use the built-in keyboard-first pickers.
-    ///
-    /// Default: true
-    pub use_system_path_prompts: Option<bool>,
-    /// Whether to use the system provided prompts.
-    /// When set to false, Zed will use the built-in prompts.
-    /// Note that this setting has no effect on Linux, where Zed will always
-    /// use the built-in prompts.
-    ///
-    /// Default: true
-    pub use_system_prompts: Option<bool>,
-    /// Aliases for the command palette. When you type a key in this map,
-    /// it will be assumed to equal the value.
-    ///
-    /// Default: true
-    #[serde(default)]
-    pub command_aliases: HashMap<String, String>,
-    /// Maximum open tabs in a pane. Will not close an unsaved
-    /// tab. Set to `None` for unlimited tabs.
-    ///
-    /// Default: none
-    pub max_tabs: Option<NonZeroUsize>,
-    /// What to do when the last window is closed
-    ///
-    /// Default: auto (nothing on macOS, "app quit" otherwise)
-    pub on_last_window_closed: Option<OnLastWindowClosed>,
-    /// Whether to resize all the panels in a dock when resizing the dock.
-    ///
-    /// Default: ["left"]
-    pub resize_all_panels_in_dock: Option<Vec<DockPosition>>,
-    /// Whether to automatically close files that have been deleted on disk.
-    ///
-    /// Default: false
-    pub close_on_file_delete: Option<bool>,
-    /// Whether to allow windows to tab together based on the user’s tabbing preference (macOS only).
-    ///
-    /// Default: false
-    pub use_system_window_tabs: Option<bool>,
-    /// Whether to show padding for zoomed panels.
-    /// When enabled, zoomed bottom panels will have some top padding,
-    /// while zoomed left/right panels will have padding to the right/left (respectively).
-    ///
-    /// Default: true
-    pub zoomed_padding: Option<bool>,
-    /// What draws window decorations/titlebar, the client application (Zed) or display server
-    /// Default: client
-    pub window_decorations: Option<WindowDecorations>,
-}
-
-#[with_fallible_options]
-#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize, JsonSchema, MergeFrom)]
-pub struct ItemSettingsContent {
-    /// Whether to show the Git file status on a tab item.
-    ///
-    /// Default: false
-    pub git_status: Option<bool>,
-    /// Position of the close button in a tab.
-    ///
-    /// Default: right
-    pub close_position: Option<ClosePosition>,
-    /// Whether to show the file icon for a tab.
-    ///
-    /// Default: false
-    pub file_icons: Option<bool>,
-    /// What to do after closing the current tab.
-    ///
-    /// Default: history
-    pub activate_on_close: Option<ActivateOnClose>,
-    /// Which files containing diagnostic errors/warnings to mark in the tabs.
-    /// This setting can take the following three values:
-    ///
-    /// Default: off
-    pub show_diagnostics: Option<ShowDiagnostics>,
-    /// Whether to always show the close button on tabs.
-    ///
-    /// Default: false
-    pub show_close_button: Option<ShowCloseButton>,
-}
-
-#[with_fallible_options]
-#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize, JsonSchema, MergeFrom)]
-pub struct PreviewTabsSettingsContent {
-    /// Whether to show opened editors as preview tabs.
-    /// Preview tabs do not stay open, are reused until explicitly set to be kept open opened (via double-click or editing) and show file names in italic.
-    ///
-    /// Default: true
-    pub enabled: Option<bool>,
-    /// Whether to open tabs in preview mode when opened from the project panel with a single click.
-    ///
-    /// Default: true
-    pub enable_preview_from_project_panel: Option<bool>,
-    /// Whether to open tabs in preview mode when selected from the file finder.
-    ///
-    /// Default: false
-    pub enable_preview_from_file_finder: Option<bool>,
-    /// Whether to open tabs in preview mode when opened from a multibuffer.
-    ///
-    /// Default: true
-    pub enable_preview_from_multibuffer: Option<bool>,
-    /// Whether to open tabs in preview mode when code navigation is used to open a multibuffer.
-    ///
-    /// Default: false
-    pub enable_preview_multibuffer_from_code_navigation: Option<bool>,
-    /// Whether to open tabs in preview mode when code navigation is used to open a single file.
-    ///
-    /// Default: true
-    pub enable_preview_file_from_code_navigation: Option<bool>,
-    /// Whether to keep tabs in preview mode when code navigation is used to navigate away from them.
-    /// If `enable_preview_file_from_code_navigation` or `enable_preview_multibuffer_from_code_navigation` is also true, the new tab may replace the existing one.
-    ///
-    /// Default: false
-    pub enable_keep_preview_on_code_navigation: Option<bool>,
-}
-
-#[derive(
-    Copy,
-    Clone,
-    Debug,
-    PartialEq,
-    Default,
-    Serialize,
-    Deserialize,
-    JsonSchema,
-    MergeFrom,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "lowercase")]
-pub enum ClosePosition {
-    Left,
-    #[default]
-    Right,
-}
-
-#[derive(
-    Copy,
-    Clone,
-    Debug,
-    PartialEq,
-    Default,
-    Serialize,
-    Deserialize,
-    JsonSchema,
-    MergeFrom,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "lowercase")]
-pub enum ShowCloseButton {
-    Always,
-    #[default]
-    Hover,
-    Hidden,
-}
-
-#[derive(
-    Copy,
-    Clone,
-    Debug,
-    Default,
-    Serialize,
-    Deserialize,
-    JsonSchema,
-    MergeFrom,
-    PartialEq,
-    Eq,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum ShowDiagnostics {
-    #[default]
-    Off,
-    Errors,
-    All,
-}
-
-#[derive(
-    Copy,
-    Clone,
-    Debug,
-    PartialEq,
-    Default,
-    Serialize,
-    Deserialize,
-    JsonSchema,
-    MergeFrom,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum ActivateOnClose {
-    #[default]
-    History,
-    Neighbour,
-    LeftNeighbour,
-}
-
-#[with_fallible_options]
-#[derive(Copy, Clone, PartialEq, Debug, Default, Serialize, Deserialize, JsonSchema, MergeFrom)]
-#[serde(rename_all = "snake_case")]
-pub struct ActivePaneModifiers {
-    /// Size of the border surrounding the active pane.
-    /// When set to 0, the active pane doesn't have any border.
-    /// The border is drawn inset.
-    ///
-    /// Default: `0.0`
-    #[serde(serialize_with = "crate::serialize_optional_f32_with_two_decimal_places")]
-    pub border_size: Option<f32>,
-    /// Opacity of inactive panels.
-    /// When set to 1.0, the inactive panes have the same opacity as the active one.
-    /// If set to 0, the inactive panes content will not be visible at all.
-    /// Values are clamped to the [0.0, 1.0] range.
-    ///
-    /// Default: `1.0`
-    #[schemars(range(min = 0.0, max = 1.0))]
-    pub inactive_opacity: Option<InactiveOpacity>,
-}
-
-#[derive(
-    Copy,
-    Clone,
-    Debug,
-    Default,
-    Serialize,
-    Deserialize,
-    PartialEq,
-    JsonSchema,
-    MergeFrom,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum BottomDockLayout {
-    /// Contained between the left and right docks
-    #[default]
-    Contained,
-    /// Takes up the full width of the window
-    Full,
-    /// Extends under the left dock while snapping to the right dock
-    LeftAligned,
-    /// Extends under the right dock while snapping to the left dock
-    RightAligned,
-}
-
-#[derive(
-    Copy,
-    Clone,
-    Default,
-    Debug,
-    Serialize,
-    Deserialize,
-    PartialEq,
-    JsonSchema,
-    MergeFrom,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum WindowDecorations {
-    /// Zed draws its own window decorations/titlebar (client-side decoration)
-    #[default]
-    Client,
-    /// Show system's window titlebar (server-side decoration; not supported by GNOME Wayland)
-    Server,
-}
-
-#[derive(
-    Copy,
-    Clone,
-    PartialEq,
-    Default,
-    Serialize,
-    Deserialize,
-    JsonSchema,
-    MergeFrom,
-    Debug,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum CloseWindowWhenNoItems {
-    /// Match platform conventions by default, so "on" on macOS and "off" everywhere else
-    #[default]
-    PlatformDefault,
-    /// Close the window when there are no tabs
-    CloseWindow,
-    /// Leave the window open when there are no tabs
-    KeepWindowOpen,
-}
-
-impl CloseWindowWhenNoItems {
-    pub fn should_close(&self) -> bool {
-        match self {
-            CloseWindowWhenNoItems::PlatformDefault => cfg!(target_os = "macos"),
-            CloseWindowWhenNoItems::CloseWindow => true,
-            CloseWindowWhenNoItems::KeepWindowOpen => false,
-        }
-    }
-}
-
-#[derive(
-    Copy,
-    Clone,
-    PartialEq,
-    Eq,
-    Default,
-    Serialize,
-    Deserialize,
-    JsonSchema,
-    MergeFrom,
-    Debug,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum RestoreOnStartupBehavior {
-    /// Always start with an empty editor
-    None,
-    /// Restore the workspace that was closed last.
-    LastWorkspace,
-    /// Restore all workspaces that were open when quitting Zed.
-    #[default]
-    LastSession,
-}
-
-#[with_fallible_options]
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, MergeFrom, Debug, PartialEq)]
-pub struct TabBarSettingsContent {
-    /// Whether or not to show the tab bar in the editor.
-    ///
-    /// Default: true
-    pub show: Option<bool>,
-    /// Whether or not to show the navigation history buttons in the tab bar.
-    ///
-    /// Default: true
-    pub show_nav_history_buttons: Option<bool>,
-    /// Whether or not to show the tab bar buttons.
-    ///
-    /// Default: true
-    pub show_tab_bar_buttons: Option<bool>,
-}
-
-#[with_fallible_options]
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, MergeFrom, Debug, PartialEq, Eq)]
-pub struct StatusBarSettingsContent {
-    /// Whether to show the status bar.
-    ///
-    /// Default: true
-    #[serde(rename = "experimental.show")]
-    pub show: Option<bool>,
-    /// Whether to display the active language button in the status bar.
-    ///
-    /// Default: true
-    pub active_language_button: Option<bool>,
-    /// Whether to show the cursor position button in the status bar.
-    ///
-    /// Default: true
-    pub cursor_position_button: Option<bool>,
-    /// Whether to show active line endings button in the status bar.
-    ///
-    /// Default: false
-    pub line_endings_button: Option<bool>,
-}
-
-#[derive(
-    Copy,
-    Clone,
-    Debug,
-    Serialize,
-    Deserialize,
-    PartialEq,
-    Eq,
-    JsonSchema,
-    MergeFrom,
-    strum::EnumDiscriminants,
-)]
-#[strum_discriminants(derive(strum::VariantArray, strum::VariantNames, strum::FromRepr))]
-#[serde(rename_all = "snake_case")]
-pub enum AutosaveSetting {
-    /// Disable autosave.
-    Off,
-    /// Save after inactivity period of `milliseconds`.
-    AfterDelay { milliseconds: DelayMs },
-    /// Autosave when focus changes.
-    OnFocusChange,
-    /// Autosave when the active window changes.
-    OnWindowChange,
-}
-
-impl AutosaveSetting {
-    pub fn should_save_on_close(&self) -> bool {
-        matches!(
-            &self,
-            AutosaveSetting::OnFocusChange
-                | AutosaveSetting::OnWindowChange
-                | AutosaveSetting::AfterDelay { .. }
-        )
-    }
-}
-
-#[derive(
-    Copy,
-    Clone,
-    Debug,
-    Serialize,
-    Deserialize,
-    PartialEq,
-    Eq,
-    JsonSchema,
-    MergeFrom,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum PaneSplitDirectionHorizontal {
-    Up,
-    Down,
-}
-
-#[derive(
-    Copy,
-    Clone,
-    Debug,
-    Serialize,
-    Deserialize,
-    PartialEq,
-    Eq,
-    JsonSchema,
-    MergeFrom,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum PaneSplitDirectionVertical {
-    Left,
-    Right,
-}
-
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, MergeFrom, PartialEq, Default)]
-#[serde(rename_all = "snake_case")]
-#[with_fallible_options]
-pub struct CenteredLayoutSettings {
-    /// The relative width of the left padding of the central pane from the
-    /// workspace when the centered layout is used.
-    ///
-    /// Default: 0.2
-    pub left_padding: Option<CenteredPaddingSettings>,
-    // The relative width of the right padding of the central pane from the
-    // workspace when the centered layout is used.
-    ///
-    /// Default: 0.2
-    pub right_padding: Option<CenteredPaddingSettings>,
-}
-
-#[derive(
-    Copy,
-    Clone,
-    Default,
-    Serialize,
-    Deserialize,
-    JsonSchema,
-    MergeFrom,
-    PartialEq,
-    Debug,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum OnLastWindowClosed {
-    /// Match platform conventions by default, so don't quit on macOS, and quit on other platforms
-    #[default]
-    PlatformDefault,
-    /// Quit the application the last window is closed
-    QuitApp,
-}
-
-impl OnLastWindowClosed {
-    pub fn is_quit_app(&self) -> bool {
-        match self {
-            OnLastWindowClosed::PlatformDefault => false,
-            OnLastWindowClosed::QuitApp => true,
-        }
-    }
-}
-
-#[with_fallible_options]
-#[derive(Clone, PartialEq, Default, Serialize, Deserialize, JsonSchema, MergeFrom, Debug)]
-pub struct ProjectPanelAutoOpenSettings {
-    /// Whether to automatically open newly created files in the editor.
-    ///
-    /// Default: true
-    pub on_create: Option<bool>,
-    /// Whether to automatically open files after pasting or duplicating them.
-    ///
-    /// Default: true
-    pub on_paste: Option<bool>,
-    /// Whether to automatically open files dropped from external sources.
-    ///
-    /// Default: true
-    pub on_drop: Option<bool>,
-}
-
-#[with_fallible_options]
-#[derive(Clone, PartialEq, Default, Serialize, Deserialize, JsonSchema, MergeFrom, Debug)]
-pub struct ProjectPanelSettingsContent {
-    /// Whether to show the project panel button in the status bar.
-    ///
-    /// Default: true
-    pub button: Option<bool>,
-    /// Whether to hide gitignore files in the project panel.
-    ///
-    /// Default: false
-    pub hide_gitignore: Option<bool>,
-    /// Customize default width (in pixels) taken by project panel
-    ///
-    /// Default: 240
-    #[serde(serialize_with = "crate::serialize_optional_f32_with_two_decimal_places")]
-    pub default_width: Option<f32>,
-    /// The position of project panel
-    ///
-    /// Default: left
-    pub dock: Option<DockSide>,
-    /// Spacing between worktree entries in the project panel.
-    ///
-    /// Default: comfortable
-    pub entry_spacing: Option<ProjectPanelEntrySpacing>,
-    /// Whether to show file icons in the project panel.
-    ///
-    /// Default: true
-    pub file_icons: Option<bool>,
-    /// Whether to show folder icons or chevrons for directories in the project panel.
-    ///
-    /// Default: true
-    pub folder_icons: Option<bool>,
-    /// Whether to show the git status in the project panel.
-    ///
-    /// Default: true
-    pub git_status: Option<bool>,
-    /// Amount of indentation (in pixels) for nested items.
-    ///
-    /// Default: 20
-    #[serde(serialize_with = "serialize_optional_f32_with_two_decimal_places")]
-    pub indent_size: Option<f32>,
-    /// Whether to reveal it in the project panel automatically,
-    /// when a corresponding project entry becomes active.
-    /// Gitignored entries are never auto revealed.
-    ///
-    /// Default: true
-    pub auto_reveal_entries: Option<bool>,
-    /// Whether to fold directories automatically
-    /// when directory has only one directory inside.
-    ///
-    /// Default: true
-    pub auto_fold_dirs: Option<bool>,
-    /// Whether the project panel should open on startup.
-    ///
-    /// Default: true
-    pub starts_open: Option<bool>,
-    /// Scrollbar-related settings
-    pub scrollbar: Option<ScrollbarSettingsContent>,
-    /// Which files containing diagnostic errors/warnings to mark in the project panel.
-    ///
-    /// Default: all
-    pub show_diagnostics: Option<ShowDiagnostics>,
-    /// Settings related to indent guides in the project panel.
-    pub indent_guides: Option<ProjectPanelIndentGuidesSettings>,
-    /// Whether to hide the root entry when only one folder is open in the window.
-    ///
-    /// Default: false
-    pub hide_root: Option<bool>,
-    /// Whether to hide the hidden entries in the project panel.
-    ///
-    /// Default: false
-    pub hide_hidden: Option<bool>,
-    /// Whether to stick parent directories at top of the project panel.
-    ///
-    /// Default: true
-    pub sticky_scroll: Option<bool>,
-    /// Whether to enable drag-and-drop operations in the project panel.
-    ///
-    /// Default: true
-    pub drag_and_drop: Option<bool>,
-    /// Settings for automatically opening files.
-    pub auto_open: Option<ProjectPanelAutoOpenSettings>,
-    /// How to order sibling entries in the project panel.
-    ///
-    /// Default: directories_first
-    pub sort_mode: Option<ProjectPanelSortMode>,
-}
-
-#[derive(
-    Copy,
-    Clone,
-    Debug,
-    Default,
-    Serialize,
-    Deserialize,
-    JsonSchema,
-    MergeFrom,
-    PartialEq,
-    Eq,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum ProjectPanelEntrySpacing {
-    /// Comfortable spacing of entries.
-    #[default]
-    Comfortable,
-    /// The standard spacing of entries.
-    Standard,
-}
-
-#[derive(
-    Copy,
-    Clone,
-    Debug,
-    Default,
-    Serialize,
-    Deserialize,
-    JsonSchema,
-    MergeFrom,
-    PartialEq,
-    Eq,
-    strum::VariantArray,
-    strum::VariantNames,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum ProjectPanelSortMode {
-    /// Show directories first, then files
-    #[default]
-    DirectoriesFirst,
-    /// Mix directories and files together
-    Mixed,
-    /// Show files first, then directories
-    FilesFirst,
-}
-
-#[with_fallible_options]
-#[derive(
-    Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, MergeFrom, PartialEq, Eq, Default,
-)]
-pub struct ProjectPanelIndentGuidesSettings {
-    pub show: Option<ShowIndentGuides>,
-}
diff --git a/crates/settings/src/settings_file.rs b/crates/settings/src/settings_file.rs
deleted file mode 100644
index df6aa8bbb4..0000000000
--- a/crates/settings/src/settings_file.rs
+++ /dev/null
@@ -1,135 +0,0 @@
-use crate::{settings_content::SettingsContent, settings_store::SettingsStore};
-use collections::HashSet;
-use fs::{Fs, PathEventKind};
-use futures::{StreamExt, channel::mpsc};
-use gpui::{App, BackgroundExecutor, ReadGlobal};
-use std::{path::PathBuf, sync::Arc, time::Duration};
-
-pub const EMPTY_THEME_NAME: &str = "empty-theme";
-
-#[cfg(any(test, feature = "test-support"))]
-pub fn test_settings() -> String {
-    let mut value =
-        crate::parse_json_with_comments::<serde_json::Value>(crate::default_settings().as_ref())
-            .unwrap();
-    #[cfg(not(target_os = "windows"))]
-    util::merge_non_null_json_value_into(
-        serde_json::json!({
-            "ui_font_family": "Courier",
-            "ui_font_features": {},
-            "ui_font_size": 14,
-            "ui_font_fallback": [],
-            "buffer_font_family": "Courier",
-            "buffer_font_features": {},
-            "buffer_font_size": 14,
-            "buffer_font_fallbacks": [],
-            "theme": EMPTY_THEME_NAME,
-        }),
-        &mut value,
-    );
-    #[cfg(target_os = "windows")]
-    util::merge_non_null_json_value_into(
-        serde_json::json!({
-            "ui_font_family": "Courier New",
-            "ui_font_features": {},
-            "ui_font_size": 14,
-            "ui_font_fallback": [],
-            "buffer_font_family": "Courier New",
-            "buffer_font_features": {},
-            "buffer_font_size": 14,
-            "buffer_font_fallbacks": [],
-            "theme": EMPTY_THEME_NAME,
-        }),
-        &mut value,
-    );
-    value.as_object_mut().unwrap().remove("languages");
-    serde_json::to_string(&value).unwrap()
-}
-
-pub fn watch_config_file(
-    executor: &BackgroundExecutor,
-    fs: Arc<dyn Fs>,
-    path: PathBuf,
-) -> mpsc::UnboundedReceiver<String> {
-    let (tx, rx) = mpsc::unbounded();
-    executor
-        .spawn(async move {
-            let (events, _) = fs.watch(&path, Duration::from_millis(100)).await;
-            futures::pin_mut!(events);
-
-            let contents = fs.load(&path).await.unwrap_or_default();
-            if tx.unbounded_send(contents).is_err() {
-                return;
-            }
-
-            loop {
-                if events.next().await.is_none() {
-                    break;
-                }
-
-                if let Ok(contents) = fs.load(&path).await
-                    && tx.unbounded_send(contents).is_err()
-                {
-                    break;
-                }
-            }
-        })
-        .detach();
-    rx
-}
-
-pub fn watch_config_dir(
-    executor: &BackgroundExecutor,
-    fs: Arc<dyn Fs>,
-    dir_path: PathBuf,
-    config_paths: HashSet<PathBuf>,
-) -> mpsc::UnboundedReceiver<String> {
-    let (tx, rx) = mpsc::unbounded();
-    executor
-        .spawn(async move {
-            for file_path in &config_paths {
-                if fs.metadata(file_path).await.is_ok_and(|v| v.is_some())
-                    && let Ok(contents) = fs.load(file_path).await
-                    && tx.unbounded_send(contents).is_err()
-                {
-                    return;
-                }
-            }
-
-            let (events, _) = fs.watch(&dir_path, Duration::from_millis(100)).await;
-            futures::pin_mut!(events);
-
-            while let Some(event_batch) = events.next().await {
-                for event in event_batch {
-                    if config_paths.contains(&event.path) {
-                        match event.kind {
-                            Some(PathEventKind::Removed) => {
-                                if tx.unbounded_send(String::new()).is_err() {
-                                    return;
-                                }
-                            }
-                            Some(PathEventKind::Created) | Some(PathEventKind::Changed) => {
-                                if let Ok(contents) = fs.load(&event.path).await
-                                    && tx.unbounded_send(contents).is_err()
-                                {
-                                    return;
-                                }
-                            }
-                            _ => {}
-                        }
-                    }
-                }
-            }
-        })
-        .detach();
-
-    rx
-}
-
-pub fn update_settings_file(
-    fs: Arc<dyn Fs>,
-    cx: &App,
-    update: impl 'static + Send + FnOnce(&mut SettingsContent, &App),
-) {
-    SettingsStore::global(cx).update_settings_file(fs, update);
-}
diff --git a/crates/settings/src/settings_store.rs b/crates/settings/src/settings_store.rs
deleted file mode 100644
index 72e2d3ef09..0000000000
--- a/crates/settings/src/settings_store.rs
+++ /dev/null
@@ -1,2296 +0,0 @@
-use anyhow::{Context as _, Result};
-use collections::{BTreeMap, HashMap, btree_map, hash_map};
-use ec4rs::{ConfigParser, PropertiesSource, Section};
-use fs::Fs;
-use futures::{
-    FutureExt, StreamExt,
-    channel::{mpsc, oneshot},
-    future::LocalBoxFuture,
-};
-use gpui::{App, AsyncApp, BorrowAppContext, Global, SharedString, Task, UpdateGlobal};
-
-use paths::{EDITORCONFIG_NAME, local_settings_file_relative_path, task_file_name};
-use schemars::{JsonSchema, json_schema};
-use serde_json::Value;
-use smallvec::SmallVec;
-use std::{
-    any::{Any, TypeId, type_name},
-    fmt::Debug,
-    ops::Range,
-    path::PathBuf,
-    rc::Rc,
-    str::{self, FromStr},
-    sync::Arc,
-};
-use util::{
-    ResultExt as _,
-    rel_path::RelPath,
-    schemars::{AllowTrailingCommas, DefaultDenyUnknownFields, replace_subschema},
-};
-
-pub type EditorconfigProperties = ec4rs::Properties;
-
-use crate::{
-    ActiveSettingsProfileName, FontFamilyName, IconThemeName, LanguageSettingsContent,
-    LanguageToSettingsMap, ThemeName, VsCodeSettings, WorktreeId, fallible_options,
-    merge_from::MergeFrom,
-    settings_content::{
-        ExtensionsSettingsContent, ProjectSettingsContent, SettingsContent, UserSettingsContent,
-    },
-};
-
-use settings_json::{infer_json_indent_size, parse_json_with_comments, update_value_in_json_text};
-
-pub trait SettingsKey: 'static + Send + Sync {
-    /// The name of a key within the JSON file from which this setting should
-    /// be deserialized. If this is `None`, then the setting will be deserialized
-    /// from the root object.
-    const KEY: Option<&'static str>;
-
-    const FALLBACK_KEY: Option<&'static str> = None;
-}
-
-/// A value that can be defined as a user setting.
-///
-/// Settings can be loaded from a combination of multiple JSON files.
-pub trait Settings: 'static + Send + Sync + Sized {
-    /// The name of the keys in the [`FileContent`](Self::FileContent) that should
-    /// always be written to a settings file, even if their value matches the default
-    /// value.
-    ///
-    /// This is useful for tagged [`FileContent`](Self::FileContent)s where the tag
-    /// is a "version" field that should always be persisted, even if the current
-    /// user settings match the current version of the settings.
-    const PRESERVED_KEYS: Option<&'static [&'static str]> = None;
-
-    /// Read the value from default.json.
-    ///
-    /// This function *should* panic if default values are missing,
-    /// and you should add a default to default.json for documentation.
-    fn from_settings(content: &SettingsContent) -> Self;
-
-    #[track_caller]
-    fn register(cx: &mut App)
-    where
-        Self: Sized,
-    {
-        SettingsStore::update_global(cx, |store, _| {
-            store.register_setting::<Self>();
-        });
-    }
-
-    #[track_caller]
-    fn get<'a>(path: Option<SettingsLocation>, cx: &'a App) -> &'a Self
-    where
-        Self: Sized,
-    {
-        cx.global::<SettingsStore>().get(path)
-    }
-
-    #[track_caller]
-    fn get_global(cx: &App) -> &Self
-    where
-        Self: Sized,
-    {
-        cx.global::<SettingsStore>().get(None)
-    }
-
-    #[track_caller]
-    fn try_get(cx: &App) -> Option<&Self>
-    where
-        Self: Sized,
-    {
-        if cx.has_global::<SettingsStore>() {
-            cx.global::<SettingsStore>().try_get(None)
-        } else {
-            None
-        }
-    }
-
-    #[track_caller]
-    fn try_read_global<R>(cx: &AsyncApp, f: impl FnOnce(&Self) -> R) -> Option<R>
-    where
-        Self: Sized,
-    {
-        cx.try_read_global(|s: &SettingsStore, _| f(s.get(None)))
-    }
-
-    #[track_caller]
-    fn override_global(settings: Self, cx: &mut App)
-    where
-        Self: Sized,
-    {
-        cx.global_mut::<SettingsStore>().override_global(settings)
-    }
-}
-
-pub struct RegisteredSetting {
-    pub settings_value: fn() -> Box<dyn AnySettingValue>,
-    pub from_settings: fn(&SettingsContent) -> Box<dyn Any>,
-    pub id: fn() -> TypeId,
-}
-
-inventory::collect!(RegisteredSetting);
-
-#[derive(Clone, Copy, Debug)]
-pub struct SettingsLocation<'a> {
-    pub worktree_id: WorktreeId,
-    pub path: &'a RelPath,
-}
-
-pub struct SettingsStore {
-    setting_values: HashMap<TypeId, Box<dyn AnySettingValue>>,
-    default_settings: Rc<SettingsContent>,
-    user_settings: Option<UserSettingsContent>,
-    global_settings: Option<Box<SettingsContent>>,
-
-    extension_settings: Option<Box<SettingsContent>>,
-    server_settings: Option<Box<SettingsContent>>,
-
-    merged_settings: Rc<SettingsContent>,
-
-    local_settings: BTreeMap<(WorktreeId, Arc<RelPath>), SettingsContent>,
-    raw_editorconfig_settings: BTreeMap<(WorktreeId, Arc<RelPath>), (String, Option<Editorconfig>)>,
-
-    _setting_file_updates: Task<()>,
-    setting_file_updates_tx:
-        mpsc::UnboundedSender<Box<dyn FnOnce(AsyncApp) -> LocalBoxFuture<'static, Result<()>>>>,
-    file_errors: BTreeMap<SettingsFile, SettingsParseResult>,
-}
-
-#[derive(Clone, PartialEq, Eq, Debug)]
-pub enum SettingsFile {
-    Default,
-    Global,
-    User,
-    Server,
-    /// Represents project settings in ssh projects as well as local projects
-    Project((WorktreeId, Arc<RelPath>)),
-}
-
-impl PartialOrd for SettingsFile {
-    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-/// Sorted in order of precedence
-impl Ord for SettingsFile {
-    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
-        use SettingsFile::*;
-        use std::cmp::Ordering;
-        match (self, other) {
-            (User, User) => Ordering::Equal,
-            (Server, Server) => Ordering::Equal,
-            (Default, Default) => Ordering::Equal,
-            (Project((id1, rel_path1)), Project((id2, rel_path2))) => id1
-                .cmp(id2)
-                .then_with(|| rel_path1.cmp(rel_path2).reverse()),
-            (Project(_), _) => Ordering::Less,
-            (_, Project(_)) => Ordering::Greater,
-            (Server, _) => Ordering::Less,
-            (_, Server) => Ordering::Greater,
-            (User, _) => Ordering::Less,
-            (_, User) => Ordering::Greater,
-            (Global, _) => Ordering::Less,
-            (_, Global) => Ordering::Greater,
-        }
-    }
-}
-
-#[derive(Clone)]
-pub struct Editorconfig {
-    pub is_root: bool,
-    pub sections: SmallVec<[Section; 5]>,
-}
-
-impl FromStr for Editorconfig {
-    type Err = anyhow::Error;
-
-    fn from_str(contents: &str) -> Result<Self, Self::Err> {
-        let parser = ConfigParser::new_buffered(contents.as_bytes())
-            .context("creating editorconfig parser")?;
-        let is_root = parser.is_root;
-        let sections = parser
-            .collect::<Result<SmallVec<_>, _>>()
-            .context("parsing editorconfig sections")?;
-        Ok(Self { is_root, sections })
-    }
-}
-
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
-pub enum LocalSettingsKind {
-    Settings,
-    Tasks,
-    Editorconfig,
-    Debug,
-}
-
-impl Global for SettingsStore {}
-
-#[doc(hidden)]
-#[derive(Debug)]
-pub struct SettingValue<T> {
-    #[doc(hidden)]
-    pub global_value: Option<T>,
-    #[doc(hidden)]
-    pub local_values: Vec<(WorktreeId, Arc<RelPath>, T)>,
-}
-
-#[doc(hidden)]
-pub trait AnySettingValue: 'static + Send + Sync {
-    fn setting_type_name(&self) -> &'static str;
-
-    fn from_settings(&self, s: &SettingsContent) -> Box<dyn Any>;
-
-    fn value_for_path(&self, path: Option<SettingsLocation>) -> &dyn Any;
-    fn all_local_values(&self) -> Vec<(WorktreeId, Arc<RelPath>, &dyn Any)>;
-    fn set_global_value(&mut self, value: Box<dyn Any>);
-    fn set_local_value(&mut self, root_id: WorktreeId, path: Arc<RelPath>, value: Box<dyn Any>);
-}
-
-/// Parameters that are used when generating some JSON schemas at runtime.
-pub struct SettingsJsonSchemaParams<'a> {
-    pub language_names: &'a [String],
-    pub font_names: &'a [String],
-    pub theme_names: &'a [SharedString],
-    pub icon_theme_names: &'a [SharedString],
-}
-
-impl SettingsStore {
-    pub fn new(cx: &App, default_settings: &str) -> Self {
-        let (setting_file_updates_tx, mut setting_file_updates_rx) = mpsc::unbounded();
-        let default_settings: Rc<SettingsContent> =
-            parse_json_with_comments(default_settings).unwrap();
-        let mut this = Self {
-            setting_values: Default::default(),
-            default_settings: default_settings.clone(),
-            global_settings: None,
-            server_settings: None,
-            user_settings: None,
-            extension_settings: None,
-
-            merged_settings: default_settings,
-            local_settings: BTreeMap::default(),
-            raw_editorconfig_settings: BTreeMap::default(),
-            setting_file_updates_tx,
-            _setting_file_updates: cx.spawn(async move |cx| {
-                while let Some(setting_file_update) = setting_file_updates_rx.next().await {
-                    (setting_file_update)(cx.clone()).await.log_err();
-                }
-            }),
-            file_errors: BTreeMap::default(),
-        };
-
-        this.load_settings_types();
-
-        this
-    }
-
-    pub fn observe_active_settings_profile_name(cx: &mut App) -> gpui::Subscription {
-        cx.observe_global::<ActiveSettingsProfileName>(|cx| {
-            Self::update_global(cx, |store, cx| {
-                store.recompute_values(None, cx);
-            });
-        })
-    }
-
-    pub fn update<C, R>(cx: &mut C, f: impl FnOnce(&mut Self, &mut C) -> R) -> R
-    where
-        C: BorrowAppContext,
-    {
-        cx.update_global(f)
-    }
-
-    /// Add a new type of setting to the store.
-    pub fn register_setting<T: Settings>(&mut self) {
-        self.register_setting_internal(&RegisteredSetting {
-            settings_value: || {
-                Box::new(SettingValue::<T> {
-                    global_value: None,
-                    local_values: Vec::new(),
-                })
-            },
-            from_settings: |content| Box::new(T::from_settings(content)),
-            id: || TypeId::of::<T>(),
-        });
-    }
-
-    fn load_settings_types(&mut self) {
-        for registered_setting in inventory::iter::<RegisteredSetting>() {
-            self.register_setting_internal(registered_setting);
-        }
-    }
-
-    fn register_setting_internal(&mut self, registered_setting: &RegisteredSetting) {
-        let entry = self.setting_values.entry((registered_setting.id)());
-
-        if matches!(entry, hash_map::Entry::Occupied(_)) {
-            return;
-        }
-
-        let setting_value = entry.or_insert((registered_setting.settings_value)());
-        let value = (registered_setting.from_settings)(&self.merged_settings);
-        setting_value.set_global_value(value);
-    }
-
-    /// Get the value of a setting.
-    ///
-    /// Panics if the given setting type has not been registered, or if there is no
-    /// value for this setting.
-    pub fn get<T: Settings>(&self, path: Option<SettingsLocation>) -> &T {
-        self.setting_values
-            .get(&TypeId::of::<T>())
-            .unwrap_or_else(|| panic!("unregistered setting type {}", type_name::<T>()))
-            .value_for_path(path)
-            .downcast_ref::<T>()
-            .expect("no default value for setting type")
-    }
-
-    /// Get the value of a setting.
-    ///
-    /// Does not panic
-    pub fn try_get<T: Settings>(&self, path: Option<SettingsLocation>) -> Option<&T> {
-        self.setting_values
-            .get(&TypeId::of::<T>())
-            .map(|value| value.value_for_path(path))
-            .and_then(|value| value.downcast_ref::<T>())
-    }
-
-    /// Get all values from project specific settings
-    pub fn get_all_locals<T: Settings>(&self) -> Vec<(WorktreeId, Arc<RelPath>, &T)> {
-        self.setting_values
-            .get(&TypeId::of::<T>())
-            .unwrap_or_else(|| panic!("unregistered setting type {}", type_name::<T>()))
-            .all_local_values()
-            .into_iter()
-            .map(|(id, path, any)| {
-                (
-                    id,
-                    path,
-                    any.downcast_ref::<T>()
-                        .expect("wrong value type for setting"),
-                )
-            })
-            .collect()
-    }
-
-    /// Override the global value for a setting.
-    ///
-    /// The given value will be overwritten if the user settings file changes.
-    pub fn override_global<T: Settings>(&mut self, value: T) {
-        self.setting_values
-            .get_mut(&TypeId::of::<T>())
-            .unwrap_or_else(|| panic!("unregistered setting type {}", type_name::<T>()))
-            .set_global_value(Box::new(value))
-    }
-
-    /// Get the user's settings content.
-    ///
-    /// For user-facing functionality use the typed setting interface.
-    /// (e.g. ProjectSettings::get_global(cx))
-    pub fn raw_user_settings(&self) -> Option<&UserSettingsContent> {
-        self.user_settings.as_ref()
-    }
-
-    /// Get the default settings content as a raw JSON value.
-    pub fn raw_default_settings(&self) -> &SettingsContent {
-        &self.default_settings
-    }
-
-    /// Get the configured settings profile names.
-    pub fn configured_settings_profiles(&self) -> impl Iterator<Item = &str> {
-        self.user_settings
-            .iter()
-            .flat_map(|settings| settings.profiles.keys().map(|k| k.as_str()))
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn test(cx: &mut App) -> Self {
-        Self::new(cx, &crate::test_settings())
-    }
-
-    /// Updates the value of a setting in the user's global configuration.
-    ///
-    /// This is only for tests. Normally, settings are only loaded from
-    /// JSON files.
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn update_user_settings(
-        &mut self,
-        cx: &mut App,
-        update: impl FnOnce(&mut SettingsContent),
-    ) {
-        let mut content = self.user_settings.clone().unwrap_or_default().content;
-        update(&mut content);
-        let new_text = serde_json::to_string(&UserSettingsContent {
-            content,
-            ..Default::default()
-        })
-        .unwrap();
-        _ = self.set_user_settings(&new_text, cx);
-    }
-
-    pub async fn load_settings(fs: &Arc<dyn Fs>) -> Result<String> {
-        match fs.load(paths::settings_file()).await {
-            result @ Ok(_) => result,
-            Err(err) => {
-                if let Some(e) = err.downcast_ref::<std::io::Error>()
-                    && e.kind() == std::io::ErrorKind::NotFound
-                {
-                    return Ok(crate::initial_user_settings_content().to_string());
-                }
-                Err(err)
-            }
-        }
-    }
-
-    fn update_settings_file_inner(
-        &self,
-        fs: Arc<dyn Fs>,
-        update: impl 'static + Send + FnOnce(String, AsyncApp) -> Result<String>,
-    ) -> oneshot::Receiver<Result<()>> {
-        let (tx, rx) = oneshot::channel::<Result<()>>();
-        self.setting_file_updates_tx
-            .unbounded_send(Box::new(move |cx: AsyncApp| {
-                async move {
-                    let res = async move {
-                        let old_text = Self::load_settings(&fs).await?;
-                        let new_text = update(old_text, cx)?;
-                        let settings_path = paths::settings_file().as_path();
-                        if fs.is_file(settings_path).await {
-                            let resolved_path =
-                                fs.canonicalize(settings_path).await.with_context(|| {
-                                    format!(
-                                        "Failed to canonicalize settings path {:?}",
-                                        settings_path
-                                    )
-                                })?;
-
-                            fs.atomic_write(resolved_path.clone(), new_text)
-                                .await
-                                .with_context(|| {
-                                    format!("Failed to write settings to file {:?}", resolved_path)
-                                })?;
-                        } else {
-                            fs.atomic_write(settings_path.to_path_buf(), new_text)
-                                .await
-                                .with_context(|| {
-                                    format!("Failed to write settings to file {:?}", settings_path)
-                                })?;
-                        }
-                        anyhow::Ok(())
-                    }
-                    .await;
-
-                    let new_res = match &res {
-                        Ok(_) => anyhow::Ok(()),
-                        Err(e) => Err(anyhow::anyhow!("Failed to write settings to file {:?}", e)),
-                    };
-
-                    _ = tx.send(new_res);
-                    res
-                }
-                .boxed_local()
-            }))
-            .map_err(|err| anyhow::format_err!("Failed to update settings file: {}", err))
-            .log_with_level(log::Level::Warn);
-        return rx;
-    }
-
-    pub fn update_settings_file(
-        &self,
-        fs: Arc<dyn Fs>,
-        update: impl 'static + Send + FnOnce(&mut SettingsContent, &App),
-    ) {
-        _ = self.update_settings_file_inner(fs, move |old_text: String, cx: AsyncApp| {
-            cx.read_global(|store: &SettingsStore, cx| {
-                store.new_text_for_update(old_text, |content| update(content, cx))
-            })
-        });
-    }
-
-    pub fn import_vscode_settings(
-        &self,
-        fs: Arc<dyn Fs>,
-        vscode_settings: VsCodeSettings,
-    ) -> oneshot::Receiver<Result<()>> {
-        self.update_settings_file_inner(fs, move |old_text: String, cx: AsyncApp| {
-            cx.read_global(|store: &SettingsStore, _cx| {
-                store.get_vscode_edits(old_text, &vscode_settings)
-            })
-        })
-    }
-
-    pub fn get_all_files(&self) -> Vec<SettingsFile> {
-        let mut files = Vec::from_iter(
-            self.local_settings
-                .keys()
-                // rev because these are sorted by path, so highest precedence is last
-                .rev()
-                .cloned()
-                .map(SettingsFile::Project),
-        );
-
-        if self.server_settings.is_some() {
-            files.push(SettingsFile::Server);
-        }
-        // ignoring profiles
-        // ignoring os profiles
-        // ignoring release channel profiles
-        // ignoring global
-        // ignoring extension
-
-        if self.user_settings.is_some() {
-            files.push(SettingsFile::User);
-        }
-        files.push(SettingsFile::Default);
-        files
-    }
-
-    pub fn get_content_for_file(&self, file: SettingsFile) -> Option<&SettingsContent> {
-        match file {
-            SettingsFile::User => self
-                .user_settings
-                .as_ref()
-                .map(|settings| settings.content.as_ref()),
-            SettingsFile::Default => Some(self.default_settings.as_ref()),
-            SettingsFile::Server => self.server_settings.as_deref(),
-            SettingsFile::Project(ref key) => self.local_settings.get(key),
-            SettingsFile::Global => self.global_settings.as_deref(),
-        }
-    }
-
-    pub fn get_overrides_for_field<T>(
-        &self,
-        target_file: SettingsFile,
-        get: fn(&SettingsContent) -> &Option<T>,
-    ) -> Vec<SettingsFile> {
-        let all_files = self.get_all_files();
-        let mut found_file = false;
-        let mut overrides = Vec::new();
-
-        for file in all_files.into_iter().rev() {
-            if !found_file {
-                found_file = file == target_file;
-                continue;
-            }
-
-            if let SettingsFile::Project((wt_id, ref path)) = file
-                && let SettingsFile::Project((target_wt_id, ref target_path)) = target_file
-                && (wt_id != target_wt_id || !target_path.starts_with(path))
-            {
-                // if requesting value from a local file, don't return values from local files in different worktrees
-                continue;
-            }
-
-            let Some(content) = self.get_content_for_file(file.clone()) else {
-                continue;
-            };
-            if get(content).is_some() {
-                overrides.push(file);
-            }
-        }
-
-        overrides
-    }
-
-    /// Checks the given file, and files that the passed file overrides for the given field.
-    /// Returns the first file found that contains the value.
-    /// The value will only be None if no file contains the value.
-    /// I.e. if no file contains the value, returns `(File::Default, None)`
-    pub fn get_value_from_file<'a, T: 'a>(
-        &'a self,
-        target_file: SettingsFile,
-        pick: fn(&'a SettingsContent) -> Option<T>,
-    ) -> (SettingsFile, Option<T>) {
-        self.get_value_from_file_inner(target_file, pick, true)
-    }
-
-    /// Same as `Self::get_value_from_file` except that it does not include the current file.
-    /// Therefore it returns the value that was potentially overloaded by the target file.
-    pub fn get_value_up_to_file<'a, T: 'a>(
-        &'a self,
-        target_file: SettingsFile,
-        pick: fn(&'a SettingsContent) -> Option<T>,
-    ) -> (SettingsFile, Option<T>) {
-        self.get_value_from_file_inner(target_file, pick, false)
-    }
-
-    fn get_value_from_file_inner<'a, T: 'a>(
-        &'a self,
-        target_file: SettingsFile,
-        pick: fn(&'a SettingsContent) -> Option<T>,
-        include_target_file: bool,
-    ) -> (SettingsFile, Option<T>) {
-        // todo(settings_ui): Add a metadata field for overriding the "overrides" tag, for contextually different settings
-        //  e.g. disable AI isn't overridden, or a vec that gets extended instead or some such
-
-        // todo(settings_ui) cache all files
-        let all_files = self.get_all_files();
-        let mut found_file = false;
-
-        for file in all_files.into_iter() {
-            if !found_file && file != SettingsFile::Default {
-                if file != target_file {
-                    continue;
-                }
-                found_file = true;
-                if !include_target_file {
-                    continue;
-                }
-            }
-
-            if let SettingsFile::Project((worktree_id, ref path)) = file
-                && let SettingsFile::Project((target_worktree_id, ref target_path)) = target_file
-                && (worktree_id != target_worktree_id || !target_path.starts_with(&path))
-            {
-                // if requesting value from a local file, don't return values from local files in different worktrees
-                continue;
-            }
-
-            let Some(content) = self.get_content_for_file(file.clone()) else {
-                continue;
-            };
-            if let Some(value) = pick(content) {
-                return (file, Some(value));
-            }
-        }
-
-        (SettingsFile::Default, None)
-    }
-
-    #[inline(always)]
-    fn parse_and_migrate_zed_settings<SettingsContentType: serde::de::DeserializeOwned>(
-        &mut self,
-        user_settings_content: &str,
-        file: SettingsFile,
-    ) -> (Option<SettingsContentType>, SettingsParseResult) {
-        let mut migration_status = MigrationStatus::NotNeeded;
-        let (settings, parse_status) = if user_settings_content.is_empty() {
-            fallible_options::parse_json("{}")
-        } else {
-            let migration_res = migrator::migrate_settings(user_settings_content);
-            migration_status = match &migration_res {
-                Ok(Some(_)) => MigrationStatus::Succeeded,
-                Ok(None) => MigrationStatus::NotNeeded,
-                Err(err) => MigrationStatus::Failed {
-                    error: err.to_string(),
-                },
-            };
-            let content = match &migration_res {
-                Ok(Some(content)) => content,
-                Ok(None) => user_settings_content,
-                Err(_) => user_settings_content,
-            };
-            fallible_options::parse_json(content)
-        };
-
-        let result = SettingsParseResult {
-            parse_status,
-            migration_status,
-        };
-        self.file_errors.insert(file, result.clone());
-        return (settings, result);
-    }
-
-    pub fn error_for_file(&self, file: SettingsFile) -> Option<SettingsParseResult> {
-        self.file_errors
-            .get(&file)
-            .filter(|parse_result| parse_result.requires_user_action())
-            .cloned()
-    }
-}
-
-impl SettingsStore {
-    /// Updates the value of a setting in a JSON file, returning the new text
-    /// for that JSON file.
-    pub fn new_text_for_update(
-        &self,
-        old_text: String,
-        update: impl FnOnce(&mut SettingsContent),
-    ) -> String {
-        let edits = self.edits_for_update(&old_text, update);
-        let mut new_text = old_text;
-        for (range, replacement) in edits.into_iter() {
-            new_text.replace_range(range, &replacement);
-        }
-        new_text
-    }
-
-    pub fn get_vscode_edits(&self, old_text: String, vscode: &VsCodeSettings) -> String {
-        self.new_text_for_update(old_text, |content| {
-            content.merge_from(&vscode.settings_content())
-        })
-    }
-
-    /// Updates the value of a setting in a JSON file, returning a list
-    /// of edits to apply to the JSON file.
-    pub fn edits_for_update(
-        &self,
-        text: &str,
-        update: impl FnOnce(&mut SettingsContent),
-    ) -> Vec<(Range<usize>, String)> {
-        let old_content: UserSettingsContent =
-            parse_json_with_comments(text).log_err().unwrap_or_default();
-        let mut new_content = old_content.clone();
-        update(&mut new_content.content);
-
-        let old_value = serde_json::to_value(&old_content).unwrap();
-        let new_value = serde_json::to_value(new_content).unwrap();
-
-        let mut key_path = Vec::new();
-        let mut edits = Vec::new();
-        let tab_size = infer_json_indent_size(&text);
-        let mut text = text.to_string();
-        update_value_in_json_text(
-            &mut text,
-            &mut key_path,
-            tab_size,
-            &old_value,
-            &new_value,
-            &mut edits,
-        );
-        edits
-    }
-
-    /// Sets the default settings via a JSON string.
-    ///
-    /// The string should contain a JSON object with a default value for every setting.
-    pub fn set_default_settings(
-        &mut self,
-        default_settings_content: &str,
-        cx: &mut App,
-    ) -> Result<()> {
-        self.default_settings = parse_json_with_comments(default_settings_content)?;
-        self.recompute_values(None, cx);
-        Ok(())
-    }
-
-    /// Sets the user settings via a JSON string.
-    #[must_use]
-    pub fn set_user_settings(
-        &mut self,
-        user_settings_content: &str,
-        cx: &mut App,
-    ) -> SettingsParseResult {
-        let (settings, parse_result) = self.parse_and_migrate_zed_settings::<UserSettingsContent>(
-            user_settings_content,
-            SettingsFile::User,
-        );
-
-        if let Some(settings) = settings {
-            self.user_settings = Some(settings);
-            self.recompute_values(None, cx);
-        }
-        return parse_result;
-    }
-
-    /// Sets the global settings via a JSON string.
-    #[must_use]
-    pub fn set_global_settings(
-        &mut self,
-        global_settings_content: &str,
-        cx: &mut App,
-    ) -> SettingsParseResult {
-        let (settings, parse_result) = self.parse_and_migrate_zed_settings::<SettingsContent>(
-            global_settings_content,
-            SettingsFile::Global,
-        );
-
-        if let Some(settings) = settings {
-            self.global_settings = Some(Box::new(settings));
-            self.recompute_values(None, cx);
-        }
-        return parse_result;
-    }
-
-    pub fn set_server_settings(
-        &mut self,
-        server_settings_content: &str,
-        cx: &mut App,
-    ) -> Result<()> {
-        let settings: Option<SettingsContent> = if server_settings_content.is_empty() {
-            None
-        } else {
-            parse_json_with_comments(server_settings_content)?
-        };
-
-        // Rewrite the server settings into a content type
-        self.server_settings = settings.map(|settings| Box::new(settings));
-
-        self.recompute_values(None, cx);
-        Ok(())
-    }
-
-    /// Add or remove a set of local settings via a JSON string.
-    pub fn set_local_settings(
-        &mut self,
-        root_id: WorktreeId,
-        directory_path: Arc<RelPath>,
-        kind: LocalSettingsKind,
-        settings_content: Option<&str>,
-        cx: &mut App,
-    ) -> std::result::Result<(), InvalidSettingsError> {
-        let mut zed_settings_changed = false;
-        match (
-            kind,
-            settings_content
-                .map(|content| content.trim())
-                .filter(|content| !content.is_empty()),
-        ) {
-            (LocalSettingsKind::Tasks, _) => {
-                return Err(InvalidSettingsError::Tasks {
-                    message: "Attempted to submit tasks into the settings store".to_string(),
-                    path: directory_path
-                        .join(RelPath::unix(task_file_name()).unwrap())
-                        .as_std_path()
-                        .to_path_buf(),
-                });
-            }
-            (LocalSettingsKind::Debug, _) => {
-                return Err(InvalidSettingsError::Debug {
-                    message: "Attempted to submit debugger config into the settings store"
-                        .to_string(),
-                    path: directory_path
-                        .join(RelPath::unix(task_file_name()).unwrap())
-                        .as_std_path()
-                        .to_path_buf(),
-                });
-            }
-            (LocalSettingsKind::Settings, None) => {
-                zed_settings_changed = self
-                    .local_settings
-                    .remove(&(root_id, directory_path.clone()))
-                    .is_some();
-                self.file_errors
-                    .remove(&SettingsFile::Project((root_id, directory_path.clone())));
-            }
-            (LocalSettingsKind::Editorconfig, None) => {
-                self.raw_editorconfig_settings
-                    .remove(&(root_id, directory_path.clone()));
-            }
-            (LocalSettingsKind::Settings, Some(settings_contents)) => {
-                let (new_settings, parse_result) = self
-                    .parse_and_migrate_zed_settings::<ProjectSettingsContent>(
-                        settings_contents,
-                        SettingsFile::Project((root_id, directory_path.clone())),
-                    );
-                match parse_result.parse_status {
-                    ParseStatus::Success => Ok(()),
-                    ParseStatus::Failed { error } => Err(InvalidSettingsError::LocalSettings {
-                        path: directory_path.join(local_settings_file_relative_path()),
-                        message: error,
-                    }),
-                }?;
-                if let Some(new_settings) = new_settings {
-                    match self.local_settings.entry((root_id, directory_path.clone())) {
-                        btree_map::Entry::Vacant(v) => {
-                            v.insert(SettingsContent {
-                                project: new_settings,
-                                ..Default::default()
-                            });
-                            zed_settings_changed = true;
-                        }
-                        btree_map::Entry::Occupied(mut o) => {
-                            if &o.get().project != &new_settings {
-                                o.insert(SettingsContent {
-                                    project: new_settings,
-                                    ..Default::default()
-                                });
-                                zed_settings_changed = true;
-                            }
-                        }
-                    }
-                }
-            }
-            (LocalSettingsKind::Editorconfig, Some(editorconfig_contents)) => {
-                match self
-                    .raw_editorconfig_settings
-                    .entry((root_id, directory_path.clone()))
-                {
-                    btree_map::Entry::Vacant(v) => match editorconfig_contents.parse() {
-                        Ok(new_contents) => {
-                            v.insert((editorconfig_contents.to_owned(), Some(new_contents)));
-                        }
-                        Err(e) => {
-                            v.insert((editorconfig_contents.to_owned(), None));
-                            return Err(InvalidSettingsError::Editorconfig {
-                                message: e.to_string(),
-                                path: directory_path
-                                    .join(RelPath::unix(EDITORCONFIG_NAME).unwrap()),
-                            });
-                        }
-                    },
-                    btree_map::Entry::Occupied(mut o) => {
-                        if o.get().0 != editorconfig_contents {
-                            match editorconfig_contents.parse() {
-                                Ok(new_contents) => {
-                                    o.insert((
-                                        editorconfig_contents.to_owned(),
-                                        Some(new_contents),
-                                    ));
-                                }
-                                Err(e) => {
-                                    o.insert((editorconfig_contents.to_owned(), None));
-                                    return Err(InvalidSettingsError::Editorconfig {
-                                        message: e.to_string(),
-                                        path: directory_path
-                                            .join(RelPath::unix(EDITORCONFIG_NAME).unwrap()),
-                                    });
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        };
-
-        if zed_settings_changed {
-            self.recompute_values(Some((root_id, &directory_path)), cx);
-        }
-        Ok(())
-    }
-
-    pub fn set_extension_settings(
-        &mut self,
-        content: ExtensionsSettingsContent,
-        cx: &mut App,
-    ) -> Result<()> {
-        self.extension_settings = Some(Box::new(SettingsContent {
-            project: ProjectSettingsContent {
-                all_languages: content.all_languages,
-                ..Default::default()
-            },
-            ..Default::default()
-        }));
-        self.recompute_values(None, cx);
-        Ok(())
-    }
-
-    /// Add or remove a set of local settings via a JSON string.
-    pub fn clear_local_settings(&mut self, root_id: WorktreeId, cx: &mut App) -> Result<()> {
-        self.local_settings
-            .retain(|(worktree_id, _), _| worktree_id != &root_id);
-        self.recompute_values(Some((root_id, RelPath::empty())), cx);
-        Ok(())
-    }
-
-    pub fn local_settings(
-        &self,
-        root_id: WorktreeId,
-    ) -> impl '_ + Iterator<Item = (Arc<RelPath>, &ProjectSettingsContent)> {
-        self.local_settings
-            .range(
-                (root_id, RelPath::empty().into())
-                    ..(
-                        WorktreeId::from_usize(root_id.to_usize() + 1),
-                        RelPath::empty().into(),
-                    ),
-            )
-            .map(|((_, path), content)| (path.clone(), &content.project))
-    }
-
-    pub fn local_editorconfig_settings(
-        &self,
-        root_id: WorktreeId,
-    ) -> impl '_ + Iterator<Item = (Arc<RelPath>, String, Option<Editorconfig>)> {
-        self.raw_editorconfig_settings
-            .range(
-                (root_id, RelPath::empty().into())
-                    ..(
-                        WorktreeId::from_usize(root_id.to_usize() + 1),
-                        RelPath::empty().into(),
-                    ),
-            )
-            .map(|((_, path), (content, parsed_content))| {
-                (path.clone(), content.clone(), parsed_content.clone())
-            })
-    }
-
-    pub fn json_schema(&self, params: &SettingsJsonSchemaParams) -> Value {
-        let mut generator = schemars::generate::SchemaSettings::draft2019_09()
-            .with_transform(DefaultDenyUnknownFields)
-            .with_transform(AllowTrailingCommas)
-            .into_generator();
-
-        UserSettingsContent::json_schema(&mut generator);
-
-        let language_settings_content_ref = generator
-            .subschema_for::<LanguageSettingsContent>()
-            .to_value();
-
-        replace_subschema::<LanguageToSettingsMap>(&mut generator, || {
-            json_schema!({
-                "type": "object",
-                "properties": params
-                    .language_names
-                    .iter()
-                    .map(|name| {
-                        (
-                            name.clone(),
-                            language_settings_content_ref.clone(),
-                        )
-                    })
-                    .collect::<serde_json::Map<_, _>>(),
-                "errorMessage": "No language with this name is installed."
-            })
-        });
-
-        replace_subschema::<FontFamilyName>(&mut generator, || {
-            json_schema!({
-                "type": "string",
-                "enum": params.font_names,
-            })
-        });
-
-        replace_subschema::<ThemeName>(&mut generator, || {
-            json_schema!({
-                "type": "string",
-                "enum": params.theme_names,
-            })
-        });
-
-        replace_subschema::<IconThemeName>(&mut generator, || {
-            json_schema!({
-                "type": "string",
-                "enum": params.icon_theme_names,
-            })
-        });
-
-        generator
-            .root_schema_for::<UserSettingsContent>()
-            .to_value()
-    }
-
-    fn recompute_values(
-        &mut self,
-        changed_local_path: Option<(WorktreeId, &RelPath)>,
-        cx: &mut App,
-    ) {
-        // Reload the global and local values for every setting.
-        let mut project_settings_stack = Vec::<SettingsContent>::new();
-        let mut paths_stack = Vec::<Option<(WorktreeId, &RelPath)>>::new();
-
-        if changed_local_path.is_none() {
-            let mut merged = self.default_settings.as_ref().clone();
-            merged.merge_from_option(self.extension_settings.as_deref());
-            merged.merge_from_option(self.global_settings.as_deref());
-            if let Some(user_settings) = self.user_settings.as_ref() {
-                merged.merge_from(&user_settings.content);
-                merged.merge_from_option(user_settings.for_release_channel());
-                merged.merge_from_option(user_settings.for_os());
-                merged.merge_from_option(user_settings.for_profile(cx));
-            }
-            merged.merge_from_option(self.server_settings.as_deref());
-            self.merged_settings = Rc::new(merged);
-
-            for setting_value in self.setting_values.values_mut() {
-                let value = setting_value.from_settings(&self.merged_settings);
-                setting_value.set_global_value(value);
-            }
-        }
-
-        for ((root_id, directory_path), local_settings) in &self.local_settings {
-            // Build a stack of all of the local values for that setting.
-            while let Some(prev_entry) = paths_stack.last() {
-                if let Some((prev_root_id, prev_path)) = prev_entry
-                    && (root_id != prev_root_id || !directory_path.starts_with(prev_path))
-                {
-                    paths_stack.pop();
-                    project_settings_stack.pop();
-                    continue;
-                }
-                break;
-            }
-
-            paths_stack.push(Some((*root_id, directory_path.as_ref())));
-            let mut merged_local_settings = if let Some(deepest) = project_settings_stack.last() {
-                (*deepest).clone()
-            } else {
-                self.merged_settings.as_ref().clone()
-            };
-            merged_local_settings.merge_from(local_settings);
-
-            project_settings_stack.push(merged_local_settings);
-
-            // If a local settings file changed, then avoid recomputing local
-            // settings for any path outside of that directory.
-            if changed_local_path.is_some_and(|(changed_root_id, changed_local_path)| {
-                *root_id != changed_root_id || !directory_path.starts_with(changed_local_path)
-            }) {
-                continue;
-            }
-
-            for setting_value in self.setting_values.values_mut() {
-                let value = setting_value.from_settings(&project_settings_stack.last().unwrap());
-                setting_value.set_local_value(*root_id, directory_path.clone(), value);
-            }
-        }
-    }
-
-    pub fn editorconfig_properties(
-        &self,
-        for_worktree: WorktreeId,
-        for_path: &RelPath,
-    ) -> Option<EditorconfigProperties> {
-        let mut properties = EditorconfigProperties::new();
-
-        for (directory_with_config, _, parsed_editorconfig) in
-            self.local_editorconfig_settings(for_worktree)
-        {
-            if !for_path.starts_with(&directory_with_config) {
-                properties.use_fallbacks();
-                return Some(properties);
-            }
-            let parsed_editorconfig = parsed_editorconfig?;
-            if parsed_editorconfig.is_root {
-                properties = EditorconfigProperties::new();
-            }
-            for section in parsed_editorconfig.sections {
-                section
-                    .apply_to(&mut properties, for_path.as_std_path())
-                    .log_err()?;
-            }
-        }
-
-        properties.use_fallbacks();
-        Some(properties)
-    }
-}
-
-/// The result of parsing settings, including any migration attempts
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct SettingsParseResult {
-    /// The result of parsing the settings file (possibly after migration)
-    pub parse_status: ParseStatus,
-    /// The result of attempting to migrate the settings file
-    pub migration_status: MigrationStatus,
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum ParseStatus {
-    /// Settings were parsed successfully
-    Success,
-    /// Settings failed to parse
-    Failed { error: String },
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum MigrationStatus {
-    /// No migration was needed - settings are up to date
-    NotNeeded,
-    /// Settings were automatically migrated in memory, but the file needs to be updated
-    Succeeded,
-    /// Migration was attempted but failed. Original settings were parsed instead.
-    Failed { error: String },
-}
-
-impl Default for SettingsParseResult {
-    fn default() -> Self {
-        Self {
-            parse_status: ParseStatus::Success,
-            migration_status: MigrationStatus::NotNeeded,
-        }
-    }
-}
-
-impl SettingsParseResult {
-    pub fn unwrap(self) -> bool {
-        self.result().unwrap()
-    }
-
-    pub fn expect(self, message: &str) -> bool {
-        self.result().expect(message)
-    }
-
-    /// Formats the ParseResult as a Result type. This is a lossy conversion
-    pub fn result(self) -> Result<bool> {
-        let migration_result = match self.migration_status {
-            MigrationStatus::NotNeeded => Ok(false),
-            MigrationStatus::Succeeded => Ok(true),
-            MigrationStatus::Failed { error } => {
-                Err(anyhow::format_err!(error)).context("Failed to migrate settings")
-            }
-        };
-
-        let parse_result = match self.parse_status {
-            ParseStatus::Success => Ok(()),
-            ParseStatus::Failed { error } => {
-                Err(anyhow::format_err!(error)).context("Failed to parse settings")
-            }
-        };
-
-        match (migration_result, parse_result) {
-            (migration_result @ Ok(_), Ok(())) => migration_result,
-            (Err(migration_err), Ok(())) => Err(migration_err),
-            (_, Err(parse_err)) => Err(parse_err),
-        }
-    }
-
-    /// Returns true if there were any errors migrating and parsing the settings content or if migration was required but there were no errors
-    pub fn requires_user_action(&self) -> bool {
-        matches!(self.parse_status, ParseStatus::Failed { .. })
-            || matches!(
-                self.migration_status,
-                MigrationStatus::Succeeded | MigrationStatus::Failed { .. }
-            )
-    }
-
-    pub fn ok(self) -> Option<bool> {
-        self.result().ok()
-    }
-
-    pub fn parse_error(&self) -> Option<String> {
-        match &self.parse_status {
-            ParseStatus::Failed { error } => Some(error.clone()),
-            ParseStatus::Success => None,
-        }
-    }
-}
-
-#[derive(Debug, Clone, PartialEq)]
-pub enum InvalidSettingsError {
-    LocalSettings { path: Arc<RelPath>, message: String },
-    UserSettings { message: String },
-    ServerSettings { message: String },
-    DefaultSettings { message: String },
-    Editorconfig { path: Arc<RelPath>, message: String },
-    Tasks { path: PathBuf, message: String },
-    Debug { path: PathBuf, message: String },
-}
-
-impl std::fmt::Display for InvalidSettingsError {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            InvalidSettingsError::LocalSettings { message, .. }
-            | InvalidSettingsError::UserSettings { message }
-            | InvalidSettingsError::ServerSettings { message }
-            | InvalidSettingsError::DefaultSettings { message }
-            | InvalidSettingsError::Tasks { message, .. }
-            | InvalidSettingsError::Editorconfig { message, .. }
-            | InvalidSettingsError::Debug { message, .. } => {
-                write!(f, "{message}")
-            }
-        }
-    }
-}
-impl std::error::Error for InvalidSettingsError {}
-
-impl Debug for SettingsStore {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("SettingsStore")
-            .field(
-                "types",
-                &self
-                    .setting_values
-                    .values()
-                    .map(|value| value.setting_type_name())
-                    .collect::<Vec<_>>(),
-            )
-            .field("default_settings", &self.default_settings)
-            .field("user_settings", &self.user_settings)
-            .field("local_settings", &self.local_settings)
-            .finish_non_exhaustive()
-    }
-}
-
-impl<T: Settings> AnySettingValue for SettingValue<T> {
-    fn from_settings(&self, s: &SettingsContent) -> Box<dyn Any> {
-        Box::new(T::from_settings(s)) as _
-    }
-
-    fn setting_type_name(&self) -> &'static str {
-        type_name::<T>()
-    }
-
-    fn all_local_values(&self) -> Vec<(WorktreeId, Arc<RelPath>, &dyn Any)> {
-        self.local_values
-            .iter()
-            .map(|(id, path, value)| (*id, path.clone(), value as _))
-            .collect()
-    }
-
-    fn value_for_path(&self, path: Option<SettingsLocation>) -> &dyn Any {
-        if let Some(SettingsLocation { worktree_id, path }) = path {
-            for (settings_root_id, settings_path, value) in self.local_values.iter().rev() {
-                if worktree_id == *settings_root_id && path.starts_with(settings_path) {
-                    return value;
-                }
-            }
-        }
-
-        self.global_value
-            .as_ref()
-            .unwrap_or_else(|| panic!("no default value for setting {}", self.setting_type_name()))
-    }
-
-    fn set_global_value(&mut self, value: Box<dyn Any>) {
-        self.global_value = Some(*value.downcast().unwrap());
-    }
-
-    fn set_local_value(&mut self, root_id: WorktreeId, path: Arc<RelPath>, value: Box<dyn Any>) {
-        let value = *value.downcast().unwrap();
-        match self
-            .local_values
-            .binary_search_by_key(&(root_id, &path), |e| (e.0, &e.1))
-        {
-            Ok(ix) => self.local_values[ix].2 = value,
-            Err(ix) => self.local_values.insert(ix, (root_id, path, value)),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::num::NonZeroU32;
-
-    use crate::{
-        ClosePosition, ItemSettingsContent, VsCodeSettingsSource, default_settings,
-        settings_content::LanguageSettingsContent, test_settings,
-    };
-
-    use super::*;
-    use unindent::Unindent;
-    use util::rel_path::rel_path;
-
-    #[derive(Debug, PartialEq)]
-    struct AutoUpdateSetting {
-        auto_update: bool,
-    }
-
-    impl Settings for AutoUpdateSetting {
-        fn from_settings(content: &SettingsContent) -> Self {
-            AutoUpdateSetting {
-                auto_update: content.auto_update.unwrap(),
-            }
-        }
-    }
-
-    #[derive(Debug, PartialEq)]
-    struct ItemSettings {
-        close_position: ClosePosition,
-        git_status: bool,
-    }
-
-    impl Settings for ItemSettings {
-        fn from_settings(content: &SettingsContent) -> Self {
-            let content = content.tabs.clone().unwrap();
-            ItemSettings {
-                close_position: content.close_position.unwrap(),
-                git_status: content.git_status.unwrap(),
-            }
-        }
-    }
-
-    #[derive(Debug, PartialEq)]
-    struct DefaultLanguageSettings {
-        tab_size: NonZeroU32,
-        preferred_line_length: u32,
-    }
-
-    impl Settings for DefaultLanguageSettings {
-        fn from_settings(content: &SettingsContent) -> Self {
-            let content = &content.project.all_languages.defaults;
-            DefaultLanguageSettings {
-                tab_size: content.tab_size.unwrap(),
-                preferred_line_length: content.preferred_line_length.unwrap(),
-            }
-        }
-    }
-
-    #[derive(Debug, PartialEq)]
-    struct ThemeSettings {
-        buffer_font_family: FontFamilyName,
-        buffer_font_fallbacks: Vec<FontFamilyName>,
-    }
-
-    impl Settings for ThemeSettings {
-        fn from_settings(content: &SettingsContent) -> Self {
-            let content = content.theme.clone();
-            ThemeSettings {
-                buffer_font_family: content.buffer_font_family.unwrap(),
-                buffer_font_fallbacks: content.buffer_font_fallbacks.unwrap(),
-            }
-        }
-    }
-
-    #[gpui::test]
-    fn test_settings_store_basic(cx: &mut App) {
-        let mut store = SettingsStore::new(cx, &default_settings());
-        store.register_setting::<AutoUpdateSetting>();
-        store.register_setting::<ItemSettings>();
-        store.register_setting::<DefaultLanguageSettings>();
-
-        assert_eq!(
-            store.get::<AutoUpdateSetting>(None),
-            &AutoUpdateSetting { auto_update: true }
-        );
-        assert_eq!(
-            store.get::<ItemSettings>(None).close_position,
-            ClosePosition::Right
-        );
-
-        store
-            .set_user_settings(
-                r#"{
-                    "auto_update": false,
-                    "tabs": {
-                      "close_position": "left"
-                    }
-                }"#,
-                cx,
-            )
-            .unwrap();
-
-        assert_eq!(
-            store.get::<AutoUpdateSetting>(None),
-            &AutoUpdateSetting { auto_update: false }
-        );
-        assert_eq!(
-            store.get::<ItemSettings>(None).close_position,
-            ClosePosition::Left
-        );
-
-        store
-            .set_local_settings(
-                WorktreeId::from_usize(1),
-                rel_path("root1").into(),
-                LocalSettingsKind::Settings,
-                Some(r#"{ "tab_size": 5 }"#),
-                cx,
-            )
-            .unwrap();
-        store
-            .set_local_settings(
-                WorktreeId::from_usize(1),
-                rel_path("root1/subdir").into(),
-                LocalSettingsKind::Settings,
-                Some(r#"{ "preferred_line_length": 50 }"#),
-                cx,
-            )
-            .unwrap();
-
-        store
-            .set_local_settings(
-                WorktreeId::from_usize(1),
-                rel_path("root2").into(),
-                LocalSettingsKind::Settings,
-                Some(r#"{ "tab_size": 9, "auto_update": true}"#),
-                cx,
-            )
-            .unwrap();
-
-        assert_eq!(
-            store.get::<DefaultLanguageSettings>(Some(SettingsLocation {
-                worktree_id: WorktreeId::from_usize(1),
-                path: rel_path("root1/something"),
-            })),
-            &DefaultLanguageSettings {
-                preferred_line_length: 80,
-                tab_size: 5.try_into().unwrap(),
-            }
-        );
-        assert_eq!(
-            store.get::<DefaultLanguageSettings>(Some(SettingsLocation {
-                worktree_id: WorktreeId::from_usize(1),
-                path: rel_path("root1/subdir/something"),
-            })),
-            &DefaultLanguageSettings {
-                preferred_line_length: 50,
-                tab_size: 5.try_into().unwrap(),
-            }
-        );
-        assert_eq!(
-            store.get::<DefaultLanguageSettings>(Some(SettingsLocation {
-                worktree_id: WorktreeId::from_usize(1),
-                path: rel_path("root2/something"),
-            })),
-            &DefaultLanguageSettings {
-                preferred_line_length: 80,
-                tab_size: 9.try_into().unwrap(),
-            }
-        );
-        assert_eq!(
-            store.get::<AutoUpdateSetting>(Some(SettingsLocation {
-                worktree_id: WorktreeId::from_usize(1),
-                path: rel_path("root2/something")
-            })),
-            &AutoUpdateSetting { auto_update: false }
-        );
-    }
-
-    #[gpui::test]
-    fn test_setting_store_assign_json_before_register(cx: &mut App) {
-        let mut store = SettingsStore::new(cx, &test_settings());
-        store
-            .set_user_settings(r#"{ "auto_update": false }"#, cx)
-            .unwrap();
-        store.register_setting::<AutoUpdateSetting>();
-
-        assert_eq!(
-            store.get::<AutoUpdateSetting>(None),
-            &AutoUpdateSetting { auto_update: false }
-        );
-    }
-
-    #[track_caller]
-    fn check_settings_update(
-        store: &mut SettingsStore,
-        old_json: String,
-        update: fn(&mut SettingsContent),
-        expected_new_json: String,
-        cx: &mut App,
-    ) {
-        store.set_user_settings(&old_json, cx).ok();
-        let edits = store.edits_for_update(&old_json, update);
-        let mut new_json = old_json;
-        for (range, replacement) in edits.into_iter() {
-            new_json.replace_range(range, &replacement);
-        }
-        pretty_assertions::assert_eq!(new_json, expected_new_json);
-    }
-
-    #[gpui::test]
-    fn test_setting_store_update(cx: &mut App) {
-        let mut store = SettingsStore::new(cx, &test_settings());
-
-        // entries added and updated
-        check_settings_update(
-            &mut store,
-            r#"{
-                "languages": {
-                    "JSON": {
-                        "auto_indent": true
-                    }
-                }
-            }"#
-            .unindent(),
-            |settings| {
-                settings
-                    .languages_mut()
-                    .get_mut("JSON")
-                    .unwrap()
-                    .auto_indent = Some(false);
-
-                settings.languages_mut().insert(
-                    "Rust".into(),
-                    LanguageSettingsContent {
-                        auto_indent: Some(true),
-                        ..Default::default()
-                    },
-                );
-            },
-            r#"{
-                "languages": {
-                    "Rust": {
-                        "auto_indent": true
-                    },
-                    "JSON": {
-                        "auto_indent": false
-                    }
-                }
-            }"#
-            .unindent(),
-            cx,
-        );
-
-        // entries removed
-        check_settings_update(
-            &mut store,
-            r#"{
-                "languages": {
-                    "Rust": {
-                        "language_setting_2": true
-                    },
-                    "JSON": {
-                        "language_setting_1": false
-                    }
-                }
-            }"#
-            .unindent(),
-            |settings| {
-                settings.languages_mut().remove("JSON").unwrap();
-            },
-            r#"{
-                "languages": {
-                    "Rust": {
-                        "language_setting_2": true
-                    }
-                }
-            }"#
-            .unindent(),
-            cx,
-        );
-
-        check_settings_update(
-            &mut store,
-            r#"{
-                "languages": {
-                    "Rust": {
-                        "language_setting_2": true
-                    },
-                    "JSON": {
-                        "language_setting_1": false
-                    }
-                }
-            }"#
-            .unindent(),
-            |settings| {
-                settings.languages_mut().remove("Rust").unwrap();
-            },
-            r#"{
-                "languages": {
-                    "JSON": {
-                        "language_setting_1": false
-                    }
-                }
-            }"#
-            .unindent(),
-            cx,
-        );
-
-        // weird formatting
-        check_settings_update(
-            &mut store,
-            r#"{
-                "tabs":   { "close_position": "left", "name": "Max"  }
-                }"#
-            .unindent(),
-            |settings| {
-                settings.tabs.as_mut().unwrap().close_position = Some(ClosePosition::Left);
-            },
-            r#"{
-                "tabs":   { "close_position": "left", "name": "Max"  }
-                }"#
-            .unindent(),
-            cx,
-        );
-
-        // single-line formatting, other keys
-        check_settings_update(
-            &mut store,
-            r#"{ "one": 1, "two": 2 }"#.to_owned(),
-            |settings| settings.auto_update = Some(true),
-            r#"{ "auto_update": true, "one": 1, "two": 2 }"#.to_owned(),
-            cx,
-        );
-
-        // empty object
-        check_settings_update(
-            &mut store,
-            r#"{
-                "tabs": {}
-            }"#
-            .unindent(),
-            |settings| settings.tabs.as_mut().unwrap().close_position = Some(ClosePosition::Left),
-            r#"{
-                "tabs": {
-                    "close_position": "left"
-                }
-            }"#
-            .unindent(),
-            cx,
-        );
-
-        // no content
-        check_settings_update(
-            &mut store,
-            r#""#.unindent(),
-            |settings| {
-                settings.tabs = Some(ItemSettingsContent {
-                    git_status: Some(true),
-                    ..Default::default()
-                })
-            },
-            r#"{
-              "tabs": {
-                "git_status": true
-              }
-            }
-            "#
-            .unindent(),
-            cx,
-        );
-
-        check_settings_update(
-            &mut store,
-            r#"{
-            }
-            "#
-            .unindent(),
-            |settings| settings.title_bar.get_or_insert_default().show_branch_name = Some(true),
-            r#"{
-              "title_bar": {
-                "show_branch_name": true
-              }
-            }
-            "#
-            .unindent(),
-            cx,
-        );
-    }
-
-    #[gpui::test]
-    fn test_vscode_import(cx: &mut App) {
-        let mut store = SettingsStore::new(cx, &test_settings());
-        store.register_setting::<DefaultLanguageSettings>();
-        store.register_setting::<ItemSettings>();
-        store.register_setting::<AutoUpdateSetting>();
-        store.register_setting::<ThemeSettings>();
-
-        // create settings that werent present
-        check_vscode_import(
-            &mut store,
-            r#"{
-            }
-            "#
-            .unindent(),
-            r#" { "editor.tabSize": 37 } "#.to_owned(),
-            r#"{
-              "base_keymap": "VSCode",
-              "tab_size": 37
-            }
-            "#
-            .unindent(),
-            cx,
-        );
-
-        // persist settings that were present
-        check_vscode_import(
-            &mut store,
-            r#"{
-                "preferred_line_length": 99,
-            }
-            "#
-            .unindent(),
-            r#"{ "editor.tabSize": 42 }"#.to_owned(),
-            r#"{
-                "base_keymap": "VSCode",
-                "tab_size": 42,
-                "preferred_line_length": 99,
-            }
-            "#
-            .unindent(),
-            cx,
-        );
-
-        // don't clobber settings that aren't present in vscode
-        check_vscode_import(
-            &mut store,
-            r#"{
-                "preferred_line_length": 99,
-                "tab_size": 42
-            }
-            "#
-            .unindent(),
-            r#"{}"#.to_owned(),
-            r#"{
-                "base_keymap": "VSCode",
-                "preferred_line_length": 99,
-                "tab_size": 42
-            }
-            "#
-            .unindent(),
-            cx,
-        );
-
-        // custom enum
-        check_vscode_import(
-            &mut store,
-            r#"{
-            }
-            "#
-            .unindent(),
-            r#"{ "git.decorations.enabled": true }"#.to_owned(),
-            r#"{
-              "project_panel": {
-                "git_status": true
-              },
-              "outline_panel": {
-                "git_status": true
-              },
-              "base_keymap": "VSCode",
-              "tabs": {
-                "git_status": true
-              }
-            }
-            "#
-            .unindent(),
-            cx,
-        );
-
-        // font-family
-        check_vscode_import(
-            &mut store,
-            r#"{
-            }
-            "#
-            .unindent(),
-            r#"{ "editor.fontFamily": "Cascadia Code, 'Consolas', Courier New" }"#.to_owned(),
-            r#"{
-              "base_keymap": "VSCode",
-              "buffer_font_fallbacks": [
-                "Consolas",
-                "Courier New"
-              ],
-              "buffer_font_family": "Cascadia Code"
-            }
-            "#
-            .unindent(),
-            cx,
-        );
-    }
-
-    #[track_caller]
-    fn check_vscode_import(
-        store: &mut SettingsStore,
-        old: String,
-        vscode: String,
-        expected: String,
-        cx: &mut App,
-    ) {
-        store.set_user_settings(&old, cx).ok();
-        let new = store.get_vscode_edits(
-            old,
-            &VsCodeSettings::from_str(&vscode, VsCodeSettingsSource::VsCode).unwrap(),
-        );
-        pretty_assertions::assert_eq!(new, expected);
-    }
-
-    #[gpui::test]
-    fn test_update_git_settings(cx: &mut App) {
-        let store = SettingsStore::new(cx, &test_settings());
-
-        let actual = store.new_text_for_update("{}".to_string(), |current| {
-            current
-                .git
-                .get_or_insert_default()
-                .inline_blame
-                .get_or_insert_default()
-                .enabled = Some(true);
-        });
-        pretty_assertions::assert_str_eq!(
-            actual,
-            r#"{
-              "git": {
-                "inline_blame": {
-                  "enabled": true
-                }
-              }
-            }
-            "#
-            .unindent()
-        );
-    }
-
-    #[gpui::test]
-    fn test_global_settings(cx: &mut App) {
-        let mut store = SettingsStore::new(cx, &test_settings());
-        store.register_setting::<ItemSettings>();
-
-        // Set global settings - these should override defaults but not user settings
-        store
-            .set_global_settings(
-                r#"{
-                    "tabs": {
-                        "close_position": "right",
-                        "git_status": true,
-                    }
-                }"#,
-                cx,
-            )
-            .unwrap();
-
-        // Before user settings, global settings should apply
-        assert_eq!(
-            store.get::<ItemSettings>(None),
-            &ItemSettings {
-                close_position: ClosePosition::Right,
-                git_status: true,
-            }
-        );
-
-        // Set user settings - these should override both defaults and global
-        store
-            .set_user_settings(
-                r#"{
-                    "tabs": {
-                        "close_position": "left"
-                    }
-                }"#,
-                cx,
-            )
-            .unwrap();
-
-        // User settings should override global settings
-        assert_eq!(
-            store.get::<ItemSettings>(None),
-            &ItemSettings {
-                close_position: ClosePosition::Left,
-                git_status: true, // Staff from global settings
-            }
-        );
-    }
-
-    #[gpui::test]
-    fn test_get_value_for_field_basic(cx: &mut App) {
-        let mut store = SettingsStore::new(cx, &test_settings());
-        store.register_setting::<DefaultLanguageSettings>();
-
-        store
-            .set_user_settings(r#"{"preferred_line_length": 0}"#, cx)
-            .unwrap();
-        let local = (WorktreeId::from_usize(0), RelPath::empty().into_arc());
-        store
-            .set_local_settings(
-                local.0,
-                local.1.clone(),
-                LocalSettingsKind::Settings,
-                Some(r#"{}"#),
-                cx,
-            )
-            .unwrap();
-
-        fn get(content: &SettingsContent) -> Option<&u32> {
-            content
-                .project
-                .all_languages
-                .defaults
-                .preferred_line_length
-                .as_ref()
-        }
-
-        let default_value = *get(&store.default_settings).unwrap();
-
-        assert_eq!(
-            store.get_value_from_file(SettingsFile::Project(local.clone()), get),
-            (SettingsFile::User, Some(&0))
-        );
-        assert_eq!(
-            store.get_value_from_file(SettingsFile::User, get),
-            (SettingsFile::User, Some(&0))
-        );
-        store.set_user_settings(r#"{}"#, cx).unwrap();
-        assert_eq!(
-            store.get_value_from_file(SettingsFile::Project(local.clone()), get),
-            (SettingsFile::Default, Some(&default_value))
-        );
-        store
-            .set_local_settings(
-                local.0,
-                local.1.clone(),
-                LocalSettingsKind::Settings,
-                Some(r#"{"preferred_line_length": 80}"#),
-                cx,
-            )
-            .unwrap();
-        assert_eq!(
-            store.get_value_from_file(SettingsFile::Project(local.clone()), get),
-            (SettingsFile::Project(local), Some(&80))
-        );
-        assert_eq!(
-            store.get_value_from_file(SettingsFile::User, get),
-            (SettingsFile::Default, Some(&default_value))
-        );
-    }
-
-    #[gpui::test]
-    fn test_get_value_for_field_local_worktrees_dont_interfere(cx: &mut App) {
-        let mut store = SettingsStore::new(cx, &test_settings());
-        store.register_setting::<DefaultLanguageSettings>();
-        store.register_setting::<AutoUpdateSetting>();
-
-        let local_1 = (WorktreeId::from_usize(0), RelPath::empty().into_arc());
-
-        let local_1_child = (
-            WorktreeId::from_usize(0),
-            RelPath::new(
-                std::path::Path::new("child1"),
-                util::paths::PathStyle::Posix,
-            )
-            .unwrap()
-            .into_arc(),
-        );
-
-        let local_2 = (WorktreeId::from_usize(1), RelPath::empty().into_arc());
-        let local_2_child = (
-            WorktreeId::from_usize(1),
-            RelPath::new(
-                std::path::Path::new("child2"),
-                util::paths::PathStyle::Posix,
-            )
-            .unwrap()
-            .into_arc(),
-        );
-
-        fn get(content: &SettingsContent) -> Option<&u32> {
-            content
-                .project
-                .all_languages
-                .defaults
-                .preferred_line_length
-                .as_ref()
-        }
-
-        store
-            .set_local_settings(
-                local_1.0,
-                local_1.1.clone(),
-                LocalSettingsKind::Settings,
-                Some(r#"{"preferred_line_length": 1}"#),
-                cx,
-            )
-            .unwrap();
-        store
-            .set_local_settings(
-                local_1_child.0,
-                local_1_child.1.clone(),
-                LocalSettingsKind::Settings,
-                Some(r#"{}"#),
-                cx,
-            )
-            .unwrap();
-        store
-            .set_local_settings(
-                local_2.0,
-                local_2.1.clone(),
-                LocalSettingsKind::Settings,
-                Some(r#"{"preferred_line_length": 2}"#),
-                cx,
-            )
-            .unwrap();
-        store
-            .set_local_settings(
-                local_2_child.0,
-                local_2_child.1.clone(),
-                LocalSettingsKind::Settings,
-                Some(r#"{}"#),
-                cx,
-            )
-            .unwrap();
-
-        // each local child should only inherit from it's parent
-        assert_eq!(
-            store.get_value_from_file(SettingsFile::Project(local_2_child), get),
-            (SettingsFile::Project(local_2), Some(&2))
-        );
-        assert_eq!(
-            store.get_value_from_file(SettingsFile::Project(local_1_child.clone()), get),
-            (SettingsFile::Project(local_1.clone()), Some(&1))
-        );
-
-        // adjacent children should be treated as siblings not inherit from each other
-        let local_1_adjacent_child = (local_1.0, rel_path("adjacent_child").into_arc());
-        store
-            .set_local_settings(
-                local_1_adjacent_child.0,
-                local_1_adjacent_child.1.clone(),
-                LocalSettingsKind::Settings,
-                Some(r#"{}"#),
-                cx,
-            )
-            .unwrap();
-        store
-            .set_local_settings(
-                local_1_child.0,
-                local_1_child.1.clone(),
-                LocalSettingsKind::Settings,
-                Some(r#"{"preferred_line_length": 3}"#),
-                cx,
-            )
-            .unwrap();
-
-        assert_eq!(
-            store.get_value_from_file(SettingsFile::Project(local_1_adjacent_child.clone()), get),
-            (SettingsFile::Project(local_1.clone()), Some(&1))
-        );
-        store
-            .set_local_settings(
-                local_1_adjacent_child.0,
-                local_1_adjacent_child.1,
-                LocalSettingsKind::Settings,
-                Some(r#"{"preferred_line_length": 3}"#),
-                cx,
-            )
-            .unwrap();
-        store
-            .set_local_settings(
-                local_1_child.0,
-                local_1_child.1.clone(),
-                LocalSettingsKind::Settings,
-                Some(r#"{}"#),
-                cx,
-            )
-            .unwrap();
-        assert_eq!(
-            store.get_value_from_file(SettingsFile::Project(local_1_child), get),
-            (SettingsFile::Project(local_1), Some(&1))
-        );
-    }
-
-    #[gpui::test]
-    fn test_get_overrides_for_field(cx: &mut App) {
-        let mut store = SettingsStore::new(cx, &test_settings());
-        store.register_setting::<DefaultLanguageSettings>();
-
-        let wt0_root = (WorktreeId::from_usize(0), RelPath::empty().into_arc());
-        let wt0_child1 = (WorktreeId::from_usize(0), rel_path("child1").into_arc());
-        let wt0_child2 = (WorktreeId::from_usize(0), rel_path("child2").into_arc());
-
-        let wt1_root = (WorktreeId::from_usize(1), RelPath::empty().into_arc());
-        let wt1_subdir = (WorktreeId::from_usize(1), rel_path("subdir").into_arc());
-
-        fn get(content: &SettingsContent) -> &Option<u32> {
-            &content.project.all_languages.defaults.preferred_line_length
-        }
-
-        store
-            .set_user_settings(r#"{"preferred_line_length": 100}"#, cx)
-            .unwrap();
-
-        store
-            .set_local_settings(
-                wt0_root.0,
-                wt0_root.1.clone(),
-                LocalSettingsKind::Settings,
-                Some(r#"{"preferred_line_length": 80}"#),
-                cx,
-            )
-            .unwrap();
-        store
-            .set_local_settings(
-                wt0_child1.0,
-                wt0_child1.1.clone(),
-                LocalSettingsKind::Settings,
-                Some(r#"{"preferred_line_length": 120}"#),
-                cx,
-            )
-            .unwrap();
-        store
-            .set_local_settings(
-                wt0_child2.0,
-                wt0_child2.1.clone(),
-                LocalSettingsKind::Settings,
-                Some(r#"{}"#),
-                cx,
-            )
-            .unwrap();
-
-        store
-            .set_local_settings(
-                wt1_root.0,
-                wt1_root.1.clone(),
-                LocalSettingsKind::Settings,
-                Some(r#"{"preferred_line_length": 90}"#),
-                cx,
-            )
-            .unwrap();
-        store
-            .set_local_settings(
-                wt1_subdir.0,
-                wt1_subdir.1.clone(),
-                LocalSettingsKind::Settings,
-                Some(r#"{}"#),
-                cx,
-            )
-            .unwrap();
-
-        let overrides = store.get_overrides_for_field(SettingsFile::Default, get);
-        assert_eq!(
-            overrides,
-            vec![
-                SettingsFile::User,
-                SettingsFile::Project(wt0_root.clone()),
-                SettingsFile::Project(wt0_child1.clone()),
-                SettingsFile::Project(wt1_root.clone()),
-            ]
-        );
-
-        let overrides = store.get_overrides_for_field(SettingsFile::User, get);
-        assert_eq!(
-            overrides,
-            vec![
-                SettingsFile::Project(wt0_root.clone()),
-                SettingsFile::Project(wt0_child1.clone()),
-                SettingsFile::Project(wt1_root.clone()),
-            ]
-        );
-
-        let overrides = store.get_overrides_for_field(SettingsFile::Project(wt0_root), get);
-        assert_eq!(overrides, vec![]);
-
-        let overrides =
-            store.get_overrides_for_field(SettingsFile::Project(wt0_child1.clone()), get);
-        assert_eq!(overrides, vec![]);
-
-        let overrides = store.get_overrides_for_field(SettingsFile::Project(wt0_child2), get);
-        assert_eq!(overrides, vec![]);
-
-        let overrides = store.get_overrides_for_field(SettingsFile::Project(wt1_root), get);
-        assert_eq!(overrides, vec![]);
-
-        let overrides = store.get_overrides_for_field(SettingsFile::Project(wt1_subdir), get);
-        assert_eq!(overrides, vec![]);
-
-        let wt0_deep_child = (
-            WorktreeId::from_usize(0),
-            rel_path("child1/subdir").into_arc(),
-        );
-        store
-            .set_local_settings(
-                wt0_deep_child.0,
-                wt0_deep_child.1.clone(),
-                LocalSettingsKind::Settings,
-                Some(r#"{"preferred_line_length": 140}"#),
-                cx,
-            )
-            .unwrap();
-
-        let overrides = store.get_overrides_for_field(SettingsFile::Project(wt0_deep_child), get);
-        assert_eq!(overrides, vec![]);
-
-        let overrides = store.get_overrides_for_field(SettingsFile::Project(wt0_child1), get);
-        assert_eq!(overrides, vec![]);
-    }
-
-    #[test]
-    fn test_file_ord() {
-        let wt0_root =
-            SettingsFile::Project((WorktreeId::from_usize(0), RelPath::empty().into_arc()));
-        let wt0_child1 =
-            SettingsFile::Project((WorktreeId::from_usize(0), rel_path("child1").into_arc()));
-        let wt0_child2 =
-            SettingsFile::Project((WorktreeId::from_usize(0), rel_path("child2").into_arc()));
-
-        let wt1_root =
-            SettingsFile::Project((WorktreeId::from_usize(1), RelPath::empty().into_arc()));
-        let wt1_subdir =
-            SettingsFile::Project((WorktreeId::from_usize(1), rel_path("subdir").into_arc()));
-
-        let mut files = vec![
-            &wt1_root,
-            &SettingsFile::Default,
-            &wt0_root,
-            &wt1_subdir,
-            &wt0_child2,
-            &SettingsFile::Server,
-            &wt0_child1,
-            &SettingsFile::User,
-        ];
-
-        files.sort();
-        pretty_assertions::assert_eq!(
-            files,
-            vec![
-                &wt0_child2,
-                &wt0_child1,
-                &wt0_root,
-                &wt1_subdir,
-                &wt1_root,
-                &SettingsFile::Server,
-                &SettingsFile::User,
-                &SettingsFile::Default,
-            ]
-        )
-    }
-}
diff --git a/crates/settings/src/vscode_import.rs b/crates/settings/src/vscode_import.rs
deleted file mode 100644
index 587850303f..0000000000
--- a/crates/settings/src/vscode_import.rs
+++ /dev/null
@@ -1,914 +0,0 @@
-use crate::*;
-use anyhow::{Context as _, Result, anyhow};
-use collections::HashMap;
-use fs::Fs;
-use paths::{cursor_settings_file_paths, vscode_settings_file_paths};
-use serde::Deserialize;
-use serde_json::{Map, Value};
-use std::{
-    num::{NonZeroU32, NonZeroUsize},
-    path::{Path, PathBuf},
-    sync::Arc,
-};
-
-#[derive(Clone, Copy, PartialEq, Eq, Debug)]
-pub enum VsCodeSettingsSource {
-    VsCode,
-    Cursor,
-}
-
-impl std::fmt::Display for VsCodeSettingsSource {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            VsCodeSettingsSource::VsCode => write!(f, "VS Code"),
-            VsCodeSettingsSource::Cursor => write!(f, "Cursor"),
-        }
-    }
-}
-
-pub struct VsCodeSettings {
-    pub source: VsCodeSettingsSource,
-    pub path: Arc<Path>,
-    content: Map<String, Value>,
-}
-
-impl VsCodeSettings {
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn from_str(content: &str, source: VsCodeSettingsSource) -> Result<Self> {
-        Ok(Self {
-            source,
-            path: Path::new("/example-path/Code/User/settings.json").into(),
-            content: serde_json_lenient::from_str(content)?,
-        })
-    }
-
-    pub async fn load_user_settings(source: VsCodeSettingsSource, fs: Arc<dyn Fs>) -> Result<Self> {
-        let candidate_paths = match source {
-            VsCodeSettingsSource::VsCode => vscode_settings_file_paths(),
-            VsCodeSettingsSource::Cursor => cursor_settings_file_paths(),
-        };
-        let mut path = None;
-        for candidate_path in candidate_paths.iter() {
-            if fs.is_file(candidate_path).await {
-                path = Some(candidate_path.clone());
-            }
-        }
-        let Some(path) = path else {
-            return Err(anyhow!(
-                "No settings file found, expected to find it in one of the following paths:\n{}",
-                candidate_paths
-                    .into_iter()
-                    .map(|path| path.to_string_lossy().into_owned())
-                    .collect::<Vec<_>>()
-                    .join("\n")
-            ));
-        };
-        let content = fs.load(&path).await.with_context(|| {
-            format!(
-                "Error loading {} settings file from {}",
-                source,
-                path.display()
-            )
-        })?;
-        let content = serde_json_lenient::from_str(&content).with_context(|| {
-            format!(
-                "Error parsing {} settings file from {}",
-                source,
-                path.display()
-            )
-        })?;
-        Ok(Self {
-            source,
-            path: path.into(),
-            content,
-        })
-    }
-
-    fn read_value(&self, setting: &str) -> Option<&Value> {
-        self.content.get(setting)
-    }
-
-    fn read_str(&self, setting: &str) -> Option<&str> {
-        self.read_value(setting).and_then(|v| v.as_str())
-    }
-
-    fn read_string(&self, setting: &str) -> Option<String> {
-        self.read_value(setting)
-            .and_then(|v| v.as_str())
-            .map(|s| s.to_owned())
-    }
-
-    fn read_bool(&self, setting: &str) -> Option<bool> {
-        self.read_value(setting).and_then(|v| v.as_bool())
-    }
-
-    fn read_f32(&self, setting: &str) -> Option<f32> {
-        self.read_value(setting)
-            .and_then(|v| v.as_f64())
-            .map(|v| v as f32)
-    }
-
-    fn read_u64(&self, setting: &str) -> Option<u64> {
-        self.read_value(setting).and_then(|v| v.as_u64())
-    }
-
-    fn read_usize(&self, setting: &str) -> Option<usize> {
-        self.read_value(setting)
-            .and_then(|v| v.as_u64())
-            .and_then(|v| v.try_into().ok())
-    }
-
-    fn read_u32(&self, setting: &str) -> Option<u32> {
-        self.read_value(setting)
-            .and_then(|v| v.as_u64())
-            .and_then(|v| v.try_into().ok())
-    }
-
-    fn read_enum<T>(&self, key: &str, f: impl FnOnce(&str) -> Option<T>) -> Option<T> {
-        self.content.get(key).and_then(Value::as_str).and_then(f)
-    }
-
-    fn read_fonts(&self, key: &str) -> (Option<FontFamilyName>, Option<Vec<FontFamilyName>>) {
-        let Some(css_name) = self.content.get(key).and_then(Value::as_str) else {
-            return (None, None);
-        };
-
-        let mut name_buffer = String::new();
-        let mut quote_char: Option<char> = None;
-        let mut fonts = Vec::new();
-        let mut add_font = |buffer: &mut String| {
-            let trimmed = buffer.trim();
-            if !trimmed.is_empty() {
-                fonts.push(trimmed.to_string().into());
-            }
-
-            buffer.clear();
-        };
-
-        for ch in css_name.chars() {
-            match (ch, quote_char) {
-                ('"' | '\'', None) => {
-                    quote_char = Some(ch);
-                }
-                (_, Some(q)) if ch == q => {
-                    quote_char = None;
-                }
-                (',', None) => {
-                    add_font(&mut name_buffer);
-                }
-                _ => {
-                    name_buffer.push(ch);
-                }
-            }
-        }
-
-        add_font(&mut name_buffer);
-        if fonts.is_empty() {
-            return (None, None);
-        }
-        (Some(fonts.remove(0)), skip_default(fonts))
-    }
-
-    pub fn settings_content(&self) -> SettingsContent {
-        SettingsContent {
-            agent: self.agent_settings_content(),
-            agent_servers: None,
-            audio: None,
-            auto_update: None,
-            base_keymap: Some(BaseKeymapContent::VSCode),
-            calls: None,
-            collaboration_panel: None,
-            debugger: None,
-            diagnostics: None,
-            disable_ai: None,
-            editor: self.editor_settings_content(),
-            extension: ExtensionSettingsContent::default(),
-            file_finder: None,
-            git: self.git_settings_content(),
-            git_panel: self.git_panel_settings_content(),
-            global_lsp_settings: None,
-            helix_mode: None,
-            image_viewer: None,
-            journal: None,
-            language_models: None,
-            line_indicator_format: None,
-            log: None,
-            message_editor: None,
-            node: self.node_binary_settings(),
-            notification_panel: None,
-            outline_panel: self.outline_panel_settings_content(),
-            preview_tabs: self.preview_tabs_settings_content(),
-            project: self.project_settings_content(),
-            project_panel: self.project_panel_settings_content(),
-            proxy: self.read_string("http.proxy"),
-            remote: RemoteSettingsContent::default(),
-            repl: None,
-            server_url: None,
-            session: None,
-            status_bar: self.status_bar_settings_content(),
-            tab_bar: self.tab_bar_settings_content(),
-            tabs: self.item_settings_content(),
-            telemetry: self.telemetry_settings_content(),
-            terminal: self.terminal_settings_content(),
-            theme: Box::new(self.theme_settings_content()),
-            title_bar: None,
-            vim: None,
-            vim_mode: None,
-            workspace: self.workspace_settings_content(),
-        }
-    }
-
-    fn agent_settings_content(&self) -> Option<AgentSettingsContent> {
-        let enabled = self.read_bool("chat.agent.enabled");
-        skip_default(AgentSettingsContent {
-            enabled: enabled,
-            button: enabled,
-            ..Default::default()
-        })
-    }
-
-    fn editor_settings_content(&self) -> EditorSettingsContent {
-        EditorSettingsContent {
-            auto_signature_help: self.read_bool("editor.parameterHints.enabled"),
-            autoscroll_on_clicks: None,
-            cursor_blink: self.read_enum("editor.cursorBlinking", |s| match s {
-                "blink" | "phase" | "expand" | "smooth" => Some(true),
-                "solid" => Some(false),
-                _ => None,
-            }),
-            cursor_shape: self.read_enum("editor.cursorStyle", |s| match s {
-                "block" => Some(CursorShape::Block),
-                "block-outline" => Some(CursorShape::Hollow),
-                "line" | "line-thin" => Some(CursorShape::Bar),
-                "underline" | "underline-thin" => Some(CursorShape::Underline),
-                _ => None,
-            }),
-            current_line_highlight: self.read_enum("editor.renderLineHighlight", |s| match s {
-                "gutter" => Some(CurrentLineHighlight::Gutter),
-                "line" => Some(CurrentLineHighlight::Line),
-                "all" => Some(CurrentLineHighlight::All),
-                _ => None,
-            }),
-            diagnostics_max_severity: None,
-            double_click_in_multibuffer: None,
-            drag_and_drop_selection: None,
-            excerpt_context_lines: None,
-            expand_excerpt_lines: None,
-            fast_scroll_sensitivity: self.read_f32("editor.fastScrollSensitivity"),
-            sticky_scroll: self.sticky_scroll_content(),
-            go_to_definition_fallback: None,
-            gutter: self.gutter_content(),
-            hide_mouse: None,
-            horizontal_scroll_margin: None,
-            hover_popover_delay: self.read_u64("editor.hover.delay").map(Into::into),
-            hover_popover_enabled: self.read_bool("editor.hover.enabled"),
-            inline_code_actions: None,
-            jupyter: None,
-            lsp_document_colors: None,
-            lsp_highlight_debounce: None,
-            middle_click_paste: None,
-            minimap: self.minimap_content(),
-            minimum_contrast_for_highlights: None,
-            multi_cursor_modifier: self.read_enum("editor.multiCursorModifier", |s| match s {
-                "ctrlCmd" => Some(MultiCursorModifier::CmdOrCtrl),
-                "alt" => Some(MultiCursorModifier::Alt),
-                _ => None,
-            }),
-            redact_private_values: None,
-            relative_line_numbers: self.read_enum("editor.lineNumbers", |s| match s {
-                "relative" => Some(RelativeLineNumbers::Enabled),
-                _ => None,
-            }),
-            rounded_selection: self.read_bool("editor.roundedSelection"),
-            scroll_beyond_last_line: None,
-            scroll_sensitivity: self.read_f32("editor.mouseWheelScrollSensitivity"),
-            scrollbar: self.scrollbar_content(),
-            search: self.search_content(),
-            search_wrap: None,
-            seed_search_query_from_cursor: self.read_enum(
-                "editor.find.seedSearchStringFromSelection",
-                |s| match s {
-                    "always" => Some(SeedQuerySetting::Always),
-                    "selection" => Some(SeedQuerySetting::Selection),
-                    "never" => Some(SeedQuerySetting::Never),
-                    _ => None,
-                },
-            ),
-            selection_highlight: self.read_bool("editor.selectionHighlight"),
-            show_signature_help_after_edits: self.read_bool("editor.parameterHints.enabled"),
-            snippet_sort_order: None,
-            toolbar: None,
-            use_smartcase_search: self.read_bool("search.smartCase"),
-            vertical_scroll_margin: self.read_f32("editor.cursorSurroundingLines"),
-            completion_menu_scrollbar: None,
-        }
-    }
-
-    fn sticky_scroll_content(&self) -> Option<StickyScrollContent> {
-        skip_default(StickyScrollContent {
-            enabled: self.read_bool("editor.stickyScroll.enabled"),
-        })
-    }
-
-    fn gutter_content(&self) -> Option<GutterContent> {
-        skip_default(GutterContent {
-            line_numbers: self.read_enum("editor.lineNumbers", |s| match s {
-                "on" | "relative" => Some(true),
-                "off" => Some(false),
-                _ => None,
-            }),
-            min_line_number_digits: None,
-            runnables: None,
-            breakpoints: None,
-            folds: self.read_enum("editor.showFoldingControls", |s| match s {
-                "always" | "mouseover" => Some(true),
-                "never" => Some(false),
-                _ => None,
-            }),
-        })
-    }
-
-    fn scrollbar_content(&self) -> Option<ScrollbarContent> {
-        let scrollbar_axes = skip_default(ScrollbarAxesContent {
-            horizontal: self.read_enum("editor.scrollbar.horizontal", |s| match s {
-                "auto" | "visible" => Some(true),
-                "hidden" => Some(false),
-                _ => None,
-            }),
-            vertical: self.read_enum("editor.scrollbar.vertical", |s| match s {
-                "auto" | "visible" => Some(true),
-                "hidden" => Some(false),
-                _ => None,
-            }),
-        })?;
-
-        Some(ScrollbarContent {
-            axes: Some(scrollbar_axes),
-            ..Default::default()
-        })
-    }
-
-    fn search_content(&self) -> Option<SearchSettingsContent> {
-        skip_default(SearchSettingsContent {
-            include_ignored: self.read_bool("search.useIgnoreFiles"),
-            ..Default::default()
-        })
-    }
-
-    fn minimap_content(&self) -> Option<MinimapContent> {
-        let minimap_enabled = self.read_bool("editor.minimap.enabled");
-        let autohide = self.read_bool("editor.minimap.autohide");
-        let show = match (minimap_enabled, autohide) {
-            (Some(true), Some(false)) => Some(ShowMinimap::Always),
-            (Some(true), _) => Some(ShowMinimap::Auto),
-            (Some(false), _) => Some(ShowMinimap::Never),
-            _ => None,
-        };
-
-        skip_default(MinimapContent {
-            show,
-            thumb: self.read_enum("editor.minimap.showSlider", |s| match s {
-                "always" => Some(MinimapThumb::Always),
-                "mouseover" => Some(MinimapThumb::Hover),
-                _ => None,
-            }),
-            max_width_columns: self
-                .read_u32("editor.minimap.maxColumn")
-                .and_then(|v| NonZeroU32::new(v)),
-            ..Default::default()
-        })
-    }
-
-    fn git_panel_settings_content(&self) -> Option<GitPanelSettingsContent> {
-        skip_default(GitPanelSettingsContent {
-            button: self.read_bool("git.enabled"),
-            fallback_branch_name: self.read_string("git.defaultBranchName"),
-            ..Default::default()
-        })
-    }
-
-    fn project_settings_content(&self) -> ProjectSettingsContent {
-        ProjectSettingsContent {
-            all_languages: AllLanguageSettingsContent {
-                features: None,
-                edit_predictions: self.edit_predictions_settings_content(),
-                defaults: self.default_language_settings_content(),
-                languages: Default::default(),
-                file_types: self.file_types(),
-            },
-            worktree: self.worktree_settings_content(),
-            lsp: Default::default(),
-            terminal: None,
-            dap: Default::default(),
-            context_servers: self.context_servers(),
-            load_direnv: None,
-            slash_commands: None,
-            git_hosting_providers: None,
-        }
-    }
-
-    fn default_language_settings_content(&self) -> LanguageSettingsContent {
-        LanguageSettingsContent {
-            allow_rewrap: None,
-            always_treat_brackets_as_autoclosed: None,
-            auto_indent: None,
-            auto_indent_on_paste: self.read_bool("editor.formatOnPaste"),
-            code_actions_on_format: None,
-            completions: skip_default(CompletionSettingsContent {
-                words: self.read_bool("editor.suggest.showWords").map(|b| {
-                    if b {
-                        WordsCompletionMode::Enabled
-                    } else {
-                        WordsCompletionMode::Disabled
-                    }
-                }),
-                ..Default::default()
-            }),
-            debuggers: None,
-            edit_predictions_disabled_in: None,
-            enable_language_server: None,
-            ensure_final_newline_on_save: self.read_bool("files.insertFinalNewline"),
-            extend_comment_on_newline: None,
-            format_on_save: self.read_bool("editor.guides.formatOnSave").map(|b| {
-                if b {
-                    FormatOnSave::On
-                } else {
-                    FormatOnSave::Off
-                }
-            }),
-            formatter: None,
-            hard_tabs: self.read_bool("editor.insertSpaces").map(|v| !v),
-            indent_guides: skip_default(IndentGuideSettingsContent {
-                enabled: self.read_bool("editor.guides.indentation"),
-                ..Default::default()
-            }),
-            inlay_hints: None,
-            jsx_tag_auto_close: None,
-            language_servers: None,
-            linked_edits: self.read_bool("editor.linkedEditing"),
-            preferred_line_length: self.read_u32("editor.wordWrapColumn"),
-            prettier: None,
-            remove_trailing_whitespace_on_save: self.read_bool("editor.trimAutoWhitespace"),
-            show_completion_documentation: None,
-            colorize_brackets: self.read_bool("editor.bracketPairColorization.enabled"),
-            show_completions_on_input: self.read_bool("editor.suggestOnTriggerCharacters"),
-            show_edit_predictions: self.read_bool("editor.inlineSuggest.enabled"),
-            show_whitespaces: self.read_enum("editor.renderWhitespace", |s| {
-                Some(match s {
-                    "boundary" => ShowWhitespaceSetting::Boundary,
-                    "trailing" => ShowWhitespaceSetting::Trailing,
-                    "selection" => ShowWhitespaceSetting::Selection,
-                    "all" => ShowWhitespaceSetting::All,
-                    _ => ShowWhitespaceSetting::None,
-                })
-            }),
-            show_wrap_guides: None,
-            soft_wrap: self.read_enum("editor.wordWrap", |s| match s {
-                "on" => Some(SoftWrap::EditorWidth),
-                "wordWrapColumn" => Some(SoftWrap::PreferLine),
-                "bounded" => Some(SoftWrap::Bounded),
-                "off" => Some(SoftWrap::None),
-                _ => None,
-            }),
-            tab_size: self
-                .read_u32("editor.tabSize")
-                .and_then(|n| NonZeroU32::new(n)),
-            tasks: None,
-            use_auto_surround: self.read_enum("editor.autoSurround", |s| match s {
-                "languageDefined" | "quotes" | "brackets" => Some(true),
-                "never" => Some(false),
-                _ => None,
-            }),
-            use_autoclose: None,
-            use_on_type_format: self.read_bool("editor.formatOnType"),
-            whitespace_map: None,
-            wrap_guides: self
-                .read_value("editor.rulers")
-                .and_then(|v| v.as_array())
-                .map(|v| {
-                    v.iter()
-                        .flat_map(|n| n.as_u64().map(|n| n as usize))
-                        .collect()
-                }),
-            word_diff_enabled: None,
-        }
-    }
-
-    fn file_types(&self) -> Option<HashMap<Arc<str>, ExtendingVec<String>>> {
-        // vscodes file association map is inverted from ours, so we flip the mapping before merging
-        let mut associations: HashMap<Arc<str>, ExtendingVec<String>> = HashMap::default();
-        let map = self.read_value("files.associations")?.as_object()?;
-        for (k, v) in map {
-            let Some(v) = v.as_str() else { continue };
-            associations.entry(v.into()).or_default().0.push(k.clone());
-        }
-        skip_default(associations)
-    }
-
-    fn edit_predictions_settings_content(&self) -> Option<EditPredictionSettingsContent> {
-        let disabled_globs = self
-            .read_value("cursor.general.globalCursorIgnoreList")?
-            .as_array()?;
-
-        skip_default(EditPredictionSettingsContent {
-            disabled_globs: skip_default(
-                disabled_globs
-                    .iter()
-                    .filter_map(|glob| glob.as_str())
-                    .map(|s| s.to_string())
-                    .collect(),
-            ),
-            ..Default::default()
-        })
-    }
-
-    fn outline_panel_settings_content(&self) -> Option<OutlinePanelSettingsContent> {
-        skip_default(OutlinePanelSettingsContent {
-            file_icons: self.read_bool("outline.icons"),
-            folder_icons: self.read_bool("outline.icons"),
-            git_status: self.read_bool("git.decorations.enabled"),
-            ..Default::default()
-        })
-    }
-
-    fn node_binary_settings(&self) -> Option<NodeBinarySettings> {
-        // this just sets the binary name instead of a full path so it relies on path lookup
-        // resolving to the one you want
-        skip_default(NodeBinarySettings {
-            npm_path: self.read_enum("npm.packageManager", |s| match s {
-                v @ ("npm" | "yarn" | "bun" | "pnpm") => Some(v.to_owned()),
-                _ => None,
-            }),
-            ..Default::default()
-        })
-    }
-
-    fn git_settings_content(&self) -> Option<GitSettings> {
-        let inline_blame = self.read_bool("git.blame.editorDecoration.enabled")?;
-        skip_default(GitSettings {
-            inline_blame: Some(InlineBlameSettings {
-                enabled: Some(inline_blame),
-                ..Default::default()
-            }),
-            ..Default::default()
-        })
-    }
-
-    fn context_servers(&self) -> HashMap<Arc<str>, ContextServerSettingsContent> {
-        #[derive(Deserialize)]
-        struct VsCodeContextServerCommand {
-            command: PathBuf,
-            args: Option<Vec<String>>,
-            env: Option<HashMap<String, String>>,
-            // note: we don't support envFile and type
-        }
-        let Some(mcp) = self.read_value("mcp").and_then(|v| v.as_object()) else {
-            return Default::default();
-        };
-        mcp.iter()
-            .filter_map(|(k, v)| {
-                Some((
-                    k.clone().into(),
-                    ContextServerSettingsContent::Stdio {
-                        enabled: true,
-                        command: serde_json::from_value::<VsCodeContextServerCommand>(v.clone())
-                            .ok()
-                            .map(|cmd| ContextServerCommand {
-                                path: cmd.command,
-                                args: cmd.args.unwrap_or_default(),
-                                env: cmd.env,
-                                timeout: None,
-                            })?,
-                    },
-                ))
-            })
-            .collect()
-    }
-
-    fn item_settings_content(&self) -> Option<ItemSettingsContent> {
-        skip_default(ItemSettingsContent {
-            git_status: self.read_bool("git.decorations.enabled"),
-            close_position: self.read_enum("workbench.editor.tabActionLocation", |s| match s {
-                "right" => Some(ClosePosition::Right),
-                "left" => Some(ClosePosition::Left),
-                _ => None,
-            }),
-            file_icons: self.read_bool("workbench.editor.showIcons"),
-            activate_on_close: self
-                .read_bool("workbench.editor.focusRecentEditorAfterClose")
-                .map(|b| {
-                    if b {
-                        ActivateOnClose::History
-                    } else {
-                        ActivateOnClose::LeftNeighbour
-                    }
-                }),
-            show_diagnostics: None,
-            show_close_button: self
-                .read_bool("workbench.editor.tabActionCloseVisibility")
-                .map(|b| {
-                    if b {
-                        ShowCloseButton::Always
-                    } else {
-                        ShowCloseButton::Hidden
-                    }
-                }),
-        })
-    }
-
-    fn preview_tabs_settings_content(&self) -> Option<PreviewTabsSettingsContent> {
-        skip_default(PreviewTabsSettingsContent {
-            enabled: self.read_bool("workbench.editor.enablePreview"),
-            enable_preview_from_project_panel: None,
-            enable_preview_from_file_finder: self
-                .read_bool("workbench.editor.enablePreviewFromQuickOpen"),
-            enable_preview_from_multibuffer: None,
-            enable_preview_multibuffer_from_code_navigation: None,
-            enable_preview_file_from_code_navigation: None,
-            enable_keep_preview_on_code_navigation: self
-                .read_bool("workbench.editor.enablePreviewFromCodeNavigation"),
-        })
-    }
-
-    fn tab_bar_settings_content(&self) -> Option<TabBarSettingsContent> {
-        skip_default(TabBarSettingsContent {
-            show: self.read_enum("workbench.editor.showTabs", |s| match s {
-                "multiple" => Some(true),
-                "single" | "none" => Some(false),
-                _ => None,
-            }),
-            show_nav_history_buttons: None,
-            show_tab_bar_buttons: self
-                .read_str("workbench.editor.editorActionsLocation")
-                .and_then(|str| if str == "hidden" { Some(false) } else { None }),
-        })
-    }
-
-    fn status_bar_settings_content(&self) -> Option<StatusBarSettingsContent> {
-        skip_default(StatusBarSettingsContent {
-            show: self.read_bool("workbench.statusBar.visible"),
-            active_language_button: None,
-            cursor_position_button: None,
-            line_endings_button: None,
-        })
-    }
-
-    fn project_panel_settings_content(&self) -> Option<ProjectPanelSettingsContent> {
-        let mut project_panel_settings = ProjectPanelSettingsContent {
-            auto_fold_dirs: self.read_bool("explorer.compactFolders"),
-            auto_reveal_entries: self.read_bool("explorer.autoReveal"),
-            button: None,
-            default_width: None,
-            dock: None,
-            drag_and_drop: None,
-            entry_spacing: None,
-            file_icons: None,
-            folder_icons: None,
-            git_status: self.read_bool("git.decorations.enabled"),
-            hide_gitignore: self.read_bool("explorer.excludeGitIgnore"),
-            hide_hidden: None,
-            hide_root: None,
-            indent_guides: None,
-            indent_size: None,
-            scrollbar: None,
-            show_diagnostics: self
-                .read_bool("problems.decorations.enabled")
-                .and_then(|b| if b { Some(ShowDiagnostics::Off) } else { None }),
-            sort_mode: None,
-            starts_open: None,
-            sticky_scroll: None,
-            auto_open: None,
-        };
-
-        if let (Some(false), Some(false)) = (
-            self.read_bool("explorer.decorations.badges"),
-            self.read_bool("explorer.decorations.colors"),
-        ) {
-            project_panel_settings.git_status = Some(false);
-            project_panel_settings.show_diagnostics = Some(ShowDiagnostics::Off);
-        }
-
-        skip_default(project_panel_settings)
-    }
-
-    fn telemetry_settings_content(&self) -> Option<TelemetrySettingsContent> {
-        self.read_enum("telemetry.telemetryLevel", |level| {
-            let (metrics, diagnostics) = match level {
-                "all" => (true, true),
-                "error" | "crash" => (false, true),
-                "off" => (false, false),
-                _ => return None,
-            };
-            Some(TelemetrySettingsContent {
-                metrics: Some(metrics),
-                diagnostics: Some(diagnostics),
-            })
-        })
-    }
-
-    fn terminal_settings_content(&self) -> Option<TerminalSettingsContent> {
-        let (font_family, font_fallbacks) = self.read_fonts("terminal.integrated.fontFamily");
-        skip_default(TerminalSettingsContent {
-            alternate_scroll: None,
-            blinking: self
-                .read_bool("terminal.integrated.cursorBlinking")
-                .map(|b| {
-                    if b {
-                        TerminalBlink::On
-                    } else {
-                        TerminalBlink::Off
-                    }
-                }),
-            button: None,
-            copy_on_select: self.read_bool("terminal.integrated.copyOnSelection"),
-            cursor_shape: self.read_enum("terminal.integrated.cursorStyle", |s| match s {
-                "block" => Some(CursorShapeContent::Block),
-                "line" => Some(CursorShapeContent::Bar),
-                "underline" => Some(CursorShapeContent::Underline),
-                _ => None,
-            }),
-            default_height: None,
-            default_width: None,
-            dock: None,
-            font_fallbacks,
-            font_family,
-            font_features: None,
-            font_size: self.read_f32("terminal.integrated.fontSize"),
-            font_weight: None,
-            keep_selection_on_copy: None,
-            line_height: self
-                .read_f32("terminal.integrated.lineHeight")
-                .map(|lh| TerminalLineHeight::Custom(lh)),
-            max_scroll_history_lines: self.read_usize("terminal.integrated.scrollback"),
-            minimum_contrast: None,
-            option_as_meta: self.read_bool("terminal.integrated.macOptionIsMeta"),
-            project: self.project_terminal_settings_content(),
-            scrollbar: None,
-            scroll_multiplier: None,
-            toolbar: None,
-        })
-    }
-
-    fn project_terminal_settings_content(&self) -> ProjectTerminalSettingsContent {
-        #[cfg(target_os = "windows")]
-        let platform = "windows";
-        #[cfg(target_os = "linux")]
-        let platform = "linux";
-        #[cfg(target_os = "macos")]
-        let platform = "osx";
-        #[cfg(target_os = "freebsd")]
-        let platform = "freebsd";
-        let env = self
-            .read_value(&format!("terminal.integrated.env.{platform}"))
-            .and_then(|v| v.as_object())
-            .map(|v| {
-                v.iter()
-                    .map(|(k, v)| (k.clone(), v.to_string()))
-                    // zed does not support substitutions, so this can break env vars
-                    .filter(|(_, v)| !v.contains('$'))
-                    .collect()
-            });
-
-        ProjectTerminalSettingsContent {
-            // TODO: handle arguments
-            shell: self
-                .read_string(&format!("terminal.integrated.{platform}Exec"))
-                .map(|s| Shell::Program(s)),
-            working_directory: None,
-            env,
-            detect_venv: None,
-            path_hyperlink_regexes: None,
-            path_hyperlink_timeout_ms: None,
-        }
-    }
-
-    fn theme_settings_content(&self) -> ThemeSettingsContent {
-        let (buffer_font_family, buffer_font_fallbacks) = self.read_fonts("editor.fontFamily");
-        ThemeSettingsContent {
-            ui_font_size: None,
-            ui_font_family: None,
-            ui_font_fallbacks: None,
-            ui_font_features: None,
-            ui_font_weight: None,
-            buffer_font_family,
-            buffer_font_fallbacks,
-            buffer_font_size: self.read_f32("editor.fontSize"),
-            buffer_font_weight: self.read_f32("editor.fontWeight").map(|w| w.into()),
-            buffer_line_height: None,
-            buffer_font_features: None,
-            agent_ui_font_size: None,
-            agent_buffer_font_size: None,
-            theme: None,
-            icon_theme: None,
-            ui_density: None,
-            unnecessary_code_fade: None,
-            experimental_theme_overrides: None,
-            theme_overrides: Default::default(),
-        }
-    }
-
-    fn workspace_settings_content(&self) -> WorkspaceSettingsContent {
-        WorkspaceSettingsContent {
-            active_pane_modifiers: self.active_pane_modifiers(),
-            autosave: self.read_enum("files.autoSave", |s| match s {
-                "off" => Some(AutosaveSetting::Off),
-                "afterDelay" => Some(AutosaveSetting::AfterDelay {
-                    milliseconds: self
-                        .read_value("files.autoSaveDelay")
-                        .and_then(|v| v.as_u64())
-                        .unwrap_or(1000)
-                        .into(),
-                }),
-                "onFocusChange" => Some(AutosaveSetting::OnFocusChange),
-                "onWindowChange" => Some(AutosaveSetting::OnWindowChange),
-                _ => None,
-            }),
-            bottom_dock_layout: None,
-            centered_layout: None,
-            close_on_file_delete: None,
-            command_aliases: Default::default(),
-            confirm_quit: self.read_enum("window.confirmBeforeClose", |s| match s {
-                "always" | "keyboardOnly" => Some(true),
-                "never" => Some(false),
-                _ => None,
-            }),
-            drop_target_size: None,
-            // workbench.editor.limit contains "enabled", "value", and "perEditorGroup"
-            // our semantics match if those are set to true, some N, and true respectively.
-            // we'll ignore "perEditorGroup" for now since we only support a global max
-            max_tabs: if self.read_bool("workbench.editor.limit.enabled") == Some(true) {
-                self.read_usize("workbench.editor.limit.value")
-                    .and_then(|n| NonZeroUsize::new(n))
-            } else {
-                None
-            },
-            on_last_window_closed: None,
-            pane_split_direction_horizontal: None,
-            pane_split_direction_vertical: None,
-            resize_all_panels_in_dock: None,
-            restore_on_file_reopen: self.read_bool("workbench.editor.restoreViewState"),
-            restore_on_startup: None,
-            window_decorations: None,
-            show_call_status_icon: None,
-            use_system_path_prompts: self.read_bool("files.simpleDialog.enable"),
-            use_system_prompts: None,
-            use_system_window_tabs: self.read_bool("window.nativeTabs"),
-            when_closing_with_no_tabs: self.read_bool("window.closeWhenEmpty").map(|b| {
-                if b {
-                    CloseWindowWhenNoItems::CloseWindow
-                } else {
-                    CloseWindowWhenNoItems::KeepWindowOpen
-                }
-            }),
-            zoomed_padding: None,
-        }
-    }
-
-    fn active_pane_modifiers(&self) -> Option<ActivePaneModifiers> {
-        if self.read_bool("accessibility.dimUnfocused.enabled") == Some(true)
-            && let Some(opacity) = self.read_f32("accessibility.dimUnfocused.opacity")
-        {
-            Some(ActivePaneModifiers {
-                border_size: None,
-                inactive_opacity: Some(InactiveOpacity(opacity)),
-            })
-        } else {
-            None
-        }
-    }
-
-    fn worktree_settings_content(&self) -> WorktreeSettingsContent {
-        WorktreeSettingsContent {
-            project_name: None,
-            prevent_sharing_in_public_channels: false,
-            file_scan_exclusions: self
-                .read_value("files.watcherExclude")
-                .and_then(|v| v.as_array())
-                .map(|v| {
-                    v.iter()
-                        .filter_map(|n| n.as_str().map(str::to_owned))
-                        .collect::<Vec<_>>()
-                })
-                .filter(|r| !r.is_empty()),
-            file_scan_inclusions: self
-                .read_value("files.watcherInclude")
-                .and_then(|v| v.as_array())
-                .map(|v| {
-                    v.iter()
-                        .filter_map(|n| n.as_str().map(str::to_owned))
-                        .collect::<Vec<_>>()
-                })
-                .filter(|r| !r.is_empty()),
-            private_files: None,
-            hidden_files: None,
-        }
-    }
-}
-
-fn skip_default<T: Default + PartialEq>(value: T) -> Option<T> {
-    if value == T::default() {
-        None
-    } else {
-        Some(value)
-    }
-}
diff --git a/crates/settings_json/Cargo.toml b/crates/settings_json/Cargo.toml
deleted file mode 100644
index 2ba9887ca0..0000000000
--- a/crates/settings_json/Cargo.toml
+++ /dev/null
@@ -1,35 +0,0 @@
-[package]
-name = "settings_json"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/settings_json.rs"
-
-[features]
-default = []
-
-[dependencies]
-anyhow.workspace = true
-tree-sitter.workspace = true
-tree-sitter-json.workspace = true
-util.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-serde_json_lenient.workspace = true
-serde_path_to_error.workspace = true
-
-[dev-dependencies]
-unindent.workspace = true
-pretty_assertions.workspace = true
-
-# Uncomment other workspace dependencies as needed
-# assistant.workspace = true
-# client.workspace = true
-# project.workspace = true
-# settings.workspace = true
diff --git a/crates/settings_json/LICENSE-GPL b/crates/settings_json/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/settings_json/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/settings_json/src/settings_json.rs b/crates/settings_json/src/settings_json.rs
deleted file mode 100644
index 5198e475af..0000000000
--- a/crates/settings_json/src/settings_json.rs
+++ /dev/null
@@ -1,2635 +0,0 @@
-use anyhow::Result;
-use serde::{Serialize, de::DeserializeOwned};
-use serde_json::Value;
-use std::{ops::Range, sync::LazyLock};
-use tree_sitter::{Query, StreamingIterator as _};
-use util::RangeExt;
-
-pub fn update_value_in_json_text<'a>(
-    text: &mut String,
-    key_path: &mut Vec<&'a str>,
-    tab_size: usize,
-    old_value: &'a Value,
-    new_value: &'a Value,
-    edits: &mut Vec<(Range<usize>, String)>,
-) {
-    // If the old and new values are both objects, then compare them key by key,
-    // preserving the comments and formatting of the unchanged parts. Otherwise,
-    // replace the old value with the new value.
-    if let (Value::Object(old_object), Value::Object(new_object)) = (old_value, new_value) {
-        for (key, old_sub_value) in old_object.iter() {
-            key_path.push(key);
-            if let Some(new_sub_value) = new_object.get(key) {
-                // Key exists in both old and new, recursively update
-                update_value_in_json_text(
-                    text,
-                    key_path,
-                    tab_size,
-                    old_sub_value,
-                    new_sub_value,
-                    edits,
-                );
-            } else {
-                // Key was removed from new object, remove the entire key-value pair
-                let (range, replacement) =
-                    replace_value_in_json_text(text, key_path, 0, None, None);
-                text.replace_range(range.clone(), &replacement);
-                edits.push((range, replacement));
-            }
-            key_path.pop();
-        }
-        for (key, new_sub_value) in new_object.iter() {
-            key_path.push(key);
-            if !old_object.contains_key(key) {
-                update_value_in_json_text(
-                    text,
-                    key_path,
-                    tab_size,
-                    &Value::Null,
-                    new_sub_value,
-                    edits,
-                );
-            }
-            key_path.pop();
-        }
-    } else if old_value != new_value {
-        let mut new_value = new_value.clone();
-        if let Some(new_object) = new_value.as_object_mut() {
-            new_object.retain(|_, v| !v.is_null());
-        }
-        let (range, replacement) =
-            replace_value_in_json_text(text, key_path, tab_size, Some(&new_value), None);
-        text.replace_range(range.clone(), &replacement);
-        edits.push((range, replacement));
-    }
-}
-
-/// * `replace_key` - When an exact key match according to `key_path` is found, replace the key with `replace_key` if `Some`.
-pub fn replace_value_in_json_text<T: AsRef<str>>(
-    text: &str,
-    key_path: &[T],
-    tab_size: usize,
-    new_value: Option<&Value>,
-    replace_key: Option<&str>,
-) -> (Range<usize>, String) {
-    static PAIR_QUERY: LazyLock<Query> = LazyLock::new(|| {
-        Query::new(
-            &tree_sitter_json::LANGUAGE.into(),
-            "(pair key: (string) @key value: (_) @value)",
-        )
-        .expect("Failed to create PAIR_QUERY")
-    });
-
-    let mut parser = tree_sitter::Parser::new();
-    parser
-        .set_language(&tree_sitter_json::LANGUAGE.into())
-        .unwrap();
-    let syntax_tree = parser.parse(text, None).unwrap();
-
-    let mut cursor = tree_sitter::QueryCursor::new();
-
-    let mut depth = 0;
-    let mut last_value_range = 0..0;
-    let mut first_key_start = None;
-    let mut existing_value_range = 0..text.len();
-
-    let mut matches = cursor.matches(&PAIR_QUERY, syntax_tree.root_node(), text.as_bytes());
-    while let Some(mat) = matches.next() {
-        if mat.captures.len() != 2 {
-            continue;
-        }
-
-        let key_range = mat.captures[0].node.byte_range();
-        let value_range = mat.captures[1].node.byte_range();
-
-        // Don't enter sub objects until we find an exact
-        // match for the current keypath
-        if last_value_range.contains_inclusive(&value_range) {
-            continue;
-        }
-
-        last_value_range = value_range.clone();
-
-        if key_range.start > existing_value_range.end {
-            break;
-        }
-
-        first_key_start.get_or_insert(key_range.start);
-
-        let found_key = text
-            .get(key_range.clone())
-            .zip(key_path.get(depth))
-            .and_then(|(key_text, key_path_value)| {
-                serde_json::to_string(key_path_value.as_ref())
-                    .ok()
-                    .map(|key_path| depth < key_path.len() && key_text == key_path)
-            })
-            .unwrap_or(false);
-
-        if found_key {
-            existing_value_range = value_range;
-            // Reset last value range when increasing in depth
-            last_value_range = existing_value_range.start..existing_value_range.start;
-            depth += 1;
-
-            if depth == key_path.len() {
-                break;
-            }
-
-            if let Some(array_replacement) = handle_possible_array_value(
-                &mat.captures[0].node,
-                &mat.captures[1].node,
-                text,
-                &key_path[depth..],
-                new_value,
-                replace_key,
-                tab_size,
-            ) {
-                return array_replacement;
-            }
-
-            first_key_start = None;
-        }
-    }
-
-    // We found the exact key we want
-    if depth == key_path.len() {
-        if let Some(new_value) = new_value {
-            let new_val = to_pretty_json(new_value, tab_size, tab_size * depth);
-            if let Some(replace_key) = replace_key.and_then(|str| serde_json::to_string(str).ok()) {
-                let new_key = format!("{}: ", replace_key);
-                if let Some(key_start) = text[..existing_value_range.start].rfind('"') {
-                    if let Some(prev_key_start) = text[..key_start].rfind('"') {
-                        existing_value_range.start = prev_key_start;
-                    } else {
-                        existing_value_range.start = key_start;
-                    }
-                }
-                (existing_value_range, new_key + &new_val)
-            } else {
-                (existing_value_range, new_val)
-            }
-        } else {
-            let mut removal_start = first_key_start.unwrap_or(existing_value_range.start);
-            let mut removal_end = existing_value_range.end;
-
-            // Find the actual key position by looking for the key in the pair
-            // We need to extend the range to include the key, not just the value
-            if let Some(key_start) = text[..existing_value_range.start].rfind('"') {
-                if let Some(prev_key_start) = text[..key_start].rfind('"') {
-                    removal_start = prev_key_start;
-                } else {
-                    removal_start = key_start;
-                }
-            }
-
-            let mut removed_comma = false;
-            // Look backward for a preceding comma first
-            let preceding_text = text.get(0..removal_start).unwrap_or("");
-            if let Some(comma_pos) = preceding_text.rfind(',') {
-                // Check if there are only whitespace characters between the comma and our key
-                let between_comma_and_key = text.get(comma_pos + 1..removal_start).unwrap_or("");
-                if between_comma_and_key.trim().is_empty() {
-                    removal_start = comma_pos;
-                    removed_comma = true;
-                }
-            }
-            if let Some(remaining_text) = text.get(existing_value_range.end..)
-                && !removed_comma
-            {
-                let mut chars = remaining_text.char_indices();
-                while let Some((offset, ch)) = chars.next() {
-                    if ch == ',' {
-                        removal_end = existing_value_range.end + offset + 1;
-                        // Also consume whitespace after the comma
-                        for (_, next_ch) in chars.by_ref() {
-                            if next_ch.is_whitespace() {
-                                removal_end += next_ch.len_utf8();
-                            } else {
-                                break;
-                            }
-                        }
-                        break;
-                    } else if !ch.is_whitespace() {
-                        break;
-                    }
-                }
-            }
-            (removal_start..removal_end, String::new())
-        }
-    } else {
-        if let Some(first_key_start) = first_key_start {
-            // We have key paths, construct the sub objects
-            let new_key = key_path[depth].as_ref();
-            // We don't have the key, construct the nested objects
-            let new_value = construct_json_value(&key_path[(depth + 1)..], new_value);
-
-            let mut row = 0;
-            let mut column = 0;
-            for (ix, char) in text.char_indices() {
-                if ix == first_key_start {
-                    break;
-                }
-                if char == '\n' {
-                    row += 1;
-                    column = 0;
-                } else {
-                    column += char.len_utf8();
-                }
-            }
-
-            if row > 0 {
-                // depth is 0 based, but division needs to be 1 based.
-                let new_val = to_pretty_json(&new_value, column / (depth + 1), column);
-                let space = ' ';
-                let content = format!("\"{new_key}\": {new_val},\n{space:width$}", width = column);
-                (first_key_start..first_key_start, content)
-            } else {
-                let new_val = serde_json::to_string(&new_value).unwrap();
-                let mut content = format!(r#""{new_key}": {new_val},"#);
-                content.push(' ');
-                (first_key_start..first_key_start, content)
-            }
-        } else {
-            // We don't have the key, construct the nested objects
-            let new_value = construct_json_value(&key_path[depth..], new_value);
-            let indent_prefix_len = tab_size * depth;
-            let mut new_val = to_pretty_json(&new_value, tab_size, indent_prefix_len);
-            if depth == 0 {
-                new_val.push('\n');
-            }
-            // best effort to keep comments with best effort indentation
-            let mut replace_text = &text[existing_value_range.clone()];
-            while let Some(comment_start) = replace_text.rfind("//") {
-                if let Some(comment_end) = replace_text[comment_start..].find('\n') {
-                    let mut comment_with_indent_start = replace_text[..comment_start]
-                        .rfind('\n')
-                        .unwrap_or(comment_start);
-                    if !replace_text[comment_with_indent_start..comment_start]
-                        .trim()
-                        .is_empty()
-                    {
-                        comment_with_indent_start = comment_start;
-                    }
-                    new_val.insert_str(
-                        1,
-                        &replace_text[comment_with_indent_start..comment_start + comment_end],
-                    );
-                }
-                replace_text = &replace_text[..comment_start];
-            }
-
-            (existing_value_range, new_val)
-        }
-    }
-}
-
-fn construct_json_value(
-    key_path: &[impl AsRef<str>],
-    new_value: Option<&serde_json::Value>,
-) -> serde_json::Value {
-    let mut new_value =
-        serde_json::to_value(new_value.unwrap_or(&serde_json::Value::Null)).unwrap();
-    for key in key_path.iter().rev() {
-        if parse_index_key(key.as_ref()).is_some() {
-            new_value = serde_json::json!([new_value]);
-        } else {
-            new_value = serde_json::json!({ key.as_ref().to_string(): new_value });
-        }
-    }
-    return new_value;
-}
-
-fn parse_index_key(index_key: &str) -> Option<usize> {
-    index_key.strip_prefix('#')?.parse().ok()
-}
-
-fn handle_possible_array_value(
-    key_node: &tree_sitter::Node,
-    value_node: &tree_sitter::Node,
-    text: &str,
-    remaining_key_path: &[impl AsRef<str>],
-    new_value: Option<&Value>,
-    replace_key: Option<&str>,
-    tab_size: usize,
-) -> Option<(Range<usize>, String)> {
-    if remaining_key_path.is_empty() {
-        return None;
-    }
-    let key_path = remaining_key_path;
-    let index = parse_index_key(key_path[0].as_ref())?;
-
-    let value_is_array = value_node.kind() == TS_ARRAY_KIND;
-
-    let array_str = if value_is_array {
-        &text[value_node.byte_range()]
-    } else {
-        ""
-    };
-
-    let (mut replace_range, mut replace_value) = replace_top_level_array_value_in_json_text(
-        array_str,
-        &key_path[1..],
-        new_value,
-        replace_key,
-        index,
-        tab_size,
-    );
-
-    if value_is_array {
-        replace_range.start += value_node.start_byte();
-        replace_range.end += value_node.start_byte();
-    } else {
-        // replace the full value if it wasn't an array
-        replace_range = value_node.byte_range();
-    }
-    let non_whitespace_char_count = replace_value.len()
-        - replace_value
-            .chars()
-            .filter(char::is_ascii_whitespace)
-            .count();
-    let needs_indent = replace_value.ends_with('\n')
-        || (replace_value
-            .chars()
-            .zip(replace_value.chars().skip(1))
-            .any(|(c, next_c)| c == '\n' && !next_c.is_ascii_whitespace()));
-    let contains_comment = (replace_value.contains("//") && replace_value.contains('\n'))
-        || (replace_value.contains("/*") && replace_value.contains("*/"));
-    if needs_indent {
-        let indent_width = key_node.start_position().column;
-        let increased_indent = format!("\n{space:width$}", space = ' ', width = indent_width);
-        replace_value = replace_value.replace('\n', &increased_indent);
-    } else if non_whitespace_char_count < 32 && !contains_comment {
-        // remove indentation
-        while let Some(idx) = replace_value.find("\n ") {
-            replace_value.remove(idx);
-        }
-        while let Some(idx) = replace_value.find("  ") {
-            replace_value.remove(idx);
-        }
-    }
-    return Some((replace_range, replace_value));
-}
-
-const TS_DOCUMENT_KIND: &str = "document";
-const TS_ARRAY_KIND: &str = "array";
-const TS_COMMENT_KIND: &str = "comment";
-
-pub fn replace_top_level_array_value_in_json_text(
-    text: &str,
-    key_path: &[impl AsRef<str>],
-    new_value: Option<&Value>,
-    replace_key: Option<&str>,
-    array_index: usize,
-    tab_size: usize,
-) -> (Range<usize>, String) {
-    let mut parser = tree_sitter::Parser::new();
-    parser
-        .set_language(&tree_sitter_json::LANGUAGE.into())
-        .unwrap();
-
-    let syntax_tree = parser.parse(text, None).unwrap();
-
-    let mut cursor = syntax_tree.walk();
-
-    if cursor.node().kind() == TS_DOCUMENT_KIND {
-        cursor.goto_first_child();
-    }
-
-    while cursor.node().kind() != TS_ARRAY_KIND {
-        if !cursor.goto_next_sibling() {
-            let json_value = construct_json_value(key_path, new_value);
-            let json_value = serde_json::json!([json_value]);
-            return (0..text.len(), to_pretty_json(&json_value, tab_size, 0));
-        }
-    }
-
-    // false if no children
-    //
-    cursor.goto_first_child();
-    debug_assert_eq!(cursor.node().kind(), "[");
-
-    let mut index = 0;
-
-    while index <= array_index {
-        let node = cursor.node();
-        if !matches!(node.kind(), "[" | "]" | TS_COMMENT_KIND | ",")
-            && !node.is_extra()
-            && !node.is_missing()
-        {
-            if index == array_index {
-                break;
-            }
-            index += 1;
-        }
-        if !cursor.goto_next_sibling() {
-            if let Some(new_value) = new_value {
-                return append_top_level_array_value_in_json_text(text, new_value, tab_size);
-            } else {
-                return (0..0, String::new());
-            }
-        }
-    }
-
-    let range = cursor.node().range();
-    let indent_width = range.start_point.column;
-    let offset = range.start_byte;
-    let text_range = range.start_byte..range.end_byte;
-    let value_str = &text[text_range.clone()];
-    let needs_indent = range.start_point.row > 0;
-
-    if new_value.is_none() && key_path.is_empty() {
-        let mut remove_range = text_range;
-        if index == 0 {
-            while cursor.goto_next_sibling()
-                && (cursor.node().is_extra() || cursor.node().is_missing())
-            {}
-            if cursor.node().kind() == "," {
-                remove_range.end = cursor.node().range().end_byte;
-            }
-            if let Some(next_newline) = &text[remove_range.end + 1..].find('\n')
-                && text[remove_range.end + 1..remove_range.end + next_newline]
-                    .chars()
-                    .all(|c| c.is_ascii_whitespace())
-            {
-                remove_range.end = remove_range.end + next_newline;
-            }
-        } else {
-            while cursor.goto_previous_sibling()
-                && (cursor.node().is_extra() || cursor.node().is_missing())
-            {}
-            if cursor.node().kind() == "," {
-                remove_range.start = cursor.node().range().start_byte;
-            }
-        }
-        (remove_range, String::new())
-    } else {
-        if let Some(array_replacement) = handle_possible_array_value(
-            &cursor.node(),
-            &cursor.node(),
-            text,
-            key_path,
-            new_value,
-            replace_key,
-            tab_size,
-        ) {
-            return array_replacement;
-        }
-        let (mut replace_range, mut replace_value) =
-            replace_value_in_json_text(value_str, key_path, tab_size, new_value, replace_key);
-
-        replace_range.start += offset;
-        replace_range.end += offset;
-
-        if needs_indent {
-            let increased_indent = format!("\n{space:width$}", space = ' ', width = indent_width);
-            replace_value = replace_value.replace('\n', &increased_indent);
-        } else {
-            while let Some(idx) = replace_value.find("\n ") {
-                replace_value.remove(idx + 1);
-            }
-            while let Some(idx) = replace_value.find("\n") {
-                replace_value.replace_range(idx..idx + 1, " ");
-            }
-        }
-
-        (replace_range, replace_value)
-    }
-}
-
-pub fn append_top_level_array_value_in_json_text(
-    text: &str,
-    new_value: &Value,
-    tab_size: usize,
-) -> (Range<usize>, String) {
-    let mut parser = tree_sitter::Parser::new();
-    parser
-        .set_language(&tree_sitter_json::LANGUAGE.into())
-        .unwrap();
-    let syntax_tree = parser.parse(text, None).unwrap();
-
-    let mut cursor = syntax_tree.walk();
-
-    if cursor.node().kind() == TS_DOCUMENT_KIND {
-        cursor.goto_first_child();
-    }
-
-    while cursor.node().kind() != TS_ARRAY_KIND {
-        if !cursor.goto_next_sibling() {
-            let json_value = serde_json::json!([new_value]);
-            return (0..text.len(), to_pretty_json(&json_value, tab_size, 0));
-        }
-    }
-
-    let went_to_last_child = cursor.goto_last_child();
-    debug_assert!(
-        went_to_last_child && cursor.node().kind() == "]",
-        "Malformed JSON syntax tree, expected `]` at end of array"
-    );
-    let close_bracket_start = cursor.node().start_byte();
-    while cursor.goto_previous_sibling()
-        && (cursor.node().is_extra() || cursor.node().is_missing())
-        && !cursor.node().is_error()
-    {}
-
-    let mut comma_range = None;
-    let mut prev_item_range = None;
-
-    if cursor.node().kind() == "," || is_error_of_kind(&mut cursor, ",") {
-        comma_range = Some(cursor.node().byte_range());
-        while cursor.goto_previous_sibling()
-            && (cursor.node().is_extra() || cursor.node().is_missing())
-        {}
-
-        debug_assert_ne!(cursor.node().kind(), "[");
-        prev_item_range = Some(cursor.node().range());
-    } else {
-        while (cursor.node().is_extra() || cursor.node().is_missing())
-            && cursor.goto_previous_sibling()
-        {}
-        if cursor.node().kind() != "[" {
-            prev_item_range = Some(cursor.node().range());
-        }
-    }
-
-    let (mut replace_range, mut replace_value) =
-        replace_value_in_json_text::<&str>("", &[], tab_size, Some(new_value), None);
-
-    replace_range.start = close_bracket_start;
-    replace_range.end = close_bracket_start;
-
-    let space = ' ';
-    if let Some(prev_item_range) = prev_item_range {
-        let needs_newline = prev_item_range.start_point.row > 0;
-        let indent_width = text[..prev_item_range.start_byte].rfind('\n').map_or(
-            prev_item_range.start_point.column,
-            |idx| {
-                prev_item_range.start_point.column
-                    - text[idx + 1..prev_item_range.start_byte].trim_start().len()
-            },
-        );
-
-        let prev_item_end = comma_range
-            .as_ref()
-            .map_or(prev_item_range.end_byte, |range| range.end);
-        if text[prev_item_end..replace_range.start].trim().is_empty() {
-            replace_range.start = prev_item_end;
-        }
-
-        if needs_newline {
-            let increased_indent = format!("\n{space:width$}", width = indent_width);
-            replace_value = replace_value.replace('\n', &increased_indent);
-            replace_value.push('\n');
-            replace_value.insert_str(0, &format!("\n{space:width$}", width = indent_width));
-        } else {
-            while let Some(idx) = replace_value.find("\n ") {
-                replace_value.remove(idx + 1);
-            }
-            while let Some(idx) = replace_value.find('\n') {
-                replace_value.replace_range(idx..idx + 1, " ");
-            }
-            replace_value.insert(0, ' ');
-        }
-
-        if comma_range.is_none() {
-            replace_value.insert(0, ',');
-        }
-    } else if replace_value.contains('\n') || text.contains('\n') {
-        if let Some(prev_newline) = text[..replace_range.start].rfind('\n')
-            && text[prev_newline..replace_range.start].trim().is_empty()
-        {
-            replace_range.start = prev_newline;
-        }
-        let indent = format!("\n{space:width$}", width = tab_size);
-        replace_value = replace_value.replace('\n', &indent);
-        replace_value.insert_str(0, &indent);
-        replace_value.push('\n');
-    }
-    return (replace_range, replace_value);
-
-    fn is_error_of_kind(cursor: &mut tree_sitter::TreeCursor<'_>, kind: &str) -> bool {
-        if cursor.node().kind() != "ERROR" {
-            return false;
-        }
-
-        let descendant_index = cursor.descendant_index();
-        let res = cursor.goto_first_child() && cursor.node().kind() == kind;
-        cursor.goto_descendant(descendant_index);
-        res
-    }
-}
-
-/// Infers the indentation size used in JSON text by analyzing the tree structure.
-/// Returns the detected indent size, or a default of 2 if no indentation is found.
-pub fn infer_json_indent_size(text: &str) -> usize {
-    const MAX_INDENT_SIZE: usize = 64;
-
-    let mut parser = tree_sitter::Parser::new();
-    parser
-        .set_language(&tree_sitter_json::LANGUAGE.into())
-        .unwrap();
-
-    let Some(syntax_tree) = parser.parse(text, None) else {
-        return 4;
-    };
-
-    let mut cursor = syntax_tree.walk();
-    let mut indent_counts = [0u32; MAX_INDENT_SIZE];
-
-    // Traverse the tree to find indentation patterns
-    fn visit_node(
-        cursor: &mut tree_sitter::TreeCursor,
-        indent_counts: &mut [u32; MAX_INDENT_SIZE],
-        depth: usize,
-    ) {
-        if depth >= 3 {
-            return;
-        }
-        let node = cursor.node();
-        let node_kind = node.kind();
-
-        // For objects and arrays, check the indentation of their first content child
-        if matches!(node_kind, "object" | "array") {
-            let container_column = node.start_position().column;
-            let container_row = node.start_position().row;
-
-            if cursor.goto_first_child() {
-                // Skip the opening bracket
-                loop {
-                    let child = cursor.node();
-                    let child_kind = child.kind();
-
-                    // Look for the first actual content (pair for objects, value for arrays)
-                    if (node_kind == "object" && child_kind == "pair")
-                        || (node_kind == "array"
-                            && !matches!(child_kind, "[" | "]" | "," | "comment"))
-                    {
-                        let child_column = child.start_position().column;
-                        let child_row = child.start_position().row;
-
-                        // Only count if the child is on a different line
-                        if child_row > container_row && child_column > container_column {
-                            let indent = child_column - container_column;
-                            if indent > 0 && indent < MAX_INDENT_SIZE {
-                                indent_counts[indent] += 1;
-                            }
-                        }
-                        break;
-                    }
-
-                    if !cursor.goto_next_sibling() {
-                        break;
-                    }
-                }
-                cursor.goto_parent();
-            }
-        }
-
-        // Recurse to children
-        if cursor.goto_first_child() {
-            loop {
-                visit_node(cursor, indent_counts, depth + 1);
-                if !cursor.goto_next_sibling() {
-                    break;
-                }
-            }
-            cursor.goto_parent();
-        }
-    }
-
-    visit_node(&mut cursor, &mut indent_counts, 0);
-
-    // Find the indent size with the highest count
-    let mut max_count = 0;
-    let mut max_indent = 4;
-
-    for (indent, &count) in indent_counts.iter().enumerate() {
-        if count > max_count {
-            max_count = count;
-            max_indent = indent;
-        }
-    }
-
-    if max_count == 0 { 2 } else { max_indent }
-}
-
-pub fn to_pretty_json(
-    value: &impl Serialize,
-    indent_size: usize,
-    indent_prefix_len: usize,
-) -> String {
-    let mut output = Vec::new();
-    let indent = " ".repeat(indent_size);
-    let mut ser = serde_json::Serializer::with_formatter(
-        &mut output,
-        serde_json::ser::PrettyFormatter::with_indent(indent.as_bytes()),
-    );
-
-    value.serialize(&mut ser).unwrap();
-    let text = String::from_utf8(output).unwrap();
-
-    let mut adjusted_text = String::new();
-    for (i, line) in text.split('\n').enumerate() {
-        if i > 0 {
-            adjusted_text.extend(std::iter::repeat(' ').take(indent_prefix_len));
-        }
-        adjusted_text.push_str(line);
-        adjusted_text.push('\n');
-    }
-    adjusted_text.pop();
-    adjusted_text
-}
-
-pub fn parse_json_with_comments<T: DeserializeOwned>(content: &str) -> Result<T> {
-    let mut deserializer = serde_json_lenient::Deserializer::from_str(content);
-    Ok(serde_path_to_error::deserialize(&mut deserializer)?)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use serde_json::{Value, json};
-    use unindent::Unindent;
-
-    #[test]
-    fn object_replace() {
-        #[track_caller]
-        fn check_object_replace(
-            input: String,
-            key_path: &[&str],
-            value: Option<Value>,
-            expected: String,
-        ) {
-            let result = replace_value_in_json_text(&input, key_path, 4, value.as_ref(), None);
-            let mut result_str = input;
-            result_str.replace_range(result.0, &result.1);
-            pretty_assertions::assert_eq!(expected, result_str);
-        }
-        check_object_replace(
-            r#"{
-                "a": 1,
-                "b": 2
-            }"#
-            .unindent(),
-            &["b"],
-            Some(json!(3)),
-            r#"{
-                "a": 1,
-                "b": 3
-            }"#
-            .unindent(),
-        );
-        check_object_replace(
-            r#"{
-                "a": 1,
-                "b": 2
-            }"#
-            .unindent(),
-            &["b"],
-            None,
-            r#"{
-                "a": 1
-            }"#
-            .unindent(),
-        );
-        check_object_replace(
-            r#"{
-                "a": 1,
-                "b": 2
-            }"#
-            .unindent(),
-            &["c"],
-            Some(json!(3)),
-            r#"{
-                "c": 3,
-                "a": 1,
-                "b": 2
-            }"#
-            .unindent(),
-        );
-        check_object_replace(
-            r#"{
-                "a": 1,
-                "b": {
-                    "c": 2,
-                    "d": 3,
-                }
-            }"#
-            .unindent(),
-            &["b", "c"],
-            Some(json!([1, 2, 3])),
-            r#"{
-                "a": 1,
-                "b": {
-                    "c": [
-                        1,
-                        2,
-                        3
-                    ],
-                    "d": 3,
-                }
-            }"#
-            .unindent(),
-        );
-
-        check_object_replace(
-            r#"{
-                "name": "old_name",
-                "id": 123
-            }"#
-            .unindent(),
-            &["name"],
-            Some(json!("new_name")),
-            r#"{
-                "name": "new_name",
-                "id": 123
-            }"#
-            .unindent(),
-        );
-
-        check_object_replace(
-            r#"{
-                "enabled": false,
-                "count": 5
-            }"#
-            .unindent(),
-            &["enabled"],
-            Some(json!(true)),
-            r#"{
-                "enabled": true,
-                "count": 5
-            }"#
-            .unindent(),
-        );
-
-        check_object_replace(
-            r#"{
-                "value": null,
-                "other": "test"
-            }"#
-            .unindent(),
-            &["value"],
-            Some(json!(42)),
-            r#"{
-                "value": 42,
-                "other": "test"
-            }"#
-            .unindent(),
-        );
-
-        check_object_replace(
-            r#"{
-                "config": {
-                    "old": true
-                },
-                "name": "test"
-            }"#
-            .unindent(),
-            &["config"],
-            Some(json!({"new": false, "count": 3})),
-            r#"{
-                "config": {
-                    "new": false,
-                    "count": 3
-                },
-                "name": "test"
-            }"#
-            .unindent(),
-        );
-
-        check_object_replace(
-            r#"{
-                // This is a comment
-                "a": 1,
-                "b": 2 // Another comment
-            }"#
-            .unindent(),
-            &["b"],
-            Some(json!({"foo": "bar"})),
-            r#"{
-                // This is a comment
-                "a": 1,
-                "b": {
-                    "foo": "bar"
-                } // Another comment
-            }"#
-            .unindent(),
-        );
-
-        check_object_replace(
-            r#"{}"#.to_string(),
-            &["new_key"],
-            Some(json!("value")),
-            r#"{
-                "new_key": "value"
-            }
-            "#
-            .unindent(),
-        );
-
-        check_object_replace(
-            r#"{
-                "only_key": 123
-            }"#
-            .unindent(),
-            &["only_key"],
-            None,
-            "{\n    \n}".to_string(),
-        );
-
-        check_object_replace(
-            r#"{
-                "level1": {
-                    "level2": {
-                        "level3": {
-                            "target": "old"
-                        }
-                    }
-                }
-            }"#
-            .unindent(),
-            &["level1", "level2", "level3", "target"],
-            Some(json!("new")),
-            r#"{
-                "level1": {
-                    "level2": {
-                        "level3": {
-                            "target": "new"
-                        }
-                    }
-                }
-            }"#
-            .unindent(),
-        );
-
-        check_object_replace(
-            r#"{
-                "parent": {}
-            }"#
-            .unindent(),
-            &["parent", "child"],
-            Some(json!("value")),
-            r#"{
-                "parent": {
-                    "child": "value"
-                }
-            }"#
-            .unindent(),
-        );
-
-        check_object_replace(
-            r#"{
-                "a": 1,
-                "b": 2,
-            }"#
-            .unindent(),
-            &["b"],
-            Some(json!(3)),
-            r#"{
-                "a": 1,
-                "b": 3,
-            }"#
-            .unindent(),
-        );
-
-        check_object_replace(
-            r#"{
-                "items": [1, 2, 3],
-                "count": 3
-            }"#
-            .unindent(),
-            &["items", "1"],
-            Some(json!(5)),
-            r#"{
-                "items": {
-                    "1": 5
-                },
-                "count": 3
-            }"#
-            .unindent(),
-        );
-
-        check_object_replace(
-            r#"{
-                "items": [1, 2, 3],
-                "count": 3
-            }"#
-            .unindent(),
-            &["items", "1"],
-            None,
-            r#"{
-                "items": {
-                    "1": null
-                },
-                "count": 3
-            }"#
-            .unindent(),
-        );
-
-        check_object_replace(
-            r#"{
-                "items": [1, 2, 3],
-                "count": 3
-            }"#
-            .unindent(),
-            &["items"],
-            Some(json!(["a", "b", "c", "d"])),
-            r#"{
-                "items": [
-                    "a",
-                    "b",
-                    "c",
-                    "d"
-                ],
-                "count": 3
-            }"#
-            .unindent(),
-        );
-
-        check_object_replace(
-            r#"{
-                "0": "zero",
-                "1": "one"
-            }"#
-            .unindent(),
-            &["1"],
-            Some(json!("ONE")),
-            r#"{
-                "0": "zero",
-                "1": "ONE"
-            }"#
-            .unindent(),
-        );
-        // Test with comments between object members
-        check_object_replace(
-            r#"{
-                "a": 1,
-                // Comment between members
-                "b": 2,
-                /* Block comment */
-                "c": 3
-            }"#
-            .unindent(),
-            &["b"],
-            Some(json!({"nested": true})),
-            r#"{
-                "a": 1,
-                // Comment between members
-                "b": {
-                    "nested": true
-                },
-                /* Block comment */
-                "c": 3
-            }"#
-            .unindent(),
-        );
-
-        // Test with trailing comments on replaced value
-        check_object_replace(
-            r#"{
-                "a": 1, // keep this comment
-                "b": 2  // this should stay
-            }"#
-            .unindent(),
-            &["a"],
-            Some(json!("changed")),
-            r#"{
-                "a": "changed", // keep this comment
-                "b": 2  // this should stay
-            }"#
-            .unindent(),
-        );
-
-        // Test with deep indentation
-        check_object_replace(
-            r#"{
-                        "deeply": {
-                                "nested": {
-                                        "value": "old"
-                                }
-                        }
-                }"#
-            .unindent(),
-            &["deeply", "nested", "value"],
-            Some(json!("new")),
-            r#"{
-                        "deeply": {
-                                "nested": {
-                                        "value": "new"
-                                }
-                        }
-                }"#
-            .unindent(),
-        );
-
-        // Test removing value with comment preservation
-        check_object_replace(
-            r#"{
-                // Header comment
-                "a": 1,
-                // This comment belongs to b
-                "b": 2,
-                // This comment belongs to c
-                "c": 3
-            }"#
-            .unindent(),
-            &["b"],
-            None,
-            r#"{
-                // Header comment
-                "a": 1,
-                // This comment belongs to b
-                // This comment belongs to c
-                "c": 3
-            }"#
-            .unindent(),
-        );
-
-        // Test with multiline block comments
-        check_object_replace(
-            r#"{
-                /*
-                 * This is a multiline
-                 * block comment
-                 */
-                "value": "old",
-                /* Another block */ "other": 123
-            }"#
-            .unindent(),
-            &["value"],
-            Some(json!("new")),
-            r#"{
-                /*
-                 * This is a multiline
-                 * block comment
-                 */
-                "value": "new",
-                /* Another block */ "other": 123
-            }"#
-            .unindent(),
-        );
-
-        check_object_replace(
-            r#"{
-                // This object is empty
-            }"#
-            .unindent(),
-            &["key"],
-            Some(json!("value")),
-            r#"{
-                // This object is empty
-                "key": "value"
-            }
-            "#
-            .unindent(),
-        );
-
-        // Test replacing in object with only comments
-        check_object_replace(
-            r#"{
-                // Comment 1
-                // Comment 2
-            }"#
-            .unindent(),
-            &["new"],
-            Some(json!(42)),
-            r#"{
-                // Comment 1
-                // Comment 2
-                "new": 42
-            }
-            "#
-            .unindent(),
-        );
-
-        // Test with inconsistent spacing
-        check_object_replace(
-            r#"{
-              "a":1,
-                    "b"  :  2  ,
-                "c":   3
-            }"#
-            .unindent(),
-            &["b"],
-            Some(json!("spaced")),
-            r#"{
-              "a":1,
-                    "b"  :  "spaced"  ,
-                "c":   3
-            }"#
-            .unindent(),
-        );
-    }
-
-    #[test]
-    fn object_replace_array() {
-        // Tests replacing values within arrays that are nested inside objects.
-        // Uses "#N" syntax in key paths to indicate array indices.
-        #[track_caller]
-        fn check_object_replace_array(
-            input: String,
-            key_path: &[&str],
-            value: Option<Value>,
-            expected: String,
-        ) {
-            let result = replace_value_in_json_text(&input, key_path, 4, value.as_ref(), None);
-            let mut result_str = input;
-            result_str.replace_range(result.0, &result.1);
-            pretty_assertions::assert_eq!(expected, result_str);
-        }
-
-        // Basic array element replacement
-        check_object_replace_array(
-            r#"{
-                "a": [1, 3],
-            }"#
-            .unindent(),
-            &["a", "#1"],
-            Some(json!(2)),
-            r#"{
-                "a": [1, 2],
-            }"#
-            .unindent(),
-        );
-
-        // Replace first element
-        check_object_replace_array(
-            r#"{
-                "items": [1, 2, 3]
-            }"#
-            .unindent(),
-            &["items", "#0"],
-            Some(json!(10)),
-            r#"{
-                "items": [10, 2, 3]
-            }"#
-            .unindent(),
-        );
-
-        // Replace last element
-        check_object_replace_array(
-            r#"{
-                "items": [1, 2, 3]
-            }"#
-            .unindent(),
-            &["items", "#2"],
-            Some(json!(30)),
-            r#"{
-                "items": [1, 2, 30]
-            }"#
-            .unindent(),
-        );
-
-        // Replace string in array
-        check_object_replace_array(
-            r#"{
-                "names": ["alice", "bob", "charlie"]
-            }"#
-            .unindent(),
-            &["names", "#1"],
-            Some(json!("robert")),
-            r#"{
-                "names": ["alice", "robert", "charlie"]
-            }"#
-            .unindent(),
-        );
-
-        // Replace boolean
-        check_object_replace_array(
-            r#"{
-                "flags": [true, false, true]
-            }"#
-            .unindent(),
-            &["flags", "#0"],
-            Some(json!(false)),
-            r#"{
-                "flags": [false, false, true]
-            }"#
-            .unindent(),
-        );
-
-        // Replace null with value
-        check_object_replace_array(
-            r#"{
-                "values": [null, 2, null]
-            }"#
-            .unindent(),
-            &["values", "#0"],
-            Some(json!(1)),
-            r#"{
-                "values": [1, 2, null]
-            }"#
-            .unindent(),
-        );
-
-        // Replace value with null
-        check_object_replace_array(
-            r#"{
-                "data": [1, 2, 3]
-            }"#
-            .unindent(),
-            &["data", "#1"],
-            Some(json!(null)),
-            r#"{
-                "data": [1, null, 3]
-            }"#
-            .unindent(),
-        );
-
-        // Replace simple value with object
-        check_object_replace_array(
-            r#"{
-                "list": [1, 2, 3]
-            }"#
-            .unindent(),
-            &["list", "#1"],
-            Some(json!({"value": 2, "label": "two"})),
-            r#"{
-                "list": [1, { "value": 2, "label": "two" }, 3]
-            }"#
-            .unindent(),
-        );
-
-        // Replace simple value with nested array
-        check_object_replace_array(
-            r#"{
-                "matrix": [1, 2, 3]
-            }"#
-            .unindent(),
-            &["matrix", "#1"],
-            Some(json!([20, 21, 22])),
-            r#"{
-                "matrix": [1, [ 20, 21, 22 ], 3]
-            }"#
-            .unindent(),
-        );
-
-        // Replace object in array
-        check_object_replace_array(
-            r#"{
-                "users": [
-                    {"name": "alice"},
-                    {"name": "bob"},
-                    {"name": "charlie"}
-                ]
-            }"#
-            .unindent(),
-            &["users", "#1"],
-            Some(json!({"name": "robert", "age": 30})),
-            r#"{
-                "users": [
-                    {"name": "alice"},
-                    { "name": "robert", "age": 30 },
-                    {"name": "charlie"}
-                ]
-            }"#
-            .unindent(),
-        );
-
-        // Replace property within object in array
-        check_object_replace_array(
-            r#"{
-                "users": [
-                    {"name": "alice", "age": 25},
-                    {"name": "bob", "age": 30},
-                    {"name": "charlie", "age": 35}
-                ]
-            }"#
-            .unindent(),
-            &["users", "#1", "age"],
-            Some(json!(31)),
-            r#"{
-                "users": [
-                    {"name": "alice", "age": 25},
-                    {"name": "bob", "age": 31},
-                    {"name": "charlie", "age": 35}
-                ]
-            }"#
-            .unindent(),
-        );
-
-        // Add new property to object in array
-        check_object_replace_array(
-            r#"{
-                "items": [
-                    {"id": 1},
-                    {"id": 2},
-                    {"id": 3}
-                ]
-            }"#
-            .unindent(),
-            &["items", "#1", "name"],
-            Some(json!("Item Two")),
-            r#"{
-                "items": [
-                    {"id": 1},
-                    {"name": "Item Two", "id": 2},
-                    {"id": 3}
-                ]
-            }"#
-            .unindent(),
-        );
-
-        // Remove property from object in array
-        check_object_replace_array(
-            r#"{
-                "items": [
-                    {"id": 1, "name": "one"},
-                    {"id": 2, "name": "two"},
-                    {"id": 3, "name": "three"}
-                ]
-            }"#
-            .unindent(),
-            &["items", "#1", "name"],
-            None,
-            r#"{
-                "items": [
-                    {"id": 1, "name": "one"},
-                    {"id": 2},
-                    {"id": 3, "name": "three"}
-                ]
-            }"#
-            .unindent(),
-        );
-
-        // Deeply nested: array in object in array
-        check_object_replace_array(
-            r#"{
-                "data": [
-                    {
-                        "values": [1, 2, 3]
-                    },
-                    {
-                        "values": [4, 5, 6]
-                    }
-                ]
-            }"#
-            .unindent(),
-            &["data", "#0", "values", "#1"],
-            Some(json!(20)),
-            r#"{
-                "data": [
-                    {
-                        "values": [1, 20, 3]
-                    },
-                    {
-                        "values": [4, 5, 6]
-                    }
-                ]
-            }"#
-            .unindent(),
-        );
-
-        // Multiple levels of nesting
-        check_object_replace_array(
-            r#"{
-                "root": {
-                    "level1": [
-                        {
-                            "level2": {
-                                "level3": [10, 20, 30]
-                            }
-                        }
-                    ]
-                }
-            }"#
-            .unindent(),
-            &["root", "level1", "#0", "level2", "level3", "#2"],
-            Some(json!(300)),
-            r#"{
-                "root": {
-                    "level1": [
-                        {
-                            "level2": {
-                                "level3": [10, 20, 300]
-                            }
-                        }
-                    ]
-                }
-            }"#
-            .unindent(),
-        );
-
-        // Array with mixed types
-        check_object_replace_array(
-            r#"{
-                "mixed": [1, "two", true, null, {"five": 5}]
-            }"#
-            .unindent(),
-            &["mixed", "#3"],
-            Some(json!({"four": 4})),
-            r#"{
-                "mixed": [1, "two", true, { "four": 4 }, {"five": 5}]
-            }"#
-            .unindent(),
-        );
-
-        // Replace with complex object
-        check_object_replace_array(
-            r#"{
-                "config": [
-                    "simple",
-                    "values"
-                ]
-            }"#
-            .unindent(),
-            &["config", "#0"],
-            Some(json!({
-                "type": "complex",
-                "settings": {
-                    "enabled": true,
-                    "level": 5
-                }
-            })),
-            r#"{
-                "config": [
-                    {
-                        "type": "complex",
-                        "settings": {
-                            "enabled": true,
-                            "level": 5
-                        }
-                    },
-                    "values"
-                ]
-            }"#
-            .unindent(),
-        );
-
-        // Array with trailing comma
-        check_object_replace_array(
-            r#"{
-                "items": [
-                    1,
-                    2,
-                    3,
-                ]
-            }"#
-            .unindent(),
-            &["items", "#1"],
-            Some(json!(20)),
-            r#"{
-                "items": [
-                    1,
-                    20,
-                    3,
-                ]
-            }"#
-            .unindent(),
-        );
-
-        // Array with comments
-        check_object_replace_array(
-            r#"{
-                "items": [
-                    1, // first item
-                    2, // second item
-                    3  // third item
-                ]
-            }"#
-            .unindent(),
-            &["items", "#1"],
-            Some(json!(20)),
-            r#"{
-                "items": [
-                    1, // first item
-                    20, // second item
-                    3  // third item
-                ]
-            }"#
-            .unindent(),
-        );
-
-        // Multiple arrays in object
-        check_object_replace_array(
-            r#"{
-                "first": [1, 2, 3],
-                "second": [4, 5, 6],
-                "third": [7, 8, 9]
-            }"#
-            .unindent(),
-            &["second", "#1"],
-            Some(json!(50)),
-            r#"{
-                "first": [1, 2, 3],
-                "second": [4, 50, 6],
-                "third": [7, 8, 9]
-            }"#
-            .unindent(),
-        );
-
-        // Empty array - add first element
-        check_object_replace_array(
-            r#"{
-                "empty": []
-            }"#
-            .unindent(),
-            &["empty", "#0"],
-            Some(json!("first")),
-            r#"{
-                "empty": ["first"]
-            }"#
-            .unindent(),
-        );
-
-        // Array of arrays
-        check_object_replace_array(
-            r#"{
-                "matrix": [
-                    [1, 2],
-                    [3, 4],
-                    [5, 6]
-                ]
-            }"#
-            .unindent(),
-            &["matrix", "#1", "#0"],
-            Some(json!(30)),
-            r#"{
-                "matrix": [
-                    [1, 2],
-                    [30, 4],
-                    [5, 6]
-                ]
-            }"#
-            .unindent(),
-        );
-
-        // Replace nested object property in array element
-        check_object_replace_array(
-            r#"{
-                "users": [
-                    {
-                        "name": "alice",
-                        "address": {
-                            "city": "NYC",
-                            "zip": "10001"
-                        }
-                    }
-                ]
-            }"#
-            .unindent(),
-            &["users", "#0", "address", "city"],
-            Some(json!("Boston")),
-            r#"{
-                "users": [
-                    {
-                        "name": "alice",
-                        "address": {
-                            "city": "Boston",
-                            "zip": "10001"
-                        }
-                    }
-                ]
-            }"#
-            .unindent(),
-        );
-
-        // Add element past end of array
-        check_object_replace_array(
-            r#"{
-                "items": [1, 2]
-            }"#
-            .unindent(),
-            &["items", "#5"],
-            Some(json!(6)),
-            r#"{
-                "items": [1, 2, 6]
-            }"#
-            .unindent(),
-        );
-
-        // Complex nested structure
-        check_object_replace_array(
-            r#"{
-                "app": {
-                    "modules": [
-                        {
-                            "name": "auth",
-                            "routes": [
-                                {"path": "/login", "method": "POST"},
-                                {"path": "/logout", "method": "POST"}
-                            ]
-                        },
-                        {
-                            "name": "api",
-                            "routes": [
-                                {"path": "/users", "method": "GET"},
-                                {"path": "/users", "method": "POST"}
-                            ]
-                        }
-                    ]
-                }
-            }"#
-            .unindent(),
-            &["app", "modules", "#1", "routes", "#0", "method"],
-            Some(json!("PUT")),
-            r#"{
-                "app": {
-                    "modules": [
-                        {
-                            "name": "auth",
-                            "routes": [
-                                {"path": "/login", "method": "POST"},
-                                {"path": "/logout", "method": "POST"}
-                            ]
-                        },
-                        {
-                            "name": "api",
-                            "routes": [
-                                {"path": "/users", "method": "PUT"},
-                                {"path": "/users", "method": "POST"}
-                            ]
-                        }
-                    ]
-                }
-            }"#
-            .unindent(),
-        );
-
-        // Escaped strings in array
-        check_object_replace_array(
-            r#"{
-                "messages": ["hello", "world"]
-            }"#
-            .unindent(),
-            &["messages", "#0"],
-            Some(json!("hello \"quoted\" world")),
-            r#"{
-                "messages": ["hello \"quoted\" world", "world"]
-            }"#
-            .unindent(),
-        );
-
-        // Block comments
-        check_object_replace_array(
-            r#"{
-                "data": [
-                    /* first */ 1,
-                    /* second */ 2,
-                    /* third */ 3
-                ]
-            }"#
-            .unindent(),
-            &["data", "#1"],
-            Some(json!(20)),
-            r#"{
-                "data": [
-                    /* first */ 1,
-                    /* second */ 20,
-                    /* third */ 3
-                ]
-            }"#
-            .unindent(),
-        );
-
-        // Inline array
-        check_object_replace_array(
-            r#"{"items": [1, 2, 3], "count": 3}"#.to_string(),
-            &["items", "#1"],
-            Some(json!(20)),
-            r#"{"items": [1, 20, 3], "count": 3}"#.to_string(),
-        );
-
-        // Single element array
-        check_object_replace_array(
-            r#"{
-                "single": [42]
-            }"#
-            .unindent(),
-            &["single", "#0"],
-            Some(json!(100)),
-            r#"{
-                "single": [100]
-            }"#
-            .unindent(),
-        );
-
-        // Inconsistent formatting
-        check_object_replace_array(
-            r#"{
-                "messy": [1,
-                    2,
-                        3,
-                4]
-            }"#
-            .unindent(),
-            &["messy", "#2"],
-            Some(json!(30)),
-            r#"{
-                "messy": [1,
-                    2,
-                        30,
-                4]
-            }"#
-            .unindent(),
-        );
-
-        // Creates array if has numbered key
-        check_object_replace_array(
-            r#"{
-                "array": {"foo": "bar"}
-            }"#
-            .unindent(),
-            &["array", "#3"],
-            Some(json!(4)),
-            r#"{
-                "array": [
-                    4
-                ]
-            }"#
-            .unindent(),
-        );
-
-        // Replace non-array element within array with array
-        check_object_replace_array(
-            r#"{
-                "matrix": [
-                    [1, 2],
-                    [3, 4],
-                    [5, 6]
-                ]
-            }"#
-            .unindent(),
-            &["matrix", "#1", "#0"],
-            Some(json!(["foo", "bar"])),
-            r#"{
-                "matrix": [
-                    [1, 2],
-                    [[ "foo", "bar" ], 4],
-                    [5, 6]
-                ]
-            }"#
-            .unindent(),
-        );
-        // Replace non-array element within array with array
-        check_object_replace_array(
-            r#"{
-                "matrix": [
-                    [1, 2],
-                    [3, 4],
-                    [5, 6]
-                ]
-            }"#
-            .unindent(),
-            &["matrix", "#1", "#0", "#3"],
-            Some(json!(["foo", "bar"])),
-            r#"{
-                "matrix": [
-                    [1, 2],
-                    [[ [ "foo", "bar" ] ], 4],
-                    [5, 6]
-                ]
-            }"#
-            .unindent(),
-        );
-
-        // Create array in key that doesn't exist
-        check_object_replace_array(
-            r#"{
-                "foo": {}
-            }"#
-            .unindent(),
-            &["foo", "bar", "#0"],
-            Some(json!({"is_object": true})),
-            r#"{
-                "foo": {
-                    "bar": [
-                        {
-                            "is_object": true
-                        }
-                    ]
-                }
-            }"#
-            .unindent(),
-        );
-    }
-
-    #[test]
-    fn array_replace() {
-        #[track_caller]
-        fn check_array_replace(
-            input: impl ToString,
-            index: usize,
-            key_path: &[&str],
-            value: Option<Value>,
-            expected: impl ToString,
-        ) {
-            let input = input.to_string();
-            let result = replace_top_level_array_value_in_json_text(
-                &input,
-                key_path,
-                value.as_ref(),
-                None,
-                index,
-                4,
-            );
-            let mut result_str = input;
-            result_str.replace_range(result.0, &result.1);
-            pretty_assertions::assert_eq!(expected.to_string(), result_str);
-        }
-
-        check_array_replace(r#"[1, 3, 3]"#, 1, &[], Some(json!(2)), r#"[1, 2, 3]"#);
-        check_array_replace(r#"[1, 3, 3]"#, 2, &[], Some(json!(2)), r#"[1, 3, 2]"#);
-        check_array_replace(r#"[1, 3, 3,]"#, 3, &[], Some(json!(2)), r#"[1, 3, 3, 2]"#);
-        check_array_replace(r#"[1, 3, 3,]"#, 100, &[], Some(json!(2)), r#"[1, 3, 3, 2]"#);
-        check_array_replace(
-            r#"[
-                1,
-                2,
-                3,
-            ]"#
-            .unindent(),
-            1,
-            &[],
-            Some(json!({"foo": "bar", "baz": "qux"})),
-            r#"[
-                1,
-                {
-                    "foo": "bar",
-                    "baz": "qux"
-                },
-                3,
-            ]"#
-            .unindent(),
-        );
-        check_array_replace(
-            r#"[1, 3, 3,]"#,
-            1,
-            &[],
-            Some(json!({"foo": "bar", "baz": "qux"})),
-            r#"[1, { "foo": "bar", "baz": "qux" }, 3,]"#,
-        );
-
-        check_array_replace(
-            r#"[1, { "foo": "bar", "baz": "qux" }, 3,]"#,
-            1,
-            &["baz"],
-            Some(json!({"qux": "quz"})),
-            r#"[1, { "foo": "bar", "baz": { "qux": "quz" } }, 3,]"#,
-        );
-
-        check_array_replace(
-            r#"[
-                1,
-                {
-                    "foo": "bar",
-                    "baz": "qux"
-                },
-                3
-            ]"#,
-            1,
-            &["baz"],
-            Some(json!({"qux": "quz"})),
-            r#"[
-                1,
-                {
-                    "foo": "bar",
-                    "baz": {
-                        "qux": "quz"
-                    }
-                },
-                3
-            ]"#,
-        );
-
-        check_array_replace(
-            r#"[
-                1,
-                {
-                    "foo": "bar",
-                    "baz": {
-                        "qux": "quz"
-                    }
-                },
-                3
-            ]"#,
-            1,
-            &["baz"],
-            Some(json!("qux")),
-            r#"[
-                1,
-                {
-                    "foo": "bar",
-                    "baz": "qux"
-                },
-                3
-            ]"#,
-        );
-
-        check_array_replace(
-            r#"[
-                1,
-                {
-                    "foo": "bar",
-                    // some comment to keep
-                    "baz": {
-                        // some comment to remove
-                        "qux": "quz"
-                    }
-                    // some other comment to keep
-                },
-                3
-            ]"#,
-            1,
-            &["baz"],
-            Some(json!("qux")),
-            r#"[
-                1,
-                {
-                    "foo": "bar",
-                    // some comment to keep
-                    "baz": "qux"
-                    // some other comment to keep
-                },
-                3
-            ]"#,
-        );
-
-        // Test with comments between array elements
-        check_array_replace(
-            r#"[
-                1,
-                // This is element 2
-                2,
-                /* Block comment */ 3,
-                4 // Trailing comment
-            ]"#,
-            2,
-            &[],
-            Some(json!("replaced")),
-            r#"[
-                1,
-                // This is element 2
-                2,
-                /* Block comment */ "replaced",
-                4 // Trailing comment
-            ]"#,
-        );
-
-        // Test empty array with comments
-        check_array_replace(
-            r#"[
-                // Empty array with comment
-            ]"#
-            .unindent(),
-            0,
-            &[],
-            Some(json!("first")),
-            r#"[
-                // Empty array with comment
-                "first"
-            ]"#
-            .unindent(),
-        );
-        check_array_replace(
-            r#"[]"#.unindent(),
-            0,
-            &[],
-            Some(json!("first")),
-            r#"["first"]"#.unindent(),
-        );
-
-        // Test array with leading comments
-        check_array_replace(
-            r#"[
-                // Leading comment
-                // Another leading comment
-                1,
-                2
-            ]"#,
-            0,
-            &[],
-            Some(json!({"new": "object"})),
-            r#"[
-                // Leading comment
-                // Another leading comment
-                {
-                    "new": "object"
-                },
-                2
-            ]"#,
-        );
-
-        // Test with deep indentation
-        check_array_replace(
-            r#"[
-                        1,
-                        2,
-                        3
-                    ]"#,
-            1,
-            &[],
-            Some(json!("deep")),
-            r#"[
-                        1,
-                        "deep",
-                        3
-                    ]"#,
-        );
-
-        // Test with mixed spacing
-        check_array_replace(
-            r#"[1,2,   3,    4]"#,
-            2,
-            &[],
-            Some(json!("spaced")),
-            r#"[1,2,   "spaced",    4]"#,
-        );
-
-        // Test replacing nested array element
-        check_array_replace(
-            r#"[
-                [1, 2, 3],
-                [4, 5, 6],
-                [7, 8, 9]
-            ]"#,
-            1,
-            &[],
-            Some(json!(["a", "b", "c", "d"])),
-            r#"[
-                [1, 2, 3],
-                [
-                    "a",
-                    "b",
-                    "c",
-                    "d"
-                ],
-                [7, 8, 9]
-            ]"#,
-        );
-
-        // Test with multiline block comments
-        check_array_replace(
-            r#"[
-                /*
-                 * This is a
-                 * multiline comment
-                 */
-                "first",
-                "second"
-            ]"#,
-            0,
-            &[],
-            Some(json!("updated")),
-            r#"[
-                /*
-                 * This is a
-                 * multiline comment
-                 */
-                "updated",
-                "second"
-            ]"#,
-        );
-
-        // Test replacing with null
-        check_array_replace(
-            r#"[true, false, true]"#,
-            1,
-            &[],
-            Some(json!(null)),
-            r#"[true, null, true]"#,
-        );
-
-        // Test single element array
-        check_array_replace(
-            r#"[42]"#,
-            0,
-            &[],
-            Some(json!({"answer": 42})),
-            r#"[{ "answer": 42 }]"#,
-        );
-
-        // Test array with only comments
-        check_array_replace(
-            r#"[
-                // Comment 1
-                // Comment 2
-                // Comment 3
-            ]"#
-            .unindent(),
-            10,
-            &[],
-            Some(json!(123)),
-            r#"[
-                // Comment 1
-                // Comment 2
-                // Comment 3
-                123
-            ]"#
-            .unindent(),
-        );
-
-        check_array_replace(
-            r#"[
-                {
-                    "key": "value"
-                },
-                {
-                    "key": "value2"
-                }
-            ]"#
-            .unindent(),
-            0,
-            &[],
-            None,
-            r#"[
-                {
-                    "key": "value2"
-                }
-            ]"#
-            .unindent(),
-        );
-
-        check_array_replace(
-            r#"[
-                {
-                    "key": "value"
-                },
-                {
-                    "key": "value2"
-                },
-                {
-                    "key": "value3"
-                },
-            ]"#
-            .unindent(),
-            1,
-            &[],
-            None,
-            r#"[
-                {
-                    "key": "value"
-                },
-                {
-                    "key": "value3"
-                },
-            ]"#
-            .unindent(),
-        );
-
-        check_array_replace(
-            r#""#,
-            2,
-            &[],
-            Some(json!(42)),
-            r#"[
-                42
-            ]"#
-            .unindent(),
-        );
-
-        check_array_replace(
-            r#""#,
-            2,
-            &["foo", "bar"],
-            Some(json!(42)),
-            r#"[
-                {
-                    "foo": {
-                        "bar": 42
-                    }
-                }
-            ]"#
-            .unindent(),
-        );
-    }
-
-    #[test]
-    fn array_append() {
-        #[track_caller]
-        fn check_array_append(input: impl ToString, value: Value, expected: impl ToString) {
-            let input = input.to_string();
-            let result = append_top_level_array_value_in_json_text(&input, &value, 4);
-            let mut result_str = input;
-            result_str.replace_range(result.0, &result.1);
-            pretty_assertions::assert_eq!(expected.to_string(), result_str);
-        }
-        check_array_append(r#"[1, 3, 3]"#, json!(4), r#"[1, 3, 3, 4]"#);
-        check_array_append(r#"[1, 3, 3,]"#, json!(4), r#"[1, 3, 3, 4]"#);
-        check_array_append(r#"[1, 3, 3   ]"#, json!(4), r#"[1, 3, 3, 4]"#);
-        check_array_append(r#"[1, 3, 3,   ]"#, json!(4), r#"[1, 3, 3, 4]"#);
-        check_array_append(
-            r#"[
-                1,
-                2,
-                3
-            ]"#
-            .unindent(),
-            json!(4),
-            r#"[
-                1,
-                2,
-                3,
-                4
-            ]"#
-            .unindent(),
-        );
-        check_array_append(
-            r#"[
-                1,
-                2,
-                3,
-            ]"#
-            .unindent(),
-            json!(4),
-            r#"[
-                1,
-                2,
-                3,
-                4
-            ]"#
-            .unindent(),
-        );
-        check_array_append(
-            r#"[
-                1,
-                2,
-                3,
-            ]"#
-            .unindent(),
-            json!({"foo": "bar", "baz": "qux"}),
-            r#"[
-                1,
-                2,
-                3,
-                {
-                    "foo": "bar",
-                    "baz": "qux"
-                }
-            ]"#
-            .unindent(),
-        );
-        check_array_append(
-            r#"[ 1, 2, 3, ]"#.unindent(),
-            json!({"foo": "bar", "baz": "qux"}),
-            r#"[ 1, 2, 3, { "foo": "bar", "baz": "qux" }]"#.unindent(),
-        );
-        check_array_append(
-            r#"[]"#,
-            json!({"foo": "bar"}),
-            r#"[
-                {
-                    "foo": "bar"
-                }
-            ]"#
-            .unindent(),
-        );
-
-        // Test with comments between array elements
-        check_array_append(
-            r#"[
-                1,
-                // Comment between elements
-                2,
-                /* Block comment */ 3
-            ]"#
-            .unindent(),
-            json!(4),
-            r#"[
-                1,
-                // Comment between elements
-                2,
-                /* Block comment */ 3,
-                4
-            ]"#
-            .unindent(),
-        );
-
-        // Test with trailing comment on last element
-        check_array_append(
-            r#"[
-                1,
-                2,
-                3 // Trailing comment
-            ]"#
-            .unindent(),
-            json!("new"),
-            r#"[
-                1,
-                2,
-                3 // Trailing comment
-            ,
-                "new"
-            ]"#
-            .unindent(),
-        );
-
-        // Test empty array with comments
-        check_array_append(
-            r#"[
-                // Empty array with comment
-            ]"#
-            .unindent(),
-            json!("first"),
-            r#"[
-                // Empty array with comment
-                "first"
-            ]"#
-            .unindent(),
-        );
-
-        // Test with multiline block comment at end
-        check_array_append(
-            r#"[
-                1,
-                2
-                /*
-                 * This is a
-                 * multiline comment
-                 */
-            ]"#
-            .unindent(),
-            json!(3),
-            r#"[
-                1,
-                2
-                /*
-                 * This is a
-                 * multiline comment
-                 */
-            ,
-                3
-            ]"#
-            .unindent(),
-        );
-
-        // Test with deep indentation
-        check_array_append(
-            r#"[
-                1,
-                    2,
-                        3
-            ]"#
-            .unindent(),
-            json!("deep"),
-            r#"[
-                1,
-                    2,
-                        3,
-                        "deep"
-            ]"#
-            .unindent(),
-        );
-
-        // Test with no spacing
-        check_array_append(r#"[1,2,3]"#, json!(4), r#"[1,2,3, 4]"#);
-
-        // Test appending complex nested structure
-        check_array_append(
-            r#"[
-                {"a": 1},
-                {"b": 2}
-            ]"#
-            .unindent(),
-            json!({"c": {"nested": [1, 2, 3]}}),
-            r#"[
-                {"a": 1},
-                {"b": 2},
-                {
-                    "c": {
-                        "nested": [
-                            1,
-                            2,
-                            3
-                        ]
-                    }
-                }
-            ]"#
-            .unindent(),
-        );
-
-        // Test array ending with comment after bracket
-        check_array_append(
-            r#"[
-                1,
-                2,
-                3
-            ] // Comment after array"#
-                .unindent(),
-            json!(4),
-            r#"[
-                1,
-                2,
-                3,
-                4
-            ] // Comment after array"#
-                .unindent(),
-        );
-
-        // Test with inconsistent element formatting
-        check_array_append(
-            r#"[1,
-               2,
-                    3,
-            ]"#
-            .unindent(),
-            json!(4),
-            r#"[1,
-               2,
-                    3,
-                    4
-            ]"#
-            .unindent(),
-        );
-
-        // Test appending to single-line array with trailing comma
-        check_array_append(
-            r#"[1, 2, 3,]"#,
-            json!({"key": "value"}),
-            r#"[1, 2, 3, { "key": "value" }]"#,
-        );
-
-        // Test appending null value
-        check_array_append(r#"[true, false]"#, json!(null), r#"[true, false, null]"#);
-
-        // Test appending to array with only comments
-        check_array_append(
-            r#"[
-                // Just comments here
-                // More comments
-            ]"#
-            .unindent(),
-            json!(42),
-            r#"[
-                // Just comments here
-                // More comments
-                42
-            ]"#
-            .unindent(),
-        );
-
-        check_array_append(
-            r#""#,
-            json!(42),
-            r#"[
-                42
-            ]"#
-            .unindent(),
-        )
-    }
-
-    #[test]
-    fn test_infer_json_indent_size() {
-        let json_2_spaces = r#"{
-  "key1": "value1",
-  "nested": {
-    "key2": "value2",
-    "array": [
-      1,
-      2,
-      3
-    ]
-  }
-}"#;
-        assert_eq!(infer_json_indent_size(json_2_spaces), 2);
-
-        let json_4_spaces = r#"{
-    "key1": "value1",
-    "nested": {
-        "key2": "value2",
-        "array": [
-            1,
-            2,
-            3
-        ]
-    }
-}"#;
-        assert_eq!(infer_json_indent_size(json_4_spaces), 4);
-
-        let json_8_spaces = r#"{
-        "key1": "value1",
-        "nested": {
-                "key2": "value2"
-        }
-}"#;
-        assert_eq!(infer_json_indent_size(json_8_spaces), 8);
-
-        let json_single_line = r#"{"key": "value", "nested": {"inner": "data"}}"#;
-        assert_eq!(infer_json_indent_size(json_single_line), 2);
-
-        let json_empty = r#"{}"#;
-        assert_eq!(infer_json_indent_size(json_empty), 2);
-
-        let json_array = r#"[
-  {
-    "id": 1,
-    "name": "first"
-  },
-  {
-    "id": 2,
-    "name": "second"
-  }
-]"#;
-        assert_eq!(infer_json_indent_size(json_array), 2);
-
-        let json_mixed = r#"{
-  "a": {
-    "b": {
-        "c": "value"
-    }
-  },
-  "d": "value2"
-}"#;
-        assert_eq!(infer_json_indent_size(json_mixed), 2);
-    }
-}
diff --git a/crates/settings_macros/Cargo.toml b/crates/settings_macros/Cargo.toml
deleted file mode 100644
index 175c2f26a3..0000000000
--- a/crates/settings_macros/Cargo.toml
+++ /dev/null
@@ -1,23 +0,0 @@
-[package]
-name = "settings_macros"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lib]
-path = "src/settings_macros.rs"
-proc-macro = true
-
-[lints]
-workspace = true
-
-[features]
-default = []
-
-[dependencies]
-quote.workspace = true
-syn.workspace = true
-
-[dev-dependencies]
-settings.workspace = true
diff --git a/crates/settings_macros/LICENSE-GPL b/crates/settings_macros/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/settings_macros/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/settings_macros/src/settings_macros.rs b/crates/settings_macros/src/settings_macros.rs
deleted file mode 100644
index bad786991d..0000000000
--- a/crates/settings_macros/src/settings_macros.rs
+++ /dev/null
@@ -1,152 +0,0 @@
-use proc_macro::TokenStream;
-
-use quote::quote;
-use syn::{
-    Data, DeriveInput, Field, Fields, ItemEnum, ItemStruct, Type, parse_macro_input, parse_quote,
-};
-
-/// Derives the `MergeFrom` trait for a struct.
-///
-/// This macro automatically implements `MergeFrom` by calling `merge_from`
-/// on all fields in the struct.
-///
-/// # Example
-///
-/// ```ignore
-/// #[derive(Clone, MergeFrom)]
-/// struct MySettings {
-///     field1: Option<String>,
-///     field2: SomeOtherSettings,
-/// }
-/// ```
-#[proc_macro_derive(MergeFrom)]
-pub fn derive_merge_from(input: TokenStream) -> TokenStream {
-    let input = parse_macro_input!(input as DeriveInput);
-
-    let name = &input.ident;
-    let (impl_generics, ty_generics, where_clause) = input.generics.split_for_impl();
-
-    let merge_body = match &input.data {
-        Data::Struct(data_struct) => match &data_struct.fields {
-            Fields::Named(fields) => {
-                let field_merges = fields.named.iter().map(|field| {
-                    let field_name = &field.ident;
-                    quote! {
-                        self.#field_name.merge_from(&other.#field_name);
-                    }
-                });
-
-                quote! {
-                    #(#field_merges)*
-                }
-            }
-            Fields::Unnamed(fields) => {
-                let field_merges = fields.unnamed.iter().enumerate().map(|(i, _)| {
-                    let field_index = syn::Index::from(i);
-                    quote! {
-                        self.#field_index.merge_from(&other.#field_index);
-                    }
-                });
-
-                quote! {
-                    #(#field_merges)*
-                }
-            }
-            Fields::Unit => {
-                quote! {
-                    // No fields to merge for unit structs
-                }
-            }
-        },
-        Data::Enum(_) => {
-            quote! {
-                *self = other.clone();
-            }
-        }
-        Data::Union(_) => {
-            panic!("MergeFrom cannot be derived for unions");
-        }
-    };
-
-    let expanded = quote! {
-        impl #impl_generics crate::merge_from::MergeFrom for #name #ty_generics #where_clause {
-            fn merge_from(&mut self, other: &Self) {
-                use crate::merge_from::MergeFrom as _;
-                #merge_body
-            }
-        }
-    };
-
-    TokenStream::from(expanded)
-}
-
-/// Registers the setting type with the SettingsStore. Note that you need to
-/// have `gpui` in your dependencies for this to work.
-#[proc_macro_derive(RegisterSetting)]
-pub fn derive_register_setting(input: TokenStream) -> TokenStream {
-    let input = syn::parse_macro_input!(input as DeriveInput);
-    let type_name = &input.ident;
-
-    quote! {
-        settings::private::inventory::submit! {
-            settings::private::RegisteredSetting {
-                settings_value: || {
-                    Box::new(settings::private::SettingValue::<#type_name> {
-                        global_value: None,
-                        local_values: Vec::new(),
-                    })
-                },
-                from_settings: |content| Box::new(<#type_name as settings::Settings>::from_settings(content)),
-                id: || std::any::TypeId::of::<#type_name>(),
-            }
-        }
-    }
-    .into()
-}
-
-// Adds serde attributes to each field with type Option<T>:
-// #serde(default, skip_serializing_if = "Option::is_none", deserialize_with = "settings::deserialize_fallible")
-#[proc_macro_attribute]
-pub fn with_fallible_options(_args: TokenStream, input: TokenStream) -> TokenStream {
-    fn apply_on_fields(fields: &mut Fields) {
-        match fields {
-            Fields::Unit => {}
-            Fields::Named(fields) => {
-                for field in &mut fields.named {
-                    add_if_option(field)
-                }
-            }
-            Fields::Unnamed(fields) => {
-                for field in &mut fields.unnamed {
-                    add_if_option(field)
-                }
-            }
-        }
-    }
-
-    fn add_if_option(field: &mut Field) {
-        match &field.ty {
-            Type::Path(syn::TypePath { qself: None, path })
-                if path.leading_colon.is_none()
-                    && path.segments.len() == 1
-                    && path.segments[0].ident == "Option" => {}
-            _ => return,
-        }
-        let attr = parse_quote!(
-            #[serde(default, skip_serializing_if = "Option::is_none", deserialize_with="crate::fallible_options::deserialize")]
-        );
-        field.attrs.push(attr);
-    }
-
-    if let Ok(mut input) = syn::parse::<ItemStruct>(input.clone()) {
-        apply_on_fields(&mut input.fields);
-        quote!(#input).into()
-    } else if let Ok(mut input) = syn::parse::<ItemEnum>(input) {
-        for variant in &mut input.variants {
-            apply_on_fields(&mut variant.fields);
-        }
-        quote!(#input).into()
-    } else {
-        panic!("with_fallible_options can only be applied to struct or enum definitions.");
-    }
-}
diff --git a/crates/settings_profile_selector/Cargo.toml b/crates/settings_profile_selector/Cargo.toml
deleted file mode 100644
index 23ccac2e43..0000000000
--- a/crates/settings_profile_selector/Cargo.toml
+++ /dev/null
@@ -1,34 +0,0 @@
-[package]
-name = "settings_profile_selector"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/settings_profile_selector.rs"
-doctest = false
-
-[dependencies]
-fuzzy.workspace = true
-gpui.workspace = true
-picker.workspace = true
-settings.workspace = true
-ui.workspace = true
-workspace.workspace = true
-zed_actions.workspace = true
-
-[dev-dependencies]
-client = { workspace = true, features = ["test-support"] }
-editor = { workspace = true, features = ["test-support"] }
-gpui = { workspace = true, features = ["test-support"] }
-language = { workspace = true, features = ["test-support"] }
-menu.workspace = true
-project = { workspace = true, features = ["test-support"] }
-serde_json.workspace = true
-settings = { workspace = true, features = ["test-support"] }
-theme = { workspace = true, features = ["test-support"] }
-workspace = { workspace = true, features = ["test-support"] }
diff --git a/crates/settings_profile_selector/LICENSE-GPL b/crates/settings_profile_selector/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/settings_profile_selector/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/settings_profile_selector/src/settings_profile_selector.rs b/crates/settings_profile_selector/src/settings_profile_selector.rs
deleted file mode 100644
index 42d714283a..0000000000
--- a/crates/settings_profile_selector/src/settings_profile_selector.rs
+++ /dev/null
@@ -1,612 +0,0 @@
-use fuzzy::{StringMatch, StringMatchCandidate, match_strings};
-use gpui::{
-    App, Context, DismissEvent, Entity, EventEmitter, Focusable, Render, Task, WeakEntity, Window,
-};
-use picker::{Picker, PickerDelegate};
-use settings::{ActiveSettingsProfileName, SettingsStore};
-use ui::{HighlightedLabel, ListItem, ListItemSpacing, prelude::*};
-use workspace::{ModalView, Workspace};
-
-pub fn init(cx: &mut App) {
-    cx.on_action(|_: &zed_actions::settings_profile_selector::Toggle, cx| {
-        workspace::with_active_or_new_workspace(cx, |workspace, window, cx| {
-            toggle_settings_profile_selector(workspace, window, cx);
-        });
-    });
-}
-
-fn toggle_settings_profile_selector(
-    workspace: &mut Workspace,
-    window: &mut Window,
-    cx: &mut Context<Workspace>,
-) {
-    workspace.toggle_modal(window, cx, |window, cx| {
-        let delegate = SettingsProfileSelectorDelegate::new(cx.entity().downgrade(), window, cx);
-        SettingsProfileSelector::new(delegate, window, cx)
-    });
-}
-
-pub struct SettingsProfileSelector {
-    picker: Entity<Picker<SettingsProfileSelectorDelegate>>,
-}
-
-impl ModalView for SettingsProfileSelector {}
-
-impl EventEmitter<DismissEvent> for SettingsProfileSelector {}
-
-impl Focusable for SettingsProfileSelector {
-    fn focus_handle(&self, cx: &App) -> gpui::FocusHandle {
-        self.picker.focus_handle(cx)
-    }
-}
-
-impl Render for SettingsProfileSelector {
-    fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
-        v_flex().w(rems(22.)).child(self.picker.clone())
-    }
-}
-
-impl SettingsProfileSelector {
-    pub fn new(
-        delegate: SettingsProfileSelectorDelegate,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx));
-        Self { picker }
-    }
-}
-
-pub struct SettingsProfileSelectorDelegate {
-    matches: Vec<StringMatch>,
-    profile_names: Vec<Option<String>>,
-    original_profile_name: Option<String>,
-    selected_profile_name: Option<String>,
-    selected_index: usize,
-    selection_completed: bool,
-    selector: WeakEntity<SettingsProfileSelector>,
-}
-
-impl SettingsProfileSelectorDelegate {
-    fn new(
-        selector: WeakEntity<SettingsProfileSelector>,
-        _: &mut Window,
-        cx: &mut Context<SettingsProfileSelector>,
-    ) -> Self {
-        let settings_store = cx.global::<SettingsStore>();
-        let mut profile_names: Vec<Option<String>> = settings_store
-            .configured_settings_profiles()
-            .map(|s| Some(s.to_string()))
-            .collect();
-        profile_names.insert(0, None);
-
-        let matches = profile_names
-            .iter()
-            .enumerate()
-            .map(|(ix, profile_name)| StringMatch {
-                candidate_id: ix,
-                score: 0.0,
-                positions: Default::default(),
-                string: display_name(profile_name),
-            })
-            .collect();
-
-        let profile_name = cx
-            .try_global::<ActiveSettingsProfileName>()
-            .map(|p| p.0.clone());
-
-        let mut this = Self {
-            matches,
-            profile_names,
-            original_profile_name: profile_name.clone(),
-            selected_profile_name: None,
-            selected_index: 0,
-            selection_completed: false,
-            selector,
-        };
-
-        if let Some(profile_name) = profile_name {
-            this.select_if_matching(&profile_name);
-        }
-
-        this
-    }
-
-    fn select_if_matching(&mut self, profile_name: &str) {
-        self.selected_index = self
-            .matches
-            .iter()
-            .position(|mat| mat.string == profile_name)
-            .unwrap_or(self.selected_index);
-    }
-
-    fn set_selected_profile(
-        &self,
-        cx: &mut Context<Picker<SettingsProfileSelectorDelegate>>,
-    ) -> Option<String> {
-        let mat = self.matches.get(self.selected_index)?;
-        let profile_name = self.profile_names.get(mat.candidate_id)?;
-        Self::update_active_profile_name_global(profile_name.clone(), cx)
-    }
-
-    fn update_active_profile_name_global(
-        profile_name: Option<String>,
-        cx: &mut Context<Picker<SettingsProfileSelectorDelegate>>,
-    ) -> Option<String> {
-        if let Some(profile_name) = profile_name {
-            cx.set_global(ActiveSettingsProfileName(profile_name.clone()));
-            return Some(profile_name);
-        }
-
-        if cx.has_global::<ActiveSettingsProfileName>() {
-            cx.remove_global::<ActiveSettingsProfileName>();
-        }
-
-        None
-    }
-}
-
-impl PickerDelegate for SettingsProfileSelectorDelegate {
-    type ListItem = ListItem;
-
-    fn placeholder_text(&self, _: &mut Window, _: &mut App) -> std::sync::Arc<str> {
-        "Select a settings profile...".into()
-    }
-
-    fn match_count(&self) -> usize {
-        self.matches.len()
-    }
-
-    fn selected_index(&self) -> usize {
-        self.selected_index
-    }
-
-    fn set_selected_index(
-        &mut self,
-        ix: usize,
-        _: &mut Window,
-        cx: &mut Context<Picker<SettingsProfileSelectorDelegate>>,
-    ) {
-        self.selected_index = ix;
-        self.selected_profile_name = self.set_selected_profile(cx);
-    }
-
-    fn update_matches(
-        &mut self,
-        query: String,
-        window: &mut Window,
-        cx: &mut Context<Picker<SettingsProfileSelectorDelegate>>,
-    ) -> Task<()> {
-        let background = cx.background_executor().clone();
-        let candidates = self
-            .profile_names
-            .iter()
-            .enumerate()
-            .map(|(id, profile_name)| StringMatchCandidate::new(id, &display_name(profile_name)))
-            .collect::<Vec<_>>();
-
-        cx.spawn_in(window, async move |this, cx| {
-            let matches = if query.is_empty() {
-                candidates
-                    .into_iter()
-                    .enumerate()
-                    .map(|(index, candidate)| StringMatch {
-                        candidate_id: index,
-                        string: candidate.string,
-                        positions: Vec::new(),
-                        score: 0.0,
-                    })
-                    .collect()
-            } else {
-                match_strings(
-                    &candidates,
-                    &query,
-                    false,
-                    true,
-                    100,
-                    &Default::default(),
-                    background,
-                )
-                .await
-            };
-
-            this.update_in(cx, |this, _, cx| {
-                this.delegate.matches = matches;
-                this.delegate.selected_index = this
-                    .delegate
-                    .selected_index
-                    .min(this.delegate.matches.len().saturating_sub(1));
-                this.delegate.selected_profile_name = this.delegate.set_selected_profile(cx);
-            })
-            .ok();
-        })
-    }
-
-    fn confirm(
-        &mut self,
-        _: bool,
-        _: &mut Window,
-        cx: &mut Context<Picker<SettingsProfileSelectorDelegate>>,
-    ) {
-        self.selection_completed = true;
-        self.selector
-            .update(cx, |_, cx| {
-                cx.emit(DismissEvent);
-            })
-            .ok();
-    }
-
-    fn dismissed(
-        &mut self,
-        _: &mut Window,
-        cx: &mut Context<Picker<SettingsProfileSelectorDelegate>>,
-    ) {
-        if !self.selection_completed {
-            SettingsProfileSelectorDelegate::update_active_profile_name_global(
-                self.original_profile_name.clone(),
-                cx,
-            );
-        }
-        self.selector.update(cx, |_, cx| cx.emit(DismissEvent)).ok();
-    }
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        _: &mut Window,
-        _: &mut Context<Picker<Self>>,
-    ) -> Option<Self::ListItem> {
-        let mat = &self.matches.get(ix)?;
-        let profile_name = &self.profile_names.get(mat.candidate_id)?;
-
-        Some(
-            ListItem::new(ix)
-                .inset(true)
-                .spacing(ListItemSpacing::Sparse)
-                .toggle_state(selected)
-                .child(HighlightedLabel::new(
-                    display_name(profile_name),
-                    mat.positions.clone(),
-                )),
-        )
-    }
-}
-
-fn display_name(profile_name: &Option<String>) -> String {
-    profile_name.clone().unwrap_or("Disabled".into())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use editor;
-    use gpui::{TestAppContext, UpdateGlobal, VisualTestContext};
-    use menu::{Cancel, Confirm, SelectNext, SelectPrevious};
-    use project::{FakeFs, Project};
-    use serde_json::json;
-    use settings::Settings;
-    use theme::{self, ThemeSettings};
-    use workspace::{self, AppState};
-    use zed_actions::settings_profile_selector;
-
-    async fn init_test(
-        profiles_json: serde_json::Value,
-        cx: &mut TestAppContext,
-    ) -> (Entity<Workspace>, &mut VisualTestContext) {
-        cx.update(|cx| {
-            let state = AppState::test(cx);
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-            settings::init(cx);
-            theme::init(theme::LoadThemes::JustBase, cx);
-            super::init(cx);
-            editor::init(cx);
-            state
-        });
-
-        cx.update(|cx| {
-            SettingsStore::update_global(cx, |store, cx| {
-                let settings_json = json!({
-                    "buffer_font_size": 10.0,
-                    "profiles": profiles_json,
-                });
-
-                store
-                    .set_user_settings(&settings_json.to_string(), cx)
-                    .unwrap();
-            });
-        });
-
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, ["/test".as_ref()], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-        cx.update(|_, cx| {
-            assert!(!cx.has_global::<ActiveSettingsProfileName>());
-            assert_eq!(ThemeSettings::get_global(cx).buffer_font_size(cx), px(10.0));
-        });
-
-        (workspace, cx)
-    }
-
-    #[track_caller]
-    fn active_settings_profile_picker(
-        workspace: &Entity<Workspace>,
-        cx: &mut VisualTestContext,
-    ) -> Entity<Picker<SettingsProfileSelectorDelegate>> {
-        workspace.update(cx, |workspace, cx| {
-            workspace
-                .active_modal::<SettingsProfileSelector>(cx)
-                .expect("settings profile selector is not open")
-                .read(cx)
-                .picker
-                .clone()
-        })
-    }
-
-    #[gpui::test]
-    async fn test_settings_profile_selector_state(cx: &mut TestAppContext) {
-        let classroom_and_streaming_profile_name = "Classroom / Streaming".to_string();
-        let demo_videos_profile_name = "Demo Videos".to_string();
-
-        let profiles_json = json!({
-            classroom_and_streaming_profile_name.clone(): {
-                "buffer_font_size": 20.0,
-            },
-            demo_videos_profile_name.clone(): {
-                "buffer_font_size": 15.0
-            }
-        });
-        let (workspace, cx) = init_test(profiles_json.clone(), cx).await;
-
-        cx.dispatch_action(settings_profile_selector::Toggle);
-        let picker = active_settings_profile_picker(&workspace, cx);
-
-        picker.read_with(cx, |picker, cx| {
-            assert_eq!(picker.delegate.matches.len(), 3);
-            assert_eq!(picker.delegate.matches[0].string, display_name(&None));
-            assert_eq!(
-                picker.delegate.matches[1].string,
-                classroom_and_streaming_profile_name
-            );
-            assert_eq!(picker.delegate.matches[2].string, demo_videos_profile_name);
-            assert_eq!(picker.delegate.matches.get(3), None);
-
-            assert_eq!(picker.delegate.selected_index, 0);
-            assert_eq!(picker.delegate.selected_profile_name, None);
-
-            assert_eq!(cx.try_global::<ActiveSettingsProfileName>(), None);
-            assert_eq!(ThemeSettings::get_global(cx).buffer_font_size(cx), px(10.0));
-        });
-
-        cx.dispatch_action(Confirm);
-
-        cx.update(|_, cx| {
-            assert_eq!(cx.try_global::<ActiveSettingsProfileName>(), None);
-        });
-
-        cx.dispatch_action(settings_profile_selector::Toggle);
-        let picker = active_settings_profile_picker(&workspace, cx);
-        cx.dispatch_action(SelectNext);
-
-        picker.read_with(cx, |picker, cx| {
-            assert_eq!(picker.delegate.selected_index, 1);
-            assert_eq!(
-                picker.delegate.selected_profile_name,
-                Some(classroom_and_streaming_profile_name.clone())
-            );
-
-            assert_eq!(
-                cx.try_global::<ActiveSettingsProfileName>()
-                    .map(|p| p.0.clone()),
-                Some(classroom_and_streaming_profile_name.clone())
-            );
-
-            assert_eq!(ThemeSettings::get_global(cx).buffer_font_size(cx), px(20.0));
-        });
-
-        cx.dispatch_action(Cancel);
-
-        cx.update(|_, cx| {
-            assert_eq!(cx.try_global::<ActiveSettingsProfileName>(), None);
-            assert_eq!(ThemeSettings::get_global(cx).buffer_font_size(cx), px(10.0));
-        });
-
-        cx.dispatch_action(settings_profile_selector::Toggle);
-        let picker = active_settings_profile_picker(&workspace, cx);
-
-        cx.dispatch_action(SelectNext);
-
-        picker.read_with(cx, |picker, cx| {
-            assert_eq!(picker.delegate.selected_index, 1);
-            assert_eq!(
-                picker.delegate.selected_profile_name,
-                Some(classroom_and_streaming_profile_name.clone())
-            );
-
-            assert_eq!(
-                cx.try_global::<ActiveSettingsProfileName>()
-                    .map(|p| p.0.clone()),
-                Some(classroom_and_streaming_profile_name.clone())
-            );
-
-            assert_eq!(ThemeSettings::get_global(cx).buffer_font_size(cx), px(20.0));
-        });
-
-        cx.dispatch_action(SelectNext);
-
-        picker.read_with(cx, |picker, cx| {
-            assert_eq!(picker.delegate.selected_index, 2);
-            assert_eq!(
-                picker.delegate.selected_profile_name,
-                Some(demo_videos_profile_name.clone())
-            );
-
-            assert_eq!(
-                cx.try_global::<ActiveSettingsProfileName>()
-                    .map(|p| p.0.clone()),
-                Some(demo_videos_profile_name.clone())
-            );
-
-            assert_eq!(ThemeSettings::get_global(cx).buffer_font_size(cx), px(15.0));
-        });
-
-        cx.dispatch_action(Confirm);
-
-        cx.update(|_, cx| {
-            assert_eq!(
-                cx.try_global::<ActiveSettingsProfileName>()
-                    .map(|p| p.0.clone()),
-                Some(demo_videos_profile_name.clone())
-            );
-            assert_eq!(ThemeSettings::get_global(cx).buffer_font_size(cx), px(15.0));
-        });
-
-        cx.dispatch_action(settings_profile_selector::Toggle);
-        let picker = active_settings_profile_picker(&workspace, cx);
-
-        picker.read_with(cx, |picker, cx| {
-            assert_eq!(picker.delegate.selected_index, 2);
-            assert_eq!(
-                picker.delegate.selected_profile_name,
-                Some(demo_videos_profile_name.clone())
-            );
-
-            assert_eq!(
-                cx.try_global::<ActiveSettingsProfileName>()
-                    .map(|p| p.0.clone()),
-                Some(demo_videos_profile_name.clone())
-            );
-            assert_eq!(ThemeSettings::get_global(cx).buffer_font_size(cx), px(15.0));
-        });
-
-        cx.dispatch_action(SelectPrevious);
-
-        picker.read_with(cx, |picker, cx| {
-            assert_eq!(picker.delegate.selected_index, 1);
-            assert_eq!(
-                picker.delegate.selected_profile_name,
-                Some(classroom_and_streaming_profile_name.clone())
-            );
-
-            assert_eq!(
-                cx.try_global::<ActiveSettingsProfileName>()
-                    .map(|p| p.0.clone()),
-                Some(classroom_and_streaming_profile_name.clone())
-            );
-
-            assert_eq!(ThemeSettings::get_global(cx).buffer_font_size(cx), px(20.0));
-        });
-
-        cx.dispatch_action(Cancel);
-
-        cx.update(|_, cx| {
-            assert_eq!(
-                cx.try_global::<ActiveSettingsProfileName>()
-                    .map(|p| p.0.clone()),
-                Some(demo_videos_profile_name.clone())
-            );
-
-            assert_eq!(ThemeSettings::get_global(cx).buffer_font_size(cx), px(15.0));
-        });
-
-        cx.dispatch_action(settings_profile_selector::Toggle);
-        let picker = active_settings_profile_picker(&workspace, cx);
-
-        picker.read_with(cx, |picker, cx| {
-            assert_eq!(picker.delegate.selected_index, 2);
-            assert_eq!(
-                picker.delegate.selected_profile_name,
-                Some(demo_videos_profile_name.clone())
-            );
-
-            assert_eq!(
-                cx.try_global::<ActiveSettingsProfileName>()
-                    .map(|p| p.0.clone()),
-                Some(demo_videos_profile_name)
-            );
-
-            assert_eq!(ThemeSettings::get_global(cx).buffer_font_size(cx), px(15.0));
-        });
-
-        cx.dispatch_action(SelectPrevious);
-
-        picker.read_with(cx, |picker, cx| {
-            assert_eq!(picker.delegate.selected_index, 1);
-            assert_eq!(
-                picker.delegate.selected_profile_name,
-                Some(classroom_and_streaming_profile_name.clone())
-            );
-
-            assert_eq!(
-                cx.try_global::<ActiveSettingsProfileName>()
-                    .map(|p| p.0.clone()),
-                Some(classroom_and_streaming_profile_name)
-            );
-
-            assert_eq!(ThemeSettings::get_global(cx).buffer_font_size(cx), px(20.0));
-        });
-
-        cx.dispatch_action(SelectPrevious);
-
-        picker.read_with(cx, |picker, cx| {
-            assert_eq!(picker.delegate.selected_index, 0);
-            assert_eq!(picker.delegate.selected_profile_name, None);
-
-            assert_eq!(
-                cx.try_global::<ActiveSettingsProfileName>()
-                    .map(|p| p.0.clone()),
-                None
-            );
-
-            assert_eq!(ThemeSettings::get_global(cx).buffer_font_size(cx), px(10.0));
-        });
-
-        cx.dispatch_action(Confirm);
-
-        cx.update(|_, cx| {
-            assert_eq!(cx.try_global::<ActiveSettingsProfileName>(), None);
-            assert_eq!(ThemeSettings::get_global(cx).buffer_font_size(cx), px(10.0));
-        });
-    }
-
-    #[gpui::test]
-    async fn test_settings_profile_selector_is_in_user_configuration_order(
-        cx: &mut TestAppContext,
-    ) {
-        // Must be unique names (HashMap)
-        let profiles_json = json!({
-            "z": {},
-            "e": {},
-            "d": {},
-            " ": {},
-            "r": {},
-            "u": {},
-            "l": {},
-            "3": {},
-            "s": {},
-            "!": {},
-        });
-        let (workspace, cx) = init_test(profiles_json.clone(), cx).await;
-
-        cx.dispatch_action(settings_profile_selector::Toggle);
-        let picker = active_settings_profile_picker(&workspace, cx);
-
-        picker.read_with(cx, |picker, _| {
-            assert_eq!(picker.delegate.matches.len(), 11);
-            assert_eq!(picker.delegate.matches[0].string, display_name(&None));
-            assert_eq!(picker.delegate.matches[1].string, "z");
-            assert_eq!(picker.delegate.matches[2].string, "e");
-            assert_eq!(picker.delegate.matches[3].string, "d");
-            assert_eq!(picker.delegate.matches[4].string, " ");
-            assert_eq!(picker.delegate.matches[5].string, "r");
-            assert_eq!(picker.delegate.matches[6].string, "u");
-            assert_eq!(picker.delegate.matches[7].string, "l");
-            assert_eq!(picker.delegate.matches[8].string, "3");
-            assert_eq!(picker.delegate.matches[9].string, "s");
-            assert_eq!(picker.delegate.matches[10].string, "!");
-        });
-    }
-}
diff --git a/crates/settings_ui/Cargo.toml b/crates/settings_ui/Cargo.toml
deleted file mode 100644
index b5a259a3b9..0000000000
--- a/crates/settings_ui/Cargo.toml
+++ /dev/null
@@ -1,58 +0,0 @@
-[package]
-name = "settings_ui"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/settings_ui.rs"
-
-[features]
-default = []
-test-support = []
-
-[dependencies]
-anyhow.workspace = true
-bm25 = "2.3.2"
-editor.workspace = true
-feature_flags.workspace = true
-fs.workspace = true
-fuzzy.workspace = true
-gpui.workspace = true
-heck.workspace = true
-log.workspace = true
-menu.workspace = true
-paths.workspace = true
-picker.workspace = true
-project.workspace = true
-release_channel.workspace = true
-schemars.workspace = true
-search.workspace = true
-serde.workspace = true
-settings.workspace = true
-strum.workspace = true
-telemetry.workspace = true
-theme.workspace = true
-title_bar.workspace = true
-ui.workspace = true
-ui_input.workspace = true
-util.workspace = true
-workspace.workspace = true
-zed_actions.workspace = true
-
-[dev-dependencies]
-assets.workspace = true
-client.workspace = true
-futures.workspace = true
-gpui = { workspace = true, features = ["test-support"] }
-language.workspace = true
-node_runtime.workspace = true
-paths.workspace = true
-pretty_assertions.workspace = true
-session.workspace = true
-settings.workspace = true
-zlog.workspace = true
diff --git a/crates/settings_ui/LICENSE-GPL b/crates/settings_ui/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/settings_ui/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/settings_ui/src/components.rs b/crates/settings_ui/src/components.rs
deleted file mode 100644
index b073372ac9..0000000000
--- a/crates/settings_ui/src/components.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-mod dropdown;
-mod font_picker;
-mod icon_theme_picker;
-mod input_field;
-mod theme_picker;
-
-pub use dropdown::*;
-pub use font_picker::font_picker;
-pub use icon_theme_picker::icon_theme_picker;
-pub use input_field::*;
-pub use theme_picker::theme_picker;
diff --git a/crates/settings_ui/src/components/dropdown.rs b/crates/settings_ui/src/components/dropdown.rs
deleted file mode 100644
index ec9ecb4eaf..0000000000
--- a/crates/settings_ui/src/components/dropdown.rs
+++ /dev/null
@@ -1,108 +0,0 @@
-use std::rc::Rc;
-
-use gpui::{App, ElementId, IntoElement, RenderOnce};
-use heck::ToTitleCase as _;
-use ui::{
-    ButtonSize, ContextMenu, DropdownMenu, DropdownStyle, FluentBuilder as _, IconPosition, px,
-};
-
-#[derive(IntoElement)]
-pub struct EnumVariantDropdown<T>
-where
-    T: strum::VariantArray + strum::VariantNames + Copy + PartialEq + Send + Sync + 'static,
-{
-    id: ElementId,
-    current_value: T,
-    variants: &'static [T],
-    labels: &'static [&'static str],
-    should_do_title_case: bool,
-    tab_index: Option<isize>,
-    on_change: Rc<dyn Fn(T, &mut App) + 'static>,
-}
-
-impl<T> EnumVariantDropdown<T>
-where
-    T: strum::VariantArray + strum::VariantNames + Copy + PartialEq + Send + Sync + 'static,
-{
-    pub fn new(
-        id: impl Into<ElementId>,
-        current_value: T,
-        variants: &'static [T],
-        labels: &'static [&'static str],
-        on_change: impl Fn(T, &mut App) + 'static,
-    ) -> Self {
-        Self {
-            id: id.into(),
-            current_value,
-            variants,
-            labels,
-            should_do_title_case: true,
-            tab_index: None,
-            on_change: Rc::new(on_change),
-        }
-    }
-
-    pub fn title_case(mut self, title_case: bool) -> Self {
-        self.should_do_title_case = title_case;
-        self
-    }
-
-    pub fn tab_index(mut self, tab_index: isize) -> Self {
-        self.tab_index = Some(tab_index);
-        self
-    }
-}
-
-impl<T> RenderOnce for EnumVariantDropdown<T>
-where
-    T: strum::VariantArray + strum::VariantNames + Copy + PartialEq + Send + Sync + 'static,
-{
-    fn render(self, window: &mut ui::Window, cx: &mut ui::App) -> impl gpui::IntoElement {
-        let current_value_label = self.labels[self
-            .variants
-            .iter()
-            .position(|v| *v == self.current_value)
-            .unwrap()];
-
-        let context_menu = window.use_keyed_state(current_value_label, cx, |window, cx| {
-            ContextMenu::new(window, cx, move |mut menu, _, _| {
-                for (&value, &label) in std::iter::zip(self.variants, self.labels) {
-                    let on_change = self.on_change.clone();
-                    let current_value = self.current_value;
-                    menu = menu.toggleable_entry(
-                        if self.should_do_title_case {
-                            label.to_title_case()
-                        } else {
-                            label.to_string()
-                        },
-                        value == current_value,
-                        IconPosition::End,
-                        None,
-                        move |_, cx| {
-                            on_change(value, cx);
-                        },
-                    );
-                }
-                menu
-            })
-        });
-
-        DropdownMenu::new(
-            self.id,
-            if self.should_do_title_case {
-                current_value_label.to_title_case()
-            } else {
-                current_value_label.to_string()
-            },
-            context_menu,
-        )
-        .when_some(self.tab_index, |elem, tab_index| elem.tab_index(tab_index))
-        .trigger_size(ButtonSize::Medium)
-        .style(DropdownStyle::Outlined)
-        .offset(gpui::Point {
-            x: px(0.0),
-            y: px(2.0),
-        })
-        .into_any_element()
-    }
-}
diff --git a/crates/settings_ui/src/components/font_picker.rs b/crates/settings_ui/src/components/font_picker.rs
deleted file mode 100644
index 7a79009efd..0000000000
--- a/crates/settings_ui/src/components/font_picker.rs
+++ /dev/null
@@ -1,181 +0,0 @@
-use std::sync::Arc;
-
-use fuzzy::{StringMatch, StringMatchCandidate};
-use gpui::{AnyElement, App, Context, DismissEvent, SharedString, Task, Window};
-use picker::{Picker, PickerDelegate};
-use theme::FontFamilyCache;
-use ui::{ListItem, ListItemSpacing, prelude::*};
-
-type FontPicker = Picker<FontPickerDelegate>;
-
-pub struct FontPickerDelegate {
-    fonts: Vec<SharedString>,
-    filtered_fonts: Vec<StringMatch>,
-    selected_index: usize,
-    current_font: SharedString,
-    on_font_changed: Arc<dyn Fn(SharedString, &mut App) + 'static>,
-}
-
-impl FontPickerDelegate {
-    fn new(
-        current_font: SharedString,
-        on_font_changed: impl Fn(SharedString, &mut App) + 'static,
-        cx: &mut Context<FontPicker>,
-    ) -> Self {
-        let font_family_cache = FontFamilyCache::global(cx);
-
-        let fonts = font_family_cache
-            .try_list_font_families()
-            .unwrap_or_else(|| vec![current_font.clone()]);
-        let selected_index = fonts
-            .iter()
-            .position(|font| *font == current_font)
-            .unwrap_or(0);
-
-        let filtered_fonts = fonts
-            .iter()
-            .enumerate()
-            .map(|(index, font)| StringMatch {
-                candidate_id: index,
-                string: font.to_string(),
-                positions: Vec::new(),
-                score: 0.0,
-            })
-            .collect();
-
-        Self {
-            fonts,
-            filtered_fonts,
-            selected_index,
-            current_font,
-            on_font_changed: Arc::new(on_font_changed),
-        }
-    }
-}
-
-impl PickerDelegate for FontPickerDelegate {
-    type ListItem = AnyElement;
-
-    fn match_count(&self) -> usize {
-        self.filtered_fonts.len()
-    }
-
-    fn selected_index(&self) -> usize {
-        self.selected_index
-    }
-
-    fn set_selected_index(&mut self, ix: usize, _: &mut Window, cx: &mut Context<FontPicker>) {
-        self.selected_index = ix.min(self.filtered_fonts.len().saturating_sub(1));
-        cx.notify();
-    }
-
-    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
-        "Search fonts…".into()
-    }
-
-    fn update_matches(
-        &mut self,
-        query: String,
-        _window: &mut Window,
-        cx: &mut Context<FontPicker>,
-    ) -> Task<()> {
-        let fonts = self.fonts.clone();
-        let current_font = self.current_font.clone();
-
-        let matches: Vec<StringMatch> = if query.is_empty() {
-            fonts
-                .iter()
-                .enumerate()
-                .map(|(index, font)| StringMatch {
-                    candidate_id: index,
-                    string: font.to_string(),
-                    positions: Vec::new(),
-                    score: 0.0,
-                })
-                .collect()
-        } else {
-            let _candidates: Vec<StringMatchCandidate> = fonts
-                .iter()
-                .enumerate()
-                .map(|(id, font)| StringMatchCandidate::new(id, font.as_ref()))
-                .collect();
-
-            fonts
-                .iter()
-                .enumerate()
-                .filter(|(_, font)| font.to_lowercase().contains(&query.to_lowercase()))
-                .map(|(index, font)| StringMatch {
-                    candidate_id: index,
-                    string: font.to_string(),
-                    positions: Vec::new(),
-                    score: 0.0,
-                })
-                .collect()
-        };
-
-        let selected_index = if query.is_empty() {
-            fonts
-                .iter()
-                .position(|font| *font == current_font)
-                .unwrap_or(0)
-        } else {
-            matches
-                .iter()
-                .position(|m| fonts[m.candidate_id] == current_font)
-                .unwrap_or(0)
-        };
-
-        self.filtered_fonts = matches;
-        self.selected_index = selected_index;
-        cx.notify();
-
-        Task::ready(())
-    }
-
-    fn confirm(&mut self, _secondary: bool, _window: &mut Window, cx: &mut Context<FontPicker>) {
-        if let Some(font_match) = self.filtered_fonts.get(self.selected_index) {
-            let font = font_match.string.clone();
-            (self.on_font_changed)(font.into(), cx);
-        }
-    }
-
-    fn dismissed(&mut self, window: &mut Window, cx: &mut Context<FontPicker>) {
-        cx.defer_in(window, |picker, window, cx| {
-            picker.set_query("", window, cx);
-        });
-        cx.emit(DismissEvent);
-    }
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        _window: &mut Window,
-        _cx: &mut Context<FontPicker>,
-    ) -> Option<Self::ListItem> {
-        let font_match = self.filtered_fonts.get(ix)?;
-
-        Some(
-            ListItem::new(ix)
-                .inset(true)
-                .spacing(ListItemSpacing::Sparse)
-                .toggle_state(selected)
-                .child(Label::new(font_match.string.clone()))
-                .into_any_element(),
-        )
-    }
-}
-
-pub fn font_picker(
-    current_font: SharedString,
-    on_font_changed: impl Fn(SharedString, &mut App) + 'static,
-    window: &mut Window,
-    cx: &mut Context<FontPicker>,
-) -> FontPicker {
-    let delegate = FontPickerDelegate::new(current_font, on_font_changed, cx);
-
-    Picker::uniform_list(delegate, window, cx)
-        .show_scrollbar(true)
-        .width(rems_from_px(210.))
-        .max_height(Some(rems(18.).into()))
-}
diff --git a/crates/settings_ui/src/components/icon_theme_picker.rs b/crates/settings_ui/src/components/icon_theme_picker.rs
deleted file mode 100644
index 33a648f81b..0000000000
--- a/crates/settings_ui/src/components/icon_theme_picker.rs
+++ /dev/null
@@ -1,189 +0,0 @@
-use std::sync::Arc;
-
-use fuzzy::{StringMatch, StringMatchCandidate};
-use gpui::{AnyElement, App, Context, DismissEvent, SharedString, Task, Window};
-use picker::{Picker, PickerDelegate};
-use theme::ThemeRegistry;
-use ui::{ListItem, ListItemSpacing, prelude::*};
-
-type IconThemePicker = Picker<IconThemePickerDelegate>;
-
-pub struct IconThemePickerDelegate {
-    icon_themes: Vec<SharedString>,
-    filtered_themes: Vec<StringMatch>,
-    selected_index: usize,
-    current_theme: SharedString,
-    on_theme_changed: Arc<dyn Fn(SharedString, &mut App) + 'static>,
-}
-
-impl IconThemePickerDelegate {
-    fn new(
-        current_theme: SharedString,
-        on_theme_changed: impl Fn(SharedString, &mut App) + 'static,
-        cx: &mut Context<IconThemePicker>,
-    ) -> Self {
-        let theme_registry = ThemeRegistry::global(cx);
-
-        let icon_themes: Vec<SharedString> = theme_registry
-            .list_icon_themes()
-            .into_iter()
-            .map(|theme_meta| theme_meta.name)
-            .collect();
-
-        let selected_index = icon_themes
-            .iter()
-            .position(|icon_themes| *icon_themes == current_theme)
-            .unwrap_or(0);
-
-        let filtered_themes = icon_themes
-            .iter()
-            .enumerate()
-            .map(|(index, icon_themes)| StringMatch {
-                candidate_id: index,
-                string: icon_themes.to_string(),
-                positions: Vec::new(),
-                score: 0.0,
-            })
-            .collect();
-
-        Self {
-            icon_themes,
-            filtered_themes,
-            selected_index,
-            current_theme,
-            on_theme_changed: Arc::new(on_theme_changed),
-        }
-    }
-}
-
-impl PickerDelegate for IconThemePickerDelegate {
-    type ListItem = AnyElement;
-
-    fn match_count(&self) -> usize {
-        self.filtered_themes.len()
-    }
-
-    fn selected_index(&self) -> usize {
-        self.selected_index
-    }
-
-    fn set_selected_index(&mut self, ix: usize, _: &mut Window, cx: &mut Context<IconThemePicker>) {
-        self.selected_index = ix.min(self.filtered_themes.len().saturating_sub(1));
-        cx.notify();
-    }
-
-    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
-        "Search icon theme…".into()
-    }
-
-    fn update_matches(
-        &mut self,
-        query: String,
-        _window: &mut Window,
-        cx: &mut Context<IconThemePicker>,
-    ) -> Task<()> {
-        let icon_themes = self.icon_themes.clone();
-        let current_theme = self.current_theme.clone();
-
-        let matches: Vec<StringMatch> = if query.is_empty() {
-            icon_themes
-                .iter()
-                .enumerate()
-                .map(|(index, icon_theme)| StringMatch {
-                    candidate_id: index,
-                    string: icon_theme.to_string(),
-                    positions: Vec::new(),
-                    score: 0.0,
-                })
-                .collect()
-        } else {
-            let _candidates: Vec<StringMatchCandidate> = icon_themes
-                .iter()
-                .enumerate()
-                .map(|(id, icon_theme)| StringMatchCandidate::new(id, icon_theme.as_ref()))
-                .collect();
-
-            icon_themes
-                .iter()
-                .enumerate()
-                .filter(|(_, icon_theme)| icon_theme.to_lowercase().contains(&query.to_lowercase()))
-                .map(|(index, icon_theme)| StringMatch {
-                    candidate_id: index,
-                    string: icon_theme.to_string(),
-                    positions: Vec::new(),
-                    score: 0.0,
-                })
-                .collect()
-        };
-
-        let selected_index = if query.is_empty() {
-            icon_themes
-                .iter()
-                .position(|icon_theme| *icon_theme == current_theme)
-                .unwrap_or(0)
-        } else {
-            matches
-                .iter()
-                .position(|m| icon_themes[m.candidate_id] == current_theme)
-                .unwrap_or(0)
-        };
-
-        self.filtered_themes = matches;
-        self.selected_index = selected_index;
-        cx.notify();
-
-        Task::ready(())
-    }
-
-    fn confirm(
-        &mut self,
-        _secondary: bool,
-        _window: &mut Window,
-        cx: &mut Context<IconThemePicker>,
-    ) {
-        if let Some(theme_match) = self.filtered_themes.get(self.selected_index) {
-            let theme = theme_match.string.clone();
-            (self.on_theme_changed)(theme.into(), cx);
-        }
-    }
-
-    fn dismissed(&mut self, window: &mut Window, cx: &mut Context<IconThemePicker>) {
-        cx.defer_in(window, |picker, window, cx| {
-            picker.set_query("", window, cx);
-        });
-        cx.emit(DismissEvent);
-    }
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        _window: &mut Window,
-        _cx: &mut Context<IconThemePicker>,
-    ) -> Option<Self::ListItem> {
-        let theme_match = self.filtered_themes.get(ix)?;
-
-        Some(
-            ListItem::new(ix)
-                .inset(true)
-                .spacing(ListItemSpacing::Sparse)
-                .toggle_state(selected)
-                .child(Label::new(theme_match.string.clone()))
-                .into_any_element(),
-        )
-    }
-}
-
-pub fn icon_theme_picker(
-    current_theme: SharedString,
-    on_theme_changed: impl Fn(SharedString, &mut App) + 'static,
-    window: &mut Window,
-    cx: &mut Context<IconThemePicker>,
-) -> IconThemePicker {
-    let delegate = IconThemePickerDelegate::new(current_theme, on_theme_changed, cx);
-
-    Picker::uniform_list(delegate, window, cx)
-        .show_scrollbar(true)
-        .width(rems_from_px(210.))
-        .max_height(Some(rems(18.).into()))
-}
diff --git a/crates/settings_ui/src/components/input_field.rs b/crates/settings_ui/src/components/input_field.rs
deleted file mode 100644
index 57917c3211..0000000000
--- a/crates/settings_ui/src/components/input_field.rs
+++ /dev/null
@@ -1,96 +0,0 @@
-use editor::Editor;
-use gpui::{Focusable, div};
-use ui::{
-    ActiveTheme as _, App, FluentBuilder as _, InteractiveElement as _, IntoElement,
-    ParentElement as _, RenderOnce, Styled as _, Window,
-};
-
-#[derive(IntoElement)]
-pub struct SettingsInputField {
-    initial_text: Option<String>,
-    placeholder: Option<&'static str>,
-    confirm: Option<Box<dyn Fn(Option<String>, &mut App)>>,
-    tab_index: Option<isize>,
-}
-
-impl SettingsInputField {
-    pub fn new() -> Self {
-        Self {
-            initial_text: None,
-            placeholder: None,
-            confirm: None,
-            tab_index: None,
-        }
-    }
-
-    pub fn with_initial_text(mut self, initial_text: String) -> Self {
-        self.initial_text = Some(initial_text);
-        self
-    }
-
-    pub fn with_placeholder(mut self, placeholder: &'static str) -> Self {
-        self.placeholder = Some(placeholder);
-        self
-    }
-
-    pub fn on_confirm(mut self, confirm: impl Fn(Option<String>, &mut App) + 'static) -> Self {
-        self.confirm = Some(Box::new(confirm));
-        self
-    }
-
-    pub(crate) fn tab_index(mut self, arg: isize) -> Self {
-        self.tab_index = Some(arg);
-        self
-    }
-}
-
-impl RenderOnce for SettingsInputField {
-    fn render(self, window: &mut Window, cx: &mut App) -> impl ui::IntoElement {
-        let editor = window.use_state(cx, {
-            move |window, cx| {
-                let mut editor = Editor::single_line(window, cx);
-                if let Some(text) = self.initial_text {
-                    editor.set_text(text, window, cx);
-                }
-
-                if let Some(placeholder) = self.placeholder {
-                    editor.set_placeholder_text(placeholder, window, cx);
-                }
-                // todo(settings_ui): We should have an observe global use for settings store
-                // so whenever a settings file is updated, the settings ui updates too
-                editor
-            }
-        });
-
-        let weak_editor = editor.downgrade();
-
-        let theme_colors = cx.theme().colors();
-
-        div()
-            .py_1()
-            .px_2()
-            .min_w_64()
-            .rounded_md()
-            .border_1()
-            .border_color(theme_colors.border)
-            .bg(theme_colors.editor_background)
-            .when_some(self.tab_index, |this, tab_index| {
-                let focus_handle = editor.focus_handle(cx).tab_index(tab_index).tab_stop(true);
-                this.track_focus(&focus_handle)
-                    .focus(|s| s.border_color(theme_colors.border_focused))
-            })
-            .child(editor)
-            .when_some(self.confirm, |this, confirm| {
-                this.on_action::<menu::Confirm>({
-                    move |_, _, cx| {
-                        let Some(editor) = weak_editor.upgrade() else {
-                            return;
-                        };
-                        let new_value = editor.read_with(cx, |editor, cx| editor.text(cx));
-                        let new_value = (!new_value.is_empty()).then_some(new_value);
-                        confirm(new_value, cx);
-                    }
-                })
-            })
-    }
-}
diff --git a/crates/settings_ui/src/components/theme_picker.rs b/crates/settings_ui/src/components/theme_picker.rs
deleted file mode 100644
index 2146ab314f..0000000000
--- a/crates/settings_ui/src/components/theme_picker.rs
+++ /dev/null
@@ -1,179 +0,0 @@
-use std::sync::Arc;
-
-use fuzzy::{StringMatch, StringMatchCandidate};
-use gpui::{AnyElement, App, Context, DismissEvent, SharedString, Task, Window};
-use picker::{Picker, PickerDelegate};
-use theme::ThemeRegistry;
-use ui::{ListItem, ListItemSpacing, prelude::*};
-
-type ThemePicker = Picker<ThemePickerDelegate>;
-
-pub struct ThemePickerDelegate {
-    themes: Vec<SharedString>,
-    filtered_themes: Vec<StringMatch>,
-    selected_index: usize,
-    current_theme: SharedString,
-    on_theme_changed: Arc<dyn Fn(SharedString, &mut App) + 'static>,
-}
-
-impl ThemePickerDelegate {
-    fn new(
-        current_theme: SharedString,
-        on_theme_changed: impl Fn(SharedString, &mut App) + 'static,
-        cx: &mut Context<ThemePicker>,
-    ) -> Self {
-        let theme_registry = ThemeRegistry::global(cx);
-
-        let themes = theme_registry.list_names();
-        let selected_index = themes
-            .iter()
-            .position(|theme| *theme == current_theme)
-            .unwrap_or(0);
-
-        let filtered_themes = themes
-            .iter()
-            .enumerate()
-            .map(|(index, theme)| StringMatch {
-                candidate_id: index,
-                string: theme.to_string(),
-                positions: Vec::new(),
-                score: 0.0,
-            })
-            .collect();
-
-        Self {
-            themes,
-            filtered_themes,
-            selected_index,
-            current_theme,
-            on_theme_changed: Arc::new(on_theme_changed),
-        }
-    }
-}
-
-impl PickerDelegate for ThemePickerDelegate {
-    type ListItem = AnyElement;
-
-    fn match_count(&self) -> usize {
-        self.filtered_themes.len()
-    }
-
-    fn selected_index(&self) -> usize {
-        self.selected_index
-    }
-
-    fn set_selected_index(&mut self, ix: usize, _: &mut Window, cx: &mut Context<ThemePicker>) {
-        self.selected_index = ix.min(self.filtered_themes.len().saturating_sub(1));
-        cx.notify();
-    }
-
-    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
-        "Search theme…".into()
-    }
-
-    fn update_matches(
-        &mut self,
-        query: String,
-        _window: &mut Window,
-        cx: &mut Context<ThemePicker>,
-    ) -> Task<()> {
-        let themes = self.themes.clone();
-        let current_theme = self.current_theme.clone();
-
-        let matches: Vec<StringMatch> = if query.is_empty() {
-            themes
-                .iter()
-                .enumerate()
-                .map(|(index, theme)| StringMatch {
-                    candidate_id: index,
-                    string: theme.to_string(),
-                    positions: Vec::new(),
-                    score: 0.0,
-                })
-                .collect()
-        } else {
-            let _candidates: Vec<StringMatchCandidate> = themes
-                .iter()
-                .enumerate()
-                .map(|(id, theme)| StringMatchCandidate::new(id, theme.as_ref()))
-                .collect();
-
-            themes
-                .iter()
-                .enumerate()
-                .filter(|(_, theme)| theme.to_lowercase().contains(&query.to_lowercase()))
-                .map(|(index, theme)| StringMatch {
-                    candidate_id: index,
-                    string: theme.to_string(),
-                    positions: Vec::new(),
-                    score: 0.0,
-                })
-                .collect()
-        };
-
-        let selected_index = if query.is_empty() {
-            themes
-                .iter()
-                .position(|theme| *theme == current_theme)
-                .unwrap_or(0)
-        } else {
-            matches
-                .iter()
-                .position(|m| themes[m.candidate_id] == current_theme)
-                .unwrap_or(0)
-        };
-
-        self.filtered_themes = matches;
-        self.selected_index = selected_index;
-        cx.notify();
-
-        Task::ready(())
-    }
-
-    fn confirm(&mut self, _secondary: bool, _window: &mut Window, cx: &mut Context<ThemePicker>) {
-        if let Some(theme_match) = self.filtered_themes.get(self.selected_index) {
-            let theme = theme_match.string.clone();
-            (self.on_theme_changed)(theme.into(), cx);
-        }
-    }
-
-    fn dismissed(&mut self, window: &mut Window, cx: &mut Context<ThemePicker>) {
-        cx.defer_in(window, |picker, window, cx| {
-            picker.set_query("", window, cx);
-        });
-        cx.emit(DismissEvent);
-    }
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        _window: &mut Window,
-        _cx: &mut Context<ThemePicker>,
-    ) -> Option<Self::ListItem> {
-        let theme_match = self.filtered_themes.get(ix)?;
-
-        Some(
-            ListItem::new(ix)
-                .inset(true)
-                .spacing(ListItemSpacing::Sparse)
-                .toggle_state(selected)
-                .child(Label::new(theme_match.string.clone()))
-                .into_any_element(),
-        )
-    }
-}
-
-pub fn theme_picker(
-    current_theme: SharedString,
-    on_theme_changed: impl Fn(SharedString, &mut App) + 'static,
-    window: &mut Window,
-    cx: &mut Context<ThemePicker>,
-) -> ThemePicker {
-    let delegate = ThemePickerDelegate::new(current_theme, on_theme_changed, cx);
-
-    Picker::uniform_list(delegate, window, cx)
-        .show_scrollbar(true)
-        .width(rems_from_px(210.))
-        .max_height(Some(rems(18.).into()))
-}
diff --git a/crates/settings_ui/src/page_data.rs b/crates/settings_ui/src/page_data.rs
deleted file mode 100644
index 8652ccf68b..0000000000
--- a/crates/settings_ui/src/page_data.rs
+++ /dev/null
@@ -1,7549 +0,0 @@
-use gpui::App;
-use settings::{LanguageSettingsContent, SettingsContent};
-use std::sync::Arc;
-use strum::IntoDiscriminant as _;
-use ui::{IntoElement, SharedString};
-
-use crate::{
-    DynamicItem, PROJECT, SettingField, SettingItem, SettingsFieldMetadata, SettingsPage,
-    SettingsPageItem, SubPageLink, USER, all_language_names, sub_page_stack,
-};
-
-const DEFAULT_STRING: String = String::new();
-/// A default empty string reference. Useful in `pick` functions for cases either in dynamic item fields, or when dealing with `settings::Maybe`
-/// to avoid the "NO DEFAULT" case.
-const DEFAULT_EMPTY_STRING: Option<&String> = Some(&DEFAULT_STRING);
-
-const DEFAULT_SHARED_STRING: SharedString = SharedString::new_static("");
-/// A default empty string reference. Useful in `pick` functions for cases either in dynamic item fields, or when dealing with `settings::Maybe`
-/// to avoid the "NO DEFAULT" case.
-const DEFAULT_EMPTY_SHARED_STRING: Option<&SharedString> = Some(&DEFAULT_SHARED_STRING);
-
-pub(crate) fn settings_data(cx: &App) -> Vec<SettingsPage> {
-    vec![
-        SettingsPage {
-            title: "General",
-            items: vec![
-                SettingsPageItem::SectionHeader("General Settings"),
-                SettingsPageItem::SettingItem(SettingItem {
-                    files: PROJECT,
-                    title: "Project Name",
-                    description: "The displayed name of this project. If left empty, the root directory name will be displayed.",
-                    field: Box::new(
-                        SettingField {
-                            json_path: Some("project_name"),
-                            pick: |settings_content| {
-                                settings_content.project.worktree.project_name.as_ref().or(DEFAULT_EMPTY_STRING)
-                            },
-                            write: |settings_content, value| {
-                                settings_content.project.worktree.project_name = value.filter(|name| !name.is_empty());
-                            },
-                        }
-                    ),
-                    metadata: Some(Box::new(SettingsFieldMetadata { placeholder: Some("Project Name"), ..Default::default() })),
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "When Closing With No Tabs",
-                    description: "What to do when using the 'close active item' action with no tabs.",
-                    field: Box::new(SettingField {
-                        json_path: Some("when_closing_with_no_tabs"),
-                        pick: |settings_content| {
-                            settings_content
-                                .workspace
-                                .when_closing_with_no_tabs
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content.workspace.when_closing_with_no_tabs = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "On Last Window Closed",
-                    description: "What to do when the last window is closed.",
-                    field: Box::new(SettingField {
-                        json_path: Some("on_last_window_closed"),
-                        pick: |settings_content| {
-                            settings_content.workspace.on_last_window_closed.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content.workspace.on_last_window_closed = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Use System Path Prompts",
-                    description: "Use native OS dialogs for 'Open' and 'Save As'.",
-                    field: Box::new(SettingField {
-                        json_path: Some("use_system_path_prompts"),
-                        pick: |settings_content| {
-                            settings_content.workspace.use_system_path_prompts.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content.workspace.use_system_path_prompts = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Use System Prompts",
-                    description: "Use native OS dialogs for confirmations.",
-                    field: Box::new(SettingField {
-                        json_path: Some("use_system_prompts"),
-                        pick: |settings_content| {
-                            settings_content.workspace.use_system_prompts.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content.workspace.use_system_prompts = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Redact Private Values",
-                    description: "Hide the values of variables in private files.",
-                    field: Box::new(SettingField {
-                        json_path: Some("redact_private_values"),
-                        pick: |settings_content| {
-                            settings_content.editor.redact_private_values.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content.editor.redact_private_values = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Private Files",
-                    description: "Globs to match against file paths to determine if a file is private.",
-                    field: Box::new(
-                        SettingField {
-                            json_path: Some("worktree.private_files"),
-                            pick: |settings_content| {
-                                settings_content.project.worktree.private_files.as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content.project.worktree.private_files = value;
-                            },
-                        }
-                        .unimplemented(),
-                    ),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SectionHeader("Workspace Restoration"),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Restore Unsaved Buffers",
-                    description: "Whether or not to restore unsaved buffers on restart.",
-                    field: Box::new(SettingField {
-                        json_path: Some("session.restore_unsaved_buffers"),
-                        pick: |settings_content| {
-                            settings_content
-                                .session
-                                .as_ref()
-                                .and_then(|session| session.restore_unsaved_buffers.as_ref())
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .session
-                                .get_or_insert_default()
-                                .restore_unsaved_buffers = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Restore On Startup",
-                    description: "What to restore from the previous session when opening Zed.",
-                    field: Box::new(SettingField {
-                        json_path: Some("restore_on_startup"),
-                        pick: |settings_content| {
-                            settings_content.workspace.restore_on_startup.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content.workspace.restore_on_startup = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SectionHeader("Scoped Settings"),
-                SettingsPageItem::SettingItem(SettingItem {
-                    files: USER,
-                    title: "Preview Channel",
-                    description: "Which settings should be activated only in Preview build of Zed.",
-                    field: Box::new(
-                        SettingField {
-                            json_path: Some("preview_channel_settings"),
-                            pick: |settings_content| {
-                                Some(settings_content)
-                            },
-                            write: |_settings_content, _value| {
-
-                            },
-                        }
-                        .unimplemented(),
-                    ),
-                    metadata: None,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    files: USER,
-                    title: "Settings Profiles",
-                    description: "Any number of settings profiles that are temporarily applied on top of your existing user settings.",
-                    field: Box::new(
-                        SettingField {
-                            json_path: Some("settings_profiles"),
-                            pick: |settings_content| {
-                                Some(settings_content)
-                            },
-                            write: |_settings_content, _value| {
-                            },
-                        }
-                        .unimplemented(),
-                    ),
-                    metadata: None,
-                }),
-                SettingsPageItem::SectionHeader("Privacy"),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Telemetry Diagnostics",
-                    description: "Send debug information like crash reports.",
-                    field: Box::new(SettingField {
-                        json_path: Some("telemetry.diagnostics"),
-                        pick: |settings_content| {
-                            settings_content
-                                .telemetry
-                                .as_ref()
-                                .and_then(|telemetry| telemetry.diagnostics.as_ref())
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .telemetry
-                                .get_or_insert_default()
-                                .diagnostics = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Telemetry Metrics",
-                    description: "Send anonymized usage data like what languages you're using Zed with.",
-                    field: Box::new(SettingField {
-                        json_path: Some("telemetry.metrics"),
-                        pick: |settings_content| {
-                            settings_content
-                                .telemetry
-                                .as_ref()
-                                .and_then(|telemetry| telemetry.metrics.as_ref())
-                        },
-                        write: |settings_content, value| {
-                            settings_content.telemetry.get_or_insert_default().metrics = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SectionHeader("Auto Update"),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Auto Update",
-                    description: "Whether or not to automatically check for updates.",
-                    field: Box::new(SettingField {
-                        json_path: Some("auto_update"),
-                        pick: |settings_content| settings_content.auto_update.as_ref(),
-                        write: |settings_content, value| {
-                            settings_content.auto_update = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-            ],
-        },
-        SettingsPage {
-            title: "Appearance",
-            items: vec![
-                SettingsPageItem::SectionHeader("Theme"),
-                SettingsPageItem::DynamicItem(DynamicItem {
-                    discriminant: SettingItem {
-                        files: USER,
-                        title: "Theme Mode",
-                        description: "Choose a static, fixed theme or dynamically select themes based on appearance and light/dark modes.",
-                        field: Box::new(SettingField {
-                            json_path: Some("theme$"),
-                            pick: |settings_content| {
-                                Some(&dynamic_variants::<settings::ThemeSelection>()[
-                                    settings_content
-                                        .theme
-                                        .theme
-                                        .as_ref()?
-                                        .discriminant() as usize])
-                            },
-                            write: |settings_content, value| {
-                                let Some(value) = value else {
-                                    settings_content.theme.theme = None;
-                                    return;
-                                };
-                                let settings_value = settings_content.theme.theme.get_or_insert_with(|| {
-                                    settings::ThemeSelection::Static(theme::ThemeName(theme::default_theme(theme::SystemAppearance::default().0).into()))
-                                });
-                                *settings_value = match value {
-                                    settings::ThemeSelectionDiscriminants::Static => {
-                                        let name = match settings_value {
-                                            settings::ThemeSelection::Static(_) => return,
-                                            settings::ThemeSelection::Dynamic { mode, light, dark } => {
-                                                match mode {
-                                                    theme::ThemeAppearanceMode::Light => light.clone(),
-                                                    theme::ThemeAppearanceMode::Dark => dark.clone(),
-                                                    theme::ThemeAppearanceMode::System => dark.clone(), // no cx, can't determine correct choice
-                                                }
-                                            },
-                                        };
-                                        settings::ThemeSelection::Static(name)
-                                    },
-                                    settings::ThemeSelectionDiscriminants::Dynamic => {
-                                        let static_name = match settings_value {
-                                            settings::ThemeSelection::Static(theme_name) => theme_name.clone(),
-                                            settings::ThemeSelection::Dynamic {..} => return,
-                                        };
-
-                                        settings::ThemeSelection::Dynamic {
-                                            mode: settings::ThemeAppearanceMode::System,
-                                            light: static_name.clone(),
-                                            dark: static_name,
-                                        }
-                                    },
-                                };
-                            },
-                        }),
-                        metadata: None,
-                    },
-                    pick_discriminant: |settings_content| {
-                        Some(settings_content.theme.theme.as_ref()?.discriminant() as usize)
-                    },
-                    fields: dynamic_variants::<settings::ThemeSelection>().into_iter().map(|variant| {
-                        match variant {
-                            settings::ThemeSelectionDiscriminants::Static => vec![
-                                SettingItem {
-                                    files: USER,
-                                    title: "Theme Name",
-                                    description: "The name of your selected theme.",
-                                    field: Box::new(SettingField {
-                                        json_path: Some("theme"),
-                                        pick: |settings_content| {
-                                            match settings_content.theme.theme.as_ref() {
-                                                Some(settings::ThemeSelection::Static(name)) => Some(name),
-                                                _ => None
-                                            }
-                                        },
-                                        write: |settings_content, value| {
-                                            let Some(value) = value else {
-                                                return;
-                                            };
-                                            match settings_content
-                                                .theme
-                                                .theme.as_mut() {
-                                                    Some(settings::ThemeSelection::Static(theme_name)) => *theme_name = value,
-                                                    _ => return
-                                                }
-                                        },
-                                    }),
-                                    metadata: None,
-                                }
-                            ],
-                            settings::ThemeSelectionDiscriminants::Dynamic => vec![
-                                SettingItem {
-                                    files: USER,
-                                    title: "Mode",
-                                    description: "Choose whether to use the selected light or dark theme or to follow your OS appearance configuration.",
-                                    field: Box::new(SettingField {
-                                        json_path: Some("theme.mode"),
-                                        pick: |settings_content| {
-                                            match settings_content.theme.theme.as_ref() {
-                                                Some(settings::ThemeSelection::Dynamic { mode, ..}) => Some(mode),
-                                                _ => None
-                                            }
-                                        },
-                                        write: |settings_content, value| {
-                                            let Some(value) = value else {
-                                                return;
-                                            };
-                                            match settings_content
-                                                .theme
-                                                .theme.as_mut() {
-                                                    Some(settings::ThemeSelection::Dynamic{ mode, ..}) => *mode = value,
-                                                    _ => return
-                                                }
-                                        },
-                                    }),
-                                    metadata: None,
-                                },
-                                SettingItem {
-                                    files: USER,
-                                    title: "Light Theme",
-                                    description: "The theme to use when mode is set to light, or when mode is set to system and it is in light mode.",
-                                    field: Box::new(SettingField {
-                                        json_path: Some("theme.light"),
-                                        pick: |settings_content| {
-                                            match settings_content.theme.theme.as_ref() {
-                                                Some(settings::ThemeSelection::Dynamic { light, ..}) => Some(light),
-                                                _ => None
-                                            }
-                                        },
-                                        write: |settings_content, value| {
-                                            let Some(value) = value else {
-                                                return;
-                                            };
-                                            match settings_content
-                                                .theme
-                                                .theme.as_mut() {
-                                                    Some(settings::ThemeSelection::Dynamic{ light, ..}) => *light = value,
-                                                    _ => return
-                                                }
-                                        },
-                                    }),
-                                    metadata: None,
-                                },
-                                SettingItem {
-                                    files: USER,
-                                    title: "Dark Theme",
-                                    description: "The theme to use when mode is set to dark, or when mode is set to system and it is in dark mode.",
-                                    field: Box::new(SettingField {
-                                        json_path: Some("theme.dark"),
-                                        pick: |settings_content| {
-                                            match settings_content.theme.theme.as_ref() {
-                                                Some(settings::ThemeSelection::Dynamic { dark, ..}) => Some(dark),
-                                                _ => None
-                                            }
-                                        },
-                                        write: |settings_content, value| {
-                                            let Some(value) = value else {
-                                                return;
-                                            };
-                                            match settings_content
-                                                .theme
-                                                .theme.as_mut() {
-                                                    Some(settings::ThemeSelection::Dynamic{ dark, ..}) => *dark = value,
-                                                    _ => return
-                                                }
-                                        },
-                                    }),
-                                    metadata: None,
-                                }
-                            ],
-                        }
-                    }).collect(),
-                }),
-                SettingsPageItem::DynamicItem(DynamicItem {
-                    discriminant: SettingItem {
-                        files: USER,
-                        title: "Icon Theme",
-                        description: "The custom set of icons Zed will associate with files and directories.",
-                        field: Box::new(SettingField {
-                            json_path: Some("icon_theme$"),
-                            pick: |settings_content| {
-                                Some(&dynamic_variants::<settings::IconThemeSelection>()[
-                                    settings_content
-                                        .theme
-                                        .icon_theme
-                                        .as_ref()?
-                                        .discriminant() as usize])
-                            },
-                            write: |settings_content, value| {
-                                let Some(value) = value else {
-                                    settings_content.theme.icon_theme = None;
-                                    return;
-                                };
-                                let settings_value = settings_content.theme.icon_theme.get_or_insert_with(|| {
-                                    settings::IconThemeSelection::Static(settings::IconThemeName(theme::default_icon_theme().name.clone().into()))
-                                });
-                                *settings_value = match value {
-                                    settings::IconThemeSelectionDiscriminants::Static => {
-                                        let name = match settings_value {
-                                            settings::IconThemeSelection::Static(_) => return,
-                                            settings::IconThemeSelection::Dynamic { mode, light, dark } => {
-                                                match mode {
-                                                    theme::ThemeAppearanceMode::Light => light.clone(),
-                                                    theme::ThemeAppearanceMode::Dark => dark.clone(),
-                                                    theme::ThemeAppearanceMode::System => dark.clone(), // no cx, can't determine correct choice
-                                                }
-                                            },
-                                        };
-                                        settings::IconThemeSelection::Static(name)
-                                    },
-                                    settings::IconThemeSelectionDiscriminants::Dynamic => {
-                                        let static_name = match settings_value {
-                                            settings::IconThemeSelection::Static(theme_name) => theme_name.clone(),
-                                            settings::IconThemeSelection::Dynamic {..} => return,
-                                        };
-
-                                        settings::IconThemeSelection::Dynamic {
-                                            mode: settings::ThemeAppearanceMode::System,
-                                            light: static_name.clone(),
-                                            dark: static_name,
-                                        }
-                                    },
-                                };
-                            },
-                        }),
-                        metadata: None,
-                    },
-                    pick_discriminant: |settings_content| {
-                        Some(settings_content.theme.icon_theme.as_ref()?.discriminant() as usize)
-                    },
-                    fields: dynamic_variants::<settings::IconThemeSelection>().into_iter().map(|variant| {
-                        match variant {
-                            settings::IconThemeSelectionDiscriminants::Static => vec![
-                                SettingItem {
-                                    files: USER,
-                                    title: "Icon Theme Name",
-                                    description: "The name of your selected icon theme.",
-                                    field: Box::new(SettingField {
-                                        json_path: Some("icon_theme$string"),
-                                        pick: |settings_content| {
-                                            match settings_content.theme.icon_theme.as_ref() {
-                                                Some(settings::IconThemeSelection::Static(name)) => Some(name),
-                                                _ => None
-                                            }
-                                        },
-                                        write: |settings_content, value| {
-                                            let Some(value) = value else {
-                                                return;
-                                            };
-                                            match settings_content
-                                                .theme
-                                                .icon_theme.as_mut() {
-                                                    Some(settings::IconThemeSelection::Static(theme_name)) => *theme_name = value,
-                                                    _ => return
-                                                }
-                                        },
-                                    }),
-                                    metadata: None,
-                                }
-                            ],
-                            settings::IconThemeSelectionDiscriminants::Dynamic => vec![
-                                SettingItem {
-                                    files: USER,
-                                    title: "Mode",
-                                    description: "Choose whether to use the selected light or dark icon theme or to follow your OS appearance configuration.",
-                                    field: Box::new(SettingField {
-                                        json_path: Some("icon_theme"),
-                                        pick: |settings_content| {
-                                            match settings_content.theme.icon_theme.as_ref() {
-                                                Some(settings::IconThemeSelection::Dynamic { mode, ..}) => Some(mode),
-                                                _ => None
-                                            }
-                                        },
-                                        write: |settings_content, value| {
-                                            let Some(value) = value else {
-                                                return;
-                                            };
-                                            match settings_content
-                                                .theme
-                                                .icon_theme.as_mut() {
-                                                    Some(settings::IconThemeSelection::Dynamic{ mode, ..}) => *mode = value,
-                                                    _ => return
-                                                }
-                                        },
-                                    }),
-                                    metadata: None,
-                                },
-                                SettingItem {
-                                    files: USER,
-                                    title: "Light Icon Theme",
-                                    description: "The icon theme to use when mode is set to light, or when mode is set to system and it is in light mode.",
-                                    field: Box::new(SettingField {
-                                        json_path: Some("icon_theme.light"),
-                                        pick: |settings_content| {
-                                            match settings_content.theme.icon_theme.as_ref() {
-                                                Some(settings::IconThemeSelection::Dynamic { light, ..}) => Some(light),
-                                                _ => None
-                                            }
-                                        },
-                                        write: |settings_content, value| {
-                                            let Some(value) = value else {
-                                                return;
-                                            };
-                                            match settings_content
-                                                .theme
-                                                .icon_theme.as_mut() {
-                                                    Some(settings::IconThemeSelection::Dynamic{ light, ..}) => *light = value,
-                                                    _ => return
-                                                }
-                                        },
-                                    }),
-                                    metadata: None,
-                                },
-                                SettingItem {
-                                    files: USER,
-                                    title: "Dark Icon Theme",
-                                    description: "The icon theme to use when mode is set to dark, or when mode is set to system and it is in dark mode.",
-                                    field: Box::new(SettingField {
-                                        json_path: Some("icon_theme.dark"),
-                                        pick: |settings_content| {
-                                            match settings_content.theme.icon_theme.as_ref() {
-                                                Some(settings::IconThemeSelection::Dynamic { dark, ..}) => Some(dark),
-                                                _ => None
-                                            }
-                                        },
-                                        write: |settings_content, value| {
-                                            let Some(value) = value else {
-                                                return;
-                                            };
-                                            match settings_content
-                                                .theme
-                                                .icon_theme.as_mut() {
-                                                    Some(settings::IconThemeSelection::Dynamic{ dark, ..}) => *dark = value,
-                                                    _ => return
-                                                }
-                                        },
-                                    }),
-                                    metadata: None,
-                                }
-                            ],
-                        }
-                    }).collect(),
-                }),
-                SettingsPageItem::SectionHeader("Buffer Font"),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Font Family",
-                    description: "Font family for editor text.",
-                    field: Box::new(SettingField {
-                        json_path: Some("buffer_font_family"),
-                        pick: |settings_content| settings_content.theme.buffer_font_family.as_ref(),
-                        write: |settings_content, value|{  settings_content.theme.buffer_font_family = value;},
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Font Size",
-                    description: "Font size for editor text.",
-                    field: Box::new(SettingField {
-                        json_path: Some("buffer_font_size"),
-                        pick: |settings_content| settings_content.theme.buffer_font_size.as_ref(),
-                        write: |settings_content, value|{  settings_content.theme.buffer_font_size = value;},
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Font Weight",
-                    description: "Font weight for editor text (100-900).",
-                    field: Box::new(SettingField {
-                        json_path: Some("buffer_font_weight"),
-                        pick: |settings_content| settings_content.theme.buffer_font_weight.as_ref(),
-                        write: |settings_content, value|{  settings_content.theme.buffer_font_weight = value;},
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::DynamicItem(DynamicItem {
-                    discriminant: SettingItem {
-                        files: USER,
-                        title: "Line Height",
-                        description: "Line height for editor text.",
-                        field: Box::new(SettingField {
-                            json_path: Some("buffer_line_height$"),
-                            pick: |settings_content| {
-                                Some(&dynamic_variants::<settings::BufferLineHeight>()[
-                                    settings_content
-                                        .theme
-                                        .buffer_line_height
-                                        .as_ref()?
-                                        .discriminant() as usize])
-                            },
-                            write: |settings_content, value| {
-                                let Some(value) = value else {
-                                    settings_content.theme.buffer_line_height = None;
-                                    return;
-                                };
-                                let settings_value = settings_content.theme.buffer_line_height.get_or_insert_with(|| {
-                                    settings::BufferLineHeight::default()
-                                });
-                                *settings_value = match value {
-                                    settings::BufferLineHeightDiscriminants::Comfortable => {
-                                        settings::BufferLineHeight::Comfortable
-                                    },
-                                    settings::BufferLineHeightDiscriminants::Standard => {
-                                        settings::BufferLineHeight::Standard
-                                    },
-                                    settings::BufferLineHeightDiscriminants::Custom => {
-                                        let custom_value = theme::BufferLineHeight::from(*settings_value).value();
-                                        settings::BufferLineHeight::Custom(custom_value)
-                                    },
-                                };
-                            },
-                        }),
-                        metadata: None,
-                    },
-                    pick_discriminant: |settings_content| {
-                        Some(settings_content.theme.buffer_line_height.as_ref()?.discriminant() as usize)
-                    },
-                    fields: dynamic_variants::<settings::BufferLineHeight>().into_iter().map(|variant| {
-                        match variant {
-                            settings::BufferLineHeightDiscriminants::Comfortable => vec![],
-                            settings::BufferLineHeightDiscriminants::Standard => vec![],
-                            settings::BufferLineHeightDiscriminants::Custom => vec![
-                                SettingItem {
-                                    files: USER,
-                                    title: "Custom Line Height",
-                                    description: "Custom line height value (must be at least 1.0).",
-                                    field: Box::new(SettingField {
-                                        json_path: Some("buffer_line_height"),
-                                        pick: |settings_content| {
-                                            match settings_content.theme.buffer_line_height.as_ref() {
-                                                Some(settings::BufferLineHeight::Custom(value)) => Some(value),
-                                                _ => None
-                                            }
-                                        },
-                                        write: |settings_content, value| {
-                                            let Some(value) = value else {
-                                                return;
-                                            };
-                                            match settings_content
-                                                .theme
-                                                .buffer_line_height.as_mut() {
-                                                    Some(settings::BufferLineHeight::Custom(line_height)) => *line_height = f32::max(value, 1.0),
-                                                    _ => return
-                                                }
-                                        },
-                                    }),
-                                    metadata: None,
-                                }
-                            ],
-                        }
-                    }).collect(),
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    files: USER,
-                    title: "Font Features",
-                    description: "The OpenType features to enable for rendering in text buffers.",
-                    field: Box::new(
-                        SettingField {
-                            json_path: Some("buffer_font_features"),
-                            pick: |settings_content| {
-                                settings_content.theme.buffer_font_features.as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content.theme.buffer_font_features = value;
-
-                            },
-                        }
-                        .unimplemented(),
-                    ),
-                    metadata: None,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    files: USER,
-                    title: "Font Fallbacks",
-                    description: "The font fallbacks to use for rendering in text buffers.",
-                    field: Box::new(
-                        SettingField {
-                            json_path: Some("buffer_font_fallbacks"),
-                            pick: |settings_content| {
-                                settings_content.theme.buffer_font_fallbacks.as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content.theme.buffer_font_fallbacks = value;
-
-                            },
-                        }
-                        .unimplemented(),
-                    ),
-                    metadata: None,
-                }),
-                SettingsPageItem::SectionHeader("UI Font"),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Font Family",
-                    description: "Font family for UI elements.",
-                    field: Box::new(SettingField {
-                        json_path: Some("ui_font_family"),
-                        pick: |settings_content| settings_content.theme.ui_font_family.as_ref(),
-                        write: |settings_content, value|{  settings_content.theme.ui_font_family = value;},
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Font Size",
-                    description: "Font size for UI elements.",
-                    field: Box::new(SettingField {
-                        json_path: Some("ui_font_size"),
-                        pick: |settings_content| settings_content.theme.ui_font_size.as_ref(),
-                        write: |settings_content, value|{  settings_content.theme.ui_font_size = value;},
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Font Weight",
-                    description: "Font weight for UI elements (100-900).",
-                    field: Box::new(SettingField {
-                        json_path: Some("ui_font_weight"),
-                        pick: |settings_content| settings_content.theme.ui_font_weight.as_ref(),
-                        write: |settings_content, value|{  settings_content.theme.ui_font_weight = value;},
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    files: USER,
-                    title: "Font Features",
-                    description: "The OpenType features to enable for rendering in UI elements.",
-                    field: Box::new(
-                        SettingField {
-                            json_path: Some("ui_font_features"),
-                            pick: |settings_content| {
-                                settings_content.theme.ui_font_features.as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content.theme.ui_font_features = value;
-
-                            },
-                        }
-                        .unimplemented(),
-                    ),
-                    metadata: None,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    files: USER,
-                    title: "Font Fallbacks",
-                    description: "The font fallbacks to use for rendering in the UI.",
-                    field: Box::new(
-                        SettingField {
-                            json_path: Some("ui_font_fallbacks"),
-                            pick: |settings_content| {
-                                settings_content.theme.ui_font_fallbacks.as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content.theme.ui_font_fallbacks = value;
-
-                            },
-                        }
-                        .unimplemented(),
-                    ),
-                    metadata: None,
-                }),
-                SettingsPageItem::SectionHeader("Agent Panel Font"),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "UI Font Size",
-                    description: "Font size for agent response text in the agent panel. Falls back to the regular UI font size.",
-                    field: Box::new(SettingField {
-                        json_path: Some("agent_ui_font_size"),
-                        pick: |settings_content| {
-                            settings_content
-                                .theme
-                                .agent_ui_font_size
-                                .as_ref()
-                                .or(settings_content.theme.ui_font_size.as_ref())
-                        },
-                        write: |settings_content, value|{  settings_content.theme.agent_ui_font_size = value;},
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Buffer Font Size",
-                    description: "Font size for user messages text in the agent panel.",
-                    field: Box::new(SettingField {
-                        json_path: Some("agent_buffer_font_size"),
-                        pick: |settings_content| {
-                            settings_content
-                                .theme
-                                .agent_buffer_font_size
-                                .as_ref()
-                                .or(settings_content.theme.buffer_font_size.as_ref())
-                        },
-                        write: |settings_content, value| {
-                            settings_content.theme.agent_buffer_font_size = value;
-
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SectionHeader("Cursor"),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Multi Cursor Modifier",
-                    description: "Modifier key for adding multiple cursors.",
-                    field: Box::new(SettingField {
-                        json_path: Some("multi_cursor_modifier"),
-                        pick: |settings_content| {
-                            settings_content.editor.multi_cursor_modifier.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content.editor.multi_cursor_modifier = value;
-
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Cursor Blink",
-                    description: "Whether the cursor blinks in the editor.",
-                    field: Box::new(SettingField {
-                        json_path: Some("cursor_blink"),
-                        pick: |settings_content| settings_content.editor.cursor_blink.as_ref(),
-                        write: |settings_content, value|{  settings_content.editor.cursor_blink = value;},
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Cursor Shape",
-                    description: "Cursor shape for the editor.",
-                    field: Box::new(SettingField {
-                        json_path: Some("cursor_shape"),
-                        pick: |settings_content| settings_content.editor.cursor_shape.as_ref(),
-                        write: |settings_content, value|{  settings_content.editor.cursor_shape = value;},
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Hide Mouse",
-                    description: "When to hide the mouse cursor.",
-                    field: Box::new(SettingField {
-                        json_path: Some("hide_mouse"),
-                        pick: |settings_content| settings_content.editor.hide_mouse.as_ref(),
-                        write: |settings_content, value|{  settings_content.editor.hide_mouse = value;},
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SectionHeader("Highlighting"),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Unnecessary Code Fade",
-                    description: "How much to fade out unused code (0.0 - 0.9).",
-                    field: Box::new(SettingField {
-                        json_path: Some("unnecessary_code_fade"),
-                        pick: |settings_content| {
-                            settings_content.theme.unnecessary_code_fade.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content.theme.unnecessary_code_fade = value;
-
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Current Line Highlight",
-                    description: "How to highlight the current line.",
-                    field: Box::new(SettingField {
-                        json_path: Some("current_line_highlight"),
-                        pick: |settings_content| {
-                            settings_content.editor.current_line_highlight.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content.editor.current_line_highlight = value;
-
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Selection Highlight",
-                    description: "Highlight all occurrences of selected text.",
-                    field: Box::new(SettingField {
-                        json_path: Some("selection_highlight"),
-                        pick: |settings_content| {
-                            settings_content.editor.selection_highlight.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content.editor.selection_highlight = value;
-
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Rounded Selection",
-                    description: "Whether the text selection should have rounded corners.",
-                    field: Box::new(SettingField {
-                        json_path: Some("rounded_selection"),
-                        pick: |settings_content| settings_content.editor.rounded_selection.as_ref(),
-                        write: |settings_content, value|{  settings_content.editor.rounded_selection = value;},
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Minimum Contrast For Highlights",
-                    description: "The minimum APCA perceptual contrast to maintain when rendering text over highlight backgrounds.",
-                    field: Box::new(SettingField {
-                        json_path: Some("minimum_contrast_for_highlights"),
-                        pick: |settings_content| {
-                            settings_content
-                                .editor
-                                .minimum_contrast_for_highlights
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content.editor.minimum_contrast_for_highlights = value;
-
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SectionHeader("Guides"),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Show Wrap Guides",
-                    description: "Show wrap guides (vertical rulers).",
-                    field: Box::new(SettingField {
-                        json_path: Some("show_wrap_guides"),
-                        pick: |settings_content| {
-                            settings_content
-                                .project
-                                .all_languages
-                                .defaults
-                                .show_wrap_guides
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-
-                                .project
-                                .all_languages
-                                .defaults
-                                .show_wrap_guides = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER | PROJECT,
-                }),
-                // todo(settings_ui): This needs a custom component
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Wrap Guides",
-                    description: "Character counts at which to show wrap guides.",
-                    field: Box::new(
-                        SettingField {
-                            json_path: Some("wrap_guides"),
-                            pick: |settings_content| {
-                                settings_content
-                                    .project
-                                    .all_languages
-                                    .defaults
-                                    .wrap_guides
-                                    .as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content.project.all_languages.defaults.wrap_guides = value;
-                            },
-                        }
-                        .unimplemented(),
-                    ),
-                    metadata: None,
-                    files: USER | PROJECT,
-                }),
-            ],
-        },
-        SettingsPage {
-            title: "Keymap",
-            items: vec![
-                SettingsPageItem::SectionHeader("Base Keymap"),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Base Keymap",
-                    description: "The name of a base set of key bindings to use.",
-                    field: Box::new(SettingField {
-                        json_path: Some("base_keymap"),
-                        pick: |settings_content| settings_content.base_keymap.as_ref(),
-                        write: |settings_content, value| {
-                            settings_content.base_keymap = value;
-                        },
-                    }),
-                    metadata: Some(Box::new(SettingsFieldMetadata {
-                        should_do_titlecase: Some(false),
-                        ..Default::default()
-                    })),
-                    files: USER,
-                }),
-                SettingsPageItem::SectionHeader("Modal Editing"),
-                // todo(settings_ui): Vim/Helix Mode should be apart of one type because it's undefined
-                // behavior to have them both enabled at the same time
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Vim Mode",
-                    description: "Enable Vim mode and key bindings.",
-                    field: Box::new(SettingField {
-                        json_path: Some("vim_mode"),
-                        pick: |settings_content| settings_content.vim_mode.as_ref(),
-                        write: |settings_content, value| {
-                            settings_content.vim_mode = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Helix Mode",
-                    description: "Enable Helix mode and key bindings.",
-                    field: Box::new(SettingField {
-                        json_path: Some("helix_mode"),
-                        pick: |settings_content| settings_content.helix_mode.as_ref(),
-                        write: |settings_content, value| {
-                            settings_content.helix_mode = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-            ],
-        },
-        SettingsPage {
-            title: "Editor",
-            items: {
-                let mut items = vec![
-                    SettingsPageItem::SectionHeader("Auto Save"),
-                    SettingsPageItem::DynamicItem(DynamicItem {
-                        discriminant: SettingItem {
-                            files: USER,
-                            title: "Auto Save Mode",
-                            description: "When to auto save buffer changes.",
-                            field: Box::new(SettingField {
-                                json_path: Some("autosave$"),
-                                pick: |settings_content| {
-                                    Some(&dynamic_variants::<settings::AutosaveSetting>()[
-                                        settings_content
-                                            .workspace
-                                            .autosave
-                                            .as_ref()?
-                                            .discriminant() as usize])
-                                },
-                                write: |settings_content, value| {
-                                    let Some(value) = value else {
-                                        settings_content.workspace.autosave = None;
-                                        return;
-                                    };
-                                    let settings_value = settings_content.workspace.autosave.get_or_insert_with(|| {
-                                        settings::AutosaveSetting::Off
-                                    });
-                                    *settings_value = match value {
-                                        settings::AutosaveSettingDiscriminants::Off => {
-                                            settings::AutosaveSetting::Off
-                                        },
-                                        settings::AutosaveSettingDiscriminants::AfterDelay => {
-                                            let milliseconds = match settings_value {
-                                                settings::AutosaveSetting::AfterDelay { milliseconds } => *milliseconds,
-                                                _ => settings::DelayMs(1000),
-                                            };
-                                            settings::AutosaveSetting::AfterDelay { milliseconds }
-                                        },
-                                        settings::AutosaveSettingDiscriminants::OnFocusChange => {
-                                            settings::AutosaveSetting::OnFocusChange
-                                        },
-                                        settings::AutosaveSettingDiscriminants::OnWindowChange => {
-                                            settings::AutosaveSetting::OnWindowChange
-                                        },
-                                    };
-                                },
-                            }),
-                            metadata: None,
-                        },
-                        pick_discriminant: |settings_content| {
-                            Some(settings_content.workspace.autosave.as_ref()?.discriminant() as usize)
-                        },
-                        fields: dynamic_variants::<settings::AutosaveSetting>().into_iter().map(|variant| {
-                            match variant {
-                                settings::AutosaveSettingDiscriminants::Off => vec![],
-                                settings::AutosaveSettingDiscriminants::AfterDelay => vec![
-                                    SettingItem {
-                                        files: USER,
-                                        title: "Delay (milliseconds)",
-                                        description: "Save after inactivity period (in milliseconds).",
-                                        field: Box::new(SettingField {
-                                            json_path: Some("autosave.after_delay.milliseconds"),
-                                            pick: |settings_content| {
-                                                match settings_content.workspace.autosave.as_ref() {
-                                                    Some(settings::AutosaveSetting::AfterDelay { milliseconds }) => Some(milliseconds),
-                                                    _ => None
-                                                }
-                                            },
-                                            write: |settings_content, value| {
-                                                let Some(value) = value else {
-                                                    settings_content.workspace.autosave = None;
-                                                    return;
-                                                };
-                                                match settings_content
-                                                    .workspace
-                                                    .autosave.as_mut() {
-                                                        Some(settings::AutosaveSetting::AfterDelay { milliseconds }) => *milliseconds = value,
-                                                        _ => return
-                                                    }
-                                            },
-                                        }),
-                                        metadata: None,
-                                    }
-                                ],
-                                settings::AutosaveSettingDiscriminants::OnFocusChange => vec![],
-                                settings::AutosaveSettingDiscriminants::OnWindowChange => vec![],
-                            }
-                        }).collect(),
-                    }),
-                    SettingsPageItem::SectionHeader("Multibuffer"),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Double Click In Multibuffer",
-                        description: "What to do when multibuffer is double-clicked in some of its excerpts.",
-                        field: Box::new(SettingField {
-                            json_path: Some("double_click_in_multibuffer"),
-                            pick: |settings_content| {
-                                settings_content.editor.double_click_in_multibuffer.as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content.editor.double_click_in_multibuffer = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Expand Excerpt Lines",
-                        description: "How many lines to expand the multibuffer excerpts by default.",
-                        field: Box::new(SettingField {
-                            json_path: Some("expand_excerpt_lines"),
-                            pick: |settings_content| {
-                                settings_content.editor.expand_excerpt_lines.as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content.editor.expand_excerpt_lines = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Excerpt Context Lines",
-                        description: "How many lines of context to provide in multibuffer excerpts by default.",
-                        field: Box::new(SettingField {
-                            json_path: Some("excerpt_context_lines"),
-                            pick: |settings_content| {
-                                settings_content.editor.excerpt_context_lines.as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content.editor.excerpt_context_lines = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Expand Outlines With Depth",
-                        description: "Default depth to expand outline items in the current file.",
-                        field: Box::new(SettingField {
-                            json_path: Some("outline_panel.expand_outlines_with_depth"),
-                            pick: |settings_content| {
-                                settings_content
-                                    .outline_panel
-                                    .as_ref()
-                                    .and_then(|outline_panel| {
-                                        outline_panel.expand_outlines_with_depth.as_ref()
-                                    })
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-                                    .outline_panel
-                                    .get_or_insert_default()
-                                    .expand_outlines_with_depth = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SectionHeader("Scrolling"),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Scroll Beyond Last Line",
-                        description: "Whether the editor will scroll beyond the last line.",
-                        field: Box::new(SettingField {
-                            json_path: Some("scroll_beyond_last_line"),
-                            pick: |settings_content| {
-                                settings_content.editor.scroll_beyond_last_line.as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content.editor.scroll_beyond_last_line = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Vertical Scroll Margin",
-                        description: "The number of lines to keep above/below the cursor when auto-scrolling.",
-                        field: Box::new(SettingField {
-                            json_path: Some("vertical_scroll_margin"),
-                            pick: |settings_content| {
-                                settings_content.editor.vertical_scroll_margin.as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content.editor.vertical_scroll_margin = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Horizontal Scroll Margin",
-                        description: "The number of characters to keep on either side when scrolling with the mouse.",
-                        field: Box::new(SettingField {
-                            json_path: Some("horizontal_scroll_margin"),
-                            pick: |settings_content| {
-                                settings_content.editor.horizontal_scroll_margin.as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content.editor.horizontal_scroll_margin = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Scroll Sensitivity",
-                        description: "Scroll sensitivity multiplier for both horizontal and vertical scrolling.",
-                        field: Box::new(SettingField {
-                            json_path: Some("scroll_sensitivity"),
-                            pick: |settings_content| {
-                                settings_content.editor.scroll_sensitivity.as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content.editor.scroll_sensitivity = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Fast Scroll Sensitivity",
-                        description: "Fast scroll sensitivity multiplier for both horizontal and vertical scrolling.",
-                        field: Box::new(SettingField {
-                            json_path: Some("fast_scroll_sensitivity"),
-                            pick: |settings_content| {
-                                settings_content.editor.fast_scroll_sensitivity.as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content.editor.fast_scroll_sensitivity = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Autoscroll On Clicks",
-                        description: "Whether to scroll when clicking near the edge of the visible text area.",
-                        field: Box::new(SettingField {
-                            json_path: Some("autoscroll_on_clicks"),
-                            pick: |settings_content| {
-                                settings_content.editor.autoscroll_on_clicks.as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content.editor.autoscroll_on_clicks = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Sticky Scroll",
-                        description: "Whether to stick scopes to the top of the editor",
-                        field: Box::new(SettingField {
-                            json_path: Some("sticky_scroll.enabled"),
-                            pick: |settings_content| {
-                                settings_content.editor.sticky_scroll.as_ref().and_then(|sticky_scroll| sticky_scroll.enabled.as_ref())
-                            },
-                            write: |settings_content, value| {
-                                settings_content.editor.sticky_scroll.get_or_insert_default().enabled = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SectionHeader("Signature Help"),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Auto Signature Help",
-                        description: "Automatically show a signature help pop-up.",
-                        field: Box::new(SettingField {
-                            json_path: Some("auto_signature_help"),
-                            pick: |settings_content| {
-                                settings_content.editor.auto_signature_help.as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content.editor.auto_signature_help = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Show Signature Help After Edits",
-                        description: "Show the signature help pop-up after completions or bracket pairs are inserted.",
-                        field: Box::new(SettingField {
-                            json_path: Some("show_signature_help_after_edits"),
-                            pick: |settings_content| {
-                                settings_content
-                                    .editor
-                                    .show_signature_help_after_edits
-                                    .as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content.editor.show_signature_help_after_edits = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Snippet Sort Order",
-                        description: "Determines how snippets are sorted relative to other completion items.",
-                        field: Box::new(SettingField {
-                            json_path: Some("snippet_sort_order"),
-                            pick: |settings_content| {
-                                settings_content.editor.snippet_sort_order.as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content.editor.snippet_sort_order = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SectionHeader("Hover Popover"),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Enabled",
-                        description: "Show the informational hover box when moving the mouse over symbols in the editor.",
-                        field: Box::new(SettingField {
-                            json_path: Some("hover_popover_enabled"),
-                            pick: |settings_content| {
-                                settings_content.editor.hover_popover_enabled.as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content.editor.hover_popover_enabled = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    // todo(settings ui): add units to this number input
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Delay",
-                        description: "Time to wait in milliseconds before showing the informational hover box.",
-                        field: Box::new(SettingField {
-                            json_path: Some("hover_popover_enabled"),
-                            pick: |settings_content| {
-                                settings_content.editor.hover_popover_delay.as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content.editor.hover_popover_delay = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SectionHeader("Drag And Drop Selection"),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Enabled",
-                        description: "Enable drag and drop selection.",
-                        field: Box::new(SettingField {
-                            json_path: Some("drag_and_drop_selection.enabled"),
-                            pick: |settings_content| {
-                                settings_content
-                                    .editor
-                                    .drag_and_drop_selection
-                                    .as_ref()
-                                    .and_then(|drag_and_drop| drag_and_drop.enabled.as_ref())
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-                                    .editor
-                                    .drag_and_drop_selection
-                                    .get_or_insert_default()
-                                    .enabled = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Delay",
-                        description: "Delay in milliseconds before drag and drop selection starts.",
-                        field: Box::new(SettingField {
-                            json_path: Some("drag_and_drop_selection.delay"),
-                            pick: |settings_content| {
-                                settings_content
-                                    .editor
-                                    .drag_and_drop_selection
-                                    .as_ref()
-                                    .and_then(|drag_and_drop| drag_and_drop.delay.as_ref())
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-                                    .editor
-                                    .drag_and_drop_selection
-                                    .get_or_insert_default()
-                                    .delay = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SectionHeader("Gutter"),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Show Line Numbers",
-                        description: "Show line numbers in the gutter.",
-                        field: Box::new(SettingField {
-                            json_path: Some("gutter.line_numbers"),
-                            pick: |settings_content| {
-                                settings_content
-                                    .editor
-                                    .gutter
-                                    .as_ref()
-                                    .and_then(|gutter| gutter.line_numbers.as_ref())
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-                                    .editor
-                                    .gutter
-                                    .get_or_insert_default()
-                                    .line_numbers = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Relative Line Numbers",
-                        description: "Controls line number display in the editor's gutter. \"disabled\" shows absolute line numbers, \"enabled\" shows relative line numbers for each absolute line, and \"wrapped\" shows relative line numbers for every line, absolute or wrapped.",
-                        field: Box::new(SettingField {
-                            json_path: Some("relative_line_numbers"),
-                            pick: |settings_content| {
-                                settings_content.editor.relative_line_numbers.as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content.editor.relative_line_numbers = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Show Runnables",
-                        description: "Show runnable buttons in the gutter.",
-                        field: Box::new(SettingField {
-                            json_path: Some("gutter.runnables"),
-                            pick: |settings_content| {
-                                settings_content
-                                    .editor
-                                    .gutter
-                                    .as_ref()
-                                    .and_then(|gutter| gutter.runnables.as_ref())
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-                                    .editor
-                                    .gutter
-                                    .get_or_insert_default()
-                                    .runnables = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Show Breakpoints",
-                        description: "Show breakpoints in the gutter.",
-                        field: Box::new(SettingField {
-                            json_path: Some("gutter.breakpoints"),
-                            pick: |settings_content| {
-                                settings_content
-                                    .editor
-                                    .gutter
-                                    .as_ref()
-                                    .and_then(|gutter| gutter.breakpoints.as_ref())
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-                                    .editor
-                                    .gutter
-                                    .get_or_insert_default()
-                                    .breakpoints = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Show Folds",
-                        description: "Show code folding controls in the gutter.",
-                        field: Box::new(SettingField {
-                            json_path: Some("gutter.folds"),
-                            pick: |settings_content| {
-                                settings_content
-                                    .editor
-                                    .gutter
-                                    .as_ref()
-                                    .and_then(|gutter| gutter.folds.as_ref())
-                            },
-                            write: |settings_content, value| {
-                                settings_content.editor.gutter.get_or_insert_default().folds =
-                                    value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Min Line Number Digits",
-                        description: "Minimum number of characters to reserve space for in the gutter.",
-                        field: Box::new(SettingField {
-                            json_path: Some("gutter.min_line_number_digits"),
-                            pick: |settings_content| {
-                                settings_content
-                                    .editor
-                                    .gutter
-                                    .as_ref()
-                                    .and_then(|gutter| gutter.min_line_number_digits.as_ref())
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-                                    .editor
-                                    .gutter
-                                    .get_or_insert_default()
-                                    .min_line_number_digits = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Inline Code Actions",
-                        description: "Show code action button at start of buffer line.",
-                        field: Box::new(SettingField {
-                            json_path: Some("inline_code_actions"),
-                            pick: |settings_content| {
-                                settings_content.editor.inline_code_actions.as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content.editor.inline_code_actions = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SectionHeader("Scrollbar"),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Show",
-                        description: "When to show the scrollbar in the editor.",
-                        field: Box::new(SettingField {
-                            json_path: Some("scrollbar"),
-                            pick: |settings_content| {
-                                settings_content.editor.scrollbar.as_ref()?.show.as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-                                    .editor
-                                    .scrollbar
-                                    .get_or_insert_default()
-                                    .show = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Cursors",
-                        description: "Show cursor positions in the scrollbar.",
-                        field: Box::new(SettingField {
-                            json_path: Some("scrollbar.cursors"),
-                            pick: |settings_content| {
-                                settings_content.editor.scrollbar.as_ref()?.cursors.as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-                                    .editor
-                                    .scrollbar
-                                    .get_or_insert_default()
-                                    .cursors = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Git Diff",
-                        description: "Show Git diff indicators in the scrollbar.",
-                        field: Box::new(SettingField {
-                            json_path: Some("scrollbar.git_diff"),
-                            pick: |settings_content| {
-                                settings_content
-                                    .editor
-                                    .scrollbar
-                                    .as_ref()?
-                                    .git_diff
-                                    .as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-                                    .editor
-                                    .scrollbar
-                                    .get_or_insert_default()
-                                    .git_diff = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Search Results",
-                        description: "Show buffer search result indicators in the scrollbar.",
-                        field: Box::new(SettingField {
-                            json_path: Some("scrollbar.search_results"),
-                            pick: |settings_content| {
-                                settings_content
-                                    .editor
-                                    .scrollbar
-                                    .as_ref()?
-                                    .search_results
-                                    .as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-                                    .editor
-                                    .scrollbar
-                                    .get_or_insert_default()
-                                    .search_results = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Selected Text",
-                        description: "Show selected text occurrences in the scrollbar.",
-                        field: Box::new(SettingField {
-                            json_path: Some("scrollbar.selected_text"),
-                            pick: |settings_content| {
-                                settings_content
-                                    .editor
-                                    .scrollbar
-                                    .as_ref()?
-                                    .selected_text
-                                    .as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-                                    .editor
-                                    .scrollbar
-                                    .get_or_insert_default()
-                                    .selected_text = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Selected Symbol",
-                        description: "Show selected symbol occurrences in the scrollbar.",
-                        field: Box::new(SettingField {
-                            json_path: Some("scrollbar.selected_symbol"),
-                            pick: |settings_content| {
-                                settings_content
-                                    .editor
-                                    .scrollbar
-                                    .as_ref()?
-                                    .selected_symbol
-                                    .as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-                                    .editor
-                                    .scrollbar
-                                    .get_or_insert_default()
-                                    .selected_symbol = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Diagnostics",
-                        description: "Which diagnostic indicators to show in the scrollbar.",
-                        field: Box::new(SettingField {
-                            json_path: Some("scrollbar.diagnostics"),
-                            pick: |settings_content| {
-                                settings_content
-                                    .editor
-                                    .scrollbar
-                                    .as_ref()?
-                                    .diagnostics
-                                    .as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-                                    .editor
-                                    .scrollbar
-                                    .get_or_insert_default()
-                                    .diagnostics = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Horizontal Scrollbar",
-                        description: "When false, forcefully disables the horizontal scrollbar.",
-                        field: Box::new(SettingField {
-                            json_path: Some("scrollbar.axes.horizontal"),
-                            pick: |settings_content| {
-                                settings_content
-                                    .editor
-                                    .scrollbar
-                                    .as_ref()?
-                                    .axes
-                                    .as_ref()?
-                                    .horizontal
-                                    .as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-                                    .editor
-                                    .scrollbar
-                                    .get_or_insert_default()
-                                    .axes
-                                    .get_or_insert_default()
-                                    .horizontal = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Vertical Scrollbar",
-                        description: "When false, forcefully disables the vertical scrollbar.",
-                        field: Box::new(SettingField {
-                            json_path: Some("scrollbar.axes.vertical"),
-                            pick: |settings_content| {
-                                settings_content
-                                    .editor
-                                    .scrollbar
-                                    .as_ref()?
-                                    .axes
-                                    .as_ref()?
-                                    .vertical
-                                    .as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-                                    .editor
-                                    .scrollbar
-                                    .get_or_insert_default()
-                                    .axes
-                                    .get_or_insert_default()
-                                    .vertical = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SectionHeader("Minimap"),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Show",
-                        description: "When to show the minimap in the editor.",
-                        field: Box::new(SettingField {
-                            json_path: Some("minimap.show"),
-                            pick: |settings_content| {
-                                settings_content.editor.minimap.as_ref()?.show.as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content.editor.minimap.get_or_insert_default().show =
-                                    value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Display In",
-                        description: "Where to show the minimap in the editor.",
-                        field: Box::new(SettingField {
-                            json_path: Some("minimap.display_in"),
-                            pick: |settings_content| {
-                                settings_content
-                                    .editor
-                                    .minimap
-                                    .as_ref()?
-                                    .display_in
-                                    .as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-                                    .editor
-                                    .minimap
-                                    .get_or_insert_default()
-                                    .display_in = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Thumb",
-                        description: "When to show the minimap thumb.",
-                        field: Box::new(SettingField {
-                            json_path: Some("minimap.thumb"),
-                            pick: |settings_content| {
-                                settings_content.editor.minimap.as_ref()?.thumb.as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-                                    .editor
-                                    .minimap
-                                    .get_or_insert_default()
-                                    .thumb = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Thumb Border",
-                        description: "Border style for the minimap's scrollbar thumb.",
-                        field: Box::new(SettingField {
-                            json_path: Some("minimap.thumb_border"),
-                            pick: |settings_content| {
-                                settings_content
-                                    .editor
-                                    .minimap
-                                    .as_ref()?
-                                    .thumb_border
-                                    .as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-                                    .editor
-                                    .minimap
-                                    .get_or_insert_default()
-                                    .thumb_border = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Current Line Highlight",
-                        description: "How to highlight the current line in the minimap.",
-                        field: Box::new(SettingField {
-                            json_path: Some("minimap.current_line_highlight"),
-                            pick: |settings_content| {
-                                settings_content
-                                    .editor
-                                    .minimap
-                                    .as_ref()
-                                    .and_then(|minimap| minimap.current_line_highlight.as_ref())
-                                    .or(settings_content.editor.current_line_highlight.as_ref())
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-                                    .editor
-                                    .minimap
-                                    .get_or_insert_default()
-                                    .current_line_highlight = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Max Width Columns",
-                        description: "Maximum number of columns to display in the minimap.",
-                        field: Box::new(SettingField {
-                            json_path: Some("minimap.max_width_columns"),
-                            pick: |settings_content| {
-                                settings_content
-                                    .editor
-                                    .minimap
-                                    .as_ref()?
-                                    .max_width_columns
-                                    .as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-                                    .editor
-                                    .minimap
-                                    .get_or_insert_default()
-                                    .max_width_columns = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SectionHeader("Toolbar"),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Breadcrumbs",
-                        description: "Show breadcrumbs.",
-                        field: Box::new(SettingField {
-                            json_path: Some("toolbar.breadcrumbs"),
-                            pick: |settings_content| {
-                                settings_content
-                                    .editor
-                                    .toolbar
-                                    .as_ref()?
-                                    .breadcrumbs
-                                    .as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-                                    .editor
-                                    .toolbar
-                                    .get_or_insert_default()
-                                    .breadcrumbs = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Quick Actions",
-                        description: "Show quick action buttons (e.g., search, selection, editor controls, etc.).",
-                        field: Box::new(SettingField {
-                            json_path: Some("toolbar.quick_actions"),
-                            pick: |settings_content| {
-                                settings_content
-                                    .editor
-                                    .toolbar
-                                    .as_ref()?
-                                    .quick_actions
-                                    .as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-                                    .editor
-                                    .toolbar
-                                    .get_or_insert_default()
-                                    .quick_actions = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Selections Menu",
-                        description: "Show the selections menu in the editor toolbar.",
-                        field: Box::new(SettingField {
-                            json_path: Some("toolbar.selections_menu"),
-                            pick: |settings_content| {
-                                settings_content
-                                    .editor
-                                    .toolbar
-                                    .as_ref()?
-                                    .selections_menu
-                                    .as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-                                    .editor
-                                    .toolbar
-                                    .get_or_insert_default()
-                                    .selections_menu = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Agent Review",
-                        description: "Show agent review buttons in the editor toolbar.",
-                        field: Box::new(SettingField {
-                            json_path: Some("toolbar.agent_review"),
-                            pick: |settings_content| {
-                                settings_content
-                                    .editor
-                                    .toolbar
-                                    .as_ref()?
-                                    .agent_review
-                                    .as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-                                    .editor
-                                    .toolbar
-                                    .get_or_insert_default()
-                                    .agent_review = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Code Actions",
-                        description: "Show code action buttons in the editor toolbar.",
-                        field: Box::new(SettingField {
-                            json_path: Some("toolbar.code_actions"),
-                            pick: |settings_content| {
-                                settings_content
-                                    .editor
-                                    .toolbar
-                                    .as_ref()?
-                                    .code_actions
-                                    .as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-                                    .editor
-                                    .toolbar
-                                    .get_or_insert_default()
-                                    .code_actions = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                ];
-                items.extend(language_settings_data());
-                items
-            },
-        },
-        SettingsPage {
-            title: "Languages & Tools",
-            items: {
-                let mut items = vec![];
-                items.extend(non_editor_language_settings_data());
-                items.extend([
-                    SettingsPageItem::SectionHeader("File Types"),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "File Type Associations",
-                        description: "A mapping from languages to files and file extensions that should be treated as that language.",
-                        field: Box::new(
-                            SettingField {
-                                json_path: Some("file_type_associations"),
-                                pick: |settings_content| {
-                                    settings_content.project.all_languages.file_types.as_ref()
-                                },
-                                write: |settings_content, value| {
-                                    settings_content.project.all_languages.file_types = value;
-
-                                },
-                            }
-                            .unimplemented(),
-                        ),
-                        metadata: None,
-                        files: USER | PROJECT,
-                    }),
-                ]);
-
-                items.extend([
-                    SettingsPageItem::SectionHeader("Diagnostics"),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Max Severity",
-                        description: "Which level to use to filter out diagnostics displayed in the editor.",
-                        field: Box::new(SettingField {
-                            json_path: Some("diagnostics_max_severity"),
-                            pick: |settings_content| settings_content.editor.diagnostics_max_severity.as_ref(),
-                            write: |settings_content, value| {
-                                settings_content.editor.diagnostics_max_severity = value;
-
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Include Warnings",
-                        description: "Whether to show warnings or not by default.",
-                        field: Box::new(SettingField {
-                            json_path: Some("diagnostics.include_warnings"),
-                            pick: |settings_content| {
-                                settings_content.diagnostics.as_ref()?.include_warnings.as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-
-                                    .diagnostics
-                                    .get_or_insert_default()
-                                    .include_warnings
-                                    = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SectionHeader("Inline Diagnostics"),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Enabled",
-                        description: "Whether to show diagnostics inline or not.",
-                        field: Box::new(SettingField {
-                            json_path: Some("diagnostics.inline.enabled"),
-                            pick: |settings_content| {
-                                settings_content.diagnostics.as_ref()?.inline.as_ref()?.enabled.as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-
-                                    .diagnostics
-                                    .get_or_insert_default()
-                                    .inline
-                                    .get_or_insert_default()
-                                    .enabled
-                                    = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Update Debounce",
-                        description: "The delay in milliseconds to show inline diagnostics after the last diagnostic update.",
-                        field: Box::new(SettingField {
-                            json_path: Some("diagnostics.inline.update_debounce_ms"),
-                            pick: |settings_content| {
-                                settings_content.diagnostics.as_ref()?.inline.as_ref()?.update_debounce_ms.as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-
-                                    .diagnostics
-                                    .get_or_insert_default()
-                                    .inline
-                                    .get_or_insert_default()
-                                    .update_debounce_ms
-                                    = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Padding",
-                        description: "The amount of padding between the end of the source line and the start of the inline diagnostic.",
-                        field: Box::new(SettingField {
-                            json_path: Some("diagnostics.inline.padding"),
-                            pick: |settings_content| {
-                                settings_content.diagnostics.as_ref()?.inline.as_ref()?.padding.as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-
-                                    .diagnostics
-                                    .get_or_insert_default()
-                                    .inline
-                                    .get_or_insert_default()
-                                    .padding
-                                    = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Minimum Column",
-                        description: "The minimum column at which to display inline diagnostics.",
-                        field: Box::new(SettingField {
-                            json_path: Some("diagnostics.inline.min_column"),
-                            pick: |settings_content| {
-                                settings_content.diagnostics.as_ref()?.inline.as_ref()?.min_column.as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-
-                                    .diagnostics
-                                    .get_or_insert_default()
-                                    .inline
-                                    .get_or_insert_default()
-                                    .min_column
-                                    = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SectionHeader("LSP Pull Diagnostics"),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Enabled",
-                        description: "Whether to pull for language server-powered diagnostics or not.",
-                        field: Box::new(SettingField {
-                            json_path: Some("diagnostics.lsp_pull_diagnostics.enabled"),
-                            pick: |settings_content| {
-                                settings_content.diagnostics.as_ref()?.lsp_pull_diagnostics.as_ref()?.enabled.as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-
-                                    .diagnostics
-                                    .get_or_insert_default()
-                                    .lsp_pull_diagnostics
-                                    .get_or_insert_default()
-                                    .enabled
-                                    = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    // todo(settings_ui): Needs unit
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Debounce",
-                        description: "Minimum time to wait before pulling diagnostics from the language server(s).",
-                        field: Box::new(SettingField {
-                            json_path: Some("diagnostics.lsp_pull_diagnostics.debounce_ms"),
-                            pick: |settings_content| {
-                                settings_content.diagnostics.as_ref()?.lsp_pull_diagnostics.as_ref()?.debounce_ms.as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-
-                                    .diagnostics
-                                    .get_or_insert_default()
-                                    .lsp_pull_diagnostics
-                                    .get_or_insert_default()
-                                    .debounce_ms
-                                    = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SectionHeader("LSP Highlights"),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Debounce",
-                        description: "The debounce delay before querying highlights from the language.",
-                        field: Box::new(SettingField {
-                            json_path: Some("lsp_highlight_debounce"),
-                            pick: |settings_content| settings_content.editor.lsp_highlight_debounce.as_ref(),
-                            write: |settings_content, value| {
-                                settings_content.editor.lsp_highlight_debounce = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                ]);
-
-                // todo(settings_ui): Refresh on extension (un)/installed
-                // Note that `crates/json_schema_store` solves the same problem, there is probably a way to unify the two
-                items.push(SettingsPageItem::SectionHeader(LANGUAGES_SECTION_HEADER));
-                items.extend(all_language_names(cx).into_iter().map(|language_name| {
-                    SettingsPageItem::SubPageLink(SubPageLink {
-                        title: language_name,
-                        files: USER | PROJECT,
-                        render: Arc::new(|this, window, cx| {
-                            this.render_sub_page_items(
-                                language_settings_data()
-                                    .iter()
-                                    .chain(non_editor_language_settings_data().iter())
-                                    .chain(edit_prediction_language_settings_section().iter())
-                                    .enumerate(),
-                                None,
-                                window,
-                                cx,
-                            )
-                            .into_any_element()
-                        }),
-                    })
-                }));
-                items
-            },
-        },
-        SettingsPage {
-            title: "Search & Files",
-            items: vec![
-                SettingsPageItem::SectionHeader("Search"),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Whole Word",
-                    description: "Search for whole words by default.",
-                    field: Box::new(SettingField {
-                        json_path: Some("search.whole_word"),
-                        pick: |settings_content| {
-                            settings_content.editor.search.as_ref()?.whole_word.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .editor
-                                .search
-                                .get_or_insert_default()
-                                .whole_word = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Case Sensitive",
-                    description: "Search case-sensitively by default.",
-                    field: Box::new(SettingField {
-                        json_path: Some("search.case_sensitive"),
-                        pick: |settings_content| {
-                            settings_content
-                                .editor
-                                .search
-                                .as_ref()?
-                                .case_sensitive
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .editor
-                                .search
-                                .get_or_insert_default()
-                                .case_sensitive = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Use Smartcase Search",
-                    description: "Whether to automatically enable case-sensitive search based on the search query.",
-                    field: Box::new(SettingField {
-                        json_path: Some("use_smartcase_search"),
-                        pick: |settings_content| {
-                            settings_content.editor.use_smartcase_search.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content.editor.use_smartcase_search = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Include Ignored",
-                    description: "Include ignored files in search results by default.",
-                    field: Box::new(SettingField {
-                        json_path: Some("search.include_ignored"),
-                        pick: |settings_content| {
-                            settings_content
-                                .editor
-                                .search
-                                .as_ref()?
-                                .include_ignored
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .editor
-                                .search
-                                .get_or_insert_default()
-                                .include_ignored = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Regex",
-                    description: "Use regex search by default.",
-                    field: Box::new(SettingField {
-                        json_path: Some("search.regex"),
-                        pick: |settings_content| {
-                            settings_content.editor.search.as_ref()?.regex.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content.editor.search.get_or_insert_default().regex = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Search Wrap",
-                    description: "Whether the editor search results will loop.",
-                    field: Box::new(SettingField {
-                        json_path: Some("search_wrap"),
-                        pick: |settings_content| settings_content.editor.search_wrap.as_ref(),
-                        write: |settings_content, value| {
-                            settings_content.editor.search_wrap = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Center on Match",
-                    description: "Whether to center the current match in the editor",
-                    field: Box::new(SettingField {
-                        json_path: Some("editor.search.center_on_match"),
-                        pick: |settings_content| {
-                            settings_content
-                                .editor
-                                .search
-                                .as_ref()
-                                .and_then(|search| search.center_on_match.as_ref())
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .editor
-                                .search
-                                .get_or_insert_default()
-                                .center_on_match = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Seed Search Query From Cursor",
-                    description: "When to populate a new search's query based on the text under the cursor.",
-                    field: Box::new(SettingField {
-                        json_path: Some("seed_search_query_from_cursor"),
-                        pick: |settings_content| {
-                            settings_content
-                                .editor
-                                .seed_search_query_from_cursor
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content.editor.seed_search_query_from_cursor = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SectionHeader("File Finder"),
-                // todo: null by default
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Include Ignored in Search",
-                    description: "Use gitignored files when searching.",
-                    field: Box::new(
-                        SettingField {
-                            json_path: Some("file_finder.include_ignored"),
-                            pick: |settings_content| {
-                                settings_content
-                                    .file_finder
-                                    .as_ref()?
-                                    .include_ignored
-                                    .as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-                                    .file_finder
-                                    .get_or_insert_default()
-                                    .include_ignored = value;
-                            },
-                        }
-                    ),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "File Icons",
-                    description: "Show file icons in the file finder.",
-                    field: Box::new(SettingField {
-                        json_path: Some("file_finder.file_icons"),
-                        pick: |settings_content| {
-                            settings_content.file_finder.as_ref()?.file_icons.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .file_finder
-                                .get_or_insert_default()
-                                .file_icons = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Modal Max Width",
-                    description: "Determines how much space the file finder can take up in relation to the available window width.",
-                    field: Box::new(SettingField {
-                        json_path: Some("file_finder.modal_max_width"),
-                        pick: |settings_content| {
-                            settings_content
-                                .file_finder
-                                .as_ref()?
-                                .modal_max_width
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .file_finder
-                                .get_or_insert_default()
-                                .modal_max_width = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Skip Focus For Active In Search",
-                    description: "Whether the file finder should skip focus for the active file in search results.",
-                    field: Box::new(SettingField {
-                        json_path: Some("file_finder.skip_focus_for_active_in_search"),
-                        pick: |settings_content| {
-                            settings_content
-                                .file_finder
-                                .as_ref()?
-                                .skip_focus_for_active_in_search
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .file_finder
-                                .get_or_insert_default()
-                                .skip_focus_for_active_in_search = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Git Status",
-                    description: "Show the Git status in the file finder.",
-                    field: Box::new(SettingField {
-                        json_path: Some("file_finder.git_status"),
-                        pick: |settings_content| {
-                            settings_content.file_finder.as_ref()?.git_status.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .file_finder
-                                .get_or_insert_default()
-                                .git_status = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SectionHeader("File Scan"),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "File Scan Exclusions",
-                    description: "Files or globs of files that will be excluded by Zed entirely. They will be skipped during file scans, file searches, and not be displayed in the project file tree. Takes precedence over \"File Scan Inclusions\"",
-                    field: Box::new(
-                        SettingField {
-                            json_path: Some("file_scan_exclusions"),
-                            pick: |settings_content| {
-                                settings_content
-                                    .project
-                                    .worktree
-                                    .file_scan_exclusions
-                                    .as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content.project.worktree.file_scan_exclusions = value;
-                            },
-                        }
-                        .unimplemented(),
-                    ),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "File Scan Inclusions",
-                    description: "Files or globs of files that will be included by Zed, even when ignored by git. This is useful for files that are not tracked by git, but are still important to your project. Note that globs that are overly broad can slow down Zed's file scanning. \"File Scan Exclusions\" takes precedence over these inclusions",
-                    field: Box::new(
-                        SettingField {
-                            json_path: Some("file_scan_inclusions"),
-                            pick: |settings_content| {
-                                settings_content
-                                    .project
-                                    .worktree
-                                    .file_scan_inclusions
-                                    .as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content.project.worktree.file_scan_inclusions = value;
-                            },
-                        }
-                        .unimplemented(),
-                    ),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Restore File State",
-                    description: "Restore previous file state when reopening.",
-                    field: Box::new(SettingField {
-                        json_path: Some("restore_on_file_reopen"),
-                        pick: |settings_content| {
-                            settings_content.workspace.restore_on_file_reopen.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content.workspace.restore_on_file_reopen = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Close on File Delete",
-                    description: "Automatically close files that have been deleted.",
-                    field: Box::new(SettingField {
-                        json_path: Some("close_on_file_delete"),
-                        pick: |settings_content| {
-                            settings_content.workspace.close_on_file_delete.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content.workspace.close_on_file_delete = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-            ],
-        },
-        SettingsPage {
-            title: "Window & Layout",
-            items: vec![
-                SettingsPageItem::SectionHeader("Status Bar"),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Project Panel Button",
-                    description: "Show the project panel button in the status bar.",
-                    field: Box::new(SettingField {
-                        json_path: Some("project_panel.button"),
-                        pick: |settings_content| {
-                            settings_content.project_panel.as_ref()?.button.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .project_panel
-                                .get_or_insert_default()
-                                .button = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Active Language Button",
-                    description: "Show the active language button in the status bar.",
-                    field: Box::new(SettingField {
-                        json_path: Some("status_bar.active_language_button"),
-                        pick: |settings_content| {
-                            settings_content
-                                .status_bar
-                                .as_ref()?
-                                .active_language_button
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .status_bar
-                                .get_or_insert_default()
-                                .active_language_button = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Cursor Position Button",
-                    description: "Show the cursor position button in the status bar.",
-                    field: Box::new(SettingField {
-                        json_path: Some("status_bar.cursor_position_button"),
-                        pick: |settings_content| {
-                            settings_content
-                                .status_bar
-                                .as_ref()?
-                                .cursor_position_button
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .status_bar
-                                .get_or_insert_default()
-                                .cursor_position_button = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Terminal Button",
-                    description: "Show the terminal button in the status bar.",
-                    field: Box::new(SettingField {
-                        json_path: Some("terminal.button"),
-                        pick: |settings_content| {
-                            settings_content.terminal.as_ref()?.button.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content.terminal.get_or_insert_default().button = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Diagnostics Button",
-                    description: "Show the project diagnostics button in the status bar.",
-                    field: Box::new(SettingField {
-                        json_path: Some("diagnostics.button"),
-                        pick: |settings_content| {
-                            settings_content.diagnostics.as_ref()?.button.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content.diagnostics.get_or_insert_default().button = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Project Search Button",
-                    description: "Show the project search button in the status bar.",
-                    field: Box::new(SettingField {
-                        json_path: Some("search.button"),
-                        pick: |settings_content| {
-                            settings_content.editor.search.as_ref()?.button.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .editor
-                                .search
-                                .get_or_insert_default()
-                                .button = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Debugger Button",
-                    description: "Show the debugger button in the status bar.",
-                    field: Box::new(SettingField {
-                        json_path: Some("debugger.button"),
-                        pick: |settings_content| {
-                            settings_content.debugger.as_ref()?.button.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content.debugger.get_or_insert_default().button = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SectionHeader("Title Bar"),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Show Branch Icon",
-                    description: "Show the branch icon beside branch switcher in the titlebar.",
-                    field: Box::new(SettingField {
-                        json_path: Some("title_bar.show_branch_icon"),
-                        pick: |settings_content| {
-                            settings_content
-                                .title_bar
-                                .as_ref()?
-                                .show_branch_icon
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .title_bar
-                                .get_or_insert_default()
-                                .show_branch_icon = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Show Branch Name",
-                    description: "Show the branch name button in the titlebar.",
-                    field: Box::new(SettingField {
-                        json_path: Some("title_bar.show_branch_name"),
-                        pick: |settings_content| {
-                            settings_content
-                                .title_bar
-                                .as_ref()?
-                                .show_branch_name
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .title_bar
-                                .get_or_insert_default()
-                                .show_branch_name = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Show Project Items",
-                    description: "Show the project host and name in the titlebar.",
-                    field: Box::new(SettingField {
-                        json_path: Some("title_bar.show_project_items"),
-                        pick: |settings_content| {
-                            settings_content
-                                .title_bar
-                                .as_ref()?
-                                .show_project_items
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .title_bar
-                                .get_or_insert_default()
-                                .show_project_items = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Show Onboarding Banner",
-                    description: "Show banners announcing new features in the titlebar.",
-                    field: Box::new(SettingField {
-                        json_path: Some("title_bar.show_onboarding_banner"),
-                        pick: |settings_content| {
-                            settings_content
-                                .title_bar
-                                .as_ref()?
-                                .show_onboarding_banner
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .title_bar
-                                .get_or_insert_default()
-                                .show_onboarding_banner = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Show User Picture",
-                    description: "Show user picture in the titlebar.",
-                    field: Box::new(SettingField {
-                        json_path: Some("title_bar.show_user_picture"),
-                        pick: |settings_content| {
-                            settings_content
-                                .title_bar
-                                .as_ref()?
-                                .show_user_picture
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .title_bar
-                                .get_or_insert_default()
-                                .show_user_picture = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Show Sign In",
-                    description: "Show the sign in button in the titlebar.",
-                    field: Box::new(SettingField {
-                        json_path: Some("title_bar.show_sign_in"),
-                        pick: |settings_content| {
-                            settings_content.title_bar.as_ref()?.show_sign_in.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .title_bar
-                                .get_or_insert_default()
-                                .show_sign_in = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Show Menus",
-                    description: "Show the menus in the titlebar.",
-                    field: Box::new(SettingField {
-                        json_path: Some("title_bar.show_menus"),
-                        pick: |settings_content| {
-                            settings_content.title_bar.as_ref()?.show_menus.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .title_bar
-                                .get_or_insert_default()
-                                .show_menus = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SectionHeader("Tab Bar"),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Show Tab Bar",
-                    description: "Show the tab bar in the editor.",
-                    field: Box::new(SettingField {
-                        json_path: Some("tab_bar.show"),
-                        pick: |settings_content| settings_content.tab_bar.as_ref()?.show.as_ref(),
-                        write: |settings_content, value| {
-                            settings_content.tab_bar.get_or_insert_default().show = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Show Git Status In Tabs",
-                    description: "Show the Git file status on a tab item.",
-                    field: Box::new(SettingField {
-                        json_path: Some("tabs.git_status"),
-                        pick: |settings_content| {
-                            settings_content.tabs.as_ref()?.git_status.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content.tabs.get_or_insert_default().git_status = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Show File Icons In Tabs",
-                    description: "Show the file icon for a tab.",
-                    field: Box::new(SettingField {
-                        json_path: Some("tabs.file_icons"),
-                        pick: |settings_content| {
-                            settings_content.tabs.as_ref()?.file_icons.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content.tabs.get_or_insert_default().file_icons = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Tab Close Position",
-                    description: "Position of the close button in a tab.",
-                    field: Box::new(SettingField {
-                        json_path: Some("tabs.close_position"),
-                        pick: |settings_content| {
-                            settings_content.tabs.as_ref()?.close_position.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content.tabs.get_or_insert_default().close_position = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    files: USER,
-                    title: "Maximum Tabs",
-                    description: "Maximum open tabs in a pane. Will not close an unsaved tab.",
-                    // todo(settings_ui): The default for this value is null and it's use in code
-                    // is complex, so I'm going to come back to this later
-                    field: Box::new(
-                        SettingField {
-                            json_path: Some("max_tabs"),
-                            pick: |settings_content| settings_content.workspace.max_tabs.as_ref(),
-                            write: |settings_content, value| {
-                                settings_content.workspace.max_tabs = value;
-                            },
-                        }
-                        .unimplemented(),
-                    ),
-                    metadata: None,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Show Navigation History Buttons",
-                    description: "Show the navigation history buttons in the tab bar.",
-                    field: Box::new(SettingField {
-                        json_path: Some("tab_bar.show_nav_history_buttons"),
-                        pick: |settings_content| {
-                            settings_content
-                                .tab_bar
-                                .as_ref()?
-                                .show_nav_history_buttons
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .tab_bar
-                                .get_or_insert_default()
-                                .show_nav_history_buttons = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Show Tab Bar Buttons",
-                    description: "Show the tab bar buttons (New, Split Pane, Zoom).",
-                    field: Box::new(SettingField {
-                        json_path: Some("tab_bar.show_tab_bar_buttons"),
-                        pick: |settings_content| {
-                            settings_content
-                                .tab_bar
-                                .as_ref()?
-                                .show_tab_bar_buttons
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .tab_bar
-                                .get_or_insert_default()
-                                .show_tab_bar_buttons = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SectionHeader("Tab Settings"),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Activate On Close",
-                    description: "What to do after closing the current tab.",
-                    field: Box::new(SettingField {
-                        json_path: Some("tabs.activate_on_close"),
-                        pick: |settings_content| {
-                            settings_content.tabs.as_ref()?.activate_on_close.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .tabs
-                                .get_or_insert_default()
-                                .activate_on_close = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Tab Show Diagnostics",
-                    description: "Which files containing diagnostic errors/warnings to mark in the tabs.",
-                    field: Box::new(SettingField {
-                        json_path: Some("tabs.show_diagnostics"),
-                        pick: |settings_content| {
-                            settings_content.tabs.as_ref()?.show_diagnostics.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .tabs
-                                .get_or_insert_default()
-                                .show_diagnostics = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Show Close Button",
-                    description: "Controls the appearance behavior of the tab's close button.",
-                    field: Box::new(SettingField {
-                        json_path: Some("tabs.show_close_button"),
-                        pick: |settings_content| {
-                            settings_content.tabs.as_ref()?.show_close_button.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .tabs
-                                .get_or_insert_default()
-                                .show_close_button = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SectionHeader("Preview Tabs"),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Preview Tabs Enabled",
-                    description: "Show opened editors as preview tabs.",
-                    field: Box::new(SettingField {
-                        json_path: Some("preview_tabs.enabled"),
-                        pick: |settings_content| {
-                            settings_content.preview_tabs.as_ref()?.enabled.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .preview_tabs
-                                .get_or_insert_default()
-                                .enabled = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Enable Preview From Project Panel",
-                    description: "Whether to open tabs in preview mode when opened from the project panel with a single click.",
-                    field: Box::new(SettingField {
-                        json_path: Some("preview_tabs.enable_preview_from_project_panel"),
-                        pick: |settings_content| {
-                            settings_content
-                                .preview_tabs
-                                .as_ref()?
-                                .enable_preview_from_project_panel
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .preview_tabs
-                                .get_or_insert_default()
-                                .enable_preview_from_project_panel = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Enable Preview From File Finder",
-                    description: "Whether to open tabs in preview mode when selected from the file finder.",
-                    field: Box::new(SettingField {
-                        json_path: Some("preview_tabs.enable_preview_from_file_finder"),
-                        pick: |settings_content| {
-                            settings_content
-                                .preview_tabs
-                                .as_ref()?
-                                .enable_preview_from_file_finder
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .preview_tabs
-                                .get_or_insert_default()
-                                .enable_preview_from_file_finder = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Enable Preview From Multibuffer",
-                    description: "Whether to open tabs in preview mode when opened from a multibuffer.",
-                    field: Box::new(SettingField {
-                        json_path: Some("preview_tabs.enable_preview_from_multibuffer"),
-                        pick: |settings_content| {
-                            settings_content
-                                .preview_tabs
-                                .as_ref()?
-                                .enable_preview_from_multibuffer
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .preview_tabs
-                                .get_or_insert_default()
-                                .enable_preview_from_multibuffer = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Enable Preview Multibuffer From Code Navigation",
-                    description: "Whether to open tabs in preview mode when code navigation is used to open a multibuffer.",
-                    field: Box::new(SettingField {
-                        json_path: Some("preview_tabs.enable_preview_multibuffer_from_code_navigation"),
-                        pick: |settings_content| {
-                            settings_content
-                                .preview_tabs
-                                .as_ref()?
-                                .enable_preview_multibuffer_from_code_navigation
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .preview_tabs
-                                .get_or_insert_default()
-                                .enable_preview_multibuffer_from_code_navigation = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Enable Preview File From Code Navigation",
-                    description: "Whether to open tabs in preview mode when code navigation is used to open a single file.",
-                    field: Box::new(SettingField {
-                        json_path: Some("preview_tabs.enable_preview_file_from_code_navigation"),
-                        pick: |settings_content| {
-                            settings_content
-                                .preview_tabs
-                                .as_ref()?
-                                .enable_preview_file_from_code_navigation
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .preview_tabs
-                                .get_or_insert_default()
-                                .enable_preview_file_from_code_navigation = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Enable Keep Preview On Code Navigation",
-                    description: "Whether to keep tabs in preview mode when code navigation is used to navigate away from them. If `enable_preview_file_from_code_navigation` or `enable_preview_multibuffer_from_code_navigation` is also true, the new tab may replace the existing one.",
-                    field: Box::new(SettingField {
-                        json_path: Some("preview_tabs.enable_keep_preview_on_code_navigation"),
-                        pick: |settings_content| {
-                            settings_content
-                                .preview_tabs
-                                .as_ref()?
-                                .enable_keep_preview_on_code_navigation
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .preview_tabs
-                                .get_or_insert_default()
-                                .enable_keep_preview_on_code_navigation = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SectionHeader("Layout"),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Bottom Dock Layout",
-                    description: "Layout mode for the bottom dock.",
-                    field: Box::new(SettingField {
-                        json_path: Some("bottom_dock_layout"),
-                        pick: |settings_content| {
-                            settings_content.workspace.bottom_dock_layout.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content.workspace.bottom_dock_layout = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    files: USER,
-                    title: "Centered Layout Left Padding",
-                    description: "Left padding for centered layout.",
-                    field: Box::new(SettingField {
-                        json_path: Some("centered_layout.left_padding"),
-                        pick: |settings_content| {
-                            settings_content
-                                .workspace
-                                .centered_layout
-                                .as_ref()?
-                                .left_padding
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .workspace
-                                .centered_layout
-                                .get_or_insert_default()
-                                .left_padding = value;
-                        },
-                    }),
-                    metadata: None,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    files: USER,
-                    title: "Centered Layout Right Padding",
-                    description: "Right padding for centered layout.",
-                    field: Box::new(SettingField {
-                        json_path: Some("centered_layout.right_padding"),
-                        pick: |settings_content| {
-                            settings_content
-                                .workspace
-                                .centered_layout
-                                .as_ref()?
-                                .right_padding
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .workspace
-                                .centered_layout
-                                .get_or_insert_default()
-                                .right_padding = value;
-                        },
-                    }),
-                    metadata: None,
-                }),
-                SettingsPageItem::SectionHeader("Window"),
-                // todo(settings_ui): Should we filter by platform.as_ref()?
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Use System Window Tabs",
-                    description: "(macOS only) whether to allow Windows to tab together.",
-                    field: Box::new(SettingField {
-                        json_path: Some("use_system_window_tabs"),
-                        pick: |settings_content| {
-                            settings_content.workspace.use_system_window_tabs.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content.workspace.use_system_window_tabs = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Window Decorations",
-                    description: "(Linux only) whether Zed or your compositor should draw window decorations.",
-                    field: Box::new(SettingField {
-                        json_path: Some("window_decorations"),
-                        pick: |settings_content| {
-                            settings_content.workspace.window_decorations.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content.workspace.window_decorations = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SectionHeader("Pane Modifiers"),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Inactive Opacity",
-                    description: "Opacity of inactive panels (0.0 - 1.0).",
-                    field: Box::new(SettingField {
-                        json_path: Some("active_pane_modifiers.inactive_opacity"),
-                        pick: |settings_content| {
-                            settings_content
-                                .workspace
-                                .active_pane_modifiers
-                                .as_ref()?
-                                .inactive_opacity
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .workspace
-                                .active_pane_modifiers
-                                .get_or_insert_default()
-                                .inactive_opacity = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Border Size",
-                    description: "Size of the border surrounding the active pane.",
-                    field: Box::new(SettingField {
-                        json_path: Some("active_pane_modifiers.border_size"),
-                        pick: |settings_content| {
-                            settings_content
-                                .workspace
-                                .active_pane_modifiers
-                                .as_ref()?
-                                .border_size
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .workspace
-                                .active_pane_modifiers
-                                .get_or_insert_default()
-                                .border_size = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Zoomed Padding",
-                    description: "Show padding for zoomed panes.",
-                    field: Box::new(SettingField {
-                        json_path: Some("zoomed_padding"),
-                        pick: |settings_content| settings_content.workspace.zoomed_padding.as_ref(),
-                        write: |settings_content, value| {
-                            settings_content.workspace.zoomed_padding = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SectionHeader("Pane Split Direction"),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Vertical Split Direction",
-                    description: "Direction to split vertically.",
-                    field: Box::new(SettingField {
-                        json_path: Some("pane_split_direction_vertical"),
-                        pick: |settings_content| {
-                            settings_content
-                                .workspace
-                                .pane_split_direction_vertical
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content.workspace.pane_split_direction_vertical = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Horizontal Split Direction",
-                    description: "Direction to split horizontally.",
-                    field: Box::new(SettingField {
-                        json_path: Some("pane_split_direction_horizontal"),
-                        pick: |settings_content| {
-                            settings_content
-                                .workspace
-                                .pane_split_direction_horizontal
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content.workspace.pane_split_direction_horizontal = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-            ],
-        },
-        SettingsPage {
-            title: "Panels",
-            items: vec![
-                SettingsPageItem::SectionHeader("Project Panel"),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Project Panel Dock",
-                    description: "Where to dock the project panel.",
-                    field: Box::new(SettingField {
-                        json_path: Some("project_panel.dock"),
-                        pick: |settings_content| {
-                            settings_content.project_panel.as_ref()?.dock.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content.project_panel.get_or_insert_default().dock = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Project Panel Default Width",
-                    description: "Default width of the project panel in pixels.",
-                    field: Box::new(SettingField {
-                        json_path: Some("project_panel.default_width"),
-                        pick: |settings_content| {
-                            settings_content
-                                .project_panel
-                                .as_ref()?
-                                .default_width
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .project_panel
-                                .get_or_insert_default()
-                                .default_width = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Hide .gitignore",
-                    description: "Whether to hide the gitignore entries in the project panel.",
-                    field: Box::new(SettingField {
-                        json_path: Some("project_panel.hide_gitignore"),
-                        pick: |settings_content| {
-                            settings_content
-                                .project_panel
-                                .as_ref()?
-                                .hide_gitignore
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .project_panel
-                                .get_or_insert_default()
-                                .hide_gitignore = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Entry Spacing",
-                    description: "Spacing between worktree entries in the project panel.",
-                    field: Box::new(SettingField {
-                        json_path: Some("project_panel.entry_spacing"),
-                        pick: |settings_content| {
-                            settings_content
-                                .project_panel
-                                .as_ref()?
-                                .entry_spacing
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .project_panel
-                                .get_or_insert_default()
-                                .entry_spacing = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "File Icons",
-                    description: "Show file icons in the project panel.",
-                    field: Box::new(SettingField {
-                        json_path: Some("project_panel.file_icons"),
-                        pick: |settings_content| {
-                            settings_content.project_panel.as_ref()?.file_icons.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .project_panel
-                                .get_or_insert_default()
-                                .file_icons = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Folder Icons",
-                    description: "Whether to show folder icons or chevrons for directories in the project panel.",
-                    field: Box::new(SettingField {
-                        json_path: Some("project_panel.folder_icons"),
-                        pick: |settings_content| {
-                            settings_content
-                                .project_panel
-                                .as_ref()?
-                                .folder_icons
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .project_panel
-                                .get_or_insert_default()
-                                .folder_icons = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Git Status",
-                    description: "Show the Git status in the project panel.",
-                    field: Box::new(SettingField {
-                        json_path: Some("project_panel.git_status"),
-                        pick: |settings_content| {
-                            settings_content.project_panel.as_ref()?.git_status.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .project_panel
-                                .get_or_insert_default()
-                                .git_status = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Indent Size",
-                    description: "Amount of indentation for nested items.",
-                    field: Box::new(SettingField {
-                        json_path: Some("project_panel.indent_size"),
-                        pick: |settings_content| {
-                            settings_content
-                                .project_panel
-                                .as_ref()?
-                                .indent_size
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .project_panel
-                                .get_or_insert_default()
-                                .indent_size = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Auto Reveal Entries",
-                    description: "Whether to reveal entries in the project panel automatically when a corresponding project entry becomes active.",
-                    field: Box::new(SettingField {
-                        json_path: Some("project_panel.auto_reveal_entries"),
-                        pick: |settings_content| {
-                            settings_content
-                                .project_panel
-                                .as_ref()?
-                                .auto_reveal_entries
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .project_panel
-                                .get_or_insert_default()
-                                .auto_reveal_entries = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Starts Open",
-                    description: "Whether the project panel should open on startup.",
-                    field: Box::new(SettingField {
-                        json_path: Some("project_panel.starts_open"),
-                        pick: |settings_content| {
-                            settings_content
-                                .project_panel
-                                .as_ref()?
-                                .starts_open
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .project_panel
-                                .get_or_insert_default()
-                                .starts_open = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Auto Fold Directories",
-                    description: "Whether to fold directories automatically and show compact folders when a directory has only one subdirectory inside.",
-                    field: Box::new(SettingField {
-                        json_path: Some("project_panel.auto_fold_dirs"),
-                        pick: |settings_content| {
-                            settings_content
-                                .project_panel
-                                .as_ref()?
-                                .auto_fold_dirs
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .project_panel
-                                .get_or_insert_default()
-                                .auto_fold_dirs = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Show Scrollbar",
-                    description: "Show the scrollbar in the project panel.",
-                    field: Box::new(SettingField {
-                        json_path: Some("project_panel.scrollbar.show"),
-                        pick: |settings_content| {
-                            show_scrollbar_or_editor(settings_content, |settings_content| {
-                                settings_content
-                                    .project_panel
-                                    .as_ref()?
-                                    .scrollbar
-                                    .as_ref()?
-                                    .show
-                                    .as_ref()
-                            })
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .project_panel
-                                .get_or_insert_default()
-                                .scrollbar
-                                .get_or_insert_default()
-                                .show = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Show Diagnostics",
-                    description: "Which files containing diagnostic errors/warnings to mark in the project panel.",
-                    field: Box::new(SettingField {
-                        json_path: Some("project_panel.show_diagnostics"),
-                        pick: |settings_content| {
-                            settings_content
-                                .project_panel
-                                .as_ref()?
-                                .show_diagnostics
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .project_panel
-                                .get_or_insert_default()
-                                .show_diagnostics = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Sticky Scroll",
-                    description: "Whether to stick parent directories at top of the project panel.",
-                    field: Box::new(SettingField {
-                        json_path: Some("project_panel.sticky_scroll"),
-                        pick: |settings_content| {
-                            settings_content
-                                .project_panel
-                                .as_ref()?
-                                .sticky_scroll
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .project_panel
-                                .get_or_insert_default()
-                                .sticky_scroll = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    files: USER,
-                    title: "Show Indent Guides",
-                    description: "Show indent guides in the project panel.",
-                    field: Box::new(
-                        SettingField {
-                            json_path: Some("project_panel.indent_guides.show"),
-                            pick: |settings_content| {
-                                settings_content
-                                    .project_panel
-                                    .as_ref()?
-                                    .indent_guides
-                                    .as_ref()?
-                                    .show
-                                    .as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-                                    .project_panel
-                                    .get_or_insert_default()
-                                    .indent_guides
-                                    .get_or_insert_default()
-                                    .show = value;
-                            },
-                        }
-                    ),
-                    metadata: None,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Drag and Drop",
-                    description: "Whether to enable drag-and-drop operations in the project panel.",
-                    field: Box::new(SettingField {
-                        json_path: Some("project_panel.drag_and_drop"),
-                        pick: |settings_content| {
-                            settings_content
-                                .project_panel
-                                .as_ref()?
-                                .drag_and_drop
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .project_panel
-                                .get_or_insert_default()
-                                .drag_and_drop = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Hide Root",
-                    description: "Whether to hide the root entry when only one folder is open in the window.",
-                    field: Box::new(SettingField {
-                        json_path: Some("project_panel.drag_and_drop"),
-                        pick: |settings_content| {
-                            settings_content.project_panel.as_ref()?.hide_root.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .project_panel
-                                .get_or_insert_default()
-                                .hide_root = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Hide Hidden",
-                    description: "Whether to hide the hidden entries in the project panel.",
-                    field: Box::new(SettingField {
-                        json_path: Some("project_panel.hide_hidden"),
-                        pick: |settings_content| {
-                            settings_content
-                                .project_panel
-                                .as_ref()?
-                                .hide_hidden
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .project_panel
-                                .get_or_insert_default()
-                                .hide_hidden = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Hidden Files",
-                    description: "Globs to match files that will be considered \"hidden\" and can be hidden from the project panel.",
-                    field: Box::new(
-                        SettingField {
-                            json_path: Some("worktree.hidden_files"),
-                            pick: |settings_content| {
-                                settings_content.project.worktree.hidden_files.as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content.project.worktree.hidden_files = value;
-                            },
-                        }
-                        .unimplemented(),
-                    ),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SectionHeader("Auto Open Files"),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "On Create",
-                    description: "Whether to automatically open newly created files in the editor.",
-                    field: Box::new(SettingField {
-                        json_path: Some("project_panel.auto_open.on_create"),
-                        pick: |settings_content| {
-                            settings_content.project_panel.as_ref()?.auto_open.as_ref()?.on_create.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content.project_panel.get_or_insert_default().auto_open.get_or_insert_default().on_create = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "On Paste",
-                    description: "Whether to automatically open files after pasting or duplicating them.",
-                    field: Box::new(SettingField {
-                        json_path: Some("project_panel.auto_open.on_paste"),
-                        pick: |settings_content| {
-                            settings_content.project_panel.as_ref()?.auto_open.as_ref()?.on_paste.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content.project_panel.get_or_insert_default().auto_open.get_or_insert_default().on_paste = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "On Drop",
-                    description: "Whether to automatically open files dropped from external sources.",
-                    field: Box::new(SettingField {
-                        json_path: Some("project_panel.auto_open.on_drop"),
-                        pick: |settings_content| {
-                            settings_content.project_panel.as_ref()?.auto_open.as_ref()?.on_drop.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content.project_panel.get_or_insert_default().auto_open.get_or_insert_default().on_drop = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Sort Mode",
-                    description: "Sort order for entries in the project panel.",
-                    field: Box::new(SettingField {
-                        pick: |settings_content| {
-                            settings_content.project_panel.as_ref()?.sort_mode.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .project_panel
-                                .get_or_insert_default()
-                                .sort_mode = value;
-                        },
-                        json_path: Some("project_panel.sort_mode"),
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SectionHeader("Terminal Panel"),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Terminal Dock",
-                    description: "Where to dock the terminal panel.",
-                    field: Box::new(SettingField {
-                        json_path: Some("terminal.dock"),
-                        pick: |settings_content| settings_content.terminal.as_ref()?.dock.as_ref(),
-                        write: |settings_content, value| {
-                            settings_content.terminal.get_or_insert_default().dock = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SectionHeader("Outline Panel"),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Outline Panel Button",
-                    description: "Show the outline panel button in the status bar.",
-                    field: Box::new(SettingField {
-                        json_path: Some("outline_panel.button"),
-                        pick: |settings_content| {
-                            settings_content.outline_panel.as_ref()?.button.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .outline_panel
-                                .get_or_insert_default()
-                                .button = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Outline Panel Dock",
-                    description: "Where to dock the outline panel.",
-                    field: Box::new(SettingField {
-                        json_path: Some("outline_panel.dock"),
-                        pick: |settings_content| {
-                            settings_content.outline_panel.as_ref()?.dock.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content.outline_panel.get_or_insert_default().dock = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Outline Panel Default Width",
-                    description: "Default width of the outline panel in pixels.",
-                    field: Box::new(SettingField {
-                        json_path: Some("outline_panel.default_width"),
-                        pick: |settings_content| {
-                            settings_content
-                                .outline_panel
-                                .as_ref()?
-                                .default_width
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .outline_panel
-                                .get_or_insert_default()
-                                .default_width = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "File Icons",
-                    description: "Show file icons in the outline panel.",
-                    field: Box::new(SettingField {
-                        json_path: Some("outline_panel.file_icons"),
-                        pick: |settings_content| {
-                            settings_content.outline_panel.as_ref()?.file_icons.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .outline_panel
-                                .get_or_insert_default()
-                                .file_icons = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Folder Icons",
-                    description: "Whether to show folder icons or chevrons for directories in the outline panel.",
-                    field: Box::new(SettingField {
-                        json_path: Some("outline_panel.folder_icons"),
-                        pick: |settings_content| {
-                            settings_content
-                                .outline_panel
-                                .as_ref()?
-                                .folder_icons
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .outline_panel
-                                .get_or_insert_default()
-                                .folder_icons = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Git Status",
-                    description: "Show the Git status in the outline panel.",
-                    field: Box::new(SettingField {
-                        json_path: Some("outline_panel.git_status"),
-                        pick: |settings_content| {
-                            settings_content.outline_panel.as_ref()?.git_status.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .outline_panel
-                                .get_or_insert_default()
-                                .git_status = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Indent Size",
-                    description: "Amount of indentation for nested items.",
-                    field: Box::new(SettingField {
-                        json_path: Some("outline_panel.indent_size"),
-                        pick: |settings_content| {
-                            settings_content
-                                .outline_panel
-                                .as_ref()?
-                                .indent_size
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .outline_panel
-                                .get_or_insert_default()
-                                .indent_size = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Auto Reveal Entries",
-                    description: "Whether to reveal when a corresponding outline entry becomes active.",
-                    field: Box::new(SettingField {
-                        json_path: Some("outline_panel.auto_reveal_entries"),
-                        pick: |settings_content| {
-                            settings_content
-                                .outline_panel
-                                .as_ref()?
-                                .auto_reveal_entries
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .outline_panel
-                                .get_or_insert_default()
-                                .auto_reveal_entries = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Auto Fold Directories",
-                    description: "Whether to fold directories automatically when a directory contains only one subdirectory.",
-                    field: Box::new(SettingField {
-                        json_path: Some("outline_panel.auto_fold_dirs"),
-                        pick: |settings_content| {
-                            settings_content
-                                .outline_panel
-                                .as_ref()?
-                                .auto_fold_dirs
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .outline_panel
-                                .get_or_insert_default()
-                                .auto_fold_dirs = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    files: USER,
-                    title: "Show Indent Guides",
-                    description: "When to show indent guides in the outline panel.",
-                    field: Box::new(
-                        SettingField {
-                            json_path: Some("outline_panel.indent_guides.show"),
-                            pick: |settings_content| {
-                                settings_content
-                                    .outline_panel
-                                    .as_ref()?
-                                    .indent_guides
-                                    .as_ref()?
-                                    .show
-                                    .as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-                                    .outline_panel
-                                    .get_or_insert_default()
-                                    .indent_guides
-                                    .get_or_insert_default()
-                                    .show = value;
-                            },
-                        }
-                    ),
-                    metadata: None,
-                }),
-                SettingsPageItem::SectionHeader("Git Panel"),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Git Panel Button",
-                    description: "Show the Git panel button in the status bar.",
-                    field: Box::new(SettingField {
-                        json_path: Some("git_panel.button"),
-                        pick: |settings_content| {
-                            settings_content.git_panel.as_ref()?.button.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content.git_panel.get_or_insert_default().button = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Git Panel Dock",
-                    description: "Where to dock the Git panel.",
-                    field: Box::new(SettingField {
-                        json_path: Some("git_panel.dock"),
-                        pick: |settings_content| settings_content.git_panel.as_ref()?.dock.as_ref(),
-                        write: |settings_content, value| {
-                            settings_content.git_panel.get_or_insert_default().dock = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Git Panel Default Width",
-                    description: "Default width of the Git panel in pixels.",
-                    field: Box::new(SettingField {
-                        json_path: Some("git_panel.default_width"),
-                        pick: |settings_content| {
-                            settings_content.git_panel.as_ref()?.default_width.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .git_panel
-                                .get_or_insert_default()
-                                .default_width = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Git Panel Status Style",
-                    description: "How entry statuses are displayed.",
-                    field: Box::new(SettingField {
-                        json_path: Some("git_panel.status_style"),
-                        pick: |settings_content| {
-                            settings_content.git_panel.as_ref()?.status_style.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .git_panel
-                                .get_or_insert_default()
-                                .status_style = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Fallback Branch Name",
-                    description: "Default branch name will be when init.defaultbranch is not set in Git.",
-                    field: Box::new(SettingField {
-                        json_path: Some("git_panel.fallback_branch_name"),
-                        pick: |settings_content| {
-                            settings_content
-                                .git_panel
-                                .as_ref()?
-                                .fallback_branch_name
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .git_panel
-                                .get_or_insert_default()
-                                .fallback_branch_name = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Sort By Path",
-                    description: "Enable to sort entries in the panel by path, disable to sort by status.",
-                    field: Box::new(SettingField {
-                        json_path: Some("git_panel.sort_by_path"),
-                        pick: |settings_content| {
-                            settings_content.git_panel.as_ref()?.sort_by_path.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .git_panel
-                                .get_or_insert_default()
-                                .sort_by_path = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Collapse Untracked Diff",
-                    description: "Whether to collapse untracked files in the diff panel.",
-                    field: Box::new(SettingField {
-                        json_path: Some("git_panel.collapse_untracked_diff"),
-                        pick: |settings_content| {
-                            settings_content
-                                .git_panel
-                                .as_ref()?
-                                .collapse_untracked_diff
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .git_panel
-                                .get_or_insert_default()
-                                .collapse_untracked_diff = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Tree View",
-                    description: "Enable to show entries in tree view list, disable to show in flat view list.",
-                    field: Box::new(SettingField {
-                        json_path: Some("git_panel.tree_view"),
-                        pick: |settings_content| {
-                            settings_content.git_panel.as_ref()?.tree_view.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .git_panel
-                                .get_or_insert_default()
-                                .tree_view = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Scroll Bar",
-                    description: "How and when the scrollbar should be displayed.",
-                    field: Box::new(SettingField {
-                        json_path: Some("git_panel.scrollbar.show"),
-                        pick: |settings_content| {
-                            show_scrollbar_or_editor(settings_content, |settings_content| {
-                                settings_content
-                                    .git_panel
-                                    .as_ref()?
-                                    .scrollbar
-                                    .as_ref()?
-                                    .show
-                                    .as_ref()
-                            })
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .git_panel
-                                .get_or_insert_default()
-                                .scrollbar
-                                .get_or_insert_default()
-                                .show = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SectionHeader("Debugger Panel"),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Debugger Panel Dock",
-                    description: "The dock position of the debug panel.",
-                    field: Box::new(SettingField {
-                        json_path: Some("debugger.dock"),
-                        pick: |settings_content| settings_content.debugger.as_ref()?.dock.as_ref(),
-                        write: |settings_content, value| {
-                            settings_content.debugger.get_or_insert_default().dock = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SectionHeader("Notification Panel"),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Notification Panel Button",
-                    description: "Show the notification panel button in the status bar.",
-                    field: Box::new(SettingField {
-                        json_path: Some("notification_panel.button"),
-                        pick: |settings_content| {
-                            settings_content
-                                .notification_panel
-                                .as_ref()?
-                                .button
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .notification_panel
-                                .get_or_insert_default()
-                                .button = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Notification Panel Dock",
-                    description: "Where to dock the notification panel.",
-                    field: Box::new(SettingField {
-                        json_path: Some("notification_panel.dock"),
-                        pick: |settings_content| {
-                            settings_content.notification_panel.as_ref()?.dock.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .notification_panel
-                                .get_or_insert_default()
-                                .dock = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Notification Panel Default Width",
-                    description: "Default width of the notification panel in pixels.",
-                    field: Box::new(SettingField {
-                        json_path: Some("notification_panel.default_width"),
-                        pick: |settings_content| {
-                            settings_content
-                                .notification_panel
-                                .as_ref()?
-                                .default_width
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .notification_panel
-                                .get_or_insert_default()
-                                .default_width = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SectionHeader("Collaboration Panel"),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Collaboration Panel Button",
-                    description: "Show the collaboration panel button in the status bar.",
-                    field: Box::new(SettingField {
-                        json_path: Some("collaboration_panel.button"),
-                        pick: |settings_content| {
-                            settings_content
-                                .collaboration_panel
-                                .as_ref()?
-                                .button
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .collaboration_panel
-                                .get_or_insert_default()
-                                .button = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Collaboration Panel Dock",
-                    description: "Where to dock the collaboration panel.",
-                    field: Box::new(SettingField {
-                        json_path: Some("collaboration_panel.dock"),
-                        pick: |settings_content| {
-                            settings_content.collaboration_panel.as_ref()?.dock.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .collaboration_panel
-                                .get_or_insert_default()
-                                .dock = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Collaboration Panel Default Width",
-                    description: "Default width of the collaboration panel in pixels.",
-                    field: Box::new(SettingField {
-                        json_path: Some("collaboration_panel.dock"),
-                        pick: |settings_content| {
-                            settings_content
-                                .collaboration_panel
-                                .as_ref()?
-                                .default_width
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .collaboration_panel
-                                .get_or_insert_default()
-                                .default_width = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SectionHeader("Agent Panel"),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Agent Panel Button",
-                    description: "Whether to show the agent panel button in the status bar.",
-                    field: Box::new(SettingField {
-                        json_path: Some("agent.button"),
-                        pick: |settings_content| settings_content.agent.as_ref()?.button.as_ref(),
-                        write: |settings_content, value| {
-                            settings_content.agent.get_or_insert_default().button = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Agent Panel Dock",
-                    description: "Where to dock the agent panel.",
-                    field: Box::new(SettingField {
-                        json_path: Some("agent.dock"),
-                        pick: |settings_content| settings_content.agent.as_ref()?.dock.as_ref(),
-                        write: |settings_content, value| {
-                            settings_content.agent.get_or_insert_default().dock = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Agent Panel Default Width",
-                    description: "Default width when the agent panel is docked to the left or right.",
-                    field: Box::new(SettingField {
-                        json_path: Some("agent.default_width"),
-                        pick: |settings_content| {
-                            settings_content.agent.as_ref()?.default_width.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content.agent.get_or_insert_default().default_width = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Agent Panel Default Height",
-                    description: "Default height when the agent panel is docked to the bottom.",
-                    field: Box::new(SettingField {
-                        json_path: Some("agent.default_height"),
-                        pick: |settings_content| {
-                            settings_content.agent.as_ref()?.default_height.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .agent
-                                .get_or_insert_default()
-                                .default_height = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-            ],
-        },
-        SettingsPage {
-            title: "Debugger",
-            items: vec![
-                SettingsPageItem::SectionHeader("General"),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Stepping Granularity",
-                    description: "Determines the stepping granularity for debug operations.",
-                    field: Box::new(SettingField {
-                        json_path: Some("debugger.stepping_granularity"),
-                        pick: |settings_content| {
-                            settings_content
-                                .debugger
-                                .as_ref()?
-                                .stepping_granularity
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .debugger
-                                .get_or_insert_default()
-                                .stepping_granularity = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Save Breakpoints",
-                    description: "Whether breakpoints should be reused across Zed sessions.",
-                    field: Box::new(SettingField {
-                        json_path: Some("debugger.save_breakpoints"),
-                        pick: |settings_content| {
-                            settings_content
-                                .debugger
-                                .as_ref()?
-                                .save_breakpoints
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .debugger
-                                .get_or_insert_default()
-                                .save_breakpoints = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Timeout",
-                    description: "Time in milliseconds until timeout error when connecting to a TCP debug adapter.",
-                    field: Box::new(SettingField {
-                        json_path: Some("debugger.timeout"),
-                        pick: |settings_content| {
-                            settings_content.debugger.as_ref()?.timeout.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content.debugger.get_or_insert_default().timeout = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Log DAP Communications",
-                    description: "Whether to log messages between active debug adapters and Zed.",
-                    field: Box::new(SettingField {
-                        json_path: Some("debugger.log_dap_communications"),
-                        pick: |settings_content| {
-                            settings_content
-                                .debugger
-                                .as_ref()?
-                                .log_dap_communications
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .debugger
-                                .get_or_insert_default()
-                                .log_dap_communications = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Format DAP Log Messages",
-                    description: "Whether to format DAP messages when adding them to debug adapter logger.",
-                    field: Box::new(SettingField {
-                        json_path: Some("debugger.format_dap_log_messages"),
-                        pick: |settings_content| {
-                            settings_content
-                                .debugger
-                                .as_ref()?
-                                .format_dap_log_messages
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .debugger
-                                .get_or_insert_default()
-                                .format_dap_log_messages = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-            ],
-        },
-        SettingsPage {
-            title: "Terminal",
-            items: vec![
-                SettingsPageItem::SectionHeader("Environment"),
-                SettingsPageItem::DynamicItem(DynamicItem {
-                    discriminant: SettingItem {
-                        files: USER | PROJECT,
-                        title: "Shell",
-                        description: "What shell to use when opening a terminal.",
-                        field: Box::new(SettingField {
-                            json_path: Some("terminal.shell$"),
-                            pick: |settings_content| {
-                                Some(&dynamic_variants::<settings::Shell>()[
-                                    settings_content
-                                        .terminal
-                                        .as_ref()?
-                                        .project
-                                        .shell
-                                        .as_ref()?
-                                        .discriminant() as usize])
-                            },
-                            write: |settings_content, value| {
-                                let Some(value) = value else {
-                                    if let Some(terminal) = settings_content.terminal.as_mut() {
-                                        terminal.project.shell = None;
-                                    }
-                                    return;
-                                };
-                                let settings_value = settings_content
-                                    .terminal
-                                    .get_or_insert_default()
-                                    .project
-                                    .shell
-                                    .get_or_insert_with(|| settings::Shell::default());
-                                let default_shell = if cfg!(target_os = "windows") {
-                                    "powershell.exe"
-                                } else {
-                                    "sh"
-                                };
-                                *settings_value = match value {
-                                    settings::ShellDiscriminants::System => {
-                                        settings::Shell::System
-                                    },
-                                    settings::ShellDiscriminants::Program => {
-                                        let program = match settings_value {
-                                            settings::Shell::Program(p) => p.clone(),
-                                            settings::Shell::WithArguments { program, .. } => program.clone(),
-                                            _ => String::from(default_shell),
-                                        };
-                                        settings::Shell::Program(program)
-                                    },
-                                    settings::ShellDiscriminants::WithArguments => {
-                                        let (program, args, title_override) = match settings_value {
-                                            settings::Shell::Program(p) => (p.clone(), vec![], None),
-                                            settings::Shell::WithArguments { program, args, title_override } => {
-                                                (program.clone(), args.clone(), title_override.clone())
-                                            },
-                                            _ => (String::from(default_shell), vec![], None),
-                                        };
-                                        settings::Shell::WithArguments {
-                                            program,
-                                            args,
-                                            title_override,
-                                        }
-                                    },
-                                };
-                            },
-                        }),
-                        metadata: None,
-                    },
-                    pick_discriminant: |settings_content| {
-                        Some(settings_content.terminal.as_ref()?.project.shell.as_ref()?.discriminant() as usize)
-                    },
-                    fields: dynamic_variants::<settings::Shell>().into_iter().map(|variant| {
-                        match variant {
-                            settings::ShellDiscriminants::System => vec![],
-                            settings::ShellDiscriminants::Program => vec![
-                                SettingItem {
-                                    files: USER | PROJECT,
-                                    title: "Program",
-                                    description: "The shell program to use.",
-                                    field: Box::new(SettingField {
-                                        json_path: Some("terminal.shell"),
-                                        pick: |settings_content| {
-                                            match settings_content.terminal.as_ref()?.project.shell.as_ref() {
-                                                Some(settings::Shell::Program(program)) => Some(program),
-                                                _ => None
-                                            }
-                                        },
-                                        write: |settings_content, value| {
-                                            let Some(value) = value else {
-                                                return;
-                                            };
-                                            match settings_content
-                                                .terminal
-                                                .get_or_insert_default()
-                                                .project
-                                                .shell.as_mut() {
-                                                    Some(settings::Shell::Program(program)) => *program = value,
-                                                    _ => return
-                                                }
-                                        },
-                                    }),
-                                    metadata: None,
-                                }
-                            ],
-                            settings::ShellDiscriminants::WithArguments => vec![
-                                SettingItem {
-                                    files: USER | PROJECT,
-                                    title: "Program",
-                                    description: "The shell program to run.",
-                                    field: Box::new(SettingField {
-                                        json_path: Some("terminal.shell.program"),
-                                        pick: |settings_content| {
-                                            match settings_content.terminal.as_ref()?.project.shell.as_ref() {
-                                                Some(settings::Shell::WithArguments { program, .. }) => Some(program),
-                                                _ => None
-                                            }
-                                        },
-                                        write: |settings_content, value| {
-                                            let Some(value) = value else {
-                                                return;
-                                            };
-                                            match settings_content
-                                                .terminal
-                                                .get_or_insert_default()
-                                                .project
-                                                .shell.as_mut() {
-                                                    Some(settings::Shell::WithArguments { program, .. }) => *program = value,
-                                                    _ => return
-                                                }
-                                        },
-                                    }),
-                                    metadata: None,
-                                },
-                                SettingItem {
-                                    files: USER | PROJECT,
-                                    title: "Arguments",
-                                    description: "The arguments to pass to the shell program.",
-                                    field: Box::new(
-                                        SettingField {
-                                            json_path: Some("terminal.shell.args"),
-                                            pick: |settings_content| {
-                                                match settings_content.terminal.as_ref()?.project.shell.as_ref() {
-                                                    Some(settings::Shell::WithArguments { args, .. }) => Some(args),
-                                                    _ => None
-                                                }
-                                            },
-                                            write: |settings_content, value| {
-                                                let Some(value) = value else {
-                                                    return;
-                                                };
-                                                match settings_content
-                                                    .terminal
-                                                    .get_or_insert_default()
-                                                    .project
-                                                    .shell.as_mut() {
-                                                        Some(settings::Shell::WithArguments { args, .. }) => *args = value,
-                                                        _ => return
-                                                    }
-                                            },
-                                        }
-                                        .unimplemented(),
-                                    ),
-                                    metadata: None,
-                                },
-                                SettingItem {
-                                    files: USER | PROJECT,
-                                    title: "Title Override",
-                                    description: "An optional string to override the title of the terminal tab.",
-                                    field: Box::new(SettingField {
-                                        json_path: Some("terminal.shell.title_override"),
-                                        pick: |settings_content| {
-                                            match settings_content.terminal.as_ref()?.project.shell.as_ref() {
-                                                Some(settings::Shell::WithArguments { title_override, .. }) => title_override.as_ref().or(DEFAULT_EMPTY_SHARED_STRING),
-                                                _ => None
-                                            }
-                                        },
-                                        write: |settings_content, value| {
-                                            match settings_content
-                                                .terminal
-                                                .get_or_insert_default()
-                                                .project
-                                                .shell.as_mut() {
-                                                    Some(settings::Shell::WithArguments { title_override, .. }) => *title_override = value.filter(|s| !s.is_empty()),
-                                                    _ => return
-                                                }
-                                        },
-                                    }),
-                                    metadata: None,
-                                }
-                            ],
-                        }
-                    }).collect(),
-                }),
-                SettingsPageItem::DynamicItem(DynamicItem {
-                    discriminant: SettingItem {
-                        files: USER | PROJECT,
-                        title: "Working Directory",
-                        description: "What working directory to use when launching the terminal.",
-                        field: Box::new(SettingField {
-                            json_path: Some("terminal.working_directory$"),
-                            pick: |settings_content| {
-                                Some(&dynamic_variants::<settings::WorkingDirectory>()[
-                                    settings_content
-                                        .terminal
-                                        .as_ref()?
-                                        .project
-                                        .working_directory
-                                        .as_ref()?
-                                        .discriminant() as usize])
-                            },
-                            write: |settings_content, value| {
-                                let Some(value) = value else {
-                                    if let Some(terminal) = settings_content.terminal.as_mut() {
-                                        terminal.project.working_directory = None;
-                                    }
-                                    return;
-                                };
-                                let settings_value = settings_content
-                                    .terminal
-                                    .get_or_insert_default()
-                                    .project
-                                    .working_directory
-                                    .get_or_insert_with(|| settings::WorkingDirectory::CurrentProjectDirectory);
-                                *settings_value = match value {
-                                    settings::WorkingDirectoryDiscriminants::CurrentProjectDirectory => {
-                                        settings::WorkingDirectory::CurrentProjectDirectory
-                                    },
-                                    settings::WorkingDirectoryDiscriminants::FirstProjectDirectory => {
-                                        settings::WorkingDirectory::FirstProjectDirectory
-                                    },
-                                    settings::WorkingDirectoryDiscriminants::AlwaysHome => {
-                                        settings::WorkingDirectory::AlwaysHome
-                                    },
-                                    settings::WorkingDirectoryDiscriminants::Always => {
-                                        let directory = match settings_value {
-                                            settings::WorkingDirectory::Always { .. } => return,
-                                            _ => String::new(),
-                                        };
-                                        settings::WorkingDirectory::Always { directory }
-                                    },
-                                };
-                            },
-                        }),
-                        metadata: None,
-                    },
-                    pick_discriminant: |settings_content| {
-                        Some(settings_content.terminal.as_ref()?.project.working_directory.as_ref()?.discriminant() as usize)
-                    },
-                    fields: dynamic_variants::<settings::WorkingDirectory>().into_iter().map(|variant| {
-                        match variant {
-                            settings::WorkingDirectoryDiscriminants::CurrentProjectDirectory => vec![],
-                            settings::WorkingDirectoryDiscriminants::FirstProjectDirectory => vec![],
-                            settings::WorkingDirectoryDiscriminants::AlwaysHome => vec![],
-                            settings::WorkingDirectoryDiscriminants::Always => vec![
-                                SettingItem {
-                                    files: USER | PROJECT,
-                                    title: "Directory",
-                                    description: "The directory path to use (will be shell expanded).",
-                                    field: Box::new(SettingField {
-                                        json_path: Some("terminal.working_directory.always"),
-                                        pick: |settings_content| {
-                                            match settings_content.terminal.as_ref()?.project.working_directory.as_ref() {
-                                                Some(settings::WorkingDirectory::Always { directory }) => Some(directory),
-                                                _ => None
-                                            }
-                                        },
-                                        write: |settings_content, value| {
-                                            let value = value.unwrap_or_default();
-                                            match settings_content
-                                                .terminal
-                                                .get_or_insert_default()
-                                                .project
-                                                .working_directory.as_mut() {
-                                                    Some(settings::WorkingDirectory::Always { directory }) => *directory = value,
-                                                    _ => return
-                                                }
-                                        },
-                                    }),
-                                    metadata: None,
-                                }
-                            ],
-                        }
-                    }).collect(),
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Environment Variables",
-                    description: "Key-value pairs to add to the terminal's environment.",
-                    field: Box::new(
-                        SettingField {
-                            json_path: Some("terminal.env"),
-                            pick: |settings_content| {
-                                settings_content.terminal.as_ref()?.project.env.as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-                                    .terminal
-                                    .get_or_insert_default()
-                                    .project
-                                    .env = value;
-                            },
-                        }
-                        .unimplemented(),
-                    ),
-                    metadata: None,
-                    files: USER | PROJECT,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Detect Virtual Environment",
-                    description: "Activates the Python virtual environment, if one is found, in the terminal's working directory.",
-                    field: Box::new(
-                        SettingField {
-                            json_path: Some("terminal.detect_venv"),
-                            pick: |settings_content| {
-                                settings_content
-                                    .terminal
-                                    .as_ref()?
-                                    .project
-                                    .detect_venv
-                                    .as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-                                    .terminal
-                                    .get_or_insert_default()
-                                    .project
-                                    .detect_venv = value;
-                            },
-                        }
-                        .unimplemented(),
-                    ),
-                    metadata: None,
-                    files: USER | PROJECT,
-                }),
-                SettingsPageItem::SectionHeader("Font"),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Font Size",
-                    description: "Font size for terminal text. If not set, defaults to buffer font size.",
-                    field: Box::new(SettingField {
-                        json_path: Some("terminal.font_size"),
-                        pick: |settings_content| {
-                            settings_content
-                                .terminal
-                                .as_ref()
-                                .and_then(|terminal| terminal.font_size.as_ref())
-                                .or(settings_content.theme.buffer_font_size.as_ref())
-                        },
-                        write: |settings_content, value| {
-                            settings_content.terminal.get_or_insert_default().font_size = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Font Family",
-                    description: "Font family for terminal text. If not set, defaults to buffer font family.",
-                    field: Box::new(SettingField {
-                        json_path: Some("terminal.font_family"),
-                        pick: |settings_content| {
-                            settings_content
-                                .terminal
-                                .as_ref()
-                                .and_then(|terminal| terminal.font_family.as_ref())
-                                .or(settings_content.theme.buffer_font_family.as_ref())
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .terminal
-                                .get_or_insert_default()
-                                .font_family = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Font Fallbacks",
-                    description: "Font fallbacks for terminal text. If not set, defaults to buffer font fallbacks.",
-                    field: Box::new(
-                        SettingField {
-                            json_path: Some("terminal.font_fallbacks"),
-                            pick: |settings_content| {
-                                settings_content
-                                    .terminal
-                                    .as_ref()
-                                    .and_then(|terminal| terminal.font_fallbacks.as_ref())
-                                    .or(settings_content.theme.buffer_font_fallbacks.as_ref())
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-                                    .terminal
-                                    .get_or_insert_default()
-                                    .font_fallbacks = value;
-                            },
-                        }
-                        .unimplemented(),
-                    ),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Font Weight",
-                    description: "Font weight for terminal text in CSS weight units (100-900).",
-                    field: Box::new(SettingField {
-                        json_path: Some("terminal.font_weight"),
-                        pick: |settings_content| {
-                            settings_content.terminal.as_ref()?.font_weight.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .terminal
-                                .get_or_insert_default()
-                                .font_weight = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Font Features",
-                    description: "Font features for terminal text.",
-                    field: Box::new(
-                        SettingField {
-                            json_path: Some("terminal.font_features"),
-                            pick: |settings_content| {
-                                settings_content
-                                    .terminal
-                                    .as_ref()
-                                    .and_then(|terminal| terminal.font_features.as_ref())
-                                    .or(settings_content.theme.buffer_font_features.as_ref())
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-                                    .terminal
-                                    .get_or_insert_default()
-                                    .font_features = value;
-                            },
-                        }
-                        .unimplemented(),
-                    ),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SectionHeader("Display Settings"),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Line Height",
-                    description: "Line height for terminal text.",
-                    field: Box::new(
-                        SettingField {
-                            json_path: Some("terminal.line_height"),
-                            pick: |settings_content| {
-                                settings_content.terminal.as_ref()?.line_height.as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-                                    .terminal
-                                    .get_or_insert_default()
-                                    .line_height = value;
-                            },
-                        }
-                        .unimplemented(),
-                    ),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Cursor Shape",
-                    description: "Default cursor shape for the terminal (bar, block, underline, or hollow).",
-                    field: Box::new(SettingField {
-                        json_path: Some("terminal.cursor_shape"),
-                        pick: |settings_content| {
-                            settings_content.terminal.as_ref()?.cursor_shape.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .terminal
-                                .get_or_insert_default()
-                                .cursor_shape = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Cursor Blinking",
-                    description: "Sets the cursor blinking behavior in the terminal.",
-                    field: Box::new(SettingField {
-                        json_path: Some("terminal.blinking"),
-                        pick: |settings_content| {
-                            settings_content.terminal.as_ref()?.blinking.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content.terminal.get_or_insert_default().blinking = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Alternate Scroll",
-                    description: "Whether alternate scroll mode is active by default (converts mouse scroll to arrow keys in apps like Vim).",
-                    field: Box::new(SettingField {
-                        json_path: Some("terminal.alternate_scroll"),
-                        pick: |settings_content| {
-                            settings_content
-                                .terminal
-                                .as_ref()?
-                                .alternate_scroll
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .terminal
-                                .get_or_insert_default()
-                                .alternate_scroll = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Minimum Contrast",
-                    description: "The minimum APCA perceptual contrast between foreground and background colors (0-106).",
-                    field: Box::new(SettingField {
-                        json_path: Some("terminal.minimum_contrast"),
-                        pick: |settings_content| {
-                            settings_content
-                                .terminal
-                                .as_ref()?
-                                .minimum_contrast
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .terminal
-                                .get_or_insert_default()
-                                .minimum_contrast = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SectionHeader("Behavior Settings"),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Option As Meta",
-                    description: "Whether the option key behaves as the meta key.",
-                    field: Box::new(SettingField {
-                        json_path: Some("terminal.option_as_meta"),
-                        pick: |settings_content| {
-                            settings_content.terminal.as_ref()?.option_as_meta.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .terminal
-                                .get_or_insert_default()
-                                .option_as_meta = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Copy On Select",
-                    description: "Whether selecting text in the terminal automatically copies to the system clipboard.",
-                    field: Box::new(SettingField {
-                        json_path: Some("terminal.copy_on_select"),
-                        pick: |settings_content| {
-                            settings_content.terminal.as_ref()?.copy_on_select.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .terminal
-                                .get_or_insert_default()
-                                .copy_on_select = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Keep Selection On Copy",
-                    description: "Whether to keep the text selection after copying it to the clipboard.",
-                    field: Box::new(SettingField {
-                        json_path: Some("terminal.keep_selection_on_copy"),
-                        pick: |settings_content| {
-                            settings_content
-                                .terminal
-                                .as_ref()?
-                                .keep_selection_on_copy
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .terminal
-                                .get_or_insert_default()
-                                .keep_selection_on_copy = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SectionHeader("Layout Settings"),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Default Width",
-                    description: "Default width when the terminal is docked to the left or right (in pixels).",
-                    field: Box::new(SettingField {
-                        json_path: Some("terminal.default_width"),
-                        pick: |settings_content| {
-                            settings_content.terminal.as_ref()?.default_width.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .terminal
-                                .get_or_insert_default()
-                                .default_width = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Default Height",
-                    description: "Default height when the terminal is docked to the bottom (in pixels).",
-                    field: Box::new(SettingField {
-                        json_path: Some("terminal.default_height"),
-                        pick: |settings_content| {
-                            settings_content.terminal.as_ref()?.default_height.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .terminal
-                                .get_or_insert_default()
-                                .default_height = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SectionHeader("Advanced Settings"),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Max Scroll History Lines",
-                    description: "Maximum number of lines to keep in scrollback history (max: 100,000; 0 disables scrolling).",
-                    field: Box::new(SettingField {
-                        json_path: Some("terminal.max_scroll_history_lines"),
-                        pick: |settings_content| {
-                            settings_content
-                                .terminal
-                                .as_ref()?
-                                .max_scroll_history_lines
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .terminal
-                                .get_or_insert_default()
-                                .max_scroll_history_lines = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Scroll Multiplier",
-                    description: "The multiplier for scrolling in the terminal with the mouse wheel",
-                    field: Box::new(SettingField {
-                        json_path: Some("terminal.scroll_multiplier"),
-                        pick: |settings_content| {
-                            settings_content.terminal.as_ref()?.scroll_multiplier.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .terminal
-                                .get_or_insert_default()
-                                .scroll_multiplier = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SectionHeader("Toolbar"),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Breadcrumbs",
-                    description: "Display the terminal title in breadcrumbs inside the terminal pane.",
-                    field: Box::new(SettingField {
-                        json_path: Some("terminal.toolbar.breadcrumbs"),
-                        pick: |settings_content| {
-                            settings_content
-                                .terminal
-                                .as_ref()?
-                                .toolbar
-                                .as_ref()?
-                                .breadcrumbs
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .terminal
-                                .get_or_insert_default()
-                                .toolbar
-                                .get_or_insert_default()
-                                .breadcrumbs = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SectionHeader("Scrollbar"),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Show Scrollbar",
-                    description: "When to show the scrollbar in the terminal.",
-                    field: Box::new(SettingField {
-                        json_path: Some("terminal.scrollbar.show"),
-                        pick: |settings_content| {
-                            show_scrollbar_or_editor(settings_content, |settings_content| {
-                                settings_content
-                                    .terminal
-                                    .as_ref()?
-                                    .scrollbar
-                                    .as_ref()?
-                                    .show
-                                    .as_ref()
-                            })
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .terminal
-                                .get_or_insert_default()
-                                .scrollbar
-                                .get_or_insert_default()
-                                .show = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-            ],
-        },
-        SettingsPage {
-            title: "Version Control",
-            items: vec![
-                SettingsPageItem::SectionHeader("Git Gutter"),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Visibility",
-                    description: "Control whether Git status is shown in the editor's gutter.",
-                    field: Box::new(SettingField {
-                        json_path: Some("git.git_gutter"),
-                        pick: |settings_content| settings_content.git.as_ref()?.git_gutter.as_ref(),
-                        write: |settings_content, value| {
-                            settings_content.git.get_or_insert_default().git_gutter = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                // todo(settings_ui): Figure out the right default for this value in default.json
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Debounce",
-                    description: "Debounce threshold in milliseconds after which changes are reflected in the Git gutter.",
-                    field: Box::new(SettingField {
-                        json_path: Some("git.gutter_debounce"),
-                        pick: |settings_content| {
-                            settings_content.git.as_ref()?.gutter_debounce.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content.git.get_or_insert_default().gutter_debounce = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SectionHeader("Inline Git Blame"),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Enabled",
-                    description: "Whether or not to show Git blame data inline in the currently focused line.",
-                    field: Box::new(SettingField {
-                        json_path: Some("git.inline_blame.enabled"),
-                        pick: |settings_content| {
-                            settings_content
-                                .git
-                                .as_ref()?
-                                .inline_blame
-                                .as_ref()?
-                                .enabled
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .git
-                                .get_or_insert_default()
-                                .inline_blame
-                                .get_or_insert_default()
-                                .enabled = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Delay",
-                    description: "The delay after which the inline blame information is shown.",
-                    field: Box::new(SettingField {
-                        json_path: Some("git.inline_blame.delay_ms"),
-                        pick: |settings_content| {
-                            settings_content
-                                .git
-                                .as_ref()?
-                                .inline_blame
-                                .as_ref()?
-                                .delay_ms
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .git
-                                .get_or_insert_default()
-                                .inline_blame
-                                .get_or_insert_default()
-                                .delay_ms = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Padding",
-                    description: "Padding between the end of the source line and the start of the inline blame in columns.",
-                    field: Box::new(SettingField {
-                        json_path: Some("git.inline_blame.padding"),
-                        pick: |settings_content| {
-                            settings_content
-                                .git
-                                .as_ref()?
-                                .inline_blame
-                                .as_ref()?
-                                .padding
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .git
-                                .get_or_insert_default()
-                                .inline_blame
-                                .get_or_insert_default()
-                                .padding = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Minimum Column",
-                    description: "The minimum column number at which to show the inline blame information.",
-                    field: Box::new(SettingField {
-                        json_path: Some("git.inline_blame.min_column"),
-                        pick: |settings_content| {
-                            settings_content
-                                .git
-                                .as_ref()?
-                                .inline_blame
-                                .as_ref()?
-                                .min_column
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .git
-                                .get_or_insert_default()
-                                .inline_blame
-                                .get_or_insert_default()
-                                .min_column = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Show Commit Summary",
-                    description: "Show commit summary as part of the inline blame.",
-                    field: Box::new(SettingField {
-                        json_path: Some("git.inline_blame.show_commit_summary"),
-                        pick: |settings_content| {
-                            settings_content
-                                .git
-                                .as_ref()?
-                                .inline_blame
-                                .as_ref()?
-                                .show_commit_summary
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .git
-                                .get_or_insert_default()
-                                .inline_blame
-                                .get_or_insert_default()
-                                .show_commit_summary = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SectionHeader("Git Blame View"),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Show Avatar",
-                    description: "Show the avatar of the author of the commit.",
-                    field: Box::new(SettingField {
-                        json_path: Some("git.blame.show_avatar"),
-                        pick: |settings_content| {
-                            settings_content
-                                .git
-                                .as_ref()?
-                                .blame
-                                .as_ref()?
-                                .show_avatar
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .git
-                                .get_or_insert_default()
-                                .blame
-                                .get_or_insert_default()
-                                .show_avatar = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SectionHeader("Branch Picker"),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Show Author Name",
-                    description: "Show author name as part of the commit information in branch picker.",
-                    field: Box::new(SettingField {
-                        json_path: Some("git.branch_picker.show_author_name"),
-                        pick: |settings_content| {
-                            settings_content
-                                .git
-                                .as_ref()?
-                                .branch_picker
-                                .as_ref()?
-                                .show_author_name
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .git
-                                .get_or_insert_default()
-                                .branch_picker
-                                .get_or_insert_default()
-                                .show_author_name = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SectionHeader("Git Hunks"),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Hunk Style",
-                    description: "How Git hunks are displayed visually in the editor.",
-                    field: Box::new(SettingField {
-                        json_path: Some("git.hunk_style"),
-                        pick: |settings_content| settings_content.git.as_ref()?.hunk_style.as_ref(),
-                        write: |settings_content, value| {
-                            settings_content.git.get_or_insert_default().hunk_style = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Path Style",
-                    description: "Should the name or path be displayed first in the git view.",
-                    field: Box::new(SettingField {
-                        json_path: Some("git.path_style"),
-                        pick: |settings_content| settings_content.git.as_ref()?.path_style.as_ref(),
-                        write: |settings_content, value| {
-                            settings_content.git.get_or_insert_default().path_style = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-            ],
-        },
-        SettingsPage {
-            title: "Collaboration",
-            items: vec![
-                SettingsPageItem::SectionHeader("Calls"),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Mute On Join",
-                    description: "Whether the microphone should be muted when joining a channel or a call.",
-                    field: Box::new(SettingField {
-                        json_path: Some("calls.mute_on_join"),
-                        pick: |settings_content| {
-                            settings_content.calls.as_ref()?.mute_on_join.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content.calls.get_or_insert_default().mute_on_join = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Share On Join",
-                    description: "Whether your current project should be shared when joining an empty channel.",
-                    field: Box::new(SettingField {
-                        json_path: Some("calls.share_on_join"),
-                        pick: |settings_content| {
-                            settings_content.calls.as_ref()?.share_on_join.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content.calls.get_or_insert_default().share_on_join = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SectionHeader("Experimental"),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Rodio Audio",
-                    description: "Opt into the new audio system.",
-                    field: Box::new(SettingField {
-                        json_path: Some("audio.experimental.rodio_audio"),
-                        pick: |settings_content| {
-                            settings_content.audio.as_ref()?.rodio_audio.as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content.audio.get_or_insert_default().rodio_audio = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Auto Microphone Volume",
-                    description: "Automatically adjust microphone volume (requires rodio audio).",
-                    field: Box::new(SettingField {
-                        json_path: Some("audio.experimental.auto_microphone_volume"),
-                        pick: |settings_content| {
-                            settings_content
-                                .audio
-                                .as_ref()?
-                                .auto_microphone_volume
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .audio
-                                .get_or_insert_default()
-                                .auto_microphone_volume = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Auto Speaker Volume",
-                    description: "Automatically adjust volume of other call members (requires rodio audio).",
-                    field: Box::new(SettingField {
-                        json_path: Some("audio.experimental.auto_speaker_volume"),
-                        pick: |settings_content| {
-                            settings_content
-                                .audio
-                                .as_ref()?
-                                .auto_speaker_volume
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .audio
-                                .get_or_insert_default()
-                                .auto_speaker_volume = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Denoise",
-                    description: "Remove background noises (requires rodio audio).",
-                    field: Box::new(SettingField {
-                        json_path: Some("audio.experimental.denoise"),
-                        pick: |settings_content| settings_content.audio.as_ref()?.denoise.as_ref(),
-                        write: |settings_content, value| {
-                            settings_content.audio.get_or_insert_default().denoise = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Legacy Audio Compatible",
-                    description: "Use audio parameters compatible with previous versions (requires rodio audio).",
-                    field: Box::new(SettingField {
-                        json_path: Some("audio.experimental.legacy_audio_compatible"),
-                        pick: |settings_content| {
-                            settings_content
-                                .audio
-                                .as_ref()?
-                                .legacy_audio_compatible
-                                .as_ref()
-                        },
-                        write: |settings_content, value| {
-                            settings_content
-                                .audio
-                                .get_or_insert_default()
-                                .legacy_audio_compatible = value;
-                        },
-                    }),
-                    metadata: None,
-                    files: USER,
-                }),
-            ],
-        },
-        SettingsPage {
-            title: "AI",
-            items: {
-                let mut items = vec![
-                    SettingsPageItem::SectionHeader("General"),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Disable AI",
-                        description: "Whether to disable all AI features in Zed.",
-                        field: Box::new(SettingField {
-                            json_path: Some("disable_ai"),
-                            pick: |settings_content| settings_content.disable_ai.as_ref(),
-                            write: |settings_content, value| {
-                                settings_content.disable_ai = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SectionHeader("Agent Configuration"),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Always Allow Tool Actions",
-                        description: "When enabled, the agent can run potentially destructive actions without asking for your confirmation. This setting has no effect on external agents.",
-                        field: Box::new(SettingField {
-                            json_path: Some("agent.always_allow_tool_actions"),
-                            pick: |settings_content| {
-                                settings_content
-                                    .agent
-                                    .as_ref()?
-                                    .always_allow_tool_actions
-                                    .as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-                                    .agent
-                                    .get_or_insert_default()
-                                    .always_allow_tool_actions = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Single File Review",
-                        description: "When enabled, agent edits will also be displayed in single-file buffers for review.",
-                        field: Box::new(SettingField {
-                            json_path: Some("agent.single_file_review"),
-                            pick: |settings_content| {
-                                settings_content.agent.as_ref()?.single_file_review.as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-                                    .agent
-                                    .get_or_insert_default()
-                                    .single_file_review = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Enable Feedback",
-                        description: "Show voting thumbs up/down icon buttons for feedback on agent edits.",
-                        field: Box::new(SettingField {
-                            json_path: Some("agent.enable_feedback"),
-                            pick: |settings_content| {
-                                settings_content.agent.as_ref()?.enable_feedback.as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-                                    .agent
-                                    .get_or_insert_default()
-                                    .enable_feedback = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Notify When Agent Waiting",
-                        description: "Where to show notifications when the agent has completed its response or needs confirmation before running a tool action.",
-                        field: Box::new(SettingField {
-                            json_path: Some("agent.notify_when_agent_waiting"),
-                            pick: |settings_content| {
-                                settings_content
-                                    .agent
-                                    .as_ref()?
-                                    .notify_when_agent_waiting
-                                    .as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-                                    .agent
-                                    .get_or_insert_default()
-                                    .notify_when_agent_waiting = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Play Sound When Agent Done",
-                        description: "Whether to play a sound when the agent has either completed its response, or needs user input.",
-                        field: Box::new(SettingField {
-                            json_path: Some("agent.play_sound_when_agent_done"),
-                            pick: |settings_content| {
-                                settings_content
-                                    .agent
-                                    .as_ref()?
-                                    .play_sound_when_agent_done
-                                    .as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-                                    .agent
-                                    .get_or_insert_default()
-                                    .play_sound_when_agent_done = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Expand Edit Card",
-                        description: "Whether to have edit cards in the agent panel expanded, showing a Preview of the diff.",
-                        field: Box::new(SettingField {
-                            json_path: Some("agent.expand_edit_card"),
-                            pick: |settings_content| {
-                                settings_content.agent.as_ref()?.expand_edit_card.as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-                                    .agent
-                                    .get_or_insert_default()
-                                    .expand_edit_card = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Expand Terminal Card",
-                        description: "Whether to have terminal cards in the agent panel expanded, showing the whole command output.",
-                        field: Box::new(SettingField {
-                            json_path: Some("agent.expand_terminal_card"),
-                            pick: |settings_content| {
-                                settings_content
-                                    .agent
-                                    .as_ref()?
-                                    .expand_terminal_card
-                                    .as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-                                    .agent
-                                    .get_or_insert_default()
-                                    .expand_terminal_card = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Use Modifier To Send",
-                        description: "Whether to always use cmd-enter (or ctrl-enter on Linux or Windows) to send messages.",
-                        field: Box::new(SettingField {
-                            json_path: Some("agent.use_modifier_to_send"),
-                            pick: |settings_content| {
-                                settings_content
-                                    .agent
-                                    .as_ref()?
-                                    .use_modifier_to_send
-                                    .as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-                                    .agent
-                                    .get_or_insert_default()
-                                    .use_modifier_to_send = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                    SettingsPageItem::SettingItem(SettingItem {
-                        title: "Message Editor Min Lines",
-                        description: "Minimum number of lines to display in the agent message editor.",
-                        field: Box::new(SettingField {
-                            json_path: Some("agent.message_editor_min_lines"),
-                            pick: |settings_content| {
-                                settings_content
-                                    .agent
-                                    .as_ref()?
-                                    .message_editor_min_lines
-                                    .as_ref()
-                            },
-                            write: |settings_content, value| {
-                                settings_content
-                                    .agent
-                                    .get_or_insert_default()
-                                    .message_editor_min_lines = value;
-                            },
-                        }),
-                        metadata: None,
-                        files: USER,
-                    }),
-                ];
-                items.extend(edit_prediction_language_settings_section());
-                items.extend(
-                    [
-                        SettingsPageItem::SettingItem(SettingItem {
-                            title: "Display Mode",
-                            description: "When to show edit predictions previews in buffer. The eager mode displays them inline, while the subtle mode displays them only when holding a modifier key.",
-                            field: Box::new(SettingField {
-                                json_path: Some("edit_prediction.display_mode"),
-                                pick: |settings_content| {
-                                    settings_content.project.all_languages.edit_predictions.as_ref()?.mode.as_ref()
-                                },
-                                write: |settings_content, value| {
-                                    settings_content.project.all_languages.edit_predictions.get_or_insert_default().mode = value;
-                                },
-                            }),
-                            metadata: None,
-                            files: USER,
-                        }),
-                        SettingsPageItem::SettingItem(SettingItem {
-                            title: "In Text Threads",
-                            description: "Whether edit predictions are enabled when editing text threads in the agent panel.",
-                            field: Box::new(SettingField {
-                                json_path: Some("edit_prediction.in_text_threads"),
-                                pick: |settings_content| {
-                                    settings_content.project.all_languages.edit_predictions.as_ref()?.enabled_in_text_threads.as_ref()
-                                },
-                                write: |settings_content, value| {
-                                    settings_content.project.all_languages.edit_predictions.get_or_insert_default().enabled_in_text_threads = value;
-                                },
-                            }),
-                            metadata: None,
-                            files: USER,
-                        }),
-                        SettingsPageItem::SettingItem(SettingItem {
-                            title: "Copilot Provider",
-                            description: "Use GitHub Copilot as your edit prediction provider.",
-                            field: Box::new(
-                                SettingField {
-                                    json_path: Some("edit_prediction.copilot_provider"),
-                                    pick: |settings_content| {
-                                        settings_content.project.all_languages.edit_predictions.as_ref()?.copilot.as_ref()
-                                    },
-                                    write: |settings_content, value| {
-                                        settings_content.project.all_languages.edit_predictions.get_or_insert_default().copilot = value;
-                                    },
-                                }
-                                .unimplemented(),
-                            ),
-                            metadata: None,
-                            files: USER | PROJECT,
-                        }),
-                        SettingsPageItem::SettingItem(SettingItem {
-                            title: "Codestral Provider",
-                            description: "Use Mistral's Codestral as your edit prediction provider.",
-                            field: Box::new(
-                                SettingField {
-                                    json_path: Some("edit_prediction.codestral_provider"),
-                                    pick: |settings_content| {
-                                        settings_content.project.all_languages.edit_predictions.as_ref()?.codestral.as_ref()
-                                    },
-                                    write: |settings_content, value| {
-                                        settings_content.project.all_languages.edit_predictions.get_or_insert_default().codestral = value;
-                                    },
-                                }
-                                .unimplemented(),
-                            ),
-                            metadata: None,
-                            files: USER | PROJECT,
-                        }),
-                    ]
-                );
-                items
-            },
-        },
-        SettingsPage {
-            title: "Network",
-            items: vec![
-                SettingsPageItem::SectionHeader("Network"),
-                // todo(settings_ui): Proxy needs a default
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Proxy",
-                    description: "The proxy to use for network requests.",
-                    field: Box::new(
-                        SettingField {
-                            json_path: Some("proxy"),
-                            pick: |settings_content| settings_content.proxy.as_ref(),
-                            write: |settings_content, value| {
-                                settings_content.proxy = value;
-                            },
-                        }
-                        .unimplemented(),
-                    ),
-                    metadata: Some(Box::new(SettingsFieldMetadata {
-                        placeholder: Some("socks5h://localhost:10808"),
-                        ..Default::default()
-                    })),
-                    files: USER,
-                }),
-                SettingsPageItem::SettingItem(SettingItem {
-                    title: "Server URL",
-                    description: "The URL of the Zed server to connect to.",
-                    field: Box::new(SettingField {
-                        json_path: Some("server_url"),
-                        pick: |settings_content| settings_content.server_url.as_ref(),
-                        write: |settings_content, value| {
-                            settings_content.server_url = value;
-                        },
-                    }),
-                    metadata: Some(Box::new(SettingsFieldMetadata {
-                        placeholder: Some("https://zed.dev"),
-                        ..Default::default()
-                    })),
-                    files: USER,
-                }),
-            ],
-        },
-    ]
-}
-
-const LANGUAGES_SECTION_HEADER: &'static str = "Languages";
-
-fn current_language() -> Option<SharedString> {
-    sub_page_stack().iter().find_map(|page| {
-        (page.section_header == LANGUAGES_SECTION_HEADER).then(|| page.link.title.clone())
-    })
-}
-
-fn language_settings_field<T>(
-    settings_content: &SettingsContent,
-    get: fn(&LanguageSettingsContent) -> Option<&T>,
-) -> Option<&T> {
-    let all_languages = &settings_content.project.all_languages;
-    if let Some(current_language_name) = current_language() {
-        if let Some(current_language) = all_languages.languages.0.get(&current_language_name) {
-            let value = get(current_language);
-            if value.is_some() {
-                return value;
-            }
-        }
-    }
-    let default_value = get(&all_languages.defaults);
-    return default_value;
-}
-
-fn language_settings_field_mut<T>(
-    settings_content: &mut SettingsContent,
-    value: Option<T>,
-    write: fn(&mut LanguageSettingsContent, Option<T>),
-) {
-    let all_languages = &mut settings_content.project.all_languages;
-    let language_content = if let Some(current_language) = current_language() {
-        all_languages
-            .languages
-            .0
-            .entry(current_language)
-            .or_default()
-    } else {
-        &mut all_languages.defaults
-    };
-    write(language_content, value);
-}
-
-fn language_settings_data() -> Vec<SettingsPageItem> {
-    let mut items = vec![
-        SettingsPageItem::SectionHeader("Indentation"),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Tab Size",
-            description: "How many columns a tab should occupy.",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).tab_size"), // TODO(cameron): not JQ syntax because not URL-safe
-                pick: |settings_content| {
-                    language_settings_field(settings_content, |language| language.tab_size.as_ref())
-                },
-                write: |settings_content, value| {
-                    language_settings_field_mut(settings_content, value, |language, value| {
-                        language.tab_size = value;
-                    })
-                },
-            }),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Hard Tabs",
-            description: "Whether to indent lines using tab characters, as opposed to multiple spaces.",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).hard_tabs"),
-                pick: |settings_content| {
-                    language_settings_field(settings_content, |language| {
-                        language.hard_tabs.as_ref()
-                    })
-                },
-                write: |settings_content, value| {
-                    language_settings_field_mut(settings_content, value, |language, value| {
-                        language.hard_tabs = value;
-                    })
-                },
-            }),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Auto Indent",
-            description: "Whether indentation should be adjusted based on the context whilst typing.",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).auto_indent"),
-                pick: |settings_content| {
-                    language_settings_field(settings_content, |language| {
-                        language.auto_indent.as_ref()
-                    })
-                },
-                write: |settings_content, value| {
-                    language_settings_field_mut(settings_content, value, |language, value| {
-                        language.auto_indent = value;
-                    })
-                },
-            }),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Auto Indent On Paste",
-            description: "Whether indentation of pasted content should be adjusted based on the context.",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).auto_indent_on_paste"),
-                pick: |settings_content| {
-                    language_settings_field(settings_content, |language| {
-                        language.auto_indent_on_paste.as_ref()
-                    })
-                },
-                write: |settings_content, value| {
-                    language_settings_field_mut(settings_content, value, |language, value| {
-                        language.auto_indent_on_paste = value;
-                    })
-                },
-            }),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SectionHeader("Wrapping"),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Soft Wrap",
-            description: "How to soft-wrap long lines of text.",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).soft_wrap"),
-                pick: |settings_content| {
-                    language_settings_field(settings_content, |language| {
-                        language.soft_wrap.as_ref()
-                    })
-                },
-                write: |settings_content, value| {
-                    language_settings_field_mut(settings_content, value, |language, value| {
-                        language.soft_wrap = value;
-                    })
-                },
-            }),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Show Wrap Guides",
-            description: "Show wrap guides in the editor.",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).show_wrap_guides"),
-                pick: |settings_content| {
-                    language_settings_field(settings_content, |language| {
-                        language.show_wrap_guides.as_ref()
-                    })
-                },
-                write: |settings_content, value| {
-                    language_settings_field_mut(settings_content, value, |language, value| {
-                        language.show_wrap_guides = value;
-                    })
-                },
-            }),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Preferred Line Length",
-            description: "The column at which to soft-wrap lines, for buffers where soft-wrap is enabled.",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).preferred_line_length"),
-                pick: |settings_content| {
-                    language_settings_field(settings_content, |language| {
-                        language.preferred_line_length.as_ref()
-                    })
-                },
-                write: |settings_content, value| {
-                    language_settings_field_mut(settings_content, value, |language, value| {
-                        language.preferred_line_length = value;
-                    })
-                },
-            }),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Wrap Guides",
-            description: "Character counts at which to show wrap guides in the editor.",
-            field: Box::new(
-                SettingField {
-                    json_path: Some("languages.$(language).wrap_guides"),
-                    pick: |settings_content| {
-                        language_settings_field(settings_content, |language| {
-                            language.wrap_guides.as_ref()
-                        })
-                    },
-                    write: |settings_content, value| {
-                        language_settings_field_mut(settings_content, value, |language, value| {
-                            language.wrap_guides = value;
-                        })
-                    },
-                }
-                .unimplemented(),
-            ),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Allow Rewrap",
-            description: "Controls where the `editor::rewrap` action is allowed for this language.",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).allow_rewrap"),
-                pick: |settings_content| {
-                    language_settings_field(settings_content, |language| {
-                        language.allow_rewrap.as_ref()
-                    })
-                },
-                write: |settings_content, value| {
-                    language_settings_field_mut(settings_content, value, |language, value| {
-                        language.allow_rewrap = value;
-                    })
-                },
-            }),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SectionHeader("Indent Guides"),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Enabled",
-            description: "Display indent guides in the editor.",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).indent_guides.enabled"),
-                pick: |settings_content| {
-                    language_settings_field(settings_content, |language| {
-                        language
-                            .indent_guides
-                            .as_ref()
-                            .and_then(|indent_guides| indent_guides.enabled.as_ref())
-                    })
-                },
-                write: |settings_content, value| {
-                    language_settings_field_mut(settings_content, value, |language, value| {
-                        language.indent_guides.get_or_insert_default().enabled = value;
-                    })
-                },
-            }),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Line Width",
-            description: "The width of the indent guides in pixels, between 1 and 10.",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).indent_guides.line_width"),
-                pick: |settings_content| {
-                    language_settings_field(settings_content, |language| {
-                        language
-                            .indent_guides
-                            .as_ref()
-                            .and_then(|indent_guides| indent_guides.line_width.as_ref())
-                    })
-                },
-                write: |settings_content, value| {
-                    language_settings_field_mut(settings_content, value, |language, value| {
-                        language.indent_guides.get_or_insert_default().line_width = value;
-                    })
-                },
-            }),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Active Line Width",
-            description: "The width of the active indent guide in pixels, between 1 and 10.",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).indent_guides.active_line_width"),
-                pick: |settings_content| {
-                    language_settings_field(settings_content, |language| {
-                        language
-                            .indent_guides
-                            .as_ref()
-                            .and_then(|indent_guides| indent_guides.active_line_width.as_ref())
-                    })
-                },
-                write: |settings_content, value| {
-                    language_settings_field_mut(settings_content, value, |language, value| {
-                        language
-                            .indent_guides
-                            .get_or_insert_default()
-                            .active_line_width = value;
-                    })
-                },
-            }),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Coloring",
-            description: "Determines how indent guides are colored.",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).indent_guides.coloring"),
-                pick: |settings_content| {
-                    language_settings_field(settings_content, |language| {
-                        language
-                            .indent_guides
-                            .as_ref()
-                            .and_then(|indent_guides| indent_guides.coloring.as_ref())
-                    })
-                },
-                write: |settings_content, value| {
-                    language_settings_field_mut(settings_content, value, |language, value| {
-                        language.indent_guides.get_or_insert_default().coloring = value;
-                    })
-                },
-            }),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Background Coloring",
-            description: "Determines how indent guide backgrounds are colored.",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).indent_guides.background_coloring"),
-                pick: |settings_content| {
-                    language_settings_field(settings_content, |language| {
-                        language
-                            .indent_guides
-                            .as_ref()
-                            .and_then(|indent_guides| indent_guides.background_coloring.as_ref())
-                    })
-                },
-                write: |settings_content, value| {
-                    language_settings_field_mut(settings_content, value, |language, value| {
-                        language
-                            .indent_guides
-                            .get_or_insert_default()
-                            .background_coloring = value;
-                    })
-                },
-            }),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SectionHeader("Formatting"),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Format On Save",
-            description: "Whether or not to perform a buffer format before saving.",
-            field: Box::new(
-                // TODO(settings_ui): this setting should just be a bool
-                SettingField {
-                    json_path: Some("languages.$(language).format_on_save"),
-                    pick: |settings_content| {
-                        language_settings_field(settings_content, |language| {
-                            language.format_on_save.as_ref()
-                        })
-                    },
-                    write: |settings_content, value| {
-                        language_settings_field_mut(settings_content, value, |language, value| {
-                            language.format_on_save = value;
-                        })
-                    },
-                },
-            ),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Remove Trailing Whitespace On Save",
-            description: "Whether or not to remove any trailing whitespace from lines of a buffer before saving it.",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).remove_trailing_whitespace_on_save"),
-                pick: |settings_content| {
-                    language_settings_field(settings_content, |language| {
-                        language.remove_trailing_whitespace_on_save.as_ref()
-                    })
-                },
-                write: |settings_content, value| {
-                    language_settings_field_mut(settings_content, value, |language, value| {
-                        language.remove_trailing_whitespace_on_save = value;
-                    })
-                },
-            }),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Ensure Final Newline On Save",
-            description: "Whether or not to ensure there's a single newline at the end of a buffer when saving it.",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).ensure_final_newline_on_save"),
-                pick: |settings_content| {
-                    language_settings_field(settings_content, |language| {
-                        language.ensure_final_newline_on_save.as_ref()
-                    })
-                },
-                write: |settings_content, value| {
-                    language_settings_field_mut(settings_content, value, |language, value| {
-                        language.ensure_final_newline_on_save = value;
-                    })
-                },
-            }),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Formatter",
-            description: "How to perform a buffer format.",
-            field: Box::new(
-                SettingField {
-                    json_path: Some("languages.$(language).formatter"),
-                    pick: |settings_content| {
-                        language_settings_field(settings_content, |language| {
-                            language.formatter.as_ref()
-                        })
-                    },
-                    write: |settings_content, value| {
-                        language_settings_field_mut(settings_content, value, |language, value| {
-                            language.formatter = value;
-                        })
-                    },
-                }
-                .unimplemented(),
-            ),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Use On Type Format",
-            description: "Whether to use additional LSP queries to format (and amend) the code after every \"trigger\" symbol input, defined by LSP server capabilities",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).use_on_type_format"),
-                pick: |settings_content| {
-                    language_settings_field(settings_content, |language| {
-                        language.use_on_type_format.as_ref()
-                    })
-                },
-                write: |settings_content, value| {
-                    language_settings_field_mut(settings_content, value, |language, value| {
-                        language.use_on_type_format = value;
-                    })
-                },
-            }),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Code Actions On Format",
-            description: "Additional code actions to run when formatting.",
-            field: Box::new(
-                SettingField {
-                    json_path: Some("languages.$(language).code_actions_on_format"),
-                    pick: |settings_content| {
-                        language_settings_field(settings_content, |language| {
-                            language.code_actions_on_format.as_ref()
-                        })
-                    },
-                    write: |settings_content, value| {
-                        language_settings_field_mut(settings_content, value, |language, value| {
-                            language.code_actions_on_format = value;
-                        })
-                    },
-                }
-                .unimplemented(),
-            ),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SectionHeader("Autoclose"),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Use Autoclose",
-            description: "Whether to automatically type closing characters for you. For example, when you type '(', Zed will automatically add a closing ')' at the correct position.",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).use_autoclose"),
-                pick: |settings_content| {
-                    language_settings_field(settings_content, |language| {
-                        language.use_autoclose.as_ref()
-                    })
-                },
-                write: |settings_content, value| {
-                    language_settings_field_mut(settings_content, value, |language, value| {
-                        language.use_autoclose = value;
-                    })
-                },
-            }),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Use Auto Surround",
-            description: "Whether to automatically surround text with characters for you. For example, when you select text and type '(', Zed will automatically surround text with ().",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).use_auto_surround"),
-                pick: |settings_content| {
-                    language_settings_field(settings_content, |language| {
-                        language.use_auto_surround.as_ref()
-                    })
-                },
-                write: |settings_content, value| {
-                    language_settings_field_mut(settings_content, value, |language, value| {
-                        language.use_auto_surround = value;
-                    })
-                },
-            }),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Always Treat Brackets As Autoclosed",
-            description: "Controls whether the closing characters are always skipped over and auto-removed no matter how they were inserted.",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).always_treat_brackets_as_autoclosed"),
-                pick: |settings_content| {
-                    language_settings_field(settings_content, |language| {
-                        language.always_treat_brackets_as_autoclosed.as_ref()
-                    })
-                },
-                write: |settings_content, value| {
-                    language_settings_field_mut(settings_content, value, |language, value| {
-                        language.always_treat_brackets_as_autoclosed = value;
-                    })
-                },
-            }),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "JSX Tag Auto Close",
-            description: "Whether to automatically close JSX tags.",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).jsx_tag_auto_close"),
-                // TODO(settings_ui): this setting should just be a bool
-                pick: |settings_content| {
-                    language_settings_field(settings_content, |language| {
-                        language.jsx_tag_auto_close.as_ref()?.enabled.as_ref()
-                    })
-                },
-                write: |settings_content, value| {
-                    language_settings_field_mut(settings_content, value, |language, value| {
-                        language.jsx_tag_auto_close.get_or_insert_default().enabled = value;
-                    })
-                },
-            }),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SectionHeader("Whitespace"),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Show Whitespaces",
-            description: "Whether to show tabs and spaces in the editor.",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).show_whitespaces"),
-                pick: |settings_content| {
-                    language_settings_field(settings_content, |language| {
-                        language.show_whitespaces.as_ref()
-                    })
-                },
-                write: |settings_content, value| {
-                    language_settings_field_mut(settings_content, value, |language, value| {
-                        language.show_whitespaces = value;
-                    })
-                },
-            }),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Space Whitespace Indicator",
-            description: "Visible character used to render space characters when show_whitespaces is enabled (default: \"•\")",
-            field: Box::new(
-                SettingField {
-                    json_path: Some("languages.$(language).whitespace_map.space"),
-                    pick: |settings_content| {
-                        language_settings_field(settings_content, |language| {
-                            language.whitespace_map.as_ref()?.space.as_ref()
-                        })
-                    },
-                    write: |settings_content, value| {
-                        language_settings_field_mut(settings_content, value, |language, value| {
-                            language.whitespace_map.get_or_insert_default().space = value;
-                        })
-                    },
-                }
-                .unimplemented(),
-            ),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Tab Whitespace Indicator",
-            description: "Visible character used to render tab characters when show_whitespaces is enabled (default: \"→\")",
-            field: Box::new(
-                SettingField {
-                    json_path: Some("languages.$(language).whitespace_map.tab"),
-                    pick: |settings_content| {
-                        language_settings_field(settings_content, |language| {
-                            language.whitespace_map.as_ref()?.tab.as_ref()
-                        })
-                    },
-                    write: |settings_content, value| {
-                        language_settings_field_mut(settings_content, value, |language, value| {
-                            language.whitespace_map.get_or_insert_default().tab = value;
-                        })
-                    },
-                }
-                .unimplemented(),
-            ),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SectionHeader("Completions"),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Show Completions On Input",
-            description: "Whether to pop the completions menu while typing in an editor without explicitly requesting it.",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).show_completions_on_input"),
-                pick: |settings_content| {
-                    language_settings_field(settings_content, |language| {
-                        language.show_completions_on_input.as_ref()
-                    })
-                },
-                write: |settings_content, value| {
-                    language_settings_field_mut(settings_content, value, |language, value| {
-                        language.show_completions_on_input = value;
-                    })
-                },
-            }),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Show Completion Documentation",
-            description: "Whether to display inline and alongside documentation for items in the completions menu.",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).show_completion_documentation"),
-                pick: |settings_content| {
-                    language_settings_field(settings_content, |language| {
-                        language.show_completion_documentation.as_ref()
-                    })
-                },
-                write: |settings_content, value| {
-                    language_settings_field_mut(settings_content, value, |language, value| {
-                        language.show_completion_documentation = value;
-                    })
-                },
-            }),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Words",
-            description: "Controls how words are completed.",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).completions.words"),
-                pick: |settings_content| {
-                    language_settings_field(settings_content, |language| {
-                        language.completions.as_ref()?.words.as_ref()
-                    })
-                },
-                write: |settings_content, value| {
-                    language_settings_field_mut(settings_content, value, |language, value| {
-                        language.completions.get_or_insert_default().words = value;
-                    })
-                },
-            }),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Words Min Length",
-            description: "How many characters has to be in the completions query to automatically show the words-based completions.",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).completions.words_min_length"),
-                pick: |settings_content| {
-                    language_settings_field(settings_content, |language| {
-                        language.completions.as_ref()?.words_min_length.as_ref()
-                    })
-                },
-                write: |settings_content, value| {
-                    language_settings_field_mut(settings_content, value, |language, value| {
-                        language
-                            .completions
-                            .get_or_insert_default()
-                            .words_min_length = value;
-                    })
-                },
-            }),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Completion Menu Scrollbar",
-            description: "When to show the scrollbar in the completion menu.",
-            field: Box::new(SettingField {
-                json_path: Some("editor.completion_menu_scrollbar"),
-                pick: |settings_content| settings_content.editor.completion_menu_scrollbar.as_ref(),
-                write: |settings_content, value| {
-                    settings_content.editor.completion_menu_scrollbar = value;
-                },
-            }),
-            metadata: None,
-            files: USER,
-        }),
-        SettingsPageItem::SectionHeader("Inlay Hints"),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Enabled",
-            description: "Global switch to toggle hints on and off.",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).inlay_hints.enabled"),
-                pick: |settings_content| {
-                    language_settings_field(settings_content, |language| {
-                        language.inlay_hints.as_ref()?.enabled.as_ref()
-                    })
-                },
-                write: |settings_content, value| {
-                    language_settings_field_mut(settings_content, value, |language, value| {
-                        language.inlay_hints.get_or_insert_default().enabled = value;
-                    })
-                },
-            }),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Show Value Hints",
-            description: "Global switch to toggle inline values on and off when debugging.",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).inlay_hints.show_value_hints"),
-                pick: |settings_content| {
-                    language_settings_field(settings_content, |language| {
-                        language.inlay_hints.as_ref()?.show_value_hints.as_ref()
-                    })
-                },
-                write: |settings_content, value| {
-                    language_settings_field_mut(settings_content, value, |language, value| {
-                        language
-                            .inlay_hints
-                            .get_or_insert_default()
-                            .show_value_hints = value;
-                    })
-                },
-            }),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Show Type Hints",
-            description: "Whether type hints should be shown.",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).inlay_hints.show_type_hints"),
-                pick: |settings_content| {
-                    language_settings_field(settings_content, |language| {
-                        language.inlay_hints.as_ref()?.show_type_hints.as_ref()
-                    })
-                },
-                write: |settings_content, value| {
-                    language_settings_field_mut(settings_content, value, |language, value| {
-                        language.inlay_hints.get_or_insert_default().show_type_hints = value;
-                    })
-                },
-            }),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Show Parameter Hints",
-            description: "Whether parameter hints should be shown.",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).inlay_hints.show_parameter_hints"),
-                pick: |settings_content| {
-                    language_settings_field(settings_content, |language| {
-                        language.inlay_hints.as_ref()?.show_parameter_hints.as_ref()
-                    })
-                },
-                write: |settings_content, value| {
-                    language_settings_field_mut(settings_content, value, |language, value| {
-                        language
-                            .inlay_hints
-                            .get_or_insert_default()
-                            .show_parameter_hints = value;
-                    })
-                },
-            }),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Show Other Hints",
-            description: "Whether other hints should be shown.",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).inlay_hints.show_other_hints"),
-                pick: |settings_content| {
-                    language_settings_field(settings_content, |language| {
-                        language.inlay_hints.as_ref()?.show_other_hints.as_ref()
-                    })
-                },
-                write: |settings_content, value| {
-                    language_settings_field_mut(settings_content, value, |language, value| {
-                        language
-                            .inlay_hints
-                            .get_or_insert_default()
-                            .show_other_hints = value;
-                    })
-                },
-            }),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Show Background",
-            description: "Show a background for inlay hints.",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).inlay_hints.show_background"),
-                pick: |settings_content| {
-                    language_settings_field(settings_content, |language| {
-                        language.inlay_hints.as_ref()?.show_background.as_ref()
-                    })
-                },
-                write: |settings_content, value| {
-                    language_settings_field_mut(settings_content, value, |language, value| {
-                        language.inlay_hints.get_or_insert_default().show_background = value;
-                    })
-                },
-            }),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Edit Debounce Ms",
-            description: "Whether or not to debounce inlay hints updates after buffer edits (set to 0 to disable debouncing).",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).inlay_hints.edit_debounce_ms"),
-                pick: |settings_content| {
-                    language_settings_field(settings_content, |language| {
-                        language.inlay_hints.as_ref()?.edit_debounce_ms.as_ref()
-                    })
-                },
-                write: |settings_content, value| {
-                    language_settings_field_mut(settings_content, value, |language, value| {
-                        language
-                            .inlay_hints
-                            .get_or_insert_default()
-                            .edit_debounce_ms = value;
-                    })
-                },
-            }),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Scroll Debounce Ms",
-            description: "Whether or not to debounce inlay hints updates after buffer scrolls (set to 0 to disable debouncing).",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).inlay_hints.scroll_debounce_ms"),
-                pick: |settings_content| {
-                    language_settings_field(settings_content, |language| {
-                        language.inlay_hints.as_ref()?.scroll_debounce_ms.as_ref()
-                    })
-                },
-                write: |settings_content, value| {
-                    language_settings_field_mut(settings_content, value, |language, value| {
-                        language
-                            .inlay_hints
-                            .get_or_insert_default()
-                            .scroll_debounce_ms = value;
-                    })
-                },
-            }),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Toggle On Modifiers Press",
-            description: "Toggles inlay hints (hides or shows) when the user presses the modifiers specified.",
-            field: Box::new(
-                SettingField {
-                    json_path: Some("languages.$(language).inlay_hints.toggle_on_modifiers_press"),
-                    pick: |settings_content| {
-                        language_settings_field(settings_content, |language| {
-                            language
-                                .inlay_hints
-                                .as_ref()?
-                                .toggle_on_modifiers_press
-                                .as_ref()
-                        })
-                    },
-                    write: |settings_content, value| {
-                        language_settings_field_mut(settings_content, value, |language, value| {
-                            language
-                                .inlay_hints
-                                .get_or_insert_default()
-                                .toggle_on_modifiers_press = value;
-                        })
-                    },
-                }
-                .unimplemented(),
-            ),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-    ];
-    if current_language().is_none() {
-        items.push(SettingsPageItem::SettingItem(SettingItem {
-            title: "LSP Document Colors",
-            description: "How to render LSP color previews in the editor.",
-            field: Box::new(SettingField {
-                json_path: Some("lsp_document_colors"),
-                pick: |settings_content| settings_content.editor.lsp_document_colors.as_ref(),
-                write: |settings_content, value| {
-                    settings_content.editor.lsp_document_colors = value;
-                },
-            }),
-            metadata: None,
-            files: USER,
-        }))
-    }
-    items.extend([
-        SettingsPageItem::SectionHeader("Tasks"),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Enabled",
-            description: "Whether tasks are enabled for this language.",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).tasks.enabled"),
-                pick: |settings_content| {
-                    language_settings_field(settings_content, |language| {
-                        language.tasks.as_ref()?.enabled.as_ref()
-                    })
-                },
-                write: |settings_content, value| {
-                    language_settings_field_mut(settings_content, value, |language, value| {
-                        language.tasks.get_or_insert_default().enabled = value;
-
-                    })
-                },
-            }),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Variables",
-            description: "Extra task variables to set for a particular language.",
-            field: Box::new(
-                SettingField {
-                    json_path: Some("languages.$(language).tasks.variables"),
-                    pick: |settings_content| {
-                        language_settings_field(settings_content, |language| {
-                            language.tasks.as_ref()?.variables.as_ref()
-                        })
-                    },
-                    write: |settings_content, value| {
-                        language_settings_field_mut(settings_content, value, |language, value| {
-                            language.tasks.get_or_insert_default().variables = value;
-
-                        })
-                    },
-                }
-                .unimplemented(),
-            ),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Prefer LSP",
-            description: "Use LSP tasks over Zed language extension tasks.",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).tasks.prefer_lsp"),
-                pick: |settings_content| {
-                    language_settings_field(settings_content, |language| {
-                        language.tasks.as_ref()?.prefer_lsp.as_ref()
-                    })
-                },
-                write: |settings_content, value| {
-                    language_settings_field_mut(settings_content, value, |language, value| {
-                        language.tasks.get_or_insert_default().prefer_lsp = value;
-
-                    })
-                },
-            }),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SectionHeader("Miscellaneous"),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Word Diff Enabled",
-            description: "Whether to enable word diff highlighting in the editor. When enabled, changed words within modified lines are highlighted to show exactly what changed.",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).word_diff_enabled"),
-                pick: |settings_content| {
-                    language_settings_field(settings_content, |language| {
-                        language.word_diff_enabled.as_ref()
-                    })
-                },
-                write: |settings_content, value| {
-                    language_settings_field_mut(settings_content, value, |language, value| {
-                        language.word_diff_enabled = value;
-                    })
-                },
-            }),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Debuggers",
-            description: "Preferred debuggers for this language.",
-            field: Box::new(
-                SettingField {
-                    json_path: Some("languages.$(language).debuggers"),
-                    pick: |settings_content| {
-                        language_settings_field(settings_content, |language| language.debuggers.as_ref())
-                    },
-                    write: |settings_content, value| {
-                        language_settings_field_mut(settings_content, value, |language, value| {
-                            language.debuggers = value;
-
-                        })
-                    },
-                }
-                .unimplemented(),
-            ),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Middle Click Paste",
-            description: "Enable middle-click paste on Linux.",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).editor.middle_click_paste"),
-                pick: |settings_content| settings_content.editor.middle_click_paste.as_ref(),
-                write: |settings_content, value| {settings_content.editor.middle_click_paste = value;},
-            }),
-            metadata: None,
-            files: USER,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Extend Comment On Newline",
-            description: "Whether to start a new line with a comment when a previous line is a comment as well.",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).extend_comment_on_newline"),
-                pick: |settings_content| {
-                    language_settings_field(settings_content, |language| {
-                        language.extend_comment_on_newline.as_ref()
-                    })
-                },
-                write: |settings_content, value| {
-                    language_settings_field_mut(settings_content, value, |language, value| {
-                        language.extend_comment_on_newline = value;
-
-                    })
-                },
-            }),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Colorize Brackets",
-            description: "Whether to colorize brackets in the editor.",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).colorize_brackets"),
-                pick: |settings_content| {
-                    language_settings_field(settings_content, |language| {
-                        language.colorize_brackets.as_ref()
-                    })
-                },
-                write: |settings_content, value| {
-                    language_settings_field_mut(settings_content, value, |language, value| {
-                        language.colorize_brackets = value;
-                    })
-                },
-            }),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-    ]);
-
-    if current_language().is_none() {
-        items.extend([
-            SettingsPageItem::SettingItem(SettingItem {
-                title: "Image Viewer",
-                description: "The unit for image file sizes.",
-                field: Box::new(SettingField {
-                    json_path: Some("image_viewer.unit"),
-                    pick: |settings_content| {
-                        settings_content.image_viewer.as_ref().and_then(|image_viewer| image_viewer.unit.as_ref())
-                    },
-                    write: |settings_content, value| {
-                        settings_content.image_viewer.get_or_insert_default().unit = value;
-
-                    },
-                }),
-                metadata: None,
-                files: USER,
-            }),
-            SettingsPageItem::SettingItem(SettingItem {
-                title: "Auto Replace Emoji Shortcode",
-                description: "Whether to automatically replace emoji shortcodes with emoji characters.",
-                field: Box::new(SettingField {
-                    json_path: Some("message_editor.auto_replace_emoji_shortcode"),
-                    pick: |settings_content| {
-                        settings_content.message_editor.as_ref().and_then(|message_editor| message_editor.auto_replace_emoji_shortcode.as_ref())
-                    },
-                    write: |settings_content, value| {
-                        settings_content.message_editor.get_or_insert_default().auto_replace_emoji_shortcode = value;
-
-                    },
-                }),
-                metadata: None,
-                files: USER,
-            }),
-            SettingsPageItem::SettingItem(SettingItem {
-                title: "Drop Size Target",
-                description: "Relative size of the drop target in the editor that will open dropped file as a split pane.",
-                field: Box::new(SettingField {
-                    json_path: Some("drop_target_size"),
-                    pick: |settings_content| {
-                        settings_content.workspace.drop_target_size.as_ref()
-                    },
-                    write: |settings_content, value| {
-                        settings_content.workspace.drop_target_size = value;
-
-                    },
-                }),
-                metadata: None,
-                files: USER,
-            }),
-        ]);
-    }
-    items
-}
-
-/// LanguageSettings items that should be included in the "Languages & Tools" page
-/// not the "Editor" page
-fn non_editor_language_settings_data() -> Vec<SettingsPageItem> {
-    vec![
-        SettingsPageItem::SectionHeader("LSP"),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Enable Language Server",
-            description: "Whether to use language servers to provide code intelligence.",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).enable_language_server"),
-                pick: |settings_content| {
-                    language_settings_field(settings_content, |language| {
-                        language.enable_language_server.as_ref()
-                    })
-                },
-                write: |settings_content, value| {
-                    language_settings_field_mut(settings_content, value, |language, value| {
-                        language.enable_language_server = value;
-                    })
-                },
-            }),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Language Servers",
-            description: "The list of language servers to use (or disable) for this language.",
-            field: Box::new(
-                SettingField {
-                    json_path: Some("languages.$(language).language_servers"),
-                    pick: |settings_content| {
-                        language_settings_field(settings_content, |language| {
-                            language.language_servers.as_ref()
-                        })
-                    },
-                    write: |settings_content, value| {
-                        language_settings_field_mut(settings_content, value, |language, value| {
-                            language.language_servers = value;
-                        })
-                    },
-                }
-                .unimplemented(),
-            ),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Linked Edits",
-            description: "Whether to perform linked edits of associated ranges, if the LS supports it. For example, when editing opening <html> tag, the contents of the closing </html> tag will be edited as well.",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).linked_edits"),
-                pick: |settings_content| {
-                    language_settings_field(settings_content, |language| {
-                        language.linked_edits.as_ref()
-                    })
-                },
-                write: |settings_content, value| {
-                    language_settings_field_mut(settings_content, value, |language, value| {
-                        language.linked_edits = value;
-                    })
-                },
-            }),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Go To Definition Fallback",
-            description: "Whether to follow-up empty Go to definition responses from the language server.",
-            field: Box::new(SettingField {
-                json_path: Some("go_to_definition_fallback"),
-                pick: |settings_content| settings_content.editor.go_to_definition_fallback.as_ref(),
-                write: |settings_content, value| {
-                    settings_content.editor.go_to_definition_fallback = value;
-                },
-            }),
-            metadata: None,
-            files: USER,
-        }),
-        SettingsPageItem::SectionHeader("LSP Completions"),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Enabled",
-            description: "Whether to fetch LSP completions or not.",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).completions.lsp"),
-                pick: |settings_content| {
-                    language_settings_field(settings_content, |language| {
-                        language.completions.as_ref()?.lsp.as_ref()
-                    })
-                },
-                write: |settings_content, value| {
-                    language_settings_field_mut(settings_content, value, |language, value| {
-                        language.completions.get_or_insert_default().lsp = value;
-                    })
-                },
-            }),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Fetch Timeout (milliseconds)",
-            description: "When fetching LSP completions, determines how long to wait for a response of a particular server (set to 0 to wait indefinitely).",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).completions.lsp_fetch_timeout_ms"),
-                pick: |settings_content| {
-                    language_settings_field(settings_content, |language| {
-                        language.completions.as_ref()?.lsp_fetch_timeout_ms.as_ref()
-                    })
-                },
-                write: |settings_content, value| {
-                    language_settings_field_mut(settings_content, value, |language, value| {
-                        language
-                            .completions
-                            .get_or_insert_default()
-                            .lsp_fetch_timeout_ms = value;
-                    })
-                },
-            }),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Insert Mode",
-            description: "Controls how LSP completions are inserted.",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).completions.lsp_insert_mode"),
-                pick: |settings_content| {
-                    language_settings_field(settings_content, |language| {
-                        language.completions.as_ref()?.lsp_insert_mode.as_ref()
-                    })
-                },
-                write: |settings_content, value| {
-                    language_settings_field_mut(settings_content, value, |language, value| {
-                        language.completions.get_or_insert_default().lsp_insert_mode = value;
-                    })
-                },
-            }),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SectionHeader("Debuggers"),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Debuggers",
-            description: "Preferred debuggers for this language.",
-            field: Box::new(
-                SettingField {
-                    json_path: Some("languages.$(language).debuggers"),
-                    pick: |settings_content| {
-                        language_settings_field(settings_content, |language| {
-                            language.debuggers.as_ref()
-                        })
-                    },
-                    write: |settings_content, value| {
-                        language_settings_field_mut(settings_content, value, |language, value| {
-                            language.debuggers = value;
-                        })
-                    },
-                }
-                .unimplemented(),
-            ),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SectionHeader("Prettier"),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Allowed",
-            description: "Enables or disables formatting with Prettier for a given language.",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).prettier.allowed"),
-                pick: |settings_content| {
-                    language_settings_field(settings_content, |language| {
-                        language.prettier.as_ref()?.allowed.as_ref()
-                    })
-                },
-                write: |settings_content, value| {
-                    language_settings_field_mut(settings_content, value, |language, value| {
-                        language.prettier.get_or_insert_default().allowed = value;
-                    })
-                },
-            }),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Parser",
-            description: "Forces Prettier integration to use a specific parser name when formatting files with the language.",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).prettier.parser"),
-                pick: |settings_content| {
-                    language_settings_field(settings_content, |language| {
-                        language.prettier.as_ref()?.parser.as_ref()
-                    })
-                },
-                write: |settings_content, value| {
-                    language_settings_field_mut(settings_content, value, |language, value| {
-                        language.prettier.get_or_insert_default().parser = value;
-                    })
-                },
-            }),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Plugins",
-            description: "Forces Prettier integration to use specific plugins when formatting files with the language.",
-            field: Box::new(
-                SettingField {
-                    json_path: Some("languages.$(language).prettier.plugins"),
-                    pick: |settings_content| {
-                        language_settings_field(settings_content, |language| {
-                            language.prettier.as_ref()?.plugins.as_ref()
-                        })
-                    },
-                    write: |settings_content, value| {
-                        language_settings_field_mut(settings_content, value, |language, value| {
-                            language.prettier.get_or_insert_default().plugins = value;
-                        })
-                    },
-                }
-                .unimplemented(),
-            ),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Options",
-            description: "Default Prettier options, in the format as in package.json section for Prettier.",
-            field: Box::new(
-                SettingField {
-                    json_path: Some("languages.$(language).prettier.options"),
-                    pick: |settings_content| {
-                        language_settings_field(settings_content, |language| {
-                            language.prettier.as_ref()?.options.as_ref()
-                        })
-                    },
-                    write: |settings_content, value| {
-                        language_settings_field_mut(settings_content, value, |language, value| {
-                            language.prettier.get_or_insert_default().options = value;
-                        })
-                    },
-                }
-                .unimplemented(),
-            ),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-    ]
-}
-
-fn edit_prediction_language_settings_section() -> Vec<SettingsPageItem> {
-    vec![
-        SettingsPageItem::SectionHeader("Edit Predictions"),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Show Edit Predictions",
-            description: "Controls whether edit predictions are shown immediately or manually by triggering `editor::showeditprediction` (false).",
-            field: Box::new(SettingField {
-                json_path: Some("languages.$(language).show_edit_predictions"),
-                pick: |settings_content| {
-                    language_settings_field(settings_content, |language| {
-                        language.show_edit_predictions.as_ref()
-                    })
-                },
-                write: |settings_content, value| {
-                    language_settings_field_mut(settings_content, value, |language, value| {
-                        language.show_edit_predictions = value;
-                    })
-                },
-            }),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-        SettingsPageItem::SettingItem(SettingItem {
-            title: "Edit Predictions Disabled In",
-            description: "Controls whether edit predictions are shown in the given language scopes.",
-            field: Box::new(
-                SettingField {
-                    json_path: Some("languages.$(language).edit_predictions_disabled_in"),
-                    pick: |settings_content| {
-                        language_settings_field(settings_content, |language| {
-                            language.edit_predictions_disabled_in.as_ref()
-                        })
-                    },
-                    write: |settings_content, value| {
-                        language_settings_field_mut(settings_content, value, |language, value| {
-                            language.edit_predictions_disabled_in = value;
-                        })
-                    },
-                }
-                .unimplemented(),
-            ),
-            metadata: None,
-            files: USER | PROJECT,
-        }),
-    ]
-}
-
-fn show_scrollbar_or_editor(
-    settings_content: &SettingsContent,
-    show: fn(&SettingsContent) -> Option<&settings::ShowScrollbar>,
-) -> Option<&settings::ShowScrollbar> {
-    show(settings_content).or(settings_content
-        .editor
-        .scrollbar
-        .as_ref()
-        .and_then(|scrollbar| scrollbar.show.as_ref()))
-}
-
-fn dynamic_variants<T>() -> &'static [T::Discriminant]
-where
-    T: strum::IntoDiscriminant,
-    T::Discriminant: strum::VariantArray,
-{
-    <<T as strum::IntoDiscriminant>::Discriminant as strum::VariantArray>::VARIANTS
-}
diff --git a/crates/settings_ui/src/settings_ui.rs b/crates/settings_ui/src/settings_ui.rs
deleted file mode 100644
index 4464d3bdd9..0000000000
--- a/crates/settings_ui/src/settings_ui.rs
+++ /dev/null
@@ -1,4047 +0,0 @@
-mod components;
-mod page_data;
-
-use anyhow::Result;
-use editor::{Editor, EditorEvent};
-use feature_flags::FeatureFlag;
-use fuzzy::StringMatchCandidate;
-use gpui::{
-    Action, App, ClipboardItem, DEFAULT_ADDITIONAL_WINDOW_SIZE, Div, Entity, FocusHandle,
-    Focusable, Global, KeyContext, ListState, ReadGlobal as _, ScrollHandle, Stateful,
-    Subscription, Task, TitlebarOptions, UniformListScrollHandle, Window, WindowBounds,
-    WindowHandle, WindowOptions, actions, div, list, point, prelude::*, px, uniform_list,
-};
-use project::{Project, WorktreeId};
-use release_channel::ReleaseChannel;
-use schemars::JsonSchema;
-use serde::Deserialize;
-use settings::{Settings, SettingsContent, SettingsStore, initial_project_settings_content};
-use std::{
-    any::{Any, TypeId, type_name},
-    cell::RefCell,
-    collections::{HashMap, HashSet},
-    num::{NonZero, NonZeroU32},
-    ops::Range,
-    rc::Rc,
-    sync::{Arc, LazyLock, RwLock},
-    time::Duration,
-};
-use title_bar::platform_title_bar::PlatformTitleBar;
-use ui::{
-    Banner, ContextMenu, Divider, DividerColor, DropdownMenu, DropdownStyle, IconButtonShape,
-    KeyBinding, KeybindingHint, PopoverMenu, Switch, Tooltip, TreeViewItem, WithScrollbar,
-    prelude::*,
-};
-use ui_input::{NumberField, NumberFieldType};
-use util::{ResultExt as _, paths::PathStyle, rel_path::RelPath};
-use workspace::{AppState, OpenOptions, OpenVisible, Workspace, client_side_decorations};
-use zed_actions::{OpenProjectSettings, OpenSettings, OpenSettingsAt};
-
-use crate::components::{
-    EnumVariantDropdown, SettingsInputField, font_picker, icon_theme_picker, theme_picker,
-};
-
-const NAVBAR_CONTAINER_TAB_INDEX: isize = 0;
-const NAVBAR_GROUP_TAB_INDEX: isize = 1;
-
-const HEADER_CONTAINER_TAB_INDEX: isize = 2;
-const HEADER_GROUP_TAB_INDEX: isize = 3;
-
-const CONTENT_CONTAINER_TAB_INDEX: isize = 4;
-const CONTENT_GROUP_TAB_INDEX: isize = 5;
-
-actions!(
-    settings_editor,
-    [
-        /// Minimizes the settings UI window.
-        Minimize,
-        /// Toggles focus between the navbar and the main content.
-        ToggleFocusNav,
-        /// Expands the navigation entry.
-        ExpandNavEntry,
-        /// Collapses the navigation entry.
-        CollapseNavEntry,
-        /// Focuses the next file in the file list.
-        FocusNextFile,
-        /// Focuses the previous file in the file list.
-        FocusPreviousFile,
-        /// Opens an editor for the current file
-        OpenCurrentFile,
-        /// Focuses the previous root navigation entry.
-        FocusPreviousRootNavEntry,
-        /// Focuses the next root navigation entry.
-        FocusNextRootNavEntry,
-        /// Focuses the first navigation entry.
-        FocusFirstNavEntry,
-        /// Focuses the last navigation entry.
-        FocusLastNavEntry,
-        /// Focuses and opens the next navigation entry without moving focus to content.
-        FocusNextNavEntry,
-        /// Focuses and opens the previous navigation entry without moving focus to content.
-        FocusPreviousNavEntry
-    ]
-);
-
-#[derive(Action, PartialEq, Eq, Clone, Copy, Debug, JsonSchema, Deserialize)]
-#[action(namespace = settings_editor)]
-struct FocusFile(pub u32);
-
-struct SettingField<T: 'static> {
-    pick: fn(&SettingsContent) -> Option<&T>,
-    write: fn(&mut SettingsContent, Option<T>),
-
-    /// A json-path-like string that gives a unique-ish string that identifies
-    /// where in the JSON the setting is defined.
-    ///
-    /// The syntax is `jq`-like, but modified slightly to be URL-safe (and
-    /// without the leading dot), e.g. `foo.bar`.
-    ///
-    /// They are URL-safe (this is important since links are the main use-case
-    /// for these paths).
-    ///
-    /// There are a couple of special cases:
-    /// - discrimminants are represented with a trailing `$`, for example
-    /// `terminal.working_directory$`. This is to distinguish the discrimminant
-    /// setting (i.e. the setting that changes whether the value is a string or
-    /// an object) from the setting in the case that it is a string.
-    /// - language-specific settings begin `languages.$(language)`. Links
-    /// targeting these settings should take the form `languages/Rust/...`, for
-    /// example, but are not currently supported.
-    json_path: Option<&'static str>,
-}
-
-impl<T: 'static> Clone for SettingField<T> {
-    fn clone(&self) -> Self {
-        *self
-    }
-}
-
-// manual impl because derive puts a Copy bound on T, which is inaccurate in our case
-impl<T: 'static> Copy for SettingField<T> {}
-
-/// Helper for unimplemented settings, used in combination with `SettingField::unimplemented`
-/// to keep the setting around in the UI with valid pick and write implementations, but don't actually try to render it.
-/// TODO(settings_ui): In non-dev builds (`#[cfg(not(debug_assertions))]`) make this render as edit-in-json
-#[derive(Clone, Copy)]
-struct UnimplementedSettingField;
-
-impl PartialEq for UnimplementedSettingField {
-    fn eq(&self, _other: &Self) -> bool {
-        true
-    }
-}
-
-impl<T: 'static> SettingField<T> {
-    /// Helper for settings with types that are not yet implemented.
-    #[allow(unused)]
-    fn unimplemented(self) -> SettingField<UnimplementedSettingField> {
-        SettingField {
-            pick: |_| Some(&UnimplementedSettingField),
-            write: |_, _| unreachable!(),
-            json_path: self.json_path,
-        }
-    }
-}
-
-trait AnySettingField {
-    fn as_any(&self) -> &dyn Any;
-    fn type_name(&self) -> &'static str;
-    fn type_id(&self) -> TypeId;
-    // Returns the file this value was set in and true, or File::Default and false to indicate it was not found in any file (missing default)
-    fn file_set_in(&self, file: SettingsUiFile, cx: &App) -> (settings::SettingsFile, bool);
-    fn reset_to_default_fn(
-        &self,
-        current_file: &SettingsUiFile,
-        file_set_in: &settings::SettingsFile,
-        cx: &App,
-    ) -> Option<Box<dyn Fn(&mut App)>>;
-
-    fn json_path(&self) -> Option<&'static str>;
-}
-
-impl<T: PartialEq + Clone + Send + Sync + 'static> AnySettingField for SettingField<T> {
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
-
-    fn type_name(&self) -> &'static str {
-        type_name::<T>()
-    }
-
-    fn type_id(&self) -> TypeId {
-        TypeId::of::<T>()
-    }
-
-    fn file_set_in(&self, file: SettingsUiFile, cx: &App) -> (settings::SettingsFile, bool) {
-        let (file, value) = cx
-            .global::<SettingsStore>()
-            .get_value_from_file(file.to_settings(), self.pick);
-        return (file, value.is_some());
-    }
-
-    fn reset_to_default_fn(
-        &self,
-        current_file: &SettingsUiFile,
-        file_set_in: &settings::SettingsFile,
-        cx: &App,
-    ) -> Option<Box<dyn Fn(&mut App)>> {
-        if file_set_in == &settings::SettingsFile::Default {
-            return None;
-        }
-        if file_set_in != &current_file.to_settings() {
-            return None;
-        }
-        let this = *self;
-        let store = SettingsStore::global(cx);
-        let default_value = (this.pick)(store.raw_default_settings());
-        let is_default = store
-            .get_content_for_file(file_set_in.clone())
-            .map_or(None, this.pick)
-            == default_value;
-        if is_default {
-            return None;
-        }
-        let current_file = current_file.clone();
-
-        return Some(Box::new(move |cx| {
-            let store = SettingsStore::global(cx);
-            let default_value = (this.pick)(store.raw_default_settings());
-            let is_set_somewhere_other_than_default = store
-                .get_value_up_to_file(current_file.to_settings(), this.pick)
-                .0
-                != settings::SettingsFile::Default;
-            let value_to_set = if is_set_somewhere_other_than_default {
-                default_value.cloned()
-            } else {
-                None
-            };
-            update_settings_file(current_file.clone(), None, cx, move |settings, _| {
-                (this.write)(settings, value_to_set);
-            })
-            // todo(settings_ui): Don't log err
-            .log_err();
-        }));
-    }
-
-    fn json_path(&self) -> Option<&'static str> {
-        self.json_path
-    }
-}
-
-#[derive(Default, Clone)]
-struct SettingFieldRenderer {
-    renderers: Rc<
-        RefCell<
-            HashMap<
-                TypeId,
-                Box<
-                    dyn Fn(
-                        &SettingsWindow,
-                        &SettingItem,
-                        SettingsUiFile,
-                        Option<&SettingsFieldMetadata>,
-                        bool,
-                        &mut Window,
-                        &mut Context<SettingsWindow>,
-                    ) -> Stateful<Div>,
-                >,
-            >,
-        >,
-    >,
-}
-
-impl Global for SettingFieldRenderer {}
-
-impl SettingFieldRenderer {
-    fn add_basic_renderer<T: 'static>(
-        &mut self,
-        render_control: impl Fn(
-            SettingField<T>,
-            SettingsUiFile,
-            Option<&SettingsFieldMetadata>,
-            &mut Window,
-            &mut App,
-        ) -> AnyElement
-        + 'static,
-    ) -> &mut Self {
-        self.add_renderer(
-            move |settings_window: &SettingsWindow,
-                  item: &SettingItem,
-                  field: SettingField<T>,
-                  settings_file: SettingsUiFile,
-                  metadata: Option<&SettingsFieldMetadata>,
-                  sub_field: bool,
-                  window: &mut Window,
-                  cx: &mut Context<SettingsWindow>| {
-                render_settings_item(
-                    settings_window,
-                    item,
-                    settings_file.clone(),
-                    render_control(field, settings_file, metadata, window, cx),
-                    sub_field,
-                    cx,
-                )
-            },
-        )
-    }
-
-    fn add_renderer<T: 'static>(
-        &mut self,
-        renderer: impl Fn(
-            &SettingsWindow,
-            &SettingItem,
-            SettingField<T>,
-            SettingsUiFile,
-            Option<&SettingsFieldMetadata>,
-            bool,
-            &mut Window,
-            &mut Context<SettingsWindow>,
-        ) -> Stateful<Div>
-        + 'static,
-    ) -> &mut Self {
-        let key = TypeId::of::<T>();
-        let renderer = Box::new(
-            move |settings_window: &SettingsWindow,
-                  item: &SettingItem,
-                  settings_file: SettingsUiFile,
-                  metadata: Option<&SettingsFieldMetadata>,
-                  sub_field: bool,
-                  window: &mut Window,
-                  cx: &mut Context<SettingsWindow>| {
-                let field = *item
-                    .field
-                    .as_ref()
-                    .as_any()
-                    .downcast_ref::<SettingField<T>>()
-                    .unwrap();
-                renderer(
-                    settings_window,
-                    item,
-                    field,
-                    settings_file,
-                    metadata,
-                    sub_field,
-                    window,
-                    cx,
-                )
-            },
-        );
-        self.renderers.borrow_mut().insert(key, renderer);
-        self
-    }
-}
-
-struct NonFocusableHandle {
-    handle: FocusHandle,
-    _subscription: Subscription,
-}
-
-impl NonFocusableHandle {
-    fn new(tab_index: isize, tab_stop: bool, window: &mut Window, cx: &mut App) -> Entity<Self> {
-        let handle = cx.focus_handle().tab_index(tab_index).tab_stop(tab_stop);
-        Self::from_handle(handle, window, cx)
-    }
-
-    fn from_handle(handle: FocusHandle, window: &mut Window, cx: &mut App) -> Entity<Self> {
-        cx.new(|cx| {
-            let _subscription = cx.on_focus(&handle, window, {
-                move |_, window, _| {
-                    window.focus_next();
-                }
-            });
-            Self {
-                handle,
-                _subscription,
-            }
-        })
-    }
-}
-
-impl Focusable for NonFocusableHandle {
-    fn focus_handle(&self, _: &App) -> FocusHandle {
-        self.handle.clone()
-    }
-}
-
-#[derive(Default)]
-struct SettingsFieldMetadata {
-    placeholder: Option<&'static str>,
-    should_do_titlecase: Option<bool>,
-}
-
-pub struct SettingsUiFeatureFlag;
-
-impl FeatureFlag for SettingsUiFeatureFlag {
-    const NAME: &'static str = "settings-ui";
-}
-
-pub fn init(cx: &mut App) {
-    init_renderers(cx);
-
-    cx.observe_new(|workspace: &mut workspace::Workspace, _, _| {
-        workspace
-            .register_action(
-                |workspace, OpenSettingsAt { path }: &OpenSettingsAt, window, cx| {
-                    let window_handle = window
-                        .window_handle()
-                        .downcast::<Workspace>()
-                        .expect("Workspaces are root Windows");
-                    open_settings_editor(workspace, Some(&path), false, window_handle, cx);
-                },
-            )
-            .register_action(|workspace, _: &OpenSettings, window, cx| {
-                let window_handle = window
-                    .window_handle()
-                    .downcast::<Workspace>()
-                    .expect("Workspaces are root Windows");
-                open_settings_editor(workspace, None, false, window_handle, cx);
-            })
-            .register_action(|workspace, _: &OpenProjectSettings, window, cx| {
-                let window_handle = window
-                    .window_handle()
-                    .downcast::<Workspace>()
-                    .expect("Workspaces are root Windows");
-                open_settings_editor(workspace, None, true, window_handle, cx);
-            });
-    })
-    .detach();
-}
-
-fn init_renderers(cx: &mut App) {
-    cx.default_global::<SettingFieldRenderer>()
-        .add_renderer::<UnimplementedSettingField>(
-            |settings_window, item, _, settings_file, _, sub_field, _, cx| {
-                render_settings_item(
-                    settings_window,
-                    item,
-                    settings_file,
-                    Button::new("open-in-settings-file", "Edit in settings.json")
-                        .style(ButtonStyle::Outlined)
-                        .size(ButtonSize::Medium)
-                        .tab_index(0_isize)
-                        .tooltip(Tooltip::for_action_title_in(
-                            "Edit in settings.json",
-                            &OpenCurrentFile,
-                            &settings_window.focus_handle,
-                        ))
-                        .on_click(cx.listener(|this, _, window, cx| {
-                            this.open_current_settings_file(window, cx);
-                        }))
-                        .into_any_element(),
-                    sub_field,
-                    cx,
-                )
-            },
-        )
-        .add_basic_renderer::<bool>(render_toggle_button)
-        .add_basic_renderer::<String>(render_text_field)
-        .add_basic_renderer::<SharedString>(render_text_field)
-        .add_basic_renderer::<settings::SaturatingBool>(render_toggle_button)
-        .add_basic_renderer::<settings::CursorShape>(render_dropdown)
-        .add_basic_renderer::<settings::RestoreOnStartupBehavior>(render_dropdown)
-        .add_basic_renderer::<settings::BottomDockLayout>(render_dropdown)
-        .add_basic_renderer::<settings::OnLastWindowClosed>(render_dropdown)
-        .add_basic_renderer::<settings::CloseWindowWhenNoItems>(render_dropdown)
-        .add_basic_renderer::<settings::FontFamilyName>(render_font_picker)
-        .add_basic_renderer::<settings::BaseKeymapContent>(render_dropdown)
-        .add_basic_renderer::<settings::MultiCursorModifier>(render_dropdown)
-        .add_basic_renderer::<settings::HideMouseMode>(render_dropdown)
-        .add_basic_renderer::<settings::CurrentLineHighlight>(render_dropdown)
-        .add_basic_renderer::<settings::ShowWhitespaceSetting>(render_dropdown)
-        .add_basic_renderer::<settings::SoftWrap>(render_dropdown)
-        .add_basic_renderer::<settings::ScrollBeyondLastLine>(render_dropdown)
-        .add_basic_renderer::<settings::SnippetSortOrder>(render_dropdown)
-        .add_basic_renderer::<settings::ClosePosition>(render_dropdown)
-        .add_basic_renderer::<settings::DockSide>(render_dropdown)
-        .add_basic_renderer::<settings::TerminalDockPosition>(render_dropdown)
-        .add_basic_renderer::<settings::DockPosition>(render_dropdown)
-        .add_basic_renderer::<settings::GitGutterSetting>(render_dropdown)
-        .add_basic_renderer::<settings::GitHunkStyleSetting>(render_dropdown)
-        .add_basic_renderer::<settings::GitPathStyle>(render_dropdown)
-        .add_basic_renderer::<settings::DiagnosticSeverityContent>(render_dropdown)
-        .add_basic_renderer::<settings::SeedQuerySetting>(render_dropdown)
-        .add_basic_renderer::<settings::DoubleClickInMultibuffer>(render_dropdown)
-        .add_basic_renderer::<settings::GoToDefinitionFallback>(render_dropdown)
-        .add_basic_renderer::<settings::ActivateOnClose>(render_dropdown)
-        .add_basic_renderer::<settings::ShowDiagnostics>(render_dropdown)
-        .add_basic_renderer::<settings::ShowCloseButton>(render_dropdown)
-        .add_basic_renderer::<settings::ProjectPanelEntrySpacing>(render_dropdown)
-        .add_basic_renderer::<settings::ProjectPanelSortMode>(render_dropdown)
-        .add_basic_renderer::<settings::RewrapBehavior>(render_dropdown)
-        .add_basic_renderer::<settings::FormatOnSave>(render_dropdown)
-        .add_basic_renderer::<settings::IndentGuideColoring>(render_dropdown)
-        .add_basic_renderer::<settings::IndentGuideBackgroundColoring>(render_dropdown)
-        .add_basic_renderer::<settings::FileFinderWidthContent>(render_dropdown)
-        .add_basic_renderer::<settings::ShowDiagnostics>(render_dropdown)
-        .add_basic_renderer::<settings::WordsCompletionMode>(render_dropdown)
-        .add_basic_renderer::<settings::LspInsertMode>(render_dropdown)
-        .add_basic_renderer::<settings::AlternateScroll>(render_dropdown)
-        .add_basic_renderer::<settings::TerminalBlink>(render_dropdown)
-        .add_basic_renderer::<settings::CursorShapeContent>(render_dropdown)
-        .add_basic_renderer::<f32>(render_number_field)
-        .add_basic_renderer::<u32>(render_number_field)
-        .add_basic_renderer::<u64>(render_number_field)
-        .add_basic_renderer::<usize>(render_number_field)
-        .add_basic_renderer::<NonZero<usize>>(render_number_field)
-        .add_basic_renderer::<NonZeroU32>(render_number_field)
-        .add_basic_renderer::<settings::CodeFade>(render_number_field)
-        .add_basic_renderer::<settings::DelayMs>(render_number_field)
-        .add_basic_renderer::<gpui::FontWeight>(render_number_field)
-        .add_basic_renderer::<settings::CenteredPaddingSettings>(render_number_field)
-        .add_basic_renderer::<settings::InactiveOpacity>(render_number_field)
-        .add_basic_renderer::<settings::MinimumContrast>(render_number_field)
-        .add_basic_renderer::<settings::ShowScrollbar>(render_dropdown)
-        .add_basic_renderer::<settings::ScrollbarDiagnostics>(render_dropdown)
-        .add_basic_renderer::<settings::ShowMinimap>(render_dropdown)
-        .add_basic_renderer::<settings::DisplayIn>(render_dropdown)
-        .add_basic_renderer::<settings::MinimapThumb>(render_dropdown)
-        .add_basic_renderer::<settings::MinimapThumbBorder>(render_dropdown)
-        .add_basic_renderer::<settings::SteppingGranularity>(render_dropdown)
-        .add_basic_renderer::<settings::NotifyWhenAgentWaiting>(render_dropdown)
-        .add_basic_renderer::<settings::NotifyWhenAgentWaiting>(render_dropdown)
-        .add_basic_renderer::<settings::ImageFileSizeUnit>(render_dropdown)
-        .add_basic_renderer::<settings::StatusStyle>(render_dropdown)
-        .add_basic_renderer::<settings::PaneSplitDirectionHorizontal>(render_dropdown)
-        .add_basic_renderer::<settings::PaneSplitDirectionVertical>(render_dropdown)
-        .add_basic_renderer::<settings::PaneSplitDirectionVertical>(render_dropdown)
-        .add_basic_renderer::<settings::DocumentColorsRenderMode>(render_dropdown)
-        .add_basic_renderer::<settings::ThemeSelectionDiscriminants>(render_dropdown)
-        .add_basic_renderer::<settings::ThemeAppearanceMode>(render_dropdown)
-        .add_basic_renderer::<settings::ThemeName>(render_theme_picker)
-        .add_basic_renderer::<settings::IconThemeSelectionDiscriminants>(render_dropdown)
-        .add_basic_renderer::<settings::IconThemeName>(render_icon_theme_picker)
-        .add_basic_renderer::<settings::BufferLineHeightDiscriminants>(render_dropdown)
-        .add_basic_renderer::<settings::AutosaveSettingDiscriminants>(render_dropdown)
-        .add_basic_renderer::<settings::WorkingDirectoryDiscriminants>(render_dropdown)
-        .add_basic_renderer::<settings::IncludeIgnoredContent>(render_dropdown)
-        .add_basic_renderer::<settings::ShowIndentGuides>(render_dropdown)
-        .add_basic_renderer::<settings::ShellDiscriminants>(render_dropdown)
-        .add_basic_renderer::<settings::EditPredictionsMode>(render_dropdown)
-        .add_basic_renderer::<settings::RelativeLineNumbers>(render_dropdown)
-        .add_basic_renderer::<settings::WindowDecorations>(render_dropdown)
-        // please semicolon stay on next line
-        ;
-}
-
-pub fn open_settings_editor(
-    _workspace: &mut Workspace,
-    path: Option<&str>,
-    open_project_settings: bool,
-    workspace_handle: WindowHandle<Workspace>,
-    cx: &mut App,
-) {
-    telemetry::event!("Settings Viewed");
-
-    /// Assumes a settings GUI window is already open
-    fn open_path(
-        path: &str,
-        // Note: This option is unsupported right now
-        _open_project_settings: bool,
-        settings_window: &mut SettingsWindow,
-        window: &mut Window,
-        cx: &mut Context<SettingsWindow>,
-    ) {
-        if path.starts_with("languages.$(language)") {
-            log::error!("language-specific settings links are not currently supported");
-            return;
-        }
-
-        settings_window.search_bar.update(cx, |editor, cx| {
-            editor.set_text(format!("#{path}"), window, cx);
-        });
-        settings_window.update_matches(cx);
-    }
-
-    let existing_window = cx
-        .windows()
-        .into_iter()
-        .find_map(|window| window.downcast::<SettingsWindow>());
-
-    if let Some(existing_window) = existing_window {
-        existing_window
-            .update(cx, |settings_window, window, cx| {
-                settings_window.original_window = Some(workspace_handle);
-                window.activate_window();
-                if let Some(path) = path {
-                    open_path(path, open_project_settings, settings_window, window, cx);
-                } else if open_project_settings {
-                    if let Some(file_index) = settings_window
-                        .files
-                        .iter()
-                        .position(|(file, _)| file.worktree_id().is_some())
-                    {
-                        settings_window.change_file(file_index, window, cx);
-                    }
-
-                    cx.notify();
-                }
-            })
-            .ok();
-        return;
-    }
-
-    // We have to defer this to get the workspace off the stack.
-
-    let path = path.map(ToOwned::to_owned);
-    cx.defer(move |cx| {
-        let current_rem_size: f32 = theme::ThemeSettings::get_global(cx).ui_font_size(cx).into();
-
-        let default_bounds = DEFAULT_ADDITIONAL_WINDOW_SIZE;
-        let default_rem_size = 16.0;
-        let scale_factor = current_rem_size / default_rem_size;
-        let scaled_bounds: gpui::Size<Pixels> = default_bounds.map(|axis| axis * scale_factor);
-
-        let app_id = ReleaseChannel::global(cx).app_id();
-        let window_decorations = match std::env::var("ZED_WINDOW_DECORATIONS") {
-            Ok(val) if val == "server" => gpui::WindowDecorations::Server,
-            Ok(val) if val == "client" => gpui::WindowDecorations::Client,
-            _ => gpui::WindowDecorations::Client,
-        };
-
-        cx.open_window(
-            WindowOptions {
-                titlebar: Some(TitlebarOptions {
-                    title: Some("Zed — Settings".into()),
-                    appears_transparent: true,
-                    traffic_light_position: Some(point(px(12.0), px(12.0))),
-                }),
-                focus: true,
-                show: true,
-                is_movable: true,
-                kind: gpui::WindowKind::Floating,
-                window_background: cx.theme().window_background_appearance(),
-                app_id: Some(app_id.to_owned()),
-                window_decorations: Some(window_decorations),
-                window_min_size: Some(gpui::Size {
-                    width: px(360.0),
-                    height: px(240.0),
-                }),
-                window_bounds: Some(WindowBounds::centered(scaled_bounds, cx)),
-                ..Default::default()
-            },
-            |window, cx| {
-                let settings_window =
-                    cx.new(|cx| SettingsWindow::new(Some(workspace_handle), window, cx));
-                settings_window.update(cx, |settings_window, cx| {
-                    if let Some(path) = path {
-                        open_path(&path, open_project_settings, settings_window, window, cx);
-                    } else if open_project_settings {
-                        if let Some(file_index) = settings_window
-                            .files
-                            .iter()
-                            .position(|(file, _)| file.worktree_id().is_some())
-                        {
-                            settings_window.change_file(file_index, window, cx);
-                        }
-
-                        settings_window.fetch_files(window, cx);
-                    }
-                });
-
-                settings_window
-            },
-        )
-        .log_err();
-    });
-}
-
-/// The current sub page path that is selected.
-/// If this is empty the selected page is rendered,
-/// otherwise the last sub page gets rendered.
-///
-/// Global so that `pick` and `write` callbacks can access it
-/// and use it to dynamically render sub pages (e.g. for language settings)
-static SUB_PAGE_STACK: LazyLock<RwLock<Vec<SubPage>>> = LazyLock::new(|| RwLock::new(Vec::new()));
-
-fn sub_page_stack() -> std::sync::RwLockReadGuard<'static, Vec<SubPage>> {
-    SUB_PAGE_STACK
-        .read()
-        .expect("SUB_PAGE_STACK is never poisoned")
-}
-
-fn sub_page_stack_mut() -> std::sync::RwLockWriteGuard<'static, Vec<SubPage>> {
-    SUB_PAGE_STACK
-        .write()
-        .expect("SUB_PAGE_STACK is never poisoned")
-}
-
-pub struct SettingsWindow {
-    title_bar: Option<Entity<PlatformTitleBar>>,
-    original_window: Option<WindowHandle<Workspace>>,
-    files: Vec<(SettingsUiFile, FocusHandle)>,
-    worktree_root_dirs: HashMap<WorktreeId, String>,
-    current_file: SettingsUiFile,
-    pages: Vec<SettingsPage>,
-    search_bar: Entity<Editor>,
-    search_task: Option<Task<()>>,
-    /// Index into navbar_entries
-    navbar_entry: usize,
-    navbar_entries: Vec<NavBarEntry>,
-    navbar_scroll_handle: UniformListScrollHandle,
-    /// [page_index][page_item_index] will be false
-    /// when the item is filtered out either by searches
-    /// or by the current file
-    navbar_focus_subscriptions: Vec<gpui::Subscription>,
-    filter_table: Vec<Vec<bool>>,
-    has_query: bool,
-    content_handles: Vec<Vec<Entity<NonFocusableHandle>>>,
-    sub_page_scroll_handle: ScrollHandle,
-    focus_handle: FocusHandle,
-    navbar_focus_handle: Entity<NonFocusableHandle>,
-    content_focus_handle: Entity<NonFocusableHandle>,
-    files_focus_handle: FocusHandle,
-    search_index: Option<Arc<SearchIndex>>,
-    list_state: ListState,
-    shown_errors: HashSet<String>,
-}
-
-struct SearchIndex {
-    bm25_engine: bm25::SearchEngine<usize>,
-    fuzzy_match_candidates: Vec<StringMatchCandidate>,
-    key_lut: Vec<SearchKeyLUTEntry>,
-}
-
-struct SearchKeyLUTEntry {
-    page_index: usize,
-    header_index: usize,
-    item_index: usize,
-    json_path: Option<&'static str>,
-}
-
-struct SubPage {
-    link: SubPageLink,
-    section_header: &'static str,
-}
-
-#[derive(Debug)]
-struct NavBarEntry {
-    title: &'static str,
-    is_root: bool,
-    expanded: bool,
-    page_index: usize,
-    item_index: Option<usize>,
-    focus_handle: FocusHandle,
-}
-
-struct SettingsPage {
-    title: &'static str,
-    items: Vec<SettingsPageItem>,
-}
-
-#[derive(PartialEq)]
-enum SettingsPageItem {
-    SectionHeader(&'static str),
-    SettingItem(SettingItem),
-    SubPageLink(SubPageLink),
-    DynamicItem(DynamicItem),
-}
-
-impl std::fmt::Debug for SettingsPageItem {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            SettingsPageItem::SectionHeader(header) => write!(f, "SectionHeader({})", header),
-            SettingsPageItem::SettingItem(setting_item) => {
-                write!(f, "SettingItem({})", setting_item.title)
-            }
-            SettingsPageItem::SubPageLink(sub_page_link) => {
-                write!(f, "SubPageLink({})", sub_page_link.title)
-            }
-            SettingsPageItem::DynamicItem(dynamic_item) => {
-                write!(f, "DynamicItem({})", dynamic_item.discriminant.title)
-            }
-        }
-    }
-}
-
-impl SettingsPageItem {
-    fn render(
-        &self,
-        settings_window: &SettingsWindow,
-        item_index: usize,
-        is_last: bool,
-        window: &mut Window,
-        cx: &mut Context<SettingsWindow>,
-    ) -> AnyElement {
-        let file = settings_window.current_file.clone();
-
-        let apply_padding = |element: Stateful<Div>| -> Stateful<Div> {
-            let element = element.pt_4();
-            if is_last {
-                element.pb_10()
-            } else {
-                element.pb_4()
-            }
-        };
-
-        let mut render_setting_item_inner =
-            |setting_item: &SettingItem,
-             padding: bool,
-             sub_field: bool,
-             cx: &mut Context<SettingsWindow>| {
-                let renderer = cx.default_global::<SettingFieldRenderer>().clone();
-                let (_, found) = setting_item.field.file_set_in(file.clone(), cx);
-
-                let renderers = renderer.renderers.borrow();
-
-                let field_renderer =
-                    renderers.get(&AnySettingField::type_id(setting_item.field.as_ref()));
-                let field_renderer_or_warning =
-                    field_renderer.ok_or("NO RENDERER").and_then(|renderer| {
-                        if cfg!(debug_assertions) && !found {
-                            Err("NO DEFAULT")
-                        } else {
-                            Ok(renderer)
-                        }
-                    });
-
-                let field = match field_renderer_or_warning {
-                    Ok(field_renderer) => window.with_id(item_index, |window| {
-                        field_renderer(
-                            settings_window,
-                            setting_item,
-                            file.clone(),
-                            setting_item.metadata.as_deref(),
-                            sub_field,
-                            window,
-                            cx,
-                        )
-                    }),
-                    Err(warning) => render_settings_item(
-                        settings_window,
-                        setting_item,
-                        file.clone(),
-                        Button::new("error-warning", warning)
-                            .style(ButtonStyle::Outlined)
-                            .size(ButtonSize::Medium)
-                            .icon(Some(IconName::Debug))
-                            .icon_position(IconPosition::Start)
-                            .icon_color(Color::Error)
-                            .tab_index(0_isize)
-                            .tooltip(Tooltip::text(setting_item.field.type_name()))
-                            .into_any_element(),
-                        sub_field,
-                        cx,
-                    ),
-                };
-
-                let field = if padding {
-                    field.map(apply_padding)
-                } else {
-                    field
-                };
-
-                (field, field_renderer_or_warning.is_ok())
-            };
-
-        match self {
-            SettingsPageItem::SectionHeader(header) => v_flex()
-                .w_full()
-                .px_8()
-                .gap_1p5()
-                .child(
-                    Label::new(SharedString::new_static(header))
-                        .size(LabelSize::Small)
-                        .color(Color::Muted)
-                        .buffer_font(cx),
-                )
-                .child(Divider::horizontal().color(DividerColor::BorderFaded))
-                .into_any_element(),
-            SettingsPageItem::SettingItem(setting_item) => {
-                let (field_with_padding, _) =
-                    render_setting_item_inner(setting_item, true, false, cx);
-
-                v_flex()
-                    .group("setting-item")
-                    .px_8()
-                    .child(field_with_padding)
-                    .when(!is_last, |this| this.child(Divider::horizontal()))
-                    .into_any_element()
-            }
-            SettingsPageItem::SubPageLink(sub_page_link) => v_flex()
-                .group("setting-item")
-                .px_8()
-                .child(
-                    h_flex()
-                        .id(sub_page_link.title.clone())
-                        .w_full()
-                        .min_w_0()
-                        .justify_between()
-                        .map(apply_padding)
-                        .child(
-                            v_flex()
-                                .w_full()
-                                .max_w_1_2()
-                                .child(Label::new(sub_page_link.title.clone())),
-                        )
-                        .child(
-                            Button::new(
-                                ("sub-page".into(), sub_page_link.title.clone()),
-                                "Configure",
-                            )
-                            .icon(IconName::ChevronRight)
-                            .tab_index(0_isize)
-                            .icon_position(IconPosition::End)
-                            .icon_color(Color::Muted)
-                            .icon_size(IconSize::Small)
-                            .style(ButtonStyle::OutlinedGhost)
-                            .size(ButtonSize::Medium)
-                            .on_click({
-                                let sub_page_link = sub_page_link.clone();
-                                cx.listener(move |this, _, _, cx| {
-                                    let mut section_index = item_index;
-                                    let current_page = this.current_page();
-
-                                    while !matches!(
-                                        current_page.items[section_index],
-                                        SettingsPageItem::SectionHeader(_)
-                                    ) {
-                                        section_index -= 1;
-                                    }
-
-                                    let SettingsPageItem::SectionHeader(header) =
-                                        current_page.items[section_index]
-                                    else {
-                                        unreachable!(
-                                            "All items always have a section header above them"
-                                        )
-                                    };
-
-                                    this.push_sub_page(sub_page_link.clone(), header, cx)
-                                })
-                            }),
-                        ),
-                )
-                .when(!is_last, |this| this.child(Divider::horizontal()))
-                .into_any_element(),
-            SettingsPageItem::DynamicItem(DynamicItem {
-                discriminant: discriminant_setting_item,
-                pick_discriminant,
-                fields,
-            }) => {
-                let file = file.to_settings();
-                let discriminant = SettingsStore::global(cx)
-                    .get_value_from_file(file, *pick_discriminant)
-                    .1;
-
-                let (discriminant_element, rendered_ok) =
-                    render_setting_item_inner(discriminant_setting_item, true, false, cx);
-
-                let has_sub_fields =
-                    rendered_ok && discriminant.map(|d| !fields[d].is_empty()).unwrap_or(false);
-
-                let mut content = v_flex()
-                    .id("dynamic-item")
-                    .child(
-                        div()
-                            .group("setting-item")
-                            .px_8()
-                            .child(discriminant_element.when(has_sub_fields, |this| this.pb_4())),
-                    )
-                    .when(!has_sub_fields && !is_last, |this| {
-                        this.child(h_flex().px_8().child(Divider::horizontal()))
-                    });
-
-                if rendered_ok {
-                    let discriminant =
-                        discriminant.expect("This should be Some if rendered_ok is true");
-                    let sub_fields = &fields[discriminant];
-                    let sub_field_count = sub_fields.len();
-
-                    for (index, field) in sub_fields.iter().enumerate() {
-                        let is_last_sub_field = index == sub_field_count - 1;
-                        let (raw_field, _) = render_setting_item_inner(field, false, true, cx);
-
-                        content = content.child(
-                            raw_field
-                                .group("setting-sub-item")
-                                .mx_8()
-                                .p_4()
-                                .border_t_1()
-                                .when(is_last_sub_field, |this| this.border_b_1())
-                                .when(is_last_sub_field && is_last, |this| this.mb_8())
-                                .border_dashed()
-                                .border_color(cx.theme().colors().border_variant)
-                                .bg(cx.theme().colors().element_background.opacity(0.2)),
-                        );
-                    }
-                }
-
-                return content.into_any_element();
-            }
-        }
-    }
-}
-
-fn render_settings_item(
-    settings_window: &SettingsWindow,
-    setting_item: &SettingItem,
-    file: SettingsUiFile,
-    control: AnyElement,
-    sub_field: bool,
-    cx: &mut Context<'_, SettingsWindow>,
-) -> Stateful<Div> {
-    let (found_in_file, _) = setting_item.field.file_set_in(file.clone(), cx);
-    let file_set_in = SettingsUiFile::from_settings(found_in_file.clone());
-
-    let clipboard_has_link = cx
-        .read_from_clipboard()
-        .and_then(|entry| entry.text())
-        .map_or(false, |maybe_url| {
-            setting_item.field.json_path().is_some()
-                && maybe_url.strip_prefix("zed://settings/") == setting_item.field.json_path()
-        });
-
-    let (link_icon, link_icon_color) = if clipboard_has_link {
-        (IconName::Check, Color::Success)
-    } else {
-        (IconName::Link, Color::Muted)
-    };
-
-    h_flex()
-        .id(setting_item.title)
-        .min_w_0()
-        .justify_between()
-        .child(
-            v_flex()
-                .relative()
-                .w_1_2()
-                .child(
-                    h_flex()
-                        .w_full()
-                        .gap_1()
-                        .child(Label::new(SharedString::new_static(setting_item.title)))
-                        .when_some(
-                            if sub_field {
-                                None
-                            } else {
-                                setting_item
-                                    .field
-                                    .reset_to_default_fn(&file, &found_in_file, cx)
-                            },
-                            |this, reset_to_default| {
-                                this.child(
-                                    IconButton::new("reset-to-default-btn", IconName::Undo)
-                                        .icon_color(Color::Muted)
-                                        .icon_size(IconSize::Small)
-                                        .tooltip(Tooltip::text("Reset to Default"))
-                                        .on_click({
-                                            move |_, _, cx| {
-                                                reset_to_default(cx);
-                                            }
-                                        }),
-                                )
-                            },
-                        )
-                        .when_some(
-                            file_set_in.filter(|file_set_in| file_set_in != &file),
-                            |this, file_set_in| {
-                                this.child(
-                                    Label::new(format!(
-                                        "—  Modified in {}",
-                                        settings_window
-                                            .display_name(&file_set_in)
-                                            .expect("File name should exist")
-                                    ))
-                                    .color(Color::Muted)
-                                    .size(LabelSize::Small),
-                                )
-                            },
-                        ),
-                )
-                .child(
-                    Label::new(SharedString::new_static(setting_item.description))
-                        .size(LabelSize::Small)
-                        .color(Color::Muted),
-                ),
-        )
-        .child(control)
-        .when(sub_page_stack().is_empty(), |this| {
-            // Intentionally using the description to make the icon button
-            // unique because some items share the same title (e.g., "Font Size")
-            let icon_button_id =
-                SharedString::new(format!("copy-link-btn-{}", setting_item.description));
-
-            this.child(
-                div()
-                    .absolute()
-                    .top(rems_from_px(18.))
-                    .map(|this| {
-                        if sub_field {
-                            this.visible_on_hover("setting-sub-item")
-                                .left(rems_from_px(-8.5))
-                        } else {
-                            this.visible_on_hover("setting-item")
-                                .left(rems_from_px(-22.))
-                        }
-                    })
-                    .child({
-                        IconButton::new(icon_button_id, link_icon)
-                            .icon_color(link_icon_color)
-                            .icon_size(IconSize::Small)
-                            .shape(IconButtonShape::Square)
-                            .tooltip(Tooltip::text("Copy Link"))
-                            .when_some(setting_item.field.json_path(), |this, path| {
-                                this.on_click(cx.listener(move |_, _, _, cx| {
-                                    let link = format!("zed://settings/{}", path);
-                                    cx.write_to_clipboard(ClipboardItem::new_string(link));
-                                    cx.notify();
-                                }))
-                            })
-                    }),
-            )
-        })
-}
-
-struct SettingItem {
-    title: &'static str,
-    description: &'static str,
-    field: Box<dyn AnySettingField>,
-    metadata: Option<Box<SettingsFieldMetadata>>,
-    files: FileMask,
-}
-
-struct DynamicItem {
-    discriminant: SettingItem,
-    pick_discriminant: fn(&SettingsContent) -> Option<usize>,
-    fields: Vec<Vec<SettingItem>>,
-}
-
-impl PartialEq for DynamicItem {
-    fn eq(&self, other: &Self) -> bool {
-        self.discriminant == other.discriminant && self.fields == other.fields
-    }
-}
-
-#[derive(PartialEq, Eq, Clone, Copy)]
-struct FileMask(u8);
-
-impl std::fmt::Debug for FileMask {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "FileMask(")?;
-        let mut items = vec![];
-
-        if self.contains(USER) {
-            items.push("USER");
-        }
-        if self.contains(PROJECT) {
-            items.push("LOCAL");
-        }
-        if self.contains(SERVER) {
-            items.push("SERVER");
-        }
-
-        write!(f, "{})", items.join(" | "))
-    }
-}
-
-const USER: FileMask = FileMask(1 << 0);
-const PROJECT: FileMask = FileMask(1 << 2);
-const SERVER: FileMask = FileMask(1 << 3);
-
-impl std::ops::BitAnd for FileMask {
-    type Output = Self;
-
-    fn bitand(self, other: Self) -> Self {
-        Self(self.0 & other.0)
-    }
-}
-
-impl std::ops::BitOr for FileMask {
-    type Output = Self;
-
-    fn bitor(self, other: Self) -> Self {
-        Self(self.0 | other.0)
-    }
-}
-
-impl FileMask {
-    fn contains(&self, other: FileMask) -> bool {
-        self.0 & other.0 != 0
-    }
-}
-
-impl PartialEq for SettingItem {
-    fn eq(&self, other: &Self) -> bool {
-        self.title == other.title
-            && self.description == other.description
-            && (match (&self.metadata, &other.metadata) {
-                (None, None) => true,
-                (Some(m1), Some(m2)) => m1.placeholder == m2.placeholder,
-                _ => false,
-            })
-    }
-}
-
-#[derive(Clone)]
-struct SubPageLink {
-    title: SharedString,
-    files: FileMask,
-    render: Arc<
-        dyn Fn(&mut SettingsWindow, &mut Window, &mut Context<SettingsWindow>) -> AnyElement
-            + 'static
-            + Send
-            + Sync,
-    >,
-}
-
-impl PartialEq for SubPageLink {
-    fn eq(&self, other: &Self) -> bool {
-        self.title == other.title
-    }
-}
-
-fn all_language_names(cx: &App) -> Vec<SharedString> {
-    workspace::AppState::global(cx)
-        .upgrade()
-        .map_or(vec![], |state| {
-            state
-                .languages
-                .language_names()
-                .into_iter()
-                .filter(|name| name.as_ref() != "Zed Keybind Context")
-                .map(Into::into)
-                .collect()
-        })
-}
-
-#[allow(unused)]
-#[derive(Clone, PartialEq, Debug)]
-enum SettingsUiFile {
-    User,                                // Uses all settings.
-    Project((WorktreeId, Arc<RelPath>)), // Has a special name, and special set of settings
-    Server(&'static str),                // Uses a special name, and the user settings
-}
-
-impl SettingsUiFile {
-    fn setting_type(&self) -> &'static str {
-        match self {
-            SettingsUiFile::User => "User",
-            SettingsUiFile::Project(_) => "Project",
-            SettingsUiFile::Server(_) => "Server",
-        }
-    }
-
-    fn is_server(&self) -> bool {
-        matches!(self, SettingsUiFile::Server(_))
-    }
-
-    fn worktree_id(&self) -> Option<WorktreeId> {
-        match self {
-            SettingsUiFile::User => None,
-            SettingsUiFile::Project((worktree_id, _)) => Some(*worktree_id),
-            SettingsUiFile::Server(_) => None,
-        }
-    }
-
-    fn from_settings(file: settings::SettingsFile) -> Option<Self> {
-        Some(match file {
-            settings::SettingsFile::User => SettingsUiFile::User,
-            settings::SettingsFile::Project(location) => SettingsUiFile::Project(location),
-            settings::SettingsFile::Server => SettingsUiFile::Server("todo: server name"),
-            settings::SettingsFile::Default => return None,
-            settings::SettingsFile::Global => return None,
-        })
-    }
-
-    fn to_settings(&self) -> settings::SettingsFile {
-        match self {
-            SettingsUiFile::User => settings::SettingsFile::User,
-            SettingsUiFile::Project(location) => settings::SettingsFile::Project(location.clone()),
-            SettingsUiFile::Server(_) => settings::SettingsFile::Server,
-        }
-    }
-
-    fn mask(&self) -> FileMask {
-        match self {
-            SettingsUiFile::User => USER,
-            SettingsUiFile::Project(_) => PROJECT,
-            SettingsUiFile::Server(_) => SERVER,
-        }
-    }
-}
-
-impl SettingsWindow {
-    fn new(
-        original_window: Option<WindowHandle<Workspace>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let font_family_cache = theme::FontFamilyCache::global(cx);
-
-        cx.spawn(async move |this, cx| {
-            font_family_cache.prefetch(cx).await;
-            this.update(cx, |_, cx| {
-                cx.notify();
-            })
-        })
-        .detach();
-
-        let current_file = SettingsUiFile::User;
-        let search_bar = cx.new(|cx| {
-            let mut editor = Editor::single_line(window, cx);
-            editor.set_placeholder_text("Search settings…", window, cx);
-            editor
-        });
-
-        cx.subscribe(&search_bar, |this, _, event: &EditorEvent, cx| {
-            let EditorEvent::Edited { transaction_id: _ } = event else {
-                return;
-            };
-
-            this.update_matches(cx);
-        })
-        .detach();
-
-        cx.observe_global_in::<SettingsStore>(window, move |this, window, cx| {
-            this.fetch_files(window, cx);
-            cx.notify();
-        })
-        .detach();
-
-        cx.on_window_closed(|cx| {
-            if let Some(existing_window) = cx
-                .windows()
-                .into_iter()
-                .find_map(|window| window.downcast::<SettingsWindow>())
-                && cx.windows().len() == 1
-            {
-                cx.update_window(*existing_window, |_, window, _| {
-                    window.remove_window();
-                })
-                .ok();
-
-                telemetry::event!("Settings Closed")
-            }
-        })
-        .detach();
-
-        if let Some(app_state) = AppState::global(cx).upgrade() {
-            for project in app_state
-                .workspace_store
-                .read(cx)
-                .workspaces()
-                .iter()
-                .filter_map(|space| {
-                    space
-                        .read(cx)
-                        .ok()
-                        .map(|workspace| workspace.project().clone())
-                })
-                .collect::<Vec<_>>()
-            {
-                cx.observe_release_in(&project, window, |this, _, window, cx| {
-                    this.fetch_files(window, cx)
-                })
-                .detach();
-                cx.subscribe_in(&project, window, Self::handle_project_event)
-                    .detach();
-            }
-
-            for workspace in app_state
-                .workspace_store
-                .read(cx)
-                .workspaces()
-                .iter()
-                .filter_map(|space| space.entity(cx).ok())
-            {
-                cx.observe_release_in(&workspace, window, |this, _, window, cx| {
-                    this.fetch_files(window, cx)
-                })
-                .detach();
-            }
-        } else {
-            log::error!("App state doesn't exist when creating a new settings window");
-        }
-
-        let this_weak = cx.weak_entity();
-        cx.observe_new::<Project>({
-            let this_weak = this_weak.clone();
-
-            move |_, window, cx| {
-                let project = cx.entity();
-                let Some(window) = window else {
-                    return;
-                };
-
-                this_weak
-                    .update(cx, |this, cx| {
-                        this.fetch_files(window, cx);
-                        cx.observe_release_in(&project, window, |_, _, window, cx| {
-                            cx.defer_in(window, |this, window, cx| this.fetch_files(window, cx));
-                        })
-                        .detach();
-
-                        cx.subscribe_in(&project, window, Self::handle_project_event)
-                            .detach();
-                    })
-                    .ok();
-            }
-        })
-        .detach();
-
-        cx.observe_new::<Workspace>(move |_, window, cx| {
-            let workspace = cx.entity();
-            let Some(window) = window else {
-                return;
-            };
-
-            this_weak
-                .update(cx, |this, cx| {
-                    this.fetch_files(window, cx);
-                    cx.observe_release_in(&workspace, window, |this, _, window, cx| {
-                        this.fetch_files(window, cx)
-                    })
-                    .detach();
-                })
-                .ok();
-        })
-        .detach();
-
-        let title_bar = if !cfg!(target_os = "macos") {
-            Some(cx.new(|cx| PlatformTitleBar::new("settings-title-bar", cx)))
-        } else {
-            None
-        };
-
-        // high overdraw value so the list scrollbar len doesn't change too much
-        let list_state = gpui::ListState::new(0, gpui::ListAlignment::Top, px(0.0)).measure_all();
-        list_state.set_scroll_handler(|_, _, _| {});
-
-        let mut this = Self {
-            title_bar,
-            original_window,
-
-            worktree_root_dirs: HashMap::default(),
-            files: vec![],
-
-            current_file: current_file,
-            pages: vec![],
-            navbar_entries: vec![],
-            navbar_entry: 0,
-            navbar_scroll_handle: UniformListScrollHandle::default(),
-            search_bar,
-            search_task: None,
-            filter_table: vec![],
-            has_query: false,
-            content_handles: vec![],
-            sub_page_scroll_handle: ScrollHandle::new(),
-            focus_handle: cx.focus_handle(),
-            navbar_focus_handle: NonFocusableHandle::new(
-                NAVBAR_CONTAINER_TAB_INDEX,
-                false,
-                window,
-                cx,
-            ),
-            navbar_focus_subscriptions: vec![],
-            content_focus_handle: NonFocusableHandle::new(
-                CONTENT_CONTAINER_TAB_INDEX,
-                false,
-                window,
-                cx,
-            ),
-            files_focus_handle: cx
-                .focus_handle()
-                .tab_index(HEADER_CONTAINER_TAB_INDEX)
-                .tab_stop(false),
-            search_index: None,
-            shown_errors: HashSet::default(),
-            list_state,
-        };
-
-        this.fetch_files(window, cx);
-        this.build_ui(window, cx);
-        this.build_search_index();
-
-        this.search_bar.update(cx, |editor, cx| {
-            editor.focus_handle(cx).focus(window);
-        });
-
-        this
-    }
-
-    fn handle_project_event(
-        &mut self,
-        _: &Entity<Project>,
-        event: &project::Event,
-        window: &mut Window,
-        cx: &mut Context<SettingsWindow>,
-    ) {
-        match event {
-            project::Event::WorktreeRemoved(_) | project::Event::WorktreeAdded(_) => {
-                cx.defer_in(window, |this, window, cx| {
-                    this.fetch_files(window, cx);
-                });
-            }
-            _ => {}
-        }
-    }
-
-    fn toggle_navbar_entry(&mut self, nav_entry_index: usize) {
-        // We can only toggle root entries
-        if !self.navbar_entries[nav_entry_index].is_root {
-            return;
-        }
-
-        let expanded = &mut self.navbar_entries[nav_entry_index].expanded;
-        *expanded = !*expanded;
-        self.navbar_entry = nav_entry_index;
-        self.reset_list_state();
-    }
-
-    fn build_navbar(&mut self, cx: &App) {
-        let mut navbar_entries = Vec::new();
-
-        for (page_index, page) in self.pages.iter().enumerate() {
-            navbar_entries.push(NavBarEntry {
-                title: page.title,
-                is_root: true,
-                expanded: false,
-                page_index,
-                item_index: None,
-                focus_handle: cx.focus_handle().tab_index(0).tab_stop(true),
-            });
-
-            for (item_index, item) in page.items.iter().enumerate() {
-                let SettingsPageItem::SectionHeader(title) = item else {
-                    continue;
-                };
-                navbar_entries.push(NavBarEntry {
-                    title,
-                    is_root: false,
-                    expanded: false,
-                    page_index,
-                    item_index: Some(item_index),
-                    focus_handle: cx.focus_handle().tab_index(0).tab_stop(true),
-                });
-            }
-        }
-
-        self.navbar_entries = navbar_entries;
-    }
-
-    fn setup_navbar_focus_subscriptions(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<SettingsWindow>,
-    ) {
-        let mut focus_subscriptions = Vec::new();
-
-        for entry_index in 0..self.navbar_entries.len() {
-            let focus_handle = self.navbar_entries[entry_index].focus_handle.clone();
-
-            let subscription = cx.on_focus(
-                &focus_handle,
-                window,
-                move |this: &mut SettingsWindow,
-                      window: &mut Window,
-                      cx: &mut Context<SettingsWindow>| {
-                    this.open_and_scroll_to_navbar_entry(entry_index, None, false, window, cx);
-                },
-            );
-            focus_subscriptions.push(subscription);
-        }
-        self.navbar_focus_subscriptions = focus_subscriptions;
-    }
-
-    fn visible_navbar_entries(&self) -> impl Iterator<Item = (usize, &NavBarEntry)> {
-        let mut index = 0;
-        let entries = &self.navbar_entries;
-        let search_matches = &self.filter_table;
-        let has_query = self.has_query;
-        std::iter::from_fn(move || {
-            while index < entries.len() {
-                let entry = &entries[index];
-                let included_in_search = if let Some(item_index) = entry.item_index {
-                    search_matches[entry.page_index][item_index]
-                } else {
-                    search_matches[entry.page_index].iter().any(|b| *b)
-                        || search_matches[entry.page_index].is_empty()
-                };
-                if included_in_search {
-                    break;
-                }
-                index += 1;
-            }
-            if index >= self.navbar_entries.len() {
-                return None;
-            }
-            let entry = &entries[index];
-            let entry_index = index;
-
-            index += 1;
-            if entry.is_root && !entry.expanded && !has_query {
-                while index < entries.len() {
-                    if entries[index].is_root {
-                        break;
-                    }
-                    index += 1;
-                }
-            }
-
-            return Some((entry_index, entry));
-        })
-    }
-
-    fn filter_matches_to_file(&mut self) {
-        let current_file = self.current_file.mask();
-        for (page, page_filter) in std::iter::zip(&self.pages, &mut self.filter_table) {
-            let mut header_index = 0;
-            let mut any_found_since_last_header = true;
-
-            for (index, item) in page.items.iter().enumerate() {
-                match item {
-                    SettingsPageItem::SectionHeader(_) => {
-                        if !any_found_since_last_header {
-                            page_filter[header_index] = false;
-                        }
-                        header_index = index;
-                        any_found_since_last_header = false;
-                    }
-                    SettingsPageItem::SettingItem(SettingItem { files, .. })
-                    | SettingsPageItem::SubPageLink(SubPageLink { files, .. })
-                    | SettingsPageItem::DynamicItem(DynamicItem {
-                        discriminant: SettingItem { files, .. },
-                        ..
-                    }) => {
-                        if !files.contains(current_file) {
-                            page_filter[index] = false;
-                        } else {
-                            any_found_since_last_header = true;
-                        }
-                    }
-                }
-            }
-            if let Some(last_header) = page_filter.get_mut(header_index)
-                && !any_found_since_last_header
-            {
-                *last_header = false;
-            }
-        }
-    }
-
-    fn update_matches(&mut self, cx: &mut Context<SettingsWindow>) {
-        self.search_task.take();
-        let mut query = self.search_bar.read(cx).text(cx);
-        if query.is_empty() || self.search_index.is_none() {
-            for page in &mut self.filter_table {
-                page.fill(true);
-            }
-            self.has_query = false;
-            self.filter_matches_to_file();
-            self.reset_list_state();
-            cx.notify();
-            return;
-        }
-
-        let is_json_link_query;
-        if query.starts_with("#") {
-            query.remove(0);
-            is_json_link_query = true;
-        } else {
-            is_json_link_query = false;
-        }
-
-        let search_index = self.search_index.as_ref().unwrap().clone();
-
-        fn update_matches_inner(
-            this: &mut SettingsWindow,
-            search_index: &SearchIndex,
-            match_indices: impl Iterator<Item = usize>,
-            cx: &mut Context<SettingsWindow>,
-        ) {
-            for page in &mut this.filter_table {
-                page.fill(false);
-            }
-
-            for match_index in match_indices {
-                let SearchKeyLUTEntry {
-                    page_index,
-                    header_index,
-                    item_index,
-                    ..
-                } = search_index.key_lut[match_index];
-                let page = &mut this.filter_table[page_index];
-                page[header_index] = true;
-                page[item_index] = true;
-            }
-            this.has_query = true;
-            this.filter_matches_to_file();
-            this.open_first_nav_page();
-            this.reset_list_state();
-            cx.notify();
-        }
-
-        self.search_task = Some(cx.spawn(async move |this, cx| {
-            if is_json_link_query {
-                let mut indices = vec![];
-                for (index, SearchKeyLUTEntry { json_path, .. }) in
-                    search_index.key_lut.iter().enumerate()
-                {
-                    let Some(json_path) = json_path else {
-                        continue;
-                    };
-
-                    if let Some(post) = query.strip_prefix(json_path)
-                        && (post.is_empty() || post.starts_with('.'))
-                    {
-                        indices.push(index);
-                    }
-                }
-                if !indices.is_empty() {
-                    this.update(cx, |this, cx| {
-                        update_matches_inner(this, search_index.as_ref(), indices.into_iter(), cx);
-                    })
-                    .ok();
-                    return;
-                }
-            }
-            let bm25_task = cx.background_spawn({
-                let search_index = search_index.clone();
-                let max_results = search_index.key_lut.len();
-                let query = query.clone();
-                async move { search_index.bm25_engine.search(&query, max_results) }
-            });
-            let cancel_flag = std::sync::atomic::AtomicBool::new(false);
-            let fuzzy_search_task = fuzzy::match_strings(
-                search_index.fuzzy_match_candidates.as_slice(),
-                &query,
-                false,
-                true,
-                search_index.fuzzy_match_candidates.len(),
-                &cancel_flag,
-                cx.background_executor().clone(),
-            );
-
-            let fuzzy_matches = fuzzy_search_task.await;
-
-            _ = this
-                .update(cx, |this, cx| {
-                    // For tuning the score threshold
-                    // for fuzzy_match in &fuzzy_matches {
-                    //     let SearchItemKey {
-                    //         page_index,
-                    //         header_index,
-                    //         item_index,
-                    //     } = search_index.key_lut[fuzzy_match.candidate_id];
-                    //     let SettingsPageItem::SectionHeader(header) =
-                    //         this.pages[page_index].items[header_index]
-                    //     else {
-                    //         continue;
-                    //     };
-                    //     let SettingsPageItem::SettingItem(SettingItem {
-                    //         title, description, ..
-                    //     }) = this.pages[page_index].items[item_index]
-                    //     else {
-                    //         continue;
-                    //     };
-                    //     let score = fuzzy_match.score;
-                    //     eprint!("# {header} :: QUERY = {query} :: SCORE = {score}\n{title}\n{description}\n\n");
-                    // }
-                    update_matches_inner(
-                        this,
-                        search_index.as_ref(),
-                        fuzzy_matches
-                            .into_iter()
-                            // MAGIC NUMBER: Was found to have right balance between not too many weird matches, but also
-                            // flexible enough to catch misspellings and <4 letter queries
-                            // More flexible is good for us here because fuzzy matches will only be used for things that don't
-                            // match using bm25
-                            .take_while(|fuzzy_match| fuzzy_match.score >= 0.3)
-                            .map(|fuzzy_match| fuzzy_match.candidate_id),
-                        cx,
-                    );
-                })
-                .ok();
-
-            let bm25_matches = bm25_task.await;
-
-            _ = this
-                .update(cx, |this, cx| {
-                    if bm25_matches.is_empty() {
-                        return;
-                    }
-                    update_matches_inner(
-                        this,
-                        search_index.as_ref(),
-                        bm25_matches
-                            .into_iter()
-                            .map(|bm25_match| bm25_match.document.id),
-                        cx,
-                    );
-                })
-                .ok();
-
-            cx.background_executor().timer(Duration::from_secs(1)).await;
-            telemetry::event!("Settings Searched", query = query)
-        }));
-    }
-
-    fn build_filter_table(&mut self) {
-        self.filter_table = self
-            .pages
-            .iter()
-            .map(|page| vec![true; page.items.len()])
-            .collect::<Vec<_>>();
-    }
-
-    fn build_search_index(&mut self) {
-        let mut key_lut: Vec<SearchKeyLUTEntry> = vec![];
-        let mut documents = Vec::default();
-        let mut fuzzy_match_candidates = Vec::default();
-
-        fn push_candidates(
-            fuzzy_match_candidates: &mut Vec<StringMatchCandidate>,
-            key_index: usize,
-            input: &str,
-        ) {
-            for word in input.split_ascii_whitespace() {
-                fuzzy_match_candidates.push(StringMatchCandidate::new(key_index, word));
-            }
-        }
-
-        // PERF: We are currently searching all items even in project files
-        // where many settings are filtered out, using the logic in filter_matches_to_file
-        // we could only search relevant items based on the current file
-        for (page_index, page) in self.pages.iter().enumerate() {
-            let mut header_index = 0;
-            let mut header_str = "";
-            for (item_index, item) in page.items.iter().enumerate() {
-                let key_index = key_lut.len();
-                let mut json_path = None;
-                match item {
-                    SettingsPageItem::DynamicItem(DynamicItem {
-                        discriminant: item, ..
-                    })
-                    | SettingsPageItem::SettingItem(item) => {
-                        json_path = item
-                            .field
-                            .json_path()
-                            .map(|path| path.trim_end_matches('$'));
-                        documents.push(bm25::Document {
-                            id: key_index,
-                            contents: [page.title, header_str, item.title, item.description]
-                                .join("\n"),
-                        });
-                        push_candidates(&mut fuzzy_match_candidates, key_index, item.title);
-                        push_candidates(&mut fuzzy_match_candidates, key_index, item.description);
-                    }
-                    SettingsPageItem::SectionHeader(header) => {
-                        documents.push(bm25::Document {
-                            id: key_index,
-                            contents: header.to_string(),
-                        });
-                        push_candidates(&mut fuzzy_match_candidates, key_index, header);
-                        header_index = item_index;
-                        header_str = *header;
-                    }
-                    SettingsPageItem::SubPageLink(sub_page_link) => {
-                        documents.push(bm25::Document {
-                            id: key_index,
-                            contents: [page.title, header_str, sub_page_link.title.as_ref()]
-                                .join("\n"),
-                        });
-                        push_candidates(
-                            &mut fuzzy_match_candidates,
-                            key_index,
-                            sub_page_link.title.as_ref(),
-                        );
-                    }
-                }
-                push_candidates(&mut fuzzy_match_candidates, key_index, page.title);
-                push_candidates(&mut fuzzy_match_candidates, key_index, header_str);
-
-                key_lut.push(SearchKeyLUTEntry {
-                    page_index,
-                    header_index,
-                    item_index,
-                    json_path,
-                });
-            }
-        }
-        let engine =
-            bm25::SearchEngineBuilder::with_documents(bm25::Language::English, documents).build();
-        self.search_index = Some(Arc::new(SearchIndex {
-            bm25_engine: engine,
-            key_lut,
-            fuzzy_match_candidates,
-        }));
-    }
-
-    fn build_content_handles(&mut self, window: &mut Window, cx: &mut Context<SettingsWindow>) {
-        self.content_handles = self
-            .pages
-            .iter()
-            .map(|page| {
-                std::iter::repeat_with(|| NonFocusableHandle::new(0, false, window, cx))
-                    .take(page.items.len())
-                    .collect()
-            })
-            .collect::<Vec<_>>();
-    }
-
-    fn reset_list_state(&mut self) {
-        // plus one for the title
-        let mut visible_items_count = self.visible_page_items().count();
-
-        if visible_items_count > 0 {
-            // show page title if page is non empty
-            visible_items_count += 1;
-        }
-
-        self.list_state.reset(visible_items_count);
-    }
-
-    fn build_ui(&mut self, window: &mut Window, cx: &mut Context<SettingsWindow>) {
-        if self.pages.is_empty() {
-            self.pages = page_data::settings_data(cx);
-            self.build_navbar(cx);
-            self.setup_navbar_focus_subscriptions(window, cx);
-            self.build_content_handles(window, cx);
-        }
-        sub_page_stack_mut().clear();
-        // PERF: doesn't have to be rebuilt, can just be filled with true. pages is constant once it is built
-        self.build_filter_table();
-        self.reset_list_state();
-        self.update_matches(cx);
-
-        cx.notify();
-    }
-
-    #[track_caller]
-    fn fetch_files(&mut self, window: &mut Window, cx: &mut Context<SettingsWindow>) {
-        self.worktree_root_dirs.clear();
-        let prev_files = self.files.clone();
-        let settings_store = cx.global::<SettingsStore>();
-        let mut ui_files = vec![];
-        let mut all_files = settings_store.get_all_files();
-        if !all_files.contains(&settings::SettingsFile::User) {
-            all_files.push(settings::SettingsFile::User);
-        }
-        for file in all_files {
-            let Some(settings_ui_file) = SettingsUiFile::from_settings(file) else {
-                continue;
-            };
-            if settings_ui_file.is_server() {
-                continue;
-            }
-
-            if let Some(worktree_id) = settings_ui_file.worktree_id() {
-                let directory_name = all_projects(cx)
-                    .find_map(|project| project.read(cx).worktree_for_id(worktree_id, cx))
-                    .and_then(|worktree| worktree.read(cx).root_dir())
-                    .and_then(|root_dir| {
-                        root_dir
-                            .file_name()
-                            .map(|os_string| os_string.to_string_lossy().to_string())
-                    });
-
-                let Some(directory_name) = directory_name else {
-                    log::error!(
-                        "No directory name found for settings file at worktree ID: {}",
-                        worktree_id
-                    );
-                    continue;
-                };
-
-                self.worktree_root_dirs.insert(worktree_id, directory_name);
-            }
-
-            let focus_handle = prev_files
-                .iter()
-                .find_map(|(prev_file, handle)| {
-                    (prev_file == &settings_ui_file).then(|| handle.clone())
-                })
-                .unwrap_or_else(|| cx.focus_handle().tab_index(0).tab_stop(true));
-            ui_files.push((settings_ui_file, focus_handle));
-        }
-
-        ui_files.reverse();
-
-        let mut missing_worktrees = Vec::new();
-
-        for worktree in all_projects(cx)
-            .flat_map(|project| project.read(cx).visible_worktrees(cx))
-            .filter(|tree| !self.worktree_root_dirs.contains_key(&tree.read(cx).id()))
-        {
-            let worktree = worktree.read(cx);
-            let worktree_id = worktree.id();
-            let Some(directory_name) = worktree.root_dir().and_then(|file| {
-                file.file_name()
-                    .map(|os_string| os_string.to_string_lossy().to_string())
-            }) else {
-                continue;
-            };
-
-            missing_worktrees.push((worktree_id, directory_name.clone()));
-            let path = RelPath::empty().to_owned().into_arc();
-
-            let settings_ui_file = SettingsUiFile::Project((worktree_id, path));
-
-            let focus_handle = prev_files
-                .iter()
-                .find_map(|(prev_file, handle)| {
-                    (prev_file == &settings_ui_file).then(|| handle.clone())
-                })
-                .unwrap_or_else(|| cx.focus_handle().tab_index(0).tab_stop(true));
-
-            ui_files.push((settings_ui_file, focus_handle));
-        }
-
-        self.worktree_root_dirs.extend(missing_worktrees);
-
-        self.files = ui_files;
-        let current_file_still_exists = self
-            .files
-            .iter()
-            .any(|(file, _)| file == &self.current_file);
-        if !current_file_still_exists {
-            self.change_file(0, window, cx);
-        }
-    }
-
-    fn open_navbar_entry_page(&mut self, navbar_entry: usize) {
-        if !self.is_nav_entry_visible(navbar_entry) {
-            self.open_first_nav_page();
-        }
-
-        let is_new_page = self.navbar_entries[self.navbar_entry].page_index
-            != self.navbar_entries[navbar_entry].page_index;
-        self.navbar_entry = navbar_entry;
-
-        // We only need to reset visible items when updating matches
-        // and selecting a new page
-        if is_new_page {
-            self.reset_list_state();
-        }
-
-        sub_page_stack_mut().clear();
-    }
-
-    fn open_first_nav_page(&mut self) {
-        let Some(first_navbar_entry_index) = self.visible_navbar_entries().next().map(|e| e.0)
-        else {
-            return;
-        };
-        self.open_navbar_entry_page(first_navbar_entry_index);
-    }
-
-    fn change_file(&mut self, ix: usize, window: &mut Window, cx: &mut Context<SettingsWindow>) {
-        if ix >= self.files.len() {
-            self.current_file = SettingsUiFile::User;
-            self.build_ui(window, cx);
-            return;
-        }
-
-        if self.files[ix].0 == self.current_file {
-            return;
-        }
-        self.current_file = self.files[ix].0.clone();
-
-        if let SettingsUiFile::Project((_, _)) = &self.current_file {
-            telemetry::event!("Setting Project Clicked");
-        }
-
-        self.build_ui(window, cx);
-
-        if self
-            .visible_navbar_entries()
-            .any(|(index, _)| index == self.navbar_entry)
-        {
-            self.open_and_scroll_to_navbar_entry(self.navbar_entry, None, true, window, cx);
-        } else {
-            self.open_first_nav_page();
-        };
-    }
-
-    fn render_files_header(
-        &self,
-        window: &mut Window,
-        cx: &mut Context<SettingsWindow>,
-    ) -> impl IntoElement {
-        static OVERFLOW_LIMIT: usize = 1;
-
-        let file_button =
-            |ix, file: &SettingsUiFile, focus_handle, cx: &mut Context<SettingsWindow>| {
-                Button::new(
-                    ix,
-                    self.display_name(&file)
-                        .expect("Files should always have a name"),
-                )
-                .toggle_state(file == &self.current_file)
-                .selected_style(ButtonStyle::Tinted(ui::TintColor::Accent))
-                .track_focus(focus_handle)
-                .on_click(cx.listener({
-                    let focus_handle = focus_handle.clone();
-                    move |this, _: &gpui::ClickEvent, window, cx| {
-                        this.change_file(ix, window, cx);
-                        focus_handle.focus(window);
-                    }
-                }))
-            };
-
-        let this = cx.entity();
-
-        let selected_file_ix = self
-            .files
-            .iter()
-            .enumerate()
-            .skip(OVERFLOW_LIMIT)
-            .find_map(|(ix, (file, _))| {
-                if file == &self.current_file {
-                    Some(ix)
-                } else {
-                    None
-                }
-            })
-            .unwrap_or(OVERFLOW_LIMIT);
-        let edit_in_json_id = SharedString::new(format!("edit-in-json-{}", selected_file_ix));
-
-        h_flex()
-            .w_full()
-            .gap_1()
-            .justify_between()
-            .track_focus(&self.files_focus_handle)
-            .tab_group()
-            .tab_index(HEADER_GROUP_TAB_INDEX)
-            .child(
-                h_flex()
-                    .gap_1()
-                    .children(
-                        self.files.iter().enumerate().take(OVERFLOW_LIMIT).map(
-                            |(ix, (file, focus_handle))| file_button(ix, file, focus_handle, cx),
-                        ),
-                    )
-                    .when(self.files.len() > OVERFLOW_LIMIT, |div| {
-                        let (file, focus_handle) = &self.files[selected_file_ix];
-
-                        div.child(file_button(selected_file_ix, file, focus_handle, cx))
-                            .when(self.files.len() > OVERFLOW_LIMIT + 1, |div| {
-                                div.child(
-                                    DropdownMenu::new(
-                                        "more-files",
-                                        format!("+{}", self.files.len() - (OVERFLOW_LIMIT + 1)),
-                                        ContextMenu::build(window, cx, move |mut menu, _, _| {
-                                            for (mut ix, (file, focus_handle)) in self
-                                                .files
-                                                .iter()
-                                                .enumerate()
-                                                .skip(OVERFLOW_LIMIT + 1)
-                                            {
-                                                let (display_name, focus_handle) =
-                                                    if selected_file_ix == ix {
-                                                        ix = OVERFLOW_LIMIT;
-                                                        (
-                                                            self.display_name(&self.files[ix].0),
-                                                            self.files[ix].1.clone(),
-                                                        )
-                                                    } else {
-                                                        (
-                                                            self.display_name(&file),
-                                                            focus_handle.clone(),
-                                                        )
-                                                    };
-
-                                                menu = menu.entry(
-                                                    display_name
-                                                        .expect("Files should always have a name"),
-                                                    None,
-                                                    {
-                                                        let this = this.clone();
-                                                        move |window, cx| {
-                                                            this.update(cx, |this, cx| {
-                                                                this.change_file(ix, window, cx);
-                                                            });
-                                                            focus_handle.focus(window);
-                                                        }
-                                                    },
-                                                );
-                                            }
-
-                                            menu
-                                        }),
-                                    )
-                                    .style(DropdownStyle::Subtle)
-                                    .trigger_tooltip(Tooltip::text("View Other Projects"))
-                                    .trigger_icon(IconName::ChevronDown)
-                                    .attach(gpui::Corner::BottomLeft)
-                                    .offset(gpui::Point {
-                                        x: px(0.0),
-                                        y: px(2.0),
-                                    })
-                                    .tab_index(0),
-                                )
-                            })
-                    }),
-            )
-            .child(
-                Button::new(edit_in_json_id, "Edit in settings.json")
-                    .tab_index(0_isize)
-                    .style(ButtonStyle::OutlinedGhost)
-                    .tooltip(Tooltip::for_action_title_in(
-                        "Edit in settings.json",
-                        &OpenCurrentFile,
-                        &self.focus_handle,
-                    ))
-                    .on_click(cx.listener(|this, _, window, cx| {
-                        this.open_current_settings_file(window, cx);
-                    })),
-            )
-    }
-
-    pub(crate) fn display_name(&self, file: &SettingsUiFile) -> Option<String> {
-        match file {
-            SettingsUiFile::User => Some("User".to_string()),
-            SettingsUiFile::Project((worktree_id, path)) => self
-                .worktree_root_dirs
-                .get(&worktree_id)
-                .map(|directory_name| {
-                    let path_style = PathStyle::local();
-                    if path.is_empty() {
-                        directory_name.clone()
-                    } else {
-                        format!(
-                            "{}{}{}",
-                            directory_name,
-                            path_style.primary_separator(),
-                            path.display(path_style)
-                        )
-                    }
-                }),
-            SettingsUiFile::Server(file) => Some(file.to_string()),
-        }
-    }
-
-    // TODO:
-    //  Reconsider this after preview launch
-    // fn file_location_str(&self) -> String {
-    //     match &self.current_file {
-    //         SettingsUiFile::User => "settings.json".to_string(),
-    //         SettingsUiFile::Project((worktree_id, path)) => self
-    //             .worktree_root_dirs
-    //             .get(&worktree_id)
-    //             .map(|directory_name| {
-    //                 let path_style = PathStyle::local();
-    //                 let file_path = path.join(paths::local_settings_file_relative_path());
-    //                 format!(
-    //                     "{}{}{}",
-    //                     directory_name,
-    //                     path_style.separator(),
-    //                     file_path.display(path_style)
-    //                 )
-    //             })
-    //             .expect("Current file should always be present in root dir map"),
-    //         SettingsUiFile::Server(file) => file.to_string(),
-    //     }
-    // }
-
-    fn render_search(&self, _window: &mut Window, cx: &mut App) -> Div {
-        h_flex()
-            .py_1()
-            .px_1p5()
-            .mb_3()
-            .gap_1p5()
-            .rounded_sm()
-            .bg(cx.theme().colors().editor_background)
-            .border_1()
-            .border_color(cx.theme().colors().border)
-            .child(Icon::new(IconName::MagnifyingGlass).color(Color::Muted))
-            .child(self.search_bar.clone())
-    }
-
-    fn render_nav(
-        &self,
-        window: &mut Window,
-        cx: &mut Context<SettingsWindow>,
-    ) -> impl IntoElement {
-        let visible_count = self.visible_navbar_entries().count();
-
-        let focus_keybind_label = if self
-            .navbar_focus_handle
-            .read(cx)
-            .handle
-            .contains_focused(window, cx)
-            || self
-                .visible_navbar_entries()
-                .any(|(_, entry)| entry.focus_handle.is_focused(window))
-        {
-            "Focus Content"
-        } else {
-            "Focus Navbar"
-        };
-
-        let mut key_context = KeyContext::new_with_defaults();
-        key_context.add("NavigationMenu");
-        key_context.add("menu");
-        if self.search_bar.focus_handle(cx).is_focused(window) {
-            key_context.add("search");
-        }
-
-        v_flex()
-            .key_context(key_context)
-            .on_action(cx.listener(|this, _: &CollapseNavEntry, window, cx| {
-                let Some(focused_entry) = this.focused_nav_entry(window, cx) else {
-                    return;
-                };
-                let focused_entry_parent = this.root_entry_containing(focused_entry);
-                if this.navbar_entries[focused_entry_parent].expanded {
-                    this.toggle_navbar_entry(focused_entry_parent);
-                    window.focus(&this.navbar_entries[focused_entry_parent].focus_handle);
-                }
-                cx.notify();
-            }))
-            .on_action(cx.listener(|this, _: &ExpandNavEntry, window, cx| {
-                let Some(focused_entry) = this.focused_nav_entry(window, cx) else {
-                    return;
-                };
-                if !this.navbar_entries[focused_entry].is_root {
-                    return;
-                }
-                if !this.navbar_entries[focused_entry].expanded {
-                    this.toggle_navbar_entry(focused_entry);
-                }
-                cx.notify();
-            }))
-            .on_action(
-                cx.listener(|this, _: &FocusPreviousRootNavEntry, window, cx| {
-                    let entry_index = this
-                        .focused_nav_entry(window, cx)
-                        .unwrap_or(this.navbar_entry);
-                    let mut root_index = None;
-                    for (index, entry) in this.visible_navbar_entries() {
-                        if index >= entry_index {
-                            break;
-                        }
-                        if entry.is_root {
-                            root_index = Some(index);
-                        }
-                    }
-                    let Some(previous_root_index) = root_index else {
-                        return;
-                    };
-                    this.focus_and_scroll_to_nav_entry(previous_root_index, window, cx);
-                }),
-            )
-            .on_action(cx.listener(|this, _: &FocusNextRootNavEntry, window, cx| {
-                let entry_index = this
-                    .focused_nav_entry(window, cx)
-                    .unwrap_or(this.navbar_entry);
-                let mut root_index = None;
-                for (index, entry) in this.visible_navbar_entries() {
-                    if index <= entry_index {
-                        continue;
-                    }
-                    if entry.is_root {
-                        root_index = Some(index);
-                        break;
-                    }
-                }
-                let Some(next_root_index) = root_index else {
-                    return;
-                };
-                this.focus_and_scroll_to_nav_entry(next_root_index, window, cx);
-            }))
-            .on_action(cx.listener(|this, _: &FocusFirstNavEntry, window, cx| {
-                if let Some((first_entry_index, _)) = this.visible_navbar_entries().next() {
-                    this.focus_and_scroll_to_nav_entry(first_entry_index, window, cx);
-                }
-            }))
-            .on_action(cx.listener(|this, _: &FocusLastNavEntry, window, cx| {
-                if let Some((last_entry_index, _)) = this.visible_navbar_entries().last() {
-                    this.focus_and_scroll_to_nav_entry(last_entry_index, window, cx);
-                }
-            }))
-            .on_action(cx.listener(|this, _: &FocusNextNavEntry, window, cx| {
-                let entry_index = this
-                    .focused_nav_entry(window, cx)
-                    .unwrap_or(this.navbar_entry);
-                let mut next_index = None;
-                for (index, _) in this.visible_navbar_entries() {
-                    if index > entry_index {
-                        next_index = Some(index);
-                        break;
-                    }
-                }
-                let Some(next_entry_index) = next_index else {
-                    return;
-                };
-                this.open_and_scroll_to_navbar_entry(
-                    next_entry_index,
-                    Some(gpui::ScrollStrategy::Bottom),
-                    false,
-                    window,
-                    cx,
-                );
-            }))
-            .on_action(cx.listener(|this, _: &FocusPreviousNavEntry, window, cx| {
-                let entry_index = this
-                    .focused_nav_entry(window, cx)
-                    .unwrap_or(this.navbar_entry);
-                let mut prev_index = None;
-                for (index, _) in this.visible_navbar_entries() {
-                    if index >= entry_index {
-                        break;
-                    }
-                    prev_index = Some(index);
-                }
-                let Some(prev_entry_index) = prev_index else {
-                    return;
-                };
-                this.open_and_scroll_to_navbar_entry(
-                    prev_entry_index,
-                    Some(gpui::ScrollStrategy::Top),
-                    false,
-                    window,
-                    cx,
-                );
-            }))
-            .w_56()
-            .h_full()
-            .p_2p5()
-            .when(cfg!(target_os = "macos"), |this| this.pt_10())
-            .flex_none()
-            .border_r_1()
-            .border_color(cx.theme().colors().border)
-            .bg(cx.theme().colors().panel_background)
-            .child(self.render_search(window, cx))
-            .child(
-                v_flex()
-                    .flex_1()
-                    .overflow_hidden()
-                    .track_focus(&self.navbar_focus_handle.focus_handle(cx))
-                    .tab_group()
-                    .tab_index(NAVBAR_GROUP_TAB_INDEX)
-                    .child(
-                        uniform_list(
-                            "settings-ui-nav-bar",
-                            visible_count + 1,
-                            cx.processor(move |this, range: Range<usize>, _, cx| {
-                                this.visible_navbar_entries()
-                                    .skip(range.start.saturating_sub(1))
-                                    .take(range.len())
-                                    .map(|(entry_index, entry)| {
-                                        TreeViewItem::new(
-                                            ("settings-ui-navbar-entry", entry_index),
-                                            entry.title,
-                                        )
-                                        .track_focus(&entry.focus_handle)
-                                        .root_item(entry.is_root)
-                                        .toggle_state(this.is_navbar_entry_selected(entry_index))
-                                        .when(entry.is_root, |item| {
-                                            item.expanded(entry.expanded || this.has_query)
-                                                .on_toggle(cx.listener(
-                                                    move |this, _, window, cx| {
-                                                        this.toggle_navbar_entry(entry_index);
-                                                        window.focus(
-                                                            &this.navbar_entries[entry_index]
-                                                                .focus_handle,
-                                                        );
-                                                        cx.notify();
-                                                    },
-                                                ))
-                                        })
-                                        .on_click({
-                                            let category = this.pages[entry.page_index].title;
-                                            let subcategory =
-                                                (!entry.is_root).then_some(entry.title);
-
-                                            cx.listener(move |this, _, window, cx| {
-                                                telemetry::event!(
-                                                    "Settings Navigation Clicked",
-                                                    category = category,
-                                                    subcategory = subcategory
-                                                );
-
-                                                this.open_and_scroll_to_navbar_entry(
-                                                    entry_index,
-                                                    None,
-                                                    true,
-                                                    window,
-                                                    cx,
-                                                );
-                                            })
-                                        })
-                                    })
-                                    .collect()
-                            }),
-                        )
-                        .size_full()
-                        .track_scroll(&self.navbar_scroll_handle),
-                    )
-                    .vertical_scrollbar_for(&self.navbar_scroll_handle, window, cx),
-            )
-            .child(
-                h_flex()
-                    .w_full()
-                    .h_8()
-                    .p_2()
-                    .pb_0p5()
-                    .flex_shrink_0()
-                    .border_t_1()
-                    .border_color(cx.theme().colors().border_variant)
-                    .child(
-                        KeybindingHint::new(
-                            KeyBinding::for_action_in(
-                                &ToggleFocusNav,
-                                &self.navbar_focus_handle.focus_handle(cx),
-                                cx,
-                            ),
-                            cx.theme().colors().surface_background.opacity(0.5),
-                        )
-                        .suffix(focus_keybind_label),
-                    ),
-            )
-    }
-
-    fn open_and_scroll_to_navbar_entry(
-        &mut self,
-        navbar_entry_index: usize,
-        scroll_strategy: Option<gpui::ScrollStrategy>,
-        focus_content: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.open_navbar_entry_page(navbar_entry_index);
-        cx.notify();
-
-        let mut handle_to_focus = None;
-
-        if self.navbar_entries[navbar_entry_index].is_root
-            || !self.is_nav_entry_visible(navbar_entry_index)
-        {
-            self.sub_page_scroll_handle
-                .set_offset(point(px(0.), px(0.)));
-            if focus_content {
-                let Some(first_item_index) =
-                    self.visible_page_items().next().map(|(index, _)| index)
-                else {
-                    return;
-                };
-                handle_to_focus = Some(self.focus_handle_for_content_element(first_item_index, cx));
-            } else if !self.is_nav_entry_visible(navbar_entry_index) {
-                let Some(first_visible_nav_entry_index) =
-                    self.visible_navbar_entries().next().map(|(index, _)| index)
-                else {
-                    return;
-                };
-                self.focus_and_scroll_to_nav_entry(first_visible_nav_entry_index, window, cx);
-            } else {
-                handle_to_focus =
-                    Some(self.navbar_entries[navbar_entry_index].focus_handle.clone());
-            }
-        } else {
-            let entry_item_index = self.navbar_entries[navbar_entry_index]
-                .item_index
-                .expect("Non-root items should have an item index");
-            self.scroll_to_content_item(entry_item_index, window, cx);
-            if focus_content {
-                handle_to_focus = Some(self.focus_handle_for_content_element(entry_item_index, cx));
-            } else {
-                handle_to_focus =
-                    Some(self.navbar_entries[navbar_entry_index].focus_handle.clone());
-            }
-        }
-
-        if let Some(scroll_strategy) = scroll_strategy
-            && let Some(logical_entry_index) = self
-                .visible_navbar_entries()
-                .into_iter()
-                .position(|(index, _)| index == navbar_entry_index)
-        {
-            self.navbar_scroll_handle
-                .scroll_to_item(logical_entry_index + 1, scroll_strategy);
-        }
-
-        // Page scroll handle updates the active item index
-        // in it's next paint call after using scroll_handle.scroll_to_top_of_item
-        // The call after that updates the offset of the scroll handle. So to
-        // ensure the scroll handle doesn't lag behind we need to render three frames
-        // back to back.
-        cx.on_next_frame(window, move |_, window, cx| {
-            if let Some(handle) = handle_to_focus.as_ref() {
-                window.focus(handle);
-            }
-
-            cx.on_next_frame(window, |_, _, cx| {
-                cx.notify();
-            });
-            cx.notify();
-        });
-        cx.notify();
-    }
-
-    fn scroll_to_content_item(
-        &self,
-        content_item_index: usize,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let index = self
-            .visible_page_items()
-            .position(|(index, _)| index == content_item_index)
-            .unwrap_or(0);
-        if index == 0 {
-            self.sub_page_scroll_handle
-                .set_offset(point(px(0.), px(0.)));
-            self.list_state.scroll_to(gpui::ListOffset {
-                item_ix: 0,
-                offset_in_item: px(0.),
-            });
-            return;
-        }
-        self.list_state.scroll_to(gpui::ListOffset {
-            item_ix: index + 1,
-            offset_in_item: px(0.),
-        });
-        cx.notify();
-    }
-
-    fn is_nav_entry_visible(&self, nav_entry_index: usize) -> bool {
-        self.visible_navbar_entries()
-            .any(|(index, _)| index == nav_entry_index)
-    }
-
-    fn focus_and_scroll_to_first_visible_nav_entry(
-        &self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(nav_entry_index) = self.visible_navbar_entries().next().map(|(index, _)| index)
-        {
-            self.focus_and_scroll_to_nav_entry(nav_entry_index, window, cx);
-        }
-    }
-
-    fn focus_and_scroll_to_nav_entry(
-        &self,
-        nav_entry_index: usize,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(position) = self
-            .visible_navbar_entries()
-            .position(|(index, _)| index == nav_entry_index)
-        else {
-            return;
-        };
-        self.navbar_scroll_handle
-            .scroll_to_item(position, gpui::ScrollStrategy::Top);
-        window.focus(&self.navbar_entries[nav_entry_index].focus_handle);
-        cx.notify();
-    }
-
-    fn visible_page_items(&self) -> impl Iterator<Item = (usize, &SettingsPageItem)> {
-        let page_idx = self.current_page_index();
-
-        self.current_page()
-            .items
-            .iter()
-            .enumerate()
-            .filter_map(move |(item_index, item)| {
-                self.filter_table[page_idx][item_index].then_some((item_index, item))
-            })
-    }
-
-    fn render_sub_page_breadcrumbs(&self) -> impl IntoElement {
-        let mut items = vec![];
-        items.push(self.current_page().title.into());
-        items.extend(
-            sub_page_stack()
-                .iter()
-                .flat_map(|page| [page.section_header.into(), page.link.title.clone()]),
-        );
-
-        let last = items.pop().unwrap();
-        h_flex()
-            .gap_1()
-            .children(
-                items
-                    .into_iter()
-                    .flat_map(|item| [item, "/".into()])
-                    .map(|item| Label::new(item).color(Color::Muted)),
-            )
-            .child(Label::new(last))
-    }
-
-    fn render_empty_state(&self, search_query: SharedString) -> impl IntoElement {
-        v_flex()
-            .size_full()
-            .items_center()
-            .justify_center()
-            .gap_1()
-            .child(Label::new("No Results"))
-            .child(
-                Label::new(search_query)
-                    .size(LabelSize::Small)
-                    .color(Color::Muted),
-            )
-    }
-
-    fn render_page_items(
-        &mut self,
-        page_index: usize,
-        _window: &mut Window,
-        cx: &mut Context<SettingsWindow>,
-    ) -> impl IntoElement {
-        let mut page_content = v_flex().id("settings-ui-page").size_full();
-
-        let has_active_search = !self.search_bar.read(cx).is_empty(cx);
-        let has_no_results = self.visible_page_items().next().is_none() && has_active_search;
-
-        if has_no_results {
-            let search_query = self.search_bar.read(cx).text(cx);
-            page_content = page_content.child(
-                self.render_empty_state(format!("No settings match \"{}\"", search_query).into()),
-            )
-        } else {
-            let last_non_header_index = self
-                .visible_page_items()
-                .filter_map(|(index, item)| {
-                    (!matches!(item, SettingsPageItem::SectionHeader(_))).then_some(index)
-                })
-                .last();
-
-            let root_nav_label = self
-                .navbar_entries
-                .iter()
-                .find(|entry| entry.is_root && entry.page_index == self.current_page_index())
-                .map(|entry| entry.title);
-
-            let list_content = list(
-                self.list_state.clone(),
-                cx.processor(move |this, index, window, cx| {
-                    if index == 0 {
-                        return div()
-                            .px_8()
-                            .when(sub_page_stack().is_empty(), |this| {
-                                this.when_some(root_nav_label, |this, title| {
-                                    this.child(
-                                        Label::new(title).size(LabelSize::Large).mt_2().mb_3(),
-                                    )
-                                })
-                            })
-                            .into_any_element();
-                    }
-
-                    let mut visible_items = this.visible_page_items();
-                    let Some((actual_item_index, item)) = visible_items.nth(index - 1) else {
-                        return gpui::Empty.into_any_element();
-                    };
-
-                    let no_bottom_border = visible_items
-                        .next()
-                        .map(|(_, item)| matches!(item, SettingsPageItem::SectionHeader(_)))
-                        .unwrap_or(false);
-
-                    let is_last = Some(actual_item_index) == last_non_header_index;
-
-                    let item_focus_handle =
-                        this.content_handles[page_index][actual_item_index].focus_handle(cx);
-
-                    v_flex()
-                        .id(("settings-page-item", actual_item_index))
-                        .track_focus(&item_focus_handle)
-                        .w_full()
-                        .min_w_0()
-                        .child(item.render(
-                            this,
-                            actual_item_index,
-                            no_bottom_border || is_last,
-                            window,
-                            cx,
-                        ))
-                        .into_any_element()
-                }),
-            );
-
-            page_content = page_content.child(list_content.size_full())
-        }
-        page_content
-    }
-
-    fn render_sub_page_items<'a, Items: Iterator<Item = (usize, &'a SettingsPageItem)>>(
-        &self,
-        items: Items,
-        page_index: Option<usize>,
-        window: &mut Window,
-        cx: &mut Context<SettingsWindow>,
-    ) -> impl IntoElement {
-        let mut page_content = v_flex()
-            .id("settings-ui-page")
-            .size_full()
-            .overflow_y_scroll()
-            .track_scroll(&self.sub_page_scroll_handle);
-
-        let items: Vec<_> = items.collect();
-        let items_len = items.len();
-        let mut section_header = None;
-
-        let has_active_search = !self.search_bar.read(cx).is_empty(cx);
-        let has_no_results = items_len == 0 && has_active_search;
-
-        if has_no_results {
-            let search_query = self.search_bar.read(cx).text(cx);
-            page_content = page_content.child(
-                self.render_empty_state(format!("No settings match \"{}\"", search_query).into()),
-            )
-        } else {
-            let last_non_header_index = items
-                .iter()
-                .enumerate()
-                .rev()
-                .find(|(_, (_, item))| !matches!(item, SettingsPageItem::SectionHeader(_)))
-                .map(|(index, _)| index);
-
-            let root_nav_label = self
-                .navbar_entries
-                .iter()
-                .find(|entry| entry.is_root && entry.page_index == self.current_page_index())
-                .map(|entry| entry.title);
-
-            page_content = page_content
-                .when(sub_page_stack().is_empty(), |this| {
-                    this.when_some(root_nav_label, |this, title| {
-                        this.child(Label::new(title).size(LabelSize::Large).mt_2().mb_3())
-                    })
-                })
-                .children(items.clone().into_iter().enumerate().map(
-                    |(index, (actual_item_index, item))| {
-                        let no_bottom_border = items
-                            .get(index + 1)
-                            .map(|(_, next_item)| {
-                                matches!(next_item, SettingsPageItem::SectionHeader(_))
-                            })
-                            .unwrap_or(false);
-                        let is_last = Some(index) == last_non_header_index;
-
-                        if let SettingsPageItem::SectionHeader(header) = item {
-                            section_header = Some(*header);
-                        }
-                        v_flex()
-                            .w_full()
-                            .min_w_0()
-                            .id(("settings-page-item", actual_item_index))
-                            .when_some(page_index, |element, page_index| {
-                                element.track_focus(
-                                    &self.content_handles[page_index][actual_item_index]
-                                        .focus_handle(cx),
-                                )
-                            })
-                            .child(item.render(
-                                self,
-                                actual_item_index,
-                                no_bottom_border || is_last,
-                                window,
-                                cx,
-                            ))
-                    },
-                ))
-        }
-        page_content
-    }
-
-    fn render_page(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<SettingsWindow>,
-    ) -> impl IntoElement {
-        let page_header;
-        let page_content;
-
-        if sub_page_stack().is_empty() {
-            page_header = self.render_files_header(window, cx).into_any_element();
-
-            page_content = self
-                .render_page_items(self.current_page_index(), window, cx)
-                .into_any_element();
-        } else {
-            page_header = h_flex()
-                .w_full()
-                .justify_between()
-                .child(
-                    h_flex()
-                        .ml_neg_1p5()
-                        .gap_1()
-                        .child(
-                            IconButton::new("back-btn", IconName::ArrowLeft)
-                                .icon_size(IconSize::Small)
-                                .shape(IconButtonShape::Square)
-                                .on_click(cx.listener(|this, _, _, cx| {
-                                    this.pop_sub_page(cx);
-                                })),
-                        )
-                        .child(self.render_sub_page_breadcrumbs()),
-                )
-                .child(
-                    Button::new("open-in-settings-file", "Edit in settings.json")
-                        .tab_index(0_isize)
-                        .style(ButtonStyle::OutlinedGhost)
-                        .tooltip(Tooltip::for_action_title_in(
-                            "Edit in settings.json",
-                            &OpenCurrentFile,
-                            &self.focus_handle,
-                        ))
-                        .on_click(cx.listener(|this, _, window, cx| {
-                            this.open_current_settings_file(window, cx);
-                        })),
-                )
-                .into_any_element();
-
-            let active_page_render_fn = sub_page_stack().last().unwrap().link.render.clone();
-            page_content = (active_page_render_fn)(self, window, cx);
-        }
-
-        let mut warning_banner = gpui::Empty.into_any_element();
-        if let Some(error) =
-            SettingsStore::global(cx).error_for_file(self.current_file.to_settings())
-        {
-            fn banner(
-                label: &'static str,
-                error: String,
-                shown_errors: &mut HashSet<String>,
-                cx: &mut Context<SettingsWindow>,
-            ) -> impl IntoElement {
-                if shown_errors.insert(error.clone()) {
-                    telemetry::event!("Settings Error Shown", label = label, error = &error);
-                }
-                Banner::new()
-                    .severity(Severity::Warning)
-                    .child(
-                        v_flex()
-                            .my_0p5()
-                            .gap_0p5()
-                            .child(Label::new(label))
-                            .child(Label::new(error).size(LabelSize::Small).color(Color::Muted)),
-                    )
-                    .action_slot(
-                        div().pr_1().pb_1().child(
-                            Button::new("fix-in-json", "Fix in settings.json")
-                                .tab_index(0_isize)
-                                .style(ButtonStyle::Tinted(ui::TintColor::Warning))
-                                .on_click(cx.listener(|this, _, window, cx| {
-                                    this.open_current_settings_file(window, cx);
-                                })),
-                        ),
-                    )
-            }
-
-            let parse_error = error.parse_error();
-            let parse_failed = parse_error.is_some();
-
-            warning_banner = v_flex()
-                .gap_2()
-                .when_some(parse_error, |this, err| {
-                    this.child(banner(
-                        "Failed to load your settings. Some values may be incorrect and changes may be lost.",
-                        err,
-                        &mut self.shown_errors,
-                        cx,
-                    ))
-                })
-                .map(|this| match &error.migration_status {
-                    settings::MigrationStatus::Succeeded => this.child(banner(
-                        "Your settings are out of date, and need to be updated.",
-                        match &self.current_file {
-                            SettingsUiFile::User => "They can be automatically migrated to the latest version.",
-                            SettingsUiFile::Server(_) | SettingsUiFile::Project(_)  => "They must be manually migrated to the latest version."
-                        }.to_string(),
-                        &mut self.shown_errors,
-                        cx,
-                    )),
-                    settings::MigrationStatus::Failed { error: err } if !parse_failed => this
-                        .child(banner(
-                            "Your settings file is out of date, automatic migration failed",
-                            err.clone(),
-                            &mut self.shown_errors,
-                            cx,
-                        )),
-                    _ => this,
-                })
-                .into_any_element()
-        }
-
-        return v_flex()
-            .id("settings-ui-page")
-            .on_action(cx.listener(|this, _: &menu::SelectNext, window, cx| {
-                if !sub_page_stack().is_empty() {
-                    window.focus_next();
-                    return;
-                }
-                for (logical_index, (actual_index, _)) in this.visible_page_items().enumerate() {
-                    let handle = this.content_handles[this.current_page_index()][actual_index]
-                        .focus_handle(cx);
-                    let mut offset = 1; // for page header
-
-                    if let Some((_, next_item)) = this.visible_page_items().nth(logical_index + 1)
-                        && matches!(next_item, SettingsPageItem::SectionHeader(_))
-                    {
-                        offset += 1;
-                    }
-                    if handle.contains_focused(window, cx) {
-                        let next_logical_index = logical_index + offset + 1;
-                        this.list_state.scroll_to_reveal_item(next_logical_index);
-                        // We need to render the next item to ensure it's focus handle is in the element tree
-                        cx.on_next_frame(window, |_, window, cx| {
-                            cx.notify();
-                            cx.on_next_frame(window, |_, window, cx| {
-                                window.focus_next();
-                                cx.notify();
-                            });
-                        });
-                        cx.notify();
-                        return;
-                    }
-                }
-                window.focus_next();
-            }))
-            .on_action(cx.listener(|this, _: &menu::SelectPrevious, window, cx| {
-                if !sub_page_stack().is_empty() {
-                    window.focus_prev();
-                    return;
-                }
-                let mut prev_was_header = false;
-                for (logical_index, (actual_index, item)) in this.visible_page_items().enumerate() {
-                    let is_header = matches!(item, SettingsPageItem::SectionHeader(_));
-                    let handle = this.content_handles[this.current_page_index()][actual_index]
-                        .focus_handle(cx);
-                    let mut offset = 1; // for page header
-
-                    if prev_was_header {
-                        offset -= 1;
-                    }
-                    if handle.contains_focused(window, cx) {
-                        let next_logical_index = logical_index + offset - 1;
-                        this.list_state.scroll_to_reveal_item(next_logical_index);
-                        // We need to render the next item to ensure it's focus handle is in the element tree
-                        cx.on_next_frame(window, |_, window, cx| {
-                            cx.notify();
-                            cx.on_next_frame(window, |_, window, cx| {
-                                window.focus_prev();
-                                cx.notify();
-                            });
-                        });
-                        cx.notify();
-                        return;
-                    }
-                    prev_was_header = is_header;
-                }
-                window.focus_prev();
-            }))
-            .when(sub_page_stack().is_empty(), |this| {
-                this.vertical_scrollbar_for(&self.list_state, window, cx)
-            })
-            .when(!sub_page_stack().is_empty(), |this| {
-                this.vertical_scrollbar_for(&self.sub_page_scroll_handle, window, cx)
-            })
-            .track_focus(&self.content_focus_handle.focus_handle(cx))
-            .pt_6()
-            .gap_4()
-            .flex_1()
-            .bg(cx.theme().colors().editor_background)
-            .child(
-                v_flex()
-                    .px_8()
-                    .gap_2()
-                    .child(page_header)
-                    .child(warning_banner),
-            )
-            .child(
-                div()
-                    .flex_1()
-                    .size_full()
-                    .tab_group()
-                    .tab_index(CONTENT_GROUP_TAB_INDEX)
-                    .child(page_content),
-            );
-    }
-
-    /// This function will create a new settings file if one doesn't exist
-    /// if the current file is a project settings with a valid worktree id
-    /// We do this because the settings ui allows initializing project settings
-    fn open_current_settings_file(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        match &self.current_file {
-            SettingsUiFile::User => {
-                let Some(original_window) = self.original_window else {
-                    return;
-                };
-                original_window
-                    .update(cx, |workspace, window, cx| {
-                        workspace
-                            .with_local_workspace(window, cx, |workspace, window, cx| {
-                                let create_task = workspace.project().update(cx, |project, cx| {
-                                    project.find_or_create_worktree(
-                                        paths::config_dir().as_path(),
-                                        false,
-                                        cx,
-                                    )
-                                });
-                                let open_task = workspace.open_paths(
-                                    vec![paths::settings_file().to_path_buf()],
-                                    OpenOptions {
-                                        visible: Some(OpenVisible::None),
-                                        ..Default::default()
-                                    },
-                                    None,
-                                    window,
-                                    cx,
-                                );
-
-                                cx.spawn_in(window, async move |workspace, cx| {
-                                    create_task.await.ok();
-                                    open_task.await;
-
-                                    workspace.update_in(cx, |_, window, cx| {
-                                        window.activate_window();
-                                        cx.notify();
-                                    })
-                                })
-                                .detach();
-                            })
-                            .detach();
-                    })
-                    .ok();
-
-                window.remove_window();
-            }
-            SettingsUiFile::Project((worktree_id, path)) => {
-                let settings_path = path.join(paths::local_settings_file_relative_path());
-                let Some(app_state) = workspace::AppState::global(cx).upgrade() else {
-                    return;
-                };
-
-                let Some((worktree, corresponding_workspace)) = app_state
-                    .workspace_store
-                    .read(cx)
-                    .workspaces()
-                    .iter()
-                    .find_map(|workspace| {
-                        workspace
-                            .read_with(cx, |workspace, cx| {
-                                workspace
-                                    .project()
-                                    .read(cx)
-                                    .worktree_for_id(*worktree_id, cx)
-                            })
-                            .ok()
-                            .flatten()
-                            .zip(Some(*workspace))
-                    })
-                else {
-                    log::error!(
-                        "No corresponding workspace contains worktree id: {}",
-                        worktree_id
-                    );
-
-                    return;
-                };
-
-                let create_task = if worktree.read(cx).entry_for_path(&settings_path).is_some() {
-                    None
-                } else {
-                    Some(worktree.update(cx, |tree, cx| {
-                        tree.create_entry(
-                            settings_path.clone(),
-                            false,
-                            Some(initial_project_settings_content().as_bytes().to_vec()),
-                            cx,
-                        )
-                    }))
-                };
-
-                let worktree_id = *worktree_id;
-
-                // TODO: move zed::open_local_file() APIs to this crate, and
-                // re-implement the "initial_contents" behavior
-                corresponding_workspace
-                    .update(cx, |_, window, cx| {
-                        cx.spawn_in(window, async move |workspace, cx| {
-                            if let Some(create_task) = create_task {
-                                create_task.await.ok()?;
-                            };
-
-                            workspace
-                                .update_in(cx, |workspace, window, cx| {
-                                    workspace.open_path(
-                                        (worktree_id, settings_path.clone()),
-                                        None,
-                                        true,
-                                        window,
-                                        cx,
-                                    )
-                                })
-                                .ok()?
-                                .await
-                                .log_err()?;
-
-                            workspace
-                                .update_in(cx, |_, window, cx| {
-                                    window.activate_window();
-                                    cx.notify();
-                                })
-                                .ok();
-
-                            Some(())
-                        })
-                        .detach();
-                    })
-                    .ok();
-
-                window.remove_window();
-            }
-            SettingsUiFile::Server(_) => {
-                // Server files are not editable
-                return;
-            }
-        };
-    }
-
-    fn current_page_index(&self) -> usize {
-        self.page_index_from_navbar_index(self.navbar_entry)
-    }
-
-    fn current_page(&self) -> &SettingsPage {
-        &self.pages[self.current_page_index()]
-    }
-
-    fn page_index_from_navbar_index(&self, index: usize) -> usize {
-        if self.navbar_entries.is_empty() {
-            return 0;
-        }
-
-        self.navbar_entries[index].page_index
-    }
-
-    fn is_navbar_entry_selected(&self, ix: usize) -> bool {
-        ix == self.navbar_entry
-    }
-
-    fn push_sub_page(
-        &mut self,
-        sub_page_link: SubPageLink,
-        section_header: &'static str,
-        cx: &mut Context<SettingsWindow>,
-    ) {
-        sub_page_stack_mut().push(SubPage {
-            link: sub_page_link,
-            section_header,
-        });
-        cx.notify();
-    }
-
-    fn pop_sub_page(&mut self, cx: &mut Context<SettingsWindow>) {
-        sub_page_stack_mut().pop();
-        cx.notify();
-    }
-
-    fn focus_file_at_index(&mut self, index: usize, window: &mut Window) {
-        if let Some((_, handle)) = self.files.get(index) {
-            handle.focus(window);
-        }
-    }
-
-    fn focused_file_index(&self, window: &Window, cx: &Context<Self>) -> usize {
-        if self.files_focus_handle.contains_focused(window, cx)
-            && let Some(index) = self
-                .files
-                .iter()
-                .position(|(_, handle)| handle.is_focused(window))
-        {
-            return index;
-        }
-        if let Some(current_file_index) = self
-            .files
-            .iter()
-            .position(|(file, _)| file == &self.current_file)
-        {
-            return current_file_index;
-        }
-        0
-    }
-
-    fn focus_handle_for_content_element(
-        &self,
-        actual_item_index: usize,
-        cx: &Context<Self>,
-    ) -> FocusHandle {
-        let page_index = self.current_page_index();
-        self.content_handles[page_index][actual_item_index].focus_handle(cx)
-    }
-
-    fn focused_nav_entry(&self, window: &Window, cx: &App) -> Option<usize> {
-        if !self
-            .navbar_focus_handle
-            .focus_handle(cx)
-            .contains_focused(window, cx)
-        {
-            return None;
-        }
-        for (index, entry) in self.navbar_entries.iter().enumerate() {
-            if entry.focus_handle.is_focused(window) {
-                return Some(index);
-            }
-        }
-        None
-    }
-
-    fn root_entry_containing(&self, nav_entry_index: usize) -> usize {
-        let mut index = Some(nav_entry_index);
-        while let Some(prev_index) = index
-            && !self.navbar_entries[prev_index].is_root
-        {
-            index = prev_index.checked_sub(1);
-        }
-        return index.expect("No root entry found");
-    }
-}
-
-impl Render for SettingsWindow {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let ui_font = theme::setup_ui_font(window, cx);
-
-        client_side_decorations(
-            v_flex()
-                .text_color(cx.theme().colors().text)
-                .size_full()
-                .children(self.title_bar.clone())
-                .child(
-                    div()
-                        .id("settings-window")
-                        .key_context("SettingsWindow")
-                        .track_focus(&self.focus_handle)
-                        .on_action(cx.listener(|this, _: &OpenCurrentFile, window, cx| {
-                            this.open_current_settings_file(window, cx);
-                        }))
-                        .on_action(|_: &Minimize, window, _cx| {
-                            window.minimize_window();
-                        })
-                        .on_action(cx.listener(|this, _: &search::FocusSearch, window, cx| {
-                            this.search_bar.focus_handle(cx).focus(window);
-                        }))
-                        .on_action(cx.listener(|this, _: &ToggleFocusNav, window, cx| {
-                            if this
-                                .navbar_focus_handle
-                                .focus_handle(cx)
-                                .contains_focused(window, cx)
-                            {
-                                this.open_and_scroll_to_navbar_entry(
-                                    this.navbar_entry,
-                                    None,
-                                    true,
-                                    window,
-                                    cx,
-                                );
-                            } else {
-                                this.focus_and_scroll_to_nav_entry(this.navbar_entry, window, cx);
-                            }
-                        }))
-                        .on_action(cx.listener(
-                            |this, FocusFile(file_index): &FocusFile, window, _| {
-                                this.focus_file_at_index(*file_index as usize, window);
-                            },
-                        ))
-                        .on_action(cx.listener(|this, _: &FocusNextFile, window, cx| {
-                            let next_index = usize::min(
-                                this.focused_file_index(window, cx) + 1,
-                                this.files.len().saturating_sub(1),
-                            );
-                            this.focus_file_at_index(next_index, window);
-                        }))
-                        .on_action(cx.listener(|this, _: &FocusPreviousFile, window, cx| {
-                            let prev_index = this.focused_file_index(window, cx).saturating_sub(1);
-                            this.focus_file_at_index(prev_index, window);
-                        }))
-                        .on_action(cx.listener(|this, _: &menu::SelectNext, window, cx| {
-                            if this
-                                .search_bar
-                                .focus_handle(cx)
-                                .contains_focused(window, cx)
-                            {
-                                this.focus_and_scroll_to_first_visible_nav_entry(window, cx);
-                            } else {
-                                window.focus_next();
-                            }
-                        }))
-                        .on_action(|_: &menu::SelectPrevious, window, _| {
-                            window.focus_prev();
-                        })
-                        .flex()
-                        .flex_row()
-                        .flex_1()
-                        .min_h_0()
-                        .font(ui_font)
-                        .bg(cx.theme().colors().background)
-                        .text_color(cx.theme().colors().text)
-                        .when(!cfg!(target_os = "macos"), |this| {
-                            this.border_t_1().border_color(cx.theme().colors().border)
-                        })
-                        .child(self.render_nav(window, cx))
-                        .child(self.render_page(window, cx)),
-                ),
-            window,
-            cx,
-        )
-    }
-}
-
-fn all_projects(cx: &App) -> impl Iterator<Item = Entity<project::Project>> {
-    workspace::AppState::global(cx)
-        .upgrade()
-        .map(|app_state| {
-            app_state
-                .workspace_store
-                .read(cx)
-                .workspaces()
-                .iter()
-                .filter_map(|workspace| Some(workspace.read(cx).ok()?.project().clone()))
-        })
-        .into_iter()
-        .flatten()
-}
-
-fn update_settings_file(
-    file: SettingsUiFile,
-    file_name: Option<&'static str>,
-    cx: &mut App,
-    update: impl 'static + Send + FnOnce(&mut SettingsContent, &App),
-) -> Result<()> {
-    telemetry::event!("Settings Change", setting = file_name, type = file.setting_type());
-
-    match file {
-        SettingsUiFile::Project((worktree_id, rel_path)) => {
-            let rel_path = rel_path.join(paths::local_settings_file_relative_path());
-            let Some((worktree, project)) = all_projects(cx).find_map(|project| {
-                project
-                    .read(cx)
-                    .worktree_for_id(worktree_id, cx)
-                    .zip(Some(project))
-            }) else {
-                anyhow::bail!("Could not find project with worktree id: {}", worktree_id);
-            };
-
-            project.update(cx, |project, cx| {
-                let task = if project.contains_local_settings_file(worktree_id, &rel_path, cx) {
-                    None
-                } else {
-                    Some(worktree.update(cx, |worktree, cx| {
-                        worktree.create_entry(rel_path.clone(), false, None, cx)
-                    }))
-                };
-
-                cx.spawn(async move |project, cx| {
-                    if let Some(task) = task
-                        && task.await.is_err()
-                    {
-                        return;
-                    };
-
-                    project
-                        .update(cx, |project, cx| {
-                            project.update_local_settings_file(worktree_id, rel_path, cx, update);
-                        })
-                        .ok();
-                })
-                .detach();
-            });
-
-            return Ok(());
-        }
-        SettingsUiFile::User => {
-            // todo(settings_ui) error?
-            SettingsStore::global(cx).update_settings_file(<dyn fs::Fs>::global(cx), update);
-            Ok(())
-        }
-        SettingsUiFile::Server(_) => unimplemented!(),
-    }
-}
-
-fn render_text_field<T: From<String> + Into<String> + AsRef<str> + Clone>(
-    field: SettingField<T>,
-    file: SettingsUiFile,
-    metadata: Option<&SettingsFieldMetadata>,
-    _window: &mut Window,
-    cx: &mut App,
-) -> AnyElement {
-    let (_, initial_text) =
-        SettingsStore::global(cx).get_value_from_file(file.to_settings(), field.pick);
-    let initial_text = initial_text.filter(|s| !s.as_ref().is_empty());
-
-    SettingsInputField::new()
-        .tab_index(0)
-        .when_some(initial_text, |editor, text| {
-            editor.with_initial_text(text.as_ref().to_string())
-        })
-        .when_some(
-            metadata.and_then(|metadata| metadata.placeholder),
-            |editor, placeholder| editor.with_placeholder(placeholder),
-        )
-        .on_confirm({
-            move |new_text, cx| {
-                update_settings_file(file.clone(), field.json_path, cx, move |settings, _cx| {
-                    (field.write)(settings, new_text.map(Into::into));
-                })
-                .log_err(); // todo(settings_ui) don't log err
-            }
-        })
-        .into_any_element()
-}
-
-fn render_toggle_button<B: Into<bool> + From<bool> + Copy>(
-    field: SettingField<B>,
-    file: SettingsUiFile,
-    _metadata: Option<&SettingsFieldMetadata>,
-    _window: &mut Window,
-    cx: &mut App,
-) -> AnyElement {
-    let (_, value) = SettingsStore::global(cx).get_value_from_file(file.to_settings(), field.pick);
-
-    let toggle_state = if value.copied().map_or(false, Into::into) {
-        ToggleState::Selected
-    } else {
-        ToggleState::Unselected
-    };
-
-    Switch::new("toggle_button", toggle_state)
-        .tab_index(0_isize)
-        .on_click({
-            move |state, _window, cx| {
-                telemetry::event!("Settings Change", setting = field.json_path, type = file.setting_type());
-
-                let state = *state == ui::ToggleState::Selected;
-                update_settings_file(file.clone(), field.json_path, cx, move |settings, _cx| {
-                    (field.write)(settings, Some(state.into()));
-                })
-                .log_err(); // todo(settings_ui) don't log err
-            }
-        })
-        .into_any_element()
-}
-
-fn render_number_field<T: NumberFieldType + Send + Sync>(
-    field: SettingField<T>,
-    file: SettingsUiFile,
-    _metadata: Option<&SettingsFieldMetadata>,
-    window: &mut Window,
-    cx: &mut App,
-) -> AnyElement {
-    let (_, value) = SettingsStore::global(cx).get_value_from_file(file.to_settings(), field.pick);
-    let value = value.copied().unwrap_or_else(T::min_value);
-    NumberField::new("numeric_stepper", value, window, cx)
-        .on_change({
-            move |value, _window, cx| {
-                let value = *value;
-                update_settings_file(file.clone(), field.json_path, cx, move |settings, _cx| {
-                    (field.write)(settings, Some(value));
-                })
-                .log_err(); // todo(settings_ui) don't log err
-            }
-        })
-        .into_any_element()
-}
-
-fn render_dropdown<T>(
-    field: SettingField<T>,
-    file: SettingsUiFile,
-    metadata: Option<&SettingsFieldMetadata>,
-    _window: &mut Window,
-    cx: &mut App,
-) -> AnyElement
-where
-    T: strum::VariantArray + strum::VariantNames + Copy + PartialEq + Send + Sync + 'static,
-{
-    let variants = || -> &'static [T] { <T as strum::VariantArray>::VARIANTS };
-    let labels = || -> &'static [&'static str] { <T as strum::VariantNames>::VARIANTS };
-    let should_do_titlecase = metadata
-        .and_then(|metadata| metadata.should_do_titlecase)
-        .unwrap_or(true);
-
-    let (_, current_value) =
-        SettingsStore::global(cx).get_value_from_file(file.to_settings(), field.pick);
-    let current_value = current_value.copied().unwrap_or(variants()[0]);
-
-    EnumVariantDropdown::new("dropdown", current_value, variants(), labels(), {
-        move |value, cx| {
-            if value == current_value {
-                return;
-            }
-            update_settings_file(file.clone(), field.json_path, cx, move |settings, _cx| {
-                (field.write)(settings, Some(value));
-            })
-            .log_err(); // todo(settings_ui) don't log err
-        }
-    })
-    .tab_index(0)
-    .title_case(should_do_titlecase)
-    .into_any_element()
-}
-
-fn render_picker_trigger_button(id: SharedString, label: SharedString) -> Button {
-    Button::new(id, label)
-        .tab_index(0_isize)
-        .style(ButtonStyle::Outlined)
-        .size(ButtonSize::Medium)
-        .icon(IconName::ChevronUpDown)
-        .icon_color(Color::Muted)
-        .icon_size(IconSize::Small)
-        .icon_position(IconPosition::End)
-}
-
-fn render_font_picker(
-    field: SettingField<settings::FontFamilyName>,
-    file: SettingsUiFile,
-    _metadata: Option<&SettingsFieldMetadata>,
-    _window: &mut Window,
-    cx: &mut App,
-) -> AnyElement {
-    let current_value = SettingsStore::global(cx)
-        .get_value_from_file(file.to_settings(), field.pick)
-        .1
-        .cloned()
-        .unwrap_or_else(|| SharedString::default().into());
-
-    PopoverMenu::new("font-picker")
-        .trigger(render_picker_trigger_button(
-            "font_family_picker_trigger".into(),
-            current_value.clone().into(),
-        ))
-        .menu(move |window, cx| {
-            let file = file.clone();
-            let current_value = current_value.clone();
-
-            Some(cx.new(move |cx| {
-                font_picker(
-                    current_value.clone().into(),
-                    move |font_name, cx| {
-                        update_settings_file(
-                            file.clone(),
-                            field.json_path,
-                            cx,
-                            move |settings, _cx| {
-                                (field.write)(settings, Some(font_name.into()));
-                            },
-                        )
-                        .log_err(); // todo(settings_ui) don't log err
-                    },
-                    window,
-                    cx,
-                )
-            }))
-        })
-        .anchor(gpui::Corner::TopLeft)
-        .offset(gpui::Point {
-            x: px(0.0),
-            y: px(2.0),
-        })
-        .with_handle(ui::PopoverMenuHandle::default())
-        .into_any_element()
-}
-
-fn render_theme_picker(
-    field: SettingField<settings::ThemeName>,
-    file: SettingsUiFile,
-    _metadata: Option<&SettingsFieldMetadata>,
-    _window: &mut Window,
-    cx: &mut App,
-) -> AnyElement {
-    let (_, value) = SettingsStore::global(cx).get_value_from_file(file.to_settings(), field.pick);
-    let current_value = value
-        .cloned()
-        .map(|theme_name| theme_name.0.into())
-        .unwrap_or_else(|| cx.theme().name.clone());
-
-    PopoverMenu::new("theme-picker")
-        .trigger(render_picker_trigger_button(
-            "theme_picker_trigger".into(),
-            current_value.clone(),
-        ))
-        .menu(move |window, cx| {
-            Some(cx.new(|cx| {
-                let file = file.clone();
-                let current_value = current_value.clone();
-                theme_picker(
-                    current_value,
-                    move |theme_name, cx| {
-                        update_settings_file(
-                            file.clone(),
-                            field.json_path,
-                            cx,
-                            move |settings, _cx| {
-                                (field.write)(
-                                    settings,
-                                    Some(settings::ThemeName(theme_name.into())),
-                                );
-                            },
-                        )
-                        .log_err(); // todo(settings_ui) don't log err
-                    },
-                    window,
-                    cx,
-                )
-            }))
-        })
-        .anchor(gpui::Corner::TopLeft)
-        .offset(gpui::Point {
-            x: px(0.0),
-            y: px(2.0),
-        })
-        .with_handle(ui::PopoverMenuHandle::default())
-        .into_any_element()
-}
-
-fn render_icon_theme_picker(
-    field: SettingField<settings::IconThemeName>,
-    file: SettingsUiFile,
-    _metadata: Option<&SettingsFieldMetadata>,
-    _window: &mut Window,
-    cx: &mut App,
-) -> AnyElement {
-    let (_, value) = SettingsStore::global(cx).get_value_from_file(file.to_settings(), field.pick);
-    let current_value = value
-        .cloned()
-        .map(|theme_name| theme_name.0.into())
-        .unwrap_or_else(|| cx.theme().name.clone());
-
-    PopoverMenu::new("icon-theme-picker")
-        .trigger(render_picker_trigger_button(
-            "icon_theme_picker_trigger".into(),
-            current_value.clone(),
-        ))
-        .menu(move |window, cx| {
-            Some(cx.new(|cx| {
-                let file = file.clone();
-                let current_value = current_value.clone();
-                icon_theme_picker(
-                    current_value,
-                    move |theme_name, cx| {
-                        update_settings_file(
-                            file.clone(),
-                            field.json_path,
-                            cx,
-                            move |settings, _cx| {
-                                (field.write)(
-                                    settings,
-                                    Some(settings::IconThemeName(theme_name.into())),
-                                );
-                            },
-                        )
-                        .log_err(); // todo(settings_ui) don't log err
-                    },
-                    window,
-                    cx,
-                )
-            }))
-        })
-        .anchor(gpui::Corner::TopLeft)
-        .offset(gpui::Point {
-            x: px(0.0),
-            y: px(2.0),
-        })
-        .with_handle(ui::PopoverMenuHandle::default())
-        .into_any_element()
-}
-
-#[cfg(test)]
-pub mod test {
-
-    use super::*;
-
-    impl SettingsWindow {
-        fn navbar_entry(&self) -> usize {
-            self.navbar_entry
-        }
-    }
-
-    impl PartialEq for NavBarEntry {
-        fn eq(&self, other: &Self) -> bool {
-            self.title == other.title
-                && self.is_root == other.is_root
-                && self.expanded == other.expanded
-                && self.page_index == other.page_index
-                && self.item_index == other.item_index
-            // ignoring focus_handle
-        }
-    }
-
-    pub fn register_settings(cx: &mut App) {
-        settings::init(cx);
-        theme::init(theme::LoadThemes::JustBase, cx);
-        editor::init(cx);
-        menu::init();
-    }
-
-    fn parse(input: &'static str, window: &mut Window, cx: &mut App) -> SettingsWindow {
-        let mut pages: Vec<SettingsPage> = Vec::new();
-        let mut expanded_pages = Vec::new();
-        let mut selected_idx = None;
-        let mut index = 0;
-        let mut in_expanded_section = false;
-
-        for mut line in input
-            .lines()
-            .map(|line| line.trim())
-            .filter(|line| !line.is_empty())
-        {
-            if let Some(pre) = line.strip_suffix('*') {
-                assert!(selected_idx.is_none(), "Only one selected entry allowed");
-                selected_idx = Some(index);
-                line = pre;
-            }
-            let (kind, title) = line.split_once(" ").unwrap();
-            assert_eq!(kind.len(), 1);
-            let kind = kind.chars().next().unwrap();
-            if kind == 'v' {
-                let page_idx = pages.len();
-                expanded_pages.push(page_idx);
-                pages.push(SettingsPage {
-                    title,
-                    items: vec![],
-                });
-                index += 1;
-                in_expanded_section = true;
-            } else if kind == '>' {
-                pages.push(SettingsPage {
-                    title,
-                    items: vec![],
-                });
-                index += 1;
-                in_expanded_section = false;
-            } else if kind == '-' {
-                pages
-                    .last_mut()
-                    .unwrap()
-                    .items
-                    .push(SettingsPageItem::SectionHeader(title));
-                if selected_idx == Some(index) && !in_expanded_section {
-                    panic!("Items in unexpanded sections cannot be selected");
-                }
-                index += 1;
-            } else {
-                panic!(
-                    "Entries must start with one of 'v', '>', or '-'\n line: {}",
-                    line
-                );
-            }
-        }
-
-        let mut settings_window = SettingsWindow {
-            title_bar: None,
-            original_window: None,
-            worktree_root_dirs: HashMap::default(),
-            files: Vec::default(),
-            current_file: crate::SettingsUiFile::User,
-            pages,
-            search_bar: cx.new(|cx| Editor::single_line(window, cx)),
-            navbar_entry: selected_idx.expect("Must have a selected navbar entry"),
-            navbar_entries: Vec::default(),
-            navbar_scroll_handle: UniformListScrollHandle::default(),
-            navbar_focus_subscriptions: vec![],
-            filter_table: vec![],
-            has_query: false,
-            content_handles: vec![],
-            search_task: None,
-            sub_page_scroll_handle: ScrollHandle::new(),
-            focus_handle: cx.focus_handle(),
-            navbar_focus_handle: NonFocusableHandle::new(
-                NAVBAR_CONTAINER_TAB_INDEX,
-                false,
-                window,
-                cx,
-            ),
-            content_focus_handle: NonFocusableHandle::new(
-                CONTENT_CONTAINER_TAB_INDEX,
-                false,
-                window,
-                cx,
-            ),
-            files_focus_handle: cx.focus_handle(),
-            search_index: None,
-            list_state: ListState::new(0, gpui::ListAlignment::Top, px(0.0)),
-            shown_errors: HashSet::default(),
-        };
-
-        settings_window.build_filter_table();
-        settings_window.build_navbar(cx);
-        for expanded_page_index in expanded_pages {
-            for entry in &mut settings_window.navbar_entries {
-                if entry.page_index == expanded_page_index && entry.is_root {
-                    entry.expanded = true;
-                }
-            }
-        }
-        settings_window
-    }
-
-    #[track_caller]
-    fn check_navbar_toggle(
-        before: &'static str,
-        toggle_page: &'static str,
-        after: &'static str,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        let mut settings_window = parse(before, window, cx);
-        let toggle_page_idx = settings_window
-            .pages
-            .iter()
-            .position(|page| page.title == toggle_page)
-            .expect("page not found");
-        let toggle_idx = settings_window
-            .navbar_entries
-            .iter()
-            .position(|entry| entry.page_index == toggle_page_idx)
-            .expect("page not found");
-        settings_window.toggle_navbar_entry(toggle_idx);
-
-        let expected_settings_window = parse(after, window, cx);
-
-        pretty_assertions::assert_eq!(
-            settings_window
-                .visible_navbar_entries()
-                .map(|(_, entry)| entry)
-                .collect::<Vec<_>>(),
-            expected_settings_window
-                .visible_navbar_entries()
-                .map(|(_, entry)| entry)
-                .collect::<Vec<_>>(),
-        );
-        pretty_assertions::assert_eq!(
-            settings_window.navbar_entries[settings_window.navbar_entry()],
-            expected_settings_window.navbar_entries[expected_settings_window.navbar_entry()],
-        );
-    }
-
-    macro_rules! check_navbar_toggle {
-        ($name:ident, before: $before:expr, toggle_page: $toggle_page:expr, after: $after:expr) => {
-            #[gpui::test]
-            fn $name(cx: &mut gpui::TestAppContext) {
-                let window = cx.add_empty_window();
-                window.update(|window, cx| {
-                    register_settings(cx);
-                    check_navbar_toggle($before, $toggle_page, $after, window, cx);
-                });
-            }
-        };
-    }
-
-    check_navbar_toggle!(
-        navbar_basic_open,
-        before: r"
-        v General
-        - General
-        - Privacy*
-        v Project
-        - Project Settings
-        ",
-        toggle_page: "General",
-        after: r"
-        > General*
-        v Project
-        - Project Settings
-        "
-    );
-
-    check_navbar_toggle!(
-        navbar_basic_close,
-        before: r"
-        > General*
-        - General
-        - Privacy
-        v Project
-        - Project Settings
-        ",
-        toggle_page: "General",
-        after: r"
-        v General*
-        - General
-        - Privacy
-        v Project
-        - Project Settings
-        "
-    );
-
-    check_navbar_toggle!(
-        navbar_basic_second_root_entry_close,
-        before: r"
-        > General
-        - General
-        - Privacy
-        v Project
-        - Project Settings*
-        ",
-        toggle_page: "Project",
-        after: r"
-        > General
-        > Project*
-        "
-    );
-
-    check_navbar_toggle!(
-        navbar_toggle_subroot,
-        before: r"
-        v General Page
-        - General
-        - Privacy
-        v Project
-        - Worktree Settings Content*
-        v AI
-        - General
-        > Appearance & Behavior
-        ",
-        toggle_page: "Project",
-        after: r"
-        v General Page
-        - General
-        - Privacy
-        > Project*
-        v AI
-        - General
-        > Appearance & Behavior
-        "
-    );
-
-    check_navbar_toggle!(
-        navbar_toggle_close_propagates_selected_index,
-        before: r"
-        v General Page
-        - General
-        - Privacy
-        v Project
-        - Worktree Settings Content
-        v AI
-        - General*
-        > Appearance & Behavior
-        ",
-        toggle_page: "General Page",
-        after: r"
-        > General Page*
-        v Project
-        - Worktree Settings Content
-        v AI
-        - General
-        > Appearance & Behavior
-        "
-    );
-
-    check_navbar_toggle!(
-        navbar_toggle_expand_propagates_selected_index,
-        before: r"
-        > General Page
-        - General
-        - Privacy
-        v Project
-        - Worktree Settings Content
-        v AI
-        - General*
-        > Appearance & Behavior
-        ",
-        toggle_page: "General Page",
-        after: r"
-        v General Page*
-        - General
-        - Privacy
-        v Project
-        - Worktree Settings Content
-        v AI
-        - General
-        > Appearance & Behavior
-        "
-    );
-}
diff --git a/crates/snippet/Cargo.toml b/crates/snippet/Cargo.toml
deleted file mode 100644
index 2dde5c2d00..0000000000
--- a/crates/snippet/Cargo.toml
+++ /dev/null
@@ -1,17 +0,0 @@
-[package]
-name = "snippet"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/snippet.rs"
-doctest = false
-
-[dependencies]
-anyhow.workspace = true
-smallvec.workspace = true
diff --git a/crates/snippet/LICENSE-GPL b/crates/snippet/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/snippet/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/snippet/src/snippet.rs b/crates/snippet/src/snippet.rs
deleted file mode 100644
index 4be4281d9a..0000000000
--- a/crates/snippet/src/snippet.rs
+++ /dev/null
@@ -1,334 +0,0 @@
-use anyhow::{Context as _, Result};
-use smallvec::SmallVec;
-use std::{collections::BTreeMap, ops::Range};
-
-#[derive(Clone, Debug, Default, PartialEq)]
-pub struct Snippet {
-    pub text: String,
-    pub tabstops: Vec<TabStop>,
-}
-
-#[derive(Clone, Debug, Default, PartialEq)]
-pub struct TabStop {
-    pub ranges: SmallVec<[Range<isize>; 2]>,
-    pub choices: Option<Vec<String>>,
-}
-
-impl Snippet {
-    pub fn parse(source: &str) -> Result<Self> {
-        let mut text = String::with_capacity(source.len());
-        let mut tabstops = BTreeMap::new();
-        parse_snippet(source, false, &mut text, &mut tabstops)
-            .context("failed to parse snippet")?;
-
-        let len = text.len() as isize;
-        let final_tabstop = tabstops.remove(&0);
-        let mut tabstops = tabstops.into_values().collect::<Vec<_>>();
-
-        if let Some(final_tabstop) = final_tabstop {
-            tabstops.push(final_tabstop);
-        } else {
-            let end_tabstop = TabStop {
-                ranges: [len..len].into_iter().collect(),
-                choices: None,
-            };
-
-            if !tabstops.last().is_some_and(|t| *t == end_tabstop) {
-                tabstops.push(end_tabstop);
-            }
-        }
-
-        Ok(Snippet { text, tabstops })
-    }
-}
-
-fn parse_snippet<'a>(
-    mut source: &'a str,
-    nested: bool,
-    text: &mut String,
-    tabstops: &mut BTreeMap<usize, TabStop>,
-) -> Result<&'a str> {
-    loop {
-        match source.chars().next() {
-            None => return Ok(""),
-            Some('$') => {
-                source = parse_tabstop(&source[1..], text, tabstops)?;
-            }
-            Some('\\') => {
-                // As specified in the LSP spec (`Grammar` section),
-                // backslashes can escape some characters:
-                // https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#snippet_syntax
-                source = &source[1..];
-                if let Some(c) = source.chars().next() {
-                    if c == '$' || c == '\\' || c == '}' {
-                        text.push(c);
-                        // All escapable characters are 1 byte long:
-                        source = &source[1..];
-                    } else {
-                        text.push('\\');
-                    }
-                } else {
-                    text.push('\\');
-                }
-            }
-            Some('}') => {
-                if nested {
-                    return Ok(source);
-                } else {
-                    text.push('}');
-                    source = &source[1..];
-                }
-            }
-            Some(_) => {
-                let chunk_end = source.find(['}', '$', '\\']).unwrap_or(source.len());
-                let (chunk, rest) = source.split_at(chunk_end);
-                text.push_str(chunk);
-                source = rest;
-            }
-        }
-    }
-}
-
-fn parse_tabstop<'a>(
-    mut source: &'a str,
-    text: &mut String,
-    tabstops: &mut BTreeMap<usize, TabStop>,
-) -> Result<&'a str> {
-    let tabstop_start = text.len();
-    let tabstop_index;
-    let mut choices = None;
-
-    if source.starts_with('{') {
-        let (index, rest) = parse_int(&source[1..])?;
-        tabstop_index = index;
-        source = rest;
-
-        if source.starts_with("|") {
-            (source, choices) = parse_choices(&source[1..], text)?;
-        }
-
-        if source.starts_with(':') {
-            source = parse_snippet(&source[1..], true, text, tabstops)?;
-        }
-
-        if source.starts_with('}') {
-            source = &source[1..];
-        } else {
-            anyhow::bail!("expected a closing brace");
-        }
-    } else {
-        let (index, rest) = parse_int(source)?;
-        tabstop_index = index;
-        source = rest;
-    }
-
-    tabstops
-        .entry(tabstop_index)
-        .or_insert_with(|| TabStop {
-            ranges: Default::default(),
-            choices,
-        })
-        .ranges
-        .push(tabstop_start as isize..text.len() as isize);
-    Ok(source)
-}
-
-fn parse_int(source: &str) -> Result<(usize, &str)> {
-    let len = source
-        .find(|c: char| !c.is_ascii_digit())
-        .unwrap_or(source.len());
-    anyhow::ensure!(len > 0, "expected an integer");
-    let (prefix, suffix) = source.split_at(len);
-    Ok((prefix.parse()?, suffix))
-}
-
-fn parse_choices<'a>(
-    mut source: &'a str,
-    text: &mut String,
-) -> Result<(&'a str, Option<Vec<String>>)> {
-    let mut found_default_choice = false;
-    let mut current_choice = String::new();
-    let mut choices = Vec::new();
-
-    loop {
-        match source.chars().next() {
-            None => return Ok(("", Some(choices))),
-            Some('\\') => {
-                source = &source[1..];
-
-                if let Some(c) = source.chars().next() {
-                    if !found_default_choice {
-                        current_choice.push(c);
-                        text.push(c);
-                    }
-                    source = &source[c.len_utf8()..];
-                }
-            }
-            Some(',') => {
-                found_default_choice = true;
-                source = &source[1..];
-                choices.push(current_choice);
-                current_choice = String::new();
-            }
-            Some('|') => {
-                source = &source[1..];
-                choices.push(current_choice);
-                return Ok((source, Some(choices)));
-            }
-            Some(_) => {
-                let chunk_end = source.find([',', '|', '\\']);
-
-                anyhow::ensure!(
-                    chunk_end.is_some(),
-                    "Placeholder choice doesn't contain closing pipe-character '|'"
-                );
-
-                let (chunk, rest) = source.split_at(chunk_end.unwrap());
-
-                if !found_default_choice {
-                    text.push_str(chunk);
-                }
-
-                current_choice.push_str(chunk);
-                source = rest;
-            }
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_snippet_without_tabstops() {
-        let snippet = Snippet::parse("one-two-three").unwrap();
-        assert_eq!(snippet.text, "one-two-three");
-        assert_eq!(tabstops(&snippet), &[vec![13..13]]);
-    }
-
-    #[test]
-    fn test_snippet_with_tabstops() {
-        let snippet = Snippet::parse("one$1two").unwrap();
-        assert_eq!(snippet.text, "onetwo");
-        assert_eq!(tabstops(&snippet), &[vec![3..3], vec![6..6]]);
-        assert_eq!(tabstop_choices(&snippet), &[&None, &None]);
-
-        // Multi-digit numbers
-        let snippet = Snippet::parse("one$123-$99-two").unwrap();
-        assert_eq!(snippet.text, "one--two");
-        assert_eq!(tabstops(&snippet), &[vec![4..4], vec![3..3], vec![8..8]]);
-        assert_eq!(tabstop_choices(&snippet), &[&None, &None, &None]);
-    }
-
-    #[test]
-    fn test_snippet_with_last_tabstop_at_end() {
-        let snippet = Snippet::parse(r#"foo.$1"#).unwrap();
-
-        // If the final tabstop is already at the end of the text, don't insert
-        // an additional tabstop at the end.
-        assert_eq!(snippet.text, r#"foo."#);
-        assert_eq!(tabstops(&snippet), &[vec![4..4]]);
-        assert_eq!(tabstop_choices(&snippet), &[&None]);
-    }
-
-    #[test]
-    fn test_snippet_with_explicit_final_tabstop() {
-        let snippet = Snippet::parse(r#"<div class="$1">$0</div>"#).unwrap();
-
-        // If the final tabstop is explicitly specified via '$0', then
-        // don't insert an additional tabstop at the end.
-        assert_eq!(snippet.text, r#"<div class=""></div>"#);
-        assert_eq!(tabstops(&snippet), &[vec![12..12], vec![14..14]]);
-        assert_eq!(tabstop_choices(&snippet), &[&None, &None]);
-    }
-
-    #[test]
-    fn test_snippet_with_placeholders() {
-        let snippet = Snippet::parse("one${1:two}three${2:four}").unwrap();
-        assert_eq!(snippet.text, "onetwothreefour");
-        assert_eq!(
-            tabstops(&snippet),
-            &[vec![3..6], vec![11..15], vec![15..15]]
-        );
-        assert_eq!(tabstop_choices(&snippet), &[&None, &None, &None]);
-    }
-
-    #[test]
-    fn test_snippet_with_choice_placeholders() {
-        let snippet = Snippet::parse("type ${1|i32, u32|} = $2")
-            .expect("Should be able to unpack choice placeholders");
-
-        assert_eq!(snippet.text, "type i32 = ");
-        assert_eq!(tabstops(&snippet), &[vec![5..8], vec![11..11],]);
-        assert_eq!(
-            tabstop_choices(&snippet),
-            &[&Some(vec!["i32".to_string(), " u32".to_string()]), &None]
-        );
-
-        let snippet = Snippet::parse(r"${1|\$\{1\|one\,two\,tree\|\}|}")
-            .expect("Should be able to parse choice with escape characters");
-
-        assert_eq!(snippet.text, "${1|one,two,tree|}");
-        assert_eq!(tabstops(&snippet), &[vec![0..18], vec![18..18]]);
-        assert_eq!(
-            tabstop_choices(&snippet),
-            &[&Some(vec!["${1|one,two,tree|}".to_string(),]), &None]
-        );
-    }
-
-    #[test]
-    fn test_snippet_with_nested_placeholders() {
-        let snippet = Snippet::parse(
-            "for (${1:var ${2:i} = 0; ${2:i} < ${3:${4:array}.length}; ${2:i}++}) {$0}",
-        )
-        .unwrap();
-        assert_eq!(snippet.text, "for (var i = 0; i < array.length; i++) {}");
-        assert_eq!(
-            tabstops(&snippet),
-            &[
-                vec![5..37],
-                vec![9..10, 16..17, 34..35],
-                vec![20..32],
-                vec![20..25],
-                vec![40..40],
-            ]
-        );
-        assert_eq!(
-            tabstop_choices(&snippet),
-            &[&None, &None, &None, &None, &None]
-        );
-    }
-
-    #[test]
-    fn test_snippet_parsing_with_escaped_chars() {
-        let snippet = Snippet::parse("\"\\$schema\": $1").unwrap();
-        assert_eq!(snippet.text, "\"$schema\": ");
-        assert_eq!(tabstops(&snippet), &[vec![11..11]]);
-        assert_eq!(tabstop_choices(&snippet), &[&None]);
-
-        let snippet = Snippet::parse("{a\\}").unwrap();
-        assert_eq!(snippet.text, "{a}");
-        assert_eq!(tabstops(&snippet), &[vec![3..3]]);
-        assert_eq!(tabstop_choices(&snippet), &[&None]);
-
-        // backslash not functioning as an escape
-        let snippet = Snippet::parse("a\\b").unwrap();
-        assert_eq!(snippet.text, "a\\b");
-        assert_eq!(tabstops(&snippet), &[vec![3..3]]);
-
-        // first backslash cancelling escaping that would
-        // have happened with second backslash
-        let snippet = Snippet::parse("one\\\\$1two").unwrap();
-        assert_eq!(snippet.text, "one\\two");
-        assert_eq!(tabstops(&snippet), &[vec![4..4], vec![7..7]]);
-    }
-
-    fn tabstops(snippet: &Snippet) -> Vec<Vec<Range<isize>>> {
-        snippet.tabstops.iter().map(|t| t.ranges.to_vec()).collect()
-    }
-
-    fn tabstop_choices(snippet: &Snippet) -> Vec<&Option<Vec<String>>> {
-        snippet.tabstops.iter().map(|t| &t.choices).collect()
-    }
-}
diff --git a/crates/snippet_provider/Cargo.toml b/crates/snippet_provider/Cargo.toml
deleted file mode 100644
index c1f04117d4..0000000000
--- a/crates/snippet_provider/Cargo.toml
+++ /dev/null
@@ -1,33 +0,0 @@
-[package]
-name = "snippet_provider"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[features]
-test-support = []
-
-[dependencies]
-anyhow.workspace = true
-collections.workspace = true
-extension.workspace = true
-fs.workspace = true
-futures.workspace = true
-gpui.workspace = true
-parking_lot.workspace = true
-paths.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-serde_json_lenient.workspace = true
-snippet.workspace = true
-util.workspace = true
-schemars.workspace = true
-
-[dev-dependencies]
-fs = { workspace = true, features = ["test-support"] }
-gpui = { workspace = true, features = ["test-support"] }
-indoc.workspace = true
diff --git a/crates/snippet_provider/LICENSE-GPL b/crates/snippet_provider/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/snippet_provider/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/snippet_provider/src/extension_snippet.rs b/crates/snippet_provider/src/extension_snippet.rs
deleted file mode 100644
index cd5fb083f9..0000000000
--- a/crates/snippet_provider/src/extension_snippet.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-use std::path::PathBuf;
-use std::sync::Arc;
-
-use anyhow::Result;
-use extension::{ExtensionHostProxy, ExtensionSnippetProxy};
-use gpui::App;
-
-use crate::SnippetRegistry;
-
-pub fn init(cx: &mut App) {
-    let proxy = ExtensionHostProxy::default_global(cx);
-    proxy.register_snippet_proxy(SnippetRegistryProxy {
-        snippet_registry: SnippetRegistry::global(cx),
-    });
-}
-
-struct SnippetRegistryProxy {
-    snippet_registry: Arc<SnippetRegistry>,
-}
-
-impl ExtensionSnippetProxy for SnippetRegistryProxy {
-    fn register_snippet(&self, path: &PathBuf, snippet_contents: &str) -> Result<()> {
-        self.snippet_registry
-            .register_snippets(path, snippet_contents)
-    }
-}
diff --git a/crates/snippet_provider/src/format.rs b/crates/snippet_provider/src/format.rs
deleted file mode 100644
index f9abb987d9..0000000000
--- a/crates/snippet_provider/src/format.rs
+++ /dev/null
@@ -1,78 +0,0 @@
-use collections::HashMap;
-use schemars::{JsonSchema, json_schema};
-use serde::Deserialize;
-use std::borrow::Cow;
-use util::schemars::{AllowTrailingCommas, DefaultDenyUnknownFields};
-
-#[derive(Deserialize)]
-pub struct VsSnippetsFile {
-    #[serde(flatten)]
-    pub(crate) snippets: HashMap<String, VsCodeSnippet>,
-}
-
-impl VsSnippetsFile {
-    pub fn generate_json_schema() -> serde_json::Value {
-        let schema = schemars::generate::SchemaSettings::draft2019_09()
-            .with_transform(DefaultDenyUnknownFields)
-            .with_transform(AllowTrailingCommas)
-            .into_generator()
-            .root_schema_for::<Self>();
-
-        serde_json::to_value(schema).unwrap()
-    }
-}
-
-impl JsonSchema for VsSnippetsFile {
-    fn schema_name() -> Cow<'static, str> {
-        "VsSnippetsFile".into()
-    }
-
-    fn json_schema(generator: &mut schemars::SchemaGenerator) -> schemars::Schema {
-        let snippet_schema = generator.subschema_for::<VsCodeSnippet>();
-        json_schema!({
-            "type": "object",
-            "additionalProperties": snippet_schema
-        })
-    }
-}
-
-#[derive(Deserialize, JsonSchema)]
-#[serde(untagged)]
-pub(crate) enum ListOrDirect {
-    Single(String),
-    List(Vec<String>),
-}
-
-impl From<ListOrDirect> for Vec<String> {
-    fn from(list: ListOrDirect) -> Self {
-        match list {
-            ListOrDirect::Single(entry) => vec![entry],
-            ListOrDirect::List(entries) => entries,
-        }
-    }
-}
-
-impl std::fmt::Display for ListOrDirect {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        write!(
-            f,
-            "{}",
-            match self {
-                Self::Single(v) => v.to_owned(),
-                Self::List(v) => v.join("\n"),
-            }
-        )
-    }
-}
-
-#[derive(Deserialize, JsonSchema)]
-pub(crate) struct VsCodeSnippet {
-    /// The snippet prefix used to decide whether a completion menu should be shown.
-    pub(crate) prefix: Option<ListOrDirect>,
-
-    /// The snippet content. Use `$1` and `${1:defaultText}` to define cursor positions and `$0` for final cursor position.
-    pub(crate) body: ListOrDirect,
-
-    /// The snippet description displayed inside the completion menu.
-    pub(crate) description: Option<ListOrDirect>,
-}
diff --git a/crates/snippet_provider/src/lib.rs b/crates/snippet_provider/src/lib.rs
deleted file mode 100644
index 5eff6c917f..0000000000
--- a/crates/snippet_provider/src/lib.rs
+++ /dev/null
@@ -1,295 +0,0 @@
-mod extension_snippet;
-pub mod format;
-mod registry;
-
-use std::{
-    path::{Path, PathBuf},
-    sync::Arc,
-    time::Duration,
-};
-
-use anyhow::Result;
-use collections::{BTreeMap, BTreeSet, HashMap};
-use format::VsSnippetsFile;
-use fs::Fs;
-use futures::stream::StreamExt;
-use gpui::{App, AppContext as _, AsyncApp, Context, Entity, Task, WeakEntity};
-pub use registry::*;
-use util::ResultExt;
-
-pub fn init(cx: &mut App) {
-    SnippetRegistry::init_global(cx);
-    extension_snippet::init(cx);
-}
-
-/// Language name, or `None` if the snippet file is global.
-type SnippetKind = Option<String>;
-fn file_stem_to_key(stem: &str) -> SnippetKind {
-    if stem == "snippets" {
-        None
-    } else {
-        Some(stem.to_owned())
-    }
-}
-
-fn file_to_snippets(file_contents: VsSnippetsFile) -> Vec<Arc<Snippet>> {
-    let mut snippets = vec![];
-    for (name, snippet) in file_contents.snippets {
-        let snippet_name = name.clone();
-        let prefixes = snippet
-            .prefix
-            .map_or_else(move || vec![snippet_name], |prefixes| prefixes.into());
-        let description = snippet
-            .description
-            .map(|description| description.to_string());
-        let body = snippet.body.to_string();
-        if snippet::Snippet::parse(&body).log_err().is_none() {
-            continue;
-        };
-        snippets.push(Arc::new(Snippet {
-            body,
-            prefix: prefixes,
-            description,
-            name,
-        }));
-    }
-    snippets
-}
-// Snippet with all of the metadata
-#[derive(Debug)]
-pub struct Snippet {
-    pub prefix: Vec<String>,
-    pub body: String,
-    pub description: Option<String>,
-    pub name: String,
-}
-
-async fn process_updates(
-    this: WeakEntity<SnippetProvider>,
-    entries: Vec<PathBuf>,
-    mut cx: AsyncApp,
-) -> Result<()> {
-    let fs = this.read_with(&cx, |this, _| this.fs.clone())?;
-    for entry_path in entries {
-        if entry_path
-            .extension()
-            .is_none_or(|extension| extension != "json")
-        {
-            continue;
-        }
-        let entry_metadata = fs.metadata(&entry_path).await;
-        // Entry could have been removed, in which case we should no longer show completions for it.
-        let entry_exists = entry_metadata.is_ok();
-        if entry_metadata.is_ok_and(|entry| entry.is_some_and(|e| e.is_dir)) {
-            // Don't process dirs.
-            continue;
-        }
-        let Some(stem) = entry_path.file_stem().and_then(|s| s.to_str()) else {
-            continue;
-        };
-        let key = file_stem_to_key(stem);
-
-        let contents = if entry_exists {
-            fs.load(&entry_path).await.ok()
-        } else {
-            None
-        };
-
-        this.update(&mut cx, move |this, _| {
-            let snippets_of_kind = this.snippets.entry(key).or_default();
-            if entry_exists {
-                let Some(file_contents) = contents else {
-                    return;
-                };
-                let Ok(as_json) = serde_json_lenient::from_str::<VsSnippetsFile>(&file_contents)
-                else {
-                    return;
-                };
-                let snippets = file_to_snippets(as_json);
-                *snippets_of_kind.entry(entry_path).or_default() = snippets;
-            } else {
-                snippets_of_kind.remove(&entry_path);
-            }
-        })?;
-    }
-    Ok(())
-}
-
-async fn initial_scan(
-    this: WeakEntity<SnippetProvider>,
-    path: Arc<Path>,
-    cx: AsyncApp,
-) -> Result<()> {
-    let fs = this.read_with(&cx, |this, _| this.fs.clone())?;
-    let entries = fs.read_dir(&path).await;
-    if let Ok(entries) = entries {
-        let entries = entries
-            .collect::<Vec<_>>()
-            .await
-            .into_iter()
-            .collect::<Result<Vec<_>>>()?;
-        process_updates(this, entries, cx).await?;
-    }
-    Ok(())
-}
-
-pub struct SnippetProvider {
-    fs: Arc<dyn Fs>,
-    snippets: HashMap<SnippetKind, BTreeMap<PathBuf, Vec<Arc<Snippet>>>>,
-    watch_tasks: Vec<Task<Result<()>>>,
-}
-
-// Watches global snippet directory, is created just once and reused across multiple projects
-struct GlobalSnippetWatcher(Entity<SnippetProvider>);
-
-impl GlobalSnippetWatcher {
-    fn new(fs: Arc<dyn Fs>, cx: &mut App) -> Self {
-        let global_snippets_dir = paths::snippets_dir();
-        let provider = cx.new(|_cx| SnippetProvider {
-            fs,
-            snippets: Default::default(),
-            watch_tasks: vec![],
-        });
-        provider.update(cx, |this, cx| this.watch_directory(global_snippets_dir, cx));
-        Self(provider)
-    }
-}
-
-impl gpui::Global for GlobalSnippetWatcher {}
-
-impl SnippetProvider {
-    pub fn new(fs: Arc<dyn Fs>, dirs_to_watch: BTreeSet<PathBuf>, cx: &mut App) -> Entity<Self> {
-        cx.new(move |cx| {
-            if !cx.has_global::<GlobalSnippetWatcher>() {
-                let global_watcher = GlobalSnippetWatcher::new(fs.clone(), cx);
-                cx.set_global(global_watcher);
-            }
-            let mut this = Self {
-                fs,
-                watch_tasks: Vec::new(),
-                snippets: Default::default(),
-            };
-
-            for dir in dirs_to_watch {
-                this.watch_directory(&dir, cx);
-            }
-
-            this
-        })
-    }
-
-    /// Add directory to be watched for content changes
-    fn watch_directory(&mut self, path: &Path, cx: &Context<Self>) {
-        let path: Arc<Path> = Arc::from(path);
-
-        self.watch_tasks.push(cx.spawn(async move |this, cx| {
-            let fs = this.read_with(cx, |this, _| this.fs.clone())?;
-            let watched_path = path.clone();
-            let watcher = fs.watch(&watched_path, Duration::from_secs(1));
-            initial_scan(this.clone(), path, cx.clone()).await?;
-
-            let (mut entries, _) = watcher.await;
-            while let Some(entries) = entries.next().await {
-                process_updates(
-                    this.clone(),
-                    entries.into_iter().map(|event| event.path).collect(),
-                    cx.clone(),
-                )
-                .await?;
-            }
-            Ok(())
-        }));
-    }
-
-    fn lookup_snippets<'a, const LOOKUP_GLOBALS: bool>(
-        &'a self,
-        language: &'a SnippetKind,
-        cx: &App,
-    ) -> Vec<Arc<Snippet>> {
-        let mut user_snippets: Vec<_> = self
-            .snippets
-            .get(language)
-            .cloned()
-            .unwrap_or_default()
-            .into_iter()
-            .flat_map(|(_, snippets)| snippets.into_iter())
-            .collect();
-        if LOOKUP_GLOBALS {
-            if let Some(global_watcher) = cx.try_global::<GlobalSnippetWatcher>() {
-                user_snippets.extend(
-                    global_watcher
-                        .0
-                        .read(cx)
-                        .lookup_snippets::<false>(language, cx),
-                );
-            }
-
-            let Some(registry) = SnippetRegistry::try_global(cx) else {
-                return user_snippets;
-            };
-
-            let registry_snippets = registry.get_snippets(language);
-            user_snippets.extend(registry_snippets);
-        }
-
-        user_snippets
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn add_snippet_for_test(
-        &mut self,
-        language: SnippetKind,
-        path: PathBuf,
-        snippet: Vec<Arc<Snippet>>,
-    ) {
-        self.snippets
-            .entry(language)
-            .or_default()
-            .insert(path, snippet);
-    }
-
-    pub fn snippets_for(&self, language: SnippetKind, cx: &App) -> Vec<Arc<Snippet>> {
-        let mut requested_snippets = self.lookup_snippets::<true>(&language, cx);
-
-        if language.is_some() {
-            // Look up global snippets as well.
-            requested_snippets.extend(self.lookup_snippets::<true>(&None, cx));
-        }
-        requested_snippets
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use fs::FakeFs;
-    use gpui;
-    use gpui::TestAppContext;
-    use indoc::indoc;
-
-    #[gpui::test]
-    fn test_lookup_snippets_dup_registry_snippets(cx: &mut TestAppContext) {
-        let fs = FakeFs::new(cx.background_executor.clone());
-        cx.update(|cx| {
-            SnippetRegistry::init_global(cx);
-            SnippetRegistry::global(cx)
-                .register_snippets(
-                    "ruby".as_ref(),
-                    indoc! {r#"
-                    {
-                      "Log to console": {
-                        "prefix": "log",
-                        "body": ["console.info(\"Hello, ${1:World}!\")", "$0"],
-                        "description": "Logs to console"
-                      }
-                    }
-            "#},
-                )
-                .unwrap();
-            let provider = SnippetProvider::new(fs.clone(), Default::default(), cx);
-            cx.update_entity(&provider, |provider, cx| {
-                assert_eq!(1, provider.snippets_for(Some("ruby".to_owned()), cx).len());
-            });
-        });
-    }
-}
diff --git a/crates/snippet_provider/src/registry.rs b/crates/snippet_provider/src/registry.rs
deleted file mode 100644
index 65850d650e..0000000000
--- a/crates/snippet_provider/src/registry.rs
+++ /dev/null
@@ -1,54 +0,0 @@
-use std::{path::Path, sync::Arc};
-
-use anyhow::Result;
-use collections::HashMap;
-use gpui::{App, Global, ReadGlobal, UpdateGlobal};
-use parking_lot::RwLock;
-
-use crate::{Snippet, SnippetKind, file_stem_to_key};
-
-struct GlobalSnippetRegistry(Arc<SnippetRegistry>);
-
-impl Global for GlobalSnippetRegistry {}
-
-#[derive(Default)]
-pub struct SnippetRegistry {
-    snippets: RwLock<HashMap<SnippetKind, Vec<Arc<Snippet>>>>,
-}
-
-impl SnippetRegistry {
-    pub fn global(cx: &App) -> Arc<Self> {
-        GlobalSnippetRegistry::global(cx).0.clone()
-    }
-
-    pub fn try_global(cx: &App) -> Option<Arc<Self>> {
-        cx.try_global::<GlobalSnippetRegistry>()
-            .map(|registry| registry.0.clone())
-    }
-
-    pub fn init_global(cx: &mut App) {
-        GlobalSnippetRegistry::set_global(cx, GlobalSnippetRegistry(Arc::new(Self::new())))
-    }
-
-    pub fn new() -> Self {
-        Self {
-            snippets: RwLock::new(HashMap::default()),
-        }
-    }
-
-    pub fn register_snippets(&self, file_path: &Path, contents: &str) -> Result<()> {
-        let snippets_in_file: crate::format::VsSnippetsFile =
-            serde_json_lenient::from_str(contents)?;
-        let kind = file_path
-            .file_stem()
-            .and_then(|stem| stem.to_str().and_then(file_stem_to_key));
-        let snippets = crate::file_to_snippets(snippets_in_file);
-        self.snippets.write().insert(kind, snippets);
-
-        Ok(())
-    }
-
-    pub fn get_snippets(&self, kind: &SnippetKind) -> Vec<Arc<Snippet>> {
-        self.snippets.read().get(kind).cloned().unwrap_or_default()
-    }
-}
diff --git a/crates/snippets_ui/Cargo.toml b/crates/snippets_ui/Cargo.toml
deleted file mode 100644
index 3139a41dad..0000000000
--- a/crates/snippets_ui/Cargo.toml
+++ /dev/null
@@ -1,25 +0,0 @@
-[package]
-name = "snippets_ui"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/snippets_ui.rs"
-
-[dependencies]
-file_finder.workspace = true
-file_icons.workspace = true
-fuzzy.workspace = true
-gpui.workspace = true
-language.workspace = true
-paths.workspace = true
-picker.workspace = true
-settings.workspace = true
-ui.workspace = true
-util.workspace = true
-workspace.workspace = true
diff --git a/crates/snippets_ui/LICENSE-GPL b/crates/snippets_ui/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/snippets_ui/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/snippets_ui/src/snippets_ui.rs b/crates/snippets_ui/src/snippets_ui.rs
deleted file mode 100644
index cfe41144ba..0000000000
--- a/crates/snippets_ui/src/snippets_ui.rs
+++ /dev/null
@@ -1,364 +0,0 @@
-use file_finder::file_finder_settings::FileFinderSettings;
-use file_icons::FileIcons;
-use fuzzy::{StringMatch, StringMatchCandidate, match_strings};
-use gpui::{
-    App, Context, DismissEvent, Entity, EventEmitter, Focusable, ParentElement, Render, Styled,
-    WeakEntity, Window, actions,
-};
-use language::{LanguageMatcher, LanguageName, LanguageRegistry};
-use paths::snippets_dir;
-use picker::{Picker, PickerDelegate};
-use settings::Settings;
-use std::{
-    borrow::{Borrow, Cow},
-    collections::HashSet,
-    fs,
-    path::Path,
-    sync::Arc,
-};
-use ui::{HighlightedLabel, ListItem, ListItemSpacing, prelude::*};
-use util::ResultExt;
-use workspace::{ModalView, OpenOptions, OpenVisible, Workspace, notifications::NotifyResultExt};
-
-#[derive(Eq, Hash, PartialEq)]
-struct ScopeName(Cow<'static, str>);
-
-struct ScopeFileName(Cow<'static, str>);
-
-impl ScopeFileName {
-    fn with_extension(self) -> String {
-        format!("{}.json", self.0)
-    }
-}
-
-const GLOBAL_SCOPE_NAME: &str = "global";
-const GLOBAL_SCOPE_FILE_NAME: &str = "snippets";
-
-impl From<ScopeName> for ScopeFileName {
-    fn from(value: ScopeName) -> Self {
-        if value.0 == GLOBAL_SCOPE_NAME {
-            ScopeFileName(Cow::Borrowed(GLOBAL_SCOPE_FILE_NAME))
-        } else {
-            ScopeFileName(value.0)
-        }
-    }
-}
-
-impl From<ScopeFileName> for ScopeName {
-    fn from(value: ScopeFileName) -> Self {
-        if value.0 == GLOBAL_SCOPE_FILE_NAME {
-            ScopeName(Cow::Borrowed(GLOBAL_SCOPE_NAME))
-        } else {
-            ScopeName(value.0)
-        }
-    }
-}
-
-actions!(
-    snippets,
-    [
-        /// Opens the snippets configuration file.
-        ConfigureSnippets,
-        /// Opens the snippets folder in the file manager.
-        OpenFolder
-    ]
-);
-
-pub fn init(cx: &mut App) {
-    cx.observe_new(register).detach();
-}
-
-fn register(workspace: &mut Workspace, _window: Option<&mut Window>, _: &mut Context<Workspace>) {
-    workspace.register_action(configure_snippets);
-    workspace.register_action(open_folder);
-}
-
-fn configure_snippets(
-    workspace: &mut Workspace,
-    _: &ConfigureSnippets,
-    window: &mut Window,
-    cx: &mut Context<Workspace>,
-) {
-    let language_registry = workspace.app_state().languages.clone();
-    let workspace_handle = workspace.weak_handle();
-
-    workspace.toggle_modal(window, cx, move |window, cx| {
-        ScopeSelector::new(language_registry, workspace_handle, window, cx)
-    });
-}
-
-fn open_folder(
-    workspace: &mut Workspace,
-    _: &OpenFolder,
-    _: &mut Window,
-    cx: &mut Context<Workspace>,
-) {
-    fs::create_dir_all(snippets_dir()).notify_err(workspace, cx);
-    cx.open_with_system(snippets_dir().borrow());
-}
-
-pub struct ScopeSelector {
-    picker: Entity<Picker<ScopeSelectorDelegate>>,
-}
-
-impl ScopeSelector {
-    fn new(
-        language_registry: Arc<LanguageRegistry>,
-        workspace: WeakEntity<Workspace>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let delegate =
-            ScopeSelectorDelegate::new(workspace, cx.entity().downgrade(), language_registry);
-
-        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx));
-
-        Self { picker }
-    }
-}
-
-impl ModalView for ScopeSelector {}
-
-impl EventEmitter<DismissEvent> for ScopeSelector {}
-
-impl Focusable for ScopeSelector {
-    fn focus_handle(&self, cx: &App) -> gpui::FocusHandle {
-        self.picker.focus_handle(cx)
-    }
-}
-
-impl Render for ScopeSelector {
-    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex().w(rems(34.)).child(self.picker.clone())
-    }
-}
-
-pub struct ScopeSelectorDelegate {
-    workspace: WeakEntity<Workspace>,
-    scope_selector: WeakEntity<ScopeSelector>,
-    language_registry: Arc<LanguageRegistry>,
-    candidates: Vec<StringMatchCandidate>,
-    matches: Vec<StringMatch>,
-    selected_index: usize,
-    existing_scopes: HashSet<ScopeName>,
-}
-
-impl ScopeSelectorDelegate {
-    fn new(
-        workspace: WeakEntity<Workspace>,
-        scope_selector: WeakEntity<ScopeSelector>,
-        language_registry: Arc<LanguageRegistry>,
-    ) -> Self {
-        let languages = language_registry.language_names().into_iter();
-
-        let candidates = std::iter::once(LanguageName::new(GLOBAL_SCOPE_NAME))
-            .chain(languages)
-            .enumerate()
-            .map(|(candidate_id, name)| StringMatchCandidate::new(candidate_id, name.as_ref()))
-            .collect::<Vec<_>>();
-
-        let mut existing_scopes = HashSet::new();
-
-        if let Some(read_dir) = fs::read_dir(snippets_dir()).log_err() {
-            for entry in read_dir {
-                if let Some(entry) = entry.log_err() {
-                    let path = entry.path();
-                    if let (Some(stem), Some(extension)) = (path.file_stem(), path.extension())
-                        && extension.to_os_string().to_str() == Some("json")
-                        && let Ok(file_name) = stem.to_os_string().into_string()
-                    {
-                        existing_scopes
-                            .insert(ScopeName::from(ScopeFileName(Cow::Owned(file_name))));
-                    }
-                }
-            }
-        }
-
-        Self {
-            workspace,
-            scope_selector,
-            language_registry,
-            candidates,
-            matches: Vec::new(),
-            selected_index: 0,
-            existing_scopes,
-        }
-    }
-
-    fn scope_icon(&self, matcher: &LanguageMatcher, cx: &App) -> Option<Icon> {
-        matcher
-            .path_suffixes
-            .iter()
-            .find_map(|extension| FileIcons::get_icon(Path::new(extension), cx))
-            .or(FileIcons::get(cx).get_icon_for_type("default", cx))
-            .map(Icon::from_path)
-            .map(|icon| icon.color(Color::Muted))
-    }
-}
-
-impl PickerDelegate for ScopeSelectorDelegate {
-    type ListItem = ListItem;
-
-    fn placeholder_text(&self, _window: &mut Window, _: &mut App) -> Arc<str> {
-        "Select snippet scope...".into()
-    }
-
-    fn match_count(&self) -> usize {
-        self.matches.len()
-    }
-
-    fn confirm(&mut self, _: bool, window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        if let Some(mat) = self.matches.get(self.selected_index) {
-            let scope_name = self.candidates[mat.candidate_id].string.clone();
-            let language = self.language_registry.language_for_name(&scope_name);
-
-            if let Some(workspace) = self.workspace.upgrade() {
-                cx.spawn_in(window, async move |_, cx| {
-                    let scope_file_name = ScopeFileName(match scope_name.to_lowercase().as_str() {
-                        GLOBAL_SCOPE_NAME => Cow::Borrowed(GLOBAL_SCOPE_FILE_NAME),
-                        _ => Cow::Owned(language.await?.lsp_id()),
-                    });
-
-                    workspace.update_in(cx, |workspace, window, cx| {
-                        workspace
-                            .with_local_workspace(window, cx, |workspace, window, cx| {
-                                workspace
-                                    .open_abs_path(
-                                        snippets_dir().join(scope_file_name.with_extension()),
-                                        OpenOptions {
-                                            visible: Some(OpenVisible::None),
-                                            ..Default::default()
-                                        },
-                                        window,
-                                        cx,
-                                    )
-                                    .detach();
-                            })
-                            .detach();
-                    })
-                })
-                .detach_and_log_err(cx);
-            };
-        }
-        self.dismissed(window, cx);
-    }
-
-    fn dismissed(&mut self, _: &mut Window, cx: &mut Context<Picker<Self>>) {
-        self.scope_selector
-            .update(cx, |_, cx| cx.emit(DismissEvent))
-            .log_err();
-    }
-
-    fn selected_index(&self) -> usize {
-        self.selected_index
-    }
-
-    fn set_selected_index(
-        &mut self,
-        ix: usize,
-        _window: &mut Window,
-        _: &mut Context<Picker<Self>>,
-    ) {
-        self.selected_index = ix;
-    }
-
-    fn update_matches(
-        &mut self,
-        query: String,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> gpui::Task<()> {
-        let background = cx.background_executor().clone();
-        let candidates = self.candidates.clone();
-        cx.spawn_in(window, async move |this, cx| {
-            let matches = if query.is_empty() {
-                candidates
-                    .into_iter()
-                    .enumerate()
-                    .map(|(index, candidate)| StringMatch {
-                        candidate_id: index,
-                        string: candidate.string,
-                        positions: Vec::new(),
-                        score: 0.0,
-                    })
-                    .collect()
-            } else {
-                match_strings(
-                    &candidates,
-                    &query,
-                    false,
-                    true,
-                    100,
-                    &Default::default(),
-                    background,
-                )
-                .await
-            };
-
-            this.update(cx, |this, cx| {
-                let delegate = &mut this.delegate;
-                delegate.matches = matches;
-                delegate.selected_index = delegate
-                    .selected_index
-                    .min(delegate.matches.len().saturating_sub(1));
-                cx.notify();
-            })
-            .log_err();
-        })
-    }
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        _window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<Self::ListItem> {
-        let mat = &self.matches.get(ix)?;
-        let name_label = mat.string.clone();
-
-        let scope_name = ScopeName(Cow::Owned(
-            LanguageName::new(&self.candidates[mat.candidate_id].string).lsp_id(),
-        ));
-        let file_label = if self.existing_scopes.contains(&scope_name) {
-            Some(ScopeFileName::from(scope_name).with_extension())
-        } else {
-            None
-        };
-
-        let language_icon = if FileFinderSettings::get_global(cx).file_icons {
-            let language_name = LanguageName::new(mat.string.as_str());
-            self.language_registry
-                .available_language_for_name(language_name.as_ref())
-                .and_then(|available_language| self.scope_icon(available_language.matcher(), cx))
-                .or_else(|| {
-                    Some(
-                        Icon::from_path(IconName::ToolWeb.path())
-                            .map(|icon| icon.color(Color::Muted)),
-                    )
-                })
-        } else {
-            None
-        };
-
-        Some(
-            ListItem::new(ix)
-                .inset(true)
-                .spacing(ListItemSpacing::Sparse)
-                .toggle_state(selected)
-                .start_slot::<Icon>(language_icon)
-                .child(
-                    h_flex()
-                        .gap_x_2()
-                        .child(HighlightedLabel::new(name_label, mat.positions.clone()))
-                        .when_some(file_label, |item, path_label| {
-                            item.child(
-                                Label::new(path_label)
-                                    .color(Color::Muted)
-                                    .size(LabelSize::Small),
-                            )
-                        }),
-                ),
-        )
-    }
-}
diff --git a/crates/sqlez/.gitignore b/crates/sqlez/.gitignore
deleted file mode 100644
index 8130c3ab47..0000000000
--- a/crates/sqlez/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-debug/
-target/
diff --git a/crates/sqlez/Cargo.toml b/crates/sqlez/Cargo.toml
deleted file mode 100644
index 5f4a0bef67..0000000000
--- a/crates/sqlez/Cargo.toml
+++ /dev/null
@@ -1,23 +0,0 @@
-[package]
-name = "sqlez"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[dependencies]
-anyhow.workspace = true
-collections.workspace = true
-futures.workspace = true
-indoc.workspace = true
-libsqlite3-sys.workspace = true
-log.workspace = true
-parking_lot.workspace = true
-smol.workspace = true
-sqlformat.workspace = true
-thread_local = "1.1.4"
-util.workspace = true
-uuid.workspace = true
diff --git a/crates/sqlez/LICENSE-GPL b/crates/sqlez/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/sqlez/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/sqlez/src/bindable.rs b/crates/sqlez/src/bindable.rs
deleted file mode 100644
index 9370389ff4..0000000000
--- a/crates/sqlez/src/bindable.rs
+++ /dev/null
@@ -1,466 +0,0 @@
-use std::{
-    path::{Path, PathBuf},
-    sync::Arc,
-};
-
-use anyhow::{Context as _, Result};
-use util::paths::PathExt;
-
-use crate::statement::{SqlType, Statement};
-
-/// Define the number of columns that a type occupies in a query/database
-pub trait StaticColumnCount {
-    fn column_count() -> usize {
-        1
-    }
-}
-
-/// Bind values of different types to placeholders in a prepared SQL statement.
-pub trait Bind {
-    fn bind(&self, statement: &Statement, start_index: i32) -> Result<i32>;
-}
-
-pub trait Column: Sized {
-    fn column(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)>;
-}
-
-impl StaticColumnCount for bool {}
-impl Bind for bool {
-    fn bind(&self, statement: &Statement, start_index: i32) -> Result<i32> {
-        statement
-            .bind(&self.then_some(1).unwrap_or(0), start_index)
-            .with_context(|| format!("Failed to bind bool at index {start_index}"))
-    }
-}
-
-impl Column for bool {
-    fn column(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
-        i32::column(statement, start_index)
-            .map(|(i, next_index)| (i != 0, next_index))
-            .with_context(|| format!("Failed to read bool at index {start_index}"))
-    }
-}
-
-impl StaticColumnCount for &[u8] {}
-impl Bind for &[u8] {
-    fn bind(&self, statement: &Statement, start_index: i32) -> Result<i32> {
-        statement
-            .bind_blob(start_index, self)
-            .with_context(|| format!("Failed to bind &[u8] at index {start_index}"))?;
-        Ok(start_index + 1)
-    }
-}
-
-impl<const C: usize> StaticColumnCount for &[u8; C] {}
-impl<const C: usize> Bind for &[u8; C] {
-    fn bind(&self, statement: &Statement, start_index: i32) -> Result<i32> {
-        statement
-            .bind_blob(start_index, self.as_slice())
-            .with_context(|| format!("Failed to bind &[u8; C] at index {start_index}"))?;
-        Ok(start_index + 1)
-    }
-}
-
-impl<const C: usize> Column for [u8; C] {
-    fn column(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
-        let bytes_slice = statement.column_blob(start_index)?;
-        let array = bytes_slice.try_into()?;
-        Ok((array, start_index + 1))
-    }
-}
-
-impl StaticColumnCount for Vec<u8> {}
-impl Bind for Vec<u8> {
-    fn bind(&self, statement: &Statement, start_index: i32) -> Result<i32> {
-        statement
-            .bind_blob(start_index, self)
-            .with_context(|| format!("Failed to bind Vec<u8> at index {start_index}"))?;
-        Ok(start_index + 1)
-    }
-}
-
-impl Column for Vec<u8> {
-    fn column(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
-        let result = statement
-            .column_blob(start_index)
-            .with_context(|| format!("Failed to read Vec<u8> at index {start_index}"))?;
-
-        Ok((Vec::from(result), start_index + 1))
-    }
-}
-
-impl StaticColumnCount for f64 {}
-impl Bind for f64 {
-    fn bind(&self, statement: &Statement, start_index: i32) -> Result<i32> {
-        statement
-            .bind_double(start_index, *self)
-            .with_context(|| format!("Failed to bind f64 at index {start_index}"))?;
-        Ok(start_index + 1)
-    }
-}
-
-impl Column for f64 {
-    fn column(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
-        let result = statement
-            .column_double(start_index)
-            .with_context(|| format!("Failed to parse f64 at index {start_index}"))?;
-
-        Ok((result, start_index + 1))
-    }
-}
-
-impl StaticColumnCount for f32 {}
-impl Bind for f32 {
-    fn bind(&self, statement: &Statement, start_index: i32) -> Result<i32> {
-        statement
-            .bind_double(start_index, *self as f64)
-            .with_context(|| format!("Failed to bind f64 at index {start_index}"))?;
-        Ok(start_index + 1)
-    }
-}
-
-impl Column for f32 {
-    fn column(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
-        let result = statement
-            .column_double(start_index)
-            .with_context(|| format!("Failed to parse f32 at index {start_index}"))?
-            as f32;
-
-        Ok((result, start_index + 1))
-    }
-}
-
-impl StaticColumnCount for i32 {}
-impl Bind for i32 {
-    fn bind(&self, statement: &Statement, start_index: i32) -> Result<i32> {
-        statement
-            .bind_int(start_index, *self)
-            .with_context(|| format!("Failed to bind i32 at index {start_index}"))?;
-
-        Ok(start_index + 1)
-    }
-}
-
-impl Column for i32 {
-    fn column<'a>(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
-        let result = statement.column_int(start_index)?;
-        Ok((result, start_index + 1))
-    }
-}
-
-impl StaticColumnCount for i64 {}
-impl Bind for i64 {
-    fn bind(&self, statement: &Statement, start_index: i32) -> Result<i32> {
-        statement
-            .bind_int64(start_index, *self)
-            .with_context(|| format!("Failed to bind i64 at index {start_index}"))?;
-        Ok(start_index + 1)
-    }
-}
-
-impl Column for i64 {
-    fn column(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
-        let result = statement.column_int64(start_index)?;
-        Ok((result, start_index + 1))
-    }
-}
-
-impl StaticColumnCount for u64 {}
-impl Bind for u64 {
-    fn bind(&self, statement: &Statement, start_index: i32) -> Result<i32> {
-        statement
-            .bind_int64(start_index, (*self) as i64)
-            .with_context(|| format!("Failed to bind i64 at index {start_index}"))?;
-        Ok(start_index + 1)
-    }
-}
-
-impl Column for u64 {
-    fn column(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
-        let result = statement.column_int64(start_index)? as u64;
-        Ok((result, start_index + 1))
-    }
-}
-
-impl StaticColumnCount for u32 {}
-impl Bind for u32 {
-    fn bind(&self, statement: &Statement, start_index: i32) -> Result<i32> {
-        (*self as i64)
-            .bind(statement, start_index)
-            .with_context(|| format!("Failed to bind usize at index {start_index}"))
-    }
-}
-
-impl Column for u32 {
-    fn column(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
-        let result = statement.column_int64(start_index)?;
-        Ok((result as u32, start_index + 1))
-    }
-}
-
-impl StaticColumnCount for u16 {}
-impl Bind for u16 {
-    fn bind(&self, statement: &Statement, start_index: i32) -> Result<i32> {
-        (*self as i64)
-            .bind(statement, start_index)
-            .with_context(|| format!("Failed to bind usize at index {start_index}"))
-    }
-}
-
-impl Column for u16 {
-    fn column(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
-        let result = statement.column_int64(start_index)?;
-        Ok((result as u16, start_index + 1))
-    }
-}
-
-impl StaticColumnCount for usize {}
-impl Bind for usize {
-    fn bind(&self, statement: &Statement, start_index: i32) -> Result<i32> {
-        (*self as i64)
-            .bind(statement, start_index)
-            .with_context(|| format!("Failed to bind usize at index {start_index}"))
-    }
-}
-
-impl Column for usize {
-    fn column(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
-        let result = statement.column_int64(start_index)?;
-        Ok((result as usize, start_index + 1))
-    }
-}
-
-impl StaticColumnCount for &str {}
-impl Bind for &str {
-    fn bind(&self, statement: &Statement, start_index: i32) -> Result<i32> {
-        statement.bind_text(start_index, self)?;
-        Ok(start_index + 1)
-    }
-}
-
-impl StaticColumnCount for Arc<str> {}
-impl Bind for Arc<str> {
-    fn bind(&self, statement: &Statement, start_index: i32) -> Result<i32> {
-        statement.bind_text(start_index, self.as_ref())?;
-        Ok(start_index + 1)
-    }
-}
-
-impl StaticColumnCount for String {}
-impl Bind for String {
-    fn bind(&self, statement: &Statement, start_index: i32) -> Result<i32> {
-        statement.bind_text(start_index, self)?;
-        Ok(start_index + 1)
-    }
-}
-
-impl Column for Arc<str> {
-    fn column(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
-        let result = statement.column_text(start_index)?;
-        Ok((Arc::from(result), start_index + 1))
-    }
-}
-
-impl Column for String {
-    fn column<'a>(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
-        let result = statement.column_text(start_index)?;
-        Ok((result.to_owned(), start_index + 1))
-    }
-}
-
-impl<T: StaticColumnCount> StaticColumnCount for Option<T> {
-    fn column_count() -> usize {
-        T::column_count()
-    }
-}
-impl<T: Bind + StaticColumnCount> Bind for Option<T> {
-    fn bind(&self, statement: &Statement, mut start_index: i32) -> Result<i32> {
-        if let Some(this) = self {
-            this.bind(statement, start_index)
-        } else {
-            for _ in 0..T::column_count() {
-                statement.bind_null(start_index)?;
-                start_index += 1;
-            }
-            Ok(start_index)
-        }
-    }
-}
-
-impl<T: Column + StaticColumnCount> Column for Option<T> {
-    fn column(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
-        if let SqlType::Null = statement.column_type(start_index)? {
-            Ok((None, start_index + T::column_count() as i32))
-        } else {
-            T::column(statement, start_index).map(|(result, next_index)| (Some(result), next_index))
-        }
-    }
-}
-
-impl<T: StaticColumnCount, const COUNT: usize> StaticColumnCount for [T; COUNT] {
-    fn column_count() -> usize {
-        T::column_count() * COUNT
-    }
-}
-impl<T: Bind, const COUNT: usize> Bind for [T; COUNT] {
-    fn bind(&self, statement: &Statement, start_index: i32) -> Result<i32> {
-        let mut current_index = start_index;
-        for binding in self {
-            current_index = binding.bind(statement, current_index)?
-        }
-
-        Ok(current_index)
-    }
-}
-
-impl StaticColumnCount for &Path {}
-impl Bind for &Path {
-    fn bind(&self, statement: &Statement, start_index: i32) -> Result<i32> {
-        self.as_os_str()
-            .as_encoded_bytes()
-            .bind(statement, start_index)
-    }
-}
-
-impl StaticColumnCount for Arc<Path> {}
-impl Bind for Arc<Path> {
-    fn bind(&self, statement: &Statement, start_index: i32) -> Result<i32> {
-        self.as_ref().bind(statement, start_index)
-    }
-}
-impl Column for Arc<Path> {
-    fn column(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
-        let blob = statement.column_blob(start_index)?;
-
-        PathBuf::try_from_bytes(blob).map(|path| (Arc::from(path.as_path()), start_index + 1))
-    }
-}
-
-impl StaticColumnCount for PathBuf {}
-impl Bind for PathBuf {
-    fn bind(&self, statement: &Statement, start_index: i32) -> Result<i32> {
-        (self.as_ref() as &Path).bind(statement, start_index)
-    }
-}
-
-impl Column for PathBuf {
-    fn column(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
-        let blob = statement.column_blob(start_index)?;
-
-        PathBuf::try_from_bytes(blob).map(|path| (path, start_index + 1))
-    }
-}
-
-impl StaticColumnCount for uuid::Uuid {
-    fn column_count() -> usize {
-        1
-    }
-}
-
-impl Bind for uuid::Uuid {
-    fn bind(&self, statement: &Statement, start_index: i32) -> Result<i32> {
-        self.as_bytes().bind(statement, start_index)
-    }
-}
-
-impl Column for uuid::Uuid {
-    fn column(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
-        let (bytes, next_index) = Column::column(statement, start_index)?;
-        Ok((uuid::Uuid::from_bytes(bytes), next_index))
-    }
-}
-
-impl StaticColumnCount for () {
-    fn column_count() -> usize {
-        0
-    }
-}
-/// Unit impls do nothing. This simplifies query macros
-impl Bind for () {
-    fn bind(&self, _statement: &Statement, start_index: i32) -> Result<i32> {
-        Ok(start_index)
-    }
-}
-
-impl Column for () {
-    fn column(_statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
-        Ok(((), start_index))
-    }
-}
-
-macro_rules! impl_tuple_row_traits {
-    ( $($local:ident: $type:ident),+ ) => {
-        impl<$($type: StaticColumnCount),+> StaticColumnCount for ($($type,)+) {
-            fn column_count() -> usize {
-                let mut count = 0;
-                $(count += $type::column_count();)+
-                count
-            }
-        }
-
-        impl<$($type: Bind),+> Bind for ($($type,)+) {
-            fn bind(&self, statement: &Statement, start_index: i32) -> Result<i32> {
-                let mut next_index = start_index;
-                let ($($local,)+) = self;
-                $(next_index = $local.bind(statement, next_index)?;)+
-                Ok(next_index)
-            }
-        }
-
-        impl<$($type: Column),+> Column for ($($type,)+) {
-            fn column(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
-                let mut next_index = start_index;
-                Ok((
-                    (
-                        $({
-                            let value;
-                            (value, next_index) = $type::column(statement, next_index)?;
-                            value
-                        },)+
-                    ),
-                    next_index,
-                ))
-            }
-        }
-    }
-}
-
-impl_tuple_row_traits!(t1: T1, t2: T2);
-impl_tuple_row_traits!(t1: T1, t2: T2, t3: T3);
-impl_tuple_row_traits!(t1: T1, t2: T2, t3: T3, t4: T4);
-impl_tuple_row_traits!(t1: T1, t2: T2, t3: T3, t4: T4, t5: T5);
-impl_tuple_row_traits!(t1: T1, t2: T2, t3: T3, t4: T4, t5: T5, t6: T6);
-impl_tuple_row_traits!(t1: T1, t2: T2, t3: T3, t4: T4, t5: T5, t6: T6, t7: T7);
-impl_tuple_row_traits!(
-    t1: T1,
-    t2: T2,
-    t3: T3,
-    t4: T4,
-    t5: T5,
-    t6: T6,
-    t7: T7,
-    t8: T8
-);
-impl_tuple_row_traits!(
-    t1: T1,
-    t2: T2,
-    t3: T3,
-    t4: T4,
-    t5: T5,
-    t6: T6,
-    t7: T7,
-    t8: T8,
-    t9: T9
-);
-impl_tuple_row_traits!(
-    t1: T1,
-    t2: T2,
-    t3: T3,
-    t4: T4,
-    t5: T5,
-    t6: T6,
-    t7: T7,
-    t8: T8,
-    t9: T9,
-    t10: T10
-);
diff --git a/crates/sqlez/src/connection.rs b/crates/sqlez/src/connection.rs
deleted file mode 100644
index 53f0d4e261..0000000000
--- a/crates/sqlez/src/connection.rs
+++ /dev/null
@@ -1,445 +0,0 @@
-use std::{
-    cell::RefCell,
-    ffi::{CStr, CString},
-    marker::PhantomData,
-    path::Path,
-    ptr,
-};
-
-use anyhow::Result;
-use libsqlite3_sys::*;
-
-pub struct Connection {
-    pub(crate) sqlite3: *mut sqlite3,
-    persistent: bool,
-    pub(crate) write: RefCell<bool>,
-    _sqlite: PhantomData<sqlite3>,
-}
-unsafe impl Send for Connection {}
-
-impl Connection {
-    pub(crate) fn open(uri: &str, persistent: bool) -> Result<Self> {
-        let mut connection = Self {
-            sqlite3: ptr::null_mut(),
-            persistent,
-            write: RefCell::new(true),
-            _sqlite: PhantomData,
-        };
-
-        let flags = SQLITE_OPEN_CREATE | SQLITE_OPEN_NOMUTEX | SQLITE_OPEN_READWRITE;
-        unsafe {
-            sqlite3_open_v2(
-                CString::new(uri)?.as_ptr(),
-                &mut connection.sqlite3,
-                flags,
-                ptr::null(),
-            );
-
-            // Turn on extended error codes
-            sqlite3_extended_result_codes(connection.sqlite3, 1);
-
-            connection.last_error()?;
-        }
-
-        Ok(connection)
-    }
-
-    /// Attempts to open the database at uri. If it fails, a shared memory db will be opened
-    /// instead.
-    pub fn open_file(uri: &str) -> Self {
-        Self::open(uri, true).unwrap_or_else(|_| Self::open_memory(Some(uri)))
-    }
-
-    pub fn open_memory(uri: Option<&str>) -> Self {
-        let in_memory_path = if let Some(uri) = uri {
-            format!("file:{}?mode=memory&cache=shared", uri)
-        } else {
-            ":memory:".to_string()
-        };
-
-        Self::open(&in_memory_path, false).expect("Could not create fallback in memory db")
-    }
-
-    pub fn persistent(&self) -> bool {
-        self.persistent
-    }
-
-    pub fn can_write(&self) -> bool {
-        *self.write.borrow()
-    }
-
-    pub fn backup_main(&self, destination: &Connection) -> Result<()> {
-        unsafe {
-            let backup = sqlite3_backup_init(
-                destination.sqlite3,
-                CString::new("main")?.as_ptr(),
-                self.sqlite3,
-                CString::new("main")?.as_ptr(),
-            );
-            sqlite3_backup_step(backup, -1);
-            sqlite3_backup_finish(backup);
-            destination.last_error()
-        }
-    }
-
-    pub fn backup_main_to(&self, destination: impl AsRef<Path>) -> Result<()> {
-        let destination = Self::open_file(destination.as_ref().to_string_lossy().as_ref());
-        self.backup_main(&destination)
-    }
-
-    pub fn sql_has_syntax_error(&self, sql: &str) -> Option<(String, usize)> {
-        let sql = CString::new(sql).unwrap();
-        let mut remaining_sql = sql.as_c_str();
-        let sql_start = remaining_sql.as_ptr();
-
-        let mut alter_table = None;
-        while {
-            let remaining_sql_str = remaining_sql.to_str().unwrap().trim();
-            let any_remaining_sql = remaining_sql_str != ";" && !remaining_sql_str.is_empty();
-            if any_remaining_sql {
-                alter_table = parse_alter_table(remaining_sql_str);
-            }
-            any_remaining_sql
-        } {
-            let mut raw_statement = ptr::null_mut::<sqlite3_stmt>();
-            let mut remaining_sql_ptr = ptr::null();
-
-            let (res, offset, message, _conn) = if let Some((table_to_alter, column)) = alter_table
-            {
-                // ALTER TABLE is a weird statement. When preparing the statement the table's
-                // existence is checked *before* syntax checking any other part of the statement.
-                // Therefore, we need to make sure that the table has been created before calling
-                // prepare. As we don't want to trash whatever database this is connected to, we
-                // create a new in-memory DB to test.
-
-                let temp_connection = Connection::open_memory(None);
-                //This should always succeed, if it doesn't then you really should know about it
-                temp_connection
-                    .exec(&format!("CREATE TABLE {table_to_alter}({column})"))
-                    .unwrap()()
-                .unwrap();
-
-                unsafe {
-                    sqlite3_prepare_v2(
-                        temp_connection.sqlite3,
-                        remaining_sql.as_ptr(),
-                        -1,
-                        &mut raw_statement,
-                        &mut remaining_sql_ptr,
-                    )
-                };
-
-                #[cfg(not(any(target_os = "linux", target_os = "freebsd")))]
-                let offset = unsafe { sqlite3_error_offset(temp_connection.sqlite3) };
-
-                #[cfg(any(target_os = "linux", target_os = "freebsd"))]
-                let offset = 0;
-
-                unsafe {
-                    (
-                        sqlite3_errcode(temp_connection.sqlite3),
-                        offset,
-                        sqlite3_errmsg(temp_connection.sqlite3),
-                        Some(temp_connection),
-                    )
-                }
-            } else {
-                unsafe {
-                    sqlite3_prepare_v2(
-                        self.sqlite3,
-                        remaining_sql.as_ptr(),
-                        -1,
-                        &mut raw_statement,
-                        &mut remaining_sql_ptr,
-                    )
-                };
-
-                #[cfg(not(any(target_os = "linux", target_os = "freebsd")))]
-                let offset = unsafe { sqlite3_error_offset(self.sqlite3) };
-
-                #[cfg(any(target_os = "linux", target_os = "freebsd"))]
-                let offset = 0;
-
-                unsafe {
-                    (
-                        sqlite3_errcode(self.sqlite3),
-                        offset,
-                        sqlite3_errmsg(self.sqlite3),
-                        None,
-                    )
-                }
-            };
-
-            unsafe { sqlite3_finalize(raw_statement) };
-
-            if res == 1 && offset >= 0 {
-                let sub_statement_correction = remaining_sql.as_ptr() as usize - sql_start as usize;
-                let err_msg = String::from_utf8_lossy(unsafe {
-                    CStr::from_ptr(message as *const _).to_bytes()
-                })
-                .into_owned();
-
-                return Some((err_msg, offset as usize + sub_statement_correction));
-            }
-            remaining_sql = unsafe { CStr::from_ptr(remaining_sql_ptr) };
-            alter_table = None;
-        }
-        None
-    }
-
-    pub(crate) fn last_error(&self) -> Result<()> {
-        unsafe {
-            let code = sqlite3_errcode(self.sqlite3);
-            const NON_ERROR_CODES: &[i32] = &[SQLITE_OK, SQLITE_ROW];
-            if NON_ERROR_CODES.contains(&code) {
-                return Ok(());
-            }
-
-            let message = sqlite3_errmsg(self.sqlite3);
-            let message = if message.is_null() {
-                None
-            } else {
-                Some(
-                    String::from_utf8_lossy(CStr::from_ptr(message as *const _).to_bytes())
-                        .into_owned(),
-                )
-            };
-
-            anyhow::bail!("Sqlite call failed with code {code} and message: {message:?}")
-        }
-    }
-
-    pub(crate) fn with_write<T>(&self, callback: impl FnOnce(&Connection) -> T) -> T {
-        *self.write.borrow_mut() = true;
-        let result = callback(self);
-        *self.write.borrow_mut() = false;
-        result
-    }
-}
-
-fn parse_alter_table(remaining_sql_str: &str) -> Option<(String, String)> {
-    let remaining_sql_str = remaining_sql_str.to_lowercase();
-    if remaining_sql_str.starts_with("alter")
-        && let Some(table_offset) = remaining_sql_str.find("table")
-    {
-        let after_table_offset = table_offset + "table".len();
-        let table_to_alter = remaining_sql_str
-            .chars()
-            .skip(after_table_offset)
-            .skip_while(|c| c.is_whitespace())
-            .take_while(|c| !c.is_whitespace())
-            .collect::<String>();
-        if !table_to_alter.is_empty() {
-            let column_name = if let Some(rename_offset) = remaining_sql_str.find("rename column") {
-                let after_rename_offset = rename_offset + "rename column".len();
-                remaining_sql_str
-                    .chars()
-                    .skip(after_rename_offset)
-                    .skip_while(|c| c.is_whitespace())
-                    .take_while(|c| !c.is_whitespace())
-                    .collect::<String>()
-            } else if let Some(drop_offset) = remaining_sql_str.find("drop column") {
-                let after_drop_offset = drop_offset + "drop column".len();
-                remaining_sql_str
-                    .chars()
-                    .skip(after_drop_offset)
-                    .skip_while(|c| c.is_whitespace())
-                    .take_while(|c| !c.is_whitespace())
-                    .collect::<String>()
-            } else {
-                "__place_holder_column_for_syntax_checking".to_string()
-            };
-            return Some((table_to_alter, column_name));
-        }
-    }
-    None
-}
-
-impl Drop for Connection {
-    fn drop(&mut self) {
-        unsafe { sqlite3_close(self.sqlite3) };
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use anyhow::Result;
-    use indoc::indoc;
-
-    use crate::connection::Connection;
-
-    #[test]
-    fn string_round_trips() -> Result<()> {
-        let connection = Connection::open_memory(Some("string_round_trips"));
-        connection
-            .exec(indoc! {"
-            CREATE TABLE text (
-                text TEXT
-            );"})
-            .unwrap()()
-        .unwrap();
-
-        let text = "Some test text";
-
-        connection
-            .exec_bound("INSERT INTO text (text) VALUES (?);")
-            .unwrap()(text)
-        .unwrap();
-
-        assert_eq!(
-            connection.select_row("SELECT text FROM text;").unwrap()().unwrap(),
-            Some(text.to_string())
-        );
-
-        Ok(())
-    }
-
-    #[test]
-    fn tuple_round_trips() {
-        let connection = Connection::open_memory(Some("tuple_round_trips"));
-        connection
-            .exec(indoc! {"
-                CREATE TABLE test (
-                    text TEXT,
-                    integer INTEGER,
-                    blob BLOB
-                );"})
-            .unwrap()()
-        .unwrap();
-
-        let tuple1 = ("test".to_string(), 64, vec![0, 1, 2, 4, 8, 16, 32, 64]);
-        let tuple2 = ("test2".to_string(), 32, vec![64, 32, 16, 8, 4, 2, 1, 0]);
-
-        let mut insert = connection
-            .exec_bound::<(String, usize, Vec<u8>)>(
-                "INSERT INTO test (text, integer, blob) VALUES (?, ?, ?)",
-            )
-            .unwrap();
-
-        insert(tuple1.clone()).unwrap();
-        insert(tuple2.clone()).unwrap();
-
-        assert_eq!(
-            connection
-                .select::<(String, usize, Vec<u8>)>("SELECT * FROM test")
-                .unwrap()()
-            .unwrap(),
-            vec![tuple1, tuple2]
-        );
-    }
-
-    #[test]
-    fn bool_round_trips() {
-        let connection = Connection::open_memory(Some("bool_round_trips"));
-        connection
-            .exec(indoc! {"
-                CREATE TABLE bools (
-                    t INTEGER,
-                    f INTEGER
-                );"})
-            .unwrap()()
-        .unwrap();
-
-        connection
-            .exec_bound("INSERT INTO bools(t, f) VALUES (?, ?)")
-            .unwrap()((true, false))
-        .unwrap();
-
-        assert_eq!(
-            connection
-                .select_row::<(bool, bool)>("SELECT * FROM bools;")
-                .unwrap()()
-            .unwrap(),
-            Some((true, false))
-        );
-    }
-
-    #[test]
-    fn backup_works() {
-        let connection1 = Connection::open_memory(Some("backup_works"));
-        connection1
-            .exec(indoc! {"
-                CREATE TABLE blobs (
-                    data BLOB
-                );"})
-            .unwrap()()
-        .unwrap();
-        let blob = vec![0, 1, 2, 4, 8, 16, 32, 64];
-        connection1
-            .exec_bound::<Vec<u8>>("INSERT INTO blobs (data) VALUES (?);")
-            .unwrap()(blob.clone())
-        .unwrap();
-
-        // Backup connection1 to connection2
-        let connection2 = Connection::open_memory(Some("backup_works_other"));
-        connection1.backup_main(&connection2).unwrap();
-
-        // Delete the added blob and verify its deleted on the other side
-        let read_blobs = connection1
-            .select::<Vec<u8>>("SELECT * FROM blobs;")
-            .unwrap()()
-        .unwrap();
-        assert_eq!(read_blobs, vec![blob]);
-    }
-
-    #[test]
-    fn multi_step_statement_works() {
-        let connection = Connection::open_memory(Some("multi_step_statement_works"));
-
-        connection
-            .exec(indoc! {"
-                CREATE TABLE test (
-                    col INTEGER
-                )"})
-            .unwrap()()
-        .unwrap();
-
-        connection
-            .exec(indoc! {"
-            INSERT INTO test(col) VALUES (2)"})
-            .unwrap()()
-        .unwrap();
-
-        assert_eq!(
-            connection
-                .select_row::<usize>("SELECT * FROM test")
-                .unwrap()()
-            .unwrap(),
-            Some(2)
-        );
-    }
-
-    #[cfg(not(any(target_os = "linux", target_os = "freebsd")))]
-    #[test]
-    fn test_sql_has_syntax_errors() {
-        let connection = Connection::open_memory(Some("test_sql_has_syntax_errors"));
-        let first_stmt =
-            "CREATE TABLE kv_store(key TEXT PRIMARY KEY, value TEXT NOT NULL) STRICT ;";
-        let second_stmt = "SELECT FROM";
-
-        let second_offset = connection.sql_has_syntax_error(second_stmt).unwrap().1;
-
-        let res = connection
-            .sql_has_syntax_error(&format!("{}\n{}", first_stmt, second_stmt))
-            .map(|(_, offset)| offset);
-
-        assert_eq!(res, Some(first_stmt.len() + second_offset + 1));
-    }
-
-    #[test]
-    fn test_alter_table_syntax() {
-        let connection = Connection::open_memory(Some("test_alter_table_syntax"));
-
-        assert!(
-            connection
-                .sql_has_syntax_error("ALTER TABLE test ADD x TEXT")
-                .is_none()
-        );
-
-        assert!(
-            connection
-                .sql_has_syntax_error("ALTER TABLE test AAD x TEXT")
-                .is_some()
-        );
-    }
-}
diff --git a/crates/sqlez/src/domain.rs b/crates/sqlez/src/domain.rs
deleted file mode 100644
index 5744a67da2..0000000000
--- a/crates/sqlez/src/domain.rs
+++ /dev/null
@@ -1,64 +0,0 @@
-use crate::connection::Connection;
-
-pub trait Domain: 'static {
-    const NAME: &str;
-    const MIGRATIONS: &[&str];
-
-    fn should_allow_migration_change(_index: usize, _old: &str, _new: &str) -> bool {
-        false
-    }
-}
-
-pub trait Migrator: 'static {
-    fn migrate(connection: &Connection) -> anyhow::Result<()>;
-}
-
-impl Migrator for () {
-    fn migrate(_connection: &Connection) -> anyhow::Result<()> {
-        Ok(()) // Do nothing
-    }
-}
-
-impl<D: Domain> Migrator for D {
-    fn migrate(connection: &Connection) -> anyhow::Result<()> {
-        connection.migrate(
-            Self::NAME,
-            Self::MIGRATIONS,
-            Self::should_allow_migration_change,
-        )
-    }
-}
-
-impl<D1: Domain, D2: Domain> Migrator for (D1, D2) {
-    fn migrate(connection: &Connection) -> anyhow::Result<()> {
-        D1::migrate(connection)?;
-        D2::migrate(connection)
-    }
-}
-
-impl<D1: Domain, D2: Domain, D3: Domain> Migrator for (D1, D2, D3) {
-    fn migrate(connection: &Connection) -> anyhow::Result<()> {
-        D1::migrate(connection)?;
-        D2::migrate(connection)?;
-        D3::migrate(connection)
-    }
-}
-
-impl<D1: Domain, D2: Domain, D3: Domain, D4: Domain> Migrator for (D1, D2, D3, D4) {
-    fn migrate(connection: &Connection) -> anyhow::Result<()> {
-        D1::migrate(connection)?;
-        D2::migrate(connection)?;
-        D3::migrate(connection)?;
-        D4::migrate(connection)
-    }
-}
-
-impl<D1: Domain, D2: Domain, D3: Domain, D4: Domain, D5: Domain> Migrator for (D1, D2, D3, D4, D5) {
-    fn migrate(connection: &Connection) -> anyhow::Result<()> {
-        D1::migrate(connection)?;
-        D2::migrate(connection)?;
-        D3::migrate(connection)?;
-        D4::migrate(connection)?;
-        D5::migrate(connection)
-    }
-}
diff --git a/crates/sqlez/src/lib.rs b/crates/sqlez/src/lib.rs
deleted file mode 100644
index a22cfff2b3..0000000000
--- a/crates/sqlez/src/lib.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-pub mod bindable;
-pub mod connection;
-pub mod domain;
-pub mod migrations;
-pub mod savepoint;
-pub mod statement;
-pub mod thread_safe_connection;
-pub mod typed_statements;
-mod util;
-
-pub use anyhow;
diff --git a/crates/sqlez/src/migrations.rs b/crates/sqlez/src/migrations.rs
deleted file mode 100644
index 567d82f9af..0000000000
--- a/crates/sqlez/src/migrations.rs
+++ /dev/null
@@ -1,390 +0,0 @@
-// Migrations are constructed by domain, and stored in a table in the connection db with domain name,
-// effected tables, actual query text, and order.
-// If a migration is run and any of the query texts don't match, the app panics on startup (maybe fallback
-// to creating a new db?)
-// Otherwise any missing migrations are run on the connection
-
-use std::ffi::CString;
-
-use anyhow::{Context as _, Result};
-use indoc::{formatdoc, indoc};
-use libsqlite3_sys::sqlite3_exec;
-
-use crate::connection::Connection;
-
-impl Connection {
-    fn eager_exec(&self, sql: &str) -> anyhow::Result<()> {
-        let sql_str = CString::new(sql).context("Error creating cstr")?;
-        unsafe {
-            sqlite3_exec(
-                self.sqlite3,
-                sql_str.as_c_str().as_ptr(),
-                None,
-                std::ptr::null_mut(),
-                std::ptr::null_mut(),
-            );
-        }
-        self.last_error()
-            .with_context(|| format!("Prepare call failed for query:\n{}", sql))?;
-
-        Ok(())
-    }
-
-    /// Migrate the database, for the given domain.
-    /// Note: Unlike everything else in SQLez, migrations are run eagerly, without first
-    /// preparing the SQL statements. This makes it possible to do multi-statement schema
-    /// updates in a single string without running into prepare errors.
-    pub fn migrate(
-        &self,
-        domain: &'static str,
-        migrations: &[&'static str],
-        mut should_allow_migration_change: impl FnMut(usize, &str, &str) -> bool,
-    ) -> Result<()> {
-        self.with_savepoint("migrating", || {
-            // Setup the migrations table unconditionally
-            self.exec(indoc! {"
-                CREATE TABLE IF NOT EXISTS migrations (
-                    domain TEXT,
-                    step INTEGER,
-                    migration TEXT
-                )"})?()?;
-
-            let completed_migrations =
-                self.select_bound::<&str, (String, usize, String)>(indoc! {"
-                    SELECT domain, step, migration FROM migrations
-                    WHERE domain = ?
-                    ORDER BY step
-                    "})?(domain)?;
-
-            let mut store_completed_migration = self
-                .exec_bound("INSERT INTO migrations (domain, step, migration) VALUES (?, ?, ?)")?;
-
-            let mut did_migrate = false;
-            for (index, migration) in migrations.iter().enumerate() {
-                let migration =
-                    sqlformat::format(migration, &sqlformat::QueryParams::None, Default::default());
-                if let Some((_, _, completed_migration)) = completed_migrations.get(index) {
-                    // Reformat completed migrations with the current `sqlformat` version, so that past migrations stored
-                    // conform to the new formatting rules.
-                    let completed_migration = sqlformat::format(
-                        completed_migration,
-                        &sqlformat::QueryParams::None,
-                        Default::default(),
-                    );
-                    if completed_migration == migration {
-                        // Migration already run. Continue
-                        continue;
-                    } else if should_allow_migration_change(index, &completed_migration, &migration)
-                    {
-                        continue;
-                    } else {
-                        anyhow::bail!(formatdoc! {"
-                            Migration changed for {domain} at step {index}
-
-                            Stored migration:
-                            {completed_migration}
-
-                            Proposed migration:
-                            {migration}"});
-                    }
-                }
-
-                self.eager_exec(&migration)?;
-                did_migrate = true;
-                store_completed_migration((domain, index, migration))?;
-            }
-
-            if did_migrate {
-                self.delete_rows_with_orphaned_foreign_key_references()?;
-                self.exec("PRAGMA foreign_key_check;")?()?;
-            }
-
-            Ok(())
-        })
-    }
-
-    /// Delete any rows that were orphaned by a migration. This is needed
-    /// because we disable foreign key constraints during migrations, so
-    /// that it's possible to re-create a table with the same name, without
-    /// deleting all associated data.
-    fn delete_rows_with_orphaned_foreign_key_references(&self) -> Result<()> {
-        let foreign_key_info: Vec<(String, String, String, String)> = self.select(
-            r#"
-                SELECT DISTINCT
-                    schema.name as child_table,
-                    foreign_keys.[from] as child_key,
-                    foreign_keys.[table] as parent_table,
-                    foreign_keys.[to] as parent_key
-                FROM sqlite_schema schema
-                JOIN pragma_foreign_key_list(schema.name) foreign_keys
-                WHERE
-                    schema.type = 'table' AND
-                    schema.name NOT LIKE "sqlite_%"
-            "#,
-        )?()?;
-
-        if !foreign_key_info.is_empty() {
-            log::info!(
-                "Found {} foreign key relationships to check",
-                foreign_key_info.len()
-            );
-        }
-
-        for (child_table, child_key, parent_table, parent_key) in foreign_key_info {
-            self.exec(&format!(
-                "
-                DELETE FROM {child_table}
-                WHERE {child_key} IS NOT NULL and {child_key} NOT IN
-                (SELECT {parent_key} FROM {parent_table})
-                "
-            ))?()?;
-        }
-
-        Ok(())
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use indoc::indoc;
-
-    use crate::connection::Connection;
-
-    #[test]
-    fn test_migrations_are_added_to_table() {
-        let connection = Connection::open_memory(Some("migrations_are_added_to_table"));
-
-        // Create first migration with a single step and run it
-        connection
-            .migrate(
-                "test",
-                &[indoc! {"
-                CREATE TABLE test1 (
-                    a TEXT,
-                    b TEXT
-                )"}],
-                disallow_migration_change,
-            )
-            .unwrap();
-
-        // Verify it got added to the migrations table
-        assert_eq!(
-            &connection
-                .select::<String>("SELECT (migration) FROM migrations")
-                .unwrap()()
-            .unwrap()[..],
-            &[indoc! {"CREATE TABLE test1 (a TEXT, b TEXT)"}],
-        );
-
-        // Add another step to the migration and run it again
-        connection
-            .migrate(
-                "test",
-                &[
-                    indoc! {"
-                    CREATE TABLE test1 (
-                        a TEXT,
-                        b TEXT
-                    )"},
-                    indoc! {"
-                    CREATE TABLE test2 (
-                        c TEXT,
-                        d TEXT
-                    )"},
-                ],
-                disallow_migration_change,
-            )
-            .unwrap();
-
-        // Verify it is also added to the migrations table
-        assert_eq!(
-            &connection
-                .select::<String>("SELECT (migration) FROM migrations")
-                .unwrap()()
-            .unwrap()[..],
-            &[
-                indoc! {"CREATE TABLE test1 (a TEXT, b TEXT)"},
-                indoc! {"CREATE TABLE test2 (c TEXT, d TEXT)"},
-            ],
-        );
-    }
-
-    #[test]
-    fn test_migration_setup_works() {
-        let connection = Connection::open_memory(Some("migration_setup_works"));
-
-        connection
-            .exec(indoc! {"
-                CREATE TABLE IF NOT EXISTS migrations (
-                    domain TEXT,
-                    step INTEGER,
-                    migration TEXT
-                );"})
-            .unwrap()()
-        .unwrap();
-
-        let mut store_completed_migration = connection
-            .exec_bound::<(&str, usize, String)>(indoc! {"
-                INSERT INTO migrations (domain, step, migration)
-                VALUES (?, ?, ?)"})
-            .unwrap();
-
-        let domain = "test_domain";
-        for i in 0..5 {
-            // Create a table forcing a schema change
-            connection
-                .exec(&format!("CREATE TABLE table{} ( test TEXT );", i))
-                .unwrap()()
-            .unwrap();
-
-            store_completed_migration((domain, i, i.to_string())).unwrap();
-        }
-    }
-
-    #[test]
-    fn migrations_dont_rerun() {
-        let connection = Connection::open_memory(Some("migrations_dont_rerun"));
-
-        // Create migration which clears a table
-
-        // Manually create the table for that migration with a row
-        connection
-            .exec(indoc! {"
-                CREATE TABLE test_table (
-                    test_column INTEGER
-                );"})
-            .unwrap()()
-        .unwrap();
-        connection
-            .exec(indoc! {"
-            INSERT INTO test_table (test_column) VALUES (1);"})
-            .unwrap()()
-        .unwrap();
-
-        assert_eq!(
-            connection
-                .select_row::<usize>("SELECT * FROM test_table")
-                .unwrap()()
-            .unwrap(),
-            Some(1)
-        );
-
-        // Run the migration verifying that the row got dropped
-        connection
-            .migrate(
-                "test",
-                &["DELETE FROM test_table"],
-                disallow_migration_change,
-            )
-            .unwrap();
-        assert_eq!(
-            connection
-                .select_row::<usize>("SELECT * FROM test_table")
-                .unwrap()()
-            .unwrap(),
-            None
-        );
-
-        // Recreate the dropped row
-        connection
-            .exec("INSERT INTO test_table (test_column) VALUES (2)")
-            .unwrap()()
-        .unwrap();
-
-        // Run the same migration again and verify that the table was left unchanged
-        connection
-            .migrate(
-                "test",
-                &["DELETE FROM test_table"],
-                disallow_migration_change,
-            )
-            .unwrap();
-        assert_eq!(
-            connection
-                .select_row::<usize>("SELECT * FROM test_table")
-                .unwrap()()
-            .unwrap(),
-            Some(2)
-        );
-    }
-
-    #[test]
-    fn changed_migration_fails() {
-        let connection = Connection::open_memory(Some("changed_migration_fails"));
-
-        // Create a migration with two steps and run it
-        connection
-            .migrate(
-                "test migration",
-                &[
-                    "CREATE TABLE test (col INTEGER)",
-                    "INSERT INTO test (col) VALUES (1)",
-                ],
-                disallow_migration_change,
-            )
-            .unwrap();
-
-        let mut migration_changed = false;
-
-        // Create another migration with the same domain but different steps
-        let second_migration_result = connection.migrate(
-            "test migration",
-            &[
-                "CREATE TABLE test (color INTEGER )",
-                "INSERT INTO test (color) VALUES (1)",
-            ],
-            |_, old, new| {
-                assert_eq!(old, "CREATE TABLE test (col INTEGER)");
-                assert_eq!(new, "CREATE TABLE test (color INTEGER)");
-                migration_changed = true;
-                false
-            },
-        );
-
-        // Verify new migration returns error when run
-        assert!(second_migration_result.is_err())
-    }
-
-    #[test]
-    fn test_create_alter_drop() {
-        let connection = Connection::open_memory(Some("test_create_alter_drop"));
-
-        connection
-            .migrate(
-                "first_migration",
-                &["CREATE TABLE table1(a TEXT) STRICT;"],
-                disallow_migration_change,
-            )
-            .unwrap();
-
-        connection
-            .exec("INSERT INTO table1(a) VALUES (\"test text\");")
-            .unwrap()()
-        .unwrap();
-
-        connection
-            .migrate(
-                "second_migration",
-                &[indoc! {"
-                    CREATE TABLE table2(b TEXT) STRICT;
-
-                    INSERT INTO table2 (b)
-                    SELECT a FROM table1;
-
-                    DROP TABLE table1;
-
-                    ALTER TABLE table2 RENAME TO table1;
-                "}],
-                disallow_migration_change,
-            )
-            .unwrap();
-
-        let res = &connection.select::<String>("SELECT b FROM table1").unwrap()().unwrap()[0];
-
-        assert_eq!(res, "test text");
-    }
-
-    fn disallow_migration_change(_: usize, _: &str, _: &str) -> bool {
-        false
-    }
-}
diff --git a/crates/sqlez/src/savepoint.rs b/crates/sqlez/src/savepoint.rs
deleted file mode 100644
index 3177cea39f..0000000000
--- a/crates/sqlez/src/savepoint.rs
+++ /dev/null
@@ -1,150 +0,0 @@
-use anyhow::Result;
-use indoc::formatdoc;
-
-use crate::connection::Connection;
-
-impl Connection {
-    // Run a set of commands within the context of a `SAVEPOINT name`. If the callback
-    // returns Err(_), the savepoint will be rolled back. Otherwise, the save
-    // point is released.
-    pub fn with_savepoint<R, F>(&self, name: impl AsRef<str>, f: F) -> Result<R>
-    where
-        F: FnOnce() -> Result<R>,
-    {
-        let name = name.as_ref();
-        self.exec(&format!("SAVEPOINT {name}"))?()?;
-        let result = f();
-        match result {
-            Ok(_) => {
-                self.exec(&format!("RELEASE {name}"))?()?;
-            }
-            Err(_) => {
-                self.exec(&formatdoc! {"
-                    ROLLBACK TO {name};
-                    RELEASE {name}"})?()?;
-            }
-        }
-        result
-    }
-
-    // Run a set of commands within the context of a `SAVEPOINT name`. If the callback
-    // returns Ok(None) or Err(_), the savepoint will be rolled back. Otherwise, the save
-    // point is released.
-    pub fn with_savepoint_rollback<R, F>(&self, name: impl AsRef<str>, f: F) -> Result<Option<R>>
-    where
-        F: FnOnce() -> Result<Option<R>>,
-    {
-        let name = name.as_ref();
-        self.exec(&format!("SAVEPOINT {name}"))?()?;
-        let result = f();
-        match result {
-            Ok(Some(_)) => {
-                self.exec(&format!("RELEASE {name}"))?()?;
-            }
-            Ok(None) | Err(_) => {
-                self.exec(&formatdoc! {"
-                    ROLLBACK TO {name};
-                    RELEASE {name}"})?()?;
-            }
-        }
-        result
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::connection::Connection;
-    use anyhow::Result;
-    use indoc::indoc;
-
-    #[test]
-    fn test_nested_savepoints() -> Result<()> {
-        let connection = Connection::open_memory(Some("nested_savepoints"));
-
-        connection
-            .exec(indoc! {"
-            CREATE TABLE text (
-                text TEXT,
-                idx INTEGER
-            );"})
-            .unwrap()()
-        .unwrap();
-
-        let save1_text = "test save1";
-        let save2_text = "test save2";
-
-        connection.with_savepoint("first", || {
-            connection.exec_bound("INSERT INTO text(text, idx) VALUES (?, ?)")?((save1_text, 1))?;
-
-            assert!(
-                connection
-                    .with_savepoint("second", || -> anyhow::Result<Option<()>> {
-                        connection.exec_bound("INSERT INTO text(text, idx) VALUES (?, ?)")?((
-                            save2_text, 2,
-                        ))?;
-
-                        assert_eq!(
-                            connection
-                                .select::<String>("SELECT text FROM text ORDER BY text.idx ASC")?(
-                            )?,
-                            vec![save1_text, save2_text],
-                        );
-
-                        anyhow::bail!("Failed second save point :(")
-                    })
-                    .err()
-                    .is_some()
-            );
-
-            assert_eq!(
-                connection.select::<String>("SELECT text FROM text ORDER BY text.idx ASC")?()?,
-                vec![save1_text],
-            );
-
-            connection.with_savepoint_rollback::<(), _>("second", || {
-                connection.exec_bound("INSERT INTO text(text, idx) VALUES (?, ?)")?((
-                    save2_text, 2,
-                ))?;
-
-                assert_eq!(
-                    connection.select::<String>("SELECT text FROM text ORDER BY text.idx ASC")?()?,
-                    vec![save1_text, save2_text],
-                );
-
-                Ok(None)
-            })?;
-
-            assert_eq!(
-                connection.select::<String>("SELECT text FROM text ORDER BY text.idx ASC")?()?,
-                vec![save1_text],
-            );
-
-            connection.with_savepoint_rollback("second", || {
-                connection.exec_bound("INSERT INTO text(text, idx) VALUES (?, ?)")?((
-                    save2_text, 2,
-                ))?;
-
-                assert_eq!(
-                    connection.select::<String>("SELECT text FROM text ORDER BY text.idx ASC")?()?,
-                    vec![save1_text, save2_text],
-                );
-
-                Ok(Some(()))
-            })?;
-
-            assert_eq!(
-                connection.select::<String>("SELECT text FROM text ORDER BY text.idx ASC")?()?,
-                vec![save1_text, save2_text],
-            );
-
-            Ok(())
-        })?;
-
-        assert_eq!(
-            connection.select::<String>("SELECT text FROM text ORDER BY text.idx ASC")?()?,
-            vec![save1_text, save2_text],
-        );
-
-        Ok(())
-    }
-}
diff --git a/crates/sqlez/src/statement.rs b/crates/sqlez/src/statement.rs
deleted file mode 100644
index d08e58a6f9..0000000000
--- a/crates/sqlez/src/statement.rs
+++ /dev/null
@@ -1,497 +0,0 @@
-use std::ffi::{CStr, CString, c_int};
-use std::marker::PhantomData;
-use std::{ptr, slice, str};
-
-use anyhow::{Context as _, Result, bail};
-use libsqlite3_sys::*;
-
-use crate::bindable::{Bind, Column};
-use crate::connection::Connection;
-
-pub struct Statement<'a> {
-    /// vector of pointers to the raw SQLite statement objects.
-    /// it holds the actual prepared statements that will be executed.
-    pub raw_statements: Vec<*mut sqlite3_stmt>,
-    /// Index of the current statement being executed from the `raw_statements` vector.
-    current_statement: usize,
-    /// A reference to the database connection.
-    /// This is used to execute the statements and check for errors.
-    connection: &'a Connection,
-    ///Indicates that the `Statement` struct is tied to the lifetime of the SQLite statement
-    phantom: PhantomData<sqlite3_stmt>,
-}
-
-#[derive(Clone, Copy, PartialEq, Eq, Debug)]
-pub enum StepResult {
-    Row,
-    Done,
-}
-
-#[derive(Clone, Copy, PartialEq, Eq, Debug)]
-pub enum SqlType {
-    Text,
-    Integer,
-    Blob,
-    Float,
-    Null,
-}
-
-impl<'a> Statement<'a> {
-    pub fn prepare<T: AsRef<str>>(connection: &'a Connection, query: T) -> Result<Self> {
-        let mut statement = Self {
-            raw_statements: Default::default(),
-            current_statement: 0,
-            connection,
-            phantom: PhantomData,
-        };
-        let sql = CString::new(query.as_ref()).context("Error creating cstr")?;
-        let mut remaining_sql = sql.as_c_str();
-        while {
-            let remaining_sql_str = remaining_sql
-                .to_str()
-                .context("Parsing remaining sql")?
-                .trim();
-            remaining_sql_str != ";" && !remaining_sql_str.is_empty()
-        } {
-            let mut raw_statement = ptr::null_mut::<sqlite3_stmt>();
-            let mut remaining_sql_ptr = ptr::null();
-            unsafe {
-                sqlite3_prepare_v2(
-                    connection.sqlite3,
-                    remaining_sql.as_ptr(),
-                    -1,
-                    &mut raw_statement,
-                    &mut remaining_sql_ptr,
-                )
-            };
-
-            connection
-                .last_error()
-                .with_context(|| format!("Prepare call failed for query:\n{}", query.as_ref()))?;
-
-            remaining_sql = unsafe { CStr::from_ptr(remaining_sql_ptr) };
-            statement.raw_statements.push(raw_statement);
-
-            if !connection.can_write() && unsafe { sqlite3_stmt_readonly(raw_statement) == 0 } {
-                let sql = unsafe { CStr::from_ptr(sqlite3_sql(raw_statement)) };
-
-                bail!(
-                    "Write statement prepared with connection that is not write capable. SQL:\n{} ",
-                    sql.to_str()?
-                )
-            }
-        }
-
-        Ok(statement)
-    }
-
-    fn current_statement(&self) -> *mut sqlite3_stmt {
-        *self.raw_statements.get(self.current_statement).unwrap()
-    }
-
-    pub fn reset(&mut self) {
-        unsafe {
-            for raw_statement in self.raw_statements.iter() {
-                sqlite3_reset(*raw_statement);
-            }
-        }
-        self.current_statement = 0;
-    }
-
-    pub fn parameter_count(&self) -> i32 {
-        unsafe {
-            self.raw_statements
-                .iter()
-                .map(|raw_statement| sqlite3_bind_parameter_count(*raw_statement))
-                .max()
-                .unwrap_or(0)
-        }
-    }
-
-    fn bind_index_with(&self, index: i32, bind: impl Fn(&*mut sqlite3_stmt)) -> Result<()> {
-        let mut any_succeed = false;
-        unsafe {
-            for raw_statement in self.raw_statements.iter() {
-                if index <= sqlite3_bind_parameter_count(*raw_statement) {
-                    bind(raw_statement);
-                    self.connection
-                        .last_error()
-                        .with_context(|| format!("Failed to bind value at index {index}"))?;
-                    any_succeed = true;
-                } else {
-                    continue;
-                }
-            }
-        }
-        if any_succeed {
-            Ok(())
-        } else {
-            anyhow::bail!("Failed to bind parameters")
-        }
-    }
-
-    pub fn bind_blob(&self, index: i32, blob: &[u8]) -> Result<()> {
-        let index = index as c_int;
-        let blob_pointer = blob.as_ptr() as *const _;
-        let len = blob.len() as c_int;
-
-        self.bind_index_with(index, |raw_statement| unsafe {
-            sqlite3_bind_blob(*raw_statement, index, blob_pointer, len, SQLITE_TRANSIENT());
-        })
-    }
-
-    pub fn column_blob(&mut self, index: i32) -> Result<&[u8]> {
-        let index = index as c_int;
-        let pointer = unsafe { sqlite3_column_blob(self.current_statement(), index) };
-
-        self.connection
-            .last_error()
-            .with_context(|| format!("Failed to read blob at index {index}"))?;
-        if pointer.is_null() {
-            return Ok(&[]);
-        }
-        let len = unsafe { sqlite3_column_bytes(self.current_statement(), index) as usize };
-        self.connection
-            .last_error()
-            .with_context(|| format!("Failed to read length of blob at index {index}"))?;
-
-        unsafe { Ok(slice::from_raw_parts(pointer as *const u8, len)) }
-    }
-
-    pub fn bind_double(&self, index: i32, double: f64) -> Result<()> {
-        let index = index as c_int;
-
-        self.bind_index_with(index, |raw_statement| unsafe {
-            sqlite3_bind_double(*raw_statement, index, double);
-        })
-    }
-
-    pub fn column_double(&self, index: i32) -> Result<f64> {
-        let index = index as c_int;
-        let result = unsafe { sqlite3_column_double(self.current_statement(), index) };
-        self.connection
-            .last_error()
-            .with_context(|| format!("Failed to read double at index {index}"))?;
-        Ok(result)
-    }
-
-    pub fn bind_int(&self, index: i32, int: i32) -> Result<()> {
-        let index = index as c_int;
-        self.bind_index_with(index, |raw_statement| unsafe {
-            sqlite3_bind_int(*raw_statement, index, int);
-        })
-    }
-
-    pub fn column_int(&self, index: i32) -> Result<i32> {
-        let index = index as c_int;
-        let result = unsafe { sqlite3_column_int(self.current_statement(), index) };
-        self.connection
-            .last_error()
-            .with_context(|| format!("Failed to read int at index {index}"))?;
-        Ok(result)
-    }
-
-    pub fn bind_int64(&self, index: i32, int: i64) -> Result<()> {
-        let index = index as c_int;
-        self.bind_index_with(index, |raw_statement| unsafe {
-            sqlite3_bind_int64(*raw_statement, index, int);
-        })
-    }
-
-    pub fn column_int64(&self, index: i32) -> Result<i64> {
-        let index = index as c_int;
-        let result = unsafe { sqlite3_column_int64(self.current_statement(), index) };
-        self.connection
-            .last_error()
-            .with_context(|| format!("Failed to read i64 at index {index}"))?;
-        Ok(result)
-    }
-
-    pub fn bind_null(&self, index: i32) -> Result<()> {
-        let index = index as c_int;
-        self.bind_index_with(index, |raw_statement| unsafe {
-            sqlite3_bind_null(*raw_statement, index);
-        })
-    }
-
-    pub fn bind_text(&self, index: i32, text: &str) -> Result<()> {
-        let index = index as c_int;
-        let text_pointer = text.as_ptr() as *const _;
-        let len = text.len() as c_int;
-
-        self.bind_index_with(index, |raw_statement| unsafe {
-            sqlite3_bind_text(*raw_statement, index, text_pointer, len, SQLITE_TRANSIENT());
-        })
-    }
-
-    pub fn column_text(&mut self, index: i32) -> Result<&str> {
-        let index = index as c_int;
-        let pointer = unsafe { sqlite3_column_text(self.current_statement(), index) };
-
-        self.connection
-            .last_error()
-            .with_context(|| format!("Failed to read text from column {index}"))?;
-        if pointer.is_null() {
-            return Ok("");
-        }
-        let len = unsafe { sqlite3_column_bytes(self.current_statement(), index) as usize };
-        self.connection
-            .last_error()
-            .with_context(|| format!("Failed to read text length at {index}"))?;
-
-        let slice = unsafe { slice::from_raw_parts(pointer, len) };
-        Ok(str::from_utf8(slice)?)
-    }
-
-    pub fn bind<T: Bind>(&self, value: &T, index: i32) -> Result<i32> {
-        debug_assert!(index > 0);
-        value.bind(self, index)
-    }
-
-    pub fn column<T: Column>(&mut self) -> Result<T> {
-        Ok(T::column(self, 0)?.0)
-    }
-
-    pub fn column_type(&mut self, index: i32) -> Result<SqlType> {
-        let result = unsafe { sqlite3_column_type(self.current_statement(), index) };
-        self.connection.last_error()?;
-        match result {
-            SQLITE_INTEGER => Ok(SqlType::Integer),
-            SQLITE_FLOAT => Ok(SqlType::Float),
-            SQLITE_TEXT => Ok(SqlType::Text),
-            SQLITE_BLOB => Ok(SqlType::Blob),
-            SQLITE_NULL => Ok(SqlType::Null),
-            _ => anyhow::bail!("Column type returned was incorrect"),
-        }
-    }
-
-    pub fn with_bindings(&mut self, bindings: &impl Bind) -> Result<&mut Self> {
-        self.bind(bindings, 1)?;
-        Ok(self)
-    }
-
-    fn step(&mut self) -> Result<StepResult> {
-        match unsafe { sqlite3_step(self.current_statement()) } {
-            SQLITE_ROW => Ok(StepResult::Row),
-            SQLITE_DONE => {
-                if self.current_statement >= self.raw_statements.len() - 1 {
-                    Ok(StepResult::Done)
-                } else {
-                    self.current_statement += 1;
-                    self.step()
-                }
-            }
-            SQLITE_MISUSE => anyhow::bail!("Statement step returned SQLITE_MISUSE"),
-            _other_error => {
-                self.connection.last_error()?;
-                unreachable!("Step returned error code and last error failed to catch it");
-            }
-        }
-    }
-
-    pub fn exec(&mut self) -> Result<()> {
-        fn logic(this: &mut Statement) -> Result<()> {
-            while this.step()? == StepResult::Row {}
-            Ok(())
-        }
-        let result = logic(self);
-        self.reset();
-        result
-    }
-
-    pub fn map<R>(&mut self, callback: impl FnMut(&mut Statement) -> Result<R>) -> Result<Vec<R>> {
-        fn logic<R>(
-            this: &mut Statement,
-            mut callback: impl FnMut(&mut Statement) -> Result<R>,
-        ) -> Result<Vec<R>> {
-            let mut mapped_rows = Vec::new();
-            while this.step()? == StepResult::Row {
-                mapped_rows.push(callback(this)?);
-            }
-            Ok(mapped_rows)
-        }
-
-        let result = logic(self, callback);
-        self.reset();
-        result
-    }
-
-    pub fn rows<R: Column>(&mut self) -> Result<Vec<R>> {
-        self.map(|s| s.column::<R>())
-    }
-
-    pub fn single<R>(&mut self, callback: impl FnOnce(&mut Statement) -> Result<R>) -> Result<R> {
-        fn logic<R>(
-            this: &mut Statement,
-            callback: impl FnOnce(&mut Statement) -> Result<R>,
-        ) -> Result<R> {
-            println!("{:?}", std::any::type_name::<R>());
-            anyhow::ensure!(
-                this.step()? == StepResult::Row,
-                "single called with query that returns no rows."
-            );
-            let result = callback(this)?;
-
-            anyhow::ensure!(
-                this.step()? == StepResult::Done,
-                "single called with a query that returns more than one row."
-            );
-
-            Ok(result)
-        }
-        let result = logic(self, callback);
-        self.reset();
-        result
-    }
-
-    pub fn row<R: Column>(&mut self) -> Result<R> {
-        self.single(|this| this.column::<R>())
-    }
-
-    pub fn maybe<R>(
-        &mut self,
-        callback: impl FnOnce(&mut Statement) -> Result<R>,
-    ) -> Result<Option<R>> {
-        fn logic<R>(
-            this: &mut Statement,
-            callback: impl FnOnce(&mut Statement) -> Result<R>,
-        ) -> Result<Option<R>> {
-            if this.step().context("Failed on step call")? != StepResult::Row {
-                return Ok(None);
-            }
-
-            let result = callback(this)
-                .map(|r| Some(r))
-                .context("Failed to parse row result")?;
-
-            anyhow::ensure!(
-                this.step().context("Second step call")? == StepResult::Done,
-                "maybe called with a query that returns more than one row."
-            );
-
-            Ok(result)
-        }
-        let result = logic(self, callback);
-        self.reset();
-        result
-    }
-
-    pub fn maybe_row<R: Column>(&mut self) -> Result<Option<R>> {
-        self.maybe(|this| this.column::<R>())
-    }
-}
-
-impl Drop for Statement<'_> {
-    fn drop(&mut self) {
-        unsafe {
-            for raw_statement in self.raw_statements.iter() {
-                sqlite3_finalize(*raw_statement);
-            }
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use indoc::indoc;
-
-    use crate::{
-        connection::Connection,
-        statement::{Statement, StepResult},
-    };
-
-    #[test]
-    fn binding_multiple_statements_with_parameter_gaps() {
-        let connection =
-            Connection::open_memory(Some("binding_multiple_statements_with_parameter_gaps"));
-
-        connection
-            .exec(indoc! {"
-            CREATE TABLE test (
-                col INTEGER
-            )"})
-            .unwrap()()
-        .unwrap();
-
-        let statement = Statement::prepare(
-            &connection,
-            indoc! {"
-                INSERT INTO test(col) VALUES (?3);
-                SELECT * FROM test WHERE col = ?1"},
-        )
-        .unwrap();
-
-        statement
-            .bind_int(1, 1)
-            .expect("Could not bind parameter to first index");
-        statement
-            .bind_int(2, 2)
-            .expect("Could not bind parameter to second index");
-        statement
-            .bind_int(3, 3)
-            .expect("Could not bind parameter to third index");
-    }
-
-    #[test]
-    fn blob_round_trips() {
-        let connection1 = Connection::open_memory(Some("blob_round_trips"));
-        connection1
-            .exec(indoc! {"
-                CREATE TABLE blobs (
-                    data BLOB
-                )"})
-            .unwrap()()
-        .unwrap();
-
-        let blob = &[0, 1, 2, 4, 8, 16, 32, 64];
-
-        let mut write =
-            Statement::prepare(&connection1, "INSERT INTO blobs (data) VALUES (?)").unwrap();
-        write.bind_blob(1, blob).unwrap();
-        assert_eq!(write.step().unwrap(), StepResult::Done);
-
-        // Read the blob from the
-        let connection2 = Connection::open_memory(Some("blob_round_trips"));
-        let mut read = Statement::prepare(&connection2, "SELECT * FROM blobs").unwrap();
-        assert_eq!(read.step().unwrap(), StepResult::Row);
-        assert_eq!(read.column_blob(0).unwrap(), blob);
-        assert_eq!(read.step().unwrap(), StepResult::Done);
-
-        // Delete the added blob and verify its deleted on the other side
-        connection2.exec("DELETE FROM blobs").unwrap()().unwrap();
-        let mut read = Statement::prepare(&connection1, "SELECT * FROM blobs").unwrap();
-        assert_eq!(read.step().unwrap(), StepResult::Done);
-    }
-
-    #[test]
-    pub fn maybe_returns_options() {
-        let connection = Connection::open_memory(Some("maybe_returns_options"));
-        connection
-            .exec(indoc! {"
-                CREATE TABLE texts (
-                    text TEXT
-                )"})
-            .unwrap()()
-        .unwrap();
-
-        assert!(
-            connection
-                .select_row::<String>("SELECT text FROM texts")
-                .unwrap()()
-            .unwrap()
-            .is_none()
-        );
-
-        let text_to_insert = "This is a test";
-
-        connection
-            .exec_bound("INSERT INTO texts VALUES (?)")
-            .unwrap()(text_to_insert)
-        .unwrap();
-
-        assert_eq!(
-            connection.select_row("SELECT text FROM texts").unwrap()().unwrap(),
-            Some(text_to_insert.to_string())
-        );
-    }
-}
diff --git a/crates/sqlez/src/thread_safe_connection.rs b/crates/sqlez/src/thread_safe_connection.rs
deleted file mode 100644
index 966f14a9c2..0000000000
--- a/crates/sqlez/src/thread_safe_connection.rs
+++ /dev/null
@@ -1,355 +0,0 @@
-use anyhow::Context as _;
-use collections::HashMap;
-use futures::{Future, FutureExt, channel::oneshot};
-use parking_lot::{Mutex, RwLock};
-use std::{
-    marker::PhantomData,
-    ops::Deref,
-    sync::{Arc, LazyLock},
-    thread,
-};
-use thread_local::ThreadLocal;
-
-use crate::{connection::Connection, domain::Migrator, util::UnboundedSyncSender};
-
-const MIGRATION_RETRIES: usize = 10;
-
-type QueuedWrite = Box<dyn 'static + Send + FnOnce()>;
-type WriteQueue = Box<dyn 'static + Send + Sync + Fn(QueuedWrite)>;
-type WriteQueueConstructor = Box<dyn 'static + Send + FnMut() -> WriteQueue>;
-
-/// List of queues of tasks by database uri. This lets us serialize writes to the database
-/// and have a single worker thread per db file. This means many thread safe connections
-/// (possibly with different migrations) could all be communicating with the same background
-/// thread.
-static QUEUES: LazyLock<RwLock<HashMap<Arc<str>, WriteQueue>>> = LazyLock::new(Default::default);
-
-/// Thread safe connection to a given database file or in memory db. This can be cloned, shared, static,
-/// whatever. It derefs to a synchronous connection by thread that is read only. A write capable connection
-/// may be accessed by passing a callback to the `write` function which will queue the callback
-#[derive(Clone)]
-pub struct ThreadSafeConnection {
-    uri: Arc<str>,
-    persistent: bool,
-    connection_initialize_query: Option<&'static str>,
-    connections: Arc<ThreadLocal<Connection>>,
-}
-
-unsafe impl Send for ThreadSafeConnection {}
-unsafe impl Sync for ThreadSafeConnection {}
-
-pub struct ThreadSafeConnectionBuilder<M: Migrator + 'static = ()> {
-    db_initialize_query: Option<&'static str>,
-    write_queue_constructor: Option<WriteQueueConstructor>,
-    connection: ThreadSafeConnection,
-    _migrator: PhantomData<*mut M>,
-}
-
-impl<M: Migrator> ThreadSafeConnectionBuilder<M> {
-    /// Sets the query to run every time a connection is opened. This must
-    /// be infallible (EG only use pragma statements) and not cause writes.
-    /// to the db or it will panic.
-    pub fn with_connection_initialize_query(mut self, initialize_query: &'static str) -> Self {
-        self.connection.connection_initialize_query = Some(initialize_query);
-        self
-    }
-
-    /// Queues an initialization query for the database file. This must be infallible
-    /// but may cause changes to the database file such as with `PRAGMA journal_mode`
-    pub fn with_db_initialization_query(mut self, initialize_query: &'static str) -> Self {
-        self.db_initialize_query = Some(initialize_query);
-        self
-    }
-
-    /// Specifies how the thread safe connection should serialize writes. If provided
-    /// the connection will call the write_queue_constructor for each database file in
-    /// this process. The constructor is responsible for setting up a background thread or
-    /// async task which handles queued writes with the provided connection.
-    pub fn with_write_queue_constructor(
-        mut self,
-        write_queue_constructor: WriteQueueConstructor,
-    ) -> Self {
-        self.write_queue_constructor = Some(write_queue_constructor);
-        self
-    }
-
-    pub async fn build(self) -> anyhow::Result<ThreadSafeConnection> {
-        self.connection
-            .initialize_queues(self.write_queue_constructor);
-
-        let db_initialize_query = self.db_initialize_query;
-
-        self.connection
-            .write(move |connection| {
-                if let Some(db_initialize_query) = db_initialize_query {
-                    connection.exec(db_initialize_query).with_context(|| {
-                        format!(
-                            "Db initialize query failed to execute: {}",
-                            db_initialize_query
-                        )
-                    })?()?;
-                }
-
-                // Retry failed migrations in case they were run in parallel from different
-                // processes. This gives a best attempt at migrating before bailing
-                let mut migration_result =
-                    anyhow::Result::<()>::Err(anyhow::anyhow!("Migration never run"));
-
-                let foreign_keys_enabled: bool =
-                    connection.select_row::<i32>("PRAGMA foreign_keys")?()
-                        .unwrap_or(None)
-                        .map(|enabled| enabled != 0)
-                        .unwrap_or(false);
-
-                connection.exec("PRAGMA foreign_keys = OFF;")?()?;
-
-                for _ in 0..MIGRATION_RETRIES {
-                    migration_result = connection
-                        .with_savepoint("thread_safe_multi_migration", || M::migrate(connection));
-
-                    if migration_result.is_ok() {
-                        break;
-                    }
-                }
-
-                if foreign_keys_enabled {
-                    connection.exec("PRAGMA foreign_keys = ON;")?()?;
-                }
-                migration_result
-            })
-            .await?;
-
-        Ok(self.connection)
-    }
-}
-
-impl ThreadSafeConnection {
-    fn initialize_queues(&self, write_queue_constructor: Option<WriteQueueConstructor>) -> bool {
-        if !QUEUES.read().contains_key(&self.uri) {
-            let mut queues = QUEUES.write();
-            if !queues.contains_key(&self.uri) {
-                let mut write_queue_constructor =
-                    write_queue_constructor.unwrap_or_else(background_thread_queue);
-                queues.insert(self.uri.clone(), write_queue_constructor());
-                return true;
-            }
-        }
-        false
-    }
-
-    pub fn builder<M: Migrator>(uri: &str, persistent: bool) -> ThreadSafeConnectionBuilder<M> {
-        ThreadSafeConnectionBuilder::<M> {
-            db_initialize_query: None,
-            write_queue_constructor: None,
-            connection: Self {
-                uri: Arc::from(uri),
-                persistent,
-                connection_initialize_query: None,
-                connections: Default::default(),
-            },
-            _migrator: PhantomData,
-        }
-    }
-
-    /// Opens a new db connection with the initialized file path. This is internal and only
-    /// called from the deref function.
-    fn open_file(uri: &str) -> Connection {
-        Connection::open_file(uri)
-    }
-
-    /// Opens a shared memory connection using the file path as the identifier. This is internal
-    /// and only called from the deref function.
-    fn open_shared_memory(uri: &str) -> Connection {
-        Connection::open_memory(Some(uri))
-    }
-
-    pub fn write<T: 'static + Send + Sync>(
-        &self,
-        callback: impl 'static + Send + FnOnce(&Connection) -> T,
-    ) -> impl Future<Output = T> {
-        // Check and invalidate queue and maybe recreate queue
-        let queues = QUEUES.read();
-        let write_channel = queues
-            .get(&self.uri)
-            .expect("Queues are inserted when build is called. This should always succeed");
-
-        // Create a one shot channel for the result of the queued write
-        // so we can await on the result
-        let (sender, receiver) = oneshot::channel();
-
-        let thread_safe_connection = (*self).clone();
-        write_channel(Box::new(move || {
-            let connection = thread_safe_connection.deref();
-            let result = connection.with_write(|connection| callback(connection));
-            sender.send(result).ok();
-        }));
-        receiver.map(|response| response.expect("Write queue unexpectedly closed"))
-    }
-
-    pub(crate) fn create_connection(
-        persistent: bool,
-        uri: &str,
-        connection_initialize_query: Option<&'static str>,
-    ) -> Connection {
-        let mut connection = if persistent {
-            Self::open_file(uri)
-        } else {
-            Self::open_shared_memory(uri)
-        };
-
-        // Disallow writes on the connection. The only writes allowed for thread safe connections
-        // are from the background thread that can serialize them.
-        *connection.write.get_mut() = false;
-
-        if let Some(initialize_query) = connection_initialize_query {
-            connection.exec(initialize_query).unwrap_or_else(|_| {
-                panic!("Initialize query failed to execute: {}", initialize_query)
-            })()
-            .unwrap()
-        }
-
-        connection
-    }
-}
-
-impl ThreadSafeConnection {
-    /// Special constructor for ThreadSafeConnection which disallows db initialization and migrations.
-    /// This allows construction to be infallible and not write to the db.
-    pub fn new(
-        uri: &str,
-        persistent: bool,
-        connection_initialize_query: Option<&'static str>,
-        write_queue_constructor: Option<WriteQueueConstructor>,
-    ) -> Self {
-        let connection = Self {
-            uri: Arc::from(uri),
-            persistent,
-            connection_initialize_query,
-            connections: Default::default(),
-        };
-
-        connection.initialize_queues(write_queue_constructor);
-        connection
-    }
-}
-
-impl Deref for ThreadSafeConnection {
-    type Target = Connection;
-
-    fn deref(&self) -> &Self::Target {
-        self.connections.get_or(|| {
-            Self::create_connection(self.persistent, &self.uri, self.connection_initialize_query)
-        })
-    }
-}
-
-pub fn background_thread_queue() -> WriteQueueConstructor {
-    use std::sync::mpsc::channel;
-
-    Box::new(|| {
-        let (sender, receiver) = channel::<QueuedWrite>();
-
-        thread::Builder::new()
-            .name("sqlezWorker".to_string())
-            .spawn(move || {
-                while let Ok(write) = receiver.recv() {
-                    write()
-                }
-            })
-            .unwrap();
-
-        let sender = UnboundedSyncSender::new(sender);
-        Box::new(move |queued_write| {
-            sender
-                .send(queued_write)
-                .expect("Could not send write action to background thread");
-        })
-    })
-}
-
-pub fn locking_queue() -> WriteQueueConstructor {
-    Box::new(|| {
-        let write_mutex = Mutex::new(());
-        Box::new(move |queued_write| {
-            let _lock = write_mutex.lock();
-            queued_write();
-        })
-    })
-}
-
-#[cfg(test)]
-mod test {
-    use indoc::indoc;
-    use std::ops::Deref;
-
-    use std::thread;
-
-    use crate::{domain::Domain, thread_safe_connection::ThreadSafeConnection};
-
-    #[test]
-    fn many_initialize_and_migrate_queries_at_once() {
-        let mut handles = vec![];
-
-        enum TestDomain {}
-        impl Domain for TestDomain {
-            const NAME: &str = "test";
-            const MIGRATIONS: &[&str] = &["CREATE TABLE test(col1 TEXT, col2 TEXT) STRICT;"];
-        }
-
-        for _ in 0..100 {
-            handles.push(thread::spawn(|| {
-                let builder =
-                    ThreadSafeConnection::builder::<TestDomain>("annoying-test.db", false)
-                        .with_db_initialization_query("PRAGMA journal_mode=WAL")
-                        .with_connection_initialize_query(indoc! {"
-                                PRAGMA synchronous=NORMAL;
-                                PRAGMA busy_timeout=1;
-                                PRAGMA foreign_keys=TRUE;
-                                PRAGMA case_sensitive_like=TRUE;
-                            "});
-
-                let _ = smol::block_on(builder.build()).unwrap().deref();
-            }));
-        }
-
-        for handle in handles {
-            let _ = handle.join();
-        }
-    }
-
-    #[test]
-    #[should_panic]
-    fn wild_zed_lost_failure() {
-        enum TestWorkspace {}
-        impl Domain for TestWorkspace {
-            const NAME: &str = "workspace";
-
-            const MIGRATIONS: &[&str] = &["
-                    CREATE TABLE workspaces(
-                        workspace_id INTEGER PRIMARY KEY,
-                        dock_visible INTEGER, -- Boolean
-                        dock_anchor TEXT, -- Enum: 'Bottom' / 'Right' / 'Expanded'
-                        dock_pane INTEGER, -- NULL indicates that we don't have a dock pane yet
-                        timestamp TEXT DEFAULT CURRENT_TIMESTAMP NOT NULL,
-                        FOREIGN KEY(dock_pane) REFERENCES panes(pane_id),
-                        FOREIGN KEY(active_pane) REFERENCES panes(pane_id)
-                    ) STRICT;
-
-                    CREATE TABLE panes(
-                        pane_id INTEGER PRIMARY KEY,
-                        workspace_id INTEGER NOT NULL,
-                        active INTEGER NOT NULL, -- Boolean
-                        FOREIGN KEY(workspace_id) REFERENCES workspaces(workspace_id)
-                            ON DELETE CASCADE
-                            ON UPDATE CASCADE
-                    ) STRICT;
-                "];
-        }
-
-        let builder =
-            ThreadSafeConnection::builder::<TestWorkspace>("wild_zed_lost_failure", false)
-                .with_connection_initialize_query("PRAGMA FOREIGN_KEYS=true");
-
-        smol::block_on(builder.build()).unwrap();
-    }
-}
diff --git a/crates/sqlez/src/typed_statements.rs b/crates/sqlez/src/typed_statements.rs
deleted file mode 100644
index e300a6e7d5..0000000000
--- a/crates/sqlez/src/typed_statements.rs
+++ /dev/null
@@ -1,96 +0,0 @@
-use anyhow::{Context as _, Result};
-
-use crate::{
-    bindable::{Bind, Column},
-    connection::Connection,
-    statement::Statement,
-};
-
-impl Connection {
-    /// Prepare a statement which has no bindings and returns nothing.
-    ///
-    /// Note: If there are multiple statements that depend upon each other
-    /// (such as those which make schema changes), preparation will fail.
-    /// Use a true migration instead.
-    pub fn exec<'a>(&'a self, query: &str) -> Result<impl 'a + FnMut() -> Result<()>> {
-        let mut statement = Statement::prepare(self, query)?;
-        Ok(move || statement.exec())
-    }
-
-    /// Prepare a statement which takes a binding, but returns nothing.
-    /// The bindings for a given invocation should be passed to the returned
-    /// closure
-    ///
-    /// Note: If there are multiple statements that depend upon each other
-    /// (such as those which make schema changes), preparation will fail.
-    /// Use a true migration instead.
-    pub fn exec_bound<'a, B: Bind>(
-        &'a self,
-        query: &str,
-    ) -> Result<impl 'a + FnMut(B) -> Result<()>> {
-        let mut statement = Statement::prepare(self, query)?;
-        Ok(move |bindings| statement.with_bindings(&bindings)?.exec())
-    }
-
-    /// Prepare a statement which has no bindings and returns a `Vec<C>`.
-    ///
-    /// Note: If there are multiple statements that depend upon each other
-    /// (such as those which make schema changes), preparation will fail.
-    /// Use a true migration instead.
-    pub fn select<'a, C: Column>(
-        &'a self,
-        query: &str,
-    ) -> Result<impl 'a + FnMut() -> Result<Vec<C>>> {
-        let mut statement = Statement::prepare(self, query)?;
-        Ok(move || statement.rows::<C>())
-    }
-
-    /// Prepare a statement which takes a binding and returns a `Vec<C>`.
-    ///
-    /// Note: If there are multiple statements that depend upon each other
-    /// (such as those which make schema changes), preparation will fail.
-    /// Use a true migration instead.
-    pub fn select_bound<'a, B: Bind, C: Column>(
-        &'a self,
-        query: &str,
-    ) -> Result<impl 'a + FnMut(B) -> Result<Vec<C>>> {
-        let mut statement = Statement::prepare(self, query)?;
-        Ok(move |bindings| statement.with_bindings(&bindings)?.rows::<C>())
-    }
-
-    /// Prepare a statement that selects a single row from the database.
-    /// Will return none if no rows are returned and will error if more than
-    /// 1 row
-    ///
-    /// Note: If there are multiple statements that depend upon each other
-    /// (such as those which make schema changes), preparation will fail.
-    /// Use a true migration instead.
-    pub fn select_row<'a, C: Column>(
-        &'a self,
-        query: &str,
-    ) -> Result<impl 'a + FnMut() -> Result<Option<C>>> {
-        let mut statement = Statement::prepare(self, query)?;
-        Ok(move || statement.maybe_row::<C>())
-    }
-
-    /// Prepare a statement which takes a binding and selects a single row
-    /// from the database. Will return none if no rows are returned and will
-    /// error if more than 1 row is returned.
-    ///
-    /// Note: If there are multiple statements that depend upon each other
-    /// (such as those which make schema changes), preparation will fail.
-    /// Use a true migration instead.
-    pub fn select_row_bound<'a, B: Bind, C: Column>(
-        &'a self,
-        query: &str,
-    ) -> Result<impl 'a + FnMut(B) -> Result<Option<C>>> {
-        let mut statement = Statement::prepare(self, query)?;
-        Ok(move |bindings| {
-            statement
-                .with_bindings(&bindings)
-                .context("Bindings failed")?
-                .maybe_row::<C>()
-                .context("Maybe row failed")
-        })
-    }
-}
diff --git a/crates/sqlez/src/util.rs b/crates/sqlez/src/util.rs
deleted file mode 100644
index 8be6d3f4e0..0000000000
--- a/crates/sqlez/src/util.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-use std::ops::Deref;
-use std::sync::mpsc::Sender;
-
-use parking_lot::Mutex;
-use thread_local::ThreadLocal;
-
-/// Unbounded standard library sender which is stored per thread to get around
-/// the lack of sync on the standard library version while still being unbounded
-/// Note: this locks on the cloneable sender, but its done once per thread, so it
-/// shouldn't result in too much contention
-pub struct UnboundedSyncSender<T: Send> {
-    cloneable_sender: Mutex<Sender<T>>,
-    local_senders: ThreadLocal<Sender<T>>,
-}
-
-impl<T: Send> UnboundedSyncSender<T> {
-    pub fn new(sender: Sender<T>) -> Self {
-        Self {
-            cloneable_sender: Mutex::new(sender),
-            local_senders: ThreadLocal::new(),
-        }
-    }
-}
-
-impl<T: Send> Deref for UnboundedSyncSender<T> {
-    type Target = Sender<T>;
-
-    fn deref(&self) -> &Self::Target {
-        self.local_senders
-            .get_or(|| self.cloneable_sender.lock().clone())
-    }
-}
diff --git a/crates/sqlez_macros/Cargo.toml b/crates/sqlez_macros/Cargo.toml
deleted file mode 100644
index cff96d0b89..0000000000
--- a/crates/sqlez_macros/Cargo.toml
+++ /dev/null
@@ -1,19 +0,0 @@
-[package]
-name = "sqlez_macros"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/sqlez_macros.rs"
-proc-macro = true
-doctest = false
-
-[dependencies]
-sqlez.workspace = true
-sqlformat.workspace = true
-syn.workspace = true
diff --git a/crates/sqlez_macros/LICENSE-GPL b/crates/sqlez_macros/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/sqlez_macros/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/sqlez_macros/src/sqlez_macros.rs b/crates/sqlez_macros/src/sqlez_macros.rs
deleted file mode 100644
index 5ddfe4cd87..0000000000
--- a/crates/sqlez_macros/src/sqlez_macros.rs
+++ /dev/null
@@ -1,102 +0,0 @@
-use proc_macro::{Delimiter, Span, TokenStream, TokenTree};
-use syn::Error;
-
-#[cfg(not(any(target_os = "linux", target_os = "freebsd")))]
-static SQLITE: std::sync::LazyLock<sqlez::thread_safe_connection::ThreadSafeConnection> =
-    std::sync::LazyLock::new(|| {
-        sqlez::thread_safe_connection::ThreadSafeConnection::new(
-            ":memory:",
-            false,
-            None,
-            Some(sqlez::thread_safe_connection::locking_queue()),
-        )
-    });
-
-#[proc_macro]
-pub fn sql(tokens: TokenStream) -> TokenStream {
-    let (spans, sql) = make_sql(tokens);
-
-    #[cfg(not(any(target_os = "linux", target_os = "freebsd")))]
-    let error = SQLITE.sql_has_syntax_error(sql.trim());
-
-    #[cfg(any(target_os = "linux", target_os = "freebsd"))]
-    let error: Option<(String, usize)> = None;
-
-    let formatted_sql = sqlformat::format(&sql, &sqlformat::QueryParams::None, Default::default());
-
-    if let Some((error, error_offset)) = error {
-        create_error(spans, error_offset, error, &formatted_sql)
-    } else {
-        format!("r#\"{}\"#", &formatted_sql).parse().unwrap()
-    }
-}
-
-fn create_error(
-    spans: Vec<(usize, Span)>,
-    error_offset: usize,
-    error: String,
-    formatted_sql: &String,
-) -> TokenStream {
-    let error_span = spans
-        .into_iter()
-        .skip_while(|(offset, _)| offset <= &error_offset)
-        .map(|(_, span)| span)
-        .next()
-        .unwrap_or_else(Span::call_site);
-    let error_text = format!("Sql Error: {}\nFor Query: {}", error, formatted_sql);
-    TokenStream::from(Error::new(error_span.into(), error_text).into_compile_error())
-}
-
-fn make_sql(tokens: TokenStream) -> (Vec<(usize, Span)>, String) {
-    let mut sql_tokens = vec![];
-    flatten_stream(tokens, &mut sql_tokens);
-    // Lookup of spans by offset at the end of the token
-    let mut spans: Vec<(usize, Span)> = Vec::new();
-    let mut sql = String::new();
-    for (token_text, span) in sql_tokens {
-        sql.push_str(&token_text);
-        spans.push((sql.len(), span));
-    }
-    (spans, sql)
-}
-
-/// This method exists to normalize the representation of groups
-/// to always include spaces between tokens. This is why we don't use the usual .to_string().
-/// This allows our token search in token_at_offset to resolve
-/// ambiguity of '(tokens)' vs. '( token )', due to sqlite requiring byte offsets
-fn flatten_stream(tokens: TokenStream, result: &mut Vec<(String, Span)>) {
-    for token_tree in tokens.into_iter() {
-        match token_tree {
-            TokenTree::Group(group) => {
-                // push open delimiter
-                result.push((open_delimiter(group.delimiter()), group.span()));
-                // recurse
-                flatten_stream(group.stream(), result);
-                // push close delimiter
-                result.push((close_delimiter(group.delimiter()), group.span()));
-            }
-            TokenTree::Ident(ident) => {
-                result.push((format!("{} ", ident), ident.span()));
-            }
-            leaf_tree => result.push((leaf_tree.to_string(), leaf_tree.span())),
-        }
-    }
-}
-
-fn open_delimiter(delimiter: Delimiter) -> String {
-    match delimiter {
-        Delimiter::Parenthesis => "( ".to_string(),
-        Delimiter::Brace => "[ ".to_string(),
-        Delimiter::Bracket => "{ ".to_string(),
-        Delimiter::None => "".to_string(),
-    }
-}
-
-fn close_delimiter(delimiter: Delimiter) -> String {
-    match delimiter {
-        Delimiter::Parenthesis => " ) ".to_string(),
-        Delimiter::Brace => " ] ".to_string(),
-        Delimiter::Bracket => " } ".to_string(),
-        Delimiter::None => "".to_string(),
-    }
-}
diff --git a/crates/story/Cargo.toml b/crates/story/Cargo.toml
deleted file mode 100644
index 798461402d..0000000000
--- a/crates/story/Cargo.toml
+++ /dev/null
@@ -1,17 +0,0 @@
-[package]
-name = "story"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lib]
-path = "src/story.rs"
-
-[lints]
-workspace = true
-
-[dependencies]
-gpui.workspace = true
-itertools.workspace = true
-smallvec.workspace = true
diff --git a/crates/story/LICENSE-GPL b/crates/story/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/story/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/story/src/story.rs b/crates/story/src/story.rs
deleted file mode 100644
index b59cb6fb99..0000000000
--- a/crates/story/src/story.rs
+++ /dev/null
@@ -1,209 +0,0 @@
-use gpui::{
-    AnyElement, App, Div, SharedString, Window, colors::DefaultColors, div, prelude::*, px, rems,
-};
-use itertools::Itertools;
-use smallvec::SmallVec;
-
-pub struct Story {}
-
-impl Story {
-    pub fn container(cx: &App) -> gpui::Stateful<Div> {
-        div()
-            .id("story_container")
-            .overflow_y_scroll()
-            .w_full()
-            .min_h_full()
-            .flex()
-            .flex_col()
-            .text_color(cx.default_colors().text)
-            .bg(cx.default_colors().background)
-    }
-
-    pub fn title(title: impl Into<SharedString>, cx: &App) -> impl Element {
-        div()
-            .text_xs()
-            .text_color(cx.default_colors().text)
-            .child(title.into())
-    }
-
-    pub fn title_for<T>(cx: &App) -> impl Element {
-        Self::title(std::any::type_name::<T>(), cx)
-    }
-
-    pub fn section(cx: &App) -> Div {
-        div()
-            .p_4()
-            .m_4()
-            .border_1()
-            .border_color(cx.default_colors().separator)
-    }
-
-    pub fn section_title(cx: &App) -> Div {
-        div().text_lg().text_color(cx.default_colors().text)
-    }
-
-    pub fn group(cx: &App) -> Div {
-        div().my_2().bg(cx.default_colors().container)
-    }
-
-    pub fn code_block(code: impl Into<SharedString>, cx: &App) -> Div {
-        div()
-            .size_full()
-            .p_2()
-            .max_w(rems(36.))
-            .bg(cx.default_colors().container)
-            .rounded_sm()
-            .text_sm()
-            .text_color(cx.default_colors().text)
-            .overflow_hidden()
-            .child(code.into())
-    }
-
-    pub fn divider(cx: &App) -> Div {
-        div().my_2().h(px(1.)).bg(cx.default_colors().separator)
-    }
-
-    pub fn description(description: impl Into<SharedString>, cx: &App) -> impl Element {
-        div()
-            .text_sm()
-            .text_color(cx.default_colors().text)
-            .min_w_96()
-            .child(description.into())
-    }
-
-    pub fn label(label: impl Into<SharedString>, cx: &App) -> impl Element {
-        div()
-            .text_xs()
-            .text_color(cx.default_colors().text)
-            .child(label.into())
-    }
-
-    /// Note: Not `ui::v_flex` as the `story` crate doesn't depend on the `ui` crate.
-    pub fn v_flex() -> Div {
-        div().flex().flex_col().gap_1()
-    }
-}
-
-#[derive(IntoElement)]
-pub struct StoryItem {
-    label: SharedString,
-    item: AnyElement,
-    description: Option<SharedString>,
-    usage: Option<SharedString>,
-}
-
-impl StoryItem {
-    pub fn new(label: impl Into<SharedString>, item: impl IntoElement) -> Self {
-        Self {
-            label: label.into(),
-            item: item.into_any_element(),
-            description: None,
-            usage: None,
-        }
-    }
-
-    pub fn description(mut self, description: impl Into<SharedString>) -> Self {
-        self.description = Some(description.into());
-        self
-    }
-
-    pub fn usage(mut self, code: impl Into<SharedString>) -> Self {
-        self.usage = Some(code.into());
-        self
-    }
-}
-
-impl RenderOnce for StoryItem {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let colors = cx.default_colors();
-
-        div()
-            .my_2()
-            .flex()
-            .gap_4()
-            .w_full()
-            .child(
-                Story::v_flex()
-                    .px_2()
-                    .w_1_2()
-                    .min_h_px()
-                    .child(Story::label(self.label, cx))
-                    .child(
-                        div()
-                            .rounded_sm()
-                            .bg(colors.background)
-                            .border_1()
-                            .border_color(colors.border)
-                            .py_1()
-                            .px_2()
-                            .overflow_hidden()
-                            .child(self.item),
-                    )
-                    .when_some(self.description, |this, description| {
-                        this.child(Story::description(description, cx))
-                    }),
-            )
-            .child(
-                Story::v_flex()
-                    .px_2()
-                    .flex_none()
-                    .w_1_2()
-                    .min_h_px()
-                    .when_some(self.usage, |this, usage| {
-                        this.child(Story::label("Example Usage", cx))
-                            .child(Story::code_block(usage, cx))
-                    }),
-            )
-    }
-}
-
-#[derive(IntoElement)]
-pub struct StorySection {
-    description: Option<SharedString>,
-    children: SmallVec<[AnyElement; 2]>,
-}
-
-impl Default for StorySection {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl StorySection {
-    pub fn new() -> Self {
-        Self {
-            description: None,
-            children: SmallVec::new(),
-        }
-    }
-
-    pub fn description(mut self, description: impl Into<SharedString>) -> Self {
-        self.description = Some(description.into());
-        self
-    }
-}
-
-impl RenderOnce for StorySection {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let children: SmallVec<[AnyElement; 2]> = SmallVec::from_iter(Itertools::intersperse_with(
-            self.children.into_iter(),
-            || Story::divider(cx).into_any_element(),
-        ));
-
-        Story::section(cx)
-            // Section title
-            .py_2()
-            // Section description
-            .when_some(self.description, |section, description| {
-                section.child(Story::description(description, cx))
-            })
-            .child(div().flex().flex_col().gap_2().children(children))
-            .child(Story::divider(cx))
-    }
-}
-
-impl ParentElement for StorySection {
-    fn extend(&mut self, elements: impl IntoIterator<Item = AnyElement>) {
-        self.children.extend(elements)
-    }
-}
diff --git a/crates/storybook/Cargo.toml b/crates/storybook/Cargo.toml
deleted file mode 100644
index 148f036134..0000000000
--- a/crates/storybook/Cargo.toml
+++ /dev/null
@@ -1,40 +0,0 @@
-[package]
-name = "storybook"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[[bin]]
-name = "storybook"
-path = "src/storybook.rs"
-
-[dependencies]
-anyhow.workspace = true
-clap = { workspace = true, features = ["derive", "string"] }
-collab_ui = { workspace = true, features = ["stories"] }
-ctrlc = "3.4"
-dialoguer = { version = "0.11.0", features = ["fuzzy-select"] }
-editor.workspace = true
-fuzzy.workspace = true
-gpui = { workspace = true, default-features = true }
-indoc.workspace = true
-language.workspace = true
-log.workspace = true
-menu.workspace = true
-picker.workspace = true
-reqwest_client.workspace = true
-rust-embed.workspace = true
-settings.workspace = true
-simplelog.workspace = true
-story.workspace = true
-strum = { workspace = true, features = ["derive"] }
-theme.workspace = true
-title_bar = { workspace = true, features = ["stories"] }
-ui = { workspace = true, features = ["stories"] }
-
-[dev-dependencies]
-gpui = { workspace = true, features = ["test-support"] }
diff --git a/crates/storybook/LICENSE-GPL b/crates/storybook/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/storybook/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/storybook/build.rs b/crates/storybook/build.rs
deleted file mode 100644
index 66791cae42..0000000000
--- a/crates/storybook/build.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-fn main() {
-    #[cfg(target_os = "windows")]
-    {
-        #[cfg(target_env = "msvc")]
-        {
-            println!("cargo:rustc-link-arg=/stack:{}", 8 * 1024 * 1024);
-        }
-    }
-}
diff --git a/crates/storybook/docs/thoughts.md b/crates/storybook/docs/thoughts.md
deleted file mode 100644
index cdeef621f3..0000000000
--- a/crates/storybook/docs/thoughts.md
+++ /dev/null
@@ -1,57 +0,0 @@
-Much of element styling is now handled by an external engine.
-
-How do I make an element hover.
-
-There's a hover style.
-
-Hoverable needs to wrap another element. That element can be styled.
-
-```rs
-struct Hoverable<E: Element> {
-
-}
-
-impl<V> Element<V> for Hoverable {
-
-}
-```
-
-```rs
-#[derive(Styled, Interactive)]
-pub struct Div {
-    declared_style: StyleRefinement,
-    interactions: Interactions
-}
-
-pub trait Styled {
-    fn declared_style(&mut self) -> &mut StyleRefinement;
-    fn compute_style(&mut self) -> Style {
-        Style::default().refine(self.declared_style())
-    }
-
-    // All the tailwind classes, modifying self.declared_style()
-}
-
-impl Style {
-    pub fn paint_background<V>(layout: Layout, cx: &mut PaintContext<V>);
-    pub fn paint_foreground<V>(layout: Layout, cx: &mut PaintContext<V>);
-}
-
-pub trait Interactive<V> {
-    fn interactions(&mut self) -> &mut Interactions<V>;
-
-    fn on_click(self, )
-}
-
-struct Interactions<V> {
-    click: SmallVec<[<Rc<dyn Fn(&mut V, &dyn Any, )>; 1]>,
-}
-```
-
-```rs
-trait Stylable {
-    type Style;
-
-    fn with_style(self, style: Self::Style) -> Self;
-}
-```
diff --git a/crates/storybook/src/actions.rs b/crates/storybook/src/actions.rs
deleted file mode 100644
index 03ee5b580c..0000000000
--- a/crates/storybook/src/actions.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-use gpui::actions;
-actions!(storybook, [Quit]);
diff --git a/crates/storybook/src/app_menus.rs b/crates/storybook/src/app_menus.rs
deleted file mode 100644
index 4e84b4c85d..0000000000
--- a/crates/storybook/src/app_menus.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-use gpui::{Menu, MenuItem};
-
-pub fn app_menus() -> Vec<Menu> {
-    use crate::actions::Quit;
-
-    vec![Menu {
-        name: "Storybook".into(),
-        items: vec![MenuItem::action("Quit", Quit)],
-    }]
-}
diff --git a/crates/storybook/src/assets.rs b/crates/storybook/src/assets.rs
deleted file mode 100644
index 4da4081212..0000000000
--- a/crates/storybook/src/assets.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-use std::borrow::Cow;
-
-use anyhow::{Context as _, Result};
-use gpui::{AssetSource, SharedString};
-use rust_embed::RustEmbed;
-
-#[derive(RustEmbed)]
-#[folder = "../../assets"]
-#[include = "fonts/**/*"]
-#[include = "icons/**/*"]
-#[include = "images/**/*"]
-#[include = "themes/**/*"]
-#[include = "sounds/**/*"]
-#[include = "*.md"]
-#[exclude = "*.DS_Store"]
-pub struct Assets;
-
-impl AssetSource for Assets {
-    fn load(&self, path: &str) -> Result<Option<Cow<'static, [u8]>>> {
-        Self::get(path)
-            .map(|f| f.data)
-            .with_context(|| format!("could not find asset at path {path:?}"))
-            .map(Some)
-    }
-
-    fn list(&self, path: &str) -> Result<Vec<SharedString>> {
-        Ok(Self::iter()
-            .filter(|p| p.starts_with(path))
-            .map(SharedString::from)
-            .collect())
-    }
-}
diff --git a/crates/storybook/src/stories.rs b/crates/storybook/src/stories.rs
deleted file mode 100644
index 63992d259c..0000000000
--- a/crates/storybook/src/stories.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-mod auto_height_editor;
-mod cursor;
-mod focus;
-mod indent_guides;
-mod kitchen_sink;
-mod overflow_scroll;
-mod picker;
-mod scroll;
-mod text;
-mod viewport_units;
-mod with_rem_size;
-
-pub use auto_height_editor::*;
-pub use cursor::*;
-pub use focus::*;
-pub use indent_guides::*;
-pub use kitchen_sink::*;
-pub use overflow_scroll::*;
-pub use picker::*;
-pub use scroll::*;
-pub use text::*;
-pub use viewport_units::*;
-pub use with_rem_size::*;
diff --git a/crates/storybook/src/stories/auto_height_editor.rs b/crates/storybook/src/stories/auto_height_editor.rs
deleted file mode 100644
index 702d5774f2..0000000000
--- a/crates/storybook/src/stories/auto_height_editor.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-use editor::Editor;
-use gpui::{
-    App, AppContext as _, Context, Entity, IntoElement, KeyBinding, ParentElement, Render, Styled,
-    Window, div, white,
-};
-
-pub struct AutoHeightEditorStory {
-    editor: Entity<Editor>,
-}
-
-impl AutoHeightEditorStory {
-    pub fn new(window: &mut Window, cx: &mut App) -> gpui::Entity<Self> {
-        cx.bind_keys([KeyBinding::new(
-            "enter",
-            editor::actions::Newline,
-            Some("Editor"),
-        )]);
-        cx.new(|cx| Self {
-            editor: cx.new(|cx| {
-                let mut editor = Editor::auto_height(1, 3, window, cx);
-                editor.set_soft_wrap_mode(language::language_settings::SoftWrap::EditorWidth, cx);
-                editor
-            }),
-        })
-    }
-}
-
-impl Render for AutoHeightEditorStory {
-    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
-        div()
-            .size_full()
-            .bg(white())
-            .text_sm()
-            .child(div().w_32().bg(gpui::black()).child(self.editor.clone()))
-    }
-}
diff --git a/crates/storybook/src/stories/cursor.rs b/crates/storybook/src/stories/cursor.rs
deleted file mode 100644
index 00bae99917..0000000000
--- a/crates/storybook/src/stories/cursor.rs
+++ /dev/null
@@ -1,109 +0,0 @@
-use gpui::{Div, Render, Stateful};
-use story::Story;
-use ui::prelude::*;
-
-pub struct CursorStory;
-
-impl Render for CursorStory {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let all_cursors: [(&str, Box<dyn Fn(Stateful<Div>) -> Stateful<Div>>); 19] = [
-            (
-                "cursor_default",
-                Box::new(|el: Stateful<Div>| el.cursor_default()),
-            ),
-            (
-                "cursor_pointer",
-                Box::new(|el: Stateful<Div>| el.cursor_pointer()),
-            ),
-            (
-                "cursor_text",
-                Box::new(|el: Stateful<Div>| el.cursor_text()),
-            ),
-            (
-                "cursor_move",
-                Box::new(|el: Stateful<Div>| el.cursor_move()),
-            ),
-            (
-                "cursor_not_allowed",
-                Box::new(|el: Stateful<Div>| el.cursor_not_allowed()),
-            ),
-            (
-                "cursor_context_menu",
-                Box::new(|el: Stateful<Div>| el.cursor_context_menu()),
-            ),
-            (
-                "cursor_crosshair",
-                Box::new(|el: Stateful<Div>| el.cursor_crosshair()),
-            ),
-            (
-                "cursor_vertical_text",
-                Box::new(|el: Stateful<Div>| el.cursor_vertical_text()),
-            ),
-            (
-                "cursor_alias",
-                Box::new(|el: Stateful<Div>| el.cursor_alias()),
-            ),
-            (
-                "cursor_copy",
-                Box::new(|el: Stateful<Div>| el.cursor_copy()),
-            ),
-            (
-                "cursor_no_drop",
-                Box::new(|el: Stateful<Div>| el.cursor_no_drop()),
-            ),
-            (
-                "cursor_grab",
-                Box::new(|el: Stateful<Div>| el.cursor_grab()),
-            ),
-            (
-                "cursor_grabbing",
-                Box::new(|el: Stateful<Div>| el.cursor_grabbing()),
-            ),
-            (
-                "cursor_col_resize",
-                Box::new(|el: Stateful<Div>| el.cursor_col_resize()),
-            ),
-            (
-                "cursor_row_resize",
-                Box::new(|el: Stateful<Div>| el.cursor_row_resize()),
-            ),
-            (
-                "cursor_n_resize",
-                Box::new(|el: Stateful<Div>| el.cursor_n_resize()),
-            ),
-            (
-                "cursor_e_resize",
-                Box::new(|el: Stateful<Div>| el.cursor_e_resize()),
-            ),
-            (
-                "cursor_s_resize",
-                Box::new(|el: Stateful<Div>| el.cursor_s_resize()),
-            ),
-            (
-                "cursor_w_resize",
-                Box::new(|el: Stateful<Div>| el.cursor_w_resize()),
-            ),
-        ];
-
-        Story::container(cx)
-            .flex()
-            .gap_1()
-            .child(Story::title("cursor", cx))
-            .children(all_cursors.map(|(name, apply_cursor)| {
-                div().gap_1().flex().text_color(gpui::white()).child(
-                    div()
-                        .flex()
-                        .items_center()
-                        .justify_center()
-                        .id(name)
-                        .map(apply_cursor)
-                        .w_64()
-                        .h_8()
-                        .bg(gpui::red())
-                        .active(|style| style.bg(gpui::green()))
-                        .text_sm()
-                        .child(Story::label(name, cx)),
-                )
-            }))
-    }
-}
diff --git a/crates/storybook/src/stories/focus.rs b/crates/storybook/src/stories/focus.rs
deleted file mode 100644
index a64c272ba7..0000000000
--- a/crates/storybook/src/stories/focus.rs
+++ /dev/null
@@ -1,123 +0,0 @@
-use gpui::{
-    App, Entity, FocusHandle, KeyBinding, Render, Subscription, Window, actions, div, prelude::*,
-};
-use ui::prelude::*;
-
-actions!(focus, [ActionA, ActionB, ActionC]);
-
-pub struct FocusStory {
-    parent_focus: FocusHandle,
-    child_1_focus: FocusHandle,
-    child_2_focus: FocusHandle,
-    _focus_subscriptions: Vec<Subscription>,
-}
-
-impl FocusStory {
-    pub fn model(window: &mut Window, cx: &mut App) -> Entity<Self> {
-        cx.bind_keys([
-            KeyBinding::new("cmd-a", ActionA, Some("parent")),
-            KeyBinding::new("cmd-a", ActionB, Some("child-1")),
-            KeyBinding::new("cmd-c", ActionC, None),
-        ]);
-
-        cx.new(|cx| {
-            let parent_focus = cx.focus_handle();
-            let child_1_focus = cx.focus_handle();
-            let child_2_focus = cx.focus_handle();
-            let _focus_subscriptions = vec![
-                cx.on_focus(&parent_focus, window, |_, _, _| {
-                    println!("Parent focused");
-                }),
-                cx.on_blur(&parent_focus, window, |_, _, _| {
-                    println!("Parent blurred");
-                }),
-                cx.on_focus(&child_1_focus, window, |_, _, _| {
-                    println!("Child 1 focused");
-                }),
-                cx.on_blur(&child_1_focus, window, |_, _, _| {
-                    println!("Child 1 blurred");
-                }),
-                cx.on_focus(&child_2_focus, window, |_, _, _| {
-                    println!("Child 2 focused");
-                }),
-                cx.on_blur(&child_2_focus, window, |_, _, _| {
-                    println!("Child 2 blurred");
-                }),
-            ];
-
-            Self {
-                parent_focus,
-                child_1_focus,
-                child_2_focus,
-                _focus_subscriptions,
-            }
-        })
-    }
-}
-
-impl Render for FocusStory {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let theme = cx.theme();
-        let color_1 = theme.status().created;
-        let color_2 = theme.status().modified;
-        let color_4 = theme.status().conflict;
-        let color_5 = theme.status().ignored;
-        let color_6 = theme.status().renamed;
-        let color_7 = theme.status().hint;
-
-        div()
-            .id("parent")
-            .active(|style| style.bg(color_7))
-            .track_focus(&self.parent_focus)
-            .key_context("parent")
-            .on_action(cx.listener(|_, _action: &ActionA, _window, _cx| {
-                println!("Action A dispatched on parent");
-            }))
-            .on_action(cx.listener(|_, _action: &ActionB, _window, _cx| {
-                println!("Action B dispatched on parent");
-            }))
-            .on_key_down(cx.listener(|_, event, _, _| println!("Key down on parent {:?}", event)))
-            .on_key_up(cx.listener(|_, event, _, _| println!("Key up on parent {:?}", event)))
-            .size_full()
-            .bg(color_1)
-            .focus(|style| style.bg(color_2))
-            .child(
-                div()
-                    .track_focus(&self.child_1_focus)
-                    .key_context("child-1")
-                    .on_action(cx.listener(|_, _action: &ActionB, _window, _cx| {
-                        println!("Action B dispatched on child 1 during");
-                    }))
-                    .w_full()
-                    .h_6()
-                    .bg(color_4)
-                    .focus(|style| style.bg(color_5))
-                    .in_focus(|style| style.bg(color_6))
-                    .on_key_down(
-                        cx.listener(|_, event, _, _| println!("Key down on child 1 {:?}", event)),
-                    )
-                    .on_key_up(
-                        cx.listener(|_, event, _, _| println!("Key up on child 1 {:?}", event)),
-                    )
-                    .child("Child 1"),
-            )
-            .child(
-                div()
-                    .track_focus(&self.child_2_focus)
-                    .key_context("child-2")
-                    .on_action(cx.listener(|_, _action: &ActionC, _window, _cx| {
-                        println!("Action C dispatched on child 2");
-                    }))
-                    .w_full()
-                    .h_6()
-                    .bg(color_4)
-                    .on_key_down(
-                        cx.listener(|_, event, _, _| println!("Key down on child 2 {:?}", event)),
-                    )
-                    .on_key_up(
-                        cx.listener(|_, event, _, _| println!("Key up on child 2 {:?}", event)),
-                    )
-                    .child("Child 2"),
-            )
-    }
-}
diff --git a/crates/storybook/src/stories/indent_guides.rs b/crates/storybook/src/stories/indent_guides.rs
deleted file mode 100644
index db23ea79bd..0000000000
--- a/crates/storybook/src/stories/indent_guides.rs
+++ /dev/null
@@ -1,82 +0,0 @@
-use std::ops::Range;
-
-use gpui::{Entity, Render, div, uniform_list};
-use gpui::{prelude::*, *};
-use ui::{AbsoluteLength, Color, DefiniteLength, Label, LabelCommon, px, v_flex};
-
-use story::Story;
-
-const LENGTH: usize = 100;
-
-pub struct IndentGuidesStory {
-    depths: Vec<usize>,
-}
-
-impl IndentGuidesStory {
-    pub fn model(_window: &mut Window, cx: &mut App) -> Entity<Self> {
-        let mut depths = Vec::new();
-        depths.push(0);
-        depths.push(1);
-        depths.push(2);
-        for _ in 0..LENGTH - 6 {
-            depths.push(3);
-        }
-        depths.push(2);
-        depths.push(1);
-        depths.push(0);
-
-        cx.new(|_cx| Self { depths })
-    }
-}
-
-impl Render for IndentGuidesStory {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        Story::container(cx)
-            .child(Story::title("Indent guides", cx))
-            .child(
-                v_flex().size_full().child(
-                    uniform_list(
-                        "some-list",
-                        self.depths.len(),
-                        cx.processor(move |this, range: Range<usize>, _window, _cx| {
-                            this.depths
-                                .iter()
-                                .enumerate()
-                                .skip(range.start)
-                                .take(range.end - range.start)
-                                .map(|(i, depth)| {
-                                    div()
-                                        .pl(DefiniteLength::Absolute(AbsoluteLength::Pixels(px(
-                                            16. * (*depth as f32),
-                                        ))))
-                                        .child(Label::new(format!("Item {}", i)).color(Color::Info))
-                                })
-                                .collect()
-                        }),
-                    )
-                    .with_sizing_behavior(gpui::ListSizingBehavior::Infer)
-                    .with_decoration(
-                        ui::indent_guides(
-                            px(16.),
-                            ui::IndentGuideColors {
-                                default: Color::Info.color(cx),
-                                hover: Color::Accent.color(cx),
-                                active: Color::Accent.color(cx),
-                            },
-                        )
-                        .with_compute_indents_fn(
-                            cx.entity(),
-                            |this, range, _cx, _context| {
-                                this.depths
-                                    .iter()
-                                    .skip(range.start)
-                                    .take(range.end - range.start)
-                                    .cloned()
-                                    .collect()
-                            },
-                        ),
-                    ),
-                ),
-            )
-    }
-}
diff --git a/crates/storybook/src/stories/kitchen_sink.rs b/crates/storybook/src/stories/kitchen_sink.rs
deleted file mode 100644
index aaddf733f8..0000000000
--- a/crates/storybook/src/stories/kitchen_sink.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-use gpui::{Entity, Render, prelude::*};
-use story::Story;
-use strum::IntoEnumIterator;
-use ui::prelude::*;
-
-use crate::story_selector::ComponentStory;
-
-pub struct KitchenSinkStory;
-
-impl KitchenSinkStory {
-    pub fn model(cx: &mut App) -> Entity<Self> {
-        cx.new(|_| Self)
-    }
-}
-
-impl Render for KitchenSinkStory {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let component_stories = ComponentStory::iter()
-            .map(|selector| selector.story(window, cx))
-            .collect::<Vec<_>>();
-
-        Story::container(cx)
-            .id("kitchen-sink")
-            .overflow_y_scroll()
-            .child(Story::title("Kitchen Sink", cx))
-            .child(Story::label("Components", cx))
-            .child(div().flex().flex_col().children(component_stories))
-            // Add a bit of space at the bottom of the kitchen sink so elements
-            // don't end up squished right up against the bottom of the screen.
-            .child(div().p_4())
-    }
-}
diff --git a/crates/storybook/src/stories/overflow_scroll.rs b/crates/storybook/src/stories/overflow_scroll.rs
deleted file mode 100644
index a9ba09d6a3..0000000000
--- a/crates/storybook/src/stories/overflow_scroll.rs
+++ /dev/null
@@ -1,41 +0,0 @@
-use gpui::Render;
-use story::Story;
-
-use ui::prelude::*;
-
-pub struct OverflowScrollStory;
-
-impl Render for OverflowScrollStory {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        Story::container(cx)
-            .child(Story::title("Overflow Scroll", cx))
-            .child(Story::label("`overflow_x_scroll`", cx))
-            .child(
-                h_flex()
-                    .id("overflow_x_scroll")
-                    .gap_2()
-                    .overflow_x_scroll()
-                    .children((0..100).map(|i| {
-                        div()
-                            .p_4()
-                            .debug_bg_cyan()
-                            .child(SharedString::from(format!("Child {}", i + 1)))
-                    })),
-            )
-            .child(Story::label("`overflow_y_scroll`", cx))
-            .child(
-                v_flex()
-                    .w_full()
-                    .flex_1()
-                    .id("overflow_y_scroll")
-                    .gap_2()
-                    .overflow_y_scroll()
-                    .children((0..100).map(|i| {
-                        div()
-                            .p_4()
-                            .debug_bg_green()
-                            .child(SharedString::from(format!("Child {}", i + 1)))
-                    })),
-            )
-    }
-}
diff --git a/crates/storybook/src/stories/picker.rs b/crates/storybook/src/stories/picker.rs
deleted file mode 100644
index d2d9a854a1..0000000000
--- a/crates/storybook/src/stories/picker.rs
+++ /dev/null
@@ -1,206 +0,0 @@
-use fuzzy::StringMatchCandidate;
-use gpui::{App, Entity, KeyBinding, Render, SharedString, Styled, Task, Window, div, prelude::*};
-use picker::{Picker, PickerDelegate};
-use std::sync::Arc;
-use ui::{Label, ListItem};
-use ui::{ListItemSpacing, prelude::*};
-
-pub struct PickerStory {
-    picker: Entity<Picker<Delegate>>,
-}
-
-struct Delegate {
-    candidates: Arc<[StringMatchCandidate]>,
-    matches: Vec<usize>,
-    selected_ix: usize,
-}
-
-impl Delegate {
-    fn new(strings: &[&str]) -> Self {
-        Self {
-            candidates: strings
-                .iter()
-                .copied()
-                .enumerate()
-                .map(|(id, string)| StringMatchCandidate::new(id, string))
-                .collect(),
-            matches: vec![],
-            selected_ix: 0,
-        }
-    }
-}
-
-impl PickerDelegate for Delegate {
-    type ListItem = ListItem;
-
-    fn match_count(&self) -> usize {
-        self.candidates.len()
-    }
-
-    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
-        "Test".into()
-    }
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        _window: &mut Window,
-        _cx: &mut Context<Picker<Self>>,
-    ) -> Option<Self::ListItem> {
-        let candidate_ix = self.matches.get(ix)?;
-        // TASK: Make StringMatchCandidate::string a SharedString
-        let candidate = SharedString::from(self.candidates[*candidate_ix].string.clone());
-
-        Some(
-            ListItem::new(ix)
-                .inset(true)
-                .spacing(ListItemSpacing::Sparse)
-                .toggle_state(selected)
-                .child(Label::new(candidate)),
-        )
-    }
-
-    fn selected_index(&self) -> usize {
-        self.selected_ix
-    }
-
-    fn set_selected_index(&mut self, ix: usize, _: &mut Window, cx: &mut Context<Picker<Self>>) {
-        self.selected_ix = ix;
-        cx.notify();
-    }
-
-    fn confirm(&mut self, secondary: bool, _window: &mut Window, _cx: &mut Context<Picker<Self>>) {
-        let candidate_ix = self.matches[self.selected_ix];
-        let candidate = self.candidates[candidate_ix].string.clone();
-
-        if secondary {
-            eprintln!("Secondary confirmed {}", candidate)
-        } else {
-            eprintln!("Confirmed {}", candidate)
-        }
-    }
-
-    fn dismissed(&mut self, _: &mut Window, cx: &mut Context<Picker<Self>>) {
-        cx.quit();
-    }
-
-    fn update_matches(
-        &mut self,
-        query: String,
-        _: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Task<()> {
-        let candidates = self.candidates.clone();
-        self.matches = cx
-            .background_executor()
-            .block(fuzzy::match_strings(
-                &candidates,
-                &query,
-                true,
-                true,
-                100,
-                &Default::default(),
-                cx.background_executor().clone(),
-            ))
-            .into_iter()
-            .map(|r| r.candidate_id)
-            .collect();
-        self.selected_ix = 0;
-        Task::ready(())
-    }
-}
-
-impl PickerStory {
-    pub fn new(window: &mut Window, cx: &mut App) -> Entity<Self> {
-        cx.new(|cx| {
-            cx.bind_keys([
-                KeyBinding::new("up", menu::SelectPrevious, Some("picker")),
-                KeyBinding::new("pageup", menu::SelectFirst, Some("picker")),
-                KeyBinding::new("shift-pageup", menu::SelectFirst, Some("picker")),
-                KeyBinding::new("ctrl-p", menu::SelectPrevious, Some("picker")),
-                KeyBinding::new("down", menu::SelectNext, Some("picker")),
-                KeyBinding::new("pagedown", menu::SelectLast, Some("picker")),
-                KeyBinding::new("shift-pagedown", menu::SelectFirst, Some("picker")),
-                KeyBinding::new("ctrl-n", menu::SelectNext, Some("picker")),
-                KeyBinding::new("cmd-up", menu::SelectFirst, Some("picker")),
-                KeyBinding::new("cmd-down", menu::SelectLast, Some("picker")),
-                KeyBinding::new("enter", menu::Confirm, Some("picker")),
-                KeyBinding::new("ctrl-enter", menu::SecondaryConfirm, Some("picker")),
-                KeyBinding::new("cmd-enter", menu::SecondaryConfirm, Some("picker")),
-                KeyBinding::new("escape", menu::Cancel, Some("picker")),
-                KeyBinding::new("ctrl-c", menu::Cancel, Some("picker")),
-            ]);
-
-            PickerStory {
-                picker: cx.new(|cx| {
-                    let mut delegate = Delegate::new(&[
-                        "Baguette (France)",
-                        "Baklava (Turkey)",
-                        "Beef Wellington (UK)",
-                        "Biryani (India)",
-                        "Borscht (Ukraine)",
-                        "Bratwurst (Germany)",
-                        "Bulgogi (Korea)",
-                        "Burrito (USA)",
-                        "Ceviche (Peru)",
-                        "Chicken Tikka Masala (India)",
-                        "Churrasco (Brazil)",
-                        "Couscous (North Africa)",
-                        "Croissant (France)",
-                        "Dim Sum (China)",
-                        "Empanada (Argentina)",
-                        "Fajitas (Mexico)",
-                        "Falafel (Middle East)",
-                        "Feijoada (Brazil)",
-                        "Fish and Chips (UK)",
-                        "Fondue (Switzerland)",
-                        "Goulash (Hungary)",
-                        "Haggis (Scotland)",
-                        "Kebab (Middle East)",
-                        "Kimchi (Korea)",
-                        "Lasagna (Italy)",
-                        "Maple Syrup Pancakes (Canada)",
-                        "Moussaka (Greece)",
-                        "Pad Thai (Thailand)",
-                        "Paella (Spain)",
-                        "Pancakes (USA)",
-                        "Pasta Carbonara (Italy)",
-                        "Pavlova (Australia)",
-                        "Peking Duck (China)",
-                        "Pho (Vietnam)",
-                        "Pierogi (Poland)",
-                        "Pizza (Italy)",
-                        "Poutine (Canada)",
-                        "Pretzel (Germany)",
-                        "Ramen (Japan)",
-                        "Rendang (Indonesia)",
-                        "Sashimi (Japan)",
-                        "Satay (Indonesia)",
-                        "Shepherd's Pie (Ireland)",
-                        "Sushi (Japan)",
-                        "Tacos (Mexico)",
-                        "Tandoori Chicken (India)",
-                        "Tortilla (Spain)",
-                        "Tzatziki (Greece)",
-                        "Wiener Schnitzel (Austria)",
-                    ]);
-                    delegate.update_matches("".into(), window, cx).detach();
-
-                    let picker = Picker::uniform_list(delegate, window, cx);
-                    picker.focus(window, cx);
-                    picker
-                }),
-            }
-        })
-    }
-}
-
-impl Render for PickerStory {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        div()
-            .bg(cx.theme().styles.colors.background)
-            .size_full()
-            .child(self.picker.clone())
-    }
-}
diff --git a/crates/storybook/src/stories/scroll.rs b/crates/storybook/src/stories/scroll.rs
deleted file mode 100644
index 8a4c7ea768..0000000000
--- a/crates/storybook/src/stories/scroll.rs
+++ /dev/null
@@ -1,52 +0,0 @@
-use gpui::{App, Entity, Render, SharedString, Styled, Window, div, prelude::*, px};
-use ui::Tooltip;
-use ui::prelude::*;
-
-pub struct ScrollStory;
-
-impl ScrollStory {
-    pub fn model(cx: &mut App) -> Entity<ScrollStory> {
-        cx.new(|_| ScrollStory)
-    }
-}
-
-impl Render for ScrollStory {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let theme = cx.theme();
-        let color_1 = theme.status().created;
-        let color_2 = theme.status().modified;
-
-        div()
-            .id("parent")
-            .bg(theme.colors().background)
-            .size_full()
-            .overflow_scroll()
-            .children((0..10).map(|row| {
-                div()
-                    .w(px(1000.))
-                    .h(px(100.))
-                    .flex()
-                    .flex_row()
-                    .children((0..10).map(|column| {
-                        let id = SharedString::from(format!("{}, {}", row, column));
-                        let bg = if row % 2 == column % 2 {
-                            color_1
-                        } else {
-                            color_2
-                        };
-                        div()
-                            .id(id.clone())
-                            .tooltip(Tooltip::text(id))
-                            .bg(bg)
-                            .size(px(100_f32))
-                            .when(row >= 5 && column >= 5, |d| {
-                                d.overflow_scroll()
-                                    .child(div().size(px(50.)).bg(color_1))
-                                    .child(div().size(px(50.)).bg(color_2))
-                                    .child(div().size(px(50.)).bg(color_1))
-                                    .child(div().size(px(50.)).bg(color_2))
-                            })
-                    }))
-            }))
-    }
-}
diff --git a/crates/storybook/src/stories/text.rs b/crates/storybook/src/stories/text.rs
deleted file mode 100644
index 7ba2378307..0000000000
--- a/crates/storybook/src/stories/text.rs
+++ /dev/null
@@ -1,120 +0,0 @@
-use gpui::{
-    App, AppContext as _, Context, Entity, HighlightStyle, InteractiveText, IntoElement,
-    ParentElement, Render, Styled, StyledText, Window, div, green, red,
-};
-use indoc::indoc;
-use story::*;
-
-pub struct TextStory;
-
-impl TextStory {
-    pub fn model(cx: &mut App) -> Entity<Self> {
-        cx.new(|_| Self)
-    }
-}
-
-impl Render for TextStory {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        Story::container(cx)
-            .child(Story::title("Text", cx))
-            .children(vec![
-                StorySection::new()
-                    .child(
-                        StoryItem::new("Default", div().bg(gpui::blue()).child("Hello World!"))
-                            .usage(indoc! {r##"
-                                div()
-                                    .child("Hello World!")
-                                "##
-                            }),
-                    )
-                    .child(
-                        StoryItem::new(
-                            "Wrapping Text",
-                            div().max_w_96().child(concat!(
-                                "The quick brown fox jumps over the lazy dog. ",
-                                "Meanwhile, the lazy dog decided it was time for a change. ",
-                                "He started daily workout routines, ate healthier and became the fastest dog in town.",
-                            )),
-                        )
-                        .description("Set a width or max-width to enable text wrapping.")
-                        .usage(indoc! {r##"
-                            div()
-                                .max_w_96()
-                                .child("Some text that you want to wrap.")
-                            "##
-                        }),
-                    )
-                    .child(
-                        StoryItem::new(
-                            "tbd",
-                            div().flex().w_96().child(
-                                div().overflow_hidden().child(concat!(
-                                    "flex-row. width 96. overflow-hidden. The quick brown fox jumps over the lazy dog. ",
-                                    "Meanwhile, the lazy dog decided it was time for a change. ",
-                                    "He started daily workout routines, ate healthier and became the fastest dog in town.",
-                                )),
-                            ),
-                        ),
-                    )
-                    .child(
-                        StoryItem::new(
-                            "Text in Horizontal Flex",
-                            div().flex().w_96().bg(red()).child(concat!(
-                                "flex-row. width 96. The quick brown fox jumps over the lazy dog. ",
-                                "Meanwhile, the lazy dog decided it was time for a change. ",
-                                "He started daily workout routines, ate healthier and became the fastest dog in town.",
-                            )),
-                        )
-                        .usage(indoc! {r##"
-                            // NOTE: When rendering text in a horizontal flex container,
-                            // Taffy will not pass width constraints down from the parent.
-                            // To fix this, render text in a parent with overflow: hidden
-
-                            div()
-                                .max_w_96()
-                                .child("Some text that you want to wrap.")
-                            "##
-                        }),
-                    )
-                    .child(
-                        StoryItem::new(
-                            "Interactive Text",
-                            InteractiveText::new(
-                                "interactive",
-                                StyledText::new("Hello world, how is it going?").with_default_highlights(
-                                    &window.text_style(),
-                                    [
-                                        (
-                                            6..11,
-                                            HighlightStyle {
-                                                background_color: Some(green()),
-                                                ..Default::default()
-                                            },
-                                        ),
-                                    ],
-                                ),
-                            )
-                            .on_click(vec![2..4, 1..3, 7..9], |range_ix, _, _cx| {
-                                println!("Clicked range {range_ix}");
-                            }),
-                        )
-                        .usage(indoc! {r##"
-                            InteractiveText::new(
-                                "interactive",
-                                StyledText::new("Hello world, how is it going?").with_highlights(&window.text_style(), [
-                                    (6..11, HighlightStyle {
-                                        background_color: Some(green()),
-                                        ..Default::default()
-                                    }),
-                                ]),
-                            )
-                            .on_click(vec![2..4, 1..3, 7..9], |range_ix, _cx| {
-                                println!("Clicked range {range_ix}");
-                            })
-                            "##
-                        }),
-                    ),
-            ])
-            .into_element()
-    }
-}
diff --git a/crates/storybook/src/stories/viewport_units.rs b/crates/storybook/src/stories/viewport_units.rs
deleted file mode 100644
index 1259a713ee..0000000000
--- a/crates/storybook/src/stories/viewport_units.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-use gpui::Render;
-use story::Story;
-
-use ui::prelude::*;
-
-pub struct ViewportUnitsStory;
-
-impl Render for ViewportUnitsStory {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        Story::container(cx).child(
-            div()
-                .flex()
-                .flex_row()
-                .child(
-                    div()
-                        .w(vw(0.5, window))
-                        .h(vh(0.8, window))
-                        .bg(gpui::red())
-                        .text_color(gpui::white())
-                        .child("50vw, 80vh"),
-                )
-                .child(
-                    div()
-                        .w(vw(0.25, window))
-                        .h(vh(0.33, window))
-                        .bg(gpui::green())
-                        .text_color(gpui::white())
-                        .child("25vw, 33vh"),
-                ),
-        )
-    }
-}
diff --git a/crates/storybook/src/stories/with_rem_size.rs b/crates/storybook/src/stories/with_rem_size.rs
deleted file mode 100644
index eeca3fb89f..0000000000
--- a/crates/storybook/src/stories/with_rem_size.rs
+++ /dev/null
@@ -1,61 +0,0 @@
-use gpui::{AnyElement, Hsla, Render};
-use story::Story;
-
-use ui::{prelude::*, utils::WithRemSize};
-
-pub struct WithRemSizeStory;
-
-impl Render for WithRemSizeStory {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        Story::container(cx).child(
-            Example::new(16., gpui::red())
-                .child(
-                    Example::new(24., gpui::green())
-                        .child(Example::new(8., gpui::blue()))
-                        .child(Example::new(16., gpui::yellow())),
-                )
-                .child(
-                    Example::new(12., gpui::green())
-                        .child(Example::new(48., gpui::blue()))
-                        .child(Example::new(16., gpui::yellow())),
-                ),
-        )
-    }
-}
-
-#[derive(IntoElement)]
-struct Example {
-    rem_size: Pixels,
-    border_color: Hsla,
-    children: Vec<AnyElement>,
-}
-
-impl Example {
-    pub fn new(rem_size: impl Into<Pixels>, border_color: Hsla) -> Self {
-        Self {
-            rem_size: rem_size.into(),
-            border_color,
-            children: Vec::new(),
-        }
-    }
-}
-
-impl ParentElement for Example {
-    fn extend(&mut self, elements: impl IntoIterator<Item = AnyElement>) {
-        self.children.extend(elements);
-    }
-}
-
-impl RenderOnce for Example {
-    fn render(self, _window: &mut Window, _cx: &mut App) -> impl IntoElement {
-        WithRemSize::new(self.rem_size).child(
-            v_flex()
-                .gap_2()
-                .p_2()
-                .border_2()
-                .border_color(self.border_color)
-                .child(Label::new(format!("1rem = {}px", f32::from(self.rem_size))))
-                .children(self.children),
-        )
-    }
-}
diff --git a/crates/storybook/src/story_selector.rs b/crates/storybook/src/story_selector.rs
deleted file mode 100644
index 7f70d58b3b..0000000000
--- a/crates/storybook/src/story_selector.rs
+++ /dev/null
@@ -1,113 +0,0 @@
-use std::str::FromStr;
-use std::sync::OnceLock;
-
-use crate::stories::*;
-use clap::ValueEnum;
-use clap::builder::PossibleValue;
-use gpui::AnyView;
-use strum::{EnumIter, EnumString, IntoEnumIterator};
-use ui::prelude::*;
-
-#[derive(Debug, PartialEq, Eq, Clone, Copy, strum::Display, EnumString, EnumIter)]
-#[strum(serialize_all = "snake_case")]
-pub enum ComponentStory {
-    ApplicationMenu,
-    AutoHeightEditor,
-    CollabNotification,
-    ContextMenu,
-    Cursor,
-    Focus,
-    OverflowScroll,
-    Picker,
-    Scroll,
-    Text,
-    ViewportUnits,
-    WithRemSize,
-    IndentGuides,
-}
-
-impl ComponentStory {
-    pub fn story(&self, window: &mut Window, cx: &mut App) -> AnyView {
-        match self {
-            Self::ApplicationMenu => cx
-                .new(|cx| title_bar::ApplicationMenuStory::new(window, cx))
-                .into(),
-            Self::AutoHeightEditor => AutoHeightEditorStory::new(window, cx).into(),
-            Self::CollabNotification => cx
-                .new(|_| collab_ui::notifications::CollabNotificationStory)
-                .into(),
-            Self::ContextMenu => cx.new(|_| ui::ContextMenuStory).into(),
-            Self::Cursor => cx.new(|_| crate::stories::CursorStory).into(),
-            Self::Focus => FocusStory::model(window, cx).into(),
-            Self::OverflowScroll => cx.new(|_| crate::stories::OverflowScrollStory).into(),
-            Self::Picker => PickerStory::new(window, cx).into(),
-            Self::Scroll => ScrollStory::model(cx).into(),
-            Self::Text => TextStory::model(cx).into(),
-            Self::ViewportUnits => cx.new(|_| crate::stories::ViewportUnitsStory).into(),
-            Self::WithRemSize => cx.new(|_| crate::stories::WithRemSizeStory).into(),
-            Self::IndentGuides => crate::stories::IndentGuidesStory::model(window, cx).into(),
-        }
-    }
-}
-
-#[derive(Debug, PartialEq, Eq, Clone, Copy)]
-pub enum StorySelector {
-    Component(ComponentStory),
-    KitchenSink,
-}
-
-impl FromStr for StorySelector {
-    type Err = anyhow::Error;
-
-    fn from_str(raw_story_name: &str) -> std::result::Result<Self, Self::Err> {
-        use anyhow::Context as _;
-
-        let story = raw_story_name.to_ascii_lowercase();
-
-        if story == "kitchen_sink" {
-            return Ok(Self::KitchenSink);
-        }
-
-        if let Some((_, story)) = story.split_once("components/") {
-            let component_story = ComponentStory::from_str(story)
-                .with_context(|| format!("story not found for component '{story}'"))?;
-
-            return Ok(Self::Component(component_story));
-        }
-
-        anyhow::bail!("story not found for '{raw_story_name}'")
-    }
-}
-
-impl StorySelector {
-    pub fn story(&self, window: &mut Window, cx: &mut App) -> AnyView {
-        match self {
-            Self::Component(component_story) => component_story.story(window, cx),
-            Self::KitchenSink => KitchenSinkStory::model(cx).into(),
-        }
-    }
-}
-
-/// The list of all stories available in the storybook.
-static ALL_STORY_SELECTORS: OnceLock<Vec<StorySelector>> = OnceLock::new();
-
-impl ValueEnum for StorySelector {
-    fn value_variants<'a>() -> &'a [Self] {
-        (ALL_STORY_SELECTORS.get_or_init(|| {
-            let component_stories = ComponentStory::iter().map(StorySelector::Component);
-
-            component_stories
-                .chain(std::iter::once(StorySelector::KitchenSink))
-                .collect::<Vec<_>>()
-        })) as _
-    }
-
-    fn to_possible_value(&self) -> Option<clap::builder::PossibleValue> {
-        let value = match self {
-            Self::Component(story) => format!("components/{story}"),
-            Self::KitchenSink => "kitchen_sink".to_string(),
-        };
-
-        Some(PossibleValue::new(value))
-    }
-}
diff --git a/crates/storybook/src/storybook.rs b/crates/storybook/src/storybook.rs
deleted file mode 100644
index 42ca921e63..0000000000
--- a/crates/storybook/src/storybook.rs
+++ /dev/null
@@ -1,161 +0,0 @@
-mod actions;
-mod app_menus;
-mod assets;
-mod stories;
-mod story_selector;
-
-use std::sync::Arc;
-
-use clap::Parser;
-use dialoguer::FuzzySelect;
-use gpui::{
-    AnyView, App, Bounds, Context, Render, Window, WindowBounds, WindowOptions,
-    colors::{Colors, GlobalColors},
-    div, px, size,
-};
-use log::LevelFilter;
-use reqwest_client::ReqwestClient;
-use settings::{KeymapFile, Settings};
-use simplelog::SimpleLogger;
-use strum::IntoEnumIterator;
-use theme::ThemeSettings;
-use ui::prelude::*;
-
-use crate::app_menus::app_menus;
-use crate::assets::Assets;
-use crate::story_selector::{ComponentStory, StorySelector};
-use actions::Quit;
-pub use indoc::indoc;
-
-#[derive(Parser)]
-#[command(author, version, about, long_about = None)]
-struct Args {
-    #[arg(value_enum)]
-    story: Option<StorySelector>,
-
-    /// The name of the theme to use in the storybook.
-    ///
-    /// If not provided, the default theme will be used.
-    #[arg(long)]
-    theme: Option<String>,
-}
-
-fn main() {
-    SimpleLogger::init(LevelFilter::Info, Default::default()).expect("could not initialize logger");
-
-    menu::init();
-    let args = Args::parse();
-
-    let story_selector = args.story.unwrap_or_else(|| {
-        let stories = ComponentStory::iter().collect::<Vec<_>>();
-
-        ctrlc::set_handler(move || {}).unwrap();
-
-        let result = FuzzySelect::new()
-            .with_prompt("Choose a story to run:")
-            .items(&stories)
-            .interact();
-
-        let Ok(selection) = result else {
-            dialoguer::console::Term::stderr().show_cursor().unwrap();
-            std::process::exit(0);
-        };
-
-        StorySelector::Component(stories[selection])
-    });
-    let theme_name = args.theme.unwrap_or("One Dark".to_string());
-
-    gpui::Application::new().with_assets(Assets).run(move |cx| {
-        load_embedded_fonts(cx).unwrap();
-
-        cx.set_global(GlobalColors(Arc::new(Colors::default())));
-
-        let http_client = ReqwestClient::user_agent("zed_storybook").unwrap();
-        cx.set_http_client(Arc::new(http_client));
-
-        settings::init(cx);
-        theme::init(theme::LoadThemes::All(Box::new(Assets)), cx);
-
-        let selector = story_selector;
-
-        let mut theme_settings = ThemeSettings::get_global(cx).clone();
-        theme_settings.theme =
-            theme::ThemeSelection::Static(settings::ThemeName(theme_name.into()));
-        ThemeSettings::override_global(theme_settings, cx);
-
-        editor::init(cx);
-        init(cx);
-        load_storybook_keymap(cx);
-        cx.set_menus(app_menus());
-
-        let size = size(px(1500.), px(780.));
-        let bounds = Bounds::centered(None, size, cx);
-        let _window = cx.open_window(
-            WindowOptions {
-                window_bounds: Some(WindowBounds::Windowed(bounds)),
-                ..Default::default()
-            },
-            move |window, cx| {
-                theme::setup_ui_font(window, cx);
-
-                cx.new(|cx| StoryWrapper::new(selector.story(window, cx)))
-            },
-        );
-
-        cx.activate(true);
-    });
-}
-
-#[derive(Clone)]
-pub struct StoryWrapper {
-    story: AnyView,
-}
-
-impl StoryWrapper {
-    pub(crate) fn new(story: AnyView) -> Self {
-        Self { story }
-    }
-}
-
-impl Render for StoryWrapper {
-    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
-        div()
-            .flex()
-            .flex_col()
-            .size_full()
-            .font_family(".ZedMono")
-            .child(self.story.clone())
-    }
-}
-
-fn load_embedded_fonts(cx: &App) -> anyhow::Result<()> {
-    let font_paths = cx.asset_source().list("fonts")?;
-    let mut embedded_fonts = Vec::new();
-    for font_path in font_paths {
-        if font_path.ends_with(".ttf") {
-            let font_bytes = cx
-                .asset_source()
-                .load(&font_path)?
-                .expect("Should never be None in the storybook");
-            embedded_fonts.push(font_bytes);
-        }
-    }
-
-    cx.text_system().add_fonts(embedded_fonts)
-}
-
-fn load_storybook_keymap(cx: &mut App) {
-    cx.bind_keys(KeymapFile::load_asset("keymaps/storybook.json", None, cx).unwrap());
-}
-
-pub fn init(cx: &mut App) {
-    cx.on_action(quit);
-}
-
-fn quit(_: &Quit, cx: &mut App) {
-    cx.spawn(async move |cx| {
-        cx.update(|cx| cx.quit())?;
-        anyhow::Ok(())
-    })
-    .detach_and_log_err(cx);
-}
diff --git a/crates/streaming_diff/Cargo.toml b/crates/streaming_diff/Cargo.toml
deleted file mode 100644
index b3645a182c..0000000000
--- a/crates/streaming_diff/Cargo.toml
+++ /dev/null
@@ -1,20 +0,0 @@
-[package]
-name = "streaming_diff"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/streaming_diff.rs"
-
-[dependencies]
-ordered-float.workspace = true
-rope.workspace = true
-
-[dev-dependencies]
-rand.workspace = true
-util = { workspace = true, features = ["test-support"] }
diff --git a/crates/streaming_diff/LICENSE-GPL b/crates/streaming_diff/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/streaming_diff/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/streaming_diff/src/streaming_diff.rs b/crates/streaming_diff/src/streaming_diff.rs
deleted file mode 100644
index 5677981b0d..0000000000
--- a/crates/streaming_diff/src/streaming_diff.rs
+++ /dev/null
@@ -1,1104 +0,0 @@
-use ordered_float::OrderedFloat;
-use rope::{Point, Rope, TextSummary};
-use std::collections::{BTreeSet, HashMap};
-use std::{
-    cmp,
-    fmt::{self, Debug},
-    ops::Range,
-};
-
-#[derive(Default)]
-struct Matrix {
-    cells: Vec<f64>,
-    rows: usize,
-    cols: usize,
-}
-
-impl Matrix {
-    fn new() -> Self {
-        Self {
-            cells: Vec::new(),
-            rows: 0,
-            cols: 0,
-        }
-    }
-
-    fn resize(&mut self, rows: usize, cols: usize) {
-        self.cells.resize(rows * cols, 0.);
-        self.rows = rows;
-        self.cols = cols;
-    }
-
-    fn swap_columns(&mut self, col1: usize, col2: usize) {
-        if col1 == col2 {
-            return;
-        }
-
-        if col1 >= self.cols {
-            panic!("column out of bounds");
-        }
-
-        if col2 >= self.cols {
-            panic!("column out of bounds");
-        }
-
-        unsafe {
-            let ptr = self.cells.as_mut_ptr();
-            std::ptr::swap_nonoverlapping(
-                ptr.add(col1 * self.rows),
-                ptr.add(col2 * self.rows),
-                self.rows,
-            );
-        }
-    }
-
-    fn get(&self, row: usize, col: usize) -> f64 {
-        if row >= self.rows {
-            panic!("row out of bounds")
-        }
-
-        if col >= self.cols {
-            panic!("column out of bounds")
-        }
-        self.cells[col * self.rows + row]
-    }
-
-    fn set(&mut self, row: usize, col: usize, value: f64) {
-        if row >= self.rows {
-            panic!("row out of bounds")
-        }
-
-        if col >= self.cols {
-            panic!("column out of bounds")
-        }
-
-        self.cells[col * self.rows + row] = value;
-    }
-}
-
-impl Debug for Matrix {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        writeln!(f)?;
-        for i in 0..self.rows {
-            for j in 0..self.cols {
-                write!(f, "{:5}", self.get(i, j))?;
-            }
-            writeln!(f)?;
-        }
-        Ok(())
-    }
-}
-
-#[derive(Debug, Clone)]
-pub enum CharOperation {
-    Insert { text: String },
-    Delete { bytes: usize },
-    Keep { bytes: usize },
-}
-
-#[derive(Default)]
-pub struct StreamingDiff {
-    old: Vec<char>,
-    new: Vec<char>,
-    scores: Matrix,
-    old_text_ix: usize,
-    new_text_ix: usize,
-    equal_runs: HashMap<(usize, usize), u32>,
-}
-
-impl StreamingDiff {
-    const INSERTION_SCORE: f64 = -1.;
-    const DELETION_SCORE: f64 = -20.;
-    const EQUALITY_BASE: f64 = 1.8;
-    const MAX_EQUALITY_EXPONENT: i32 = 16;
-
-    pub fn new(old: String) -> Self {
-        let old = old.chars().collect::<Vec<_>>();
-        let mut scores = Matrix::new();
-        scores.resize(old.len() + 1, 1);
-        for i in 0..=old.len() {
-            scores.set(i, 0, i as f64 * Self::DELETION_SCORE);
-        }
-        Self {
-            old,
-            new: Vec::new(),
-            scores,
-            old_text_ix: 0,
-            new_text_ix: 0,
-            equal_runs: Default::default(),
-        }
-    }
-
-    pub fn push_new(&mut self, text: &str) -> Vec<CharOperation> {
-        self.new.extend(text.chars());
-        self.scores.swap_columns(0, self.scores.cols - 1);
-        self.scores
-            .resize(self.old.len() + 1, self.new.len() - self.new_text_ix + 1);
-        self.equal_runs.retain(|(_i, j), _| *j == self.new_text_ix);
-
-        for j in self.new_text_ix + 1..=self.new.len() {
-            let relative_j = j - self.new_text_ix;
-
-            self.scores
-                .set(0, relative_j, j as f64 * Self::INSERTION_SCORE);
-            for i in 1..=self.old.len() {
-                let insertion_score = self.scores.get(i, relative_j - 1) + Self::INSERTION_SCORE;
-                let deletion_score = self.scores.get(i - 1, relative_j) + Self::DELETION_SCORE;
-                let equality_score = if self.old[i - 1] == self.new[j - 1] {
-                    let mut equal_run = self.equal_runs.get(&(i - 1, j - 1)).copied().unwrap_or(0);
-                    equal_run += 1;
-                    self.equal_runs.insert((i, j), equal_run);
-
-                    let exponent = cmp::min(equal_run as i32 / 4, Self::MAX_EQUALITY_EXPONENT);
-                    self.scores.get(i - 1, relative_j - 1) + Self::EQUALITY_BASE.powi(exponent)
-                } else {
-                    f64::NEG_INFINITY
-                };
-
-                let score = insertion_score.max(deletion_score).max(equality_score);
-                self.scores.set(i, relative_j, score);
-            }
-        }
-
-        let mut max_score = f64::NEG_INFINITY;
-        let mut next_old_text_ix = self.old_text_ix;
-        let next_new_text_ix = self.new.len();
-        for i in self.old_text_ix..=self.old.len() {
-            let score = self.scores.get(i, next_new_text_ix - self.new_text_ix);
-            if score > max_score {
-                max_score = score;
-                next_old_text_ix = i;
-            }
-        }
-
-        let hunks = self.backtrack(next_old_text_ix, next_new_text_ix);
-        self.old_text_ix = next_old_text_ix;
-        self.new_text_ix = next_new_text_ix;
-        hunks
-    }
-
-    fn backtrack(&self, old_text_ix: usize, new_text_ix: usize) -> Vec<CharOperation> {
-        let mut pending_insert: Option<Range<usize>> = None;
-        let mut hunks = Vec::new();
-        let mut i = old_text_ix;
-        let mut j = new_text_ix;
-        while (i, j) != (self.old_text_ix, self.new_text_ix) {
-            let insertion_score = if j > self.new_text_ix {
-                Some((i, j - 1))
-            } else {
-                None
-            };
-            let deletion_score = if i > self.old_text_ix {
-                Some((i - 1, j))
-            } else {
-                None
-            };
-            let equality_score = if i > self.old_text_ix && j > self.new_text_ix {
-                if self.old[i - 1] == self.new[j - 1] {
-                    Some((i - 1, j - 1))
-                } else {
-                    None
-                }
-            } else {
-                None
-            };
-
-            let (prev_i, prev_j) = [insertion_score, deletion_score, equality_score]
-                .iter()
-                .max_by_key(|cell| {
-                    cell.map(|(i, j)| OrderedFloat(self.scores.get(i, j - self.new_text_ix)))
-                })
-                .unwrap()
-                .unwrap();
-
-            if prev_i == i && prev_j == j - 1 {
-                if let Some(pending_insert) = pending_insert.as_mut() {
-                    pending_insert.start = prev_j;
-                } else {
-                    pending_insert = Some(prev_j..j);
-                }
-            } else {
-                if let Some(range) = pending_insert.take() {
-                    hunks.push(CharOperation::Insert {
-                        text: self.new[range].iter().collect(),
-                    });
-                }
-
-                let char_len = self.old[i - 1].len_utf8();
-                if prev_i == i - 1 && prev_j == j {
-                    if let Some(CharOperation::Delete { bytes: len }) = hunks.last_mut() {
-                        *len += char_len;
-                    } else {
-                        hunks.push(CharOperation::Delete { bytes: char_len })
-                    }
-                } else if let Some(CharOperation::Keep { bytes: len }) = hunks.last_mut() {
-                    *len += char_len;
-                } else {
-                    hunks.push(CharOperation::Keep { bytes: char_len })
-                }
-            }
-
-            i = prev_i;
-            j = prev_j;
-        }
-
-        if let Some(range) = pending_insert.take() {
-            hunks.push(CharOperation::Insert {
-                text: self.new[range].iter().collect(),
-            });
-        }
-
-        hunks.reverse();
-        hunks
-    }
-
-    pub fn finish(self) -> Vec<CharOperation> {
-        self.backtrack(self.old.len(), self.new.len())
-    }
-}
-
-#[derive(Debug, Clone, PartialEq)]
-pub enum LineOperation {
-    Insert { lines: u32 },
-    Delete { lines: u32 },
-    Keep { lines: u32 },
-}
-
-#[derive(Debug, Default)]
-pub struct LineDiff {
-    inserted_newline_at_end: bool,
-    /// The extent of kept and deleted text.
-    old_end: Point,
-    /// The extent of kept and inserted text.
-    new_end: Point,
-    /// Deleted rows, expressed in terms of the old text.
-    deleted_rows: BTreeSet<u32>,
-    /// Inserted rows, expressed in terms of the new text.
-    inserted_rows: BTreeSet<u32>,
-    buffered_insert: String,
-    /// After deleting a newline, we buffer deletion until we keep or insert a character.
-    buffered_delete: usize,
-}
-
-impl LineDiff {
-    pub fn push_char_operations<'a>(
-        &mut self,
-        operations: impl IntoIterator<Item = &'a CharOperation>,
-        old_text: &Rope,
-    ) {
-        for operation in operations {
-            self.push_char_operation(operation, old_text);
-        }
-    }
-
-    pub fn push_char_operation(&mut self, operation: &CharOperation, old_text: &Rope) {
-        match operation {
-            CharOperation::Insert { text } => {
-                self.flush_delete(old_text);
-
-                if is_line_start(self.old_end) {
-                    if let Some(newline_ix) = text.rfind('\n') {
-                        let (prefix, suffix) = text.split_at(newline_ix + 1);
-                        self.buffered_insert.push_str(prefix);
-                        self.flush_insert(old_text);
-                        self.buffered_insert.push_str(suffix);
-                    } else {
-                        self.buffered_insert.push_str(text);
-                    }
-                } else {
-                    self.buffered_insert.push_str(text);
-                    if !text.ends_with('\n') {
-                        self.flush_insert(old_text);
-                    }
-                }
-            }
-            CharOperation::Delete { bytes } => {
-                self.buffered_delete += bytes;
-
-                let common_suffix_len = self.trim_buffered_end(old_text);
-                self.flush_insert(old_text);
-
-                if common_suffix_len > 0 || !is_line_end(self.old_end, old_text) {
-                    self.flush_delete(old_text);
-                    self.keep(common_suffix_len, old_text);
-                }
-            }
-            CharOperation::Keep { bytes } => {
-                self.flush_delete(old_text);
-                self.flush_insert(old_text);
-                self.keep(*bytes, old_text);
-            }
-        }
-    }
-
-    fn flush_insert(&mut self, old_text: &Rope) {
-        if self.buffered_insert.is_empty() {
-            return;
-        }
-
-        let new_start = self.new_end;
-        let lines = TextSummary::from(self.buffered_insert.as_str()).lines;
-        self.new_end += lines;
-
-        if is_line_start(self.old_end) {
-            if self.new_end.column == 0 {
-                self.inserted_rows.extend(new_start.row..self.new_end.row);
-            } else {
-                self.deleted_rows.insert(self.old_end.row);
-                self.inserted_rows.extend(new_start.row..=self.new_end.row);
-            }
-        } else if is_line_end(self.old_end, old_text) {
-            if self.buffered_insert.starts_with('\n') {
-                self.inserted_rows
-                    .extend(new_start.row + 1..=self.new_end.row);
-                self.inserted_newline_at_end = true;
-            } else {
-                if !self.inserted_newline_at_end {
-                    self.deleted_rows.insert(self.old_end.row);
-                }
-                self.inserted_rows.extend(new_start.row..=self.new_end.row);
-            }
-        } else {
-            self.deleted_rows.insert(self.old_end.row);
-            self.inserted_rows.extend(new_start.row..=self.new_end.row);
-        }
-
-        self.buffered_insert.clear();
-    }
-
-    fn flush_delete(&mut self, old_text: &Rope) {
-        if self.buffered_delete == 0 {
-            return;
-        }
-
-        let old_start = self.old_end;
-        self.old_end =
-            old_text.offset_to_point(old_text.point_to_offset(self.old_end) + self.buffered_delete);
-
-        if is_line_end(old_start, old_text) && is_line_end(self.old_end, old_text) {
-            self.deleted_rows
-                .extend(old_start.row + 1..=self.old_end.row);
-        } else if is_line_start(old_start)
-            && (is_line_start(self.old_end) && self.old_end < old_text.max_point())
-            && self.new_end.column == 0
-        {
-            self.deleted_rows.extend(old_start.row..self.old_end.row);
-        } else {
-            self.inserted_rows.insert(self.new_end.row);
-            self.deleted_rows.extend(old_start.row..=self.old_end.row);
-        }
-
-        self.inserted_newline_at_end = false;
-        self.buffered_delete = 0;
-    }
-
-    fn keep(&mut self, bytes: usize, old_text: &Rope) {
-        if bytes == 0 {
-            return;
-        }
-
-        let lines =
-            old_text.offset_to_point(old_text.point_to_offset(self.old_end) + bytes) - self.old_end;
-        self.old_end += lines;
-        self.new_end += lines;
-        self.inserted_newline_at_end = false;
-    }
-
-    fn trim_buffered_end(&mut self, old_text: &Rope) -> usize {
-        let old_start_offset = old_text.point_to_offset(self.old_end);
-        let old_end_offset = old_start_offset + self.buffered_delete;
-
-        let new_chars = self.buffered_insert.chars().rev();
-        let old_chars = old_text
-            .chunks_in_range(old_start_offset..old_end_offset)
-            .flat_map(|chunk| chunk.chars().rev());
-
-        let mut common_suffix_len = 0;
-        for (new_ch, old_ch) in new_chars.zip(old_chars) {
-            if new_ch == old_ch {
-                common_suffix_len += new_ch.len_utf8();
-            } else {
-                break;
-            }
-        }
-
-        self.buffered_delete -= common_suffix_len;
-        self.buffered_insert
-            .truncate(self.buffered_insert.len() - common_suffix_len);
-
-        common_suffix_len
-    }
-
-    pub fn finish(&mut self, old_text: &Rope) {
-        self.flush_insert(old_text);
-        self.flush_delete(old_text);
-
-        let old_start = self.old_end;
-        self.old_end = old_text.max_point();
-        self.new_end += self.old_end - old_start;
-    }
-
-    pub fn line_operations(&self) -> Vec<LineOperation> {
-        let mut ops = Vec::new();
-        let mut deleted_rows = self.deleted_rows.iter().copied().peekable();
-        let mut inserted_rows = self.inserted_rows.iter().copied().peekable();
-        let mut old_row = 0;
-        let mut new_row = 0;
-
-        while deleted_rows.peek().is_some() || inserted_rows.peek().is_some() {
-            // Check for a run of deleted lines at current old row.
-            if Some(old_row) == deleted_rows.peek().copied() {
-                if let Some(LineOperation::Delete { lines }) = ops.last_mut() {
-                    *lines += 1;
-                } else {
-                    ops.push(LineOperation::Delete { lines: 1 });
-                }
-                old_row += 1;
-                deleted_rows.next();
-            } else if Some(new_row) == inserted_rows.peek().copied() {
-                if let Some(LineOperation::Insert { lines }) = ops.last_mut() {
-                    *lines += 1;
-                } else {
-                    ops.push(LineOperation::Insert { lines: 1 });
-                }
-                new_row += 1;
-                inserted_rows.next();
-            } else {
-                // Keep lines until the next deletion, insertion, or the end of the old text.
-                let lines_to_next_deletion = inserted_rows
-                    .peek()
-                    .copied()
-                    .unwrap_or(self.new_end.row + 1)
-                    - new_row;
-                let lines_to_next_insertion =
-                    deleted_rows.peek().copied().unwrap_or(self.old_end.row + 1) - old_row;
-                let kept_lines =
-                    cmp::max(1, cmp::min(lines_to_next_insertion, lines_to_next_deletion));
-                if kept_lines > 0 {
-                    ops.push(LineOperation::Keep { lines: kept_lines });
-                    old_row += kept_lines;
-                    new_row += kept_lines;
-                }
-            }
-        }
-
-        if old_row < self.old_end.row + 1 {
-            ops.push(LineOperation::Keep {
-                lines: self.old_end.row + 1 - old_row,
-            });
-        }
-
-        ops
-    }
-}
-
-fn is_line_start(point: Point) -> bool {
-    point.column == 0
-}
-
-fn is_line_end(point: Point, text: &Rope) -> bool {
-    text.line_len(point.row) == point.column
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use rand::prelude::*;
-    use std::env;
-
-    #[test]
-    fn test_delete_first_of_two_lines() {
-        let old_text = "aaaa\nbbbb";
-        let char_ops = vec![
-            CharOperation::Delete { bytes: 5 },
-            CharOperation::Keep { bytes: 4 },
-        ];
-        let expected_line_ops = vec![
-            LineOperation::Delete { lines: 1 },
-            LineOperation::Keep { lines: 1 },
-        ];
-        let new_text = apply_char_operations(old_text, &char_ops);
-        assert_eq!(
-            new_text,
-            apply_line_operations(old_text, &new_text, &expected_line_ops)
-        );
-
-        let line_ops = char_ops_to_line_ops(old_text, &char_ops);
-        assert_eq!(line_ops, expected_line_ops);
-    }
-
-    #[test]
-    fn test_delete_second_of_two_lines() {
-        let old_text = "aaaa\nbbbb";
-        let char_ops = vec![
-            CharOperation::Keep { bytes: 5 },
-            CharOperation::Delete { bytes: 4 },
-        ];
-        let line_ops = char_ops_to_line_ops(old_text, &char_ops);
-        assert_eq!(
-            line_ops,
-            vec![
-                LineOperation::Keep { lines: 1 },
-                LineOperation::Delete { lines: 1 },
-                LineOperation::Insert { lines: 1 }
-            ]
-        );
-        let new_text = apply_char_operations(old_text, &char_ops);
-        assert_eq!(
-            new_text,
-            apply_line_operations(old_text, &new_text, &line_ops)
-        );
-    }
-
-    #[test]
-    fn test_add_new_line() {
-        let old_text = "aaaa\nbbbb";
-        let char_ops = vec![
-            CharOperation::Keep { bytes: 9 },
-            CharOperation::Insert {
-                text: "\ncccc".into(),
-            },
-        ];
-        let line_ops = char_ops_to_line_ops(old_text, &char_ops);
-        assert_eq!(
-            line_ops,
-            vec![
-                LineOperation::Keep { lines: 2 },
-                LineOperation::Insert { lines: 1 }
-            ]
-        );
-        let new_text = apply_char_operations(old_text, &char_ops);
-        assert_eq!(
-            new_text,
-            apply_line_operations(old_text, &new_text, &line_ops)
-        );
-    }
-
-    #[test]
-    fn test_delete_line_in_middle() {
-        let old_text = "aaaa\nbbbb\ncccc";
-        let char_ops = vec![
-            CharOperation::Keep { bytes: 5 },
-            CharOperation::Delete { bytes: 5 },
-            CharOperation::Keep { bytes: 4 },
-        ];
-        let line_ops = char_ops_to_line_ops(old_text, &char_ops);
-        assert_eq!(
-            line_ops,
-            vec![
-                LineOperation::Keep { lines: 1 },
-                LineOperation::Delete { lines: 1 },
-                LineOperation::Keep { lines: 1 }
-            ]
-        );
-        let new_text = apply_char_operations(old_text, &char_ops);
-        assert_eq!(
-            new_text,
-            apply_line_operations(old_text, &new_text, &line_ops)
-        );
-    }
-
-    #[test]
-    fn test_replace_line() {
-        let old_text = "aaaa\nbbbb\ncccc";
-        let char_ops = vec![
-            CharOperation::Keep { bytes: 5 },
-            CharOperation::Delete { bytes: 4 },
-            CharOperation::Insert {
-                text: "BBBB".into(),
-            },
-            CharOperation::Keep { bytes: 5 },
-        ];
-        let line_ops = char_ops_to_line_ops(old_text, &char_ops);
-        assert_eq!(
-            line_ops,
-            vec![
-                LineOperation::Keep { lines: 1 },
-                LineOperation::Delete { lines: 1 },
-                LineOperation::Insert { lines: 1 },
-                LineOperation::Keep { lines: 1 }
-            ]
-        );
-        let new_text = apply_char_operations(old_text, &char_ops);
-        assert_eq!(
-            new_text,
-            apply_line_operations(old_text, &new_text, &line_ops)
-        );
-    }
-
-    #[test]
-    fn test_multiple_edits_on_different_lines() {
-        let old_text = "aaaa\nbbbb\ncccc\ndddd";
-        let char_ops = vec![
-            CharOperation::Insert { text: "A".into() },
-            CharOperation::Keep { bytes: 9 },
-            CharOperation::Delete { bytes: 5 },
-            CharOperation::Keep { bytes: 4 },
-            CharOperation::Insert {
-                text: "\nEEEE".into(),
-            },
-        ];
-        let line_ops = char_ops_to_line_ops(old_text, &char_ops);
-        assert_eq!(
-            line_ops,
-            vec![
-                LineOperation::Delete { lines: 1 },
-                LineOperation::Insert { lines: 1 },
-                LineOperation::Keep { lines: 1 },
-                LineOperation::Delete { lines: 2 },
-                LineOperation::Insert { lines: 2 },
-            ]
-        );
-        let new_text = apply_char_operations(old_text, &char_ops);
-        assert_eq!(
-            new_text,
-            apply_line_operations(old_text, &new_text, &line_ops)
-        );
-    }
-
-    #[test]
-    fn test_edit_at_end_of_line() {
-        let old_text = "aaaa\nbbbb\ncccc";
-        let char_ops = vec![
-            CharOperation::Keep { bytes: 4 },
-            CharOperation::Insert { text: "A".into() },
-            CharOperation::Keep { bytes: 10 },
-        ];
-        let line_ops = char_ops_to_line_ops(old_text, &char_ops);
-        assert_eq!(
-            line_ops,
-            vec![
-                LineOperation::Delete { lines: 1 },
-                LineOperation::Insert { lines: 1 },
-                LineOperation::Keep { lines: 2 }
-            ]
-        );
-        let new_text = apply_char_operations(old_text, &char_ops);
-        assert_eq!(
-            new_text,
-            apply_line_operations(old_text, &new_text, &line_ops)
-        );
-    }
-
-    #[test]
-    fn test_insert_newline_character() {
-        let old_text = "aaaabbbb";
-        let char_ops = vec![
-            CharOperation::Keep { bytes: 4 },
-            CharOperation::Insert { text: "\n".into() },
-            CharOperation::Keep { bytes: 4 },
-        ];
-        let new_text = apply_char_operations(old_text, &char_ops);
-        let line_ops = char_ops_to_line_ops(old_text, &char_ops);
-        assert_eq!(
-            line_ops,
-            vec![
-                LineOperation::Delete { lines: 1 },
-                LineOperation::Insert { lines: 2 }
-            ]
-        );
-        assert_eq!(
-            new_text,
-            apply_line_operations(old_text, &new_text, &line_ops)
-        );
-    }
-
-    #[test]
-    fn test_insert_newline_at_beginning() {
-        let old_text = "aaaa\nbbbb";
-        let char_ops = vec![
-            CharOperation::Insert { text: "\n".into() },
-            CharOperation::Keep { bytes: 9 },
-        ];
-        let line_ops = char_ops_to_line_ops(old_text, &char_ops);
-        assert_eq!(
-            line_ops,
-            vec![
-                LineOperation::Insert { lines: 1 },
-                LineOperation::Keep { lines: 2 }
-            ]
-        );
-        let new_text = apply_char_operations(old_text, &char_ops);
-        assert_eq!(
-            new_text,
-            apply_line_operations(old_text, &new_text, &line_ops)
-        );
-    }
-
-    #[test]
-    fn test_delete_newline() {
-        let old_text = "aaaa\nbbbb";
-        let char_ops = vec![
-            CharOperation::Keep { bytes: 4 },
-            CharOperation::Delete { bytes: 1 },
-            CharOperation::Keep { bytes: 4 },
-        ];
-        let line_ops = char_ops_to_line_ops(old_text, &char_ops);
-        assert_eq!(
-            line_ops,
-            vec![
-                LineOperation::Delete { lines: 2 },
-                LineOperation::Insert { lines: 1 }
-            ]
-        );
-
-        let new_text = apply_char_operations(old_text, &char_ops);
-        assert_eq!(
-            new_text,
-            apply_line_operations(old_text, &new_text, &line_ops)
-        );
-    }
-
-    #[test]
-    fn test_insert_multiple_newlines() {
-        let old_text = "aaaa\nbbbb";
-        let char_ops = vec![
-            CharOperation::Keep { bytes: 5 },
-            CharOperation::Insert {
-                text: "\n\n".into(),
-            },
-            CharOperation::Keep { bytes: 4 },
-        ];
-        let line_ops = char_ops_to_line_ops(old_text, &char_ops);
-        assert_eq!(
-            line_ops,
-            vec![
-                LineOperation::Keep { lines: 1 },
-                LineOperation::Insert { lines: 2 },
-                LineOperation::Keep { lines: 1 }
-            ]
-        );
-        let new_text = apply_char_operations(old_text, &char_ops);
-        assert_eq!(
-            new_text,
-            apply_line_operations(old_text, &new_text, &line_ops)
-        );
-    }
-
-    #[test]
-    fn test_delete_multiple_newlines() {
-        let old_text = "aaaa\n\n\nbbbb";
-        let char_ops = vec![
-            CharOperation::Keep { bytes: 5 },
-            CharOperation::Delete { bytes: 2 },
-            CharOperation::Keep { bytes: 4 },
-        ];
-        let line_ops = char_ops_to_line_ops(old_text, &char_ops);
-        assert_eq!(
-            line_ops,
-            vec![
-                LineOperation::Keep { lines: 1 },
-                LineOperation::Delete { lines: 2 },
-                LineOperation::Keep { lines: 1 }
-            ]
-        );
-        let new_text = apply_char_operations(old_text, &char_ops);
-        assert_eq!(
-            new_text,
-            apply_line_operations(old_text, &new_text, &line_ops)
-        );
-    }
-
-    #[test]
-    fn test_complex_scenario() {
-        let old_text = "line1\nline2\nline3\nline4";
-        let char_ops = vec![
-            CharOperation::Keep { bytes: 6 },
-            CharOperation::Insert {
-                text: "inserted\n".into(),
-            },
-            CharOperation::Delete { bytes: 6 },
-            CharOperation::Keep { bytes: 5 },
-            CharOperation::Insert {
-                text: "\nnewline".into(),
-            },
-            CharOperation::Keep { bytes: 6 },
-        ];
-        let line_ops = char_ops_to_line_ops(old_text, &char_ops);
-        assert_eq!(
-            line_ops,
-            vec![
-                LineOperation::Keep { lines: 1 },
-                LineOperation::Delete { lines: 1 },
-                LineOperation::Insert { lines: 1 },
-                LineOperation::Keep { lines: 1 },
-                LineOperation::Insert { lines: 1 },
-                LineOperation::Keep { lines: 1 }
-            ]
-        );
-        let new_text = apply_char_operations(old_text, &char_ops);
-        assert_eq!(new_text, "line1\ninserted\nline3\nnewline\nline4");
-        assert_eq!(
-            apply_line_operations(old_text, &new_text, &line_ops),
-            new_text,
-        );
-    }
-
-    #[test]
-    fn test_cleaning_up_common_suffix() {
-        let old_text = concat!(
-            "        for y in 0..size.y() {\n",
-            "            let a = 10;\n",
-            "            let b = 20;\n",
-            "        }",
-        );
-        let char_ops = [
-            CharOperation::Keep { bytes: 8 },
-            CharOperation::Insert { text: "let".into() },
-            CharOperation::Insert {
-                text: " mut".into(),
-            },
-            CharOperation::Insert { text: " y".into() },
-            CharOperation::Insert { text: " =".into() },
-            CharOperation::Insert { text: " 0".into() },
-            CharOperation::Insert { text: ";".into() },
-            CharOperation::Insert { text: "\n".into() },
-            CharOperation::Insert {
-                text: "        while".into(),
-            },
-            CharOperation::Insert { text: " y".into() },
-            CharOperation::Insert {
-                text: " < size".into(),
-            },
-            CharOperation::Insert { text: ".".into() },
-            CharOperation::Insert { text: "y".into() },
-            CharOperation::Insert { text: "()".into() },
-            CharOperation::Insert { text: " {".into() },
-            CharOperation::Insert { text: "\n".into() },
-            CharOperation::Delete { bytes: 23 },
-            CharOperation::Keep { bytes: 23 },
-            CharOperation::Keep { bytes: 1 },
-            CharOperation::Keep { bytes: 23 },
-            CharOperation::Keep { bytes: 1 },
-            CharOperation::Keep { bytes: 8 },
-            CharOperation::Insert {
-                text: "    y".into(),
-            },
-            CharOperation::Insert { text: " +=".into() },
-            CharOperation::Insert { text: " 1".into() },
-            CharOperation::Insert { text: ";".into() },
-            CharOperation::Insert { text: "\n".into() },
-            CharOperation::Insert {
-                text: "        ".into(),
-            },
-            CharOperation::Keep { bytes: 1 },
-        ];
-        let line_ops = char_ops_to_line_ops(old_text, &char_ops);
-        assert_eq!(
-            line_ops,
-            vec![
-                LineOperation::Delete { lines: 1 },
-                LineOperation::Insert { lines: 2 },
-                LineOperation::Keep { lines: 2 },
-                LineOperation::Delete { lines: 1 },
-                LineOperation::Insert { lines: 2 },
-            ]
-        );
-        let new_text = apply_char_operations(old_text, &char_ops);
-        assert_eq!(
-            new_text,
-            apply_line_operations(old_text, &new_text, &line_ops)
-        );
-    }
-
-    #[test]
-    fn test_random_diffs() {
-        random_test(|mut rng| {
-            let old_text_len = env::var("OLD_TEXT_LEN")
-                .map(|i| i.parse().expect("invalid `OLD_TEXT_LEN` variable"))
-                .unwrap_or(10);
-
-            let old = random_text(&mut rng, old_text_len);
-            println!("old text: {:?}", old);
-
-            let new = randomly_edit(&old, &mut rng);
-            println!("new text: {:?}", new);
-
-            let char_operations = random_streaming_diff(&mut rng, &old, &new);
-            println!("char operations: {:?}", char_operations);
-
-            // Use apply_char_operations to verify the result
-            let patched = apply_char_operations(&old, &char_operations);
-            assert_eq!(patched, new);
-
-            // Test char_ops_to_line_ops
-            let line_ops = char_ops_to_line_ops(&old, &char_operations);
-            println!("line operations: {:?}", line_ops);
-            let patched = apply_line_operations(&old, &new, &line_ops);
-            assert_eq!(patched, new);
-        });
-    }
-
-    fn char_ops_to_line_ops(old_text: &str, char_ops: &[CharOperation]) -> Vec<LineOperation> {
-        let old_rope = Rope::from(old_text);
-        let mut diff = LineDiff::default();
-        for op in char_ops {
-            diff.push_char_operation(op, &old_rope);
-        }
-        diff.finish(&old_rope);
-        diff.line_operations()
-    }
-
-    fn random_streaming_diff(rng: &mut impl Rng, old: &str, new: &str) -> Vec<CharOperation> {
-        let mut diff = StreamingDiff::new(old.to_string());
-        let mut char_operations = Vec::new();
-        let mut new_len = 0;
-
-        while new_len < new.len() {
-            let mut chunk_len = rng.random_range(1..=new.len() - new_len);
-            while !new.is_char_boundary(new_len + chunk_len) {
-                chunk_len += 1;
-            }
-            let chunk = &new[new_len..new_len + chunk_len];
-            let new_hunks = diff.push_new(chunk);
-            char_operations.extend(new_hunks);
-            new_len += chunk_len;
-        }
-
-        char_operations.extend(diff.finish());
-        char_operations
-    }
-
-    fn random_test<F>(mut test_fn: F)
-    where
-        F: FnMut(StdRng),
-    {
-        let iterations = env::var("ITERATIONS")
-            .map(|i| i.parse().expect("invalid `ITERATIONS` variable"))
-            .unwrap_or(100);
-
-        let seed: u64 = env::var("SEED")
-            .map(|s| s.parse().expect("invalid `SEED` variable"))
-            .unwrap_or(0);
-
-        println!(
-            "Running test with {} iterations and seed {}",
-            iterations, seed
-        );
-
-        for i in 0..iterations {
-            println!("Iteration {}", i + 1);
-            let rng = StdRng::seed_from_u64(seed + i);
-            test_fn(rng);
-        }
-    }
-
-    fn apply_line_operations(old_text: &str, new_text: &str, line_ops: &[LineOperation]) -> String {
-        let mut result: Vec<&str> = Vec::new();
-
-        let old_lines: Vec<&str> = old_text.split('\n').collect();
-        let new_lines: Vec<&str> = new_text.split('\n').collect();
-        let mut old_start = 0_usize;
-        let mut new_start = 0_usize;
-
-        for op in line_ops {
-            match op {
-                LineOperation::Keep { lines } => {
-                    let old_end = old_start + *lines as usize;
-                    result.extend(&old_lines[old_start..old_end]);
-                    old_start = old_end;
-                    new_start += *lines as usize;
-                }
-                LineOperation::Delete { lines } => {
-                    old_start += *lines as usize;
-                }
-                LineOperation::Insert { lines } => {
-                    let new_end = new_start + *lines as usize;
-                    result.extend(&new_lines[new_start..new_end]);
-                    new_start = new_end;
-                }
-            }
-        }
-
-        result.join("\n")
-    }
-
-    #[test]
-    fn test_apply_char_operations() {
-        let old_text = "Hello, world!";
-        let char_ops = vec![
-            CharOperation::Keep { bytes: 7 },
-            CharOperation::Delete { bytes: 5 },
-            CharOperation::Insert {
-                text: "Rust".to_string(),
-            },
-            CharOperation::Keep { bytes: 1 },
-        ];
-        let result = apply_char_operations(old_text, &char_ops);
-        assert_eq!(result, "Hello, Rust!");
-    }
-
-    fn random_text(rng: &mut impl Rng, length: usize) -> String {
-        util::RandomCharIter::new(rng).take(length).collect()
-    }
-
-    fn randomly_edit(text: &str, rng: &mut impl Rng) -> String {
-        let mut result = String::from(text);
-        let edit_count = rng.random_range(1..=5);
-
-        fn random_char_range(text: &str, rng: &mut impl Rng) -> (usize, usize) {
-            let mut start = rng.random_range(0..=text.len());
-            while !text.is_char_boundary(start) {
-                start -= 1;
-            }
-            let mut end = rng.random_range(start..=text.len());
-            while !text.is_char_boundary(end) {
-                end += 1;
-            }
-            (start, end)
-        }
-
-        for _ in 0..edit_count {
-            match rng.random_range(0..3) {
-                0 => {
-                    // Insert
-                    let (pos, _) = random_char_range(&result, rng);
-                    let insert_len = rng.random_range(1..=5);
-                    let insert_text: String = random_text(rng, insert_len);
-                    result.insert_str(pos, &insert_text);
-                }
-                1 => {
-                    // Delete
-                    if !result.is_empty() {
-                        let (start, end) = random_char_range(&result, rng);
-                        result.replace_range(start..end, "");
-                    }
-                }
-                2 => {
-                    // Replace
-                    if !result.is_empty() {
-                        let (start, end) = random_char_range(&result, rng);
-                        let replace_len = end - start;
-                        let replace_text: String = random_text(rng, replace_len);
-                        result.replace_range(start..end, &replace_text);
-                    }
-                }
-                _ => unreachable!(),
-            }
-        }
-
-        result
-    }
-
-    fn apply_char_operations(old_text: &str, char_ops: &[CharOperation]) -> String {
-        let mut result = String::new();
-        let mut old_ix = 0;
-
-        for operation in char_ops {
-            match operation {
-                CharOperation::Keep { bytes } => {
-                    result.push_str(&old_text[old_ix..old_ix + bytes]);
-                    old_ix += bytes;
-                }
-                CharOperation::Delete { bytes } => {
-                    old_ix += bytes;
-                }
-                CharOperation::Insert { text } => {
-                    result.push_str(text);
-                }
-            }
-        }
-
-        result
-    }
-}
diff --git a/crates/sum_tree/Cargo.toml b/crates/sum_tree/Cargo.toml
index 3e06ede162..d9924a4210 100644
--- a/crates/sum_tree/Cargo.toml
+++ b/crates/sum_tree/Cargo.toml
@@ -17,13 +17,11 @@ doctest = false
 arrayvec = "0.7.1"
 rayon.workspace = true
 log.workspace = true
-ztracing.workspace = true
 tracing.workspace = true
 
 [dev-dependencies]
 ctor.workspace = true
 rand.workspace = true
-zlog.workspace = true
 
 [package.metadata.cargo-machete]
 ignored = ["tracing"]
diff --git a/crates/sum_tree/src/cursor.rs b/crates/sum_tree/src/cursor.rs
index 589ae96a2a..efdb6ac13a 100644
--- a/crates/sum_tree/src/cursor.rs
+++ b/crates/sum_tree/src/cursor.rs
@@ -1,7 +1,7 @@
 use super::*;
 use arrayvec::ArrayVec;
 use std::{cmp::Ordering, mem, sync::Arc};
-use ztracing::instrument;
+use tracing::instrument;
 
 #[derive(Clone)]
 struct StackEntry<'a, T: Item, D> {
diff --git a/crates/sum_tree/src/sum_tree.rs b/crates/sum_tree/src/sum_tree.rs
index bfc4587969..4a83730ebd 100644
--- a/crates/sum_tree/src/sum_tree.rs
+++ b/crates/sum_tree/src/sum_tree.rs
@@ -8,7 +8,7 @@ use std::marker::PhantomData;
 use std::mem;
 use std::{cmp::Ordering, fmt, iter::FromIterator, sync::Arc};
 pub use tree_map::{MapSeekTarget, TreeMap, TreeSet};
-use ztracing::instrument;
+use tracing::instrument;
 
 #[cfg(test)]
 pub const TREE_BASE: usize = 2;
diff --git a/crates/supermaven/Cargo.toml b/crates/supermaven/Cargo.toml
deleted file mode 100644
index c2d0c48a9e..0000000000
--- a/crates/supermaven/Cargo.toml
+++ /dev/null
@@ -1,44 +0,0 @@
-[package]
-name = "supermaven"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/supermaven.rs"
-doctest = false
-
-[dependencies]
-anyhow.workspace = true
-client.workspace = true
-collections.workspace = true
-edit_prediction_types.workspace = true
-futures.workspace = true
-gpui.workspace = true
-language.workspace = true
-log.workspace = true
-postage.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-smol.workspace = true
-supermaven_api.workspace = true
-text.workspace = true
-ui.workspace = true
-unicode-segmentation.workspace = true
-util.workspace = true
-
-[dev-dependencies]
-editor = { workspace = true, features = ["test-support"] }
-env_logger.workspace = true
-gpui = { workspace = true, features = ["test-support"] }
-language = { workspace = true, features = ["test-support"] }
-project = { workspace = true, features = ["test-support"] }
-settings = { workspace = true, features = ["test-support"] }
-theme = { workspace = true, features = ["test-support"] }
-util = { workspace = true, features = ["test-support"] }
-http_client = { workspace = true, features = ["test-support"] }
diff --git a/crates/supermaven/LICENSE-GPL b/crates/supermaven/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/supermaven/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/supermaven/src/messages.rs b/crates/supermaven/src/messages.rs
deleted file mode 100644
index f515d6353b..0000000000
--- a/crates/supermaven/src/messages.rs
+++ /dev/null
@@ -1,153 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SetApiKey {
-    pub api_key: String,
-}
-
-// Outbound messages
-#[derive(Debug, Serialize)]
-#[serde(tag = "kind", rename_all = "snake_case")]
-pub enum OutboundMessage {
-    SetApiKey(SetApiKey),
-    StateUpdate(StateUpdateMessage),
-    #[allow(dead_code)]
-    UseFreeVersion,
-    Logout,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct StateUpdateMessage {
-    pub new_id: String,
-    pub updates: Vec<StateUpdate>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(tag = "kind", rename_all = "snake_case")]
-pub enum StateUpdate {
-    FileUpdate(FileUpdateMessage),
-    CursorUpdate(CursorPositionUpdateMessage),
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub struct FileUpdateMessage {
-    pub path: String,
-    pub content: String,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub struct CursorPositionUpdateMessage {
-    pub path: String,
-    pub offset: usize,
-}
-
-// Inbound messages coming in on stdout
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(tag = "kind", rename_all = "snake_case")]
-pub enum ResponseItem {
-    // A completion
-    Text { text: String },
-    // Vestigial message type from old versions -- safe to ignore
-    Del { text: String },
-    // Be able to delete whitespace prior to the cursor, likely for the rest of the completion
-    Dedent { text: String },
-    // When the completion is over
-    End,
-    // Got the closing parentheses and shouldn't show any more after
-    Barrier,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SupermavenResponse {
-    pub state_id: String,
-    pub items: Vec<ResponseItem>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct SupermavenMetadataMessage {
-    pub dust_strings: Option<Vec<String>>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct SupermavenTaskUpdateMessage {
-    pub task: String,
-    pub status: TaskStatus,
-    pub percent_complete: Option<f32>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum TaskStatus {
-    InProgress,
-    Complete,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct SupermavenActiveRepoMessage {
-    pub repo_simple_name: Option<String>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(tag = "kind", rename_all = "snake_case")]
-pub enum SupermavenPopupAction {
-    OpenUrl { label: String, url: String },
-    NoOp { label: String },
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub struct SupermavenPopupMessage {
-    pub message: String,
-    pub actions: Vec<SupermavenPopupAction>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(tag = "kind", rename_all = "camelCase")]
-pub struct ActivationRequest {
-    pub activate_url: Option<String>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SupermavenSetMessage {
-    pub key: String,
-    pub value: serde_json::Value,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub enum ServiceTier {
-    FreeNoLicense,
-    #[serde(other)]
-    Unknown,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(tag = "kind", rename_all = "snake_case")]
-pub enum SupermavenMessage {
-    Response(SupermavenResponse),
-    Metadata(SupermavenMetadataMessage),
-    Apology {
-        message: Option<String>,
-    },
-    ActivationRequest(ActivationRequest),
-    ActivationSuccess,
-    Passthrough {
-        passthrough: Box<SupermavenMessage>,
-    },
-    Popup(SupermavenPopupMessage),
-    TaskStatus(SupermavenTaskUpdateMessage),
-    ActiveRepo(SupermavenActiveRepoMessage),
-    ServiceTier {
-        service_tier: ServiceTier,
-    },
-
-    Set(SupermavenSetMessage),
-    #[serde(other)]
-    Unknown,
-}
diff --git a/crates/supermaven/src/supermaven.rs b/crates/supermaven/src/supermaven.rs
deleted file mode 100644
index 527f4ec37d..0000000000
--- a/crates/supermaven/src/supermaven.rs
+++ /dev/null
@@ -1,511 +0,0 @@
-mod messages;
-mod supermaven_edit_prediction_delegate;
-
-pub use supermaven_edit_prediction_delegate::*;
-
-use anyhow::{Context as _, Result};
-#[allow(unused_imports)]
-use client::{Client, proto};
-use collections::BTreeMap;
-
-use futures::{AsyncBufReadExt, StreamExt, channel::mpsc, io::BufReader};
-use gpui::{App, AsyncApp, Context, Entity, EntityId, Global, Task, WeakEntity, actions};
-use language::{
-    Anchor, Buffer, BufferSnapshot, ToOffset, language_settings::all_language_settings,
-};
-use messages::*;
-use postage::watch;
-use serde::{Deserialize, Serialize};
-use settings::SettingsStore;
-use smol::{
-    io::AsyncWriteExt,
-    process::{Child, ChildStdin, ChildStdout},
-};
-use std::{path::PathBuf, process::Stdio, sync::Arc};
-use ui::prelude::*;
-use util::ResultExt;
-
-actions!(
-    supermaven,
-    [
-        /// Signs out of Supermaven.
-        SignOut
-    ]
-);
-
-pub fn init(client: Arc<Client>, cx: &mut App) {
-    let supermaven = cx.new(|_| Supermaven::Starting);
-    Supermaven::set_global(supermaven.clone(), cx);
-
-    let mut provider = all_language_settings(None, cx).edit_predictions.provider;
-    if provider == language::language_settings::EditPredictionProvider::Supermaven {
-        supermaven.update(cx, |supermaven, cx| supermaven.start(client.clone(), cx));
-    }
-
-    cx.observe_global::<SettingsStore>(move |cx| {
-        let new_provider = all_language_settings(None, cx).edit_predictions.provider;
-        if new_provider != provider {
-            provider = new_provider;
-            if provider == language::language_settings::EditPredictionProvider::Supermaven {
-                supermaven.update(cx, |supermaven, cx| supermaven.start(client.clone(), cx));
-            } else {
-                supermaven.update(cx, |supermaven, _cx| supermaven.stop());
-            }
-        }
-    })
-    .detach();
-
-    cx.on_action(|_: &SignOut, cx| {
-        if let Some(supermaven) = Supermaven::global(cx) {
-            supermaven.update(cx, |supermaven, _cx| supermaven.sign_out());
-        }
-    });
-}
-
-pub enum Supermaven {
-    Starting,
-    FailedDownload { error: anyhow::Error },
-    Spawned(SupermavenAgent),
-    Error { error: anyhow::Error },
-}
-
-#[derive(Clone)]
-pub enum AccountStatus {
-    Unknown,
-    NeedsActivation { activate_url: String },
-    Ready,
-}
-
-#[derive(Clone)]
-struct SupermavenGlobal(Entity<Supermaven>);
-
-impl Global for SupermavenGlobal {}
-
-impl Supermaven {
-    pub fn global(cx: &App) -> Option<Entity<Self>> {
-        cx.try_global::<SupermavenGlobal>()
-            .map(|model| model.0.clone())
-    }
-
-    pub fn set_global(supermaven: Entity<Self>, cx: &mut App) {
-        cx.set_global(SupermavenGlobal(supermaven));
-    }
-
-    pub fn start(&mut self, client: Arc<Client>, cx: &mut Context<Self>) {
-        if let Self::Starting = self {
-            cx.spawn(async move |this, cx| {
-                let binary_path =
-                    supermaven_api::get_supermaven_agent_path(client.http_client()).await?;
-
-                this.update(cx, |this, cx| {
-                    if let Self::Starting = this {
-                        *this =
-                            Self::Spawned(SupermavenAgent::new(binary_path, client.clone(), cx)?);
-                    }
-                    anyhow::Ok(())
-                })
-            })
-            .detach_and_log_err(cx)
-        }
-    }
-
-    pub fn stop(&mut self) {
-        *self = Self::Starting;
-    }
-
-    pub fn is_enabled(&self) -> bool {
-        matches!(self, Self::Spawned { .. })
-    }
-
-    pub fn complete(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        cursor_position: Anchor,
-        cx: &App,
-    ) -> Option<SupermavenCompletion> {
-        if let Self::Spawned(agent) = self {
-            let buffer_id = buffer.entity_id();
-            let buffer = buffer.read(cx);
-            let path = buffer
-                .file()
-                .and_then(|file| Some(file.as_local()?.abs_path(cx)))
-                .unwrap_or_else(|| PathBuf::from("untitled"))
-                .to_string_lossy()
-                .to_string();
-            let content = buffer.text();
-            let offset = cursor_position.to_offset(buffer);
-            let state_id = agent.next_state_id;
-            agent.next_state_id.0 += 1;
-
-            let (updates_tx, mut updates_rx) = watch::channel();
-            postage::stream::Stream::try_recv(&mut updates_rx).unwrap();
-
-            agent.states.insert(
-                state_id,
-                SupermavenCompletionState {
-                    buffer_id,
-                    prefix_anchor: cursor_position,
-                    prefix_offset: offset,
-                    text: String::new(),
-                    dedent: String::new(),
-                    updates_tx,
-                },
-            );
-            // ensure the states map is max 1000 elements
-            if agent.states.len() > 1000 {
-                // state id is monotonic so it's sufficient to remove the first element
-                agent
-                    .states
-                    .remove(&agent.states.keys().next().unwrap().clone());
-            }
-
-            let _ = agent
-                .outgoing_tx
-                .unbounded_send(OutboundMessage::StateUpdate(StateUpdateMessage {
-                    new_id: state_id.0.to_string(),
-                    updates: vec![
-                        StateUpdate::FileUpdate(FileUpdateMessage {
-                            path: path.clone(),
-                            content,
-                        }),
-                        StateUpdate::CursorUpdate(CursorPositionUpdateMessage { path, offset }),
-                    ],
-                }));
-
-            Some(SupermavenCompletion {
-                id: state_id,
-                updates: updates_rx,
-            })
-        } else {
-            None
-        }
-    }
-
-    pub fn completion(
-        &self,
-        buffer: &Entity<Buffer>,
-        cursor_position: Anchor,
-        cx: &App,
-    ) -> Option<&str> {
-        if let Self::Spawned(agent) = self {
-            find_relevant_completion(
-                &agent.states,
-                buffer.entity_id(),
-                &buffer.read(cx).snapshot(),
-                cursor_position,
-            )
-        } else {
-            None
-        }
-    }
-
-    pub fn sign_out(&mut self) {
-        if let Self::Spawned(agent) = self {
-            agent
-                .outgoing_tx
-                .unbounded_send(OutboundMessage::Logout)
-                .ok();
-            // The account status will get set to RequiresActivation or Ready when the next
-            // message from the agent comes in. Until that happens, set the status to Unknown
-            // to disable the button.
-            agent.account_status = AccountStatus::Unknown;
-        }
-    }
-}
-
-fn find_relevant_completion<'a>(
-    states: &'a BTreeMap<SupermavenCompletionStateId, SupermavenCompletionState>,
-    buffer_id: EntityId,
-    buffer: &BufferSnapshot,
-    cursor_position: Anchor,
-) -> Option<&'a str> {
-    let mut best_completion: Option<&str> = None;
-    'completions: for state in states.values() {
-        if state.buffer_id != buffer_id {
-            continue;
-        }
-        let Some(state_completion) = state.text.strip_prefix(&state.dedent) else {
-            continue;
-        };
-
-        let current_cursor_offset = cursor_position.to_offset(buffer);
-        if current_cursor_offset < state.prefix_offset {
-            continue;
-        }
-
-        let original_cursor_offset = buffer.clip_offset(state.prefix_offset, text::Bias::Left);
-        let text_inserted_since_completion_request: String = buffer
-            .text_for_range(original_cursor_offset..current_cursor_offset)
-            .collect();
-        let trimmed_completion =
-            match state_completion.strip_prefix(&text_inserted_since_completion_request) {
-                Some(suffix) => suffix,
-                None => continue 'completions,
-            };
-
-        if best_completion.is_some_and(|best| best.len() > trimmed_completion.len()) {
-            continue;
-        }
-
-        best_completion = Some(trimmed_completion);
-    }
-    best_completion
-}
-
-pub struct SupermavenAgent {
-    _process: Child,
-    next_state_id: SupermavenCompletionStateId,
-    states: BTreeMap<SupermavenCompletionStateId, SupermavenCompletionState>,
-    outgoing_tx: mpsc::UnboundedSender<OutboundMessage>,
-    _handle_outgoing_messages: Task<Result<()>>,
-    _handle_incoming_messages: Task<Result<()>>,
-    pub account_status: AccountStatus,
-    service_tier: Option<ServiceTier>,
-    #[allow(dead_code)]
-    client: Arc<Client>,
-}
-
-impl SupermavenAgent {
-    fn new(
-        binary_path: PathBuf,
-        client: Arc<Client>,
-        cx: &mut Context<Supermaven>,
-    ) -> Result<Self> {
-        let mut process = util::command::new_smol_command(&binary_path)
-            .arg("stdio")
-            .stdin(Stdio::piped())
-            .stdout(Stdio::piped())
-            .stderr(Stdio::piped())
-            .kill_on_drop(true)
-            .spawn()
-            .context("failed to start the binary")?;
-
-        let stdin = process
-            .stdin
-            .take()
-            .context("failed to get stdin for process")?;
-        let stdout = process
-            .stdout
-            .take()
-            .context("failed to get stdout for process")?;
-
-        let (outgoing_tx, outgoing_rx) = mpsc::unbounded();
-
-        cx.spawn({
-            let client = client.clone();
-            let outgoing_tx = outgoing_tx.clone();
-            async move |this, cx| {
-                let mut status = client.status();
-                while let Some(status) = status.next().await {
-                    if status.is_connected() {
-                        let api_key = client.request(proto::GetSupermavenApiKey {}).await?.api_key;
-                        outgoing_tx
-                            .unbounded_send(OutboundMessage::SetApiKey(SetApiKey { api_key }))
-                            .ok();
-                        this.update(cx, |this, cx| {
-                            if let Supermaven::Spawned(this) = this {
-                                this.account_status = AccountStatus::Ready;
-                                cx.notify();
-                            }
-                        })?;
-                        break;
-                    }
-                }
-                anyhow::Ok(())
-            }
-        })
-        .detach();
-
-        Ok(Self {
-            _process: process,
-            next_state_id: SupermavenCompletionStateId::default(),
-            states: BTreeMap::default(),
-            outgoing_tx,
-            _handle_outgoing_messages: cx.spawn(async move |_, _cx| {
-                Self::handle_outgoing_messages(outgoing_rx, stdin).await
-            }),
-            _handle_incoming_messages: cx.spawn(async move |this, cx| {
-                Self::handle_incoming_messages(this, stdout, cx).await
-            }),
-            account_status: AccountStatus::Unknown,
-            service_tier: None,
-            client,
-        })
-    }
-
-    async fn handle_outgoing_messages(
-        mut outgoing: mpsc::UnboundedReceiver<OutboundMessage>,
-        mut stdin: ChildStdin,
-    ) -> Result<()> {
-        while let Some(message) = outgoing.next().await {
-            let bytes = serde_json::to_vec(&message)?;
-            stdin.write_all(&bytes).await?;
-            stdin.write_all(&[b'\n']).await?;
-        }
-        Ok(())
-    }
-
-    async fn handle_incoming_messages(
-        this: WeakEntity<Supermaven>,
-        stdout: ChildStdout,
-        cx: &mut AsyncApp,
-    ) -> Result<()> {
-        const MESSAGE_PREFIX: &str = "SM-MESSAGE ";
-
-        let stdout = BufReader::new(stdout);
-        let mut lines = stdout.lines();
-        while let Some(line) = lines.next().await {
-            let Some(line) = line.context("failed to read line from stdout").log_err() else {
-                continue;
-            };
-            let Some(line) = line.strip_prefix(MESSAGE_PREFIX) else {
-                continue;
-            };
-            let Some(message) = serde_json::from_str::<SupermavenMessage>(line)
-                .with_context(|| format!("failed to deserialize line from stdout: {:?}", line))
-                .log_err()
-            else {
-                continue;
-            };
-
-            this.update(cx, |this, _cx| {
-                if let Supermaven::Spawned(this) = this {
-                    this.handle_message(message);
-                }
-                Task::ready(anyhow::Ok(()))
-            })?
-            .await?;
-        }
-
-        Ok(())
-    }
-
-    fn handle_message(&mut self, message: SupermavenMessage) {
-        match message {
-            SupermavenMessage::ActivationRequest(request) => {
-                self.account_status = match request.activate_url {
-                    Some(activate_url) => AccountStatus::NeedsActivation { activate_url },
-                    None => AccountStatus::Ready,
-                };
-            }
-            SupermavenMessage::ActivationSuccess => {
-                self.account_status = AccountStatus::Ready;
-            }
-            SupermavenMessage::ServiceTier { service_tier } => {
-                self.account_status = AccountStatus::Ready;
-                self.service_tier = Some(service_tier);
-            }
-            SupermavenMessage::Response(response) => {
-                let state_id = SupermavenCompletionStateId(response.state_id.parse().unwrap());
-                if let Some(state) = self.states.get_mut(&state_id) {
-                    for item in &response.items {
-                        match item {
-                            ResponseItem::Text { text } => state.text.push_str(text),
-                            ResponseItem::Dedent { text } => state.dedent.push_str(text),
-                            _ => {}
-                        }
-                    }
-                    *state.updates_tx.borrow_mut() = ();
-                }
-            }
-            SupermavenMessage::Passthrough { passthrough } => self.handle_message(*passthrough),
-            _ => {
-                log::warn!("unhandled message: {:?}", message);
-            }
-        }
-    }
-}
-
-#[derive(Copy, Clone, Debug, Default, Eq, PartialEq, Ord, PartialOrd, Serialize, Deserialize)]
-pub struct SupermavenCompletionStateId(usize);
-
-#[allow(dead_code)]
-pub struct SupermavenCompletionState {
-    buffer_id: EntityId,
-    prefix_anchor: Anchor,
-    // prefix_offset is tracked independently because the anchor biases left which
-    // doesn't allow us to determine if the prior text has been deleted.
-    prefix_offset: usize,
-    text: String,
-    dedent: String,
-    updates_tx: watch::Sender<()>,
-}
-
-pub struct SupermavenCompletion {
-    pub id: SupermavenCompletionStateId,
-    pub updates: watch::Receiver<()>,
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use collections::BTreeMap;
-    use gpui::TestAppContext;
-    use language::Buffer;
-
-    #[gpui::test]
-    async fn test_find_relevant_completion_no_first_letter_skip(cx: &mut TestAppContext) {
-        let buffer = cx.new(|cx| Buffer::local("hello world", cx));
-        let buffer_snapshot = buffer.read_with(cx, |buffer, _| buffer.snapshot());
-
-        let mut states = BTreeMap::new();
-        let state_id = SupermavenCompletionStateId(1);
-        let (updates_tx, _) = watch::channel();
-
-        states.insert(
-            state_id,
-            SupermavenCompletionState {
-                buffer_id: buffer.entity_id(),
-                prefix_anchor: buffer_snapshot.anchor_before(0), // Start of buffer
-                prefix_offset: 0,
-                text: "hello".to_string(),
-                dedent: String::new(),
-                updates_tx,
-            },
-        );
-
-        let cursor_position = buffer_snapshot.anchor_after(1);
-
-        let result = find_relevant_completion(
-            &states,
-            buffer.entity_id(),
-            &buffer_snapshot,
-            cursor_position,
-        );
-
-        assert_eq!(result, Some("ello"));
-    }
-
-    #[gpui::test]
-    async fn test_find_relevant_completion_with_multiple_chars(cx: &mut TestAppContext) {
-        let buffer = cx.new(|cx| Buffer::local("hello world", cx));
-        let buffer_snapshot = buffer.read_with(cx, |buffer, _| buffer.snapshot());
-
-        let mut states = BTreeMap::new();
-        let state_id = SupermavenCompletionStateId(1);
-        let (updates_tx, _) = watch::channel();
-
-        states.insert(
-            state_id,
-            SupermavenCompletionState {
-                buffer_id: buffer.entity_id(),
-                prefix_anchor: buffer_snapshot.anchor_before(0), // Start of buffer
-                prefix_offset: 0,
-                text: "hello".to_string(),
-                dedent: String::new(),
-                updates_tx,
-            },
-        );
-
-        let cursor_position = buffer_snapshot.anchor_after(3);
-
-        let result = find_relevant_completion(
-            &states,
-            buffer.entity_id(),
-            &buffer_snapshot,
-            cursor_position,
-        );
-
-        assert_eq!(result, Some("lo"));
-    }
-}
diff --git a/crates/supermaven/src/supermaven_edit_prediction_delegate.rs b/crates/supermaven/src/supermaven_edit_prediction_delegate.rs
deleted file mode 100644
index 578bc894f2..0000000000
--- a/crates/supermaven/src/supermaven_edit_prediction_delegate.rs
+++ /dev/null
@@ -1,302 +0,0 @@
-use crate::{Supermaven, SupermavenCompletionStateId};
-use anyhow::Result;
-use edit_prediction_types::{Direction, EditPrediction, EditPredictionDelegate};
-use futures::StreamExt as _;
-use gpui::{App, Context, Entity, EntityId, Task};
-use language::{Anchor, Buffer, BufferSnapshot};
-use std::{
-    ops::{AddAssign, Range},
-    path::Path,
-    sync::Arc,
-    time::Duration,
-};
-use text::{ToOffset, ToPoint};
-use unicode_segmentation::UnicodeSegmentation;
-
-pub const DEBOUNCE_TIMEOUT: Duration = Duration::from_millis(75);
-
-pub struct SupermavenEditPredictionDelegate {
-    supermaven: Entity<Supermaven>,
-    buffer_id: Option<EntityId>,
-    completion_id: Option<SupermavenCompletionStateId>,
-    completion_text: Option<String>,
-    file_extension: Option<String>,
-    pending_refresh: Option<Task<Result<()>>>,
-    completion_position: Option<language::Anchor>,
-}
-
-impl SupermavenEditPredictionDelegate {
-    pub fn new(supermaven: Entity<Supermaven>) -> Self {
-        Self {
-            supermaven,
-            buffer_id: None,
-            completion_id: None,
-            completion_text: None,
-            file_extension: None,
-            pending_refresh: None,
-            completion_position: None,
-        }
-    }
-}
-
-// Computes the edit prediction from the difference between the completion text.
-// This is defined by greedily matching the buffer text against the completion text.
-// Inlays are inserted for parts of the completion text that are not present in the buffer text.
-// For example, given the completion text "axbyc" and the buffer text "xy", the rendered output in the editor would be "[a]x[b]y[c]".
-// The parts in brackets are the inlays.
-fn completion_from_diff(
-    snapshot: BufferSnapshot,
-    completion_text: &str,
-    position: Anchor,
-    delete_range: Range<Anchor>,
-) -> EditPrediction {
-    let buffer_text = snapshot.text_for_range(delete_range).collect::<String>();
-
-    let mut edits: Vec<(Range<language::Anchor>, Arc<str>)> = Vec::new();
-
-    let completion_graphemes: Vec<&str> = completion_text.graphemes(true).collect();
-    let buffer_graphemes: Vec<&str> = buffer_text.graphemes(true).collect();
-
-    let mut offset = position.to_offset(&snapshot);
-
-    let mut i = 0;
-    let mut j = 0;
-    while i < completion_graphemes.len() && j < buffer_graphemes.len() {
-        // find the next instance of the buffer text in the completion text.
-        let k = completion_graphemes[i..]
-            .iter()
-            .position(|c| *c == buffer_graphemes[j]);
-        match k {
-            Some(k) => {
-                if k != 0 {
-                    let offset = snapshot.anchor_after(offset);
-                    // the range from the current position to item is an inlay.
-                    let edit = (
-                        offset..offset,
-                        completion_graphemes[i..i + k].join("").into(),
-                    );
-                    edits.push(edit);
-                }
-                i += k + 1;
-                j += 1;
-                offset.add_assign(buffer_graphemes[j - 1].len());
-            }
-            None => {
-                // there are no more matching completions, so drop the remaining
-                // completion text as an inlay.
-                break;
-            }
-        }
-    }
-
-    if j == buffer_graphemes.len() && i < completion_graphemes.len() {
-        let offset = snapshot.anchor_after(offset);
-        // there is leftover completion text, so drop it as an inlay.
-        let edit_range = offset..offset;
-        let edit_text = completion_graphemes[i..].join("");
-        edits.push((edit_range, edit_text.into()));
-    }
-
-    EditPrediction::Local {
-        id: None,
-        edits,
-        edit_preview: None,
-    }
-}
-
-impl EditPredictionDelegate for SupermavenEditPredictionDelegate {
-    fn name() -> &'static str {
-        "supermaven"
-    }
-
-    fn display_name() -> &'static str {
-        "Supermaven"
-    }
-
-    fn show_predictions_in_menu() -> bool {
-        true
-    }
-
-    fn show_tab_accept_marker() -> bool {
-        true
-    }
-
-    fn supports_jump_to_edit() -> bool {
-        false
-    }
-
-    fn is_enabled(&self, _buffer: &Entity<Buffer>, _cursor_position: Anchor, cx: &App) -> bool {
-        self.supermaven.read(cx).is_enabled()
-    }
-
-    fn is_refreshing(&self, _cx: &App) -> bool {
-        self.pending_refresh.is_some() && self.completion_id.is_none()
-    }
-
-    fn refresh(
-        &mut self,
-        buffer_handle: Entity<Buffer>,
-        cursor_position: Anchor,
-        debounce: bool,
-        cx: &mut Context<Self>,
-    ) {
-        // Only make new completion requests when debounce is true (i.e., when text is typed)
-        // When debounce is false (i.e., cursor movement), we should not make new requests
-        if !debounce {
-            return;
-        }
-
-        reset_completion_cache(self, cx);
-
-        let Some(mut completion) = self.supermaven.update(cx, |supermaven, cx| {
-            supermaven.complete(&buffer_handle, cursor_position, cx)
-        }) else {
-            return;
-        };
-
-        self.pending_refresh = Some(cx.spawn(async move |this, cx| {
-            if debounce {
-                cx.background_executor().timer(DEBOUNCE_TIMEOUT).await;
-            }
-
-            while let Some(()) = completion.updates.next().await {
-                this.update(cx, |this, cx| {
-                    // Get the completion text and cache it
-                    if let Some(text) =
-                        this.supermaven
-                            .read(cx)
-                            .completion(&buffer_handle, cursor_position, cx)
-                    {
-                        this.completion_text = Some(text.to_string());
-
-                        this.completion_position = Some(cursor_position);
-                    }
-
-                    this.completion_id = Some(completion.id);
-                    this.buffer_id = Some(buffer_handle.entity_id());
-                    this.file_extension = buffer_handle.read(cx).file().and_then(|file| {
-                        Some(
-                            Path::new(file.file_name(cx))
-                                .extension()?
-                                .to_str()?
-                                .to_string(),
-                        )
-                    });
-                    cx.notify();
-                })?;
-            }
-            Ok(())
-        }));
-    }
-
-    fn cycle(
-        &mut self,
-        _buffer: Entity<Buffer>,
-        _cursor_position: Anchor,
-        _direction: Direction,
-        _cx: &mut Context<Self>,
-    ) {
-    }
-
-    fn accept(&mut self, _cx: &mut Context<Self>) {
-        reset_completion_cache(self, _cx);
-    }
-
-    fn discard(&mut self, _cx: &mut Context<Self>) {
-        reset_completion_cache(self, _cx);
-    }
-
-    fn suggest(
-        &mut self,
-        buffer: &Entity<Buffer>,
-        cursor_position: Anchor,
-        cx: &mut Context<Self>,
-    ) -> Option<EditPrediction> {
-        if self.buffer_id != Some(buffer.entity_id()) {
-            return None;
-        }
-
-        if self.completion_id.is_none() {
-            return None;
-        }
-
-        let completion_text = if let Some(cached_text) = &self.completion_text {
-            cached_text.as_str()
-        } else {
-            let text = self
-                .supermaven
-                .read(cx)
-                .completion(buffer, cursor_position, cx)?;
-            self.completion_text = Some(text.to_string());
-            text
-        };
-
-        // Check if the cursor is still at the same position as the completion request
-        // If we don't have a completion position stored, don't show the completion
-        if let Some(completion_position) = self.completion_position {
-            if cursor_position != completion_position {
-                return None;
-            }
-        } else {
-            return None;
-        }
-
-        let completion_text = trim_to_end_of_line_unless_leading_newline(completion_text);
-
-        let completion_text = completion_text.trim_end();
-
-        if !completion_text.trim().is_empty() {
-            let snapshot = buffer.read(cx).snapshot();
-
-            // Calculate the range from cursor to end of line correctly
-            let cursor_point = cursor_position.to_point(&snapshot);
-            let end_of_line = snapshot.anchor_after(language::Point::new(
-                cursor_point.row,
-                snapshot.line_len(cursor_point.row),
-            ));
-            let delete_range = cursor_position..end_of_line;
-
-            Some(completion_from_diff(
-                snapshot,
-                completion_text,
-                cursor_position,
-                delete_range,
-            ))
-        } else {
-            None
-        }
-    }
-}
-
-fn reset_completion_cache(
-    provider: &mut SupermavenEditPredictionDelegate,
-    _cx: &mut Context<SupermavenEditPredictionDelegate>,
-) {
-    provider.pending_refresh = None;
-    provider.completion_id = None;
-    provider.completion_text = None;
-    provider.completion_position = None;
-    provider.buffer_id = None;
-}
-
-fn trim_to_end_of_line_unless_leading_newline(text: &str) -> &str {
-    if has_leading_newline(text) {
-        text
-    } else if let Some(i) = text.find('\n') {
-        &text[..i]
-    } else {
-        text
-    }
-}
-
-fn has_leading_newline(text: &str) -> bool {
-    for c in text.chars() {
-        if c == '\n' {
-            return true;
-        }
-        if !c.is_whitespace() {
-            return false;
-        }
-    }
-    false
-}
diff --git a/crates/supermaven_api/Cargo.toml b/crates/supermaven_api/Cargo.toml
deleted file mode 100644
index 28868a9a74..0000000000
--- a/crates/supermaven_api/Cargo.toml
+++ /dev/null
@@ -1,23 +0,0 @@
-[package]
-name = "supermaven_api"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/supermaven_api.rs"
-doctest = false
-
-[dependencies]
-anyhow.workspace = true
-futures.workspace = true
-http_client.workspace = true
-paths.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-smol.workspace = true
-util.workspace = true
diff --git a/crates/supermaven_api/LICENSE-GPL b/crates/supermaven_api/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/supermaven_api/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/supermaven_api/src/supermaven_api.rs b/crates/supermaven_api/src/supermaven_api.rs
deleted file mode 100644
index 539826c817..0000000000
--- a/crates/supermaven_api/src/supermaven_api.rs
+++ /dev/null
@@ -1,291 +0,0 @@
-use anyhow::{Context as _, Result, anyhow};
-use futures::AsyncReadExt;
-use futures::io::BufReader;
-use http_client::{AsyncBody, HttpClient, Request as HttpRequest};
-use paths::supermaven_dir;
-use serde::{Deserialize, Serialize};
-use smol::fs::{self, File};
-use std::path::{Path, PathBuf};
-use std::sync::Arc;
-
-use util::fs::{make_file_executable, remove_matching};
-
-#[derive(Serialize)]
-pub struct GetExternalUserRequest {
-    pub id: String,
-}
-
-#[derive(Serialize)]
-pub struct CreateExternalUserRequest {
-    pub id: String,
-    pub email: String,
-}
-
-#[derive(Serialize)]
-pub struct DeleteExternalUserRequest {
-    pub id: String,
-}
-
-#[derive(Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct CreateExternalUserResponse {
-    pub api_key: String,
-}
-
-#[derive(Deserialize)]
-pub struct SupermavenApiError {
-    pub message: String,
-}
-
-pub struct SupermavenBinary {}
-
-pub struct SupermavenAdminApi {
-    admin_api_key: String,
-    api_url: String,
-    http_client: Arc<dyn HttpClient>,
-}
-
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SupermavenDownloadResponse {
-    pub download_url: String,
-    pub version: u64,
-    pub sha256_hash: String,
-}
-
-#[derive(Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SupermavenUser {
-    #[expect(
-        unused,
-        reason = "This field was found to be unused with serde library bump; it's left as is due to insufficient context on PO's side, but it *may* be fine to remove"
-    )]
-    id: String,
-    #[expect(
-        unused,
-        reason = "This field was found to be unused with serde library bump; it's left as is due to insufficient context on PO's side, but it *may* be fine to remove"
-    )]
-    email: String,
-    api_key: String,
-}
-
-impl SupermavenAdminApi {
-    pub fn new(admin_api_key: String, http_client: Arc<dyn HttpClient>) -> Self {
-        Self {
-            admin_api_key,
-            api_url: "https://supermaven.com/api/".to_string(),
-            http_client,
-        }
-    }
-
-    pub async fn try_get_user(
-        &self,
-        request: GetExternalUserRequest,
-    ) -> Result<Option<SupermavenUser>> {
-        let uri = format!("{}external-user/{}", &self.api_url, &request.id);
-
-        let request = HttpRequest::get(&uri).header("Authorization", self.admin_api_key.clone());
-
-        let mut response = self
-            .http_client
-            .send(request.body(AsyncBody::default())?)
-            .await
-            .with_context(|| "Unable to get Supermaven API Key".to_string())?;
-
-        let mut body = Vec::new();
-        response.body_mut().read_to_end(&mut body).await?;
-
-        if response.status().is_client_error() {
-            let error: SupermavenApiError = serde_json::from_slice(&body)?;
-            if error.message == "User not found" {
-                return Ok(None);
-            } else {
-                anyhow::bail!("Supermaven API error: {}", error.message);
-            }
-        } else if response.status().is_server_error() {
-            let error: SupermavenApiError = serde_json::from_slice(&body)?;
-            return Err(anyhow!("Supermaven API server error").context(error.message));
-        }
-
-        let body_str = std::str::from_utf8(&body)?;
-
-        Ok(Some(
-            serde_json::from_str::<SupermavenUser>(body_str)
-                .with_context(|| "Unable to parse Supermaven user response".to_string())?,
-        ))
-    }
-
-    pub async fn try_create_user(
-        &self,
-        request: CreateExternalUserRequest,
-    ) -> Result<CreateExternalUserResponse> {
-        let uri = format!("{}external-user", &self.api_url);
-
-        let request = HttpRequest::post(&uri)
-            .header("Authorization", self.admin_api_key.clone())
-            .body(AsyncBody::from(serde_json::to_vec(&request)?))?;
-
-        let mut response = self
-            .http_client
-            .send(request)
-            .await
-            .with_context(|| "Unable to create Supermaven API Key".to_string())?;
-
-        let mut body = Vec::new();
-        response.body_mut().read_to_end(&mut body).await?;
-
-        let body_str = std::str::from_utf8(&body)?;
-
-        if !response.status().is_success() {
-            let error: SupermavenApiError = serde_json::from_slice(&body)?;
-            return Err(anyhow!("Supermaven API server error").context(error.message));
-        }
-
-        serde_json::from_str::<CreateExternalUserResponse>(body_str)
-            .with_context(|| "Unable to parse Supermaven API Key response".to_string())
-    }
-
-    pub async fn try_delete_user(&self, request: DeleteExternalUserRequest) -> Result<()> {
-        let uri = format!("{}external-user/{}", &self.api_url, &request.id);
-
-        let request = HttpRequest::delete(&uri).header("Authorization", self.admin_api_key.clone());
-
-        let mut response = self
-            .http_client
-            .send(request.body(AsyncBody::default())?)
-            .await
-            .with_context(|| "Unable to delete Supermaven User".to_string())?;
-
-        let mut body = Vec::new();
-        response.body_mut().read_to_end(&mut body).await?;
-
-        if response.status().is_client_error() {
-            let error: SupermavenApiError = serde_json::from_slice(&body)?;
-            if error.message == "User not found" {
-                return Ok(());
-            } else {
-                anyhow::bail!("Supermaven API error: {}", error.message);
-            }
-        } else if response.status().is_server_error() {
-            let error: SupermavenApiError = serde_json::from_slice(&body)?;
-            return Err(anyhow!("Supermaven API server error").context(error.message));
-        }
-
-        Ok(())
-    }
-
-    pub async fn try_get_or_create_user(
-        &self,
-        request: CreateExternalUserRequest,
-    ) -> Result<CreateExternalUserResponse> {
-        let get_user_request = GetExternalUserRequest {
-            id: request.id.clone(),
-        };
-
-        match self.try_get_user(get_user_request).await? {
-            None => self.try_create_user(request).await,
-            Some(SupermavenUser { api_key, .. }) => Ok(CreateExternalUserResponse { api_key }),
-        }
-    }
-}
-
-pub async fn latest_release(
-    client: Arc<dyn HttpClient>,
-    platform: &str,
-    arch: &str,
-) -> Result<SupermavenDownloadResponse> {
-    let uri = format!(
-        "https://supermaven.com/api/download-path?platform={}&arch={}",
-        platform, arch
-    );
-
-    // Download is not authenticated
-    let request = HttpRequest::get(&uri);
-
-    let mut response = client
-        .send(request.body(AsyncBody::default())?)
-        .await
-        .with_context(|| "Unable to acquire Supermaven Agent".to_string())?;
-
-    let mut body = Vec::new();
-    response.body_mut().read_to_end(&mut body).await?;
-
-    if response.status().is_client_error() || response.status().is_server_error() {
-        let body_str = std::str::from_utf8(&body)?;
-        let error: SupermavenApiError = serde_json::from_str(body_str)?;
-        anyhow::bail!("Supermaven API error: {}", error.message);
-    }
-
-    serde_json::from_slice::<SupermavenDownloadResponse>(&body)
-        .with_context(|| "Unable to parse Supermaven Agent response".to_string())
-}
-
-pub fn version_path(version: u64) -> PathBuf {
-    supermaven_dir().join(format!(
-        "sm-agent-{}{}",
-        version,
-        std::env::consts::EXE_SUFFIX
-    ))
-}
-
-pub async fn has_version(version_path: &Path) -> bool {
-    fs::metadata(version_path).await.is_ok_and(|m| m.is_file())
-}
-
-pub async fn get_supermaven_agent_path(client: Arc<dyn HttpClient>) -> Result<PathBuf> {
-    fs::create_dir_all(supermaven_dir())
-        .await
-        .with_context(|| {
-            format!(
-                "Could not create Supermaven Agent Directory at {:?}",
-                supermaven_dir()
-            )
-        })?;
-
-    let platform = match std::env::consts::OS {
-        "macos" => "darwin",
-        "windows" => "windows",
-        "linux" => "linux",
-        unsupported => anyhow::bail!("unsupported platform {unsupported}"),
-    };
-
-    let arch = match std::env::consts::ARCH {
-        "x86_64" => "amd64",
-        "aarch64" => "arm64",
-        unsupported => anyhow::bail!("unsupported architecture {unsupported}"),
-    };
-
-    let download_info = latest_release(client.clone(), platform, arch).await?;
-
-    let binary_path = version_path(download_info.version);
-
-    if has_version(&binary_path).await {
-        // Due to an issue with the Supermaven binary not being made executable on
-        // earlier Zed versions and Supermaven releases not occurring that frequently,
-        // we ensure here that the found binary is actually executable.
-        make_file_executable(&binary_path).await?;
-
-        return Ok(binary_path);
-    }
-
-    let request = HttpRequest::get(&download_info.download_url);
-
-    let mut response = client
-        .send(request.body(AsyncBody::default())?)
-        .await
-        .with_context(|| "Unable to download Supermaven Agent".to_string())?;
-
-    let mut file = File::create(&binary_path)
-        .await
-        .with_context(|| format!("Unable to create file at {:?}", binary_path))?;
-
-    futures::io::copy(BufReader::new(response.body_mut()), &mut file)
-        .await
-        .with_context(|| format!("Unable to write binary to file at {:?}", binary_path))?;
-
-    make_file_executable(&binary_path).await?;
-
-    remove_matching(supermaven_dir(), |file| file != binary_path).await;
-
-    Ok(binary_path)
-}
diff --git a/crates/svg_preview/Cargo.toml b/crates/svg_preview/Cargo.toml
deleted file mode 100644
index 18f55e28d5..0000000000
--- a/crates/svg_preview/Cargo.toml
+++ /dev/null
@@ -1,20 +0,0 @@
-[package]
-name = "svg_preview"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/svg_preview.rs"
-
-[dependencies]
-multi_buffer.workspace = true
-file_icons.workspace = true
-gpui.workspace = true
-language.workspace = true
-ui.workspace = true
-workspace.workspace = true
diff --git a/crates/svg_preview/LICENSE-GPL b/crates/svg_preview/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/svg_preview/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/svg_preview/src/svg_preview.rs b/crates/svg_preview/src/svg_preview.rs
deleted file mode 100644
index ca1891394d..0000000000
--- a/crates/svg_preview/src/svg_preview.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-use gpui::{App, actions};
-use workspace::Workspace;
-
-pub mod svg_preview_view;
-
-actions!(
-    svg,
-    [
-        /// Opens an SVG preview for the current file.
-        OpenPreview,
-        /// Opens an SVG preview in a split pane.
-        OpenPreviewToTheSide,
-        /// Opens a following SVG preview that syncs with the editor.
-        OpenFollowingPreview
-    ]
-);
-
-pub fn init(cx: &mut App) {
-    cx.observe_new(|workspace: &mut Workspace, window, cx| {
-        let Some(window) = window else {
-            return;
-        };
-        crate::svg_preview_view::SvgPreviewView::register(workspace, window, cx);
-    })
-    .detach();
-}
diff --git a/crates/svg_preview/src/svg_preview_view.rs b/crates/svg_preview/src/svg_preview_view.rs
deleted file mode 100644
index a286dba437..0000000000
--- a/crates/svg_preview/src/svg_preview_view.rs
+++ /dev/null
@@ -1,341 +0,0 @@
-use std::mem;
-use std::sync::Arc;
-
-use file_icons::FileIcons;
-use gpui::{
-    App, Context, Entity, EventEmitter, FocusHandle, Focusable, IntoElement, ParentElement, Render,
-    RenderImage, Styled, Subscription, Task, WeakEntity, Window, div, img,
-};
-use language::{Buffer, BufferEvent};
-use multi_buffer::MultiBuffer;
-use ui::prelude::*;
-use workspace::item::Item;
-use workspace::{Pane, Workspace};
-
-use crate::{OpenFollowingPreview, OpenPreview, OpenPreviewToTheSide};
-
-pub struct SvgPreviewView {
-    focus_handle: FocusHandle,
-    buffer: Option<Entity<Buffer>>,
-    current_svg: Option<Result<Arc<RenderImage>, SharedString>>,
-    _refresh: Task<()>,
-    _buffer_subscription: Option<Subscription>,
-    _workspace_subscription: Option<Subscription>,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub enum SvgPreviewMode {
-    /// The preview will always show the contents of the provided editor.
-    Default,
-    /// The preview will "follow" the last active editor of an SVG file.
-    Follow,
-}
-
-impl SvgPreviewView {
-    pub fn new(
-        mode: SvgPreviewMode,
-        active_buffer: Entity<MultiBuffer>,
-        workspace_handle: WeakEntity<Workspace>,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) -> Entity<Self> {
-        cx.new(|cx| {
-            let workspace_subscription = if mode == SvgPreviewMode::Follow
-                && let Some(workspace) = workspace_handle.upgrade()
-            {
-                Some(Self::subscribe_to_workspace(workspace, window, cx))
-            } else {
-                None
-            };
-
-            let buffer = active_buffer.read_with(cx, |buffer, _cx| buffer.as_singleton());
-
-            let subscription = buffer
-                .as_ref()
-                .map(|buffer| Self::create_buffer_subscription(buffer, window, cx));
-
-            let mut this = Self {
-                focus_handle: cx.focus_handle(),
-                buffer,
-                current_svg: None,
-                _buffer_subscription: subscription,
-                _workspace_subscription: workspace_subscription,
-                _refresh: Task::ready(()),
-            };
-            this.render_image(window, cx);
-
-            this
-        })
-    }
-
-    fn subscribe_to_workspace(
-        workspace: Entity<Workspace>,
-        window: &Window,
-        cx: &mut Context<Self>,
-    ) -> Subscription {
-        cx.subscribe_in(
-            &workspace,
-            window,
-            move |this: &mut SvgPreviewView, workspace, event: &workspace::Event, window, cx| {
-                if let workspace::Event::ActiveItemChanged = event {
-                    let workspace = workspace.read(cx);
-                    if let Some(active_item) = workspace.active_item(cx)
-                        && let Some(buffer) = active_item.downcast::<MultiBuffer>()
-                        && Self::is_svg_file(&buffer, cx)
-                    {
-                        let Some(buffer) = buffer.read(cx).as_singleton() else {
-                            return;
-                        };
-                        if this.buffer.as_ref() != Some(&buffer) {
-                            this._buffer_subscription =
-                                Some(Self::create_buffer_subscription(&buffer, window, cx));
-                            this.buffer = Some(buffer);
-                            this.render_image(window, cx);
-                            cx.notify();
-                        }
-                    } else {
-                        this.set_current(None, window, cx);
-                    }
-                }
-            },
-        )
-    }
-
-    fn render_image(&mut self, window: &Window, cx: &mut Context<Self>) {
-        let Some(buffer) = self.buffer.as_ref() else {
-            return;
-        };
-        const SCALE_FACTOR: f32 = 1.0;
-
-        let renderer = cx.svg_renderer();
-        let content = buffer.read(cx).snapshot();
-        let background_task = cx.background_spawn(async move {
-            renderer.render_single_frame(content.text().as_bytes(), SCALE_FACTOR, true)
-        });
-
-        self._refresh = cx.spawn_in(window, async move |this, cx| {
-            let result = background_task.await;
-
-            this.update_in(cx, |view, window, cx| {
-                let current = result.map_err(|e| e.to_string().into());
-                view.set_current(Some(current), window, cx);
-            })
-            .ok();
-        });
-    }
-
-    fn set_current(
-        &mut self,
-        image: Option<Result<Arc<RenderImage>, SharedString>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(Ok(image)) = mem::replace(&mut self.current_svg, image) {
-            window.drop_image(image).ok();
-        }
-        cx.notify();
-    }
-
-    fn find_existing_preview_item_idx(
-        pane: &Pane,
-        buffer: &Entity<MultiBuffer>,
-        cx: &App,
-    ) -> Option<usize> {
-        let buffer_id = buffer.entity_id();
-        pane.items_of_type::<SvgPreviewView>()
-            .find(|view| {
-                view.read(cx)
-                    .buffer
-                    .as_ref()
-                    .is_some_and(|buffer| buffer.entity_id() == buffer_id)
-            })
-            .and_then(|view| pane.index_for_item(&view))
-    }
-
-    pub fn resolve_active_item_as_svg_buffer(
-        workspace: &Workspace,
-        cx: &mut Context<Workspace>,
-    ) -> Option<Entity<MultiBuffer>> {
-        workspace
-            .active_item(cx)?
-            .act_as::<MultiBuffer>(cx)
-            .filter(|buffer| Self::is_svg_file(&buffer, cx))
-    }
-
-    fn create_svg_view(
-        mode: SvgPreviewMode,
-        workspace: &mut Workspace,
-        buffer: Entity<MultiBuffer>,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) -> Entity<SvgPreviewView> {
-        let workspace_handle = workspace.weak_handle();
-        SvgPreviewView::new(mode, buffer, workspace_handle, window, cx)
-    }
-
-    fn create_buffer_subscription(
-        buffer: &Entity<Buffer>,
-        window: &Window,
-        cx: &mut Context<Self>,
-    ) -> Subscription {
-        cx.subscribe_in(
-            buffer,
-            window,
-            move |this, _buffer, event: &BufferEvent, window, cx| match event {
-                BufferEvent::Edited | BufferEvent::Saved => {
-                    this.render_image(window, cx);
-                }
-                _ => {}
-            },
-        )
-    }
-
-    pub fn is_svg_file(buffer: &Entity<MultiBuffer>, cx: &App) -> bool {
-        buffer
-            .read(cx)
-            .as_singleton()
-            .and_then(|buffer| buffer.read(cx).file())
-            .is_some_and(|file| {
-                file.path()
-                    .extension()
-                    .is_some_and(|ext| ext.eq_ignore_ascii_case("svg"))
-            })
-    }
-
-    pub fn register(workspace: &mut Workspace, _window: &mut Window, _cx: &mut Context<Workspace>) {
-        workspace.register_action(move |workspace, _: &OpenPreview, window, cx| {
-            if let Some(buffer) = Self::resolve_active_item_as_svg_buffer(workspace, cx)
-                && Self::is_svg_file(&buffer, cx)
-            {
-                let view = Self::create_svg_view(
-                    SvgPreviewMode::Default,
-                    workspace,
-                    buffer.clone(),
-                    window,
-                    cx,
-                );
-                workspace.active_pane().update(cx, |pane, cx| {
-                    if let Some(existing_view_idx) =
-                        Self::find_existing_preview_item_idx(pane, &buffer, cx)
-                    {
-                        pane.activate_item(existing_view_idx, true, true, window, cx);
-                    } else {
-                        pane.add_item(Box::new(view), true, true, None, window, cx)
-                    }
-                });
-                cx.notify();
-            }
-        });
-
-        workspace.register_action(move |workspace, _: &OpenPreviewToTheSide, window, cx| {
-            if let Some(editor) = Self::resolve_active_item_as_svg_buffer(workspace, cx)
-                && Self::is_svg_file(&editor, cx)
-            {
-                let editor_clone = editor.clone();
-                let view = Self::create_svg_view(
-                    SvgPreviewMode::Default,
-                    workspace,
-                    editor_clone,
-                    window,
-                    cx,
-                );
-                let pane = workspace
-                    .find_pane_in_direction(workspace::SplitDirection::Right, cx)
-                    .unwrap_or_else(|| {
-                        workspace.split_pane(
-                            workspace.active_pane().clone(),
-                            workspace::SplitDirection::Right,
-                            window,
-                            cx,
-                        )
-                    });
-                pane.update(cx, |pane, cx| {
-                    if let Some(existing_view_idx) =
-                        Self::find_existing_preview_item_idx(pane, &editor, cx)
-                    {
-                        pane.activate_item(existing_view_idx, true, true, window, cx);
-                    } else {
-                        pane.add_item(Box::new(view), false, false, None, window, cx)
-                    }
-                });
-                cx.notify();
-            }
-        });
-
-        workspace.register_action(move |workspace, _: &OpenFollowingPreview, window, cx| {
-            if let Some(editor) = Self::resolve_active_item_as_svg_buffer(workspace, cx)
-                && Self::is_svg_file(&editor, cx)
-            {
-                let view =
-                    Self::create_svg_view(SvgPreviewMode::Follow, workspace, editor, window, cx);
-                workspace.active_pane().update(cx, |pane, cx| {
-                    pane.add_item(Box::new(view), true, true, None, window, cx)
-                });
-                cx.notify();
-            }
-        });
-    }
-}
-
-impl Render for SvgPreviewView {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .id("SvgPreview")
-            .key_context("SvgPreview")
-            .track_focus(&self.focus_handle(cx))
-            .size_full()
-            .bg(cx.theme().colors().editor_background)
-            .flex()
-            .justify_center()
-            .items_center()
-            .map(|this| match self.current_svg.clone() {
-                Some(Ok(image)) => {
-                    this.child(img(image).max_w_full().max_h_full().with_fallback(|| {
-                        h_flex()
-                            .p_4()
-                            .gap_2()
-                            .child(Icon::new(IconName::Warning))
-                            .child("Failed to load SVG image")
-                            .into_any_element()
-                    }))
-                }
-                Some(Err(e)) => this.child(div().p_4().child(e).into_any_element()),
-                None => this.child(div().p_4().child("No SVG file selected")),
-            })
-    }
-}
-
-impl Focusable for SvgPreviewView {
-    fn focus_handle(&self, _cx: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl EventEmitter<()> for SvgPreviewView {}
-
-impl Item for SvgPreviewView {
-    type Event = ();
-
-    fn tab_icon(&self, _window: &Window, cx: &App) -> Option<Icon> {
-        self.buffer
-            .as_ref()
-            .and_then(|buffer| buffer.read(cx).file())
-            .and_then(|file| FileIcons::get_icon(file.path().as_std_path(), cx))
-            .map(Icon::from_path)
-            .or_else(|| Some(Icon::new(IconName::Image)))
-    }
-
-    fn tab_content_text(&self, _detail: usize, cx: &App) -> SharedString {
-        self.buffer
-            .as_ref()
-            .and_then(|svg_path| svg_path.read(cx).file())
-            .map(|name| format!("Preview {}", name.file_name(cx)).into())
-            .unwrap_or_else(|| "SVG Preview".into())
-    }
-
-    fn telemetry_event_text(&self) -> Option<&'static str> {
-        Some("svg preview: open")
-    }
-
-    fn to_item_events(_event: &Self::Event, _f: impl FnMut(workspace::item::ItemEvent)) {}
-}
diff --git a/crates/system_specs/Cargo.toml b/crates/system_specs/Cargo.toml
deleted file mode 100644
index 15d6822b38..0000000000
--- a/crates/system_specs/Cargo.toml
+++ /dev/null
@@ -1,28 +0,0 @@
-[package]
-name = "system_specs"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/system_specs.rs"
-
-[features]
-default = []
-
-[dependencies]
-anyhow.workspace = true
-client.workspace = true
-gpui.workspace = true
-human_bytes.workspace = true
-release_channel.workspace = true
-semver.workspace = true
-serde.workspace = true
-sysinfo.workspace = true
-
-[target.'cfg(any(target_os = "linux", target_os = "freebsd"))'.dependencies]
-pciid-parser.workspace = true
diff --git a/crates/system_specs/LICENSE-GPL b/crates/system_specs/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/system_specs/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/system_specs/src/system_specs.rs b/crates/system_specs/src/system_specs.rs
deleted file mode 100644
index 139f23d193..0000000000
--- a/crates/system_specs/src/system_specs.rs
+++ /dev/null
@@ -1,295 +0,0 @@
-use client::telemetry;
-pub use gpui::GpuSpecs;
-use gpui::{App, AppContext as _, Task, Window, actions};
-use human_bytes::human_bytes;
-use release_channel::{AppCommitSha, AppVersion, ReleaseChannel};
-use semver::Version;
-use serde::Serialize;
-use std::{env, fmt::Display};
-use sysinfo::{MemoryRefreshKind, RefreshKind, System};
-
-actions!(
-    zed,
-    [
-        /// Copies system specifications to the clipboard for bug reports.
-        CopySystemSpecsIntoClipboard,
-    ]
-);
-
-#[derive(Clone, Debug, Serialize)]
-pub struct SystemSpecs {
-    app_version: String,
-    release_channel: &'static str,
-    os_name: String,
-    os_version: String,
-    memory: u64,
-    architecture: &'static str,
-    commit_sha: Option<String>,
-    bundle_type: Option<String>,
-    gpu_specs: Option<String>,
-}
-
-impl SystemSpecs {
-    pub fn new(window: &mut Window, cx: &mut App) -> Task<Self> {
-        let app_version = AppVersion::global(cx).to_string();
-        let release_channel = ReleaseChannel::global(cx);
-        let os_name = telemetry::os_name();
-        let system = System::new_with_specifics(
-            RefreshKind::nothing().with_memory(MemoryRefreshKind::everything()),
-        );
-        let memory = system.total_memory();
-        let architecture = env::consts::ARCH;
-        let commit_sha = match release_channel {
-            ReleaseChannel::Dev | ReleaseChannel::Nightly => {
-                AppCommitSha::try_global(cx).map(|sha| sha.full())
-            }
-            _ => None,
-        };
-        let bundle_type = bundle_type();
-
-        let gpu_specs = window.gpu_specs().map(|specs| {
-            format!(
-                "{} || {} || {}",
-                specs.device_name, specs.driver_name, specs.driver_info
-            )
-        });
-
-        cx.background_spawn(async move {
-            let os_version = telemetry::os_version();
-            SystemSpecs {
-                app_version,
-                release_channel: release_channel.display_name(),
-                bundle_type,
-                os_name,
-                os_version,
-                memory,
-                architecture,
-                commit_sha,
-                gpu_specs,
-            }
-        })
-    }
-
-    pub fn new_stateless(
-        app_version: Version,
-        app_commit_sha: Option<AppCommitSha>,
-        release_channel: ReleaseChannel,
-    ) -> Self {
-        let os_name = telemetry::os_name();
-        let os_version = telemetry::os_version();
-        let system = System::new_with_specifics(
-            RefreshKind::nothing().with_memory(MemoryRefreshKind::everything()),
-        );
-        let memory = system.total_memory();
-        let architecture = env::consts::ARCH;
-        let commit_sha = match release_channel {
-            ReleaseChannel::Dev | ReleaseChannel::Nightly => app_commit_sha.map(|sha| sha.full()),
-            _ => None,
-        };
-        let bundle_type = bundle_type();
-
-        Self {
-            app_version: app_version.to_string(),
-            release_channel: release_channel.display_name(),
-            os_name,
-            os_version,
-            memory,
-            architecture,
-            commit_sha,
-            bundle_type,
-            gpu_specs: try_determine_available_gpus(),
-        }
-    }
-}
-
-impl Display for SystemSpecs {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let os_information = format!("OS: {} {}", self.os_name, self.os_version);
-        let app_version_information = format!(
-            "Zed: v{} ({}) {}{}",
-            self.app_version,
-            match &self.commit_sha {
-                Some(commit_sha) => format!("{} {}", self.release_channel, commit_sha),
-                None => self.release_channel.to_string(),
-            },
-            if let Some(bundle_type) = &self.bundle_type {
-                format!("({bundle_type})")
-            } else {
-                "".to_string()
-            },
-            if cfg!(debug_assertions) {
-                "(Taylor's Version)"
-            } else {
-                ""
-            },
-        );
-        let system_specs = [
-            app_version_information,
-            os_information,
-            format!("Memory: {}", human_bytes(self.memory as f64)),
-            format!("Architecture: {}", self.architecture),
-        ]
-        .into_iter()
-        .chain(
-            self.gpu_specs
-                .as_ref()
-                .map(|specs| format!("GPU: {}", specs)),
-        )
-        .collect::<Vec<String>>()
-        .join("\n");
-
-        write!(f, "{system_specs}")
-    }
-}
-
-fn try_determine_available_gpus() -> Option<String> {
-    #[cfg(any(target_os = "linux", target_os = "freebsd"))]
-    {
-        #[allow(
-            clippy::disallowed_methods,
-            reason = "we are not running in an executor"
-        )]
-        std::process::Command::new("vulkaninfo")
-            .args(&["--summary"])
-            .output()
-            .ok()
-            .map(|output| {
-                [
-                    "<details><summary>`vulkaninfo --summary` output</summary>",
-                    "",
-                    "```",
-                    String::from_utf8_lossy(&output.stdout).as_ref(),
-                    "```",
-                    "</details>",
-                ]
-                .join("\n")
-            })
-            .or(Some("Failed to run `vulkaninfo --summary`".to_string()))
-    }
-    #[cfg(not(any(target_os = "linux", target_os = "freebsd")))]
-    {
-        None
-    }
-}
-
-#[derive(Debug, PartialEq, Eq, serde::Deserialize, serde::Serialize, Clone)]
-pub struct GpuInfo {
-    pub device_name: Option<String>,
-    pub device_pci_id: u16,
-    pub vendor_name: Option<String>,
-    pub vendor_pci_id: u16,
-    pub driver_version: Option<String>,
-    pub driver_name: Option<String>,
-}
-
-#[cfg(any(target_os = "linux", target_os = "freebsd"))]
-pub fn read_gpu_info_from_sys_class_drm() -> anyhow::Result<Vec<GpuInfo>> {
-    use anyhow::Context as _;
-    use pciid_parser;
-    let dir_iter = std::fs::read_dir("/sys/class/drm").context("Failed to read /sys/class/drm")?;
-    let mut pci_addresses = vec![];
-    let mut gpus = Vec::<GpuInfo>::new();
-    let pci_db = pciid_parser::Database::read().ok();
-    for entry in dir_iter {
-        let Ok(entry) = entry else {
-            continue;
-        };
-
-        let device_path = entry.path().join("device");
-        let Some(pci_address) = device_path.read_link().ok().and_then(|pci_address| {
-            pci_address
-                .file_name()
-                .and_then(std::ffi::OsStr::to_str)
-                .map(str::trim)
-                .map(str::to_string)
-        }) else {
-            continue;
-        };
-        let Ok(device_pci_id) = read_pci_id_from_path(device_path.join("device")) else {
-            continue;
-        };
-        let Ok(vendor_pci_id) = read_pci_id_from_path(device_path.join("vendor")) else {
-            continue;
-        };
-        let driver_name = std::fs::read_link(device_path.join("driver"))
-            .ok()
-            .and_then(|driver_link| {
-                driver_link
-                    .file_name()
-                    .and_then(std::ffi::OsStr::to_str)
-                    .map(str::trim)
-                    .map(str::to_string)
-            });
-        let driver_version = driver_name
-            .as_ref()
-            .and_then(|driver_name| {
-                std::fs::read_to_string(format!("/sys/module/{driver_name}/version")).ok()
-            })
-            .as_deref()
-            .map(str::trim)
-            .map(str::to_string);
-
-        let already_found = gpus
-            .iter()
-            .zip(&pci_addresses)
-            .any(|(gpu, gpu_pci_address)| {
-                gpu_pci_address == &pci_address
-                    && gpu.driver_version == driver_version
-                    && gpu.driver_name == driver_name
-            });
-
-        if already_found {
-            continue;
-        }
-
-        let vendor = pci_db
-            .as_ref()
-            .and_then(|db| db.vendors.get(&vendor_pci_id));
-        let vendor_name = vendor.map(|vendor| vendor.name.clone());
-        let device_name = vendor
-            .and_then(|vendor| vendor.devices.get(&device_pci_id))
-            .map(|device| device.name.clone());
-
-        gpus.push(GpuInfo {
-            device_name,
-            device_pci_id,
-            vendor_name,
-            vendor_pci_id,
-            driver_version,
-            driver_name,
-        });
-        pci_addresses.push(pci_address);
-    }
-
-    Ok(gpus)
-}
-
-#[cfg(any(target_os = "linux", target_os = "freebsd"))]
-fn read_pci_id_from_path(path: impl AsRef<std::path::Path>) -> anyhow::Result<u16> {
-    use anyhow::Context as _;
-    let id = std::fs::read_to_string(path)?;
-    let id = id
-        .trim()
-        .strip_prefix("0x")
-        .context("Not a device ID")
-        .context(id.clone())?;
-    anyhow::ensure!(
-        id.len() == 4,
-        "Not a device id, expected 4 digits, found {}",
-        id.len()
-    );
-    u16::from_str_radix(id, 16).context("Failed to parse device ID")
-}
-
-/// Returns value of `ZED_BUNDLE_TYPE` set at compiletime or else at runtime.
-///
-/// The compiletime value is used by flatpak since it doesn't seem to have a way to provide a
-/// runtime environment variable.
-///
-/// The runtime value is used by snap since the Zed snaps use release binaries directly, and so
-/// cannot have this baked in.
-fn bundle_type() -> Option<String> {
-    option_env!("ZED_BUNDLE_TYPE")
-        .map(|bundle_type| bundle_type.to_string())
-        .or_else(|| env::var("ZED_BUNDLE_TYPE").ok())
-}
diff --git a/crates/tab_switcher/Cargo.toml b/crates/tab_switcher/Cargo.toml
deleted file mode 100644
index 36e4ba7734..0000000000
--- a/crates/tab_switcher/Cargo.toml
+++ /dev/null
@@ -1,39 +0,0 @@
-[package]
-name = "tab_switcher"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/tab_switcher.rs"
-doctest = false
-
-[dependencies]
-collections.workspace = true
-editor.workspace = true
-fuzzy.workspace = true
-gpui.workspace = true
-menu.workspace = true
-picker.workspace = true
-project.workspace = true
-schemars.workspace = true
-serde.workspace = true
-settings.workspace = true
-smol.workspace = true
-ui.workspace = true
-util.workspace = true
-workspace.workspace = true
-
-[dev-dependencies]
-anyhow.workspace = true
-ctor.workspace = true
-gpui = { workspace = true, features = ["test-support"] }
-language = { workspace = true, features = ["test-support"] }
-serde_json.workspace = true
-theme = { workspace = true, features = ["test-support"] }
-workspace = { workspace = true, features = ["test-support"] }
-zlog.workspace = true
diff --git a/crates/tab_switcher/LICENSE-GPL b/crates/tab_switcher/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/tab_switcher/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/tab_switcher/src/tab_switcher.rs b/crates/tab_switcher/src/tab_switcher.rs
deleted file mode 100644
index 85186ad504..0000000000
--- a/crates/tab_switcher/src/tab_switcher.rs
+++ /dev/null
@@ -1,758 +0,0 @@
-#[cfg(test)]
-mod tab_switcher_tests;
-
-use collections::HashMap;
-use editor::items::{
-    entry_diagnostic_aware_icon_decoration_and_color, entry_git_aware_label_color,
-};
-use fuzzy::StringMatchCandidate;
-use gpui::{
-    Action, AnyElement, App, Context, DismissEvent, Entity, EntityId, EventEmitter, FocusHandle,
-    Focusable, Modifiers, ModifiersChangedEvent, MouseButton, MouseUpEvent, ParentElement, Point,
-    Render, Styled, Task, WeakEntity, Window, actions, rems,
-};
-use picker::{Picker, PickerDelegate};
-use project::Project;
-use schemars::JsonSchema;
-use serde::Deserialize;
-use settings::Settings;
-use std::{cmp::Reverse, sync::Arc};
-use ui::{
-    DecoratedIcon, IconDecoration, IconDecorationKind, ListItem, ListItemSpacing, Tooltip,
-    prelude::*,
-};
-use util::ResultExt;
-use workspace::{
-    Event as WorkspaceEvent, ModalView, Pane, SaveIntent, Workspace,
-    item::{ItemHandle, ItemSettings, ShowDiagnostics, TabContentParams},
-    pane::{render_item_indicator, tab_details},
-};
-
-const PANEL_WIDTH_REMS: f32 = 28.;
-
-/// Toggles the tab switcher interface.
-#[derive(PartialEq, Clone, Deserialize, JsonSchema, Default, Action)]
-#[action(namespace = tab_switcher)]
-#[serde(deny_unknown_fields)]
-pub struct Toggle {
-    #[serde(default)]
-    pub select_last: bool,
-}
-actions!(
-    tab_switcher,
-    [
-        /// Closes the selected item in the tab switcher.
-        CloseSelectedItem,
-        /// Toggles between showing all tabs or just the current pane's tabs.
-        ToggleAll
-    ]
-);
-
-pub struct TabSwitcher {
-    picker: Entity<Picker<TabSwitcherDelegate>>,
-    init_modifiers: Option<Modifiers>,
-}
-
-impl ModalView for TabSwitcher {}
-
-pub fn init(cx: &mut App) {
-    cx.observe_new(TabSwitcher::register).detach();
-}
-
-impl TabSwitcher {
-    fn register(
-        workspace: &mut Workspace,
-        _window: Option<&mut Window>,
-        _: &mut Context<Workspace>,
-    ) {
-        workspace.register_action(|workspace, action: &Toggle, window, cx| {
-            let Some(tab_switcher) = workspace.active_modal::<Self>(cx) else {
-                Self::open(workspace, action.select_last, false, window, cx);
-                return;
-            };
-
-            tab_switcher.update(cx, |tab_switcher, cx| {
-                tab_switcher
-                    .picker
-                    .update(cx, |picker, cx| picker.cycle_selection(window, cx))
-            });
-        });
-        workspace.register_action(|workspace, _action: &ToggleAll, window, cx| {
-            let Some(tab_switcher) = workspace.active_modal::<Self>(cx) else {
-                Self::open(workspace, false, true, window, cx);
-                return;
-            };
-
-            tab_switcher.update(cx, |tab_switcher, cx| {
-                tab_switcher
-                    .picker
-                    .update(cx, |picker, cx| picker.cycle_selection(window, cx))
-            });
-        });
-    }
-
-    fn open(
-        workspace: &mut Workspace,
-        select_last: bool,
-        is_global: bool,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        let mut weak_pane = workspace.active_pane().downgrade();
-        for dock in [
-            workspace.left_dock(),
-            workspace.bottom_dock(),
-            workspace.right_dock(),
-        ] {
-            dock.update(cx, |this, cx| {
-                let Some(panel) = this
-                    .active_panel()
-                    .filter(|panel| panel.panel_focus_handle(cx).contains_focused(window, cx))
-                else {
-                    return;
-                };
-                if let Some(pane) = panel.pane(cx) {
-                    weak_pane = pane.downgrade();
-                }
-            })
-        }
-
-        let weak_workspace = workspace.weak_handle();
-
-        let project = workspace.project().clone();
-        let original_items: Vec<_> = workspace
-            .panes()
-            .iter()
-            .map(|p| (p.clone(), p.read(cx).active_item_index()))
-            .collect();
-        workspace.toggle_modal(window, cx, |window, cx| {
-            let delegate = TabSwitcherDelegate::new(
-                project,
-                select_last,
-                cx.entity().downgrade(),
-                weak_pane,
-                weak_workspace,
-                is_global,
-                window,
-                cx,
-                original_items,
-            );
-            TabSwitcher::new(delegate, window, is_global, cx)
-        });
-    }
-
-    fn new(
-        delegate: TabSwitcherDelegate,
-        window: &mut Window,
-        is_global: bool,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let init_modifiers = if is_global {
-            None
-        } else {
-            window.modifiers().modified().then_some(window.modifiers())
-        };
-        Self {
-            picker: cx.new(|cx| {
-                if is_global {
-                    Picker::list(delegate, window, cx)
-                } else {
-                    Picker::nonsearchable_list(delegate, window, cx)
-                }
-            }),
-            init_modifiers,
-        }
-    }
-
-    fn handle_modifiers_changed(
-        &mut self,
-        event: &ModifiersChangedEvent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(init_modifiers) = self.init_modifiers else {
-            return;
-        };
-        if !event.modified() || !init_modifiers.is_subset_of(event) {
-            self.init_modifiers = None;
-            if self.picker.read(cx).delegate.matches.is_empty() {
-                cx.emit(DismissEvent)
-            } else {
-                window.dispatch_action(menu::Confirm.boxed_clone(), cx);
-            }
-        }
-    }
-
-    fn handle_close_selected_item(
-        &mut self,
-        _: &CloseSelectedItem,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.picker.update(cx, |picker, cx| {
-            picker
-                .delegate
-                .close_item_at(picker.delegate.selected_index(), window, cx)
-        });
-    }
-}
-
-impl EventEmitter<DismissEvent> for TabSwitcher {}
-
-impl Focusable for TabSwitcher {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        self.picker.focus_handle(cx)
-    }
-}
-
-impl Render for TabSwitcher {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .key_context("TabSwitcher")
-            .w(rems(PANEL_WIDTH_REMS))
-            .on_modifiers_changed(cx.listener(Self::handle_modifiers_changed))
-            .on_action(cx.listener(Self::handle_close_selected_item))
-            .child(self.picker.clone())
-    }
-}
-
-#[derive(Clone)]
-struct TabMatch {
-    pane: WeakEntity<Pane>,
-    item_index: usize,
-    item: Box<dyn ItemHandle>,
-    detail: usize,
-    preview: bool,
-}
-
-pub struct TabSwitcherDelegate {
-    select_last: bool,
-    tab_switcher: WeakEntity<TabSwitcher>,
-    selected_index: usize,
-    pane: WeakEntity<Pane>,
-    workspace: WeakEntity<Workspace>,
-    project: Entity<Project>,
-    matches: Vec<TabMatch>,
-    original_items: Vec<(Entity<Pane>, usize)>,
-    is_all_panes: bool,
-    restored_items: bool,
-}
-
-impl TabMatch {
-    fn icon(
-        &self,
-        project: &Entity<Project>,
-        selected: bool,
-        window: &Window,
-        cx: &App,
-    ) -> Option<DecoratedIcon> {
-        let icon = self.item.tab_icon(window, cx)?;
-        let item_settings = ItemSettings::get_global(cx);
-        let show_diagnostics = item_settings.show_diagnostics;
-        let git_status_color = item_settings
-            .git_status
-            .then(|| {
-                let path = self.item.project_path(cx)?;
-                let project = project.read(cx);
-                let entry = project.entry_for_path(&path, cx)?;
-                let git_status = project
-                    .project_path_git_status(&path, cx)
-                    .map(|status| status.summary())
-                    .unwrap_or_default();
-                Some(entry_git_aware_label_color(
-                    git_status,
-                    entry.is_ignored,
-                    selected,
-                ))
-            })
-            .flatten();
-        let colored_icon = icon.color(git_status_color.unwrap_or_default());
-
-        let most_severe_diagnostic_level = if show_diagnostics == ShowDiagnostics::Off {
-            None
-        } else {
-            let buffer_store = project.read(cx).buffer_store().read(cx);
-            let buffer = self
-                .item
-                .project_path(cx)
-                .and_then(|path| buffer_store.get_by_path(&path))
-                .map(|buffer| buffer.read(cx));
-            buffer.and_then(|buffer| {
-                buffer
-                    .buffer_diagnostics(None)
-                    .iter()
-                    .map(|diagnostic_entry| diagnostic_entry.diagnostic.severity)
-                    .min()
-            })
-        };
-
-        let decorations =
-            entry_diagnostic_aware_icon_decoration_and_color(most_severe_diagnostic_level)
-                .filter(|(d, _)| {
-                    *d != IconDecorationKind::Triangle
-                        || show_diagnostics != ShowDiagnostics::Errors
-                })
-                .map(|(icon, color)| {
-                    let knockout_item_color = if selected {
-                        cx.theme().colors().element_selected
-                    } else {
-                        cx.theme().colors().element_background
-                    };
-                    IconDecoration::new(icon, knockout_item_color, cx)
-                        .color(color.color(cx))
-                        .position(Point {
-                            x: px(-2.),
-                            y: px(-2.),
-                        })
-                });
-        Some(DecoratedIcon::new(colored_icon, decorations))
-    }
-}
-
-impl TabSwitcherDelegate {
-    #[allow(clippy::complexity)]
-    fn new(
-        project: Entity<Project>,
-        select_last: bool,
-        tab_switcher: WeakEntity<TabSwitcher>,
-        pane: WeakEntity<Pane>,
-        workspace: WeakEntity<Workspace>,
-        is_all_panes: bool,
-        window: &mut Window,
-        cx: &mut Context<TabSwitcher>,
-        original_items: Vec<(Entity<Pane>, usize)>,
-    ) -> Self {
-        Self::subscribe_to_updates(&workspace, window, cx);
-        Self {
-            select_last,
-            tab_switcher,
-            selected_index: 0,
-            pane,
-            workspace,
-            project,
-            matches: Vec::new(),
-            is_all_panes,
-            original_items,
-            restored_items: false,
-        }
-    }
-
-    fn subscribe_to_updates(
-        workspace: &WeakEntity<Workspace>,
-        window: &mut Window,
-        cx: &mut Context<TabSwitcher>,
-    ) {
-        let Some(workspace) = workspace.upgrade() else {
-            return;
-        };
-        cx.subscribe_in(&workspace, window, |tab_switcher, _, event, window, cx| {
-            match event {
-                WorkspaceEvent::ItemAdded { .. } | WorkspaceEvent::PaneRemoved => {
-                    tab_switcher.picker.update(cx, |picker, cx| {
-                        let query = picker.query(cx);
-                        picker.delegate.update_matches(query, window, cx);
-                        cx.notify();
-                    })
-                }
-                WorkspaceEvent::ItemRemoved { .. } => {
-                    tab_switcher.picker.update(cx, |picker, cx| {
-                        let query = picker.query(cx);
-                        picker.delegate.update_matches(query, window, cx);
-
-                        // When the Tab Switcher is being used and an item is
-                        // removed, there's a chance that the new selected index
-                        // will not match the actual tab that is now being displayed
-                        // by the pane, as such, the selected index needs to be
-                        // updated to match the pane's state.
-                        picker.delegate.sync_selected_index(cx);
-                        cx.notify();
-                    })
-                }
-                _ => {}
-            };
-        })
-        .detach();
-    }
-
-    fn update_all_pane_matches(
-        &mut self,
-        query: String,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) {
-        let Some(workspace) = self.workspace.upgrade() else {
-            return;
-        };
-        let mut all_items = Vec::new();
-        let mut item_index = 0;
-        for pane_handle in workspace.read(cx).panes() {
-            let pane = pane_handle.read(cx);
-            let items: Vec<Box<dyn ItemHandle>> =
-                pane.items().map(|item| item.boxed_clone()).collect();
-            for ((_detail, item), detail) in items
-                .iter()
-                .enumerate()
-                .zip(tab_details(&items, window, cx))
-            {
-                all_items.push(TabMatch {
-                    pane: pane_handle.downgrade(),
-                    item_index,
-                    item: item.clone(),
-                    detail,
-                    preview: pane.is_active_preview_item(item.item_id()),
-                });
-                item_index += 1;
-            }
-        }
-
-        let matches = if query.is_empty() {
-            let history = workspace.read(cx).recently_activated_items(cx);
-            all_items
-                .sort_by_key(|tab| (Reverse(history.get(&tab.item.item_id())), tab.item_index));
-            all_items
-        } else {
-            let candidates = all_items
-                .iter()
-                .enumerate()
-                .flat_map(|(ix, tab_match)| {
-                    Some(StringMatchCandidate::new(
-                        ix,
-                        &tab_match.item.tab_content_text(0, cx),
-                    ))
-                })
-                .collect::<Vec<_>>();
-            smol::block_on(fuzzy::match_strings(
-                &candidates,
-                &query,
-                true,
-                true,
-                10000,
-                &Default::default(),
-                cx.background_executor().clone(),
-            ))
-            .into_iter()
-            .map(|m| all_items[m.candidate_id].clone())
-            .collect()
-        };
-
-        let selected_item_id = self.selected_item_id();
-        self.matches = matches;
-        self.selected_index = self.compute_selected_index(selected_item_id, window, cx);
-    }
-
-    fn update_matches(
-        &mut self,
-        query: String,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) {
-        if self.is_all_panes {
-            // needed because we need to borrow the workspace, but that may be borrowed when the picker
-            // calls update_matches.
-            let this = cx.entity();
-            window.defer(cx, move |window, cx| {
-                this.update(cx, |this, cx| {
-                    this.delegate.update_all_pane_matches(query, window, cx);
-                })
-            });
-            return;
-        }
-        let selected_item_id = self.selected_item_id();
-        self.matches.clear();
-        let Some(pane) = self.pane.upgrade() else {
-            return;
-        };
-
-        let pane = pane.read(cx);
-        let mut history_indices = HashMap::default();
-        pane.activation_history().iter().rev().enumerate().for_each(
-            |(history_index, history_entry)| {
-                history_indices.insert(history_entry.entity_id, history_index);
-            },
-        );
-
-        let items: Vec<Box<dyn ItemHandle>> = pane.items().map(|item| item.boxed_clone()).collect();
-        items
-            .iter()
-            .enumerate()
-            .zip(tab_details(&items, window, cx))
-            .map(|((item_index, item), detail)| TabMatch {
-                pane: self.pane.clone(),
-                item_index,
-                item: item.boxed_clone(),
-                detail,
-                preview: pane.is_active_preview_item(item.item_id()),
-            })
-            .for_each(|tab_match| self.matches.push(tab_match));
-
-        let non_history_base = history_indices.len();
-        self.matches.sort_by(move |a, b| {
-            let a_score = *history_indices
-                .get(&a.item.item_id())
-                .unwrap_or(&(a.item_index + non_history_base));
-            let b_score = *history_indices
-                .get(&b.item.item_id())
-                .unwrap_or(&(b.item_index + non_history_base));
-            a_score.cmp(&b_score)
-        });
-
-        self.selected_index = self.compute_selected_index(selected_item_id, window, cx);
-    }
-
-    fn selected_item_id(&self) -> Option<EntityId> {
-        self.matches
-            .get(self.selected_index())
-            .map(|tab_match| tab_match.item.item_id())
-    }
-
-    fn compute_selected_index(
-        &mut self,
-        prev_selected_item_id: Option<EntityId>,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> usize {
-        if self.matches.is_empty() {
-            return 0;
-        }
-
-        if let Some(selected_item_id) = prev_selected_item_id {
-            // If the previously selected item is still in the list, select its new position.
-            if let Some(item_index) = self
-                .matches
-                .iter()
-                .position(|tab_match| tab_match.item.item_id() == selected_item_id)
-            {
-                return item_index;
-            }
-            // Otherwise, try to preserve the previously selected index.
-            return self.selected_index.min(self.matches.len() - 1);
-        }
-
-        if self.select_last {
-            return self.matches.len() - 1;
-        }
-
-        // This only runs when initially opening the picker
-        // Index 0 is already active, so don't preselect it for switching.
-        if self.matches.len() > 1 {
-            self.set_selected_index(1, window, cx);
-            return 1;
-        }
-
-        0
-    }
-
-    fn close_item_at(
-        &mut self,
-        ix: usize,
-        window: &mut Window,
-        cx: &mut Context<Picker<TabSwitcherDelegate>>,
-    ) {
-        let Some(tab_match) = self.matches.get(ix) else {
-            return;
-        };
-        let Some(pane) = tab_match.pane.upgrade() else {
-            return;
-        };
-
-        pane.update(cx, |pane, cx| {
-            pane.close_item_by_id(tab_match.item.item_id(), SaveIntent::Close, window, cx)
-                .detach_and_log_err(cx);
-        });
-    }
-
-    /// Updates the selected index to ensure it matches the pane's active item,
-    /// as the pane's active item can be indirectly updated and this method
-    /// ensures that the picker can react to those changes.
-    fn sync_selected_index(&mut self, cx: &mut Context<Picker<TabSwitcherDelegate>>) {
-        let item = if self.is_all_panes {
-            self.workspace
-                .read_with(cx, |workspace, cx| workspace.active_item(cx))
-        } else {
-            self.pane.read_with(cx, |pane, _cx| pane.active_item())
-        };
-
-        let Ok(Some(item)) = item else {
-            return;
-        };
-
-        let item_id = item.item_id();
-        let Some((index, _tab_match)) = self
-            .matches
-            .iter()
-            .enumerate()
-            .find(|(_index, tab_match)| tab_match.item.item_id() == item_id)
-        else {
-            return;
-        };
-
-        self.selected_index = index;
-    }
-}
-
-impl PickerDelegate for TabSwitcherDelegate {
-    type ListItem = ListItem;
-
-    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
-        "Search all tabs…".into()
-    }
-
-    fn no_matches_text(&self, _window: &mut Window, _cx: &mut App) -> Option<SharedString> {
-        Some("No tabs".into())
-    }
-
-    fn match_count(&self) -> usize {
-        self.matches.len()
-    }
-
-    fn selected_index(&self) -> usize {
-        self.selected_index
-    }
-
-    fn set_selected_index(
-        &mut self,
-        ix: usize,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) {
-        self.selected_index = ix;
-
-        let Some(selected_match) = self.matches.get(self.selected_index()) else {
-            return;
-        };
-        selected_match
-            .pane
-            .update(cx, |pane, cx| {
-                if let Some(index) = pane.index_for_item(selected_match.item.as_ref()) {
-                    pane.activate_item(index, false, false, window, cx);
-                }
-            })
-            .ok();
-        cx.notify();
-    }
-
-    fn separators_after_indices(&self) -> Vec<usize> {
-        Vec::new()
-    }
-
-    fn update_matches(
-        &mut self,
-        raw_query: String,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Task<()> {
-        self.update_matches(raw_query, window, cx);
-        Task::ready(())
-    }
-
-    fn confirm(
-        &mut self,
-        _secondary: bool,
-        window: &mut Window,
-        cx: &mut Context<Picker<TabSwitcherDelegate>>,
-    ) {
-        let Some(selected_match) = self.matches.get(self.selected_index()) else {
-            return;
-        };
-
-        self.restored_items = true;
-        for (pane, index) in self.original_items.iter() {
-            pane.update(cx, |this, cx| {
-                this.activate_item(*index, false, false, window, cx);
-            })
-        }
-        selected_match
-            .pane
-            .update(cx, |pane, cx| {
-                if let Some(index) = pane.index_for_item(selected_match.item.as_ref()) {
-                    pane.activate_item(index, true, true, window, cx);
-                }
-            })
-            .ok();
-    }
-
-    fn dismissed(&mut self, window: &mut Window, cx: &mut Context<Picker<TabSwitcherDelegate>>) {
-        if !self.restored_items {
-            for (pane, index) in self.original_items.iter() {
-                pane.update(cx, |this, cx| {
-                    this.activate_item(*index, false, false, window, cx);
-                })
-            }
-        }
-
-        self.tab_switcher
-            .update(cx, |_, cx| cx.emit(DismissEvent))
-            .log_err();
-    }
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<Self::ListItem> {
-        let tab_match = self.matches.get(ix)?;
-
-        let params = TabContentParams {
-            detail: Some(tab_match.detail),
-            selected: true,
-            preview: tab_match.preview,
-            deemphasized: false,
-        };
-        let label = tab_match.item.tab_content(params, window, cx);
-
-        let icon = tab_match.icon(&self.project, selected, window, cx);
-
-        let indicator = render_item_indicator(tab_match.item.boxed_clone(), cx);
-        let indicator_color = if let Some(ref indicator) = indicator {
-            indicator.color
-        } else {
-            Color::default()
-        };
-        let indicator = h_flex()
-            .flex_shrink_0()
-            .children(indicator)
-            .child(div().w_2())
-            .into_any_element();
-        let close_button = div()
-            .id("close-button")
-            .on_mouse_up(
-                // We need this on_mouse_up here because on macOS you may have ctrl held
-                // down to open the menu, and a ctrl-click comes through as a right click.
-                MouseButton::Right,
-                cx.listener(move |picker, _: &MouseUpEvent, window, cx| {
-                    cx.stop_propagation();
-                    picker.delegate.close_item_at(ix, window, cx);
-                }),
-            )
-            .child(
-                IconButton::new("close_tab", IconName::Close)
-                    .icon_size(IconSize::Small)
-                    .icon_color(indicator_color)
-                    .tooltip(Tooltip::for_action_title("Close", &CloseSelectedItem))
-                    .on_click(cx.listener(move |picker, _, window, cx| {
-                        cx.stop_propagation();
-                        picker.delegate.close_item_at(ix, window, cx);
-                    })),
-            )
-            .into_any_element();
-
-        Some(
-            ListItem::new(ix)
-                .spacing(ListItemSpacing::Sparse)
-                .inset(true)
-                .toggle_state(selected)
-                .child(h_flex().w_full().child(label))
-                .start_slot::<DecoratedIcon>(icon)
-                .map(|el| {
-                    if self.selected_index == ix {
-                        el.end_slot::<AnyElement>(close_button)
-                    } else {
-                        el.end_slot::<AnyElement>(indicator)
-                            .end_hover_slot::<AnyElement>(close_button)
-                    }
-                }),
-        )
-    }
-}
diff --git a/crates/tab_switcher/src/tab_switcher_tests.rs b/crates/tab_switcher/src/tab_switcher_tests.rs
deleted file mode 100644
index 85177f29ed..0000000000
--- a/crates/tab_switcher/src/tab_switcher_tests.rs
+++ /dev/null
@@ -1,345 +0,0 @@
-use super::*;
-use editor::Editor;
-use gpui::{TestAppContext, VisualTestContext};
-use menu::SelectPrevious;
-use project::{Project, ProjectPath};
-use serde_json::json;
-use util::{path, rel_path::rel_path};
-use workspace::{ActivatePreviousItem, AppState, Workspace};
-
-#[ctor::ctor]
-fn init_logger() {
-    zlog::init_test();
-}
-
-#[gpui::test]
-async fn test_open_with_prev_tab_selected_and_cycle_on_toggle_action(
-    cx: &mut gpui::TestAppContext,
-) {
-    let app_state = init_test(cx);
-
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/root"),
-            json!({
-                "1.txt": "First file",
-                "2.txt": "Second file",
-                "3.txt": "Third file",
-                "4.txt": "Fourth file",
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), [path!("/root").as_ref()], cx).await;
-    let (workspace, cx) =
-        cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-    let tab_1 = open_buffer("1.txt", &workspace, cx).await;
-    let tab_2 = open_buffer("2.txt", &workspace, cx).await;
-    let tab_3 = open_buffer("3.txt", &workspace, cx).await;
-    let tab_4 = open_buffer("4.txt", &workspace, cx).await;
-
-    // Starts with the previously opened item selected
-    let tab_switcher = open_tab_switcher(false, &workspace, cx);
-    tab_switcher.update(cx, |tab_switcher, _| {
-        assert_eq!(tab_switcher.delegate.matches.len(), 4);
-        assert_match_at_position(tab_switcher, 0, tab_4.boxed_clone());
-        assert_match_selection(tab_switcher, 1, tab_3.boxed_clone());
-        assert_match_at_position(tab_switcher, 2, tab_2.boxed_clone());
-        assert_match_at_position(tab_switcher, 3, tab_1.boxed_clone());
-    });
-
-    cx.dispatch_action(Toggle { select_last: false });
-    cx.dispatch_action(Toggle { select_last: false });
-    tab_switcher.update(cx, |tab_switcher, _| {
-        assert_eq!(tab_switcher.delegate.matches.len(), 4);
-        assert_match_at_position(tab_switcher, 0, tab_4.boxed_clone());
-        assert_match_at_position(tab_switcher, 1, tab_3.boxed_clone());
-        assert_match_at_position(tab_switcher, 2, tab_2.boxed_clone());
-        assert_match_selection(tab_switcher, 3, tab_1.boxed_clone());
-    });
-
-    cx.dispatch_action(SelectPrevious);
-    tab_switcher.update(cx, |tab_switcher, _| {
-        assert_eq!(tab_switcher.delegate.matches.len(), 4);
-        assert_match_at_position(tab_switcher, 0, tab_4.boxed_clone());
-        assert_match_at_position(tab_switcher, 1, tab_3.boxed_clone());
-        assert_match_selection(tab_switcher, 2, tab_2.boxed_clone());
-        assert_match_at_position(tab_switcher, 3, tab_1.boxed_clone());
-    });
-}
-
-#[gpui::test]
-async fn test_open_with_last_tab_selected(cx: &mut gpui::TestAppContext) {
-    let app_state = init_test(cx);
-
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/root"),
-            json!({
-                "1.txt": "First file",
-                "2.txt": "Second file",
-                "3.txt": "Third file",
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), [path!("/root").as_ref()], cx).await;
-    let (workspace, cx) =
-        cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-    let tab_1 = open_buffer("1.txt", &workspace, cx).await;
-    let tab_2 = open_buffer("2.txt", &workspace, cx).await;
-    let tab_3 = open_buffer("3.txt", &workspace, cx).await;
-
-    // Starts with the last item selected
-    let tab_switcher = open_tab_switcher(true, &workspace, cx);
-    tab_switcher.update(cx, |tab_switcher, _| {
-        assert_eq!(tab_switcher.delegate.matches.len(), 3);
-        assert_match_at_position(tab_switcher, 0, tab_3);
-        assert_match_at_position(tab_switcher, 1, tab_2);
-        assert_match_selection(tab_switcher, 2, tab_1);
-    });
-}
-
-#[gpui::test]
-async fn test_open_item_on_modifiers_release(cx: &mut gpui::TestAppContext) {
-    let app_state = init_test(cx);
-
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/root"),
-            json!({
-                "1.txt": "First file",
-                "2.txt": "Second file",
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), [path!("/root").as_ref()], cx).await;
-    let (workspace, cx) =
-        cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-    let tab_1 = open_buffer("1.txt", &workspace, cx).await;
-    let tab_2 = open_buffer("2.txt", &workspace, cx).await;
-
-    cx.simulate_modifiers_change(Modifiers::control());
-    let tab_switcher = open_tab_switcher(false, &workspace, cx);
-    tab_switcher.update(cx, |tab_switcher, _| {
-        assert_eq!(tab_switcher.delegate.matches.len(), 2);
-        assert_match_at_position(tab_switcher, 0, tab_2.boxed_clone());
-        assert_match_selection(tab_switcher, 1, tab_1.boxed_clone());
-    });
-
-    cx.simulate_modifiers_change(Modifiers::none());
-    cx.read(|cx| {
-        let active_editor = workspace.read(cx).active_item_as::<Editor>(cx).unwrap();
-        assert_eq!(active_editor.read(cx).title(cx), "1.txt");
-    });
-    assert_tab_switcher_is_closed(workspace, cx);
-}
-
-#[gpui::test]
-async fn test_open_on_empty_pane(cx: &mut gpui::TestAppContext) {
-    let app_state = init_test(cx);
-    app_state.fs.as_fake().insert_tree("/root", json!({})).await;
-
-    let project = Project::test(app_state.fs.clone(), ["/root".as_ref()], cx).await;
-    let (workspace, cx) =
-        cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-    cx.simulate_modifiers_change(Modifiers::control());
-    let tab_switcher = open_tab_switcher(false, &workspace, cx);
-    tab_switcher.update(cx, |tab_switcher, _| {
-        assert!(tab_switcher.delegate.matches.is_empty());
-    });
-
-    cx.simulate_modifiers_change(Modifiers::none());
-    assert_tab_switcher_is_closed(workspace, cx);
-}
-
-#[gpui::test]
-async fn test_open_with_single_item(cx: &mut gpui::TestAppContext) {
-    let app_state = init_test(cx);
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(path!("/root"), json!({"1.txt": "Single file"}))
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), [path!("/root").as_ref()], cx).await;
-    let (workspace, cx) =
-        cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-    let tab = open_buffer("1.txt", &workspace, cx).await;
-
-    let tab_switcher = open_tab_switcher(false, &workspace, cx);
-    tab_switcher.update(cx, |tab_switcher, _| {
-        assert_eq!(tab_switcher.delegate.matches.len(), 1);
-        assert_match_selection(tab_switcher, 0, tab);
-    });
-}
-
-#[gpui::test]
-async fn test_close_selected_item(cx: &mut gpui::TestAppContext) {
-    let app_state = init_test(cx);
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            path!("/root"),
-            json!({
-                "1.txt": "First file",
-                "2.txt": "Second file",
-                "3.txt": "Third file",
-                "4.txt": "Fourth file",
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), [path!("/root").as_ref()], cx).await;
-    let (workspace, cx) =
-        cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-    let tab_1 = open_buffer("1.txt", &workspace, cx).await;
-    let tab_3 = open_buffer("3.txt", &workspace, cx).await;
-    let tab_2 = open_buffer("2.txt", &workspace, cx).await;
-    let tab_4 = open_buffer("4.txt", &workspace, cx).await;
-
-    // After opening all buffers, let's navigate to the previous item two times, finishing with:
-    //
-    // 1.txt | [3.txt] | 2.txt | 4.txt
-    //
-    // With 3.txt being the active item in the pane.
-    cx.dispatch_action(ActivatePreviousItem);
-    cx.dispatch_action(ActivatePreviousItem);
-    cx.run_until_parked();
-
-    cx.simulate_modifiers_change(Modifiers::control());
-    let tab_switcher = open_tab_switcher(false, &workspace, cx);
-    tab_switcher.update(cx, |tab_switcher, _| {
-        assert_eq!(tab_switcher.delegate.matches.len(), 4);
-        assert_match_at_position(tab_switcher, 0, tab_3.boxed_clone());
-        assert_match_selection(tab_switcher, 1, tab_2.boxed_clone());
-        assert_match_at_position(tab_switcher, 2, tab_4.boxed_clone());
-        assert_match_at_position(tab_switcher, 3, tab_1.boxed_clone());
-    });
-
-    cx.simulate_modifiers_change(Modifiers::control());
-    cx.dispatch_action(CloseSelectedItem);
-    tab_switcher.update(cx, |tab_switcher, _| {
-        assert_eq!(tab_switcher.delegate.matches.len(), 3);
-        assert_match_selection(tab_switcher, 0, tab_3);
-        assert_match_at_position(tab_switcher, 1, tab_4);
-        assert_match_at_position(tab_switcher, 2, tab_1);
-    });
-
-    // Still switches tab on modifiers release
-    cx.simulate_modifiers_change(Modifiers::none());
-    cx.read(|cx| {
-        let active_editor = workspace.read(cx).active_item_as::<Editor>(cx).unwrap();
-        assert_eq!(active_editor.read(cx).title(cx), "3.txt");
-    });
-    assert_tab_switcher_is_closed(workspace, cx);
-}
-
-fn init_test(cx: &mut TestAppContext) -> Arc<AppState> {
-    cx.update(|cx| {
-        let state = AppState::test(cx);
-        theme::init(theme::LoadThemes::JustBase, cx);
-        super::init(cx);
-        editor::init(cx);
-        state
-    })
-}
-
-#[track_caller]
-fn open_tab_switcher(
-    select_last: bool,
-    workspace: &Entity<Workspace>,
-    cx: &mut VisualTestContext,
-) -> Entity<Picker<TabSwitcherDelegate>> {
-    cx.dispatch_action(Toggle { select_last });
-    get_active_tab_switcher(workspace, cx)
-}
-
-#[track_caller]
-fn get_active_tab_switcher(
-    workspace: &Entity<Workspace>,
-    cx: &mut VisualTestContext,
-) -> Entity<Picker<TabSwitcherDelegate>> {
-    workspace.update(cx, |workspace, cx| {
-        workspace
-            .active_modal::<TabSwitcher>(cx)
-            .expect("tab switcher is not open")
-            .read(cx)
-            .picker
-            .clone()
-    })
-}
-
-async fn open_buffer(
-    file_path: &str,
-    workspace: &Entity<Workspace>,
-    cx: &mut gpui::VisualTestContext,
-) -> Box<dyn ItemHandle> {
-    let project = workspace.read_with(cx, |workspace, _| workspace.project().clone());
-    let worktree_id = project.update(cx, |project, cx| {
-        let worktree = project.worktrees(cx).last().expect("worktree not found");
-        worktree.read(cx).id()
-    });
-    let project_path = ProjectPath {
-        worktree_id,
-        path: rel_path(file_path).into(),
-    };
-    workspace
-        .update_in(cx, move |workspace, window, cx| {
-            workspace.open_path(project_path, None, true, window, cx)
-        })
-        .await
-        .unwrap()
-}
-
-#[track_caller]
-fn assert_match_selection(
-    tab_switcher: &Picker<TabSwitcherDelegate>,
-    expected_selection_index: usize,
-    expected_item: Box<dyn ItemHandle>,
-) {
-    assert_eq!(
-        tab_switcher.delegate.selected_index(),
-        expected_selection_index,
-        "item is not selected"
-    );
-    assert_match_at_position(tab_switcher, expected_selection_index, expected_item);
-}
-
-#[track_caller]
-fn assert_match_at_position(
-    tab_switcher: &Picker<TabSwitcherDelegate>,
-    match_index: usize,
-    expected_item: Box<dyn ItemHandle>,
-) {
-    let match_item = tab_switcher
-        .delegate
-        .matches
-        .get(match_index)
-        .unwrap_or_else(|| panic!("Tab Switcher has no match for index {match_index}"));
-    assert_eq!(match_item.item.item_id(), expected_item.item_id());
-}
-
-#[track_caller]
-fn assert_tab_switcher_is_closed(workspace: Entity<Workspace>, cx: &mut VisualTestContext) {
-    workspace.update(cx, |workspace, cx| {
-        assert!(
-            workspace.active_modal::<TabSwitcher>(cx).is_none(),
-            "tab switcher is still open"
-        );
-    });
-}
diff --git a/crates/task/Cargo.toml b/crates/task/Cargo.toml
deleted file mode 100644
index b3cb63bf00..0000000000
--- a/crates/task/Cargo.toml
+++ /dev/null
@@ -1,41 +0,0 @@
-[package]
-name = "task"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[features]
-test-support = [
-    "gpui/test-support",
-    "util/test-support"
-]
-
-[lib]
-path = "src/task.rs"
-doctest = false
-
-[lints]
-workspace = true
-
-[dependencies]
-anyhow.workspace = true
-collections.workspace = true
-futures.workspace = true
-gpui.workspace = true
-hex.workspace = true
-log.workspace = true
-parking_lot.workspace = true
-proto.workspace = true
-schemars.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-serde_json_lenient.workspace = true
-sha2.workspace = true
-shellexpand.workspace = true
-util.workspace = true
-zed_actions.workspace = true
-
-[dev-dependencies]
-gpui = { workspace = true, features = ["test-support"] }
-pretty_assertions.workspace = true
diff --git a/crates/task/LICENSE-GPL b/crates/task/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/task/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/task/src/adapter_schema.rs b/crates/task/src/adapter_schema.rs
deleted file mode 100644
index 2c58bc0eab..0000000000
--- a/crates/task/src/adapter_schema.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-use gpui::SharedString;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-
-/// JSON schema for a specific adapter
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, JsonSchema)]
-pub struct AdapterSchema {
-    /// The adapter name identifier
-    pub adapter: SharedString,
-    /// The JSON schema for this adapter's configuration
-    pub schema: serde_json::Value,
-}
-
-#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, JsonSchema)]
-#[serde(transparent)]
-pub struct AdapterSchemas(pub Vec<AdapterSchema>);
diff --git a/crates/task/src/debug_format.rs b/crates/task/src/debug_format.rs
deleted file mode 100644
index 5609e2565c..0000000000
--- a/crates/task/src/debug_format.rs
+++ /dev/null
@@ -1,534 +0,0 @@
-use anyhow::{Context as _, Result};
-use collections::FxHashMap;
-use gpui::SharedString;
-use log as _;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use std::net::Ipv4Addr;
-use std::path::PathBuf;
-use util::{debug_panic, schemars::add_new_subschema};
-
-use crate::{TaskTemplate, adapter_schema::AdapterSchemas};
-
-/// Represents the host information of the debug adapter
-#[derive(Default, Deserialize, Serialize, PartialEq, Eq, JsonSchema, Clone, Debug)]
-pub struct TcpArgumentsTemplate {
-    /// The port that the debug adapter is listening on
-    ///
-    /// Default: We will try to find an open port
-    pub port: Option<u16>,
-    /// The host that the debug adapter is listening too
-    ///
-    /// Default: 127.0.0.1
-    pub host: Option<Ipv4Addr>,
-    /// The max amount of time in milliseconds to connect to a tcp DAP before returning an error
-    ///
-    /// Default: 2000ms
-    pub timeout: Option<u64>,
-}
-
-impl TcpArgumentsTemplate {
-    /// Get the host or fallback to the default host
-    pub fn host(&self) -> Ipv4Addr {
-        self.host.unwrap_or_else(|| Ipv4Addr::new(127, 0, 0, 1))
-    }
-
-    pub fn from_proto(proto: proto::TcpHost) -> Result<Self> {
-        Ok(Self {
-            port: proto.port.map(|p| p.try_into()).transpose()?,
-            host: proto.host.map(|h| h.parse()).transpose()?,
-            timeout: proto.timeout,
-        })
-    }
-
-    pub fn to_proto(&self) -> proto::TcpHost {
-        proto::TcpHost {
-            port: self.port.map(|p| p.into()),
-            host: self.host.map(|h| h.to_string()),
-            timeout: self.timeout,
-        }
-    }
-}
-
-/// Represents the attach request information of the debug adapter
-#[derive(Default, Serialize, PartialEq, Eq, JsonSchema, Clone, Debug)]
-pub struct AttachRequest {
-    /// The processId to attach to, if left empty we will show a process picker
-    pub process_id: Option<u32>,
-}
-
-impl<'de> Deserialize<'de> for AttachRequest {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        #[derive(Deserialize)]
-        struct Helper {
-            process_id: Option<u32>,
-        }
-
-        let helper = Helper::deserialize(deserializer)?;
-
-        // Skip creating an AttachRequest if process_id is None
-        if helper.process_id.is_none() {
-            return Err(serde::de::Error::custom("process_id is required"));
-        }
-
-        Ok(AttachRequest {
-            process_id: helper.process_id,
-        })
-    }
-}
-
-/// Represents the launch request information of the debug adapter
-#[derive(Deserialize, Serialize, Default, PartialEq, Eq, JsonSchema, Clone, Debug)]
-pub struct LaunchRequest {
-    /// The program that you trying to debug
-    pub program: String,
-    /// The current working directory of your project
-    #[serde(default)]
-    pub cwd: Option<PathBuf>,
-    /// Arguments to pass to a debuggee
-    #[serde(default)]
-    pub args: Vec<String>,
-    #[serde(default)]
-    pub env: FxHashMap<String, String>,
-}
-
-impl LaunchRequest {
-    pub fn env_json(&self) -> serde_json::Value {
-        serde_json::Value::Object(
-            self.env
-                .iter()
-                .map(|(k, v)| (k.clone(), v.to_owned().into()))
-                .collect::<serde_json::Map<String, serde_json::Value>>(),
-        )
-    }
-}
-
-/// Represents the type that will determine which request to call on the debug adapter
-#[derive(Deserialize, Serialize, PartialEq, Eq, JsonSchema, Clone, Debug)]
-#[serde(rename_all = "lowercase", tag = "request")]
-pub enum DebugRequest {
-    /// Call the `launch` request on the debug adapter
-    Launch(LaunchRequest),
-    /// Call the `attach` request on the debug adapter
-    Attach(AttachRequest),
-}
-
-impl DebugRequest {
-    pub fn to_proto(&self) -> proto::DebugRequest {
-        match self {
-            DebugRequest::Launch(launch_request) => proto::DebugRequest {
-                request: Some(proto::debug_request::Request::DebugLaunchRequest(
-                    proto::DebugLaunchRequest {
-                        program: launch_request.program.clone(),
-                        cwd: launch_request
-                            .cwd
-                            .as_ref()
-                            .map(|cwd| cwd.to_string_lossy().into_owned()),
-                        args: launch_request.args.clone(),
-                        env: launch_request
-                            .env
-                            .iter()
-                            .map(|(k, v)| (k.clone(), v.clone()))
-                            .collect(),
-                    },
-                )),
-            },
-            DebugRequest::Attach(attach_request) => proto::DebugRequest {
-                request: Some(proto::debug_request::Request::DebugAttachRequest(
-                    proto::DebugAttachRequest {
-                        process_id: attach_request
-                            .process_id
-                            .expect("The process ID to be already filled out."),
-                    },
-                )),
-            },
-        }
-    }
-
-    pub fn from_proto(val: proto::DebugRequest) -> Result<DebugRequest> {
-        let request = val.request.context("Missing debug request")?;
-        match request {
-            proto::debug_request::Request::DebugLaunchRequest(proto::DebugLaunchRequest {
-                program,
-                cwd,
-                args,
-                env,
-            }) => Ok(DebugRequest::Launch(LaunchRequest {
-                program,
-                cwd: cwd.map(From::from),
-                args,
-                env: env.into_iter().collect(),
-            })),
-
-            proto::debug_request::Request::DebugAttachRequest(proto::DebugAttachRequest {
-                process_id,
-            }) => Ok(DebugRequest::Attach(AttachRequest {
-                process_id: Some(process_id),
-            })),
-        }
-    }
-}
-
-impl From<LaunchRequest> for DebugRequest {
-    fn from(launch_config: LaunchRequest) -> Self {
-        DebugRequest::Launch(launch_config)
-    }
-}
-
-impl From<AttachRequest> for DebugRequest {
-    fn from(attach_config: AttachRequest) -> Self {
-        DebugRequest::Attach(attach_config)
-    }
-}
-
-#[derive(Serialize, PartialEq, Eq, JsonSchema, Clone, Debug)]
-#[serde(untagged)]
-pub enum BuildTaskDefinition {
-    ByName(SharedString),
-    Template {
-        #[serde(flatten)]
-        task_template: TaskTemplate,
-        #[serde(skip)]
-        locator_name: Option<SharedString>,
-    },
-}
-
-impl<'de> Deserialize<'de> for BuildTaskDefinition {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        #[derive(Deserialize)]
-        struct TemplateHelper {
-            #[serde(default)]
-            label: Option<String>,
-            #[serde(flatten)]
-            rest: serde_json::Value,
-        }
-
-        let value = serde_json::Value::deserialize(deserializer)?;
-
-        if let Ok(name) = serde_json::from_value::<SharedString>(value.clone()) {
-            return Ok(BuildTaskDefinition::ByName(name));
-        }
-
-        let helper: TemplateHelper =
-            serde_json::from_value(value).map_err(serde::de::Error::custom)?;
-
-        let mut template_value = helper.rest;
-        if let serde_json::Value::Object(ref mut map) = template_value {
-            map.insert(
-                "label".to_string(),
-                serde_json::to_value(helper.label.unwrap_or_else(|| "debug-build".to_owned()))
-                    .map_err(serde::de::Error::custom)?,
-            );
-        }
-
-        let task_template: TaskTemplate =
-            serde_json::from_value(template_value).map_err(serde::de::Error::custom)?;
-
-        Ok(BuildTaskDefinition::Template {
-            task_template,
-            locator_name: None,
-        })
-    }
-}
-
-#[derive(Deserialize, Serialize, PartialEq, Eq, Clone, Debug, JsonSchema)]
-pub enum Request {
-    Launch,
-    Attach,
-}
-
-/// This struct represent a user created debug task from the new process modal
-#[derive(Deserialize, Serialize, PartialEq, Eq, Clone, Debug, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub struct ZedDebugConfig {
-    /// Name of the debug task
-    pub label: SharedString,
-    /// The debug adapter to use
-    pub adapter: SharedString,
-    #[serde(flatten)]
-    pub request: DebugRequest,
-    /// Whether to tell the debug adapter to stop on entry
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub stop_on_entry: Option<bool>,
-}
-
-/// This struct represent a user created debug task
-#[derive(Deserialize, Serialize, PartialEq, Eq, Clone, Debug, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub struct DebugScenario {
-    pub adapter: SharedString,
-    /// Name of the debug task
-    pub label: SharedString,
-    /// A task to run prior to spawning the debuggee.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub build: Option<BuildTaskDefinition>,
-    /// The main arguments to be sent to the debug adapter
-    #[serde(default, flatten)]
-    pub config: serde_json::Value,
-    /// Optional TCP connection information
-    ///
-    /// If provided, this will be used to connect to the debug adapter instead of
-    /// spawning a new process. This is useful for connecting to a debug adapter
-    /// that is already running or is started by another process.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub tcp_connection: Option<TcpArgumentsTemplate>,
-}
-
-/// A group of Debug Tasks defined in a JSON file.
-#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, JsonSchema)]
-#[serde(transparent)]
-pub struct DebugTaskFile(pub Vec<DebugScenario>);
-
-impl DebugTaskFile {
-    pub fn generate_json_schema(schemas: &AdapterSchemas) -> serde_json::Value {
-        let mut generator = schemars::generate::SchemaSettings::draft2019_09().into_generator();
-
-        let mut build_task_value = BuildTaskDefinition::json_schema(&mut generator).to_value();
-
-        if let Some(template_object) = build_task_value
-            .get_mut("anyOf")
-            .and_then(|array| array.as_array_mut())
-            .and_then(|array| array.get_mut(1))
-        {
-            if let Some(properties) = template_object
-                .get_mut("properties")
-                .and_then(|value| value.as_object_mut())
-                && properties.remove("label").is_none()
-            {
-                debug_panic!(
-                    "Generated TaskTemplate json schema did not have expected 'label' field. \
-                        Schema of 2nd alternative is: {template_object:?}"
-                );
-            }
-
-            if let Some(arr) = template_object
-                .get_mut("required")
-                .and_then(|array| array.as_array_mut())
-            {
-                arr.retain(|v| v.as_str() != Some("label"));
-            }
-        } else {
-            debug_panic!(
-                "Generated TaskTemplate json schema did not match expectations. \
-                Schema is: {build_task_value:?}"
-            );
-        }
-
-        let adapter_conditions = schemas
-            .0
-            .iter()
-            .map(|adapter_schema| {
-                let adapter_name = adapter_schema.adapter.to_string();
-                add_new_subschema(
-                    &mut generator,
-                    &format!("{adapter_name}DebugSettings"),
-                    serde_json::json!({
-                        "if": {
-                            "properties": {
-                                "adapter": { "const": adapter_name }
-                            }
-                        },
-                        "then": adapter_schema.schema
-                    }),
-                )
-            })
-            .collect::<Vec<_>>();
-
-        let build_task_definition_ref = add_new_subschema(
-            &mut generator,
-            BuildTaskDefinition::schema_name().as_ref(),
-            build_task_value,
-        );
-
-        let meta_schema = generator
-            .settings()
-            .meta_schema
-            .as_ref()
-            .expect("meta_schema should be present in schemars settings")
-            .to_string();
-
-        serde_json::json!({
-            "$schema": meta_schema,
-            "title": "Debug Configurations",
-            "description": "Configuration for debug scenarios",
-            "allowTrailingCommas": true,
-            "type": "array",
-            "items": {
-                "type": "object",
-                "required": ["adapter", "label"],
-                // TODO: Uncommenting this will cause json-language-server to provide warnings for
-                // unrecognized properties. It should be enabled if/when there's an adapter JSON
-                // schema that's comprehensive. In order to not get warnings for the other schemas,
-                // `additionalProperties` or `unevaluatedProperties` (to handle "allOf" etc style
-                // schema combinations) could be set to `true` for that schema.
-                //
-                // "unevaluatedProperties": false,
-                "properties": {
-                    "adapter": {
-                        "type": "string",
-                        "description": "The name of the debug adapter"
-                    },
-                    "label": {
-                        "type": "string",
-                        "description": "The name of the debug configuration"
-                    },
-                    "build": build_task_definition_ref,
-                    "tcp_connection": {
-                        "type": "object",
-                        "description": "Optional TCP connection information for connecting to an already running debug adapter",
-                        "properties": {
-                            "port": {
-                                "type": "integer",
-                                "description": "The port that the debug adapter is listening on (default: auto-find open port)"
-                            },
-                            "host": {
-                                "type": "string",
-                                "pattern": "^((25[0-5]|(2[0-4]|1\\d|[1-9]|)\\d)\\.?\\b){4}$",
-                                "description": "The host that the debug adapter is listening to (default: 127.0.0.1)"
-                            },
-                            "timeout": {
-                                "type": "integer",
-                                "description": "The max amount of time in milliseconds to connect to a tcp DAP before returning an error (default: 2000ms)"
-                            }
-                        }
-                    }
-                },
-                "allOf": adapter_conditions
-            },
-            "$defs": generator.take_definitions(true),
-        })
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::DebugScenario;
-    use serde_json::json;
-
-    #[test]
-    fn test_just_build_args() {
-        let json = r#"{
-            "label": "Build & debug rust",
-            "adapter": "CodeLLDB",
-            "build": {
-                "command": "rust",
-                "args": ["build"]
-            }
-        }"#;
-
-        let deserialized: DebugScenario = serde_json::from_str(json).unwrap();
-        assert!(deserialized.build.is_some());
-        match deserialized.build.as_ref().unwrap() {
-            crate::BuildTaskDefinition::Template { task_template, .. } => {
-                assert_eq!("debug-build", task_template.label);
-                assert_eq!("rust", task_template.command);
-                assert_eq!(vec!["build"], task_template.args);
-            }
-            _ => panic!("Expected Template variant"),
-        }
-        assert_eq!(json!({}), deserialized.config);
-        assert_eq!("CodeLLDB", deserialized.adapter.as_ref());
-        assert_eq!("Build & debug rust", deserialized.label.as_ref());
-    }
-
-    #[test]
-    fn test_empty_scenario_has_none_request() {
-        let json = r#"{
-            "label": "Build & debug rust",
-            "build": "rust",
-            "adapter": "CodeLLDB"
-        }"#;
-
-        let deserialized: DebugScenario = serde_json::from_str(json).unwrap();
-
-        assert_eq!(json!({}), deserialized.config);
-        assert_eq!("CodeLLDB", deserialized.adapter.as_ref());
-        assert_eq!("Build & debug rust", deserialized.label.as_ref());
-    }
-
-    #[test]
-    fn test_launch_scenario_deserialization() {
-        let json = r#"{
-            "label": "Launch program",
-            "adapter": "CodeLLDB",
-            "request": "launch",
-            "program": "target/debug/myapp",
-            "args": ["--test"]
-        }"#;
-
-        let deserialized: DebugScenario = serde_json::from_str(json).unwrap();
-
-        assert_eq!(
-            json!({ "request": "launch", "program": "target/debug/myapp", "args": ["--test"] }),
-            deserialized.config
-        );
-        assert_eq!("CodeLLDB", deserialized.adapter.as_ref());
-        assert_eq!("Launch program", deserialized.label.as_ref());
-    }
-
-    #[test]
-    fn test_attach_scenario_deserialization() {
-        let json = r#"{
-            "label": "Attach to process",
-            "adapter": "CodeLLDB",
-            "process_id": 1234,
-            "request": "attach"
-        }"#;
-
-        let deserialized: DebugScenario = serde_json::from_str(json).unwrap();
-
-        assert_eq!(
-            json!({ "request": "attach", "process_id": 1234 }),
-            deserialized.config
-        );
-        assert_eq!("CodeLLDB", deserialized.adapter.as_ref());
-        assert_eq!("Attach to process", deserialized.label.as_ref());
-    }
-
-    #[test]
-    fn test_build_task_definition_without_label() {
-        use crate::BuildTaskDefinition;
-
-        let json = r#""my_build_task""#;
-        let deserialized: BuildTaskDefinition = serde_json::from_str(json).unwrap();
-        match deserialized {
-            BuildTaskDefinition::ByName(name) => assert_eq!("my_build_task", name.as_ref()),
-            _ => panic!("Expected ByName variant"),
-        }
-
-        let json = r#"{
-            "command": "cargo",
-            "args": ["build", "--release"]
-        }"#;
-        let deserialized: BuildTaskDefinition = serde_json::from_str(json).unwrap();
-        match deserialized {
-            BuildTaskDefinition::Template { task_template, .. } => {
-                assert_eq!("debug-build", task_template.label);
-                assert_eq!("cargo", task_template.command);
-                assert_eq!(vec!["build", "--release"], task_template.args);
-            }
-            _ => panic!("Expected Template variant"),
-        }
-
-        let json = r#"{
-            "label": "Build Release",
-            "command": "cargo",
-            "args": ["build", "--release"]
-        }"#;
-        let deserialized: BuildTaskDefinition = serde_json::from_str(json).unwrap();
-        match deserialized {
-            BuildTaskDefinition::Template { task_template, .. } => {
-                assert_eq!("Build Release", task_template.label);
-                assert_eq!("cargo", task_template.command);
-                assert_eq!(vec!["build", "--release"], task_template.args);
-            }
-            _ => panic!("Expected Template variant"),
-        }
-    }
-}
diff --git a/crates/task/src/serde_helpers.rs b/crates/task/src/serde_helpers.rs
deleted file mode 100644
index a95214d8b0..0000000000
--- a/crates/task/src/serde_helpers.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-use serde::de::{self, Deserializer, Visitor};
-use std::fmt;
-
-/// Deserializes a non-empty string array.
-pub fn non_empty_string_vec<'de, D>(deserializer: D) -> Result<Vec<String>, D::Error>
-where
-    D: Deserializer<'de>,
-{
-    struct NonEmptyStringVecVisitor;
-
-    impl<'de> Visitor<'de> for NonEmptyStringVecVisitor {
-        type Value = Vec<String>;
-
-        fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-            formatter.write_str("a list of non-empty strings")
-        }
-
-        fn visit_seq<V>(self, mut seq: V) -> Result<Vec<String>, V::Error>
-        where
-            V: de::SeqAccess<'de>,
-        {
-            let mut vec = Vec::new();
-            while let Some(value) = seq.next_element::<String>()? {
-                if value.is_empty() {
-                    return Err(de::Error::invalid_value(
-                        de::Unexpected::Str(&value),
-                        &"a non-empty string",
-                    ));
-                }
-                vec.push(value);
-            }
-            Ok(vec)
-        }
-    }
-
-    deserializer.deserialize_seq(NonEmptyStringVecVisitor)
-}
diff --git a/crates/task/src/static_source.rs b/crates/task/src/static_source.rs
deleted file mode 100644
index 9e4051ef97..0000000000
--- a/crates/task/src/static_source.rs
+++ /dev/null
@@ -1,123 +0,0 @@
-//! A source of tasks, based on a static configuration, deserialized from the tasks config file, and related infrastructure for tracking changes to the file.
-
-use std::sync::Arc;
-
-use futures::{StreamExt, channel::mpsc::UnboundedSender};
-use gpui::{App, AppContext};
-use parking_lot::RwLock;
-use serde::Deserialize;
-use util::ResultExt;
-
-use crate::TaskTemplates;
-use futures::channel::mpsc::UnboundedReceiver;
-
-/// The source of tasks defined in a tasks config file.
-pub struct StaticSource {
-    tasks: TrackedFile<TaskTemplates>,
-}
-
-/// A Wrapper around deserializable T that keeps track of its contents
-/// via a provided channel.
-pub struct TrackedFile<T> {
-    parsed_contents: Arc<RwLock<T>>,
-}
-
-impl<T: PartialEq + 'static + Sync> TrackedFile<T> {
-    /// Initializes new [`TrackedFile`] with a type that's deserializable.
-    pub fn new(
-        mut tracker: UnboundedReceiver<String>,
-        notification_outlet: UnboundedSender<()>,
-        cx: &App,
-    ) -> Self
-    where
-        T: for<'a> Deserialize<'a> + Default + Send,
-    {
-        let parsed_contents: Arc<RwLock<T>> = Arc::default();
-        cx.background_spawn({
-            let parsed_contents = parsed_contents.clone();
-            async move {
-                while let Some(new_contents) = tracker.next().await {
-                    if Arc::strong_count(&parsed_contents) == 1 {
-                        // We're no longer being observed. Stop polling.
-                        break;
-                    }
-                    if !new_contents.trim().is_empty() {
-                        let Some(new_contents) =
-                            serde_json_lenient::from_str::<T>(&new_contents).log_err()
-                        else {
-                            continue;
-                        };
-                        let mut contents = parsed_contents.write();
-                        if *contents != new_contents {
-                            *contents = new_contents;
-                            if notification_outlet.unbounded_send(()).is_err() {
-                                // Whoever cared about contents is not around anymore.
-                                break;
-                            }
-                        }
-                    }
-                }
-                anyhow::Ok(())
-            }
-        })
-        .detach_and_log_err(cx);
-        Self { parsed_contents }
-    }
-
-    /// Initializes new [`TrackedFile`] with a type that's convertible from another deserializable type.
-    pub fn new_convertible<U: for<'a> Deserialize<'a> + TryInto<T, Error = anyhow::Error>>(
-        mut tracker: UnboundedReceiver<String>,
-        notification_outlet: UnboundedSender<()>,
-        cx: &App,
-    ) -> Self
-    where
-        T: Default + Send,
-    {
-        let parsed_contents: Arc<RwLock<T>> = Arc::default();
-        cx.background_spawn({
-            async move {
-                while let Some(new_contents) = tracker.next().await {
-                    if Arc::strong_count(&parsed_contents) == 1 {
-                        // We're no longer being observed. Stop polling.
-                        break;
-                    }
-
-                    if !new_contents.trim().is_empty() {
-                        let Some(new_contents) =
-                            serde_json_lenient::from_str::<U>(&new_contents).log_err()
-                        else {
-                            continue;
-                        };
-                        let Some(new_contents) = new_contents.try_into().log_err() else {
-                            continue;
-                        };
-                        let mut contents = parsed_contents.write();
-                        if *contents != new_contents {
-                            *contents = new_contents;
-                            if notification_outlet.unbounded_send(()).is_err() {
-                                // Whoever cared about contents is not around anymore.
-                                break;
-                            }
-                        }
-                    }
-                }
-                anyhow::Ok(())
-            }
-        })
-        .detach_and_log_err(cx);
-        Self {
-            parsed_contents: Default::default(),
-        }
-    }
-}
-
-impl StaticSource {
-    /// Initializes the static source, reacting on tasks config changes.
-    pub fn new(tasks: TrackedFile<TaskTemplates>) -> Self {
-        Self { tasks }
-    }
-    /// Returns current list of tasks
-    pub fn tasks_to_schedule(&self) -> TaskTemplates {
-        self.tasks.parsed_contents.read().clone()
-    }
-}
diff --git a/crates/task/src/task.rs b/crates/task/src/task.rs
deleted file mode 100644
index 92d5909419..0000000000
--- a/crates/task/src/task.rs
+++ /dev/null
@@ -1,431 +0,0 @@
-//! Baseline interface of Tasks in Zed: all tasks in Zed are intended to use those for implementing their own logic.
-
-mod adapter_schema;
-mod debug_format;
-mod serde_helpers;
-pub mod static_source;
-mod task_template;
-mod vscode_debug_format;
-mod vscode_format;
-
-use anyhow::Context as _;
-use collections::{HashMap, HashSet, hash_map};
-use gpui::SharedString;
-use serde::{Deserialize, Serialize};
-use std::borrow::Cow;
-use std::path::PathBuf;
-use std::str::FromStr;
-
-pub use adapter_schema::{AdapterSchema, AdapterSchemas};
-pub use debug_format::{
-    AttachRequest, BuildTaskDefinition, DebugRequest, DebugScenario, DebugTaskFile, LaunchRequest,
-    Request, TcpArgumentsTemplate, ZedDebugConfig,
-};
-pub use task_template::{
-    DebugArgsRequest, HideStrategy, RevealStrategy, TaskTemplate, TaskTemplates,
-    substitute_variables_in_map, substitute_variables_in_str,
-};
-pub use util::shell::{Shell, ShellKind};
-pub use util::shell_builder::ShellBuilder;
-pub use vscode_debug_format::VsCodeDebugTaskFile;
-pub use vscode_format::VsCodeTaskFile;
-pub use zed_actions::RevealTarget;
-
-/// Task identifier, unique within the application.
-/// Based on it, task reruns and terminal tabs are managed.
-#[derive(Default, Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord, Deserialize)]
-pub struct TaskId(pub String);
-
-/// Contains all information needed by Zed to spawn a new terminal tab for the given task.
-#[derive(Default, Debug, Clone, PartialEq, Eq)]
-pub struct SpawnInTerminal {
-    /// Id of the task to use when determining task tab affinity.
-    pub id: TaskId,
-    /// Full unshortened form of `label` field.
-    pub full_label: String,
-    /// Human readable name of the terminal tab.
-    pub label: String,
-    /// Executable command to spawn.
-    pub command: Option<String>,
-    /// Arguments to the command, potentially unsubstituted,
-    /// to let the shell that spawns the command to do the substitution, if needed.
-    pub args: Vec<String>,
-    /// A human-readable label, containing command and all of its arguments, joined and substituted.
-    pub command_label: String,
-    /// Current working directory to spawn the command into.
-    pub cwd: Option<PathBuf>,
-    /// Env overrides for the command, will be appended to the terminal's environment from the settings.
-    pub env: HashMap<String, String>,
-    /// Whether to use a new terminal tab or reuse the existing one to spawn the process.
-    pub use_new_terminal: bool,
-    /// Whether to allow multiple instances of the same task to be run, or rather wait for the existing ones to finish.
-    pub allow_concurrent_runs: bool,
-    /// What to do with the terminal pane and tab, after the command was started.
-    pub reveal: RevealStrategy,
-    /// Where to show tasks' terminal output.
-    pub reveal_target: RevealTarget,
-    /// What to do with the terminal pane and tab, after the command had finished.
-    pub hide: HideStrategy,
-    /// Which shell to use when spawning the task.
-    pub shell: Shell,
-    /// Whether to show the task summary line in the task output (sucess/failure).
-    pub show_summary: bool,
-    /// Whether to show the command line in the task output.
-    pub show_command: bool,
-    /// Whether to show the rerun button in the terminal tab.
-    pub show_rerun: bool,
-}
-
-impl SpawnInTerminal {
-    pub fn to_proto(&self) -> proto::SpawnInTerminal {
-        proto::SpawnInTerminal {
-            label: self.label.clone(),
-            command: self.command.clone(),
-            args: self.args.clone(),
-            env: self
-                .env
-                .iter()
-                .map(|(k, v)| (k.clone(), v.clone()))
-                .collect(),
-            cwd: self
-                .cwd
-                .clone()
-                .map(|cwd| cwd.to_string_lossy().into_owned()),
-        }
-    }
-
-    pub fn from_proto(proto: proto::SpawnInTerminal) -> Self {
-        Self {
-            label: proto.label.clone(),
-            command: proto.command.clone(),
-            args: proto.args.clone(),
-            env: proto.env.into_iter().collect(),
-            cwd: proto.cwd.map(PathBuf::from),
-            ..Default::default()
-        }
-    }
-}
-
-/// A final form of the [`TaskTemplate`], that got resolved with a particular [`TaskContext`] and now is ready to spawn the actual task.
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct ResolvedTask {
-    /// A way to distinguish tasks produced by the same template, but different contexts.
-    /// NOTE: Resolved tasks may have the same labels, commands and do the same things,
-    /// but still may have different ids if the context was different during the resolution.
-    /// Since the template has `env` field, for a generic task that may be a bash command,
-    /// so it's impossible to determine the id equality without more context in a generic case.
-    pub id: TaskId,
-    /// A template the task got resolved from.
-    original_task: TaskTemplate,
-    /// Full, unshortened label of the task after all resolutions are made.
-    pub resolved_label: String,
-    /// Variables that were substituted during the task template resolution.
-    substituted_variables: HashSet<VariableName>,
-    /// Further actions that need to take place after the resolved task is spawned,
-    /// with all task variables resolved.
-    pub resolved: SpawnInTerminal,
-}
-
-impl ResolvedTask {
-    /// A task template before the resolution.
-    pub fn original_task(&self) -> &TaskTemplate {
-        &self.original_task
-    }
-
-    /// Variables that were substituted during the task template resolution.
-    pub fn substituted_variables(&self) -> &HashSet<VariableName> {
-        &self.substituted_variables
-    }
-
-    /// A human-readable label to display in the UI.
-    pub fn display_label(&self) -> &str {
-        self.resolved.label.as_str()
-    }
-}
-
-/// Variables, available for use in [`TaskContext`] when a Zed's [`TaskTemplate`] gets resolved into a [`ResolvedTask`].
-/// Name of the variable must be a valid shell variable identifier, which generally means that it is
-/// a word  consisting only  of alphanumeric characters and underscores,
-/// and beginning with an alphabetic character or an  underscore.
-#[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize)]
-pub enum VariableName {
-    /// An absolute path of the currently opened file.
-    File,
-    /// A path of the currently opened file (relative to worktree root).
-    RelativeFile,
-    /// A path of the currently opened file's directory (relative to worktree root).
-    RelativeDir,
-    /// The currently opened filename.
-    Filename,
-    /// The path to a parent directory of a currently opened file.
-    Dirname,
-    /// Stem (filename without extension) of the currently opened file.
-    Stem,
-    /// An absolute path of the currently opened worktree, that contains the file.
-    WorktreeRoot,
-    /// A symbol text, that contains latest cursor/selection position.
-    Symbol,
-    /// A row with the latest cursor/selection position.
-    Row,
-    /// A column with the latest cursor/selection position.
-    Column,
-    /// Text from the latest selection.
-    SelectedText,
-    /// The symbol selected by the symbol tagging system, specifically the @run capture in a runnables.scm
-    RunnableSymbol,
-    /// Open a Picker to select a process ID to use in place
-    /// Can only be used to debug configurations
-    PickProcessId,
-    /// Custom variable, provided by the plugin or other external source.
-    /// Will be printed with `CUSTOM_` prefix to avoid potential conflicts with other variables.
-    Custom(Cow<'static, str>),
-}
-
-impl VariableName {
-    /// Generates a `$VARIABLE`-like string value to be used in templates.
-    pub fn template_value(&self) -> String {
-        format!("${self}")
-    }
-    /// Generates a `"$VARIABLE"`-like string, to be used instead of `Self::template_value` when expanded value could contain spaces or special characters.
-    pub fn template_value_with_whitespace(&self) -> String {
-        format!("\"${self}\"")
-    }
-}
-
-impl FromStr for VariableName {
-    type Err = ();
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let without_prefix = s.strip_prefix(ZED_VARIABLE_NAME_PREFIX).ok_or(())?;
-        let value = match without_prefix {
-            "FILE" => Self::File,
-            "FILENAME" => Self::Filename,
-            "RELATIVE_FILE" => Self::RelativeFile,
-            "RELATIVE_DIR" => Self::RelativeDir,
-            "DIRNAME" => Self::Dirname,
-            "STEM" => Self::Stem,
-            "WORKTREE_ROOT" => Self::WorktreeRoot,
-            "SYMBOL" => Self::Symbol,
-            "RUNNABLE_SYMBOL" => Self::RunnableSymbol,
-            "SELECTED_TEXT" => Self::SelectedText,
-            "ROW" => Self::Row,
-            "COLUMN" => Self::Column,
-            _ => {
-                if let Some(custom_name) =
-                    without_prefix.strip_prefix(ZED_CUSTOM_VARIABLE_NAME_PREFIX)
-                {
-                    Self::Custom(Cow::Owned(custom_name.to_owned()))
-                } else {
-                    return Err(());
-                }
-            }
-        };
-        Ok(value)
-    }
-}
-
-/// A prefix that all [`VariableName`] variants are prefixed with when used in environment variables and similar template contexts.
-pub const ZED_VARIABLE_NAME_PREFIX: &str = "ZED_";
-const ZED_CUSTOM_VARIABLE_NAME_PREFIX: &str = "CUSTOM_";
-
-impl std::fmt::Display for VariableName {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        match self {
-            Self::File => write!(f, "{ZED_VARIABLE_NAME_PREFIX}FILE"),
-            Self::Filename => write!(f, "{ZED_VARIABLE_NAME_PREFIX}FILENAME"),
-            Self::RelativeFile => write!(f, "{ZED_VARIABLE_NAME_PREFIX}RELATIVE_FILE"),
-            Self::RelativeDir => write!(f, "{ZED_VARIABLE_NAME_PREFIX}RELATIVE_DIR"),
-            Self::Dirname => write!(f, "{ZED_VARIABLE_NAME_PREFIX}DIRNAME"),
-            Self::Stem => write!(f, "{ZED_VARIABLE_NAME_PREFIX}STEM"),
-            Self::WorktreeRoot => write!(f, "{ZED_VARIABLE_NAME_PREFIX}WORKTREE_ROOT"),
-            Self::Symbol => write!(f, "{ZED_VARIABLE_NAME_PREFIX}SYMBOL"),
-            Self::Row => write!(f, "{ZED_VARIABLE_NAME_PREFIX}ROW"),
-            Self::Column => write!(f, "{ZED_VARIABLE_NAME_PREFIX}COLUMN"),
-            Self::SelectedText => write!(f, "{ZED_VARIABLE_NAME_PREFIX}SELECTED_TEXT"),
-            Self::RunnableSymbol => write!(f, "{ZED_VARIABLE_NAME_PREFIX}RUNNABLE_SYMBOL"),
-            Self::PickProcessId => write!(f, "{ZED_VARIABLE_NAME_PREFIX}PICK_PID"),
-            Self::Custom(s) => write!(
-                f,
-                "{ZED_VARIABLE_NAME_PREFIX}{ZED_CUSTOM_VARIABLE_NAME_PREFIX}{s}"
-            ),
-        }
-    }
-}
-
-/// Container for predefined environment variables that describe state of Zed at the time the task was spawned.
-#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize)]
-pub struct TaskVariables(HashMap<VariableName, String>);
-
-impl TaskVariables {
-    /// Inserts another variable into the container, overwriting the existing one if it already exists — in this case, the old value is returned.
-    pub fn insert(&mut self, variable: VariableName, value: String) -> Option<String> {
-        self.0.insert(variable, value)
-    }
-
-    /// Extends the container with another one, overwriting the existing variables on collision.
-    pub fn extend(&mut self, other: Self) {
-        self.0.extend(other.0);
-    }
-    /// Get the value associated with given variable name, if there is one.
-    pub fn get(&self, key: &VariableName) -> Option<&str> {
-        self.0.get(key).map(|s| s.as_str())
-    }
-    /// Clear out variables obtained from tree-sitter queries, which are prefixed with '_' character
-    pub fn sweep(&mut self) {
-        self.0.retain(|name, _| {
-            if let VariableName::Custom(name) = name {
-                !name.starts_with('_')
-            } else {
-                true
-            }
-        })
-    }
-
-    pub fn iter(&self) -> impl Iterator<Item = (&VariableName, &String)> {
-        self.0.iter()
-    }
-}
-
-impl FromIterator<(VariableName, String)> for TaskVariables {
-    fn from_iter<T: IntoIterator<Item = (VariableName, String)>>(iter: T) -> Self {
-        Self(HashMap::from_iter(iter))
-    }
-}
-
-impl IntoIterator for TaskVariables {
-    type Item = (VariableName, String);
-
-    type IntoIter = hash_map::IntoIter<VariableName, String>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        self.0.into_iter()
-    }
-}
-
-/// Keeps track of the file associated with a task and context of tasks execution (i.e. current file or current function).
-/// Keeps all Zed-related state inside, used to produce a resolved task out of its template.
-#[derive(Clone, Debug, Default, PartialEq, Eq)]
-pub struct TaskContext {
-    /// A path to a directory in which the task should be executed.
-    pub cwd: Option<PathBuf>,
-    /// Additional environment variables associated with a given task.
-    pub task_variables: TaskVariables,
-    /// Environment variables obtained when loading the project into Zed.
-    /// This is the environment one would get when `cd`ing in a terminal
-    /// into the project's root directory.
-    pub project_env: HashMap<String, String>,
-}
-
-/// This is a new type representing a 'tag' on a 'runnable symbol', typically a test of main() function, found via treesitter.
-#[derive(Clone, Debug)]
-pub struct RunnableTag(pub SharedString);
-
-pub fn shell_from_proto(proto: proto::Shell) -> anyhow::Result<Shell> {
-    let shell_type = proto.shell_type.context("invalid shell type")?;
-    let shell = match shell_type {
-        proto::shell::ShellType::System(_) => Shell::System,
-        proto::shell::ShellType::Program(program) => Shell::Program(program),
-        proto::shell::ShellType::WithArguments(program) => Shell::WithArguments {
-            program: program.program,
-            args: program.args,
-            title_override: None,
-        },
-    };
-    Ok(shell)
-}
-
-pub fn shell_to_proto(shell: Shell) -> proto::Shell {
-    let shell_type = match shell {
-        Shell::System => proto::shell::ShellType::System(proto::System {}),
-        Shell::Program(program) => proto::shell::ShellType::Program(program),
-        Shell::WithArguments {
-            program,
-            args,
-            title_override: _,
-        } => proto::shell::ShellType::WithArguments(proto::shell::WithArguments { program, args }),
-    };
-    proto::Shell {
-        shell_type: Some(shell_type),
-    }
-}
-
-type VsCodeEnvVariable = String;
-type VsCodeCommand = String;
-type ZedEnvVariable = String;
-
-struct EnvVariableReplacer {
-    variables: HashMap<VsCodeEnvVariable, ZedEnvVariable>,
-    commands: HashMap<VsCodeCommand, ZedEnvVariable>,
-}
-
-impl EnvVariableReplacer {
-    fn new(variables: HashMap<VsCodeEnvVariable, ZedEnvVariable>) -> Self {
-        Self {
-            variables,
-            commands: HashMap::default(),
-        }
-    }
-
-    fn with_commands(
-        mut self,
-        commands: impl IntoIterator<Item = (VsCodeCommand, ZedEnvVariable)>,
-    ) -> Self {
-        self.commands = commands.into_iter().collect();
-        self
-    }
-
-    fn replace_value(&self, input: serde_json::Value) -> serde_json::Value {
-        match input {
-            serde_json::Value::String(s) => serde_json::Value::String(self.replace(&s)),
-            serde_json::Value::Array(arr) => {
-                serde_json::Value::Array(arr.into_iter().map(|v| self.replace_value(v)).collect())
-            }
-            serde_json::Value::Object(obj) => serde_json::Value::Object(
-                obj.into_iter()
-                    .map(|(k, v)| (self.replace(&k), self.replace_value(v)))
-                    .collect(),
-            ),
-            _ => input,
-        }
-    }
-    // Replaces occurrences of VsCode-specific environment variables with Zed equivalents.
-    fn replace(&self, input: &str) -> String {
-        shellexpand::env_with_context_no_errors(&input, |var: &str| {
-            // Colons denote a default value in case the variable is not set. We want to preserve that default, as otherwise shellexpand will substitute it for us.
-            let colon_position = var.find(':').unwrap_or(var.len());
-            let (left, right) = var.split_at(colon_position);
-            if left == "env" && !right.is_empty() {
-                let variable_name = &right[1..];
-                return Some(format!("${{{variable_name}}}"));
-            } else if left == "command" && !right.is_empty() {
-                let command_name = &right[1..];
-                if let Some(replacement_command) = self.commands.get(command_name) {
-                    return Some(format!("${{{replacement_command}}}"));
-                }
-            }
-
-            let (variable_name, default) = (left, right);
-            let append_previous_default = |ret: &mut String| {
-                if !default.is_empty() {
-                    ret.push_str(default);
-                }
-            };
-            if let Some(substitution) = self.variables.get(variable_name) {
-                // Got a VSCode->Zed hit, perform a substitution
-                let mut name = format!("${{{substitution}");
-                append_previous_default(&mut name);
-                name.push('}');
-                return Some(name);
-            }
-            // This is an unknown variable.
-            // We should not error out, as they may come from user environment (e.g. $PATH). That means that the variable substitution might not be perfect.
-            // If there's a default, we need to return the string verbatim as otherwise shellexpand will apply that default for us.
-            if !default.is_empty() {
-                return Some(format!("${{{var}}}"));
-            }
-            // Else we can just return None and that variable will be left as is.
-            None
-        })
-        .into_owned()
-    }
-}
diff --git a/crates/task/src/task_template.rs b/crates/task/src/task_template.rs
deleted file mode 100644
index 0c319db061..0000000000
--- a/crates/task/src/task_template.rs
+++ /dev/null
@@ -1,974 +0,0 @@
-use anyhow::{Context as _, bail};
-use collections::{HashMap, HashSet};
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use sha2::{Digest, Sha256};
-use std::path::PathBuf;
-use util::schemars::{AllowTrailingCommas, DefaultDenyUnknownFields};
-use util::serde::default_true;
-use util::{ResultExt, truncate_and_remove_front};
-
-use crate::{
-    AttachRequest, ResolvedTask, RevealTarget, Shell, SpawnInTerminal, TaskContext, TaskId,
-    VariableName, ZED_VARIABLE_NAME_PREFIX, serde_helpers::non_empty_string_vec,
-};
-
-/// A template definition of a Zed task to run.
-/// May use the [`VariableName`] to get the corresponding substitutions into its fields.
-///
-/// Template itself is not ready to spawn a task, it needs to be resolved with a [`TaskContext`] first, that
-/// contains all relevant Zed state in task variables.
-/// A single template may produce different tasks (or none) for different contexts.
-#[derive(Clone, Default, Debug, PartialEq, Eq, Serialize, Deserialize, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub struct TaskTemplate {
-    /// Human readable name of the task to display in the UI.
-    pub label: String,
-    /// Executable command to spawn.
-    pub command: String,
-    /// Arguments to the command.
-    #[serde(default)]
-    pub args: Vec<String>,
-    /// Env overrides for the command, will be appended to the terminal's environment from the settings.
-    #[serde(default)]
-    pub env: HashMap<String, String>,
-    /// Current working directory to spawn the command into, defaults to current project root.
-    #[serde(default)]
-    pub cwd: Option<String>,
-    /// Whether to use a new terminal tab or reuse the existing one to spawn the process.
-    #[serde(default)]
-    pub use_new_terminal: bool,
-    /// Whether to allow multiple instances of the same task to be run, or rather wait for the existing ones to finish.
-    #[serde(default)]
-    pub allow_concurrent_runs: bool,
-    /// What to do with the terminal pane and tab, after the command was started:
-    /// * `always` — always show the task's pane, and focus the corresponding tab in it (default)
-    // * `no_focus` — always show the task's pane, add the task's tab in it, but don't focus it
-    // * `never` — do not alter focus, but still add/reuse the task's tab in its pane
-    #[serde(default)]
-    pub reveal: RevealStrategy,
-    /// Where to place the task's terminal item after starting the task.
-    /// * `dock` — in the terminal dock, "regular" terminal items' place (default).
-    /// * `center` — in the central pane group, "main" editor area.
-    #[serde(default)]
-    pub reveal_target: RevealTarget,
-    /// What to do with the terminal pane and tab, after the command had finished:
-    /// * `never` — do nothing when the command finishes (default)
-    /// * `always` — always hide the terminal tab, hide the pane also if it was the last tab in it
-    /// * `on_success` — hide the terminal tab on task success only, otherwise behaves similar to `always`.
-    #[serde(default)]
-    pub hide: HideStrategy,
-    /// Represents the tags which this template attaches to.
-    /// Adding this removes this task from other UI and gives you ability to run it by tag.
-    #[serde(default, deserialize_with = "non_empty_string_vec")]
-    #[schemars(length(min = 1))]
-    pub tags: Vec<String>,
-    /// Which shell to use when spawning the task.
-    #[serde(default)]
-    pub shell: Shell,
-    /// Whether to show the task line in the task output.
-    #[serde(default = "default_true")]
-    pub show_summary: bool,
-    /// Whether to show the command line in the task output.
-    #[serde(default = "default_true")]
-    pub show_command: bool,
-}
-
-#[derive(Deserialize, Eq, PartialEq, Clone, Debug)]
-/// Use to represent debug request type
-pub enum DebugArgsRequest {
-    /// launch (program, cwd) are stored in TaskTemplate as (command, cwd)
-    Launch,
-    /// Attach
-    Attach(AttachRequest),
-}
-
-/// What to do with the terminal pane and tab, after the command was started.
-#[derive(Default, Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum RevealStrategy {
-    /// Always show the task's pane, and focus the corresponding tab in it.
-    #[default]
-    Always,
-    /// Always show the task's pane, add the task's tab in it, but don't focus it.
-    NoFocus,
-    /// Do not alter focus, but still add/reuse the task's tab in its pane.
-    Never,
-}
-
-/// What to do with the terminal pane and tab, after the command has finished.
-#[derive(Default, Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum HideStrategy {
-    /// Do nothing when the command finishes.
-    #[default]
-    Never,
-    /// Always hide the terminal tab, hide the pane also if it was the last tab in it.
-    Always,
-    /// Hide the terminal tab on task success only, otherwise behaves similar to `Always`.
-    OnSuccess,
-}
-
-/// A group of Tasks defined in a JSON file.
-#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, JsonSchema)]
-pub struct TaskTemplates(pub Vec<TaskTemplate>);
-
-impl TaskTemplates {
-    /// Generates JSON schema of Tasks JSON template format.
-    pub fn generate_json_schema() -> serde_json::Value {
-        let schema = schemars::generate::SchemaSettings::draft2019_09()
-            .with_transform(DefaultDenyUnknownFields)
-            .with_transform(AllowTrailingCommas)
-            .into_generator()
-            .root_schema_for::<Self>();
-
-        serde_json::to_value(schema).unwrap()
-    }
-}
-
-impl TaskTemplate {
-    /// Replaces all `VariableName` task variables in the task template string fields.
-    /// If any replacement fails or the new string substitutions still have [`ZED_VARIABLE_NAME_PREFIX`],
-    /// `None` is returned.
-    ///
-    /// Every [`ResolvedTask`] gets a [`TaskId`], based on the `id_base` (to avoid collision with various task sources),
-    /// and hashes of its template and [`TaskContext`], see [`ResolvedTask`] fields' documentation for more details.
-    pub fn resolve_task(&self, id_base: &str, cx: &TaskContext) -> Option<ResolvedTask> {
-        if self.label.trim().is_empty() || self.command.trim().is_empty() {
-            return None;
-        }
-
-        let mut variable_names = HashMap::default();
-        let mut substituted_variables = HashSet::default();
-        let task_variables = cx
-            .task_variables
-            .0
-            .iter()
-            .map(|(key, value)| {
-                let key_string = key.to_string();
-                if !variable_names.contains_key(&key_string) {
-                    variable_names.insert(key_string.clone(), key.clone());
-                }
-                (key_string, value.as_str())
-            })
-            .collect::<HashMap<_, _>>();
-        let truncated_variables = truncate_variables(&task_variables);
-        let cwd = match self.cwd.as_deref() {
-            Some(cwd) => {
-                let substituted_cwd = substitute_all_template_variables_in_str(
-                    cwd,
-                    &task_variables,
-                    &variable_names,
-                    &mut substituted_variables,
-                )?;
-                Some(PathBuf::from(substituted_cwd))
-            }
-            None => None,
-        }
-        .or(cx.cwd.clone());
-        let full_label = substitute_all_template_variables_in_str(
-            &self.label,
-            &task_variables,
-            &variable_names,
-            &mut substituted_variables,
-        )?;
-
-        // Arbitrarily picked threshold below which we don't truncate any variables.
-        const TRUNCATION_THRESHOLD: usize = 64;
-
-        let human_readable_label = if full_label.len() > TRUNCATION_THRESHOLD {
-            substitute_all_template_variables_in_str(
-                &self.label,
-                &truncated_variables,
-                &variable_names,
-                &mut substituted_variables,
-            )?
-        } else {
-            #[allow(
-                clippy::redundant_clone,
-                reason = "We want to clone the full_label to avoid borrowing it in the fold closure"
-            )]
-            full_label.clone()
-        }
-        .lines()
-        .fold(String::new(), |mut string, line| {
-            if string.is_empty() {
-                string.push_str(line);
-            } else {
-                string.push_str("\\n");
-                string.push_str(line);
-            }
-            string
-        });
-
-        let command = substitute_all_template_variables_in_str(
-            &self.command,
-            &task_variables,
-            &variable_names,
-            &mut substituted_variables,
-        )?;
-        let args_with_substitutions = substitute_all_template_variables_in_vec(
-            &self.args,
-            &task_variables,
-            &variable_names,
-            &mut substituted_variables,
-        )?;
-
-        let task_hash = to_hex_hash(self)
-            .context("hashing task template")
-            .log_err()?;
-        let variables_hash = to_hex_hash(&task_variables)
-            .context("hashing task variables")
-            .log_err()?;
-        let id = TaskId(format!("{id_base}_{task_hash}_{variables_hash}"));
-
-        let env = {
-            // Start with the project environment as the base.
-            let mut env = cx.project_env.clone();
-
-            // Extend that environment with what's defined in the TaskTemplate
-            env.extend(self.env.clone());
-
-            // Then we replace all task variables that could be set in environment variables
-            let mut env = substitute_all_template_variables_in_map(
-                &env,
-                &task_variables,
-                &variable_names,
-                &mut substituted_variables,
-            )?;
-
-            // Last step: set the task variables as environment variables too
-            env.extend(task_variables.into_iter().map(|(k, v)| (k, v.to_owned())));
-            env
-        };
-
-        Some(ResolvedTask {
-            id: id.clone(),
-            substituted_variables,
-            original_task: self.clone(),
-            resolved_label: full_label.clone(),
-            resolved: SpawnInTerminal {
-                id,
-                cwd,
-                full_label,
-                label: human_readable_label,
-                command_label: args_with_substitutions.iter().fold(
-                    command.clone(),
-                    |mut command_label, arg| {
-                        command_label.push(' ');
-                        command_label.push_str(arg);
-                        command_label
-                    },
-                ),
-                command: Some(command),
-                args: args_with_substitutions,
-                env,
-                use_new_terminal: self.use_new_terminal,
-                allow_concurrent_runs: self.allow_concurrent_runs,
-                reveal: self.reveal,
-                reveal_target: self.reveal_target,
-                hide: self.hide,
-                shell: self.shell.clone(),
-                show_summary: self.show_summary,
-                show_command: self.show_command,
-                show_rerun: true,
-            },
-        })
-    }
-}
-
-const MAX_DISPLAY_VARIABLE_LENGTH: usize = 15;
-
-fn truncate_variables(task_variables: &HashMap<String, &str>) -> HashMap<String, String> {
-    task_variables
-        .iter()
-        .map(|(key, value)| {
-            (
-                key.clone(),
-                truncate_and_remove_front(value, MAX_DISPLAY_VARIABLE_LENGTH),
-            )
-        })
-        .collect()
-}
-
-fn to_hex_hash(object: impl Serialize) -> anyhow::Result<String> {
-    let json = serde_json_lenient::to_string(&object).context("serializing the object")?;
-    let mut hasher = Sha256::new();
-    hasher.update(json.as_bytes());
-    Ok(hex::encode(hasher.finalize()))
-}
-
-pub fn substitute_variables_in_str(template_str: &str, context: &TaskContext) -> Option<String> {
-    let mut variable_names = HashMap::default();
-    let mut substituted_variables = HashSet::default();
-    let task_variables = context
-        .task_variables
-        .0
-        .iter()
-        .map(|(key, value)| {
-            let key_string = key.to_string();
-            if !variable_names.contains_key(&key_string) {
-                variable_names.insert(key_string.clone(), key.clone());
-            }
-            (key_string, value.as_str())
-        })
-        .collect::<HashMap<_, _>>();
-    substitute_all_template_variables_in_str(
-        template_str,
-        &task_variables,
-        &variable_names,
-        &mut substituted_variables,
-    )
-}
-fn substitute_all_template_variables_in_str<A: AsRef<str>>(
-    template_str: &str,
-    task_variables: &HashMap<String, A>,
-    variable_names: &HashMap<String, VariableName>,
-    substituted_variables: &mut HashSet<VariableName>,
-) -> Option<String> {
-    let substituted_string = shellexpand::env_with_context(template_str, |var| {
-        // Colons denote a default value in case the variable is not set. We want to preserve that default, as otherwise shellexpand will substitute it for us.
-        let colon_position = var.find(':').unwrap_or(var.len());
-        let (variable_name, default) = var.split_at(colon_position);
-        if let Some(name) = task_variables.get(variable_name) {
-            if let Some(substituted_variable) = variable_names.get(variable_name) {
-                substituted_variables.insert(substituted_variable.clone());
-            }
-            // Got a task variable hit - use the variable value, ignore default
-            return Ok(Some(name.as_ref().to_owned()));
-        } else if variable_name.starts_with(ZED_VARIABLE_NAME_PREFIX) {
-            // Unknown ZED variable - use default if available
-            if !default.is_empty() {
-                // Strip the colon and return the default value
-                return Ok(Some(default[1..].to_owned()));
-            } else {
-                bail!("Unknown variable name: {variable_name}");
-            }
-        }
-        // This is an unknown variable.
-        // We should not error out, as they may come from user environment (e.g. $PATH). That means that the variable substitution might not be perfect.
-        // If there's a default, we need to return the string verbatim as otherwise shellexpand will apply that default for us.
-        if !default.is_empty() {
-            return Ok(Some(format!("${{{var}}}")));
-        }
-        // Else we can just return None and that variable will be left as is.
-        Ok(None)
-    })
-    .ok()?;
-    Some(substituted_string.into_owned())
-}
-
-fn substitute_all_template_variables_in_vec(
-    template_strs: &[String],
-    task_variables: &HashMap<String, &str>,
-    variable_names: &HashMap<String, VariableName>,
-    substituted_variables: &mut HashSet<VariableName>,
-) -> Option<Vec<String>> {
-    let mut expanded = Vec::with_capacity(template_strs.len());
-    for variable in template_strs {
-        let new_value = substitute_all_template_variables_in_str(
-            variable,
-            task_variables,
-            variable_names,
-            substituted_variables,
-        )?;
-        expanded.push(new_value);
-    }
-    Some(expanded)
-}
-
-pub fn substitute_variables_in_map(
-    keys_and_values: &HashMap<String, String>,
-    context: &TaskContext,
-) -> Option<HashMap<String, String>> {
-    let mut variable_names = HashMap::default();
-    let mut substituted_variables = HashSet::default();
-    let task_variables = context
-        .task_variables
-        .0
-        .iter()
-        .map(|(key, value)| {
-            let key_string = key.to_string();
-            if !variable_names.contains_key(&key_string) {
-                variable_names.insert(key_string.clone(), key.clone());
-            }
-            (key_string, value.as_str())
-        })
-        .collect::<HashMap<_, _>>();
-    substitute_all_template_variables_in_map(
-        keys_and_values,
-        &task_variables,
-        &variable_names,
-        &mut substituted_variables,
-    )
-}
-fn substitute_all_template_variables_in_map(
-    keys_and_values: &HashMap<String, String>,
-    task_variables: &HashMap<String, &str>,
-    variable_names: &HashMap<String, VariableName>,
-    substituted_variables: &mut HashSet<VariableName>,
-) -> Option<HashMap<String, String>> {
-    let mut new_map: HashMap<String, String> = Default::default();
-    for (key, value) in keys_and_values {
-        let new_value = substitute_all_template_variables_in_str(
-            value,
-            task_variables,
-            variable_names,
-            substituted_variables,
-        )?;
-        let new_key = substitute_all_template_variables_in_str(
-            key,
-            task_variables,
-            variable_names,
-            substituted_variables,
-        )?;
-        new_map.insert(new_key, new_value);
-    }
-    Some(new_map)
-}
-
-#[cfg(test)]
-mod tests {
-    use std::{borrow::Cow, path::Path};
-
-    use crate::{TaskVariables, VariableName};
-
-    use super::*;
-
-    const TEST_ID_BASE: &str = "test_base";
-
-    #[test]
-    fn test_resolving_templates_with_blank_command_and_label() {
-        let task_with_all_properties = TaskTemplate {
-            label: "test_label".to_string(),
-            command: "test_command".to_string(),
-            args: vec!["test_arg".to_string()],
-            env: HashMap::from_iter([("test_env_key".to_string(), "test_env_var".to_string())]),
-            ..TaskTemplate::default()
-        };
-
-        for task_with_blank_property in &[
-            TaskTemplate {
-                label: "".to_string(),
-                ..task_with_all_properties.clone()
-            },
-            TaskTemplate {
-                command: "".to_string(),
-                ..task_with_all_properties.clone()
-            },
-            TaskTemplate {
-                label: "".to_string(),
-                command: "".to_string(),
-                ..task_with_all_properties
-            },
-        ] {
-            assert_eq!(
-                task_with_blank_property.resolve_task(TEST_ID_BASE, &TaskContext::default()),
-                None,
-                "should not resolve task with blank label and/or command: {task_with_blank_property:?}"
-            );
-        }
-    }
-
-    #[test]
-    fn test_template_cwd_resolution() {
-        let task_without_cwd = TaskTemplate {
-            cwd: None,
-            label: "test task".to_string(),
-            command: "echo 4".to_string(),
-            ..TaskTemplate::default()
-        };
-
-        let resolved_task = |task_template: &TaskTemplate, task_cx| {
-            let resolved_task = task_template
-                .resolve_task(TEST_ID_BASE, task_cx)
-                .unwrap_or_else(|| panic!("failed to resolve task {task_without_cwd:?}"));
-            assert_substituted_variables(&resolved_task, Vec::new());
-            resolved_task.resolved
-        };
-
-        let cx = TaskContext {
-            cwd: None,
-            task_variables: TaskVariables::default(),
-            project_env: HashMap::default(),
-        };
-        assert_eq!(
-            resolved_task(&task_without_cwd, &cx).cwd,
-            None,
-            "When neither task nor task context have cwd, it should be None"
-        );
-
-        let context_cwd = Path::new("a").join("b").join("c");
-        let cx = TaskContext {
-            cwd: Some(context_cwd.clone()),
-            task_variables: TaskVariables::default(),
-            project_env: HashMap::default(),
-        };
-        assert_eq!(
-            resolved_task(&task_without_cwd, &cx).cwd,
-            Some(context_cwd.clone()),
-            "TaskContext's cwd should be taken on resolve if task's cwd is None"
-        );
-
-        let task_cwd = Path::new("d").join("e").join("f");
-        let mut task_with_cwd = task_without_cwd.clone();
-        task_with_cwd.cwd = Some(task_cwd.display().to_string());
-        let task_with_cwd = task_with_cwd;
-
-        let cx = TaskContext {
-            cwd: None,
-            task_variables: TaskVariables::default(),
-            project_env: HashMap::default(),
-        };
-        assert_eq!(
-            resolved_task(&task_with_cwd, &cx).cwd,
-            Some(task_cwd.clone()),
-            "TaskTemplate's cwd should be taken on resolve if TaskContext's cwd is None"
-        );
-
-        let cx = TaskContext {
-            cwd: Some(context_cwd),
-            task_variables: TaskVariables::default(),
-            project_env: HashMap::default(),
-        };
-        assert_eq!(
-            resolved_task(&task_with_cwd, &cx).cwd,
-            Some(task_cwd),
-            "TaskTemplate's cwd should be taken on resolve if TaskContext's cwd is not None"
-        );
-    }
-
-    #[test]
-    fn test_template_variables_resolution() {
-        let custom_variable_1 = VariableName::Custom(Cow::Borrowed("custom_variable_1"));
-        let custom_variable_2 = VariableName::Custom(Cow::Borrowed("custom_variable_2"));
-        let long_value = "01".repeat(MAX_DISPLAY_VARIABLE_LENGTH * 2);
-        let all_variables = [
-            (VariableName::Row, "1234".to_string()),
-            (VariableName::Column, "5678".to_string()),
-            (VariableName::File, "test_file".to_string()),
-            (VariableName::SelectedText, "test_selected_text".to_string()),
-            (VariableName::Symbol, long_value.clone()),
-            (VariableName::WorktreeRoot, "/test_root/".to_string()),
-            (
-                custom_variable_1.clone(),
-                "test_custom_variable_1".to_string(),
-            ),
-            (
-                custom_variable_2.clone(),
-                "test_custom_variable_2".to_string(),
-            ),
-        ];
-
-        let task_with_all_variables = TaskTemplate {
-            label: format!(
-                "test label for {} and {}",
-                VariableName::Row.template_value(),
-                VariableName::Symbol.template_value(),
-            ),
-            command: format!(
-                "echo {} {}",
-                VariableName::File.template_value(),
-                VariableName::Symbol.template_value(),
-            ),
-            args: vec![
-                format!("arg1 {}", VariableName::SelectedText.template_value()),
-                format!("arg2 {}", VariableName::Column.template_value()),
-                format!("arg3 {}", VariableName::Symbol.template_value()),
-            ],
-            env: HashMap::from_iter([
-                ("test_env_key".to_string(), "test_env_var".to_string()),
-                (
-                    "env_key_1".to_string(),
-                    VariableName::WorktreeRoot.template_value(),
-                ),
-                (
-                    "env_key_2".to_string(),
-                    format!(
-                        "env_var_2 {} {}",
-                        custom_variable_1.template_value(),
-                        custom_variable_2.template_value()
-                    ),
-                ),
-                (
-                    "env_key_3".to_string(),
-                    format!("env_var_3 {}", VariableName::Symbol.template_value()),
-                ),
-            ]),
-            ..TaskTemplate::default()
-        };
-
-        let mut first_resolved_id = None;
-        for i in 0..15 {
-            let resolved_task = task_with_all_variables.resolve_task(
-                TEST_ID_BASE,
-                &TaskContext {
-                    cwd: None,
-                    task_variables: TaskVariables::from_iter(all_variables.clone()),
-                    project_env: HashMap::default(),
-                },
-            ).unwrap_or_else(|| panic!("Should successfully resolve task {task_with_all_variables:?} with variables {all_variables:?}"));
-
-            match &first_resolved_id {
-                None => first_resolved_id = Some(resolved_task.id.clone()),
-                Some(first_id) => assert_eq!(
-                    &resolved_task.id, first_id,
-                    "Step {i}, for the same task template and context, there should be the same resolved task id"
-                ),
-            }
-
-            assert_eq!(
-                resolved_task.original_task, task_with_all_variables,
-                "Resolved task should store its template without changes"
-            );
-            assert_eq!(
-                resolved_task.resolved_label,
-                format!("test label for 1234 and {long_value}"),
-                "Resolved task label should be substituted with variables and those should not be shortened"
-            );
-            assert_substituted_variables(
-                &resolved_task,
-                all_variables.iter().map(|(name, _)| name.clone()).collect(),
-            );
-
-            let spawn_in_terminal = &resolved_task.resolved;
-            assert_eq!(
-                spawn_in_terminal.label,
-                format!(
-                    "test label for 1234 and …{}",
-                    &long_value[long_value.len() - MAX_DISPLAY_VARIABLE_LENGTH..]
-                ),
-                "Human-readable label should have long substitutions trimmed"
-            );
-            assert_eq!(
-                spawn_in_terminal.command.clone().unwrap(),
-                format!("echo test_file {long_value}"),
-                "Command should be substituted with variables and those should not be shortened"
-            );
-            assert_eq!(
-                spawn_in_terminal.args,
-                &[
-                    "arg1 test_selected_text",
-                    "arg2 5678",
-                    "arg3 010101010101010101010101010101010101010101010101010101010101",
-                ],
-                "Args should be substituted with variables"
-            );
-            assert_eq!(
-                spawn_in_terminal.command_label,
-                format!(
-                    "{} arg1 test_selected_text arg2 5678 arg3 {long_value}",
-                    spawn_in_terminal.command.clone().unwrap()
-                ),
-                "Command label args should be substituted with variables and those should not be shortened"
-            );
-
-            assert_eq!(
-                spawn_in_terminal
-                    .env
-                    .get("test_env_key")
-                    .map(|s| s.as_str()),
-                Some("test_env_var")
-            );
-            assert_eq!(
-                spawn_in_terminal.env.get("env_key_1").map(|s| s.as_str()),
-                Some("/test_root/")
-            );
-            assert_eq!(
-                spawn_in_terminal.env.get("env_key_2").map(|s| s.as_str()),
-                Some("env_var_2 test_custom_variable_1 test_custom_variable_2")
-            );
-            assert_eq!(
-                spawn_in_terminal.env.get("env_key_3"),
-                Some(&format!("env_var_3 {long_value}")),
-                "Env vars should be substituted with variables and those should not be shortened"
-            );
-        }
-
-        for i in 0..all_variables.len() {
-            let mut not_all_variables = all_variables.to_vec();
-            let removed_variable = not_all_variables.remove(i);
-            let resolved_task_attempt = task_with_all_variables.resolve_task(
-                TEST_ID_BASE,
-                &TaskContext {
-                    cwd: None,
-                    task_variables: TaskVariables::from_iter(not_all_variables),
-                    project_env: HashMap::default(),
-                },
-            );
-            assert_eq!(
-                resolved_task_attempt, None,
-                "If any of the Zed task variables is not substituted, the task should not be resolved, but got some resolution without the variable {removed_variable:?} (index {i})"
-            );
-        }
-    }
-
-    #[test]
-    fn test_can_resolve_free_variables() {
-        let task = TaskTemplate {
-            label: "My task".into(),
-            command: "echo".into(),
-            args: vec!["$PATH".into()],
-            ..TaskTemplate::default()
-        };
-        let resolved_task = task
-            .resolve_task(TEST_ID_BASE, &TaskContext::default())
-            .unwrap();
-        assert_substituted_variables(&resolved_task, Vec::new());
-        let resolved = resolved_task.resolved;
-        assert_eq!(resolved.label, task.label);
-        assert_eq!(resolved.command, Some(task.command));
-        assert_eq!(resolved.args, task.args);
-    }
-
-    #[test]
-    fn test_errors_on_missing_zed_variable() {
-        let task = TaskTemplate {
-            label: "My task".into(),
-            command: "echo".into(),
-            args: vec!["$ZED_VARIABLE".into()],
-            ..TaskTemplate::default()
-        };
-        assert!(
-            task.resolve_task(TEST_ID_BASE, &TaskContext::default())
-                .is_none()
-        );
-    }
-
-    #[test]
-    fn test_symbol_dependent_tasks() {
-        let task_with_all_properties = TaskTemplate {
-            label: "test_label".to_string(),
-            command: "test_command".to_string(),
-            args: vec!["test_arg".to_string()],
-            env: HashMap::from_iter([("test_env_key".to_string(), "test_env_var".to_string())]),
-            ..TaskTemplate::default()
-        };
-        let cx = TaskContext {
-            cwd: None,
-            task_variables: TaskVariables::from_iter(Some((
-                VariableName::Symbol,
-                "test_symbol".to_string(),
-            ))),
-            project_env: HashMap::default(),
-        };
-
-        for (i, symbol_dependent_task) in [
-            TaskTemplate {
-                label: format!("test_label_{}", VariableName::Symbol.template_value()),
-                ..task_with_all_properties.clone()
-            },
-            TaskTemplate {
-                command: format!("test_command_{}", VariableName::Symbol.template_value()),
-                ..task_with_all_properties.clone()
-            },
-            TaskTemplate {
-                args: vec![format!(
-                    "test_arg_{}",
-                    VariableName::Symbol.template_value()
-                )],
-                ..task_with_all_properties.clone()
-            },
-            TaskTemplate {
-                env: HashMap::from_iter([(
-                    "test_env_key".to_string(),
-                    format!("test_env_var_{}", VariableName::Symbol.template_value()),
-                )]),
-                ..task_with_all_properties
-            },
-        ]
-        .into_iter()
-        .enumerate()
-        {
-            let resolved = symbol_dependent_task
-                .resolve_task(TEST_ID_BASE, &cx)
-                .unwrap_or_else(|| panic!("Failed to resolve task {symbol_dependent_task:?}"));
-            assert_eq!(
-                resolved.substituted_variables,
-                HashSet::from_iter(Some(VariableName::Symbol)),
-                "(index {i}) Expected the task to depend on symbol task variable: {resolved:?}"
-            )
-        }
-    }
-
-    #[track_caller]
-    fn assert_substituted_variables(resolved_task: &ResolvedTask, mut expected: Vec<VariableName>) {
-        let mut resolved_variables = resolved_task
-            .substituted_variables
-            .iter()
-            .cloned()
-            .collect::<Vec<_>>();
-        resolved_variables.sort_by_key(|var| var.to_string());
-        expected.sort_by_key(|var| var.to_string());
-        assert_eq!(resolved_variables, expected)
-    }
-
-    #[test]
-    fn substitute_funky_labels() {
-        let faulty_go_test = TaskTemplate {
-            label: format!(
-                "go test {}/{}",
-                VariableName::Symbol.template_value(),
-                VariableName::Symbol.template_value(),
-            ),
-            command: "go".into(),
-            args: vec![format!(
-                "^{}$/^{}$",
-                VariableName::Symbol.template_value(),
-                VariableName::Symbol.template_value()
-            )],
-            ..TaskTemplate::default()
-        };
-        let mut context = TaskContext::default();
-        context
-            .task_variables
-            .insert(VariableName::Symbol, "my-symbol".to_string());
-        assert!(faulty_go_test.resolve_task("base", &context).is_some());
-    }
-
-    #[test]
-    fn test_project_env() {
-        let all_variables = [
-            (VariableName::Row, "1234".to_string()),
-            (VariableName::Column, "5678".to_string()),
-            (VariableName::File, "test_file".to_string()),
-            (VariableName::Symbol, "my symbol".to_string()),
-        ];
-
-        let template = TaskTemplate {
-            label: "my task".to_string(),
-            command: format!(
-                "echo {} {}",
-                VariableName::File.template_value(),
-                VariableName::Symbol.template_value(),
-            ),
-            args: vec![],
-            env: HashMap::from_iter([
-                (
-                    "TASK_ENV_VAR1".to_string(),
-                    "TASK_ENV_VAR1_VALUE".to_string(),
-                ),
-                (
-                    "TASK_ENV_VAR2".to_string(),
-                    format!(
-                        "env_var_2 {} {}",
-                        VariableName::Row.template_value(),
-                        VariableName::Column.template_value()
-                    ),
-                ),
-                (
-                    "PROJECT_ENV_WILL_BE_OVERWRITTEN".to_string(),
-                    "overwritten".to_string(),
-                ),
-            ]),
-            ..TaskTemplate::default()
-        };
-
-        let project_env = HashMap::from_iter([
-            (
-                "PROJECT_ENV_VAR1".to_string(),
-                "PROJECT_ENV_VAR1_VALUE".to_string(),
-            ),
-            (
-                "PROJECT_ENV_WILL_BE_OVERWRITTEN".to_string(),
-                "PROJECT_ENV_WILL_BE_OVERWRITTEN_VALUE".to_string(),
-            ),
-        ]);
-
-        let context = TaskContext {
-            cwd: None,
-            task_variables: TaskVariables::from_iter(all_variables),
-            project_env,
-        };
-
-        let resolved = template
-            .resolve_task(TEST_ID_BASE, &context)
-            .unwrap()
-            .resolved;
-
-        assert_eq!(resolved.env["TASK_ENV_VAR1"], "TASK_ENV_VAR1_VALUE");
-        assert_eq!(resolved.env["TASK_ENV_VAR2"], "env_var_2 1234 5678");
-        assert_eq!(resolved.env["PROJECT_ENV_VAR1"], "PROJECT_ENV_VAR1_VALUE");
-        assert_eq!(
-            resolved.env["PROJECT_ENV_WILL_BE_OVERWRITTEN"],
-            "overwritten"
-        );
-    }
-
-    #[test]
-    fn test_variable_default_values() {
-        let task_with_defaults = TaskTemplate {
-            label: "test with defaults".to_string(),
-            command: format!(
-                "echo ${{{}}}",
-                VariableName::File.to_string() + ":fallback.txt"
-            ),
-            args: vec![
-                "${ZED_MISSING_VAR:default_value}".to_string(),
-                format!("${{{}}}", VariableName::Row.to_string() + ":42"),
-            ],
-            ..TaskTemplate::default()
-        };
-
-        // Test 1: When ZED_FILE exists, should use actual value and ignore default
-        let context_with_file = TaskContext {
-            cwd: None,
-            task_variables: TaskVariables::from_iter(vec![
-                (VariableName::File, "actual_file.rs".to_string()),
-                (VariableName::Row, "123".to_string()),
-            ]),
-            project_env: HashMap::default(),
-        };
-
-        let resolved = task_with_defaults
-            .resolve_task(TEST_ID_BASE, &context_with_file)
-            .expect("Should resolve task with existing variables");
-
-        assert_eq!(
-            resolved.resolved.command.unwrap(),
-            "echo actual_file.rs",
-            "Should use actual ZED_FILE value, not default"
-        );
-        assert_eq!(
-            resolved.resolved.args,
-            vec!["default_value", "123"],
-            "Should use default for missing var, actual value for existing var"
-        );
-
-        // Test 2: When ZED_FILE doesn't exist, should use default value
-        let context_without_file = TaskContext {
-            cwd: None,
-            task_variables: TaskVariables::from_iter(vec![(VariableName::Row, "456".to_string())]),
-            project_env: HashMap::default(),
-        };
-
-        let resolved = task_with_defaults
-            .resolve_task(TEST_ID_BASE, &context_without_file)
-            .expect("Should resolve task using default values");
-
-        assert_eq!(
-            resolved.resolved.command.unwrap(),
-            "echo fallback.txt",
-            "Should use default value when ZED_FILE is missing"
-        );
-        assert_eq!(
-            resolved.resolved.args,
-            vec!["default_value", "456"],
-            "Should use defaults for missing vars"
-        );
-
-        // Test 3: Missing ZED variable without default should fail
-        let task_no_default = TaskTemplate {
-            label: "test no default".to_string(),
-            command: "${ZED_MISSING_NO_DEFAULT}".to_string(),
-            ..TaskTemplate::default()
-        };
-
-        assert!(
-            task_no_default
-                .resolve_task(TEST_ID_BASE, &TaskContext::default())
-                .is_none(),
-            "Should fail when ZED variable has no default and doesn't exist"
-        );
-    }
-}
diff --git a/crates/task/src/vscode_debug_format.rs b/crates/task/src/vscode_debug_format.rs
deleted file mode 100644
index bef64c8d40..0000000000
--- a/crates/task/src/vscode_debug_format.rs
+++ /dev/null
@@ -1,194 +0,0 @@
-use collections::HashMap;
-use serde::Deserialize;
-use util::ResultExt as _;
-
-use crate::{
-    DebugScenario, DebugTaskFile, EnvVariableReplacer, TcpArgumentsTemplate, VariableName,
-};
-
-// TODO support preLaunchTask linkage with other tasks
-#[derive(Clone, Debug, Deserialize, PartialEq)]
-#[serde(rename_all = "camelCase")]
-struct VsCodeDebugTaskDefinition {
-    r#type: String,
-    name: String,
-    #[serde(default)]
-    port: Option<u16>,
-    #[serde(flatten)]
-    other_attributes: serde_json::Value,
-}
-
-impl VsCodeDebugTaskDefinition {
-    fn try_to_zed(mut self, replacer: &EnvVariableReplacer) -> anyhow::Result<DebugScenario> {
-        let label = replacer.replace(&self.name);
-        let mut config = replacer.replace_value(self.other_attributes);
-        let adapter = task_type_to_adapter_name(&self.r#type);
-        if let Some(config) = config.as_object_mut()
-            && adapter == "JavaScript"
-        {
-            config.insert("type".to_owned(), self.r#type.clone().into());
-            if let Some(port) = self.port.take() {
-                config.insert("port".to_owned(), port.into());
-            }
-        }
-        let definition = DebugScenario {
-            label: label.into(),
-            build: None,
-            adapter: adapter.into(),
-            tcp_connection: self.port.map(|port| TcpArgumentsTemplate {
-                port: Some(port),
-                host: None,
-                timeout: None,
-            }),
-            config,
-        };
-        Ok(definition)
-    }
-}
-
-#[derive(Clone, Debug, Deserialize, PartialEq)]
-#[serde(rename_all = "camelCase")]
-pub struct VsCodeDebugTaskFile {
-    #[serde(default)]
-    version: Option<String>,
-    configurations: Vec<VsCodeDebugTaskDefinition>,
-}
-
-impl TryFrom<VsCodeDebugTaskFile> for DebugTaskFile {
-    type Error = anyhow::Error;
-
-    fn try_from(file: VsCodeDebugTaskFile) -> Result<Self, Self::Error> {
-        let replacer = EnvVariableReplacer::new(HashMap::from_iter([
-            (
-                "workspaceFolder".to_owned(),
-                VariableName::WorktreeRoot.to_string(),
-            ),
-            (
-                "relativeFile".to_owned(),
-                VariableName::RelativeFile.to_string(),
-            ),
-            ("file".to_owned(), VariableName::File.to_string()),
-        ]))
-        .with_commands([(
-            "pickMyProcess".to_owned(),
-            VariableName::PickProcessId.to_string(),
-        )]);
-        let templates = file
-            .configurations
-            .into_iter()
-            .filter_map(|config| config.try_to_zed(&replacer).log_err())
-            .collect::<Vec<_>>();
-        Ok(DebugTaskFile(templates))
-    }
-}
-
-fn task_type_to_adapter_name(task_type: &str) -> String {
-    match task_type {
-        "pwa-node" | "node" | "node-terminal" | "chrome" | "pwa-chrome" | "edge" | "pwa-edge"
-        | "msedge" | "pwa-msedge" => "JavaScript",
-        "go" => "Delve",
-        "php" => "Xdebug",
-        "cppdbg" | "lldb" => "CodeLLDB",
-        "debugpy" => "Debugpy",
-        "rdbg" => "rdbg",
-        _ => task_type,
-    }
-    .to_owned()
-}
-
-#[cfg(test)]
-mod tests {
-    use serde_json::json;
-
-    use crate::{DebugScenario, DebugTaskFile, VariableName};
-
-    use super::VsCodeDebugTaskFile;
-
-    #[test]
-    fn test_parsing_vscode_launch_json() {
-        let raw = r#"
-            {
-                "version": "0.2.0",
-                "configurations": [
-                    {
-                        "name": "Debug my JS app",
-                        "request": "launch",
-                        "type": "node",
-                        "program": "${workspaceFolder}/xyz.js",
-                        "showDevDebugOutput": false,
-                        "stopOnEntry": true,
-                        "args": ["--foo", "${workspaceFolder}/thing"],
-                        "cwd": "${workspaceFolder}/${env:FOO}/sub",
-                        "env": {
-                            "X": "Y"
-                        },
-                        "port": 17
-                    },
-                ]
-            }
-        "#;
-        let parsed: VsCodeDebugTaskFile =
-            serde_json_lenient::from_str(raw).expect("deserializing launch.json");
-        let zed = DebugTaskFile::try_from(parsed).expect("converting to Zed debug templates");
-        pretty_assertions::assert_eq!(
-            zed,
-            DebugTaskFile(vec![DebugScenario {
-                label: "Debug my JS app".into(),
-                adapter: "JavaScript".into(),
-                config: json!({
-                    "request": "launch",
-                    "program": "${ZED_WORKTREE_ROOT}/xyz.js",
-                    "showDevDebugOutput": false,
-                    "stopOnEntry": true,
-                    "args": [
-                        "--foo",
-                        "${ZED_WORKTREE_ROOT}/thing",
-                    ],
-                    "cwd": "${ZED_WORKTREE_ROOT}/${FOO}/sub",
-                    "env": {
-                        "X": "Y",
-                    },
-                    "type": "node",
-                    "port": 17,
-                }),
-                tcp_connection: None,
-                build: None
-            }])
-        );
-    }
-
-    #[test]
-    fn test_command_pickmyprocess_replacement() {
-        let raw = r#"
-            {
-                "version": "0.2.0",
-                "configurations": [
-                    {
-                        "name": "Attach to Process",
-                        "request": "attach",
-                        "type": "cppdbg",
-                        "processId": "${command:pickMyProcess}"
-                    }
-                ]
-            }
-        "#;
-        let parsed: VsCodeDebugTaskFile =
-            serde_json_lenient::from_str(raw).expect("deserializing launch.json");
-        let zed = DebugTaskFile::try_from(parsed).expect("converting to Zed debug templates");
-
-        let expected_placeholder = format!("${{{}}}", VariableName::PickProcessId);
-        pretty_assertions::assert_eq!(
-            zed,
-            DebugTaskFile(vec![DebugScenario {
-                label: "Attach to Process".into(),
-                adapter: "CodeLLDB".into(),
-                config: json!({
-                    "request": "attach",
-                    "processId": expected_placeholder,
-                }),
-                tcp_connection: None,
-                build: None
-            }])
-        );
-    }
-}
diff --git a/crates/task/src/vscode_format.rs b/crates/task/src/vscode_format.rs
deleted file mode 100644
index 9078a73fbb..0000000000
--- a/crates/task/src/vscode_format.rs
+++ /dev/null
@@ -1,361 +0,0 @@
-use anyhow::bail;
-use collections::HashMap;
-use serde::Deserialize;
-use util::ResultExt;
-
-use crate::{EnvVariableReplacer, TaskTemplate, TaskTemplates, VariableName};
-
-#[derive(Clone, Debug, Deserialize, PartialEq)]
-#[serde(rename_all = "camelCase")]
-struct TaskOptions {
-    cwd: Option<String>,
-    #[serde(default)]
-    env: HashMap<String, String>,
-}
-
-#[derive(Clone, Debug, Deserialize, PartialEq)]
-#[serde(rename_all = "camelCase")]
-struct VsCodeTaskDefinition {
-    label: String,
-    #[serde(flatten)]
-    command: Option<Command>,
-    #[serde(flatten)]
-    other_attributes: HashMap<String, serde_json_lenient::Value>,
-    options: Option<TaskOptions>,
-}
-
-#[derive(Clone, Deserialize, PartialEq, Debug)]
-#[serde(tag = "type")]
-#[serde(rename_all = "camelCase")]
-enum Command {
-    Npm {
-        script: String,
-    },
-    Shell {
-        command: String,
-        #[serde(default)]
-        args: Vec<String>,
-    },
-    Gulp {
-        task: String,
-    },
-}
-
-impl VsCodeTaskDefinition {
-    fn into_zed_format(
-        self,
-        replacer: &EnvVariableReplacer,
-    ) -> anyhow::Result<Option<TaskTemplate>> {
-        if self.other_attributes.contains_key("dependsOn") {
-            log::warn!(
-                "Skipping deserializing of a task `{}` with the unsupported `dependsOn` key",
-                self.label
-            );
-            return Ok(None);
-        }
-        // `type` might not be set in e.g. tasks that use `dependsOn`; we still want to deserialize the whole object though (hence command is an Option),
-        // as that way we can provide more specific description of why deserialization failed.
-        // E.g. if the command is missing due to `dependsOn` presence, we can check other_attributes first before doing this (and provide nice error message)
-        // catch-all if on value.command presence.
-        let Some(command) = self.command else {
-            bail!("Missing `type` field in task");
-        };
-
-        let (command, args) = match command {
-            Command::Npm { script } => ("npm".to_owned(), vec!["run".to_string(), script]),
-            Command::Shell { command, args } => (command, args),
-            Command::Gulp { task } => ("gulp".to_owned(), vec![task]),
-        };
-        // Per VSC docs, only `command`, `args` and `options` support variable substitution.
-        let command = replacer.replace(&command);
-        let args = args.into_iter().map(|arg| replacer.replace(&arg)).collect();
-        let mut template = TaskTemplate {
-            label: self.label,
-            command,
-            args,
-            ..TaskTemplate::default()
-        };
-        if let Some(options) = self.options {
-            template.cwd = options.cwd.map(|cwd| replacer.replace(&cwd));
-            template.env = options.env;
-        }
-        Ok(Some(template))
-    }
-}
-
-/// [`VsCodeTaskFile`] is a superset of Code's task definition format.
-#[derive(Debug, Deserialize, PartialEq)]
-pub struct VsCodeTaskFile {
-    tasks: Vec<VsCodeTaskDefinition>,
-}
-
-impl TryFrom<VsCodeTaskFile> for TaskTemplates {
-    type Error = anyhow::Error;
-
-    fn try_from(value: VsCodeTaskFile) -> Result<Self, Self::Error> {
-        let replacer = EnvVariableReplacer::new(HashMap::from_iter([
-            (
-                "workspaceFolder".to_owned(),
-                VariableName::WorktreeRoot.to_string(),
-            ),
-            ("file".to_owned(), VariableName::File.to_string()),
-            ("lineNumber".to_owned(), VariableName::Row.to_string()),
-            (
-                "selectedText".to_owned(),
-                VariableName::SelectedText.to_string(),
-            ),
-        ]));
-        let templates = value
-            .tasks
-            .into_iter()
-            .filter_map(|vscode_definition| {
-                vscode_definition
-                    .into_zed_format(&replacer)
-                    .log_err()
-                    .flatten()
-            })
-            .collect();
-        Ok(Self(templates))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::collections::HashMap;
-
-    use crate::{
-        TaskTemplate, TaskTemplates, VsCodeTaskFile,
-        vscode_format::{Command, VsCodeTaskDefinition},
-    };
-
-    use super::EnvVariableReplacer;
-
-    fn compare_without_other_attributes(lhs: VsCodeTaskDefinition, rhs: VsCodeTaskDefinition) {
-        assert_eq!(
-            VsCodeTaskDefinition {
-                other_attributes: Default::default(),
-                ..lhs
-            },
-            VsCodeTaskDefinition {
-                other_attributes: Default::default(),
-                ..rhs
-            },
-        );
-    }
-
-    #[test]
-    fn test_variable_substitution() {
-        let replacer = EnvVariableReplacer::new(Default::default());
-        assert_eq!(replacer.replace("Food"), "Food");
-        // Unknown variables are left in tact.
-        assert_eq!(
-            replacer.replace("$PATH is an environment variable"),
-            "$PATH is an environment variable"
-        );
-        assert_eq!(replacer.replace("${PATH}"), "${PATH}");
-        assert_eq!(replacer.replace("${PATH:food}"), "${PATH:food}");
-        // And now, the actual replacing
-        let replacer = EnvVariableReplacer::new(HashMap::from_iter([(
-            "PATH".to_owned(),
-            "ZED_PATH".to_owned(),
-        )]));
-        assert_eq!(replacer.replace("Food"), "Food");
-        assert_eq!(
-            replacer.replace("$PATH is an environment variable"),
-            "${ZED_PATH} is an environment variable"
-        );
-        assert_eq!(replacer.replace("${PATH}"), "${ZED_PATH}");
-        assert_eq!(replacer.replace("${PATH:food}"), "${ZED_PATH:food}");
-    }
-
-    #[test]
-    fn can_deserialize_ts_tasks() {
-        const TYPESCRIPT_TASKS: &str = include_str!("../test_data/typescript.json");
-        let vscode_definitions: VsCodeTaskFile =
-            serde_json_lenient::from_str(TYPESCRIPT_TASKS).unwrap();
-
-        let expected = vec![
-            VsCodeTaskDefinition {
-                label: "gulp: tests".to_string(),
-                command: Some(Command::Npm {
-                    script: "build:tests:notypecheck".to_string(),
-                }),
-                other_attributes: Default::default(),
-                options: None,
-            },
-            VsCodeTaskDefinition {
-                label: "tsc: watch ./src".to_string(),
-                command: Some(Command::Shell {
-                    command: "node".to_string(),
-                    args: vec![
-                        "${workspaceFolder}/node_modules/typescript/lib/tsc.js".to_string(),
-                        "--build".to_string(),
-                        "${workspaceFolder}/src".to_string(),
-                        "--watch".to_string(),
-                    ],
-                }),
-                other_attributes: Default::default(),
-                options: None,
-            },
-            VsCodeTaskDefinition {
-                label: "npm: build:compiler".to_string(),
-                command: Some(Command::Npm {
-                    script: "build:compiler".to_string(),
-                }),
-                other_attributes: Default::default(),
-                options: None,
-            },
-            VsCodeTaskDefinition {
-                label: "npm: build:tests".to_string(),
-                command: Some(Command::Npm {
-                    script: "build:tests:notypecheck".to_string(),
-                }),
-                other_attributes: Default::default(),
-                options: None,
-            },
-        ];
-
-        assert_eq!(vscode_definitions.tasks.len(), expected.len());
-        vscode_definitions
-            .tasks
-            .iter()
-            .zip(expected)
-            .for_each(|(lhs, rhs)| compare_without_other_attributes(lhs.clone(), rhs));
-
-        let expected = vec![
-            TaskTemplate {
-                label: "gulp: tests".to_string(),
-                command: "npm".to_string(),
-                args: vec!["run".to_string(), "build:tests:notypecheck".to_string()],
-                ..Default::default()
-            },
-            TaskTemplate {
-                label: "tsc: watch ./src".to_string(),
-                command: "node".to_string(),
-                args: vec![
-                    "${ZED_WORKTREE_ROOT}/node_modules/typescript/lib/tsc.js".to_string(),
-                    "--build".to_string(),
-                    "${ZED_WORKTREE_ROOT}/src".to_string(),
-                    "--watch".to_string(),
-                ],
-                ..Default::default()
-            },
-            TaskTemplate {
-                label: "npm: build:compiler".to_string(),
-                command: "npm".to_string(),
-                args: vec!["run".to_string(), "build:compiler".to_string()],
-                ..Default::default()
-            },
-            TaskTemplate {
-                label: "npm: build:tests".to_string(),
-                command: "npm".to_string(),
-                args: vec!["run".to_string(), "build:tests:notypecheck".to_string()],
-                ..Default::default()
-            },
-        ];
-
-        let tasks: TaskTemplates = vscode_definitions.try_into().unwrap();
-        assert_eq!(tasks.0, expected);
-    }
-
-    #[test]
-    fn can_deserialize_rust_analyzer_tasks() {
-        const RUST_ANALYZER_TASKS: &str = include_str!("../test_data/rust-analyzer.json");
-        let vscode_definitions: VsCodeTaskFile =
-            serde_json_lenient::from_str(RUST_ANALYZER_TASKS).unwrap();
-        let expected = vec![
-            VsCodeTaskDefinition {
-                label: "Build Extension in Background".to_string(),
-                command: Some(Command::Npm {
-                    script: "watch".to_string(),
-                }),
-                options: None,
-                other_attributes: Default::default(),
-            },
-            VsCodeTaskDefinition {
-                label: "Build Extension".to_string(),
-                command: Some(Command::Npm {
-                    script: "build".to_string(),
-                }),
-                options: None,
-                other_attributes: Default::default(),
-            },
-            VsCodeTaskDefinition {
-                label: "Build Server".to_string(),
-                command: Some(Command::Shell {
-                    command: "cargo build --package rust-analyzer".to_string(),
-                    args: Default::default(),
-                }),
-                options: None,
-                other_attributes: Default::default(),
-            },
-            VsCodeTaskDefinition {
-                label: "Build Server (Release)".to_string(),
-                command: Some(Command::Shell {
-                    command: "cargo build --release --package rust-analyzer".to_string(),
-                    args: Default::default(),
-                }),
-                options: None,
-                other_attributes: Default::default(),
-            },
-            VsCodeTaskDefinition {
-                label: "Pretest".to_string(),
-                command: Some(Command::Npm {
-                    script: "pretest".to_string(),
-                }),
-                options: None,
-                other_attributes: Default::default(),
-            },
-            VsCodeTaskDefinition {
-                label: "Build Server and Extension".to_string(),
-                command: None,
-                options: None,
-                other_attributes: Default::default(),
-            },
-            VsCodeTaskDefinition {
-                label: "Build Server (Release) and Extension".to_string(),
-                command: None,
-                options: None,
-                other_attributes: Default::default(),
-            },
-        ];
-        assert_eq!(vscode_definitions.tasks.len(), expected.len());
-        vscode_definitions
-            .tasks
-            .iter()
-            .zip(expected)
-            .for_each(|(lhs, rhs)| compare_without_other_attributes(lhs.clone(), rhs));
-        let expected = vec![
-            TaskTemplate {
-                label: "Build Extension in Background".to_string(),
-                command: "npm".to_string(),
-                args: vec!["run".to_string(), "watch".to_string()],
-                ..Default::default()
-            },
-            TaskTemplate {
-                label: "Build Extension".to_string(),
-                command: "npm".to_string(),
-                args: vec!["run".to_string(), "build".to_string()],
-                ..Default::default()
-            },
-            TaskTemplate {
-                label: "Build Server".to_string(),
-                command: "cargo build --package rust-analyzer".to_string(),
-                ..Default::default()
-            },
-            TaskTemplate {
-                label: "Build Server (Release)".to_string(),
-                command: "cargo build --release --package rust-analyzer".to_string(),
-                ..Default::default()
-            },
-            TaskTemplate {
-                label: "Pretest".to_string(),
-                command: "npm".to_string(),
-                args: vec!["run".to_string(), "pretest".to_string()],
-                ..Default::default()
-            },
-        ];
-        let tasks: TaskTemplates = vscode_definitions.try_into().unwrap();
-        assert_eq!(tasks.0, expected);
-    }
-}
diff --git a/crates/task/test_data/rust-analyzer.json b/crates/task/test_data/rust-analyzer.json
deleted file mode 100644
index 0ea585c4b8..0000000000
--- a/crates/task/test_data/rust-analyzer.json
+++ /dev/null
@@ -1,67 +0,0 @@
-// See https://go.microsoft.com/fwlink/?LinkId=733558
-// for the documentation about the tasks.json format
-{
-  "version": "2.0.0",
-  "tasks": [
-    {
-      "label": "Build Extension in Background",
-      "group": "build",
-      "type": "npm",
-      "script": "watch",
-      "path": "editors/code/",
-      "problemMatcher": {
-        "base": "$tsc-watch",
-        "fileLocation": ["relative", "${workspaceFolder}/editors/code/"]
-      },
-      "isBackground": true
-    },
-    {
-      "label": "Build Extension",
-      "group": "build",
-      "type": "npm",
-      "script": "build",
-      "path": "editors/code/",
-      "problemMatcher": {
-        "base": "$tsc",
-        "fileLocation": ["relative", "${workspaceFolder}/editors/code/"]
-      }
-    },
-    {
-      "label": "Build Server",
-      "group": "build",
-      "type": "shell",
-      "command": "cargo build --package rust-analyzer",
-      "problemMatcher": "$rustc"
-    },
-    {
-      "label": "Build Server (Release)",
-      "group": "build",
-      "type": "shell",
-      "command": "cargo build --release --package rust-analyzer",
-      "problemMatcher": "$rustc"
-    },
-    {
-      "label": "Pretest",
-      "group": "build",
-      "isBackground": false,
-      "type": "npm",
-      "script": "pretest",
-      "path": "editors/code/",
-      "problemMatcher": {
-        "base": "$tsc",
-        "fileLocation": ["relative", "${workspaceFolder}/editors/code/"]
-      }
-    },
-
-    {
-      "label": "Build Server and Extension",
-      "dependsOn": ["Build Server", "Build Extension"],
-      "problemMatcher": "$rustc"
-    },
-    {
-      "label": "Build Server (Release) and Extension",
-      "dependsOn": ["Build Server (Release)", "Build Extension"],
-      "problemMatcher": "$rustc"
-    }
-  ]
-}
diff --git a/crates/task/test_data/typescript.json b/crates/task/test_data/typescript.json
deleted file mode 100644
index 91d2343682..0000000000
--- a/crates/task/test_data/typescript.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  // See https://go.microsoft.com/fwlink/?LinkId=733558
-  // for the documentation about the tasks.json format
-  "version": "2.0.0",
-  "tasks": [
-    {
-      // Kept for backwards compat for old launch.json files so it's
-      // less annoying if moving up to the new build or going back to
-      // the old build.
-      //
-      // This is first because the actual "npm: build:tests" task
-      // below has the same script value, and VS Code ignores labels
-      // and deduplicates them.
-      // https://github.com/microsoft/vscode/issues/93001
-      "label": "gulp: tests",
-      "type": "npm",
-      "script": "build:tests:notypecheck",
-      "group": "build",
-      "hide": true,
-      "problemMatcher": ["$tsc"]
-    },
-    {
-      "label": "tsc: watch ./src",
-      "type": "shell",
-      "command": "node",
-      "args": [
-        "${workspaceFolder}/node_modules/typescript/lib/tsc.js",
-        "--build",
-        "${workspaceFolder}/src",
-        "--watch"
-      ],
-      "group": "build",
-      "isBackground": true,
-      "problemMatcher": ["$tsc-watch"]
-    },
-    {
-      "label": "npm: build:compiler",
-      "type": "npm",
-      "script": "build:compiler",
-      "group": "build",
-      "problemMatcher": ["$tsc"]
-    },
-    {
-      "label": "npm: build:tests",
-      "type": "npm",
-      "script": "build:tests:notypecheck",
-      "group": "build",
-      "problemMatcher": ["$tsc"]
-    }
-  ]
-}
diff --git a/crates/tasks_ui/Cargo.toml b/crates/tasks_ui/Cargo.toml
deleted file mode 100644
index 2f75a0b57c..0000000000
--- a/crates/tasks_ui/Cargo.toml
+++ /dev/null
@@ -1,41 +0,0 @@
-[package]
-name = "tasks_ui"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/tasks_ui.rs"
-
-[dependencies]
-anyhow.workspace = true
-collections.workspace = true
-editor.workspace = true
-file_icons.workspace = true
-fuzzy.workspace = true
-itertools.workspace = true
-gpui.workspace = true
-menu.workspace = true
-picker.workspace = true
-project.workspace = true
-task.workspace = true
-serde.workspace = true
-ui.workspace = true
-util.workspace = true
-workspace.workspace = true
-language.workspace = true
-zed_actions.workspace = true
-
-[dev-dependencies]
-editor = { workspace = true, features = ["test-support"] }
-gpui = { workspace = true, features = ["test-support"] }
-language = { workspace = true, features = ["test-support"] }
-project = { workspace = true, features = ["test-support"] }
-serde_json.workspace = true
-tree-sitter-rust.workspace = true
-tree-sitter-typescript.workspace = true
-workspace = { workspace = true, features = ["test-support"] }
diff --git a/crates/tasks_ui/LICENSE-GPL b/crates/tasks_ui/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/tasks_ui/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/tasks_ui/src/modal.rs b/crates/tasks_ui/src/modal.rs
deleted file mode 100644
index 644f82285b..0000000000
--- a/crates/tasks_ui/src/modal.rs
+++ /dev/null
@@ -1,1312 +0,0 @@
-use std::sync::Arc;
-
-use crate::TaskContexts;
-use editor::Editor;
-use fuzzy::{StringMatch, StringMatchCandidate};
-use gpui::{
-    Action, AnyElement, App, AppContext as _, Context, DismissEvent, Entity, EventEmitter,
-    Focusable, InteractiveElement, ParentElement, Render, Styled, Subscription, Task, WeakEntity,
-    Window, rems,
-};
-use itertools::Itertools;
-use picker::{Picker, PickerDelegate, highlighted_match_with_paths::HighlightedMatch};
-use project::{TaskSourceKind, task_store::TaskStore};
-use task::{DebugScenario, ResolvedTask, RevealTarget, TaskContext, TaskTemplate};
-use ui::{
-    ActiveTheme, Clickable, FluentBuilder as _, IconButtonShape, IconWithIndicator, Indicator,
-    IntoElement, KeyBinding, ListItem, ListItemSpacing, RenderOnce, Toggleable, Tooltip, div,
-    prelude::*,
-};
-
-use util::{ResultExt, truncate_and_trailoff};
-use workspace::{ModalView, Workspace};
-pub use zed_actions::{Rerun, Spawn};
-
-/// A modal used to spawn new tasks.
-pub struct TasksModalDelegate {
-    task_store: Entity<TaskStore>,
-    candidates: Option<Vec<(TaskSourceKind, ResolvedTask)>>,
-    task_overrides: Option<TaskOverrides>,
-    last_used_candidate_index: Option<usize>,
-    divider_index: Option<usize>,
-    matches: Vec<StringMatch>,
-    selected_index: usize,
-    workspace: WeakEntity<Workspace>,
-    prompt: String,
-    task_contexts: Arc<TaskContexts>,
-    placeholder_text: Arc<str>,
-}
-
-/// Task template amendments to do before resolving the context.
-#[derive(Clone, Debug, Default, PartialEq, Eq)]
-pub struct TaskOverrides {
-    /// See [`RevealTarget`].
-    pub reveal_target: Option<RevealTarget>,
-}
-
-impl TasksModalDelegate {
-    fn new(
-        task_store: Entity<TaskStore>,
-        task_contexts: Arc<TaskContexts>,
-        task_overrides: Option<TaskOverrides>,
-        workspace: WeakEntity<Workspace>,
-    ) -> Self {
-        let placeholder_text = if let Some(TaskOverrides {
-            reveal_target: Some(RevealTarget::Center),
-        }) = &task_overrides
-        {
-            Arc::from("Find a task, or run a command in the central pane")
-        } else {
-            Arc::from("Find a task, or run a command")
-        };
-        Self {
-            task_store,
-            workspace,
-            candidates: None,
-            matches: Vec::new(),
-            last_used_candidate_index: None,
-            divider_index: None,
-            selected_index: 0,
-            prompt: String::default(),
-            task_contexts,
-            task_overrides,
-            placeholder_text,
-        }
-    }
-
-    fn spawn_oneshot(&mut self) -> Option<(TaskSourceKind, ResolvedTask)> {
-        if self.prompt.trim().is_empty() {
-            return None;
-        }
-
-        let default_context = TaskContext::default();
-        let active_context = self
-            .task_contexts
-            .active_context()
-            .unwrap_or(&default_context);
-        let source_kind = TaskSourceKind::UserInput;
-        let id_base = source_kind.to_id_base();
-        let mut new_oneshot = TaskTemplate {
-            label: self.prompt.clone(),
-            command: self.prompt.clone(),
-            ..TaskTemplate::default()
-        };
-        if let Some(TaskOverrides {
-            reveal_target: Some(reveal_target),
-        }) = &self.task_overrides
-        {
-            new_oneshot.reveal_target = *reveal_target;
-        }
-        Some((
-            source_kind,
-            new_oneshot.resolve_task(&id_base, active_context)?,
-        ))
-    }
-
-    fn delete_previously_used(&mut self, ix: usize, cx: &mut App) {
-        let Some(candidates) = self.candidates.as_mut() else {
-            return;
-        };
-        let Some(task) = candidates.get(ix).map(|(_, task)| task.clone()) else {
-            return;
-        };
-        // We remove this candidate manually instead of .taking() the candidates, as we already know the index;
-        // it doesn't make sense to requery the inventory for new candidates, as that's potentially costly and more often than not it should just return back
-        // the original list without a removed entry.
-        candidates.remove(ix);
-        if let Some(inventory) = self.task_store.read(cx).task_inventory().cloned() {
-            inventory.update(cx, |inventory, _| {
-                inventory.delete_previously_used(&task.id);
-            })
-        };
-    }
-}
-
-pub struct TasksModal {
-    pub picker: Entity<Picker<TasksModalDelegate>>,
-    _subscription: [Subscription; 2],
-}
-
-impl TasksModal {
-    pub fn new(
-        task_store: Entity<TaskStore>,
-        task_contexts: Arc<TaskContexts>,
-        task_overrides: Option<TaskOverrides>,
-        is_modal: bool,
-        workspace: WeakEntity<Workspace>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let picker = cx.new(|cx| {
-            Picker::uniform_list(
-                TasksModalDelegate::new(task_store, task_contexts, task_overrides, workspace),
-                window,
-                cx,
-            )
-            .modal(is_modal)
-        });
-        let _subscription = [
-            cx.subscribe(&picker, |_, _, _: &DismissEvent, cx| {
-                cx.emit(DismissEvent);
-            }),
-            cx.subscribe(&picker, |_, _, event: &ShowAttachModal, cx| {
-                cx.emit(ShowAttachModal {
-                    debug_config: event.debug_config.clone(),
-                });
-            }),
-        ];
-        Self {
-            picker,
-            _subscription,
-        }
-    }
-
-    pub fn tasks_loaded(
-        &mut self,
-        task_contexts: Arc<TaskContexts>,
-        lsp_tasks: Vec<(TaskSourceKind, task::ResolvedTask)>,
-        used_tasks: Vec<(TaskSourceKind, task::ResolvedTask)>,
-        current_resolved_tasks: Vec<(TaskSourceKind, task::ResolvedTask)>,
-        add_current_language_tasks: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let last_used_candidate_index = if used_tasks.is_empty() {
-            None
-        } else {
-            Some(used_tasks.len() - 1)
-        };
-        let mut new_candidates = used_tasks;
-        new_candidates.extend(lsp_tasks);
-        let hide_vscode = current_resolved_tasks.iter().any(|(kind, _)| match kind {
-            TaskSourceKind::Worktree {
-                id: _,
-                directory_in_worktree: dir,
-                id_base: _,
-            } => dir.file_name().is_some_and(|name| name == ".zed"),
-            _ => false,
-        });
-        // todo(debugger): We're always adding lsp tasks here even if prefer_lsp is false
-        // We should move the filter to new_candidates instead of on current
-        // and add a test for this
-        new_candidates.extend(current_resolved_tasks.into_iter().filter(|(task_kind, _)| {
-            match task_kind {
-                TaskSourceKind::Worktree {
-                    directory_in_worktree: dir,
-                    ..
-                } => !(hide_vscode && dir.file_name().is_some_and(|name| name == ".vscode")),
-                TaskSourceKind::Language { .. } => add_current_language_tasks,
-                _ => true,
-            }
-        }));
-        self.picker.update(cx, |picker, cx| {
-            picker.delegate.task_contexts = task_contexts;
-            picker.delegate.last_used_candidate_index = last_used_candidate_index;
-            picker.delegate.candidates = Some(new_candidates);
-            picker.refresh(window, cx);
-            cx.notify();
-        })
-    }
-}
-
-impl Render for TasksModal {
-    fn render(
-        &mut self,
-        _window: &mut Window,
-        _: &mut Context<Self>,
-    ) -> impl gpui::prelude::IntoElement {
-        v_flex()
-            .key_context("TasksModal")
-            .w(rems(34.))
-            .child(self.picker.clone())
-    }
-}
-
-pub struct ShowAttachModal {
-    pub debug_config: DebugScenario,
-}
-
-impl EventEmitter<DismissEvent> for TasksModal {}
-impl EventEmitter<ShowAttachModal> for TasksModal {}
-impl EventEmitter<ShowAttachModal> for Picker<TasksModalDelegate> {}
-
-impl Focusable for TasksModal {
-    fn focus_handle(&self, cx: &gpui::App) -> gpui::FocusHandle {
-        self.picker.read(cx).focus_handle(cx)
-    }
-}
-
-impl ModalView for TasksModal {}
-
-const MAX_TAGS_LINE_LEN: usize = 30;
-
-impl PickerDelegate for TasksModalDelegate {
-    type ListItem = ListItem;
-
-    fn match_count(&self) -> usize {
-        self.matches.len()
-    }
-
-    fn selected_index(&self) -> usize {
-        self.selected_index
-    }
-
-    fn set_selected_index(
-        &mut self,
-        ix: usize,
-        _window: &mut Window,
-        _cx: &mut Context<picker::Picker<Self>>,
-    ) {
-        self.selected_index = ix;
-    }
-
-    fn placeholder_text(&self, _window: &mut Window, _: &mut App) -> Arc<str> {
-        self.placeholder_text.clone()
-    }
-
-    fn update_matches(
-        &mut self,
-        query: String,
-        window: &mut Window,
-        cx: &mut Context<picker::Picker<Self>>,
-    ) -> Task<()> {
-        let candidates = match &self.candidates {
-            Some(candidates) => Task::ready(string_match_candidates(candidates)),
-            None => {
-                if let Some(task_inventory) = self.task_store.read(cx).task_inventory().cloned() {
-                    let task_list = task_inventory.update(cx, |this, cx| {
-                        this.used_and_current_resolved_tasks(self.task_contexts.clone(), cx)
-                    });
-                    let workspace = self.workspace.clone();
-                    let lsp_task_sources = self.task_contexts.lsp_task_sources.clone();
-                    let task_position = self.task_contexts.latest_selection;
-                    cx.spawn(async move |picker, cx| {
-                        let (used, current) = task_list.await;
-                        let Ok((lsp_tasks, prefer_lsp)) = workspace.update(cx, |workspace, cx| {
-                            let lsp_tasks = editor::lsp_tasks(
-                                workspace.project().clone(),
-                                &lsp_task_sources,
-                                task_position,
-                                cx,
-                            );
-                            let prefer_lsp = workspace
-                                .active_item(cx)
-                                .and_then(|item| item.downcast::<Editor>())
-                                .map(|editor| {
-                                    editor
-                                        .read(cx)
-                                        .buffer()
-                                        .read(cx)
-                                        .language_settings(cx)
-                                        .tasks
-                                        .prefer_lsp
-                                })
-                                .unwrap_or(false);
-                            (lsp_tasks, prefer_lsp)
-                        }) else {
-                            return Vec::new();
-                        };
-
-                        let lsp_tasks = lsp_tasks.await;
-                        picker
-                            .update(cx, |picker, _| {
-                                picker.delegate.last_used_candidate_index = if used.is_empty() {
-                                    None
-                                } else {
-                                    Some(used.len() - 1)
-                                };
-
-                                let mut new_candidates = used;
-                                let add_current_language_tasks =
-                                    !prefer_lsp || lsp_tasks.is_empty();
-                                new_candidates.extend(lsp_tasks.into_iter().flat_map(
-                                    |(kind, tasks_with_locations)| {
-                                        tasks_with_locations
-                                            .into_iter()
-                                            .sorted_by_key(|(location, task)| {
-                                                (location.is_none(), task.resolved_label.clone())
-                                            })
-                                            .map(move |(_, task)| (kind.clone(), task))
-                                    },
-                                ));
-                                // todo(debugger): We're always adding lsp tasks here even if prefer_lsp is false
-                                // We should move the filter to new_candidates instead of on current
-                                // and add a test for this
-                                new_candidates.extend(current.into_iter().filter(
-                                    |(task_kind, _)| {
-                                        add_current_language_tasks
-                                            || !matches!(task_kind, TaskSourceKind::Language { .. })
-                                    },
-                                ));
-                                let match_candidates = string_match_candidates(&new_candidates);
-                                let _ = picker.delegate.candidates.insert(new_candidates);
-                                match_candidates
-                            })
-                            .ok()
-                            .unwrap_or_default()
-                    })
-                } else {
-                    Task::ready(Vec::new())
-                }
-            }
-        };
-
-        cx.spawn_in(window, async move |picker, cx| {
-            let candidates = candidates.await;
-            let matches = fuzzy::match_strings(
-                &candidates,
-                &query,
-                true,
-                true,
-                1000,
-                &Default::default(),
-                cx.background_executor().clone(),
-            )
-            .await;
-            picker
-                .update(cx, |picker, _| {
-                    let delegate = &mut picker.delegate;
-                    delegate.matches = matches;
-                    if let Some(index) = delegate.last_used_candidate_index {
-                        delegate.matches.sort_by_key(|m| m.candidate_id > index);
-                    }
-
-                    delegate.prompt = query;
-                    delegate.divider_index = delegate.last_used_candidate_index.and_then(|index| {
-                        let index = delegate
-                            .matches
-                            .partition_point(|matching_task| matching_task.candidate_id <= index);
-                        Some(index).and_then(|index| (index != 0).then(|| index - 1))
-                    });
-
-                    if delegate.matches.is_empty() {
-                        delegate.selected_index = 0;
-                    } else {
-                        delegate.selected_index =
-                            delegate.selected_index.min(delegate.matches.len() - 1);
-                    }
-                })
-                .log_err();
-        })
-    }
-
-    fn confirm(
-        &mut self,
-        omit_history_entry: bool,
-        window: &mut Window,
-        cx: &mut Context<picker::Picker<Self>>,
-    ) {
-        let current_match_index = self.selected_index();
-        let task = self
-            .matches
-            .get(current_match_index)
-            .and_then(|current_match| {
-                let ix = current_match.candidate_id;
-                self.candidates
-                    .as_ref()
-                    .map(|candidates| candidates[ix].clone())
-            });
-        let Some((task_source_kind, mut task)) = task else {
-            return;
-        };
-        if let Some(TaskOverrides {
-            reveal_target: Some(reveal_target),
-        }) = &self.task_overrides
-        {
-            task.resolved.reveal_target = *reveal_target;
-        }
-
-        self.workspace
-            .update(cx, |workspace, cx| {
-                workspace.schedule_resolved_task(
-                    task_source_kind,
-                    task,
-                    omit_history_entry,
-                    window,
-                    cx,
-                );
-            })
-            .ok();
-
-        cx.emit(DismissEvent);
-    }
-
-    fn dismissed(&mut self, _window: &mut Window, cx: &mut Context<picker::Picker<Self>>) {
-        cx.emit(DismissEvent);
-    }
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        window: &mut Window,
-        cx: &mut Context<picker::Picker<Self>>,
-    ) -> Option<Self::ListItem> {
-        let candidates = self.candidates.as_ref()?;
-        let hit = &self.matches.get(ix)?;
-        let (source_kind, resolved_task) = &candidates.get(hit.candidate_id)?;
-        let template = resolved_task.original_task();
-        let display_label = resolved_task.display_label();
-
-        let mut tooltip_label_text =
-            if display_label != &template.label || source_kind == &TaskSourceKind::UserInput {
-                resolved_task.resolved_label.clone()
-            } else {
-                String::new()
-            };
-
-        if resolved_task.resolved.command_label != resolved_task.resolved_label {
-            if !tooltip_label_text.trim().is_empty() {
-                tooltip_label_text.push('\n');
-            }
-            tooltip_label_text.push_str(&resolved_task.resolved.command_label);
-        }
-
-        if !template.tags.is_empty() {
-            tooltip_label_text.push('\n');
-            tooltip_label_text.push_str(
-                template
-                    .tags
-                    .iter()
-                    .map(|tag| format!("\n#{}", tag))
-                    .collect::<Vec<_>>()
-                    .join("")
-                    .as_str(),
-            );
-        }
-        let tooltip_label = if tooltip_label_text.trim().is_empty() {
-            None
-        } else {
-            Some(Tooltip::simple(tooltip_label_text, cx))
-        };
-
-        let highlighted_location = HighlightedMatch {
-            text: hit.string.clone(),
-            highlight_positions: hit.positions.clone(),
-            color: Color::Default,
-        };
-        let icon = match source_kind {
-            TaskSourceKind::UserInput => Some(Icon::new(IconName::Terminal)),
-            TaskSourceKind::AbsPath { .. } => Some(Icon::new(IconName::Settings)),
-            TaskSourceKind::Worktree { .. } => Some(Icon::new(IconName::FileTree)),
-            TaskSourceKind::Lsp {
-                language_name: name,
-                ..
-            }
-            | TaskSourceKind::Language { name, .. } => file_icons::FileIcons::get(cx)
-                .get_icon_for_type(&name.to_lowercase(), cx)
-                .map(Icon::from_path),
-        }
-        .map(|icon| icon.color(Color::Muted).size(IconSize::Small));
-        let indicator = if matches!(source_kind, TaskSourceKind::Lsp { .. }) {
-            Some(Indicator::icon(
-                Icon::new(IconName::BoltOutlined).size(IconSize::Small),
-            ))
-        } else {
-            None
-        };
-        let icon = icon.map(|icon| {
-            IconWithIndicator::new(icon, indicator)
-                .indicator_border_color(Some(cx.theme().colors().border_transparent))
-        });
-        let history_run_icon = if Some(ix) <= self.divider_index {
-            Some(
-                Icon::new(IconName::HistoryRerun)
-                    .color(Color::Muted)
-                    .size(IconSize::Small)
-                    .into_any_element(),
-            )
-        } else {
-            Some(
-                v_flex()
-                    .flex_none()
-                    .size(IconSize::Small.rems())
-                    .into_any_element(),
-            )
-        };
-
-        Some(
-            ListItem::new(format!("tasks-modal-{ix}"))
-                .inset(true)
-                .start_slot::<IconWithIndicator>(icon)
-                .end_slot::<AnyElement>(
-                    h_flex()
-                        .gap_1()
-                        .child(Label::new(truncate_and_trailoff(
-                            &template
-                                .tags
-                                .iter()
-                                .map(|tag| format!("#{}", tag))
-                                .collect::<Vec<_>>()
-                                .join(" "),
-                            MAX_TAGS_LINE_LEN,
-                        )))
-                        .flex_none()
-                        .child(history_run_icon.unwrap())
-                        .into_any_element(),
-                )
-                .spacing(ListItemSpacing::Sparse)
-                .when_some(tooltip_label, |list_item, item_label| {
-                    list_item.tooltip(move |_, _| item_label.clone())
-                })
-                .map(|item| {
-                    if matches!(source_kind, TaskSourceKind::UserInput)
-                        || Some(ix) <= self.divider_index
-                    {
-                        let task_index = hit.candidate_id;
-                        let delete_button = div().child(
-                            IconButton::new("delete", IconName::Close)
-                                .shape(IconButtonShape::Square)
-                                .icon_color(Color::Muted)
-                                .size(ButtonSize::None)
-                                .icon_size(IconSize::XSmall)
-                                .on_click(cx.listener(move |picker, _event, window, cx| {
-                                    cx.stop_propagation();
-                                    window.prevent_default();
-
-                                    picker.delegate.delete_previously_used(task_index, cx);
-                                    picker.delegate.last_used_candidate_index = picker
-                                        .delegate
-                                        .last_used_candidate_index
-                                        .unwrap_or(0)
-                                        .checked_sub(1);
-                                    picker.refresh(window, cx);
-                                }))
-                                .tooltip(|_, cx| {
-                                    Tooltip::simple("Delete Previously Scheduled Task", cx)
-                                }),
-                        );
-                        item.end_hover_slot(delete_button)
-                    } else {
-                        item
-                    }
-                })
-                .toggle_state(selected)
-                .child(highlighted_location.render(window, cx)),
-        )
-    }
-
-    fn confirm_completion(
-        &mut self,
-        _: String,
-        _window: &mut Window,
-        _: &mut Context<Picker<Self>>,
-    ) -> Option<String> {
-        let task_index = self.matches.get(self.selected_index())?.candidate_id;
-        let tasks = self.candidates.as_ref()?;
-        let (_, task) = tasks.get(task_index)?;
-        Some(task.resolved.command_label.clone())
-    }
-
-    fn confirm_input(
-        &mut self,
-        omit_history_entry: bool,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) {
-        let Some((task_source_kind, mut task)) = self.spawn_oneshot() else {
-            return;
-        };
-
-        if let Some(TaskOverrides {
-            reveal_target: Some(reveal_target),
-        }) = self.task_overrides
-        {
-            task.resolved.reveal_target = reveal_target;
-        }
-        self.workspace
-            .update(cx, |workspace, cx| {
-                workspace.schedule_resolved_task(
-                    task_source_kind,
-                    task,
-                    omit_history_entry,
-                    window,
-                    cx,
-                )
-            })
-            .ok();
-        cx.emit(DismissEvent);
-    }
-
-    fn separators_after_indices(&self) -> Vec<usize> {
-        if let Some(i) = self.divider_index {
-            vec![i]
-        } else {
-            Vec::new()
-        }
-    }
-
-    fn render_footer(
-        &self,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<gpui::AnyElement> {
-        let is_recent_selected = self.divider_index >= Some(self.selected_index);
-        let current_modifiers = window.modifiers();
-        let left_button = if self
-            .task_store
-            .read(cx)
-            .task_inventory()?
-            .read(cx)
-            .last_scheduled_task(None)
-            .is_some()
-        {
-            Some(("Rerun Last Task", Rerun::default().boxed_clone()))
-        } else {
-            None
-        };
-        Some(
-            h_flex()
-                .w_full()
-                .p_1p5()
-                .justify_between()
-                .border_t_1()
-                .border_color(cx.theme().colors().border_variant)
-                .child(
-                    left_button
-                        .map(|(label, action)| {
-                            let keybind = KeyBinding::for_action(&*action, cx);
-
-                            Button::new("edit-current-task", label)
-                                .key_binding(keybind)
-                                .on_click(move |_, window, cx| {
-                                    window.dispatch_action(action.boxed_clone(), cx);
-                                })
-                                .into_any_element()
-                        })
-                        .unwrap_or_else(|| h_flex().into_any_element()),
-                )
-                .map(|this| {
-                    if (current_modifiers.alt || self.matches.is_empty()) && !self.prompt.is_empty()
-                    {
-                        let action = picker::ConfirmInput {
-                            secondary: current_modifiers.secondary(),
-                        }
-                        .boxed_clone();
-                        this.child({
-                            let spawn_oneshot_label = if current_modifiers.secondary() {
-                                "Spawn Oneshot Without History"
-                            } else {
-                                "Spawn Oneshot"
-                            };
-
-                            Button::new("spawn-onehshot", spawn_oneshot_label)
-                                .key_binding(KeyBinding::for_action(&*action, cx))
-                                .on_click(move |_, window, cx| {
-                                    window.dispatch_action(action.boxed_clone(), cx)
-                                })
-                        })
-                    } else if current_modifiers.secondary() {
-                        this.child({
-                            let label = if is_recent_selected {
-                                "Rerun Without History"
-                            } else {
-                                "Spawn Without History"
-                            };
-                            Button::new("spawn", label)
-                                .key_binding(KeyBinding::for_action(&menu::SecondaryConfirm, cx))
-                                .on_click(move |_, window, cx| {
-                                    window.dispatch_action(menu::SecondaryConfirm.boxed_clone(), cx)
-                                })
-                        })
-                    } else {
-                        this.child({
-                            let run_entry_label =
-                                if is_recent_selected { "Rerun" } else { "Spawn" };
-
-                            Button::new("spawn", run_entry_label)
-                                .key_binding(KeyBinding::for_action(&menu::Confirm, cx))
-                                .on_click(|_, window, cx| {
-                                    window.dispatch_action(menu::Confirm.boxed_clone(), cx);
-                                })
-                        })
-                    }
-                })
-                .into_any_element(),
-        )
-    }
-}
-
-fn string_match_candidates<'a>(
-    candidates: impl IntoIterator<Item = &'a (TaskSourceKind, ResolvedTask)> + 'a,
-) -> Vec<StringMatchCandidate> {
-    candidates
-        .into_iter()
-        .enumerate()
-        .map(|(index, (_, candidate))| StringMatchCandidate::new(index, candidate.display_label()))
-        .collect()
-}
-
-#[cfg(test)]
-mod tests {
-    use std::{path::PathBuf, sync::Arc};
-
-    use editor::{Editor, SelectionEffects};
-    use gpui::{TestAppContext, VisualTestContext};
-    use language::{Language, LanguageConfig, LanguageMatcher, Point};
-    use project::{ContextProviderWithTasks, FakeFs, Project};
-    use serde_json::json;
-    use task::TaskTemplates;
-    use util::path;
-    use workspace::{CloseInactiveTabsAndPanes, OpenOptions, OpenVisible};
-
-    use crate::{modal::Spawn, tests::init_test};
-
-    use super::*;
-
-    #[gpui::test]
-    async fn test_spawn_tasks_modal_query_reuse(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/dir"),
-            json!({
-                ".zed": {
-                    "tasks.json": r#"[
-                        {
-                            "label": "example task",
-                            "command": "echo",
-                            "args": ["4"]
-                        },
-                        {
-                            "label": "another one",
-                            "command": "echo",
-                            "args": ["55"]
-                        },
-                    ]"#,
-                },
-                "a.ts": "a"
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-
-        let tasks_picker = open_spawn_tasks(&workspace, cx);
-        assert_eq!(
-            query(&tasks_picker, cx),
-            "",
-            "Initial query should be empty"
-        );
-        assert_eq!(
-            task_names(&tasks_picker, cx),
-            vec!["another one", "example task"],
-            "With no global tasks and no open item, a single worktree should be used and its tasks listed"
-        );
-        drop(tasks_picker);
-
-        let _ = workspace
-            .update_in(cx, |workspace, window, cx| {
-                workspace.open_abs_path(
-                    PathBuf::from(path!("/dir/a.ts")),
-                    OpenOptions {
-                        visible: Some(OpenVisible::All),
-                        ..Default::default()
-                    },
-                    window,
-                    cx,
-                )
-            })
-            .await
-            .unwrap();
-        let tasks_picker = open_spawn_tasks(&workspace, cx);
-        assert_eq!(
-            task_names(&tasks_picker, cx),
-            vec!["another one", "example task"],
-            "Initial tasks should be listed in alphabetical order"
-        );
-
-        let query_str = "tas";
-        cx.simulate_input(query_str);
-        assert_eq!(query(&tasks_picker, cx), query_str);
-        assert_eq!(
-            task_names(&tasks_picker, cx),
-            vec!["example task"],
-            "Only one task should match the query {query_str}"
-        );
-
-        cx.dispatch_action(picker::ConfirmCompletion);
-        assert_eq!(
-            query(&tasks_picker, cx),
-            "echo 4",
-            "Query should be set to the selected task's command"
-        );
-        assert_eq!(
-            task_names(&tasks_picker, cx),
-            Vec::<String>::new(),
-            "No task should be listed"
-        );
-        cx.dispatch_action(picker::ConfirmInput { secondary: false });
-
-        let tasks_picker = open_spawn_tasks(&workspace, cx);
-        assert_eq!(
-            query(&tasks_picker, cx),
-            "",
-            "Query should be reset after confirming"
-        );
-        assert_eq!(
-            task_names(&tasks_picker, cx),
-            vec!["echo 4", "another one", "example task"],
-            "New oneshot task should be listed first"
-        );
-
-        let query_str = "echo 4";
-        cx.simulate_input(query_str);
-        assert_eq!(query(&tasks_picker, cx), query_str);
-        assert_eq!(
-            task_names(&tasks_picker, cx),
-            vec!["echo 4"],
-            "New oneshot should match custom command query"
-        );
-
-        cx.dispatch_action(picker::ConfirmInput { secondary: false });
-        let tasks_picker = open_spawn_tasks(&workspace, cx);
-        assert_eq!(
-            query(&tasks_picker, cx),
-            "",
-            "Query should be reset after confirming"
-        );
-        assert_eq!(
-            task_names(&tasks_picker, cx),
-            vec![query_str, "another one", "example task"],
-            "Last recently used one show task should be listed first"
-        );
-
-        cx.dispatch_action(picker::ConfirmCompletion);
-        assert_eq!(
-            query(&tasks_picker, cx),
-            query_str,
-            "Query should be set to the custom task's name"
-        );
-        assert_eq!(
-            task_names(&tasks_picker, cx),
-            vec![query_str],
-            "Only custom task should be listed"
-        );
-
-        let query_str = "0";
-        cx.simulate_input(query_str);
-        assert_eq!(query(&tasks_picker, cx), "echo 40");
-        assert_eq!(
-            task_names(&tasks_picker, cx),
-            Vec::<String>::new(),
-            "New oneshot should not match any command query"
-        );
-
-        cx.dispatch_action(picker::ConfirmInput { secondary: true });
-        let tasks_picker = open_spawn_tasks(&workspace, cx);
-        assert_eq!(
-            query(&tasks_picker, cx),
-            "",
-            "Query should be reset after confirming"
-        );
-        assert_eq!(
-            task_names(&tasks_picker, cx),
-            vec!["echo 4", "another one", "example task"],
-            "No query should be added to the list, as it was submitted with secondary action (that maps to omit_history = true)"
-        );
-
-        cx.dispatch_action(Spawn::ByName {
-            task_name: "example task".to_string(),
-            reveal_target: None,
-        });
-        let tasks_picker = workspace.update(cx, |workspace, cx| {
-            workspace
-                .active_modal::<TasksModal>(cx)
-                .unwrap()
-                .read(cx)
-                .picker
-                .clone()
-        });
-        assert_eq!(
-            task_names(&tasks_picker, cx),
-            vec!["echo 4", "another one", "example task"],
-        );
-    }
-
-    #[gpui::test]
-    async fn test_basic_context_for_simple_files(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/dir"),
-            json!({
-                ".zed": {
-                    "tasks.json": r#"[
-                        {
-                            "label": "hello from $ZED_FILE:$ZED_ROW:$ZED_COLUMN",
-                            "command": "echo",
-                            "args": ["hello", "from", "$ZED_FILE", ":", "$ZED_ROW", ":", "$ZED_COLUMN"]
-                        },
-                        {
-                            "label": "opened now: $ZED_WORKTREE_ROOT",
-                            "command": "echo",
-                            "args": ["opened", "now:", "$ZED_WORKTREE_ROOT"]
-                        }
-                    ]"#,
-                },
-                "file_without_extension": "aaaaaaaaaaaaaaaaaaaa\naaaaaaaaaaaaaaaaaa",
-                "file_with.odd_extension": "b",
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-        let tasks_picker = open_spawn_tasks(&workspace, cx);
-        assert_eq!(
-            task_names(&tasks_picker, cx),
-            vec![concat!("opened now: ", path!("/dir")).to_string()],
-            "When no file is open for a single worktree, should autodetect all worktree-related tasks"
-        );
-        tasks_picker.update(cx, |_, cx| {
-            cx.emit(DismissEvent);
-        });
-        drop(tasks_picker);
-        cx.executor().run_until_parked();
-
-        let _ = workspace
-            .update_in(cx, |workspace, window, cx| {
-                workspace.open_abs_path(
-                    PathBuf::from(path!("/dir/file_with.odd_extension")),
-                    OpenOptions {
-                        visible: Some(OpenVisible::All),
-                        ..Default::default()
-                    },
-                    window,
-                    cx,
-                )
-            })
-            .await
-            .unwrap();
-        cx.executor().run_until_parked();
-        let tasks_picker = open_spawn_tasks(&workspace, cx);
-        assert_eq!(
-            task_names(&tasks_picker, cx),
-            vec![
-                concat!("hello from ", path!("/dir/file_with.odd_extension:1:1")).to_string(),
-                concat!("opened now: ", path!("/dir")).to_string(),
-            ],
-            "Second opened buffer should fill the context, labels should be trimmed if long enough"
-        );
-        tasks_picker.update(cx, |_, cx| {
-            cx.emit(DismissEvent);
-        });
-        drop(tasks_picker);
-        cx.executor().run_until_parked();
-
-        let second_item = workspace
-            .update_in(cx, |workspace, window, cx| {
-                workspace.open_abs_path(
-                    PathBuf::from(path!("/dir/file_without_extension")),
-                    OpenOptions {
-                        visible: Some(OpenVisible::All),
-                        ..Default::default()
-                    },
-                    window,
-                    cx,
-                )
-            })
-            .await
-            .unwrap();
-
-        let editor = cx
-            .update(|_window, cx| second_item.act_as::<Editor>(cx))
-            .unwrap();
-        editor.update_in(cx, |editor, window, cx| {
-            editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                s.select_ranges(Some(Point::new(1, 2)..Point::new(1, 5)))
-            })
-        });
-        cx.executor().run_until_parked();
-        let tasks_picker = open_spawn_tasks(&workspace, cx);
-        assert_eq!(
-            task_names(&tasks_picker, cx),
-            vec![
-                concat!("hello from ", path!("/dir/file_without_extension:2:3")).to_string(),
-                concat!("opened now: ", path!("/dir")).to_string(),
-            ],
-            "Opened buffer should fill the context, labels should be trimmed if long enough"
-        );
-        tasks_picker.update(cx, |_, cx| {
-            cx.emit(DismissEvent);
-        });
-        drop(tasks_picker);
-        cx.executor().run_until_parked();
-    }
-
-    #[gpui::test]
-    async fn test_language_task_filtering(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/dir"),
-            json!({
-                "a1.ts": "// a1",
-                "a2.ts": "// a2",
-                "b.rs": "// b",
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
-        project.read_with(cx, |project, _| {
-            let language_registry = project.languages();
-            language_registry.add(Arc::new(
-                Language::new(
-                    LanguageConfig {
-                        name: "TypeScript".into(),
-                        matcher: LanguageMatcher {
-                            path_suffixes: vec!["ts".to_string()],
-                            ..LanguageMatcher::default()
-                        },
-                        ..LanguageConfig::default()
-                    },
-                    None,
-                )
-                .with_context_provider(Some(Arc::new(
-                    ContextProviderWithTasks::new(TaskTemplates(vec![
-                        TaskTemplate {
-                            label: "Task without variables".to_string(),
-                            command: "npm run clean".to_string(),
-                            ..TaskTemplate::default()
-                        },
-                        TaskTemplate {
-                            label: "TypeScript task from file $ZED_FILE".to_string(),
-                            command: "npm run build".to_string(),
-                            ..TaskTemplate::default()
-                        },
-                        TaskTemplate {
-                            label: "Another task from file $ZED_FILE".to_string(),
-                            command: "npm run lint".to_string(),
-                            ..TaskTemplate::default()
-                        },
-                    ])),
-                ))),
-            ));
-            language_registry.add(Arc::new(
-                Language::new(
-                    LanguageConfig {
-                        name: "Rust".into(),
-                        matcher: LanguageMatcher {
-                            path_suffixes: vec!["rs".to_string()],
-                            ..LanguageMatcher::default()
-                        },
-                        ..LanguageConfig::default()
-                    },
-                    None,
-                )
-                .with_context_provider(Some(Arc::new(
-                    ContextProviderWithTasks::new(TaskTemplates(vec![TaskTemplate {
-                        label: "Rust task".to_string(),
-                        command: "cargo check".into(),
-                        ..TaskTemplate::default()
-                    }])),
-                ))),
-            ));
-        });
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-        let _ts_file_1 = workspace
-            .update_in(cx, |workspace, window, cx| {
-                workspace.open_abs_path(
-                    PathBuf::from(path!("/dir/a1.ts")),
-                    OpenOptions {
-                        visible: Some(OpenVisible::All),
-                        ..Default::default()
-                    },
-                    window,
-                    cx,
-                )
-            })
-            .await
-            .unwrap();
-        let tasks_picker = open_spawn_tasks(&workspace, cx);
-        assert_eq!(
-            task_names(&tasks_picker, cx),
-            vec![
-                concat!("Another task from file ", path!("/dir/a1.ts")),
-                concat!("TypeScript task from file ", path!("/dir/a1.ts")),
-                "Task without variables",
-            ],
-            "Should open spawn TypeScript tasks for the opened file, tasks with most template variables above, all groups sorted alphanumerically"
-        );
-
-        emulate_task_schedule(
-            tasks_picker,
-            &project,
-            concat!("TypeScript task from file ", path!("/dir/a1.ts")),
-            cx,
-        );
-
-        let tasks_picker = open_spawn_tasks(&workspace, cx);
-        assert_eq!(
-            task_names(&tasks_picker, cx),
-            vec![
-                concat!("TypeScript task from file ", path!("/dir/a1.ts")),
-                concat!("Another task from file ", path!("/dir/a1.ts")),
-                "Task without variables",
-            ],
-            "After spawning the task and getting it into the history, it should be up in the sort as recently used.
-            Tasks with the same labels and context are deduplicated."
-        );
-        tasks_picker.update(cx, |_, cx| {
-            cx.emit(DismissEvent);
-        });
-        drop(tasks_picker);
-        cx.executor().run_until_parked();
-
-        let _ts_file_2 = workspace
-            .update_in(cx, |workspace, window, cx| {
-                workspace.open_abs_path(
-                    PathBuf::from(path!("/dir/a2.ts")),
-                    OpenOptions {
-                        visible: Some(OpenVisible::All),
-                        ..Default::default()
-                    },
-                    window,
-                    cx,
-                )
-            })
-            .await
-            .unwrap();
-        let tasks_picker = open_spawn_tasks(&workspace, cx);
-        assert_eq!(
-            task_names(&tasks_picker, cx),
-            vec![
-                concat!("TypeScript task from file ", path!("/dir/a1.ts")),
-                concat!("Another task from file ", path!("/dir/a2.ts")),
-                concat!("TypeScript task from file ", path!("/dir/a2.ts")),
-                "Task without variables",
-            ],
-            "Even when both TS files are open, should only show the history (on the top), and tasks, resolved for the current file"
-        );
-        tasks_picker.update(cx, |_, cx| {
-            cx.emit(DismissEvent);
-        });
-        drop(tasks_picker);
-        cx.executor().run_until_parked();
-
-        let _rs_file = workspace
-            .update_in(cx, |workspace, window, cx| {
-                workspace.open_abs_path(
-                    PathBuf::from(path!("/dir/b.rs")),
-                    OpenOptions {
-                        visible: Some(OpenVisible::All),
-                        ..Default::default()
-                    },
-                    window,
-                    cx,
-                )
-            })
-            .await
-            .unwrap();
-        let tasks_picker = open_spawn_tasks(&workspace, cx);
-        assert_eq!(
-            task_names(&tasks_picker, cx),
-            vec!["Rust task"],
-            "Even when both TS files are open and one TS task spawned, opened file's language tasks should be displayed only"
-        );
-
-        cx.dispatch_action(CloseInactiveTabsAndPanes::default());
-        emulate_task_schedule(tasks_picker, &project, "Rust task", cx);
-        let _ts_file_2 = workspace
-            .update_in(cx, |workspace, window, cx| {
-                workspace.open_abs_path(
-                    PathBuf::from(path!("/dir/a2.ts")),
-                    OpenOptions {
-                        visible: Some(OpenVisible::All),
-                        ..Default::default()
-                    },
-                    window,
-                    cx,
-                )
-            })
-            .await
-            .unwrap();
-        let tasks_picker = open_spawn_tasks(&workspace, cx);
-        assert_eq!(
-            task_names(&tasks_picker, cx),
-            vec![
-                concat!("TypeScript task from file ", path!("/dir/a1.ts")),
-                concat!("Another task from file ", path!("/dir/a2.ts")),
-                concat!("TypeScript task from file ", path!("/dir/a2.ts")),
-                "Task without variables",
-            ],
-            "After closing all but *.rs tabs, running a Rust task and switching back to TS tasks, \
-            same TS spawn history should be restored"
-        );
-    }
-
-    fn emulate_task_schedule(
-        tasks_picker: Entity<Picker<TasksModalDelegate>>,
-        project: &Entity<Project>,
-        scheduled_task_label: &str,
-        cx: &mut VisualTestContext,
-    ) {
-        let scheduled_task = tasks_picker.read_with(cx, |tasks_picker, _| {
-            tasks_picker
-                .delegate
-                .candidates
-                .iter()
-                .flatten()
-                .find(|(_, task)| task.resolved_label == scheduled_task_label)
-                .cloned()
-                .unwrap()
-        });
-        project.update(cx, |project, cx| {
-            if let Some(task_inventory) = project.task_store().read(cx).task_inventory().cloned() {
-                task_inventory.update(cx, |inventory, _| {
-                    let (kind, task) = scheduled_task;
-                    inventory.task_scheduled(kind, task);
-                });
-            }
-        });
-        tasks_picker.update(cx, |_, cx| {
-            cx.emit(DismissEvent);
-        });
-        drop(tasks_picker);
-        cx.executor().run_until_parked()
-    }
-
-    fn open_spawn_tasks(
-        workspace: &Entity<Workspace>,
-        cx: &mut VisualTestContext,
-    ) -> Entity<Picker<TasksModalDelegate>> {
-        cx.dispatch_action(Spawn::modal());
-        workspace.update(cx, |workspace, cx| {
-            workspace
-                .active_modal::<TasksModal>(cx)
-                .expect("no task modal after `Spawn` action was dispatched")
-                .read(cx)
-                .picker
-                .clone()
-        })
-    }
-
-    fn query(
-        spawn_tasks: &Entity<Picker<TasksModalDelegate>>,
-        cx: &mut VisualTestContext,
-    ) -> String {
-        spawn_tasks.read_with(cx, |spawn_tasks, cx| spawn_tasks.query(cx))
-    }
-
-    fn task_names(
-        spawn_tasks: &Entity<Picker<TasksModalDelegate>>,
-        cx: &mut VisualTestContext,
-    ) -> Vec<String> {
-        spawn_tasks.read_with(cx, |spawn_tasks, _| {
-            spawn_tasks
-                .delegate
-                .matches
-                .iter()
-                .map(|hit| hit.string.clone())
-                .collect::<Vec<_>>()
-        })
-    }
-}
diff --git a/crates/tasks_ui/src/tasks_ui.rs b/crates/tasks_ui/src/tasks_ui.rs
deleted file mode 100644
index 35c8a2ee22..0000000000
--- a/crates/tasks_ui/src/tasks_ui.rs
+++ /dev/null
@@ -1,611 +0,0 @@
-use std::{path::Path, sync::Arc};
-
-use collections::HashMap;
-use editor::Editor;
-use gpui::{App, AppContext as _, Context, Entity, Task, Window};
-use project::{Location, TaskContexts, TaskSourceKind, Worktree};
-use task::{RevealTarget, TaskContext, TaskId, TaskTemplate, TaskVariables, VariableName};
-use workspace::Workspace;
-
-mod modal;
-
-pub use modal::{Rerun, ShowAttachModal, Spawn, TaskOverrides, TasksModal};
-
-pub fn init(cx: &mut App) {
-    cx.observe_new(
-        |workspace: &mut Workspace, _: Option<&mut Window>, _: &mut Context<Workspace>| {
-            workspace
-                .register_action(spawn_task_or_modal)
-                .register_action(move |workspace, action: &modal::Rerun, window, cx| {
-                    if let Some((task_source_kind, mut last_scheduled_task)) = workspace
-                        .project()
-                        .read(cx)
-                        .task_store()
-                        .read(cx)
-                        .task_inventory()
-                        .and_then(|inventory| {
-                            inventory.read(cx).last_scheduled_task(
-                                action
-                                    .task_id
-                                    .as_ref()
-                                    .map(|id| TaskId(id.clone()))
-                                    .as_ref(),
-                            )
-                        })
-                    {
-                        if action.reevaluate_context {
-                            let mut original_task = last_scheduled_task.original_task().clone();
-                            if let Some(allow_concurrent_runs) = action.allow_concurrent_runs {
-                                original_task.allow_concurrent_runs = allow_concurrent_runs;
-                            }
-                            if let Some(use_new_terminal) = action.use_new_terminal {
-                                original_task.use_new_terminal = use_new_terminal;
-                            }
-                            let task_contexts = task_contexts(workspace, window, cx);
-                            cx.spawn_in(window, async move |workspace, cx| {
-                                let task_contexts = task_contexts.await;
-                                let default_context = TaskContext::default();
-                                workspace
-                                    .update_in(cx, |workspace, window, cx| {
-                                        workspace.schedule_task(
-                                            task_source_kind,
-                                            &original_task,
-                                            task_contexts
-                                                .active_context()
-                                                .unwrap_or(&default_context),
-                                            false,
-                                            window,
-                                            cx,
-                                        )
-                                    })
-                                    .ok()
-                            })
-                            .detach()
-                        } else {
-                            let resolved = &mut last_scheduled_task.resolved;
-
-                            if let Some(allow_concurrent_runs) = action.allow_concurrent_runs {
-                                resolved.allow_concurrent_runs = allow_concurrent_runs;
-                            }
-                            if let Some(use_new_terminal) = action.use_new_terminal {
-                                resolved.use_new_terminal = use_new_terminal;
-                            }
-
-                            workspace.schedule_resolved_task(
-                                task_source_kind,
-                                last_scheduled_task,
-                                false,
-                                window,
-                                cx,
-                            );
-                        }
-                    } else {
-                        spawn_task_or_modal(
-                            workspace,
-                            &Spawn::ViaModal {
-                                reveal_target: None,
-                            },
-                            window,
-                            cx,
-                        );
-                    };
-                });
-        },
-    )
-    .detach();
-}
-
-fn spawn_task_or_modal(
-    workspace: &mut Workspace,
-    action: &Spawn,
-    window: &mut Window,
-    cx: &mut Context<Workspace>,
-) {
-    if let Some(provider) = workspace.debugger_provider() {
-        provider.spawn_task_or_modal(workspace, action, window, cx);
-        return;
-    }
-
-    match action {
-        Spawn::ByName {
-            task_name,
-            reveal_target,
-        } => {
-            let overrides = reveal_target.map(|reveal_target| TaskOverrides {
-                reveal_target: Some(reveal_target),
-            });
-            let name = task_name.clone();
-            spawn_tasks_filtered(move |(_, task)| task.label.eq(&name), overrides, window, cx)
-                .detach_and_log_err(cx)
-        }
-        Spawn::ByTag {
-            task_tag,
-            reveal_target,
-        } => {
-            let overrides = reveal_target.map(|reveal_target| TaskOverrides {
-                reveal_target: Some(reveal_target),
-            });
-            let tag = task_tag.clone();
-            spawn_tasks_filtered(
-                move |(_, task)| task.tags.contains(&tag),
-                overrides,
-                window,
-                cx,
-            )
-            .detach_and_log_err(cx)
-        }
-        Spawn::ViaModal { reveal_target } => {
-            toggle_modal(workspace, *reveal_target, window, cx).detach()
-        }
-    }
-}
-
-pub fn toggle_modal(
-    workspace: &mut Workspace,
-    reveal_target: Option<RevealTarget>,
-    window: &mut Window,
-    cx: &mut Context<Workspace>,
-) -> Task<()> {
-    let task_store = workspace.project().read(cx).task_store().clone();
-    let workspace_handle = workspace.weak_handle();
-    let can_open_modal = workspace
-        .project()
-        .read_with(cx, |project, _| !project.is_via_collab());
-    if can_open_modal {
-        let task_contexts = task_contexts(workspace, window, cx);
-        cx.spawn_in(window, async move |workspace, cx| {
-            let task_contexts = Arc::new(task_contexts.await);
-            workspace
-                .update_in(cx, |workspace, window, cx| {
-                    workspace.toggle_modal(window, cx, |window, cx| {
-                        TasksModal::new(
-                            task_store.clone(),
-                            task_contexts,
-                            reveal_target.map(|target| TaskOverrides {
-                                reveal_target: Some(target),
-                            }),
-                            true,
-                            workspace_handle,
-                            window,
-                            cx,
-                        )
-                    })
-                })
-                .ok();
-        })
-    } else {
-        Task::ready(())
-    }
-}
-
-pub fn spawn_tasks_filtered<F>(
-    mut predicate: F,
-    overrides: Option<TaskOverrides>,
-    window: &mut Window,
-    cx: &mut Context<Workspace>,
-) -> Task<anyhow::Result<()>>
-where
-    F: FnMut((&TaskSourceKind, &TaskTemplate)) -> bool + 'static,
-{
-    cx.spawn_in(window, async move |workspace, cx| {
-        let task_contexts = workspace.update_in(cx, |workspace, window, cx| {
-            task_contexts(workspace, window, cx)
-        })?;
-        let task_contexts = task_contexts.await;
-        let mut tasks = workspace
-            .update(cx, |workspace, cx| {
-                let Some(task_inventory) = workspace
-                    .project()
-                    .read(cx)
-                    .task_store()
-                    .read(cx)
-                    .task_inventory()
-                    .cloned()
-                else {
-                    return Task::ready(Vec::new());
-                };
-                let (file, language) = task_contexts
-                    .location()
-                    .map(|location| {
-                        let buffer = location.buffer.read(cx);
-                        (
-                            buffer.file().cloned(),
-                            buffer.language_at(location.range.start),
-                        )
-                    })
-                    .unwrap_or_default();
-                task_inventory
-                    .read(cx)
-                    .list_tasks(file, language, task_contexts.worktree(), cx)
-            })?
-            .await;
-
-        let did_spawn = workspace
-            .update_in(cx, |workspace, window, cx| {
-                let default_context = TaskContext::default();
-                let active_context = task_contexts.active_context().unwrap_or(&default_context);
-
-                tasks.retain_mut(|(task_source_kind, target_task)| {
-                    if predicate((task_source_kind, target_task)) {
-                        if let Some(overrides) = &overrides
-                            && let Some(target_override) = overrides.reveal_target
-                        {
-                            target_task.reveal_target = target_override;
-                        }
-                        workspace.schedule_task(
-                            task_source_kind.clone(),
-                            target_task,
-                            active_context,
-                            false,
-                            window,
-                            cx,
-                        );
-                        true
-                    } else {
-                        false
-                    }
-                });
-
-                if tasks.is_empty() { None } else { Some(()) }
-            })?
-            .is_some();
-        if !did_spawn {
-            workspace
-                .update_in(cx, |workspace, window, cx| {
-                    spawn_task_or_modal(
-                        workspace,
-                        &Spawn::ViaModal {
-                            reveal_target: overrides.and_then(|overrides| overrides.reveal_target),
-                        },
-                        window,
-                        cx,
-                    );
-                })
-                .ok();
-        }
-
-        Ok(())
-    })
-}
-
-pub fn task_contexts(
-    workspace: &Workspace,
-    window: &mut Window,
-    cx: &mut App,
-) -> Task<TaskContexts> {
-    let active_item = workspace.active_item(cx);
-    let active_worktree = active_item
-        .as_ref()
-        .and_then(|item| item.project_path(cx))
-        .map(|project_path| project_path.worktree_id)
-        .filter(|worktree_id| {
-            workspace
-                .project()
-                .read(cx)
-                .worktree_for_id(*worktree_id, cx)
-                .is_some_and(|worktree| is_visible_directory(&worktree, cx))
-        })
-        .or_else(|| {
-            workspace
-                .visible_worktrees(cx)
-                .next()
-                .map(|tree| tree.read(cx).id())
-        });
-
-    let active_editor = active_item.and_then(|item| item.act_as::<Editor>(cx));
-
-    let editor_context_task = active_editor.as_ref().map(|active_editor| {
-        active_editor.update(cx, |editor, cx| editor.task_context(window, cx))
-    });
-
-    let location = active_editor.as_ref().and_then(|editor| {
-        editor.update(cx, |editor, cx| {
-            let selection = editor.selections.newest_anchor();
-            let multi_buffer = editor.buffer().clone();
-            let multi_buffer_snapshot = multi_buffer.read(cx).snapshot(cx);
-            let (buffer_snapshot, buffer_offset) =
-                multi_buffer_snapshot.point_to_buffer_offset(selection.head())?;
-            let buffer_anchor = buffer_snapshot.anchor_before(buffer_offset);
-            let buffer = multi_buffer.read(cx).buffer(buffer_snapshot.remote_id())?;
-            Some(Location {
-                buffer,
-                range: buffer_anchor..buffer_anchor,
-            })
-        })
-    });
-
-    let lsp_task_sources = active_editor
-        .as_ref()
-        .map(|active_editor| active_editor.update(cx, |editor, cx| editor.lsp_task_sources(cx)))
-        .unwrap_or_default();
-
-    let latest_selection = active_editor.as_ref().map(|active_editor| {
-        active_editor
-            .read(cx)
-            .selections
-            .newest_anchor()
-            .head()
-            .text_anchor
-    });
-
-    let mut worktree_abs_paths = workspace
-        .worktrees(cx)
-        .filter(|worktree| is_visible_directory(worktree, cx))
-        .map(|worktree| {
-            let worktree = worktree.read(cx);
-            (worktree.id(), worktree.abs_path())
-        })
-        .collect::<HashMap<_, _>>();
-
-    cx.background_spawn(async move {
-        let mut task_contexts = TaskContexts::default();
-
-        task_contexts.lsp_task_sources = lsp_task_sources;
-        task_contexts.latest_selection = latest_selection;
-
-        if let Some(editor_context_task) = editor_context_task
-            && let Some(editor_context) = editor_context_task.await
-        {
-            task_contexts.active_item_context = Some((active_worktree, location, editor_context));
-        }
-
-        if let Some(active_worktree) = active_worktree {
-            if let Some(active_worktree_abs_path) = worktree_abs_paths.remove(&active_worktree) {
-                task_contexts.active_worktree_context =
-                    Some((active_worktree, worktree_context(&active_worktree_abs_path)));
-            }
-        } else if worktree_abs_paths.len() == 1 {
-            task_contexts.active_worktree_context = worktree_abs_paths
-                .drain()
-                .next()
-                .map(|(id, abs_path)| (id, worktree_context(&abs_path)));
-        }
-
-        task_contexts.other_worktree_contexts.extend(
-            worktree_abs_paths
-                .into_iter()
-                .map(|(id, abs_path)| (id, worktree_context(&abs_path))),
-        );
-        task_contexts
-    })
-}
-
-fn is_visible_directory(worktree: &Entity<Worktree>, cx: &App) -> bool {
-    let worktree = worktree.read(cx);
-    worktree.is_visible() && worktree.root_entry().is_some_and(|entry| entry.is_dir())
-}
-
-fn worktree_context(worktree_abs_path: &Path) -> TaskContext {
-    let mut task_variables = TaskVariables::default();
-    task_variables.insert(
-        VariableName::WorktreeRoot,
-        worktree_abs_path.to_string_lossy().into_owned(),
-    );
-    TaskContext {
-        cwd: Some(worktree_abs_path.to_path_buf()),
-        task_variables,
-        project_env: HashMap::default(),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::{collections::HashMap, sync::Arc};
-
-    use editor::{Editor, MultiBufferOffset, SelectionEffects};
-    use gpui::TestAppContext;
-    use language::{Language, LanguageConfig};
-    use project::{BasicContextProvider, FakeFs, Project, task_store::TaskStore};
-    use serde_json::json;
-    use task::{TaskContext, TaskVariables, VariableName};
-    use ui::VisualContext;
-    use util::{path, rel_path::rel_path};
-    use workspace::{AppState, Workspace};
-
-    use crate::task_contexts;
-
-    #[gpui::test]
-    async fn test_default_language_context(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/dir"),
-            json!({
-                ".zed": {
-                    "tasks.json": r#"[
-                            {
-                                "label": "example task",
-                                "command": "echo",
-                                "args": ["4"]
-                            },
-                            {
-                                "label": "another one",
-                                "command": "echo",
-                                "args": ["55"]
-                            },
-                        ]"#,
-                },
-                "a.ts": "function this_is_a_test() { }",
-                "rust": {
-                                    "b.rs": "use std; fn this_is_a_rust_file() { }",
-                }
-
-            }),
-        )
-        .await;
-        let project = Project::test(fs, [path!("/dir").as_ref()], cx).await;
-        let worktree_store = project.read_with(cx, |project, _| project.worktree_store());
-        let rust_language = Arc::new(
-            Language::new(
-                LanguageConfig::default(),
-                Some(tree_sitter_rust::LANGUAGE.into()),
-            )
-            .with_outline_query(
-                r#"(function_item
-            "fn" @context
-            name: (_) @name) @item"#,
-            )
-            .unwrap()
-            .with_context_provider(Some(Arc::new(BasicContextProvider::new(
-                worktree_store.clone(),
-            )))),
-        );
-
-        let typescript_language = Arc::new(
-            Language::new(
-                LanguageConfig::default(),
-                Some(tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into()),
-            )
-            .with_outline_query(
-                r#"(function_declaration
-                    "async"? @context
-                    "function" @context
-                    name: (_) @name
-                    parameters: (formal_parameters
-                        "(" @context
-                        ")" @context)) @item"#,
-            )
-            .unwrap()
-            .with_context_provider(Some(Arc::new(BasicContextProvider::new(
-                worktree_store.clone(),
-            )))),
-        );
-
-        let worktree_id = project.update(cx, |project, cx| {
-            project.worktrees(cx).next().unwrap().read(cx).id()
-        });
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-        let buffer1 = workspace
-            .update(cx, |this, cx| {
-                this.project().update(cx, |this, cx| {
-                    this.open_buffer((worktree_id, rel_path("a.ts")), cx)
-                })
-            })
-            .await
-            .unwrap();
-        buffer1.update(cx, |this, cx| {
-            this.set_language(Some(typescript_language), cx)
-        });
-        let editor1 = cx.new_window_entity(|window, cx| {
-            Editor::for_buffer(buffer1, Some(project.clone()), window, cx)
-        });
-        let buffer2 = workspace
-            .update(cx, |this, cx| {
-                this.project().update(cx, |this, cx| {
-                    this.open_buffer((worktree_id, rel_path("rust/b.rs")), cx)
-                })
-            })
-            .await
-            .unwrap();
-        buffer2.update(cx, |this, cx| this.set_language(Some(rust_language), cx));
-        let editor2 = cx
-            .new_window_entity(|window, cx| Editor::for_buffer(buffer2, Some(project), window, cx));
-
-        let first_context = workspace
-            .update_in(cx, |workspace, window, cx| {
-                workspace.add_item_to_center(Box::new(editor1.clone()), window, cx);
-                workspace.add_item_to_center(Box::new(editor2.clone()), window, cx);
-                assert_eq!(
-                    workspace.active_item(cx).unwrap().item_id(),
-                    editor2.entity_id()
-                );
-                task_contexts(workspace, window, cx)
-            })
-            .await;
-
-        assert_eq!(
-            first_context
-                .active_context()
-                .expect("Should have an active context"),
-            &TaskContext {
-                cwd: Some(path!("/dir").into()),
-                task_variables: TaskVariables::from_iter([
-                    (VariableName::File, path!("/dir/rust/b.rs").into()),
-                    (VariableName::Filename, "b.rs".into()),
-                    (VariableName::RelativeFile, path!("rust/b.rs").into()),
-                    (VariableName::RelativeDir, "rust".into()),
-                    (VariableName::Dirname, path!("/dir/rust").into()),
-                    (VariableName::Stem, "b".into()),
-                    (VariableName::WorktreeRoot, path!("/dir").into()),
-                    (VariableName::Row, "1".into()),
-                    (VariableName::Column, "1".into()),
-                ]),
-                project_env: HashMap::default(),
-            }
-        );
-
-        // And now, let's select an identifier.
-        editor2.update_in(cx, |editor, window, cx| {
-            editor.change_selections(SelectionEffects::no_scroll(), window, cx, |selections| {
-                selections.select_ranges([MultiBufferOffset(14)..MultiBufferOffset(18)])
-            })
-        });
-
-        assert_eq!(
-            workspace
-                .update_in(cx, |workspace, window, cx| {
-                    task_contexts(workspace, window, cx)
-                })
-                .await
-                .active_context()
-                .expect("Should have an active context"),
-            &TaskContext {
-                cwd: Some(path!("/dir").into()),
-                task_variables: TaskVariables::from_iter([
-                    (VariableName::File, path!("/dir/rust/b.rs").into()),
-                    (VariableName::Filename, "b.rs".into()),
-                    (VariableName::RelativeFile, path!("rust/b.rs").into()),
-                    (VariableName::RelativeDir, "rust".into()),
-                    (VariableName::Dirname, path!("/dir/rust").into()),
-                    (VariableName::Stem, "b".into()),
-                    (VariableName::WorktreeRoot, path!("/dir").into()),
-                    (VariableName::Row, "1".into()),
-                    (VariableName::Column, "15".into()),
-                    (VariableName::SelectedText, "is_i".into()),
-                    (VariableName::Symbol, "this_is_a_rust_file".into()),
-                ]),
-                project_env: HashMap::default(),
-            }
-        );
-
-        assert_eq!(
-            workspace
-                .update_in(cx, |workspace, window, cx| {
-                    // Now, let's switch the active item to .ts file.
-                    workspace.activate_item(&editor1, true, true, window, cx);
-                    task_contexts(workspace, window, cx)
-                })
-                .await
-                .active_context()
-                .expect("Should have an active context"),
-            &TaskContext {
-                cwd: Some(path!("/dir").into()),
-                task_variables: TaskVariables::from_iter([
-                    (VariableName::File, path!("/dir/a.ts").into()),
-                    (VariableName::Filename, "a.ts".into()),
-                    (VariableName::RelativeFile, "a.ts".into()),
-                    (VariableName::RelativeDir, ".".into()),
-                    (VariableName::Dirname, path!("/dir").into()),
-                    (VariableName::Stem, "a".into()),
-                    (VariableName::WorktreeRoot, path!("/dir").into()),
-                    (VariableName::Row, "1".into()),
-                    (VariableName::Column, "1".into()),
-                    (VariableName::Symbol, "this_is_a_test".into()),
-                ]),
-                project_env: HashMap::default(),
-            }
-        );
-    }
-
-    pub(crate) fn init_test(cx: &mut TestAppContext) -> Arc<AppState> {
-        cx.update(|cx| {
-            let state = AppState::test(cx);
-            crate::init(cx);
-            editor::init(cx);
-            TaskStore::init(None);
-            state
-        })
-    }
-}
diff --git a/crates/telemetry/Cargo.toml b/crates/telemetry/Cargo.toml
deleted file mode 100644
index ed166ea4c7..0000000000
--- a/crates/telemetry/Cargo.toml
+++ /dev/null
@@ -1,18 +0,0 @@
-[package]
-name = "telemetry"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/telemetry.rs"
-
-[dependencies]
-serde.workspace = true
-serde_json.workspace = true
-telemetry_events.workspace = true
-futures.workspace = true
diff --git a/crates/telemetry/LICENSE-GPL b/crates/telemetry/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/telemetry/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/telemetry/src/telemetry.rs b/crates/telemetry/src/telemetry.rs
deleted file mode 100644
index e6c8516967..0000000000
--- a/crates/telemetry/src/telemetry.rs
+++ /dev/null
@@ -1,66 +0,0 @@
-//! See [Telemetry in Zed](https://zed.dev/docs/telemetry) for additional information.
-use futures::channel::mpsc;
-pub use serde_json;
-use std::sync::OnceLock;
-pub use telemetry_events::FlexibleEvent as Event;
-
-/// Macro to create telemetry events and send them to the telemetry queue.
-///
-/// By convention, the name should be "Noun Verbed", e.g. "Keymap Changed"
-/// or "Project Diagnostics Opened".
-///
-/// The properties can be any value that implements serde::Serialize.
-///
-/// ```
-/// # let url = "https://example.com";
-/// telemetry::event!("Keymap Changed", version = "1.0.0");
-/// telemetry::event!("Documentation Viewed", url, source = "Extension Upsell");
-/// ```
-///
-/// If you want to debug logging in development, export `RUST_LOG=telemetry=trace`
-#[macro_export]
-macro_rules! event {
-    ($name:expr) => {{
-        let event = $crate::Event {
-            event_type: $name.to_string(),
-            event_properties: std::collections::HashMap::new(),
-        };
-        $crate::send_event(event);
-    }};
-    ($name:expr, $($key:ident $(= $value:expr)?),+ $(,)?) => {{
-        let event = $crate::Event {
-            event_type: $name.to_string(),
-            event_properties: std::collections::HashMap::from([
-                $(
-                    (stringify!($key).to_string(),
-                        $crate::serde_json::value::to_value(&$crate::serialize_property!($key $(= $value)?))
-                            .unwrap_or_else(|_| $crate::serde_json::to_value(&()).unwrap())
-                    ),
-                )+
-            ]),
-        };
-        $crate::send_event(event);
-    }};
-}
-
-#[macro_export]
-macro_rules! serialize_property {
-    ($key:ident) => {
-        $key
-    };
-    ($key:ident = $value:expr) => {
-        $value
-    };
-}
-
-pub fn send_event(event: Event) {
-    if let Some(queue) = TELEMETRY_QUEUE.get() {
-        queue.unbounded_send(event).ok();
-    }
-}
-
-pub fn init(tx: mpsc::UnboundedSender<Event>) {
-    TELEMETRY_QUEUE.set(tx).ok();
-}
-
-static TELEMETRY_QUEUE: OnceLock<mpsc::UnboundedSender<Event>> = OnceLock::new();
diff --git a/crates/telemetry_events/Cargo.toml b/crates/telemetry_events/Cargo.toml
deleted file mode 100644
index 6a5149c545..0000000000
--- a/crates/telemetry_events/Cargo.toml
+++ /dev/null
@@ -1,17 +0,0 @@
-[package]
-name = "telemetry_events"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/telemetry_events.rs"
-
-[dependencies]
-semver.workspace = true
-serde.workspace = true
-serde_json.workspace = true
diff --git a/crates/telemetry_events/LICENSE-GPL b/crates/telemetry_events/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/telemetry_events/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/telemetry_events/src/telemetry_events.rs b/crates/telemetry_events/src/telemetry_events.rs
deleted file mode 100644
index 83ec2c0644..0000000000
--- a/crates/telemetry_events/src/telemetry_events.rs
+++ /dev/null
@@ -1,126 +0,0 @@
-//! See [Telemetry in Zed](https://zed.dev/docs/telemetry) for additional information.
-
-use semver::Version;
-use serde::{Deserialize, Serialize};
-use std::{collections::HashMap, fmt::Display, time::Duration};
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct EventRequestBody {
-    /// Identifier unique to each system Zed is installed on
-    pub system_id: Option<String>,
-    /// Identifier unique to each Zed installation (differs for stable, preview, dev)
-    pub installation_id: Option<String>,
-    /// Identifier unique to each logged in Zed user (randomly generated on first sign in)
-    /// Identifier unique to each Zed session (differs for each time you open Zed)
-    pub session_id: Option<String>,
-    pub metrics_id: Option<String>,
-    /// True for Zed staff, otherwise false
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub is_staff: Option<bool>,
-    /// Zed version number
-    pub app_version: String,
-    pub os_name: String,
-    pub os_version: Option<String>,
-    pub architecture: String,
-    /// Zed release channel (stable, preview, dev)
-    pub release_channel: Option<String>,
-    pub events: Vec<EventWrapper>,
-}
-
-impl EventRequestBody {
-    pub fn semver(&self) -> Option<Version> {
-        self.app_version.parse().ok()
-    }
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct EventWrapper {
-    pub signed_in: bool,
-    /// Duration between this event's timestamp and the timestamp of the first event in the current batch
-    pub milliseconds_since_first_event: i64,
-    /// The event itself
-    #[serde(flatten)]
-    pub event: Event,
-}
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum AssistantKind {
-    Panel,
-    Inline,
-    InlineTerminal,
-}
-impl Display for AssistantKind {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(
-            f,
-            "{}",
-            match self {
-                Self::Panel => "panel",
-                Self::Inline => "inline",
-                Self::InlineTerminal => "inline_terminal",
-            }
-        )
-    }
-}
-
-#[derive(Default, Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum AssistantPhase {
-    #[default]
-    Response,
-    Invoked,
-    Accepted,
-    Rejected,
-}
-
-impl Display for AssistantPhase {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(
-            f,
-            "{}",
-            match self {
-                Self::Response => "response",
-                Self::Invoked => "invoked",
-                Self::Accepted => "accepted",
-                Self::Rejected => "rejected",
-            }
-        )
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(tag = "type")]
-pub enum Event {
-    Flexible(FlexibleEvent),
-}
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct FlexibleEvent {
-    pub event_type: String,
-    pub event_properties: HashMap<String, serde_json::Value>,
-}
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub enum EditPredictionRating {
-    Positive,
-    Negative,
-}
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct AssistantEventData {
-    /// Unique random identifier for each assistant tab (None for inline assist)
-    pub conversation_id: Option<String>,
-    /// Server-generated message ID (only supported for some providers)
-    pub message_id: Option<String>,
-    /// The kind of assistant (Panel, Inline)
-    pub kind: AssistantKind,
-    #[serde(default)]
-    pub phase: AssistantPhase,
-    /// Name of the AI model used (gpt-4o, claude-3-5-sonnet, etc)
-    pub model: String,
-    pub model_provider: String,
-    pub response_latency: Option<Duration>,
-    pub error_message: Option<String>,
-    pub language_name: Option<String>,
-}
diff --git a/crates/terminal/Cargo.toml b/crates/terminal/Cargo.toml
deleted file mode 100644
index 1266c5a6e5..0000000000
--- a/crates/terminal/Cargo.toml
+++ /dev/null
@@ -1,53 +0,0 @@
-[package]
-name = "terminal"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[features]
-test-support = [
-    "collections/test-support",
-    "gpui/test-support",
-    "settings/test-support",
-]
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/terminal.rs"
-doctest = false
-
-[dependencies]
-alacritty_terminal.workspace = true
-anyhow.workspace = true
-collections.workspace = true
-futures.workspace = true
-gpui.workspace = true
-itertools.workspace = true
-libc.workspace = true
-log.workspace = true
-regex.workspace = true
-release_channel.workspace = true
-schemars.workspace = true
-serde.workspace = true
-settings.workspace = true
-sysinfo.workspace = true
-smol.workspace = true
-task.workspace = true
-theme.workspace = true
-thiserror.workspace = true
-util.workspace = true
-urlencoding.workspace = true
-
-[target.'cfg(windows)'.dependencies]
-windows.workspace = true
-
-[dev-dependencies]
-gpui = { workspace = true, features = ["test-support"] }
-rand.workspace = true
-serde_json.workspace = true
-settings = { workspace = true, features = ["test-support"] }
-url.workspace = true
-util_macros.workspace = true
diff --git a/crates/terminal/LICENSE-GPL b/crates/terminal/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/terminal/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/terminal/src/mappings/colors.rs b/crates/terminal/src/mappings/colors.rs
deleted file mode 100644
index 876e366606..0000000000
--- a/crates/terminal/src/mappings/colors.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-use alacritty_terminal::vte::ansi::Rgb as AlacRgb;
-use gpui::Rgba;
-
-//Convenience method to convert from a GPUI color to an alacritty Rgb
-pub fn to_alac_rgb(color: impl Into<Rgba>) -> AlacRgb {
-    let color = color.into();
-    let r = ((color.r * color.a) * 255.) as u8;
-    let g = ((color.g * color.a) * 255.) as u8;
-    let b = ((color.b * color.a) * 255.) as u8;
-    AlacRgb { r, g, b }
-}
diff --git a/crates/terminal/src/mappings/keys.rs b/crates/terminal/src/mappings/keys.rs
deleted file mode 100644
index 8073961fc5..0000000000
--- a/crates/terminal/src/mappings/keys.rs
+++ /dev/null
@@ -1,449 +0,0 @@
-use std::borrow::Cow;
-
-/// The mappings defined in this file where created from reading the alacritty source
-use alacritty_terminal::term::TermMode;
-use gpui::Keystroke;
-
-#[derive(Debug, PartialEq, Eq)]
-enum AlacModifiers {
-    None,
-    Alt,
-    Ctrl,
-    Shift,
-    CtrlShift,
-    Other,
-}
-
-impl AlacModifiers {
-    fn new(ks: &Keystroke) -> Self {
-        match (
-            ks.modifiers.alt,
-            ks.modifiers.control,
-            ks.modifiers.shift,
-            ks.modifiers.platform,
-        ) {
-            (false, false, false, false) => AlacModifiers::None,
-            (true, false, false, false) => AlacModifiers::Alt,
-            (false, true, false, false) => AlacModifiers::Ctrl,
-            (false, false, true, false) => AlacModifiers::Shift,
-            (false, true, true, false) => AlacModifiers::CtrlShift,
-            _ => AlacModifiers::Other,
-        }
-    }
-
-    fn any(&self) -> bool {
-        match &self {
-            AlacModifiers::None => false,
-            AlacModifiers::Alt => true,
-            AlacModifiers::Ctrl => true,
-            AlacModifiers::Shift => true,
-            AlacModifiers::CtrlShift => true,
-            AlacModifiers::Other => true,
-        }
-    }
-}
-
-pub fn to_esc_str(
-    keystroke: &Keystroke,
-    mode: &TermMode,
-    option_as_meta: bool,
-) -> Option<Cow<'static, str>> {
-    let modifiers = AlacModifiers::new(keystroke);
-
-    // Manual Bindings including modifiers
-    let manual_esc_str: Option<&'static str> = match (keystroke.key.as_ref(), &modifiers) {
-        //Basic special keys
-        ("tab", AlacModifiers::None) => Some("\x09"),
-        ("escape", AlacModifiers::None) => Some("\x1b"),
-        ("enter", AlacModifiers::None) => Some("\x0d"),
-        ("enter", AlacModifiers::Shift) => Some("\x0a"),
-        ("enter", AlacModifiers::Alt) => Some("\x1b\x0d"),
-        ("backspace", AlacModifiers::None) => Some("\x7f"),
-        //Interesting escape codes
-        ("tab", AlacModifiers::Shift) => Some("\x1b[Z"),
-        ("backspace", AlacModifiers::Ctrl) => Some("\x08"),
-        ("backspace", AlacModifiers::Alt) => Some("\x1b\x7f"),
-        ("backspace", AlacModifiers::Shift) => Some("\x7f"),
-        ("space", AlacModifiers::Ctrl) => Some("\x00"),
-        ("home", AlacModifiers::Shift) if mode.contains(TermMode::ALT_SCREEN) => Some("\x1b[1;2H"),
-        ("end", AlacModifiers::Shift) if mode.contains(TermMode::ALT_SCREEN) => Some("\x1b[1;2F"),
-        ("pageup", AlacModifiers::Shift) if mode.contains(TermMode::ALT_SCREEN) => {
-            Some("\x1b[5;2~")
-        }
-        ("pagedown", AlacModifiers::Shift) if mode.contains(TermMode::ALT_SCREEN) => {
-            Some("\x1b[6;2~")
-        }
-        ("home", AlacModifiers::None) if mode.contains(TermMode::APP_CURSOR) => Some("\x1bOH"),
-        ("home", AlacModifiers::None) if !mode.contains(TermMode::APP_CURSOR) => Some("\x1b[H"),
-        ("end", AlacModifiers::None) if mode.contains(TermMode::APP_CURSOR) => Some("\x1bOF"),
-        ("end", AlacModifiers::None) if !mode.contains(TermMode::APP_CURSOR) => Some("\x1b[F"),
-        ("up", AlacModifiers::None) if mode.contains(TermMode::APP_CURSOR) => Some("\x1bOA"),
-        ("up", AlacModifiers::None) if !mode.contains(TermMode::APP_CURSOR) => Some("\x1b[A"),
-        ("down", AlacModifiers::None) if mode.contains(TermMode::APP_CURSOR) => Some("\x1bOB"),
-        ("down", AlacModifiers::None) if !mode.contains(TermMode::APP_CURSOR) => Some("\x1b[B"),
-        ("right", AlacModifiers::None) if mode.contains(TermMode::APP_CURSOR) => Some("\x1bOC"),
-        ("right", AlacModifiers::None) if !mode.contains(TermMode::APP_CURSOR) => Some("\x1b[C"),
-        ("left", AlacModifiers::None) if mode.contains(TermMode::APP_CURSOR) => Some("\x1bOD"),
-        ("left", AlacModifiers::None) if !mode.contains(TermMode::APP_CURSOR) => Some("\x1b[D"),
-        ("back", AlacModifiers::None) => Some("\x7f"),
-        ("insert", AlacModifiers::None) => Some("\x1b[2~"),
-        ("delete", AlacModifiers::None) => Some("\x1b[3~"),
-        ("pageup", AlacModifiers::None) => Some("\x1b[5~"),
-        ("pagedown", AlacModifiers::None) => Some("\x1b[6~"),
-        ("f1", AlacModifiers::None) => Some("\x1bOP"),
-        ("f2", AlacModifiers::None) => Some("\x1bOQ"),
-        ("f3", AlacModifiers::None) => Some("\x1bOR"),
-        ("f4", AlacModifiers::None) => Some("\x1bOS"),
-        ("f5", AlacModifiers::None) => Some("\x1b[15~"),
-        ("f6", AlacModifiers::None) => Some("\x1b[17~"),
-        ("f7", AlacModifiers::None) => Some("\x1b[18~"),
-        ("f8", AlacModifiers::None) => Some("\x1b[19~"),
-        ("f9", AlacModifiers::None) => Some("\x1b[20~"),
-        ("f10", AlacModifiers::None) => Some("\x1b[21~"),
-        ("f11", AlacModifiers::None) => Some("\x1b[23~"),
-        ("f12", AlacModifiers::None) => Some("\x1b[24~"),
-        ("f13", AlacModifiers::None) => Some("\x1b[25~"),
-        ("f14", AlacModifiers::None) => Some("\x1b[26~"),
-        ("f15", AlacModifiers::None) => Some("\x1b[28~"),
-        ("f16", AlacModifiers::None) => Some("\x1b[29~"),
-        ("f17", AlacModifiers::None) => Some("\x1b[31~"),
-        ("f18", AlacModifiers::None) => Some("\x1b[32~"),
-        ("f19", AlacModifiers::None) => Some("\x1b[33~"),
-        ("f20", AlacModifiers::None) => Some("\x1b[34~"),
-        // NumpadEnter, Action::Esc("\n".into());
-        //Mappings for caret notation keys
-        ("a", AlacModifiers::Ctrl) => Some("\x01"), //1
-        ("A", AlacModifiers::CtrlShift) => Some("\x01"), //1
-        ("b", AlacModifiers::Ctrl) => Some("\x02"), //2
-        ("B", AlacModifiers::CtrlShift) => Some("\x02"), //2
-        ("c", AlacModifiers::Ctrl) => Some("\x03"), //3
-        ("C", AlacModifiers::CtrlShift) => Some("\x03"), //3
-        ("d", AlacModifiers::Ctrl) => Some("\x04"), //4
-        ("D", AlacModifiers::CtrlShift) => Some("\x04"), //4
-        ("e", AlacModifiers::Ctrl) => Some("\x05"), //5
-        ("E", AlacModifiers::CtrlShift) => Some("\x05"), //5
-        ("f", AlacModifiers::Ctrl) => Some("\x06"), //6
-        ("F", AlacModifiers::CtrlShift) => Some("\x06"), //6
-        ("g", AlacModifiers::Ctrl) => Some("\x07"), //7
-        ("G", AlacModifiers::CtrlShift) => Some("\x07"), //7
-        ("h", AlacModifiers::Ctrl) => Some("\x08"), //8
-        ("H", AlacModifiers::CtrlShift) => Some("\x08"), //8
-        ("i", AlacModifiers::Ctrl) => Some("\x09"), //9
-        ("I", AlacModifiers::CtrlShift) => Some("\x09"), //9
-        ("j", AlacModifiers::Ctrl) => Some("\x0a"), //10
-        ("J", AlacModifiers::CtrlShift) => Some("\x0a"), //10
-        ("k", AlacModifiers::Ctrl) => Some("\x0b"), //11
-        ("K", AlacModifiers::CtrlShift) => Some("\x0b"), //11
-        ("l", AlacModifiers::Ctrl) => Some("\x0c"), //12
-        ("L", AlacModifiers::CtrlShift) => Some("\x0c"), //12
-        ("m", AlacModifiers::Ctrl) => Some("\x0d"), //13
-        ("M", AlacModifiers::CtrlShift) => Some("\x0d"), //13
-        ("n", AlacModifiers::Ctrl) => Some("\x0e"), //14
-        ("N", AlacModifiers::CtrlShift) => Some("\x0e"), //14
-        ("o", AlacModifiers::Ctrl) => Some("\x0f"), //15
-        ("O", AlacModifiers::CtrlShift) => Some("\x0f"), //15
-        ("p", AlacModifiers::Ctrl) => Some("\x10"), //16
-        ("P", AlacModifiers::CtrlShift) => Some("\x10"), //16
-        ("q", AlacModifiers::Ctrl) => Some("\x11"), //17
-        ("Q", AlacModifiers::CtrlShift) => Some("\x11"), //17
-        ("r", AlacModifiers::Ctrl) => Some("\x12"), //18
-        ("R", AlacModifiers::CtrlShift) => Some("\x12"), //18
-        ("s", AlacModifiers::Ctrl) => Some("\x13"), //19
-        ("S", AlacModifiers::CtrlShift) => Some("\x13"), //19
-        ("t", AlacModifiers::Ctrl) => Some("\x14"), //20
-        ("T", AlacModifiers::CtrlShift) => Some("\x14"), //20
-        ("u", AlacModifiers::Ctrl) => Some("\x15"), //21
-        ("U", AlacModifiers::CtrlShift) => Some("\x15"), //21
-        ("v", AlacModifiers::Ctrl) => Some("\x16"), //22
-        ("V", AlacModifiers::CtrlShift) => Some("\x16"), //22
-        ("w", AlacModifiers::Ctrl) => Some("\x17"), //23
-        ("W", AlacModifiers::CtrlShift) => Some("\x17"), //23
-        ("x", AlacModifiers::Ctrl) => Some("\x18"), //24
-        ("X", AlacModifiers::CtrlShift) => Some("\x18"), //24
-        ("y", AlacModifiers::Ctrl) => Some("\x19"), //25
-        ("Y", AlacModifiers::CtrlShift) => Some("\x19"), //25
-        ("z", AlacModifiers::Ctrl) => Some("\x1a"), //26
-        ("Z", AlacModifiers::CtrlShift) => Some("\x1a"), //26
-        ("@", AlacModifiers::Ctrl) => Some("\x00"), //0
-        ("[", AlacModifiers::Ctrl) => Some("\x1b"), //27
-        ("\\", AlacModifiers::Ctrl) => Some("\x1c"), //28
-        ("]", AlacModifiers::Ctrl) => Some("\x1d"), //29
-        ("^", AlacModifiers::Ctrl) => Some("\x1e"), //30
-        ("_", AlacModifiers::Ctrl) => Some("\x1f"), //31
-        ("?", AlacModifiers::Ctrl) => Some("\x7f"), //127
-        _ => None,
-    };
-    if let Some(esc_str) = manual_esc_str {
-        return Some(Cow::Borrowed(esc_str));
-    }
-
-    // Automated bindings applying modifiers
-    if modifiers.any() {
-        let modifier_code = modifier_code(keystroke);
-        let modified_esc_str = match keystroke.key.as_ref() {
-            "up" => Some(format!("\x1b[1;{}A", modifier_code)),
-            "down" => Some(format!("\x1b[1;{}B", modifier_code)),
-            "right" => Some(format!("\x1b[1;{}C", modifier_code)),
-            "left" => Some(format!("\x1b[1;{}D", modifier_code)),
-            "f1" => Some(format!("\x1b[1;{}P", modifier_code)),
-            "f2" => Some(format!("\x1b[1;{}Q", modifier_code)),
-            "f3" => Some(format!("\x1b[1;{}R", modifier_code)),
-            "f4" => Some(format!("\x1b[1;{}S", modifier_code)),
-            "F5" => Some(format!("\x1b[15;{}~", modifier_code)),
-            "f6" => Some(format!("\x1b[17;{}~", modifier_code)),
-            "f7" => Some(format!("\x1b[18;{}~", modifier_code)),
-            "f8" => Some(format!("\x1b[19;{}~", modifier_code)),
-            "f9" => Some(format!("\x1b[20;{}~", modifier_code)),
-            "f10" => Some(format!("\x1b[21;{}~", modifier_code)),
-            "f11" => Some(format!("\x1b[23;{}~", modifier_code)),
-            "f12" => Some(format!("\x1b[24;{}~", modifier_code)),
-            "f13" => Some(format!("\x1b[25;{}~", modifier_code)),
-            "f14" => Some(format!("\x1b[26;{}~", modifier_code)),
-            "f15" => Some(format!("\x1b[28;{}~", modifier_code)),
-            "f16" => Some(format!("\x1b[29;{}~", modifier_code)),
-            "f17" => Some(format!("\x1b[31;{}~", modifier_code)),
-            "f18" => Some(format!("\x1b[32;{}~", modifier_code)),
-            "f19" => Some(format!("\x1b[33;{}~", modifier_code)),
-            "f20" => Some(format!("\x1b[34;{}~", modifier_code)),
-            _ if modifier_code == 2 => None,
-            "insert" => Some(format!("\x1b[2;{}~", modifier_code)),
-            "pageup" => Some(format!("\x1b[5;{}~", modifier_code)),
-            "pagedown" => Some(format!("\x1b[6;{}~", modifier_code)),
-            "end" => Some(format!("\x1b[1;{}F", modifier_code)),
-            "home" => Some(format!("\x1b[1;{}H", modifier_code)),
-            _ => None,
-        };
-        if let Some(esc_str) = modified_esc_str {
-            return Some(Cow::Owned(esc_str));
-        }
-    }
-
-    if !cfg!(target_os = "macos") || option_as_meta {
-        let is_alt_lowercase_ascii = modifiers == AlacModifiers::Alt && keystroke.key.is_ascii();
-        let is_alt_uppercase_ascii =
-            keystroke.modifiers.alt && keystroke.modifiers.shift && keystroke.key.is_ascii();
-        if is_alt_lowercase_ascii || is_alt_uppercase_ascii {
-            let key = if is_alt_uppercase_ascii {
-                &keystroke.key.to_ascii_uppercase()
-            } else {
-                &keystroke.key
-            };
-            return Some(Cow::Owned(format!("\x1b{}", key)));
-        }
-    }
-
-    None
-}
-
-///   Code     Modifiers
-/// ---------+---------------------------
-///    2     | Shift
-///    3     | Alt
-///    4     | Shift + Alt
-///    5     | Control
-///    6     | Shift + Control
-///    7     | Alt + Control
-///    8     | Shift + Alt + Control
-/// ---------+---------------------------
-/// from: https://invisible-island.net/xterm/ctlseqs/ctlseqs.html#h2-PC-Style-Function-Keys
-fn modifier_code(keystroke: &Keystroke) -> u32 {
-    let mut modifier_code = 0;
-    if keystroke.modifiers.shift {
-        modifier_code |= 1;
-    }
-    if keystroke.modifiers.alt {
-        modifier_code |= 1 << 1;
-    }
-    if keystroke.modifiers.control {
-        modifier_code |= 1 << 2;
-    }
-    modifier_code + 1
-}
-
-#[cfg(test)]
-mod test {
-    use gpui::Modifiers;
-
-    use super::*;
-
-    #[test]
-    fn test_scroll_keys() {
-        //These keys should be handled by the scrolling element directly
-        //Need to signify this by returning 'None'
-        let shift_pageup = Keystroke::parse("shift-pageup").unwrap();
-        let shift_pagedown = Keystroke::parse("shift-pagedown").unwrap();
-        let shift_home = Keystroke::parse("shift-home").unwrap();
-        let shift_end = Keystroke::parse("shift-end").unwrap();
-
-        let none = TermMode::NONE;
-        assert_eq!(to_esc_str(&shift_pageup, &none, false), None);
-        assert_eq!(to_esc_str(&shift_pagedown, &none, false), None);
-        assert_eq!(to_esc_str(&shift_home, &none, false), None);
-        assert_eq!(to_esc_str(&shift_end, &none, false), None);
-
-        let alt_screen = TermMode::ALT_SCREEN;
-        assert_eq!(
-            to_esc_str(&shift_pageup, &alt_screen, false),
-            Some("\x1b[5;2~".into())
-        );
-        assert_eq!(
-            to_esc_str(&shift_pagedown, &alt_screen, false),
-            Some("\x1b[6;2~".into())
-        );
-        assert_eq!(
-            to_esc_str(&shift_home, &alt_screen, false),
-            Some("\x1b[1;2H".into())
-        );
-        assert_eq!(
-            to_esc_str(&shift_end, &alt_screen, false),
-            Some("\x1b[1;2F".into())
-        );
-
-        let pageup = Keystroke::parse("pageup").unwrap();
-        let pagedown = Keystroke::parse("pagedown").unwrap();
-        let any = TermMode::ANY;
-
-        assert_eq!(to_esc_str(&pageup, &any, false), Some("\x1b[5~".into()));
-        assert_eq!(to_esc_str(&pagedown, &any, false), Some("\x1b[6~".into()));
-    }
-
-    #[test]
-    fn test_plain_inputs() {
-        let ks = Keystroke {
-            modifiers: Modifiers {
-                control: false,
-                alt: false,
-                shift: false,
-                platform: false,
-                function: false,
-            },
-            key: "🖖🏻".to_string(), //2 char string
-            key_char: None,
-        };
-        assert_eq!(to_esc_str(&ks, &TermMode::NONE, false), None);
-    }
-
-    #[test]
-    fn test_application_mode() {
-        let app_cursor = TermMode::APP_CURSOR;
-        let none = TermMode::NONE;
-
-        let up = Keystroke::parse("up").unwrap();
-        let down = Keystroke::parse("down").unwrap();
-        let left = Keystroke::parse("left").unwrap();
-        let right = Keystroke::parse("right").unwrap();
-
-        assert_eq!(to_esc_str(&up, &none, false), Some("\x1b[A".into()));
-        assert_eq!(to_esc_str(&down, &none, false), Some("\x1b[B".into()));
-        assert_eq!(to_esc_str(&right, &none, false), Some("\x1b[C".into()));
-        assert_eq!(to_esc_str(&left, &none, false), Some("\x1b[D".into()));
-
-        assert_eq!(to_esc_str(&up, &app_cursor, false), Some("\x1bOA".into()));
-        assert_eq!(to_esc_str(&down, &app_cursor, false), Some("\x1bOB".into()));
-        assert_eq!(
-            to_esc_str(&right, &app_cursor, false),
-            Some("\x1bOC".into())
-        );
-        assert_eq!(to_esc_str(&left, &app_cursor, false), Some("\x1bOD".into()));
-    }
-
-    #[test]
-    fn test_ctrl_codes() {
-        let letters_lower = 'a'..='z';
-        let letters_upper = 'A'..='Z';
-        let mode = TermMode::ANY;
-
-        for (lower, upper) in letters_lower.zip(letters_upper) {
-            assert_eq!(
-                to_esc_str(
-                    &Keystroke::parse(&format!("ctrl-shift-{}", lower)).unwrap(),
-                    &mode,
-                    false
-                ),
-                to_esc_str(
-                    &Keystroke::parse(&format!("ctrl-{}", upper)).unwrap(),
-                    &mode,
-                    false
-                ),
-                "On letter: {}/{}",
-                lower,
-                upper
-            )
-        }
-    }
-
-    #[test]
-    fn alt_is_meta() {
-        let ascii_printable = ' '..='~';
-        for character in ascii_printable {
-            assert_eq!(
-                to_esc_str(
-                    &Keystroke::parse(&format!("alt-{}", character)).unwrap(),
-                    &TermMode::NONE,
-                    true
-                )
-                .unwrap(),
-                format!("\x1b{}", character)
-            );
-        }
-
-        let gpui_keys = [
-            "up", "down", "right", "left", "f1", "f2", "f3", "f4", "F5", "f6", "f7", "f8", "f9",
-            "f10", "f11", "f12", "f13", "f14", "f15", "f16", "f17", "f18", "f19", "f20", "insert",
-            "pageup", "pagedown", "end", "home",
-        ];
-
-        for key in gpui_keys {
-            assert_ne!(
-                to_esc_str(
-                    &Keystroke::parse(&format!("alt-{}", key)).unwrap(),
-                    &TermMode::NONE,
-                    true
-                )
-                .unwrap(),
-                format!("\x1b{}", key)
-            );
-        }
-    }
-
-    #[test]
-    fn test_shift_enter_newline() {
-        let shift_enter = Keystroke::parse("shift-enter").unwrap();
-        let regular_enter = Keystroke::parse("enter").unwrap();
-        let mode = TermMode::NONE;
-
-        // Shift-enter should send line feed (newline)
-        assert_eq!(to_esc_str(&shift_enter, &mode, false), Some("\x0a".into()));
-
-        // Regular enter should still send carriage return
-        assert_eq!(
-            to_esc_str(&regular_enter, &mode, false),
-            Some("\x0d".into())
-        );
-    }
-
-    #[test]
-    fn test_modifier_code_calc() {
-        //   Code     Modifiers
-        // ---------+---------------------------
-        //    2     | Shift
-        //    3     | Alt
-        //    4     | Shift + Alt
-        //    5     | Control
-        //    6     | Shift + Control
-        //    7     | Alt + Control
-        //    8     | Shift + Alt + Control
-        // ---------+---------------------------
-        // from: https://invisible-island.net/xterm/ctlseqs/ctlseqs.html#h2-PC-Style-Function-Keys
-        assert_eq!(2, modifier_code(&Keystroke::parse("shift-a").unwrap()));
-        assert_eq!(3, modifier_code(&Keystroke::parse("alt-a").unwrap()));
-        assert_eq!(4, modifier_code(&Keystroke::parse("shift-alt-a").unwrap()));
-        assert_eq!(5, modifier_code(&Keystroke::parse("ctrl-a").unwrap()));
-        assert_eq!(6, modifier_code(&Keystroke::parse("shift-ctrl-a").unwrap()));
-        assert_eq!(7, modifier_code(&Keystroke::parse("alt-ctrl-a").unwrap()));
-        assert_eq!(
-            8,
-            modifier_code(&Keystroke::parse("shift-ctrl-alt-a").unwrap())
-        );
-    }
-}
diff --git a/crates/terminal/src/mappings/mod.rs b/crates/terminal/src/mappings/mod.rs
deleted file mode 100644
index d58dd27f96..0000000000
--- a/crates/terminal/src/mappings/mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-pub mod colors;
-pub mod keys;
-pub mod mouse;
diff --git a/crates/terminal/src/mappings/mouse.rs b/crates/terminal/src/mappings/mouse.rs
deleted file mode 100644
index 8c3eed8b54..0000000000
--- a/crates/terminal/src/mappings/mouse.rs
+++ /dev/null
@@ -1,277 +0,0 @@
-use std::cmp::{self, max, min};
-use std::iter::repeat;
-
-use alacritty_terminal::grid::Dimensions;
-/// Most of the code, and specifically the constants, in this are copied from Alacritty,
-/// with modifications for our circumstances
-use alacritty_terminal::index::{Column as GridCol, Line as GridLine, Point as AlacPoint, Side};
-use alacritty_terminal::term::TermMode;
-use gpui::{Modifiers, MouseButton, Pixels, Point, ScrollWheelEvent, px};
-
-use crate::TerminalBounds;
-
-enum MouseFormat {
-    Sgr,
-    Normal(bool),
-}
-
-impl MouseFormat {
-    fn from_mode(mode: TermMode) -> Self {
-        if mode.contains(TermMode::SGR_MOUSE) {
-            MouseFormat::Sgr
-        } else if mode.contains(TermMode::UTF8_MOUSE) {
-            MouseFormat::Normal(true)
-        } else {
-            MouseFormat::Normal(false)
-        }
-    }
-}
-
-#[derive(Debug)]
-enum AlacMouseButton {
-    LeftButton = 0,
-    MiddleButton = 1,
-    RightButton = 2,
-    LeftMove = 32,
-    MiddleMove = 33,
-    RightMove = 34,
-    NoneMove = 35,
-    ScrollUp = 64,
-    ScrollDown = 65,
-    Other = 99,
-}
-
-impl AlacMouseButton {
-    fn from_move_button(e: Option<MouseButton>) -> Self {
-        match e {
-            Some(gpui::MouseButton::Left) => AlacMouseButton::LeftMove,
-            Some(gpui::MouseButton::Middle) => AlacMouseButton::MiddleMove,
-            Some(gpui::MouseButton::Right) => AlacMouseButton::RightMove,
-            Some(gpui::MouseButton::Navigate(_)) => AlacMouseButton::Other,
-            None => AlacMouseButton::NoneMove,
-        }
-    }
-
-    fn from_button(e: MouseButton) -> Self {
-        match e {
-            gpui::MouseButton::Left => AlacMouseButton::LeftButton,
-            gpui::MouseButton::Right => AlacMouseButton::MiddleButton,
-            gpui::MouseButton::Middle => AlacMouseButton::RightButton,
-            gpui::MouseButton::Navigate(_) => AlacMouseButton::Other,
-        }
-    }
-
-    fn from_scroll(e: &ScrollWheelEvent) -> Self {
-        let is_positive = match e.delta {
-            gpui::ScrollDelta::Pixels(pixels) => pixels.y > px(0.),
-            gpui::ScrollDelta::Lines(lines) => lines.y > 0.,
-        };
-
-        if is_positive {
-            AlacMouseButton::ScrollUp
-        } else {
-            AlacMouseButton::ScrollDown
-        }
-    }
-
-    fn is_other(&self) -> bool {
-        matches!(self, AlacMouseButton::Other)
-    }
-}
-
-pub fn scroll_report(
-    point: AlacPoint,
-    scroll_lines: i32,
-    e: &ScrollWheelEvent,
-    mode: TermMode,
-) -> Option<impl Iterator<Item = Vec<u8>>> {
-    if mode.intersects(TermMode::MOUSE_MODE) {
-        mouse_report(
-            point,
-            AlacMouseButton::from_scroll(e),
-            true,
-            e.modifiers,
-            MouseFormat::from_mode(mode),
-        )
-        .map(|report| repeat(report).take(max(scroll_lines, 1) as usize))
-    } else {
-        None
-    }
-}
-
-pub fn alt_scroll(scroll_lines: i32) -> Vec<u8> {
-    let cmd = if scroll_lines > 0 { b'A' } else { b'B' };
-
-    let mut content = Vec::with_capacity(scroll_lines.unsigned_abs() as usize * 3);
-    for _ in 0..scroll_lines.abs() {
-        content.push(0x1b);
-        content.push(b'O');
-        content.push(cmd);
-    }
-    content
-}
-
-pub fn mouse_button_report(
-    point: AlacPoint,
-    button: gpui::MouseButton,
-    modifiers: Modifiers,
-    pressed: bool,
-    mode: TermMode,
-) -> Option<Vec<u8>> {
-    let button = AlacMouseButton::from_button(button);
-    if !button.is_other() && mode.intersects(TermMode::MOUSE_MODE) {
-        mouse_report(
-            point,
-            button,
-            pressed,
-            modifiers,
-            MouseFormat::from_mode(mode),
-        )
-    } else {
-        None
-    }
-}
-
-pub fn mouse_moved_report(
-    point: AlacPoint,
-    button: Option<MouseButton>,
-    modifiers: Modifiers,
-    mode: TermMode,
-) -> Option<Vec<u8>> {
-    let button = AlacMouseButton::from_move_button(button);
-
-    if !button.is_other() && mode.intersects(TermMode::MOUSE_MOTION | TermMode::MOUSE_DRAG) {
-        //Only drags are reported in drag mode, so block NoneMove.
-        if mode.contains(TermMode::MOUSE_DRAG) && matches!(button, AlacMouseButton::NoneMove) {
-            None
-        } else {
-            mouse_report(point, button, true, modifiers, MouseFormat::from_mode(mode))
-        }
-    } else {
-        None
-    }
-}
-
-pub fn grid_point(
-    pos: Point<Pixels>,
-    cur_size: TerminalBounds,
-    display_offset: usize,
-) -> AlacPoint {
-    grid_point_and_side(pos, cur_size, display_offset).0
-}
-
-pub fn grid_point_and_side(
-    pos: Point<Pixels>,
-    cur_size: TerminalBounds,
-    display_offset: usize,
-) -> (AlacPoint, Side) {
-    let mut col = GridCol((pos.x / cur_size.cell_width) as usize);
-    let cell_x = cmp::max(px(0.), pos.x) % cur_size.cell_width;
-    let half_cell_width = cur_size.cell_width / 2.0;
-    let mut side = if cell_x > half_cell_width {
-        Side::Right
-    } else {
-        Side::Left
-    };
-
-    if col > cur_size.last_column() {
-        col = cur_size.last_column();
-        side = Side::Right;
-    }
-    let col = min(col, cur_size.last_column());
-    let mut line = (pos.y / cur_size.line_height) as i32;
-    if line > cur_size.bottommost_line() {
-        line = cur_size.bottommost_line().0;
-        side = Side::Right;
-    } else if line < 0 {
-        side = Side::Left;
-    }
-
-    (
-        AlacPoint::new(GridLine(line - display_offset as i32), col),
-        side,
-    )
-}
-
-///Generate the bytes to send to the terminal, from the cell location, a mouse event, and the terminal mode
-fn mouse_report(
-    point: AlacPoint,
-    button: AlacMouseButton,
-    pressed: bool,
-    modifiers: Modifiers,
-    format: MouseFormat,
-) -> Option<Vec<u8>> {
-    if point.line < 0 {
-        return None;
-    }
-
-    let mut mods = 0;
-    if modifiers.shift {
-        mods += 4;
-    }
-    if modifiers.alt {
-        mods += 8;
-    }
-    if modifiers.control {
-        mods += 16;
-    }
-
-    match format {
-        MouseFormat::Sgr => {
-            Some(sgr_mouse_report(point, button as u8 + mods, pressed).into_bytes())
-        }
-        MouseFormat::Normal(utf8) => {
-            if pressed {
-                normal_mouse_report(point, button as u8 + mods, utf8)
-            } else {
-                normal_mouse_report(point, 3 + mods, utf8)
-            }
-        }
-    }
-}
-
-fn normal_mouse_report(point: AlacPoint, button: u8, utf8: bool) -> Option<Vec<u8>> {
-    let AlacPoint { line, column } = point;
-    let max_point = if utf8 { 2015 } else { 223 };
-
-    if line >= max_point || column >= max_point {
-        return None;
-    }
-
-    let mut msg = vec![b'\x1b', b'[', b'M', 32 + button];
-
-    let mouse_pos_encode = |pos: usize| -> Vec<u8> {
-        let pos = 32 + 1 + pos;
-        let first = 0xC0 + pos / 64;
-        let second = 0x80 + (pos & 63);
-        vec![first as u8, second as u8]
-    };
-
-    if utf8 && column >= 95 {
-        msg.append(&mut mouse_pos_encode(column.0));
-    } else {
-        msg.push(32 + 1 + column.0 as u8);
-    }
-
-    if utf8 && line >= 95 {
-        msg.append(&mut mouse_pos_encode(line.0 as usize));
-    } else {
-        msg.push(32 + 1 + line.0 as u8);
-    }
-
-    Some(msg)
-}
-
-fn sgr_mouse_report(point: AlacPoint, button: u8, pressed: bool) -> String {
-    let c = if pressed { 'M' } else { 'm' };
-
-    let msg = format!(
-        "\x1b[<{};{};{}{}",
-        button,
-        point.column + 1,
-        point.line + 1,
-        c
-    );
-
-    msg
-}
diff --git a/crates/terminal/src/pty_info.rs b/crates/terminal/src/pty_info.rs
deleted file mode 100644
index c92de2f23b..0000000000
--- a/crates/terminal/src/pty_info.rs
+++ /dev/null
@@ -1,170 +0,0 @@
-use alacritty_terminal::tty::Pty;
-#[cfg(target_os = "windows")]
-use std::num::NonZeroU32;
-#[cfg(unix)]
-use std::os::fd::AsRawFd;
-use std::path::PathBuf;
-
-#[cfg(target_os = "windows")]
-use windows::Win32::{Foundation::HANDLE, System::Threading::GetProcessId};
-
-use sysinfo::{Pid, Process, ProcessRefreshKind, RefreshKind, System, UpdateKind};
-
-pub struct ProcessIdGetter {
-    handle: i32,
-    fallback_pid: u32,
-}
-
-impl ProcessIdGetter {
-    pub fn fallback_pid(&self) -> Pid {
-        Pid::from_u32(self.fallback_pid)
-    }
-}
-
-#[cfg(unix)]
-impl ProcessIdGetter {
-    fn new(pty: &Pty) -> ProcessIdGetter {
-        ProcessIdGetter {
-            handle: pty.file().as_raw_fd(),
-            fallback_pid: pty.child().id(),
-        }
-    }
-
-    fn pid(&self) -> Option<Pid> {
-        let pid = unsafe { libc::tcgetpgrp(self.handle) };
-        if pid < 0 {
-            return Some(Pid::from_u32(self.fallback_pid));
-        }
-        Some(Pid::from_u32(pid as u32))
-    }
-}
-
-#[cfg(windows)]
-impl ProcessIdGetter {
-    fn new(pty: &Pty) -> ProcessIdGetter {
-        let child = pty.child_watcher();
-        let handle = child.raw_handle();
-        let fallback_pid = child.pid().unwrap_or_else(|| unsafe {
-            NonZeroU32::new_unchecked(GetProcessId(HANDLE(handle as _)))
-        });
-
-        ProcessIdGetter {
-            handle: handle as i32,
-            fallback_pid: u32::from(fallback_pid),
-        }
-    }
-
-    fn pid(&self) -> Option<Pid> {
-        let pid = unsafe { GetProcessId(HANDLE(self.handle as _)) };
-        // the GetProcessId may fail and returns zero, which will lead to a stack overflow issue
-        if pid == 0 {
-            // in the builder process, there is a small chance, almost negligible,
-            // that this value could be zero, which means child_watcher returns None,
-            // GetProcessId returns 0.
-            if self.fallback_pid == 0 {
-                return None;
-            }
-            return Some(Pid::from_u32(self.fallback_pid));
-        }
-        Some(Pid::from_u32(pid))
-    }
-}
-
-#[derive(Clone, Debug)]
-pub struct ProcessInfo {
-    pub name: String,
-    pub cwd: PathBuf,
-    pub argv: Vec<String>,
-}
-
-/// Fetches Zed-relevant Pseudo-Terminal (PTY) process information
-pub struct PtyProcessInfo {
-    system: System,
-    refresh_kind: ProcessRefreshKind,
-    pid_getter: ProcessIdGetter,
-    pub current: Option<ProcessInfo>,
-}
-
-impl PtyProcessInfo {
-    pub fn new(pty: &Pty) -> PtyProcessInfo {
-        let process_refresh_kind = ProcessRefreshKind::nothing()
-            .with_cmd(UpdateKind::Always)
-            .with_cwd(UpdateKind::Always)
-            .with_exe(UpdateKind::Always);
-        let refresh_kind = RefreshKind::nothing().with_processes(process_refresh_kind);
-        let system = System::new_with_specifics(refresh_kind);
-
-        PtyProcessInfo {
-            system,
-            refresh_kind: process_refresh_kind,
-            pid_getter: ProcessIdGetter::new(pty),
-            current: None,
-        }
-    }
-
-    pub fn pid_getter(&self) -> &ProcessIdGetter {
-        &self.pid_getter
-    }
-
-    fn refresh(&mut self) -> Option<&Process> {
-        let pid = self.pid_getter.pid()?;
-        if self.system.refresh_processes_specifics(
-            sysinfo::ProcessesToUpdate::Some(&[pid]),
-            true,
-            self.refresh_kind,
-        ) == 1
-        {
-            self.system.process(pid)
-        } else {
-            None
-        }
-    }
-
-    fn get_child(&self) -> Option<&Process> {
-        let pid = self.pid_getter.fallback_pid();
-        self.system.process(pid)
-    }
-
-    pub(crate) fn kill_current_process(&mut self) -> bool {
-        self.refresh().is_some_and(|process| process.kill())
-    }
-
-    pub(crate) fn kill_child_process(&mut self) -> bool {
-        self.get_child().is_some_and(|process| process.kill())
-    }
-
-    fn load(&mut self) -> Option<ProcessInfo> {
-        let process = self.refresh()?;
-        let cwd = process.cwd().map_or(PathBuf::new(), |p| p.to_owned());
-
-        let info = ProcessInfo {
-            name: process.name().to_str()?.to_owned(),
-            cwd,
-            argv: process
-                .cmd()
-                .iter()
-                .filter_map(|s| s.to_str().map(ToOwned::to_owned))
-                .collect(),
-        };
-        self.current = Some(info.clone());
-        Some(info)
-    }
-
-    /// Updates the cached process info, returns whether the Zed-relevant info has changed
-    pub fn has_changed(&mut self) -> bool {
-        let current = self.load();
-        let has_changed = match (self.current.as_ref(), current.as_ref()) {
-            (None, None) => false,
-            (Some(prev), Some(now)) => prev.cwd != now.cwd || prev.name != now.name,
-            _ => true,
-        };
-        if has_changed {
-            self.current = current;
-        }
-        has_changed
-    }
-
-    pub fn pid(&self) -> Option<Pid> {
-        self.pid_getter.pid()
-    }
-}
diff --git a/crates/terminal/src/terminal.rs b/crates/terminal/src/terminal.rs
deleted file mode 100644
index caca93eac5..0000000000
--- a/crates/terminal/src/terminal.rs
+++ /dev/null
@@ -1,2854 +0,0 @@
-pub mod mappings;
-
-pub use alacritty_terminal;
-
-mod pty_info;
-mod terminal_hyperlinks;
-pub mod terminal_settings;
-
-use alacritty_terminal::{
-    Term,
-    event::{Event as AlacTermEvent, EventListener, Notify, WindowSize},
-    event_loop::{EventLoop, Msg, Notifier},
-    grid::{Dimensions, Grid, Row, Scroll as AlacScroll},
-    index::{Boundary, Column, Direction as AlacDirection, Line, Point as AlacPoint},
-    selection::{Selection, SelectionRange, SelectionType},
-    sync::FairMutex,
-    term::{
-        Config, RenderableCursor, TermMode,
-        cell::{Cell, Flags},
-        search::{Match, RegexIter, RegexSearch},
-    },
-    tty::{self},
-    vi_mode::{ViModeCursor, ViMotion},
-    vte::ansi::{
-        ClearMode, CursorStyle as AlacCursorStyle, Handler, NamedPrivateMode, PrivateMode,
-    },
-};
-use anyhow::{Context as _, Result, bail};
-use log::trace;
-
-use futures::{
-    FutureExt,
-    channel::mpsc::{UnboundedReceiver, UnboundedSender, unbounded},
-};
-
-use itertools::Itertools as _;
-use mappings::mouse::{
-    alt_scroll, grid_point, grid_point_and_side, mouse_button_report, mouse_moved_report,
-    scroll_report,
-};
-
-use collections::{HashMap, VecDeque};
-use futures::StreamExt;
-use pty_info::{ProcessIdGetter, PtyProcessInfo};
-use serde::{Deserialize, Serialize};
-use settings::Settings;
-use smol::channel::{Receiver, Sender};
-use task::{HideStrategy, Shell, SpawnInTerminal};
-use terminal_hyperlinks::RegexSearches;
-use terminal_settings::{AlternateScroll, CursorShape, TerminalSettings};
-use theme::{ActiveTheme, Theme};
-use urlencoding;
-use util::truncate_and_trailoff;
-
-use std::{
-    borrow::Cow,
-    cmp::{self, min},
-    fmt::Display,
-    ops::{Deref, RangeInclusive},
-    path::PathBuf,
-    process::ExitStatus,
-    sync::Arc,
-    time::Instant,
-};
-use thiserror::Error;
-
-use gpui::{
-    App, AppContext as _, Bounds, ClipboardItem, Context, EventEmitter, Hsla, Keystroke, Modifiers,
-    MouseButton, MouseDownEvent, MouseMoveEvent, MouseUpEvent, Pixels, Point, Rgba,
-    ScrollWheelEvent, Size, Task, TouchPhase, Window, actions, black, px,
-};
-
-use crate::mappings::{colors::to_alac_rgb, keys::to_esc_str};
-
-actions!(
-    terminal,
-    [
-        /// Clears the terminal screen.
-        Clear,
-        /// Copies selected text to the clipboard.
-        Copy,
-        /// Pastes from the clipboard.
-        Paste,
-        /// Shows the character palette for special characters.
-        ShowCharacterPalette,
-        /// Searches for text in the terminal.
-        SearchTest,
-        /// Scrolls up by one line.
-        ScrollLineUp,
-        /// Scrolls down by one line.
-        ScrollLineDown,
-        /// Scrolls up by one page.
-        ScrollPageUp,
-        /// Scrolls down by one page.
-        ScrollPageDown,
-        /// Scrolls up by half a page.
-        ScrollHalfPageUp,
-        /// Scrolls down by half a page.
-        ScrollHalfPageDown,
-        /// Scrolls to the top of the terminal buffer.
-        ScrollToTop,
-        /// Scrolls to the bottom of the terminal buffer.
-        ScrollToBottom,
-        /// Toggles vi mode in the terminal.
-        ToggleViMode,
-        /// Selects all text in the terminal.
-        SelectAll,
-    ]
-);
-
-const DEBUG_TERMINAL_WIDTH: Pixels = px(500.);
-const DEBUG_TERMINAL_HEIGHT: Pixels = px(30.);
-const DEBUG_CELL_WIDTH: Pixels = px(5.);
-const DEBUG_LINE_HEIGHT: Pixels = px(5.);
-
-///Upward flowing events, for changing the title and such
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum Event {
-    TitleChanged,
-    BreadcrumbsChanged,
-    CloseTerminal,
-    Bell,
-    Wakeup,
-    BlinkChanged(bool),
-    SelectionsChanged,
-    NewNavigationTarget(Option<MaybeNavigationTarget>),
-    Open(MaybeNavigationTarget),
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct PathLikeTarget {
-    /// File system path, absolute or relative, existing or not.
-    /// Might have line and column number(s) attached as `file.rs:1:23`
-    pub maybe_path: String,
-    /// Current working directory of the terminal
-    pub terminal_dir: Option<PathBuf>,
-}
-
-/// A string inside terminal, potentially useful as a URI that can be opened.
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum MaybeNavigationTarget {
-    /// HTTP, git, etc. string determined by the `URL_REGEX` regex.
-    Url(String),
-    /// File system path, absolute or relative, existing or not.
-    /// Might have line and column number(s) attached as `file.rs:1:23`
-    PathLike(PathLikeTarget),
-}
-
-#[derive(Clone)]
-enum InternalEvent {
-    Resize(TerminalBounds),
-    Clear,
-    // FocusNextMatch,
-    Scroll(AlacScroll),
-    ScrollToAlacPoint(AlacPoint),
-    SetSelection(Option<(Selection, AlacPoint)>),
-    UpdateSelection(Point<Pixels>),
-    // Adjusted mouse position, should open
-    FindHyperlink(Point<Pixels>, bool),
-    // Whether keep selection when copy
-    Copy(Option<bool>),
-    // Vi mode events
-    ToggleViMode,
-    ViMotion(ViMotion),
-    MoveViCursorToAlacPoint(AlacPoint),
-}
-
-///A translation struct for Alacritty to communicate with us from their event loop
-#[derive(Clone)]
-pub struct ZedListener(pub UnboundedSender<AlacTermEvent>);
-
-impl EventListener for ZedListener {
-    fn send_event(&self, event: AlacTermEvent) {
-        self.0.unbounded_send(event).ok();
-    }
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct TerminalBounds {
-    pub cell_width: Pixels,
-    pub line_height: Pixels,
-    pub bounds: Bounds<Pixels>,
-}
-
-impl TerminalBounds {
-    pub fn new(line_height: Pixels, cell_width: Pixels, bounds: Bounds<Pixels>) -> Self {
-        TerminalBounds {
-            cell_width,
-            line_height,
-            bounds,
-        }
-    }
-
-    pub fn num_lines(&self) -> usize {
-        (self.bounds.size.height / self.line_height).floor() as usize
-    }
-
-    pub fn num_columns(&self) -> usize {
-        (self.bounds.size.width / self.cell_width).floor() as usize
-    }
-
-    pub fn height(&self) -> Pixels {
-        self.bounds.size.height
-    }
-
-    pub fn width(&self) -> Pixels {
-        self.bounds.size.width
-    }
-
-    pub fn cell_width(&self) -> Pixels {
-        self.cell_width
-    }
-
-    pub fn line_height(&self) -> Pixels {
-        self.line_height
-    }
-}
-
-impl Default for TerminalBounds {
-    fn default() -> Self {
-        TerminalBounds::new(
-            DEBUG_LINE_HEIGHT,
-            DEBUG_CELL_WIDTH,
-            Bounds {
-                origin: Point::default(),
-                size: Size {
-                    width: DEBUG_TERMINAL_WIDTH,
-                    height: DEBUG_TERMINAL_HEIGHT,
-                },
-            },
-        )
-    }
-}
-
-impl From<TerminalBounds> for WindowSize {
-    fn from(val: TerminalBounds) -> Self {
-        WindowSize {
-            num_lines: val.num_lines() as u16,
-            num_cols: val.num_columns() as u16,
-            cell_width: f32::from(val.cell_width()) as u16,
-            cell_height: f32::from(val.line_height()) as u16,
-        }
-    }
-}
-
-impl Dimensions for TerminalBounds {
-    /// Note: this is supposed to be for the back buffer's length,
-    /// but we exclusively use it to resize the terminal, which does not
-    /// use this method. We still have to implement it for the trait though,
-    /// hence, this comment.
-    fn total_lines(&self) -> usize {
-        self.screen_lines()
-    }
-
-    fn screen_lines(&self) -> usize {
-        self.num_lines()
-    }
-
-    fn columns(&self) -> usize {
-        self.num_columns()
-    }
-}
-
-#[derive(Error, Debug)]
-pub struct TerminalError {
-    pub directory: Option<PathBuf>,
-    pub program: Option<String>,
-    pub args: Option<Vec<String>>,
-    pub title_override: Option<String>,
-    pub source: std::io::Error,
-}
-
-impl TerminalError {
-    pub fn fmt_directory(&self) -> String {
-        self.directory
-            .clone()
-            .map(|path| {
-                match path
-                    .into_os_string()
-                    .into_string()
-                    .map_err(|os_str| format!("<non-utf8 path> {}", os_str.to_string_lossy()))
-                {
-                    Ok(s) => s,
-                    Err(s) => s,
-                }
-            })
-            .unwrap_or_else(|| "<none specified>".to_string())
-    }
-
-    pub fn fmt_shell(&self) -> String {
-        if let Some(title_override) = &self.title_override {
-            format!(
-                "{} {} ({})",
-                self.program.as_deref().unwrap_or("<system defined shell>"),
-                self.args.as_ref().into_iter().flatten().format(" "),
-                title_override
-            )
-        } else {
-            format!(
-                "{} {}",
-                self.program.as_deref().unwrap_or("<system defined shell>"),
-                self.args.as_ref().into_iter().flatten().format(" ")
-            )
-        }
-    }
-}
-
-impl Display for TerminalError {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let dir_string: String = self.fmt_directory();
-        let shell = self.fmt_shell();
-
-        write!(
-            f,
-            "Working directory: {} Shell command: `{}`, IOError: {}",
-            dir_string, shell, self.source
-        )
-    }
-}
-
-// https://github.com/alacritty/alacritty/blob/cb3a79dbf6472740daca8440d5166c1d4af5029e/extra/man/alacritty.5.scd?plain=1#L207-L213
-const DEFAULT_SCROLL_HISTORY_LINES: usize = 10_000;
-pub const MAX_SCROLL_HISTORY_LINES: usize = 100_000;
-
-pub struct TerminalBuilder {
-    terminal: Terminal,
-    events_rx: UnboundedReceiver<AlacTermEvent>,
-}
-
-impl TerminalBuilder {
-    pub fn new_display_only(
-        cursor_shape: CursorShape,
-        alternate_scroll: AlternateScroll,
-        max_scroll_history_lines: Option<usize>,
-        window_id: u64,
-    ) -> Result<TerminalBuilder> {
-        // Create a display-only terminal (no actual PTY).
-        let default_cursor_style = AlacCursorStyle::from(cursor_shape);
-        let scrolling_history = max_scroll_history_lines
-            .unwrap_or(DEFAULT_SCROLL_HISTORY_LINES)
-            .min(MAX_SCROLL_HISTORY_LINES);
-        let config = Config {
-            scrolling_history,
-            default_cursor_style,
-            ..Config::default()
-        };
-
-        let (events_tx, events_rx) = unbounded();
-        let mut term = Term::new(
-            config.clone(),
-            &TerminalBounds::default(),
-            ZedListener(events_tx),
-        );
-
-        if let AlternateScroll::Off = alternate_scroll {
-            term.unset_private_mode(PrivateMode::Named(NamedPrivateMode::AlternateScroll));
-        }
-
-        let term = Arc::new(FairMutex::new(term));
-
-        let terminal = Terminal {
-            task: None,
-            terminal_type: TerminalType::DisplayOnly,
-            completion_tx: None,
-            term,
-            term_config: config,
-            title_override: None,
-            events: VecDeque::with_capacity(10),
-            last_content: Default::default(),
-            last_mouse: None,
-            matches: Vec::new(),
-            selection_head: None,
-            breadcrumb_text: String::new(),
-            scroll_px: px(0.),
-            next_link_id: 0,
-            selection_phase: SelectionPhase::Ended,
-            hyperlink_regex_searches: RegexSearches::default(),
-            vi_mode_enabled: false,
-            is_remote_terminal: false,
-            last_mouse_move_time: Instant::now(),
-            last_hyperlink_search_position: None,
-            #[cfg(windows)]
-            shell_program: None,
-            activation_script: Vec::new(),
-            template: CopyTemplate {
-                shell: Shell::System,
-                env: HashMap::default(),
-                cursor_shape,
-                alternate_scroll,
-                max_scroll_history_lines,
-                path_hyperlink_regexes: Vec::default(),
-                path_hyperlink_timeout_ms: 0,
-                window_id,
-            },
-            child_exited: None,
-            event_loop_task: Task::ready(Ok(())),
-        };
-
-        Ok(TerminalBuilder {
-            terminal,
-            events_rx,
-        })
-    }
-
-    pub fn new(
-        working_directory: Option<PathBuf>,
-        task: Option<TaskState>,
-        shell: Shell,
-        mut env: HashMap<String, String>,
-        cursor_shape: CursorShape,
-        alternate_scroll: AlternateScroll,
-        max_scroll_history_lines: Option<usize>,
-        path_hyperlink_regexes: Vec<String>,
-        path_hyperlink_timeout_ms: u64,
-        is_remote_terminal: bool,
-        window_id: u64,
-        completion_tx: Option<Sender<Option<ExitStatus>>>,
-        cx: &App,
-        activation_script: Vec<String>,
-    ) -> Task<Result<TerminalBuilder>> {
-        let version = release_channel::AppVersion::global(cx);
-        let fut = async move {
-            // If the parent environment doesn't have a locale set
-            // (As is the case when launched from a .app on MacOS),
-            // and the Project doesn't have a locale set, then
-            // set a fallback for our child environment to use.
-            if std::env::var("LANG").is_err() {
-                env.entry("LANG".to_string())
-                    .or_insert_with(|| "en_US.UTF-8".to_string());
-            }
-
-            env.insert("ZED_TERM".to_string(), "true".to_string());
-            env.insert("TERM_PROGRAM".to_string(), "zed".to_string());
-            env.insert("TERM".to_string(), "xterm-256color".to_string());
-            env.insert("COLORTERM".to_string(), "truecolor".to_string());
-            env.insert("TERM_PROGRAM_VERSION".to_string(), version.to_string());
-
-            #[derive(Default)]
-            struct ShellParams {
-                program: String,
-                args: Option<Vec<String>>,
-                title_override: Option<String>,
-            }
-
-            impl ShellParams {
-                fn new(
-                    program: String,
-                    args: Option<Vec<String>>,
-                    title_override: Option<String>,
-                ) -> Self {
-                    log::debug!("Using {program} as shell");
-                    Self {
-                        program,
-                        args,
-                        title_override,
-                    }
-                }
-            }
-
-            let shell_params = match shell.clone() {
-                Shell::System => {
-                    if cfg!(windows) {
-                        Some(ShellParams::new(
-                            util::shell::get_windows_system_shell(),
-                            None,
-                            None,
-                        ))
-                    } else {
-                        None
-                    }
-                }
-                Shell::Program(program) => Some(ShellParams::new(program, None, None)),
-                Shell::WithArguments {
-                    program,
-                    args,
-                    title_override,
-                } => Some(ShellParams::new(program, Some(args), title_override)),
-            };
-            let terminal_title_override =
-                shell_params.as_ref().and_then(|e| e.title_override.clone());
-
-            #[cfg(windows)]
-            let shell_program = shell_params.as_ref().map(|params| {
-                use util::ResultExt;
-
-                Self::resolve_path(&params.program)
-                    .log_err()
-                    .unwrap_or(params.program.clone())
-            });
-
-            // Note: when remoting, this shell_kind will scrutinize `ssh` or
-            // `wsl.exe` as a shell and fall back to posix or powershell based on
-            // the compilation target. This is fine right now due to the restricted
-            // way we use the return value, but would become incorrect if we
-            // supported remoting into windows.
-            let shell_kind = shell.shell_kind(cfg!(windows));
-
-            let pty_options = {
-                let alac_shell = shell_params.as_ref().map(|params| {
-                    alacritty_terminal::tty::Shell::new(
-                        params.program.clone(),
-                        params.args.clone().unwrap_or_default(),
-                    )
-                });
-
-                alacritty_terminal::tty::Options {
-                    shell: alac_shell,
-                    working_directory: working_directory.clone(),
-                    drain_on_exit: true,
-                    env: env.clone().into_iter().collect(),
-                    #[cfg(windows)]
-                    escape_args: shell_kind.tty_escape_args(),
-                }
-            };
-
-            let default_cursor_style = AlacCursorStyle::from(cursor_shape);
-            let scrolling_history = if task.is_some() {
-                // Tasks like `cargo build --all` may produce a lot of output, ergo allow maximum scrolling.
-                // After the task finishes, we do not allow appending to that terminal, so small tasks output should not
-                // cause excessive memory usage over time.
-                MAX_SCROLL_HISTORY_LINES
-            } else {
-                max_scroll_history_lines
-                    .unwrap_or(DEFAULT_SCROLL_HISTORY_LINES)
-                    .min(MAX_SCROLL_HISTORY_LINES)
-            };
-            let config = Config {
-                scrolling_history,
-                default_cursor_style,
-                ..Config::default()
-            };
-
-            //Setup the pty...
-            let pty = match tty::new(&pty_options, TerminalBounds::default().into(), window_id) {
-                Ok(pty) => pty,
-                Err(error) => {
-                    bail!(TerminalError {
-                        directory: working_directory,
-                        program: shell_params.as_ref().map(|params| params.program.clone()),
-                        args: shell_params.as_ref().and_then(|params| params.args.clone()),
-                        title_override: terminal_title_override,
-                        source: error,
-                    });
-                }
-            };
-
-            //Spawn a task so the Alacritty EventLoop can communicate with us
-            //TODO: Remove with a bounded sender which can be dispatched on &self
-            let (events_tx, events_rx) = unbounded();
-            //Set up the terminal...
-            let mut term = Term::new(
-                config.clone(),
-                &TerminalBounds::default(),
-                ZedListener(events_tx.clone()),
-            );
-
-            //Alacritty defaults to alternate scrolling being on, so we just need to turn it off.
-            if let AlternateScroll::Off = alternate_scroll {
-                term.unset_private_mode(PrivateMode::Named(NamedPrivateMode::AlternateScroll));
-            }
-
-            let term = Arc::new(FairMutex::new(term));
-
-            let pty_info = PtyProcessInfo::new(&pty);
-
-            //And connect them together
-            let event_loop = EventLoop::new(
-                term.clone(),
-                ZedListener(events_tx),
-                pty,
-                pty_options.drain_on_exit,
-                false,
-            )
-            .context("failed to create event loop")?;
-
-            let pty_tx = event_loop.channel();
-            let _io_thread = event_loop.spawn(); // DANGER
-
-            let no_task = task.is_none();
-            let terminal = Terminal {
-                task,
-                terminal_type: TerminalType::Pty {
-                    pty_tx: Notifier(pty_tx),
-                    info: pty_info,
-                },
-                completion_tx,
-                term,
-                term_config: config,
-                title_override: terminal_title_override,
-                events: VecDeque::with_capacity(10), //Should never get this high.
-                last_content: Default::default(),
-                last_mouse: None,
-                matches: Vec::new(),
-                selection_head: None,
-                breadcrumb_text: String::new(),
-                scroll_px: px(0.),
-                next_link_id: 0,
-                selection_phase: SelectionPhase::Ended,
-                hyperlink_regex_searches: RegexSearches::new(
-                    &path_hyperlink_regexes,
-                    path_hyperlink_timeout_ms,
-                ),
-                vi_mode_enabled: false,
-                is_remote_terminal,
-                last_mouse_move_time: Instant::now(),
-                last_hyperlink_search_position: None,
-                #[cfg(windows)]
-                shell_program,
-                activation_script: activation_script.clone(),
-                template: CopyTemplate {
-                    shell,
-                    env,
-                    cursor_shape,
-                    alternate_scroll,
-                    max_scroll_history_lines,
-                    path_hyperlink_regexes,
-                    path_hyperlink_timeout_ms,
-                    window_id,
-                },
-                child_exited: None,
-                event_loop_task: Task::ready(Ok(())),
-            };
-
-            if !activation_script.is_empty() && no_task {
-                for activation_script in activation_script {
-                    terminal.write_to_pty(activation_script.into_bytes());
-                    // Simulate enter key press
-                    // NOTE(PowerShell): using `\r\n` will put PowerShell in a continuation mode (infamous >> character)
-                    // and generally mess up the rendering.
-                    terminal.write_to_pty(b"\x0d");
-                }
-                // In order to clear the screen at this point, we have two options:
-                // 1. We can send a shell-specific command such as "clear" or "cls"
-                // 2. We can "echo" a marker message that we will then catch when handling a Wakeup event
-                //    and clear the screen using `terminal.clear()` method
-                // We cannot issue a `terminal.clear()` command at this point as alacritty is evented
-                // and while we have sent the activation script to the pty, it will be executed asynchronously.
-                // Therefore, we somehow need to wait for the activation script to finish executing before we
-                // can proceed with clearing the screen.
-                terminal.write_to_pty(shell_kind.clear_screen_command().as_bytes());
-                // Simulate enter key press
-                terminal.write_to_pty(b"\x0d");
-            }
-
-            Ok(TerminalBuilder {
-                terminal,
-                events_rx,
-            })
-        };
-        // the thread we spawn things on has an effect on signal handling
-        if !cfg!(target_os = "windows") {
-            cx.spawn(async move |_| fut.await)
-        } else {
-            cx.background_spawn(fut)
-        }
-    }
-
-    pub fn subscribe(mut self, cx: &Context<Terminal>) -> Terminal {
-        //Event loop
-        self.terminal.event_loop_task = cx.spawn(async move |terminal, cx| {
-            while let Some(event) = self.events_rx.next().await {
-                terminal.update(cx, |terminal, cx| {
-                    //Process the first event immediately for lowered latency
-                    terminal.process_event(event, cx);
-                })?;
-
-                'outer: loop {
-                    let mut events = Vec::new();
-
-                    #[cfg(any(test, feature = "test-support"))]
-                    let mut timer = cx.background_executor().simulate_random_delay().fuse();
-                    #[cfg(not(any(test, feature = "test-support")))]
-                    let mut timer = cx
-                        .background_executor()
-                        .timer(std::time::Duration::from_millis(4))
-                        .fuse();
-
-                    let mut wakeup = false;
-                    loop {
-                        futures::select_biased! {
-                            _ = timer => break,
-                            event = self.events_rx.next() => {
-                                if let Some(event) = event {
-                                    if matches!(event, AlacTermEvent::Wakeup) {
-                                        wakeup = true;
-                                    } else {
-                                        events.push(event);
-                                    }
-
-                                    if events.len() > 100 {
-                                        break;
-                                    }
-                                } else {
-                                    break;
-                                }
-                            },
-                        }
-                    }
-
-                    if events.is_empty() && !wakeup {
-                        smol::future::yield_now().await;
-                        break 'outer;
-                    }
-
-                    terminal.update(cx, |this, cx| {
-                        if wakeup {
-                            this.process_event(AlacTermEvent::Wakeup, cx);
-                        }
-
-                        for event in events {
-                            this.process_event(event, cx);
-                        }
-                    })?;
-                    smol::future::yield_now().await;
-                }
-            }
-            anyhow::Ok(())
-        });
-        self.terminal
-    }
-
-    #[cfg(windows)]
-    fn resolve_path(path: &str) -> Result<String> {
-        use windows::Win32::Storage::FileSystem::SearchPathW;
-        use windows::core::HSTRING;
-
-        let path = if path.starts_with(r"\\?\") || !path.contains(&['/', '\\']) {
-            path.to_string()
-        } else {
-            r"\\?\".to_string() + path
-        };
-
-        let required_length = unsafe { SearchPathW(None, &HSTRING::from(&path), None, None, None) };
-        let mut buf = vec![0u16; required_length as usize];
-        let size = unsafe { SearchPathW(None, &HSTRING::from(&path), None, Some(&mut buf), None) };
-
-        Ok(String::from_utf16(&buf[..size as usize])?)
-    }
-}
-
-#[derive(Debug, Clone, Deserialize, Serialize)]
-pub struct IndexedCell {
-    pub point: AlacPoint,
-    pub cell: Cell,
-}
-
-impl Deref for IndexedCell {
-    type Target = Cell;
-
-    #[inline]
-    fn deref(&self) -> &Cell {
-        &self.cell
-    }
-}
-
-// TODO: Un-pub
-#[derive(Clone)]
-pub struct TerminalContent {
-    pub cells: Vec<IndexedCell>,
-    pub mode: TermMode,
-    pub display_offset: usize,
-    pub selection_text: Option<String>,
-    pub selection: Option<SelectionRange>,
-    pub cursor: RenderableCursor,
-    pub cursor_char: char,
-    pub terminal_bounds: TerminalBounds,
-    pub last_hovered_word: Option<HoveredWord>,
-    pub scrolled_to_top: bool,
-    pub scrolled_to_bottom: bool,
-}
-
-#[derive(Debug, Clone, Eq, PartialEq)]
-pub struct HoveredWord {
-    pub word: String,
-    pub word_match: RangeInclusive<AlacPoint>,
-    pub id: usize,
-}
-
-impl Default for TerminalContent {
-    fn default() -> Self {
-        TerminalContent {
-            cells: Default::default(),
-            mode: Default::default(),
-            display_offset: Default::default(),
-            selection_text: Default::default(),
-            selection: Default::default(),
-            cursor: RenderableCursor {
-                shape: alacritty_terminal::vte::ansi::CursorShape::Block,
-                point: AlacPoint::new(Line(0), Column(0)),
-            },
-            cursor_char: Default::default(),
-            terminal_bounds: Default::default(),
-            last_hovered_word: None,
-            scrolled_to_top: false,
-            scrolled_to_bottom: false,
-        }
-    }
-}
-
-#[derive(PartialEq, Eq)]
-pub enum SelectionPhase {
-    Selecting,
-    Ended,
-}
-
-enum TerminalType {
-    Pty {
-        pty_tx: Notifier,
-        info: PtyProcessInfo,
-    },
-    DisplayOnly,
-}
-
-pub struct Terminal {
-    terminal_type: TerminalType,
-    completion_tx: Option<Sender<Option<ExitStatus>>>,
-    term: Arc<FairMutex<Term<ZedListener>>>,
-    term_config: Config,
-    events: VecDeque<InternalEvent>,
-    /// This is only used for mouse mode cell change detection
-    last_mouse: Option<(AlacPoint, AlacDirection)>,
-    pub matches: Vec<RangeInclusive<AlacPoint>>,
-    pub last_content: TerminalContent,
-    pub selection_head: Option<AlacPoint>,
-    pub breadcrumb_text: String,
-    title_override: Option<String>,
-    scroll_px: Pixels,
-    next_link_id: usize,
-    selection_phase: SelectionPhase,
-    hyperlink_regex_searches: RegexSearches,
-    task: Option<TaskState>,
-    vi_mode_enabled: bool,
-    is_remote_terminal: bool,
-    last_mouse_move_time: Instant,
-    last_hyperlink_search_position: Option<Point<Pixels>>,
-    #[cfg(windows)]
-    shell_program: Option<String>,
-    template: CopyTemplate,
-    activation_script: Vec<String>,
-    child_exited: Option<ExitStatus>,
-    event_loop_task: Task<Result<(), anyhow::Error>>,
-}
-
-struct CopyTemplate {
-    shell: Shell,
-    env: HashMap<String, String>,
-    cursor_shape: CursorShape,
-    alternate_scroll: AlternateScroll,
-    max_scroll_history_lines: Option<usize>,
-    path_hyperlink_regexes: Vec<String>,
-    path_hyperlink_timeout_ms: u64,
-    window_id: u64,
-}
-
-#[derive(Debug)]
-pub struct TaskState {
-    pub status: TaskStatus,
-    pub completion_rx: Receiver<Option<ExitStatus>>,
-    pub spawned_task: SpawnInTerminal,
-}
-
-/// A status of the current terminal tab's task.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum TaskStatus {
-    /// The task had been started, but got cancelled or somehow otherwise it did not
-    /// report its exit code before the terminal event loop was shut down.
-    Unknown,
-    /// The task is started and running currently.
-    Running,
-    /// After the start, the task stopped running and reported its error code back.
-    Completed { success: bool },
-}
-
-impl TaskStatus {
-    fn register_terminal_exit(&mut self) {
-        if self == &Self::Running {
-            *self = Self::Unknown;
-        }
-    }
-
-    fn register_task_exit(&mut self, error_code: i32) {
-        *self = TaskStatus::Completed {
-            success: error_code == 0,
-        };
-    }
-}
-
-impl Terminal {
-    fn process_event(&mut self, event: AlacTermEvent, cx: &mut Context<Self>) {
-        match event {
-            AlacTermEvent::Title(title) => {
-                // ignore default shell program title change as windows always sends those events
-                // and it would end up showing the shell executable path in breadcrumbs
-                #[cfg(windows)]
-                {
-                    if self
-                        .shell_program
-                        .as_ref()
-                        .map(|e| *e == title)
-                        .unwrap_or(false)
-                    {
-                        return;
-                    }
-                }
-
-                self.breadcrumb_text = title;
-                cx.emit(Event::BreadcrumbsChanged);
-            }
-            AlacTermEvent::ResetTitle => {
-                self.breadcrumb_text = String::new();
-                cx.emit(Event::BreadcrumbsChanged);
-            }
-            AlacTermEvent::ClipboardStore(_, data) => {
-                cx.write_to_clipboard(ClipboardItem::new_string(data))
-            }
-            AlacTermEvent::ClipboardLoad(_, format) => {
-                self.write_to_pty(
-                    match &cx.read_from_clipboard().and_then(|item| item.text()) {
-                        // The terminal only supports pasting strings, not images.
-                        Some(text) => format(text),
-                        _ => format(""),
-                    }
-                    .into_bytes(),
-                )
-            }
-            AlacTermEvent::PtyWrite(out) => self.write_to_pty(out.into_bytes()),
-            AlacTermEvent::TextAreaSizeRequest(format) => {
-                self.write_to_pty(format(self.last_content.terminal_bounds.into()).into_bytes())
-            }
-            AlacTermEvent::CursorBlinkingChange => {
-                let terminal = self.term.lock();
-                let blinking = terminal.cursor_style().blinking;
-                cx.emit(Event::BlinkChanged(blinking));
-            }
-            AlacTermEvent::Bell => {
-                cx.emit(Event::Bell);
-            }
-            AlacTermEvent::Exit => self.register_task_finished(None, cx),
-            AlacTermEvent::MouseCursorDirty => {
-                //NOOP, Handled in render
-            }
-            AlacTermEvent::Wakeup => {
-                cx.emit(Event::Wakeup);
-
-                if let TerminalType::Pty { info, .. } = &mut self.terminal_type {
-                    if info.has_changed() {
-                        cx.emit(Event::TitleChanged);
-                    }
-                }
-            }
-            AlacTermEvent::ColorRequest(index, format) => {
-                // It's important that the color request is processed here to retain relative order
-                // with other PTY writes. Otherwise applications might witness out-of-order
-                // responses to requests. For example: An application sending `OSC 11 ; ? ST`
-                // (color request) followed by `CSI c` (request device attributes) would receive
-                // the response to `CSI c` first.
-                // Instead of locking, we could store the colors in `self.last_content`. But then
-                // we might respond with out of date value if a "set color" sequence is immediately
-                // followed by a color request sequence.
-                let color = self.term.lock().colors()[index]
-                    .unwrap_or_else(|| to_alac_rgb(get_color_at_index(index, cx.theme().as_ref())));
-                self.write_to_pty(format(color).into_bytes());
-            }
-            AlacTermEvent::ChildExit(error_code) => {
-                self.register_task_finished(Some(error_code), cx);
-            }
-        }
-    }
-
-    pub fn selection_started(&self) -> bool {
-        self.selection_phase == SelectionPhase::Selecting
-    }
-
-    fn process_terminal_event(
-        &mut self,
-        event: &InternalEvent,
-        term: &mut Term<ZedListener>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            &InternalEvent::Resize(mut new_bounds) => {
-                trace!("Resizing: new_bounds={new_bounds:?}");
-                new_bounds.bounds.size.height =
-                    cmp::max(new_bounds.line_height, new_bounds.height());
-                new_bounds.bounds.size.width = cmp::max(new_bounds.cell_width, new_bounds.width());
-
-                self.last_content.terminal_bounds = new_bounds;
-
-                if let TerminalType::Pty { pty_tx, .. } = &self.terminal_type {
-                    pty_tx.0.send(Msg::Resize(new_bounds.into())).ok();
-                }
-
-                term.resize(new_bounds);
-                // If there are matches we need to emit a wake up event to
-                // invalidate the matches and recalculate their locations
-                // in the new terminal layout
-                if !self.matches.is_empty() {
-                    cx.emit(Event::Wakeup);
-                }
-            }
-            InternalEvent::Clear => {
-                trace!("Clearing");
-                // Clear back buffer
-                term.clear_screen(ClearMode::Saved);
-
-                let cursor = term.grid().cursor.point;
-
-                // Clear the lines above
-                term.grid_mut().reset_region(..cursor.line);
-
-                // Copy the current line up
-                let line = term.grid()[cursor.line][..Column(term.grid().columns())]
-                    .iter()
-                    .cloned()
-                    .enumerate()
-                    .collect::<Vec<(usize, Cell)>>();
-
-                for (i, cell) in line {
-                    term.grid_mut()[Line(0)][Column(i)] = cell;
-                }
-
-                // Reset the cursor
-                term.grid_mut().cursor.point =
-                    AlacPoint::new(Line(0), term.grid_mut().cursor.point.column);
-                let new_cursor = term.grid().cursor.point;
-
-                // Clear the lines below the new cursor
-                if (new_cursor.line.0 as usize) < term.screen_lines() - 1 {
-                    term.grid_mut().reset_region((new_cursor.line + 1)..);
-                }
-
-                cx.emit(Event::Wakeup);
-            }
-            InternalEvent::Scroll(scroll) => {
-                trace!("Scrolling: scroll={scroll:?}");
-                term.scroll_display(*scroll);
-                self.refresh_hovered_word(window);
-
-                if self.vi_mode_enabled {
-                    match *scroll {
-                        AlacScroll::Delta(delta) => {
-                            term.vi_mode_cursor = term.vi_mode_cursor.scroll(term, delta);
-                        }
-                        AlacScroll::PageUp => {
-                            let lines = term.screen_lines() as i32;
-                            term.vi_mode_cursor = term.vi_mode_cursor.scroll(term, lines);
-                        }
-                        AlacScroll::PageDown => {
-                            let lines = -(term.screen_lines() as i32);
-                            term.vi_mode_cursor = term.vi_mode_cursor.scroll(term, lines);
-                        }
-                        AlacScroll::Top => {
-                            let point = AlacPoint::new(term.topmost_line(), Column(0));
-                            term.vi_mode_cursor = ViModeCursor::new(point);
-                        }
-                        AlacScroll::Bottom => {
-                            let point = AlacPoint::new(term.bottommost_line(), Column(0));
-                            term.vi_mode_cursor = ViModeCursor::new(point);
-                        }
-                    }
-                    if let Some(mut selection) = term.selection.take() {
-                        let point = term.vi_mode_cursor.point;
-                        selection.update(point, AlacDirection::Right);
-                        term.selection = Some(selection);
-
-                        #[cfg(any(target_os = "linux", target_os = "freebsd"))]
-                        if let Some(selection_text) = term.selection_to_string() {
-                            cx.write_to_primary(ClipboardItem::new_string(selection_text));
-                        }
-
-                        self.selection_head = Some(point);
-                        cx.emit(Event::SelectionsChanged)
-                    }
-                }
-            }
-            InternalEvent::SetSelection(selection) => {
-                trace!("Setting selection: selection={selection:?}");
-                term.selection = selection.as_ref().map(|(sel, _)| sel.clone());
-
-                #[cfg(any(target_os = "linux", target_os = "freebsd"))]
-                if let Some(selection_text) = term.selection_to_string() {
-                    cx.write_to_primary(ClipboardItem::new_string(selection_text));
-                }
-
-                if let Some((_, head)) = selection {
-                    self.selection_head = Some(*head);
-                }
-                cx.emit(Event::SelectionsChanged)
-            }
-            InternalEvent::UpdateSelection(position) => {
-                trace!("Updating selection: position={position:?}");
-                if let Some(mut selection) = term.selection.take() {
-                    let (point, side) = grid_point_and_side(
-                        *position,
-                        self.last_content.terminal_bounds,
-                        term.grid().display_offset(),
-                    );
-
-                    selection.update(point, side);
-                    term.selection = Some(selection);
-
-                    #[cfg(any(target_os = "linux", target_os = "freebsd"))]
-                    if let Some(selection_text) = term.selection_to_string() {
-                        cx.write_to_primary(ClipboardItem::new_string(selection_text));
-                    }
-
-                    self.selection_head = Some(point);
-                    cx.emit(Event::SelectionsChanged)
-                }
-            }
-
-            InternalEvent::Copy(keep_selection) => {
-                trace!("Copying selection: keep_selection={keep_selection:?}");
-                if let Some(txt) = term.selection_to_string() {
-                    cx.write_to_clipboard(ClipboardItem::new_string(txt));
-                    if !keep_selection.unwrap_or_else(|| {
-                        let settings = TerminalSettings::get_global(cx);
-                        settings.keep_selection_on_copy
-                    }) {
-                        self.events.push_back(InternalEvent::SetSelection(None));
-                    }
-                }
-            }
-            InternalEvent::ScrollToAlacPoint(point) => {
-                trace!("Scrolling to point: point={point:?}");
-                term.scroll_to_point(*point);
-                self.refresh_hovered_word(window);
-            }
-            InternalEvent::MoveViCursorToAlacPoint(point) => {
-                trace!("Move vi cursor to point: point={point:?}");
-                term.vi_goto_point(*point);
-                self.refresh_hovered_word(window);
-            }
-            InternalEvent::ToggleViMode => {
-                trace!("Toggling vi mode");
-                self.vi_mode_enabled = !self.vi_mode_enabled;
-                term.toggle_vi_mode();
-            }
-            InternalEvent::ViMotion(motion) => {
-                trace!("Performing vi motion: motion={motion:?}");
-                term.vi_motion(*motion);
-            }
-            InternalEvent::FindHyperlink(position, open) => {
-                trace!("Finding hyperlink at position: position={position:?}, open={open:?}");
-                let prev_hovered_word = self.last_content.last_hovered_word.take();
-
-                let point = grid_point(
-                    *position,
-                    self.last_content.terminal_bounds,
-                    term.grid().display_offset(),
-                )
-                .grid_clamp(term, Boundary::Grid);
-
-                match terminal_hyperlinks::find_from_grid_point(
-                    term,
-                    point,
-                    &mut self.hyperlink_regex_searches,
-                ) {
-                    Some((maybe_url_or_path, is_url, url_match)) => {
-                        let target = if is_url {
-                            // Treat "file://" URLs like file paths to ensure
-                            // that line numbers at the end of the path are
-                            // handled correctly.
-                            // file://{path} should be urldecoded, returning a urldecoded {path}
-                            if let Some(path) = maybe_url_or_path.strip_prefix("file://") {
-                                let decoded_path = urlencoding::decode(path)
-                                    .map(|decoded| decoded.into_owned())
-                                    .unwrap_or(path.to_owned());
-
-                                MaybeNavigationTarget::PathLike(PathLikeTarget {
-                                    maybe_path: decoded_path,
-                                    terminal_dir: self.working_directory(),
-                                })
-                            } else {
-                                MaybeNavigationTarget::Url(maybe_url_or_path.clone())
-                            }
-                        } else {
-                            MaybeNavigationTarget::PathLike(PathLikeTarget {
-                                maybe_path: maybe_url_or_path.clone(),
-                                terminal_dir: self.working_directory(),
-                            })
-                        };
-                        if *open {
-                            cx.emit(Event::Open(target));
-                        } else {
-                            self.update_selected_word(
-                                prev_hovered_word,
-                                url_match,
-                                maybe_url_or_path,
-                                target,
-                                cx,
-                            );
-                        }
-                    }
-                    None => {
-                        cx.emit(Event::NewNavigationTarget(None));
-                    }
-                }
-            }
-        }
-    }
-
-    fn update_selected_word(
-        &mut self,
-        prev_word: Option<HoveredWord>,
-        word_match: RangeInclusive<AlacPoint>,
-        word: String,
-        navigation_target: MaybeNavigationTarget,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(prev_word) = prev_word
-            && prev_word.word == word
-            && prev_word.word_match == word_match
-        {
-            self.last_content.last_hovered_word = Some(HoveredWord {
-                word,
-                word_match,
-                id: prev_word.id,
-            });
-            return;
-        }
-
-        self.last_content.last_hovered_word = Some(HoveredWord {
-            word,
-            word_match,
-            id: self.next_link_id(),
-        });
-        cx.emit(Event::NewNavigationTarget(Some(navigation_target)));
-        cx.notify()
-    }
-
-    fn next_link_id(&mut self) -> usize {
-        let res = self.next_link_id;
-        self.next_link_id = self.next_link_id.wrapping_add(1);
-        res
-    }
-
-    pub fn last_content(&self) -> &TerminalContent {
-        &self.last_content
-    }
-
-    pub fn set_cursor_shape(&mut self, cursor_shape: CursorShape) {
-        self.term_config.default_cursor_style = cursor_shape.into();
-        self.term.lock().set_options(self.term_config.clone());
-    }
-
-    pub fn write_output(&mut self, bytes: &[u8], cx: &mut Context<Self>) {
-        // Inject bytes directly into the terminal emulator and refresh the UI.
-        // This bypasses the PTY/event loop for display-only terminals.
-        //
-        // We first convert LF to CRLF, to get the expected line wrapping in Alacritty.
-        // When output comes from piped commands (not a PTY) such as codex-acp, and that
-        // output only contains LF (\n) without a CR (\r) after it, such as the output
-        // of the `ls` command when running outside a PTY, Alacritty moves the cursor
-        // cursor down a line but does not move it back to the initial column. This makes
-        // the rendered output look ridiculous. To prevent this, we insert a CR (\r) before
-        // each LF that didn't already have one. (Alacritty doesn't have a setting for this.)
-        let mut converted = Vec::with_capacity(bytes.len());
-        let mut prev_byte = 0u8;
-        for &byte in bytes {
-            if byte == b'\n' && prev_byte != b'\r' {
-                converted.push(b'\r');
-            }
-            converted.push(byte);
-            prev_byte = byte;
-        }
-
-        let mut processor = alacritty_terminal::vte::ansi::Processor::<
-            alacritty_terminal::vte::ansi::StdSyncHandler,
-        >::new();
-        {
-            let mut term = self.term.lock();
-            processor.advance(&mut *term, &converted);
-        }
-        cx.emit(Event::Wakeup);
-    }
-
-    pub fn total_lines(&self) -> usize {
-        self.term.lock_unfair().total_lines()
-    }
-
-    pub fn viewport_lines(&self) -> usize {
-        self.term.lock_unfair().screen_lines()
-    }
-
-    //To test:
-    //- Activate match on terminal (scrolling and selection)
-    //- Editor search snapping behavior
-
-    pub fn activate_match(&mut self, index: usize) {
-        if let Some(search_match) = self.matches.get(index).cloned() {
-            self.set_selection(Some((make_selection(&search_match), *search_match.end())));
-            if self.vi_mode_enabled {
-                self.events
-                    .push_back(InternalEvent::MoveViCursorToAlacPoint(*search_match.end()));
-            } else {
-                self.events
-                    .push_back(InternalEvent::ScrollToAlacPoint(*search_match.start()));
-            }
-        }
-    }
-
-    pub fn select_matches(&mut self, matches: &[RangeInclusive<AlacPoint>]) {
-        let matches_to_select = self
-            .matches
-            .iter()
-            .filter(|self_match| matches.contains(self_match))
-            .cloned()
-            .collect::<Vec<_>>();
-        for match_to_select in matches_to_select {
-            self.set_selection(Some((
-                make_selection(&match_to_select),
-                *match_to_select.end(),
-            )));
-        }
-    }
-
-    pub fn select_all(&mut self) {
-        let term = self.term.lock();
-        let start = AlacPoint::new(term.topmost_line(), Column(0));
-        let end = AlacPoint::new(term.bottommost_line(), term.last_column());
-        drop(term);
-        self.set_selection(Some((make_selection(&(start..=end)), end)));
-    }
-
-    fn set_selection(&mut self, selection: Option<(Selection, AlacPoint)>) {
-        self.events
-            .push_back(InternalEvent::SetSelection(selection));
-    }
-
-    pub fn copy(&mut self, keep_selection: Option<bool>) {
-        self.events.push_back(InternalEvent::Copy(keep_selection));
-    }
-
-    pub fn clear(&mut self) {
-        self.events.push_back(InternalEvent::Clear)
-    }
-
-    pub fn scroll_line_up(&mut self) {
-        self.events
-            .push_back(InternalEvent::Scroll(AlacScroll::Delta(1)));
-    }
-
-    pub fn scroll_up_by(&mut self, lines: usize) {
-        self.events
-            .push_back(InternalEvent::Scroll(AlacScroll::Delta(lines as i32)));
-    }
-
-    pub fn scroll_line_down(&mut self) {
-        self.events
-            .push_back(InternalEvent::Scroll(AlacScroll::Delta(-1)));
-    }
-
-    pub fn scroll_down_by(&mut self, lines: usize) {
-        self.events
-            .push_back(InternalEvent::Scroll(AlacScroll::Delta(-(lines as i32))));
-    }
-
-    pub fn scroll_page_up(&mut self) {
-        self.events
-            .push_back(InternalEvent::Scroll(AlacScroll::PageUp));
-    }
-
-    pub fn scroll_page_down(&mut self) {
-        self.events
-            .push_back(InternalEvent::Scroll(AlacScroll::PageDown));
-    }
-
-    pub fn scroll_to_top(&mut self) {
-        self.events
-            .push_back(InternalEvent::Scroll(AlacScroll::Top));
-    }
-
-    pub fn scroll_to_bottom(&mut self) {
-        self.events
-            .push_back(InternalEvent::Scroll(AlacScroll::Bottom));
-    }
-
-    pub fn scrolled_to_top(&self) -> bool {
-        self.last_content.scrolled_to_top
-    }
-
-    pub fn scrolled_to_bottom(&self) -> bool {
-        self.last_content.scrolled_to_bottom
-    }
-
-    ///Resize the terminal and the PTY.
-    pub fn set_size(&mut self, new_bounds: TerminalBounds) {
-        if self.last_content.terminal_bounds != new_bounds {
-            self.events.push_back(InternalEvent::Resize(new_bounds))
-        }
-    }
-
-    /// Write the Input payload to the PTY, if applicable.
-    /// (This is a no-op for display-only terminals.)
-    fn write_to_pty(&self, input: impl Into<Cow<'static, [u8]>>) {
-        if let TerminalType::Pty { pty_tx, .. } = &self.terminal_type {
-            let input = input.into();
-            if log::log_enabled!(log::Level::Debug) {
-                if let Ok(str) = str::from_utf8(&input) {
-                    log::debug!("Writing to PTY: {:?}", str);
-                } else {
-                    log::debug!("Writing to PTY: {:?}", input);
-                }
-            }
-            pty_tx.notify(input);
-        }
-    }
-
-    pub fn input(&mut self, input: impl Into<Cow<'static, [u8]>>) {
-        self.events
-            .push_back(InternalEvent::Scroll(AlacScroll::Bottom));
-        self.events.push_back(InternalEvent::SetSelection(None));
-
-        self.write_to_pty(input);
-    }
-
-    pub fn toggle_vi_mode(&mut self) {
-        self.events.push_back(InternalEvent::ToggleViMode);
-    }
-
-    pub fn vi_motion(&mut self, keystroke: &Keystroke) {
-        if !self.vi_mode_enabled {
-            return;
-        }
-
-        let key: Cow<'_, str> = if keystroke.modifiers.shift {
-            Cow::Owned(keystroke.key.to_uppercase())
-        } else {
-            Cow::Borrowed(keystroke.key.as_str())
-        };
-
-        let motion: Option<ViMotion> = match key.as_ref() {
-            "h" | "left" => Some(ViMotion::Left),
-            "j" | "down" => Some(ViMotion::Down),
-            "k" | "up" => Some(ViMotion::Up),
-            "l" | "right" => Some(ViMotion::Right),
-            "w" => Some(ViMotion::WordRight),
-            "b" if !keystroke.modifiers.control => Some(ViMotion::WordLeft),
-            "e" => Some(ViMotion::WordRightEnd),
-            "%" => Some(ViMotion::Bracket),
-            "$" => Some(ViMotion::Last),
-            "0" => Some(ViMotion::First),
-            "^" => Some(ViMotion::FirstOccupied),
-            "H" => Some(ViMotion::High),
-            "M" => Some(ViMotion::Middle),
-            "L" => Some(ViMotion::Low),
-            _ => None,
-        };
-
-        if let Some(motion) = motion {
-            let cursor = self.last_content.cursor.point;
-            let cursor_pos = Point {
-                x: cursor.column.0 as f32 * self.last_content.terminal_bounds.cell_width,
-                y: cursor.line.0 as f32 * self.last_content.terminal_bounds.line_height,
-            };
-            self.events
-                .push_back(InternalEvent::UpdateSelection(cursor_pos));
-            self.events.push_back(InternalEvent::ViMotion(motion));
-            return;
-        }
-
-        let scroll_motion = match key.as_ref() {
-            "g" => Some(AlacScroll::Top),
-            "G" => Some(AlacScroll::Bottom),
-            "b" if keystroke.modifiers.control => Some(AlacScroll::PageUp),
-            "f" if keystroke.modifiers.control => Some(AlacScroll::PageDown),
-            "d" if keystroke.modifiers.control => {
-                let amount = self.last_content.terminal_bounds.line_height().to_f64() as i32 / 2;
-                Some(AlacScroll::Delta(-amount))
-            }
-            "u" if keystroke.modifiers.control => {
-                let amount = self.last_content.terminal_bounds.line_height().to_f64() as i32 / 2;
-                Some(AlacScroll::Delta(amount))
-            }
-            _ => None,
-        };
-
-        if let Some(scroll_motion) = scroll_motion {
-            self.events.push_back(InternalEvent::Scroll(scroll_motion));
-            return;
-        }
-
-        match key.as_ref() {
-            "v" => {
-                let point = self.last_content.cursor.point;
-                let selection_type = SelectionType::Simple;
-                let side = AlacDirection::Right;
-                let selection = Selection::new(selection_type, point, side);
-                self.events
-                    .push_back(InternalEvent::SetSelection(Some((selection, point))));
-            }
-
-            "escape" => {
-                self.events.push_back(InternalEvent::SetSelection(None));
-            }
-
-            "y" => {
-                self.copy(Some(false));
-            }
-
-            "i" => {
-                self.scroll_to_bottom();
-                self.toggle_vi_mode();
-            }
-            _ => {}
-        }
-    }
-
-    pub fn try_keystroke(&mut self, keystroke: &Keystroke, option_as_meta: bool) -> bool {
-        if self.vi_mode_enabled {
-            self.vi_motion(keystroke);
-            return true;
-        }
-
-        // Keep default terminal behavior
-        let esc = to_esc_str(keystroke, &self.last_content.mode, option_as_meta);
-        if let Some(esc) = esc {
-            match esc {
-                Cow::Borrowed(string) => self.input(string.as_bytes()),
-                Cow::Owned(string) => self.input(string.into_bytes()),
-            };
-            true
-        } else {
-            false
-        }
-    }
-
-    pub fn try_modifiers_change(
-        &mut self,
-        modifiers: &Modifiers,
-        window: &Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self
-            .last_content
-            .terminal_bounds
-            .bounds
-            .contains(&window.mouse_position())
-            && modifiers.secondary()
-        {
-            self.refresh_hovered_word(window);
-        }
-        cx.notify();
-    }
-
-    ///Paste text into the terminal
-    pub fn paste(&mut self, text: &str) {
-        let paste_text = if self.last_content.mode.contains(TermMode::BRACKETED_PASTE) {
-            format!("{}{}{}", "\x1b[200~", text.replace('\x1b', ""), "\x1b[201~")
-        } else {
-            text.replace("\r\n", "\r").replace('\n', "\r")
-        };
-
-        self.input(paste_text.into_bytes());
-    }
-
-    pub fn sync(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let term = self.term.clone();
-        let mut terminal = term.lock_unfair();
-        //Note that the ordering of events matters for event processing
-        while let Some(e) = self.events.pop_front() {
-            self.process_terminal_event(&e, &mut terminal, window, cx)
-        }
-
-        self.last_content = Self::make_content(&terminal, &self.last_content);
-    }
-
-    fn make_content(term: &Term<ZedListener>, last_content: &TerminalContent) -> TerminalContent {
-        let content = term.renderable_content();
-
-        // Pre-allocate with estimated size to reduce reallocations
-        let estimated_size = content.display_iter.size_hint().0;
-        let mut cells = Vec::with_capacity(estimated_size);
-
-        cells.extend(content.display_iter.map(|ic| IndexedCell {
-            point: ic.point,
-            cell: ic.cell.clone(),
-        }));
-
-        let selection_text = if content.selection.is_some() {
-            term.selection_to_string()
-        } else {
-            None
-        };
-
-        TerminalContent {
-            cells,
-            mode: content.mode,
-            display_offset: content.display_offset,
-            selection_text,
-            selection: content.selection,
-            cursor: content.cursor,
-            cursor_char: term.grid()[content.cursor.point].c,
-            terminal_bounds: last_content.terminal_bounds,
-            last_hovered_word: last_content.last_hovered_word.clone(),
-            scrolled_to_top: content.display_offset == term.history_size(),
-            scrolled_to_bottom: content.display_offset == 0,
-        }
-    }
-
-    pub fn get_content(&self) -> String {
-        let term = self.term.lock_unfair();
-        let start = AlacPoint::new(term.topmost_line(), Column(0));
-        let end = AlacPoint::new(term.bottommost_line(), term.last_column());
-        term.bounds_to_string(start, end)
-    }
-
-    pub fn last_n_non_empty_lines(&self, n: usize) -> Vec<String> {
-        let term = self.term.clone();
-        let terminal = term.lock_unfair();
-        let grid = terminal.grid();
-        let mut lines = Vec::new();
-
-        let mut current_line = grid.bottommost_line().0;
-        let topmost_line = grid.topmost_line().0;
-
-        while current_line >= topmost_line && lines.len() < n {
-            let logical_line_start = self.find_logical_line_start(grid, current_line, topmost_line);
-            let logical_line = self.construct_logical_line(grid, logical_line_start, current_line);
-
-            if let Some(line) = self.process_line(logical_line) {
-                lines.push(line);
-            }
-
-            // Move to the line above the start of the current logical line
-            current_line = logical_line_start - 1;
-        }
-
-        lines.reverse();
-        lines
-    }
-
-    fn find_logical_line_start(&self, grid: &Grid<Cell>, current: i32, topmost: i32) -> i32 {
-        let mut line_start = current;
-        while line_start > topmost {
-            let prev_line = Line(line_start - 1);
-            let last_cell = &grid[prev_line][Column(grid.columns() - 1)];
-            if !last_cell.flags.contains(Flags::WRAPLINE) {
-                break;
-            }
-            line_start -= 1;
-        }
-        line_start
-    }
-
-    fn construct_logical_line(&self, grid: &Grid<Cell>, start: i32, end: i32) -> String {
-        let mut logical_line = String::new();
-        for row in start..=end {
-            let grid_row = &grid[Line(row)];
-            logical_line.push_str(&row_to_string(grid_row));
-        }
-        logical_line
-    }
-
-    fn process_line(&self, line: String) -> Option<String> {
-        let trimmed = line.trim_end().to_string();
-        if !trimmed.is_empty() {
-            Some(trimmed)
-        } else {
-            None
-        }
-    }
-
-    pub fn focus_in(&self) {
-        if self.last_content.mode.contains(TermMode::FOCUS_IN_OUT) {
-            self.write_to_pty("\x1b[I".as_bytes());
-        }
-    }
-
-    pub fn focus_out(&mut self) {
-        if self.last_content.mode.contains(TermMode::FOCUS_IN_OUT) {
-            self.write_to_pty("\x1b[O".as_bytes());
-        }
-    }
-
-    pub fn mouse_changed(&mut self, point: AlacPoint, side: AlacDirection) -> bool {
-        match self.last_mouse {
-            Some((old_point, old_side)) => {
-                if old_point == point && old_side == side {
-                    false
-                } else {
-                    self.last_mouse = Some((point, side));
-                    true
-                }
-            }
-            None => {
-                self.last_mouse = Some((point, side));
-                true
-            }
-        }
-    }
-
-    pub fn mouse_mode(&self, shift: bool) -> bool {
-        self.last_content.mode.intersects(TermMode::MOUSE_MODE) && !shift
-    }
-
-    pub fn mouse_move(&mut self, e: &MouseMoveEvent, cx: &mut Context<Self>) {
-        let position = e.position - self.last_content.terminal_bounds.bounds.origin;
-        if self.mouse_mode(e.modifiers.shift) {
-            let (point, side) = grid_point_and_side(
-                position,
-                self.last_content.terminal_bounds,
-                self.last_content.display_offset,
-            );
-
-            if self.mouse_changed(point, side)
-                && let Some(bytes) =
-                    mouse_moved_report(point, e.pressed_button, e.modifiers, self.last_content.mode)
-            {
-                self.write_to_pty(bytes);
-            }
-        } else if e.modifiers.secondary() {
-            self.word_from_position(e.position);
-        }
-        cx.notify();
-    }
-
-    fn word_from_position(&mut self, position: Point<Pixels>) {
-        if self.selection_phase == SelectionPhase::Selecting {
-            self.last_content.last_hovered_word = None;
-        } else if self.last_content.terminal_bounds.bounds.contains(&position) {
-            // Throttle hyperlink searches to avoid excessive processing
-            let now = Instant::now();
-            let should_search = if let Some(last_pos) = self.last_hyperlink_search_position {
-                // Only search if mouse moved significantly or enough time passed
-                let distance_moved =
-                    ((position.x - last_pos.x).abs() + (position.y - last_pos.y).abs()) > px(5.0);
-                let time_elapsed = now.duration_since(self.last_mouse_move_time).as_millis() > 100;
-                distance_moved || time_elapsed
-            } else {
-                true
-            };
-
-            if should_search {
-                self.last_mouse_move_time = now;
-                self.last_hyperlink_search_position = Some(position);
-                self.events.push_back(InternalEvent::FindHyperlink(
-                    position - self.last_content.terminal_bounds.bounds.origin,
-                    false,
-                ));
-            }
-        } else {
-            self.last_content.last_hovered_word = None;
-        }
-    }
-
-    pub fn select_word_at_event_position(&mut self, e: &MouseDownEvent) {
-        let position = e.position - self.last_content.terminal_bounds.bounds.origin;
-        let (point, side) = grid_point_and_side(
-            position,
-            self.last_content.terminal_bounds,
-            self.last_content.display_offset,
-        );
-        let selection = Selection::new(SelectionType::Semantic, point, side);
-        self.events
-            .push_back(InternalEvent::SetSelection(Some((selection, point))));
-    }
-
-    pub fn mouse_drag(
-        &mut self,
-        e: &MouseMoveEvent,
-        region: Bounds<Pixels>,
-        cx: &mut Context<Self>,
-    ) {
-        let position = e.position - self.last_content.terminal_bounds.bounds.origin;
-        if !self.mouse_mode(e.modifiers.shift) {
-            self.selection_phase = SelectionPhase::Selecting;
-            // Alacritty has the same ordering, of first updating the selection
-            // then scrolling 15ms later
-            self.events
-                .push_back(InternalEvent::UpdateSelection(position));
-
-            // Doesn't make sense to scroll the alt screen
-            if !self.last_content.mode.contains(TermMode::ALT_SCREEN) {
-                let scroll_lines = match self.drag_line_delta(e, region) {
-                    Some(value) => value,
-                    None => return,
-                };
-
-                self.events
-                    .push_back(InternalEvent::Scroll(AlacScroll::Delta(scroll_lines)));
-            }
-
-            cx.notify();
-        }
-    }
-
-    fn drag_line_delta(&self, e: &MouseMoveEvent, region: Bounds<Pixels>) -> Option<i32> {
-        let top = region.origin.y;
-        let bottom = region.bottom_left().y;
-
-        let scroll_lines = if e.position.y < top {
-            let scroll_delta = (top - e.position.y).pow(1.1);
-            (scroll_delta / self.last_content.terminal_bounds.line_height).ceil() as i32
-        } else if e.position.y > bottom {
-            let scroll_delta = -((e.position.y - bottom).pow(1.1));
-            (scroll_delta / self.last_content.terminal_bounds.line_height).floor() as i32
-        } else {
-            return None;
-        };
-
-        Some(scroll_lines.clamp(-3, 3))
-    }
-
-    pub fn mouse_down(&mut self, e: &MouseDownEvent, _cx: &mut Context<Self>) {
-        let position = e.position - self.last_content.terminal_bounds.bounds.origin;
-        let point = grid_point(
-            position,
-            self.last_content.terminal_bounds,
-            self.last_content.display_offset,
-        );
-
-        if self.mouse_mode(e.modifiers.shift) {
-            if let Some(bytes) =
-                mouse_button_report(point, e.button, e.modifiers, true, self.last_content.mode)
-            {
-                self.write_to_pty(bytes);
-            }
-        } else {
-            match e.button {
-                MouseButton::Left => {
-                    let (point, side) = grid_point_and_side(
-                        position,
-                        self.last_content.terminal_bounds,
-                        self.last_content.display_offset,
-                    );
-
-                    let selection_type = match e.click_count {
-                        0 => return, //This is a release
-                        1 => Some(SelectionType::Simple),
-                        2 => Some(SelectionType::Semantic),
-                        3 => Some(SelectionType::Lines),
-                        _ => None,
-                    };
-
-                    if selection_type == Some(SelectionType::Simple) && e.modifiers.shift {
-                        self.events
-                            .push_back(InternalEvent::UpdateSelection(position));
-                        return;
-                    }
-
-                    let selection = selection_type
-                        .map(|selection_type| Selection::new(selection_type, point, side));
-
-                    if let Some(sel) = selection {
-                        self.events
-                            .push_back(InternalEvent::SetSelection(Some((sel, point))));
-                    }
-                }
-                #[cfg(any(target_os = "linux", target_os = "freebsd"))]
-                MouseButton::Middle => {
-                    if let Some(item) = _cx.read_from_primary() {
-                        let text = item.text().unwrap_or_default();
-                        self.input(text.into_bytes());
-                    }
-                }
-                _ => {}
-            }
-        }
-    }
-
-    pub fn mouse_up(&mut self, e: &MouseUpEvent, cx: &Context<Self>) {
-        let setting = TerminalSettings::get_global(cx);
-
-        let position = e.position - self.last_content.terminal_bounds.bounds.origin;
-        if self.mouse_mode(e.modifiers.shift) {
-            let point = grid_point(
-                position,
-                self.last_content.terminal_bounds,
-                self.last_content.display_offset,
-            );
-
-            if let Some(bytes) =
-                mouse_button_report(point, e.button, e.modifiers, false, self.last_content.mode)
-            {
-                self.write_to_pty(bytes);
-            }
-        } else {
-            if e.button == MouseButton::Left && setting.copy_on_select {
-                self.copy(Some(true));
-            }
-
-            //Hyperlinks
-            if self.selection_phase == SelectionPhase::Ended {
-                let mouse_cell_index =
-                    content_index_for_mouse(position, &self.last_content.terminal_bounds);
-                if let Some(link) = self.last_content.cells[mouse_cell_index].hyperlink() {
-                    cx.open_url(link.uri());
-                } else if e.modifiers.secondary() {
-                    self.events
-                        .push_back(InternalEvent::FindHyperlink(position, true));
-                }
-            }
-        }
-
-        self.selection_phase = SelectionPhase::Ended;
-        self.last_mouse = None;
-    }
-
-    ///Scroll the terminal
-    pub fn scroll_wheel(&mut self, e: &ScrollWheelEvent, scroll_multiplier: f32) {
-        let mouse_mode = self.mouse_mode(e.shift);
-        let scroll_multiplier = if mouse_mode { 1. } else { scroll_multiplier };
-
-        if let Some(scroll_lines) = self.determine_scroll_lines(e, scroll_multiplier) {
-            if mouse_mode {
-                let point = grid_point(
-                    e.position - self.last_content.terminal_bounds.bounds.origin,
-                    self.last_content.terminal_bounds,
-                    self.last_content.display_offset,
-                );
-
-                if let Some(scrolls) = scroll_report(point, scroll_lines, e, self.last_content.mode)
-                {
-                    for scroll in scrolls {
-                        self.write_to_pty(scroll);
-                    }
-                };
-            } else if self
-                .last_content
-                .mode
-                .contains(TermMode::ALT_SCREEN | TermMode::ALTERNATE_SCROLL)
-                && !e.shift
-            {
-                self.write_to_pty(alt_scroll(scroll_lines));
-            } else if scroll_lines != 0 {
-                let scroll = AlacScroll::Delta(scroll_lines);
-
-                self.events.push_back(InternalEvent::Scroll(scroll));
-            }
-        }
-    }
-
-    fn refresh_hovered_word(&mut self, window: &Window) {
-        self.word_from_position(window.mouse_position());
-    }
-
-    fn determine_scroll_lines(
-        &mut self,
-        e: &ScrollWheelEvent,
-        scroll_multiplier: f32,
-    ) -> Option<i32> {
-        let line_height = self.last_content.terminal_bounds.line_height;
-        match e.touch_phase {
-            /* Reset scroll state on started */
-            TouchPhase::Started => {
-                self.scroll_px = px(0.);
-                None
-            }
-            /* Calculate the appropriate scroll lines */
-            TouchPhase::Moved => {
-                let old_offset = (self.scroll_px / line_height) as i32;
-
-                self.scroll_px += e.delta.pixel_delta(line_height).y * scroll_multiplier;
-
-                let new_offset = (self.scroll_px / line_height) as i32;
-
-                // Whenever we hit the edges, reset our stored scroll to 0
-                // so we can respond to changes in direction quickly
-                self.scroll_px %= self.last_content.terminal_bounds.height();
-
-                Some(new_offset - old_offset)
-            }
-            TouchPhase::Ended => None,
-        }
-    }
-
-    pub fn find_matches(
-        &self,
-        mut searcher: RegexSearch,
-        cx: &Context<Self>,
-    ) -> Task<Vec<RangeInclusive<AlacPoint>>> {
-        let term = self.term.clone();
-        cx.background_spawn(async move {
-            let term = term.lock();
-
-            all_search_matches(&term, &mut searcher).collect()
-        })
-    }
-
-    pub fn working_directory(&self) -> Option<PathBuf> {
-        if self.is_remote_terminal {
-            // We can't yet reliably detect the working directory of a shell on the
-            // SSH host. Until we can do that, it doesn't make sense to display
-            // the working directory on the client and persist that.
-            None
-        } else {
-            self.client_side_working_directory()
-        }
-    }
-
-    /// Returns the working directory of the process that's connected to the PTY.
-    /// That means it returns the working directory of the local shell or program
-    /// that's running inside the terminal.
-    ///
-    /// This does *not* return the working directory of the shell that runs on the
-    /// remote host, in case Zed is connected to a remote host.
-    fn client_side_working_directory(&self) -> Option<PathBuf> {
-        match &self.terminal_type {
-            TerminalType::Pty { info, .. } => {
-                info.current.as_ref().map(|process| process.cwd.clone())
-            }
-            TerminalType::DisplayOnly => None,
-        }
-    }
-
-    pub fn title(&self, truncate: bool) -> String {
-        const MAX_CHARS: usize = 25;
-        match &self.task {
-            Some(task_state) => {
-                if truncate {
-                    truncate_and_trailoff(&task_state.spawned_task.label, MAX_CHARS)
-                } else {
-                    task_state.spawned_task.full_label.clone()
-                }
-            }
-            None => self
-                .title_override
-                .as_ref()
-                .map(|title_override| title_override.to_string())
-                .unwrap_or_else(|| match &self.terminal_type {
-                    TerminalType::Pty { info, .. } => info
-                        .current
-                        .as_ref()
-                        .map(|fpi| {
-                            let process_file = fpi
-                                .cwd
-                                .file_name()
-                                .map(|name| name.to_string_lossy().into_owned())
-                                .unwrap_or_default();
-
-                            let argv = fpi.argv.as_slice();
-                            let process_name = format!(
-                                "{}{}",
-                                fpi.name,
-                                if !argv.is_empty() {
-                                    format!(" {}", (argv[1..]).join(" "))
-                                } else {
-                                    "".to_string()
-                                }
-                            );
-                            let (process_file, process_name) = if truncate {
-                                (
-                                    truncate_and_trailoff(&process_file, MAX_CHARS),
-                                    truncate_and_trailoff(&process_name, MAX_CHARS),
-                                )
-                            } else {
-                                (process_file, process_name)
-                            };
-                            format!("{process_file} — {process_name}")
-                        })
-                        .unwrap_or_else(|| "Terminal".to_string()),
-                    TerminalType::DisplayOnly => "Terminal".to_string(),
-                }),
-        }
-    }
-
-    pub fn kill_active_task(&mut self) {
-        if let Some(task) = self.task()
-            && task.status == TaskStatus::Running
-        {
-            if let TerminalType::Pty { info, .. } = &mut self.terminal_type {
-                info.kill_current_process();
-            }
-        }
-    }
-
-    pub fn pid(&self) -> Option<sysinfo::Pid> {
-        match &self.terminal_type {
-            TerminalType::Pty { info, .. } => info.pid(),
-            TerminalType::DisplayOnly => None,
-        }
-    }
-
-    pub fn pid_getter(&self) -> Option<&ProcessIdGetter> {
-        match &self.terminal_type {
-            TerminalType::Pty { info, .. } => Some(info.pid_getter()),
-            TerminalType::DisplayOnly => None,
-        }
-    }
-
-    pub fn task(&self) -> Option<&TaskState> {
-        self.task.as_ref()
-    }
-
-    pub fn wait_for_completed_task(&self, cx: &App) -> Task<Option<ExitStatus>> {
-        if let Some(task) = self.task() {
-            if task.status == TaskStatus::Running {
-                let completion_receiver = task.completion_rx.clone();
-                return cx.spawn(async move |_| completion_receiver.recv().await.ok().flatten());
-            } else if let Ok(status) = task.completion_rx.try_recv() {
-                return Task::ready(status);
-            }
-        }
-        Task::ready(None)
-    }
-
-    fn register_task_finished(&mut self, error_code: Option<i32>, cx: &mut Context<Terminal>) {
-        let e: Option<ExitStatus> = error_code.map(|code| {
-            #[cfg(unix)]
-            {
-                std::os::unix::process::ExitStatusExt::from_raw(code)
-            }
-            #[cfg(windows)]
-            {
-                std::os::windows::process::ExitStatusExt::from_raw(code as u32)
-            }
-        });
-
-        if let Some(tx) = &self.completion_tx {
-            tx.try_send(e).ok();
-        }
-        if let Some(e) = e {
-            self.child_exited = Some(e);
-        }
-        let task = match &mut self.task {
-            Some(task) => task,
-            None => {
-                if self.child_exited.is_none_or(|e| e.code() == Some(0)) {
-                    cx.emit(Event::CloseTerminal);
-                }
-                return;
-            }
-        };
-        if task.status != TaskStatus::Running {
-            return;
-        }
-        match error_code {
-            Some(error_code) => {
-                task.status.register_task_exit(error_code);
-            }
-            None => {
-                task.status.register_terminal_exit();
-            }
-        };
-
-        let (finished_successfully, task_line, command_line) = task_summary(task, error_code);
-        let mut lines_to_show = Vec::new();
-        if task.spawned_task.show_summary {
-            lines_to_show.push(task_line.as_str());
-        }
-        if task.spawned_task.show_command {
-            lines_to_show.push(command_line.as_str());
-        }
-
-        if !lines_to_show.is_empty() {
-            // SAFETY: the invocation happens on non `TaskStatus::Running` tasks, once,
-            // after either `AlacTermEvent::Exit` or `AlacTermEvent::ChildExit` events that are spawned
-            // when Zed task finishes and no more output is made.
-            // After the task summary is output once, no more text is appended to the terminal.
-            unsafe { append_text_to_term(&mut self.term.lock(), &lines_to_show) };
-        }
-
-        match task.spawned_task.hide {
-            HideStrategy::Never => {}
-            HideStrategy::Always => {
-                cx.emit(Event::CloseTerminal);
-            }
-            HideStrategy::OnSuccess => {
-                if finished_successfully {
-                    cx.emit(Event::CloseTerminal);
-                }
-            }
-        }
-    }
-
-    pub fn vi_mode_enabled(&self) -> bool {
-        self.vi_mode_enabled
-    }
-
-    pub fn clone_builder(&self, cx: &App, cwd: Option<PathBuf>) -> Task<Result<TerminalBuilder>> {
-        let working_directory = self.working_directory().or_else(|| cwd);
-        TerminalBuilder::new(
-            working_directory,
-            None,
-            self.template.shell.clone(),
-            self.template.env.clone(),
-            self.template.cursor_shape,
-            self.template.alternate_scroll,
-            self.template.max_scroll_history_lines,
-            self.template.path_hyperlink_regexes.clone(),
-            self.template.path_hyperlink_timeout_ms,
-            self.is_remote_terminal,
-            self.template.window_id,
-            None,
-            cx,
-            self.activation_script.clone(),
-        )
-    }
-}
-
-// Helper function to convert a grid row to a string
-pub fn row_to_string(row: &Row<Cell>) -> String {
-    row[..Column(row.len())]
-        .iter()
-        .map(|cell| cell.c)
-        .collect::<String>()
-}
-
-const TASK_DELIMITER: &str = "⏵ ";
-fn task_summary(task: &TaskState, error_code: Option<i32>) -> (bool, String, String) {
-    let escaped_full_label = task
-        .spawned_task
-        .full_label
-        .replace("\r\n", "\r")
-        .replace('\n', "\r");
-    let success = error_code == Some(0);
-    let task_line = match error_code {
-        Some(0) => format!("{TASK_DELIMITER}Task `{escaped_full_label}` finished successfully"),
-        Some(error_code) => format!(
-            "{TASK_DELIMITER}Task `{escaped_full_label}` finished with non-zero error code: {error_code}"
-        ),
-        None => format!("{TASK_DELIMITER}Task `{escaped_full_label}` finished"),
-    };
-    let escaped_command_label = task
-        .spawned_task
-        .command_label
-        .replace("\r\n", "\r")
-        .replace('\n', "\r");
-    let command_line = format!("{TASK_DELIMITER}Command: {escaped_command_label}");
-    (success, task_line, command_line)
-}
-
-/// Appends a stringified task summary to the terminal, after its output.
-///
-/// SAFETY: This function should only be called after terminal's PTY is no longer alive.
-/// New text being added to the terminal here, uses "less public" APIs,
-/// which are not maintaining the entire terminal state intact.
-///
-///
-/// The library
-///
-/// * does not increment inner grid cursor's _lines_ on `input` calls
-///   (but displaying the lines correctly and incrementing cursor's columns)
-///
-/// * ignores `\n` and \r` character input, requiring the `newline` call instead
-///
-/// * does not alter grid state after `newline` call
-///   so its `bottommost_line` is always the same additions, and
-///   the cursor's `point` is not updated to the new line and column values
-///
-/// * ??? there could be more consequences, and any further "proper" streaming from the PTY might bug and/or panic.
-///   Still, subsequent `append_text_to_term` invocations are possible and display the contents correctly.
-///
-/// Despite the quirks, this is the simplest approach to appending text to the terminal: its alternative, `grid_mut` manipulations,
-/// do not properly set the scrolling state and display odd text after appending; also those manipulations are more tedious and error-prone.
-/// The function achieves proper display and scrolling capabilities, at a cost of grid state not properly synchronized.
-/// This is enough for printing moderately-sized texts like task summaries, but might break or perform poorly for larger texts.
-unsafe fn append_text_to_term(term: &mut Term<ZedListener>, text_lines: &[&str]) {
-    term.newline();
-    term.grid_mut().cursor.point.column = Column(0);
-    for line in text_lines {
-        for c in line.chars() {
-            term.input(c);
-        }
-        term.newline();
-        term.grid_mut().cursor.point.column = Column(0);
-    }
-}
-
-impl Drop for Terminal {
-    fn drop(&mut self) {
-        if let TerminalType::Pty { pty_tx, info } = &mut self.terminal_type {
-            info.kill_child_process();
-            pty_tx.0.send(Msg::Shutdown).ok();
-        }
-    }
-}
-
-impl EventEmitter<Event> for Terminal {}
-
-fn make_selection(range: &RangeInclusive<AlacPoint>) -> Selection {
-    let mut selection = Selection::new(SelectionType::Simple, *range.start(), AlacDirection::Left);
-    selection.update(*range.end(), AlacDirection::Right);
-    selection
-}
-
-fn all_search_matches<'a, T>(
-    term: &'a Term<T>,
-    regex: &'a mut RegexSearch,
-) -> impl Iterator<Item = Match> + 'a {
-    let start = AlacPoint::new(term.grid().topmost_line(), Column(0));
-    let end = AlacPoint::new(term.grid().bottommost_line(), term.grid().last_column());
-    RegexIter::new(start, end, AlacDirection::Right, term, regex)
-}
-
-fn content_index_for_mouse(pos: Point<Pixels>, terminal_bounds: &TerminalBounds) -> usize {
-    let col = (pos.x / terminal_bounds.cell_width()).round() as usize;
-    let clamped_col = min(col, terminal_bounds.columns() - 1);
-    let row = (pos.y / terminal_bounds.line_height()).round() as usize;
-    let clamped_row = min(row, terminal_bounds.screen_lines() - 1);
-    clamped_row * terminal_bounds.columns() + clamped_col
-}
-
-/// Converts an 8 bit ANSI color to its GPUI equivalent.
-/// Accepts `usize` for compatibility with the `alacritty::Colors` interface,
-/// Other than that use case, should only be called with values in the `[0,255]` range
-pub fn get_color_at_index(index: usize, theme: &Theme) -> Hsla {
-    let colors = theme.colors();
-
-    match index {
-        // 0-15 are the same as the named colors above
-        0 => colors.terminal_ansi_black,
-        1 => colors.terminal_ansi_red,
-        2 => colors.terminal_ansi_green,
-        3 => colors.terminal_ansi_yellow,
-        4 => colors.terminal_ansi_blue,
-        5 => colors.terminal_ansi_magenta,
-        6 => colors.terminal_ansi_cyan,
-        7 => colors.terminal_ansi_white,
-        8 => colors.terminal_ansi_bright_black,
-        9 => colors.terminal_ansi_bright_red,
-        10 => colors.terminal_ansi_bright_green,
-        11 => colors.terminal_ansi_bright_yellow,
-        12 => colors.terminal_ansi_bright_blue,
-        13 => colors.terminal_ansi_bright_magenta,
-        14 => colors.terminal_ansi_bright_cyan,
-        15 => colors.terminal_ansi_bright_white,
-        // 16-231 are a 6x6x6 RGB color cube, mapped to 0-255 using steps defined by XTerm.
-        // See: https://github.com/xterm-x11/xterm-snapshots/blob/master/256colres.pl
-        16..=231 => {
-            let (r, g, b) = rgb_for_index(index as u8);
-            rgba_color(
-                if r == 0 { 0 } else { r * 40 + 55 },
-                if g == 0 { 0 } else { g * 40 + 55 },
-                if b == 0 { 0 } else { b * 40 + 55 },
-            )
-        }
-        // 232-255 are a 24-step grayscale ramp from (8, 8, 8) to (238, 238, 238).
-        232..=255 => {
-            let i = index as u8 - 232; // Align index to 0..24
-            let value = i * 10 + 8;
-            rgba_color(value, value, value)
-        }
-        // For compatibility with the alacritty::Colors interface
-        // See: https://github.com/alacritty/alacritty/blob/master/alacritty_terminal/src/term/color.rs
-        256 => colors.terminal_foreground,
-        257 => colors.terminal_background,
-        258 => theme.players().local().cursor,
-        259 => colors.terminal_ansi_dim_black,
-        260 => colors.terminal_ansi_dim_red,
-        261 => colors.terminal_ansi_dim_green,
-        262 => colors.terminal_ansi_dim_yellow,
-        263 => colors.terminal_ansi_dim_blue,
-        264 => colors.terminal_ansi_dim_magenta,
-        265 => colors.terminal_ansi_dim_cyan,
-        266 => colors.terminal_ansi_dim_white,
-        267 => colors.terminal_bright_foreground,
-        268 => colors.terminal_ansi_black, // 'Dim Background', non-standard color
-
-        _ => black(),
-    }
-}
-
-/// Generates the RGB channels in [0, 5] for a given index into the 6x6x6 ANSI color cube.
-///
-/// See: [8 bit ANSI color](https://en.wikipedia.org/wiki/ANSI_escape_code#8-bit).
-///
-/// Wikipedia gives a formula for calculating the index for a given color:
-///
-/// ```text
-/// index = 16 + 36 × r + 6 × g + b (0 ≤ r, g, b ≤ 5)
-/// ```
-///
-/// This function does the reverse, calculating the `r`, `g`, and `b` components from a given index.
-fn rgb_for_index(i: u8) -> (u8, u8, u8) {
-    debug_assert!((16..=231).contains(&i));
-    let i = i - 16;
-    let r = (i - (i % 36)) / 36;
-    let g = ((i % 36) - (i % 6)) / 6;
-    let b = (i % 36) % 6;
-    (r, g, b)
-}
-
-pub fn rgba_color(r: u8, g: u8, b: u8) -> Hsla {
-    Rgba {
-        r: (r as f32 / 255.),
-        g: (g as f32 / 255.),
-        b: (b as f32 / 255.),
-        a: 1.,
-    }
-    .into()
-}
-
-#[cfg(test)]
-mod tests {
-    use std::time::Duration;
-
-    use super::*;
-    use crate::{
-        IndexedCell, TerminalBounds, TerminalBuilder, TerminalContent, content_index_for_mouse,
-        rgb_for_index,
-    };
-    use alacritty_terminal::{
-        index::{Column, Line, Point as AlacPoint},
-        term::cell::Cell,
-    };
-    use collections::HashMap;
-    use gpui::{Pixels, Point, TestAppContext, bounds, point, size, smol_timeout};
-    use rand::{Rng, distr, rngs::ThreadRng};
-    use task::ShellBuilder;
-
-    #[gpui::test]
-    async fn test_basic_terminal(cx: &mut TestAppContext) {
-        cx.executor().allow_parking();
-
-        let (completion_tx, completion_rx) = smol::channel::unbounded();
-        let (program, args) = ShellBuilder::new(&Shell::System, false)
-            .build(Some("echo".to_owned()), &["hello".to_owned()]);
-        let builder = cx
-            .update(|cx| {
-                TerminalBuilder::new(
-                    None,
-                    None,
-                    task::Shell::WithArguments {
-                        program,
-                        args,
-                        title_override: None,
-                    },
-                    HashMap::default(),
-                    CursorShape::default(),
-                    AlternateScroll::On,
-                    None,
-                    vec![],
-                    0,
-                    false,
-                    0,
-                    Some(completion_tx),
-                    cx,
-                    vec![],
-                )
-            })
-            .await
-            .unwrap();
-        let terminal = cx.new(|cx| builder.subscribe(cx));
-        assert_eq!(
-            completion_rx.recv().await.unwrap(),
-            Some(ExitStatus::default())
-        );
-        assert_eq!(
-            terminal.update(cx, |term, _| term.get_content()).trim(),
-            "hello"
-        );
-
-        // Inject additional output directly into the emulator (display-only path)
-        terminal.update(cx, |term, cx| {
-            term.write_output(b"\nfrom_injection", cx);
-        });
-
-        let content_after = terminal.update(cx, |term, _| term.get_content());
-        assert!(
-            content_after.contains("from_injection"),
-            "expected injected output to appear, got: {content_after}"
-        );
-    }
-
-    // TODO should be tested on Linux too, but does not work there well
-    #[cfg(target_os = "macos")]
-    #[gpui::test(iterations = 10)]
-    async fn test_terminal_eof(cx: &mut TestAppContext) {
-        cx.executor().allow_parking();
-
-        let (completion_tx, completion_rx) = smol::channel::unbounded();
-        let builder = cx
-            .update(|cx| {
-                TerminalBuilder::new(
-                    None,
-                    None,
-                    task::Shell::System,
-                    HashMap::default(),
-                    CursorShape::default(),
-                    AlternateScroll::On,
-                    None,
-                    vec![],
-                    0,
-                    false,
-                    0,
-                    Some(completion_tx),
-                    cx,
-                    Vec::new(),
-                )
-            })
-            .await
-            .unwrap();
-        // Build an empty command, which will result in a tty shell spawned.
-        let terminal = cx.new(|cx| builder.subscribe(cx));
-
-        let (event_tx, event_rx) = smol::channel::unbounded::<Event>();
-        cx.update(|cx| {
-            cx.subscribe(&terminal, move |_, e, _| {
-                event_tx.send_blocking(e.clone()).unwrap();
-            })
-        })
-        .detach();
-        cx.background_spawn(async move {
-            assert_eq!(
-                completion_rx.recv().await.unwrap(),
-                Some(ExitStatus::default()),
-                "EOF should result in the tty shell exiting successfully",
-            );
-        })
-        .detach();
-
-        let first_event = event_rx.recv().await.expect("No wakeup event received");
-
-        terminal.update(cx, |terminal, _| {
-            let success = terminal.try_keystroke(&Keystroke::parse("ctrl-c").unwrap(), false);
-            assert!(success, "Should have registered ctrl-c sequence");
-        });
-        terminal.update(cx, |terminal, _| {
-            let success = terminal.try_keystroke(&Keystroke::parse("ctrl-d").unwrap(), false);
-            assert!(success, "Should have registered ctrl-d sequence");
-        });
-
-        let mut all_events = vec![first_event];
-        while let Ok(Ok(new_event)) = smol_timeout(Duration::from_secs(1), event_rx.recv()).await {
-            all_events.push(new_event.clone());
-            if new_event == Event::CloseTerminal {
-                break;
-            }
-        }
-        assert!(
-            all_events.contains(&Event::CloseTerminal),
-            "EOF command sequence should have triggered a TTY terminal exit, but got events: {all_events:?}",
-        );
-    }
-
-    #[gpui::test(iterations = 10)]
-    async fn test_terminal_no_exit_on_spawn_failure(cx: &mut TestAppContext) {
-        cx.executor().allow_parking();
-
-        let (completion_tx, completion_rx) = smol::channel::unbounded();
-        let (program, args) = ShellBuilder::new(&Shell::System, false)
-            .build(Some("asdasdasdasd".to_owned()), &["@@@@@".to_owned()]);
-        let builder = cx
-            .update(|cx| {
-                TerminalBuilder::new(
-                    None,
-                    None,
-                    task::Shell::WithArguments {
-                        program,
-                        args,
-                        title_override: None,
-                    },
-                    HashMap::default(),
-                    CursorShape::default(),
-                    AlternateScroll::On,
-                    None,
-                    Vec::new(),
-                    0,
-                    false,
-                    0,
-                    Some(completion_tx),
-                    cx,
-                    Vec::new(),
-                )
-            })
-            .await
-            .unwrap();
-        let terminal = cx.new(|cx| builder.subscribe(cx));
-
-        let (event_tx, event_rx) = smol::channel::unbounded::<Event>();
-        cx.update(|cx| {
-            cx.subscribe(&terminal, move |_, e, _| {
-                event_tx.send_blocking(e.clone()).unwrap();
-            })
-        })
-        .detach();
-        cx.background_spawn(async move {
-            #[cfg(target_os = "windows")]
-            {
-                let exit_status = completion_rx.recv().await.ok().flatten();
-                if let Some(exit_status) = exit_status {
-                    assert!(
-                        !exit_status.success(),
-                        "Wrong shell command should result in a failure"
-                    );
-                    assert_eq!(exit_status.code(), Some(1));
-                }
-            }
-            #[cfg(not(target_os = "windows"))]
-            {
-                let exit_status = completion_rx.recv().await.unwrap().unwrap();
-                assert!(
-                    !exit_status.success(),
-                    "Wrong shell command should result in a failure"
-                );
-                assert_eq!(exit_status.code(), None);
-            }
-        })
-        .detach();
-
-        let mut all_events = Vec::new();
-        while let Ok(Ok(new_event)) =
-            smol_timeout(Duration::from_millis(500), event_rx.recv()).await
-        {
-            all_events.push(new_event.clone());
-        }
-
-        assert!(
-            !all_events
-                .iter()
-                .any(|event| event == &Event::CloseTerminal),
-            "Wrong shell command should update the title but not should not close the terminal to show the error message, but got events: {all_events:?}",
-        );
-    }
-
-    #[test]
-    fn test_rgb_for_index() {
-        // Test every possible value in the color cube.
-        for i in 16..=231 {
-            let (r, g, b) = rgb_for_index(i);
-            assert_eq!(i, 16 + 36 * r + 6 * g + b);
-        }
-    }
-
-    #[test]
-    fn test_mouse_to_cell_test() {
-        let mut rng = rand::rng();
-        const ITERATIONS: usize = 10;
-        const PRECISION: usize = 1000;
-
-        for _ in 0..ITERATIONS {
-            let viewport_cells = rng.random_range(15..20);
-            let cell_size =
-                rng.random_range(5 * PRECISION..20 * PRECISION) as f32 / PRECISION as f32;
-
-            let size = crate::TerminalBounds {
-                cell_width: Pixels::from(cell_size),
-                line_height: Pixels::from(cell_size),
-                bounds: bounds(
-                    Point::default(),
-                    size(
-                        Pixels::from(cell_size * (viewport_cells as f32)),
-                        Pixels::from(cell_size * (viewport_cells as f32)),
-                    ),
-                ),
-            };
-
-            let cells = get_cells(size, &mut rng);
-            let content = convert_cells_to_content(size, &cells);
-
-            for row in 0..(viewport_cells - 1) {
-                let row = row as usize;
-                for col in 0..(viewport_cells - 1) {
-                    let col = col as usize;
-
-                    let row_offset = rng.random_range(0..PRECISION) as f32 / PRECISION as f32;
-                    let col_offset = rng.random_range(0..PRECISION) as f32 / PRECISION as f32;
-
-                    let mouse_pos = point(
-                        Pixels::from(col as f32 * cell_size + col_offset),
-                        Pixels::from(row as f32 * cell_size + row_offset),
-                    );
-
-                    let content_index =
-                        content_index_for_mouse(mouse_pos, &content.terminal_bounds);
-                    let mouse_cell = content.cells[content_index].c;
-                    let real_cell = cells[row][col];
-
-                    assert_eq!(mouse_cell, real_cell);
-                }
-            }
-        }
-    }
-
-    #[test]
-    fn test_mouse_to_cell_clamp() {
-        let mut rng = rand::rng();
-
-        let size = crate::TerminalBounds {
-            cell_width: Pixels::from(10.),
-            line_height: Pixels::from(10.),
-            bounds: bounds(
-                Point::default(),
-                size(Pixels::from(100.), Pixels::from(100.)),
-            ),
-        };
-
-        let cells = get_cells(size, &mut rng);
-        let content = convert_cells_to_content(size, &cells);
-
-        assert_eq!(
-            content.cells[content_index_for_mouse(
-                point(Pixels::from(-10.), Pixels::from(-10.)),
-                &content.terminal_bounds,
-            )]
-            .c,
-            cells[0][0]
-        );
-        assert_eq!(
-            content.cells[content_index_for_mouse(
-                point(Pixels::from(1000.), Pixels::from(1000.)),
-                &content.terminal_bounds,
-            )]
-            .c,
-            cells[9][9]
-        );
-    }
-
-    fn get_cells(size: TerminalBounds, rng: &mut ThreadRng) -> Vec<Vec<char>> {
-        let mut cells = Vec::new();
-
-        for _ in 0..((size.height() / size.line_height()) as usize) {
-            let mut row_vec = Vec::new();
-            for _ in 0..((size.width() / size.cell_width()) as usize) {
-                let cell_char = rng.sample(distr::Alphanumeric) as char;
-                row_vec.push(cell_char)
-            }
-            cells.push(row_vec)
-        }
-
-        cells
-    }
-
-    fn convert_cells_to_content(
-        terminal_bounds: TerminalBounds,
-        cells: &[Vec<char>],
-    ) -> TerminalContent {
-        let mut ic = Vec::new();
-
-        for (index, row) in cells.iter().enumerate() {
-            for (cell_index, cell_char) in row.iter().enumerate() {
-                ic.push(IndexedCell {
-                    point: AlacPoint::new(Line(index as i32), Column(cell_index)),
-                    cell: Cell {
-                        c: *cell_char,
-                        ..Default::default()
-                    },
-                });
-            }
-        }
-
-        TerminalContent {
-            cells: ic,
-            terminal_bounds,
-            ..Default::default()
-        }
-    }
-
-    #[gpui::test]
-    async fn test_write_output_converts_lf_to_crlf(cx: &mut TestAppContext) {
-        let terminal = cx.new(|cx| {
-            TerminalBuilder::new_display_only(CursorShape::default(), AlternateScroll::On, None, 0)
-                .unwrap()
-                .subscribe(cx)
-        });
-
-        // Test simple LF conversion
-        terminal.update(cx, |terminal, cx| {
-            terminal.write_output(b"line1\nline2\n", cx);
-        });
-
-        // Get the content by directly accessing the term
-        let content = terminal.update(cx, |terminal, _cx| {
-            let term = terminal.term.lock_unfair();
-            Terminal::make_content(&term, &terminal.last_content)
-        });
-
-        // If LF is properly converted to CRLF, each line should start at column 0
-        // The diagonal staircase bug would cause increasing column positions
-
-        // Get the cells and check that lines start at column 0
-        let cells = &content.cells;
-        let mut line1_col0 = false;
-        let mut line2_col0 = false;
-
-        for cell in cells {
-            if cell.c == 'l' && cell.point.column.0 == 0 {
-                if cell.point.line.0 == 0 && !line1_col0 {
-                    line1_col0 = true;
-                } else if cell.point.line.0 == 1 && !line2_col0 {
-                    line2_col0 = true;
-                }
-            }
-        }
-
-        assert!(line1_col0, "First line should start at column 0");
-        assert!(line2_col0, "Second line should start at column 0");
-    }
-
-    #[gpui::test]
-    async fn test_write_output_preserves_existing_crlf(cx: &mut TestAppContext) {
-        let terminal = cx.new(|cx| {
-            TerminalBuilder::new_display_only(CursorShape::default(), AlternateScroll::On, None, 0)
-                .unwrap()
-                .subscribe(cx)
-        });
-
-        // Test that existing CRLF doesn't get doubled
-        terminal.update(cx, |terminal, cx| {
-            terminal.write_output(b"line1\r\nline2\r\n", cx);
-        });
-
-        // Get the content by directly accessing the term
-        let content = terminal.update(cx, |terminal, _cx| {
-            let term = terminal.term.lock_unfair();
-            Terminal::make_content(&term, &terminal.last_content)
-        });
-
-        let cells = &content.cells;
-
-        // Check that both lines start at column 0
-        let mut found_lines_at_column_0 = 0;
-        for cell in cells {
-            if cell.c == 'l' && cell.point.column.0 == 0 {
-                found_lines_at_column_0 += 1;
-            }
-        }
-
-        assert!(
-            found_lines_at_column_0 >= 2,
-            "Both lines should start at column 0"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_write_output_preserves_bare_cr(cx: &mut TestAppContext) {
-        let terminal = cx.new(|cx| {
-            TerminalBuilder::new_display_only(CursorShape::default(), AlternateScroll::On, None, 0)
-                .unwrap()
-                .subscribe(cx)
-        });
-
-        // Test that bare CR (without LF) is preserved
-        terminal.update(cx, |terminal, cx| {
-            terminal.write_output(b"hello\rworld", cx);
-        });
-
-        // Get the content by directly accessing the term
-        let content = terminal.update(cx, |terminal, _cx| {
-            let term = terminal.term.lock_unfair();
-            Terminal::make_content(&term, &terminal.last_content)
-        });
-
-        let cells = &content.cells;
-
-        // Check that we have "world" at the beginning of the line
-        let mut text = String::new();
-        for cell in cells.iter().take(5) {
-            if cell.point.line.0 == 0 {
-                text.push(cell.c);
-            }
-        }
-
-        assert!(
-            text.starts_with("world"),
-            "Bare CR should allow overwriting: got '{}'",
-            text
-        );
-    }
-}
diff --git a/crates/terminal/src/terminal_hyperlinks.rs b/crates/terminal/src/terminal_hyperlinks.rs
deleted file mode 100644
index 71a1634076..0000000000
--- a/crates/terminal/src/terminal_hyperlinks.rs
+++ /dev/null
@@ -1,1673 +0,0 @@
-use alacritty_terminal::{
-    Term,
-    event::EventListener,
-    grid::Dimensions,
-    index::{Boundary, Column, Direction as AlacDirection, Point as AlacPoint},
-    term::{
-        cell::Flags,
-        search::{Match, RegexIter, RegexSearch},
-    },
-};
-use log::{info, warn};
-use regex::Regex;
-use std::{
-    ops::{Index, Range},
-    time::{Duration, Instant},
-};
-
-const URL_REGEX: &str = r#"(ipfs:|ipns:|magnet:|mailto:|gemini://|gopher://|https://|http://|news:|file://|git://|ssh:|ftp://)[^\u{0000}-\u{001F}\u{007F}-\u{009F}<>"\s{-}\^⟨⟩`']+"#;
-const WIDE_CHAR_SPACERS: Flags =
-    Flags::from_bits(Flags::LEADING_WIDE_CHAR_SPACER.bits() | Flags::WIDE_CHAR_SPACER.bits())
-        .unwrap();
-
-pub(super) struct RegexSearches {
-    url_regex: RegexSearch,
-    path_hyperlink_regexes: Vec<Regex>,
-    path_hyperlink_timeout: Duration,
-}
-
-impl Default for RegexSearches {
-    fn default() -> Self {
-        Self {
-            url_regex: RegexSearch::new(URL_REGEX).unwrap(),
-            path_hyperlink_regexes: Vec::default(),
-            path_hyperlink_timeout: Duration::default(),
-        }
-    }
-}
-impl RegexSearches {
-    pub(super) fn new(
-        path_hyperlink_regexes: impl IntoIterator<Item: AsRef<str>>,
-        path_hyperlink_timeout_ms: u64,
-    ) -> Self {
-        Self {
-            url_regex: RegexSearch::new(URL_REGEX).unwrap(),
-            path_hyperlink_regexes: path_hyperlink_regexes
-                .into_iter()
-                .filter_map(|regex| {
-                    Regex::new(regex.as_ref())
-                        .inspect_err(|error| {
-                            warn!(
-                                concat!(
-                                    "Ignoring path hyperlink regex specified in ",
-                                    "`terminal.path_hyperlink_regexes`:\n\n\t{}\n\nError: {}",
-                                ),
-                                regex.as_ref(),
-                                error
-                            );
-                        })
-                        .ok()
-                })
-                .collect(),
-            path_hyperlink_timeout: Duration::from_millis(path_hyperlink_timeout_ms),
-        }
-    }
-}
-
-pub(super) fn find_from_grid_point<T: EventListener>(
-    term: &Term<T>,
-    point: AlacPoint,
-    regex_searches: &mut RegexSearches,
-) -> Option<(String, bool, Match)> {
-    let grid = term.grid();
-    let link = grid.index(point).hyperlink();
-    let found_word = if let Some(ref url) = link {
-        let mut min_index = point;
-        loop {
-            let new_min_index = min_index.sub(term, Boundary::Cursor, 1);
-            if new_min_index == min_index || grid.index(new_min_index).hyperlink() != link {
-                break;
-            } else {
-                min_index = new_min_index
-            }
-        }
-
-        let mut max_index = point;
-        loop {
-            let new_max_index = max_index.add(term, Boundary::Cursor, 1);
-            if new_max_index == max_index || grid.index(new_max_index).hyperlink() != link {
-                break;
-            } else {
-                max_index = new_max_index
-            }
-        }
-
-        let url = url.uri().to_owned();
-        let url_match = min_index..=max_index;
-
-        Some((url, true, url_match))
-    } else {
-        let (line_start, line_end) = (term.line_search_left(point), term.line_search_right(point));
-        if let Some((url, url_match)) = RegexIter::new(
-            line_start,
-            line_end,
-            AlacDirection::Right,
-            term,
-            &mut regex_searches.url_regex,
-        )
-        .find(|rm| rm.contains(&point))
-        .map(|url_match| {
-            let url = term.bounds_to_string(*url_match.start(), *url_match.end());
-            sanitize_url_punctuation(url, url_match, term)
-        }) {
-            Some((url, true, url_match))
-        } else {
-            path_match(
-                &term,
-                line_start,
-                line_end,
-                point,
-                &mut regex_searches.path_hyperlink_regexes,
-                regex_searches.path_hyperlink_timeout,
-            )
-            .map(|(path, path_match)| (path, false, path_match))
-        }
-    };
-
-    found_word.map(|(maybe_url_or_path, is_url, word_match)| {
-        if is_url {
-            // Treat "file://" IRIs like file paths to ensure
-            // that line numbers at the end of the path are
-            // handled correctly
-            if let Some(path) = maybe_url_or_path.strip_prefix("file://") {
-                (path.to_string(), false, word_match)
-            } else {
-                (maybe_url_or_path, true, word_match)
-            }
-        } else {
-            (maybe_url_or_path, false, word_match)
-        }
-    })
-}
-
-fn sanitize_url_punctuation<T: EventListener>(
-    url: String,
-    url_match: Match,
-    term: &Term<T>,
-) -> (String, Match) {
-    let mut sanitized_url = url;
-    let mut chars_trimmed = 0;
-
-    // First, handle parentheses balancing using single traversal
-    let (open_parens, close_parens) =
-        sanitized_url
-            .chars()
-            .fold((0, 0), |(opens, closes), c| match c {
-                '(' => (opens + 1, closes),
-                ')' => (opens, closes + 1),
-                _ => (opens, closes),
-            });
-
-    // Trim unbalanced closing parentheses
-    if close_parens > open_parens {
-        let mut remaining_close = close_parens;
-        while sanitized_url.ends_with(')') && remaining_close > open_parens {
-            sanitized_url.pop();
-            chars_trimmed += 1;
-            remaining_close -= 1;
-        }
-    }
-
-    // Handle trailing periods
-    if sanitized_url.ends_with('.') {
-        let trailing_periods = sanitized_url
-            .chars()
-            .rev()
-            .take_while(|&c| c == '.')
-            .count();
-
-        if trailing_periods > 1 {
-            sanitized_url.truncate(sanitized_url.len() - trailing_periods);
-            chars_trimmed += trailing_periods;
-        } else if trailing_periods == 1
-            && let Some(second_last_char) = sanitized_url.chars().rev().nth(1)
-            && (second_last_char.is_alphanumeric() || second_last_char == '/')
-        {
-            sanitized_url.pop();
-            chars_trimmed += 1;
-        }
-    }
-
-    if chars_trimmed > 0 {
-        let new_end = url_match.end().sub(term, Boundary::Grid, chars_trimmed);
-        let sanitized_match = Match::new(*url_match.start(), new_end);
-        (sanitized_url, sanitized_match)
-    } else {
-        (sanitized_url, url_match)
-    }
-}
-
-fn path_match<T>(
-    term: &Term<T>,
-    line_start: AlacPoint,
-    line_end: AlacPoint,
-    hovered: AlacPoint,
-    path_hyperlink_regexes: &mut Vec<Regex>,
-    path_hyperlink_timeout: Duration,
-) -> Option<(String, Match)> {
-    if path_hyperlink_regexes.is_empty() || path_hyperlink_timeout.as_millis() == 0 {
-        return None;
-    }
-    debug_assert!(line_start <= hovered);
-    debug_assert!(line_end >= hovered);
-    let search_start_time = Instant::now();
-
-    let timed_out = || {
-        let elapsed_time = Instant::now().saturating_duration_since(search_start_time);
-        (elapsed_time > path_hyperlink_timeout)
-            .then_some((elapsed_time.as_millis(), path_hyperlink_timeout.as_millis()))
-    };
-
-    // This used to be: `let line = term.bounds_to_string(line_start, line_end)`, however, that
-    // api compresses tab characters into a single space, whereas we require a cell accurate
-    // string representation of the line. The below algorithm does this, but seems a bit odd.
-    // Maybe there is a clean api for doing this, but I couldn't find it.
-    let mut line = String::with_capacity(
-        (line_end.line.0 - line_start.line.0 + 1) as usize * term.grid().columns(),
-    );
-    let first_cell = &term.grid()[line_start];
-    line.push(first_cell.c);
-    let mut start_offset = 0;
-    let mut hovered_point_byte_offset = None;
-
-    if !first_cell.flags.intersects(WIDE_CHAR_SPACERS) {
-        start_offset += first_cell.c.len_utf8();
-        if line_start == hovered {
-            hovered_point_byte_offset = Some(0);
-        }
-    }
-
-    for cell in term.grid().iter_from(line_start) {
-        if cell.point > line_end {
-            break;
-        }
-        let is_spacer = cell.flags.intersects(WIDE_CHAR_SPACERS);
-        if cell.point == hovered {
-            debug_assert!(hovered_point_byte_offset.is_none());
-            if start_offset > 0 && cell.flags.contains(Flags::WIDE_CHAR_SPACER) {
-                // If we hovered on a trailing spacer, back up to the end of the previous char's bytes.
-                start_offset -= 1;
-            }
-            hovered_point_byte_offset = Some(start_offset);
-        } else if cell.point < hovered && !is_spacer {
-            start_offset += cell.c.len_utf8();
-        }
-
-        if !is_spacer {
-            line.push(match cell.c {
-                '\t' => ' ',
-                c @ _ => c,
-            });
-        }
-    }
-    let line = line.trim_ascii_end();
-    let hovered_point_byte_offset = hovered_point_byte_offset?;
-    let found_from_range = |path_range: Range<usize>,
-                            link_range: Range<usize>,
-                            position: Option<(u32, Option<u32>)>| {
-        let advance_point_by_str = |mut point: AlacPoint, s: &str| {
-            for _ in s.chars() {
-                point = term
-                    .expand_wide(point, AlacDirection::Right)
-                    .add(term, Boundary::Grid, 1);
-            }
-
-            // There does not appear to be an alacritty api that is
-            // "move to start of current wide char", so we have to do it ourselves.
-            let flags = term.grid().index(point).flags;
-            if flags.contains(Flags::LEADING_WIDE_CHAR_SPACER) {
-                AlacPoint::new(point.line + 1, Column(0))
-            } else if flags.contains(Flags::WIDE_CHAR_SPACER) {
-                AlacPoint::new(point.line, point.column - 1)
-            } else {
-                point
-            }
-        };
-
-        let link_start = advance_point_by_str(line_start, &line[..link_range.start]);
-        let link_end = advance_point_by_str(link_start, &line[link_range]);
-        let link_match = link_start
-            ..=term
-                .expand_wide(link_end, AlacDirection::Left)
-                .sub(term, Boundary::Grid, 1);
-
-        (
-            {
-                let mut path = line[path_range].to_string();
-                position.inspect(|(line, column)| {
-                    path += &format!(":{line}");
-                    column.inspect(|column| path += &format!(":{column}"));
-                });
-                path
-            },
-            link_match,
-        )
-    };
-
-    for regex in path_hyperlink_regexes {
-        let mut path_found = false;
-
-        for captures in regex.captures_iter(&line) {
-            path_found = true;
-            let match_range = captures.get(0).unwrap().range();
-            let (path_range, line_column) = if let Some(path) = captures.name("path") {
-                let parse = |name: &str| {
-                    captures
-                        .name(name)
-                        .and_then(|capture| capture.as_str().parse().ok())
-                };
-
-                (
-                    path.range(),
-                    parse("line").map(|line| (line, parse("column"))),
-                )
-            } else {
-                (match_range.clone(), None)
-            };
-            let link_range = captures
-                .name("link")
-                .map_or_else(|| match_range.clone(), |link| link.range());
-
-            if !link_range.contains(&hovered_point_byte_offset) {
-                // No match, just skip.
-                continue;
-            }
-            let found = found_from_range(path_range, link_range, line_column);
-
-            if found.1.contains(&hovered) {
-                return Some(found);
-            }
-        }
-
-        if path_found {
-            return None;
-        }
-
-        if let Some((timed_out_ms, timeout_ms)) = timed_out() {
-            warn!("Timed out processing path hyperlink regexes after {timed_out_ms}ms");
-            info!("{timeout_ms}ms time out specified in `terminal.path_hyperlink_timeout_ms`");
-            return None;
-        }
-    }
-
-    None
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::terminal_settings::TerminalSettings;
-
-    use super::*;
-    use alacritty_terminal::{
-        event::VoidListener,
-        grid::Dimensions,
-        index::{Boundary, Column, Line, Point as AlacPoint},
-        term::{Config, cell::Flags, test::TermSize},
-        vte::ansi::Handler,
-    };
-    use regex::Regex;
-    use settings::{self, Settings, SettingsContent};
-    use std::{cell::RefCell, ops::RangeInclusive, path::PathBuf, rc::Rc};
-    use url::Url;
-    use util::paths::PathWithPosition;
-
-    fn re_test(re: &str, hay: &str, expected: Vec<&str>) {
-        let results: Vec<_> = Regex::new(re)
-            .unwrap()
-            .find_iter(hay)
-            .map(|m| m.as_str())
-            .collect();
-        assert_eq!(results, expected);
-    }
-
-    #[test]
-    fn test_url_regex() {
-        re_test(
-            URL_REGEX,
-            "test http://example.com test 'https://website1.com' test mailto:bob@example.com train",
-            vec![
-                "http://example.com",
-                "https://website1.com",
-                "mailto:bob@example.com",
-            ],
-        );
-    }
-
-    #[test]
-    fn test_url_parentheses_sanitization() {
-        // Test our sanitize_url_parentheses function directly
-        let test_cases = vec![
-            // Cases that should be sanitized (unbalanced parentheses)
-            ("https://www.google.com/)", "https://www.google.com/"),
-            ("https://example.com/path)", "https://example.com/path"),
-            ("https://test.com/))", "https://test.com/"),
-            // Cases that should NOT be sanitized (balanced parentheses)
-            (
-                "https://en.wikipedia.org/wiki/Example_(disambiguation)",
-                "https://en.wikipedia.org/wiki/Example_(disambiguation)",
-            ),
-            ("https://test.com/(hello)", "https://test.com/(hello)"),
-            (
-                "https://example.com/path(1)(2)",
-                "https://example.com/path(1)(2)",
-            ),
-            // Edge cases
-            ("https://test.com/", "https://test.com/"),
-            ("https://example.com", "https://example.com"),
-        ];
-
-        for (input, expected) in test_cases {
-            // Create a minimal terminal for testing
-            let term = Term::new(Config::default(), &TermSize::new(80, 24), VoidListener);
-
-            // Create a dummy match that spans the entire input
-            let start_point = AlacPoint::new(Line(0), Column(0));
-            let end_point = AlacPoint::new(Line(0), Column(input.len()));
-            let dummy_match = Match::new(start_point, end_point);
-
-            let (result, _) = sanitize_url_punctuation(input.to_string(), dummy_match, &term);
-            assert_eq!(result, expected, "Failed for input: {}", input);
-        }
-    }
-
-    #[test]
-    fn test_url_periods_sanitization() {
-        // Test URLs with trailing periods (sentence punctuation)
-        let test_cases = vec![
-            // Cases that should be sanitized (trailing periods likely punctuation)
-            ("https://example.com.", "https://example.com"),
-            (
-                "https://github.com/zed-industries/zed.",
-                "https://github.com/zed-industries/zed",
-            ),
-            (
-                "https://example.com/path/file.html.",
-                "https://example.com/path/file.html",
-            ),
-            (
-                "https://example.com/file.pdf.",
-                "https://example.com/file.pdf",
-            ),
-            ("https://example.com:8080.", "https://example.com:8080"),
-            ("https://example.com..", "https://example.com"),
-            (
-                "https://en.wikipedia.org/wiki/C.E.O.",
-                "https://en.wikipedia.org/wiki/C.E.O",
-            ),
-            // Cases that should NOT be sanitized (periods are part of URL structure)
-            (
-                "https://example.com/v1.0/api",
-                "https://example.com/v1.0/api",
-            ),
-            ("https://192.168.1.1", "https://192.168.1.1"),
-            ("https://sub.domain.com", "https://sub.domain.com"),
-        ];
-
-        for (input, expected) in test_cases {
-            // Create a minimal terminal for testing
-            let term = Term::new(Config::default(), &TermSize::new(80, 24), VoidListener);
-
-            // Create a dummy match that spans the entire input
-            let start_point = AlacPoint::new(Line(0), Column(0));
-            let end_point = AlacPoint::new(Line(0), Column(input.len()));
-            let dummy_match = Match::new(start_point, end_point);
-
-            // This test should initially fail since we haven't implemented period sanitization yet
-            let (result, _) = sanitize_url_punctuation(input.to_string(), dummy_match, &term);
-            assert_eq!(result, expected, "Failed for input: {}", input);
-        }
-    }
-
-    macro_rules! test_hyperlink {
-        ($($lines:expr),+; $hyperlink_kind:ident) => { {
-            use crate::terminal_hyperlinks::tests::line_cells_count;
-            use std::cmp;
-
-            let test_lines = vec![$($lines),+];
-            let (total_cells, longest_line_cells) =
-                test_lines.iter().copied()
-                    .map(line_cells_count)
-                    .fold((0, 0), |state, cells| (state.0 + cells, cmp::max(state.1, cells)));
-            let contains_tab_char = test_lines.iter().copied()
-                .map(str::chars).flatten().find(|&c| c == '\t');
-            let columns = if contains_tab_char.is_some() {
-                // This avoids tabs at end of lines causing whitespace-eating line wraps...
-                vec![longest_line_cells + 1]
-            } else {
-                // Alacritty has issues with 2 columns, use 3 as the minimum for now.
-                vec![3, longest_line_cells / 2, longest_line_cells + 1]
-            };
-            test_hyperlink!(
-                columns;
-                total_cells;
-                test_lines.iter().copied();
-                $hyperlink_kind
-            )
-        } };
-
-        ($columns:expr; $total_cells:expr; $lines:expr; $hyperlink_kind:ident) => { {
-            use crate::terminal_hyperlinks::tests::{ test_hyperlink, HyperlinkKind };
-
-            let source_location = format!("{}:{}", std::file!(), std::line!());
-            for columns in $columns {
-                test_hyperlink(columns, $total_cells, $lines, HyperlinkKind::$hyperlink_kind,
-                    &source_location);
-            }
-        } };
-    }
-
-    mod path {
-        /// 👉 := **hovered** on following char
-        ///
-        /// 👈 := **hovered** on wide char spacer of previous full width char
-        ///
-        /// **`‹›`** := expected **hyperlink** match
-        ///
-        /// **`«»`** := expected **path**, **row**, and **column** capture groups
-        ///
-        /// [**`c₀, c₁, …, cₙ;`**]ₒₚₜ := use specified terminal widths of `c₀, c₁, …, cₙ` **columns**
-        /// (defaults to `3, longest_line_cells / 2, longest_line_cells + 1;`)
-        ///
-        macro_rules! test_path {
-            ($($lines:literal),+) => { test_hyperlink!($($lines),+; Path) };
-        }
-
-        #[test]
-        fn simple() {
-            // Rust paths
-            // Just the path
-            test_path!("‹«/👉test/cool.rs»›");
-            test_path!("‹«/test/cool👉.rs»›");
-
-            // path and line
-            test_path!("‹«/👉test/cool.rs»:«4»›");
-            test_path!("‹«/test/cool.rs»👉:«4»›");
-            test_path!("‹«/test/cool.rs»:«👉4»›");
-            test_path!("‹«/👉test/cool.rs»(«4»)›");
-            test_path!("‹«/test/cool.rs»👉(«4»)›");
-            test_path!("‹«/test/cool.rs»(«👉4»)›");
-            test_path!("‹«/test/cool.rs»(«4»👉)›");
-
-            // path, line, and column
-            test_path!("‹«/👉test/cool.rs»:«4»:«2»›");
-            test_path!("‹«/test/cool.rs»:«4»:«👉2»›");
-            test_path!("‹«/👉test/cool.rs»(«4»,«2»)›");
-            test_path!("‹«/test/cool.rs»(«4»👉,«2»)›");
-
-            // path, line, column, and ':' suffix
-            test_path!("‹«/👉test/cool.rs»:«4»:«2»›:");
-            test_path!("‹«/test/cool.rs»:«4»:«👉2»›:");
-            test_path!("‹«/👉test/cool.rs»(«4»,«2»)›:");
-            test_path!("‹«/test/cool.rs»(«4»,«2»👉)›:");
-            test_path!("‹«/👉test/cool.rs»:(«4»,«2»)›:");
-            test_path!("‹«/test/cool.rs»:(«4»,«2»👉)›:");
-            test_path!("‹«/👉test/cool.rs»:(«4»:«2»)›:");
-            test_path!("‹«/test/cool.rs»:(«4»:«2»👉)›:");
-            test_path!("/test/cool.rs:4:2👉:", "What is this?");
-            test_path!("/test/cool.rs(4,2)👉:", "What is this?");
-
-            // path, line, column, and description
-            test_path!("‹«/test/co👉ol.rs»:«4»:«2»›:Error!");
-            test_path!("‹«/test/co👉ol.rs»(«4»,«2»)›:Error!");
-
-            // Cargo output
-            test_path!("    Compiling Cool 👉(/test/Cool)");
-            test_path!("    Compiling Cool (‹«/👉test/Cool»›)");
-            test_path!("    Compiling Cool (/test/Cool👉)");
-
-            // Python
-            test_path!("‹«awe👉some.py»›");
-            test_path!("‹«👉a»› ");
-
-            test_path!("    ‹F👉ile \"«/awesome.py»\", line «42»›: Wat?");
-            test_path!("    ‹File \"«/awe👉some.py»\", line «42»›");
-            test_path!("    ‹File \"«/awesome.py»👉\", line «42»›: Wat?");
-            test_path!("    ‹File \"«/awesome.py»\", line «4👉2»›");
-        }
-
-        #[test]
-        fn simple_with_descriptions() {
-            // path, line, column and description
-            test_path!("‹«/👉test/cool.rs»:«4»:«2»›:例Desc例例例");
-            test_path!("‹«/test/cool.rs»:«4»:«👉2»›:例Desc例例例");
-            test_path!("‹«/👉test/cool.rs»(«4»,«2»)›:例Desc例例例");
-            test_path!("‹«/test/cool.rs»(«4»👉,«2»)›:例Desc例例例");
-
-            // path, line, column and description w/extra colons
-            test_path!("‹«/👉test/cool.rs»:«4»:«2»›::例Desc例例例");
-            test_path!("‹«/test/cool.rs»:«4»:«👉2»›::例Desc例例例");
-            test_path!("‹«/👉test/cool.rs»(«4»,«2»)›::例Desc例例例");
-            test_path!("‹«/test/cool.rs»(«4»,«2»👉)›::例Desc例例例");
-        }
-
-        #[test]
-        fn multiple_same_line() {
-            test_path!("‹«/👉test/cool.rs»› /test/cool.rs");
-            test_path!("/test/cool.rs ‹«/👉test/cool.rs»›");
-
-            test_path!(
-                "‹«🦀 multiple_👉same_line 🦀» 🚣«4» 🏛️«2»›: 🦀 multiple_same_line 🦀 🚣4 🏛️2:"
-            );
-            test_path!(
-                "🦀 multiple_same_line 🦀 🚣4 🏛️2 ‹«🦀 multiple_👉same_line 🦀» 🚣«4» 🏛️«2»›:"
-            );
-
-            // ls output (tab separated)
-            test_path!(
-                "‹«Carg👉o.toml»›\t\texperiments\t\tnotebooks\t\trust-toolchain.toml\ttooling"
-            );
-            test_path!(
-                "Cargo.toml\t\t‹«exper👉iments»›\t\tnotebooks\t\trust-toolchain.toml\ttooling"
-            );
-            test_path!(
-                "Cargo.toml\t\texperiments\t\t‹«note👉books»›\t\trust-toolchain.toml\ttooling"
-            );
-            test_path!(
-                "Cargo.toml\t\texperiments\t\tnotebooks\t\t‹«rust-t👉oolchain.toml»›\ttooling"
-            );
-            test_path!(
-                "Cargo.toml\t\texperiments\t\tnotebooks\t\trust-toolchain.toml\t‹«too👉ling»›"
-            );
-        }
-
-        #[test]
-        fn colons_galore() {
-            test_path!("‹«/test/co👉ol.rs»:«4»›");
-            test_path!("‹«/test/co👉ol.rs»:«4»›:");
-            test_path!("‹«/test/co👉ol.rs»:«4»:«2»›");
-            test_path!("‹«/test/co👉ol.rs»:«4»:«2»›:");
-            test_path!("‹«/test/co👉ol.rs»(«1»)›");
-            test_path!("‹«/test/co👉ol.rs»(«1»)›:");
-            test_path!("‹«/test/co👉ol.rs»(«1»,«618»)›");
-            test_path!("‹«/test/co👉ol.rs»(«1»,«618»)›:");
-            test_path!("‹«/test/co👉ol.rs»::«42»›");
-            test_path!("‹«/test/co👉ol.rs»::«42»›:");
-            test_path!("‹«/test/co👉ol.rs»(«1»,«618»)›::");
-        }
-
-        #[test]
-        fn quotes_and_brackets() {
-            test_path!("\"‹«/test/co👉ol.rs»:«4»›\"");
-            test_path!("'‹«/test/co👉ol.rs»:«4»›'");
-            test_path!("`‹«/test/co👉ol.rs»:«4»›`");
-
-            test_path!("[‹«/test/co👉ol.rs»:«4»›]");
-            test_path!("(‹«/test/co👉ol.rs»:«4»›)");
-            test_path!("{‹«/test/co👉ol.rs»:«4»›}");
-            test_path!("<‹«/test/co👉ol.rs»:«4»›>");
-
-            test_path!("[\"‹«/test/co👉ol.rs»:«4»›\"]");
-            test_path!("'(‹«/test/co👉ol.rs»:«4»›)'");
-
-            test_path!("\"‹«/test/co👉ol.rs»:«4»:«2»›\"");
-            test_path!("'‹«/test/co👉ol.rs»:«4»:«2»›'");
-            test_path!("`‹«/test/co👉ol.rs»:«4»:«2»›`");
-
-            test_path!("[‹«/test/co👉ol.rs»:«4»:«2»›]");
-            test_path!("(‹«/test/co👉ol.rs»:«4»:«2»›)");
-            test_path!("{‹«/test/co👉ol.rs»:«4»:«2»›}");
-            test_path!("<‹«/test/co👉ol.rs»:«4»:«2»›>");
-
-            test_path!("[\"‹«/test/co👉ol.rs»:«4»:«2»›\"]");
-
-            test_path!("\"‹«/test/co👉ol.rs»(«4»)›\"");
-            test_path!("'‹«/test/co👉ol.rs»(«4»)›'");
-            test_path!("`‹«/test/co👉ol.rs»(«4»)›`");
-
-            test_path!("[‹«/test/co👉ol.rs»(«4»)›]");
-            test_path!("(‹«/test/co👉ol.rs»(«4»)›)");
-            test_path!("{‹«/test/co👉ol.rs»(«4»)›}");
-            test_path!("<‹«/test/co👉ol.rs»(«4»)›>");
-
-            test_path!("[\"‹«/test/co👉ol.rs»(«4»)›\"]");
-
-            test_path!("\"‹«/test/co👉ol.rs»(«4»,«2»)›\"");
-            test_path!("'‹«/test/co👉ol.rs»(«4»,«2»)›'");
-            test_path!("`‹«/test/co👉ol.rs»(«4»,«2»)›`");
-
-            test_path!("[‹«/test/co👉ol.rs»(«4»,«2»)›]");
-            test_path!("(‹«/test/co👉ol.rs»(«4»,«2»)›)");
-            test_path!("{‹«/test/co👉ol.rs»(«4»,«2»)›}");
-            test_path!("<‹«/test/co👉ol.rs»(«4»,«2»)›>");
-
-            test_path!("[\"‹«/test/co👉ol.rs»(«4»,«2»)›\"]");
-
-            // Imbalanced
-            test_path!("([‹«/test/co👉ol.rs»:«4»›] was here...)");
-            test_path!("[Here's <‹«/test/co👉ol.rs»:«4»›>]");
-            test_path!("('‹«/test/co👉ol.rs»:«4»›' was here...)");
-            test_path!("[Here's `‹«/test/co👉ol.rs»:«4»›`]");
-        }
-
-        #[test]
-        fn trailing_punctuation() {
-            test_path!("‹«/test/co👉ol.rs»›:,..");
-            test_path!("/test/cool.rs:,👉..");
-            test_path!("‹«/test/co👉ol.rs»:«4»›:,");
-            test_path!("/test/cool.rs:4:👉,");
-            test_path!("[\"‹«/test/co👉ol.rs»:«4»›\"]:,");
-            test_path!("'(‹«/test/co👉ol.rs»:«4»›),,'...");
-            test_path!("('‹«/test/co👉ol.rs»:«4»›'::: was here...)");
-            test_path!("[Here's <‹«/test/co👉ol.rs»:«4»›>]::: ");
-        }
-
-        #[test]
-        fn word_wide_chars() {
-            // Rust paths
-            test_path!("‹«/👉例/cool.rs»›");
-            test_path!("‹«/例👈/cool.rs»›");
-            test_path!("‹«/例/cool.rs»:«👉4»›");
-            test_path!("‹«/例/cool.rs»:«4»:«👉2»›");
-
-            // Cargo output
-            test_path!("    Compiling Cool (‹«/👉例/Cool»›)");
-            test_path!("    Compiling Cool (‹«/例👈/Cool»›)");
-
-            test_path!("    Compiling Cool (‹«/👉例/Cool Spaces»›)");
-            test_path!("    Compiling Cool (‹«/例👈/Cool Spaces»›)");
-            test_path!("    Compiling Cool (‹«/👉例/Cool Spaces»:«4»:«2»›)");
-            test_path!("    Compiling Cool (‹«/例👈/Cool Spaces»(«4»,«2»)›)");
-
-            test_path!("    --> ‹«/👉例/Cool Spaces»›");
-            test_path!("    ::: ‹«/例👈/Cool Spaces»›");
-            test_path!("    --> ‹«/👉例/Cool Spaces»:«4»:«2»›");
-            test_path!("    ::: ‹«/例👈/Cool Spaces»(«4»,«2»)›");
-            test_path!("    panicked at ‹«/👉例/Cool Spaces»:«4»:«2»›:");
-            test_path!("    panicked at ‹«/例👈/Cool Spaces»(«4»,«2»)›:");
-            test_path!("    at ‹«/👉例/Cool Spaces»:«4»:«2»›");
-            test_path!("    at ‹«/例👈/Cool Spaces»(«4»,«2»)›");
-
-            // Python
-            test_path!("‹«👉例wesome.py»›");
-            test_path!("‹«例👈wesome.py»›");
-            test_path!("    ‹File \"«/👉例wesome.py»\", line «42»›: Wat?");
-            test_path!("    ‹File \"«/例👈wesome.py»\", line «42»›: Wat?");
-        }
-
-        #[test]
-        fn non_word_wide_chars() {
-            // Mojo diagnostic message
-            test_path!("    ‹File \"«/awe👉some.🔥»\", line «42»›: Wat?");
-            test_path!("    ‹File \"«/awesome👉.🔥»\", line «42»›: Wat?");
-            test_path!("    ‹File \"«/awesome.👉🔥»\", line «42»›: Wat?");
-            test_path!("    ‹File \"«/awesome.🔥👈»\", line «42»›: Wat?");
-        }
-
-        /// These likely rise to the level of being worth fixing.
-        mod issues {
-            #[test]
-            // <https://github.com/alacritty/alacritty/issues/8586>
-            fn issue_alacritty_8586() {
-                // Rust paths
-                test_path!("‹«/👉例/cool.rs»›");
-                test_path!("‹«/例👈/cool.rs»›");
-                test_path!("‹«/例/cool.rs»:«👉4»›");
-                test_path!("‹«/例/cool.rs»:«4»:«👉2»›");
-
-                // Cargo output
-                test_path!("    Compiling Cool (‹«/👉例/Cool»›)");
-                test_path!("    Compiling Cool (‹«/例👈/Cool»›)");
-
-                // Python
-                test_path!("‹«👉例wesome.py»›");
-                test_path!("‹«例👈wesome.py»›");
-                test_path!("    ‹File \"«/👉例wesome.py»\", line «42»›: Wat?");
-                test_path!("    ‹File \"«/例👈wesome.py»\", line «42»›: Wat?");
-            }
-
-            #[test]
-            // <https://github.com/zed-industries/zed/issues/12338>
-            fn issue_12338_regex() {
-                // Issue #12338
-                test_path!(".rw-r--r--     0     staff 05-27 14:03 ‹«'test file 👉1.txt'»›");
-                test_path!(".rw-r--r--     0     staff 05-27 14:03 ‹«👉'test file 1.txt'»›");
-            }
-
-            #[test]
-            // <https://github.com/zed-industries/zed/issues/12338>
-            fn issue_12338() {
-                // Issue #12338
-                test_path!(".rw-r--r--     0     staff 05-27 14:03 ‹«test👉、2.txt»›");
-                test_path!(".rw-r--r--     0     staff 05-27 14:03 ‹«test、👈2.txt»›");
-                test_path!(".rw-r--r--     0     staff 05-27 14:03 ‹«test👉。3.txt»›");
-                test_path!(".rw-r--r--     0     staff 05-27 14:03 ‹«test。👈3.txt»›");
-
-                // Rust paths
-                test_path!("‹«/👉🏃/🦀.rs»›");
-                test_path!("‹«/🏃👈/🦀.rs»›");
-                test_path!("‹«/🏃/👉🦀.rs»:«4»›");
-                test_path!("‹«/🏃/🦀👈.rs»:«4»:«2»›");
-
-                // Cargo output
-                test_path!("    Compiling Cool (‹«/👉🏃/Cool»›)");
-                test_path!("    Compiling Cool (‹«/🏃👈/Cool»›)");
-
-                // Python
-                test_path!("‹«👉🏃wesome.py»›");
-                test_path!("‹«🏃👈wesome.py»›");
-                test_path!("    ‹File \"«/👉🏃wesome.py»\", line «42»›: Wat?");
-                test_path!("    ‹File \"«/🏃👈wesome.py»\", line «42»›: Wat?");
-
-                // Mojo
-                test_path!("‹«/awe👉some.🔥»› is some good Mojo!");
-                test_path!("‹«/awesome👉.🔥»› is some good Mojo!");
-                test_path!("‹«/awesome.👉🔥»› is some good Mojo!");
-                test_path!("‹«/awesome.🔥👈»› is some good Mojo!");
-                test_path!("    ‹File \"«/👉🏃wesome.🔥»\", line «42»›: Wat?");
-                test_path!("    ‹File \"«/🏃👈wesome.🔥»\", line «42»›: Wat?");
-            }
-
-            #[test]
-            // <https://github.com/zed-industries/zed/issues/40202>
-            fn issue_40202() {
-                // Elixir
-                test_path!("[‹«lib/blitz_apex_👉server/stats/aggregate_rank_stats.ex»:«35»›: BlitzApexServer.Stats.AggregateRankStats.update/2]
-                1 #=> 1");
-            }
-
-            #[test]
-            // <https://github.com/zed-industries/zed/issues/28194>
-            fn issue_28194() {
-                test_path!(
-                    "‹«test/c👉ontrollers/template_items_controller_test.rb»:«20»›:in 'block (2 levels) in <class:TemplateItemsControllerTest>'"
-                );
-            }
-
-            #[test]
-            #[cfg_attr(
-                not(target_os = "windows"),
-                should_panic(
-                    expected = "Path = «/test/cool.rs:4:NotDesc», at grid cells (0, 1)..=(7, 2)"
-                )
-            )]
-            #[cfg_attr(
-                target_os = "windows",
-                should_panic(
-                    expected = r#"Path = «C:\\test\\cool.rs:4:NotDesc», at grid cells (0, 1)..=(8, 1)"#
-                )
-            )]
-            // PathWithPosition::parse_str considers "/test/co👉ol.rs:4:NotDesc" invalid input, but
-            // still succeeds and truncates the part after the position. Ideally this would be
-            // parsed as the path "/test/co👉ol.rs:4:NotDesc" with no position.
-            fn path_with_position_parse_str() {
-                test_path!("`‹«/test/co👉ol.rs:4:NotDesc»›`");
-                test_path!("<‹«/test/co👉ol.rs:4:NotDesc»›>");
-
-                test_path!("'‹«(/test/co👉ol.rs:4:2)»›'");
-                test_path!("'‹«(/test/co👉ol.rs(4))»›'");
-                test_path!("'‹«(/test/co👉ol.rs(4,2))»›'");
-            }
-        }
-
-        /// Minor issues arguably not important enough to fix/workaround...
-        mod nits {
-            #[test]
-            fn alacritty_bugs_with_two_columns() {
-                test_path!("‹«/👉test/cool.rs»(«4»)›");
-                test_path!("‹«/test/cool.rs»(«👉4»)›");
-                test_path!("‹«/test/cool.rs»(«4»,«👉2»)›");
-
-                // Python
-                test_path!("‹«awe👉some.py»›");
-            }
-
-            #[test]
-            #[cfg_attr(
-                not(target_os = "windows"),
-                should_panic(
-                    expected = "Path = «/test/cool.rs», line = 1, at grid cells (0, 0)..=(9, 0)"
-                )
-            )]
-            #[cfg_attr(
-                target_os = "windows",
-                should_panic(
-                    expected = r#"Path = «C:\\test\\cool.rs», line = 1, at grid cells (0, 0)..=(9, 2)"#
-                )
-            )]
-            fn invalid_row_column_should_be_part_of_path() {
-                test_path!("‹«/👉test/cool.rs:1:618033988749»›");
-                test_path!("‹«/👉test/cool.rs(1,618033988749)»›");
-            }
-
-            #[test]
-            #[cfg_attr(
-                not(target_os = "windows"),
-                should_panic(expected = "Path = «/te:st/co:ol.r:s:4:2::::::»")
-            )]
-            #[cfg_attr(
-                target_os = "windows",
-                should_panic(expected = r#"Path = «C:\\te:st\\co:ol.r:s:4:2::::::»"#)
-            )]
-            fn many_trailing_colons_should_be_parsed_as_part_of_the_path() {
-                test_path!("‹«/te:st/👉co:ol.r:s:4:2::::::»›");
-                test_path!("/test/cool.rs:::👉:");
-            }
-        }
-
-        mod windows {
-            // Lots of fun to be had with long file paths (verbatim) and UNC paths on Windows.
-            // See <https://learn.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation>
-            // See <https://users.rust-lang.org/t/understanding-windows-paths/58583>
-            // See <https://github.com/rust-lang/cargo/issues/13919>
-
-            #[test]
-            fn default_prompts() {
-                // Windows command prompt
-                test_path!(r#"‹«C:\Users\someone\👉test»›>"#);
-                test_path!(r#"C:\Users\someone\test👉>"#);
-
-                // Windows PowerShell
-                test_path!(r#"PS ‹«C:\Users\someone\👉test\cool.rs»›>"#);
-                test_path!(r#"PS C:\Users\someone\test\cool.rs👉>"#);
-            }
-
-            #[test]
-            fn unc() {
-                test_path!(r#"‹«\\server\share\👉test\cool.rs»›"#);
-                test_path!(r#"‹«\\server\share\test\cool👉.rs»›"#);
-            }
-
-            mod issues {
-                #[test]
-                fn issue_verbatim() {
-                    test_path!(r#"‹«\\?\C:\👉test\cool.rs»›"#);
-                    test_path!(r#"‹«\\?\C:\test\cool👉.rs»›"#);
-                }
-
-                #[test]
-                fn issue_verbatim_unc() {
-                    test_path!(r#"‹«\\?\UNC\server\share\👉test\cool.rs»›"#);
-                    test_path!(r#"‹«\\?\UNC\server\share\test\cool👉.rs»›"#);
-                }
-            }
-        }
-
-        mod perf {
-            use super::super::*;
-            use crate::TerminalSettings;
-            use alacritty_terminal::{
-                event::VoidListener,
-                grid::Dimensions,
-                index::{Column, Point as AlacPoint},
-                term::test::mock_term,
-                term::{Term, search::Match},
-            };
-            use settings::{self, Settings, SettingsContent};
-            use std::{cell::RefCell, rc::Rc};
-            use util_macros::perf;
-
-            fn build_test_term(line: &str) -> (Term<VoidListener>, AlacPoint) {
-                let content = line.repeat(500);
-                let term = mock_term(&content);
-                let point = AlacPoint::new(
-                    term.grid().bottommost_line() - 1,
-                    Column(term.grid().last_column().0 / 2),
-                );
-
-                (term, point)
-            }
-
-            #[perf]
-            pub fn cargo_hyperlink_benchmark() {
-                const LINE: &str = "    Compiling terminal v0.1.0 (/Hyperlinks/Bench/Source/zed-hyperlinks/crates/terminal)\r\n";
-                thread_local! {
-                    static TEST_TERM_AND_POINT: (Term<VoidListener>, AlacPoint) =
-                        build_test_term(LINE);
-                }
-                TEST_TERM_AND_POINT.with(|(term, point)| {
-                    assert!(
-                        find_from_grid_point_bench(term, *point).is_some(),
-                        "Hyperlink should have been found"
-                    );
-                });
-            }
-
-            #[perf]
-            pub fn rust_hyperlink_benchmark() {
-                const LINE: &str = "    --> /Hyperlinks/Bench/Source/zed-hyperlinks/crates/terminal/terminal.rs:1000:42\r\n";
-                thread_local! {
-                    static TEST_TERM_AND_POINT: (Term<VoidListener>, AlacPoint) =
-                        build_test_term(LINE);
-                }
-                TEST_TERM_AND_POINT.with(|(term, point)| {
-                    assert!(
-                        find_from_grid_point_bench(term, *point).is_some(),
-                        "Hyperlink should have been found"
-                    );
-                });
-            }
-
-            #[perf]
-            pub fn ls_hyperlink_benchmark() {
-                const LINE: &str = "Cargo.toml        experiments        notebooks        rust-toolchain.toml    tooling\r\n";
-                thread_local! {
-                    static TEST_TERM_AND_POINT: (Term<VoidListener>, AlacPoint) =
-                        build_test_term(LINE);
-                }
-                TEST_TERM_AND_POINT.with(|(term, point)| {
-                    assert!(
-                        find_from_grid_point_bench(term, *point).is_some(),
-                        "Hyperlink should have been found"
-                    );
-                });
-            }
-
-            pub fn find_from_grid_point_bench(
-                term: &Term<VoidListener>,
-                point: AlacPoint,
-            ) -> Option<(String, bool, Match)> {
-                const PATH_HYPERLINK_TIMEOUT_MS: u64 = 1000;
-
-                thread_local! {
-                    static TEST_REGEX_SEARCHES: RefCell<RegexSearches> =
-                        RefCell::new({
-                            let default_settings_content: Rc<SettingsContent> =
-                                settings::parse_json_with_comments(&settings::default_settings())
-                                    .unwrap();
-                            let default_terminal_settings =
-                                TerminalSettings::from_settings(&default_settings_content);
-
-                            RegexSearches::new(
-                                &default_terminal_settings.path_hyperlink_regexes,
-                                PATH_HYPERLINK_TIMEOUT_MS
-                            )
-                        });
-                }
-
-                TEST_REGEX_SEARCHES.with(|regex_searches| {
-                    find_from_grid_point(&term, point, &mut regex_searches.borrow_mut())
-                })
-            }
-        }
-    }
-
-    mod file_iri {
-        // File IRIs have a ton of use cases, most of which we currently do not support. A few of
-        // those cases are documented here as tests which are expected to fail.
-        // See https://en.wikipedia.org/wiki/File_URI_scheme
-
-        /// [**`c₀, c₁, …, cₙ;`**]ₒₚₜ := use specified terminal widths of `c₀, c₁, …, cₙ` **columns**
-        /// (defaults to `3, longest_line_cells / 2, longest_line_cells + 1;`)
-        ///
-        macro_rules! test_file_iri {
-            ($file_iri:literal) => { { test_hyperlink!(concat!("‹«👉", $file_iri, "»›"); FileIri) } };
-        }
-
-        #[cfg(not(target_os = "windows"))]
-        #[test]
-        fn absolute_file_iri() {
-            test_file_iri!("file:///test/cool/index.rs");
-            test_file_iri!("file:///test/cool/");
-        }
-
-        mod issues {
-            #[cfg(not(target_os = "windows"))]
-            #[test]
-            #[should_panic(expected = "Path = «/test/Ῥόδος/», at grid cells (0, 0)..=(15, 1)")]
-            fn issue_file_iri_with_percent_encoded_characters() {
-                // Non-space characters
-                // file:///test/Ῥόδος/
-                test_file_iri!("file:///test/%E1%BF%AC%CF%8C%CE%B4%CE%BF%CF%82/"); // URI
-
-                // Spaces
-                test_file_iri!("file:///te%20st/co%20ol/index.rs");
-                test_file_iri!("file:///te%20st/co%20ol/");
-            }
-        }
-
-        #[cfg(target_os = "windows")]
-        mod windows {
-            mod issues {
-                // The test uses Url::to_file_path(), but it seems that the Url crate doesn't
-                // support relative file IRIs.
-                #[test]
-                #[should_panic(
-                    expected = r#"Failed to interpret file IRI `file:/test/cool/index.rs` as a path"#
-                )]
-                fn issue_relative_file_iri() {
-                    test_file_iri!("file:/test/cool/index.rs");
-                    test_file_iri!("file:/test/cool/");
-                }
-
-                // See https://en.wikipedia.org/wiki/File_URI_scheme
-                // https://github.com/zed-industries/zed/issues/39189
-                #[test]
-                #[should_panic(
-                    expected = r#"Path = «C:\\test\\cool\\index.rs», at grid cells (0, 0)..=(9, 1)"#
-                )]
-                fn issue_39189() {
-                    test_file_iri!("file:///C:/test/cool/index.rs");
-                    test_file_iri!("file:///C:/test/cool/");
-                }
-
-                #[test]
-                #[should_panic(
-                    expected = r#"Path = «C:\\test\\Ῥόδος\\», at grid cells (0, 0)..=(16, 1)"#
-                )]
-                fn issue_file_iri_with_percent_encoded_characters() {
-                    // Non-space characters
-                    // file:///test/Ῥόδος/
-                    test_file_iri!("file:///C:/test/%E1%BF%AC%CF%8C%CE%B4%CE%BF%CF%82/"); // URI
-
-                    // Spaces
-                    test_file_iri!("file:///C:/te%20st/co%20ol/index.rs");
-                    test_file_iri!("file:///C:/te%20st/co%20ol/");
-                }
-            }
-        }
-    }
-
-    mod iri {
-        /// [**`c₀, c₁, …, cₙ;`**]ₒₚₜ := use specified terminal widths of `c₀, c₁, …, cₙ` **columns**
-        /// (defaults to `3, longest_line_cells / 2, longest_line_cells + 1;`)
-        ///
-        macro_rules! test_iri {
-            ($iri:literal) => { { test_hyperlink!(concat!("‹«👉", $iri, "»›"); Iri) } };
-        }
-
-        #[test]
-        fn simple() {
-            // In the order they appear in URL_REGEX, except 'file://' which is treated as a path
-            test_iri!("ipfs://test/cool.ipfs");
-            test_iri!("ipns://test/cool.ipns");
-            test_iri!("magnet://test/cool.git");
-            test_iri!("mailto:someone@somewhere.here");
-            test_iri!("gemini://somewhere.here");
-            test_iri!("gopher://somewhere.here");
-            test_iri!("http://test/cool/index.html");
-            test_iri!("http://10.10.10.10:1111/cool.html");
-            test_iri!("http://test/cool/index.html?amazing=1");
-            test_iri!("http://test/cool/index.html#right%20here");
-            test_iri!("http://test/cool/index.html?amazing=1#right%20here");
-            test_iri!("https://test/cool/index.html");
-            test_iri!("https://10.10.10.10:1111/cool.html");
-            test_iri!("https://test/cool/index.html?amazing=1");
-            test_iri!("https://test/cool/index.html#right%20here");
-            test_iri!("https://test/cool/index.html?amazing=1#right%20here");
-            test_iri!("news://test/cool.news");
-            test_iri!("git://test/cool.git");
-            test_iri!("ssh://user@somewhere.over.here:12345/test/cool.git");
-            test_iri!("ftp://test/cool.ftp");
-        }
-
-        #[test]
-        fn wide_chars() {
-            // In the order they appear in URL_REGEX, except 'file://' which is treated as a path
-            test_iri!("ipfs://例🏃🦀/cool.ipfs");
-            test_iri!("ipns://例🏃🦀/cool.ipns");
-            test_iri!("magnet://例🏃🦀/cool.git");
-            test_iri!("mailto:someone@somewhere.here");
-            test_iri!("gemini://somewhere.here");
-            test_iri!("gopher://somewhere.here");
-            test_iri!("http://例🏃🦀/cool/index.html");
-            test_iri!("http://10.10.10.10:1111/cool.html");
-            test_iri!("http://例🏃🦀/cool/index.html?amazing=1");
-            test_iri!("http://例🏃🦀/cool/index.html#right%20here");
-            test_iri!("http://例🏃🦀/cool/index.html?amazing=1#right%20here");
-            test_iri!("https://例🏃🦀/cool/index.html");
-            test_iri!("https://10.10.10.10:1111/cool.html");
-            test_iri!("https://例🏃🦀/cool/index.html?amazing=1");
-            test_iri!("https://例🏃🦀/cool/index.html#right%20here");
-            test_iri!("https://例🏃🦀/cool/index.html?amazing=1#right%20here");
-            test_iri!("news://例🏃🦀/cool.news");
-            test_iri!("git://例/cool.git");
-            test_iri!("ssh://user@somewhere.over.here:12345/例🏃🦀/cool.git");
-            test_iri!("ftp://例🏃🦀/cool.ftp");
-        }
-
-        // There are likely more tests needed for IRI vs URI
-        #[test]
-        fn iris() {
-            // These refer to the same location, see example here:
-            // <https://en.wikipedia.org/wiki/Internationalized_Resource_Identifier#Compatibility>
-            test_iri!("https://en.wiktionary.org/wiki/Ῥόδος"); // IRI
-            test_iri!("https://en.wiktionary.org/wiki/%E1%BF%AC%CF%8C%CE%B4%CE%BF%CF%82"); // URI
-        }
-
-        #[test]
-        #[should_panic(expected = "Expected a path, but was a iri")]
-        fn file_is_a_path() {
-            test_iri!("file://test/cool/index.rs");
-        }
-    }
-
-    #[derive(Debug, PartialEq)]
-    enum HyperlinkKind {
-        FileIri,
-        Iri,
-        Path,
-    }
-
-    struct ExpectedHyperlink {
-        hovered_grid_point: AlacPoint,
-        hovered_char: char,
-        hyperlink_kind: HyperlinkKind,
-        iri_or_path: String,
-        row: Option<u32>,
-        column: Option<u32>,
-        hyperlink_match: RangeInclusive<AlacPoint>,
-    }
-
-    /// Converts to Windows style paths on Windows, like path!(), but at runtime for improved test
-    /// readability.
-    fn build_term_from_test_lines<'a>(
-        hyperlink_kind: HyperlinkKind,
-        term_size: TermSize,
-        test_lines: impl Iterator<Item = &'a str>,
-    ) -> (Term<VoidListener>, ExpectedHyperlink) {
-        #[derive(Default, Eq, PartialEq)]
-        enum HoveredState {
-            #[default]
-            HoveredScan,
-            HoveredNextChar,
-            Done,
-        }
-
-        #[derive(Default, Eq, PartialEq)]
-        enum MatchState {
-            #[default]
-            MatchScan,
-            MatchNextChar,
-            Match(AlacPoint),
-            Done,
-        }
-
-        #[derive(Default, Eq, PartialEq)]
-        enum CapturesState {
-            #[default]
-            PathScan,
-            PathNextChar,
-            Path(AlacPoint),
-            RowScan,
-            Row(String),
-            ColumnScan,
-            Column(String),
-            Done,
-        }
-
-        fn prev_input_point_from_term(term: &Term<VoidListener>) -> AlacPoint {
-            let grid = term.grid();
-            let cursor = &grid.cursor;
-            let mut point = cursor.point;
-
-            if !cursor.input_needs_wrap {
-                point = point.sub(term, Boundary::Grid, 1);
-            }
-
-            if grid.index(point).flags.contains(Flags::WIDE_CHAR_SPACER) {
-                point.column -= 1;
-            }
-
-            point
-        }
-
-        fn end_point_from_prev_input_point(
-            term: &Term<VoidListener>,
-            prev_input_point: AlacPoint,
-        ) -> AlacPoint {
-            if term
-                .grid()
-                .index(prev_input_point)
-                .flags
-                .contains(Flags::WIDE_CHAR)
-            {
-                prev_input_point.add(term, Boundary::Grid, 1)
-            } else {
-                prev_input_point
-            }
-        }
-
-        fn process_input(term: &mut Term<VoidListener>, c: char) {
-            match c {
-                '\t' => term.put_tab(1),
-                c @ _ => term.input(c),
-            }
-        }
-
-        let mut hovered_grid_point: Option<AlacPoint> = None;
-        let mut hyperlink_match = AlacPoint::default()..=AlacPoint::default();
-        let mut iri_or_path = String::default();
-        let mut row = None;
-        let mut column = None;
-        let mut prev_input_point = AlacPoint::default();
-        let mut hovered_state = HoveredState::default();
-        let mut match_state = MatchState::default();
-        let mut captures_state = CapturesState::default();
-        let mut term = Term::new(Config::default(), &term_size, VoidListener);
-
-        for text in test_lines {
-            let chars: Box<dyn Iterator<Item = char>> =
-                if cfg!(windows) && hyperlink_kind == HyperlinkKind::Path {
-                    Box::new(text.chars().map(|c| if c == '/' { '\\' } else { c })) as _
-                } else {
-                    Box::new(text.chars()) as _
-                };
-            let mut chars = chars.peekable();
-            while let Some(c) = chars.next() {
-                match c {
-                    '👉' => {
-                        hovered_state = HoveredState::HoveredNextChar;
-                    }
-                    '👈' => {
-                        hovered_grid_point = Some(prev_input_point.add(&term, Boundary::Grid, 1));
-                    }
-                    '«' | '»' => {
-                        captures_state = match captures_state {
-                            CapturesState::PathScan => CapturesState::PathNextChar,
-                            CapturesState::PathNextChar => {
-                                panic!("Should have been handled by char input")
-                            }
-                            CapturesState::Path(start_point) => {
-                                iri_or_path = term.bounds_to_string(
-                                    start_point,
-                                    end_point_from_prev_input_point(&term, prev_input_point),
-                                );
-                                CapturesState::RowScan
-                            }
-                            CapturesState::RowScan => CapturesState::Row(String::new()),
-                            CapturesState::Row(number) => {
-                                row = Some(number.parse::<u32>().unwrap());
-                                CapturesState::ColumnScan
-                            }
-                            CapturesState::ColumnScan => CapturesState::Column(String::new()),
-                            CapturesState::Column(number) => {
-                                column = Some(number.parse::<u32>().unwrap());
-                                CapturesState::Done
-                            }
-                            CapturesState::Done => {
-                                panic!("Extra '«', '»'")
-                            }
-                        }
-                    }
-                    '‹' | '›' => {
-                        match_state = match match_state {
-                            MatchState::MatchScan => MatchState::MatchNextChar,
-                            MatchState::MatchNextChar => {
-                                panic!("Should have been handled by char input")
-                            }
-                            MatchState::Match(start_point) => {
-                                hyperlink_match = start_point
-                                    ..=end_point_from_prev_input_point(&term, prev_input_point);
-                                MatchState::Done
-                            }
-                            MatchState::Done => {
-                                panic!("Extra '‹', '›'")
-                            }
-                        }
-                    }
-                    _ => {
-                        if let CapturesState::Row(number) | CapturesState::Column(number) =
-                            &mut captures_state
-                        {
-                            number.push(c)
-                        }
-
-                        let is_windows_abs_path_start = captures_state
-                            == CapturesState::PathNextChar
-                            && cfg!(windows)
-                            && hyperlink_kind == HyperlinkKind::Path
-                            && c == '\\'
-                            && chars.peek().is_some_and(|c| *c != '\\');
-
-                        if is_windows_abs_path_start {
-                            // Convert Unix abs path start into Windows abs path start so that the
-                            // same test can be used for both OSes.
-                            term.input('C');
-                            prev_input_point = prev_input_point_from_term(&term);
-                            term.input(':');
-                            process_input(&mut term, c);
-                        } else {
-                            process_input(&mut term, c);
-                            prev_input_point = prev_input_point_from_term(&term);
-                        }
-
-                        if hovered_state == HoveredState::HoveredNextChar {
-                            hovered_grid_point = Some(prev_input_point);
-                            hovered_state = HoveredState::Done;
-                        }
-                        if captures_state == CapturesState::PathNextChar {
-                            captures_state = CapturesState::Path(prev_input_point);
-                        }
-                        if match_state == MatchState::MatchNextChar {
-                            match_state = MatchState::Match(prev_input_point);
-                        }
-                    }
-                }
-            }
-            term.move_down_and_cr(1);
-        }
-
-        if hyperlink_kind == HyperlinkKind::FileIri {
-            let Ok(url) = Url::parse(&iri_or_path) else {
-                panic!("Failed to parse file IRI `{iri_or_path}`");
-            };
-            let Ok(path) = url.to_file_path() else {
-                panic!("Failed to interpret file IRI `{iri_or_path}` as a path");
-            };
-            iri_or_path = path.to_string_lossy().into_owned();
-        }
-
-        let hovered_grid_point = hovered_grid_point.expect("Missing hovered point (👉 or 👈)");
-        let hovered_char = term.grid().index(hovered_grid_point).c;
-        (
-            term,
-            ExpectedHyperlink {
-                hovered_grid_point,
-                hovered_char,
-                hyperlink_kind,
-                iri_or_path,
-                row,
-                column,
-                hyperlink_match,
-            },
-        )
-    }
-
-    fn line_cells_count(line: &str) -> usize {
-        // This avoids taking a dependency on the unicode-width crate
-        fn width(c: char) -> usize {
-            match c {
-                // Fullwidth unicode characters used in tests
-                '例' | '🏃' | '🦀' | '🔥' => 2,
-                '\t' => 8, // it's really 0-8, use the max always
-                _ => 1,
-            }
-        }
-        const CONTROL_CHARS: &str = "‹«👉👈»›";
-        line.chars()
-            .filter(|c| !CONTROL_CHARS.contains(*c))
-            .map(width)
-            .sum::<usize>()
-    }
-
-    struct CheckHyperlinkMatch<'a> {
-        term: &'a Term<VoidListener>,
-        expected_hyperlink: &'a ExpectedHyperlink,
-        source_location: &'a str,
-    }
-
-    impl<'a> CheckHyperlinkMatch<'a> {
-        fn new(
-            term: &'a Term<VoidListener>,
-            expected_hyperlink: &'a ExpectedHyperlink,
-            source_location: &'a str,
-        ) -> Self {
-            Self {
-                term,
-                expected_hyperlink,
-                source_location,
-            }
-        }
-
-        fn check_path_with_position_and_match(
-            &self,
-            path_with_position: PathWithPosition,
-            hyperlink_match: &Match,
-        ) {
-            let format_path_with_position_and_match =
-                |path_with_position: &PathWithPosition, hyperlink_match: &Match| {
-                    let mut result =
-                        format!("Path = «{}»", &path_with_position.path.to_string_lossy());
-                    if let Some(row) = path_with_position.row {
-                        result += &format!(", line = {row}");
-                        if let Some(column) = path_with_position.column {
-                            result += &format!(", column = {column}");
-                        }
-                    }
-
-                    result += &format!(
-                        ", at grid cells {}",
-                        Self::format_hyperlink_match(hyperlink_match)
-                    );
-                    result
-                };
-
-            assert_ne!(
-                self.expected_hyperlink.hyperlink_kind,
-                HyperlinkKind::Iri,
-                "\n    at {}\nExpected a path, but was a iri:\n{}",
-                self.source_location,
-                self.format_renderable_content()
-            );
-
-            assert_eq!(
-                format_path_with_position_and_match(
-                    &PathWithPosition {
-                        path: PathBuf::from(self.expected_hyperlink.iri_or_path.clone()),
-                        row: self.expected_hyperlink.row,
-                        column: self.expected_hyperlink.column
-                    },
-                    &self.expected_hyperlink.hyperlink_match
-                ),
-                format_path_with_position_and_match(&path_with_position, hyperlink_match),
-                "\n    at {}:\n{}",
-                self.source_location,
-                self.format_renderable_content()
-            );
-        }
-
-        fn check_iri_and_match(&self, iri: String, hyperlink_match: &Match) {
-            let format_iri_and_match = |iri: &String, hyperlink_match: &Match| {
-                format!(
-                    "Url = «{iri}», at grid cells {}",
-                    Self::format_hyperlink_match(hyperlink_match)
-                )
-            };
-
-            assert_eq!(
-                self.expected_hyperlink.hyperlink_kind,
-                HyperlinkKind::Iri,
-                "\n    at {}\nExpected a iri, but was a path:\n{}",
-                self.source_location,
-                self.format_renderable_content()
-            );
-
-            assert_eq!(
-                format_iri_and_match(
-                    &self.expected_hyperlink.iri_or_path,
-                    &self.expected_hyperlink.hyperlink_match
-                ),
-                format_iri_and_match(&iri, hyperlink_match),
-                "\n    at {}:\n{}",
-                self.source_location,
-                self.format_renderable_content()
-            );
-        }
-
-        fn format_hyperlink_match(hyperlink_match: &Match) -> String {
-            format!(
-                "({}, {})..=({}, {})",
-                hyperlink_match.start().line.0,
-                hyperlink_match.start().column.0,
-                hyperlink_match.end().line.0,
-                hyperlink_match.end().column.0
-            )
-        }
-
-        fn format_renderable_content(&self) -> String {
-            let mut result = format!("\nHovered on '{}'\n", self.expected_hyperlink.hovered_char);
-
-            let mut first_header_row = String::new();
-            let mut second_header_row = String::new();
-            let mut marker_header_row = String::new();
-            for index in 0..self.term.columns() {
-                let remainder = index % 10;
-                if index > 0 && remainder == 0 {
-                    first_header_row.push_str(&format!("{:>10}", (index / 10)));
-                }
-                second_header_row += &remainder.to_string();
-                if index == self.expected_hyperlink.hovered_grid_point.column.0 {
-                    marker_header_row.push('↓');
-                } else {
-                    marker_header_row.push(' ');
-                }
-            }
-
-            let remainder = (self.term.columns() - 1) % 10;
-            if remainder != 0 {
-                first_header_row.push_str(&" ".repeat(remainder));
-            }
-
-            result += &format!("\n      [ {}]\n", first_header_row);
-            result += &format!("      [{}]\n", second_header_row);
-            result += &format!("       {}", marker_header_row);
-
-            for cell in self
-                .term
-                .renderable_content()
-                .display_iter
-                .filter(|cell| !cell.flags.intersects(WIDE_CHAR_SPACERS))
-            {
-                if cell.point.column.0 == 0 {
-                    let prefix =
-                        if cell.point.line == self.expected_hyperlink.hovered_grid_point.line {
-                            '→'
-                        } else {
-                            ' '
-                        };
-                    result += &format!("\n{prefix}[{:>3}] ", cell.point.line.to_string());
-                }
-
-                match cell.c {
-                    '\t' => result.push(' '),
-                    c @ _ => result.push(c),
-                }
-            }
-
-            result
-        }
-    }
-
-    fn test_hyperlink<'a>(
-        columns: usize,
-        total_cells: usize,
-        test_lines: impl Iterator<Item = &'a str>,
-        hyperlink_kind: HyperlinkKind,
-        source_location: &str,
-    ) {
-        const CARGO_DIR_REGEX: &str =
-            r#"\s+(Compiling|Checking|Documenting) [^(]+\((?<link>(?<path>.+))\)"#;
-        const RUST_DIAGNOSTIC_REGEX: &str = r#"\s+(-->|:::|at) (?<link>(?<path>.+?))(:$|$)"#;
-        const ISSUE_12338_REGEX: &str =
-            r#"[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2} (?<link>(?<path>.+))"#;
-        const MULTIPLE_SAME_LINE_REGEX: &str =
-            r#"(?<link>(?<path>🦀 multiple_same_line 🦀) 🚣(?<line>[0-9]+) 🏛(?<column>[0-9]+)):"#;
-        const PATH_HYPERLINK_TIMEOUT_MS: u64 = 1000;
-
-        thread_local! {
-            static TEST_REGEX_SEARCHES: RefCell<RegexSearches> =
-                RefCell::new({
-                    let default_settings_content: Rc<SettingsContent> =
-                        settings::parse_json_with_comments(&settings::default_settings()).unwrap();
-                    let default_terminal_settings = TerminalSettings::from_settings(&default_settings_content);
-
-                    RegexSearches::new([
-                        RUST_DIAGNOSTIC_REGEX,
-                        CARGO_DIR_REGEX,
-                        ISSUE_12338_REGEX,
-                        MULTIPLE_SAME_LINE_REGEX,
-                    ]
-                        .into_iter()
-                        .chain(default_terminal_settings.path_hyperlink_regexes
-                            .iter()
-                            .map(AsRef::as_ref)),
-                    PATH_HYPERLINK_TIMEOUT_MS)
-                });
-        }
-
-        let term_size = TermSize::new(columns, total_cells / columns + 2);
-        let (term, expected_hyperlink) =
-            build_term_from_test_lines(hyperlink_kind, term_size, test_lines);
-        let hyperlink_found = TEST_REGEX_SEARCHES.with(|regex_searches| {
-            find_from_grid_point(
-                &term,
-                expected_hyperlink.hovered_grid_point,
-                &mut regex_searches.borrow_mut(),
-            )
-        });
-        let check_hyperlink_match =
-            CheckHyperlinkMatch::new(&term, &expected_hyperlink, source_location);
-        match hyperlink_found {
-            Some((hyperlink_word, false, hyperlink_match)) => {
-                check_hyperlink_match.check_path_with_position_and_match(
-                    PathWithPosition::parse_str(&hyperlink_word),
-                    &hyperlink_match,
-                );
-            }
-            Some((hyperlink_word, true, hyperlink_match)) => {
-                check_hyperlink_match.check_iri_and_match(hyperlink_word, &hyperlink_match);
-            }
-            None => {
-                if expected_hyperlink.hyperlink_match.start()
-                    != expected_hyperlink.hyperlink_match.end()
-                {
-                    assert!(
-                        false,
-                        "No hyperlink found\n     at {source_location}:\n{}",
-                        check_hyperlink_match.format_renderable_content()
-                    )
-                }
-            }
-        }
-    }
-}
diff --git a/crates/terminal/src/terminal_settings.rs b/crates/terminal/src/terminal_settings.rs
deleted file mode 100644
index 3d70d85f35..0000000000
--- a/crates/terminal/src/terminal_settings.rs
+++ /dev/null
@@ -1,178 +0,0 @@
-use alacritty_terminal::vte::ansi::{
-    CursorShape as AlacCursorShape, CursorStyle as AlacCursorStyle,
-};
-use collections::HashMap;
-use gpui::{FontFallbacks, FontFeatures, FontWeight, Pixels, px};
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-
-pub use settings::AlternateScroll;
-
-use settings::{
-    PathHyperlinkRegex, RegisterSetting, ShowScrollbar, TerminalBlink, TerminalDockPosition,
-    TerminalLineHeight, VenvSettings, WorkingDirectory, merge_from::MergeFrom,
-};
-use task::Shell;
-use theme::FontFamilyName;
-
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
-pub struct Toolbar {
-    pub breadcrumbs: bool,
-}
-
-#[derive(Clone, Debug, Deserialize, RegisterSetting)]
-pub struct TerminalSettings {
-    pub shell: Shell,
-    pub working_directory: WorkingDirectory,
-    pub font_size: Option<Pixels>, // todo(settings_refactor) can be non-optional...
-    pub font_family: Option<FontFamilyName>,
-    pub font_fallbacks: Option<FontFallbacks>,
-    pub font_features: Option<FontFeatures>,
-    pub font_weight: Option<FontWeight>,
-    pub line_height: TerminalLineHeight,
-    pub env: HashMap<String, String>,
-    pub cursor_shape: CursorShape,
-    pub blinking: TerminalBlink,
-    pub alternate_scroll: AlternateScroll,
-    pub option_as_meta: bool,
-    pub copy_on_select: bool,
-    pub keep_selection_on_copy: bool,
-    pub button: bool,
-    pub dock: TerminalDockPosition,
-    pub default_width: Pixels,
-    pub default_height: Pixels,
-    pub detect_venv: VenvSettings,
-    pub max_scroll_history_lines: Option<usize>,
-    pub scroll_multiplier: f32,
-    pub toolbar: Toolbar,
-    pub scrollbar: ScrollbarSettings,
-    pub minimum_contrast: f32,
-    pub path_hyperlink_regexes: Vec<String>,
-    pub path_hyperlink_timeout_ms: u64,
-}
-
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
-pub struct ScrollbarSettings {
-    /// When to show the scrollbar in the terminal.
-    ///
-    /// Default: inherits editor scrollbar settings
-    pub show: Option<ShowScrollbar>,
-}
-
-fn settings_shell_to_task_shell(shell: settings::Shell) -> Shell {
-    match shell {
-        settings::Shell::System => Shell::System,
-        settings::Shell::Program(program) => Shell::Program(program),
-        settings::Shell::WithArguments {
-            program,
-            args,
-            title_override,
-        } => Shell::WithArguments {
-            program,
-            args,
-            title_override: title_override.map(Into::into),
-        },
-    }
-}
-
-impl settings::Settings for TerminalSettings {
-    fn from_settings(content: &settings::SettingsContent) -> Self {
-        let user_content = content.terminal.clone().unwrap();
-        // Note: we allow a subset of "terminal" settings in the project files.
-        let mut project_content = user_content.project.clone();
-        project_content.merge_from_option(content.project.terminal.as_ref());
-        TerminalSettings {
-            shell: settings_shell_to_task_shell(project_content.shell.unwrap()),
-            working_directory: project_content.working_directory.unwrap(),
-            font_size: user_content.font_size.map(px),
-            font_family: user_content.font_family,
-            font_fallbacks: user_content.font_fallbacks.map(|fallbacks| {
-                FontFallbacks::from_fonts(
-                    fallbacks
-                        .into_iter()
-                        .map(|family| family.0.to_string())
-                        .collect(),
-                )
-            }),
-            font_features: user_content.font_features,
-            font_weight: user_content.font_weight,
-            line_height: user_content.line_height.unwrap(),
-            env: project_content.env.unwrap(),
-            cursor_shape: user_content.cursor_shape.unwrap().into(),
-            blinking: user_content.blinking.unwrap(),
-            alternate_scroll: user_content.alternate_scroll.unwrap(),
-            option_as_meta: user_content.option_as_meta.unwrap(),
-            copy_on_select: user_content.copy_on_select.unwrap(),
-            keep_selection_on_copy: user_content.keep_selection_on_copy.unwrap(),
-            button: user_content.button.unwrap(),
-            dock: user_content.dock.unwrap(),
-            default_width: px(user_content.default_width.unwrap()),
-            default_height: px(user_content.default_height.unwrap()),
-            detect_venv: project_content.detect_venv.unwrap(),
-            scroll_multiplier: user_content.scroll_multiplier.unwrap(),
-            max_scroll_history_lines: user_content.max_scroll_history_lines,
-            toolbar: Toolbar {
-                breadcrumbs: user_content.toolbar.unwrap().breadcrumbs.unwrap(),
-            },
-            scrollbar: ScrollbarSettings {
-                show: user_content.scrollbar.unwrap().show,
-            },
-            minimum_contrast: user_content.minimum_contrast.unwrap(),
-            path_hyperlink_regexes: project_content
-                .path_hyperlink_regexes
-                .unwrap()
-                .into_iter()
-                .map(|regex| match regex {
-                    PathHyperlinkRegex::SingleLine(regex) => regex,
-                    PathHyperlinkRegex::MultiLine(regex) => regex.join("\n"),
-                })
-                .collect(),
-            path_hyperlink_timeout_ms: project_content.path_hyperlink_timeout_ms.unwrap(),
-        }
-    }
-}
-
-#[derive(Clone, Copy, Debug, Default, Serialize, Deserialize, PartialEq, Eq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum CursorShape {
-    /// Cursor is a block like `█`.
-    #[default]
-    Block,
-    /// Cursor is an underscore like `_`.
-    Underline,
-    /// Cursor is a vertical bar like `⎸`.
-    Bar,
-    /// Cursor is a hollow box like `▯`.
-    Hollow,
-}
-
-impl From<settings::CursorShapeContent> for CursorShape {
-    fn from(value: settings::CursorShapeContent) -> Self {
-        match value {
-            settings::CursorShapeContent::Block => CursorShape::Block,
-            settings::CursorShapeContent::Underline => CursorShape::Underline,
-            settings::CursorShapeContent::Bar => CursorShape::Bar,
-            settings::CursorShapeContent::Hollow => CursorShape::Hollow,
-        }
-    }
-}
-
-impl From<CursorShape> for AlacCursorShape {
-    fn from(value: CursorShape) -> Self {
-        match value {
-            CursorShape::Block => AlacCursorShape::Block,
-            CursorShape::Underline => AlacCursorShape::Underline,
-            CursorShape::Bar => AlacCursorShape::Beam,
-            CursorShape::Hollow => AlacCursorShape::HollowBlock,
-        }
-    }
-}
-
-impl From<CursorShape> for AlacCursorStyle {
-    fn from(value: CursorShape) -> Self {
-        AlacCursorStyle {
-            shape: value.into(),
-            blinking: false,
-        }
-    }
-}
diff --git a/crates/terminal_view/Cargo.toml b/crates/terminal_view/Cargo.toml
deleted file mode 100644
index eadd00bcbb..0000000000
--- a/crates/terminal_view/Cargo.toml
+++ /dev/null
@@ -1,58 +0,0 @@
-[package]
-name = "terminal_view"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[features]
-test-support = ["editor/test-support", "gpui/test-support"]
-
-[lib]
-path = "src/terminal_view.rs"
-doctest = false
-
-[dependencies]
-anyhow.workspace = true
-async-recursion.workspace = true
-assistant_slash_command.workspace = true
-breadcrumbs.workspace = true
-collections.workspace = true
-db.workspace = true
-dirs.workspace = true
-editor.workspace = true
-futures.workspace = true
-gpui.workspace = true
-itertools.workspace = true
-language.workspace = true
-log.workspace = true
-pretty_assertions.workspace = true
-project.workspace = true
-regex.workspace = true
-task.workspace = true
-schemars.workspace = true
-search.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-shellexpand.workspace = true
-terminal.workspace = true
-theme.workspace = true
-ui.workspace = true
-util.workspace = true
-workspace.workspace = true
-zed_actions.workspace = true
-
-[dev-dependencies]
-client = { workspace = true, features = ["test-support"] }
-editor = { workspace = true, features = ["test-support"] }
-gpui = { workspace = true, features = ["test-support"] }
-project = { workspace = true, features = ["test-support"] }
-rand.workspace = true
-workspace = { workspace = true, features = ["test-support"] }
-
-[package.metadata.cargo-machete]
-ignored = ["log"]
diff --git a/crates/terminal_view/LICENSE-GPL b/crates/terminal_view/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/terminal_view/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/terminal_view/README.md b/crates/terminal_view/README.md
deleted file mode 100644
index ca48f54542..0000000000
--- a/crates/terminal_view/README.md
+++ /dev/null
@@ -1,23 +0,0 @@
-Design notes:
-
-This crate is split into two conceptual halves:
-- The terminal.rs file and the src/mappings/ folder, these contain the code for interacting with Alacritty and maintaining the pty event loop. Some behavior in this file is constrained by terminal protocols and standards. The Zed init function is also placed here.
-- Everything else. These other files integrate the `Terminal` struct created in terminal.rs into the rest of GPUI. The main entry point for GPUI is the terminal_view.rs file and the modal.rs file.
-
-ttys are created externally, and so can fail in unexpected ways. However, GPUI currently does not have an API for models than can fail to instantiate. `TerminalBuilder` solves this by using Rust's type system to split tty instantiation into a 2 step process: first attempt to create the file handles with `TerminalBuilder::new()`, check the result, then call `TerminalBuilder::subscribe(cx)` from within a model context.
-
-The TerminalView struct abstracts over failed and successful terminals, passing focus through to the associated view and allowing clients to build a terminal without worrying about errors.
-
-#Input
-
-There are currently many distinct paths for getting keystrokes to the terminal:
-
-1. Terminal specific characters and bindings. Things like ctrl-a mapping to ASCII control character 1, ANSI escape codes associated with the function keys, etc. These are caught with a raw key-down handler in the element and are processed immediately. This is done with the `try_keystroke()` method on Terminal
-
-2. GPU Action handlers. GPUI clobbers a few vital keys by adding bindings to them in the global context. These keys are synthesized and then dispatched through the same `try_keystroke()` API as the above mappings
-
-3. IME text. When the special character mappings fail, we pass the keystroke back to GPUI to hand it to the IME system. This comes back to us in the `View::replace_text_in_range()` method, and we then send that to the terminal directly, bypassing `try_keystroke()`.
-
-4. Pasted text has a separate pathway.
-
-Generally, there's a distinction between 'keystrokes that need to be mapped' and 'strings which need to be written'. I've attempted to unify these under the '.try_keystroke()' API and the `.input()` API (which try_keystroke uses) so we have consistent input handling across the terminal
diff --git a/crates/terminal_view/scripts/print256color.sh b/crates/terminal_view/scripts/print256color.sh
deleted file mode 100755
index 9cb3b1c47c..0000000000
--- a/crates/terminal_view/scripts/print256color.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/usr/bin/env bash
-
-# Tom Hale, 2016. MIT Licence.
-# Print out 256 colours, with each number printed in its corresponding colour
-# See http://askubuntu.com/questions/821157/print-a-256-color-test-pattern-in-the-terminal/821163#821163
-
-set -eu # Fail on errors or undeclared variables
-
-printable_colours=256
-
-# Return a colour that contrasts with the given colour
-# Bash only does integer division, so keep it integral
-function contrast_colour {
-    local r g b luminance
-    colour="$1"
-
-    if (( colour < 16 )); then # Initial 16 ANSI colours
-        (( colour == 0 )) && printf "15" || printf "0"
-        return
-    fi
-
-    # Greyscale # rgb_R = rgb_G = rgb_B = (number - 232) * 10 + 8
-    if (( colour > 231 )); then # Greyscale ramp
-        (( colour < 244 )) && printf "15" || printf "0"
-        return
-    fi
-
-    # All other colours:
-    # 6x6x6 colour cube = 16 + 36*R + 6*G + B  # Where RGB are [0..5]
-    # See http://stackoverflow.com/a/27165165/5353461
-
-    # r=$(( (colour-16) / 36 ))
-    g=$(( ((colour-16) % 36) / 6 ))
-    # b=$(( (colour-16) % 6 ))
-
-    # If luminance is bright, print number in black, white otherwise.
-    # Green contributes 587/1000 to human perceived luminance - ITU R-REC-BT.601
-    (( g > 2)) && printf "0" || printf "15"
-    return
-
-    # Uncomment the below for more precise luminance calculations
-
-    # # Calculate perceived brightness
-    # # See https://www.w3.org/TR/AERT#color-contrast
-    # # and http://www.itu.int/rec/R-REC-BT.601
-    # # Luminance is in range 0..5000 as each value is 0..5
-    # luminance=$(( (r * 299) + (g * 587) + (b * 114) ))
-    # (( $luminance > 2500 )) && printf "0" || printf "15"
-}
-
-# Print a coloured block with the number of that colour
-function print_colour {
-    local colour="$1" contrast
-    contrast=$(contrast_colour "$1")
-    printf "\e[48;5;%sm" "$colour"                # Start block of colour
-    printf "\e[38;5;%sm%3d" "$contrast" "$colour" # In contrast, print number
-    printf "\e[0m "                               # Reset colour
-}
-
-# Starting at $1, print a run of $2 colours
-function print_run {
-    local i
-    for (( i = "$1"; i < "$1" + "$2" && i < printable_colours; i++ )) do
-        print_colour "$i"
-    done
-    printf "  "
-}
-
-# Print blocks of colours
-function print_blocks {
-    local start="$1" i
-    local end="$2" # inclusive
-    local block_cols="$3"
-    local block_rows="$4"
-    local blocks_per_line="$5"
-    local block_length=$((block_cols * block_rows))
-
-    # Print sets of blocks
-    for (( i = start; i <= end; i += (blocks_per_line-1) * block_length )) do
-        printf "\n" # Space before each set of blocks
-        # For each block row
-        for (( row = 0; row < block_rows; row++ )) do
-            # Print block columns for all blocks on the line
-            for (( block = 0; block < blocks_per_line; block++ )) do
-                print_run $(( i + (block * block_length) )) "$block_cols"
-            done
-            (( i += block_cols )) # Prepare to print the next row
-            printf "\n"
-        done
-    done
-}
-
-print_run 0 16 # The first 16 colours are spread over the whole spectrum
-printf "\n"
-print_blocks 16 231 6 6 3 # 6x6x6 colour cube between 16 and 231 inclusive
-print_blocks 232 255 12 2 1 # Not 50, but 24 Shades of Grey
diff --git a/crates/terminal_view/scripts/truecolor.sh b/crates/terminal_view/scripts/truecolor.sh
deleted file mode 100755
index 622051f242..0000000000
--- a/crates/terminal_view/scripts/truecolor.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-# Copied from: https://unix.stackexchange.com/a/696756
-# Based on: https://gist.github.com/XVilka/8346728 and https://unix.stackexchange.com/a/404415/395213
-
-awk -v term_cols="${width:-$(tput cols || echo 80)}" -v term_lines="${height:-1}" 'BEGIN{
-    s="/\\";
-    total_cols=term_cols*term_lines;
-    for (colnum = 0; colnum<total_cols; colnum++) {
-        r = 255-(colnum*255/total_cols);
-        g = (colnum*510/total_cols);
-        b = (colnum*255/total_cols);
-        if (g>255) g = 510-g;
-        printf "\033[48;2;%d;%d;%dm", r,g,b;
-        printf "\033[38;2;%d;%d;%dm", 255-r,255-g,255-b;
-        printf "%s\033[0m", substr(s,colnum%2+1,1);
-        if (colnum%term_cols==term_cols) printf "\n";
-    }
-    printf "\n";
-}'
diff --git a/crates/terminal_view/src/persistence.rs b/crates/terminal_view/src/persistence.rs
deleted file mode 100644
index 8d6ef03fd7..0000000000
--- a/crates/terminal_view/src/persistence.rs
+++ /dev/null
@@ -1,487 +0,0 @@
-use anyhow::Result;
-use async_recursion::async_recursion;
-use collections::HashSet;
-use futures::{StreamExt as _, stream::FuturesUnordered};
-use gpui::{AppContext as _, AsyncWindowContext, Axis, Entity, Task, WeakEntity};
-use project::Project;
-use serde::{Deserialize, Serialize};
-use std::path::PathBuf;
-use ui::{App, Context, Pixels, Window};
-use util::ResultExt as _;
-
-use db::{
-    query,
-    sqlez::{domain::Domain, statement::Statement, thread_safe_connection::ThreadSafeConnection},
-    sqlez_macros::sql,
-};
-use workspace::{
-    ItemHandle, ItemId, Member, Pane, PaneAxis, PaneGroup, SerializableItem as _, Workspace,
-    WorkspaceDb, WorkspaceId,
-};
-
-use crate::{
-    TerminalView, default_working_directory,
-    terminal_panel::{TerminalPanel, new_terminal_pane},
-};
-
-pub(crate) fn serialize_pane_group(
-    pane_group: &PaneGroup,
-    active_pane: &Entity<Pane>,
-    cx: &mut App,
-) -> SerializedPaneGroup {
-    build_serialized_pane_group(&pane_group.root, active_pane, cx)
-}
-
-fn build_serialized_pane_group(
-    pane_group: &Member,
-    active_pane: &Entity<Pane>,
-    cx: &mut App,
-) -> SerializedPaneGroup {
-    match pane_group {
-        Member::Axis(PaneAxis {
-            axis,
-            members,
-            flexes,
-            bounding_boxes: _,
-        }) => SerializedPaneGroup::Group {
-            axis: SerializedAxis(*axis),
-            children: members
-                .iter()
-                .map(|member| build_serialized_pane_group(member, active_pane, cx))
-                .collect::<Vec<_>>(),
-            flexes: Some(flexes.lock().clone()),
-        },
-        Member::Pane(pane_handle) => {
-            SerializedPaneGroup::Pane(serialize_pane(pane_handle, pane_handle == active_pane, cx))
-        }
-    }
-}
-
-fn serialize_pane(pane: &Entity<Pane>, active: bool, cx: &mut App) -> SerializedPane {
-    let mut items_to_serialize = HashSet::default();
-    let pane = pane.read(cx);
-    let children = pane
-        .items()
-        .filter_map(|item| {
-            let terminal_view = item.act_as::<TerminalView>(cx)?;
-            if terminal_view.read(cx).terminal().read(cx).task().is_some() {
-                None
-            } else {
-                let id = item.item_id().as_u64();
-                items_to_serialize.insert(id);
-                Some(id)
-            }
-        })
-        .collect::<Vec<_>>();
-    let active_item = pane
-        .active_item()
-        .map(|item| item.item_id().as_u64())
-        .filter(|active_id| items_to_serialize.contains(active_id));
-
-    let pinned_count = pane.pinned_count();
-    SerializedPane {
-        active,
-        children,
-        active_item,
-        pinned_count,
-    }
-}
-
-pub(crate) fn deserialize_terminal_panel(
-    workspace: WeakEntity<Workspace>,
-    project: Entity<Project>,
-    database_id: WorkspaceId,
-    serialized_panel: SerializedTerminalPanel,
-    window: &mut Window,
-    cx: &mut App,
-) -> Task<anyhow::Result<Entity<TerminalPanel>>> {
-    window.spawn(cx, async move |cx| {
-        let terminal_panel = workspace.update_in(cx, |workspace, window, cx| {
-            cx.new(|cx| {
-                let mut panel = TerminalPanel::new(workspace, window, cx);
-                panel.height = serialized_panel.height.map(|h| h.round());
-                panel.width = serialized_panel.width.map(|w| w.round());
-                panel
-            })
-        })?;
-        match &serialized_panel.items {
-            SerializedItems::NoSplits(item_ids) => {
-                let items = deserialize_terminal_views(
-                    database_id,
-                    project,
-                    workspace,
-                    item_ids.as_slice(),
-                    cx,
-                )
-                .await;
-                let active_item = serialized_panel.active_item_id;
-                terminal_panel.update_in(cx, |terminal_panel, window, cx| {
-                    terminal_panel.active_pane.update(cx, |pane, cx| {
-                        populate_pane_items(pane, items, active_item, window, cx);
-                    });
-                })?;
-            }
-            SerializedItems::WithSplits(serialized_pane_group) => {
-                let center_pane = deserialize_pane_group(
-                    workspace,
-                    project,
-                    terminal_panel.clone(),
-                    database_id,
-                    serialized_pane_group,
-                    cx,
-                )
-                .await;
-                if let Some((center_group, active_pane)) = center_pane {
-                    terminal_panel.update(cx, |terminal_panel, _| {
-                        terminal_panel.center = PaneGroup::with_root(center_group);
-                        terminal_panel.active_pane =
-                            active_pane.unwrap_or_else(|| terminal_panel.center.first_pane());
-                    })?;
-                }
-            }
-        }
-
-        Ok(terminal_panel)
-    })
-}
-
-fn populate_pane_items(
-    pane: &mut Pane,
-    items: Vec<Entity<TerminalView>>,
-    active_item: Option<u64>,
-    window: &mut Window,
-    cx: &mut Context<Pane>,
-) {
-    let mut item_index = pane.items_len();
-    let mut active_item_index = None;
-    for item in items {
-        if Some(item.item_id().as_u64()) == active_item {
-            active_item_index = Some(item_index);
-        }
-        pane.add_item(Box::new(item), false, false, None, window, cx);
-        item_index += 1;
-    }
-    if let Some(index) = active_item_index {
-        pane.activate_item(index, false, false, window, cx);
-    }
-}
-
-#[async_recursion(?Send)]
-async fn deserialize_pane_group(
-    workspace: WeakEntity<Workspace>,
-    project: Entity<Project>,
-    panel: Entity<TerminalPanel>,
-    workspace_id: WorkspaceId,
-    serialized: &SerializedPaneGroup,
-    cx: &mut AsyncWindowContext,
-) -> Option<(Member, Option<Entity<Pane>>)> {
-    match serialized {
-        SerializedPaneGroup::Group {
-            axis,
-            flexes,
-            children,
-        } => {
-            let mut current_active_pane = None;
-            let mut members = Vec::new();
-            for child in children {
-                if let Some((new_member, active_pane)) = deserialize_pane_group(
-                    workspace.clone(),
-                    project.clone(),
-                    panel.clone(),
-                    workspace_id,
-                    child,
-                    cx,
-                )
-                .await
-                {
-                    members.push(new_member);
-                    current_active_pane = current_active_pane.or(active_pane);
-                }
-            }
-
-            if members.is_empty() {
-                return None;
-            }
-
-            if members.len() == 1 {
-                return Some((members.remove(0), current_active_pane));
-            }
-
-            Some((
-                Member::Axis(PaneAxis::load(axis.0, members, flexes.clone())),
-                current_active_pane,
-            ))
-        }
-        SerializedPaneGroup::Pane(serialized_pane) => {
-            let active = serialized_pane.active;
-
-            let pane = panel
-                .update_in(cx, |terminal_panel, window, cx| {
-                    new_terminal_pane(
-                        workspace.clone(),
-                        project.clone(),
-                        terminal_panel.active_pane.read(cx).is_zoomed(),
-                        window,
-                        cx,
-                    )
-                })
-                .log_err()?;
-            let active_item = serialized_pane.active_item;
-            let pinned_count = serialized_pane.pinned_count;
-            let new_items = deserialize_terminal_views(
-                workspace_id,
-                project.clone(),
-                workspace.clone(),
-                serialized_pane.children.as_slice(),
-                cx,
-            );
-            cx.spawn({
-                let pane = pane.downgrade();
-                async move |cx| {
-                    let new_items = new_items.await;
-
-                    let items = pane.update_in(cx, |pane, window, cx| {
-                        populate_pane_items(pane, new_items, active_item, window, cx);
-                        pane.set_pinned_count(pinned_count);
-                        pane.items_len()
-                    });
-                    // Avoid blank panes in splits
-                    if items.is_ok_and(|items| items == 0) {
-                        let working_directory = workspace
-                            .update(cx, |workspace, cx| default_working_directory(workspace, cx))
-                            .ok()
-                            .flatten();
-                        let Some(terminal) = project
-                            .update(cx, |project, cx| {
-                                project.create_terminal_shell(working_directory, cx)
-                            })
-                            .log_err()
-                        else {
-                            return;
-                        };
-
-                        let terminal = terminal.await.log_err();
-                        pane.update_in(cx, |pane, window, cx| {
-                            if let Some(terminal) = terminal {
-                                let terminal_view = Box::new(cx.new(|cx| {
-                                    TerminalView::new(
-                                        terminal,
-                                        workspace.clone(),
-                                        Some(workspace_id),
-                                        project.downgrade(),
-                                        window,
-                                        cx,
-                                    )
-                                }));
-                                pane.add_item(terminal_view, true, false, None, window, cx);
-                            }
-                        })
-                        .ok();
-                    }
-                }
-            })
-            .await;
-            Some((Member::Pane(pane.clone()), active.then_some(pane)))
-        }
-    }
-}
-
-fn deserialize_terminal_views(
-    workspace_id: WorkspaceId,
-    project: Entity<Project>,
-    workspace: WeakEntity<Workspace>,
-    item_ids: &[u64],
-    cx: &mut AsyncWindowContext,
-) -> impl Future<Output = Vec<Entity<TerminalView>>> + use<> {
-    let mut deserialized_items = item_ids
-        .iter()
-        .map(|item_id| {
-            cx.update(|window, cx| {
-                TerminalView::deserialize(
-                    project.clone(),
-                    workspace.clone(),
-                    workspace_id,
-                    *item_id,
-                    window,
-                    cx,
-                )
-            })
-            .unwrap_or_else(|e| Task::ready(Err(e.context("no window present"))))
-        })
-        .collect::<FuturesUnordered<_>>();
-    async move {
-        let mut items = Vec::with_capacity(deserialized_items.len());
-        while let Some(item) = deserialized_items.next().await {
-            if let Some(item) = item.log_err() {
-                items.push(item);
-            }
-        }
-        items
-    }
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub(crate) struct SerializedTerminalPanel {
-    pub items: SerializedItems,
-    // A deprecated field, kept for backwards compatibility for the code before terminal splits were introduced.
-    pub active_item_id: Option<u64>,
-    pub width: Option<Pixels>,
-    pub height: Option<Pixels>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(untagged)]
-pub(crate) enum SerializedItems {
-    // The data stored before terminal splits were introduced.
-    NoSplits(Vec<u64>),
-    WithSplits(SerializedPaneGroup),
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub(crate) enum SerializedPaneGroup {
-    Pane(SerializedPane),
-    Group {
-        axis: SerializedAxis,
-        flexes: Option<Vec<f32>>,
-        children: Vec<SerializedPaneGroup>,
-    },
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub(crate) struct SerializedPane {
-    pub active: bool,
-    pub children: Vec<u64>,
-    pub active_item: Option<u64>,
-    #[serde(default)]
-    pub pinned_count: usize,
-}
-
-#[derive(Debug)]
-pub(crate) struct SerializedAxis(pub Axis);
-
-impl Serialize for SerializedAxis {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        match self.0 {
-            Axis::Horizontal => serializer.serialize_str("horizontal"),
-            Axis::Vertical => serializer.serialize_str("vertical"),
-        }
-    }
-}
-
-impl<'de> Deserialize<'de> for SerializedAxis {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        let s = String::deserialize(deserializer)?;
-        match s.as_str() {
-            "horizontal" => Ok(SerializedAxis(Axis::Horizontal)),
-            "vertical" => Ok(SerializedAxis(Axis::Vertical)),
-            invalid => Err(serde::de::Error::custom(format!(
-                "Invalid axis value: '{invalid}'"
-            ))),
-        }
-    }
-}
-
-pub struct TerminalDb(ThreadSafeConnection);
-
-impl Domain for TerminalDb {
-    const NAME: &str = stringify!(TerminalDb);
-
-    const MIGRATIONS: &[&str] = &[
-        sql!(
-            CREATE TABLE terminals (
-                workspace_id INTEGER,
-                item_id INTEGER UNIQUE,
-                working_directory BLOB,
-                PRIMARY KEY(workspace_id, item_id),
-                FOREIGN KEY(workspace_id) REFERENCES workspaces(workspace_id)
-                ON DELETE CASCADE
-            ) STRICT;
-        ),
-        // Remove the unique constraint on the item_id table
-        // SQLite doesn't have a way of doing this automatically, so
-        // we have to do this silly copying.
-        sql!(
-            CREATE TABLE terminals2 (
-                workspace_id INTEGER,
-                item_id INTEGER,
-                working_directory BLOB,
-                PRIMARY KEY(workspace_id, item_id),
-                FOREIGN KEY(workspace_id) REFERENCES workspaces(workspace_id)
-                ON DELETE CASCADE
-            ) STRICT;
-
-            INSERT INTO terminals2 (workspace_id, item_id, working_directory)
-            SELECT workspace_id, item_id, working_directory FROM terminals;
-
-            DROP TABLE terminals;
-
-            ALTER TABLE terminals2 RENAME TO terminals;
-        ),
-        sql! (
-            ALTER TABLE terminals ADD COLUMN working_directory_path TEXT;
-            UPDATE terminals SET working_directory_path = CAST(working_directory AS TEXT);
-        ),
-    ];
-}
-
-db::static_connection!(TERMINAL_DB, TerminalDb, [WorkspaceDb]);
-
-impl TerminalDb {
-    query! {
-       pub async fn update_workspace_id(
-            new_id: WorkspaceId,
-            old_id: WorkspaceId,
-            item_id: ItemId
-        ) -> Result<()> {
-            UPDATE terminals
-            SET workspace_id = ?
-            WHERE workspace_id = ? AND item_id = ?
-        }
-    }
-
-    pub async fn save_working_directory(
-        &self,
-        item_id: ItemId,
-        workspace_id: WorkspaceId,
-        working_directory: PathBuf,
-    ) -> Result<()> {
-        log::debug!(
-            "Saving working directory {working_directory:?} for item {item_id} in workspace {workspace_id:?}"
-        );
-        let query =
-            "INSERT INTO terminals(item_id, workspace_id, working_directory, working_directory_path)
-            VALUES (?1, ?2, ?3, ?4)
-            ON CONFLICT DO UPDATE SET
-                item_id = ?1,
-                workspace_id = ?2,
-                working_directory = ?3,
-                working_directory_path = ?4"
-        ;
-        self.write(move |conn| {
-            let mut statement = Statement::prepare(conn, query)?;
-            let mut next_index = statement.bind(&item_id, 1)?;
-            next_index = statement.bind(&workspace_id, next_index)?;
-            next_index = statement.bind(&working_directory, next_index)?;
-            statement.bind(
-                &working_directory.to_string_lossy().into_owned(),
-                next_index,
-            )?;
-            statement.exec()
-        })
-        .await
-    }
-
-    query! {
-        pub fn get_working_directory(item_id: ItemId, workspace_id: WorkspaceId) -> Result<Option<PathBuf>> {
-            SELECT working_directory
-            FROM terminals
-            WHERE item_id = ? AND workspace_id = ?
-        }
-    }
-}
diff --git a/crates/terminal_view/src/terminal_element.rs b/crates/terminal_view/src/terminal_element.rs
deleted file mode 100644
index fd9568b0c5..0000000000
--- a/crates/terminal_view/src/terminal_element.rs
+++ /dev/null
@@ -1,2049 +0,0 @@
-use editor::{CursorLayout, EditorSettings, HighlightedRange, HighlightedRangeLine};
-use gpui::{
-    AbsoluteLength, AnyElement, App, AvailableSpace, Bounds, ContentMask, Context, DispatchPhase,
-    Element, ElementId, Entity, FocusHandle, Font, FontFeatures, FontStyle, FontWeight,
-    GlobalElementId, HighlightStyle, Hitbox, Hsla, InputHandler, InteractiveElement, Interactivity,
-    IntoElement, LayoutId, Length, ModifiersChangedEvent, MouseButton, MouseMoveEvent, Pixels,
-    Point, ShapedLine, StatefulInteractiveElement, StrikethroughStyle, Styled, TextRun, TextStyle,
-    UTF16Selection, UnderlineStyle, WeakEntity, WhiteSpace, Window, div, fill, point, px, relative,
-    size,
-};
-use itertools::Itertools;
-use language::CursorShape;
-use settings::Settings;
-use std::time::Instant;
-use terminal::{
-    IndexedCell, Terminal, TerminalBounds, TerminalContent,
-    alacritty_terminal::{
-        grid::Dimensions,
-        index::Point as AlacPoint,
-        term::{TermMode, cell::Flags},
-        vte::ansi::{
-            Color::{self as AnsiColor, Named},
-            CursorShape as AlacCursorShape, NamedColor,
-        },
-    },
-    terminal_settings::TerminalSettings,
-};
-use theme::{ActiveTheme, Theme, ThemeSettings};
-use ui::utils::ensure_minimum_contrast;
-use ui::{ParentElement, Tooltip};
-use util::ResultExt;
-use workspace::Workspace;
-
-use std::mem;
-use std::{fmt::Debug, ops::RangeInclusive, rc::Rc};
-
-use crate::{BlockContext, BlockProperties, ContentMode, TerminalMode, TerminalView};
-
-/// The information generated during layout that is necessary for painting.
-pub struct LayoutState {
-    hitbox: Hitbox,
-    batched_text_runs: Vec<BatchedTextRun>,
-    rects: Vec<LayoutRect>,
-    relative_highlighted_ranges: Vec<(RangeInclusive<AlacPoint>, Hsla)>,
-    cursor: Option<CursorLayout>,
-    background_color: Hsla,
-    dimensions: TerminalBounds,
-    mode: TermMode,
-    display_offset: usize,
-    hyperlink_tooltip: Option<AnyElement>,
-    gutter: Pixels,
-    block_below_cursor_element: Option<AnyElement>,
-    base_text_style: TextStyle,
-    content_mode: ContentMode,
-}
-
-/// Helper struct for converting data between Alacritty's cursor points, and displayed cursor points.
-struct DisplayCursor {
-    line: i32,
-    col: usize,
-}
-
-impl DisplayCursor {
-    fn from(cursor_point: AlacPoint, display_offset: usize) -> Self {
-        Self {
-            line: cursor_point.line.0 + display_offset as i32,
-            col: cursor_point.column.0,
-        }
-    }
-
-    pub fn line(&self) -> i32 {
-        self.line
-    }
-
-    pub fn col(&self) -> usize {
-        self.col
-    }
-}
-
-/// A batched text run that combines multiple adjacent cells with the same style
-#[derive(Debug)]
-pub struct BatchedTextRun {
-    pub start_point: AlacPoint<i32, i32>,
-    pub text: String,
-    pub cell_count: usize,
-    pub style: TextRun,
-    pub font_size: AbsoluteLength,
-}
-
-impl BatchedTextRun {
-    fn new_from_char(
-        start_point: AlacPoint<i32, i32>,
-        c: char,
-        style: TextRun,
-        font_size: AbsoluteLength,
-    ) -> Self {
-        let mut text = String::with_capacity(100); // Pre-allocate for typical line length
-        text.push(c);
-        BatchedTextRun {
-            start_point,
-            text,
-            cell_count: 1,
-            style,
-            font_size,
-        }
-    }
-
-    fn can_append(&self, other_style: &TextRun) -> bool {
-        self.style.font == other_style.font
-            && self.style.color == other_style.color
-            && self.style.background_color == other_style.background_color
-            && self.style.underline == other_style.underline
-            && self.style.strikethrough == other_style.strikethrough
-    }
-
-    fn append_char(&mut self, c: char) {
-        self.append_char_internal(c, true);
-    }
-
-    fn append_zero_width_chars(&mut self, chars: &[char]) {
-        for &c in chars {
-            self.append_char_internal(c, false);
-        }
-    }
-
-    fn append_char_internal(&mut self, c: char, counts_cell: bool) {
-        self.text.push(c);
-        if counts_cell {
-            self.cell_count += 1;
-        }
-        self.style.len += c.len_utf8();
-    }
-
-    pub fn paint(
-        &self,
-        origin: Point<Pixels>,
-        dimensions: &TerminalBounds,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        let pos = Point::new(
-            origin.x + self.start_point.column as f32 * dimensions.cell_width,
-            origin.y + self.start_point.line as f32 * dimensions.line_height,
-        );
-
-        let _ = window
-            .text_system()
-            .shape_line(
-                self.text.clone().into(),
-                self.font_size.to_pixels(window.rem_size()),
-                std::slice::from_ref(&self.style),
-                Some(dimensions.cell_width),
-            )
-            .paint(pos, dimensions.line_height, window, cx);
-    }
-}
-
-#[derive(Clone, Debug, Default)]
-pub struct LayoutRect {
-    point: AlacPoint<i32, i32>,
-    num_of_cells: usize,
-    color: Hsla,
-}
-
-impl LayoutRect {
-    fn new(point: AlacPoint<i32, i32>, num_of_cells: usize, color: Hsla) -> LayoutRect {
-        LayoutRect {
-            point,
-            num_of_cells,
-            color,
-        }
-    }
-
-    pub fn paint(&self, origin: Point<Pixels>, dimensions: &TerminalBounds, window: &mut Window) {
-        let position = {
-            let alac_point = self.point;
-            point(
-                (origin.x + alac_point.column as f32 * dimensions.cell_width).floor(),
-                origin.y + alac_point.line as f32 * dimensions.line_height,
-            )
-        };
-        let size = point(
-            (dimensions.cell_width * self.num_of_cells as f32).ceil(),
-            dimensions.line_height,
-        )
-        .into();
-
-        window.paint_quad(fill(Bounds::new(position, size), self.color));
-    }
-}
-
-/// Represents a rectangular region with a specific background color
-#[derive(Debug, Clone)]
-struct BackgroundRegion {
-    start_line: i32,
-    start_col: i32,
-    end_line: i32,
-    end_col: i32,
-    color: Hsla,
-}
-
-impl BackgroundRegion {
-    fn new(line: i32, col: i32, color: Hsla) -> Self {
-        BackgroundRegion {
-            start_line: line,
-            start_col: col,
-            end_line: line,
-            end_col: col,
-            color,
-        }
-    }
-
-    /// Check if this region can be merged with another region
-    fn can_merge_with(&self, other: &BackgroundRegion) -> bool {
-        if self.color != other.color {
-            return false;
-        }
-
-        // Check if regions are adjacent horizontally
-        if self.start_line == other.start_line && self.end_line == other.end_line {
-            return self.end_col + 1 == other.start_col || other.end_col + 1 == self.start_col;
-        }
-
-        // Check if regions are adjacent vertically with same column span
-        if self.start_col == other.start_col && self.end_col == other.end_col {
-            return self.end_line + 1 == other.start_line || other.end_line + 1 == self.start_line;
-        }
-
-        false
-    }
-
-    /// Merge this region with another region
-    fn merge_with(&mut self, other: &BackgroundRegion) {
-        self.start_line = self.start_line.min(other.start_line);
-        self.start_col = self.start_col.min(other.start_col);
-        self.end_line = self.end_line.max(other.end_line);
-        self.end_col = self.end_col.max(other.end_col);
-    }
-}
-
-/// Merge background regions to minimize the number of rectangles
-fn merge_background_regions(regions: Vec<BackgroundRegion>) -> Vec<BackgroundRegion> {
-    if regions.is_empty() {
-        return regions;
-    }
-
-    let mut merged = regions;
-    let mut changed = true;
-
-    // Keep merging until no more merges are possible
-    while changed {
-        changed = false;
-        let mut i = 0;
-
-        while i < merged.len() {
-            let mut j = i + 1;
-            while j < merged.len() {
-                if merged[i].can_merge_with(&merged[j]) {
-                    let other = merged.remove(j);
-                    merged[i].merge_with(&other);
-                    changed = true;
-                } else {
-                    j += 1;
-                }
-            }
-            i += 1;
-        }
-    }
-
-    merged
-}
-
-/// The GPUI element that paints the terminal.
-/// We need to keep a reference to the model for mouse events, do we need it for any other terminal stuff, or can we move that to connection?
-pub struct TerminalElement {
-    terminal: Entity<Terminal>,
-    terminal_view: Entity<TerminalView>,
-    workspace: WeakEntity<Workspace>,
-    focus: FocusHandle,
-    focused: bool,
-    cursor_visible: bool,
-    interactivity: Interactivity,
-    mode: TerminalMode,
-    block_below_cursor: Option<Rc<BlockProperties>>,
-}
-
-impl InteractiveElement for TerminalElement {
-    fn interactivity(&mut self) -> &mut Interactivity {
-        &mut self.interactivity
-    }
-}
-
-impl StatefulInteractiveElement for TerminalElement {}
-
-impl TerminalElement {
-    pub fn new(
-        terminal: Entity<Terminal>,
-        terminal_view: Entity<TerminalView>,
-        workspace: WeakEntity<Workspace>,
-        focus: FocusHandle,
-        focused: bool,
-        cursor_visible: bool,
-        block_below_cursor: Option<Rc<BlockProperties>>,
-        mode: TerminalMode,
-    ) -> TerminalElement {
-        TerminalElement {
-            terminal,
-            terminal_view,
-            workspace,
-            focused,
-            focus: focus.clone(),
-            cursor_visible,
-            block_below_cursor,
-            mode,
-            interactivity: Default::default(),
-        }
-        .track_focus(&focus)
-    }
-
-    //Vec<Range<AlacPoint>> -> Clip out the parts of the ranges
-
-    pub fn layout_grid(
-        grid: impl Iterator<Item = IndexedCell>,
-        start_line_offset: i32,
-        text_style: &TextStyle,
-        hyperlink: Option<(HighlightStyle, &RangeInclusive<AlacPoint>)>,
-        minimum_contrast: f32,
-        cx: &App,
-    ) -> (Vec<LayoutRect>, Vec<BatchedTextRun>) {
-        let start_time = Instant::now();
-        let theme = cx.theme();
-
-        // Pre-allocate with estimated capacity to reduce reallocations
-        let estimated_cells = grid.size_hint().0;
-        let estimated_runs = estimated_cells / 10; // Estimate ~10 cells per run
-        let estimated_regions = estimated_cells / 20; // Estimate ~20 cells per background region
-
-        let mut batched_runs = Vec::with_capacity(estimated_runs);
-        let mut cell_count = 0;
-
-        // Collect background regions for efficient merging
-        let mut background_regions: Vec<BackgroundRegion> = Vec::with_capacity(estimated_regions);
-        let mut current_batch: Option<BatchedTextRun> = None;
-
-        // First pass: collect all cells and their backgrounds
-        let linegroups = grid.into_iter().chunk_by(|i| i.point.line);
-        for (line_index, (_, line)) in linegroups.into_iter().enumerate() {
-            let alac_line = start_line_offset + line_index as i32;
-
-            // Flush any existing batch at line boundaries
-            if let Some(batch) = current_batch.take() {
-                batched_runs.push(batch);
-            }
-
-            let mut previous_cell_had_extras = false;
-
-            for cell in line {
-                let mut fg = cell.fg;
-                let mut bg = cell.bg;
-                if cell.flags.contains(Flags::INVERSE) {
-                    mem::swap(&mut fg, &mut bg);
-                }
-
-                // Collect background regions (skip default background)
-                if !matches!(bg, Named(NamedColor::Background)) {
-                    let color = convert_color(&bg, theme);
-                    let col = cell.point.column.0 as i32;
-
-                    // Try to extend the last region if it's on the same line with the same color
-                    if let Some(last_region) = background_regions.last_mut() {
-                        if last_region.color == color
-                            && last_region.start_line == alac_line
-                            && last_region.end_line == alac_line
-                            && last_region.end_col + 1 == col
-                        {
-                            last_region.end_col = col;
-                        } else {
-                            background_regions.push(BackgroundRegion::new(alac_line, col, color));
-                        }
-                    } else {
-                        background_regions.push(BackgroundRegion::new(alac_line, col, color));
-                    }
-                }
-                // Skip wide character spacers - they're just placeholders for the second cell of wide characters
-                if cell.flags.contains(Flags::WIDE_CHAR_SPACER) {
-                    continue;
-                }
-
-                // Skip spaces that follow cells with extras (emoji variation sequences)
-                if cell.c == ' ' && previous_cell_had_extras {
-                    previous_cell_had_extras = false;
-                    continue;
-                }
-                // Update tracking for next iteration
-                previous_cell_had_extras =
-                    matches!(cell.zerowidth(), Some(chars) if !chars.is_empty());
-
-                //Layout current cell text
-                {
-                    if !is_blank(&cell) {
-                        cell_count += 1;
-                        let cell_style = TerminalElement::cell_style(
-                            &cell,
-                            fg,
-                            bg,
-                            theme,
-                            text_style,
-                            hyperlink,
-                            minimum_contrast,
-                        );
-
-                        let cell_point = AlacPoint::new(alac_line, cell.point.column.0 as i32);
-                        let zero_width_chars = cell.zerowidth();
-
-                        // Try to batch with existing run
-                        if let Some(ref mut batch) = current_batch {
-                            if batch.can_append(&cell_style)
-                                && batch.start_point.line == cell_point.line
-                                && batch.start_point.column + batch.cell_count as i32
-                                    == cell_point.column
-                            {
-                                batch.append_char(cell.c);
-                                if let Some(chars) = zero_width_chars {
-                                    batch.append_zero_width_chars(chars);
-                                }
-                            } else {
-                                // Flush current batch and start new one
-                                let old_batch = current_batch.take().unwrap();
-                                batched_runs.push(old_batch);
-                                let mut new_batch = BatchedTextRun::new_from_char(
-                                    cell_point,
-                                    cell.c,
-                                    cell_style,
-                                    text_style.font_size,
-                                );
-                                if let Some(chars) = zero_width_chars {
-                                    new_batch.append_zero_width_chars(chars);
-                                }
-                                current_batch = Some(new_batch);
-                            }
-                        } else {
-                            // Start new batch
-                            let mut new_batch = BatchedTextRun::new_from_char(
-                                cell_point,
-                                cell.c,
-                                cell_style,
-                                text_style.font_size,
-                            );
-                            if let Some(chars) = zero_width_chars {
-                                new_batch.append_zero_width_chars(chars);
-                            }
-                            current_batch = Some(new_batch);
-                        }
-                    };
-                }
-            }
-        }
-
-        // Flush any remaining batch
-        if let Some(batch) = current_batch {
-            batched_runs.push(batch);
-        }
-
-        // Second pass: merge background regions and convert to layout rects
-        let region_count = background_regions.len();
-        let merged_regions = merge_background_regions(background_regions);
-        let mut rects = Vec::with_capacity(merged_regions.len() * 2); // Estimate 2 rects per merged region
-
-        // Convert merged regions to layout rects
-        // Since LayoutRect only supports single-line rectangles, we need to split multi-line regions
-        for region in merged_regions {
-            for line in region.start_line..=region.end_line {
-                rects.push(LayoutRect::new(
-                    AlacPoint::new(line, region.start_col),
-                    (region.end_col - region.start_col + 1) as usize,
-                    region.color,
-                ));
-            }
-        }
-
-        let layout_time = start_time.elapsed();
-        log::debug!(
-            "Terminal layout_grid: {} cells processed, {} batched runs created, {} rects (from {} merged regions), layout took {:?}",
-            cell_count,
-            batched_runs.len(),
-            rects.len(),
-            region_count,
-            layout_time
-        );
-
-        (rects, batched_runs)
-    }
-
-    /// Computes the cursor position and expected block width, may return a zero width if x_for_index returns
-    /// the same position for sequential indexes. Use em_width instead
-    fn shape_cursor(
-        cursor_point: DisplayCursor,
-        size: TerminalBounds,
-        text_fragment: &ShapedLine,
-    ) -> Option<(Point<Pixels>, Pixels)> {
-        if cursor_point.line() < size.total_lines() as i32 {
-            let cursor_width = if text_fragment.width == Pixels::ZERO {
-                size.cell_width()
-            } else {
-                text_fragment.width
-            };
-
-            // Cursor should always surround as much of the text as possible,
-            // hence when on pixel boundaries round the origin down and the width up
-            Some((
-                point(
-                    (cursor_point.col() as f32 * size.cell_width()).floor(),
-                    (cursor_point.line() as f32 * size.line_height()).floor(),
-                ),
-                cursor_width.ceil(),
-            ))
-        } else {
-            None
-        }
-    }
-
-    /// Checks if a character is a decorative block/box-like character that should
-    /// preserve its exact colors without contrast adjustment.
-    ///
-    /// This specifically targets characters used as visual connectors, separators,
-    /// and borders where color matching with adjacent backgrounds is critical.
-    /// Regular icons (git, folders, etc.) are excluded as they need to remain readable.
-    ///
-    /// Fixes https://github.com/zed-industries/zed/issues/34234
-    fn is_decorative_character(ch: char) -> bool {
-        matches!(
-            ch as u32,
-            // Unicode Box Drawing and Block Elements
-            0x2500..=0x257F // Box Drawing (└ ┐ ─ │ etc.)
-            | 0x2580..=0x259F // Block Elements (▀ ▄ █ ░ ▒ ▓ etc.)
-            | 0x25A0..=0x25FF // Geometric Shapes (■ ▶ ● etc. - includes triangular/circular separators)
-
-            // Private Use Area - Powerline separator symbols only
-            | 0xE0B0..=0xE0B7 // Powerline separators: triangles (E0B0-E0B3) and half circles (E0B4-E0B7)
-            | 0xE0B8..=0xE0BF // Powerline separators: corner triangles
-            | 0xE0C0..=0xE0CA // Powerline separators: flames (E0C0-E0C3), pixelated (E0C4-E0C7), and ice (E0C8 & E0CA)
-            | 0xE0CC..=0xE0D1 // Powerline separators: honeycombs (E0CC-E0CD) and lego (E0CE-E0D1)
-            | 0xE0D2..=0xE0D7 // Powerline separators: trapezoid (E0D2 & E0D4) and inverted triangles (E0D6-E0D7)
-        )
-    }
-
-    /// Converts the Alacritty cell styles to GPUI text styles and background color.
-    fn cell_style(
-        indexed: &IndexedCell,
-        fg: terminal::alacritty_terminal::vte::ansi::Color,
-        bg: terminal::alacritty_terminal::vte::ansi::Color,
-        colors: &Theme,
-        text_style: &TextStyle,
-        hyperlink: Option<(HighlightStyle, &RangeInclusive<AlacPoint>)>,
-        minimum_contrast: f32,
-    ) -> TextRun {
-        let flags = indexed.cell.flags;
-        let mut fg = convert_color(&fg, colors);
-        let bg = convert_color(&bg, colors);
-
-        // Only apply contrast adjustment to non-decorative characters
-        if !Self::is_decorative_character(indexed.c) {
-            fg = ensure_minimum_contrast(fg, bg, minimum_contrast);
-        }
-
-        // Ghostty uses (175/255) as the multiplier (~0.69), Alacritty uses 0.66, Kitty
-        // uses 0.75. We're using 0.7 because it's pretty well in the middle of that.
-        if flags.intersects(Flags::DIM) {
-            fg.a *= 0.7;
-        }
-
-        let underline = (flags.intersects(Flags::ALL_UNDERLINES)
-            || indexed.cell.hyperlink().is_some())
-        .then(|| UnderlineStyle {
-            color: Some(fg),
-            thickness: Pixels::from(1.0),
-            wavy: flags.contains(Flags::UNDERCURL),
-        });
-
-        let strikethrough = flags
-            .intersects(Flags::STRIKEOUT)
-            .then(|| StrikethroughStyle {
-                color: Some(fg),
-                thickness: Pixels::from(1.0),
-            });
-
-        let weight = if flags.intersects(Flags::BOLD) {
-            FontWeight::BOLD
-        } else {
-            text_style.font_weight
-        };
-
-        let style = if flags.intersects(Flags::ITALIC) {
-            FontStyle::Italic
-        } else {
-            FontStyle::Normal
-        };
-
-        let mut result = TextRun {
-            len: indexed.c.len_utf8(),
-            color: fg,
-            background_color: None,
-            font: Font {
-                weight,
-                style,
-                ..text_style.font()
-            },
-            underline,
-            strikethrough,
-        };
-
-        if let Some((style, range)) = hyperlink
-            && range.contains(&indexed.point)
-        {
-            if let Some(underline) = style.underline {
-                result.underline = Some(underline);
-            }
-
-            if let Some(color) = style.color {
-                result.color = color;
-            }
-        }
-
-        result
-    }
-
-    fn generic_button_handler<E>(
-        connection: Entity<Terminal>,
-        focus_handle: FocusHandle,
-        steal_focus: bool,
-        f: impl Fn(&mut Terminal, &E, &mut Context<Terminal>),
-    ) -> impl Fn(&E, &mut Window, &mut App) {
-        move |event, window, cx| {
-            if steal_focus {
-                window.focus(&focus_handle);
-            } else if !focus_handle.is_focused(window) {
-                return;
-            }
-            connection.update(cx, |terminal, cx| {
-                f(terminal, event, cx);
-
-                cx.notify();
-            })
-        }
-    }
-
-    fn register_mouse_listeners(
-        &mut self,
-        mode: TermMode,
-        hitbox: &Hitbox,
-        content_mode: &ContentMode,
-        window: &mut Window,
-    ) {
-        let focus = self.focus.clone();
-        let terminal = self.terminal.clone();
-        let terminal_view = self.terminal_view.clone();
-
-        self.interactivity.on_mouse_down(MouseButton::Left, {
-            let terminal = terminal.clone();
-            let focus = focus.clone();
-            let terminal_view = terminal_view.clone();
-
-            move |e, window, cx| {
-                window.focus(&focus);
-
-                let scroll_top = terminal_view.read(cx).scroll_top;
-                terminal.update(cx, |terminal, cx| {
-                    let mut adjusted_event = e.clone();
-                    if scroll_top > Pixels::ZERO {
-                        adjusted_event.position.y += scroll_top;
-                    }
-                    terminal.mouse_down(&adjusted_event, cx);
-                    cx.notify();
-                })
-            }
-        });
-
-        window.on_mouse_event({
-            let terminal = self.terminal.clone();
-            let hitbox = hitbox.clone();
-            let focus = focus.clone();
-            let terminal_view = terminal_view;
-            move |e: &MouseMoveEvent, phase, window, cx| {
-                if phase != DispatchPhase::Bubble {
-                    return;
-                }
-
-                if e.pressed_button.is_some() && !cx.has_active_drag() && focus.is_focused(window) {
-                    let hovered = hitbox.is_hovered(window);
-
-                    let scroll_top = terminal_view.read(cx).scroll_top;
-                    terminal.update(cx, |terminal, cx| {
-                        if terminal.selection_started() || hovered {
-                            let mut adjusted_event = e.clone();
-                            if scroll_top > Pixels::ZERO {
-                                adjusted_event.position.y += scroll_top;
-                            }
-                            terminal.mouse_drag(&adjusted_event, hitbox.bounds, cx);
-                            cx.notify();
-                        }
-                    })
-                }
-
-                if hitbox.is_hovered(window) {
-                    terminal.update(cx, |terminal, cx| {
-                        terminal.mouse_move(e, cx);
-                    })
-                }
-            }
-        });
-
-        self.interactivity.on_mouse_up(
-            MouseButton::Left,
-            TerminalElement::generic_button_handler(
-                terminal.clone(),
-                focus.clone(),
-                false,
-                move |terminal, e, cx| {
-                    terminal.mouse_up(e, cx);
-                },
-            ),
-        );
-        self.interactivity.on_mouse_down(
-            MouseButton::Middle,
-            TerminalElement::generic_button_handler(
-                terminal.clone(),
-                focus.clone(),
-                true,
-                move |terminal, e, cx| {
-                    terminal.mouse_down(e, cx);
-                },
-            ),
-        );
-
-        if content_mode.is_scrollable() {
-            self.interactivity.on_scroll_wheel({
-                let terminal_view = self.terminal_view.downgrade();
-                move |e, window, cx| {
-                    terminal_view
-                        .update(cx, |terminal_view, cx| {
-                            if matches!(terminal_view.mode, TerminalMode::Standalone)
-                                || terminal_view.focus_handle.is_focused(window)
-                            {
-                                terminal_view.scroll_wheel(e, cx);
-                                cx.notify();
-                            }
-                        })
-                        .ok();
-                }
-            });
-        }
-
-        // Mouse mode handlers:
-        // All mouse modes need the extra click handlers
-        if mode.intersects(TermMode::MOUSE_MODE) {
-            self.interactivity.on_mouse_down(
-                MouseButton::Right,
-                TerminalElement::generic_button_handler(
-                    terminal.clone(),
-                    focus.clone(),
-                    true,
-                    move |terminal, e, cx| {
-                        terminal.mouse_down(e, cx);
-                    },
-                ),
-            );
-            self.interactivity.on_mouse_up(
-                MouseButton::Right,
-                TerminalElement::generic_button_handler(
-                    terminal.clone(),
-                    focus.clone(),
-                    false,
-                    move |terminal, e, cx| {
-                        terminal.mouse_up(e, cx);
-                    },
-                ),
-            );
-            self.interactivity.on_mouse_up(
-                MouseButton::Middle,
-                TerminalElement::generic_button_handler(
-                    terminal,
-                    focus,
-                    false,
-                    move |terminal, e, cx| {
-                        terminal.mouse_up(e, cx);
-                    },
-                ),
-            );
-        }
-    }
-
-    fn rem_size(&self, cx: &mut App) -> Option<Pixels> {
-        let settings = ThemeSettings::get_global(cx).clone();
-        let buffer_font_size = settings.buffer_font_size(cx);
-        let rem_size_scale = {
-            // Our default UI font size is 14px on a 16px base scale.
-            // This means the default UI font size is 0.875rems.
-            let default_font_size_scale = 14. / ui::BASE_REM_SIZE_IN_PX;
-
-            // We then determine the delta between a single rem and the default font
-            // size scale.
-            let default_font_size_delta = 1. - default_font_size_scale;
-
-            // Finally, we add this delta to 1rem to get the scale factor that
-            // should be used to scale up the UI.
-            1. + default_font_size_delta
-        };
-
-        Some(buffer_font_size * rem_size_scale)
-    }
-}
-
-impl Element for TerminalElement {
-    type RequestLayoutState = ();
-    type PrepaintState = LayoutState;
-
-    fn id(&self) -> Option<ElementId> {
-        self.interactivity.element_id.clone()
-    }
-
-    fn source_location(&self) -> Option<&'static core::panic::Location<'static>> {
-        None
-    }
-
-    fn request_layout(
-        &mut self,
-        global_id: Option<&GlobalElementId>,
-        inspector_id: Option<&gpui::InspectorElementId>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> (LayoutId, Self::RequestLayoutState) {
-        let height: Length = match self.terminal_view.read(cx).content_mode(window, cx) {
-            ContentMode::Inline {
-                displayed_lines,
-                total_lines: _,
-            } => {
-                let rem_size = window.rem_size();
-                let line_height = f32::from(window.text_style().font_size.to_pixels(rem_size))
-                    * TerminalSettings::get_global(cx)
-                        .line_height
-                        .value()
-                        .to_pixels(rem_size);
-                (displayed_lines * line_height).into()
-            }
-            ContentMode::Scrollable => {
-                if let TerminalMode::Embedded { .. } = &self.mode {
-                    let term = self.terminal.read(cx);
-                    if !term.scrolled_to_top() && !term.scrolled_to_bottom() && self.focused {
-                        self.interactivity.occlude_mouse();
-                    }
-                }
-
-                relative(1.).into()
-            }
-        };
-
-        let layout_id = self.interactivity.request_layout(
-            global_id,
-            inspector_id,
-            window,
-            cx,
-            |mut style, window, cx| {
-                style.size.width = relative(1.).into();
-                style.size.height = height;
-
-                window.request_layout(style, None, cx)
-            },
-        );
-        (layout_id, ())
-    }
-
-    fn prepaint(
-        &mut self,
-        global_id: Option<&GlobalElementId>,
-        inspector_id: Option<&gpui::InspectorElementId>,
-        bounds: Bounds<Pixels>,
-        _: &mut Self::RequestLayoutState,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Self::PrepaintState {
-        let rem_size = self.rem_size(cx);
-        self.interactivity.prepaint(
-            global_id,
-            inspector_id,
-            bounds,
-            bounds.size,
-            window,
-            cx,
-            |_, _, hitbox, window, cx| {
-                let hitbox = hitbox.unwrap();
-                let settings = ThemeSettings::get_global(cx).clone();
-
-                let buffer_font_size = settings.buffer_font_size(cx);
-
-                let terminal_settings = TerminalSettings::get_global(cx);
-                let minimum_contrast = terminal_settings.minimum_contrast;
-
-                let font_family = terminal_settings.font_family.as_ref().map_or_else(
-                    || settings.buffer_font.family.clone(),
-                    |font_family| font_family.0.clone().into(),
-                );
-
-                let font_fallbacks = terminal_settings
-                    .font_fallbacks
-                    .as_ref()
-                    .or(settings.buffer_font.fallbacks.as_ref())
-                    .cloned();
-
-                let font_features = terminal_settings
-                    .font_features
-                    .as_ref()
-                    .unwrap_or(&FontFeatures::disable_ligatures())
-                    .clone();
-
-                let font_weight = terminal_settings.font_weight.unwrap_or_default();
-
-                let line_height = terminal_settings.line_height.value();
-
-                let font_size = match &self.mode {
-                    TerminalMode::Embedded { .. } => {
-                        window.text_style().font_size.to_pixels(window.rem_size())
-                    }
-                    TerminalMode::Standalone => terminal_settings
-                        .font_size
-                        .map_or(buffer_font_size, |size| theme::adjusted_font_size(size, cx)),
-                };
-
-                let theme = cx.theme().clone();
-
-                let link_style = HighlightStyle {
-                    color: Some(theme.colors().link_text_hover),
-                    font_weight: Some(font_weight),
-                    font_style: None,
-                    background_color: None,
-                    underline: Some(UnderlineStyle {
-                        thickness: px(1.0),
-                        color: Some(theme.colors().link_text_hover),
-                        wavy: false,
-                    }),
-                    strikethrough: None,
-                    fade_out: None,
-                };
-
-                let text_style = TextStyle {
-                    font_family,
-                    font_features,
-                    font_weight,
-                    font_fallbacks,
-                    font_size: font_size.into(),
-                    font_style: FontStyle::Normal,
-                    line_height: line_height.into(),
-                    background_color: Some(theme.colors().terminal_ansi_background),
-                    white_space: WhiteSpace::Normal,
-                    // These are going to be overridden per-cell
-                    color: theme.colors().terminal_foreground,
-                    ..Default::default()
-                };
-
-                let text_system = cx.text_system();
-                let player_color = theme.players().local();
-                let match_color = theme.colors().search_match_background;
-                let gutter;
-                let (dimensions, line_height_px) = {
-                    let rem_size = window.rem_size();
-                    let font_pixels = text_style.font_size.to_pixels(rem_size);
-                    // TODO: line_height should be an f32 not an AbsoluteLength.
-                    let line_height = f32::from(font_pixels) * line_height.to_pixels(rem_size);
-                    let font_id = cx.text_system().resolve_font(&text_style.font());
-
-                    let cell_width = text_system
-                        .advance(font_id, font_pixels, 'm')
-                        .unwrap()
-                        .width;
-                    gutter = cell_width;
-
-                    let mut size = bounds.size;
-                    size.width -= gutter;
-
-                    // https://github.com/zed-industries/zed/issues/2750
-                    // if the terminal is one column wide, rendering 🦀
-                    // causes alacritty to misbehave.
-                    if size.width < cell_width * 2.0 {
-                        size.width = cell_width * 2.0;
-                    }
-
-                    let mut origin = bounds.origin;
-                    origin.x += gutter;
-
-                    (
-                        TerminalBounds::new(line_height, cell_width, Bounds { origin, size }),
-                        line_height,
-                    )
-                };
-
-                let search_matches = self.terminal.read(cx).matches.clone();
-
-                let background_color = theme.colors().terminal_background;
-
-                let (last_hovered_word, hover_tooltip) =
-                    self.terminal.update(cx, |terminal, cx| {
-                        terminal.set_size(dimensions);
-                        terminal.sync(window, cx);
-
-                        if window.modifiers().secondary()
-                            && bounds.contains(&window.mouse_position())
-                            && self.terminal_view.read(cx).hover.is_some()
-                        {
-                            let registered_hover = self.terminal_view.read(cx).hover.as_ref();
-                            if terminal.last_content.last_hovered_word.as_ref()
-                                == registered_hover.map(|hover| &hover.hovered_word)
-                            {
-                                (
-                                    terminal.last_content.last_hovered_word.clone(),
-                                    registered_hover.map(|hover| hover.tooltip.clone()),
-                                )
-                            } else {
-                                (None, None)
-                            }
-                        } else {
-                            (None, None)
-                        }
-                    });
-
-                let scroll_top = self.terminal_view.read(cx).scroll_top;
-                let hyperlink_tooltip = hover_tooltip.map(|hover_tooltip| {
-                    let offset = bounds.origin + point(gutter, px(0.)) - point(px(0.), scroll_top);
-                    let mut element = div()
-                        .size_full()
-                        .id("terminal-element")
-                        .tooltip(Tooltip::text(hover_tooltip))
-                        .into_any_element();
-                    element.prepaint_as_root(offset, bounds.size.into(), window, cx);
-                    element
-                });
-
-                let TerminalContent {
-                    cells,
-                    mode,
-                    display_offset,
-                    cursor_char,
-                    selection,
-                    cursor,
-                    ..
-                } = &self.terminal.read(cx).last_content;
-                let mode = *mode;
-                let display_offset = *display_offset;
-
-                // searches, highlights to a single range representations
-                let mut relative_highlighted_ranges = Vec::new();
-                for search_match in search_matches {
-                    relative_highlighted_ranges.push((search_match, match_color))
-                }
-                if let Some(selection) = selection {
-                    relative_highlighted_ranges
-                        .push((selection.start..=selection.end, player_color.selection));
-                }
-
-                // then have that representation be converted to the appropriate highlight data structure
-
-                let content_mode = self.terminal_view.read(cx).content_mode(window, cx);
-                let (rects, batched_text_runs) = match content_mode {
-                    ContentMode::Scrollable => {
-                        // In scrollable mode, the terminal already provides cells
-                        // that are correctly positioned for the current viewport
-                        // based on its display_offset. We don't need additional filtering.
-                        TerminalElement::layout_grid(
-                            cells.iter().cloned(),
-                            0,
-                            &text_style,
-                            last_hovered_word.as_ref().map(|last_hovered_word| {
-                                (link_style, &last_hovered_word.word_match)
-                            }),
-                            minimum_contrast,
-                            cx,
-                        )
-                    }
-                    ContentMode::Inline { .. } => {
-                        let intersection = window.content_mask().bounds.intersect(&bounds);
-                        let start_row = (intersection.top() - bounds.top()) / line_height_px;
-                        let end_row = start_row + intersection.size.height / line_height_px;
-                        let line_range = (start_row as i32)..=(end_row as i32);
-
-                        TerminalElement::layout_grid(
-                            cells
-                                .iter()
-                                .skip_while(|i| &i.point.line < line_range.start())
-                                .take_while(|i| &i.point.line <= line_range.end())
-                                .cloned(),
-                            *line_range.start(),
-                            &text_style,
-                            last_hovered_word.as_ref().map(|last_hovered_word| {
-                                (link_style, &last_hovered_word.word_match)
-                            }),
-                            minimum_contrast,
-                            cx,
-                        )
-                    }
-                };
-
-                // Layout cursor. Rectangle is used for IME, so we should lay it out even
-                // if we don't end up showing it.
-                let cursor = if let AlacCursorShape::Hidden = cursor.shape {
-                    None
-                } else {
-                    let cursor_point = DisplayCursor::from(cursor.point, display_offset);
-                    let cursor_text = {
-                        let str_trxt = cursor_char.to_string();
-                        let len = str_trxt.len();
-                        window.text_system().shape_line(
-                            str_trxt.into(),
-                            text_style.font_size.to_pixels(window.rem_size()),
-                            &[TextRun {
-                                len,
-                                font: text_style.font(),
-                                color: theme.colors().terminal_ansi_background,
-                                ..Default::default()
-                            }],
-                            None,
-                        )
-                    };
-
-                    let focused = self.focused;
-                    TerminalElement::shape_cursor(cursor_point, dimensions, &cursor_text).map(
-                        move |(cursor_position, block_width)| {
-                            let (shape, text) = match cursor.shape {
-                                AlacCursorShape::Block if !focused => (CursorShape::Hollow, None),
-                                AlacCursorShape::Block => (CursorShape::Block, Some(cursor_text)),
-                                AlacCursorShape::Underline => (CursorShape::Underline, None),
-                                AlacCursorShape::Beam => (CursorShape::Bar, None),
-                                AlacCursorShape::HollowBlock => (CursorShape::Hollow, None),
-                                //This case is handled in the if wrapping the whole cursor layout
-                                AlacCursorShape::Hidden => unreachable!(),
-                            };
-
-                            CursorLayout::new(
-                                cursor_position,
-                                block_width,
-                                dimensions.line_height,
-                                theme.players().local().cursor,
-                                shape,
-                                text,
-                            )
-                        },
-                    )
-                };
-
-                let block_below_cursor_element = if let Some(block) = &self.block_below_cursor {
-                    let terminal = self.terminal.read(cx);
-                    if terminal.last_content.display_offset == 0 {
-                        let target_line = terminal.last_content.cursor.point.line.0 + 1;
-                        let render = &block.render;
-                        let mut block_cx = BlockContext {
-                            window,
-                            context: cx,
-                            dimensions,
-                        };
-                        let element = render(&mut block_cx);
-                        let mut element = div().occlude().child(element).into_any_element();
-                        let available_space = size(
-                            AvailableSpace::Definite(dimensions.width() + gutter),
-                            AvailableSpace::Definite(
-                                block.height as f32 * dimensions.line_height(),
-                            ),
-                        );
-                        let origin = bounds.origin
-                            + point(px(0.), target_line as f32 * dimensions.line_height())
-                            - point(px(0.), scroll_top);
-                        window.with_rem_size(rem_size, |window| {
-                            element.prepaint_as_root(origin, available_space, window, cx);
-                        });
-                        Some(element)
-                    } else {
-                        None
-                    }
-                } else {
-                    None
-                };
-
-                LayoutState {
-                    hitbox,
-                    batched_text_runs,
-                    cursor,
-                    background_color,
-                    dimensions,
-                    rects,
-                    relative_highlighted_ranges,
-                    mode,
-                    display_offset,
-                    hyperlink_tooltip,
-                    gutter,
-                    block_below_cursor_element,
-                    base_text_style: text_style,
-                    content_mode,
-                }
-            },
-        )
-    }
-
-    fn paint(
-        &mut self,
-        global_id: Option<&GlobalElementId>,
-        inspector_id: Option<&gpui::InspectorElementId>,
-        bounds: Bounds<Pixels>,
-        _: &mut Self::RequestLayoutState,
-        layout: &mut Self::PrepaintState,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        let paint_start = Instant::now();
-        window.with_content_mask(Some(ContentMask { bounds }), |window| {
-            let scroll_top = self.terminal_view.read(cx).scroll_top;
-
-            window.paint_quad(fill(bounds, layout.background_color));
-            let origin =
-                bounds.origin + Point::new(layout.gutter, px(0.)) - Point::new(px(0.), scroll_top);
-
-            let marked_text_cloned: Option<String> = {
-                let ime_state = &self.terminal_view.read(cx).ime_state;
-                ime_state.as_ref().map(|state| state.marked_text.clone())
-            };
-
-            let terminal_input_handler = TerminalInputHandler {
-                terminal: self.terminal.clone(),
-                terminal_view: self.terminal_view.clone(),
-                cursor_bounds: layout
-                    .cursor
-                    .as_ref()
-                    .map(|cursor| cursor.bounding_rect(origin)),
-                workspace: self.workspace.clone(),
-            };
-
-            self.register_mouse_listeners(
-                layout.mode,
-                &layout.hitbox,
-                &layout.content_mode,
-                window,
-            );
-            if window.modifiers().secondary()
-                && bounds.contains(&window.mouse_position())
-                && self.terminal_view.read(cx).hover.is_some()
-            {
-                window.set_cursor_style(gpui::CursorStyle::PointingHand, &layout.hitbox);
-            } else {
-                window.set_cursor_style(gpui::CursorStyle::IBeam, &layout.hitbox);
-            }
-
-            let original_cursor = layout.cursor.take();
-            let hyperlink_tooltip = layout.hyperlink_tooltip.take();
-            let block_below_cursor_element = layout.block_below_cursor_element.take();
-            self.interactivity.paint(
-                global_id,
-                inspector_id,
-                bounds,
-                Some(&layout.hitbox),
-                window,
-                cx,
-                |_, window, cx| {
-                    window.handle_input(&self.focus, terminal_input_handler, cx);
-
-                    window.on_key_event({
-                        let this = self.terminal.clone();
-                        move |event: &ModifiersChangedEvent, phase, window, cx| {
-                            if phase != DispatchPhase::Bubble {
-                                return;
-                            }
-
-                            this.update(cx, |term, cx| {
-                                term.try_modifiers_change(&event.modifiers, window, cx)
-                            });
-                        }
-                    });
-
-                    for rect in &layout.rects {
-                        rect.paint(origin, &layout.dimensions, window);
-                    }
-
-                    for (relative_highlighted_range, color) in
-&                        layout.relative_highlighted_ranges
-                    {
-                        if let Some((start_y, highlighted_range_lines)) =
-                            to_highlighted_range_lines(relative_highlighted_range, layout, origin)
-                        {
-                            let corner_radius = if EditorSettings::get_global(cx).rounded_selection {
-                                0.15 * layout.dimensions.line_height
-                            } else {
-                                Pixels::ZERO
-                            };
-                            let hr = HighlightedRange {
-                                start_y,
-                                line_height: layout.dimensions.line_height,
-                                lines: highlighted_range_lines,
-                                color: *color,
-                                corner_radius: corner_radius,
-                            };
-                            hr.paint(true, bounds, window);
-                        }
-                    }
-
-                    // Paint batched text runs instead of individual cells
-                    let text_paint_start = Instant::now();
-                    for batch in &layout.batched_text_runs {
-                        batch.paint(origin, &layout.dimensions, window, cx);
-                    }
-                    let text_paint_time = text_paint_start.elapsed();
-
-                    if let Some(text_to_mark) = &marked_text_cloned
-                        && !text_to_mark.is_empty()
-                            && let Some(cursor_layout) = &original_cursor {
-                                let ime_position = cursor_layout.bounding_rect(origin).origin;
-                                let mut ime_style = layout.base_text_style.clone();
-                                ime_style.underline = Some(UnderlineStyle {
-                                    color: Some(ime_style.color),
-                                    thickness: px(1.0),
-                                    wavy: false,
-                                });
-
-                                let shaped_line = window.text_system().shape_line(
-                                    text_to_mark.clone().into(),
-                                    ime_style.font_size.to_pixels(window.rem_size()),
-                                    &[TextRun {
-                                        len: text_to_mark.len(),
-                                        font: ime_style.font(),
-                                        color: ime_style.color,
-                                        underline: ime_style.underline,
-                                        ..Default::default()
-                                    }],
-                                    None
-                                );
-                                shaped_line
-                                    .paint(ime_position, layout.dimensions.line_height, window, cx)
-                                    .log_err();
-                            }
-
-                    if self.cursor_visible && marked_text_cloned.is_none()
-                        && let Some(mut cursor) = original_cursor {
-                            cursor.paint(origin, window, cx);
-                        }
-
-                    if let Some(mut element) = block_below_cursor_element {
-                        element.paint(window, cx);
-                    }
-
-                    if let Some(mut element) = hyperlink_tooltip {
-                        element.paint(window, cx);
-                    }
-                    let total_paint_time = paint_start.elapsed();
-                    log::debug!(
-                        "Terminal paint: {} text runs, {} rects, text paint took {:?}, total paint took {:?}",
-                        layout.batched_text_runs.len(),
-                        layout.rects.len(),
-                        text_paint_time,
-                        total_paint_time
-                    );
-                },
-            );
-        });
-    }
-}
-
-impl IntoElement for TerminalElement {
-    type Element = Self;
-
-    fn into_element(self) -> Self::Element {
-        self
-    }
-}
-
-struct TerminalInputHandler {
-    terminal: Entity<Terminal>,
-    terminal_view: Entity<TerminalView>,
-    workspace: WeakEntity<Workspace>,
-    cursor_bounds: Option<Bounds<Pixels>>,
-}
-
-impl InputHandler for TerminalInputHandler {
-    fn selected_text_range(
-        &mut self,
-        _ignore_disabled_input: bool,
-        _: &mut Window,
-        cx: &mut App,
-    ) -> Option<UTF16Selection> {
-        if self
-            .terminal
-            .read(cx)
-            .last_content
-            .mode
-            .contains(TermMode::ALT_SCREEN)
-        {
-            None
-        } else {
-            Some(UTF16Selection {
-                range: 0..0,
-                reversed: false,
-            })
-        }
-    }
-
-    fn marked_text_range(
-        &mut self,
-        _window: &mut Window,
-        cx: &mut App,
-    ) -> Option<std::ops::Range<usize>> {
-        self.terminal_view.read(cx).marked_text_range()
-    }
-
-    fn text_for_range(
-        &mut self,
-        _: std::ops::Range<usize>,
-        _: &mut Option<std::ops::Range<usize>>,
-        _: &mut Window,
-        _: &mut App,
-    ) -> Option<String> {
-        None
-    }
-
-    fn replace_text_in_range(
-        &mut self,
-        _replacement_range: Option<std::ops::Range<usize>>,
-        text: &str,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        self.terminal_view.update(cx, |view, view_cx| {
-            view.clear_marked_text(view_cx);
-            view.commit_text(text, view_cx);
-        });
-
-        self.workspace
-            .update(cx, |this, cx| {
-                window.invalidate_character_coordinates();
-                let project = this.project().read(cx);
-                let telemetry = project.client().telemetry().clone();
-                telemetry.log_edit_event("terminal", project.is_via_remote_server());
-            })
-            .ok();
-    }
-
-    fn replace_and_mark_text_in_range(
-        &mut self,
-        _range_utf16: Option<std::ops::Range<usize>>,
-        new_text: &str,
-        new_marked_range: Option<std::ops::Range<usize>>,
-        _window: &mut Window,
-        cx: &mut App,
-    ) {
-        self.terminal_view.update(cx, |view, view_cx| {
-            view.set_marked_text(new_text.to_string(), new_marked_range, view_cx);
-        });
-    }
-
-    fn unmark_text(&mut self, _window: &mut Window, cx: &mut App) {
-        self.terminal_view.update(cx, |view, view_cx| {
-            view.clear_marked_text(view_cx);
-        });
-    }
-
-    fn bounds_for_range(
-        &mut self,
-        range_utf16: std::ops::Range<usize>,
-        _window: &mut Window,
-        cx: &mut App,
-    ) -> Option<Bounds<Pixels>> {
-        let term_bounds = self.terminal_view.read(cx).terminal_bounds(cx);
-
-        let mut bounds = self.cursor_bounds?;
-        let offset_x = term_bounds.cell_width * range_utf16.start as f32;
-        bounds.origin.x += offset_x;
-
-        Some(bounds)
-    }
-
-    fn apple_press_and_hold_enabled(&mut self) -> bool {
-        false
-    }
-
-    fn character_index_for_point(
-        &mut self,
-        _point: Point<Pixels>,
-        _window: &mut Window,
-        _cx: &mut App,
-    ) -> Option<usize> {
-        None
-    }
-}
-
-pub fn is_blank(cell: &IndexedCell) -> bool {
-    if cell.c != ' ' {
-        return false;
-    }
-
-    if cell.bg != AnsiColor::Named(NamedColor::Background) {
-        return false;
-    }
-
-    if cell.hyperlink().is_some() {
-        return false;
-    }
-
-    if cell
-        .flags
-        .intersects(Flags::ALL_UNDERLINES | Flags::INVERSE | Flags::STRIKEOUT)
-    {
-        return false;
-    }
-
-    true
-}
-
-fn to_highlighted_range_lines(
-    range: &RangeInclusive<AlacPoint>,
-    layout: &LayoutState,
-    origin: Point<Pixels>,
-) -> Option<(Pixels, Vec<HighlightedRangeLine>)> {
-    // Step 1. Normalize the points to be viewport relative.
-    // When display_offset = 1, here's how the grid is arranged:
-    //-2,0 -2,1...
-    //--- Viewport top
-    //-1,0 -1,1...
-    //--------- Terminal Top
-    // 0,0  0,1...
-    // 1,0  1,1...
-    //--- Viewport Bottom
-    // 2,0  2,1...
-    //--------- Terminal Bottom
-
-    // Normalize to viewport relative, from terminal relative.
-    // lines are i32s, which are negative above the top left corner of the terminal
-    // If the user has scrolled, we use the display_offset to tell us which offset
-    // of the grid data we should be looking at. But for the rendering step, we don't
-    // want negatives. We want things relative to the 'viewport' (the area of the grid
-    // which is currently shown according to the display offset)
-    let unclamped_start = AlacPoint::new(
-        range.start().line + layout.display_offset,
-        range.start().column,
-    );
-    let unclamped_end =
-        AlacPoint::new(range.end().line + layout.display_offset, range.end().column);
-
-    // Step 2. Clamp range to viewport, and return None if it doesn't overlap
-    if unclamped_end.line.0 < 0 || unclamped_start.line.0 > layout.dimensions.num_lines() as i32 {
-        return None;
-    }
-
-    let clamped_start_line = unclamped_start.line.0.max(0) as usize;
-
-    let clamped_end_line = unclamped_end
-        .line
-        .0
-        .min(layout.dimensions.num_lines() as i32) as usize;
-
-    // Convert the start of the range to pixels
-    let start_y = origin.y + clamped_start_line as f32 * layout.dimensions.line_height;
-
-    // Step 3. Expand ranges that cross lines into a collection of single-line ranges.
-    //  (also convert to pixels)
-    let mut highlighted_range_lines = Vec::new();
-    for line in clamped_start_line..=clamped_end_line {
-        let mut line_start = 0;
-        let mut line_end = layout.dimensions.columns();
-
-        if line == clamped_start_line && unclamped_start.line.0 >= 0 {
-            line_start = unclamped_start.column.0;
-        }
-        if line == clamped_end_line && unclamped_end.line.0 <= layout.dimensions.num_lines() as i32
-        {
-            line_end = unclamped_end.column.0 + 1; // +1 for inclusive
-        }
-
-        highlighted_range_lines.push(HighlightedRangeLine {
-            start_x: origin.x + line_start as f32 * layout.dimensions.cell_width,
-            end_x: origin.x + line_end as f32 * layout.dimensions.cell_width,
-        });
-    }
-
-    Some((start_y, highlighted_range_lines))
-}
-
-/// Converts a 2, 8, or 24 bit color ANSI color to the GPUI equivalent.
-pub fn convert_color(fg: &terminal::alacritty_terminal::vte::ansi::Color, theme: &Theme) -> Hsla {
-    let colors = theme.colors();
-    match fg {
-        // Named and theme defined colors
-        terminal::alacritty_terminal::vte::ansi::Color::Named(n) => match n {
-            NamedColor::Black => colors.terminal_ansi_black,
-            NamedColor::Red => colors.terminal_ansi_red,
-            NamedColor::Green => colors.terminal_ansi_green,
-            NamedColor::Yellow => colors.terminal_ansi_yellow,
-            NamedColor::Blue => colors.terminal_ansi_blue,
-            NamedColor::Magenta => colors.terminal_ansi_magenta,
-            NamedColor::Cyan => colors.terminal_ansi_cyan,
-            NamedColor::White => colors.terminal_ansi_white,
-            NamedColor::BrightBlack => colors.terminal_ansi_bright_black,
-            NamedColor::BrightRed => colors.terminal_ansi_bright_red,
-            NamedColor::BrightGreen => colors.terminal_ansi_bright_green,
-            NamedColor::BrightYellow => colors.terminal_ansi_bright_yellow,
-            NamedColor::BrightBlue => colors.terminal_ansi_bright_blue,
-            NamedColor::BrightMagenta => colors.terminal_ansi_bright_magenta,
-            NamedColor::BrightCyan => colors.terminal_ansi_bright_cyan,
-            NamedColor::BrightWhite => colors.terminal_ansi_bright_white,
-            NamedColor::Foreground => colors.terminal_foreground,
-            NamedColor::Background => colors.terminal_ansi_background,
-            NamedColor::Cursor => theme.players().local().cursor,
-            NamedColor::DimBlack => colors.terminal_ansi_dim_black,
-            NamedColor::DimRed => colors.terminal_ansi_dim_red,
-            NamedColor::DimGreen => colors.terminal_ansi_dim_green,
-            NamedColor::DimYellow => colors.terminal_ansi_dim_yellow,
-            NamedColor::DimBlue => colors.terminal_ansi_dim_blue,
-            NamedColor::DimMagenta => colors.terminal_ansi_dim_magenta,
-            NamedColor::DimCyan => colors.terminal_ansi_dim_cyan,
-            NamedColor::DimWhite => colors.terminal_ansi_dim_white,
-            NamedColor::BrightForeground => colors.terminal_bright_foreground,
-            NamedColor::DimForeground => colors.terminal_dim_foreground,
-        },
-        // 'True' colors
-        terminal::alacritty_terminal::vte::ansi::Color::Spec(rgb) => {
-            terminal::rgba_color(rgb.r, rgb.g, rgb.b)
-        }
-        // 8 bit, indexed colors
-        terminal::alacritty_terminal::vte::ansi::Color::Indexed(i) => {
-            terminal::get_color_at_index(*i as usize, theme)
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use gpui::{AbsoluteLength, Hsla, font};
-    use ui::utils::apca_contrast;
-
-    #[test]
-    fn test_is_decorative_character() {
-        // Box Drawing characters (U+2500 to U+257F)
-        assert!(TerminalElement::is_decorative_character('─')); // U+2500
-        assert!(TerminalElement::is_decorative_character('│')); // U+2502
-        assert!(TerminalElement::is_decorative_character('┌')); // U+250C
-        assert!(TerminalElement::is_decorative_character('┐')); // U+2510
-        assert!(TerminalElement::is_decorative_character('└')); // U+2514
-        assert!(TerminalElement::is_decorative_character('┘')); // U+2518
-        assert!(TerminalElement::is_decorative_character('┼')); // U+253C
-
-        // Block Elements (U+2580 to U+259F)
-        assert!(TerminalElement::is_decorative_character('▀')); // U+2580
-        assert!(TerminalElement::is_decorative_character('▄')); // U+2584
-        assert!(TerminalElement::is_decorative_character('█')); // U+2588
-        assert!(TerminalElement::is_decorative_character('░')); // U+2591
-        assert!(TerminalElement::is_decorative_character('▒')); // U+2592
-        assert!(TerminalElement::is_decorative_character('▓')); // U+2593
-
-        // Geometric Shapes - block/box-like subset (U+25A0 to U+25D7)
-        assert!(TerminalElement::is_decorative_character('■')); // U+25A0
-        assert!(TerminalElement::is_decorative_character('□')); // U+25A1
-        assert!(TerminalElement::is_decorative_character('▲')); // U+25B2
-        assert!(TerminalElement::is_decorative_character('▼')); // U+25BC
-        assert!(TerminalElement::is_decorative_character('◆')); // U+25C6
-        assert!(TerminalElement::is_decorative_character('●')); // U+25CF
-
-        // The specific character from the issue
-        assert!(TerminalElement::is_decorative_character('◗')); // U+25D7
-        assert!(TerminalElement::is_decorative_character('◘')); // U+25D8 (now included in Geometric Shapes)
-        assert!(TerminalElement::is_decorative_character('◙')); // U+25D9 (now included in Geometric Shapes)
-
-        // Powerline symbols (Private Use Area)
-        assert!(TerminalElement::is_decorative_character('\u{E0B0}')); // Powerline right triangle
-        assert!(TerminalElement::is_decorative_character('\u{E0B2}')); // Powerline left triangle
-        assert!(TerminalElement::is_decorative_character('\u{E0B4}')); // Powerline right half circle (the actual issue!)
-        assert!(TerminalElement::is_decorative_character('\u{E0B6}')); // Powerline left half circle
-        assert!(TerminalElement::is_decorative_character('\u{E0CA}')); // Powerline mirrored ice waveform
-        assert!(TerminalElement::is_decorative_character('\u{E0D7}')); // Powerline left triangle inverted
-
-        // Characters that should NOT be considered decorative
-        assert!(!TerminalElement::is_decorative_character('A')); // Regular letter
-        assert!(!TerminalElement::is_decorative_character('$')); // Symbol
-        assert!(!TerminalElement::is_decorative_character(' ')); // Space
-        assert!(!TerminalElement::is_decorative_character('←')); // U+2190 (Arrow, not in our ranges)
-        assert!(!TerminalElement::is_decorative_character('→')); // U+2192 (Arrow, not in our ranges)
-        assert!(!TerminalElement::is_decorative_character('\u{F00C}')); // Font Awesome check (icon, needs contrast)
-        assert!(!TerminalElement::is_decorative_character('\u{E711}')); // Devicons (icon, needs contrast)
-        assert!(!TerminalElement::is_decorative_character('\u{EA71}')); // Codicons folder (icon, needs contrast)
-        assert!(!TerminalElement::is_decorative_character('\u{F401}')); // Octicons (icon, needs contrast)
-        assert!(!TerminalElement::is_decorative_character('\u{1F600}')); // Emoji (not in our ranges)
-    }
-
-    #[test]
-    fn test_decorative_character_boundary_cases() {
-        // Test exact boundaries of our ranges
-        // Box Drawing range boundaries
-        assert!(TerminalElement::is_decorative_character('\u{2500}')); // First char
-        assert!(TerminalElement::is_decorative_character('\u{257F}')); // Last char
-        assert!(!TerminalElement::is_decorative_character('\u{24FF}')); // Just before
-
-        // Block Elements range boundaries
-        assert!(TerminalElement::is_decorative_character('\u{2580}')); // First char
-        assert!(TerminalElement::is_decorative_character('\u{259F}')); // Last char
-
-        // Geometric Shapes subset boundaries
-        assert!(TerminalElement::is_decorative_character('\u{25A0}')); // First char
-        assert!(TerminalElement::is_decorative_character('\u{25FF}')); // Last char
-        assert!(!TerminalElement::is_decorative_character('\u{2600}')); // Just after
-    }
-
-    #[test]
-    fn test_decorative_characters_bypass_contrast_adjustment() {
-        // Decorative characters should not be affected by contrast adjustment
-
-        // The specific character from issue #34234
-        let problematic_char = '◗'; // U+25D7
-        assert!(
-            TerminalElement::is_decorative_character(problematic_char),
-            "Character ◗ (U+25D7) should be recognized as decorative"
-        );
-
-        // Verify some other commonly used decorative characters
-        assert!(TerminalElement::is_decorative_character('│')); // Vertical line
-        assert!(TerminalElement::is_decorative_character('─')); // Horizontal line
-        assert!(TerminalElement::is_decorative_character('█')); // Full block
-        assert!(TerminalElement::is_decorative_character('▓')); // Dark shade
-        assert!(TerminalElement::is_decorative_character('■')); // Black square
-        assert!(TerminalElement::is_decorative_character('●')); // Black circle
-
-        // Verify normal text characters are NOT decorative
-        assert!(!TerminalElement::is_decorative_character('A'));
-        assert!(!TerminalElement::is_decorative_character('1'));
-        assert!(!TerminalElement::is_decorative_character('$'));
-        assert!(!TerminalElement::is_decorative_character(' '));
-    }
-
-    #[test]
-    fn test_contrast_adjustment_logic() {
-        // Test the core contrast adjustment logic without needing full app context
-
-        // Test case 1: Light colors (poor contrast)
-        let white_fg = gpui::Hsla {
-            h: 0.0,
-            s: 0.0,
-            l: 1.0,
-            a: 1.0,
-        };
-        let light_gray_bg = gpui::Hsla {
-            h: 0.0,
-            s: 0.0,
-            l: 0.95,
-            a: 1.0,
-        };
-
-        // Should have poor contrast
-        let actual_contrast = apca_contrast(white_fg, light_gray_bg).abs();
-        assert!(
-            actual_contrast < 30.0,
-            "White on light gray should have poor APCA contrast: {}",
-            actual_contrast
-        );
-
-        // After adjustment with minimum APCA contrast of 45, should be darker
-        let adjusted = ensure_minimum_contrast(white_fg, light_gray_bg, 45.0);
-        assert!(
-            adjusted.l < white_fg.l,
-            "Adjusted color should be darker than original"
-        );
-        let adjusted_contrast = apca_contrast(adjusted, light_gray_bg).abs();
-        assert!(adjusted_contrast >= 45.0, "Should meet minimum contrast");
-
-        // Test case 2: Dark colors (poor contrast)
-        let black_fg = gpui::Hsla {
-            h: 0.0,
-            s: 0.0,
-            l: 0.0,
-            a: 1.0,
-        };
-        let dark_gray_bg = gpui::Hsla {
-            h: 0.0,
-            s: 0.0,
-            l: 0.05,
-            a: 1.0,
-        };
-
-        // Should have poor contrast
-        let actual_contrast = apca_contrast(black_fg, dark_gray_bg).abs();
-        assert!(
-            actual_contrast < 30.0,
-            "Black on dark gray should have poor APCA contrast: {}",
-            actual_contrast
-        );
-
-        // After adjustment with minimum APCA contrast of 45, should be lighter
-        let adjusted = ensure_minimum_contrast(black_fg, dark_gray_bg, 45.0);
-        assert!(
-            adjusted.l > black_fg.l,
-            "Adjusted color should be lighter than original"
-        );
-        let adjusted_contrast = apca_contrast(adjusted, dark_gray_bg).abs();
-        assert!(adjusted_contrast >= 45.0, "Should meet minimum contrast");
-
-        // Test case 3: Already good contrast
-        let good_contrast = ensure_minimum_contrast(black_fg, white_fg, 45.0);
-        assert_eq!(
-            good_contrast, black_fg,
-            "Good contrast should not be adjusted"
-        );
-    }
-
-    #[test]
-    fn test_white_on_white_contrast_issue() {
-        // This test reproduces the exact issue from the bug report
-        // where white ANSI text on white background should be adjusted
-
-        // Simulate One Light theme colors
-        let white_fg = gpui::Hsla {
-            h: 0.0,
-            s: 0.0,
-            l: 0.98, // #fafafaff is approximately 98% lightness
-            a: 1.0,
-        };
-        let white_bg = gpui::Hsla {
-            h: 0.0,
-            s: 0.0,
-            l: 0.98, // Same as foreground - this is the problem!
-            a: 1.0,
-        };
-
-        // With minimum contrast of 0.0, no adjustment should happen
-        let no_adjust = ensure_minimum_contrast(white_fg, white_bg, 0.0);
-        assert_eq!(no_adjust, white_fg, "No adjustment with min_contrast 0.0");
-
-        // With minimum APCA contrast of 15, it should adjust to a darker color
-        let adjusted = ensure_minimum_contrast(white_fg, white_bg, 15.0);
-        assert!(
-            adjusted.l < white_fg.l,
-            "White on white should become darker, got l={}",
-            adjusted.l
-        );
-
-        // Verify the contrast is now acceptable
-        let new_contrast = apca_contrast(adjusted, white_bg).abs();
-        assert!(
-            new_contrast >= 15.0,
-            "Adjusted APCA contrast {} should be >= 15.0",
-            new_contrast
-        );
-    }
-
-    #[test]
-    fn test_batched_text_run_can_append() {
-        let style1 = TextRun {
-            len: 1,
-            font: font("Helvetica"),
-            color: Hsla::red(),
-            ..Default::default()
-        };
-
-        let style2 = TextRun {
-            len: 1,
-            font: font("Helvetica"),
-            color: Hsla::red(),
-            ..Default::default()
-        };
-
-        let style3 = TextRun {
-            len: 1,
-            font: font("Helvetica"),
-            color: Hsla::blue(), // Different color
-            ..Default::default()
-        };
-
-        let font_size = AbsoluteLength::Pixels(px(12.0));
-        let batch = BatchedTextRun::new_from_char(AlacPoint::new(0, 0), 'a', style1, font_size);
-
-        // Should be able to append same style
-        assert!(batch.can_append(&style2));
-
-        // Should not be able to append different style
-        assert!(!batch.can_append(&style3));
-    }
-
-    #[test]
-    fn test_batched_text_run_append() {
-        let style = TextRun {
-            len: 1,
-            font: font("Helvetica"),
-            color: Hsla::red(),
-            ..Default::default()
-        };
-
-        let font_size = AbsoluteLength::Pixels(px(12.0));
-        let mut batch = BatchedTextRun::new_from_char(AlacPoint::new(0, 0), 'a', style, font_size);
-
-        assert_eq!(batch.text, "a");
-        assert_eq!(batch.cell_count, 1);
-        assert_eq!(batch.style.len, 1);
-
-        batch.append_char('b');
-
-        assert_eq!(batch.text, "ab");
-        assert_eq!(batch.cell_count, 2);
-        assert_eq!(batch.style.len, 2);
-
-        batch.append_char('c');
-
-        assert_eq!(batch.text, "abc");
-        assert_eq!(batch.cell_count, 3);
-        assert_eq!(batch.style.len, 3);
-    }
-
-    #[test]
-    fn test_batched_text_run_append_char() {
-        let style = TextRun {
-            len: 1,
-            font: font("Helvetica"),
-            color: Hsla::red(),
-            ..Default::default()
-        };
-
-        let font_size = AbsoluteLength::Pixels(px(12.0));
-        let mut batch = BatchedTextRun::new_from_char(AlacPoint::new(0, 0), 'x', style, font_size);
-
-        assert_eq!(batch.text, "x");
-        assert_eq!(batch.cell_count, 1);
-        assert_eq!(batch.style.len, 1);
-
-        batch.append_char('y');
-
-        assert_eq!(batch.text, "xy");
-        assert_eq!(batch.cell_count, 2);
-        assert_eq!(batch.style.len, 2);
-
-        // Test with multi-byte character
-        batch.append_char('😀');
-
-        assert_eq!(batch.text, "xy😀");
-        assert_eq!(batch.cell_count, 3);
-        assert_eq!(batch.style.len, 6); // 1 + 1 + 4 bytes for emoji
-    }
-
-    #[test]
-    fn test_batched_text_run_append_zero_width_char() {
-        let style = TextRun {
-            len: 1,
-            font: font("Helvetica"),
-            color: Hsla::red(),
-            ..Default::default()
-        };
-
-        let font_size = AbsoluteLength::Pixels(px(12.0));
-        let mut batch = BatchedTextRun::new_from_char(AlacPoint::new(0, 0), 'x', style, font_size);
-
-        let combining = '\u{0301}';
-        batch.append_zero_width_chars(&[combining]);
-
-        assert_eq!(batch.text, format!("x{}", combining));
-        assert_eq!(batch.cell_count, 1);
-        assert_eq!(batch.style.len, 1 + combining.len_utf8());
-    }
-
-    #[test]
-    fn test_background_region_can_merge() {
-        let color1 = Hsla::red();
-        let color2 = Hsla::blue();
-
-        // Test horizontal merging
-        let mut region1 = BackgroundRegion::new(0, 0, color1);
-        region1.end_col = 5;
-        let region2 = BackgroundRegion::new(0, 6, color1);
-        assert!(region1.can_merge_with(&region2));
-
-        // Test vertical merging with same column span
-        let mut region3 = BackgroundRegion::new(0, 0, color1);
-        region3.end_col = 5;
-        let mut region4 = BackgroundRegion::new(1, 0, color1);
-        region4.end_col = 5;
-        assert!(region3.can_merge_with(&region4));
-
-        // Test cannot merge different colors
-        let region5 = BackgroundRegion::new(0, 0, color1);
-        let region6 = BackgroundRegion::new(0, 1, color2);
-        assert!(!region5.can_merge_with(&region6));
-
-        // Test cannot merge non-adjacent regions
-        let region7 = BackgroundRegion::new(0, 0, color1);
-        let region8 = BackgroundRegion::new(0, 2, color1);
-        assert!(!region7.can_merge_with(&region8));
-
-        // Test cannot merge vertical regions with different column spans
-        let mut region9 = BackgroundRegion::new(0, 0, color1);
-        region9.end_col = 5;
-        let mut region10 = BackgroundRegion::new(1, 0, color1);
-        region10.end_col = 6;
-        assert!(!region9.can_merge_with(&region10));
-    }
-
-    #[test]
-    fn test_background_region_merge() {
-        let color = Hsla::red();
-
-        // Test horizontal merge
-        let mut region1 = BackgroundRegion::new(0, 0, color);
-        region1.end_col = 5;
-        let mut region2 = BackgroundRegion::new(0, 6, color);
-        region2.end_col = 10;
-        region1.merge_with(&region2);
-        assert_eq!(region1.start_col, 0);
-        assert_eq!(region1.end_col, 10);
-        assert_eq!(region1.start_line, 0);
-        assert_eq!(region1.end_line, 0);
-
-        // Test vertical merge
-        let mut region3 = BackgroundRegion::new(0, 0, color);
-        region3.end_col = 5;
-        let mut region4 = BackgroundRegion::new(1, 0, color);
-        region4.end_col = 5;
-        region3.merge_with(&region4);
-        assert_eq!(region3.start_col, 0);
-        assert_eq!(region3.end_col, 5);
-        assert_eq!(region3.start_line, 0);
-        assert_eq!(region3.end_line, 1);
-    }
-
-    #[test]
-    fn test_merge_background_regions() {
-        let color = Hsla::red();
-
-        // Test merging multiple adjacent regions
-        let regions = vec![
-            BackgroundRegion::new(0, 0, color),
-            BackgroundRegion::new(0, 1, color),
-            BackgroundRegion::new(0, 2, color),
-            BackgroundRegion::new(1, 0, color),
-            BackgroundRegion::new(1, 1, color),
-            BackgroundRegion::new(1, 2, color),
-        ];
-
-        let merged = merge_background_regions(regions);
-        assert_eq!(merged.len(), 1);
-        assert_eq!(merged[0].start_line, 0);
-        assert_eq!(merged[0].end_line, 1);
-        assert_eq!(merged[0].start_col, 0);
-        assert_eq!(merged[0].end_col, 2);
-
-        // Test with non-mergeable regions
-        let color2 = Hsla::blue();
-        let regions2 = vec![
-            BackgroundRegion::new(0, 0, color),
-            BackgroundRegion::new(0, 2, color),  // Gap at column 1
-            BackgroundRegion::new(1, 0, color2), // Different color
-        ];
-
-        let merged2 = merge_background_regions(regions2);
-        assert_eq!(merged2.len(), 3);
-    }
-}
diff --git a/crates/terminal_view/src/terminal_panel.rs b/crates/terminal_view/src/terminal_panel.rs
deleted file mode 100644
index ab89787fc8..0000000000
--- a/crates/terminal_view/src/terminal_panel.rs
+++ /dev/null
@@ -1,1978 +0,0 @@
-use std::{cmp, ops::ControlFlow, path::PathBuf, process::ExitStatus, sync::Arc, time::Duration};
-
-use crate::{
-    TerminalView, default_working_directory,
-    persistence::{
-        SerializedItems, SerializedTerminalPanel, deserialize_terminal_panel, serialize_pane_group,
-    },
-};
-use breadcrumbs::Breadcrumbs;
-use collections::HashMap;
-use db::kvp::KEY_VALUE_STORE;
-use futures::{channel::oneshot, future::join_all};
-use gpui::{
-    Action, AnyView, App, AsyncApp, AsyncWindowContext, Context, Corner, Entity, EventEmitter,
-    ExternalPaths, FocusHandle, Focusable, IntoElement, ParentElement, Pixels, Render, Styled,
-    Task, WeakEntity, Window, actions,
-};
-use itertools::Itertools;
-use project::{Fs, Project, ProjectEntryId};
-use search::{BufferSearchBar, buffer_search::DivRegistrar};
-use settings::{Settings, TerminalDockPosition};
-use task::{RevealStrategy, RevealTarget, Shell, ShellBuilder, SpawnInTerminal, TaskId};
-use terminal::{Terminal, terminal_settings::TerminalSettings};
-use ui::{
-    ButtonLike, Clickable, ContextMenu, FluentBuilder, PopoverMenu, SplitButton, Toggleable,
-    Tooltip, prelude::*,
-};
-use util::{ResultExt, TryFutureExt};
-use workspace::{
-    ActivateNextPane, ActivatePane, ActivatePaneDown, ActivatePaneLeft, ActivatePaneRight,
-    ActivatePaneUp, ActivatePreviousPane, DraggedSelection, DraggedTab, ItemId, MoveItemToPane,
-    MoveItemToPaneInDirection, MovePaneDown, MovePaneLeft, MovePaneRight, MovePaneUp, NewTerminal,
-    Pane, PaneGroup, SplitDirection, SplitDown, SplitLeft, SplitRight, SplitUp, SwapPaneDown,
-    SwapPaneLeft, SwapPaneRight, SwapPaneUp, ToggleZoom, Workspace,
-    dock::{DockPosition, Panel, PanelEvent, PanelHandle},
-    item::SerializableItem,
-    move_active_item, move_item, pane,
-};
-
-use anyhow::{Result, anyhow};
-use zed_actions::assistant::InlineAssist;
-
-const TERMINAL_PANEL_KEY: &str = "TerminalPanel";
-
-actions!(
-    terminal_panel,
-    [
-        /// Toggles the terminal panel.
-        Toggle,
-        /// Toggles focus on the terminal panel.
-        ToggleFocus
-    ]
-);
-
-pub fn init(cx: &mut App) {
-    cx.observe_new(
-        |workspace: &mut Workspace, _window, _: &mut Context<Workspace>| {
-            workspace.register_action(TerminalPanel::new_terminal);
-            workspace.register_action(TerminalPanel::open_terminal);
-            workspace.register_action(|workspace, _: &ToggleFocus, window, cx| {
-                if is_enabled_in_workspace(workspace, cx) {
-                    workspace.toggle_panel_focus::<TerminalPanel>(window, cx);
-                }
-            });
-            workspace.register_action(|workspace, _: &Toggle, window, cx| {
-                if is_enabled_in_workspace(workspace, cx) {
-                    if !workspace.toggle_panel_focus::<TerminalPanel>(window, cx) {
-                        workspace.close_panel::<TerminalPanel>(window, cx);
-                    }
-                }
-            });
-        },
-    )
-    .detach();
-}
-
-pub struct TerminalPanel {
-    pub(crate) active_pane: Entity<Pane>,
-    pub(crate) center: PaneGroup,
-    fs: Arc<dyn Fs>,
-    workspace: WeakEntity<Workspace>,
-    pub(crate) width: Option<Pixels>,
-    pub(crate) height: Option<Pixels>,
-    pending_serialization: Task<Option<()>>,
-    pending_terminals_to_add: usize,
-    deferred_tasks: HashMap<TaskId, Task<()>>,
-    assistant_enabled: bool,
-    assistant_tab_bar_button: Option<AnyView>,
-    active: bool,
-}
-
-impl TerminalPanel {
-    pub fn new(workspace: &Workspace, window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let project = workspace.project();
-        let pane = new_terminal_pane(workspace.weak_handle(), project.clone(), false, window, cx);
-        let center = PaneGroup::new(pane.clone());
-        let terminal_panel = Self {
-            center,
-            active_pane: pane,
-            fs: workspace.app_state().fs.clone(),
-            workspace: workspace.weak_handle(),
-            pending_serialization: Task::ready(None),
-            width: None,
-            height: None,
-            pending_terminals_to_add: 0,
-            deferred_tasks: HashMap::default(),
-            assistant_enabled: false,
-            assistant_tab_bar_button: None,
-            active: false,
-        };
-        terminal_panel.apply_tab_bar_buttons(&terminal_panel.active_pane, cx);
-        terminal_panel
-    }
-
-    pub fn set_assistant_enabled(&mut self, enabled: bool, cx: &mut Context<Self>) {
-        self.assistant_enabled = enabled;
-        if enabled {
-            let focus_handle = self
-                .active_pane
-                .read(cx)
-                .active_item()
-                .map(|item| item.item_focus_handle(cx))
-                .unwrap_or(self.focus_handle(cx));
-            self.assistant_tab_bar_button = Some(
-                cx.new(move |_| InlineAssistTabBarButton { focus_handle })
-                    .into(),
-            );
-        } else {
-            self.assistant_tab_bar_button = None;
-        }
-        for pane in self.center.panes() {
-            self.apply_tab_bar_buttons(pane, cx);
-        }
-    }
-
-    fn apply_tab_bar_buttons(&self, terminal_pane: &Entity<Pane>, cx: &mut Context<Self>) {
-        let assistant_tab_bar_button = self.assistant_tab_bar_button.clone();
-        terminal_pane.update(cx, |pane, cx| {
-            pane.set_render_tab_bar_buttons(cx, move |pane, window, cx| {
-                let split_context = pane
-                    .active_item()
-                    .and_then(|item| item.downcast::<TerminalView>())
-                    .map(|terminal_view| terminal_view.read(cx).focus_handle.clone());
-                if !pane.has_focus(window, cx) && !pane.context_menu_focused(window, cx) {
-                    return (None, None);
-                }
-                let focus_handle = pane.focus_handle(cx);
-                let right_children = h_flex()
-                    .gap(DynamicSpacing::Base02.rems(cx))
-                    .child(
-                        PopoverMenu::new("terminal-tab-bar-popover-menu")
-                            .trigger_with_tooltip(
-                                IconButton::new("plus", IconName::Plus).icon_size(IconSize::Small),
-                                Tooltip::text("New…"),
-                            )
-                            .anchor(Corner::TopRight)
-                            .with_handle(pane.new_item_context_menu_handle.clone())
-                            .menu(move |window, cx| {
-                                let focus_handle = focus_handle.clone();
-                                let menu = ContextMenu::build(window, cx, |menu, _, _| {
-                                    menu.context(focus_handle.clone())
-                                        .action(
-                                            "New Terminal",
-                                            workspace::NewTerminal.boxed_clone(),
-                                        )
-                                        // We want the focus to go back to terminal panel once task modal is dismissed,
-                                        // hence we focus that first. Otherwise, we'd end up without a focused element, as
-                                        // context menu will be gone the moment we spawn the modal.
-                                        .action(
-                                            "Spawn Task",
-                                            zed_actions::Spawn::modal().boxed_clone(),
-                                        )
-                                });
-
-                                Some(menu)
-                            }),
-                    )
-                    .children(assistant_tab_bar_button.clone())
-                    .child(
-                        PopoverMenu::new("terminal-pane-tab-bar-split")
-                            .trigger_with_tooltip(
-                                IconButton::new("terminal-pane-split", IconName::Split)
-                                    .icon_size(IconSize::Small),
-                                Tooltip::text("Split Pane"),
-                            )
-                            .anchor(Corner::TopRight)
-                            .with_handle(pane.split_item_context_menu_handle.clone())
-                            .menu({
-                                move |window, cx| {
-                                    ContextMenu::build(window, cx, |menu, _, _| {
-                                        menu.when_some(
-                                            split_context.clone(),
-                                            |menu, split_context| menu.context(split_context),
-                                        )
-                                        .action("Split Right", SplitRight.boxed_clone())
-                                        .action("Split Left", SplitLeft.boxed_clone())
-                                        .action("Split Up", SplitUp.boxed_clone())
-                                        .action("Split Down", SplitDown.boxed_clone())
-                                    })
-                                    .into()
-                                }
-                            }),
-                    )
-                    .child({
-                        let zoomed = pane.is_zoomed();
-                        IconButton::new("toggle_zoom", IconName::Maximize)
-                            .icon_size(IconSize::Small)
-                            .toggle_state(zoomed)
-                            .selected_icon(IconName::Minimize)
-                            .on_click(cx.listener(|pane, _, window, cx| {
-                                pane.toggle_zoom(&workspace::ToggleZoom, window, cx);
-                            }))
-                            .tooltip(move |_window, cx| {
-                                Tooltip::for_action(
-                                    if zoomed { "Zoom Out" } else { "Zoom In" },
-                                    &ToggleZoom,
-                                    cx,
-                                )
-                            })
-                    })
-                    .into_any_element()
-                    .into();
-                (None, right_children)
-            });
-        });
-    }
-
-    fn serialization_key(workspace: &Workspace) -> Option<String> {
-        workspace
-            .database_id()
-            .map(|id| i64::from(id).to_string())
-            .or(workspace.session_id())
-            .map(|id| format!("{:?}-{:?}", TERMINAL_PANEL_KEY, id))
-    }
-
-    pub async fn load(
-        workspace: WeakEntity<Workspace>,
-        mut cx: AsyncWindowContext,
-    ) -> Result<Entity<Self>> {
-        let mut terminal_panel = None;
-
-        if let Some((database_id, serialization_key)) = workspace
-            .read_with(&cx, |workspace, _| {
-                workspace
-                    .database_id()
-                    .zip(TerminalPanel::serialization_key(workspace))
-            })
-            .ok()
-            .flatten()
-            && let Some(serialized_panel) = cx
-                .background_spawn(async move { KEY_VALUE_STORE.read_kvp(&serialization_key) })
-                .await
-                .log_err()
-                .flatten()
-                .map(|panel| serde_json::from_str::<SerializedTerminalPanel>(&panel))
-                .transpose()
-                .log_err()
-                .flatten()
-            && let Ok(serialized) = workspace
-                .update_in(&mut cx, |workspace, window, cx| {
-                    deserialize_terminal_panel(
-                        workspace.weak_handle(),
-                        workspace.project().clone(),
-                        database_id,
-                        serialized_panel,
-                        window,
-                        cx,
-                    )
-                })?
-                .await
-        {
-            terminal_panel = Some(serialized);
-        }
-
-        let terminal_panel = if let Some(panel) = terminal_panel {
-            panel
-        } else {
-            workspace.update_in(&mut cx, |workspace, window, cx| {
-                cx.new(|cx| TerminalPanel::new(workspace, window, cx))
-            })?
-        };
-
-        if let Some(workspace) = workspace.upgrade() {
-            workspace
-                .update(&mut cx, |workspace, _| {
-                    workspace.set_terminal_provider(TerminalProvider(terminal_panel.clone()))
-                })
-                .ok();
-        }
-
-        // Since panels/docks are loaded outside from the workspace, we cleanup here, instead of through the workspace.
-        if let Some(workspace) = workspace.upgrade() {
-            let cleanup_task = workspace.update_in(&mut cx, |workspace, window, cx| {
-                let alive_item_ids = terminal_panel
-                    .read(cx)
-                    .center
-                    .panes()
-                    .into_iter()
-                    .flat_map(|pane| pane.read(cx).items())
-                    .map(|item| item.item_id().as_u64() as ItemId)
-                    .collect();
-                workspace.database_id().map(|workspace_id| {
-                    TerminalView::cleanup(workspace_id, alive_item_ids, window, cx)
-                })
-            })?;
-            if let Some(task) = cleanup_task {
-                task.await.log_err();
-            }
-        }
-
-        if let Some(workspace) = workspace.upgrade() {
-            let should_focus = workspace
-                .update_in(&mut cx, |workspace, window, cx| {
-                    workspace.active_item(cx).is_none()
-                        && workspace
-                            .is_dock_at_position_open(terminal_panel.position(window, cx), cx)
-                })
-                .unwrap_or(false);
-
-            if should_focus {
-                terminal_panel
-                    .update_in(&mut cx, |panel, window, cx| {
-                        panel.active_pane.update(cx, |pane, cx| {
-                            pane.focus_active_item(window, cx);
-                        });
-                    })
-                    .ok();
-            }
-        }
-        Ok(terminal_panel)
-    }
-
-    fn handle_pane_event(
-        &mut self,
-        pane: &Entity<Pane>,
-        event: &pane::Event,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            pane::Event::ActivateItem { .. } => self.serialize(cx),
-            pane::Event::RemovedItem { .. } => self.serialize(cx),
-            pane::Event::Remove { focus_on_pane } => {
-                let pane_count_before_removal = self.center.panes().len();
-                let _removal_result = self.center.remove(pane);
-                if pane_count_before_removal == 1 {
-                    self.center.first_pane().update(cx, |pane, cx| {
-                        pane.set_zoomed(false, cx);
-                    });
-                    cx.emit(PanelEvent::Close);
-                } else if let Some(focus_on_pane) =
-                    focus_on_pane.as_ref().or_else(|| self.center.panes().pop())
-                {
-                    focus_on_pane.focus_handle(cx).focus(window);
-                }
-            }
-            pane::Event::ZoomIn => {
-                for pane in self.center.panes() {
-                    pane.update(cx, |pane, cx| {
-                        pane.set_zoomed(true, cx);
-                    })
-                }
-                cx.emit(PanelEvent::ZoomIn);
-                cx.notify();
-            }
-            pane::Event::ZoomOut => {
-                for pane in self.center.panes() {
-                    pane.update(cx, |pane, cx| {
-                        pane.set_zoomed(false, cx);
-                    })
-                }
-                cx.emit(PanelEvent::ZoomOut);
-                cx.notify();
-            }
-            pane::Event::AddItem { item } => {
-                if let Some(workspace) = self.workspace.upgrade() {
-                    workspace.update(cx, |workspace, cx| {
-                        item.added_to_pane(workspace, pane.clone(), window, cx)
-                    })
-                }
-                self.serialize(cx);
-            }
-            &pane::Event::Split {
-                direction,
-                clone_active_item,
-            } => {
-                if clone_active_item {
-                    let fut = self.new_pane_with_cloned_active_terminal(window, cx);
-                    let pane = pane.clone();
-                    cx.spawn_in(window, async move |panel, cx| {
-                        let Some(new_pane) = fut.await else {
-                            return;
-                        };
-                        panel
-                            .update_in(cx, |panel, window, cx| {
-                                panel.center.split(&pane, &new_pane, direction).log_err();
-                                window.focus(&new_pane.focus_handle(cx));
-                            })
-                            .ok();
-                    })
-                    .detach();
-                } else {
-                    let Some(item) = pane.update(cx, |pane, cx| pane.take_active_item(window, cx))
-                    else {
-                        return;
-                    };
-                    let Ok(project) = self
-                        .workspace
-                        .update(cx, |workspace, _| workspace.project().clone())
-                    else {
-                        return;
-                    };
-                    let new_pane =
-                        new_terminal_pane(self.workspace.clone(), project, false, window, cx);
-                    new_pane.update(cx, |pane, cx| {
-                        pane.add_item(item, true, true, None, window, cx);
-                    });
-                    self.center.split(&pane, &new_pane, direction).log_err();
-                    window.focus(&new_pane.focus_handle(cx));
-                }
-            }
-            pane::Event::Focus => {
-                self.active_pane = pane.clone();
-            }
-            pane::Event::ItemPinned | pane::Event::ItemUnpinned => {
-                self.serialize(cx);
-            }
-
-            _ => {}
-        }
-    }
-
-    fn new_pane_with_cloned_active_terminal(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Option<Entity<Pane>>> {
-        let Some(workspace) = self.workspace.upgrade() else {
-            return Task::ready(None);
-        };
-        let workspace = workspace.read(cx);
-        let database_id = workspace.database_id();
-        let weak_workspace = self.workspace.clone();
-        let project = workspace.project().clone();
-        let active_pane = &self.active_pane;
-        let terminal_view = active_pane
-            .read(cx)
-            .active_item()
-            .and_then(|item| item.downcast::<TerminalView>());
-        let working_directory = terminal_view
-            .as_ref()
-            .and_then(|terminal_view| {
-                terminal_view
-                    .read(cx)
-                    .terminal()
-                    .read(cx)
-                    .working_directory()
-            })
-            .or_else(|| default_working_directory(workspace, cx));
-        let is_zoomed = active_pane.read(cx).is_zoomed();
-        cx.spawn_in(window, async move |panel, cx| {
-            let terminal = project
-                .update(cx, |project, cx| match terminal_view {
-                    Some(view) => project.clone_terminal(
-                        &view.read(cx).terminal.clone(),
-                        cx,
-                        working_directory,
-                    ),
-                    None => project.create_terminal_shell(working_directory, cx),
-                })
-                .ok()?
-                .await
-                .log_err()?;
-
-            panel
-                .update_in(cx, move |terminal_panel, window, cx| {
-                    let terminal_view = Box::new(cx.new(|cx| {
-                        TerminalView::new(
-                            terminal.clone(),
-                            weak_workspace.clone(),
-                            database_id,
-                            project.downgrade(),
-                            window,
-                            cx,
-                        )
-                    }));
-                    let pane = new_terminal_pane(weak_workspace, project, is_zoomed, window, cx);
-                    terminal_panel.apply_tab_bar_buttons(&pane, cx);
-                    pane.update(cx, |pane, cx| {
-                        pane.add_item(terminal_view, true, true, None, window, cx);
-                    });
-                    Some(pane)
-                })
-                .ok()
-                .flatten()
-        })
-    }
-
-    pub fn open_terminal(
-        workspace: &mut Workspace,
-        action: &workspace::OpenTerminal,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        let Some(terminal_panel) = workspace.panel::<Self>(cx) else {
-            return;
-        };
-
-        terminal_panel
-            .update(cx, |panel, cx| {
-                panel.add_terminal_shell(
-                    Some(action.working_directory.clone()),
-                    RevealStrategy::Always,
-                    window,
-                    cx,
-                )
-            })
-            .detach_and_log_err(cx);
-    }
-
-    pub fn spawn_task(
-        &mut self,
-        task: &SpawnInTerminal,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<WeakEntity<Terminal>>> {
-        let Some(workspace) = self.workspace.upgrade() else {
-            return Task::ready(Err(anyhow!("failed to read workspace")));
-        };
-
-        let project = workspace.read(cx).project().read(cx);
-
-        if project.is_via_collab() {
-            return Task::ready(Err(anyhow!("cannot spawn tasks as a guest")));
-        }
-
-        let remote_client = project.remote_client();
-        let is_windows = project.path_style(cx).is_windows();
-        let remote_shell = remote_client
-            .as_ref()
-            .and_then(|remote_client| remote_client.read(cx).shell());
-
-        let shell = if let Some(remote_shell) = remote_shell
-            && task.shell == Shell::System
-        {
-            Shell::Program(remote_shell)
-        } else {
-            task.shell.clone()
-        };
-
-        let builder = ShellBuilder::new(&shell, is_windows);
-        let command_label = builder.command_label(task.command.as_deref().unwrap_or(""));
-        let (command, args) = builder.build_no_quote(task.command.clone(), &task.args);
-
-        let task = SpawnInTerminal {
-            command_label,
-            command: Some(command),
-            args,
-            ..task.clone()
-        };
-
-        if task.allow_concurrent_runs && task.use_new_terminal {
-            return self.spawn_in_new_terminal(task, window, cx);
-        }
-
-        let mut terminals_for_task = self.terminals_for_task(&task.full_label, cx);
-        let Some(existing) = terminals_for_task.pop() else {
-            return self.spawn_in_new_terminal(task, window, cx);
-        };
-
-        let (existing_item_index, task_pane, existing_terminal) = existing;
-        if task.allow_concurrent_runs {
-            return self.replace_terminal(
-                task,
-                task_pane,
-                existing_item_index,
-                existing_terminal,
-                window,
-                cx,
-            );
-        }
-
-        let (tx, rx) = oneshot::channel();
-
-        self.deferred_tasks.insert(
-            task.id.clone(),
-            cx.spawn_in(window, async move |terminal_panel, cx| {
-                wait_for_terminals_tasks(terminals_for_task, cx).await;
-                let task = terminal_panel.update_in(cx, |terminal_panel, window, cx| {
-                    if task.use_new_terminal {
-                        terminal_panel.spawn_in_new_terminal(task, window, cx)
-                    } else {
-                        terminal_panel.replace_terminal(
-                            task,
-                            task_pane,
-                            existing_item_index,
-                            existing_terminal,
-                            window,
-                            cx,
-                        )
-                    }
-                });
-                if let Ok(task) = task {
-                    tx.send(task.await).ok();
-                }
-            }),
-        );
-
-        cx.spawn(async move |_, _| rx.await?)
-    }
-
-    fn spawn_in_new_terminal(
-        &mut self,
-        spawn_task: SpawnInTerminal,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<WeakEntity<Terminal>>> {
-        let reveal = spawn_task.reveal;
-        let reveal_target = spawn_task.reveal_target;
-        match reveal_target {
-            RevealTarget::Center => self
-                .workspace
-                .update(cx, |workspace, cx| {
-                    Self::add_center_terminal(workspace, window, cx, |project, cx| {
-                        project.create_terminal_task(spawn_task, cx)
-                    })
-                })
-                .unwrap_or_else(|e| Task::ready(Err(e))),
-            RevealTarget::Dock => self.add_terminal_task(spawn_task, reveal, window, cx),
-        }
-    }
-
-    /// Create a new Terminal in the current working directory or the user's home directory
-    fn new_terminal(
-        workspace: &mut Workspace,
-        _: &workspace::NewTerminal,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        let Some(terminal_panel) = workspace.panel::<Self>(cx) else {
-            return;
-        };
-
-        terminal_panel
-            .update(cx, |this, cx| {
-                this.add_terminal_shell(
-                    default_working_directory(workspace, cx),
-                    RevealStrategy::Always,
-                    window,
-                    cx,
-                )
-            })
-            .detach_and_log_err(cx);
-    }
-
-    fn terminals_for_task(
-        &self,
-        label: &str,
-        cx: &mut App,
-    ) -> Vec<(usize, Entity<Pane>, Entity<TerminalView>)> {
-        let Some(workspace) = self.workspace.upgrade() else {
-            return Vec::new();
-        };
-
-        let pane_terminal_views = |pane: Entity<Pane>| {
-            pane.read(cx)
-                .items()
-                .enumerate()
-                .filter_map(|(index, item)| Some((index, item.act_as::<TerminalView>(cx)?)))
-                .filter_map(|(index, terminal_view)| {
-                    let task_state = terminal_view.read(cx).terminal().read(cx).task()?;
-                    if &task_state.spawned_task.full_label == label {
-                        Some((index, terminal_view))
-                    } else {
-                        None
-                    }
-                })
-                .map(move |(index, terminal_view)| (index, pane.clone(), terminal_view))
-        };
-
-        self.center
-            .panes()
-            .into_iter()
-            .cloned()
-            .flat_map(pane_terminal_views)
-            .chain(
-                workspace
-                    .read(cx)
-                    .panes()
-                    .iter()
-                    .cloned()
-                    .flat_map(pane_terminal_views),
-            )
-            .sorted_by_key(|(_, _, terminal_view)| terminal_view.entity_id())
-            .collect()
-    }
-
-    fn activate_terminal_view(
-        &self,
-        pane: &Entity<Pane>,
-        item_index: usize,
-        focus: bool,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        pane.update(cx, |pane, cx| {
-            pane.activate_item(item_index, true, focus, window, cx)
-        })
-    }
-
-    pub fn add_center_terminal(
-        workspace: &mut Workspace,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-        create_terminal: impl FnOnce(
-            &mut Project,
-            &mut Context<Project>,
-        ) -> Task<Result<Entity<Terminal>>>
-        + 'static,
-    ) -> Task<Result<WeakEntity<Terminal>>> {
-        if !is_enabled_in_workspace(workspace, cx) {
-            return Task::ready(Err(anyhow!(
-                "terminal not yet supported for remote projects"
-            )));
-        }
-        let project = workspace.project().downgrade();
-        cx.spawn_in(window, async move |workspace, cx| {
-            let terminal = project.update(cx, create_terminal)?.await?;
-
-            workspace.update_in(cx, |workspace, window, cx| {
-                let terminal_view = cx.new(|cx| {
-                    TerminalView::new(
-                        terminal.clone(),
-                        workspace.weak_handle(),
-                        workspace.database_id(),
-                        workspace.project().downgrade(),
-                        window,
-                        cx,
-                    )
-                });
-                workspace.add_item_to_active_pane(Box::new(terminal_view), None, true, window, cx);
-            })?;
-            Ok(terminal.downgrade())
-        })
-    }
-
-    pub fn add_terminal_task(
-        &mut self,
-        task: SpawnInTerminal,
-        reveal_strategy: RevealStrategy,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<WeakEntity<Terminal>>> {
-        let workspace = self.workspace.clone();
-        cx.spawn_in(window, async move |terminal_panel, cx| {
-            if workspace.update(cx, |workspace, cx| !is_enabled_in_workspace(workspace, cx))? {
-                anyhow::bail!("terminal not yet supported for remote projects");
-            }
-            let pane = terminal_panel.update(cx, |terminal_panel, _| {
-                terminal_panel.pending_terminals_to_add += 1;
-                terminal_panel.active_pane.clone()
-            })?;
-            let project = workspace.read_with(cx, |workspace, _| workspace.project().clone())?;
-            let terminal = project
-                .update(cx, |project, cx| project.create_terminal_task(task, cx))?
-                .await?;
-            let result = workspace.update_in(cx, |workspace, window, cx| {
-                let terminal_view = Box::new(cx.new(|cx| {
-                    TerminalView::new(
-                        terminal.clone(),
-                        workspace.weak_handle(),
-                        workspace.database_id(),
-                        workspace.project().downgrade(),
-                        window,
-                        cx,
-                    )
-                }));
-
-                match reveal_strategy {
-                    RevealStrategy::Always => {
-                        workspace.focus_panel::<Self>(window, cx);
-                    }
-                    RevealStrategy::NoFocus => {
-                        workspace.open_panel::<Self>(window, cx);
-                    }
-                    RevealStrategy::Never => {}
-                }
-
-                pane.update(cx, |pane, cx| {
-                    let focus = pane.has_focus(window, cx)
-                        || matches!(reveal_strategy, RevealStrategy::Always);
-                    pane.add_item(terminal_view, true, focus, None, window, cx);
-                });
-
-                Ok(terminal.downgrade())
-            })?;
-            terminal_panel.update(cx, |terminal_panel, cx| {
-                terminal_panel.pending_terminals_to_add =
-                    terminal_panel.pending_terminals_to_add.saturating_sub(1);
-                terminal_panel.serialize(cx)
-            })?;
-            result
-        })
-    }
-
-    fn add_terminal_shell(
-        &mut self,
-        cwd: Option<PathBuf>,
-        reveal_strategy: RevealStrategy,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<WeakEntity<Terminal>>> {
-        let workspace = self.workspace.clone();
-
-        cx.spawn_in(window, async move |terminal_panel, cx| {
-            if workspace.update(cx, |workspace, cx| !is_enabled_in_workspace(workspace, cx))? {
-                anyhow::bail!("terminal not yet supported for collaborative projects");
-            }
-            let pane = terminal_panel.update(cx, |terminal_panel, _| {
-                terminal_panel.pending_terminals_to_add += 1;
-                terminal_panel.active_pane.clone()
-            })?;
-            let project = workspace.read_with(cx, |workspace, _| workspace.project().clone())?;
-            let terminal = project
-                .update(cx, |project, cx| project.create_terminal_shell(cwd, cx))?
-                .await;
-
-            match terminal {
-                Ok(terminal) => {
-                    let result = workspace.update_in(cx, |workspace, window, cx| {
-                        let terminal_view = Box::new(cx.new(|cx| {
-                            TerminalView::new(
-                                terminal.clone(),
-                                workspace.weak_handle(),
-                                workspace.database_id(),
-                                workspace.project().downgrade(),
-                                window,
-                                cx,
-                            )
-                        }));
-
-                        match reveal_strategy {
-                            RevealStrategy::Always => {
-                                workspace.focus_panel::<Self>(window, cx);
-                            }
-                            RevealStrategy::NoFocus => {
-                                workspace.open_panel::<Self>(window, cx);
-                            }
-                            RevealStrategy::Never => {}
-                        }
-
-                        pane.update(cx, |pane, cx| {
-                            let focus = pane.has_focus(window, cx)
-                                || matches!(reveal_strategy, RevealStrategy::Always);
-                            pane.add_item(terminal_view, true, focus, None, window, cx);
-                        });
-
-                        Ok(terminal.downgrade())
-                    })?;
-                    terminal_panel.update(cx, |terminal_panel, cx| {
-                        terminal_panel.pending_terminals_to_add =
-                            terminal_panel.pending_terminals_to_add.saturating_sub(1);
-                        terminal_panel.serialize(cx)
-                    })?;
-                    result
-                }
-                Err(error) => {
-                    pane.update_in(cx, |pane, window, cx| {
-                        let focus = pane.has_focus(window, cx);
-                        let failed_to_spawn = cx.new(|cx| FailedToSpawnTerminal {
-                            error: error.to_string(),
-                            focus_handle: cx.focus_handle(),
-                        });
-                        pane.add_item(Box::new(failed_to_spawn), true, focus, None, window, cx);
-                    })?;
-                    Err(error)
-                }
-            }
-        })
-    }
-
-    fn serialize(&mut self, cx: &mut Context<Self>) {
-        let height = self.height;
-        let width = self.width;
-        let Some(serialization_key) = self
-            .workspace
-            .read_with(cx, |workspace, _| {
-                TerminalPanel::serialization_key(workspace)
-            })
-            .ok()
-            .flatten()
-        else {
-            return;
-        };
-        self.pending_serialization = cx.spawn(async move |terminal_panel, cx| {
-            cx.background_executor()
-                .timer(Duration::from_millis(50))
-                .await;
-            let terminal_panel = terminal_panel.upgrade()?;
-            let items = terminal_panel
-                .update(cx, |terminal_panel, cx| {
-                    SerializedItems::WithSplits(serialize_pane_group(
-                        &terminal_panel.center,
-                        &terminal_panel.active_pane,
-                        cx,
-                    ))
-                })
-                .ok()?;
-            cx.background_spawn(
-                async move {
-                    KEY_VALUE_STORE
-                        .write_kvp(
-                            serialization_key,
-                            serde_json::to_string(&SerializedTerminalPanel {
-                                items,
-                                active_item_id: None,
-                                height,
-                                width,
-                            })?,
-                        )
-                        .await?;
-                    anyhow::Ok(())
-                }
-                .log_err(),
-            )
-            .await;
-            Some(())
-        });
-    }
-
-    fn replace_terminal(
-        &self,
-        spawn_task: SpawnInTerminal,
-        task_pane: Entity<Pane>,
-        terminal_item_index: usize,
-        terminal_to_replace: Entity<TerminalView>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<WeakEntity<Terminal>>> {
-        let reveal = spawn_task.reveal;
-        let reveal_target = spawn_task.reveal_target;
-        let task_workspace = self.workspace.clone();
-        cx.spawn_in(window, async move |terminal_panel, cx| {
-            let project = terminal_panel.update(cx, |this, cx| {
-                this.workspace
-                    .update(cx, |workspace, _| workspace.project().clone())
-            })??;
-            let new_terminal = project
-                .update(cx, |project, cx| {
-                    project.create_terminal_task(spawn_task, cx)
-                })?
-                .await?;
-            terminal_to_replace.update_in(cx, |terminal_to_replace, window, cx| {
-                terminal_to_replace.set_terminal(new_terminal.clone(), window, cx);
-            })?;
-
-            match reveal {
-                RevealStrategy::Always => match reveal_target {
-                    RevealTarget::Center => {
-                        task_workspace.update_in(cx, |workspace, window, cx| {
-                            let did_activate = workspace.activate_item(
-                                &terminal_to_replace,
-                                true,
-                                true,
-                                window,
-                                cx,
-                            );
-
-                            anyhow::ensure!(did_activate, "Failed to retrieve terminal pane");
-
-                            anyhow::Ok(())
-                        })??;
-                    }
-                    RevealTarget::Dock => {
-                        terminal_panel.update_in(cx, |terminal_panel, window, cx| {
-                            terminal_panel.activate_terminal_view(
-                                &task_pane,
-                                terminal_item_index,
-                                true,
-                                window,
-                                cx,
-                            )
-                        })?;
-
-                        cx.spawn(async move |cx| {
-                            task_workspace
-                                .update_in(cx, |workspace, window, cx| {
-                                    workspace.focus_panel::<Self>(window, cx)
-                                })
-                                .ok()
-                        })
-                        .detach();
-                    }
-                },
-                RevealStrategy::NoFocus => match reveal_target {
-                    RevealTarget::Center => {
-                        task_workspace.update_in(cx, |workspace, window, cx| {
-                            workspace.active_pane().focus_handle(cx).focus(window);
-                        })?;
-                    }
-                    RevealTarget::Dock => {
-                        terminal_panel.update_in(cx, |terminal_panel, window, cx| {
-                            terminal_panel.activate_terminal_view(
-                                &task_pane,
-                                terminal_item_index,
-                                false,
-                                window,
-                                cx,
-                            )
-                        })?;
-
-                        cx.spawn(async move |cx| {
-                            task_workspace
-                                .update_in(cx, |workspace, window, cx| {
-                                    workspace.open_panel::<Self>(window, cx)
-                                })
-                                .ok()
-                        })
-                        .detach();
-                    }
-                },
-                RevealStrategy::Never => {}
-            }
-
-            Ok(new_terminal.downgrade())
-        })
-    }
-
-    fn has_no_terminals(&self, cx: &App) -> bool {
-        self.active_pane.read(cx).items_len() == 0 && self.pending_terminals_to_add == 0
-    }
-
-    pub fn assistant_enabled(&self) -> bool {
-        self.assistant_enabled
-    }
-
-    fn is_enabled(&self, cx: &App) -> bool {
-        self.workspace
-            .upgrade()
-            .is_some_and(|workspace| is_enabled_in_workspace(workspace.read(cx), cx))
-    }
-
-    fn activate_pane_in_direction(
-        &mut self,
-        direction: SplitDirection,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(pane) = self
-            .center
-            .find_pane_in_direction(&self.active_pane, direction, cx)
-        {
-            window.focus(&pane.focus_handle(cx));
-        } else {
-            self.workspace
-                .update(cx, |workspace, cx| {
-                    workspace.activate_pane_in_direction(direction, window, cx)
-                })
-                .ok();
-        }
-    }
-
-    fn swap_pane_in_direction(&mut self, direction: SplitDirection, cx: &mut Context<Self>) {
-        if let Some(to) = self
-            .center
-            .find_pane_in_direction(&self.active_pane, direction, cx)
-            .cloned()
-        {
-            self.center.swap(&self.active_pane, &to);
-            cx.notify();
-        }
-    }
-
-    fn move_pane_to_border(&mut self, direction: SplitDirection, cx: &mut Context<Self>) {
-        if self
-            .center
-            .move_to_border(&self.active_pane, direction)
-            .unwrap()
-        {
-            cx.notify();
-        }
-    }
-}
-
-fn is_enabled_in_workspace(workspace: &Workspace, cx: &App) -> bool {
-    workspace.project().read(cx).supports_terminal(cx)
-}
-
-pub fn new_terminal_pane(
-    workspace: WeakEntity<Workspace>,
-    project: Entity<Project>,
-    zoomed: bool,
-    window: &mut Window,
-    cx: &mut Context<TerminalPanel>,
-) -> Entity<Pane> {
-    let is_local = project.read(cx).is_local();
-    let terminal_panel = cx.entity();
-    let pane = cx.new(|cx| {
-        let mut pane = Pane::new(
-            workspace.clone(),
-            project.clone(),
-            Default::default(),
-            None,
-            NewTerminal.boxed_clone(),
-            false,
-            window,
-            cx,
-        );
-        pane.set_zoomed(zoomed, cx);
-        pane.set_can_navigate(false, cx);
-        pane.display_nav_history_buttons(None);
-        pane.set_should_display_tab_bar(|_, _| true);
-        pane.set_zoom_out_on_close(false);
-
-        let split_closure_terminal_panel = terminal_panel.downgrade();
-        pane.set_can_split(Some(Arc::new(move |pane, dragged_item, _window, cx| {
-            if let Some(tab) = dragged_item.downcast_ref::<DraggedTab>() {
-                let is_current_pane = tab.pane == cx.entity();
-                let Some(can_drag_away) = split_closure_terminal_panel
-                    .read_with(cx, |terminal_panel, _| {
-                        let current_panes = terminal_panel.center.panes();
-                        !current_panes.contains(&&tab.pane)
-                            || current_panes.len() > 1
-                            || (!is_current_pane || pane.items_len() > 1)
-                    })
-                    .ok()
-                else {
-                    return false;
-                };
-                if can_drag_away {
-                    let item = if is_current_pane {
-                        pane.item_for_index(tab.ix)
-                    } else {
-                        tab.pane.read(cx).item_for_index(tab.ix)
-                    };
-                    if let Some(item) = item {
-                        return item.downcast::<TerminalView>().is_some();
-                    }
-                }
-            }
-            false
-        })));
-
-        let buffer_search_bar = cx.new(|cx| {
-            search::BufferSearchBar::new(Some(project.read(cx).languages().clone()), window, cx)
-        });
-        let breadcrumbs = cx.new(|_| Breadcrumbs::new());
-        pane.toolbar().update(cx, |toolbar, cx| {
-            toolbar.add_item(buffer_search_bar, window, cx);
-            toolbar.add_item(breadcrumbs, window, cx);
-        });
-
-        let drop_closure_project = project.downgrade();
-        let drop_closure_terminal_panel = terminal_panel.downgrade();
-        pane.set_custom_drop_handle(cx, move |pane, dropped_item, window, cx| {
-            let Some(project) = drop_closure_project.upgrade() else {
-                return ControlFlow::Break(());
-            };
-            if let Some(tab) = dropped_item.downcast_ref::<DraggedTab>() {
-                let this_pane = cx.entity();
-                let item = if tab.pane == this_pane {
-                    pane.item_for_index(tab.ix)
-                } else {
-                    tab.pane.read(cx).item_for_index(tab.ix)
-                };
-                if let Some(item) = item {
-                    if item.downcast::<TerminalView>().is_some() {
-                        let source = tab.pane.clone();
-                        let item_id_to_move = item.item_id();
-
-                        let Ok(new_split_pane) = pane
-                            .drag_split_direction()
-                            .map(|split_direction| {
-                                drop_closure_terminal_panel.update(cx, |terminal_panel, cx| {
-                                    let is_zoomed = if terminal_panel.active_pane == this_pane {
-                                        pane.is_zoomed()
-                                    } else {
-                                        terminal_panel.active_pane.read(cx).is_zoomed()
-                                    };
-                                    let new_pane = new_terminal_pane(
-                                        workspace.clone(),
-                                        project.clone(),
-                                        is_zoomed,
-                                        window,
-                                        cx,
-                                    );
-                                    terminal_panel.apply_tab_bar_buttons(&new_pane, cx);
-                                    terminal_panel.center.split(
-                                        &this_pane,
-                                        &new_pane,
-                                        split_direction,
-                                    )?;
-                                    anyhow::Ok(new_pane)
-                                })
-                            })
-                            .transpose()
-                        else {
-                            return ControlFlow::Break(());
-                        };
-
-                        match new_split_pane.transpose() {
-                            // Source pane may be the one currently updated, so defer the move.
-                            Ok(Some(new_pane)) => cx
-                                .spawn_in(window, async move |_, cx| {
-                                    cx.update(|window, cx| {
-                                        move_item(
-                                            &source,
-                                            &new_pane,
-                                            item_id_to_move,
-                                            new_pane.read(cx).active_item_index(),
-                                            true,
-                                            window,
-                                            cx,
-                                        );
-                                    })
-                                    .ok();
-                                })
-                                .detach(),
-                            // If we drop into existing pane or current pane,
-                            // regular pane drop handler will take care of it,
-                            // using the right tab index for the operation.
-                            Ok(None) => return ControlFlow::Continue(()),
-                            err @ Err(_) => {
-                                err.log_err();
-                                return ControlFlow::Break(());
-                            }
-                        };
-                    } else if let Some(project_path) = item.project_path(cx)
-                        && let Some(entry_path) = project.read(cx).absolute_path(&project_path, cx)
-                    {
-                        add_paths_to_terminal(pane, &[entry_path], window, cx);
-                    }
-                }
-            } else if let Some(selection) = dropped_item.downcast_ref::<DraggedSelection>() {
-                let project = project.read(cx);
-                let paths_to_add = selection
-                    .items()
-                    .map(|selected_entry| selected_entry.entry_id)
-                    .filter_map(|entry_id| project.path_for_entry(entry_id, cx))
-                    .filter_map(|project_path| project.absolute_path(&project_path, cx))
-                    .collect::<Vec<_>>();
-                if !paths_to_add.is_empty() {
-                    add_paths_to_terminal(pane, &paths_to_add, window, cx);
-                }
-            } else if let Some(&entry_id) = dropped_item.downcast_ref::<ProjectEntryId>() {
-                if let Some(entry_path) = project
-                    .read(cx)
-                    .path_for_entry(entry_id, cx)
-                    .and_then(|project_path| project.read(cx).absolute_path(&project_path, cx))
-                {
-                    add_paths_to_terminal(pane, &[entry_path], window, cx);
-                }
-            } else if is_local && let Some(paths) = dropped_item.downcast_ref::<ExternalPaths>() {
-                add_paths_to_terminal(pane, paths.paths(), window, cx);
-            }
-
-            ControlFlow::Break(())
-        });
-
-        pane
-    });
-
-    cx.subscribe_in(&pane, window, TerminalPanel::handle_pane_event)
-        .detach();
-    cx.observe(&pane, |_, _, cx| cx.notify()).detach();
-
-    pane
-}
-
-async fn wait_for_terminals_tasks(
-    terminals_for_task: Vec<(usize, Entity<Pane>, Entity<TerminalView>)>,
-    cx: &mut AsyncApp,
-) {
-    let pending_tasks = terminals_for_task.iter().filter_map(|(_, _, terminal)| {
-        terminal
-            .update(cx, |terminal_view, cx| {
-                terminal_view
-                    .terminal()
-                    .update(cx, |terminal, cx| terminal.wait_for_completed_task(cx))
-            })
-            .ok()
-    });
-    join_all(pending_tasks).await;
-}
-
-fn add_paths_to_terminal(
-    pane: &mut Pane,
-    paths: &[PathBuf],
-    window: &mut Window,
-    cx: &mut Context<Pane>,
-) {
-    if let Some(terminal_view) = pane
-        .active_item()
-        .and_then(|item| item.downcast::<TerminalView>())
-    {
-        window.focus(&terminal_view.focus_handle(cx));
-        let mut new_text = paths.iter().map(|path| format!(" {path:?}")).join("");
-        new_text.push(' ');
-        terminal_view.update(cx, |terminal_view, cx| {
-            terminal_view.terminal().update(cx, |terminal, _| {
-                terminal.paste(&new_text);
-            });
-        });
-    }
-}
-
-struct FailedToSpawnTerminal {
-    error: String,
-    focus_handle: FocusHandle,
-}
-
-impl Focusable for FailedToSpawnTerminal {
-    fn focus_handle(&self, _: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl Render for FailedToSpawnTerminal {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let popover_menu = PopoverMenu::new("settings-popover")
-            .trigger(
-                IconButton::new("icon-button-popover", IconName::ChevronDown)
-                    .icon_size(IconSize::XSmall),
-            )
-            .menu(move |window, cx| {
-                Some(ContextMenu::build(window, cx, |context_menu, _, _| {
-                    context_menu
-                        .action("Open Settings", zed_actions::OpenSettings.boxed_clone())
-                        .action(
-                            "Edit settings.json",
-                            zed_actions::OpenSettingsFile.boxed_clone(),
-                        )
-                }))
-            })
-            .anchor(Corner::TopRight)
-            .offset(gpui::Point {
-                x: px(0.0),
-                y: px(2.0),
-            });
-
-        v_flex()
-            .track_focus(&self.focus_handle)
-            .size_full()
-            .p_4()
-            .items_center()
-            .justify_center()
-            .bg(cx.theme().colors().editor_background)
-            .child(
-                v_flex()
-                    .max_w_112()
-                    .items_center()
-                    .justify_center()
-                    .text_center()
-                    .child(Label::new("Failed to spawn terminal"))
-                    .child(
-                        Label::new(self.error.to_string())
-                            .size(LabelSize::Small)
-                            .color(Color::Muted)
-                            .mb_4(),
-                    )
-                    .child(SplitButton::new(
-                        ButtonLike::new("open-settings-ui")
-                            .child(Label::new("Edit Settings").size(LabelSize::Small))
-                            .on_click(|_, window, cx| {
-                                window.dispatch_action(zed_actions::OpenSettings.boxed_clone(), cx);
-                            }),
-                        popover_menu.into_any_element(),
-                    )),
-            )
-    }
-}
-
-impl EventEmitter<()> for FailedToSpawnTerminal {}
-
-impl workspace::Item for FailedToSpawnTerminal {
-    type Event = ();
-
-    fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString {
-        SharedString::new_static("Failed to spawn terminal")
-    }
-}
-
-impl EventEmitter<PanelEvent> for TerminalPanel {}
-
-impl Render for TerminalPanel {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let mut registrar = DivRegistrar::new(
-            |panel, _, cx| {
-                panel
-                    .active_pane
-                    .read(cx)
-                    .toolbar()
-                    .read(cx)
-                    .item_of_type::<BufferSearchBar>()
-            },
-            cx,
-        );
-        BufferSearchBar::register(&mut registrar);
-        let registrar = registrar.into_div();
-        self.workspace
-            .update(cx, |workspace, cx| {
-                registrar.size_full().child(self.center.render(
-                    workspace.zoomed_item(),
-                    &workspace::PaneRenderContext {
-                        follower_states: &HashMap::default(),
-                        active_call: workspace.active_call(),
-                        active_pane: &self.active_pane,
-                        app_state: workspace.app_state(),
-                        project: workspace.project(),
-                        workspace: &workspace.weak_handle(),
-                    },
-                    window,
-                    cx,
-                ))
-            })
-            .ok()
-            .map(|div| {
-                div.on_action({
-                    cx.listener(|terminal_panel, _: &ActivatePaneLeft, window, cx| {
-                        terminal_panel.activate_pane_in_direction(SplitDirection::Left, window, cx);
-                    })
-                })
-                .on_action({
-                    cx.listener(|terminal_panel, _: &ActivatePaneRight, window, cx| {
-                        terminal_panel.activate_pane_in_direction(
-                            SplitDirection::Right,
-                            window,
-                            cx,
-                        );
-                    })
-                })
-                .on_action({
-                    cx.listener(|terminal_panel, _: &ActivatePaneUp, window, cx| {
-                        terminal_panel.activate_pane_in_direction(SplitDirection::Up, window, cx);
-                    })
-                })
-                .on_action({
-                    cx.listener(|terminal_panel, _: &ActivatePaneDown, window, cx| {
-                        terminal_panel.activate_pane_in_direction(SplitDirection::Down, window, cx);
-                    })
-                })
-                .on_action(
-                    cx.listener(|terminal_panel, _action: &ActivateNextPane, window, cx| {
-                        let panes = terminal_panel.center.panes();
-                        if let Some(ix) = panes
-                            .iter()
-                            .position(|pane| **pane == terminal_panel.active_pane)
-                        {
-                            let next_ix = (ix + 1) % panes.len();
-                            window.focus(&panes[next_ix].focus_handle(cx));
-                        }
-                    }),
-                )
-                .on_action(cx.listener(
-                    |terminal_panel, _action: &ActivatePreviousPane, window, cx| {
-                        let panes = terminal_panel.center.panes();
-                        if let Some(ix) = panes
-                            .iter()
-                            .position(|pane| **pane == terminal_panel.active_pane)
-                        {
-                            let prev_ix = cmp::min(ix.wrapping_sub(1), panes.len() - 1);
-                            window.focus(&panes[prev_ix].focus_handle(cx));
-                        }
-                    },
-                ))
-                .on_action(
-                    cx.listener(|terminal_panel, action: &ActivatePane, window, cx| {
-                        let panes = terminal_panel.center.panes();
-                        if let Some(&pane) = panes.get(action.0) {
-                            window.focus(&pane.read(cx).focus_handle(cx));
-                        } else {
-                            let future =
-                                terminal_panel.new_pane_with_cloned_active_terminal(window, cx);
-                            cx.spawn_in(window, async move |terminal_panel, cx| {
-                                if let Some(new_pane) = future.await {
-                                    _ = terminal_panel.update_in(
-                                        cx,
-                                        |terminal_panel, window, cx| {
-                                            terminal_panel
-                                                .center
-                                                .split(
-                                                    &terminal_panel.active_pane,
-                                                    &new_pane,
-                                                    SplitDirection::Right,
-                                                )
-                                                .log_err();
-                                            let new_pane = new_pane.read(cx);
-                                            window.focus(&new_pane.focus_handle(cx));
-                                        },
-                                    );
-                                }
-                            })
-                            .detach();
-                        }
-                    }),
-                )
-                .on_action(cx.listener(|terminal_panel, _: &SwapPaneLeft, _, cx| {
-                    terminal_panel.swap_pane_in_direction(SplitDirection::Left, cx);
-                }))
-                .on_action(cx.listener(|terminal_panel, _: &SwapPaneRight, _, cx| {
-                    terminal_panel.swap_pane_in_direction(SplitDirection::Right, cx);
-                }))
-                .on_action(cx.listener(|terminal_panel, _: &SwapPaneUp, _, cx| {
-                    terminal_panel.swap_pane_in_direction(SplitDirection::Up, cx);
-                }))
-                .on_action(cx.listener(|terminal_panel, _: &SwapPaneDown, _, cx| {
-                    terminal_panel.swap_pane_in_direction(SplitDirection::Down, cx);
-                }))
-                .on_action(cx.listener(|terminal_panel, _: &MovePaneLeft, _, cx| {
-                    terminal_panel.move_pane_to_border(SplitDirection::Left, cx);
-                }))
-                .on_action(cx.listener(|terminal_panel, _: &MovePaneRight, _, cx| {
-                    terminal_panel.move_pane_to_border(SplitDirection::Right, cx);
-                }))
-                .on_action(cx.listener(|terminal_panel, _: &MovePaneUp, _, cx| {
-                    terminal_panel.move_pane_to_border(SplitDirection::Up, cx);
-                }))
-                .on_action(cx.listener(|terminal_panel, _: &MovePaneDown, _, cx| {
-                    terminal_panel.move_pane_to_border(SplitDirection::Down, cx);
-                }))
-                .on_action(
-                    cx.listener(|terminal_panel, action: &MoveItemToPane, window, cx| {
-                        let Some(&target_pane) =
-                            terminal_panel.center.panes().get(action.destination)
-                        else {
-                            return;
-                        };
-                        move_active_item(
-                            &terminal_panel.active_pane,
-                            target_pane,
-                            action.focus,
-                            true,
-                            window,
-                            cx,
-                        );
-                    }),
-                )
-                .on_action(cx.listener(
-                    |terminal_panel, action: &MoveItemToPaneInDirection, window, cx| {
-                        let source_pane = &terminal_panel.active_pane;
-                        if let Some(destination_pane) = terminal_panel
-                            .center
-                            .find_pane_in_direction(source_pane, action.direction, cx)
-                        {
-                            move_active_item(
-                                source_pane,
-                                destination_pane,
-                                action.focus,
-                                true,
-                                window,
-                                cx,
-                            );
-                        };
-                    },
-                ))
-            })
-            .unwrap_or_else(|| div())
-    }
-}
-
-impl Focusable for TerminalPanel {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        self.active_pane.focus_handle(cx)
-    }
-}
-
-impl Panel for TerminalPanel {
-    fn position(&self, _window: &Window, cx: &App) -> DockPosition {
-        match TerminalSettings::get_global(cx).dock {
-            TerminalDockPosition::Left => DockPosition::Left,
-            TerminalDockPosition::Bottom => DockPosition::Bottom,
-            TerminalDockPosition::Right => DockPosition::Right,
-        }
-    }
-
-    fn position_is_valid(&self, _: DockPosition) -> bool {
-        true
-    }
-
-    fn set_position(
-        &mut self,
-        position: DockPosition,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        settings::update_settings_file(self.fs.clone(), cx, move |settings, _| {
-            let dock = match position {
-                DockPosition::Left => TerminalDockPosition::Left,
-                DockPosition::Bottom => TerminalDockPosition::Bottom,
-                DockPosition::Right => TerminalDockPosition::Right,
-            };
-            settings.terminal.get_or_insert_default().dock = Some(dock);
-        });
-    }
-
-    fn size(&self, window: &Window, cx: &App) -> Pixels {
-        let settings = TerminalSettings::get_global(cx);
-        match self.position(window, cx) {
-            DockPosition::Left | DockPosition::Right => {
-                self.width.unwrap_or(settings.default_width)
-            }
-            DockPosition::Bottom => self.height.unwrap_or(settings.default_height),
-        }
-    }
-
-    fn set_size(&mut self, size: Option<Pixels>, window: &mut Window, cx: &mut Context<Self>) {
-        match self.position(window, cx) {
-            DockPosition::Left | DockPosition::Right => self.width = size,
-            DockPosition::Bottom => self.height = size,
-        }
-        cx.notify();
-        cx.defer_in(window, |this, _, cx| {
-            this.serialize(cx);
-        })
-    }
-
-    fn is_zoomed(&self, _window: &Window, cx: &App) -> bool {
-        self.active_pane.read(cx).is_zoomed()
-    }
-
-    fn set_zoomed(&mut self, zoomed: bool, _: &mut Window, cx: &mut Context<Self>) {
-        for pane in self.center.panes() {
-            pane.update(cx, |pane, cx| {
-                pane.set_zoomed(zoomed, cx);
-            })
-        }
-        cx.notify();
-    }
-
-    fn set_active(&mut self, active: bool, window: &mut Window, cx: &mut Context<Self>) {
-        let old_active = self.active;
-        self.active = active;
-        if !active || old_active == active || !self.has_no_terminals(cx) {
-            return;
-        }
-        cx.defer_in(window, |this, window, cx| {
-            let Ok(kind) = this
-                .workspace
-                .update(cx, |workspace, cx| default_working_directory(workspace, cx))
-            else {
-                return;
-            };
-
-            this.add_terminal_shell(kind, RevealStrategy::Always, window, cx)
-                .detach_and_log_err(cx)
-        })
-    }
-
-    fn icon_label(&self, _window: &Window, cx: &App) -> Option<String> {
-        let count = self
-            .center
-            .panes()
-            .into_iter()
-            .map(|pane| pane.read(cx).items_len())
-            .sum::<usize>();
-        if count == 0 {
-            None
-        } else {
-            Some(count.to_string())
-        }
-    }
-
-    fn persistent_name() -> &'static str {
-        "TerminalPanel"
-    }
-
-    fn panel_key() -> &'static str {
-        TERMINAL_PANEL_KEY
-    }
-
-    fn icon(&self, _window: &Window, cx: &App) -> Option<IconName> {
-        if (self.is_enabled(cx) || !self.has_no_terminals(cx))
-            && TerminalSettings::get_global(cx).button
-        {
-            Some(IconName::TerminalAlt)
-        } else {
-            None
-        }
-    }
-
-    fn icon_tooltip(&self, _window: &Window, _cx: &App) -> Option<&'static str> {
-        Some("Terminal Panel")
-    }
-
-    fn toggle_action(&self) -> Box<dyn gpui::Action> {
-        Box::new(ToggleFocus)
-    }
-
-    fn pane(&self) -> Option<Entity<Pane>> {
-        Some(self.active_pane.clone())
-    }
-
-    fn activation_priority(&self) -> u32 {
-        1
-    }
-}
-
-struct TerminalProvider(Entity<TerminalPanel>);
-
-impl workspace::TerminalProvider for TerminalProvider {
-    fn spawn(
-        &self,
-        task: SpawnInTerminal,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Option<Result<ExitStatus>>> {
-        let terminal_panel = self.0.clone();
-        window.spawn(cx, async move |cx| {
-            let terminal = terminal_panel
-                .update_in(cx, |terminal_panel, window, cx| {
-                    terminal_panel.spawn_task(&task, window, cx)
-                })
-                .ok()?
-                .await;
-            match terminal {
-                Ok(terminal) => {
-                    let exit_status = terminal
-                        .read_with(cx, |terminal, cx| terminal.wait_for_completed_task(cx))
-                        .ok()?
-                        .await?;
-                    Some(Ok(exit_status))
-                }
-                Err(e) => Some(Err(e)),
-            }
-        })
-    }
-}
-
-struct InlineAssistTabBarButton {
-    focus_handle: FocusHandle,
-}
-
-impl Render for InlineAssistTabBarButton {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let focus_handle = self.focus_handle.clone();
-        IconButton::new("terminal_inline_assistant", IconName::ZedAssistant)
-            .icon_size(IconSize::Small)
-            .on_click(cx.listener(|_, _, window, cx| {
-                window.dispatch_action(InlineAssist::default().boxed_clone(), cx);
-            }))
-            .tooltip(move |_window, cx| {
-                Tooltip::for_action_in("Inline Assist", &InlineAssist::default(), &focus_handle, cx)
-            })
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::num::NonZero;
-
-    use super::*;
-    use gpui::{TestAppContext, UpdateGlobal as _};
-    use pretty_assertions::assert_eq;
-    use project::FakeFs;
-    use settings::SettingsStore;
-
-    #[gpui::test]
-    async fn test_spawn_an_empty_task(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, [], cx).await;
-        let workspace = cx.add_window(|window, cx| Workspace::test_new(project, window, cx));
-
-        let (window_handle, terminal_panel) = workspace
-            .update(cx, |workspace, window, cx| {
-                let window_handle = window.window_handle();
-                let terminal_panel = cx.new(|cx| TerminalPanel::new(workspace, window, cx));
-                (window_handle, terminal_panel)
-            })
-            .unwrap();
-
-        let task = window_handle
-            .update(cx, |_, window, cx| {
-                terminal_panel.update(cx, |terminal_panel, cx| {
-                    terminal_panel.spawn_task(&SpawnInTerminal::default(), window, cx)
-                })
-            })
-            .unwrap();
-
-        let terminal = task.await.unwrap();
-        let expected_shell = util::get_system_shell();
-        terminal
-            .update(cx, |terminal, _| {
-                let task_metadata = terminal
-                    .task()
-                    .expect("When spawning a task, should have the task metadata")
-                    .spawned_task
-                    .clone();
-                assert_eq!(task_metadata.env, HashMap::default());
-                assert_eq!(task_metadata.cwd, None);
-                assert_eq!(task_metadata.shell, task::Shell::System);
-                assert_eq!(
-                    task_metadata.command,
-                    Some(expected_shell.clone()),
-                    "Empty tasks should spawn a -i shell"
-                );
-                assert_eq!(task_metadata.args, Vec::<String>::new());
-                assert_eq!(
-                    task_metadata.command_label, expected_shell,
-                    "We show the shell launch for empty commands"
-                );
-            })
-            .unwrap();
-    }
-
-    #[gpui::test]
-    async fn test_bypass_max_tabs_limit(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, [], cx).await;
-        let workspace = cx.add_window(|window, cx| Workspace::test_new(project, window, cx));
-
-        let (window_handle, terminal_panel) = workspace
-            .update(cx, |workspace, window, cx| {
-                let window_handle = window.window_handle();
-                let terminal_panel = cx.new(|cx| TerminalPanel::new(workspace, window, cx));
-                (window_handle, terminal_panel)
-            })
-            .unwrap();
-
-        set_max_tabs(cx, Some(3));
-
-        for _ in 0..5 {
-            let task = window_handle
-                .update(cx, |_, window, cx| {
-                    terminal_panel.update(cx, |panel, cx| {
-                        panel.add_terminal_shell(None, RevealStrategy::Always, window, cx)
-                    })
-                })
-                .unwrap();
-            task.await.unwrap();
-        }
-
-        cx.run_until_parked();
-
-        let item_count =
-            terminal_panel.read_with(cx, |panel, cx| panel.active_pane.read(cx).items_len());
-
-        assert_eq!(
-            item_count, 5,
-            "Terminal panel should bypass max_tabs limit and have all 5 terminals"
-        );
-    }
-
-    // A complex Unix command won't be properly parsed by the Windows terminal hence omit the test there.
-    #[cfg(unix)]
-    #[gpui::test]
-    async fn test_spawn_script_like_task(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, [], cx).await;
-        let workspace = cx.add_window(|window, cx| Workspace::test_new(project, window, cx));
-
-        let (window_handle, terminal_panel) = workspace
-            .update(cx, |workspace, window, cx| {
-                let window_handle = window.window_handle();
-                let terminal_panel = cx.new(|cx| TerminalPanel::new(workspace, window, cx));
-                (window_handle, terminal_panel)
-            })
-            .unwrap();
-
-        let user_command = r#"REPO_URL=$(git remote get-url origin | sed -e \"s/^git@\\(.*\\):\\(.*\\)\\.git$/https:\\/\\/\\1\\/\\2/\"); COMMIT_SHA=$(git log -1 --format=\"%H\" -- \"${ZED_RELATIVE_FILE}\"); echo \"${REPO_URL}/blob/${COMMIT_SHA}/${ZED_RELATIVE_FILE}#L${ZED_ROW}-$(echo $(($(wc -l <<< \"$ZED_SELECTED_TEXT\") + $ZED_ROW - 1)))\" | xclip -selection clipboard"#.to_string();
-
-        let expected_cwd = PathBuf::from("/some/work");
-        let task = window_handle
-            .update(cx, |_, window, cx| {
-                terminal_panel.update(cx, |terminal_panel, cx| {
-                    terminal_panel.spawn_task(
-                        &SpawnInTerminal {
-                            command: Some(user_command.clone()),
-                            cwd: Some(expected_cwd.clone()),
-                            ..SpawnInTerminal::default()
-                        },
-                        window,
-                        cx,
-                    )
-                })
-            })
-            .unwrap();
-
-        let terminal = task.await.unwrap();
-        let shell = util::get_system_shell();
-        terminal
-            .update(cx, |terminal, _| {
-                let task_metadata = terminal
-                    .task()
-                    .expect("When spawning a task, should have the task metadata")
-                    .spawned_task
-                    .clone();
-                assert_eq!(task_metadata.env, HashMap::default());
-                assert_eq!(task_metadata.cwd, Some(expected_cwd));
-                assert_eq!(task_metadata.shell, task::Shell::System);
-                assert_eq!(task_metadata.command, Some(shell.clone()));
-                assert_eq!(
-                    task_metadata.args,
-                    vec!["-i".to_string(), "-c".to_string(), user_command.clone(),],
-                    "Use command should have been moved into the arguments, as we're spawning a new -i shell",
-                );
-                assert_eq!(
-                    task_metadata.command_label,
-                    format!("{shell} {interactive}-c '{user_command}'", interactive = if cfg!(windows) {""} else {"-i "}),
-                    "We want to show to the user the entire command spawned");
-            })
-            .unwrap();
-    }
-
-    #[gpui::test]
-    async fn renders_error_if_default_shell_fails(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        cx.update(|cx| {
-            SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |settings| {
-                    settings.terminal.get_or_insert_default().project.shell =
-                        Some(settings::Shell::Program("asdf".to_owned()));
-                });
-            });
-        });
-
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, [], cx).await;
-        let workspace = cx.add_window(|window, cx| Workspace::test_new(project, window, cx));
-
-        let (window_handle, terminal_panel) = workspace
-            .update(cx, |workspace, window, cx| {
-                let window_handle = window.window_handle();
-                let terminal_panel = cx.new(|cx| TerminalPanel::new(workspace, window, cx));
-                (window_handle, terminal_panel)
-            })
-            .unwrap();
-
-        window_handle
-            .update(cx, |_, window, cx| {
-                terminal_panel.update(cx, |terminal_panel, cx| {
-                    terminal_panel.add_terminal_shell(None, RevealStrategy::Always, window, cx)
-                })
-            })
-            .unwrap()
-            .await
-            .unwrap_err();
-
-        window_handle
-            .update(cx, |_, _, cx| {
-                terminal_panel.update(cx, |terminal_panel, cx| {
-                    assert!(
-                        terminal_panel
-                            .active_pane
-                            .read(cx)
-                            .items()
-                            .any(|item| item.downcast::<FailedToSpawnTerminal>().is_some()),
-                        "should spawn `FailedToSpawnTerminal` pane"
-                    );
-                })
-            })
-            .unwrap();
-    }
-
-    fn set_max_tabs(cx: &mut TestAppContext, value: Option<usize>) {
-        cx.update_global(|store: &mut SettingsStore, cx| {
-            store.update_user_settings(cx, |settings| {
-                settings.workspace.max_tabs = value.map(|v| NonZero::new(v).unwrap())
-            });
-        });
-    }
-
-    pub fn init_test(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let store = SettingsStore::test(cx);
-            cx.set_global(store);
-            theme::init(theme::LoadThemes::JustBase, cx);
-            editor::init(cx);
-            crate::init(cx);
-        });
-    }
-}
diff --git a/crates/terminal_view/src/terminal_path_like_target.rs b/crates/terminal_view/src/terminal_path_like_target.rs
deleted file mode 100644
index fa40196645..0000000000
--- a/crates/terminal_view/src/terminal_path_like_target.rs
+++ /dev/null
@@ -1,1338 +0,0 @@
-use super::{HoverTarget, HoveredWord, TerminalView};
-use anyhow::{Context as _, Result};
-use editor::Editor;
-use gpui::{App, AppContext, Context, Task, WeakEntity, Window};
-use itertools::Itertools;
-use project::{Entry, Metadata};
-use std::path::PathBuf;
-use terminal::PathLikeTarget;
-use util::{
-    ResultExt, debug_panic,
-    paths::{PathStyle, PathWithPosition},
-    rel_path::RelPath,
-};
-use workspace::{OpenOptions, OpenVisible, Workspace};
-
-/// The way we found the open target. This is important to have for test assertions.
-/// For example, remote projects never look in the file system.
-#[cfg(test)]
-#[derive(Debug, Clone, Copy, Eq, PartialEq)]
-enum OpenTargetFoundBy {
-    WorktreeExact,
-    WorktreeScan,
-    FileSystemBackground,
-}
-
-#[cfg(test)]
-#[derive(Debug, Clone, Copy, Eq, PartialEq)]
-enum BackgroundFsChecks {
-    Enabled,
-    Disabled,
-}
-
-#[derive(Debug, Clone)]
-enum OpenTarget {
-    Worktree(PathWithPosition, Entry, #[cfg(test)] OpenTargetFoundBy),
-    File(PathWithPosition, Metadata),
-}
-
-impl OpenTarget {
-    fn is_file(&self) -> bool {
-        match self {
-            OpenTarget::Worktree(_, entry, ..) => entry.is_file(),
-            OpenTarget::File(_, metadata) => !metadata.is_dir,
-        }
-    }
-
-    fn is_dir(&self) -> bool {
-        match self {
-            OpenTarget::Worktree(_, entry, ..) => entry.is_dir(),
-            OpenTarget::File(_, metadata) => metadata.is_dir,
-        }
-    }
-
-    fn path(&self) -> &PathWithPosition {
-        match self {
-            OpenTarget::Worktree(path, ..) => path,
-            OpenTarget::File(path, _) => path,
-        }
-    }
-
-    #[cfg(test)]
-    fn found_by(&self) -> OpenTargetFoundBy {
-        match self {
-            OpenTarget::Worktree(.., found_by) => *found_by,
-            OpenTarget::File(..) => OpenTargetFoundBy::FileSystemBackground,
-        }
-    }
-}
-
-pub(super) fn hover_path_like_target(
-    workspace: &WeakEntity<Workspace>,
-    hovered_word: HoveredWord,
-    path_like_target: &PathLikeTarget,
-    cx: &mut Context<TerminalView>,
-) -> Task<()> {
-    #[cfg(not(test))]
-    {
-        possible_hover_target(workspace, hovered_word, path_like_target, cx)
-    }
-    #[cfg(test)]
-    {
-        possible_hover_target(
-            workspace,
-            hovered_word,
-            path_like_target,
-            cx,
-            BackgroundFsChecks::Enabled,
-        )
-    }
-}
-
-fn possible_hover_target(
-    workspace: &WeakEntity<Workspace>,
-    hovered_word: HoveredWord,
-    path_like_target: &PathLikeTarget,
-    cx: &mut Context<TerminalView>,
-    #[cfg(test)] background_fs_checks: BackgroundFsChecks,
-) -> Task<()> {
-    let file_to_open_task = possible_open_target(
-        workspace,
-        path_like_target,
-        cx,
-        #[cfg(test)]
-        background_fs_checks,
-    );
-    cx.spawn(async move |terminal_view, cx| {
-        let file_to_open = file_to_open_task.await;
-        terminal_view
-            .update(cx, |terminal_view, _| match file_to_open {
-                Some(OpenTarget::File(path, _) | OpenTarget::Worktree(path, ..)) => {
-                    terminal_view.hover = Some(HoverTarget {
-                        tooltip: path.to_string(|path| path.to_string_lossy().into_owned()),
-                        hovered_word,
-                    });
-                }
-                None => {
-                    terminal_view.hover = None;
-                }
-            })
-            .ok();
-    })
-}
-
-fn possible_open_target(
-    workspace: &WeakEntity<Workspace>,
-    path_like_target: &PathLikeTarget,
-    cx: &App,
-    #[cfg(test)] background_fs_checks: BackgroundFsChecks,
-) -> Task<Option<OpenTarget>> {
-    let Some(workspace) = workspace.upgrade() else {
-        return Task::ready(None);
-    };
-    // We have to check for both paths, as on Unix, certain paths with positions are valid file paths too.
-    // We can be on FS remote part, without real FS, so cannot canonicalize or check for existence the path right away.
-    let mut potential_paths = Vec::new();
-    let cwd = path_like_target.terminal_dir.as_ref();
-    let maybe_path = &path_like_target.maybe_path;
-    let original_path = PathWithPosition::from_path(PathBuf::from(maybe_path));
-    let path_with_position = PathWithPosition::parse_str(maybe_path);
-    let worktree_candidates = workspace
-        .read(cx)
-        .worktrees(cx)
-        .sorted_by_key(|worktree| {
-            let worktree_root = worktree.read(cx).abs_path();
-            match cwd.and_then(|cwd| worktree_root.strip_prefix(cwd).ok()) {
-                Some(cwd_child) => cwd_child.components().count(),
-                None => usize::MAX,
-            }
-        })
-        .collect::<Vec<_>>();
-    // Since we do not check paths via FS and joining, we need to strip off potential `./`, `a/`, `b/` prefixes out of it.
-    const GIT_DIFF_PATH_PREFIXES: &[&str] = &["a", "b"];
-    for prefix_str in GIT_DIFF_PATH_PREFIXES.iter().chain(std::iter::once(&".")) {
-        if let Some(stripped) = original_path.path.strip_prefix(prefix_str).ok() {
-            potential_paths.push(PathWithPosition {
-                path: stripped.to_owned(),
-                row: original_path.row,
-                column: original_path.column,
-            });
-        }
-        if let Some(stripped) = path_with_position.path.strip_prefix(prefix_str).ok() {
-            potential_paths.push(PathWithPosition {
-                path: stripped.to_owned(),
-                row: path_with_position.row,
-                column: path_with_position.column,
-            });
-        }
-    }
-
-    let insert_both_paths = original_path != path_with_position;
-    potential_paths.insert(0, original_path);
-    if insert_both_paths {
-        potential_paths.insert(1, path_with_position);
-    }
-
-    // If we won't find paths "easily", we can traverse the entire worktree to look what ends with the potential path suffix.
-    // That will be slow, though, so do the fast checks first.
-    let mut worktree_paths_to_check = Vec::new();
-    let mut is_cwd_in_worktree = false;
-    let mut open_target = None;
-    'worktree_loop: for worktree in &worktree_candidates {
-        let worktree_root = worktree.read(cx).abs_path();
-        let mut paths_to_check = Vec::with_capacity(potential_paths.len());
-        let relative_cwd = cwd
-            .and_then(|cwd| cwd.strip_prefix(&worktree_root).ok())
-            .and_then(|cwd| RelPath::new(cwd, PathStyle::local()).ok())
-            .and_then(|cwd_stripped| {
-                (cwd_stripped.as_ref() != RelPath::empty()).then(|| {
-                    is_cwd_in_worktree = true;
-                    cwd_stripped
-                })
-            });
-
-        for path_with_position in &potential_paths {
-            let path_to_check = if worktree_root.ends_with(&path_with_position.path) {
-                let root_path_with_position = PathWithPosition {
-                    path: worktree_root.to_path_buf(),
-                    row: path_with_position.row,
-                    column: path_with_position.column,
-                };
-                match worktree.read(cx).root_entry() {
-                    Some(root_entry) => {
-                        open_target = Some(OpenTarget::Worktree(
-                            root_path_with_position,
-                            root_entry.clone(),
-                            #[cfg(test)]
-                            OpenTargetFoundBy::WorktreeExact,
-                        ));
-                        break 'worktree_loop;
-                    }
-                    None => root_path_with_position,
-                }
-            } else {
-                PathWithPosition {
-                    path: path_with_position
-                        .path
-                        .strip_prefix(&worktree_root)
-                        .unwrap_or(&path_with_position.path)
-                        .to_owned(),
-                    row: path_with_position.row,
-                    column: path_with_position.column,
-                }
-            };
-
-            if let Ok(relative_path_to_check) =
-                RelPath::new(&path_to_check.path, PathStyle::local())
-                && !worktree.read(cx).is_single_file()
-                && let Some(entry) = relative_cwd
-                    .clone()
-                    .and_then(|relative_cwd| {
-                        worktree
-                            .read(cx)
-                            .entry_for_path(&relative_cwd.join(&relative_path_to_check))
-                    })
-                    .or_else(|| worktree.read(cx).entry_for_path(&relative_path_to_check))
-            {
-                open_target = Some(OpenTarget::Worktree(
-                    PathWithPosition {
-                        path: worktree.read(cx).absolutize(&entry.path),
-                        row: path_to_check.row,
-                        column: path_to_check.column,
-                    },
-                    entry.clone(),
-                    #[cfg(test)]
-                    OpenTargetFoundBy::WorktreeExact,
-                ));
-                break 'worktree_loop;
-            }
-
-            paths_to_check.push(path_to_check);
-        }
-
-        if !paths_to_check.is_empty() {
-            worktree_paths_to_check.push((worktree.clone(), paths_to_check));
-        }
-    }
-
-    #[cfg(not(test))]
-    let enable_background_fs_checks = workspace.read(cx).project().read(cx).is_local();
-    #[cfg(test)]
-    let enable_background_fs_checks = background_fs_checks == BackgroundFsChecks::Enabled;
-
-    if open_target.is_some() {
-        // We we want to prefer open targets found via background fs checks over worktree matches,
-        // however we can return early if either:
-        //   - This is a remote project, or
-        //   - If the terminal working directory is inside of at least one worktree
-        if !enable_background_fs_checks || is_cwd_in_worktree {
-            return Task::ready(open_target);
-        }
-    }
-
-    // Before entire worktree traversal(s), make an attempt to do FS checks if available.
-    let fs_paths_to_check =
-        if enable_background_fs_checks {
-            let fs_cwd_paths_to_check = cwd
-                .iter()
-                .flat_map(|cwd| {
-                    let mut paths_to_check = Vec::new();
-                    for path_to_check in &potential_paths {
-                        let maybe_path = &path_to_check.path;
-                        if path_to_check.path.is_relative() {
-                            paths_to_check.push(PathWithPosition {
-                                path: cwd.join(&maybe_path),
-                                row: path_to_check.row,
-                                column: path_to_check.column,
-                            });
-                        }
-                    }
-                    paths_to_check
-                })
-                .collect::<Vec<_>>();
-            fs_cwd_paths_to_check
-                .into_iter()
-                .chain(
-                    potential_paths
-                        .into_iter()
-                        .flat_map(|path_to_check| {
-                            let mut paths_to_check = Vec::new();
-                            let maybe_path = &path_to_check.path;
-                            if maybe_path.starts_with("~") {
-                                if let Some(home_path) = maybe_path.strip_prefix("~").ok().and_then(
-                                    |stripped_maybe_path| {
-                                        Some(dirs::home_dir()?.join(stripped_maybe_path))
-                                    },
-                                ) {
-                                    paths_to_check.push(PathWithPosition {
-                                        path: home_path,
-                                        row: path_to_check.row,
-                                        column: path_to_check.column,
-                                    });
-                                }
-                            } else {
-                                paths_to_check.push(PathWithPosition {
-                                    path: maybe_path.clone(),
-                                    row: path_to_check.row,
-                                    column: path_to_check.column,
-                                });
-                                if maybe_path.is_relative() {
-                                    for worktree in &worktree_candidates {
-                                        if !worktree.read(cx).is_single_file() {
-                                            paths_to_check.push(PathWithPosition {
-                                                path: worktree.read(cx).abs_path().join(maybe_path),
-                                                row: path_to_check.row,
-                                                column: path_to_check.column,
-                                            });
-                                        }
-                                    }
-                                }
-                            }
-                            paths_to_check
-                        })
-                        .collect::<Vec<_>>(),
-                )
-                .collect()
-        } else {
-            Vec::new()
-        };
-
-    let fs = workspace.read(cx).project().read(cx).fs().clone();
-    let background_fs_checks_task = cx.background_spawn(async move {
-        for mut path_to_check in fs_paths_to_check {
-            if let Some(fs_path_to_check) = fs.canonicalize(&path_to_check.path).await.ok()
-                && let Some(metadata) = fs.metadata(&fs_path_to_check).await.ok().flatten()
-            {
-                if open_target
-                    .as_ref()
-                    .map(|open_target| open_target.path().path != fs_path_to_check)
-                    .unwrap_or(true)
-                {
-                    path_to_check.path = fs_path_to_check;
-                    return Some(OpenTarget::File(path_to_check, metadata));
-                }
-
-                break;
-            }
-        }
-
-        open_target
-    });
-
-    cx.spawn(async move |cx| {
-        background_fs_checks_task.await.or_else(|| {
-            for (worktree, worktree_paths_to_check) in worktree_paths_to_check {
-                let found_entry = worktree
-                    .update(cx, |worktree, _| -> Option<OpenTarget> {
-                        let traversal =
-                            worktree.traverse_from_path(true, true, false, RelPath::empty());
-                        for entry in traversal {
-                            if let Some(path_in_worktree) =
-                                worktree_paths_to_check.iter().find(|path_to_check| {
-                                    RelPath::new(&path_to_check.path, PathStyle::local())
-                                        .is_ok_and(|path| entry.path.ends_with(&path))
-                                })
-                            {
-                                return Some(OpenTarget::Worktree(
-                                    PathWithPosition {
-                                        path: worktree.absolutize(&entry.path),
-                                        row: path_in_worktree.row,
-                                        column: path_in_worktree.column,
-                                    },
-                                    entry.clone(),
-                                    #[cfg(test)]
-                                    OpenTargetFoundBy::WorktreeScan,
-                                ));
-                            }
-                        }
-                        None
-                    })
-                    .ok()?;
-                if let Some(found_entry) = found_entry {
-                    return Some(found_entry);
-                }
-            }
-            None
-        })
-    })
-}
-
-pub(super) fn open_path_like_target(
-    workspace: &WeakEntity<Workspace>,
-    terminal_view: &mut TerminalView,
-    path_like_target: &PathLikeTarget,
-    window: &mut Window,
-    cx: &mut Context<TerminalView>,
-) {
-    #[cfg(not(test))]
-    {
-        possibly_open_target(workspace, terminal_view, path_like_target, window, cx)
-            .detach_and_log_err(cx)
-    }
-    #[cfg(test)]
-    {
-        possibly_open_target(
-            workspace,
-            terminal_view,
-            path_like_target,
-            window,
-            cx,
-            BackgroundFsChecks::Enabled,
-        )
-        .detach_and_log_err(cx)
-    }
-}
-
-fn possibly_open_target(
-    workspace: &WeakEntity<Workspace>,
-    terminal_view: &mut TerminalView,
-    path_like_target: &PathLikeTarget,
-    window: &mut Window,
-    cx: &mut Context<TerminalView>,
-    #[cfg(test)] background_fs_checks: BackgroundFsChecks,
-) -> Task<Result<Option<OpenTarget>>> {
-    if terminal_view.hover.is_none() {
-        return Task::ready(Ok(None));
-    }
-    let workspace = workspace.clone();
-    let path_like_target = path_like_target.clone();
-    cx.spawn_in(window, async move |terminal_view, cx| {
-        let Some(open_target) = terminal_view
-            .update(cx, |_, cx| {
-                possible_open_target(
-                    &workspace,
-                    &path_like_target,
-                    cx,
-                    #[cfg(test)]
-                    background_fs_checks,
-                )
-            })?
-            .await
-        else {
-            return Ok(None);
-        };
-
-        let path_to_open = open_target.path();
-        let opened_items = workspace
-            .update_in(cx, |workspace, window, cx| {
-                workspace.open_paths(
-                    vec![path_to_open.path.clone()],
-                    OpenOptions {
-                        visible: Some(OpenVisible::OnlyDirectories),
-                        ..Default::default()
-                    },
-                    None,
-                    window,
-                    cx,
-                )
-            })
-            .context("workspace update")?
-            .await;
-        if opened_items.len() != 1 {
-            debug_panic!(
-                "Received {} items for one path {path_to_open:?}",
-                opened_items.len(),
-            );
-        }
-
-        if let Some(opened_item) = opened_items.first() {
-            if open_target.is_file() {
-                if let Some(Ok(opened_item)) = opened_item {
-                    if let Some(row) = path_to_open.row {
-                        let col = path_to_open.column.unwrap_or(0);
-                        if let Some(active_editor) = opened_item.downcast::<Editor>() {
-                            active_editor
-                                .downgrade()
-                                .update_in(cx, |editor, window, cx| {
-                                    editor.go_to_singleton_buffer_point(
-                                        language::Point::new(
-                                            row.saturating_sub(1),
-                                            col.saturating_sub(1),
-                                        ),
-                                        window,
-                                        cx,
-                                    )
-                                })
-                                .log_err();
-                        }
-                    }
-                    return Ok(Some(open_target));
-                }
-            } else if open_target.is_dir() {
-                workspace.update(cx, |workspace, cx| {
-                    workspace.project().update(cx, |_, cx| {
-                        cx.emit(project::Event::ActivateProjectPanel);
-                    })
-                })?;
-                return Ok(Some(open_target));
-            }
-        }
-        Ok(None)
-    })
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use gpui::TestAppContext;
-    use project::Project;
-    use serde_json::json;
-    use std::path::{Path, PathBuf};
-    use terminal::{HoveredWord, alacritty_terminal::index::Point as AlacPoint};
-    use util::path;
-    use workspace::AppState;
-
-    async fn init_test(
-        app_cx: &mut TestAppContext,
-        trees: impl IntoIterator<Item = (&str, serde_json::Value)>,
-        worktree_roots: impl IntoIterator<Item = &str>,
-    ) -> impl AsyncFnMut(
-        HoveredWord,
-        PathLikeTarget,
-        BackgroundFsChecks,
-    ) -> (Option<HoverTarget>, Option<OpenTarget>) {
-        let fs = app_cx.update(AppState::test).fs.as_fake().clone();
-
-        app_cx.update(|cx| {
-            theme::init(theme::LoadThemes::JustBase, cx);
-            editor::init(cx);
-        });
-
-        for (path, tree) in trees {
-            fs.insert_tree(path, tree).await;
-        }
-
-        let project: gpui::Entity<Project> = Project::test(
-            fs.clone(),
-            worktree_roots.into_iter().map(Path::new),
-            app_cx,
-        )
-        .await;
-
-        let (workspace, cx) =
-            app_cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-        let cwd = std::env::current_dir().expect("Failed to get working directory");
-        let terminal = project
-            .update(cx, |project: &mut Project, cx| {
-                project.create_terminal_shell(Some(cwd), cx)
-            })
-            .await
-            .expect("Failed to create a terminal");
-
-        let workspace_a = workspace.clone();
-        let (terminal_view, cx) = app_cx.add_window_view(|window, cx| {
-            TerminalView::new(
-                terminal,
-                workspace_a.downgrade(),
-                None,
-                project.downgrade(),
-                window,
-                cx,
-            )
-        });
-
-        async move |hovered_word: HoveredWord,
-                    path_like_target: PathLikeTarget,
-                    background_fs_checks: BackgroundFsChecks|
-                    -> (Option<HoverTarget>, Option<OpenTarget>) {
-            let workspace_a = workspace.clone();
-            terminal_view
-                .update(cx, |_, cx| {
-                    possible_hover_target(
-                        &workspace_a.downgrade(),
-                        hovered_word,
-                        &path_like_target,
-                        cx,
-                        background_fs_checks,
-                    )
-                })
-                .await;
-
-            let hover_target =
-                terminal_view.read_with(cx, |terminal_view, _| terminal_view.hover.clone());
-
-            let open_target = terminal_view
-                .update_in(cx, |terminal_view, window, cx| {
-                    possibly_open_target(
-                        &workspace.downgrade(),
-                        terminal_view,
-                        &path_like_target,
-                        window,
-                        cx,
-                        background_fs_checks,
-                    )
-                })
-                .await
-                .expect("Failed to possibly open target");
-
-            (hover_target, open_target)
-        }
-    }
-
-    async fn test_path_like_simple(
-        test_path_like: &mut impl AsyncFnMut(
-            HoveredWord,
-            PathLikeTarget,
-            BackgroundFsChecks,
-        ) -> (Option<HoverTarget>, Option<OpenTarget>),
-        maybe_path: &str,
-        tooltip: &str,
-        terminal_dir: Option<PathBuf>,
-        background_fs_checks: BackgroundFsChecks,
-        mut open_target_found_by: OpenTargetFoundBy,
-        file: &str,
-        line: u32,
-    ) {
-        let (hover_target, open_target) = test_path_like(
-            HoveredWord {
-                word: maybe_path.to_string(),
-                word_match: AlacPoint::default()..=AlacPoint::default(),
-                id: 0,
-            },
-            PathLikeTarget {
-                maybe_path: maybe_path.to_string(),
-                terminal_dir,
-            },
-            background_fs_checks,
-        )
-        .await;
-
-        let Some(hover_target) = hover_target else {
-            assert!(
-                hover_target.is_some(),
-                "Hover target should not be `None` at {file}:{line}:"
-            );
-            return;
-        };
-
-        assert_eq!(
-            hover_target.tooltip, tooltip,
-            "Tooltip mismatch at {file}:{line}:"
-        );
-        assert_eq!(
-            hover_target.hovered_word.word, maybe_path,
-            "Hovered word mismatch at {file}:{line}:"
-        );
-
-        let Some(open_target) = open_target else {
-            assert!(
-                open_target.is_some(),
-                "Open target should not be `None` at {file}:{line}:"
-            );
-            return;
-        };
-
-        assert_eq!(
-            open_target.path().path,
-            Path::new(tooltip),
-            "Open target path mismatch at {file}:{line}:"
-        );
-
-        if background_fs_checks == BackgroundFsChecks::Disabled
-            && open_target_found_by == OpenTargetFoundBy::FileSystemBackground
-        {
-            open_target_found_by = OpenTargetFoundBy::WorktreeScan;
-        }
-
-        assert_eq!(
-            open_target.found_by(),
-            open_target_found_by,
-            "Open target found by mismatch at {file}:{line}:"
-        );
-    }
-
-    macro_rules! none_or_some_pathbuf {
-        (None) => {
-            None
-        };
-        ($cwd:literal) => {
-            Some($crate::PathBuf::from(path!($cwd)))
-        };
-    }
-
-    macro_rules! test_path_like {
-        (
-            $test_path_like:expr,
-            $maybe_path:literal,
-            $tooltip:literal,
-            $cwd:tt,
-            $found_by:expr
-        ) => {{
-            test_path_like!(
-                $test_path_like,
-                $maybe_path,
-                $tooltip,
-                $cwd,
-                BackgroundFsChecks::Enabled,
-                $found_by
-            );
-            test_path_like!(
-                $test_path_like,
-                $maybe_path,
-                $tooltip,
-                $cwd,
-                BackgroundFsChecks::Disabled,
-                $found_by
-            );
-        }};
-
-        (
-            $test_path_like:expr,
-            $maybe_path:literal,
-            $tooltip:literal,
-            $cwd:tt,
-            $background_fs_checks:path,
-            $found_by:expr
-        ) => {
-            test_path_like_simple(
-                &mut $test_path_like,
-                path!($maybe_path),
-                path!($tooltip),
-                none_or_some_pathbuf!($cwd),
-                $background_fs_checks,
-                $found_by,
-                std::file!(),
-                std::line!(),
-            )
-            .await
-        };
-    }
-
-    // Note the arms of `test`, `test_local`, and `test_remote` should be collapsed once macro
-    // metavariable expressions (#![feature(macro_metavar_expr)]) are stabilized.
-    // See https://github.com/rust-lang/rust/issues/83527
-    #[doc = "test_path_likes!(<cx>, <trees>, <worktrees>, { $(<tests>;)+ })"]
-    macro_rules! test_path_likes {
-        ($cx:expr, $trees:expr, $worktrees:expr, { $($tests:expr;)+ }) => { {
-            let mut test_path_like = init_test($cx, $trees, $worktrees).await;
-            #[doc ="test!(<hovered maybe_path>, <expected tooltip>, <terminal cwd> "]
-            #[doc ="\\[, found by \\])"]
-            #[allow(unused_macros)]
-            macro_rules! test {
-                ($maybe_path:literal, $tooltip:literal, $cwd:tt) => {
-                    test_path_like!(
-                        test_path_like,
-                        $maybe_path,
-                        $tooltip,
-                        $cwd,
-                        OpenTargetFoundBy::WorktreeExact
-                    )
-                };
-                ($maybe_path:literal, $tooltip:literal, $cwd:tt, $found_by:ident) => {
-                    test_path_like!(
-                        test_path_like,
-                        $maybe_path,
-                        $tooltip,
-                        $cwd,
-                        OpenTargetFoundBy::$found_by
-                    )
-                }
-            }
-            #[doc ="test_local!(<hovered maybe_path>, <expected tooltip>, <terminal cwd> "]
-            #[doc ="\\[, found by \\])"]
-            #[allow(unused_macros)]
-            macro_rules! test_local {
-                ($maybe_path:literal, $tooltip:literal, $cwd:tt) => {
-                    test_path_like!(
-                        test_path_like,
-                        $maybe_path,
-                        $tooltip,
-                        $cwd,
-                        BackgroundFsChecks::Enabled,
-                        OpenTargetFoundBy::WorktreeExact
-                    )
-                };
-                ($maybe_path:literal, $tooltip:literal, $cwd:tt, $found_by:ident) => {
-                    test_path_like!(
-                        test_path_like,
-                        $maybe_path,
-                        $tooltip,
-                        $cwd,
-                        BackgroundFsChecks::Enabled,
-                        OpenTargetFoundBy::$found_by
-                    )
-                }
-            }
-            #[doc ="test_remote!(<hovered maybe_path>, <expected tooltip>, <terminal cwd> "]
-            #[doc ="\\[, found by \\])"]
-            #[allow(unused_macros)]
-            macro_rules! test_remote {
-                ($maybe_path:literal, $tooltip:literal, $cwd:tt) => {
-                    test_path_like!(
-                        test_path_like,
-                        $maybe_path,
-                        $tooltip,
-                        $cwd,
-                        BackgroundFsChecks::Disabled,
-                        OpenTargetFoundBy::WorktreeExact
-                    )
-                };
-                ($maybe_path:literal, $tooltip:literal, $cwd:tt, $found_by:ident) => {
-                    test_path_like!(
-                        test_path_like,
-                        $maybe_path,
-                        $tooltip,
-                        $cwd,
-                        BackgroundFsChecks::Disabled,
-                        OpenTargetFoundBy::$found_by
-                    )
-                }
-            }
-            $($tests);+
-        } }
-    }
-
-    #[gpui::test]
-    async fn one_folder_worktree(cx: &mut TestAppContext) {
-        test_path_likes!(
-            cx,
-            vec![(
-                path!("/test"),
-                json!({
-                    "lib.rs": "",
-                    "test.rs": "",
-                }),
-            )],
-            vec![path!("/test")],
-            {
-                test!("lib.rs", "/test/lib.rs", None);
-                test!("/test/lib.rs", "/test/lib.rs", None);
-                test!("test.rs", "/test/test.rs", None);
-                test!("/test/test.rs", "/test/test.rs", None);
-            }
-        )
-    }
-
-    #[gpui::test]
-    async fn mixed_worktrees(cx: &mut TestAppContext) {
-        test_path_likes!(
-            cx,
-            vec![
-                (
-                    path!("/"),
-                    json!({
-                        "file.txt": "",
-                    }),
-                ),
-                (
-                    path!("/test"),
-                    json!({
-                        "lib.rs": "",
-                        "test.rs": "",
-                        "file.txt": "",
-                    }),
-                ),
-            ],
-            vec![path!("/file.txt"), path!("/test")],
-            {
-                test!("file.txt", "/file.txt", "/");
-                test!("/file.txt", "/file.txt", "/");
-
-                test!("lib.rs", "/test/lib.rs", "/test");
-                test!("test.rs", "/test/test.rs", "/test");
-                test!("file.txt", "/test/file.txt", "/test");
-
-                test!("/test/lib.rs", "/test/lib.rs", "/test");
-                test!("/test/test.rs", "/test/test.rs", "/test");
-                test!("/test/file.txt", "/test/file.txt", "/test");
-            }
-        )
-    }
-
-    #[gpui::test]
-    async fn worktree_file_preferred(cx: &mut TestAppContext) {
-        test_path_likes!(
-            cx,
-            vec![
-                (
-                    path!("/"),
-                    json!({
-                        "file.txt": "",
-                    }),
-                ),
-                (
-                    path!("/test"),
-                    json!({
-                        "file.txt": "",
-                    }),
-                ),
-            ],
-            vec![path!("/test")],
-            {
-                test!("file.txt", "/test/file.txt", "/test");
-            }
-        )
-    }
-
-    mod issues {
-        use super::*;
-
-        // https://github.com/zed-industries/zed/issues/28407
-        #[gpui::test]
-        async fn issue_28407_siblings(cx: &mut TestAppContext) {
-            test_path_likes!(
-                cx,
-                vec![(
-                    path!("/dir1"),
-                    json!({
-                        "dir 2": {
-                            "C.py": ""
-                        },
-                        "dir 3": {
-                            "C.py": ""
-                        },
-                    }),
-                )],
-                vec![path!("/dir1")],
-                {
-                    test!("C.py", "/dir1/dir 2/C.py", "/dir1", WorktreeScan);
-                    test!("C.py", "/dir1/dir 2/C.py", "/dir1/dir 2");
-                    test!("C.py", "/dir1/dir 3/C.py", "/dir1/dir 3");
-                }
-            )
-        }
-
-        // https://github.com/zed-industries/zed/issues/28407
-        // See https://github.com/zed-industries/zed/issues/34027
-        // See https://github.com/zed-industries/zed/issues/33498
-        #[gpui::test]
-        async fn issue_28407_nesting(cx: &mut TestAppContext) {
-            test_path_likes!(
-                cx,
-                vec![(
-                    path!("/project"),
-                    json!({
-                        "lib": {
-                            "src": {
-                                "main.rs": "",
-                                "only_in_lib.rs": ""
-                            },
-                        },
-                        "src": {
-                            "main.rs": ""
-                        },
-                    }),
-                )],
-                vec![path!("/project")],
-                {
-                    test!("main.rs", "/project/src/main.rs", "/project/src");
-                    test!("main.rs", "/project/lib/src/main.rs", "/project/lib/src");
-
-                    test!("src/main.rs", "/project/src/main.rs", "/project");
-                    test!("src/main.rs", "/project/src/main.rs", "/project/src");
-                    test!("src/main.rs", "/project/lib/src/main.rs", "/project/lib");
-
-                    test!("lib/src/main.rs", "/project/lib/src/main.rs", "/project");
-                    test!(
-                        "lib/src/main.rs",
-                        "/project/lib/src/main.rs",
-                        "/project/src"
-                    );
-                    test!(
-                        "lib/src/main.rs",
-                        "/project/lib/src/main.rs",
-                        "/project/lib"
-                    );
-                    test!(
-                        "lib/src/main.rs",
-                        "/project/lib/src/main.rs",
-                        "/project/lib/src"
-                    );
-                    test!(
-                        "src/only_in_lib.rs",
-                        "/project/lib/src/only_in_lib.rs",
-                        "/project/lib/src",
-                        WorktreeScan
-                    );
-                }
-            )
-        }
-
-        // https://github.com/zed-industries/zed/issues/28339
-        // Note: These could all be found by WorktreeExact if we used
-        // `fs::normalize_path(&maybe_path)`
-        #[gpui::test]
-        async fn issue_28339(cx: &mut TestAppContext) {
-            test_path_likes!(
-                cx,
-                vec![(
-                    path!("/tmp"),
-                    json!({
-                        "issue28339": {
-                            "foo": {
-                                "bar.txt": ""
-                            },
-                        },
-                    }),
-                )],
-                vec![path!("/tmp")],
-                {
-                    test_local!(
-                        "foo/./bar.txt",
-                        "/tmp/issue28339/foo/bar.txt",
-                        "/tmp/issue28339",
-                        WorktreeExact
-                    );
-                    test_local!(
-                        "foo/../foo/bar.txt",
-                        "/tmp/issue28339/foo/bar.txt",
-                        "/tmp/issue28339",
-                        WorktreeExact
-                    );
-                    test_local!(
-                        "foo/..///foo/bar.txt",
-                        "/tmp/issue28339/foo/bar.txt",
-                        "/tmp/issue28339",
-                        WorktreeExact
-                    );
-                    test_local!(
-                        "issue28339/../issue28339/foo/../foo/bar.txt",
-                        "/tmp/issue28339/foo/bar.txt",
-                        "/tmp/issue28339",
-                        WorktreeExact
-                    );
-                    test_local!(
-                        "./bar.txt",
-                        "/tmp/issue28339/foo/bar.txt",
-                        "/tmp/issue28339/foo",
-                        WorktreeExact
-                    );
-                    test_local!(
-                        "../foo/bar.txt",
-                        "/tmp/issue28339/foo/bar.txt",
-                        "/tmp/issue28339/foo",
-                        FileSystemBackground
-                    );
-                }
-            )
-        }
-
-        // https://github.com/zed-industries/zed/issues/28339
-        // Note: These could all be found by WorktreeExact if we used
-        // `fs::normalize_path(&maybe_path)`
-        #[gpui::test]
-        #[should_panic(expected = "Hover target should not be `None`")]
-        async fn issue_28339_remote(cx: &mut TestAppContext) {
-            test_path_likes!(
-                cx,
-                vec![(
-                    path!("/tmp"),
-                    json!({
-                        "issue28339": {
-                            "foo": {
-                                "bar.txt": ""
-                            },
-                        },
-                    }),
-                )],
-                vec![path!("/tmp")],
-                {
-                    test_remote!(
-                        "foo/./bar.txt",
-                        "/tmp/issue28339/foo/bar.txt",
-                        "/tmp/issue28339"
-                    );
-                    test_remote!(
-                        "foo/../foo/bar.txt",
-                        "/tmp/issue28339/foo/bar.txt",
-                        "/tmp/issue28339"
-                    );
-                    test_remote!(
-                        "foo/..///foo/bar.txt",
-                        "/tmp/issue28339/foo/bar.txt",
-                        "/tmp/issue28339"
-                    );
-                    test_remote!(
-                        "issue28339/../issue28339/foo/../foo/bar.txt",
-                        "/tmp/issue28339/foo/bar.txt",
-                        "/tmp/issue28339"
-                    );
-                    test_remote!(
-                        "./bar.txt",
-                        "/tmp/issue28339/foo/bar.txt",
-                        "/tmp/issue28339/foo"
-                    );
-                    test_remote!(
-                        "../foo/bar.txt",
-                        "/tmp/issue28339/foo/bar.txt",
-                        "/tmp/issue28339/foo"
-                    );
-                }
-            )
-        }
-
-        // https://github.com/zed-industries/zed/issues/34027
-        #[gpui::test]
-        async fn issue_34027(cx: &mut TestAppContext) {
-            test_path_likes!(
-                cx,
-                vec![(
-                    path!("/tmp/issue34027"),
-                    json!({
-                        "test.txt": "",
-                        "foo": {
-                            "test.txt": "",
-                        }
-                    }),
-                ),],
-                vec![path!("/tmp/issue34027")],
-                {
-                    test!("test.txt", "/tmp/issue34027/test.txt", "/tmp/issue34027");
-                    test!(
-                        "test.txt",
-                        "/tmp/issue34027/foo/test.txt",
-                        "/tmp/issue34027/foo"
-                    );
-                }
-            )
-        }
-
-        // https://github.com/zed-industries/zed/issues/34027
-        #[gpui::test]
-        async fn issue_34027_siblings(cx: &mut TestAppContext) {
-            test_path_likes!(
-                cx,
-                vec![(
-                    path!("/test"),
-                    json!({
-                        "sub1": {
-                            "file.txt": "",
-                        },
-                        "sub2": {
-                            "file.txt": "",
-                        }
-                    }),
-                ),],
-                vec![path!("/test")],
-                {
-                    test!("file.txt", "/test/sub1/file.txt", "/test/sub1");
-                    test!("file.txt", "/test/sub2/file.txt", "/test/sub2");
-                    test!("sub1/file.txt", "/test/sub1/file.txt", "/test/sub1");
-                    test!("sub2/file.txt", "/test/sub2/file.txt", "/test/sub2");
-                    test!("sub1/file.txt", "/test/sub1/file.txt", "/test/sub2");
-                    test!("sub2/file.txt", "/test/sub2/file.txt", "/test/sub1");
-                }
-            )
-        }
-
-        // https://github.com/zed-industries/zed/issues/34027
-        #[gpui::test]
-        async fn issue_34027_nesting(cx: &mut TestAppContext) {
-            test_path_likes!(
-                cx,
-                vec![(
-                    path!("/test"),
-                    json!({
-                        "sub1": {
-                            "file.txt": "",
-                            "subsub1": {
-                                "file.txt": "",
-                            }
-                        },
-                        "sub2": {
-                            "file.txt": "",
-                            "subsub1": {
-                                "file.txt": "",
-                            }
-                        }
-                    }),
-                ),],
-                vec![path!("/test")],
-                {
-                    test!(
-                        "file.txt",
-                        "/test/sub1/subsub1/file.txt",
-                        "/test/sub1/subsub1"
-                    );
-                    test!(
-                        "file.txt",
-                        "/test/sub2/subsub1/file.txt",
-                        "/test/sub2/subsub1"
-                    );
-                    test!(
-                        "subsub1/file.txt",
-                        "/test/sub1/subsub1/file.txt",
-                        "/test",
-                        WorktreeScan
-                    );
-                    test!(
-                        "subsub1/file.txt",
-                        "/test/sub1/subsub1/file.txt",
-                        "/test",
-                        WorktreeScan
-                    );
-                    test!(
-                        "subsub1/file.txt",
-                        "/test/sub1/subsub1/file.txt",
-                        "/test/sub1"
-                    );
-                    test!(
-                        "subsub1/file.txt",
-                        "/test/sub2/subsub1/file.txt",
-                        "/test/sub2"
-                    );
-                    test!(
-                        "subsub1/file.txt",
-                        "/test/sub1/subsub1/file.txt",
-                        "/test/sub1/subsub1",
-                        WorktreeScan
-                    );
-                }
-            )
-        }
-
-        // https://github.com/zed-industries/zed/issues/34027
-        #[gpui::test]
-        async fn issue_34027_non_worktree_local_file(cx: &mut TestAppContext) {
-            test_path_likes!(
-                cx,
-                vec![
-                    (
-                        path!("/"),
-                        json!({
-                            "file.txt": "",
-                        }),
-                    ),
-                    (
-                        path!("/test"),
-                        json!({
-                            "file.txt": "",
-                        }),
-                    ),
-                ],
-                vec![path!("/test")],
-                {
-                    // Note: Opening a non-worktree file adds that file as a single file worktree.
-                    test_local!("file.txt", "/file.txt", "/", FileSystemBackground);
-                }
-            )
-        }
-
-        // https://github.com/zed-industries/zed/issues/34027
-        #[gpui::test]
-        async fn issue_34027_non_worktree_remote_file(cx: &mut TestAppContext) {
-            test_path_likes!(
-                cx,
-                vec![
-                    (
-                        path!("/"),
-                        json!({
-                            "file.txt": "",
-                        }),
-                    ),
-                    (
-                        path!("/test"),
-                        json!({
-                            "file.txt": "",
-                        }),
-                    ),
-                ],
-                vec![path!("/test")],
-                {
-                    // Note: Opening a non-worktree file adds that file as a single file worktree.
-                    test_remote!("file.txt", "/test/file.txt", "/");
-                    test_remote!("/test/file.txt", "/test/file.txt", "/");
-                }
-            )
-        }
-
-        // See https://github.com/zed-industries/zed/issues/34027
-        #[gpui::test]
-        #[should_panic(expected = "Tooltip mismatch")]
-        async fn issue_34027_gaps(cx: &mut TestAppContext) {
-            test_path_likes!(
-                cx,
-                vec![(
-                    path!("/project"),
-                    json!({
-                        "lib": {
-                            "src": {
-                                "main.rs": ""
-                            },
-                        },
-                        "src": {
-                            "main.rs": ""
-                        },
-                    }),
-                )],
-                vec![path!("/project")],
-                {
-                    test!("main.rs", "/project/src/main.rs", "/project");
-                    test!("main.rs", "/project/lib/src/main.rs", "/project/lib");
-                }
-            )
-        }
-
-        // See https://github.com/zed-industries/zed/issues/34027
-        #[gpui::test]
-        #[should_panic(expected = "Tooltip mismatch")]
-        async fn issue_34027_overlap(cx: &mut TestAppContext) {
-            test_path_likes!(
-                cx,
-                vec![(
-                    path!("/project"),
-                    json!({
-                        "lib": {
-                            "src": {
-                                "main.rs": ""
-                            },
-                        },
-                        "src": {
-                            "main.rs": ""
-                        },
-                    }),
-                )],
-                vec![path!("/project")],
-                {
-                    // Finds "/project/src/main.rs"
-                    test!(
-                        "src/main.rs",
-                        "/project/lib/src/main.rs",
-                        "/project/lib/src"
-                    );
-                }
-            )
-        }
-    }
-}
diff --git a/crates/terminal_view/src/terminal_scrollbar.rs b/crates/terminal_view/src/terminal_scrollbar.rs
deleted file mode 100644
index 871bb60230..0000000000
--- a/crates/terminal_view/src/terminal_scrollbar.rs
+++ /dev/null
@@ -1,91 +0,0 @@
-use std::{
-    cell::{Cell, RefCell},
-    rc::Rc,
-};
-
-use gpui::{Bounds, Point, Size, size};
-use terminal::Terminal;
-use ui::{Pixels, ScrollableHandle, px};
-
-#[derive(Debug)]
-struct ScrollHandleState {
-    line_height: Pixels,
-    total_lines: usize,
-    viewport_lines: usize,
-    display_offset: usize,
-}
-
-impl ScrollHandleState {
-    fn new(terminal: &Terminal) -> Self {
-        Self {
-            line_height: terminal.last_content().terminal_bounds.line_height,
-            total_lines: terminal.total_lines(),
-            viewport_lines: terminal.viewport_lines(),
-            display_offset: terminal.last_content().display_offset,
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct TerminalScrollHandle {
-    state: Rc<RefCell<ScrollHandleState>>,
-    pub future_display_offset: Rc<Cell<Option<usize>>>,
-}
-
-impl TerminalScrollHandle {
-    pub fn new(terminal: &Terminal) -> Self {
-        Self {
-            state: Rc::new(RefCell::new(ScrollHandleState::new(terminal))),
-            future_display_offset: Rc::new(Cell::new(None)),
-        }
-    }
-
-    pub fn update(&self, terminal: &Terminal) {
-        *self.state.borrow_mut() = ScrollHandleState::new(terminal);
-    }
-}
-
-impl ScrollableHandle for TerminalScrollHandle {
-    fn max_offset(&self) -> Size<Pixels> {
-        let state = self.state.borrow();
-        size(
-            Pixels::ZERO,
-            state
-                .total_lines
-                .checked_sub(state.viewport_lines)
-                .unwrap_or(0) as f32
-                * state.line_height,
-        )
-    }
-
-    fn offset(&self) -> Point<Pixels> {
-        let state = self.state.borrow();
-        let scroll_offset = state.total_lines - state.viewport_lines - state.display_offset;
-        Point::new(
-            Pixels::ZERO,
-            -(scroll_offset as f32 * self.state.borrow().line_height),
-        )
-    }
-
-    fn set_offset(&self, point: Point<Pixels>) {
-        let state = self.state.borrow();
-        let offset_delta = (point.y / state.line_height).round() as i32;
-
-        let max_offset = state.total_lines - state.viewport_lines;
-        let display_offset = (max_offset as i32 + offset_delta).clamp(0, max_offset as i32);
-
-        self.future_display_offset
-            .set(Some(display_offset as usize));
-    }
-
-    fn viewport(&self) -> Bounds<Pixels> {
-        let state = self.state.borrow();
-        Bounds::new(
-            Point::new(px(0.), px(0.)),
-            size(
-                Pixels::ZERO,
-                state.viewport_lines as f32 * state.line_height,
-            ),
-        )
-    }
-}
diff --git a/crates/terminal_view/src/terminal_slash_command.rs b/crates/terminal_view/src/terminal_slash_command.rs
deleted file mode 100644
index 13c2cef48c..0000000000
--- a/crates/terminal_view/src/terminal_slash_command.rs
+++ /dev/null
@@ -1,129 +0,0 @@
-use std::sync::Arc;
-use std::sync::atomic::AtomicBool;
-
-use crate::{TerminalView, terminal_panel::TerminalPanel};
-use anyhow::Result;
-use assistant_slash_command::{
-    ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
-    SlashCommandResult,
-};
-use gpui::{App, Entity, Task, WeakEntity};
-use language::{BufferSnapshot, CodeLabel, LspAdapterDelegate};
-use ui::prelude::*;
-use workspace::{Workspace, dock::Panel};
-
-use assistant_slash_command::create_label_for_command;
-
-pub struct TerminalSlashCommand;
-
-const LINE_COUNT_ARG: &str = "--line-count";
-
-const DEFAULT_CONTEXT_LINES: usize = 50;
-
-impl SlashCommand for TerminalSlashCommand {
-    fn name(&self) -> String {
-        "terminal".into()
-    }
-
-    fn label(&self, cx: &App) -> CodeLabel {
-        create_label_for_command("terminal", &[LINE_COUNT_ARG], cx)
-    }
-
-    fn description(&self) -> String {
-        "Insert terminal output".into()
-    }
-
-    fn icon(&self) -> IconName {
-        IconName::Terminal
-    }
-
-    fn menu_text(&self) -> String {
-        self.description()
-    }
-
-    fn requires_argument(&self) -> bool {
-        false
-    }
-
-    fn accepts_arguments(&self) -> bool {
-        true
-    }
-
-    fn complete_argument(
-        self: Arc<Self>,
-        _arguments: &[String],
-        _cancel: Arc<AtomicBool>,
-        _workspace: Option<WeakEntity<Workspace>>,
-        _window: &mut Window,
-        _cx: &mut App,
-    ) -> Task<Result<Vec<ArgumentCompletion>>> {
-        Task::ready(Ok(Vec::new()))
-    }
-
-    fn run(
-        self: Arc<Self>,
-        arguments: &[String],
-        _context_slash_command_output_sections: &[SlashCommandOutputSection<language::Anchor>],
-        _context_buffer: BufferSnapshot,
-        workspace: WeakEntity<Workspace>,
-        _delegate: Option<Arc<dyn LspAdapterDelegate>>,
-        _: &mut Window,
-        cx: &mut App,
-    ) -> Task<SlashCommandResult> {
-        let Some(workspace) = workspace.upgrade() else {
-            return Task::ready(Err(anyhow::anyhow!("workspace was dropped")));
-        };
-
-        let Some(active_terminal) = resolve_active_terminal(&workspace, cx) else {
-            return Task::ready(Err(anyhow::anyhow!("no active terminal")));
-        };
-
-        let line_count = arguments
-            .get(0)
-            .and_then(|s| s.parse::<usize>().ok())
-            .unwrap_or(DEFAULT_CONTEXT_LINES);
-
-        let lines = active_terminal
-            .read(cx)
-            .entity()
-            .read(cx)
-            .last_n_non_empty_lines(line_count);
-
-        let mut text = String::new();
-        text.push_str("Terminal output:\n");
-        text.push_str(&lines.join("\n"));
-        let range = 0..text.len();
-
-        Task::ready(Ok(SlashCommandOutput {
-            text,
-            sections: vec![SlashCommandOutputSection {
-                range,
-                icon: IconName::Terminal,
-                label: "Terminal".into(),
-                metadata: None,
-            }],
-            run_commands_in_text: false,
-        }
-        .into_event_stream()))
-    }
-}
-
-fn resolve_active_terminal(
-    workspace: &Entity<Workspace>,
-    cx: &mut App,
-) -> Option<Entity<TerminalView>> {
-    if let Some(terminal_view) = workspace
-        .read(cx)
-        .active_item(cx)
-        .and_then(|item| item.act_as::<TerminalView>(cx))
-    {
-        return Some(terminal_view);
-    }
-
-    let terminal_panel = workspace.read(cx).panel::<TerminalPanel>(cx)?;
-    terminal_panel.read(cx).pane().and_then(|pane| {
-        pane.read(cx)
-            .active_item()
-            .and_then(|t| t.downcast::<TerminalView>())
-    })
-}
diff --git a/crates/terminal_view/src/terminal_view.rs b/crates/terminal_view/src/terminal_view.rs
deleted file mode 100644
index 98f7a17a27..0000000000
--- a/crates/terminal_view/src/terminal_view.rs
+++ /dev/null
@@ -1,1786 +0,0 @@
-mod persistence;
-pub mod terminal_element;
-pub mod terminal_panel;
-mod terminal_path_like_target;
-pub mod terminal_scrollbar;
-mod terminal_slash_command;
-
-use assistant_slash_command::SlashCommandRegistry;
-use editor::{EditorSettings, actions::SelectAll, blink_manager::BlinkManager};
-use gpui::{
-    Action, AnyElement, App, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable,
-    KeyContext, KeyDownEvent, Keystroke, MouseButton, MouseDownEvent, Pixels, Render,
-    ScrollWheelEvent, Styled, Subscription, Task, WeakEntity, actions, anchored, deferred, div,
-};
-use persistence::TERMINAL_DB;
-use project::{Project, search::SearchQuery};
-use schemars::JsonSchema;
-use task::TaskId;
-use terminal::{
-    Clear, Copy, Event, HoveredWord, MaybeNavigationTarget, Paste, ScrollLineDown, ScrollLineUp,
-    ScrollPageDown, ScrollPageUp, ScrollToBottom, ScrollToTop, ShowCharacterPalette, TaskState,
-    TaskStatus, Terminal, TerminalBounds, ToggleViMode,
-    alacritty_terminal::{
-        index::Point,
-        term::{TermMode, point_to_viewport, search::RegexSearch},
-    },
-    terminal_settings::{CursorShape, TerminalSettings},
-};
-use terminal_element::TerminalElement;
-use terminal_panel::TerminalPanel;
-use terminal_path_like_target::{hover_path_like_target, open_path_like_target};
-use terminal_scrollbar::TerminalScrollHandle;
-use terminal_slash_command::TerminalSlashCommand;
-use ui::{
-    ContextMenu, Divider, ScrollAxes, Scrollbars, Tooltip, WithScrollbar,
-    prelude::*,
-    scrollbars::{self, GlobalSetting, ScrollbarVisibility},
-};
-use util::ResultExt;
-use workspace::{
-    CloseActiveItem, NewCenterTerminal, NewTerminal, ToolbarItemLocation, Workspace, WorkspaceId,
-    delete_unloaded_items,
-    item::{
-        BreadcrumbText, Item, ItemEvent, SerializableItem, TabContentParams, TabTooltipContent,
-    },
-    register_serializable_item,
-    searchable::{Direction, SearchEvent, SearchOptions, SearchableItem, SearchableItemHandle},
-};
-
-use serde::Deserialize;
-use settings::{Settings, SettingsStore, TerminalBlink, WorkingDirectory};
-use zed_actions::assistant::InlineAssist;
-
-use std::{
-    cmp,
-    ops::{Range, RangeInclusive},
-    path::{Path, PathBuf},
-    rc::Rc,
-    sync::Arc,
-    time::Duration,
-};
-
-struct ImeState {
-    marked_text: String,
-    marked_range_utf16: Option<Range<usize>>,
-}
-
-const CURSOR_BLINK_INTERVAL: Duration = Duration::from_millis(500);
-
-/// Event to transmit the scroll from the element to the view
-#[derive(Clone, Debug, PartialEq)]
-pub struct ScrollTerminal(pub i32);
-
-/// Sends the specified text directly to the terminal.
-#[derive(Clone, Debug, Default, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = terminal)]
-pub struct SendText(String);
-
-/// Sends a keystroke sequence to the terminal.
-#[derive(Clone, Debug, Default, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = terminal)]
-pub struct SendKeystroke(String);
-
-actions!(
-    terminal,
-    [
-        /// Reruns the last executed task in the terminal.
-        RerunTask
-    ]
-);
-
-pub fn init(cx: &mut App) {
-    assistant_slash_command::init(cx);
-    terminal_panel::init(cx);
-
-    register_serializable_item::<TerminalView>(cx);
-
-    cx.observe_new(|workspace: &mut Workspace, _window, _cx| {
-        workspace.register_action(TerminalView::deploy);
-    })
-    .detach();
-    SlashCommandRegistry::global(cx).register_command(TerminalSlashCommand, true);
-}
-
-pub struct BlockProperties {
-    pub height: u8,
-    pub render: Box<dyn Send + Fn(&mut BlockContext) -> AnyElement>,
-}
-
-pub struct BlockContext<'a, 'b> {
-    pub window: &'a mut Window,
-    pub context: &'b mut App,
-    pub dimensions: TerminalBounds,
-}
-
-///A terminal view, maintains the PTY's file handles and communicates with the terminal
-pub struct TerminalView {
-    terminal: Entity<Terminal>,
-    workspace: WeakEntity<Workspace>,
-    project: WeakEntity<Project>,
-    focus_handle: FocusHandle,
-    //Currently using iTerm bell, show bell emoji in tab until input is received
-    has_bell: bool,
-    context_menu: Option<(Entity<ContextMenu>, gpui::Point<Pixels>, Subscription)>,
-    cursor_shape: CursorShape,
-    blink_manager: Entity<BlinkManager>,
-    mode: TerminalMode,
-    blinking_terminal_enabled: bool,
-    cwd_serialized: bool,
-    hover: Option<HoverTarget>,
-    hover_tooltip_update: Task<()>,
-    workspace_id: Option<WorkspaceId>,
-    show_breadcrumbs: bool,
-    block_below_cursor: Option<Rc<BlockProperties>>,
-    scroll_top: Pixels,
-    scroll_handle: TerminalScrollHandle,
-    ime_state: Option<ImeState>,
-    _subscriptions: Vec<Subscription>,
-    _terminal_subscriptions: Vec<Subscription>,
-}
-
-#[derive(Default, Clone)]
-pub enum TerminalMode {
-    #[default]
-    Standalone,
-    Embedded {
-        max_lines_when_unfocused: Option<usize>,
-    },
-}
-
-#[derive(Clone)]
-pub enum ContentMode {
-    Scrollable,
-    Inline {
-        displayed_lines: usize,
-        total_lines: usize,
-    },
-}
-
-impl ContentMode {
-    pub fn is_limited(&self) -> bool {
-        match self {
-            ContentMode::Scrollable => false,
-            ContentMode::Inline {
-                displayed_lines,
-                total_lines,
-            } => displayed_lines < total_lines,
-        }
-    }
-
-    pub fn is_scrollable(&self) -> bool {
-        matches!(self, ContentMode::Scrollable)
-    }
-}
-
-#[derive(Debug)]
-#[cfg_attr(test, derive(Clone, Eq, PartialEq))]
-struct HoverTarget {
-    tooltip: String,
-    hovered_word: HoveredWord,
-}
-
-impl EventEmitter<Event> for TerminalView {}
-impl EventEmitter<ItemEvent> for TerminalView {}
-impl EventEmitter<SearchEvent> for TerminalView {}
-
-impl Focusable for TerminalView {
-    fn focus_handle(&self, _cx: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl TerminalView {
-    ///Create a new Terminal in the current working directory or the user's home directory
-    pub fn deploy(
-        workspace: &mut Workspace,
-        _: &NewCenterTerminal,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        let working_directory = default_working_directory(workspace, cx);
-        TerminalPanel::add_center_terminal(workspace, window, cx, |project, cx| {
-            project.create_terminal_shell(working_directory, cx)
-        })
-        .detach_and_log_err(cx);
-    }
-
-    pub fn new(
-        terminal: Entity<Terminal>,
-        workspace: WeakEntity<Workspace>,
-        workspace_id: Option<WorkspaceId>,
-        project: WeakEntity<Project>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let workspace_handle = workspace.clone();
-        let terminal_subscriptions =
-            subscribe_for_terminal_events(&terminal, workspace, window, cx);
-
-        let focus_handle = cx.focus_handle();
-        let focus_in = cx.on_focus_in(&focus_handle, window, |terminal_view, window, cx| {
-            terminal_view.focus_in(window, cx);
-        });
-        let focus_out = cx.on_focus_out(
-            &focus_handle,
-            window,
-            |terminal_view, _event, window, cx| {
-                terminal_view.focus_out(window, cx);
-            },
-        );
-        let cursor_shape = TerminalSettings::get_global(cx).cursor_shape;
-
-        let scroll_handle = TerminalScrollHandle::new(terminal.read(cx));
-
-        let blink_manager = cx.new(|cx| {
-            BlinkManager::new(
-                CURSOR_BLINK_INTERVAL,
-                |cx| {
-                    !matches!(
-                        TerminalSettings::get_global(cx).blinking,
-                        TerminalBlink::Off
-                    )
-                },
-                cx,
-            )
-        });
-
-        let _subscriptions = vec![
-            focus_in,
-            focus_out,
-            cx.observe(&blink_manager, |_, _, cx| cx.notify()),
-            cx.observe_global::<SettingsStore>(Self::settings_changed),
-        ];
-        Self {
-            terminal,
-            workspace: workspace_handle,
-            project,
-            has_bell: false,
-            focus_handle,
-            context_menu: None,
-            cursor_shape,
-            blink_manager,
-            blinking_terminal_enabled: false,
-            hover: None,
-            hover_tooltip_update: Task::ready(()),
-            mode: TerminalMode::Standalone,
-            workspace_id,
-            show_breadcrumbs: TerminalSettings::get_global(cx).toolbar.breadcrumbs,
-            block_below_cursor: None,
-            scroll_top: Pixels::ZERO,
-            scroll_handle,
-            cwd_serialized: false,
-            ime_state: None,
-            _subscriptions,
-            _terminal_subscriptions: terminal_subscriptions,
-        }
-    }
-
-    /// Enable 'embedded' mode where the terminal displays the full content with an optional limit of lines.
-    pub fn set_embedded_mode(
-        &mut self,
-        max_lines_when_unfocused: Option<usize>,
-        cx: &mut Context<Self>,
-    ) {
-        self.mode = TerminalMode::Embedded {
-            max_lines_when_unfocused,
-        };
-        cx.notify();
-    }
-
-    const MAX_EMBEDDED_LINES: usize = 1_000;
-
-    /// Returns the current `ContentMode` depending on the set `TerminalMode` and the current number of lines
-    ///
-    /// Note: Even in embedded mode, the terminal will fallback to scrollable when its content exceeds `MAX_EMBEDDED_LINES`
-    pub fn content_mode(&self, window: &Window, cx: &App) -> ContentMode {
-        match &self.mode {
-            TerminalMode::Standalone => ContentMode::Scrollable,
-            TerminalMode::Embedded {
-                max_lines_when_unfocused,
-            } => {
-                let total_lines = self.terminal.read(cx).total_lines();
-
-                if total_lines > Self::MAX_EMBEDDED_LINES {
-                    ContentMode::Scrollable
-                } else {
-                    let mut displayed_lines = total_lines;
-
-                    if !self.focus_handle.is_focused(window)
-                        && let Some(max_lines) = max_lines_when_unfocused
-                    {
-                        displayed_lines = displayed_lines.min(*max_lines)
-                    }
-
-                    ContentMode::Inline {
-                        displayed_lines,
-                        total_lines,
-                    }
-                }
-            }
-        }
-    }
-
-    /// Sets the marked (pre-edit) text from the IME.
-    pub(crate) fn set_marked_text(
-        &mut self,
-        text: String,
-        range: Option<Range<usize>>,
-        cx: &mut Context<Self>,
-    ) {
-        self.ime_state = Some(ImeState {
-            marked_text: text,
-            marked_range_utf16: range,
-        });
-        cx.notify();
-    }
-
-    /// Gets the current marked range (UTF-16).
-    pub(crate) fn marked_text_range(&self) -> Option<Range<usize>> {
-        self.ime_state
-            .as_ref()
-            .and_then(|state| state.marked_range_utf16.clone())
-    }
-
-    /// Clears the marked (pre-edit) text state.
-    pub(crate) fn clear_marked_text(&mut self, cx: &mut Context<Self>) {
-        if self.ime_state.is_some() {
-            self.ime_state = None;
-            cx.notify();
-        }
-    }
-
-    /// Commits (sends) the given text to the PTY. Called by InputHandler::replace_text_in_range.
-    pub(crate) fn commit_text(&mut self, text: &str, cx: &mut Context<Self>) {
-        if !text.is_empty() {
-            self.terminal.update(cx, |term, _| {
-                term.input(text.to_string().into_bytes());
-            });
-        }
-    }
-
-    pub(crate) fn terminal_bounds(&self, cx: &App) -> TerminalBounds {
-        self.terminal.read(cx).last_content().terminal_bounds
-    }
-
-    pub fn entity(&self) -> &Entity<Terminal> {
-        &self.terminal
-    }
-
-    pub fn has_bell(&self) -> bool {
-        self.has_bell
-    }
-
-    pub fn clear_bell(&mut self, cx: &mut Context<TerminalView>) {
-        self.has_bell = false;
-        cx.emit(Event::Wakeup);
-    }
-
-    pub fn deploy_context_menu(
-        &mut self,
-        position: gpui::Point<Pixels>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let assistant_enabled = self
-            .workspace
-            .upgrade()
-            .and_then(|workspace| workspace.read(cx).panel::<TerminalPanel>(cx))
-            .is_some_and(|terminal_panel| terminal_panel.read(cx).assistant_enabled());
-        let context_menu = ContextMenu::build(window, cx, |menu, _, _| {
-            menu.context(self.focus_handle.clone())
-                .action("New Terminal", Box::new(NewTerminal))
-                .separator()
-                .action("Copy", Box::new(Copy))
-                .action("Paste", Box::new(Paste))
-                .action("Select All", Box::new(SelectAll))
-                .action("Clear", Box::new(Clear))
-                .when(assistant_enabled, |menu| {
-                    menu.separator()
-                        .action("Inline Assist", Box::new(InlineAssist::default()))
-                })
-                .separator()
-                .action(
-                    "Close Terminal Tab",
-                    Box::new(CloseActiveItem {
-                        save_intent: None,
-                        close_pinned: true,
-                    }),
-                )
-        });
-
-        window.focus(&context_menu.focus_handle(cx));
-        let subscription = cx.subscribe_in(
-            &context_menu,
-            window,
-            |this, _, _: &DismissEvent, window, cx| {
-                if this.context_menu.as_ref().is_some_and(|context_menu| {
-                    context_menu.0.focus_handle(cx).contains_focused(window, cx)
-                }) {
-                    cx.focus_self(window);
-                }
-                this.context_menu.take();
-                cx.notify();
-            },
-        );
-
-        self.context_menu = Some((context_menu, position, subscription));
-    }
-
-    fn settings_changed(&mut self, cx: &mut Context<Self>) {
-        let settings = TerminalSettings::get_global(cx);
-        let breadcrumb_visibility_changed = self.show_breadcrumbs != settings.toolbar.breadcrumbs;
-        self.show_breadcrumbs = settings.toolbar.breadcrumbs;
-
-        let should_blink = match settings.blinking {
-            TerminalBlink::Off => false,
-            TerminalBlink::On => true,
-            TerminalBlink::TerminalControlled => self.blinking_terminal_enabled,
-        };
-        let new_cursor_shape = settings.cursor_shape;
-        let old_cursor_shape = self.cursor_shape;
-        if old_cursor_shape != new_cursor_shape {
-            self.cursor_shape = new_cursor_shape;
-            self.terminal.update(cx, |term, _| {
-                term.set_cursor_shape(self.cursor_shape);
-            });
-        }
-
-        self.blink_manager.update(
-            cx,
-            if should_blink {
-                BlinkManager::enable
-            } else {
-                BlinkManager::disable
-            },
-        );
-
-        if breadcrumb_visibility_changed {
-            cx.emit(ItemEvent::UpdateBreadcrumbs);
-        }
-        cx.notify();
-    }
-
-    fn show_character_palette(
-        &mut self,
-        _: &ShowCharacterPalette,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self
-            .terminal
-            .read(cx)
-            .last_content
-            .mode
-            .contains(TermMode::ALT_SCREEN)
-        {
-            self.terminal.update(cx, |term, cx| {
-                term.try_keystroke(
-                    &Keystroke::parse("ctrl-cmd-space").unwrap(),
-                    TerminalSettings::get_global(cx).option_as_meta,
-                )
-            });
-        } else {
-            window.show_character_palette();
-        }
-    }
-
-    fn select_all(&mut self, _: &SelectAll, _: &mut Window, cx: &mut Context<Self>) {
-        self.terminal.update(cx, |term, _| term.select_all());
-        cx.notify();
-    }
-
-    fn rerun_task(&mut self, _: &RerunTask, window: &mut Window, cx: &mut Context<Self>) {
-        let task = self
-            .terminal
-            .read(cx)
-            .task()
-            .map(|task| terminal_rerun_override(&task.spawned_task.id))
-            .unwrap_or_default();
-        window.dispatch_action(Box::new(task), cx);
-    }
-
-    fn clear(&mut self, _: &Clear, _: &mut Window, cx: &mut Context<Self>) {
-        self.scroll_top = px(0.);
-        self.terminal.update(cx, |term, _| term.clear());
-        cx.notify();
-    }
-
-    fn max_scroll_top(&self, cx: &App) -> Pixels {
-        let terminal = self.terminal.read(cx);
-
-        let Some(block) = self.block_below_cursor.as_ref() else {
-            return Pixels::ZERO;
-        };
-
-        let line_height = terminal.last_content().terminal_bounds.line_height;
-        let viewport_lines = terminal.viewport_lines();
-        let cursor = point_to_viewport(
-            terminal.last_content.display_offset,
-            terminal.last_content.cursor.point,
-        )
-        .unwrap_or_default();
-        let max_scroll_top_in_lines =
-            (block.height as usize).saturating_sub(viewport_lines.saturating_sub(cursor.line + 1));
-
-        max_scroll_top_in_lines as f32 * line_height
-    }
-
-    fn scroll_wheel(&mut self, event: &ScrollWheelEvent, cx: &mut Context<Self>) {
-        let terminal_content = self.terminal.read(cx).last_content();
-
-        if self.block_below_cursor.is_some() && terminal_content.display_offset == 0 {
-            let line_height = terminal_content.terminal_bounds.line_height;
-            let y_delta = event.delta.pixel_delta(line_height).y;
-            if y_delta < Pixels::ZERO || self.scroll_top > Pixels::ZERO {
-                self.scroll_top = cmp::max(
-                    Pixels::ZERO,
-                    cmp::min(self.scroll_top - y_delta, self.max_scroll_top(cx)),
-                );
-                cx.notify();
-                return;
-            }
-        }
-        self.terminal.update(cx, |term, cx| {
-            term.scroll_wheel(
-                event,
-                TerminalSettings::get_global(cx).scroll_multiplier.max(0.01),
-            )
-        });
-    }
-
-    fn scroll_line_up(&mut self, _: &ScrollLineUp, _: &mut Window, cx: &mut Context<Self>) {
-        let terminal_content = self.terminal.read(cx).last_content();
-        if self.block_below_cursor.is_some()
-            && terminal_content.display_offset == 0
-            && self.scroll_top > Pixels::ZERO
-        {
-            let line_height = terminal_content.terminal_bounds.line_height;
-            self.scroll_top = cmp::max(self.scroll_top - line_height, Pixels::ZERO);
-            return;
-        }
-
-        self.terminal.update(cx, |term, _| term.scroll_line_up());
-        cx.notify();
-    }
-
-    fn scroll_line_down(&mut self, _: &ScrollLineDown, _: &mut Window, cx: &mut Context<Self>) {
-        let terminal_content = self.terminal.read(cx).last_content();
-        if self.block_below_cursor.is_some() && terminal_content.display_offset == 0 {
-            let max_scroll_top = self.max_scroll_top(cx);
-            if self.scroll_top < max_scroll_top {
-                let line_height = terminal_content.terminal_bounds.line_height;
-                self.scroll_top = cmp::min(self.scroll_top + line_height, max_scroll_top);
-            }
-            return;
-        }
-
-        self.terminal.update(cx, |term, _| term.scroll_line_down());
-        cx.notify();
-    }
-
-    fn scroll_page_up(&mut self, _: &ScrollPageUp, _: &mut Window, cx: &mut Context<Self>) {
-        if self.scroll_top == Pixels::ZERO {
-            self.terminal.update(cx, |term, _| term.scroll_page_up());
-        } else {
-            let line_height = self
-                .terminal
-                .read(cx)
-                .last_content
-                .terminal_bounds
-                .line_height();
-            let visible_block_lines = (self.scroll_top / line_height) as usize;
-            let viewport_lines = self.terminal.read(cx).viewport_lines();
-            let visible_content_lines = viewport_lines - visible_block_lines;
-
-            if visible_block_lines >= viewport_lines {
-                self.scroll_top = ((visible_block_lines - viewport_lines) as f32) * line_height;
-            } else {
-                self.scroll_top = px(0.);
-                self.terminal
-                    .update(cx, |term, _| term.scroll_up_by(visible_content_lines));
-            }
-        }
-        cx.notify();
-    }
-
-    fn scroll_page_down(&mut self, _: &ScrollPageDown, _: &mut Window, cx: &mut Context<Self>) {
-        self.terminal.update(cx, |term, _| term.scroll_page_down());
-        let terminal = self.terminal.read(cx);
-        if terminal.last_content().display_offset < terminal.viewport_lines() {
-            self.scroll_top = self.max_scroll_top(cx);
-        }
-        cx.notify();
-    }
-
-    fn scroll_to_top(&mut self, _: &ScrollToTop, _: &mut Window, cx: &mut Context<Self>) {
-        self.terminal.update(cx, |term, _| term.scroll_to_top());
-        cx.notify();
-    }
-
-    fn scroll_to_bottom(&mut self, _: &ScrollToBottom, _: &mut Window, cx: &mut Context<Self>) {
-        self.terminal.update(cx, |term, _| term.scroll_to_bottom());
-        if self.block_below_cursor.is_some() {
-            self.scroll_top = self.max_scroll_top(cx);
-        }
-        cx.notify();
-    }
-
-    fn toggle_vi_mode(&mut self, _: &ToggleViMode, _: &mut Window, cx: &mut Context<Self>) {
-        self.terminal.update(cx, |term, _| term.toggle_vi_mode());
-        cx.notify();
-    }
-
-    pub fn should_show_cursor(&self, focused: bool, cx: &mut Context<Self>) -> bool {
-        // Always show cursor when not focused or in special modes
-        if !focused
-            || self
-                .terminal
-                .read(cx)
-                .last_content
-                .mode
-                .contains(TermMode::ALT_SCREEN)
-        {
-            return true;
-        }
-
-        // When focused, check blinking settings and blink manager state
-        match TerminalSettings::get_global(cx).blinking {
-            TerminalBlink::Off => true,
-            TerminalBlink::TerminalControlled => {
-                !self.blinking_terminal_enabled || self.blink_manager.read(cx).visible()
-            }
-            TerminalBlink::On => self.blink_manager.read(cx).visible(),
-        }
-    }
-
-    pub fn pause_cursor_blinking(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
-        self.blink_manager.update(cx, BlinkManager::pause_blinking);
-    }
-
-    pub fn terminal(&self) -> &Entity<Terminal> {
-        &self.terminal
-    }
-
-    pub fn set_block_below_cursor(
-        &mut self,
-        block: BlockProperties,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.block_below_cursor = Some(Rc::new(block));
-        self.scroll_to_bottom(&ScrollToBottom, window, cx);
-        cx.notify();
-    }
-
-    pub fn clear_block_below_cursor(&mut self, cx: &mut Context<Self>) {
-        self.block_below_cursor = None;
-        self.scroll_top = Pixels::ZERO;
-        cx.notify();
-    }
-
-    ///Attempt to paste the clipboard into the terminal
-    fn copy(&mut self, _: &Copy, _: &mut Window, cx: &mut Context<Self>) {
-        self.terminal.update(cx, |term, _| term.copy(None));
-        cx.notify();
-    }
-
-    ///Attempt to paste the clipboard into the terminal
-    fn paste(&mut self, _: &Paste, _: &mut Window, cx: &mut Context<Self>) {
-        if let Some(clipboard_string) = cx.read_from_clipboard().and_then(|item| item.text()) {
-            self.terminal
-                .update(cx, |terminal, _cx| terminal.paste(&clipboard_string));
-        }
-    }
-
-    fn send_text(&mut self, text: &SendText, _: &mut Window, cx: &mut Context<Self>) {
-        self.clear_bell(cx);
-        self.terminal.update(cx, |term, _| {
-            term.input(text.0.to_string().into_bytes());
-        });
-    }
-
-    fn send_keystroke(&mut self, text: &SendKeystroke, _: &mut Window, cx: &mut Context<Self>) {
-        if let Some(keystroke) = Keystroke::parse(&text.0).log_err() {
-            self.clear_bell(cx);
-            self.terminal.update(cx, |term, cx| {
-                let processed =
-                    term.try_keystroke(&keystroke, TerminalSettings::get_global(cx).option_as_meta);
-                if processed && term.vi_mode_enabled() {
-                    cx.notify();
-                }
-                processed
-            });
-        }
-    }
-
-    fn dispatch_context(&self, cx: &App) -> KeyContext {
-        let mut dispatch_context = KeyContext::new_with_defaults();
-        dispatch_context.add("Terminal");
-
-        if self.terminal.read(cx).vi_mode_enabled() {
-            dispatch_context.add("vi_mode");
-        }
-
-        let mode = self.terminal.read(cx).last_content.mode;
-        dispatch_context.set(
-            "screen",
-            if mode.contains(TermMode::ALT_SCREEN) {
-                "alt"
-            } else {
-                "normal"
-            },
-        );
-
-        if mode.contains(TermMode::APP_CURSOR) {
-            dispatch_context.add("DECCKM");
-        }
-        if mode.contains(TermMode::APP_KEYPAD) {
-            dispatch_context.add("DECPAM");
-        } else {
-            dispatch_context.add("DECPNM");
-        }
-        if mode.contains(TermMode::SHOW_CURSOR) {
-            dispatch_context.add("DECTCEM");
-        }
-        if mode.contains(TermMode::LINE_WRAP) {
-            dispatch_context.add("DECAWM");
-        }
-        if mode.contains(TermMode::ORIGIN) {
-            dispatch_context.add("DECOM");
-        }
-        if mode.contains(TermMode::INSERT) {
-            dispatch_context.add("IRM");
-        }
-        //LNM is apparently the name for this. https://vt100.net/docs/vt510-rm/LNM.html
-        if mode.contains(TermMode::LINE_FEED_NEW_LINE) {
-            dispatch_context.add("LNM");
-        }
-        if mode.contains(TermMode::FOCUS_IN_OUT) {
-            dispatch_context.add("report_focus");
-        }
-        if mode.contains(TermMode::ALTERNATE_SCROLL) {
-            dispatch_context.add("alternate_scroll");
-        }
-        if mode.contains(TermMode::BRACKETED_PASTE) {
-            dispatch_context.add("bracketed_paste");
-        }
-        if mode.intersects(TermMode::MOUSE_MODE) {
-            dispatch_context.add("any_mouse_reporting");
-        }
-        {
-            let mouse_reporting = if mode.contains(TermMode::MOUSE_REPORT_CLICK) {
-                "click"
-            } else if mode.contains(TermMode::MOUSE_DRAG) {
-                "drag"
-            } else if mode.contains(TermMode::MOUSE_MOTION) {
-                "motion"
-            } else {
-                "off"
-            };
-            dispatch_context.set("mouse_reporting", mouse_reporting);
-        }
-        {
-            let format = if mode.contains(TermMode::SGR_MOUSE) {
-                "sgr"
-            } else if mode.contains(TermMode::UTF8_MOUSE) {
-                "utf8"
-            } else {
-                "normal"
-            };
-            dispatch_context.set("mouse_format", format);
-        };
-
-        if self.terminal.read(cx).last_content.selection.is_some() {
-            dispatch_context.add("selection");
-        }
-
-        dispatch_context
-    }
-
-    fn set_terminal(
-        &mut self,
-        terminal: Entity<Terminal>,
-        window: &mut Window,
-        cx: &mut Context<TerminalView>,
-    ) {
-        self._terminal_subscriptions =
-            subscribe_for_terminal_events(&terminal, self.workspace.clone(), window, cx);
-        self.terminal = terminal;
-    }
-
-    fn rerun_button(task: &TaskState) -> Option<IconButton> {
-        if !task.spawned_task.show_rerun {
-            return None;
-        }
-
-        let task_id = task.spawned_task.id.clone();
-        Some(
-            IconButton::new("rerun-icon", IconName::Rerun)
-                .icon_size(IconSize::Small)
-                .size(ButtonSize::Compact)
-                .icon_color(Color::Default)
-                .shape(ui::IconButtonShape::Square)
-                .tooltip(move |_window, cx| Tooltip::for_action("Rerun task", &RerunTask, cx))
-                .on_click(move |_, window, cx| {
-                    window.dispatch_action(Box::new(terminal_rerun_override(&task_id)), cx);
-                }),
-        )
-    }
-}
-
-fn terminal_rerun_override(task: &TaskId) -> zed_actions::Rerun {
-    zed_actions::Rerun {
-        task_id: Some(task.0.clone()),
-        allow_concurrent_runs: Some(true),
-        use_new_terminal: Some(false),
-        reevaluate_context: false,
-    }
-}
-
-fn subscribe_for_terminal_events(
-    terminal: &Entity<Terminal>,
-    workspace: WeakEntity<Workspace>,
-    window: &mut Window,
-    cx: &mut Context<TerminalView>,
-) -> Vec<Subscription> {
-    let terminal_subscription = cx.observe(terminal, |_, _, cx| cx.notify());
-    let mut previous_cwd = None;
-    let terminal_events_subscription = cx.subscribe_in(
-        terminal,
-        window,
-        move |terminal_view, terminal, event, window, cx| {
-            let current_cwd = terminal.read(cx).working_directory();
-            if current_cwd != previous_cwd {
-                previous_cwd = current_cwd;
-                terminal_view.cwd_serialized = false;
-            }
-
-            match event {
-                Event::Wakeup => {
-                    cx.notify();
-                    cx.emit(Event::Wakeup);
-                    cx.emit(ItemEvent::UpdateTab);
-                    cx.emit(SearchEvent::MatchesInvalidated);
-                }
-
-                Event::Bell => {
-                    terminal_view.has_bell = true;
-                    cx.emit(Event::Wakeup);
-                }
-
-                Event::BlinkChanged(blinking) => {
-                    terminal_view.blinking_terminal_enabled = *blinking;
-
-                    // If in terminal-controlled mode and focused, update blink manager
-                    if matches!(
-                        TerminalSettings::get_global(cx).blinking,
-                        TerminalBlink::TerminalControlled
-                    ) && terminal_view.focus_handle.is_focused(window)
-                    {
-                        terminal_view.blink_manager.update(cx, |manager, cx| {
-                            if *blinking {
-                                manager.enable(cx);
-                            } else {
-                                manager.disable(cx);
-                            }
-                        });
-                    }
-                }
-
-                Event::TitleChanged => {
-                    cx.emit(ItemEvent::UpdateTab);
-                }
-
-                Event::NewNavigationTarget(maybe_navigation_target) => {
-                    match maybe_navigation_target
-                        .as_ref()
-                        .zip(terminal.read(cx).last_content.last_hovered_word.as_ref())
-                    {
-                        Some((MaybeNavigationTarget::Url(url), hovered_word)) => {
-                            if Some(hovered_word)
-                                != terminal_view
-                                    .hover
-                                    .as_ref()
-                                    .map(|hover| &hover.hovered_word)
-                            {
-                                terminal_view.hover = Some(HoverTarget {
-                                    tooltip: url.clone(),
-                                    hovered_word: hovered_word.clone(),
-                                });
-                                terminal_view.hover_tooltip_update = Task::ready(());
-                                cx.notify();
-                            }
-                        }
-                        Some((MaybeNavigationTarget::PathLike(path_like_target), hovered_word)) => {
-                            if Some(hovered_word)
-                                != terminal_view
-                                    .hover
-                                    .as_ref()
-                                    .map(|hover| &hover.hovered_word)
-                            {
-                                terminal_view.hover = None;
-                                terminal_view.hover_tooltip_update = hover_path_like_target(
-                                    &workspace,
-                                    hovered_word.clone(),
-                                    path_like_target,
-                                    cx,
-                                );
-                                cx.notify();
-                            }
-                        }
-                        None => {
-                            terminal_view.hover = None;
-                            terminal_view.hover_tooltip_update = Task::ready(());
-                            cx.notify();
-                        }
-                    }
-                }
-
-                Event::Open(maybe_navigation_target) => match maybe_navigation_target {
-                    MaybeNavigationTarget::Url(url) => cx.open_url(url),
-                    MaybeNavigationTarget::PathLike(path_like_target) => open_path_like_target(
-                        &workspace,
-                        terminal_view,
-                        path_like_target,
-                        window,
-                        cx,
-                    ),
-                },
-                Event::BreadcrumbsChanged => cx.emit(ItemEvent::UpdateBreadcrumbs),
-                Event::CloseTerminal => cx.emit(ItemEvent::CloseItem),
-                Event::SelectionsChanged => {
-                    window.invalidate_character_coordinates();
-                    cx.emit(SearchEvent::ActiveMatchChanged)
-                }
-            }
-        },
-    );
-    vec![terminal_subscription, terminal_events_subscription]
-}
-
-fn regex_search_for_query(query: &project::search::SearchQuery) -> Option<RegexSearch> {
-    let str = query.as_str();
-    if query.is_regex() {
-        if str == "." {
-            return None;
-        }
-        RegexSearch::new(str).ok()
-    } else {
-        RegexSearch::new(&regex::escape(str)).ok()
-    }
-}
-
-struct TerminalScrollbarSettingsWrapper;
-
-impl GlobalSetting for TerminalScrollbarSettingsWrapper {
-    fn get_value(_cx: &App) -> &Self {
-        &Self
-    }
-}
-
-impl ScrollbarVisibility for TerminalScrollbarSettingsWrapper {
-    fn visibility(&self, cx: &App) -> scrollbars::ShowScrollbar {
-        TerminalSettings::get_global(cx)
-            .scrollbar
-            .show
-            .map(Into::into)
-            .unwrap_or_else(|| EditorSettings::get_global(cx).scrollbar.show)
-    }
-}
-
-impl TerminalView {
-    fn key_down(&mut self, event: &KeyDownEvent, window: &mut Window, cx: &mut Context<Self>) {
-        self.clear_bell(cx);
-        self.pause_cursor_blinking(window, cx);
-
-        self.terminal.update(cx, |term, cx| {
-            let handled = term.try_keystroke(
-                &event.keystroke,
-                TerminalSettings::get_global(cx).option_as_meta,
-            );
-            if handled {
-                cx.stop_propagation();
-            }
-        });
-    }
-
-    fn focus_in(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.terminal.update(cx, |terminal, _| {
-            terminal.set_cursor_shape(self.cursor_shape);
-            terminal.focus_in();
-        });
-
-        let should_blink = match TerminalSettings::get_global(cx).blinking {
-            TerminalBlink::Off => false,
-            TerminalBlink::On => true,
-            TerminalBlink::TerminalControlled => self.blinking_terminal_enabled,
-        };
-
-        if should_blink {
-            self.blink_manager.update(cx, BlinkManager::enable);
-        }
-
-        window.invalidate_character_coordinates();
-        cx.notify();
-    }
-
-    fn focus_out(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
-        self.blink_manager.update(cx, BlinkManager::disable);
-        self.terminal.update(cx, |terminal, _| {
-            terminal.focus_out();
-            terminal.set_cursor_shape(CursorShape::Hollow);
-        });
-        cx.notify();
-    }
-}
-
-impl Render for TerminalView {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        // TODO: this should be moved out of render
-        self.scroll_handle.update(self.terminal.read(cx));
-
-        if let Some(new_display_offset) = self.scroll_handle.future_display_offset.take() {
-            self.terminal.update(cx, |term, _| {
-                let delta = new_display_offset as i32 - term.last_content.display_offset as i32;
-                match delta.cmp(&0) {
-                    std::cmp::Ordering::Greater => term.scroll_up_by(delta as usize),
-                    std::cmp::Ordering::Less => term.scroll_down_by(-delta as usize),
-                    std::cmp::Ordering::Equal => {}
-                }
-            });
-        }
-
-        let terminal_handle = self.terminal.clone();
-        let terminal_view_handle = cx.entity();
-
-        let focused = self.focus_handle.is_focused(window);
-
-        div()
-            .id("terminal-view")
-            .size_full()
-            .relative()
-            .track_focus(&self.focus_handle(cx))
-            .key_context(self.dispatch_context(cx))
-            .on_action(cx.listener(TerminalView::send_text))
-            .on_action(cx.listener(TerminalView::send_keystroke))
-            .on_action(cx.listener(TerminalView::copy))
-            .on_action(cx.listener(TerminalView::paste))
-            .on_action(cx.listener(TerminalView::clear))
-            .on_action(cx.listener(TerminalView::scroll_line_up))
-            .on_action(cx.listener(TerminalView::scroll_line_down))
-            .on_action(cx.listener(TerminalView::scroll_page_up))
-            .on_action(cx.listener(TerminalView::scroll_page_down))
-            .on_action(cx.listener(TerminalView::scroll_to_top))
-            .on_action(cx.listener(TerminalView::scroll_to_bottom))
-            .on_action(cx.listener(TerminalView::toggle_vi_mode))
-            .on_action(cx.listener(TerminalView::show_character_palette))
-            .on_action(cx.listener(TerminalView::select_all))
-            .on_action(cx.listener(TerminalView::rerun_task))
-            .on_key_down(cx.listener(Self::key_down))
-            .on_mouse_down(
-                MouseButton::Right,
-                cx.listener(|this, event: &MouseDownEvent, window, cx| {
-                    if !this.terminal.read(cx).mouse_mode(event.modifiers.shift) {
-                        if this.terminal.read(cx).last_content.selection.is_none() {
-                            this.terminal.update(cx, |terminal, _| {
-                                terminal.select_word_at_event_position(event);
-                            });
-                        };
-                        this.deploy_context_menu(event.position, window, cx);
-                        cx.notify();
-                    }
-                }),
-            )
-            .child(
-                // TODO: Oddly this wrapper div is needed for TerminalElement to not steal events from the context menu
-                div()
-                    .id("terminal-view-container")
-                    .size_full()
-                    .bg(cx.theme().colors().editor_background)
-                    .child(TerminalElement::new(
-                        terminal_handle,
-                        terminal_view_handle,
-                        self.workspace.clone(),
-                        self.focus_handle.clone(),
-                        focused,
-                        self.should_show_cursor(focused, cx),
-                        self.block_below_cursor.clone(),
-                        self.mode.clone(),
-                    ))
-                    .when(self.content_mode(window, cx).is_scrollable(), |div| {
-                        div.custom_scrollbars(
-                            Scrollbars::for_settings::<TerminalScrollbarSettingsWrapper>()
-                                .show_along(ScrollAxes::Vertical)
-                                .with_track_along(
-                                    ScrollAxes::Vertical,
-                                    cx.theme().colors().editor_background,
-                                )
-                                .tracked_scroll_handle(&self.scroll_handle),
-                            window,
-                            cx,
-                        )
-                    }),
-            )
-            .children(self.context_menu.as_ref().map(|(menu, position, _)| {
-                deferred(
-                    anchored()
-                        .position(*position)
-                        .anchor(gpui::Corner::TopLeft)
-                        .child(menu.clone()),
-                )
-                .with_priority(1)
-            }))
-    }
-}
-
-impl Item for TerminalView {
-    type Event = ItemEvent;
-
-    fn tab_tooltip_content(&self, cx: &App) -> Option<TabTooltipContent> {
-        Some(TabTooltipContent::Custom(Box::new(Tooltip::element({
-            let terminal = self.terminal().read(cx);
-            let title = terminal.title(false);
-            let pid = terminal.pid_getter()?.fallback_pid();
-
-            move |_, _| {
-                v_flex()
-                    .gap_1()
-                    .child(Label::new(title.clone()))
-                    .child(h_flex().flex_grow().child(Divider::horizontal()))
-                    .child(
-                        Label::new(format!("Process ID (PID): {}", pid))
-                            .color(Color::Muted)
-                            .size(LabelSize::Small),
-                    )
-                    .into_any_element()
-            }
-        }))))
-    }
-
-    fn tab_content(&self, params: TabContentParams, _window: &Window, cx: &App) -> AnyElement {
-        let terminal = self.terminal().read(cx);
-        let title = terminal.title(true);
-
-        let (icon, icon_color, rerun_button) = match terminal.task() {
-            Some(terminal_task) => match &terminal_task.status {
-                TaskStatus::Running => (
-                    IconName::PlayFilled,
-                    Color::Disabled,
-                    TerminalView::rerun_button(terminal_task),
-                ),
-                TaskStatus::Unknown => (
-                    IconName::Warning,
-                    Color::Warning,
-                    TerminalView::rerun_button(terminal_task),
-                ),
-                TaskStatus::Completed { success } => {
-                    let rerun_button = TerminalView::rerun_button(terminal_task);
-
-                    if *success {
-                        (IconName::Check, Color::Success, rerun_button)
-                    } else {
-                        (IconName::XCircle, Color::Error, rerun_button)
-                    }
-                }
-            },
-            None => (IconName::Terminal, Color::Muted, None),
-        };
-
-        h_flex()
-            .gap_1()
-            .group("term-tab-icon")
-            .child(
-                h_flex()
-                    .group("term-tab-icon")
-                    .child(
-                        div()
-                            .when(rerun_button.is_some(), |this| {
-                                this.hover(|style| style.invisible().w_0())
-                            })
-                            .child(Icon::new(icon).color(icon_color)),
-                    )
-                    .when_some(rerun_button, |this, rerun_button| {
-                        this.child(
-                            div()
-                                .absolute()
-                                .visible_on_hover("term-tab-icon")
-                                .child(rerun_button),
-                        )
-                    }),
-            )
-            .child(Label::new(title).color(params.text_color()))
-            .into_any()
-    }
-
-    fn tab_content_text(&self, detail: usize, cx: &App) -> SharedString {
-        let terminal = self.terminal().read(cx);
-        terminal.title(detail == 0).into()
-    }
-
-    fn telemetry_event_text(&self) -> Option<&'static str> {
-        None
-    }
-
-    fn buffer_kind(&self, _: &App) -> workspace::item::ItemBufferKind {
-        workspace::item::ItemBufferKind::Singleton
-    }
-
-    fn can_split(&self) -> bool {
-        true
-    }
-
-    fn clone_on_split(
-        &self,
-        workspace_id: Option<WorkspaceId>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Option<Entity<Self>>> {
-        let Ok(terminal) = self.project.update(cx, |project, cx| {
-            let cwd = project
-                .active_project_directory(cx)
-                .map(|it| it.to_path_buf());
-            project.clone_terminal(self.terminal(), cx, cwd)
-        }) else {
-            return Task::ready(None);
-        };
-        cx.spawn_in(window, async move |this, cx| {
-            let terminal = terminal.await.log_err()?;
-            this.update_in(cx, |this, window, cx| {
-                cx.new(|cx| {
-                    TerminalView::new(
-                        terminal,
-                        this.workspace.clone(),
-                        workspace_id,
-                        this.project.clone(),
-                        window,
-                        cx,
-                    )
-                })
-            })
-            .ok()
-        })
-    }
-
-    fn is_dirty(&self, cx: &gpui::App) -> bool {
-        match self.terminal.read(cx).task() {
-            Some(task) => task.status == TaskStatus::Running,
-            None => self.has_bell(),
-        }
-    }
-
-    fn has_conflict(&self, _cx: &App) -> bool {
-        false
-    }
-
-    fn can_save_as(&self, _cx: &App) -> bool {
-        false
-    }
-
-    fn as_searchable(
-        &self,
-        handle: &Entity<Self>,
-        _: &App,
-    ) -> Option<Box<dyn SearchableItemHandle>> {
-        Some(Box::new(handle.clone()))
-    }
-
-    fn breadcrumb_location(&self, cx: &App) -> ToolbarItemLocation {
-        if self.show_breadcrumbs && !self.terminal().read(cx).breadcrumb_text.trim().is_empty() {
-            ToolbarItemLocation::PrimaryLeft
-        } else {
-            ToolbarItemLocation::Hidden
-        }
-    }
-
-    fn breadcrumbs(&self, _: &theme::Theme, cx: &App) -> Option<Vec<BreadcrumbText>> {
-        Some(vec![BreadcrumbText {
-            text: self.terminal().read(cx).breadcrumb_text.clone(),
-            highlights: None,
-            font: None,
-        }])
-    }
-
-    fn added_to_workspace(
-        &mut self,
-        workspace: &mut Workspace,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.terminal().read(cx).task().is_none() {
-            if let Some((new_id, old_id)) = workspace.database_id().zip(self.workspace_id) {
-                log::debug!(
-                    "Updating workspace id for the terminal, old: {old_id:?}, new: {new_id:?}",
-                );
-                cx.background_spawn(TERMINAL_DB.update_workspace_id(
-                    new_id,
-                    old_id,
-                    cx.entity_id().as_u64(),
-                ))
-                .detach();
-            }
-            self.workspace_id = workspace.database_id();
-        }
-    }
-
-    fn to_item_events(event: &Self::Event, mut f: impl FnMut(ItemEvent)) {
-        f(*event)
-    }
-}
-
-impl SerializableItem for TerminalView {
-    fn serialized_item_kind() -> &'static str {
-        "Terminal"
-    }
-
-    fn cleanup(
-        workspace_id: WorkspaceId,
-        alive_items: Vec<workspace::ItemId>,
-        _window: &mut Window,
-        cx: &mut App,
-    ) -> Task<anyhow::Result<()>> {
-        delete_unloaded_items(alive_items, workspace_id, "terminals", &TERMINAL_DB, cx)
-    }
-
-    fn serialize(
-        &mut self,
-        _workspace: &mut Workspace,
-        item_id: workspace::ItemId,
-        _closing: bool,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Task<anyhow::Result<()>>> {
-        let terminal = self.terminal().read(cx);
-        if terminal.task().is_some() {
-            return None;
-        }
-
-        if let Some((cwd, workspace_id)) = terminal.working_directory().zip(self.workspace_id) {
-            self.cwd_serialized = true;
-            Some(cx.background_spawn(async move {
-                TERMINAL_DB
-                    .save_working_directory(item_id, workspace_id, cwd)
-                    .await
-            }))
-        } else {
-            None
-        }
-    }
-
-    fn should_serialize(&self, _: &Self::Event) -> bool {
-        !self.cwd_serialized
-    }
-
-    fn deserialize(
-        project: Entity<Project>,
-        workspace: WeakEntity<Workspace>,
-        workspace_id: workspace::WorkspaceId,
-        item_id: workspace::ItemId,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<anyhow::Result<Entity<Self>>> {
-        window.spawn(cx, async move |cx| {
-            let cwd = cx
-                .update(|_window, cx| {
-                    let from_db = TERMINAL_DB
-                        .get_working_directory(item_id, workspace_id)
-                        .log_err()
-                        .flatten();
-                    if from_db
-                        .as_ref()
-                        .is_some_and(|from_db| !from_db.as_os_str().is_empty())
-                    {
-                        from_db
-                    } else {
-                        workspace
-                            .upgrade()
-                            .and_then(|workspace| default_working_directory(workspace.read(cx), cx))
-                    }
-                })
-                .ok()
-                .flatten();
-
-            let terminal = project
-                .update(cx, |project, cx| project.create_terminal_shell(cwd, cx))?
-                .await?;
-            cx.update(|window, cx| {
-                cx.new(|cx| {
-                    TerminalView::new(
-                        terminal,
-                        workspace,
-                        Some(workspace_id),
-                        project.downgrade(),
-                        window,
-                        cx,
-                    )
-                })
-            })
-        })
-    }
-}
-
-impl SearchableItem for TerminalView {
-    type Match = RangeInclusive<Point>;
-
-    fn supported_options(&self) -> SearchOptions {
-        SearchOptions {
-            case: false,
-            word: false,
-            regex: true,
-            replacement: false,
-            selection: false,
-            find_in_results: false,
-        }
-    }
-
-    /// Clear stored matches
-    fn clear_matches(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
-        self.terminal().update(cx, |term, _| term.matches.clear())
-    }
-
-    /// Store matches returned from find_matches somewhere for rendering
-    fn update_matches(
-        &mut self,
-        matches: &[Self::Match],
-        _active_match_index: Option<usize>,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.terminal()
-            .update(cx, |term, _| term.matches = matches.to_vec())
-    }
-
-    /// Returns the selection content to pre-load into this search
-    fn query_suggestion(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> String {
-        self.terminal()
-            .read(cx)
-            .last_content
-            .selection_text
-            .clone()
-            .unwrap_or_default()
-    }
-
-    /// Focus match at given index into the Vec of matches
-    fn activate_match(
-        &mut self,
-        index: usize,
-        _: &[Self::Match],
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.terminal()
-            .update(cx, |term, _| term.activate_match(index));
-        cx.notify();
-    }
-
-    /// Add selections for all matches given.
-    fn select_matches(&mut self, matches: &[Self::Match], _: &mut Window, cx: &mut Context<Self>) {
-        self.terminal()
-            .update(cx, |term, _| term.select_matches(matches));
-        cx.notify();
-    }
-
-    /// Get all of the matches for this query, should be done on the background
-    fn find_matches(
-        &mut self,
-        query: Arc<SearchQuery>,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Vec<Self::Match>> {
-        if let Some(s) = regex_search_for_query(&query) {
-            self.terminal()
-                .update(cx, |term, cx| term.find_matches(s, cx))
-        } else {
-            Task::ready(vec![])
-        }
-    }
-
-    /// Reports back to the search toolbar what the active match should be (the selection)
-    fn active_match_index(
-        &mut self,
-        direction: Direction,
-        matches: &[Self::Match],
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<usize> {
-        // Selection head might have a value if there's a selection that isn't
-        // associated with a match. Therefore, if there are no matches, we should
-        // report None, no matter the state of the terminal
-
-        if !matches.is_empty() {
-            if let Some(selection_head) = self.terminal().read(cx).selection_head {
-                // If selection head is contained in a match. Return that match
-                match direction {
-                    Direction::Prev => {
-                        // If no selection before selection head, return the first match
-                        Some(
-                            matches
-                                .iter()
-                                .enumerate()
-                                .rev()
-                                .find(|(_, search_match)| {
-                                    search_match.contains(&selection_head)
-                                        || search_match.start() < &selection_head
-                                })
-                                .map(|(ix, _)| ix)
-                                .unwrap_or(0),
-                        )
-                    }
-                    Direction::Next => {
-                        // If no selection after selection head, return the last match
-                        Some(
-                            matches
-                                .iter()
-                                .enumerate()
-                                .find(|(_, search_match)| {
-                                    search_match.contains(&selection_head)
-                                        || search_match.start() > &selection_head
-                                })
-                                .map(|(ix, _)| ix)
-                                .unwrap_or(matches.len().saturating_sub(1)),
-                        )
-                    }
-                }
-            } else {
-                // Matches found but no active selection, return the first last one (closest to cursor)
-                Some(matches.len().saturating_sub(1))
-            }
-        } else {
-            None
-        }
-    }
-    fn replace(
-        &mut self,
-        _: &Self::Match,
-        _: &SearchQuery,
-        _window: &mut Window,
-        _: &mut Context<Self>,
-    ) {
-        // Replacement is not supported in terminal view, so this is a no-op.
-    }
-}
-
-///Gets the working directory for the given workspace, respecting the user's settings.
-/// None implies "~" on whichever machine we end up on.
-pub(crate) fn default_working_directory(workspace: &Workspace, cx: &App) -> Option<PathBuf> {
-    match &TerminalSettings::get_global(cx).working_directory {
-        WorkingDirectory::CurrentProjectDirectory => workspace
-            .project()
-            .read(cx)
-            .active_project_directory(cx)
-            .as_deref()
-            .map(Path::to_path_buf)
-            .or_else(|| first_project_directory(workspace, cx)),
-        WorkingDirectory::FirstProjectDirectory => first_project_directory(workspace, cx),
-        WorkingDirectory::AlwaysHome => None,
-        WorkingDirectory::Always { directory } => {
-            shellexpand::full(&directory) //TODO handle this better
-                .ok()
-                .map(|dir| Path::new(&dir.to_string()).to_path_buf())
-                .filter(|dir| dir.is_dir())
-        }
-    }
-}
-///Gets the first project's home directory, or the home directory
-fn first_project_directory(workspace: &Workspace, cx: &App) -> Option<PathBuf> {
-    let worktree = workspace.worktrees(cx).next()?.read(cx);
-    let worktree_path = worktree.abs_path();
-    if worktree.root_entry()?.is_dir() {
-        Some(worktree_path.to_path_buf())
-    } else {
-        // If worktree is a file, return its parent directory
-        worktree_path.parent().map(|p| p.to_path_buf())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use gpui::TestAppContext;
-    use project::{Entry, Project, ProjectPath, Worktree};
-    use std::path::Path;
-    use util::rel_path::RelPath;
-    use workspace::AppState;
-
-    // Working directory calculation tests
-
-    // No Worktrees in project -> home_dir()
-    #[gpui::test]
-    async fn no_worktree(cx: &mut TestAppContext) {
-        let (project, workspace) = init_test(cx).await;
-        cx.read(|cx| {
-            let workspace = workspace.read(cx);
-            let active_entry = project.read(cx).active_entry();
-
-            //Make sure environment is as expected
-            assert!(active_entry.is_none());
-            assert!(workspace.worktrees(cx).next().is_none());
-
-            let res = default_working_directory(workspace, cx);
-            assert_eq!(res, None);
-            let res = first_project_directory(workspace, cx);
-            assert_eq!(res, None);
-        });
-    }
-
-    // No active entry, but a worktree, worktree is a file -> parent directory
-    #[gpui::test]
-    async fn no_active_entry_worktree_is_file(cx: &mut TestAppContext) {
-        let (project, workspace) = init_test(cx).await;
-
-        create_file_wt(project.clone(), "/root.txt", cx).await;
-        cx.read(|cx| {
-            let workspace = workspace.read(cx);
-            let active_entry = project.read(cx).active_entry();
-
-            //Make sure environment is as expected
-            assert!(active_entry.is_none());
-            assert!(workspace.worktrees(cx).next().is_some());
-
-            let res = default_working_directory(workspace, cx);
-            assert_eq!(res, Some(Path::new("/").to_path_buf()));
-            let res = first_project_directory(workspace, cx);
-            assert_eq!(res, Some(Path::new("/").to_path_buf()));
-        });
-    }
-
-    // No active entry, but a worktree, worktree is a folder -> worktree_folder
-    #[gpui::test]
-    async fn no_active_entry_worktree_is_dir(cx: &mut TestAppContext) {
-        let (project, workspace) = init_test(cx).await;
-
-        let (_wt, _entry) = create_folder_wt(project.clone(), "/root/", cx).await;
-        cx.update(|cx| {
-            let workspace = workspace.read(cx);
-            let active_entry = project.read(cx).active_entry();
-
-            assert!(active_entry.is_none());
-            assert!(workspace.worktrees(cx).next().is_some());
-
-            let res = default_working_directory(workspace, cx);
-            assert_eq!(res, Some((Path::new("/root/")).to_path_buf()));
-            let res = first_project_directory(workspace, cx);
-            assert_eq!(res, Some((Path::new("/root/")).to_path_buf()));
-        });
-    }
-
-    // Active entry with a work tree, worktree is a file -> worktree_folder()
-    #[gpui::test]
-    async fn active_entry_worktree_is_file(cx: &mut TestAppContext) {
-        let (project, workspace) = init_test(cx).await;
-
-        let (_wt, _entry) = create_folder_wt(project.clone(), "/root1/", cx).await;
-        let (wt2, entry2) = create_file_wt(project.clone(), "/root2.txt", cx).await;
-        insert_active_entry_for(wt2, entry2, project.clone(), cx);
-
-        cx.update(|cx| {
-            let workspace = workspace.read(cx);
-            let active_entry = project.read(cx).active_entry();
-
-            assert!(active_entry.is_some());
-
-            let res = default_working_directory(workspace, cx);
-            assert_eq!(res, Some((Path::new("/root1/")).to_path_buf()));
-            let res = first_project_directory(workspace, cx);
-            assert_eq!(res, Some((Path::new("/root1/")).to_path_buf()));
-        });
-    }
-
-    // Active entry, with a worktree, worktree is a folder -> worktree_folder
-    #[gpui::test]
-    async fn active_entry_worktree_is_dir(cx: &mut TestAppContext) {
-        let (project, workspace) = init_test(cx).await;
-
-        let (_wt, _entry) = create_folder_wt(project.clone(), "/root1/", cx).await;
-        let (wt2, entry2) = create_folder_wt(project.clone(), "/root2/", cx).await;
-        insert_active_entry_for(wt2, entry2, project.clone(), cx);
-
-        cx.update(|cx| {
-            let workspace = workspace.read(cx);
-            let active_entry = project.read(cx).active_entry();
-
-            assert!(active_entry.is_some());
-
-            let res = default_working_directory(workspace, cx);
-            assert_eq!(res, Some((Path::new("/root2/")).to_path_buf()));
-            let res = first_project_directory(workspace, cx);
-            assert_eq!(res, Some((Path::new("/root1/")).to_path_buf()));
-        });
-    }
-
-    /// Creates a worktree with 1 file: /root.txt
-    pub async fn init_test(cx: &mut TestAppContext) -> (Entity<Project>, Entity<Workspace>) {
-        let params = cx.update(AppState::test);
-        cx.update(|cx| {
-            theme::init(theme::LoadThemes::JustBase, cx);
-        });
-
-        let project = Project::test(params.fs.clone(), [], cx).await;
-        let workspace = cx
-            .add_window(|window, cx| Workspace::test_new(project.clone(), window, cx))
-            .root(cx)
-            .unwrap();
-
-        (project, workspace)
-    }
-
-    /// Creates a worktree with 1 folder: /root{suffix}/
-    async fn create_folder_wt(
-        project: Entity<Project>,
-        path: impl AsRef<Path>,
-        cx: &mut TestAppContext,
-    ) -> (Entity<Worktree>, Entry) {
-        create_wt(project, true, path, cx).await
-    }
-
-    /// Creates a worktree with 1 file: /root{suffix}.txt
-    async fn create_file_wt(
-        project: Entity<Project>,
-        path: impl AsRef<Path>,
-        cx: &mut TestAppContext,
-    ) -> (Entity<Worktree>, Entry) {
-        create_wt(project, false, path, cx).await
-    }
-
-    async fn create_wt(
-        project: Entity<Project>,
-        is_dir: bool,
-        path: impl AsRef<Path>,
-        cx: &mut TestAppContext,
-    ) -> (Entity<Worktree>, Entry) {
-        let (wt, _) = project
-            .update(cx, |project, cx| {
-                project.find_or_create_worktree(path, true, cx)
-            })
-            .await
-            .unwrap();
-
-        let entry = cx
-            .update(|cx| {
-                wt.update(cx, |wt, cx| {
-                    wt.create_entry(RelPath::empty().into(), is_dir, None, cx)
-                })
-            })
-            .await
-            .unwrap()
-            .into_included()
-            .unwrap();
-
-        (wt, entry)
-    }
-
-    pub fn insert_active_entry_for(
-        wt: Entity<Worktree>,
-        entry: Entry,
-        project: Entity<Project>,
-        cx: &mut TestAppContext,
-    ) {
-        cx.update(|cx| {
-            let p = ProjectPath {
-                worktree_id: wt.read(cx).id(),
-                path: entry.path,
-            };
-            project.update(cx, |project, cx| project.set_active_path(Some(p), cx));
-        });
-    }
-}
diff --git a/crates/text/Cargo.toml b/crates/text/Cargo.toml
deleted file mode 100644
index ed02381eb8..0000000000
--- a/crates/text/Cargo.toml
+++ /dev/null
@@ -1,39 +0,0 @@
-[package]
-name = "text"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/text.rs"
-doctest = false
-
-[features]
-test-support = ["rand", "util/test-support"]
-
-[dependencies]
-anyhow.workspace = true
-clock.workspace = true
-collections.workspace = true
-log.workspace = true
-parking_lot.workspace = true
-postage.workspace = true
-rand = { workspace = true, optional = true }
-regex.workspace = true
-rope.workspace = true
-smallvec.workspace = true
-sum_tree.workspace = true
-util.workspace = true
-
-[dev-dependencies]
-collections = { workspace = true, features = ["test-support"] }
-ctor.workspace = true
-gpui = { workspace = true, features = ["test-support"] }
-rand.workspace = true
-util = { workspace = true, features = ["test-support"] }
-http_client = { workspace = true, features = ["test-support"] }
-zlog.workspace = true
diff --git a/crates/text/LICENSE-GPL b/crates/text/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/text/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/text/src/anchor.rs b/crates/text/src/anchor.rs
deleted file mode 100644
index bf660b1302..0000000000
--- a/crates/text/src/anchor.rs
+++ /dev/null
@@ -1,219 +0,0 @@
-use crate::{
-    BufferId, BufferSnapshot, Point, PointUtf16, TextDimension, ToOffset, ToPoint, ToPointUtf16,
-    locator::Locator,
-};
-use std::{cmp::Ordering, fmt::Debug, ops::Range};
-use sum_tree::{Bias, Dimensions};
-
-/// A timestamped position in a buffer
-#[derive(Copy, Clone, Eq, PartialEq, Hash)]
-pub struct Anchor {
-    /// The timestamp of the operation that inserted the text
-    /// in which this anchor is located.
-    pub timestamp: clock::Lamport,
-    /// The byte offset into the text inserted in the operation
-    /// at `timestamp`.
-    pub offset: usize,
-    /// Whether this anchor stays attached to the character *before* or *after*
-    /// the offset.
-    pub bias: Bias,
-    pub buffer_id: Option<BufferId>,
-}
-
-impl Debug for Anchor {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        if self.is_min() {
-            return write!(f, "Anchor::min({:?})", self.buffer_id);
-        }
-        if self.is_max() {
-            return write!(f, "Anchor::max({:?})", self.buffer_id);
-        }
-
-        f.debug_struct("Anchor")
-            .field("timestamp", &self.timestamp)
-            .field("offset", &self.offset)
-            .field("bias", &self.bias)
-            .field("buffer_id", &self.buffer_id)
-            .finish()
-    }
-}
-
-impl Anchor {
-    pub const MIN: Self = Self {
-        timestamp: clock::Lamport::MIN,
-        offset: usize::MIN,
-        bias: Bias::Left,
-        buffer_id: None,
-    };
-
-    pub const MAX: Self = Self {
-        timestamp: clock::Lamport::MAX,
-        offset: usize::MAX,
-        bias: Bias::Right,
-        buffer_id: None,
-    };
-
-    pub fn min_for_buffer(buffer_id: BufferId) -> Self {
-        Self {
-            timestamp: clock::Lamport::MIN,
-            offset: usize::MIN,
-            bias: Bias::Left,
-            buffer_id: Some(buffer_id),
-        }
-    }
-
-    pub fn max_for_buffer(buffer_id: BufferId) -> Self {
-        Self {
-            timestamp: clock::Lamport::MAX,
-            offset: usize::MAX,
-            bias: Bias::Right,
-            buffer_id: Some(buffer_id),
-        }
-    }
-
-    pub fn min_min_range_for_buffer(buffer_id: BufferId) -> std::ops::Range<Self> {
-        let min = Self::min_for_buffer(buffer_id);
-        min..min
-    }
-    pub fn max_max_range_for_buffer(buffer_id: BufferId) -> std::ops::Range<Self> {
-        let max = Self::max_for_buffer(buffer_id);
-        max..max
-    }
-    pub fn min_max_range_for_buffer(buffer_id: BufferId) -> std::ops::Range<Self> {
-        Self::min_for_buffer(buffer_id)..Self::max_for_buffer(buffer_id)
-    }
-
-    pub fn cmp(&self, other: &Anchor, buffer: &BufferSnapshot) -> Ordering {
-        let fragment_id_comparison = if self.timestamp == other.timestamp {
-            Ordering::Equal
-        } else {
-            buffer
-                .fragment_id_for_anchor(self)
-                .cmp(buffer.fragment_id_for_anchor(other))
-        };
-
-        fragment_id_comparison
-            .then_with(|| self.offset.cmp(&other.offset))
-            .then_with(|| self.bias.cmp(&other.bias))
-    }
-
-    pub fn min<'a>(&'a self, other: &'a Self, buffer: &BufferSnapshot) -> &'a Self {
-        if self.cmp(other, buffer).is_le() {
-            self
-        } else {
-            other
-        }
-    }
-
-    pub fn max<'a>(&'a self, other: &'a Self, buffer: &BufferSnapshot) -> &'a Self {
-        if self.cmp(other, buffer).is_ge() {
-            self
-        } else {
-            other
-        }
-    }
-
-    pub fn bias(&self, bias: Bias, buffer: &BufferSnapshot) -> Anchor {
-        match bias {
-            Bias::Left => self.bias_left(buffer),
-            Bias::Right => self.bias_right(buffer),
-        }
-    }
-
-    pub fn bias_left(&self, buffer: &BufferSnapshot) -> Anchor {
-        match self.bias {
-            Bias::Left => *self,
-            Bias::Right => buffer.anchor_before(self),
-        }
-    }
-
-    pub fn bias_right(&self, buffer: &BufferSnapshot) -> Anchor {
-        match self.bias {
-            Bias::Left => buffer.anchor_after(self),
-            Bias::Right => *self,
-        }
-    }
-
-    pub fn summary<D>(&self, content: &BufferSnapshot) -> D
-    where
-        D: TextDimension,
-    {
-        content.summary_for_anchor(self)
-    }
-
-    /// Returns true when the [`Anchor`] is located inside a visible fragment.
-    pub fn is_valid(&self, buffer: &BufferSnapshot) -> bool {
-        if self.is_min() || self.is_max() {
-            true
-        } else if self.buffer_id.is_none_or(|id| id != buffer.remote_id) {
-            false
-        } else {
-            let Some(fragment_id) = buffer.try_fragment_id_for_anchor(self) else {
-                return false;
-            };
-            let (.., item) = buffer
-                .fragments
-                .find::<Dimensions<Option<&Locator>, usize>, _>(
-                    &None,
-                    &Some(fragment_id),
-                    Bias::Left,
-                );
-            item.is_some_and(|fragment| fragment.visible)
-        }
-    }
-
-    pub fn is_min(&self) -> bool {
-        self.timestamp == clock::Lamport::MIN
-            && self.offset == usize::MIN
-            && self.bias == Bias::Left
-    }
-
-    pub fn is_max(&self) -> bool {
-        self.timestamp == clock::Lamport::MAX
-            && self.offset == usize::MAX
-            && self.bias == Bias::Right
-    }
-}
-
-pub trait OffsetRangeExt {
-    fn to_offset(&self, snapshot: &BufferSnapshot) -> Range<usize>;
-    fn to_point(&self, snapshot: &BufferSnapshot) -> Range<Point>;
-    fn to_point_utf16(&self, snapshot: &BufferSnapshot) -> Range<PointUtf16>;
-}
-
-impl<T> OffsetRangeExt for Range<T>
-where
-    T: ToOffset,
-{
-    fn to_offset(&self, snapshot: &BufferSnapshot) -> Range<usize> {
-        self.start.to_offset(snapshot)..self.end.to_offset(snapshot)
-    }
-
-    fn to_point(&self, snapshot: &BufferSnapshot) -> Range<Point> {
-        self.start.to_offset(snapshot).to_point(snapshot)
-            ..self.end.to_offset(snapshot).to_point(snapshot)
-    }
-
-    fn to_point_utf16(&self, snapshot: &BufferSnapshot) -> Range<PointUtf16> {
-        self.start.to_offset(snapshot).to_point_utf16(snapshot)
-            ..self.end.to_offset(snapshot).to_point_utf16(snapshot)
-    }
-}
-
-pub trait AnchorRangeExt {
-    fn cmp(&self, b: &Range<Anchor>, buffer: &BufferSnapshot) -> Ordering;
-    fn overlaps(&self, b: &Range<Anchor>, buffer: &BufferSnapshot) -> bool;
-}
-
-impl AnchorRangeExt for Range<Anchor> {
-    fn cmp(&self, other: &Range<Anchor>, buffer: &BufferSnapshot) -> Ordering {
-        match self.start.cmp(&other.start, buffer) {
-            Ordering::Equal => other.end.cmp(&self.end, buffer),
-            ord => ord,
-        }
-    }
-
-    fn overlaps(&self, other: &Range<Anchor>, buffer: &BufferSnapshot) -> bool {
-        self.start.cmp(&other.end, buffer).is_lt() && other.start.cmp(&self.end, buffer).is_lt()
-    }
-}
diff --git a/crates/text/src/locator.rs b/crates/text/src/locator.rs
deleted file mode 100644
index cc94441a3d..0000000000
--- a/crates/text/src/locator.rs
+++ /dev/null
@@ -1,130 +0,0 @@
-use smallvec::SmallVec;
-use std::iter;
-
-/// An identifier for a position in a ordered collection.
-///
-/// Allows prepending and appending without needing to renumber existing locators
-/// using `Locator::between(lhs, rhs)`.
-///
-/// The initial location for a collection should be `Locator::between(Locator::min(), Locator::max())`,
-/// leaving room for items to be inserted before and after it.
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct Locator(SmallVec<[u64; 4]>);
-
-impl Locator {
-    pub const fn min() -> Self {
-        // SAFETY: 1 is <= 4
-        Self(unsafe { SmallVec::from_const_with_len_unchecked([u64::MIN; 4], 1) })
-    }
-
-    pub const fn max() -> Self {
-        // SAFETY: 1 is <= 4
-        Self(unsafe { SmallVec::from_const_with_len_unchecked([u64::MAX; 4], 1) })
-    }
-
-    pub const fn min_ref() -> &'static Self {
-        const { &Self::min() }
-    }
-
-    pub const fn max_ref() -> &'static Self {
-        const { &Self::max() }
-    }
-
-    pub fn assign(&mut self, other: &Self) {
-        self.0.resize(other.0.len(), 0);
-        self.0.copy_from_slice(&other.0);
-    }
-
-    pub fn between(lhs: &Self, rhs: &Self) -> Self {
-        let lhs = lhs.0.iter().copied().chain(iter::repeat(u64::MIN));
-        let rhs = rhs.0.iter().copied().chain(iter::repeat(u64::MAX));
-        let mut location = SmallVec::new();
-        for (lhs, rhs) in lhs.zip(rhs) {
-            let mid = lhs + ((rhs.saturating_sub(lhs)) >> 48);
-            location.push(mid);
-            if mid > lhs {
-                break;
-            }
-        }
-        Self(location)
-    }
-
-    pub fn len(&self) -> usize {
-        self.0.len()
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.len() == 0
-    }
-}
-
-impl Default for Locator {
-    fn default() -> Self {
-        Self::min()
-    }
-}
-
-impl sum_tree::Item for Locator {
-    type Summary = Locator;
-
-    fn summary(&self, _cx: ()) -> Self::Summary {
-        self.clone()
-    }
-}
-
-impl sum_tree::KeyedItem for Locator {
-    type Key = Locator;
-
-    fn key(&self) -> Self::Key {
-        self.clone()
-    }
-}
-
-impl sum_tree::ContextLessSummary for Locator {
-    fn zero() -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, summary: &Self) {
-        self.assign(summary);
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use rand::prelude::*;
-    use std::mem;
-
-    #[gpui::test(iterations = 100)]
-    fn test_locators(mut rng: StdRng) {
-        let mut lhs = Default::default();
-        let mut rhs = Default::default();
-        while lhs == rhs {
-            lhs = Locator(
-                (0..rng.random_range(1..=5))
-                    .map(|_| rng.random_range(0..=100))
-                    .collect(),
-            );
-            rhs = Locator(
-                (0..rng.random_range(1..=5))
-                    .map(|_| rng.random_range(0..=100))
-                    .collect(),
-            );
-        }
-
-        if lhs > rhs {
-            mem::swap(&mut lhs, &mut rhs);
-        }
-
-        let middle = Locator::between(&lhs, &rhs);
-        assert!(middle > lhs);
-        assert!(middle < rhs);
-        for ix in 0..middle.0.len() - 1 {
-            assert!(
-                middle.0[ix] == *lhs.0.get(ix).unwrap_or(&0)
-                    || middle.0[ix] == *rhs.0.get(ix).unwrap_or(&0)
-            );
-        }
-    }
-}
diff --git a/crates/text/src/network.rs b/crates/text/src/network.rs
deleted file mode 100644
index d0d1b650ad..0000000000
--- a/crates/text/src/network.rs
+++ /dev/null
@@ -1,94 +0,0 @@
-use std::fmt::Debug;
-
-use clock::ReplicaId;
-use collections::{BTreeMap, HashSet};
-
-pub struct Network<T: Clone, R: rand::Rng> {
-    inboxes: BTreeMap<ReplicaId, Vec<Envelope<T>>>,
-    disconnected_peers: HashSet<ReplicaId>,
-    rng: R,
-}
-
-#[derive(Clone, Debug)]
-struct Envelope<T: Clone> {
-    message: T,
-}
-
-impl<T: Clone, R: rand::Rng> Network<T, R> {
-    pub fn new(rng: R) -> Self {
-        Network {
-            inboxes: BTreeMap::default(),
-            disconnected_peers: HashSet::default(),
-            rng,
-        }
-    }
-
-    pub fn add_peer(&mut self, id: ReplicaId) {
-        self.inboxes.insert(id, Vec::new());
-    }
-
-    pub fn disconnect_peer(&mut self, id: ReplicaId) {
-        self.disconnected_peers.insert(id);
-        self.inboxes.get_mut(&id).unwrap().clear();
-    }
-
-    pub fn reconnect_peer(&mut self, id: ReplicaId, replicate_from: ReplicaId) {
-        assert!(self.disconnected_peers.remove(&id));
-        self.replicate(replicate_from, id);
-    }
-
-    pub fn is_disconnected(&self, id: ReplicaId) -> bool {
-        self.disconnected_peers.contains(&id)
-    }
-
-    pub fn contains_disconnected_peers(&self) -> bool {
-        !self.disconnected_peers.is_empty()
-    }
-
-    pub fn replicate(&mut self, old_replica_id: ReplicaId, new_replica_id: ReplicaId) {
-        self.inboxes
-            .insert(new_replica_id, self.inboxes[&old_replica_id].clone());
-    }
-
-    pub fn is_idle(&self) -> bool {
-        self.inboxes.values().all(|i| i.is_empty())
-    }
-
-    pub fn broadcast(&mut self, sender: ReplicaId, messages: Vec<T>) {
-        // Drop messages from disconnected peers.
-        if self.disconnected_peers.contains(&sender) {
-            return;
-        }
-
-        for (replica, inbox) in self.inboxes.iter_mut() {
-            if *replica != sender && !self.disconnected_peers.contains(replica) {
-                for message in &messages {
-                    // Insert one or more duplicates of this message, potentially *before* the previous
-                    // message sent by this peer to simulate out-of-order delivery.
-                    for _ in 0..self.rng.random_range(1..4) {
-                        let insertion_index = self.rng.random_range(0..inbox.len() + 1);
-                        inbox.insert(
-                            insertion_index,
-                            Envelope {
-                                message: message.clone(),
-                            },
-                        );
-                    }
-                }
-            }
-        }
-    }
-
-    pub fn has_unreceived(&self, receiver: ReplicaId) -> bool {
-        !self.inboxes[&receiver].is_empty()
-    }
-
-    pub fn receive(&mut self, receiver: ReplicaId) -> Vec<T> {
-        let inbox = self.inboxes.get_mut(&receiver).unwrap();
-        let count = self.rng.random_range(0..inbox.len() + 1);
-        inbox
-            .drain(0..count)
-            .map(|envelope| envelope.message)
-            .collect()
-    }
-}
diff --git a/crates/text/src/operation_queue.rs b/crates/text/src/operation_queue.rs
deleted file mode 100644
index f87af381ff..0000000000
--- a/crates/text/src/operation_queue.rs
+++ /dev/null
@@ -1,165 +0,0 @@
-use clock::Lamport;
-use std::{fmt::Debug, ops::Add};
-use sum_tree::{ContextLessSummary, Dimension, Edit, Item, KeyedItem, SumTree};
-
-pub trait Operation: Clone + Debug {
-    fn lamport_timestamp(&self) -> clock::Lamport;
-}
-
-#[derive(Clone, Debug)]
-struct OperationItem<T>(T);
-
-#[derive(Clone, Debug)]
-pub struct OperationQueue<T: Operation>(SumTree<OperationItem<T>>);
-
-#[derive(Clone, Copy, Debug, Eq, Ord, PartialEq, PartialOrd)]
-pub struct OperationKey(clock::Lamport);
-
-#[derive(Clone, Copy, Debug, Eq, PartialEq)]
-pub struct OperationSummary {
-    pub key: OperationKey,
-    pub len: usize,
-}
-
-impl OperationKey {
-    pub fn new(timestamp: clock::Lamport) -> Self {
-        Self(timestamp)
-    }
-}
-
-impl<T: Operation> Default for OperationQueue<T> {
-    fn default() -> Self {
-        OperationQueue::new()
-    }
-}
-
-impl<T: Operation> OperationQueue<T> {
-    pub fn new() -> Self {
-        OperationQueue(SumTree::default())
-    }
-
-    pub fn len(&self) -> usize {
-        self.0.summary().len
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.len() == 0
-    }
-
-    pub fn insert(&mut self, mut ops: Vec<T>) {
-        ops.sort_by_key(|op| op.lamport_timestamp());
-        ops.dedup_by_key(|op| op.lamport_timestamp());
-        self.0.edit(
-            ops.into_iter()
-                .map(|op| Edit::Insert(OperationItem(op)))
-                .collect(),
-            (),
-        );
-    }
-
-    pub fn drain(&mut self) -> Self {
-        let clone = self.clone();
-        self.0 = SumTree::default();
-        clone
-    }
-
-    pub fn iter(&self) -> impl Iterator<Item = &T> {
-        self.0.iter().map(|i| &i.0)
-    }
-}
-
-impl ContextLessSummary for OperationSummary {
-    fn zero() -> Self {
-        OperationSummary {
-            key: OperationKey::new(Lamport::MIN),
-            len: 0,
-        }
-    }
-
-    fn add_summary(&mut self, other: &Self) {
-        assert!(self.key < other.key);
-        self.key = other.key;
-        self.len += other.len;
-    }
-}
-
-impl Add<&Self> for OperationSummary {
-    type Output = Self;
-
-    fn add(self, other: &Self) -> Self {
-        assert!(self.key < other.key);
-        OperationSummary {
-            key: other.key,
-            len: self.len + other.len,
-        }
-    }
-}
-
-impl Dimension<'_, OperationSummary> for OperationKey {
-    fn zero(_cx: ()) -> Self {
-        OperationKey::new(Lamport::MIN)
-    }
-
-    fn add_summary(&mut self, summary: &OperationSummary, _: ()) {
-        assert!(*self <= summary.key);
-        *self = summary.key;
-    }
-}
-
-impl<T: Operation> Item for OperationItem<T> {
-    type Summary = OperationSummary;
-
-    fn summary(&self, _cx: ()) -> Self::Summary {
-        OperationSummary {
-            key: OperationKey::new(self.0.lamport_timestamp()),
-            len: 1,
-        }
-    }
-}
-
-impl<T: Operation> KeyedItem for OperationItem<T> {
-    type Key = OperationKey;
-
-    fn key(&self) -> Self::Key {
-        OperationKey::new(self.0.lamport_timestamp())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use clock::ReplicaId;
-
-    use super::*;
-
-    #[test]
-    fn test_len() {
-        let mut clock = clock::Lamport::new(ReplicaId::LOCAL);
-
-        let mut queue = OperationQueue::new();
-        assert_eq!(queue.len(), 0);
-
-        queue.insert(vec![
-            TestOperation(clock.tick()),
-            TestOperation(clock.tick()),
-        ]);
-        assert_eq!(queue.len(), 2);
-
-        queue.insert(vec![TestOperation(clock.tick())]);
-        assert_eq!(queue.len(), 3);
-
-        drop(queue.drain());
-        assert_eq!(queue.len(), 0);
-
-        queue.insert(vec![TestOperation(clock.tick())]);
-        assert_eq!(queue.len(), 1);
-    }
-
-    #[derive(Clone, Debug, Eq, PartialEq)]
-    struct TestOperation(clock::Lamport);
-
-    impl Operation for TestOperation {
-        fn lamport_timestamp(&self) -> clock::Lamport {
-            self.0
-        }
-    }
-}
diff --git a/crates/text/src/patch.rs b/crates/text/src/patch.rs
deleted file mode 100644
index ec495f60fd..0000000000
--- a/crates/text/src/patch.rs
+++ /dev/null
@@ -1,608 +0,0 @@
-use crate::Edit;
-use std::{
-    cmp, mem,
-    ops::{Add, AddAssign, Sub},
-};
-
-#[derive(Clone, Default, Debug, PartialEq, Eq)]
-pub struct Patch<T>(Vec<Edit<T>>);
-
-impl<T> Patch<T>
-where
-    T: 'static + Clone + Copy + Ord + Default,
-{
-    pub fn new(edits: Vec<Edit<T>>) -> Self {
-        #[cfg(debug_assertions)]
-        {
-            let mut last_edit: Option<&Edit<T>> = None;
-            for edit in &edits {
-                if let Some(last_edit) = last_edit {
-                    assert!(edit.old.start > last_edit.old.end);
-                    assert!(edit.new.start > last_edit.new.end);
-                }
-                last_edit = Some(edit);
-            }
-        }
-        Self(edits)
-    }
-
-    pub fn edits(&self) -> &[Edit<T>] {
-        &self.0
-    }
-
-    pub fn into_inner(self) -> Vec<Edit<T>> {
-        self.0
-    }
-    pub fn invert(&mut self) -> &mut Self {
-        for edit in &mut self.0 {
-            mem::swap(&mut edit.old, &mut edit.new);
-        }
-        self
-    }
-
-    pub fn clear(&mut self) {
-        self.0.clear();
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.0.is_empty()
-    }
-
-    pub fn push(&mut self, edit: Edit<T>) {
-        if edit.is_empty() {
-            return;
-        }
-
-        if let Some(last) = self.0.last_mut() {
-            if last.old.end >= edit.old.start {
-                last.old.end = edit.old.end;
-                last.new.end = edit.new.end;
-            } else {
-                self.0.push(edit);
-            }
-        } else {
-            self.0.push(edit);
-        }
-    }
-}
-
-impl<T, TDelta> Patch<T>
-where
-    T: 'static
-        + Copy
-        + Ord
-        + Sub<T, Output = TDelta>
-        + Add<TDelta, Output = T>
-        + AddAssign<TDelta>
-        + Default,
-    TDelta: Ord + Copy,
-{
-    #[must_use]
-    pub fn compose(&self, new_edits_iter: impl IntoIterator<Item = Edit<T>>) -> Self {
-        let mut old_edits_iter = self.0.iter().cloned().peekable();
-        let mut new_edits_iter = new_edits_iter.into_iter().peekable();
-        let mut composed = Patch(Vec::new());
-
-        let mut old_start = T::default();
-        let mut new_start = T::default();
-        loop {
-            let old_edit = old_edits_iter.peek_mut();
-            let new_edit = new_edits_iter.peek_mut();
-
-            // Push the old edit if its new end is before the new edit's old start.
-            if let Some(old_edit) = old_edit.as_ref() {
-                let new_edit = new_edit.as_ref();
-                if new_edit.is_none_or(|new_edit| old_edit.new.end < new_edit.old.start) {
-                    let catchup = old_edit.old.start - old_start;
-                    old_start += catchup;
-                    new_start += catchup;
-
-                    let old_end = old_start + old_edit.old_len();
-                    let new_end = new_start + old_edit.new_len();
-                    composed.push(Edit {
-                        old: old_start..old_end,
-                        new: new_start..new_end,
-                    });
-                    old_start = old_end;
-                    new_start = new_end;
-                    old_edits_iter.next();
-                    continue;
-                }
-            }
-
-            // Push the new edit if its old end is before the old edit's new start.
-            if let Some(new_edit) = new_edit.as_ref() {
-                let old_edit = old_edit.as_ref();
-                if old_edit.is_none_or(|old_edit| new_edit.old.end < old_edit.new.start) {
-                    let catchup = new_edit.new.start - new_start;
-                    old_start += catchup;
-                    new_start += catchup;
-
-                    let old_end = old_start + new_edit.old_len();
-                    let new_end = new_start + new_edit.new_len();
-                    composed.push(Edit {
-                        old: old_start..old_end,
-                        new: new_start..new_end,
-                    });
-                    old_start = old_end;
-                    new_start = new_end;
-                    new_edits_iter.next();
-                    continue;
-                }
-            }
-
-            // If we still have edits by this point then they must intersect, so we compose them.
-            if let Some((old_edit, new_edit)) = old_edit.zip(new_edit) {
-                if old_edit.new.start < new_edit.old.start {
-                    let catchup = old_edit.old.start - old_start;
-                    old_start += catchup;
-                    new_start += catchup;
-
-                    let overshoot = new_edit.old.start - old_edit.new.start;
-                    let old_end = cmp::min(old_start + overshoot, old_edit.old.end);
-                    let new_end = new_start + overshoot;
-                    composed.push(Edit {
-                        old: old_start..old_end,
-                        new: new_start..new_end,
-                    });
-
-                    old_edit.old.start = old_end;
-                    old_edit.new.start += overshoot;
-                    old_start = old_end;
-                    new_start = new_end;
-                } else {
-                    let catchup = new_edit.new.start - new_start;
-                    old_start += catchup;
-                    new_start += catchup;
-
-                    let overshoot = old_edit.new.start - new_edit.old.start;
-                    let old_end = old_start + overshoot;
-                    let new_end = cmp::min(new_start + overshoot, new_edit.new.end);
-                    composed.push(Edit {
-                        old: old_start..old_end,
-                        new: new_start..new_end,
-                    });
-
-                    new_edit.old.start += overshoot;
-                    new_edit.new.start = new_end;
-                    old_start = old_end;
-                    new_start = new_end;
-                }
-
-                if old_edit.new.end > new_edit.old.end {
-                    let old_end = old_start + cmp::min(old_edit.old_len(), new_edit.old_len());
-                    let new_end = new_start + new_edit.new_len();
-                    composed.push(Edit {
-                        old: old_start..old_end,
-                        new: new_start..new_end,
-                    });
-
-                    old_edit.old.start = old_end;
-                    old_edit.new.start = new_edit.old.end;
-                    old_start = old_end;
-                    new_start = new_end;
-                    new_edits_iter.next();
-                } else {
-                    let old_end = old_start + old_edit.old_len();
-                    let new_end = new_start + cmp::min(old_edit.new_len(), new_edit.new_len());
-                    composed.push(Edit {
-                        old: old_start..old_end,
-                        new: new_start..new_end,
-                    });
-
-                    new_edit.old.start = old_edit.new.end;
-                    new_edit.new.start = new_end;
-                    old_start = old_end;
-                    new_start = new_end;
-                    old_edits_iter.next();
-                }
-            } else {
-                break;
-            }
-        }
-
-        composed
-    }
-
-    pub fn old_to_new(&self, old: T) -> T {
-        let ix = match self.0.binary_search_by(|probe| probe.old.start.cmp(&old)) {
-            Ok(ix) => ix,
-            Err(ix) => {
-                if ix == 0 {
-                    return old;
-                } else {
-                    ix - 1
-                }
-            }
-        };
-        if let Some(edit) = self.0.get(ix) {
-            if old >= edit.old.end {
-                edit.new.end + (old - edit.old.end)
-            } else {
-                edit.new.start
-            }
-        } else {
-            old
-        }
-    }
-}
-
-impl<T> Patch<T> {
-    pub fn retain_mut<F>(&mut self, f: F)
-    where
-        F: FnMut(&mut Edit<T>) -> bool,
-    {
-        self.0.retain_mut(f);
-    }
-}
-
-impl<T: Clone> IntoIterator for Patch<T> {
-    type Item = Edit<T>;
-    type IntoIter = std::vec::IntoIter<Edit<T>>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        self.0.into_iter()
-    }
-}
-
-impl<'a, T: Clone> IntoIterator for &'a Patch<T> {
-    type Item = Edit<T>;
-    type IntoIter = std::iter::Cloned<std::slice::Iter<'a, Edit<T>>>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        self.0.iter().cloned()
-    }
-}
-
-impl<'a, T: Clone> IntoIterator for &'a mut Patch<T> {
-    type Item = Edit<T>;
-    type IntoIter = std::iter::Cloned<std::slice::Iter<'a, Edit<T>>>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        self.0.iter().cloned()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use rand::prelude::*;
-    use std::env;
-
-    #[gpui::test]
-    fn test_one_disjoint_edit() {
-        assert_patch_composition(
-            Patch(vec![Edit {
-                old: 1..3,
-                new: 1..4,
-            }]),
-            Patch(vec![Edit {
-                old: 0..0,
-                new: 0..4,
-            }]),
-            Patch(vec![
-                Edit {
-                    old: 0..0,
-                    new: 0..4,
-                },
-                Edit {
-                    old: 1..3,
-                    new: 5..8,
-                },
-            ]),
-        );
-
-        assert_patch_composition(
-            Patch(vec![Edit {
-                old: 1..3,
-                new: 1..4,
-            }]),
-            Patch(vec![Edit {
-                old: 5..9,
-                new: 5..7,
-            }]),
-            Patch(vec![
-                Edit {
-                    old: 1..3,
-                    new: 1..4,
-                },
-                Edit {
-                    old: 4..8,
-                    new: 5..7,
-                },
-            ]),
-        );
-    }
-
-    #[gpui::test]
-    fn test_one_overlapping_edit() {
-        assert_patch_composition(
-            Patch(vec![Edit {
-                old: 1..3,
-                new: 1..4,
-            }]),
-            Patch(vec![Edit {
-                old: 3..5,
-                new: 3..6,
-            }]),
-            Patch(vec![Edit {
-                old: 1..4,
-                new: 1..6,
-            }]),
-        );
-    }
-
-    #[gpui::test]
-    fn test_two_disjoint_and_overlapping() {
-        assert_patch_composition(
-            Patch(vec![
-                Edit {
-                    old: 1..3,
-                    new: 1..4,
-                },
-                Edit {
-                    old: 8..12,
-                    new: 9..11,
-                },
-            ]),
-            Patch(vec![
-                Edit {
-                    old: 0..0,
-                    new: 0..4,
-                },
-                Edit {
-                    old: 3..10,
-                    new: 7..9,
-                },
-            ]),
-            Patch(vec![
-                Edit {
-                    old: 0..0,
-                    new: 0..4,
-                },
-                Edit {
-                    old: 1..12,
-                    new: 5..10,
-                },
-            ]),
-        );
-    }
-
-    #[gpui::test]
-    fn test_two_new_edits_overlapping_one_old_edit() {
-        assert_patch_composition(
-            Patch(vec![Edit {
-                old: 0..0,
-                new: 0..3,
-            }]),
-            Patch(vec![
-                Edit {
-                    old: 0..0,
-                    new: 0..1,
-                },
-                Edit {
-                    old: 1..2,
-                    new: 2..2,
-                },
-            ]),
-            Patch(vec![Edit {
-                old: 0..0,
-                new: 0..3,
-            }]),
-        );
-
-        assert_patch_composition(
-            Patch(vec![Edit {
-                old: 2..3,
-                new: 2..4,
-            }]),
-            Patch(vec![
-                Edit {
-                    old: 0..2,
-                    new: 0..1,
-                },
-                Edit {
-                    old: 3..3,
-                    new: 2..5,
-                },
-            ]),
-            Patch(vec![Edit {
-                old: 0..3,
-                new: 0..6,
-            }]),
-        );
-
-        assert_patch_composition(
-            Patch(vec![Edit {
-                old: 0..0,
-                new: 0..2,
-            }]),
-            Patch(vec![
-                Edit {
-                    old: 0..0,
-                    new: 0..2,
-                },
-                Edit {
-                    old: 2..5,
-                    new: 4..4,
-                },
-            ]),
-            Patch(vec![Edit {
-                old: 0..3,
-                new: 0..4,
-            }]),
-        );
-    }
-
-    #[gpui::test]
-    fn test_two_new_edits_touching_one_old_edit() {
-        assert_patch_composition(
-            Patch(vec![
-                Edit {
-                    old: 2..3,
-                    new: 2..4,
-                },
-                Edit {
-                    old: 7..7,
-                    new: 8..11,
-                },
-            ]),
-            Patch(vec![
-                Edit {
-                    old: 2..3,
-                    new: 2..2,
-                },
-                Edit {
-                    old: 4..4,
-                    new: 3..4,
-                },
-            ]),
-            Patch(vec![
-                Edit {
-                    old: 2..3,
-                    new: 2..4,
-                },
-                Edit {
-                    old: 7..7,
-                    new: 8..11,
-                },
-            ]),
-        );
-    }
-
-    #[gpui::test]
-    fn test_old_to_new() {
-        let patch = Patch(vec![
-            Edit {
-                old: 2..4,
-                new: 2..4,
-            },
-            Edit {
-                old: 7..8,
-                new: 7..11,
-            },
-        ]);
-        assert_eq!(patch.old_to_new(0), 0);
-        assert_eq!(patch.old_to_new(1), 1);
-        assert_eq!(patch.old_to_new(2), 2);
-        assert_eq!(patch.old_to_new(3), 2);
-        assert_eq!(patch.old_to_new(4), 4);
-        assert_eq!(patch.old_to_new(5), 5);
-        assert_eq!(patch.old_to_new(6), 6);
-        assert_eq!(patch.old_to_new(7), 7);
-        assert_eq!(patch.old_to_new(8), 11);
-        assert_eq!(patch.old_to_new(9), 12);
-    }
-
-    #[gpui::test(iterations = 100)]
-    fn test_random_patch_compositions(mut rng: StdRng) {
-        let operations = env::var("OPERATIONS")
-            .map(|i| i.parse().expect("invalid `OPERATIONS` variable"))
-            .unwrap_or(20);
-
-        let initial_chars = (0..rng.random_range(0..=100))
-            .map(|_| rng.random_range(b'a'..=b'z') as char)
-            .collect::<Vec<_>>();
-        log::info!("initial chars: {:?}", initial_chars);
-
-        // Generate two sequential patches
-        let mut patches = Vec::new();
-        let mut expected_chars = initial_chars.clone();
-        for i in 0..2 {
-            log::info!("patch {}:", i);
-
-            let mut delta = 0i32;
-            let mut last_edit_end = 0;
-            let mut edits = Vec::new();
-
-            for _ in 0..operations {
-                if last_edit_end >= expected_chars.len() {
-                    break;
-                }
-
-                let end = rng.random_range(last_edit_end..=expected_chars.len());
-                let start = rng.random_range(last_edit_end..=end);
-                let old_len = end - start;
-
-                let mut new_len = rng.random_range(0..=3);
-                if start == end && new_len == 0 {
-                    new_len += 1;
-                }
-
-                last_edit_end = start + new_len + 1;
-
-                let new_chars = (0..new_len)
-                    .map(|_| rng.random_range(b'A'..=b'Z') as char)
-                    .collect::<Vec<_>>();
-                log::info!(
-                    "  editing {:?}: {:?}",
-                    start..end,
-                    new_chars.iter().collect::<String>()
-                );
-                edits.push(Edit {
-                    old: (start as i32 - delta) as u32..(end as i32 - delta) as u32,
-                    new: start as u32..(start + new_len) as u32,
-                });
-                expected_chars.splice(start..end, new_chars);
-
-                delta += new_len as i32 - old_len as i32;
-            }
-
-            patches.push(Patch(edits));
-        }
-
-        log::info!("old patch: {:?}", &patches[0]);
-        log::info!("new patch: {:?}", &patches[1]);
-        log::info!("initial chars: {:?}", initial_chars);
-        log::info!("final chars: {:?}", expected_chars);
-
-        // Compose the patches, and verify that it has the same effect as applying the
-        // two patches separately.
-        let composed = patches[0].compose(&patches[1]);
-        log::info!("composed patch: {:?}", &composed);
-
-        let mut actual_chars = initial_chars;
-        for edit in composed.0 {
-            actual_chars.splice(
-                edit.new.start as usize..edit.new.start as usize + edit.old.len(),
-                expected_chars[edit.new.start as usize..edit.new.end as usize]
-                    .iter()
-                    .copied(),
-            );
-        }
-
-        assert_eq!(actual_chars, expected_chars);
-    }
-
-    #[track_caller]
-    #[allow(clippy::almost_complete_range)]
-    fn assert_patch_composition(old: Patch<u32>, new: Patch<u32>, composed: Patch<u32>) {
-        let original = ('a'..'z').collect::<Vec<_>>();
-        let inserted = ('A'..'Z').collect::<Vec<_>>();
-
-        let mut expected = original.clone();
-        apply_patch(&mut expected, &old, &inserted);
-        apply_patch(&mut expected, &new, &inserted);
-
-        let mut actual = original;
-        apply_patch(&mut actual, &composed, &expected);
-        assert_eq!(
-            actual.into_iter().collect::<String>(),
-            expected.into_iter().collect::<String>(),
-            "expected patch is incorrect"
-        );
-
-        assert_eq!(old.compose(&new), composed);
-    }
-
-    fn apply_patch(text: &mut Vec<char>, patch: &Patch<u32>, new_text: &[char]) {
-        for edit in patch.0.iter().rev() {
-            text.splice(
-                edit.old.start as usize..edit.old.end as usize,
-                new_text[edit.new.start as usize..edit.new.end as usize]
-                    .iter()
-                    .copied(),
-            );
-        }
-    }
-}
diff --git a/crates/text/src/selection.rs b/crates/text/src/selection.rs
deleted file mode 100644
index e355f70c49..0000000000
--- a/crates/text/src/selection.rs
+++ /dev/null
@@ -1,169 +0,0 @@
-use crate::{Anchor, BufferSnapshot, TextDimension};
-use std::cmp::Ordering;
-use std::ops::Range;
-
-#[derive(Default, Copy, Clone, Debug, PartialEq)]
-pub enum SelectionGoal {
-    #[default]
-    None,
-    HorizontalPosition(f64),
-    HorizontalRange {
-        start: f64,
-        end: f64,
-    },
-    WrappedHorizontalPosition((u32, f32)),
-}
-
-#[derive(Clone, Debug, PartialEq)]
-pub struct Selection<T> {
-    pub id: usize,
-    pub start: T,
-    pub end: T,
-    pub reversed: bool,
-    pub goal: SelectionGoal,
-}
-
-impl<T: Clone> Selection<T> {
-    /// A place where the selection had stopped at.
-    pub fn head(&self) -> T {
-        if self.reversed {
-            self.start.clone()
-        } else {
-            self.end.clone()
-        }
-    }
-
-    /// A place where selection was initiated from.
-    pub fn tail(&self) -> T {
-        if self.reversed {
-            self.end.clone()
-        } else {
-            self.start.clone()
-        }
-    }
-
-    pub fn map<F, S>(&self, f: F) -> Selection<S>
-    where
-        F: Fn(T) -> S,
-    {
-        Selection::<S> {
-            id: self.id,
-            start: f(self.start.clone()),
-            end: f(self.end.clone()),
-            reversed: self.reversed,
-            goal: self.goal,
-        }
-    }
-
-    pub fn collapse_to(&mut self, point: T, new_goal: SelectionGoal) {
-        self.start = point.clone();
-        self.end = point;
-        self.goal = new_goal;
-        self.reversed = false;
-    }
-}
-
-impl<T: Copy + Ord> Selection<T> {
-    pub fn is_empty(&self) -> bool {
-        self.start == self.end
-    }
-
-    pub fn set_head(&mut self, head: T, new_goal: SelectionGoal) {
-        if head.cmp(&self.tail()) < Ordering::Equal {
-            if !self.reversed {
-                self.end = self.start;
-                self.reversed = true;
-            }
-            self.start = head;
-        } else {
-            if self.reversed {
-                self.start = self.end;
-                self.reversed = false;
-            }
-            self.end = head;
-        }
-        self.goal = new_goal;
-    }
-
-    pub fn set_tail(&mut self, tail: T, new_goal: SelectionGoal) {
-        if tail.cmp(&self.head()) <= Ordering::Equal {
-            if self.reversed {
-                self.end = self.start;
-                self.reversed = false;
-            }
-            self.start = tail;
-        } else {
-            if !self.reversed {
-                self.start = self.end;
-                self.reversed = true;
-            }
-            self.end = tail;
-        }
-        self.goal = new_goal;
-    }
-
-    pub fn set_head_tail(&mut self, head: T, tail: T, new_goal: SelectionGoal) {
-        if head < tail {
-            self.reversed = true;
-            self.start = head;
-            self.end = tail;
-        } else {
-            self.reversed = false;
-            self.start = tail;
-            self.end = head;
-        }
-        self.goal = new_goal;
-    }
-
-    pub fn swap_head_tail(&mut self) {
-        if self.reversed {
-            self.reversed = false;
-        } else {
-            std::mem::swap(&mut self.start, &mut self.end);
-        }
-    }
-}
-
-impl<T: Copy> Selection<T> {
-    pub fn range(&self) -> Range<T> {
-        self.start..self.end
-    }
-}
-
-impl<T: std::ops::Sub + Copy> Selection<T> {
-    pub fn len(&self) -> <T as std::ops::Sub>::Output {
-        self.end - self.start
-    }
-}
-
-impl<T: Copy + Eq> Selection<T> {
-    #[cfg(feature = "test-support")]
-    pub fn from_offset(offset: T) -> Self {
-        Selection {
-            id: 0,
-            start: offset,
-            end: offset,
-            goal: SelectionGoal::None,
-            reversed: false,
-        }
-    }
-
-    pub fn equals(&self, offset_range: &Range<T>) -> bool {
-        self.start == offset_range.start && self.end == offset_range.end
-    }
-}
-
-impl Selection<Anchor> {
-    pub fn resolve<'a, D: 'a + TextDimension>(
-        &'a self,
-        snapshot: &'a BufferSnapshot,
-    ) -> Selection<D> {
-        Selection {
-            id: self.id,
-            start: snapshot.summary_for_anchor(&self.start),
-            end: snapshot.summary_for_anchor(&self.end),
-            reversed: self.reversed,
-            goal: self.goal,
-        }
-    }
-}
diff --git a/crates/text/src/subscription.rs b/crates/text/src/subscription.rs
deleted file mode 100644
index 50857a2de4..0000000000
--- a/crates/text/src/subscription.rs
+++ /dev/null
@@ -1,67 +0,0 @@
-use crate::{Edit, Patch};
-use parking_lot::Mutex;
-use std::{
-    mem,
-    sync::{Arc, Weak},
-};
-
-#[derive(Default)]
-pub struct Topic<T>(Mutex<Vec<Weak<Mutex<Patch<T>>>>>);
-
-pub struct Subscription<T>(Arc<Mutex<Patch<T>>>);
-
-impl<T: Default, TDelta> Topic<T>
-where
-    T: 'static
-        + Copy
-        + Ord
-        + std::ops::Sub<T, Output = TDelta>
-        + std::ops::Add<TDelta, Output = T>
-        + std::ops::AddAssign<TDelta>
-        + Default,
-    TDelta: Ord + Copy,
-{
-    pub fn subscribe(&mut self) -> Subscription<T> {
-        let subscription = Subscription(Default::default());
-        self.0.get_mut().push(Arc::downgrade(&subscription.0));
-        subscription
-    }
-
-    pub fn publish(&self, edits: impl Clone + IntoIterator<Item = Edit<T>>) {
-        publish(&mut self.0.lock(), edits);
-    }
-
-    pub fn publish_mut(&mut self, edits: impl Clone + IntoIterator<Item = Edit<T>>) {
-        publish(self.0.get_mut(), edits);
-    }
-}
-
-impl<T: Default> Subscription<T> {
-    pub fn consume(&self) -> Patch<T> {
-        mem::take(&mut *self.0.lock())
-    }
-}
-
-fn publish<T, TDelta>(
-    subscriptions: &mut Vec<Weak<Mutex<Patch<T>>>>,
-    edits: impl Clone + IntoIterator<Item = Edit<T>>,
-) where
-    T: 'static
-        + Copy
-        + Ord
-        + std::ops::Sub<T, Output = TDelta>
-        + std::ops::Add<TDelta, Output = T>
-        + std::ops::AddAssign<TDelta>
-        + Default,
-    TDelta: Ord + Copy,
-{
-    subscriptions.retain(|subscription| {
-        if let Some(subscription) = subscription.upgrade() {
-            let mut patch = subscription.lock();
-            *patch = patch.compose(edits.clone());
-            true
-        } else {
-            false
-        }
-    });
-}
diff --git a/crates/text/src/tests.rs b/crates/text/src/tests.rs
deleted file mode 100644
index c9e04e407f..0000000000
--- a/crates/text/src/tests.rs
+++ /dev/null
@@ -1,812 +0,0 @@
-use super::{network::Network, *};
-use clock::ReplicaId;
-use rand::prelude::*;
-use std::{
-    cmp::Ordering,
-    env,
-    iter::Iterator,
-    time::{Duration, Instant},
-};
-
-#[cfg(test)]
-#[ctor::ctor]
-fn init_logger() {
-    zlog::init_test();
-}
-
-#[test]
-fn test_edit() {
-    let mut buffer = Buffer::new(ReplicaId::LOCAL, BufferId::new(1).unwrap(), "abc");
-    assert_eq!(buffer.text(), "abc");
-    buffer.edit([(3..3, "def")]);
-    assert_eq!(buffer.text(), "abcdef");
-    buffer.edit([(0..0, "ghi")]);
-    assert_eq!(buffer.text(), "ghiabcdef");
-    buffer.edit([(5..5, "jkl")]);
-    assert_eq!(buffer.text(), "ghiabjklcdef");
-    buffer.edit([(6..7, "")]);
-    assert_eq!(buffer.text(), "ghiabjlcdef");
-    buffer.edit([(4..9, "mno")]);
-    assert_eq!(buffer.text(), "ghiamnoef");
-}
-
-#[gpui::test(iterations = 100)]
-fn test_random_edits(mut rng: StdRng) {
-    let operations = env::var("OPERATIONS")
-        .map(|i| i.parse().expect("invalid `OPERATIONS` variable"))
-        .unwrap_or(10);
-
-    let reference_string_len = rng.random_range(0..3);
-    let mut reference_string = RandomCharIter::new(&mut rng)
-        .take(reference_string_len)
-        .collect::<String>();
-    let mut buffer = Buffer::new(
-        ReplicaId::LOCAL,
-        BufferId::new(1).unwrap(),
-        reference_string.clone(),
-    );
-    LineEnding::normalize(&mut reference_string);
-
-    buffer.set_group_interval(Duration::from_millis(rng.random_range(0..=200)));
-    let mut buffer_versions = Vec::new();
-    log::info!(
-        "buffer text {:?}, version: {:?}",
-        buffer.text(),
-        buffer.version()
-    );
-
-    for _i in 0..operations {
-        let (edits, _) = buffer.randomly_edit(&mut rng, 5);
-        for (old_range, new_text) in edits.iter().rev() {
-            reference_string.replace_range(old_range.clone(), new_text);
-        }
-
-        assert_eq!(buffer.text(), reference_string);
-        log::info!(
-            "buffer text {:?}, version: {:?}",
-            buffer.text(),
-            buffer.version()
-        );
-
-        if rng.random_bool(0.25) {
-            buffer.randomly_undo_redo(&mut rng);
-            reference_string = buffer.text();
-            log::info!(
-                "buffer text {:?}, version: {:?}",
-                buffer.text(),
-                buffer.version()
-            );
-        }
-
-        let range = buffer.random_byte_range(0, &mut rng);
-        assert_eq!(
-            buffer.text_summary_for_range::<TextSummary, _>(range.clone()),
-            TextSummary::from(&reference_string[range])
-        );
-
-        buffer.check_invariants();
-
-        if rng.random_bool(0.3) {
-            buffer_versions.push((buffer.clone(), buffer.subscribe()));
-        }
-    }
-
-    for (old_buffer, subscription) in buffer_versions {
-        let edits = buffer
-            .edits_since::<usize>(&old_buffer.version)
-            .collect::<Vec<_>>();
-
-        log::info!(
-            "applying edits since version {:?} to old text: {:?}: {:?}",
-            old_buffer.version(),
-            old_buffer.text(),
-            edits,
-        );
-
-        let mut text = old_buffer.visible_text.clone();
-        for edit in edits {
-            let new_text: String = buffer.text_for_range(edit.new.clone()).collect();
-            text.replace(edit.new.start..edit.new.start + edit.old.len(), &new_text);
-        }
-        assert_eq!(text.to_string(), buffer.text());
-
-        assert_eq!(
-            buffer.rope_for_version(old_buffer.version()).to_string(),
-            old_buffer.text()
-        );
-
-        for _ in 0..5 {
-            let end_ix =
-                old_buffer.clip_offset(rng.random_range(0..=old_buffer.len()), Bias::Right);
-            let start_ix = old_buffer.clip_offset(rng.random_range(0..=end_ix), Bias::Left);
-            let range = old_buffer.anchor_before(start_ix)..old_buffer.anchor_after(end_ix);
-            let mut old_text = old_buffer.text_for_range(range.clone()).collect::<String>();
-            let edits = buffer
-                .edits_since_in_range::<usize>(&old_buffer.version, range.clone())
-                .collect::<Vec<_>>();
-            log::info!(
-                "applying edits since version {:?} to old text in range {:?}: {:?}: {:?}",
-                old_buffer.version(),
-                start_ix..end_ix,
-                old_text,
-                edits,
-            );
-
-            let new_text = buffer.text_for_range(range).collect::<String>();
-            for edit in edits {
-                old_text.replace_range(
-                    edit.new.start..edit.new.start + edit.old_len(),
-                    &new_text[edit.new],
-                );
-            }
-            assert_eq!(old_text, new_text);
-        }
-
-        assert_eq!(
-            buffer.has_edits_since(&old_buffer.version),
-            buffer
-                .edits_since::<usize>(&old_buffer.version)
-                .next()
-                .is_some(),
-        );
-
-        let subscription_edits = subscription.consume();
-        log::info!(
-            "applying subscription edits since version {:?} to old text: {:?}: {:?}",
-            old_buffer.version(),
-            old_buffer.text(),
-            subscription_edits,
-        );
-
-        let mut text = old_buffer.visible_text.clone();
-        for edit in subscription_edits.into_inner() {
-            let new_text: String = buffer.text_for_range(edit.new.clone()).collect();
-            text.replace(edit.new.start..edit.new.start + edit.old.len(), &new_text);
-        }
-        assert_eq!(text.to_string(), buffer.text());
-    }
-}
-
-#[test]
-fn test_line_endings() {
-    assert_eq!(LineEnding::detect(&"🍐✅\n".repeat(1000)), LineEnding::Unix);
-    assert_eq!(LineEnding::detect(&"abcd\n".repeat(1000)), LineEnding::Unix);
-    assert_eq!(
-        LineEnding::detect(&"🍐✅\r\n".repeat(1000)),
-        LineEnding::Windows
-    );
-    assert_eq!(
-        LineEnding::detect(&"abcd\r\n".repeat(1000)),
-        LineEnding::Windows
-    );
-
-    let mut buffer = Buffer::new(
-        ReplicaId::LOCAL,
-        BufferId::new(1).unwrap(),
-        "one\r\ntwo\rthree",
-    );
-    assert_eq!(buffer.text(), "one\ntwo\nthree");
-    assert_eq!(buffer.line_ending(), LineEnding::Windows);
-    buffer.check_invariants();
-
-    buffer.edit([(buffer.len()..buffer.len(), "\r\nfour")]);
-    buffer.edit([(0..0, "zero\r\n")]);
-    assert_eq!(buffer.text(), "zero\none\ntwo\nthree\nfour");
-    assert_eq!(buffer.line_ending(), LineEnding::Windows);
-    buffer.check_invariants();
-}
-
-#[test]
-fn test_line_len() {
-    let mut buffer = Buffer::new(ReplicaId::LOCAL, BufferId::new(1).unwrap(), "");
-    buffer.edit([(0..0, "abcd\nefg\nhij")]);
-    buffer.edit([(12..12, "kl\nmno")]);
-    buffer.edit([(18..18, "\npqrs\n")]);
-    buffer.edit([(18..21, "\nPQ")]);
-
-    assert_eq!(buffer.line_len(0), 4);
-    assert_eq!(buffer.line_len(1), 3);
-    assert_eq!(buffer.line_len(2), 5);
-    assert_eq!(buffer.line_len(3), 3);
-    assert_eq!(buffer.line_len(4), 4);
-    assert_eq!(buffer.line_len(5), 0);
-}
-
-#[test]
-fn test_common_prefix_at_position() {
-    let text = "a = str; b = δα";
-    let buffer = Buffer::new(ReplicaId::LOCAL, BufferId::new(1).unwrap(), text);
-
-    let offset1 = offset_after(text, "str");
-    let offset2 = offset_after(text, "δα");
-
-    // the preceding word is a prefix of the suggestion
-    assert_eq!(
-        buffer.common_prefix_at(offset1, "string"),
-        range_of(text, "str"),
-    );
-    // a suffix of the preceding word is a prefix of the suggestion
-    assert_eq!(
-        buffer.common_prefix_at(offset1, "tree"),
-        range_of(text, "tr"),
-    );
-    // the preceding word is a substring of the suggestion, but not a prefix
-    assert_eq!(
-        buffer.common_prefix_at(offset1, "astro"),
-        empty_range_after(text, "str"),
-    );
-
-    // prefix matching is case insensitive.
-    assert_eq!(
-        buffer.common_prefix_at(offset1, "Strαngε"),
-        range_of(text, "str"),
-    );
-    assert_eq!(
-        buffer.common_prefix_at(offset2, "ΔΑΜΝ"),
-        range_of(text, "δα"),
-    );
-
-    fn offset_after(text: &str, part: &str) -> usize {
-        text.find(part).unwrap() + part.len()
-    }
-
-    fn empty_range_after(text: &str, part: &str) -> Range<usize> {
-        let offset = offset_after(text, part);
-        offset..offset
-    }
-
-    fn range_of(text: &str, part: &str) -> Range<usize> {
-        let start = text.find(part).unwrap();
-        start..start + part.len()
-    }
-}
-
-#[test]
-fn test_text_summary_for_range() {
-    let buffer = Buffer::new(
-        ReplicaId::LOCAL,
-        BufferId::new(1).unwrap(),
-        "ab\nefg\nhklm\nnopqrs\ntuvwxyz",
-    );
-    assert_eq!(
-        buffer.text_summary_for_range::<TextSummary, _>(0..2),
-        TextSummary {
-            len: 2,
-            chars: 2,
-            len_utf16: OffsetUtf16(2),
-            lines: Point::new(0, 2),
-            first_line_chars: 2,
-            last_line_chars: 2,
-            last_line_len_utf16: 2,
-            longest_row: 0,
-            longest_row_chars: 2,
-        }
-    );
-    assert_eq!(
-        buffer.text_summary_for_range::<TextSummary, _>(1..3),
-        TextSummary {
-            len: 2,
-            chars: 2,
-            len_utf16: OffsetUtf16(2),
-            lines: Point::new(1, 0),
-            first_line_chars: 1,
-            last_line_chars: 0,
-            last_line_len_utf16: 0,
-            longest_row: 0,
-            longest_row_chars: 1,
-        }
-    );
-    assert_eq!(
-        buffer.text_summary_for_range::<TextSummary, _>(1..12),
-        TextSummary {
-            len: 11,
-            chars: 11,
-            len_utf16: OffsetUtf16(11),
-            lines: Point::new(3, 0),
-            first_line_chars: 1,
-            last_line_chars: 0,
-            last_line_len_utf16: 0,
-            longest_row: 2,
-            longest_row_chars: 4,
-        }
-    );
-    assert_eq!(
-        buffer.text_summary_for_range::<TextSummary, _>(0..20),
-        TextSummary {
-            len: 20,
-            chars: 20,
-            len_utf16: OffsetUtf16(20),
-            lines: Point::new(4, 1),
-            first_line_chars: 2,
-            last_line_chars: 1,
-            last_line_len_utf16: 1,
-            longest_row: 3,
-            longest_row_chars: 6,
-        }
-    );
-    assert_eq!(
-        buffer.text_summary_for_range::<TextSummary, _>(0..22),
-        TextSummary {
-            len: 22,
-            chars: 22,
-            len_utf16: OffsetUtf16(22),
-            lines: Point::new(4, 3),
-            first_line_chars: 2,
-            last_line_chars: 3,
-            last_line_len_utf16: 3,
-            longest_row: 3,
-            longest_row_chars: 6,
-        }
-    );
-    assert_eq!(
-        buffer.text_summary_for_range::<TextSummary, _>(7..22),
-        TextSummary {
-            len: 15,
-            chars: 15,
-            len_utf16: OffsetUtf16(15),
-            lines: Point::new(2, 3),
-            first_line_chars: 4,
-            last_line_chars: 3,
-            last_line_len_utf16: 3,
-            longest_row: 1,
-            longest_row_chars: 6,
-        }
-    );
-}
-
-#[test]
-fn test_chars_at() {
-    let mut buffer = Buffer::new(ReplicaId::LOCAL, BufferId::new(1).unwrap(), "");
-    buffer.edit([(0..0, "abcd\nefgh\nij")]);
-    buffer.edit([(12..12, "kl\nmno")]);
-    buffer.edit([(18..18, "\npqrs")]);
-    buffer.edit([(18..21, "\nPQ")]);
-
-    let chars = buffer.chars_at(Point::new(0, 0));
-    assert_eq!(chars.collect::<String>(), "abcd\nefgh\nijkl\nmno\nPQrs");
-
-    let chars = buffer.chars_at(Point::new(1, 0));
-    assert_eq!(chars.collect::<String>(), "efgh\nijkl\nmno\nPQrs");
-
-    let chars = buffer.chars_at(Point::new(2, 0));
-    assert_eq!(chars.collect::<String>(), "ijkl\nmno\nPQrs");
-
-    let chars = buffer.chars_at(Point::new(3, 0));
-    assert_eq!(chars.collect::<String>(), "mno\nPQrs");
-
-    let chars = buffer.chars_at(Point::new(4, 0));
-    assert_eq!(chars.collect::<String>(), "PQrs");
-
-    // Regression test:
-    let mut buffer = Buffer::new(ReplicaId::LOCAL, BufferId::new(1).unwrap(), "");
-    buffer.edit([(0..0, "[workspace]\nmembers = [\n    \"xray_core\",\n    \"xray_server\",\n    \"xray_cli\",\n    \"xray_wasm\",\n]\n")]);
-    buffer.edit([(60..60, "\n")]);
-
-    let chars = buffer.chars_at(Point::new(6, 0));
-    assert_eq!(chars.collect::<String>(), "    \"xray_wasm\",\n]\n");
-}
-
-#[test]
-fn test_anchors() {
-    let mut buffer = Buffer::new(ReplicaId::LOCAL, BufferId::new(1).unwrap(), "");
-    buffer.edit([(0..0, "abc")]);
-    let left_anchor = buffer.anchor_before(2);
-    let right_anchor = buffer.anchor_after(2);
-
-    buffer.edit([(1..1, "def\n")]);
-    assert_eq!(buffer.text(), "adef\nbc");
-    assert_eq!(left_anchor.to_offset(&buffer), 6);
-    assert_eq!(right_anchor.to_offset(&buffer), 6);
-    assert_eq!(left_anchor.to_point(&buffer), Point { row: 1, column: 1 });
-    assert_eq!(right_anchor.to_point(&buffer), Point { row: 1, column: 1 });
-
-    buffer.edit([(2..3, "")]);
-    assert_eq!(buffer.text(), "adf\nbc");
-    assert_eq!(left_anchor.to_offset(&buffer), 5);
-    assert_eq!(right_anchor.to_offset(&buffer), 5);
-    assert_eq!(left_anchor.to_point(&buffer), Point { row: 1, column: 1 });
-    assert_eq!(right_anchor.to_point(&buffer), Point { row: 1, column: 1 });
-
-    buffer.edit([(5..5, "ghi\n")]);
-    assert_eq!(buffer.text(), "adf\nbghi\nc");
-    assert_eq!(left_anchor.to_offset(&buffer), 5);
-    assert_eq!(right_anchor.to_offset(&buffer), 9);
-    assert_eq!(left_anchor.to_point(&buffer), Point { row: 1, column: 1 });
-    assert_eq!(right_anchor.to_point(&buffer), Point { row: 2, column: 0 });
-
-    buffer.edit([(7..9, "")]);
-    assert_eq!(buffer.text(), "adf\nbghc");
-    assert_eq!(left_anchor.to_offset(&buffer), 5);
-    assert_eq!(right_anchor.to_offset(&buffer), 7);
-    assert_eq!(left_anchor.to_point(&buffer), Point { row: 1, column: 1 },);
-    assert_eq!(right_anchor.to_point(&buffer), Point { row: 1, column: 3 });
-
-    // Ensure anchoring to a point is equivalent to anchoring to an offset.
-    assert_eq!(
-        buffer.anchor_before(Point { row: 0, column: 0 }),
-        buffer.anchor_before(0)
-    );
-    assert_eq!(
-        buffer.anchor_before(Point { row: 0, column: 1 }),
-        buffer.anchor_before(1)
-    );
-    assert_eq!(
-        buffer.anchor_before(Point { row: 0, column: 2 }),
-        buffer.anchor_before(2)
-    );
-    assert_eq!(
-        buffer.anchor_before(Point { row: 0, column: 3 }),
-        buffer.anchor_before(3)
-    );
-    assert_eq!(
-        buffer.anchor_before(Point { row: 1, column: 0 }),
-        buffer.anchor_before(4)
-    );
-    assert_eq!(
-        buffer.anchor_before(Point { row: 1, column: 1 }),
-        buffer.anchor_before(5)
-    );
-    assert_eq!(
-        buffer.anchor_before(Point { row: 1, column: 2 }),
-        buffer.anchor_before(6)
-    );
-    assert_eq!(
-        buffer.anchor_before(Point { row: 1, column: 3 }),
-        buffer.anchor_before(7)
-    );
-    assert_eq!(
-        buffer.anchor_before(Point { row: 1, column: 4 }),
-        buffer.anchor_before(8)
-    );
-
-    // Comparison between anchors.
-    let anchor_at_offset_0 = buffer.anchor_before(0);
-    let anchor_at_offset_1 = buffer.anchor_before(1);
-    let anchor_at_offset_2 = buffer.anchor_before(2);
-
-    assert_eq!(
-        anchor_at_offset_0.cmp(&anchor_at_offset_0, &buffer),
-        Ordering::Equal
-    );
-    assert_eq!(
-        anchor_at_offset_1.cmp(&anchor_at_offset_1, &buffer),
-        Ordering::Equal
-    );
-    assert_eq!(
-        anchor_at_offset_2.cmp(&anchor_at_offset_2, &buffer),
-        Ordering::Equal
-    );
-
-    assert_eq!(
-        anchor_at_offset_0.cmp(&anchor_at_offset_1, &buffer),
-        Ordering::Less
-    );
-    assert_eq!(
-        anchor_at_offset_1.cmp(&anchor_at_offset_2, &buffer),
-        Ordering::Less
-    );
-    assert_eq!(
-        anchor_at_offset_0.cmp(&anchor_at_offset_2, &buffer),
-        Ordering::Less
-    );
-
-    assert_eq!(
-        anchor_at_offset_1.cmp(&anchor_at_offset_0, &buffer),
-        Ordering::Greater
-    );
-    assert_eq!(
-        anchor_at_offset_2.cmp(&anchor_at_offset_1, &buffer),
-        Ordering::Greater
-    );
-    assert_eq!(
-        anchor_at_offset_2.cmp(&anchor_at_offset_0, &buffer),
-        Ordering::Greater
-    );
-}
-
-#[test]
-fn test_anchors_at_start_and_end() {
-    let mut buffer = Buffer::new(ReplicaId::LOCAL, BufferId::new(1).unwrap(), "");
-    let before_start_anchor = buffer.anchor_before(0);
-    let after_end_anchor = buffer.anchor_after(0);
-
-    buffer.edit([(0..0, "abc")]);
-    assert_eq!(buffer.text(), "abc");
-    assert_eq!(before_start_anchor.to_offset(&buffer), 0);
-    assert_eq!(after_end_anchor.to_offset(&buffer), 3);
-
-    let after_start_anchor = buffer.anchor_after(0);
-    let before_end_anchor = buffer.anchor_before(3);
-
-    buffer.edit([(3..3, "def")]);
-    buffer.edit([(0..0, "ghi")]);
-    assert_eq!(buffer.text(), "ghiabcdef");
-    assert_eq!(before_start_anchor.to_offset(&buffer), 0);
-    assert_eq!(after_start_anchor.to_offset(&buffer), 3);
-    assert_eq!(before_end_anchor.to_offset(&buffer), 6);
-    assert_eq!(after_end_anchor.to_offset(&buffer), 9);
-}
-
-#[test]
-fn test_undo_redo() {
-    let mut buffer = Buffer::new(ReplicaId::LOCAL, BufferId::new(1).unwrap(), "1234");
-    // Set group interval to zero so as to not group edits in the undo stack.
-    buffer.set_group_interval(Duration::from_secs(0));
-
-    buffer.edit([(1..1, "abx")]);
-    buffer.edit([(3..4, "yzef")]);
-    buffer.edit([(3..5, "cd")]);
-    assert_eq!(buffer.text(), "1abcdef234");
-
-    let entries = buffer.history.undo_stack.clone();
-    assert_eq!(entries.len(), 3);
-
-    buffer.undo_or_redo(entries[0].transaction.clone());
-    assert_eq!(buffer.text(), "1cdef234");
-    buffer.undo_or_redo(entries[0].transaction.clone());
-    assert_eq!(buffer.text(), "1abcdef234");
-
-    buffer.undo_or_redo(entries[1].transaction.clone());
-    assert_eq!(buffer.text(), "1abcdx234");
-    buffer.undo_or_redo(entries[2].transaction.clone());
-    assert_eq!(buffer.text(), "1abx234");
-    buffer.undo_or_redo(entries[1].transaction.clone());
-    assert_eq!(buffer.text(), "1abyzef234");
-    buffer.undo_or_redo(entries[2].transaction.clone());
-    assert_eq!(buffer.text(), "1abcdef234");
-
-    buffer.undo_or_redo(entries[2].transaction.clone());
-    assert_eq!(buffer.text(), "1abyzef234");
-    buffer.undo_or_redo(entries[0].transaction.clone());
-    assert_eq!(buffer.text(), "1yzef234");
-    buffer.undo_or_redo(entries[1].transaction.clone());
-    assert_eq!(buffer.text(), "1234");
-}
-
-#[test]
-fn test_history() {
-    let mut now = Instant::now();
-    let mut buffer = Buffer::new(ReplicaId::LOCAL, BufferId::new(1).unwrap(), "123456");
-    buffer.set_group_interval(Duration::from_millis(300));
-
-    let transaction_1 = buffer.start_transaction_at(now).unwrap();
-    buffer.edit([(2..4, "cd")]);
-    buffer.end_transaction_at(now);
-    assert_eq!(buffer.text(), "12cd56");
-
-    buffer.start_transaction_at(now);
-    buffer.edit([(4..5, "e")]);
-    buffer.end_transaction_at(now).unwrap();
-    assert_eq!(buffer.text(), "12cde6");
-
-    now += buffer.transaction_group_interval() + Duration::from_millis(1);
-    buffer.start_transaction_at(now);
-    buffer.edit([(0..1, "a")]);
-    buffer.edit([(1..1, "b")]);
-    buffer.end_transaction_at(now).unwrap();
-    assert_eq!(buffer.text(), "ab2cde6");
-
-    // Last transaction happened past the group interval, undo it on its own.
-    buffer.undo();
-    assert_eq!(buffer.text(), "12cde6");
-
-    // First two transactions happened within the group interval, undo them together.
-    buffer.undo();
-    assert_eq!(buffer.text(), "123456");
-
-    // Redo the first two transactions together.
-    buffer.redo();
-    assert_eq!(buffer.text(), "12cde6");
-
-    // Redo the last transaction on its own.
-    buffer.redo();
-    assert_eq!(buffer.text(), "ab2cde6");
-
-    buffer.start_transaction_at(now);
-    assert!(buffer.end_transaction_at(now).is_none());
-    buffer.undo();
-    assert_eq!(buffer.text(), "12cde6");
-
-    // Redo stack gets cleared after performing an edit.
-    buffer.start_transaction_at(now);
-    buffer.edit([(0..0, "X")]);
-    buffer.end_transaction_at(now);
-    assert_eq!(buffer.text(), "X12cde6");
-    buffer.redo();
-    assert_eq!(buffer.text(), "X12cde6");
-    buffer.undo();
-    assert_eq!(buffer.text(), "12cde6");
-    buffer.undo();
-    assert_eq!(buffer.text(), "123456");
-
-    // Transactions can be grouped manually.
-    buffer.redo();
-    buffer.redo();
-    assert_eq!(buffer.text(), "X12cde6");
-    buffer.group_until_transaction(transaction_1);
-    buffer.undo();
-    assert_eq!(buffer.text(), "123456");
-    buffer.redo();
-    assert_eq!(buffer.text(), "X12cde6");
-}
-
-#[test]
-fn test_finalize_last_transaction() {
-    let now = Instant::now();
-    let mut buffer = Buffer::new(ReplicaId::LOCAL, BufferId::new(1).unwrap(), "123456");
-    buffer.history.group_interval = Duration::from_millis(1);
-
-    buffer.start_transaction_at(now);
-    buffer.edit([(2..4, "cd")]);
-    buffer.end_transaction_at(now);
-    assert_eq!(buffer.text(), "12cd56");
-
-    buffer.finalize_last_transaction();
-    buffer.start_transaction_at(now);
-    buffer.edit([(4..5, "e")]);
-    buffer.end_transaction_at(now).unwrap();
-    assert_eq!(buffer.text(), "12cde6");
-
-    buffer.start_transaction_at(now);
-    buffer.edit([(0..1, "a")]);
-    buffer.edit([(1..1, "b")]);
-    buffer.end_transaction_at(now).unwrap();
-    assert_eq!(buffer.text(), "ab2cde6");
-
-    buffer.undo();
-    assert_eq!(buffer.text(), "12cd56");
-
-    buffer.undo();
-    assert_eq!(buffer.text(), "123456");
-
-    buffer.redo();
-    assert_eq!(buffer.text(), "12cd56");
-
-    buffer.redo();
-    assert_eq!(buffer.text(), "ab2cde6");
-}
-
-#[test]
-fn test_edited_ranges_for_transaction() {
-    let now = Instant::now();
-    let mut buffer = Buffer::new(ReplicaId::LOCAL, BufferId::new(1).unwrap(), "1234567");
-
-    buffer.start_transaction_at(now);
-    buffer.edit([(2..4, "cd")]);
-    buffer.edit([(6..6, "efg")]);
-    buffer.end_transaction_at(now);
-    assert_eq!(buffer.text(), "12cd56efg7");
-
-    let tx = buffer.finalize_last_transaction().unwrap().clone();
-    assert_eq!(
-        buffer
-            .edited_ranges_for_transaction::<usize>(&tx)
-            .collect::<Vec<_>>(),
-        [2..4, 6..9]
-    );
-
-    buffer.edit([(5..5, "hijk")]);
-    assert_eq!(buffer.text(), "12cd5hijk6efg7");
-    assert_eq!(
-        buffer
-            .edited_ranges_for_transaction::<usize>(&tx)
-            .collect::<Vec<_>>(),
-        [2..4, 10..13]
-    );
-
-    buffer.edit([(4..4, "l")]);
-    assert_eq!(buffer.text(), "12cdl5hijk6efg7");
-    assert_eq!(
-        buffer
-            .edited_ranges_for_transaction::<usize>(&tx)
-            .collect::<Vec<_>>(),
-        [2..4, 11..14]
-    );
-}
-
-#[test]
-fn test_concurrent_edits() {
-    let text = "abcdef";
-
-    let mut buffer1 = Buffer::new(ReplicaId::new(1), BufferId::new(1).unwrap(), text);
-    let mut buffer2 = Buffer::new(ReplicaId::new(2), BufferId::new(1).unwrap(), text);
-    let mut buffer3 = Buffer::new(ReplicaId::new(3), BufferId::new(1).unwrap(), text);
-
-    let buf1_op = buffer1.edit([(1..2, "12")]);
-    assert_eq!(buffer1.text(), "a12cdef");
-    let buf2_op = buffer2.edit([(3..4, "34")]);
-    assert_eq!(buffer2.text(), "abc34ef");
-    let buf3_op = buffer3.edit([(5..6, "56")]);
-    assert_eq!(buffer3.text(), "abcde56");
-
-    buffer1.apply_op(buf2_op.clone());
-    buffer1.apply_op(buf3_op.clone());
-    buffer2.apply_op(buf1_op.clone());
-    buffer2.apply_op(buf3_op);
-    buffer3.apply_op(buf1_op);
-    buffer3.apply_op(buf2_op);
-
-    assert_eq!(buffer1.text(), "a12c34e56");
-    assert_eq!(buffer2.text(), "a12c34e56");
-    assert_eq!(buffer3.text(), "a12c34e56");
-}
-
-#[gpui::test(iterations = 100)]
-fn test_random_concurrent_edits(mut rng: StdRng) {
-    let peers = env::var("PEERS")
-        .map(|i| i.parse().expect("invalid `PEERS` variable"))
-        .unwrap_or(5);
-    let operations = env::var("OPERATIONS")
-        .map(|i| i.parse().expect("invalid `OPERATIONS` variable"))
-        .unwrap_or(10);
-
-    let base_text_len = rng.random_range(0..10);
-    let base_text = RandomCharIter::new(&mut rng)
-        .take(base_text_len)
-        .collect::<String>();
-    let mut replica_ids = Vec::new();
-    let mut buffers = Vec::new();
-    let mut network = Network::new(rng.clone());
-
-    for i in 0..peers {
-        let mut buffer = Buffer::new(
-            ReplicaId::new(i as u16),
-            BufferId::new(1).unwrap(),
-            base_text.clone(),
-        );
-        buffer.history.group_interval = Duration::from_millis(rng.random_range(0..=200));
-        buffers.push(buffer);
-        replica_ids.push(ReplicaId::new(i as u16));
-        network.add_peer(ReplicaId::new(i as u16));
-    }
-
-    log::info!("initial text: {:?}", base_text);
-
-    let mut mutation_count = operations;
-    loop {
-        let replica_index = rng.random_range(0..peers);
-        let replica_id = replica_ids[replica_index];
-        let buffer = &mut buffers[replica_index];
-        match rng.random_range(0..=100) {
-            0..=50 if mutation_count != 0 => {
-                let op = buffer.randomly_edit(&mut rng, 5).1;
-                network.broadcast(buffer.replica_id, vec![op]);
-                log::info!("buffer {:?} text: {:?}", buffer.replica_id, buffer.text());
-                mutation_count -= 1;
-            }
-            51..=70 if mutation_count != 0 => {
-                let ops = buffer.randomly_undo_redo(&mut rng);
-                network.broadcast(buffer.replica_id, ops);
-                mutation_count -= 1;
-            }
-            71..=100 if network.has_unreceived(replica_id) => {
-                let ops = network.receive(replica_id);
-                if !ops.is_empty() {
-                    log::info!(
-                        "peer {:?} applying {} ops from the network.",
-                        replica_id,
-                        ops.len()
-                    );
-                    buffer.apply_ops(ops);
-                }
-            }
-            _ => {}
-        }
-        buffer.check_invariants();
-
-        if mutation_count == 0 && network.is_idle() {
-            break;
-        }
-    }
-
-    let first_buffer = &buffers[0];
-    for buffer in &buffers[1..] {
-        assert_eq!(
-            buffer.text(),
-            first_buffer.text(),
-            "Replica {:?} text != Replica 0 text",
-            buffer.replica_id
-        );
-        buffer.check_invariants();
-    }
-}
diff --git a/crates/text/src/text.rs b/crates/text/src/text.rs
deleted file mode 100644
index 866552e4e5..0000000000
--- a/crates/text/src/text.rs
+++ /dev/null
@@ -1,3564 +0,0 @@
-mod anchor;
-pub mod locator;
-#[cfg(any(test, feature = "test-support"))]
-pub mod network;
-pub mod operation_queue;
-mod patch;
-mod selection;
-pub mod subscription;
-#[cfg(test)]
-mod tests;
-mod undo_map;
-
-pub use anchor::*;
-use anyhow::{Context as _, Result};
-use clock::Lamport;
-pub use clock::ReplicaId;
-use collections::{HashMap, HashSet};
-use locator::Locator;
-use operation_queue::OperationQueue;
-pub use patch::Patch;
-use postage::{oneshot, prelude::*};
-
-use regex::Regex;
-pub use rope::*;
-pub use selection::*;
-use std::{
-    borrow::Cow,
-    cmp::{self, Ordering, Reverse},
-    fmt::Display,
-    future::Future,
-    iter::Iterator,
-    num::NonZeroU64,
-    ops::{self, Deref, Range, Sub},
-    str,
-    sync::{Arc, LazyLock},
-    time::{Duration, Instant},
-};
-pub use subscription::*;
-pub use sum_tree::Bias;
-use sum_tree::{Dimensions, FilterCursor, SumTree, TreeMap, TreeSet};
-use undo_map::UndoMap;
-use util::debug_panic;
-
-#[cfg(any(test, feature = "test-support"))]
-use util::RandomCharIter;
-
-static LINE_SEPARATORS_REGEX: LazyLock<Regex> =
-    LazyLock::new(|| Regex::new(r"\r\n|\r").expect("Failed to create LINE_SEPARATORS_REGEX"));
-
-pub type TransactionId = clock::Lamport;
-
-pub struct Buffer {
-    snapshot: BufferSnapshot,
-    history: History,
-    deferred_ops: OperationQueue<Operation>,
-    deferred_replicas: HashSet<ReplicaId>,
-    pub lamport_clock: clock::Lamport,
-    subscriptions: Topic<usize>,
-    edit_id_resolvers: HashMap<clock::Lamport, Vec<oneshot::Sender<()>>>,
-    wait_for_version_txs: Vec<(clock::Global, oneshot::Sender<()>)>,
-}
-
-#[repr(transparent)]
-#[derive(Clone, Copy, Debug, Hash, PartialEq, PartialOrd, Ord, Eq)]
-pub struct BufferId(NonZeroU64);
-
-impl Display for BufferId {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
-impl From<NonZeroU64> for BufferId {
-    fn from(id: NonZeroU64) -> Self {
-        BufferId(id)
-    }
-}
-
-impl BufferId {
-    /// Returns Err if `id` is outside of BufferId domain.
-    pub fn new(id: u64) -> anyhow::Result<Self> {
-        let id = NonZeroU64::new(id).context("Buffer id cannot be 0.")?;
-        Ok(Self(id))
-    }
-
-    /// Increments this buffer id, returning the old value.
-    /// So that's a post-increment operator in disguise.
-    pub fn next(&mut self) -> Self {
-        let old = *self;
-        self.0 = self.0.saturating_add(1);
-        old
-    }
-
-    pub fn to_proto(self) -> u64 {
-        self.into()
-    }
-}
-
-impl From<BufferId> for u64 {
-    fn from(id: BufferId) -> Self {
-        id.0.get()
-    }
-}
-
-#[derive(Clone)]
-pub struct BufferSnapshot {
-    replica_id: ReplicaId,
-    remote_id: BufferId,
-    visible_text: Rope,
-    deleted_text: Rope,
-    line_ending: LineEnding,
-    undo_map: UndoMap,
-    fragments: SumTree<Fragment>,
-    insertions: SumTree<InsertionFragment>,
-    insertion_slices: TreeSet<InsertionSlice>,
-    pub version: clock::Global,
-}
-
-#[derive(Clone, Debug)]
-pub struct HistoryEntry {
-    transaction: Transaction,
-    first_edit_at: Instant,
-    last_edit_at: Instant,
-    suppress_grouping: bool,
-}
-
-#[derive(Clone, Debug)]
-pub struct Transaction {
-    pub id: TransactionId,
-    pub edit_ids: Vec<clock::Lamport>,
-    pub start: clock::Global,
-}
-
-impl Transaction {
-    pub fn merge_in(&mut self, other: Transaction) {
-        self.edit_ids.extend(other.edit_ids);
-    }
-}
-
-impl HistoryEntry {
-    pub fn transaction_id(&self) -> TransactionId {
-        self.transaction.id
-    }
-}
-
-struct History {
-    base_text: Rope,
-    operations: TreeMap<clock::Lamport, Operation>,
-    undo_stack: Vec<HistoryEntry>,
-    redo_stack: Vec<HistoryEntry>,
-    transaction_depth: usize,
-    group_interval: Duration,
-}
-
-#[derive(Clone, Debug, Eq, PartialEq)]
-struct InsertionSlice {
-    edit_id: clock::Lamport,
-    insertion_id: clock::Lamport,
-    range: Range<usize>,
-}
-
-impl Ord for InsertionSlice {
-    fn cmp(&self, other: &Self) -> Ordering {
-        self.edit_id
-            .cmp(&other.edit_id)
-            .then_with(|| self.insertion_id.cmp(&other.insertion_id))
-            .then_with(|| self.range.start.cmp(&other.range.start))
-            .then_with(|| self.range.end.cmp(&other.range.end))
-    }
-}
-
-impl PartialOrd for InsertionSlice {
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-impl InsertionSlice {
-    fn from_fragment(edit_id: clock::Lamport, fragment: &Fragment) -> Self {
-        Self {
-            edit_id,
-            insertion_id: fragment.timestamp,
-            range: fragment.insertion_offset..fragment.insertion_offset + fragment.len,
-        }
-    }
-}
-
-impl History {
-    pub fn new(base_text: Rope) -> Self {
-        Self {
-            base_text,
-            operations: Default::default(),
-            undo_stack: Vec::new(),
-            redo_stack: Vec::new(),
-            transaction_depth: 0,
-            // Don't group transactions in tests unless we opt in, because it's a footgun.
-            #[cfg(any(test, feature = "test-support"))]
-            group_interval: Duration::ZERO,
-            #[cfg(not(any(test, feature = "test-support")))]
-            group_interval: Duration::from_millis(300),
-        }
-    }
-
-    fn push(&mut self, op: Operation) {
-        self.operations.insert(op.timestamp(), op);
-    }
-
-    fn start_transaction(
-        &mut self,
-        start: clock::Global,
-        now: Instant,
-        clock: &mut clock::Lamport,
-    ) -> Option<TransactionId> {
-        self.transaction_depth += 1;
-        if self.transaction_depth == 1 {
-            let id = clock.tick();
-            self.undo_stack.push(HistoryEntry {
-                transaction: Transaction {
-                    id,
-                    start,
-                    edit_ids: Default::default(),
-                },
-                first_edit_at: now,
-                last_edit_at: now,
-                suppress_grouping: false,
-            });
-            Some(id)
-        } else {
-            None
-        }
-    }
-
-    fn end_transaction(&mut self, now: Instant) -> Option<&HistoryEntry> {
-        assert_ne!(self.transaction_depth, 0);
-        self.transaction_depth -= 1;
-        if self.transaction_depth == 0 {
-            if self
-                .undo_stack
-                .last()
-                .unwrap()
-                .transaction
-                .edit_ids
-                .is_empty()
-            {
-                self.undo_stack.pop();
-                None
-            } else {
-                self.redo_stack.clear();
-                let entry = self.undo_stack.last_mut().unwrap();
-                entry.last_edit_at = now;
-                Some(entry)
-            }
-        } else {
-            None
-        }
-    }
-
-    fn group(&mut self) -> Option<TransactionId> {
-        let mut count = 0;
-        let mut entries = self.undo_stack.iter();
-        if let Some(mut entry) = entries.next_back() {
-            while let Some(prev_entry) = entries.next_back() {
-                if !prev_entry.suppress_grouping
-                    && entry.first_edit_at - prev_entry.last_edit_at < self.group_interval
-                {
-                    entry = prev_entry;
-                    count += 1;
-                } else {
-                    break;
-                }
-            }
-        }
-        self.group_trailing(count)
-    }
-
-    fn group_until(&mut self, transaction_id: TransactionId) {
-        let mut count = 0;
-        for entry in self.undo_stack.iter().rev() {
-            if entry.transaction_id() == transaction_id {
-                self.group_trailing(count);
-                break;
-            } else if entry.suppress_grouping {
-                break;
-            } else {
-                count += 1;
-            }
-        }
-    }
-
-    fn group_trailing(&mut self, n: usize) -> Option<TransactionId> {
-        let new_len = self.undo_stack.len() - n;
-        let (entries_to_keep, entries_to_merge) = self.undo_stack.split_at_mut(new_len);
-        if let Some(last_entry) = entries_to_keep.last_mut() {
-            for entry in &*entries_to_merge {
-                for edit_id in &entry.transaction.edit_ids {
-                    last_entry.transaction.edit_ids.push(*edit_id);
-                }
-            }
-
-            if let Some(entry) = entries_to_merge.last_mut() {
-                last_entry.last_edit_at = entry.last_edit_at;
-            }
-        }
-
-        self.undo_stack.truncate(new_len);
-        self.undo_stack.last().map(|e| e.transaction.id)
-    }
-
-    fn finalize_last_transaction(&mut self) -> Option<&Transaction> {
-        self.undo_stack.last_mut().map(|entry| {
-            entry.suppress_grouping = true;
-            &entry.transaction
-        })
-    }
-
-    fn push_transaction(&mut self, transaction: Transaction, now: Instant) {
-        assert_eq!(self.transaction_depth, 0);
-        self.undo_stack.push(HistoryEntry {
-            transaction,
-            first_edit_at: now,
-            last_edit_at: now,
-            suppress_grouping: false,
-        });
-    }
-
-    /// Differs from `push_transaction` in that it does not clear the redo
-    /// stack. Intended to be used to create a parent transaction to merge
-    /// potential child transactions into.
-    ///
-    /// The caller is responsible for removing it from the undo history using
-    /// `forget_transaction` if no edits are merged into it. Otherwise, if edits
-    /// are merged into this transaction, the caller is responsible for ensuring
-    /// the redo stack is cleared. The easiest way to ensure the redo stack is
-    /// cleared is to create transactions with the usual `start_transaction` and
-    /// `end_transaction` methods and merging the resulting transactions into
-    /// the transaction created by this method
-    fn push_empty_transaction(
-        &mut self,
-        start: clock::Global,
-        now: Instant,
-        clock: &mut clock::Lamport,
-    ) -> TransactionId {
-        assert_eq!(self.transaction_depth, 0);
-        let id = clock.tick();
-        let transaction = Transaction {
-            id,
-            start,
-            edit_ids: Vec::new(),
-        };
-        self.undo_stack.push(HistoryEntry {
-            transaction,
-            first_edit_at: now,
-            last_edit_at: now,
-            suppress_grouping: false,
-        });
-        id
-    }
-
-    fn push_undo(&mut self, op_id: clock::Lamport) {
-        assert_ne!(self.transaction_depth, 0);
-        if let Some(Operation::Edit(_)) = self.operations.get(&op_id) {
-            let last_transaction = self.undo_stack.last_mut().unwrap();
-            last_transaction.transaction.edit_ids.push(op_id);
-        }
-    }
-
-    fn pop_undo(&mut self) -> Option<&HistoryEntry> {
-        assert_eq!(self.transaction_depth, 0);
-        if let Some(entry) = self.undo_stack.pop() {
-            self.redo_stack.push(entry);
-            self.redo_stack.last()
-        } else {
-            None
-        }
-    }
-
-    fn remove_from_undo(&mut self, transaction_id: TransactionId) -> Option<&HistoryEntry> {
-        assert_eq!(self.transaction_depth, 0);
-
-        let entry_ix = self
-            .undo_stack
-            .iter()
-            .rposition(|entry| entry.transaction.id == transaction_id)?;
-        let entry = self.undo_stack.remove(entry_ix);
-        self.redo_stack.push(entry);
-        self.redo_stack.last()
-    }
-
-    fn remove_from_undo_until(&mut self, transaction_id: TransactionId) -> &[HistoryEntry] {
-        assert_eq!(self.transaction_depth, 0);
-
-        let redo_stack_start_len = self.redo_stack.len();
-        if let Some(entry_ix) = self
-            .undo_stack
-            .iter()
-            .rposition(|entry| entry.transaction.id == transaction_id)
-        {
-            self.redo_stack
-                .extend(self.undo_stack.drain(entry_ix..).rev());
-        }
-        &self.redo_stack[redo_stack_start_len..]
-    }
-
-    fn forget(&mut self, transaction_id: TransactionId) -> Option<Transaction> {
-        assert_eq!(self.transaction_depth, 0);
-        if let Some(entry_ix) = self
-            .undo_stack
-            .iter()
-            .rposition(|entry| entry.transaction.id == transaction_id)
-        {
-            Some(self.undo_stack.remove(entry_ix).transaction)
-        } else if let Some(entry_ix) = self
-            .redo_stack
-            .iter()
-            .rposition(|entry| entry.transaction.id == transaction_id)
-        {
-            Some(self.redo_stack.remove(entry_ix).transaction)
-        } else {
-            None
-        }
-    }
-
-    fn transaction(&self, transaction_id: TransactionId) -> Option<&Transaction> {
-        let entry = self
-            .undo_stack
-            .iter()
-            .rfind(|entry| entry.transaction.id == transaction_id)
-            .or_else(|| {
-                self.redo_stack
-                    .iter()
-                    .rfind(|entry| entry.transaction.id == transaction_id)
-            })?;
-        Some(&entry.transaction)
-    }
-
-    fn transaction_mut(&mut self, transaction_id: TransactionId) -> Option<&mut Transaction> {
-        let entry = self
-            .undo_stack
-            .iter_mut()
-            .rfind(|entry| entry.transaction.id == transaction_id)
-            .or_else(|| {
-                self.redo_stack
-                    .iter_mut()
-                    .rfind(|entry| entry.transaction.id == transaction_id)
-            })?;
-        Some(&mut entry.transaction)
-    }
-
-    fn merge_transactions(&mut self, transaction: TransactionId, destination: TransactionId) {
-        if let Some(transaction) = self.forget(transaction)
-            && let Some(destination) = self.transaction_mut(destination)
-        {
-            destination.edit_ids.extend(transaction.edit_ids);
-        }
-    }
-
-    fn pop_redo(&mut self) -> Option<&HistoryEntry> {
-        assert_eq!(self.transaction_depth, 0);
-        if let Some(entry) = self.redo_stack.pop() {
-            self.undo_stack.push(entry);
-            self.undo_stack.last()
-        } else {
-            None
-        }
-    }
-
-    fn remove_from_redo(&mut self, transaction_id: TransactionId) -> &[HistoryEntry] {
-        assert_eq!(self.transaction_depth, 0);
-
-        let undo_stack_start_len = self.undo_stack.len();
-        if let Some(entry_ix) = self
-            .redo_stack
-            .iter()
-            .rposition(|entry| entry.transaction.id == transaction_id)
-        {
-            self.undo_stack
-                .extend(self.redo_stack.drain(entry_ix..).rev());
-        }
-        &self.undo_stack[undo_stack_start_len..]
-    }
-}
-
-struct Edits<'a, D: TextDimension, F: FnMut(&FragmentSummary) -> bool> {
-    visible_cursor: rope::Cursor<'a>,
-    deleted_cursor: rope::Cursor<'a>,
-    fragments_cursor: Option<FilterCursor<'a, 'static, F, Fragment, FragmentTextSummary>>,
-    undos: &'a UndoMap,
-    since: &'a clock::Global,
-    old_end: D,
-    new_end: D,
-    range: Range<(&'a Locator, usize)>,
-    buffer_id: BufferId,
-}
-
-#[derive(Clone, Debug, Default, Eq, PartialEq)]
-pub struct Edit<D> {
-    pub old: Range<D>,
-    pub new: Range<D>,
-}
-impl<D> Edit<D>
-where
-    D: PartialEq,
-{
-    pub fn is_empty(&self) -> bool {
-        self.old.start == self.old.end && self.new.start == self.new.end
-    }
-}
-
-impl<D, DDelta> Edit<D>
-where
-    D: Sub<D, Output = DDelta> + Copy,
-{
-    pub fn old_len(&self) -> DDelta {
-        self.old.end - self.old.start
-    }
-
-    pub fn new_len(&self) -> DDelta {
-        self.new.end - self.new.start
-    }
-}
-
-impl<D1, D2> Edit<(D1, D2)> {
-    pub fn flatten(self) -> (Edit<D1>, Edit<D2>) {
-        (
-            Edit {
-                old: self.old.start.0..self.old.end.0,
-                new: self.new.start.0..self.new.end.0,
-            },
-            Edit {
-                old: self.old.start.1..self.old.end.1,
-                new: self.new.start.1..self.new.end.1,
-            },
-        )
-    }
-}
-
-#[derive(Eq, PartialEq, Clone, Debug)]
-pub struct Fragment {
-    pub id: Locator,
-    pub timestamp: clock::Lamport,
-    pub insertion_offset: usize,
-    pub len: usize,
-    pub visible: bool,
-    pub deletions: HashSet<clock::Lamport>,
-    pub max_undos: clock::Global,
-}
-
-#[derive(Eq, PartialEq, Clone, Debug)]
-pub struct FragmentSummary {
-    text: FragmentTextSummary,
-    max_id: Locator,
-    max_version: clock::Global,
-    min_insertion_version: clock::Global,
-    max_insertion_version: clock::Global,
-}
-
-#[derive(Copy, Default, Clone, Debug, PartialEq, Eq)]
-struct FragmentTextSummary {
-    visible: usize,
-    deleted: usize,
-}
-
-impl<'a> sum_tree::Dimension<'a, FragmentSummary> for FragmentTextSummary {
-    fn zero(_: &Option<clock::Global>) -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, summary: &'a FragmentSummary, _: &Option<clock::Global>) {
-        self.visible += summary.text.visible;
-        self.deleted += summary.text.deleted;
-    }
-}
-
-#[derive(Eq, PartialEq, Clone, Debug)]
-struct InsertionFragment {
-    timestamp: clock::Lamport,
-    split_offset: usize,
-    fragment_id: Locator,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
-struct InsertionFragmentKey {
-    timestamp: clock::Lamport,
-    split_offset: usize,
-}
-
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub enum Operation {
-    Edit(EditOperation),
-    Undo(UndoOperation),
-}
-
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub struct EditOperation {
-    pub timestamp: clock::Lamport,
-    pub version: clock::Global,
-    pub ranges: Vec<Range<FullOffset>>,
-    pub new_text: Vec<Arc<str>>,
-}
-
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub struct UndoOperation {
-    pub timestamp: clock::Lamport,
-    pub version: clock::Global,
-    pub counts: HashMap<clock::Lamport, u32>,
-}
-
-/// Stores information about the indentation of a line (tabs and spaces).
-#[derive(Clone, Copy, Debug, Eq, PartialEq)]
-pub struct LineIndent {
-    pub tabs: u32,
-    pub spaces: u32,
-    pub line_blank: bool,
-}
-
-impl LineIndent {
-    pub fn from_chunks(chunks: &mut Chunks) -> Self {
-        let mut tabs = 0;
-        let mut spaces = 0;
-        let mut line_blank = true;
-
-        'outer: while let Some(chunk) = chunks.peek() {
-            for ch in chunk.chars() {
-                if ch == '\t' {
-                    tabs += 1;
-                } else if ch == ' ' {
-                    spaces += 1;
-                } else {
-                    if ch != '\n' {
-                        line_blank = false;
-                    }
-                    break 'outer;
-                }
-            }
-
-            chunks.next();
-        }
-
-        Self {
-            tabs,
-            spaces,
-            line_blank,
-        }
-    }
-
-    /// Constructs a new `LineIndent` which only contains spaces.
-    pub fn spaces(spaces: u32) -> Self {
-        Self {
-            tabs: 0,
-            spaces,
-            line_blank: true,
-        }
-    }
-
-    /// Constructs a new `LineIndent` which only contains tabs.
-    pub fn tabs(tabs: u32) -> Self {
-        Self {
-            tabs,
-            spaces: 0,
-            line_blank: true,
-        }
-    }
-
-    /// Indicates whether the line is empty.
-    pub fn is_line_empty(&self) -> bool {
-        self.tabs == 0 && self.spaces == 0 && self.line_blank
-    }
-
-    /// Indicates whether the line is blank (contains only whitespace).
-    pub fn is_line_blank(&self) -> bool {
-        self.line_blank
-    }
-
-    /// Returns the number of indentation characters (tabs or spaces).
-    pub fn raw_len(&self) -> u32 {
-        self.tabs + self.spaces
-    }
-
-    /// Returns the number of indentation characters (tabs or spaces), taking tab size into account.
-    pub fn len(&self, tab_size: u32) -> u32 {
-        self.tabs * tab_size + self.spaces
-    }
-}
-
-impl From<&str> for LineIndent {
-    fn from(value: &str) -> Self {
-        Self::from_iter(value.chars())
-    }
-}
-
-impl FromIterator<char> for LineIndent {
-    fn from_iter<T: IntoIterator<Item = char>>(chars: T) -> Self {
-        let mut tabs = 0;
-        let mut spaces = 0;
-        let mut line_blank = true;
-        for c in chars {
-            if c == '\t' {
-                tabs += 1;
-            } else if c == ' ' {
-                spaces += 1;
-            } else {
-                if c != '\n' {
-                    line_blank = false;
-                }
-                break;
-            }
-        }
-        Self {
-            tabs,
-            spaces,
-            line_blank,
-        }
-    }
-}
-
-impl Buffer {
-    pub fn new(replica_id: ReplicaId, remote_id: BufferId, base_text: impl Into<String>) -> Buffer {
-        let mut base_text = base_text.into();
-        let line_ending = LineEnding::detect(&base_text);
-        LineEnding::normalize(&mut base_text);
-        Self::new_normalized(replica_id, remote_id, line_ending, Rope::from(&*base_text))
-    }
-
-    pub fn new_normalized(
-        replica_id: ReplicaId,
-        remote_id: BufferId,
-        line_ending: LineEnding,
-        normalized: Rope,
-    ) -> Buffer {
-        let history = History::new(normalized);
-        let mut fragments = SumTree::new(&None);
-        let mut insertions = SumTree::default();
-
-        let mut lamport_clock = clock::Lamport::new(replica_id);
-        let mut version = clock::Global::new();
-
-        let visible_text = history.base_text.clone();
-        if !visible_text.is_empty() {
-            let insertion_timestamp = clock::Lamport::new(ReplicaId::LOCAL);
-            lamport_clock.observe(insertion_timestamp);
-            version.observe(insertion_timestamp);
-            let fragment_id = Locator::between(&Locator::min(), &Locator::max());
-            let fragment = Fragment {
-                id: fragment_id,
-                timestamp: insertion_timestamp,
-                insertion_offset: 0,
-                len: visible_text.len(),
-                visible: true,
-                deletions: Default::default(),
-                max_undos: Default::default(),
-            };
-            insertions.push(InsertionFragment::new(&fragment), ());
-            fragments.push(fragment, &None);
-        }
-
-        Buffer {
-            snapshot: BufferSnapshot {
-                replica_id,
-                remote_id,
-                visible_text,
-                deleted_text: Rope::new(),
-                line_ending,
-                fragments,
-                insertions,
-                version,
-                undo_map: Default::default(),
-                insertion_slices: Default::default(),
-            },
-            history,
-            deferred_ops: OperationQueue::new(),
-            deferred_replicas: HashSet::default(),
-            lamport_clock,
-            subscriptions: Default::default(),
-            edit_id_resolvers: Default::default(),
-            wait_for_version_txs: Default::default(),
-        }
-    }
-
-    pub fn version(&self) -> clock::Global {
-        self.version.clone()
-    }
-
-    pub fn snapshot(&self) -> BufferSnapshot {
-        self.snapshot.clone()
-    }
-
-    pub fn branch(&self) -> Self {
-        Self {
-            snapshot: self.snapshot.clone(),
-            history: History::new(self.base_text().clone()),
-            deferred_ops: OperationQueue::new(),
-            deferred_replicas: HashSet::default(),
-            lamport_clock: clock::Lamport::new(ReplicaId::LOCAL_BRANCH),
-            subscriptions: Default::default(),
-            edit_id_resolvers: Default::default(),
-            wait_for_version_txs: Default::default(),
-        }
-    }
-
-    pub fn replica_id(&self) -> ReplicaId {
-        self.lamport_clock.replica_id
-    }
-
-    pub fn remote_id(&self) -> BufferId {
-        self.remote_id
-    }
-
-    pub fn deferred_ops_len(&self) -> usize {
-        self.deferred_ops.len()
-    }
-
-    pub fn transaction_group_interval(&self) -> Duration {
-        self.history.group_interval
-    }
-
-    pub fn edit<R, I, S, T>(&mut self, edits: R) -> Operation
-    where
-        R: IntoIterator<IntoIter = I>,
-        I: ExactSizeIterator<Item = (Range<S>, T)>,
-        S: ToOffset,
-        T: Into<Arc<str>>,
-    {
-        let edits = edits
-            .into_iter()
-            .map(|(range, new_text)| (range, new_text.into()));
-
-        self.start_transaction();
-        let timestamp = self.lamport_clock.tick();
-        let operation = Operation::Edit(self.apply_local_edit(edits, timestamp));
-
-        self.history.push(operation.clone());
-        self.history.push_undo(operation.timestamp());
-        self.snapshot.version.observe(operation.timestamp());
-        self.end_transaction();
-        operation
-    }
-
-    fn apply_local_edit<S: ToOffset, T: Into<Arc<str>>>(
-        &mut self,
-        edits: impl ExactSizeIterator<Item = (Range<S>, T)>,
-        timestamp: clock::Lamport,
-    ) -> EditOperation {
-        let mut edits_patch = Patch::default();
-        let mut edit_op = EditOperation {
-            timestamp,
-            version: self.version(),
-            ranges: Vec::with_capacity(edits.len()),
-            new_text: Vec::with_capacity(edits.len()),
-        };
-        let mut new_insertions = Vec::new();
-        let mut insertion_offset = 0;
-        let mut insertion_slices = Vec::new();
-
-        let mut edits = edits
-            .map(|(range, new_text)| (range.to_offset(&*self), new_text))
-            .peekable();
-
-        let mut new_ropes =
-            RopeBuilder::new(self.visible_text.cursor(0), self.deleted_text.cursor(0));
-        let mut old_fragments = self.fragments.cursor::<FragmentTextSummary>(&None);
-        let mut new_fragments = old_fragments.slice(&edits.peek().unwrap().0.start, Bias::Right);
-        new_ropes.append(new_fragments.summary().text);
-
-        let mut fragment_start = old_fragments.start().visible;
-        for (range, new_text) in edits {
-            let new_text = LineEnding::normalize_arc(new_text.into());
-            let fragment_end = old_fragments.end().visible;
-
-            // If the current fragment ends before this range, then jump ahead to the first fragment
-            // that extends past the start of this range, reusing any intervening fragments.
-            if fragment_end < range.start {
-                // If the current fragment has been partially consumed, then consume the rest of it
-                // and advance to the next fragment before slicing.
-                if fragment_start > old_fragments.start().visible {
-                    if fragment_end > fragment_start {
-                        let mut suffix = old_fragments.item().unwrap().clone();
-                        suffix.len = fragment_end - fragment_start;
-                        suffix.insertion_offset += fragment_start - old_fragments.start().visible;
-                        new_insertions.push(InsertionFragment::insert_new(&suffix));
-                        new_ropes.push_fragment(&suffix, suffix.visible);
-                        new_fragments.push(suffix, &None);
-                    }
-                    old_fragments.next();
-                }
-
-                let slice = old_fragments.slice(&range.start, Bias::Right);
-                new_ropes.append(slice.summary().text);
-                new_fragments.append(slice, &None);
-                fragment_start = old_fragments.start().visible;
-            }
-
-            let full_range_start = FullOffset(range.start + old_fragments.start().deleted);
-
-            // Preserve any portion of the current fragment that precedes this range.
-            if fragment_start < range.start {
-                let mut prefix = old_fragments.item().unwrap().clone();
-                prefix.len = range.start - fragment_start;
-                prefix.insertion_offset += fragment_start - old_fragments.start().visible;
-                prefix.id = Locator::between(&new_fragments.summary().max_id, &prefix.id);
-                new_insertions.push(InsertionFragment::insert_new(&prefix));
-                new_ropes.push_fragment(&prefix, prefix.visible);
-                new_fragments.push(prefix, &None);
-                fragment_start = range.start;
-            }
-
-            // Insert the new text before any existing fragments within the range.
-            if !new_text.is_empty() {
-                let new_start = new_fragments.summary().text.visible;
-
-                let fragment = Fragment {
-                    id: Locator::between(
-                        &new_fragments.summary().max_id,
-                        old_fragments
-                            .item()
-                            .map_or(&Locator::max(), |old_fragment| &old_fragment.id),
-                    ),
-                    timestamp,
-                    insertion_offset,
-                    len: new_text.len(),
-                    deletions: Default::default(),
-                    max_undos: Default::default(),
-                    visible: true,
-                };
-                edits_patch.push(Edit {
-                    old: fragment_start..fragment_start,
-                    new: new_start..new_start + new_text.len(),
-                });
-                insertion_slices.push(InsertionSlice::from_fragment(timestamp, &fragment));
-                new_insertions.push(InsertionFragment::insert_new(&fragment));
-                new_ropes.push_str(new_text.as_ref());
-                new_fragments.push(fragment, &None);
-                insertion_offset += new_text.len();
-            }
-
-            // Advance through every fragment that intersects this range, marking the intersecting
-            // portions as deleted.
-            while fragment_start < range.end {
-                let fragment = old_fragments.item().unwrap();
-                let fragment_end = old_fragments.end().visible;
-                let mut intersection = fragment.clone();
-                let intersection_end = cmp::min(range.end, fragment_end);
-                if fragment.visible {
-                    intersection.len = intersection_end - fragment_start;
-                    intersection.insertion_offset += fragment_start - old_fragments.start().visible;
-                    intersection.id =
-                        Locator::between(&new_fragments.summary().max_id, &intersection.id);
-                    intersection.deletions.insert(timestamp);
-                    intersection.visible = false;
-                }
-                if intersection.len > 0 {
-                    if fragment.visible && !intersection.visible {
-                        let new_start = new_fragments.summary().text.visible;
-                        edits_patch.push(Edit {
-                            old: fragment_start..intersection_end,
-                            new: new_start..new_start,
-                        });
-                        insertion_slices
-                            .push(InsertionSlice::from_fragment(timestamp, &intersection));
-                    }
-                    new_insertions.push(InsertionFragment::insert_new(&intersection));
-                    new_ropes.push_fragment(&intersection, fragment.visible);
-                    new_fragments.push(intersection, &None);
-                    fragment_start = intersection_end;
-                }
-                if fragment_end <= range.end {
-                    old_fragments.next();
-                }
-            }
-
-            let full_range_end = FullOffset(range.end + old_fragments.start().deleted);
-            edit_op.ranges.push(full_range_start..full_range_end);
-            edit_op.new_text.push(new_text);
-        }
-
-        // If the current fragment has been partially consumed, then consume the rest of it
-        // and advance to the next fragment before slicing.
-        if fragment_start > old_fragments.start().visible {
-            let fragment_end = old_fragments.end().visible;
-            if fragment_end > fragment_start {
-                let mut suffix = old_fragments.item().unwrap().clone();
-                suffix.len = fragment_end - fragment_start;
-                suffix.insertion_offset += fragment_start - old_fragments.start().visible;
-                new_insertions.push(InsertionFragment::insert_new(&suffix));
-                new_ropes.push_fragment(&suffix, suffix.visible);
-                new_fragments.push(suffix, &None);
-            }
-            old_fragments.next();
-        }
-
-        let suffix = old_fragments.suffix();
-        new_ropes.append(suffix.summary().text);
-        new_fragments.append(suffix, &None);
-        let (visible_text, deleted_text) = new_ropes.finish();
-        drop(old_fragments);
-
-        self.snapshot.fragments = new_fragments;
-        self.snapshot.insertions.edit(new_insertions, ());
-        self.snapshot.visible_text = visible_text;
-        self.snapshot.deleted_text = deleted_text;
-        self.subscriptions.publish_mut(&edits_patch);
-        self.snapshot.insertion_slices.extend(insertion_slices);
-        edit_op
-    }
-
-    pub fn set_line_ending(&mut self, line_ending: LineEnding) {
-        self.snapshot.line_ending = line_ending;
-    }
-
-    pub fn apply_ops<I: IntoIterator<Item = Operation>>(&mut self, ops: I) {
-        let mut deferred_ops = Vec::new();
-        for op in ops {
-            self.history.push(op.clone());
-            if self.can_apply_op(&op) {
-                self.apply_op(op);
-            } else {
-                self.deferred_replicas.insert(op.replica_id());
-                deferred_ops.push(op);
-            }
-        }
-        self.deferred_ops.insert(deferred_ops);
-        self.flush_deferred_ops();
-    }
-
-    fn apply_op(&mut self, op: Operation) {
-        match op {
-            Operation::Edit(edit) => {
-                if !self.version.observed(edit.timestamp) {
-                    self.apply_remote_edit(
-                        &edit.version,
-                        &edit.ranges,
-                        &edit.new_text,
-                        edit.timestamp,
-                    );
-                    self.snapshot.version.observe(edit.timestamp);
-                    self.lamport_clock.observe(edit.timestamp);
-                    self.resolve_edit(edit.timestamp);
-                }
-            }
-            Operation::Undo(undo) => {
-                if !self.version.observed(undo.timestamp) {
-                    self.apply_undo(&undo);
-                    self.snapshot.version.observe(undo.timestamp);
-                    self.lamport_clock.observe(undo.timestamp);
-                }
-            }
-        }
-        self.wait_for_version_txs.retain_mut(|(version, tx)| {
-            if self.snapshot.version().observed_all(version) {
-                tx.try_send(()).ok();
-                false
-            } else {
-                true
-            }
-        });
-    }
-
-    fn apply_remote_edit(
-        &mut self,
-        version: &clock::Global,
-        ranges: &[Range<FullOffset>],
-        new_text: &[Arc<str>],
-        timestamp: clock::Lamport,
-    ) {
-        if ranges.is_empty() {
-            return;
-        }
-
-        let edits = ranges.iter().zip(new_text.iter());
-        let mut edits_patch = Patch::default();
-        let mut insertion_slices = Vec::new();
-        let cx = Some(version.clone());
-        let mut new_insertions = Vec::new();
-        let mut insertion_offset = 0;
-        let mut new_ropes =
-            RopeBuilder::new(self.visible_text.cursor(0), self.deleted_text.cursor(0));
-        let mut old_fragments = self
-            .fragments
-            .cursor::<Dimensions<VersionedFullOffset, usize>>(&cx);
-        let mut new_fragments =
-            old_fragments.slice(&VersionedFullOffset::Offset(ranges[0].start), Bias::Left);
-        new_ropes.append(new_fragments.summary().text);
-
-        let mut fragment_start = old_fragments.start().0.full_offset();
-        for (range, new_text) in edits {
-            let fragment_end = old_fragments.end().0.full_offset();
-
-            // If the current fragment ends before this range, then jump ahead to the first fragment
-            // that extends past the start of this range, reusing any intervening fragments.
-            if fragment_end < range.start {
-                // If the current fragment has been partially consumed, then consume the rest of it
-                // and advance to the next fragment before slicing.
-                if fragment_start > old_fragments.start().0.full_offset() {
-                    if fragment_end > fragment_start {
-                        let mut suffix = old_fragments.item().unwrap().clone();
-                        suffix.len = fragment_end.0 - fragment_start.0;
-                        suffix.insertion_offset +=
-                            fragment_start - old_fragments.start().0.full_offset();
-                        new_insertions.push(InsertionFragment::insert_new(&suffix));
-                        new_ropes.push_fragment(&suffix, suffix.visible);
-                        new_fragments.push(suffix, &None);
-                    }
-                    old_fragments.next();
-                }
-
-                let slice =
-                    old_fragments.slice(&VersionedFullOffset::Offset(range.start), Bias::Left);
-                new_ropes.append(slice.summary().text);
-                new_fragments.append(slice, &None);
-                fragment_start = old_fragments.start().0.full_offset();
-            }
-
-            // If we are at the end of a non-concurrent fragment, advance to the next one.
-            let fragment_end = old_fragments.end().0.full_offset();
-            if fragment_end == range.start && fragment_end > fragment_start {
-                let mut fragment = old_fragments.item().unwrap().clone();
-                fragment.len = fragment_end.0 - fragment_start.0;
-                fragment.insertion_offset += fragment_start - old_fragments.start().0.full_offset();
-                new_insertions.push(InsertionFragment::insert_new(&fragment));
-                new_ropes.push_fragment(&fragment, fragment.visible);
-                new_fragments.push(fragment, &None);
-                old_fragments.next();
-                fragment_start = old_fragments.start().0.full_offset();
-            }
-
-            // Skip over insertions that are concurrent to this edit, but have a lower lamport
-            // timestamp.
-            while let Some(fragment) = old_fragments.item() {
-                if fragment_start == range.start && fragment.timestamp > timestamp {
-                    new_ropes.push_fragment(fragment, fragment.visible);
-                    new_fragments.push(fragment.clone(), &None);
-                    old_fragments.next();
-                    debug_assert_eq!(fragment_start, range.start);
-                } else {
-                    break;
-                }
-            }
-            debug_assert!(fragment_start <= range.start);
-
-            // Preserve any portion of the current fragment that precedes this range.
-            if fragment_start < range.start {
-                let mut prefix = old_fragments.item().unwrap().clone();
-                prefix.len = range.start.0 - fragment_start.0;
-                prefix.insertion_offset += fragment_start - old_fragments.start().0.full_offset();
-                prefix.id = Locator::between(&new_fragments.summary().max_id, &prefix.id);
-                new_insertions.push(InsertionFragment::insert_new(&prefix));
-                fragment_start = range.start;
-                new_ropes.push_fragment(&prefix, prefix.visible);
-                new_fragments.push(prefix, &None);
-            }
-
-            // Insert the new text before any existing fragments within the range.
-            if !new_text.is_empty() {
-                let mut old_start = old_fragments.start().1;
-                if old_fragments.item().is_some_and(|f| f.visible) {
-                    old_start += fragment_start.0 - old_fragments.start().0.full_offset().0;
-                }
-                let new_start = new_fragments.summary().text.visible;
-                let fragment = Fragment {
-                    id: Locator::between(
-                        &new_fragments.summary().max_id,
-                        old_fragments
-                            .item()
-                            .map_or(&Locator::max(), |old_fragment| &old_fragment.id),
-                    ),
-                    timestamp,
-                    insertion_offset,
-                    len: new_text.len(),
-                    deletions: Default::default(),
-                    max_undos: Default::default(),
-                    visible: true,
-                };
-                edits_patch.push(Edit {
-                    old: old_start..old_start,
-                    new: new_start..new_start + new_text.len(),
-                });
-                insertion_slices.push(InsertionSlice::from_fragment(timestamp, &fragment));
-                new_insertions.push(InsertionFragment::insert_new(&fragment));
-                new_ropes.push_str(new_text);
-                new_fragments.push(fragment, &None);
-                insertion_offset += new_text.len();
-            }
-
-            // Advance through every fragment that intersects this range, marking the intersecting
-            // portions as deleted.
-            while fragment_start < range.end {
-                let fragment = old_fragments.item().unwrap();
-                let fragment_end = old_fragments.end().0.full_offset();
-                let mut intersection = fragment.clone();
-                let intersection_end = cmp::min(range.end, fragment_end);
-                if fragment.was_visible(version, &self.undo_map) {
-                    intersection.len = intersection_end.0 - fragment_start.0;
-                    intersection.insertion_offset +=
-                        fragment_start - old_fragments.start().0.full_offset();
-                    intersection.id =
-                        Locator::between(&new_fragments.summary().max_id, &intersection.id);
-                    intersection.deletions.insert(timestamp);
-                    intersection.visible = false;
-                    insertion_slices.push(InsertionSlice::from_fragment(timestamp, &intersection));
-                }
-                if intersection.len > 0 {
-                    if fragment.visible && !intersection.visible {
-                        let old_start = old_fragments.start().1
-                            + (fragment_start.0 - old_fragments.start().0.full_offset().0);
-                        let new_start = new_fragments.summary().text.visible;
-                        edits_patch.push(Edit {
-                            old: old_start..old_start + intersection.len,
-                            new: new_start..new_start,
-                        });
-                    }
-                    new_insertions.push(InsertionFragment::insert_new(&intersection));
-                    new_ropes.push_fragment(&intersection, fragment.visible);
-                    new_fragments.push(intersection, &None);
-                    fragment_start = intersection_end;
-                }
-                if fragment_end <= range.end {
-                    old_fragments.next();
-                }
-            }
-        }
-
-        // If the current fragment has been partially consumed, then consume the rest of it
-        // and advance to the next fragment before slicing.
-        if fragment_start > old_fragments.start().0.full_offset() {
-            let fragment_end = old_fragments.end().0.full_offset();
-            if fragment_end > fragment_start {
-                let mut suffix = old_fragments.item().unwrap().clone();
-                suffix.len = fragment_end.0 - fragment_start.0;
-                suffix.insertion_offset += fragment_start - old_fragments.start().0.full_offset();
-                new_insertions.push(InsertionFragment::insert_new(&suffix));
-                new_ropes.push_fragment(&suffix, suffix.visible);
-                new_fragments.push(suffix, &None);
-            }
-            old_fragments.next();
-        }
-
-        let suffix = old_fragments.suffix();
-        new_ropes.append(suffix.summary().text);
-        new_fragments.append(suffix, &None);
-        let (visible_text, deleted_text) = new_ropes.finish();
-        drop(old_fragments);
-
-        self.snapshot.fragments = new_fragments;
-        self.snapshot.visible_text = visible_text;
-        self.snapshot.deleted_text = deleted_text;
-        self.snapshot.insertions.edit(new_insertions, ());
-        self.snapshot.insertion_slices.extend(insertion_slices);
-        self.subscriptions.publish_mut(&edits_patch)
-    }
-
-    fn fragment_ids_for_edits<'a>(
-        &'a self,
-        edit_ids: impl Iterator<Item = &'a clock::Lamport>,
-    ) -> Vec<&'a Locator> {
-        // Get all of the insertion slices changed by the given edits.
-        let mut insertion_slices = Vec::new();
-        for edit_id in edit_ids {
-            let insertion_slice = InsertionSlice {
-                edit_id: *edit_id,
-                insertion_id: clock::Lamport::MIN,
-                range: 0..0,
-            };
-            let slices = self
-                .snapshot
-                .insertion_slices
-                .iter_from(&insertion_slice)
-                .take_while(|slice| slice.edit_id == *edit_id);
-            insertion_slices.extend(slices)
-        }
-        insertion_slices
-            .sort_unstable_by_key(|s| (s.insertion_id, s.range.start, Reverse(s.range.end)));
-
-        // Get all of the fragments corresponding to these insertion slices.
-        let mut fragment_ids = Vec::new();
-        let mut insertions_cursor = self.insertions.cursor::<InsertionFragmentKey>(());
-        for insertion_slice in &insertion_slices {
-            if insertion_slice.insertion_id != insertions_cursor.start().timestamp
-                || insertion_slice.range.start > insertions_cursor.start().split_offset
-            {
-                insertions_cursor.seek_forward(
-                    &InsertionFragmentKey {
-                        timestamp: insertion_slice.insertion_id,
-                        split_offset: insertion_slice.range.start,
-                    },
-                    Bias::Left,
-                );
-            }
-            while let Some(item) = insertions_cursor.item() {
-                if item.timestamp != insertion_slice.insertion_id
-                    || item.split_offset >= insertion_slice.range.end
-                {
-                    break;
-                }
-                fragment_ids.push(&item.fragment_id);
-                insertions_cursor.next();
-            }
-        }
-        fragment_ids.sort_unstable();
-        fragment_ids
-    }
-
-    fn apply_undo(&mut self, undo: &UndoOperation) {
-        self.snapshot.undo_map.insert(undo);
-
-        let mut edits = Patch::default();
-        let mut old_fragments = self
-            .fragments
-            .cursor::<Dimensions<Option<&Locator>, usize>>(&None);
-        let mut new_fragments = SumTree::new(&None);
-        let mut new_ropes =
-            RopeBuilder::new(self.visible_text.cursor(0), self.deleted_text.cursor(0));
-
-        for fragment_id in self.fragment_ids_for_edits(undo.counts.keys()) {
-            let preceding_fragments = old_fragments.slice(&Some(fragment_id), Bias::Left);
-            new_ropes.append(preceding_fragments.summary().text);
-            new_fragments.append(preceding_fragments, &None);
-
-            if let Some(fragment) = old_fragments.item() {
-                let mut fragment = fragment.clone();
-                let fragment_was_visible = fragment.visible;
-
-                fragment.visible = fragment.is_visible(&self.undo_map);
-                fragment.max_undos.observe(undo.timestamp);
-
-                let old_start = old_fragments.start().1;
-                let new_start = new_fragments.summary().text.visible;
-                if fragment_was_visible && !fragment.visible {
-                    edits.push(Edit {
-                        old: old_start..old_start + fragment.len,
-                        new: new_start..new_start,
-                    });
-                } else if !fragment_was_visible && fragment.visible {
-                    edits.push(Edit {
-                        old: old_start..old_start,
-                        new: new_start..new_start + fragment.len,
-                    });
-                }
-                new_ropes.push_fragment(&fragment, fragment_was_visible);
-                new_fragments.push(fragment, &None);
-
-                old_fragments.next();
-            }
-        }
-
-        let suffix = old_fragments.suffix();
-        new_ropes.append(suffix.summary().text);
-        new_fragments.append(suffix, &None);
-
-        drop(old_fragments);
-        let (visible_text, deleted_text) = new_ropes.finish();
-        self.snapshot.fragments = new_fragments;
-        self.snapshot.visible_text = visible_text;
-        self.snapshot.deleted_text = deleted_text;
-        self.subscriptions.publish_mut(&edits);
-    }
-
-    fn flush_deferred_ops(&mut self) {
-        self.deferred_replicas.clear();
-        let mut deferred_ops = Vec::new();
-        for op in self.deferred_ops.drain().iter().cloned() {
-            if self.can_apply_op(&op) {
-                self.apply_op(op);
-            } else {
-                self.deferred_replicas.insert(op.replica_id());
-                deferred_ops.push(op);
-            }
-        }
-        self.deferred_ops.insert(deferred_ops);
-    }
-
-    fn can_apply_op(&self, op: &Operation) -> bool {
-        if self.deferred_replicas.contains(&op.replica_id()) {
-            false
-        } else {
-            self.version.observed_all(match op {
-                Operation::Edit(edit) => &edit.version,
-                Operation::Undo(undo) => &undo.version,
-            })
-        }
-    }
-
-    pub fn has_deferred_ops(&self) -> bool {
-        !self.deferred_ops.is_empty()
-    }
-
-    pub fn peek_undo_stack(&self) -> Option<&HistoryEntry> {
-        self.history.undo_stack.last()
-    }
-
-    pub fn peek_redo_stack(&self) -> Option<&HistoryEntry> {
-        self.history.redo_stack.last()
-    }
-
-    pub fn start_transaction(&mut self) -> Option<TransactionId> {
-        self.start_transaction_at(Instant::now())
-    }
-
-    pub fn start_transaction_at(&mut self, now: Instant) -> Option<TransactionId> {
-        self.history
-            .start_transaction(self.version.clone(), now, &mut self.lamport_clock)
-    }
-
-    pub fn end_transaction(&mut self) -> Option<(TransactionId, clock::Global)> {
-        self.end_transaction_at(Instant::now())
-    }
-
-    pub fn end_transaction_at(&mut self, now: Instant) -> Option<(TransactionId, clock::Global)> {
-        if let Some(entry) = self.history.end_transaction(now) {
-            let since = entry.transaction.start.clone();
-            let id = self.history.group().unwrap();
-            Some((id, since))
-        } else {
-            None
-        }
-    }
-
-    pub fn finalize_last_transaction(&mut self) -> Option<&Transaction> {
-        self.history.finalize_last_transaction()
-    }
-
-    pub fn group_until_transaction(&mut self, transaction_id: TransactionId) {
-        self.history.group_until(transaction_id);
-    }
-
-    pub fn base_text(&self) -> &Rope {
-        &self.history.base_text
-    }
-
-    pub fn operations(&self) -> &TreeMap<clock::Lamport, Operation> {
-        &self.history.operations
-    }
-
-    pub fn undo(&mut self) -> Option<(TransactionId, Operation)> {
-        if let Some(entry) = self.history.pop_undo() {
-            let transaction = entry.transaction.clone();
-            let transaction_id = transaction.id;
-            let op = self.undo_or_redo(transaction);
-            Some((transaction_id, op))
-        } else {
-            None
-        }
-    }
-
-    pub fn undo_transaction(&mut self, transaction_id: TransactionId) -> Option<Operation> {
-        let transaction = self
-            .history
-            .remove_from_undo(transaction_id)?
-            .transaction
-            .clone();
-        Some(self.undo_or_redo(transaction))
-    }
-
-    pub fn undo_to_transaction(&mut self, transaction_id: TransactionId) -> Vec<Operation> {
-        let transactions = self
-            .history
-            .remove_from_undo_until(transaction_id)
-            .iter()
-            .map(|entry| entry.transaction.clone())
-            .collect::<Vec<_>>();
-
-        transactions
-            .into_iter()
-            .map(|transaction| self.undo_or_redo(transaction))
-            .collect()
-    }
-
-    pub fn forget_transaction(&mut self, transaction_id: TransactionId) -> Option<Transaction> {
-        self.history.forget(transaction_id)
-    }
-
-    pub fn get_transaction(&self, transaction_id: TransactionId) -> Option<&Transaction> {
-        self.history.transaction(transaction_id)
-    }
-
-    pub fn merge_transactions(&mut self, transaction: TransactionId, destination: TransactionId) {
-        self.history.merge_transactions(transaction, destination);
-    }
-
-    pub fn redo(&mut self) -> Option<(TransactionId, Operation)> {
-        if let Some(entry) = self.history.pop_redo() {
-            let transaction = entry.transaction.clone();
-            let transaction_id = transaction.id;
-            let op = self.undo_or_redo(transaction);
-            Some((transaction_id, op))
-        } else {
-            None
-        }
-    }
-
-    pub fn redo_to_transaction(&mut self, transaction_id: TransactionId) -> Vec<Operation> {
-        let transactions = self
-            .history
-            .remove_from_redo(transaction_id)
-            .iter()
-            .map(|entry| entry.transaction.clone())
-            .collect::<Vec<_>>();
-
-        transactions
-            .into_iter()
-            .map(|transaction| self.undo_or_redo(transaction))
-            .collect()
-    }
-
-    fn undo_or_redo(&mut self, transaction: Transaction) -> Operation {
-        let mut counts = HashMap::default();
-        for edit_id in transaction.edit_ids {
-            counts.insert(edit_id, self.undo_map.undo_count(edit_id).saturating_add(1));
-        }
-
-        let operation = self.undo_operations(counts);
-        self.history.push(operation.clone());
-        operation
-    }
-
-    pub fn undo_operations(&mut self, counts: HashMap<clock::Lamport, u32>) -> Operation {
-        let timestamp = self.lamport_clock.tick();
-        let version = self.version();
-        self.snapshot.version.observe(timestamp);
-        let undo = UndoOperation {
-            timestamp,
-            version,
-            counts,
-        };
-        self.apply_undo(&undo);
-        Operation::Undo(undo)
-    }
-
-    pub fn push_transaction(&mut self, transaction: Transaction, now: Instant) {
-        self.history.push_transaction(transaction, now);
-    }
-
-    /// Differs from `push_transaction` in that it does not clear the redo stack.
-    /// The caller responsible for
-    /// Differs from `push_transaction` in that it does not clear the redo
-    /// stack. Intended to be used to create a parent transaction to merge
-    /// potential child transactions into.
-    ///
-    /// The caller is responsible for removing it from the undo history using
-    /// `forget_transaction` if no edits are merged into it. Otherwise, if edits
-    /// are merged into this transaction, the caller is responsible for ensuring
-    /// the redo stack is cleared. The easiest way to ensure the redo stack is
-    /// cleared is to create transactions with the usual `start_transaction` and
-    /// `end_transaction` methods and merging the resulting transactions into
-    /// the transaction created by this method
-    pub fn push_empty_transaction(&mut self, now: Instant) -> TransactionId {
-        self.history
-            .push_empty_transaction(self.version.clone(), now, &mut self.lamport_clock)
-    }
-
-    pub fn edited_ranges_for_transaction_id<D>(
-        &self,
-        transaction_id: TransactionId,
-    ) -> impl '_ + Iterator<Item = Range<D>>
-    where
-        D: TextDimension,
-    {
-        self.history
-            .transaction(transaction_id)
-            .into_iter()
-            .flat_map(|transaction| self.edited_ranges_for_transaction(transaction))
-    }
-
-    pub fn edited_ranges_for_edit_ids<'a, D>(
-        &'a self,
-        edit_ids: impl IntoIterator<Item = &'a clock::Lamport>,
-    ) -> impl 'a + Iterator<Item = Range<D>>
-    where
-        D: TextDimension,
-    {
-        // get fragment ranges
-        let mut cursor = self
-            .fragments
-            .cursor::<Dimensions<Option<&Locator>, usize>>(&None);
-        let offset_ranges = self
-            .fragment_ids_for_edits(edit_ids.into_iter())
-            .into_iter()
-            .filter_map(move |fragment_id| {
-                cursor.seek_forward(&Some(fragment_id), Bias::Left);
-                let fragment = cursor.item()?;
-                let start_offset = cursor.start().1;
-                let end_offset = start_offset + if fragment.visible { fragment.len } else { 0 };
-                Some(start_offset..end_offset)
-            });
-
-        // combine adjacent ranges
-        let mut prev_range: Option<Range<usize>> = None;
-        let disjoint_ranges = offset_ranges
-            .map(Some)
-            .chain([None])
-            .filter_map(move |range| {
-                if let Some((range, prev_range)) = range.as_ref().zip(prev_range.as_mut())
-                    && prev_range.end == range.start
-                {
-                    prev_range.end = range.end;
-                    return None;
-                }
-                let result = prev_range.clone();
-                prev_range = range;
-                result
-            });
-
-        // convert to the desired text dimension.
-        let mut position = D::zero(());
-        let mut rope_cursor = self.visible_text.cursor(0);
-        disjoint_ranges.map(move |range| {
-            position.add_assign(&rope_cursor.summary(range.start));
-            let start = position;
-            position.add_assign(&rope_cursor.summary(range.end));
-            let end = position;
-            start..end
-        })
-    }
-
-    pub fn edited_ranges_for_transaction<'a, D>(
-        &'a self,
-        transaction: &'a Transaction,
-    ) -> impl 'a + Iterator<Item = Range<D>>
-    where
-        D: TextDimension,
-    {
-        self.edited_ranges_for_edit_ids(&transaction.edit_ids)
-    }
-
-    pub fn subscribe(&mut self) -> Subscription<usize> {
-        self.subscriptions.subscribe()
-    }
-
-    pub fn wait_for_edits<It: IntoIterator<Item = clock::Lamport>>(
-        &mut self,
-        edit_ids: It,
-    ) -> impl 'static + Future<Output = Result<()>> + use<It> {
-        let mut futures = Vec::new();
-        for edit_id in edit_ids {
-            if !self.version.observed(edit_id) {
-                let (tx, rx) = oneshot::channel();
-                self.edit_id_resolvers.entry(edit_id).or_default().push(tx);
-                futures.push(rx);
-            }
-        }
-
-        async move {
-            for mut future in futures {
-                if future.recv().await.is_none() {
-                    anyhow::bail!("gave up waiting for edits");
-                }
-            }
-            Ok(())
-        }
-    }
-
-    pub fn wait_for_anchors<It: IntoIterator<Item = Anchor>>(
-        &mut self,
-        anchors: It,
-    ) -> impl 'static + Future<Output = Result<()>> + use<It> {
-        let mut futures = Vec::new();
-        for anchor in anchors {
-            if !self.version.observed(anchor.timestamp) && !anchor.is_max() && !anchor.is_min() {
-                let (tx, rx) = oneshot::channel();
-                self.edit_id_resolvers
-                    .entry(anchor.timestamp)
-                    .or_default()
-                    .push(tx);
-                futures.push(rx);
-            }
-        }
-
-        async move {
-            for mut future in futures {
-                if future.recv().await.is_none() {
-                    anyhow::bail!("gave up waiting for anchors");
-                }
-            }
-            Ok(())
-        }
-    }
-
-    pub fn wait_for_version(
-        &mut self,
-        version: clock::Global,
-    ) -> impl Future<Output = Result<()>> + use<> {
-        let mut rx = None;
-        if !self.snapshot.version.observed_all(&version) {
-            let channel = oneshot::channel();
-            self.wait_for_version_txs.push((version, channel.0));
-            rx = Some(channel.1);
-        }
-        async move {
-            if let Some(mut rx) = rx
-                && rx.recv().await.is_none()
-            {
-                anyhow::bail!("gave up waiting for version");
-            }
-            Ok(())
-        }
-    }
-
-    pub fn give_up_waiting(&mut self) {
-        self.edit_id_resolvers.clear();
-        self.wait_for_version_txs.clear();
-    }
-
-    fn resolve_edit(&mut self, edit_id: clock::Lamport) {
-        for mut tx in self
-            .edit_id_resolvers
-            .remove(&edit_id)
-            .into_iter()
-            .flatten()
-        {
-            tx.try_send(()).ok();
-        }
-    }
-}
-
-#[cfg(any(test, feature = "test-support"))]
-impl Buffer {
-    #[track_caller]
-    pub fn edit_via_marked_text(&mut self, marked_string: &str) {
-        let edits = self.edits_for_marked_text(marked_string);
-        self.edit(edits);
-    }
-
-    #[track_caller]
-    pub fn edits_for_marked_text(&self, marked_string: &str) -> Vec<(Range<usize>, String)> {
-        let old_text = self.text();
-        let (new_text, mut ranges) = util::test::marked_text_ranges(marked_string, false);
-        if ranges.is_empty() {
-            ranges.push(0..new_text.len());
-        }
-
-        assert_eq!(
-            old_text[..ranges[0].start],
-            new_text[..ranges[0].start],
-            "invalid edit"
-        );
-
-        let mut delta = 0;
-        let mut edits = Vec::new();
-        let mut ranges = ranges.into_iter().peekable();
-
-        while let Some(inserted_range) = ranges.next() {
-            let new_start = inserted_range.start;
-            let old_start = (new_start as isize - delta) as usize;
-
-            let following_text = if let Some(next_range) = ranges.peek() {
-                &new_text[inserted_range.end..next_range.start]
-            } else {
-                &new_text[inserted_range.end..]
-            };
-
-            let inserted_len = inserted_range.len();
-            let deleted_len = old_text[old_start..]
-                .find(following_text)
-                .expect("invalid edit");
-
-            let old_range = old_start..old_start + deleted_len;
-            edits.push((old_range, new_text[inserted_range].to_string()));
-            delta += inserted_len as isize - deleted_len as isize;
-        }
-
-        assert_eq!(
-            old_text.len() as isize + delta,
-            new_text.len() as isize,
-            "invalid edit"
-        );
-
-        edits
-    }
-
-    pub fn check_invariants(&self) {
-        // Ensure every fragment is ordered by locator in the fragment tree and corresponds
-        // to an insertion fragment in the insertions tree.
-        let mut prev_fragment_id = Locator::min();
-        for fragment in self.snapshot.fragments.items(&None) {
-            assert!(fragment.id > prev_fragment_id);
-            prev_fragment_id = fragment.id.clone();
-
-            let insertion_fragment = self
-                .snapshot
-                .insertions
-                .get(
-                    &InsertionFragmentKey {
-                        timestamp: fragment.timestamp,
-                        split_offset: fragment.insertion_offset,
-                    },
-                    (),
-                )
-                .unwrap();
-            assert_eq!(
-                insertion_fragment.fragment_id, fragment.id,
-                "fragment: {:?}\ninsertion: {:?}",
-                fragment, insertion_fragment
-            );
-        }
-
-        let mut cursor = self.snapshot.fragments.cursor::<Option<&Locator>>(&None);
-        for insertion_fragment in self.snapshot.insertions.cursor::<()>(()) {
-            cursor.seek(&Some(&insertion_fragment.fragment_id), Bias::Left);
-            let fragment = cursor.item().unwrap();
-            assert_eq!(insertion_fragment.fragment_id, fragment.id);
-            assert_eq!(insertion_fragment.split_offset, fragment.insertion_offset);
-        }
-
-        let fragment_summary = self.snapshot.fragments.summary();
-        assert_eq!(
-            fragment_summary.text.visible,
-            self.snapshot.visible_text.len()
-        );
-        assert_eq!(
-            fragment_summary.text.deleted,
-            self.snapshot.deleted_text.len()
-        );
-
-        assert!(!self.text().contains("\r\n"));
-    }
-
-    pub fn set_group_interval(&mut self, group_interval: Duration) {
-        self.history.group_interval = group_interval;
-    }
-
-    pub fn random_byte_range(&self, start_offset: usize, rng: &mut impl rand::Rng) -> Range<usize> {
-        let end = self.clip_offset(rng.random_range(start_offset..=self.len()), Bias::Right);
-        let start = self.clip_offset(rng.random_range(start_offset..=end), Bias::Right);
-        start..end
-    }
-
-    pub fn get_random_edits<T>(
-        &self,
-        rng: &mut T,
-        edit_count: usize,
-    ) -> Vec<(Range<usize>, Arc<str>)>
-    where
-        T: rand::Rng,
-    {
-        let mut edits: Vec<(Range<usize>, Arc<str>)> = Vec::new();
-        let mut last_end = None;
-        for _ in 0..edit_count {
-            if last_end.is_some_and(|last_end| last_end >= self.len()) {
-                break;
-            }
-            let new_start = last_end.map_or(0, |last_end| last_end + 1);
-            let range = self.random_byte_range(new_start, rng);
-            last_end = Some(range.end);
-
-            let new_text_len = rng.random_range(0..10);
-            let new_text: String = RandomCharIter::new(&mut *rng).take(new_text_len).collect();
-
-            edits.push((range, new_text.into()));
-        }
-        edits
-    }
-
-    pub fn randomly_edit<T>(
-        &mut self,
-        rng: &mut T,
-        edit_count: usize,
-    ) -> (Vec<(Range<usize>, Arc<str>)>, Operation)
-    where
-        T: rand::Rng,
-    {
-        let mut edits = self.get_random_edits(rng, edit_count);
-        log::info!("mutating buffer {:?} with {:?}", self.replica_id, edits);
-
-        let op = self.edit(edits.iter().cloned());
-        if let Operation::Edit(edit) = &op {
-            assert_eq!(edits.len(), edit.new_text.len());
-            for (edit, new_text) in edits.iter_mut().zip(&edit.new_text) {
-                edit.1 = new_text.clone();
-            }
-        } else {
-            unreachable!()
-        }
-
-        (edits, op)
-    }
-
-    pub fn randomly_undo_redo(&mut self, rng: &mut impl rand::Rng) -> Vec<Operation> {
-        use rand::prelude::*;
-
-        let mut ops = Vec::new();
-        for _ in 0..rng.random_range(1..=5) {
-            if let Some(entry) = self.history.undo_stack.choose(rng) {
-                let transaction = entry.transaction.clone();
-                log::info!(
-                    "undoing buffer {:?} transaction {:?}",
-                    self.replica_id,
-                    transaction
-                );
-                ops.push(self.undo_or_redo(transaction));
-            }
-        }
-        ops
-    }
-}
-
-impl Deref for Buffer {
-    type Target = BufferSnapshot;
-
-    fn deref(&self) -> &Self::Target {
-        &self.snapshot
-    }
-}
-
-impl BufferSnapshot {
-    pub fn as_rope(&self) -> &Rope {
-        &self.visible_text
-    }
-
-    pub fn rope_for_version(&self, version: &clock::Global) -> Rope {
-        let mut rope = Rope::new();
-
-        let mut cursor = self
-            .fragments
-            .filter::<_, FragmentTextSummary>(&None, move |summary| {
-                !version.observed_all(&summary.max_version)
-            });
-        cursor.next();
-
-        let mut visible_cursor = self.visible_text.cursor(0);
-        let mut deleted_cursor = self.deleted_text.cursor(0);
-
-        while let Some(fragment) = cursor.item() {
-            if cursor.start().visible > visible_cursor.offset() {
-                let text = visible_cursor.slice(cursor.start().visible);
-                rope.append(text);
-            }
-
-            if fragment.was_visible(version, &self.undo_map) {
-                if fragment.visible {
-                    let text = visible_cursor.slice(cursor.end().visible);
-                    rope.append(text);
-                } else {
-                    deleted_cursor.seek_forward(cursor.start().deleted);
-                    let text = deleted_cursor.slice(cursor.end().deleted);
-                    rope.append(text);
-                }
-            } else if fragment.visible {
-                visible_cursor.seek_forward(cursor.end().visible);
-            }
-
-            cursor.next();
-        }
-
-        if cursor.start().visible > visible_cursor.offset() {
-            let text = visible_cursor.slice(cursor.start().visible);
-            rope.append(text);
-        }
-
-        rope
-    }
-
-    pub fn remote_id(&self) -> BufferId {
-        self.remote_id
-    }
-
-    pub fn replica_id(&self) -> ReplicaId {
-        self.replica_id
-    }
-
-    pub fn row_count(&self) -> u32 {
-        self.max_point().row + 1
-    }
-
-    pub fn len(&self) -> usize {
-        self.visible_text.len()
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.len() == 0
-    }
-
-    pub fn chars(&self) -> impl Iterator<Item = char> + '_ {
-        self.chars_at(0)
-    }
-
-    pub fn chars_for_range<T: ToOffset>(&self, range: Range<T>) -> impl Iterator<Item = char> + '_ {
-        self.text_for_range(range).flat_map(str::chars)
-    }
-
-    pub fn reversed_chars_for_range<T: ToOffset>(
-        &self,
-        range: Range<T>,
-    ) -> impl Iterator<Item = char> + '_ {
-        self.reversed_chunks_in_range(range)
-            .flat_map(|chunk| chunk.chars().rev())
-    }
-
-    pub fn contains_str_at<T>(&self, position: T, needle: &str) -> bool
-    where
-        T: ToOffset,
-    {
-        let position = position.to_offset(self);
-        position == self.clip_offset(position, Bias::Left)
-            && self
-                .bytes_in_range(position..self.len())
-                .flatten()
-                .copied()
-                .take(needle.len())
-                .eq(needle.bytes())
-    }
-
-    pub fn common_prefix_at<T>(&self, position: T, needle: &str) -> Range<T>
-    where
-        T: ToOffset + TextDimension,
-    {
-        let offset = position.to_offset(self);
-        let common_prefix_len = needle
-            .char_indices()
-            .map(|(index, _)| index)
-            .chain([needle.len()])
-            .take_while(|&len| len <= offset)
-            .filter(|&len| {
-                let left = self
-                    .chars_for_range(offset - len..offset)
-                    .flat_map(char::to_lowercase);
-                let right = needle[..len].chars().flat_map(char::to_lowercase);
-                left.eq(right)
-            })
-            .last()
-            .unwrap_or(0);
-        let start_offset = offset - common_prefix_len;
-        let start = self.text_summary_for_range(0..start_offset);
-        start..position
-    }
-
-    pub fn text(&self) -> String {
-        self.visible_text.to_string()
-    }
-
-    pub fn line_ending(&self) -> LineEnding {
-        self.line_ending
-    }
-
-    pub fn deleted_text(&self) -> String {
-        self.deleted_text.to_string()
-    }
-
-    pub fn fragments(&self) -> impl Iterator<Item = &Fragment> {
-        self.fragments.iter()
-    }
-
-    pub fn text_summary(&self) -> TextSummary {
-        self.visible_text.summary()
-    }
-
-    pub fn max_point(&self) -> Point {
-        self.visible_text.max_point()
-    }
-
-    pub fn max_point_utf16(&self) -> PointUtf16 {
-        self.visible_text.max_point_utf16()
-    }
-
-    pub fn point_to_offset(&self, point: Point) -> usize {
-        self.visible_text.point_to_offset(point)
-    }
-
-    pub fn point_to_offset_utf16(&self, point: Point) -> OffsetUtf16 {
-        self.visible_text.point_to_offset_utf16(point)
-    }
-
-    pub fn point_utf16_to_offset_utf16(&self, point: PointUtf16) -> OffsetUtf16 {
-        self.visible_text.point_utf16_to_offset_utf16(point)
-    }
-
-    pub fn point_utf16_to_offset(&self, point: PointUtf16) -> usize {
-        self.visible_text.point_utf16_to_offset(point)
-    }
-
-    pub fn unclipped_point_utf16_to_offset(&self, point: Unclipped<PointUtf16>) -> usize {
-        self.visible_text.unclipped_point_utf16_to_offset(point)
-    }
-
-    pub fn unclipped_point_utf16_to_point(&self, point: Unclipped<PointUtf16>) -> Point {
-        self.visible_text.unclipped_point_utf16_to_point(point)
-    }
-
-    pub fn offset_utf16_to_offset(&self, offset: OffsetUtf16) -> usize {
-        self.visible_text.offset_utf16_to_offset(offset)
-    }
-
-    pub fn offset_to_offset_utf16(&self, offset: usize) -> OffsetUtf16 {
-        self.visible_text.offset_to_offset_utf16(offset)
-    }
-
-    pub fn offset_to_point(&self, offset: usize) -> Point {
-        self.visible_text.offset_to_point(offset)
-    }
-
-    pub fn offset_to_point_utf16(&self, offset: usize) -> PointUtf16 {
-        self.visible_text.offset_to_point_utf16(offset)
-    }
-
-    pub fn point_to_point_utf16(&self, point: Point) -> PointUtf16 {
-        self.visible_text.point_to_point_utf16(point)
-    }
-
-    pub fn point_utf16_to_point(&self, point: PointUtf16) -> Point {
-        self.visible_text.point_utf16_to_point(point)
-    }
-
-    pub fn version(&self) -> &clock::Global {
-        &self.version
-    }
-
-    pub fn chars_at<T: ToOffset>(&self, position: T) -> impl Iterator<Item = char> + '_ {
-        let offset = position.to_offset(self);
-        self.visible_text.chars_at(offset)
-    }
-
-    pub fn reversed_chars_at<T: ToOffset>(&self, position: T) -> impl Iterator<Item = char> + '_ {
-        let offset = position.to_offset(self);
-        self.visible_text.reversed_chars_at(offset)
-    }
-
-    pub fn reversed_chunks_in_range<T: ToOffset>(&self, range: Range<T>) -> rope::Chunks<'_> {
-        let range = range.start.to_offset(self)..range.end.to_offset(self);
-        self.visible_text.reversed_chunks_in_range(range)
-    }
-
-    pub fn bytes_in_range<T: ToOffset>(&self, range: Range<T>) -> rope::Bytes<'_> {
-        let start = range.start.to_offset(self);
-        let end = range.end.to_offset(self);
-        self.visible_text.bytes_in_range(start..end)
-    }
-
-    pub fn reversed_bytes_in_range<T: ToOffset>(&self, range: Range<T>) -> rope::Bytes<'_> {
-        let start = range.start.to_offset(self);
-        let end = range.end.to_offset(self);
-        self.visible_text.reversed_bytes_in_range(start..end)
-    }
-
-    pub fn text_for_range<T: ToOffset>(&self, range: Range<T>) -> Chunks<'_> {
-        let start = range.start.to_offset(self);
-        let end = range.end.to_offset(self);
-        self.visible_text.chunks_in_range(start..end)
-    }
-
-    pub fn line_len(&self, row: u32) -> u32 {
-        let row_start_offset = Point::new(row, 0).to_offset(self);
-        let row_end_offset = if row >= self.max_point().row {
-            self.len()
-        } else {
-            Point::new(row + 1, 0).to_previous_offset(self)
-        };
-        (row_end_offset - row_start_offset) as u32
-    }
-
-    pub fn line_indents_in_row_range(
-        &self,
-        row_range: Range<u32>,
-    ) -> impl Iterator<Item = (u32, LineIndent)> + '_ {
-        let start = Point::new(row_range.start, 0).to_offset(self);
-        let end = Point::new(row_range.end, self.line_len(row_range.end)).to_offset(self);
-
-        let mut chunks = self.as_rope().chunks_in_range(start..end);
-        let mut row = row_range.start;
-        let mut done = false;
-        std::iter::from_fn(move || {
-            if done {
-                None
-            } else {
-                let indent = (row, LineIndent::from_chunks(&mut chunks));
-                done = !chunks.next_line();
-                row += 1;
-                Some(indent)
-            }
-        })
-    }
-
-    /// Returns the line indents in the given row range, exclusive of end row, in reversed order.
-    pub fn reversed_line_indents_in_row_range(
-        &self,
-        row_range: Range<u32>,
-    ) -> impl Iterator<Item = (u32, LineIndent)> + '_ {
-        let start = Point::new(row_range.start, 0).to_offset(self);
-
-        let end_point;
-        let end;
-        if row_range.end > row_range.start {
-            end_point = Point::new(row_range.end - 1, self.line_len(row_range.end - 1));
-            end = end_point.to_offset(self);
-        } else {
-            end_point = Point::new(row_range.start, 0);
-            end = start;
-        };
-
-        let mut chunks = self.as_rope().chunks_in_range(start..end);
-        // Move the cursor to the start of the last line if it's not empty.
-        chunks.seek(end);
-        if end_point.column > 0 {
-            chunks.prev_line();
-        }
-
-        let mut row = end_point.row;
-        let mut done = false;
-        std::iter::from_fn(move || {
-            if done {
-                None
-            } else {
-                let initial_offset = chunks.offset();
-                let indent = (row, LineIndent::from_chunks(&mut chunks));
-                if chunks.offset() > initial_offset {
-                    chunks.prev_line();
-                }
-                done = !chunks.prev_line();
-                if !done {
-                    row -= 1;
-                }
-
-                Some(indent)
-            }
-        })
-    }
-
-    pub fn line_indent_for_row(&self, row: u32) -> LineIndent {
-        LineIndent::from_iter(self.chars_at(Point::new(row, 0)))
-    }
-
-    pub fn is_line_blank(&self, row: u32) -> bool {
-        self.text_for_range(Point::new(row, 0)..Point::new(row, self.line_len(row)))
-            .all(|chunk| chunk.matches(|c: char| !c.is_whitespace()).next().is_none())
-    }
-
-    pub fn text_summary_for_range<D, O: ToOffset>(&self, range: Range<O>) -> D
-    where
-        D: TextDimension,
-    {
-        self.visible_text
-            .cursor(range.start.to_offset(self))
-            .summary(range.end.to_offset(self))
-    }
-
-    pub fn summaries_for_anchors<'a, D, A>(&'a self, anchors: A) -> impl 'a + Iterator<Item = D>
-    where
-        D: 'a + TextDimension,
-        A: 'a + IntoIterator<Item = &'a Anchor>,
-    {
-        let anchors = anchors.into_iter();
-        self.summaries_for_anchors_with_payload::<D, _, ()>(anchors.map(|a| (a, ())))
-            .map(|d| d.0)
-    }
-
-    pub fn summaries_for_anchors_with_payload<'a, D, A, T>(
-        &'a self,
-        anchors: A,
-    ) -> impl 'a + Iterator<Item = (D, T)>
-    where
-        D: 'a + TextDimension,
-        A: 'a + IntoIterator<Item = (&'a Anchor, T)>,
-    {
-        let anchors = anchors.into_iter();
-        let mut insertion_cursor = self.insertions.cursor::<InsertionFragmentKey>(());
-        let mut fragment_cursor = self
-            .fragments
-            .cursor::<Dimensions<Option<&Locator>, usize>>(&None);
-        let mut text_cursor = self.visible_text.cursor(0);
-        let mut position = D::zero(());
-
-        anchors.map(move |(anchor, payload)| {
-            if anchor.is_min() {
-                return (D::zero(()), payload);
-            } else if anchor.is_max() {
-                return (D::from_text_summary(&self.visible_text.summary()), payload);
-            }
-
-            let anchor_key = InsertionFragmentKey {
-                timestamp: anchor.timestamp,
-                split_offset: anchor.offset,
-            };
-            insertion_cursor.seek(&anchor_key, anchor.bias);
-            if let Some(insertion) = insertion_cursor.item() {
-                let comparison = sum_tree::KeyedItem::key(insertion).cmp(&anchor_key);
-                if comparison == Ordering::Greater
-                    || (anchor.bias == Bias::Left
-                        && comparison == Ordering::Equal
-                        && anchor.offset > 0)
-                {
-                    insertion_cursor.prev();
-                }
-            } else {
-                insertion_cursor.prev();
-            }
-            let Some(insertion) = insertion_cursor.item() else {
-                panic!(
-                    "invalid insertion for buffer {}@{:?} with anchor {:?}",
-                    self.remote_id(),
-                    self.version,
-                    anchor
-                );
-            };
-            assert_eq!(
-                insertion.timestamp,
-                anchor.timestamp,
-                "invalid insertion for buffer {}@{:?} and anchor {:?}",
-                self.remote_id(),
-                self.version,
-                anchor
-            );
-
-            fragment_cursor.seek_forward(&Some(&insertion.fragment_id), Bias::Left);
-            let fragment = fragment_cursor.item().unwrap();
-            let mut fragment_offset = fragment_cursor.start().1;
-            if fragment.visible {
-                fragment_offset += anchor.offset - insertion.split_offset;
-            }
-
-            position.add_assign(&text_cursor.summary(fragment_offset));
-            (position, payload)
-        })
-    }
-
-    pub fn summary_for_anchor<D>(&self, anchor: &Anchor) -> D
-    where
-        D: TextDimension,
-    {
-        self.text_summary_for_range(0..self.offset_for_anchor(anchor))
-    }
-
-    pub fn offset_for_anchor(&self, anchor: &Anchor) -> usize {
-        if anchor.is_min() {
-            0
-        } else if anchor.is_max() {
-            self.visible_text.len()
-        } else {
-            debug_assert_eq!(anchor.buffer_id, Some(self.remote_id));
-            debug_assert!(
-                self.version.observed(anchor.timestamp),
-                "Anchor timestamp {:?} not observed by buffer {:?}",
-                anchor.timestamp,
-                self.version
-            );
-            let anchor_key = InsertionFragmentKey {
-                timestamp: anchor.timestamp,
-                split_offset: anchor.offset,
-            };
-            let mut insertion_cursor = self.insertions.cursor::<InsertionFragmentKey>(());
-            insertion_cursor.seek(&anchor_key, anchor.bias);
-            if let Some(insertion) = insertion_cursor.item() {
-                let comparison = sum_tree::KeyedItem::key(insertion).cmp(&anchor_key);
-                if comparison == Ordering::Greater
-                    || (anchor.bias == Bias::Left
-                        && comparison == Ordering::Equal
-                        && anchor.offset > 0)
-                {
-                    insertion_cursor.prev();
-                }
-            } else {
-                insertion_cursor.prev();
-            }
-
-            let Some(insertion) = insertion_cursor
-                .item()
-                .filter(|insertion| insertion.timestamp == anchor.timestamp)
-            else {
-                self.panic_bad_anchor(anchor);
-            };
-
-            let (start, _, item) = self
-                .fragments
-                .find::<Dimensions<Option<&Locator>, usize>, _>(
-                    &None,
-                    &Some(&insertion.fragment_id),
-                    Bias::Left,
-                );
-            let fragment = item.unwrap();
-            let mut fragment_offset = start.1;
-            if fragment.visible {
-                fragment_offset += anchor.offset - insertion.split_offset;
-            }
-            fragment_offset
-        }
-    }
-
-    #[cold]
-    fn panic_bad_anchor(&self, anchor: &Anchor) -> ! {
-        if anchor.buffer_id.is_some_and(|id| id != self.remote_id) {
-            panic!(
-                "invalid anchor - buffer id does not match: anchor {anchor:?}; buffer id: {}, version: {:?}",
-                self.remote_id, self.version
-            );
-        } else if !self.version.observed(anchor.timestamp) {
-            panic!(
-                "invalid anchor - snapshot has not observed lamport: {:?}; version: {:?}",
-                anchor, self.version
-            );
-        } else {
-            panic!(
-                "invalid anchor {:?}. buffer id: {}, version: {:?}",
-                anchor, self.remote_id, self.version
-            );
-        }
-    }
-
-    fn fragment_id_for_anchor(&self, anchor: &Anchor) -> &Locator {
-        self.try_fragment_id_for_anchor(anchor)
-            .unwrap_or_else(|| self.panic_bad_anchor(anchor))
-    }
-
-    fn try_fragment_id_for_anchor(&self, anchor: &Anchor) -> Option<&Locator> {
-        if anchor.is_min() {
-            Some(Locator::min_ref())
-        } else if anchor.is_max() {
-            Some(Locator::max_ref())
-        } else {
-            let anchor_key = InsertionFragmentKey {
-                timestamp: anchor.timestamp,
-                split_offset: anchor.offset,
-            };
-            let mut insertion_cursor = self.insertions.cursor::<InsertionFragmentKey>(());
-            insertion_cursor.seek(&anchor_key, anchor.bias);
-            if let Some(insertion) = insertion_cursor.item() {
-                let comparison = sum_tree::KeyedItem::key(insertion).cmp(&anchor_key);
-                if comparison == Ordering::Greater
-                    || (anchor.bias == Bias::Left
-                        && comparison == Ordering::Equal
-                        && anchor.offset > 0)
-                {
-                    insertion_cursor.prev();
-                }
-            } else {
-                insertion_cursor.prev();
-            }
-
-            insertion_cursor
-                .item()
-                .filter(|insertion| {
-                    !cfg!(debug_assertions) || insertion.timestamp == anchor.timestamp
-                })
-                .map(|insertion| &insertion.fragment_id)
-        }
-    }
-
-    pub fn anchor_before<T: ToOffset>(&self, position: T) -> Anchor {
-        self.anchor_at(position, Bias::Left)
-    }
-
-    pub fn anchor_after<T: ToOffset>(&self, position: T) -> Anchor {
-        self.anchor_at(position, Bias::Right)
-    }
-
-    pub fn anchor_at<T: ToOffset>(&self, position: T, bias: Bias) -> Anchor {
-        self.anchor_at_offset(position.to_offset(self), bias)
-    }
-
-    fn anchor_at_offset(&self, mut offset: usize, bias: Bias) -> Anchor {
-        if bias == Bias::Left && offset == 0 {
-            Anchor::min_for_buffer(self.remote_id)
-        } else if bias == Bias::Right
-            && ((!cfg!(debug_assertions) && offset >= self.len()) || offset == self.len())
-        {
-            Anchor::max_for_buffer(self.remote_id)
-        } else {
-            if self
-                .visible_text
-                .assert_char_boundary::<{ cfg!(debug_assertions) }>(offset)
-            {
-                offset = match bias {
-                    Bias::Left => self.visible_text.floor_char_boundary(offset),
-                    Bias::Right => self.visible_text.ceil_char_boundary(offset),
-                };
-            }
-            let (start, _, item) = self.fragments.find::<usize, _>(&None, &offset, bias);
-            let Some(fragment) = item else {
-                // We got a bad offset, likely out of bounds
-                debug_panic!(
-                    "Failed to find fragment at offset {} (len: {})",
-                    offset,
-                    self.len()
-                );
-                return Anchor::max_for_buffer(self.remote_id);
-            };
-            let overshoot = offset - start;
-            Anchor {
-                timestamp: fragment.timestamp,
-                offset: fragment.insertion_offset + overshoot,
-                bias,
-                buffer_id: Some(self.remote_id),
-            }
-        }
-    }
-
-    pub fn can_resolve(&self, anchor: &Anchor) -> bool {
-        anchor.is_min()
-            || anchor.is_max()
-            || (Some(self.remote_id) == anchor.buffer_id && self.version.observed(anchor.timestamp))
-    }
-
-    pub fn clip_offset(&self, offset: usize, bias: Bias) -> usize {
-        self.visible_text.clip_offset(offset, bias)
-    }
-
-    pub fn clip_point(&self, point: Point, bias: Bias) -> Point {
-        self.visible_text.clip_point(point, bias)
-    }
-
-    pub fn clip_offset_utf16(&self, offset: OffsetUtf16, bias: Bias) -> OffsetUtf16 {
-        self.visible_text.clip_offset_utf16(offset, bias)
-    }
-
-    pub fn clip_point_utf16(&self, point: Unclipped<PointUtf16>, bias: Bias) -> PointUtf16 {
-        self.visible_text.clip_point_utf16(point, bias)
-    }
-
-    pub fn edits_since<'a, D>(
-        &'a self,
-        since: &'a clock::Global,
-    ) -> impl 'a + Iterator<Item = Edit<D>>
-    where
-        D: TextDimension + Ord,
-    {
-        self.edits_since_in_range(since, Anchor::MIN..Anchor::MAX)
-    }
-
-    pub fn anchored_edits_since<'a, D>(
-        &'a self,
-        since: &'a clock::Global,
-    ) -> impl 'a + Iterator<Item = (Edit<D>, Range<Anchor>)>
-    where
-        D: TextDimension + Ord,
-    {
-        self.anchored_edits_since_in_range(since, Anchor::MIN..Anchor::MAX)
-    }
-
-    pub fn edits_since_in_range<'a, D>(
-        &'a self,
-        since: &'a clock::Global,
-        range: Range<Anchor>,
-    ) -> impl 'a + Iterator<Item = Edit<D>>
-    where
-        D: TextDimension + Ord,
-    {
-        self.anchored_edits_since_in_range(since, range)
-            .map(|item| item.0)
-    }
-
-    pub fn anchored_edits_since_in_range<'a, D>(
-        &'a self,
-        since: &'a clock::Global,
-        range: Range<Anchor>,
-    ) -> impl 'a + Iterator<Item = (Edit<D>, Range<Anchor>)>
-    where
-        D: TextDimension + Ord,
-    {
-        let fragments_cursor = if *since == self.version {
-            None
-        } else {
-            let mut cursor = self.fragments.filter(&None, move |summary| {
-                !since.observed_all(&summary.max_version)
-            });
-            cursor.next();
-            Some(cursor)
-        };
-        let start_fragment_id = self.fragment_id_for_anchor(&range.start);
-        let (start, _, item) = self
-            .fragments
-            .find::<Dimensions<Option<&Locator>, FragmentTextSummary>, _>(
-                &None,
-                &Some(start_fragment_id),
-                Bias::Left,
-            );
-        let mut visible_start = start.1.visible;
-        let mut deleted_start = start.1.deleted;
-        if let Some(fragment) = item {
-            let overshoot = range.start.offset - fragment.insertion_offset;
-            if fragment.visible {
-                visible_start += overshoot;
-            } else {
-                deleted_start += overshoot;
-            }
-        }
-        let end_fragment_id = self.fragment_id_for_anchor(&range.end);
-
-        Edits {
-            visible_cursor: self.visible_text.cursor(visible_start),
-            deleted_cursor: self.deleted_text.cursor(deleted_start),
-            fragments_cursor,
-            undos: &self.undo_map,
-            since,
-            old_end: D::zero(()),
-            new_end: D::zero(()),
-            range: (start_fragment_id, range.start.offset)..(end_fragment_id, range.end.offset),
-            buffer_id: self.remote_id,
-        }
-    }
-
-    pub fn has_edits_since_in_range(&self, since: &clock::Global, range: Range<Anchor>) -> bool {
-        if *since != self.version {
-            let start_fragment_id = self.fragment_id_for_anchor(&range.start);
-            let end_fragment_id = self.fragment_id_for_anchor(&range.end);
-            let mut cursor = self.fragments.filter::<_, usize>(&None, move |summary| {
-                !since.observed_all(&summary.max_version)
-            });
-            cursor.next();
-            while let Some(fragment) = cursor.item() {
-                if fragment.id > *end_fragment_id {
-                    break;
-                }
-                if fragment.id > *start_fragment_id {
-                    let was_visible = fragment.was_visible(since, &self.undo_map);
-                    let is_visible = fragment.visible;
-                    if was_visible != is_visible {
-                        return true;
-                    }
-                }
-                cursor.next();
-            }
-        }
-        false
-    }
-
-    pub fn has_edits_since(&self, since: &clock::Global) -> bool {
-        if *since != self.version {
-            let mut cursor = self.fragments.filter::<_, usize>(&None, move |summary| {
-                !since.observed_all(&summary.max_version)
-            });
-            cursor.next();
-            while let Some(fragment) = cursor.item() {
-                let was_visible = fragment.was_visible(since, &self.undo_map);
-                let is_visible = fragment.visible;
-                if was_visible != is_visible {
-                    return true;
-                }
-                cursor.next();
-            }
-        }
-        false
-    }
-
-    pub fn range_to_version(&self, range: Range<usize>, version: &clock::Global) -> Range<usize> {
-        let mut offsets = self.offsets_to_version([range.start, range.end], version);
-        offsets.next().unwrap()..offsets.next().unwrap()
-    }
-
-    /// Converts the given sequence of offsets into their corresponding offsets
-    /// at a prior version of this buffer.
-    pub fn offsets_to_version<'a>(
-        &'a self,
-        offsets: impl 'a + IntoIterator<Item = usize>,
-        version: &'a clock::Global,
-    ) -> impl 'a + Iterator<Item = usize> {
-        let mut edits = self.edits_since(version).peekable();
-        let mut last_old_end = 0;
-        let mut last_new_end = 0;
-        offsets.into_iter().map(move |new_offset| {
-            while let Some(edit) = edits.peek() {
-                if edit.new.start > new_offset {
-                    break;
-                }
-
-                if edit.new.end <= new_offset {
-                    last_new_end = edit.new.end;
-                    last_old_end = edit.old.end;
-                    edits.next();
-                    continue;
-                }
-
-                let overshoot = new_offset - edit.new.start;
-                return (edit.old.start + overshoot).min(edit.old.end);
-            }
-
-            last_old_end + new_offset.saturating_sub(last_new_end)
-        })
-    }
-
-    /// Visually annotates a position or range with the `Debug` representation of a value. The
-    /// callsite of this function is used as a key - previous annotations will be removed.
-    #[cfg(debug_assertions)]
-    #[track_caller]
-    pub fn debug<R, V>(&self, ranges: &R, value: V)
-    where
-        R: debug::ToDebugRanges,
-        V: std::fmt::Debug,
-    {
-        self.debug_with_key(std::panic::Location::caller(), ranges, value);
-    }
-
-    /// Visually annotates a position or range with the `Debug` representation of a value. Previous
-    /// debug annotations with the same key will be removed. The key is also used to determine the
-    /// annotation's color.
-    #[cfg(debug_assertions)]
-    pub fn debug_with_key<K, R, V>(&self, key: &K, ranges: &R, value: V)
-    where
-        K: std::hash::Hash + 'static,
-        R: debug::ToDebugRanges,
-        V: std::fmt::Debug,
-    {
-        let ranges = ranges
-            .to_debug_ranges(self)
-            .into_iter()
-            .map(|range| self.anchor_after(range.start)..self.anchor_before(range.end))
-            .collect();
-        debug::GlobalDebugRanges::with_locked(|debug_ranges| {
-            debug_ranges.insert(key, ranges, format!("{value:?}").into());
-        });
-    }
-}
-
-struct RopeBuilder<'a> {
-    old_visible_cursor: rope::Cursor<'a>,
-    old_deleted_cursor: rope::Cursor<'a>,
-    new_visible: Rope,
-    new_deleted: Rope,
-}
-
-impl<'a> RopeBuilder<'a> {
-    fn new(old_visible_cursor: rope::Cursor<'a>, old_deleted_cursor: rope::Cursor<'a>) -> Self {
-        Self {
-            old_visible_cursor,
-            old_deleted_cursor,
-            new_visible: Rope::new(),
-            new_deleted: Rope::new(),
-        }
-    }
-
-    fn append(&mut self, len: FragmentTextSummary) {
-        self.push(len.visible, true, true);
-        self.push(len.deleted, false, false);
-    }
-
-    fn push_fragment(&mut self, fragment: &Fragment, was_visible: bool) {
-        debug_assert!(fragment.len > 0);
-        self.push(fragment.len, was_visible, fragment.visible)
-    }
-
-    fn push(&mut self, len: usize, was_visible: bool, is_visible: bool) {
-        let text = if was_visible {
-            self.old_visible_cursor
-                .slice(self.old_visible_cursor.offset() + len)
-        } else {
-            self.old_deleted_cursor
-                .slice(self.old_deleted_cursor.offset() + len)
-        };
-        if is_visible {
-            self.new_visible.append(text);
-        } else {
-            self.new_deleted.append(text);
-        }
-    }
-
-    fn push_str(&mut self, text: &str) {
-        self.new_visible.push(text);
-    }
-
-    fn finish(mut self) -> (Rope, Rope) {
-        self.new_visible.append(self.old_visible_cursor.suffix());
-        self.new_deleted.append(self.old_deleted_cursor.suffix());
-        (self.new_visible, self.new_deleted)
-    }
-}
-
-impl<D: TextDimension + Ord, F: FnMut(&FragmentSummary) -> bool> Iterator for Edits<'_, D, F> {
-    type Item = (Edit<D>, Range<Anchor>);
-
-    fn next(&mut self) -> Option<Self::Item> {
-        let mut pending_edit: Option<Self::Item> = None;
-        let cursor = self.fragments_cursor.as_mut()?;
-
-        while let Some(fragment) = cursor.item() {
-            if fragment.id < *self.range.start.0 {
-                cursor.next();
-                continue;
-            } else if fragment.id > *self.range.end.0 {
-                break;
-            }
-
-            if cursor.start().visible > self.visible_cursor.offset() {
-                let summary = self.visible_cursor.summary(cursor.start().visible);
-                self.old_end.add_assign(&summary);
-                self.new_end.add_assign(&summary);
-            }
-
-            if pending_edit
-                .as_ref()
-                .is_some_and(|(change, _)| change.new.end < self.new_end)
-            {
-                break;
-            }
-
-            let start_anchor = Anchor {
-                timestamp: fragment.timestamp,
-                offset: fragment.insertion_offset,
-                bias: Bias::Right,
-                buffer_id: Some(self.buffer_id),
-            };
-            let end_anchor = Anchor {
-                timestamp: fragment.timestamp,
-                offset: fragment.insertion_offset + fragment.len,
-                bias: Bias::Left,
-                buffer_id: Some(self.buffer_id),
-            };
-
-            if !fragment.was_visible(self.since, self.undos) && fragment.visible {
-                let mut visible_end = cursor.end().visible;
-                if fragment.id == *self.range.end.0 {
-                    visible_end = cmp::min(
-                        visible_end,
-                        cursor.start().visible + (self.range.end.1 - fragment.insertion_offset),
-                    );
-                }
-
-                let fragment_summary = self.visible_cursor.summary(visible_end);
-                let mut new_end = self.new_end;
-                new_end.add_assign(&fragment_summary);
-                if let Some((edit, range)) = pending_edit.as_mut() {
-                    edit.new.end = new_end;
-                    range.end = end_anchor;
-                } else {
-                    pending_edit = Some((
-                        Edit {
-                            old: self.old_end..self.old_end,
-                            new: self.new_end..new_end,
-                        },
-                        start_anchor..end_anchor,
-                    ));
-                }
-
-                self.new_end = new_end;
-            } else if fragment.was_visible(self.since, self.undos) && !fragment.visible {
-                let mut deleted_end = cursor.end().deleted;
-                if fragment.id == *self.range.end.0 {
-                    deleted_end = cmp::min(
-                        deleted_end,
-                        cursor.start().deleted + (self.range.end.1 - fragment.insertion_offset),
-                    );
-                }
-
-                if cursor.start().deleted > self.deleted_cursor.offset() {
-                    self.deleted_cursor.seek_forward(cursor.start().deleted);
-                }
-                let fragment_summary = self.deleted_cursor.summary(deleted_end);
-                let mut old_end = self.old_end;
-                old_end.add_assign(&fragment_summary);
-                if let Some((edit, range)) = pending_edit.as_mut() {
-                    edit.old.end = old_end;
-                    range.end = end_anchor;
-                } else {
-                    pending_edit = Some((
-                        Edit {
-                            old: self.old_end..old_end,
-                            new: self.new_end..self.new_end,
-                        },
-                        start_anchor..end_anchor,
-                    ));
-                }
-
-                self.old_end = old_end;
-            }
-
-            cursor.next();
-        }
-
-        pending_edit
-    }
-}
-
-impl Fragment {
-    fn is_visible(&self, undos: &UndoMap) -> bool {
-        !undos.is_undone(self.timestamp) && self.deletions.iter().all(|d| undos.is_undone(*d))
-    }
-
-    fn was_visible(&self, version: &clock::Global, undos: &UndoMap) -> bool {
-        (version.observed(self.timestamp) && !undos.was_undone(self.timestamp, version))
-            && self
-                .deletions
-                .iter()
-                .all(|d| !version.observed(*d) || undos.was_undone(*d, version))
-    }
-}
-
-impl sum_tree::Item for Fragment {
-    type Summary = FragmentSummary;
-
-    fn summary(&self, _cx: &Option<clock::Global>) -> Self::Summary {
-        let mut max_version = clock::Global::new();
-        max_version.observe(self.timestamp);
-        for deletion in &self.deletions {
-            max_version.observe(*deletion);
-        }
-        max_version.join(&self.max_undos);
-
-        let mut min_insertion_version = clock::Global::new();
-        min_insertion_version.observe(self.timestamp);
-        let max_insertion_version = min_insertion_version.clone();
-        if self.visible {
-            FragmentSummary {
-                max_id: self.id.clone(),
-                text: FragmentTextSummary {
-                    visible: self.len,
-                    deleted: 0,
-                },
-                max_version,
-                min_insertion_version,
-                max_insertion_version,
-            }
-        } else {
-            FragmentSummary {
-                max_id: self.id.clone(),
-                text: FragmentTextSummary {
-                    visible: 0,
-                    deleted: self.len,
-                },
-                max_version,
-                min_insertion_version,
-                max_insertion_version,
-            }
-        }
-    }
-}
-
-impl sum_tree::Summary for FragmentSummary {
-    type Context<'a> = &'a Option<clock::Global>;
-
-    fn zero(_cx: Self::Context<'_>) -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, other: &Self, _: Self::Context<'_>) {
-        self.max_id.assign(&other.max_id);
-        self.text.visible += &other.text.visible;
-        self.text.deleted += &other.text.deleted;
-        self.max_version.join(&other.max_version);
-        self.min_insertion_version
-            .meet(&other.min_insertion_version);
-        self.max_insertion_version
-            .join(&other.max_insertion_version);
-    }
-}
-
-impl Default for FragmentSummary {
-    fn default() -> Self {
-        FragmentSummary {
-            max_id: Locator::min(),
-            text: FragmentTextSummary::default(),
-            max_version: clock::Global::new(),
-            min_insertion_version: clock::Global::new(),
-            max_insertion_version: clock::Global::new(),
-        }
-    }
-}
-
-impl sum_tree::Item for InsertionFragment {
-    type Summary = InsertionFragmentKey;
-
-    fn summary(&self, _cx: ()) -> Self::Summary {
-        InsertionFragmentKey {
-            timestamp: self.timestamp,
-            split_offset: self.split_offset,
-        }
-    }
-}
-
-impl sum_tree::KeyedItem for InsertionFragment {
-    type Key = InsertionFragmentKey;
-
-    fn key(&self) -> Self::Key {
-        sum_tree::Item::summary(self, ())
-    }
-}
-
-impl InsertionFragment {
-    fn new(fragment: &Fragment) -> Self {
-        Self {
-            timestamp: fragment.timestamp,
-            split_offset: fragment.insertion_offset,
-            fragment_id: fragment.id.clone(),
-        }
-    }
-
-    fn insert_new(fragment: &Fragment) -> sum_tree::Edit<Self> {
-        sum_tree::Edit::Insert(Self::new(fragment))
-    }
-}
-
-impl sum_tree::ContextLessSummary for InsertionFragmentKey {
-    fn zero() -> Self {
-        InsertionFragmentKey {
-            timestamp: Lamport::MIN,
-            split_offset: 0,
-        }
-    }
-
-    fn add_summary(&mut self, summary: &Self) {
-        *self = *summary;
-    }
-}
-
-#[derive(Copy, Clone, Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct FullOffset(pub usize);
-
-impl ops::AddAssign<usize> for FullOffset {
-    fn add_assign(&mut self, rhs: usize) {
-        self.0 += rhs;
-    }
-}
-
-impl ops::Add<usize> for FullOffset {
-    type Output = Self;
-
-    fn add(mut self, rhs: usize) -> Self::Output {
-        self += rhs;
-        self
-    }
-}
-
-impl ops::Sub for FullOffset {
-    type Output = usize;
-
-    fn sub(self, rhs: Self) -> Self::Output {
-        self.0 - rhs.0
-    }
-}
-
-impl sum_tree::Dimension<'_, FragmentSummary> for usize {
-    fn zero(_: &Option<clock::Global>) -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, summary: &FragmentSummary, _: &Option<clock::Global>) {
-        *self += summary.text.visible;
-    }
-}
-
-impl sum_tree::Dimension<'_, FragmentSummary> for FullOffset {
-    fn zero(_: &Option<clock::Global>) -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, summary: &FragmentSummary, _: &Option<clock::Global>) {
-        self.0 += summary.text.visible + summary.text.deleted;
-    }
-}
-
-impl<'a> sum_tree::Dimension<'a, FragmentSummary> for Option<&'a Locator> {
-    fn zero(_: &Option<clock::Global>) -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, summary: &'a FragmentSummary, _: &Option<clock::Global>) {
-        *self = Some(&summary.max_id);
-    }
-}
-
-impl sum_tree::SeekTarget<'_, FragmentSummary, FragmentTextSummary> for usize {
-    fn cmp(
-        &self,
-        cursor_location: &FragmentTextSummary,
-        _: &Option<clock::Global>,
-    ) -> cmp::Ordering {
-        Ord::cmp(self, &cursor_location.visible)
-    }
-}
-
-#[derive(Copy, Clone, Debug, Eq, PartialEq)]
-enum VersionedFullOffset {
-    Offset(FullOffset),
-    Invalid,
-}
-
-impl VersionedFullOffset {
-    fn full_offset(&self) -> FullOffset {
-        if let Self::Offset(position) = self {
-            *position
-        } else {
-            panic!("invalid version")
-        }
-    }
-}
-
-impl Default for VersionedFullOffset {
-    fn default() -> Self {
-        Self::Offset(Default::default())
-    }
-}
-
-impl<'a> sum_tree::Dimension<'a, FragmentSummary> for VersionedFullOffset {
-    fn zero(_cx: &Option<clock::Global>) -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, summary: &'a FragmentSummary, cx: &Option<clock::Global>) {
-        if let Self::Offset(offset) = self {
-            let version = cx.as_ref().unwrap();
-            if version.observed_all(&summary.max_insertion_version) {
-                *offset += summary.text.visible + summary.text.deleted;
-            } else if version.observed_any(&summary.min_insertion_version) {
-                *self = Self::Invalid;
-            }
-        }
-    }
-}
-
-impl sum_tree::SeekTarget<'_, FragmentSummary, Self> for VersionedFullOffset {
-    fn cmp(&self, cursor_position: &Self, _: &Option<clock::Global>) -> cmp::Ordering {
-        match (self, cursor_position) {
-            (Self::Offset(a), Self::Offset(b)) => Ord::cmp(a, b),
-            (Self::Offset(_), Self::Invalid) => cmp::Ordering::Less,
-            (Self::Invalid, _) => unreachable!(),
-        }
-    }
-}
-
-impl Operation {
-    fn replica_id(&self) -> ReplicaId {
-        operation_queue::Operation::lamport_timestamp(self).replica_id
-    }
-
-    pub fn timestamp(&self) -> clock::Lamport {
-        match self {
-            Operation::Edit(edit) => edit.timestamp,
-            Operation::Undo(undo) => undo.timestamp,
-        }
-    }
-
-    pub fn as_edit(&self) -> Option<&EditOperation> {
-        match self {
-            Operation::Edit(edit) => Some(edit),
-            _ => None,
-        }
-    }
-
-    pub fn is_edit(&self) -> bool {
-        matches!(self, Operation::Edit { .. })
-    }
-}
-
-impl operation_queue::Operation for Operation {
-    fn lamport_timestamp(&self) -> clock::Lamport {
-        match self {
-            Operation::Edit(edit) => edit.timestamp,
-            Operation::Undo(undo) => undo.timestamp,
-        }
-    }
-}
-
-pub trait ToOffset {
-    fn to_offset(&self, snapshot: &BufferSnapshot) -> usize;
-    /// Turns this point into the next offset in the buffer that comes after this, respecting utf8 boundaries.
-    fn to_next_offset(&self, snapshot: &BufferSnapshot) -> usize {
-        snapshot
-            .visible_text
-            .ceil_char_boundary(self.to_offset(snapshot) + 1)
-    }
-    /// Turns this point into the previous offset in the buffer that comes before this, respecting utf8 boundaries.
-    fn to_previous_offset(&self, snapshot: &BufferSnapshot) -> usize {
-        snapshot
-            .visible_text
-            .floor_char_boundary(self.to_offset(snapshot).saturating_sub(1))
-    }
-}
-
-impl ToOffset for Point {
-    #[inline]
-    fn to_offset(&self, snapshot: &BufferSnapshot) -> usize {
-        snapshot.point_to_offset(*self)
-    }
-}
-
-impl ToOffset for usize {
-    fn to_offset(&self, snapshot: &BufferSnapshot) -> usize {
-        if snapshot
-            .as_rope()
-            .assert_char_boundary::<{ cfg!(debug_assertions) }>(*self)
-        {
-            snapshot.as_rope().floor_char_boundary(*self)
-        } else {
-            *self
-        }
-    }
-}
-
-impl ToOffset for Anchor {
-    #[inline]
-    fn to_offset(&self, snapshot: &BufferSnapshot) -> usize {
-        snapshot.summary_for_anchor(self)
-    }
-}
-
-impl<T: ToOffset> ToOffset for &T {
-    #[inline]
-    fn to_offset(&self, content: &BufferSnapshot) -> usize {
-        (*self).to_offset(content)
-    }
-}
-
-impl ToOffset for PointUtf16 {
-    #[inline]
-    fn to_offset(&self, snapshot: &BufferSnapshot) -> usize {
-        snapshot.point_utf16_to_offset(*self)
-    }
-}
-
-impl ToOffset for Unclipped<PointUtf16> {
-    #[inline]
-    fn to_offset(&self, snapshot: &BufferSnapshot) -> usize {
-        snapshot.unclipped_point_utf16_to_offset(*self)
-    }
-}
-
-pub trait ToPoint {
-    fn to_point(&self, snapshot: &BufferSnapshot) -> Point;
-}
-
-impl ToPoint for Anchor {
-    #[inline]
-    fn to_point(&self, snapshot: &BufferSnapshot) -> Point {
-        snapshot.summary_for_anchor(self)
-    }
-}
-
-impl ToPoint for usize {
-    #[inline]
-    fn to_point(&self, snapshot: &BufferSnapshot) -> Point {
-        snapshot.offset_to_point(*self)
-    }
-}
-
-impl ToPoint for Point {
-    #[inline]
-    fn to_point(&self, _: &BufferSnapshot) -> Point {
-        *self
-    }
-}
-
-impl ToPoint for Unclipped<PointUtf16> {
-    #[inline]
-    fn to_point(&self, snapshot: &BufferSnapshot) -> Point {
-        snapshot.unclipped_point_utf16_to_point(*self)
-    }
-}
-
-pub trait ToPointUtf16 {
-    fn to_point_utf16(&self, snapshot: &BufferSnapshot) -> PointUtf16;
-}
-
-impl ToPointUtf16 for Anchor {
-    #[inline]
-    fn to_point_utf16(&self, snapshot: &BufferSnapshot) -> PointUtf16 {
-        snapshot.summary_for_anchor(self)
-    }
-}
-
-impl ToPointUtf16 for usize {
-    #[inline]
-    fn to_point_utf16(&self, snapshot: &BufferSnapshot) -> PointUtf16 {
-        snapshot.offset_to_point_utf16(*self)
-    }
-}
-
-impl ToPointUtf16 for PointUtf16 {
-    #[inline]
-    fn to_point_utf16(&self, _: &BufferSnapshot) -> PointUtf16 {
-        *self
-    }
-}
-
-impl ToPointUtf16 for Point {
-    #[inline]
-    fn to_point_utf16(&self, snapshot: &BufferSnapshot) -> PointUtf16 {
-        snapshot.point_to_point_utf16(*self)
-    }
-}
-
-pub trait ToOffsetUtf16 {
-    fn to_offset_utf16(&self, snapshot: &BufferSnapshot) -> OffsetUtf16;
-}
-
-impl ToOffsetUtf16 for Anchor {
-    #[inline]
-    fn to_offset_utf16(&self, snapshot: &BufferSnapshot) -> OffsetUtf16 {
-        snapshot.summary_for_anchor(self)
-    }
-}
-
-impl ToOffsetUtf16 for usize {
-    #[inline]
-    fn to_offset_utf16(&self, snapshot: &BufferSnapshot) -> OffsetUtf16 {
-        snapshot.offset_to_offset_utf16(*self)
-    }
-}
-
-impl ToOffsetUtf16 for OffsetUtf16 {
-    #[inline]
-    fn to_offset_utf16(&self, _snapshot: &BufferSnapshot) -> OffsetUtf16 {
-        *self
-    }
-}
-
-pub trait FromAnchor {
-    fn from_anchor(anchor: &Anchor, snapshot: &BufferSnapshot) -> Self;
-}
-
-impl FromAnchor for Anchor {
-    #[inline]
-    fn from_anchor(anchor: &Anchor, _snapshot: &BufferSnapshot) -> Self {
-        *anchor
-    }
-}
-
-impl FromAnchor for Point {
-    #[inline]
-    fn from_anchor(anchor: &Anchor, snapshot: &BufferSnapshot) -> Self {
-        snapshot.summary_for_anchor(anchor)
-    }
-}
-
-impl FromAnchor for PointUtf16 {
-    #[inline]
-    fn from_anchor(anchor: &Anchor, snapshot: &BufferSnapshot) -> Self {
-        snapshot.summary_for_anchor(anchor)
-    }
-}
-
-impl FromAnchor for usize {
-    #[inline]
-    fn from_anchor(anchor: &Anchor, snapshot: &BufferSnapshot) -> Self {
-        snapshot.summary_for_anchor(anchor)
-    }
-}
-
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub enum LineEnding {
-    Unix,
-    Windows,
-}
-
-impl Default for LineEnding {
-    fn default() -> Self {
-        #[cfg(unix)]
-        return Self::Unix;
-
-        #[cfg(not(unix))]
-        return Self::Windows;
-    }
-}
-
-impl LineEnding {
-    pub fn as_str(&self) -> &'static str {
-        match self {
-            LineEnding::Unix => "\n",
-            LineEnding::Windows => "\r\n",
-        }
-    }
-
-    pub fn label(&self) -> &'static str {
-        match self {
-            LineEnding::Unix => "LF",
-            LineEnding::Windows => "CRLF",
-        }
-    }
-
-    pub fn detect(text: &str) -> Self {
-        let mut max_ix = cmp::min(text.len(), 1000);
-        while !text.is_char_boundary(max_ix) {
-            max_ix -= 1;
-        }
-
-        if let Some(ix) = text[..max_ix].find(['\n']) {
-            if ix > 0 && text.as_bytes()[ix - 1] == b'\r' {
-                Self::Windows
-            } else {
-                Self::Unix
-            }
-        } else {
-            Self::default()
-        }
-    }
-
-    pub fn normalize(text: &mut String) {
-        if let Cow::Owned(replaced) = LINE_SEPARATORS_REGEX.replace_all(text, "\n") {
-            *text = replaced;
-        }
-    }
-
-    pub fn normalize_arc(text: Arc<str>) -> Arc<str> {
-        if let Cow::Owned(replaced) = LINE_SEPARATORS_REGEX.replace_all(&text, "\n") {
-            replaced.into()
-        } else {
-            text
-        }
-    }
-
-    pub fn normalize_cow(text: Cow<str>) -> Cow<str> {
-        if let Cow::Owned(replaced) = LINE_SEPARATORS_REGEX.replace_all(&text, "\n") {
-            replaced.into()
-        } else {
-            text
-        }
-    }
-}
-
-pub fn chunks_with_line_ending(rope: &Rope, line_ending: LineEnding) -> impl Iterator<Item = &str> {
-    rope.chunks().flat_map(move |chunk| {
-        let mut newline = false;
-        let end_with_newline = chunk.ends_with('\n').then_some(line_ending.as_str());
-        chunk
-            .lines()
-            .flat_map(move |line| {
-                let ending = if newline {
-                    Some(line_ending.as_str())
-                } else {
-                    None
-                };
-                newline = true;
-                ending.into_iter().chain([line])
-            })
-            .chain(end_with_newline)
-    })
-}
-
-#[cfg(debug_assertions)]
-pub mod debug {
-    use super::*;
-    use parking_lot::Mutex;
-    use std::any::TypeId;
-    use std::hash::{Hash, Hasher};
-
-    static GLOBAL_DEBUG_RANGES: Mutex<Option<GlobalDebugRanges>> = Mutex::new(None);
-
-    pub struct GlobalDebugRanges {
-        pub ranges: Vec<DebugRange>,
-        key_to_occurrence_index: HashMap<Key, usize>,
-        next_occurrence_index: usize,
-    }
-
-    pub struct DebugRange {
-        key: Key,
-        pub ranges: Vec<Range<Anchor>>,
-        pub value: Arc<str>,
-        pub occurrence_index: usize,
-    }
-
-    #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-    struct Key {
-        type_id: TypeId,
-        hash: u64,
-    }
-
-    impl GlobalDebugRanges {
-        pub fn with_locked<R>(f: impl FnOnce(&mut Self) -> R) -> R {
-            let mut state = GLOBAL_DEBUG_RANGES.lock();
-            if state.is_none() {
-                *state = Some(GlobalDebugRanges {
-                    ranges: Vec::new(),
-                    key_to_occurrence_index: HashMap::default(),
-                    next_occurrence_index: 0,
-                });
-            }
-            if let Some(global_debug_ranges) = state.as_mut() {
-                f(global_debug_ranges)
-            } else {
-                unreachable!()
-            }
-        }
-
-        pub fn insert<K: Hash + 'static>(
-            &mut self,
-            key: &K,
-            ranges: Vec<Range<Anchor>>,
-            value: Arc<str>,
-        ) {
-            let occurrence_index = *self
-                .key_to_occurrence_index
-                .entry(Key::new(key))
-                .or_insert_with(|| {
-                    let occurrence_index = self.next_occurrence_index;
-                    self.next_occurrence_index += 1;
-                    occurrence_index
-                });
-            let key = Key::new(key);
-            let existing = self
-                .ranges
-                .iter()
-                .enumerate()
-                .rfind(|(_, existing)| existing.key == key);
-            if let Some((existing_ix, _)) = existing {
-                self.ranges.remove(existing_ix);
-            }
-            self.ranges.push(DebugRange {
-                ranges,
-                key,
-                value,
-                occurrence_index,
-            });
-        }
-
-        pub fn remove<K: Hash + 'static>(&mut self, key: &K) {
-            self.remove_impl(&Key::new(key));
-        }
-
-        fn remove_impl(&mut self, key: &Key) {
-            let existing = self
-                .ranges
-                .iter()
-                .enumerate()
-                .rfind(|(_, existing)| &existing.key == key);
-            if let Some((existing_ix, _)) = existing {
-                self.ranges.remove(existing_ix);
-            }
-        }
-
-        pub fn remove_all_with_key_type<K: 'static>(&mut self) {
-            self.ranges
-                .retain(|item| item.key.type_id != TypeId::of::<K>());
-        }
-    }
-
-    impl Key {
-        fn new<K: Hash + 'static>(key: &K) -> Self {
-            let type_id = TypeId::of::<K>();
-            let mut hasher = collections::FxHasher::default();
-            key.hash(&mut hasher);
-            Key {
-                type_id,
-                hash: hasher.finish(),
-            }
-        }
-    }
-
-    pub trait ToDebugRanges {
-        fn to_debug_ranges(&self, snapshot: &BufferSnapshot) -> Vec<Range<usize>>;
-    }
-
-    impl<T: ToOffset> ToDebugRanges for T {
-        fn to_debug_ranges(&self, snapshot: &BufferSnapshot) -> Vec<Range<usize>> {
-            [self.to_offset(snapshot)].to_debug_ranges(snapshot)
-        }
-    }
-
-    impl<T: ToOffset + Clone> ToDebugRanges for Range<T> {
-        fn to_debug_ranges(&self, snapshot: &BufferSnapshot) -> Vec<Range<usize>> {
-            [self.clone()].to_debug_ranges(snapshot)
-        }
-    }
-
-    impl<T: ToOffset> ToDebugRanges for Vec<T> {
-        fn to_debug_ranges(&self, snapshot: &BufferSnapshot) -> Vec<Range<usize>> {
-            self.as_slice().to_debug_ranges(snapshot)
-        }
-    }
-
-    impl<T: ToOffset> ToDebugRanges for Vec<Range<T>> {
-        fn to_debug_ranges(&self, snapshot: &BufferSnapshot) -> Vec<Range<usize>> {
-            self.as_slice().to_debug_ranges(snapshot)
-        }
-    }
-
-    impl<T: ToOffset> ToDebugRanges for [T] {
-        fn to_debug_ranges(&self, snapshot: &BufferSnapshot) -> Vec<Range<usize>> {
-            self.iter()
-                .map(|item| {
-                    let offset = item.to_offset(snapshot);
-                    offset..offset
-                })
-                .collect()
-        }
-    }
-
-    impl<T: ToOffset> ToDebugRanges for [Range<T>] {
-        fn to_debug_ranges(&self, snapshot: &BufferSnapshot) -> Vec<Range<usize>> {
-            self.iter()
-                .map(|range| range.start.to_offset(snapshot)..range.end.to_offset(snapshot))
-                .collect()
-        }
-    }
-}
diff --git a/crates/text/src/undo_map.rs b/crates/text/src/undo_map.rs
deleted file mode 100644
index 2c2eba8de6..0000000000
--- a/crates/text/src/undo_map.rs
+++ /dev/null
@@ -1,115 +0,0 @@
-use crate::UndoOperation;
-use clock::Lamport;
-use std::cmp;
-use sum_tree::{Bias, SumTree};
-
-#[derive(Copy, Clone, Debug)]
-struct UndoMapEntry {
-    key: UndoMapKey,
-    undo_count: u32,
-}
-
-impl sum_tree::Item for UndoMapEntry {
-    type Summary = UndoMapKey;
-
-    fn summary(&self, _cx: ()) -> Self::Summary {
-        self.key
-    }
-}
-
-impl sum_tree::KeyedItem for UndoMapEntry {
-    type Key = UndoMapKey;
-
-    fn key(&self) -> Self::Key {
-        self.key
-    }
-}
-
-#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
-struct UndoMapKey {
-    edit_id: clock::Lamport,
-    undo_id: clock::Lamport,
-}
-
-impl sum_tree::ContextLessSummary for UndoMapKey {
-    fn zero() -> Self {
-        UndoMapKey {
-            edit_id: Lamport::MIN,
-            undo_id: Lamport::MIN,
-        }
-    }
-
-    fn add_summary(&mut self, summary: &Self) {
-        *self = cmp::max(*self, *summary);
-    }
-}
-
-#[derive(Clone, Default)]
-pub struct UndoMap(SumTree<UndoMapEntry>);
-
-impl UndoMap {
-    pub fn insert(&mut self, undo: &UndoOperation) {
-        let edits = undo
-            .counts
-            .iter()
-            .map(|(edit_id, count)| {
-                sum_tree::Edit::Insert(UndoMapEntry {
-                    key: UndoMapKey {
-                        edit_id: *edit_id,
-                        undo_id: undo.timestamp,
-                    },
-                    undo_count: *count,
-                })
-            })
-            .collect::<Vec<_>>();
-        self.0.edit(edits, ());
-    }
-
-    pub fn is_undone(&self, edit_id: clock::Lamport) -> bool {
-        self.undo_count(edit_id) % 2 == 1
-    }
-    pub fn was_undone(&self, edit_id: clock::Lamport, version: &clock::Global) -> bool {
-        let mut cursor = self.0.cursor::<UndoMapKey>(());
-        cursor.seek(
-            &UndoMapKey {
-                edit_id,
-                undo_id: Lamport::MIN,
-            },
-            Bias::Left,
-        );
-
-        let mut undo_count = 0;
-        for entry in cursor {
-            if entry.key.edit_id != edit_id {
-                break;
-            }
-
-            if version.observed(entry.key.undo_id) {
-                undo_count = cmp::max(undo_count, entry.undo_count);
-            }
-        }
-
-        undo_count % 2 == 1
-    }
-
-    pub fn undo_count(&self, edit_id: clock::Lamport) -> u32 {
-        let mut cursor = self.0.cursor::<UndoMapKey>(());
-        cursor.seek(
-            &UndoMapKey {
-                edit_id,
-                undo_id: Lamport::MIN,
-            },
-            Bias::Left,
-        );
-
-        let mut undo_count = 0;
-        for entry in cursor {
-            if entry.key.edit_id != edit_id {
-                break;
-            }
-
-            undo_count = cmp::max(undo_count, entry.undo_count);
-        }
-        undo_count
-    }
-}
diff --git a/crates/theme/Cargo.toml b/crates/theme/Cargo.toml
deleted file mode 100644
index ef193c500d..0000000000
--- a/crates/theme/Cargo.toml
+++ /dev/null
@@ -1,43 +0,0 @@
-[package]
-name = "theme"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[features]
-default = []
-test-support = ["gpui/test-support", "fs/test-support", "settings/test-support"]
-
-[lib]
-path = "src/theme.rs"
-doctest = false
-
-[dependencies]
-anyhow.workspace = true
-collections.workspace = true
-derive_more.workspace = true
-fs.workspace = true
-futures.workspace = true
-gpui.workspace = true
-log.workspace = true
-palette = { workspace = true, default-features = false, features = ["std"] }
-parking_lot.workspace = true
-refineable.workspace = true
-schemars = { workspace = true, features = ["indexmap2"] }
-serde.workspace = true
-serde_json.workspace = true
-serde_json_lenient.workspace = true
-settings.workspace = true
-strum.workspace = true
-thiserror.workspace = true
-util.workspace = true
-uuid.workspace = true
-
-[dev-dependencies]
-fs = { workspace = true, features = ["test-support"] }
-gpui = { workspace = true, features = ["test-support"] }
-settings = { workspace = true, features = ["test-support"] }
diff --git a/crates/theme/LICENSE-GPL b/crates/theme/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/theme/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/theme/src/default_colors.rs b/crates/theme/src/default_colors.rs
deleted file mode 100644
index 82be2896c6..0000000000
--- a/crates/theme/src/default_colors.rs
+++ /dev/null
@@ -1,2504 +0,0 @@
-use gpui::{Hsla, Rgba};
-
-use crate::ColorScale;
-use crate::scale::{ColorScaleSet, ColorScales};
-use crate::{SystemColors, ThemeColors};
-
-pub(crate) fn neutral() -> ColorScaleSet {
-    sand()
-}
-
-const ADDED_COLOR: Hsla = Hsla {
-    h: 134. / 360.,
-    s: 0.55,
-    l: 0.40,
-    a: 1.0,
-};
-const WORD_ADDED_COLOR: Hsla = Hsla {
-    h: 134. / 360.,
-    s: 0.55,
-    l: 0.40,
-    a: 0.35,
-};
-const MODIFIED_COLOR: Hsla = Hsla {
-    h: 48. / 360.,
-    s: 0.76,
-    l: 0.47,
-    a: 1.0,
-};
-const REMOVED_COLOR: Hsla = Hsla {
-    h: 350. / 360.,
-    s: 0.88,
-    l: 0.25,
-    a: 1.0,
-};
-const WORD_DELETED_COLOR: Hsla = Hsla {
-    h: 350. / 360.,
-    s: 0.88,
-    l: 0.25,
-    a: 0.80,
-};
-
-/// The default colors for the theme.
-///
-/// Themes that do not specify all colors are refined off of these defaults.
-impl ThemeColors {
-    /// Returns the default colors for light themes.
-    ///
-    /// Themes that do not specify all colors are refined off of these defaults.
-    pub fn light() -> Self {
-        let system = SystemColors::default();
-
-        Self {
-            border: neutral().light().step_6(),
-            border_variant: neutral().light().step_5(),
-            border_focused: blue().light().step_5(),
-            border_selected: blue().light().step_5(),
-            border_transparent: system.transparent,
-            border_disabled: neutral().light().step_3(),
-            elevated_surface_background: neutral().light().step_2(),
-            surface_background: neutral().light().step_2(),
-            background: neutral().light().step_1(),
-            element_background: neutral().light().step_3(),
-            element_hover: neutral().light_alpha().step_4(),
-            element_active: neutral().light_alpha().step_5(),
-            element_selected: neutral().light_alpha().step_5(),
-            element_disabled: neutral().light_alpha().step_3(),
-            element_selection_background: blue().light().step_3().alpha(0.25),
-            drop_target_background: blue().light_alpha().step_2(),
-            drop_target_border: neutral().light().step_12(),
-            ghost_element_background: system.transparent,
-            ghost_element_hover: neutral().light_alpha().step_3(),
-            ghost_element_active: neutral().light_alpha().step_4(),
-            ghost_element_selected: neutral().light_alpha().step_5(),
-            ghost_element_disabled: neutral().light_alpha().step_3(),
-            text: neutral().light().step_12(),
-            text_muted: neutral().light().step_10(),
-            text_placeholder: neutral().light().step_10(),
-            text_disabled: neutral().light().step_9(),
-            text_accent: blue().light().step_11(),
-            icon: neutral().light().step_11(),
-            icon_muted: neutral().light().step_10(),
-            icon_disabled: neutral().light().step_9(),
-            icon_placeholder: neutral().light().step_10(),
-            icon_accent: blue().light().step_11(),
-            debugger_accent: red().light().step_10(),
-            status_bar_background: neutral().light().step_2(),
-            title_bar_background: neutral().light().step_2(),
-            title_bar_inactive_background: neutral().light().step_3(),
-            toolbar_background: neutral().light().step_1(),
-            tab_bar_background: neutral().light().step_2(),
-            tab_inactive_background: neutral().light().step_2(),
-            tab_active_background: neutral().light().step_1(),
-            search_match_background: neutral().light().step_5(),
-            search_active_match_background: neutral().light().step_7(),
-            panel_background: neutral().light().step_2(),
-            panel_focused_border: blue().light().step_10(),
-            panel_indent_guide: neutral().light_alpha().step_5(),
-            panel_indent_guide_hover: neutral().light_alpha().step_6(),
-            panel_indent_guide_active: neutral().light_alpha().step_6(),
-            panel_overlay_background: neutral().light().step_2(),
-            panel_overlay_hover: neutral().light().step_4(),
-            pane_focused_border: blue().light().step_5(),
-            pane_group_border: neutral().light().step_6(),
-            scrollbar_thumb_background: neutral().light_alpha().step_3(),
-            scrollbar_thumb_hover_background: neutral().light_alpha().step_4(),
-            scrollbar_thumb_active_background: neutral().light_alpha().step_5(),
-            scrollbar_thumb_border: gpui::transparent_black(),
-            scrollbar_track_background: gpui::transparent_black(),
-            scrollbar_track_border: neutral().light().step_5(),
-            minimap_thumb_background: neutral().light_alpha().step_3().alpha(0.7),
-            minimap_thumb_hover_background: neutral().light_alpha().step_4().alpha(0.7),
-            minimap_thumb_active_background: neutral().light_alpha().step_5().alpha(0.7),
-            minimap_thumb_border: gpui::transparent_black(),
-            editor_foreground: neutral().light().step_12(),
-            editor_background: neutral().light().step_1(),
-            editor_gutter_background: neutral().light().step_1(),
-            editor_subheader_background: neutral().light().step_2(),
-            editor_active_line_background: neutral().light_alpha().step_3(),
-            editor_highlighted_line_background: neutral().light_alpha().step_3(),
-            editor_debugger_active_line_background: yellow().dark_alpha().step_3(),
-            editor_line_number: neutral().light().step_10(),
-            editor_hover_line_number: neutral().light().step_12(),
-            editor_active_line_number: neutral().light().step_11(),
-            editor_invisible: neutral().light().step_10(),
-            editor_wrap_guide: neutral().light_alpha().step_7(),
-            editor_active_wrap_guide: neutral().light_alpha().step_8(),
-            editor_indent_guide: neutral().light_alpha().step_5(),
-            editor_indent_guide_active: neutral().light_alpha().step_6(),
-            editor_document_highlight_read_background: neutral().light_alpha().step_3(),
-            editor_document_highlight_write_background: neutral().light_alpha().step_4(),
-            editor_document_highlight_bracket_background: green().light_alpha().step_5(),
-            terminal_background: neutral().light().step_1(),
-            terminal_foreground: black().light().step_12(),
-            terminal_bright_foreground: black().light().step_11(),
-            terminal_dim_foreground: black().light().step_10(),
-            terminal_ansi_background: neutral().light().step_1(),
-            terminal_ansi_bright_black: black().light().step_11(),
-            terminal_ansi_bright_red: red().light().step_10(),
-            terminal_ansi_bright_green: green().light().step_10(),
-            terminal_ansi_bright_yellow: yellow().light().step_10(),
-            terminal_ansi_bright_blue: blue().light().step_10(),
-            terminal_ansi_bright_magenta: violet().light().step_10(),
-            terminal_ansi_bright_cyan: cyan().light().step_10(),
-            terminal_ansi_bright_white: neutral().light().step_11(),
-            terminal_ansi_black: black().light().step_12(),
-            terminal_ansi_red: red().light().step_11(),
-            terminal_ansi_green: green().light().step_11(),
-            terminal_ansi_yellow: yellow().light().step_11(),
-            terminal_ansi_blue: blue().light().step_11(),
-            terminal_ansi_magenta: violet().light().step_11(),
-            terminal_ansi_cyan: cyan().light().step_11(),
-            terminal_ansi_white: neutral().light().step_12(),
-            terminal_ansi_dim_black: black().light().step_11(),
-            terminal_ansi_dim_red: red().light().step_10(),
-            terminal_ansi_dim_green: green().light().step_10(),
-            terminal_ansi_dim_yellow: yellow().light().step_10(),
-            terminal_ansi_dim_blue: blue().light().step_10(),
-            terminal_ansi_dim_magenta: violet().light().step_10(),
-            terminal_ansi_dim_cyan: cyan().light().step_10(),
-            terminal_ansi_dim_white: neutral().light().step_11(),
-            link_text_hover: orange().light().step_10(),
-            version_control_added: ADDED_COLOR,
-            version_control_deleted: REMOVED_COLOR,
-            version_control_modified: MODIFIED_COLOR,
-            version_control_renamed: MODIFIED_COLOR,
-            version_control_conflict: orange().light().step_12(),
-            version_control_ignored: gray().light().step_12(),
-            version_control_word_added: WORD_ADDED_COLOR,
-            version_control_word_deleted: WORD_DELETED_COLOR,
-            version_control_conflict_marker_ours: green().light().step_10().alpha(0.5),
-            version_control_conflict_marker_theirs: blue().light().step_10().alpha(0.5),
-            vim_normal_background: system.transparent,
-            vim_insert_background: system.transparent,
-            vim_replace_background: system.transparent,
-            vim_visual_background: system.transparent,
-            vim_visual_line_background: system.transparent,
-            vim_visual_block_background: system.transparent,
-            vim_helix_normal_background: system.transparent,
-            vim_helix_select_background: system.transparent,
-            vim_mode_text: system.transparent,
-        }
-    }
-
-    /// Returns the default colors for dark themes.
-    ///
-    /// Themes that do not specify all colors are refined off of these defaults.
-    pub fn dark() -> Self {
-        let system = SystemColors::default();
-
-        Self {
-            border: neutral().dark().step_6(),
-            border_variant: neutral().dark().step_5(),
-            border_focused: blue().dark().step_5(),
-            border_selected: blue().dark().step_5(),
-            border_transparent: system.transparent,
-            border_disabled: neutral().dark().step_3(),
-            elevated_surface_background: neutral().dark().step_2(),
-            surface_background: neutral().dark().step_2(),
-            background: neutral().dark().step_1(),
-            element_background: neutral().dark().step_3(),
-            element_hover: neutral().dark_alpha().step_4(),
-            element_active: neutral().dark_alpha().step_5(),
-            element_selected: neutral().dark_alpha().step_5(),
-            element_disabled: neutral().dark_alpha().step_3(),
-            element_selection_background: blue().dark().step_3().alpha(0.25),
-            drop_target_background: blue().dark_alpha().step_2(),
-            drop_target_border: neutral().dark().step_12(),
-            ghost_element_background: system.transparent,
-            ghost_element_hover: neutral().dark_alpha().step_4(),
-            ghost_element_active: neutral().dark_alpha().step_5(),
-            ghost_element_selected: neutral().dark_alpha().step_5(),
-            ghost_element_disabled: neutral().dark_alpha().step_3(),
-            text: neutral().dark().step_12(),
-            text_muted: neutral().dark().step_11(),
-            text_placeholder: neutral().dark().step_10(),
-            text_disabled: neutral().dark().step_9(),
-            text_accent: blue().dark().step_11(),
-            icon: neutral().dark().step_11(),
-            icon_muted: neutral().dark().step_10(),
-            icon_disabled: neutral().dark().step_9(),
-            icon_placeholder: neutral().dark().step_10(),
-            icon_accent: blue().dark().step_11(),
-            debugger_accent: red().light().step_10(),
-            status_bar_background: neutral().dark().step_2(),
-            title_bar_background: neutral().dark().step_2(),
-            title_bar_inactive_background: neutral().dark().step_3(),
-            toolbar_background: neutral().dark().step_1(),
-            tab_bar_background: neutral().dark().step_2(),
-            tab_inactive_background: neutral().dark().step_2(),
-            tab_active_background: neutral().dark().step_1(),
-            search_match_background: neutral().dark().step_5(),
-            search_active_match_background: neutral().dark().step_3(),
-            panel_background: neutral().dark().step_2(),
-            panel_focused_border: blue().dark().step_8(),
-            panel_indent_guide: neutral().dark_alpha().step_4(),
-            panel_indent_guide_hover: neutral().dark_alpha().step_6(),
-            panel_indent_guide_active: neutral().dark_alpha().step_6(),
-            panel_overlay_background: neutral().dark().step_2(),
-            panel_overlay_hover: neutral().dark().step_4(),
-            pane_focused_border: blue().dark().step_5(),
-            pane_group_border: neutral().dark().step_6(),
-            scrollbar_thumb_background: neutral().dark_alpha().step_3(),
-            scrollbar_thumb_hover_background: neutral().dark_alpha().step_4(),
-            scrollbar_thumb_active_background: neutral().dark_alpha().step_5(),
-            scrollbar_thumb_border: gpui::transparent_black(),
-            scrollbar_track_background: gpui::transparent_black(),
-            scrollbar_track_border: neutral().dark().step_5(),
-            minimap_thumb_background: neutral().dark_alpha().step_3().alpha(0.7),
-            minimap_thumb_hover_background: neutral().dark_alpha().step_4().alpha(0.7),
-            minimap_thumb_active_background: neutral().dark_alpha().step_5().alpha(0.7),
-            minimap_thumb_border: gpui::transparent_black(),
-            editor_foreground: neutral().dark().step_12(),
-            editor_background: neutral().dark().step_1(),
-            editor_gutter_background: neutral().dark().step_1(),
-            editor_subheader_background: neutral().dark().step_3(),
-            editor_active_line_background: neutral().dark_alpha().step_3(),
-            editor_highlighted_line_background: yellow().dark_alpha().step_4(),
-            editor_debugger_active_line_background: yellow().dark_alpha().step_3(),
-            editor_line_number: neutral().dark_alpha().step_10(),
-            editor_hover_line_number: neutral().dark_alpha().step_12(),
-            editor_active_line_number: neutral().dark_alpha().step_11(),
-            editor_invisible: neutral().dark_alpha().step_4(),
-            editor_wrap_guide: neutral().dark_alpha().step_4(),
-            editor_active_wrap_guide: neutral().dark_alpha().step_4(),
-            editor_indent_guide: neutral().dark_alpha().step_4(),
-            editor_indent_guide_active: neutral().dark_alpha().step_6(),
-            editor_document_highlight_read_background: neutral().dark_alpha().step_4(),
-            editor_document_highlight_write_background: neutral().dark_alpha().step_4(),
-            editor_document_highlight_bracket_background: green().dark_alpha().step_6(),
-            terminal_background: neutral().dark().step_1(),
-            terminal_ansi_background: neutral().dark().step_1(),
-            terminal_foreground: white().dark().step_12(),
-            terminal_bright_foreground: white().dark().step_11(),
-            terminal_dim_foreground: white().dark().step_10(),
-            terminal_ansi_black: black().dark().step_12(),
-            terminal_ansi_bright_black: black().dark().step_11(),
-            terminal_ansi_dim_black: black().dark().step_10(),
-            terminal_ansi_red: red().dark().step_11(),
-            terminal_ansi_bright_red: red().dark().step_10(),
-            terminal_ansi_dim_red: red().dark().step_9(),
-            terminal_ansi_green: green().dark().step_11(),
-            terminal_ansi_bright_green: green().dark().step_10(),
-            terminal_ansi_dim_green: green().dark().step_9(),
-            terminal_ansi_yellow: yellow().dark().step_11(),
-            terminal_ansi_bright_yellow: yellow().dark().step_10(),
-            terminal_ansi_dim_yellow: yellow().dark().step_9(),
-            terminal_ansi_blue: blue().dark().step_11(),
-            terminal_ansi_bright_blue: blue().dark().step_10(),
-            terminal_ansi_dim_blue: blue().dark().step_9(),
-            terminal_ansi_magenta: violet().dark().step_11(),
-            terminal_ansi_bright_magenta: violet().dark().step_10(),
-            terminal_ansi_dim_magenta: violet().dark().step_9(),
-            terminal_ansi_cyan: cyan().dark().step_11(),
-            terminal_ansi_bright_cyan: cyan().dark().step_10(),
-            terminal_ansi_dim_cyan: cyan().dark().step_9(),
-            terminal_ansi_white: neutral().dark().step_12(),
-            terminal_ansi_bright_white: neutral().dark().step_11(),
-            terminal_ansi_dim_white: neutral().dark().step_10(),
-            link_text_hover: orange().dark().step_10(),
-            version_control_added: ADDED_COLOR,
-            version_control_deleted: REMOVED_COLOR,
-            version_control_modified: MODIFIED_COLOR,
-            version_control_renamed: MODIFIED_COLOR,
-            version_control_conflict: orange().dark().step_12(),
-            version_control_ignored: gray().dark().step_12(),
-            version_control_word_added: WORD_ADDED_COLOR,
-            version_control_word_deleted: WORD_DELETED_COLOR,
-            version_control_conflict_marker_ours: green().dark().step_10().alpha(0.5),
-            version_control_conflict_marker_theirs: blue().dark().step_10().alpha(0.5),
-            vim_normal_background: system.transparent,
-            vim_insert_background: system.transparent,
-            vim_replace_background: system.transparent,
-            vim_visual_background: system.transparent,
-            vim_visual_line_background: system.transparent,
-            vim_visual_block_background: system.transparent,
-            vim_helix_normal_background: system.transparent,
-            vim_helix_select_background: system.transparent,
-            vim_mode_text: system.transparent,
-        }
-    }
-}
-
-type StaticColorScale = [&'static str; 12];
-
-struct StaticColorScaleSet {
-    scale: &'static str,
-    light: StaticColorScale,
-    light_alpha: StaticColorScale,
-    dark: StaticColorScale,
-    dark_alpha: StaticColorScale,
-}
-
-impl TryFrom<StaticColorScaleSet> for ColorScaleSet {
-    type Error = anyhow::Error;
-
-    fn try_from(value: StaticColorScaleSet) -> Result<Self, Self::Error> {
-        fn to_color_scale(scale: StaticColorScale) -> anyhow::Result<ColorScale> {
-            scale
-                .into_iter()
-                .map(|color| Rgba::try_from(color).map(Hsla::from))
-                .collect::<Result<Vec<_>, _>>()
-                .map(ColorScale::from_iter)
-        }
-
-        Ok(Self::new(
-            value.scale,
-            to_color_scale(value.light)?,
-            to_color_scale(value.light_alpha)?,
-            to_color_scale(value.dark)?,
-            to_color_scale(value.dark_alpha)?,
-        ))
-    }
-}
-
-/// Color scales used to build the default themes.
-pub fn default_color_scales() -> ColorScales {
-    ColorScales {
-        gray: gray(),
-        mauve: mauve(),
-        slate: slate(),
-        sage: sage(),
-        olive: olive(),
-        sand: sand(),
-        gold: gold(),
-        bronze: bronze(),
-        brown: brown(),
-        yellow: yellow(),
-        amber: amber(),
-        orange: orange(),
-        tomato: tomato(),
-        red: red(),
-        ruby: ruby(),
-        crimson: crimson(),
-        pink: pink(),
-        plum: plum(),
-        purple: purple(),
-        violet: violet(),
-        iris: iris(),
-        indigo: indigo(),
-        blue: blue(),
-        cyan: cyan(),
-        teal: teal(),
-        jade: jade(),
-        green: green(),
-        grass: grass(),
-        lime: lime(),
-        mint: mint(),
-        sky: sky(),
-        black: black(),
-        white: white(),
-    }
-}
-
-pub(crate) fn gray() -> ColorScaleSet {
-    StaticColorScaleSet {
-        scale: "Gray",
-        light: [
-            "#fcfcfcff",
-            "#f9f9f9ff",
-            "#f0f0f0ff",
-            "#e8e8e8ff",
-            "#e0e0e0ff",
-            "#d9d9d9ff",
-            "#cececeff",
-            "#bbbbbbff",
-            "#8d8d8dff",
-            "#838383ff",
-            "#646464ff",
-            "#202020ff",
-        ],
-        light_alpha: [
-            "#00000003",
-            "#00000006",
-            "#0000000f",
-            "#00000017",
-            "#0000001f",
-            "#00000026",
-            "#00000031",
-            "#00000044",
-            "#00000072",
-            "#0000007c",
-            "#0000009b",
-            "#000000df",
-        ],
-        dark: [
-            "#111111ff",
-            "#191919ff",
-            "#222222ff",
-            "#2a2a2aff",
-            "#313131ff",
-            "#3a3a3aff",
-            "#484848ff",
-            "#606060ff",
-            "#6e6e6eff",
-            "#7b7b7bff",
-            "#b4b4b4ff",
-            "#eeeeeeff",
-        ],
-        dark_alpha: [
-            "#00000000",
-            "#ffffff09",
-            "#ffffff12",
-            "#ffffff1b",
-            "#ffffff22",
-            "#ffffff2c",
-            "#ffffff3b",
-            "#ffffff55",
-            "#ffffff64",
-            "#ffffff72",
-            "#ffffffaf",
-            "#ffffffed",
-        ],
-    }
-    .try_into()
-    .unwrap()
-}
-
-pub(crate) fn mauve() -> ColorScaleSet {
-    StaticColorScaleSet {
-        scale: "Mauve",
-        light: [
-            "#fdfcfdff",
-            "#faf9fbff",
-            "#f2eff3ff",
-            "#eae7ecff",
-            "#e3dfe6ff",
-            "#dbd8e0ff",
-            "#d0cdd7ff",
-            "#bcbac7ff",
-            "#8e8c99ff",
-            "#84828eff",
-            "#65636dff",
-            "#211f26ff",
-        ],
-        light_alpha: [
-            "#55005503",
-            "#2b005506",
-            "#30004010",
-            "#20003618",
-            "#20003820",
-            "#14003527",
-            "#10003332",
-            "#08003145",
-            "#05001d73",
-            "#0500197d",
-            "#0400119c",
-            "#020008e0",
-        ],
-        dark: [
-            "#121113ff",
-            "#1a191bff",
-            "#232225ff",
-            "#2b292dff",
-            "#323035ff",
-            "#3c393fff",
-            "#49474eff",
-            "#625f69ff",
-            "#6f6d78ff",
-            "#7c7a85ff",
-            "#b5b2bcff",
-            "#eeeef0ff",
-        ],
-        dark_alpha: [
-            "#00000000",
-            "#f5f4f609",
-            "#ebeaf814",
-            "#eee5f81d",
-            "#efe6fe25",
-            "#f1e6fd30",
-            "#eee9ff40",
-            "#eee7ff5d",
-            "#eae6fd6e",
-            "#ece9fd7c",
-            "#f5f1ffb7",
-            "#fdfdffef",
-        ],
-    }
-    .try_into()
-    .unwrap()
-}
-
-pub(crate) fn slate() -> ColorScaleSet {
-    StaticColorScaleSet {
-        scale: "Slate",
-        light: [
-            "#fcfcfdff",
-            "#f9f9fbff",
-            "#f0f0f3ff",
-            "#e8e8ecff",
-            "#e0e1e6ff",
-            "#d9d9e0ff",
-            "#cdced6ff",
-            "#b9bbc6ff",
-            "#8b8d98ff",
-            "#80838dff",
-            "#60646cff",
-            "#1c2024ff",
-        ],
-        light_alpha: [
-            "#00005503",
-            "#00005506",
-            "#0000330f",
-            "#00002d17",
-            "#0009321f",
-            "#00002f26",
-            "#00062e32",
-            "#00083046",
-            "#00051d74",
-            "#00071b7f",
-            "#0007149f",
-            "#000509e3",
-        ],
-        dark: [
-            "#111113ff",
-            "#18191bff",
-            "#212225ff",
-            "#272a2dff",
-            "#2e3135ff",
-            "#363a3fff",
-            "#43484eff",
-            "#5a6169ff",
-            "#696e77ff",
-            "#777b84ff",
-            "#b0b4baff",
-            "#edeef0ff",
-        ],
-        dark_alpha: [
-            "#00000000",
-            "#d8f4f609",
-            "#ddeaf814",
-            "#d3edf81d",
-            "#d9edfe25",
-            "#d6ebfd30",
-            "#d9edff40",
-            "#d9edff5d",
-            "#dfebfd6d",
-            "#e5edfd7b",
-            "#f1f7feb5",
-            "#fcfdffef",
-        ],
-    }
-    .try_into()
-    .unwrap()
-}
-
-pub(crate) fn sage() -> ColorScaleSet {
-    StaticColorScaleSet {
-        scale: "Sage",
-        light: [
-            "#fbfdfcff",
-            "#f7f9f8ff",
-            "#eef1f0ff",
-            "#e6e9e8ff",
-            "#dfe2e0ff",
-            "#d7dad9ff",
-            "#cbcfcdff",
-            "#b8bcbaff",
-            "#868e8bff",
-            "#7c8481ff",
-            "#5f6563ff",
-            "#1a211eff",
-        ],
-        light_alpha: [
-            "#00804004",
-            "#00402008",
-            "#002d1e11",
-            "#001f1519",
-            "#00180820",
-            "#00140d28",
-            "#00140a34",
-            "#000f0847",
-            "#00110b79",
-            "#00100a83",
-            "#000a07a0",
-            "#000805e5",
-        ],
-        dark: [
-            "#101211ff",
-            "#171918ff",
-            "#202221ff",
-            "#272a29ff",
-            "#2e3130ff",
-            "#373b39ff",
-            "#444947ff",
-            "#5b625fff",
-            "#63706bff",
-            "#717d79ff",
-            "#adb5b2ff",
-            "#eceeedff",
-        ],
-        dark_alpha: [
-            "#00000000",
-            "#f0f2f108",
-            "#f3f5f412",
-            "#f2fefd1a",
-            "#f1fbfa22",
-            "#edfbf42d",
-            "#edfcf73c",
-            "#ebfdf657",
-            "#dffdf266",
-            "#e5fdf674",
-            "#f4fefbb0",
-            "#fdfffeed",
-        ],
-    }
-    .try_into()
-    .unwrap()
-}
-
-pub(crate) fn olive() -> ColorScaleSet {
-    StaticColorScaleSet {
-        scale: "Olive",
-        light: [
-            "#fcfdfcff",
-            "#f8faf8ff",
-            "#eff1efff",
-            "#e7e9e7ff",
-            "#dfe2dfff",
-            "#d7dad7ff",
-            "#cccfccff",
-            "#b9bcb8ff",
-            "#898e87ff",
-            "#7f847dff",
-            "#60655fff",
-            "#1d211cff",
-        ],
-        light_alpha: [
-            "#00550003",
-            "#00490007",
-            "#00200010",
-            "#00160018",
-            "#00180020",
-            "#00140028",
-            "#000f0033",
-            "#040f0047",
-            "#050f0078",
-            "#040e0082",
-            "#020a00a0",
-            "#010600e3",
-        ],
-        dark: [
-            "#111210ff",
-            "#181917ff",
-            "#212220ff",
-            "#282a27ff",
-            "#2f312eff",
-            "#383a36ff",
-            "#454843ff",
-            "#5c625bff",
-            "#687066ff",
-            "#767d74ff",
-            "#afb5adff",
-            "#eceeecff",
-        ],
-        dark_alpha: [
-            "#00000000",
-            "#f1f2f008",
-            "#f4f5f312",
-            "#f3fef21a",
-            "#f2fbf122",
-            "#f4faed2c",
-            "#f2fced3b",
-            "#edfdeb57",
-            "#ebfde766",
-            "#f0fdec74",
-            "#f6fef4b0",
-            "#fdfffded",
-        ],
-    }
-    .try_into()
-    .unwrap()
-}
-
-pub(crate) fn sand() -> ColorScaleSet {
-    StaticColorScaleSet {
-        scale: "Sand",
-        light: [
-            "#fdfdfcff",
-            "#f9f9f8ff",
-            "#f1f0efff",
-            "#e9e8e6ff",
-            "#e2e1deff",
-            "#dad9d6ff",
-            "#cfcecaff",
-            "#bcbbb5ff",
-            "#8d8d86ff",
-            "#82827cff",
-            "#63635eff",
-            "#21201cff",
-        ],
-        light_alpha: [
-            "#55550003",
-            "#25250007",
-            "#20100010",
-            "#1f150019",
-            "#1f180021",
-            "#19130029",
-            "#19140035",
-            "#1915014a",
-            "#0f0f0079",
-            "#0c0c0083",
-            "#080800a1",
-            "#060500e3",
-        ],
-        dark: [
-            "#111110ff",
-            "#191918ff",
-            "#222221ff",
-            "#2a2a28ff",
-            "#31312eff",
-            "#3b3a37ff",
-            "#494844ff",
-            "#62605bff",
-            "#6f6d66ff",
-            "#7c7b74ff",
-            "#b5b3adff",
-            "#eeeeecff",
-        ],
-        dark_alpha: [
-            "#00000000",
-            "#f4f4f309",
-            "#f6f6f513",
-            "#fefef31b",
-            "#fbfbeb23",
-            "#fffaed2d",
-            "#fffbed3c",
-            "#fff9eb57",
-            "#fffae965",
-            "#fffdee73",
-            "#fffcf4b0",
-            "#fffffded",
-        ],
-    }
-    .try_into()
-    .unwrap()
-}
-
-pub(crate) fn gold() -> ColorScaleSet {
-    StaticColorScaleSet {
-        scale: "Gold",
-        light: [
-            "#fdfdfcff",
-            "#faf9f2ff",
-            "#f2f0e7ff",
-            "#eae6dbff",
-            "#e1dccfff",
-            "#d8d0bfff",
-            "#cbc0aaff",
-            "#b9a88dff",
-            "#978365ff",
-            "#8c7a5eff",
-            "#71624bff",
-            "#3b352bff",
-        ],
-        light_alpha: [
-            "#55550003",
-            "#9d8a000d",
-            "#75600018",
-            "#6b4e0024",
-            "#60460030",
-            "#64440040",
-            "#63420055",
-            "#633d0072",
-            "#5332009a",
-            "#492d00a1",
-            "#362100b4",
-            "#130c00d4",
-        ],
-        dark: [
-            "#121211ff",
-            "#1b1a17ff",
-            "#24231fff",
-            "#2d2b26ff",
-            "#38352eff",
-            "#444039ff",
-            "#544f46ff",
-            "#696256ff",
-            "#978365ff",
-            "#a39073ff",
-            "#cbb99fff",
-            "#e8e2d9ff",
-        ],
-        dark_alpha: [
-            "#91911102",
-            "#f9e29d0b",
-            "#f8ecbb15",
-            "#ffeec41e",
-            "#feecc22a",
-            "#feebcb37",
-            "#ffedcd48",
-            "#fdeaca5f",
-            "#ffdba690",
-            "#fedfb09d",
-            "#fee7c6c8",
-            "#fef7ede7",
-        ],
-    }
-    .try_into()
-    .unwrap()
-}
-
-pub(crate) fn bronze() -> ColorScaleSet {
-    StaticColorScaleSet {
-        scale: "Bronze",
-        light: [
-            "#fdfcfcff",
-            "#fdf7f5ff",
-            "#f6edeaff",
-            "#efe4dfff",
-            "#e7d9d3ff",
-            "#dfcdc5ff",
-            "#d3bcb3ff",
-            "#c2a499ff",
-            "#a18072ff",
-            "#957468ff",
-            "#7d5e54ff",
-            "#43302bff",
-        ],
-        light_alpha: [
-            "#55000003",
-            "#cc33000a",
-            "#92250015",
-            "#80280020",
-            "#7423002c",
-            "#7324003a",
-            "#6c1f004c",
-            "#671c0066",
-            "#551a008d",
-            "#4c150097",
-            "#3d0f00ab",
-            "#1d0600d4",
-        ],
-        dark: [
-            "#141110ff",
-            "#1c1917ff",
-            "#262220ff",
-            "#302a27ff",
-            "#3b3330ff",
-            "#493e3aff",
-            "#5a4c47ff",
-            "#6f5f58ff",
-            "#a18072ff",
-            "#ae8c7eff",
-            "#d4b3a5ff",
-            "#ede0d9ff",
-        ],
-        dark_alpha: [
-            "#d1110004",
-            "#fbbc910c",
-            "#faceb817",
-            "#facdb622",
-            "#ffd2c12d",
-            "#ffd1c03c",
-            "#fdd0c04f",
-            "#ffd6c565",
-            "#fec7b09b",
-            "#fecab5a9",
-            "#ffd7c6d1",
-            "#fff1e9ec",
-        ],
-    }
-    .try_into()
-    .unwrap()
-}
-
-pub(crate) fn brown() -> ColorScaleSet {
-    StaticColorScaleSet {
-        scale: "Brown",
-        light: [
-            "#fefdfcff",
-            "#fcf9f6ff",
-            "#f6eee7ff",
-            "#f0e4d9ff",
-            "#ebdacaff",
-            "#e4cdb7ff",
-            "#dcbc9fff",
-            "#cea37eff",
-            "#ad7f58ff",
-            "#a07553ff",
-            "#815e46ff",
-            "#3e332eff",
-        ],
-        light_alpha: [
-            "#aa550003",
-            "#aa550009",
-            "#a04b0018",
-            "#9b4a0026",
-            "#9f4d0035",
-            "#a04e0048",
-            "#a34e0060",
-            "#9f4a0081",
-            "#823c00a7",
-            "#723300ac",
-            "#522100b9",
-            "#140600d1",
-        ],
-        dark: [
-            "#12110fff",
-            "#1c1816ff",
-            "#28211dff",
-            "#322922ff",
-            "#3e3128ff",
-            "#4d3c2fff",
-            "#614a39ff",
-            "#7c5f46ff",
-            "#ad7f58ff",
-            "#b88c67ff",
-            "#dbb594ff",
-            "#f2e1caff",
-        ],
-        dark_alpha: [
-            "#91110002",
-            "#fba67c0c",
-            "#fcb58c19",
-            "#fbbb8a24",
-            "#fcb88931",
-            "#fdba8741",
-            "#ffbb8856",
-            "#ffbe8773",
-            "#feb87da8",
-            "#ffc18cb3",
-            "#fed1aad9",
-            "#feecd4f2",
-        ],
-    }
-    .try_into()
-    .unwrap()
-}
-
-pub(crate) fn yellow() -> ColorScaleSet {
-    StaticColorScaleSet {
-        scale: "Yellow",
-        light: [
-            "#fdfdf9ff",
-            "#fefce9ff",
-            "#fffab8ff",
-            "#fff394ff",
-            "#ffe770ff",
-            "#f3d768ff",
-            "#e4c767ff",
-            "#d5ae39ff",
-            "#ffe629ff",
-            "#ffdc00ff",
-            "#9e6c00ff",
-            "#473b1fff",
-        ],
-        light_alpha: [
-            "#aaaa0006",
-            "#f4dd0016",
-            "#ffee0047",
-            "#ffe3016b",
-            "#ffd5008f",
-            "#ebbc0097",
-            "#d2a10098",
-            "#c99700c6",
-            "#ffe100d6",
-            "#ffdc00ff",
-            "#9e6c00ff",
-            "#2e2000e0",
-        ],
-        dark: [
-            "#14120bff",
-            "#1b180fff",
-            "#2d2305ff",
-            "#362b00ff",
-            "#433500ff",
-            "#524202ff",
-            "#665417ff",
-            "#836a21ff",
-            "#ffe629ff",
-            "#ffff57ff",
-            "#f5e147ff",
-            "#f6eeb4ff",
-        ],
-        dark_alpha: [
-            "#d1510004",
-            "#f9b4000b",
-            "#ffaa001e",
-            "#fdb70028",
-            "#febb0036",
-            "#fec40046",
-            "#fdcb225c",
-            "#fdca327b",
-            "#ffe629ff",
-            "#ffff57ff",
-            "#fee949f5",
-            "#fef6baf6",
-        ],
-    }
-    .try_into()
-    .unwrap()
-}
-
-pub(crate) fn amber() -> ColorScaleSet {
-    StaticColorScaleSet {
-        scale: "Amber",
-        light: [
-            "#fefdfbff",
-            "#fefbe9ff",
-            "#fff7c2ff",
-            "#ffee9cff",
-            "#fbe577ff",
-            "#f3d673ff",
-            "#e9c162ff",
-            "#e2a336ff",
-            "#ffc53dff",
-            "#ffba18ff",
-            "#ab6400ff",
-            "#4f3422ff",
-        ],
-        light_alpha: [
-            "#c0800004",
-            "#f4d10016",
-            "#ffde003d",
-            "#ffd40063",
-            "#f8cf0088",
-            "#eab5008c",
-            "#dc9b009d",
-            "#da8a00c9",
-            "#ffb300c2",
-            "#ffb300e7",
-            "#ab6400ff",
-            "#341500dd",
-        ],
-        dark: [
-            "#16120cff",
-            "#1d180fff",
-            "#302008ff",
-            "#3f2700ff",
-            "#4d3000ff",
-            "#5c3d05ff",
-            "#714f19ff",
-            "#8f6424ff",
-            "#ffc53dff",
-            "#ffd60aff",
-            "#ffca16ff",
-            "#ffe7b3ff",
-        ],
-        dark_alpha: [
-            "#e63c0006",
-            "#fd9b000d",
-            "#fa820022",
-            "#fc820032",
-            "#fd8b0041",
-            "#fd9b0051",
-            "#ffab2567",
-            "#ffae3587",
-            "#ffc53dff",
-            "#ffd60aff",
-            "#ffca16ff",
-            "#ffe7b3ff",
-        ],
-    }
-    .try_into()
-    .unwrap()
-}
-
-pub(crate) fn orange() -> ColorScaleSet {
-    StaticColorScaleSet {
-        scale: "Orange",
-        light: [
-            "#fefcfbff",
-            "#fff7edff",
-            "#ffefd6ff",
-            "#ffdfb5ff",
-            "#ffd19aff",
-            "#ffc182ff",
-            "#f5ae73ff",
-            "#ec9455ff",
-            "#f76b15ff",
-            "#ef5f00ff",
-            "#cc4e00ff",
-            "#582d1dff",
-        ],
-        light_alpha: [
-            "#c0400004",
-            "#ff8e0012",
-            "#ff9c0029",
-            "#ff91014a",
-            "#ff8b0065",
-            "#ff81007d",
-            "#ed6c008c",
-            "#e35f00aa",
-            "#f65e00ea",
-            "#ef5f00ff",
-            "#cc4e00ff",
-            "#431200e2",
-        ],
-        dark: [
-            "#17120eff",
-            "#1e160fff",
-            "#331e0bff",
-            "#462100ff",
-            "#562800ff",
-            "#66350cff",
-            "#7e451dff",
-            "#a35829ff",
-            "#f76b15ff",
-            "#ff801fff",
-            "#ffa057ff",
-            "#ffe0c2ff",
-        ],
-        dark_alpha: [
-            "#ec360007",
-            "#fe6d000e",
-            "#fb6a0025",
-            "#ff590039",
-            "#ff61004a",
-            "#fd75045c",
-            "#ff832c75",
-            "#fe84389d",
-            "#fe6d15f7",
-            "#ff801fff",
-            "#ffa057ff",
-            "#ffe0c2ff",
-        ],
-    }
-    .try_into()
-    .unwrap()
-}
-
-pub(crate) fn tomato() -> ColorScaleSet {
-    StaticColorScaleSet {
-        scale: "Tomato",
-        light: [
-            "#fffcfcff",
-            "#fff8f7ff",
-            "#feebe7ff",
-            "#ffdcd3ff",
-            "#ffcdc2ff",
-            "#fdbdafff",
-            "#f5a898ff",
-            "#ec8e7bff",
-            "#e54d2eff",
-            "#dd4425ff",
-            "#d13415ff",
-            "#5c271fff",
-        ],
-        light_alpha: [
-            "#ff000003",
-            "#ff200008",
-            "#f52b0018",
-            "#ff35002c",
-            "#ff2e003d",
-            "#f92d0050",
-            "#e7280067",
-            "#db250084",
-            "#df2600d1",
-            "#d72400da",
-            "#cd2200ea",
-            "#460900e0",
-        ],
-        dark: [
-            "#181111ff",
-            "#1f1513ff",
-            "#391714ff",
-            "#4e1511ff",
-            "#5e1c16ff",
-            "#6e2920ff",
-            "#853a2dff",
-            "#ac4d39ff",
-            "#e54d2eff",
-            "#ec6142ff",
-            "#ff977dff",
-            "#fbd3cbff",
-        ],
-        dark_alpha: [
-            "#f1121208",
-            "#ff55330f",
-            "#ff35232b",
-            "#fd201142",
-            "#fe332153",
-            "#ff4f3864",
-            "#fd644a7d",
-            "#fe6d4ea7",
-            "#fe5431e4",
-            "#ff6847eb",
-            "#ff977dff",
-            "#ffd6cefb",
-        ],
-    }
-    .try_into()
-    .unwrap()
-}
-
-pub(crate) fn red() -> ColorScaleSet {
-    StaticColorScaleSet {
-        scale: "Red",
-        light: [
-            "#fffcfcff",
-            "#fff7f7ff",
-            "#feebecff",
-            "#ffdbdcff",
-            "#ffcdceff",
-            "#fdbdbeff",
-            "#f4a9aaff",
-            "#eb8e90ff",
-            "#e5484dff",
-            "#dc3e42ff",
-            "#ce2c31ff",
-            "#641723ff",
-        ],
-        light_alpha: [
-            "#ff000003",
-            "#ff000008",
-            "#f3000d14",
-            "#ff000824",
-            "#ff000632",
-            "#f8000442",
-            "#df000356",
-            "#d2000571",
-            "#db0007b7",
-            "#d10005c1",
-            "#c40006d3",
-            "#55000de8",
-        ],
-        dark: [
-            "#191111ff",
-            "#201314ff",
-            "#3b1219ff",
-            "#500f1cff",
-            "#611623ff",
-            "#72232dff",
-            "#8c333aff",
-            "#b54548ff",
-            "#e5484dff",
-            "#ec5d5eff",
-            "#ff9592ff",
-            "#ffd1d9ff",
-        ],
-        dark_alpha: [
-            "#f4121209",
-            "#f22f3e11",
-            "#ff173f2d",
-            "#fe0a3b44",
-            "#ff204756",
-            "#ff3e5668",
-            "#ff536184",
-            "#ff5d61b0",
-            "#fe4e54e4",
-            "#ff6465eb",
-            "#ff9592ff",
-            "#ffd1d9ff",
-        ],
-    }
-    .try_into()
-    .unwrap()
-}
-
-pub(crate) fn ruby() -> ColorScaleSet {
-    StaticColorScaleSet {
-        scale: "Ruby",
-        light: [
-            "#fffcfdff",
-            "#fff7f8ff",
-            "#feeaedff",
-            "#ffdce1ff",
-            "#ffced6ff",
-            "#f8bfc8ff",
-            "#efacb8ff",
-            "#e592a3ff",
-            "#e54666ff",
-            "#dc3b5dff",
-            "#ca244dff",
-            "#64172bff",
-        ],
-        light_alpha: [
-            "#ff005503",
-            "#ff002008",
-            "#f3002515",
-            "#ff002523",
-            "#ff002a31",
-            "#e4002440",
-            "#ce002553",
-            "#c300286d",
-            "#db002cb9",
-            "#d2002cc4",
-            "#c10030db",
-            "#550016e8",
-        ],
-        dark: [
-            "#191113ff",
-            "#1e1517ff",
-            "#3a141eff",
-            "#4e1325ff",
-            "#5e1a2eff",
-            "#6f2539ff",
-            "#883447ff",
-            "#b3445aff",
-            "#e54666ff",
-            "#ec5a72ff",
-            "#ff949dff",
-            "#fed2e1ff",
-        ],
-        dark_alpha: [
-            "#f4124a09",
-            "#fe5a7f0e",
-            "#ff235d2c",
-            "#fd195e42",
-            "#fe2d6b53",
-            "#ff447665",
-            "#ff577d80",
-            "#ff5c7cae",
-            "#fe4c70e4",
-            "#ff617beb",
-            "#ff949dff",
-            "#ffd3e2fe",
-        ],
-    }
-    .try_into()
-    .unwrap()
-}
-
-pub(crate) fn crimson() -> ColorScaleSet {
-    StaticColorScaleSet {
-        scale: "Crimson",
-        light: [
-            "#fffcfdff",
-            "#fef7f9ff",
-            "#ffe9f0ff",
-            "#fedce7ff",
-            "#faceddff",
-            "#f3bed1ff",
-            "#eaacc3ff",
-            "#e093b2ff",
-            "#e93d82ff",
-            "#df3478ff",
-            "#cb1d63ff",
-            "#621639ff",
-        ],
-        light_alpha: [
-            "#ff005503",
-            "#e0004008",
-            "#ff005216",
-            "#f8005123",
-            "#e5004f31",
-            "#d0004b41",
-            "#bf004753",
-            "#b6004a6c",
-            "#e2005bc2",
-            "#d70056cb",
-            "#c4004fe2",
-            "#530026e9",
-        ],
-        dark: [
-            "#191114ff",
-            "#201318ff",
-            "#381525ff",
-            "#4d122fff",
-            "#5c1839ff",
-            "#6d2545ff",
-            "#873356ff",
-            "#b0436eff",
-            "#e93d82ff",
-            "#ee518aff",
-            "#ff92adff",
-            "#fdd3e8ff",
-        ],
-        dark_alpha: [
-            "#f4126709",
-            "#f22f7a11",
-            "#fe2a8b2a",
-            "#fd158741",
-            "#fd278f51",
-            "#fe459763",
-            "#fd559b7f",
-            "#fe5b9bab",
-            "#fe418de8",
-            "#ff5693ed",
-            "#ff92adff",
-            "#ffd5eafd",
-        ],
-    }
-    .try_into()
-    .unwrap()
-}
-
-pub(crate) fn pink() -> ColorScaleSet {
-    StaticColorScaleSet {
-        scale: "Pink",
-        light: [
-            "#fffcfeff",
-            "#fef7fbff",
-            "#fee9f5ff",
-            "#fbdcefff",
-            "#f6cee7ff",
-            "#efbfddff",
-            "#e7acd0ff",
-            "#dd93c2ff",
-            "#d6409fff",
-            "#cf3897ff",
-            "#c2298aff",
-            "#651249ff",
-        ],
-        light_alpha: [
-            "#ff00aa03",
-            "#e0008008",
-            "#f4008c16",
-            "#e2008b23",
-            "#d1008331",
-            "#c0007840",
-            "#b6006f53",
-            "#af006f6c",
-            "#c8007fbf",
-            "#c2007ac7",
-            "#b60074d6",
-            "#59003bed",
-        ],
-        dark: [
-            "#191117ff",
-            "#21121dff",
-            "#37172fff",
-            "#4b143dff",
-            "#591c47ff",
-            "#692955ff",
-            "#833869ff",
-            "#a84885ff",
-            "#d6409fff",
-            "#de51a8ff",
-            "#ff8dccff",
-            "#fdd1eaff",
-        ],
-        dark_alpha: [
-            "#f412bc09",
-            "#f420bb12",
-            "#fe37cc29",
-            "#fc1ec43f",
-            "#fd35c24e",
-            "#fd51c75f",
-            "#fd62c87b",
-            "#ff68c8a2",
-            "#fe49bcd4",
-            "#ff5cc0dc",
-            "#ff8dccff",
-            "#ffd3ecfd",
-        ],
-    }
-    .try_into()
-    .unwrap()
-}
-
-pub(crate) fn plum() -> ColorScaleSet {
-    StaticColorScaleSet {
-        scale: "Plum",
-        light: [
-            "#fefcffff",
-            "#fdf7fdff",
-            "#fbebfbff",
-            "#f7def8ff",
-            "#f2d1f3ff",
-            "#e9c2ecff",
-            "#deade3ff",
-            "#cf91d8ff",
-            "#ab4abaff",
-            "#a144afff",
-            "#953ea3ff",
-            "#53195dff",
-        ],
-        light_alpha: [
-            "#aa00ff03",
-            "#c000c008",
-            "#cc00cc14",
-            "#c200c921",
-            "#b700bd2e",
-            "#a400b03d",
-            "#9900a852",
-            "#9000a56e",
-            "#89009eb5",
-            "#7f0092bb",
-            "#730086c1",
-            "#40004be6",
-        ],
-        dark: [
-            "#181118ff",
-            "#201320ff",
-            "#351a35ff",
-            "#451d47ff",
-            "#512454ff",
-            "#5e3061ff",
-            "#734079ff",
-            "#92549cff",
-            "#ab4abaff",
-            "#b658c4ff",
-            "#e796f3ff",
-            "#f4d4f4ff",
-        ],
-        dark_alpha: [
-            "#f112f108",
-            "#f22ff211",
-            "#fd4cfd27",
-            "#f646ff3a",
-            "#f455ff48",
-            "#f66dff56",
-            "#f07cfd70",
-            "#ee84ff95",
-            "#e961feb6",
-            "#ed70ffc0",
-            "#f19cfef3",
-            "#feddfef4",
-        ],
-    }
-    .try_into()
-    .unwrap()
-}
-
-pub(crate) fn purple() -> ColorScaleSet {
-    StaticColorScaleSet {
-        scale: "Purple",
-        light: [
-            "#fefcfeff",
-            "#fbf7feff",
-            "#f7edfeff",
-            "#f2e2fcff",
-            "#ead5f9ff",
-            "#e0c4f4ff",
-            "#d1afecff",
-            "#be93e4ff",
-            "#8e4ec6ff",
-            "#8347b9ff",
-            "#8145b5ff",
-            "#402060ff",
-        ],
-        light_alpha: [
-            "#aa00aa03",
-            "#8000e008",
-            "#8e00f112",
-            "#8d00e51d",
-            "#8000db2a",
-            "#7a01d03b",
-            "#6d00c350",
-            "#6600c06c",
-            "#5c00adb1",
-            "#53009eb8",
-            "#52009aba",
-            "#250049df",
-        ],
-        dark: [
-            "#18111bff",
-            "#1e1523ff",
-            "#301c3bff",
-            "#3d224eff",
-            "#48295cff",
-            "#54346bff",
-            "#664282ff",
-            "#8457aaff",
-            "#8e4ec6ff",
-            "#9a5cd0ff",
-            "#d19dffff",
-            "#ecd9faff",
-        ],
-        dark_alpha: [
-            "#b412f90b",
-            "#b744f714",
-            "#c150ff2d",
-            "#bb53fd42",
-            "#be5cfd51",
-            "#c16dfd61",
-            "#c378fd7a",
-            "#c47effa4",
-            "#b661ffc2",
-            "#bc6fffcd",
-            "#d19dffff",
-            "#f1ddfffa",
-        ],
-    }
-    .try_into()
-    .unwrap()
-}
-
-pub(crate) fn violet() -> ColorScaleSet {
-    StaticColorScaleSet {
-        scale: "Violet",
-        light: [
-            "#fdfcfeff",
-            "#faf8ffff",
-            "#f4f0feff",
-            "#ebe4ffff",
-            "#e1d9ffff",
-            "#d4cafeff",
-            "#c2b5f5ff",
-            "#aa99ecff",
-            "#6e56cfff",
-            "#654dc4ff",
-            "#6550b9ff",
-            "#2f265fff",
-        ],
-        light_alpha: [
-            "#5500aa03",
-            "#4900ff07",
-            "#4400ee0f",
-            "#4300ff1b",
-            "#3600ff26",
-            "#3100fb35",
-            "#2d01dd4a",
-            "#2b00d066",
-            "#2400b7a9",
-            "#2300abb2",
-            "#1f0099af",
-            "#0b0043d9",
-        ],
-        dark: [
-            "#14121fff",
-            "#1b1525ff",
-            "#291f43ff",
-            "#33255bff",
-            "#3c2e69ff",
-            "#473876ff",
-            "#56468bff",
-            "#6958adff",
-            "#6e56cfff",
-            "#7d66d9ff",
-            "#baa7ffff",
-            "#e2ddfeff",
-        ],
-        dark_alpha: [
-            "#4422ff0f",
-            "#853ff916",
-            "#8354fe36",
-            "#7d51fd50",
-            "#845ffd5f",
-            "#8f6cfd6d",
-            "#9879ff83",
-            "#977dfea8",
-            "#8668ffcc",
-            "#9176fed7",
-            "#baa7ffff",
-            "#e3defffe",
-        ],
-    }
-    .try_into()
-    .unwrap()
-}
-
-pub(crate) fn iris() -> ColorScaleSet {
-    StaticColorScaleSet {
-        scale: "Iris",
-        light: [
-            "#fdfdffff",
-            "#f8f8ffff",
-            "#f0f1feff",
-            "#e6e7ffff",
-            "#dadcffff",
-            "#cbcdffff",
-            "#b8baf8ff",
-            "#9b9ef0ff",
-            "#5b5bd6ff",
-            "#5151cdff",
-            "#5753c6ff",
-            "#272962ff",
-        ],
-        light_alpha: [
-            "#0000ff02",
-            "#0000ff07",
-            "#0011ee0f",
-            "#000bff19",
-            "#000eff25",
-            "#000aff34",
-            "#0008e647",
-            "#0008d964",
-            "#0000c0a4",
-            "#0000b6ae",
-            "#0600abac",
-            "#000246d8",
-        ],
-        dark: [
-            "#13131eff",
-            "#171625ff",
-            "#202248ff",
-            "#262a65ff",
-            "#303374ff",
-            "#3d3e82ff",
-            "#4a4a95ff",
-            "#5958b1ff",
-            "#5b5bd6ff",
-            "#6e6adeff",
-            "#b1a9ffff",
-            "#e0dffeff",
-        ],
-        dark_alpha: [
-            "#3636fe0e",
-            "#564bf916",
-            "#525bff3b",
-            "#4d58ff5a",
-            "#5b62fd6b",
-            "#6d6ffd7a",
-            "#7777fe8e",
-            "#7b7afeac",
-            "#6a6afed4",
-            "#7d79ffdc",
-            "#b1a9ffff",
-            "#e1e0fffe",
-        ],
-    }
-    .try_into()
-    .unwrap()
-}
-
-pub(crate) fn indigo() -> ColorScaleSet {
-    StaticColorScaleSet {
-        scale: "Indigo",
-        light: [
-            "#fdfdfeff",
-            "#f7f9ffff",
-            "#edf2feff",
-            "#e1e9ffff",
-            "#d2deffff",
-            "#c1d0ffff",
-            "#abbdf9ff",
-            "#8da4efff",
-            "#3e63ddff",
-            "#3358d4ff",
-            "#3a5bc7ff",
-            "#1f2d5cff",
-        ],
-        light_alpha: [
-            "#00008002",
-            "#0040ff08",
-            "#0047f112",
-            "#0044ff1e",
-            "#0044ff2d",
-            "#003eff3e",
-            "#0037ed54",
-            "#0034dc72",
-            "#0031d2c1",
-            "#002ec9cc",
-            "#002bb7c5",
-            "#001046e0",
-        ],
-        dark: [
-            "#11131fff",
-            "#141726ff",
-            "#182449ff",
-            "#1d2e62ff",
-            "#253974ff",
-            "#304384ff",
-            "#3a4f97ff",
-            "#435db1ff",
-            "#3e63ddff",
-            "#5472e4ff",
-            "#9eb1ffff",
-            "#d6e1ffff",
-        ],
-        dark_alpha: [
-            "#1133ff0f",
-            "#3354fa17",
-            "#2f62ff3c",
-            "#3566ff57",
-            "#4171fd6b",
-            "#5178fd7c",
-            "#5a7fff90",
-            "#5b81feac",
-            "#4671ffdb",
-            "#5c7efee3",
-            "#9eb1ffff",
-            "#d6e1ffff",
-        ],
-    }
-    .try_into()
-    .unwrap()
-}
-
-pub(crate) fn blue() -> ColorScaleSet {
-    StaticColorScaleSet {
-        scale: "Blue",
-        light: [
-            "#fbfdffff",
-            "#f4faffff",
-            "#e6f4feff",
-            "#d5efffff",
-            "#c2e5ffff",
-            "#acd8fcff",
-            "#8ec8f6ff",
-            "#5eb1efff",
-            "#0090ffff",
-            "#0588f0ff",
-            "#0d74ceff",
-            "#113264ff",
-        ],
-        light_alpha: [
-            "#0080ff04",
-            "#008cff0b",
-            "#008ff519",
-            "#009eff2a",
-            "#0093ff3d",
-            "#0088f653",
-            "#0083eb71",
-            "#0084e6a1",
-            "#0090ffff",
-            "#0086f0fa",
-            "#006dcbf2",
-            "#002359ee",
-        ],
-        dark: [
-            "#0d1520ff",
-            "#111927ff",
-            "#0d2847ff",
-            "#003362ff",
-            "#004074ff",
-            "#104d87ff",
-            "#205d9eff",
-            "#2870bdff",
-            "#0090ffff",
-            "#3b9effff",
-            "#70b8ffff",
-            "#c2e6ffff",
-        ],
-        dark_alpha: [
-            "#004df211",
-            "#1166fb18",
-            "#0077ff3a",
-            "#0075ff57",
-            "#0081fd6b",
-            "#0f89fd7f",
-            "#2a91fe98",
-            "#3094feb9",
-            "#0090ffff",
-            "#3b9effff",
-            "#70b8ffff",
-            "#c2e6ffff",
-        ],
-    }
-    .try_into()
-    .unwrap()
-}
-
-pub(crate) fn cyan() -> ColorScaleSet {
-    StaticColorScaleSet {
-        scale: "Cyan",
-        light: [
-            "#fafdfeff",
-            "#f2fafbff",
-            "#def7f9ff",
-            "#caf1f6ff",
-            "#b5e9f0ff",
-            "#9ddde7ff",
-            "#7dcedcff",
-            "#3db9cfff",
-            "#00a2c7ff",
-            "#0797b9ff",
-            "#107d98ff",
-            "#0d3c48ff",
-        ],
-        light_alpha: [
-            "#0099cc05",
-            "#009db10d",
-            "#00c2d121",
-            "#00bcd435",
-            "#01b4cc4a",
-            "#00a7c162",
-            "#009fbb82",
-            "#00a3c0c2",
-            "#00a2c7ff",
-            "#0094b7f8",
-            "#007491ef",
-            "#00323ef2",
-        ],
-        dark: [
-            "#0b161aff",
-            "#101b20ff",
-            "#082c36ff",
-            "#003848ff",
-            "#004558ff",
-            "#045468ff",
-            "#12677eff",
-            "#11809cff",
-            "#00a2c7ff",
-            "#23afd0ff",
-            "#4ccce6ff",
-            "#b6ecf7ff",
-        ],
-        dark_alpha: [
-            "#0091f70a",
-            "#02a7f211",
-            "#00befd28",
-            "#00baff3b",
-            "#00befd4d",
-            "#00c7fd5e",
-            "#14cdff75",
-            "#11cfff95",
-            "#00cfffc3",
-            "#28d6ffcd",
-            "#52e1fee5",
-            "#bbf3fef7",
-        ],
-    }
-    .try_into()
-    .unwrap()
-}
-
-pub(crate) fn teal() -> ColorScaleSet {
-    StaticColorScaleSet {
-        scale: "Teal",
-        light: [
-            "#fafefdff",
-            "#f3fbf9ff",
-            "#e0f8f3ff",
-            "#ccf3eaff",
-            "#b8eae0ff",
-            "#a1ded2ff",
-            "#83cdc1ff",
-            "#53b9abff",
-            "#12a594ff",
-            "#0d9b8aff",
-            "#008573ff",
-            "#0d3d38ff",
-        ],
-        light_alpha: [
-            "#00cc9905",
-            "#00aa800c",
-            "#00c69d1f",
-            "#00c39633",
-            "#00b49047",
-            "#00a6855e",
-            "#0099807c",
-            "#009783ac",
-            "#009e8ced",
-            "#009684f2",
-            "#008573ff",
-            "#00332df2",
-        ],
-        dark: [
-            "#0d1514ff",
-            "#111c1bff",
-            "#0d2d2aff",
-            "#023b37ff",
-            "#084843ff",
-            "#145750ff",
-            "#1c6961ff",
-            "#207e73ff",
-            "#12a594ff",
-            "#0eb39eff",
-            "#0bd8b6ff",
-            "#adf0ddff",
-        ],
-        dark_alpha: [
-            "#00deab05",
-            "#12fbe60c",
-            "#00ffe61e",
-            "#00ffe92d",
-            "#00ffea3b",
-            "#1cffe84b",
-            "#2efde85f",
-            "#32ffe775",
-            "#13ffe49f",
-            "#0dffe0ae",
-            "#0afed5d6",
-            "#b8ffebef",
-        ],
-    }
-    .try_into()
-    .unwrap()
-}
-
-pub(crate) fn jade() -> ColorScaleSet {
-    StaticColorScaleSet {
-        scale: "Jade",
-        light: [
-            "#fbfefdff",
-            "#f4fbf7ff",
-            "#e6f7edff",
-            "#d6f1e3ff",
-            "#c3e9d7ff",
-            "#acdec8ff",
-            "#8bceb6ff",
-            "#56ba9fff",
-            "#29a383ff",
-            "#26997bff",
-            "#208368ff",
-            "#1d3b31ff",
-        ],
-        light_alpha: [
-            "#00c08004",
-            "#00a3460b",
-            "#00ae4819",
-            "#00a85129",
-            "#00a2553c",
-            "#009a5753",
-            "#00945f74",
-            "#00976ea9",
-            "#00916bd6",
-            "#008764d9",
-            "#007152df",
-            "#002217e2",
-        ],
-        dark: [
-            "#0d1512ff",
-            "#121c18ff",
-            "#0f2e22ff",
-            "#0b3b2cff",
-            "#114837ff",
-            "#1b5745ff",
-            "#246854ff",
-            "#2a7e68ff",
-            "#29a383ff",
-            "#27b08bff",
-            "#1fd8a4ff",
-            "#adf0d4ff",
-        ],
-        dark_alpha: [
-            "#00de4505",
-            "#27fba60c",
-            "#02f99920",
-            "#00ffaa2d",
-            "#11ffb63b",
-            "#34ffc24b",
-            "#45fdc75e",
-            "#48ffcf75",
-            "#38feca9d",
-            "#31fec7ab",
-            "#21fec0d6",
-            "#b8ffe1ef",
-        ],
-    }
-    .try_into()
-    .unwrap()
-}
-
-pub(crate) fn green() -> ColorScaleSet {
-    StaticColorScaleSet {
-        scale: "Green",
-        light: [
-            "#fbfefcff",
-            "#f4fbf6ff",
-            "#e6f6ebff",
-            "#d6f1dfff",
-            "#c4e8d1ff",
-            "#adddc0ff",
-            "#8eceaaff",
-            "#5bb98bff",
-            "#30a46cff",
-            "#2b9a66ff",
-            "#218358ff",
-            "#193b2dff",
-        ],
-        light_alpha: [
-            "#00c04004",
-            "#00a32f0b",
-            "#00a43319",
-            "#00a83829",
-            "#019c393b",
-            "#00963c52",
-            "#00914071",
-            "#00924ba4",
-            "#008f4acf",
-            "#008647d4",
-            "#00713fde",
-            "#002616e6",
-        ],
-        dark: [
-            "#0e1512ff",
-            "#121b17ff",
-            "#132d21ff",
-            "#113b29ff",
-            "#174933ff",
-            "#20573eff",
-            "#28684aff",
-            "#2f7c57ff",
-            "#30a46cff",
-            "#33b074ff",
-            "#3dd68cff",
-            "#b1f1cbff",
-        ],
-        dark_alpha: [
-            "#00de4505",
-            "#29f99d0b",
-            "#22ff991e",
-            "#11ff992d",
-            "#2bffa23c",
-            "#44ffaa4b",
-            "#50fdac5e",
-            "#54ffad73",
-            "#44ffa49e",
-            "#43fea4ab",
-            "#46fea5d4",
-            "#bbffd7f0",
-        ],
-    }
-    .try_into()
-    .unwrap()
-}
-
-pub(crate) fn grass() -> ColorScaleSet {
-    StaticColorScaleSet {
-        scale: "Grass",
-        light: [
-            "#fbfefbff",
-            "#f5fbf5ff",
-            "#e9f6e9ff",
-            "#daf1dbff",
-            "#c9e8caff",
-            "#b2ddb5ff",
-            "#94ce9aff",
-            "#65ba74ff",
-            "#46a758ff",
-            "#3e9b4fff",
-            "#2a7e3bff",
-            "#203c25ff",
-        ],
-        light_alpha: [
-            "#00c00004",
-            "#0099000a",
-            "#00970016",
-            "#009f0725",
-            "#00930536",
-            "#008f0a4d",
-            "#018b0f6b",
-            "#008d199a",
-            "#008619b9",
-            "#007b17c1",
-            "#006514d5",
-            "#002006df",
-        ],
-        dark: [
-            "#0e1511ff",
-            "#141a15ff",
-            "#1b2a1eff",
-            "#1d3a24ff",
-            "#25482dff",
-            "#2d5736ff",
-            "#366740ff",
-            "#3e7949ff",
-            "#46a758ff",
-            "#53b365ff",
-            "#71d083ff",
-            "#c2f0c2ff",
-        ],
-        dark_alpha: [
-            "#00de1205",
-            "#5ef7780a",
-            "#70fe8c1b",
-            "#57ff802c",
-            "#68ff8b3b",
-            "#71ff8f4b",
-            "#77fd925d",
-            "#77fd9070",
-            "#65ff82a1",
-            "#72ff8dae",
-            "#89ff9fcd",
-            "#ceffceef",
-        ],
-    }
-    .try_into()
-    .unwrap()
-}
-
-pub(crate) fn lime() -> ColorScaleSet {
-    StaticColorScaleSet {
-        scale: "Lime",
-        light: [
-            "#fcfdfaff",
-            "#f8faf3ff",
-            "#eef6d6ff",
-            "#e2f0bdff",
-            "#d3e7a6ff",
-            "#c2da91ff",
-            "#abc978ff",
-            "#8db654ff",
-            "#bdee63ff",
-            "#b0e64cff",
-            "#5c7c2fff",
-            "#37401cff",
-        ],
-        light_alpha: [
-            "#66990005",
-            "#6b95000c",
-            "#96c80029",
-            "#8fc60042",
-            "#81bb0059",
-            "#72aa006e",
-            "#61990087",
-            "#559200ab",
-            "#93e4009c",
-            "#8fdc00b3",
-            "#375f00d0",
-            "#1e2900e3",
-        ],
-        dark: [
-            "#11130cff",
-            "#151a10ff",
-            "#1f2917ff",
-            "#29371dff",
-            "#334423ff",
-            "#3d522aff",
-            "#496231ff",
-            "#577538ff",
-            "#bdee63ff",
-            "#d4ff70ff",
-            "#bde56cff",
-            "#e3f7baff",
-        ],
-        dark_alpha: [
-            "#11bb0003",
-            "#78f7000a",
-            "#9bfd4c1a",
-            "#a7fe5c29",
-            "#affe6537",
-            "#b2fe6d46",
-            "#b6ff6f57",
-            "#b6fd6d6c",
-            "#caff69ed",
-            "#d4ff70ff",
-            "#d1fe77e4",
-            "#e9febff7",
-        ],
-    }
-    .try_into()
-    .unwrap()
-}
-
-pub(crate) fn mint() -> ColorScaleSet {
-    StaticColorScaleSet {
-        scale: "Mint",
-        light: [
-            "#f9fefdff",
-            "#f2fbf9ff",
-            "#ddf9f2ff",
-            "#c8f4e9ff",
-            "#b3ecdeff",
-            "#9ce0d0ff",
-            "#7ecfbdff",
-            "#4cbba5ff",
-            "#86ead4ff",
-            "#7de0cbff",
-            "#027864ff",
-            "#16433cff",
-        ],
-        light_alpha: [
-            "#00d5aa06",
-            "#00b18a0d",
-            "#00d29e22",
-            "#00cc9937",
-            "#00c0914c",
-            "#00b08663",
-            "#00a17d81",
-            "#009e7fb3",
-            "#00d3a579",
-            "#00c39982",
-            "#007763fd",
-            "#00312ae9",
-        ],
-        dark: [
-            "#0e1515ff",
-            "#0f1b1bff",
-            "#092c2bff",
-            "#003a38ff",
-            "#004744ff",
-            "#105650ff",
-            "#1e685fff",
-            "#277f70ff",
-            "#86ead4ff",
-            "#a8f5e5ff",
-            "#58d5baff",
-            "#c4f5e1ff",
-        ],
-        dark_alpha: [
-            "#00dede05",
-            "#00f9f90b",
-            "#00fff61d",
-            "#00fff42c",
-            "#00fff23a",
-            "#0effeb4a",
-            "#34fde55e",
-            "#41ffdf76",
-            "#92ffe7e9",
-            "#aefeedf5",
-            "#67ffded2",
-            "#cbfee9f5",
-        ],
-    }
-    .try_into()
-    .unwrap()
-}
-
-pub(crate) fn sky() -> ColorScaleSet {
-    StaticColorScaleSet {
-        scale: "Sky",
-        light: [
-            "#f9feffff",
-            "#f1fafdff",
-            "#e1f6fdff",
-            "#d1f0faff",
-            "#bee7f5ff",
-            "#a9daedff",
-            "#8dcae3ff",
-            "#60b3d7ff",
-            "#7ce2feff",
-            "#74daf8ff",
-            "#00749eff",
-            "#1d3e56ff",
-        ],
-        light_alpha: [
-            "#00d5ff06",
-            "#00a4db0e",
-            "#00b3ee1e",
-            "#00ace42e",
-            "#00a1d841",
-            "#0092ca56",
-            "#0089c172",
-            "#0085bf9f",
-            "#00c7fe83",
-            "#00bcf38b",
-            "#00749eff",
-            "#002540e2",
-        ],
-        dark: [
-            "#0d141fff",
-            "#111a27ff",
-            "#112840ff",
-            "#113555ff",
-            "#154467ff",
-            "#1b537bff",
-            "#1f6692ff",
-            "#197caeff",
-            "#7ce2feff",
-            "#a8eeffff",
-            "#75c7f0ff",
-            "#c2f3ffff",
-        ],
-        dark_alpha: [
-            "#0044ff0f",
-            "#1171fb18",
-            "#1184fc33",
-            "#128fff49",
-            "#1c9dfd5d",
-            "#28a5ff72",
-            "#2badfe8b",
-            "#1db2fea9",
-            "#7ce3fffe",
-            "#a8eeffff",
-            "#7cd3ffef",
-            "#c2f3ffff",
-        ],
-    }
-    .try_into()
-    .unwrap()
-}
-
-pub(crate) fn black() -> ColorScaleSet {
-    StaticColorScaleSet {
-        scale: "Black",
-        light: [
-            "#0000000d",
-            "#0000001a",
-            "#00000026",
-            "#00000033",
-            "#0000004d",
-            "#00000066",
-            "#00000080",
-            "#00000099",
-            "#000000b3",
-            "#000000cc",
-            "#000000e6",
-            "#000000f2",
-        ],
-        light_alpha: [
-            "#0000000d",
-            "#0000001a",
-            "#00000026",
-            "#00000033",
-            "#0000004d",
-            "#00000066",
-            "#00000080",
-            "#00000099",
-            "#000000b3",
-            "#000000cc",
-            "#000000e6",
-            "#000000f2",
-        ],
-        dark: [
-            "#0000000d",
-            "#0000001a",
-            "#00000026",
-            "#00000033",
-            "#0000004d",
-            "#00000066",
-            "#00000080",
-            "#00000099",
-            "#000000b3",
-            "#000000cc",
-            "#000000e6",
-            "#000000f2",
-        ],
-        dark_alpha: [
-            "#0000000d",
-            "#0000001a",
-            "#00000026",
-            "#00000033",
-            "#0000004d",
-            "#00000066",
-            "#00000080",
-            "#00000099",
-            "#000000b3",
-            "#000000cc",
-            "#000000e6",
-            "#000000f2",
-        ],
-    }
-    .try_into()
-    .unwrap()
-}
-
-pub(crate) fn white() -> ColorScaleSet {
-    StaticColorScaleSet {
-        scale: "White",
-        light: [
-            "#ffffff0d",
-            "#ffffff1a",
-            "#ffffff26",
-            "#ffffff33",
-            "#ffffff4d",
-            "#ffffff66",
-            "#ffffff80",
-            "#ffffff99",
-            "#ffffffb3",
-            "#ffffffcc",
-            "#ffffffe6",
-            "#fffffff2",
-        ],
-        light_alpha: [
-            "#ffffff0d",
-            "#ffffff1a",
-            "#ffffff26",
-            "#ffffff33",
-            "#ffffff4d",
-            "#ffffff66",
-            "#ffffff80",
-            "#ffffff99",
-            "#ffffffb3",
-            "#ffffffcc",
-            "#ffffffe6",
-            "#fffffff2",
-        ],
-        dark: [
-            "#ffffff0d",
-            "#ffffff1a",
-            "#ffffff26",
-            "#ffffff33",
-            "#ffffff4d",
-            "#ffffff66",
-            "#ffffff80",
-            "#ffffff99",
-            "#ffffffb3",
-            "#ffffffcc",
-            "#ffffffe6",
-            "#fffffff2",
-        ],
-        dark_alpha: [
-            "#ffffff0d",
-            "#ffffff1a",
-            "#ffffff26",
-            "#ffffff33",
-            "#ffffff4d",
-            "#ffffff66",
-            "#ffffff80",
-            "#ffffff99",
-            "#ffffffb3",
-            "#ffffffcc",
-            "#ffffffe6",
-            "#fffffff2",
-        ],
-    }
-    .try_into()
-    .unwrap()
-}
diff --git a/crates/theme/src/fallback_themes.rs b/crates/theme/src/fallback_themes.rs
deleted file mode 100644
index 6bfcb1c868..0000000000
--- a/crates/theme/src/fallback_themes.rs
+++ /dev/null
@@ -1,373 +0,0 @@
-use std::sync::Arc;
-
-use gpui::{FontStyle, FontWeight, HighlightStyle, Hsla, WindowBackgroundAppearance, hsla};
-
-use crate::{
-    AccentColors, Appearance, DEFAULT_DARK_THEME, PlayerColors, StatusColors,
-    StatusColorsRefinement, SyntaxTheme, SystemColors, Theme, ThemeColors, ThemeColorsRefinement,
-    ThemeFamily, ThemeStyles, default_color_scales,
-};
-
-/// The default theme family for Zed.
-///
-/// This is used to construct the default theme fallback values, as well as to
-/// have a theme available at compile time for tests.
-pub fn zed_default_themes() -> ThemeFamily {
-    ThemeFamily {
-        id: "zed-default".to_string(),
-        name: "Zed Default".into(),
-        author: "".into(),
-        themes: vec![zed_default_dark()],
-        scales: default_color_scales(),
-    }
-}
-
-// If a theme customizes a foreground version of a status color, but does not
-// customize the background color, then use a partly-transparent version of the
-// foreground color for the background color.
-pub(crate) fn apply_status_color_defaults(status: &mut StatusColorsRefinement) {
-    for (fg_color, bg_color) in [
-        (&status.deleted, &mut status.deleted_background),
-        (&status.created, &mut status.created_background),
-        (&status.modified, &mut status.modified_background),
-        (&status.conflict, &mut status.conflict_background),
-        (&status.error, &mut status.error_background),
-        (&status.hidden, &mut status.hidden_background),
-    ] {
-        if bg_color.is_none()
-            && let Some(fg_color) = fg_color
-        {
-            *bg_color = Some(fg_color.opacity(0.25));
-        }
-    }
-}
-
-pub(crate) fn apply_theme_color_defaults(
-    theme_colors: &mut ThemeColorsRefinement,
-    player_colors: &PlayerColors,
-) {
-    if theme_colors.element_selection_background.is_none() {
-        let mut selection = player_colors.local().selection;
-        if selection.a == 1.0 {
-            selection.a = 0.25;
-        }
-        theme_colors.element_selection_background = Some(selection);
-    }
-}
-
-pub(crate) fn zed_default_dark() -> Theme {
-    let bg = hsla(215. / 360., 12. / 100., 15. / 100., 1.);
-    let editor = hsla(220. / 360., 12. / 100., 18. / 100., 1.);
-    let elevated_surface = hsla(225. / 360., 12. / 100., 17. / 100., 1.);
-    let hover = hsla(225.0 / 360., 11.8 / 100., 26.7 / 100., 1.0);
-
-    let blue = hsla(207.8 / 360., 81. / 100., 66. / 100., 1.0);
-    let gray = hsla(218.8 / 360., 10. / 100., 40. / 100., 1.0);
-    let green = hsla(95. / 360., 38. / 100., 62. / 100., 1.0);
-    let orange = hsla(29. / 360., 54. / 100., 61. / 100., 1.0);
-    let purple = hsla(286. / 360., 51. / 100., 64. / 100., 1.0);
-    let red = hsla(355. / 360., 65. / 100., 65. / 100., 1.0);
-    let teal = hsla(187. / 360., 47. / 100., 55. / 100., 1.0);
-    let yellow = hsla(39. / 360., 67. / 100., 69. / 100., 1.0);
-
-    const ADDED_COLOR: Hsla = Hsla {
-        h: 134. / 360.,
-        s: 0.55,
-        l: 0.40,
-        a: 1.0,
-    };
-    const WORD_ADDED_COLOR: Hsla = Hsla {
-        h: 134. / 360.,
-        s: 0.55,
-        l: 0.40,
-        a: 0.35,
-    };
-    const MODIFIED_COLOR: Hsla = Hsla {
-        h: 48. / 360.,
-        s: 0.76,
-        l: 0.47,
-        a: 1.0,
-    };
-    const REMOVED_COLOR: Hsla = Hsla {
-        h: 350. / 360.,
-        s: 0.88,
-        l: 0.25,
-        a: 1.0,
-    };
-    const WORD_DELETED_COLOR: Hsla = Hsla {
-        h: 350. / 360.,
-        s: 0.88,
-        l: 0.25,
-        a: 0.80,
-    };
-
-    let player = PlayerColors::dark();
-    Theme {
-        id: "one_dark".to_string(),
-        name: DEFAULT_DARK_THEME.into(),
-        appearance: Appearance::Dark,
-        styles: ThemeStyles {
-            window_background_appearance: WindowBackgroundAppearance::Opaque,
-            system: SystemColors::default(),
-            accents: AccentColors(vec![blue, orange, purple, teal, red, green, yellow]),
-            colors: ThemeColors {
-                border: hsla(225. / 360., 13. / 100., 12. / 100., 1.),
-                border_variant: hsla(228. / 360., 8. / 100., 25. / 100., 1.),
-                border_focused: hsla(223. / 360., 78. / 100., 65. / 100., 1.),
-                border_selected: hsla(222.6 / 360., 77.5 / 100., 65.1 / 100., 1.0),
-                border_transparent: SystemColors::default().transparent,
-                border_disabled: hsla(222.0 / 360., 11.6 / 100., 33.7 / 100., 1.0),
-                elevated_surface_background: elevated_surface,
-                surface_background: bg,
-                background: bg,
-                element_background: hsla(223.0 / 360., 13. / 100., 21. / 100., 1.0),
-                element_hover: hover,
-                element_active: hsla(220.0 / 360., 11.8 / 100., 20.0 / 100., 1.0),
-                element_selected: hsla(224.0 / 360., 11.3 / 100., 26.1 / 100., 1.0),
-                element_disabled: SystemColors::default().transparent,
-                element_selection_background: player.local().selection.alpha(0.25),
-                drop_target_background: hsla(220.0 / 360., 8.3 / 100., 21.4 / 100., 1.0),
-                drop_target_border: hsla(221. / 360., 11. / 100., 86. / 100., 1.0),
-                ghost_element_background: SystemColors::default().transparent,
-                ghost_element_hover: hover,
-                ghost_element_active: hsla(220.0 / 360., 11.8 / 100., 20.0 / 100., 1.0),
-                ghost_element_selected: hsla(224.0 / 360., 11.3 / 100., 26.1 / 100., 1.0),
-                ghost_element_disabled: SystemColors::default().transparent,
-                text: hsla(221. / 360., 11. / 100., 86. / 100., 1.0),
-                text_muted: hsla(218.0 / 360., 7. / 100., 46. / 100., 1.0),
-                text_placeholder: hsla(220.0 / 360., 6.6 / 100., 44.5 / 100., 1.0),
-                text_disabled: hsla(220.0 / 360., 6.6 / 100., 44.5 / 100., 1.0),
-                text_accent: hsla(222.6 / 360., 77.5 / 100., 65.1 / 100., 1.0),
-                icon: hsla(222.9 / 360., 9.9 / 100., 86.1 / 100., 1.0),
-                icon_muted: hsla(220.0 / 360., 12.1 / 100., 66.1 / 100., 1.0),
-                icon_disabled: hsla(220.0 / 360., 6.4 / 100., 45.7 / 100., 1.0),
-                icon_placeholder: hsla(220.0 / 360., 6.4 / 100., 45.7 / 100., 1.0),
-                icon_accent: blue,
-                debugger_accent: red,
-                status_bar_background: bg,
-                title_bar_background: bg,
-                title_bar_inactive_background: bg,
-                toolbar_background: editor,
-                tab_bar_background: bg,
-                tab_inactive_background: bg,
-                tab_active_background: editor,
-                search_match_background: bg,
-                search_active_match_background: bg,
-
-                editor_background: editor,
-                editor_gutter_background: editor,
-                editor_subheader_background: bg,
-                editor_active_line_background: hsla(222.9 / 360., 13.5 / 100., 20.4 / 100., 1.0),
-                editor_highlighted_line_background: hsla(207.8 / 360., 81. / 100., 66. / 100., 0.1),
-                editor_debugger_active_line_background: hsla(
-                    207.8 / 360.,
-                    81. / 100.,
-                    66. / 100.,
-                    0.2,
-                ),
-                editor_line_number: hsla(222.0 / 360., 11.5 / 100., 34.1 / 100., 1.0),
-                editor_active_line_number: hsla(216.0 / 360., 5.9 / 100., 49.6 / 100., 1.0),
-                editor_hover_line_number: hsla(216.0 / 360., 5.9 / 100., 56.7 / 100., 1.0),
-                editor_invisible: hsla(222.0 / 360., 11.5 / 100., 34.1 / 100., 1.0),
-                editor_wrap_guide: hsla(228. / 360., 8. / 100., 25. / 100., 1.),
-                editor_active_wrap_guide: hsla(228. / 360., 8. / 100., 25. / 100., 1.),
-                editor_indent_guide: hsla(228. / 360., 8. / 100., 25. / 100., 1.),
-                editor_indent_guide_active: hsla(225. / 360., 13. / 100., 12. / 100., 1.),
-                editor_document_highlight_read_background: hsla(
-                    207.8 / 360.,
-                    81. / 100.,
-                    66. / 100.,
-                    0.2,
-                ),
-                editor_document_highlight_write_background: gpui::red(),
-                editor_document_highlight_bracket_background: gpui::green(),
-
-                terminal_background: bg,
-                // todo("Use one colors for terminal")
-                terminal_ansi_background: crate::black().dark().step_12(),
-                terminal_foreground: crate::white().dark().step_12(),
-                terminal_bright_foreground: crate::white().dark().step_11(),
-                terminal_dim_foreground: crate::white().dark().step_10(),
-                terminal_ansi_black: crate::black().dark().step_12(),
-                terminal_ansi_red: crate::red().dark().step_11(),
-                terminal_ansi_green: crate::green().dark().step_11(),
-                terminal_ansi_yellow: crate::yellow().dark().step_11(),
-                terminal_ansi_blue: crate::blue().dark().step_11(),
-                terminal_ansi_magenta: crate::violet().dark().step_11(),
-                terminal_ansi_cyan: crate::cyan().dark().step_11(),
-                terminal_ansi_white: crate::neutral().dark().step_12(),
-                terminal_ansi_bright_black: crate::black().dark().step_11(),
-                terminal_ansi_bright_red: crate::red().dark().step_10(),
-                terminal_ansi_bright_green: crate::green().dark().step_10(),
-                terminal_ansi_bright_yellow: crate::yellow().dark().step_10(),
-                terminal_ansi_bright_blue: crate::blue().dark().step_10(),
-                terminal_ansi_bright_magenta: crate::violet().dark().step_10(),
-                terminal_ansi_bright_cyan: crate::cyan().dark().step_10(),
-                terminal_ansi_bright_white: crate::neutral().dark().step_11(),
-                terminal_ansi_dim_black: crate::black().dark().step_10(),
-                terminal_ansi_dim_red: crate::red().dark().step_9(),
-                terminal_ansi_dim_green: crate::green().dark().step_9(),
-                terminal_ansi_dim_yellow: crate::yellow().dark().step_9(),
-                terminal_ansi_dim_blue: crate::blue().dark().step_9(),
-                terminal_ansi_dim_magenta: crate::violet().dark().step_9(),
-                terminal_ansi_dim_cyan: crate::cyan().dark().step_9(),
-                terminal_ansi_dim_white: crate::neutral().dark().step_10(),
-                panel_background: bg,
-                panel_focused_border: blue,
-                panel_indent_guide: hsla(228. / 360., 8. / 100., 25. / 100., 1.),
-                panel_indent_guide_hover: hsla(225. / 360., 13. / 100., 12. / 100., 1.),
-                panel_indent_guide_active: hsla(225. / 360., 13. / 100., 12. / 100., 1.),
-                panel_overlay_background: bg,
-                panel_overlay_hover: hover,
-                pane_focused_border: blue,
-                pane_group_border: hsla(225. / 360., 13. / 100., 12. / 100., 1.),
-                scrollbar_thumb_background: gpui::transparent_black(),
-                scrollbar_thumb_hover_background: hover,
-                scrollbar_thumb_active_background: hsla(
-                    225.0 / 360.,
-                    11.8 / 100.,
-                    26.7 / 100.,
-                    1.0,
-                ),
-                scrollbar_thumb_border: hsla(228. / 360., 8. / 100., 25. / 100., 1.),
-                scrollbar_track_background: gpui::transparent_black(),
-                scrollbar_track_border: hsla(228. / 360., 8. / 100., 25. / 100., 1.),
-                minimap_thumb_background: hsla(225.0 / 360., 11.8 / 100., 26.7 / 100., 0.7),
-                minimap_thumb_hover_background: hsla(225.0 / 360., 11.8 / 100., 26.7 / 100., 0.7),
-                minimap_thumb_active_background: hsla(225.0 / 360., 11.8 / 100., 26.7 / 100., 0.7),
-                minimap_thumb_border: hsla(228. / 360., 8. / 100., 25. / 100., 1.),
-                editor_foreground: hsla(218. / 360., 14. / 100., 71. / 100., 1.),
-                link_text_hover: blue,
-                version_control_added: ADDED_COLOR,
-                version_control_deleted: REMOVED_COLOR,
-                version_control_modified: MODIFIED_COLOR,
-                version_control_renamed: MODIFIED_COLOR,
-                version_control_conflict: crate::orange().light().step_12(),
-                version_control_ignored: crate::gray().light().step_12(),
-                version_control_word_added: WORD_ADDED_COLOR,
-                version_control_word_deleted: WORD_DELETED_COLOR,
-                version_control_conflict_marker_ours: crate::green().light().step_12().alpha(0.5),
-                version_control_conflict_marker_theirs: crate::blue().light().step_12().alpha(0.5),
-
-                vim_normal_background: SystemColors::default().transparent,
-                vim_insert_background: SystemColors::default().transparent,
-                vim_replace_background: SystemColors::default().transparent,
-                vim_visual_background: SystemColors::default().transparent,
-                vim_visual_line_background: SystemColors::default().transparent,
-                vim_visual_block_background: SystemColors::default().transparent,
-                vim_helix_normal_background: SystemColors::default().transparent,
-                vim_helix_select_background: SystemColors::default().transparent,
-                vim_mode_text: SystemColors::default().transparent,
-            },
-            status: StatusColors {
-                conflict: yellow,
-                conflict_background: yellow,
-                conflict_border: yellow,
-                created: green,
-                created_background: green,
-                created_border: green,
-                deleted: red,
-                deleted_background: red,
-                deleted_border: red,
-                error: red,
-                error_background: red,
-                error_border: red,
-                hidden: gray,
-                hidden_background: gray,
-                hidden_border: gray,
-                hint: blue,
-                hint_background: blue,
-                hint_border: blue,
-                ignored: gray,
-                ignored_background: gray,
-                ignored_border: gray,
-                info: blue,
-                info_background: blue,
-                info_border: blue,
-                modified: yellow,
-                modified_background: yellow,
-                modified_border: yellow,
-                predictive: gray,
-                predictive_background: gray,
-                predictive_border: gray,
-                renamed: blue,
-                renamed_background: blue,
-                renamed_border: blue,
-                success: green,
-                success_background: green,
-                success_border: green,
-                unreachable: gray,
-                unreachable_background: gray,
-                unreachable_border: gray,
-                warning: yellow,
-                warning_background: yellow,
-                warning_border: yellow,
-            },
-            player,
-            syntax: Arc::new(SyntaxTheme {
-                highlights: vec![
-                    ("attribute".into(), purple.into()),
-                    ("boolean".into(), orange.into()),
-                    ("comment".into(), gray.into()),
-                    ("comment.doc".into(), gray.into()),
-                    ("constant".into(), yellow.into()),
-                    ("constructor".into(), blue.into()),
-                    ("embedded".into(), HighlightStyle::default()),
-                    (
-                        "emphasis".into(),
-                        HighlightStyle {
-                            font_style: Some(FontStyle::Italic),
-                            ..HighlightStyle::default()
-                        },
-                    ),
-                    (
-                        "emphasis.strong".into(),
-                        HighlightStyle {
-                            font_weight: Some(FontWeight::BOLD),
-                            ..HighlightStyle::default()
-                        },
-                    ),
-                    ("enum".into(), HighlightStyle::default()),
-                    ("function".into(), blue.into()),
-                    ("function.method".into(), blue.into()),
-                    ("function.definition".into(), blue.into()),
-                    ("hint".into(), blue.into()),
-                    ("keyword".into(), purple.into()),
-                    ("label".into(), HighlightStyle::default()),
-                    ("link_text".into(), blue.into()),
-                    (
-                        "link_uri".into(),
-                        HighlightStyle {
-                            color: Some(teal),
-                            font_style: Some(FontStyle::Italic),
-                            ..HighlightStyle::default()
-                        },
-                    ),
-                    ("number".into(), orange.into()),
-                    ("operator".into(), HighlightStyle::default()),
-                    ("predictive".into(), HighlightStyle::default()),
-                    ("preproc".into(), HighlightStyle::default()),
-                    ("primary".into(), HighlightStyle::default()),
-                    ("property".into(), red.into()),
-                    ("punctuation".into(), HighlightStyle::default()),
-                    ("punctuation.bracket".into(), HighlightStyle::default()),
-                    ("punctuation.delimiter".into(), HighlightStyle::default()),
-                    ("punctuation.list_marker".into(), HighlightStyle::default()),
-                    ("punctuation.special".into(), HighlightStyle::default()),
-                    ("string".into(), green.into()),
-                    ("string.escape".into(), HighlightStyle::default()),
-                    ("string.regex".into(), red.into()),
-                    ("string.special".into(), HighlightStyle::default()),
-                    ("string.special.symbol".into(), HighlightStyle::default()),
-                    ("tag".into(), HighlightStyle::default()),
-                    ("text.literal".into(), HighlightStyle::default()),
-                    ("title".into(), HighlightStyle::default()),
-                    ("type".into(), teal.into()),
-                    ("variable".into(), HighlightStyle::default()),
-                    ("variable.special".into(), red.into()),
-                    ("variant".into(), HighlightStyle::default()),
-                ],
-            }),
-        },
-    }
-}
diff --git a/crates/theme/src/font_family_cache.rs b/crates/theme/src/font_family_cache.rs
deleted file mode 100644
index 411cf9b4d4..0000000000
--- a/crates/theme/src/font_family_cache.rs
+++ /dev/null
@@ -1,95 +0,0 @@
-use std::sync::Arc;
-use std::time::Instant;
-
-use gpui::{App, Global, ReadGlobal, SharedString};
-use parking_lot::RwLock;
-
-#[derive(Default)]
-struct FontFamilyCacheState {
-    loaded_at: Option<Instant>,
-    font_families: Vec<SharedString>,
-}
-
-/// A cache for the list of font families.
-///
-/// Listing the available font families from the text system is expensive,
-/// so we do it once and then use the cached values each render.
-#[derive(Default)]
-pub struct FontFamilyCache {
-    state: Arc<RwLock<FontFamilyCacheState>>,
-}
-
-#[derive(Default)]
-struct GlobalFontFamilyCache(Arc<FontFamilyCache>);
-
-impl Global for GlobalFontFamilyCache {}
-
-impl FontFamilyCache {
-    /// Initializes the global font family cache.
-    pub fn init_global(cx: &mut App) {
-        cx.default_global::<GlobalFontFamilyCache>();
-    }
-
-    /// Returns the global font family cache.
-    pub fn global(cx: &App) -> Arc<Self> {
-        GlobalFontFamilyCache::global(cx).0.clone()
-    }
-
-    /// Returns the list of font families.
-    pub fn list_font_families(&self, cx: &App) -> Vec<SharedString> {
-        if self.state.read().loaded_at.is_some() {
-            return self.state.read().font_families.clone();
-        }
-
-        let mut lock = self.state.write();
-        lock.font_families = cx
-            .text_system()
-            .all_font_names()
-            .into_iter()
-            .map(SharedString::from)
-            .collect();
-        lock.loaded_at = Some(Instant::now());
-
-        lock.font_families.clone()
-    }
-
-    /// Returns the list of font families if they have been loaded
-    pub fn try_list_font_families(&self) -> Option<Vec<SharedString>> {
-        self.state
-            .try_read()
-            .filter(|state| state.loaded_at.is_some())
-            .map(|state| state.font_families.clone())
-    }
-
-    /// Prefetch all font names in the background
-    pub async fn prefetch(&self, cx: &gpui::AsyncApp) {
-        if self
-            .state
-            .try_read()
-            .is_none_or(|state| state.loaded_at.is_some())
-        {
-            return;
-        }
-
-        let Ok(text_system) = cx.update(|cx| App::text_system(cx).clone()) else {
-            return;
-        };
-
-        let state = self.state.clone();
-
-        cx.background_executor()
-            .spawn(async move {
-                // We take this lock in the background executor to ensure that synchronous calls to `list_font_families` are blocked while we are prefetching,
-                // while not blocking the main thread and risking deadlocks
-                let mut lock = state.write();
-                let all_font_names = text_system
-                    .all_font_names()
-                    .into_iter()
-                    .map(SharedString::from)
-                    .collect();
-                lock.font_families = all_font_names;
-                lock.loaded_at = Some(Instant::now());
-            })
-            .await;
-    }
-}
diff --git a/crates/theme/src/icon_theme.rs b/crates/theme/src/icon_theme.rs
deleted file mode 100644
index 818bf1b2f1..0000000000
--- a/crates/theme/src/icon_theme.rs
+++ /dev/null
@@ -1,422 +0,0 @@
-use std::sync::{Arc, LazyLock};
-
-use collections::HashMap;
-use gpui::SharedString;
-
-use crate::Appearance;
-
-/// A family of icon themes.
-pub struct IconThemeFamily {
-    /// The unique ID for the icon theme family.
-    pub id: String,
-    /// The name of the icon theme family.
-    pub name: SharedString,
-    /// The author of the icon theme family.
-    pub author: SharedString,
-    /// The list of icon themes in the family.
-    pub themes: Vec<IconTheme>,
-}
-
-/// An icon theme.
-#[derive(Debug, PartialEq)]
-pub struct IconTheme {
-    /// The unique ID for the icon theme.
-    pub id: String,
-    /// The name of the icon theme.
-    pub name: SharedString,
-    /// The appearance of the icon theme (e.g., light or dark).
-    pub appearance: Appearance,
-    /// The icons used for directories.
-    pub directory_icons: DirectoryIcons,
-    /// The icons used for named directories.
-    pub named_directory_icons: HashMap<String, DirectoryIcons>,
-    /// The icons used for chevrons.
-    pub chevron_icons: ChevronIcons,
-    /// The mapping of file stems to their associated icon keys.
-    pub file_stems: HashMap<String, String>,
-    /// The mapping of file suffixes to their associated icon keys.
-    pub file_suffixes: HashMap<String, String>,
-    /// The mapping of icon keys to icon definitions.
-    pub file_icons: HashMap<String, IconDefinition>,
-}
-
-/// The icons used for directories.
-#[derive(Debug, PartialEq, Clone)]
-pub struct DirectoryIcons {
-    /// The path to the icon to use for a collapsed directory.
-    pub collapsed: Option<SharedString>,
-    /// The path to the icon to use for an expanded directory.
-    pub expanded: Option<SharedString>,
-}
-
-/// The icons used for chevrons.
-#[derive(Debug, PartialEq)]
-pub struct ChevronIcons {
-    /// The path to the icon to use for a collapsed chevron.
-    pub collapsed: Option<SharedString>,
-    /// The path to the icon to use for an expanded chevron.
-    pub expanded: Option<SharedString>,
-}
-
-/// An icon definition.
-#[derive(Debug, PartialEq)]
-pub struct IconDefinition {
-    /// The path to the icon file.
-    pub path: SharedString,
-}
-
-const FILE_STEMS_BY_ICON_KEY: &[(&str, &[&str])] = &[
-    ("docker", &["Dockerfile"]),
-    ("ruby", &["Podfile"]),
-    ("heroku", &["Procfile"]),
-];
-
-const FILE_SUFFIXES_BY_ICON_KEY: &[(&str, &[&str])] = &[
-    ("astro", &["astro"]),
-    (
-        "audio",
-        &[
-            "aac", "flac", "m4a", "mka", "mp3", "ogg", "opus", "wav", "wma", "wv",
-        ],
-    ),
-    ("backup", &["bak"]),
-    ("bicep", &["bicep"]),
-    ("bun", &["lockb"]),
-    ("c", &["c", "h"]),
-    ("cairo", &["cairo"]),
-    ("code", &["handlebars", "metadata", "rkt", "scm"]),
-    ("coffeescript", &["coffee"]),
-    (
-        "cpp",
-        &[
-            "c++", "h++", "cc", "cpp", "cxx", "hh", "hpp", "hxx", "inl", "ixx",
-        ],
-    ),
-    ("crystal", &["cr", "ecr"]),
-    ("csharp", &["cs"]),
-    ("csproj", &["csproj"]),
-    ("css", &["css", "pcss", "postcss"]),
-    ("cue", &["cue"]),
-    ("dart", &["dart"]),
-    ("diff", &["diff"]),
-    (
-        "document",
-        &[
-            "doc", "docx", "mdx", "odp", "ods", "odt", "pdf", "ppt", "pptx", "rtf", "txt", "xls",
-            "xlsx",
-        ],
-    ),
-    ("elixir", &["eex", "ex", "exs", "heex"]),
-    ("elm", &["elm"]),
-    (
-        "erlang",
-        &[
-            "Emakefile",
-            "app.src",
-            "erl",
-            "escript",
-            "hrl",
-            "rebar.config",
-            "xrl",
-            "yrl",
-        ],
-    ),
-    (
-        "eslint",
-        &[
-            "eslint.config.cjs",
-            "eslint.config.cts",
-            "eslint.config.js",
-            "eslint.config.mjs",
-            "eslint.config.mts",
-            "eslint.config.ts",
-            "eslintrc",
-            "eslintrc.js",
-            "eslintrc.json",
-        ],
-    ),
-    ("font", &["otf", "ttf", "woff", "woff2"]),
-    ("fsharp", &["fs"]),
-    ("fsproj", &["fsproj"]),
-    ("gitlab", &["gitlab-ci.yml"]),
-    ("gleam", &["gleam"]),
-    ("go", &["go", "mod", "work"]),
-    ("graphql", &["gql", "graphql", "graphqls"]),
-    ("haskell", &["hs"]),
-    ("hcl", &["hcl"]),
-    ("html", &["htm", "html"]),
-    (
-        "image",
-        &[
-            "avif", "bmp", "gif", "heic", "heif", "ico", "j2k", "jfif", "jp2", "jpeg", "jpg",
-            "jxl", "png", "psd", "qoi", "svg", "tiff", "webp",
-        ],
-    ),
-    ("java", &["java"]),
-    ("javascript", &["cjs", "js", "mjs"]),
-    ("json", &["json", "jsonc"]),
-    ("julia", &["jl"]),
-    ("kdl", &["kdl"]),
-    ("kotlin", &["kt"]),
-    ("lock", &["lock"]),
-    ("log", &["log"]),
-    ("lua", &["lua"]),
-    ("luau", &["luau"]),
-    ("markdown", &["markdown", "md"]),
-    ("metal", &["metal"]),
-    ("nim", &["nim"]),
-    ("nix", &["nix"]),
-    ("ocaml", &["ml", "mli"]),
-    ("odin", &["odin"]),
-    ("php", &["php"]),
-    (
-        "prettier",
-        &[
-            "prettier.config.cjs",
-            "prettier.config.js",
-            "prettier.config.mjs",
-            "prettierignore",
-            "prettierrc",
-            "prettierrc.cjs",
-            "prettierrc.js",
-            "prettierrc.json",
-            "prettierrc.json5",
-            "prettierrc.mjs",
-            "prettierrc.toml",
-            "prettierrc.yaml",
-            "prettierrc.yml",
-        ],
-    ),
-    ("prisma", &["prisma"]),
-    ("puppet", &["pp"]),
-    ("python", &["py"]),
-    ("r", &["r", "R"]),
-    ("react", &["cjsx", "ctsx", "jsx", "mjsx", "mtsx", "tsx"]),
-    ("roc", &["roc"]),
-    ("ruby", &["rb"]),
-    ("rust", &["rs"]),
-    ("sass", &["sass", "scss"]),
-    ("scala", &["scala", "sc"]),
-    ("settings", &["conf", "ini", "yaml", "yml"]),
-    ("solidity", &["sol"]),
-    (
-        "storage",
-        &[
-            "accdb", "csv", "dat", "db", "dbf", "dll", "fmp", "fp7", "frm", "gdb", "ib", "ldf",
-            "mdb", "mdf", "myd", "myi", "pdb", "RData", "rdata", "sav", "sdf", "sql", "sqlite",
-            "tsv",
-        ],
-    ),
-    (
-        "stylelint",
-        &[
-            "stylelint.config.cjs",
-            "stylelint.config.js",
-            "stylelint.config.mjs",
-            "stylelintignore",
-            "stylelintrc",
-            "stylelintrc.cjs",
-            "stylelintrc.js",
-            "stylelintrc.json",
-            "stylelintrc.mjs",
-            "stylelintrc.yaml",
-            "stylelintrc.yml",
-        ],
-    ),
-    ("surrealql", &["surql"]),
-    ("svelte", &["svelte"]),
-    ("swift", &["swift"]),
-    ("tcl", &["tcl"]),
-    ("template", &["hbs", "plist", "xml"]),
-    (
-        "terminal",
-        &[
-            "bash",
-            "bash_aliases",
-            "bash_login",
-            "bash_logout",
-            "bash_profile",
-            "bashrc",
-            "fish",
-            "nu",
-            "profile",
-            "ps1",
-            "sh",
-            "zlogin",
-            "zlogout",
-            "zprofile",
-            "zsh",
-            "zsh_aliases",
-            "zsh_histfile",
-            "zsh_history",
-            "zshenv",
-            "zshrc",
-        ],
-    ),
-    ("terraform", &["tf", "tfvars"]),
-    ("toml", &["toml"]),
-    ("typescript", &["cts", "mts", "ts"]),
-    ("v", &["v", "vsh", "vv"]),
-    (
-        "vcs",
-        &[
-            "COMMIT_EDITMSG",
-            "EDIT_DESCRIPTION",
-            "MERGE_MSG",
-            "NOTES_EDITMSG",
-            "TAG_EDITMSG",
-            "gitattributes",
-            "gitignore",
-            "gitkeep",
-            "gitmodules",
-        ],
-    ),
-    ("vbproj", &["vbproj"]),
-    ("video", &["avi", "m4v", "mkv", "mov", "mp4", "webm", "wmv"]),
-    ("vs_sln", &["sln"]),
-    ("vs_suo", &["suo"]),
-    ("vue", &["vue"]),
-    ("vyper", &["vy", "vyi"]),
-    ("wgsl", &["wgsl"]),
-    ("zig", &["zig"]),
-];
-
-/// A mapping of a file type identifier to its corresponding icon.
-const FILE_ICONS: &[(&str, &str)] = &[
-    ("astro", "icons/file_icons/astro.svg"),
-    ("audio", "icons/file_icons/audio.svg"),
-    ("bicep", "icons/file_icons/file.svg"),
-    ("bun", "icons/file_icons/bun.svg"),
-    ("c", "icons/file_icons/c.svg"),
-    ("cairo", "icons/file_icons/cairo.svg"),
-    ("code", "icons/file_icons/code.svg"),
-    ("coffeescript", "icons/file_icons/coffeescript.svg"),
-    ("cpp", "icons/file_icons/cpp.svg"),
-    ("crystal", "icons/file_icons/file.svg"),
-    ("csharp", "icons/file_icons/file.svg"),
-    ("csproj", "icons/file_icons/file.svg"),
-    ("css", "icons/file_icons/css.svg"),
-    ("cue", "icons/file_icons/file.svg"),
-    ("dart", "icons/file_icons/dart.svg"),
-    ("default", "icons/file_icons/file.svg"),
-    ("diff", "icons/file_icons/diff.svg"),
-    ("docker", "icons/file_icons/docker.svg"),
-    ("document", "icons/file_icons/book.svg"),
-    ("elixir", "icons/file_icons/elixir.svg"),
-    ("elm", "icons/file_icons/elm.svg"),
-    ("erlang", "icons/file_icons/erlang.svg"),
-    ("eslint", "icons/file_icons/eslint.svg"),
-    ("font", "icons/file_icons/font.svg"),
-    ("fsharp", "icons/file_icons/fsharp.svg"),
-    ("fsproj", "icons/file_icons/file.svg"),
-    ("gitlab", "icons/file_icons/settings.svg"),
-    ("gleam", "icons/file_icons/gleam.svg"),
-    ("go", "icons/file_icons/go.svg"),
-    ("graphql", "icons/file_icons/graphql.svg"),
-    ("haskell", "icons/file_icons/haskell.svg"),
-    ("hcl", "icons/file_icons/hcl.svg"),
-    ("heroku", "icons/file_icons/heroku.svg"),
-    ("html", "icons/file_icons/html.svg"),
-    ("image", "icons/file_icons/image.svg"),
-    ("java", "icons/file_icons/java.svg"),
-    ("javascript", "icons/file_icons/javascript.svg"),
-    ("json", "icons/file_icons/code.svg"),
-    ("julia", "icons/file_icons/julia.svg"),
-    ("kdl", "icons/file_icons/kdl.svg"),
-    ("kotlin", "icons/file_icons/kotlin.svg"),
-    ("lock", "icons/file_icons/lock.svg"),
-    ("log", "icons/file_icons/info.svg"),
-    ("lua", "icons/file_icons/lua.svg"),
-    ("luau", "icons/file_icons/luau.svg"),
-    ("markdown", "icons/file_icons/book.svg"),
-    ("metal", "icons/file_icons/metal.svg"),
-    ("nim", "icons/file_icons/nim.svg"),
-    ("nix", "icons/file_icons/nix.svg"),
-    ("ocaml", "icons/file_icons/ocaml.svg"),
-    ("odin", "icons/file_icons/odin.svg"),
-    ("phoenix", "icons/file_icons/phoenix.svg"),
-    ("php", "icons/file_icons/php.svg"),
-    ("prettier", "icons/file_icons/prettier.svg"),
-    ("prisma", "icons/file_icons/prisma.svg"),
-    ("puppet", "icons/file_icons/puppet.svg"),
-    ("python", "icons/file_icons/python.svg"),
-    ("r", "icons/file_icons/r.svg"),
-    ("react", "icons/file_icons/react.svg"),
-    ("roc", "icons/file_icons/roc.svg"),
-    ("ruby", "icons/file_icons/ruby.svg"),
-    ("rust", "icons/file_icons/rust.svg"),
-    ("sass", "icons/file_icons/sass.svg"),
-    ("scala", "icons/file_icons/scala.svg"),
-    ("settings", "icons/file_icons/settings.svg"),
-    ("solidity", "icons/file_icons/file.svg"),
-    ("storage", "icons/file_icons/database.svg"),
-    ("stylelint", "icons/file_icons/javascript.svg"),
-    ("surrealql", "icons/file_icons/surrealql.svg"),
-    ("svelte", "icons/file_icons/html.svg"),
-    ("swift", "icons/file_icons/swift.svg"),
-    ("tcl", "icons/file_icons/tcl.svg"),
-    ("template", "icons/file_icons/html.svg"),
-    ("terminal", "icons/file_icons/terminal.svg"),
-    ("terraform", "icons/file_icons/terraform.svg"),
-    ("toml", "icons/file_icons/toml.svg"),
-    ("typescript", "icons/file_icons/typescript.svg"),
-    ("v", "icons/file_icons/v.svg"),
-    ("vbproj", "icons/file_icons/file.svg"),
-    ("vcs", "icons/file_icons/git.svg"),
-    ("video", "icons/file_icons/video.svg"),
-    ("vs_sln", "icons/file_icons/file.svg"),
-    ("vs_suo", "icons/file_icons/file.svg"),
-    ("vue", "icons/file_icons/vue.svg"),
-    ("vyper", "icons/file_icons/vyper.svg"),
-    ("wgsl", "icons/file_icons/wgsl.svg"),
-    ("zig", "icons/file_icons/zig.svg"),
-];
-
-/// Returns a mapping of file associations to icon keys.
-fn icon_keys_by_association(
-    associations_by_icon_key: &[(&str, &[&str])],
-) -> HashMap<String, String> {
-    let mut icon_keys_by_association = HashMap::default();
-    for (icon_key, associations) in associations_by_icon_key {
-        for association in *associations {
-            icon_keys_by_association.insert(association.to_string(), icon_key.to_string());
-        }
-    }
-
-    icon_keys_by_association
-}
-
-/// The name of the default icon theme.
-pub(crate) const DEFAULT_ICON_THEME_NAME: &str = "Zed (Default)";
-
-static DEFAULT_ICON_THEME: LazyLock<Arc<IconTheme>> = LazyLock::new(|| {
-    Arc::new(IconTheme {
-        id: "zed".into(),
-        name: DEFAULT_ICON_THEME_NAME.into(),
-        appearance: Appearance::Dark,
-        directory_icons: DirectoryIcons {
-            collapsed: Some("icons/file_icons/folder.svg".into()),
-            expanded: Some("icons/file_icons/folder_open.svg".into()),
-        },
-        named_directory_icons: HashMap::default(),
-        chevron_icons: ChevronIcons {
-            collapsed: Some("icons/file_icons/chevron_right.svg".into()),
-            expanded: Some("icons/file_icons/chevron_down.svg".into()),
-        },
-        file_stems: icon_keys_by_association(FILE_STEMS_BY_ICON_KEY),
-        file_suffixes: icon_keys_by_association(FILE_SUFFIXES_BY_ICON_KEY),
-        file_icons: HashMap::from_iter(FILE_ICONS.iter().map(|(ty, path)| {
-            (
-                ty.to_string(),
-                IconDefinition {
-                    path: (*path).into(),
-                },
-            )
-        })),
-    })
-});
-
-/// Returns the default icon theme.
-pub fn default_icon_theme() -> Arc<IconTheme> {
-    DEFAULT_ICON_THEME.clone()
-}
diff --git a/crates/theme/src/icon_theme_schema.rs b/crates/theme/src/icon_theme_schema.rs
deleted file mode 100644
index 45ac985ae9..0000000000
--- a/crates/theme/src/icon_theme_schema.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-#![allow(missing_docs)]
-
-use gpui::SharedString;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use std::collections::HashMap;
-
-use crate::AppearanceContent;
-
-#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema)]
-pub struct IconThemeFamilyContent {
-    pub name: String,
-    pub author: String,
-    pub themes: Vec<IconThemeContent>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema)]
-pub struct IconThemeContent {
-    pub name: String,
-    pub appearance: AppearanceContent,
-    #[serde(default)]
-    pub directory_icons: DirectoryIconsContent,
-    #[serde(default)]
-    pub named_directory_icons: HashMap<String, DirectoryIconsContent>,
-    #[serde(default)]
-    pub chevron_icons: ChevronIconsContent,
-    #[serde(default)]
-    pub file_stems: HashMap<String, String>,
-    #[serde(default)]
-    pub file_suffixes: HashMap<String, String>,
-    #[serde(default)]
-    pub file_icons: HashMap<String, IconDefinitionContent>,
-}
-
-#[derive(Debug, Clone, Default, Serialize, Deserialize, JsonSchema)]
-pub struct DirectoryIconsContent {
-    pub collapsed: Option<SharedString>,
-    pub expanded: Option<SharedString>,
-}
-
-#[derive(Debug, Clone, Default, Serialize, Deserialize, JsonSchema)]
-pub struct ChevronIconsContent {
-    pub collapsed: Option<SharedString>,
-    pub expanded: Option<SharedString>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema)]
-pub struct IconDefinitionContent {
-    pub path: SharedString,
-}
diff --git a/crates/theme/src/registry.rs b/crates/theme/src/registry.rs
deleted file mode 100644
index c362b62704..0000000000
--- a/crates/theme/src/registry.rs
+++ /dev/null
@@ -1,364 +0,0 @@
-use std::sync::Arc;
-use std::{fmt::Debug, path::Path};
-
-use anyhow::{Context as _, Result};
-use collections::HashMap;
-use derive_more::{Deref, DerefMut};
-use fs::Fs;
-use futures::StreamExt;
-use gpui::{App, AssetSource, Global, SharedString};
-use parking_lot::RwLock;
-use thiserror::Error;
-use util::ResultExt;
-
-use crate::{
-    Appearance, AppearanceContent, ChevronIcons, DEFAULT_ICON_THEME_NAME, DirectoryIcons,
-    IconDefinition, IconTheme, Theme, ThemeFamily, ThemeFamilyContent, default_icon_theme,
-    read_icon_theme, read_user_theme, refine_theme_family,
-};
-
-/// The metadata for a theme.
-#[derive(Debug, Clone)]
-pub struct ThemeMeta {
-    /// The name of the theme.
-    pub name: SharedString,
-    /// The appearance of the theme.
-    pub appearance: Appearance,
-}
-
-/// An error indicating that the theme with the given name was not found.
-#[derive(Debug, Error, Clone)]
-#[error("theme not found: {0}")]
-pub struct ThemeNotFoundError(pub SharedString);
-
-/// An error indicating that the icon theme with the given name was not found.
-#[derive(Debug, Error, Clone)]
-#[error("icon theme not found: {0}")]
-pub struct IconThemeNotFoundError(pub SharedString);
-
-/// The global [`ThemeRegistry`].
-///
-/// This newtype exists for obtaining a unique [`TypeId`](std::any::TypeId) when
-/// inserting the [`ThemeRegistry`] into the context as a global.
-///
-/// This should not be exposed outside of this module.
-#[derive(Default, Deref, DerefMut)]
-struct GlobalThemeRegistry(Arc<ThemeRegistry>);
-
-impl Global for GlobalThemeRegistry {}
-
-struct ThemeRegistryState {
-    themes: HashMap<SharedString, Arc<Theme>>,
-    icon_themes: HashMap<SharedString, Arc<IconTheme>>,
-    /// Whether the extensions have been loaded yet.
-    extensions_loaded: bool,
-}
-
-/// The registry for themes.
-pub struct ThemeRegistry {
-    state: RwLock<ThemeRegistryState>,
-    assets: Box<dyn AssetSource>,
-}
-
-impl ThemeRegistry {
-    /// Returns the global [`ThemeRegistry`].
-    pub fn global(cx: &App) -> Arc<Self> {
-        cx.global::<GlobalThemeRegistry>().0.clone()
-    }
-
-    /// Returns the global [`ThemeRegistry`].
-    ///
-    /// Inserts a default [`ThemeRegistry`] if one does not yet exist.
-    pub fn default_global(cx: &mut App) -> Arc<Self> {
-        cx.default_global::<GlobalThemeRegistry>().0.clone()
-    }
-
-    /// Returns the global [`ThemeRegistry`] if it exists.
-    pub fn try_global(cx: &mut App) -> Option<Arc<Self>> {
-        cx.try_global::<GlobalThemeRegistry>().map(|t| t.0.clone())
-    }
-
-    /// Sets the global [`ThemeRegistry`].
-    pub(crate) fn set_global(assets: Box<dyn AssetSource>, cx: &mut App) {
-        cx.set_global(GlobalThemeRegistry(Arc::new(ThemeRegistry::new(assets))));
-    }
-
-    /// Creates a new [`ThemeRegistry`] with the given [`AssetSource`].
-    pub fn new(assets: Box<dyn AssetSource>) -> Self {
-        let registry = Self {
-            state: RwLock::new(ThemeRegistryState {
-                themes: HashMap::default(),
-                icon_themes: HashMap::default(),
-                extensions_loaded: false,
-            }),
-            assets,
-        };
-
-        // We're loading the Zed default theme, as we need a theme to be loaded
-        // for tests.
-        registry.insert_theme_families([crate::fallback_themes::zed_default_themes()]);
-
-        let default_icon_theme = crate::default_icon_theme();
-        registry
-            .state
-            .write()
-            .icon_themes
-            .insert(default_icon_theme.name.clone(), default_icon_theme);
-
-        registry
-    }
-
-    /// Returns whether the extensions have been loaded.
-    pub fn extensions_loaded(&self) -> bool {
-        self.state.read().extensions_loaded
-    }
-
-    /// Sets the flag indicating that the extensions have loaded.
-    pub fn set_extensions_loaded(&self) {
-        self.state.write().extensions_loaded = true;
-    }
-
-    fn insert_theme_families(&self, families: impl IntoIterator<Item = ThemeFamily>) {
-        for family in families.into_iter() {
-            self.insert_themes(family.themes);
-        }
-    }
-
-    fn insert_themes(&self, themes: impl IntoIterator<Item = Theme>) {
-        let mut state = self.state.write();
-        for theme in themes.into_iter() {
-            state.themes.insert(theme.name.clone(), Arc::new(theme));
-        }
-    }
-
-    #[allow(unused)]
-    fn insert_user_theme_families(&self, families: impl IntoIterator<Item = ThemeFamilyContent>) {
-        for family in families.into_iter() {
-            let refined_family = refine_theme_family(family);
-
-            self.insert_themes(refined_family.themes);
-        }
-    }
-
-    /// Removes the themes with the given names from the registry.
-    pub fn remove_user_themes(&self, themes_to_remove: &[SharedString]) {
-        self.state
-            .write()
-            .themes
-            .retain(|name, _| !themes_to_remove.contains(name))
-    }
-
-    /// Removes all themes from the registry.
-    pub fn clear(&self) {
-        self.state.write().themes.clear();
-    }
-
-    /// Returns the names of all themes in the registry.
-    pub fn list_names(&self) -> Vec<SharedString> {
-        let mut names = self.state.read().themes.keys().cloned().collect::<Vec<_>>();
-        names.sort();
-        names
-    }
-
-    /// Returns the metadata of all themes in the registry.
-    pub fn list(&self) -> Vec<ThemeMeta> {
-        self.state
-            .read()
-            .themes
-            .values()
-            .map(|theme| ThemeMeta {
-                name: theme.name.clone(),
-                appearance: theme.appearance(),
-            })
-            .collect()
-    }
-
-    /// Returns the theme with the given name.
-    pub fn get(&self, name: &str) -> Result<Arc<Theme>, ThemeNotFoundError> {
-        self.state
-            .read()
-            .themes
-            .get(name)
-            .ok_or_else(|| ThemeNotFoundError(name.to_string().into()))
-            .cloned()
-    }
-
-    /// Loads the themes bundled with the Zed binary and adds them to the registry.
-    pub fn load_bundled_themes(&self) {
-        let theme_paths = self
-            .assets
-            .list("themes/")
-            .expect("failed to list theme assets")
-            .into_iter()
-            .filter(|path| path.ends_with(".json"));
-
-        for path in theme_paths {
-            let Some(theme) = self.assets.load(&path).log_err().flatten() else {
-                continue;
-            };
-
-            let Some(theme_family) = serde_json::from_slice(&theme)
-                .with_context(|| format!("failed to parse theme at path \"{path}\""))
-                .log_err()
-            else {
-                continue;
-            };
-
-            self.insert_user_theme_families([theme_family]);
-        }
-    }
-
-    /// Loads the user themes from the specified directory and adds them to the registry.
-    pub async fn load_user_themes(&self, themes_path: &Path, fs: Arc<dyn Fs>) -> Result<()> {
-        let mut theme_paths = fs
-            .read_dir(themes_path)
-            .await
-            .with_context(|| format!("reading themes from {themes_path:?}"))?;
-
-        while let Some(theme_path) = theme_paths.next().await {
-            let Some(theme_path) = theme_path.log_err() else {
-                continue;
-            };
-
-            self.load_user_theme(&theme_path, fs.clone())
-                .await
-                .log_err();
-        }
-
-        Ok(())
-    }
-
-    /// Loads the user theme from the specified path and adds it to the registry.
-    pub async fn load_user_theme(&self, theme_path: &Path, fs: Arc<dyn Fs>) -> Result<()> {
-        let theme = read_user_theme(theme_path, fs).await?;
-
-        self.insert_user_theme_families([theme]);
-
-        Ok(())
-    }
-
-    /// Returns the default icon theme.
-    pub fn default_icon_theme(&self) -> Result<Arc<IconTheme>, IconThemeNotFoundError> {
-        self.get_icon_theme(DEFAULT_ICON_THEME_NAME)
-    }
-
-    /// Returns the metadata of all icon themes in the registry.
-    pub fn list_icon_themes(&self) -> Vec<ThemeMeta> {
-        self.state
-            .read()
-            .icon_themes
-            .values()
-            .map(|theme| ThemeMeta {
-                name: theme.name.clone(),
-                appearance: theme.appearance,
-            })
-            .collect()
-    }
-
-    /// Returns the icon theme with the specified name.
-    pub fn get_icon_theme(&self, name: &str) -> Result<Arc<IconTheme>, IconThemeNotFoundError> {
-        self.state
-            .read()
-            .icon_themes
-            .get(name)
-            .ok_or_else(|| IconThemeNotFoundError(name.to_string().into()))
-            .cloned()
-    }
-
-    /// Removes the icon themes with the given names from the registry.
-    pub fn remove_icon_themes(&self, icon_themes_to_remove: &[SharedString]) {
-        self.state
-            .write()
-            .icon_themes
-            .retain(|name, _| !icon_themes_to_remove.contains(name))
-    }
-
-    /// Loads the icon theme from the specified path and adds it to the registry.
-    ///
-    /// The `icons_root_dir` parameter indicates the root directory from which
-    /// the relative paths to icons in the theme should be resolved against.
-    pub async fn load_icon_theme(
-        &self,
-        icon_theme_path: &Path,
-        icons_root_dir: &Path,
-        fs: Arc<dyn Fs>,
-    ) -> Result<()> {
-        let icon_theme_family = read_icon_theme(icon_theme_path, fs).await?;
-
-        let resolve_icon_path = |path: SharedString| {
-            icons_root_dir
-                .join(path.as_ref())
-                .to_string_lossy()
-                .to_string()
-                .into()
-        };
-
-        let default_icon_theme = default_icon_theme();
-
-        let mut state = self.state.write();
-        for icon_theme in icon_theme_family.themes {
-            let mut file_stems = default_icon_theme.file_stems.clone();
-            file_stems.extend(icon_theme.file_stems);
-
-            let mut file_suffixes = default_icon_theme.file_suffixes.clone();
-            file_suffixes.extend(icon_theme.file_suffixes);
-
-            let mut named_directory_icons = default_icon_theme.named_directory_icons.clone();
-            named_directory_icons.extend(icon_theme.named_directory_icons.into_iter().map(
-                |(key, value)| {
-                    (
-                        key,
-                        DirectoryIcons {
-                            collapsed: value.collapsed.map(resolve_icon_path),
-                            expanded: value.expanded.map(resolve_icon_path),
-                        },
-                    )
-                },
-            ));
-
-            let icon_theme = IconTheme {
-                id: uuid::Uuid::new_v4().to_string(),
-                name: icon_theme.name.into(),
-                appearance: match icon_theme.appearance {
-                    AppearanceContent::Light => Appearance::Light,
-                    AppearanceContent::Dark => Appearance::Dark,
-                },
-                directory_icons: DirectoryIcons {
-                    collapsed: icon_theme.directory_icons.collapsed.map(resolve_icon_path),
-                    expanded: icon_theme.directory_icons.expanded.map(resolve_icon_path),
-                },
-                named_directory_icons,
-                chevron_icons: ChevronIcons {
-                    collapsed: icon_theme.chevron_icons.collapsed.map(resolve_icon_path),
-                    expanded: icon_theme.chevron_icons.expanded.map(resolve_icon_path),
-                },
-                file_stems,
-                file_suffixes,
-                file_icons: icon_theme
-                    .file_icons
-                    .into_iter()
-                    .map(|(key, icon)| {
-                        (
-                            key,
-                            IconDefinition {
-                                path: resolve_icon_path(icon.path),
-                            },
-                        )
-                    })
-                    .collect(),
-            };
-
-            state
-                .icon_themes
-                .insert(icon_theme.name.clone(), Arc::new(icon_theme));
-        }
-
-        Ok(())
-    }
-}
-
-impl Default for ThemeRegistry {
-    fn default() -> Self {
-        Self::new(Box::new(()))
-    }
-}
diff --git a/crates/theme/src/scale.rs b/crates/theme/src/scale.rs
deleted file mode 100644
index 70c6114cc6..0000000000
--- a/crates/theme/src/scale.rs
+++ /dev/null
@@ -1,298 +0,0 @@
-#![allow(missing_docs)]
-use gpui::{App, Hsla, SharedString};
-
-use crate::{ActiveTheme, Appearance};
-
-/// A collection of colors that are used to style the UI.
-///
-/// Each step has a semantic meaning, and is used to style different parts of the UI.
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
-pub struct ColorScaleStep(usize);
-
-impl ColorScaleStep {
-    pub const ONE: Self = Self(1);
-    pub const TWO: Self = Self(2);
-    pub const THREE: Self = Self(3);
-    pub const FOUR: Self = Self(4);
-    pub const FIVE: Self = Self(5);
-    pub const SIX: Self = Self(6);
-    pub const SEVEN: Self = Self(7);
-    pub const EIGHT: Self = Self(8);
-    pub const NINE: Self = Self(9);
-    pub const TEN: Self = Self(10);
-    pub const ELEVEN: Self = Self(11);
-    pub const TWELVE: Self = Self(12);
-
-    /// All of the steps in a [`ColorScale`].
-    pub const ALL: [ColorScaleStep; 12] = [
-        Self::ONE,
-        Self::TWO,
-        Self::THREE,
-        Self::FOUR,
-        Self::FIVE,
-        Self::SIX,
-        Self::SEVEN,
-        Self::EIGHT,
-        Self::NINE,
-        Self::TEN,
-        Self::ELEVEN,
-        Self::TWELVE,
-    ];
-}
-
-/// A scale of colors for a given [`ColorScaleSet`].
-///
-/// Each [`ColorScale`] contains exactly 12 colors. Refer to
-/// [`ColorScaleStep`] for a reference of what each step is used for.
-pub struct ColorScale(Vec<Hsla>);
-
-impl FromIterator<Hsla> for ColorScale {
-    fn from_iter<T: IntoIterator<Item = Hsla>>(iter: T) -> Self {
-        Self(Vec::from_iter(iter))
-    }
-}
-
-impl ColorScale {
-    /// Returns the specified step in the [`ColorScale`].
-    #[inline]
-    pub fn step(&self, step: ColorScaleStep) -> Hsla {
-        // Steps are one-based, so we need convert to the zero-based vec index.
-        self.0[step.0 - 1]
-    }
-
-    /// `Step 1` - Used for main application backgrounds.
-    ///
-    /// This step provides a neutral base for any overlaying components, ideal for applications' main backdrop or empty spaces such as canvas areas.
-    ///
-    #[inline]
-    pub fn step_1(&self) -> Hsla {
-        self.step(ColorScaleStep::ONE)
-    }
-
-    /// `Step 2` - Used for both main application backgrounds and subtle component backgrounds.
-    ///
-    /// Like `Step 1`, this step allows variations in background styles, from striped tables, sidebar backgrounds, to card backgrounds.
-    #[inline]
-    pub fn step_2(&self) -> Hsla {
-        self.step(ColorScaleStep::TWO)
-    }
-
-    /// `Step 3` - Used for UI component backgrounds in their normal states.
-    ///
-    /// This step maintains accessibility by guaranteeing a contrast ratio of 4.5:1 with steps 11 and 12 for text. It could also suit hover states for transparent components.
-    #[inline]
-    pub fn step_3(&self) -> Hsla {
-        self.step(ColorScaleStep::THREE)
-    }
-
-    /// `Step 4` - Used for UI component backgrounds in their hover states.
-    ///
-    /// Also suited for pressed or selected states of components with a transparent background.
-    #[inline]
-    pub fn step_4(&self) -> Hsla {
-        self.step(ColorScaleStep::FOUR)
-    }
-
-    /// `Step 5` - Used for UI component backgrounds in their pressed or selected states.
-    #[inline]
-    pub fn step_5(&self) -> Hsla {
-        self.step(ColorScaleStep::FIVE)
-    }
-
-    /// `Step 6` - Used for subtle borders on non-interactive components.
-    ///
-    /// Its usage spans from sidebars' borders, headers' dividers, cards' outlines, to alerts' edges and separators.
-    #[inline]
-    pub fn step_6(&self) -> Hsla {
-        self.step(ColorScaleStep::SIX)
-    }
-
-    /// `Step 7` - Used for subtle borders on interactive components.
-    ///
-    /// This step subtly delineates the boundary of elements users interact with.
-    #[inline]
-    pub fn step_7(&self) -> Hsla {
-        self.step(ColorScaleStep::SEVEN)
-    }
-
-    /// `Step 8` - Used for stronger borders on interactive components and focus rings.
-    ///
-    /// It strengthens the visibility and accessibility of active elements and their focus states.
-    #[inline]
-    pub fn step_8(&self) -> Hsla {
-        self.step(ColorScaleStep::EIGHT)
-    }
-
-    /// `Step 9` - Used for solid backgrounds.
-    ///
-    /// `Step 9` is the most saturated step, having the least mix of white or black.
-    ///
-    /// Due to its high chroma, `Step 9` is versatile and particularly useful for semantic colors such as
-    /// error, warning, and success indicators.
-    #[inline]
-    pub fn step_9(&self) -> Hsla {
-        self.step(ColorScaleStep::NINE)
-    }
-
-    /// `Step 10` - Used for hovered or active solid backgrounds, particularly when `Step 9` is their normal state.
-    ///
-    /// May also be used for extremely low contrast text. This should be used sparingly, as it may be difficult to read.
-    #[inline]
-    pub fn step_10(&self) -> Hsla {
-        self.step(ColorScaleStep::TEN)
-    }
-
-    /// `Step 11` - Used for text and icons requiring low contrast or less emphasis.
-    #[inline]
-    pub fn step_11(&self) -> Hsla {
-        self.step(ColorScaleStep::ELEVEN)
-    }
-
-    /// `Step 12` - Used for text and icons requiring high contrast or prominence.
-    #[inline]
-    pub fn step_12(&self) -> Hsla {
-        self.step(ColorScaleStep::TWELVE)
-    }
-}
-
-pub struct ColorScales {
-    pub gray: ColorScaleSet,
-    pub mauve: ColorScaleSet,
-    pub slate: ColorScaleSet,
-    pub sage: ColorScaleSet,
-    pub olive: ColorScaleSet,
-    pub sand: ColorScaleSet,
-    pub gold: ColorScaleSet,
-    pub bronze: ColorScaleSet,
-    pub brown: ColorScaleSet,
-    pub yellow: ColorScaleSet,
-    pub amber: ColorScaleSet,
-    pub orange: ColorScaleSet,
-    pub tomato: ColorScaleSet,
-    pub red: ColorScaleSet,
-    pub ruby: ColorScaleSet,
-    pub crimson: ColorScaleSet,
-    pub pink: ColorScaleSet,
-    pub plum: ColorScaleSet,
-    pub purple: ColorScaleSet,
-    pub violet: ColorScaleSet,
-    pub iris: ColorScaleSet,
-    pub indigo: ColorScaleSet,
-    pub blue: ColorScaleSet,
-    pub cyan: ColorScaleSet,
-    pub teal: ColorScaleSet,
-    pub jade: ColorScaleSet,
-    pub green: ColorScaleSet,
-    pub grass: ColorScaleSet,
-    pub lime: ColorScaleSet,
-    pub mint: ColorScaleSet,
-    pub sky: ColorScaleSet,
-    pub black: ColorScaleSet,
-    pub white: ColorScaleSet,
-}
-
-impl IntoIterator for ColorScales {
-    type Item = ColorScaleSet;
-
-    type IntoIter = std::vec::IntoIter<Self::Item>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        vec![
-            self.gray,
-            self.mauve,
-            self.slate,
-            self.sage,
-            self.olive,
-            self.sand,
-            self.gold,
-            self.bronze,
-            self.brown,
-            self.yellow,
-            self.amber,
-            self.orange,
-            self.tomato,
-            self.red,
-            self.ruby,
-            self.crimson,
-            self.pink,
-            self.plum,
-            self.purple,
-            self.violet,
-            self.iris,
-            self.indigo,
-            self.blue,
-            self.cyan,
-            self.teal,
-            self.jade,
-            self.green,
-            self.grass,
-            self.lime,
-            self.mint,
-            self.sky,
-            self.black,
-            self.white,
-        ]
-        .into_iter()
-    }
-}
-
-/// Provides groups of [`ColorScale`]s for light and dark themes, as well as transparent versions of each scale.
-pub struct ColorScaleSet {
-    name: SharedString,
-    light: ColorScale,
-    dark: ColorScale,
-    light_alpha: ColorScale,
-    dark_alpha: ColorScale,
-}
-
-impl ColorScaleSet {
-    pub fn new(
-        name: impl Into<SharedString>,
-        light: ColorScale,
-        light_alpha: ColorScale,
-        dark: ColorScale,
-        dark_alpha: ColorScale,
-    ) -> Self {
-        Self {
-            name: name.into(),
-            light,
-            light_alpha,
-            dark,
-            dark_alpha,
-        }
-    }
-
-    pub fn name(&self) -> &SharedString {
-        &self.name
-    }
-
-    pub fn light(&self) -> &ColorScale {
-        &self.light
-    }
-
-    pub fn light_alpha(&self) -> &ColorScale {
-        &self.light_alpha
-    }
-
-    pub fn dark(&self) -> &ColorScale {
-        &self.dark
-    }
-
-    pub fn dark_alpha(&self) -> &ColorScale {
-        &self.dark_alpha
-    }
-
-    pub fn step(&self, cx: &App, step: ColorScaleStep) -> Hsla {
-        match cx.theme().appearance {
-            Appearance::Light => self.light().step(step),
-            Appearance::Dark => self.dark().step(step),
-        }
-    }
-
-    pub fn step_alpha(&self, cx: &App, step: ColorScaleStep) -> Hsla {
-        match cx.theme().appearance {
-            Appearance::Light => self.light_alpha.step(step),
-            Appearance::Dark => self.dark_alpha.step(step),
-        }
-    }
-}
diff --git a/crates/theme/src/schema.rs b/crates/theme/src/schema.rs
deleted file mode 100644
index f52b2cf0e5..0000000000
--- a/crates/theme/src/schema.rs
+++ /dev/null
@@ -1,826 +0,0 @@
-#![allow(missing_docs)]
-
-use gpui::{FontStyle, FontWeight, HighlightStyle, Hsla};
-use palette::FromColor;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-pub use settings::{FontWeightContent, WindowBackgroundContent};
-
-use crate::{StatusColorsRefinement, ThemeColorsRefinement};
-
-fn ensure_non_opaque(color: Hsla) -> Hsla {
-    const MAXIMUM_OPACITY: f32 = 0.7;
-    if color.a <= MAXIMUM_OPACITY {
-        color
-    } else {
-        Hsla {
-            a: MAXIMUM_OPACITY,
-            ..color
-        }
-    }
-}
-
-fn ensure_opaque(color: Hsla) -> Hsla {
-    Hsla { a: 1.0, ..color }
-}
-
-#[derive(Debug, PartialEq, Clone, Copy, Serialize, Deserialize, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum AppearanceContent {
-    Light,
-    Dark,
-}
-
-/// The content of a serialized theme family.
-#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema)]
-pub struct ThemeFamilyContent {
-    pub name: String,
-    pub author: String,
-    pub themes: Vec<ThemeContent>,
-}
-
-/// The content of a serialized theme.
-#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema)]
-pub struct ThemeContent {
-    pub name: String,
-    pub appearance: AppearanceContent,
-    pub style: settings::ThemeStyleContent,
-}
-
-/// Returns the syntax style overrides in the [`ThemeContent`].
-pub fn syntax_overrides(this: &settings::ThemeStyleContent) -> Vec<(String, HighlightStyle)> {
-    this.syntax
-        .iter()
-        .map(|(key, style)| {
-            (
-                key.clone(),
-                HighlightStyle {
-                    color: style
-                        .color
-                        .as_ref()
-                        .and_then(|color| try_parse_color(color).ok()),
-                    background_color: style
-                        .background_color
-                        .as_ref()
-                        .and_then(|color| try_parse_color(color).ok()),
-                    font_style: style.font_style.map(FontStyle::from),
-                    font_weight: style.font_weight.map(FontWeight::from),
-                    ..Default::default()
-                },
-            )
-        })
-        .collect()
-}
-
-pub fn status_colors_refinement(colors: &settings::StatusColorsContent) -> StatusColorsRefinement {
-    StatusColorsRefinement {
-        conflict: colors
-            .conflict
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        conflict_background: colors
-            .conflict_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        conflict_border: colors
-            .conflict_border
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        created: colors
-            .created
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        created_background: colors
-            .created_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        created_border: colors
-            .created_border
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        deleted: colors
-            .deleted
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        deleted_background: colors
-            .deleted_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        deleted_border: colors
-            .deleted_border
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        error: colors
-            .error
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        error_background: colors
-            .error_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        error_border: colors
-            .error_border
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        hidden: colors
-            .hidden
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        hidden_background: colors
-            .hidden_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        hidden_border: colors
-            .hidden_border
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        hint: colors
-            .hint
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        hint_background: colors
-            .hint_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        hint_border: colors
-            .hint_border
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        ignored: colors
-            .ignored
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        ignored_background: colors
-            .ignored_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        ignored_border: colors
-            .ignored_border
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        info: colors
-            .info
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        info_background: colors
-            .info_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        info_border: colors
-            .info_border
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        modified: colors
-            .modified
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        modified_background: colors
-            .modified_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        modified_border: colors
-            .modified_border
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        predictive: colors
-            .predictive
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        predictive_background: colors
-            .predictive_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        predictive_border: colors
-            .predictive_border
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        renamed: colors
-            .renamed
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        renamed_background: colors
-            .renamed_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        renamed_border: colors
-            .renamed_border
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        success: colors
-            .success
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        success_background: colors
-            .success_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        success_border: colors
-            .success_border
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        unreachable: colors
-            .unreachable
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        unreachable_background: colors
-            .unreachable_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        unreachable_border: colors
-            .unreachable_border
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        warning: colors
-            .warning
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        warning_background: colors
-            .warning_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        warning_border: colors
-            .warning_border
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-    }
-}
-
-pub fn theme_colors_refinement(
-    this: &settings::ThemeColorsContent,
-    status_colors: &StatusColorsRefinement,
-) -> ThemeColorsRefinement {
-    let border = this
-        .border
-        .as_ref()
-        .and_then(|color| try_parse_color(color).ok());
-    let editor_document_highlight_read_background = this
-        .editor_document_highlight_read_background
-        .as_ref()
-        .and_then(|color| try_parse_color(color).ok());
-    let scrollbar_thumb_background = this
-        .scrollbar_thumb_background
-        .as_ref()
-        .and_then(|color| try_parse_color(color).ok())
-        .or_else(|| {
-            this.deprecated_scrollbar_thumb_background
-                .as_ref()
-                .and_then(|color| try_parse_color(color).ok())
-        });
-    let scrollbar_thumb_hover_background = this
-        .scrollbar_thumb_hover_background
-        .as_ref()
-        .and_then(|color| try_parse_color(color).ok());
-    let scrollbar_thumb_active_background = this
-        .scrollbar_thumb_active_background
-        .as_ref()
-        .and_then(|color| try_parse_color(color).ok())
-        .or(scrollbar_thumb_background);
-    let scrollbar_thumb_border = this
-        .scrollbar_thumb_border
-        .as_ref()
-        .and_then(|color| try_parse_color(color).ok());
-    let element_hover = this
-        .element_hover
-        .as_ref()
-        .and_then(|color| try_parse_color(color).ok());
-    let panel_background = this
-        .panel_background
-        .as_ref()
-        .and_then(|color| try_parse_color(color).ok());
-    let search_match_background = this
-        .search_match_background
-        .as_ref()
-        .and_then(|color| try_parse_color(color).ok());
-    let search_active_match_background = this
-        .search_active_match_background
-        .as_ref()
-        .and_then(|color| try_parse_color(color).ok())
-        .or(search_match_background);
-    ThemeColorsRefinement {
-        border,
-        border_variant: this
-            .border_variant
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        border_focused: this
-            .border_focused
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        border_selected: this
-            .border_selected
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        border_transparent: this
-            .border_transparent
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        border_disabled: this
-            .border_disabled
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        elevated_surface_background: this
-            .elevated_surface_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        surface_background: this
-            .surface_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        background: this
-            .background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        element_background: this
-            .element_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        element_hover,
-        element_active: this
-            .element_active
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        element_selected: this
-            .element_selected
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        element_disabled: this
-            .element_disabled
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        element_selection_background: this
-            .element_selection_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        drop_target_background: this
-            .drop_target_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        drop_target_border: this
-            .drop_target_border
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        ghost_element_background: this
-            .ghost_element_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        ghost_element_hover: this
-            .ghost_element_hover
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        ghost_element_active: this
-            .ghost_element_active
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        ghost_element_selected: this
-            .ghost_element_selected
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        ghost_element_disabled: this
-            .ghost_element_disabled
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        text: this
-            .text
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        text_muted: this
-            .text_muted
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        text_placeholder: this
-            .text_placeholder
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        text_disabled: this
-            .text_disabled
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        text_accent: this
-            .text_accent
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        icon: this
-            .icon
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        icon_muted: this
-            .icon_muted
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        icon_disabled: this
-            .icon_disabled
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        icon_placeholder: this
-            .icon_placeholder
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        icon_accent: this
-            .icon_accent
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        debugger_accent: this
-            .debugger_accent
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        status_bar_background: this
-            .status_bar_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        title_bar_background: this
-            .title_bar_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        title_bar_inactive_background: this
-            .title_bar_inactive_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        toolbar_background: this
-            .toolbar_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        tab_bar_background: this
-            .tab_bar_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        tab_inactive_background: this
-            .tab_inactive_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        tab_active_background: this
-            .tab_active_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        search_match_background: search_match_background,
-        search_active_match_background: search_active_match_background,
-        panel_background,
-        panel_focused_border: this
-            .panel_focused_border
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        panel_indent_guide: this
-            .panel_indent_guide
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        panel_indent_guide_hover: this
-            .panel_indent_guide_hover
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        panel_indent_guide_active: this
-            .panel_indent_guide_active
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        panel_overlay_background: this
-            .panel_overlay_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok())
-            .or(panel_background.map(ensure_opaque)),
-        panel_overlay_hover: this
-            .panel_overlay_hover
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok())
-            .or(panel_background
-                .zip(element_hover)
-                .map(|(panel_bg, hover_bg)| panel_bg.blend(hover_bg))
-                .map(ensure_opaque)),
-        pane_focused_border: this
-            .pane_focused_border
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        pane_group_border: this
-            .pane_group_border
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok())
-            .or(border),
-        scrollbar_thumb_background,
-        scrollbar_thumb_hover_background,
-        scrollbar_thumb_active_background,
-        scrollbar_thumb_border,
-        scrollbar_track_background: this
-            .scrollbar_track_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        scrollbar_track_border: this
-            .scrollbar_track_border
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        minimap_thumb_background: this
-            .minimap_thumb_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok())
-            .or(scrollbar_thumb_background.map(ensure_non_opaque)),
-        minimap_thumb_hover_background: this
-            .minimap_thumb_hover_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok())
-            .or(scrollbar_thumb_hover_background.map(ensure_non_opaque)),
-        minimap_thumb_active_background: this
-            .minimap_thumb_active_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok())
-            .or(scrollbar_thumb_active_background.map(ensure_non_opaque)),
-        minimap_thumb_border: this
-            .minimap_thumb_border
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok())
-            .or(scrollbar_thumb_border),
-        editor_foreground: this
-            .editor_foreground
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        editor_background: this
-            .editor_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        editor_gutter_background: this
-            .editor_gutter_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        editor_subheader_background: this
-            .editor_subheader_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        editor_active_line_background: this
-            .editor_active_line_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        editor_highlighted_line_background: this
-            .editor_highlighted_line_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        editor_debugger_active_line_background: this
-            .editor_debugger_active_line_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        editor_line_number: this
-            .editor_line_number
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        editor_hover_line_number: this
-            .editor_hover_line_number
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        editor_active_line_number: this
-            .editor_active_line_number
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        editor_invisible: this
-            .editor_invisible
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        editor_wrap_guide: this
-            .editor_wrap_guide
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        editor_active_wrap_guide: this
-            .editor_active_wrap_guide
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        editor_indent_guide: this
-            .editor_indent_guide
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        editor_indent_guide_active: this
-            .editor_indent_guide_active
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        editor_document_highlight_read_background,
-        editor_document_highlight_write_background: this
-            .editor_document_highlight_write_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        editor_document_highlight_bracket_background: this
-            .editor_document_highlight_bracket_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok())
-            // Fall back to `editor.document_highlight.read_background`, for backwards compatibility.
-            .or(editor_document_highlight_read_background),
-        terminal_background: this
-            .terminal_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        terminal_ansi_background: this
-            .terminal_ansi_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        terminal_foreground: this
-            .terminal_foreground
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        terminal_bright_foreground: this
-            .terminal_bright_foreground
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        terminal_dim_foreground: this
-            .terminal_dim_foreground
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        terminal_ansi_black: this
-            .terminal_ansi_black
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        terminal_ansi_bright_black: this
-            .terminal_ansi_bright_black
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        terminal_ansi_dim_black: this
-            .terminal_ansi_dim_black
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        terminal_ansi_red: this
-            .terminal_ansi_red
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        terminal_ansi_bright_red: this
-            .terminal_ansi_bright_red
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        terminal_ansi_dim_red: this
-            .terminal_ansi_dim_red
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        terminal_ansi_green: this
-            .terminal_ansi_green
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        terminal_ansi_bright_green: this
-            .terminal_ansi_bright_green
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        terminal_ansi_dim_green: this
-            .terminal_ansi_dim_green
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        terminal_ansi_yellow: this
-            .terminal_ansi_yellow
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        terminal_ansi_bright_yellow: this
-            .terminal_ansi_bright_yellow
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        terminal_ansi_dim_yellow: this
-            .terminal_ansi_dim_yellow
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        terminal_ansi_blue: this
-            .terminal_ansi_blue
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        terminal_ansi_bright_blue: this
-            .terminal_ansi_bright_blue
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        terminal_ansi_dim_blue: this
-            .terminal_ansi_dim_blue
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        terminal_ansi_magenta: this
-            .terminal_ansi_magenta
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        terminal_ansi_bright_magenta: this
-            .terminal_ansi_bright_magenta
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        terminal_ansi_dim_magenta: this
-            .terminal_ansi_dim_magenta
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        terminal_ansi_cyan: this
-            .terminal_ansi_cyan
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        terminal_ansi_bright_cyan: this
-            .terminal_ansi_bright_cyan
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        terminal_ansi_dim_cyan: this
-            .terminal_ansi_dim_cyan
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        terminal_ansi_white: this
-            .terminal_ansi_white
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        terminal_ansi_bright_white: this
-            .terminal_ansi_bright_white
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        terminal_ansi_dim_white: this
-            .terminal_ansi_dim_white
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        link_text_hover: this
-            .link_text_hover
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        version_control_added: this
-            .version_control_added
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok())
-            // Fall back to `created`, for backwards compatibility.
-            .or(status_colors.created),
-        version_control_deleted: this
-            .version_control_deleted
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok())
-            // Fall back to `deleted`, for backwards compatibility.
-            .or(status_colors.deleted),
-        version_control_modified: this
-            .version_control_modified
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok())
-            // Fall back to `modified`, for backwards compatibility.
-            .or(status_colors.modified),
-        version_control_renamed: this
-            .version_control_renamed
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok())
-            // Fall back to `modified`, for backwards compatibility.
-            .or(status_colors.modified),
-        version_control_conflict: this
-            .version_control_conflict
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok())
-            // Fall back to `ignored`, for backwards compatibility.
-            .or(status_colors.ignored),
-        version_control_ignored: this
-            .version_control_ignored
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok())
-            // Fall back to `conflict`, for backwards compatibility.
-            .or(status_colors.ignored),
-        version_control_word_added: this
-            .version_control_word_added
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        version_control_word_deleted: this
-            .version_control_word_deleted
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        #[allow(deprecated)]
-        version_control_conflict_marker_ours: this
-            .version_control_conflict_marker_ours
-            .as_ref()
-            .or(this.version_control_conflict_ours_background.as_ref())
-            .and_then(|color| try_parse_color(color).ok()),
-        #[allow(deprecated)]
-        version_control_conflict_marker_theirs: this
-            .version_control_conflict_marker_theirs
-            .as_ref()
-            .or(this.version_control_conflict_theirs_background.as_ref())
-            .and_then(|color| try_parse_color(color).ok()),
-        vim_normal_background: this
-            .vim_normal_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        vim_insert_background: this
-            .vim_insert_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        vim_replace_background: this
-            .vim_replace_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        vim_visual_background: this
-            .vim_visual_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        vim_visual_line_background: this
-            .vim_visual_line_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        vim_visual_block_background: this
-            .vim_visual_block_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        vim_helix_normal_background: this
-            .vim_helix_normal_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        vim_helix_select_background: this
-            .vim_helix_select_background
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-        vim_mode_text: this
-            .vim_mode_text
-            .as_ref()
-            .and_then(|color| try_parse_color(color).ok()),
-    }
-}
-
-pub(crate) fn try_parse_color(color: &str) -> anyhow::Result<Hsla> {
-    let rgba = gpui::Rgba::try_from(color)?;
-    let rgba = palette::rgb::Srgba::from_components((rgba.r, rgba.g, rgba.b, rgba.a));
-    let hsla = palette::Hsla::from_color(rgba);
-
-    let hsla = gpui::hsla(
-        hsla.hue.into_positive_degrees() / 360.,
-        hsla.saturation,
-        hsla.lightness,
-        hsla.alpha,
-    );
-
-    Ok(hsla)
-}
diff --git a/crates/theme/src/settings.rs b/crates/theme/src/settings.rs
deleted file mode 100644
index d60d4882a6..0000000000
--- a/crates/theme/src/settings.rs
+++ /dev/null
@@ -1,749 +0,0 @@
-use crate::{
-    Appearance, DEFAULT_ICON_THEME_NAME, SyntaxTheme, Theme, status_colors_refinement,
-    syntax_overrides, theme_colors_refinement,
-};
-use collections::HashMap;
-use derive_more::{Deref, DerefMut};
-use gpui::{
-    App, Context, Font, FontFallbacks, FontStyle, FontWeight, Global, Pixels, Subscription, Window,
-    px,
-};
-use refineable::Refineable;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-pub use settings::{FontFamilyName, IconThemeName, ThemeAppearanceMode, ThemeName};
-use settings::{RegisterSetting, Settings, SettingsContent};
-use std::sync::Arc;
-
-const MIN_FONT_SIZE: Pixels = px(6.0);
-const MAX_FONT_SIZE: Pixels = px(100.0);
-const MIN_LINE_HEIGHT: f32 = 1.0;
-
-#[derive(
-    Debug,
-    Default,
-    PartialEq,
-    Eq,
-    PartialOrd,
-    Ord,
-    Hash,
-    Clone,
-    Copy,
-    Serialize,
-    Deserialize,
-    JsonSchema,
-)]
-
-/// Specifies the density of the UI.
-/// Note: This setting is still experimental. See [this tracking issue](https://github.com/zed-industries/zed/issues/18078)
-#[serde(rename_all = "snake_case")]
-pub enum UiDensity {
-    /// A denser UI with tighter spacing and smaller elements.
-    #[serde(alias = "compact")]
-    Compact,
-    #[default]
-    #[serde(alias = "default")]
-    /// The default UI density.
-    Default,
-    #[serde(alias = "comfortable")]
-    /// A looser UI with more spacing and larger elements.
-    Comfortable,
-}
-
-impl UiDensity {
-    /// The spacing ratio of a given density.
-    /// TODO: Standardize usage throughout the app or remove
-    pub fn spacing_ratio(self) -> f32 {
-        match self {
-            UiDensity::Compact => 0.75,
-            UiDensity::Default => 1.0,
-            UiDensity::Comfortable => 1.25,
-        }
-    }
-}
-
-impl From<String> for UiDensity {
-    fn from(s: String) -> Self {
-        match s.as_str() {
-            "compact" => Self::Compact,
-            "default" => Self::Default,
-            "comfortable" => Self::Comfortable,
-            _ => Self::default(),
-        }
-    }
-}
-
-impl From<UiDensity> for String {
-    fn from(val: UiDensity) -> Self {
-        match val {
-            UiDensity::Compact => "compact".to_string(),
-            UiDensity::Default => "default".to_string(),
-            UiDensity::Comfortable => "comfortable".to_string(),
-        }
-    }
-}
-
-impl From<settings::UiDensity> for UiDensity {
-    fn from(val: settings::UiDensity) -> Self {
-        match val {
-            settings::UiDensity::Compact => Self::Compact,
-            settings::UiDensity::Default => Self::Default,
-            settings::UiDensity::Comfortable => Self::Comfortable,
-        }
-    }
-}
-
-/// Customizable settings for the UI and theme system.
-#[derive(Clone, PartialEq, RegisterSetting)]
-pub struct ThemeSettings {
-    /// The UI font size. Determines the size of text in the UI,
-    /// as well as the size of a [gpui::Rems] unit.
-    ///
-    /// Changing this will impact the size of all UI elements.
-    ui_font_size: Pixels,
-    /// The font used for UI elements.
-    pub ui_font: Font,
-    /// The font size used for buffers, and the terminal.
-    ///
-    /// The terminal font size can be overridden using it's own setting.
-    buffer_font_size: Pixels,
-    /// The font used for buffers, and the terminal.
-    ///
-    /// The terminal font family can be overridden using it's own setting.
-    pub buffer_font: Font,
-    /// The agent font size. Determines the size of text in the agent panel. Falls back to the UI font size if unset.
-    agent_ui_font_size: Option<Pixels>,
-    /// The agent buffer font size. Determines the size of user messages in the agent panel.
-    agent_buffer_font_size: Option<Pixels>,
-    /// The line height for buffers, and the terminal.
-    ///
-    /// Changing this may affect the spacing of some UI elements.
-    ///
-    /// The terminal font family can be overridden using it's own setting.
-    pub buffer_line_height: BufferLineHeight,
-    /// The current theme selection.
-    pub theme: ThemeSelection,
-    /// Manual overrides for the active theme.
-    ///
-    /// Note: This setting is still experimental. See [this tracking issue](https://github.com/zed-industries/zed/issues/18078)
-    pub experimental_theme_overrides: Option<settings::ThemeStyleContent>,
-    /// Manual overrides per theme
-    pub theme_overrides: HashMap<String, settings::ThemeStyleContent>,
-    /// The current icon theme selection.
-    pub icon_theme: IconThemeSelection,
-    /// The density of the UI.
-    /// Note: This setting is still experimental. See [this tracking issue](
-    pub ui_density: UiDensity,
-    /// The amount of fading applied to unnecessary code.
-    pub unnecessary_code_fade: f32,
-}
-
-pub(crate) const DEFAULT_LIGHT_THEME: &'static str = "One Light";
-pub(crate) const DEFAULT_DARK_THEME: &'static str = "One Dark";
-
-/// Returns the name of the default theme for the given [`Appearance`].
-pub fn default_theme(appearance: Appearance) -> &'static str {
-    match appearance {
-        Appearance::Light => DEFAULT_LIGHT_THEME,
-        Appearance::Dark => DEFAULT_DARK_THEME,
-    }
-}
-
-/// The appearance of the system.
-#[derive(Debug, Clone, Copy, Deref)]
-pub struct SystemAppearance(pub Appearance);
-
-impl Default for SystemAppearance {
-    fn default() -> Self {
-        Self(Appearance::Dark)
-    }
-}
-
-#[derive(Deref, DerefMut, Default)]
-struct GlobalSystemAppearance(SystemAppearance);
-
-impl Global for GlobalSystemAppearance {}
-
-impl SystemAppearance {
-    /// Initializes the [`SystemAppearance`] for the application.
-    pub fn init(cx: &mut App) {
-        *cx.default_global::<GlobalSystemAppearance>() =
-            GlobalSystemAppearance(SystemAppearance(cx.window_appearance().into()));
-    }
-
-    /// Returns the global [`SystemAppearance`].
-    pub fn global(cx: &App) -> Self {
-        cx.global::<GlobalSystemAppearance>().0
-    }
-
-    /// Returns a mutable reference to the global [`SystemAppearance`].
-    pub fn global_mut(cx: &mut App) -> &mut Self {
-        cx.global_mut::<GlobalSystemAppearance>()
-    }
-}
-
-#[derive(Default)]
-struct BufferFontSize(Pixels);
-
-impl Global for BufferFontSize {}
-
-#[derive(Default)]
-pub(crate) struct UiFontSize(Pixels);
-
-impl Global for UiFontSize {}
-
-/// In-memory override for the font size in the agent panel.
-#[derive(Default)]
-pub struct AgentFontSize(Pixels);
-
-impl Global for AgentFontSize {}
-
-/// Represents the selection of a theme, which can be either static or dynamic.
-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
-#[serde(untagged)]
-pub enum ThemeSelection {
-    /// A static theme selection, represented by a single theme name.
-    Static(ThemeName),
-    /// A dynamic theme selection, which can change based the [ThemeMode].
-    Dynamic {
-        /// The mode used to determine which theme to use.
-        #[serde(default)]
-        mode: ThemeAppearanceMode,
-        /// The theme to use for light mode.
-        light: ThemeName,
-        /// The theme to use for dark mode.
-        dark: ThemeName,
-    },
-}
-
-impl From<settings::ThemeSelection> for ThemeSelection {
-    fn from(selection: settings::ThemeSelection) -> Self {
-        match selection {
-            settings::ThemeSelection::Static(theme) => ThemeSelection::Static(theme),
-            settings::ThemeSelection::Dynamic { mode, light, dark } => {
-                ThemeSelection::Dynamic { mode, light, dark }
-            }
-        }
-    }
-}
-
-impl ThemeSelection {
-    /// Returns the theme name for the selected [ThemeMode].
-    pub fn name(&self, system_appearance: Appearance) -> ThemeName {
-        match self {
-            Self::Static(theme) => theme.clone(),
-            Self::Dynamic { mode, light, dark } => match mode {
-                ThemeAppearanceMode::Light => light.clone(),
-                ThemeAppearanceMode::Dark => dark.clone(),
-                ThemeAppearanceMode::System => match system_appearance {
-                    Appearance::Light => light.clone(),
-                    Appearance::Dark => dark.clone(),
-                },
-            },
-        }
-    }
-
-    /// Returns the [ThemeMode] for the [ThemeSelection].
-    pub fn mode(&self) -> Option<ThemeAppearanceMode> {
-        match self {
-            ThemeSelection::Static(_) => None,
-            ThemeSelection::Dynamic { mode, .. } => Some(*mode),
-        }
-    }
-}
-
-/// Represents the selection of an icon theme, which can be either static or dynamic.
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum IconThemeSelection {
-    /// A static icon theme selection, represented by a single icon theme name.
-    Static(IconThemeName),
-    /// A dynamic icon theme selection, which can change based on the [`ThemeMode`].
-    Dynamic {
-        /// The mode used to determine which theme to use.
-        mode: ThemeAppearanceMode,
-        /// The icon theme to use for light mode.
-        light: IconThemeName,
-        /// The icon theme to use for dark mode.
-        dark: IconThemeName,
-    },
-}
-
-impl From<settings::IconThemeSelection> for IconThemeSelection {
-    fn from(selection: settings::IconThemeSelection) -> Self {
-        match selection {
-            settings::IconThemeSelection::Static(theme) => IconThemeSelection::Static(theme),
-            settings::IconThemeSelection::Dynamic { mode, light, dark } => {
-                IconThemeSelection::Dynamic { mode, light, dark }
-            }
-        }
-    }
-}
-
-impl IconThemeSelection {
-    /// Returns the icon theme name based on the given [`Appearance`].
-    pub fn name(&self, system_appearance: Appearance) -> IconThemeName {
-        match self {
-            Self::Static(theme) => theme.clone(),
-            Self::Dynamic { mode, light, dark } => match mode {
-                ThemeAppearanceMode::Light => light.clone(),
-                ThemeAppearanceMode::Dark => dark.clone(),
-                ThemeAppearanceMode::System => match system_appearance {
-                    Appearance::Light => light.clone(),
-                    Appearance::Dark => dark.clone(),
-                },
-            },
-        }
-    }
-
-    /// Returns the [`ThemeMode`] for the [`IconThemeSelection`].
-    pub fn mode(&self) -> Option<ThemeAppearanceMode> {
-        match self {
-            IconThemeSelection::Static(_) => None,
-            IconThemeSelection::Dynamic { mode, .. } => Some(*mode),
-        }
-    }
-}
-
-/// Sets the theme for the given appearance to the theme with the specified name.
-///
-/// The caller should make sure that the [`Appearance`] matches the theme associated with the name.
-///
-/// If the current [`ThemeAppearanceMode`] is set to [`System`] and the user's system [`Appearance`]
-/// is different than the new theme's [`Appearance`], this function will update the
-/// [`ThemeAppearanceMode`] to the new theme's appearance in order to display the new theme.
-///
-/// [`System`]: ThemeAppearanceMode::System
-pub fn set_theme(
-    current: &mut SettingsContent,
-    theme_name: impl Into<Arc<str>>,
-    theme_appearance: Appearance,
-    system_appearance: Appearance,
-) {
-    let theme_name = ThemeName(theme_name.into());
-
-    let Some(selection) = current.theme.theme.as_mut() else {
-        current.theme.theme = Some(settings::ThemeSelection::Static(theme_name));
-        return;
-    };
-
-    match selection {
-        settings::ThemeSelection::Static(theme) => {
-            *theme = theme_name;
-        }
-        settings::ThemeSelection::Dynamic { mode, light, dark } => {
-            // Update the appropriate theme slot based on appearance.
-            match theme_appearance {
-                Appearance::Light => *light = theme_name,
-                Appearance::Dark => *dark = theme_name,
-            }
-
-            // Don't update the theme mode if it is set to system and the new theme has the same
-            // appearance.
-            let should_update_mode =
-                !(mode == &ThemeAppearanceMode::System && theme_appearance == system_appearance);
-
-            if should_update_mode {
-                // Update the mode to the specified appearance (otherwise we might set the theme and
-                // nothing gets updated because the system specified the other mode appearance).
-                *mode = ThemeAppearanceMode::from(theme_appearance);
-            }
-        }
-    }
-}
-
-/// Sets the icon theme for the given appearance to the icon theme with the specified name.
-pub fn set_icon_theme(
-    current: &mut SettingsContent,
-    icon_theme_name: IconThemeName,
-    appearance: Appearance,
-) {
-    if let Some(selection) = current.theme.icon_theme.as_mut() {
-        let icon_theme_to_update = match selection {
-            settings::IconThemeSelection::Static(theme) => theme,
-            settings::IconThemeSelection::Dynamic { mode, light, dark } => match mode {
-                ThemeAppearanceMode::Light => light,
-                ThemeAppearanceMode::Dark => dark,
-                ThemeAppearanceMode::System => match appearance {
-                    Appearance::Light => light,
-                    Appearance::Dark => dark,
-                },
-            },
-        };
-
-        *icon_theme_to_update = icon_theme_name;
-    } else {
-        current.theme.icon_theme = Some(settings::IconThemeSelection::Static(icon_theme_name));
-    }
-}
-
-/// Sets the mode for the theme.
-pub fn set_mode(content: &mut SettingsContent, mode: ThemeAppearanceMode) {
-    let theme = content.theme.as_mut();
-
-    if let Some(selection) = theme.theme.as_mut() {
-        match selection {
-            settings::ThemeSelection::Static(theme) => {
-                // If the theme was previously set to a single static theme,
-                // we don't know whether it was a light or dark theme, so we
-                // just use it for both.
-                *selection = settings::ThemeSelection::Dynamic {
-                    mode,
-                    light: theme.clone(),
-                    dark: theme.clone(),
-                };
-            }
-            settings::ThemeSelection::Dynamic {
-                mode: mode_to_update,
-                ..
-            } => *mode_to_update = mode,
-        }
-    } else {
-        theme.theme = Some(settings::ThemeSelection::Dynamic {
-            mode,
-            light: ThemeName(DEFAULT_LIGHT_THEME.into()),
-            dark: ThemeName(DEFAULT_DARK_THEME.into()),
-        });
-    }
-
-    if let Some(selection) = theme.icon_theme.as_mut() {
-        match selection {
-            settings::IconThemeSelection::Static(icon_theme) => {
-                // If the icon theme was previously set to a single static
-                // theme, we don't know whether it was a light or dark
-                // theme, so we just use it for both.
-                *selection = settings::IconThemeSelection::Dynamic {
-                    mode,
-                    light: icon_theme.clone(),
-                    dark: icon_theme.clone(),
-                };
-            }
-            settings::IconThemeSelection::Dynamic {
-                mode: mode_to_update,
-                ..
-            } => *mode_to_update = mode,
-        }
-    } else {
-        theme.icon_theme = Some(settings::IconThemeSelection::Static(IconThemeName(
-            DEFAULT_ICON_THEME_NAME.into(),
-        )));
-    }
-}
-// }
-
-/// The buffer's line height.
-#[derive(Clone, Copy, Debug, PartialEq, Default)]
-pub enum BufferLineHeight {
-    /// A less dense line height.
-    #[default]
-    Comfortable,
-    /// The default line height.
-    Standard,
-    /// A custom line height, where 1.0 is the font's height. Must be at least 1.0.
-    Custom(f32),
-}
-
-impl From<settings::BufferLineHeight> for BufferLineHeight {
-    fn from(value: settings::BufferLineHeight) -> Self {
-        match value {
-            settings::BufferLineHeight::Comfortable => BufferLineHeight::Comfortable,
-            settings::BufferLineHeight::Standard => BufferLineHeight::Standard,
-            settings::BufferLineHeight::Custom(line_height) => {
-                BufferLineHeight::Custom(line_height)
-            }
-        }
-    }
-}
-
-impl BufferLineHeight {
-    /// Returns the value of the line height.
-    pub fn value(&self) -> f32 {
-        match self {
-            BufferLineHeight::Comfortable => 1.618,
-            BufferLineHeight::Standard => 1.3,
-            BufferLineHeight::Custom(line_height) => *line_height,
-        }
-    }
-}
-
-impl ThemeSettings {
-    /// Returns the buffer font size.
-    pub fn buffer_font_size(&self, cx: &App) -> Pixels {
-        let font_size = cx
-            .try_global::<BufferFontSize>()
-            .map(|size| size.0)
-            .unwrap_or(self.buffer_font_size);
-        clamp_font_size(font_size)
-    }
-
-    /// Returns the UI font size.
-    pub fn ui_font_size(&self, cx: &App) -> Pixels {
-        let font_size = cx
-            .try_global::<UiFontSize>()
-            .map(|size| size.0)
-            .unwrap_or(self.ui_font_size);
-        clamp_font_size(font_size)
-    }
-
-    /// Returns the agent panel font size. Falls back to the UI font size if unset.
-    pub fn agent_ui_font_size(&self, cx: &App) -> Pixels {
-        cx.try_global::<AgentFontSize>()
-            .map(|size| size.0)
-            .or(self.agent_ui_font_size)
-            .map(clamp_font_size)
-            .unwrap_or_else(|| self.ui_font_size(cx))
-    }
-
-    /// Returns the agent panel buffer font size.
-    pub fn agent_buffer_font_size(&self, cx: &App) -> Pixels {
-        cx.try_global::<AgentFontSize>()
-            .map(|size| size.0)
-            .or(self.agent_buffer_font_size)
-            .map(clamp_font_size)
-            .unwrap_or_else(|| self.buffer_font_size(cx))
-    }
-
-    /// Returns the buffer font size, read from the settings.
-    ///
-    /// The real buffer font size is stored in-memory, to support temporary font size changes.
-    /// Use [`Self::buffer_font_size`] to get the real font size.
-    pub fn buffer_font_size_settings(&self) -> Pixels {
-        self.buffer_font_size
-    }
-
-    /// Returns the UI font size, read from the settings.
-    ///
-    /// The real UI font size is stored in-memory, to support temporary font size changes.
-    /// Use [`Self::ui_font_size`] to get the real font size.
-    pub fn ui_font_size_settings(&self) -> Pixels {
-        self.ui_font_size
-    }
-
-    /// Returns the agent font size, read from the settings.
-    ///
-    /// The real agent font size is stored in-memory, to support temporary font size changes.
-    /// Use [`Self::agent_ui_font_size`] to get the real font size.
-    pub fn agent_ui_font_size_settings(&self) -> Option<Pixels> {
-        self.agent_ui_font_size
-    }
-
-    /// Returns the agent buffer font size, read from the settings.
-    ///
-    /// The real agent buffer font size is stored in-memory, to support temporary font size changes.
-    /// Use [`Self::agent_buffer_font_size`] to get the real font size.
-    pub fn agent_buffer_font_size_settings(&self) -> Option<Pixels> {
-        self.agent_buffer_font_size
-    }
-
-    // TODO: Rename: `line_height` -> `buffer_line_height`
-    /// Returns the buffer's line height.
-    pub fn line_height(&self) -> f32 {
-        f32::max(self.buffer_line_height.value(), MIN_LINE_HEIGHT)
-    }
-
-    /// Applies the theme overrides, if there are any, to the current theme.
-    pub fn apply_theme_overrides(&self, mut arc_theme: Arc<Theme>) -> Arc<Theme> {
-        // Apply the old overrides setting first, so that the new setting can override those.
-        if let Some(experimental_theme_overrides) = &self.experimental_theme_overrides {
-            let mut theme = (*arc_theme).clone();
-            ThemeSettings::modify_theme(&mut theme, experimental_theme_overrides);
-            arc_theme = Arc::new(theme);
-        }
-
-        if let Some(theme_overrides) = self.theme_overrides.get(arc_theme.name.as_ref()) {
-            let mut theme = (*arc_theme).clone();
-            ThemeSettings::modify_theme(&mut theme, theme_overrides);
-            arc_theme = Arc::new(theme);
-        }
-
-        arc_theme
-    }
-
-    fn modify_theme(base_theme: &mut Theme, theme_overrides: &settings::ThemeStyleContent) {
-        if let Some(window_background_appearance) = theme_overrides.window_background_appearance {
-            base_theme.styles.window_background_appearance = window_background_appearance.into();
-        }
-        let status_color_refinement = status_colors_refinement(&theme_overrides.status);
-
-        base_theme.styles.colors.refine(&theme_colors_refinement(
-            &theme_overrides.colors,
-            &status_color_refinement,
-        ));
-        base_theme.styles.status.refine(&status_color_refinement);
-        base_theme.styles.player.merge(&theme_overrides.players);
-        base_theme.styles.accents.merge(&theme_overrides.accents);
-        base_theme.styles.syntax = SyntaxTheme::merge(
-            base_theme.styles.syntax.clone(),
-            syntax_overrides(&theme_overrides),
-        );
-    }
-}
-
-/// Observe changes to the adjusted buffer font size.
-pub fn observe_buffer_font_size_adjustment<V: 'static>(
-    cx: &mut Context<V>,
-    f: impl 'static + Fn(&mut V, &mut Context<V>),
-) -> Subscription {
-    cx.observe_global::<BufferFontSize>(f)
-}
-
-/// Gets the font size, adjusted by the difference between the current buffer font size and the one set in the settings.
-pub fn adjusted_font_size(size: Pixels, cx: &App) -> Pixels {
-    let adjusted_font_size =
-        if let Some(BufferFontSize(adjusted_size)) = cx.try_global::<BufferFontSize>() {
-            let buffer_font_size = ThemeSettings::get_global(cx).buffer_font_size;
-            let delta = *adjusted_size - buffer_font_size;
-            size + delta
-        } else {
-            size
-        };
-    clamp_font_size(adjusted_font_size)
-}
-
-/// Adjusts the buffer font size.
-pub fn adjust_buffer_font_size(cx: &mut App, f: impl FnOnce(Pixels) -> Pixels) {
-    let buffer_font_size = ThemeSettings::get_global(cx).buffer_font_size;
-    let adjusted_size = cx
-        .try_global::<BufferFontSize>()
-        .map_or(buffer_font_size, |adjusted_size| adjusted_size.0);
-    cx.set_global(BufferFontSize(clamp_font_size(f(adjusted_size))));
-    cx.refresh_windows();
-}
-
-/// Resets the buffer font size to the default value.
-pub fn reset_buffer_font_size(cx: &mut App) {
-    if cx.has_global::<BufferFontSize>() {
-        cx.remove_global::<BufferFontSize>();
-        cx.refresh_windows();
-    }
-}
-
-// TODO: Make private, change usages to use `get_ui_font_size` instead.
-#[allow(missing_docs)]
-pub fn setup_ui_font(window: &mut Window, cx: &mut App) -> gpui::Font {
-    let (ui_font, ui_font_size) = {
-        let theme_settings = ThemeSettings::get_global(cx);
-        let font = theme_settings.ui_font.clone();
-        (font, theme_settings.ui_font_size(cx))
-    };
-
-    window.set_rem_size(ui_font_size);
-    ui_font
-}
-
-/// Sets the adjusted UI font size.
-pub fn adjust_ui_font_size(cx: &mut App, f: impl FnOnce(Pixels) -> Pixels) {
-    let ui_font_size = ThemeSettings::get_global(cx).ui_font_size(cx);
-    let adjusted_size = cx
-        .try_global::<UiFontSize>()
-        .map_or(ui_font_size, |adjusted_size| adjusted_size.0);
-    cx.set_global(UiFontSize(clamp_font_size(f(adjusted_size))));
-    cx.refresh_windows();
-}
-
-/// Resets the UI font size to the default value.
-pub fn reset_ui_font_size(cx: &mut App) {
-    if cx.has_global::<UiFontSize>() {
-        cx.remove_global::<UiFontSize>();
-        cx.refresh_windows();
-    }
-}
-
-/// Sets the adjusted font size of agent responses in the agent panel.
-pub fn adjust_agent_ui_font_size(cx: &mut App, f: impl FnOnce(Pixels) -> Pixels) {
-    let agent_ui_font_size = ThemeSettings::get_global(cx).agent_ui_font_size(cx);
-    let adjusted_size = cx
-        .try_global::<AgentFontSize>()
-        .map_or(agent_ui_font_size, |adjusted_size| adjusted_size.0);
-    cx.set_global(AgentFontSize(clamp_font_size(f(adjusted_size))));
-    cx.refresh_windows();
-}
-
-/// Resets the agent response font size in the agent panel to the default value.
-pub fn reset_agent_ui_font_size(cx: &mut App) {
-    if cx.has_global::<AgentFontSize>() {
-        cx.remove_global::<AgentFontSize>();
-        cx.refresh_windows();
-    }
-}
-
-/// Sets the adjusted font size of user messages in the agent panel.
-pub fn adjust_agent_buffer_font_size(cx: &mut App, f: impl FnOnce(Pixels) -> Pixels) {
-    let agent_buffer_font_size = ThemeSettings::get_global(cx).agent_buffer_font_size(cx);
-    let adjusted_size = cx
-        .try_global::<AgentFontSize>()
-        .map_or(agent_buffer_font_size, |adjusted_size| adjusted_size.0);
-    cx.set_global(AgentFontSize(clamp_font_size(f(adjusted_size))));
-    cx.refresh_windows();
-}
-
-/// Resets the user message font size in the agent panel to the default value.
-pub fn reset_agent_buffer_font_size(cx: &mut App) {
-    if cx.has_global::<AgentFontSize>() {
-        cx.remove_global::<AgentFontSize>();
-        cx.refresh_windows();
-    }
-}
-
-/// Ensures font size is within the valid range.
-pub fn clamp_font_size(size: Pixels) -> Pixels {
-    size.clamp(MIN_FONT_SIZE, MAX_FONT_SIZE)
-}
-
-fn clamp_font_weight(weight: f32) -> FontWeight {
-    FontWeight(weight.clamp(100., 950.))
-}
-
-/// font fallback from settings
-pub fn font_fallbacks_from_settings(
-    fallbacks: Option<Vec<settings::FontFamilyName>>,
-) -> Option<FontFallbacks> {
-    fallbacks.map(|fallbacks| {
-        FontFallbacks::from_fonts(
-            fallbacks
-                .into_iter()
-                .map(|font_family| font_family.0.to_string())
-                .collect(),
-        )
-    })
-}
-
-impl settings::Settings for ThemeSettings {
-    fn from_settings(content: &settings::SettingsContent) -> Self {
-        let content = &content.theme;
-        let theme_selection: ThemeSelection = content.theme.clone().unwrap().into();
-        let icon_theme_selection: IconThemeSelection = content.icon_theme.clone().unwrap().into();
-        Self {
-            ui_font_size: clamp_font_size(content.ui_font_size.unwrap().into()),
-            ui_font: Font {
-                family: content.ui_font_family.as_ref().unwrap().0.clone().into(),
-                features: content.ui_font_features.clone().unwrap(),
-                fallbacks: font_fallbacks_from_settings(content.ui_font_fallbacks.clone()),
-                weight: clamp_font_weight(content.ui_font_weight.unwrap().0),
-                style: Default::default(),
-            },
-            buffer_font: Font {
-                family: content
-                    .buffer_font_family
-                    .as_ref()
-                    .unwrap()
-                    .0
-                    .clone()
-                    .into(),
-                features: content.buffer_font_features.clone().unwrap(),
-                fallbacks: font_fallbacks_from_settings(content.buffer_font_fallbacks.clone()),
-                weight: clamp_font_weight(content.buffer_font_weight.unwrap().0),
-                style: FontStyle::default(),
-            },
-            buffer_font_size: clamp_font_size(content.buffer_font_size.unwrap().into()),
-            buffer_line_height: content.buffer_line_height.unwrap().into(),
-            agent_ui_font_size: content.agent_ui_font_size.map(Into::into),
-            agent_buffer_font_size: content.agent_buffer_font_size.map(Into::into),
-            theme: theme_selection,
-            experimental_theme_overrides: content.experimental_theme_overrides.clone(),
-            theme_overrides: content.theme_overrides.clone(),
-            icon_theme: icon_theme_selection,
-            ui_density: content.ui_density.unwrap_or_default().into(),
-            unnecessary_code_fade: content.unnecessary_code_fade.unwrap().0.clamp(0.0, 0.9),
-        }
-    }
-}
diff --git a/crates/theme/src/styles.rs b/crates/theme/src/styles.rs
deleted file mode 100644
index da22f8de1f..0000000000
--- a/crates/theme/src/styles.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-mod accents;
-mod colors;
-mod players;
-mod status;
-mod syntax;
-mod system;
-
-pub use accents::*;
-pub use colors::*;
-pub use players::*;
-pub use status::*;
-pub use syntax::*;
-pub use system::*;
diff --git a/crates/theme/src/styles/accents.rs b/crates/theme/src/styles/accents.rs
deleted file mode 100644
index 49ae755bf8..0000000000
--- a/crates/theme/src/styles/accents.rs
+++ /dev/null
@@ -1,88 +0,0 @@
-use gpui::Hsla;
-use serde::Deserialize;
-
-use crate::{
-    amber, blue, cyan, gold, grass, indigo, iris, jade, lime, orange, pink, purple, tomato,
-    try_parse_color,
-};
-
-/// A collection of colors that are used to color indent aware lines in the editor.
-#[derive(Clone, Debug, Deserialize, PartialEq)]
-pub struct AccentColors(pub Vec<Hsla>);
-
-impl Default for AccentColors {
-    /// Don't use this!
-    /// We have to have a default to be `[refineable::Refinable]`.
-    /// TODO "Find a way to not need this for Refinable"
-    fn default() -> Self {
-        Self::dark()
-    }
-}
-
-impl AccentColors {
-    /// Returns the set of dark accent colors.
-    pub fn dark() -> Self {
-        Self(vec![
-            blue().dark().step_9(),
-            orange().dark().step_9(),
-            pink().dark().step_9(),
-            lime().dark().step_9(),
-            purple().dark().step_9(),
-            amber().dark().step_9(),
-            jade().dark().step_9(),
-            tomato().dark().step_9(),
-            cyan().dark().step_9(),
-            gold().dark().step_9(),
-            grass().dark().step_9(),
-            indigo().dark().step_9(),
-            iris().dark().step_9(),
-        ])
-    }
-
-    /// Returns the set of light accent colors.
-    pub fn light() -> Self {
-        Self(vec![
-            blue().light().step_9(),
-            orange().light().step_9(),
-            pink().light().step_9(),
-            lime().light().step_9(),
-            purple().light().step_9(),
-            amber().light().step_9(),
-            jade().light().step_9(),
-            tomato().light().step_9(),
-            cyan().light().step_9(),
-            gold().light().step_9(),
-            grass().light().step_9(),
-            indigo().light().step_9(),
-            iris().light().step_9(),
-        ])
-    }
-}
-
-impl AccentColors {
-    /// Returns the color for the given index.
-    pub fn color_for_index(&self, index: u32) -> Hsla {
-        self.0[index as usize % self.0.len()]
-    }
-
-    /// Merges the given accent colors into this [`AccentColors`] instance.
-    pub fn merge(&mut self, accent_colors: &[settings::AccentContent]) {
-        if accent_colors.is_empty() {
-            return;
-        }
-
-        let colors = accent_colors
-            .iter()
-            .filter_map(|accent_color| {
-                accent_color
-                    .0
-                    .as_ref()
-                    .and_then(|color| try_parse_color(color).ok())
-            })
-            .collect::<Vec<_>>();
-
-        if !colors.is_empty() {
-            self.0 = colors;
-        }
-    }
-}
diff --git a/crates/theme/src/styles/colors.rs b/crates/theme/src/styles/colors.rs
deleted file mode 100644
index 905f2245e0..0000000000
--- a/crates/theme/src/styles/colors.rs
+++ /dev/null
@@ -1,655 +0,0 @@
-#![allow(missing_docs)]
-
-use gpui::{App, Hsla, SharedString, WindowBackgroundAppearance};
-use refineable::Refineable;
-use std::sync::Arc;
-use strum::{AsRefStr, EnumIter, IntoEnumIterator};
-
-use crate::{
-    AccentColors, ActiveTheme, PlayerColors, StatusColors, StatusColorsRefinement, SyntaxTheme,
-    SystemColors,
-};
-
-#[derive(Refineable, Clone, Debug, PartialEq)]
-#[refineable(Debug, serde::Deserialize)]
-pub struct ThemeColors {
-    /// Border color. Used for most borders, is usually a high contrast color.
-    pub border: Hsla,
-    /// Border color. Used for deemphasized borders, like a visual divider between two sections
-    pub border_variant: Hsla,
-    /// Border color. Used for focused elements, like keyboard focused list item.
-    pub border_focused: Hsla,
-    /// Border color. Used for selected elements, like an active search filter or selected checkbox.
-    pub border_selected: Hsla,
-    /// Border color. Used for transparent borders. Used for placeholder borders when an element gains a border on state change.
-    pub border_transparent: Hsla,
-    /// Border color. Used for disabled elements, like a disabled input or button.
-    pub border_disabled: Hsla,
-    /// Border color. Used for elevated surfaces, like a context menu, popup, or dialog.
-    pub elevated_surface_background: Hsla,
-    /// Background Color. Used for grounded surfaces like a panel or tab.
-    pub surface_background: Hsla,
-    /// Background Color. Used for the app background and blank panels or windows.
-    pub background: Hsla,
-    /// Background Color. Used for the background of an element that should have a different background than the surface it's on.
-    ///
-    /// Elements might include: Buttons, Inputs, Checkboxes, Radio Buttons...
-    ///
-    /// For an element that should have the same background as the surface it's on, use `ghost_element_background`.
-    pub element_background: Hsla,
-    /// Background Color. Used for the hover state of an element that should have a different background than the surface it's on.
-    ///
-    /// Hover states are triggered by the mouse entering an element, or a finger touching an element on a touch screen.
-    pub element_hover: Hsla,
-    /// Background Color. Used for the active state of an element that should have a different background than the surface it's on.
-    ///
-    /// Active states are triggered by the mouse button being pressed down on an element, or the Return button or other activator being pressed.
-    pub element_active: Hsla,
-    /// Background Color. Used for the selected state of an element that should have a different background than the surface it's on.
-    ///
-    /// Selected states are triggered by the element being selected (or "activated") by the user.
-    ///
-    /// This could include a selected checkbox, a toggleable button that is toggled on, etc.
-    pub element_selected: Hsla,
-    /// Background Color. Used for the background of selections in a UI element.
-    pub element_selection_background: Hsla,
-    /// Background Color. Used for the disabled state of an element that should have a different background than the surface it's on.
-    ///
-    /// Disabled states are shown when a user cannot interact with an element, like a disabled button or input.
-    pub element_disabled: Hsla,
-    /// Background Color. Used for the area that shows where a dragged element will be dropped.
-    pub drop_target_background: Hsla,
-    /// Border Color. Used for the border that shows where a dragged element will be dropped.
-    pub drop_target_border: Hsla,
-    /// Used for the background of a ghost element that should have the same background as the surface it's on.
-    ///
-    /// Elements might include: Buttons, Inputs, Checkboxes, Radio Buttons...
-    ///
-    /// For an element that should have a different background than the surface it's on, use `element_background`.
-    pub ghost_element_background: Hsla,
-    /// Background Color. Used for the hover state of a ghost element that should have the same background as the surface it's on.
-    ///
-    /// Hover states are triggered by the mouse entering an element, or a finger touching an element on a touch screen.
-    pub ghost_element_hover: Hsla,
-    /// Background Color. Used for the active state of a ghost element that should have the same background as the surface it's on.
-    ///
-    /// Active states are triggered by the mouse button being pressed down on an element, or the Return button or other activator being pressed.
-    pub ghost_element_active: Hsla,
-    /// Background Color. Used for the selected state of a ghost element that should have the same background as the surface it's on.
-    ///
-    /// Selected states are triggered by the element being selected (or "activated") by the user.
-    ///
-    /// This could include a selected checkbox, a toggleable button that is toggled on, etc.
-    pub ghost_element_selected: Hsla,
-    /// Background Color. Used for the disabled state of a ghost element that should have the same background as the surface it's on.
-    ///
-    /// Disabled states are shown when a user cannot interact with an element, like a disabled button or input.
-    pub ghost_element_disabled: Hsla,
-    /// Text Color. Default text color used for most text.
-    pub text: Hsla,
-    /// Text Color. Color of muted or deemphasized text. It is a subdued version of the standard text color.
-    pub text_muted: Hsla,
-    /// Text Color. Color of the placeholder text typically shown in input fields to guide the user to enter valid data.
-    pub text_placeholder: Hsla,
-    /// Text Color. Color used for text denoting disabled elements. Typically, the color is faded or grayed out to emphasize the disabled state.
-    pub text_disabled: Hsla,
-    /// Text Color. Color used for emphasis or highlighting certain text, like an active filter or a matched character in a search.
-    pub text_accent: Hsla,
-    /// Fill Color. Used for the default fill color of an icon.
-    pub icon: Hsla,
-    /// Fill Color. Used for the muted or deemphasized fill color of an icon.
-    ///
-    /// This might be used to show an icon in an inactive pane, or to deemphasize a series of icons to give them less visual weight.
-    pub icon_muted: Hsla,
-    /// Fill Color. Used for the disabled fill color of an icon.
-    ///
-    /// Disabled states are shown when a user cannot interact with an element, like a icon button.
-    pub icon_disabled: Hsla,
-    /// Fill Color. Used for the placeholder fill color of an icon.
-    ///
-    /// This might be used to show an icon in an input that disappears when the user enters text.
-    pub icon_placeholder: Hsla,
-    /// Fill Color. Used for the accent fill color of an icon.
-    ///
-    /// This might be used to show when a toggleable icon button is selected.
-    pub icon_accent: Hsla,
-    /// Color used to accent some debugger elements
-    /// Is used by breakpoints
-    pub debugger_accent: Hsla,
-
-    // ===
-    // UI Elements
-    // ===
-    pub status_bar_background: Hsla,
-    pub title_bar_background: Hsla,
-    pub title_bar_inactive_background: Hsla,
-    pub toolbar_background: Hsla,
-    pub tab_bar_background: Hsla,
-    pub tab_inactive_background: Hsla,
-    pub tab_active_background: Hsla,
-    pub search_match_background: Hsla,
-    pub search_active_match_background: Hsla,
-    pub panel_background: Hsla,
-    pub panel_focused_border: Hsla,
-    pub panel_indent_guide: Hsla,
-    pub panel_indent_guide_hover: Hsla,
-    pub panel_indent_guide_active: Hsla,
-
-    /// The color of the overlay surface on top of panel.
-    pub panel_overlay_background: Hsla,
-    /// The color of the overlay surface on top of panel when hovered over.
-    pub panel_overlay_hover: Hsla,
-
-    pub pane_focused_border: Hsla,
-    pub pane_group_border: Hsla,
-    /// The color of the scrollbar thumb.
-    pub scrollbar_thumb_background: Hsla,
-    /// The color of the scrollbar thumb when hovered over.
-    pub scrollbar_thumb_hover_background: Hsla,
-    /// The color of the scrollbar thumb whilst being actively dragged.
-    pub scrollbar_thumb_active_background: Hsla,
-    /// The border color of the scrollbar thumb.
-    pub scrollbar_thumb_border: Hsla,
-    /// The background color of the scrollbar track.
-    pub scrollbar_track_background: Hsla,
-    /// The border color of the scrollbar track.
-    pub scrollbar_track_border: Hsla,
-    /// The color of the minimap thumb.
-    pub minimap_thumb_background: Hsla,
-    /// The color of the minimap thumb when hovered over.
-    pub minimap_thumb_hover_background: Hsla,
-    /// The color of the minimap thumb whilst being actively dragged.
-    pub minimap_thumb_active_background: Hsla,
-    /// The border color of the minimap thumb.
-    pub minimap_thumb_border: Hsla,
-
-    /// Background color for Vim Normal mode indicator.
-    pub vim_normal_background: Hsla,
-    /// Background color for Vim Insert mode indicator.
-    pub vim_insert_background: Hsla,
-    /// Background color for Vim Replace mode indicator.
-    pub vim_replace_background: Hsla,
-    /// Background color for Vim Visual mode indicator.
-    pub vim_visual_background: Hsla,
-    /// Background color for Vim Visual Line mode indicator.
-    pub vim_visual_line_background: Hsla,
-    /// Background color for Vim Visual Block mode indicator.
-    pub vim_visual_block_background: Hsla,
-    /// Background color for Vim Helix Normal mode indicator.
-    pub vim_helix_normal_background: Hsla,
-    /// Background color for Vim Helix Select mode indicator.
-    pub vim_helix_select_background: Hsla,
-    /// Text color for Vim mode indicator label.
-    pub vim_mode_text: Hsla,
-
-    // ===
-    // Editor
-    // ===
-    pub editor_foreground: Hsla,
-    pub editor_background: Hsla,
-    pub editor_gutter_background: Hsla,
-    pub editor_subheader_background: Hsla,
-    pub editor_active_line_background: Hsla,
-    pub editor_highlighted_line_background: Hsla,
-    /// Line color of the line a debugger is currently stopped at
-    pub editor_debugger_active_line_background: Hsla,
-    /// Text Color. Used for the text of the line number in the editor gutter.
-    pub editor_line_number: Hsla,
-    /// Text Color. Used for the text of the line number in the editor gutter when the line is highlighted.
-    pub editor_active_line_number: Hsla,
-    /// Text Color. Used for the text of the line number in the editor gutter when the line is hovered over.
-    pub editor_hover_line_number: Hsla,
-    /// Text Color. Used to mark invisible characters in the editor.
-    ///
-    /// Example: spaces, tabs, carriage returns, etc.
-    pub editor_invisible: Hsla,
-    pub editor_wrap_guide: Hsla,
-    pub editor_active_wrap_guide: Hsla,
-    pub editor_indent_guide: Hsla,
-    pub editor_indent_guide_active: Hsla,
-    /// Read-access of a symbol, like reading a variable.
-    ///
-    /// A document highlight is a range inside a text document which deserves
-    /// special attention. Usually a document highlight is visualized by changing
-    /// the background color of its range.
-    pub editor_document_highlight_read_background: Hsla,
-    /// Read-access of a symbol, like reading a variable.
-    ///
-    /// A document highlight is a range inside a text document which deserves
-    /// special attention. Usually a document highlight is visualized by changing
-    /// the background color of its range.
-    pub editor_document_highlight_write_background: Hsla,
-    /// Highlighted brackets background color.
-    ///
-    /// Matching brackets in the cursor scope are highlighted with this background color.
-    pub editor_document_highlight_bracket_background: Hsla,
-
-    // ===
-    // Terminal
-    // ===
-    /// Terminal layout background color.
-    pub terminal_background: Hsla,
-    /// Terminal foreground color.
-    pub terminal_foreground: Hsla,
-    /// Bright terminal foreground color.
-    pub terminal_bright_foreground: Hsla,
-    /// Dim terminal foreground color.
-    pub terminal_dim_foreground: Hsla,
-    /// Terminal ANSI background color.
-    pub terminal_ansi_background: Hsla,
-    /// Black ANSI terminal color.
-    pub terminal_ansi_black: Hsla,
-    /// Bright black ANSI terminal color.
-    pub terminal_ansi_bright_black: Hsla,
-    /// Dim black ANSI terminal color.
-    pub terminal_ansi_dim_black: Hsla,
-    /// Red ANSI terminal color.
-    pub terminal_ansi_red: Hsla,
-    /// Bright red ANSI terminal color.
-    pub terminal_ansi_bright_red: Hsla,
-    /// Dim red ANSI terminal color.
-    pub terminal_ansi_dim_red: Hsla,
-    /// Green ANSI terminal color.
-    pub terminal_ansi_green: Hsla,
-    /// Bright green ANSI terminal color.
-    pub terminal_ansi_bright_green: Hsla,
-    /// Dim green ANSI terminal color.
-    pub terminal_ansi_dim_green: Hsla,
-    /// Yellow ANSI terminal color.
-    pub terminal_ansi_yellow: Hsla,
-    /// Bright yellow ANSI terminal color.
-    pub terminal_ansi_bright_yellow: Hsla,
-    /// Dim yellow ANSI terminal color.
-    pub terminal_ansi_dim_yellow: Hsla,
-    /// Blue ANSI terminal color.
-    pub terminal_ansi_blue: Hsla,
-    /// Bright blue ANSI terminal color.
-    pub terminal_ansi_bright_blue: Hsla,
-    /// Dim blue ANSI terminal color.
-    pub terminal_ansi_dim_blue: Hsla,
-    /// Magenta ANSI terminal color.
-    pub terminal_ansi_magenta: Hsla,
-    /// Bright magenta ANSI terminal color.
-    pub terminal_ansi_bright_magenta: Hsla,
-    /// Dim magenta ANSI terminal color.
-    pub terminal_ansi_dim_magenta: Hsla,
-    /// Cyan ANSI terminal color.
-    pub terminal_ansi_cyan: Hsla,
-    /// Bright cyan ANSI terminal color.
-    pub terminal_ansi_bright_cyan: Hsla,
-    /// Dim cyan ANSI terminal color.
-    pub terminal_ansi_dim_cyan: Hsla,
-    /// White ANSI terminal color.
-    pub terminal_ansi_white: Hsla,
-    /// Bright white ANSI terminal color.
-    pub terminal_ansi_bright_white: Hsla,
-    /// Dim white ANSI terminal color.
-    pub terminal_ansi_dim_white: Hsla,
-
-    /// Represents a link text hover color.
-    pub link_text_hover: Hsla,
-
-    /// Represents an added entry or hunk in vcs, like git.
-    pub version_control_added: Hsla,
-    /// Represents a deleted entry in version control systems.
-    pub version_control_deleted: Hsla,
-    /// Represents a modified entry in version control systems.
-    pub version_control_modified: Hsla,
-    /// Represents a renamed entry in version control systems.
-    pub version_control_renamed: Hsla,
-    /// Represents a conflicting entry in version control systems.
-    pub version_control_conflict: Hsla,
-    /// Represents an ignored entry in version control systems.
-    pub version_control_ignored: Hsla,
-    /// Represents an added word in a word diff.
-    pub version_control_word_added: Hsla,
-    /// Represents a deleted word in a word diff.
-    pub version_control_word_deleted: Hsla,
-    /// Represents the "ours" region of a merge conflict.
-    pub version_control_conflict_marker_ours: Hsla,
-    /// Represents the "theirs" region of a merge conflict.
-    pub version_control_conflict_marker_theirs: Hsla,
-}
-
-#[derive(EnumIter, Debug, Clone, Copy, AsRefStr)]
-#[strum(serialize_all = "snake_case")]
-pub enum ThemeColorField {
-    Border,
-    BorderVariant,
-    BorderFocused,
-    BorderSelected,
-    BorderTransparent,
-    BorderDisabled,
-    ElevatedSurfaceBackground,
-    SurfaceBackground,
-    Background,
-    ElementBackground,
-    ElementHover,
-    ElementActive,
-    ElementSelected,
-    ElementDisabled,
-    DropTargetBackground,
-    DropTargetBorder,
-    GhostElementBackground,
-    GhostElementHover,
-    GhostElementActive,
-    GhostElementSelected,
-    GhostElementDisabled,
-    Text,
-    TextMuted,
-    TextPlaceholder,
-    TextDisabled,
-    TextAccent,
-    Icon,
-    IconMuted,
-    IconDisabled,
-    IconPlaceholder,
-    IconAccent,
-    StatusBarBackground,
-    TitleBarBackground,
-    TitleBarInactiveBackground,
-    ToolbarBackground,
-    TabBarBackground,
-    TabInactiveBackground,
-    TabActiveBackground,
-    SearchMatchBackground,
-    SearchActiveMatchBackground,
-    PanelBackground,
-    PanelFocusedBorder,
-    PanelIndentGuide,
-    PanelIndentGuideHover,
-    PanelIndentGuideActive,
-    PanelOverlayBackground,
-    PanelOverlayHover,
-    PaneFocusedBorder,
-    PaneGroupBorder,
-    ScrollbarThumbBackground,
-    ScrollbarThumbHoverBackground,
-    ScrollbarThumbActiveBackground,
-    ScrollbarThumbBorder,
-    ScrollbarTrackBackground,
-    ScrollbarTrackBorder,
-    MinimapThumbBackground,
-    MinimapThumbHoverBackground,
-    MinimapThumbActiveBackground,
-    MinimapThumbBorder,
-    EditorForeground,
-    EditorBackground,
-    EditorGutterBackground,
-    EditorSubheaderBackground,
-    EditorActiveLineBackground,
-    EditorHighlightedLineBackground,
-    EditorLineNumber,
-    EditorActiveLineNumber,
-    EditorInvisible,
-    EditorWrapGuide,
-    EditorActiveWrapGuide,
-    EditorIndentGuide,
-    EditorIndentGuideActive,
-    EditorDocumentHighlightReadBackground,
-    EditorDocumentHighlightWriteBackground,
-    EditorDocumentHighlightBracketBackground,
-    TerminalBackground,
-    TerminalForeground,
-    TerminalBrightForeground,
-    TerminalDimForeground,
-    TerminalAnsiBackground,
-    TerminalAnsiBlack,
-    TerminalAnsiBrightBlack,
-    TerminalAnsiDimBlack,
-    TerminalAnsiRed,
-    TerminalAnsiBrightRed,
-    TerminalAnsiDimRed,
-    TerminalAnsiGreen,
-    TerminalAnsiBrightGreen,
-    TerminalAnsiDimGreen,
-    TerminalAnsiYellow,
-    TerminalAnsiBrightYellow,
-    TerminalAnsiDimYellow,
-    TerminalAnsiBlue,
-    TerminalAnsiBrightBlue,
-    TerminalAnsiDimBlue,
-    TerminalAnsiMagenta,
-    TerminalAnsiBrightMagenta,
-    TerminalAnsiDimMagenta,
-    TerminalAnsiCyan,
-    TerminalAnsiBrightCyan,
-    TerminalAnsiDimCyan,
-    TerminalAnsiWhite,
-    TerminalAnsiBrightWhite,
-    TerminalAnsiDimWhite,
-    LinkTextHover,
-    VersionControlAdded,
-    VersionControlDeleted,
-    VersionControlModified,
-    VersionControlRenamed,
-    VersionControlConflict,
-    VersionControlIgnored,
-}
-
-impl ThemeColors {
-    pub fn color(&self, field: ThemeColorField) -> Hsla {
-        match field {
-            ThemeColorField::Border => self.border,
-            ThemeColorField::BorderVariant => self.border_variant,
-            ThemeColorField::BorderFocused => self.border_focused,
-            ThemeColorField::BorderSelected => self.border_selected,
-            ThemeColorField::BorderTransparent => self.border_transparent,
-            ThemeColorField::BorderDisabled => self.border_disabled,
-            ThemeColorField::ElevatedSurfaceBackground => self.elevated_surface_background,
-            ThemeColorField::SurfaceBackground => self.surface_background,
-            ThemeColorField::Background => self.background,
-            ThemeColorField::ElementBackground => self.element_background,
-            ThemeColorField::ElementHover => self.element_hover,
-            ThemeColorField::ElementActive => self.element_active,
-            ThemeColorField::ElementSelected => self.element_selected,
-            ThemeColorField::ElementDisabled => self.element_disabled,
-            ThemeColorField::DropTargetBackground => self.drop_target_background,
-            ThemeColorField::DropTargetBorder => self.drop_target_border,
-            ThemeColorField::GhostElementBackground => self.ghost_element_background,
-            ThemeColorField::GhostElementHover => self.ghost_element_hover,
-            ThemeColorField::GhostElementActive => self.ghost_element_active,
-            ThemeColorField::GhostElementSelected => self.ghost_element_selected,
-            ThemeColorField::GhostElementDisabled => self.ghost_element_disabled,
-            ThemeColorField::Text => self.text,
-            ThemeColorField::TextMuted => self.text_muted,
-            ThemeColorField::TextPlaceholder => self.text_placeholder,
-            ThemeColorField::TextDisabled => self.text_disabled,
-            ThemeColorField::TextAccent => self.text_accent,
-            ThemeColorField::Icon => self.icon,
-            ThemeColorField::IconMuted => self.icon_muted,
-            ThemeColorField::IconDisabled => self.icon_disabled,
-            ThemeColorField::IconPlaceholder => self.icon_placeholder,
-            ThemeColorField::IconAccent => self.icon_accent,
-            ThemeColorField::StatusBarBackground => self.status_bar_background,
-            ThemeColorField::TitleBarBackground => self.title_bar_background,
-            ThemeColorField::TitleBarInactiveBackground => self.title_bar_inactive_background,
-            ThemeColorField::ToolbarBackground => self.toolbar_background,
-            ThemeColorField::TabBarBackground => self.tab_bar_background,
-            ThemeColorField::TabInactiveBackground => self.tab_inactive_background,
-            ThemeColorField::TabActiveBackground => self.tab_active_background,
-            ThemeColorField::SearchMatchBackground => self.search_match_background,
-            ThemeColorField::SearchActiveMatchBackground => self.search_active_match_background,
-            ThemeColorField::PanelBackground => self.panel_background,
-            ThemeColorField::PanelFocusedBorder => self.panel_focused_border,
-            ThemeColorField::PanelIndentGuide => self.panel_indent_guide,
-            ThemeColorField::PanelIndentGuideHover => self.panel_indent_guide_hover,
-            ThemeColorField::PanelIndentGuideActive => self.panel_indent_guide_active,
-            ThemeColorField::PanelOverlayBackground => self.panel_overlay_background,
-            ThemeColorField::PanelOverlayHover => self.panel_overlay_hover,
-            ThemeColorField::PaneFocusedBorder => self.pane_focused_border,
-            ThemeColorField::PaneGroupBorder => self.pane_group_border,
-            ThemeColorField::ScrollbarThumbBackground => self.scrollbar_thumb_background,
-            ThemeColorField::ScrollbarThumbHoverBackground => self.scrollbar_thumb_hover_background,
-            ThemeColorField::ScrollbarThumbActiveBackground => {
-                self.scrollbar_thumb_active_background
-            }
-            ThemeColorField::ScrollbarThumbBorder => self.scrollbar_thumb_border,
-            ThemeColorField::ScrollbarTrackBackground => self.scrollbar_track_background,
-            ThemeColorField::ScrollbarTrackBorder => self.scrollbar_track_border,
-            ThemeColorField::MinimapThumbBackground => self.minimap_thumb_background,
-            ThemeColorField::MinimapThumbHoverBackground => self.minimap_thumb_hover_background,
-            ThemeColorField::MinimapThumbActiveBackground => self.minimap_thumb_active_background,
-            ThemeColorField::MinimapThumbBorder => self.minimap_thumb_border,
-            ThemeColorField::EditorForeground => self.editor_foreground,
-            ThemeColorField::EditorBackground => self.editor_background,
-            ThemeColorField::EditorGutterBackground => self.editor_gutter_background,
-            ThemeColorField::EditorSubheaderBackground => self.editor_subheader_background,
-            ThemeColorField::EditorActiveLineBackground => self.editor_active_line_background,
-            ThemeColorField::EditorHighlightedLineBackground => {
-                self.editor_highlighted_line_background
-            }
-            ThemeColorField::EditorLineNumber => self.editor_line_number,
-            ThemeColorField::EditorActiveLineNumber => self.editor_active_line_number,
-            ThemeColorField::EditorInvisible => self.editor_invisible,
-            ThemeColorField::EditorWrapGuide => self.editor_wrap_guide,
-            ThemeColorField::EditorActiveWrapGuide => self.editor_active_wrap_guide,
-            ThemeColorField::EditorIndentGuide => self.editor_indent_guide,
-            ThemeColorField::EditorIndentGuideActive => self.editor_indent_guide_active,
-            ThemeColorField::EditorDocumentHighlightReadBackground => {
-                self.editor_document_highlight_read_background
-            }
-            ThemeColorField::EditorDocumentHighlightWriteBackground => {
-                self.editor_document_highlight_write_background
-            }
-            ThemeColorField::EditorDocumentHighlightBracketBackground => {
-                self.editor_document_highlight_bracket_background
-            }
-            ThemeColorField::TerminalBackground => self.terminal_background,
-            ThemeColorField::TerminalForeground => self.terminal_foreground,
-            ThemeColorField::TerminalBrightForeground => self.terminal_bright_foreground,
-            ThemeColorField::TerminalDimForeground => self.terminal_dim_foreground,
-            ThemeColorField::TerminalAnsiBackground => self.terminal_ansi_background,
-            ThemeColorField::TerminalAnsiBlack => self.terminal_ansi_black,
-            ThemeColorField::TerminalAnsiBrightBlack => self.terminal_ansi_bright_black,
-            ThemeColorField::TerminalAnsiDimBlack => self.terminal_ansi_dim_black,
-            ThemeColorField::TerminalAnsiRed => self.terminal_ansi_red,
-            ThemeColorField::TerminalAnsiBrightRed => self.terminal_ansi_bright_red,
-            ThemeColorField::TerminalAnsiDimRed => self.terminal_ansi_dim_red,
-            ThemeColorField::TerminalAnsiGreen => self.terminal_ansi_green,
-            ThemeColorField::TerminalAnsiBrightGreen => self.terminal_ansi_bright_green,
-            ThemeColorField::TerminalAnsiDimGreen => self.terminal_ansi_dim_green,
-            ThemeColorField::TerminalAnsiYellow => self.terminal_ansi_yellow,
-            ThemeColorField::TerminalAnsiBrightYellow => self.terminal_ansi_bright_yellow,
-            ThemeColorField::TerminalAnsiDimYellow => self.terminal_ansi_dim_yellow,
-            ThemeColorField::TerminalAnsiBlue => self.terminal_ansi_blue,
-            ThemeColorField::TerminalAnsiBrightBlue => self.terminal_ansi_bright_blue,
-            ThemeColorField::TerminalAnsiDimBlue => self.terminal_ansi_dim_blue,
-            ThemeColorField::TerminalAnsiMagenta => self.terminal_ansi_magenta,
-            ThemeColorField::TerminalAnsiBrightMagenta => self.terminal_ansi_bright_magenta,
-            ThemeColorField::TerminalAnsiDimMagenta => self.terminal_ansi_dim_magenta,
-            ThemeColorField::TerminalAnsiCyan => self.terminal_ansi_cyan,
-            ThemeColorField::TerminalAnsiBrightCyan => self.terminal_ansi_bright_cyan,
-            ThemeColorField::TerminalAnsiDimCyan => self.terminal_ansi_dim_cyan,
-            ThemeColorField::TerminalAnsiWhite => self.terminal_ansi_white,
-            ThemeColorField::TerminalAnsiBrightWhite => self.terminal_ansi_bright_white,
-            ThemeColorField::TerminalAnsiDimWhite => self.terminal_ansi_dim_white,
-            ThemeColorField::LinkTextHover => self.link_text_hover,
-            ThemeColorField::VersionControlAdded => self.version_control_added,
-            ThemeColorField::VersionControlDeleted => self.version_control_deleted,
-            ThemeColorField::VersionControlModified => self.version_control_modified,
-            ThemeColorField::VersionControlRenamed => self.version_control_renamed,
-            ThemeColorField::VersionControlConflict => self.version_control_conflict,
-            ThemeColorField::VersionControlIgnored => self.version_control_ignored,
-        }
-    }
-
-    pub fn iter(&self) -> impl Iterator<Item = (ThemeColorField, Hsla)> + '_ {
-        ThemeColorField::iter().map(move |field| (field, self.color(field)))
-    }
-
-    pub fn to_vec(&self) -> Vec<(ThemeColorField, Hsla)> {
-        self.iter().collect()
-    }
-}
-
-pub fn all_theme_colors(cx: &mut App) -> Vec<(Hsla, SharedString)> {
-    let theme = cx.theme();
-    ThemeColorField::iter()
-        .map(|field| {
-            let color = theme.colors().color(field);
-            let name = field.as_ref().to_string();
-            (color, SharedString::from(name))
-        })
-        .collect()
-}
-
-#[derive(Refineable, Clone, Debug, PartialEq)]
-pub struct ThemeStyles {
-    /// The background appearance of the window.
-    pub window_background_appearance: WindowBackgroundAppearance,
-    pub system: SystemColors,
-    /// An array of colors used for theme elements that iterate through a series of colors.
-    ///
-    /// Example: Player colors, rainbow brackets and indent guides, etc.
-    pub accents: AccentColors,
-
-    #[refineable]
-    pub colors: ThemeColors,
-
-    #[refineable]
-    pub status: StatusColors,
-
-    pub player: PlayerColors,
-
-    pub syntax: Arc<SyntaxTheme>,
-}
-
-#[cfg(test)]
-mod tests {
-    use serde_json::json;
-
-    use super::*;
-
-    #[test]
-    fn override_a_single_theme_color() {
-        let mut colors = ThemeColors::light();
-
-        let magenta: Hsla = gpui::rgb(0xff00ff).into();
-
-        assert_ne!(colors.text, magenta);
-
-        let overrides = ThemeColorsRefinement {
-            text: Some(magenta),
-            ..Default::default()
-        };
-
-        colors.refine(&overrides);
-
-        assert_eq!(colors.text, magenta);
-    }
-
-    #[test]
-    fn override_multiple_theme_colors() {
-        let mut colors = ThemeColors::light();
-
-        let magenta: Hsla = gpui::rgb(0xff00ff).into();
-        let green: Hsla = gpui::rgb(0x00ff00).into();
-
-        assert_ne!(colors.text, magenta);
-        assert_ne!(colors.background, green);
-
-        let overrides = ThemeColorsRefinement {
-            text: Some(magenta),
-            background: Some(green),
-            ..Default::default()
-        };
-
-        colors.refine(&overrides);
-
-        assert_eq!(colors.text, magenta);
-        assert_eq!(colors.background, green);
-    }
-
-    #[test]
-    fn deserialize_theme_colors_refinement_from_json() {
-        let colors: ThemeColorsRefinement = serde_json::from_value(json!({
-            "background": "#ff00ff",
-            "text": "#ff0000"
-        }))
-        .unwrap();
-
-        assert_eq!(colors.background, Some(gpui::rgb(0xff00ff).into()));
-        assert_eq!(colors.text, Some(gpui::rgb(0xff0000).into()));
-    }
-}
diff --git a/crates/theme/src/styles/players.rs b/crates/theme/src/styles/players.rs
deleted file mode 100644
index 439dbdd437..0000000000
--- a/crates/theme/src/styles/players.rs
+++ /dev/null
@@ -1,187 +0,0 @@
-#![allow(missing_docs)]
-
-use gpui::Hsla;
-use serde::Deserialize;
-
-use crate::{amber, blue, jade, lime, orange, pink, purple, red, try_parse_color};
-
-#[derive(Debug, Clone, Copy, Deserialize, Default, PartialEq)]
-pub struct PlayerColor {
-    pub cursor: Hsla,
-    pub background: Hsla,
-    pub selection: Hsla,
-}
-
-/// A collection of colors that are used to color players in the editor.
-///
-/// The first color is always the local player's color, usually a blue.
-///
-/// The rest of the default colors crisscross back and forth on the
-/// color wheel so that the colors are as distinct as possible.
-#[derive(Clone, Debug, Deserialize, PartialEq)]
-pub struct PlayerColors(pub Vec<PlayerColor>);
-
-impl Default for PlayerColors {
-    /// Don't use this!
-    /// We have to have a default to be `[refineable::Refinable]`.
-    /// TODO "Find a way to not need this for Refinable"
-    fn default() -> Self {
-        Self::dark()
-    }
-}
-
-impl PlayerColors {
-    pub fn dark() -> Self {
-        Self(vec![
-            PlayerColor {
-                cursor: blue().dark().step_9(),
-                background: blue().dark().step_5(),
-                selection: blue().dark().step_3(),
-            },
-            PlayerColor {
-                cursor: orange().dark().step_9(),
-                background: orange().dark().step_5(),
-                selection: orange().dark().step_3(),
-            },
-            PlayerColor {
-                cursor: pink().dark().step_9(),
-                background: pink().dark().step_5(),
-                selection: pink().dark().step_3(),
-            },
-            PlayerColor {
-                cursor: lime().dark().step_9(),
-                background: lime().dark().step_5(),
-                selection: lime().dark().step_3(),
-            },
-            PlayerColor {
-                cursor: purple().dark().step_9(),
-                background: purple().dark().step_5(),
-                selection: purple().dark().step_3(),
-            },
-            PlayerColor {
-                cursor: amber().dark().step_9(),
-                background: amber().dark().step_5(),
-                selection: amber().dark().step_3(),
-            },
-            PlayerColor {
-                cursor: jade().dark().step_9(),
-                background: jade().dark().step_5(),
-                selection: jade().dark().step_3(),
-            },
-            PlayerColor {
-                cursor: red().dark().step_9(),
-                background: red().dark().step_5(),
-                selection: red().dark().step_3(),
-            },
-        ])
-    }
-
-    pub fn light() -> Self {
-        Self(vec![
-            PlayerColor {
-                cursor: blue().light().step_9(),
-                background: blue().light().step_4(),
-                selection: blue().light().step_3(),
-            },
-            PlayerColor {
-                cursor: orange().light().step_9(),
-                background: orange().light().step_4(),
-                selection: orange().light().step_3(),
-            },
-            PlayerColor {
-                cursor: pink().light().step_9(),
-                background: pink().light().step_4(),
-                selection: pink().light().step_3(),
-            },
-            PlayerColor {
-                cursor: lime().light().step_9(),
-                background: lime().light().step_4(),
-                selection: lime().light().step_3(),
-            },
-            PlayerColor {
-                cursor: purple().light().step_9(),
-                background: purple().light().step_4(),
-                selection: purple().light().step_3(),
-            },
-            PlayerColor {
-                cursor: amber().light().step_9(),
-                background: amber().light().step_4(),
-                selection: amber().light().step_3(),
-            },
-            PlayerColor {
-                cursor: jade().light().step_9(),
-                background: jade().light().step_4(),
-                selection: jade().light().step_3(),
-            },
-            PlayerColor {
-                cursor: red().light().step_9(),
-                background: red().light().step_4(),
-                selection: red().light().step_3(),
-            },
-        ])
-    }
-}
-
-impl PlayerColors {
-    pub fn local(&self) -> PlayerColor {
-        *self.0.first().unwrap()
-    }
-
-    pub fn agent(&self) -> PlayerColor {
-        *self.0.last().unwrap()
-    }
-
-    pub fn absent(&self) -> PlayerColor {
-        *self.0.last().unwrap()
-    }
-
-    pub fn read_only(&self) -> PlayerColor {
-        let local = self.local();
-        PlayerColor {
-            cursor: local.cursor.grayscale(),
-            background: local.background.grayscale(),
-            selection: local.selection.grayscale(),
-        }
-    }
-
-    pub fn color_for_participant(&self, participant_index: u32) -> PlayerColor {
-        let len = self.0.len() - 1;
-        self.0[(participant_index as usize % len) + 1]
-    }
-
-    /// Merges the given player colors into this [`PlayerColors`] instance.
-    pub fn merge(&mut self, user_player_colors: &[settings::PlayerColorContent]) {
-        if user_player_colors.is_empty() {
-            return;
-        }
-
-        for (idx, player) in user_player_colors.iter().enumerate() {
-            let cursor = player
-                .cursor
-                .as_ref()
-                .and_then(|color| try_parse_color(color).ok());
-            let background = player
-                .background
-                .as_ref()
-                .and_then(|color| try_parse_color(color).ok());
-            let selection = player
-                .selection
-                .as_ref()
-                .and_then(|color| try_parse_color(color).ok());
-
-            if let Some(player_color) = self.0.get_mut(idx) {
-                *player_color = PlayerColor {
-                    cursor: cursor.unwrap_or(player_color.cursor),
-                    background: background.unwrap_or(player_color.background),
-                    selection: selection.unwrap_or(player_color.selection),
-                };
-            } else {
-                self.0.push(PlayerColor {
-                    cursor: cursor.unwrap_or_default(),
-                    background: background.unwrap_or_default(),
-                    selection: selection.unwrap_or_default(),
-                });
-            }
-        }
-    }
-}
diff --git a/crates/theme/src/styles/status.rs b/crates/theme/src/styles/status.rs
deleted file mode 100644
index ab333ecb3e..0000000000
--- a/crates/theme/src/styles/status.rs
+++ /dev/null
@@ -1,191 +0,0 @@
-#![allow(missing_docs)]
-
-use gpui::Hsla;
-use refineable::Refineable;
-
-use crate::{blue, grass, neutral, red, yellow};
-
-#[derive(Refineable, Clone, Debug, PartialEq)]
-#[refineable(Debug, serde::Deserialize)]
-pub struct StatusColors {
-    /// Indicates some kind of conflict, like a file changed on disk while it was open, or
-    /// merge conflicts in a Git repository.
-    pub conflict: Hsla,
-    pub conflict_background: Hsla,
-    pub conflict_border: Hsla,
-
-    /// Indicates something new, like a new file added to a Git repository.
-    pub created: Hsla,
-    pub created_background: Hsla,
-    pub created_border: Hsla,
-
-    /// Indicates that something no longer exists, like a deleted file.
-    pub deleted: Hsla,
-    pub deleted_background: Hsla,
-    pub deleted_border: Hsla,
-
-    /// Indicates a system error, a failed operation or a diagnostic error.
-    pub error: Hsla,
-    pub error_background: Hsla,
-    pub error_border: Hsla,
-
-    /// Represents a hidden status, such as a file being hidden in a file tree.
-    pub hidden: Hsla,
-    pub hidden_background: Hsla,
-    pub hidden_border: Hsla,
-
-    /// Indicates a hint or some kind of additional information.
-    pub hint: Hsla,
-    pub hint_background: Hsla,
-    pub hint_border: Hsla,
-
-    /// Indicates that something is deliberately ignored, such as a file or operation ignored by Git.
-    pub ignored: Hsla,
-    pub ignored_background: Hsla,
-    pub ignored_border: Hsla,
-
-    /// Represents informational status updates or messages.
-    pub info: Hsla,
-    pub info_background: Hsla,
-    pub info_border: Hsla,
-
-    /// Indicates a changed or altered status, like a file that has been edited.
-    pub modified: Hsla,
-    pub modified_background: Hsla,
-    pub modified_border: Hsla,
-
-    /// Indicates something that is predicted, like automatic code completion, or generated code.
-    pub predictive: Hsla,
-    pub predictive_background: Hsla,
-    pub predictive_border: Hsla,
-
-    /// Represents a renamed status, such as a file that has been renamed.
-    pub renamed: Hsla,
-    pub renamed_background: Hsla,
-    pub renamed_border: Hsla,
-
-    /// Indicates a successful operation or task completion.
-    pub success: Hsla,
-    pub success_background: Hsla,
-    pub success_border: Hsla,
-
-    /// Indicates some kind of unreachable status, like a block of code that can never be reached.
-    pub unreachable: Hsla,
-    pub unreachable_background: Hsla,
-    pub unreachable_border: Hsla,
-
-    /// Represents a warning status, like an operation that is about to fail.
-    pub warning: Hsla,
-    pub warning_background: Hsla,
-    pub warning_border: Hsla,
-}
-
-pub struct DiagnosticColors {
-    pub error: Hsla,
-    pub warning: Hsla,
-    pub info: Hsla,
-}
-
-impl StatusColors {
-    pub fn dark() -> Self {
-        Self {
-            conflict: red().dark().step_9(),
-            conflict_background: red().dark().step_9(),
-            conflict_border: red().dark().step_9(),
-            created: grass().dark().step_9(),
-            created_background: grass().dark().step_9().opacity(0.25),
-            created_border: grass().dark().step_9(),
-            deleted: red().dark().step_9(),
-            deleted_background: red().dark().step_9().opacity(0.25),
-            deleted_border: red().dark().step_9(),
-            error: red().dark().step_9(),
-            error_background: red().dark().step_9(),
-            error_border: red().dark().step_9(),
-            hidden: neutral().dark().step_9(),
-            hidden_background: neutral().dark().step_9(),
-            hidden_border: neutral().dark().step_9(),
-            hint: blue().dark().step_9(),
-            hint_background: blue().dark().step_9(),
-            hint_border: blue().dark().step_9(),
-            ignored: neutral().dark().step_9(),
-            ignored_background: neutral().dark().step_9(),
-            ignored_border: neutral().dark().step_9(),
-            info: blue().dark().step_9(),
-            info_background: blue().dark().step_9(),
-            info_border: blue().dark().step_9(),
-            modified: yellow().dark().step_9(),
-            modified_background: yellow().dark().step_9().opacity(0.25),
-            modified_border: yellow().dark().step_9(),
-            predictive: neutral().dark_alpha().step_9(),
-            predictive_background: neutral().dark_alpha().step_9(),
-            predictive_border: neutral().dark_alpha().step_9(),
-            renamed: blue().dark().step_9(),
-            renamed_background: blue().dark().step_9(),
-            renamed_border: blue().dark().step_9(),
-            success: grass().dark().step_9(),
-            success_background: grass().dark().step_9(),
-            success_border: grass().dark().step_9(),
-            unreachable: neutral().dark().step_10(),
-            unreachable_background: neutral().dark().step_10(),
-            unreachable_border: neutral().dark().step_10(),
-            warning: yellow().dark().step_9(),
-            warning_background: yellow().dark().step_9(),
-            warning_border: yellow().dark().step_9(),
-        }
-    }
-
-    pub fn light() -> Self {
-        Self {
-            conflict: red().light().step_9(),
-            conflict_background: red().light().step_9(),
-            conflict_border: red().light().step_9(),
-            created: grass().light().step_9(),
-            created_background: grass().light().step_9(),
-            created_border: grass().light().step_9(),
-            deleted: red().light().step_9(),
-            deleted_background: red().light().step_9(),
-            deleted_border: red().light().step_9(),
-            error: red().light().step_9(),
-            error_background: red().light().step_9(),
-            error_border: red().light().step_9(),
-            hidden: neutral().light().step_9(),
-            hidden_background: neutral().light().step_9(),
-            hidden_border: neutral().light().step_9(),
-            hint: blue().light().step_9(),
-            hint_background: blue().light().step_9(),
-            hint_border: blue().light().step_9(),
-            ignored: neutral().light().step_9(),
-            ignored_background: neutral().light().step_9(),
-            ignored_border: neutral().light().step_9(),
-            info: blue().light().step_9(),
-            info_background: blue().light().step_9(),
-            info_border: blue().light().step_9(),
-            modified: yellow().light().step_9(),
-            modified_background: yellow().light().step_9(),
-            modified_border: yellow().light().step_9(),
-            predictive: neutral().light_alpha().step_9(),
-            predictive_background: neutral().light_alpha().step_9(),
-            predictive_border: neutral().light_alpha().step_9(),
-            renamed: blue().light().step_9(),
-            renamed_background: blue().light().step_9(),
-            renamed_border: blue().light().step_9(),
-            success: grass().light().step_9(),
-            success_background: grass().light().step_9(),
-            success_border: grass().light().step_9(),
-            unreachable: neutral().light().step_10(),
-            unreachable_background: neutral().light().step_10(),
-            unreachable_border: neutral().light().step_10(),
-            warning: yellow().light().step_9(),
-            warning_background: yellow().light().step_9(),
-            warning_border: yellow().light().step_9(),
-        }
-    }
-
-    pub fn diagnostic(&self) -> DiagnosticColors {
-        DiagnosticColors {
-            error: self.error,
-            warning: self.warning,
-            info: self.info,
-        }
-    }
-}
diff --git a/crates/theme/src/styles/syntax.rs b/crates/theme/src/styles/syntax.rs
deleted file mode 100644
index 0a97ff77f2..0000000000
--- a/crates/theme/src/styles/syntax.rs
+++ /dev/null
@@ -1,197 +0,0 @@
-#![allow(missing_docs)]
-
-use std::sync::Arc;
-
-use gpui::{HighlightStyle, Hsla};
-
-#[derive(Debug, PartialEq, Eq, Clone, Default)]
-pub struct SyntaxTheme {
-    pub highlights: Vec<(String, HighlightStyle)>,
-}
-
-impl SyntaxTheme {
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn new_test(colors: impl IntoIterator<Item = (&'static str, Hsla)>) -> Self {
-        Self::new_test_styles(colors.into_iter().map(|(key, color)| {
-            (
-                key,
-                HighlightStyle {
-                    color: Some(color),
-                    ..Default::default()
-                },
-            )
-        }))
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn new_test_styles(
-        colors: impl IntoIterator<Item = (&'static str, HighlightStyle)>,
-    ) -> Self {
-        Self {
-            highlights: colors
-                .into_iter()
-                .map(|(key, style)| (key.to_owned(), style))
-                .collect(),
-        }
-    }
-
-    pub fn get(&self, name: &str) -> HighlightStyle {
-        self.highlights
-            .iter()
-            .find_map(|entry| if entry.0 == name { Some(entry.1) } else { None })
-            .unwrap_or_default()
-    }
-
-    pub fn color(&self, name: &str) -> Hsla {
-        self.get(name).color.unwrap_or_default()
-    }
-
-    pub fn highlight_id(&self, name: &str) -> Option<u32> {
-        let ix = self.highlights.iter().position(|entry| entry.0 == name)?;
-        Some(ix as u32)
-    }
-
-    /// Returns a new [`Arc<SyntaxTheme>`] with the given syntax styles merged in.
-    pub fn merge(base: Arc<Self>, user_syntax_styles: Vec<(String, HighlightStyle)>) -> Arc<Self> {
-        if user_syntax_styles.is_empty() {
-            return base;
-        }
-
-        let mut merged_highlights = base.highlights.clone();
-
-        for (name, highlight) in user_syntax_styles {
-            if let Some((_, existing_highlight)) = merged_highlights
-                .iter_mut()
-                .find(|(existing_name, _)| existing_name == &name)
-            {
-                existing_highlight.color = highlight.color.or(existing_highlight.color);
-                existing_highlight.font_weight =
-                    highlight.font_weight.or(existing_highlight.font_weight);
-                existing_highlight.font_style =
-                    highlight.font_style.or(existing_highlight.font_style);
-                existing_highlight.background_color = highlight
-                    .background_color
-                    .or(existing_highlight.background_color);
-                existing_highlight.underline = highlight.underline.or(existing_highlight.underline);
-                existing_highlight.strikethrough =
-                    highlight.strikethrough.or(existing_highlight.strikethrough);
-                existing_highlight.fade_out = highlight.fade_out.or(existing_highlight.fade_out);
-            } else {
-                merged_highlights.push((name, highlight));
-            }
-        }
-
-        Arc::new(Self {
-            highlights: merged_highlights,
-        })
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use gpui::FontStyle;
-
-    use super::*;
-
-    #[test]
-    fn test_syntax_theme_merge() {
-        // Merging into an empty `SyntaxTheme` keeps all the user-defined styles.
-        let syntax_theme = SyntaxTheme::merge(
-            Arc::new(SyntaxTheme::new_test([])),
-            vec![
-                (
-                    "foo".to_string(),
-                    HighlightStyle {
-                        color: Some(gpui::red()),
-                        ..Default::default()
-                    },
-                ),
-                (
-                    "foo.bar".to_string(),
-                    HighlightStyle {
-                        color: Some(gpui::green()),
-                        ..Default::default()
-                    },
-                ),
-            ],
-        );
-        assert_eq!(
-            syntax_theme,
-            Arc::new(SyntaxTheme::new_test([
-                ("foo", gpui::red()),
-                ("foo.bar", gpui::green())
-            ]))
-        );
-
-        // Merging empty user-defined styles keeps all the base styles.
-        let syntax_theme = SyntaxTheme::merge(
-            Arc::new(SyntaxTheme::new_test([
-                ("foo", gpui::blue()),
-                ("foo.bar", gpui::red()),
-            ])),
-            Vec::new(),
-        );
-        assert_eq!(
-            syntax_theme,
-            Arc::new(SyntaxTheme::new_test([
-                ("foo", gpui::blue()),
-                ("foo.bar", gpui::red())
-            ]))
-        );
-
-        let syntax_theme = SyntaxTheme::merge(
-            Arc::new(SyntaxTheme::new_test([
-                ("foo", gpui::red()),
-                ("foo.bar", gpui::green()),
-            ])),
-            vec![(
-                "foo.bar".to_string(),
-                HighlightStyle {
-                    color: Some(gpui::yellow()),
-                    ..Default::default()
-                },
-            )],
-        );
-        assert_eq!(
-            syntax_theme,
-            Arc::new(SyntaxTheme::new_test([
-                ("foo", gpui::red()),
-                ("foo.bar", gpui::yellow())
-            ]))
-        );
-
-        let syntax_theme = SyntaxTheme::merge(
-            Arc::new(SyntaxTheme::new_test([
-                ("foo", gpui::red()),
-                ("foo.bar", gpui::green()),
-            ])),
-            vec![(
-                "foo.bar".to_string(),
-                HighlightStyle {
-                    font_style: Some(FontStyle::Italic),
-                    ..Default::default()
-                },
-            )],
-        );
-        assert_eq!(
-            syntax_theme,
-            Arc::new(SyntaxTheme::new_test_styles([
-                (
-                    "foo",
-                    HighlightStyle {
-                        color: Some(gpui::red()),
-                        ..Default::default()
-                    }
-                ),
-                (
-                    "foo.bar",
-                    HighlightStyle {
-                        color: Some(gpui::green()),
-                        font_style: Some(FontStyle::Italic),
-                        ..Default::default()
-                    }
-                )
-            ]))
-        );
-    }
-}
diff --git a/crates/theme/src/styles/system.rs b/crates/theme/src/styles/system.rs
deleted file mode 100644
index 676577bfb4..0000000000
--- a/crates/theme/src/styles/system.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-#![allow(missing_docs)]
-
-use gpui::{Hsla, hsla};
-
-#[derive(Clone, Debug, PartialEq)]
-pub struct SystemColors {
-    pub transparent: Hsla,
-    pub mac_os_traffic_light_red: Hsla,
-    pub mac_os_traffic_light_yellow: Hsla,
-    pub mac_os_traffic_light_green: Hsla,
-}
-
-impl Default for SystemColors {
-    fn default() -> Self {
-        Self {
-            transparent: hsla(0.0, 0.0, 0.0, 0.0),
-            mac_os_traffic_light_red: hsla(0.0139, 0.79, 0.65, 1.0),
-            mac_os_traffic_light_yellow: hsla(0.114, 0.88, 0.63, 1.0),
-            mac_os_traffic_light_green: hsla(0.313, 0.49, 0.55, 1.0),
-        }
-    }
-}
diff --git a/crates/theme/src/theme.rs b/crates/theme/src/theme.rs
deleted file mode 100644
index c94e0d60bf..0000000000
--- a/crates/theme/src/theme.rs
+++ /dev/null
@@ -1,527 +0,0 @@
-#![deny(missing_docs)]
-
-//! # Theme
-//!
-//! This crate provides the theme system for Zed.
-//!
-//! ## Overview
-//!
-//! A theme is a collection of colors used to build a consistent appearance for UI components across the application.
-
-mod default_colors;
-mod fallback_themes;
-mod font_family_cache;
-mod icon_theme;
-mod icon_theme_schema;
-mod registry;
-mod scale;
-mod schema;
-mod settings;
-mod styles;
-
-use std::path::Path;
-use std::sync::Arc;
-
-use ::settings::Settings;
-use ::settings::SettingsStore;
-use anyhow::Result;
-use fallback_themes::apply_status_color_defaults;
-use fs::Fs;
-use gpui::BorrowAppContext;
-use gpui::Global;
-use gpui::{
-    App, AssetSource, HighlightStyle, Hsla, Pixels, Refineable, SharedString, WindowAppearance,
-    WindowBackgroundAppearance, px,
-};
-use serde::Deserialize;
-use uuid::Uuid;
-
-pub use crate::default_colors::*;
-use crate::fallback_themes::apply_theme_color_defaults;
-pub use crate::font_family_cache::*;
-pub use crate::icon_theme::*;
-pub use crate::icon_theme_schema::*;
-pub use crate::registry::*;
-pub use crate::scale::*;
-pub use crate::schema::*;
-pub use crate::settings::*;
-pub use crate::styles::*;
-pub use ::settings::{
-    FontStyleContent, HighlightStyleContent, StatusColorsContent, ThemeColorsContent,
-    ThemeStyleContent,
-};
-
-/// Defines window border radius for platforms that use client side decorations.
-pub const CLIENT_SIDE_DECORATION_ROUNDING: Pixels = px(10.0);
-/// Defines window shadow size for platforms that use client side decorations.
-pub const CLIENT_SIDE_DECORATION_SHADOW: Pixels = px(10.0);
-
-/// The appearance of the theme.
-#[derive(Debug, PartialEq, Clone, Copy, Deserialize)]
-pub enum Appearance {
-    /// A light appearance.
-    Light,
-    /// A dark appearance.
-    Dark,
-}
-
-impl Appearance {
-    /// Returns whether the appearance is light.
-    pub fn is_light(&self) -> bool {
-        match self {
-            Self::Light => true,
-            Self::Dark => false,
-        }
-    }
-}
-
-impl From<WindowAppearance> for Appearance {
-    fn from(value: WindowAppearance) -> Self {
-        match value {
-            WindowAppearance::Dark | WindowAppearance::VibrantDark => Self::Dark,
-            WindowAppearance::Light | WindowAppearance::VibrantLight => Self::Light,
-        }
-    }
-}
-
-impl From<Appearance> for ThemeAppearanceMode {
-    fn from(value: Appearance) -> Self {
-        match value {
-            Appearance::Light => Self::Light,
-            Appearance::Dark => Self::Dark,
-        }
-    }
-}
-
-/// Which themes should be loaded. This is used primarily for testing.
-pub enum LoadThemes {
-    /// Only load the base theme.
-    ///
-    /// No user themes will be loaded.
-    JustBase,
-
-    /// Load all of the built-in themes.
-    All(Box<dyn AssetSource>),
-}
-
-/// Initialize the theme system.
-pub fn init(themes_to_load: LoadThemes, cx: &mut App) {
-    SystemAppearance::init(cx);
-    let (assets, load_user_themes) = match themes_to_load {
-        LoadThemes::JustBase => (Box::new(()) as Box<dyn AssetSource>, false),
-        LoadThemes::All(assets) => (assets, true),
-    };
-    ThemeRegistry::set_global(assets, cx);
-
-    if load_user_themes {
-        ThemeRegistry::global(cx).load_bundled_themes();
-    }
-
-    FontFamilyCache::init_global(cx);
-
-    let theme = GlobalTheme::configured_theme(cx);
-    let icon_theme = GlobalTheme::configured_icon_theme(cx);
-    cx.set_global(GlobalTheme { theme, icon_theme });
-
-    let settings = ThemeSettings::get_global(cx);
-
-    let mut prev_buffer_font_size_settings = settings.buffer_font_size_settings();
-    let mut prev_ui_font_size_settings = settings.ui_font_size_settings();
-    let mut prev_agent_ui_font_size_settings = settings.agent_ui_font_size_settings();
-    let mut prev_agent_buffer_font_size_settings = settings.agent_buffer_font_size_settings();
-    let mut prev_theme_name = settings.theme.name(SystemAppearance::global(cx).0);
-    let mut prev_icon_theme_name = settings.icon_theme.name(SystemAppearance::global(cx).0);
-    let mut prev_theme_overrides = (
-        settings.experimental_theme_overrides.clone(),
-        settings.theme_overrides.clone(),
-    );
-
-    cx.observe_global::<SettingsStore>(move |cx| {
-        let settings = ThemeSettings::get_global(cx);
-
-        let buffer_font_size_settings = settings.buffer_font_size_settings();
-        let ui_font_size_settings = settings.ui_font_size_settings();
-        let agent_ui_font_size_settings = settings.agent_ui_font_size_settings();
-        let agent_buffer_font_size_settings = settings.agent_buffer_font_size_settings();
-        let theme_name = settings.theme.name(SystemAppearance::global(cx).0);
-        let icon_theme_name = settings.icon_theme.name(SystemAppearance::global(cx).0);
-        let theme_overrides = (
-            settings.experimental_theme_overrides.clone(),
-            settings.theme_overrides.clone(),
-        );
-
-        if buffer_font_size_settings != prev_buffer_font_size_settings {
-            prev_buffer_font_size_settings = buffer_font_size_settings;
-            reset_buffer_font_size(cx);
-        }
-
-        if ui_font_size_settings != prev_ui_font_size_settings {
-            prev_ui_font_size_settings = ui_font_size_settings;
-            reset_ui_font_size(cx);
-        }
-
-        if agent_ui_font_size_settings != prev_agent_ui_font_size_settings {
-            prev_agent_ui_font_size_settings = agent_ui_font_size_settings;
-            reset_agent_ui_font_size(cx);
-        }
-
-        if agent_buffer_font_size_settings != prev_agent_buffer_font_size_settings {
-            prev_agent_buffer_font_size_settings = agent_buffer_font_size_settings;
-            reset_agent_buffer_font_size(cx);
-        }
-
-        if theme_name != prev_theme_name || theme_overrides != prev_theme_overrides {
-            prev_theme_name = theme_name;
-            prev_theme_overrides = theme_overrides;
-            GlobalTheme::reload_theme(cx);
-        }
-
-        if icon_theme_name != prev_icon_theme_name {
-            prev_icon_theme_name = icon_theme_name;
-            GlobalTheme::reload_icon_theme(cx);
-        }
-    })
-    .detach();
-}
-
-/// Implementing this trait allows accessing the active theme.
-pub trait ActiveTheme {
-    /// Returns the active theme.
-    fn theme(&self) -> &Arc<Theme>;
-}
-
-impl ActiveTheme for App {
-    fn theme(&self) -> &Arc<Theme> {
-        GlobalTheme::theme(self)
-    }
-}
-
-/// A theme family is a grouping of themes under a single name.
-///
-/// For example, the "One" theme family contains the "One Light" and "One Dark" themes.
-///
-/// It can also be used to package themes with many variants.
-///
-/// For example, the "Atelier" theme family contains "Cave", "Dune", "Estuary", "Forest", "Heath", etc.
-pub struct ThemeFamily {
-    /// The unique identifier for the theme family.
-    pub id: String,
-    /// The name of the theme family. This will be displayed in the UI, such as when adding or removing a theme family.
-    pub name: SharedString,
-    /// The author of the theme family.
-    pub author: SharedString,
-    /// The [Theme]s in the family.
-    pub themes: Vec<Theme>,
-    /// The color scales used by the themes in the family.
-    /// Note: This will be removed in the future.
-    pub scales: ColorScales,
-}
-
-impl ThemeFamily {
-    // This is on ThemeFamily because we will have variables here we will need
-    // in the future to resolve @references.
-    /// Refines ThemeContent into a theme, merging it's contents with the base theme.
-    pub fn refine_theme(&self, theme: &ThemeContent) -> Theme {
-        let appearance = match theme.appearance {
-            AppearanceContent::Light => Appearance::Light,
-            AppearanceContent::Dark => Appearance::Dark,
-        };
-
-        let mut refined_status_colors = match theme.appearance {
-            AppearanceContent::Light => StatusColors::light(),
-            AppearanceContent::Dark => StatusColors::dark(),
-        };
-        let mut status_colors_refinement = status_colors_refinement(&theme.style.status);
-        apply_status_color_defaults(&mut status_colors_refinement);
-        refined_status_colors.refine(&status_colors_refinement);
-
-        let mut refined_player_colors = match theme.appearance {
-            AppearanceContent::Light => PlayerColors::light(),
-            AppearanceContent::Dark => PlayerColors::dark(),
-        };
-        refined_player_colors.merge(&theme.style.players);
-
-        let mut refined_theme_colors = match theme.appearance {
-            AppearanceContent::Light => ThemeColors::light(),
-            AppearanceContent::Dark => ThemeColors::dark(),
-        };
-        let mut theme_colors_refinement =
-            theme_colors_refinement(&theme.style.colors, &status_colors_refinement);
-        apply_theme_color_defaults(&mut theme_colors_refinement, &refined_player_colors);
-        refined_theme_colors.refine(&theme_colors_refinement);
-
-        let mut refined_accent_colors = match theme.appearance {
-            AppearanceContent::Light => AccentColors::light(),
-            AppearanceContent::Dark => AccentColors::dark(),
-        };
-        refined_accent_colors.merge(&theme.style.accents);
-
-        let syntax_highlights = theme
-            .style
-            .syntax
-            .iter()
-            .map(|(syntax_token, highlight)| {
-                (
-                    syntax_token.clone(),
-                    HighlightStyle {
-                        color: highlight
-                            .color
-                            .as_ref()
-                            .and_then(|color| try_parse_color(color).ok()),
-                        background_color: highlight
-                            .background_color
-                            .as_ref()
-                            .and_then(|color| try_parse_color(color).ok()),
-                        font_style: highlight.font_style.map(Into::into),
-                        font_weight: highlight.font_weight.map(Into::into),
-                        ..Default::default()
-                    },
-                )
-            })
-            .collect::<Vec<_>>();
-        let syntax_theme = SyntaxTheme::merge(Arc::new(SyntaxTheme::default()), syntax_highlights);
-
-        let window_background_appearance = theme
-            .style
-            .window_background_appearance
-            .map(Into::into)
-            .unwrap_or_default();
-
-        Theme {
-            id: uuid::Uuid::new_v4().to_string(),
-            name: theme.name.clone().into(),
-            appearance,
-            styles: ThemeStyles {
-                system: SystemColors::default(),
-                window_background_appearance,
-                accents: refined_accent_colors,
-                colors: refined_theme_colors,
-                status: refined_status_colors,
-                player: refined_player_colors,
-                syntax: syntax_theme,
-            },
-        }
-    }
-}
-
-/// Refines a [ThemeFamilyContent] and it's [ThemeContent]s into a [ThemeFamily].
-pub fn refine_theme_family(theme_family_content: ThemeFamilyContent) -> ThemeFamily {
-    let id = Uuid::new_v4().to_string();
-    let name = theme_family_content.name.clone();
-    let author = theme_family_content.author.clone();
-
-    let mut theme_family = ThemeFamily {
-        id,
-        name: name.into(),
-        author: author.into(),
-        themes: vec![],
-        scales: default_color_scales(),
-    };
-
-    let refined_themes = theme_family_content
-        .themes
-        .iter()
-        .map(|theme_content| theme_family.refine_theme(theme_content))
-        .collect();
-
-    theme_family.themes = refined_themes;
-
-    theme_family
-}
-
-/// A theme is the primary mechanism for defining the appearance of the UI.
-#[derive(Clone, Debug, PartialEq)]
-pub struct Theme {
-    /// The unique identifier for the theme.
-    pub id: String,
-    /// The name of the theme.
-    pub name: SharedString,
-    /// The appearance of the theme (light or dark).
-    pub appearance: Appearance,
-    /// The colors and other styles for the theme.
-    pub styles: ThemeStyles,
-}
-
-impl Theme {
-    /// Returns the [`SystemColors`] for the theme.
-    #[inline(always)]
-    pub fn system(&self) -> &SystemColors {
-        &self.styles.system
-    }
-
-    /// Returns the [`AccentColors`] for the theme.
-    #[inline(always)]
-    pub fn accents(&self) -> &AccentColors {
-        &self.styles.accents
-    }
-
-    /// Returns the [`PlayerColors`] for the theme.
-    #[inline(always)]
-    pub fn players(&self) -> &PlayerColors {
-        &self.styles.player
-    }
-
-    /// Returns the [`ThemeColors`] for the theme.
-    #[inline(always)]
-    pub fn colors(&self) -> &ThemeColors {
-        &self.styles.colors
-    }
-
-    /// Returns the [`SyntaxTheme`] for the theme.
-    #[inline(always)]
-    pub fn syntax(&self) -> &Arc<SyntaxTheme> {
-        &self.styles.syntax
-    }
-
-    /// Returns the [`StatusColors`] for the theme.
-    #[inline(always)]
-    pub fn status(&self) -> &StatusColors {
-        &self.styles.status
-    }
-
-    /// Returns the color for the syntax node with the given name.
-    #[inline(always)]
-    pub fn syntax_color(&self, name: &str) -> Hsla {
-        self.syntax().color(name)
-    }
-
-    /// Returns the [`Appearance`] for the theme.
-    #[inline(always)]
-    pub fn appearance(&self) -> Appearance {
-        self.appearance
-    }
-
-    /// Returns the [`WindowBackgroundAppearance`] for the theme.
-    #[inline(always)]
-    pub fn window_background_appearance(&self) -> WindowBackgroundAppearance {
-        self.styles.window_background_appearance
-    }
-
-    /// Darkens the color by reducing its lightness.
-    /// The resulting lightness is clamped to ensure it doesn't go below 0.0.
-    ///
-    /// The first value darkens light appearance mode, the second darkens appearance dark mode.
-    ///
-    /// Note: This is a tentative solution and may be replaced with a more robust color system.
-    pub fn darken(&self, color: Hsla, light_amount: f32, dark_amount: f32) -> Hsla {
-        let amount = match self.appearance {
-            Appearance::Light => light_amount,
-            Appearance::Dark => dark_amount,
-        };
-        let mut hsla = color;
-        hsla.l = (hsla.l - amount).max(0.0);
-        hsla
-    }
-}
-
-/// Asynchronously reads the user theme from the specified path.
-pub async fn read_user_theme(theme_path: &Path, fs: Arc<dyn Fs>) -> Result<ThemeFamilyContent> {
-    let bytes = fs.load_bytes(theme_path).await?;
-    let theme_family: ThemeFamilyContent = serde_json_lenient::from_slice(&bytes)?;
-
-    for theme in &theme_family.themes {
-        if theme
-            .style
-            .colors
-            .deprecated_scrollbar_thumb_background
-            .is_some()
-        {
-            log::warn!(
-                r#"Theme "{theme_name}" is using a deprecated style property: scrollbar_thumb.background. Use `scrollbar.thumb.background` instead."#,
-                theme_name = theme.name
-            )
-        }
-    }
-
-    Ok(theme_family)
-}
-
-/// Asynchronously reads the icon theme from the specified path.
-pub async fn read_icon_theme(
-    icon_theme_path: &Path,
-    fs: Arc<dyn Fs>,
-) -> Result<IconThemeFamilyContent> {
-    let bytes = fs.load_bytes(icon_theme_path).await?;
-    let icon_theme_family: IconThemeFamilyContent = serde_json_lenient::from_slice(&bytes)?;
-
-    Ok(icon_theme_family)
-}
-
-/// The active theme
-pub struct GlobalTheme {
-    theme: Arc<Theme>,
-    icon_theme: Arc<IconTheme>,
-}
-impl Global for GlobalTheme {}
-
-impl GlobalTheme {
-    fn configured_theme(cx: &mut App) -> Arc<Theme> {
-        let themes = ThemeRegistry::default_global(cx);
-        let theme_settings = ThemeSettings::get_global(cx);
-        let system_appearance = SystemAppearance::global(cx);
-
-        let theme_name = theme_settings.theme.name(*system_appearance);
-
-        let theme = match themes.get(&theme_name.0) {
-            Ok(theme) => theme,
-            Err(err) => {
-                if themes.extensions_loaded() {
-                    log::error!("{err}");
-                }
-                themes
-                    .get(default_theme(*system_appearance))
-                    // fallback for tests.
-                    .unwrap_or_else(|_| themes.get(DEFAULT_DARK_THEME).unwrap())
-            }
-        };
-        theme_settings.apply_theme_overrides(theme)
-    }
-
-    /// Reloads the current theme.
-    ///
-    /// Reads the [`ThemeSettings`] to know which theme should be loaded,
-    /// taking into account the current [`SystemAppearance`].
-    pub fn reload_theme(cx: &mut App) {
-        let theme = Self::configured_theme(cx);
-        cx.update_global::<Self, _>(|this, _| this.theme = theme);
-        cx.refresh_windows();
-    }
-
-    fn configured_icon_theme(cx: &mut App) -> Arc<IconTheme> {
-        let themes = ThemeRegistry::default_global(cx);
-        let theme_settings = ThemeSettings::get_global(cx);
-        let system_appearance = SystemAppearance::global(cx);
-
-        let icon_theme_name = theme_settings.icon_theme.name(*system_appearance);
-
-        match themes.get_icon_theme(&icon_theme_name.0) {
-            Ok(theme) => theme,
-            Err(err) => {
-                if themes.extensions_loaded() {
-                    log::error!("{err}");
-                }
-                themes.get_icon_theme(DEFAULT_ICON_THEME_NAME).unwrap()
-            }
-        }
-    }
-
-    /// Reloads the current icon theme.
-    ///
-    /// Reads the [`ThemeSettings`] to know which icon theme should be loaded,
-    /// taking into account the current [`SystemAppearance`].
-    pub fn reload_icon_theme(cx: &mut App) {
-        let icon_theme = Self::configured_icon_theme(cx);
-        cx.update_global::<Self, _>(|this, _| this.icon_theme = icon_theme);
-        cx.refresh_windows();
-    }
-
-    /// the active theme
-    pub fn theme(cx: &App) -> &Arc<Theme> {
-        &cx.global::<Self>().theme
-    }
-
-    /// the active icon theme
-    pub fn icon_theme(cx: &App) -> &Arc<IconTheme> {
-        &cx.global::<Self>().icon_theme
-    }
-}
diff --git a/crates/theme_extension/Cargo.toml b/crates/theme_extension/Cargo.toml
deleted file mode 100644
index d94e15914b..0000000000
--- a/crates/theme_extension/Cargo.toml
+++ /dev/null
@@ -1,19 +0,0 @@
-[package]
-name = "theme_extension"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/theme_extension.rs"
-
-[dependencies]
-anyhow.workspace = true
-extension.workspace = true
-fs.workspace = true
-gpui.workspace = true
-theme.workspace = true
diff --git a/crates/theme_extension/LICENSE-GPL b/crates/theme_extension/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/theme_extension/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/theme_extension/src/theme_extension.rs b/crates/theme_extension/src/theme_extension.rs
deleted file mode 100644
index 10df2349c8..0000000000
--- a/crates/theme_extension/src/theme_extension.rs
+++ /dev/null
@@ -1,88 +0,0 @@
-use std::path::PathBuf;
-use std::sync::Arc;
-
-use anyhow::Result;
-use extension::{ExtensionHostProxy, ExtensionThemeProxy};
-use fs::Fs;
-use gpui::{App, BackgroundExecutor, SharedString, Task};
-use theme::{GlobalTheme, ThemeRegistry};
-
-pub fn init(
-    extension_host_proxy: Arc<ExtensionHostProxy>,
-    theme_registry: Arc<ThemeRegistry>,
-    executor: BackgroundExecutor,
-) {
-    extension_host_proxy.register_theme_proxy(ThemeRegistryProxy {
-        theme_registry,
-        executor,
-    });
-}
-
-struct ThemeRegistryProxy {
-    theme_registry: Arc<ThemeRegistry>,
-    executor: BackgroundExecutor,
-}
-
-impl ExtensionThemeProxy for ThemeRegistryProxy {
-    fn set_extensions_loaded(&self) {
-        self.theme_registry.set_extensions_loaded();
-    }
-
-    fn list_theme_names(&self, theme_path: PathBuf, fs: Arc<dyn Fs>) -> Task<Result<Vec<String>>> {
-        self.executor.spawn(async move {
-            let themes = theme::read_user_theme(&theme_path, fs).await?;
-            Ok(themes.themes.into_iter().map(|theme| theme.name).collect())
-        })
-    }
-
-    fn remove_user_themes(&self, themes: Vec<SharedString>) {
-        self.theme_registry.remove_user_themes(&themes);
-    }
-
-    fn load_user_theme(&self, theme_path: PathBuf, fs: Arc<dyn Fs>) -> Task<Result<()>> {
-        let theme_registry = self.theme_registry.clone();
-        self.executor
-            .spawn(async move { theme_registry.load_user_theme(&theme_path, fs).await })
-    }
-
-    fn reload_current_theme(&self, cx: &mut App) {
-        GlobalTheme::reload_theme(cx)
-    }
-
-    fn list_icon_theme_names(
-        &self,
-        icon_theme_path: PathBuf,
-        fs: Arc<dyn Fs>,
-    ) -> Task<Result<Vec<String>>> {
-        self.executor.spawn(async move {
-            let icon_theme_family = theme::read_icon_theme(&icon_theme_path, fs).await?;
-            Ok(icon_theme_family
-                .themes
-                .into_iter()
-                .map(|theme| theme.name)
-                .collect())
-        })
-    }
-
-    fn remove_icon_themes(&self, icon_themes: Vec<SharedString>) {
-        self.theme_registry.remove_icon_themes(&icon_themes);
-    }
-
-    fn load_icon_theme(
-        &self,
-        icon_theme_path: PathBuf,
-        icons_root_dir: PathBuf,
-        fs: Arc<dyn Fs>,
-    ) -> Task<Result<()>> {
-        let theme_registry = self.theme_registry.clone();
-        self.executor.spawn(async move {
-            theme_registry
-                .load_icon_theme(&icon_theme_path, &icons_root_dir, fs)
-                .await
-        })
-    }
-
-    fn reload_current_icon_theme(&self, cx: &mut App) {
-        GlobalTheme::reload_icon_theme(cx)
-    }
-}
diff --git a/crates/theme_importer/Cargo.toml b/crates/theme_importer/Cargo.toml
deleted file mode 100644
index a91ffc4454..0000000000
--- a/crates/theme_importer/Cargo.toml
+++ /dev/null
@@ -1,25 +0,0 @@
-[package]
-name = "theme_importer"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[dependencies]
-anyhow.workspace = true
-clap = { workspace = true, features = ["derive"] }
-collections.workspace = true
-gpui.workspace = true
-indexmap.workspace = true
-log.workspace = true
-palette.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-serde_json_lenient.workspace = true
-simplelog.workspace= true
-strum = { workspace = true, features = ["derive"] }
-theme.workspace = true
-vscode_theme = "0.2.0"
diff --git a/crates/theme_importer/LICENSE-GPL b/crates/theme_importer/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/theme_importer/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/theme_importer/README.md b/crates/theme_importer/README.md
deleted file mode 100644
index 20b7d063ad..0000000000
--- a/crates/theme_importer/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Zed Theme Importer
-
-```sh
-cargo run -p theme_importer -- dark-plus-syntax-color-theme.json --output output-theme.json
-```
diff --git a/crates/theme_importer/src/color.rs b/crates/theme_importer/src/color.rs
deleted file mode 100644
index 921f7a376b..0000000000
--- a/crates/theme_importer/src/color.rs
+++ /dev/null
@@ -1,56 +0,0 @@
-use anyhow::Result;
-use gpui::Hsla;
-use palette::FromColor;
-
-#[allow(unused)]
-pub(crate) fn try_parse_color(color: &str) -> Result<Hsla> {
-    let rgba = gpui::Rgba::try_from(color)?;
-    let rgba = palette::rgb::Srgba::from_components((rgba.r, rgba.g, rgba.b, rgba.a));
-    let hsla = palette::Hsla::from_color(rgba);
-
-    let hsla = gpui::hsla(
-        hsla.hue.into_positive_degrees() / 360.,
-        hsla.saturation,
-        hsla.lightness,
-        hsla.alpha,
-    );
-
-    Ok(hsla)
-}
-
-#[allow(unused)]
-pub(crate) fn pack_color(color: Hsla) -> u32 {
-    let hsla = palette::Hsla::from_components((color.h * 360., color.s, color.l, color.a));
-    let rgba = palette::rgb::Srgba::from_color(hsla);
-    let rgba = rgba.into_format::<u8, u8>();
-
-    u32::from(rgba)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    pub fn test_serialize_color() {
-        let color = "#b4637aff";
-        let hsla = try_parse_color(color).unwrap();
-        let packed = pack_color(hsla);
-
-        assert_eq!(format!("#{:x}", packed), color);
-    }
-
-    #[test]
-    pub fn test_serialize_color_with_palette() {
-        let color = "#b4637aff";
-
-        let rgba = gpui::Rgba::try_from(color).unwrap();
-        let rgba = palette::rgb::Srgba::from_components((rgba.r, rgba.g, rgba.b, rgba.a));
-        let hsla = palette::Hsla::from_color(rgba);
-
-        let rgba = palette::rgb::Srgba::from_color(hsla);
-        let rgba = rgba.into_format::<u8, u8>();
-
-        assert_eq!(format!("#{:x}", rgba), color);
-    }
-}
diff --git a/crates/theme_importer/src/main.rs b/crates/theme_importer/src/main.rs
deleted file mode 100644
index 24291fc511..0000000000
--- a/crates/theme_importer/src/main.rs
+++ /dev/null
@@ -1,130 +0,0 @@
-mod color;
-mod vscode;
-
-use std::fs::File;
-use std::io::{Read, Write};
-use std::path::PathBuf;
-
-use anyhow::{Context as _, Result};
-use clap::Parser;
-use collections::IndexMap;
-use log::LevelFilter;
-use serde::Deserialize;
-use simplelog::ColorChoice;
-use simplelog::{TermLogger, TerminalMode};
-use theme::{Appearance, AppearanceContent};
-
-use crate::vscode::VsCodeTheme;
-use crate::vscode::VsCodeThemeConverter;
-
-const ZED_THEME_SCHEMA_URL: &str = "https://zed.dev/schema/themes/v0.2.0.json";
-
-#[derive(Debug, Clone, Copy, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum ThemeAppearanceJson {
-    Light,
-    Dark,
-}
-
-impl From<ThemeAppearanceJson> for AppearanceContent {
-    fn from(value: ThemeAppearanceJson) -> Self {
-        match value {
-            ThemeAppearanceJson::Light => Self::Light,
-            ThemeAppearanceJson::Dark => Self::Dark,
-        }
-    }
-}
-
-impl From<ThemeAppearanceJson> for Appearance {
-    fn from(value: ThemeAppearanceJson) -> Self {
-        match value {
-            ThemeAppearanceJson::Light => Self::Light,
-            ThemeAppearanceJson::Dark => Self::Dark,
-        }
-    }
-}
-
-#[derive(Debug, Deserialize)]
-pub struct ThemeMetadata {
-    pub name: String,
-    pub file_name: String,
-    pub appearance: ThemeAppearanceJson,
-}
-
-#[derive(Parser)]
-#[command(author, version, about, long_about = None)]
-struct Args {
-    /// The path to the theme to import.
-    theme_path: PathBuf,
-
-    /// Whether to warn when values are missing from the theme.
-    #[arg(long)]
-    warn_on_missing: bool,
-
-    /// The path to write the output to.
-    #[arg(long, short)]
-    output: Option<PathBuf>,
-}
-
-fn main() -> Result<()> {
-    let args = Args::parse();
-
-    let log_config = {
-        let mut config = simplelog::ConfigBuilder::new();
-
-        if !args.warn_on_missing {
-            config.add_filter_ignore_str("theme_printer");
-        }
-
-        config.build()
-    };
-
-    TermLogger::init(
-        LevelFilter::Trace,
-        log_config,
-        TerminalMode::Stderr,
-        ColorChoice::Auto,
-    )
-    .expect("could not initialize logger");
-
-    let theme_file_path = args.theme_path;
-
-    let mut buffer = Vec::new();
-    match File::open(&theme_file_path).and_then(|mut file| file.read_to_end(&mut buffer)) {
-        Ok(_) => {}
-        Err(err) => {
-            log::info!("Failed to open file at path: {:?}", theme_file_path);
-            return Err(err)?;
-        }
-    };
-
-    let vscode_theme: VsCodeTheme = serde_json_lenient::from_slice(&buffer)
-        .context(format!("failed to parse theme {theme_file_path:?}"))?;
-
-    let theme_metadata = ThemeMetadata {
-        name: vscode_theme.name.clone().unwrap_or("".to_string()),
-        appearance: ThemeAppearanceJson::Dark,
-        file_name: "".to_string(),
-    };
-
-    let converter = VsCodeThemeConverter::new(vscode_theme, theme_metadata, IndexMap::default());
-
-    let theme = converter.convert()?;
-    let mut theme = serde_json::to_value(theme).unwrap();
-    theme.as_object_mut().unwrap().insert(
-        "$schema".to_string(),
-        serde_json::Value::String(ZED_THEME_SCHEMA_URL.to_string()),
-    );
-    let theme_json = serde_json::to_string_pretty(&theme).unwrap();
-
-    if let Some(output) = args.output {
-        let mut file = File::create(output)?;
-        file.write_all(theme_json.as_bytes())?;
-    } else {
-        println!("{}", theme_json);
-    }
-
-    log::info!("Done!");
-
-    Ok(())
-}
diff --git a/crates/theme_importer/src/vscode.rs b/crates/theme_importer/src/vscode.rs
deleted file mode 100644
index 6933bbaa8f..0000000000
--- a/crates/theme_importer/src/vscode.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-mod converter;
-mod syntax;
-mod theme;
-
-pub use converter::*;
-pub use syntax::*;
-pub use theme::*;
diff --git a/crates/theme_importer/src/vscode/converter.rs b/crates/theme_importer/src/vscode/converter.rs
deleted file mode 100644
index e4a9769978..0000000000
--- a/crates/theme_importer/src/vscode/converter.rs
+++ /dev/null
@@ -1,276 +0,0 @@
-use anyhow::Result;
-use collections::IndexMap;
-use strum::IntoEnumIterator;
-use theme::{
-    FontStyleContent, FontWeightContent, HighlightStyleContent, StatusColorsContent,
-    ThemeColorsContent, ThemeContent, ThemeStyleContent, WindowBackgroundContent,
-};
-
-use crate::ThemeMetadata;
-use crate::vscode::{VsCodeTheme, VsCodeTokenScope};
-
-use super::ZedSyntaxToken;
-
-pub(crate) fn try_parse_font_weight(font_style: &str) -> Option<FontWeightContent> {
-    match font_style {
-        style if style.contains("bold") => Some(FontWeightContent::Bold),
-        _ => None,
-    }
-}
-
-pub(crate) fn try_parse_font_style(font_style: &str) -> Option<FontStyleContent> {
-    match font_style {
-        style if style.contains("italic") => Some(FontStyleContent::Italic),
-        style if style.contains("oblique") => Some(FontStyleContent::Oblique),
-        _ => None,
-    }
-}
-
-pub struct VsCodeThemeConverter {
-    theme: VsCodeTheme,
-    theme_metadata: ThemeMetadata,
-    syntax_overrides: IndexMap<String, Vec<String>>,
-}
-
-impl VsCodeThemeConverter {
-    pub fn new(
-        theme: VsCodeTheme,
-        theme_metadata: ThemeMetadata,
-        syntax_overrides: IndexMap<String, Vec<String>>,
-    ) -> Self {
-        Self {
-            theme,
-            theme_metadata,
-            syntax_overrides,
-        }
-    }
-
-    pub fn convert(self) -> Result<ThemeContent> {
-        let appearance = self.theme_metadata.appearance.into();
-
-        let status_colors = self.convert_status_colors()?;
-        let theme_colors = self.convert_theme_colors()?;
-        let syntax_theme = self.convert_syntax_theme()?;
-
-        Ok(ThemeContent {
-            name: self.theme_metadata.name,
-            appearance,
-            style: ThemeStyleContent {
-                window_background_appearance: Some(WindowBackgroundContent::Opaque),
-                accents: Vec::new(), //TODO can we read this from the theme?
-                colors: theme_colors,
-                status: status_colors,
-                players: Vec::new(),
-                syntax: syntax_theme,
-            },
-        })
-    }
-
-    fn convert_status_colors(&self) -> Result<StatusColorsContent> {
-        let vscode_colors = &self.theme.colors;
-
-        let vscode_base_status_colors = StatusColorsContent {
-            hint: Some("#969696ff".to_string()),
-            ..Default::default()
-        };
-
-        Ok(StatusColorsContent {
-            conflict: vscode_colors
-                .git_decoration
-                .conflicting_resource_foreground
-                .clone(),
-            created: vscode_colors.editor_gutter.added_background.clone(),
-            deleted: vscode_colors.editor_gutter.deleted_background.clone(),
-            error: vscode_colors.editor_error.foreground.clone(),
-            error_background: vscode_colors.editor_error.background.clone(),
-            error_border: vscode_colors.editor_error.border.clone(),
-            hidden: vscode_colors.tab.inactive_foreground.clone(),
-            hint: vscode_colors
-                .editor_inlay_hint
-                .foreground
-                .clone()
-                .or(vscode_base_status_colors.hint),
-            hint_border: vscode_colors.editor_hint.border.clone(),
-            ignored: vscode_colors
-                .git_decoration
-                .ignored_resource_foreground
-                .clone(),
-            info: vscode_colors.editor_info.foreground.clone(),
-            info_background: vscode_colors.editor_info.background.clone(),
-            info_border: vscode_colors.editor_info.border.clone(),
-            modified: vscode_colors.editor_gutter.modified_background.clone(),
-            // renamed: None,
-            // success: None,
-            warning: vscode_colors.editor_warning.foreground.clone(),
-            warning_background: vscode_colors.editor_warning.background.clone(),
-            warning_border: vscode_colors.editor_warning.border.clone(),
-            ..Default::default()
-        })
-    }
-
-    fn convert_theme_colors(&self) -> Result<ThemeColorsContent> {
-        let vscode_colors = &self.theme.colors;
-
-        let vscode_panel_border = vscode_colors.panel.border.clone();
-        let vscode_tab_inactive_background = vscode_colors.tab.inactive_background.clone();
-        let vscode_editor_foreground = vscode_colors.editor.foreground.clone();
-        let vscode_editor_background = vscode_colors.editor.background.clone();
-        let vscode_scrollbar_slider_background = vscode_colors.scrollbar_slider.background.clone();
-        let vscode_token_colors_foreground = self
-            .theme
-            .token_colors
-            .iter()
-            .find(|token_color| token_color.scope.is_none())
-            .and_then(|token_color| token_color.settings.foreground.as_ref())
-            .cloned();
-
-        Ok(ThemeColorsContent {
-            border: vscode_panel_border.clone(),
-            border_variant: vscode_panel_border.clone(),
-            border_focused: vscode_colors.focus_border.clone(),
-            border_selected: vscode_panel_border.clone(),
-            border_transparent: vscode_panel_border.clone(),
-            border_disabled: vscode_panel_border.clone(),
-            elevated_surface_background: vscode_colors.dropdown.background.clone(),
-            surface_background: vscode_colors.panel.background.clone(),
-            background: vscode_editor_background.clone(),
-            element_background: vscode_colors.button.background.clone(),
-            element_hover: vscode_colors.list.hover_background.clone(),
-            element_selected: vscode_colors.list.active_selection_background.clone(),
-            drop_target_background: vscode_colors.list.drop_background.clone(),
-            ghost_element_hover: vscode_colors.list.hover_background.clone(),
-            ghost_element_selected: vscode_colors.list.active_selection_background.clone(),
-            text: vscode_colors
-                .foreground
-                .clone()
-                .or(vscode_token_colors_foreground.clone()),
-            text_muted: vscode_colors.tab.inactive_foreground.clone(),
-            status_bar_background: vscode_colors.status_bar.background.clone(),
-            title_bar_background: vscode_colors.title_bar.active_background.clone(),
-            toolbar_background: vscode_colors
-                .breadcrumb
-                .background
-                .clone()
-                .or(vscode_editor_background.clone()),
-            tab_bar_background: vscode_colors.editor_group_header.tabs_background.clone(),
-            tab_inactive_background: vscode_tab_inactive_background.clone(),
-            tab_active_background: vscode_colors
-                .tab
-                .active_background
-                .clone()
-                .or(vscode_tab_inactive_background),
-            search_match_background: vscode_colors.editor.find_match_background.clone(),
-            panel_background: vscode_colors.panel.background.clone(),
-            pane_group_border: vscode_colors.editor_group.border.clone(),
-            scrollbar_thumb_background: vscode_scrollbar_slider_background.clone(),
-            scrollbar_thumb_hover_background: vscode_colors
-                .scrollbar_slider
-                .hover_background
-                .clone(),
-            scrollbar_thumb_active_background: vscode_colors
-                .scrollbar_slider
-                .active_background
-                .clone(),
-            scrollbar_thumb_border: vscode_scrollbar_slider_background,
-            scrollbar_track_background: vscode_editor_background.clone(),
-            scrollbar_track_border: vscode_colors.editor_overview_ruler.border.clone(),
-            minimap_thumb_background: vscode_colors.minimap_slider.background.clone(),
-            minimap_thumb_hover_background: vscode_colors.minimap_slider.hover_background.clone(),
-            minimap_thumb_active_background: vscode_colors.minimap_slider.active_background.clone(),
-            editor_foreground: vscode_editor_foreground.or(vscode_token_colors_foreground),
-            editor_background: vscode_editor_background.clone(),
-            editor_gutter_background: vscode_editor_background,
-            editor_active_line_background: vscode_colors.editor.line_highlight_background.clone(),
-            editor_line_number: vscode_colors.editor_line_number.foreground.clone(),
-            editor_active_line_number: vscode_colors.editor.foreground.clone(),
-            editor_wrap_guide: vscode_panel_border.clone(),
-            editor_active_wrap_guide: vscode_panel_border,
-            editor_document_highlight_bracket_background: vscode_colors
-                .editor_bracket_match
-                .background
-                .clone(),
-            terminal_background: vscode_colors.terminal.background.clone(),
-            terminal_ansi_black: vscode_colors.terminal.ansi_black.clone(),
-            terminal_ansi_bright_black: vscode_colors.terminal.ansi_bright_black.clone(),
-            terminal_ansi_red: vscode_colors.terminal.ansi_red.clone(),
-            terminal_ansi_bright_red: vscode_colors.terminal.ansi_bright_red.clone(),
-            terminal_ansi_green: vscode_colors.terminal.ansi_green.clone(),
-            terminal_ansi_bright_green: vscode_colors.terminal.ansi_bright_green.clone(),
-            terminal_ansi_yellow: vscode_colors.terminal.ansi_yellow.clone(),
-            terminal_ansi_bright_yellow: vscode_colors.terminal.ansi_bright_yellow.clone(),
-            terminal_ansi_blue: vscode_colors.terminal.ansi_blue.clone(),
-            terminal_ansi_bright_blue: vscode_colors.terminal.ansi_bright_blue.clone(),
-            terminal_ansi_magenta: vscode_colors.terminal.ansi_magenta.clone(),
-            terminal_ansi_bright_magenta: vscode_colors.terminal.ansi_bright_magenta.clone(),
-            terminal_ansi_cyan: vscode_colors.terminal.ansi_cyan.clone(),
-            terminal_ansi_bright_cyan: vscode_colors.terminal.ansi_bright_cyan.clone(),
-            terminal_ansi_white: vscode_colors.terminal.ansi_white.clone(),
-            terminal_ansi_bright_white: vscode_colors.terminal.ansi_bright_white.clone(),
-            link_text_hover: vscode_colors.text_link.active_foreground.clone(),
-            ..Default::default()
-        })
-    }
-
-    fn convert_syntax_theme(&self) -> Result<IndexMap<String, HighlightStyleContent>> {
-        let mut highlight_styles = IndexMap::default();
-
-        for syntax_token in ZedSyntaxToken::iter() {
-            let override_match = self
-                .syntax_overrides
-                .get(&syntax_token.to_string())
-                .and_then(|scope| {
-                    self.theme.token_colors.iter().find(|token_color| {
-                        token_color.scope == Some(VsCodeTokenScope::Many(scope.clone()))
-                    })
-                });
-
-            let best_match = override_match
-                .or_else(|| syntax_token.find_best_token_color_match(&self.theme.token_colors))
-                .or_else(|| {
-                    syntax_token.fallbacks().iter().find_map(|fallback| {
-                        fallback.find_best_token_color_match(&self.theme.token_colors)
-                    })
-                });
-
-            let Some(token_color) = best_match else {
-                log::warn!("No matching token color found for '{syntax_token}'");
-                continue;
-            };
-
-            log::info!(
-                "Matched '{syntax_token}' to '{}'",
-                token_color
-                    .name
-                    .clone()
-                    .or_else(|| token_color
-                        .scope
-                        .as_ref()
-                        .map(|scope| format!("{:?}", scope)))
-                    .unwrap_or_else(|| "no identifier".to_string())
-            );
-
-            let highlight_style = HighlightStyleContent {
-                color: token_color.settings.foreground.clone(),
-                background_color: token_color.settings.background.clone(),
-                font_style: token_color
-                    .settings
-                    .font_style
-                    .as_ref()
-                    .and_then(|style| try_parse_font_style(style)),
-                font_weight: token_color
-                    .settings
-                    .font_style
-                    .as_ref()
-                    .and_then(|style| try_parse_font_weight(style)),
-            };
-
-            if highlight_style.is_empty() {
-                continue;
-            }
-
-            highlight_styles.insert(syntax_token.to_string(), highlight_style);
-        }
-
-        Ok(highlight_styles)
-    }
-}
diff --git a/crates/theme_importer/src/vscode/syntax.rs b/crates/theme_importer/src/vscode/syntax.rs
deleted file mode 100644
index 7b134089b7..0000000000
--- a/crates/theme_importer/src/vscode/syntax.rs
+++ /dev/null
@@ -1,310 +0,0 @@
-use indexmap::IndexMap;
-use serde::Deserialize;
-use strum::EnumIter;
-
-#[derive(Debug, PartialEq, Eq, Deserialize)]
-#[serde(untagged)]
-pub enum VsCodeTokenScope {
-    One(String),
-    Many(Vec<String>),
-}
-
-#[derive(Debug, Deserialize)]
-pub struct VsCodeTokenColor {
-    pub name: Option<String>,
-    pub scope: Option<VsCodeTokenScope>,
-    pub settings: VsCodeTokenColorSettings,
-}
-
-#[derive(Debug, Deserialize)]
-pub struct VsCodeTokenColorSettings {
-    pub foreground: Option<String>,
-    pub background: Option<String>,
-    #[serde(rename = "fontStyle")]
-    pub font_style: Option<String>,
-}
-
-#[derive(Debug, PartialEq, Copy, Clone, EnumIter)]
-pub enum ZedSyntaxToken {
-    Attribute,
-    Boolean,
-    Comment,
-    CommentDoc,
-    Constant,
-    Constructor,
-    Embedded,
-    Emphasis,
-    EmphasisStrong,
-    Enum,
-    Function,
-    Hint,
-    Keyword,
-    Label,
-    LinkText,
-    LinkUri,
-    Number,
-    Operator,
-    Predictive,
-    Preproc,
-    Primary,
-    Property,
-    Punctuation,
-    PunctuationBracket,
-    PunctuationDelimiter,
-    PunctuationListMarker,
-    PunctuationSpecial,
-    String,
-    StringEscape,
-    StringRegex,
-    StringSpecial,
-    StringSpecialSymbol,
-    Tag,
-    TextLiteral,
-    Title,
-    Type,
-    Variable,
-    VariableSpecial,
-    Variant,
-}
-
-impl std::fmt::Display for ZedSyntaxToken {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(
-            f,
-            "{}",
-            match self {
-                ZedSyntaxToken::Attribute => "attribute",
-                ZedSyntaxToken::Boolean => "boolean",
-                ZedSyntaxToken::Comment => "comment",
-                ZedSyntaxToken::CommentDoc => "comment.doc",
-                ZedSyntaxToken::Constant => "constant",
-                ZedSyntaxToken::Constructor => "constructor",
-                ZedSyntaxToken::Embedded => "embedded",
-                ZedSyntaxToken::Emphasis => "emphasis",
-                ZedSyntaxToken::EmphasisStrong => "emphasis.strong",
-                ZedSyntaxToken::Enum => "enum",
-                ZedSyntaxToken::Function => "function",
-                ZedSyntaxToken::Hint => "hint",
-                ZedSyntaxToken::Keyword => "keyword",
-                ZedSyntaxToken::Label => "label",
-                ZedSyntaxToken::LinkText => "link_text",
-                ZedSyntaxToken::LinkUri => "link_uri",
-                ZedSyntaxToken::Number => "number",
-                ZedSyntaxToken::Operator => "operator",
-                ZedSyntaxToken::Predictive => "predictive",
-                ZedSyntaxToken::Preproc => "preproc",
-                ZedSyntaxToken::Primary => "primary",
-                ZedSyntaxToken::Property => "property",
-                ZedSyntaxToken::Punctuation => "punctuation",
-                ZedSyntaxToken::PunctuationBracket => "punctuation.bracket",
-                ZedSyntaxToken::PunctuationDelimiter => "punctuation.delimiter",
-                ZedSyntaxToken::PunctuationListMarker => "punctuation.list_marker",
-                ZedSyntaxToken::PunctuationSpecial => "punctuation.special",
-                ZedSyntaxToken::String => "string",
-                ZedSyntaxToken::StringEscape => "string.escape",
-                ZedSyntaxToken::StringRegex => "string.regex",
-                ZedSyntaxToken::StringSpecial => "string.special",
-                ZedSyntaxToken::StringSpecialSymbol => "string.special.symbol",
-                ZedSyntaxToken::Tag => "tag",
-                ZedSyntaxToken::TextLiteral => "text.literal",
-                ZedSyntaxToken::Title => "title",
-                ZedSyntaxToken::Type => "type",
-                ZedSyntaxToken::Variable => "variable",
-                ZedSyntaxToken::VariableSpecial => "variable.special",
-                ZedSyntaxToken::Variant => "variant",
-            }
-        )
-    }
-}
-
-impl ZedSyntaxToken {
-    pub fn find_best_token_color_match<'a>(
-        &self,
-        token_colors: &'a [VsCodeTokenColor],
-    ) -> Option<&'a VsCodeTokenColor> {
-        let mut ranked_matches = IndexMap::new();
-
-        for (ix, token_color) in token_colors.iter().enumerate() {
-            if token_color.settings.foreground.is_none() {
-                continue;
-            }
-
-            let Some(rank) = self.rank_match(token_color) else {
-                continue;
-            };
-
-            if rank > 0 {
-                ranked_matches.insert(ix, rank);
-            }
-        }
-
-        ranked_matches
-            .into_iter()
-            .max_by_key(|(_, rank)| *rank)
-            .map(|(ix, _)| &token_colors[ix])
-    }
-
-    fn rank_match(&self, token_color: &VsCodeTokenColor) -> Option<u32> {
-        let candidate_scopes = match token_color.scope.as_ref()? {
-            VsCodeTokenScope::One(scope) => vec![scope],
-            VsCodeTokenScope::Many(scopes) => scopes.iter().collect(),
-        }
-        .iter()
-        .flat_map(|scope| scope.split(',').map(|s| s.trim()))
-        .collect::<Vec<_>>();
-
-        let scopes_to_match = self.to_vscode();
-        let number_of_scopes_to_match = scopes_to_match.len();
-
-        let mut matches = 0;
-
-        for (ix, scope) in scopes_to_match.into_iter().enumerate() {
-            // Assign each entry a weight that is inversely proportional to its
-            // position in the list.
-            //
-            // Entries towards the front are weighted higher than those towards the end.
-            let weight = (number_of_scopes_to_match - ix) as u32;
-
-            if candidate_scopes.contains(&scope) {
-                matches += 1 + weight;
-            }
-        }
-
-        Some(matches)
-    }
-
-    pub fn fallbacks(&self) -> &[Self] {
-        match self {
-            ZedSyntaxToken::CommentDoc => &[ZedSyntaxToken::Comment],
-            ZedSyntaxToken::Number => &[ZedSyntaxToken::Constant],
-            ZedSyntaxToken::VariableSpecial => &[ZedSyntaxToken::Variable],
-            ZedSyntaxToken::PunctuationBracket
-            | ZedSyntaxToken::PunctuationDelimiter
-            | ZedSyntaxToken::PunctuationListMarker
-            | ZedSyntaxToken::PunctuationSpecial => &[ZedSyntaxToken::Punctuation],
-            ZedSyntaxToken::StringEscape
-            | ZedSyntaxToken::StringRegex
-            | ZedSyntaxToken::StringSpecial
-            | ZedSyntaxToken::StringSpecialSymbol => &[ZedSyntaxToken::String],
-            _ => &[],
-        }
-    }
-
-    fn to_vscode(self) -> Vec<&'static str> {
-        match self {
-            ZedSyntaxToken::Attribute => vec!["entity.other.attribute-name"],
-            ZedSyntaxToken::Boolean => vec!["constant.language"],
-            ZedSyntaxToken::Comment => vec!["comment"],
-            ZedSyntaxToken::CommentDoc => vec!["comment.block.documentation"],
-            ZedSyntaxToken::Constant => vec!["constant", "constant.language", "constant.character"],
-            ZedSyntaxToken::Constructor => {
-                vec![
-                    "entity.name.tag",
-                    "entity.name.function.definition.special.constructor",
-                ]
-            }
-            ZedSyntaxToken::Embedded => vec!["meta.embedded"],
-            ZedSyntaxToken::Emphasis => vec!["markup.italic"],
-            ZedSyntaxToken::EmphasisStrong => vec![
-                "markup.bold",
-                "markup.italic markup.bold",
-                "markup.bold markup.italic",
-            ],
-            ZedSyntaxToken::Enum => vec!["support.type.enum"],
-            ZedSyntaxToken::Function => vec![
-                "entity.function",
-                "entity.name.function",
-                "variable.function",
-            ],
-            ZedSyntaxToken::Hint => vec![],
-            ZedSyntaxToken::Keyword => vec![
-                "keyword",
-                "keyword.other.fn.rust",
-                "keyword.control",
-                "keyword.control.fun",
-                "keyword.control.class",
-                "punctuation.accessor",
-                "entity.name.tag",
-            ],
-            ZedSyntaxToken::Label => vec![
-                "label",
-                "entity.name",
-                "entity.name.import",
-                "entity.name.package",
-            ],
-            ZedSyntaxToken::LinkText => vec!["markup.underline.link", "string.other.link"],
-            ZedSyntaxToken::LinkUri => vec!["markup.underline.link", "string.other.link"],
-            ZedSyntaxToken::Number => vec!["constant.numeric", "number"],
-            ZedSyntaxToken::Operator => vec!["operator", "keyword.operator"],
-            ZedSyntaxToken::Predictive => vec![],
-            ZedSyntaxToken::Preproc => vec![
-                "preproc",
-                "meta.preprocessor",
-                "punctuation.definition.preprocessor",
-            ],
-            ZedSyntaxToken::Primary => vec![],
-            ZedSyntaxToken::Property => vec![
-                "variable.member",
-                "support.type.property-name",
-                "variable.object.property",
-                "variable.other.field",
-            ],
-            ZedSyntaxToken::Punctuation => vec![
-                "punctuation",
-                "punctuation.section",
-                "punctuation.accessor",
-                "punctuation.separator",
-                "punctuation.definition.tag",
-            ],
-            ZedSyntaxToken::PunctuationBracket => vec![
-                "punctuation.bracket",
-                "punctuation.definition.tag.begin",
-                "punctuation.definition.tag.end",
-            ],
-            ZedSyntaxToken::PunctuationDelimiter => vec![
-                "punctuation.delimiter",
-                "punctuation.separator",
-                "punctuation.terminator",
-            ],
-            ZedSyntaxToken::PunctuationListMarker => {
-                vec!["markup.list punctuation.definition.list.begin"]
-            }
-            ZedSyntaxToken::PunctuationSpecial => vec!["punctuation.special"],
-            ZedSyntaxToken::String => vec!["string"],
-            ZedSyntaxToken::StringEscape => {
-                vec!["string.escape", "constant.character", "constant.other"]
-            }
-            ZedSyntaxToken::StringRegex => vec!["string.regex"],
-            ZedSyntaxToken::StringSpecial => vec!["string.special", "constant.other.symbol"],
-            ZedSyntaxToken::StringSpecialSymbol => {
-                vec!["string.special.symbol", "constant.other.symbol"]
-            }
-            ZedSyntaxToken::Tag => vec!["tag", "entity.name.tag", "meta.tag.sgml"],
-            ZedSyntaxToken::TextLiteral => vec!["text.literal", "string"],
-            ZedSyntaxToken::Title => vec!["title", "entity.name"],
-            ZedSyntaxToken::Type => vec![
-                "entity.name.type",
-                "entity.name.type.primitive",
-                "entity.name.type.numeric",
-                "keyword.type",
-                "support.type",
-                "support.type.primitive",
-                "support.class",
-            ],
-            ZedSyntaxToken::Variable => vec![
-                "variable",
-                "variable.language",
-                "variable.member",
-                "variable.parameter",
-                "variable.parameter.function-call",
-            ],
-            ZedSyntaxToken::VariableSpecial => vec![
-                "variable.special",
-                "variable.member",
-                "variable.annotation",
-                "variable.language",
-            ],
-            ZedSyntaxToken::Variant => vec!["variant"],
-        }
-    }
-}
diff --git a/crates/theme_importer/src/vscode/theme.rs b/crates/theme_importer/src/vscode/theme.rs
deleted file mode 100644
index 2479dd312e..0000000000
--- a/crates/theme_importer/src/vscode/theme.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-use serde::Deserialize;
-use vscode_theme::Colors;
-
-use crate::vscode::VsCodeTokenColor;
-
-#[derive(Deserialize, Debug)]
-pub struct VsCodeTheme {
-    #[serde(rename = "$schema")]
-    #[expect(
-        unused,
-        reason = "This field was found to be unused with serde library bump; it's left as is due to insufficient context on PO's side, but it *may* be fine to remove"
-    )]
-    pub schema: Option<String>,
-    pub name: Option<String>,
-    #[expect(
-        unused,
-        reason = "This field was found to be unused with serde library bump; it's left as is due to insufficient context on PO's side, but it *may* be fine to remove"
-    )]
-    pub author: Option<String>,
-    #[expect(
-        unused,
-        reason = "This field was found to be unused with serde library bump; it's left as is due to insufficient context on PO's side, but it *may* be fine to remove"
-    )]
-    pub maintainers: Option<Vec<String>>,
-    #[serde(rename = "semanticClass")]
-    #[expect(
-        unused,
-        reason = "This field was found to be unused with serde library bump; it's left as is due to insufficient context on PO's side, but it *may* be fine to remove"
-    )]
-    pub semantic_class: Option<String>,
-    #[expect(
-        unused,
-        reason = "This field was found to be unused with serde library bump; it's left as is due to insufficient context on PO's side, but it *may* be fine to remove"
-    )]
-    #[serde(rename = "semanticHighlighting")]
-    pub semantic_highlighting: Option<bool>,
-    pub colors: Colors,
-    #[serde(rename = "tokenColors")]
-    pub token_colors: Vec<VsCodeTokenColor>,
-}
diff --git a/crates/theme_selector/Cargo.toml b/crates/theme_selector/Cargo.toml
deleted file mode 100644
index 1a563e81f2..0000000000
--- a/crates/theme_selector/Cargo.toml
+++ /dev/null
@@ -1,30 +0,0 @@
-[package]
-name = "theme_selector"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/theme_selector.rs"
-doctest = false
-
-[dependencies]
-fs.workspace = true
-fuzzy.workspace = true
-gpui.workspace = true
-log.workspace = true
-picker.workspace = true
-serde.workspace = true
-settings.workspace = true
-telemetry.workspace = true
-theme.workspace = true
-ui.workspace = true
-util.workspace = true
-workspace.workspace = true
-zed_actions.workspace = true
-
-[dev-dependencies]
diff --git a/crates/theme_selector/LICENSE-GPL b/crates/theme_selector/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/theme_selector/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/theme_selector/src/icon_theme_selector.rs b/crates/theme_selector/src/icon_theme_selector.rs
deleted file mode 100644
index 2ea3436d43..0000000000
--- a/crates/theme_selector/src/icon_theme_selector.rs
+++ /dev/null
@@ -1,338 +0,0 @@
-use fs::Fs;
-use fuzzy::{StringMatch, StringMatchCandidate, match_strings};
-use gpui::{
-    App, Context, DismissEvent, Entity, EventEmitter, Focusable, Render, UpdateGlobal, WeakEntity,
-    Window,
-};
-use picker::{Picker, PickerDelegate};
-use settings::{Settings as _, SettingsStore, update_settings_file};
-use std::sync::Arc;
-use theme::{
-    Appearance, IconThemeName, IconThemeSelection, SystemAppearance, ThemeMeta, ThemeRegistry,
-    ThemeSettings,
-};
-use ui::{ListItem, ListItemSpacing, prelude::*, v_flex};
-use util::ResultExt;
-use workspace::{ModalView, ui::HighlightedLabel};
-use zed_actions::{ExtensionCategoryFilter, Extensions};
-
-pub(crate) struct IconThemeSelector {
-    picker: Entity<Picker<IconThemeSelectorDelegate>>,
-}
-
-impl EventEmitter<DismissEvent> for IconThemeSelector {}
-
-impl Focusable for IconThemeSelector {
-    fn focus_handle(&self, cx: &App) -> gpui::FocusHandle {
-        self.picker.focus_handle(cx)
-    }
-}
-
-impl ModalView for IconThemeSelector {}
-
-impl IconThemeSelector {
-    pub fn new(
-        delegate: IconThemeSelectorDelegate,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx));
-        Self { picker }
-    }
-}
-
-impl Render for IconThemeSelector {
-    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .key_context("IconThemeSelector")
-            .w(rems(34.))
-            .child(self.picker.clone())
-    }
-}
-
-pub(crate) struct IconThemeSelectorDelegate {
-    fs: Arc<dyn Fs>,
-    themes: Vec<ThemeMeta>,
-    matches: Vec<StringMatch>,
-    original_theme: IconThemeName,
-    selection_completed: bool,
-    selected_theme: Option<IconThemeName>,
-    selected_index: usize,
-    selector: WeakEntity<IconThemeSelector>,
-}
-
-impl IconThemeSelectorDelegate {
-    pub fn new(
-        selector: WeakEntity<IconThemeSelector>,
-        fs: Arc<dyn Fs>,
-        themes_filter: Option<&Vec<String>>,
-        cx: &mut Context<IconThemeSelector>,
-    ) -> Self {
-        let theme_settings = ThemeSettings::get_global(cx);
-        let original_theme = theme_settings
-            .icon_theme
-            .name(SystemAppearance::global(cx).0);
-
-        let registry = ThemeRegistry::global(cx);
-        let mut themes = registry
-            .list_icon_themes()
-            .into_iter()
-            .filter(|meta| {
-                if let Some(theme_filter) = themes_filter {
-                    theme_filter.contains(&meta.name.to_string())
-                } else {
-                    true
-                }
-            })
-            .collect::<Vec<_>>();
-
-        themes.sort_unstable_by(|a, b| {
-            a.appearance
-                .is_light()
-                .cmp(&b.appearance.is_light())
-                .then(a.name.cmp(&b.name))
-        });
-        let matches = themes
-            .iter()
-            .map(|meta| StringMatch {
-                candidate_id: 0,
-                score: 0.0,
-                positions: Default::default(),
-                string: meta.name.to_string(),
-            })
-            .collect();
-        let mut this = Self {
-            fs,
-            themes,
-            matches,
-            original_theme: original_theme.clone(),
-            selected_index: 0,
-            selected_theme: None,
-            selection_completed: false,
-            selector,
-        };
-
-        this.select_if_matching(&original_theme.0);
-        this
-    }
-
-    fn show_selected_theme(
-        &mut self,
-        cx: &mut Context<Picker<IconThemeSelectorDelegate>>,
-    ) -> Option<IconThemeName> {
-        let mat = self.matches.get(self.selected_index)?;
-        let name = IconThemeName(mat.string.clone().into());
-        Self::set_icon_theme(name.clone(), cx);
-        Some(name)
-    }
-
-    fn select_if_matching(&mut self, theme_name: &str) {
-        self.selected_index = self
-            .matches
-            .iter()
-            .position(|mat| mat.string == theme_name)
-            .unwrap_or(self.selected_index);
-    }
-
-    fn set_icon_theme(name: IconThemeName, cx: &mut App) {
-        SettingsStore::update_global(cx, |store, _| {
-            let mut theme_settings = store.get::<ThemeSettings>(None).clone();
-            theme_settings.icon_theme = IconThemeSelection::Static(name);
-            store.override_global(theme_settings);
-        });
-    }
-}
-
-impl PickerDelegate for IconThemeSelectorDelegate {
-    type ListItem = ui::ListItem;
-
-    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
-        "Select Icon Theme...".into()
-    }
-
-    fn match_count(&self) -> usize {
-        self.matches.len()
-    }
-
-    fn confirm(
-        &mut self,
-        _: bool,
-        window: &mut Window,
-        cx: &mut Context<Picker<IconThemeSelectorDelegate>>,
-    ) {
-        self.selection_completed = true;
-
-        let theme_settings = ThemeSettings::get_global(cx);
-        let theme_name = theme_settings
-            .icon_theme
-            .name(SystemAppearance::global(cx).0);
-
-        telemetry::event!(
-            "Settings Changed",
-            setting = "icon_theme",
-            value = theme_name
-        );
-
-        let appearance = Appearance::from(window.appearance());
-
-        update_settings_file(self.fs.clone(), cx, move |settings, _| {
-            theme::set_icon_theme(settings, theme_name, appearance);
-        });
-
-        self.selector
-            .update(cx, |_, cx| {
-                cx.emit(DismissEvent);
-            })
-            .ok();
-    }
-
-    fn dismissed(&mut self, _: &mut Window, cx: &mut Context<Picker<IconThemeSelectorDelegate>>) {
-        if !self.selection_completed {
-            Self::set_icon_theme(self.original_theme.clone(), cx);
-            self.selection_completed = true;
-        }
-
-        self.selector
-            .update(cx, |_, cx| cx.emit(DismissEvent))
-            .log_err();
-    }
-
-    fn selected_index(&self) -> usize {
-        self.selected_index
-    }
-
-    fn set_selected_index(
-        &mut self,
-        ix: usize,
-        _: &mut Window,
-        cx: &mut Context<Picker<IconThemeSelectorDelegate>>,
-    ) {
-        self.selected_index = ix;
-        self.selected_theme = self.show_selected_theme(cx);
-    }
-
-    fn update_matches(
-        &mut self,
-        query: String,
-        window: &mut Window,
-        cx: &mut Context<Picker<IconThemeSelectorDelegate>>,
-    ) -> gpui::Task<()> {
-        let background = cx.background_executor().clone();
-        let candidates = self
-            .themes
-            .iter()
-            .enumerate()
-            .map(|(id, meta)| StringMatchCandidate::new(id, &meta.name))
-            .collect::<Vec<_>>();
-
-        cx.spawn_in(window, async move |this, cx| {
-            let matches = if query.is_empty() {
-                candidates
-                    .into_iter()
-                    .enumerate()
-                    .map(|(index, candidate)| StringMatch {
-                        candidate_id: index,
-                        string: candidate.string,
-                        positions: Vec::new(),
-                        score: 0.0,
-                    })
-                    .collect()
-            } else {
-                match_strings(
-                    &candidates,
-                    &query,
-                    false,
-                    true,
-                    100,
-                    &Default::default(),
-                    background,
-                )
-                .await
-            };
-
-            this.update(cx, |this, cx| {
-                this.delegate.matches = matches;
-                if query.is_empty() && this.delegate.selected_theme.is_none() {
-                    this.delegate.selected_index = this
-                        .delegate
-                        .selected_index
-                        .min(this.delegate.matches.len().saturating_sub(1));
-                } else if let Some(selected) = this.delegate.selected_theme.as_ref() {
-                    this.delegate.selected_index = this
-                        .delegate
-                        .matches
-                        .iter()
-                        .enumerate()
-                        .find(|(_, mtch)| mtch.string.as_str() == selected.0.as_ref())
-                        .map(|(ix, _)| ix)
-                        .unwrap_or_default();
-                } else {
-                    this.delegate.selected_index = 0;
-                }
-                this.delegate.selected_theme = this.delegate.show_selected_theme(cx);
-            })
-            .log_err();
-        })
-    }
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        _window: &mut Window,
-        _cx: &mut Context<Picker<Self>>,
-    ) -> Option<Self::ListItem> {
-        let theme_match = &self.matches.get(ix)?;
-
-        Some(
-            ListItem::new(ix)
-                .inset(true)
-                .spacing(ListItemSpacing::Sparse)
-                .toggle_state(selected)
-                .child(HighlightedLabel::new(
-                    theme_match.string.clone(),
-                    theme_match.positions.clone(),
-                )),
-        )
-    }
-
-    fn render_footer(
-        &self,
-        _window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<gpui::AnyElement> {
-        Some(
-            h_flex()
-                .p_2()
-                .w_full()
-                .justify_between()
-                .gap_2()
-                .border_t_1()
-                .border_color(cx.theme().colors().border_variant)
-                .child(
-                    Button::new("docs", "View Icon Theme Docs")
-                        .icon(IconName::ArrowUpRight)
-                        .icon_position(IconPosition::End)
-                        .icon_size(IconSize::Small)
-                        .icon_color(Color::Muted)
-                        .on_click(|_event, _window, cx| {
-                            cx.open_url("https://zed.dev/docs/icon-themes");
-                        }),
-                )
-                .child(
-                    Button::new("more-icon-themes", "Install Icon Themes").on_click(
-                        move |_event, window, cx| {
-                            window.dispatch_action(
-                                Box::new(Extensions {
-                                    category_filter: Some(ExtensionCategoryFilter::IconThemes),
-                                    id: None,
-                                }),
-                                cx,
-                            );
-                        },
-                    ),
-                )
-                .into_any_element(),
-        )
-    }
-}
diff --git a/crates/theme_selector/src/theme_selector.rs b/crates/theme_selector/src/theme_selector.rs
deleted file mode 100644
index 74b242dd0b..0000000000
--- a/crates/theme_selector/src/theme_selector.rs
+++ /dev/null
@@ -1,524 +0,0 @@
-mod icon_theme_selector;
-
-use fs::Fs;
-use fuzzy::{StringMatch, StringMatchCandidate, match_strings};
-use gpui::{
-    App, Context, DismissEvent, Entity, EventEmitter, Focusable, Render, UpdateGlobal, WeakEntity,
-    Window, actions,
-};
-use picker::{Picker, PickerDelegate};
-use settings::{Settings, SettingsStore, update_settings_file};
-use std::sync::Arc;
-use theme::{
-    Appearance, SystemAppearance, Theme, ThemeAppearanceMode, ThemeMeta, ThemeName, ThemeRegistry,
-    ThemeSelection, ThemeSettings,
-};
-use ui::{ListItem, ListItemSpacing, prelude::*, v_flex};
-use util::ResultExt;
-use workspace::{ModalView, Workspace, ui::HighlightedLabel, with_active_or_new_workspace};
-use zed_actions::{ExtensionCategoryFilter, Extensions};
-
-use crate::icon_theme_selector::{IconThemeSelector, IconThemeSelectorDelegate};
-
-actions!(
-    theme_selector,
-    [
-        /// Reloads all themes from disk.
-        Reload
-    ]
-);
-
-pub fn init(cx: &mut App) {
-    cx.on_action(|action: &zed_actions::theme_selector::Toggle, cx| {
-        let action = action.clone();
-        with_active_or_new_workspace(cx, move |workspace, window, cx| {
-            toggle_theme_selector(workspace, &action, window, cx);
-        });
-    });
-    cx.on_action(|action: &zed_actions::icon_theme_selector::Toggle, cx| {
-        let action = action.clone();
-        with_active_or_new_workspace(cx, move |workspace, window, cx| {
-            toggle_icon_theme_selector(workspace, &action, window, cx);
-        });
-    });
-}
-
-fn toggle_theme_selector(
-    workspace: &mut Workspace,
-    toggle: &zed_actions::theme_selector::Toggle,
-    window: &mut Window,
-    cx: &mut Context<Workspace>,
-) {
-    let fs = workspace.app_state().fs.clone();
-    workspace.toggle_modal(window, cx, |window, cx| {
-        let delegate = ThemeSelectorDelegate::new(
-            cx.entity().downgrade(),
-            fs,
-            toggle.themes_filter.as_ref(),
-            cx,
-        );
-        ThemeSelector::new(delegate, window, cx)
-    });
-}
-
-fn toggle_icon_theme_selector(
-    workspace: &mut Workspace,
-    toggle: &zed_actions::icon_theme_selector::Toggle,
-    window: &mut Window,
-    cx: &mut Context<Workspace>,
-) {
-    let fs = workspace.app_state().fs.clone();
-    workspace.toggle_modal(window, cx, |window, cx| {
-        let delegate = IconThemeSelectorDelegate::new(
-            cx.entity().downgrade(),
-            fs,
-            toggle.themes_filter.as_ref(),
-            cx,
-        );
-        IconThemeSelector::new(delegate, window, cx)
-    });
-}
-
-impl ModalView for ThemeSelector {}
-
-struct ThemeSelector {
-    picker: Entity<Picker<ThemeSelectorDelegate>>,
-}
-
-impl EventEmitter<DismissEvent> for ThemeSelector {}
-
-impl Focusable for ThemeSelector {
-    fn focus_handle(&self, cx: &App) -> gpui::FocusHandle {
-        self.picker.focus_handle(cx)
-    }
-}
-
-impl Render for ThemeSelector {
-    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
-        v_flex()
-            .key_context("ThemeSelector")
-            .w(rems(34.))
-            .child(self.picker.clone())
-    }
-}
-
-impl ThemeSelector {
-    pub fn new(
-        delegate: ThemeSelectorDelegate,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx));
-        Self { picker }
-    }
-}
-
-struct ThemeSelectorDelegate {
-    fs: Arc<dyn Fs>,
-    themes: Vec<ThemeMeta>,
-    matches: Vec<StringMatch>,
-    /// The theme that was selected before the `ThemeSelector` menu was opened.
-    ///
-    /// We use this to return back to theme that was set if the user dismisses the menu.
-    original_theme_settings: ThemeSettings,
-    /// The current system appearance.
-    original_system_appearance: Appearance,
-    /// The currently selected new theme.
-    new_theme: Arc<Theme>,
-    selection_completed: bool,
-    selected_theme: Option<Arc<Theme>>,
-    selected_index: usize,
-    selector: WeakEntity<ThemeSelector>,
-}
-
-impl ThemeSelectorDelegate {
-    fn new(
-        selector: WeakEntity<ThemeSelector>,
-        fs: Arc<dyn Fs>,
-        themes_filter: Option<&Vec<String>>,
-        cx: &mut Context<ThemeSelector>,
-    ) -> Self {
-        let original_theme = cx.theme().clone();
-        let original_theme_settings = ThemeSettings::get_global(cx).clone();
-        let original_system_appearance = SystemAppearance::global(cx).0;
-
-        let registry = ThemeRegistry::global(cx);
-        let mut themes = registry
-            .list()
-            .into_iter()
-            .filter(|meta| {
-                if let Some(theme_filter) = themes_filter {
-                    theme_filter.contains(&meta.name.to_string())
-                } else {
-                    true
-                }
-            })
-            .collect::<Vec<_>>();
-
-        // Sort by dark vs light, then by name.
-        themes.sort_unstable_by(|a, b| {
-            a.appearance
-                .is_light()
-                .cmp(&b.appearance.is_light())
-                .then(a.name.cmp(&b.name))
-        });
-
-        let matches: Vec<StringMatch> = themes
-            .iter()
-            .map(|meta| StringMatch {
-                candidate_id: 0,
-                score: 0.0,
-                positions: Default::default(),
-                string: meta.name.to_string(),
-            })
-            .collect();
-
-        // The current theme is likely in this list, so default to first showing that.
-        let selected_index = matches
-            .iter()
-            .position(|mat| mat.string == original_theme.name)
-            .unwrap_or(0);
-
-        Self {
-            fs,
-            themes,
-            matches,
-            original_theme_settings,
-            original_system_appearance,
-            new_theme: original_theme, // Start with the original theme.
-            selected_index,
-            selection_completed: false,
-            selected_theme: None,
-            selector,
-        }
-    }
-
-    fn show_selected_theme(
-        &mut self,
-        cx: &mut Context<Picker<ThemeSelectorDelegate>>,
-    ) -> Option<Arc<Theme>> {
-        if let Some(mat) = self.matches.get(self.selected_index) {
-            let registry = ThemeRegistry::global(cx);
-
-            match registry.get(&mat.string) {
-                Ok(theme) => {
-                    self.set_theme(theme.clone(), cx);
-                    Some(theme)
-                }
-                Err(error) => {
-                    log::error!("error loading theme {}: {}", mat.string, error);
-                    None
-                }
-            }
-        } else {
-            None
-        }
-    }
-
-    fn set_theme(&mut self, new_theme: Arc<Theme>, cx: &mut App) {
-        // Update the global (in-memory) theme settings.
-        SettingsStore::update_global(cx, |store, _| {
-            override_global_theme(
-                store,
-                &new_theme,
-                &self.original_theme_settings.theme,
-                self.original_system_appearance,
-            )
-        });
-
-        self.new_theme = new_theme;
-    }
-}
-
-/// Overrides the global (in-memory) theme settings.
-///
-/// Note that this does **not** update the user's `settings.json` file (see the
-/// [`ThemeSelectorDelegate::confirm`] method and [`theme::set_theme`] function).
-fn override_global_theme(
-    store: &mut SettingsStore,
-    new_theme: &Theme,
-    original_theme: &ThemeSelection,
-    system_appearance: Appearance,
-) {
-    let theme_name = ThemeName(new_theme.name.clone().into());
-    let new_appearance = new_theme.appearance();
-    let new_theme_is_light = new_appearance.is_light();
-
-    let mut curr_theme_settings = store.get::<ThemeSettings>(None).clone();
-
-    match (original_theme, &curr_theme_settings.theme) {
-        // Override the currently selected static theme.
-        (ThemeSelection::Static(_), ThemeSelection::Static(_)) => {
-            curr_theme_settings.theme = ThemeSelection::Static(theme_name);
-        }
-
-        // If the current theme selection is dynamic, then only override the global setting for the
-        // specific mode (light or dark).
-        (
-            ThemeSelection::Dynamic {
-                mode: original_mode,
-                light: original_light,
-                dark: original_dark,
-            },
-            ThemeSelection::Dynamic { .. },
-        ) => {
-            let new_mode = update_mode_if_new_appearance_is_different_from_system(
-                original_mode,
-                system_appearance,
-                new_appearance,
-            );
-
-            let updated_theme = retain_original_opposing_theme(
-                new_theme_is_light,
-                new_mode,
-                theme_name,
-                original_light,
-                original_dark,
-            );
-
-            curr_theme_settings.theme = updated_theme;
-        }
-
-        // The theme selection mode changed while selecting new themes (someone edited the settings
-        // file on disk while we had the dialogue open), so don't do anything.
-        _ => return,
-    };
-
-    store.override_global(curr_theme_settings);
-}
-
-/// Helper function for determining the new [`ThemeAppearanceMode`] for the new theme.
-///
-/// If the the original theme mode was [`System`] and the new theme's appearance matches the system
-/// appearance, we don't need to change the mode setting.
-///
-/// Otherwise, we need to change the mode in order to see the new theme.
-///
-/// [`System`]: ThemeAppearanceMode::System
-fn update_mode_if_new_appearance_is_different_from_system(
-    original_mode: &ThemeAppearanceMode,
-    system_appearance: Appearance,
-    new_appearance: Appearance,
-) -> ThemeAppearanceMode {
-    if original_mode == &ThemeAppearanceMode::System && system_appearance == new_appearance {
-        ThemeAppearanceMode::System
-    } else {
-        ThemeAppearanceMode::from(new_appearance)
-    }
-}
-
-/// Helper function for updating / displaying the [`ThemeSelection`] while using the theme selector.
-///
-/// We want to retain the alternate theme selection of the original settings (before the menu was
-/// opened), not the currently selected theme (which likely has changed multiple times while the
-/// menu has been open).
-fn retain_original_opposing_theme(
-    new_theme_is_light: bool,
-    new_mode: ThemeAppearanceMode,
-    theme_name: ThemeName,
-    original_light: &ThemeName,
-    original_dark: &ThemeName,
-) -> ThemeSelection {
-    if new_theme_is_light {
-        ThemeSelection::Dynamic {
-            mode: new_mode,
-            light: theme_name,
-            dark: original_dark.clone(),
-        }
-    } else {
-        ThemeSelection::Dynamic {
-            mode: new_mode,
-            light: original_light.clone(),
-            dark: theme_name,
-        }
-    }
-}
-
-impl PickerDelegate for ThemeSelectorDelegate {
-    type ListItem = ui::ListItem;
-
-    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
-        "Select Theme...".into()
-    }
-
-    fn match_count(&self) -> usize {
-        self.matches.len()
-    }
-
-    fn confirm(
-        &mut self,
-        _secondary: bool,
-        _window: &mut Window,
-        cx: &mut Context<Picker<ThemeSelectorDelegate>>,
-    ) {
-        self.selection_completed = true;
-
-        let theme_name: Arc<str> = self.new_theme.name.as_str().into();
-        let theme_appearance = self.new_theme.appearance;
-        let system_appearance = SystemAppearance::global(cx).0;
-
-        telemetry::event!("Settings Changed", setting = "theme", value = theme_name);
-
-        update_settings_file(self.fs.clone(), cx, move |settings, _| {
-            theme::set_theme(settings, theme_name, theme_appearance, system_appearance);
-        });
-
-        self.selector
-            .update(cx, |_, cx| {
-                cx.emit(DismissEvent);
-            })
-            .ok();
-    }
-
-    fn dismissed(&mut self, _: &mut Window, cx: &mut Context<Picker<ThemeSelectorDelegate>>) {
-        if !self.selection_completed {
-            SettingsStore::update_global(cx, |store, _| {
-                store.override_global(self.original_theme_settings.clone());
-            });
-            self.selection_completed = true;
-        }
-
-        self.selector
-            .update(cx, |_, cx| cx.emit(DismissEvent))
-            .log_err();
-    }
-
-    fn selected_index(&self) -> usize {
-        self.selected_index
-    }
-
-    fn set_selected_index(
-        &mut self,
-        ix: usize,
-        _: &mut Window,
-        cx: &mut Context<Picker<ThemeSelectorDelegate>>,
-    ) {
-        self.selected_index = ix;
-        self.selected_theme = self.show_selected_theme(cx);
-    }
-
-    fn update_matches(
-        &mut self,
-        query: String,
-        window: &mut Window,
-        cx: &mut Context<Picker<ThemeSelectorDelegate>>,
-    ) -> gpui::Task<()> {
-        let background = cx.background_executor().clone();
-        let candidates = self
-            .themes
-            .iter()
-            .enumerate()
-            .map(|(id, meta)| StringMatchCandidate::new(id, &meta.name))
-            .collect::<Vec<_>>();
-
-        cx.spawn_in(window, async move |this, cx| {
-            let matches = if query.is_empty() {
-                candidates
-                    .into_iter()
-                    .enumerate()
-                    .map(|(index, candidate)| StringMatch {
-                        candidate_id: index,
-                        string: candidate.string,
-                        positions: Vec::new(),
-                        score: 0.0,
-                    })
-                    .collect()
-            } else {
-                match_strings(
-                    &candidates,
-                    &query,
-                    false,
-                    true,
-                    100,
-                    &Default::default(),
-                    background,
-                )
-                .await
-            };
-
-            this.update(cx, |this, cx| {
-                this.delegate.matches = matches;
-                if query.is_empty() && this.delegate.selected_theme.is_none() {
-                    this.delegate.selected_index = this
-                        .delegate
-                        .selected_index
-                        .min(this.delegate.matches.len().saturating_sub(1));
-                } else if let Some(selected) = this.delegate.selected_theme.as_ref() {
-                    this.delegate.selected_index = this
-                        .delegate
-                        .matches
-                        .iter()
-                        .enumerate()
-                        .find(|(_, mtch)| mtch.string == selected.name)
-                        .map(|(ix, _)| ix)
-                        .unwrap_or_default();
-                } else {
-                    this.delegate.selected_index = 0;
-                }
-                this.delegate.selected_theme = this.delegate.show_selected_theme(cx);
-            })
-            .log_err();
-        })
-    }
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        _window: &mut Window,
-        _cx: &mut Context<Picker<Self>>,
-    ) -> Option<Self::ListItem> {
-        let theme_match = &self.matches.get(ix)?;
-
-        Some(
-            ListItem::new(ix)
-                .inset(true)
-                .spacing(ListItemSpacing::Sparse)
-                .toggle_state(selected)
-                .child(HighlightedLabel::new(
-                    theme_match.string.clone(),
-                    theme_match.positions.clone(),
-                )),
-        )
-    }
-
-    fn render_footer(
-        &self,
-        _: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<gpui::AnyElement> {
-        Some(
-            h_flex()
-                .p_2()
-                .w_full()
-                .justify_between()
-                .gap_2()
-                .border_t_1()
-                .border_color(cx.theme().colors().border_variant)
-                .child(
-                    Button::new("docs", "View Theme Docs")
-                        .icon(IconName::ArrowUpRight)
-                        .icon_position(IconPosition::End)
-                        .icon_size(IconSize::Small)
-                        .icon_color(Color::Muted)
-                        .on_click(cx.listener(|_, _, _, cx| {
-                            cx.open_url("https://zed.dev/docs/themes");
-                        })),
-                )
-                .child(
-                    Button::new("more-themes", "Install Themes").on_click(cx.listener({
-                        move |_, _, window, cx| {
-                            window.dispatch_action(
-                                Box::new(Extensions {
-                                    category_filter: Some(ExtensionCategoryFilter::Themes),
-                                    id: None,
-                                }),
-                                cx,
-                            );
-                        }
-                    })),
-                )
-                .into_any_element(),
-        )
-    }
-}
diff --git a/crates/time_format/Cargo.toml b/crates/time_format/Cargo.toml
deleted file mode 100644
index b598d19887..0000000000
--- a/crates/time_format/Cargo.toml
+++ /dev/null
@@ -1,21 +0,0 @@
-[package]
-name = "time_format"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/time_format.rs"
-doctest = false
-
-[dependencies]
-sys-locale.workspace = true
-time.workspace = true
-
-[target.'cfg(target_os = "macos")'.dependencies]
-core-foundation.workspace = true
-core-foundation-sys.workspace = true
diff --git a/crates/time_format/LICENSE-GPL b/crates/time_format/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/time_format/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/time_format/src/time_format.rs b/crates/time_format/src/time_format.rs
deleted file mode 100644
index 37d4201d1b..0000000000
--- a/crates/time_format/src/time_format.rs
+++ /dev/null
@@ -1,973 +0,0 @@
-use time::{OffsetDateTime, UtcOffset};
-
-/// The formatting style for a timestamp.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum TimestampFormat {
-    /// Formats the timestamp as an absolute time, e.g. "2021-12-31 3:00AM".
-    Absolute,
-    /// Formats the timestamp as an absolute time.
-    /// If the message is from today or yesterday the date will be replaced with "Today at x" or "Yesterday at x" respectively.
-    /// E.g. "Today at 12:00 PM", "Yesterday at 11:00 AM", "2021-12-31 3:00AM".
-    EnhancedAbsolute,
-    /// Formats the timestamp as an absolute time, using month name, day of month, year. e.g. "Feb. 24, 2024".
-    MediumAbsolute,
-    /// Formats the timestamp as a relative time, e.g. "just now", "1 minute ago", "2 hours ago", "2 months ago".
-    Relative,
-}
-
-/// Formats a timestamp, which respects the user's date and time preferences/custom format.
-pub fn format_localized_timestamp(
-    timestamp: OffsetDateTime,
-    reference: OffsetDateTime,
-    timezone: UtcOffset,
-    format: TimestampFormat,
-) -> String {
-    let timestamp_local = timestamp.to_offset(timezone);
-    let reference_local = reference.to_offset(timezone);
-    format_local_timestamp(timestamp_local, reference_local, format)
-}
-
-/// Formats a timestamp, which respects the user's date and time preferences/custom format.
-pub fn format_local_timestamp(
-    timestamp: OffsetDateTime,
-    reference: OffsetDateTime,
-    format: TimestampFormat,
-) -> String {
-    match format {
-        TimestampFormat::Absolute => format_absolute_timestamp(timestamp, reference, false),
-        TimestampFormat::EnhancedAbsolute => format_absolute_timestamp(timestamp, reference, true),
-        TimestampFormat::MediumAbsolute => format_absolute_timestamp_medium(timestamp, reference),
-        TimestampFormat::Relative => format_relative_time(timestamp, reference)
-            .unwrap_or_else(|| format_relative_date(timestamp, reference)),
-    }
-}
-
-/// Formats the date component of a timestamp
-pub fn format_date(
-    timestamp: OffsetDateTime,
-    reference: OffsetDateTime,
-    enhanced_formatting: bool,
-) -> String {
-    format_absolute_date(timestamp, reference, enhanced_formatting)
-}
-
-/// Formats the time component of a timestamp
-pub fn format_time(timestamp: OffsetDateTime) -> String {
-    format_absolute_time(timestamp)
-}
-
-/// Formats the date component of a timestamp in medium style
-pub fn format_date_medium(
-    timestamp: OffsetDateTime,
-    reference: OffsetDateTime,
-    enhanced_formatting: bool,
-) -> String {
-    format_absolute_date_medium(timestamp, reference, enhanced_formatting)
-}
-
-fn format_absolute_date(
-    timestamp: OffsetDateTime,
-    reference: OffsetDateTime,
-    #[allow(unused_variables)] enhanced_date_formatting: bool,
-) -> String {
-    #[cfg(target_os = "macos")]
-    {
-        if !enhanced_date_formatting {
-            return macos::format_date(&timestamp);
-        }
-
-        let timestamp_date = timestamp.date();
-        let reference_date = reference.date();
-        if timestamp_date == reference_date {
-            "Today".to_string()
-        } else if reference_date.previous_day() == Some(timestamp_date) {
-            "Yesterday".to_string()
-        } else {
-            macos::format_date(&timestamp)
-        }
-    }
-    #[cfg(not(target_os = "macos"))]
-    {
-        // todo(linux) respect user's date/time preferences
-        // todo(windows) respect user's date/time preferences
-        let current_locale = CURRENT_LOCALE
-            .get_or_init(|| sys_locale::get_locale().unwrap_or_else(|| String::from("en-US")));
-        format_timestamp_naive_date(
-            timestamp,
-            reference,
-            is_12_hour_time_by_locale(current_locale.as_str()),
-        )
-    }
-}
-
-fn format_absolute_time(timestamp: OffsetDateTime) -> String {
-    #[cfg(target_os = "macos")]
-    {
-        macos::format_time(&timestamp)
-    }
-    #[cfg(not(target_os = "macos"))]
-    {
-        // todo(linux) respect user's date/time preferences
-        // todo(windows) respect user's date/time preferences
-        let current_locale = CURRENT_LOCALE
-            .get_or_init(|| sys_locale::get_locale().unwrap_or_else(|| String::from("en-US")));
-        format_timestamp_naive_time(
-            timestamp,
-            is_12_hour_time_by_locale(current_locale.as_str()),
-        )
-    }
-}
-
-fn format_absolute_timestamp(
-    timestamp: OffsetDateTime,
-    reference: OffsetDateTime,
-    #[allow(unused_variables)] enhanced_date_formatting: bool,
-) -> String {
-    #[cfg(target_os = "macos")]
-    {
-        if !enhanced_date_formatting {
-            return format!(
-                "{} {}",
-                format_absolute_date(timestamp, reference, enhanced_date_formatting),
-                format_absolute_time(timestamp)
-            );
-        }
-
-        let timestamp_date = timestamp.date();
-        let reference_date = reference.date();
-        if timestamp_date == reference_date {
-            format!("Today at {}", format_absolute_time(timestamp))
-        } else if reference_date.previous_day() == Some(timestamp_date) {
-            format!("Yesterday at {}", format_absolute_time(timestamp))
-        } else {
-            format!(
-                "{} {}",
-                format_absolute_date(timestamp, reference, enhanced_date_formatting),
-                format_absolute_time(timestamp)
-            )
-        }
-    }
-    #[cfg(not(target_os = "macos"))]
-    {
-        // todo(linux) respect user's date/time preferences
-        // todo(windows) respect user's date/time preferences
-        format_timestamp_fallback(timestamp, reference)
-    }
-}
-
-fn format_absolute_date_medium(
-    timestamp: OffsetDateTime,
-    reference: OffsetDateTime,
-    enhanced_formatting: bool,
-) -> String {
-    #[cfg(target_os = "macos")]
-    {
-        if !enhanced_formatting {
-            return macos::format_date_medium(&timestamp);
-        }
-
-        let timestamp_date = timestamp.date();
-        let reference_date = reference.date();
-        if timestamp_date == reference_date {
-            "Today".to_string()
-        } else if reference_date.previous_day() == Some(timestamp_date) {
-            "Yesterday".to_string()
-        } else {
-            macos::format_date_medium(&timestamp)
-        }
-    }
-    #[cfg(not(target_os = "macos"))]
-    {
-        // todo(linux) respect user's date/time preferences
-        // todo(windows) respect user's date/time preferences
-        let current_locale = CURRENT_LOCALE
-            .get_or_init(|| sys_locale::get_locale().unwrap_or_else(|| String::from("en-US")));
-        if !enhanced_formatting {
-            return format_timestamp_naive_date_medium(
-                timestamp,
-                is_12_hour_time_by_locale(current_locale.as_str()),
-            );
-        }
-
-        let timestamp_date = timestamp.date();
-        let reference_date = reference.date();
-        if timestamp_date == reference_date {
-            "Today".to_string()
-        } else if reference_date.previous_day() == Some(timestamp_date) {
-            "Yesterday".to_string()
-        } else {
-            format_timestamp_naive_date_medium(
-                timestamp,
-                is_12_hour_time_by_locale(current_locale.as_str()),
-            )
-        }
-    }
-}
-
-fn format_absolute_timestamp_medium(
-    timestamp: OffsetDateTime,
-    reference: OffsetDateTime,
-) -> String {
-    #[cfg(target_os = "macos")]
-    {
-        format_absolute_date_medium(timestamp, reference, false)
-    }
-    #[cfg(not(target_os = "macos"))]
-    {
-        // todo(linux) respect user's date/time preferences
-        // todo(windows) respect user's date/time preferences
-        format_timestamp_fallback(timestamp, reference)
-    }
-}
-
-fn format_relative_time(timestamp: OffsetDateTime, reference: OffsetDateTime) -> Option<String> {
-    let difference = reference - timestamp;
-    let minutes = difference.whole_minutes();
-    match minutes {
-        0 => Some("Just now".to_string()),
-        1 => Some("1 minute ago".to_string()),
-        2..=59 => Some(format!("{} minutes ago", minutes)),
-        _ => {
-            let hours = difference.whole_hours();
-            match hours {
-                1 => Some("1 hour ago".to_string()),
-                2..=23 => Some(format!("{} hours ago", hours)),
-                _ => None,
-            }
-        }
-    }
-}
-
-fn format_relative_date(timestamp: OffsetDateTime, reference: OffsetDateTime) -> String {
-    let timestamp_date = timestamp.date();
-    let reference_date = reference.date();
-    let difference = reference_date - timestamp_date;
-    let days = difference.whole_days();
-    match days {
-        0 => "Today".to_string(),
-        1 => "Yesterday".to_string(),
-        2..=6 => format!("{} days ago", days),
-        _ => {
-            let weeks = difference.whole_weeks();
-            match weeks {
-                1 => "1 week ago".to_string(),
-                2..=4 => format!("{} weeks ago", weeks),
-                _ => {
-                    let month_diff = calculate_month_difference(timestamp, reference);
-                    match month_diff {
-                        0..=1 => "1 month ago".to_string(),
-                        2..=11 => format!("{} months ago", month_diff),
-                        _ => {
-                            let timestamp_year = timestamp_date.year();
-                            let reference_year = reference_date.year();
-                            let years = reference_year - timestamp_year;
-                            match years {
-                                1 => "1 year ago".to_string(),
-                                _ => format!("{} years ago", years),
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-/// Calculates the difference in months between two timestamps.
-/// The reference timestamp should always be greater than the timestamp.
-fn calculate_month_difference(timestamp: OffsetDateTime, reference: OffsetDateTime) -> usize {
-    let timestamp_year = timestamp.year();
-    let reference_year = reference.year();
-    let timestamp_month: u8 = timestamp.month().into();
-    let reference_month: u8 = reference.month().into();
-
-    let month_diff = if reference_month >= timestamp_month {
-        reference_month as usize - timestamp_month as usize
-    } else {
-        12 - timestamp_month as usize + reference_month as usize
-    };
-
-    let year_diff = (reference_year - timestamp_year) as usize;
-    if year_diff == 0 {
-        reference_month as usize - timestamp_month as usize
-    } else if month_diff == 0 {
-        year_diff * 12
-    } else if timestamp_month > reference_month {
-        (year_diff - 1) * 12 + month_diff
-    } else {
-        year_diff * 12 + month_diff
-    }
-}
-
-/// Formats a timestamp, which is either in 12-hour or 24-hour time format.
-/// Note:
-/// This function does not respect the user's date and time preferences.
-/// This should only be used as a fallback mechanism when the OS time formatting fails.
-fn format_timestamp_naive_time(timestamp_local: OffsetDateTime, is_12_hour_time: bool) -> String {
-    let timestamp_local_hour = timestamp_local.hour();
-    let timestamp_local_minute = timestamp_local.minute();
-
-    let (hour, meridiem) = if is_12_hour_time {
-        let meridiem = if timestamp_local_hour >= 12 {
-            "PM"
-        } else {
-            "AM"
-        };
-
-        let hour_12 = match timestamp_local_hour {
-            0 => 12,                              // Midnight
-            13..=23 => timestamp_local_hour - 12, // PM hours
-            _ => timestamp_local_hour,            // AM hours
-        };
-
-        (hour_12, Some(meridiem))
-    } else {
-        (timestamp_local_hour, None)
-    };
-
-    match meridiem {
-        Some(meridiem) => format!("{}:{:02} {}", hour, timestamp_local_minute, meridiem),
-        None => format!("{:02}:{:02}", hour, timestamp_local_minute),
-    }
-}
-
-#[cfg(not(target_os = "macos"))]
-fn format_timestamp_naive_date(
-    timestamp_local: OffsetDateTime,
-    reference_local: OffsetDateTime,
-    is_12_hour_time: bool,
-) -> String {
-    let reference_local_date = reference_local.date();
-    let timestamp_local_date = timestamp_local.date();
-
-    if timestamp_local_date == reference_local_date {
-        "Today".to_string()
-    } else if reference_local_date.previous_day() == Some(timestamp_local_date) {
-        "Yesterday".to_string()
-    } else {
-        match is_12_hour_time {
-            true => format!(
-                "{:02}/{:02}/{}",
-                timestamp_local_date.month() as u32,
-                timestamp_local_date.day(),
-                timestamp_local_date.year()
-            ),
-            false => format!(
-                "{:02}/{:02}/{}",
-                timestamp_local_date.day(),
-                timestamp_local_date.month() as u32,
-                timestamp_local_date.year()
-            ),
-        }
-    }
-}
-
-#[cfg(not(target_os = "macos"))]
-fn format_timestamp_naive_date_medium(
-    timestamp_local: OffsetDateTime,
-    is_12_hour_time: bool,
-) -> String {
-    let timestamp_local_date = timestamp_local.date();
-
-    match is_12_hour_time {
-        true => format!(
-            "{:02}/{:02}/{}",
-            timestamp_local_date.month() as u32,
-            timestamp_local_date.day(),
-            timestamp_local_date.year()
-        ),
-        false => format!(
-            "{:02}/{:02}/{}",
-            timestamp_local_date.day(),
-            timestamp_local_date.month() as u32,
-            timestamp_local_date.year()
-        ),
-    }
-}
-
-pub fn format_timestamp_naive(
-    timestamp_local: OffsetDateTime,
-    reference_local: OffsetDateTime,
-    is_12_hour_time: bool,
-) -> String {
-    let formatted_time = format_timestamp_naive_time(timestamp_local, is_12_hour_time);
-    let reference_local_date = reference_local.date();
-    let timestamp_local_date = timestamp_local.date();
-
-    if timestamp_local_date == reference_local_date {
-        format!("Today at {}", formatted_time)
-    } else if reference_local_date.previous_day() == Some(timestamp_local_date) {
-        format!("Yesterday at {}", formatted_time)
-    } else {
-        let formatted_date = match is_12_hour_time {
-            true => format!(
-                "{:02}/{:02}/{}",
-                timestamp_local_date.month() as u32,
-                timestamp_local_date.day(),
-                timestamp_local_date.year()
-            ),
-            false => format!(
-                "{:02}/{:02}/{}",
-                timestamp_local_date.day(),
-                timestamp_local_date.month() as u32,
-                timestamp_local_date.year()
-            ),
-        };
-        format!("{} {}", formatted_date, formatted_time)
-    }
-}
-
-#[cfg(not(target_os = "macos"))]
-static CURRENT_LOCALE: std::sync::OnceLock<String> = std::sync::OnceLock::new();
-
-#[cfg(not(target_os = "macos"))]
-fn format_timestamp_fallback(timestamp: OffsetDateTime, reference: OffsetDateTime) -> String {
-    let current_locale = CURRENT_LOCALE
-        .get_or_init(|| sys_locale::get_locale().unwrap_or_else(|| String::from("en-US")));
-
-    let is_12_hour_time = is_12_hour_time_by_locale(current_locale.as_str());
-    format_timestamp_naive(timestamp, reference, is_12_hour_time)
-}
-
-/// Returns `true` if the locale is recognized as a 12-hour time locale.
-#[cfg(not(target_os = "macos"))]
-fn is_12_hour_time_by_locale(locale: &str) -> bool {
-    [
-        "es-MX", "es-CO", "es-SV", "es-NI",
-        "es-HN", // Mexico, Colombia, El Salvador, Nicaragua, Honduras
-        "en-US", "en-CA", "en-AU", "en-NZ", // U.S, Canada, Australia, New Zealand
-        "ar-SA", "ar-EG", "ar-JO", // Saudi Arabia, Egypt, Jordan
-        "en-IN", "hi-IN", // India, Hindu
-        "en-PK", "ur-PK", // Pakistan, Urdu
-        "en-PH", "fil-PH", // Philippines, Filipino
-        "bn-BD", "ccp-BD", // Bangladesh, Chakma
-        "en-IE", "ga-IE", // Ireland, Irish
-        "en-MY", "ms-MY", // Malaysia, Malay
-    ]
-    .contains(&locale)
-}
-
-#[cfg(target_os = "macos")]
-mod macos {
-    use core_foundation::base::TCFType;
-    use core_foundation::date::CFAbsoluteTime;
-    use core_foundation::string::CFString;
-    use core_foundation_sys::date_formatter::CFDateFormatterCreateStringWithAbsoluteTime;
-    use core_foundation_sys::date_formatter::CFDateFormatterRef;
-    use core_foundation_sys::locale::CFLocaleRef;
-    use core_foundation_sys::{
-        base::kCFAllocatorDefault,
-        date_formatter::{
-            CFDateFormatterCreate, kCFDateFormatterMediumStyle, kCFDateFormatterNoStyle,
-            kCFDateFormatterShortStyle,
-        },
-        locale::CFLocaleCopyCurrent,
-    };
-
-    pub fn format_time(timestamp: &time::OffsetDateTime) -> String {
-        format_with_date_formatter(timestamp, TIME_FORMATTER.with(|f| *f))
-    }
-
-    pub fn format_date(timestamp: &time::OffsetDateTime) -> String {
-        format_with_date_formatter(timestamp, DATE_FORMATTER.with(|f| *f))
-    }
-
-    pub fn format_date_medium(timestamp: &time::OffsetDateTime) -> String {
-        format_with_date_formatter(timestamp, MEDIUM_DATE_FORMATTER.with(|f| *f))
-    }
-
-    fn format_with_date_formatter(
-        timestamp: &time::OffsetDateTime,
-        fmt: CFDateFormatterRef,
-    ) -> String {
-        const UNIX_TO_CF_ABSOLUTE_TIME_OFFSET: i64 = 978307200;
-        // Convert timestamp to macOS absolute time
-        let timestamp_macos = timestamp.unix_timestamp() - UNIX_TO_CF_ABSOLUTE_TIME_OFFSET;
-        let cf_absolute_time = timestamp_macos as CFAbsoluteTime;
-        unsafe {
-            let s = CFDateFormatterCreateStringWithAbsoluteTime(
-                kCFAllocatorDefault,
-                fmt,
-                cf_absolute_time,
-            );
-            CFString::wrap_under_create_rule(s).to_string()
-        }
-    }
-
-    thread_local! {
-        static CURRENT_LOCALE: CFLocaleRef = unsafe { CFLocaleCopyCurrent() };
-        static TIME_FORMATTER: CFDateFormatterRef = unsafe {
-            CFDateFormatterCreate(
-                kCFAllocatorDefault,
-                CURRENT_LOCALE.with(|locale| *locale),
-                kCFDateFormatterNoStyle,
-                kCFDateFormatterShortStyle,
-            )
-        };
-        static DATE_FORMATTER: CFDateFormatterRef = unsafe {
-            CFDateFormatterCreate(
-                kCFAllocatorDefault,
-                CURRENT_LOCALE.with(|locale| *locale),
-                kCFDateFormatterShortStyle,
-                kCFDateFormatterNoStyle,
-            )
-        };
-
-        static MEDIUM_DATE_FORMATTER: CFDateFormatterRef = unsafe {
-            CFDateFormatterCreate(
-                kCFAllocatorDefault,
-                CURRENT_LOCALE.with(|locale| *locale),
-                kCFDateFormatterMediumStyle,
-                kCFDateFormatterNoStyle,
-            )
-        };
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_format_date() {
-        let reference = create_offset_datetime(1990, 4, 12, 10, 30, 0);
-
-        // Test with same date (today)
-        let timestamp_today = create_offset_datetime(1990, 4, 12, 9, 30, 0);
-        assert_eq!(format_date(timestamp_today, reference, true), "Today");
-
-        // Test with previous day (yesterday)
-        let timestamp_yesterday = create_offset_datetime(1990, 4, 11, 9, 30, 0);
-        assert_eq!(
-            format_date(timestamp_yesterday, reference, true),
-            "Yesterday"
-        );
-
-        // Test with other date
-        let timestamp_other = create_offset_datetime(1990, 4, 10, 9, 30, 0);
-        let result = format_date(timestamp_other, reference, true);
-        assert!(!result.is_empty());
-        assert_ne!(result, "Today");
-        assert_ne!(result, "Yesterday");
-    }
-
-    #[test]
-    fn test_format_time() {
-        let timestamp = create_offset_datetime(1990, 4, 12, 9, 30, 0);
-
-        // We can't assert the exact output as it depends on the platform and locale
-        // But we can at least confirm it doesn't panic and returns a non-empty string
-        let result = format_time(timestamp);
-        assert!(!result.is_empty());
-    }
-
-    #[test]
-    fn test_format_date_medium() {
-        let reference = create_offset_datetime(1990, 4, 12, 10, 30, 0);
-        let timestamp = create_offset_datetime(1990, 4, 12, 9, 30, 0);
-
-        // Test with enhanced formatting (today)
-        let result_enhanced = format_date_medium(timestamp, reference, true);
-        assert_eq!(result_enhanced, "Today");
-
-        // Test with standard formatting
-        let result_standard = format_date_medium(timestamp, reference, false);
-        assert!(!result_standard.is_empty());
-
-        // Test yesterday with enhanced formatting
-        let timestamp_yesterday = create_offset_datetime(1990, 4, 11, 9, 30, 0);
-        let result_yesterday = format_date_medium(timestamp_yesterday, reference, true);
-        assert_eq!(result_yesterday, "Yesterday");
-
-        // Test other date with enhanced formatting
-        let timestamp_other = create_offset_datetime(1990, 4, 10, 9, 30, 0);
-        let result_other = format_date_medium(timestamp_other, reference, true);
-        assert!(!result_other.is_empty());
-        assert_ne!(result_other, "Today");
-        assert_ne!(result_other, "Yesterday");
-    }
-
-    #[test]
-    fn test_format_absolute_time() {
-        let timestamp = create_offset_datetime(1990, 4, 12, 9, 30, 0);
-
-        // We can't assert the exact output as it depends on the platform and locale
-        // But we can at least confirm it doesn't panic and returns a non-empty string
-        let result = format_absolute_time(timestamp);
-        assert!(!result.is_empty());
-    }
-
-    #[test]
-    fn test_format_absolute_date() {
-        let reference = create_offset_datetime(1990, 4, 12, 10, 30, 0);
-
-        // Test with same date (today)
-        let timestamp_today = create_offset_datetime(1990, 4, 12, 9, 30, 0);
-        assert_eq!(
-            format_absolute_date(timestamp_today, reference, true),
-            "Today"
-        );
-
-        // Test with previous day (yesterday)
-        let timestamp_yesterday = create_offset_datetime(1990, 4, 11, 9, 30, 0);
-        assert_eq!(
-            format_absolute_date(timestamp_yesterday, reference, true),
-            "Yesterday"
-        );
-
-        // Test with other date
-        let timestamp_other = create_offset_datetime(1990, 4, 10, 9, 30, 0);
-        let result = format_absolute_date(timestamp_other, reference, true);
-        assert!(!result.is_empty());
-        assert_ne!(result, "Today");
-        assert_ne!(result, "Yesterday");
-    }
-
-    #[test]
-    fn test_format_absolute_date_medium() {
-        let reference = create_offset_datetime(1990, 4, 12, 10, 30, 0);
-        let timestamp = create_offset_datetime(1990, 4, 12, 9, 30, 0);
-
-        // Test with enhanced formatting (today)
-        let result_enhanced = format_absolute_date_medium(timestamp, reference, true);
-        assert_eq!(result_enhanced, "Today");
-
-        // Test with standard formatting
-        let result_standard = format_absolute_date_medium(timestamp, reference, false);
-        assert!(!result_standard.is_empty());
-
-        // Test yesterday with enhanced formatting
-        let timestamp_yesterday = create_offset_datetime(1990, 4, 11, 9, 30, 0);
-        let result_yesterday = format_absolute_date_medium(timestamp_yesterday, reference, true);
-        assert_eq!(result_yesterday, "Yesterday");
-    }
-
-    #[test]
-    fn test_format_timestamp_naive_time() {
-        let timestamp = create_offset_datetime(1990, 4, 12, 9, 30, 0);
-        assert_eq!(format_timestamp_naive_time(timestamp, true), "9:30 AM");
-        assert_eq!(format_timestamp_naive_time(timestamp, false), "09:30");
-
-        let timestamp_pm = create_offset_datetime(1990, 4, 12, 15, 45, 0);
-        assert_eq!(format_timestamp_naive_time(timestamp_pm, true), "3:45 PM");
-        assert_eq!(format_timestamp_naive_time(timestamp_pm, false), "15:45");
-    }
-
-    #[test]
-    fn test_format_24_hour_time() {
-        let reference = create_offset_datetime(1990, 4, 12, 16, 45, 0);
-        let timestamp = create_offset_datetime(1990, 4, 12, 15, 30, 0);
-
-        assert_eq!(
-            format_timestamp_naive(timestamp, reference, false),
-            "Today at 15:30"
-        );
-    }
-
-    #[test]
-    fn test_format_today() {
-        let reference = create_offset_datetime(1990, 4, 12, 16, 45, 0);
-        let timestamp = create_offset_datetime(1990, 4, 12, 15, 30, 0);
-
-        assert_eq!(
-            format_timestamp_naive(timestamp, reference, true),
-            "Today at 3:30 PM"
-        );
-    }
-
-    #[test]
-    fn test_format_yesterday() {
-        let reference = create_offset_datetime(1990, 4, 12, 10, 30, 0);
-        let timestamp = create_offset_datetime(1990, 4, 11, 9, 0, 0);
-
-        assert_eq!(
-            format_timestamp_naive(timestamp, reference, true),
-            "Yesterday at 9:00 AM"
-        );
-    }
-
-    #[test]
-    fn test_format_yesterday_less_than_24_hours_ago() {
-        let reference = create_offset_datetime(1990, 4, 12, 19, 59, 0);
-        let timestamp = create_offset_datetime(1990, 4, 11, 20, 0, 0);
-
-        assert_eq!(
-            format_timestamp_naive(timestamp, reference, true),
-            "Yesterday at 8:00 PM"
-        );
-    }
-
-    #[test]
-    fn test_format_yesterday_more_than_24_hours_ago() {
-        let reference = create_offset_datetime(1990, 4, 12, 19, 59, 0);
-        let timestamp = create_offset_datetime(1990, 4, 11, 18, 0, 0);
-
-        assert_eq!(
-            format_timestamp_naive(timestamp, reference, true),
-            "Yesterday at 6:00 PM"
-        );
-    }
-
-    #[test]
-    fn test_format_yesterday_over_midnight() {
-        let reference = create_offset_datetime(1990, 4, 12, 0, 5, 0);
-        let timestamp = create_offset_datetime(1990, 4, 11, 23, 55, 0);
-
-        assert_eq!(
-            format_timestamp_naive(timestamp, reference, true),
-            "Yesterday at 11:55 PM"
-        );
-    }
-
-    #[test]
-    fn test_format_yesterday_over_month() {
-        let reference = create_offset_datetime(1990, 4, 2, 9, 0, 0);
-        let timestamp = create_offset_datetime(1990, 4, 1, 20, 0, 0);
-
-        assert_eq!(
-            format_timestamp_naive(timestamp, reference, true),
-            "Yesterday at 8:00 PM"
-        );
-    }
-
-    #[test]
-    fn test_format_before_yesterday() {
-        let reference = create_offset_datetime(1990, 4, 12, 10, 30, 0);
-        let timestamp = create_offset_datetime(1990, 4, 10, 20, 20, 0);
-
-        assert_eq!(
-            format_timestamp_naive(timestamp, reference, true),
-            "04/10/1990 8:20 PM"
-        );
-    }
-
-    #[test]
-    fn test_relative_format_minutes() {
-        let reference = create_offset_datetime(1990, 4, 12, 23, 0, 0);
-        let mut current_timestamp = reference;
-
-        let mut next_minute = || {
-            current_timestamp = if current_timestamp.minute() == 0 {
-                current_timestamp
-                    .replace_hour(current_timestamp.hour() - 1)
-                    .unwrap()
-                    .replace_minute(59)
-                    .unwrap()
-            } else {
-                current_timestamp
-                    .replace_minute(current_timestamp.minute() - 1)
-                    .unwrap()
-            };
-            current_timestamp
-        };
-
-        assert_eq!(
-            format_relative_time(reference, reference),
-            Some("Just now".to_string())
-        );
-
-        assert_eq!(
-            format_relative_time(next_minute(), reference),
-            Some("1 minute ago".to_string())
-        );
-
-        for i in 2..=59 {
-            assert_eq!(
-                format_relative_time(next_minute(), reference),
-                Some(format!("{} minutes ago", i))
-            );
-        }
-
-        assert_eq!(
-            format_relative_time(next_minute(), reference),
-            Some("1 hour ago".to_string())
-        );
-    }
-
-    #[test]
-    fn test_relative_format_hours() {
-        let reference = create_offset_datetime(1990, 4, 12, 23, 0, 0);
-        let mut current_timestamp = reference;
-
-        let mut next_hour = || {
-            current_timestamp = if current_timestamp.hour() == 0 {
-                let date = current_timestamp.date().previous_day().unwrap();
-                current_timestamp.replace_date(date)
-            } else {
-                current_timestamp
-                    .replace_hour(current_timestamp.hour() - 1)
-                    .unwrap()
-            };
-            current_timestamp
-        };
-
-        assert_eq!(
-            format_relative_time(next_hour(), reference),
-            Some("1 hour ago".to_string())
-        );
-
-        for i in 2..=23 {
-            assert_eq!(
-                format_relative_time(next_hour(), reference),
-                Some(format!("{} hours ago", i))
-            );
-        }
-
-        assert_eq!(format_relative_time(next_hour(), reference), None);
-    }
-
-    #[test]
-    fn test_relative_format_days() {
-        let reference = create_offset_datetime(1990, 4, 12, 23, 0, 0);
-        let mut current_timestamp = reference;
-
-        let mut next_day = || {
-            let date = current_timestamp.date().previous_day().unwrap();
-            current_timestamp = current_timestamp.replace_date(date);
-            current_timestamp
-        };
-
-        assert_eq!(
-            format_relative_date(reference, reference),
-            "Today".to_string()
-        );
-
-        assert_eq!(
-            format_relative_date(next_day(), reference),
-            "Yesterday".to_string()
-        );
-
-        for i in 2..=6 {
-            assert_eq!(
-                format_relative_date(next_day(), reference),
-                format!("{} days ago", i)
-            );
-        }
-
-        assert_eq!(format_relative_date(next_day(), reference), "1 week ago");
-    }
-
-    #[test]
-    fn test_relative_format_weeks() {
-        let reference = create_offset_datetime(1990, 4, 12, 23, 0, 0);
-        let mut current_timestamp = reference;
-
-        let mut next_week = || {
-            for _ in 0..7 {
-                let date = current_timestamp.date().previous_day().unwrap();
-                current_timestamp = current_timestamp.replace_date(date);
-            }
-            current_timestamp
-        };
-
-        assert_eq!(
-            format_relative_date(next_week(), reference),
-            "1 week ago".to_string()
-        );
-
-        for i in 2..=4 {
-            assert_eq!(
-                format_relative_date(next_week(), reference),
-                format!("{} weeks ago", i)
-            );
-        }
-
-        assert_eq!(format_relative_date(next_week(), reference), "1 month ago");
-    }
-
-    #[test]
-    fn test_relative_format_months() {
-        let reference = create_offset_datetime(1990, 4, 12, 23, 0, 0);
-        let mut current_timestamp = reference;
-
-        let mut next_month = || {
-            if current_timestamp.month() == time::Month::January {
-                current_timestamp = current_timestamp
-                    .replace_month(time::Month::December)
-                    .unwrap()
-                    .replace_year(current_timestamp.year() - 1)
-                    .unwrap();
-            } else {
-                current_timestamp = current_timestamp
-                    .replace_month(current_timestamp.month().previous())
-                    .unwrap();
-            }
-            current_timestamp
-        };
-
-        assert_eq!(
-            format_relative_date(next_month(), reference),
-            "4 weeks ago".to_string()
-        );
-
-        for i in 2..=11 {
-            assert_eq!(
-                format_relative_date(next_month(), reference),
-                format!("{} months ago", i)
-            );
-        }
-
-        assert_eq!(format_relative_date(next_month(), reference), "1 year ago");
-    }
-
-    #[test]
-    fn test_calculate_month_difference() {
-        let reference = create_offset_datetime(1990, 4, 12, 23, 0, 0);
-
-        assert_eq!(calculate_month_difference(reference, reference), 0);
-
-        assert_eq!(
-            calculate_month_difference(create_offset_datetime(1990, 1, 12, 23, 0, 0), reference),
-            3
-        );
-
-        assert_eq!(
-            calculate_month_difference(create_offset_datetime(1989, 11, 12, 23, 0, 0), reference),
-            5
-        );
-
-        assert_eq!(
-            calculate_month_difference(create_offset_datetime(1989, 4, 12, 23, 0, 0), reference),
-            12
-        );
-
-        assert_eq!(
-            calculate_month_difference(create_offset_datetime(1989, 3, 12, 23, 0, 0), reference),
-            13
-        );
-
-        assert_eq!(
-            calculate_month_difference(create_offset_datetime(1987, 5, 12, 23, 0, 0), reference),
-            35
-        );
-
-        assert_eq!(
-            calculate_month_difference(create_offset_datetime(1987, 4, 12, 23, 0, 0), reference),
-            36
-        );
-
-        assert_eq!(
-            calculate_month_difference(create_offset_datetime(1987, 3, 12, 23, 0, 0), reference),
-            37
-        );
-    }
-
-    fn test_timezone() -> UtcOffset {
-        UtcOffset::from_hms(0, 0, 0).expect("Valid timezone offset")
-    }
-
-    fn create_offset_datetime(
-        year: i32,
-        month: u8,
-        day: u8,
-        hour: u8,
-        minute: u8,
-        second: u8,
-    ) -> OffsetDateTime {
-        let date = time::Date::from_calendar_date(year, time::Month::try_from(month).unwrap(), day)
-            .unwrap();
-        let time = time::Time::from_hms(hour, minute, second).unwrap();
-        let date = date.with_time(time).assume_utc(); // Assume UTC for simplicity
-        date.to_offset(test_timezone())
-    }
-}
diff --git a/crates/title_bar/Cargo.toml b/crates/title_bar/Cargo.toml
deleted file mode 100644
index 6d5d0ce170..0000000000
--- a/crates/title_bar/Cargo.toml
+++ /dev/null
@@ -1,71 +0,0 @@
-[package]
-name = "title_bar"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/title_bar.rs"
-doctest = false
-
-[features]
-default = []
-stories = ["dep:story"]
-test-support = [
-    "call/test-support",
-    "client/test-support",
-    "collections/test-support",
-    "gpui/test-support",
-    "http_client/test-support",
-    "project/test-support",
-    "util/test-support",
-    "workspace/test-support",
-]
-
-[dependencies]
-anyhow.workspace = true
-auto_update.workspace = true
-call.workspace = true
-channel.workspace = true
-chrono.workspace = true
-client.workspace = true
-cloud_llm_client.workspace = true
-db.workspace = true
-gpui = { workspace = true, features = ["screen-capture"] }
-notifications.workspace = true
-project.workspace = true
-remote.workspace = true
-rpc.workspace = true
-schemars.workspace = true
-serde.workspace = true
-settings.workspace = true
-smallvec.workspace = true
-story = { workspace = true, optional = true }
-telemetry.workspace = true
-theme.workspace = true
-ui.workspace = true
-util.workspace = true
-workspace.workspace = true
-zed_actions.workspace = true
-
-[target.'cfg(windows)'.dependencies]
-windows.workspace = true
-
-[dev-dependencies]
-call = { workspace = true, features = ["test-support"] }
-client = { workspace = true, features = ["test-support"] }
-collections = { workspace = true, features = ["test-support"] }
-gpui = { workspace = true, features = ["test-support"] }
-http_client = { workspace = true, features = ["test-support"] }
-notifications = { workspace = true, features = ["test-support"] }
-pretty_assertions.workspace = true
-project = { workspace = true, features = ["test-support"] }
-rpc = { workspace = true, features = ["test-support"] }
-settings = { workspace = true, features = ["test-support"] }
-tree-sitter-md.workspace = true
-util = { workspace = true, features = ["test-support"] }
-workspace = { workspace = true, features = ["test-support"] }
diff --git a/crates/title_bar/LICENSE-GPL b/crates/title_bar/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/title_bar/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/title_bar/src/application_menu.rs b/crates/title_bar/src/application_menu.rs
deleted file mode 100644
index 817b73c45e..0000000000
--- a/crates/title_bar/src/application_menu.rs
+++ /dev/null
@@ -1,324 +0,0 @@
-use gpui::{Entity, OwnedMenu, OwnedMenuItem};
-use settings::Settings;
-
-#[cfg(not(target_os = "macos"))]
-use gpui::{Action, actions};
-
-#[cfg(not(target_os = "macos"))]
-use schemars::JsonSchema;
-#[cfg(not(target_os = "macos"))]
-use serde::Deserialize;
-
-use smallvec::SmallVec;
-use ui::{ContextMenu, PopoverMenu, PopoverMenuHandle, Tooltip, prelude::*};
-
-use crate::title_bar_settings::TitleBarSettings;
-
-#[cfg(not(target_os = "macos"))]
-actions!(
-    app_menu,
-    [
-        /// Navigates to the menu item on the right.
-        ActivateMenuRight,
-        /// Navigates to the menu item on the left.
-        ActivateMenuLeft
-    ]
-);
-
-#[cfg(not(target_os = "macos"))]
-#[derive(Clone, Deserialize, JsonSchema, PartialEq, Default, Action)]
-#[action(namespace = app_menu)]
-pub struct OpenApplicationMenu(String);
-
-#[cfg(not(target_os = "macos"))]
-pub enum ActivateDirection {
-    Left,
-    Right,
-}
-
-#[derive(Clone)]
-struct MenuEntry {
-    menu: OwnedMenu,
-    handle: PopoverMenuHandle<ContextMenu>,
-}
-
-pub struct ApplicationMenu {
-    entries: SmallVec<[MenuEntry; 8]>,
-    pending_menu_open: Option<String>,
-}
-
-impl ApplicationMenu {
-    pub fn new(_: &mut Window, cx: &mut Context<Self>) -> Self {
-        let menus = cx.get_menus().unwrap_or_default();
-        Self {
-            entries: menus
-                .into_iter()
-                .map(|menu| MenuEntry {
-                    menu,
-                    handle: PopoverMenuHandle::default(),
-                })
-                .collect(),
-            pending_menu_open: None,
-        }
-    }
-
-    fn sanitize_menu_items(items: Vec<OwnedMenuItem>) -> Vec<OwnedMenuItem> {
-        let mut cleaned = Vec::new();
-        let mut last_was_separator = false;
-
-        for item in items {
-            match item {
-                OwnedMenuItem::Separator => {
-                    if !last_was_separator {
-                        cleaned.push(item);
-                        last_was_separator = true;
-                    }
-                }
-                OwnedMenuItem::Submenu(submenu) => {
-                    // Skip empty submenus
-                    if !submenu.items.is_empty() {
-                        cleaned.push(OwnedMenuItem::Submenu(submenu));
-                        last_was_separator = false;
-                    }
-                }
-                item => {
-                    cleaned.push(item);
-                    last_was_separator = false;
-                }
-            }
-        }
-
-        // Remove trailing separator
-        if let Some(OwnedMenuItem::Separator) = cleaned.last() {
-            cleaned.pop();
-        }
-
-        cleaned
-    }
-
-    fn build_menu_from_items(
-        entry: MenuEntry,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Entity<ContextMenu> {
-        ContextMenu::build(window, cx, |menu, window, cx| {
-            // Grab current focus handle so menu can shown items in context with the focused element
-            let menu = menu.when_some(window.focused(cx), |menu, focused| menu.context(focused));
-            let sanitized_items = Self::sanitize_menu_items(entry.menu.items);
-
-            sanitized_items
-                .into_iter()
-                .fold(menu, |menu, item| match item {
-                    OwnedMenuItem::Separator => menu.separator(),
-                    OwnedMenuItem::Action {
-                        name,
-                        action,
-                        checked,
-                        ..
-                    } => menu.action_checked(name, action, checked),
-                    OwnedMenuItem::Submenu(submenu) => {
-                        submenu
-                            .items
-                            .into_iter()
-                            .fold(menu, |menu, item| match item {
-                                OwnedMenuItem::Separator => menu.separator(),
-                                OwnedMenuItem::Action {
-                                    name,
-                                    action,
-                                    checked,
-                                    ..
-                                } => menu.action_checked(name, action, checked),
-                                OwnedMenuItem::Submenu(_) => menu,
-                                OwnedMenuItem::SystemMenu(_) => {
-                                    // A system menu doesn't make sense in this context, so ignore it
-                                    menu
-                                }
-                            })
-                    }
-                    OwnedMenuItem::SystemMenu(_) => {
-                        // A system menu doesn't make sense in this context, so ignore it
-                        menu
-                    }
-                })
-        })
-    }
-
-    fn render_application_menu(&self, entry: &MenuEntry) -> impl IntoElement {
-        let handle = entry.handle.clone();
-
-        let menu_name = entry.menu.name.clone();
-        let entry = entry.clone();
-
-        // Application menu must have same ids as first menu item in standard menu
-        div()
-            .id(format!("{}-menu-item", menu_name))
-            .occlude()
-            .child(
-                PopoverMenu::new(format!("{}-menu-popover", menu_name))
-                    .menu(move |window, cx| {
-                        Self::build_menu_from_items(entry.clone(), window, cx).into()
-                    })
-                    .trigger_with_tooltip(
-                        IconButton::new(
-                            SharedString::from(format!("{}-menu-trigger", menu_name)),
-                            ui::IconName::Menu,
-                        )
-                        .style(ButtonStyle::Subtle)
-                        .icon_size(IconSize::Small),
-                        Tooltip::text("Open Application Menu"),
-                    )
-                    .with_handle(handle),
-            )
-    }
-
-    fn render_standard_menu(&self, entry: &MenuEntry) -> impl IntoElement {
-        let current_handle = entry.handle.clone();
-
-        let menu_name = entry.menu.name.clone();
-        let entry = entry.clone();
-
-        let all_handles: Vec<_> = self
-            .entries
-            .iter()
-            .map(|entry| entry.handle.clone())
-            .collect();
-
-        div()
-            .id(format!("{}-menu-item", menu_name))
-            .occlude()
-            .child(
-                PopoverMenu::new(format!("{}-menu-popover", menu_name))
-                    .menu(move |window, cx| {
-                        Self::build_menu_from_items(entry.clone(), window, cx).into()
-                    })
-                    .trigger(
-                        Button::new(
-                            SharedString::from(format!("{}-menu-trigger", menu_name)),
-                            menu_name,
-                        )
-                        .style(ButtonStyle::Subtle)
-                        .label_size(LabelSize::Small),
-                    )
-                    .with_handle(current_handle.clone()),
-            )
-            .on_hover(move |hover_enter, window, cx| {
-                if *hover_enter && !current_handle.is_deployed() {
-                    all_handles.iter().for_each(|h| h.hide(cx));
-
-                    // We need to defer this so that this menu handle can take focus from the previous menu
-                    let handle = current_handle.clone();
-                    window.defer(cx, move |window, cx| handle.show(window, cx));
-                }
-            })
-    }
-
-    #[cfg(not(target_os = "macos"))]
-    pub fn open_menu(
-        &mut self,
-        action: &OpenApplicationMenu,
-        _window: &mut Window,
-        _cx: &mut Context<Self>,
-    ) {
-        self.pending_menu_open = Some(action.0.clone());
-    }
-
-    #[cfg(not(target_os = "macos"))]
-    pub fn navigate_menus_in_direction(
-        &mut self,
-        direction: ActivateDirection,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let current_index = self
-            .entries
-            .iter()
-            .position(|entry| entry.handle.is_deployed());
-        let Some(current_index) = current_index else {
-            return;
-        };
-
-        let next_index = match direction {
-            ActivateDirection::Left => {
-                if current_index == 0 {
-                    self.entries.len() - 1
-                } else {
-                    current_index - 1
-                }
-            }
-            ActivateDirection::Right => {
-                if current_index == self.entries.len() - 1 {
-                    0
-                } else {
-                    current_index + 1
-                }
-            }
-        };
-
-        self.entries[current_index].handle.hide(cx);
-
-        // We need to defer this so that this menu handle can take focus from the previous menu
-        let next_handle = self.entries[next_index].handle.clone();
-        cx.defer_in(window, move |_, window, cx| next_handle.show(window, cx));
-    }
-
-    pub fn all_menus_shown(&self, cx: &mut Context<Self>) -> bool {
-        show_menus(cx)
-            || self.entries.iter().any(|entry| entry.handle.is_deployed())
-            || self.pending_menu_open.is_some()
-    }
-}
-
-pub(crate) fn show_menus(cx: &mut App) -> bool {
-    TitleBarSettings::get_global(cx).show_menus
-        && (cfg!(not(target_os = "macos")) || option_env!("ZED_USE_CROSS_PLATFORM_MENU").is_some())
-}
-
-impl Render for ApplicationMenu {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let all_menus_shown = self.all_menus_shown(cx);
-
-        if let Some(pending_menu_open) = self.pending_menu_open.take()
-            && let Some(entry) = self
-                .entries
-                .iter()
-                .find(|entry| entry.menu.name == pending_menu_open && !entry.handle.is_deployed())
-        {
-            let handle_to_show = entry.handle.clone();
-            let handles_to_hide: Vec<_> = self
-                .entries
-                .iter()
-                .filter(|e| e.menu.name != pending_menu_open && e.handle.is_deployed())
-                .map(|e| e.handle.clone())
-                .collect();
-
-            if handles_to_hide.is_empty() {
-                // We need to wait for the next frame to show all menus first,
-                // before we can handle show/hide operations
-                window.on_next_frame(move |window, cx| {
-                    handles_to_hide.iter().for_each(|handle| handle.hide(cx));
-                    window.defer(cx, move |window, cx| handle_to_show.show(window, cx));
-                });
-            } else {
-                // Since menus are already shown, we can directly handle show/hide operations
-                handles_to_hide.iter().for_each(|handle| handle.hide(cx));
-                cx.defer_in(window, move |_, window, cx| handle_to_show.show(window, cx));
-            }
-        }
-
-        div()
-            .key_context("ApplicationMenu")
-            .flex()
-            .flex_row()
-            .gap_x_1()
-            .when(!all_menus_shown && !self.entries.is_empty(), |this| {
-                this.child(self.render_application_menu(&self.entries[0]))
-            })
-            .when(all_menus_shown, |this| {
-                this.children(
-                    self.entries
-                        .iter()
-                        .map(|entry| self.render_standard_menu(entry)),
-                )
-            })
-    }
-}
diff --git a/crates/title_bar/src/collab.rs b/crates/title_bar/src/collab.rs
deleted file mode 100644
index 8a2d23dd26..0000000000
--- a/crates/title_bar/src/collab.rs
+++ /dev/null
@@ -1,627 +0,0 @@
-use std::rc::Rc;
-use std::sync::Arc;
-
-use call::{ActiveCall, ParticipantLocation, Room};
-use channel::ChannelStore;
-use client::{User, proto::PeerId};
-use gpui::{
-    AnyElement, Hsla, IntoElement, MouseButton, Path, ScreenCaptureSource, Styled, WeakEntity,
-    canvas, point,
-};
-use gpui::{App, Task, Window};
-use project::WorktreeSettings;
-use rpc::proto::{self};
-use settings::{Settings as _, SettingsLocation};
-use theme::ActiveTheme;
-use ui::{
-    Avatar, AvatarAudioStatusIndicator, ContextMenu, ContextMenuItem, Divider, DividerColor,
-    Facepile, PopoverMenu, SplitButton, SplitButtonStyle, TintColor, Tooltip, prelude::*,
-};
-use util::rel_path::RelPath;
-use workspace::notifications::DetachAndPromptErr;
-
-use crate::TitleBar;
-
-pub fn toggle_screen_sharing(
-    screen: anyhow::Result<Option<Rc<dyn ScreenCaptureSource>>>,
-    window: &mut Window,
-    cx: &mut App,
-) {
-    let call = ActiveCall::global(cx).read(cx);
-    let toggle_screen_sharing = match screen {
-        Ok(screen) => {
-            let Some(room) = call.room().cloned() else {
-                return;
-            };
-
-            room.update(cx, |room, cx| {
-                let clicked_on_currently_shared_screen =
-                    room.shared_screen_id().is_some_and(|screen_id| {
-                        Some(screen_id)
-                            == screen
-                                .as_deref()
-                                .and_then(|s| s.metadata().ok().map(|meta| meta.id))
-                    });
-                let should_unshare_current_screen = room.is_sharing_screen();
-                let unshared_current_screen = should_unshare_current_screen.then(|| {
-                    telemetry::event!(
-                        "Screen Share Disabled",
-                        room_id = room.id(),
-                        channel_id = room.channel_id(),
-                    );
-                    room.unshare_screen(clicked_on_currently_shared_screen || screen.is_none(), cx)
-                });
-                if let Some(screen) = screen {
-                    if !should_unshare_current_screen {
-                        telemetry::event!(
-                            "Screen Share Enabled",
-                            room_id = room.id(),
-                            channel_id = room.channel_id(),
-                        );
-                    }
-                    cx.spawn(async move |room, cx| {
-                        unshared_current_screen.transpose()?;
-                        if !clicked_on_currently_shared_screen {
-                            room.update(cx, |room, cx| room.share_screen(screen, cx))?
-                                .await
-                        } else {
-                            Ok(())
-                        }
-                    })
-                } else {
-                    Task::ready(Ok(()))
-                }
-            })
-        }
-        Err(e) => Task::ready(Err(e)),
-    };
-    toggle_screen_sharing.detach_and_prompt_err("Sharing Screen Failed", window, cx, |e, _, _| Some(format!("{:?}\n\nPlease check that you have given Zed permissions to record your screen in Settings.", e)));
-}
-
-pub fn toggle_mute(cx: &mut App) {
-    let call = ActiveCall::global(cx).read(cx);
-    if let Some(room) = call.room().cloned() {
-        room.update(cx, |room, cx| {
-            let operation = if room.is_muted() {
-                "Microphone Enabled"
-            } else {
-                "Microphone Disabled"
-            };
-            telemetry::event!(
-                operation,
-                room_id = room.id(),
-                channel_id = room.channel_id(),
-            );
-
-            room.toggle_mute(cx)
-        });
-    }
-}
-
-pub fn toggle_deafen(cx: &mut App) {
-    if let Some(room) = ActiveCall::global(cx).read(cx).room().cloned() {
-        room.update(cx, |room, cx| room.toggle_deafen(cx));
-    }
-}
-
-fn render_color_ribbon(color: Hsla) -> impl Element {
-    canvas(
-        move |_, _, _| {},
-        move |bounds, _, window, _| {
-            let height = bounds.size.height;
-            let horizontal_offset = height;
-            let vertical_offset = height / 2.0;
-            let mut path = Path::new(bounds.bottom_left());
-            path.curve_to(
-                bounds.origin + point(horizontal_offset, vertical_offset),
-                bounds.origin + point(px(0.0), vertical_offset),
-            );
-            path.line_to(bounds.top_right() + point(-horizontal_offset, vertical_offset));
-            path.curve_to(
-                bounds.bottom_right(),
-                bounds.top_right() + point(px(0.0), vertical_offset),
-            );
-            path.line_to(bounds.bottom_left());
-            window.paint_path(path, color);
-        },
-    )
-    .h_1()
-    .w_full()
-}
-
-impl TitleBar {
-    pub(crate) fn render_collaborator_list(
-        &self,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let room = ActiveCall::global(cx).read(cx).room().cloned();
-        let current_user = self.user_store.read(cx).current_user();
-        let client = self.client.clone();
-        let project_id = self.project.read(cx).remote_id();
-        let workspace = self.workspace.upgrade();
-
-        h_flex()
-            .id("collaborator-list")
-            .w_full()
-            .gap_1()
-            .overflow_x_scroll()
-            .when_some(
-                current_user.zip(client.peer_id()).zip(room),
-                |this, ((current_user, peer_id), room)| {
-                    let player_colors = cx.theme().players();
-                    let room = room.read(cx);
-                    let mut remote_participants =
-                        room.remote_participants().values().collect::<Vec<_>>();
-                    remote_participants.sort_by_key(|p| p.participant_index.0);
-
-                    let current_user_face_pile = self.render_collaborator(
-                        &current_user,
-                        peer_id,
-                        true,
-                        room.is_speaking(),
-                        room.is_muted(),
-                        None,
-                        room,
-                        project_id,
-                        &current_user,
-                        cx,
-                    );
-
-                    this.children(current_user_face_pile.map(|face_pile| {
-                        v_flex()
-                            .on_mouse_down(MouseButton::Left, |_, window, _| {
-                                window.prevent_default()
-                            })
-                            .child(face_pile)
-                            .child(render_color_ribbon(player_colors.local().cursor))
-                    }))
-                    .children(remote_participants.iter().filter_map(|collaborator| {
-                        let player_color =
-                            player_colors.color_for_participant(collaborator.participant_index.0);
-                        let is_following = workspace
-                            .as_ref()?
-                            .read(cx)
-                            .is_being_followed(collaborator.peer_id);
-                        let is_present = project_id.is_some_and(|project_id| {
-                            collaborator.location
-                                == ParticipantLocation::SharedProject { project_id }
-                        });
-
-                        let facepile = self.render_collaborator(
-                            &collaborator.user,
-                            collaborator.peer_id,
-                            is_present,
-                            collaborator.speaking,
-                            collaborator.muted,
-                            is_following.then_some(player_color.selection),
-                            room,
-                            project_id,
-                            &current_user,
-                            cx,
-                        )?;
-
-                        Some(
-                            v_flex()
-                                .id(("collaborator", collaborator.user.id))
-                                .child(facepile)
-                                .child(render_color_ribbon(player_color.cursor))
-                                .cursor_pointer()
-                                .on_mouse_down(MouseButton::Left, |_, window, _| {
-                                    window.prevent_default()
-                                })
-                                .on_click({
-                                    let peer_id = collaborator.peer_id;
-                                    cx.listener(move |this, _, window, cx| {
-                                        cx.stop_propagation();
-
-                                        this.workspace
-                                            .update(cx, |workspace, cx| {
-                                                if is_following {
-                                                    workspace.unfollow(peer_id, window, cx);
-                                                } else {
-                                                    workspace.follow(peer_id, window, cx);
-                                                }
-                                            })
-                                            .ok();
-                                    })
-                                })
-                                .tooltip({
-                                    let login = collaborator.user.github_login.clone();
-                                    Tooltip::text(format!("Follow {login}"))
-                                }),
-                        )
-                    }))
-                },
-            )
-    }
-
-    fn render_collaborator(
-        &self,
-        user: &Arc<User>,
-        peer_id: PeerId,
-        is_present: bool,
-        is_speaking: bool,
-        is_muted: bool,
-        leader_selection_color: Option<Hsla>,
-        room: &Room,
-        project_id: Option<u64>,
-        current_user: &Arc<User>,
-        cx: &App,
-    ) -> Option<Div> {
-        if room.role_for_user(user.id) == Some(proto::ChannelRole::Guest) {
-            return None;
-        }
-
-        const FACEPILE_LIMIT: usize = 3;
-        let followers = project_id.map_or(&[] as &[_], |id| room.followers_for(peer_id, id));
-        let extra_count = followers.len().saturating_sub(FACEPILE_LIMIT);
-
-        Some(
-            div()
-                .m_0p5()
-                .p_0p5()
-                // When the collaborator is not followed, still draw this wrapper div, but leave
-                // it transparent, so that it does not shift the layout when following.
-                .when_some(leader_selection_color, |div, color| {
-                    div.rounded_sm().bg(color)
-                })
-                .child(
-                    Facepile::empty()
-                        .child(
-                            Avatar::new(user.avatar_uri.clone())
-                                .grayscale(!is_present)
-                                .border_color(if is_speaking {
-                                    cx.theme().status().info
-                                } else {
-                                    // We draw the border in a transparent color rather to avoid
-                                    // the layout shift that would come with adding/removing the border.
-                                    gpui::transparent_black()
-                                })
-                                .when(is_muted, |avatar| {
-                                    avatar.indicator(
-                                        AvatarAudioStatusIndicator::new(ui::AudioStatus::Muted)
-                                            .tooltip({
-                                                let github_login = user.github_login.clone();
-                                                Tooltip::text(format!("{} is muted", github_login))
-                                            }),
-                                    )
-                                }),
-                        )
-                        .children(followers.iter().take(FACEPILE_LIMIT).filter_map(
-                            |follower_peer_id| {
-                                let follower = room
-                                    .remote_participants()
-                                    .values()
-                                    .find_map(|p| {
-                                        (p.peer_id == *follower_peer_id).then_some(&p.user)
-                                    })
-                                    .or_else(|| {
-                                        (self.client.peer_id() == Some(*follower_peer_id))
-                                            .then_some(current_user)
-                                    })?
-                                    .clone();
-
-                                Some(div().mt(-px(4.)).child(
-                                    Avatar::new(follower.avatar_uri.clone()).size(rems(0.75)),
-                                ))
-                            },
-                        ))
-                        .children(if extra_count > 0 {
-                            Some(
-                                Label::new(format!("+{extra_count}"))
-                                    .ml_1()
-                                    .into_any_element(),
-                            )
-                        } else {
-                            None
-                        }),
-                ),
-        )
-    }
-
-    pub(crate) fn render_call_controls(
-        &self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Vec<AnyElement> {
-        let Some(room) = ActiveCall::global(cx).read(cx).room().cloned() else {
-            return Vec::new();
-        };
-
-        let is_connecting_to_project = self
-            .workspace
-            .update(cx, |workspace, cx| workspace.has_active_modal(window, cx))
-            .unwrap_or(false);
-
-        let room = room.read(cx);
-        let project = self.project.read(cx);
-        let is_local = project.is_local() || project.is_via_remote_server();
-        let is_shared = is_local && project.is_shared();
-        let is_muted = room.is_muted();
-        let muted_by_user = room.muted_by_user();
-        let is_deafened = room.is_deafened().unwrap_or(false);
-        let is_screen_sharing = room.is_sharing_screen();
-        let can_use_microphone = room.can_use_microphone();
-        let can_share_projects = room.can_share_projects();
-        let screen_sharing_supported = cx.is_screen_capture_supported();
-
-        let channel_store = ChannelStore::global(cx);
-        let channel = room
-            .channel_id()
-            .and_then(|channel_id| channel_store.read(cx).channel_for_id(channel_id).cloned());
-
-        let mut children = Vec::new();
-
-        children.push(
-            h_flex()
-                .gap_1()
-                .child(
-                    IconButton::new("leave-call", IconName::Exit)
-                        .style(ButtonStyle::Subtle)
-                        .tooltip(Tooltip::text("Leave Call"))
-                        .icon_size(IconSize::Small)
-                        .on_click(move |_, _window, cx| {
-                            ActiveCall::global(cx)
-                                .update(cx, |call, cx| call.hang_up(cx))
-                                .detach_and_log_err(cx);
-                        }),
-                )
-                .child(Divider::vertical().color(DividerColor::Border))
-                .into_any_element(),
-        );
-
-        if is_local && can_share_projects && !is_connecting_to_project {
-            let is_sharing_disabled = channel.is_some_and(|channel| match channel.visibility {
-                proto::ChannelVisibility::Public => project.visible_worktrees(cx).any(|worktree| {
-                    let worktree_id = worktree.read(cx).id();
-
-                    let settings_location = Some(SettingsLocation {
-                        worktree_id,
-                        path: RelPath::empty(),
-                    });
-
-                    WorktreeSettings::get(settings_location, cx).prevent_sharing_in_public_channels
-                }),
-                proto::ChannelVisibility::Members => false,
-            });
-
-            children.push(
-                Button::new(
-                    "toggle_sharing",
-                    if is_shared { "Unshare" } else { "Share" },
-                )
-                .tooltip(Tooltip::text(if is_shared {
-                    "Stop sharing project with call participants"
-                } else {
-                    "Share project with call participants"
-                }))
-                .style(ButtonStyle::Subtle)
-                .selected_style(ButtonStyle::Tinted(TintColor::Accent))
-                .toggle_state(is_shared)
-                .label_size(LabelSize::Small)
-                .when(is_sharing_disabled, |parent| {
-                    parent.disabled(true).tooltip(Tooltip::text(
-                        "This project may not be shared in a public channel.",
-                    ))
-                })
-                .on_click(cx.listener(move |this, _, window, cx| {
-                    if is_shared {
-                        this.unshare_project(window, cx);
-                    } else {
-                        this.share_project(cx);
-                    }
-                }))
-                .into_any_element(),
-            );
-        }
-
-        if can_use_microphone {
-            children.push(
-                IconButton::new(
-                    "mute-microphone",
-                    if is_muted {
-                        IconName::MicMute
-                    } else {
-                        IconName::Mic
-                    },
-                )
-                .tooltip(move |_window, cx| {
-                    if is_muted {
-                        if is_deafened {
-                            Tooltip::with_meta(
-                                "Unmute Microphone",
-                                None,
-                                "Audio will be unmuted",
-                                cx,
-                            )
-                        } else {
-                            Tooltip::simple("Unmute Microphone", cx)
-                        }
-                    } else {
-                        Tooltip::simple("Mute Microphone", cx)
-                    }
-                })
-                .style(ButtonStyle::Subtle)
-                .icon_size(IconSize::Small)
-                .toggle_state(is_muted)
-                .selected_style(ButtonStyle::Tinted(TintColor::Error))
-                .on_click(move |_, _window, cx| toggle_mute(cx))
-                .into_any_element(),
-            );
-        }
-
-        children.push(
-            IconButton::new(
-                "mute-sound",
-                if is_deafened {
-                    IconName::AudioOff
-                } else {
-                    IconName::AudioOn
-                },
-            )
-            .style(ButtonStyle::Subtle)
-            .selected_style(ButtonStyle::Tinted(TintColor::Error))
-            .icon_size(IconSize::Small)
-            .toggle_state(is_deafened)
-            .tooltip(move |_window, cx| {
-                if is_deafened {
-                    let label = "Unmute Audio";
-
-                    if !muted_by_user {
-                        Tooltip::with_meta(label, None, "Microphone will be unmuted", cx)
-                    } else {
-                        Tooltip::simple(label, cx)
-                    }
-                } else {
-                    let label = "Mute Audio";
-
-                    if !muted_by_user {
-                        Tooltip::with_meta(label, None, "Microphone will be muted", cx)
-                    } else {
-                        Tooltip::simple(label, cx)
-                    }
-                }
-            })
-            .on_click(move |_, _, cx| toggle_deafen(cx))
-            .into_any_element(),
-        );
-
-        if can_use_microphone && screen_sharing_supported {
-            let trigger = IconButton::new("screen-share", IconName::Screen)
-                .style(ButtonStyle::Subtle)
-                .icon_size(IconSize::Small)
-                .toggle_state(is_screen_sharing)
-                .selected_style(ButtonStyle::Tinted(TintColor::Accent))
-                .tooltip(Tooltip::text(if is_screen_sharing {
-                    "Stop Sharing Screen"
-                } else {
-                    "Share Screen"
-                }))
-                .on_click(move |_, window, cx| {
-                    let should_share = ActiveCall::global(cx)
-                        .read(cx)
-                        .room()
-                        .is_some_and(|room| !room.read(cx).is_sharing_screen());
-
-                    window
-                        .spawn(cx, async move |cx| {
-                            let screen = if should_share {
-                                cx.update(|_, cx| pick_default_screen(cx))?.await
-                            } else {
-                                Ok(None)
-                            };
-                            cx.update(|window, cx| toggle_screen_sharing(screen, window, cx))?;
-
-                            Result::<_, anyhow::Error>::Ok(())
-                        })
-                        .detach();
-                });
-
-            children.push(
-                SplitButton::new(
-                    trigger.render(window, cx),
-                    self.render_screen_list().into_any_element(),
-                )
-                .style(SplitButtonStyle::Transparent)
-                .into_any_element(),
-            );
-        }
-
-        children.push(div().pr_2().into_any_element());
-
-        children
-    }
-
-    fn render_screen_list(&self) -> impl IntoElement {
-        PopoverMenu::new("screen-share-screen-list")
-            .with_handle(self.screen_share_popover_handle.clone())
-            .trigger(
-                ui::ButtonLike::new_rounded_right("screen-share-screen-list-trigger")
-                    .child(
-                        h_flex()
-                            .mx_neg_0p5()
-                            .h_full()
-                            .justify_center()
-                            .child(Icon::new(IconName::ChevronDown).size(IconSize::XSmall)),
-                    )
-                    .toggle_state(self.screen_share_popover_handle.is_deployed()),
-            )
-            .menu(|window, cx| {
-                let screens = cx.screen_capture_sources();
-                Some(ContextMenu::build(window, cx, |context_menu, _, cx| {
-                    cx.spawn(async move |this: WeakEntity<ContextMenu>, cx| {
-                        let screens = screens.await??;
-                        this.update(cx, |this, cx| {
-                            let active_screenshare_id = ActiveCall::global(cx)
-                                .read(cx)
-                                .room()
-                                .and_then(|room| room.read(cx).shared_screen_id());
-                            for screen in screens {
-                                let Ok(meta) = screen.metadata() else {
-                                    continue;
-                                };
-
-                                let label = meta
-                                    .label
-                                    .clone()
-                                    .unwrap_or_else(|| SharedString::from("Unknown screen"));
-                                let resolution = SharedString::from(format!(
-                                    "{} × {}",
-                                    meta.resolution.width.0, meta.resolution.height.0
-                                ));
-                                this.push_item(ContextMenuItem::CustomEntry {
-                                    entry_render: Box::new(move |_, _| {
-                                        h_flex()
-                                            .gap_2()
-                                            .child(
-                                                Icon::new(IconName::Screen)
-                                                    .size(IconSize::XSmall)
-                                                    .map(|this| {
-                                                        if active_screenshare_id == Some(meta.id) {
-                                                            this.color(Color::Accent)
-                                                        } else {
-                                                            this.color(Color::Muted)
-                                                        }
-                                                    }),
-                                            )
-                                            .child(Label::new(label.clone()))
-                                            .child(
-                                                Label::new(resolution.clone())
-                                                    .color(Color::Muted)
-                                                    .size(LabelSize::Small),
-                                            )
-                                            .into_any()
-                                    }),
-                                    selectable: true,
-                                    documentation_aside: None,
-                                    handler: Rc::new(move |_, window, cx| {
-                                        toggle_screen_sharing(Ok(Some(screen.clone())), window, cx);
-                                    }),
-                                });
-                            }
-                        })
-                    })
-                    .detach_and_log_err(cx);
-                    context_menu
-                }))
-            })
-    }
-}
-
-/// Picks the screen to share when clicking on the main screen sharing button.
-fn pick_default_screen(cx: &App) -> Task<anyhow::Result<Option<Rc<dyn ScreenCaptureSource>>>> {
-    let source = cx.screen_capture_sources();
-    cx.spawn(async move |_| {
-        let available_sources = source.await??;
-        Ok(available_sources
-            .iter()
-            .find(|it| {
-                it.as_ref()
-                    .metadata()
-                    .is_ok_and(|meta| meta.is_main.unwrap_or_default())
-            })
-            .or_else(|| available_sources.first())
-            .cloned())
-    })
-}
diff --git a/crates/title_bar/src/onboarding_banner.rs b/crates/title_bar/src/onboarding_banner.rs
deleted file mode 100644
index 750ef0a6cd..0000000000
--- a/crates/title_bar/src/onboarding_banner.rs
+++ /dev/null
@@ -1,170 +0,0 @@
-use gpui::{Action, Entity, Global, Render, SharedString};
-use ui::{ButtonLike, Tooltip, prelude::*};
-use util::ResultExt;
-
-/// Prompts the user to try newly released Zed's features
-pub struct OnboardingBanner {
-    dismissed: bool,
-    source: String,
-    details: BannerDetails,
-    visible_when: Option<Box<dyn Fn(&mut App) -> bool>>,
-}
-
-#[derive(Clone)]
-struct BannerGlobal {
-    entity: Entity<OnboardingBanner>,
-}
-impl Global for BannerGlobal {}
-
-pub struct BannerDetails {
-    pub action: Box<dyn Action>,
-    pub icon_name: IconName,
-    pub label: SharedString,
-    pub subtitle: Option<SharedString>,
-}
-
-impl OnboardingBanner {
-    pub fn new(
-        source: &str,
-        icon_name: IconName,
-        label: impl Into<SharedString>,
-        subtitle: Option<SharedString>,
-        action: Box<dyn Action>,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        cx.set_global(BannerGlobal {
-            entity: cx.entity(),
-        });
-        Self {
-            source: source.to_string(),
-            details: BannerDetails {
-                action,
-                icon_name,
-                label: label.into(),
-                subtitle: subtitle.or(Some(SharedString::from("Introducing:"))),
-            },
-            visible_when: None,
-            dismissed: get_dismissed(source),
-        }
-    }
-
-    pub fn visible_when(mut self, predicate: impl Fn(&mut App) -> bool + 'static) -> Self {
-        self.visible_when = Some(Box::new(predicate));
-        self
-    }
-
-    fn should_show(&self, cx: &mut App) -> bool {
-        !self.dismissed && self.visible_when.as_ref().map_or(true, |f| f(cx))
-    }
-
-    fn dismiss(&mut self, cx: &mut Context<Self>) {
-        persist_dismissed(&self.source, cx);
-        self.dismissed = true;
-        cx.notify();
-    }
-}
-
-fn dismissed_at_key(source: &str) -> String {
-    if source == "Git Onboarding" {
-        "zed_git_banner_dismissed_at".to_string()
-    } else {
-        format!(
-            "{}_banner_dismissed_at",
-            source.to_lowercase().trim().replace(" ", "_")
-        )
-    }
-}
-
-fn get_dismissed(source: &str) -> bool {
-    let dismissed_at = dismissed_at_key(source);
-    db::kvp::KEY_VALUE_STORE
-        .read_kvp(&dismissed_at)
-        .log_err()
-        .is_some_and(|dismissed| dismissed.is_some())
-}
-
-fn persist_dismissed(source: &str, cx: &mut App) {
-    let dismissed_at = dismissed_at_key(source);
-    cx.spawn(async |_| {
-        let time = chrono::Utc::now().to_rfc3339();
-        db::kvp::KEY_VALUE_STORE.write_kvp(dismissed_at, time).await
-    })
-    .detach_and_log_err(cx);
-}
-
-pub fn restore_banner(cx: &mut App) {
-    cx.defer(|cx| {
-        cx.global::<BannerGlobal>()
-            .entity
-            .clone()
-            .update(cx, |this, cx| {
-                this.dismissed = false;
-                cx.notify();
-            });
-    });
-
-    let source = &cx.global::<BannerGlobal>().entity.read(cx).source;
-    let dismissed_at = dismissed_at_key(source);
-    cx.spawn(async |_| db::kvp::KEY_VALUE_STORE.delete_kvp(dismissed_at).await)
-        .detach_and_log_err(cx);
-}
-
-impl Render for OnboardingBanner {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        if !self.should_show(cx) {
-            return div();
-        }
-
-        let border_color = cx.theme().colors().editor_foreground.opacity(0.3);
-        let banner = h_flex()
-            .rounded_sm()
-            .border_1()
-            .border_color(border_color)
-            .child(
-                ButtonLike::new("try-a-feature")
-                    .child(
-                        h_flex()
-                            .h_full()
-                            .gap_1()
-                            .child(Icon::new(self.details.icon_name).size(IconSize::XSmall))
-                            .child(
-                                h_flex()
-                                    .gap_0p5()
-                                    .when_some(self.details.subtitle.as_ref(), |this, subtitle| {
-                                        this.child(
-                                            Label::new(subtitle)
-                                                .size(LabelSize::Small)
-                                                .color(Color::Muted),
-                                        )
-                                    })
-                                    .child(Label::new(&self.details.label).size(LabelSize::Small)),
-                            ),
-                    )
-                    .on_click(cx.listener(|this, _, window, cx| {
-                        telemetry::event!("Banner Clicked", source = this.source);
-                        this.dismiss(cx);
-                        window.dispatch_action(this.details.action.boxed_clone(), cx)
-                    })),
-            )
-            .child(
-                div().border_l_1().border_color(border_color).child(
-                    IconButton::new("close", IconName::Close)
-                        .icon_size(IconSize::Indicator)
-                        .on_click(cx.listener(|this, _, _window, cx| {
-                            telemetry::event!("Banner Dismissed", source = this.source);
-                            this.dismiss(cx)
-                        }))
-                        .tooltip(|_window, cx| {
-                            Tooltip::with_meta(
-                                "Close Announcement Banner",
-                                None,
-                                "It won't show again for this feature",
-                                cx,
-                            )
-                        }),
-                ),
-            );
-
-        div().pr_2().child(banner)
-    }
-}
diff --git a/crates/title_bar/src/platform_title_bar.rs b/crates/title_bar/src/platform_title_bar.rs
deleted file mode 100644
index 6ce7d089bb..0000000000
--- a/crates/title_bar/src/platform_title_bar.rs
+++ /dev/null
@@ -1,192 +0,0 @@
-use gpui::{
-    AnyElement, Context, Decorations, Entity, Hsla, InteractiveElement, IntoElement, MouseButton,
-    ParentElement, Pixels, StatefulInteractiveElement, Styled, Window, WindowControlArea, div, px,
-};
-use smallvec::SmallVec;
-use std::mem;
-use ui::prelude::*;
-
-use crate::{
-    platforms::{platform_linux, platform_mac, platform_windows},
-    system_window_tabs::SystemWindowTabs,
-};
-
-pub struct PlatformTitleBar {
-    id: ElementId,
-    platform_style: PlatformStyle,
-    children: SmallVec<[AnyElement; 2]>,
-    should_move: bool,
-    system_window_tabs: Entity<SystemWindowTabs>,
-}
-
-impl PlatformTitleBar {
-    pub fn new(id: impl Into<ElementId>, cx: &mut Context<Self>) -> Self {
-        let platform_style = PlatformStyle::platform();
-        let system_window_tabs = cx.new(|_cx| SystemWindowTabs::new());
-
-        Self {
-            id: id.into(),
-            platform_style,
-            children: SmallVec::new(),
-            should_move: false,
-            system_window_tabs,
-        }
-    }
-
-    #[cfg(not(target_os = "windows"))]
-    pub fn height(window: &mut Window) -> Pixels {
-        (1.75 * window.rem_size()).max(px(34.))
-    }
-
-    #[cfg(target_os = "windows")]
-    pub fn height(_window: &mut Window) -> Pixels {
-        // todo(windows) instead of hard coded size report the actual size to the Windows platform API
-        px(32.)
-    }
-
-    pub fn title_bar_color(&self, window: &mut Window, cx: &mut Context<Self>) -> Hsla {
-        if cfg!(any(target_os = "linux", target_os = "freebsd")) {
-            if window.is_window_active() && !self.should_move {
-                cx.theme().colors().title_bar_background
-            } else {
-                cx.theme().colors().title_bar_inactive_background
-            }
-        } else {
-            cx.theme().colors().title_bar_background
-        }
-    }
-
-    pub fn set_children<T>(&mut self, children: T)
-    where
-        T: IntoIterator<Item = AnyElement>,
-    {
-        self.children = children.into_iter().collect();
-    }
-}
-
-impl Render for PlatformTitleBar {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let supported_controls = window.window_controls();
-        let decorations = window.window_decorations();
-        let height = Self::height(window);
-        let titlebar_color = self.title_bar_color(window, cx);
-        let close_action = Box::new(workspace::CloseWindow);
-        let children = mem::take(&mut self.children);
-
-        let title_bar = h_flex()
-            .window_control_area(WindowControlArea::Drag)
-            .w_full()
-            .h(height)
-            .map(|this| {
-                this.on_mouse_down_out(cx.listener(move |this, _ev, _window, _cx| {
-                    this.should_move = false;
-                }))
-                .on_mouse_up(
-                    gpui::MouseButton::Left,
-                    cx.listener(move |this, _ev, _window, _cx| {
-                        this.should_move = false;
-                    }),
-                )
-                .on_mouse_down(
-                    gpui::MouseButton::Left,
-                    cx.listener(move |this, _ev, _window, _cx| {
-                        this.should_move = true;
-                    }),
-                )
-                .on_mouse_move(cx.listener(move |this, _ev, window, _| {
-                    if this.should_move {
-                        this.should_move = false;
-                        window.start_window_move();
-                    }
-                }))
-            })
-            .map(|this| {
-                // Note: On Windows the title bar behavior is handled by the platform implementation.
-                this.id(self.id.clone())
-                    .when(self.platform_style == PlatformStyle::Mac, |this| {
-                        this.on_click(|event, window, _| {
-                            if event.click_count() == 2 {
-                                window.titlebar_double_click();
-                            }
-                        })
-                    })
-                    .when(self.platform_style == PlatformStyle::Linux, |this| {
-                        this.on_click(|event, window, _| {
-                            if event.click_count() == 2 {
-                                window.zoom_window();
-                            }
-                        })
-                    })
-            })
-            .map(|this| {
-                if window.is_fullscreen() {
-                    this.pl_2()
-                } else if self.platform_style == PlatformStyle::Mac {
-                    this.pl(px(platform_mac::TRAFFIC_LIGHT_PADDING))
-                } else {
-                    this.pl_2()
-                }
-            })
-            .map(|el| match decorations {
-                Decorations::Server => el,
-                Decorations::Client { tiling, .. } => el
-                    .when(!(tiling.top || tiling.right), |el| {
-                        el.rounded_tr(theme::CLIENT_SIDE_DECORATION_ROUNDING)
-                    })
-                    .when(!(tiling.top || tiling.left), |el| {
-                        el.rounded_tl(theme::CLIENT_SIDE_DECORATION_ROUNDING)
-                    })
-                    // this border is to avoid a transparent gap in the rounded corners
-                    .mt(px(-1.))
-                    .mb(px(-1.))
-                    .border(px(1.))
-                    .border_color(titlebar_color),
-            })
-            .bg(titlebar_color)
-            .content_stretch()
-            .child(
-                div()
-                    .id(self.id.clone())
-                    .flex()
-                    .flex_row()
-                    .items_center()
-                    .justify_between()
-                    .overflow_x_hidden()
-                    .w_full()
-                    .children(children),
-            )
-            .when(!window.is_fullscreen(), |title_bar| {
-                match self.platform_style {
-                    PlatformStyle::Mac => title_bar,
-                    PlatformStyle::Linux => {
-                        if matches!(decorations, Decorations::Client { .. }) {
-                            title_bar
-                                .child(platform_linux::LinuxWindowControls::new(close_action))
-                                .when(supported_controls.window_menu, |titlebar| {
-                                    titlebar
-                                        .on_mouse_down(MouseButton::Right, move |ev, window, _| {
-                                            window.show_window_menu(ev.position)
-                                        })
-                                })
-                        } else {
-                            title_bar
-                        }
-                    }
-                    PlatformStyle::Windows => {
-                        title_bar.child(platform_windows::WindowsWindowControls::new(height))
-                    }
-                }
-            });
-
-        v_flex()
-            .w_full()
-            .child(title_bar)
-            .child(self.system_window_tabs.clone().into_any_element())
-    }
-}
-
-impl ParentElement for PlatformTitleBar {
-    fn extend(&mut self, elements: impl IntoIterator<Item = AnyElement>) {
-        self.children.extend(elements)
-    }
-}
diff --git a/crates/title_bar/src/platforms.rs b/crates/title_bar/src/platforms.rs
deleted file mode 100644
index 67e87d45ea..0000000000
--- a/crates/title_bar/src/platforms.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-pub mod platform_linux;
-pub mod platform_mac;
-pub mod platform_windows;
diff --git a/crates/title_bar/src/platforms/platform_linux.rs b/crates/title_bar/src/platforms/platform_linux.rs
deleted file mode 100644
index 0e7af80f80..0000000000
--- a/crates/title_bar/src/platforms/platform_linux.rs
+++ /dev/null
@@ -1,208 +0,0 @@
-use gpui::{Action, Hsla, MouseButton, prelude::*, svg};
-use ui::prelude::*;
-
-#[derive(IntoElement)]
-pub struct LinuxWindowControls {
-    close_window_action: Box<dyn Action>,
-}
-
-impl LinuxWindowControls {
-    pub fn new(close_window_action: Box<dyn Action>) -> Self {
-        Self {
-            close_window_action,
-        }
-    }
-}
-
-impl RenderOnce for LinuxWindowControls {
-    fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement {
-        h_flex()
-            .id("generic-window-controls")
-            .px_3()
-            .gap_3()
-            .on_mouse_down(MouseButton::Left, |_, _, cx| cx.stop_propagation())
-            .child(WindowControl::new(
-                "minimize",
-                WindowControlType::Minimize,
-                cx,
-            ))
-            .child(WindowControl::new(
-                "maximize-or-restore",
-                if window.is_maximized() {
-                    WindowControlType::Restore
-                } else {
-                    WindowControlType::Maximize
-                },
-                cx,
-            ))
-            .child(WindowControl::new_close(
-                "close",
-                WindowControlType::Close,
-                self.close_window_action,
-                cx,
-            ))
-    }
-}
-
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
-pub enum WindowControlType {
-    Minimize,
-    Restore,
-    Maximize,
-    Close,
-}
-
-impl WindowControlType {
-    /// Returns the icon name for the window control type.
-    ///
-    /// Will take a [PlatformStyle] in the future to return a different
-    /// icon name based on the platform.
-    pub fn icon(&self) -> IconName {
-        match self {
-            WindowControlType::Minimize => IconName::GenericMinimize,
-            WindowControlType::Restore => IconName::GenericRestore,
-            WindowControlType::Maximize => IconName::GenericMaximize,
-            WindowControlType::Close => IconName::GenericClose,
-        }
-    }
-}
-
-#[allow(unused)]
-pub struct WindowControlStyle {
-    background: Hsla,
-    background_hover: Hsla,
-    icon: Hsla,
-    icon_hover: Hsla,
-}
-
-impl WindowControlStyle {
-    pub fn default(cx: &mut App) -> Self {
-        let colors = cx.theme().colors();
-
-        Self {
-            background: colors.ghost_element_background,
-            background_hover: colors.ghost_element_hover,
-            icon: colors.icon,
-            icon_hover: colors.icon_muted,
-        }
-    }
-
-    #[allow(unused)]
-    /// Sets the background color of the control.
-    pub fn background(mut self, color: impl Into<Hsla>) -> Self {
-        self.background = color.into();
-        self
-    }
-
-    #[allow(unused)]
-    /// Sets the background color of the control when hovered.
-    pub fn background_hover(mut self, color: impl Into<Hsla>) -> Self {
-        self.background_hover = color.into();
-        self
-    }
-
-    #[allow(unused)]
-    /// Sets the color of the icon.
-    pub fn icon(mut self, color: impl Into<Hsla>) -> Self {
-        self.icon = color.into();
-        self
-    }
-
-    #[allow(unused)]
-    /// Sets the color of the icon when hovered.
-    pub fn icon_hover(mut self, color: impl Into<Hsla>) -> Self {
-        self.icon_hover = color.into();
-        self
-    }
-}
-
-#[derive(IntoElement)]
-pub struct WindowControl {
-    id: ElementId,
-    icon: WindowControlType,
-    style: WindowControlStyle,
-    close_action: Option<Box<dyn Action>>,
-}
-
-impl WindowControl {
-    pub fn new(id: impl Into<ElementId>, icon: WindowControlType, cx: &mut App) -> Self {
-        let style = WindowControlStyle::default(cx);
-
-        Self {
-            id: id.into(),
-            icon,
-            style,
-            close_action: None,
-        }
-    }
-
-    pub fn new_close(
-        id: impl Into<ElementId>,
-        icon: WindowControlType,
-        close_action: Box<dyn Action>,
-        cx: &mut App,
-    ) -> Self {
-        let style = WindowControlStyle::default(cx);
-
-        Self {
-            id: id.into(),
-            icon,
-            style,
-            close_action: Some(close_action.boxed_clone()),
-        }
-    }
-
-    #[allow(unused)]
-    pub fn custom_style(
-        id: impl Into<ElementId>,
-        icon: WindowControlType,
-        style: WindowControlStyle,
-    ) -> Self {
-        Self {
-            id: id.into(),
-            icon,
-            style,
-            close_action: None,
-        }
-    }
-}
-
-impl RenderOnce for WindowControl {
-    fn render(self, _window: &mut Window, _cx: &mut App) -> impl IntoElement {
-        let icon = svg()
-            .size_4()
-            .flex_none()
-            .path(self.icon.icon().path())
-            .text_color(self.style.icon)
-            .group_hover("", |this| this.text_color(self.style.icon_hover));
-
-        h_flex()
-            .id(self.id)
-            .group("")
-            .cursor_pointer()
-            .justify_center()
-            .content_center()
-            .rounded_2xl()
-            .w_5()
-            .h_5()
-            .hover(|this| this.bg(self.style.background_hover))
-            .active(|this| this.bg(self.style.background_hover))
-            .child(icon)
-            .on_mouse_move(|_, _, cx| cx.stop_propagation())
-            .on_click(move |_, window, cx| {
-                cx.stop_propagation();
-                match self.icon {
-                    WindowControlType::Minimize => window.minimize_window(),
-                    WindowControlType::Restore => window.zoom_window(),
-                    WindowControlType::Maximize => window.zoom_window(),
-                    WindowControlType::Close => window.dispatch_action(
-                        self.close_action
-                            .as_ref()
-                            .expect("Use WindowControl::new_close() for close control.")
-                            .boxed_clone(),
-                        cx,
-                    ),
-                }
-            })
-    }
-}
diff --git a/crates/title_bar/src/platforms/platform_mac.rs b/crates/title_bar/src/platforms/platform_mac.rs
deleted file mode 100644
index c7becde6c1..0000000000
--- a/crates/title_bar/src/platforms/platform_mac.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-/// Use pixels here instead of a rem-based size because the macOS traffic
-/// lights are a static size, and don't scale with the rest of the UI.
-///
-/// Magic number: There is one extra pixel of padding on the left side due to
-/// the 1px border around the window on macOS apps.
-pub const TRAFFIC_LIGHT_PADDING: f32 = 71.;
diff --git a/crates/title_bar/src/platforms/platform_windows.rs b/crates/title_bar/src/platforms/platform_windows.rs
deleted file mode 100644
index 1df75ee8a9..0000000000
--- a/crates/title_bar/src/platforms/platform_windows.rs
+++ /dev/null
@@ -1,143 +0,0 @@
-use gpui::{Hsla, Rgba, WindowControlArea, prelude::*};
-
-use ui::prelude::*;
-
-#[derive(IntoElement)]
-pub struct WindowsWindowControls {
-    button_height: Pixels,
-}
-
-impl WindowsWindowControls {
-    pub fn new(button_height: Pixels) -> Self {
-        Self { button_height }
-    }
-
-    #[cfg(not(target_os = "windows"))]
-    fn get_font() -> &'static str {
-        "Segoe Fluent Icons"
-    }
-
-    #[cfg(target_os = "windows")]
-    fn get_font() -> &'static str {
-        use windows::Wdk::System::SystemServices::RtlGetVersion;
-
-        let mut version = unsafe { std::mem::zeroed() };
-        let status = unsafe { RtlGetVersion(&mut version) };
-
-        if status.is_ok() && version.dwBuildNumber >= 22000 {
-            "Segoe Fluent Icons"
-        } else {
-            "Segoe MDL2 Assets"
-        }
-    }
-}
-
-impl RenderOnce for WindowsWindowControls {
-    fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let close_button_hover_color = Rgba {
-            r: 232.0 / 255.0,
-            g: 17.0 / 255.0,
-            b: 32.0 / 255.0,
-            a: 1.0,
-        };
-
-        let button_hover_color = cx.theme().colors().ghost_element_hover;
-        let button_active_color = cx.theme().colors().ghost_element_active;
-
-        div()
-            .id("windows-window-controls")
-            .font_family(Self::get_font())
-            .flex()
-            .flex_row()
-            .justify_center()
-            .content_stretch()
-            .max_h(self.button_height)
-            .min_h(self.button_height)
-            .child(WindowsCaptionButton::new(
-                "minimize",
-                WindowsCaptionButtonIcon::Minimize,
-                button_hover_color,
-                button_active_color,
-            ))
-            .child(WindowsCaptionButton::new(
-                "maximize-or-restore",
-                if window.is_maximized() {
-                    WindowsCaptionButtonIcon::Restore
-                } else {
-                    WindowsCaptionButtonIcon::Maximize
-                },
-                button_hover_color,
-                button_active_color,
-            ))
-            .child(WindowsCaptionButton::new(
-                "close",
-                WindowsCaptionButtonIcon::Close,
-                close_button_hover_color,
-                button_active_color,
-            ))
-    }
-}
-
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
-enum WindowsCaptionButtonIcon {
-    Minimize,
-    Restore,
-    Maximize,
-    Close,
-}
-
-#[derive(IntoElement)]
-struct WindowsCaptionButton {
-    id: ElementId,
-    icon: WindowsCaptionButtonIcon,
-    hover_background_color: Hsla,
-    active_background_color: Hsla,
-}
-
-impl WindowsCaptionButton {
-    pub fn new(
-        id: impl Into<ElementId>,
-        icon: WindowsCaptionButtonIcon,
-        hover_background_color: impl Into<Hsla>,
-        active_background_color: impl Into<Hsla>,
-    ) -> Self {
-        Self {
-            id: id.into(),
-            icon,
-            hover_background_color: hover_background_color.into(),
-            active_background_color: active_background_color.into(),
-        }
-    }
-}
-
-impl RenderOnce for WindowsCaptionButton {
-    fn render(self, _window: &mut Window, _cx: &mut App) -> impl IntoElement {
-        h_flex()
-            .id(self.id)
-            .justify_center()
-            .content_center()
-            .occlude()
-            .w(px(36.))
-            .h_full()
-            .text_size(px(10.0))
-            .hover(|style| style.bg(self.hover_background_color))
-            .active(|style| style.bg(self.active_background_color))
-            .map(|this| match self.icon {
-                WindowsCaptionButtonIcon::Close => {
-                    this.window_control_area(WindowControlArea::Close)
-                }
-                WindowsCaptionButtonIcon::Maximize | WindowsCaptionButtonIcon::Restore => {
-                    this.window_control_area(WindowControlArea::Max)
-                }
-                WindowsCaptionButtonIcon::Minimize => {
-                    this.window_control_area(WindowControlArea::Min)
-                }
-            })
-            .child(match self.icon {
-                WindowsCaptionButtonIcon::Minimize => "\u{e921}",
-                WindowsCaptionButtonIcon::Restore => "\u{e923}",
-                WindowsCaptionButtonIcon::Maximize => "\u{e922}",
-                WindowsCaptionButtonIcon::Close => "\u{e8bb}",
-            })
-    }
-}
diff --git a/crates/title_bar/src/stories.rs b/crates/title_bar/src/stories.rs
deleted file mode 100644
index 21ed2268db..0000000000
--- a/crates/title_bar/src/stories.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-mod application_menu;
-
-pub use application_menu::*;
diff --git a/crates/title_bar/src/stories/application_menu.rs b/crates/title_bar/src/stories/application_menu.rs
deleted file mode 100644
index f47f2a6c76..0000000000
--- a/crates/title_bar/src/stories/application_menu.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-use gpui::{Entity, Render};
-use story::{Story, StoryItem, StorySection};
-
-use ui::prelude::*;
-
-use crate::application_menu::ApplicationMenu;
-
-pub struct ApplicationMenuStory {
-    menu: Entity<ApplicationMenu>,
-}
-
-impl ApplicationMenuStory {
-    pub fn new(window: &mut Window, cx: &mut App) -> Self {
-        Self {
-            menu: cx.new(|cx| ApplicationMenu::new(window, cx)),
-        }
-    }
-}
-
-impl Render for ApplicationMenuStory {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        Story::container(cx)
-            .child(Story::title_for::<ApplicationMenu>(cx))
-            .child(StorySection::new().child(StoryItem::new(
-                "Application Menu",
-                h_flex().child(self.menu.clone()),
-            )))
-    }
-}
diff --git a/crates/title_bar/src/system_window_tabs.rs b/crates/title_bar/src/system_window_tabs.rs
deleted file mode 100644
index a9bf46cc4f..0000000000
--- a/crates/title_bar/src/system_window_tabs.rs
+++ /dev/null
@@ -1,529 +0,0 @@
-use settings::{Settings, SettingsStore};
-
-use gpui::{
-    AnyWindowHandle, Context, Hsla, InteractiveElement, MouseButton, ParentElement, ScrollHandle,
-    Styled, SystemWindowTab, SystemWindowTabController, Window, WindowId, actions, canvas, div,
-};
-
-use theme::ThemeSettings;
-use ui::{
-    Color, ContextMenu, DynamicSpacing, IconButton, IconButtonShape, IconName, IconSize, Label,
-    LabelSize, Tab, h_flex, prelude::*, right_click_menu,
-};
-use workspace::{
-    CloseWindow, ItemSettings, Workspace, WorkspaceSettings,
-    item::{ClosePosition, ShowCloseButton},
-};
-
-actions!(
-    window,
-    [
-        ShowNextWindowTab,
-        ShowPreviousWindowTab,
-        MergeAllWindows,
-        MoveTabToNewWindow
-    ]
-);
-
-#[derive(Clone)]
-pub struct DraggedWindowTab {
-    pub id: WindowId,
-    pub ix: usize,
-    pub handle: AnyWindowHandle,
-    pub title: String,
-    pub width: Pixels,
-    pub is_active: bool,
-    pub active_background_color: Hsla,
-    pub inactive_background_color: Hsla,
-}
-
-pub struct SystemWindowTabs {
-    tab_bar_scroll_handle: ScrollHandle,
-    measured_tab_width: Pixels,
-    last_dragged_tab: Option<DraggedWindowTab>,
-}
-
-impl SystemWindowTabs {
-    pub fn new() -> Self {
-        Self {
-            tab_bar_scroll_handle: ScrollHandle::new(),
-            measured_tab_width: px(0.),
-            last_dragged_tab: None,
-        }
-    }
-
-    pub fn init(cx: &mut App) {
-        let mut was_use_system_window_tabs =
-            WorkspaceSettings::get_global(cx).use_system_window_tabs;
-
-        cx.observe_global::<SettingsStore>(move |cx| {
-            let use_system_window_tabs = WorkspaceSettings::get_global(cx).use_system_window_tabs;
-            if use_system_window_tabs == was_use_system_window_tabs {
-                return;
-            }
-            was_use_system_window_tabs = use_system_window_tabs;
-
-            let tabbing_identifier = if use_system_window_tabs {
-                Some(String::from("zed"))
-            } else {
-                None
-            };
-
-            if use_system_window_tabs {
-                SystemWindowTabController::init(cx);
-            }
-
-            cx.windows().iter().for_each(|handle| {
-                let _ = handle.update(cx, |_, window, cx| {
-                    window.set_tabbing_identifier(tabbing_identifier.clone());
-                    if use_system_window_tabs {
-                        let tabs = if let Some(tabs) = window.tabbed_windows() {
-                            tabs
-                        } else {
-                            vec![SystemWindowTab::new(
-                                SharedString::from(window.window_title()),
-                                window.window_handle(),
-                            )]
-                        };
-
-                        SystemWindowTabController::add_tab(cx, handle.window_id(), tabs);
-                    }
-                });
-            });
-        })
-        .detach();
-
-        cx.observe_new(|workspace: &mut Workspace, _, _| {
-            workspace.register_action_renderer(|div, _, window, cx| {
-                let window_id = window.window_handle().window_id();
-                let controller = cx.global::<SystemWindowTabController>();
-
-                let tab_groups = controller.tab_groups();
-                let tabs = controller.tabs(window_id);
-                let Some(tabs) = tabs else {
-                    return div;
-                };
-
-                div.when(tabs.len() > 1, |div| {
-                    div.on_action(move |_: &ShowNextWindowTab, window, cx| {
-                        SystemWindowTabController::select_next_tab(
-                            cx,
-                            window.window_handle().window_id(),
-                        );
-                    })
-                    .on_action(move |_: &ShowPreviousWindowTab, window, cx| {
-                        SystemWindowTabController::select_previous_tab(
-                            cx,
-                            window.window_handle().window_id(),
-                        );
-                    })
-                    .on_action(move |_: &MoveTabToNewWindow, window, cx| {
-                        SystemWindowTabController::move_tab_to_new_window(
-                            cx,
-                            window.window_handle().window_id(),
-                        );
-                        window.move_tab_to_new_window();
-                    })
-                })
-                .when(tab_groups.len() > 1, |div| {
-                    div.on_action(move |_: &MergeAllWindows, window, cx| {
-                        SystemWindowTabController::merge_all_windows(
-                            cx,
-                            window.window_handle().window_id(),
-                        );
-                        window.merge_all_windows();
-                    })
-                })
-            });
-        })
-        .detach();
-    }
-
-    fn render_tab(
-        &self,
-        ix: usize,
-        item: SystemWindowTab,
-        tabs: Vec<SystemWindowTab>,
-        active_background_color: Hsla,
-        inactive_background_color: Hsla,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement + use<> {
-        let entity = cx.entity();
-        let settings = ItemSettings::get_global(cx);
-        let close_side = &settings.close_position;
-        let show_close_button = &settings.show_close_button;
-
-        let rem_size = window.rem_size();
-        let width = self.measured_tab_width.max(rem_size * 10);
-        let is_active = window.window_handle().window_id() == item.id;
-        let title = item.title.to_string();
-
-        let label = Label::new(&title)
-            .size(LabelSize::Small)
-            .truncate()
-            .color(if is_active {
-                Color::Default
-            } else {
-                Color::Muted
-            });
-
-        let tab = h_flex()
-            .id(ix)
-            .group("tab")
-            .w_full()
-            .overflow_hidden()
-            .h(Tab::content_height(cx))
-            .relative()
-            .px(DynamicSpacing::Base16.px(cx))
-            .justify_center()
-            .border_l_1()
-            .border_color(cx.theme().colors().border)
-            .cursor_pointer()
-            .on_drag(
-                DraggedWindowTab {
-                    id: item.id,
-                    ix,
-                    handle: item.handle,
-                    title: item.title.to_string(),
-                    width,
-                    is_active,
-                    active_background_color,
-                    inactive_background_color,
-                },
-                move |tab, _, _, cx| {
-                    entity.update(cx, |this, _cx| {
-                        this.last_dragged_tab = Some(tab.clone());
-                    });
-                    cx.new(|_| tab.clone())
-                },
-            )
-            .drag_over::<DraggedWindowTab>({
-                let tab_ix = ix;
-                move |element, dragged_tab: &DraggedWindowTab, _, cx| {
-                    let mut styled_tab = element
-                        .bg(cx.theme().colors().drop_target_background)
-                        .border_color(cx.theme().colors().drop_target_border)
-                        .border_0();
-
-                    if tab_ix < dragged_tab.ix {
-                        styled_tab = styled_tab.border_l_2();
-                    } else if tab_ix > dragged_tab.ix {
-                        styled_tab = styled_tab.border_r_2();
-                    }
-
-                    styled_tab
-                }
-            })
-            .on_drop({
-                let tab_ix = ix;
-                cx.listener(move |this, dragged_tab: &DraggedWindowTab, _window, cx| {
-                    this.last_dragged_tab = None;
-                    Self::handle_tab_drop(dragged_tab, tab_ix, cx);
-                })
-            })
-            .on_click(move |_, _, cx| {
-                let _ = item.handle.update(cx, |_, window, _| {
-                    window.activate_window();
-                });
-            })
-            .on_mouse_up(MouseButton::Middle, move |_, window, cx| {
-                if item.handle.window_id() == window.window_handle().window_id() {
-                    window.dispatch_action(Box::new(CloseWindow), cx);
-                } else {
-                    let _ = item.handle.update(cx, |_, window, cx| {
-                        window.dispatch_action(Box::new(CloseWindow), cx);
-                    });
-                }
-            })
-            .child(label)
-            .map(|this| match show_close_button {
-                ShowCloseButton::Hidden => this,
-                _ => this.child(
-                    div()
-                        .absolute()
-                        .top_2()
-                        .w_4()
-                        .h_4()
-                        .map(|this| match close_side {
-                            ClosePosition::Left => this.left_1(),
-                            ClosePosition::Right => this.right_1(),
-                        })
-                        .child(
-                            IconButton::new("close", IconName::Close)
-                                .shape(IconButtonShape::Square)
-                                .icon_color(Color::Muted)
-                                .icon_size(IconSize::XSmall)
-                                .on_click({
-                                    move |_, window, cx| {
-                                        if item.handle.window_id()
-                                            == window.window_handle().window_id()
-                                        {
-                                            window.dispatch_action(Box::new(CloseWindow), cx);
-                                        } else {
-                                            let _ = item.handle.update(cx, |_, window, cx| {
-                                                window.dispatch_action(Box::new(CloseWindow), cx);
-                                            });
-                                        }
-                                    }
-                                })
-                                .map(|this| match show_close_button {
-                                    ShowCloseButton::Hover => this.visible_on_hover("tab"),
-                                    _ => this,
-                                }),
-                        ),
-                ),
-            })
-            .into_any();
-
-        let menu = right_click_menu(ix)
-            .trigger(|_, _, _| tab)
-            .menu(move |window, cx| {
-                let focus_handle = cx.focus_handle();
-                let tabs = tabs.clone();
-                let other_tabs = tabs.clone();
-                let move_tabs = tabs.clone();
-                let merge_tabs = tabs.clone();
-
-                ContextMenu::build(window, cx, move |mut menu, _window_, _cx| {
-                    menu = menu.entry("Close Tab", None, move |window, cx| {
-                        Self::handle_right_click_action(
-                            cx,
-                            window,
-                            &tabs,
-                            |tab| tab.id == item.id,
-                            |window, cx| {
-                                window.dispatch_action(Box::new(CloseWindow), cx);
-                            },
-                        );
-                    });
-
-                    menu = menu.entry("Close Other Tabs", None, move |window, cx| {
-                        Self::handle_right_click_action(
-                            cx,
-                            window,
-                            &other_tabs,
-                            |tab| tab.id != item.id,
-                            |window, cx| {
-                                window.dispatch_action(Box::new(CloseWindow), cx);
-                            },
-                        );
-                    });
-
-                    menu = menu.entry("Move Tab to New Window", None, move |window, cx| {
-                        Self::handle_right_click_action(
-                            cx,
-                            window,
-                            &move_tabs,
-                            |tab| tab.id == item.id,
-                            |window, cx| {
-                                SystemWindowTabController::move_tab_to_new_window(
-                                    cx,
-                                    window.window_handle().window_id(),
-                                );
-                                window.move_tab_to_new_window();
-                            },
-                        );
-                    });
-
-                    menu = menu.entry("Show All Tabs", None, move |window, cx| {
-                        Self::handle_right_click_action(
-                            cx,
-                            window,
-                            &merge_tabs,
-                            |tab| tab.id == item.id,
-                            |window, _cx| {
-                                window.toggle_window_tab_overview();
-                            },
-                        );
-                    });
-
-                    menu.context(focus_handle)
-                })
-            });
-
-        div()
-            .flex_1()
-            .min_w(rem_size * 10)
-            .when(is_active, |this| this.bg(active_background_color))
-            .border_t_1()
-            .border_color(if is_active {
-                active_background_color
-            } else {
-                cx.theme().colors().border
-            })
-            .child(menu)
-    }
-
-    fn handle_tab_drop(dragged_tab: &DraggedWindowTab, ix: usize, cx: &mut Context<Self>) {
-        SystemWindowTabController::update_tab_position(cx, dragged_tab.id, ix);
-    }
-
-    fn handle_right_click_action<F, P>(
-        cx: &mut App,
-        window: &mut Window,
-        tabs: &Vec<SystemWindowTab>,
-        predicate: P,
-        mut action: F,
-    ) where
-        P: Fn(&SystemWindowTab) -> bool,
-        F: FnMut(&mut Window, &mut App),
-    {
-        for tab in tabs {
-            if predicate(tab) {
-                if tab.id == window.window_handle().window_id() {
-                    action(window, cx);
-                } else {
-                    let _ = tab.handle.update(cx, |_view, window, cx| {
-                        action(window, cx);
-                    });
-                }
-            }
-        }
-    }
-}
-
-impl Render for SystemWindowTabs {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let use_system_window_tabs = WorkspaceSettings::get_global(cx).use_system_window_tabs;
-        let active_background_color = cx.theme().colors().title_bar_background;
-        let inactive_background_color = cx.theme().colors().tab_bar_background;
-        let entity = cx.entity();
-
-        let controller = cx.global::<SystemWindowTabController>();
-        let visible = controller.is_visible();
-        let current_window_tab = vec![SystemWindowTab::new(
-            SharedString::from(window.window_title()),
-            window.window_handle(),
-        )];
-        let tabs = controller
-            .tabs(window.window_handle().window_id())
-            .unwrap_or(&current_window_tab)
-            .clone();
-
-        let tab_items = tabs
-            .iter()
-            .enumerate()
-            .map(|(ix, item)| {
-                self.render_tab(
-                    ix,
-                    item.clone(),
-                    tabs.clone(),
-                    active_background_color,
-                    inactive_background_color,
-                    window,
-                    cx,
-                )
-            })
-            .collect::<Vec<_>>();
-
-        let number_of_tabs = tab_items.len().max(1);
-        if (!window.tab_bar_visible() && !visible)
-            || (!use_system_window_tabs && number_of_tabs == 1)
-        {
-            return h_flex().into_any_element();
-        }
-
-        h_flex()
-            .w_full()
-            .h(Tab::container_height(cx))
-            .bg(inactive_background_color)
-            .on_mouse_up_out(
-                MouseButton::Left,
-                cx.listener(|this, _event, window, cx| {
-                    if let Some(tab) = this.last_dragged_tab.take() {
-                        SystemWindowTabController::move_tab_to_new_window(cx, tab.id);
-                        if tab.id == window.window_handle().window_id() {
-                            window.move_tab_to_new_window();
-                        } else {
-                            let _ = tab.handle.update(cx, |_, window, _cx| {
-                                window.move_tab_to_new_window();
-                            });
-                        }
-                    }
-                }),
-            )
-            .child(
-                h_flex()
-                    .id("window tabs")
-                    .w_full()
-                    .h(Tab::container_height(cx))
-                    .bg(inactive_background_color)
-                    .overflow_x_scroll()
-                    .track_scroll(&self.tab_bar_scroll_handle)
-                    .children(tab_items)
-                    .child(
-                        canvas(
-                            |_, _, _| (),
-                            move |bounds, _, _, cx| {
-                                let entity = entity.clone();
-                                entity.update(cx, |this, cx| {
-                                    let width = bounds.size.width / number_of_tabs as f32;
-                                    if width != this.measured_tab_width {
-                                        this.measured_tab_width = width;
-                                        cx.notify();
-                                    }
-                                });
-                            },
-                        )
-                        .absolute()
-                        .size_full(),
-                    ),
-            )
-            .child(
-                h_flex()
-                    .h_full()
-                    .px(DynamicSpacing::Base06.rems(cx))
-                    .border_t_1()
-                    .border_l_1()
-                    .border_color(cx.theme().colors().border)
-                    .child(
-                        IconButton::new("plus", IconName::Plus)
-                            .icon_size(IconSize::Small)
-                            .icon_color(Color::Muted)
-                            .on_click(|_event, window, cx| {
-                                window.dispatch_action(
-                                    Box::new(zed_actions::OpenRecent {
-                                        create_new_window: true,
-                                    }),
-                                    cx,
-                                );
-                            }),
-                    ),
-            )
-            .into_any_element()
-    }
-}
-
-impl Render for DraggedWindowTab {
-    fn render(
-        &mut self,
-        _window: &mut gpui::Window,
-        cx: &mut gpui::Context<Self>,
-    ) -> impl gpui::IntoElement {
-        let ui_font = ThemeSettings::get_global(cx).ui_font.clone();
-        let label = Label::new(self.title.clone())
-            .size(LabelSize::Small)
-            .truncate()
-            .color(if self.is_active {
-                Color::Default
-            } else {
-                Color::Muted
-            });
-
-        h_flex()
-            .h(Tab::container_height(cx))
-            .w(self.width)
-            .px(DynamicSpacing::Base16.px(cx))
-            .justify_center()
-            .bg(if self.is_active {
-                self.active_background_color
-            } else {
-                self.inactive_background_color
-            })
-            .border_1()
-            .border_color(cx.theme().colors().border)
-            .font(ui_font)
-            .child(label)
-    }
-}
diff --git a/crates/title_bar/src/title_bar.rs b/crates/title_bar/src/title_bar.rs
deleted file mode 100644
index 680c455e73..0000000000
--- a/crates/title_bar/src/title_bar.rs
+++ /dev/null
@@ -1,777 +0,0 @@
-mod application_menu;
-pub mod collab;
-mod onboarding_banner;
-pub mod platform_title_bar;
-mod platforms;
-mod system_window_tabs;
-mod title_bar_settings;
-
-#[cfg(feature = "stories")]
-mod stories;
-
-use crate::{
-    application_menu::{ApplicationMenu, show_menus},
-    platform_title_bar::PlatformTitleBar,
-    system_window_tabs::SystemWindowTabs,
-};
-
-#[cfg(not(target_os = "macos"))]
-use crate::application_menu::{
-    ActivateDirection, ActivateMenuLeft, ActivateMenuRight, OpenApplicationMenu,
-};
-
-use auto_update::AutoUpdateStatus;
-use call::ActiveCall;
-use client::{Client, UserStore, zed_urls};
-use cloud_llm_client::{Plan, PlanV1, PlanV2};
-use gpui::{
-    Action, AnyElement, App, Context, Corner, Element, Entity, Focusable, InteractiveElement,
-    IntoElement, MouseButton, ParentElement, Render, StatefulInteractiveElement, Styled,
-    Subscription, WeakEntity, Window, actions, div,
-};
-use onboarding_banner::OnboardingBanner;
-use project::{Project, WorktreeSettings, git_store::GitStoreEvent};
-use remote::RemoteConnectionOptions;
-use settings::{Settings, SettingsLocation};
-use std::sync::Arc;
-use theme::ActiveTheme;
-use title_bar_settings::TitleBarSettings;
-use ui::{
-    Avatar, Button, ButtonLike, ButtonStyle, Chip, ContextMenu, Icon, IconName, IconSize,
-    IconWithIndicator, Indicator, PopoverMenu, PopoverMenuHandle, Tooltip, h_flex, prelude::*,
-};
-use util::{ResultExt, rel_path::RelPath};
-use workspace::{Workspace, notifications::NotifyResultExt};
-use zed_actions::{OpenRecent, OpenRemote};
-
-pub use onboarding_banner::restore_banner;
-
-#[cfg(feature = "stories")]
-pub use stories::*;
-
-const MAX_PROJECT_NAME_LENGTH: usize = 40;
-const MAX_BRANCH_NAME_LENGTH: usize = 40;
-const MAX_SHORT_SHA_LENGTH: usize = 8;
-
-actions!(
-    collab,
-    [
-        /// Toggles the user menu dropdown.
-        ToggleUserMenu,
-        /// Toggles the project menu dropdown.
-        ToggleProjectMenu,
-        /// Switches to a different git branch.
-        SwitchBranch
-    ]
-);
-
-pub fn init(cx: &mut App) {
-    SystemWindowTabs::init(cx);
-
-    cx.observe_new(|workspace: &mut Workspace, window, cx| {
-        let Some(window) = window else {
-            return;
-        };
-        let item = cx.new(|cx| TitleBar::new("title-bar", workspace, window, cx));
-        workspace.set_titlebar_item(item.into(), window, cx);
-
-        #[cfg(not(target_os = "macos"))]
-        workspace.register_action(|workspace, action: &OpenApplicationMenu, window, cx| {
-            if let Some(titlebar) = workspace
-                .titlebar_item()
-                .and_then(|item| item.downcast::<TitleBar>().ok())
-            {
-                titlebar.update(cx, |titlebar, cx| {
-                    if let Some(ref menu) = titlebar.application_menu {
-                        menu.update(cx, |menu, cx| menu.open_menu(action, window, cx));
-                    }
-                });
-            }
-        });
-
-        #[cfg(not(target_os = "macos"))]
-        workspace.register_action(|workspace, _: &ActivateMenuRight, window, cx| {
-            if let Some(titlebar) = workspace
-                .titlebar_item()
-                .and_then(|item| item.downcast::<TitleBar>().ok())
-            {
-                titlebar.update(cx, |titlebar, cx| {
-                    if let Some(ref menu) = titlebar.application_menu {
-                        menu.update(cx, |menu, cx| {
-                            menu.navigate_menus_in_direction(ActivateDirection::Right, window, cx)
-                        });
-                    }
-                });
-            }
-        });
-
-        #[cfg(not(target_os = "macos"))]
-        workspace.register_action(|workspace, _: &ActivateMenuLeft, window, cx| {
-            if let Some(titlebar) = workspace
-                .titlebar_item()
-                .and_then(|item| item.downcast::<TitleBar>().ok())
-            {
-                titlebar.update(cx, |titlebar, cx| {
-                    if let Some(ref menu) = titlebar.application_menu {
-                        menu.update(cx, |menu, cx| {
-                            menu.navigate_menus_in_direction(ActivateDirection::Left, window, cx)
-                        });
-                    }
-                });
-            }
-        });
-    })
-    .detach();
-}
-
-pub struct TitleBar {
-    platform_titlebar: Entity<PlatformTitleBar>,
-    project: Entity<Project>,
-    user_store: Entity<UserStore>,
-    client: Arc<Client>,
-    workspace: WeakEntity<Workspace>,
-    application_menu: Option<Entity<ApplicationMenu>>,
-    _subscriptions: Vec<Subscription>,
-    banner: Entity<OnboardingBanner>,
-    screen_share_popover_handle: PopoverMenuHandle<ContextMenu>,
-}
-
-impl Render for TitleBar {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let title_bar_settings = *TitleBarSettings::get_global(cx);
-
-        let show_menus = show_menus(cx);
-
-        let mut children = Vec::new();
-
-        children.push(
-            h_flex()
-                .gap_1()
-                .map(|title_bar| {
-                    let mut render_project_items = title_bar_settings.show_branch_name
-                        || title_bar_settings.show_project_items;
-                    title_bar
-                        .when_some(
-                            self.application_menu.clone().filter(|_| !show_menus),
-                            |title_bar, menu| {
-                                render_project_items &=
-                                    !menu.update(cx, |menu, cx| menu.all_menus_shown(cx));
-                                title_bar.child(menu)
-                            },
-                        )
-                        .when(render_project_items, |title_bar| {
-                            title_bar
-                                .when(title_bar_settings.show_project_items, |title_bar| {
-                                    title_bar
-                                        .children(self.render_project_host(cx))
-                                        .child(self.render_project_name(cx))
-                                })
-                                .when(title_bar_settings.show_branch_name, |title_bar| {
-                                    title_bar.children(self.render_project_branch(cx))
-                                })
-                        })
-                })
-                .on_mouse_down(MouseButton::Left, |_, _, cx| cx.stop_propagation())
-                .into_any_element(),
-        );
-
-        children.push(self.render_collaborator_list(window, cx).into_any_element());
-
-        if title_bar_settings.show_onboarding_banner {
-            children.push(self.banner.clone().into_any_element())
-        }
-
-        let status = self.client.status();
-        let status = &*status.borrow();
-        let user = self.user_store.read(cx).current_user();
-
-        let signed_in = user.is_some();
-
-        children.push(
-            h_flex()
-                .map(|this| {
-                    if signed_in {
-                        this.pr_1p5()
-                    } else {
-                        this.pr_1()
-                    }
-                })
-                .gap_1()
-                .on_mouse_down(MouseButton::Left, |_, _, cx| cx.stop_propagation())
-                .children(self.render_call_controls(window, cx))
-                .children(self.render_connection_status(status, cx))
-                .when(
-                    user.is_none() && TitleBarSettings::get_global(cx).show_sign_in,
-                    |el| el.child(self.render_sign_in_button(cx)),
-                )
-                .child(self.render_app_menu_button(cx))
-                .into_any_element(),
-        );
-
-        if show_menus {
-            self.platform_titlebar.update(cx, |this, _| {
-                this.set_children(
-                    self.application_menu
-                        .clone()
-                        .map(|menu| menu.into_any_element()),
-                );
-            });
-
-            let height = PlatformTitleBar::height(window);
-            let title_bar_color = self.platform_titlebar.update(cx, |platform_titlebar, cx| {
-                platform_titlebar.title_bar_color(window, cx)
-            });
-
-            v_flex()
-                .w_full()
-                .child(self.platform_titlebar.clone().into_any_element())
-                .child(
-                    h_flex()
-                        .bg(title_bar_color)
-                        .h(height)
-                        .pl_2()
-                        .justify_between()
-                        .w_full()
-                        .children(children),
-                )
-                .into_any_element()
-        } else {
-            self.platform_titlebar.update(cx, |this, _| {
-                this.set_children(children);
-            });
-            self.platform_titlebar.clone().into_any_element()
-        }
-    }
-}
-
-impl TitleBar {
-    pub fn new(
-        id: impl Into<ElementId>,
-        workspace: &Workspace,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let project = workspace.project().clone();
-        let git_store = project.read(cx).git_store().clone();
-        let user_store = workspace.app_state().user_store.clone();
-        let client = workspace.app_state().client.clone();
-        let active_call = ActiveCall::global(cx);
-
-        let platform_style = PlatformStyle::platform();
-        let application_menu = match platform_style {
-            PlatformStyle::Mac => {
-                if option_env!("ZED_USE_CROSS_PLATFORM_MENU").is_some() {
-                    Some(cx.new(|cx| ApplicationMenu::new(window, cx)))
-                } else {
-                    None
-                }
-            }
-            PlatformStyle::Linux | PlatformStyle::Windows => {
-                Some(cx.new(|cx| ApplicationMenu::new(window, cx)))
-            }
-        };
-
-        let mut subscriptions = Vec::new();
-        subscriptions.push(
-            cx.observe(&workspace.weak_handle().upgrade().unwrap(), |_, _, cx| {
-                cx.notify()
-            }),
-        );
-        subscriptions.push(cx.subscribe(&project, |_, _, _: &project::Event, cx| cx.notify()));
-        subscriptions.push(cx.observe(&active_call, |this, _, cx| this.active_call_changed(cx)));
-        subscriptions.push(cx.observe_window_activation(window, Self::window_activation_changed));
-        subscriptions.push(
-            cx.subscribe(&git_store, move |_, _, event, cx| match event {
-                GitStoreEvent::ActiveRepositoryChanged(_)
-                | GitStoreEvent::RepositoryUpdated(_, _, true) => {
-                    cx.notify();
-                }
-                _ => {}
-            }),
-        );
-        subscriptions.push(cx.observe(&user_store, |_, _, cx| cx.notify()));
-
-        let banner = cx.new(|cx| {
-            OnboardingBanner::new(
-                "ACP Claude Code Onboarding",
-                IconName::AiClaude,
-                "Claude Code",
-                Some("Introducing:".into()),
-                zed_actions::agent::OpenClaudeCodeOnboardingModal.boxed_clone(),
-                cx,
-            )
-            // When updating this to a non-AI feature release, remove this line.
-            .visible_when(|cx| !project::DisableAiSettings::get_global(cx).disable_ai)
-        });
-
-        let platform_titlebar = cx.new(|cx| PlatformTitleBar::new(id, cx));
-
-        Self {
-            platform_titlebar,
-            application_menu,
-            workspace: workspace.weak_handle(),
-            project,
-            user_store,
-            client,
-            _subscriptions: subscriptions,
-            banner,
-            screen_share_popover_handle: Default::default(),
-        }
-    }
-
-    fn render_remote_project_connection(&self, cx: &mut Context<Self>) -> Option<AnyElement> {
-        let options = self.project.read(cx).remote_connection_options(cx)?;
-        let host: SharedString = options.display_name().into();
-
-        let (nickname, tooltip_title, icon) = match options {
-            RemoteConnectionOptions::Ssh(options) => (
-                options.nickname.map(|nick| nick.into()),
-                "Remote Project",
-                IconName::Server,
-            ),
-            RemoteConnectionOptions::Wsl(_) => (None, "Remote Project", IconName::Linux),
-            RemoteConnectionOptions::Docker(_dev_container_connection) => {
-                (None, "Dev Container", IconName::Box)
-            }
-        };
-
-        let nickname = nickname.unwrap_or_else(|| host.clone());
-
-        let (indicator_color, meta) = match self.project.read(cx).remote_connection_state(cx)? {
-            remote::ConnectionState::Connecting => (Color::Info, format!("Connecting to: {host}")),
-            remote::ConnectionState::Connected => (Color::Success, format!("Connected to: {host}")),
-            remote::ConnectionState::HeartbeatMissed => (
-                Color::Warning,
-                format!("Connection attempt to {host} missed. Retrying..."),
-            ),
-            remote::ConnectionState::Reconnecting => (
-                Color::Warning,
-                format!("Lost connection to {host}. Reconnecting..."),
-            ),
-            remote::ConnectionState::Disconnected => {
-                (Color::Error, format!("Disconnected from {host}"))
-            }
-        };
-
-        let icon_color = match self.project.read(cx).remote_connection_state(cx)? {
-            remote::ConnectionState::Connecting => Color::Info,
-            remote::ConnectionState::Connected => Color::Default,
-            remote::ConnectionState::HeartbeatMissed => Color::Warning,
-            remote::ConnectionState::Reconnecting => Color::Warning,
-            remote::ConnectionState::Disconnected => Color::Error,
-        };
-
-        let meta = SharedString::from(meta);
-
-        Some(
-            ButtonLike::new("ssh-server-icon")
-                .child(
-                    h_flex()
-                        .gap_2()
-                        .max_w_32()
-                        .child(
-                            IconWithIndicator::new(
-                                Icon::new(icon).size(IconSize::Small).color(icon_color),
-                                Some(Indicator::dot().color(indicator_color)),
-                            )
-                            .indicator_border_color(Some(cx.theme().colors().title_bar_background))
-                            .into_any_element(),
-                        )
-                        .child(Label::new(nickname).size(LabelSize::Small).truncate()),
-                )
-                .tooltip(move |_window, cx| {
-                    Tooltip::with_meta(
-                        tooltip_title,
-                        Some(&OpenRemote {
-                            from_existing_connection: false,
-                            create_new_window: false,
-                        }),
-                        meta.clone(),
-                        cx,
-                    )
-                })
-                .on_click(|_, window, cx| {
-                    window.dispatch_action(
-                        OpenRemote {
-                            from_existing_connection: false,
-                            create_new_window: false,
-                        }
-                        .boxed_clone(),
-                        cx,
-                    );
-                })
-                .into_any_element(),
-        )
-    }
-
-    pub fn render_project_host(&self, cx: &mut Context<Self>) -> Option<AnyElement> {
-        if self.project.read(cx).is_via_remote_server() {
-            return self.render_remote_project_connection(cx);
-        }
-
-        if self.project.read(cx).is_disconnected(cx) {
-            return Some(
-                Button::new("disconnected", "Disconnected")
-                    .disabled(true)
-                    .color(Color::Disabled)
-                    .style(ButtonStyle::Subtle)
-                    .label_size(LabelSize::Small)
-                    .into_any_element(),
-            );
-        }
-
-        let host = self.project.read(cx).host()?;
-        let host_user = self.user_store.read(cx).get_cached_user(host.user_id)?;
-        let participant_index = self
-            .user_store
-            .read(cx)
-            .participant_indices()
-            .get(&host_user.id)?;
-        Some(
-            Button::new("project_owner_trigger", host_user.github_login.clone())
-                .color(Color::Player(participant_index.0))
-                .style(ButtonStyle::Subtle)
-                .label_size(LabelSize::Small)
-                .tooltip(Tooltip::text(format!(
-                    "{} is sharing this project. Click to follow.",
-                    host_user.github_login
-                )))
-                .on_click({
-                    let host_peer_id = host.peer_id;
-                    cx.listener(move |this, _, window, cx| {
-                        this.workspace
-                            .update(cx, |workspace, cx| {
-                                workspace.follow(host_peer_id, window, cx);
-                            })
-                            .log_err();
-                    })
-                })
-                .into_any_element(),
-        )
-    }
-
-    pub fn render_project_name(&self, cx: &mut Context<Self>) -> impl IntoElement {
-        let name = self
-            .project
-            .read(cx)
-            .visible_worktrees(cx)
-            .map(|worktree| {
-                let worktree = worktree.read(cx);
-                let settings_location = SettingsLocation {
-                    worktree_id: worktree.id(),
-                    path: RelPath::empty(),
-                };
-
-                let settings = WorktreeSettings::get(Some(settings_location), cx);
-                match &settings.project_name {
-                    Some(name) => name.as_str(),
-                    None => worktree.root_name_str(),
-                }
-            })
-            .next();
-        let is_project_selected = name.is_some();
-        let name = if let Some(name) = name {
-            util::truncate_and_trailoff(name, MAX_PROJECT_NAME_LENGTH)
-        } else {
-            "Open recent project".to_string()
-        };
-
-        Button::new("project_name_trigger", name)
-            .when(!is_project_selected, |b| b.color(Color::Muted))
-            .style(ButtonStyle::Subtle)
-            .label_size(LabelSize::Small)
-            .tooltip(move |_window, cx| {
-                Tooltip::for_action(
-                    "Recent Projects",
-                    &zed_actions::OpenRecent {
-                        create_new_window: false,
-                    },
-                    cx,
-                )
-            })
-            .on_click(cx.listener(move |_, _, window, cx| {
-                window.dispatch_action(
-                    OpenRecent {
-                        create_new_window: false,
-                    }
-                    .boxed_clone(),
-                    cx,
-                );
-            }))
-    }
-
-    pub fn render_project_branch(&self, cx: &mut Context<Self>) -> Option<impl IntoElement> {
-        let settings = TitleBarSettings::get_global(cx);
-        let repository = self.project.read(cx).active_repository(cx)?;
-        let workspace = self.workspace.upgrade()?;
-        let repo = repository.read(cx);
-        let branch_name = repo
-            .branch
-            .as_ref()
-            .map(|branch| branch.name())
-            .map(|name| util::truncate_and_trailoff(name, MAX_BRANCH_NAME_LENGTH))
-            .or_else(|| {
-                repo.head_commit.as_ref().map(|commit| {
-                    commit
-                        .sha
-                        .chars()
-                        .take(MAX_SHORT_SHA_LENGTH)
-                        .collect::<String>()
-                })
-            })?;
-
-        Some(
-            Button::new("project_branch_trigger", branch_name)
-                .color(Color::Muted)
-                .style(ButtonStyle::Subtle)
-                .label_size(LabelSize::Small)
-                .tooltip(move |_window, cx| {
-                    Tooltip::with_meta(
-                        "Recent Branches",
-                        Some(&zed_actions::git::Branch),
-                        "Local branches only",
-                        cx,
-                    )
-                })
-                .on_click(move |_, window, cx| {
-                    let _ = workspace.update(cx, |this, cx| {
-                        window.focus(&this.active_pane().focus_handle(cx));
-                        window.dispatch_action(zed_actions::git::Branch.boxed_clone(), cx);
-                    });
-                })
-                .when(settings.show_branch_icon, |branch_button| {
-                    let (icon, icon_color) = {
-                        let status = repo.status_summary();
-                        let tracked = status.index + status.worktree;
-                        if status.conflict > 0 {
-                            (IconName::Warning, Color::VersionControlConflict)
-                        } else if tracked.modified > 0 {
-                            (IconName::SquareDot, Color::VersionControlModified)
-                        } else if tracked.added > 0 || status.untracked > 0 {
-                            (IconName::SquarePlus, Color::VersionControlAdded)
-                        } else if tracked.deleted > 0 {
-                            (IconName::SquareMinus, Color::VersionControlDeleted)
-                        } else {
-                            (IconName::GitBranch, Color::Muted)
-                        }
-                    };
-
-                    branch_button
-                        .icon(icon)
-                        .icon_position(IconPosition::Start)
-                        .icon_color(icon_color)
-                        .icon_size(IconSize::Indicator)
-                }),
-        )
-    }
-
-    fn window_activation_changed(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if window.is_window_active() {
-            ActiveCall::global(cx)
-                .update(cx, |call, cx| call.set_location(Some(&self.project), cx))
-                .detach_and_log_err(cx);
-        } else if cx.active_window().is_none() {
-            ActiveCall::global(cx)
-                .update(cx, |call, cx| call.set_location(None, cx))
-                .detach_and_log_err(cx);
-        }
-        self.workspace
-            .update(cx, |workspace, cx| {
-                workspace.update_active_view_for_followers(window, cx);
-            })
-            .ok();
-    }
-
-    fn active_call_changed(&mut self, cx: &mut Context<Self>) {
-        cx.notify();
-    }
-
-    fn share_project(&mut self, cx: &mut Context<Self>) {
-        let active_call = ActiveCall::global(cx);
-        let project = self.project.clone();
-        active_call
-            .update(cx, |call, cx| call.share_project(project, cx))
-            .detach_and_log_err(cx);
-    }
-
-    fn unshare_project(&mut self, _: &mut Window, cx: &mut Context<Self>) {
-        let active_call = ActiveCall::global(cx);
-        let project = self.project.clone();
-        active_call
-            .update(cx, |call, cx| call.unshare_project(project, cx))
-            .log_err();
-    }
-
-    fn render_connection_status(
-        &self,
-        status: &client::Status,
-        cx: &mut Context<Self>,
-    ) -> Option<AnyElement> {
-        match status {
-            client::Status::ConnectionError
-            | client::Status::ConnectionLost
-            | client::Status::Reauthenticating
-            | client::Status::Reconnecting
-            | client::Status::ReconnectionError { .. } => Some(
-                div()
-                    .id("disconnected")
-                    .child(Icon::new(IconName::Disconnected).size(IconSize::Small))
-                    .tooltip(Tooltip::text("Disconnected"))
-                    .into_any_element(),
-            ),
-            client::Status::UpgradeRequired => {
-                let auto_updater = auto_update::AutoUpdater::get(cx);
-                let label = match auto_updater.map(|auto_update| auto_update.read(cx).status()) {
-                    Some(AutoUpdateStatus::Updated { .. }) => "Please restart Zed to Collaborate",
-                    Some(AutoUpdateStatus::Installing { .. })
-                    | Some(AutoUpdateStatus::Downloading { .. })
-                    | Some(AutoUpdateStatus::Checking) => "Updating...",
-                    Some(AutoUpdateStatus::Idle)
-                    | Some(AutoUpdateStatus::Errored { .. })
-                    | None => "Please update Zed to Collaborate",
-                };
-
-                Some(
-                    Button::new("connection-status", label)
-                        .label_size(LabelSize::Small)
-                        .on_click(|_, window, cx| {
-                            if let Some(auto_updater) = auto_update::AutoUpdater::get(cx)
-                                && auto_updater.read(cx).status().is_updated()
-                            {
-                                workspace::reload(cx);
-                                return;
-                            }
-                            auto_update::check(&Default::default(), window, cx);
-                        })
-                        .into_any_element(),
-                )
-            }
-            _ => None,
-        }
-    }
-
-    pub fn render_sign_in_button(&mut self, _: &mut Context<Self>) -> Button {
-        let client = self.client.clone();
-        Button::new("sign_in", "Sign in")
-            .label_size(LabelSize::Small)
-            .on_click(move |_, window, cx| {
-                let client = client.clone();
-                window
-                    .spawn(cx, async move |cx| {
-                        client
-                            .sign_in_with_optional_connect(true, cx)
-                            .await
-                            .notify_async_err(cx);
-                    })
-                    .detach();
-            })
-    }
-
-    pub fn render_app_menu_button(&mut self, cx: &mut Context<Self>) -> impl Element {
-        let user_store = self.user_store.read(cx);
-        let user = user_store.current_user();
-
-        let user_avatar = user.as_ref().map(|u| u.avatar_uri.clone());
-        let user_login = user.as_ref().map(|u| u.github_login.clone());
-
-        let is_signed_in = user.is_some();
-
-        let has_subscription_period = user_store.subscription_period().is_some();
-        let plan = user_store.plan().filter(|_| {
-            // Since the user might be on the legacy free plan we filter based on whether we have a subscription period.
-            has_subscription_period
-        });
-
-        let free_chip_bg = cx
-            .theme()
-            .colors()
-            .editor_background
-            .opacity(0.5)
-            .blend(cx.theme().colors().text_accent.opacity(0.05));
-
-        let pro_chip_bg = cx
-            .theme()
-            .colors()
-            .editor_background
-            .opacity(0.5)
-            .blend(cx.theme().colors().text_accent.opacity(0.2));
-
-        PopoverMenu::new("user-menu")
-            .anchor(Corner::TopRight)
-            .menu(move |window, cx| {
-                ContextMenu::build(window, cx, |menu, _, _cx| {
-                    let user_login = user_login.clone();
-
-                    let (plan_name, label_color, bg_color) = match plan {
-                        None | Some(Plan::V1(PlanV1::ZedFree) | Plan::V2(PlanV2::ZedFree)) => {
-                            ("Free", Color::Default, free_chip_bg)
-                        }
-                        Some(Plan::V1(PlanV1::ZedProTrial) | Plan::V2(PlanV2::ZedProTrial)) => {
-                            ("Pro Trial", Color::Accent, pro_chip_bg)
-                        }
-                        Some(Plan::V1(PlanV1::ZedPro) | Plan::V2(PlanV2::ZedPro)) => {
-                            ("Pro", Color::Accent, pro_chip_bg)
-                        }
-                    };
-
-                    menu.when(is_signed_in, |this| {
-                        this.custom_entry(
-                            move |_window, _cx| {
-                                let user_login = user_login.clone().unwrap_or_default();
-
-                                h_flex()
-                                    .w_full()
-                                    .justify_between()
-                                    .child(Label::new(user_login))
-                                    .child(
-                                        Chip::new(plan_name.to_string())
-                                            .bg_color(bg_color)
-                                            .label_color(label_color),
-                                    )
-                                    .into_any_element()
-                            },
-                            move |_, cx| {
-                                cx.open_url(&zed_urls::account_url(cx));
-                            },
-                        )
-                        .separator()
-                    })
-                    .action("Settings", zed_actions::OpenSettings.boxed_clone())
-                    .action("Keymap", Box::new(zed_actions::OpenKeymap))
-                    .action(
-                        "Themes…",
-                        zed_actions::theme_selector::Toggle::default().boxed_clone(),
-                    )
-                    .action(
-                        "Icon Themes…",
-                        zed_actions::icon_theme_selector::Toggle::default().boxed_clone(),
-                    )
-                    .action(
-                        "Extensions",
-                        zed_actions::Extensions::default().boxed_clone(),
-                    )
-                    .when(is_signed_in, |this| {
-                        this.separator()
-                            .action("Sign Out", client::SignOut.boxed_clone())
-                    })
-                })
-                .into()
-            })
-            .map(|this| {
-                if is_signed_in && TitleBarSettings::get_global(cx).show_user_picture {
-                    this.trigger_with_tooltip(
-                        ButtonLike::new("user-menu")
-                            .children(user_avatar.clone().map(|avatar| Avatar::new(avatar))),
-                        Tooltip::text("Toggle User Menu"),
-                    )
-                } else {
-                    this.trigger_with_tooltip(
-                        IconButton::new("user-menu", IconName::ChevronDown)
-                            .icon_size(IconSize::Small),
-                        Tooltip::text("Toggle User Menu"),
-                    )
-                }
-            })
-            .anchor(gpui::Corner::TopRight)
-    }
-}
diff --git a/crates/title_bar/src/title_bar_settings.rs b/crates/title_bar/src/title_bar_settings.rs
deleted file mode 100644
index 29fae4d31e..0000000000
--- a/crates/title_bar/src/title_bar_settings.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-use settings::{RegisterSetting, Settings, SettingsContent};
-
-#[derive(Copy, Clone, Debug, RegisterSetting)]
-pub struct TitleBarSettings {
-    pub show_branch_icon: bool,
-    pub show_onboarding_banner: bool,
-    pub show_user_picture: bool,
-    pub show_branch_name: bool,
-    pub show_project_items: bool,
-    pub show_sign_in: bool,
-    pub show_menus: bool,
-}
-
-impl Settings for TitleBarSettings {
-    fn from_settings(s: &SettingsContent) -> Self {
-        let content = s.title_bar.clone().unwrap();
-        TitleBarSettings {
-            show_branch_icon: content.show_branch_icon.unwrap(),
-            show_onboarding_banner: content.show_onboarding_banner.unwrap(),
-            show_user_picture: content.show_user_picture.unwrap(),
-            show_branch_name: content.show_branch_name.unwrap(),
-            show_project_items: content.show_project_items.unwrap(),
-            show_sign_in: content.show_sign_in.unwrap(),
-            show_menus: content.show_menus.unwrap(),
-        }
-    }
-}
diff --git a/crates/toolchain_selector/Cargo.toml b/crates/toolchain_selector/Cargo.toml
deleted file mode 100644
index 94a655b727..0000000000
--- a/crates/toolchain_selector/Cargo.toml
+++ /dev/null
@@ -1,29 +0,0 @@
-[package]
-name = "toolchain_selector"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[dependencies]
-anyhow.workspace = true
-convert_case.workspace = true
-editor.workspace = true
-file_finder.workspace = true
-futures.workspace = true
-fuzzy.workspace = true
-gpui.workspace = true
-language.workspace = true
-menu.workspace = true
-picker.workspace = true
-project.workspace = true
-ui.workspace = true
-util.workspace = true
-workspace.workspace = true
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/toolchain_selector.rs"
-doctest = false
diff --git a/crates/toolchain_selector/LICENSE-GPL b/crates/toolchain_selector/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/toolchain_selector/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/toolchain_selector/src/active_toolchain.rs b/crates/toolchain_selector/src/active_toolchain.rs
deleted file mode 100644
index 03c152e3fd..0000000000
--- a/crates/toolchain_selector/src/active_toolchain.rs
+++ /dev/null
@@ -1,264 +0,0 @@
-use std::sync::Arc;
-
-use editor::Editor;
-use gpui::{
-    AsyncWindowContext, Context, Entity, IntoElement, ParentElement, Render, Styled, Subscription,
-    Task, WeakEntity, Window, div,
-};
-use language::{Buffer, BufferEvent, LanguageName, Toolchain, ToolchainScope};
-use project::{Project, ProjectPath, Toolchains, WorktreeId, toolchain_store::ToolchainStoreEvent};
-use ui::{Button, ButtonCommon, Clickable, LabelSize, SharedString, Tooltip};
-use util::{maybe, rel_path::RelPath};
-use workspace::{StatusItemView, Workspace, item::ItemHandle};
-
-use crate::ToolchainSelector;
-
-pub struct ActiveToolchain {
-    active_toolchain: Option<Toolchain>,
-    term: SharedString,
-    workspace: WeakEntity<Workspace>,
-    active_buffer: Option<(WorktreeId, WeakEntity<Buffer>, Subscription)>,
-    _update_toolchain_task: Task<Option<()>>,
-}
-
-impl ActiveToolchain {
-    pub fn new(workspace: &Workspace, window: &mut Window, cx: &mut Context<Self>) -> Self {
-        if let Some(store) = workspace.project().read(cx).toolchain_store() {
-            cx.subscribe_in(
-                &store,
-                window,
-                |this, _, _: &ToolchainStoreEvent, window, cx| {
-                    let editor = this
-                        .workspace
-                        .update(cx, |workspace, cx| {
-                            workspace
-                                .active_item(cx)
-                                .and_then(|item| item.downcast::<Editor>())
-                        })
-                        .ok()
-                        .flatten();
-                    if let Some(editor) = editor {
-                        this.update_lister(editor, window, cx);
-                    }
-                },
-            )
-            .detach();
-        }
-        Self {
-            active_toolchain: None,
-            active_buffer: None,
-            term: SharedString::new_static("Toolchain"),
-            workspace: workspace.weak_handle(),
-
-            _update_toolchain_task: Self::spawn_tracker_task(window, cx),
-        }
-    }
-    fn spawn_tracker_task(window: &mut Window, cx: &mut Context<Self>) -> Task<Option<()>> {
-        cx.spawn_in(window, async move |this, cx| {
-            let did_set_toolchain = maybe!(async {
-                let active_file = this
-                    .read_with(cx, |this, _| {
-                        this.active_buffer
-                            .as_ref()
-                            .map(|(_, buffer, _)| buffer.clone())
-                    })
-                    .ok()
-                    .flatten()?;
-                let workspace = this.read_with(cx, |this, _| this.workspace.clone()).ok()?;
-                let language_name = active_file
-                    .read_with(cx, |this, _| Some(this.language()?.name()))
-                    .ok()
-                    .flatten()?;
-                let meta = workspace
-                    .update(cx, |workspace, cx| {
-                        let languages = workspace.project().read(cx).languages();
-                        Project::toolchain_metadata(languages.clone(), language_name.clone())
-                    })
-                    .ok()?
-                    .await?;
-                let _ = this.update(cx, |this, cx| {
-                    this.term = meta.term;
-                    cx.notify();
-                });
-                let (worktree_id, path) = active_file
-                    .update(cx, |this, cx| {
-                        this.file().and_then(|file| {
-                            Some((file.worktree_id(cx), file.path().parent()?.into()))
-                        })
-                    })
-                    .ok()
-                    .flatten()?;
-                let toolchain =
-                    Self::active_toolchain(workspace, worktree_id, path, language_name, cx).await?;
-                this.update(cx, |this, cx| {
-                    this.active_toolchain = Some(toolchain);
-
-                    cx.notify();
-                })
-                .ok()
-            })
-            .await
-            .is_some();
-            if !did_set_toolchain {
-                this.update(cx, |this, cx| {
-                    this.active_toolchain = None;
-                    cx.notify();
-                })
-                .ok();
-            }
-            did_set_toolchain.then_some(())
-        })
-    }
-
-    fn update_lister(
-        &mut self,
-        editor: Entity<Editor>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let editor = editor.read(cx);
-        if let Some((_, buffer, _)) = editor.active_excerpt(cx)
-            && let Some(worktree_id) = buffer.read(cx).file().map(|file| file.worktree_id(cx))
-        {
-            let subscription = cx.subscribe_in(
-                &buffer,
-                window,
-                |this, _, event: &BufferEvent, window, cx| {
-                    if matches!(event, BufferEvent::LanguageChanged(_)) {
-                        this._update_toolchain_task = Self::spawn_tracker_task(window, cx);
-                    }
-                },
-            );
-            self.active_buffer = Some((worktree_id, buffer.downgrade(), subscription));
-            self._update_toolchain_task = Self::spawn_tracker_task(window, cx);
-        }
-
-        cx.notify();
-    }
-
-    fn active_toolchain(
-        workspace: WeakEntity<Workspace>,
-        worktree_id: WorktreeId,
-        relative_path: Arc<RelPath>,
-        language_name: LanguageName,
-        cx: &mut AsyncWindowContext,
-    ) -> Task<Option<Toolchain>> {
-        cx.spawn(async move |cx| {
-            let workspace_id = workspace
-                .read_with(cx, |this, _| this.database_id())
-                .ok()
-                .flatten()?;
-            let selected_toolchain = workspace
-                .update(cx, |this, cx| {
-                    this.project().read(cx).active_toolchain(
-                        ProjectPath {
-                            worktree_id,
-                            path: relative_path.clone(),
-                        },
-                        language_name.clone(),
-                        cx,
-                    )
-                })
-                .ok()?
-                .await;
-            if let Some(toolchain) = selected_toolchain {
-                Some(toolchain)
-            } else {
-                let project = workspace
-                    .read_with(cx, |this, _| this.project().clone())
-                    .ok()?;
-                let Toolchains {
-                    toolchains,
-                    root_path: relative_path,
-                    user_toolchains,
-                } = cx
-                    .update(|_, cx| {
-                        project.read(cx).available_toolchains(
-                            ProjectPath {
-                                worktree_id,
-                                path: relative_path.clone(),
-                            },
-                            language_name,
-                            cx,
-                        )
-                    })
-                    .ok()?
-                    .await?;
-                // Since we don't have a selected toolchain, pick one for user here.
-                let default_choice = user_toolchains
-                    .iter()
-                    .find_map(|(scope, toolchains)| {
-                        if scope == &ToolchainScope::Global {
-                            // Ignore global toolchains when making a default choice. They're unlikely to be the right choice.
-                            None
-                        } else {
-                            toolchains.first()
-                        }
-                    })
-                    .or_else(|| toolchains.toolchains.first())
-                    .cloned();
-                if let Some(toolchain) = &default_choice {
-                    workspace::WORKSPACE_DB
-                        .set_toolchain(
-                            workspace_id,
-                            worktree_id,
-                            relative_path.clone(),
-                            toolchain.clone(),
-                        )
-                        .await
-                        .ok()?;
-                    project
-                        .update(cx, |this, cx| {
-                            this.activate_toolchain(
-                                ProjectPath {
-                                    worktree_id,
-                                    path: relative_path,
-                                },
-                                toolchain.clone(),
-                                cx,
-                            )
-                        })
-                        .ok()?
-                        .await;
-                }
-
-                default_choice
-            }
-        })
-    }
-}
-
-impl Render for ActiveToolchain {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let Some(active_toolchain) = self.active_toolchain.as_ref() else {
-            return div().hidden();
-        };
-
-        div().child(
-            Button::new("change-toolchain", active_toolchain.name.clone())
-                .label_size(LabelSize::Small)
-                .on_click(cx.listener(|this, _, window, cx| {
-                    if let Some(workspace) = this.workspace.upgrade() {
-                        workspace.update(cx, |workspace, cx| {
-                            ToolchainSelector::toggle(workspace, window, cx)
-                        });
-                    }
-                }))
-                .tooltip(Tooltip::text(format!("Select {}", &self.term))),
-        )
-    }
-}
-
-impl StatusItemView for ActiveToolchain {
-    fn set_active_pane_item(
-        &mut self,
-        active_pane_item: Option<&dyn ItemHandle>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(editor) = active_pane_item.and_then(|item| item.downcast::<Editor>()) {
-            self.update_lister(editor, window, cx);
-        }
-        cx.notify();
-    }
-}
diff --git a/crates/toolchain_selector/src/toolchain_selector.rs b/crates/toolchain_selector/src/toolchain_selector.rs
deleted file mode 100644
index 138f99066f..0000000000
--- a/crates/toolchain_selector/src/toolchain_selector.rs
+++ /dev/null
@@ -1,1142 +0,0 @@
-mod active_toolchain;
-
-pub use active_toolchain::ActiveToolchain;
-use convert_case::Casing as _;
-use editor::Editor;
-use file_finder::OpenPathDelegate;
-use futures::channel::oneshot;
-use fuzzy::{StringMatch, StringMatchCandidate, match_strings};
-use gpui::{
-    Action, Animation, AnimationExt, App, Context, DismissEvent, Entity, EventEmitter, FocusHandle,
-    Focusable, KeyContext, ParentElement, Render, Styled, Subscription, Task, WeakEntity, Window,
-    actions, pulsating_between,
-};
-use language::{Language, LanguageName, Toolchain, ToolchainScope};
-use picker::{Picker, PickerDelegate};
-use project::{DirectoryLister, Project, ProjectPath, Toolchains, WorktreeId};
-use std::{
-    borrow::Cow,
-    path::{Path, PathBuf},
-    sync::Arc,
-    time::Duration,
-};
-use ui::{
-    Divider, HighlightedLabel, KeyBinding, List, ListItem, ListItemSpacing, Navigable,
-    NavigableEntry, prelude::*,
-};
-use util::{ResultExt, maybe, paths::PathStyle, rel_path::RelPath};
-use workspace::{ModalView, Workspace};
-
-actions!(
-    toolchain,
-    [
-        /// Selects a toolchain for the current project.
-        Select,
-        /// Adds a new toolchain for the current project.
-        AddToolchain
-    ]
-);
-
-pub fn init(cx: &mut App) {
-    cx.observe_new(ToolchainSelector::register).detach();
-}
-
-pub struct ToolchainSelector {
-    state: State,
-    create_search_state: Arc<dyn Fn(&mut Window, &mut Context<Self>) -> SearchState + 'static>,
-    language: Option<Arc<Language>>,
-    project: Entity<Project>,
-    language_name: LanguageName,
-    worktree_id: WorktreeId,
-    relative_path: Arc<RelPath>,
-}
-
-#[derive(Clone)]
-struct SearchState {
-    picker: Entity<Picker<ToolchainSelectorDelegate>>,
-}
-
-struct AddToolchainState {
-    state: AddState,
-    project: Entity<Project>,
-    language_name: LanguageName,
-    root_path: ProjectPath,
-    weak: WeakEntity<ToolchainSelector>,
-}
-
-struct ScopePickerState {
-    entries: [NavigableEntry; 3],
-    selected_scope: ToolchainScope,
-}
-
-#[expect(
-    dead_code,
-    reason = "These tasks have to be kept alive to run to completion"
-)]
-enum PathInputState {
-    WaitingForPath(Task<()>),
-    Resolving(Task<()>),
-}
-
-enum AddState {
-    Path {
-        picker: Entity<Picker<file_finder::OpenPathDelegate>>,
-        error: Option<Arc<str>>,
-        input_state: PathInputState,
-        _subscription: Subscription,
-    },
-    Name {
-        toolchain: Toolchain,
-        editor: Entity<Editor>,
-        scope_picker: ScopePickerState,
-    },
-}
-
-impl AddToolchainState {
-    fn new(
-        project: Entity<Project>,
-        language_name: LanguageName,
-        root_path: ProjectPath,
-        window: &mut Window,
-        cx: &mut Context<ToolchainSelector>,
-    ) -> Entity<Self> {
-        let weak = cx.weak_entity();
-
-        cx.new(|cx| {
-            let (lister, rx) = Self::create_path_browser_delegate(project.clone(), cx);
-            let picker = cx.new(|cx| Picker::uniform_list(lister, window, cx));
-            Self {
-                state: AddState::Path {
-                    _subscription: cx.subscribe(&picker, |_, _, _: &DismissEvent, cx| {
-                        cx.stop_propagation();
-                    }),
-                    picker,
-                    error: None,
-                    input_state: Self::wait_for_path(rx, window, cx),
-                },
-                project,
-                language_name,
-                root_path,
-                weak,
-            }
-        })
-    }
-
-    fn create_path_browser_delegate(
-        project: Entity<Project>,
-        cx: &mut Context<Self>,
-    ) -> (OpenPathDelegate, oneshot::Receiver<Option<Vec<PathBuf>>>) {
-        let (tx, rx) = oneshot::channel();
-        let weak = cx.weak_entity();
-        let path_style = project.read(cx).path_style(cx);
-        let lister =
-            OpenPathDelegate::new(tx, DirectoryLister::Project(project), false, path_style)
-                .show_hidden()
-                .with_footer(Arc::new(move |_, cx| {
-                    let error = weak
-                        .read_with(cx, |this, _| {
-                            if let AddState::Path { error, .. } = &this.state {
-                                error.clone()
-                            } else {
-                                None
-                            }
-                        })
-                        .ok()
-                        .flatten();
-                    let is_loading = weak
-                        .read_with(cx, |this, _| {
-                            matches!(
-                                this.state,
-                                AddState::Path {
-                                    input_state: PathInputState::Resolving(_),
-                                    ..
-                                }
-                            )
-                        })
-                        .unwrap_or_default();
-                    Some(
-                        v_flex()
-                            .child(Divider::horizontal())
-                            .child(
-                                h_flex()
-                                    .p_1()
-                                    .justify_between()
-                                    .gap_2()
-                                    .child(
-                                        Label::new("Select Toolchain Path")
-                                            .color(Color::Muted)
-                                            .map(|this| {
-                                                if is_loading {
-                                                    this.with_animation(
-                                                        "select-toolchain-label",
-                                                        Animation::new(Duration::from_secs(2))
-                                                            .repeat()
-                                                            .with_easing(pulsating_between(
-                                                                0.4, 0.8,
-                                                            )),
-                                                        |label, delta| label.alpha(delta),
-                                                    )
-                                                    .into_any()
-                                                } else {
-                                                    this.into_any_element()
-                                                }
-                                            }),
-                                    )
-                                    .when_some(error, |this, error| {
-                                        this.child(Label::new(error).color(Color::Error))
-                                    }),
-                            )
-                            .into_any(),
-                    )
-                }));
-
-        (lister, rx)
-    }
-    fn resolve_path(
-        path: PathBuf,
-        root_path: ProjectPath,
-        language_name: LanguageName,
-        project: Entity<Project>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> PathInputState {
-        PathInputState::Resolving(cx.spawn_in(window, async move |this, cx| {
-            _ = maybe!(async move {
-                let toolchain = project
-                    .update(cx, |this, cx| {
-                        this.resolve_toolchain(path.clone(), language_name, cx)
-                    })?
-                    .await;
-                let Ok(toolchain) = toolchain else {
-                    // Go back to the path input state
-                    _ = this.update_in(cx, |this, window, cx| {
-                        if let AddState::Path {
-                            input_state,
-                            picker,
-                            error,
-                            ..
-                        } = &mut this.state
-                            && matches!(input_state, PathInputState::Resolving(_))
-                        {
-                            let Err(e) = toolchain else { unreachable!() };
-                            *error = Some(Arc::from(e.to_string()));
-                            let (delegate, rx) =
-                                Self::create_path_browser_delegate(this.project.clone(), cx);
-                            picker.update(cx, |picker, cx| {
-                                *picker = Picker::uniform_list(delegate, window, cx);
-                                picker.set_query(
-                                    Arc::from(path.to_string_lossy().as_ref()),
-                                    window,
-                                    cx,
-                                );
-                            });
-                            *input_state = Self::wait_for_path(rx, window, cx);
-                            this.focus_handle(cx).focus(window);
-                        }
-                    });
-                    return Err(anyhow::anyhow!("Failed to resolve toolchain"));
-                };
-                let resolved_toolchain_path = project.read_with(cx, |this, cx| {
-                    this.find_project_path(&toolchain.path.as_ref(), cx)
-                })?;
-
-                // Suggest a default scope based on the applicability.
-                let scope = if let Some(project_path) = resolved_toolchain_path {
-                    if !root_path.path.as_ref().is_empty() && project_path.starts_with(&root_path) {
-                        ToolchainScope::Subproject(root_path.worktree_id, root_path.path)
-                    } else {
-                        ToolchainScope::Project
-                    }
-                } else {
-                    // This path lies outside of the project.
-                    ToolchainScope::Global
-                };
-
-                _ = this.update_in(cx, |this, window, cx| {
-                    let scope_picker = ScopePickerState {
-                        entries: std::array::from_fn(|_| NavigableEntry::focusable(cx)),
-                        selected_scope: scope,
-                    };
-                    this.state = AddState::Name {
-                        editor: cx.new(|cx| {
-                            let mut editor = Editor::single_line(window, cx);
-                            editor.set_text(toolchain.name.as_ref(), window, cx);
-                            editor
-                        }),
-                        toolchain,
-                        scope_picker,
-                    };
-                    this.focus_handle(cx).focus(window);
-                });
-
-                Result::<_, anyhow::Error>::Ok(())
-            })
-            .await;
-        }))
-    }
-
-    fn wait_for_path(
-        rx: oneshot::Receiver<Option<Vec<PathBuf>>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> PathInputState {
-        let task = cx.spawn_in(window, async move |this, cx| {
-            maybe!(async move {
-                let result = rx.await.log_err()?;
-
-                let path = result
-                    .into_iter()
-                    .flat_map(|paths| paths.into_iter())
-                    .next()?;
-                this.update_in(cx, |this, window, cx| {
-                    if let AddState::Path {
-                        input_state, error, ..
-                    } = &mut this.state
-                        && matches!(input_state, PathInputState::WaitingForPath(_))
-                    {
-                        error.take();
-                        *input_state = Self::resolve_path(
-                            path,
-                            this.root_path.clone(),
-                            this.language_name.clone(),
-                            this.project.clone(),
-                            window,
-                            cx,
-                        );
-                    }
-                })
-                .ok()?;
-                Some(())
-            })
-            .await;
-        });
-        PathInputState::WaitingForPath(task)
-    }
-
-    fn confirm_toolchain(
-        &mut self,
-        _: &menu::Confirm,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let AddState::Name {
-            toolchain,
-            editor,
-            scope_picker,
-        } = &mut self.state
-        else {
-            return;
-        };
-
-        let text = editor.read(cx).text(cx);
-        if text.is_empty() {
-            return;
-        }
-
-        toolchain.name = SharedString::from(text);
-        self.project.update(cx, |this, cx| {
-            this.add_toolchain(toolchain.clone(), scope_picker.selected_scope.clone(), cx);
-        });
-        _ = self.weak.update(cx, |this, cx| {
-            this.state = State::Search((this.create_search_state)(window, cx));
-            this.focus_handle(cx).focus(window);
-            cx.notify();
-        });
-    }
-}
-impl Focusable for AddToolchainState {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        match &self.state {
-            AddState::Path { picker, .. } => picker.focus_handle(cx),
-            AddState::Name { editor, .. } => editor.focus_handle(cx),
-        }
-    }
-}
-
-impl AddToolchainState {
-    fn select_scope(&mut self, scope: ToolchainScope, cx: &mut Context<Self>) {
-        if let AddState::Name { scope_picker, .. } = &mut self.state {
-            scope_picker.selected_scope = scope;
-            cx.notify();
-        }
-    }
-}
-
-impl Focusable for State {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        match self {
-            State::Search(state) => state.picker.focus_handle(cx),
-            State::AddToolchain(state) => state.focus_handle(cx),
-        }
-    }
-}
-impl Render for AddToolchainState {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let theme = cx.theme().clone();
-        let weak = self.weak.upgrade();
-        let label = SharedString::new_static("Add");
-
-        v_flex()
-            .size_full()
-            // todo: These modal styles shouldn't be needed as the modal picker already has `elevation_3`
-            // They get duplicated in the middle state of adding a virtual env, but then are needed for this last state
-            .bg(cx.theme().colors().elevated_surface_background)
-            .border_1()
-            .border_color(cx.theme().colors().border_variant)
-            .rounded_lg()
-            .when_some(weak, |this, weak| {
-                this.on_action(window.listener_for(
-                    &weak,
-                    |this: &mut ToolchainSelector, _: &menu::Cancel, window, cx| {
-                        this.state = State::Search((this.create_search_state)(window, cx));
-                        this.state.focus_handle(cx).focus(window);
-                        cx.notify();
-                    },
-                ))
-            })
-            .on_action(cx.listener(Self::confirm_toolchain))
-            .map(|this| match &self.state {
-                AddState::Path { picker, .. } => this.child(picker.clone()),
-                AddState::Name {
-                    editor,
-                    scope_picker,
-                    ..
-                } => {
-                    let scope_options = [
-                        ToolchainScope::Global,
-                        ToolchainScope::Project,
-                        ToolchainScope::Subproject(
-                            self.root_path.worktree_id,
-                            self.root_path.path.clone(),
-                        ),
-                    ];
-
-                    let mut navigable_scope_picker = Navigable::new(
-                        v_flex()
-                            .child(
-                                h_flex()
-                                    .w_full()
-                                    .p_2()
-                                    .border_b_1()
-                                    .border_color(theme.colors().border)
-                                    .child(editor.clone()),
-                            )
-                            .child(
-                                v_flex()
-                                    .child(
-                                        Label::new("Scope")
-                                            .size(LabelSize::Small)
-                                            .color(Color::Muted)
-                                            .mt_1()
-                                            .ml_2(),
-                                    )
-                                    .child(List::new().children(
-                                        scope_options.iter().enumerate().map(|(i, scope)| {
-                                            let is_selected = *scope == scope_picker.selected_scope;
-                                            let label = scope.label();
-                                            let description = scope.description();
-                                            let scope_clone_for_action = scope.clone();
-                                            let scope_clone_for_click = scope.clone();
-
-                                            div()
-                                                .id(SharedString::from(format!("scope-option-{i}")))
-                                                .track_focus(&scope_picker.entries[i].focus_handle)
-                                                .on_action(cx.listener(
-                                                    move |this, _: &menu::Confirm, _, cx| {
-                                                        this.select_scope(
-                                                            scope_clone_for_action.clone(),
-                                                            cx,
-                                                        );
-                                                    },
-                                                ))
-                                                .child(
-                                                    ListItem::new(SharedString::from(format!(
-                                                        "scope-{i}"
-                                                    )))
-                                                    .toggle_state(
-                                                        is_selected
-                                                            || scope_picker.entries[i]
-                                                                .focus_handle
-                                                                .contains_focused(window, cx),
-                                                    )
-                                                    .inset(true)
-                                                    .spacing(ListItemSpacing::Sparse)
-                                                    .child(
-                                                        h_flex()
-                                                            .gap_2()
-                                                            .child(Label::new(label))
-                                                            .child(
-                                                                Label::new(description)
-                                                                    .size(LabelSize::Small)
-                                                                    .color(Color::Muted),
-                                                            ),
-                                                    )
-                                                    .on_click(cx.listener(move |this, _, _, cx| {
-                                                        this.select_scope(
-                                                            scope_clone_for_click.clone(),
-                                                            cx,
-                                                        );
-                                                    })),
-                                                )
-                                        }),
-                                    ))
-                                    .child(Divider::horizontal())
-                                    .child(h_flex().p_1p5().justify_end().map(|this| {
-                                        let is_disabled = editor.read(cx).is_empty(cx);
-                                        let handle = self.focus_handle(cx);
-                                        this.child(
-                                            Button::new("add-toolchain", label)
-                                                .disabled(is_disabled)
-                                                .key_binding(KeyBinding::for_action_in(
-                                                    &menu::Confirm,
-                                                    &handle,
-                                                    cx,
-                                                ))
-                                                .on_click(cx.listener(|this, _, window, cx| {
-                                                    this.confirm_toolchain(
-                                                        &menu::Confirm,
-                                                        window,
-                                                        cx,
-                                                    );
-                                                }))
-                                                .map(|this| {
-                                                    if false {
-                                                        this.with_animation(
-                                                            "inspecting-user-toolchain",
-                                                            Animation::new(Duration::from_millis(
-                                                                500,
-                                                            ))
-                                                            .repeat()
-                                                            .with_easing(pulsating_between(
-                                                                0.4, 0.8,
-                                                            )),
-                                                            |label, delta| label.alpha(delta),
-                                                        )
-                                                        .into_any()
-                                                    } else {
-                                                        this.into_any_element()
-                                                    }
-                                                }),
-                                        )
-                                    })),
-                            )
-                            .into_any_element(),
-                    );
-
-                    for entry in &scope_picker.entries {
-                        navigable_scope_picker = navigable_scope_picker.entry(entry.clone());
-                    }
-
-                    this.child(navigable_scope_picker.render(window, cx))
-                }
-            })
-    }
-}
-
-#[derive(Clone)]
-enum State {
-    Search(SearchState),
-    AddToolchain(Entity<AddToolchainState>),
-}
-
-impl RenderOnce for State {
-    fn render(self, _: &mut Window, _: &mut App) -> impl IntoElement {
-        match self {
-            State::Search(state) => state.picker.into_any_element(),
-            State::AddToolchain(state) => state.into_any_element(),
-        }
-    }
-}
-impl ToolchainSelector {
-    fn register(
-        workspace: &mut Workspace,
-        _window: Option<&mut Window>,
-        _: &mut Context<Workspace>,
-    ) {
-        workspace.register_action(move |workspace, _: &Select, window, cx| {
-            Self::toggle(workspace, window, cx);
-        });
-        workspace.register_action(move |workspace, _: &AddToolchain, window, cx| {
-            let Some(toolchain_selector) = workspace.active_modal::<Self>(cx) else {
-                Self::toggle(workspace, window, cx);
-                return;
-            };
-
-            toolchain_selector.update(cx, |toolchain_selector, cx| {
-                toolchain_selector.handle_add_toolchain(&AddToolchain, window, cx);
-            });
-        });
-    }
-
-    fn toggle(
-        workspace: &mut Workspace,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) -> Option<()> {
-        let (_, buffer, _) = workspace
-            .active_item(cx)?
-            .act_as::<Editor>(cx)?
-            .read(cx)
-            .active_excerpt(cx)?;
-        let project = workspace.project().clone();
-
-        let language_name = buffer.read(cx).language()?.name();
-        let worktree_id = buffer.read(cx).file()?.worktree_id(cx);
-        let relative_path: Arc<RelPath> = buffer.read(cx).file()?.path().parent()?.into();
-        let worktree_root_path = project
-            .read(cx)
-            .worktree_for_id(worktree_id, cx)?
-            .read(cx)
-            .abs_path();
-        let weak = workspace.weak_handle();
-        cx.spawn_in(window, async move |workspace, cx| {
-            let active_toolchain = project
-                .read_with(cx, |this, cx| {
-                    this.active_toolchain(
-                        ProjectPath {
-                            worktree_id,
-                            path: relative_path.clone(),
-                        },
-                        language_name.clone(),
-                        cx,
-                    )
-                })?
-                .await;
-            workspace
-                .update_in(cx, |this, window, cx| {
-                    this.toggle_modal(window, cx, move |window, cx| {
-                        ToolchainSelector::new(
-                            weak,
-                            project,
-                            active_toolchain,
-                            worktree_id,
-                            worktree_root_path,
-                            relative_path,
-                            language_name,
-                            window,
-                            cx,
-                        )
-                    });
-                })
-                .ok();
-            anyhow::Ok(())
-        })
-        .detach();
-
-        Some(())
-    }
-
-    fn new(
-        workspace: WeakEntity<Workspace>,
-        project: Entity<Project>,
-        active_toolchain: Option<Toolchain>,
-        worktree_id: WorktreeId,
-        worktree_root: Arc<Path>,
-        relative_path: Arc<RelPath>,
-        language_name: LanguageName,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let language_registry = project.read(cx).languages().clone();
-        cx.spawn({
-            let language_name = language_name.clone();
-            async move |this, cx| {
-                let language = language_registry
-                    .language_for_name(&language_name.0)
-                    .await
-                    .ok();
-                this.update(cx, |this, cx| {
-                    this.language = language;
-                    cx.notify();
-                })
-                .ok();
-            }
-        })
-        .detach();
-        let project_clone = project.clone();
-        let language_name_clone = language_name.clone();
-        let relative_path_clone = relative_path.clone();
-
-        let create_search_state = Arc::new(move |window: &mut Window, cx: &mut Context<Self>| {
-            let toolchain_selector = cx.entity().downgrade();
-            let picker = cx.new(|cx| {
-                let delegate = ToolchainSelectorDelegate::new(
-                    active_toolchain.clone(),
-                    toolchain_selector,
-                    workspace.clone(),
-                    worktree_id,
-                    worktree_root.clone(),
-                    project_clone.clone(),
-                    relative_path_clone.clone(),
-                    language_name_clone.clone(),
-                    window,
-                    cx,
-                );
-                Picker::uniform_list(delegate, window, cx)
-            });
-            let picker_focus_handle = picker.focus_handle(cx);
-            picker.update(cx, |picker, _| {
-                picker.delegate.focus_handle = picker_focus_handle.clone();
-            });
-            SearchState { picker }
-        });
-
-        Self {
-            state: State::Search(create_search_state(window, cx)),
-            create_search_state,
-            language: None,
-            project,
-            language_name,
-            worktree_id,
-            relative_path,
-        }
-    }
-
-    fn handle_add_toolchain(
-        &mut self,
-        _: &AddToolchain,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if matches!(self.state, State::Search(_)) {
-            self.state = State::AddToolchain(AddToolchainState::new(
-                self.project.clone(),
-                self.language_name.clone(),
-                ProjectPath {
-                    worktree_id: self.worktree_id,
-                    path: self.relative_path.clone(),
-                },
-                window,
-                cx,
-            ));
-            self.state.focus_handle(cx).focus(window);
-            cx.notify();
-        }
-    }
-}
-
-impl Render for ToolchainSelector {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let mut key_context = KeyContext::new_with_defaults();
-        key_context.add("ToolchainSelector");
-
-        v_flex()
-            .key_context(key_context)
-            .w(rems(34.))
-            .on_action(cx.listener(Self::handle_add_toolchain))
-            .child(self.state.clone().render(window, cx))
-    }
-}
-
-impl Focusable for ToolchainSelector {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        self.state.focus_handle(cx)
-    }
-}
-
-impl EventEmitter<DismissEvent> for ToolchainSelector {}
-impl ModalView for ToolchainSelector {}
-
-pub struct ToolchainSelectorDelegate {
-    toolchain_selector: WeakEntity<ToolchainSelector>,
-    candidates: Arc<[(Toolchain, Option<ToolchainScope>)]>,
-    matches: Vec<StringMatch>,
-    selected_index: usize,
-    workspace: WeakEntity<Workspace>,
-    worktree_id: WorktreeId,
-    worktree_abs_path_root: Arc<Path>,
-    relative_path: Arc<RelPath>,
-    placeholder_text: Arc<str>,
-    add_toolchain_text: Arc<str>,
-    project: Entity<Project>,
-    focus_handle: FocusHandle,
-    _fetch_candidates_task: Task<Option<()>>,
-}
-
-impl ToolchainSelectorDelegate {
-    fn new(
-        active_toolchain: Option<Toolchain>,
-        toolchain_selector: WeakEntity<ToolchainSelector>,
-        workspace: WeakEntity<Workspace>,
-        worktree_id: WorktreeId,
-        worktree_abs_path_root: Arc<Path>,
-        project: Entity<Project>,
-        relative_path: Arc<RelPath>,
-        language_name: LanguageName,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Self {
-        let _project = project.clone();
-        let path_style = project.read(cx).path_style(cx);
-
-        let _fetch_candidates_task = cx.spawn_in(window, {
-            async move |this, cx| {
-                let meta = _project
-                    .read_with(cx, |this, _| {
-                        Project::toolchain_metadata(this.languages().clone(), language_name.clone())
-                    })
-                    .ok()?
-                    .await?;
-                let relative_path = this
-                    .update(cx, |this, cx| {
-                        this.delegate.add_toolchain_text = format!(
-                            "Add {}",
-                            meta.term.as_ref().to_case(convert_case::Case::Title)
-                        )
-                        .into();
-                        cx.notify();
-                        this.delegate.relative_path.clone()
-                    })
-                    .ok()?;
-
-                let Toolchains {
-                    toolchains: available_toolchains,
-                    root_path: relative_path,
-                    user_toolchains,
-                } = _project
-                    .update(cx, |this, cx| {
-                        this.available_toolchains(
-                            ProjectPath {
-                                worktree_id,
-                                path: relative_path.clone(),
-                            },
-                            language_name,
-                            cx,
-                        )
-                    })
-                    .ok()?
-                    .await?;
-                let pretty_path = {
-                    if relative_path.is_empty() {
-                        Cow::Borrowed("worktree root")
-                    } else {
-                        Cow::Owned(format!("`{}`", relative_path.display(path_style)))
-                    }
-                };
-                let placeholder_text =
-                    format!("Select a {} for {pretty_path}…", meta.term.to_lowercase(),).into();
-                let _ = this.update_in(cx, move |this, window, cx| {
-                    this.delegate.relative_path = relative_path;
-                    this.delegate.placeholder_text = placeholder_text;
-                    this.refresh_placeholder(window, cx);
-                });
-
-                let _ = this.update_in(cx, move |this, window, cx| {
-                    this.delegate.candidates = user_toolchains
-                        .into_iter()
-                        .flat_map(|(scope, toolchains)| {
-                            toolchains
-                                .into_iter()
-                                .map(move |toolchain| (toolchain, Some(scope.clone())))
-                        })
-                        .chain(
-                            available_toolchains
-                                .toolchains
-                                .into_iter()
-                                .map(|toolchain| (toolchain, None)),
-                        )
-                        .collect();
-
-                    if let Some(active_toolchain) = active_toolchain
-                        && let Some(position) = this
-                            .delegate
-                            .candidates
-                            .iter()
-                            .position(|(toolchain, _)| *toolchain == active_toolchain)
-                    {
-                        this.delegate.set_selected_index(position, window, cx);
-                    }
-                    this.update_matches(this.query(cx), window, cx);
-                });
-
-                Some(())
-            }
-        });
-        let placeholder_text = "Select a toolchain…".to_string().into();
-        Self {
-            toolchain_selector,
-            candidates: Default::default(),
-            matches: vec![],
-            selected_index: 0,
-            workspace,
-            worktree_id,
-            worktree_abs_path_root,
-            placeholder_text,
-            relative_path,
-            _fetch_candidates_task,
-            project,
-            focus_handle: cx.focus_handle(),
-            add_toolchain_text: Arc::from("Add Toolchain"),
-        }
-    }
-    fn relativize_path(
-        path: SharedString,
-        worktree_root: &Path,
-        path_style: PathStyle,
-    ) -> SharedString {
-        Path::new(&path.as_ref())
-            .strip_prefix(&worktree_root)
-            .ok()
-            .and_then(|suffix| suffix.to_str())
-            .map(|suffix| format!(".{}{suffix}", path_style.primary_separator()).into())
-            .unwrap_or(path)
-    }
-}
-
-impl PickerDelegate for ToolchainSelectorDelegate {
-    type ListItem = ListItem;
-
-    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
-        self.placeholder_text.clone()
-    }
-
-    fn match_count(&self) -> usize {
-        self.matches.len()
-    }
-
-    fn confirm(&mut self, _: bool, window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        if let Some(string_match) = self.matches.get(self.selected_index) {
-            let (toolchain, _) = self.candidates[string_match.candidate_id].clone();
-            if let Some(workspace_id) = self
-                .workspace
-                .read_with(cx, |this, _| this.database_id())
-                .ok()
-                .flatten()
-            {
-                let workspace = self.workspace.clone();
-                let worktree_id = self.worktree_id;
-                let path = self.relative_path.clone();
-                let relative_path = self.relative_path.clone();
-                cx.spawn_in(window, async move |_, cx| {
-                    workspace::WORKSPACE_DB
-                        .set_toolchain(workspace_id, worktree_id, relative_path, toolchain.clone())
-                        .await
-                        .log_err();
-                    workspace
-                        .update(cx, |this, cx| {
-                            this.project().update(cx, |this, cx| {
-                                this.activate_toolchain(
-                                    ProjectPath { worktree_id, path },
-                                    toolchain,
-                                    cx,
-                                )
-                            })
-                        })
-                        .ok()?
-                        .await;
-                    Some(())
-                })
-                .detach();
-            }
-        }
-        self.dismissed(window, cx);
-    }
-
-    fn dismissed(&mut self, _: &mut Window, cx: &mut Context<Picker<Self>>) {
-        self.toolchain_selector
-            .update(cx, |_, cx| cx.emit(DismissEvent))
-            .log_err();
-    }
-
-    fn selected_index(&self) -> usize {
-        self.selected_index
-    }
-
-    fn set_selected_index(
-        &mut self,
-        ix: usize,
-        _window: &mut Window,
-        _: &mut Context<Picker<Self>>,
-    ) {
-        self.selected_index = ix;
-    }
-
-    fn update_matches(
-        &mut self,
-        query: String,
-        window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> gpui::Task<()> {
-        let background = cx.background_executor().clone();
-        let candidates = self.candidates.clone();
-        let worktree_root_path = self.worktree_abs_path_root.clone();
-        let path_style = self.project.read(cx).path_style(cx);
-        cx.spawn_in(window, async move |this, cx| {
-            let matches = if query.is_empty() {
-                candidates
-                    .into_iter()
-                    .enumerate()
-                    .map(|(index, (candidate, _))| {
-                        let path = Self::relativize_path(
-                            candidate.path.clone(),
-                            &worktree_root_path,
-                            path_style,
-                        );
-                        let string = format!("{}{}", candidate.name, path);
-                        StringMatch {
-                            candidate_id: index,
-                            string,
-                            positions: Vec::new(),
-                            score: 0.0,
-                        }
-                    })
-                    .collect()
-            } else {
-                let candidates = candidates
-                    .into_iter()
-                    .enumerate()
-                    .map(|(candidate_id, (toolchain, _))| {
-                        let path = Self::relativize_path(
-                            toolchain.path.clone(),
-                            &worktree_root_path,
-                            path_style,
-                        );
-                        let string = format!("{}{}", toolchain.name, path);
-                        StringMatchCandidate::new(candidate_id, &string)
-                    })
-                    .collect::<Vec<_>>();
-                match_strings(
-                    &candidates,
-                    &query,
-                    false,
-                    true,
-                    100,
-                    &Default::default(),
-                    background,
-                )
-                .await
-            };
-
-            this.update(cx, |this, cx| {
-                let delegate = &mut this.delegate;
-                delegate.matches = matches;
-                delegate.selected_index = delegate
-                    .selected_index
-                    .min(delegate.matches.len().saturating_sub(1));
-                cx.notify();
-            })
-            .log_err();
-        })
-    }
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        _: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<Self::ListItem> {
-        let mat = &self.matches.get(ix)?;
-        let (toolchain, scope) = &self.candidates.get(mat.candidate_id)?;
-
-        let label = toolchain.name.clone();
-        let path_style = self.project.read(cx).path_style(cx);
-        let path = Self::relativize_path(
-            toolchain.path.clone(),
-            &self.worktree_abs_path_root,
-            path_style,
-        );
-        let (name_highlights, mut path_highlights) = mat
-            .positions
-            .iter()
-            .cloned()
-            .partition::<Vec<_>, _>(|index| *index < label.len());
-        path_highlights.iter_mut().for_each(|index| {
-            *index -= label.len();
-        });
-        let id: SharedString = format!("toolchain-{ix}",).into();
-        Some(
-            ListItem::new(id)
-                .inset(true)
-                .spacing(ListItemSpacing::Sparse)
-                .toggle_state(selected)
-                .child(HighlightedLabel::new(label, name_highlights))
-                .child(
-                    HighlightedLabel::new(path, path_highlights)
-                        .size(LabelSize::Small)
-                        .color(Color::Muted),
-                )
-                .when_some(scope.as_ref(), |this, scope| {
-                    let id: SharedString = format!(
-                        "delete-custom-toolchain-{}-{}",
-                        toolchain.name, toolchain.path
-                    )
-                    .into();
-                    let toolchain = toolchain.clone();
-                    let scope = scope.clone();
-
-                    this.end_slot(IconButton::new(id, IconName::Trash).on_click(cx.listener(
-                        move |this, _, _, cx| {
-                            this.delegate.project.update(cx, |this, cx| {
-                                this.remove_toolchain(toolchain.clone(), scope.clone(), cx)
-                            });
-
-                            this.delegate.matches.retain_mut(|m| {
-                                if m.candidate_id == ix {
-                                    return false;
-                                } else if m.candidate_id > ix {
-                                    m.candidate_id -= 1;
-                                }
-                                true
-                            });
-
-                            this.delegate.candidates = this
-                                .delegate
-                                .candidates
-                                .iter()
-                                .enumerate()
-                                .filter_map(|(i, toolchain)| (ix != i).then_some(toolchain.clone()))
-                                .collect();
-
-                            if this.delegate.selected_index >= ix {
-                                this.delegate.selected_index =
-                                    this.delegate.selected_index.saturating_sub(1);
-                            }
-                            cx.stop_propagation();
-                            cx.notify();
-                        },
-                    )))
-                }),
-        )
-    }
-    fn render_footer(
-        &self,
-        _window: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<AnyElement> {
-        Some(
-            v_flex()
-                .rounded_b_md()
-                .child(Divider::horizontal())
-                .child(
-                    h_flex()
-                        .p_1p5()
-                        .gap_0p5()
-                        .justify_end()
-                        .child(
-                            Button::new("xd", self.add_toolchain_text.clone())
-                                .key_binding(KeyBinding::for_action_in(
-                                    &AddToolchain,
-                                    &self.focus_handle,
-                                    cx,
-                                ))
-                                .on_click(|_, window, cx| {
-                                    window.dispatch_action(Box::new(AddToolchain), cx)
-                                }),
-                        )
-                        .child(
-                            Button::new("select", "Select")
-                                .key_binding(KeyBinding::for_action_in(
-                                    &menu::Confirm,
-                                    &self.focus_handle,
-                                    cx,
-                                ))
-                                .on_click(|_, window, cx| {
-                                    window.dispatch_action(menu::Confirm.boxed_clone(), cx)
-                                }),
-                        ),
-                )
-                .into_any_element(),
-        )
-    }
-}
diff --git a/crates/ui/Cargo.toml b/crates/ui/Cargo.toml
deleted file mode 100644
index 5eb58bf1da..0000000000
--- a/crates/ui/Cargo.toml
+++ /dev/null
@@ -1,42 +0,0 @@
-[package]
-name = "ui"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-name = "ui"
-path = "src/ui.rs"
-
-[dependencies]
-chrono.workspace = true
-component.workspace = true
-documented.workspace = true
-gpui.workspace = true
-gpui_macros.workspace = true
-icons.workspace = true
-itertools.workspace = true
-menu.workspace = true
-schemars.workspace = true
-serde.workspace = true
-settings.workspace = true
-smallvec.workspace = true
-story = { workspace = true, optional = true }
-strum.workspace = true
-theme.workspace = true
-ui_macros.workspace = true
-util.workspace = true
-
-[target.'cfg(windows)'.dependencies]
-windows.workspace = true
-
-[dev-dependencies]
-gpui = { workspace = true, features = ["test-support"] }
-
-[features]
-default = []
-stories = ["dep:story"]
diff --git a/crates/ui/LICENSE-GPL b/crates/ui/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/ui/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/ui/src/component_prelude.rs b/crates/ui/src/component_prelude.rs
deleted file mode 100644
index 0a01372970..0000000000
--- a/crates/ui/src/component_prelude.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-pub use component::{
-    Component, ComponentId, ComponentScope, ComponentStatus, example_group,
-    example_group_with_title, single_example,
-};
-pub use documented::Documented;
-pub use ui_macros::RegisterComponent;
diff --git a/crates/ui/src/components.rs b/crates/ui/src/components.rs
deleted file mode 100644
index b6318f18c9..0000000000
--- a/crates/ui/src/components.rs
+++ /dev/null
@@ -1,89 +0,0 @@
-mod avatar;
-mod banner;
-mod button;
-mod callout;
-mod chip;
-mod content_group;
-mod context_menu;
-mod data_table;
-mod diff_stat;
-mod disclosure;
-mod divider;
-mod dropdown_menu;
-mod facepile;
-mod group;
-mod icon;
-mod image;
-mod indent_guides;
-mod indicator;
-mod keybinding;
-mod keybinding_hint;
-mod label;
-mod list;
-mod modal;
-mod navigable;
-mod notification;
-mod popover;
-mod popover_menu;
-mod progress;
-mod radio;
-mod right_click_menu;
-mod scrollbar;
-mod settings_container;
-mod settings_group;
-mod stack;
-mod sticky_items;
-mod tab;
-mod tab_bar;
-mod thread_item;
-mod toggle;
-mod tooltip;
-mod tree_view_item;
-
-#[cfg(feature = "stories")]
-mod stories;
-
-pub use avatar::*;
-pub use banner::*;
-pub use button::*;
-pub use callout::*;
-pub use chip::*;
-pub use content_group::*;
-pub use context_menu::*;
-pub use data_table::*;
-pub use diff_stat::*;
-pub use disclosure::*;
-pub use divider::*;
-pub use dropdown_menu::*;
-pub use facepile::*;
-pub use group::*;
-pub use icon::*;
-pub use image::*;
-pub use indent_guides::*;
-pub use indicator::*;
-pub use keybinding::*;
-pub use keybinding_hint::*;
-pub use label::*;
-pub use list::*;
-pub use modal::*;
-pub use navigable::*;
-pub use notification::*;
-pub use popover::*;
-pub use popover_menu::*;
-pub use progress::*;
-pub use radio::*;
-pub use right_click_menu::*;
-pub use scrollbar::*;
-pub use settings_container::*;
-pub use settings_group::*;
-pub use stack::*;
-pub use sticky_items::*;
-pub use tab::*;
-pub use tab_bar::*;
-pub use thread_item::*;
-pub use toggle::*;
-pub use tooltip::*;
-pub use tree_view_item::*;
-
-#[cfg(feature = "stories")]
-pub use stories::*;
diff --git a/crates/ui/src/components/avatar.rs b/crates/ui/src/components/avatar.rs
deleted file mode 100644
index 7b2ba8ce5c..0000000000
--- a/crates/ui/src/components/avatar.rs
+++ /dev/null
@@ -1,303 +0,0 @@
-use crate::prelude::*;
-
-use documented::Documented;
-use gpui::{AnyElement, Hsla, ImageSource, Img, IntoElement, Styled, img};
-
-/// An element that renders a user avatar with customizable appearance options.
-///
-/// # Examples
-///
-/// ```
-/// use ui::Avatar;
-///
-/// Avatar::new("path/to/image.png")
-///     .grayscale(true)
-///     .border_color(gpui::red());
-/// ```
-#[derive(IntoElement, Documented, RegisterComponent)]
-pub struct Avatar {
-    image: Img,
-    size: Option<AbsoluteLength>,
-    border_color: Option<Hsla>,
-    indicator: Option<AnyElement>,
-}
-
-impl Avatar {
-    /// Creates a new avatar element with the specified image source.
-    pub fn new(src: impl Into<ImageSource>) -> Self {
-        Avatar {
-            image: img(src),
-            size: None,
-            border_color: None,
-            indicator: None,
-        }
-    }
-
-    /// Applies a grayscale filter to the avatar image.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use ui::Avatar;
-    ///
-    /// let avatar = Avatar::new("path/to/image.png").grayscale(true);
-    /// ```
-    pub fn grayscale(mut self, grayscale: bool) -> Self {
-        self.image = self.image.grayscale(grayscale);
-        self
-    }
-
-    /// Sets the border color of the avatar.
-    ///
-    /// This might be used to match the border to the background color of
-    /// the parent element to create the illusion of cropping another
-    /// shape underneath (for example in face piles.)
-    pub fn border_color(mut self, color: impl Into<Hsla>) -> Self {
-        self.border_color = Some(color.into());
-        self
-    }
-
-    /// Size overrides the avatar size. By default they are 1rem.
-    pub fn size<L: Into<AbsoluteLength>>(mut self, size: impl Into<Option<L>>) -> Self {
-        self.size = size.into().map(Into::into);
-        self
-    }
-
-    /// Sets the current indicator to be displayed on the avatar, if any.
-    pub fn indicator<E: IntoElement>(mut self, indicator: impl Into<Option<E>>) -> Self {
-        self.indicator = indicator.into().map(IntoElement::into_any_element);
-        self
-    }
-}
-
-impl RenderOnce for Avatar {
-    fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let border_width = if self.border_color.is_some() {
-            px(2.)
-        } else {
-            px(0.)
-        };
-
-        let image_size = self.size.unwrap_or_else(|| rems(1.).into());
-        let container_size = image_size.to_pixels(window.rem_size()) + border_width * 2.;
-
-        div()
-            .size(container_size)
-            .rounded_full()
-            .when_some(self.border_color, |this, color| {
-                this.border(border_width).border_color(color)
-            })
-            .child(
-                self.image
-                    .size(image_size)
-                    .rounded_full()
-                    .bg(cx.theme().colors().element_disabled)
-                    .with_fallback(|| {
-                        h_flex()
-                            .size_full()
-                            .justify_center()
-                            .child(
-                                Icon::new(IconName::Person)
-                                    .color(Color::Muted)
-                                    .size(IconSize::Small),
-                            )
-                            .into_any_element()
-                    }),
-            )
-            .children(self.indicator.map(|indicator| div().child(indicator)))
-    }
-}
-
-use gpui::AnyView;
-
-/// The audio status of an player, for use in representing
-/// their status visually on their avatar.
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
-pub enum AudioStatus {
-    /// The player's microphone is muted.
-    Muted,
-    /// The player's microphone is muted, and collaboration audio is disabled.
-    Deafened,
-}
-
-/// An indicator that shows the audio status of a player.
-#[derive(IntoElement)]
-pub struct AvatarAudioStatusIndicator {
-    audio_status: AudioStatus,
-    tooltip: Option<Box<dyn Fn(&mut Window, &mut App) -> AnyView>>,
-}
-
-impl AvatarAudioStatusIndicator {
-    /// Creates a new `AvatarAudioStatusIndicator`
-    pub fn new(audio_status: AudioStatus) -> Self {
-        Self {
-            audio_status,
-            tooltip: None,
-        }
-    }
-
-    /// Sets the tooltip for the indicator.
-    pub fn tooltip(mut self, tooltip: impl Fn(&mut Window, &mut App) -> AnyView + 'static) -> Self {
-        self.tooltip = Some(Box::new(tooltip));
-        self
-    }
-}
-
-impl RenderOnce for AvatarAudioStatusIndicator {
-    fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let icon_size = IconSize::Indicator;
-
-        let width_in_px = icon_size.rems() * window.rem_size();
-        let padding_x = px(4.);
-
-        div()
-            .absolute()
-            .bottom(rems_from_px(-3.))
-            .right(rems_from_px(-6.))
-            .w(width_in_px + padding_x)
-            .h(icon_size.rems())
-            .child(
-                h_flex()
-                    .id("muted-indicator")
-                    .justify_center()
-                    .px(padding_x)
-                    .py(px(2.))
-                    .bg(cx.theme().status().error_background)
-                    .rounded_sm()
-                    .child(
-                        Icon::new(match self.audio_status {
-                            AudioStatus::Muted => IconName::MicMute,
-                            AudioStatus::Deafened => IconName::AudioOff,
-                        })
-                        .size(icon_size)
-                        .color(Color::Error),
-                    )
-                    .when_some(self.tooltip, |this, tooltip| {
-                        this.tooltip(move |window, cx| tooltip(window, cx))
-                    }),
-            )
-    }
-}
-
-/// Represents the availability status of a collaborator.
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
-pub enum CollaboratorAvailability {
-    Free,
-    Busy,
-}
-
-/// Represents the availability and presence status of a collaborator.
-#[derive(IntoElement)]
-pub struct AvatarAvailabilityIndicator {
-    availability: CollaboratorAvailability,
-    avatar_size: Option<Pixels>,
-}
-
-impl AvatarAvailabilityIndicator {
-    /// Creates a new indicator
-    pub fn new(availability: CollaboratorAvailability) -> Self {
-        Self {
-            availability,
-            avatar_size: None,
-        }
-    }
-
-    /// Sets the size of the [`Avatar`](crate::Avatar) this indicator appears on.
-    pub fn avatar_size(mut self, size: impl Into<Option<Pixels>>) -> Self {
-        self.avatar_size = size.into();
-        self
-    }
-}
-
-impl RenderOnce for AvatarAvailabilityIndicator {
-    fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let avatar_size = self.avatar_size.unwrap_or_else(|| window.rem_size());
-
-        // HACK: non-integer sizes result in oval indicators.
-        let indicator_size = (avatar_size * 0.4).round();
-
-        div()
-            .absolute()
-            .bottom_0()
-            .right_0()
-            .size(indicator_size)
-            .rounded(indicator_size)
-            .bg(match self.availability {
-                CollaboratorAvailability::Free => cx.theme().status().created,
-                CollaboratorAvailability::Busy => cx.theme().status().deleted,
-            })
-    }
-}
-
-// View this component preview using `workspace: open component-preview`
-impl Component for Avatar {
-    fn scope() -> ComponentScope {
-        ComponentScope::Collaboration
-    }
-
-    fn description() -> Option<&'static str> {
-        Some(Avatar::DOCS)
-    }
-
-    fn preview(_window: &mut Window, cx: &mut App) -> Option<AnyElement> {
-        let example_avatar = "https://avatars.githubusercontent.com/u/1714999?v=4";
-
-        Some(
-            v_flex()
-                .gap_6()
-                .children(vec![
-                    example_group(vec![
-                        single_example("Default", Avatar::new(example_avatar).into_any_element()),
-                        single_example(
-                            "Grayscale",
-                            Avatar::new(example_avatar)
-                                .grayscale(true)
-                                .into_any_element(),
-                        ),
-                        single_example(
-                            "Border",
-                            Avatar::new(example_avatar)
-                                .border_color(cx.theme().colors().border)
-                                .into_any_element(),
-                        ).description("Can be used to create visual space by setting the border color to match the background, which creates the appearance of a gap around the avatar."),
-                    ]),
-                    example_group_with_title(
-                        "Indicator Styles",
-                        vec![
-                            single_example(
-                                "Muted",
-                                Avatar::new(example_avatar)
-                                    .indicator(AvatarAudioStatusIndicator::new(AudioStatus::Muted))
-                                    .into_any_element(),
-                            ).description("Indicates the collaborator's mic is muted."),
-                            single_example(
-                                "Deafened",
-                                Avatar::new(example_avatar)
-                                    .indicator(AvatarAudioStatusIndicator::new(
-                                        AudioStatus::Deafened,
-                                    ))
-                                    .into_any_element(),
-                            ).description("Indicates that both the collaborator's mic and audio are muted."),
-                            single_example(
-                                "Availability: Free",
-                                Avatar::new(example_avatar)
-                                    .indicator(AvatarAvailabilityIndicator::new(
-                                        CollaboratorAvailability::Free,
-                                    ))
-                                    .into_any_element(),
-                            ).description("Indicates that the person is free, usually meaning they are not in a call."),
-                            single_example(
-                                "Availability: Busy",
-                                Avatar::new(example_avatar)
-                                    .indicator(AvatarAvailabilityIndicator::new(
-                                        CollaboratorAvailability::Busy,
-                                    ))
-                                    .into_any_element(),
-                            ).description("Indicates that the person is busy, usually meaning they are in a channel or direct call."),
-                        ],
-                    ),
-                ])
-                .into_any_element(),
-        )
-    }
-}
diff --git a/crates/ui/src/components/banner.rs b/crates/ui/src/components/banner.rs
deleted file mode 100644
index a09170f5b2..0000000000
--- a/crates/ui/src/components/banner.rs
+++ /dev/null
@@ -1,182 +0,0 @@
-use crate::prelude::*;
-use gpui::{AnyElement, IntoElement, ParentElement, Styled};
-
-/// Banners provide informative and brief messages without interrupting the user.
-/// This component offers four severity levels that can be used depending on the message.
-///
-/// # Usage Example
-///
-/// ```
-/// use ui::prelude::*;
-/// use ui::{Banner, Button, IconName, IconPosition, IconSize, Label, Severity};
-///
-/// Banner::new()
-///     .severity(Severity::Success)
-///     .children([Label::new("This is a success message")])
-///     .action_slot(
-///         Button::new("learn-more", "Learn More")
-///             .icon(IconName::ArrowUpRight)
-///             .icon_size(IconSize::Small)
-///             .icon_position(IconPosition::End)
-///     );
-/// ```
-#[derive(IntoElement, RegisterComponent)]
-pub struct Banner {
-    severity: Severity,
-    children: Vec<AnyElement>,
-    action_slot: Option<AnyElement>,
-}
-
-impl Banner {
-    /// Creates a new `Banner` component with default styling.
-    pub fn new() -> Self {
-        Self {
-            severity: Severity::Info,
-            children: Vec::new(),
-            action_slot: None,
-        }
-    }
-
-    /// Sets the severity of the banner.
-    pub fn severity(mut self, severity: Severity) -> Self {
-        self.severity = severity;
-        self
-    }
-
-    /// A slot for actions, such as CTA or dismissal buttons.
-    pub fn action_slot(mut self, element: impl IntoElement) -> Self {
-        self.action_slot = Some(element.into_any_element());
-        self
-    }
-}
-
-impl ParentElement for Banner {
-    fn extend(&mut self, elements: impl IntoIterator<Item = AnyElement>) {
-        self.children.extend(elements)
-    }
-}
-
-impl RenderOnce for Banner {
-    fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let banner = h_flex()
-            .py_0p5()
-            .gap_1p5()
-            .flex_wrap()
-            .justify_between()
-            .rounded_sm()
-            .border_1();
-
-        let (icon, icon_color, bg_color, border_color) = match self.severity {
-            Severity::Info => (
-                IconName::Info,
-                Color::Muted,
-                cx.theme().status().info_background.opacity(0.5),
-                cx.theme().colors().border.opacity(0.5),
-            ),
-            Severity::Success => (
-                IconName::Check,
-                Color::Success,
-                cx.theme().status().success.opacity(0.1),
-                cx.theme().status().success.opacity(0.2),
-            ),
-            Severity::Warning => (
-                IconName::Warning,
-                Color::Warning,
-                cx.theme().status().warning_background.opacity(0.5),
-                cx.theme().status().warning_border.opacity(0.4),
-            ),
-            Severity::Error => (
-                IconName::XCircle,
-                Color::Error,
-                cx.theme().status().error.opacity(0.1),
-                cx.theme().status().error.opacity(0.2),
-            ),
-        };
-
-        let mut banner = banner.bg(bg_color).border_color(border_color);
-
-        let icon_and_child = h_flex()
-            .items_start()
-            .min_w_0()
-            .gap_1p5()
-            .child(
-                h_flex()
-                    .h(window.line_height())
-                    .flex_shrink_0()
-                    .child(Icon::new(icon).size(IconSize::XSmall).color(icon_color)),
-            )
-            .child(div().min_w_0().children(self.children));
-
-        if let Some(action_slot) = self.action_slot {
-            banner = banner
-                .pl_2()
-                .pr_1()
-                .child(icon_and_child)
-                .child(action_slot);
-        } else {
-            banner = banner.px_2().child(icon_and_child);
-        }
-
-        banner
-    }
-}
-
-impl Component for Banner {
-    fn scope() -> ComponentScope {
-        ComponentScope::DataDisplay
-    }
-
-    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
-        let severity_examples = vec![
-            single_example(
-                "Default",
-                Banner::new()
-                    .child(Label::new("This is a default banner with no customization"))
-                    .into_any_element(),
-            ),
-            single_example(
-                "Info",
-                Banner::new()
-                    .severity(Severity::Info)
-                    .child(Label::new("This is an informational message"))
-                    .action_slot(
-                        Button::new("learn-more", "Learn More")
-                            .icon(IconName::ArrowUpRight)
-                            .icon_size(IconSize::Small)
-                            .icon_position(IconPosition::End),
-                    )
-                    .into_any_element(),
-            ),
-            single_example(
-                "Success",
-                Banner::new()
-                    .severity(Severity::Success)
-                    .child(Label::new("Operation completed successfully"))
-                    .action_slot(Button::new("dismiss", "Dismiss"))
-                    .into_any_element(),
-            ),
-            single_example(
-                "Warning",
-                Banner::new()
-                    .severity(Severity::Warning)
-                    .child(Label::new("Your settings file uses deprecated settings"))
-                    .action_slot(Button::new("update", "Update Settings"))
-                    .into_any_element(),
-            ),
-            single_example(
-                "Error",
-                Banner::new()
-                    .severity(Severity::Error)
-                    .child(Label::new("Connection error: unable to connect to server"))
-                    .action_slot(Button::new("reconnect", "Retry"))
-                    .into_any_element(),
-            ),
-        ];
-
-        Some(
-            example_group(severity_examples)
-                .vertical()
-                .into_any_element(),
-        )
-    }
-}
diff --git a/crates/ui/src/components/button.rs b/crates/ui/src/components/button.rs
deleted file mode 100644
index 23e7702f62..0000000000
--- a/crates/ui/src/components/button.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-mod button;
-mod button_icon;
-mod button_like;
-mod icon_button;
-mod split_button;
-mod toggle_button;
-
-pub use button::*;
-pub use button_like::*;
-pub use icon_button::*;
-pub use split_button::*;
-pub use toggle_button::*;
diff --git a/crates/ui/src/components/button/button.rs b/crates/ui/src/components/button/button.rs
deleted file mode 100644
index 83b50b6341..0000000000
--- a/crates/ui/src/components/button/button.rs
+++ /dev/null
@@ -1,612 +0,0 @@
-use crate::component_prelude::*;
-use gpui::{AnyElement, AnyView, DefiniteLength};
-use ui_macros::RegisterComponent;
-
-use crate::{ButtonCommon, ButtonLike, ButtonSize, ButtonStyle, IconName, IconSize, Label};
-use crate::{
-    Color, DynamicSpacing, ElevationIndex, IconPosition, KeyBinding, KeybindingPosition, TintColor,
-    prelude::*,
-};
-
-use super::button_icon::ButtonIcon;
-
-/// An element that creates a button with a label and an optional icon.
-///
-/// Common buttons:
-/// - Label, Icon + Label: [`Button`] (this component)
-/// - Icon only: [`IconButton`]
-/// - Custom: [`ButtonLike`]
-///
-/// To create a more complex button than what the [`Button`] or [`IconButton`] components provide, use
-/// [`ButtonLike`] directly.
-///
-/// # Examples
-///
-/// **A button with a label**, is typically used in scenarios such as a form, where the button's label
-/// indicates what action will be performed when the button is clicked.
-///
-/// ```
-/// use ui::prelude::*;
-///
-/// Button::new("button_id", "Click me!")
-///     .on_click(|event, window, cx| {
-///         // Handle click event
-///     });
-/// ```
-///
-/// **A toggleable button**, is typically used in scenarios such as a toolbar,
-/// where the button's state indicates whether a feature is enabled or not, or
-/// a trigger for a popover menu, where clicking the button toggles the visibility of the menu.
-///
-/// ```
-/// use ui::prelude::*;
-///
-/// Button::new("button_id", "Click me!")
-///     .icon(IconName::Check)
-///     .toggle_state(true)
-///     .on_click(|event, window, cx| {
-///         // Handle click event
-///     });
-/// ```
-///
-/// To change the style of the button when it is selected use the [`selected_style`][Button::selected_style] method.
-///
-/// ```
-/// use ui::prelude::*;
-/// use ui::TintColor;
-///
-/// Button::new("button_id", "Click me!")
-///     .toggle_state(true)
-///     .selected_style(ButtonStyle::Tinted(TintColor::Accent))
-///     .on_click(|event, window, cx| {
-///         // Handle click event
-///     });
-/// ```
-/// This will create a button with a blue tinted background when selected.
-///
-/// **A full-width button**, is typically used in scenarios such as the bottom of a modal or form, where it occupies the entire width of its container.
-/// The button's content, including text and icons, is centered by default.
-///
-/// ```
-/// use ui::prelude::*;
-///
-/// let button = Button::new("button_id", "Click me!")
-///     .full_width()
-///     .on_click(|event, window, cx| {
-///         // Handle click event
-///     });
-/// ```
-///
-#[derive(IntoElement, Documented, RegisterComponent)]
-pub struct Button {
-    base: ButtonLike,
-    label: SharedString,
-    label_color: Option<Color>,
-    label_size: Option<LabelSize>,
-    selected_label: Option<SharedString>,
-    selected_label_color: Option<Color>,
-    icon: Option<IconName>,
-    icon_position: Option<IconPosition>,
-    icon_size: Option<IconSize>,
-    icon_color: Option<Color>,
-    selected_icon: Option<IconName>,
-    selected_icon_color: Option<Color>,
-    key_binding: Option<KeyBinding>,
-    key_binding_position: KeybindingPosition,
-    alpha: Option<f32>,
-    truncate: bool,
-}
-
-impl Button {
-    /// Creates a new [`Button`] with a specified identifier and label.
-    ///
-    /// This is the primary constructor for a [`Button`] component. It initializes
-    /// the button with the provided identifier and label text, setting all other
-    /// properties to their default values, which can be customized using the
-    /// builder pattern methods provided by this struct.
-    pub fn new(id: impl Into<ElementId>, label: impl Into<SharedString>) -> Self {
-        Self {
-            base: ButtonLike::new(id),
-            label: label.into(),
-            label_color: None,
-            label_size: None,
-            selected_label: None,
-            selected_label_color: None,
-            icon: None,
-            icon_position: None,
-            icon_size: None,
-            icon_color: None,
-            selected_icon: None,
-            selected_icon_color: None,
-            key_binding: None,
-            key_binding_position: KeybindingPosition::default(),
-            alpha: None,
-            truncate: false,
-        }
-    }
-
-    /// Sets the color of the button's label.
-    pub fn color(mut self, label_color: impl Into<Option<Color>>) -> Self {
-        self.label_color = label_color.into();
-        self
-    }
-
-    /// Defines the size of the button's label.
-    pub fn label_size(mut self, label_size: impl Into<Option<LabelSize>>) -> Self {
-        self.label_size = label_size.into();
-        self
-    }
-
-    /// Sets the label used when the button is in a selected state.
-    pub fn selected_label<L: Into<SharedString>>(mut self, label: impl Into<Option<L>>) -> Self {
-        self.selected_label = label.into().map(Into::into);
-        self
-    }
-
-    /// Sets the label color used when the button is in a selected state.
-    pub fn selected_label_color(mut self, color: impl Into<Option<Color>>) -> Self {
-        self.selected_label_color = color.into();
-        self
-    }
-
-    /// Assigns an icon to the button.
-    pub fn icon(mut self, icon: impl Into<Option<IconName>>) -> Self {
-        self.icon = icon.into();
-        self
-    }
-
-    /// Sets the position of the icon relative to the label.
-    pub fn icon_position(mut self, icon_position: impl Into<Option<IconPosition>>) -> Self {
-        self.icon_position = icon_position.into();
-        self
-    }
-
-    /// Specifies the size of the button's icon.
-    pub fn icon_size(mut self, icon_size: impl Into<Option<IconSize>>) -> Self {
-        self.icon_size = icon_size.into();
-        self
-    }
-
-    /// Sets the color of the button's icon.
-    pub fn icon_color(mut self, icon_color: impl Into<Option<Color>>) -> Self {
-        self.icon_color = icon_color.into();
-        self
-    }
-
-    /// Chooses an icon to display when the button is in a selected state.
-    pub fn selected_icon(mut self, icon: impl Into<Option<IconName>>) -> Self {
-        self.selected_icon = icon.into();
-        self
-    }
-
-    /// Sets the icon color used when the button is in a selected state.
-    pub fn selected_icon_color(mut self, color: impl Into<Option<Color>>) -> Self {
-        self.selected_icon_color = color.into();
-        self
-    }
-
-    /// Display the keybinding that triggers the button action.
-    pub fn key_binding(mut self, key_binding: impl Into<Option<KeyBinding>>) -> Self {
-        self.key_binding = key_binding.into();
-        self
-    }
-
-    /// Sets the position of the keybinding relative to the button label.
-    ///
-    /// This method allows you to specify where the keybinding should be displayed
-    /// in relation to the button's label.
-    pub fn key_binding_position(mut self, position: KeybindingPosition) -> Self {
-        self.key_binding_position = position;
-        self
-    }
-
-    /// Sets the alpha property of the color of label.
-    pub fn alpha(mut self, alpha: f32) -> Self {
-        self.alpha = Some(alpha);
-        self
-    }
-
-    /// Truncates overflowing labels with an ellipsis (`…`) if needed.
-    ///
-    /// Buttons with static labels should _never_ be truncated, ensure
-    /// this is only used when the label is dynamic and may overflow.
-    pub fn truncate(mut self, truncate: bool) -> Self {
-        self.truncate = truncate;
-        self
-    }
-}
-
-impl Toggleable for Button {
-    /// Sets the selected state of the button.
-    ///
-    /// This method allows the selection state of the button to be specified.
-    /// It modifies the button's appearance to reflect its selected state.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use ui::prelude::*;
-    ///
-    /// Button::new("button_id", "Click me!")
-    ///     .toggle_state(true)
-    ///     .on_click(|event, window, cx| {
-    ///         // Handle click event
-    ///     });
-    /// ```
-    ///
-    /// Use [`selected_style`](Button::selected_style) to change the style of the button when it is selected.
-    fn toggle_state(mut self, selected: bool) -> Self {
-        self.base = self.base.toggle_state(selected);
-        self
-    }
-}
-
-impl SelectableButton for Button {
-    /// Sets the style for the button when selected.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use ui::prelude::*;
-    /// use ui::TintColor;
-    ///
-    /// Button::new("button_id", "Click me!")
-    ///     .toggle_state(true)
-    ///     .selected_style(ButtonStyle::Tinted(TintColor::Accent))
-    ///     .on_click(|event, window, cx| {
-    ///         // Handle click event
-    ///     });
-    /// ```
-    /// This results in a button with a blue tinted background when selected.
-    fn selected_style(mut self, style: ButtonStyle) -> Self {
-        self.base = self.base.selected_style(style);
-        self
-    }
-}
-
-impl Disableable for Button {
-    /// Disables the button.
-    ///
-    /// This method allows the button to be disabled. When a button is disabled,
-    /// it doesn't react to user interactions and its appearance is updated to reflect this.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use ui::prelude::*;
-    ///
-    /// Button::new("button_id", "Click me!")
-    ///     .disabled(true)
-    ///     .on_click(|event, window, cx| {
-    ///         // Handle click event
-    ///     });
-    /// ```
-    ///
-    /// This results in a button that is disabled and does not respond to click events.
-    fn disabled(mut self, disabled: bool) -> Self {
-        self.base = self.base.disabled(disabled);
-        self.key_binding = self
-            .key_binding
-            .take()
-            .map(|binding| binding.disabled(disabled));
-        self
-    }
-}
-
-impl Clickable for Button {
-    /// Sets the click event handler for the button.
-    fn on_click(
-        mut self,
-        handler: impl Fn(&gpui::ClickEvent, &mut Window, &mut App) + 'static,
-    ) -> Self {
-        self.base = self.base.on_click(handler);
-        self
-    }
-
-    fn cursor_style(mut self, cursor_style: gpui::CursorStyle) -> Self {
-        self.base = self.base.cursor_style(cursor_style);
-        self
-    }
-}
-
-impl FixedWidth for Button {
-    /// Sets a fixed width for the button.
-    ///
-    /// This function allows a button to have a fixed width instead of automatically growing or shrinking.
-    /// Sets a fixed width for the button.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use ui::prelude::*;
-    ///
-    /// Button::new("button_id", "Click me!")
-    ///     .width(px(100.))
-    ///     .on_click(|event, window, cx| {
-    ///         // Handle click event
-    ///     });
-    /// ```
-    ///
-    /// This sets the button's width to be exactly 100 pixels.
-    fn width(mut self, width: impl Into<DefiniteLength>) -> Self {
-        self.base = self.base.width(width);
-        self
-    }
-
-    /// Sets the button to occupy the full width of its container.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use ui::prelude::*;
-    ///
-    /// Button::new("button_id", "Click me!")
-    ///     .full_width()
-    ///     .on_click(|event, window, cx| {
-    ///         // Handle click event
-    ///     });
-    /// ```
-    ///
-    /// This stretches the button to the full width of its container.
-    fn full_width(mut self) -> Self {
-        self.base = self.base.full_width();
-        self
-    }
-}
-
-impl ButtonCommon for Button {
-    /// Sets the button's id.
-    fn id(&self) -> &ElementId {
-        self.base.id()
-    }
-
-    /// Sets the visual style of the button using a [`ButtonStyle`].
-    fn style(mut self, style: ButtonStyle) -> Self {
-        self.base = self.base.style(style);
-        self
-    }
-
-    /// Sets the button's size using a [`ButtonSize`].
-    fn size(mut self, size: ButtonSize) -> Self {
-        self.base = self.base.size(size);
-        self
-    }
-
-    /// Sets a tooltip for the button.
-    ///
-    /// This method allows a tooltip to be set for the button. The tooltip is a function that
-    /// takes a mutable references to [`Window`] and [`App`], and returns an [`AnyView`]. The
-    /// tooltip is displayed when the user hovers over the button.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use ui::prelude::*;
-    /// use ui::Tooltip;
-    ///
-    /// Button::new("button_id", "Click me!")
-    ///     .tooltip(Tooltip::text("This is a tooltip"))
-    ///     .on_click(|event, window, cx| {
-    ///         // Handle click event
-    ///     });
-    /// ```
-    ///
-    /// This will create a button with a tooltip that displays "This is a tooltip" when hovered over.
-    fn tooltip(mut self, tooltip: impl Fn(&mut Window, &mut App) -> AnyView + 'static) -> Self {
-        self.base = self.base.tooltip(tooltip);
-        self
-    }
-
-    fn tab_index(mut self, tab_index: impl Into<isize>) -> Self {
-        self.base = self.base.tab_index(tab_index);
-        self
-    }
-
-    fn layer(mut self, elevation: ElevationIndex) -> Self {
-        self.base = self.base.layer(elevation);
-        self
-    }
-
-    fn track_focus(mut self, focus_handle: &gpui::FocusHandle) -> Self {
-        self.base = self.base.track_focus(focus_handle);
-        self
-    }
-}
-
-impl RenderOnce for Button {
-    #[allow(refining_impl_trait)]
-    fn render(self, _window: &mut Window, cx: &mut App) -> ButtonLike {
-        let is_disabled = self.base.disabled;
-        let is_selected = self.base.selected;
-
-        let label = self
-            .selected_label
-            .filter(|_| is_selected)
-            .unwrap_or(self.label);
-
-        let label_color = if is_disabled {
-            Color::Disabled
-        } else if is_selected {
-            self.selected_label_color.unwrap_or(Color::Selected)
-        } else {
-            self.label_color.unwrap_or_default()
-        };
-
-        self.base.child(
-            h_flex()
-                .gap(DynamicSpacing::Base04.rems(cx))
-                .when(self.icon_position == Some(IconPosition::Start), |this| {
-                    this.children(self.icon.map(|icon| {
-                        ButtonIcon::new(icon)
-                            .disabled(is_disabled)
-                            .toggle_state(is_selected)
-                            .selected_icon(self.selected_icon)
-                            .selected_icon_color(self.selected_icon_color)
-                            .size(self.icon_size)
-                            .color(self.icon_color)
-                    }))
-                })
-                .child(
-                    h_flex()
-                        .when(
-                            self.key_binding_position == KeybindingPosition::Start,
-                            |this| this.flex_row_reverse(),
-                        )
-                        .gap(DynamicSpacing::Base06.rems(cx))
-                        .justify_between()
-                        .child(
-                            Label::new(label)
-                                .color(label_color)
-                                .size(self.label_size.unwrap_or_default())
-                                .when_some(self.alpha, |this, alpha| this.alpha(alpha))
-                                .when(self.truncate, |this| this.truncate()),
-                        )
-                        .children(self.key_binding),
-                )
-                .when(self.icon_position != Some(IconPosition::Start), |this| {
-                    this.children(self.icon.map(|icon| {
-                        ButtonIcon::new(icon)
-                            .disabled(is_disabled)
-                            .toggle_state(is_selected)
-                            .selected_icon(self.selected_icon)
-                            .selected_icon_color(self.selected_icon_color)
-                            .size(self.icon_size)
-                            .color(self.icon_color)
-                    }))
-                }),
-        )
-    }
-}
-
-impl Component for Button {
-    fn scope() -> ComponentScope {
-        ComponentScope::Input
-    }
-
-    fn sort_name() -> &'static str {
-        "ButtonA"
-    }
-
-    fn description() -> Option<&'static str> {
-        Some("A button triggers an event or action.")
-    }
-
-    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
-        Some(
-            v_flex()
-                .gap_6()
-                .children(vec![
-                    example_group_with_title(
-                        "Button Styles",
-                        vec![
-                            single_example(
-                                "Default",
-                                Button::new("default", "Default").into_any_element(),
-                            ),
-                            single_example(
-                                "Filled",
-                                Button::new("filled", "Filled")
-                                    .style(ButtonStyle::Filled)
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Subtle",
-                                Button::new("outline", "Subtle")
-                                    .style(ButtonStyle::Subtle)
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Tinted",
-                                Button::new("tinted_accent_style", "Accent")
-                                    .style(ButtonStyle::Tinted(TintColor::Accent))
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Transparent",
-                                Button::new("transparent", "Transparent")
-                                    .style(ButtonStyle::Transparent)
-                                    .into_any_element(),
-                            ),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "Tint Styles",
-                        vec![
-                            single_example(
-                                "Accent",
-                                Button::new("tinted_accent", "Accent")
-                                    .style(ButtonStyle::Tinted(TintColor::Accent))
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Error",
-                                Button::new("tinted_negative", "Error")
-                                    .style(ButtonStyle::Tinted(TintColor::Error))
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Warning",
-                                Button::new("tinted_warning", "Warning")
-                                    .style(ButtonStyle::Tinted(TintColor::Warning))
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Success",
-                                Button::new("tinted_positive", "Success")
-                                    .style(ButtonStyle::Tinted(TintColor::Success))
-                                    .into_any_element(),
-                            ),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "Special States",
-                        vec![
-                            single_example(
-                                "Default",
-                                Button::new("default_state", "Default").into_any_element(),
-                            ),
-                            single_example(
-                                "Disabled",
-                                Button::new("disabled", "Disabled")
-                                    .disabled(true)
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Selected",
-                                Button::new("selected", "Selected")
-                                    .toggle_state(true)
-                                    .into_any_element(),
-                            ),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "Buttons with Icons",
-                        vec![
-                            single_example(
-                                "Icon Start",
-                                Button::new("icon_start", "Icon Start")
-                                    .icon(IconName::Check)
-                                    .icon_position(IconPosition::Start)
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Icon End",
-                                Button::new("icon_end", "Icon End")
-                                    .icon(IconName::Check)
-                                    .icon_position(IconPosition::End)
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Icon Color",
-                                Button::new("icon_color", "Icon Color")
-                                    .icon(IconName::Check)
-                                    .icon_color(Color::Accent)
-                                    .into_any_element(),
-                            ),
-                        ],
-                    ),
-                ])
-                .into_any_element(),
-        )
-    }
-}
diff --git a/crates/ui/src/components/button/button_icon.rs b/crates/ui/src/components/button/button_icon.rs
deleted file mode 100644
index 510c418714..0000000000
--- a/crates/ui/src/components/button/button_icon.rs
+++ /dev/null
@@ -1,199 +0,0 @@
-use crate::{Icon, IconName, IconSize, IconWithIndicator, Indicator, prelude::*};
-use gpui::Hsla;
-
-/// An icon that appears within a button.
-///
-/// Can be used as either an icon alongside a label, like in [`Button`](crate::Button),
-/// or as a standalone icon, like in [`IconButton`](crate::IconButton).
-#[derive(IntoElement, RegisterComponent)]
-pub(super) struct ButtonIcon {
-    icon: IconName,
-    size: IconSize,
-    color: Color,
-    disabled: bool,
-    selected: bool,
-    selected_icon: Option<IconName>,
-    selected_icon_color: Option<Color>,
-    selected_style: Option<ButtonStyle>,
-    indicator: Option<Indicator>,
-    indicator_border_color: Option<Hsla>,
-}
-
-impl ButtonIcon {
-    pub fn new(icon: IconName) -> Self {
-        Self {
-            icon,
-            size: IconSize::default(),
-            color: Color::default(),
-            disabled: false,
-            selected: false,
-            selected_icon: None,
-            selected_icon_color: None,
-            selected_style: None,
-            indicator: None,
-            indicator_border_color: None,
-        }
-    }
-
-    pub fn size(mut self, size: impl Into<Option<IconSize>>) -> Self {
-        if let Some(size) = size.into() {
-            self.size = size;
-        }
-        self
-    }
-
-    pub fn color(mut self, color: impl Into<Option<Color>>) -> Self {
-        if let Some(color) = color.into() {
-            self.color = color;
-        }
-        self
-    }
-
-    pub fn selected_icon(mut self, icon: impl Into<Option<IconName>>) -> Self {
-        self.selected_icon = icon.into();
-        self
-    }
-
-    pub fn selected_icon_color(mut self, color: impl Into<Option<Color>>) -> Self {
-        self.selected_icon_color = color.into();
-        self
-    }
-
-    pub fn indicator(mut self, indicator: Indicator) -> Self {
-        self.indicator = Some(indicator);
-        self
-    }
-
-    pub fn indicator_border_color(mut self, color: Option<Hsla>) -> Self {
-        self.indicator_border_color = color;
-        self
-    }
-}
-
-impl Disableable for ButtonIcon {
-    fn disabled(mut self, disabled: bool) -> Self {
-        self.disabled = disabled;
-        self
-    }
-}
-
-impl Toggleable for ButtonIcon {
-    fn toggle_state(mut self, selected: bool) -> Self {
-        self.selected = selected;
-        self
-    }
-}
-
-impl SelectableButton for ButtonIcon {
-    fn selected_style(mut self, style: ButtonStyle) -> Self {
-        self.selected_style = Some(style);
-        self
-    }
-}
-
-impl RenderOnce for ButtonIcon {
-    fn render(self, _window: &mut Window, _cx: &mut App) -> impl IntoElement {
-        let icon = self
-            .selected_icon
-            .filter(|_| self.selected)
-            .unwrap_or(self.icon);
-
-        let icon_color = if self.disabled {
-            Color::Disabled
-        } else if self.selected_style.is_some() && self.selected {
-            self.selected_style.unwrap().into()
-        } else if self.selected {
-            self.selected_icon_color.unwrap_or(Color::Selected)
-        } else {
-            self.color
-        };
-
-        let icon = Icon::new(icon).size(self.size).color(icon_color);
-
-        match self.indicator {
-            Some(indicator) => IconWithIndicator::new(icon, Some(indicator))
-                .indicator_border_color(self.indicator_border_color)
-                .into_any_element(),
-            None => icon.into_any_element(),
-        }
-    }
-}
-
-impl Component for ButtonIcon {
-    fn scope() -> ComponentScope {
-        ComponentScope::Input
-    }
-
-    fn name() -> &'static str {
-        "ButtonIcon"
-    }
-
-    fn description() -> Option<&'static str> {
-        Some("An icon component specifically designed for use within buttons.")
-    }
-
-    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
-        Some(
-            v_flex()
-                .gap_6()
-                .children(vec![
-                    example_group_with_title(
-                        "Basic Usage",
-                        vec![
-                            single_example(
-                                "Default",
-                                ButtonIcon::new(IconName::Star).into_any_element(),
-                            ),
-                            single_example(
-                                "Custom Size",
-                                ButtonIcon::new(IconName::Star)
-                                    .size(IconSize::Medium)
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Custom Color",
-                                ButtonIcon::new(IconName::Star)
-                                    .color(Color::Accent)
-                                    .into_any_element(),
-                            ),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "States",
-                        vec![
-                            single_example(
-                                "Selected",
-                                ButtonIcon::new(IconName::Star)
-                                    .toggle_state(true)
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Disabled",
-                                ButtonIcon::new(IconName::Star)
-                                    .disabled(true)
-                                    .into_any_element(),
-                            ),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "With Indicator",
-                        vec![
-                            single_example(
-                                "Default Indicator",
-                                ButtonIcon::new(IconName::Star)
-                                    .indicator(Indicator::dot())
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Custom Indicator",
-                                ButtonIcon::new(IconName::Star)
-                                    .indicator(Indicator::dot().color(Color::Error))
-                                    .into_any_element(),
-                            ),
-                        ],
-                    ),
-                ])
-                .into_any_element(),
-        )
-    }
-}
diff --git a/crates/ui/src/components/button/button_like.rs b/crates/ui/src/components/button/button_like.rs
deleted file mode 100644
index 4ce7aeed0d..0000000000
--- a/crates/ui/src/components/button/button_like.rs
+++ /dev/null
@@ -1,849 +0,0 @@
-use documented::Documented;
-use gpui::{
-    AnyElement, AnyView, ClickEvent, CursorStyle, DefiniteLength, FocusHandle, Hsla, MouseButton,
-    MouseClickEvent, MouseDownEvent, MouseUpEvent, Rems, StyleRefinement, relative,
-    transparent_black,
-};
-use smallvec::SmallVec;
-
-use crate::{DynamicSpacing, ElevationIndex, prelude::*};
-
-/// A trait for buttons that can be Selected. Enables setting the [`ButtonStyle`] of a button when it is selected.
-pub trait SelectableButton: Toggleable {
-    fn selected_style(self, style: ButtonStyle) -> Self;
-}
-
-/// A common set of traits all buttons must implement.
-pub trait ButtonCommon: Clickable + Disableable {
-    /// A unique element ID to identify the button.
-    fn id(&self) -> &ElementId;
-
-    /// The visual style of the button.
-    ///
-    /// Most commonly will be [`ButtonStyle::Subtle`], or [`ButtonStyle::Filled`]
-    /// for an emphasized button.
-    fn style(self, style: ButtonStyle) -> Self;
-
-    /// The size of the button.
-    ///
-    /// Most buttons will use the default size.
-    ///
-    /// [`ButtonSize`] can also be used to help build non-button elements
-    /// that are consistently sized with buttons.
-    fn size(self, size: ButtonSize) -> Self;
-
-    /// The tooltip that shows when a user hovers over the button.
-    ///
-    /// Nearly all interactable elements should have a tooltip. Some example
-    /// exceptions might a scroll bar, or a slider.
-    fn tooltip(self, tooltip: impl Fn(&mut Window, &mut App) -> AnyView + 'static) -> Self;
-
-    fn tab_index(self, tab_index: impl Into<isize>) -> Self;
-
-    fn layer(self, elevation: ElevationIndex) -> Self;
-
-    fn track_focus(self, focus_handle: &FocusHandle) -> Self;
-}
-
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy, Default)]
-pub enum IconPosition {
-    #[default]
-    Start,
-    End,
-}
-
-#[derive(Default, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
-pub enum KeybindingPosition {
-    Start,
-    #[default]
-    End,
-}
-
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy, Default)]
-pub enum TintColor {
-    #[default]
-    Accent,
-    Error,
-    Warning,
-    Success,
-}
-
-impl TintColor {
-    fn button_like_style(self, cx: &mut App) -> ButtonLikeStyles {
-        match self {
-            TintColor::Accent => ButtonLikeStyles {
-                background: cx.theme().status().info_background,
-                border_color: cx.theme().status().info_border,
-                label_color: cx.theme().colors().text,
-                icon_color: cx.theme().colors().text,
-            },
-            TintColor::Error => ButtonLikeStyles {
-                background: cx.theme().status().error_background,
-                border_color: cx.theme().status().error_border,
-                label_color: cx.theme().colors().text,
-                icon_color: cx.theme().colors().text,
-            },
-            TintColor::Warning => ButtonLikeStyles {
-                background: cx.theme().status().warning_background,
-                border_color: cx.theme().status().warning_border,
-                label_color: cx.theme().colors().text,
-                icon_color: cx.theme().colors().text,
-            },
-            TintColor::Success => ButtonLikeStyles {
-                background: cx.theme().status().success_background,
-                border_color: cx.theme().status().success_border,
-                label_color: cx.theme().colors().text,
-                icon_color: cx.theme().colors().text,
-            },
-        }
-    }
-}
-
-impl From<TintColor> for Color {
-    fn from(tint: TintColor) -> Self {
-        match tint {
-            TintColor::Accent => Color::Accent,
-            TintColor::Error => Color::Error,
-            TintColor::Warning => Color::Warning,
-            TintColor::Success => Color::Success,
-        }
-    }
-}
-
-// Used to go from ButtonStyle -> Color through tint colors.
-impl From<ButtonStyle> for Color {
-    fn from(style: ButtonStyle) -> Self {
-        match style {
-            ButtonStyle::Tinted(tint) => tint.into(),
-            _ => Color::Default,
-        }
-    }
-}
-
-/// The visual appearance of a button.
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy, Default)]
-pub enum ButtonStyle {
-    /// A filled button with a solid background color. Provides emphasis versus
-    /// the more common subtle button.
-    Filled,
-
-    /// Used to emphasize a button in some way, like a selected state, or a semantic
-    /// coloring like an error or success button.
-    Tinted(TintColor),
-
-    /// Usually used as a secondary action that should have more emphasis than
-    /// a fully transparent button.
-    Outlined,
-
-    /// A more de-emphasized version of the outlined button.
-    OutlinedGhost,
-
-    /// The default button style, used for most buttons. Has a transparent background,
-    /// but has a background color to indicate states like hover and active.
-    #[default]
-    Subtle,
-
-    /// Used for buttons that only change foreground color on hover and active states.
-    ///
-    /// TODO: Better docs for this.
-    Transparent,
-}
-
-/// Rounding for a button that may have straight edges.
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
-pub(crate) struct ButtonLikeRounding {
-    /// Top-left corner rounding
-    pub top_left: bool,
-    /// Top-right corner rounding
-    pub top_right: bool,
-    /// Bottom-right corner rounding
-    pub bottom_right: bool,
-    /// Bottom-left corner rounding
-    pub bottom_left: bool,
-}
-
-impl ButtonLikeRounding {
-    pub const ALL: Self = Self {
-        top_left: true,
-        top_right: true,
-        bottom_right: true,
-        bottom_left: true,
-    };
-    pub const LEFT: Self = Self {
-        top_left: true,
-        top_right: false,
-        bottom_right: false,
-        bottom_left: true,
-    };
-    pub const RIGHT: Self = Self {
-        top_left: false,
-        top_right: true,
-        bottom_right: true,
-        bottom_left: false,
-    };
-}
-
-#[derive(Debug, Clone)]
-pub(crate) struct ButtonLikeStyles {
-    pub background: Hsla,
-    #[allow(unused)]
-    pub border_color: Hsla,
-    #[allow(unused)]
-    pub label_color: Hsla,
-    #[allow(unused)]
-    pub icon_color: Hsla,
-}
-
-fn element_bg_from_elevation(elevation: Option<ElevationIndex>, cx: &mut App) -> Hsla {
-    match elevation {
-        Some(ElevationIndex::Background) => cx.theme().colors().element_background,
-        Some(ElevationIndex::ElevatedSurface) => cx.theme().colors().elevated_surface_background,
-        Some(ElevationIndex::Surface) => cx.theme().colors().surface_background,
-        Some(ElevationIndex::ModalSurface) => cx.theme().colors().background,
-        _ => cx.theme().colors().element_background,
-    }
-}
-
-impl ButtonStyle {
-    pub(crate) fn enabled(
-        self,
-        elevation: Option<ElevationIndex>,
-
-        cx: &mut App,
-    ) -> ButtonLikeStyles {
-        match self {
-            ButtonStyle::Filled => ButtonLikeStyles {
-                background: element_bg_from_elevation(elevation, cx),
-                border_color: transparent_black(),
-                label_color: Color::Default.color(cx),
-                icon_color: Color::Default.color(cx),
-            },
-            ButtonStyle::Tinted(tint) => tint.button_like_style(cx),
-            ButtonStyle::Outlined => ButtonLikeStyles {
-                background: element_bg_from_elevation(elevation, cx),
-                border_color: cx.theme().colors().border_variant,
-                label_color: Color::Default.color(cx),
-                icon_color: Color::Default.color(cx),
-            },
-            ButtonStyle::OutlinedGhost => ButtonLikeStyles {
-                background: transparent_black(),
-                border_color: cx.theme().colors().border_variant,
-                label_color: Color::Default.color(cx),
-                icon_color: Color::Default.color(cx),
-            },
-            ButtonStyle::Subtle => ButtonLikeStyles {
-                background: cx.theme().colors().ghost_element_background,
-                border_color: transparent_black(),
-                label_color: Color::Default.color(cx),
-                icon_color: Color::Default.color(cx),
-            },
-            ButtonStyle::Transparent => ButtonLikeStyles {
-                background: transparent_black(),
-                border_color: transparent_black(),
-                label_color: Color::Default.color(cx),
-                icon_color: Color::Default.color(cx),
-            },
-        }
-    }
-
-    pub(crate) fn hovered(
-        self,
-        elevation: Option<ElevationIndex>,
-
-        cx: &mut App,
-    ) -> ButtonLikeStyles {
-        match self {
-            ButtonStyle::Filled => {
-                let mut filled_background = element_bg_from_elevation(elevation, cx);
-                filled_background.fade_out(0.5);
-
-                ButtonLikeStyles {
-                    background: filled_background,
-                    border_color: transparent_black(),
-                    label_color: Color::Default.color(cx),
-                    icon_color: Color::Default.color(cx),
-                }
-            }
-            ButtonStyle::Tinted(tint) => {
-                let mut styles = tint.button_like_style(cx);
-                let theme = cx.theme();
-                styles.background = theme.darken(styles.background, 0.05, 0.2);
-                styles
-            }
-            ButtonStyle::Outlined => ButtonLikeStyles {
-                background: cx.theme().colors().ghost_element_hover,
-                border_color: cx.theme().colors().border,
-                label_color: Color::Default.color(cx),
-                icon_color: Color::Default.color(cx),
-            },
-            ButtonStyle::OutlinedGhost => ButtonLikeStyles {
-                background: cx.theme().colors().ghost_element_hover,
-                border_color: cx.theme().colors().border,
-                label_color: Color::Default.color(cx),
-                icon_color: Color::Default.color(cx),
-            },
-            ButtonStyle::Subtle => ButtonLikeStyles {
-                background: cx.theme().colors().ghost_element_hover,
-                border_color: transparent_black(),
-                label_color: Color::Default.color(cx),
-                icon_color: Color::Default.color(cx),
-            },
-            ButtonStyle::Transparent => ButtonLikeStyles {
-                background: transparent_black(),
-                border_color: transparent_black(),
-                // TODO: These are not great
-                label_color: Color::Muted.color(cx),
-                // TODO: These are not great
-                icon_color: Color::Muted.color(cx),
-            },
-        }
-    }
-
-    pub(crate) fn active(self, cx: &mut App) -> ButtonLikeStyles {
-        match self {
-            ButtonStyle::Filled => ButtonLikeStyles {
-                background: cx.theme().colors().element_active,
-                border_color: transparent_black(),
-                label_color: Color::Default.color(cx),
-                icon_color: Color::Default.color(cx),
-            },
-            ButtonStyle::Tinted(tint) => tint.button_like_style(cx),
-            ButtonStyle::Subtle => ButtonLikeStyles {
-                background: cx.theme().colors().ghost_element_active,
-                border_color: transparent_black(),
-                label_color: Color::Default.color(cx),
-                icon_color: Color::Default.color(cx),
-            },
-            ButtonStyle::Outlined => ButtonLikeStyles {
-                background: cx.theme().colors().element_active,
-                border_color: cx.theme().colors().border_variant,
-                label_color: Color::Default.color(cx),
-                icon_color: Color::Default.color(cx),
-            },
-            ButtonStyle::OutlinedGhost => ButtonLikeStyles {
-                background: transparent_black(),
-                border_color: cx.theme().colors().border_variant,
-                label_color: Color::Default.color(cx),
-                icon_color: Color::Default.color(cx),
-            },
-            ButtonStyle::Transparent => ButtonLikeStyles {
-                background: transparent_black(),
-                border_color: transparent_black(),
-                // TODO: These are not great
-                label_color: Color::Muted.color(cx),
-                // TODO: These are not great
-                icon_color: Color::Muted.color(cx),
-            },
-        }
-    }
-
-    #[allow(unused)]
-    pub(crate) fn focused(self, window: &mut Window, cx: &mut App) -> ButtonLikeStyles {
-        match self {
-            ButtonStyle::Filled => ButtonLikeStyles {
-                background: cx.theme().colors().element_background,
-                border_color: cx.theme().colors().border_focused,
-                label_color: Color::Default.color(cx),
-                icon_color: Color::Default.color(cx),
-            },
-            ButtonStyle::Tinted(tint) => tint.button_like_style(cx),
-            ButtonStyle::Subtle => ButtonLikeStyles {
-                background: cx.theme().colors().ghost_element_background,
-                border_color: cx.theme().colors().border_focused,
-                label_color: Color::Default.color(cx),
-                icon_color: Color::Default.color(cx),
-            },
-            ButtonStyle::Outlined => ButtonLikeStyles {
-                background: cx.theme().colors().ghost_element_background,
-                border_color: cx.theme().colors().border,
-                label_color: Color::Default.color(cx),
-                icon_color: Color::Default.color(cx),
-            },
-            ButtonStyle::OutlinedGhost => ButtonLikeStyles {
-                background: transparent_black(),
-                border_color: cx.theme().colors().border,
-                label_color: Color::Default.color(cx),
-                icon_color: Color::Default.color(cx),
-            },
-            ButtonStyle::Transparent => ButtonLikeStyles {
-                background: transparent_black(),
-                border_color: cx.theme().colors().border_focused,
-                label_color: Color::Accent.color(cx),
-                icon_color: Color::Accent.color(cx),
-            },
-        }
-    }
-
-    #[allow(unused)]
-    pub(crate) fn disabled(
-        self,
-        elevation: Option<ElevationIndex>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> ButtonLikeStyles {
-        match self {
-            ButtonStyle::Filled => ButtonLikeStyles {
-                background: cx.theme().colors().element_disabled,
-                border_color: cx.theme().colors().border_disabled,
-                label_color: Color::Disabled.color(cx),
-                icon_color: Color::Disabled.color(cx),
-            },
-            ButtonStyle::Tinted(tint) => tint.button_like_style(cx),
-            ButtonStyle::Subtle => ButtonLikeStyles {
-                background: cx.theme().colors().ghost_element_disabled,
-                border_color: cx.theme().colors().border_disabled,
-                label_color: Color::Disabled.color(cx),
-                icon_color: Color::Disabled.color(cx),
-            },
-            ButtonStyle::Outlined => ButtonLikeStyles {
-                background: cx.theme().colors().element_disabled,
-                border_color: cx.theme().colors().border_disabled,
-                label_color: Color::Default.color(cx),
-                icon_color: Color::Default.color(cx),
-            },
-            ButtonStyle::OutlinedGhost => ButtonLikeStyles {
-                background: transparent_black(),
-                border_color: cx.theme().colors().border_disabled,
-                label_color: Color::Default.color(cx),
-                icon_color: Color::Default.color(cx),
-            },
-            ButtonStyle::Transparent => ButtonLikeStyles {
-                background: transparent_black(),
-                border_color: transparent_black(),
-                label_color: Color::Disabled.color(cx),
-                icon_color: Color::Disabled.color(cx),
-            },
-        }
-    }
-}
-
-/// The height of a button.
-///
-/// Can also be used to size non-button elements to align with [`Button`]s.
-#[derive(Default, PartialEq, Clone, Copy)]
-pub enum ButtonSize {
-    Large,
-    Medium,
-    #[default]
-    Default,
-    Compact,
-    None,
-}
-
-impl ButtonSize {
-    pub fn rems(self) -> Rems {
-        match self {
-            ButtonSize::Large => rems_from_px(32.),
-            ButtonSize::Medium => rems_from_px(28.),
-            ButtonSize::Default => rems_from_px(22.),
-            ButtonSize::Compact => rems_from_px(18.),
-            ButtonSize::None => rems_from_px(16.),
-        }
-    }
-}
-
-/// A button-like element that can be used to create a custom button when
-/// prebuilt buttons are not sufficient. Use this sparingly, as it is
-/// unconstrained and may make the UI feel less consistent.
-///
-/// This is also used to build the prebuilt buttons.
-#[derive(IntoElement, Documented, RegisterComponent)]
-pub struct ButtonLike {
-    pub(super) base: Div,
-    id: ElementId,
-    pub(super) style: ButtonStyle,
-    pub(super) disabled: bool,
-    pub(super) selected: bool,
-    pub(super) selected_style: Option<ButtonStyle>,
-    pub(super) width: Option<DefiniteLength>,
-    pub(super) height: Option<DefiniteLength>,
-    pub(super) layer: Option<ElevationIndex>,
-    tab_index: Option<isize>,
-    size: ButtonSize,
-    rounding: Option<ButtonLikeRounding>,
-    tooltip: Option<Box<dyn Fn(&mut Window, &mut App) -> AnyView>>,
-    hoverable_tooltip: Option<Box<dyn Fn(&mut Window, &mut App) -> AnyView>>,
-    cursor_style: CursorStyle,
-    on_click: Option<Box<dyn Fn(&ClickEvent, &mut Window, &mut App) + 'static>>,
-    on_right_click: Option<Box<dyn Fn(&ClickEvent, &mut Window, &mut App) + 'static>>,
-    children: SmallVec<[AnyElement; 2]>,
-    focus_handle: Option<FocusHandle>,
-}
-
-impl ButtonLike {
-    pub fn new(id: impl Into<ElementId>) -> Self {
-        Self {
-            base: div(),
-            id: id.into(),
-            style: ButtonStyle::default(),
-            disabled: false,
-            selected: false,
-            selected_style: None,
-            width: None,
-            height: None,
-            size: ButtonSize::Default,
-            rounding: Some(ButtonLikeRounding::ALL),
-            tooltip: None,
-            hoverable_tooltip: None,
-            children: SmallVec::new(),
-            cursor_style: CursorStyle::PointingHand,
-            on_click: None,
-            on_right_click: None,
-            layer: None,
-            tab_index: None,
-            focus_handle: None,
-        }
-    }
-
-    pub fn new_rounded_left(id: impl Into<ElementId>) -> Self {
-        Self::new(id).rounding(ButtonLikeRounding::LEFT)
-    }
-
-    pub fn new_rounded_right(id: impl Into<ElementId>) -> Self {
-        Self::new(id).rounding(ButtonLikeRounding::RIGHT)
-    }
-
-    pub fn new_rounded_all(id: impl Into<ElementId>) -> Self {
-        Self::new(id).rounding(ButtonLikeRounding::ALL)
-    }
-
-    pub fn opacity(mut self, opacity: f32) -> Self {
-        self.base = self.base.opacity(opacity);
-        self
-    }
-
-    pub fn height(mut self, height: DefiniteLength) -> Self {
-        self.height = Some(height);
-        self
-    }
-
-    pub(crate) fn rounding(mut self, rounding: impl Into<Option<ButtonLikeRounding>>) -> Self {
-        self.rounding = rounding.into();
-        self
-    }
-
-    pub fn on_right_click(
-        mut self,
-        handler: impl Fn(&ClickEvent, &mut Window, &mut App) + 'static,
-    ) -> Self {
-        self.on_right_click = Some(Box::new(handler));
-        self
-    }
-
-    pub fn hoverable_tooltip(
-        mut self,
-        tooltip: impl Fn(&mut Window, &mut App) -> AnyView + 'static,
-    ) -> Self {
-        self.hoverable_tooltip = Some(Box::new(tooltip));
-        self
-    }
-}
-
-impl Disableable for ButtonLike {
-    fn disabled(mut self, disabled: bool) -> Self {
-        self.disabled = disabled;
-        self
-    }
-}
-
-impl Toggleable for ButtonLike {
-    fn toggle_state(mut self, selected: bool) -> Self {
-        self.selected = selected;
-        self
-    }
-}
-
-impl SelectableButton for ButtonLike {
-    fn selected_style(mut self, style: ButtonStyle) -> Self {
-        self.selected_style = Some(style);
-        self
-    }
-}
-
-impl Clickable for ButtonLike {
-    fn on_click(mut self, handler: impl Fn(&ClickEvent, &mut Window, &mut App) + 'static) -> Self {
-        self.on_click = Some(Box::new(handler));
-        self
-    }
-
-    fn cursor_style(mut self, cursor_style: CursorStyle) -> Self {
-        self.cursor_style = cursor_style;
-        self
-    }
-}
-
-impl FixedWidth for ButtonLike {
-    fn width(mut self, width: impl Into<DefiniteLength>) -> Self {
-        self.width = Some(width.into());
-        self
-    }
-
-    fn full_width(mut self) -> Self {
-        self.width = Some(relative(1.));
-        self
-    }
-}
-
-impl ButtonCommon for ButtonLike {
-    fn id(&self) -> &ElementId {
-        &self.id
-    }
-
-    fn style(mut self, style: ButtonStyle) -> Self {
-        self.style = style;
-        self
-    }
-
-    fn size(mut self, size: ButtonSize) -> Self {
-        self.size = size;
-        self
-    }
-
-    fn tooltip(mut self, tooltip: impl Fn(&mut Window, &mut App) -> AnyView + 'static) -> Self {
-        self.tooltip = Some(Box::new(tooltip));
-        self
-    }
-
-    fn tab_index(mut self, tab_index: impl Into<isize>) -> Self {
-        self.tab_index = Some(tab_index.into());
-        self
-    }
-
-    fn layer(mut self, elevation: ElevationIndex) -> Self {
-        self.layer = Some(elevation);
-        self
-    }
-
-    fn track_focus(mut self, focus_handle: &gpui::FocusHandle) -> Self {
-        self.focus_handle = Some(focus_handle.clone());
-        self
-    }
-}
-
-impl VisibleOnHover for ButtonLike {
-    fn visible_on_hover(mut self, group_name: impl Into<SharedString>) -> Self {
-        self.base = self.base.visible_on_hover(group_name);
-        self
-    }
-}
-
-impl ParentElement for ButtonLike {
-    fn extend(&mut self, elements: impl IntoIterator<Item = AnyElement>) {
-        self.children.extend(elements)
-    }
-}
-
-impl RenderOnce for ButtonLike {
-    fn render(self, _: &mut Window, cx: &mut App) -> impl IntoElement {
-        let style = self
-            .selected_style
-            .filter(|_| self.selected)
-            .unwrap_or(self.style);
-
-        let is_outlined = matches!(
-            self.style,
-            ButtonStyle::Outlined | ButtonStyle::OutlinedGhost
-        );
-
-        self.base
-            .h_flex()
-            .id(self.id.clone())
-            .when_some(self.tab_index, |this, tab_index| this.tab_index(tab_index))
-            .when_some(self.focus_handle, |this, focus_handle| {
-                this.track_focus(&focus_handle)
-            })
-            .font_ui(cx)
-            .group("")
-            .flex_none()
-            .h(self.height.unwrap_or(self.size.rems().into()))
-            .when_some(self.width, |this, width| {
-                this.w(width).justify_center().text_center()
-            })
-            .when(is_outlined, |this| this.border_1())
-            .when_some(self.rounding, |this, rounding| {
-                this.when(rounding.top_left, |this| this.rounded_tl_sm())
-                    .when(rounding.top_right, |this| this.rounded_tr_sm())
-                    .when(rounding.bottom_right, |this| this.rounded_br_sm())
-                    .when(rounding.bottom_left, |this| this.rounded_bl_sm())
-            })
-            .gap(DynamicSpacing::Base04.rems(cx))
-            .map(|this| match self.size {
-                ButtonSize::Large | ButtonSize::Medium => this.px(DynamicSpacing::Base08.rems(cx)),
-                ButtonSize::Default | ButtonSize::Compact => {
-                    this.px(DynamicSpacing::Base04.rems(cx))
-                }
-                ButtonSize::None => this.px_px(),
-            })
-            .border_color(style.enabled(self.layer, cx).border_color)
-            .bg(style.enabled(self.layer, cx).background)
-            .when(self.disabled, |this| {
-                if self.cursor_style == CursorStyle::PointingHand {
-                    this.cursor_not_allowed()
-                } else {
-                    this.cursor(self.cursor_style)
-                }
-            })
-            .when(!self.disabled, |this| {
-                let hovered_style = style.hovered(self.layer, cx);
-                let focus_color =
-                    |refinement: StyleRefinement| refinement.bg(hovered_style.background);
-
-                this.cursor(self.cursor_style)
-                    .hover(focus_color)
-                    .map(|this| {
-                        if is_outlined {
-                            this.focus_visible(|s| {
-                                s.border_color(cx.theme().colors().border_focused)
-                            })
-                        } else {
-                            this.focus_visible(focus_color)
-                        }
-                    })
-                    .active(|active| active.bg(style.active(cx).background))
-            })
-            .when_some(
-                self.on_right_click.filter(|_| !self.disabled),
-                |this, on_right_click| {
-                    this.on_mouse_down(MouseButton::Right, |_event, window, cx| {
-                        window.prevent_default();
-                        cx.stop_propagation();
-                    })
-                    .on_mouse_up(
-                        MouseButton::Right,
-                        move |event, window, cx| {
-                            cx.stop_propagation();
-                            let click_event = ClickEvent::Mouse(MouseClickEvent {
-                                down: MouseDownEvent {
-                                    button: MouseButton::Right,
-                                    position: event.position,
-                                    modifiers: event.modifiers,
-                                    click_count: 1,
-                                    first_mouse: false,
-                                },
-                                up: MouseUpEvent {
-                                    button: MouseButton::Right,
-                                    position: event.position,
-                                    modifiers: event.modifiers,
-                                    click_count: 1,
-                                },
-                            });
-                            (on_right_click)(&click_event, window, cx)
-                        },
-                    )
-                },
-            )
-            .when_some(
-                self.on_click.filter(|_| !self.disabled),
-                |this, on_click| {
-                    this.on_mouse_down(MouseButton::Left, |_, window, _| window.prevent_default())
-                        .on_click(move |event, window, cx| {
-                            cx.stop_propagation();
-                            (on_click)(event, window, cx)
-                        })
-                },
-            )
-            .when_some(self.tooltip, |this, tooltip| {
-                this.tooltip(move |window, cx| tooltip(window, cx))
-            })
-            .when_some(self.hoverable_tooltip, |this, tooltip| {
-                this.hoverable_tooltip(move |window, cx| tooltip(window, cx))
-            })
-            .children(self.children)
-    }
-}
-
-impl Component for ButtonLike {
-    fn scope() -> ComponentScope {
-        ComponentScope::Input
-    }
-
-    fn sort_name() -> &'static str {
-        // ButtonLike should be at the bottom of the button list
-        "ButtonZ"
-    }
-
-    fn description() -> Option<&'static str> {
-        Some(ButtonLike::DOCS)
-    }
-
-    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
-        Some(
-            v_flex()
-                .gap_6()
-                .children(vec![
-                    example_group(vec![
-                        single_example(
-                            "Default",
-                            ButtonLike::new("default")
-                                .child(Label::new("Default"))
-                                .into_any_element(),
-                        ),
-                        single_example(
-                            "Filled",
-                            ButtonLike::new("filled")
-                                .style(ButtonStyle::Filled)
-                                .child(Label::new("Filled"))
-                                .into_any_element(),
-                        ),
-                        single_example(
-                            "Subtle",
-                            ButtonLike::new("outline")
-                                .style(ButtonStyle::Subtle)
-                                .child(Label::new("Subtle"))
-                                .into_any_element(),
-                        ),
-                        single_example(
-                            "Tinted",
-                            ButtonLike::new("tinted_accent_style")
-                                .style(ButtonStyle::Tinted(TintColor::Accent))
-                                .child(Label::new("Accent"))
-                                .into_any_element(),
-                        ),
-                        single_example(
-                            "Transparent",
-                            ButtonLike::new("transparent")
-                                .style(ButtonStyle::Transparent)
-                                .child(Label::new("Transparent"))
-                                .into_any_element(),
-                        ),
-                    ]),
-                    example_group_with_title(
-                        "Button Group Constructors",
-                        vec![
-                            single_example(
-                                "Left Rounded",
-                                ButtonLike::new_rounded_left("left_rounded")
-                                    .child(Label::new("Left Rounded"))
-                                    .style(ButtonStyle::Filled)
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Right Rounded",
-                                ButtonLike::new_rounded_right("right_rounded")
-                                    .child(Label::new("Right Rounded"))
-                                    .style(ButtonStyle::Filled)
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Button Group",
-                                h_flex()
-                                    .gap_px()
-                                    .child(
-                                        ButtonLike::new_rounded_left("bg_left")
-                                            .child(Label::new("Left"))
-                                            .style(ButtonStyle::Filled),
-                                    )
-                                    .child(
-                                        ButtonLike::new_rounded_right("bg_right")
-                                            .child(Label::new("Right"))
-                                            .style(ButtonStyle::Filled),
-                                    )
-                                    .into_any_element(),
-                            ),
-                        ],
-                    ),
-                ])
-                .into_any_element(),
-        )
-    }
-}
diff --git a/crates/ui/src/components/button/icon_button.rs b/crates/ui/src/components/button/icon_button.rs
deleted file mode 100644
index 961176ed6c..0000000000
--- a/crates/ui/src/components/button/icon_button.rs
+++ /dev/null
@@ -1,388 +0,0 @@
-use gpui::{AnyView, DefiniteLength, Hsla};
-
-use super::button_like::{ButtonCommon, ButtonLike, ButtonSize, ButtonStyle};
-use crate::{ElevationIndex, Indicator, SelectableButton, TintColor, prelude::*};
-use crate::{IconName, IconSize};
-
-use super::button_icon::ButtonIcon;
-
-/// The shape of an [`IconButton`].
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
-pub enum IconButtonShape {
-    Square,
-    Wide,
-}
-
-#[derive(IntoElement, RegisterComponent)]
-pub struct IconButton {
-    base: ButtonLike,
-    shape: IconButtonShape,
-    icon: IconName,
-    icon_size: IconSize,
-    icon_color: Color,
-    selected_icon: Option<IconName>,
-    selected_icon_color: Option<Color>,
-    indicator: Option<Indicator>,
-    indicator_border_color: Option<Hsla>,
-    alpha: Option<f32>,
-}
-
-impl IconButton {
-    pub fn new(id: impl Into<ElementId>, icon: IconName) -> Self {
-        let mut this = Self {
-            base: ButtonLike::new(id),
-            shape: IconButtonShape::Wide,
-            icon,
-            icon_size: IconSize::default(),
-            icon_color: Color::Default,
-            selected_icon: None,
-            selected_icon_color: None,
-            indicator: None,
-            indicator_border_color: None,
-            alpha: None,
-        };
-        this.base.base = this.base.base.debug_selector(|| format!("ICON-{:?}", icon));
-        this
-    }
-
-    pub fn shape(mut self, shape: IconButtonShape) -> Self {
-        self.shape = shape;
-        self
-    }
-
-    pub fn icon_size(mut self, icon_size: IconSize) -> Self {
-        self.icon_size = icon_size;
-        self
-    }
-
-    pub fn icon_color(mut self, icon_color: Color) -> Self {
-        self.icon_color = icon_color;
-        self
-    }
-
-    pub fn alpha(mut self, alpha: f32) -> Self {
-        self.alpha = Some(alpha);
-        self
-    }
-
-    pub fn selected_icon(mut self, icon: impl Into<Option<IconName>>) -> Self {
-        self.selected_icon = icon.into();
-        self
-    }
-
-    pub fn on_right_click(
-        mut self,
-        handler: impl Fn(&gpui::ClickEvent, &mut Window, &mut App) + 'static,
-    ) -> Self {
-        self.base = self.base.on_right_click(handler);
-        self
-    }
-
-    /// Sets the icon color used when the button is in a selected state.
-    pub fn selected_icon_color(mut self, color: impl Into<Option<Color>>) -> Self {
-        self.selected_icon_color = color.into();
-        self
-    }
-
-    pub fn indicator(mut self, indicator: Indicator) -> Self {
-        self.indicator = Some(indicator);
-        self
-    }
-
-    pub fn indicator_border_color(mut self, color: Option<Hsla>) -> Self {
-        self.indicator_border_color = color;
-
-        self
-    }
-}
-
-impl Disableable for IconButton {
-    fn disabled(mut self, disabled: bool) -> Self {
-        self.base = self.base.disabled(disabled);
-        self
-    }
-}
-
-impl Toggleable for IconButton {
-    fn toggle_state(mut self, selected: bool) -> Self {
-        self.base = self.base.toggle_state(selected);
-        self
-    }
-}
-
-impl SelectableButton for IconButton {
-    fn selected_style(mut self, style: ButtonStyle) -> Self {
-        self.base = self.base.selected_style(style);
-        self
-    }
-}
-
-impl Clickable for IconButton {
-    fn on_click(
-        mut self,
-        handler: impl Fn(&gpui::ClickEvent, &mut Window, &mut App) + 'static,
-    ) -> Self {
-        self.base = self.base.on_click(handler);
-        self
-    }
-
-    fn cursor_style(mut self, cursor_style: gpui::CursorStyle) -> Self {
-        self.base = self.base.cursor_style(cursor_style);
-        self
-    }
-}
-
-impl FixedWidth for IconButton {
-    fn width(mut self, width: impl Into<DefiniteLength>) -> Self {
-        self.base = self.base.width(width);
-        self
-    }
-
-    fn full_width(mut self) -> Self {
-        self.base = self.base.full_width();
-        self
-    }
-}
-
-impl ButtonCommon for IconButton {
-    fn id(&self) -> &ElementId {
-        self.base.id()
-    }
-
-    fn style(mut self, style: ButtonStyle) -> Self {
-        self.base = self.base.style(style);
-        self
-    }
-
-    fn size(mut self, size: ButtonSize) -> Self {
-        self.base = self.base.size(size);
-        self
-    }
-
-    fn tooltip(mut self, tooltip: impl Fn(&mut Window, &mut App) -> AnyView + 'static) -> Self {
-        self.base = self.base.tooltip(tooltip);
-        self
-    }
-
-    fn tab_index(mut self, tab_index: impl Into<isize>) -> Self {
-        self.base = self.base.tab_index(tab_index);
-        self
-    }
-
-    fn layer(mut self, elevation: ElevationIndex) -> Self {
-        self.base = self.base.layer(elevation);
-        self
-    }
-
-    fn track_focus(mut self, focus_handle: &gpui::FocusHandle) -> Self {
-        self.base = self.base.track_focus(focus_handle);
-        self
-    }
-}
-
-impl VisibleOnHover for IconButton {
-    fn visible_on_hover(mut self, group_name: impl Into<SharedString>) -> Self {
-        self.base = self.base.visible_on_hover(group_name);
-        self
-    }
-}
-
-impl RenderOnce for IconButton {
-    #[allow(refining_impl_trait)]
-    fn render(self, window: &mut Window, cx: &mut App) -> ButtonLike {
-        let is_disabled = self.base.disabled;
-        let is_selected = self.base.selected;
-        let selected_style = self.base.selected_style;
-
-        let color = self.icon_color.color(cx).opacity(self.alpha.unwrap_or(1.0));
-        self.base
-            .map(|this| match self.shape {
-                IconButtonShape::Square => {
-                    let size = self.icon_size.square(window, cx);
-                    this.width(size).height(size.into())
-                }
-                IconButtonShape::Wide => this,
-            })
-            .child(
-                ButtonIcon::new(self.icon)
-                    .disabled(is_disabled)
-                    .toggle_state(is_selected)
-                    .selected_icon(self.selected_icon)
-                    .selected_icon_color(self.selected_icon_color)
-                    .when_some(selected_style, |this, style| this.selected_style(style))
-                    .when_some(self.indicator, |this, indicator| {
-                        this.indicator(indicator)
-                            .indicator_border_color(self.indicator_border_color)
-                    })
-                    .size(self.icon_size)
-                    .color(Color::Custom(color)),
-            )
-    }
-}
-
-impl Component for IconButton {
-    fn scope() -> ComponentScope {
-        ComponentScope::Input
-    }
-
-    fn sort_name() -> &'static str {
-        "ButtonB"
-    }
-
-    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
-        Some(
-            v_flex()
-                .gap_6()
-                .children(vec![
-                    example_group_with_title(
-                        "Icon Button Styles",
-                        vec![
-                            single_example(
-                                "Default",
-                                IconButton::new("default", IconName::Check)
-                                    .layer(ElevationIndex::Background)
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Filled",
-                                IconButton::new("filled", IconName::Check)
-                                    .layer(ElevationIndex::Background)
-                                    .style(ButtonStyle::Filled)
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Subtle",
-                                IconButton::new("subtle", IconName::Check)
-                                    .layer(ElevationIndex::Background)
-                                    .style(ButtonStyle::Subtle)
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Tinted",
-                                IconButton::new("tinted", IconName::Check)
-                                    .layer(ElevationIndex::Background)
-                                    .style(ButtonStyle::Tinted(TintColor::Accent))
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Transparent",
-                                IconButton::new("transparent", IconName::Check)
-                                    .layer(ElevationIndex::Background)
-                                    .style(ButtonStyle::Transparent)
-                                    .into_any_element(),
-                            ),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "Icon Button Shapes",
-                        vec![
-                            single_example(
-                                "Square",
-                                IconButton::new("square", IconName::Check)
-                                    .shape(IconButtonShape::Square)
-                                    .style(ButtonStyle::Filled)
-                                    .layer(ElevationIndex::Background)
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Wide",
-                                IconButton::new("wide", IconName::Check)
-                                    .shape(IconButtonShape::Wide)
-                                    .style(ButtonStyle::Filled)
-                                    .layer(ElevationIndex::Background)
-                                    .into_any_element(),
-                            ),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "Icon Button Sizes",
-                        vec![
-                            single_example(
-                                "XSmall",
-                                IconButton::new("xsmall", IconName::Check)
-                                    .icon_size(IconSize::XSmall)
-                                    .style(ButtonStyle::Filled)
-                                    .layer(ElevationIndex::Background)
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Small",
-                                IconButton::new("small", IconName::Check)
-                                    .icon_size(IconSize::Small)
-                                    .style(ButtonStyle::Filled)
-                                    .layer(ElevationIndex::Background)
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Medium",
-                                IconButton::new("medium", IconName::Check)
-                                    .icon_size(IconSize::Medium)
-                                    .style(ButtonStyle::Filled)
-                                    .layer(ElevationIndex::Background)
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "XLarge",
-                                IconButton::new("xlarge", IconName::Check)
-                                    .icon_size(IconSize::XLarge)
-                                    .style(ButtonStyle::Filled)
-                                    .layer(ElevationIndex::Background)
-                                    .into_any_element(),
-                            ),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "Special States",
-                        vec![
-                            single_example(
-                                "Disabled",
-                                IconButton::new("disabled", IconName::Check)
-                                    .disabled(true)
-                                    .style(ButtonStyle::Filled)
-                                    .layer(ElevationIndex::Background)
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Selected",
-                                IconButton::new("selected", IconName::Check)
-                                    .toggle_state(true)
-                                    .style(ButtonStyle::Filled)
-                                    .layer(ElevationIndex::Background)
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "With Indicator",
-                                IconButton::new("indicator", IconName::Check)
-                                    .indicator(Indicator::dot().color(Color::Success))
-                                    .style(ButtonStyle::Filled)
-                                    .layer(ElevationIndex::Background)
-                                    .into_any_element(),
-                            ),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "Custom Colors",
-                        vec![
-                            single_example(
-                                "Custom Icon Color",
-                                IconButton::new("custom_color", IconName::Check)
-                                    .icon_color(Color::Accent)
-                                    .style(ButtonStyle::Filled)
-                                    .layer(ElevationIndex::Background)
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "With Alpha",
-                                IconButton::new("alpha", IconName::Check)
-                                    .alpha(0.5)
-                                    .style(ButtonStyle::Filled)
-                                    .layer(ElevationIndex::Background)
-                                    .into_any_element(),
-                            ),
-                        ],
-                    ),
-                ])
-                .into_any_element(),
-        )
-    }
-}
diff --git a/crates/ui/src/components/button/split_button.rs b/crates/ui/src/components/button/split_button.rs
deleted file mode 100644
index 48f06ff378..0000000000
--- a/crates/ui/src/components/button/split_button.rs
+++ /dev/null
@@ -1,97 +0,0 @@
-use gpui::{
-    AnyElement, App, BoxShadow, IntoElement, ParentElement, RenderOnce, Styled, Window, div, hsla,
-    point, prelude::FluentBuilder, px,
-};
-use theme::ActiveTheme;
-
-use crate::{ElevationIndex, IconButton, h_flex};
-
-use super::ButtonLike;
-
-#[derive(Clone, Copy, PartialEq)]
-pub enum SplitButtonStyle {
-    Filled,
-    Outlined,
-    Transparent,
-}
-
-pub enum SplitButtonKind {
-    ButtonLike(ButtonLike),
-    IconButton(IconButton),
-}
-
-impl From<IconButton> for SplitButtonKind {
-    fn from(icon_button: IconButton) -> Self {
-        Self::IconButton(icon_button)
-    }
-}
-
-impl From<ButtonLike> for SplitButtonKind {
-    fn from(button_like: ButtonLike) -> Self {
-        Self::ButtonLike(button_like)
-    }
-}
-
-/// /// A button with two parts: a primary action on the left and a secondary action on the right.
-///
-/// The left side is a [`ButtonLike`] with the main action, while the right side can contain
-/// any element (typically a dropdown trigger or similar).
-///
-/// The two sections are visually separated by a divider, but presented as a unified control.
-#[derive(IntoElement)]
-pub struct SplitButton {
-    left: SplitButtonKind,
-    right: AnyElement,
-    style: SplitButtonStyle,
-}
-
-impl SplitButton {
-    pub fn new(left: impl Into<SplitButtonKind>, right: AnyElement) -> Self {
-        Self {
-            left: left.into(),
-            right,
-            style: SplitButtonStyle::Filled,
-        }
-    }
-
-    pub fn style(mut self, style: SplitButtonStyle) -> Self {
-        self.style = style;
-        self
-    }
-}
-
-impl RenderOnce for SplitButton {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let is_filled_or_outlined = matches!(
-            self.style,
-            SplitButtonStyle::Filled | SplitButtonStyle::Outlined
-        );
-
-        h_flex()
-            .rounded_sm()
-            .when(is_filled_or_outlined, |this| {
-                this.border_1()
-                    .border_color(cx.theme().colors().border.opacity(0.8))
-            })
-            .child(div().flex_grow().child(match self.left {
-                SplitButtonKind::ButtonLike(button) => button.into_any_element(),
-                SplitButtonKind::IconButton(icon) => icon.into_any_element(),
-            }))
-            .child(
-                div()
-                    .h_full()
-                    .w_px()
-                    .bg(cx.theme().colors().border.opacity(0.5)),
-            )
-            .child(self.right)
-            .when(self.style == SplitButtonStyle::Filled, |this| {
-                this.bg(ElevationIndex::Surface.on_elevation_bg(cx))
-                    .shadow(vec![BoxShadow {
-                        color: hsla(0.0, 0.0, 0.0, 0.16),
-                        offset: point(px(0.), px(1.)),
-                        blur_radius: px(0.),
-                        spread_radius: px(0.),
-                    }])
-            })
-    }
-}
diff --git a/crates/ui/src/components/button/toggle_button.rs b/crates/ui/src/components/button/toggle_button.rs
deleted file mode 100644
index 5cecfef062..0000000000
--- a/crates/ui/src/components/button/toggle_button.rs
+++ /dev/null
@@ -1,769 +0,0 @@
-use std::rc::Rc;
-
-use gpui::{AnyView, ClickEvent, relative};
-
-use crate::{ButtonLike, ButtonLikeRounding, TintColor, Tooltip, prelude::*};
-
-/// The position of a [`ToggleButton`] within a group of buttons.
-#[derive(Debug, PartialEq, Eq, Clone, Copy)]
-pub struct ToggleButtonPosition {
-    /// The toggle button is one of the leftmost of the group.
-    leftmost: bool,
-    /// The toggle button is one of the rightmost of the group.
-    rightmost: bool,
-    /// The toggle button is one of the topmost of the group.
-    topmost: bool,
-    /// The toggle button is one of the bottommost of the group.
-    bottommost: bool,
-}
-
-impl ToggleButtonPosition {
-    pub const HORIZONTAL_FIRST: Self = Self {
-        leftmost: true,
-        ..Self::HORIZONTAL_MIDDLE
-    };
-    pub const HORIZONTAL_MIDDLE: Self = Self {
-        leftmost: false,
-        rightmost: false,
-        topmost: true,
-        bottommost: true,
-    };
-    pub const HORIZONTAL_LAST: Self = Self {
-        rightmost: true,
-        ..Self::HORIZONTAL_MIDDLE
-    };
-
-    pub(crate) fn to_rounding(self) -> ButtonLikeRounding {
-        ButtonLikeRounding {
-            top_left: self.topmost && self.leftmost,
-            top_right: self.topmost && self.rightmost,
-            bottom_right: self.bottommost && self.rightmost,
-            bottom_left: self.bottommost && self.leftmost,
-        }
-    }
-}
-
-pub struct ButtonConfiguration {
-    label: SharedString,
-    icon: Option<IconName>,
-    on_click: Box<dyn Fn(&ClickEvent, &mut Window, &mut App) + 'static>,
-    selected: bool,
-    tooltip: Option<Rc<dyn Fn(&mut Window, &mut App) -> AnyView>>,
-}
-
-mod private {
-    pub trait ToggleButtonStyle {}
-}
-
-pub trait ButtonBuilder: 'static + private::ToggleButtonStyle {
-    fn into_configuration(self) -> ButtonConfiguration;
-}
-
-pub struct ToggleButtonSimple {
-    label: SharedString,
-    on_click: Box<dyn Fn(&ClickEvent, &mut Window, &mut App) + 'static>,
-    selected: bool,
-    tooltip: Option<Rc<dyn Fn(&mut Window, &mut App) -> AnyView>>,
-}
-
-impl ToggleButtonSimple {
-    pub fn new(
-        label: impl Into<SharedString>,
-        on_click: impl Fn(&ClickEvent, &mut Window, &mut App) + 'static,
-    ) -> Self {
-        Self {
-            label: label.into(),
-            on_click: Box::new(on_click),
-            selected: false,
-            tooltip: None,
-        }
-    }
-
-    pub fn selected(mut self, selected: bool) -> Self {
-        self.selected = selected;
-        self
-    }
-
-    pub fn tooltip(mut self, tooltip: impl Fn(&mut Window, &mut App) -> AnyView + 'static) -> Self {
-        self.tooltip = Some(Rc::new(tooltip));
-        self
-    }
-}
-
-impl private::ToggleButtonStyle for ToggleButtonSimple {}
-
-impl ButtonBuilder for ToggleButtonSimple {
-    fn into_configuration(self) -> ButtonConfiguration {
-        ButtonConfiguration {
-            label: self.label,
-            icon: None,
-            on_click: self.on_click,
-            selected: self.selected,
-            tooltip: self.tooltip,
-        }
-    }
-}
-
-pub struct ToggleButtonWithIcon {
-    label: SharedString,
-    icon: IconName,
-    on_click: Box<dyn Fn(&ClickEvent, &mut Window, &mut App) + 'static>,
-    selected: bool,
-    tooltip: Option<Rc<dyn Fn(&mut Window, &mut App) -> AnyView>>,
-}
-
-impl ToggleButtonWithIcon {
-    pub fn new(
-        label: impl Into<SharedString>,
-        icon: IconName,
-        on_click: impl Fn(&ClickEvent, &mut Window, &mut App) + 'static,
-    ) -> Self {
-        Self {
-            label: label.into(),
-            icon,
-            on_click: Box::new(on_click),
-            selected: false,
-            tooltip: None,
-        }
-    }
-
-    pub fn selected(mut self, selected: bool) -> Self {
-        self.selected = selected;
-        self
-    }
-
-    pub fn tooltip(mut self, tooltip: impl Fn(&mut Window, &mut App) -> AnyView + 'static) -> Self {
-        self.tooltip = Some(Rc::new(tooltip));
-        self
-    }
-}
-
-impl private::ToggleButtonStyle for ToggleButtonWithIcon {}
-
-impl ButtonBuilder for ToggleButtonWithIcon {
-    fn into_configuration(self) -> ButtonConfiguration {
-        ButtonConfiguration {
-            label: self.label,
-            icon: Some(self.icon),
-            on_click: self.on_click,
-            selected: self.selected,
-            tooltip: self.tooltip,
-        }
-    }
-}
-
-#[derive(Clone, Copy, PartialEq)]
-pub enum ToggleButtonGroupStyle {
-    Transparent,
-    Filled,
-    Outlined,
-}
-
-#[derive(Clone, Copy, PartialEq)]
-pub enum ToggleButtonGroupSize {
-    Default,
-    Medium,
-    Large,
-    Custom(Rems),
-}
-
-#[derive(IntoElement)]
-pub struct ToggleButtonGroup<T, const COLS: usize = 3, const ROWS: usize = 1>
-where
-    T: ButtonBuilder,
-{
-    group_name: SharedString,
-    rows: [[T; COLS]; ROWS],
-    style: ToggleButtonGroupStyle,
-    size: ToggleButtonGroupSize,
-    label_size: LabelSize,
-    group_width: Option<DefiniteLength>,
-    auto_width: bool,
-    selected_index: usize,
-    tab_index: Option<isize>,
-}
-
-impl<T: ButtonBuilder, const COLS: usize> ToggleButtonGroup<T, COLS> {
-    pub fn single_row(group_name: impl Into<SharedString>, buttons: [T; COLS]) -> Self {
-        Self {
-            group_name: group_name.into(),
-            rows: [buttons],
-            style: ToggleButtonGroupStyle::Transparent,
-            size: ToggleButtonGroupSize::Default,
-            label_size: LabelSize::Small,
-            group_width: None,
-            auto_width: false,
-            selected_index: 0,
-            tab_index: None,
-        }
-    }
-}
-
-impl<T: ButtonBuilder, const COLS: usize> ToggleButtonGroup<T, COLS, 2> {
-    pub fn two_rows(
-        group_name: impl Into<SharedString>,
-        first_row: [T; COLS],
-        second_row: [T; COLS],
-    ) -> Self {
-        Self {
-            group_name: group_name.into(),
-            rows: [first_row, second_row],
-            style: ToggleButtonGroupStyle::Transparent,
-            size: ToggleButtonGroupSize::Default,
-            label_size: LabelSize::Small,
-            group_width: None,
-            auto_width: false,
-            selected_index: 0,
-            tab_index: None,
-        }
-    }
-}
-
-impl<T: ButtonBuilder, const COLS: usize, const ROWS: usize> ToggleButtonGroup<T, COLS, ROWS> {
-    pub fn style(mut self, style: ToggleButtonGroupStyle) -> Self {
-        self.style = style;
-        self
-    }
-
-    pub fn size(mut self, size: ToggleButtonGroupSize) -> Self {
-        self.size = size;
-        self
-    }
-
-    pub fn selected_index(mut self, index: usize) -> Self {
-        self.selected_index = index;
-        self
-    }
-
-    /// Makes the button group size itself to fit the content of the buttons,
-    /// rather than filling the full width of its parent.
-    pub fn auto_width(mut self) -> Self {
-        self.auto_width = true;
-        self
-    }
-
-    pub fn label_size(mut self, label_size: LabelSize) -> Self {
-        self.label_size = label_size;
-        self
-    }
-
-    /// Sets the tab index for the toggle button group.
-    /// The tab index is set to the initial value provided, then the
-    /// value is incremented by the number of buttons in the group.
-    pub fn tab_index(mut self, tab_index: &mut isize) -> Self {
-        self.tab_index = Some(*tab_index);
-        *tab_index += (COLS * ROWS) as isize;
-        self
-    }
-
-    const fn button_width() -> DefiniteLength {
-        relative(1. / COLS as f32)
-    }
-}
-
-impl<T: ButtonBuilder, const COLS: usize, const ROWS: usize> FixedWidth
-    for ToggleButtonGroup<T, COLS, ROWS>
-{
-    fn width(mut self, width: impl Into<DefiniteLength>) -> Self {
-        self.group_width = Some(width.into());
-        self
-    }
-
-    fn full_width(mut self) -> Self {
-        self.group_width = Some(relative(1.));
-        self
-    }
-}
-
-impl<T: ButtonBuilder, const COLS: usize, const ROWS: usize> RenderOnce
-    for ToggleButtonGroup<T, COLS, ROWS>
-{
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let custom_height = match self.size {
-            ToggleButtonGroupSize::Custom(height) => Some(height),
-            _ => None,
-        };
-
-        let entries =
-            self.rows.into_iter().enumerate().map(|(row_index, row)| {
-                let group_name = self.group_name.clone();
-                row.into_iter().enumerate().map(move |(col_index, button)| {
-                    let ButtonConfiguration {
-                        label,
-                        icon,
-                        on_click,
-                        selected,
-                        tooltip,
-                    } = button.into_configuration();
-
-                    let entry_index = row_index * COLS + col_index;
-
-                    ButtonLike::new((group_name.clone(), entry_index))
-                        .when(!self.auto_width, |this| this.full_width())
-                        .rounding(Some(
-                            ToggleButtonPosition {
-                                leftmost: col_index == 0,
-                                rightmost: col_index == COLS - 1,
-                                topmost: row_index == 0,
-                                bottommost: row_index == ROWS - 1,
-                            }
-                            .to_rounding(),
-                        ))
-                        .when_some(self.tab_index, |this, tab_index| {
-                            this.tab_index(tab_index + entry_index as isize)
-                        })
-                        .when(entry_index == self.selected_index || selected, |this| {
-                            this.toggle_state(true)
-                                .selected_style(ButtonStyle::Tinted(TintColor::Accent))
-                        })
-                        .when(self.style == ToggleButtonGroupStyle::Filled, |button| {
-                            button.style(ButtonStyle::Filled)
-                        })
-                        .when(self.size == ToggleButtonGroupSize::Medium, |button| {
-                            button.size(ButtonSize::Medium)
-                        })
-                        .when(self.size == ToggleButtonGroupSize::Large, |button| {
-                            button.size(ButtonSize::Large)
-                        })
-                        .when_some(custom_height, |button, height| button.height(height.into()))
-                        .child(
-                            h_flex()
-                                .w_full()
-                                .px_2()
-                                .gap_1p5()
-                                .justify_center()
-                                .flex_none()
-                                .when_some(icon, |this, icon| {
-                                    this.py_2()
-                                        .child(Icon::new(icon).size(IconSize::XSmall).map(|this| {
-                                            if entry_index == self.selected_index || selected {
-                                                this.color(Color::Accent)
-                                            } else {
-                                                this.color(Color::Muted)
-                                            }
-                                        }))
-                                })
-                                .child(Label::new(label).size(self.label_size).when(
-                                    entry_index == self.selected_index || selected,
-                                    |this| this.color(Color::Accent),
-                                )),
-                        )
-                        .when_some(tooltip, |this, tooltip| {
-                            this.tooltip(move |window, cx| tooltip(window, cx))
-                        })
-                        .on_click(on_click)
-                        .into_any_element()
-                })
-            });
-
-        let border_color = cx.theme().colors().border.opacity(0.6);
-        let is_outlined_or_filled = self.style == ToggleButtonGroupStyle::Outlined
-            || self.style == ToggleButtonGroupStyle::Filled;
-        let is_transparent = self.style == ToggleButtonGroupStyle::Transparent;
-
-        v_flex()
-            .map(|this| {
-                if let Some(width) = self.group_width {
-                    this.w(width)
-                } else if self.auto_width {
-                    this
-                } else {
-                    this.w_full()
-                }
-            })
-            .rounded_md()
-            .overflow_hidden()
-            .map(|this| {
-                if is_transparent {
-                    this.gap_px()
-                } else {
-                    this.border_1().border_color(border_color)
-                }
-            })
-            .children(entries.enumerate().map(|(row_index, row)| {
-                let last_row = row_index == ROWS - 1;
-                h_flex()
-                    .when(!is_outlined_or_filled, |this| this.gap_px())
-                    .when(is_outlined_or_filled && !last_row, |this| {
-                        this.border_b_1().border_color(border_color)
-                    })
-                    .children(row.enumerate().map(|(item_index, item)| {
-                        let last_item = item_index == COLS - 1;
-                        div()
-                            .when(is_outlined_or_filled && !last_item, |this| {
-                                this.border_r_1().border_color(border_color)
-                            })
-                            .when(!self.auto_width, |this| this.w(Self::button_width()))
-                            .overflow_hidden()
-                            .child(item)
-                    }))
-            }))
-    }
-}
-
-fn register_toggle_button_group() {
-    component::register_component::<ToggleButtonGroup<ToggleButtonSimple>>();
-}
-
-component::__private::inventory::submit! {
-    component::ComponentFn::new(register_toggle_button_group)
-}
-
-impl<T: ButtonBuilder, const COLS: usize, const ROWS: usize> Component
-    for ToggleButtonGroup<T, COLS, ROWS>
-{
-    fn name() -> &'static str {
-        "ToggleButtonGroup"
-    }
-
-    fn scope() -> ComponentScope {
-        ComponentScope::Input
-    }
-
-    fn sort_name() -> &'static str {
-        "ButtonG"
-    }
-
-    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
-        Some(
-            v_flex()
-                .gap_6()
-                .children(vec![example_group_with_title(
-                    "Transparent Variant",
-                    vec![
-                        single_example(
-                            "Single Row Group",
-                            ToggleButtonGroup::single_row(
-                                "single_row_test",
-                                [
-                                    ToggleButtonSimple::new("First", |_, _, _| {}),
-                                    ToggleButtonSimple::new("Second", |_, _, _| {}),
-                                    ToggleButtonSimple::new("Third", |_, _, _| {}),
-                                ],
-                            )
-                            .selected_index(1)
-                            .into_any_element(),
-                        ),
-                        single_example(
-                            "Single Row Group with icons",
-                            ToggleButtonGroup::single_row(
-                                "single_row_test_icon",
-                                [
-                                    ToggleButtonWithIcon::new(
-                                        "First",
-                                        IconName::AiZed,
-                                        |_, _, _| {},
-                                    ),
-                                    ToggleButtonWithIcon::new(
-                                        "Second",
-                                        IconName::AiZed,
-                                        |_, _, _| {},
-                                    ),
-                                    ToggleButtonWithIcon::new(
-                                        "Third",
-                                        IconName::AiZed,
-                                        |_, _, _| {},
-                                    ),
-                                ],
-                            )
-                            .selected_index(1)
-                            .into_any_element(),
-                        ),
-                        single_example(
-                            "Multiple Row Group",
-                            ToggleButtonGroup::two_rows(
-                                "multiple_row_test",
-                                [
-                                    ToggleButtonSimple::new("First", |_, _, _| {}),
-                                    ToggleButtonSimple::new("Second", |_, _, _| {}),
-                                    ToggleButtonSimple::new("Third", |_, _, _| {}),
-                                ],
-                                [
-                                    ToggleButtonSimple::new("Fourth", |_, _, _| {}),
-                                    ToggleButtonSimple::new("Fifth", |_, _, _| {}),
-                                    ToggleButtonSimple::new("Sixth", |_, _, _| {}),
-                                ],
-                            )
-                            .selected_index(3)
-                            .into_any_element(),
-                        ),
-                        single_example(
-                            "Multiple Row Group with Icons",
-                            ToggleButtonGroup::two_rows(
-                                "multiple_row_test_icons",
-                                [
-                                    ToggleButtonWithIcon::new(
-                                        "First",
-                                        IconName::AiZed,
-                                        |_, _, _| {},
-                                    ),
-                                    ToggleButtonWithIcon::new(
-                                        "Second",
-                                        IconName::AiZed,
-                                        |_, _, _| {},
-                                    ),
-                                    ToggleButtonWithIcon::new(
-                                        "Third",
-                                        IconName::AiZed,
-                                        |_, _, _| {},
-                                    ),
-                                ],
-                                [
-                                    ToggleButtonWithIcon::new(
-                                        "Fourth",
-                                        IconName::AiZed,
-                                        |_, _, _| {},
-                                    ),
-                                    ToggleButtonWithIcon::new(
-                                        "Fifth",
-                                        IconName::AiZed,
-                                        |_, _, _| {},
-                                    ),
-                                    ToggleButtonWithIcon::new(
-                                        "Sixth",
-                                        IconName::AiZed,
-                                        |_, _, _| {},
-                                    ),
-                                ],
-                            )
-                            .selected_index(3)
-                            .into_any_element(),
-                        ),
-                    ],
-                )])
-                .children(vec![example_group_with_title(
-                    "Outlined Variant",
-                    vec![
-                        single_example(
-                            "Single Row Group",
-                            ToggleButtonGroup::single_row(
-                                "single_row_test_outline",
-                                [
-                                    ToggleButtonSimple::new("First", |_, _, _| {}),
-                                    ToggleButtonSimple::new("Second", |_, _, _| {}),
-                                    ToggleButtonSimple::new("Third", |_, _, _| {}),
-                                ],
-                            )
-                            .selected_index(1)
-                            .style(ToggleButtonGroupStyle::Outlined)
-                            .into_any_element(),
-                        ),
-                        single_example(
-                            "Single Row Group with icons",
-                            ToggleButtonGroup::single_row(
-                                "single_row_test_icon_outlined",
-                                [
-                                    ToggleButtonWithIcon::new(
-                                        "First",
-                                        IconName::AiZed,
-                                        |_, _, _| {},
-                                    ),
-                                    ToggleButtonWithIcon::new(
-                                        "Second",
-                                        IconName::AiZed,
-                                        |_, _, _| {},
-                                    ),
-                                    ToggleButtonWithIcon::new(
-                                        "Third",
-                                        IconName::AiZed,
-                                        |_, _, _| {},
-                                    ),
-                                ],
-                            )
-                            .selected_index(1)
-                            .style(ToggleButtonGroupStyle::Outlined)
-                            .into_any_element(),
-                        ),
-                        single_example(
-                            "Multiple Row Group",
-                            ToggleButtonGroup::two_rows(
-                                "multiple_row_test",
-                                [
-                                    ToggleButtonSimple::new("First", |_, _, _| {}),
-                                    ToggleButtonSimple::new("Second", |_, _, _| {}),
-                                    ToggleButtonSimple::new("Third", |_, _, _| {}),
-                                ],
-                                [
-                                    ToggleButtonSimple::new("Fourth", |_, _, _| {}),
-                                    ToggleButtonSimple::new("Fifth", |_, _, _| {}),
-                                    ToggleButtonSimple::new("Sixth", |_, _, _| {}),
-                                ],
-                            )
-                            .selected_index(3)
-                            .style(ToggleButtonGroupStyle::Outlined)
-                            .into_any_element(),
-                        ),
-                        single_example(
-                            "Multiple Row Group with Icons",
-                            ToggleButtonGroup::two_rows(
-                                "multiple_row_test",
-                                [
-                                    ToggleButtonWithIcon::new(
-                                        "First",
-                                        IconName::AiZed,
-                                        |_, _, _| {},
-                                    ),
-                                    ToggleButtonWithIcon::new(
-                                        "Second",
-                                        IconName::AiZed,
-                                        |_, _, _| {},
-                                    ),
-                                    ToggleButtonWithIcon::new(
-                                        "Third",
-                                        IconName::AiZed,
-                                        |_, _, _| {},
-                                    ),
-                                ],
-                                [
-                                    ToggleButtonWithIcon::new(
-                                        "Fourth",
-                                        IconName::AiZed,
-                                        |_, _, _| {},
-                                    ),
-                                    ToggleButtonWithIcon::new(
-                                        "Fifth",
-                                        IconName::AiZed,
-                                        |_, _, _| {},
-                                    ),
-                                    ToggleButtonWithIcon::new(
-                                        "Sixth",
-                                        IconName::AiZed,
-                                        |_, _, _| {},
-                                    ),
-                                ],
-                            )
-                            .selected_index(3)
-                            .style(ToggleButtonGroupStyle::Outlined)
-                            .into_any_element(),
-                        ),
-                    ],
-                )])
-                .children(vec![example_group_with_title(
-                    "Filled Variant",
-                    vec![
-                        single_example(
-                            "Single Row Group",
-                            ToggleButtonGroup::single_row(
-                                "single_row_test_outline",
-                                [
-                                    ToggleButtonSimple::new("First", |_, _, _| {}),
-                                    ToggleButtonSimple::new("Second", |_, _, _| {}),
-                                    ToggleButtonSimple::new("Third", |_, _, _| {}),
-                                ],
-                            )
-                            .selected_index(2)
-                            .style(ToggleButtonGroupStyle::Filled)
-                            .into_any_element(),
-                        ),
-                        single_example(
-                            "Single Row Group with icons",
-                            ToggleButtonGroup::single_row(
-                                "single_row_test_icon_outlined",
-                                [
-                                    ToggleButtonWithIcon::new(
-                                        "First",
-                                        IconName::AiZed,
-                                        |_, _, _| {},
-                                    ),
-                                    ToggleButtonWithIcon::new(
-                                        "Second",
-                                        IconName::AiZed,
-                                        |_, _, _| {},
-                                    ),
-                                    ToggleButtonWithIcon::new(
-                                        "Third",
-                                        IconName::AiZed,
-                                        |_, _, _| {},
-                                    ),
-                                ],
-                            )
-                            .selected_index(1)
-                            .style(ToggleButtonGroupStyle::Filled)
-                            .into_any_element(),
-                        ),
-                        single_example(
-                            "Multiple Row Group",
-                            ToggleButtonGroup::two_rows(
-                                "multiple_row_test",
-                                [
-                                    ToggleButtonSimple::new("First", |_, _, _| {}),
-                                    ToggleButtonSimple::new("Second", |_, _, _| {}),
-                                    ToggleButtonSimple::new("Third", |_, _, _| {}),
-                                ],
-                                [
-                                    ToggleButtonSimple::new("Fourth", |_, _, _| {}),
-                                    ToggleButtonSimple::new("Fifth", |_, _, _| {}),
-                                    ToggleButtonSimple::new("Sixth", |_, _, _| {}),
-                                ],
-                            )
-                            .selected_index(3)
-                            .width(rems_from_px(100.))
-                            .style(ToggleButtonGroupStyle::Filled)
-                            .into_any_element(),
-                        ),
-                        single_example(
-                            "Multiple Row Group with Icons",
-                            ToggleButtonGroup::two_rows(
-                                "multiple_row_test",
-                                [
-                                    ToggleButtonWithIcon::new(
-                                        "First",
-                                        IconName::AiZed,
-                                        |_, _, _| {},
-                                    ),
-                                    ToggleButtonWithIcon::new(
-                                        "Second",
-                                        IconName::AiZed,
-                                        |_, _, _| {},
-                                    ),
-                                    ToggleButtonWithIcon::new(
-                                        "Third",
-                                        IconName::AiZed,
-                                        |_, _, _| {},
-                                    ),
-                                ],
-                                [
-                                    ToggleButtonWithIcon::new(
-                                        "Fourth",
-                                        IconName::AiZed,
-                                        |_, _, _| {},
-                                    ),
-                                    ToggleButtonWithIcon::new(
-                                        "Fifth",
-                                        IconName::AiZed,
-                                        |_, _, _| {},
-                                    ),
-                                    ToggleButtonWithIcon::new(
-                                        "Sixth",
-                                        IconName::AiZed,
-                                        |_, _, _| {},
-                                    ),
-                                ],
-                            )
-                            .selected_index(3)
-                            .width(rems_from_px(100.))
-                            .style(ToggleButtonGroupStyle::Filled)
-                            .into_any_element(),
-                        ),
-                    ],
-                )])
-                .children(vec![single_example(
-                    "With Tooltips",
-                    ToggleButtonGroup::single_row(
-                        "with_tooltips",
-                        [
-                            ToggleButtonSimple::new("First", |_, _, _| {})
-                                .tooltip(Tooltip::text("This is a tooltip. Hello!")),
-                            ToggleButtonSimple::new("Second", |_, _, _| {})
-                                .tooltip(Tooltip::text("This is a tooltip. Hey?")),
-                            ToggleButtonSimple::new("Third", |_, _, _| {})
-                                .tooltip(Tooltip::text("This is a tooltip. Get out of here now!")),
-                        ],
-                    )
-                    .selected_index(1)
-                    .into_any_element(),
-                )])
-                .into_any_element(),
-        )
-    }
-}
diff --git a/crates/ui/src/components/callout.rs b/crates/ui/src/components/callout.rs
deleted file mode 100644
index 4eb849d7f6..0000000000
--- a/crates/ui/src/components/callout.rs
+++ /dev/null
@@ -1,327 +0,0 @@
-use gpui::AnyElement;
-
-use crate::prelude::*;
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum BorderPosition {
-    Top,
-    Bottom,
-}
-
-/// A callout component for displaying important information that requires user attention.
-///
-/// # Usage Example
-///
-/// ```
-/// use ui::prelude::*;
-/// use ui::{Button, Callout, IconName, Label, Severity};
-///
-/// let callout = Callout::new()
-///     .severity(Severity::Warning)
-///     .icon(IconName::Warning)
-///     .title("Be aware of your subscription!")
-///     .description("Your subscription is about to expire. Renew now!")
-///     .actions_slot(Button::new("renew", "Renew Now"));
-/// ```
-///
-#[derive(IntoElement, RegisterComponent)]
-pub struct Callout {
-    severity: Severity,
-    icon: Option<IconName>,
-    title: Option<SharedString>,
-    description: Option<SharedString>,
-    description_slot: Option<AnyElement>,
-    actions_slot: Option<AnyElement>,
-    dismiss_action: Option<AnyElement>,
-    line_height: Option<Pixels>,
-    border_position: BorderPosition,
-}
-
-impl Callout {
-    /// Creates a new `Callout` component with default styling.
-    pub fn new() -> Self {
-        Self {
-            severity: Severity::Info,
-            icon: None,
-            title: None,
-            description: None,
-            description_slot: None,
-            actions_slot: None,
-            dismiss_action: None,
-            line_height: None,
-            border_position: BorderPosition::Top,
-        }
-    }
-
-    /// Sets the severity of the callout.
-    pub fn severity(mut self, severity: Severity) -> Self {
-        self.severity = severity;
-        self
-    }
-
-    /// Sets the icon to display in the callout.
-    pub fn icon(mut self, icon: IconName) -> Self {
-        self.icon = Some(icon);
-        self
-    }
-
-    /// Sets the title of the callout.
-    pub fn title(mut self, title: impl Into<SharedString>) -> Self {
-        self.title = Some(title.into());
-        self
-    }
-
-    /// Sets the description of the callout.
-    /// The description can be single or multi-line text.
-    pub fn description(mut self, description: impl Into<SharedString>) -> Self {
-        self.description = Some(description.into());
-        self
-    }
-
-    /// Allows for any element—like markdown elements—to fill the description slot of the callout.
-    /// This method wins over `description` if both happen to be set.
-    pub fn description_slot(mut self, description: impl IntoElement) -> Self {
-        self.description_slot = Some(description.into_any_element());
-        self
-    }
-
-    /// Sets the primary call-to-action button.
-    pub fn actions_slot(mut self, action: impl IntoElement) -> Self {
-        self.actions_slot = Some(action.into_any_element());
-        self
-    }
-
-    /// Sets an optional dismiss button, which is usually an icon button with a close icon.
-    /// This button is always rendered as the last one to the far right.
-    pub fn dismiss_action(mut self, action: impl IntoElement) -> Self {
-        self.dismiss_action = Some(action.into_any_element());
-        self
-    }
-
-    /// Sets a custom line height for the callout content.
-    pub fn line_height(mut self, line_height: Pixels) -> Self {
-        self.line_height = Some(line_height);
-        self
-    }
-
-    /// Sets the border position in the callout.
-    pub fn border_position(mut self, border_position: BorderPosition) -> Self {
-        self.border_position = border_position;
-        self
-    }
-}
-
-impl RenderOnce for Callout {
-    fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let line_height = self.line_height.unwrap_or(window.line_height());
-
-        let has_actions = self.actions_slot.is_some() || self.dismiss_action.is_some();
-
-        let (icon, icon_color, bg_color) = match self.severity {
-            Severity::Info => (
-                IconName::Info,
-                Color::Muted,
-                cx.theme().colors().panel_background.opacity(0.),
-            ),
-            Severity::Success => (
-                IconName::Check,
-                Color::Success,
-                cx.theme().status().success.opacity(0.1),
-            ),
-            Severity::Warning => (
-                IconName::Warning,
-                Color::Warning,
-                cx.theme().status().warning_background.opacity(0.2),
-            ),
-            Severity::Error => (
-                IconName::XCircle,
-                Color::Error,
-                cx.theme().status().error.opacity(0.08),
-            ),
-        };
-
-        h_flex()
-            .min_w_0()
-            .w_full()
-            .p_2()
-            .gap_2()
-            .items_start()
-            .map(|this| match self.border_position {
-                BorderPosition::Top => this.border_t_1(),
-                BorderPosition::Bottom => this.border_b_1(),
-            })
-            .border_color(cx.theme().colors().border)
-            .bg(bg_color)
-            .overflow_x_hidden()
-            .when(self.icon.is_some(), |this| {
-                this.child(
-                    h_flex()
-                        .h(line_height)
-                        .justify_center()
-                        .child(Icon::new(icon).size(IconSize::Small).color(icon_color)),
-                )
-            })
-            .child(
-                v_flex()
-                    .min_w_0()
-                    .w_full()
-                    .child(
-                        h_flex()
-                            .min_h(line_height)
-                            .w_full()
-                            .gap_1()
-                            .justify_between()
-                            .flex_wrap()
-                            .when_some(self.title, |this, title| {
-                                this.child(h_flex().child(Label::new(title).size(LabelSize::Small)))
-                            })
-                            .when(has_actions, |this| {
-                                this.child(
-                                    h_flex()
-                                        .gap_0p5()
-                                        .when_some(self.actions_slot, |this, action| {
-                                            this.child(action)
-                                        })
-                                        .when_some(self.dismiss_action, |this, action| {
-                                            this.child(action)
-                                        }),
-                                )
-                            }),
-                    )
-                    .map(|this| {
-                        if let Some(description_slot) = self.description_slot {
-                            this.child(
-                                div()
-                                    .w_full()
-                                    .flex_1()
-                                    .text_ui_sm(cx)
-                                    .child(description_slot),
-                            )
-                        } else if let Some(description) = self.description {
-                            this.child(
-                                div()
-                                    .w_full()
-                                    .flex_1()
-                                    .text_ui_sm(cx)
-                                    .text_color(cx.theme().colors().text_muted)
-                                    .child(description),
-                            )
-                        } else {
-                            this
-                        }
-                    }),
-            )
-    }
-}
-
-impl Component for Callout {
-    fn scope() -> ComponentScope {
-        ComponentScope::DataDisplay
-    }
-
-    fn description() -> Option<&'static str> {
-        Some(
-            "Used to display a callout for situations where the user needs to know some information, and likely make a decision. This might be a thread running out of tokens, or running out of prompts on a plan and needing to upgrade.",
-        )
-    }
-
-    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
-        let single_action = || Button::new("got-it", "Got it").label_size(LabelSize::Small);
-        let multiple_actions = || {
-            h_flex()
-                .gap_0p5()
-                .child(Button::new("update", "Backup & Update").label_size(LabelSize::Small))
-                .child(Button::new("dismiss", "Dismiss").label_size(LabelSize::Small))
-        };
-
-        let basic_examples = vec![
-            single_example(
-                "Simple with Title Only",
-                Callout::new()
-                    .icon(IconName::Info)
-                    .title("System maintenance scheduled for tonight")
-                    .actions_slot(single_action())
-                    .into_any_element(),
-            )
-            .width(px(580.)),
-            single_example(
-                "With Title and Description",
-                Callout::new()
-                    .icon(IconName::Warning)
-                    .title("Your settings contain deprecated values")
-                    .description(
-                        "We'll backup your current settings and update them to the new format.",
-                    )
-                    .actions_slot(single_action())
-                    .into_any_element(),
-            )
-            .width(px(580.)),
-            single_example(
-                "Error with Multiple Actions",
-                Callout::new()
-                    .icon(IconName::Close)
-                    .title("Thread reached the token limit")
-                    .description("Start a new thread from a summary to continue the conversation.")
-                    .actions_slot(multiple_actions())
-                    .into_any_element(),
-            )
-            .width(px(580.)),
-            single_example(
-                "Multi-line Description",
-                Callout::new()
-                    .icon(IconName::Sparkle)
-                    .title("Upgrade to Pro")
-                    .description("• Unlimited threads\n• Priority support\n• Advanced analytics")
-                    .actions_slot(multiple_actions())
-                    .into_any_element(),
-            )
-            .width(px(580.)),
-        ];
-
-        let severity_examples = vec![
-            single_example(
-                "Info",
-                Callout::new()
-                    .icon(IconName::Info)
-                    .title("System maintenance scheduled for tonight")
-                    .actions_slot(single_action())
-                    .into_any_element(),
-            ),
-            single_example(
-                "Warning",
-                Callout::new()
-                    .severity(Severity::Warning)
-                    .icon(IconName::Triangle)
-                    .title("System maintenance scheduled for tonight")
-                    .actions_slot(single_action())
-                    .into_any_element(),
-            ),
-            single_example(
-                "Error",
-                Callout::new()
-                    .severity(Severity::Error)
-                    .icon(IconName::XCircle)
-                    .title("System maintenance scheduled for tonight")
-                    .actions_slot(single_action())
-                    .into_any_element(),
-            ),
-            single_example(
-                "Success",
-                Callout::new()
-                    .severity(Severity::Success)
-                    .icon(IconName::Check)
-                    .title("System maintenance scheduled for tonight")
-                    .actions_slot(single_action())
-                    .into_any_element(),
-            ),
-        ];
-
-        Some(
-            v_flex()
-                .gap_4()
-                .child(example_group(basic_examples).vertical())
-                .child(example_group_with_title("Severity", severity_examples).vertical())
-                .into_any_element(),
-        )
-    }
-}
diff --git a/crates/ui/src/components/chip.rs b/crates/ui/src/components/chip.rs
deleted file mode 100644
index 8d0000db94..0000000000
--- a/crates/ui/src/components/chip.rs
+++ /dev/null
@@ -1,106 +0,0 @@
-use crate::prelude::*;
-use gpui::{AnyElement, Hsla, IntoElement, ParentElement, Styled};
-
-/// Chips provide a container for an informative label.
-///
-/// # Usage Example
-///
-/// ```
-/// use ui::Chip;
-///
-/// let chip = Chip::new("This Chip");
-/// ```
-#[derive(IntoElement, RegisterComponent)]
-pub struct Chip {
-    label: SharedString,
-    label_color: Color,
-    label_size: LabelSize,
-    bg_color: Option<Hsla>,
-}
-
-impl Chip {
-    /// Creates a new `Chip` component with the specified label.
-    pub fn new(label: impl Into<SharedString>) -> Self {
-        Self {
-            label: label.into(),
-            label_color: Color::Default,
-            label_size: LabelSize::XSmall,
-            bg_color: None,
-        }
-    }
-
-    /// Sets the color of the label.
-    pub fn label_color(mut self, color: Color) -> Self {
-        self.label_color = color;
-        self
-    }
-
-    /// Sets the size of the label.
-    pub fn label_size(mut self, size: LabelSize) -> Self {
-        self.label_size = size;
-        self
-    }
-
-    /// Sets a custom background color for the callout content.
-    pub fn bg_color(mut self, color: Hsla) -> Self {
-        self.bg_color = Some(color);
-        self
-    }
-}
-
-impl RenderOnce for Chip {
-    fn render(self, _: &mut Window, cx: &mut App) -> impl IntoElement {
-        let bg_color = self
-            .bg_color
-            .unwrap_or(cx.theme().colors().element_background);
-
-        h_flex()
-            .min_w_0()
-            .flex_initial()
-            .px_1()
-            .border_1()
-            .rounded_sm()
-            .border_color(cx.theme().colors().border)
-            .bg(bg_color)
-            .overflow_hidden()
-            .child(
-                Label::new(self.label)
-                    .size(self.label_size)
-                    .color(self.label_color)
-                    .buffer_font(cx),
-            )
-    }
-}
-
-impl Component for Chip {
-    fn scope() -> ComponentScope {
-        ComponentScope::DataDisplay
-    }
-
-    fn preview(_window: &mut Window, cx: &mut App) -> Option<AnyElement> {
-        let chip_examples = vec![
-            single_example("Default", Chip::new("Chip Example").into_any_element()),
-            single_example(
-                "Customized Label Color",
-                Chip::new("Chip Example")
-                    .label_color(Color::Accent)
-                    .into_any_element(),
-            ),
-            single_example(
-                "Customized Label Size",
-                Chip::new("Chip Example")
-                    .label_size(LabelSize::Large)
-                    .label_color(Color::Accent)
-                    .into_any_element(),
-            ),
-            single_example(
-                "Customized Background Color",
-                Chip::new("Chip Example")
-                    .bg_color(cx.theme().colors().text_accent.opacity(0.1))
-                    .into_any_element(),
-            ),
-        ];
-
-        Some(example_group(chip_examples).vertical().into_any_element())
-    }
-}
diff --git a/crates/ui/src/components/content_group.rs b/crates/ui/src/components/content_group.rs
deleted file mode 100644
index f89d38d153..0000000000
--- a/crates/ui/src/components/content_group.rs
+++ /dev/null
@@ -1,137 +0,0 @@
-use crate::component_prelude::*;
-use crate::prelude::*;
-use gpui::{AnyElement, IntoElement, ParentElement, StyleRefinement, Styled};
-use smallvec::SmallVec;
-
-/// Creates a new [ContentGroup].
-pub fn content_group() -> ContentGroup {
-    ContentGroup::new()
-}
-
-/// A [ContentGroup] that vertically stacks its children.
-///
-/// This is a convenience function that simply combines [`ContentGroup`] and [`v_flex`](crate::v_flex).
-pub fn v_container() -> ContentGroup {
-    content_group().v_flex()
-}
-
-/// Creates a new horizontal [ContentGroup].
-///
-/// This is a convenience function that simply combines [`ContentGroup`] and [`h_flex`](crate::h_flex).
-pub fn h_container() -> ContentGroup {
-    content_group().h_flex()
-}
-
-/// A flexible container component that can hold other elements.
-#[derive(IntoElement, Documented, RegisterComponent)]
-pub struct ContentGroup {
-    base: Div,
-    border: bool,
-    fill: bool,
-    children: SmallVec<[AnyElement; 2]>,
-}
-
-impl ContentGroup {
-    /// Creates a new [`ContentGroup`].
-    pub fn new() -> Self {
-        Self {
-            base: div(),
-            border: true,
-            fill: true,
-            children: SmallVec::new(),
-        }
-    }
-
-    /// Removes the border from the [`ContentGroup`].
-    pub fn borderless(mut self) -> Self {
-        self.border = false;
-        self
-    }
-
-    /// Removes the background fill from the [`ContentGroup`].
-    pub fn unfilled(mut self) -> Self {
-        self.fill = false;
-        self
-    }
-}
-
-impl ParentElement for ContentGroup {
-    fn extend(&mut self, elements: impl IntoIterator<Item = AnyElement>) {
-        self.children.extend(elements)
-    }
-}
-
-impl Styled for ContentGroup {
-    fn style(&mut self) -> &mut StyleRefinement {
-        self.base.style()
-    }
-}
-
-impl RenderOnce for ContentGroup {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        // TODO:
-        // Baked in padding will make scrollable views inside of content boxes awkward.
-        //
-        // Do we make the padding optional, or do we push to use a different component?
-
-        self.base
-            .when(self.fill, |this| {
-                this.bg(cx.theme().colors().text.opacity(0.05))
-            })
-            .when(self.border, |this| {
-                this.border_1().border_color(cx.theme().colors().border)
-            })
-            .rounded_sm()
-            .children(self.children)
-    }
-}
-
-impl Component for ContentGroup {
-    fn scope() -> ComponentScope {
-        ComponentScope::Layout
-    }
-
-    fn description() -> Option<&'static str> {
-        Some(ContentGroup::DOCS)
-    }
-
-    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
-        Some(
-            example_group(vec![
-                single_example(
-                    "Default",
-                    ContentGroup::new()
-                        .flex_1()
-                        .items_center()
-                        .justify_center()
-                        .h_48()
-                        .child(Label::new("Default ContentGroup"))
-                        .into_any_element(),
-                ).description("A contained style for laying out groups of content. Has a default background and border color."),
-                single_example(
-                    "Without Border",
-                    ContentGroup::new()
-                        .flex_1()
-                        .items_center()
-                        .justify_center()
-                        .h_48()
-                        .borderless()
-                        .child(Label::new("Borderless ContentGroup"))
-                        .into_any_element(),
-                ),
-                single_example(
-                    "Without Fill",
-                    ContentGroup::new()
-                        .flex_1()
-                        .items_center()
-                        .justify_center()
-                        .h_48()
-                        .unfilled()
-                        .child(Label::new("Unfilled ContentGroup"))
-                        .into_any_element(),
-                ),
-            ])
-            .into_any_element(),
-        )
-    }
-}
diff --git a/crates/ui/src/components/context_menu.rs b/crates/ui/src/components/context_menu.rs
deleted file mode 100644
index a4bae64740..0000000000
--- a/crates/ui/src/components/context_menu.rs
+++ /dev/null
@@ -1,1392 +0,0 @@
-use crate::{
-    Icon, IconButtonShape, IconName, IconSize, KeyBinding, Label, List, ListItem, ListSeparator,
-    ListSubHeader, h_flex, prelude::*, utils::WithRemSize, v_flex,
-};
-use gpui::{
-    Action, AnyElement, App, AppContext as _, DismissEvent, Entity, EventEmitter, FocusHandle,
-    Focusable, IntoElement, Render, Subscription, px,
-};
-use menu::{SelectFirst, SelectLast, SelectNext, SelectPrevious};
-use settings::Settings;
-use std::{rc::Rc, time::Duration};
-use theme::ThemeSettings;
-
-use super::Tooltip;
-
-pub enum ContextMenuItem {
-    Separator,
-    Header(SharedString),
-    /// title, link_label, link_url
-    HeaderWithLink(SharedString, SharedString, SharedString), // This could be folded into header
-    Label(SharedString),
-    Entry(ContextMenuEntry),
-    CustomEntry {
-        entry_render: Box<dyn Fn(&mut Window, &mut App) -> AnyElement>,
-        handler: Rc<dyn Fn(Option<&FocusHandle>, &mut Window, &mut App)>,
-        selectable: bool,
-        documentation_aside: Option<DocumentationAside>,
-    },
-}
-
-impl ContextMenuItem {
-    pub fn custom_entry(
-        entry_render: impl Fn(&mut Window, &mut App) -> AnyElement + 'static,
-        handler: impl Fn(&mut Window, &mut App) + 'static,
-        documentation_aside: Option<DocumentationAside>,
-    ) -> Self {
-        Self::CustomEntry {
-            entry_render: Box::new(entry_render),
-            handler: Rc::new(move |_, window, cx| handler(window, cx)),
-            selectable: true,
-            documentation_aside,
-        }
-    }
-}
-
-pub struct ContextMenuEntry {
-    toggle: Option<(IconPosition, bool)>,
-    label: SharedString,
-    icon: Option<IconName>,
-    custom_icon_path: Option<SharedString>,
-    custom_icon_svg: Option<SharedString>,
-    icon_position: IconPosition,
-    icon_size: IconSize,
-    icon_color: Option<Color>,
-    handler: Rc<dyn Fn(Option<&FocusHandle>, &mut Window, &mut App)>,
-    action: Option<Box<dyn Action>>,
-    disabled: bool,
-    documentation_aside: Option<DocumentationAside>,
-    end_slot_icon: Option<IconName>,
-    end_slot_title: Option<SharedString>,
-    end_slot_handler: Option<Rc<dyn Fn(Option<&FocusHandle>, &mut Window, &mut App)>>,
-    show_end_slot_on_hover: bool,
-}
-
-impl ContextMenuEntry {
-    pub fn new(label: impl Into<SharedString>) -> Self {
-        ContextMenuEntry {
-            toggle: None,
-            label: label.into(),
-            icon: None,
-            custom_icon_path: None,
-            custom_icon_svg: None,
-            icon_position: IconPosition::Start,
-            icon_size: IconSize::Small,
-            icon_color: None,
-            handler: Rc::new(|_, _, _| {}),
-            action: None,
-            disabled: false,
-            documentation_aside: None,
-            end_slot_icon: None,
-            end_slot_title: None,
-            end_slot_handler: None,
-            show_end_slot_on_hover: false,
-        }
-    }
-
-    pub fn toggleable(mut self, toggle_position: IconPosition, toggled: bool) -> Self {
-        self.toggle = Some((toggle_position, toggled));
-        self
-    }
-
-    pub fn icon(mut self, icon: IconName) -> Self {
-        self.icon = Some(icon);
-        self
-    }
-
-    pub fn custom_icon_path(mut self, path: impl Into<SharedString>) -> Self {
-        self.custom_icon_path = Some(path.into());
-        self.custom_icon_svg = None; // Clear other icon sources if custom path is set
-        self.icon = None;
-        self
-    }
-
-    pub fn custom_icon_svg(mut self, svg: impl Into<SharedString>) -> Self {
-        self.custom_icon_svg = Some(svg.into());
-        self.custom_icon_path = None; // Clear other icon sources if custom path is set
-        self.icon = None;
-        self
-    }
-
-    pub fn icon_position(mut self, position: IconPosition) -> Self {
-        self.icon_position = position;
-        self
-    }
-
-    pub fn icon_size(mut self, icon_size: IconSize) -> Self {
-        self.icon_size = icon_size;
-        self
-    }
-
-    pub fn icon_color(mut self, icon_color: Color) -> Self {
-        self.icon_color = Some(icon_color);
-        self
-    }
-
-    pub fn toggle(mut self, toggle_position: IconPosition, toggled: bool) -> Self {
-        self.toggle = Some((toggle_position, toggled));
-        self
-    }
-
-    pub fn action(mut self, action: Box<dyn Action>) -> Self {
-        self.action = Some(action);
-        self
-    }
-
-    pub fn handler(mut self, handler: impl Fn(&mut Window, &mut App) + 'static) -> Self {
-        self.handler = Rc::new(move |_, window, cx| handler(window, cx));
-        self
-    }
-
-    pub fn disabled(mut self, disabled: bool) -> Self {
-        self.disabled = disabled;
-        self
-    }
-
-    pub fn documentation_aside(
-        mut self,
-        side: DocumentationSide,
-        edge: DocumentationEdge,
-        render: impl Fn(&mut App) -> AnyElement + 'static,
-    ) -> Self {
-        self.documentation_aside = Some(DocumentationAside {
-            side,
-            edge,
-            render: Rc::new(render),
-        });
-
-        self
-    }
-}
-
-impl FluentBuilder for ContextMenuEntry {}
-
-impl From<ContextMenuEntry> for ContextMenuItem {
-    fn from(entry: ContextMenuEntry) -> Self {
-        ContextMenuItem::Entry(entry)
-    }
-}
-
-pub struct ContextMenu {
-    builder: Option<Rc<dyn Fn(Self, &mut Window, &mut Context<Self>) -> Self>>,
-    items: Vec<ContextMenuItem>,
-    focus_handle: FocusHandle,
-    action_context: Option<FocusHandle>,
-    selected_index: Option<usize>,
-    delayed: bool,
-    clicked: bool,
-    end_slot_action: Option<Box<dyn Action>>,
-    key_context: SharedString,
-    _on_blur_subscription: Subscription,
-    keep_open_on_confirm: bool,
-    documentation_aside: Option<(usize, DocumentationAside)>,
-    fixed_width: Option<DefiniteLength>,
-}
-
-#[derive(Copy, Clone, PartialEq, Eq)]
-pub enum DocumentationSide {
-    Left,
-    Right,
-}
-
-#[derive(Copy, Default, Clone, PartialEq, Eq)]
-pub enum DocumentationEdge {
-    #[default]
-    Top,
-    Bottom,
-}
-
-#[derive(Clone)]
-pub struct DocumentationAside {
-    pub side: DocumentationSide,
-    pub edge: DocumentationEdge,
-    pub render: Rc<dyn Fn(&mut App) -> AnyElement>,
-}
-
-impl DocumentationAside {
-    pub fn new(
-        side: DocumentationSide,
-        edge: DocumentationEdge,
-        render: Rc<dyn Fn(&mut App) -> AnyElement>,
-    ) -> Self {
-        Self { side, edge, render }
-    }
-}
-
-impl Focusable for ContextMenu {
-    fn focus_handle(&self, _cx: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl EventEmitter<DismissEvent> for ContextMenu {}
-
-impl FluentBuilder for ContextMenu {}
-
-impl ContextMenu {
-    pub fn new(
-        window: &mut Window,
-        cx: &mut Context<Self>,
-        f: impl FnOnce(Self, &mut Window, &mut Context<Self>) -> Self,
-    ) -> Self {
-        let focus_handle = cx.focus_handle();
-        let _on_blur_subscription = cx.on_blur(
-            &focus_handle,
-            window,
-            |this: &mut ContextMenu, window, cx| this.cancel(&menu::Cancel, window, cx),
-        );
-        window.refresh();
-
-        f(
-            Self {
-                builder: None,
-                items: Default::default(),
-                focus_handle,
-                action_context: None,
-                selected_index: None,
-                delayed: false,
-                clicked: false,
-                key_context: "menu".into(),
-                _on_blur_subscription,
-                keep_open_on_confirm: false,
-                documentation_aside: None,
-                fixed_width: None,
-                end_slot_action: None,
-            },
-            window,
-            cx,
-        )
-    }
-
-    pub fn build(
-        window: &mut Window,
-        cx: &mut App,
-        f: impl FnOnce(Self, &mut Window, &mut Context<Self>) -> Self,
-    ) -> Entity<Self> {
-        cx.new(|cx| Self::new(window, cx, f))
-    }
-
-    /// Builds a [`ContextMenu`] that will stay open when making changes instead of closing after each confirmation.
-    ///
-    /// The main difference from [`ContextMenu::build`] is the type of the `builder`, as we need to be able to hold onto
-    /// it to call it again.
-    pub fn build_persistent(
-        window: &mut Window,
-        cx: &mut App,
-        builder: impl Fn(Self, &mut Window, &mut Context<Self>) -> Self + 'static,
-    ) -> Entity<Self> {
-        cx.new(|cx| {
-            let builder = Rc::new(builder);
-
-            let focus_handle = cx.focus_handle();
-            let _on_blur_subscription = cx.on_blur(
-                &focus_handle,
-                window,
-                |this: &mut ContextMenu, window, cx| this.cancel(&menu::Cancel, window, cx),
-            );
-            window.refresh();
-
-            (builder.clone())(
-                Self {
-                    builder: Some(builder),
-                    items: Default::default(),
-                    focus_handle,
-                    action_context: None,
-                    selected_index: None,
-                    delayed: false,
-                    clicked: false,
-                    key_context: "menu".into(),
-                    _on_blur_subscription,
-                    keep_open_on_confirm: true,
-                    documentation_aside: None,
-                    fixed_width: None,
-                    end_slot_action: None,
-                },
-                window,
-                cx,
-            )
-        })
-    }
-
-    /// Rebuilds the menu.
-    ///
-    /// This is used to refresh the menu entries when entries are toggled when the menu is configured with
-    /// `keep_open_on_confirm = true`.
-    ///
-    /// This only works if the [`ContextMenu`] was constructed using [`ContextMenu::build_persistent`]. Otherwise it is
-    /// a no-op.
-    pub fn rebuild(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let Some(builder) = self.builder.clone() else {
-            return;
-        };
-
-        // The way we rebuild the menu is a bit of a hack.
-        let focus_handle = cx.focus_handle();
-        let new_menu = (builder.clone())(
-            Self {
-                builder: Some(builder),
-                items: Default::default(),
-                focus_handle: focus_handle.clone(),
-                action_context: None,
-                selected_index: None,
-                delayed: false,
-                clicked: false,
-                key_context: "menu".into(),
-                _on_blur_subscription: cx.on_blur(
-                    &focus_handle,
-                    window,
-                    |this: &mut ContextMenu, window, cx| this.cancel(&menu::Cancel, window, cx),
-                ),
-                keep_open_on_confirm: false,
-                documentation_aside: None,
-                fixed_width: None,
-                end_slot_action: None,
-            },
-            window,
-            cx,
-        );
-
-        self.items = new_menu.items;
-
-        cx.notify();
-    }
-
-    pub fn context(mut self, focus: FocusHandle) -> Self {
-        self.action_context = Some(focus);
-        self
-    }
-
-    pub fn header(mut self, title: impl Into<SharedString>) -> Self {
-        self.items.push(ContextMenuItem::Header(title.into()));
-        self
-    }
-
-    pub fn header_with_link(
-        mut self,
-        title: impl Into<SharedString>,
-        link_label: impl Into<SharedString>,
-        link_url: impl Into<SharedString>,
-    ) -> Self {
-        self.items.push(ContextMenuItem::HeaderWithLink(
-            title.into(),
-            link_label.into(),
-            link_url.into(),
-        ));
-        self
-    }
-
-    pub fn separator(mut self) -> Self {
-        self.items.push(ContextMenuItem::Separator);
-        self
-    }
-
-    pub fn extend<I: Into<ContextMenuItem>>(mut self, items: impl IntoIterator<Item = I>) -> Self {
-        self.items.extend(items.into_iter().map(Into::into));
-        self
-    }
-
-    pub fn item(mut self, item: impl Into<ContextMenuItem>) -> Self {
-        self.items.push(item.into());
-        self
-    }
-
-    pub fn push_item(&mut self, item: impl Into<ContextMenuItem>) {
-        self.items.push(item.into());
-    }
-
-    pub fn entry(
-        mut self,
-        label: impl Into<SharedString>,
-        action: Option<Box<dyn Action>>,
-        handler: impl Fn(&mut Window, &mut App) + 'static,
-    ) -> Self {
-        self.items.push(ContextMenuItem::Entry(ContextMenuEntry {
-            toggle: None,
-            label: label.into(),
-            handler: Rc::new(move |_, window, cx| handler(window, cx)),
-            icon: None,
-            custom_icon_path: None,
-            custom_icon_svg: None,
-            icon_position: IconPosition::End,
-            icon_size: IconSize::Small,
-            icon_color: None,
-            action,
-            disabled: false,
-            documentation_aside: None,
-            end_slot_icon: None,
-            end_slot_title: None,
-            end_slot_handler: None,
-            show_end_slot_on_hover: false,
-        }));
-        self
-    }
-
-    pub fn entry_with_end_slot(
-        mut self,
-        label: impl Into<SharedString>,
-        action: Option<Box<dyn Action>>,
-        handler: impl Fn(&mut Window, &mut App) + 'static,
-        end_slot_icon: IconName,
-        end_slot_title: SharedString,
-        end_slot_handler: impl Fn(&mut Window, &mut App) + 'static,
-    ) -> Self {
-        self.items.push(ContextMenuItem::Entry(ContextMenuEntry {
-            toggle: None,
-            label: label.into(),
-            handler: Rc::new(move |_, window, cx| handler(window, cx)),
-            icon: None,
-            custom_icon_path: None,
-            custom_icon_svg: None,
-            icon_position: IconPosition::End,
-            icon_size: IconSize::Small,
-            icon_color: None,
-            action,
-            disabled: false,
-            documentation_aside: None,
-            end_slot_icon: Some(end_slot_icon),
-            end_slot_title: Some(end_slot_title),
-            end_slot_handler: Some(Rc::new(move |_, window, cx| end_slot_handler(window, cx))),
-            show_end_slot_on_hover: false,
-        }));
-        self
-    }
-
-    pub fn entry_with_end_slot_on_hover(
-        mut self,
-        label: impl Into<SharedString>,
-        action: Option<Box<dyn Action>>,
-        handler: impl Fn(&mut Window, &mut App) + 'static,
-        end_slot_icon: IconName,
-        end_slot_title: SharedString,
-        end_slot_handler: impl Fn(&mut Window, &mut App) + 'static,
-    ) -> Self {
-        self.items.push(ContextMenuItem::Entry(ContextMenuEntry {
-            toggle: None,
-            label: label.into(),
-            handler: Rc::new(move |_, window, cx| handler(window, cx)),
-            icon: None,
-            custom_icon_path: None,
-            custom_icon_svg: None,
-            icon_position: IconPosition::End,
-            icon_size: IconSize::Small,
-            icon_color: None,
-            action,
-            disabled: false,
-            documentation_aside: None,
-            end_slot_icon: Some(end_slot_icon),
-            end_slot_title: Some(end_slot_title),
-            end_slot_handler: Some(Rc::new(move |_, window, cx| end_slot_handler(window, cx))),
-            show_end_slot_on_hover: true,
-        }));
-        self
-    }
-
-    pub fn toggleable_entry(
-        mut self,
-        label: impl Into<SharedString>,
-        toggled: bool,
-        position: IconPosition,
-        action: Option<Box<dyn Action>>,
-        handler: impl Fn(&mut Window, &mut App) + 'static,
-    ) -> Self {
-        self.items.push(ContextMenuItem::Entry(ContextMenuEntry {
-            toggle: Some((position, toggled)),
-            label: label.into(),
-            handler: Rc::new(move |_, window, cx| handler(window, cx)),
-            icon: None,
-            custom_icon_path: None,
-            custom_icon_svg: None,
-            icon_position: position,
-            icon_size: IconSize::Small,
-            icon_color: None,
-            action,
-            disabled: false,
-            documentation_aside: None,
-            end_slot_icon: None,
-            end_slot_title: None,
-            end_slot_handler: None,
-            show_end_slot_on_hover: false,
-        }));
-        self
-    }
-
-    pub fn custom_row(
-        mut self,
-        entry_render: impl Fn(&mut Window, &mut App) -> AnyElement + 'static,
-    ) -> Self {
-        self.items.push(ContextMenuItem::CustomEntry {
-            entry_render: Box::new(entry_render),
-            handler: Rc::new(|_, _, _| {}),
-            selectable: false,
-            documentation_aside: None,
-        });
-        self
-    }
-
-    pub fn custom_entry(
-        mut self,
-        entry_render: impl Fn(&mut Window, &mut App) -> AnyElement + 'static,
-        handler: impl Fn(&mut Window, &mut App) + 'static,
-    ) -> Self {
-        self.items.push(ContextMenuItem::CustomEntry {
-            entry_render: Box::new(entry_render),
-            handler: Rc::new(move |_, window, cx| handler(window, cx)),
-            selectable: true,
-            documentation_aside: None,
-        });
-        self
-    }
-
-    pub fn label(mut self, label: impl Into<SharedString>) -> Self {
-        self.items.push(ContextMenuItem::Label(label.into()));
-        self
-    }
-
-    pub fn action(self, label: impl Into<SharedString>, action: Box<dyn Action>) -> Self {
-        self.action_checked(label, action, false)
-    }
-
-    pub fn action_checked(
-        mut self,
-        label: impl Into<SharedString>,
-        action: Box<dyn Action>,
-        checked: bool,
-    ) -> Self {
-        self.items.push(ContextMenuItem::Entry(ContextMenuEntry {
-            toggle: if checked {
-                Some((IconPosition::Start, true))
-            } else {
-                None
-            },
-            label: label.into(),
-            action: Some(action.boxed_clone()),
-            handler: Rc::new(move |context, window, cx| {
-                if let Some(context) = &context {
-                    window.focus(context);
-                }
-                window.dispatch_action(action.boxed_clone(), cx);
-            }),
-            icon: None,
-            custom_icon_path: None,
-            custom_icon_svg: None,
-            icon_position: IconPosition::End,
-            icon_size: IconSize::Small,
-            icon_color: None,
-            disabled: false,
-            documentation_aside: None,
-            end_slot_icon: None,
-            end_slot_title: None,
-            end_slot_handler: None,
-            show_end_slot_on_hover: false,
-        }));
-        self
-    }
-
-    pub fn action_disabled_when(
-        mut self,
-        disabled: bool,
-        label: impl Into<SharedString>,
-        action: Box<dyn Action>,
-    ) -> Self {
-        self.items.push(ContextMenuItem::Entry(ContextMenuEntry {
-            toggle: None,
-            label: label.into(),
-            action: Some(action.boxed_clone()),
-            handler: Rc::new(move |context, window, cx| {
-                if let Some(context) = &context {
-                    window.focus(context);
-                }
-                window.dispatch_action(action.boxed_clone(), cx);
-            }),
-            icon: None,
-            custom_icon_path: None,
-            custom_icon_svg: None,
-            icon_size: IconSize::Small,
-            icon_position: IconPosition::End,
-            icon_color: None,
-            disabled,
-            documentation_aside: None,
-            end_slot_icon: None,
-            end_slot_title: None,
-            end_slot_handler: None,
-            show_end_slot_on_hover: false,
-        }));
-        self
-    }
-
-    pub fn link(mut self, label: impl Into<SharedString>, action: Box<dyn Action>) -> Self {
-        self.items.push(ContextMenuItem::Entry(ContextMenuEntry {
-            toggle: None,
-            label: label.into(),
-            action: Some(action.boxed_clone()),
-            handler: Rc::new(move |_, window, cx| window.dispatch_action(action.boxed_clone(), cx)),
-            icon: Some(IconName::ArrowUpRight),
-            custom_icon_path: None,
-            custom_icon_svg: None,
-            icon_size: IconSize::XSmall,
-            icon_position: IconPosition::End,
-            icon_color: None,
-            disabled: false,
-            documentation_aside: None,
-            end_slot_icon: None,
-            end_slot_title: None,
-            end_slot_handler: None,
-            show_end_slot_on_hover: false,
-        }));
-        self
-    }
-
-    pub fn keep_open_on_confirm(mut self, keep_open: bool) -> Self {
-        self.keep_open_on_confirm = keep_open;
-        self
-    }
-
-    pub fn trigger_end_slot_handler(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let Some(entry) = self.selected_index.and_then(|ix| self.items.get(ix)) else {
-            return;
-        };
-        let ContextMenuItem::Entry(entry) = entry else {
-            return;
-        };
-        let Some(handler) = entry.end_slot_handler.as_ref() else {
-            return;
-        };
-        handler(None, window, cx);
-    }
-
-    pub fn fixed_width(mut self, width: DefiniteLength) -> Self {
-        self.fixed_width = Some(width);
-        self
-    }
-
-    pub fn end_slot_action(mut self, action: Box<dyn Action>) -> Self {
-        self.end_slot_action = Some(action);
-        self
-    }
-
-    pub fn key_context(mut self, context: impl Into<SharedString>) -> Self {
-        self.key_context = context.into();
-        self
-    }
-
-    pub fn confirm(&mut self, _: &menu::Confirm, window: &mut Window, cx: &mut Context<Self>) {
-        let context = self.action_context.as_ref();
-        if let Some(
-            ContextMenuItem::Entry(ContextMenuEntry {
-                handler,
-                disabled: false,
-                ..
-            })
-            | ContextMenuItem::CustomEntry { handler, .. },
-        ) = self.selected_index.and_then(|ix| self.items.get(ix))
-        {
-            (handler)(context, window, cx)
-        }
-
-        if self.keep_open_on_confirm {
-            self.rebuild(window, cx);
-        } else {
-            cx.emit(DismissEvent);
-        }
-    }
-
-    pub fn cancel(&mut self, _: &menu::Cancel, _: &mut Window, cx: &mut Context<Self>) {
-        cx.emit(DismissEvent);
-        cx.emit(DismissEvent);
-    }
-
-    pub fn end_slot(&mut self, _: &dyn Action, window: &mut Window, cx: &mut Context<Self>) {
-        let Some(item) = self.selected_index.and_then(|ix| self.items.get(ix)) else {
-            return;
-        };
-        let ContextMenuItem::Entry(entry) = item else {
-            return;
-        };
-        let Some(handler) = entry.end_slot_handler.as_ref() else {
-            return;
-        };
-        handler(None, window, cx);
-        self.rebuild(window, cx);
-        cx.notify();
-    }
-
-    pub fn clear_selected(&mut self) {
-        self.selected_index = None;
-    }
-
-    pub fn select_first(&mut self, _: &SelectFirst, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(ix) = self.items.iter().position(|item| item.is_selectable()) {
-            self.select_index(ix, window, cx);
-        }
-        cx.notify();
-    }
-
-    pub fn select_last(&mut self, window: &mut Window, cx: &mut Context<Self>) -> Option<usize> {
-        for (ix, item) in self.items.iter().enumerate().rev() {
-            if item.is_selectable() {
-                return self.select_index(ix, window, cx);
-            }
-        }
-        None
-    }
-
-    fn handle_select_last(&mut self, _: &SelectLast, window: &mut Window, cx: &mut Context<Self>) {
-        if self.select_last(window, cx).is_some() {
-            cx.notify();
-        }
-    }
-
-    pub fn select_next(&mut self, _: &SelectNext, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(ix) = self.selected_index {
-            let next_index = ix + 1;
-            if self.items.len() <= next_index {
-                self.select_first(&SelectFirst, window, cx);
-                return;
-            } else {
-                for (ix, item) in self.items.iter().enumerate().skip(next_index) {
-                    if item.is_selectable() {
-                        self.select_index(ix, window, cx);
-                        cx.notify();
-                        return;
-                    }
-                }
-            }
-        }
-        self.select_first(&SelectFirst, window, cx);
-    }
-
-    pub fn select_previous(
-        &mut self,
-        _: &SelectPrevious,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(ix) = self.selected_index {
-            for (ix, item) in self.items.iter().enumerate().take(ix).rev() {
-                if item.is_selectable() {
-                    self.select_index(ix, window, cx);
-                    cx.notify();
-                    return;
-                }
-            }
-        }
-        self.handle_select_last(&SelectLast, window, cx);
-    }
-
-    fn select_index(
-        &mut self,
-        ix: usize,
-        _window: &mut Window,
-        _cx: &mut Context<Self>,
-    ) -> Option<usize> {
-        self.documentation_aside = None;
-        let item = self.items.get(ix)?;
-        if item.is_selectable() {
-            self.selected_index = Some(ix);
-            match item {
-                ContextMenuItem::Entry(entry) => {
-                    if let Some(callback) = &entry.documentation_aside {
-                        self.documentation_aside = Some((ix, callback.clone()));
-                    }
-                }
-                ContextMenuItem::CustomEntry {
-                    documentation_aside: Some(callback),
-                    ..
-                } => {
-                    self.documentation_aside = Some((ix, callback.clone()));
-                }
-                _ => (),
-            }
-        }
-        Some(ix)
-    }
-
-    pub fn on_action_dispatch(
-        &mut self,
-        dispatched: &dyn Action,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.clicked {
-            cx.propagate();
-            return;
-        }
-
-        if let Some(ix) = self.items.iter().position(|item| {
-            if let ContextMenuItem::Entry(ContextMenuEntry {
-                action: Some(action),
-                disabled: false,
-                ..
-            }) = item
-            {
-                action.partial_eq(dispatched)
-            } else {
-                false
-            }
-        }) {
-            self.select_index(ix, window, cx);
-            self.delayed = true;
-            cx.notify();
-            let action = dispatched.boxed_clone();
-            cx.spawn_in(window, async move |this, cx| {
-                cx.background_executor()
-                    .timer(Duration::from_millis(50))
-                    .await;
-                cx.update(|window, cx| {
-                    this.update(cx, |this, cx| {
-                        this.cancel(&menu::Cancel, window, cx);
-                        window.dispatch_action(action, cx);
-                    })
-                })
-            })
-            .detach_and_log_err(cx);
-        } else {
-            cx.propagate()
-        }
-    }
-
-    pub fn on_blur_subscription(mut self, new_subscription: Subscription) -> Self {
-        self._on_blur_subscription = new_subscription;
-        self
-    }
-
-    fn render_menu_item(
-        &self,
-        ix: usize,
-        item: &ContextMenuItem,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement + use<> {
-        match item {
-            ContextMenuItem::Separator => ListSeparator.into_any_element(),
-            ContextMenuItem::Header(header) => ListSubHeader::new(header.clone())
-                .inset(true)
-                .into_any_element(),
-            ContextMenuItem::HeaderWithLink(header, label, url) => {
-                let url = url.clone();
-                let link_id = ElementId::Name(format!("link-{}", url).into());
-                ListSubHeader::new(header.clone())
-                    .inset(true)
-                    .end_slot(
-                        Button::new(link_id, label.clone())
-                            .color(Color::Muted)
-                            .label_size(LabelSize::Small)
-                            .size(ButtonSize::None)
-                            .style(ButtonStyle::Transparent)
-                            .on_click(move |_, _, cx| {
-                                let url = url.clone();
-                                cx.open_url(&url);
-                            })
-                            .into_any_element(),
-                    )
-                    .into_any_element()
-            }
-            ContextMenuItem::Label(label) => ListItem::new(ix)
-                .inset(true)
-                .disabled(true)
-                .child(Label::new(label.clone()))
-                .into_any_element(),
-            ContextMenuItem::Entry(entry) => {
-                self.render_menu_entry(ix, entry, cx).into_any_element()
-            }
-            ContextMenuItem::CustomEntry {
-                entry_render,
-                handler,
-                selectable,
-                ..
-            } => {
-                let handler = handler.clone();
-                let menu = cx.entity().downgrade();
-                let selectable = *selectable;
-                ListItem::new(ix)
-                    .inset(true)
-                    .toggle_state(if selectable {
-                        Some(ix) == self.selected_index
-                    } else {
-                        false
-                    })
-                    .selectable(selectable)
-                    .when(selectable, |item| {
-                        item.on_click({
-                            let context = self.action_context.clone();
-                            let keep_open_on_confirm = self.keep_open_on_confirm;
-                            move |_, window, cx| {
-                                handler(context.as_ref(), window, cx);
-                                menu.update(cx, |menu, cx| {
-                                    menu.clicked = true;
-
-                                    if keep_open_on_confirm {
-                                        menu.rebuild(window, cx);
-                                    } else {
-                                        cx.emit(DismissEvent);
-                                    }
-                                })
-                                .ok();
-                            }
-                        })
-                    })
-                    .child(entry_render(window, cx))
-                    .into_any_element()
-            }
-        }
-    }
-
-    fn render_menu_entry(
-        &self,
-        ix: usize,
-        entry: &ContextMenuEntry,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let ContextMenuEntry {
-            toggle,
-            label,
-            handler,
-            icon,
-            custom_icon_path,
-            custom_icon_svg,
-            icon_position,
-            icon_size,
-            icon_color,
-            action,
-            disabled,
-            documentation_aside,
-            end_slot_icon,
-            end_slot_title,
-            end_slot_handler,
-            show_end_slot_on_hover,
-        } = entry;
-        let this = cx.weak_entity();
-
-        let handler = handler.clone();
-        let menu = cx.entity().downgrade();
-
-        let icon_color = if *disabled {
-            Color::Muted
-        } else if toggle.is_some() {
-            icon_color.unwrap_or(Color::Accent)
-        } else {
-            icon_color.unwrap_or(Color::Default)
-        };
-
-        let label_color = if *disabled {
-            Color::Disabled
-        } else {
-            Color::Default
-        };
-
-        let label_element = if let Some(custom_path) = custom_icon_path {
-            h_flex()
-                .gap_1p5()
-                .when(
-                    *icon_position == IconPosition::Start && toggle.is_none(),
-                    |flex| {
-                        flex.child(
-                            Icon::from_path(custom_path.clone())
-                                .size(*icon_size)
-                                .color(icon_color),
-                        )
-                    },
-                )
-                .child(Label::new(label.clone()).color(label_color).truncate())
-                .when(*icon_position == IconPosition::End, |flex| {
-                    flex.child(
-                        Icon::from_path(custom_path.clone())
-                            .size(*icon_size)
-                            .color(icon_color),
-                    )
-                })
-                .into_any_element()
-        } else if let Some(custom_icon_svg) = custom_icon_svg {
-            h_flex()
-                .gap_1p5()
-                .when(
-                    *icon_position == IconPosition::Start && toggle.is_none(),
-                    |flex| {
-                        flex.child(
-                            Icon::from_external_svg(custom_icon_svg.clone())
-                                .size(*icon_size)
-                                .color(icon_color),
-                        )
-                    },
-                )
-                .child(Label::new(label.clone()).color(label_color).truncate())
-                .when(*icon_position == IconPosition::End, |flex| {
-                    flex.child(
-                        Icon::from_external_svg(custom_icon_svg.clone())
-                            .size(*icon_size)
-                            .color(icon_color),
-                    )
-                })
-                .into_any_element()
-        } else if let Some(icon_name) = icon {
-            h_flex()
-                .gap_1p5()
-                .when(
-                    *icon_position == IconPosition::Start && toggle.is_none(),
-                    |flex| flex.child(Icon::new(*icon_name).size(*icon_size).color(icon_color)),
-                )
-                .child(Label::new(label.clone()).color(label_color).truncate())
-                .when(*icon_position == IconPosition::End, |flex| {
-                    flex.child(Icon::new(*icon_name).size(*icon_size).color(icon_color))
-                })
-                .into_any_element()
-        } else {
-            Label::new(label.clone())
-                .color(label_color)
-                .truncate()
-                .into_any_element()
-        };
-
-        div()
-            .id(("context-menu-child", ix))
-            .when_some(documentation_aside.clone(), |this, documentation_aside| {
-                this.occlude()
-                    .on_hover(cx.listener(move |menu, hovered, _, cx| {
-                        if *hovered {
-                            menu.documentation_aside = Some((ix, documentation_aside.clone()));
-                        } else if matches!(menu.documentation_aside, Some((id, _)) if id == ix) {
-                            menu.documentation_aside = None;
-                        }
-                        cx.notify();
-                    }))
-            })
-            .child(
-                ListItem::new(ix)
-                    .group_name("label_container")
-                    .inset(true)
-                    .disabled(*disabled)
-                    .toggle_state(Some(ix) == self.selected_index)
-                    .when_some(*toggle, |list_item, (position, toggled)| {
-                        let contents = div()
-                            .flex_none()
-                            .child(
-                                Icon::new(icon.unwrap_or(IconName::Check))
-                                    .color(icon_color)
-                                    .size(*icon_size),
-                            )
-                            .when(!toggled, |contents| contents.invisible());
-
-                        match position {
-                            IconPosition::Start => list_item.start_slot(contents),
-                            IconPosition::End => list_item.end_slot(contents),
-                        }
-                    })
-                    .child(
-                        h_flex()
-                            .w_full()
-                            .justify_between()
-                            .child(label_element)
-                            .debug_selector(|| format!("MENU_ITEM-{}", label))
-                            .children(action.as_ref().map(|action| {
-                                let binding = self
-                                    .action_context
-                                    .as_ref()
-                                    .map(|focus| KeyBinding::for_action_in(&**action, focus, cx))
-                                    .unwrap_or_else(|| KeyBinding::for_action(&**action, cx));
-
-                                div()
-                                    .ml_4()
-                                    .child(binding.disabled(*disabled))
-                                    .when(*disabled && documentation_aside.is_some(), |parent| {
-                                        parent.invisible()
-                                    })
-                            }))
-                            .when(*disabled && documentation_aside.is_some(), |parent| {
-                                parent.child(
-                                    Icon::new(IconName::Info)
-                                        .size(IconSize::XSmall)
-                                        .color(Color::Muted),
-                                )
-                            }),
-                    )
-                    .when_some(
-                        end_slot_icon
-                            .as_ref()
-                            .zip(self.end_slot_action.as_ref())
-                            .zip(end_slot_title.as_ref())
-                            .zip(end_slot_handler.as_ref()),
-                        |el, (((icon, action), title), handler)| {
-                            el.end_slot({
-                                let icon_button = IconButton::new("end-slot-icon", *icon)
-                                    .shape(IconButtonShape::Square)
-                                    .tooltip({
-                                        let action_context = self.action_context.clone();
-                                        let title = title.clone();
-                                        let action = action.boxed_clone();
-                                        move |_window, cx| {
-                                            action_context
-                                                .as_ref()
-                                                .map(|focus| {
-                                                    Tooltip::for_action_in(
-                                                        title.clone(),
-                                                        &*action,
-                                                        focus,
-                                                        cx,
-                                                    )
-                                                })
-                                                .unwrap_or_else(|| {
-                                                    Tooltip::for_action(title.clone(), &*action, cx)
-                                                })
-                                        }
-                                    })
-                                    .on_click({
-                                        let handler = handler.clone();
-                                        move |_, window, cx| {
-                                            handler(None, window, cx);
-                                            this.update(cx, |this, cx| {
-                                                this.rebuild(window, cx);
-                                                cx.notify();
-                                            })
-                                            .ok();
-                                        }
-                                    });
-
-                                if *show_end_slot_on_hover {
-                                    div()
-                                        .visible_on_hover("label_container")
-                                        .child(icon_button)
-                                        .into_any_element()
-                                } else {
-                                    icon_button.into_any_element()
-                                }
-                            })
-                        },
-                    )
-                    .on_click({
-                        let context = self.action_context.clone();
-                        let keep_open_on_confirm = self.keep_open_on_confirm;
-                        move |_, window, cx| {
-                            handler(context.as_ref(), window, cx);
-                            menu.update(cx, |menu, cx| {
-                                menu.clicked = true;
-                                if keep_open_on_confirm {
-                                    menu.rebuild(window, cx);
-                                } else {
-                                    cx.emit(DismissEvent);
-                                }
-                            })
-                            .ok();
-                        }
-                    }),
-            )
-            .into_any_element()
-    }
-}
-
-impl ContextMenuItem {
-    fn is_selectable(&self) -> bool {
-        match self {
-            ContextMenuItem::Header(_)
-            | ContextMenuItem::HeaderWithLink(_, _, _)
-            | ContextMenuItem::Separator
-            | ContextMenuItem::Label { .. } => false,
-            ContextMenuItem::Entry(ContextMenuEntry { disabled, .. }) => !disabled,
-            ContextMenuItem::CustomEntry { selectable, .. } => *selectable,
-        }
-    }
-}
-
-impl Render for ContextMenu {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let ui_font_size = ThemeSettings::get_global(cx).ui_font_size(cx);
-        let window_size = window.viewport_size();
-        let rem_size = window.rem_size();
-        let is_wide_window = window_size.width / rem_size > rems_from_px(800.).0;
-
-        let aside = self.documentation_aside.clone();
-        let render_aside = |aside: DocumentationAside, cx: &mut Context<Self>| {
-            WithRemSize::new(ui_font_size)
-                .occlude()
-                .elevation_2(cx)
-                .w_full()
-                .p_2()
-                .overflow_hidden()
-                .when(is_wide_window, |this| this.max_w_96())
-                .when(!is_wide_window, |this| this.max_w_48())
-                .child((aside.render)(cx))
-        };
-
-        let render_menu =
-            |cx: &mut Context<Self>, window: &mut Window| {
-                WithRemSize::new(ui_font_size)
-                    .occlude()
-                    .elevation_2(cx)
-                    .flex()
-                    .flex_row()
-                    .flex_shrink_0()
-                    .child(
-                        v_flex()
-                            .id("context-menu")
-                            .max_h(vh(0.75, window))
-                            .flex_shrink_0()
-                            .when_some(self.fixed_width, |this, width| {
-                                this.w(width).overflow_x_hidden()
-                            })
-                            .when(self.fixed_width.is_none(), |this| {
-                                this.min_w(px(200.)).flex_1()
-                            })
-                            .overflow_y_scroll()
-                            .track_focus(&self.focus_handle(cx))
-                            .on_mouse_down_out(cx.listener(|this, _, window, cx| {
-                                this.cancel(&menu::Cancel, window, cx)
-                            }))
-                            .key_context(self.key_context.as_ref())
-                            .on_action(cx.listener(ContextMenu::select_first))
-                            .on_action(cx.listener(ContextMenu::handle_select_last))
-                            .on_action(cx.listener(ContextMenu::select_next))
-                            .on_action(cx.listener(ContextMenu::select_previous))
-                            .on_action(cx.listener(ContextMenu::confirm))
-                            .on_action(cx.listener(ContextMenu::cancel))
-                            .when_some(self.end_slot_action.as_ref(), |el, action| {
-                                el.on_boxed_action(&**action, cx.listener(ContextMenu::end_slot))
-                            })
-                            .when(!self.delayed, |mut el| {
-                                for item in self.items.iter() {
-                                    if let ContextMenuItem::Entry(ContextMenuEntry {
-                                        action: Some(action),
-                                        disabled: false,
-                                        ..
-                                    }) = item
-                                    {
-                                        el = el.on_boxed_action(
-                                            &**action,
-                                            cx.listener(ContextMenu::on_action_dispatch),
-                                        );
-                                    }
-                                }
-                                el
-                            })
-                            .child(
-                                List::new().children(
-                                    self.items.iter().enumerate().map(|(ix, item)| {
-                                        self.render_menu_item(ix, item, window, cx)
-                                    }),
-                                ),
-                            ),
-                    )
-            };
-
-        if is_wide_window {
-            div()
-                .relative()
-                .child(render_menu(cx, window))
-                .children(aside.map(|(_item_index, aside)| {
-                    h_flex()
-                        .absolute()
-                        .when(aside.side == DocumentationSide::Left, |this| {
-                            this.right_full().mr_1()
-                        })
-                        .when(aside.side == DocumentationSide::Right, |this| {
-                            this.left_full().ml_1()
-                        })
-                        .when(aside.edge == DocumentationEdge::Top, |this| this.top_0())
-                        .when(aside.edge == DocumentationEdge::Bottom, |this| {
-                            this.bottom_0()
-                        })
-                        .child(render_aside(aside, cx))
-                }))
-        } else {
-            v_flex()
-                .w_full()
-                .gap_1()
-                .justify_end()
-                .children(aside.map(|(_, aside)| render_aside(aside, cx)))
-                .child(render_menu(cx, window))
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use gpui::TestAppContext;
-
-    use super::*;
-
-    #[gpui::test]
-    fn can_navigate_back_over_headers(cx: &mut TestAppContext) {
-        let cx = cx.add_empty_window();
-        let context_menu = cx.update(|window, cx| {
-            ContextMenu::build(window, cx, |menu, _, _| {
-                menu.header("First header")
-                    .separator()
-                    .entry("First entry", None, |_, _| {})
-                    .separator()
-                    .separator()
-                    .entry("Last entry", None, |_, _| {})
-                    .header("Last header")
-            })
-        });
-
-        context_menu.update_in(cx, |context_menu, window, cx| {
-            assert_eq!(
-                None, context_menu.selected_index,
-                "No selection is in the menu initially"
-            );
-
-            context_menu.select_first(&SelectFirst, window, cx);
-            assert_eq!(
-                Some(2),
-                context_menu.selected_index,
-                "Should select first selectable entry, skipping the header and the separator"
-            );
-
-            context_menu.select_next(&SelectNext, window, cx);
-            assert_eq!(
-                Some(5),
-                context_menu.selected_index,
-                "Should select next selectable entry, skipping 2 separators along the way"
-            );
-
-            context_menu.select_next(&SelectNext, window, cx);
-            assert_eq!(
-                Some(2),
-                context_menu.selected_index,
-                "Should wrap around to first selectable entry"
-            );
-        });
-
-        context_menu.update_in(cx, |context_menu, window, cx| {
-            assert_eq!(
-                Some(2),
-                context_menu.selected_index,
-                "Should start from the first selectable entry"
-            );
-
-            context_menu.select_previous(&SelectPrevious, window, cx);
-            assert_eq!(
-                Some(5),
-                context_menu.selected_index,
-                "Should wrap around to previous selectable entry (last)"
-            );
-
-            context_menu.select_previous(&SelectPrevious, window, cx);
-            assert_eq!(
-                Some(2),
-                context_menu.selected_index,
-                "Should go back to previous selectable entry (first)"
-            );
-        });
-
-        context_menu.update_in(cx, |context_menu, window, cx| {
-            context_menu.select_first(&SelectFirst, window, cx);
-            assert_eq!(
-                Some(2),
-                context_menu.selected_index,
-                "Should start from the first selectable entry"
-            );
-
-            context_menu.select_previous(&SelectPrevious, window, cx);
-            assert_eq!(
-                Some(5),
-                context_menu.selected_index,
-                "Should wrap around to last selectable entry"
-            );
-            context_menu.select_next(&SelectNext, window, cx);
-            assert_eq!(
-                Some(2),
-                context_menu.selected_index,
-                "Should wrap around to first selectable entry"
-            );
-        });
-    }
-}
diff --git a/crates/ui/src/components/data_table.rs b/crates/ui/src/components/data_table.rs
deleted file mode 100644
index 9cd2a5cb7a..0000000000
--- a/crates/ui/src/components/data_table.rs
+++ /dev/null
@@ -1,1390 +0,0 @@
-use std::{ops::Range, rc::Rc};
-
-use gpui::{
-    AbsoluteLength, AppContext, Context, DefiniteLength, DragMoveEvent, Entity, EntityId,
-    FocusHandle, Length, ListHorizontalSizingBehavior, ListSizingBehavior, Point, Stateful,
-    UniformListScrollHandle, WeakEntity, transparent_black, uniform_list,
-};
-
-use crate::{
-    ActiveTheme as _, AnyElement, App, Button, ButtonCommon as _, ButtonStyle, Color, Component,
-    ComponentScope, Div, ElementId, FixedWidth as _, FluentBuilder as _, Indicator,
-    InteractiveElement, IntoElement, ParentElement, Pixels, RegisterComponent, RenderOnce,
-    ScrollableHandle, Scrollbars, SharedString, StatefulInteractiveElement, Styled, StyledExt as _,
-    StyledTypography, Window, WithScrollbar, div, example_group_with_title, h_flex, px,
-    single_example, v_flex,
-};
-use itertools::intersperse_with;
-
-const RESIZE_COLUMN_WIDTH: f32 = 8.0;
-
-#[derive(Debug)]
-struct DraggedColumn(usize);
-
-struct UniformListData<const COLS: usize> {
-    render_item_fn: Box<dyn Fn(Range<usize>, &mut Window, &mut App) -> Vec<[AnyElement; COLS]>>,
-    element_id: ElementId,
-    row_count: usize,
-}
-
-enum TableContents<const COLS: usize> {
-    Vec(Vec<[AnyElement; COLS]>),
-    UniformList(UniformListData<COLS>),
-}
-
-impl<const COLS: usize> TableContents<COLS> {
-    fn rows_mut(&mut self) -> Option<&mut Vec<[AnyElement; COLS]>> {
-        match self {
-            TableContents::Vec(rows) => Some(rows),
-            TableContents::UniformList(_) => None,
-        }
-    }
-
-    fn len(&self) -> usize {
-        match self {
-            TableContents::Vec(rows) => rows.len(),
-            TableContents::UniformList(data) => data.row_count,
-        }
-    }
-
-    fn is_empty(&self) -> bool {
-        self.len() == 0
-    }
-}
-
-pub struct TableInteractionState {
-    pub focus_handle: FocusHandle,
-    pub scroll_handle: UniformListScrollHandle,
-    pub custom_scrollbar: Option<Scrollbars>,
-}
-
-impl TableInteractionState {
-    pub fn new(cx: &mut App) -> Self {
-        Self {
-            focus_handle: cx.focus_handle(),
-            scroll_handle: UniformListScrollHandle::new(),
-            custom_scrollbar: None,
-        }
-    }
-
-    pub fn with_custom_scrollbar(mut self, custom_scrollbar: Scrollbars) -> Self {
-        self.custom_scrollbar = Some(custom_scrollbar);
-        self
-    }
-
-    pub fn scroll_offset(&self) -> Point<Pixels> {
-        self.scroll_handle.offset()
-    }
-
-    pub fn set_scroll_offset(&self, offset: Point<Pixels>) {
-        self.scroll_handle.set_offset(offset);
-    }
-
-    pub fn listener<E: ?Sized>(
-        this: &Entity<Self>,
-        f: impl Fn(&mut Self, &E, &mut Window, &mut Context<Self>) + 'static,
-    ) -> impl Fn(&E, &mut Window, &mut App) + 'static {
-        let view = this.downgrade();
-        move |e: &E, window: &mut Window, cx: &mut App| {
-            view.update(cx, |view, cx| f(view, e, window, cx)).ok();
-        }
-    }
-
-    fn render_resize_handles<const COLS: usize>(
-        &self,
-        column_widths: &[Length; COLS],
-        resizable_columns: &[TableResizeBehavior; COLS],
-        initial_sizes: [DefiniteLength; COLS],
-        columns: Option<Entity<TableColumnWidths<COLS>>>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> AnyElement {
-        let spacers = column_widths
-            .iter()
-            .map(|width| base_cell_style(Some(*width)).into_any_element());
-
-        let mut column_ix = 0;
-        let resizable_columns_slice = *resizable_columns;
-        let mut resizable_columns = resizable_columns.iter();
-
-        let dividers = intersperse_with(spacers, || {
-            window.with_id(column_ix, |window| {
-                let mut resize_divider = div()
-                    // This is required because this is evaluated at a different time than the use_state call above
-                    .id(column_ix)
-                    .relative()
-                    .top_0()
-                    .w_px()
-                    .h_full()
-                    .bg(cx.theme().colors().border.opacity(0.8));
-
-                let mut resize_handle = div()
-                    .id("column-resize-handle")
-                    .absolute()
-                    .left_neg_0p5()
-                    .w(px(RESIZE_COLUMN_WIDTH))
-                    .h_full();
-
-                if resizable_columns
-                    .next()
-                    .is_some_and(TableResizeBehavior::is_resizable)
-                {
-                    let hovered = window.use_state(cx, |_window, _cx| false);
-
-                    resize_divider = resize_divider.when(*hovered.read(cx), |div| {
-                        div.bg(cx.theme().colors().border_focused)
-                    });
-
-                    resize_handle = resize_handle
-                        .on_hover(move |&was_hovered, _, cx| hovered.write(cx, was_hovered))
-                        .cursor_col_resize()
-                        .when_some(columns.clone(), |this, columns| {
-                            this.on_click(move |event, window, cx| {
-                                if event.click_count() >= 2 {
-                                    columns.update(cx, |columns, _| {
-                                        columns.on_double_click(
-                                            column_ix,
-                                            &initial_sizes,
-                                            &resizable_columns_slice,
-                                            window,
-                                        );
-                                    })
-                                }
-
-                                cx.stop_propagation();
-                            })
-                        })
-                        .on_drag(DraggedColumn(column_ix), |_, _offset, _window, cx| {
-                            cx.new(|_cx| gpui::Empty)
-                        })
-                }
-
-                column_ix += 1;
-                resize_divider.child(resize_handle).into_any_element()
-            })
-        });
-
-        h_flex()
-            .id("resize-handles")
-            .absolute()
-            .inset_0()
-            .w_full()
-            .children(dividers)
-            .into_any_element()
-    }
-}
-
-#[derive(Debug, Copy, Clone, PartialEq)]
-pub enum TableResizeBehavior {
-    None,
-    Resizable,
-    MinSize(f32),
-}
-
-impl TableResizeBehavior {
-    pub fn is_resizable(&self) -> bool {
-        *self != TableResizeBehavior::None
-    }
-
-    pub fn min_size(&self) -> Option<f32> {
-        match self {
-            TableResizeBehavior::None => None,
-            TableResizeBehavior::Resizable => Some(0.05),
-            TableResizeBehavior::MinSize(min_size) => Some(*min_size),
-        }
-    }
-}
-
-pub struct TableColumnWidths<const COLS: usize> {
-    widths: [DefiniteLength; COLS],
-    visible_widths: [DefiniteLength; COLS],
-    cached_bounds_width: Pixels,
-    initialized: bool,
-}
-
-impl<const COLS: usize> TableColumnWidths<COLS> {
-    pub fn new(_: &mut App) -> Self {
-        Self {
-            widths: [DefiniteLength::default(); COLS],
-            visible_widths: [DefiniteLength::default(); COLS],
-            cached_bounds_width: Default::default(),
-            initialized: false,
-        }
-    }
-
-    fn get_fraction(length: &DefiniteLength, bounds_width: Pixels, rem_size: Pixels) -> f32 {
-        match length {
-            DefiniteLength::Absolute(AbsoluteLength::Pixels(pixels)) => *pixels / bounds_width,
-            DefiniteLength::Absolute(AbsoluteLength::Rems(rems_width)) => {
-                rems_width.to_pixels(rem_size) / bounds_width
-            }
-            DefiniteLength::Fraction(fraction) => *fraction,
-        }
-    }
-
-    fn on_double_click(
-        &mut self,
-        double_click_position: usize,
-        initial_sizes: &[DefiniteLength; COLS],
-        resize_behavior: &[TableResizeBehavior; COLS],
-        window: &mut Window,
-    ) {
-        let bounds_width = self.cached_bounds_width;
-        let rem_size = window.rem_size();
-        let initial_sizes =
-            initial_sizes.map(|length| Self::get_fraction(&length, bounds_width, rem_size));
-        let widths = self
-            .widths
-            .map(|length| Self::get_fraction(&length, bounds_width, rem_size));
-
-        let updated_widths = Self::reset_to_initial_size(
-            double_click_position,
-            widths,
-            initial_sizes,
-            resize_behavior,
-        );
-        self.widths = updated_widths.map(DefiniteLength::Fraction);
-        self.visible_widths = self.widths;
-    }
-
-    fn reset_to_initial_size(
-        col_idx: usize,
-        mut widths: [f32; COLS],
-        initial_sizes: [f32; COLS],
-        resize_behavior: &[TableResizeBehavior; COLS],
-    ) -> [f32; COLS] {
-        // RESET:
-        // Part 1:
-        // Figure out if we should shrink/grow the selected column
-        // Get diff which represents the change in column we want to make initial size delta curr_size = diff
-        //
-        // Part 2: We need to decide which side column we should move and where
-        //
-        // If we want to grow our column we should check the left/right columns diff to see what side
-        // has a greater delta than their initial size. Likewise, if we shrink our column we should check
-        // the left/right column diffs to see what side has the smallest delta.
-        //
-        // Part 3: resize
-        //
-        // col_idx represents the column handle to the right of an active column
-        //
-        // If growing and right has the greater delta {
-        //    shift col_idx to the right
-        // } else if growing and left has the greater delta {
-        //  shift col_idx - 1 to the left
-        // } else if shrinking and the right has the greater delta {
-        //  shift
-        // } {
-        //
-        // }
-        // }
-        //
-        // if we need to shrink, then if the right
-        //
-
-        // DRAGGING
-        // we get diff which represents the change in the _drag handle_ position
-        // -diff => dragging left ->
-        //      grow the column to the right of the handle as much as we can shrink columns to the left of the handle
-        // +diff => dragging right -> growing handles column
-        //      grow the column to the left of the handle as much as we can shrink columns to the right of the handle
-        //
-
-        let diff = initial_sizes[col_idx] - widths[col_idx];
-
-        let left_diff =
-            initial_sizes[..col_idx].iter().sum::<f32>() - widths[..col_idx].iter().sum::<f32>();
-        let right_diff = initial_sizes[col_idx + 1..].iter().sum::<f32>()
-            - widths[col_idx + 1..].iter().sum::<f32>();
-
-        let go_left_first = if diff < 0.0 {
-            left_diff > right_diff
-        } else {
-            left_diff < right_diff
-        };
-
-        if !go_left_first {
-            let diff_remaining =
-                Self::propagate_resize_diff(diff, col_idx, &mut widths, resize_behavior, 1);
-
-            if diff_remaining != 0.0 && col_idx > 0 {
-                Self::propagate_resize_diff(
-                    diff_remaining,
-                    col_idx,
-                    &mut widths,
-                    resize_behavior,
-                    -1,
-                );
-            }
-        } else {
-            let diff_remaining =
-                Self::propagate_resize_diff(diff, col_idx, &mut widths, resize_behavior, -1);
-
-            if diff_remaining != 0.0 {
-                Self::propagate_resize_diff(
-                    diff_remaining,
-                    col_idx,
-                    &mut widths,
-                    resize_behavior,
-                    1,
-                );
-            }
-        }
-
-        widths
-    }
-
-    fn on_drag_move(
-        &mut self,
-        drag_event: &DragMoveEvent<DraggedColumn>,
-        resize_behavior: &[TableResizeBehavior; COLS],
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let drag_position = drag_event.event.position;
-        let bounds = drag_event.bounds;
-
-        let mut col_position = 0.0;
-        let rem_size = window.rem_size();
-        let bounds_width = bounds.right() - bounds.left();
-        let col_idx = drag_event.drag(cx).0;
-
-        let column_handle_width = Self::get_fraction(
-            &DefiniteLength::Absolute(AbsoluteLength::Pixels(px(RESIZE_COLUMN_WIDTH))),
-            bounds_width,
-            rem_size,
-        );
-
-        let mut widths = self
-            .widths
-            .map(|length| Self::get_fraction(&length, bounds_width, rem_size));
-
-        for length in widths[0..=col_idx].iter() {
-            col_position += length + column_handle_width;
-        }
-
-        let mut total_length_ratio = col_position;
-        for length in widths[col_idx + 1..].iter() {
-            total_length_ratio += length;
-        }
-        total_length_ratio += (COLS - 1 - col_idx) as f32 * column_handle_width;
-
-        let drag_fraction = (drag_position.x - bounds.left()) / bounds_width;
-        let drag_fraction = drag_fraction * total_length_ratio;
-        let diff = drag_fraction - col_position - column_handle_width / 2.0;
-
-        Self::drag_column_handle(diff, col_idx, &mut widths, resize_behavior);
-
-        self.visible_widths = widths.map(DefiniteLength::Fraction);
-    }
-
-    fn drag_column_handle(
-        diff: f32,
-        col_idx: usize,
-        widths: &mut [f32; COLS],
-        resize_behavior: &[TableResizeBehavior; COLS],
-    ) {
-        // if diff > 0.0 then go right
-        if diff > 0.0 {
-            Self::propagate_resize_diff(diff, col_idx, widths, resize_behavior, 1);
-        } else {
-            Self::propagate_resize_diff(-diff, col_idx + 1, widths, resize_behavior, -1);
-        }
-    }
-
-    fn propagate_resize_diff(
-        diff: f32,
-        col_idx: usize,
-        widths: &mut [f32; COLS],
-        resize_behavior: &[TableResizeBehavior; COLS],
-        direction: i8,
-    ) -> f32 {
-        let mut diff_remaining = diff;
-        if resize_behavior[col_idx].min_size().is_none() {
-            return diff;
-        }
-
-        let step_right;
-        let step_left;
-        if direction < 0 {
-            step_right = 0;
-            step_left = 1;
-        } else {
-            step_right = 1;
-            step_left = 0;
-        }
-        if col_idx == 0 && direction < 0 {
-            return diff;
-        }
-        let mut curr_column = col_idx + step_right - step_left;
-
-        while diff_remaining != 0.0 && curr_column < COLS {
-            let Some(min_size) = resize_behavior[curr_column].min_size() else {
-                if curr_column == 0 {
-                    break;
-                }
-                curr_column -= step_left;
-                curr_column += step_right;
-                continue;
-            };
-
-            let curr_width = widths[curr_column] - diff_remaining;
-            widths[curr_column] = curr_width;
-
-            if min_size > curr_width {
-                diff_remaining = min_size - curr_width;
-                widths[curr_column] = min_size;
-            } else {
-                diff_remaining = 0.0;
-                break;
-            }
-            if curr_column == 0 {
-                break;
-            }
-            curr_column -= step_left;
-            curr_column += step_right;
-        }
-        widths[col_idx] = widths[col_idx] + (diff - diff_remaining);
-
-        diff_remaining
-    }
-}
-
-pub struct TableWidths<const COLS: usize> {
-    initial: [DefiniteLength; COLS],
-    current: Option<Entity<TableColumnWidths<COLS>>>,
-    resizable: [TableResizeBehavior; COLS],
-}
-
-impl<const COLS: usize> TableWidths<COLS> {
-    pub fn new(widths: [impl Into<DefiniteLength>; COLS]) -> Self {
-        let widths = widths.map(Into::into);
-
-        TableWidths {
-            initial: widths,
-            current: None,
-            resizable: [TableResizeBehavior::None; COLS],
-        }
-    }
-
-    fn lengths(&self, cx: &App) -> [Length; COLS] {
-        self.current
-            .as_ref()
-            .map(|entity| entity.read(cx).visible_widths.map(Length::Definite))
-            .unwrap_or(self.initial.map(Length::Definite))
-    }
-}
-
-/// A table component
-#[derive(RegisterComponent, IntoElement)]
-pub struct Table<const COLS: usize = 3> {
-    striped: bool,
-    width: Option<Length>,
-    headers: Option<[AnyElement; COLS]>,
-    rows: TableContents<COLS>,
-    interaction_state: Option<WeakEntity<TableInteractionState>>,
-    col_widths: Option<TableWidths<COLS>>,
-    map_row: Option<Rc<dyn Fn((usize, Stateful<Div>), &mut Window, &mut App) -> AnyElement>>,
-    use_ui_font: bool,
-    empty_table_callback: Option<Rc<dyn Fn(&mut Window, &mut App) -> AnyElement>>,
-}
-
-impl<const COLS: usize> Table<COLS> {
-    /// number of headers provided.
-    pub fn new() -> Self {
-        Self {
-            striped: false,
-            width: None,
-            headers: None,
-            rows: TableContents::Vec(Vec::new()),
-            interaction_state: None,
-            map_row: None,
-            use_ui_font: true,
-            empty_table_callback: None,
-            col_widths: None,
-        }
-    }
-
-    /// Enables uniform list rendering.
-    /// The provided function will be passed directly to the `uniform_list` element.
-    /// Therefore, if this method is called, any calls to [`Table::row`] before or after
-    /// this method is called will be ignored.
-    pub fn uniform_list(
-        mut self,
-        id: impl Into<ElementId>,
-        row_count: usize,
-        render_item_fn: impl Fn(Range<usize>, &mut Window, &mut App) -> Vec<[AnyElement; COLS]>
-        + 'static,
-    ) -> Self {
-        self.rows = TableContents::UniformList(UniformListData {
-            element_id: id.into(),
-            row_count,
-            render_item_fn: Box::new(render_item_fn),
-        });
-        self
-    }
-
-    /// Enables row striping.
-    pub fn striped(mut self) -> Self {
-        self.striped = true;
-        self
-    }
-
-    /// Sets the width of the table.
-    /// Will enable horizontal scrolling if [`Self::interactable`] is also called.
-    pub fn width(mut self, width: impl Into<Length>) -> Self {
-        self.width = Some(width.into());
-        self
-    }
-
-    /// Enables interaction (primarily scrolling) with the table.
-    ///
-    /// Vertical scrolling will be enabled by default if the table is taller than its container.
-    ///
-    /// Horizontal scrolling will only be enabled if [`Self::width`] is also called, otherwise
-    /// the list will always shrink the table columns to fit their contents I.e. If [`Self::uniform_list`]
-    /// is used without a width and with [`Self::interactable`], the [`ListHorizontalSizingBehavior`] will
-    /// be set to [`ListHorizontalSizingBehavior::FitList`].
-    pub fn interactable(mut self, interaction_state: &Entity<TableInteractionState>) -> Self {
-        self.interaction_state = Some(interaction_state.downgrade());
-        self
-    }
-
-    pub fn header(mut self, headers: [impl IntoElement; COLS]) -> Self {
-        self.headers = Some(headers.map(IntoElement::into_any_element));
-        self
-    }
-
-    pub fn row(mut self, items: [impl IntoElement; COLS]) -> Self {
-        if let Some(rows) = self.rows.rows_mut() {
-            rows.push(items.map(IntoElement::into_any_element));
-        }
-        self
-    }
-
-    pub fn column_widths(mut self, widths: [impl Into<DefiniteLength>; COLS]) -> Self {
-        if self.col_widths.is_none() {
-            self.col_widths = Some(TableWidths::new(widths));
-        }
-        self
-    }
-
-    pub fn resizable_columns(
-        mut self,
-        resizable: [TableResizeBehavior; COLS],
-        column_widths: &Entity<TableColumnWidths<COLS>>,
-        cx: &mut App,
-    ) -> Self {
-        if let Some(table_widths) = self.col_widths.as_mut() {
-            table_widths.resizable = resizable;
-            let column_widths = table_widths
-                .current
-                .get_or_insert_with(|| column_widths.clone());
-
-            column_widths.update(cx, |widths, _| {
-                if !widths.initialized {
-                    widths.initialized = true;
-                    widths.widths = table_widths.initial;
-                    widths.visible_widths = widths.widths;
-                }
-            })
-        }
-        self
-    }
-
-    pub fn no_ui_font(mut self) -> Self {
-        self.use_ui_font = false;
-        self
-    }
-
-    pub fn map_row(
-        mut self,
-        callback: impl Fn((usize, Stateful<Div>), &mut Window, &mut App) -> AnyElement + 'static,
-    ) -> Self {
-        self.map_row = Some(Rc::new(callback));
-        self
-    }
-
-    /// Provide a callback that is invoked when the table is rendered without any rows
-    pub fn empty_table_callback(
-        mut self,
-        callback: impl Fn(&mut Window, &mut App) -> AnyElement + 'static,
-    ) -> Self {
-        self.empty_table_callback = Some(Rc::new(callback));
-        self
-    }
-}
-
-fn base_cell_style(width: Option<Length>) -> Div {
-    div()
-        .px_1p5()
-        .when_some(width, |this, width| this.w(width))
-        .when(width.is_none(), |this| this.flex_1())
-        .whitespace_nowrap()
-        .text_ellipsis()
-        .overflow_hidden()
-}
-
-fn base_cell_style_text(width: Option<Length>, use_ui_font: bool, cx: &App) -> Div {
-    base_cell_style(width).when(use_ui_font, |el| el.text_ui(cx))
-}
-
-pub fn render_table_row<const COLS: usize>(
-    row_index: usize,
-    items: [impl IntoElement; COLS],
-    table_context: TableRenderContext<COLS>,
-    window: &mut Window,
-    cx: &mut App,
-) -> AnyElement {
-    let is_striped = table_context.striped;
-    let is_last = row_index == table_context.total_row_count - 1;
-    let bg = if row_index % 2 == 1 && is_striped {
-        Some(cx.theme().colors().text.opacity(0.05))
-    } else {
-        None
-    };
-    let column_widths = table_context
-        .column_widths
-        .map_or([None; COLS], |widths| widths.map(Some));
-
-    let mut row = h_flex()
-        .id(("table_row", row_index))
-        .size_full()
-        .when_some(bg, |row, bg| row.bg(bg))
-        .hover(|s| s.bg(cx.theme().colors().element_hover.opacity(0.6)))
-        .when(!is_striped, |row| {
-            row.border_b_1()
-                .border_color(transparent_black())
-                .when(!is_last, |row| row.border_color(cx.theme().colors().border))
-        });
-
-    row = row.children(
-        items
-            .map(IntoElement::into_any_element)
-            .into_iter()
-            .zip(column_widths)
-            .map(|(cell, width)| {
-                base_cell_style_text(width, table_context.use_ui_font, cx)
-                    .px_1()
-                    .py_0p5()
-                    .child(cell)
-            }),
-    );
-
-    let row = if let Some(map_row) = table_context.map_row {
-        map_row((row_index, row), window, cx)
-    } else {
-        row.into_any_element()
-    };
-
-    div().size_full().child(row).into_any_element()
-}
-
-pub fn render_table_header<const COLS: usize>(
-    headers: [impl IntoElement; COLS],
-    table_context: TableRenderContext<COLS>,
-    columns_widths: Option<(
-        WeakEntity<TableColumnWidths<COLS>>,
-        [TableResizeBehavior; COLS],
-        [DefiniteLength; COLS],
-    )>,
-    entity_id: Option<EntityId>,
-    cx: &mut App,
-) -> impl IntoElement {
-    let column_widths = table_context
-        .column_widths
-        .map_or([None; COLS], |widths| widths.map(Some));
-
-    let element_id = entity_id
-        .map(|entity| entity.to_string())
-        .unwrap_or_default();
-
-    let shared_element_id: SharedString = format!("table-{}", element_id).into();
-
-    div()
-        .flex()
-        .flex_row()
-        .items_center()
-        .justify_between()
-        .w_full()
-        .p_2()
-        .border_b_1()
-        .border_color(cx.theme().colors().border)
-        .children(headers.into_iter().enumerate().zip(column_widths).map(
-            |((header_idx, h), width)| {
-                base_cell_style_text(width, table_context.use_ui_font, cx)
-                    .child(h)
-                    .id(ElementId::NamedInteger(
-                        shared_element_id.clone(),
-                        header_idx as u64,
-                    ))
-                    .when_some(
-                        columns_widths.as_ref().cloned(),
-                        |this, (column_widths, resizables, initial_sizes)| {
-                            if resizables[header_idx].is_resizable() {
-                                this.on_click(move |event, window, cx| {
-                                    if event.click_count() > 1 {
-                                        column_widths
-                                            .update(cx, |column, _| {
-                                                column.on_double_click(
-                                                    header_idx,
-                                                    &initial_sizes,
-                                                    &resizables,
-                                                    window,
-                                                );
-                                            })
-                                            .ok();
-                                    }
-                                })
-                            } else {
-                                this
-                            }
-                        },
-                    )
-            },
-        ))
-}
-
-#[derive(Clone)]
-pub struct TableRenderContext<const COLS: usize> {
-    pub striped: bool,
-    pub total_row_count: usize,
-    pub column_widths: Option<[Length; COLS]>,
-    pub map_row: Option<Rc<dyn Fn((usize, Stateful<Div>), &mut Window, &mut App) -> AnyElement>>,
-    pub use_ui_font: bool,
-}
-
-impl<const COLS: usize> TableRenderContext<COLS> {
-    fn new(table: &Table<COLS>, cx: &App) -> Self {
-        Self {
-            striped: table.striped,
-            total_row_count: table.rows.len(),
-            column_widths: table.col_widths.as_ref().map(|widths| widths.lengths(cx)),
-            map_row: table.map_row.clone(),
-            use_ui_font: table.use_ui_font,
-        }
-    }
-}
-
-impl<const COLS: usize> RenderOnce for Table<COLS> {
-    fn render(mut self, window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let table_context = TableRenderContext::new(&self, cx);
-        let interaction_state = self.interaction_state.and_then(|state| state.upgrade());
-        let current_widths = self
-            .col_widths
-            .as_ref()
-            .and_then(|widths| Some((widths.current.as_ref()?, widths.resizable)))
-            .map(|(curr, resize_behavior)| (curr.downgrade(), resize_behavior));
-
-        let current_widths_with_initial_sizes = self
-            .col_widths
-            .as_ref()
-            .and_then(|widths| Some((widths.current.as_ref()?, widths.resizable, widths.initial)))
-            .map(|(curr, resize_behavior, initial)| (curr.downgrade(), resize_behavior, initial));
-
-        let width = self.width;
-        let no_rows_rendered = self.rows.is_empty();
-
-        let table = div()
-            .when_some(width, |this, width| this.w(width))
-            .h_full()
-            .v_flex()
-            .when_some(self.headers.take(), |this, headers| {
-                this.child(render_table_header(
-                    headers,
-                    table_context.clone(),
-                    current_widths_with_initial_sizes,
-                    interaction_state.as_ref().map(Entity::entity_id),
-                    cx,
-                ))
-            })
-            .when_some(current_widths, {
-                |this, (widths, resize_behavior)| {
-                    this.on_drag_move::<DraggedColumn>({
-                        let widths = widths.clone();
-                        move |e, window, cx| {
-                            widths
-                                .update(cx, |widths, cx| {
-                                    widths.on_drag_move(e, &resize_behavior, window, cx);
-                                })
-                                .ok();
-                        }
-                    })
-                    .on_children_prepainted({
-                        let widths = widths.clone();
-                        move |bounds, _, cx| {
-                            widths
-                                .update(cx, |widths, _| {
-                                    // This works because all children x axis bounds are the same
-                                    widths.cached_bounds_width =
-                                        bounds[0].right() - bounds[0].left();
-                                })
-                                .ok();
-                        }
-                    })
-                    .on_drop::<DraggedColumn>(move |_, _, cx| {
-                        widths
-                            .update(cx, |widths, _| {
-                                widths.widths = widths.visible_widths;
-                            })
-                            .ok();
-                        // Finish the resize operation
-                    })
-                }
-            })
-            .child({
-                let content = div()
-                    .flex_grow()
-                    .w_full()
-                    .relative()
-                    .overflow_hidden()
-                    .map(|parent| match self.rows {
-                        TableContents::Vec(items) => {
-                            parent.children(items.into_iter().enumerate().map(|(index, row)| {
-                                div().child(render_table_row(
-                                    index,
-                                    row,
-                                    table_context.clone(),
-                                    window,
-                                    cx,
-                                ))
-                            }))
-                        }
-                        TableContents::UniformList(uniform_list_data) => parent.child(
-                            uniform_list(
-                                uniform_list_data.element_id,
-                                uniform_list_data.row_count,
-                                {
-                                    let render_item_fn = uniform_list_data.render_item_fn;
-                                    move |range: Range<usize>, window, cx| {
-                                        let elements = render_item_fn(range.clone(), window, cx);
-                                        elements
-                                            .into_iter()
-                                            .zip(range)
-                                            .map(|(row, row_index)| {
-                                                render_table_row(
-                                                    row_index,
-                                                    row,
-                                                    table_context.clone(),
-                                                    window,
-                                                    cx,
-                                                )
-                                            })
-                                            .collect()
-                                    }
-                                },
-                            )
-                            .size_full()
-                            .flex_grow()
-                            .with_sizing_behavior(ListSizingBehavior::Auto)
-                            .with_horizontal_sizing_behavior(if width.is_some() {
-                                ListHorizontalSizingBehavior::Unconstrained
-                            } else {
-                                ListHorizontalSizingBehavior::FitList
-                            })
-                            .when_some(
-                                interaction_state.as_ref(),
-                                |this, state| {
-                                    this.track_scroll(
-                                        &state.read_with(cx, |s, _| s.scroll_handle.clone()),
-                                    )
-                                },
-                            ),
-                        ),
-                    })
-                    .when_some(
-                        self.col_widths.as_ref().zip(interaction_state.as_ref()),
-                        |parent, (table_widths, state)| {
-                            parent.child(state.update(cx, |state, cx| {
-                                let resizable_columns = table_widths.resizable;
-                                let column_widths = table_widths.lengths(cx);
-                                let columns = table_widths.current.clone();
-                                let initial_sizes = table_widths.initial;
-                                state.render_resize_handles(
-                                    &column_widths,
-                                    &resizable_columns,
-                                    initial_sizes,
-                                    columns,
-                                    window,
-                                    cx,
-                                )
-                            }))
-                        },
-                    );
-
-                if let Some(state) = interaction_state.as_ref() {
-                    let scrollbars = state
-                        .read(cx)
-                        .custom_scrollbar
-                        .clone()
-                        .unwrap_or_else(|| Scrollbars::new(super::ScrollAxes::Both));
-                    content
-                        .custom_scrollbars(
-                            scrollbars.tracked_scroll_handle(&state.read(cx).scroll_handle),
-                            window,
-                            cx,
-                        )
-                        .into_any_element()
-                } else {
-                    content.into_any_element()
-                }
-            })
-            .when_some(
-                no_rows_rendered
-                    .then_some(self.empty_table_callback)
-                    .flatten(),
-                |this, callback| {
-                    this.child(
-                        h_flex()
-                            .size_full()
-                            .p_3()
-                            .items_start()
-                            .justify_center()
-                            .child(callback(window, cx)),
-                    )
-                },
-            );
-
-        if let Some(interaction_state) = interaction_state.as_ref() {
-            table
-                .track_focus(&interaction_state.read(cx).focus_handle)
-                .id(("table", interaction_state.entity_id()))
-                .into_any_element()
-        } else {
-            table.into_any_element()
-        }
-    }
-}
-
-impl Component for Table<3> {
-    fn scope() -> ComponentScope {
-        ComponentScope::Layout
-    }
-
-    fn description() -> Option<&'static str> {
-        Some("A table component for displaying data in rows and columns with optional styling.")
-    }
-
-    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
-        Some(
-            v_flex()
-                .gap_6()
-                .children(vec![
-                    example_group_with_title(
-                        "Basic Tables",
-                        vec![
-                            single_example(
-                                "Simple Table",
-                                Table::new()
-                                    .width(px(400.))
-                                    .header(["Name", "Age", "City"])
-                                    .row(["Alice", "28", "New York"])
-                                    .row(["Bob", "32", "San Francisco"])
-                                    .row(["Charlie", "25", "London"])
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Two Column Table",
-                                Table::new()
-                                    .header(["Category", "Value"])
-                                    .width(px(300.))
-                                    .row(["Revenue", "$100,000"])
-                                    .row(["Expenses", "$75,000"])
-                                    .row(["Profit", "$25,000"])
-                                    .into_any_element(),
-                            ),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "Styled Tables",
-                        vec![
-                            single_example(
-                                "Default",
-                                Table::new()
-                                    .width(px(400.))
-                                    .header(["Product", "Price", "Stock"])
-                                    .row(["Laptop", "$999", "In Stock"])
-                                    .row(["Phone", "$599", "Low Stock"])
-                                    .row(["Tablet", "$399", "Out of Stock"])
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Striped",
-                                Table::new()
-                                    .width(px(400.))
-                                    .striped()
-                                    .header(["Product", "Price", "Stock"])
-                                    .row(["Laptop", "$999", "In Stock"])
-                                    .row(["Phone", "$599", "Low Stock"])
-                                    .row(["Tablet", "$399", "Out of Stock"])
-                                    .row(["Headphones", "$199", "In Stock"])
-                                    .into_any_element(),
-                            ),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "Mixed Content Table",
-                        vec![single_example(
-                            "Table with Elements",
-                            Table::new()
-                                .width(px(840.))
-                                .header(["Status", "Name", "Priority", "Deadline", "Action"])
-                                .row([
-                                    Indicator::dot().color(Color::Success).into_any_element(),
-                                    "Project A".into_any_element(),
-                                    "High".into_any_element(),
-                                    "2023-12-31".into_any_element(),
-                                    Button::new("view_a", "View")
-                                        .style(ButtonStyle::Filled)
-                                        .full_width()
-                                        .into_any_element(),
-                                ])
-                                .row([
-                                    Indicator::dot().color(Color::Warning).into_any_element(),
-                                    "Project B".into_any_element(),
-                                    "Medium".into_any_element(),
-                                    "2024-03-15".into_any_element(),
-                                    Button::new("view_b", "View")
-                                        .style(ButtonStyle::Filled)
-                                        .full_width()
-                                        .into_any_element(),
-                                ])
-                                .row([
-                                    Indicator::dot().color(Color::Error).into_any_element(),
-                                    "Project C".into_any_element(),
-                                    "Low".into_any_element(),
-                                    "2024-06-30".into_any_element(),
-                                    Button::new("view_c", "View")
-                                        .style(ButtonStyle::Filled)
-                                        .full_width()
-                                        .into_any_element(),
-                                ])
-                                .into_any_element(),
-                        )],
-                    ),
-                ])
-                .into_any_element(),
-        )
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    fn is_almost_eq(a: &[f32], b: &[f32]) -> bool {
-        a.len() == b.len() && a.iter().zip(b).all(|(x, y)| (x - y).abs() < 1e-6)
-    }
-
-    fn cols_to_str<const COLS: usize>(cols: &[f32; COLS], total_size: f32) -> String {
-        cols.map(|f| "*".repeat(f32::round(f * total_size) as usize))
-            .join("|")
-    }
-
-    fn parse_resize_behavior<const COLS: usize>(
-        input: &str,
-        total_size: f32,
-    ) -> [TableResizeBehavior; COLS] {
-        let mut resize_behavior = [TableResizeBehavior::None; COLS];
-        let mut max_index = 0;
-        for (index, col) in input.split('|').enumerate() {
-            if col.starts_with('X') || col.is_empty() {
-                resize_behavior[index] = TableResizeBehavior::None;
-            } else if col.starts_with('*') {
-                resize_behavior[index] =
-                    TableResizeBehavior::MinSize(col.len() as f32 / total_size);
-            } else {
-                panic!("invalid test input: unrecognized resize behavior: {}", col);
-            }
-            max_index = index;
-        }
-
-        if max_index + 1 != COLS {
-            panic!("invalid test input: too many columns");
-        }
-        resize_behavior
-    }
-
-    mod reset_column_size {
-        use super::*;
-
-        fn parse<const COLS: usize>(input: &str) -> ([f32; COLS], f32, Option<usize>) {
-            let mut widths = [f32::NAN; COLS];
-            let mut column_index = None;
-            for (index, col) in input.split('|').enumerate() {
-                widths[index] = col.len() as f32;
-                if col.starts_with('X') {
-                    column_index = Some(index);
-                }
-            }
-
-            for w in widths {
-                assert!(w.is_finite(), "incorrect number of columns");
-            }
-            let total = widths.iter().sum::<f32>();
-            for width in &mut widths {
-                *width /= total;
-            }
-            (widths, total, column_index)
-        }
-
-        #[track_caller]
-        fn check_reset_size<const COLS: usize>(
-            initial_sizes: &str,
-            widths: &str,
-            expected: &str,
-            resize_behavior: &str,
-        ) {
-            let (initial_sizes, total_1, None) = parse::<COLS>(initial_sizes) else {
-                panic!("invalid test input: initial sizes should not be marked");
-            };
-            let (widths, total_2, Some(column_index)) = parse::<COLS>(widths) else {
-                panic!("invalid test input: widths should be marked");
-            };
-            assert_eq!(
-                total_1, total_2,
-                "invalid test input: total width not the same {total_1}, {total_2}"
-            );
-            let (expected, total_3, None) = parse::<COLS>(expected) else {
-                panic!("invalid test input: expected should not be marked: {expected:?}");
-            };
-            assert_eq!(
-                total_2, total_3,
-                "invalid test input: total width not the same"
-            );
-            let resize_behavior = parse_resize_behavior::<COLS>(resize_behavior, total_1);
-            let result = TableColumnWidths::reset_to_initial_size(
-                column_index,
-                widths,
-                initial_sizes,
-                &resize_behavior,
-            );
-            let is_eq = is_almost_eq(&result, &expected);
-            if !is_eq {
-                let result_str = cols_to_str(&result, total_1);
-                let expected_str = cols_to_str(&expected, total_1);
-                panic!(
-                    "resize failed\ncomputed: {result_str}\nexpected: {expected_str}\n\ncomputed values: {result:?}\nexpected values: {expected:?}\n:minimum widths: {resize_behavior:?}"
-                );
-            }
-        }
-
-        macro_rules! check_reset_size {
-            (columns: $cols:expr, starting: $initial:expr, snapshot: $current:expr, expected: $expected:expr, resizing: $resizing:expr $(,)?) => {
-                check_reset_size::<$cols>($initial, $current, $expected, $resizing);
-            };
-            ($name:ident, columns: $cols:expr, starting: $initial:expr, snapshot: $current:expr, expected: $expected:expr, minimums: $resizing:expr $(,)?) => {
-                #[test]
-                fn $name() {
-                    check_reset_size::<$cols>($initial, $current, $expected, $resizing);
-                }
-            };
-        }
-
-        check_reset_size!(
-            basic_right,
-            columns: 5,
-            starting: "**|**|**|**|**",
-            snapshot: "**|**|X|***|**",
-            expected: "**|**|**|**|**",
-            minimums: "X|*|*|*|*",
-        );
-
-        check_reset_size!(
-            basic_left,
-            columns: 5,
-            starting: "**|**|**|**|**",
-            snapshot: "**|**|***|X|**",
-            expected: "**|**|**|**|**",
-            minimums: "X|*|*|*|**",
-        );
-
-        check_reset_size!(
-            squashed_left_reset_col2,
-            columns: 6,
-            starting: "*|***|**|**|****|*",
-            snapshot: "*|*|X|*|*|********",
-            expected: "*|*|**|*|*|*******",
-            minimums: "X|*|*|*|*|*",
-        );
-
-        check_reset_size!(
-            grow_cascading_right,
-            columns: 6,
-            starting: "*|***|****|**|***|*",
-            snapshot: "*|***|X|**|**|*****",
-            expected: "*|***|****|*|*|****",
-            minimums: "X|*|*|*|*|*",
-        );
-
-        check_reset_size!(
-           squashed_right_reset_col4,
-           columns: 6,
-           starting: "*|***|**|**|****|*",
-           snapshot: "*|********|*|*|X|*",
-           expected: "*|*****|*|*|****|*",
-           minimums: "X|*|*|*|*|*",
-        );
-
-        check_reset_size!(
-            reset_col6_right,
-            columns: 6,
-            starting: "*|***|**|***|***|**",
-            snapshot: "*|***|**|***|**|XXX",
-            expected: "*|***|**|***|***|**",
-            minimums: "X|*|*|*|*|*",
-        );
-
-        check_reset_size!(
-            reset_col6_left,
-            columns: 6,
-            starting: "*|***|**|***|***|**",
-            snapshot: "*|***|**|***|****|X",
-            expected: "*|***|**|***|***|**",
-            minimums: "X|*|*|*|*|*",
-        );
-
-        check_reset_size!(
-            last_column_grow_cascading,
-            columns: 6,
-            starting: "*|***|**|**|**|***",
-            snapshot: "*|*******|*|**|*|X",
-            expected: "*|******|*|*|*|***",
-            minimums: "X|*|*|*|*|*",
-        );
-
-        check_reset_size!(
-            goes_left_when_left_has_extreme_diff,
-            columns: 6,
-            starting: "*|***|****|**|**|***",
-            snapshot: "*|********|X|*|**|**",
-            expected: "*|*****|****|*|**|**",
-            minimums: "X|*|*|*|*|*",
-        );
-
-        check_reset_size!(
-            basic_shrink_right,
-            columns: 6,
-            starting: "**|**|**|**|**|**",
-            snapshot: "**|**|XXX|*|**|**",
-            expected: "**|**|**|**|**|**",
-            minimums: "X|*|*|*|*|*",
-        );
-
-        check_reset_size!(
-            shrink_should_go_left,
-            columns: 6,
-            starting: "*|***|**|*|*|*",
-            snapshot: "*|*|XXX|**|*|*",
-            expected: "*|**|**|**|*|*",
-            minimums: "X|*|*|*|*|*",
-        );
-
-        check_reset_size!(
-            shrink_should_go_right,
-            columns: 6,
-            starting: "*|***|**|**|**|*",
-            snapshot: "*|****|XXX|*|*|*",
-            expected: "*|****|**|**|*|*",
-            minimums: "X|*|*|*|*|*",
-        );
-    }
-
-    mod drag_handle {
-        use super::*;
-
-        fn parse<const COLS: usize>(input: &str) -> ([f32; COLS], f32, Option<usize>) {
-            let mut widths = [f32::NAN; COLS];
-            let column_index = input.replace("*", "").find("I");
-            for (index, col) in input.replace("I", "|").split('|').enumerate() {
-                widths[index] = col.len() as f32;
-            }
-
-            for w in widths {
-                assert!(w.is_finite(), "incorrect number of columns");
-            }
-            let total = widths.iter().sum::<f32>();
-            for width in &mut widths {
-                *width /= total;
-            }
-            (widths, total, column_index)
-        }
-
-        #[track_caller]
-        fn check<const COLS: usize>(
-            distance: i32,
-            widths: &str,
-            expected: &str,
-            resize_behavior: &str,
-        ) {
-            let (mut widths, total_1, Some(column_index)) = parse::<COLS>(widths) else {
-                panic!("invalid test input: widths should be marked");
-            };
-            let (expected, total_2, None) = parse::<COLS>(expected) else {
-                panic!("invalid test input: expected should not be marked: {expected:?}");
-            };
-            assert_eq!(
-                total_1, total_2,
-                "invalid test input: total width not the same"
-            );
-            let resize_behavior = parse_resize_behavior::<COLS>(resize_behavior, total_1);
-
-            let distance = distance as f32 / total_1;
-
-            let result = TableColumnWidths::drag_column_handle(
-                distance,
-                column_index,
-                &mut widths,
-                &resize_behavior,
-            );
-
-            let is_eq = is_almost_eq(&widths, &expected);
-            if !is_eq {
-                let result_str = cols_to_str(&widths, total_1);
-                let expected_str = cols_to_str(&expected, total_1);
-                panic!(
-                    "resize failed\ncomputed: {result_str}\nexpected: {expected_str}\n\ncomputed values: {result:?}\nexpected values: {expected:?}\n:minimum widths: {resize_behavior:?}"
-                );
-            }
-        }
-
-        macro_rules! check {
-            (columns: $cols:expr, distance: $dist:expr, snapshot: $current:expr, expected: $expected:expr, resizing: $resizing:expr $(,)?) => {
-                check!($cols, $dist, $snapshot, $expected, $resizing);
-            };
-            ($name:ident, columns: $cols:expr, distance: $dist:expr, snapshot: $current:expr, expected: $expected:expr, minimums: $resizing:expr $(,)?) => {
-                #[test]
-                fn $name() {
-                    check::<$cols>($dist, $current, $expected, $resizing);
-                }
-            };
-        }
-
-        check!(
-            basic_right_drag,
-            columns: 3,
-            distance: 1,
-            snapshot: "**|**I**",
-            expected: "**|***|*",
-            minimums: "X|*|*",
-        );
-
-        check!(
-            drag_left_against_mins,
-            columns: 5,
-            distance: -1,
-            snapshot: "*|*|*|*I*******",
-            expected: "*|*|*|*|*******",
-            minimums: "X|*|*|*|*",
-        );
-
-        check!(
-            drag_left,
-            columns: 5,
-            distance: -2,
-            snapshot: "*|*|*|*****I***",
-            expected: "*|*|*|***|*****",
-            minimums: "X|*|*|*|*",
-        );
-    }
-}
diff --git a/crates/ui/src/components/diff_stat.rs b/crates/ui/src/components/diff_stat.rs
deleted file mode 100644
index 2606963555..0000000000
--- a/crates/ui/src/components/diff_stat.rs
+++ /dev/null
@@ -1,85 +0,0 @@
-use crate::prelude::*;
-
-#[derive(IntoElement, RegisterComponent)]
-pub struct DiffStat {
-    id: ElementId,
-    added: usize,
-    removed: usize,
-}
-
-impl DiffStat {
-    pub fn new(id: impl Into<ElementId>, added: usize, removed: usize) -> Self {
-        Self {
-            id: id.into(),
-            added,
-            removed,
-        }
-    }
-}
-
-impl RenderOnce for DiffStat {
-    fn render(self, _: &mut Window, _cx: &mut App) -> impl IntoElement {
-        h_flex()
-            .id(self.id)
-            .gap_1()
-            .child(
-                h_flex()
-                    .gap_0p5()
-                    .child(
-                        Icon::new(IconName::Plus)
-                            .size(IconSize::XSmall)
-                            .color(Color::Success),
-                    )
-                    .child(
-                        Label::new(self.added.to_string())
-                            .color(Color::Success)
-                            .size(LabelSize::Small),
-                    ),
-            )
-            .child(
-                h_flex()
-                    .gap_0p5()
-                    .child(
-                        Icon::new(IconName::Dash)
-                            .size(IconSize::XSmall)
-                            .color(Color::Error),
-                    )
-                    .child(
-                        Label::new(self.removed.to_string())
-                            .color(Color::Error)
-                            .size(LabelSize::Small),
-                    ),
-            )
-    }
-}
-
-impl Component for DiffStat {
-    fn scope() -> ComponentScope {
-        ComponentScope::VersionControl
-    }
-
-    fn preview(_window: &mut Window, cx: &mut App) -> Option<AnyElement> {
-        let container = || {
-            h_flex()
-                .py_4()
-                .w_72()
-                .justify_center()
-                .border_1()
-                .border_color(cx.theme().colors().border_variant)
-                .bg(cx.theme().colors().panel_background)
-        };
-
-        let diff_stat_example = vec![single_example(
-            "Default",
-            container()
-                .child(DiffStat::new("id", 1, 2))
-                .into_any_element(),
-        )];
-
-        Some(
-            example_group(diff_stat_example)
-                .vertical()
-                .into_any_element(),
-        )
-    }
-}
diff --git a/crates/ui/src/components/disclosure.rs b/crates/ui/src/components/disclosure.rs
deleted file mode 100644
index 84282db2e3..0000000000
--- a/crates/ui/src/components/disclosure.rs
+++ /dev/null
@@ -1,152 +0,0 @@
-use std::sync::Arc;
-
-use gpui::{ClickEvent, CursorStyle, SharedString};
-
-use crate::{Color, IconButton, IconButtonShape, IconName, IconSize, prelude::*};
-
-#[derive(IntoElement, RegisterComponent)]
-pub struct Disclosure {
-    id: ElementId,
-    is_open: bool,
-    selected: bool,
-    disabled: bool,
-    on_toggle_expanded: Option<Arc<dyn Fn(&ClickEvent, &mut Window, &mut App) + 'static>>,
-    cursor_style: CursorStyle,
-    opened_icon: IconName,
-    closed_icon: IconName,
-    visible_on_hover: Option<SharedString>,
-}
-
-impl Disclosure {
-    pub fn new(id: impl Into<ElementId>, is_open: bool) -> Self {
-        Self {
-            id: id.into(),
-            is_open,
-            selected: false,
-            disabled: false,
-            on_toggle_expanded: None,
-            cursor_style: CursorStyle::PointingHand,
-            opened_icon: IconName::ChevronDown,
-            closed_icon: IconName::ChevronRight,
-            visible_on_hover: None,
-        }
-    }
-
-    pub fn on_toggle_expanded(
-        mut self,
-        handler: impl Into<Option<Arc<dyn Fn(&ClickEvent, &mut Window, &mut App) + 'static>>>,
-    ) -> Self {
-        self.on_toggle_expanded = handler.into();
-        self
-    }
-
-    pub fn opened_icon(mut self, icon: IconName) -> Self {
-        self.opened_icon = icon;
-        self
-    }
-
-    pub fn closed_icon(mut self, icon: IconName) -> Self {
-        self.closed_icon = icon;
-        self
-    }
-
-    pub fn disabled(mut self, disabled: bool) -> Self {
-        self.disabled = disabled;
-        self
-    }
-}
-
-impl Toggleable for Disclosure {
-    fn toggle_state(mut self, selected: bool) -> Self {
-        self.selected = selected;
-        self
-    }
-}
-
-impl Clickable for Disclosure {
-    fn on_click(mut self, handler: impl Fn(&ClickEvent, &mut Window, &mut App) + 'static) -> Self {
-        self.on_toggle_expanded = Some(Arc::new(handler));
-        self
-    }
-
-    fn cursor_style(mut self, cursor_style: gpui::CursorStyle) -> Self {
-        self.cursor_style = cursor_style;
-        self
-    }
-}
-
-impl VisibleOnHover for Disclosure {
-    fn visible_on_hover(mut self, group_name: impl Into<SharedString>) -> Self {
-        self.visible_on_hover = Some(group_name.into());
-        self
-    }
-}
-
-impl RenderOnce for Disclosure {
-    fn render(self, _window: &mut Window, _cx: &mut App) -> impl IntoElement {
-        IconButton::new(
-            self.id,
-            match self.is_open {
-                true => self.opened_icon,
-                false => self.closed_icon,
-            },
-        )
-        .shape(IconButtonShape::Square)
-        .icon_color(Color::Muted)
-        .icon_size(IconSize::Small)
-        .disabled(self.disabled)
-        .toggle_state(self.selected)
-        .when_some(self.visible_on_hover.clone(), |this, group_name| {
-            this.visible_on_hover(group_name)
-        })
-        .when_some(self.on_toggle_expanded, move |this, on_toggle| {
-            this.on_click(move |event, window, cx| on_toggle(event, window, cx))
-        })
-    }
-}
-
-impl Component for Disclosure {
-    fn scope() -> ComponentScope {
-        ComponentScope::Input
-    }
-
-    fn description() -> Option<&'static str> {
-        Some(
-            "An interactive element used to show or hide content, typically used in expandable sections or tree-like structures.",
-        )
-    }
-
-    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
-        Some(
-            v_flex()
-                .gap_6()
-                .children(vec![
-                    example_group_with_title(
-                        "Disclosure States",
-                        vec![
-                            single_example(
-                                "Closed",
-                                Disclosure::new("closed", false).into_any_element(),
-                            ),
-                            single_example(
-                                "Open",
-                                Disclosure::new("open", true).into_any_element(),
-                            ),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "Interactive Example",
-                        vec![single_example(
-                            "Toggleable",
-                            v_flex()
-                                .gap_2()
-                                .child(Disclosure::new("interactive", false).into_any_element())
-                                .child(Label::new("Click to toggle"))
-                                .into_any_element(),
-                        )],
-                    ),
-                ])
-                .into_any_element(),
-        )
-    }
-}
diff --git a/crates/ui/src/components/divider.rs b/crates/ui/src/components/divider.rs
deleted file mode 100644
index d6101f2320..0000000000
--- a/crates/ui/src/components/divider.rs
+++ /dev/null
@@ -1,248 +0,0 @@
-use gpui::{Hsla, IntoElement, PathBuilder, canvas, point};
-
-use crate::prelude::*;
-
-pub fn divider() -> Divider {
-    Divider {
-        style: DividerStyle::Solid,
-        direction: DividerDirection::Horizontal,
-        color: DividerColor::default(),
-        inset: false,
-    }
-}
-
-pub fn vertical_divider() -> Divider {
-    Divider {
-        style: DividerStyle::Solid,
-        direction: DividerDirection::Vertical,
-        color: DividerColor::default(),
-        inset: false,
-    }
-}
-
-#[derive(Clone, Copy, PartialEq)]
-enum DividerStyle {
-    Solid,
-    Dashed,
-}
-
-#[derive(Clone, Copy, PartialEq)]
-enum DividerDirection {
-    Horizontal,
-    Vertical,
-}
-
-/// The color of a [`Divider`].
-#[derive(Default)]
-pub enum DividerColor {
-    Border,
-    BorderFaded,
-    #[default]
-    BorderVariant,
-}
-
-impl DividerColor {
-    pub fn hsla(self, cx: &mut App) -> Hsla {
-        match self {
-            DividerColor::Border => cx.theme().colors().border,
-            DividerColor::BorderFaded => cx.theme().colors().border.opacity(0.6),
-            DividerColor::BorderVariant => cx.theme().colors().border_variant,
-        }
-    }
-}
-
-#[derive(IntoElement, RegisterComponent)]
-pub struct Divider {
-    style: DividerStyle,
-    direction: DividerDirection,
-    color: DividerColor,
-    inset: bool,
-}
-
-impl Divider {
-    pub fn horizontal() -> Self {
-        Self {
-            style: DividerStyle::Solid,
-            direction: DividerDirection::Horizontal,
-            color: DividerColor::default(),
-            inset: false,
-        }
-    }
-
-    pub fn vertical() -> Self {
-        Self {
-            style: DividerStyle::Solid,
-            direction: DividerDirection::Vertical,
-            color: DividerColor::default(),
-            inset: false,
-        }
-    }
-
-    pub fn horizontal_dashed() -> Self {
-        Self {
-            style: DividerStyle::Dashed,
-            direction: DividerDirection::Horizontal,
-            color: DividerColor::default(),
-            inset: false,
-        }
-    }
-
-    pub fn vertical_dashed() -> Self {
-        Self {
-            style: DividerStyle::Dashed,
-            direction: DividerDirection::Vertical,
-            color: DividerColor::default(),
-            inset: false,
-        }
-    }
-
-    pub fn inset(mut self) -> Self {
-        self.inset = true;
-        self
-    }
-
-    pub fn color(mut self, color: DividerColor) -> Self {
-        self.color = color;
-        self
-    }
-
-    pub fn render_solid(self, base: Div, cx: &mut App) -> impl IntoElement {
-        base.bg(self.color.hsla(cx))
-    }
-
-    pub fn render_dashed(self, base: Div) -> impl IntoElement {
-        base.relative().child(
-            canvas(
-                |_, _, _| {},
-                move |bounds, _, window, cx| {
-                    let mut builder = PathBuilder::stroke(px(1.)).dash_array(&[px(4.), px(2.)]);
-                    let (start, end) = match self.direction {
-                        DividerDirection::Horizontal => {
-                            let x = bounds.origin.x;
-                            let y = bounds.origin.y + px(0.5);
-                            (point(x, y), point(x + bounds.size.width, y))
-                        }
-                        DividerDirection::Vertical => {
-                            let x = bounds.origin.x + px(0.5);
-                            let y = bounds.origin.y;
-                            (point(x, y), point(x, y + bounds.size.height))
-                        }
-                    };
-                    builder.move_to(start);
-                    builder.line_to(end);
-                    if let Ok(line) = builder.build() {
-                        window.paint_path(line, self.color.hsla(cx));
-                    }
-                },
-            )
-            .absolute()
-            .size_full(),
-        )
-    }
-}
-
-impl RenderOnce for Divider {
-    fn render(self, _: &mut Window, cx: &mut App) -> impl IntoElement {
-        let base = match self.direction {
-            DividerDirection::Horizontal => {
-                div().h_px().w_full().when(self.inset, |this| this.mx_1p5())
-            }
-            DividerDirection::Vertical => {
-                div().w_px().h_full().when(self.inset, |this| this.my_1p5())
-            }
-        };
-
-        match self.style {
-            DividerStyle::Solid => self.render_solid(base, cx).into_any_element(),
-            DividerStyle::Dashed => self.render_dashed(base).into_any_element(),
-        }
-    }
-}
-
-impl Component for Divider {
-    fn scope() -> ComponentScope {
-        ComponentScope::Layout
-    }
-
-    fn description() -> Option<&'static str> {
-        Some(
-            "Visual separator used to create divisions between groups of content or sections in a layout.",
-        )
-    }
-
-    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
-        Some(
-            v_flex()
-                .gap_6()
-                .children(vec![
-                    example_group_with_title(
-                        "Horizontal Dividers",
-                        vec![
-                            single_example("Default", Divider::horizontal().into_any_element()),
-                            single_example(
-                                "Border Color",
-                                Divider::horizontal()
-                                    .color(DividerColor::Border)
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Inset",
-                                Divider::horizontal().inset().into_any_element(),
-                            ),
-                            single_example(
-                                "Dashed",
-                                Divider::horizontal_dashed().into_any_element(),
-                            ),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "Vertical Dividers",
-                        vec![
-                            single_example(
-                                "Default",
-                                div().h_16().child(Divider::vertical()).into_any_element(),
-                            ),
-                            single_example(
-                                "Border Color",
-                                div()
-                                    .h_16()
-                                    .child(Divider::vertical().color(DividerColor::Border))
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Inset",
-                                div()
-                                    .h_16()
-                                    .child(Divider::vertical().inset())
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Dashed",
-                                div()
-                                    .h_16()
-                                    .child(Divider::vertical_dashed())
-                                    .into_any_element(),
-                            ),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "Example Usage",
-                        vec![single_example(
-                            "Between Content",
-                            v_flex()
-                                .w_full()
-                                .gap_4()
-                                .px_4()
-                                .child(Label::new("Section One"))
-                                .child(Divider::horizontal())
-                                .child(Label::new("Section Two"))
-                                .child(Divider::horizontal_dashed())
-                                .child(Label::new("Section Three"))
-                                .into_any_element(),
-                        )],
-                    ),
-                ])
-                .into_any_element(),
-        )
-    }
-}
diff --git a/crates/ui/src/components/dropdown_menu.rs b/crates/ui/src/components/dropdown_menu.rs
deleted file mode 100644
index 5b5de7a257..0000000000
--- a/crates/ui/src/components/dropdown_menu.rs
+++ /dev/null
@@ -1,304 +0,0 @@
-use gpui::{AnyView, Corner, Entity, Pixels, Point};
-
-use crate::{ButtonLike, ContextMenu, PopoverMenu, prelude::*};
-
-use super::PopoverMenuHandle;
-
-#[derive(Debug, Default, Clone, Copy, PartialEq, Eq, Hash)]
-pub enum DropdownStyle {
-    #[default]
-    Solid,
-    Outlined,
-    Subtle,
-    Ghost,
-}
-
-enum LabelKind {
-    Text(SharedString),
-    Element(AnyElement),
-}
-
-#[derive(IntoElement, RegisterComponent)]
-pub struct DropdownMenu {
-    id: ElementId,
-    label: LabelKind,
-    trigger_size: ButtonSize,
-    trigger_tooltip: Option<Box<dyn Fn(&mut Window, &mut App) -> AnyView + 'static>>,
-    trigger_icon: Option<IconName>,
-    style: DropdownStyle,
-    menu: Entity<ContextMenu>,
-    full_width: bool,
-    disabled: bool,
-    handle: Option<PopoverMenuHandle<ContextMenu>>,
-    attach: Option<Corner>,
-    offset: Option<Point<Pixels>>,
-    tab_index: Option<isize>,
-    chevron: bool,
-}
-
-impl DropdownMenu {
-    pub fn new(
-        id: impl Into<ElementId>,
-        label: impl Into<SharedString>,
-        menu: Entity<ContextMenu>,
-    ) -> Self {
-        Self {
-            id: id.into(),
-            label: LabelKind::Text(label.into()),
-            trigger_size: ButtonSize::Default,
-            trigger_tooltip: None,
-            trigger_icon: Some(IconName::ChevronUpDown),
-            style: DropdownStyle::default(),
-            menu,
-            full_width: false,
-            disabled: false,
-            handle: None,
-            attach: None,
-            offset: None,
-            tab_index: None,
-            chevron: true,
-        }
-    }
-
-    pub fn new_with_element(
-        id: impl Into<ElementId>,
-        label: AnyElement,
-        menu: Entity<ContextMenu>,
-    ) -> Self {
-        Self {
-            id: id.into(),
-            label: LabelKind::Element(label),
-            trigger_size: ButtonSize::Default,
-            trigger_tooltip: None,
-            trigger_icon: Some(IconName::ChevronUpDown),
-            style: DropdownStyle::default(),
-            menu,
-            full_width: false,
-            disabled: false,
-            handle: None,
-            attach: None,
-            offset: None,
-            tab_index: None,
-            chevron: true,
-        }
-    }
-
-    pub fn style(mut self, style: DropdownStyle) -> Self {
-        self.style = style;
-        self
-    }
-
-    pub fn trigger_size(mut self, size: ButtonSize) -> Self {
-        self.trigger_size = size;
-        self
-    }
-
-    pub fn trigger_tooltip(
-        mut self,
-        tooltip: impl Fn(&mut Window, &mut App) -> AnyView + 'static,
-    ) -> Self {
-        self.trigger_tooltip = Some(Box::new(tooltip));
-        self
-    }
-
-    pub fn trigger_icon(mut self, icon: IconName) -> Self {
-        self.trigger_icon = Some(icon);
-        self
-    }
-
-    pub fn full_width(mut self, full_width: bool) -> Self {
-        self.full_width = full_width;
-        self
-    }
-
-    pub fn handle(mut self, handle: PopoverMenuHandle<ContextMenu>) -> Self {
-        self.handle = Some(handle);
-        self
-    }
-
-    /// Defines which corner of the handle to attach the menu's anchor to.
-    pub fn attach(mut self, attach: Corner) -> Self {
-        self.attach = Some(attach);
-        self
-    }
-
-    /// Offsets the position of the menu by that many pixels.
-    pub fn offset(mut self, offset: Point<Pixels>) -> Self {
-        self.offset = Some(offset);
-        self
-    }
-
-    pub fn tab_index(mut self, arg: isize) -> Self {
-        self.tab_index = Some(arg);
-        self
-    }
-
-    pub fn no_chevron(mut self) -> Self {
-        self.chevron = false;
-        self
-    }
-}
-
-impl Disableable for DropdownMenu {
-    fn disabled(mut self, disabled: bool) -> Self {
-        self.disabled = disabled;
-        self
-    }
-}
-
-impl RenderOnce for DropdownMenu {
-    fn render(self, _window: &mut Window, _cx: &mut App) -> impl IntoElement {
-        let button_style = match self.style {
-            DropdownStyle::Solid => ButtonStyle::Filled,
-            DropdownStyle::Subtle => ButtonStyle::Subtle,
-            DropdownStyle::Outlined => ButtonStyle::Outlined,
-            DropdownStyle::Ghost => ButtonStyle::Transparent,
-        };
-
-        let full_width = self.full_width;
-        let trigger_size = self.trigger_size;
-
-        let (text_button, element_button) = match self.label {
-            LabelKind::Text(text) => (
-                Some(
-                    Button::new(self.id.clone(), text)
-                        .style(button_style)
-                        .when(self.chevron, |this| {
-                            this.icon(self.trigger_icon)
-                                .icon_position(IconPosition::End)
-                                .icon_size(IconSize::XSmall)
-                                .icon_color(Color::Muted)
-                        })
-                        .when(full_width, |this| this.full_width())
-                        .size(trigger_size)
-                        .disabled(self.disabled)
-                        .when_some(self.tab_index, |this, tab_index| this.tab_index(tab_index)),
-                ),
-                None,
-            ),
-            LabelKind::Element(element) => (
-                None,
-                Some(
-                    ButtonLike::new(self.id.clone())
-                        .child(element)
-                        .style(button_style)
-                        .when(self.chevron, |this| {
-                            this.child(
-                                Icon::new(IconName::ChevronUpDown)
-                                    .size(IconSize::XSmall)
-                                    .color(Color::Muted),
-                            )
-                        })
-                        .when(full_width, |this| this.full_width())
-                        .size(trigger_size)
-                        .disabled(self.disabled)
-                        .when_some(self.tab_index, |this, tab_index| this.tab_index(tab_index)),
-                ),
-            ),
-        };
-
-        let mut popover = PopoverMenu::new((self.id.clone(), "popover"))
-            .full_width(self.full_width)
-            .menu(move |_window, _cx| Some(self.menu.clone()));
-
-        popover = match (text_button, element_button, self.trigger_tooltip) {
-            (Some(text_button), None, Some(tooltip)) => {
-                popover.trigger_with_tooltip(text_button, tooltip)
-            }
-            (Some(text_button), None, None) => popover.trigger(text_button),
-            (None, Some(element_button), Some(tooltip)) => {
-                popover.trigger_with_tooltip(element_button, tooltip)
-            }
-            (None, Some(element_button), None) => popover.trigger(element_button),
-            _ => popover,
-        };
-
-        popover
-            .attach(match self.attach {
-                Some(attach) => attach,
-                None => Corner::BottomRight,
-            })
-            .when_some(self.offset, |this, offset| this.offset(offset))
-            .when_some(self.handle, |this, handle| this.with_handle(handle))
-    }
-}
-
-impl Component for DropdownMenu {
-    fn scope() -> ComponentScope {
-        ComponentScope::Input
-    }
-
-    fn name() -> &'static str {
-        "DropdownMenu"
-    }
-
-    fn description() -> Option<&'static str> {
-        Some(
-            "A dropdown menu displays a list of actions or options. A dropdown menu is always activated by clicking a trigger (or via a keybinding).",
-        )
-    }
-
-    fn preview(window: &mut Window, cx: &mut App) -> Option<AnyElement> {
-        let menu = ContextMenu::build(window, cx, |this, _, _| {
-            this.entry("Option 1", None, |_, _| {})
-                .entry("Option 2", None, |_, _| {})
-                .entry("Option 3", None, |_, _| {})
-                .separator()
-                .entry("Option 4", None, |_, _| {})
-        });
-
-        Some(
-            v_flex()
-                .gap_6()
-                .children(vec![
-                    example_group_with_title(
-                        "Basic Usage",
-                        vec![
-                            single_example(
-                                "Default",
-                                DropdownMenu::new("default", "Select an option", menu.clone())
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Full Width",
-                                DropdownMenu::new(
-                                    "full-width",
-                                    "Full Width Dropdown",
-                                    menu.clone(),
-                                )
-                                .full_width(true)
-                                .into_any_element(),
-                            ),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "Styles",
-                        vec![
-                            single_example(
-                                "Outlined",
-                                DropdownMenu::new("outlined", "Outlined Dropdown", menu.clone())
-                                    .style(DropdownStyle::Outlined)
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Ghost",
-                                DropdownMenu::new("ghost", "Ghost Dropdown", menu.clone())
-                                    .style(DropdownStyle::Ghost)
-                                    .into_any_element(),
-                            ),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "States",
-                        vec![single_example(
-                            "Disabled",
-                            DropdownMenu::new("disabled", "Disabled Dropdown", menu)
-                                .disabled(true)
-                                .into_any_element(),
-                        )],
-                    ),
-                ])
-                .into_any_element(),
-        )
-    }
-}
diff --git a/crates/ui/src/components/facepile.rs b/crates/ui/src/components/facepile.rs
deleted file mode 100644
index 79a36871d6..0000000000
--- a/crates/ui/src/components/facepile.rs
+++ /dev/null
@@ -1,135 +0,0 @@
-use crate::component_prelude::*;
-use crate::prelude::*;
-use gpui::{AnyElement, StyleRefinement};
-use smallvec::SmallVec;
-
-use super::Avatar;
-
-/// An element that displays a collection of (usually) faces stacked
-/// horizontally, with the left-most face on top, visually descending
-/// from left to right.
-///
-/// Facepiles are used to display a group of people or things,
-/// such as a list of participants in a collaboration session.
-///
-/// # Examples
-///
-/// ## Default
-///
-/// A default, horizontal facepile.
-///
-/// ```
-/// use gpui::IntoElement;
-/// use ui::{Avatar, Facepile, EXAMPLE_FACES};
-///
-/// let facepile = Facepile::new(
-///     EXAMPLE_FACES.iter().take(3).map(|&url|
-///         Avatar::new(url).into_any_element()).collect()
-/// );
-/// ```
-#[derive(IntoElement, Documented, RegisterComponent)]
-pub struct Facepile {
-    base: Div,
-    faces: SmallVec<[AnyElement; 2]>,
-}
-
-impl Facepile {
-    /// Creates a new empty facepile.
-    pub fn empty() -> Self {
-        Self::new(SmallVec::new())
-    }
-
-    /// Creates a new facepile with the given faces.
-    pub fn new(faces: SmallVec<[AnyElement; 2]>) -> Self {
-        Self { base: div(), faces }
-    }
-}
-
-impl ParentElement for Facepile {
-    fn extend(&mut self, elements: impl IntoIterator<Item = AnyElement>) {
-        self.faces.extend(elements);
-    }
-}
-
-// Style methods.
-impl Facepile {
-    fn style(&mut self) -> &mut StyleRefinement {
-        self.base.style()
-    }
-
-    gpui::padding_style_methods!({
-        visibility: pub
-    });
-}
-
-impl RenderOnce for Facepile {
-    fn render(self, _window: &mut Window, _cx: &mut App) -> impl IntoElement {
-        // Lay the faces out in reverse so they overlap in the desired order (left to right, front to back)
-        self.base
-            .flex()
-            .flex_row_reverse()
-            .items_center()
-            .justify_start()
-            .children(
-                self.faces
-                    .into_iter()
-                    .enumerate()
-                    .rev()
-                    .map(|(ix, player)| div().when(ix > 0, |div| div.ml_neg_1()).child(player)),
-            )
-    }
-}
-
-pub const EXAMPLE_FACES: [&str; 6] = [
-    "https://avatars.githubusercontent.com/u/326587?s=60&v=4",
-    "https://avatars.githubusercontent.com/u/2280405?s=60&v=4",
-    "https://avatars.githubusercontent.com/u/1789?s=60&v=4",
-    "https://avatars.githubusercontent.com/u/67129314?s=60&v=4",
-    "https://avatars.githubusercontent.com/u/482957?s=60&v=4",
-    "https://avatars.githubusercontent.com/u/1714999?s=60&v=4",
-];
-
-impl Component for Facepile {
-    fn scope() -> ComponentScope {
-        ComponentScope::Collaboration
-    }
-
-    fn description() -> Option<&'static str> {
-        Some(
-            "Displays a collection of avatars or initials in a compact format. Often used to represent active collaborators or a subset of contributors.",
-        )
-    }
-
-    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
-        Some(
-            v_flex()
-                .gap_6()
-                .children(vec![example_group_with_title(
-                    "Facepile Examples",
-                    vec![
-                        single_example(
-                            "Default",
-                            Facepile::new(
-                                EXAMPLE_FACES
-                                    .iter()
-                                    .map(|&url| Avatar::new(url).into_any_element())
-                                    .collect(),
-                            )
-                            .into_any_element(),
-                        ),
-                        single_example(
-                            "Custom Size",
-                            Facepile::new(
-                                EXAMPLE_FACES
-                                    .iter()
-                                    .map(|&url| Avatar::new(url).size(px(24.)).into_any_element())
-                                    .collect(),
-                            )
-                            .into_any_element(),
-                        ),
-                    ],
-                )])
-                .into_any_element(),
-        )
-    }
-}
diff --git a/crates/ui/src/components/group.rs b/crates/ui/src/components/group.rs
deleted file mode 100644
index 12462bb24b..0000000000
--- a/crates/ui/src/components/group.rs
+++ /dev/null
@@ -1,57 +0,0 @@
-use gpui::{Div, div, prelude::*};
-
-/// Creates a horizontal group with tight, consistent spacing.
-///
-/// xs: ~2px @16px/rem
-pub fn h_group_sm() -> Div {
-    div().flex().gap_0p5()
-}
-
-/// Creates a horizontal group with consistent spacing.
-///
-/// s: ~4px @16px/rem
-pub fn h_group() -> Div {
-    div().flex().gap_1()
-}
-
-/// Creates a horizontal group with consistent spacing.
-///
-/// m: ~6px @16px/rem
-pub fn h_group_lg() -> Div {
-    div().flex().gap_1p5()
-}
-
-/// Creates a horizontal group with consistent spacing.
-///
-/// l: ~8px @16px/rem
-pub fn h_group_xl() -> Div {
-    div().flex().gap_2()
-}
-
-/// Creates a vertical group with tight, consistent spacing.
-///
-/// xs: ~2px @16px/rem
-pub fn v_group_sm() -> Div {
-    div().flex().flex_col().gap_0p5()
-}
-
-/// Creates a vertical group with consistent spacing.
-///
-/// s: ~4px @16px/rem
-pub fn v_group() -> Div {
-    div().flex().flex_col().gap_1()
-}
-
-/// Creates a vertical group with consistent spacing.
-///
-/// m: ~6px @16px/rem
-pub fn v_group_lg() -> Div {
-    div().flex().flex_col().gap_1p5()
-}
-
-/// Creates a vertical group with consistent spacing.
-///
-/// l: ~8px @16px/rem
-pub fn v_group_xl() -> Div {
-    div().flex().flex_col().gap_2()
-}
diff --git a/crates/ui/src/components/icon.rs b/crates/ui/src/components/icon.rs
deleted file mode 100644
index 1c8e36ec18..0000000000
--- a/crates/ui/src/components/icon.rs
+++ /dev/null
@@ -1,371 +0,0 @@
-mod decorated_icon;
-mod icon_decoration;
-
-use std::path::{Path, PathBuf};
-use std::sync::Arc;
-
-pub use decorated_icon::*;
-use gpui::{AnimationElement, AnyElement, Hsla, IntoElement, Rems, Transformation, img, svg};
-pub use icon_decoration::*;
-pub use icons::*;
-
-use crate::traits::transformable::Transformable;
-use crate::{Indicator, prelude::*};
-
-#[derive(IntoElement)]
-pub enum AnyIcon {
-    Icon(Icon),
-    AnimatedIcon(AnimationElement<Icon>),
-}
-
-impl AnyIcon {
-    /// Returns a new [`AnyIcon`] after applying the given mapping function
-    /// to the contained [`Icon`].
-    pub fn map(self, f: impl FnOnce(Icon) -> Icon) -> Self {
-        match self {
-            Self::Icon(icon) => Self::Icon(f(icon)),
-            Self::AnimatedIcon(animated_icon) => Self::AnimatedIcon(animated_icon.map_element(f)),
-        }
-    }
-}
-
-impl From<Icon> for AnyIcon {
-    fn from(value: Icon) -> Self {
-        Self::Icon(value)
-    }
-}
-
-impl From<AnimationElement<Icon>> for AnyIcon {
-    fn from(value: AnimationElement<Icon>) -> Self {
-        Self::AnimatedIcon(value)
-    }
-}
-
-impl RenderOnce for AnyIcon {
-    fn render(self, _window: &mut Window, _cx: &mut App) -> impl IntoElement {
-        match self {
-            Self::Icon(icon) => icon.into_any_element(),
-            Self::AnimatedIcon(animated_icon) => animated_icon.into_any_element(),
-        }
-    }
-}
-
-#[derive(Default, PartialEq, Copy, Clone)]
-pub enum IconSize {
-    /// 10px
-    Indicator,
-    /// 12px
-    XSmall,
-    /// 14px
-    Small,
-    #[default]
-    /// 16px
-    Medium,
-    /// 48px
-    XLarge,
-    Custom(Rems),
-}
-
-impl IconSize {
-    pub fn rems(self) -> Rems {
-        match self {
-            IconSize::Indicator => rems_from_px(10.),
-            IconSize::XSmall => rems_from_px(12.),
-            IconSize::Small => rems_from_px(14.),
-            IconSize::Medium => rems_from_px(16.),
-            IconSize::XLarge => rems_from_px(48.),
-            IconSize::Custom(size) => size,
-        }
-    }
-
-    /// Returns the individual components of the square that contains this [`IconSize`].
-    ///
-    /// The returned tuple contains:
-    ///   1. The length of one side of the square
-    ///   2. The padding of one side of the square
-    pub fn square_components(&self, window: &mut Window, cx: &mut App) -> (Pixels, Pixels) {
-        let icon_size = self.rems() * window.rem_size();
-        let padding = match self {
-            IconSize::Indicator => DynamicSpacing::Base00.px(cx),
-            IconSize::XSmall => DynamicSpacing::Base02.px(cx),
-            IconSize::Small => DynamicSpacing::Base02.px(cx),
-            IconSize::Medium => DynamicSpacing::Base02.px(cx),
-            IconSize::XLarge => DynamicSpacing::Base02.px(cx),
-            // TODO: Wire into dynamic spacing
-            IconSize::Custom(size) => size.to_pixels(window.rem_size()),
-        };
-
-        (icon_size, padding)
-    }
-
-    /// Returns the length of a side of the square that contains this [`IconSize`], with padding.
-    pub fn square(&self, window: &mut Window, cx: &mut App) -> Pixels {
-        let (icon_size, padding) = self.square_components(window, cx);
-
-        icon_size + padding * 2.
-    }
-}
-
-impl From<IconName> for Icon {
-    fn from(icon: IconName) -> Self {
-        Icon::new(icon)
-    }
-}
-
-/// The source of an icon.
-enum IconSource {
-    /// An SVG embedded in the Zed binary.
-    Embedded(SharedString),
-    /// An image file located at the specified path.
-    ///
-    /// Currently our SVG renderer is missing support for rendering polychrome SVGs.
-    ///
-    /// In order to support icon themes, we render the icons as images instead.
-    External(Arc<Path>),
-    /// An SVG not embedded in the Zed binary.
-    ExternalSvg(SharedString),
-}
-
-impl IconSource {
-    fn from_path(path: impl Into<SharedString>) -> Self {
-        let path = path.into();
-        if path.starts_with("icons/") {
-            Self::Embedded(path)
-        } else {
-            Self::External(Arc::from(PathBuf::from(path.as_ref())))
-        }
-    }
-}
-
-#[derive(IntoElement, RegisterComponent)]
-pub struct Icon {
-    source: IconSource,
-    color: Color,
-    size: Rems,
-    transformation: Transformation,
-}
-
-impl Icon {
-    pub fn new(icon: IconName) -> Self {
-        Self {
-            source: IconSource::Embedded(icon.path().into()),
-            color: Color::default(),
-            size: IconSize::default().rems(),
-            transformation: Transformation::default(),
-        }
-    }
-
-    pub fn from_path(path: impl Into<SharedString>) -> Self {
-        Self {
-            source: IconSource::from_path(path),
-            color: Color::default(),
-            size: IconSize::default().rems(),
-            transformation: Transformation::default(),
-        }
-    }
-
-    pub fn from_external_svg(svg: SharedString) -> Self {
-        Self {
-            source: IconSource::ExternalSvg(svg),
-            color: Color::default(),
-            size: IconSize::default().rems(),
-            transformation: Transformation::default(),
-        }
-    }
-
-    pub fn color(mut self, color: Color) -> Self {
-        self.color = color;
-        self
-    }
-
-    pub fn size(mut self, size: IconSize) -> Self {
-        self.size = size.rems();
-        self
-    }
-
-    /// Sets a custom size for the icon, in [`Rems`].
-    ///
-    /// Not to be exposed outside of the `ui` crate.
-    pub(crate) fn custom_size(mut self, size: Rems) -> Self {
-        self.size = size;
-        self
-    }
-}
-
-impl Transformable for Icon {
-    fn transform(mut self, transformation: Transformation) -> Self {
-        self.transformation = transformation;
-        self
-    }
-}
-
-impl RenderOnce for Icon {
-    fn render(self, _: &mut Window, cx: &mut App) -> impl IntoElement {
-        match self.source {
-            IconSource::Embedded(path) => svg()
-                .with_transformation(self.transformation)
-                .size(self.size)
-                .flex_none()
-                .path(path)
-                .text_color(self.color.color(cx))
-                .into_any_element(),
-            IconSource::ExternalSvg(path) => svg()
-                .external_path(path)
-                .with_transformation(self.transformation)
-                .size(self.size)
-                .flex_none()
-                .text_color(self.color.color(cx))
-                .into_any_element(),
-            IconSource::External(path) => img(path)
-                .size(self.size)
-                .flex_none()
-                .text_color(self.color.color(cx))
-                .into_any_element(),
-        }
-    }
-}
-
-#[derive(IntoElement)]
-pub struct IconWithIndicator {
-    icon: Icon,
-    indicator: Option<Indicator>,
-    indicator_border_color: Option<Hsla>,
-}
-
-impl IconWithIndicator {
-    pub fn new(icon: Icon, indicator: Option<Indicator>) -> Self {
-        Self {
-            icon,
-            indicator,
-            indicator_border_color: None,
-        }
-    }
-
-    pub fn indicator(mut self, indicator: Option<Indicator>) -> Self {
-        self.indicator = indicator;
-        self
-    }
-
-    pub fn indicator_color(mut self, color: Color) -> Self {
-        if let Some(indicator) = self.indicator.as_mut() {
-            indicator.color = color;
-        }
-        self
-    }
-
-    pub fn indicator_border_color(mut self, color: Option<Hsla>) -> Self {
-        self.indicator_border_color = color;
-        self
-    }
-}
-
-impl RenderOnce for IconWithIndicator {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let indicator_border_color = self
-            .indicator_border_color
-            .unwrap_or_else(|| cx.theme().colors().elevated_surface_background);
-
-        div()
-            .relative()
-            .child(self.icon)
-            .when_some(self.indicator, |this, indicator| {
-                this.child(
-                    div()
-                        .absolute()
-                        .size_2p5()
-                        .border_2()
-                        .border_color(indicator_border_color)
-                        .rounded_full()
-                        .bottom_neg_0p5()
-                        .right_neg_0p5()
-                        .child(indicator),
-                )
-            })
-    }
-}
-
-impl Component for Icon {
-    fn scope() -> ComponentScope {
-        ComponentScope::Images
-    }
-
-    fn description() -> Option<&'static str> {
-        Some(
-            "A versatile icon component that supports SVG and image-based icons with customizable size, color, and transformations.",
-        )
-    }
-
-    fn preview(_window: &mut Window, cx: &mut App) -> Option<AnyElement> {
-        Some(
-            v_flex()
-                .gap_6()
-                .children(vec![
-                    example_group_with_title(
-                        "Sizes",
-                        vec![single_example(
-                            "XSmall, Small, Default, Large",
-                            h_flex()
-                                .gap_1()
-                                .child(
-                                    Icon::new(IconName::Star)
-                                        .size(IconSize::XSmall)
-                                        .into_any_element(),
-                                )
-                                .child(
-                                    Icon::new(IconName::Star)
-                                        .size(IconSize::Small)
-                                        .into_any_element(),
-                                )
-                                .child(Icon::new(IconName::Star).into_any_element())
-                                .child(
-                                    Icon::new(IconName::Star)
-                                        .size(IconSize::XLarge)
-                                        .into_any_element(),
-                                )
-                                .into_any_element(),
-                        )],
-                    ),
-                    example_group_with_title(
-                        "Colors",
-                        vec![single_example(
-                            "Default & Custom",
-                            h_flex()
-                                .gap_1()
-                                .child(Icon::new(IconName::Star).into_any_element())
-                                .child(
-                                    Icon::new(IconName::Star)
-                                        .color(Color::Error)
-                                        .into_any_element(),
-                                )
-                                .into_any_element(),
-                        )],
-                    ),
-                    example_group_with_title(
-                        "All Icons",
-                        vec![single_example(
-                            "All Icons",
-                            h_flex()
-                                .image_cache(gpui::retain_all("all icons"))
-                                .flex_wrap()
-                                .gap_2()
-                                .children(<IconName as strum::IntoEnumIterator>::iter().map(
-                                    |icon_name| {
-                                        h_flex()
-                                            .p_1()
-                                            .gap_1()
-                                            .border_1()
-                                            .border_color(cx.theme().colors().border_variant)
-                                            .bg(cx.theme().colors().element_disabled)
-                                            .rounded_sm()
-                                            .child(Icon::new(icon_name).into_any_element())
-                                            .child(SharedString::new_static(icon_name.into()))
-                                    },
-                                ))
-                                .into_any_element(),
-                        )],
-                    ),
-                ])
-                .into_any_element(),
-        )
-    }
-}
diff --git a/crates/ui/src/components/icon/decorated_icon.rs b/crates/ui/src/components/icon/decorated_icon.rs
deleted file mode 100644
index 82ca844c38..0000000000
--- a/crates/ui/src/components/icon/decorated_icon.rs
+++ /dev/null
@@ -1,106 +0,0 @@
-use gpui::{AnyElement, IntoElement, Point};
-
-use crate::{IconDecoration, IconDecorationKind, prelude::*};
-
-#[derive(IntoElement, RegisterComponent)]
-pub struct DecoratedIcon {
-    icon: Icon,
-    decoration: Option<IconDecoration>,
-}
-
-impl DecoratedIcon {
-    pub fn new(icon: Icon, decoration: Option<IconDecoration>) -> Self {
-        Self { icon, decoration }
-    }
-}
-
-impl RenderOnce for DecoratedIcon {
-    fn render(self, _window: &mut Window, _cx: &mut App) -> impl IntoElement {
-        div()
-            .relative()
-            .size(self.icon.size)
-            .child(self.icon)
-            .children(self.decoration)
-    }
-}
-
-impl Component for DecoratedIcon {
-    fn scope() -> ComponentScope {
-        ComponentScope::Images
-    }
-
-    fn description() -> Option<&'static str> {
-        Some(
-            "An icon with an optional decoration overlay (like an X, triangle, or dot) that can be positioned relative to the icon",
-        )
-    }
-
-    fn preview(_window: &mut Window, cx: &mut App) -> Option<AnyElement> {
-        let decoration_x = IconDecoration::new(
-            IconDecorationKind::X,
-            cx.theme().colors().surface_background,
-            cx,
-        )
-        .color(cx.theme().status().error)
-        .position(Point {
-            x: px(-2.),
-            y: px(-2.),
-        });
-
-        let decoration_triangle = IconDecoration::new(
-            IconDecorationKind::Triangle,
-            cx.theme().colors().surface_background,
-            cx,
-        )
-        .color(cx.theme().status().error)
-        .position(Point {
-            x: px(-2.),
-            y: px(-2.),
-        });
-
-        let decoration_dot = IconDecoration::new(
-            IconDecorationKind::Dot,
-            cx.theme().colors().surface_background,
-            cx,
-        )
-        .color(cx.theme().status().error)
-        .position(Point {
-            x: px(-2.),
-            y: px(-2.),
-        });
-
-        Some(
-            v_flex()
-                .gap_6()
-                .children(vec![example_group_with_title(
-                    "Decorations",
-                    vec![
-                        single_example(
-                            "No Decoration",
-                            DecoratedIcon::new(Icon::new(IconName::FileDoc), None)
-                                .into_any_element(),
-                        ),
-                        single_example(
-                            "X Decoration",
-                            DecoratedIcon::new(Icon::new(IconName::FileDoc), Some(decoration_x))
-                                .into_any_element(),
-                        ),
-                        single_example(
-                            "Triangle Decoration",
-                            DecoratedIcon::new(
-                                Icon::new(IconName::FileDoc),
-                                Some(decoration_triangle),
-                            )
-                            .into_any_element(),
-                        ),
-                        single_example(
-                            "Dot Decoration",
-                            DecoratedIcon::new(Icon::new(IconName::FileDoc), Some(decoration_dot))
-                                .into_any_element(),
-                        ),
-                    ],
-                )])
-                .into_any_element(),
-        )
-    }
-}
diff --git a/crates/ui/src/components/icon/icon_decoration.rs b/crates/ui/src/components/icon/icon_decoration.rs
deleted file mode 100644
index 9f84a8bcf4..0000000000
--- a/crates/ui/src/components/icon/icon_decoration.rs
+++ /dev/null
@@ -1,159 +0,0 @@
-use std::sync::Arc;
-
-use gpui::{Hsla, IntoElement, Point, svg};
-use strum::{EnumIter, EnumString, IntoStaticStr};
-
-use crate::prelude::*;
-
-const ICON_DECORATION_SIZE: Pixels = px(11.);
-
-/// An icon silhouette used to knockout the background of an element for an icon
-/// to sit on top of it, emulating a stroke/border.
-#[derive(Debug, PartialEq, Eq, Copy, Clone, EnumIter, EnumString, IntoStaticStr)]
-#[strum(serialize_all = "snake_case")]
-pub enum KnockoutIconName {
-    XFg,
-    XBg,
-    DotFg,
-    DotBg,
-    TriangleFg,
-    TriangleBg,
-}
-
-impl KnockoutIconName {
-    /// Returns the path to this icon.
-    pub fn path(&self) -> Arc<str> {
-        let file_stem: &'static str = self.into();
-        format!("icons/knockouts/{file_stem}.svg").into()
-    }
-}
-
-#[derive(Debug, PartialEq, Eq, Copy, Clone, EnumIter, EnumString)]
-pub enum IconDecorationKind {
-    X,
-    Dot,
-    Triangle,
-}
-
-impl IconDecorationKind {
-    fn fg(&self) -> KnockoutIconName {
-        match self {
-            Self::X => KnockoutIconName::XFg,
-            Self::Dot => KnockoutIconName::DotFg,
-            Self::Triangle => KnockoutIconName::TriangleFg,
-        }
-    }
-
-    fn bg(&self) -> KnockoutIconName {
-        match self {
-            Self::X => KnockoutIconName::XBg,
-            Self::Dot => KnockoutIconName::DotBg,
-            Self::Triangle => KnockoutIconName::TriangleBg,
-        }
-    }
-}
-
-/// The decoration for an icon.
-///
-/// For example, this can show an indicator, an "x", or a diagonal strikethrough
-/// to indicate something is disabled.
-#[derive(IntoElement)]
-pub struct IconDecoration {
-    kind: IconDecorationKind,
-    color: Hsla,
-    knockout_color: Hsla,
-    knockout_hover_color: Hsla,
-    position: Point<Pixels>,
-    group_name: Option<SharedString>,
-}
-
-impl IconDecoration {
-    /// Creates a new [`IconDecoration`].
-    pub fn new(kind: IconDecorationKind, knockout_color: Hsla, cx: &App) -> Self {
-        let color = cx.theme().colors().icon;
-        let position = Point::default();
-
-        Self {
-            kind,
-            color,
-            knockout_color,
-            knockout_hover_color: knockout_color,
-            position,
-            group_name: None,
-        }
-    }
-
-    /// Sets the kind of decoration.
-    pub fn kind(mut self, kind: IconDecorationKind) -> Self {
-        self.kind = kind;
-        self
-    }
-
-    /// Sets the color of the decoration.
-    pub fn color(mut self, color: Hsla) -> Self {
-        self.color = color;
-        self
-    }
-
-    /// Sets the color of the decoration's knockout
-    ///
-    /// Match this to the background of the element the icon will be rendered
-    /// on.
-    pub fn knockout_color(mut self, color: Hsla) -> Self {
-        self.knockout_color = color;
-        self
-    }
-
-    /// Sets the color of the decoration that is used on hover.
-    pub fn knockout_hover_color(mut self, color: Hsla) -> Self {
-        self.knockout_hover_color = color;
-        self
-    }
-
-    /// Sets the position of the decoration.
-    pub fn position(mut self, position: Point<Pixels>) -> Self {
-        self.position = position;
-        self
-    }
-
-    /// Sets the name of the group the decoration belongs to
-    pub fn group_name(mut self, name: Option<SharedString>) -> Self {
-        self.group_name = name;
-        self
-    }
-}
-
-impl RenderOnce for IconDecoration {
-    fn render(self, _window: &mut Window, _cx: &mut App) -> impl IntoElement {
-        let foreground = svg()
-            .absolute()
-            .bottom_0()
-            .right_0()
-            .size(ICON_DECORATION_SIZE)
-            .path(self.kind.fg().path())
-            .text_color(self.color);
-
-        let background = svg()
-            .absolute()
-            .bottom_0()
-            .right_0()
-            .size(ICON_DECORATION_SIZE)
-            .path(self.kind.bg().path())
-            .text_color(self.knockout_color)
-            .map(|this| match self.group_name {
-                Some(group_name) => this.group_hover(group_name, |style| {
-                    style.text_color(self.knockout_hover_color)
-                }),
-                None => this.hover(|style| style.text_color(self.knockout_hover_color)),
-            });
-
-        div()
-            .size(ICON_DECORATION_SIZE)
-            .flex_none()
-            .absolute()
-            .bottom(self.position.y)
-            .right(self.position.x)
-            .child(foreground)
-            .child(background)
-    }
-}
diff --git a/crates/ui/src/components/image.rs b/crates/ui/src/components/image.rs
deleted file mode 100644
index 3e8cbd8fff..0000000000
--- a/crates/ui/src/components/image.rs
+++ /dev/null
@@ -1,184 +0,0 @@
-use std::sync::Arc;
-
-use gpui::Transformation;
-use gpui::{App, IntoElement, Rems, RenderOnce, Size, Styled, Window, svg};
-use serde::{Deserialize, Serialize};
-use strum::{EnumIter, EnumString, IntoStaticStr};
-
-use crate::Color;
-use crate::prelude::*;
-use crate::traits::transformable::Transformable;
-
-#[derive(
-    Debug, PartialEq, Eq, Copy, Clone, EnumIter, EnumString, IntoStaticStr, Serialize, Deserialize,
-)]
-#[strum(serialize_all = "snake_case")]
-pub enum VectorName {
-    AcpGrid,
-    AcpLogo,
-    AcpLogoSerif,
-    AiGrid,
-    DebuggerGrid,
-    Grid,
-    ProTrialStamp,
-    ProUserStamp,
-    ZedLogo,
-    ZedXCopilot,
-}
-
-impl VectorName {
-    /// Returns the path to this vector image.
-    pub fn path(&self) -> Arc<str> {
-        let file_stem: &'static str = self.into();
-        format!("images/{file_stem}.svg").into()
-    }
-}
-
-/// A vector image, such as an SVG.
-///
-/// A [`Vector`] is different from an [`crate::Icon`] in that it is intended
-/// to be displayed at a specific size, or series of sizes, rather
-/// than conforming to the standard size of an icon.
-#[derive(IntoElement, RegisterComponent)]
-pub struct Vector {
-    path: Arc<str>,
-    color: Color,
-    size: Size<Rems>,
-    transformation: Transformation,
-}
-
-impl Vector {
-    /// Creates a new [`Vector`] image with the given [`VectorName`] and size.
-    pub fn new(vector: VectorName, width: Rems, height: Rems) -> Self {
-        Self {
-            path: vector.path(),
-            color: Color::default(),
-            size: Size { width, height },
-            transformation: Transformation::default(),
-        }
-    }
-
-    /// Creates a new [`Vector`] image where the width and height are the same.
-    pub fn square(vector: VectorName, size: Rems) -> Self {
-        Self::new(vector, size, size)
-    }
-
-    /// Sets the vector color.
-    pub fn color(mut self, color: Color) -> Self {
-        self.color = color;
-        self
-    }
-
-    /// Sets the vector size.
-    pub fn size(mut self, size: impl Into<Size<Rems>>) -> Self {
-        let size = size.into();
-        self.size = size;
-        self
-    }
-}
-
-impl Transformable for Vector {
-    fn transform(mut self, transformation: Transformation) -> Self {
-        self.transformation = transformation;
-        self
-    }
-}
-
-impl RenderOnce for Vector {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let width = self.size.width;
-        let height = self.size.height;
-
-        svg()
-            // By default, prevent the SVG from stretching
-            // to fill its container.
-            .flex_none()
-            .w(width)
-            .h(height)
-            .path(self.path)
-            .text_color(self.color.color(cx))
-            .with_transformation(self.transformation)
-    }
-}
-
-impl Component for Vector {
-    fn scope() -> ComponentScope {
-        ComponentScope::Images
-    }
-
-    fn name() -> &'static str {
-        "Vector"
-    }
-
-    fn description() -> Option<&'static str> {
-        Some("A vector image component that can be displayed at specific sizes.")
-    }
-
-    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
-        let size = rems_from_px(60.);
-
-        Some(
-            v_flex()
-                .gap_6()
-                .children(vec![
-                    example_group_with_title(
-                        "Basic Usage",
-                        vec![
-                            single_example(
-                                "Default",
-                                Vector::square(VectorName::ZedLogo, size).into_any_element(),
-                            ),
-                            single_example(
-                                "Custom Size",
-                                h_flex()
-                                    .h(rems_from_px(120.))
-                                    .justify_center()
-                                    .child(Vector::new(
-                                        VectorName::ZedLogo,
-                                        rems_from_px(120.),
-                                        rems_from_px(200.),
-                                    ))
-                                    .into_any_element(),
-                            ),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "Colored",
-                        vec![
-                            single_example(
-                                "Accent Color",
-                                Vector::square(VectorName::ZedLogo, size)
-                                    .color(Color::Accent)
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Error Color",
-                                Vector::square(VectorName::ZedLogo, size)
-                                    .color(Color::Error)
-                                    .into_any_element(),
-                            ),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "Different Vectors",
-                        vec![single_example(
-                            "Zed X Copilot",
-                            Vector::square(VectorName::ZedXCopilot, rems_from_px(100.))
-                                .into_any_element(),
-                        )],
-                    ),
-                ])
-                .into_any_element(),
-        )
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn vector_path() {
-        assert_eq!(VectorName::ZedLogo.path().as_ref(), "images/zed_logo.svg");
-    }
-}
diff --git a/crates/ui/src/components/indent_guides.rs b/crates/ui/src/components/indent_guides.rs
deleted file mode 100644
index 60aa23b44c..0000000000
--- a/crates/ui/src/components/indent_guides.rs
+++ /dev/null
@@ -1,596 +0,0 @@
-use std::{cmp::Ordering, ops::Range, rc::Rc};
-
-use gpui::{AnyElement, App, Bounds, Entity, Hsla, Point, fill, point, size};
-use gpui::{DispatchPhase, Hitbox, HitboxBehavior, MouseButton, MouseDownEvent, MouseMoveEvent};
-use smallvec::SmallVec;
-
-use crate::prelude::*;
-
-/// Represents the colors used for different states of indent guides.
-#[derive(Debug, Clone)]
-pub struct IndentGuideColors {
-    /// The color of the indent guide when it's neither active nor hovered.
-    pub default: Hsla,
-    /// The color of the indent guide when it's hovered.
-    pub hover: Hsla,
-    /// The color of the indent guide when it's active.
-    pub active: Hsla,
-}
-
-impl IndentGuideColors {
-    /// Returns the indent guide colors that should be used for panels.
-    pub fn panel(cx: &App) -> Self {
-        Self {
-            default: cx.theme().colors().panel_indent_guide,
-            hover: cx.theme().colors().panel_indent_guide_hover,
-            active: cx.theme().colors().panel_indent_guide_active,
-        }
-    }
-}
-
-pub struct IndentGuides {
-    colors: IndentGuideColors,
-    indent_size: Pixels,
-    compute_indents_fn:
-        Option<Box<dyn Fn(Range<usize>, &mut Window, &mut App) -> SmallVec<[usize; 64]>>>,
-    render_fn: Option<
-        Box<
-            dyn Fn(
-                RenderIndentGuideParams,
-                &mut Window,
-                &mut App,
-            ) -> SmallVec<[RenderedIndentGuide; 12]>,
-        >,
-    >,
-    on_click: Option<Rc<dyn Fn(&IndentGuideLayout, &mut Window, &mut App)>>,
-}
-
-pub fn indent_guides(indent_size: Pixels, colors: IndentGuideColors) -> IndentGuides {
-    IndentGuides {
-        colors,
-        indent_size,
-        compute_indents_fn: None,
-        render_fn: None,
-        on_click: None,
-    }
-}
-
-impl IndentGuides {
-    /// Sets the callback that will be called when the user clicks on an indent guide.
-    pub fn on_click(
-        mut self,
-        on_click: impl Fn(&IndentGuideLayout, &mut Window, &mut App) + 'static,
-    ) -> Self {
-        self.on_click = Some(Rc::new(on_click));
-        self
-    }
-
-    /// Sets the function that computes indents for uniform list decoration.
-    pub fn with_compute_indents_fn<V: Render>(
-        mut self,
-        entity: Entity<V>,
-        compute_indents_fn: impl Fn(
-            &mut V,
-            Range<usize>,
-            &mut Window,
-            &mut Context<V>,
-        ) -> SmallVec<[usize; 64]>
-        + 'static,
-    ) -> Self {
-        let compute_indents_fn = Box::new(move |range, window: &mut Window, cx: &mut App| {
-            entity.update(cx, |this, cx| compute_indents_fn(this, range, window, cx))
-        });
-        self.compute_indents_fn = Some(compute_indents_fn);
-        self
-    }
-
-    /// Sets a custom callback that will be called when the indent guides need to be rendered.
-    pub fn with_render_fn<V: Render>(
-        mut self,
-        entity: Entity<V>,
-        render_fn: impl Fn(
-            &mut V,
-            RenderIndentGuideParams,
-            &mut Window,
-            &mut App,
-        ) -> SmallVec<[RenderedIndentGuide; 12]>
-        + 'static,
-    ) -> Self {
-        let render_fn = move |params, window: &mut Window, cx: &mut App| {
-            entity.update(cx, |this, cx| render_fn(this, params, window, cx))
-        };
-        self.render_fn = Some(Box::new(render_fn));
-        self
-    }
-
-    fn render_from_layout(
-        &self,
-        indent_guides: SmallVec<[IndentGuideLayout; 12]>,
-        bounds: Bounds<Pixels>,
-        item_height: Pixels,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> AnyElement {
-        let mut indent_guides = if let Some(ref custom_render) = self.render_fn {
-            let params = RenderIndentGuideParams {
-                indent_guides,
-                indent_size: self.indent_size,
-                item_height,
-            };
-            custom_render(params, window, cx)
-        } else {
-            indent_guides
-                .into_iter()
-                .map(|layout| RenderedIndentGuide {
-                    bounds: Bounds::new(
-                        point(
-                            layout.offset.x * self.indent_size,
-                            layout.offset.y * item_height,
-                        ),
-                        size(px(1.), layout.length * item_height),
-                    ),
-                    layout,
-                    is_active: false,
-                    hitbox: None,
-                })
-                .collect()
-        };
-        for guide in &mut indent_guides {
-            guide.bounds.origin += bounds.origin;
-            if let Some(hitbox) = guide.hitbox.as_mut() {
-                hitbox.origin += bounds.origin;
-            }
-        }
-
-        let indent_guides = IndentGuidesElement {
-            indent_guides: Rc::new(indent_guides),
-            colors: self.colors.clone(),
-            on_hovered_indent_guide_click: self.on_click.clone(),
-        };
-        indent_guides.into_any_element()
-    }
-}
-
-/// Parameters for rendering indent guides.
-pub struct RenderIndentGuideParams {
-    /// The calculated layouts for the indent guides to be rendered.
-    pub indent_guides: SmallVec<[IndentGuideLayout; 12]>,
-    /// The size of each indentation level in pixels.
-    pub indent_size: Pixels,
-    /// The height of each item in pixels.
-    pub item_height: Pixels,
-}
-
-/// Represents a rendered indent guide with its visual properties and interaction areas.
-pub struct RenderedIndentGuide {
-    /// The bounds of the rendered indent guide in pixels.
-    pub bounds: Bounds<Pixels>,
-    /// The layout information for the indent guide.
-    pub layout: IndentGuideLayout,
-    /// Indicates whether the indent guide is currently active.
-    pub is_active: bool,
-    /// Can be used to customize the hitbox of the indent guide,
-    /// if this is set to `None`, the bounds of the indent guide will be used.
-    pub hitbox: Option<Bounds<Pixels>>,
-}
-
-/// Represents the layout information for an indent guide.
-#[derive(Debug, PartialEq, Eq, Hash)]
-pub struct IndentGuideLayout {
-    /// The starting position of the indent guide, where x is the indentation level
-    /// and y is the starting row.
-    pub offset: Point<usize>,
-    /// The length of the indent guide in rows.
-    pub length: usize,
-    /// Indicates whether the indent guide continues beyond the visible bounds.
-    pub continues_offscreen: bool,
-}
-
-/// Implements the necessary functionality for rendering indent guides inside a uniform list.
-mod uniform_list {
-    use gpui::UniformListDecoration;
-
-    use super::*;
-
-    impl UniformListDecoration for IndentGuides {
-        fn compute(
-            &self,
-            mut visible_range: Range<usize>,
-            bounds: Bounds<Pixels>,
-            _scroll_offset: Point<Pixels>,
-            item_height: Pixels,
-            item_count: usize,
-            window: &mut Window,
-            cx: &mut App,
-        ) -> AnyElement {
-            let includes_trailing_indent = visible_range.end < item_count;
-            // Check if we have entries after the visible range,
-            // if so extend the visible range so we can fetch a trailing indent,
-            // which is needed to compute indent guides correctly.
-            if includes_trailing_indent {
-                visible_range.end += 1;
-            }
-            let Some(ref compute_indents_fn) = self.compute_indents_fn else {
-                panic!("compute_indents_fn is required for UniformListDecoration");
-            };
-            let visible_entries = &compute_indents_fn(visible_range.clone(), window, cx);
-            let indent_guides = compute_indent_guides(
-                visible_entries,
-                visible_range.start,
-                includes_trailing_indent,
-            );
-            self.render_from_layout(indent_guides, bounds, item_height, window, cx)
-        }
-    }
-}
-
-/// Implements the necessary functionality for rendering indent guides inside a sticky items.
-mod sticky_items {
-    use crate::StickyItemsDecoration;
-
-    use super::*;
-
-    impl StickyItemsDecoration for IndentGuides {
-        fn compute(
-            &self,
-            indents: &SmallVec<[usize; 8]>,
-            bounds: Bounds<Pixels>,
-            _scroll_offset: Point<Pixels>,
-            item_height: Pixels,
-            window: &mut Window,
-            cx: &mut App,
-        ) -> AnyElement {
-            let indent_guides = compute_indent_guides(indents, 0, false);
-            self.render_from_layout(indent_guides, bounds, item_height, window, cx)
-        }
-    }
-}
-
-struct IndentGuidesElement {
-    colors: IndentGuideColors,
-    indent_guides: Rc<SmallVec<[RenderedIndentGuide; 12]>>,
-    on_hovered_indent_guide_click: Option<Rc<dyn Fn(&IndentGuideLayout, &mut Window, &mut App)>>,
-}
-
-enum IndentGuidesElementPrepaintState {
-    Static,
-    Interactive {
-        hitboxes: Rc<SmallVec<[Hitbox; 12]>>,
-        on_hovered_indent_guide_click: Rc<dyn Fn(&IndentGuideLayout, &mut Window, &mut App)>,
-    },
-}
-
-impl Element for IndentGuidesElement {
-    type RequestLayoutState = ();
-    type PrepaintState = IndentGuidesElementPrepaintState;
-
-    fn id(&self) -> Option<ElementId> {
-        None
-    }
-
-    fn source_location(&self) -> Option<&'static core::panic::Location<'static>> {
-        None
-    }
-
-    fn request_layout(
-        &mut self,
-        _id: Option<&gpui::GlobalElementId>,
-        _inspector_id: Option<&gpui::InspectorElementId>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> (gpui::LayoutId, Self::RequestLayoutState) {
-        (window.request_layout(gpui::Style::default(), [], cx), ())
-    }
-
-    fn prepaint(
-        &mut self,
-        _id: Option<&gpui::GlobalElementId>,
-        _inspector_id: Option<&gpui::InspectorElementId>,
-        _bounds: Bounds<Pixels>,
-        _request_layout: &mut Self::RequestLayoutState,
-        window: &mut Window,
-        _cx: &mut App,
-    ) -> Self::PrepaintState {
-        if let Some(on_hovered_indent_guide_click) = self.on_hovered_indent_guide_click.clone() {
-            let hitboxes = self
-                .indent_guides
-                .as_ref()
-                .iter()
-                .map(|guide| {
-                    window
-                        .insert_hitbox(guide.hitbox.unwrap_or(guide.bounds), HitboxBehavior::Normal)
-                })
-                .collect();
-            Self::PrepaintState::Interactive {
-                hitboxes: Rc::new(hitboxes),
-                on_hovered_indent_guide_click,
-            }
-        } else {
-            Self::PrepaintState::Static
-        }
-    }
-
-    fn paint(
-        &mut self,
-        _id: Option<&gpui::GlobalElementId>,
-        _inspector_id: Option<&gpui::InspectorElementId>,
-        _bounds: Bounds<Pixels>,
-        _request_layout: &mut Self::RequestLayoutState,
-        prepaint: &mut Self::PrepaintState,
-        window: &mut Window,
-        _cx: &mut App,
-    ) {
-        let current_view = window.current_view();
-
-        match prepaint {
-            IndentGuidesElementPrepaintState::Static => {
-                for indent_guide in self.indent_guides.as_ref() {
-                    let fill_color = if indent_guide.is_active {
-                        self.colors.active
-                    } else {
-                        self.colors.default
-                    };
-
-                    window.paint_quad(fill(indent_guide.bounds, fill_color));
-                }
-            }
-            IndentGuidesElementPrepaintState::Interactive {
-                hitboxes,
-                on_hovered_indent_guide_click,
-            } => {
-                window.on_mouse_event({
-                    let hitboxes = hitboxes.clone();
-                    let indent_guides = self.indent_guides.clone();
-                    let on_hovered_indent_guide_click = on_hovered_indent_guide_click.clone();
-                    move |event: &MouseDownEvent, phase, window, cx| {
-                        if phase == DispatchPhase::Bubble && event.button == MouseButton::Left {
-                            let mut active_hitbox_ix = None;
-                            for (i, hitbox) in hitboxes.iter().enumerate() {
-                                if hitbox.is_hovered(window) {
-                                    active_hitbox_ix = Some(i);
-                                    break;
-                                }
-                            }
-
-                            let Some(active_hitbox_ix) = active_hitbox_ix else {
-                                return;
-                            };
-
-                            let active_indent_guide = &indent_guides[active_hitbox_ix].layout;
-                            on_hovered_indent_guide_click(active_indent_guide, window, cx);
-
-                            cx.stop_propagation();
-                            window.prevent_default();
-                        }
-                    }
-                });
-                let mut hovered_hitbox_id = None;
-                for (i, hitbox) in hitboxes.iter().enumerate() {
-                    window.set_cursor_style(gpui::CursorStyle::PointingHand, hitbox);
-                    let indent_guide = &self.indent_guides[i];
-                    let fill_color = if hitbox.is_hovered(window) {
-                        hovered_hitbox_id = Some(hitbox.id);
-                        self.colors.hover
-                    } else if indent_guide.is_active {
-                        self.colors.active
-                    } else {
-                        self.colors.default
-                    };
-
-                    window.paint_quad(fill(indent_guide.bounds, fill_color));
-                }
-
-                window.on_mouse_event({
-                    let prev_hovered_hitbox_id = hovered_hitbox_id;
-                    let hitboxes = hitboxes.clone();
-                    move |_: &MouseMoveEvent, phase, window, cx| {
-                        let mut hovered_hitbox_id = None;
-                        for hitbox in hitboxes.as_ref() {
-                            if hitbox.is_hovered(window) {
-                                hovered_hitbox_id = Some(hitbox.id);
-                                break;
-                            }
-                        }
-                        if phase == DispatchPhase::Capture {
-                            // If the hovered hitbox has changed, we need to re-paint the indent guides.
-                            match (prev_hovered_hitbox_id, hovered_hitbox_id) {
-                                (Some(prev_id), Some(id)) => {
-                                    if prev_id != id {
-                                        cx.notify(current_view)
-                                    }
-                                }
-                                (None, Some(_)) => cx.notify(current_view),
-                                (Some(_), None) => cx.notify(current_view),
-                                (None, None) => {}
-                            }
-                        }
-                    }
-                });
-            }
-        }
-    }
-}
-
-impl IntoElement for IndentGuidesElement {
-    type Element = Self;
-
-    fn into_element(self) -> Self::Element {
-        self
-    }
-}
-
-fn compute_indent_guides(
-    indents: &[usize],
-    offset: usize,
-    includes_trailing_indent: bool,
-) -> SmallVec<[IndentGuideLayout; 12]> {
-    let mut indent_guides = SmallVec::<[IndentGuideLayout; 12]>::new();
-    let mut indent_stack = SmallVec::<[IndentGuideLayout; 8]>::new();
-
-    let mut min_depth = usize::MAX;
-    for (row, &depth) in indents.iter().enumerate() {
-        if includes_trailing_indent && row == indents.len() - 1 {
-            continue;
-        }
-
-        let current_row = row + offset;
-        let current_depth = indent_stack.len();
-        if depth < min_depth {
-            min_depth = depth;
-        }
-
-        match depth.cmp(&current_depth) {
-            Ordering::Less => {
-                for _ in 0..(current_depth - depth) {
-                    if let Some(guide) = indent_stack.pop() {
-                        indent_guides.push(guide);
-                    }
-                }
-            }
-            Ordering::Greater => {
-                for new_depth in current_depth..depth {
-                    indent_stack.push(IndentGuideLayout {
-                        offset: Point::new(new_depth, current_row),
-                        length: current_row,
-                        continues_offscreen: false,
-                    });
-                }
-            }
-            _ => {}
-        }
-
-        for indent in indent_stack.iter_mut() {
-            indent.length = current_row - indent.offset.y + 1;
-        }
-    }
-
-    indent_guides.extend(indent_stack);
-
-    for guide in indent_guides.iter_mut() {
-        if includes_trailing_indent
-            && guide.offset.y + guide.length == offset + indents.len().saturating_sub(1)
-        {
-            guide.continues_offscreen = indents
-                .last()
-                .map(|last_indent| guide.offset.x < *last_indent)
-                .unwrap_or(false);
-        }
-    }
-
-    indent_guides
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_compute_indent_guides() {
-        fn assert_compute_indent_guides(
-            input: &[usize],
-            offset: usize,
-            includes_trailing_indent: bool,
-            expected: Vec<IndentGuideLayout>,
-        ) {
-            use std::collections::HashSet;
-            assert_eq!(
-                compute_indent_guides(input, offset, includes_trailing_indent)
-                    .into_vec()
-                    .into_iter()
-                    .collect::<HashSet<_>>(),
-                expected.into_iter().collect::<HashSet<_>>(),
-            );
-        }
-
-        assert_compute_indent_guides(
-            &[0, 1, 2, 2, 1, 0],
-            0,
-            false,
-            vec![
-                IndentGuideLayout {
-                    offset: Point::new(0, 1),
-                    length: 4,
-                    continues_offscreen: false,
-                },
-                IndentGuideLayout {
-                    offset: Point::new(1, 2),
-                    length: 2,
-                    continues_offscreen: false,
-                },
-            ],
-        );
-
-        assert_compute_indent_guides(
-            &[2, 2, 2, 1, 1],
-            0,
-            false,
-            vec![
-                IndentGuideLayout {
-                    offset: Point::new(0, 0),
-                    length: 5,
-                    continues_offscreen: false,
-                },
-                IndentGuideLayout {
-                    offset: Point::new(1, 0),
-                    length: 3,
-                    continues_offscreen: false,
-                },
-            ],
-        );
-
-        assert_compute_indent_guides(
-            &[1, 2, 3, 2, 1],
-            0,
-            false,
-            vec![
-                IndentGuideLayout {
-                    offset: Point::new(0, 0),
-                    length: 5,
-                    continues_offscreen: false,
-                },
-                IndentGuideLayout {
-                    offset: Point::new(1, 1),
-                    length: 3,
-                    continues_offscreen: false,
-                },
-                IndentGuideLayout {
-                    offset: Point::new(2, 2),
-                    length: 1,
-                    continues_offscreen: false,
-                },
-            ],
-        );
-
-        assert_compute_indent_guides(
-            &[0, 1, 0],
-            0,
-            true,
-            vec![IndentGuideLayout {
-                offset: Point::new(0, 1),
-                length: 1,
-                continues_offscreen: false,
-            }],
-        );
-
-        assert_compute_indent_guides(
-            &[0, 1, 1],
-            0,
-            true,
-            vec![IndentGuideLayout {
-                offset: Point::new(0, 1),
-                length: 1,
-                continues_offscreen: true,
-            }],
-        );
-        assert_compute_indent_guides(
-            &[0, 1, 2],
-            0,
-            true,
-            vec![IndentGuideLayout {
-                offset: Point::new(0, 1),
-                length: 1,
-                continues_offscreen: true,
-            }],
-        );
-    }
-}
diff --git a/crates/ui/src/components/indicator.rs b/crates/ui/src/components/indicator.rs
deleted file mode 100644
index 59d69a068b..0000000000
--- a/crates/ui/src/components/indicator.rs
+++ /dev/null
@@ -1,177 +0,0 @@
-use super::AnyIcon;
-use crate::prelude::*;
-
-#[derive(Default)]
-enum IndicatorKind {
-    #[default]
-    Dot,
-    Bar,
-    Icon(AnyIcon),
-}
-
-#[derive(IntoElement, RegisterComponent)]
-pub struct Indicator {
-    kind: IndicatorKind,
-    border_color: Option<Color>,
-    pub color: Color,
-}
-
-impl Indicator {
-    pub fn dot() -> Self {
-        Self {
-            kind: IndicatorKind::Dot,
-            border_color: None,
-            color: Color::Default,
-        }
-    }
-
-    pub fn bar() -> Self {
-        Self {
-            kind: IndicatorKind::Bar,
-            border_color: None,
-
-            color: Color::Default,
-        }
-    }
-
-    pub fn icon(icon: impl Into<AnyIcon>) -> Self {
-        Self {
-            kind: IndicatorKind::Icon(icon.into()),
-            border_color: None,
-
-            color: Color::Default,
-        }
-    }
-
-    pub fn color(mut self, color: Color) -> Self {
-        self.color = color;
-        self
-    }
-
-    pub fn border_color(mut self, color: Color) -> Self {
-        self.border_color = Some(color);
-        self
-    }
-}
-
-impl RenderOnce for Indicator {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let container = div().flex_none();
-        let container = if let Some(border_color) = self.border_color {
-            if matches!(self.kind, IndicatorKind::Dot | IndicatorKind::Bar) {
-                container.border_1().border_color(border_color.color(cx))
-            } else {
-                container
-            }
-        } else {
-            container
-        };
-
-        match self.kind {
-            IndicatorKind::Icon(icon) => container
-                .child(icon.map(|icon| icon.custom_size(rems_from_px(8.)).color(self.color))),
-            IndicatorKind::Dot => container
-                .w_1p5()
-                .h_1p5()
-                .rounded_full()
-                .bg(self.color.color(cx)),
-            IndicatorKind::Bar => container
-                .w_full()
-                .h_1p5()
-                .rounded_t_sm()
-                .bg(self.color.color(cx)),
-        }
-    }
-}
-
-impl Component for Indicator {
-    fn scope() -> ComponentScope {
-        ComponentScope::Status
-    }
-
-    fn description() -> Option<&'static str> {
-        Some(
-            "Visual indicators used to represent status, notifications, or draw attention to specific elements.",
-        )
-    }
-
-    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
-        Some(
-            v_flex()
-                .gap_6()
-                .children(vec![
-                    example_group_with_title(
-                        "Dot Indicators",
-                        vec![
-                            single_example("Default", Indicator::dot().into_any_element()),
-                            single_example(
-                                "Success",
-                                Indicator::dot().color(Color::Success).into_any_element(),
-                            ),
-                            single_example(
-                                "Warning",
-                                Indicator::dot().color(Color::Warning).into_any_element(),
-                            ),
-                            single_example(
-                                "Error",
-                                Indicator::dot().color(Color::Error).into_any_element(),
-                            ),
-                            single_example(
-                                "With Border",
-                                Indicator::dot()
-                                    .color(Color::Accent)
-                                    .border_color(Color::Default)
-                                    .into_any_element(),
-                            ),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "Bar Indicators",
-                        vec![
-                            single_example("Default", Indicator::bar().into_any_element()),
-                            single_example(
-                                "Success",
-                                Indicator::bar().color(Color::Success).into_any_element(),
-                            ),
-                            single_example(
-                                "Warning",
-                                Indicator::bar().color(Color::Warning).into_any_element(),
-                            ),
-                            single_example(
-                                "Error",
-                                Indicator::bar().color(Color::Error).into_any_element(),
-                            ),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "Icon Indicators",
-                        vec![
-                            single_example(
-                                "Default",
-                                Indicator::icon(Icon::new(IconName::Circle)).into_any_element(),
-                            ),
-                            single_example(
-                                "Success",
-                                Indicator::icon(Icon::new(IconName::Check))
-                                    .color(Color::Success)
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Warning",
-                                Indicator::icon(Icon::new(IconName::Warning))
-                                    .color(Color::Warning)
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Error",
-                                Indicator::icon(Icon::new(IconName::Close))
-                                    .color(Color::Error)
-                                    .into_any_element(),
-                            ),
-                        ],
-                    ),
-                ])
-                .into_any_element(),
-        )
-    }
-}
diff --git a/crates/ui/src/components/keybinding.rs b/crates/ui/src/components/keybinding.rs
deleted file mode 100644
index e22669995d..0000000000
--- a/crates/ui/src/components/keybinding.rs
+++ /dev/null
@@ -1,740 +0,0 @@
-use std::rc::Rc;
-
-use crate::PlatformStyle;
-use crate::{Icon, IconName, IconSize, h_flex, prelude::*};
-use gpui::{
-    Action, AnyElement, App, FocusHandle, Global, IntoElement, KeybindingKeystroke, Keystroke,
-    Modifiers, Window, relative,
-};
-use itertools::Itertools;
-use settings::KeybindSource;
-
-#[derive(Debug)]
-enum Source {
-    Action {
-        action: Box<dyn Action>,
-        focus_handle: Option<FocusHandle>,
-    },
-    Keystrokes {
-        /// A keybinding consists of a set of keystrokes,
-        /// where each keystroke is a key and a set of modifier keys.
-        /// More than one keystroke produces a chord.
-        ///
-        /// This should always contain at least one keystroke.
-        keystrokes: Rc<[KeybindingKeystroke]>,
-    },
-}
-
-impl Clone for Source {
-    fn clone(&self) -> Self {
-        match self {
-            Source::Action {
-                action,
-                focus_handle,
-            } => Source::Action {
-                action: action.boxed_clone(),
-                focus_handle: focus_handle.clone(),
-            },
-            Source::Keystrokes { keystrokes } => Source::Keystrokes {
-                keystrokes: keystrokes.clone(),
-            },
-        }
-    }
-}
-
-#[derive(Clone, Debug, IntoElement, RegisterComponent)]
-pub struct KeyBinding {
-    source: Source,
-    size: Option<AbsoluteLength>,
-    /// The [`PlatformStyle`] to use when displaying this keybinding.
-    platform_style: PlatformStyle,
-    /// Determines whether the keybinding is meant for vim mode.
-    vim_mode: bool,
-    /// Indicates whether the keybinding is currently disabled.
-    disabled: bool,
-}
-
-struct VimStyle(bool);
-impl Global for VimStyle {}
-
-impl KeyBinding {
-    /// Returns the highest precedence keybinding for an action. This is the last binding added to
-    /// the keymap. User bindings are added after built-in bindings so that they take precedence.
-    pub fn for_action(action: &dyn Action, cx: &App) -> Self {
-        Self::new(action, None, cx)
-    }
-
-    /// Like `for_action`, but lets you specify the context from which keybindings are matched.
-    pub fn for_action_in(action: &dyn Action, focus: &FocusHandle, cx: &App) -> Self {
-        Self::new(action, Some(focus.clone()), cx)
-    }
-    pub fn has_binding(&self, window: &Window) -> bool {
-        match &self.source {
-            Source::Action {
-                action,
-                focus_handle: Some(focus),
-            } => window
-                .highest_precedence_binding_for_action_in(action.as_ref(), focus)
-                .or_else(|| window.highest_precedence_binding_for_action(action.as_ref()))
-                .is_some(),
-            _ => false,
-        }
-    }
-
-    pub fn set_vim_mode(cx: &mut App, enabled: bool) {
-        cx.set_global(VimStyle(enabled));
-    }
-
-    fn is_vim_mode(cx: &App) -> bool {
-        cx.try_global::<VimStyle>().is_some_and(|g| g.0)
-    }
-
-    pub fn new(action: &dyn Action, focus_handle: Option<FocusHandle>, cx: &App) -> Self {
-        Self {
-            source: Source::Action {
-                action: action.boxed_clone(),
-                focus_handle,
-            },
-            size: None,
-            vim_mode: KeyBinding::is_vim_mode(cx),
-            platform_style: PlatformStyle::platform(),
-            disabled: false,
-        }
-    }
-
-    pub fn from_keystrokes(keystrokes: Rc<[KeybindingKeystroke]>, source: KeybindSource) -> Self {
-        Self {
-            source: Source::Keystrokes { keystrokes },
-            size: None,
-            vim_mode: source == KeybindSource::Vim,
-            platform_style: PlatformStyle::platform(),
-            disabled: false,
-        }
-    }
-
-    /// Sets the [`PlatformStyle`] for this [`KeyBinding`].
-    pub fn platform_style(mut self, platform_style: PlatformStyle) -> Self {
-        self.platform_style = platform_style;
-        self
-    }
-
-    /// Sets the size for this [`KeyBinding`].
-    pub fn size(mut self, size: impl Into<AbsoluteLength>) -> Self {
-        self.size = Some(size.into());
-        self
-    }
-
-    /// Sets whether this keybinding is currently disabled.
-    /// Disabled keybinds will be rendered in a dimmed state.
-    pub fn disabled(mut self, disabled: bool) -> Self {
-        self.disabled = disabled;
-        self
-    }
-}
-
-fn render_key(
-    key: &str,
-    color: Option<Color>,
-    platform_style: PlatformStyle,
-    size: impl Into<Option<AbsoluteLength>>,
-) -> AnyElement {
-    let key_icon = icon_for_key(key, platform_style);
-    match key_icon {
-        Some(icon) => KeyIcon::new(icon, color).size(size).into_any_element(),
-        None => {
-            let key = util::capitalize(key);
-            Key::new(&key, color).size(size).into_any_element()
-        }
-    }
-}
-
-impl RenderOnce for KeyBinding {
-    fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let render_keybinding = |keystrokes: &[KeybindingKeystroke]| {
-            let color = self.disabled.then_some(Color::Disabled);
-
-            h_flex()
-                .debug_selector(|| {
-                    format!(
-                        "KEY_BINDING-{}",
-                        keystrokes
-                            .iter()
-                            .map(|k| k.key().to_string())
-                            .collect::<Vec<_>>()
-                            .join(" ")
-                    )
-                })
-                .gap(DynamicSpacing::Base04.rems(cx))
-                .flex_none()
-                .children(keystrokes.iter().map(|keystroke| {
-                    h_flex()
-                        .flex_none()
-                        .py_0p5()
-                        .rounded_xs()
-                        .text_color(cx.theme().colors().text_muted)
-                        .children(render_keybinding_keystroke(
-                            keystroke,
-                            color,
-                            self.size,
-                            PlatformStyle::platform(),
-                            self.vim_mode,
-                        ))
-                }))
-                .into_any_element()
-        };
-
-        match self.source {
-            Source::Action {
-                action,
-                focus_handle,
-            } => focus_handle
-                .or_else(|| window.focused(cx))
-                .and_then(|focus| {
-                    window.highest_precedence_binding_for_action_in(action.as_ref(), &focus)
-                })
-                .or_else(|| window.highest_precedence_binding_for_action(action.as_ref()))
-                .map(|binding| render_keybinding(binding.keystrokes())),
-            Source::Keystrokes { keystrokes } => Some(render_keybinding(keystrokes.as_ref())),
-        }
-        .unwrap_or_else(|| gpui::Empty.into_any_element())
-    }
-}
-
-pub fn render_keybinding_keystroke(
-    keystroke: &KeybindingKeystroke,
-    color: Option<Color>,
-    size: impl Into<Option<AbsoluteLength>>,
-    platform_style: PlatformStyle,
-    vim_mode: bool,
-) -> Vec<AnyElement> {
-    let use_text = vim_mode
-        || matches!(
-            platform_style,
-            PlatformStyle::Linux | PlatformStyle::Windows
-        );
-    let size = size.into();
-
-    if use_text {
-        let element = Key::new(
-            keystroke_text(
-                keystroke.modifiers(),
-                keystroke.key(),
-                platform_style,
-                vim_mode,
-            ),
-            color,
-        )
-        .size(size)
-        .into_any_element();
-        vec![element]
-    } else {
-        let mut elements = Vec::new();
-        elements.extend(render_modifiers(
-            keystroke.modifiers(),
-            platform_style,
-            color,
-            size,
-            true,
-        ));
-        elements.push(render_key(keystroke.key(), color, platform_style, size));
-        elements
-    }
-}
-
-fn icon_for_key(key: &str, platform_style: PlatformStyle) -> Option<IconName> {
-    match key {
-        "left" => Some(IconName::ArrowLeft),
-        "right" => Some(IconName::ArrowRight),
-        "up" => Some(IconName::ArrowUp),
-        "down" => Some(IconName::ArrowDown),
-        "backspace" => Some(IconName::Backspace),
-        "delete" => Some(IconName::Backspace),
-        "return" => Some(IconName::Return),
-        "enter" => Some(IconName::Return),
-        "tab" => Some(IconName::Tab),
-        "space" => Some(IconName::Space),
-        "escape" => Some(IconName::Escape),
-        "pagedown" => Some(IconName::PageDown),
-        "pageup" => Some(IconName::PageUp),
-        "shift" if platform_style == PlatformStyle::Mac => Some(IconName::Shift),
-        "control" if platform_style == PlatformStyle::Mac => Some(IconName::Control),
-        "platform" if platform_style == PlatformStyle::Mac => Some(IconName::Command),
-        "function" if platform_style == PlatformStyle::Mac => Some(IconName::Control),
-        "alt" if platform_style == PlatformStyle::Mac => Some(IconName::Option),
-        _ => None,
-    }
-}
-
-pub fn render_modifiers(
-    modifiers: &Modifiers,
-    platform_style: PlatformStyle,
-    color: Option<Color>,
-    size: Option<AbsoluteLength>,
-    trailing_separator: bool,
-) -> impl Iterator<Item = AnyElement> {
-    #[derive(Clone)]
-    enum KeyOrIcon {
-        Key(&'static str),
-        Plus,
-        Icon(IconName),
-    }
-
-    struct Modifier {
-        enabled: bool,
-        mac: KeyOrIcon,
-        linux: KeyOrIcon,
-        windows: KeyOrIcon,
-    }
-
-    let table = {
-        use KeyOrIcon::*;
-
-        [
-            Modifier {
-                enabled: modifiers.function,
-                mac: Icon(IconName::Control),
-                linux: Key("Fn"),
-                windows: Key("Fn"),
-            },
-            Modifier {
-                enabled: modifiers.control,
-                mac: Icon(IconName::Control),
-                linux: Key("Ctrl"),
-                windows: Key("Ctrl"),
-            },
-            Modifier {
-                enabled: modifiers.alt,
-                mac: Icon(IconName::Option),
-                linux: Key("Alt"),
-                windows: Key("Alt"),
-            },
-            Modifier {
-                enabled: modifiers.platform,
-                mac: Icon(IconName::Command),
-                linux: Key("Super"),
-                windows: Key("Win"),
-            },
-            Modifier {
-                enabled: modifiers.shift,
-                mac: Icon(IconName::Shift),
-                linux: Key("Shift"),
-                windows: Key("Shift"),
-            },
-        ]
-    };
-
-    let filtered = table
-        .into_iter()
-        .filter(|modifier| modifier.enabled)
-        .collect::<Vec<_>>();
-
-    let platform_keys = filtered
-        .into_iter()
-        .map(move |modifier| match platform_style {
-            PlatformStyle::Mac => Some(modifier.mac),
-            PlatformStyle::Linux => Some(modifier.linux),
-            PlatformStyle::Windows => Some(modifier.windows),
-        });
-
-    let separator = match platform_style {
-        PlatformStyle::Mac => None,
-        PlatformStyle::Linux => Some(KeyOrIcon::Plus),
-        PlatformStyle::Windows => Some(KeyOrIcon::Plus),
-    };
-
-    let platform_keys = itertools::intersperse(platform_keys, separator.clone());
-
-    platform_keys
-        .chain(if modifiers.modified() && trailing_separator {
-            Some(separator)
-        } else {
-            None
-        })
-        .flatten()
-        .map(move |key_or_icon| match key_or_icon {
-            KeyOrIcon::Key(key) => Key::new(key, color).size(size).into_any_element(),
-            KeyOrIcon::Icon(icon) => KeyIcon::new(icon, color).size(size).into_any_element(),
-            KeyOrIcon::Plus => "+".into_any_element(),
-        })
-}
-
-#[derive(IntoElement)]
-pub struct Key {
-    key: SharedString,
-    color: Option<Color>,
-    size: Option<AbsoluteLength>,
-}
-
-impl RenderOnce for Key {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let single_char = self.key.len() == 1;
-        let size = self
-            .size
-            .unwrap_or_else(|| TextSize::default().rems(cx).into());
-
-        div()
-            .py_0()
-            .map(|this| {
-                if single_char {
-                    this.w(size).flex().flex_none().justify_center()
-                } else {
-                    this.px_0p5()
-                }
-            })
-            .h(size)
-            .text_size(size)
-            .line_height(relative(1.))
-            .text_color(self.color.unwrap_or(Color::Muted).color(cx))
-            .child(self.key)
-    }
-}
-
-impl Key {
-    pub fn new(key: impl Into<SharedString>, color: Option<Color>) -> Self {
-        Self {
-            key: key.into(),
-            color,
-            size: None,
-        }
-    }
-
-    pub fn size(mut self, size: impl Into<Option<AbsoluteLength>>) -> Self {
-        self.size = size.into();
-        self
-    }
-}
-
-#[derive(IntoElement)]
-pub struct KeyIcon {
-    icon: IconName,
-    color: Option<Color>,
-    size: Option<AbsoluteLength>,
-}
-
-impl RenderOnce for KeyIcon {
-    fn render(self, window: &mut Window, _cx: &mut App) -> impl IntoElement {
-        let size = self.size.unwrap_or(IconSize::Small.rems().into());
-
-        Icon::new(self.icon)
-            .size(IconSize::Custom(size.to_rems(window.rem_size())))
-            .color(self.color.unwrap_or(Color::Muted))
-    }
-}
-
-impl KeyIcon {
-    pub fn new(icon: IconName, color: Option<Color>) -> Self {
-        Self {
-            icon,
-            color,
-            size: None,
-        }
-    }
-
-    pub fn size(mut self, size: impl Into<Option<AbsoluteLength>>) -> Self {
-        self.size = size.into();
-        self
-    }
-}
-
-/// Returns a textual representation of the key binding for the given [`Action`].
-pub fn text_for_action(action: &dyn Action, window: &Window, cx: &App) -> Option<String> {
-    let key_binding = window.highest_precedence_binding_for_action(action)?;
-    Some(text_for_keybinding_keystrokes(key_binding.keystrokes(), cx))
-}
-
-pub fn text_for_keystrokes(keystrokes: &[Keystroke], cx: &App) -> String {
-    let platform_style = PlatformStyle::platform();
-    let vim_enabled = KeyBinding::is_vim_mode(cx);
-    keystrokes
-        .iter()
-        .map(|keystroke| {
-            keystroke_text(
-                &keystroke.modifiers,
-                &keystroke.key,
-                platform_style,
-                vim_enabled,
-            )
-        })
-        .join(" ")
-}
-
-pub fn text_for_keybinding_keystrokes(keystrokes: &[KeybindingKeystroke], cx: &App) -> String {
-    let platform_style = PlatformStyle::platform();
-    let vim_enabled = KeyBinding::is_vim_mode(cx);
-    keystrokes
-        .iter()
-        .map(|keystroke| {
-            keystroke_text(
-                keystroke.modifiers(),
-                keystroke.key(),
-                platform_style,
-                vim_enabled,
-            )
-        })
-        .join(" ")
-}
-
-pub fn text_for_keystroke(modifiers: &Modifiers, key: &str, cx: &App) -> String {
-    let platform_style = PlatformStyle::platform();
-    keystroke_text(modifiers, key, platform_style, KeyBinding::is_vim_mode(cx))
-}
-
-/// Returns a textual representation of the given [`Keystroke`].
-fn keystroke_text(
-    modifiers: &Modifiers,
-    key: &str,
-    platform_style: PlatformStyle,
-    vim_mode: bool,
-) -> String {
-    let mut text = String::new();
-    let delimiter = '-';
-
-    if modifiers.function {
-        match vim_mode {
-            false => text.push_str("Fn"),
-            true => text.push_str("fn"),
-        }
-
-        text.push(delimiter);
-    }
-
-    if modifiers.control {
-        match (platform_style, vim_mode) {
-            (PlatformStyle::Mac, false) => text.push_str("Control"),
-            (PlatformStyle::Linux | PlatformStyle::Windows, false) => text.push_str("Ctrl"),
-            (_, true) => text.push_str("ctrl"),
-        }
-
-        text.push(delimiter);
-    }
-
-    if modifiers.platform {
-        match (platform_style, vim_mode) {
-            (PlatformStyle::Mac, false) => text.push_str("Command"),
-            (PlatformStyle::Mac, true) => text.push_str("cmd"),
-            (PlatformStyle::Linux, false) => text.push_str("Super"),
-            (PlatformStyle::Linux, true) => text.push_str("super"),
-            (PlatformStyle::Windows, false) => text.push_str("Win"),
-            (PlatformStyle::Windows, true) => text.push_str("win"),
-        }
-
-        text.push(delimiter);
-    }
-
-    if modifiers.alt {
-        match (platform_style, vim_mode) {
-            (PlatformStyle::Mac, false) => text.push_str("Option"),
-            (PlatformStyle::Mac, true) => text.push_str("option"),
-            (PlatformStyle::Linux | PlatformStyle::Windows, false) => text.push_str("Alt"),
-            (_, true) => text.push_str("alt"),
-        }
-
-        text.push(delimiter);
-    }
-
-    if modifiers.shift {
-        match (platform_style, vim_mode) {
-            (_, false) => text.push_str("Shift"),
-            (_, true) => text.push_str("shift"),
-        }
-        text.push(delimiter);
-    }
-
-    if vim_mode {
-        text.push_str(key)
-    } else {
-        let key = match key {
-            "pageup" => "PageUp",
-            "pagedown" => "PageDown",
-            key => &util::capitalize(key),
-        };
-        text.push_str(key);
-    }
-
-    text
-}
-
-impl Component for KeyBinding {
-    fn scope() -> ComponentScope {
-        ComponentScope::Typography
-    }
-
-    fn name() -> &'static str {
-        "KeyBinding"
-    }
-
-    fn description() -> Option<&'static str> {
-        Some(
-            "A component that displays a key binding, supporting different platform styles and vim mode.",
-        )
-    }
-
-    // fn preview(_window: &mut Window, cx: &mut App) -> Option<AnyElement> {
-    //     Some(
-    //         v_flex()
-    //             .gap_6()
-    //             .children(vec![
-    //                 example_group_with_title(
-    //                     "Basic Usage",
-    //                     vec![
-    //                         single_example(
-    //                             "Default",
-    //                             KeyBinding::new_from_gpui(
-    //                                 gpui::KeyBinding::new("ctrl-s", gpui::NoAction, None),
-    //                                 cx,
-    //                             )
-    //                             .into_any_element(),
-    //                         ),
-    //                         single_example(
-    //                             "Mac Style",
-    //                             KeyBinding::new_from_gpui(
-    //                                 gpui::KeyBinding::new("cmd-s", gpui::NoAction, None),
-    //                                 cx,
-    //                             )
-    //                             .platform_style(PlatformStyle::Mac)
-    //                             .into_any_element(),
-    //                         ),
-    //                         single_example(
-    //                             "Windows Style",
-    //                             KeyBinding::new_from_gpui(
-    //                                 gpui::KeyBinding::new("ctrl-s", gpui::NoAction, None),
-    //                                 cx,
-    //                             )
-    //                             .platform_style(PlatformStyle::Windows)
-    //                             .into_any_element(),
-    //                         ),
-    //                     ],
-    //                 ),
-    //                 example_group_with_title(
-    //                     "Vim Mode",
-    //                     vec![single_example(
-    //                         "Vim Mode Enabled",
-    //                         KeyBinding::new_from_gpui(
-    //                             gpui::KeyBinding::new("dd", gpui::NoAction, None),
-    //                             cx,
-    //                         )
-    //                         .vim_mode(true)
-    //                         .into_any_element(),
-    //                     )],
-    //                 ),
-    //                 example_group_with_title(
-    //                     "Complex Bindings",
-    //                     vec![
-    //                         single_example(
-    //                             "Multiple Keys",
-    //                             KeyBinding::new_from_gpui(
-    //                                 gpui::KeyBinding::new("ctrl-k ctrl-b", gpui::NoAction, None),
-    //                                 cx,
-    //                             )
-    //                             .into_any_element(),
-    //                         ),
-    //                         single_example(
-    //                             "With Shift",
-    //                             KeyBinding::new_from_gpui(
-    //                                 gpui::KeyBinding::new("shift-cmd-p", gpui::NoAction, None),
-    //                                 cx,
-    //                             )
-    //                             .into_any_element(),
-    //                         ),
-    //                     ],
-    //                 ),
-    //             ])
-    //             .into_any_element(),
-    //     )
-    // }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_text_for_keystroke() {
-        let keystroke = Keystroke::parse("cmd-c").unwrap();
-        assert_eq!(
-            keystroke_text(
-                &keystroke.modifiers,
-                &keystroke.key,
-                PlatformStyle::Mac,
-                false
-            ),
-            "Command-C".to_string()
-        );
-        assert_eq!(
-            keystroke_text(
-                &keystroke.modifiers,
-                &keystroke.key,
-                PlatformStyle::Linux,
-                false
-            ),
-            "Super-C".to_string()
-        );
-        assert_eq!(
-            keystroke_text(
-                &keystroke.modifiers,
-                &keystroke.key,
-                PlatformStyle::Windows,
-                false
-            ),
-            "Win-C".to_string()
-        );
-
-        let keystroke = Keystroke::parse("ctrl-alt-delete").unwrap();
-        assert_eq!(
-            keystroke_text(
-                &keystroke.modifiers,
-                &keystroke.key,
-                PlatformStyle::Mac,
-                false
-            ),
-            "Control-Option-Delete".to_string()
-        );
-        assert_eq!(
-            keystroke_text(
-                &keystroke.modifiers,
-                &keystroke.key,
-                PlatformStyle::Linux,
-                false
-            ),
-            "Ctrl-Alt-Delete".to_string()
-        );
-        assert_eq!(
-            keystroke_text(
-                &keystroke.modifiers,
-                &keystroke.key,
-                PlatformStyle::Windows,
-                false
-            ),
-            "Ctrl-Alt-Delete".to_string()
-        );
-
-        let keystroke = Keystroke::parse("shift-pageup").unwrap();
-        assert_eq!(
-            keystroke_text(
-                &keystroke.modifiers,
-                &keystroke.key,
-                PlatformStyle::Mac,
-                false
-            ),
-            "Shift-PageUp".to_string()
-        );
-        assert_eq!(
-            keystroke_text(
-                &keystroke.modifiers,
-                &keystroke.key,
-                PlatformStyle::Linux,
-                false,
-            ),
-            "Shift-PageUp".to_string()
-        );
-        assert_eq!(
-            keystroke_text(
-                &keystroke.modifiers,
-                &keystroke.key,
-                PlatformStyle::Windows,
-                false
-            ),
-            "Shift-PageUp".to_string()
-        );
-    }
-}
diff --git a/crates/ui/src/components/keybinding_hint.rs b/crates/ui/src/components/keybinding_hint.rs
deleted file mode 100644
index c998e29f0e..0000000000
--- a/crates/ui/src/components/keybinding_hint.rs
+++ /dev/null
@@ -1,341 +0,0 @@
-use crate::KeyBinding;
-use crate::prelude::*;
-use gpui::{AnyElement, App, BoxShadow, FontStyle, Hsla, IntoElement, Window, point};
-use theme::Appearance;
-
-/// Represents a hint for a keybinding, optionally with a prefix and suffix.
-///
-/// This struct allows for the creation and customization of a keybinding hint,
-/// which can be used to display keyboard shortcuts or commands in a user interface.
-///
-/// # Examples
-///
-/// ```no_run
-/// use gpui::{App, Hsla, KeybindingKeystroke, Keystroke};
-/// use ui::prelude::*;
-/// use ui::{KeyBinding, KeybindingHint};
-/// use settings::KeybindSource;
-///
-/// # fn example(cx: &App) {
-/// let hint = KeybindingHint::new(
-///     KeyBinding::from_keystrokes(vec![KeybindingKeystroke::from_keystroke(Keystroke::parse("ctrl-s").unwrap())].into(), KeybindSource::Base),
-///     Hsla::black()
-/// )
-///     .prefix("Save:")
-///     .size(Pixels::from(14.0));
-/// # }
-/// ```
-#[derive(Debug, IntoElement, RegisterComponent)]
-pub struct KeybindingHint {
-    prefix: Option<SharedString>,
-    suffix: Option<SharedString>,
-    keybinding: KeyBinding,
-    size: Option<Pixels>,
-    background_color: Hsla,
-}
-
-impl KeybindingHint {
-    /// Creates a new `KeybindingHint` with the specified keybinding.
-    ///
-    /// This method initializes a new `KeybindingHint` instance with the given keybinding,
-    /// setting all other fields to their default values.
-    ///
-    /// # Examples
-    ///
-    /// ```no_run
-    /// use gpui::{App, Hsla, KeybindingKeystroke, Keystroke};
-    /// use ui::prelude::*;
-    /// use ui::{KeyBinding, KeybindingHint};
-    /// use settings::KeybindSource;
-    ///
-    /// # fn example(cx: &App) {
-    /// let hint = KeybindingHint::new(
-    ///     KeyBinding::from_keystrokes(vec![KeybindingKeystroke::from_keystroke(Keystroke::parse("ctrl-c").unwrap())].into(), KeybindSource::Base),
-    ///     Hsla::black()
-    /// );
-    /// # }
-    /// ```
-    pub fn new(keybinding: KeyBinding, background_color: Hsla) -> Self {
-        Self {
-            prefix: None,
-            suffix: None,
-            keybinding,
-            size: None,
-            background_color,
-        }
-    }
-
-    /// Creates a new `KeybindingHint` with a prefix and keybinding.
-    ///
-    /// This method initializes a new `KeybindingHint` instance with the given prefix and keybinding,
-    /// setting all other fields to their default values.
-    ///
-    /// # Examples
-    ///
-    /// ```no_run
-    /// use gpui::{App, Hsla, KeybindingKeystroke, Keystroke};
-    /// use ui::prelude::*;
-    /// use ui::{KeyBinding, KeybindingHint};
-    /// use settings::KeybindSource;
-    ///
-    /// # fn example(cx: &App) {
-    /// let hint = KeybindingHint::with_prefix(
-    ///     "Copy:",
-    ///     KeyBinding::from_keystrokes(vec![KeybindingKeystroke::from_keystroke(Keystroke::parse("ctrl-c").unwrap())].into(), KeybindSource::Base),
-    ///     Hsla::black()
-    /// );
-    /// # }
-    /// ```
-    pub fn with_prefix(
-        prefix: impl Into<SharedString>,
-        keybinding: KeyBinding,
-        background_color: Hsla,
-    ) -> Self {
-        Self {
-            prefix: Some(prefix.into()),
-            suffix: None,
-            keybinding,
-            size: None,
-            background_color,
-        }
-    }
-
-    /// Creates a new `KeybindingHint` with a keybinding and suffix.
-    ///
-    /// This method initializes a new `KeybindingHint` instance with the given keybinding and suffix,
-    /// setting all other fields to their default values.
-    ///
-    /// # Examples
-    ///
-    /// ```no_run
-    /// use gpui::{App, Hsla, KeybindingKeystroke, Keystroke};
-    /// use ui::prelude::*;
-    /// use ui::{KeyBinding, KeybindingHint};
-    /// use settings::KeybindSource;
-    ///
-    /// # fn example(cx: &App) {
-    /// let hint = KeybindingHint::with_suffix(
-    ///     KeyBinding::from_keystrokes(vec![KeybindingKeystroke::from_keystroke(Keystroke::parse("ctrl-v").unwrap())].into(), KeybindSource::Base),
-    ///     "Paste",
-    ///     Hsla::black()
-    /// );
-    /// # }
-    /// ```
-    pub fn with_suffix(
-        keybinding: KeyBinding,
-        suffix: impl Into<SharedString>,
-        background_color: Hsla,
-    ) -> Self {
-        Self {
-            prefix: None,
-            suffix: Some(suffix.into()),
-            keybinding,
-            size: None,
-            background_color,
-        }
-    }
-
-    /// Sets the prefix for the keybinding hint.
-    ///
-    /// This method allows adding or changing the prefix text that appears before the keybinding.
-    ///
-    /// # Examples
-    ///
-    /// ```no_run
-    /// use gpui::{App, Hsla, KeybindingKeystroke, Keystroke};
-    /// use ui::prelude::*;
-    /// use ui::{KeyBinding, KeybindingHint};
-    /// use settings::KeybindSource;
-    ///
-    /// # fn example(cx: &App) {
-    /// let hint = KeybindingHint::new(
-    ///     KeyBinding::from_keystrokes(vec![KeybindingKeystroke::from_keystroke(Keystroke::parse("ctrl-x").unwrap())].into(), KeybindSource::Base),
-    ///     Hsla::black()
-    /// )
-    ///     .prefix("Cut:");
-    /// # }
-    /// ```
-    pub fn prefix(mut self, prefix: impl Into<SharedString>) -> Self {
-        self.prefix = Some(prefix.into());
-        self
-    }
-
-    /// Sets the suffix for the keybinding hint.
-    ///
-    /// This method allows adding or changing the suffix text that appears after the keybinding.
-    ///
-    /// # Examples
-    ///
-    /// ```no_run
-    /// use gpui::{App, Hsla, KeybindingKeystroke, Keystroke};
-    /// use ui::prelude::*;
-    /// use ui::{KeyBinding, KeybindingHint};
-    /// use settings::KeybindSource;
-    ///
-    /// # fn example(cx: &App) {
-    /// let hint = KeybindingHint::new(
-    ///     KeyBinding::from_keystrokes(vec![KeybindingKeystroke::from_keystroke(Keystroke::parse("ctrl-f").unwrap())].into(), KeybindSource::Base),
-    ///     Hsla::black()
-    /// )
-    ///     .suffix("Find");
-    /// # }
-    /// ```
-    pub fn suffix(mut self, suffix: impl Into<SharedString>) -> Self {
-        self.suffix = Some(suffix.into());
-        self
-    }
-
-    /// Sets the size of the keybinding hint.
-    ///
-    /// This method allows specifying the size of the keybinding hint in pixels.
-    ///
-    /// # Examples
-    ///
-    /// ```no_run
-    /// use gpui::{App, Hsla, KeybindingKeystroke, Keystroke};
-    /// use ui::prelude::*;
-    /// use ui::{KeyBinding, KeybindingHint};
-    /// use settings::KeybindSource;
-    ///
-    /// # fn example(cx: &App) {
-    /// let hint = KeybindingHint::new(
-    ///     KeyBinding::from_keystrokes(vec![KeybindingKeystroke::from_keystroke(Keystroke::parse("ctrl-z").unwrap())].into(), KeybindSource::Base),
-    ///     Hsla::black()
-    /// )
-    ///     .size(Pixels::from(16.0));
-    /// # }
-    /// ```
-    pub fn size(mut self, size: impl Into<Option<Pixels>>) -> Self {
-        self.size = size.into();
-        self
-    }
-}
-
-impl RenderOnce for KeybindingHint {
-    fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let colors = cx.theme().colors();
-        let is_light = cx.theme().appearance() == Appearance::Light;
-
-        let border_color =
-            self.background_color
-                .blend(colors.text.alpha(if is_light { 0.08 } else { 0.16 }));
-
-        let bg_color = self
-            .background_color
-            .blend(colors.text_accent.alpha(if is_light { 0.05 } else { 0.1 }));
-
-        let shadow_color = colors.text.alpha(if is_light { 0.04 } else { 0.08 });
-
-        let size = self
-            .size
-            .unwrap_or(TextSize::Small.rems(cx).to_pixels(window.rem_size()));
-
-        let kb_size = size - px(2.0);
-
-        let mut base = h_flex();
-
-        base.text_style()
-            .get_or_insert_with(Default::default)
-            .font_style = Some(FontStyle::Italic);
-
-        base.gap_1()
-            .font_buffer(cx)
-            .text_size(size)
-            .text_color(colors.text_disabled)
-            .children(self.prefix)
-            .child(
-                h_flex()
-                    .rounded_sm()
-                    .px_0p5()
-                    .mr_0p5()
-                    .border_1()
-                    .border_color(border_color)
-                    .bg(bg_color)
-                    .shadow(vec![BoxShadow {
-                        color: shadow_color,
-                        offset: point(px(0.), px(1.)),
-                        blur_radius: px(0.),
-                        spread_radius: px(0.),
-                    }])
-                    .child(self.keybinding.size(rems_from_px(kb_size))),
-            )
-            .children(self.suffix)
-    }
-}
-
-impl Component for KeybindingHint {
-    fn scope() -> ComponentScope {
-        ComponentScope::DataDisplay
-    }
-
-    fn description() -> Option<&'static str> {
-        Some("Displays a keyboard shortcut hint with optional prefix and suffix text")
-    }
-
-    fn preview(_window: &mut Window, cx: &mut App) -> Option<AnyElement> {
-        let enter = KeyBinding::for_action(&menu::Confirm, cx);
-
-        let bg_color = cx.theme().colors().surface_background;
-
-        Some(
-            v_flex()
-                .gap_6()
-                .children(vec![
-                    example_group_with_title(
-                        "Basic",
-                        vec![
-                            single_example(
-                                "With Prefix",
-                                KeybindingHint::with_prefix(
-                                    "Go to Start:",
-                                    enter.clone(),
-                                    bg_color,
-                                )
-                                .into_any_element(),
-                            ),
-                            single_example(
-                                "With Suffix",
-                                KeybindingHint::with_suffix(enter.clone(), "Go to End", bg_color)
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "With Prefix and Suffix",
-                                KeybindingHint::new(enter.clone(), bg_color)
-                                    .prefix("Confirm:")
-                                    .suffix("Execute selected action")
-                                    .into_any_element(),
-                            ),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "Sizes",
-                        vec![
-                            single_example(
-                                "Small",
-                                KeybindingHint::new(enter.clone(), bg_color)
-                                    .size(Pixels::from(12.0))
-                                    .prefix("Small:")
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Medium",
-                                KeybindingHint::new(enter.clone(), bg_color)
-                                    .size(Pixels::from(16.0))
-                                    .suffix("Medium")
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Large",
-                                KeybindingHint::new(enter, bg_color)
-                                    .size(Pixels::from(20.0))
-                                    .prefix("Large:")
-                                    .suffix("Size")
-                                    .into_any_element(),
-                            ),
-                        ],
-                    ),
-                ])
-                .into_any_element(),
-        )
-    }
-}
diff --git a/crates/ui/src/components/label.rs b/crates/ui/src/components/label.rs
deleted file mode 100644
index dc830559ca..0000000000
--- a/crates/ui/src/components/label.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-mod highlighted_label;
-mod label;
-mod label_like;
-mod loading_label;
-mod spinner_label;
-
-pub use highlighted_label::*;
-pub use label::*;
-pub use label_like::*;
-pub use loading_label::*;
-pub use spinner_label::*;
diff --git a/crates/ui/src/components/label/highlighted_label.rs b/crates/ui/src/components/label/highlighted_label.rs
deleted file mode 100644
index 840bba7b17..0000000000
--- a/crates/ui/src/components/label/highlighted_label.rs
+++ /dev/null
@@ -1,242 +0,0 @@
-use std::ops::Range;
-
-use gpui::{FontWeight, HighlightStyle, StyledText};
-
-use crate::{LabelCommon, LabelLike, LabelSize, LineHeightStyle, prelude::*};
-
-#[derive(IntoElement, RegisterComponent)]
-pub struct HighlightedLabel {
-    base: LabelLike,
-    label: SharedString,
-    highlight_indices: Vec<usize>,
-}
-
-impl HighlightedLabel {
-    /// Constructs a label with the given characters highlighted.
-    /// Characters are identified by UTF-8 byte position.
-    pub fn new(label: impl Into<SharedString>, highlight_indices: Vec<usize>) -> Self {
-        let label = label.into();
-        for &run in &highlight_indices {
-            assert!(
-                label.is_char_boundary(run),
-                "highlight index {run} is not a valid UTF-8 boundary"
-            );
-        }
-        Self {
-            base: LabelLike::new(),
-            label,
-            highlight_indices,
-        }
-    }
-
-    pub fn text(&self) -> &str {
-        self.label.as_str()
-    }
-
-    pub fn highlight_indices(&self) -> &[usize] {
-        &self.highlight_indices
-    }
-}
-
-impl LabelCommon for HighlightedLabel {
-    fn size(mut self, size: LabelSize) -> Self {
-        self.base = self.base.size(size);
-        self
-    }
-
-    fn weight(mut self, weight: FontWeight) -> Self {
-        self.base = self.base.weight(weight);
-        self
-    }
-
-    fn line_height_style(mut self, line_height_style: LineHeightStyle) -> Self {
-        self.base = self.base.line_height_style(line_height_style);
-        self
-    }
-
-    fn color(mut self, color: Color) -> Self {
-        self.base = self.base.color(color);
-        self
-    }
-
-    fn strikethrough(mut self) -> Self {
-        self.base = self.base.strikethrough();
-        self
-    }
-
-    fn italic(mut self) -> Self {
-        self.base = self.base.italic();
-        self
-    }
-
-    fn alpha(mut self, alpha: f32) -> Self {
-        self.base = self.base.alpha(alpha);
-        self
-    }
-
-    fn underline(mut self) -> Self {
-        self.base = self.base.underline();
-        self
-    }
-
-    fn truncate(mut self) -> Self {
-        self.base = self.base.truncate();
-        self
-    }
-
-    fn single_line(mut self) -> Self {
-        self.base = self.base.single_line();
-        self
-    }
-
-    fn buffer_font(mut self, cx: &App) -> Self {
-        self.base = self.base.buffer_font(cx);
-        self
-    }
-
-    fn inline_code(mut self, cx: &App) -> Self {
-        self.base = self.base.inline_code(cx);
-        self
-    }
-}
-
-pub fn highlight_ranges(
-    text: &str,
-    indices: &[usize],
-    style: HighlightStyle,
-) -> Vec<(Range<usize>, HighlightStyle)> {
-    let mut highlight_indices = indices.iter().copied().peekable();
-    let mut highlights: Vec<(Range<usize>, HighlightStyle)> = Vec::new();
-
-    while let Some(start_ix) = highlight_indices.next() {
-        let mut end_ix = start_ix;
-
-        loop {
-            end_ix += text[end_ix..].chars().next().map_or(0, |c| c.len_utf8());
-            if highlight_indices.next_if(|&ix| ix == end_ix).is_none() {
-                break;
-            }
-        }
-
-        highlights.push((start_ix..end_ix, style));
-    }
-
-    highlights
-}
-
-impl RenderOnce for HighlightedLabel {
-    fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let highlight_color = cx.theme().colors().text_accent;
-
-        let highlights = highlight_ranges(
-            &self.label,
-            &self.highlight_indices,
-            HighlightStyle {
-                color: Some(highlight_color),
-                ..Default::default()
-            },
-        );
-
-        let mut text_style = window.text_style();
-        text_style.color = self.base.color.color(cx);
-
-        self.base
-            .child(StyledText::new(self.label).with_default_highlights(&text_style, highlights))
-    }
-}
-
-impl Component for HighlightedLabel {
-    fn scope() -> ComponentScope {
-        ComponentScope::Typography
-    }
-
-    fn name() -> &'static str {
-        "HighlightedLabel"
-    }
-
-    fn description() -> Option<&'static str> {
-        Some("A label with highlighted characters based on specified indices.")
-    }
-
-    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
-        Some(
-            v_flex()
-                .gap_6()
-                .children(vec![
-                    example_group_with_title(
-                        "Basic Usage",
-                        vec![
-                            single_example(
-                                "Default",
-                                HighlightedLabel::new("Highlighted Text", vec![0, 1, 2, 3]).into_any_element(),
-                            ),
-                            single_example(
-                                "Custom Color",
-                                HighlightedLabel::new("Colored Highlight", vec![0, 1, 7, 8, 9])
-                                    .color(Color::Accent)
-                                    .into_any_element(),
-                            ),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "Styles",
-                        vec![
-                            single_example(
-                                "Bold",
-                                HighlightedLabel::new("Bold Highlight", vec![0, 1, 2, 3])
-                                    .weight(FontWeight::BOLD)
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Italic",
-                                HighlightedLabel::new("Italic Highlight", vec![0, 1, 6, 7, 8])
-                                    .italic()
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Underline",
-                                HighlightedLabel::new("Underlined Highlight", vec![0, 1, 10, 11, 12])
-                                    .underline()
-                                    .into_any_element(),
-                            ),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "Sizes",
-                        vec![
-                            single_example(
-                                "Small",
-                                HighlightedLabel::new("Small Highlight", vec![0, 1, 5, 6, 7])
-                                    .size(LabelSize::Small)
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Large",
-                                HighlightedLabel::new("Large Highlight", vec![0, 1, 5, 6, 7])
-                                    .size(LabelSize::Large)
-                                    .into_any_element(),
-                            ),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "Special Cases",
-                        vec![
-                            single_example(
-                                "Single Line",
-                                HighlightedLabel::new("Single Line Highlight\nWith Newline", vec![0, 1, 7, 8, 9])
-                                    .single_line()
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Truncate",
-                                HighlightedLabel::new("This is a very long text that should be truncated with highlights", vec![0, 1, 2, 3, 4, 5])
-                                    .truncate()
-                                    .into_any_element(),
-                            ),
-                        ],
-                    ),
-                ])
-                .into_any_element()
-        )
-    }
-}
diff --git a/crates/ui/src/components/label/label.rs b/crates/ui/src/components/label/label.rs
deleted file mode 100644
index 49e2de94a1..0000000000
--- a/crates/ui/src/components/label/label.rs
+++ /dev/null
@@ -1,266 +0,0 @@
-use crate::{LabelLike, prelude::*};
-use gpui::StyleRefinement;
-
-/// A struct representing a label element in the UI.
-///
-/// The `Label` struct stores the label text and common properties for a label element.
-/// It provides methods for modifying these properties.
-///
-/// # Examples
-///
-/// ```
-/// use ui::prelude::*;
-///
-/// Label::new("Hello, World!");
-/// ```
-///
-/// **A colored label**, for example labeling a dangerous action:
-///
-/// ```
-/// use ui::prelude::*;
-///
-/// let my_label = Label::new("Delete").color(Color::Error);
-/// ```
-///
-/// **A label with a strikethrough**, for example labeling something that has been deleted:
-///
-/// ```
-/// use ui::prelude::*;
-///
-/// let my_label = Label::new("Deleted").strikethrough();
-/// ```
-#[derive(IntoElement, RegisterComponent)]
-pub struct Label {
-    base: LabelLike,
-    label: SharedString,
-}
-
-impl Label {
-    /// Creates a new [`Label`] with the given text.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use ui::prelude::*;
-    ///
-    /// let my_label = Label::new("Hello, World!");
-    /// ```
-    pub fn new(label: impl Into<SharedString>) -> Self {
-        Self {
-            base: LabelLike::new(),
-            label: label.into(),
-        }
-    }
-
-    /// Sets the text of the [`Label`].
-    pub fn set_text(&mut self, text: impl Into<SharedString>) {
-        self.label = text.into();
-    }
-}
-
-// Style methods.
-impl Label {
-    fn style(&mut self) -> &mut StyleRefinement {
-        self.base.base.style()
-    }
-
-    gpui::margin_style_methods!({
-        visibility: pub
-    });
-}
-
-impl LabelCommon for Label {
-    /// Sets the size of the label using a [`LabelSize`].
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use ui::prelude::*;
-    ///
-    /// let my_label = Label::new("Hello, World!").size(LabelSize::Small);
-    /// ```
-    fn size(mut self, size: LabelSize) -> Self {
-        self.base = self.base.size(size);
-        self
-    }
-
-    /// Sets the weight of the label using a [`FontWeight`].
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use gpui::FontWeight;
-    /// use ui::prelude::*;
-    ///
-    /// let my_label = Label::new("Hello, World!").weight(FontWeight::BOLD);
-    /// ```
-    fn weight(mut self, weight: gpui::FontWeight) -> Self {
-        self.base = self.base.weight(weight);
-        self
-    }
-
-    /// Sets the line height style of the label using a [`LineHeightStyle`].
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use ui::prelude::*;
-    ///
-    /// let my_label = Label::new("Hello, World!").line_height_style(LineHeightStyle::UiLabel);
-    /// ```
-    fn line_height_style(mut self, line_height_style: LineHeightStyle) -> Self {
-        self.base = self.base.line_height_style(line_height_style);
-        self
-    }
-
-    /// Sets the color of the label using a [`Color`].
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use ui::prelude::*;
-    ///
-    /// let my_label = Label::new("Hello, World!").color(Color::Accent);
-    /// ```
-    fn color(mut self, color: Color) -> Self {
-        self.base = self.base.color(color);
-        self
-    }
-
-    /// Sets the strikethrough property of the label.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use ui::prelude::*;
-    ///
-    /// let my_label = Label::new("Hello, World!").strikethrough();
-    /// ```
-    fn strikethrough(mut self) -> Self {
-        self.base = self.base.strikethrough();
-        self
-    }
-
-    /// Sets the italic property of the label.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use ui::prelude::*;
-    ///
-    /// let my_label = Label::new("Hello, World!").italic();
-    /// ```
-    fn italic(mut self) -> Self {
-        self.base = self.base.italic();
-        self
-    }
-
-    /// Sets the alpha property of the color of label.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use ui::prelude::*;
-    ///
-    /// let my_label = Label::new("Hello, World!").alpha(0.5);
-    /// ```
-    fn alpha(mut self, alpha: f32) -> Self {
-        self.base = self.base.alpha(alpha);
-        self
-    }
-
-    fn underline(mut self) -> Self {
-        self.base = self.base.underline();
-        self
-    }
-
-    /// Truncates overflowing text with an ellipsis (`…`) if needed.
-    fn truncate(mut self) -> Self {
-        self.base = self.base.truncate();
-        self
-    }
-
-    fn single_line(mut self) -> Self {
-        self.label = SharedString::from(self.label.replace('\n', "⏎"));
-        self.base = self.base.single_line();
-        self
-    }
-
-    fn buffer_font(mut self, cx: &App) -> Self {
-        self.base = self.base.buffer_font(cx);
-        self
-    }
-
-    /// Styles the label to look like inline code.
-    fn inline_code(mut self, cx: &App) -> Self {
-        self.base = self.base.inline_code(cx);
-        self
-    }
-}
-
-impl RenderOnce for Label {
-    fn render(self, _window: &mut Window, _cx: &mut App) -> impl IntoElement {
-        self.base.child(self.label)
-    }
-}
-
-impl Component for Label {
-    fn scope() -> ComponentScope {
-        ComponentScope::Typography
-    }
-
-    fn description() -> Option<&'static str> {
-        Some("A text label component that supports various styles, sizes, and formatting options.")
-    }
-
-    fn preview(_window: &mut Window, cx: &mut App) -> Option<AnyElement> {
-        Some(
-            v_flex()
-                .gap_6()
-                .children(vec![
-                    example_group_with_title(
-                        "Sizes",
-                        vec![
-                            single_example("Default", Label::new("Project Explorer").into_any_element()),
-                            single_example("Small", Label::new("File: main.rs").size(LabelSize::Small).into_any_element()),
-                            single_example("Large", Label::new("Welcome to Zed").size(LabelSize::Large).into_any_element()),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "Colors",
-                        vec![
-                            single_example("Default", Label::new("Status: Ready").into_any_element()),
-                            single_example("Accent", Label::new("New Update Available").color(Color::Accent).into_any_element()),
-                            single_example("Error", Label::new("Build Failed").color(Color::Error).into_any_element()),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "Styles",
-                        vec![
-                            single_example("Default", Label::new("Normal Text").into_any_element()),
-                            single_example("Bold", Label::new("Important Notice").weight(gpui::FontWeight::BOLD).into_any_element()),
-                            single_example("Italic", Label::new("Code Comment").italic().into_any_element()),
-                            single_example("Strikethrough", Label::new("Deprecated Feature").strikethrough().into_any_element()),
-                            single_example("Underline", Label::new("Clickable Link").underline().into_any_element()),
-                            single_example("Inline Code", Label::new("fn main() {}").inline_code(cx).into_any_element()),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "Line Height Styles",
-                        vec![
-                            single_example("Default", Label::new("Multi-line\nText\nExample").into_any_element()),
-                            single_example("UI Label", Label::new("Compact\nUI\nLabel").line_height_style(LineHeightStyle::UiLabel).into_any_element()),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "Special Cases",
-                        vec![
-                            single_example("Single Line", Label::new("Line 1\nLine 2\nLine 3").single_line().into_any_element()),
-                            single_example("Text Ellipsis", div().max_w_24().child(Label::new("This is a very long file name that should be truncated: very_long_file_name_with_many_words.rs").truncate()).into_any_element()),
-                        ],
-                    ),
-                ])
-                .into_any_element()
-        )
-    }
-}
diff --git a/crates/ui/src/components/label/label_like.rs b/crates/ui/src/components/label/label_like.rs
deleted file mode 100644
index 1fa6b14c83..0000000000
--- a/crates/ui/src/components/label/label_like.rs
+++ /dev/null
@@ -1,315 +0,0 @@
-use crate::prelude::*;
-use gpui::{FontWeight, StyleRefinement, UnderlineStyle};
-use settings::Settings;
-use smallvec::SmallVec;
-use theme::ThemeSettings;
-
-/// Sets the size of a label
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy, Default)]
-pub enum LabelSize {
-    /// The default size of a label.
-    #[default]
-    Default,
-    /// The large size of a label.
-    Large,
-    /// The small size of a label.
-    Small,
-    /// The extra small size of a label.
-    XSmall,
-}
-
-/// Sets the line height of a label
-#[derive(Default, PartialEq, Copy, Clone)]
-pub enum LineHeightStyle {
-    /// The default line height style of a label,
-    /// set by either the UI's default line height,
-    /// or the developer's default buffer line height.
-    #[default]
-    TextLabel,
-    /// Sets the line height to 1.
-    UiLabel,
-}
-
-/// A common set of traits all labels must implement.
-pub trait LabelCommon {
-    /// Sets the size of the label using a [`LabelSize`].
-    fn size(self, size: LabelSize) -> Self;
-
-    /// Sets the font weight of the label.
-    fn weight(self, weight: FontWeight) -> Self;
-
-    /// Sets the line height style of the label using a [`LineHeightStyle`].
-    fn line_height_style(self, line_height_style: LineHeightStyle) -> Self;
-
-    /// Sets the color of the label using a [`Color`].
-    fn color(self, color: Color) -> Self;
-
-    /// Sets the strikethrough property of the label.
-    fn strikethrough(self) -> Self;
-
-    /// Sets the italic property of the label.
-    fn italic(self) -> Self;
-
-    /// Sets the underline property of the label
-    fn underline(self) -> Self;
-
-    /// Sets the alpha property of the label, overwriting the alpha value of the color.
-    fn alpha(self, alpha: f32) -> Self;
-
-    /// Truncates overflowing text with an ellipsis (`…`) if needed.
-    fn truncate(self) -> Self;
-
-    /// Sets the label to render as a single line.
-    fn single_line(self) -> Self;
-
-    /// Sets the font to the buffer's
-    fn buffer_font(self, cx: &App) -> Self;
-
-    /// Styles the label to look like inline code.
-    fn inline_code(self, cx: &App) -> Self;
-}
-
-/// A label-like element that can be used to create a custom label when
-/// prebuilt labels are not sufficient. Use this sparingly, as it is
-/// unconstrained and may make the UI feel less consistent.
-///
-/// This is also used to build the prebuilt labels.
-#[derive(IntoElement)]
-pub struct LabelLike {
-    pub(super) base: Div,
-    size: LabelSize,
-    weight: Option<FontWeight>,
-    line_height_style: LineHeightStyle,
-    pub(crate) color: Color,
-    strikethrough: bool,
-    italic: bool,
-    children: SmallVec<[AnyElement; 2]>,
-    alpha: Option<f32>,
-    underline: bool,
-    single_line: bool,
-    truncate: bool,
-}
-
-impl Default for LabelLike {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl LabelLike {
-    /// Creates a new, fully custom label.
-    /// Prefer using [`Label`] or [`HighlightedLabel`] where possible.
-    pub fn new() -> Self {
-        Self {
-            base: div(),
-            size: LabelSize::Default,
-            weight: None,
-            line_height_style: LineHeightStyle::default(),
-            color: Color::Default,
-            strikethrough: false,
-            italic: false,
-            children: SmallVec::new(),
-            alpha: None,
-            underline: false,
-            single_line: false,
-            truncate: false,
-        }
-    }
-}
-
-// Style methods.
-impl LabelLike {
-    fn style(&mut self) -> &mut StyleRefinement {
-        self.base.style()
-    }
-
-    gpui::margin_style_methods!({
-        visibility: pub
-    });
-}
-
-impl LabelCommon for LabelLike {
-    fn size(mut self, size: LabelSize) -> Self {
-        self.size = size;
-        self
-    }
-
-    fn weight(mut self, weight: FontWeight) -> Self {
-        self.weight = Some(weight);
-        self
-    }
-
-    fn line_height_style(mut self, line_height_style: LineHeightStyle) -> Self {
-        self.line_height_style = line_height_style;
-        self
-    }
-
-    fn color(mut self, color: Color) -> Self {
-        self.color = color;
-        self
-    }
-
-    fn strikethrough(mut self) -> Self {
-        self.strikethrough = true;
-        self
-    }
-
-    fn italic(mut self) -> Self {
-        self.italic = true;
-        self
-    }
-
-    fn underline(mut self) -> Self {
-        self.underline = true;
-        self
-    }
-
-    fn alpha(mut self, alpha: f32) -> Self {
-        self.alpha = Some(alpha);
-        self
-    }
-
-    /// Truncates overflowing text with an ellipsis (`…`) if needed.
-    fn truncate(mut self) -> Self {
-        self.truncate = true;
-        self
-    }
-
-    fn single_line(mut self) -> Self {
-        self.single_line = true;
-        self
-    }
-
-    fn buffer_font(mut self, cx: &App) -> Self {
-        self.base = self
-            .base
-            .font(theme::ThemeSettings::get_global(cx).buffer_font.clone());
-        self
-    }
-
-    fn inline_code(mut self, cx: &App) -> Self {
-        self.base = self
-            .base
-            .font(theme::ThemeSettings::get_global(cx).buffer_font.clone())
-            .bg(cx.theme().colors().element_background)
-            .rounded_sm()
-            .px_0p5();
-        self
-    }
-}
-
-impl ParentElement for LabelLike {
-    fn extend(&mut self, elements: impl IntoIterator<Item = AnyElement>) {
-        self.children.extend(elements)
-    }
-}
-
-impl RenderOnce for LabelLike {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let mut color = self.color.color(cx);
-        if let Some(alpha) = self.alpha {
-            color.fade_out(1.0 - alpha);
-        }
-
-        self.base
-            .map(|this| match self.size {
-                LabelSize::Large => this.text_ui_lg(cx),
-                LabelSize::Default => this.text_ui(cx),
-                LabelSize::Small => this.text_ui_sm(cx),
-                LabelSize::XSmall => this.text_ui_xs(cx),
-            })
-            .when(self.line_height_style == LineHeightStyle::UiLabel, |this| {
-                this.line_height(relative(1.))
-            })
-            .when(self.italic, |this| this.italic())
-            .when(self.underline, |mut this| {
-                this.text_style()
-                    .get_or_insert_with(Default::default)
-                    .underline = Some(UnderlineStyle {
-                    thickness: px(1.),
-                    color: None,
-                    wavy: false,
-                });
-                this
-            })
-            .when(self.strikethrough, |this| this.line_through())
-            .when(self.single_line, |this| this.whitespace_nowrap())
-            .when(self.truncate, |this| {
-                this.overflow_x_hidden().text_ellipsis()
-            })
-            .text_color(color)
-            .font_weight(
-                self.weight
-                    .unwrap_or(ThemeSettings::get_global(cx).ui_font.weight),
-            )
-            .children(self.children)
-    }
-}
-
-impl Component for LabelLike {
-    fn scope() -> ComponentScope {
-        ComponentScope::Typography
-    }
-
-    fn name() -> &'static str {
-        "LabelLike"
-    }
-
-    fn description() -> Option<&'static str> {
-        Some(
-            "A flexible, customizable label-like component that serves as a base for other label types.",
-        )
-    }
-
-    fn preview(_window: &mut Window, cx: &mut App) -> Option<AnyElement> {
-        Some(
-            v_flex()
-                .gap_6()
-                .children(vec![
-                    example_group_with_title(
-                        "Sizes",
-                        vec![
-                            single_example("Default", LabelLike::new().child("Default size").into_any_element()),
-                            single_example("Large", LabelLike::new().size(LabelSize::Large).child("Large size").into_any_element()),
-                            single_example("Small", LabelLike::new().size(LabelSize::Small).child("Small size").into_any_element()),
-                            single_example("XSmall", LabelLike::new().size(LabelSize::XSmall).child("Extra small size").into_any_element()),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "Styles",
-                        vec![
-                            single_example("Bold", LabelLike::new().weight(FontWeight::BOLD).child("Bold text").into_any_element()),
-                            single_example("Italic", LabelLike::new().italic().child("Italic text").into_any_element()),
-                            single_example("Underline", LabelLike::new().underline().child("Underlined text").into_any_element()),
-                            single_example("Strikethrough", LabelLike::new().strikethrough().child("Strikethrough text").into_any_element()),
-                            single_example("Inline Code", LabelLike::new().inline_code(cx).child("const value = 42;").into_any_element()),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "Colors",
-                        vec![
-                            single_example("Default", LabelLike::new().child("Default color").into_any_element()),
-                            single_example("Accent", LabelLike::new().color(Color::Accent).child("Accent color").into_any_element()),
-                            single_example("Error", LabelLike::new().color(Color::Error).child("Error color").into_any_element()),
-                            single_example("Alpha", LabelLike::new().alpha(0.5).child("50% opacity").into_any_element()),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "Line Height",
-                        vec![
-                            single_example("Default", LabelLike::new().child("Default line height\nMulti-line text").into_any_element()),
-                            single_example("UI Label", LabelLike::new().line_height_style(LineHeightStyle::UiLabel).child("UI label line height\nMulti-line text").into_any_element()),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "Special Cases",
-                        vec![
-                            single_example("Single Line", LabelLike::new().single_line().child("This is a very long text that should be displayed in a single line").into_any_element()),
-                            single_example("Truncate", LabelLike::new().truncate().child("This is a very long text that should be truncated with an ellipsis").into_any_element()),
-                        ],
-                    ),
-                ])
-                .into_any_element()
-        )
-    }
-}
diff --git a/crates/ui/src/components/label/loading_label.rs b/crates/ui/src/components/label/loading_label.rs
deleted file mode 100644
index 0b6b027e47..0000000000
--- a/crates/ui/src/components/label/loading_label.rs
+++ /dev/null
@@ -1,112 +0,0 @@
-use crate::prelude::*;
-use gpui::{Animation, AnimationExt, FontWeight};
-use std::time::Duration;
-
-#[derive(IntoElement)]
-pub struct LoadingLabel {
-    base: Label,
-    text: SharedString,
-}
-
-impl LoadingLabel {
-    pub fn new(text: impl Into<SharedString>) -> Self {
-        let text = text.into();
-        LoadingLabel {
-            base: Label::new(text.clone()),
-            text,
-        }
-    }
-}
-
-impl LabelCommon for LoadingLabel {
-    fn size(mut self, size: LabelSize) -> Self {
-        self.base = self.base.size(size);
-        self
-    }
-
-    fn weight(mut self, weight: FontWeight) -> Self {
-        self.base = self.base.weight(weight);
-        self
-    }
-
-    fn line_height_style(mut self, line_height_style: LineHeightStyle) -> Self {
-        self.base = self.base.line_height_style(line_height_style);
-        self
-    }
-
-    fn color(mut self, color: Color) -> Self {
-        self.base = self.base.color(color);
-        self
-    }
-
-    fn strikethrough(mut self) -> Self {
-        self.base = self.base.strikethrough();
-        self
-    }
-
-    fn italic(mut self) -> Self {
-        self.base = self.base.italic();
-        self
-    }
-
-    fn alpha(mut self, alpha: f32) -> Self {
-        self.base = self.base.alpha(alpha);
-        self
-    }
-
-    fn underline(mut self) -> Self {
-        self.base = self.base.underline();
-        self
-    }
-
-    fn truncate(mut self) -> Self {
-        self.base = self.base.truncate();
-        self
-    }
-
-    fn single_line(mut self) -> Self {
-        self.base = self.base.single_line();
-        self
-    }
-
-    fn buffer_font(mut self, cx: &App) -> Self {
-        self.base = self.base.buffer_font(cx);
-        self
-    }
-
-    fn inline_code(mut self, cx: &App) -> Self {
-        self.base = self.base.inline_code(cx);
-        self
-    }
-}
-
-impl RenderOnce for LoadingLabel {
-    fn render(self, _window: &mut Window, _cx: &mut App) -> impl IntoElement {
-        let text = self.text.clone();
-
-        self.base.color(Color::Muted).with_animations(
-            "loading_label",
-            vec![
-                Animation::new(Duration::from_secs(1)),
-                Animation::new(Duration::from_secs(1)).repeat(),
-            ],
-            move |mut label, animation_ix, delta| {
-                match animation_ix {
-                    0 => {
-                        let chars_to_show = (delta * text.len() as f32).ceil() as usize;
-                        let text = SharedString::from(text[0..chars_to_show].to_string());
-                        label.set_text(text);
-                    }
-                    1 => match delta {
-                        d if d < 0.25 => label.set_text(text.clone()),
-                        d if d < 0.5 => label.set_text(format!("{}.", text)),
-                        d if d < 0.75 => label.set_text(format!("{}..", text)),
-                        _ => label.set_text(format!("{}...", text)),
-                    },
-                    _ => {}
-                }
-                label
-            },
-        )
-    }
-}
diff --git a/crates/ui/src/components/label/spinner_label.rs b/crates/ui/src/components/label/spinner_label.rs
deleted file mode 100644
index 33eeeae125..0000000000
--- a/crates/ui/src/components/label/spinner_label.rs
+++ /dev/null
@@ -1,205 +0,0 @@
-use crate::prelude::*;
-use gpui::{Animation, AnimationExt, FontWeight};
-use std::time::Duration;
-
-/// Different types of spinner animations
-#[derive(Debug, Default, Clone, Copy, PartialEq)]
-pub enum SpinnerVariant {
-    #[default]
-    Dots,
-    DotsVariant,
-    Sand,
-}
-
-/// A spinner indication, based on the label component, that loops through
-/// frames of the specified animation. It implements `LabelCommon` as well.
-///
-/// # Default Example
-///
-/// ```
-/// use ui::{SpinnerLabel};
-///
-/// SpinnerLabel::new();
-/// ```
-///
-/// # Variant Example
-///
-/// ```
-/// use ui::{SpinnerLabel};
-///
-/// SpinnerLabel::dots_variant();
-/// ```
-#[derive(IntoElement, RegisterComponent)]
-pub struct SpinnerLabel {
-    base: Label,
-    variant: SpinnerVariant,
-    frames: Vec<&'static str>,
-    duration: Duration,
-}
-
-impl SpinnerVariant {
-    fn frames(&self) -> Vec<&'static str> {
-        match self {
-            SpinnerVariant::Dots => vec!["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"],
-            SpinnerVariant::DotsVariant => vec!["⣼", "⣹", "⢻", "⠿", "⡟", "⣏", "⣧", "⣶"],
-            SpinnerVariant::Sand => vec![
-                "⠁", "⠂", "⠄", "⡀", "⡈", "⡐", "⡠", "⣀", "⣁", "⣂", "⣄", "⣌", "⣔", "⣤", "⣥", "⣦",
-                "⣮", "⣶", "⣷", "⣿", "⡿", "⠿", "⢟", "⠟", "⡛", "⠛", "⠫", "⢋", "⠋", "⠍", "⡉", "⠉",
-                "⠑", "⠡", "⢁",
-            ],
-        }
-    }
-
-    fn duration(&self) -> Duration {
-        match self {
-            SpinnerVariant::Dots => Duration::from_millis(1000),
-            SpinnerVariant::DotsVariant => Duration::from_millis(1000),
-            SpinnerVariant::Sand => Duration::from_millis(2000),
-        }
-    }
-
-    fn animation_id(&self) -> &'static str {
-        match self {
-            SpinnerVariant::Dots => "spinner_label_dots",
-            SpinnerVariant::DotsVariant => "spinner_label_dots_variant",
-            SpinnerVariant::Sand => "spinner_label_dots_variant_2",
-        }
-    }
-}
-
-impl SpinnerLabel {
-    pub fn new() -> Self {
-        Self::with_variant(SpinnerVariant::default())
-    }
-
-    pub fn with_variant(variant: SpinnerVariant) -> Self {
-        let frames = variant.frames();
-        let duration = variant.duration();
-
-        SpinnerLabel {
-            base: Label::new(frames[0]).color(Color::Muted),
-            variant,
-            frames,
-            duration,
-        }
-    }
-
-    pub fn dots() -> Self {
-        Self::with_variant(SpinnerVariant::Dots)
-    }
-
-    pub fn dots_variant() -> Self {
-        Self::with_variant(SpinnerVariant::DotsVariant)
-    }
-
-    pub fn sand() -> Self {
-        Self::with_variant(SpinnerVariant::Sand)
-    }
-}
-
-impl LabelCommon for SpinnerLabel {
-    fn size(mut self, size: LabelSize) -> Self {
-        self.base = self.base.size(size);
-        self
-    }
-
-    fn weight(mut self, weight: FontWeight) -> Self {
-        self.base = self.base.weight(weight);
-        self
-    }
-
-    fn line_height_style(mut self, line_height_style: LineHeightStyle) -> Self {
-        self.base = self.base.line_height_style(line_height_style);
-        self
-    }
-
-    fn color(mut self, color: Color) -> Self {
-        self.base = self.base.color(color);
-        self
-    }
-
-    fn strikethrough(mut self) -> Self {
-        self.base = self.base.strikethrough();
-        self
-    }
-
-    fn italic(mut self) -> Self {
-        self.base = self.base.italic();
-        self
-    }
-
-    fn alpha(mut self, alpha: f32) -> Self {
-        self.base = self.base.alpha(alpha);
-        self
-    }
-
-    fn underline(mut self) -> Self {
-        self.base = self.base.underline();
-        self
-    }
-
-    fn truncate(mut self) -> Self {
-        self.base = self.base.truncate();
-        self
-    }
-
-    fn single_line(mut self) -> Self {
-        self.base = self.base.single_line();
-        self
-    }
-
-    fn buffer_font(mut self, cx: &App) -> Self {
-        self.base = self.base.buffer_font(cx);
-        self
-    }
-
-    fn inline_code(mut self, cx: &App) -> Self {
-        self.base = self.base.inline_code(cx);
-        self
-    }
-}
-
-impl RenderOnce for SpinnerLabel {
-    fn render(self, _window: &mut Window, _cx: &mut App) -> impl IntoElement {
-        let frames = self.frames.clone();
-        let duration = self.duration;
-
-        self.base.with_animation(
-            self.variant.animation_id(),
-            Animation::new(duration).repeat(),
-            move |mut label, delta| {
-                let frame_index = (delta * frames.len() as f32) as usize % frames.len();
-
-                label.set_text(frames[frame_index]);
-                label
-            },
-        )
-    }
-}
-
-impl Component for SpinnerLabel {
-    fn scope() -> ComponentScope {
-        ComponentScope::Loading
-    }
-
-    fn name() -> &'static str {
-        "Spinner Label"
-    }
-
-    fn sort_name() -> &'static str {
-        "Spinner Label"
-    }
-
-    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
-        let examples = vec![
-            single_example("Default", SpinnerLabel::new().into_any_element()),
-            single_example(
-                "Dots Variant",
-                SpinnerLabel::dots_variant().into_any_element(),
-            ),
-            single_example("Sand Variant", SpinnerLabel::sand().into_any_element()),
-        ];
-
-        Some(example_group(examples).vertical().into_any_element())
-    }
-}
diff --git a/crates/ui/src/components/list.rs b/crates/ui/src/components/list.rs
deleted file mode 100644
index 6876f290ce..0000000000
--- a/crates/ui/src/components/list.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-mod list;
-mod list_bullet_item;
-mod list_header;
-mod list_item;
-mod list_separator;
-mod list_sub_header;
-
-pub use list::*;
-pub use list_bullet_item::*;
-pub use list_header::*;
-pub use list_item::*;
-pub use list_separator::*;
-pub use list_sub_header::*;
diff --git a/crates/ui/src/components/list/list.rs b/crates/ui/src/components/list/list.rs
deleted file mode 100644
index ccae5bed23..0000000000
--- a/crates/ui/src/components/list/list.rs
+++ /dev/null
@@ -1,142 +0,0 @@
-use component::{Component, ComponentScope, example_group_with_title, single_example};
-use gpui::AnyElement;
-use smallvec::SmallVec;
-
-use crate::{Label, ListHeader, ListItem, prelude::*};
-
-pub enum EmptyMessage {
-    Text(SharedString),
-    Element(AnyElement),
-}
-
-#[derive(IntoElement, RegisterComponent)]
-pub struct List {
-    /// Message to display when the list is empty
-    /// Defaults to "No items"
-    empty_message: EmptyMessage,
-    header: Option<ListHeader>,
-    toggle: Option<bool>,
-    children: SmallVec<[AnyElement; 2]>,
-}
-
-impl Default for List {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl List {
-    pub fn new() -> Self {
-        Self {
-            empty_message: EmptyMessage::Text("No items".into()),
-            header: None,
-            toggle: None,
-            children: SmallVec::new(),
-        }
-    }
-
-    pub fn empty_message(mut self, message: impl Into<EmptyMessage>) -> Self {
-        self.empty_message = message.into();
-        self
-    }
-
-    pub fn header(mut self, header: impl Into<Option<ListHeader>>) -> Self {
-        self.header = header.into();
-        self
-    }
-
-    pub fn toggle(mut self, toggle: impl Into<Option<bool>>) -> Self {
-        self.toggle = toggle.into();
-        self
-    }
-}
-
-impl ParentElement for List {
-    fn extend(&mut self, elements: impl IntoIterator<Item = AnyElement>) {
-        self.children.extend(elements)
-    }
-}
-
-impl From<String> for EmptyMessage {
-    fn from(s: String) -> Self {
-        EmptyMessage::Text(SharedString::from(s))
-    }
-}
-
-impl From<&str> for EmptyMessage {
-    fn from(s: &str) -> Self {
-        EmptyMessage::Text(SharedString::from(s.to_owned()))
-    }
-}
-
-impl From<AnyElement> for EmptyMessage {
-    fn from(e: AnyElement) -> Self {
-        EmptyMessage::Element(e)
-    }
-}
-
-impl RenderOnce for List {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        v_flex()
-            .w_full()
-            .py(DynamicSpacing::Base04.rems(cx))
-            .children(self.header)
-            .map(|this| match (self.children.is_empty(), self.toggle) {
-                (false, _) => this.children(self.children),
-                (true, Some(false)) => this,
-                (true, _) => match self.empty_message {
-                    EmptyMessage::Text(text) => {
-                        this.px_2().child(Label::new(text).color(Color::Muted))
-                    }
-                    EmptyMessage::Element(element) => this.child(element),
-                },
-            })
-    }
-}
-
-impl Component for List {
-    fn scope() -> ComponentScope {
-        ComponentScope::Layout
-    }
-
-    fn description() -> Option<&'static str> {
-        Some(
-            "A container component for displaying a collection of list items with optional header and empty state.",
-        )
-    }
-
-    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
-        Some(
-            v_flex()
-                .gap_6()
-                .children(vec![example_group_with_title(
-                    "Basic Lists",
-                    vec![
-                        single_example(
-                            "Simple List",
-                            List::new()
-                                .child(ListItem::new("item1").child(Label::new("Item 1")))
-                                .child(ListItem::new("item2").child(Label::new("Item 2")))
-                                .child(ListItem::new("item3").child(Label::new("Item 3")))
-                                .into_any_element(),
-                        ),
-                        single_example(
-                            "With Header",
-                            List::new()
-                                .header(ListHeader::new("Section Header"))
-                                .child(ListItem::new("item1").child(Label::new("Item 1")))
-                                .child(ListItem::new("item2").child(Label::new("Item 2")))
-                                .into_any_element(),
-                        ),
-                        single_example(
-                            "Empty List",
-                            List::new()
-                                .empty_message("No items to display")
-                                .into_any_element(),
-                        ),
-                    ],
-                )])
-                .into_any_element(),
-        )
-    }
-}
diff --git a/crates/ui/src/components/list/list_bullet_item.rs b/crates/ui/src/components/list/list_bullet_item.rs
deleted file mode 100644
index 17731488f7..0000000000
--- a/crates/ui/src/components/list/list_bullet_item.rs
+++ /dev/null
@@ -1,83 +0,0 @@
-use crate::{ListItem, prelude::*};
-use component::{Component, ComponentScope, example_group_with_title, single_example};
-use gpui::{IntoElement, ParentElement, SharedString};
-
-#[derive(IntoElement, RegisterComponent)]
-pub struct ListBulletItem {
-    label: SharedString,
-}
-
-impl ListBulletItem {
-    pub fn new(label: impl Into<SharedString>) -> Self {
-        Self {
-            label: label.into(),
-        }
-    }
-}
-
-impl RenderOnce for ListBulletItem {
-    fn render(self, window: &mut Window, _cx: &mut App) -> impl IntoElement {
-        let line_height = window.line_height() * 0.85;
-
-        ListItem::new("list-item")
-            .selectable(false)
-            .child(
-                h_flex()
-                    .w_full()
-                    .min_w_0()
-                    .gap_1()
-                    .items_start()
-                    .child(
-                        h_flex().h(line_height).justify_center().child(
-                            Icon::new(IconName::Dash)
-                                .size(IconSize::XSmall)
-                                .color(Color::Hidden),
-                        ),
-                    )
-                    .child(div().w_full().min_w_0().child(Label::new(self.label))),
-            )
-            .into_any_element()
-    }
-}
-
-impl Component for ListBulletItem {
-    fn scope() -> ComponentScope {
-        ComponentScope::DataDisplay
-    }
-
-    fn description() -> Option<&'static str> {
-        Some("A list item with a bullet point indicator for unordered lists.")
-    }
-
-    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
-        Some(
-            v_flex()
-                .gap_6()
-                .child(example_group_with_title(
-                    "Bullet Items",
-                    vec![
-                        single_example(
-                            "Simple",
-                            ListBulletItem::new("First bullet item").into_any_element(),
-                        ),
-                        single_example(
-                            "Multiple Lines",
-                            v_flex()
-                                .child(ListBulletItem::new("First item"))
-                                .child(ListBulletItem::new("Second item"))
-                                .child(ListBulletItem::new("Third item"))
-                                .into_any_element(),
-                        ),
-                        single_example(
-                            "Long Text",
-                            ListBulletItem::new(
-                                "A longer bullet item that demonstrates text wrapping behavior",
-                            )
-                            .into_any_element(),
-                        ),
-                    ],
-                ))
-                .into_any_element(),
-        )
-    }
-}
diff --git a/crates/ui/src/components/list/list_header.rs b/crates/ui/src/components/list/list_header.rs
deleted file mode 100644
index 8726dca50d..0000000000
--- a/crates/ui/src/components/list/list_header.rs
+++ /dev/null
@@ -1,218 +0,0 @@
-use std::sync::Arc;
-
-use crate::{Disclosure, prelude::*};
-use component::{Component, ComponentScope, example_group_with_title, single_example};
-use gpui::{AnyElement, ClickEvent};
-use settings::Settings;
-use theme::ThemeSettings;
-
-#[derive(IntoElement, RegisterComponent)]
-pub struct ListHeader {
-    /// The label of the header.
-    label: SharedString,
-    /// A slot for content that appears before the label, like an icon or avatar.
-    start_slot: Option<AnyElement>,
-    /// A slot for content that appears after the label, usually on the other side of the header.
-    /// This might be a button, a disclosure arrow, a face pile, etc.
-    end_slot: Option<AnyElement>,
-    /// A slot for content that appears on hover after the label
-    /// It will obscure the `end_slot` when visible.
-    end_hover_slot: Option<AnyElement>,
-    toggle: Option<bool>,
-    on_toggle: Option<Arc<dyn Fn(&ClickEvent, &mut Window, &mut App) + 'static>>,
-    inset: bool,
-    selected: bool,
-}
-
-impl ListHeader {
-    pub fn new(label: impl Into<SharedString>) -> Self {
-        Self {
-            label: label.into(),
-            start_slot: None,
-            end_slot: None,
-            end_hover_slot: None,
-            inset: false,
-            toggle: None,
-            on_toggle: None,
-            selected: false,
-        }
-    }
-
-    pub fn toggle(mut self, toggle: impl Into<Option<bool>>) -> Self {
-        self.toggle = toggle.into();
-        self
-    }
-
-    pub fn on_toggle(
-        mut self,
-        on_toggle: impl Fn(&ClickEvent, &mut Window, &mut App) + 'static,
-    ) -> Self {
-        self.on_toggle = Some(Arc::new(on_toggle));
-        self
-    }
-
-    pub fn start_slot<E: IntoElement>(mut self, start_slot: impl Into<Option<E>>) -> Self {
-        self.start_slot = start_slot.into().map(IntoElement::into_any_element);
-        self
-    }
-
-    pub fn end_slot<E: IntoElement>(mut self, end_slot: impl Into<Option<E>>) -> Self {
-        self.end_slot = end_slot.into().map(IntoElement::into_any_element);
-        self
-    }
-
-    pub fn end_hover_slot<E: IntoElement>(mut self, end_hover_slot: impl Into<Option<E>>) -> Self {
-        self.end_hover_slot = end_hover_slot.into().map(IntoElement::into_any_element);
-        self
-    }
-
-    pub fn inset(mut self, inset: bool) -> Self {
-        self.inset = inset;
-        self
-    }
-}
-
-impl Toggleable for ListHeader {
-    fn toggle_state(mut self, selected: bool) -> Self {
-        self.selected = selected;
-        self
-    }
-}
-
-impl RenderOnce for ListHeader {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let ui_density = ThemeSettings::get_global(cx).ui_density;
-
-        h_flex()
-            .id(self.label.clone())
-            .w_full()
-            .relative()
-            .group("list_header")
-            .child(
-                div()
-                    .map(|this| match ui_density {
-                        theme::UiDensity::Comfortable => this.h_5(),
-                        _ => this.h_7(),
-                    })
-                    .when(self.inset, |this| this.px_2())
-                    .when(self.selected, |this| {
-                        this.bg(cx.theme().colors().ghost_element_selected)
-                    })
-                    .flex()
-                    .flex_1()
-                    .items_center()
-                    .justify_between()
-                    .w_full()
-                    .gap(DynamicSpacing::Base04.rems(cx))
-                    .child(
-                        h_flex()
-                            .gap(DynamicSpacing::Base04.rems(cx))
-                            .children(self.toggle.map(|is_open| {
-                                Disclosure::new("toggle", is_open)
-                                    .on_toggle_expanded(self.on_toggle.clone())
-                            }))
-                            .child(
-                                div()
-                                    .id("label_container")
-                                    .flex()
-                                    .gap(DynamicSpacing::Base04.rems(cx))
-                                    .items_center()
-                                    .children(self.start_slot)
-                                    .child(Label::new(self.label.clone()).color(Color::Muted))
-                                    .when_some(self.on_toggle, |this, on_toggle| {
-                                        this.on_click(move |event, window, cx| {
-                                            on_toggle(event, window, cx)
-                                        })
-                                    }),
-                            ),
-                    )
-                    .child(h_flex().children(self.end_slot))
-                    .when_some(self.end_hover_slot, |this, end_hover_slot| {
-                        this.child(
-                            div()
-                                .absolute()
-                                .right_0()
-                                .visible_on_hover("list_header")
-                                .child(end_hover_slot),
-                        )
-                    }),
-            )
-    }
-}
-
-impl Component for ListHeader {
-    fn scope() -> ComponentScope {
-        ComponentScope::DataDisplay
-    }
-
-    fn description() -> Option<&'static str> {
-        Some(
-            "A header component for lists with support for icons, actions, and collapsible sections.",
-        )
-    }
-
-    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
-        Some(
-            v_flex()
-                .gap_6()
-                .children(vec![
-                    example_group_with_title(
-                        "Basic Headers",
-                        vec![
-                            single_example(
-                                "Simple",
-                                ListHeader::new("Section Header").into_any_element(),
-                            ),
-                            single_example(
-                                "With Icon",
-                                ListHeader::new("Files")
-                                    .start_slot(Icon::new(IconName::File))
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "With End Slot",
-                                ListHeader::new("Recent")
-                                    .end_slot(Label::new("5").color(Color::Muted))
-                                    .into_any_element(),
-                            ),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "Collapsible Headers",
-                        vec![
-                            single_example(
-                                "Expanded",
-                                ListHeader::new("Expanded Section")
-                                    .toggle(Some(true))
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Collapsed",
-                                ListHeader::new("Collapsed Section")
-                                    .toggle(Some(false))
-                                    .into_any_element(),
-                            ),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "States",
-                        vec![
-                            single_example(
-                                "Selected",
-                                ListHeader::new("Selected Header")
-                                    .toggle_state(true)
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Inset",
-                                ListHeader::new("Inset Header")
-                                    .inset(true)
-                                    .into_any_element(),
-                            ),
-                        ],
-                    ),
-                ])
-                .into_any_element(),
-        )
-    }
-}
diff --git a/crates/ui/src/components/list/list_item.rs b/crates/ui/src/components/list/list_item.rs
deleted file mode 100644
index d581fad945..0000000000
--- a/crates/ui/src/components/list/list_item.rs
+++ /dev/null
@@ -1,470 +0,0 @@
-use std::sync::Arc;
-
-use component::{Component, ComponentScope, example_group_with_title, single_example};
-use gpui::{AnyElement, AnyView, ClickEvent, MouseButton, MouseDownEvent, Pixels, px};
-use smallvec::SmallVec;
-
-use crate::{Disclosure, prelude::*};
-
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy, Default)]
-pub enum ListItemSpacing {
-    #[default]
-    Dense,
-    ExtraDense,
-    Sparse,
-}
-
-#[derive(IntoElement, RegisterComponent)]
-pub struct ListItem {
-    id: ElementId,
-    group_name: Option<SharedString>,
-    disabled: bool,
-    selected: bool,
-    spacing: ListItemSpacing,
-    indent_level: usize,
-    indent_step_size: Pixels,
-    /// A slot for content that appears before the children, like an icon or avatar.
-    start_slot: Option<AnyElement>,
-    /// A slot for content that appears after the children, usually on the other side of the header.
-    /// This might be a button, a disclosure arrow, a face pile, etc.
-    end_slot: Option<AnyElement>,
-    /// A slot for content that appears on hover after the children
-    /// It will obscure the `end_slot` when visible.
-    end_hover_slot: Option<AnyElement>,
-    toggle: Option<bool>,
-    inset: bool,
-    on_click: Option<Box<dyn Fn(&ClickEvent, &mut Window, &mut App) + 'static>>,
-    on_hover: Option<Box<dyn Fn(&bool, &mut Window, &mut App) + 'static>>,
-    on_toggle: Option<Arc<dyn Fn(&ClickEvent, &mut Window, &mut App) + 'static>>,
-    tooltip: Option<Box<dyn Fn(&mut Window, &mut App) -> AnyView + 'static>>,
-    on_secondary_mouse_down: Option<Box<dyn Fn(&MouseDownEvent, &mut Window, &mut App) + 'static>>,
-    children: SmallVec<[AnyElement; 2]>,
-    selectable: bool,
-    always_show_disclosure_icon: bool,
-    outlined: bool,
-    rounded: bool,
-    overflow_x: bool,
-    focused: Option<bool>,
-}
-
-impl ListItem {
-    pub fn new(id: impl Into<ElementId>) -> Self {
-        Self {
-            id: id.into(),
-            group_name: None,
-            disabled: false,
-            selected: false,
-            spacing: ListItemSpacing::Dense,
-            indent_level: 0,
-            indent_step_size: px(12.),
-            start_slot: None,
-            end_slot: None,
-            end_hover_slot: None,
-            toggle: None,
-            inset: false,
-            on_click: None,
-            on_secondary_mouse_down: None,
-            on_toggle: None,
-            on_hover: None,
-            tooltip: None,
-            children: SmallVec::new(),
-            selectable: true,
-            always_show_disclosure_icon: false,
-            outlined: false,
-            rounded: false,
-            overflow_x: false,
-            focused: None,
-        }
-    }
-
-    pub fn group_name(mut self, group_name: impl Into<SharedString>) -> Self {
-        self.group_name = Some(group_name.into());
-        self
-    }
-
-    pub fn spacing(mut self, spacing: ListItemSpacing) -> Self {
-        self.spacing = spacing;
-        self
-    }
-
-    pub fn selectable(mut self, has_hover: bool) -> Self {
-        self.selectable = has_hover;
-        self
-    }
-
-    pub fn always_show_disclosure_icon(mut self, show: bool) -> Self {
-        self.always_show_disclosure_icon = show;
-        self
-    }
-
-    pub fn on_click(
-        mut self,
-        handler: impl Fn(&ClickEvent, &mut Window, &mut App) + 'static,
-    ) -> Self {
-        self.on_click = Some(Box::new(handler));
-        self
-    }
-
-    pub fn on_hover(mut self, handler: impl Fn(&bool, &mut Window, &mut App) + 'static) -> Self {
-        self.on_hover = Some(Box::new(handler));
-        self
-    }
-
-    pub fn on_secondary_mouse_down(
-        mut self,
-        handler: impl Fn(&MouseDownEvent, &mut Window, &mut App) + 'static,
-    ) -> Self {
-        self.on_secondary_mouse_down = Some(Box::new(handler));
-        self
-    }
-
-    pub fn tooltip(mut self, tooltip: impl Fn(&mut Window, &mut App) -> AnyView + 'static) -> Self {
-        self.tooltip = Some(Box::new(tooltip));
-        self
-    }
-
-    pub fn inset(mut self, inset: bool) -> Self {
-        self.inset = inset;
-        self
-    }
-
-    pub fn indent_level(mut self, indent_level: usize) -> Self {
-        self.indent_level = indent_level;
-        self
-    }
-
-    pub fn indent_step_size(mut self, indent_step_size: Pixels) -> Self {
-        self.indent_step_size = indent_step_size;
-        self
-    }
-
-    pub fn toggle(mut self, toggle: impl Into<Option<bool>>) -> Self {
-        self.toggle = toggle.into();
-        self
-    }
-
-    pub fn on_toggle(
-        mut self,
-        on_toggle: impl Fn(&ClickEvent, &mut Window, &mut App) + 'static,
-    ) -> Self {
-        self.on_toggle = Some(Arc::new(on_toggle));
-        self
-    }
-
-    pub fn start_slot<E: IntoElement>(mut self, start_slot: impl Into<Option<E>>) -> Self {
-        self.start_slot = start_slot.into().map(IntoElement::into_any_element);
-        self
-    }
-
-    pub fn end_slot<E: IntoElement>(mut self, end_slot: impl Into<Option<E>>) -> Self {
-        self.end_slot = end_slot.into().map(IntoElement::into_any_element);
-        self
-    }
-
-    pub fn end_hover_slot<E: IntoElement>(mut self, end_hover_slot: impl Into<Option<E>>) -> Self {
-        self.end_hover_slot = end_hover_slot.into().map(IntoElement::into_any_element);
-        self
-    }
-
-    pub fn outlined(mut self) -> Self {
-        self.outlined = true;
-        self
-    }
-
-    pub fn rounded(mut self) -> Self {
-        self.rounded = true;
-        self
-    }
-
-    pub fn overflow_x(mut self) -> Self {
-        self.overflow_x = true;
-        self
-    }
-
-    pub fn focused(mut self, focused: bool) -> Self {
-        self.focused = Some(focused);
-        self
-    }
-}
-
-impl Disableable for ListItem {
-    fn disabled(mut self, disabled: bool) -> Self {
-        self.disabled = disabled;
-        self
-    }
-}
-
-impl Toggleable for ListItem {
-    fn toggle_state(mut self, selected: bool) -> Self {
-        self.selected = selected;
-        self
-    }
-}
-
-impl ParentElement for ListItem {
-    fn extend(&mut self, elements: impl IntoIterator<Item = AnyElement>) {
-        self.children.extend(elements)
-    }
-}
-
-impl RenderOnce for ListItem {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        h_flex()
-            .id(self.id)
-            .when_some(self.group_name, |this, group| this.group(group))
-            .w_full()
-            .relative()
-            // When an item is inset draw the indent spacing outside of the item
-            .when(self.inset, |this| {
-                this.ml(self.indent_level as f32 * self.indent_step_size)
-                    .px(DynamicSpacing::Base04.rems(cx))
-            })
-            .when(!self.inset && !self.disabled, |this| {
-                this
-                    // TODO: Add focus state
-                    // .when(self.state == InteractionState::Focused, |this| {
-                    .when_some(self.focused, |this, focused| {
-                        if focused {
-                            this.border_1()
-                                .border_color(cx.theme().colors().border_focused)
-                        } else {
-                            this.border_1()
-                        }
-                    })
-                    .when(self.selectable, |this| {
-                        this.hover(|style| style.bg(cx.theme().colors().ghost_element_hover))
-                            .active(|style| style.bg(cx.theme().colors().ghost_element_active))
-                            .when(self.outlined, |this| this.rounded_sm())
-                            .when(self.selected, |this| {
-                                this.bg(cx.theme().colors().ghost_element_selected)
-                            })
-                    })
-            })
-            .when(self.rounded, |this| this.rounded_sm())
-            .when_some(self.on_hover, |this, on_hover| this.on_hover(on_hover))
-            .child(
-                h_flex()
-                    .id("inner_list_item")
-                    .group("list_item")
-                    .w_full()
-                    .relative()
-                    .gap_1()
-                    .px(DynamicSpacing::Base06.rems(cx))
-                    .map(|this| match self.spacing {
-                        ListItemSpacing::Dense => this,
-                        ListItemSpacing::ExtraDense => this.py_neg_px(),
-                        ListItemSpacing::Sparse => this.py_1(),
-                    })
-                    .when(self.inset && !self.disabled, |this| {
-                        this
-                            // TODO: Add focus state
-                            //.when(self.state == InteractionState::Focused, |this| {
-                            .when_some(self.focused, |this, focused| {
-                                if focused {
-                                    this.border_1()
-                                        .border_color(cx.theme().colors().border_focused)
-                                } else {
-                                    this.border_1()
-                                }
-                            })
-                            .when(self.selectable, |this| {
-                                this.hover(|style| {
-                                    style.bg(cx.theme().colors().ghost_element_hover)
-                                })
-                                .active(|style| style.bg(cx.theme().colors().ghost_element_active))
-                                .when(self.selected, |this| {
-                                    this.bg(cx.theme().colors().ghost_element_selected)
-                                })
-                            })
-                    })
-                    .when_some(
-                        self.on_click.filter(|_| !self.disabled),
-                        |this, on_click| this.cursor_pointer().on_click(on_click),
-                    )
-                    .when(self.outlined, |this| {
-                        this.border_1()
-                            .border_color(cx.theme().colors().border)
-                            .rounded_sm()
-                            .overflow_hidden()
-                    })
-                    .when_some(self.on_secondary_mouse_down, |this, on_mouse_down| {
-                        this.on_mouse_down(MouseButton::Right, move |event, window, cx| {
-                            (on_mouse_down)(event, window, cx)
-                        })
-                    })
-                    .when_some(self.tooltip, |this, tooltip| this.tooltip(tooltip))
-                    .map(|this| {
-                        if self.inset {
-                            this.rounded_sm()
-                        } else {
-                            // When an item is not inset draw the indent spacing inside of the item
-                            this.ml(self.indent_level as f32 * self.indent_step_size)
-                        }
-                    })
-                    .children(self.toggle.map(|is_open| {
-                        div()
-                            .flex()
-                            .absolute()
-                            .left(rems(-1.))
-                            .when(is_open && !self.always_show_disclosure_icon, |this| {
-                                this.visible_on_hover("")
-                            })
-                            .child(
-                                Disclosure::new("toggle", is_open)
-                                    .on_toggle_expanded(self.on_toggle),
-                            )
-                    }))
-                    .child(
-                        h_flex()
-                            .flex_grow()
-                            .flex_shrink_0()
-                            .flex_basis(relative(0.25))
-                            .gap(DynamicSpacing::Base06.rems(cx))
-                            .map(|list_content| {
-                                if self.overflow_x {
-                                    list_content
-                                } else {
-                                    list_content.overflow_hidden()
-                                }
-                            })
-                            .children(self.start_slot)
-                            .children(self.children),
-                    )
-                    .when_some(self.end_slot, |this, end_slot| {
-                        this.justify_between().child(
-                            h_flex()
-                                .flex_shrink()
-                                .overflow_hidden()
-                                .when(self.end_hover_slot.is_some(), |this| {
-                                    this.visible()
-                                        .group_hover("list_item", |this| this.invisible())
-                                })
-                                .child(end_slot),
-                        )
-                    })
-                    .when_some(self.end_hover_slot, |this, end_hover_slot| {
-                        this.child(
-                            h_flex()
-                                .h_full()
-                                .absolute()
-                                .right(DynamicSpacing::Base06.rems(cx))
-                                .top_0()
-                                .visible_on_hover("list_item")
-                                .child(end_hover_slot),
-                        )
-                    }),
-            )
-    }
-}
-
-impl Component for ListItem {
-    fn scope() -> ComponentScope {
-        ComponentScope::DataDisplay
-    }
-
-    fn description() -> Option<&'static str> {
-        Some(
-            "A flexible list item component with support for icons, actions, disclosure toggles, and hierarchical display.",
-        )
-    }
-
-    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
-        Some(
-            v_flex()
-                .gap_6()
-                .children(vec![
-                    example_group_with_title(
-                        "Basic List Items",
-                        vec![
-                            single_example(
-                                "Simple",
-                                ListItem::new("simple")
-                                    .child(Label::new("Simple list item"))
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "With Icon",
-                                ListItem::new("with_icon")
-                                    .start_slot(Icon::new(IconName::File))
-                                    .child(Label::new("List item with icon"))
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Selected",
-                                ListItem::new("selected")
-                                    .toggle_state(true)
-                                    .start_slot(Icon::new(IconName::Check))
-                                    .child(Label::new("Selected item"))
-                                    .into_any_element(),
-                            ),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "List Item Spacing",
-                        vec![
-                            single_example(
-                                "Dense",
-                                ListItem::new("dense")
-                                    .spacing(ListItemSpacing::Dense)
-                                    .child(Label::new("Dense spacing"))
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Extra Dense",
-                                ListItem::new("extra_dense")
-                                    .spacing(ListItemSpacing::ExtraDense)
-                                    .child(Label::new("Extra dense spacing"))
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Sparse",
-                                ListItem::new("sparse")
-                                    .spacing(ListItemSpacing::Sparse)
-                                    .child(Label::new("Sparse spacing"))
-                                    .into_any_element(),
-                            ),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "With Slots",
-                        vec![
-                            single_example(
-                                "End Slot",
-                                ListItem::new("end_slot")
-                                    .child(Label::new("Item with end slot"))
-                                    .end_slot(Icon::new(IconName::ChevronRight))
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "With Toggle",
-                                ListItem::new("with_toggle")
-                                    .toggle(Some(true))
-                                    .child(Label::new("Expandable item"))
-                                    .into_any_element(),
-                            ),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "States",
-                        vec![
-                            single_example(
-                                "Disabled",
-                                ListItem::new("disabled")
-                                    .disabled(true)
-                                    .child(Label::new("Disabled item"))
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Non-selectable",
-                                ListItem::new("non_selectable")
-                                    .selectable(false)
-                                    .child(Label::new("Non-selectable item"))
-                                    .into_any_element(),
-                            ),
-                        ],
-                    ),
-                ])
-                .into_any_element(),
-        )
-    }
-}
diff --git a/crates/ui/src/components/list/list_separator.rs b/crates/ui/src/components/list/list_separator.rs
deleted file mode 100644
index 92a7c987c7..0000000000
--- a/crates/ui/src/components/list/list_separator.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-use crate::prelude::*;
-
-#[derive(IntoElement)]
-pub struct ListSeparator;
-
-impl RenderOnce for ListSeparator {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        div()
-            .h_px()
-            .w_full()
-            .my(DynamicSpacing::Base06.rems(cx))
-            .bg(cx.theme().colors().border_variant)
-    }
-}
diff --git a/crates/ui/src/components/list/list_sub_header.rs b/crates/ui/src/components/list/list_sub_header.rs
deleted file mode 100644
index b4a82fb2ed..0000000000
--- a/crates/ui/src/components/list/list_sub_header.rs
+++ /dev/null
@@ -1,149 +0,0 @@
-use crate::prelude::*;
-use component::{Component, ComponentScope, example_group_with_title, single_example};
-
-#[derive(IntoElement, RegisterComponent)]
-pub struct ListSubHeader {
-    label: SharedString,
-    start_slot: Option<IconName>,
-    end_slot: Option<AnyElement>,
-    inset: bool,
-    selected: bool,
-}
-
-impl ListSubHeader {
-    pub fn new(label: impl Into<SharedString>) -> Self {
-        Self {
-            label: label.into(),
-            start_slot: None,
-            end_slot: None,
-            inset: false,
-            selected: false,
-        }
-    }
-
-    pub fn left_icon(mut self, left_icon: Option<IconName>) -> Self {
-        self.start_slot = left_icon;
-        self
-    }
-
-    pub fn end_slot(mut self, end_slot: AnyElement) -> Self {
-        self.end_slot = Some(end_slot);
-        self
-    }
-
-    pub fn inset(mut self, inset: bool) -> Self {
-        self.inset = inset;
-        self
-    }
-}
-
-impl Toggleable for ListSubHeader {
-    fn toggle_state(mut self, selected: bool) -> Self {
-        self.selected = selected;
-        self
-    }
-}
-
-impl RenderOnce for ListSubHeader {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        h_flex()
-            .flex_1()
-            .w_full()
-            .relative()
-            .pb(DynamicSpacing::Base04.rems(cx))
-            .px(DynamicSpacing::Base02.rems(cx))
-            .child(
-                div()
-                    .h_5()
-                    .when(self.inset, |this| this.px_2())
-                    .when(self.selected, |this| {
-                        this.bg(cx.theme().colors().ghost_element_selected)
-                    })
-                    .flex()
-                    .flex_1()
-                    .w_full()
-                    .gap_1()
-                    .items_center()
-                    .justify_between()
-                    .child(
-                        div()
-                            .flex()
-                            .gap_1()
-                            .items_center()
-                            .children(
-                                self.start_slot.map(|i| {
-                                    Icon::new(i).color(Color::Muted).size(IconSize::Small)
-                                }),
-                            )
-                            .child(
-                                Label::new(self.label.clone())
-                                    .color(Color::Muted)
-                                    .size(LabelSize::Small),
-                            ),
-                    )
-                    .children(self.end_slot),
-            )
-    }
-}
-
-impl Component for ListSubHeader {
-    fn scope() -> ComponentScope {
-        ComponentScope::DataDisplay
-    }
-
-    fn description() -> Option<&'static str> {
-        Some(
-            "A sub-header component for organizing list content into subsections with optional icons and end slots.",
-        )
-    }
-
-    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
-        Some(
-            v_flex()
-                .gap_6()
-                .children(vec![
-                    example_group_with_title(
-                        "Basic Sub-headers",
-                        vec![
-                            single_example(
-                                "Simple",
-                                ListSubHeader::new("Subsection").into_any_element(),
-                            ),
-                            single_example(
-                                "With Icon",
-                                ListSubHeader::new("Documents")
-                                    .left_icon(Some(IconName::File))
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "With End Slot",
-                                ListSubHeader::new("Recent")
-                                    .end_slot(
-                                        Label::new("3").color(Color::Muted).into_any_element(),
-                                    )
-                                    .into_any_element(),
-                            ),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "States",
-                        vec![
-                            single_example(
-                                "Selected",
-                                ListSubHeader::new("Selected")
-                                    .toggle_state(true)
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Inset",
-                                ListSubHeader::new("Inset Sub-header")
-                                    .inset(true)
-                                    .into_any_element(),
-                            ),
-                        ],
-                    ),
-                ])
-                .into_any_element(),
-        )
-    }
-}
diff --git a/crates/ui/src/components/modal.rs b/crates/ui/src/components/modal.rs
deleted file mode 100644
index 85565f5488..0000000000
--- a/crates/ui/src/components/modal.rs
+++ /dev/null
@@ -1,462 +0,0 @@
-use crate::{
-    Clickable, Color, DynamicSpacing, Headline, HeadlineSize, Icon, IconButton, IconButtonShape,
-    IconName, Label, LabelCommon, LabelSize, h_flex, v_flex,
-};
-use gpui::{prelude::FluentBuilder, *};
-use smallvec::SmallVec;
-use theme::ActiveTheme;
-
-#[derive(IntoElement)]
-pub struct Modal {
-    id: ElementId,
-    header: ModalHeader,
-    children: SmallVec<[AnyElement; 2]>,
-    footer: Option<ModalFooter>,
-    container_id: ElementId,
-    container_scroll_handler: Option<ScrollHandle>,
-}
-
-impl Modal {
-    pub fn new(id: impl Into<SharedString>, scroll_handle: Option<ScrollHandle>) -> Self {
-        let id = id.into();
-
-        let container_id = ElementId::Name(format!("{}_container", id).into());
-        Self {
-            id: ElementId::Name(id),
-            header: ModalHeader::new(),
-            children: SmallVec::new(),
-            footer: None,
-            container_id,
-            container_scroll_handler: scroll_handle,
-        }
-    }
-
-    pub fn header(mut self, header: ModalHeader) -> Self {
-        self.header = header;
-        self
-    }
-
-    pub fn section(mut self, section: Section) -> Self {
-        self.children.push(section.into_any_element());
-        self
-    }
-
-    pub fn footer(mut self, footer: ModalFooter) -> Self {
-        self.footer = Some(footer);
-        self
-    }
-
-    pub fn show_dismiss(mut self, show: bool) -> Self {
-        self.header.show_dismiss_button = show;
-        self
-    }
-
-    pub fn show_back(mut self, show: bool) -> Self {
-        self.header.show_back_button = show;
-        self
-    }
-}
-
-impl ParentElement for Modal {
-    fn extend(&mut self, elements: impl IntoIterator<Item = AnyElement>) {
-        self.children.extend(elements)
-    }
-}
-
-impl RenderOnce for Modal {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        v_flex()
-            .id(self.id.clone())
-            .size_full()
-            .flex_1()
-            .overflow_hidden()
-            .child(self.header)
-            .child(
-                v_flex()
-                    .id(self.container_id.clone())
-                    .w_full()
-                    .flex_1()
-                    .gap(DynamicSpacing::Base08.rems(cx))
-                    .when(self.footer.is_some(), |this| this.pb_4())
-                    .when_some(
-                        self.container_scroll_handler,
-                        |this, container_scroll_handle| {
-                            this.overflow_y_scroll()
-                                .track_scroll(&container_scroll_handle)
-                        },
-                    )
-                    .children(self.children),
-            )
-            .children(self.footer)
-    }
-}
-
-#[derive(IntoElement)]
-pub struct ModalHeader {
-    icon: Option<Icon>,
-    headline: Option<SharedString>,
-    description: Option<SharedString>,
-    children: SmallVec<[AnyElement; 2]>,
-    show_dismiss_button: bool,
-    show_back_button: bool,
-}
-
-impl Default for ModalHeader {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl ModalHeader {
-    pub fn new() -> Self {
-        Self {
-            icon: None,
-            headline: None,
-            description: None,
-            children: SmallVec::new(),
-            show_dismiss_button: false,
-            show_back_button: false,
-        }
-    }
-
-    pub fn icon(mut self, icon: Icon) -> Self {
-        self.icon = Some(icon);
-        self
-    }
-
-    /// Set the headline of the modal.
-    ///
-    /// This will insert the headline as the first item
-    /// of `children` if it is not already present.
-    pub fn headline(mut self, headline: impl Into<SharedString>) -> Self {
-        self.headline = Some(headline.into());
-        self
-    }
-
-    pub fn description(mut self, description: impl Into<SharedString>) -> Self {
-        self.description = Some(description.into());
-        self
-    }
-
-    pub fn show_dismiss_button(mut self, show: bool) -> Self {
-        self.show_dismiss_button = show;
-        self
-    }
-
-    pub fn show_back_button(mut self, show: bool) -> Self {
-        self.show_back_button = show;
-        self
-    }
-}
-
-impl ParentElement for ModalHeader {
-    fn extend(&mut self, elements: impl IntoIterator<Item = AnyElement>) {
-        self.children.extend(elements)
-    }
-}
-
-impl RenderOnce for ModalHeader {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let mut children = self.children;
-
-        if self.headline.is_some() {
-            children.insert(
-                0,
-                Headline::new(self.headline.unwrap())
-                    .size(HeadlineSize::XSmall)
-                    .color(Color::Muted)
-                    .into_any_element(),
-            );
-        }
-
-        h_flex()
-            .flex_none()
-            .justify_between()
-            .w_full()
-            .px(DynamicSpacing::Base12.rems(cx))
-            .pt(DynamicSpacing::Base08.rems(cx))
-            .pb(DynamicSpacing::Base04.rems(cx))
-            .gap(DynamicSpacing::Base08.rems(cx))
-            .when(self.show_back_button, |this| {
-                this.child(
-                    IconButton::new("back", IconName::ArrowLeft)
-                        .shape(IconButtonShape::Square)
-                        .on_click(|_, window, cx| {
-                            window.dispatch_action(menu::Cancel.boxed_clone(), cx);
-                        }),
-                )
-            })
-            .child(
-                v_flex()
-                    .flex_1()
-                    .child(
-                        h_flex()
-                            .gap_1()
-                            .when_some(self.icon, |this, icon| this.child(icon))
-                            .children(children),
-                    )
-                    .when_some(self.description, |this, description| {
-                        this.child(Label::new(description).color(Color::Muted).mb_2())
-                    }),
-            )
-            .when(self.show_dismiss_button, |this| {
-                this.child(
-                    IconButton::new("dismiss", IconName::Close)
-                        .shape(IconButtonShape::Square)
-                        .on_click(|_, window, cx| {
-                            window.dispatch_action(menu::Cancel.boxed_clone(), cx);
-                        }),
-                )
-            })
-    }
-}
-
-#[derive(IntoElement)]
-pub struct ModalRow {
-    children: SmallVec<[AnyElement; 2]>,
-}
-
-impl Default for ModalRow {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl ModalRow {
-    pub fn new() -> Self {
-        Self {
-            children: SmallVec::new(),
-        }
-    }
-}
-
-impl ParentElement for ModalRow {
-    fn extend(&mut self, elements: impl IntoIterator<Item = AnyElement>) {
-        self.children.extend(elements)
-    }
-}
-
-impl RenderOnce for ModalRow {
-    fn render(self, _window: &mut Window, _cx: &mut App) -> impl IntoElement {
-        h_flex().w_full().py_1().children(self.children)
-    }
-}
-
-#[derive(IntoElement)]
-pub struct ModalFooter {
-    start_slot: Option<AnyElement>,
-    end_slot: Option<AnyElement>,
-}
-
-impl Default for ModalFooter {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl ModalFooter {
-    pub fn new() -> Self {
-        Self {
-            start_slot: None,
-            end_slot: None,
-        }
-    }
-
-    pub fn start_slot<E: IntoElement>(mut self, start_slot: impl Into<Option<E>>) -> Self {
-        self.start_slot = start_slot.into().map(IntoElement::into_any_element);
-        self
-    }
-
-    pub fn end_slot<E: IntoElement>(mut self, end_slot: impl Into<Option<E>>) -> Self {
-        self.end_slot = end_slot.into().map(IntoElement::into_any_element);
-        self
-    }
-}
-
-impl RenderOnce for ModalFooter {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        h_flex()
-            .w_full()
-            .p(DynamicSpacing::Base08.rems(cx))
-            .flex_none()
-            .justify_between()
-            .gap_1()
-            .border_t_1()
-            .border_color(cx.theme().colors().border_variant)
-            .child(div().when_some(self.start_slot, |this, start_slot| this.child(start_slot)))
-            .child(div().when_some(self.end_slot, |this, end_slot| this.child(end_slot)))
-    }
-}
-
-#[derive(IntoElement)]
-pub struct Section {
-    contained: bool,
-    padded: bool,
-    header: Option<SectionHeader>,
-    meta: Option<SharedString>,
-    children: SmallVec<[AnyElement; 2]>,
-}
-
-impl Default for Section {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl Section {
-    pub fn new() -> Self {
-        Self {
-            contained: false,
-            padded: true,
-            header: None,
-            meta: None,
-            children: SmallVec::new(),
-        }
-    }
-
-    pub fn new_contained() -> Self {
-        Self {
-            contained: true,
-            padded: true,
-            header: None,
-            meta: None,
-            children: SmallVec::new(),
-        }
-    }
-
-    pub fn contained(mut self, contained: bool) -> Self {
-        self.contained = contained;
-        self
-    }
-
-    pub fn header(mut self, header: SectionHeader) -> Self {
-        self.header = Some(header);
-        self
-    }
-
-    pub fn meta(mut self, meta: impl Into<SharedString>) -> Self {
-        self.meta = Some(meta.into());
-        self
-    }
-    pub fn padded(mut self, padded: bool) -> Self {
-        self.padded = padded;
-        self
-    }
-}
-
-impl ParentElement for Section {
-    fn extend(&mut self, elements: impl IntoIterator<Item = AnyElement>) {
-        self.children.extend(elements)
-    }
-}
-
-impl RenderOnce for Section {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let mut section_bg = cx.theme().colors().text;
-        section_bg.fade_out(0.96);
-
-        let children = if self.contained {
-            v_flex()
-                .flex_1()
-                .when(self.padded, |this| this.px(DynamicSpacing::Base12.rems(cx)))
-                .child(
-                    v_flex()
-                        .w_full()
-                        .rounded_sm()
-                        .border_1()
-                        .border_color(cx.theme().colors().border)
-                        .bg(section_bg)
-                        .py(DynamicSpacing::Base06.rems(cx))
-                        .gap_y(DynamicSpacing::Base04.rems(cx))
-                        .child(div().flex().flex_1().size_full().children(self.children)),
-                )
-        } else {
-            v_flex()
-                .w_full()
-                .flex_1()
-                .gap_y(DynamicSpacing::Base04.rems(cx))
-                .when(self.padded, |this| {
-                    this.px(DynamicSpacing::Base06.rems(cx) + DynamicSpacing::Base06.rems(cx))
-                })
-                .children(self.children)
-        };
-
-        v_flex()
-            .size_full()
-            .flex_1()
-            .child(
-                v_flex()
-                    .flex_none()
-                    .px(DynamicSpacing::Base12.rems(cx))
-                    .children(self.header)
-                    .when_some(self.meta, |this, meta| {
-                        this.child(Label::new(meta).size(LabelSize::Small).color(Color::Muted))
-                    }),
-            )
-            .child(children)
-            // fill any leftover space
-            .child(div().flex().flex_1())
-    }
-}
-
-#[derive(IntoElement)]
-pub struct SectionHeader {
-    /// The label of the header.
-    label: SharedString,
-    /// A slot for content that appears after the label, usually on the other side of the header.
-    /// This might be a button, a disclosure arrow, a face pile, etc.
-    end_slot: Option<AnyElement>,
-}
-
-impl SectionHeader {
-    pub fn new(label: impl Into<SharedString>) -> Self {
-        Self {
-            label: label.into(),
-            end_slot: None,
-        }
-    }
-
-    pub fn end_slot<E: IntoElement>(mut self, end_slot: impl Into<Option<E>>) -> Self {
-        self.end_slot = end_slot.into().map(IntoElement::into_any_element);
-        self
-    }
-}
-
-impl RenderOnce for SectionHeader {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        h_flex()
-            .id(self.label.clone())
-            .w_full()
-            .px(DynamicSpacing::Base08.rems(cx))
-            .child(
-                div()
-                    .h_7()
-                    .flex()
-                    .items_center()
-                    .justify_between()
-                    .w_full()
-                    .gap(DynamicSpacing::Base04.rems(cx))
-                    .child(
-                        div().flex_1().child(
-                            Label::new(self.label.clone())
-                                .size(LabelSize::Small)
-                                .into_element(),
-                        ),
-                    )
-                    .child(h_flex().children(self.end_slot)),
-            )
-    }
-}
-
-impl From<SharedString> for SectionHeader {
-    fn from(val: SharedString) -> Self {
-        SectionHeader::new(val)
-    }
-}
-
-impl From<&'static str> for SectionHeader {
-    fn from(val: &'static str) -> Self {
-        let label: SharedString = val.into();
-        SectionHeader::new(label)
-    }
-}
diff --git a/crates/ui/src/components/navigable.rs b/crates/ui/src/components/navigable.rs
deleted file mode 100644
index a592bcc36f..0000000000
--- a/crates/ui/src/components/navigable.rs
+++ /dev/null
@@ -1,102 +0,0 @@
-use crate::prelude::*;
-use gpui::{AnyElement, FocusHandle, ScrollAnchor, ScrollHandle};
-
-/// An element that can be navigated through via keyboard. Intended for use with scrollable views that want to use
-#[derive(IntoElement)]
-pub struct Navigable {
-    child: AnyElement,
-    selectable_children: Vec<NavigableEntry>,
-}
-
-/// An entry of [Navigable] that can be navigated to.
-#[derive(Clone)]
-pub struct NavigableEntry {
-    #[allow(missing_docs)]
-    pub focus_handle: FocusHandle,
-    #[allow(missing_docs)]
-    pub scroll_anchor: Option<ScrollAnchor>,
-}
-
-impl NavigableEntry {
-    /// Creates a new [NavigableEntry] for a given scroll handle.
-    pub fn new(scroll_handle: &ScrollHandle, cx: &App) -> Self {
-        Self {
-            focus_handle: cx.focus_handle(),
-            scroll_anchor: Some(ScrollAnchor::for_handle(scroll_handle.clone())),
-        }
-    }
-    /// Create a new [NavigableEntry] that cannot be scrolled to.
-    pub fn focusable(cx: &App) -> Self {
-        Self {
-            focus_handle: cx.focus_handle(),
-            scroll_anchor: None,
-        }
-    }
-}
-impl Navigable {
-    /// Creates new empty [Navigable] wrapper.
-    pub fn new(child: AnyElement) -> Self {
-        Self {
-            child,
-            selectable_children: vec![],
-        }
-    }
-
-    /// Add a new entry that can be navigated to via keyboard.
-    ///
-    /// The order of calls to [Navigable::entry] determines the order of traversal of
-    /// elements via successive uses of `menu:::SelectNext/SelectPrevious`
-    pub fn entry(mut self, child: NavigableEntry) -> Self {
-        self.selectable_children.push(child);
-        self
-    }
-
-    fn find_focused(
-        selectable_children: &[NavigableEntry],
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<usize> {
-        selectable_children
-            .iter()
-            .position(|entry| entry.focus_handle.contains_focused(window, cx))
-    }
-}
-
-impl RenderOnce for Navigable {
-    fn render(self, _window: &mut Window, _: &mut App) -> impl crate::IntoElement {
-        div()
-            .on_action({
-                let children = self.selectable_children.clone();
-
-                move |_: &menu::SelectNext, window, cx| {
-                    let target = Self::find_focused(&children, window, cx)
-                        .and_then(|index| {
-                            index.checked_add(1).filter(|index| *index < children.len())
-                        })
-                        .unwrap_or(0);
-                    if let Some(entry) = children.get(target) {
-                        entry.focus_handle.focus(window);
-                        if let Some(anchor) = &entry.scroll_anchor {
-                            anchor.scroll_to(window, cx);
-                        }
-                    }
-                }
-            })
-            .on_action({
-                let children = self.selectable_children;
-                move |_: &menu::SelectPrevious, window, cx| {
-                    let target = Self::find_focused(&children, window, cx)
-                        .and_then(|index| index.checked_sub(1))
-                        .or(children.len().checked_sub(1));
-                    if let Some(entry) = target.and_then(|target| children.get(target)) {
-                        entry.focus_handle.focus(window);
-                        if let Some(anchor) = &entry.scroll_anchor {
-                            anchor.scroll_to(window, cx);
-                        }
-                    }
-                }
-            })
-            .size_full()
-            .child(self.child)
-    }
-}
diff --git a/crates/ui/src/components/notification.rs b/crates/ui/src/components/notification.rs
deleted file mode 100644
index 61109550f7..0000000000
--- a/crates/ui/src/components/notification.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-mod alert_modal;
-
-pub use alert_modal::*;
diff --git a/crates/ui/src/components/notification/alert_modal.rs b/crates/ui/src/components/notification/alert_modal.rs
deleted file mode 100644
index 9990dc1ce5..0000000000
--- a/crates/ui/src/components/notification/alert_modal.rs
+++ /dev/null
@@ -1,113 +0,0 @@
-use crate::component_prelude::*;
-use crate::prelude::*;
-use gpui::IntoElement;
-use smallvec::{SmallVec, smallvec};
-
-#[derive(IntoElement, RegisterComponent)]
-pub struct AlertModal {
-    id: ElementId,
-    children: SmallVec<[AnyElement; 2]>,
-    title: SharedString,
-    primary_action: SharedString,
-    dismiss_label: SharedString,
-}
-
-impl AlertModal {
-    pub fn new(id: impl Into<ElementId>, title: impl Into<SharedString>) -> Self {
-        Self {
-            id: id.into(),
-            children: smallvec![],
-            title: title.into(),
-            primary_action: "Ok".into(),
-            dismiss_label: "Cancel".into(),
-        }
-    }
-
-    pub fn primary_action(mut self, primary_action: impl Into<SharedString>) -> Self {
-        self.primary_action = primary_action.into();
-        self
-    }
-
-    pub fn dismiss_label(mut self, dismiss_label: impl Into<SharedString>) -> Self {
-        self.dismiss_label = dismiss_label.into();
-        self
-    }
-}
-
-impl RenderOnce for AlertModal {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        v_flex()
-            .id(self.id)
-            .elevation_3(cx)
-            .w(px(440.))
-            .p_5()
-            .child(
-                v_flex()
-                    .text_ui(cx)
-                    .text_color(Color::Muted.color(cx))
-                    .gap_1()
-                    .child(Headline::new(self.title).size(HeadlineSize::Small))
-                    .children(self.children),
-            )
-            .child(
-                h_flex()
-                    .h(rems(1.75))
-                    .items_center()
-                    .child(div().flex_1())
-                    .child(
-                        h_flex()
-                            .items_center()
-                            .gap_1()
-                            .child(
-                                Button::new(self.dismiss_label.clone(), self.dismiss_label.clone())
-                                    .color(Color::Muted),
-                            )
-                            .child(Button::new(
-                                self.primary_action.clone(),
-                                self.primary_action,
-                            )),
-                    ),
-            )
-    }
-}
-
-impl ParentElement for AlertModal {
-    fn extend(&mut self, elements: impl IntoIterator<Item = AnyElement>) {
-        self.children.extend(elements)
-    }
-}
-
-impl Component for AlertModal {
-    fn scope() -> ComponentScope {
-        ComponentScope::Notification
-    }
-
-    fn status() -> ComponentStatus {
-        ComponentStatus::WorkInProgress
-    }
-
-    fn description() -> Option<&'static str> {
-        Some("A modal dialog that presents an alert message with primary and dismiss actions.")
-    }
-
-    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
-        Some(
-            v_flex()
-                .gap_6()
-                .p_4()
-                .children(vec![example_group(
-                    vec![
-                        single_example(
-                            "Basic Alert",
-                            AlertModal::new("simple-modal", "Do you want to leave the current call?")
-                                .child("The current window will be closed, and connections to any shared projects will be terminated."
-                                )
-                                .primary_action("Leave Call")
-                                .into_any_element(),
-                        )
-                    ],
-                )])
-                .into_any_element()
-        )
-    }
-}
diff --git a/crates/ui/src/components/popover.rs b/crates/ui/src/components/popover.rs
deleted file mode 100644
index 7143514c52..0000000000
--- a/crates/ui/src/components/popover.rs
+++ /dev/null
@@ -1,94 +0,0 @@
-use crate::prelude::*;
-use crate::v_flex;
-use gpui::{
-    AnyElement, App, Element, IntoElement, ParentElement, Pixels, RenderOnce, Styled, Window, div,
-};
-use smallvec::SmallVec;
-
-/// Y height added beyond the size of the contents.
-pub const POPOVER_Y_PADDING: Pixels = px(8.);
-
-/// A popover is used to display a menu or show some options.
-///
-/// Clicking the element that launches the popover should not change the current view,
-/// and the popover should be statically positioned relative to that element (not the
-/// user's mouse.)
-///
-/// Example: A "new" menu with options like "new file", "new folder", etc,
-/// Linear's "Display" menu, a profile menu that appears when you click your avatar.
-///
-/// Related elements:
-///
-/// [`ContextMenu`](crate::ContextMenu):
-///
-/// Used to display a popover menu that only contains a list of items. Context menus are always
-/// launched by secondary clicking on an element. The menu is positioned relative to the user's cursor.
-///
-/// Example: Right clicking a file in the file tree to get a list of actions, right clicking
-/// a tab to in the tab bar to get a list of actions.
-///
-/// `Dropdown`:
-///
-/// Used to display a list of options when the user clicks an element. The menu is
-/// positioned relative the element that was clicked, and clicking an item in the
-/// dropdown should change the value of the element that was clicked.
-///
-/// Example: A theme select control. Displays "One Dark", clicking it opens a list of themes.
-/// When one is selected, the theme select control displays the selected theme.
-#[derive(IntoElement)]
-pub struct Popover {
-    children: SmallVec<[AnyElement; 2]>,
-    aside: Option<AnyElement>,
-}
-
-impl RenderOnce for Popover {
-    fn render(self, _: &mut Window, cx: &mut App) -> impl IntoElement {
-        div()
-            .flex()
-            .gap_1()
-            .child(
-                v_flex()
-                    .elevation_2(cx)
-                    .py(POPOVER_Y_PADDING / 2.)
-                    .child(div().children(self.children)),
-            )
-            .when_some(self.aside, |this, aside| {
-                this.child(
-                    v_flex()
-                        .elevation_2(cx)
-                        .bg(cx.theme().colors().surface_background)
-                        .px_1()
-                        .child(aside),
-                )
-            })
-    }
-}
-
-impl Default for Popover {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl Popover {
-    pub fn new() -> Self {
-        Self {
-            children: SmallVec::new(),
-            aside: None,
-        }
-    }
-
-    pub fn aside(mut self, aside: impl IntoElement) -> Self
-    where
-        Self: Sized,
-    {
-        self.aside = Some(aside.into_element().into_any());
-        self
-    }
-}
-
-impl ParentElement for Popover {
-    fn extend(&mut self, elements: impl IntoIterator<Item = AnyElement>) {
-        self.children.extend(elements)
-    }
-}
diff --git a/crates/ui/src/components/popover_menu.rs b/crates/ui/src/components/popover_menu.rs
deleted file mode 100644
index b1a52bec8f..0000000000
--- a/crates/ui/src/components/popover_menu.rs
+++ /dev/null
@@ -1,488 +0,0 @@
-use std::{cell::RefCell, rc::Rc};
-
-use gpui::{
-    AnyElement, AnyView, App, Bounds, Corner, DismissEvent, DispatchPhase, Element, ElementId,
-    Entity, Focusable as _, GlobalElementId, HitboxBehavior, HitboxId, InteractiveElement,
-    IntoElement, LayoutId, Length, ManagedView, MouseDownEvent, ParentElement, Pixels, Point,
-    Style, Window, anchored, deferred, div, point, prelude::FluentBuilder, px, size,
-};
-
-use crate::prelude::*;
-
-pub trait PopoverTrigger: IntoElement + Clickable + Toggleable + 'static {}
-
-impl<T: IntoElement + Clickable + Toggleable + 'static> PopoverTrigger for T {}
-
-impl<T: Clickable> Clickable for gpui::AnimationElement<T>
-where
-    T: Clickable + 'static,
-{
-    fn on_click(
-        self,
-        handler: impl Fn(&gpui::ClickEvent, &mut Window, &mut App) + 'static,
-    ) -> Self {
-        self.map_element(|e| e.on_click(handler))
-    }
-
-    fn cursor_style(self, cursor_style: gpui::CursorStyle) -> Self {
-        self.map_element(|e| e.cursor_style(cursor_style))
-    }
-}
-
-impl<T: Toggleable> Toggleable for gpui::AnimationElement<T>
-where
-    T: Toggleable + 'static,
-{
-    fn toggle_state(self, selected: bool) -> Self {
-        self.map_element(|e| e.toggle_state(selected))
-    }
-}
-
-pub struct PopoverMenuHandle<M>(Rc<RefCell<Option<PopoverMenuHandleState<M>>>>);
-
-impl<M> Clone for PopoverMenuHandle<M> {
-    fn clone(&self) -> Self {
-        Self(self.0.clone())
-    }
-}
-
-impl<M> Default for PopoverMenuHandle<M> {
-    fn default() -> Self {
-        Self(Rc::default())
-    }
-}
-
-struct PopoverMenuHandleState<M> {
-    menu_builder: Rc<dyn Fn(&mut Window, &mut App) -> Option<Entity<M>>>,
-    menu: Rc<RefCell<Option<Entity<M>>>>,
-    on_open: Option<Rc<dyn Fn(&mut Window, &mut App)>>,
-}
-
-impl<M: ManagedView> PopoverMenuHandle<M> {
-    pub fn show(&self, window: &mut Window, cx: &mut App) {
-        if let Some(state) = self.0.borrow().as_ref() {
-            show_menu(
-                &state.menu_builder,
-                &state.menu,
-                state.on_open.clone(),
-                window,
-                cx,
-            );
-        }
-    }
-
-    pub fn hide(&self, cx: &mut App) {
-        if let Some(state) = self.0.borrow().as_ref()
-            && let Some(menu) = state.menu.borrow().as_ref()
-        {
-            menu.update(cx, |_, cx| cx.emit(DismissEvent));
-        }
-    }
-
-    pub fn toggle(&self, window: &mut Window, cx: &mut App) {
-        if let Some(state) = self.0.borrow().as_ref() {
-            if state.menu.borrow().is_some() {
-                self.hide(cx);
-            } else {
-                self.show(window, cx);
-            }
-        }
-    }
-
-    pub fn is_deployed(&self) -> bool {
-        self.0
-            .borrow()
-            .as_ref()
-            .is_some_and(|state| state.menu.borrow().as_ref().is_some())
-    }
-
-    pub fn is_focused(&self, window: &Window, cx: &App) -> bool {
-        self.0.borrow().as_ref().is_some_and(|state| {
-            state
-                .menu
-                .borrow()
-                .as_ref()
-                .is_some_and(|model| model.focus_handle(cx).is_focused(window))
-        })
-    }
-
-    pub fn refresh_menu(
-        &self,
-        window: &mut Window,
-        cx: &mut App,
-        new_menu_builder: Rc<dyn Fn(&mut Window, &mut App) -> Option<Entity<M>>>,
-    ) {
-        let show_menu = if let Some(state) = self.0.borrow_mut().as_mut() {
-            state.menu_builder = new_menu_builder;
-            state.menu.borrow().is_some()
-        } else {
-            false
-        };
-
-        if show_menu {
-            self.show(window, cx);
-        }
-    }
-}
-
-pub struct PopoverMenu<M: ManagedView> {
-    id: ElementId,
-    child_builder: Option<
-        Box<
-            dyn FnOnce(
-                    Rc<RefCell<Option<Entity<M>>>>,
-                    Option<Rc<dyn Fn(&mut Window, &mut App) -> Option<Entity<M>> + 'static>>,
-                ) -> AnyElement
-                + 'static,
-        >,
-    >,
-    menu_builder: Option<Rc<dyn Fn(&mut Window, &mut App) -> Option<Entity<M>> + 'static>>,
-    anchor: Corner,
-    attach: Option<Corner>,
-    offset: Option<Point<Pixels>>,
-    trigger_handle: Option<PopoverMenuHandle<M>>,
-    on_open: Option<Rc<dyn Fn(&mut Window, &mut App)>>,
-    full_width: bool,
-}
-
-impl<M: ManagedView> PopoverMenu<M> {
-    /// Returns a new [`PopoverMenu`].
-    pub fn new(id: impl Into<ElementId>) -> Self {
-        Self {
-            id: id.into(),
-            child_builder: None,
-            menu_builder: None,
-            anchor: Corner::TopLeft,
-            attach: None,
-            offset: None,
-            trigger_handle: None,
-            on_open: None,
-            full_width: false,
-        }
-    }
-
-    pub fn full_width(mut self, full_width: bool) -> Self {
-        self.full_width = full_width;
-        self
-    }
-
-    pub fn menu(
-        mut self,
-        f: impl Fn(&mut Window, &mut App) -> Option<Entity<M>> + 'static,
-    ) -> Self {
-        self.menu_builder = Some(Rc::new(f));
-        self
-    }
-
-    pub fn with_handle(mut self, handle: PopoverMenuHandle<M>) -> Self {
-        self.trigger_handle = Some(handle);
-        self
-    }
-
-    pub fn trigger<T: PopoverTrigger>(mut self, t: T) -> Self {
-        let on_open = self.on_open.clone();
-        self.child_builder = Some(Box::new(move |menu, builder| {
-            let open = menu.borrow().is_some();
-            t.toggle_state(open)
-                .when_some(builder, |el, builder| {
-                    el.on_click(move |_event, window, cx| {
-                        show_menu(&builder, &menu, on_open.clone(), window, cx)
-                    })
-                })
-                .into_any_element()
-        }));
-        self
-    }
-
-    /// This method prevents the trigger button tooltip from being seen when the menu is open.
-    pub fn trigger_with_tooltip<T: PopoverTrigger + ButtonCommon>(
-        mut self,
-        t: T,
-        tooltip_builder: impl Fn(&mut Window, &mut App) -> AnyView + 'static,
-    ) -> Self {
-        let on_open = self.on_open.clone();
-        self.child_builder = Some(Box::new(move |menu, builder| {
-            let open = menu.borrow().is_some();
-            t.toggle_state(open)
-                .when_some(builder, |el, builder| {
-                    el.on_click(move |_, window, cx| {
-                        show_menu(&builder, &menu, on_open.clone(), window, cx)
-                    })
-                    .when(!open, |t| {
-                        t.tooltip(move |window, cx| tooltip_builder(window, cx))
-                    })
-                })
-                .into_any_element()
-        }));
-        self
-    }
-
-    /// Defines which corner of the menu to anchor to the attachment point.
-    /// By default, it uses the cursor position. Also see the `attach` method.
-    pub fn anchor(mut self, anchor: Corner) -> Self {
-        self.anchor = anchor;
-        self
-    }
-
-    /// Defines which corner of the handle to attach the menu's anchor to.
-    pub fn attach(mut self, attach: Corner) -> Self {
-        self.attach = Some(attach);
-        self
-    }
-
-    /// Offsets the position of the content by that many pixels.
-    pub fn offset(mut self, offset: Point<Pixels>) -> Self {
-        self.offset = Some(offset);
-        self
-    }
-
-    /// Attaches something upon opening the menu.
-    pub fn on_open(mut self, on_open: Rc<dyn Fn(&mut Window, &mut App)>) -> Self {
-        self.on_open = Some(on_open);
-        self
-    }
-
-    fn resolved_attach(&self) -> Corner {
-        self.attach.unwrap_or(match self.anchor {
-            Corner::TopLeft => Corner::BottomLeft,
-            Corner::TopRight => Corner::BottomRight,
-            Corner::BottomLeft => Corner::TopLeft,
-            Corner::BottomRight => Corner::TopRight,
-        })
-    }
-
-    fn resolved_offset(&self, window: &mut Window) -> Point<Pixels> {
-        self.offset.unwrap_or_else(|| {
-            // Default offset = 4px padding + 1px border
-            let offset = rems_from_px(5.) * window.rem_size();
-            match self.anchor {
-                Corner::TopRight | Corner::BottomRight => point(offset, px(0.)),
-                Corner::TopLeft | Corner::BottomLeft => point(-offset, px(0.)),
-            }
-        })
-    }
-}
-
-fn show_menu<M: ManagedView>(
-    builder: &Rc<dyn Fn(&mut Window, &mut App) -> Option<Entity<M>>>,
-    menu: &Rc<RefCell<Option<Entity<M>>>>,
-    on_open: Option<Rc<dyn Fn(&mut Window, &mut App)>>,
-    window: &mut Window,
-    cx: &mut App,
-) {
-    let previous_focus_handle = window.focused(cx);
-    let Some(new_menu) = (builder)(window, cx) else {
-        return;
-    };
-    let menu2 = menu.clone();
-
-    window
-        .subscribe(&new_menu, cx, move |modal, _: &DismissEvent, window, cx| {
-            if modal.focus_handle(cx).contains_focused(window, cx)
-                && let Some(previous_focus_handle) = previous_focus_handle.as_ref()
-            {
-                window.focus(previous_focus_handle);
-            }
-            *menu2.borrow_mut() = None;
-            window.refresh();
-        })
-        .detach();
-    window.focus(&new_menu.focus_handle(cx));
-    *menu.borrow_mut() = Some(new_menu);
-    window.refresh();
-
-    if let Some(on_open) = on_open {
-        on_open(window, cx);
-    }
-}
-
-pub struct PopoverMenuElementState<M> {
-    menu: Rc<RefCell<Option<Entity<M>>>>,
-    child_bounds: Option<Bounds<Pixels>>,
-}
-
-impl<M> Clone for PopoverMenuElementState<M> {
-    fn clone(&self) -> Self {
-        Self {
-            menu: Rc::clone(&self.menu),
-            child_bounds: self.child_bounds,
-        }
-    }
-}
-
-impl<M> Default for PopoverMenuElementState<M> {
-    fn default() -> Self {
-        Self {
-            menu: Rc::default(),
-            child_bounds: None,
-        }
-    }
-}
-
-pub struct PopoverMenuFrameState<M: ManagedView> {
-    child_layout_id: Option<LayoutId>,
-    child_element: Option<AnyElement>,
-    menu_element: Option<AnyElement>,
-    menu_handle: Rc<RefCell<Option<Entity<M>>>>,
-}
-
-impl<M: ManagedView> Element for PopoverMenu<M> {
-    type RequestLayoutState = PopoverMenuFrameState<M>;
-    type PrepaintState = Option<HitboxId>;
-
-    fn id(&self) -> Option<ElementId> {
-        Some(self.id.clone())
-    }
-
-    fn source_location(&self) -> Option<&'static core::panic::Location<'static>> {
-        None
-    }
-
-    fn request_layout(
-        &mut self,
-        global_id: Option<&GlobalElementId>,
-        _inspector_id: Option<&gpui::InspectorElementId>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> (gpui::LayoutId, Self::RequestLayoutState) {
-        window.with_element_state(
-            global_id.unwrap(),
-            |element_state: Option<PopoverMenuElementState<M>>, window| {
-                let element_state = element_state.unwrap_or_default();
-                let mut menu_layout_id = None;
-
-                let menu_element = element_state.menu.borrow_mut().as_mut().map(|menu| {
-                    let offset = self.resolved_offset(window);
-                    let mut anchored = anchored()
-                        .snap_to_window_with_margin(px(8.))
-                        .anchor(self.anchor)
-                        .offset(offset);
-                    if let Some(child_bounds) = element_state.child_bounds {
-                        anchored =
-                            anchored.position(child_bounds.corner(self.resolved_attach()) + offset);
-                    }
-                    let mut element = deferred(anchored.child(div().occlude().child(menu.clone())))
-                        .with_priority(1)
-                        .into_any();
-
-                    menu_layout_id = Some(element.request_layout(window, cx));
-                    element
-                });
-
-                let mut child_element = self.child_builder.take().map(|child_builder| {
-                    (child_builder)(element_state.menu.clone(), self.menu_builder.clone())
-                });
-
-                if let Some(trigger_handle) = self.trigger_handle.take()
-                    && let Some(menu_builder) = self.menu_builder.clone()
-                {
-                    *trigger_handle.0.borrow_mut() = Some(PopoverMenuHandleState {
-                        menu_builder,
-                        menu: element_state.menu.clone(),
-                        on_open: self.on_open.clone(),
-                    });
-                }
-
-                let child_layout_id = child_element
-                    .as_mut()
-                    .map(|child_element| child_element.request_layout(window, cx));
-
-                let mut style = Style::default();
-                if self.full_width {
-                    style.size = size(relative(1.).into(), Length::Auto);
-                }
-
-                let layout_id = window.request_layout(
-                    style,
-                    menu_layout_id.into_iter().chain(child_layout_id),
-                    cx,
-                );
-
-                (
-                    (
-                        layout_id,
-                        PopoverMenuFrameState {
-                            child_element,
-                            child_layout_id,
-                            menu_element,
-                            menu_handle: element_state.menu.clone(),
-                        },
-                    ),
-                    element_state,
-                )
-            },
-        )
-    }
-
-    fn prepaint(
-        &mut self,
-        global_id: Option<&GlobalElementId>,
-        _inspector_id: Option<&gpui::InspectorElementId>,
-        _bounds: Bounds<Pixels>,
-        request_layout: &mut Self::RequestLayoutState,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<HitboxId> {
-        if let Some(child) = request_layout.child_element.as_mut() {
-            child.prepaint(window, cx);
-        }
-
-        if let Some(menu) = request_layout.menu_element.as_mut() {
-            menu.prepaint(window, cx);
-        }
-
-        request_layout.child_layout_id.map(|layout_id| {
-            let bounds = window.layout_bounds(layout_id);
-            window.with_element_state(global_id.unwrap(), |element_state, _cx| {
-                let mut element_state: PopoverMenuElementState<M> = element_state.unwrap();
-                element_state.child_bounds = Some(bounds);
-                ((), element_state)
-            });
-
-            window.insert_hitbox(bounds, HitboxBehavior::Normal).id
-        })
-    }
-
-    fn paint(
-        &mut self,
-        _id: Option<&GlobalElementId>,
-        _inspector_id: Option<&gpui::InspectorElementId>,
-        _: Bounds<gpui::Pixels>,
-        request_layout: &mut Self::RequestLayoutState,
-        child_hitbox: &mut Option<HitboxId>,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        if let Some(mut child) = request_layout.child_element.take() {
-            child.paint(window, cx);
-        }
-
-        if let Some(mut menu) = request_layout.menu_element.take() {
-            menu.paint(window, cx);
-
-            if let Some(child_hitbox) = *child_hitbox {
-                let menu_handle = request_layout.menu_handle.clone();
-                // Mouse-downing outside the menu dismisses it, so we don't
-                // want a click on the toggle to re-open it.
-                window.on_mouse_event(move |_: &MouseDownEvent, phase, window, cx| {
-                    if phase == DispatchPhase::Bubble && child_hitbox.is_hovered(window) {
-                        if let Some(menu) = menu_handle.borrow().as_ref() {
-                            menu.update(cx, |_, cx| {
-                                cx.emit(DismissEvent);
-                            });
-                        }
-                        cx.stop_propagation();
-                    }
-                })
-            }
-        }
-    }
-}
-
-impl<M: ManagedView> IntoElement for PopoverMenu<M> {
-    type Element = Self;
-
-    fn into_element(self) -> Self::Element {
-        self
-    }
-}
diff --git a/crates/ui/src/components/progress.rs b/crates/ui/src/components/progress.rs
deleted file mode 100644
index bfaf7f3dcf..0000000000
--- a/crates/ui/src/components/progress.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-mod progress_bar;
-pub use progress_bar::*;
diff --git a/crates/ui/src/components/progress/progress_bar.rs b/crates/ui/src/components/progress/progress_bar.rs
deleted file mode 100644
index 5cc5abd36d..0000000000
--- a/crates/ui/src/components/progress/progress_bar.rs
+++ /dev/null
@@ -1,156 +0,0 @@
-use documented::Documented;
-use gpui::{Hsla, point};
-
-use crate::components::Label;
-use crate::prelude::*;
-
-/// A progress bar is a horizontal bar that communicates the status of a process.
-///
-/// A progress bar should not be used to represent indeterminate progress.
-#[derive(IntoElement, RegisterComponent, Documented)]
-pub struct ProgressBar {
-    id: ElementId,
-    value: f32,
-    max_value: f32,
-    bg_color: Hsla,
-    over_color: Hsla,
-    fg_color: Hsla,
-}
-
-impl ProgressBar {
-    pub fn new(id: impl Into<ElementId>, value: f32, max_value: f32, cx: &App) -> Self {
-        Self {
-            id: id.into(),
-            value,
-            max_value,
-            bg_color: cx.theme().colors().background,
-            over_color: cx.theme().status().error,
-            fg_color: cx.theme().status().info,
-        }
-    }
-
-    /// Sets the current value of the progress bar.
-    pub fn value(mut self, value: f32) -> Self {
-        self.value = value;
-        self
-    }
-
-    /// Sets the maximum value of the progress bar.
-    pub fn max_value(mut self, max_value: f32) -> Self {
-        self.max_value = max_value;
-        self
-    }
-
-    /// Sets the background color of the progress bar.
-    pub fn bg_color(mut self, color: Hsla) -> Self {
-        self.bg_color = color;
-        self
-    }
-
-    /// Sets the foreground color of the progress bar.
-    pub fn fg_color(mut self, color: Hsla) -> Self {
-        self.fg_color = color;
-        self
-    }
-
-    /// Sets the over limit color of the progress bar.
-    pub fn over_color(mut self, color: Hsla) -> Self {
-        self.over_color = color;
-        self
-    }
-}
-
-impl RenderOnce for ProgressBar {
-    fn render(self, _window: &mut Window, _cx: &mut App) -> impl IntoElement {
-        let fill_width = (self.value / self.max_value).clamp(0.02, 1.0);
-
-        div()
-            .id(self.id.clone())
-            .w_full()
-            .h(px(8.0))
-            .rounded_full()
-            .p(px(2.0))
-            .bg(self.bg_color)
-            .shadow(vec![gpui::BoxShadow {
-                color: gpui::black().opacity(0.08),
-                offset: point(px(0.), px(1.)),
-                blur_radius: px(0.),
-                spread_radius: px(0.),
-            }])
-            .child(
-                div()
-                    .h_full()
-                    .rounded_full()
-                    .when(self.value > self.max_value, |div| div.bg(self.over_color))
-                    .when(self.value <= self.max_value, |div| div.bg(self.fg_color))
-                    .w(relative(fill_width)),
-            )
-    }
-}
-
-impl Component for ProgressBar {
-    fn scope() -> ComponentScope {
-        ComponentScope::Status
-    }
-
-    fn description() -> Option<&'static str> {
-        Some(Self::DOCS)
-    }
-
-    fn preview(_window: &mut Window, cx: &mut App) -> Option<AnyElement> {
-        let max_value = 180.0;
-
-        Some(
-            div()
-                .flex()
-                .flex_col()
-                .gap_4()
-                .p_4()
-                .w(px(240.0))
-                .child(div().child("Progress Bar"))
-                .child(
-                    div()
-                        .flex()
-                        .flex_col()
-                        .gap_2()
-                        .child(
-                            div()
-                                .flex()
-                                .justify_between()
-                                .child(Label::new("0%"))
-                                .child(Label::new("Empty")),
-                        )
-                        .child(ProgressBar::new("empty", 0.0, max_value, cx)),
-                )
-                .child(
-                    div()
-                        .flex()
-                        .flex_col()
-                        .gap_2()
-                        .child(
-                            div()
-                                .flex()
-                                .justify_between()
-                                .child(Label::new("38%"))
-                                .child(Label::new("Partial")),
-                        )
-                        .child(ProgressBar::new("partial", max_value * 0.35, max_value, cx)),
-                )
-                .child(
-                    div()
-                        .flex()
-                        .flex_col()
-                        .gap_2()
-                        .child(
-                            div()
-                                .flex()
-                                .justify_between()
-                                .child(Label::new("100%"))
-                                .child(Label::new("Complete")),
-                        )
-                        .child(ProgressBar::new("filled", max_value, max_value, cx)),
-                )
-                .into_any_element(),
-        )
-    }
-}
diff --git a/crates/ui/src/components/radio.rs b/crates/ui/src/components/radio.rs
deleted file mode 100644
index c7e19f5c34..0000000000
--- a/crates/ui/src/components/radio.rs
+++ /dev/null
@@ -1,60 +0,0 @@
-use std::sync::Arc;
-
-use crate::prelude::*;
-
-#[derive(IntoElement)]
-pub struct RadioWithLabel {
-    id: ElementId,
-    label: Label,
-    selected: bool,
-    on_click: Arc<dyn Fn(&bool, &mut Window, &mut App) + 'static>,
-}
-
-impl RadioWithLabel {
-    pub fn new(
-        id: impl Into<ElementId>,
-        label: Label,
-        selected: bool,
-        on_click: impl Fn(&bool, &mut Window, &mut App) + 'static,
-    ) -> Self {
-        Self {
-            id: id.into(),
-            label,
-            selected,
-            on_click: Arc::new(on_click),
-        }
-    }
-}
-
-impl RenderOnce for RadioWithLabel {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let inner_diameter = rems_from_px(6.);
-        let outer_diameter = rems_from_px(16.);
-        let border_width = rems_from_px(1.);
-        h_flex()
-            .id(self.id)
-            .gap(DynamicSpacing::Base08.rems(cx))
-            .group("")
-            .child(
-                div()
-                    .size(outer_diameter)
-                    .rounded(outer_diameter / 2.)
-                    .border_color(cx.theme().colors().border)
-                    .border(border_width)
-                    .group_hover("", |el| el.bg(cx.theme().colors().element_hover))
-                    .when(self.selected, |el| {
-                        el.child(
-                            div()
-                                .m((outer_diameter - inner_diameter) / 2. - border_width)
-                                .size(inner_diameter)
-                                .rounded(inner_diameter / 2.)
-                                .bg(cx.theme().colors().icon_accent),
-                        )
-                    }),
-            )
-            .child(self.label)
-            .on_click(move |_event, window, cx| {
-                (self.on_click)(&true, window, cx);
-            })
-    }
-}
diff --git a/crates/ui/src/components/right_click_menu.rs b/crates/ui/src/components/right_click_menu.rs
deleted file mode 100644
index dff4230737..0000000000
--- a/crates/ui/src/components/right_click_menu.rs
+++ /dev/null
@@ -1,287 +0,0 @@
-use std::{cell::RefCell, rc::Rc};
-
-use gpui::{
-    AnyElement, App, Bounds, Corner, DismissEvent, DispatchPhase, Element, ElementId, Entity,
-    Focusable as _, GlobalElementId, Hitbox, HitboxBehavior, InteractiveElement, IntoElement,
-    LayoutId, ManagedView, MouseButton, MouseDownEvent, ParentElement, Pixels, Point, Window,
-    anchored, deferred, div, px,
-};
-
-pub struct RightClickMenu<M: ManagedView> {
-    id: ElementId,
-    child_builder: Option<Box<dyn FnOnce(bool, &mut Window, &mut App) -> AnyElement + 'static>>,
-    menu_builder: Option<Rc<dyn Fn(&mut Window, &mut App) -> Entity<M> + 'static>>,
-    anchor: Option<Corner>,
-    attach: Option<Corner>,
-}
-
-impl<M: ManagedView> RightClickMenu<M> {
-    pub fn menu(mut self, f: impl Fn(&mut Window, &mut App) -> Entity<M> + 'static) -> Self {
-        self.menu_builder = Some(Rc::new(f));
-        self
-    }
-
-    pub fn trigger<F, E>(mut self, e: F) -> Self
-    where
-        F: FnOnce(bool, &mut Window, &mut App) -> E + 'static,
-        E: IntoElement + 'static,
-    {
-        self.child_builder = Some(Box::new(move |is_menu_active, window, cx| {
-            e(is_menu_active, window, cx).into_any_element()
-        }));
-        self
-    }
-
-    /// anchor defines which corner of the menu to anchor to the attachment point
-    /// (by default the cursor position, but see attach)
-    pub fn anchor(mut self, anchor: Corner) -> Self {
-        self.anchor = Some(anchor);
-        self
-    }
-
-    /// attach defines which corner of the handle to attach the menu's anchor to
-    pub fn attach(mut self, attach: Corner) -> Self {
-        self.attach = Some(attach);
-        self
-    }
-
-    fn with_element_state<R>(
-        &mut self,
-        global_id: &GlobalElementId,
-        window: &mut Window,
-        cx: &mut App,
-        f: impl FnOnce(&mut Self, &mut MenuHandleElementState<M>, &mut Window, &mut App) -> R,
-    ) -> R {
-        window.with_optional_element_state::<MenuHandleElementState<M>, _>(
-            Some(global_id),
-            |element_state, window| {
-                let mut element_state = element_state.unwrap().unwrap_or_default();
-                let result = f(self, &mut element_state, window, cx);
-                (result, Some(element_state))
-            },
-        )
-    }
-}
-
-/// Creates a [`RightClickMenu`]
-pub fn right_click_menu<M: ManagedView>(id: impl Into<ElementId>) -> RightClickMenu<M> {
-    RightClickMenu {
-        id: id.into(),
-        child_builder: None,
-        menu_builder: None,
-        anchor: None,
-        attach: None,
-    }
-}
-
-pub struct MenuHandleElementState<M> {
-    menu: Rc<RefCell<Option<Entity<M>>>>,
-    position: Rc<RefCell<Point<Pixels>>>,
-}
-
-impl<M> Clone for MenuHandleElementState<M> {
-    fn clone(&self) -> Self {
-        Self {
-            menu: Rc::clone(&self.menu),
-            position: Rc::clone(&self.position),
-        }
-    }
-}
-
-impl<M> Default for MenuHandleElementState<M> {
-    fn default() -> Self {
-        Self {
-            menu: Rc::default(),
-            position: Rc::default(),
-        }
-    }
-}
-
-pub struct RequestLayoutState {
-    child_layout_id: Option<LayoutId>,
-    child_element: Option<AnyElement>,
-    menu_element: Option<AnyElement>,
-}
-
-pub struct PrepaintState {
-    hitbox: Hitbox,
-    child_bounds: Option<Bounds<Pixels>>,
-}
-
-impl<M: ManagedView> Element for RightClickMenu<M> {
-    type RequestLayoutState = RequestLayoutState;
-    type PrepaintState = PrepaintState;
-
-    fn id(&self) -> Option<ElementId> {
-        Some(self.id.clone())
-    }
-
-    fn source_location(&self) -> Option<&'static core::panic::Location<'static>> {
-        None
-    }
-
-    fn request_layout(
-        &mut self,
-        id: Option<&GlobalElementId>,
-        _inspector_id: Option<&gpui::InspectorElementId>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> (gpui::LayoutId, Self::RequestLayoutState) {
-        self.with_element_state(
-            id.unwrap(),
-            window,
-            cx,
-            |this, element_state, window, cx| {
-                let mut menu_layout_id = None;
-
-                let menu_element = element_state.menu.borrow_mut().as_mut().map(|menu| {
-                    let mut anchored = anchored().snap_to_window_with_margin(px(8.));
-                    if let Some(anchor) = this.anchor {
-                        anchored = anchored.anchor(anchor);
-                    }
-                    anchored = anchored.position(*element_state.position.borrow());
-
-                    let mut element = deferred(anchored.child(div().occlude().child(menu.clone())))
-                        .with_priority(1)
-                        .into_any();
-
-                    menu_layout_id = Some(element.request_layout(window, cx));
-                    element
-                });
-
-                let mut child_element = this.child_builder.take().map(|child_builder| {
-                    (child_builder)(element_state.menu.borrow().is_some(), window, cx)
-                });
-
-                let child_layout_id = child_element
-                    .as_mut()
-                    .map(|child_element| child_element.request_layout(window, cx));
-
-                let layout_id = window.request_layout(
-                    gpui::Style::default(),
-                    menu_layout_id.into_iter().chain(child_layout_id),
-                    cx,
-                );
-
-                (
-                    layout_id,
-                    RequestLayoutState {
-                        child_element,
-                        child_layout_id,
-                        menu_element,
-                    },
-                )
-            },
-        )
-    }
-
-    fn prepaint(
-        &mut self,
-        _id: Option<&GlobalElementId>,
-        _inspector_id: Option<&gpui::InspectorElementId>,
-        bounds: Bounds<Pixels>,
-        request_layout: &mut Self::RequestLayoutState,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> PrepaintState {
-        let hitbox = window.insert_hitbox(bounds, HitboxBehavior::Normal);
-
-        if let Some(child) = request_layout.child_element.as_mut() {
-            child.prepaint(window, cx);
-        }
-
-        if let Some(menu) = request_layout.menu_element.as_mut() {
-            menu.prepaint(window, cx);
-        }
-
-        PrepaintState {
-            hitbox,
-            child_bounds: request_layout
-                .child_layout_id
-                .map(|layout_id| window.layout_bounds(layout_id)),
-        }
-    }
-
-    fn paint(
-        &mut self,
-        id: Option<&GlobalElementId>,
-        _inspector_id: Option<&gpui::InspectorElementId>,
-        _bounds: Bounds<gpui::Pixels>,
-        request_layout: &mut Self::RequestLayoutState,
-        prepaint_state: &mut Self::PrepaintState,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        self.with_element_state(
-            id.unwrap(),
-            window,
-            cx,
-            |this, element_state, window, cx| {
-                if let Some(mut child) = request_layout.child_element.take() {
-                    child.paint(window, cx);
-                }
-
-                if let Some(mut menu) = request_layout.menu_element.take() {
-                    menu.paint(window, cx);
-                }
-
-                let Some(builder) = this.menu_builder.take() else {
-                    return;
-                };
-
-                let attach = this.attach;
-                let menu = element_state.menu.clone();
-                let position = element_state.position.clone();
-                let child_bounds = prepaint_state.child_bounds;
-
-                let hitbox_id = prepaint_state.hitbox.id;
-                window.on_mouse_event(move |event: &MouseDownEvent, phase, window, cx| {
-                    if phase == DispatchPhase::Bubble
-                        && event.button == MouseButton::Right
-                        && hitbox_id.is_hovered(window)
-                    {
-                        cx.stop_propagation();
-                        window.prevent_default();
-
-                        let new_menu = (builder)(window, cx);
-                        let menu2 = menu.clone();
-                        let previous_focus_handle = window.focused(cx);
-
-                        window
-                            .subscribe(&new_menu, cx, move |modal, _: &DismissEvent, window, cx| {
-                                if modal.focus_handle(cx).contains_focused(window, cx)
-                                    && let Some(previous_focus_handle) =
-                                        previous_focus_handle.as_ref()
-                                {
-                                    window.focus(previous_focus_handle);
-                                }
-                                *menu2.borrow_mut() = None;
-                                window.refresh();
-                            })
-                            .detach();
-                        window.focus(&new_menu.focus_handle(cx));
-                        *menu.borrow_mut() = Some(new_menu);
-                        *position.borrow_mut() = if let Some(child_bounds) = child_bounds {
-                            if let Some(attach) = attach {
-                                child_bounds.corner(attach)
-                            } else {
-                                window.mouse_position()
-                            }
-                        } else {
-                            window.mouse_position()
-                        };
-                        window.refresh();
-                    }
-                });
-            },
-        )
-    }
-}
-
-impl<M: ManagedView> IntoElement for RightClickMenu<M> {
-    type Element = Self;
-
-    fn into_element(self) -> Self::Element {
-        self
-    }
-}
diff --git a/crates/ui/src/components/scrollbar.rs b/crates/ui/src/components/scrollbar.rs
deleted file mode 100644
index 391d480fb3..0000000000
--- a/crates/ui/src/components/scrollbar.rs
+++ /dev/null
@@ -1,1466 +0,0 @@
-use std::{
-    any::Any,
-    fmt::Debug,
-    ops::Not,
-    time::{Duration, Instant},
-};
-
-use gpui::{
-    Along, App, AppContext as _, Axis as ScrollbarAxis, BorderStyle, Bounds, ContentMask, Context,
-    Corner, Corners, CursorStyle, DispatchPhase, Div, Edges, Element, ElementId, Entity, EntityId,
-    GlobalElementId, Hitbox, HitboxBehavior, Hsla, InteractiveElement, IntoElement, IsZero,
-    LayoutId, ListState, MouseButton, MouseDownEvent, MouseMoveEvent, MouseUpEvent, Negate,
-    ParentElement, Pixels, Point, Position, Render, ScrollHandle, ScrollWheelEvent, Size, Stateful,
-    StatefulInteractiveElement, Style, Styled, Task, UniformListDecoration,
-    UniformListScrollHandle, Window, ease_in_out, prelude::FluentBuilder as _, px, quad, relative,
-    size,
-};
-use settings::SettingsStore;
-use smallvec::SmallVec;
-use theme::ActiveTheme as _;
-use util::ResultExt;
-
-use std::ops::Range;
-
-use crate::scrollbars::{ScrollbarAutoHide, ScrollbarVisibility, ShowScrollbar};
-
-const SCROLLBAR_HIDE_DELAY_INTERVAL: Duration = Duration::from_secs(1);
-const SCROLLBAR_HIDE_DURATION: Duration = Duration::from_millis(400);
-const SCROLLBAR_SHOW_DURATION: Duration = Duration::from_millis(50);
-
-const SCROLLBAR_PADDING: Pixels = px(4.);
-
-pub mod scrollbars {
-    use gpui::{App, Global};
-    use schemars::JsonSchema;
-    use serde::{Deserialize, Serialize};
-    use settings::Settings;
-
-    /// When to show the scrollbar in the editor.
-    ///
-    /// Default: auto
-    #[derive(Copy, Clone, Debug, Default, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
-    #[serde(rename_all = "snake_case")]
-    pub enum ShowScrollbar {
-        /// Show the scrollbar if there's important information or
-        /// follow the system's configured behavior.
-        #[default]
-        Auto,
-        /// Match the system's configured behavior.
-        System,
-        /// Always show the scrollbar.
-        Always,
-        /// Never show the scrollbar.
-        Never,
-    }
-
-    impl From<settings::ShowScrollbar> for ShowScrollbar {
-        fn from(value: settings::ShowScrollbar) -> Self {
-            match value {
-                settings::ShowScrollbar::Auto => ShowScrollbar::Auto,
-                settings::ShowScrollbar::System => ShowScrollbar::System,
-                settings::ShowScrollbar::Always => ShowScrollbar::Always,
-                settings::ShowScrollbar::Never => ShowScrollbar::Never,
-            }
-        }
-    }
-
-    pub trait GlobalSetting {
-        fn get_value(cx: &App) -> &Self;
-    }
-
-    impl<T: Settings> GlobalSetting for T {
-        fn get_value(cx: &App) -> &T {
-            T::get_global(cx)
-        }
-    }
-
-    pub trait ScrollbarVisibility: GlobalSetting + 'static {
-        fn visibility(&self, cx: &App) -> ShowScrollbar;
-    }
-
-    #[derive(Default)]
-    pub struct ScrollbarAutoHide(pub bool);
-
-    impl ScrollbarAutoHide {
-        pub fn should_hide(&self) -> bool {
-            self.0
-        }
-    }
-
-    impl Global for ScrollbarAutoHide {}
-}
-
-fn get_scrollbar_state<T>(
-    mut config: Scrollbars<T>,
-    caller_location: &'static std::panic::Location,
-    window: &mut Window,
-    cx: &mut App,
-) -> Entity<ScrollbarStateWrapper<T>>
-where
-    T: ScrollableHandle,
-{
-    let element_id = config.id.take().unwrap_or_else(|| caller_location.into());
-    let track_color = config.track_color;
-
-    let state = window.use_keyed_state(element_id, cx, |window, cx| {
-        let parent_id = cx.entity_id();
-        ScrollbarStateWrapper(
-            cx.new(|cx| ScrollbarState::new_from_config(config, parent_id, window, cx)),
-        )
-    });
-
-    state.update(cx, |state, cx| {
-        state
-            .0
-            .update(cx, |state, _cx| state.update_track_color(track_color))
-    });
-    state
-}
-
-pub trait WithScrollbar: Sized {
-    type Output;
-
-    fn custom_scrollbars<T>(
-        self,
-        config: Scrollbars<T>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Self::Output
-    where
-        T: ScrollableHandle;
-
-    // TODO: account for these cases properly
-    // #[track_caller]
-    // fn horizontal_scrollbar(self, window: &mut Window, cx: &mut App) -> Self::Output {
-    //     self.custom_scrollbars(
-    //         Scrollbars::new(ScrollAxes::Horizontal).ensure_id(core::panic::Location::caller()),
-    //         window,
-    //         cx,
-    //     )
-    // }
-
-    // #[track_caller]
-    // fn vertical_scrollbar(self, window: &mut Window, cx: &mut App) -> Self::Output {
-    //     self.custom_scrollbars(
-    //         Scrollbars::new(ScrollAxes::Vertical).ensure_id(core::panic::Location::caller()),
-    //         window,
-    //         cx,
-    //     )
-    // }
-
-    #[track_caller]
-    fn vertical_scrollbar_for<ScrollHandle: ScrollableHandle + Clone>(
-        self,
-        scroll_handle: &ScrollHandle,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Self::Output {
-        self.custom_scrollbars(
-            Scrollbars::new(ScrollAxes::Vertical)
-                .tracked_scroll_handle(scroll_handle)
-                .ensure_id(core::panic::Location::caller()),
-            window,
-            cx,
-        )
-    }
-}
-
-impl WithScrollbar for Stateful<Div> {
-    type Output = Self;
-
-    #[track_caller]
-    fn custom_scrollbars<T>(
-        self,
-        config: Scrollbars<T>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Self::Output
-    where
-        T: ScrollableHandle,
-    {
-        render_scrollbar(
-            get_scrollbar_state(config, std::panic::Location::caller(), window, cx),
-            self,
-            cx,
-        )
-    }
-}
-
-impl WithScrollbar for Div {
-    type Output = Stateful<Div>;
-
-    #[track_caller]
-    fn custom_scrollbars<T>(
-        self,
-        config: Scrollbars<T>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Self::Output
-    where
-        T: ScrollableHandle,
-    {
-        let scrollbar = get_scrollbar_state(config, std::panic::Location::caller(), window, cx);
-        // We know this ID stays consistent as long as the element is rendered for
-        // consecutive frames, which is sufficient for our use case here
-        let scrollbar_entity_id = scrollbar.entity_id();
-
-        render_scrollbar(
-            scrollbar,
-            self.id(("track-scroll", scrollbar_entity_id)),
-            cx,
-        )
-    }
-}
-
-fn render_scrollbar<T>(
-    scrollbar: Entity<ScrollbarStateWrapper<T>>,
-    div: Stateful<Div>,
-    cx: &App,
-) -> Stateful<Div>
-where
-    T: ScrollableHandle,
-{
-    let state = &scrollbar.read(cx).0;
-
-    div.when_some(state.read(cx).handle_to_track(), |this, handle| {
-        this.track_scroll(handle).when_some(
-            state.read(cx).visible_axes(),
-            |this, axes| match axes {
-                ScrollAxes::Horizontal => this.overflow_x_scroll(),
-                ScrollAxes::Vertical => this.overflow_y_scroll(),
-                ScrollAxes::Both => this.overflow_scroll(),
-            },
-        )
-    })
-    .when_some(
-        state
-            .read(cx)
-            .space_to_reserve_for(ScrollbarAxis::Horizontal),
-        |this, space| this.pb(space),
-    )
-    .when_some(
-        state.read(cx).space_to_reserve_for(ScrollbarAxis::Vertical),
-        |this, space| this.pr(space),
-    )
-    .child(state.clone())
-}
-
-impl<T: ScrollableHandle> UniformListDecoration for ScrollbarStateWrapper<T> {
-    fn compute(
-        &self,
-        _visible_range: Range<usize>,
-        _bounds: Bounds<Pixels>,
-        scroll_offset: Point<Pixels>,
-        _item_height: Pixels,
-        _item_count: usize,
-        _window: &mut Window,
-        _cx: &mut App,
-    ) -> gpui::AnyElement {
-        ScrollbarElement {
-            origin: scroll_offset.negate(),
-            state: self.0.clone(),
-        }
-        .into_any()
-    }
-}
-
-// impl WithScrollbar for UniformList {
-//     type Output = Self;
-
-//     #[track_caller]
-//     fn custom_scrollbars<S, T>(
-//         self,
-//         config: Scrollbars<S, T>,
-//         window: &mut Window,
-//         cx: &mut App,
-//     ) -> Self::Output
-//     where
-//         S: ScrollbarVisibilitySetting,
-//         T: ScrollableHandle,
-//     {
-//         let scrollbar = get_scrollbar_state(config, std::panic::Location::caller(), window, cx);
-//         self.when_some(
-//             scrollbar.read_with(cx, |wrapper, cx| {
-//                 wrapper
-//                     .0
-//                     .read(cx)
-//                     .handle_to_track::<UniformListScrollHandle>()
-//                     .cloned()
-//             }),
-//             |this, handle| this.track_scroll(handle),
-//         )
-//         .with_decoration(scrollbar)
-//     }
-// }
-
-#[derive(Copy, Clone, PartialEq, Eq)]
-enum ShowBehavior {
-    Always,
-    Autohide,
-    Never,
-}
-
-impl ShowBehavior {
-    fn from_setting(setting: ShowScrollbar, cx: &mut App) -> Self {
-        match setting {
-            ShowScrollbar::Never => Self::Never,
-            ShowScrollbar::Auto => Self::Autohide,
-            ShowScrollbar::System => {
-                if cx.default_global::<ScrollbarAutoHide>().should_hide() {
-                    Self::Autohide
-                } else {
-                    Self::Always
-                }
-            }
-            ShowScrollbar::Always => Self::Always,
-        }
-    }
-}
-
-pub enum ScrollAxes {
-    Horizontal,
-    Vertical,
-    Both,
-}
-
-impl ScrollAxes {
-    fn apply_to<T>(self, point: Point<T>, value: T) -> Point<T>
-    where
-        T: Debug + Default + PartialEq + Clone,
-    {
-        match self {
-            Self::Horizontal => point.apply_along(ScrollbarAxis::Horizontal, |_| value),
-            Self::Vertical => point.apply_along(ScrollbarAxis::Vertical, |_| value),
-            Self::Both => Point::new(value.clone(), value),
-        }
-    }
-}
-
-#[derive(Clone, Debug, Default, PartialEq)]
-enum ReservedSpace {
-    #[default]
-    None,
-    Thumb,
-    Track,
-}
-
-impl ReservedSpace {
-    fn is_visible(&self) -> bool {
-        *self != ReservedSpace::None
-    }
-
-    fn needs_scroll_track(&self) -> bool {
-        *self == ReservedSpace::Track
-    }
-}
-
-#[derive(Debug, Default, Clone, Copy)]
-enum ScrollbarWidth {
-    #[default]
-    Normal,
-    Small,
-    XSmall,
-}
-
-impl ScrollbarWidth {
-    fn to_pixels(&self) -> Pixels {
-        match self {
-            ScrollbarWidth::Normal => px(8.),
-            ScrollbarWidth::Small => px(6.),
-            ScrollbarWidth::XSmall => px(4.),
-        }
-    }
-}
-
-#[derive(Clone)]
-enum Handle<T: ScrollableHandle> {
-    Tracked(T),
-    Untracked(fn() -> T),
-}
-
-#[derive(Clone)]
-pub struct Scrollbars<T: ScrollableHandle = ScrollHandle> {
-    id: Option<ElementId>,
-    get_visibility: fn(&App) -> ShowScrollbar,
-    tracked_entity: Option<Option<EntityId>>,
-    scrollable_handle: Handle<T>,
-    visibility: Point<ReservedSpace>,
-    track_color: Option<Hsla>,
-    scrollbar_width: ScrollbarWidth,
-}
-
-impl Scrollbars {
-    pub fn new(show_along: ScrollAxes) -> Self {
-        Self::new_with_setting(show_along, |_| ShowScrollbar::default())
-    }
-
-    pub fn for_settings<S: ScrollbarVisibility>() -> Scrollbars {
-        Scrollbars::new_with_setting(ScrollAxes::Both, |cx| S::get_value(cx).visibility(cx))
-    }
-}
-
-impl Scrollbars {
-    fn new_with_setting(show_along: ScrollAxes, get_visibility: fn(&App) -> ShowScrollbar) -> Self {
-        Self {
-            id: None,
-            get_visibility,
-            scrollable_handle: Handle::Untracked(ScrollHandle::new),
-            tracked_entity: None,
-            visibility: show_along.apply_to(Default::default(), ReservedSpace::Thumb),
-            track_color: None,
-            scrollbar_width: ScrollbarWidth::Normal,
-        }
-    }
-}
-
-impl<ScrollHandle: ScrollableHandle> Scrollbars<ScrollHandle> {
-    pub fn id(mut self, id: impl Into<ElementId>) -> Self {
-        self.id = Some(id.into());
-        self
-    }
-
-    fn ensure_id(mut self, id: impl Into<ElementId>) -> Self {
-        if self.id.is_none() {
-            self.id = Some(id.into());
-        }
-        self
-    }
-
-    /// Notify the current context whenever this scrollbar gets a scroll event
-    pub fn notify_content(mut self) -> Self {
-        self.tracked_entity = Some(None);
-        self
-    }
-
-    /// Set a parent model which should be notified whenever this scrollbar gets a scroll event.
-    pub fn tracked_entity(mut self, entity_id: EntityId) -> Self {
-        self.tracked_entity = Some(Some(entity_id));
-        self
-    }
-
-    pub fn tracked_scroll_handle<TrackedHandle: ScrollableHandle>(
-        self,
-        tracked_scroll_handle: &TrackedHandle,
-    ) -> Scrollbars<TrackedHandle> {
-        let Self {
-            id,
-            tracked_entity: tracked_entity_id,
-            scrollbar_width,
-            visibility,
-            get_visibility,
-            track_color,
-            ..
-        } = self;
-
-        Scrollbars {
-            scrollable_handle: Handle::Tracked(tracked_scroll_handle.clone()),
-            id,
-            tracked_entity: tracked_entity_id,
-            visibility,
-            scrollbar_width,
-            track_color,
-            get_visibility,
-        }
-    }
-
-    pub fn show_along(mut self, along: ScrollAxes) -> Self {
-        self.visibility = along.apply_to(self.visibility, ReservedSpace::Thumb);
-        self
-    }
-
-    pub fn with_track_along(mut self, along: ScrollAxes, background_color: Hsla) -> Self {
-        self.visibility = along.apply_to(self.visibility, ReservedSpace::Track);
-        self.track_color = Some(background_color);
-        self
-    }
-
-    pub fn width_sm(mut self) -> Self {
-        self.scrollbar_width = ScrollbarWidth::Small;
-        self
-    }
-
-    pub fn width_xs(mut self) -> Self {
-        self.scrollbar_width = ScrollbarWidth::XSmall;
-        self
-    }
-}
-
-#[derive(PartialEq, Clone, Debug)]
-enum VisibilityState {
-    Visible,
-    Animating { showing: bool, delta: f32 },
-    Hidden,
-    Disabled,
-}
-
-const DELTA_MAX: f32 = 1.0;
-
-impl VisibilityState {
-    fn from_behavior(behavior: ShowBehavior) -> Self {
-        match behavior {
-            ShowBehavior::Always => Self::Visible,
-            ShowBehavior::Never => Self::Disabled,
-            ShowBehavior::Autohide => Self::for_show(),
-        }
-    }
-
-    fn for_show() -> Self {
-        Self::Animating {
-            showing: true,
-            delta: Default::default(),
-        }
-    }
-
-    fn for_autohide() -> Self {
-        Self::Animating {
-            showing: Default::default(),
-            delta: Default::default(),
-        }
-    }
-
-    fn is_visible(&self) -> bool {
-        matches!(self, Self::Visible | Self::Animating { .. })
-    }
-
-    #[inline]
-    fn is_disabled(&self) -> bool {
-        *self == VisibilityState::Disabled
-    }
-
-    fn animation_progress(&self) -> Option<(f32, Duration, bool)> {
-        match self {
-            Self::Animating { showing, delta } => Some((
-                *delta,
-                if *showing {
-                    SCROLLBAR_SHOW_DURATION
-                } else {
-                    SCROLLBAR_HIDE_DURATION
-                },
-                *showing,
-            )),
-            _ => None,
-        }
-    }
-
-    fn set_delta(&mut self, new_delta: f32) {
-        match self {
-            Self::Animating { showing, .. } if new_delta >= DELTA_MAX => {
-                if *showing {
-                    *self = Self::Visible;
-                } else {
-                    *self = Self::Hidden;
-                }
-            }
-            Self::Animating { delta, .. } => *delta = new_delta,
-            _ => {}
-        }
-    }
-
-    fn toggle_visible(&self, show_behavior: ShowBehavior) -> Self {
-        match self {
-            Self::Hidden => {
-                if show_behavior == ShowBehavior::Autohide {
-                    Self::for_show()
-                } else {
-                    Self::Visible
-                }
-            }
-            Self::Animating {
-                showing: false,
-                delta: progress,
-            } => Self::Animating {
-                showing: true,
-                delta: DELTA_MAX - progress,
-            },
-            _ => self.clone(),
-        }
-    }
-}
-
-enum ParentHoverEvent {
-    Within,
-    Entered,
-    Exited,
-    Outside,
-}
-
-/// This is used to ensure notifies within the state do not notify the parent
-/// unintentionally.
-struct ScrollbarStateWrapper<T: ScrollableHandle>(Entity<ScrollbarState<T>>);
-
-/// A scrollbar state that should be persisted across frames.
-struct ScrollbarState<T: ScrollableHandle = ScrollHandle> {
-    thumb_state: ThumbState,
-    notify_id: Option<EntityId>,
-    manually_added: bool,
-    scroll_handle: T,
-    width: ScrollbarWidth,
-    show_behavior: ShowBehavior,
-    get_visibility: fn(&App) -> ShowScrollbar,
-    visibility: Point<ReservedSpace>,
-    track_color: Option<Hsla>,
-    show_state: VisibilityState,
-    mouse_in_parent: bool,
-    last_prepaint_state: Option<ScrollbarPrepaintState>,
-    _auto_hide_task: Option<Task<()>>,
-}
-
-impl<T: ScrollableHandle> ScrollbarState<T> {
-    fn new_from_config(
-        config: Scrollbars<T>,
-        parent_id: EntityId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        cx.observe_global_in::<SettingsStore>(window, Self::settings_changed)
-            .detach();
-
-        let (manually_added, scroll_handle) = match config.scrollable_handle {
-            Handle::Tracked(handle) => (true, handle),
-            Handle::Untracked(func) => (false, func()),
-        };
-
-        let show_behavior = ShowBehavior::from_setting((config.get_visibility)(cx), cx);
-        ScrollbarState {
-            thumb_state: Default::default(),
-            notify_id: config.tracked_entity.map(|id| id.unwrap_or(parent_id)),
-            manually_added,
-            scroll_handle,
-            width: config.scrollbar_width,
-            visibility: config.visibility,
-            track_color: config.track_color,
-            show_behavior,
-            get_visibility: config.get_visibility,
-            show_state: VisibilityState::from_behavior(show_behavior),
-            mouse_in_parent: true,
-            last_prepaint_state: None,
-            _auto_hide_task: None,
-        }
-    }
-
-    fn settings_changed(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.set_show_behavior(
-            ShowBehavior::from_setting((self.get_visibility)(cx), cx),
-            window,
-            cx,
-        );
-    }
-
-    /// Schedules a scrollbar auto hide if no auto hide is currently in progress yet.
-    fn schedule_auto_hide(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if self._auto_hide_task.is_none() {
-            self._auto_hide_task = (self.visible() && self.show_behavior == ShowBehavior::Autohide)
-                .then(|| {
-                    cx.spawn_in(window, async move |scrollbar_state, cx| {
-                        cx.background_executor()
-                            .timer(SCROLLBAR_HIDE_DELAY_INTERVAL)
-                            .await;
-                        scrollbar_state
-                            .update(cx, |state, cx| {
-                                if state.thumb_state == ThumbState::Inactive {
-                                    state.set_visibility(VisibilityState::for_autohide(), cx);
-                                }
-                                state._auto_hide_task.take();
-                            })
-                            .log_err();
-                    })
-                });
-        }
-    }
-
-    fn show_scrollbars(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let visibility = self.show_state.toggle_visible(self.show_behavior);
-        self.set_visibility(visibility, cx);
-        self._auto_hide_task.take();
-        self.schedule_auto_hide(window, cx);
-    }
-
-    fn set_show_behavior(
-        &mut self,
-        behavior: ShowBehavior,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.show_behavior != behavior {
-            self.show_behavior = behavior;
-            self.set_visibility(VisibilityState::from_behavior(behavior), cx);
-            self.schedule_auto_hide(window, cx);
-            cx.notify();
-        }
-    }
-
-    fn set_visibility(&mut self, visibility: VisibilityState, cx: &mut Context<Self>) {
-        if self.show_state != visibility {
-            self.show_state = visibility;
-            cx.notify();
-        }
-    }
-
-    #[inline]
-    fn visible_axes(&self) -> Option<ScrollAxes> {
-        match (&self.visibility.x, &self.visibility.y) {
-            (ReservedSpace::None, ReservedSpace::None) => None,
-            (ReservedSpace::None, _) => Some(ScrollAxes::Vertical),
-            (_, ReservedSpace::None) => Some(ScrollAxes::Horizontal),
-            _ => Some(ScrollAxes::Both),
-        }
-    }
-
-    fn space_to_reserve_for(&self, axis: ScrollbarAxis) -> Option<Pixels> {
-        (self.show_state.is_disabled().not()
-            && self.visibility.along(axis).needs_scroll_track()
-            && self
-                .scroll_handle()
-                .max_offset()
-                .along(axis)
-                .is_zero()
-                .not())
-        .then(|| self.space_to_reserve())
-    }
-
-    fn space_to_reserve(&self) -> Pixels {
-        self.width.to_pixels() + 2 * SCROLLBAR_PADDING
-    }
-
-    fn handle_to_track<Handle: ScrollableHandle>(&self) -> Option<&Handle> {
-        (!self.manually_added)
-            .then(|| (self.scroll_handle() as &dyn Any).downcast_ref::<Handle>())
-            .flatten()
-    }
-
-    fn scroll_handle(&self) -> &T {
-        &self.scroll_handle
-    }
-
-    fn set_offset(&mut self, offset: Point<Pixels>, cx: &mut Context<Self>) {
-        self.scroll_handle.set_offset(offset);
-        self.notify_parent(cx);
-        cx.notify();
-    }
-
-    fn is_dragging(&self) -> bool {
-        self.thumb_state.is_dragging()
-    }
-
-    fn set_dragging(
-        &mut self,
-        axis: ScrollbarAxis,
-        drag_offset: Pixels,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.set_thumb_state(ThumbState::Dragging(axis, drag_offset), window, cx);
-        self.scroll_handle().drag_started();
-    }
-
-    fn update_hovered_thumb(
-        &mut self,
-        position: &Point<Pixels>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.set_thumb_state(
-            if let Some(&ScrollbarLayout { axis, .. }) =
-                self.last_prepaint_state.as_ref().and_then(|state| {
-                    state
-                        .thumb_for_position(position)
-                        .filter(|thumb| thumb.cursor_hitbox.is_hovered(window))
-                })
-            {
-                ThumbState::Hover(axis)
-            } else {
-                ThumbState::Inactive
-            },
-            window,
-            cx,
-        );
-    }
-
-    fn set_thumb_state(&mut self, state: ThumbState, window: &mut Window, cx: &mut Context<Self>) {
-        if self.thumb_state != state {
-            if state == ThumbState::Inactive {
-                self.schedule_auto_hide(window, cx);
-            } else {
-                self.set_visibility(self.show_state.toggle_visible(self.show_behavior), cx);
-                self._auto_hide_task.take();
-            }
-            self.thumb_state = state;
-            cx.notify();
-        }
-    }
-
-    fn update_parent_hovered(&mut self, window: &Window) -> ParentHoverEvent {
-        let last_parent_hovered = self.mouse_in_parent;
-        self.mouse_in_parent = self.parent_hovered(window);
-        let state_changed = self.mouse_in_parent != last_parent_hovered;
-        match (self.mouse_in_parent, state_changed) {
-            (true, true) => ParentHoverEvent::Entered,
-            (true, false) => ParentHoverEvent::Within,
-            (false, true) => ParentHoverEvent::Exited,
-            (false, false) => ParentHoverEvent::Outside,
-        }
-    }
-
-    fn update_track_color(&mut self, track_color: Option<Hsla>) {
-        self.track_color = track_color;
-    }
-
-    fn parent_hovered(&self, window: &Window) -> bool {
-        self.last_prepaint_state
-            .as_ref()
-            .is_some_and(|state| state.parent_bounds_hitbox.is_hovered(window))
-    }
-
-    fn hit_for_position(&self, position: &Point<Pixels>) -> Option<&ScrollbarLayout> {
-        self.last_prepaint_state
-            .as_ref()
-            .and_then(|state| state.hit_for_position(position))
-    }
-
-    fn thumb_for_axis(&self, axis: ScrollbarAxis) -> Option<&ScrollbarLayout> {
-        self.last_prepaint_state
-            .as_ref()
-            .and_then(|state| state.thumbs.iter().find(|thumb| thumb.axis == axis))
-    }
-
-    fn thumb_ranges(
-        &self,
-    ) -> impl Iterator<Item = (ScrollbarAxis, Range<f32>, ReservedSpace)> + '_ {
-        const MINIMUM_THUMB_SIZE: Pixels = px(25.);
-        let max_offset = self.scroll_handle().max_offset();
-        let viewport_size = self.scroll_handle().viewport().size;
-        let current_offset = self.scroll_handle().offset();
-
-        [ScrollbarAxis::Horizontal, ScrollbarAxis::Vertical]
-            .into_iter()
-            .filter(|&axis| self.visibility.along(axis).is_visible())
-            .flat_map(move |axis| {
-                let max_offset = max_offset.along(axis);
-                let viewport_size = viewport_size.along(axis);
-                if max_offset.is_zero() || viewport_size.is_zero() {
-                    return None;
-                }
-                let content_size = viewport_size + max_offset;
-                let visible_percentage = viewport_size / content_size;
-                let thumb_size = MINIMUM_THUMB_SIZE.max(viewport_size * visible_percentage);
-                if thumb_size > viewport_size {
-                    return None;
-                }
-                let current_offset = current_offset
-                    .along(axis)
-                    .clamp(-max_offset, Pixels::ZERO)
-                    .abs();
-                let start_offset = (current_offset / max_offset) * (viewport_size - thumb_size);
-                let thumb_percentage_start = start_offset / viewport_size;
-                let thumb_percentage_end = (start_offset + thumb_size) / viewport_size;
-                Some((
-                    axis,
-                    thumb_percentage_start..thumb_percentage_end,
-                    self.visibility.along(axis),
-                ))
-            })
-    }
-
-    fn visible(&self) -> bool {
-        self.show_state.is_visible()
-    }
-
-    #[inline]
-    fn disabled(&self) -> bool {
-        self.show_state.is_disabled()
-    }
-
-    fn notify_parent(&self, cx: &mut App) {
-        if let Some(entity_id) = self.notify_id {
-            cx.notify(entity_id);
-        }
-    }
-}
-
-impl<T: ScrollableHandle> Render for ScrollbarState<T> {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        ScrollbarElement {
-            state: cx.entity(),
-            origin: Default::default(),
-        }
-    }
-}
-
-struct ScrollbarElement<T: ScrollableHandle> {
-    origin: Point<Pixels>,
-    state: Entity<ScrollbarState<T>>,
-}
-
-#[derive(Default, Debug, PartialEq, Eq)]
-enum ThumbState {
-    #[default]
-    Inactive,
-    Hover(ScrollbarAxis),
-    Dragging(ScrollbarAxis, Pixels),
-}
-
-impl ThumbState {
-    fn is_dragging(&self) -> bool {
-        matches!(*self, ThumbState::Dragging(..))
-    }
-}
-
-impl ScrollableHandle for UniformListScrollHandle {
-    fn max_offset(&self) -> Size<Pixels> {
-        self.0.borrow().base_handle.max_offset()
-    }
-
-    fn set_offset(&self, point: Point<Pixels>) {
-        self.0.borrow().base_handle.set_offset(point);
-    }
-
-    fn offset(&self) -> Point<Pixels> {
-        self.0.borrow().base_handle.offset()
-    }
-
-    fn viewport(&self) -> Bounds<Pixels> {
-        self.0.borrow().base_handle.bounds()
-    }
-}
-
-impl ScrollableHandle for ListState {
-    fn max_offset(&self) -> Size<Pixels> {
-        self.max_offset_for_scrollbar()
-    }
-
-    fn set_offset(&self, point: Point<Pixels>) {
-        self.set_offset_from_scrollbar(point);
-    }
-
-    fn offset(&self) -> Point<Pixels> {
-        self.scroll_px_offset_for_scrollbar()
-    }
-
-    fn drag_started(&self) {
-        self.scrollbar_drag_started();
-    }
-
-    fn drag_ended(&self) {
-        self.scrollbar_drag_ended();
-    }
-
-    fn viewport(&self) -> Bounds<Pixels> {
-        self.viewport_bounds()
-    }
-}
-
-impl ScrollableHandle for ScrollHandle {
-    fn max_offset(&self) -> Size<Pixels> {
-        self.max_offset()
-    }
-
-    fn set_offset(&self, point: Point<Pixels>) {
-        self.set_offset(point);
-    }
-
-    fn offset(&self) -> Point<Pixels> {
-        self.offset()
-    }
-
-    fn viewport(&self) -> Bounds<Pixels> {
-        self.bounds()
-    }
-}
-
-pub trait ScrollableHandle: 'static + Any + Sized + Clone {
-    fn max_offset(&self) -> Size<Pixels>;
-    fn set_offset(&self, point: Point<Pixels>);
-    fn offset(&self) -> Point<Pixels>;
-    fn viewport(&self) -> Bounds<Pixels>;
-    fn drag_started(&self) {}
-    fn drag_ended(&self) {}
-
-    fn scrollable_along(&self, axis: ScrollbarAxis) -> bool {
-        self.max_offset().along(axis) > Pixels::ZERO
-    }
-    fn content_size(&self) -> Size<Pixels> {
-        self.viewport().size + self.max_offset()
-    }
-}
-
-enum ScrollbarMouseEvent {
-    TrackClick,
-    ThumbDrag(Pixels),
-}
-
-struct ScrollbarLayout {
-    thumb_bounds: Bounds<Pixels>,
-    track_bounds: Bounds<Pixels>,
-    cursor_hitbox: Hitbox,
-    reserved_space: ReservedSpace,
-    track_background: Option<(Bounds<Pixels>, Hsla)>,
-    axis: ScrollbarAxis,
-}
-
-impl ScrollbarLayout {
-    fn compute_click_offset(
-        &self,
-        event_position: Point<Pixels>,
-        max_offset: Size<Pixels>,
-        event_type: ScrollbarMouseEvent,
-    ) -> Pixels {
-        let Self {
-            track_bounds,
-            thumb_bounds,
-            axis,
-            ..
-        } = self;
-        let axis = *axis;
-
-        let viewport_size = track_bounds.size.along(axis);
-        let thumb_size = thumb_bounds.size.along(axis);
-        let thumb_offset = match event_type {
-            ScrollbarMouseEvent::TrackClick => thumb_size / 2.,
-            ScrollbarMouseEvent::ThumbDrag(thumb_offset) => thumb_offset,
-        };
-
-        let thumb_start =
-            (event_position.along(axis) - track_bounds.origin.along(axis) - thumb_offset)
-                .clamp(px(0.), viewport_size - thumb_size);
-
-        let max_offset = max_offset.along(axis);
-        let percentage = if viewport_size > thumb_size {
-            thumb_start / (viewport_size - thumb_size)
-        } else {
-            0.
-        };
-
-        -max_offset * percentage
-    }
-}
-
-impl PartialEq for ScrollbarLayout {
-    fn eq(&self, other: &Self) -> bool {
-        self.axis == other.axis && self.thumb_bounds == other.thumb_bounds
-    }
-}
-
-pub struct ScrollbarPrepaintState {
-    parent_bounds_hitbox: Hitbox,
-    thumbs: SmallVec<[ScrollbarLayout; 2]>,
-}
-
-impl ScrollbarPrepaintState {
-    fn thumb_for_position(&self, position: &Point<Pixels>) -> Option<&ScrollbarLayout> {
-        self.thumbs
-            .iter()
-            .find(|info| info.thumb_bounds.contains(position))
-    }
-
-    fn hit_for_position(&self, position: &Point<Pixels>) -> Option<&ScrollbarLayout> {
-        self.thumbs.iter().find(|info| {
-            if info.reserved_space.needs_scroll_track() {
-                info.track_bounds.contains(position)
-            } else {
-                info.thumb_bounds.contains(position)
-            }
-        })
-    }
-}
-
-impl PartialEq for ScrollbarPrepaintState {
-    fn eq(&self, other: &Self) -> bool {
-        self.thumbs == other.thumbs
-    }
-}
-
-impl<T: ScrollableHandle> Element for ScrollbarElement<T> {
-    type RequestLayoutState = ();
-    type PrepaintState = Option<(ScrollbarPrepaintState, Option<f32>)>;
-
-    fn id(&self) -> Option<ElementId> {
-        Some(("scrollbar_animation", self.state.entity_id()).into())
-    }
-
-    fn source_location(&self) -> Option<&'static core::panic::Location<'static>> {
-        None
-    }
-
-    fn request_layout(
-        &mut self,
-        _id: Option<&GlobalElementId>,
-        _inspector_id: Option<&gpui::InspectorElementId>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> (LayoutId, Self::RequestLayoutState) {
-        let scrollbar_style = Style {
-            position: Position::Absolute,
-            inset: Edges::default(),
-            size: size(relative(1.), relative(1.)).map(Into::into),
-            ..Default::default()
-        };
-
-        (window.request_layout(scrollbar_style, None, cx), ())
-    }
-
-    fn prepaint(
-        &mut self,
-        id: Option<&GlobalElementId>,
-        _inspector_id: Option<&gpui::InspectorElementId>,
-        bounds: Bounds<Pixels>,
-        _request_layout: &mut Self::RequestLayoutState,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Self::PrepaintState {
-        let prepaint_state = self
-            .state
-            .read(cx)
-            .disabled()
-            .not()
-            .then(|| ScrollbarPrepaintState {
-                thumbs: {
-                    let state = self.state.read(cx);
-                    let thumb_ranges = state.thumb_ranges().collect::<Vec<_>>();
-                    let width = state.width.to_pixels();
-                    let track_color = state.track_color;
-
-                    let additional_padding = if thumb_ranges.len() == 2 {
-                        width
-                    } else {
-                        Pixels::ZERO
-                    };
-
-                    thumb_ranges
-                        .into_iter()
-                        .map(|(axis, thumb_range, reserved_space)| {
-                            let track_anchor = match axis {
-                                ScrollbarAxis::Horizontal => Corner::BottomLeft,
-                                ScrollbarAxis::Vertical => Corner::TopRight,
-                            };
-                            let Bounds { origin, size } = Bounds::from_corner_and_size(
-                                track_anchor,
-                                bounds
-                                    .corner(track_anchor)
-                                    .apply_along(axis.invert(), |corner| {
-                                        corner - SCROLLBAR_PADDING
-                                    }),
-                                bounds.size.apply_along(axis.invert(), |_| width),
-                            );
-                            let scroll_track_bounds = Bounds::new(self.origin + origin, size);
-
-                            let padded_bounds = scroll_track_bounds.extend(match axis {
-                                ScrollbarAxis::Horizontal => Edges {
-                                    right: -SCROLLBAR_PADDING,
-                                    left: -SCROLLBAR_PADDING,
-                                    ..Default::default()
-                                },
-                                ScrollbarAxis::Vertical => Edges {
-                                    top: -SCROLLBAR_PADDING,
-                                    bottom: -SCROLLBAR_PADDING,
-                                    ..Default::default()
-                                },
-                            });
-
-                            let available_space =
-                                padded_bounds.size.along(axis) - additional_padding;
-
-                            let thumb_offset = thumb_range.start * available_space;
-                            let thumb_end = thumb_range.end * available_space;
-                            let thumb_bounds = Bounds::new(
-                                padded_bounds
-                                    .origin
-                                    .apply_along(axis, |origin| origin + thumb_offset),
-                                padded_bounds
-                                    .size
-                                    .apply_along(axis, |_| thumb_end - thumb_offset),
-                            );
-
-                            let needs_scroll_track = reserved_space.needs_scroll_track();
-
-                            ScrollbarLayout {
-                                thumb_bounds,
-                                track_bounds: padded_bounds,
-                                axis,
-                                cursor_hitbox: window.insert_hitbox(
-                                    if needs_scroll_track {
-                                        padded_bounds
-                                    } else {
-                                        thumb_bounds
-                                    },
-                                    HitboxBehavior::BlockMouseExceptScroll,
-                                ),
-                                track_background: track_color
-                                    .filter(|_| needs_scroll_track)
-                                    .map(|color| (padded_bounds.dilate(SCROLLBAR_PADDING), color)),
-                                reserved_space,
-                            }
-                        })
-                        .collect()
-                },
-                parent_bounds_hitbox: window.insert_hitbox(bounds, HitboxBehavior::Normal),
-            });
-        if prepaint_state
-            .as_ref()
-            .is_some_and(|state| Some(state) != self.state.read(cx).last_prepaint_state.as_ref())
-        {
-            self.state
-                .update(cx, |state, cx| state.show_scrollbars(window, cx));
-        }
-
-        prepaint_state.map(|state| {
-            let autohide_delta = self.state.read(cx).show_state.animation_progress().map(
-                |(delta, delta_duration, should_invert)| {
-                    window.with_element_state(id.unwrap(), |state, window| {
-                        let state = state.unwrap_or_else(|| Instant::now());
-                        let current = Instant::now();
-
-                        let new_delta = DELTA_MAX
-                            .min(delta + (current - state).div_duration_f32(delta_duration));
-                        self.state
-                            .update(cx, |state, _| state.show_state.set_delta(new_delta));
-
-                        window.request_animation_frame();
-                        let delta = if should_invert {
-                            DELTA_MAX - delta
-                        } else {
-                            delta
-                        };
-                        (ease_in_out(delta), current)
-                    })
-                },
-            );
-
-            (state, autohide_delta)
-        })
-    }
-
-    fn paint(
-        &mut self,
-        _id: Option<&GlobalElementId>,
-        _inspector_id: Option<&gpui::InspectorElementId>,
-        Bounds { origin, size }: Bounds<Pixels>,
-        _request_layout: &mut Self::RequestLayoutState,
-        prepaint_state: &mut Self::PrepaintState,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        let Some((prepaint_state, autohide_fade)) = prepaint_state.take() else {
-            return;
-        };
-
-        let bounds = Bounds::new(self.origin + origin, size);
-        window.with_content_mask(Some(ContentMask { bounds }), |window| {
-            let colors = cx.theme().colors();
-
-            let capture_phase;
-
-            if self.state.read(cx).visible() {
-                let thumb_state = &self.state.read(cx).thumb_state;
-
-                if thumb_state.is_dragging() {
-                    capture_phase = DispatchPhase::Capture;
-                } else {
-                    capture_phase = DispatchPhase::Bubble;
-                }
-
-                for ScrollbarLayout {
-                    thumb_bounds,
-                    cursor_hitbox,
-                    axis,
-                    reserved_space,
-                    track_background,
-                    ..
-                } in &prepaint_state.thumbs
-                {
-                    const MAXIMUM_OPACITY: f32 = 0.7;
-                    let (thumb_base_color, hovered) = match thumb_state {
-                        ThumbState::Dragging(dragged_axis, _) if dragged_axis == axis => {
-                            (colors.scrollbar_thumb_active_background, false)
-                        }
-                        ThumbState::Hover(hovered_axis) if hovered_axis == axis => {
-                            (colors.scrollbar_thumb_hover_background, true)
-                        }
-                        _ => (colors.scrollbar_thumb_background, false),
-                    };
-
-                    let blending_color = if hovered || reserved_space.needs_scroll_track() {
-                        track_background
-                            .map(|(_, background)| background)
-                            .unwrap_or(colors.surface_background)
-                    } else {
-                        let blend_color = colors.surface_background;
-                        blend_color.min(blend_color.alpha(MAXIMUM_OPACITY))
-                    };
-
-                    let mut thumb_color = blending_color.blend(thumb_base_color);
-
-                    if !hovered && let Some(fade) = autohide_fade {
-                        thumb_color.fade_out(fade);
-                    }
-
-                    if let Some((track_bounds, color)) = track_background {
-                        let mut color = *color;
-                        if let Some(fade) = autohide_fade {
-                            color.fade_out(fade);
-                        }
-
-                        window.paint_quad(quad(
-                            *track_bounds,
-                            Corners::default(),
-                            color,
-                            Edges::default(),
-                            Hsla::transparent_black(),
-                            BorderStyle::default(),
-                        ));
-                    }
-
-                    window.paint_quad(quad(
-                        *thumb_bounds,
-                        Corners::all(Pixels::MAX).clamp_radii_for_quad_size(thumb_bounds.size),
-                        thumb_color,
-                        Edges::default(),
-                        Hsla::transparent_black(),
-                        BorderStyle::default(),
-                    ));
-
-                    if thumb_state.is_dragging() {
-                        window.set_window_cursor_style(CursorStyle::Arrow);
-                    } else {
-                        window.set_cursor_style(CursorStyle::Arrow, cursor_hitbox);
-                    }
-                }
-            } else {
-                capture_phase = DispatchPhase::Bubble;
-            }
-
-            self.state.update(cx, |state, _| {
-                state.last_prepaint_state = Some(prepaint_state)
-            });
-
-            window.on_mouse_event({
-                let state = self.state.clone();
-
-                move |event: &MouseDownEvent, phase, window, cx| {
-                    state.update(cx, |state, cx| {
-                        let Some(scrollbar_layout) = (phase == capture_phase
-                            && event.button == MouseButton::Left)
-                            .then(|| state.hit_for_position(&event.position))
-                            .flatten()
-                        else {
-                            return;
-                        };
-
-                        let ScrollbarLayout {
-                            thumb_bounds, axis, ..
-                        } = scrollbar_layout;
-
-                        if thumb_bounds.contains(&event.position) {
-                            let offset =
-                                event.position.along(*axis) - thumb_bounds.origin.along(*axis);
-                            state.set_dragging(*axis, offset, window, cx);
-                        } else {
-                            let scroll_handle = state.scroll_handle();
-                            let click_offset = scrollbar_layout.compute_click_offset(
-                                event.position,
-                                scroll_handle.max_offset(),
-                                ScrollbarMouseEvent::TrackClick,
-                            );
-                            state.set_offset(
-                                scroll_handle.offset().apply_along(*axis, |_| click_offset),
-                                cx,
-                            );
-                        };
-
-                        cx.stop_propagation();
-                    });
-                }
-            });
-
-            window.on_mouse_event({
-                let state = self.state.clone();
-
-                move |event: &ScrollWheelEvent, phase, window, cx| {
-                    state.update(cx, |state, cx| {
-                        if phase.capture() && state.parent_hovered(window) {
-                            state.update_hovered_thumb(&event.position, window, cx)
-                        }
-                    });
-                }
-            });
-
-            window.on_mouse_event({
-                let state = self.state.clone();
-
-                move |event: &MouseMoveEvent, phase, window, cx| {
-                    if phase != capture_phase {
-                        return;
-                    }
-
-                    match state.read(cx).thumb_state {
-                        ThumbState::Dragging(axis, drag_state) if event.dragging() => {
-                            if let Some(scrollbar_layout) = state.read(cx).thumb_for_axis(axis) {
-                                let scroll_handle = state.read(cx).scroll_handle();
-                                let drag_offset = scrollbar_layout.compute_click_offset(
-                                    event.position,
-                                    scroll_handle.max_offset(),
-                                    ScrollbarMouseEvent::ThumbDrag(drag_state),
-                                );
-                                let new_offset =
-                                    scroll_handle.offset().apply_along(axis, |_| drag_offset);
-
-                                state.update(cx, |state, cx| state.set_offset(new_offset, cx));
-                                cx.stop_propagation();
-                            }
-                        }
-                        _ => state.update(cx, |state, cx| {
-                            match state.update_parent_hovered(window) {
-                                hover @ ParentHoverEvent::Entered
-                                | hover @ ParentHoverEvent::Within
-                                    if event.pressed_button.is_none() =>
-                                {
-                                    if matches!(hover, ParentHoverEvent::Entered) {
-                                        state.show_scrollbars(window, cx);
-                                    }
-                                    state.update_hovered_thumb(&event.position, window, cx);
-                                    if state.thumb_state != ThumbState::Inactive {
-                                        cx.stop_propagation();
-                                    }
-                                }
-                                ParentHoverEvent::Exited => {
-                                    state.set_thumb_state(ThumbState::Inactive, window, cx);
-                                }
-                                _ => {}
-                            }
-                        }),
-                    }
-                }
-            });
-
-            window.on_mouse_event({
-                let state = self.state.clone();
-                move |event: &MouseUpEvent, phase, window, cx| {
-                    if phase != capture_phase {
-                        return;
-                    }
-
-                    state.update(cx, |state, cx| {
-                        if state.is_dragging() {
-                            state.scroll_handle().drag_ended();
-                        }
-
-                        if !state.parent_hovered(window) {
-                            state.schedule_auto_hide(window, cx);
-                            return;
-                        }
-
-                        state.update_hovered_thumb(&event.position, window, cx);
-                    });
-                }
-            });
-        })
-    }
-}
-
-impl<T: ScrollableHandle> IntoElement for ScrollbarElement<T> {
-    type Element = Self;
-
-    fn into_element(self) -> Self::Element {
-        self
-    }
-}
diff --git a/crates/ui/src/components/settings_container.rs b/crates/ui/src/components/settings_container.rs
deleted file mode 100644
index 31cb1b32f8..0000000000
--- a/crates/ui/src/components/settings_container.rs
+++ /dev/null
@@ -1,89 +0,0 @@
-use gpui::AnyElement;
-use smallvec::SmallVec;
-
-use crate::prelude::*;
-
-use super::Checkbox;
-
-#[derive(IntoElement, RegisterComponent)]
-pub struct SettingsContainer {
-    children: SmallVec<[AnyElement; 2]>,
-}
-
-impl Default for SettingsContainer {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl SettingsContainer {
-    pub fn new() -> Self {
-        Self {
-            children: SmallVec::new(),
-        }
-    }
-}
-
-impl ParentElement for SettingsContainer {
-    fn extend(&mut self, elements: impl IntoIterator<Item = AnyElement>) {
-        self.children.extend(elements)
-    }
-}
-
-impl RenderOnce for SettingsContainer {
-    fn render(self, _window: &mut Window, _cx: &mut App) -> impl IntoElement {
-        v_flex().px_2().gap_1().children(self.children)
-    }
-}
-
-impl Component for SettingsContainer {
-    fn scope() -> ComponentScope {
-        ComponentScope::Layout
-    }
-
-    fn name() -> &'static str {
-        "SettingsContainer"
-    }
-
-    fn description() -> Option<&'static str> {
-        Some("A container for organizing and displaying settings in a structured manner.")
-    }
-
-    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
-        Some(
-            v_flex()
-                .gap_6()
-                .children(vec![
-                    example_group_with_title(
-                        "Basic Usage",
-                        vec![
-                            single_example(
-                                "Empty Container",
-                                SettingsContainer::new().into_any_element(),
-                            ),
-                            single_example(
-                                "With Content",
-                                SettingsContainer::new()
-                                    .child(Label::new("Setting 1"))
-                                    .child(Label::new("Setting 2"))
-                                    .child(Label::new("Setting 3"))
-                                    .into_any_element(),
-                            ),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "With Different Elements",
-                        vec![single_example(
-                            "Mixed Content",
-                            SettingsContainer::new()
-                                .child(Label::new("Text Setting"))
-                                .child(Checkbox::new("checkbox", ToggleState::Unselected))
-                                .child(Button::new("button", "Click me"))
-                                .into_any_element(),
-                        )],
-                    ),
-                ])
-                .into_any_element(),
-        )
-    }
-}
diff --git a/crates/ui/src/components/settings_group.rs b/crates/ui/src/components/settings_group.rs
deleted file mode 100644
index 1812a1bec4..0000000000
--- a/crates/ui/src/components/settings_group.rs
+++ /dev/null
@@ -1,110 +0,0 @@
-use gpui::AnyElement;
-use smallvec::SmallVec;
-
-use crate::{ListHeader, prelude::*};
-
-use super::Checkbox;
-
-/// A group of settings.
-#[derive(IntoElement, RegisterComponent)]
-pub struct SettingsGroup {
-    header: SharedString,
-    children: SmallVec<[AnyElement; 2]>,
-}
-
-impl SettingsGroup {
-    pub fn new(header: impl Into<SharedString>) -> Self {
-        Self {
-            header: header.into(),
-            children: SmallVec::new(),
-        }
-    }
-}
-
-impl ParentElement for SettingsGroup {
-    fn extend(&mut self, elements: impl IntoIterator<Item = AnyElement>) {
-        self.children.extend(elements)
-    }
-}
-
-impl RenderOnce for SettingsGroup {
-    fn render(self, _window: &mut Window, _cx: &mut App) -> impl IntoElement {
-        v_flex()
-            .p_1()
-            .gap_2()
-            .child(ListHeader::new(self.header))
-            .children(self.children)
-    }
-}
-
-impl Component for SettingsGroup {
-    fn scope() -> ComponentScope {
-        ComponentScope::Layout
-    }
-
-    fn name() -> &'static str {
-        "SettingsGroup"
-    }
-
-    fn description() -> Option<&'static str> {
-        Some("A group of settings with a header, used to organize related settings.")
-    }
-
-    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
-        Some(
-            v_flex()
-                .gap_6()
-                .children(vec![
-                    example_group_with_title(
-                        "Basic Usage",
-                        vec![
-                            single_example(
-                                "Empty Group",
-                                SettingsGroup::new("General Settings").into_any_element(),
-                            ),
-                            single_example(
-                                "With Children",
-                                SettingsGroup::new("Appearance")
-                                    .child(
-                                        Checkbox::new("dark_mode", ToggleState::Unselected)
-                                            .label("Dark Mode"),
-                                    )
-                                    .child(
-                                        Checkbox::new("high_contrast", ToggleState::Unselected)
-                                            .label("High Contrast"),
-                                    )
-                                    .into_any_element(),
-                            ),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "Multiple Groups",
-                        vec![single_example(
-                            "Two Groups",
-                            v_flex()
-                                .gap_4()
-                                .child(
-                                    SettingsGroup::new("General").child(
-                                        Checkbox::new("auto_update", ToggleState::Selected)
-                                            .label("Auto Update"),
-                                    ),
-                                )
-                                .child(
-                                    SettingsGroup::new("Editor")
-                                        .child(
-                                            Checkbox::new("line_numbers", ToggleState::Selected)
-                                                .label("Show Line Numbers"),
-                                        )
-                                        .child(
-                                            Checkbox::new("word_wrap", ToggleState::Unselected)
-                                                .label("Word Wrap"),
-                                        ),
-                                )
-                                .into_any_element(),
-                        )],
-                    ),
-                ])
-                .into_any_element(),
-        )
-    }
-}
diff --git a/crates/ui/src/components/stack.rs b/crates/ui/src/components/stack.rs
deleted file mode 100644
index 2118757548..0000000000
--- a/crates/ui/src/components/stack.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-use gpui::{Div, div};
-
-use crate::StyledExt;
-
-/// Horizontally stacks elements. Sets `flex()`, `flex_row()`, `items_center()`
-#[track_caller]
-pub fn h_flex() -> Div {
-    div().h_flex()
-}
-
-/// Vertically stacks elements. Sets `flex()`, `flex_col()`
-#[track_caller]
-pub fn v_flex() -> Div {
-    div().v_flex()
-}
diff --git a/crates/ui/src/components/sticky_items.rs b/crates/ui/src/components/sticky_items.rs
deleted file mode 100644
index bf64622b29..0000000000
--- a/crates/ui/src/components/sticky_items.rs
+++ /dev/null
@@ -1,335 +0,0 @@
-use std::{ops::Range, rc::Rc};
-
-use gpui::{
-    AnyElement, App, AvailableSpace, Bounds, Context, Element, ElementId, Entity, GlobalElementId,
-    InspectorElementId, IntoElement, LayoutId, Pixels, Point, Render, Style, UniformListDecoration,
-    Window, point, px, size,
-};
-use smallvec::SmallVec;
-
-pub trait StickyCandidate {
-    fn depth(&self) -> usize;
-}
-
-pub struct StickyItems<T> {
-    compute_fn: Rc<dyn Fn(Range<usize>, &mut Window, &mut App) -> SmallVec<[T; 8]>>,
-    render_fn: Rc<dyn Fn(T, &mut Window, &mut App) -> SmallVec<[AnyElement; 8]>>,
-    decorations: Vec<Box<dyn StickyItemsDecoration>>,
-}
-
-pub fn sticky_items<V, T>(
-    entity: Entity<V>,
-    compute_fn: impl Fn(&mut V, Range<usize>, &mut Window, &mut Context<V>) -> SmallVec<[T; 8]>
-    + 'static,
-    render_fn: impl Fn(&mut V, T, &mut Window, &mut Context<V>) -> SmallVec<[AnyElement; 8]> + 'static,
-) -> StickyItems<T>
-where
-    V: Render,
-    T: StickyCandidate + Clone + 'static,
-{
-    let entity_compute = entity.clone();
-    let entity_render = entity;
-
-    let compute_fn = Rc::new(
-        move |range: Range<usize>, window: &mut Window, cx: &mut App| -> SmallVec<[T; 8]> {
-            entity_compute.update(cx, |view, cx| compute_fn(view, range, window, cx))
-        },
-    );
-    let render_fn = Rc::new(
-        move |entry: T, window: &mut Window, cx: &mut App| -> SmallVec<[AnyElement; 8]> {
-            entity_render.update(cx, |view, cx| render_fn(view, entry, window, cx))
-        },
-    );
-
-    StickyItems {
-        compute_fn,
-        render_fn,
-        decorations: Vec::new(),
-    }
-}
-
-impl<T> StickyItems<T>
-where
-    T: StickyCandidate + Clone + 'static,
-{
-    /// Adds a decoration element to the sticky items.
-    pub fn with_decoration(mut self, decoration: impl StickyItemsDecoration + 'static) -> Self {
-        self.decorations.push(Box::new(decoration));
-        self
-    }
-}
-
-struct StickyItemsElement {
-    drifting_element: Option<AnyElement>,
-    drifting_decoration: Option<AnyElement>,
-    rest_elements: SmallVec<[AnyElement; 8]>,
-    rest_decorations: SmallVec<[AnyElement; 1]>,
-}
-
-impl IntoElement for StickyItemsElement {
-    type Element = Self;
-
-    fn into_element(self) -> Self::Element {
-        self
-    }
-}
-
-impl Element for StickyItemsElement {
-    type RequestLayoutState = ();
-    type PrepaintState = ();
-
-    fn id(&self) -> Option<ElementId> {
-        None
-    }
-
-    fn source_location(&self) -> Option<&'static core::panic::Location<'static>> {
-        None
-    }
-
-    fn request_layout(
-        &mut self,
-        _id: Option<&GlobalElementId>,
-        _inspector_id: Option<&InspectorElementId>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> (LayoutId, Self::RequestLayoutState) {
-        (window.request_layout(Style::default(), [], cx), ())
-    }
-
-    fn prepaint(
-        &mut self,
-        _id: Option<&GlobalElementId>,
-        _inspector_id: Option<&InspectorElementId>,
-        _bounds: Bounds<Pixels>,
-        _request_layout: &mut Self::RequestLayoutState,
-        _window: &mut Window,
-        _cx: &mut App,
-    ) -> Self::PrepaintState {
-    }
-
-    fn paint(
-        &mut self,
-        _id: Option<&GlobalElementId>,
-        _inspector_id: Option<&InspectorElementId>,
-        _bounds: Bounds<Pixels>,
-        _request_layout: &mut Self::RequestLayoutState,
-        _prepaint: &mut Self::PrepaintState,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        if let Some(ref mut drifting_element) = self.drifting_element {
-            drifting_element.paint(window, cx);
-        }
-        if let Some(ref mut drifting_decoration) = self.drifting_decoration {
-            drifting_decoration.paint(window, cx);
-        }
-        for item in self.rest_elements.iter_mut().rev() {
-            item.paint(window, cx);
-        }
-        for item in self.rest_decorations.iter_mut() {
-            item.paint(window, cx);
-        }
-    }
-}
-
-impl<T> UniformListDecoration for StickyItems<T>
-where
-    T: StickyCandidate + Clone + 'static,
-{
-    fn compute(
-        &self,
-        visible_range: Range<usize>,
-        bounds: Bounds<Pixels>,
-        scroll_offset: Point<Pixels>,
-        item_height: Pixels,
-        _item_count: usize,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> AnyElement {
-        let entries = (self.compute_fn)(visible_range.clone(), window, cx);
-
-        let Some(sticky_anchor) = find_sticky_anchor(&entries, visible_range.start) else {
-            return StickyItemsElement {
-                drifting_element: None,
-                drifting_decoration: None,
-                rest_elements: SmallVec::new(),
-                rest_decorations: SmallVec::new(),
-            }
-            .into_any_element();
-        };
-
-        let anchor_depth = sticky_anchor.entry.depth();
-        let mut elements = (self.render_fn)(sticky_anchor.entry, window, cx);
-        let items_count = elements.len();
-
-        let indents: SmallVec<[usize; 8]> = (0..items_count)
-            .map(|ix| anchor_depth.saturating_sub(items_count.saturating_sub(ix)))
-            .collect();
-
-        let mut last_decoration_element = None;
-        let mut rest_decoration_elements = SmallVec::new();
-
-        let expanded_width = bounds.size.width + scroll_offset.x.abs();
-
-        let decor_available_space = size(
-            AvailableSpace::Definite(expanded_width),
-            AvailableSpace::Definite(bounds.size.height),
-        );
-
-        let drifting_y_offset = if sticky_anchor.drifting {
-            let scroll_top = -scroll_offset.y;
-            let anchor_top = item_height * (sticky_anchor.index + 1);
-            let sticky_area_height = item_height * items_count;
-            (anchor_top - scroll_top - sticky_area_height).min(Pixels::ZERO)
-        } else {
-            Pixels::ZERO
-        };
-
-        let (drifting_indent, rest_indents) = if sticky_anchor.drifting && !indents.is_empty() {
-            let last = indents[indents.len() - 1];
-            let rest: SmallVec<[usize; 8]> = indents[..indents.len() - 1].iter().copied().collect();
-            (Some(last), rest)
-        } else {
-            (None, indents)
-        };
-
-        let base_origin = bounds.origin - point(px(0.), scroll_offset.y);
-
-        for decoration in &self.decorations {
-            if let Some(drifting_indent) = drifting_indent {
-                let drifting_indent_vec: SmallVec<[usize; 8]> =
-                    [drifting_indent].into_iter().collect();
-
-                let sticky_origin = base_origin
-                    + point(px(0.), item_height * rest_indents.len() + drifting_y_offset);
-                let decoration_bounds = Bounds::new(sticky_origin, bounds.size);
-
-                let mut drifting_dec = decoration.as_ref().compute(
-                    &drifting_indent_vec,
-                    decoration_bounds,
-                    scroll_offset,
-                    item_height,
-                    window,
-                    cx,
-                );
-                drifting_dec.layout_as_root(decor_available_space, window, cx);
-                drifting_dec.prepaint_at(sticky_origin, window, cx);
-                last_decoration_element = Some(drifting_dec);
-            }
-
-            if !rest_indents.is_empty() {
-                let decoration_bounds = Bounds::new(base_origin, bounds.size);
-                let mut rest_dec = decoration.as_ref().compute(
-                    &rest_indents,
-                    decoration_bounds,
-                    scroll_offset,
-                    item_height,
-                    window,
-                    cx,
-                );
-                rest_dec.layout_as_root(decor_available_space, window, cx);
-                rest_dec.prepaint_at(bounds.origin, window, cx);
-                rest_decoration_elements.push(rest_dec);
-            }
-        }
-
-        let (mut drifting_element, mut rest_elements) =
-            if sticky_anchor.drifting && !elements.is_empty() {
-                let last = elements.pop().unwrap();
-                (Some(last), elements)
-            } else {
-                (None, elements)
-            };
-
-        let element_available_space = size(
-            AvailableSpace::Definite(expanded_width),
-            AvailableSpace::Definite(item_height),
-        );
-
-        // order of prepaint is important here
-        // mouse events checks hitboxes in reverse insertion order
-        if let Some(ref mut drifting_element) = drifting_element {
-            let sticky_origin = base_origin
-                + point(
-                    px(0.),
-                    item_height * rest_elements.len() + drifting_y_offset,
-                );
-
-            drifting_element.layout_as_root(element_available_space, window, cx);
-            drifting_element.prepaint_at(sticky_origin, window, cx);
-        }
-
-        for (ix, element) in rest_elements.iter_mut().enumerate() {
-            let sticky_origin = base_origin + point(px(0.), item_height * ix);
-
-            element.layout_as_root(element_available_space, window, cx);
-            element.prepaint_at(sticky_origin, window, cx);
-        }
-
-        StickyItemsElement {
-            drifting_element,
-            drifting_decoration: last_decoration_element,
-            rest_elements,
-            rest_decorations: rest_decoration_elements,
-        }
-        .into_any_element()
-    }
-}
-
-struct StickyAnchor<T> {
-    entry: T,
-    index: usize,
-    drifting: bool,
-}
-
-fn find_sticky_anchor<T: StickyCandidate + Clone>(
-    entries: &SmallVec<[T; 8]>,
-    visible_range_start: usize,
-) -> Option<StickyAnchor<T>> {
-    let mut iter = entries.iter().enumerate().peekable();
-    while let Some((ix, current_entry)) = iter.next() {
-        let depth = current_entry.depth();
-
-        if depth < ix {
-            return Some(StickyAnchor {
-                entry: current_entry.clone(),
-                index: visible_range_start + ix,
-                drifting: false,
-            });
-        }
-
-        if let Some(&(_next_ix, next_entry)) = iter.peek() {
-            let next_depth = next_entry.depth();
-            let next_item_outdented = next_depth + 1 == depth;
-
-            let depth_same_as_index = depth == ix;
-            let depth_greater_than_index = depth == ix + 1;
-
-            if next_item_outdented && (depth_same_as_index || depth_greater_than_index) {
-                return Some(StickyAnchor {
-                    entry: current_entry.clone(),
-                    index: visible_range_start + ix,
-                    drifting: depth_greater_than_index,
-                });
-            }
-        }
-    }
-
-    None
-}
-
-/// A decoration for a [`StickyItems`]. This can be used for various things,
-/// such as rendering indent guides, or other visual effects.
-pub trait StickyItemsDecoration {
-    /// Compute the decoration element, given the visible range of list items,
-    /// the bounds of the list, and the height of each item.
-    fn compute(
-        &self,
-        indents: &SmallVec<[usize; 8]>,
-        bounds: Bounds<Pixels>,
-        scroll_offset: Point<Pixels>,
-        item_height: Pixels,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> AnyElement;
-}
diff --git a/crates/ui/src/components/stories.rs b/crates/ui/src/components/stories.rs
deleted file mode 100644
index bcfcfd04c3..0000000000
--- a/crates/ui/src/components/stories.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-mod context_menu;
-
-pub use context_menu::*;
diff --git a/crates/ui/src/components/stories/context_menu.rs b/crates/ui/src/components/stories/context_menu.rs
deleted file mode 100644
index 197964adc8..0000000000
--- a/crates/ui/src/components/stories/context_menu.rs
+++ /dev/null
@@ -1,81 +0,0 @@
-use gpui::{Corner, Entity, Render, actions};
-use story::Story;
-
-use crate::prelude::*;
-use crate::{ContextMenu, Label, right_click_menu};
-
-actions!(stories, [PrintCurrentDate, PrintBestFood]);
-
-fn build_menu(
-    window: &mut Window,
-    cx: &mut App,
-    header: impl Into<SharedString>,
-) -> Entity<ContextMenu> {
-    ContextMenu::build(window, cx, |menu, _, _| {
-        menu.header(header)
-            .separator()
-            .action("Print current time", Box::new(PrintCurrentDate))
-            .entry(
-                "Print best food",
-                Some(Box::new(PrintBestFood)),
-                |window, cx| window.dispatch_action(Box::new(PrintBestFood), cx),
-            )
-    })
-}
-
-pub struct ContextMenuStory;
-
-impl Render for ContextMenuStory {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        Story::container(cx)
-            .on_action(|_: &PrintCurrentDate, _, _| {
-                println!("printing unix time!");
-                if let Ok(unix_time) = std::time::UNIX_EPOCH.elapsed() {
-                    println!("Current Unix time is {:?}", unix_time.as_secs());
-                }
-            })
-            .on_action(|_: &PrintBestFood, _, _| {
-                println!("burrito");
-            })
-            .flex()
-            .flex_row()
-            .justify_between()
-            .child(
-                div()
-                    .flex()
-                    .flex_col()
-                    .justify_between()
-                    .child(
-                        right_click_menu("test2")
-                            .trigger(|_, _, _| Label::new("TOP LEFT"))
-                            .menu(move |window, cx| build_menu(window, cx, "top left")),
-                    )
-                    .child(
-                        right_click_menu("test1")
-                            .trigger(|_, _, _| Label::new("BOTTOM LEFT"))
-                            .anchor(Corner::BottomLeft)
-                            .attach(Corner::TopLeft)
-                            .menu(move |window, cx| build_menu(window, cx, "bottom left")),
-                    ),
-            )
-            .child(
-                div()
-                    .flex()
-                    .flex_col()
-                    .justify_between()
-                    .child(
-                        right_click_menu("test3")
-                            .trigger(|_, _, _| Label::new("TOP RIGHT"))
-                            .anchor(Corner::TopRight)
-                            .menu(move |window, cx| build_menu(window, cx, "top right")),
-                    )
-                    .child(
-                        right_click_menu("test4")
-                            .trigger(|_, _, _| Label::new("BOTTOM RIGHT"))
-                            .anchor(Corner::BottomRight)
-                            .attach(Corner::TopRight)
-                            .menu(move |window, cx| build_menu(window, cx, "bottom right")),
-                    ),
-            )
-    }
-}
diff --git a/crates/ui/src/components/tab.rs b/crates/ui/src/components/tab.rs
deleted file mode 100644
index e6823f46b7..0000000000
--- a/crates/ui/src/components/tab.rs
+++ /dev/null
@@ -1,238 +0,0 @@
-use std::cmp::Ordering;
-
-use gpui::{AnyElement, IntoElement, Stateful};
-use smallvec::SmallVec;
-
-use crate::prelude::*;
-
-const START_TAB_SLOT_SIZE: Pixels = px(12.);
-const END_TAB_SLOT_SIZE: Pixels = px(14.);
-
-/// The position of a [`Tab`] within a list of tabs.
-#[derive(Debug, PartialEq, Eq, Clone, Copy)]
-pub enum TabPosition {
-    /// The tab is first in the list.
-    First,
-
-    /// The tab is in the middle of the list (i.e., it is not the first or last tab).
-    ///
-    /// The [`Ordering`] is where this tab is positioned with respect to the selected tab.
-    Middle(Ordering),
-
-    /// The tab is last in the list.
-    Last,
-}
-
-#[derive(Debug, PartialEq, Eq, Clone, Copy)]
-pub enum TabCloseSide {
-    Start,
-    End,
-}
-
-#[derive(IntoElement, RegisterComponent)]
-pub struct Tab {
-    div: Stateful<Div>,
-    selected: bool,
-    position: TabPosition,
-    close_side: TabCloseSide,
-    start_slot: Option<AnyElement>,
-    end_slot: Option<AnyElement>,
-    children: SmallVec<[AnyElement; 2]>,
-}
-
-impl Tab {
-    pub fn new(id: impl Into<ElementId>) -> Self {
-        let id = id.into();
-        Self {
-            div: div()
-                .id(id.clone())
-                .debug_selector(|| format!("TAB-{}", id)),
-            selected: false,
-            position: TabPosition::First,
-            close_side: TabCloseSide::End,
-            start_slot: None,
-            end_slot: None,
-            children: SmallVec::new(),
-        }
-    }
-
-    pub fn position(mut self, position: TabPosition) -> Self {
-        self.position = position;
-        self
-    }
-
-    pub fn close_side(mut self, close_side: TabCloseSide) -> Self {
-        self.close_side = close_side;
-        self
-    }
-
-    pub fn start_slot<E: IntoElement>(mut self, element: impl Into<Option<E>>) -> Self {
-        self.start_slot = element.into().map(IntoElement::into_any_element);
-        self
-    }
-
-    pub fn end_slot<E: IntoElement>(mut self, element: impl Into<Option<E>>) -> Self {
-        self.end_slot = element.into().map(IntoElement::into_any_element);
-        self
-    }
-
-    pub fn content_height(cx: &App) -> Pixels {
-        DynamicSpacing::Base32.px(cx) - px(1.)
-    }
-
-    pub fn container_height(cx: &App) -> Pixels {
-        DynamicSpacing::Base32.px(cx)
-    }
-}
-
-impl InteractiveElement for Tab {
-    fn interactivity(&mut self) -> &mut gpui::Interactivity {
-        self.div.interactivity()
-    }
-}
-
-impl StatefulInteractiveElement for Tab {}
-
-impl Toggleable for Tab {
-    fn toggle_state(mut self, selected: bool) -> Self {
-        self.selected = selected;
-        self
-    }
-}
-
-impl ParentElement for Tab {
-    fn extend(&mut self, elements: impl IntoIterator<Item = AnyElement>) {
-        self.children.extend(elements)
-    }
-}
-
-impl RenderOnce for Tab {
-    #[allow(refining_impl_trait)]
-    fn render(self, _: &mut Window, cx: &mut App) -> Stateful<Div> {
-        let (text_color, tab_bg, _tab_hover_bg, _tab_active_bg) = match self.selected {
-            false => (
-                cx.theme().colors().text_muted,
-                cx.theme().colors().tab_inactive_background,
-                cx.theme().colors().ghost_element_hover,
-                cx.theme().colors().ghost_element_active,
-            ),
-            true => (
-                cx.theme().colors().text,
-                cx.theme().colors().tab_active_background,
-                cx.theme().colors().element_hover,
-                cx.theme().colors().element_active,
-            ),
-        };
-
-        let (start_slot, end_slot) = {
-            let start_slot = h_flex()
-                .size(START_TAB_SLOT_SIZE)
-                .justify_center()
-                .children(self.start_slot);
-
-            let end_slot = h_flex()
-                .size(END_TAB_SLOT_SIZE)
-                .justify_center()
-                .children(self.end_slot);
-
-            match self.close_side {
-                TabCloseSide::End => (start_slot, end_slot),
-                TabCloseSide::Start => (end_slot, start_slot),
-            }
-        };
-
-        self.div
-            .h(Tab::container_height(cx))
-            .bg(tab_bg)
-            .border_color(cx.theme().colors().border)
-            .map(|this| match self.position {
-                TabPosition::First => {
-                    if self.selected {
-                        this.pl_px().border_r_1().pb_px()
-                    } else {
-                        this.pl_px().pr_px().border_b_1()
-                    }
-                }
-                TabPosition::Last => {
-                    if self.selected {
-                        this.border_l_1().border_r_1().pb_px()
-                    } else {
-                        this.pl_px().border_b_1().border_r_1()
-                    }
-                }
-                TabPosition::Middle(Ordering::Equal) => this.border_l_1().border_r_1().pb_px(),
-                TabPosition::Middle(Ordering::Less) => this.border_l_1().pr_px().border_b_1(),
-                TabPosition::Middle(Ordering::Greater) => this.border_r_1().pl_px().border_b_1(),
-            })
-            .cursor_pointer()
-            .child(
-                h_flex()
-                    .group("")
-                    .relative()
-                    .h(Tab::content_height(cx))
-                    .px(DynamicSpacing::Base04.px(cx))
-                    .gap(DynamicSpacing::Base04.rems(cx))
-                    .text_color(text_color)
-                    .child(start_slot)
-                    .children(self.children)
-                    .child(end_slot),
-            )
-    }
-}
-
-impl Component for Tab {
-    fn scope() -> ComponentScope {
-        ComponentScope::Navigation
-    }
-
-    fn description() -> Option<&'static str> {
-        Some(
-            "A tab component that can be used in a tabbed interface, supporting different positions and states.",
-        )
-    }
-
-    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
-        Some(
-            v_flex()
-                .gap_6()
-                .children(vec![example_group_with_title(
-                    "Variations",
-                    vec![
-                        single_example(
-                            "Default",
-                            Tab::new("default").child("Default Tab").into_any_element(),
-                        ),
-                        single_example(
-                            "Selected",
-                            Tab::new("selected")
-                                .toggle_state(true)
-                                .child("Selected Tab")
-                                .into_any_element(),
-                        ),
-                        single_example(
-                            "First",
-                            Tab::new("first")
-                                .position(TabPosition::First)
-                                .child("First Tab")
-                                .into_any_element(),
-                        ),
-                        single_example(
-                            "Middle",
-                            Tab::new("middle")
-                                .position(TabPosition::Middle(Ordering::Equal))
-                                .child("Middle Tab")
-                                .into_any_element(),
-                        ),
-                        single_example(
-                            "Last",
-                            Tab::new("last")
-                                .position(TabPosition::Last)
-                                .child("Last Tab")
-                                .into_any_element(),
-                        ),
-                    ],
-                )])
-                .into_any_element(),
-        )
-    }
-}
diff --git a/crates/ui/src/components/tab_bar.rs b/crates/ui/src/components/tab_bar.rs
deleted file mode 100644
index 5d41466e3c..0000000000
--- a/crates/ui/src/components/tab_bar.rs
+++ /dev/null
@@ -1,207 +0,0 @@
-use gpui::{AnyElement, ScrollHandle};
-use smallvec::SmallVec;
-
-use crate::Tab;
-use crate::prelude::*;
-
-#[derive(IntoElement, RegisterComponent)]
-pub struct TabBar {
-    id: ElementId,
-    start_children: SmallVec<[AnyElement; 2]>,
-    children: SmallVec<[AnyElement; 2]>,
-    end_children: SmallVec<[AnyElement; 2]>,
-    scroll_handle: Option<ScrollHandle>,
-}
-
-impl TabBar {
-    pub fn new(id: impl Into<ElementId>) -> Self {
-        Self {
-            id: id.into(),
-            start_children: SmallVec::new(),
-            children: SmallVec::new(),
-            end_children: SmallVec::new(),
-            scroll_handle: None,
-        }
-    }
-
-    pub fn track_scroll(mut self, scroll_handle: &ScrollHandle) -> Self {
-        self.scroll_handle = Some(scroll_handle.clone());
-        self
-    }
-
-    pub fn start_children_mut(&mut self) -> &mut SmallVec<[AnyElement; 2]> {
-        &mut self.start_children
-    }
-
-    pub fn start_child(mut self, start_child: impl IntoElement) -> Self
-    where
-        Self: Sized,
-    {
-        self.start_children_mut()
-            .push(start_child.into_element().into_any());
-        self
-    }
-
-    pub fn start_children(
-        mut self,
-        start_children: impl IntoIterator<Item = impl IntoElement>,
-    ) -> Self
-    where
-        Self: Sized,
-    {
-        self.start_children_mut().extend(
-            start_children
-                .into_iter()
-                .map(|child| child.into_any_element()),
-        );
-        self
-    }
-
-    pub fn end_children_mut(&mut self) -> &mut SmallVec<[AnyElement; 2]> {
-        &mut self.end_children
-    }
-
-    pub fn end_child(mut self, end_child: impl IntoElement) -> Self
-    where
-        Self: Sized,
-    {
-        self.end_children_mut()
-            .push(end_child.into_element().into_any());
-        self
-    }
-
-    pub fn end_children(mut self, end_children: impl IntoIterator<Item = impl IntoElement>) -> Self
-    where
-        Self: Sized,
-    {
-        self.end_children_mut().extend(
-            end_children
-                .into_iter()
-                .map(|child| child.into_any_element()),
-        );
-        self
-    }
-}
-
-impl ParentElement for TabBar {
-    fn extend(&mut self, elements: impl IntoIterator<Item = AnyElement>) {
-        self.children.extend(elements)
-    }
-}
-
-impl RenderOnce for TabBar {
-    fn render(self, _: &mut Window, cx: &mut App) -> impl IntoElement {
-        div()
-            .id(self.id)
-            .group("tab_bar")
-            .flex()
-            .flex_none()
-            .w_full()
-            .h(Tab::container_height(cx))
-            .bg(cx.theme().colors().tab_bar_background)
-            .when(!self.start_children.is_empty(), |this| {
-                this.child(
-                    h_flex()
-                        .flex_none()
-                        .gap(DynamicSpacing::Base04.rems(cx))
-                        .px(DynamicSpacing::Base06.rems(cx))
-                        .border_b_1()
-                        .border_r_1()
-                        .border_color(cx.theme().colors().border)
-                        .children(self.start_children),
-                )
-            })
-            .child(
-                div()
-                    .relative()
-                    .flex_1()
-                    .h_full()
-                    .overflow_x_hidden()
-                    .child(
-                        div()
-                            .absolute()
-                            .top_0()
-                            .left_0()
-                            .size_full()
-                            .border_b_1()
-                            .border_color(cx.theme().colors().border),
-                    )
-                    .child(
-                        h_flex()
-                            .id("tabs")
-                            .flex_grow()
-                            .overflow_x_scroll()
-                            .when_some(self.scroll_handle, |cx, scroll_handle| {
-                                cx.track_scroll(&scroll_handle)
-                            })
-                            .children(self.children),
-                    ),
-            )
-            .when(!self.end_children.is_empty(), |this| {
-                this.child(
-                    h_flex()
-                        .flex_none()
-                        .gap(DynamicSpacing::Base04.rems(cx))
-                        .px(DynamicSpacing::Base06.rems(cx))
-                        .border_b_1()
-                        .border_l_1()
-                        .border_color(cx.theme().colors().border)
-                        .children(self.end_children),
-                )
-            })
-    }
-}
-
-impl Component for TabBar {
-    fn scope() -> ComponentScope {
-        ComponentScope::Navigation
-    }
-
-    fn name() -> &'static str {
-        "TabBar"
-    }
-
-    fn description() -> Option<&'static str> {
-        Some("A horizontal bar containing tabs for navigation between different views or sections.")
-    }
-
-    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
-        Some(
-            v_flex()
-                .gap_6()
-                .children(vec![
-                    example_group_with_title(
-                        "Basic Usage",
-                        vec![
-                            single_example(
-                                "Empty TabBar",
-                                TabBar::new("empty_tab_bar").into_any_element(),
-                            ),
-                            single_example(
-                                "With Tabs",
-                                TabBar::new("tab_bar_with_tabs")
-                                    .child(Tab::new("tab1"))
-                                    .child(Tab::new("tab2"))
-                                    .child(Tab::new("tab3"))
-                                    .into_any_element(),
-                            ),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "With Start and End Children",
-                        vec![single_example(
-                            "Full TabBar",
-                            TabBar::new("full_tab_bar")
-                                .start_child(Button::new("start_button", "Start"))
-                                .child(Tab::new("tab1"))
-                                .child(Tab::new("tab2"))
-                                .child(Tab::new("tab3"))
-                                .end_child(Button::new("end_button", "End"))
-                                .into_any_element(),
-                        )],
-                    ),
-                ])
-                .into_any_element(),
-        )
-    }
-}
diff --git a/crates/ui/src/components/thread_item.rs b/crates/ui/src/components/thread_item.rs
deleted file mode 100644
index a4f6a8a533..0000000000
--- a/crates/ui/src/components/thread_item.rs
+++ /dev/null
@@ -1,260 +0,0 @@
-use crate::{
-    Chip, DecoratedIcon, DiffStat, IconDecoration, IconDecorationKind, SpinnerLabel, prelude::*,
-};
-use gpui::{ClickEvent, SharedString};
-
-#[derive(IntoElement, RegisterComponent)]
-pub struct ThreadItem {
-    id: ElementId,
-    icon: IconName,
-    title: SharedString,
-    timestamp: SharedString,
-    running: bool,
-    generation_done: bool,
-    selected: bool,
-    added: Option<usize>,
-    removed: Option<usize>,
-    worktree: Option<SharedString>,
-    on_click: Option<Box<dyn Fn(&ClickEvent, &mut Window, &mut App) + 'static>>,
-}
-
-impl ThreadItem {
-    pub fn new(id: impl Into<ElementId>, title: impl Into<SharedString>) -> Self {
-        Self {
-            id: id.into(),
-            icon: IconName::ZedAgent,
-            title: title.into(),
-            timestamp: "".into(),
-            running: false,
-            generation_done: false,
-            selected: false,
-            added: None,
-            removed: None,
-            worktree: None,
-            on_click: None,
-        }
-    }
-
-    pub fn timestamp(mut self, timestamp: impl Into<SharedString>) -> Self {
-        self.timestamp = timestamp.into();
-        self
-    }
-
-    pub fn icon(mut self, icon: IconName) -> Self {
-        self.icon = icon;
-        self
-    }
-
-    pub fn running(mut self, running: bool) -> Self {
-        self.running = running;
-        self
-    }
-
-    pub fn generation_done(mut self, generation_done: bool) -> Self {
-        self.generation_done = generation_done;
-        self
-    }
-
-    pub fn selected(mut self, selected: bool) -> Self {
-        self.selected = selected;
-        self
-    }
-
-    pub fn added(mut self, added: usize) -> Self {
-        self.added = Some(added);
-        self
-    }
-
-    pub fn removed(mut self, removed: usize) -> Self {
-        self.removed = Some(removed);
-        self
-    }
-
-    pub fn worktree(mut self, worktree: impl Into<SharedString>) -> Self {
-        self.worktree = Some(worktree.into());
-        self
-    }
-
-    pub fn on_click(
-        mut self,
-        handler: impl Fn(&ClickEvent, &mut Window, &mut App) + 'static,
-    ) -> Self {
-        self.on_click = Some(Box::new(handler));
-        self
-    }
-}
-
-impl RenderOnce for ThreadItem {
-    fn render(self, _: &mut Window, cx: &mut App) -> impl IntoElement {
-        let icon_container = || h_flex().size_4().justify_center();
-        let agent_icon = Icon::new(self.icon)
-            .color(Color::Muted)
-            .size(IconSize::Small);
-
-        let icon = if self.generation_done {
-            DecoratedIcon::new(
-                agent_icon,
-                Some(
-                    IconDecoration::new(
-                        IconDecorationKind::Dot,
-                        cx.theme().colors().surface_background,
-                        cx,
-                    )
-                    .color(cx.theme().colors().text_accent)
-                    .position(gpui::Point {
-                        x: px(-2.),
-                        y: px(-2.),
-                    }),
-                ),
-            )
-            .into_any_element()
-        } else {
-            agent_icon.into_any_element()
-        };
-
-        let has_no_changes = self.added.is_none() && self.removed.is_none();
-
-        v_flex()
-            .id(self.id.clone())
-            .cursor_pointer()
-            .p_2()
-            .when(self.selected, |this| {
-                this.bg(cx.theme().colors().element_active)
-            })
-            .hover(|s| s.bg(cx.theme().colors().element_hover))
-            .child(
-                h_flex()
-                    .w_full()
-                    .gap_1p5()
-                    .child(icon)
-                    .child(Label::new(self.title).truncate())
-                    .when(self.running, |this| {
-                        this.child(icon_container().child(SpinnerLabel::new().color(Color::Accent)))
-                    }),
-            )
-            .child(
-                h_flex()
-                    .gap_1p5()
-                    .child(icon_container()) // Icon Spacing
-                    .when_some(self.worktree, |this, name| {
-                        this.child(Chip::new(name).label_size(LabelSize::XSmall))
-                    })
-                    .child(
-                        Label::new(self.timestamp)
-                            .size(LabelSize::Small)
-                            .color(Color::Muted),
-                    )
-                    .child(
-                        Label::new("•")
-                            .size(LabelSize::Small)
-                            .color(Color::Muted)
-                            .alpha(0.5),
-                    )
-                    .when(has_no_changes, |this| {
-                        this.child(
-                            Label::new("No Changes")
-                                .size(LabelSize::Small)
-                                .color(Color::Muted),
-                        )
-                    })
-                    .when(self.added.is_some() || self.removed.is_some(), |this| {
-                        this.child(DiffStat::new(
-                            self.id,
-                            self.added.unwrap_or(0),
-                            self.removed.unwrap_or(0),
-                        ))
-                    }),
-            )
-            .when_some(self.on_click, |this, on_click| this.on_click(on_click))
-    }
-}
-
-impl Component for ThreadItem {
-    fn scope() -> ComponentScope {
-        ComponentScope::Agent
-    }
-
-    fn preview(_window: &mut Window, cx: &mut App) -> Option<AnyElement> {
-        let container = || {
-            v_flex()
-                .w_72()
-                .border_1()
-                .border_color(cx.theme().colors().border_variant)
-                .bg(cx.theme().colors().panel_background)
-        };
-
-        let thread_item_examples = vec![
-            single_example(
-                "Default",
-                container()
-                    .child(
-                        ThreadItem::new("ti-1", "Linking to the Agent Panel Depending on Settings")
-                            .icon(IconName::AiOpenAi)
-                            .timestamp("1:33 AM"),
-                    )
-                    .into_any_element(),
-            ),
-            single_example(
-                "Generation Done",
-                container()
-                    .child(
-                        ThreadItem::new("ti-2", "Refine thread view scrolling behavior")
-                            .timestamp("12:12 AM")
-                            .generation_done(true),
-                    )
-                    .into_any_element(),
-            ),
-            single_example(
-                "Running Agent",
-                container()
-                    .child(
-                        ThreadItem::new("ti-3", "Add line numbers option to FileEditBlock")
-                            .icon(IconName::AiClaude)
-                            .timestamp("7:30 PM")
-                            .running(true),
-                    )
-                    .into_any_element(),
-            ),
-            single_example(
-                "In Worktree",
-                container()
-                    .child(
-                        ThreadItem::new("ti-4", "Add line numbers option to FileEditBlock")
-                            .icon(IconName::AiClaude)
-                            .timestamp("7:37 PM")
-                            .worktree("link-agent-panel"),
-                    )
-                    .into_any_element(),
-            ),
-            single_example(
-                "With Changes",
-                container()
-                    .child(
-                        ThreadItem::new("ti-5", "Managing user and project settings interactions")
-                            .icon(IconName::AiClaude)
-                            .timestamp("7:37 PM")
-                            .added(10)
-                            .removed(3),
-                    )
-                    .into_any_element(),
-            ),
-            single_example(
-                "Selected Item",
-                container()
-                    .child(
-                        ThreadItem::new("ti-6", "Refine textarea interaction behavior")
-                            .icon(IconName::AiGemini)
-                            .timestamp("3:00 PM")
-                            .selected(true),
-                    )
-                    .into_any_element(),
-            ),
-        ];
-
-        Some(
-            example_group(thread_item_examples)
-                .vertical()
-                .into_any_element(),
-        )
-    }
-}
diff --git a/crates/ui/src/components/toggle.rs b/crates/ui/src/components/toggle.rs
deleted file mode 100644
index 86ff1d8eff..0000000000
--- a/crates/ui/src/components/toggle.rs
+++ /dev/null
@@ -1,1063 +0,0 @@
-use gpui::{
-    AnyElement, AnyView, ClickEvent, ElementId, Hsla, IntoElement, KeybindingKeystroke, Keystroke,
-    Styled, Window, div, hsla, prelude::*,
-};
-use settings::KeybindSource;
-use std::{rc::Rc, sync::Arc};
-
-use crate::utils::is_light;
-use crate::{Color, Icon, IconName, ToggleState, Tooltip};
-use crate::{ElevationIndex, KeyBinding, prelude::*};
-
-// TODO: Checkbox, CheckboxWithLabel, and Switch could all be
-// restructured to use a ToggleLike, similar to Button/Buttonlike, Label/Labellike
-
-/// Creates a new checkbox.
-pub fn checkbox(id: impl Into<ElementId>, toggle_state: ToggleState) -> Checkbox {
-    Checkbox::new(id, toggle_state)
-}
-
-/// Creates a new switch.
-pub fn switch(id: impl Into<ElementId>, toggle_state: ToggleState) -> Switch {
-    Switch::new(id, toggle_state)
-}
-
-/// The visual style of a toggle.
-#[derive(Debug, Default, Clone, PartialEq, Eq)]
-pub enum ToggleStyle {
-    /// Toggle has a transparent background
-    #[default]
-    Ghost,
-    /// Toggle has a filled background based on the
-    /// elevation index of the parent container
-    ElevationBased(ElevationIndex),
-    /// A custom style using a color to tint the toggle
-    Custom(Hsla),
-}
-
-/// # Checkbox
-///
-/// Checkboxes are used for multiple choices, not for mutually exclusive choices.
-/// Each checkbox works independently from other checkboxes in the list,
-/// therefore checking an additional box does not affect any other selections.
-#[derive(IntoElement, RegisterComponent)]
-pub struct Checkbox {
-    id: ElementId,
-    toggle_state: ToggleState,
-    style: ToggleStyle,
-    disabled: bool,
-    placeholder: bool,
-    filled: bool,
-    visualization: bool,
-    label: Option<SharedString>,
-    label_size: LabelSize,
-    label_color: Color,
-    tooltip: Option<Box<dyn Fn(&mut Window, &mut App) -> AnyView>>,
-    on_click: Option<Box<dyn Fn(&ToggleState, &ClickEvent, &mut Window, &mut App) + 'static>>,
-}
-
-impl Checkbox {
-    /// Creates a new [`Checkbox`].
-    pub fn new(id: impl Into<ElementId>, checked: ToggleState) -> Self {
-        Self {
-            id: id.into(),
-            toggle_state: checked,
-            style: ToggleStyle::default(),
-            disabled: false,
-            placeholder: false,
-            filled: false,
-            visualization: false,
-            label: None,
-            label_size: LabelSize::Default,
-            label_color: Color::Muted,
-            tooltip: None,
-            on_click: None,
-        }
-    }
-
-    /// Sets the disabled state of the [`Checkbox`].
-    pub fn disabled(mut self, disabled: bool) -> Self {
-        self.disabled = disabled;
-        self
-    }
-
-    /// Sets the disabled state of the [`Checkbox`].
-    pub fn placeholder(mut self, placeholder: bool) -> Self {
-        self.placeholder = placeholder;
-        self
-    }
-
-    /// Binds a handler to the [`Checkbox`] that will be called when clicked.
-    pub fn on_click(
-        mut self,
-        handler: impl Fn(&ToggleState, &mut Window, &mut App) + 'static,
-    ) -> Self {
-        self.on_click = Some(Box::new(move |state, _, window, cx| {
-            handler(state, window, cx)
-        }));
-        self
-    }
-
-    pub fn on_click_ext(
-        mut self,
-        handler: impl Fn(&ToggleState, &ClickEvent, &mut Window, &mut App) + 'static,
-    ) -> Self {
-        self.on_click = Some(Box::new(handler));
-        self
-    }
-
-    /// Sets the `fill` setting of the checkbox, indicating whether it should be filled.
-    pub fn fill(mut self) -> Self {
-        self.filled = true;
-        self
-    }
-
-    /// Makes the checkbox look enabled but without pointer cursor and hover styles.
-    /// Primarily used for uninteractive markdown previews.
-    pub fn visualization_only(mut self, visualization: bool) -> Self {
-        self.visualization = visualization;
-        self
-    }
-
-    /// Sets the style of the checkbox using the specified [`ToggleStyle`].
-    pub fn style(mut self, style: ToggleStyle) -> Self {
-        self.style = style;
-        self
-    }
-
-    /// Match the style of the checkbox to the current elevation using [`ToggleStyle::ElevationBased`].
-    pub fn elevation(mut self, elevation: ElevationIndex) -> Self {
-        self.style = ToggleStyle::ElevationBased(elevation);
-        self
-    }
-
-    /// Sets the tooltip for the checkbox.
-    pub fn tooltip(mut self, tooltip: impl Fn(&mut Window, &mut App) -> AnyView + 'static) -> Self {
-        self.tooltip = Some(Box::new(tooltip));
-        self
-    }
-
-    /// Set the label for the checkbox.
-    pub fn label(mut self, label: impl Into<SharedString>) -> Self {
-        self.label = Some(label.into());
-        self
-    }
-
-    pub fn label_size(mut self, size: LabelSize) -> Self {
-        self.label_size = size;
-        self
-    }
-
-    pub fn label_color(mut self, color: Color) -> Self {
-        self.label_color = color;
-        self
-    }
-}
-
-impl Checkbox {
-    fn bg_color(&self, cx: &App) -> Hsla {
-        let style = self.style.clone();
-        match (style, self.filled) {
-            (ToggleStyle::Ghost, false) => cx.theme().colors().ghost_element_background,
-            (ToggleStyle::Ghost, true) => cx.theme().colors().element_background,
-            (ToggleStyle::ElevationBased(_), false) => gpui::transparent_black(),
-            (ToggleStyle::ElevationBased(elevation), true) => elevation.darker_bg(cx),
-            (ToggleStyle::Custom(_), false) => gpui::transparent_black(),
-            (ToggleStyle::Custom(color), true) => color.opacity(0.2),
-        }
-    }
-
-    fn border_color(&self, cx: &App) -> Hsla {
-        if self.disabled {
-            return cx.theme().colors().border_variant;
-        }
-
-        match self.style.clone() {
-            ToggleStyle::Ghost => cx.theme().colors().border,
-            ToggleStyle::ElevationBased(_) => cx.theme().colors().border,
-            ToggleStyle::Custom(color) => color.opacity(0.3),
-        }
-    }
-
-    pub fn container_size() -> Pixels {
-        px(20.0)
-    }
-}
-
-impl RenderOnce for Checkbox {
-    fn render(self, _: &mut Window, cx: &mut App) -> impl IntoElement {
-        let group_id = format!("checkbox_group_{:?}", self.id);
-        let color = if self.disabled {
-            Color::Disabled
-        } else {
-            Color::Selected
-        };
-
-        let icon = match self.toggle_state {
-            ToggleState::Selected => {
-                if self.placeholder {
-                    None
-                } else {
-                    Some(
-                        Icon::new(IconName::Check)
-                            .size(IconSize::Small)
-                            .color(color),
-                    )
-                }
-            }
-            ToggleState::Indeterminate => {
-                Some(Icon::new(IconName::Dash).size(IconSize::Small).color(color))
-            }
-            ToggleState::Unselected => None,
-        };
-
-        let bg_color = self.bg_color(cx);
-        let border_color = self.border_color(cx);
-        let hover_border_color = border_color.alpha(0.7);
-
-        let size = Self::container_size();
-
-        let checkbox = h_flex()
-            .group(group_id.clone())
-            .id(self.id.clone())
-            .size(size)
-            .justify_center()
-            .child(
-                div()
-                    .flex()
-                    .flex_none()
-                    .justify_center()
-                    .items_center()
-                    .m_1()
-                    .size_4()
-                    .rounded_xs()
-                    .bg(bg_color)
-                    .border_1()
-                    .border_color(border_color)
-                    .when(self.disabled, |this| this.cursor_not_allowed())
-                    .when(self.disabled, |this| {
-                        this.bg(cx.theme().colors().element_disabled.opacity(0.6))
-                    })
-                    .when(!self.disabled && !self.visualization, |this| {
-                        this.group_hover(group_id.clone(), |el| el.border_color(hover_border_color))
-                    })
-                    .when(self.placeholder, |this| {
-                        this.child(
-                            div()
-                                .flex_none()
-                                .rounded_full()
-                                .bg(color.color(cx).alpha(0.5))
-                                .size(px(4.)),
-                        )
-                    })
-                    .children(icon),
-            );
-
-        h_flex()
-            .id(self.id)
-            .map(|this| {
-                if self.disabled {
-                    this.cursor_not_allowed()
-                } else if self.visualization {
-                    this.cursor_default()
-                } else {
-                    this.cursor_pointer()
-                }
-            })
-            .gap(DynamicSpacing::Base06.rems(cx))
-            .child(checkbox)
-            .when_some(self.label, |this, label| {
-                this.child(
-                    Label::new(label)
-                        .color(self.label_color)
-                        .size(self.label_size),
-                )
-            })
-            .when_some(self.tooltip, |this, tooltip| {
-                this.tooltip(move |window, cx| tooltip(window, cx))
-            })
-            .when_some(
-                self.on_click.filter(|_| !self.disabled),
-                |this, on_click| {
-                    this.on_click(move |click, window, cx| {
-                        on_click(&self.toggle_state.inverse(), click, window, cx)
-                    })
-                },
-            )
-    }
-}
-
-/// Defines the color for a switch component.
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy, Default)]
-pub enum SwitchColor {
-    #[default]
-    Accent,
-    Custom(Hsla),
-}
-
-impl SwitchColor {
-    fn get_colors(&self, is_on: bool, cx: &App) -> (Hsla, Hsla) {
-        if !is_on {
-            return (
-                cx.theme().colors().element_disabled,
-                cx.theme().colors().border,
-            );
-        }
-
-        match self {
-            SwitchColor::Accent => {
-                let status = cx.theme().status();
-                let colors = cx.theme().colors();
-                (status.info.opacity(0.4), colors.text_accent.opacity(0.2))
-            }
-            SwitchColor::Custom(color) => (*color, color.opacity(0.6)),
-        }
-    }
-}
-
-impl From<SwitchColor> for Color {
-    fn from(color: SwitchColor) -> Self {
-        match color {
-            SwitchColor::Accent => Color::Accent,
-            SwitchColor::Custom(_) => Color::Default,
-        }
-    }
-}
-
-/// Defines the color for a switch component.
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy, Default)]
-pub enum SwitchLabelPosition {
-    Start,
-    #[default]
-    End,
-}
-
-/// # Switch
-///
-/// Switches are used to represent opposite states, such as enabled or disabled.
-#[derive(IntoElement, RegisterComponent)]
-pub struct Switch {
-    id: ElementId,
-    toggle_state: ToggleState,
-    disabled: bool,
-    on_click: Option<Rc<dyn Fn(&ToggleState, &mut Window, &mut App) + 'static>>,
-    label: Option<SharedString>,
-    label_position: Option<SwitchLabelPosition>,
-    label_size: LabelSize,
-    full_width: bool,
-    key_binding: Option<KeyBinding>,
-    color: SwitchColor,
-    tab_index: Option<isize>,
-}
-
-impl Switch {
-    /// Creates a new [`Switch`].
-    pub fn new(id: impl Into<ElementId>, state: ToggleState) -> Self {
-        Self {
-            id: id.into(),
-            toggle_state: state,
-            disabled: false,
-            on_click: None,
-            label: None,
-            label_position: None,
-            label_size: LabelSize::Small,
-            full_width: false,
-            key_binding: None,
-            color: SwitchColor::default(),
-            tab_index: None,
-        }
-    }
-
-    /// Sets the color of the switch using the specified [`SwitchColor`].
-    pub fn color(mut self, color: SwitchColor) -> Self {
-        self.color = color;
-        self
-    }
-
-    /// Sets the disabled state of the [`Switch`].
-    pub fn disabled(mut self, disabled: bool) -> Self {
-        self.disabled = disabled;
-        self
-    }
-
-    /// Binds a handler to the [`Switch`] that will be called when clicked.
-    pub fn on_click(
-        mut self,
-        handler: impl Fn(&ToggleState, &mut Window, &mut App) + 'static,
-    ) -> Self {
-        self.on_click = Some(Rc::new(handler));
-        self
-    }
-
-    /// Sets the label of the [`Switch`].
-    pub fn label(mut self, label: impl Into<SharedString>) -> Self {
-        self.label = Some(label.into());
-        self
-    }
-
-    pub fn label_position(
-        mut self,
-        label_position: impl Into<Option<SwitchLabelPosition>>,
-    ) -> Self {
-        self.label_position = label_position.into();
-        self
-    }
-
-    pub fn label_size(mut self, size: LabelSize) -> Self {
-        self.label_size = size;
-        self
-    }
-
-    pub fn full_width(mut self, full_width: bool) -> Self {
-        self.full_width = full_width;
-        self
-    }
-
-    /// Display the keybinding that triggers the switch action.
-    pub fn key_binding(mut self, key_binding: impl Into<Option<KeyBinding>>) -> Self {
-        self.key_binding = key_binding.into();
-        self
-    }
-
-    pub fn tab_index(mut self, tab_index: impl Into<isize>) -> Self {
-        self.tab_index = Some(tab_index.into());
-        self
-    }
-}
-
-impl RenderOnce for Switch {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let is_on = self.toggle_state == ToggleState::Selected;
-        let adjust_ratio = if is_light(cx) { 1.5 } else { 1.0 };
-
-        let base_color = cx.theme().colors().text;
-        let thumb_color = base_color;
-        let (bg_color, border_color) = self.color.get_colors(is_on, cx);
-
-        let bg_hover_color = if is_on {
-            bg_color.blend(base_color.opacity(0.16 * adjust_ratio))
-        } else {
-            bg_color.blend(base_color.opacity(0.05 * adjust_ratio))
-        };
-
-        let thumb_opacity = match (is_on, self.disabled) {
-            (_, true) => 0.2,
-            (true, false) => 1.0,
-            (false, false) => 0.5,
-        };
-
-        let group_id = format!("switch_group_{:?}", self.id);
-        let label = self.label;
-
-        let switch = div()
-            .id((self.id.clone(), "switch"))
-            .p(px(1.0))
-            .border_2()
-            .border_color(cx.theme().colors().border_transparent)
-            .rounded_full()
-            .when_some(
-                self.tab_index.filter(|_| !self.disabled),
-                |this, tab_index| {
-                    this.tab_index(tab_index)
-                        .focus_visible(|mut style| {
-                            style.border_color = Some(cx.theme().colors().border_focused);
-                            style
-                        })
-                        .when_some(self.on_click.clone(), |this, on_click| {
-                            this.on_click(move |_, window, cx| {
-                                on_click(&self.toggle_state.inverse(), window, cx)
-                            })
-                        })
-                },
-            )
-            .child(
-                h_flex()
-                    .w(DynamicSpacing::Base32.rems(cx))
-                    .h(DynamicSpacing::Base20.rems(cx))
-                    .group(group_id.clone())
-                    .child(
-                        h_flex()
-                            .when(is_on, |on| on.justify_end())
-                            .when(!is_on, |off| off.justify_start())
-                            .size_full()
-                            .rounded_full()
-                            .px(DynamicSpacing::Base02.px(cx))
-                            .bg(bg_color)
-                            .when(!self.disabled, |this| {
-                                this.group_hover(group_id.clone(), |el| el.bg(bg_hover_color))
-                            })
-                            .border_1()
-                            .border_color(border_color)
-                            .child(
-                                div()
-                                    .size(DynamicSpacing::Base12.rems(cx))
-                                    .rounded_full()
-                                    .bg(thumb_color)
-                                    .opacity(thumb_opacity),
-                            ),
-                    ),
-            );
-
-        h_flex()
-            .id(self.id)
-            .cursor_pointer()
-            .gap(DynamicSpacing::Base06.rems(cx))
-            .when(self.full_width, |this| this.w_full().justify_between())
-            .when(
-                self.label_position == Some(SwitchLabelPosition::Start),
-                |this| {
-                    this.when_some(label.clone(), |this, label| {
-                        this.child(Label::new(label).size(self.label_size))
-                    })
-                },
-            )
-            .child(switch)
-            .when(
-                self.label_position == Some(SwitchLabelPosition::End),
-                |this| {
-                    this.when_some(label, |this, label| {
-                        this.child(Label::new(label).size(self.label_size))
-                    })
-                },
-            )
-            .children(self.key_binding)
-            .when_some(
-                self.on_click.filter(|_| !self.disabled),
-                |this, on_click| {
-                    this.on_click(move |_, window, cx| {
-                        on_click(&self.toggle_state.inverse(), window, cx)
-                    })
-                },
-            )
-    }
-}
-
-/// # SwitchField
-///
-/// A field component that combines a label, description, and switch into one reusable component.
-///
-/// # Examples
-///
-/// ```
-/// use ui::prelude::*;
-/// use ui::{SwitchField, ToggleState};
-///
-/// let switch_field = SwitchField::new(
-///     "feature-toggle",
-///     Some("Enable feature"),
-///     Some("This feature adds new functionality to the app.".into()),
-///     ToggleState::Unselected,
-///     |state, window, cx| {
-///         // Logic here
-///     }
-/// );
-/// ```
-#[derive(IntoElement, RegisterComponent)]
-pub struct SwitchField {
-    id: ElementId,
-    label: Option<SharedString>,
-    description: Option<SharedString>,
-    toggle_state: ToggleState,
-    on_click: Arc<dyn Fn(&ToggleState, &mut Window, &mut App) + 'static>,
-    disabled: bool,
-    color: SwitchColor,
-    tooltip: Option<Rc<dyn Fn(&mut Window, &mut App) -> AnyView>>,
-    tab_index: Option<isize>,
-}
-
-impl SwitchField {
-    pub fn new(
-        id: impl Into<ElementId>,
-        label: Option<impl Into<SharedString>>,
-        description: Option<SharedString>,
-        toggle_state: impl Into<ToggleState>,
-        on_click: impl Fn(&ToggleState, &mut Window, &mut App) + 'static,
-    ) -> Self {
-        Self {
-            id: id.into(),
-            label: label.map(Into::into),
-            description,
-            toggle_state: toggle_state.into(),
-            on_click: Arc::new(on_click),
-            disabled: false,
-            color: SwitchColor::Accent,
-            tooltip: None,
-            tab_index: None,
-        }
-    }
-
-    pub fn description(mut self, description: impl Into<SharedString>) -> Self {
-        self.description = Some(description.into());
-        self
-    }
-
-    pub fn disabled(mut self, disabled: bool) -> Self {
-        self.disabled = disabled;
-        self
-    }
-
-    /// Sets the color of the switch using the specified [`SwitchColor`].
-    /// This changes the color scheme of the switch when it's in the "on" state.
-    pub fn color(mut self, color: SwitchColor) -> Self {
-        self.color = color;
-        self
-    }
-
-    pub fn tooltip(mut self, tooltip: impl Fn(&mut Window, &mut App) -> AnyView + 'static) -> Self {
-        self.tooltip = Some(Rc::new(tooltip));
-        self
-    }
-
-    pub fn tab_index(mut self, tab_index: isize) -> Self {
-        self.tab_index = Some(tab_index);
-        self
-    }
-}
-
-impl RenderOnce for SwitchField {
-    fn render(self, _window: &mut Window, _cx: &mut App) -> impl IntoElement {
-        let tooltip = self
-            .tooltip
-            .zip(self.label.clone())
-            .map(|(tooltip_fn, label)| {
-                h_flex().gap_0p5().child(Label::new(label)).child(
-                    IconButton::new("tooltip_button", IconName::Info)
-                        .icon_size(IconSize::XSmall)
-                        .icon_color(Color::Muted)
-                        .shape(crate::IconButtonShape::Square)
-                        .style(ButtonStyle::Transparent)
-                        .tooltip({
-                            let tooltip = tooltip_fn.clone();
-                            move |window, cx| tooltip(window, cx)
-                        })
-                        .on_click(|_, _, _| {}), // Intentional empty on click handler so that clicking on the info tooltip icon doesn't trigger the switch toggle
-                )
-            });
-
-        h_flex()
-            .id((self.id.clone(), "container"))
-            .when(!self.disabled, |this| {
-                this.hover(|this| this.cursor_pointer())
-            })
-            .w_full()
-            .gap_4()
-            .justify_between()
-            .flex_wrap()
-            .child(match (&self.description, tooltip) {
-                (Some(description), Some(tooltip)) => v_flex()
-                    .gap_0p5()
-                    .max_w_5_6()
-                    .child(tooltip)
-                    .child(Label::new(description.clone()).color(Color::Muted))
-                    .into_any_element(),
-                (Some(description), None) => v_flex()
-                    .gap_0p5()
-                    .max_w_5_6()
-                    .when_some(self.label, |this, label| this.child(Label::new(label)))
-                    .child(Label::new(description.clone()).color(Color::Muted))
-                    .into_any_element(),
-                (None, Some(tooltip)) => tooltip.into_any_element(),
-                (None, None) => {
-                    if let Some(label) = self.label.clone() {
-                        Label::new(label).into_any_element()
-                    } else {
-                        gpui::Empty.into_any_element()
-                    }
-                }
-            })
-            .child(
-                Switch::new((self.id.clone(), "switch"), self.toggle_state)
-                    .color(self.color)
-                    .disabled(self.disabled)
-                    .when_some(
-                        self.tab_index.filter(|_| !self.disabled),
-                        |this, tab_index| this.tab_index(tab_index),
-                    )
-                    .on_click({
-                        let on_click = self.on_click.clone();
-                        move |state, window, cx| {
-                            (on_click)(state, window, cx);
-                        }
-                    }),
-            )
-            .when(!self.disabled, |this| {
-                this.on_click({
-                    let on_click = self.on_click.clone();
-                    let toggle_state = self.toggle_state;
-                    move |_click, window, cx| {
-                        (on_click)(&toggle_state.inverse(), window, cx);
-                    }
-                })
-            })
-    }
-}
-
-impl Component for SwitchField {
-    fn scope() -> ComponentScope {
-        ComponentScope::Input
-    }
-
-    fn description() -> Option<&'static str> {
-        Some("A field component that combines a label, description, and switch")
-    }
-
-    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
-        Some(
-            v_flex()
-                .gap_6()
-                .children(vec![
-                    example_group_with_title(
-                        "States",
-                        vec![
-                            single_example(
-                                "Unselected",
-                                SwitchField::new(
-                                    "switch_field_unselected",
-                                    Some("Enable notifications"),
-                                    Some("Receive notifications when new messages arrive.".into()),
-                                    ToggleState::Unselected,
-                                    |_, _, _| {},
-                                )
-                                .into_any_element(),
-                            ),
-                            single_example(
-                                "Selected",
-                                SwitchField::new(
-                                    "switch_field_selected",
-                                    Some("Enable notifications"),
-                                    Some("Receive notifications when new messages arrive.".into()),
-                                    ToggleState::Selected,
-                                    |_, _, _| {},
-                                )
-                                .into_any_element(),
-                            ),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "Colors",
-                        vec![
-                            single_example(
-                                "Default",
-                                SwitchField::new(
-                                    "switch_field_default",
-                                    Some("Default color"),
-                                    Some("This uses the default switch color.".into()),
-                                    ToggleState::Selected,
-                                    |_, _, _| {},
-                                )
-                                .into_any_element(),
-                            ),
-                            single_example(
-                                "Accent",
-                                SwitchField::new(
-                                    "switch_field_accent",
-                                    Some("Accent color"),
-                                    Some("This uses the accent color scheme.".into()),
-                                    ToggleState::Selected,
-                                    |_, _, _| {},
-                                )
-                                .color(SwitchColor::Accent)
-                                .into_any_element(),
-                            ),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "Disabled",
-                        vec![single_example(
-                            "Disabled",
-                            SwitchField::new(
-                                "switch_field_disabled",
-                                Some("Disabled field"),
-                                Some("This field is disabled and cannot be toggled.".into()),
-                                ToggleState::Selected,
-                                |_, _, _| {},
-                            )
-                            .disabled(true)
-                            .into_any_element(),
-                        )],
-                    ),
-                    example_group_with_title(
-                        "No Description",
-                        vec![single_example(
-                            "No Description",
-                            SwitchField::new(
-                                "switch_field_disabled",
-                                Some("Disabled field"),
-                                None,
-                                ToggleState::Selected,
-                                |_, _, _| {},
-                            )
-                            .into_any_element(),
-                        )],
-                    ),
-                    example_group_with_title(
-                        "With Tooltip",
-                        vec![
-                            single_example(
-                                "Tooltip with Description",
-                                SwitchField::new(
-                                    "switch_field_tooltip_with_desc",
-                                    Some("Nice Feature"),
-                                    Some("Enable advanced configuration options.".into()),
-                                    ToggleState::Unselected,
-                                    |_, _, _| {},
-                                )
-                                .tooltip(Tooltip::text("This is content for this tooltip!"))
-                                .into_any_element(),
-                            ),
-                            single_example(
-                                "Tooltip without Description",
-                                SwitchField::new(
-                                    "switch_field_tooltip_no_desc",
-                                    Some("Nice Feature"),
-                                    None,
-                                    ToggleState::Selected,
-                                    |_, _, _| {},
-                                )
-                                .tooltip(Tooltip::text("This is content for this tooltip!"))
-                                .into_any_element(),
-                            ),
-                        ],
-                    ),
-                ])
-                .into_any_element(),
-        )
-    }
-}
-
-impl Component for Checkbox {
-    fn scope() -> ComponentScope {
-        ComponentScope::Input
-    }
-
-    fn description() -> Option<&'static str> {
-        Some("A checkbox component that can be used for multiple choice selections")
-    }
-
-    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
-        Some(
-            v_flex()
-                .gap_6()
-                .children(vec![
-                    example_group_with_title(
-                        "States",
-                        vec![
-                            single_example(
-                                "Unselected",
-                                Checkbox::new("checkbox_unselected", ToggleState::Unselected)
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Placeholder",
-                                Checkbox::new("checkbox_indeterminate", ToggleState::Selected)
-                                    .placeholder(true)
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Indeterminate",
-                                Checkbox::new("checkbox_indeterminate", ToggleState::Indeterminate)
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Selected",
-                                Checkbox::new("checkbox_selected", ToggleState::Selected)
-                                    .into_any_element(),
-                            ),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "Styles",
-                        vec![
-                            single_example(
-                                "Default",
-                                Checkbox::new("checkbox_default", ToggleState::Selected)
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Filled",
-                                Checkbox::new("checkbox_filled", ToggleState::Selected)
-                                    .fill()
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "ElevationBased",
-                                Checkbox::new("checkbox_elevation", ToggleState::Selected)
-                                    .style(ToggleStyle::ElevationBased(
-                                        ElevationIndex::EditorSurface,
-                                    ))
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Custom Color",
-                                Checkbox::new("checkbox_custom", ToggleState::Selected)
-                                    .style(ToggleStyle::Custom(hsla(142.0 / 360., 0.68, 0.45, 0.7)))
-                                    .into_any_element(),
-                            ),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "Disabled",
-                        vec![
-                            single_example(
-                                "Unselected",
-                                Checkbox::new(
-                                    "checkbox_disabled_unselected",
-                                    ToggleState::Unselected,
-                                )
-                                .disabled(true)
-                                .into_any_element(),
-                            ),
-                            single_example(
-                                "Selected",
-                                Checkbox::new("checkbox_disabled_selected", ToggleState::Selected)
-                                    .disabled(true)
-                                    .into_any_element(),
-                            ),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "With Label",
-                        vec![single_example(
-                            "Default",
-                            Checkbox::new("checkbox_with_label", ToggleState::Selected)
-                                .label("Always save on quit")
-                                .into_any_element(),
-                        )],
-                    ),
-                    example_group_with_title(
-                        "Extra",
-                        vec![single_example(
-                            "Visualization-Only",
-                            Checkbox::new("viz_only", ToggleState::Selected)
-                                .visualization_only(true)
-                                .into_any_element(),
-                        )],
-                    ),
-                ])
-                .into_any_element(),
-        )
-    }
-}
-
-impl Component for Switch {
-    fn scope() -> ComponentScope {
-        ComponentScope::Input
-    }
-
-    fn description() -> Option<&'static str> {
-        Some("A switch component that represents binary states like on/off")
-    }
-
-    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
-        Some(
-            v_flex()
-                .gap_6()
-                .children(vec![
-                    example_group_with_title(
-                        "States",
-                        vec![
-                            single_example(
-                                "Off",
-                                Switch::new("switch_off", ToggleState::Unselected)
-                                    .on_click(|_, _, _cx| {})
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "On",
-                                Switch::new("switch_on", ToggleState::Selected)
-                                    .on_click(|_, _, _cx| {})
-                                    .into_any_element(),
-                            ),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "Colors",
-                        vec![
-                            single_example(
-                                "Accent (Default)",
-                                Switch::new("switch_accent_style", ToggleState::Selected)
-                                    .on_click(|_, _, _cx| {})
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Custom",
-                                Switch::new("switch_custom_style", ToggleState::Selected)
-                                    .color(SwitchColor::Custom(hsla(300.0 / 360.0, 0.6, 0.6, 1.0)))
-                                    .on_click(|_, _, _cx| {})
-                                    .into_any_element(),
-                            ),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "Disabled",
-                        vec![
-                            single_example(
-                                "Off",
-                                Switch::new("switch_disabled_off", ToggleState::Unselected)
-                                    .disabled(true)
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "On",
-                                Switch::new("switch_disabled_on", ToggleState::Selected)
-                                    .disabled(true)
-                                    .into_any_element(),
-                            ),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "With Label",
-                        vec![
-                            single_example(
-                                "Start Label",
-                                Switch::new("switch_with_label_start", ToggleState::Selected)
-                                    .label("Always save on quit")
-                                    .label_position(SwitchLabelPosition::Start)
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "End Label",
-                                Switch::new("switch_with_label_end", ToggleState::Selected)
-                                    .label("Always save on quit")
-                                    .label_position(SwitchLabelPosition::End)
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "Default Size Label",
-                                Switch::new(
-                                    "switch_with_label_default_size",
-                                    ToggleState::Selected,
-                                )
-                                .label("Always save on quit")
-                                .label_size(LabelSize::Default)
-                                .into_any_element(),
-                            ),
-                            single_example(
-                                "Small Size Label",
-                                Switch::new("switch_with_label_small_size", ToggleState::Selected)
-                                    .label("Always save on quit")
-                                    .label_size(LabelSize::Small)
-                                    .into_any_element(),
-                            ),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "With Keybinding",
-                        vec![single_example(
-                            "Keybinding",
-                            Switch::new("switch_with_keybinding", ToggleState::Selected)
-                                .key_binding(Some(KeyBinding::from_keystrokes(
-                                    vec![KeybindingKeystroke::from_keystroke(
-                                        Keystroke::parse("cmd-s").unwrap(),
-                                    )]
-                                    .into(),
-                                    KeybindSource::Base,
-                                )))
-                                .into_any_element(),
-                        )],
-                    ),
-                ])
-                .into_any_element(),
-        )
-    }
-}
diff --git a/crates/ui/src/components/tooltip.rs b/crates/ui/src/components/tooltip.rs
deleted file mode 100644
index 8b4ff3f731..0000000000
--- a/crates/ui/src/components/tooltip.rs
+++ /dev/null
@@ -1,297 +0,0 @@
-use std::borrow::Borrow;
-use std::rc::Rc;
-
-use gpui::{Action, AnyElement, AnyView, AppContext, FocusHandle, IntoElement, Render};
-use settings::Settings;
-use theme::ThemeSettings;
-
-use crate::prelude::*;
-use crate::{Color, KeyBinding, Label, LabelSize, StyledExt, h_flex, v_flex};
-
-#[derive(RegisterComponent)]
-pub struct Tooltip {
-    title: Title,
-    meta: Option<SharedString>,
-    key_binding: Option<KeyBinding>,
-}
-
-#[derive(Clone, IntoElement)]
-enum Title {
-    Str(SharedString),
-    Callback(Rc<dyn Fn(&mut Window, &mut App) -> AnyElement>),
-}
-
-impl From<SharedString> for Title {
-    fn from(value: SharedString) -> Self {
-        Title::Str(value)
-    }
-}
-
-impl RenderOnce for Title {
-    fn render(self, window: &mut Window, cx: &mut App) -> impl gpui::IntoElement {
-        match self {
-            Title::Str(title) => title.into_any_element(),
-            Title::Callback(element) => element(window, cx),
-        }
-    }
-}
-
-impl Tooltip {
-    pub fn simple(title: impl Into<SharedString>, cx: &mut App) -> AnyView {
-        cx.new(|_| Self {
-            title: Title::Str(title.into()),
-            meta: None,
-            key_binding: None,
-        })
-        .into()
-    }
-
-    pub fn text(title: impl Into<SharedString>) -> impl Fn(&mut Window, &mut App) -> AnyView {
-        let title = title.into();
-        move |_, cx| {
-            cx.new(|_| Self {
-                title: title.clone().into(),
-                meta: None,
-                key_binding: None,
-            })
-            .into()
-        }
-    }
-
-    pub fn for_action_title<T: Into<SharedString>>(
-        title: T,
-        action: &dyn Action,
-    ) -> impl Fn(&mut Window, &mut App) -> AnyView + use<T> {
-        let title = title.into();
-        let action = action.boxed_clone();
-        move |_, cx| {
-            cx.new(|cx| Self {
-                title: Title::Str(title.clone()),
-                meta: None,
-                key_binding: Some(KeyBinding::for_action(action.as_ref(), cx)),
-            })
-            .into()
-        }
-    }
-
-    pub fn for_action_title_in<Str: Into<SharedString>>(
-        title: Str,
-        action: &dyn Action,
-        focus_handle: &FocusHandle,
-    ) -> impl Fn(&mut Window, &mut App) -> AnyView + use<Str> {
-        let title = title.into();
-        let action = action.boxed_clone();
-        let focus_handle = focus_handle.clone();
-        move |_, cx| {
-            cx.new(|cx| Self {
-                title: Title::Str(title.clone()),
-                meta: None,
-                key_binding: Some(KeyBinding::for_action_in(
-                    action.as_ref(),
-                    &focus_handle,
-                    cx,
-                )),
-            })
-            .into()
-        }
-    }
-
-    pub fn for_action(
-        title: impl Into<SharedString>,
-        action: &dyn Action,
-        cx: &mut App,
-    ) -> AnyView {
-        cx.new(|cx| Self {
-            title: Title::Str(title.into()),
-            meta: None,
-            key_binding: Some(KeyBinding::for_action(action, cx)),
-        })
-        .into()
-    }
-
-    pub fn for_action_in(
-        title: impl Into<SharedString>,
-        action: &dyn Action,
-        focus_handle: &FocusHandle,
-        cx: &mut App,
-    ) -> AnyView {
-        cx.new(|cx| Self {
-            title: title.into().into(),
-            meta: None,
-            key_binding: Some(KeyBinding::for_action_in(action, focus_handle, cx)),
-        })
-        .into()
-    }
-
-    pub fn with_meta(
-        title: impl Into<SharedString>,
-        action: Option<&dyn Action>,
-        meta: impl Into<SharedString>,
-        cx: &mut App,
-    ) -> AnyView {
-        cx.new(|cx| Self {
-            title: title.into().into(),
-            meta: Some(meta.into()),
-            key_binding: action.map(|action| KeyBinding::for_action(action, cx)),
-        })
-        .into()
-    }
-
-    pub fn with_meta_in(
-        title: impl Into<SharedString>,
-        action: Option<&dyn Action>,
-        meta: impl Into<SharedString>,
-        focus_handle: &FocusHandle,
-        cx: &mut App,
-    ) -> AnyView {
-        cx.new(|cx| Self {
-            title: title.into().into(),
-            meta: Some(meta.into()),
-            key_binding: action.map(|action| KeyBinding::for_action_in(action, focus_handle, cx)),
-        })
-        .into()
-    }
-
-    pub fn new(title: impl Into<SharedString>) -> Self {
-        Self {
-            title: title.into().into(),
-            meta: None,
-            key_binding: None,
-        }
-    }
-
-    pub fn new_element(title: impl Fn(&mut Window, &mut App) -> AnyElement + 'static) -> Self {
-        Self {
-            title: Title::Callback(Rc::new(title)),
-            meta: None,
-            key_binding: None,
-        }
-    }
-
-    pub fn element(
-        title: impl Fn(&mut Window, &mut App) -> AnyElement + 'static,
-    ) -> impl Fn(&mut Window, &mut App) -> AnyView {
-        let title = Title::Callback(Rc::new(title));
-        move |_, cx| {
-            let title = title.clone();
-            cx.new(|_| Self {
-                title,
-                meta: None,
-                key_binding: None,
-            })
-            .into()
-        }
-    }
-
-    pub fn meta(mut self, meta: impl Into<SharedString>) -> Self {
-        self.meta = Some(meta.into());
-        self
-    }
-
-    pub fn key_binding(mut self, key_binding: impl Into<Option<KeyBinding>>) -> Self {
-        self.key_binding = key_binding.into();
-        self
-    }
-}
-
-impl Render for Tooltip {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        tooltip_container(cx, |el, _| {
-            el.child(
-                h_flex()
-                    .gap_4()
-                    .child(div().max_w_72().child(self.title.clone()))
-                    .when_some(self.key_binding.clone(), |this, key_binding| {
-                        this.justify_between().child(key_binding)
-                    }),
-            )
-            .when_some(self.meta.clone(), |this, meta| {
-                this.child(
-                    div()
-                        .max_w_72()
-                        .child(Label::new(meta).size(LabelSize::Small).color(Color::Muted)),
-                )
-            })
-        })
-    }
-}
-
-pub fn tooltip_container<C>(cx: &mut C, f: impl FnOnce(Div, &mut C) -> Div) -> impl IntoElement
-where
-    C: AppContext + Borrow<App>,
-{
-    let app = (*cx).borrow();
-    let ui_font = ThemeSettings::get_global(app).ui_font.clone();
-
-    // padding to avoid tooltip appearing right below the mouse cursor
-    div().pl_2().pt_2p5().child(
-        v_flex()
-            .elevation_2(app)
-            .font(ui_font)
-            .text_ui(app)
-            .text_color(app.theme().colors().text)
-            .py_1()
-            .px_2()
-            .map(|el| f(el, cx)),
-    )
-}
-
-pub struct LinkPreview {
-    link: SharedString,
-}
-
-impl LinkPreview {
-    pub fn new(url: &str, cx: &mut App) -> AnyView {
-        let mut wrapped_url = String::new();
-        for (i, ch) in url.chars().enumerate() {
-            if i == 500 {
-                wrapped_url.push('…');
-                break;
-            }
-            if i % 100 == 0 && i != 0 {
-                wrapped_url.push('\n');
-            }
-            wrapped_url.push(ch);
-        }
-        cx.new(|_| LinkPreview {
-            link: wrapped_url.into(),
-        })
-        .into()
-    }
-}
-
-impl Render for LinkPreview {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        tooltip_container(cx, |el, _| {
-            el.child(
-                Label::new(self.link.clone())
-                    .size(LabelSize::XSmall)
-                    .color(Color::Muted),
-            )
-        })
-    }
-}
-
-impl Component for Tooltip {
-    fn scope() -> ComponentScope {
-        ComponentScope::DataDisplay
-    }
-
-    fn description() -> Option<&'static str> {
-        Some(
-            "A tooltip that appears when hovering over an element, optionally showing a keybinding or additional metadata.",
-        )
-    }
-
-    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
-        Some(
-            example_group(vec![single_example(
-                "Text only",
-                Button::new("delete-example", "Delete")
-                    .tooltip(Tooltip::text("This is a tooltip!"))
-                    .into_any_element(),
-            )])
-            .into_any_element(),
-        )
-    }
-}
diff --git a/crates/ui/src/components/tree_view_item.rs b/crates/ui/src/components/tree_view_item.rs
deleted file mode 100644
index c96800223d..0000000000
--- a/crates/ui/src/components/tree_view_item.rs
+++ /dev/null
@@ -1,294 +0,0 @@
-use std::sync::Arc;
-
-use gpui::{AnyElement, AnyView, ClickEvent, MouseButton, MouseDownEvent};
-
-use crate::{Disclosure, prelude::*};
-
-#[derive(IntoElement, RegisterComponent)]
-pub struct TreeViewItem {
-    id: ElementId,
-    group_name: Option<SharedString>,
-    label: SharedString,
-    expanded: bool,
-    selected: bool,
-    disabled: bool,
-    focused: bool,
-    default_expanded: bool,
-    root_item: bool,
-    tooltip: Option<Box<dyn Fn(&mut Window, &mut App) -> AnyView + 'static>>,
-    on_click: Option<Box<dyn Fn(&ClickEvent, &mut Window, &mut App) + 'static>>,
-    on_hover: Option<Box<dyn Fn(&bool, &mut Window, &mut App) + 'static>>,
-    on_toggle: Option<Arc<dyn Fn(&ClickEvent, &mut Window, &mut App) + 'static>>,
-    on_secondary_mouse_down: Option<Box<dyn Fn(&MouseDownEvent, &mut Window, &mut App) + 'static>>,
-    tab_index: Option<isize>,
-    focus_handle: Option<gpui::FocusHandle>,
-}
-
-impl TreeViewItem {
-    pub fn new(id: impl Into<ElementId>, label: impl Into<SharedString>) -> Self {
-        Self {
-            id: id.into(),
-            group_name: None,
-            label: label.into(),
-            expanded: false,
-            selected: false,
-            disabled: false,
-            focused: false,
-            default_expanded: false,
-            root_item: false,
-            tooltip: None,
-            on_click: None,
-            on_hover: None,
-            on_toggle: None,
-            on_secondary_mouse_down: None,
-            tab_index: None,
-            focus_handle: None,
-        }
-    }
-
-    pub fn group_name(mut self, group_name: impl Into<SharedString>) -> Self {
-        self.group_name = Some(group_name.into());
-        self
-    }
-
-    pub fn on_click(
-        mut self,
-        handler: impl Fn(&ClickEvent, &mut Window, &mut App) + 'static,
-    ) -> Self {
-        self.on_click = Some(Box::new(handler));
-        self
-    }
-
-    pub fn on_hover(mut self, handler: impl Fn(&bool, &mut Window, &mut App) + 'static) -> Self {
-        self.on_hover = Some(Box::new(handler));
-        self
-    }
-
-    pub fn on_secondary_mouse_down(
-        mut self,
-        handler: impl Fn(&MouseDownEvent, &mut Window, &mut App) + 'static,
-    ) -> Self {
-        self.on_secondary_mouse_down = Some(Box::new(handler));
-        self
-    }
-
-    pub fn tooltip(mut self, tooltip: impl Fn(&mut Window, &mut App) -> AnyView + 'static) -> Self {
-        self.tooltip = Some(Box::new(tooltip));
-        self
-    }
-
-    pub fn tab_index(mut self, tab_index: isize) -> Self {
-        self.tab_index = Some(tab_index);
-        self
-    }
-
-    pub fn expanded(mut self, toggle: bool) -> Self {
-        self.expanded = toggle;
-        self
-    }
-
-    pub fn default_expanded(mut self, default_expanded: bool) -> Self {
-        self.default_expanded = default_expanded;
-        self
-    }
-
-    pub fn on_toggle(
-        mut self,
-        on_toggle: impl Fn(&ClickEvent, &mut Window, &mut App) + 'static,
-    ) -> Self {
-        self.on_toggle = Some(Arc::new(on_toggle));
-        self
-    }
-
-    pub fn root_item(mut self, root_item: bool) -> Self {
-        self.root_item = root_item;
-        self
-    }
-
-    pub fn focused(mut self, focused: bool) -> Self {
-        self.focused = focused;
-        self
-    }
-
-    pub fn track_focus(mut self, focus_handle: &gpui::FocusHandle) -> Self {
-        self.focus_handle = Some(focus_handle.clone());
-        self
-    }
-}
-
-impl Disableable for TreeViewItem {
-    fn disabled(mut self, disabled: bool) -> Self {
-        self.disabled = disabled;
-        self
-    }
-}
-
-impl Toggleable for TreeViewItem {
-    fn toggle_state(mut self, selected: bool) -> Self {
-        self.selected = selected;
-        self
-    }
-}
-
-impl RenderOnce for TreeViewItem {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let selected_bg = cx.theme().colors().element_active.opacity(0.5);
-
-        let transparent_border = cx.theme().colors().border.opacity(0.);
-        let selected_border = cx.theme().colors().border.opacity(0.4);
-        let focused_border = cx.theme().colors().border_focused;
-
-        let item_size = rems_from_px(28.);
-        let indentation_line = h_flex().size(item_size).flex_none().justify_center().child(
-            div()
-                .w_px()
-                .h_full()
-                .bg(cx.theme().colors().border.opacity(0.5)),
-        );
-
-        h_flex()
-            .id(self.id)
-            .when_some(self.group_name, |this, group| this.group(group))
-            .w_full()
-            .child(
-                h_flex()
-                    .id("inner_tree_view_item")
-                    .cursor_pointer()
-                    .size_full()
-                    .h(item_size)
-                    .rounded_sm()
-                    .border_1()
-                    .border_color(transparent_border)
-                    .focus_visible(|s| s.border_color(focused_border))
-                    .when(self.selected, |this| {
-                        this.border_color(selected_border).bg(selected_bg)
-                    })
-                    .hover(|s| s.bg(cx.theme().colors().element_hover))
-                    .map(|this| {
-                        let label = self.label;
-
-                        if self.root_item {
-                            this.px_1()
-                                .gap_2p5()
-                                .child(
-                                    Disclosure::new("toggle", self.expanded)
-                                        .when_some(
-                                            self.on_toggle.clone(),
-                                            |disclosure, on_toggle| {
-                                                disclosure.on_toggle_expanded(on_toggle)
-                                            },
-                                        )
-                                        .opened_icon(IconName::ChevronDown)
-                                        .closed_icon(IconName::ChevronRight),
-                                )
-                                .child(
-                                    Label::new(label)
-                                        .when(!self.selected, |this| this.color(Color::Muted)),
-                                )
-                        } else {
-                            this.child(indentation_line).child(
-                                h_flex()
-                                    .id("nested_inner_tree_view_item")
-                                    .w_full()
-                                    .flex_grow()
-                                    .px_1()
-                                    .child(
-                                        Label::new(label)
-                                            .when(!self.selected, |this| this.color(Color::Muted)),
-                                    ),
-                            )
-                        }
-                    })
-                    .when_some(self.focus_handle, |this, handle| this.track_focus(&handle))
-                    .when_some(self.tab_index, |this, index| this.tab_index(index))
-                    .when_some(self.on_hover, |this, on_hover| this.on_hover(on_hover))
-                    .when_some(
-                        self.on_click.filter(|_| !self.disabled),
-                        |this, on_click| this.on_click(on_click),
-                    )
-                    .when_some(self.on_secondary_mouse_down, |this, on_mouse_down| {
-                        this.on_mouse_down(MouseButton::Right, move |event, window, cx| {
-                            (on_mouse_down)(event, window, cx)
-                        })
-                    })
-                    .when_some(self.tooltip, |this, tooltip| this.tooltip(tooltip)),
-            )
-    }
-}
-
-impl Component for TreeViewItem {
-    fn scope() -> ComponentScope {
-        ComponentScope::Navigation
-    }
-
-    fn description() -> Option<&'static str> {
-        Some(
-            "A hierarchical list of items that may have a parent-child relationship where children can be toggled into view by expanding or collapsing their parent item.",
-        )
-    }
-
-    fn preview(_window: &mut Window, cx: &mut App) -> Option<AnyElement> {
-        let container = || {
-            v_flex()
-                .p_2()
-                .w_64()
-                .border_1()
-                .border_color(cx.theme().colors().border_variant)
-                .bg(cx.theme().colors().panel_background)
-        };
-
-        Some(
-            example_group(vec![
-                single_example(
-                    "Basic Tree View",
-                    container()
-                        .child(
-                            TreeViewItem::new("index-1", "Tree Item Root #1")
-                                .root_item(true)
-                                .toggle_state(true),
-                        )
-                        .child(TreeViewItem::new("index-2", "Tree Item #2"))
-                        .child(TreeViewItem::new("index-3", "Tree Item #3"))
-                        .child(TreeViewItem::new("index-4", "Tree Item Root #2").root_item(true))
-                        .child(TreeViewItem::new("index-5", "Tree Item #5"))
-                        .child(TreeViewItem::new("index-6", "Tree Item #6"))
-                        .into_any_element(),
-                ),
-                single_example(
-                    "Active Child",
-                    container()
-                        .child(TreeViewItem::new("index-1", "Tree Item Root #1").root_item(true))
-                        .child(TreeViewItem::new("index-2", "Tree Item #2").toggle_state(true))
-                        .child(TreeViewItem::new("index-3", "Tree Item #3"))
-                        .into_any_element(),
-                ),
-                single_example(
-                    "Focused Parent",
-                    container()
-                        .child(
-                            TreeViewItem::new("index-1", "Tree Item Root #1")
-                                .root_item(true)
-                                .focused(true)
-                                .toggle_state(true),
-                        )
-                        .child(TreeViewItem::new("index-2", "Tree Item #2"))
-                        .child(TreeViewItem::new("index-3", "Tree Item #3"))
-                        .into_any_element(),
-                ),
-                single_example(
-                    "Focused Child",
-                    container()
-                        .child(
-                            TreeViewItem::new("index-1", "Tree Item Root #1")
-                                .root_item(true)
-                                .toggle_state(true),
-                        )
-                        .child(TreeViewItem::new("index-2", "Tree Item #2").focused(true))
-                        .child(TreeViewItem::new("index-3", "Tree Item #3"))
-                        .into_any_element(),
-                ),
-            ])
-            .into_any_element(),
-        )
-    }
-}
diff --git a/crates/ui/src/prelude.rs b/crates/ui/src/prelude.rs
deleted file mode 100644
index 0357e498bb..0000000000
--- a/crates/ui/src/prelude.rs
+++ /dev/null
@@ -1,35 +0,0 @@
-//! The prelude of this crate. When building UI in Zed you almost always want to import this.
-
-pub use gpui::prelude::*;
-pub use gpui::{
-    AbsoluteLength, AnyElement, App, Context, DefiniteLength, Div, Element, ElementId,
-    InteractiveElement, ParentElement, Pixels, Rems, RenderOnce, SharedString, Styled, Window, div,
-    px, relative, rems,
-};
-
-pub use component::{
-    Component, ComponentScope, example_group, example_group_with_title, single_example,
-};
-pub use ui_macros::RegisterComponent;
-
-pub use crate::DynamicSpacing;
-pub use crate::animation::{AnimationDirection, AnimationDuration, DefaultAnimations};
-pub use crate::styles::{
-    PlatformStyle, Severity, StyledTypography, TextSize, rems_from_px, vh, vw,
-};
-pub use crate::traits::clickable::*;
-pub use crate::traits::disableable::*;
-pub use crate::traits::fixed::*;
-pub use crate::traits::styled_ext::*;
-pub use crate::traits::toggleable::*;
-pub use crate::traits::visible_on_hover::*;
-pub use crate::{Button, ButtonSize, ButtonStyle, IconButton, SelectableButton};
-pub use crate::{ButtonCommon, Color};
-pub use crate::{Headline, HeadlineSize};
-pub use crate::{Icon, IconName, IconPosition, IconSize};
-pub use crate::{Label, LabelCommon, LabelSize, LineHeightStyle, LoadingLabel};
-pub use crate::{h_container, h_flex, v_container, v_flex};
-pub use crate::{
-    h_group, h_group_lg, h_group_sm, h_group_xl, v_group, v_group_lg, v_group_sm, v_group_xl,
-};
-pub use theme::ActiveTheme;
diff --git a/crates/ui/src/styles.rs b/crates/ui/src/styles.rs
deleted file mode 100644
index bc2399f54b..0000000000
--- a/crates/ui/src/styles.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-pub mod animation;
-mod appearance;
-mod color;
-mod elevation;
-mod platform;
-mod severity;
-mod spacing;
-mod typography;
-mod units;
-
-pub use appearance::*;
-pub use color::*;
-pub use elevation::*;
-pub use platform::*;
-pub use severity::*;
-pub use spacing::*;
-pub use typography::*;
-pub use units::*;
diff --git a/crates/ui/src/styles/animation.rs b/crates/ui/src/styles/animation.rs
deleted file mode 100644
index acea834548..0000000000
--- a/crates/ui/src/styles/animation.rs
+++ /dev/null
@@ -1,290 +0,0 @@
-use crate::{ContentGroup, prelude::*};
-use gpui::{AnimationElement, AnimationExt, Styled};
-use std::time::Duration;
-
-use gpui::ease_out_quint;
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub enum AnimationDuration {
-    Instant = 50,
-    Fast = 150,
-    Slow = 300,
-}
-
-impl AnimationDuration {
-    pub fn duration(&self) -> Duration {
-        Duration::from_millis(*self as u64)
-    }
-}
-
-impl Into<std::time::Duration> for AnimationDuration {
-    fn into(self) -> Duration {
-        self.duration()
-    }
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub enum AnimationDirection {
-    FromBottom,
-    FromLeft,
-    FromRight,
-    FromTop,
-}
-
-pub trait DefaultAnimations: Styled + Sized + Element {
-    fn animate_in(
-        self,
-        animation_type: AnimationDirection,
-        fade_in: bool,
-    ) -> AnimationElement<Self> {
-        let animation_name = match animation_type {
-            AnimationDirection::FromBottom => "animate_from_bottom",
-            AnimationDirection::FromLeft => "animate_from_left",
-            AnimationDirection::FromRight => "animate_from_right",
-            AnimationDirection::FromTop => "animate_from_top",
-        };
-
-        let animation_id = self.id().map_or_else(
-            || ElementId::from(animation_name),
-            |id| (id, animation_name).into(),
-        );
-
-        self.with_animation(
-            animation_id,
-            gpui::Animation::new(AnimationDuration::Fast.into()).with_easing(ease_out_quint()),
-            move |mut this, delta| {
-                let start_opacity = 0.4;
-                let start_pos = 0.0;
-                let end_pos = 40.0;
-
-                if fade_in {
-                    this = this.opacity(start_opacity + delta * (1.0 - start_opacity));
-                }
-
-                match animation_type {
-                    AnimationDirection::FromBottom => {
-                        this.bottom(px(start_pos + delta * (end_pos - start_pos)))
-                    }
-                    AnimationDirection::FromLeft => {
-                        this.left(px(start_pos + delta * (end_pos - start_pos)))
-                    }
-                    AnimationDirection::FromRight => {
-                        this.right(px(start_pos + delta * (end_pos - start_pos)))
-                    }
-                    AnimationDirection::FromTop => {
-                        this.top(px(start_pos + delta * (end_pos - start_pos)))
-                    }
-                }
-            },
-        )
-    }
-
-    fn animate_in_from_bottom(self, fade: bool) -> AnimationElement<Self> {
-        self.animate_in(AnimationDirection::FromBottom, fade)
-    }
-
-    fn animate_in_from_left(self, fade: bool) -> AnimationElement<Self> {
-        self.animate_in(AnimationDirection::FromLeft, fade)
-    }
-
-    fn animate_in_from_right(self, fade: bool) -> AnimationElement<Self> {
-        self.animate_in(AnimationDirection::FromRight, fade)
-    }
-
-    fn animate_in_from_top(self, fade: bool) -> AnimationElement<Self> {
-        self.animate_in(AnimationDirection::FromTop, fade)
-    }
-}
-
-impl<E: Styled + Element> DefaultAnimations for E {}
-
-// Don't use this directly, it only exists to show animation previews
-#[derive(RegisterComponent)]
-struct Animation {}
-
-impl Component for Animation {
-    fn scope() -> ComponentScope {
-        ComponentScope::Utilities
-    }
-
-    fn description() -> Option<&'static str> {
-        Some("Demonstrates various animation patterns and transitions available in the UI system.")
-    }
-
-    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
-        let container_size = 128.0;
-        let element_size = 32.0;
-        let offset = container_size / 2.0 - element_size / 2.0;
-        Some(
-            v_flex()
-                .gap_6()
-                .children(vec![
-                    example_group_with_title(
-                        "Animate In",
-                        vec![
-                            single_example(
-                                "From Bottom",
-                                ContentGroup::new()
-                                    .relative()
-                                    .items_center()
-                                    .justify_center()
-                                    .size(px(container_size))
-                                    .child(
-                                        div()
-                                            .id("animate-in-from-bottom")
-                                            .absolute()
-                                            .size(px(element_size))
-                                            .left(px(offset))
-                                            .rounded_md()
-                                            .bg(gpui::red())
-                                            .animate_in_from_bottom(false),
-                                    )
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "From Top",
-                                ContentGroup::new()
-                                    .relative()
-                                    .items_center()
-                                    .justify_center()
-                                    .size(px(container_size))
-                                    .child(
-                                        div()
-                                            .id("animate-in-from-top")
-                                            .absolute()
-                                            .size(px(element_size))
-                                            .left(px(offset))
-                                            .rounded_md()
-                                            .bg(gpui::blue())
-                                            .animate_in_from_top(false),
-                                    )
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "From Left",
-                                ContentGroup::new()
-                                    .relative()
-                                    .items_center()
-                                    .justify_center()
-                                    .size(px(container_size))
-                                    .child(
-                                        div()
-                                            .id("animate-in-from-left")
-                                            .absolute()
-                                            .size(px(element_size))
-                                            .top(px(offset))
-                                            .rounded_md()
-                                            .bg(gpui::green())
-                                            .animate_in_from_left(false),
-                                    )
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "From Right",
-                                ContentGroup::new()
-                                    .relative()
-                                    .items_center()
-                                    .justify_center()
-                                    .size(px(container_size))
-                                    .child(
-                                        div()
-                                            .id("animate-in-from-right")
-                                            .absolute()
-                                            .size(px(element_size))
-                                            .top(px(offset))
-                                            .rounded_md()
-                                            .bg(gpui::yellow())
-                                            .animate_in_from_right(false),
-                                    )
-                                    .into_any_element(),
-                            ),
-                        ],
-                    )
-                    .grow(),
-                    example_group_with_title(
-                        "Fade and Animate In",
-                        vec![
-                            single_example(
-                                "From Bottom",
-                                ContentGroup::new()
-                                    .relative()
-                                    .items_center()
-                                    .justify_center()
-                                    .size(px(container_size))
-                                    .child(
-                                        div()
-                                            .id("fade-animate-in-from-bottom")
-                                            .absolute()
-                                            .size(px(element_size))
-                                            .left(px(offset))
-                                            .rounded_md()
-                                            .bg(gpui::red())
-                                            .animate_in_from_bottom(true),
-                                    )
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "From Top",
-                                ContentGroup::new()
-                                    .relative()
-                                    .items_center()
-                                    .justify_center()
-                                    .size(px(container_size))
-                                    .child(
-                                        div()
-                                            .id("fade-animate-in-from-top")
-                                            .absolute()
-                                            .size(px(element_size))
-                                            .left(px(offset))
-                                            .rounded_md()
-                                            .bg(gpui::blue())
-                                            .animate_in_from_top(true),
-                                    )
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "From Left",
-                                ContentGroup::new()
-                                    .relative()
-                                    .items_center()
-                                    .justify_center()
-                                    .size(px(container_size))
-                                    .child(
-                                        div()
-                                            .id("fade-animate-in-from-left")
-                                            .absolute()
-                                            .size(px(element_size))
-                                            .top(px(offset))
-                                            .rounded_md()
-                                            .bg(gpui::green())
-                                            .animate_in_from_left(true),
-                                    )
-                                    .into_any_element(),
-                            ),
-                            single_example(
-                                "From Right",
-                                ContentGroup::new()
-                                    .relative()
-                                    .items_center()
-                                    .justify_center()
-                                    .size(px(container_size))
-                                    .child(
-                                        div()
-                                            .id("fade-animate-in-from-right")
-                                            .absolute()
-                                            .size(px(element_size))
-                                            .top(px(offset))
-                                            .rounded_md()
-                                            .bg(gpui::yellow())
-                                            .animate_in_from_right(true),
-                                    )
-                                    .into_any_element(),
-                            ),
-                        ],
-                    )
-                    .grow(),
-                ])
-                .into_any_element(),
-        )
-    }
-}
diff --git a/crates/ui/src/styles/appearance.rs b/crates/ui/src/styles/appearance.rs
deleted file mode 100644
index 007511584e..0000000000
--- a/crates/ui/src/styles/appearance.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-use crate::prelude::*;
-use gpui::{App, WindowBackgroundAppearance};
-
-/// Returns the [WindowBackgroundAppearance].
-fn window_appearance(cx: &mut App) -> WindowBackgroundAppearance {
-    cx.theme().styles.window_background_appearance
-}
-
-/// Returns if the window and it's surfaces are expected
-/// to be transparent.
-///
-/// Helps determine if you need to take extra steps to prevent
-/// transparent backgrounds.
-pub fn theme_is_transparent(cx: &mut App) -> bool {
-    matches!(
-        window_appearance(cx),
-        WindowBackgroundAppearance::Transparent | WindowBackgroundAppearance::Blurred
-    )
-}
diff --git a/crates/ui/src/styles/color.rs b/crates/ui/src/styles/color.rs
deleted file mode 100644
index 586b2ccc57..0000000000
--- a/crates/ui/src/styles/color.rs
+++ /dev/null
@@ -1,244 +0,0 @@
-use crate::{Label, LabelCommon, component_prelude::*, v_flex};
-use documented::{DocumentedFields, DocumentedVariants};
-use gpui::{App, Hsla, IntoElement, ParentElement, Styled};
-use theme::ActiveTheme;
-
-/// Sets a color that has a consistent meaning across all themes.
-#[derive(
-    Debug,
-    Default,
-    Eq,
-    PartialEq,
-    Copy,
-    Clone,
-    RegisterComponent,
-    Documented,
-    DocumentedFields,
-    DocumentedVariants,
-)]
-pub enum Color {
-    #[default]
-    /// The default text color. Might be known as "foreground" or "primary" in
-    /// some theme systems.
-    ///
-    /// For less emphasis, consider using [`Color::Muted`] or [`Color::Hidden`].
-    Default,
-    /// A text color used for accents, such as links or highlights.
-    Accent,
-    /// A color used to indicate a conflict, such as a version control merge conflict, or a conflict between a file in the editor and the file system.
-    Conflict,
-    /// A color used to indicate a newly created item, such as a new file in
-    /// version control, or a new file on disk.
-    Created,
-    /// It is highly, HIGHLY recommended not to use this! Using this color
-    /// means detaching it from any semantic meaning across themes.
-    ///
-    /// A custom color specified by an HSLA value.
-    Custom(Hsla),
-    /// A color used for all debugger UI elements.
-    Debugger,
-    /// A color used to indicate a deleted item, such as a file removed from version control.
-    Deleted,
-    /// A color used for disabled UI elements or text, like a disabled button or menu item.
-    Disabled,
-    /// A color used to indicate an error condition, or something the user
-    /// cannot do. In very rare cases, it might be used to indicate dangerous or
-    /// destructive action.
-    Error,
-    /// A color used for elements that represent something that is hidden, like
-    /// a hidden file, or an element that should be visually de-emphasized.
-    Hidden,
-    /// A color used for hint or suggestion text, often a blue color. Use this
-    /// color to represent helpful, or semantically neutral information.
-    Hint,
-    /// A color used for items that are intentionally ignored, such as files ignored by version control.
-    Ignored,
-    /// A color used for informational messages or status indicators, often a blue color.
-    Info,
-    /// A color used to indicate a modified item, such as an edited file, or a modified entry in version control.
-    Modified,
-    /// A color used for text or UI elements that should be visually muted or de-emphasized.
-    ///
-    /// For more emphasis, consider using [`Color::Default`].
-    ///
-    /// For less emphasis, consider using [`Color::Hidden`].
-    Muted,
-    /// A color used for placeholder text in input fields.
-    Placeholder,
-    /// A color associated with a specific player number.
-    Player(u32),
-    /// A color used to indicate selected text or UI elements.
-    Selected,
-    /// A color used to indicate a successful operation or status.
-    Success,
-    /// A version control color used to indicate a newly added file or content in version control.
-    VersionControlAdded,
-    /// A version control color used to indicate conflicting changes that need resolution.
-    VersionControlConflict,
-    /// A version control color used to indicate a file or content that has been deleted in version control.
-    VersionControlDeleted,
-    /// A version control color used to indicate files or content that is being ignored by version control.
-    VersionControlIgnored,
-    /// A version control color used to indicate modified files or content in version control.
-    VersionControlModified,
-    /// A color used to indicate a warning condition.
-    Warning,
-}
-
-impl Color {
-    /// Returns the Color's HSLA value.
-    pub fn color(&self, cx: &App) -> Hsla {
-        match self {
-            Color::Default => cx.theme().colors().text,
-            Color::Muted => cx.theme().colors().text_muted,
-            Color::Created => cx.theme().status().created,
-            Color::Modified => cx.theme().status().modified,
-            Color::Conflict => cx.theme().status().conflict,
-            Color::Ignored => cx.theme().status().ignored,
-            Color::Debugger => cx.theme().colors().debugger_accent,
-            Color::Deleted => cx.theme().status().deleted,
-            Color::Disabled => cx.theme().colors().text_disabled,
-            Color::Hidden => cx.theme().status().hidden,
-            Color::Hint => cx.theme().status().hint,
-            Color::Info => cx.theme().status().info,
-            Color::Placeholder => cx.theme().colors().text_placeholder,
-            Color::Accent => cx.theme().colors().text_accent,
-            Color::Player(i) => cx.theme().styles.player.color_for_participant(*i).cursor,
-            Color::Error => cx.theme().status().error,
-            Color::Selected => cx.theme().colors().text_accent,
-            Color::Success => cx.theme().status().success,
-            Color::VersionControlAdded => cx.theme().colors().version_control_added,
-            Color::VersionControlConflict => cx.theme().colors().version_control_conflict,
-            Color::VersionControlDeleted => cx.theme().colors().version_control_deleted,
-            Color::VersionControlIgnored => cx.theme().colors().version_control_ignored,
-            Color::VersionControlModified => cx.theme().colors().version_control_modified,
-            Color::Warning => cx.theme().status().warning,
-            Color::Custom(color) => *color,
-        }
-    }
-}
-
-impl From<Hsla> for Color {
-    fn from(color: Hsla) -> Self {
-        Color::Custom(color)
-    }
-}
-
-impl Component for Color {
-    fn scope() -> ComponentScope {
-        ComponentScope::Utilities
-    }
-
-    fn description() -> Option<&'static str> {
-        Some(Color::DOCS)
-    }
-
-    fn preview(_window: &mut gpui::Window, _cx: &mut App) -> Option<gpui::AnyElement> {
-        Some(
-            v_flex()
-                .gap_6()
-                .children(vec![
-                    example_group_with_title(
-                        "Text Colors",
-                        vec![
-                            single_example(
-                                "Default",
-                                Label::new("Default text color")
-                                    .color(Color::Default)
-                                    .into_any_element(),
-                            )
-                            .description(Color::Default.get_variant_docs()),
-                            single_example(
-                                "Muted",
-                                Label::new("Muted text color")
-                                    .color(Color::Muted)
-                                    .into_any_element(),
-                            )
-                            .description(Color::Muted.get_variant_docs()),
-                            single_example(
-                                "Accent",
-                                Label::new("Accent text color")
-                                    .color(Color::Accent)
-                                    .into_any_element(),
-                            )
-                            .description(Color::Accent.get_variant_docs()),
-                            single_example(
-                                "Disabled",
-                                Label::new("Disabled text color")
-                                    .color(Color::Disabled)
-                                    .into_any_element(),
-                            )
-                            .description(Color::Disabled.get_variant_docs()),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "Status Colors",
-                        vec![
-                            single_example(
-                                "Success",
-                                Label::new("Success status")
-                                    .color(Color::Success)
-                                    .into_any_element(),
-                            )
-                            .description(Color::Success.get_variant_docs()),
-                            single_example(
-                                "Warning",
-                                Label::new("Warning status")
-                                    .color(Color::Warning)
-                                    .into_any_element(),
-                            )
-                            .description(Color::Warning.get_variant_docs()),
-                            single_example(
-                                "Error",
-                                Label::new("Error status")
-                                    .color(Color::Error)
-                                    .into_any_element(),
-                            )
-                            .description(Color::Error.get_variant_docs()),
-                            single_example(
-                                "Info",
-                                Label::new("Info status")
-                                    .color(Color::Info)
-                                    .into_any_element(),
-                            )
-                            .description(Color::Info.get_variant_docs()),
-                        ],
-                    ),
-                    example_group_with_title(
-                        "Version Control Colors",
-                        vec![
-                            single_example(
-                                "Created",
-                                Label::new("Created item")
-                                    .color(Color::Created)
-                                    .into_any_element(),
-                            )
-                            .description(Color::Created.get_variant_docs()),
-                            single_example(
-                                "Modified",
-                                Label::new("Modified item")
-                                    .color(Color::Modified)
-                                    .into_any_element(),
-                            )
-                            .description(Color::Modified.get_variant_docs()),
-                            single_example(
-                                "Deleted",
-                                Label::new("Deleted item")
-                                    .color(Color::Deleted)
-                                    .into_any_element(),
-                            )
-                            .description(Color::Deleted.get_variant_docs()),
-                            single_example(
-                                "Conflict",
-                                Label::new("Conflict item")
-                                    .color(Color::Conflict)
-                                    .into_any_element(),
-                            )
-                            .description(Color::Conflict.get_variant_docs()),
-                        ],
-                    ),
-                ])
-                .into_any_element(),
-        )
-    }
-}
diff --git a/crates/ui/src/styles/elevation.rs b/crates/ui/src/styles/elevation.rs
deleted file mode 100644
index 35e8e499b9..0000000000
--- a/crates/ui/src/styles/elevation.rs
+++ /dev/null
@@ -1,129 +0,0 @@
-use std::fmt::{self, Display, Formatter};
-
-use gpui::{App, BoxShadow, Hsla, hsla, point, px};
-use theme::{ActiveTheme, Appearance};
-
-/// Today, elevation is primarily used to add shadows to elements, and set the correct background for elements like buttons.
-///
-/// Elevation can be thought of as the physical closeness of an element to the
-/// user. Elements with lower elevations are physically further away on the
-/// z-axis and appear to be underneath elements with higher elevations.
-///
-/// In the future, a more complete approach to elevation may be added.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum ElevationIndex {
-    /// On the layer of the app background. This is under panels, panes, and
-    /// other surfaces.
-    Background,
-    /// The primary surface – Contains panels, panes, containers, etc.
-    Surface,
-    /// The same elevation as the primary surface, but used for the editable areas, like buffers
-    EditorSurface,
-    /// A surface that is elevated above the primary surface. but below washes, models, and dragged elements.
-    ElevatedSurface,
-    /// A surface above the [ElevationIndex::ElevatedSurface] that is used for dialogs, alerts, modals, etc.
-    ModalSurface,
-}
-
-impl Display for ElevationIndex {
-    fn fmt(&self, f: &mut Formatter) -> fmt::Result {
-        match self {
-            ElevationIndex::Background => write!(f, "Background"),
-            ElevationIndex::Surface => write!(f, "Surface"),
-            ElevationIndex::EditorSurface => write!(f, "Editor Surface"),
-            ElevationIndex::ElevatedSurface => write!(f, "Elevated Surface"),
-            ElevationIndex::ModalSurface => write!(f, "Modal Surface"),
-        }
-    }
-}
-
-impl ElevationIndex {
-    /// Returns an appropriate shadow for the given elevation index.
-    pub fn shadow(self, cx: &App) -> Vec<BoxShadow> {
-        let is_light = cx.theme().appearance() == Appearance::Light;
-
-        match self {
-            ElevationIndex::Surface => vec![],
-            ElevationIndex::EditorSurface => vec![],
-
-            ElevationIndex::ElevatedSurface => vec![
-                BoxShadow {
-                    color: hsla(0., 0., 0., 0.12),
-                    offset: point(px(0.), px(2.)),
-                    blur_radius: px(3.),
-                    spread_radius: px(0.),
-                },
-                BoxShadow {
-                    color: hsla(0., 0., 0., if is_light { 0.03 } else { 0.06 }),
-                    offset: point(px(1.), px(1.)),
-                    blur_radius: px(0.),
-                    spread_radius: px(0.),
-                },
-            ],
-
-            ElevationIndex::ModalSurface => vec![
-                BoxShadow {
-                    color: hsla(0., 0., 0., if is_light { 0.06 } else { 0.12 }),
-                    offset: point(px(0.), px(2.)),
-                    blur_radius: px(3.),
-                    spread_radius: px(0.),
-                },
-                BoxShadow {
-                    color: hsla(0., 0., 0., if is_light { 0.06 } else { 0.08 }),
-                    offset: point(px(0.), px(3.)),
-                    blur_radius: px(6.),
-                    spread_radius: px(0.),
-                },
-                BoxShadow {
-                    color: hsla(0., 0., 0., 0.04),
-                    offset: point(px(0.), px(6.)),
-                    blur_radius: px(12.),
-                    spread_radius: px(0.),
-                },
-                BoxShadow {
-                    color: hsla(0., 0., 0., if is_light { 0.04 } else { 0.12 }),
-                    offset: point(px(1.), px(1.)),
-                    blur_radius: px(0.),
-                    spread_radius: px(0.),
-                },
-            ],
-
-            _ => vec![],
-        }
-    }
-
-    /// Returns the background color for the given elevation index.
-    pub fn bg(&self, cx: &mut App) -> Hsla {
-        match self {
-            ElevationIndex::Background => cx.theme().colors().background,
-            ElevationIndex::Surface => cx.theme().colors().surface_background,
-            ElevationIndex::EditorSurface => cx.theme().colors().editor_background,
-            ElevationIndex::ElevatedSurface => cx.theme().colors().elevated_surface_background,
-            ElevationIndex::ModalSurface => cx.theme().colors().elevated_surface_background,
-        }
-    }
-
-    /// Returns a color that is appropriate a filled element on this elevation
-    pub fn on_elevation_bg(&self, cx: &App) -> Hsla {
-        match self {
-            ElevationIndex::Background => cx.theme().colors().surface_background,
-            ElevationIndex::Surface => cx.theme().colors().background,
-            ElevationIndex::EditorSurface => cx.theme().colors().surface_background,
-            ElevationIndex::ElevatedSurface => cx.theme().colors().background,
-            ElevationIndex::ModalSurface => cx.theme().colors().background,
-        }
-    }
-
-    /// Attempts to return a darker background color than the current elevation index's background.
-    ///
-    /// If the current background color is already dark, it will return a lighter color instead.
-    pub fn darker_bg(&self, cx: &App) -> Hsla {
-        match self {
-            ElevationIndex::Background => cx.theme().colors().surface_background,
-            ElevationIndex::Surface => cx.theme().colors().editor_background,
-            ElevationIndex::EditorSurface => cx.theme().colors().surface_background,
-            ElevationIndex::ElevatedSurface => cx.theme().colors().editor_background,
-            ElevationIndex::ModalSurface => cx.theme().colors().editor_background,
-        }
-    }
-}
diff --git a/crates/ui/src/styles/platform.rs b/crates/ui/src/styles/platform.rs
deleted file mode 100644
index 0d873a2ff2..0000000000
--- a/crates/ui/src/styles/platform.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-/// The platform style to use when rendering UI.
-///
-/// This can be used to abstract over platform differences.
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
-pub enum PlatformStyle {
-    /// Display in macOS style.
-    Mac,
-    /// Display in Linux style.
-    Linux,
-    /// Display in Windows style.
-    Windows,
-}
-
-impl PlatformStyle {
-    /// Returns the [`PlatformStyle`] for the current platform.
-    pub const fn platform() -> Self {
-        if cfg!(any(target_os = "linux", target_os = "freebsd")) {
-            Self::Linux
-        } else if cfg!(target_os = "windows") {
-            Self::Windows
-        } else {
-            Self::Mac
-        }
-    }
-}
diff --git a/crates/ui/src/styles/severity.rs b/crates/ui/src/styles/severity.rs
deleted file mode 100644
index 464f835186..0000000000
--- a/crates/ui/src/styles/severity.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-/// Severity levels that determine the style of the component.
-/// Usually, it affects the background. Most of the time,
-/// it also follows with an icon corresponding the severity level.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum Severity {
-    Info,
-    Success,
-    Warning,
-    Error,
-}
diff --git a/crates/ui/src/styles/spacing.rs b/crates/ui/src/styles/spacing.rs
deleted file mode 100644
index c6629f5d88..0000000000
--- a/crates/ui/src/styles/spacing.rs
+++ /dev/null
@@ -1,55 +0,0 @@
-use gpui::{App, Pixels, Rems, px, rems};
-use settings::Settings;
-use theme::{ThemeSettings, UiDensity};
-use ui_macros::derive_dynamic_spacing;
-
-// Derives [DynamicSpacing]. See [ui_macros::derive_dynamic_spacing].
-//
-// There are 3 UI density settings: Compact, Default, and Comfortable.
-//
-// When a tuple of three values is provided, the values are used directly.
-//
-// Example: (1, 2, 4) => Compact: 1px, Default: 2px, Comfortable: 4px
-//
-// When a single value is provided, the standard spacing formula is
-// used to derive the of spacing values. This formula can be found in
-// the macro.
-//
-// Example:
-//
-// Assuming the standard formula is (n-4, n, n+4)
-//
-// 24 => Compact: 20px, Default: 24px, Comfortable: 28px
-//
-// The [DynamicSpacing] enum variants use a BaseXX format,
-// where XX = the pixel value @ default rem size and the default UI density.
-//
-// Example:
-//
-// DynamicSpacing::Base16 would return 16px at the default UI scale & density.
-derive_dynamic_spacing![
-    (0, 0, 0),
-    (1, 1, 2),
-    (1, 2, 4),
-    (2, 3, 4),
-    (2, 4, 6),
-    (3, 6, 8),
-    (4, 8, 10),
-    (10, 12, 14),
-    (14, 16, 18),
-    (18, 20, 22),
-    24,
-    32,
-    40,
-    48
-];
-
-/// Returns the current [`UiDensity`] setting. Use this to
-/// modify or show something in the UI other than spacing.
-///
-/// Do not use this to calculate spacing values.
-///
-/// Always use [DynamicSpacing] for spacing values.
-pub fn ui_density(cx: &mut App) -> UiDensity {
-    ThemeSettings::get_global(cx).ui_density
-}
diff --git a/crates/ui/src/styles/typography.rs b/crates/ui/src/styles/typography.rs
deleted file mode 100644
index 2bb0b35720..0000000000
--- a/crates/ui/src/styles/typography.rs
+++ /dev/null
@@ -1,295 +0,0 @@
-use crate::prelude::*;
-use gpui::{
-    AnyElement, App, IntoElement, ParentElement, Rems, RenderOnce, SharedString, Styled, Window,
-    div, rems,
-};
-use settings::Settings;
-use theme::{ActiveTheme, ThemeSettings};
-
-use crate::{Color, rems_from_px};
-
-/// Extends [`gpui::Styled`] with typography-related styling methods.
-pub trait StyledTypography: Styled + Sized {
-    /// Sets the font family to the buffer font.
-    fn font_buffer(self, cx: &App) -> Self {
-        let settings = ThemeSettings::get_global(cx);
-        let buffer_font_family = settings.buffer_font.family.clone();
-
-        self.font_family(buffer_font_family)
-    }
-
-    /// Sets the font family to the UI font.
-    fn font_ui(self, cx: &App) -> Self {
-        let settings = ThemeSettings::get_global(cx);
-        let ui_font_family = settings.ui_font.family.clone();
-
-        self.font_family(ui_font_family)
-    }
-
-    /// Sets the text size using a [`TextSize`].
-    fn text_ui_size(self, size: TextSize, cx: &App) -> Self {
-        self.text_size(size.rems(cx))
-    }
-
-    /// The large size for UI text.
-    ///
-    /// `1rem` or `16px` at the default scale of `1rem` = `16px`.
-    ///
-    /// Note: The absolute size of this text will change based on a user's `ui_scale` setting.
-    ///
-    /// Use `text_ui` for regular-sized text.
-    fn text_ui_lg(self, cx: &App) -> Self {
-        self.text_size(TextSize::Large.rems(cx))
-    }
-
-    /// The default size for UI text.
-    ///
-    /// `0.825rem` or `14px` at the default scale of `1rem` = `16px`.
-    ///
-    /// Note: The absolute size of this text will change based on a user's `ui_scale` setting.
-    ///
-    /// Use `text_ui_sm` for smaller text.
-    fn text_ui(self, cx: &App) -> Self {
-        self.text_size(TextSize::default().rems(cx))
-    }
-
-    /// The small size for UI text.
-    ///
-    /// `0.75rem` or `12px` at the default scale of `1rem` = `16px`.
-    ///
-    /// Note: The absolute size of this text will change based on a user's `ui_scale` setting.
-    ///
-    /// Use `text_ui` for regular-sized text.
-    fn text_ui_sm(self, cx: &App) -> Self {
-        self.text_size(TextSize::Small.rems(cx))
-    }
-
-    /// The extra small size for UI text.
-    ///
-    /// `0.625rem` or `10px` at the default scale of `1rem` = `16px`.
-    ///
-    /// Note: The absolute size of this text will change based on a user's `ui_scale` setting.
-    ///
-    /// Use `text_ui` for regular-sized text.
-    fn text_ui_xs(self, cx: &App) -> Self {
-        self.text_size(TextSize::XSmall.rems(cx))
-    }
-
-    /// The font size for buffer text.
-    ///
-    /// Retrieves the default font size, or the user's custom font size if set.
-    ///
-    /// This should only be used for text that is displayed in a buffer,
-    /// or other places that text needs to match the user's buffer font size.
-    fn text_buffer(self, cx: &App) -> Self {
-        let settings = ThemeSettings::get_global(cx);
-        self.text_size(settings.buffer_font_size(cx))
-    }
-}
-
-impl<E: Styled> StyledTypography for E {}
-
-/// A utility for getting the size of various semantic text sizes.
-#[derive(Debug, Default, Clone)]
-pub enum TextSize {
-    /// The default size for UI text.
-    ///
-    /// `0.825rem` or `14px` at the default scale of `1rem` = `16px`.
-    ///
-    /// Note: The absolute size of this text will change based on a user's `ui_scale` setting.
-    #[default]
-    Default,
-    /// The large size for UI text.
-    ///
-    /// `1rem` or `16px` at the default scale of `1rem` = `16px`.
-    ///
-    /// Note: The absolute size of this text will change based on a user's `ui_scale` setting.
-    Large,
-
-    /// The small size for UI text.
-    ///
-    /// `0.75rem` or `12px` at the default scale of `1rem` = `16px`.
-    ///
-    /// Note: The absolute size of this text will change based on a user's `ui_scale` setting.
-    Small,
-
-    /// The extra small size for UI text.
-    ///
-    /// `0.625rem` or `10px` at the default scale of `1rem` = `16px`.
-    ///
-    /// Note: The absolute size of this text will change based on a user's `ui_scale` setting.
-    XSmall,
-
-    /// The `ui_font_size` set by the user.
-    Ui,
-    /// The `buffer_font_size` set by the user.
-    Editor,
-    // TODO: The terminal settings will need to be passed to
-    // ThemeSettings before we can enable this.
-    //// The `terminal.font_size` set by the user.
-    // Terminal,
-}
-
-impl TextSize {
-    /// Returns the text size in rems.
-    pub fn rems(self, cx: &App) -> Rems {
-        let theme_settings = ThemeSettings::get_global(cx);
-
-        match self {
-            Self::Large => rems_from_px(16.),
-            Self::Default => rems_from_px(14.),
-            Self::Small => rems_from_px(12.),
-            Self::XSmall => rems_from_px(10.),
-            Self::Ui => rems_from_px(theme_settings.ui_font_size(cx)),
-            Self::Editor => rems_from_px(theme_settings.buffer_font_size(cx)),
-        }
-    }
-
-    pub fn pixels(self, cx: &App) -> Pixels {
-        let theme_settings = ThemeSettings::get_global(cx);
-
-        match self {
-            Self::Large => px(16.),
-            Self::Default => px(14.),
-            Self::Small => px(12.),
-            Self::XSmall => px(10.),
-            Self::Ui => theme_settings.ui_font_size(cx),
-            Self::Editor => theme_settings.buffer_font_size(cx),
-        }
-    }
-}
-
-/// The size of a [`Headline`] element
-///
-/// Defaults to a Major Second scale.
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy, Default)]
-pub enum HeadlineSize {
-    /// An extra small headline - `~14px` @16px/rem
-    XSmall,
-    /// A small headline - `16px` @16px/rem
-    Small,
-    #[default]
-    /// A medium headline - `~18px` @16px/rem
-    Medium,
-    /// A large headline - `~20px` @16px/rem
-    Large,
-    /// An extra large headline - `~22px` @16px/rem
-    XLarge,
-}
-
-impl HeadlineSize {
-    /// Returns the headline size in rems.
-    pub fn rems(self) -> Rems {
-        match self {
-            Self::XSmall => rems(0.88),
-            Self::Small => rems(1.0),
-            Self::Medium => rems(1.125),
-            Self::Large => rems(1.27),
-            Self::XLarge => rems(1.43),
-        }
-    }
-
-    /// Returns the line height for the headline size.
-    pub fn line_height(self) -> Rems {
-        match self {
-            Self::XSmall => rems(1.6),
-            Self::Small => rems(1.6),
-            Self::Medium => rems(1.6),
-            Self::Large => rems(1.6),
-            Self::XLarge => rems(1.6),
-        }
-    }
-}
-
-/// A headline element, used to emphasize some text and
-/// create a visual hierarchy.
-#[derive(IntoElement, RegisterComponent)]
-pub struct Headline {
-    size: HeadlineSize,
-    text: SharedString,
-    color: Color,
-}
-
-impl RenderOnce for Headline {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let ui_font = ThemeSettings::get_global(cx).ui_font.clone();
-
-        div()
-            .font(ui_font)
-            .line_height(self.size.line_height())
-            .text_size(self.size.rems())
-            .text_color(cx.theme().colors().text)
-            .child(self.text)
-    }
-}
-
-impl Headline {
-    /// Create a new headline element.
-    pub fn new(text: impl Into<SharedString>) -> Self {
-        Self {
-            size: HeadlineSize::default(),
-            text: text.into(),
-            color: Color::default(),
-        }
-    }
-
-    /// Set the size of the headline.
-    pub fn size(mut self, size: HeadlineSize) -> Self {
-        self.size = size;
-        self
-    }
-
-    /// Set the color of the headline.
-    pub fn color(mut self, color: Color) -> Self {
-        self.color = color;
-        self
-    }
-}
-
-impl Component for Headline {
-    fn scope() -> ComponentScope {
-        ComponentScope::Typography
-    }
-
-    fn description() -> Option<&'static str> {
-        Some("A headline element used to emphasize text and create visual hierarchy in the UI.")
-    }
-
-    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
-        Some(
-            v_flex()
-                .gap_1()
-                .children(vec![
-                    single_example(
-                        "XLarge",
-                        Headline::new("XLarge Headline")
-                            .size(HeadlineSize::XLarge)
-                            .into_any_element(),
-                    ),
-                    single_example(
-                        "Large",
-                        Headline::new("Large Headline")
-                            .size(HeadlineSize::Large)
-                            .into_any_element(),
-                    ),
-                    single_example(
-                        "Medium (Default)",
-                        Headline::new("Medium Headline").into_any_element(),
-                    ),
-                    single_example(
-                        "Small",
-                        Headline::new("Small Headline")
-                            .size(HeadlineSize::Small)
-                            .into_any_element(),
-                    ),
-                    single_example(
-                        "XSmall",
-                        Headline::new("XSmall Headline")
-                            .size(HeadlineSize::XSmall)
-                            .into_any_element(),
-                    ),
-                ])
-                .into_any_element(),
-        )
-    }
-}
diff --git a/crates/ui/src/styles/units.rs b/crates/ui/src/styles/units.rs
deleted file mode 100644
index 3fa6520204..0000000000
--- a/crates/ui/src/styles/units.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-use gpui::{Length, Rems, Window, rems};
-
-/// The base size of a rem, in pixels.
-pub const BASE_REM_SIZE_IN_PX: f32 = 16.;
-
-/// Returns a rem value derived from the provided pixel value and the base rem size (16px).
-///
-/// This can be used to compute rem values relative to pixel sizes, without
-/// needing to hard-code the rem value.
-///
-/// For instance, instead of writing `rems(0.875)` you can write `rems_from_px(14.)`
-#[inline(always)]
-pub fn rems_from_px(px: impl Into<f32>) -> Rems {
-    rems(px.into() / BASE_REM_SIZE_IN_PX)
-}
-
-/// Returns a [`Length`] corresponding to the specified percentage of the viewport's width.
-///
-/// `percent` should be a value between `0.0` and `1.0`.
-pub fn vw(percent: f32, window: &mut Window) -> Length {
-    Length::from(window.viewport_size().width * percent)
-}
-
-/// Returns a [`Length`] corresponding to the specified percentage of the viewport's height.
-///
-/// `percent` should be a value between `0.0` and `1.0`.
-pub fn vh(percent: f32, window: &mut Window) -> Length {
-    Length::from(window.viewport_size().height * percent)
-}
diff --git a/crates/ui/src/traits.rs b/crates/ui/src/traits.rs
deleted file mode 100644
index 9627f6d6ad..0000000000
--- a/crates/ui/src/traits.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-pub mod animation_ext;
-pub mod clickable;
-pub mod disableable;
-pub mod fixed;
-pub mod styled_ext;
-pub mod toggleable;
-pub mod transformable;
-pub mod visible_on_hover;
diff --git a/crates/ui/src/traits/animation_ext.rs b/crates/ui/src/traits/animation_ext.rs
deleted file mode 100644
index 4907c71ff2..0000000000
--- a/crates/ui/src/traits/animation_ext.rs
+++ /dev/null
@@ -1,42 +0,0 @@
-use std::time::Duration;
-
-use gpui::{Animation, AnimationElement, AnimationExt, Transformation, percentage};
-
-use crate::{prelude::*, traits::transformable::Transformable};
-
-/// An extension trait for adding common animations to animatable components.
-pub trait CommonAnimationExt: AnimationExt {
-    /// Render this component as rotating over the given duration.
-    ///
-    /// NOTE: This method uses the location of the caller to generate an ID for this state.
-    ///       If this is not sufficient to identify your state (e.g. you're rendering a list item),
-    ///       you can provide a custom ElementID using the `use_keyed_rotate_animation` method.
-    #[track_caller]
-    fn with_rotate_animation(self, duration: u64) -> AnimationElement<Self>
-    where
-        Self: Transformable + Sized,
-    {
-        self.with_keyed_rotate_animation(
-            ElementId::CodeLocation(*std::panic::Location::caller()),
-            duration,
-        )
-    }
-
-    /// Render this component as rotating with the given element ID over the given duration.
-    fn with_keyed_rotate_animation(
-        self,
-        id: impl Into<ElementId>,
-        duration: u64,
-    ) -> AnimationElement<Self>
-    where
-        Self: Transformable + Sized,
-    {
-        self.with_animation(
-            id,
-            Animation::new(Duration::from_secs(duration)).repeat(),
-            |component, delta| component.transform(Transformation::rotate(percentage(delta))),
-        )
-    }
-}
-
-impl<T: AnimationExt> CommonAnimationExt for T {}
diff --git a/crates/ui/src/traits/clickable.rs b/crates/ui/src/traits/clickable.rs
deleted file mode 100644
index 55a4986b20..0000000000
--- a/crates/ui/src/traits/clickable.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-use gpui::{App, ClickEvent, CursorStyle, Window};
-
-/// A trait for elements that can be clicked. Enables the use of the `on_click` method.
-pub trait Clickable {
-    /// Sets the click handler that will fire whenever the element is clicked.
-    fn on_click(self, handler: impl Fn(&ClickEvent, &mut Window, &mut App) + 'static) -> Self;
-    /// Sets the cursor style when hovering over the element.
-    fn cursor_style(self, cursor_style: CursorStyle) -> Self;
-}
diff --git a/crates/ui/src/traits/disableable.rs b/crates/ui/src/traits/disableable.rs
deleted file mode 100644
index 9f08ed8d12..0000000000
--- a/crates/ui/src/traits/disableable.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-/// A trait for elements that can be disabled. Generally used to implement disabling an element's interactivity and changing its appearance to reflect that it is disabled.
-pub trait Disableable {
-    /// Sets whether the element is disabled.
-    fn disabled(self, disabled: bool) -> Self;
-}
diff --git a/crates/ui/src/traits/fixed.rs b/crates/ui/src/traits/fixed.rs
deleted file mode 100644
index 6ca9c8617f..0000000000
--- a/crates/ui/src/traits/fixed.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-use gpui::DefiniteLength;
-
-/// A trait for elements that can have a fixed with. Enables the use of the `width` and `full_width` methods.
-pub trait FixedWidth {
-    /// Sets the width of the element.
-    fn width(self, width: impl Into<DefiniteLength>) -> Self;
-
-    /// Sets the element's width to the full width of its container.
-    fn full_width(self) -> Self;
-}
diff --git a/crates/ui/src/traits/styled_ext.rs b/crates/ui/src/traits/styled_ext.rs
deleted file mode 100644
index 849e56a024..0000000000
--- a/crates/ui/src/traits/styled_ext.rs
+++ /dev/null
@@ -1,134 +0,0 @@
-use gpui::{App, Styled, hsla};
-
-use crate::ElevationIndex;
-use crate::prelude::*;
-
-fn elevated<E: Styled>(this: E, cx: &App, index: ElevationIndex) -> E {
-    this.bg(cx.theme().colors().elevated_surface_background)
-        .rounded_lg()
-        .border_1()
-        .border_color(cx.theme().colors().border_variant)
-        .shadow(index.shadow(cx))
-}
-
-fn elevated_borderless<E: Styled>(this: E, cx: &mut App, index: ElevationIndex) -> E {
-    this.bg(cx.theme().colors().elevated_surface_background)
-        .rounded_lg()
-        .shadow(index.shadow(cx))
-}
-
-/// Extends [`gpui::Styled`] with Zed-specific styling methods.
-// gate on rust-analyzer so rust-analyzer never needs to expand this macro, it takes up to 10 seconds to expand due to inefficiencies in rust-analyzers proc-macro srv
-#[cfg_attr(
-    all(debug_assertions, not(rust_analyzer)),
-    gpui_macros::derive_inspector_reflection
-)]
-pub trait StyledExt: Styled + Sized {
-    /// Horizontally stacks elements.
-    ///
-    /// Sets `flex()`, `flex_row()`, `items_center()`
-    fn h_flex(self) -> Self {
-        self.flex().flex_row().items_center()
-    }
-
-    /// Vertically stacks elements.
-    ///
-    /// Sets `flex()`, `flex_col()`
-    fn v_flex(self) -> Self {
-        self.flex().flex_col()
-    }
-
-    /// The [`Surface`](ElevationIndex::Surface) elevation level, located above the app background, is the standard level for all elements
-    ///
-    /// Sets `bg()`, `rounded_lg()`, `border()`, `border_color()`, `shadow()`
-    ///
-    /// Example Elements: Title Bar, Panel, Tab Bar, Editor
-    fn elevation_1(self, cx: &App) -> Self {
-        elevated(self, cx, ElevationIndex::Surface)
-    }
-
-    /// See [`elevation_1`](Self::elevation_1).
-    ///
-    /// Renders a borderless version [`elevation_1`](Self::elevation_1).
-    fn elevation_1_borderless(self, cx: &mut App) -> Self {
-        elevated_borderless(self, cx, ElevationIndex::Surface)
-    }
-
-    /// Non-Modal Elevated Surfaces appear above the [`Surface`](ElevationIndex::Surface) layer and is used for things that should appear above most UI elements like an editor or panel, but not elements like popovers, context menus, modals, etc.
-    ///
-    /// Sets `bg()`, `rounded_lg()`, `border()`, `border_color()`, `shadow()`
-    ///
-    /// Examples: Notifications, Palettes, Detached/Floating Windows, Detached/Floating Panels
-    fn elevation_2(self, cx: &App) -> Self {
-        elevated(self, cx, ElevationIndex::ElevatedSurface)
-    }
-
-    /// See [`elevation_2`](Self::elevation_2).
-    ///
-    /// Renders a borderless version [`elevation_2`](Self::elevation_2).
-    fn elevation_2_borderless(self, cx: &mut App) -> Self {
-        elevated_borderless(self, cx, ElevationIndex::ElevatedSurface)
-    }
-
-    /// Modal Surfaces are used for elements that should appear above all other UI elements and are located above the wash layer. This is the maximum elevation at which UI elements can be rendered in their default state.
-    ///
-    /// Elements rendered at this layer should have an enforced behavior: Any interaction outside of the modal will either dismiss the modal or prompt an action (Save your progress, etc) then dismiss the modal.
-    ///
-    /// If the element does not have this behavior, it should be rendered at the [`Elevated Surface`](ElevationIndex::ElevatedSurface) layer.
-    ///
-    /// Sets `bg()`, `rounded_lg()`, `border()`, `border_color()`, `shadow()`
-    ///
-    /// Examples: Settings Modal, Channel Management, Wizards/Setup UI, Dialogs
-    fn elevation_3(self, cx: &App) -> Self {
-        elevated(self, cx, ElevationIndex::ModalSurface)
-    }
-
-    /// See [`elevation_3`](Self::elevation_3).
-    ///
-    /// Renders a borderless version [`elevation_3`](Self::elevation_3).
-    fn elevation_3_borderless(self, cx: &mut App) -> Self {
-        elevated_borderless(self, cx, ElevationIndex::ModalSurface)
-    }
-
-    /// The theme's primary border color.
-    fn border_primary(self, cx: &mut App) -> Self {
-        self.border_color(cx.theme().colors().border)
-    }
-
-    /// The theme's secondary or muted border color.
-    fn border_muted(self, cx: &mut App) -> Self {
-        self.border_color(cx.theme().colors().border_variant)
-    }
-
-    /// Sets the background color to red for debugging when building UI.
-    fn debug_bg_red(self) -> Self {
-        self.bg(hsla(0. / 360., 1., 0.5, 1.))
-    }
-
-    /// Sets the background color to green for debugging when building UI.
-    fn debug_bg_green(self) -> Self {
-        self.bg(hsla(120. / 360., 1., 0.5, 1.))
-    }
-
-    /// Sets the background color to blue for debugging when building UI.
-    fn debug_bg_blue(self) -> Self {
-        self.bg(hsla(240. / 360., 1., 0.5, 1.))
-    }
-
-    /// Sets the background color to yellow for debugging when building UI.
-    fn debug_bg_yellow(self) -> Self {
-        self.bg(hsla(60. / 360., 1., 0.5, 1.))
-    }
-
-    /// Sets the background color to cyan for debugging when building UI.
-    fn debug_bg_cyan(self) -> Self {
-        self.bg(hsla(160. / 360., 1., 0.5, 1.))
-    }
-
-    /// Sets the background color to magenta for debugging when building UI.
-    fn debug_bg_magenta(self) -> Self {
-        self.bg(hsla(300. / 360., 1., 0.5, 1.))
-    }
-}
-
-impl<E: Styled> StyledExt for E {}
diff --git a/crates/ui/src/traits/toggleable.rs b/crates/ui/src/traits/toggleable.rs
deleted file mode 100644
index f731f9965e..0000000000
--- a/crates/ui/src/traits/toggleable.rs
+++ /dev/null
@@ -1,69 +0,0 @@
-/// A trait for elements that can be toggled.
-///
-/// Implement this for elements that are visually distinct
-/// when in two opposing states, like checkboxes or switches.
-pub trait Toggleable {
-    /// Sets whether the element is selected.
-    fn toggle_state(self, selected: bool) -> Self;
-}
-
-/// Represents the selection status of an element.
-#[derive(Debug, Default, PartialEq, Eq, Hash, Clone, Copy)]
-pub enum ToggleState {
-    /// The element is not selected.
-    #[default]
-    Unselected,
-    /// The selection state of the element is indeterminate.
-    Indeterminate,
-    /// The element is selected.
-    Selected,
-}
-
-impl ToggleState {
-    /// Returns the inverse of the current selection status.
-    ///
-    /// Indeterminate states become selected if inverted.
-    pub fn inverse(&self) -> Self {
-        match self {
-            Self::Unselected | Self::Indeterminate => Self::Selected,
-            Self::Selected => Self::Unselected,
-        }
-    }
-
-    /// Creates a `ToggleState` from the given `any_checked` and `all_checked` flags.
-    pub fn from_any_and_all(any_checked: bool, all_checked: bool) -> Self {
-        match (any_checked, all_checked) {
-            (true, true) => Self::Selected,
-            (false, false) => Self::Unselected,
-            _ => Self::Indeterminate,
-        }
-    }
-
-    /// Returns whether this toggle state is selected
-    pub fn selected(&self) -> bool {
-        match self {
-            ToggleState::Indeterminate | ToggleState::Unselected => false,
-            ToggleState::Selected => true,
-        }
-    }
-}
-
-impl From<bool> for ToggleState {
-    fn from(selected: bool) -> Self {
-        if selected {
-            Self::Selected
-        } else {
-            Self::Unselected
-        }
-    }
-}
-
-impl From<Option<bool>> for ToggleState {
-    fn from(selected: Option<bool>) -> Self {
-        match selected {
-            Some(true) => Self::Selected,
-            Some(false) => Self::Unselected,
-            None => Self::Indeterminate,
-        }
-    }
-}
diff --git a/crates/ui/src/traits/transformable.rs b/crates/ui/src/traits/transformable.rs
deleted file mode 100644
index f52141f304..0000000000
--- a/crates/ui/src/traits/transformable.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-use gpui::Transformation;
-
-/// A trait for components that can be transformed.
-pub trait Transformable {
-    /// Sets the transformation for the element.
-    fn transform(self, transformation: Transformation) -> Self;
-}
diff --git a/crates/ui/src/traits/visible_on_hover.rs b/crates/ui/src/traits/visible_on_hover.rs
deleted file mode 100644
index fc0bb837d7..0000000000
--- a/crates/ui/src/traits/visible_on_hover.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-use gpui::{InteractiveElement, SharedString, Styled};
-
-/// A trait for elements that can be made visible on hover by
-/// tracking a specific group.
-pub trait VisibleOnHover {
-    /// Sets the element to only be visible when the specified group is hovered.
-    ///
-    /// Pass `""` as the `group_name` to use the global group.
-    fn visible_on_hover(self, group_name: impl Into<SharedString>) -> Self;
-}
-
-impl<E: InteractiveElement + Styled> VisibleOnHover for E {
-    fn visible_on_hover(self, group_name: impl Into<SharedString>) -> Self {
-        self.invisible()
-            .group_hover(group_name, |style| style.visible())
-    }
-}
diff --git a/crates/ui/src/ui.rs b/crates/ui/src/ui.rs
deleted file mode 100644
index 17e707f11b..0000000000
--- a/crates/ui/src/ui.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-//! # UI – Zed UI Primitives & Components
-//!
-//! This crate provides a set of UI primitives and components that are used to build all of the elements in Zed's UI.
-//!
-//! ## Related Crates:
-//!
-//! - [`ui_macros`] - proc_macros support for this crate
-//! - `ui_input` - the single line input component
-
-pub mod component_prelude;
-mod components;
-pub mod prelude;
-mod styles;
-mod traits;
-pub mod utils;
-
-pub use components::*;
-pub use prelude::*;
-pub use styles::*;
-pub use traits::animation_ext::*;
diff --git a/crates/ui/src/utils.rs b/crates/ui/src/utils.rs
deleted file mode 100644
index cd7d8eb497..0000000000
--- a/crates/ui/src/utils.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-//! UI-related utilities
-
-use gpui::App;
-use theme::ActiveTheme;
-
-mod apca_contrast;
-mod color_contrast;
-mod corner_solver;
-mod format_distance;
-mod search_input;
-mod with_rem_size;
-
-pub use apca_contrast::*;
-pub use color_contrast::*;
-pub use corner_solver::{CornerSolver, inner_corner_radius};
-pub use format_distance::*;
-pub use search_input::*;
-pub use with_rem_size::*;
-
-/// Returns true if the current theme is light or vibrant light.
-pub fn is_light(cx: &mut App) -> bool {
-    cx.theme().appearance.is_light()
-}
diff --git a/crates/ui/src/utils/apca_contrast.rs b/crates/ui/src/utils/apca_contrast.rs
deleted file mode 100644
index 341b44670d..0000000000
--- a/crates/ui/src/utils/apca_contrast.rs
+++ /dev/null
@@ -1,479 +0,0 @@
-use gpui::Hsla;
-
-/// APCA (Accessible Perceptual Contrast Algorithm) constants
-/// Based on APCA 0.0.98G-4g W3 compatible constants
-/// https://github.com/Myndex/apca-w3
-struct APCAConstants {
-    // Main TRC exponent for monitor perception
-    main_trc: f32,
-
-    // sRGB coefficients
-    s_rco: f32,
-    s_gco: f32,
-    s_bco: f32,
-
-    // G-4g constants for use with 2.4 exponent
-    norm_bg: f32,
-    norm_txt: f32,
-    rev_txt: f32,
-    rev_bg: f32,
-
-    // G-4g Clamps and Scalers
-    blk_thrs: f32,
-    blk_clmp: f32,
-    scale_bow: f32,
-    scale_wob: f32,
-    lo_bow_offset: f32,
-    lo_wob_offset: f32,
-    delta_y_min: f32,
-    lo_clip: f32,
-}
-
-impl Default for APCAConstants {
-    fn default() -> Self {
-        Self {
-            main_trc: 2.4,
-            s_rco: 0.2126729,
-            s_gco: 0.7151522,
-            s_bco: 0.0721750,
-            norm_bg: 0.56,
-            norm_txt: 0.57,
-            rev_txt: 0.62,
-            rev_bg: 0.65,
-            blk_thrs: 0.022,
-            blk_clmp: 1.414,
-            scale_bow: 1.14,
-            scale_wob: 1.14,
-            lo_bow_offset: 0.027,
-            lo_wob_offset: 0.027,
-            delta_y_min: 0.0005,
-            lo_clip: 0.1,
-        }
-    }
-}
-
-/// Calculates the perceptual lightness contrast using APCA.
-/// Returns a value between approximately -108 and 106.
-/// Negative values indicate light text on dark background.
-/// Positive values indicate dark text on light background.
-///
-/// The APCA algorithm is more perceptually accurate than WCAG 2.x,
-/// especially for dark mode interfaces. Key improvements include:
-/// - Better accuracy for dark backgrounds
-/// - Polarity-aware (direction matters)
-/// - Perceptually uniform across the range
-///
-/// Common APCA Lc thresholds per ARC Bronze Simple Mode:
-/// https://readtech.org/ARC/tests/bronze-simple-mode/
-/// - Lc 45: Minimum for large fluent text (36px+)
-/// - Lc 60: Minimum for other content text
-/// - Lc 75: Minimum for body text
-/// - Lc 90: Preferred for body text
-///
-/// Most terminal themes use colors with APCA values of 40-70.
-///
-/// https://github.com/Myndex/apca-w3
-pub fn apca_contrast(text_color: Hsla, background_color: Hsla) -> f32 {
-    let constants = APCAConstants::default();
-
-    let text_y = srgb_to_y(text_color, &constants);
-    let bg_y = srgb_to_y(background_color, &constants);
-
-    // Apply soft clamp to near-black colors
-    let text_y_clamped = if text_y > constants.blk_thrs {
-        text_y
-    } else {
-        text_y + (constants.blk_thrs - text_y).powf(constants.blk_clmp)
-    };
-
-    let bg_y_clamped = if bg_y > constants.blk_thrs {
-        bg_y
-    } else {
-        bg_y + (constants.blk_thrs - bg_y).powf(constants.blk_clmp)
-    };
-
-    // Return 0 for extremely low delta Y
-    if (bg_y_clamped - text_y_clamped).abs() < constants.delta_y_min {
-        return 0.0;
-    }
-
-    let sapc;
-    let output_contrast;
-
-    if bg_y_clamped > text_y_clamped {
-        // Normal polarity: dark text on light background
-        sapc = (bg_y_clamped.powf(constants.norm_bg) - text_y_clamped.powf(constants.norm_txt))
-            * constants.scale_bow;
-
-        // Low contrast smooth rollout to prevent polarity reversal
-        output_contrast = if sapc < constants.lo_clip {
-            0.0
-        } else {
-            sapc - constants.lo_bow_offset
-        };
-    } else {
-        // Reverse polarity: light text on dark background
-        sapc = (bg_y_clamped.powf(constants.rev_bg) - text_y_clamped.powf(constants.rev_txt))
-            * constants.scale_wob;
-
-        output_contrast = if sapc > -constants.lo_clip {
-            0.0
-        } else {
-            sapc + constants.lo_wob_offset
-        };
-    }
-
-    // Return Lc (lightness contrast) scaled to percentage
-    output_contrast * 100.0
-}
-
-/// Converts sRGB color to Y (luminance) for APCA calculation
-fn srgb_to_y(color: Hsla, constants: &APCAConstants) -> f32 {
-    let rgba = color.to_rgb();
-
-    // Linearize and apply coefficients
-    let r_linear = (rgba.r).powf(constants.main_trc);
-    let g_linear = (rgba.g).powf(constants.main_trc);
-    let b_linear = (rgba.b).powf(constants.main_trc);
-
-    constants.s_rco * r_linear + constants.s_gco * g_linear + constants.s_bco * b_linear
-}
-
-/// Adjusts the foreground color to meet the minimum APCA contrast against the background.
-/// The minimum_apca_contrast should be an absolute value (e.g., 75 for Lc 75).
-///
-/// This implementation gradually adjusts the lightness while preserving the hue and
-/// saturation as much as possible, only falling back to black/white when necessary.
-pub fn ensure_minimum_contrast(
-    foreground: Hsla,
-    background: Hsla,
-    minimum_apca_contrast: f32,
-) -> Hsla {
-    if minimum_apca_contrast <= 0.0 {
-        return foreground;
-    }
-
-    let current_contrast = apca_contrast(foreground, background).abs();
-
-    if current_contrast >= minimum_apca_contrast {
-        return foreground;
-    }
-
-    // First, try to adjust lightness while preserving hue and saturation
-    let adjusted = adjust_lightness_for_contrast(foreground, background, minimum_apca_contrast);
-
-    let adjusted_contrast = apca_contrast(adjusted, background).abs();
-    if adjusted_contrast >= minimum_apca_contrast {
-        return adjusted;
-    }
-
-    // If that's not enough, gradually reduce saturation while adjusting lightness
-    let desaturated =
-        adjust_lightness_and_saturation_for_contrast(foreground, background, minimum_apca_contrast);
-
-    let desaturated_contrast = apca_contrast(desaturated, background).abs();
-    if desaturated_contrast >= minimum_apca_contrast {
-        return desaturated;
-    }
-
-    // Last resort: use black or white
-    let black = Hsla {
-        h: 0.0,
-        s: 0.0,
-        l: 0.0,
-        a: foreground.a,
-    };
-
-    let white = Hsla {
-        h: 0.0,
-        s: 0.0,
-        l: 1.0,
-        a: foreground.a,
-    };
-
-    let black_contrast = apca_contrast(black, background).abs();
-    let white_contrast = apca_contrast(white, background).abs();
-
-    if white_contrast > black_contrast {
-        white
-    } else {
-        black
-    }
-}
-
-/// Adjusts only the lightness to meet the minimum contrast, preserving hue and saturation
-fn adjust_lightness_for_contrast(
-    foreground: Hsla,
-    background: Hsla,
-    minimum_apca_contrast: f32,
-) -> Hsla {
-    // Determine if we need to go lighter or darker
-    let bg_luminance = srgb_to_y(background, &APCAConstants::default());
-    let should_go_darker = bg_luminance > 0.5;
-
-    // Binary search for the optimal lightness
-    let mut low = if should_go_darker { 0.0 } else { foreground.l };
-    let mut high = if should_go_darker { foreground.l } else { 1.0 };
-    let mut best_l = foreground.l;
-
-    for _ in 0..20 {
-        let mid = (low + high) / 2.0;
-        let test_color = Hsla {
-            h: foreground.h,
-            s: foreground.s,
-            l: mid,
-            a: foreground.a,
-        };
-
-        let contrast = apca_contrast(test_color, background).abs();
-
-        if contrast >= minimum_apca_contrast {
-            best_l = mid;
-            // Try to get closer to the minimum
-            if should_go_darker {
-                low = mid;
-            } else {
-                high = mid;
-            }
-        } else if should_go_darker {
-            high = mid;
-        } else {
-            low = mid;
-        }
-
-        // If we're close enough to the target, stop
-        if (contrast - minimum_apca_contrast).abs() < 1.0 {
-            best_l = mid;
-            break;
-        }
-    }
-
-    Hsla {
-        h: foreground.h,
-        s: foreground.s,
-        l: best_l,
-        a: foreground.a,
-    }
-}
-
-/// Adjusts both lightness and saturation to meet the minimum contrast
-fn adjust_lightness_and_saturation_for_contrast(
-    foreground: Hsla,
-    background: Hsla,
-    minimum_apca_contrast: f32,
-) -> Hsla {
-    // Try different saturation levels
-    let saturation_steps = [1.0, 0.8, 0.6, 0.4, 0.2, 0.0];
-
-    for &sat_multiplier in &saturation_steps {
-        let test_color = Hsla {
-            h: foreground.h,
-            s: foreground.s * sat_multiplier,
-            l: foreground.l,
-            a: foreground.a,
-        };
-
-        let adjusted = adjust_lightness_for_contrast(test_color, background, minimum_apca_contrast);
-        let contrast = apca_contrast(adjusted, background).abs();
-
-        if contrast >= minimum_apca_contrast {
-            return adjusted;
-        }
-    }
-
-    // If we get here, even grayscale didn't work, so return the grayscale attempt
-    Hsla {
-        h: foreground.h,
-        s: 0.0,
-        l: foreground.l,
-        a: foreground.a,
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn hsla(h: f32, s: f32, l: f32, a: f32) -> Hsla {
-        Hsla { h, s, l, a }
-    }
-
-    fn hsla_from_hex(hex: u32) -> Hsla {
-        let r = ((hex >> 16) & 0xFF) as f32 / 255.0;
-        let g = ((hex >> 8) & 0xFF) as f32 / 255.0;
-        let b = (hex & 0xFF) as f32 / 255.0;
-
-        let max = r.max(g).max(b);
-        let min = r.min(g).min(b);
-        let l = (max + min) / 2.0;
-
-        if max == min {
-            // Achromatic
-            Hsla {
-                h: 0.0,
-                s: 0.0,
-                l,
-                a: 1.0,
-            }
-        } else {
-            let d = max - min;
-            let s = if l > 0.5 {
-                d / (2.0 - max - min)
-            } else {
-                d / (max + min)
-            };
-
-            let h = if max == r {
-                (g - b) / d + if g < b { 6.0 } else { 0.0 }
-            } else if max == g {
-                (b - r) / d + 2.0
-            } else {
-                (r - g) / d + 4.0
-            } / 6.0;
-
-            Hsla { h, s, l, a: 1.0 }
-        }
-    }
-
-    #[test]
-    fn test_apca_contrast() {
-        // Test black text on white background (should be positive)
-        let black = hsla(0.0, 0.0, 0.0, 1.0);
-        let white = hsla(0.0, 0.0, 1.0, 1.0);
-        let contrast = apca_contrast(black, white);
-        assert!(
-            contrast > 100.0,
-            "Black on white should have high positive contrast, got {}",
-            contrast
-        );
-
-        // Test white text on black background (should be negative)
-        let contrast_reversed = apca_contrast(white, black);
-        assert!(
-            contrast_reversed < -100.0,
-            "White on black should have high negative contrast, got {}",
-            contrast_reversed
-        );
-
-        // Same color should have zero contrast
-        let gray = hsla(0.0, 0.0, 0.5, 1.0);
-        let contrast_same = apca_contrast(gray, gray);
-        assert!(
-            contrast_same.abs() < 1.0,
-            "Same color should have near-zero contrast, got {}",
-            contrast_same
-        );
-
-        // APCA is NOT commutative - polarity matters
-        assert!(
-            (contrast + contrast_reversed).abs() > 1.0,
-            "APCA should not be commutative"
-        );
-    }
-
-    #[test]
-    fn test_srgb_to_y() {
-        let constants = APCAConstants::default();
-
-        // Test known Y values
-        let black = hsla(0.0, 0.0, 0.0, 1.0);
-        let y_black = srgb_to_y(black, &constants);
-        assert!(
-            y_black.abs() < 0.001,
-            "Black should have Y near 0, got {}",
-            y_black
-        );
-
-        let white = hsla(0.0, 0.0, 1.0, 1.0);
-        let y_white = srgb_to_y(white, &constants);
-        assert!(
-            (y_white - 1.0).abs() < 0.001,
-            "White should have Y near 1, got {}",
-            y_white
-        );
-    }
-
-    #[test]
-    fn test_srgb_to_y_nan_issue() {
-        let dark_red = hsla_from_hex(0x5f0000);
-        let y_dark_red = srgb_to_y(dark_red, &APCAConstants::default());
-        assert!(!y_dark_red.is_nan());
-    }
-
-    #[test]
-    fn test_ensure_minimum_contrast() {
-        let white_bg = hsla(0.0, 0.0, 1.0, 1.0);
-        let light_gray = hsla(0.0, 0.0, 0.9, 1.0);
-
-        // Light gray on white has poor contrast
-        let initial_contrast = apca_contrast(light_gray, white_bg).abs();
-        assert!(
-            initial_contrast < 15.0,
-            "Initial contrast should be low, got {}",
-            initial_contrast
-        );
-
-        // Should be adjusted to black for better contrast (using APCA Lc 45 as minimum)
-        let adjusted = ensure_minimum_contrast(light_gray, white_bg, 45.0);
-        assert_eq!(adjusted.l, 0.0); // Should be black
-        assert_eq!(adjusted.a, light_gray.a); // Alpha preserved
-
-        // Test with dark background
-        let black_bg = hsla(0.0, 0.0, 0.0, 1.0);
-        let dark_gray = hsla(0.0, 0.0, 0.1, 1.0);
-
-        // Dark gray on black has poor contrast
-        let initial_contrast = apca_contrast(dark_gray, black_bg).abs();
-        assert!(
-            initial_contrast < 15.0,
-            "Initial contrast should be low, got {}",
-            initial_contrast
-        );
-
-        // Should be adjusted to white for better contrast
-        let adjusted = ensure_minimum_contrast(dark_gray, black_bg, 45.0);
-        assert_eq!(adjusted.l, 1.0); // Should be white
-
-        // Test when contrast is already sufficient
-        let black = hsla(0.0, 0.0, 0.0, 1.0);
-        let adjusted = ensure_minimum_contrast(black, white_bg, 45.0);
-        assert_eq!(adjusted, black); // Should remain unchanged
-    }
-
-    #[test]
-    fn test_one_light_theme_exact_colors() {
-        // Test with exact colors from One Light theme
-        // terminal.background and terminal.ansi.white are both #fafafaff
-        let fafafa = hsla_from_hex(0xfafafa);
-
-        // They should be identical
-        let bg = fafafa;
-        let fg = fafafa;
-
-        // Contrast should be 0 (no contrast)
-        let contrast = apca_contrast(fg, bg);
-        assert!(
-            contrast.abs() < 1.0,
-            "Same color should have near-zero APCA contrast, got {}",
-            contrast
-        );
-
-        // With minimum APCA contrast of 15 (very low, but detectable), it should adjust
-        let adjusted = ensure_minimum_contrast(fg, bg, 15.0);
-        // The new algorithm preserves colors, so we just need to check contrast
-        let new_contrast = apca_contrast(adjusted, bg).abs();
-        assert!(
-            new_contrast >= 15.0,
-            "Adjusted contrast {} should be >= 15.0",
-            new_contrast
-        );
-
-        // The adjusted color should have sufficient contrast
-        let new_contrast = apca_contrast(adjusted, bg).abs();
-        assert!(
-            new_contrast >= 15.0,
-            "Adjusted APCA contrast {} should be >= 15.0",
-            new_contrast
-        );
-    }
-}
diff --git a/crates/ui/src/utils/color_contrast.rs b/crates/ui/src/utils/color_contrast.rs
deleted file mode 100644
index 2a6b4bf281..0000000000
--- a/crates/ui/src/utils/color_contrast.rs
+++ /dev/null
@@ -1,70 +0,0 @@
-use gpui::{Hsla, Rgba};
-
-/// Calculates the contrast ratio between two colors according to WCAG 2.0 standards.
-///
-/// The formula used is:
-/// (L1 + 0.05) / (L2 + 0.05), where L1 is the lighter of the two luminances and L2 is the darker.
-///
-/// Returns a float representing the contrast ratio. A higher value indicates more contrast.
-/// The range of the returned value is 1 to 21 (commonly written as 1:1 to 21:1).
-pub fn calculate_contrast_ratio(fg: Hsla, bg: Hsla) -> f32 {
-    let l1 = relative_luminance(fg);
-    let l2 = relative_luminance(bg);
-
-    let (lighter, darker) = if l1 > l2 { (l1, l2) } else { (l2, l1) };
-
-    (lighter + 0.05) / (darker + 0.05)
-}
-
-/// Calculates the relative luminance of a color.
-///
-/// The relative luminance is the relative brightness of any point in a colorspace,
-/// normalized to 0 for darkest black and 1 for lightest white.
-fn relative_luminance(color: Hsla) -> f32 {
-    let rgba: Rgba = color.into();
-    let r = linearize(rgba.r);
-    let g = linearize(rgba.g);
-    let b = linearize(rgba.b);
-
-    0.2126 * r + 0.7152 * g + 0.0722 * b
-}
-
-/// Linearizes an RGB component.
-fn linearize(component: f32) -> f32 {
-    if component <= 0.03928 {
-        component / 12.92
-    } else {
-        ((component + 0.055) / 1.055).powf(2.4)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use gpui::hsla;
-
-    use super::*;
-
-    // Test the contrast ratio formula with some common color combinations to
-    // prevent regressions in either the color conversions or the formula itself.
-    #[test]
-    fn test_contrast_ratio_formula() {
-        // White on Black (should be close to 21:1)
-        let white = hsla(0.0, 0.0, 1.0, 1.0);
-        let black = hsla(0.0, 0.0, 0.0, 1.0);
-        assert!((calculate_contrast_ratio(white, black) - 21.0).abs() < 0.1);
-
-        // Black on White (should be close to 21:1)
-        assert!((calculate_contrast_ratio(black, white) - 21.0).abs() < 0.1);
-
-        // Mid-gray on Black (should be close to 5.32:1)
-        let mid_gray = hsla(0.0, 0.0, 0.5, 1.0);
-        assert!((calculate_contrast_ratio(mid_gray, black) - 5.32).abs() < 0.1);
-
-        // White on Mid-gray (should be close to 3.95:1)
-        assert!((calculate_contrast_ratio(white, mid_gray) - 3.95).abs() < 0.1);
-
-        // Same color (should be 1:1)
-        let red = hsla(0.0, 1.0, 0.5, 1.0);
-        assert!((calculate_contrast_ratio(red, red) - 1.0).abs() < 0.01);
-    }
-}
diff --git a/crates/ui/src/utils/corner_solver.rs b/crates/ui/src/utils/corner_solver.rs
deleted file mode 100644
index c49bccc445..0000000000
--- a/crates/ui/src/utils/corner_solver.rs
+++ /dev/null
@@ -1,61 +0,0 @@
-use gpui::Pixels;
-
-/// Calculates the child’s content-corner radius for a single nested level.
-///
-/// child_content_radius = max(0, parent_radius - parent_border - parent_padding + self_border)
-///
-/// - parent_radius: outer corner radius of the parent element
-/// - parent_border: border width of the parent element
-/// - parent_padding: padding of the parent element
-/// - self_border: border width of this child element (for content inset)
-pub fn inner_corner_radius(
-    parent_radius: Pixels,
-    parent_border: Pixels,
-    parent_padding: Pixels,
-    self_border: Pixels,
-) -> Pixels {
-    (parent_radius - parent_border - parent_padding + self_border).max(Pixels::ZERO)
-}
-
-/// Solver for arbitrarily deep nested corner radii.
-///
-/// Each nested level’s outer border-box radius is:
-///   R₀ = max(0, root_radius - root_border - root_padding)
-///   Rᵢ = max(0, Rᵢ₋₁ - childᵢ₋₁_border - childᵢ₋₁_padding) for i > 0
-pub struct CornerSolver {
-    root_radius: Pixels,
-    root_border: Pixels,
-    root_padding: Pixels,
-    children: Vec<(Pixels, Pixels)>, // (border, padding)
-}
-
-impl CornerSolver {
-    pub fn new(root_radius: Pixels, root_border: Pixels, root_padding: Pixels) -> Self {
-        Self {
-            root_radius,
-            root_border,
-            root_padding,
-            children: Vec::new(),
-        }
-    }
-
-    pub fn add_child(mut self, border: Pixels, padding: Pixels) -> Self {
-        self.children.push((border, padding));
-        self
-    }
-
-    pub fn corner_radius(&self, level: usize) -> Pixels {
-        if level == 0 {
-            return (self.root_radius - self.root_border - self.root_padding).max(Pixels::ZERO);
-        }
-        if level >= self.children.len() {
-            return Pixels::ZERO;
-        }
-        let mut r = (self.root_radius - self.root_border - self.root_padding).max(Pixels::ZERO);
-        for i in 0..level {
-            let (b, p) = self.children[i];
-            r = (r - b - p).max(Pixels::ZERO);
-        }
-        r
-    }
-}
diff --git a/crates/ui/src/utils/format_distance.rs b/crates/ui/src/utils/format_distance.rs
deleted file mode 100644
index 6ec497edee..0000000000
--- a/crates/ui/src/utils/format_distance.rs
+++ /dev/null
@@ -1,396 +0,0 @@
-// This won't be documented further as it is intended to be removed, or merged with the `time_format` crate.
-
-use chrono::{DateTime, Local, NaiveDateTime};
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub enum DateTimeType {
-    Naive(NaiveDateTime),
-    Local(DateTime<Local>),
-}
-
-impl DateTimeType {
-    /// Converts the [`DateTimeType`] to a [`NaiveDateTime`].
-    ///
-    /// If the [`DateTimeType`] is already a [`NaiveDateTime`], it will be returned as is.
-    /// If the [`DateTimeType`] is a [`DateTime<Local>`], it will be converted to a [`NaiveDateTime`].
-    pub fn to_naive(self) -> NaiveDateTime {
-        match self {
-            DateTimeType::Naive(naive) => naive,
-            DateTimeType::Local(local) => local.naive_local(),
-        }
-    }
-}
-
-pub struct FormatDistance {
-    date: DateTimeType,
-    base_date: DateTimeType,
-    include_seconds: bool,
-    add_suffix: bool,
-    hide_prefix: bool,
-}
-
-impl FormatDistance {
-    pub fn new(date: DateTimeType, base_date: DateTimeType) -> Self {
-        Self {
-            date,
-            base_date,
-            include_seconds: false,
-            add_suffix: false,
-            hide_prefix: false,
-        }
-    }
-
-    pub fn from_now(date: DateTimeType) -> Self {
-        Self::new(date, DateTimeType::Local(Local::now()))
-    }
-
-    pub fn include_seconds(mut self, include_seconds: bool) -> Self {
-        self.include_seconds = include_seconds;
-        self
-    }
-
-    pub fn add_suffix(mut self, add_suffix: bool) -> Self {
-        self.add_suffix = add_suffix;
-        self
-    }
-
-    pub fn hide_prefix(mut self, hide_prefix: bool) -> Self {
-        self.hide_prefix = hide_prefix;
-        self
-    }
-}
-
-impl std::fmt::Display for FormatDistance {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(
-            f,
-            "{}",
-            format_distance(
-                self.date,
-                self.base_date.to_naive(),
-                self.include_seconds,
-                self.add_suffix,
-                self.hide_prefix,
-            )
-        )
-    }
-}
-/// Calculates the distance in seconds between two [`NaiveDateTime`] objects.
-/// It returns a signed integer denoting the difference. If `date` is earlier than `base_date`, the returned value will be negative.
-///
-/// ## Arguments
-///
-/// * `date` - A [NaiveDateTime`] object representing the date of interest
-/// * `base_date` - A [NaiveDateTime`] object representing the base date against which the comparison is made
-fn distance_in_seconds(date: NaiveDateTime, base_date: NaiveDateTime) -> i64 {
-    let duration = date.signed_duration_since(base_date);
-    -duration.num_seconds()
-}
-
-/// Generates a string describing the time distance between two dates in a human-readable way.
-fn distance_string(
-    distance: i64,
-    include_seconds: bool,
-    add_suffix: bool,
-    hide_prefix: bool,
-) -> String {
-    let suffix = if distance < 0 { " from now" } else { " ago" };
-
-    let distance = distance.abs();
-
-    let minutes = distance / 60;
-    let hours = distance / 3_600;
-    let days = distance / 86_400;
-    let months = distance / 2_592_000;
-
-    let string = if distance < 5 && include_seconds {
-        if hide_prefix {
-            "5 seconds"
-        } else {
-            "less than 5 seconds"
-        }
-        .to_string()
-    } else if distance < 10 && include_seconds {
-        if hide_prefix {
-            "10 seconds"
-        } else {
-            "less than 10 seconds"
-        }
-        .to_string()
-    } else if distance < 20 && include_seconds {
-        if hide_prefix {
-            "20 seconds"
-        } else {
-            "less than 20 seconds"
-        }
-        .to_string()
-    } else if distance < 40 && include_seconds {
-        "half a minute".to_string()
-    } else if distance < 60 && include_seconds {
-        if hide_prefix {
-            "a minute"
-        } else {
-            "less than a minute"
-        }
-        .to_string()
-    } else if distance < 90 && include_seconds {
-        "1 minute".to_string()
-    } else if distance < 30 {
-        if hide_prefix {
-            "a minute"
-        } else {
-            "less than a minute"
-        }
-        .to_string()
-    } else if distance < 90 {
-        "1 minute".to_string()
-    } else if distance < 2_700 {
-        format!("{} minutes", minutes)
-    } else if distance < 5_400 {
-        if hide_prefix {
-            "1 hour"
-        } else {
-            "about 1 hour"
-        }
-        .to_string()
-    } else if distance < 86_400 {
-        if hide_prefix {
-            format!("{} hours", hours)
-        } else {
-            format!("about {} hours", hours)
-        }
-    } else if distance < 172_800 {
-        "1 day".to_string()
-    } else if distance < 2_592_000 {
-        format!("{} days", days)
-    } else if distance < 5_184_000 {
-        if hide_prefix {
-            "1 month"
-        } else {
-            "about 1 month"
-        }
-        .to_string()
-    } else if distance < 7_776_000 {
-        if hide_prefix {
-            "2 months"
-        } else {
-            "about 2 months"
-        }
-        .to_string()
-    } else if distance < 31_540_000 {
-        format!("{} months", months)
-    } else if distance < 39_425_000 {
-        if hide_prefix {
-            "1 year"
-        } else {
-            "about 1 year"
-        }
-        .to_string()
-    } else if distance < 55_195_000 {
-        if hide_prefix { "1 year" } else { "over 1 year" }.to_string()
-    } else if distance < 63_080_000 {
-        if hide_prefix {
-            "2 years"
-        } else {
-            "almost 2 years"
-        }
-        .to_string()
-    } else {
-        let years = distance / 31_536_000;
-        let remaining_months = (distance % 31_536_000) / 2_592_000;
-
-        if remaining_months < 3 {
-            if hide_prefix {
-                format!("{} years", years)
-            } else {
-                format!("about {} years", years)
-            }
-        } else if remaining_months < 9 {
-            if hide_prefix {
-                format!("{} years", years)
-            } else {
-                format!("over {} years", years)
-            }
-        } else if hide_prefix {
-            format!("{} years", years + 1)
-        } else {
-            format!("almost {} years", years + 1)
-        }
-    };
-
-    if add_suffix {
-        format!("{}{}", string, suffix)
-    } else {
-        string
-    }
-}
-
-/// Get the time difference between two dates into a relative human readable string.
-///
-/// For example, "less than a minute ago", "about 2 hours ago", "3 months from now", etc.
-///
-/// Use [`format_distance_from_now`] to compare a NaiveDateTime against now.
-pub fn format_distance(
-    date: DateTimeType,
-    base_date: NaiveDateTime,
-    include_seconds: bool,
-    add_suffix: bool,
-    hide_prefix: bool,
-) -> String {
-    let distance = distance_in_seconds(date.to_naive(), base_date);
-
-    distance_string(distance, include_seconds, add_suffix, hide_prefix)
-}
-
-/// Get the time difference between a date and now as relative human readable string.
-///
-/// For example, "less than a minute ago", "about 2 hours ago", "3 months from now", etc.
-pub fn format_distance_from_now(
-    datetime: DateTimeType,
-    include_seconds: bool,
-    add_suffix: bool,
-    hide_prefix: bool,
-) -> String {
-    let now = chrono::offset::Local::now().naive_local();
-
-    format_distance(datetime, now, include_seconds, add_suffix, hide_prefix)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use chrono::NaiveDateTime;
-
-    #[test]
-    fn test_format_distance() {
-        let date = DateTimeType::Naive(
-            #[allow(deprecated)]
-            NaiveDateTime::from_timestamp_opt(9600, 0).expect("Invalid NaiveDateTime for date"),
-        );
-        let base_date = DateTimeType::Naive(
-            #[allow(deprecated)]
-            NaiveDateTime::from_timestamp_opt(0, 0).expect("Invalid NaiveDateTime for base_date"),
-        );
-
-        assert_eq!(
-            "about 2 hours",
-            format_distance(date, base_date.to_naive(), false, false, false)
-        );
-    }
-
-    #[test]
-    fn test_format_distance_with_suffix() {
-        let date = DateTimeType::Naive(
-            #[allow(deprecated)]
-            NaiveDateTime::from_timestamp_opt(9600, 0).expect("Invalid NaiveDateTime for date"),
-        );
-        let base_date = DateTimeType::Naive(
-            #[allow(deprecated)]
-            NaiveDateTime::from_timestamp_opt(0, 0).expect("Invalid NaiveDateTime for base_date"),
-        );
-
-        assert_eq!(
-            "about 2 hours from now",
-            format_distance(date, base_date.to_naive(), false, true, false)
-        );
-    }
-
-    #[test]
-    fn test_format_distance_from_hms() {
-        let date = DateTimeType::Naive(
-            NaiveDateTime::parse_from_str("1969-07-20T11:22:33Z", "%Y-%m-%dT%H:%M:%SZ")
-                .expect("Invalid NaiveDateTime for date"),
-        );
-        let base_date = DateTimeType::Naive(
-            NaiveDateTime::parse_from_str("2024-02-01T00:00:00Z", "%Y-%m-%dT%H:%M:%SZ")
-                .expect("Invalid NaiveDateTime for base_date"),
-        );
-
-        assert_eq!(
-            "over 54 years ago",
-            format_distance(date, base_date.to_naive(), false, true, false)
-        );
-    }
-
-    #[test]
-    fn test_format_distance_string() {
-        assert_eq!(
-            distance_string(3, false, false, false),
-            "less than a minute"
-        );
-        assert_eq!(
-            distance_string(7, false, false, false),
-            "less than a minute"
-        );
-        assert_eq!(
-            distance_string(13, false, false, false),
-            "less than a minute"
-        );
-        assert_eq!(
-            distance_string(21, false, false, false),
-            "less than a minute"
-        );
-        assert_eq!(distance_string(45, false, false, false), "1 minute");
-        assert_eq!(distance_string(61, false, false, false), "1 minute");
-        assert_eq!(distance_string(1920, false, false, false), "32 minutes");
-        assert_eq!(distance_string(3902, false, false, false), "about 1 hour");
-        assert_eq!(distance_string(18002, false, false, false), "about 5 hours");
-        assert_eq!(distance_string(86470, false, false, false), "1 day");
-        assert_eq!(distance_string(345880, false, false, false), "4 days");
-        assert_eq!(
-            distance_string(2764800, false, false, false),
-            "about 1 month"
-        );
-        assert_eq!(
-            distance_string(5184000, false, false, false),
-            "about 2 months"
-        );
-        assert_eq!(distance_string(10368000, false, false, false), "4 months");
-        assert_eq!(
-            distance_string(34694000, false, false, false),
-            "about 1 year"
-        );
-        assert_eq!(
-            distance_string(47310000, false, false, false),
-            "over 1 year"
-        );
-        assert_eq!(
-            distance_string(61503000, false, false, false),
-            "almost 2 years"
-        );
-        assert_eq!(
-            distance_string(160854000, false, false, false),
-            "about 5 years"
-        );
-        assert_eq!(
-            distance_string(236550000, false, false, false),
-            "over 7 years"
-        );
-        assert_eq!(
-            distance_string(249166000, false, false, false),
-            "almost 8 years"
-        );
-    }
-
-    #[test]
-    fn test_format_distance_string_include_seconds() {
-        assert_eq!(
-            distance_string(3, true, false, false),
-            "less than 5 seconds"
-        );
-        assert_eq!(
-            distance_string(7, true, false, false),
-            "less than 10 seconds"
-        );
-        assert_eq!(
-            distance_string(13, true, false, false),
-            "less than 20 seconds"
-        );
-        assert_eq!(distance_string(21, true, false, false), "half a minute");
-        assert_eq!(
-            distance_string(45, true, false, false),
-            "less than a minute"
-        );
-        assert_eq!(distance_string(61, true, false, false), "1 minute");
-    }
-}
diff --git a/crates/ui/src/utils/search_input.rs b/crates/ui/src/utils/search_input.rs
deleted file mode 100644
index c677b203d5..0000000000
--- a/crates/ui/src/utils/search_input.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-use gpui::{Pixels, px};
-
-pub struct SearchInputWidth;
-
-impl SearchInputWidth {
-    /// The container size in which the input stops filling the whole width.
-    pub const THRESHOLD_WIDTH: Pixels = px(1200.0);
-
-    /// The maximum width for the search input when the container is larger than the threshold.
-    pub const MAX_WIDTH: Pixels = px(1200.0);
-
-    /// Calculates the actual width in pixels based on the container width.
-    pub fn calc_width(container_width: Pixels) -> Pixels {
-        if container_width < Self::THRESHOLD_WIDTH {
-            container_width
-        } else {
-            container_width.min(Self::MAX_WIDTH)
-        }
-    }
-}
diff --git a/crates/ui/src/utils/with_rem_size.rs b/crates/ui/src/utils/with_rem_size.rs
deleted file mode 100644
index b9770b086c..0000000000
--- a/crates/ui/src/utils/with_rem_size.rs
+++ /dev/null
@@ -1,114 +0,0 @@
-use gpui::{
-    AnyElement, App, Bounds, Div, DivFrameState, Element, ElementId, GlobalElementId, Hitbox,
-    InteractiveElement as _, IntoElement, LayoutId, ParentElement, Pixels, StyleRefinement, Styled,
-    Window, div,
-};
-
-/// An element that sets a particular rem size for its children.
-pub struct WithRemSize {
-    div: Div,
-    rem_size: Pixels,
-}
-
-impl WithRemSize {
-    /// Create a new [WithRemSize] element, which sets a
-    /// particular rem size for its children.
-    pub fn new(rem_size: impl Into<Pixels>) -> Self {
-        Self {
-            div: div(),
-            rem_size: rem_size.into(),
-        }
-    }
-
-    /// Block the mouse from interacting with this element or any of its children
-    /// The fluent API equivalent to [`Interactivity::occlude_mouse`]
-    ///
-    /// [`Interactivity::occlude_mouse`]: gpui::Interactivity::occlude_mouse
-    pub fn occlude(mut self) -> Self {
-        self.div = self.div.occlude();
-        self
-    }
-}
-
-impl Styled for WithRemSize {
-    fn style(&mut self) -> &mut StyleRefinement {
-        self.div.style()
-    }
-}
-
-impl ParentElement for WithRemSize {
-    fn extend(&mut self, elements: impl IntoIterator<Item = AnyElement>) {
-        self.div.extend(elements)
-    }
-}
-
-impl Element for WithRemSize {
-    type RequestLayoutState = DivFrameState;
-    type PrepaintState = Option<Hitbox>;
-
-    fn id(&self) -> Option<ElementId> {
-        Element::id(&self.div)
-    }
-
-    fn source_location(&self) -> Option<&'static core::panic::Location<'static>> {
-        Element::source_location(&self.div)
-    }
-
-    fn request_layout(
-        &mut self,
-        id: Option<&GlobalElementId>,
-        inspector_id: Option<&gpui::InspectorElementId>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> (LayoutId, Self::RequestLayoutState) {
-        window.with_rem_size(Some(self.rem_size), |window| {
-            self.div.request_layout(id, inspector_id, window, cx)
-        })
-    }
-
-    fn prepaint(
-        &mut self,
-        id: Option<&GlobalElementId>,
-        inspector_id: Option<&gpui::InspectorElementId>,
-        bounds: Bounds<Pixels>,
-        request_layout: &mut Self::RequestLayoutState,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Self::PrepaintState {
-        window.with_rem_size(Some(self.rem_size), |window| {
-            self.div
-                .prepaint(id, inspector_id, bounds, request_layout, window, cx)
-        })
-    }
-
-    fn paint(
-        &mut self,
-        id: Option<&GlobalElementId>,
-        inspector_id: Option<&gpui::InspectorElementId>,
-        bounds: Bounds<Pixels>,
-        request_layout: &mut Self::RequestLayoutState,
-        prepaint: &mut Self::PrepaintState,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        window.with_rem_size(Some(self.rem_size), |window| {
-            self.div.paint(
-                id,
-                inspector_id,
-                bounds,
-                request_layout,
-                prepaint,
-                window,
-                cx,
-            )
-        })
-    }
-}
-
-impl IntoElement for WithRemSize {
-    type Element = Self;
-
-    fn into_element(self) -> Self::Element {
-        self
-    }
-}
diff --git a/crates/ui_input/Cargo.toml b/crates/ui_input/Cargo.toml
deleted file mode 100644
index 4e7b08241d..0000000000
--- a/crates/ui_input/Cargo.toml
+++ /dev/null
@@ -1,24 +0,0 @@
-[package]
-name = "ui_input"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/ui_input.rs"
-
-[dependencies]
-component.workspace = true
-editor.workspace = true
-gpui.workspace = true
-menu.workspace = true
-settings.workspace = true
-theme.workspace = true
-ui.workspace = true
-
-[features]
-default = []
diff --git a/crates/ui_input/LICENSE-GPL b/crates/ui_input/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/ui_input/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/ui_input/src/input_field.rs b/crates/ui_input/src/input_field.rs
deleted file mode 100644
index 2bae8c172d..0000000000
--- a/crates/ui_input/src/input_field.rs
+++ /dev/null
@@ -1,259 +0,0 @@
-use component::{example_group, single_example};
-use editor::{Editor, EditorElement, EditorStyle};
-use gpui::{App, Entity, FocusHandle, Focusable, FontStyle, Hsla, Length, TextStyle};
-use settings::Settings;
-use std::sync::Arc;
-use theme::ThemeSettings;
-use ui::prelude::*;
-
-pub struct InputFieldStyle {
-    text_color: Hsla,
-    background_color: Hsla,
-    border_color: Hsla,
-}
-
-/// An Input Field component that can be used to create text fields like search inputs, form fields, etc.
-///
-/// It wraps a single line [`Editor`] and allows for common field properties like labels, placeholders, icons, etc.
-#[derive(RegisterComponent)]
-pub struct InputField {
-    /// An optional label for the text field.
-    ///
-    /// Its position is determined by the [`FieldLabelLayout`].
-    label: Option<SharedString>,
-    /// The size of the label text.
-    label_size: LabelSize,
-    /// The placeholder text for the text field.
-    placeholder: SharedString,
-    /// Exposes the underlying [`Entity<Editor>`] to allow for customizing the editor beyond the provided API.
-    ///
-    /// This likely will only be public in the short term, ideally the API will be expanded to cover necessary use cases.
-    pub editor: Entity<Editor>,
-    /// An optional icon that is displayed at the start of the text field.
-    ///
-    /// For example, a magnifying glass icon in a search field.
-    start_icon: Option<IconName>,
-    /// Whether the text field is disabled.
-    disabled: bool,
-    /// The minimum width of for the input
-    min_width: Length,
-    /// The tab index for keyboard navigation order.
-    tab_index: Option<isize>,
-    /// Whether this field is a tab stop (can be focused via Tab key).
-    tab_stop: bool,
-}
-
-impl Focusable for InputField {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        self.editor.focus_handle(cx)
-    }
-}
-
-impl InputField {
-    pub fn new(window: &mut Window, cx: &mut App, placeholder: impl Into<SharedString>) -> Self {
-        let placeholder_text = placeholder.into();
-
-        let editor = cx.new(|cx| {
-            let mut input = Editor::single_line(window, cx);
-            input.set_placeholder_text(&placeholder_text, window, cx);
-            input
-        });
-
-        Self {
-            label: None,
-            label_size: LabelSize::Small,
-            placeholder: placeholder_text,
-            editor,
-            start_icon: None,
-            disabled: false,
-            min_width: px(192.).into(),
-            tab_index: None,
-            tab_stop: true,
-        }
-    }
-
-    pub fn start_icon(mut self, icon: IconName) -> Self {
-        self.start_icon = Some(icon);
-        self
-    }
-
-    pub fn label(mut self, label: impl Into<SharedString>) -> Self {
-        self.label = Some(label.into());
-        self
-    }
-
-    pub fn label_size(mut self, size: LabelSize) -> Self {
-        self.label_size = size;
-        self
-    }
-
-    pub fn label_min_width(mut self, width: impl Into<Length>) -> Self {
-        self.min_width = width.into();
-        self
-    }
-
-    pub fn tab_index(mut self, index: isize) -> Self {
-        self.tab_index = Some(index);
-        self
-    }
-
-    pub fn tab_stop(mut self, tab_stop: bool) -> Self {
-        self.tab_stop = tab_stop;
-        self
-    }
-
-    pub fn set_disabled(&mut self, disabled: bool, cx: &mut Context<Self>) {
-        self.disabled = disabled;
-        self.editor
-            .update(cx, |editor, _| editor.set_read_only(disabled))
-    }
-
-    pub fn is_empty(&self, cx: &App) -> bool {
-        self.editor().read(cx).text(cx).trim().is_empty()
-    }
-
-    pub fn editor(&self) -> &Entity<Editor> {
-        &self.editor
-    }
-
-    pub fn text(&self, cx: &App) -> String {
-        self.editor().read(cx).text(cx)
-    }
-
-    pub fn clear(&self, window: &mut Window, cx: &mut App) {
-        self.editor()
-            .update(cx, |editor, cx| editor.clear(window, cx))
-    }
-
-    pub fn set_text(&self, text: impl Into<Arc<str>>, window: &mut Window, cx: &mut App) {
-        self.editor()
-            .update(cx, |editor, cx| editor.set_text(text, window, cx))
-    }
-}
-
-impl Render for InputField {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let editor = self.editor.clone();
-        let settings = ThemeSettings::get_global(cx);
-        let theme_color = cx.theme().colors();
-
-        let mut style = InputFieldStyle {
-            text_color: theme_color.text,
-            background_color: theme_color.editor_background,
-            border_color: theme_color.border_variant,
-        };
-
-        if self.disabled {
-            style.text_color = theme_color.text_disabled;
-            style.background_color = theme_color.editor_background;
-            style.border_color = theme_color.border_disabled;
-        }
-
-        // if self.error_message.is_some() {
-        //     style.text_color = cx.theme().status().error;
-        //     style.border_color = cx.theme().status().error_border
-        // }
-
-        let text_style = TextStyle {
-            font_family: settings.ui_font.family.clone(),
-            font_features: settings.ui_font.features.clone(),
-            font_size: rems(0.875).into(),
-            font_weight: settings.buffer_font.weight,
-            font_style: FontStyle::Normal,
-            line_height: relative(1.2),
-            color: style.text_color,
-            ..Default::default()
-        };
-
-        let editor_style = EditorStyle {
-            background: theme_color.ghost_element_background,
-            local_player: cx.theme().players().local(),
-            syntax: cx.theme().syntax().clone(),
-            text: text_style,
-            ..Default::default()
-        };
-
-        let focus_handle = self.editor.focus_handle(cx);
-
-        let configured_handle = if let Some(tab_index) = self.tab_index {
-            focus_handle.tab_index(tab_index).tab_stop(self.tab_stop)
-        } else if !self.tab_stop {
-            focus_handle.tab_stop(false)
-        } else {
-            focus_handle
-        };
-
-        v_flex()
-            .id(self.placeholder.clone())
-            .w_full()
-            .gap_1()
-            .when_some(self.label.clone(), |this, label| {
-                this.child(
-                    Label::new(label)
-                        .size(self.label_size)
-                        .color(if self.disabled {
-                            Color::Disabled
-                        } else {
-                            Color::Default
-                        }),
-                )
-            })
-            .child(
-                h_flex()
-                    .track_focus(&configured_handle)
-                    .min_w(self.min_width)
-                    .min_h_8()
-                    .w_full()
-                    .px_2()
-                    .py_1p5()
-                    .flex_grow()
-                    .text_color(style.text_color)
-                    .rounded_md()
-                    .bg(style.background_color)
-                    .border_1()
-                    .border_color(style.border_color)
-                    .when(
-                        editor.focus_handle(cx).contains_focused(window, cx),
-                        |this| this.border_color(theme_color.border_focused),
-                    )
-                    .when_some(self.start_icon, |this, icon| {
-                        this.gap_1()
-                            .child(Icon::new(icon).size(IconSize::Small).color(Color::Muted))
-                    })
-                    .child(EditorElement::new(&self.editor, editor_style)),
-            )
-    }
-}
-
-impl Component for InputField {
-    fn scope() -> ComponentScope {
-        ComponentScope::Input
-    }
-
-    fn preview(window: &mut Window, cx: &mut App) -> Option<AnyElement> {
-        let input_small =
-            cx.new(|cx| InputField::new(window, cx, "placeholder").label("Small Label"));
-
-        let input_regular = cx.new(|cx| {
-            InputField::new(window, cx, "placeholder")
-                .label("Regular Label")
-                .label_size(LabelSize::Default)
-        });
-
-        Some(
-            v_flex()
-                .gap_6()
-                .children(vec![example_group(vec![
-                    single_example(
-                        "Small Label (Default)",
-                        div().child(input_small).into_any_element(),
-                    ),
-                    single_example(
-                        "Regular Label",
-                        div().child(input_regular).into_any_element(),
-                    ),
-                ])])
-                .into_any_element(),
-        )
-    }
-}
diff --git a/crates/ui_input/src/number_field.rs b/crates/ui_input/src/number_field.rs
deleted file mode 100644
index ee5c57b43b..0000000000
--- a/crates/ui_input/src/number_field.rs
+++ /dev/null
@@ -1,577 +0,0 @@
-use std::{
-    fmt::Display,
-    num::{NonZero, NonZeroU32, NonZeroU64},
-    rc::Rc,
-    str::FromStr,
-};
-
-use editor::{Editor, EditorStyle};
-use gpui::{ClickEvent, Entity, FocusHandle, Focusable, FontWeight, Modifiers};
-
-use settings::{CenteredPaddingSettings, CodeFade, DelayMs, InactiveOpacity, MinimumContrast};
-use ui::prelude::*;
-
-#[derive(Debug, Default, Clone, Copy, PartialEq, Eq, Hash)]
-pub enum NumberFieldMode {
-    #[default]
-    Read,
-    Edit,
-}
-
-pub trait NumberFieldType: Display + Copy + Clone + Sized + PartialOrd + FromStr + 'static {
-    fn default_format(value: &Self) -> String {
-        format!("{}", value)
-    }
-    fn default_step() -> Self;
-    fn large_step() -> Self;
-    fn small_step() -> Self;
-    fn min_value() -> Self;
-    fn max_value() -> Self;
-    fn saturating_add(self, rhs: Self) -> Self;
-    fn saturating_sub(self, rhs: Self) -> Self;
-}
-
-macro_rules! impl_newtype_numeric_stepper_float {
-    ($type:ident, $default:expr, $large:expr, $small:expr, $min:expr, $max:expr) => {
-        impl NumberFieldType for $type {
-            fn default_step() -> Self {
-                $default.into()
-            }
-
-            fn large_step() -> Self {
-                $large.into()
-            }
-
-            fn small_step() -> Self {
-                $small.into()
-            }
-
-            fn min_value() -> Self {
-                $min.into()
-            }
-
-            fn max_value() -> Self {
-                $max.into()
-            }
-
-            fn saturating_add(self, rhs: Self) -> Self {
-                $type((self.0 + rhs.0).min(Self::max_value().0))
-            }
-
-            fn saturating_sub(self, rhs: Self) -> Self {
-                $type((self.0 - rhs.0).max(Self::min_value().0))
-            }
-        }
-    };
-}
-
-macro_rules! impl_newtype_numeric_stepper_int {
-    ($type:ident, $default:expr, $large:expr, $small:expr, $min:expr, $max:expr) => {
-        impl NumberFieldType for $type {
-            fn default_step() -> Self {
-                $default.into()
-            }
-
-            fn large_step() -> Self {
-                $large.into()
-            }
-
-            fn small_step() -> Self {
-                $small.into()
-            }
-
-            fn min_value() -> Self {
-                $min.into()
-            }
-
-            fn max_value() -> Self {
-                $max.into()
-            }
-
-            fn saturating_add(self, rhs: Self) -> Self {
-                $type(self.0.saturating_add(rhs.0).min(Self::max_value().0))
-            }
-
-            fn saturating_sub(self, rhs: Self) -> Self {
-                $type(self.0.saturating_sub(rhs.0).max(Self::min_value().0))
-            }
-        }
-    };
-}
-
-#[rustfmt::skip]
-impl_newtype_numeric_stepper_float!(FontWeight, 50., 100., 10., FontWeight::THIN, FontWeight::BLACK);
-impl_newtype_numeric_stepper_float!(CodeFade, 0.1, 0.2, 0.05, 0.0, 0.9);
-impl_newtype_numeric_stepper_float!(InactiveOpacity, 0.1, 0.2, 0.05, 0.0, 1.0);
-impl_newtype_numeric_stepper_float!(MinimumContrast, 1., 10., 0.5, 0.0, 106.0);
-impl_newtype_numeric_stepper_int!(DelayMs, 100, 500, 10, 0, 2000);
-impl_newtype_numeric_stepper_float!(
-    CenteredPaddingSettings,
-    0.05,
-    0.2,
-    0.1,
-    CenteredPaddingSettings::MIN_PADDING,
-    CenteredPaddingSettings::MAX_PADDING
-);
-
-macro_rules! impl_numeric_stepper_int {
-    ($type:ident) => {
-        impl NumberFieldType for $type {
-            fn default_step() -> Self {
-                1
-            }
-
-            fn large_step() -> Self {
-                10
-            }
-
-            fn small_step() -> Self {
-                1
-            }
-
-            fn min_value() -> Self {
-                <$type>::MIN
-            }
-
-            fn max_value() -> Self {
-                <$type>::MAX
-            }
-
-            fn saturating_add(self, rhs: Self) -> Self {
-                self.saturating_add(rhs)
-            }
-
-            fn saturating_sub(self, rhs: Self) -> Self {
-                self.saturating_sub(rhs)
-            }
-        }
-    };
-}
-
-macro_rules! impl_numeric_stepper_nonzero_int {
-    ($nonzero:ty, $inner:ty) => {
-        impl NumberFieldType for $nonzero {
-            fn default_step() -> Self {
-                <$nonzero>::new(1).unwrap()
-            }
-
-            fn large_step() -> Self {
-                <$nonzero>::new(10).unwrap()
-            }
-
-            fn small_step() -> Self {
-                <$nonzero>::new(1).unwrap()
-            }
-
-            fn min_value() -> Self {
-                <$nonzero>::MIN
-            }
-
-            fn max_value() -> Self {
-                <$nonzero>::MAX
-            }
-
-            fn saturating_add(self, rhs: Self) -> Self {
-                let result = self.get().saturating_add(rhs.get());
-                <$nonzero>::new(result.max(1)).unwrap()
-            }
-
-            fn saturating_sub(self, rhs: Self) -> Self {
-                let result = self.get().saturating_sub(rhs.get()).max(1);
-                <$nonzero>::new(result).unwrap()
-            }
-        }
-    };
-}
-
-macro_rules! impl_numeric_stepper_float {
-    ($type:ident) => {
-        impl NumberFieldType for $type {
-            fn default_format(value: &Self) -> String {
-                format!("{:.2}", value)
-            }
-
-            fn default_step() -> Self {
-                1.0
-            }
-
-            fn large_step() -> Self {
-                10.0
-            }
-
-            fn small_step() -> Self {
-                0.1
-            }
-
-            fn min_value() -> Self {
-                <$type>::MIN
-            }
-
-            fn max_value() -> Self {
-                <$type>::MAX
-            }
-
-            fn saturating_add(self, rhs: Self) -> Self {
-                (self + rhs).clamp(Self::min_value(), Self::max_value())
-            }
-
-            fn saturating_sub(self, rhs: Self) -> Self {
-                (self - rhs).clamp(Self::min_value(), Self::max_value())
-            }
-        }
-    };
-}
-
-impl_numeric_stepper_float!(f32);
-impl_numeric_stepper_float!(f64);
-impl_numeric_stepper_int!(isize);
-impl_numeric_stepper_int!(usize);
-impl_numeric_stepper_int!(i32);
-impl_numeric_stepper_int!(u32);
-impl_numeric_stepper_int!(i64);
-impl_numeric_stepper_int!(u64);
-
-impl_numeric_stepper_nonzero_int!(NonZeroU32, u32);
-impl_numeric_stepper_nonzero_int!(NonZeroU64, u64);
-impl_numeric_stepper_nonzero_int!(NonZero<usize>, usize);
-
-#[derive(RegisterComponent)]
-pub struct NumberField<T = usize> {
-    id: ElementId,
-    value: T,
-    focus_handle: FocusHandle,
-    mode: Entity<NumberFieldMode>,
-    format: Box<dyn FnOnce(&T) -> String>,
-    large_step: T,
-    small_step: T,
-    step: T,
-    min_value: T,
-    max_value: T,
-    on_reset: Option<Box<dyn Fn(&ClickEvent, &mut Window, &mut App) + 'static>>,
-    on_change: Rc<dyn Fn(&T, &mut Window, &mut App) + 'static>,
-    tab_index: Option<isize>,
-}
-
-impl<T: NumberFieldType> NumberField<T> {
-    pub fn new(id: impl Into<ElementId>, value: T, window: &mut Window, cx: &mut App) -> Self {
-        let id = id.into();
-
-        let (mode, focus_handle) = window.with_id(id.clone(), |window| {
-            let mode = window.use_state(cx, |_, _| NumberFieldMode::default());
-            let focus_handle = window.use_state(cx, |_, cx| cx.focus_handle());
-            (mode, focus_handle)
-        });
-
-        Self {
-            id,
-            mode,
-            value,
-            focus_handle: focus_handle.read(cx).clone(),
-            format: Box::new(T::default_format),
-            large_step: T::large_step(),
-            step: T::default_step(),
-            small_step: T::small_step(),
-            min_value: T::min_value(),
-            max_value: T::max_value(),
-            on_reset: None,
-            on_change: Rc::new(|_, _, _| {}),
-            tab_index: None,
-        }
-    }
-
-    pub fn format(mut self, format: impl FnOnce(&T) -> String + 'static) -> Self {
-        self.format = Box::new(format);
-        self
-    }
-
-    pub fn small_step(mut self, step: T) -> Self {
-        self.small_step = step;
-        self
-    }
-
-    pub fn normal_step(mut self, step: T) -> Self {
-        self.step = step;
-        self
-    }
-
-    pub fn large_step(mut self, step: T) -> Self {
-        self.large_step = step;
-        self
-    }
-
-    pub fn min(mut self, min: T) -> Self {
-        self.min_value = min;
-        self
-    }
-
-    pub fn max(mut self, max: T) -> Self {
-        self.max_value = max;
-        self
-    }
-
-    pub fn on_reset(
-        mut self,
-        on_reset: impl Fn(&ClickEvent, &mut Window, &mut App) + 'static,
-    ) -> Self {
-        self.on_reset = Some(Box::new(on_reset));
-        self
-    }
-
-    pub fn tab_index(mut self, tab_index: isize) -> Self {
-        self.tab_index = Some(tab_index);
-        self
-    }
-
-    pub fn on_change(mut self, on_change: impl Fn(&T, &mut Window, &mut App) + 'static) -> Self {
-        self.on_change = Rc::new(on_change);
-        self
-    }
-}
-
-impl<T: NumberFieldType> IntoElement for NumberField<T> {
-    type Element = gpui::Component<Self>;
-
-    fn into_element(self) -> Self::Element {
-        gpui::Component::new(self)
-    }
-}
-
-impl<T: NumberFieldType> RenderOnce for NumberField<T> {
-    fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let mut tab_index = self.tab_index;
-
-        let get_step = {
-            let large_step = self.large_step;
-            let step = self.step;
-            let small_step = self.small_step;
-            move |modifiers: Modifiers| -> T {
-                if modifiers.shift {
-                    large_step
-                } else if modifiers.alt {
-                    small_step
-                } else {
-                    step
-                }
-            }
-        };
-
-        let bg_color = cx.theme().colors().surface_background;
-        let hover_bg_color = cx.theme().colors().element_hover;
-
-        let border_color = cx.theme().colors().border_variant;
-        let focus_border_color = cx.theme().colors().border_focused;
-
-        let base_button = |icon: IconName| {
-            h_flex()
-                .cursor_pointer()
-                .p_1p5()
-                .size_full()
-                .justify_center()
-                .overflow_hidden()
-                .border_1()
-                .border_color(border_color)
-                .bg(bg_color)
-                .hover(|s| s.bg(hover_bg_color))
-                .focus_visible(|s| s.border_color(focus_border_color).bg(hover_bg_color))
-                .child(Icon::new(icon).size(IconSize::Small))
-        };
-
-        h_flex()
-            .id(self.id.clone())
-            .track_focus(&self.focus_handle)
-            .gap_1()
-            .when_some(self.on_reset, |this, on_reset| {
-                this.child(
-                    IconButton::new("reset", IconName::RotateCcw)
-                        .icon_size(IconSize::Small)
-                        .when_some(tab_index.as_mut(), |this, tab_index| {
-                            *tab_index += 1;
-                            this.tab_index(*tab_index - 1)
-                        })
-                        .on_click(on_reset),
-                )
-            })
-            .child(
-                h_flex()
-                    .map(|decrement| {
-                        let decrement_handler = {
-                            let value = self.value;
-                            let on_change = self.on_change.clone();
-                            let min = self.min_value;
-                            move |click: &ClickEvent, window: &mut Window, cx: &mut App| {
-                                let step = get_step(click.modifiers());
-                                let new_value = value.saturating_sub(step);
-                                let new_value = if new_value < min { min } else { new_value };
-                                on_change(&new_value, window, cx);
-                            }
-                        };
-
-                        decrement.child(
-                            base_button(IconName::Dash)
-                                .id("decrement_button")
-                                .rounded_tl_sm()
-                                .rounded_bl_sm()
-                                .tab_index(
-                                    tab_index
-                                        .as_mut()
-                                        .map(|tab_index| {
-                                            *tab_index += 1;
-                                            *tab_index - 1
-                                        })
-                                        .unwrap_or(0),
-                                )
-                                .on_click(decrement_handler),
-                        )
-                    })
-                    .child(
-                        h_flex()
-                            .min_w_16()
-                            .size_full()
-                            .border_y_1()
-                            .border_color(border_color)
-                            .bg(bg_color)
-                            .in_focus(|this| this.border_color(focus_border_color))
-                            .child(match *self.mode.read(cx) {
-                                NumberFieldMode::Read => h_flex()
-                                    .px_1()
-                                    .flex_1()
-                                    .justify_center()
-                                    .child(Label::new((self.format)(&self.value)))
-                                    .into_any_element(),
-                                // Edit mode is disabled until we implement center text alignment for editor
-                                // mode.write(cx, NumberFieldMode::Edit);
-                                //
-                                // When we get to making Edit mode work, we shouldn't even focus the decrement/increment buttons.
-                                // Focus should go instead straight to the editor, avoiding any double-step focus.
-                                // In this world, the buttons become a mouse-only interaction, given users should be able
-                                // to do everything they'd do with the buttons straight in the editor anyway.
-                                NumberFieldMode::Edit => h_flex()
-                                    .flex_1()
-                                    .child(window.use_state(cx, {
-                                        |window, cx| {
-                                            let previous_focus_handle = window.focused(cx);
-                                            let mut editor = Editor::single_line(window, cx);
-                                            let mut style = EditorStyle::default();
-                                            style.text.text_align = gpui::TextAlign::Right;
-                                            editor.set_style(style, window, cx);
-
-                                            editor.set_text(format!("{}", self.value), window, cx);
-                                            cx.on_focus_out(&editor.focus_handle(cx), window, {
-                                                let mode = self.mode.clone();
-                                                let min = self.min_value;
-                                                let max = self.max_value;
-                                                let on_change = self.on_change.clone();
-                                                move |this, _, window, cx| {
-                                                    if let Ok(new_value) =
-                                                        this.text(cx).parse::<T>()
-                                                    {
-                                                        let new_value = if new_value < min {
-                                                            min
-                                                        } else if new_value > max {
-                                                            max
-                                                        } else {
-                                                            new_value
-                                                        };
-
-                                                        if let Some(previous) =
-                                                            previous_focus_handle.as_ref()
-                                                        {
-                                                            window.focus(previous);
-                                                        }
-                                                        on_change(&new_value, window, cx);
-                                                    };
-                                                    mode.write(cx, NumberFieldMode::Read);
-                                                }
-                                            })
-                                            .detach();
-
-                                            window.focus(&editor.focus_handle(cx));
-
-                                            editor
-                                        }
-                                    }))
-                                    .on_action::<menu::Confirm>({
-                                        move |_, window, _| {
-                                            window.blur();
-                                        }
-                                    })
-                                    .into_any_element(),
-                            }),
-                    )
-                    .map(|increment| {
-                        let increment_handler = {
-                            let value = self.value;
-                            let on_change = self.on_change.clone();
-                            let max = self.max_value;
-                            move |click: &ClickEvent, window: &mut Window, cx: &mut App| {
-                                let step = get_step(click.modifiers());
-                                let new_value = value.saturating_add(step);
-                                let new_value = if new_value > max { max } else { new_value };
-                                on_change(&new_value, window, cx);
-                            }
-                        };
-
-                        increment.child(
-                            base_button(IconName::Plus)
-                                .id("increment_button")
-                                .rounded_tr_sm()
-                                .rounded_br_sm()
-                                .tab_index(
-                                    tab_index
-                                        .as_mut()
-                                        .map(|tab_index| {
-                                            *tab_index += 1;
-                                            *tab_index - 1
-                                        })
-                                        .unwrap_or(0),
-                                )
-                                .on_click(increment_handler),
-                        )
-                    }),
-            )
-    }
-}
-
-impl Component for NumberField<usize> {
-    fn scope() -> ComponentScope {
-        ComponentScope::Input
-    }
-
-    fn name() -> &'static str {
-        "Number Field"
-    }
-
-    fn sort_name() -> &'static str {
-        Self::name()
-    }
-
-    fn description() -> Option<&'static str> {
-        Some("A numeric input element with increment and decrement buttons.")
-    }
-
-    fn preview(window: &mut Window, cx: &mut App) -> Option<AnyElement> {
-        let stepper_example = window.use_state(cx, |_, _| 100.0);
-
-        Some(
-            v_flex()
-                .gap_6()
-                .children(vec![single_example(
-                    "Default Numeric Stepper",
-                    NumberField::new(
-                        "numeric-stepper-component-preview",
-                        *stepper_example.read(cx),
-                        window,
-                        cx,
-                    )
-                    .on_change({
-                        let stepper_example = stepper_example.clone();
-                        move |value, _, cx| stepper_example.write(cx, *value)
-                    })
-                    .min(1.0)
-                    .max(100.0)
-                    .into_any_element(),
-                )])
-                .into_any_element(),
-        )
-    }
-}
diff --git a/crates/ui_input/src/ui_input.rs b/crates/ui_input/src/ui_input.rs
deleted file mode 100644
index ddc0e659a2..0000000000
--- a/crates/ui_input/src/ui_input.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-//! This crate provides UI components that can be used for form-like scenarios, such as a input and number field.
-//!
-//! It can't be located in the `ui` crate because it depends on `editor`.
-//!
-mod input_field;
-mod number_field;
-
-pub use input_field::*;
-pub use number_field::*;
diff --git a/crates/ui_macros/Cargo.toml b/crates/ui_macros/Cargo.toml
deleted file mode 100644
index 74bd2186a7..0000000000
--- a/crates/ui_macros/Cargo.toml
+++ /dev/null
@@ -1,21 +0,0 @@
-[package]
-name = "ui_macros"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/ui_macros.rs"
-proc-macro = true
-
-[dependencies]
-quote.workspace = true
-syn.workspace = true
-
-[dev-dependencies]
-component.workspace = true
-ui.workspace = true
diff --git a/crates/ui_macros/LICENSE-GPL b/crates/ui_macros/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/ui_macros/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/ui_macros/src/derive_register_component.rs b/crates/ui_macros/src/derive_register_component.rs
deleted file mode 100644
index 64ab132cc0..0000000000
--- a/crates/ui_macros/src/derive_register_component.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-use proc_macro::TokenStream;
-use quote::quote;
-use syn::{DeriveInput, parse_macro_input};
-
-pub fn derive_register_component(input: TokenStream) -> TokenStream {
-    let input = parse_macro_input!(input as DeriveInput);
-
-    let name = input.ident;
-    let register_fn_name = syn::Ident::new(
-        &format!("__component_registry_internal_register_{}", name),
-        name.span(),
-    );
-    let expanded = quote! {
-        const _: () = {
-            struct AssertComponent<T: component::Component>(::std::marker::PhantomData<T>);
-            let _ = AssertComponent::<#name>(::std::marker::PhantomData);
-        };
-
-        #[allow(non_snake_case)]
-        fn #register_fn_name() {
-            component::register_component::<#name>();
-        }
-
-        component::__private::inventory::submit! {
-            component::ComponentFn::new(#register_fn_name)
-        }
-    };
-    expanded.into()
-}
diff --git a/crates/ui_macros/src/dynamic_spacing.rs b/crates/ui_macros/src/dynamic_spacing.rs
deleted file mode 100644
index 15ba3e241e..0000000000
--- a/crates/ui_macros/src/dynamic_spacing.rs
+++ /dev/null
@@ -1,167 +0,0 @@
-use proc_macro::TokenStream;
-use quote::{format_ident, quote};
-use syn::{
-    LitInt, Token, parse::Parse, parse::ParseStream, parse_macro_input, punctuated::Punctuated,
-};
-
-struct DynamicSpacingInput {
-    values: Punctuated<DynamicSpacingValue, Token![,]>,
-}
-
-// The input for the derive macro is a list of values.
-//
-// When a single value is provided, the standard spacing formula is
-// used to derive the of spacing values.
-//
-// When a tuple of three values is provided, the values are used as
-// the spacing values directly.
-enum DynamicSpacingValue {
-    Single(LitInt),
-    Tuple(LitInt, LitInt, LitInt),
-}
-
-impl Parse for DynamicSpacingInput {
-    fn parse(input: ParseStream) -> syn::Result<Self> {
-        Ok(DynamicSpacingInput {
-            values: input.parse_terminated(DynamicSpacingValue::parse, Token![,])?,
-        })
-    }
-}
-
-impl Parse for DynamicSpacingValue {
-    fn parse(input: ParseStream) -> syn::Result<Self> {
-        if input.peek(syn::token::Paren) {
-            let content;
-            syn::parenthesized!(content in input);
-            let a: LitInt = content.parse()?;
-            content.parse::<Token![,]>()?;
-            let b: LitInt = content.parse()?;
-            content.parse::<Token![,]>()?;
-            let c: LitInt = content.parse()?;
-            Ok(DynamicSpacingValue::Tuple(a, b, c))
-        } else {
-            Ok(DynamicSpacingValue::Single(input.parse()?))
-        }
-    }
-}
-
-/// Derives the spacing method for the `DynamicSpacing` enum.
-pub fn derive_spacing(input: TokenStream) -> TokenStream {
-    let input = parse_macro_input!(input as DynamicSpacingInput);
-
-    let spacing_ratios: Vec<_> = input
-        .values
-        .iter()
-        .map(|v| {
-            let variant = match v {
-                DynamicSpacingValue::Single(n) => {
-                    format_ident!("Base{:02}", n.base10_parse::<u32>().unwrap())
-                }
-                DynamicSpacingValue::Tuple(_, b, _) => {
-                    format_ident!("Base{:02}", b.base10_parse::<u32>().unwrap())
-                }
-            };
-            match v {
-                DynamicSpacingValue::Single(n) => {
-                    let n = n.base10_parse::<f32>().unwrap();
-                    quote! {
-                        DynamicSpacing::#variant => match ThemeSettings::get_global(cx).ui_density {
-                            ::theme::UiDensity::Compact => (#n - 4.0).max(0.0) / BASE_REM_SIZE_IN_PX,
-                            ::theme::UiDensity::Default => #n / BASE_REM_SIZE_IN_PX,
-                            ::theme::UiDensity::Comfortable => (#n + 4.0) / BASE_REM_SIZE_IN_PX,
-                        }
-                    }
-                }
-                DynamicSpacingValue::Tuple(a, b, c) => {
-                    let a = a.base10_parse::<f32>().unwrap();
-                    let b = b.base10_parse::<f32>().unwrap();
-                    let c = c.base10_parse::<f32>().unwrap();
-                    quote! {
-                        DynamicSpacing::#variant => match ThemeSettings::get_global(cx).ui_density {
-                            ::theme::UiDensity::Compact => #a / BASE_REM_SIZE_IN_PX,
-                            ::theme::UiDensity::Default => #b / BASE_REM_SIZE_IN_PX,
-                            ::theme::UiDensity::Comfortable => #c / BASE_REM_SIZE_IN_PX,
-                        }
-                    }
-                }
-            }
-        })
-        .collect();
-
-    let (variant_names, doc_strings): (Vec<_>, Vec<_>) = input
-        .values
-        .iter()
-        .map(|v| {
-            let variant = match v {
-                DynamicSpacingValue::Single(n) => {
-                    format_ident!("Base{:02}", n.base10_parse::<u32>().unwrap())
-                }
-                DynamicSpacingValue::Tuple(_, b, _) => {
-                    format_ident!("Base{:02}", b.base10_parse::<u32>().unwrap())
-                }
-            };
-            let doc_string = match v {
-                DynamicSpacingValue::Single(n) => {
-                    let n = n.base10_parse::<f32>().unwrap();
-                    let compact = (n - 4.0).max(0.0);
-                    let comfortable = n + 4.0;
-                    format!(
-                        "`{}px`|`{}px`|`{}px (@16px/rem)` - Scales with the user's rem size.",
-                        compact, n, comfortable
-                    )
-                }
-                DynamicSpacingValue::Tuple(a, b, c) => {
-                    let a = a.base10_parse::<f32>().unwrap();
-                    let b = b.base10_parse::<f32>().unwrap();
-                    let c = c.base10_parse::<f32>().unwrap();
-                    format!(
-                        "`{}px`|`{}px`|`{}px (@16px/rem)` - Scales with the user's rem size.",
-                        a, b, c
-                    )
-                }
-            };
-            (quote!(#variant), quote!(#doc_string))
-        })
-        .unzip();
-
-    let expanded = quote! {
-        /// A dynamic spacing system that adjusts spacing based on
-        /// [UiDensity].
-        ///
-        /// The number following "Base" refers to the base pixel size
-        /// at the default rem size and spacing settings.
-        ///
-        /// When possible, [DynamicSpacing] should be used over manual
-        /// or built-in spacing values in places dynamic spacing is needed.
-        #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
-        pub enum DynamicSpacing {
-            #(
-                #[doc = #doc_strings]
-                #variant_names,
-            )*
-        }
-
-        impl DynamicSpacing {
-            /// Returns the spacing ratio, should only be used internally.
-            fn spacing_ratio(&self, cx: &App) -> f32 {
-                const BASE_REM_SIZE_IN_PX: f32 = 16.0;
-                match self {
-                    #(#spacing_ratios,)*
-                }
-            }
-
-            /// Returns the spacing value in rems.
-            pub fn rems(&self, cx: &App) -> Rems {
-                rems(self.spacing_ratio(cx))
-            }
-
-            /// Returns the spacing value in pixels.
-            pub fn px(&self, cx: &App) -> Pixels {
-                let ui_font_size_f32: f32 = ThemeSettings::get_global(cx).ui_font_size(cx).into();
-                px(ui_font_size_f32 * self.spacing_ratio(cx))
-            }
-        }
-    };
-
-    TokenStream::from(expanded)
-}
diff --git a/crates/ui_macros/src/ui_macros.rs b/crates/ui_macros/src/ui_macros.rs
deleted file mode 100644
index ce48a21c11..0000000000
--- a/crates/ui_macros/src/ui_macros.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-mod derive_register_component;
-mod dynamic_spacing;
-
-use proc_macro::TokenStream;
-
-/// Generates the DynamicSpacing enum used for density-aware spacing in the UI.
-#[proc_macro]
-pub fn derive_dynamic_spacing(input: TokenStream) -> TokenStream {
-    dynamic_spacing::derive_spacing(input)
-}
-
-/// Registers components that implement the `Component` trait.
-///
-/// This proc macro is used to automatically register structs that implement
-/// the `Component` trait with the [`component::ComponentRegistry`].
-///
-/// If the component trait is not implemented, it will generate a compile-time error.
-///
-/// # Example
-///
-/// ```
-/// use ui::Component;
-/// use ui_macros::RegisterComponent;
-///
-/// #[derive(RegisterComponent)]
-/// struct MyComponent;
-///
-/// impl Component for MyComponent {
-///     // Component implementation
-/// }
-/// ```
-///
-/// This example will add MyComponent to the ComponentRegistry.
-#[proc_macro_derive(RegisterComponent)]
-pub fn derive_register_component(input: TokenStream) -> TokenStream {
-    derive_register_component::derive_register_component(input)
-}
diff --git a/crates/ui_prompt/Cargo.toml b/crates/ui_prompt/Cargo.toml
deleted file mode 100644
index 55a9828843..0000000000
--- a/crates/ui_prompt/Cargo.toml
+++ /dev/null
@@ -1,24 +0,0 @@
-[package]
-name = "ui_prompt"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/ui_prompt.rs"
-
-[features]
-default = []
-
-[dependencies]
-gpui.workspace = true
-markdown.workspace = true
-menu.workspace = true
-settings.workspace = true
-theme.workspace = true
-ui.workspace = true
-workspace.workspace = true
diff --git a/crates/ui_prompt/LICENSE-GPL b/crates/ui_prompt/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/ui_prompt/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/ui_prompt/src/ui_prompt.rs b/crates/ui_prompt/src/ui_prompt.rs
deleted file mode 100644
index 3b2716fd92..0000000000
--- a/crates/ui_prompt/src/ui_prompt.rs
+++ /dev/null
@@ -1,205 +0,0 @@
-use gpui::{
-    App, Entity, EventEmitter, FocusHandle, Focusable, PromptButton, PromptHandle, PromptLevel,
-    PromptResponse, RenderablePromptHandle, SharedString, TextStyleRefinement, Window, div,
-    prelude::*,
-};
-use markdown::{Markdown, MarkdownElement, MarkdownStyle};
-use settings::{Settings, SettingsStore};
-use theme::ThemeSettings;
-use ui::{FluentBuilder, TintColor, prelude::*};
-use workspace::WorkspaceSettings;
-
-pub fn init(cx: &mut App) {
-    process_settings(cx);
-
-    cx.observe_global::<SettingsStore>(process_settings)
-        .detach();
-}
-
-fn process_settings(cx: &mut App) {
-    let settings = WorkspaceSettings::get_global(cx);
-    if settings.use_system_prompts && cfg!(not(any(target_os = "linux", target_os = "freebsd"))) {
-        cx.reset_prompt_builder();
-    } else {
-        cx.set_prompt_builder(zed_prompt_renderer);
-    }
-}
-
-/// Use this function in conjunction with [App::set_prompt_builder] to force
-/// GPUI to use the internal prompt system.
-fn zed_prompt_renderer(
-    level: PromptLevel,
-    message: &str,
-    detail: Option<&str>,
-    actions: &[PromptButton],
-    handle: PromptHandle,
-    window: &mut Window,
-    cx: &mut App,
-) -> RenderablePromptHandle {
-    let renderer = cx.new({
-        |cx| ZedPromptRenderer {
-            _level: level,
-            message: cx.new(|cx| Markdown::new(SharedString::new(message), None, None, cx)),
-            actions: actions.iter().map(|a| a.label().to_string()).collect(),
-            focus: cx.focus_handle(),
-            active_action_id: 0,
-            detail: detail
-                .filter(|text| !text.is_empty())
-                .map(|text| cx.new(|cx| Markdown::new(SharedString::new(text), None, None, cx))),
-        }
-    });
-
-    handle.with_view(renderer, window, cx)
-}
-
-pub struct ZedPromptRenderer {
-    _level: PromptLevel,
-    message: Entity<Markdown>,
-    actions: Vec<String>,
-    focus: FocusHandle,
-    active_action_id: usize,
-    detail: Option<Entity<Markdown>>,
-}
-
-impl ZedPromptRenderer {
-    fn confirm(&mut self, _: &menu::Confirm, _window: &mut Window, cx: &mut Context<Self>) {
-        cx.emit(PromptResponse(self.active_action_id));
-    }
-
-    fn cancel(&mut self, _: &menu::Cancel, _window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(ix) = self.actions.iter().position(|a| a == "Cancel") {
-            cx.emit(PromptResponse(ix));
-        }
-    }
-
-    fn select_first(
-        &mut self,
-        _: &menu::SelectFirst,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.active_action_id = self.actions.len().saturating_sub(1);
-        cx.notify();
-    }
-
-    fn select_last(&mut self, _: &menu::SelectLast, _window: &mut Window, cx: &mut Context<Self>) {
-        self.active_action_id = 0;
-        cx.notify();
-    }
-
-    fn select_next(&mut self, _: &menu::SelectNext, _window: &mut Window, cx: &mut Context<Self>) {
-        self.active_action_id = (self.active_action_id + 1) % self.actions.len();
-        cx.notify();
-    }
-
-    fn select_previous(
-        &mut self,
-        _: &menu::SelectPrevious,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.active_action_id > 0 {
-            self.active_action_id -= 1;
-        } else {
-            self.active_action_id = self.actions.len().saturating_sub(1);
-        }
-        cx.notify();
-    }
-}
-
-impl Render for ZedPromptRenderer {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let settings = ThemeSettings::get_global(cx);
-
-        let dialog = v_flex()
-            .key_context("Prompt")
-            .cursor_default()
-            .track_focus(&self.focus)
-            .on_action(cx.listener(Self::confirm))
-            .on_action(cx.listener(Self::cancel))
-            .on_action(cx.listener(Self::select_next))
-            .on_action(cx.listener(Self::select_previous))
-            .on_action(cx.listener(Self::select_first))
-            .on_action(cx.listener(Self::select_last))
-            .w_80()
-            .p_4()
-            .gap_4()
-            .elevation_3(cx)
-            .overflow_hidden()
-            .font_family(settings.ui_font.family.clone())
-            .child(div().w_full().child(MarkdownElement::new(
-                self.message.clone(),
-                markdown_style(true, window, cx),
-            )))
-            .children(self.detail.clone().map(|detail| {
-                div().w_full().text_xs().child(MarkdownElement::new(
-                    detail,
-                    markdown_style(false, window, cx),
-                ))
-            }))
-            .child(
-                v_flex()
-                    .gap_1()
-                    .children(self.actions.iter().enumerate().map(|(ix, action)| {
-                        Button::new(ix, action.clone())
-                            .full_width()
-                            .style(ButtonStyle::Outlined)
-                            .when(ix == self.active_action_id, |s| {
-                                s.style(ButtonStyle::Tinted(TintColor::Accent))
-                            })
-                            .tab_index(ix as isize)
-                            .on_click(cx.listener(move |_, _, _window, cx| {
-                                cx.emit(PromptResponse(ix));
-                            }))
-                    })),
-            );
-
-        div()
-            .size_full()
-            .occlude()
-            .bg(gpui::black().opacity(0.2))
-            .child(
-                v_flex()
-                    .size_full()
-                    .absolute()
-                    .top_0()
-                    .left_0()
-                    .items_center()
-                    .justify_center()
-                    .child(dialog),
-            )
-    }
-}
-
-fn markdown_style(main_message: bool, window: &Window, cx: &App) -> MarkdownStyle {
-    let mut base_text_style = window.text_style();
-    let settings = ThemeSettings::get_global(cx);
-    let font_size = settings.ui_font_size(cx).into();
-
-    let color = if main_message {
-        Color::Default.color(cx)
-    } else {
-        Color::Muted.color(cx)
-    };
-
-    base_text_style.refine(&TextStyleRefinement {
-        font_family: Some(settings.ui_font.family.clone()),
-        font_size: Some(font_size),
-        color: Some(color),
-        ..Default::default()
-    });
-
-    MarkdownStyle {
-        base_text_style,
-        selection_background_color: cx.theme().colors().element_selection_background,
-        ..Default::default()
-    }
-}
-
-impl EventEmitter<PromptResponse> for ZedPromptRenderer {}
-
-impl Focusable for ZedPromptRenderer {
-    fn focus_handle(&self, _: &crate::App) -> FocusHandle {
-        self.focus.clone()
-    }
-}
diff --git a/crates/util/src/shell_env.rs b/crates/util/src/shell_env.rs
deleted file mode 100644
index c41a28b469..0000000000
--- a/crates/util/src/shell_env.rs
+++ /dev/null
@@ -1,221 +0,0 @@
-use std::path::Path;
-
-use anyhow::{Context as _, Result};
-use collections::HashMap;
-
-use crate::shell::ShellKind;
-
-pub fn print_env() {
-    let env_vars: HashMap<String, String> = std::env::vars().collect();
-    let json = serde_json::to_string_pretty(&env_vars).unwrap_or_else(|err| {
-        eprintln!("Error serializing environment variables: {}", err);
-        std::process::exit(1);
-    });
-    println!("{}", json);
-}
-
-/// Capture all environment variables from the login shell in the given directory.
-pub async fn capture(
-    shell_path: impl AsRef<Path>,
-    args: &[String],
-    directory: impl AsRef<Path>,
-) -> Result<collections::HashMap<String, String>> {
-    #[cfg(windows)]
-    return capture_windows(shell_path.as_ref(), args, directory.as_ref()).await;
-    #[cfg(unix)]
-    return capture_unix(shell_path.as_ref(), args, directory.as_ref()).await;
-}
-
-#[cfg(unix)]
-async fn capture_unix(
-    shell_path: &Path,
-    args: &[String],
-    directory: &Path,
-) -> Result<collections::HashMap<String, String>> {
-    use std::os::unix::process::CommandExt;
-
-    use crate::command::new_std_command;
-
-    let shell_kind = ShellKind::new(shell_path, false);
-    let zed_path = super::get_shell_safe_zed_path(shell_kind)?;
-
-    let mut command_string = String::new();
-    let mut command = new_std_command(shell_path);
-    command.args(args);
-    // In some shells, file descriptors greater than 2 cannot be used in interactive mode,
-    // so file descriptor 0 (stdin) is used instead. This impacts zsh, old bash; perhaps others.
-    // See: https://github.com/zed-industries/zed/pull/32136#issuecomment-2999645482
-    const FD_STDIN: std::os::fd::RawFd = 0;
-    const FD_STDOUT: std::os::fd::RawFd = 1;
-    const FD_STDERR: std::os::fd::RawFd = 2;
-
-    let (fd_num, redir) = match shell_kind {
-        ShellKind::Rc => (FD_STDIN, format!(">[1={}]", FD_STDIN)), // `[1=0]`
-        ShellKind::Nushell | ShellKind::Tcsh => (FD_STDOUT, "".to_string()),
-        // xonsh doesn't support redirecting to stdin, and control sequences are printed to
-        // stdout on startup
-        ShellKind::Xonsh => (FD_STDERR, "o>e".to_string()),
-        ShellKind::PowerShell => (FD_STDIN, format!(">{}", FD_STDIN)),
-        _ => (FD_STDIN, format!(">&{}", FD_STDIN)), // `>&0`
-    };
-
-    match shell_kind {
-        ShellKind::Csh | ShellKind::Tcsh => {
-            // For csh/tcsh, login shell requires passing `-` as 0th argument (instead of `-l`)
-            command.arg0("-");
-        }
-        ShellKind::Fish => {
-            // in fish, asdf, direnv attach to the `fish_prompt` event
-            command_string.push_str("emit fish_prompt;");
-            command.arg("-l");
-        }
-        _ => {
-            command.arg("-l");
-        }
-    }
-    // cd into the directory, triggering directory specific side-effects (asdf, direnv, etc)
-    command_string.push_str(&format!("cd '{}';", directory.display()));
-    if let Some(prefix) = shell_kind.command_prefix() {
-        command_string.push(prefix);
-    }
-    command_string.push_str(&format!("{} --printenv {}", zed_path, redir));
-    command.args(["-i", "-c", &command_string]);
-
-    super::set_pre_exec_to_start_new_session(&mut command);
-
-    let (env_output, process_output) = spawn_and_read_fd(command, fd_num).await?;
-    let env_output = String::from_utf8_lossy(&env_output);
-
-    anyhow::ensure!(
-        process_output.status.success(),
-        "login shell exited with {}. stdout: {:?}, stderr: {:?}",
-        process_output.status,
-        String::from_utf8_lossy(&process_output.stdout),
-        String::from_utf8_lossy(&process_output.stderr),
-    );
-
-    // Parse the JSON output from zed --printenv
-    let env_map: collections::HashMap<String, String> = serde_json::from_str(&env_output)
-        .with_context(|| {
-            format!("Failed to deserialize environment variables from json: {env_output}")
-        })?;
-    Ok(env_map)
-}
-
-#[cfg(unix)]
-async fn spawn_and_read_fd(
-    mut command: std::process::Command,
-    child_fd: std::os::fd::RawFd,
-) -> anyhow::Result<(Vec<u8>, std::process::Output)> {
-    use command_fds::{CommandFdExt, FdMapping};
-    use std::{io::Read, process::Stdio};
-
-    let (mut reader, writer) = std::io::pipe()?;
-
-    command.fd_mappings(vec![FdMapping {
-        parent_fd: writer.into(),
-        child_fd,
-    }])?;
-
-    let process = smol::process::Command::from(command)
-        .stdin(Stdio::null())
-        .stdout(Stdio::piped())
-        .stderr(Stdio::piped())
-        .spawn()?;
-
-    let mut buffer = Vec::new();
-    reader.read_to_end(&mut buffer)?;
-
-    Ok((buffer, process.output().await?))
-}
-
-#[cfg(windows)]
-async fn capture_windows(
-    shell_path: &Path,
-    args: &[String],
-    directory: &Path,
-) -> Result<collections::HashMap<String, String>> {
-    use std::process::Stdio;
-
-    let zed_path =
-        std::env::current_exe().context("Failed to determine current zed executable path.")?;
-
-    let shell_kind = ShellKind::new(shell_path, true);
-    let mut cmd = crate::command::new_smol_command(shell_path);
-    cmd.args(args);
-    let cmd = match shell_kind {
-        ShellKind::Csh
-        | ShellKind::Tcsh
-        | ShellKind::Rc
-        | ShellKind::Fish
-        | ShellKind::Xonsh
-        | ShellKind::Posix => cmd.args([
-            "-l",
-            "-i",
-            "-c",
-            &format!(
-                "cd '{}'; '{}' --printenv",
-                directory.display(),
-                zed_path.display()
-            ),
-        ]),
-        ShellKind::PowerShell | ShellKind::Pwsh => cmd.args([
-            "-NonInteractive",
-            "-NoProfile",
-            "-Command",
-            &format!(
-                "Set-Location '{}'; & '{}' --printenv",
-                directory.display(),
-                zed_path.display()
-            ),
-        ]),
-        ShellKind::Elvish => cmd.args([
-            "-c",
-            &format!(
-                "cd '{}'; '{}' --printenv",
-                directory.display(),
-                zed_path.display()
-            ),
-        ]),
-        ShellKind::Nushell => cmd.args([
-            "-c",
-            &format!(
-                "cd '{}'; {}'{}' --printenv",
-                directory.display(),
-                shell_kind
-                    .command_prefix()
-                    .map(|prefix| prefix.to_string())
-                    .unwrap_or_default(),
-                zed_path.display()
-            ),
-        ]),
-        ShellKind::Cmd => cmd.args([
-            "/c",
-            "cd",
-            &directory.display().to_string(),
-            "&&",
-            &zed_path.display().to_string(),
-            "--printenv",
-        ]),
-    }
-    .stdin(Stdio::null())
-    .stdout(Stdio::piped())
-    .stderr(Stdio::piped());
-    let output = cmd
-        .output()
-        .await
-        .with_context(|| format!("command {cmd:?}"))?;
-    anyhow::ensure!(
-        output.status.success(),
-        "Command {cmd:?} failed with {}. stdout: {:?}, stderr: {:?}",
-        output.status,
-        String::from_utf8_lossy(&output.stdout),
-        String::from_utf8_lossy(&output.stderr),
-    );
-    let env_output = String::from_utf8_lossy(&output.stdout);
-
-    // Parse the JSON output from zed --printenv
-    serde_json::from_str(&env_output).with_context(|| {
-        format!("Failed to deserialize environment variables from json: {env_output}")
-    })
-}
diff --git a/crates/util/src/util.rs b/crates/util/src/util.rs
index 4ea3590196..d7383a4975 100644
--- a/crates/util/src/util.rs
+++ b/crates/util/src/util.rs
@@ -10,18 +10,17 @@ pub mod schemars;
 pub mod serde;
 pub mod shell;
 pub mod shell_builder;
-pub mod shell_env;
 pub mod size;
 #[cfg(any(test, feature = "test-support"))]
 pub mod test;
 pub mod time;
 
-use anyhow::{Context as _, Result};
+use anyhow::Result;
 use futures::Future;
 use itertools::Either;
-use paths::PathExt;
+
 use regex::Regex;
-use std::path::PathBuf;
+
 use std::sync::{LazyLock, OnceLock};
 use std::{
     borrow::Cow,
@@ -224,157 +223,7 @@ where
     items.sort_by(compare);
 }
 
-/// Prevents execution of the application with root privileges on Unix systems.
-///
-/// This function checks if the current process is running with root privileges
-/// and terminates the program with an error message unless explicitly allowed via the
-/// `ZED_ALLOW_ROOT` environment variable.
-#[cfg(unix)]
-pub fn prevent_root_execution() {
-    let is_root = nix::unistd::geteuid().is_root();
-    let allow_root = std::env::var("ZED_ALLOW_ROOT").is_ok_and(|val| val == "true");
 
-    if is_root && !allow_root {
-        eprintln!(
-            "\
-Error: Running Zed as root or via sudo is unsupported.
-       Doing so (even once) may subtly break things for all subsequent non-root usage of Zed.
-       It is untested and not recommended, don't complain when things break.
-       If you wish to proceed anyways, set `ZED_ALLOW_ROOT=true` in your environment."
-        );
-        std::process::exit(1);
-    }
-}
-
-#[cfg(unix)]
-fn load_shell_from_passwd() -> Result<()> {
-    let buflen = match unsafe { libc::sysconf(libc::_SC_GETPW_R_SIZE_MAX) } {
-        n if n < 0 => 1024,
-        n => n as usize,
-    };
-    let mut buffer = Vec::with_capacity(buflen);
-
-    let mut pwd: std::mem::MaybeUninit<libc::passwd> = std::mem::MaybeUninit::uninit();
-    let mut result: *mut libc::passwd = std::ptr::null_mut();
-
-    let uid = unsafe { libc::getuid() };
-    let status = unsafe {
-        libc::getpwuid_r(
-            uid,
-            pwd.as_mut_ptr(),
-            buffer.as_mut_ptr() as *mut libc::c_char,
-            buflen,
-            &mut result,
-        )
-    };
-    anyhow::ensure!(!result.is_null(), "passwd entry for uid {} not found", uid);
-
-    // SAFETY: If `getpwuid_r` doesn't error, we have the entry here.
-    let entry = unsafe { pwd.assume_init() };
-
-    anyhow::ensure!(
-        status == 0,
-        "call to getpwuid_r failed. uid: {}, status: {}",
-        uid,
-        status
-    );
-    anyhow::ensure!(
-        entry.pw_uid == uid,
-        "passwd entry has different uid ({}) than getuid ({}) returned",
-        entry.pw_uid,
-        uid,
-    );
-
-    let shell = unsafe { std::ffi::CStr::from_ptr(entry.pw_shell).to_str().unwrap() };
-    let should_set_shell = env::var("SHELL").map_or(true, |shell_env| {
-        shell_env != shell && !std::path::Path::new(&shell_env).exists()
-    });
-
-    if should_set_shell {
-        log::info!(
-            "updating SHELL environment variable to value from passwd entry: {:?}",
-            shell,
-        );
-        unsafe { env::set_var("SHELL", shell) };
-    }
-
-    Ok(())
-}
-
-/// Returns a shell escaped path for the current zed executable
-pub fn get_shell_safe_zed_path(shell_kind: shell::ShellKind) -> anyhow::Result<String> {
-    let zed_path =
-        std::env::current_exe().context("Failed to determine current zed executable path.")?;
-
-    zed_path
-        .try_shell_safe(shell_kind)
-        .context("Failed to shell-escape Zed executable path.")
-}
-
-/// Returns a path for the zed cli executable, this function
-/// should be called from the zed executable, not zed-cli.
-pub fn get_zed_cli_path() -> Result<PathBuf> {
-    let zed_path =
-        std::env::current_exe().context("Failed to determine current zed executable path.")?;
-    let parent = zed_path
-        .parent()
-        .context("Failed to determine parent directory of zed executable path.")?;
-
-    let possible_locations: &[&str] = if cfg!(target_os = "macos") {
-        // On macOS, the zed executable and zed-cli are inside the app bundle,
-        // so here ./cli is for both installed and development builds.
-        &["./cli"]
-    } else if cfg!(target_os = "windows") {
-        // bin/zed.exe is for installed builds, ./cli.exe is for development builds.
-        &["bin/zed.exe", "./cli.exe"]
-    } else if cfg!(target_os = "linux") || cfg!(target_os = "freebsd") {
-        // bin is the standard, ./cli is for the target directory in development builds.
-        &["../bin/zed", "./cli"]
-    } else {
-        anyhow::bail!("unsupported platform for determining zed-cli path");
-    };
-
-    possible_locations
-        .iter()
-        .find_map(|p| {
-            parent
-                .join(p)
-                .canonicalize()
-                .ok()
-                .filter(|p| p != &zed_path)
-        })
-        .with_context(|| {
-            format!(
-                "could not find zed-cli from any of: {}",
-                possible_locations.join(", ")
-            )
-        })
-}
-
-#[cfg(unix)]
-pub async fn load_login_shell_environment() -> Result<()> {
-    load_shell_from_passwd().log_err();
-
-    // If possible, we want to `cd` in the user's `$HOME` to trigger programs
-    // such as direnv, asdf, mise, ... to adjust the PATH. These tools often hook
-    // into shell's `cd` command (and hooks) to manipulate env.
-    // We do this so that we get the env a user would have when spawning a shell
-    // in home directory.
-    for (name, value) in shell_env::capture(get_system_shell(), &[], paths::home_dir())
-        .await
-        .with_context(|| format!("capturing environment with {:?}", get_system_shell()))?
-    {
-        unsafe { env::set_var(&name, &value) };
-    }
-
-    log::info!(
-        "set environment variables from shell:{}, path:{}",
-        std::env::var("SHELL").unwrap_or_default(),
-        std::env::var("PATH").unwrap_or_default(),
-    );
-
-    Ok(())
-}
 
 /// Configures the process to start a new session, to prevent interactive shells from taking control
 /// of the terminal.
diff --git a/crates/vercel/Cargo.toml b/crates/vercel/Cargo.toml
deleted file mode 100644
index 98b26c9104..0000000000
--- a/crates/vercel/Cargo.toml
+++ /dev/null
@@ -1,22 +0,0 @@
-[package]
-name = "vercel"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/vercel.rs"
-
-[features]
-default = []
-schemars = ["dep:schemars"]
-
-[dependencies]
-anyhow.workspace = true
-schemars = { workspace = true, optional = true }
-serde.workspace = true
-strum.workspace = true
diff --git a/crates/vercel/LICENSE-GPL b/crates/vercel/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/vercel/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/vercel/src/vercel.rs b/crates/vercel/src/vercel.rs
deleted file mode 100644
index 8686fda53f..0000000000
--- a/crates/vercel/src/vercel.rs
+++ /dev/null
@@ -1,78 +0,0 @@
-use anyhow::Result;
-use serde::{Deserialize, Serialize};
-use strum::EnumIter;
-
-pub const VERCEL_API_URL: &str = "https://api.v0.dev/v1";
-
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
-#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq, EnumIter)]
-pub enum Model {
-    #[default]
-    #[serde(rename = "v0-1.5-md")]
-    VZeroOnePointFiveMedium,
-    #[serde(rename = "custom")]
-    Custom {
-        name: String,
-        /// The name displayed in the UI, such as in the assistant panel model dropdown menu.
-        display_name: Option<String>,
-        max_tokens: u64,
-        max_output_tokens: Option<u64>,
-        max_completion_tokens: Option<u64>,
-    },
-}
-
-impl Model {
-    pub fn default_fast() -> Self {
-        Self::VZeroOnePointFiveMedium
-    }
-
-    pub fn from_id(id: &str) -> Result<Self> {
-        match id {
-            "v0-1.5-md" => Ok(Self::VZeroOnePointFiveMedium),
-            invalid_id => anyhow::bail!("invalid model id '{invalid_id}'"),
-        }
-    }
-
-    pub fn id(&self) -> &str {
-        match self {
-            Self::VZeroOnePointFiveMedium => "v0-1.5-md",
-            Self::Custom { name, .. } => name,
-        }
-    }
-
-    pub fn display_name(&self) -> &str {
-        match self {
-            Self::VZeroOnePointFiveMedium => "v0-1.5-md",
-            Self::Custom {
-                name, display_name, ..
-            } => display_name.as_ref().unwrap_or(name),
-        }
-    }
-
-    pub fn max_token_count(&self) -> u64 {
-        match self {
-            Self::VZeroOnePointFiveMedium => 128_000,
-            Self::Custom { max_tokens, .. } => *max_tokens,
-        }
-    }
-
-    pub fn max_output_tokens(&self) -> Option<u64> {
-        match self {
-            Self::VZeroOnePointFiveMedium => Some(32_000),
-            Self::Custom {
-                max_output_tokens, ..
-            } => *max_output_tokens,
-        }
-    }
-
-    pub fn supports_parallel_tool_calls(&self) -> bool {
-        match self {
-            Self::VZeroOnePointFiveMedium => true,
-            Model::Custom { .. } => false,
-        }
-    }
-
-    pub fn supports_prompt_cache_key(&self) -> bool {
-        false
-    }
-}
diff --git a/crates/vim/Cargo.toml b/crates/vim/Cargo.toml
deleted file mode 100644
index 74409a6c25..0000000000
--- a/crates/vim/Cargo.toml
+++ /dev/null
@@ -1,75 +0,0 @@
-[package]
-name = "vim"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/vim.rs"
-doctest = false
-
-[features]
-neovim = ["nvim-rs", "async-compat", "async-trait", "tokio"]
-
-[dependencies]
-anyhow.workspace = true
-async-compat = { workspace = true, "optional" = true }
-async-trait = { workspace = true, "optional" = true }
-collections.workspace = true
-command_palette.workspace = true
-command_palette_hooks.workspace = true
-db.workspace = true
-editor.workspace = true
-env_logger.workspace = true
-futures.workspace = true
-fuzzy.workspace = true
-gpui.workspace = true
-itertools.workspace = true
-language.workspace = true
-log.workspace = true
-multi_buffer.workspace = true
-nvim-rs = { git = "https://github.com/KillTheMule/nvim-rs", rev = "764dd270c642f77f10f3e19d05cc178a6cbe69f3", features = ["use_tokio"], optional = true }
-picker.workspace = true
-project.workspace = true
-regex.workspace = true
-schemars.workspace = true
-search.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-task.workspace = true
-text.workspace = true
-theme.workspace = true
-menu.workspace = true
-tokio = { version = "1.15", features = ["full"], optional = true }
-ui.workspace = true
-util.workspace = true
-util_macros.workspace = true
-vim_mode_setting.workspace = true
-workspace.workspace = true
-zed_actions.workspace = true
-
-[dev-dependencies]
-assets.workspace = true
-command_palette = { workspace = true, features = ["test-support"] }
-editor = { workspace = true, features = ["test-support"] }
-git_ui.workspace = true
-gpui = { workspace = true, features = ["test-support"] }
-indoc.workspace = true
-language = { workspace = true, features = ["test-support"] }
-project = { workspace = true, features = ["test-support"] }
-lsp = { workspace = true, features = ["test-support"] }
-markdown_preview.workspace = true
-parking_lot.workspace = true
-project_panel.workspace = true
-release_channel.workspace = true
-semver.workspace = true
-settings_ui.workspace = true
-settings.workspace = true
-perf.workspace = true
-util = { workspace = true, features = ["test-support"] }
-workspace = { workspace = true, features = ["test-support"] }
diff --git a/crates/vim/LICENSE-GPL b/crates/vim/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/vim/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/vim/README.md b/crates/vim/README.md
deleted file mode 100644
index 28f1375c62..0000000000
--- a/crates/vim/README.md
+++ /dev/null
@@ -1,36 +0,0 @@
-This contains the code for Zed's Vim emulation mode.
-
-Vim mode in Zed is supposed to primarily "do what you expect": it mostly tries to copy vim exactly, but will use Zed-specific functionality when available to make things smoother. This means Zed will never be 100% vim compatible, but should be 100% vim familiar!
-
-The backlog is maintained in the `#vim` channel notes.
-
-## Testing against Neovim
-
-If you are making a change to make Zed's behavior more closely match vim/nvim, you can create a test using the `NeovimBackedTestContext`.
-
-For example, the following test checks that Zed and Neovim have the same behavior when running `*` in visual mode:
-
-```rust
-#[gpui::test]
-async fn test_visual_star_hash(cx: &mut gpui::TestAppContext) {
-    let mut cx = NeovimBackedTestContext::new(cx).await;
-
-    cx.set_shared_state("ˇa.c. abcd a.c. abcd").await;
-    cx.simulate_shared_keystrokes(["v", "3", "l", "*"]).await;
-    cx.assert_shared_state("a.c. abcd ˇa.c. abcd").await;
-}
-```
-
-To keep CI runs fast, by default the neovim tests use a cached JSON file that records what neovim did (see crates/vim/test_data),
-but while developing this test you'll need to run it with the neovim flag enabled:
-
-```sh
-cargo test -p vim --features neovim test_visual_star_hash
-```
-
-This will run your keystrokes against a headless neovim and cache the results in the test_data directory. Note that neovim must be installed and reachable on your $PATH in order to run the feature.
-
-
-## Testing zed-only behavior
-
-Zed does more than vim/neovim in their default modes. The `VimTestContext` can be used instead. This lets you test integration with the language server and other parts of zed's UI that don't have a NeoVim equivalent.
diff --git a/crates/vim/src/change_list.rs b/crates/vim/src/change_list.rs
deleted file mode 100644
index 21cd332800..0000000000
--- a/crates/vim/src/change_list.rs
+++ /dev/null
@@ -1,220 +0,0 @@
-use editor::{Bias, Direction, Editor, display_map::ToDisplayPoint, movement};
-use gpui::{Context, Window, actions};
-
-use crate::{Vim, state::Mode};
-
-actions!(
-    vim,
-    [
-        /// Navigates to an older position in the change list.
-        ChangeListOlder,
-        /// Navigates to a newer position in the change list.
-        ChangeListNewer
-    ]
-);
-
-pub(crate) fn register(editor: &mut Editor, cx: &mut Context<Vim>) {
-    Vim::action(editor, cx, |vim, _: &ChangeListOlder, window, cx| {
-        vim.move_to_change(Direction::Prev, window, cx);
-    });
-    Vim::action(editor, cx, |vim, _: &ChangeListNewer, window, cx| {
-        vim.move_to_change(Direction::Next, window, cx);
-    });
-}
-
-impl Vim {
-    fn move_to_change(
-        &mut self,
-        direction: Direction,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let count = Vim::take_count(cx).unwrap_or(1);
-        Vim::take_forced_motion(cx);
-        self.update_editor(cx, |_, editor, cx| {
-            if let Some(selections) = editor
-                .change_list
-                .next_change(count, direction)
-                .map(|s| s.to_vec())
-            {
-                editor.change_selections(Default::default(), window, cx, |s| {
-                    let map = s.display_snapshot();
-                    s.select_display_ranges(selections.iter().map(|a| {
-                        let point = a.to_display_point(&map);
-                        point..point
-                    }))
-                })
-            };
-        });
-    }
-
-    pub(crate) fn push_to_change_list(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let Some((new_positions, buffer)) = self.update_editor(cx, |vim, editor, cx| {
-            let display_map = editor.display_snapshot(cx);
-            let selections = editor.selections.all_adjusted_display(&display_map);
-            let buffer = editor.buffer().clone();
-
-            let pop_state = editor
-                .change_list
-                .last()
-                .map(|previous| {
-                    previous.len() == selections.len()
-                        && previous.iter().enumerate().all(|(ix, p)| {
-                            p.to_display_point(&display_map).row() == selections[ix].head().row()
-                        })
-                })
-                .unwrap_or(false);
-
-            let new_positions = selections
-                .into_iter()
-                .map(|s| {
-                    let point = if vim.mode == Mode::Insert {
-                        movement::saturating_left(&display_map, s.head())
-                    } else {
-                        s.head()
-                    };
-                    display_map.display_point_to_anchor(point, Bias::Left)
-                })
-                .collect::<Vec<_>>();
-
-            editor
-                .change_list
-                .push_to_change_list(pop_state, new_positions.clone());
-
-            (new_positions, buffer)
-        }) else {
-            return;
-        };
-
-        self.set_mark(".".to_string(), new_positions, &buffer, window, cx)
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use indoc::indoc;
-
-    use crate::{state::Mode, test::NeovimBackedTestContext};
-
-    #[gpui::test]
-    async fn test_change_list_insert(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state("ˇ").await;
-
-        cx.simulate_shared_keystrokes("i 1 1 escape shift-o 2 2 escape shift-g o 3 3 escape")
-            .await;
-
-        cx.shared_state().await.assert_eq(indoc! {
-            "22
-             11
-             3ˇ3"
-        });
-
-        cx.simulate_shared_keystrokes("g ;").await;
-        // NOTE: this matches nvim when I type it into it
-        // but in tests, nvim always reports the column as 0...
-        cx.assert_state(
-            indoc! {
-            "22
-             11
-             3ˇ3"
-            },
-            Mode::Normal,
-        );
-        cx.simulate_shared_keystrokes("g ;").await;
-        cx.assert_state(
-            indoc! {
-            "2ˇ2
-             11
-             33"
-            },
-            Mode::Normal,
-        );
-        cx.simulate_shared_keystrokes("g ;").await;
-        cx.assert_state(
-            indoc! {
-            "22
-             1ˇ1
-             33"
-            },
-            Mode::Normal,
-        );
-        cx.simulate_shared_keystrokes("g ,").await;
-        cx.assert_state(
-            indoc! {
-            "2ˇ2
-             11
-             33"
-            },
-            Mode::Normal,
-        );
-        cx.simulate_shared_keystrokes("shift-g i 4 4 escape").await;
-        cx.simulate_shared_keystrokes("g ;").await;
-        cx.assert_state(
-            indoc! {
-            "22
-             11
-             34ˇ43"
-            },
-            Mode::Normal,
-        );
-        cx.simulate_shared_keystrokes("g ;").await;
-        cx.assert_state(
-            indoc! {
-            "2ˇ2
-             11
-             3443"
-            },
-            Mode::Normal,
-        );
-    }
-
-    #[gpui::test]
-    async fn test_change_list_delete(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.set_shared_state(indoc! {
-        "one two
-        three fˇour"})
-            .await;
-        cx.simulate_shared_keystrokes("x k d i w ^ x").await;
-        cx.shared_state().await.assert_eq(indoc! {
-        "ˇne•
-        three fur"});
-        cx.simulate_shared_keystrokes("2 g ;").await;
-        cx.shared_state().await.assert_eq(indoc! {
-        "ne•
-        three fˇur"});
-        cx.simulate_shared_keystrokes("g ,").await;
-        cx.shared_state().await.assert_eq(indoc! {
-        "ˇne•
-        three fur"});
-    }
-
-    #[gpui::test]
-    async fn test_gi(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.set_shared_state(indoc! {
-        "one two
-        three fˇr"})
-            .await;
-        cx.simulate_shared_keystrokes("i o escape k g i").await;
-        cx.simulate_shared_keystrokes("u escape").await;
-        cx.shared_state().await.assert_eq(indoc! {
-        "one two
-        three foˇur"});
-    }
-
-    #[gpui::test]
-    async fn test_dot_mark(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.set_shared_state(indoc! {
-        "one two
-        three fˇr"})
-            .await;
-        cx.simulate_shared_keystrokes("i o escape k ` .").await;
-        cx.shared_state().await.assert_eq(indoc! {
-        "one two
-        three fˇor"});
-    }
-}
diff --git a/crates/vim/src/command.rs b/crates/vim/src/command.rs
deleted file mode 100644
index 5bf0fca041..0000000000
--- a/crates/vim/src/command.rs
+++ /dev/null
@@ -1,3211 +0,0 @@
-use anyhow::{Result, anyhow};
-use collections::{HashMap, HashSet};
-use command_palette_hooks::{CommandInterceptItem, CommandInterceptResult};
-use editor::{
-    Bias, Editor, EditorSettings, SelectionEffects, ToPoint,
-    actions::{SortLinesCaseInsensitive, SortLinesCaseSensitive},
-    display_map::ToDisplayPoint,
-};
-use futures::AsyncWriteExt as _;
-use gpui::{
-    Action, App, AppContext as _, Context, Global, Keystroke, Task, WeakEntity, Window, actions,
-};
-use itertools::Itertools;
-use language::Point;
-use multi_buffer::MultiBufferRow;
-use project::ProjectPath;
-use regex::Regex;
-use schemars::JsonSchema;
-use search::{BufferSearchBar, SearchOptions};
-use serde::Deserialize;
-use settings::{Settings, SettingsStore};
-use std::{
-    iter::Peekable,
-    ops::{Deref, Range},
-    path::{Path, PathBuf},
-    process::Stdio,
-    str::Chars,
-    sync::OnceLock,
-    time::Instant,
-};
-use task::{HideStrategy, RevealStrategy, SpawnInTerminal, TaskId};
-use ui::ActiveTheme;
-use util::{
-    ResultExt,
-    paths::PathStyle,
-    rel_path::{RelPath, RelPathBuf},
-};
-use workspace::{Item, SaveIntent, Workspace, notifications::NotifyResultExt};
-use workspace::{SplitDirection, notifications::DetachAndPromptErr};
-use zed_actions::{OpenDocs, RevealTarget};
-
-use crate::{
-    ToggleMarksView, ToggleRegistersView, Vim,
-    motion::{EndOfDocument, Motion, MotionKind, StartOfDocument},
-    normal::{
-        JoinLines,
-        search::{FindCommand, ReplaceCommand, Replacement},
-    },
-    object::Object,
-    state::{Mark, Mode},
-    visual::VisualDeleteLine,
-};
-
-/// Goes to the specified line number in the editor.
-#[derive(Clone, Debug, PartialEq, Action)]
-#[action(namespace = vim, no_json, no_register)]
-pub struct GoToLine {
-    range: CommandRange,
-}
-
-/// Yanks (copies) text based on the specified range.
-#[derive(Clone, Debug, PartialEq, Action)]
-#[action(namespace = vim, no_json, no_register)]
-pub struct YankCommand {
-    range: CommandRange,
-}
-
-/// Executes a command with the specified range.
-#[derive(Clone, Debug, PartialEq, Action)]
-#[action(namespace = vim, no_json, no_register)]
-pub struct WithRange {
-    restore_selection: bool,
-    range: CommandRange,
-    action: WrappedAction,
-}
-
-/// Executes a command with the specified count.
-#[derive(Clone, Debug, PartialEq, Action)]
-#[action(namespace = vim, no_json, no_register)]
-pub struct WithCount {
-    count: u32,
-    action: WrappedAction,
-}
-
-#[derive(Clone, Deserialize, JsonSchema, PartialEq)]
-pub enum VimOption {
-    Wrap(bool),
-    Number(bool),
-    RelativeNumber(bool),
-    IgnoreCase(bool),
-}
-
-impl VimOption {
-    fn possible_commands(query: &str) -> Vec<CommandInterceptItem> {
-        let mut prefix_of_options = Vec::new();
-        let mut options = query.split(" ").collect::<Vec<_>>();
-        let prefix = options.pop().unwrap_or_default();
-        for option in options {
-            if let Some(opt) = Self::from(option) {
-                prefix_of_options.push(opt)
-            } else {
-                return vec![];
-            }
-        }
-
-        Self::possibilities(prefix)
-            .map(|possible| {
-                let mut options = prefix_of_options.clone();
-                options.push(possible);
-
-                CommandInterceptItem {
-                    string: format!(
-                        ":set {}",
-                        options.iter().map(|opt| opt.to_string()).join(" ")
-                    ),
-                    action: VimSet { options }.boxed_clone(),
-                    positions: vec![],
-                }
-            })
-            .collect()
-    }
-
-    fn possibilities(query: &str) -> impl Iterator<Item = Self> + '_ {
-        [
-            (None, VimOption::Wrap(true)),
-            (None, VimOption::Wrap(false)),
-            (None, VimOption::Number(true)),
-            (None, VimOption::Number(false)),
-            (None, VimOption::RelativeNumber(true)),
-            (None, VimOption::RelativeNumber(false)),
-            (Some("rnu"), VimOption::RelativeNumber(true)),
-            (Some("nornu"), VimOption::RelativeNumber(false)),
-            (None, VimOption::IgnoreCase(true)),
-            (None, VimOption::IgnoreCase(false)),
-            (Some("ic"), VimOption::IgnoreCase(true)),
-            (Some("noic"), VimOption::IgnoreCase(false)),
-        ]
-        .into_iter()
-        .filter(move |(prefix, option)| prefix.unwrap_or(option.to_string()).starts_with(query))
-        .map(|(_, option)| option)
-    }
-
-    fn from(option: &str) -> Option<Self> {
-        match option {
-            "wrap" => Some(Self::Wrap(true)),
-            "nowrap" => Some(Self::Wrap(false)),
-
-            "number" => Some(Self::Number(true)),
-            "nu" => Some(Self::Number(true)),
-            "nonumber" => Some(Self::Number(false)),
-            "nonu" => Some(Self::Number(false)),
-
-            "relativenumber" => Some(Self::RelativeNumber(true)),
-            "rnu" => Some(Self::RelativeNumber(true)),
-            "norelativenumber" => Some(Self::RelativeNumber(false)),
-            "nornu" => Some(Self::RelativeNumber(false)),
-
-            "ignorecase" => Some(Self::IgnoreCase(true)),
-            "ic" => Some(Self::IgnoreCase(true)),
-            "noignorecase" => Some(Self::IgnoreCase(false)),
-            "noic" => Some(Self::IgnoreCase(false)),
-
-            _ => None,
-        }
-    }
-
-    fn to_string(&self) -> &'static str {
-        match self {
-            VimOption::Wrap(true) => "wrap",
-            VimOption::Wrap(false) => "nowrap",
-            VimOption::Number(true) => "number",
-            VimOption::Number(false) => "nonumber",
-            VimOption::RelativeNumber(true) => "relativenumber",
-            VimOption::RelativeNumber(false) => "norelativenumber",
-            VimOption::IgnoreCase(true) => "ignorecase",
-            VimOption::IgnoreCase(false) => "noignorecase",
-        }
-    }
-}
-
-/// Sets vim options and configuration values.
-#[derive(Clone, PartialEq, Action)]
-#[action(namespace = vim, no_json, no_register)]
-pub struct VimSet {
-    options: Vec<VimOption>,
-}
-
-/// Saves the current file with optional save intent.
-#[derive(Clone, PartialEq, Action)]
-#[action(namespace = vim, no_json, no_register)]
-struct VimSave {
-    pub range: Option<CommandRange>,
-    pub save_intent: Option<SaveIntent>,
-    pub filename: String,
-}
-
-/// Deletes the specified marks from the editor.
-#[derive(Clone, PartialEq, Action)]
-#[action(namespace = vim, no_json, no_register)]
-struct VimSplit {
-    pub vertical: bool,
-    pub filename: String,
-}
-
-#[derive(Clone, PartialEq, Action)]
-#[action(namespace = vim, no_json, no_register)]
-enum DeleteMarks {
-    Marks(String),
-    AllLocal,
-}
-
-actions!(
-    vim,
-    [
-        /// Executes a command in visual mode.
-        VisualCommand,
-        /// Executes a command with a count prefix.
-        CountCommand,
-        /// Executes a shell command.
-        ShellCommand,
-        /// Indicates that an argument is required for the command.
-        ArgumentRequired
-    ]
-);
-
-/// Opens the specified file for editing.
-#[derive(Clone, PartialEq, Action)]
-#[action(namespace = vim, no_json, no_register)]
-struct VimEdit {
-    pub filename: String,
-}
-
-#[derive(Clone, PartialEq, Action)]
-#[action(namespace = vim, no_json, no_register)]
-struct VimNorm {
-    pub range: Option<CommandRange>,
-    pub command: String,
-}
-
-#[derive(Debug)]
-struct WrappedAction(Box<dyn Action>);
-
-impl PartialEq for WrappedAction {
-    fn eq(&self, other: &Self) -> bool {
-        self.0.partial_eq(&*other.0)
-    }
-}
-
-impl Clone for WrappedAction {
-    fn clone(&self) -> Self {
-        Self(self.0.boxed_clone())
-    }
-}
-
-impl Deref for WrappedAction {
-    type Target = dyn Action;
-    fn deref(&self) -> &dyn Action {
-        &*self.0
-    }
-}
-
-pub fn register(editor: &mut Editor, cx: &mut Context<Vim>) {
-    // Vim::action(editor, cx, |vim, action: &StartOfLine, window, cx| {
-    Vim::action(editor, cx, |vim, action: &VimSet, _, cx| {
-        for option in action.options.iter() {
-            vim.update_editor(cx, |_, editor, cx| match option {
-                VimOption::Wrap(true) => {
-                    editor
-                        .set_soft_wrap_mode(language::language_settings::SoftWrap::EditorWidth, cx);
-                }
-                VimOption::Wrap(false) => {
-                    editor.set_soft_wrap_mode(language::language_settings::SoftWrap::None, cx);
-                }
-                VimOption::Number(enabled) => {
-                    editor.set_show_line_numbers(*enabled, cx);
-                }
-                VimOption::RelativeNumber(enabled) => {
-                    editor.set_relative_line_number(Some(*enabled), cx);
-                }
-                VimOption::IgnoreCase(enabled) => {
-                    let mut settings = EditorSettings::get_global(cx).clone();
-                    settings.search.case_sensitive = !*enabled;
-                    SettingsStore::update(cx, |store, _| {
-                        store.override_global(settings);
-                    });
-                }
-            });
-        }
-    });
-    Vim::action(editor, cx, |vim, _: &VisualCommand, window, cx| {
-        let Some(workspace) = vim.workspace(window) else {
-            return;
-        };
-        workspace.update(cx, |workspace, cx| {
-            command_palette::CommandPalette::toggle(workspace, "'<,'>", window, cx);
-        })
-    });
-
-    Vim::action(editor, cx, |vim, _: &ShellCommand, window, cx| {
-        let Some(workspace) = vim.workspace(window) else {
-            return;
-        };
-        workspace.update(cx, |workspace, cx| {
-            command_palette::CommandPalette::toggle(workspace, "'<,'>!", window, cx);
-        })
-    });
-
-    Vim::action(editor, cx, |_, _: &ArgumentRequired, window, cx| {
-        let _ = window.prompt(
-            gpui::PromptLevel::Critical,
-            "Argument required",
-            None,
-            &["Cancel"],
-            cx,
-        );
-    });
-
-    Vim::action(editor, cx, |vim, _: &ShellCommand, window, cx| {
-        let Some(workspace) = vim.workspace(window) else {
-            return;
-        };
-        workspace.update(cx, |workspace, cx| {
-            command_palette::CommandPalette::toggle(workspace, "'<,'>!", window, cx);
-        })
-    });
-
-    Vim::action(editor, cx, |vim, action: &VimSave, window, cx| {
-        if let Some(range) = &action.range {
-            vim.update_editor(cx, |vim, editor, cx| {
-                let Some(range) = range.buffer_range(vim, editor, window, cx).ok() else {
-                    return;
-                };
-                let Some((line_ending, text, whole_buffer)) = editor.buffer().update(cx, |multi, cx| {
-                    Some(multi.as_singleton()?.update(cx, |buffer, _| {
-                        (
-                            buffer.line_ending(),
-                            buffer.as_rope().slice_rows(range.start.0..range.end.0 + 1),
-                            range.start.0 == 0 && range.end.0 + 1 >= buffer.row_count(),
-                        )
-                    }))
-                }) else {
-                    return;
-                };
-
-                let filename = action.filename.clone();
-                let filename = if filename.is_empty() {
-                    let Some(file) = editor
-                        .buffer()
-                        .read(cx)
-                        .as_singleton()
-                        .and_then(|buffer| buffer.read(cx).file())
-                    else {
-                        let _ = window.prompt(
-                            gpui::PromptLevel::Warning,
-                            "No file name",
-                            Some("Partial buffer write requires file name."),
-                            &["Cancel"],
-                            cx,
-                        );
-                        return;
-                    };
-                    file.path().display(file.path_style(cx)).to_string()
-                } else {
-                    filename
-                };
-
-                if action.filename.is_empty() {
-                    if whole_buffer {
-                        if let Some(workspace) = vim.workspace(window) {
-                            workspace.update(cx, |workspace, cx| {
-                                workspace
-                                    .save_active_item(
-                                        action.save_intent.unwrap_or(SaveIntent::Save),
-                                        window,
-                                        cx,
-                                    )
-                                    .detach_and_prompt_err("Failed to save", window, cx, |_, _, _| None);
-                            });
-                        }
-                        return;
-                    }
-                    if Some(SaveIntent::Overwrite) != action.save_intent {
-                        let _ = window.prompt(
-                            gpui::PromptLevel::Warning,
-                            "Use ! to write partial buffer",
-                            Some("Overwriting the current file with selected buffer content requires '!'."),
-                            &["Cancel"],
-                            cx,
-                        );
-                        return;
-                    }
-                    editor.buffer().update(cx, |multi, cx| {
-                        if let Some(buffer) = multi.as_singleton() {
-                            buffer.update(cx, |buffer, _| buffer.set_conflict());
-                        }
-                    });
-                };
-
-                editor.project().unwrap().update(cx, |project, cx| {
-                    let worktree = project.visible_worktrees(cx).next().unwrap();
-
-                    worktree.update(cx, |worktree, cx| {
-                        let path_style = worktree.path_style();
-                        let Some(path) = RelPath::new(Path::new(&filename), path_style).ok() else {
-                            return;
-                        };
-
-                        let rx = (worktree.entry_for_path(&path).is_some() && Some(SaveIntent::Overwrite) != action.save_intent).then(|| {
-                            window.prompt(
-                                gpui::PromptLevel::Warning,
-                                &format!("{path:?} already exists. Do you want to replace it?"),
-                                Some(
-                                    "A file or folder with the same name already exists. Replacing it will overwrite its current contents.",
-                                ),
-                                &["Replace", "Cancel"],
-                                cx
-                            )
-                        });
-                        let filename = filename.clone();
-                        cx.spawn_in(window, async move |this, cx| {
-                            if let Some(rx) = rx
-                                && Ok(0) != rx.await
-                            {
-                                return;
-                            }
-
-                            let _ = this.update_in(cx, |worktree, window, cx| {
-                                let Some(path) = RelPath::new(Path::new(&filename), path_style).ok() else {
-                                    return;
-                                };
-                                worktree
-                                    .write_file(path.into_arc(), text.clone(), line_ending, cx)
-                                    .detach_and_prompt_err("Failed to write lines", window, cx, |_, _, _| None);
-                            });
-                        })
-                        .detach();
-                    });
-                });
-            });
-            return;
-        }
-        if action.filename.is_empty() {
-            if let Some(workspace) = vim.workspace(window) {
-                workspace.update(cx, |workspace, cx| {
-                    workspace
-                        .save_active_item(
-                            action.save_intent.unwrap_or(SaveIntent::Save),
-                            window,
-                            cx,
-                        )
-                        .detach_and_prompt_err("Failed to save", window, cx, |_, _, _| None);
-                });
-            }
-            return;
-        }
-        vim.update_editor(cx, |_, editor, cx| {
-            let Some(project) = editor.project().cloned() else {
-                return;
-            };
-            let Some(worktree) = project.read(cx).visible_worktrees(cx).next() else {
-                return;
-            };
-            let path_style = worktree.read(cx).path_style();
-            let Ok(project_path) =
-                RelPath::new(Path::new(&action.filename), path_style).map(|path| ProjectPath {
-                    worktree_id: worktree.read(cx).id(),
-                    path: path.into_arc(),
-                })
-            else {
-                // TODO implement save_as with absolute path
-                Task::ready(Err::<(), _>(anyhow!(
-                    "Cannot save buffer with absolute path"
-                )))
-                .detach_and_prompt_err(
-                    "Failed to save",
-                    window,
-                    cx,
-                    |_, _, _| None,
-                );
-                return;
-            };
-
-            if project.read(cx).entry_for_path(&project_path, cx).is_some()
-                && action.save_intent != Some(SaveIntent::Overwrite)
-            {
-                let answer = window.prompt(
-                    gpui::PromptLevel::Critical,
-                    &format!(
-                        "{} already exists. Do you want to replace it?",
-                        project_path.path.display(path_style)
-                    ),
-                    Some(
-                        "A file or folder with the same name already exists. \
-                        Replacing it will overwrite its current contents.",
-                    ),
-                    &["Replace", "Cancel"],
-                    cx,
-                );
-                cx.spawn_in(window, async move |editor, cx| {
-                    if answer.await.ok() != Some(0) {
-                        return;
-                    }
-
-                    let _ = editor.update_in(cx, |editor, window, cx| {
-                        editor
-                            .save_as(project, project_path, window, cx)
-                            .detach_and_prompt_err("Failed to :w", window, cx, |_, _, _| None);
-                    });
-                })
-                .detach();
-            } else {
-                editor
-                    .save_as(project, project_path, window, cx)
-                    .detach_and_prompt_err("Failed to :w", window, cx, |_, _, _| None);
-            }
-        });
-    });
-
-    Vim::action(editor, cx, |vim, action: &VimSplit, window, cx| {
-        let Some(workspace) = vim.workspace(window) else {
-            return;
-        };
-
-        workspace.update(cx, |workspace, cx| {
-            let project = workspace.project().clone();
-            let Some(worktree) = project.read(cx).visible_worktrees(cx).next() else {
-                return;
-            };
-            let path_style = worktree.read(cx).path_style();
-            let Some(path) = RelPath::new(Path::new(&action.filename), path_style).log_err() else {
-                return;
-            };
-            let project_path = ProjectPath {
-                worktree_id: worktree.read(cx).id(),
-                path: path.into_arc(),
-            };
-
-            let direction = if action.vertical {
-                SplitDirection::vertical(cx)
-            } else {
-                SplitDirection::horizontal(cx)
-            };
-
-            workspace
-                .split_path_preview(project_path, false, Some(direction), window, cx)
-                .detach_and_log_err(cx);
-        })
-    });
-
-    Vim::action(editor, cx, |vim, action: &DeleteMarks, window, cx| {
-        fn err(s: String, window: &mut Window, cx: &mut Context<Editor>) {
-            let _ = window.prompt(
-                gpui::PromptLevel::Critical,
-                &format!("Invalid argument: {}", s),
-                None,
-                &["Cancel"],
-                cx,
-            );
-        }
-        vim.update_editor(cx, |vim, editor, cx| match action {
-            DeleteMarks::Marks(s) => {
-                if s.starts_with('-') || s.ends_with('-') || s.contains(['\'', '`']) {
-                    err(s.clone(), window, cx);
-                    return;
-                }
-
-                let to_delete = if s.len() < 3 {
-                    Some(s.clone())
-                } else {
-                    s.chars()
-                        .tuple_windows::<(_, _, _)>()
-                        .map(|(a, b, c)| {
-                            if b == '-' {
-                                if match a {
-                                    'a'..='z' => a <= c && c <= 'z',
-                                    'A'..='Z' => a <= c && c <= 'Z',
-                                    '0'..='9' => a <= c && c <= '9',
-                                    _ => false,
-                                } {
-                                    Some((a..=c).collect_vec())
-                                } else {
-                                    None
-                                }
-                            } else if a == '-' {
-                                if c == '-' { None } else { Some(vec![c]) }
-                            } else if c == '-' {
-                                if a == '-' { None } else { Some(vec![a]) }
-                            } else {
-                                Some(vec![a, b, c])
-                            }
-                        })
-                        .fold_options(HashSet::<char>::default(), |mut set, chars| {
-                            set.extend(chars.iter().copied());
-                            set
-                        })
-                        .map(|set| set.iter().collect::<String>())
-                };
-
-                let Some(to_delete) = to_delete else {
-                    err(s.clone(), window, cx);
-                    return;
-                };
-
-                for c in to_delete.chars().filter(|c| !c.is_whitespace()) {
-                    vim.delete_mark(c.to_string(), editor, window, cx);
-                }
-            }
-            DeleteMarks::AllLocal => {
-                for s in 'a'..='z' {
-                    vim.delete_mark(s.to_string(), editor, window, cx);
-                }
-            }
-        });
-    });
-
-    Vim::action(editor, cx, |vim, action: &VimEdit, window, cx| {
-        vim.update_editor(cx, |vim, editor, cx| {
-            let Some(workspace) = vim.workspace(window) else {
-                return;
-            };
-            let Some(project) = editor.project().cloned() else {
-                return;
-            };
-            let Some(worktree) = project.read(cx).visible_worktrees(cx).next() else {
-                return;
-            };
-            let path_style = worktree.read(cx).path_style();
-            let Some(path) = RelPath::new(Path::new(&action.filename), path_style).log_err() else {
-                return;
-            };
-            let project_path = ProjectPath {
-                worktree_id: worktree.read(cx).id(),
-                path: path.into_arc(),
-            };
-
-            let _ = workspace.update(cx, |workspace, cx| {
-                workspace
-                    .open_path(project_path, None, true, window, cx)
-                    .detach_and_log_err(cx);
-            });
-        });
-    });
-
-    Vim::action(editor, cx, |vim, action: &VimNorm, window, cx| {
-        let keystrokes = action
-            .command
-            .chars()
-            .map(|c| Keystroke::parse(&c.to_string()).unwrap())
-            .collect();
-        vim.switch_mode(Mode::Normal, true, window, cx);
-        let initial_selections =
-            vim.update_editor(cx, |_, editor, _| editor.selections.disjoint_anchors_arc());
-        if let Some(range) = &action.range {
-            let result = vim.update_editor(cx, |vim, editor, cx| {
-                let range = range.buffer_range(vim, editor, window, cx)?;
-                editor.change_selections(
-                    SelectionEffects::no_scroll().nav_history(false),
-                    window,
-                    cx,
-                    |s| {
-                        s.select_ranges(
-                            (range.start.0..=range.end.0)
-                                .map(|line| Point::new(line, 0)..Point::new(line, 0)),
-                        );
-                    },
-                );
-                anyhow::Ok(())
-            });
-            if let Some(Err(err)) = result {
-                log::error!("Error selecting range: {}", err);
-                return;
-            }
-        };
-
-        let Some(workspace) = vim.workspace(window) else {
-            return;
-        };
-        let task = workspace.update(cx, |workspace, cx| {
-            workspace.send_keystrokes_impl(keystrokes, window, cx)
-        });
-        let had_range = action.range.is_some();
-
-        cx.spawn_in(window, async move |vim, cx| {
-            task.await;
-            vim.update_in(cx, |vim, window, cx| {
-                vim.update_editor(cx, |_, editor, cx| {
-                    if had_range {
-                        editor.change_selections(SelectionEffects::default(), window, cx, |s| {
-                            s.select_anchor_ranges([s.newest_anchor().range()]);
-                        })
-                    }
-                });
-                if matches!(vim.mode, Mode::Insert | Mode::Replace) {
-                    vim.normal_before(&Default::default(), window, cx);
-                } else {
-                    vim.switch_mode(Mode::Normal, true, window, cx);
-                }
-                vim.update_editor(cx, |_, editor, cx| {
-                    if let Some(first_sel) = initial_selections
-                        && let Some(tx_id) = editor
-                            .buffer()
-                            .update(cx, |multi, cx| multi.last_transaction_id(cx))
-                    {
-                        let last_sel = editor.selections.disjoint_anchors_arc();
-                        editor.modify_transaction_selection_history(tx_id, |old| {
-                            old.0 = first_sel;
-                            old.1 = Some(last_sel);
-                        });
-                    }
-                });
-            })
-            .ok();
-        })
-        .detach();
-    });
-
-    Vim::action(editor, cx, |vim, _: &CountCommand, window, cx| {
-        let Some(workspace) = vim.workspace(window) else {
-            return;
-        };
-        let count = Vim::take_count(cx).unwrap_or(1);
-        Vim::take_forced_motion(cx);
-        let n = if count > 1 {
-            format!(".,.+{}", count.saturating_sub(1))
-        } else {
-            ".".to_string()
-        };
-        workspace.update(cx, |workspace, cx| {
-            command_palette::CommandPalette::toggle(workspace, &n, window, cx);
-        })
-    });
-
-    Vim::action(editor, cx, |vim, action: &GoToLine, window, cx| {
-        vim.switch_mode(Mode::Normal, false, window, cx);
-        let result = vim.update_editor(cx, |vim, editor, cx| {
-            let snapshot = editor.snapshot(window, cx);
-            let buffer_row = action.range.head().buffer_row(vim, editor, window, cx)?;
-            let current = editor
-                .selections
-                .newest::<Point>(&editor.display_snapshot(cx));
-            let target = snapshot
-                .buffer_snapshot()
-                .clip_point(Point::new(buffer_row.0, current.head().column), Bias::Left);
-            editor.change_selections(Default::default(), window, cx, |s| {
-                s.select_ranges([target..target]);
-            });
-
-            anyhow::Ok(())
-        });
-        if let Some(e @ Err(_)) = result {
-            let Some(workspace) = vim.workspace(window) else {
-                return;
-            };
-            workspace.update(cx, |workspace, cx| {
-                e.notify_err(workspace, cx);
-            });
-        }
-    });
-
-    Vim::action(editor, cx, |vim, action: &YankCommand, window, cx| {
-        vim.update_editor(cx, |vim, editor, cx| {
-            let snapshot = editor.snapshot(window, cx);
-            if let Ok(range) = action.range.buffer_range(vim, editor, window, cx) {
-                let end = if range.end < snapshot.buffer_snapshot().max_row() {
-                    Point::new(range.end.0 + 1, 0)
-                } else {
-                    snapshot.buffer_snapshot().max_point()
-                };
-                vim.copy_ranges(
-                    editor,
-                    MotionKind::Linewise,
-                    true,
-                    vec![Point::new(range.start.0, 0)..end],
-                    window,
-                    cx,
-                )
-            }
-        });
-    });
-
-    Vim::action(editor, cx, |_, action: &WithCount, window, cx| {
-        for _ in 0..action.count {
-            window.dispatch_action(action.action.boxed_clone(), cx)
-        }
-    });
-
-    Vim::action(editor, cx, |vim, action: &WithRange, window, cx| {
-        let result = vim.update_editor(cx, |vim, editor, cx| {
-            action.range.buffer_range(vim, editor, window, cx)
-        });
-
-        let range = match result {
-            None => return,
-            Some(e @ Err(_)) => {
-                let Some(workspace) = vim.workspace(window) else {
-                    return;
-                };
-                workspace.update(cx, |workspace, cx| {
-                    e.notify_err(workspace, cx);
-                });
-                return;
-            }
-            Some(Ok(result)) => result,
-        };
-
-        let previous_selections = vim
-            .update_editor(cx, |_, editor, cx| {
-                let selections = action.restore_selection.then(|| {
-                    editor
-                        .selections
-                        .disjoint_anchor_ranges()
-                        .collect::<Vec<_>>()
-                });
-                let snapshot = editor.buffer().read(cx).snapshot(cx);
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    let end = Point::new(range.end.0, snapshot.line_len(range.end));
-                    s.select_ranges([end..Point::new(range.start.0, 0)]);
-                });
-                selections
-            })
-            .flatten();
-        window.dispatch_action(action.action.boxed_clone(), cx);
-        cx.defer_in(window, move |vim, window, cx| {
-            vim.update_editor(cx, |_, editor, cx| {
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    if let Some(previous_selections) = previous_selections {
-                        s.select_ranges(previous_selections);
-                    } else {
-                        s.select_ranges([
-                            Point::new(range.start.0, 0)..Point::new(range.start.0, 0)
-                        ]);
-                    }
-                })
-            });
-        });
-    });
-
-    Vim::action(editor, cx, |vim, action: &OnMatchingLines, window, cx| {
-        action.run(vim, window, cx)
-    });
-
-    Vim::action(editor, cx, |vim, action: &ShellExec, window, cx| {
-        action.run(vim, window, cx)
-    })
-}
-
-#[derive(Default)]
-struct VimCommand {
-    prefix: &'static str,
-    suffix: &'static str,
-    action: Option<Box<dyn Action>>,
-    action_name: Option<&'static str>,
-    bang_action: Option<Box<dyn Action>>,
-    args: Option<
-        Box<dyn Fn(Box<dyn Action>, String) -> Option<Box<dyn Action>> + Send + Sync + 'static>,
-    >,
-    /// Optional range Range to use if no range is specified.
-    default_range: Option<CommandRange>,
-    range: Option<
-        Box<
-            dyn Fn(Box<dyn Action>, &CommandRange) -> Option<Box<dyn Action>>
-                + Send
-                + Sync
-                + 'static,
-        >,
-    >,
-    has_count: bool,
-    has_filename: bool,
-}
-
-struct ParsedQuery {
-    args: String,
-    has_bang: bool,
-    has_space: bool,
-}
-
-impl VimCommand {
-    fn new(pattern: (&'static str, &'static str), action: impl Action) -> Self {
-        Self {
-            prefix: pattern.0,
-            suffix: pattern.1,
-            action: Some(action.boxed_clone()),
-            ..Default::default()
-        }
-    }
-
-    // from_str is used for actions in other crates.
-    fn str(pattern: (&'static str, &'static str), action_name: &'static str) -> Self {
-        Self {
-            prefix: pattern.0,
-            suffix: pattern.1,
-            action_name: Some(action_name),
-            ..Default::default()
-        }
-    }
-
-    fn bang(mut self, bang_action: impl Action) -> Self {
-        self.bang_action = Some(bang_action.boxed_clone());
-        self
-    }
-
-    fn args(
-        mut self,
-        f: impl Fn(Box<dyn Action>, String) -> Option<Box<dyn Action>> + Send + Sync + 'static,
-    ) -> Self {
-        self.args = Some(Box::new(f));
-        self
-    }
-
-    fn filename(
-        mut self,
-        f: impl Fn(Box<dyn Action>, String) -> Option<Box<dyn Action>> + Send + Sync + 'static,
-    ) -> Self {
-        self.args = Some(Box::new(f));
-        self.has_filename = true;
-        self
-    }
-
-    fn range(
-        mut self,
-        f: impl Fn(Box<dyn Action>, &CommandRange) -> Option<Box<dyn Action>> + Send + Sync + 'static,
-    ) -> Self {
-        self.range = Some(Box::new(f));
-        self
-    }
-
-    fn default_range(mut self, range: CommandRange) -> Self {
-        self.default_range = Some(range);
-        self
-    }
-
-    fn count(mut self) -> Self {
-        self.has_count = true;
-        self
-    }
-
-    fn generate_filename_completions(
-        parsed_query: &ParsedQuery,
-        workspace: WeakEntity<Workspace>,
-        cx: &mut App,
-    ) -> Task<Vec<String>> {
-        let ParsedQuery {
-            args,
-            has_bang: _,
-            has_space: _,
-        } = parsed_query;
-        let Some(workspace) = workspace.upgrade() else {
-            return Task::ready(Vec::new());
-        };
-
-        let (task, args_path) = workspace.update(cx, |workspace, cx| {
-            let prefix = workspace
-                .project()
-                .read(cx)
-                .visible_worktrees(cx)
-                .map(|worktree| worktree.read(cx).abs_path().to_path_buf())
-                .next()
-                .or_else(std::env::home_dir)
-                .unwrap_or_else(|| PathBuf::from(""));
-
-            let rel_path = match RelPath::new(Path::new(&args), PathStyle::local()) {
-                Ok(path) => path.to_rel_path_buf(),
-                Err(_) => {
-                    return (Task::ready(Ok(Vec::new())), RelPathBuf::new());
-                }
-            };
-
-            let rel_path = if args.ends_with(PathStyle::local().primary_separator()) {
-                rel_path
-            } else {
-                rel_path
-                    .parent()
-                    .map(|rel_path| rel_path.to_rel_path_buf())
-                    .unwrap_or(RelPathBuf::new())
-            };
-
-            let task = workspace.project().update(cx, |project, cx| {
-                let path = prefix
-                    .join(rel_path.as_std_path())
-                    .to_string_lossy()
-                    .to_string();
-                project.list_directory(path, cx)
-            });
-
-            (task, rel_path)
-        });
-
-        cx.background_spawn(async move {
-            let directories = task.await.unwrap_or_default();
-            directories
-                .iter()
-                .map(|dir| {
-                    let path = RelPath::new(dir.path.as_path(), PathStyle::local())
-                        .map(|cow| cow.into_owned())
-                        .unwrap_or(RelPathBuf::new());
-                    let mut path_string = args_path
-                        .join(&path)
-                        .display(PathStyle::local())
-                        .to_string();
-                    if dir.is_dir {
-                        path_string.push_str(PathStyle::local().primary_separator());
-                    }
-                    path_string
-                })
-                .collect()
-        })
-    }
-
-    fn get_parsed_query(&self, query: String) -> Option<ParsedQuery> {
-        let rest = query
-            .strip_prefix(self.prefix)?
-            .to_string()
-            .chars()
-            .zip_longest(self.suffix.to_string().chars())
-            .skip_while(|e| e.clone().both().map(|(s, q)| s == q).unwrap_or(false))
-            .filter_map(|e| e.left())
-            .collect::<String>();
-        let has_bang = rest.starts_with('!');
-        let has_space = rest.starts_with("! ") || rest.starts_with(' ');
-        let args = if has_bang {
-            rest.strip_prefix('!')?.trim().to_string()
-        } else if rest.is_empty() {
-            "".into()
-        } else {
-            rest.strip_prefix(' ')?.trim().to_string()
-        };
-        Some(ParsedQuery {
-            args,
-            has_bang,
-            has_space,
-        })
-    }
-
-    fn parse(
-        &self,
-        query: &str,
-        range: &Option<CommandRange>,
-        cx: &App,
-    ) -> Option<Box<dyn Action>> {
-        let ParsedQuery {
-            args,
-            has_bang,
-            has_space: _,
-        } = self.get_parsed_query(query.to_string())?;
-        let action = if has_bang && self.bang_action.is_some() {
-            self.bang_action.as_ref().unwrap().boxed_clone()
-        } else if let Some(action) = self.action.as_ref() {
-            action.boxed_clone()
-        } else if let Some(action_name) = self.action_name {
-            cx.build_action(action_name, None).log_err()?
-        } else {
-            return None;
-        };
-
-        let action = if args.is_empty() {
-            action
-        } else {
-            // if command does not accept args and we have args then we should do no action
-            self.args.as_ref()?(action, args)?
-        };
-
-        let range = range.as_ref().or(self.default_range.as_ref());
-        if let Some(range) = range {
-            self.range.as_ref().and_then(|f| f(action, range))
-        } else {
-            Some(action)
-        }
-    }
-
-    // TODO: ranges with search queries
-    fn parse_range(query: &str) -> (Option<CommandRange>, String) {
-        let mut chars = query.chars().peekable();
-
-        match chars.peek() {
-            Some('%') => {
-                chars.next();
-                return (
-                    Some(CommandRange {
-                        start: Position::Line { row: 1, offset: 0 },
-                        end: Some(Position::LastLine { offset: 0 }),
-                    }),
-                    chars.collect(),
-                );
-            }
-            Some('*') => {
-                chars.next();
-                return (
-                    Some(CommandRange {
-                        start: Position::Mark {
-                            name: '<',
-                            offset: 0,
-                        },
-                        end: Some(Position::Mark {
-                            name: '>',
-                            offset: 0,
-                        }),
-                    }),
-                    chars.collect(),
-                );
-            }
-            _ => {}
-        }
-
-        let start = Self::parse_position(&mut chars);
-
-        match chars.peek() {
-            Some(',' | ';') => {
-                chars.next();
-                (
-                    Some(CommandRange {
-                        start: start.unwrap_or(Position::CurrentLine { offset: 0 }),
-                        end: Self::parse_position(&mut chars),
-                    }),
-                    chars.collect(),
-                )
-            }
-            _ => (
-                start.map(|start| CommandRange { start, end: None }),
-                chars.collect(),
-            ),
-        }
-    }
-
-    fn parse_position(chars: &mut Peekable<Chars>) -> Option<Position> {
-        match chars.peek()? {
-            '0'..='9' => {
-                let row = Self::parse_u32(chars);
-                Some(Position::Line {
-                    row,
-                    offset: Self::parse_offset(chars),
-                })
-            }
-            '\'' => {
-                chars.next();
-                let name = chars.next()?;
-                Some(Position::Mark {
-                    name,
-                    offset: Self::parse_offset(chars),
-                })
-            }
-            '.' => {
-                chars.next();
-                Some(Position::CurrentLine {
-                    offset: Self::parse_offset(chars),
-                })
-            }
-            '+' | '-' => Some(Position::CurrentLine {
-                offset: Self::parse_offset(chars),
-            }),
-            '$' => {
-                chars.next();
-                Some(Position::LastLine {
-                    offset: Self::parse_offset(chars),
-                })
-            }
-            _ => None,
-        }
-    }
-
-    fn parse_offset(chars: &mut Peekable<Chars>) -> i32 {
-        let mut res: i32 = 0;
-        while matches!(chars.peek(), Some('+' | '-')) {
-            let sign = if chars.next().unwrap() == '+' { 1 } else { -1 };
-            let amount = if matches!(chars.peek(), Some('0'..='9')) {
-                (Self::parse_u32(chars) as i32).saturating_mul(sign)
-            } else {
-                sign
-            };
-            res = res.saturating_add(amount)
-        }
-        res
-    }
-
-    fn parse_u32(chars: &mut Peekable<Chars>) -> u32 {
-        let mut res: u32 = 0;
-        while matches!(chars.peek(), Some('0'..='9')) {
-            res = res
-                .saturating_mul(10)
-                .saturating_add(chars.next().unwrap() as u32 - '0' as u32);
-        }
-        res
-    }
-}
-
-#[derive(Clone, Debug, Deserialize, JsonSchema, PartialEq)]
-enum Position {
-    Line { row: u32, offset: i32 },
-    Mark { name: char, offset: i32 },
-    LastLine { offset: i32 },
-    CurrentLine { offset: i32 },
-}
-
-impl Position {
-    fn buffer_row(
-        &self,
-        vim: &Vim,
-        editor: &mut Editor,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Result<MultiBufferRow> {
-        let snapshot = editor.snapshot(window, cx);
-        let target = match self {
-            Position::Line { row, offset } => {
-                if let Some(anchor) = editor.active_excerpt(cx).and_then(|(_, buffer, _)| {
-                    editor.buffer().read(cx).buffer_point_to_anchor(
-                        &buffer,
-                        Point::new(row.saturating_sub(1), 0),
-                        cx,
-                    )
-                }) {
-                    anchor
-                        .to_point(&snapshot.buffer_snapshot())
-                        .row
-                        .saturating_add_signed(*offset)
-                } else {
-                    row.saturating_add_signed(offset.saturating_sub(1))
-                }
-            }
-            Position::Mark { name, offset } => {
-                let Some(Mark::Local(anchors)) =
-                    vim.get_mark(&name.to_string(), editor, window, cx)
-                else {
-                    anyhow::bail!("mark {name} not set");
-                };
-                let Some(mark) = anchors.last() else {
-                    anyhow::bail!("mark {name} contains empty anchors");
-                };
-                mark.to_point(&snapshot.buffer_snapshot())
-                    .row
-                    .saturating_add_signed(*offset)
-            }
-            Position::LastLine { offset } => snapshot
-                .buffer_snapshot()
-                .max_row()
-                .0
-                .saturating_add_signed(*offset),
-            Position::CurrentLine { offset } => editor
-                .selections
-                .newest_anchor()
-                .head()
-                .to_point(&snapshot.buffer_snapshot())
-                .row
-                .saturating_add_signed(*offset),
-        };
-
-        Ok(MultiBufferRow(target).min(snapshot.buffer_snapshot().max_row()))
-    }
-}
-
-#[derive(Clone, Debug, PartialEq)]
-pub(crate) struct CommandRange {
-    start: Position,
-    end: Option<Position>,
-}
-
-impl CommandRange {
-    fn head(&self) -> &Position {
-        self.end.as_ref().unwrap_or(&self.start)
-    }
-
-    /// Convert the `CommandRange` into a `Range<MultiBufferRow>`.
-    pub(crate) fn buffer_range(
-        &self,
-        vim: &Vim,
-        editor: &mut Editor,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Result<Range<MultiBufferRow>> {
-        let start = self.start.buffer_row(vim, editor, window, cx)?;
-        let end = if let Some(end) = self.end.as_ref() {
-            end.buffer_row(vim, editor, window, cx)?
-        } else {
-            start
-        };
-        if end < start {
-            anyhow::Ok(end..start)
-        } else {
-            anyhow::Ok(start..end)
-        }
-    }
-
-    pub fn as_count(&self) -> Option<u32> {
-        if let CommandRange {
-            start: Position::Line { row, offset: 0 },
-            end: None,
-        } = &self
-        {
-            Some(*row)
-        } else {
-            None
-        }
-    }
-
-    /// The `CommandRange` representing the entire buffer.
-    fn buffer() -> Self {
-        Self {
-            start: Position::Line { row: 1, offset: 0 },
-            end: Some(Position::LastLine { offset: 0 }),
-        }
-    }
-}
-
-fn generate_commands(_: &App) -> Vec<VimCommand> {
-    vec![
-        VimCommand::new(
-            ("w", "rite"),
-            VimSave {
-                save_intent: Some(SaveIntent::Save),
-                filename: "".into(),
-                range: None,
-            },
-        )
-        .bang(VimSave {
-            save_intent: Some(SaveIntent::Overwrite),
-            filename: "".into(),
-            range: None,
-        })
-        .filename(|action, filename| {
-            Some(
-                VimSave {
-                    save_intent: action
-                        .as_any()
-                        .downcast_ref::<VimSave>()
-                        .and_then(|action| action.save_intent),
-                    filename,
-                    range: None,
-                }
-                .boxed_clone(),
-            )
-        })
-        .range(|action, range| {
-            let mut action: VimSave = action.as_any().downcast_ref::<VimSave>().unwrap().clone();
-            action.range.replace(range.clone());
-            Some(Box::new(action))
-        }),
-        VimCommand::new(("e", "dit"), editor::actions::ReloadFile)
-            .bang(editor::actions::ReloadFile)
-            .filename(|_, filename| Some(VimEdit { filename }.boxed_clone())),
-        VimCommand::new(("sp", "lit"), workspace::SplitHorizontal).filename(|_, filename| {
-            Some(
-                VimSplit {
-                    vertical: false,
-                    filename,
-                }
-                .boxed_clone(),
-            )
-        }),
-        VimCommand::new(("vs", "plit"), workspace::SplitVertical).filename(|_, filename| {
-            Some(
-                VimSplit {
-                    vertical: true,
-                    filename,
-                }
-                .boxed_clone(),
-            )
-        }),
-        VimCommand::new(("tabe", "dit"), workspace::NewFile)
-            .filename(|_action, filename| Some(VimEdit { filename }.boxed_clone())),
-        VimCommand::new(("tabnew", ""), workspace::NewFile)
-            .filename(|_action, filename| Some(VimEdit { filename }.boxed_clone())),
-        VimCommand::new(
-            ("q", "uit"),
-            workspace::CloseActiveItem {
-                save_intent: Some(SaveIntent::Close),
-                close_pinned: false,
-            },
-        )
-        .bang(workspace::CloseActiveItem {
-            save_intent: Some(SaveIntent::Skip),
-            close_pinned: true,
-        }),
-        VimCommand::new(
-            ("wq", ""),
-            workspace::CloseActiveItem {
-                save_intent: Some(SaveIntent::Save),
-                close_pinned: false,
-            },
-        )
-        .bang(workspace::CloseActiveItem {
-            save_intent: Some(SaveIntent::Overwrite),
-            close_pinned: true,
-        }),
-        VimCommand::new(
-            ("x", "it"),
-            workspace::CloseActiveItem {
-                save_intent: Some(SaveIntent::SaveAll),
-                close_pinned: false,
-            },
-        )
-        .bang(workspace::CloseActiveItem {
-            save_intent: Some(SaveIntent::Overwrite),
-            close_pinned: true,
-        }),
-        VimCommand::new(
-            ("exi", "t"),
-            workspace::CloseActiveItem {
-                save_intent: Some(SaveIntent::SaveAll),
-                close_pinned: false,
-            },
-        )
-        .bang(workspace::CloseActiveItem {
-            save_intent: Some(SaveIntent::Overwrite),
-            close_pinned: true,
-        }),
-        VimCommand::new(
-            ("up", "date"),
-            workspace::Save {
-                save_intent: Some(SaveIntent::SaveAll),
-            },
-        ),
-        VimCommand::new(
-            ("wa", "ll"),
-            workspace::SaveAll {
-                save_intent: Some(SaveIntent::SaveAll),
-            },
-        )
-        .bang(workspace::SaveAll {
-            save_intent: Some(SaveIntent::Overwrite),
-        }),
-        VimCommand::new(
-            ("qa", "ll"),
-            workspace::CloseAllItemsAndPanes {
-                save_intent: Some(SaveIntent::Close),
-            },
-        )
-        .bang(workspace::CloseAllItemsAndPanes {
-            save_intent: Some(SaveIntent::Skip),
-        }),
-        VimCommand::new(
-            ("quita", "ll"),
-            workspace::CloseAllItemsAndPanes {
-                save_intent: Some(SaveIntent::Close),
-            },
-        )
-        .bang(workspace::CloseAllItemsAndPanes {
-            save_intent: Some(SaveIntent::Skip),
-        }),
-        VimCommand::new(
-            ("xa", "ll"),
-            workspace::CloseAllItemsAndPanes {
-                save_intent: Some(SaveIntent::SaveAll),
-            },
-        )
-        .bang(workspace::CloseAllItemsAndPanes {
-            save_intent: Some(SaveIntent::Overwrite),
-        }),
-        VimCommand::new(
-            ("wqa", "ll"),
-            workspace::CloseAllItemsAndPanes {
-                save_intent: Some(SaveIntent::SaveAll),
-            },
-        )
-        .bang(workspace::CloseAllItemsAndPanes {
-            save_intent: Some(SaveIntent::Overwrite),
-        }),
-        VimCommand::new(("cq", "uit"), zed_actions::Quit),
-        VimCommand::new(
-            ("bd", "elete"),
-            workspace::CloseActiveItem {
-                save_intent: Some(SaveIntent::Close),
-                close_pinned: false,
-            },
-        )
-        .bang(workspace::CloseActiveItem {
-            save_intent: Some(SaveIntent::Skip),
-            close_pinned: true,
-        }),
-        VimCommand::new(
-            ("norm", "al"),
-            VimNorm {
-                command: "".into(),
-                range: None,
-            },
-        )
-        .args(|_, args| {
-            Some(
-                VimNorm {
-                    command: args,
-                    range: None,
-                }
-                .boxed_clone(),
-            )
-        })
-        .range(|action, range| {
-            let mut action: VimNorm = action.as_any().downcast_ref::<VimNorm>().unwrap().clone();
-            action.range.replace(range.clone());
-            Some(Box::new(action))
-        }),
-        VimCommand::new(("bn", "ext"), workspace::ActivateNextItem).count(),
-        VimCommand::new(("bN", "ext"), workspace::ActivatePreviousItem).count(),
-        VimCommand::new(("bp", "revious"), workspace::ActivatePreviousItem).count(),
-        VimCommand::new(("bf", "irst"), workspace::ActivateItem(0)),
-        VimCommand::new(("br", "ewind"), workspace::ActivateItem(0)),
-        VimCommand::new(("bl", "ast"), workspace::ActivateLastItem),
-        VimCommand::str(("buffers", ""), "tab_switcher::ToggleAll"),
-        VimCommand::str(("ls", ""), "tab_switcher::ToggleAll"),
-        VimCommand::new(("new", ""), workspace::NewFileSplitHorizontal),
-        VimCommand::new(("vne", "w"), workspace::NewFileSplitVertical),
-        VimCommand::new(("tabn", "ext"), workspace::ActivateNextItem).count(),
-        VimCommand::new(("tabp", "revious"), workspace::ActivatePreviousItem).count(),
-        VimCommand::new(("tabN", "ext"), workspace::ActivatePreviousItem).count(),
-        VimCommand::new(
-            ("tabc", "lose"),
-            workspace::CloseActiveItem {
-                save_intent: Some(SaveIntent::Close),
-                close_pinned: false,
-            },
-        ),
-        VimCommand::new(
-            ("tabo", "nly"),
-            workspace::CloseOtherItems {
-                save_intent: Some(SaveIntent::Close),
-                close_pinned: false,
-            },
-        )
-        .bang(workspace::CloseOtherItems {
-            save_intent: Some(SaveIntent::Skip),
-            close_pinned: false,
-        }),
-        VimCommand::new(
-            ("on", "ly"),
-            workspace::CloseInactiveTabsAndPanes {
-                save_intent: Some(SaveIntent::Close),
-            },
-        )
-        .bang(workspace::CloseInactiveTabsAndPanes {
-            save_intent: Some(SaveIntent::Skip),
-        }),
-        VimCommand::str(("cl", "ist"), "diagnostics::Deploy"),
-        VimCommand::new(("cc", ""), editor::actions::Hover),
-        VimCommand::new(("ll", ""), editor::actions::Hover),
-        VimCommand::new(("cn", "ext"), editor::actions::GoToDiagnostic::default())
-            .range(wrap_count),
-        VimCommand::new(
-            ("cp", "revious"),
-            editor::actions::GoToPreviousDiagnostic::default(),
-        )
-        .range(wrap_count),
-        VimCommand::new(
-            ("cN", "ext"),
-            editor::actions::GoToPreviousDiagnostic::default(),
-        )
-        .range(wrap_count),
-        VimCommand::new(
-            ("lp", "revious"),
-            editor::actions::GoToPreviousDiagnostic::default(),
-        )
-        .range(wrap_count),
-        VimCommand::new(
-            ("lN", "ext"),
-            editor::actions::GoToPreviousDiagnostic::default(),
-        )
-        .range(wrap_count),
-        VimCommand::new(("j", "oin"), JoinLines).range(select_range),
-        VimCommand::new(("fo", "ld"), editor::actions::FoldSelectedRanges).range(act_on_range),
-        VimCommand::new(("foldo", "pen"), editor::actions::UnfoldLines)
-            .bang(editor::actions::UnfoldRecursive)
-            .range(act_on_range),
-        VimCommand::new(("foldc", "lose"), editor::actions::Fold)
-            .bang(editor::actions::FoldRecursive)
-            .range(act_on_range),
-        VimCommand::new(("dif", "fupdate"), editor::actions::ToggleSelectedDiffHunks)
-            .range(act_on_range),
-        VimCommand::str(("rev", "ert"), "git::Restore").range(act_on_range),
-        VimCommand::new(("d", "elete"), VisualDeleteLine).range(select_range),
-        VimCommand::new(("y", "ank"), gpui::NoAction).range(|_, range| {
-            Some(
-                YankCommand {
-                    range: range.clone(),
-                }
-                .boxed_clone(),
-            )
-        }),
-        VimCommand::new(("reg", "isters"), ToggleRegistersView).bang(ToggleRegistersView),
-        VimCommand::new(("di", "splay"), ToggleRegistersView).bang(ToggleRegistersView),
-        VimCommand::new(("marks", ""), ToggleMarksView).bang(ToggleMarksView),
-        VimCommand::new(("delm", "arks"), ArgumentRequired)
-            .bang(DeleteMarks::AllLocal)
-            .args(|_, args| Some(DeleteMarks::Marks(args).boxed_clone())),
-        VimCommand::new(("sor", "t"), SortLinesCaseSensitive)
-            .range(select_range)
-            .default_range(CommandRange::buffer()),
-        VimCommand::new(("sort i", ""), SortLinesCaseInsensitive)
-            .range(select_range)
-            .default_range(CommandRange::buffer()),
-        VimCommand::str(("E", "xplore"), "project_panel::ToggleFocus"),
-        VimCommand::str(("H", "explore"), "project_panel::ToggleFocus"),
-        VimCommand::str(("L", "explore"), "project_panel::ToggleFocus"),
-        VimCommand::str(("S", "explore"), "project_panel::ToggleFocus"),
-        VimCommand::str(("Ve", "xplore"), "project_panel::ToggleFocus"),
-        VimCommand::str(("te", "rm"), "terminal_panel::Toggle"),
-        VimCommand::str(("T", "erm"), "terminal_panel::Toggle"),
-        VimCommand::str(("C", "ollab"), "collab_panel::ToggleFocus"),
-        VimCommand::str(("No", "tifications"), "notification_panel::ToggleFocus"),
-        VimCommand::str(("A", "I"), "agent::ToggleFocus"),
-        VimCommand::str(("G", "it"), "git_panel::ToggleFocus"),
-        VimCommand::str(("D", "ebug"), "debug_panel::ToggleFocus"),
-        VimCommand::new(("noh", "lsearch"), search::buffer_search::Dismiss),
-        VimCommand::new(("$", ""), EndOfDocument),
-        VimCommand::new(("%", ""), EndOfDocument),
-        VimCommand::new(("0", ""), StartOfDocument),
-        VimCommand::new(("ex", ""), editor::actions::ReloadFile).bang(editor::actions::ReloadFile),
-        VimCommand::new(("cpp", "link"), editor::actions::CopyPermalinkToLine).range(act_on_range),
-        VimCommand::str(("opt", "ions"), "zed::OpenDefaultSettings"),
-        VimCommand::str(("map", ""), "vim::OpenDefaultKeymap"),
-        VimCommand::new(("h", "elp"), OpenDocs),
-    ]
-}
-
-struct VimCommands(Vec<VimCommand>);
-// safety: we only ever access this from the main thread (as ensured by the cx argument)
-// actions are not Sync so we can't otherwise use a OnceLock.
-unsafe impl Sync for VimCommands {}
-impl Global for VimCommands {}
-
-fn commands(cx: &App) -> &Vec<VimCommand> {
-    static COMMANDS: OnceLock<VimCommands> = OnceLock::new();
-    &COMMANDS
-        .get_or_init(|| VimCommands(generate_commands(cx)))
-        .0
-}
-
-fn act_on_range(action: Box<dyn Action>, range: &CommandRange) -> Option<Box<dyn Action>> {
-    Some(
-        WithRange {
-            restore_selection: true,
-            range: range.clone(),
-            action: WrappedAction(action),
-        }
-        .boxed_clone(),
-    )
-}
-
-fn select_range(action: Box<dyn Action>, range: &CommandRange) -> Option<Box<dyn Action>> {
-    Some(
-        WithRange {
-            restore_selection: false,
-            range: range.clone(),
-            action: WrappedAction(action),
-        }
-        .boxed_clone(),
-    )
-}
-
-fn wrap_count(action: Box<dyn Action>, range: &CommandRange) -> Option<Box<dyn Action>> {
-    range.as_count().map(|count| {
-        WithCount {
-            count,
-            action: WrappedAction(action),
-        }
-        .boxed_clone()
-    })
-}
-
-pub fn command_interceptor(
-    mut input: &str,
-    workspace: WeakEntity<Workspace>,
-    cx: &mut App,
-) -> Task<CommandInterceptResult> {
-    while input.starts_with(':') {
-        input = &input[1..];
-    }
-
-    let (range, query) = VimCommand::parse_range(input);
-    let range_prefix = input[0..(input.len() - query.len())].to_string();
-    let has_trailing_space = query.ends_with(" ");
-    let mut query = query.as_str().trim();
-
-    let on_matching_lines = (query.starts_with('g') || query.starts_with('v'))
-        .then(|| {
-            let (pattern, range, search, invert) = OnMatchingLines::parse(query, &range)?;
-            let start_idx = query.len() - pattern.len();
-            query = query[start_idx..].trim();
-            Some((range, search, invert))
-        })
-        .flatten();
-
-    let mut action = if range.is_some() && query.is_empty() {
-        Some(
-            GoToLine {
-                range: range.clone().unwrap(),
-            }
-            .boxed_clone(),
-        )
-    } else if query.starts_with('/') || query.starts_with('?') {
-        Some(
-            FindCommand {
-                query: query[1..].to_string(),
-                backwards: query.starts_with('?'),
-            }
-            .boxed_clone(),
-        )
-    } else if query.starts_with("se ") || query.starts_with("set ") {
-        let (prefix, option) = query.split_once(' ').unwrap();
-        let mut commands = VimOption::possible_commands(option);
-        if !commands.is_empty() {
-            let query = prefix.to_string() + " " + option;
-            for command in &mut commands {
-                command.positions = generate_positions(&command.string, &query);
-            }
-        }
-        return Task::ready(CommandInterceptResult {
-            results: commands,
-            exclusive: false,
-        });
-    } else if query.starts_with('s') {
-        let mut substitute = "substitute".chars().peekable();
-        let mut query = query.chars().peekable();
-        while substitute
-            .peek()
-            .is_some_and(|char| Some(char) == query.peek())
-        {
-            substitute.next();
-            query.next();
-        }
-        if let Some(replacement) = Replacement::parse(query) {
-            let range = range.clone().unwrap_or(CommandRange {
-                start: Position::CurrentLine { offset: 0 },
-                end: None,
-            });
-            Some(ReplaceCommand { replacement, range }.boxed_clone())
-        } else {
-            None
-        }
-    } else if query.contains('!') {
-        ShellExec::parse(query, range.clone())
-    } else if on_matching_lines.is_some() {
-        commands(cx)
-            .iter()
-            .find_map(|command| command.parse(query, &range, cx))
-    } else {
-        None
-    };
-
-    if let Some((range, search, invert)) = on_matching_lines
-        && let Some(ref inner) = action
-    {
-        action = Some(Box::new(OnMatchingLines {
-            range,
-            search,
-            action: WrappedAction(inner.boxed_clone()),
-            invert,
-        }));
-    };
-
-    if let Some(action) = action {
-        let string = input.to_string();
-        let positions = generate_positions(&string, &(range_prefix + query));
-        return Task::ready(CommandInterceptResult {
-            results: vec![CommandInterceptItem {
-                action,
-                string,
-                positions,
-            }],
-            exclusive: false,
-        });
-    }
-
-    let Some((mut results, filenames)) =
-        commands(cx).iter().enumerate().find_map(|(idx, command)| {
-            let action = command.parse(query, &range, cx)?;
-            let parsed_query = command.get_parsed_query(query.into())?;
-            let display_string = ":".to_owned()
-                + &range_prefix
-                + command.prefix
-                + command.suffix
-                + if parsed_query.has_bang { "!" } else { "" };
-            let space = if parsed_query.has_space { " " } else { "" };
-
-            let string = format!("{}{}{}", &display_string, &space, &parsed_query.args);
-            let positions = generate_positions(&string, &(range_prefix.clone() + query));
-
-            let results = vec![CommandInterceptItem {
-                action,
-                string,
-                positions,
-            }];
-
-            let no_args_positions =
-                generate_positions(&display_string, &(range_prefix.clone() + query));
-
-            // The following are valid autocomplete scenarios:
-            // :w!filename.txt
-            // :w filename.txt
-            // :w[space]
-            if !command.has_filename
-                || (!has_trailing_space && !parsed_query.has_bang && parsed_query.args.is_empty())
-            {
-                return Some((results, None));
-            }
-
-            Some((
-                results,
-                Some((idx, parsed_query, display_string, no_args_positions)),
-            ))
-        })
-    else {
-        return Task::ready(CommandInterceptResult::default());
-    };
-
-    if let Some((cmd_idx, parsed_query, display_string, no_args_positions)) = filenames {
-        let filenames = VimCommand::generate_filename_completions(&parsed_query, workspace, cx);
-        cx.spawn(async move |cx| {
-            let filenames = filenames.await;
-            const MAX_RESULTS: usize = 100;
-            let executor = cx.background_executor().clone();
-            let mut candidates = Vec::with_capacity(filenames.len());
-
-            for (idx, filename) in filenames.iter().enumerate() {
-                candidates.push(fuzzy::StringMatchCandidate::new(idx, &filename));
-            }
-            let filenames = fuzzy::match_strings(
-                &candidates,
-                &parsed_query.args,
-                false,
-                true,
-                MAX_RESULTS,
-                &Default::default(),
-                executor,
-            )
-            .await;
-
-            for fuzzy::StringMatch {
-                candidate_id: _,
-                score: _,
-                positions,
-                string,
-            } in filenames
-            {
-                let offset = display_string.len() + 1;
-                let mut positions: Vec<_> = positions.iter().map(|&pos| pos + offset).collect();
-                positions.splice(0..0, no_args_positions.clone());
-                let string = format!("{display_string} {string}");
-                let (range, query) = VimCommand::parse_range(&string[1..]);
-                let action =
-                    match cx.update(|cx| commands(cx).get(cmd_idx)?.parse(&query, &range, cx)) {
-                        Ok(Some(action)) => action,
-                        _ => continue,
-                    };
-                results.push(CommandInterceptItem {
-                    action,
-                    string,
-                    positions,
-                });
-            }
-            CommandInterceptResult {
-                results,
-                exclusive: true,
-            }
-        })
-    } else {
-        Task::ready(CommandInterceptResult {
-            results,
-            exclusive: false,
-        })
-    }
-}
-
-fn generate_positions(string: &str, query: &str) -> Vec<usize> {
-    let mut positions = Vec::new();
-    let mut chars = query.chars();
-
-    let Some(mut current) = chars.next() else {
-        return positions;
-    };
-
-    for (i, c) in string.char_indices() {
-        if c == current {
-            positions.push(i);
-            if let Some(c) = chars.next() {
-                current = c;
-            } else {
-                break;
-            }
-        }
-    }
-
-    positions
-}
-
-/// Applies a command to all lines matching a pattern.
-#[derive(Debug, PartialEq, Clone, Action)]
-#[action(namespace = vim, no_json, no_register)]
-pub(crate) struct OnMatchingLines {
-    range: CommandRange,
-    search: String,
-    action: WrappedAction,
-    invert: bool,
-}
-
-impl OnMatchingLines {
-    // convert a vim query into something more usable by zed.
-    // we don't attempt to fully convert between the two regex syntaxes,
-    // but we do flip \( and \) to ( and ) (and vice-versa) in the pattern,
-    // and convert \0..\9 to $0..$9 in the replacement so that common idioms work.
-    pub(crate) fn parse(
-        query: &str,
-        range: &Option<CommandRange>,
-    ) -> Option<(String, CommandRange, String, bool)> {
-        let mut global = "global".chars().peekable();
-        let mut query_chars = query.chars().peekable();
-        let mut invert = false;
-        if query_chars.peek() == Some(&'v') {
-            invert = true;
-            query_chars.next();
-        }
-        while global
-            .peek()
-            .is_some_and(|char| Some(char) == query_chars.peek())
-        {
-            global.next();
-            query_chars.next();
-        }
-        if !invert && query_chars.peek() == Some(&'!') {
-            invert = true;
-            query_chars.next();
-        }
-        let range = range.clone().unwrap_or(CommandRange {
-            start: Position::Line { row: 0, offset: 0 },
-            end: Some(Position::LastLine { offset: 0 }),
-        });
-
-        let delimiter = query_chars.next().filter(|c| {
-            !c.is_alphanumeric() && *c != '"' && *c != '|' && *c != '\'' && *c != '!'
-        })?;
-
-        let mut search = String::new();
-        let mut escaped = false;
-
-        for c in query_chars.by_ref() {
-            if escaped {
-                escaped = false;
-                // unescape escaped parens
-                if c != '(' && c != ')' && c != delimiter {
-                    search.push('\\')
-                }
-                search.push(c)
-            } else if c == '\\' {
-                escaped = true;
-            } else if c == delimiter {
-                break;
-            } else {
-                // escape unescaped parens
-                if c == '(' || c == ')' {
-                    search.push('\\')
-                }
-                search.push(c)
-            }
-        }
-
-        Some((query_chars.collect::<String>(), range, search, invert))
-    }
-
-    pub fn run(&self, vim: &mut Vim, window: &mut Window, cx: &mut Context<Vim>) {
-        let result = vim.update_editor(cx, |vim, editor, cx| {
-            self.range.buffer_range(vim, editor, window, cx)
-        });
-
-        let range = match result {
-            None => return,
-            Some(e @ Err(_)) => {
-                let Some(workspace) = vim.workspace(window) else {
-                    return;
-                };
-                workspace.update(cx, |workspace, cx| {
-                    e.notify_err(workspace, cx);
-                });
-                return;
-            }
-            Some(Ok(result)) => result,
-        };
-
-        let mut action = self.action.boxed_clone();
-        let mut last_pattern = self.search.clone();
-
-        let mut regexes = match Regex::new(&self.search) {
-            Ok(regex) => vec![(regex, !self.invert)],
-            e @ Err(_) => {
-                let Some(workspace) = vim.workspace(window) else {
-                    return;
-                };
-                workspace.update(cx, |workspace, cx| {
-                    e.notify_err(workspace, cx);
-                });
-                return;
-            }
-        };
-        while let Some(inner) = action
-            .boxed_clone()
-            .as_any()
-            .downcast_ref::<OnMatchingLines>()
-        {
-            let Some(regex) = Regex::new(&inner.search).ok() else {
-                break;
-            };
-            last_pattern = inner.search.clone();
-            action = inner.action.boxed_clone();
-            regexes.push((regex, !inner.invert))
-        }
-
-        if let Some(pane) = vim.pane(window, cx) {
-            pane.update(cx, |pane, cx| {
-                if let Some(search_bar) = pane.toolbar().read(cx).item_of_type::<BufferSearchBar>()
-                {
-                    search_bar.update(cx, |search_bar, cx| {
-                        if search_bar.show(window, cx) {
-                            let _ = search_bar.search(
-                                &last_pattern,
-                                Some(SearchOptions::REGEX | SearchOptions::CASE_SENSITIVE),
-                                false,
-                                window,
-                                cx,
-                            );
-                        }
-                    });
-                }
-            });
-        };
-
-        vim.update_editor(cx, |_, editor, cx| {
-            let snapshot = editor.snapshot(window, cx);
-            let mut row = range.start.0;
-
-            let point_range = Point::new(range.start.0, 0)
-                ..snapshot
-                    .buffer_snapshot()
-                    .clip_point(Point::new(range.end.0 + 1, 0), Bias::Left);
-            cx.spawn_in(window, async move |editor, cx| {
-                let new_selections = cx
-                    .background_spawn(async move {
-                        let mut line = String::new();
-                        let mut new_selections = Vec::new();
-                        let chunks = snapshot
-                            .buffer_snapshot()
-                            .text_for_range(point_range)
-                            .chain(["\n"]);
-
-                        for chunk in chunks {
-                            for (newline_ix, text) in chunk.split('\n').enumerate() {
-                                if newline_ix > 0 {
-                                    if regexes.iter().all(|(regex, should_match)| {
-                                        regex.is_match(&line) == *should_match
-                                    }) {
-                                        new_selections
-                                            .push(Point::new(row, 0).to_display_point(&snapshot))
-                                    }
-                                    row += 1;
-                                    line.clear();
-                                }
-                                line.push_str(text)
-                            }
-                        }
-
-                        new_selections
-                    })
-                    .await;
-
-                if new_selections.is_empty() {
-                    return;
-                }
-                editor
-                    .update_in(cx, |editor, window, cx| {
-                        editor.start_transaction_at(Instant::now(), window, cx);
-                        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                            s.replace_cursors_with(|_| new_selections);
-                        });
-                        window.dispatch_action(action, cx);
-                        cx.defer_in(window, move |editor, window, cx| {
-                            let newest = editor
-                                .selections
-                                .newest::<Point>(&editor.display_snapshot(cx));
-                            editor.change_selections(
-                                SelectionEffects::no_scroll(),
-                                window,
-                                cx,
-                                |s| {
-                                    s.select(vec![newest]);
-                                },
-                            );
-                            editor.end_transaction_at(Instant::now(), cx);
-                        })
-                    })
-                    .ok();
-            })
-            .detach();
-        });
-    }
-}
-
-/// Executes a shell command and returns the output.
-#[derive(Clone, Debug, PartialEq, Action)]
-#[action(namespace = vim, no_json, no_register)]
-pub struct ShellExec {
-    command: String,
-    range: Option<CommandRange>,
-    is_read: bool,
-}
-
-impl Vim {
-    pub fn cancel_running_command(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if self.running_command.take().is_some() {
-            self.update_editor(cx, |_, editor, cx| {
-                editor.transact(window, cx, |editor, _window, _cx| {
-                    editor.clear_row_highlights::<ShellExec>();
-                })
-            });
-        }
-    }
-
-    fn prepare_shell_command(
-        &mut self,
-        command: &str,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> String {
-        let mut ret = String::new();
-        // N.B. non-standard escaping rules:
-        // * !echo % => "echo README.md"
-        // * !echo \% => "echo %"
-        // * !echo \\% => echo \%
-        // * !echo \\\% => echo \\%
-        for c in command.chars() {
-            if c != '%' && c != '!' {
-                ret.push(c);
-                continue;
-            } else if ret.chars().last() == Some('\\') {
-                ret.pop();
-                ret.push(c);
-                continue;
-            }
-            match c {
-                '%' => {
-                    self.update_editor(cx, |_, editor, cx| {
-                        if let Some((_, buffer, _)) = editor.active_excerpt(cx)
-                            && let Some(file) = buffer.read(cx).file()
-                            && let Some(local) = file.as_local()
-                        {
-                            ret.push_str(&local.path().display(local.path_style(cx)));
-                        }
-                    });
-                }
-                '!' => {
-                    if let Some(command) = &self.last_command {
-                        ret.push_str(command)
-                    }
-                }
-                _ => {}
-            }
-        }
-        self.last_command = Some(ret.clone());
-        ret
-    }
-
-    pub fn shell_command_motion(
-        &mut self,
-        motion: Motion,
-        times: Option<usize>,
-        forced_motion: bool,
-        window: &mut Window,
-        cx: &mut Context<Vim>,
-    ) {
-        self.stop_recording(cx);
-        let Some(workspace) = self.workspace(window) else {
-            return;
-        };
-        let command = self.update_editor(cx, |_, editor, cx| {
-            let snapshot = editor.snapshot(window, cx);
-            let start = editor
-                .selections
-                .newest_display(&editor.display_snapshot(cx));
-            let text_layout_details = editor.text_layout_details(window);
-            let (mut range, _) = motion
-                .range(
-                    &snapshot,
-                    start.clone(),
-                    times,
-                    &text_layout_details,
-                    forced_motion,
-                )
-                .unwrap_or((start.range(), MotionKind::Exclusive));
-            if range.start != start.start {
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.select_ranges([
-                        range.start.to_point(&snapshot)..range.start.to_point(&snapshot)
-                    ]);
-                })
-            }
-            if range.end.row() > range.start.row() && range.end.column() != 0 {
-                *range.end.row_mut() -= 1
-            }
-            if range.end.row() == range.start.row() {
-                ".!".to_string()
-            } else {
-                format!(".,.+{}!", (range.end.row() - range.start.row()).0)
-            }
-        });
-        if let Some(command) = command {
-            workspace.update(cx, |workspace, cx| {
-                command_palette::CommandPalette::toggle(workspace, &command, window, cx);
-            });
-        }
-    }
-
-    pub fn shell_command_object(
-        &mut self,
-        object: Object,
-        around: bool,
-        window: &mut Window,
-        cx: &mut Context<Vim>,
-    ) {
-        self.stop_recording(cx);
-        let Some(workspace) = self.workspace(window) else {
-            return;
-        };
-        let command = self.update_editor(cx, |_, editor, cx| {
-            let snapshot = editor.snapshot(window, cx);
-            let start = editor
-                .selections
-                .newest_display(&editor.display_snapshot(cx));
-            let range = object
-                .range(&snapshot, start.clone(), around, None)
-                .unwrap_or(start.range());
-            if range.start != start.start {
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.select_ranges([
-                        range.start.to_point(&snapshot)..range.start.to_point(&snapshot)
-                    ]);
-                })
-            }
-            if range.end.row() == range.start.row() {
-                ".!".to_string()
-            } else {
-                format!(".,.+{}!", (range.end.row() - range.start.row()).0)
-            }
-        });
-        if let Some(command) = command {
-            workspace.update(cx, |workspace, cx| {
-                command_palette::CommandPalette::toggle(workspace, &command, window, cx);
-            });
-        }
-    }
-}
-
-impl ShellExec {
-    pub fn parse(query: &str, range: Option<CommandRange>) -> Option<Box<dyn Action>> {
-        let (before, after) = query.split_once('!')?;
-        let before = before.trim();
-
-        if !"read".starts_with(before) {
-            return None;
-        }
-
-        Some(
-            ShellExec {
-                command: after.trim().to_string(),
-                range,
-                is_read: !before.is_empty(),
-            }
-            .boxed_clone(),
-        )
-    }
-
-    pub fn run(&self, vim: &mut Vim, window: &mut Window, cx: &mut Context<Vim>) {
-        let Some(workspace) = vim.workspace(window) else {
-            return;
-        };
-
-        let project = workspace.read(cx).project().clone();
-        let command = vim.prepare_shell_command(&self.command, window, cx);
-
-        if self.range.is_none() && !self.is_read {
-            workspace.update(cx, |workspace, cx| {
-                let project = workspace.project().read(cx);
-                let cwd = project.first_project_directory(cx);
-                let shell = project.terminal_settings(&cwd, cx).shell.clone();
-
-                let spawn_in_terminal = SpawnInTerminal {
-                    id: TaskId("vim".to_string()),
-                    full_label: command.clone(),
-                    label: command.clone(),
-                    command: Some(command.clone()),
-                    args: Vec::new(),
-                    command_label: command.clone(),
-                    cwd,
-                    env: HashMap::default(),
-                    use_new_terminal: true,
-                    allow_concurrent_runs: true,
-                    reveal: RevealStrategy::NoFocus,
-                    reveal_target: RevealTarget::Dock,
-                    hide: HideStrategy::Never,
-                    shell,
-                    show_summary: false,
-                    show_command: false,
-                    show_rerun: false,
-                };
-
-                let task_status = workspace.spawn_in_terminal(spawn_in_terminal, window, cx);
-                cx.background_spawn(async move {
-                    match task_status.await {
-                        Some(Ok(status)) => {
-                            if status.success() {
-                                log::debug!("Vim shell exec succeeded");
-                            } else {
-                                log::debug!("Vim shell exec failed, code: {:?}", status.code());
-                            }
-                        }
-                        Some(Err(e)) => log::error!("Vim shell exec failed: {e}"),
-                        None => log::debug!("Vim shell exec got cancelled"),
-                    }
-                })
-                .detach();
-            });
-            return;
-        };
-
-        let mut input_snapshot = None;
-        let mut input_range = None;
-        let mut needs_newline_prefix = false;
-        vim.update_editor(cx, |vim, editor, cx| {
-            let snapshot = editor.buffer().read(cx).snapshot(cx);
-            let range = if let Some(range) = self.range.clone() {
-                let Some(range) = range.buffer_range(vim, editor, window, cx).log_err() else {
-                    return;
-                };
-                Point::new(range.start.0, 0)
-                    ..snapshot.clip_point(Point::new(range.end.0 + 1, 0), Bias::Right)
-            } else {
-                let mut end = editor
-                    .selections
-                    .newest::<Point>(&editor.display_snapshot(cx))
-                    .range()
-                    .end;
-                end = snapshot.clip_point(Point::new(end.row + 1, 0), Bias::Right);
-                needs_newline_prefix = end == snapshot.max_point();
-                end..end
-            };
-            if self.is_read {
-                input_range =
-                    Some(snapshot.anchor_after(range.end)..snapshot.anchor_after(range.end));
-            } else {
-                input_range =
-                    Some(snapshot.anchor_before(range.start)..snapshot.anchor_after(range.end));
-            }
-            editor.highlight_rows::<ShellExec>(
-                input_range.clone().unwrap(),
-                cx.theme().status().unreachable_background,
-                Default::default(),
-                cx,
-            );
-
-            if !self.is_read {
-                input_snapshot = Some(snapshot)
-            }
-        });
-
-        let Some(range) = input_range else { return };
-
-        let process_task = project.update(cx, |project, cx| project.exec_in_shell(command, cx));
-
-        let is_read = self.is_read;
-
-        let task = cx.spawn_in(window, async move |vim, cx| {
-            let Some(mut process) = process_task.await.log_err() else {
-                return;
-            };
-            process.stdout(Stdio::piped());
-            process.stderr(Stdio::piped());
-
-            if input_snapshot.is_some() {
-                process.stdin(Stdio::piped());
-            } else {
-                process.stdin(Stdio::null());
-            };
-
-            let Some(mut running) = process.spawn().log_err() else {
-                vim.update_in(cx, |vim, window, cx| {
-                    vim.cancel_running_command(window, cx);
-                })
-                .log_err();
-                return;
-            };
-
-            if let Some(mut stdin) = running.stdin.take()
-                && let Some(snapshot) = input_snapshot
-            {
-                let range = range.clone();
-                cx.background_spawn(async move {
-                    for chunk in snapshot.text_for_range(range) {
-                        if stdin.write_all(chunk.as_bytes()).await.log_err().is_none() {
-                            return;
-                        }
-                    }
-                    stdin.flush().await.log_err();
-                })
-                .detach();
-            };
-
-            let output = cx.background_spawn(running.output()).await;
-
-            let Some(output) = output.log_err() else {
-                vim.update_in(cx, |vim, window, cx| {
-                    vim.cancel_running_command(window, cx);
-                })
-                .log_err();
-                return;
-            };
-            let mut text = String::new();
-            if needs_newline_prefix {
-                text.push('\n');
-            }
-            text.push_str(&String::from_utf8_lossy(&output.stdout));
-            text.push_str(&String::from_utf8_lossy(&output.stderr));
-            if !text.is_empty() && text.chars().last() != Some('\n') {
-                text.push('\n');
-            }
-
-            vim.update_in(cx, |vim, window, cx| {
-                vim.update_editor(cx, |_, editor, cx| {
-                    editor.transact(window, cx, |editor, window, cx| {
-                        editor.edit([(range.clone(), text)], cx);
-                        let snapshot = editor.buffer().read(cx).snapshot(cx);
-                        editor.change_selections(Default::default(), window, cx, |s| {
-                            let point = if is_read {
-                                let point = range.end.to_point(&snapshot);
-                                Point::new(point.row.saturating_sub(1), 0)
-                            } else {
-                                let point = range.start.to_point(&snapshot);
-                                Point::new(point.row, 0)
-                            };
-                            s.select_ranges([point..point]);
-                        })
-                    })
-                });
-                vim.cancel_running_command(window, cx);
-            })
-            .log_err();
-        });
-        vim.running_command.replace(task);
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use std::path::{Path, PathBuf};
-
-    use crate::{
-        VimAddon,
-        state::Mode,
-        test::{NeovimBackedTestContext, VimTestContext},
-    };
-    use editor::{Editor, EditorSettings};
-    use gpui::{Context, TestAppContext};
-    use indoc::indoc;
-    use settings::Settings;
-    use util::path;
-    use workspace::{OpenOptions, Workspace};
-
-    #[gpui::test]
-    async fn test_command_basics(cx: &mut TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {"
-            ˇa
-            b
-            c"})
-            .await;
-
-        cx.simulate_shared_keystrokes(": j enter").await;
-
-        // hack: our cursor positioning after a join command is wrong
-        cx.simulate_shared_keystrokes("^").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "ˇa b
-            c"
-        });
-    }
-
-    #[gpui::test]
-    async fn test_command_goto(cx: &mut TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {"
-            ˇa
-            b
-            c"})
-            .await;
-        cx.simulate_shared_keystrokes(": 3 enter").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            a
-            b
-            ˇc"});
-    }
-
-    #[gpui::test]
-    async fn test_command_replace(cx: &mut TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {"
-            ˇa
-            b
-            b
-            c"})
-            .await;
-        cx.simulate_shared_keystrokes(": % s / b / d enter").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            a
-            d
-            ˇd
-            c"});
-        cx.simulate_shared_keystrokes(": % s : . : \\ 0 \\ 0 enter")
-            .await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            aa
-            dd
-            dd
-            ˇcc"});
-        cx.simulate_shared_keystrokes("k : s / d d / e e enter")
-            .await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            aa
-            dd
-            ˇee
-            cc"});
-    }
-
-    #[gpui::test]
-    async fn test_command_search(cx: &mut TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {"
-                ˇa
-                b
-                a
-                c"})
-            .await;
-        cx.simulate_shared_keystrokes(": / b enter").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-                a
-                ˇb
-                a
-                c"});
-        cx.simulate_shared_keystrokes(": ? a enter").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-                ˇa
-                b
-                a
-                c"});
-    }
-
-    #[gpui::test]
-    async fn test_command_write(cx: &mut TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-        let path = Path::new(path!("/root/dir/file.rs"));
-        let fs = cx.workspace(|workspace, _, cx| workspace.project().read(cx).fs().clone());
-
-        cx.simulate_keystrokes("i @ escape");
-        cx.simulate_keystrokes(": w enter");
-
-        assert_eq!(fs.load(path).await.unwrap().replace("\r\n", "\n"), "@\n");
-
-        fs.as_fake().insert_file(path, b"oops\n".to_vec()).await;
-
-        // conflict!
-        cx.simulate_keystrokes("i @ escape");
-        cx.simulate_keystrokes(": w enter");
-        cx.simulate_prompt_answer("Cancel");
-
-        assert_eq!(fs.load(path).await.unwrap().replace("\r\n", "\n"), "oops\n");
-        assert!(!cx.has_pending_prompt());
-        cx.simulate_keystrokes(": w !");
-        cx.simulate_keystrokes("enter");
-        assert!(!cx.has_pending_prompt());
-        assert_eq!(fs.load(path).await.unwrap().replace("\r\n", "\n"), "@@\n");
-    }
-
-    #[gpui::test]
-    async fn test_command_quit(cx: &mut TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        cx.simulate_keystrokes(": n e w enter");
-        cx.workspace(|workspace, _, cx| assert_eq!(workspace.items(cx).count(), 2));
-        cx.simulate_keystrokes(": q enter");
-        cx.workspace(|workspace, _, cx| assert_eq!(workspace.items(cx).count(), 1));
-        cx.simulate_keystrokes(": n e w enter");
-        cx.workspace(|workspace, _, cx| assert_eq!(workspace.items(cx).count(), 2));
-        cx.simulate_keystrokes(": q a enter");
-        cx.workspace(|workspace, _, cx| assert_eq!(workspace.items(cx).count(), 0));
-    }
-
-    #[gpui::test]
-    async fn test_offsets(cx: &mut TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state("ˇ1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n")
-            .await;
-
-        cx.simulate_shared_keystrokes(": + enter").await;
-        cx.shared_state()
-            .await
-            .assert_eq("1\nˇ2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n");
-
-        cx.simulate_shared_keystrokes(": 1 0 - enter").await;
-        cx.shared_state()
-            .await
-            .assert_eq("1\n2\n3\n4\n5\n6\n7\n8\nˇ9\n10\n11\n");
-
-        cx.simulate_shared_keystrokes(": . - 2 enter").await;
-        cx.shared_state()
-            .await
-            .assert_eq("1\n2\n3\n4\n5\n6\nˇ7\n8\n9\n10\n11\n");
-
-        cx.simulate_shared_keystrokes(": % enter").await;
-        cx.shared_state()
-            .await
-            .assert_eq("1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\nˇ");
-    }
-
-    #[gpui::test]
-    async fn test_command_ranges(cx: &mut TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state("ˇ1\n2\n3\n4\n4\n3\n2\n1").await;
-
-        cx.simulate_shared_keystrokes(": 2 , 4 d enter").await;
-        cx.shared_state().await.assert_eq("1\nˇ4\n3\n2\n1");
-
-        cx.simulate_shared_keystrokes(": 2 , 4 s o r t enter").await;
-        cx.shared_state().await.assert_eq("1\nˇ2\n3\n4\n1");
-
-        cx.simulate_shared_keystrokes(": 2 , 4 j o i n enter").await;
-        cx.shared_state().await.assert_eq("1\nˇ2 3 4\n1");
-    }
-
-    #[gpui::test]
-    async fn test_command_visual_replace(cx: &mut TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state("ˇ1\n2\n3\n4\n4\n3\n2\n1").await;
-
-        cx.simulate_shared_keystrokes("v 2 j : s / . / k enter")
-            .await;
-        cx.shared_state().await.assert_eq("k\nk\nˇk\n4\n4\n3\n2\n1");
-    }
-
-    #[track_caller]
-    fn assert_active_item(
-        workspace: &mut Workspace,
-        expected_path: &str,
-        expected_text: &str,
-        cx: &mut Context<Workspace>,
-    ) {
-        let active_editor = workspace.active_item_as::<Editor>(cx).unwrap();
-
-        let buffer = active_editor
-            .read(cx)
-            .buffer()
-            .read(cx)
-            .as_singleton()
-            .unwrap();
-
-        let text = buffer.read(cx).text();
-        let file = buffer.read(cx).file().unwrap();
-        let file_path = file.as_local().unwrap().abs_path(cx);
-
-        assert_eq!(text, expected_text);
-        assert_eq!(file_path, Path::new(expected_path));
-    }
-
-    #[gpui::test]
-    async fn test_command_gf(cx: &mut TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        // Assert base state, that we're in /root/dir/file.rs
-        cx.workspace(|workspace, _, cx| {
-            assert_active_item(workspace, path!("/root/dir/file.rs"), "", cx);
-        });
-
-        // Insert a new file
-        let fs = cx.workspace(|workspace, _, cx| workspace.project().read(cx).fs().clone());
-        fs.as_fake()
-            .insert_file(
-                path!("/root/dir/file2.rs"),
-                "This is file2.rs".as_bytes().to_vec(),
-            )
-            .await;
-        fs.as_fake()
-            .insert_file(
-                path!("/root/dir/file3.rs"),
-                "go to file3".as_bytes().to_vec(),
-            )
-            .await;
-
-        // Put the path to the second file into the currently open buffer
-        cx.set_state(indoc! {"go to fiˇle2.rs"}, Mode::Normal);
-
-        // Go to file2.rs
-        cx.simulate_keystrokes("g f");
-
-        // We now have two items
-        cx.workspace(|workspace, _, cx| assert_eq!(workspace.items(cx).count(), 2));
-        cx.workspace(|workspace, _, cx| {
-            assert_active_item(
-                workspace,
-                path!("/root/dir/file2.rs"),
-                "This is file2.rs",
-                cx,
-            );
-        });
-
-        // Update editor to point to `file2.rs`
-        cx.editor =
-            cx.workspace(|workspace, _, cx| workspace.active_item_as::<Editor>(cx).unwrap());
-
-        // Put the path to the third file into the currently open buffer,
-        // but remove its suffix, because we want that lookup to happen automatically.
-        cx.set_state(indoc! {"go to fiˇle3"}, Mode::Normal);
-
-        // Go to file3.rs
-        cx.simulate_keystrokes("g f");
-
-        // We now have three items
-        cx.workspace(|workspace, _, cx| assert_eq!(workspace.items(cx).count(), 3));
-        cx.workspace(|workspace, _, cx| {
-            assert_active_item(workspace, path!("/root/dir/file3.rs"), "go to file3", cx);
-        });
-    }
-
-    #[gpui::test]
-    async fn test_command_write_filename(cx: &mut TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        cx.workspace(|workspace, _, cx| {
-            assert_active_item(workspace, path!("/root/dir/file.rs"), "", cx);
-        });
-
-        cx.simulate_keystrokes(": w space other.rs");
-        cx.simulate_keystrokes("enter");
-
-        cx.workspace(|workspace, _, cx| {
-            assert_active_item(workspace, path!("/root/other.rs"), "", cx);
-        });
-
-        cx.simulate_keystrokes(": w space dir/file.rs");
-        cx.simulate_keystrokes("enter");
-
-        cx.simulate_prompt_answer("Replace");
-        cx.run_until_parked();
-
-        cx.workspace(|workspace, _, cx| {
-            assert_active_item(workspace, path!("/root/dir/file.rs"), "", cx);
-        });
-
-        cx.simulate_keystrokes(": w ! space other.rs");
-        cx.simulate_keystrokes("enter");
-
-        cx.workspace(|workspace, _, cx| {
-            assert_active_item(workspace, path!("/root/other.rs"), "", cx);
-        });
-    }
-
-    #[gpui::test]
-    async fn test_command_write_range(cx: &mut TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        cx.workspace(|workspace, _, cx| {
-            assert_active_item(workspace, path!("/root/dir/file.rs"), "", cx);
-        });
-
-        cx.set_state(
-            indoc! {"
-                    The quick
-                    brown« fox
-                    jumpsˇ» over
-                    the lazy dog
-                "},
-            Mode::Visual,
-        );
-
-        cx.simulate_keystrokes(": w space dir/other.rs");
-        cx.simulate_keystrokes("enter");
-
-        let other = path!("/root/dir/other.rs");
-
-        let _ = cx
-            .workspace(|workspace, window, cx| {
-                workspace.open_abs_path(PathBuf::from(other), OpenOptions::default(), window, cx)
-            })
-            .await;
-
-        cx.workspace(|workspace, _, cx| {
-            assert_active_item(
-                workspace,
-                other,
-                indoc! {"
-                        brown fox
-                        jumps over
-                    "},
-                cx,
-            );
-        });
-    }
-
-    #[gpui::test]
-    async fn test_command_matching_lines(cx: &mut TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {"
-            ˇa
-            b
-            a
-            b
-            a
-        "})
-            .await;
-
-        cx.simulate_shared_keystrokes(":").await;
-        cx.simulate_shared_keystrokes("g / a / d").await;
-        cx.simulate_shared_keystrokes("enter").await;
-
-        cx.shared_state().await.assert_eq(indoc! {"
-            b
-            b
-            ˇ"});
-
-        cx.simulate_shared_keystrokes("u").await;
-
-        cx.shared_state().await.assert_eq(indoc! {"
-            ˇa
-            b
-            a
-            b
-            a
-        "});
-
-        cx.simulate_shared_keystrokes(":").await;
-        cx.simulate_shared_keystrokes("v / a / d").await;
-        cx.simulate_shared_keystrokes("enter").await;
-
-        cx.shared_state().await.assert_eq(indoc! {"
-            a
-            a
-            ˇa"});
-    }
-
-    #[gpui::test]
-    async fn test_del_marks(cx: &mut TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {"
-            ˇa
-            b
-            a
-            b
-            a
-        "})
-            .await;
-
-        cx.simulate_shared_keystrokes("m a").await;
-
-        let mark = cx.update_editor(|editor, window, cx| {
-            let vim = editor.addon::<VimAddon>().unwrap().entity.clone();
-            vim.update(cx, |vim, cx| vim.get_mark("a", editor, window, cx))
-        });
-        assert!(mark.is_some());
-
-        cx.simulate_shared_keystrokes(": d e l m space a").await;
-        cx.simulate_shared_keystrokes("enter").await;
-
-        let mark = cx.update_editor(|editor, window, cx| {
-            let vim = editor.addon::<VimAddon>().unwrap().entity.clone();
-            vim.update(cx, |vim, cx| vim.get_mark("a", editor, window, cx))
-        });
-        assert!(mark.is_none())
-    }
-
-    #[gpui::test]
-    async fn test_normal_command(cx: &mut TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {"
-            The quick
-            brown« fox
-            jumpsˇ» over
-            the lazy dog
-        "})
-            .await;
-
-        cx.simulate_shared_keystrokes(": n o r m space w C w o r d")
-            .await;
-        cx.simulate_shared_keystrokes("enter").await;
-
-        cx.shared_state().await.assert_eq(indoc! {"
-            The quick
-            brown word
-            jumps worˇd
-            the lazy dog
-        "});
-
-        cx.simulate_shared_keystrokes(": n o r m space _ w c i w t e s t")
-            .await;
-        cx.simulate_shared_keystrokes("enter").await;
-
-        cx.shared_state().await.assert_eq(indoc! {"
-            The quick
-            brown word
-            jumps tesˇt
-            the lazy dog
-        "});
-
-        cx.simulate_shared_keystrokes("_ l v l : n o r m space s l a")
-            .await;
-        cx.simulate_shared_keystrokes("enter").await;
-
-        cx.shared_state().await.assert_eq(indoc! {"
-            The quick
-            brown word
-            lˇaumps test
-            the lazy dog
-        "});
-
-        cx.set_shared_state(indoc! {"
-            ˇThe quick
-            brown fox
-            jumps over
-            the lazy dog
-        "})
-            .await;
-
-        cx.simulate_shared_keystrokes("c i w M y escape").await;
-
-        cx.shared_state().await.assert_eq(indoc! {"
-            Mˇy quick
-            brown fox
-            jumps over
-            the lazy dog
-        "});
-
-        cx.simulate_shared_keystrokes(": n o r m space u").await;
-        cx.simulate_shared_keystrokes("enter").await;
-
-        cx.shared_state().await.assert_eq(indoc! {"
-            ˇThe quick
-            brown fox
-            jumps over
-            the lazy dog
-        "});
-        // Once ctrl-v to input character literals is added there should be a test for redo
-    }
-
-    #[gpui::test]
-    async fn test_command_tabnew(cx: &mut TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        // Create a new file to ensure that, when the filename is used with
-        // `:tabnew`, it opens the existing file in a new tab.
-        let fs = cx.workspace(|workspace, _, cx| workspace.project().read(cx).fs().clone());
-        fs.as_fake()
-            .insert_file(path!("/root/dir/file_2.rs"), "file_2".as_bytes().to_vec())
-            .await;
-
-        cx.simulate_keystrokes(": tabnew");
-        cx.simulate_keystrokes("enter");
-        cx.workspace(|workspace, _, cx| assert_eq!(workspace.items(cx).count(), 2));
-
-        // Assert that the new tab is empty and not associated with any file, as
-        // no file path was provided to the `:tabnew` command.
-        cx.workspace(|workspace, _window, cx| {
-            let active_editor = workspace.active_item_as::<Editor>(cx).unwrap();
-            let buffer = active_editor
-                .read(cx)
-                .buffer()
-                .read(cx)
-                .as_singleton()
-                .unwrap();
-
-            assert!(&buffer.read(cx).file().is_none());
-        });
-
-        // Leverage the filename as an argument to the `:tabnew` command,
-        // ensuring that the file, instead of an empty buffer, is opened in a
-        // new tab.
-        cx.simulate_keystrokes(": tabnew space dir/file_2.rs");
-        cx.simulate_keystrokes("enter");
-
-        cx.workspace(|workspace, _, cx| assert_eq!(workspace.items(cx).count(), 3));
-        cx.workspace(|workspace, _, cx| {
-            assert_active_item(workspace, path!("/root/dir/file_2.rs"), "file_2", cx);
-        });
-
-        // If the `filename` argument provided to the `:tabnew` command is for a
-        // file that doesn't yet exist, it should still associate the buffer
-        // with that file path, so that when the buffer contents are saved, the
-        // file is created.
-        cx.simulate_keystrokes(": tabnew space dir/file_3.rs");
-        cx.simulate_keystrokes("enter");
-
-        cx.workspace(|workspace, _, cx| assert_eq!(workspace.items(cx).count(), 4));
-        cx.workspace(|workspace, _, cx| {
-            assert_active_item(workspace, path!("/root/dir/file_3.rs"), "", cx);
-        });
-    }
-
-    #[gpui::test]
-    async fn test_command_tabedit(cx: &mut TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        // Create a new file to ensure that, when the filename is used with
-        // `:tabedit`, it opens the existing file in a new tab.
-        let fs = cx.workspace(|workspace, _, cx| workspace.project().read(cx).fs().clone());
-        fs.as_fake()
-            .insert_file(path!("/root/dir/file_2.rs"), "file_2".as_bytes().to_vec())
-            .await;
-
-        cx.simulate_keystrokes(": tabedit");
-        cx.simulate_keystrokes("enter");
-        cx.workspace(|workspace, _, cx| assert_eq!(workspace.items(cx).count(), 2));
-
-        // Assert that the new tab is empty and not associated with any file, as
-        // no file path was provided to the `:tabedit` command.
-        cx.workspace(|workspace, _window, cx| {
-            let active_editor = workspace.active_item_as::<Editor>(cx).unwrap();
-            let buffer = active_editor
-                .read(cx)
-                .buffer()
-                .read(cx)
-                .as_singleton()
-                .unwrap();
-
-            assert!(&buffer.read(cx).file().is_none());
-        });
-
-        // Leverage the filename as an argument to the `:tabedit` command,
-        // ensuring that the file, instead of an empty buffer, is opened in a
-        // new tab.
-        cx.simulate_keystrokes(": tabedit space dir/file_2.rs");
-        cx.simulate_keystrokes("enter");
-
-        cx.workspace(|workspace, _, cx| assert_eq!(workspace.items(cx).count(), 3));
-        cx.workspace(|workspace, _, cx| {
-            assert_active_item(workspace, path!("/root/dir/file_2.rs"), "file_2", cx);
-        });
-
-        // If the `filename` argument provided to the `:tabedit` command is for a
-        // file that doesn't yet exist, it should still associate the buffer
-        // with that file path, so that when the buffer contents are saved, the
-        // file is created.
-        cx.simulate_keystrokes(": tabedit space dir/file_3.rs");
-        cx.simulate_keystrokes("enter");
-
-        cx.workspace(|workspace, _, cx| assert_eq!(workspace.items(cx).count(), 4));
-        cx.workspace(|workspace, _, cx| {
-            assert_active_item(workspace, path!("/root/dir/file_3.rs"), "", cx);
-        });
-    }
-
-    #[gpui::test]
-    async fn test_ignorecase_command(cx: &mut TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-        cx.read(|cx| {
-            assert_eq!(
-                EditorSettings::get_global(cx).search.case_sensitive,
-                false,
-                "The `case_sensitive` setting should be `false` by default."
-            );
-        });
-        cx.simulate_keystrokes(": set space noignorecase");
-        cx.simulate_keystrokes("enter");
-        cx.read(|cx| {
-            assert_eq!(
-                EditorSettings::get_global(cx).search.case_sensitive,
-                true,
-                "The `case_sensitive` setting should have been enabled with `:set noignorecase`."
-            );
-        });
-        cx.simulate_keystrokes(": set space ignorecase");
-        cx.simulate_keystrokes("enter");
-        cx.read(|cx| {
-            assert_eq!(
-                EditorSettings::get_global(cx).search.case_sensitive,
-                false,
-                "The `case_sensitive` setting should have been disabled with `:set ignorecase`."
-            );
-        });
-        cx.simulate_keystrokes(": set space noic");
-        cx.simulate_keystrokes("enter");
-        cx.read(|cx| {
-            assert_eq!(
-                EditorSettings::get_global(cx).search.case_sensitive,
-                true,
-                "The `case_sensitive` setting should have been enabled with `:set noic`."
-            );
-        });
-        cx.simulate_keystrokes(": set space ic");
-        cx.simulate_keystrokes("enter");
-        cx.read(|cx| {
-            assert_eq!(
-                EditorSettings::get_global(cx).search.case_sensitive,
-                false,
-                "The `case_sensitive` setting should have been disabled with `:set ic`."
-            );
-        });
-    }
-
-    #[gpui::test]
-    async fn test_sort_commands(cx: &mut TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        cx.set_state(
-            indoc! {"
-                «hornet
-                quirrel
-                elderbug
-                cornifer
-                idaˇ»
-            "},
-            Mode::Visual,
-        );
-
-        cx.simulate_keystrokes(": sort");
-        cx.simulate_keystrokes("enter");
-
-        cx.assert_state(
-            indoc! {"
-                ˇcornifer
-                elderbug
-                hornet
-                ida
-                quirrel
-            "},
-            Mode::Normal,
-        );
-
-        // Assert that, by default, `:sort` takes case into consideration.
-        cx.set_state(
-            indoc! {"
-                «hornet
-                quirrel
-                Elderbug
-                cornifer
-                idaˇ»
-            "},
-            Mode::Visual,
-        );
-
-        cx.simulate_keystrokes(": sort");
-        cx.simulate_keystrokes("enter");
-
-        cx.assert_state(
-            indoc! {"
-                ˇElderbug
-                cornifer
-                hornet
-                ida
-                quirrel
-            "},
-            Mode::Normal,
-        );
-
-        // Assert that, if the `i` option is passed, `:sort` ignores case.
-        cx.set_state(
-            indoc! {"
-                «hornet
-                quirrel
-                Elderbug
-                cornifer
-                idaˇ»
-            "},
-            Mode::Visual,
-        );
-
-        cx.simulate_keystrokes(": sort space i");
-        cx.simulate_keystrokes("enter");
-
-        cx.assert_state(
-            indoc! {"
-                ˇcornifer
-                Elderbug
-                hornet
-                ida
-                quirrel
-            "},
-            Mode::Normal,
-        );
-
-        // When no range is provided, sorts the whole buffer.
-        cx.set_state(
-            indoc! {"
-                ˇhornet
-                quirrel
-                elderbug
-                cornifer
-                ida
-            "},
-            Mode::Normal,
-        );
-
-        cx.simulate_keystrokes(": sort");
-        cx.simulate_keystrokes("enter");
-
-        cx.assert_state(
-            indoc! {"
-                ˇcornifer
-                elderbug
-                hornet
-                ida
-                quirrel
-            "},
-            Mode::Normal,
-        );
-    }
-}
diff --git a/crates/vim/src/digraph.rs b/crates/vim/src/digraph.rs
deleted file mode 100644
index 39014fea5b..0000000000
--- a/crates/vim/src/digraph.rs
+++ /dev/null
@@ -1,365 +0,0 @@
-use std::sync::Arc;
-
-use collections::HashMap;
-use editor::Editor;
-use gpui::{Action, App, Context, Keystroke, KeystrokeEvent, Window};
-use schemars::JsonSchema;
-use serde::Deserialize;
-use settings::Settings;
-use std::sync::LazyLock;
-
-use crate::{Vim, VimSettings, state::Operator};
-
-mod default;
-
-#[derive(Debug, Clone, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = vim)]
-struct Literal(String, char);
-
-pub(crate) fn register(editor: &mut Editor, cx: &mut Context<Vim>) {
-    Vim::action(editor, cx, Vim::literal)
-}
-
-static DEFAULT_DIGRAPHS_MAP: LazyLock<HashMap<String, Arc<str>>> = LazyLock::new(|| {
-    let mut map = HashMap::default();
-    for &(a, b, c) in default::DEFAULT_DIGRAPHS {
-        let key = format!("{a}{b}");
-        let value = char::from_u32(c).unwrap().to_string().into();
-        map.insert(key, value);
-    }
-    map
-});
-
-fn lookup_digraph(a: char, b: char, cx: &App) -> Arc<str> {
-    let custom_digraphs = &VimSettings::get_global(cx).custom_digraphs;
-    let input = format!("{a}{b}");
-    let reversed = format!("{b}{a}");
-
-    custom_digraphs
-        .get(&input)
-        .or_else(|| DEFAULT_DIGRAPHS_MAP.get(&input))
-        .or_else(|| custom_digraphs.get(&reversed))
-        .or_else(|| DEFAULT_DIGRAPHS_MAP.get(&reversed))
-        .cloned()
-        .unwrap_or_else(|| b.to_string().into())
-}
-
-impl Vim {
-    pub fn insert_digraph(
-        &mut self,
-        first_char: char,
-        second_char: char,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let text = lookup_digraph(first_char, second_char, cx);
-
-        self.pop_operator(window, cx);
-        if self.editor_input_enabled() {
-            self.update_editor(cx, |_, editor, cx| editor.insert(&text, window, cx));
-        } else {
-            self.input_ignored(text, window, cx);
-        }
-    }
-
-    fn literal(&mut self, action: &Literal, window: &mut Window, cx: &mut Context<Self>) {
-        match self.active_operator() {
-            Some(Operator::Literal {
-                prefix: Some(prefix),
-            }) => {
-                if let Some(keystroke) = Keystroke::parse(&action.0).ok() {
-                    window.defer(cx, |window, cx| {
-                        window.dispatch_keystroke(keystroke, cx);
-                    });
-                }
-                return self.handle_literal_input(prefix, "", window, cx);
-            }
-            Some(_) => self.insert_literal(Some(action.1), "", window, cx),
-            None => log::error!(
-                "Literal called when no operator was on the stack. This likely means there is an invalid keymap config"
-            ),
-        }
-    }
-
-    pub fn handle_literal_keystroke(
-        &mut self,
-        keystroke_event: &KeystrokeEvent,
-        prefix: String,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        // handled by handle_literal_input
-        if keystroke_event.keystroke.key_char.is_some() {
-            return;
-        };
-
-        if !prefix.is_empty() {
-            self.handle_literal_input(prefix, "", window, cx);
-        } else {
-            self.pop_operator(window, cx);
-        }
-
-        // give another chance to handle the binding outside
-        // of waiting mode.
-        if keystroke_event.action.is_none() {
-            let keystroke = keystroke_event.keystroke.clone();
-            window.defer(cx, |window, cx| {
-                window.dispatch_keystroke(keystroke, cx);
-            });
-        }
-    }
-
-    pub fn handle_literal_input(
-        &mut self,
-        mut prefix: String,
-        text: &str,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let first = prefix.chars().next();
-        let next = text.chars().next().unwrap_or(' ');
-        match first {
-            Some('o' | 'O') => {
-                if next.is_digit(8) {
-                    prefix.push(next);
-                    if prefix.len() == 4 {
-                        let ch: char = u8::from_str_radix(&prefix[1..], 8).unwrap_or(255).into();
-                        return self.insert_literal(Some(ch), "", window, cx);
-                    }
-                } else {
-                    let ch = if prefix.len() > 1 {
-                        Some(u8::from_str_radix(&prefix[1..], 8).unwrap_or(255).into())
-                    } else {
-                        None
-                    };
-                    return self.insert_literal(ch, text, window, cx);
-                }
-            }
-            Some('x' | 'X' | 'u' | 'U') => {
-                let max_len = match first.unwrap() {
-                    'x' => 3,
-                    'X' => 3,
-                    'u' => 5,
-                    'U' => 9,
-                    _ => unreachable!(),
-                };
-                if next.is_ascii_hexdigit() {
-                    prefix.push(next);
-                    if prefix.len() == max_len {
-                        let ch: char = u32::from_str_radix(&prefix[1..], 16)
-                            .ok()
-                            .and_then(|n| n.try_into().ok())
-                            .unwrap_or('\u{FFFD}');
-                        return self.insert_literal(Some(ch), "", window, cx);
-                    }
-                } else {
-                    let ch = if prefix.len() > 1 {
-                        Some(
-                            u32::from_str_radix(&prefix[1..], 16)
-                                .ok()
-                                .and_then(|n| n.try_into().ok())
-                                .unwrap_or('\u{FFFD}'),
-                        )
-                    } else {
-                        None
-                    };
-                    return self.insert_literal(ch, text, window, cx);
-                }
-            }
-            Some('0'..='9') => {
-                if next.is_ascii_hexdigit() {
-                    prefix.push(next);
-                    if prefix.len() == 3 {
-                        let ch: char = u8::from_str_radix(&prefix, 10).unwrap_or(255).into();
-                        return self.insert_literal(Some(ch), "", window, cx);
-                    }
-                } else {
-                    let ch: char = u8::from_str_radix(&prefix, 10).unwrap_or(255).into();
-                    return self.insert_literal(Some(ch), "", window, cx);
-                }
-            }
-            None if matches!(next, 'o' | 'O' | 'x' | 'X' | 'u' | 'U' | '0'..='9') => {
-                prefix.push(next)
-            }
-            _ => {
-                return self.insert_literal(None, text, window, cx);
-            }
-        };
-
-        self.pop_operator(window, cx);
-        self.push_operator(
-            Operator::Literal {
-                prefix: Some(prefix),
-            },
-            window,
-            cx,
-        );
-    }
-
-    fn insert_literal(
-        &mut self,
-        ch: Option<char>,
-        suffix: &str,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.pop_operator(window, cx);
-        let mut text = String::new();
-        if let Some(c) = ch {
-            if c == '\n' {
-                text.push('\x00')
-            } else {
-                text.push(c)
-            }
-        }
-        text.push_str(suffix);
-
-        if self.editor_input_enabled() {
-            self.update_editor(cx, |_, editor, cx| editor.insert(&text, window, cx));
-        } else {
-            self.input_ignored(text.into(), window, cx);
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use collections::HashMap;
-    use settings::SettingsStore;
-
-    use crate::{
-        state::Mode,
-        test::{NeovimBackedTestContext, VimTestContext},
-    };
-
-    #[gpui::test]
-    async fn test_digraph_insert_mode(cx: &mut gpui::TestAppContext) {
-        let mut cx: NeovimBackedTestContext = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state("Hellˇo").await;
-        cx.simulate_shared_keystrokes("a ctrl-k o : escape").await;
-        cx.shared_state().await.assert_eq("Helloˇö");
-
-        cx.set_shared_state("Hellˇo").await;
-        cx.simulate_shared_keystrokes("a ctrl-k : o escape").await;
-        cx.shared_state().await.assert_eq("Helloˇö");
-
-        cx.set_shared_state("Hellˇo").await;
-        cx.simulate_shared_keystrokes("i ctrl-k o : escape").await;
-        cx.shared_state().await.assert_eq("Hellˇöo");
-    }
-
-    #[gpui::test]
-    async fn test_digraph_insert_multicursor(cx: &mut gpui::TestAppContext) {
-        let mut cx: VimTestContext = VimTestContext::new(cx, true).await;
-
-        cx.set_state("Hellˇo wˇorld", Mode::Normal);
-        cx.simulate_keystrokes("a ctrl-k o : escape");
-        cx.assert_state("Helloˇö woˇörld", Mode::Normal);
-    }
-
-    #[gpui::test]
-    async fn test_digraph_replace(cx: &mut gpui::TestAppContext) {
-        let mut cx: NeovimBackedTestContext = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state("Hellˇo").await;
-        cx.simulate_shared_keystrokes("r ctrl-k o :").await;
-        cx.shared_state().await.assert_eq("Hellˇö");
-    }
-
-    #[gpui::test]
-    async fn test_digraph_find(cx: &mut gpui::TestAppContext) {
-        let mut cx: NeovimBackedTestContext = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state("ˇHellö world").await;
-        cx.simulate_shared_keystrokes("f ctrl-k o :").await;
-        cx.shared_state().await.assert_eq("Hellˇö world");
-
-        cx.set_shared_state("ˇHellö world").await;
-        cx.simulate_shared_keystrokes("t ctrl-k o :").await;
-        cx.shared_state().await.assert_eq("Helˇlö world");
-    }
-
-    #[gpui::test]
-    async fn test_digraph_replace_mode(cx: &mut gpui::TestAppContext) {
-        let mut cx: NeovimBackedTestContext = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state("ˇHello").await;
-        cx.simulate_shared_keystrokes(
-            "shift-r ctrl-k a ' ctrl-k e ` ctrl-k i : ctrl-k o ~ ctrl-k u - escape",
-        )
-        .await;
-        cx.shared_state().await.assert_eq("áèïõˇū");
-    }
-
-    #[gpui::test]
-    async fn test_digraph_custom(cx: &mut gpui::TestAppContext) {
-        let mut cx: VimTestContext = VimTestContext::new(cx, true).await;
-
-        cx.update_global(|store: &mut SettingsStore, cx| {
-            store.update_user_settings(cx, |s| {
-                let mut custom_digraphs = HashMap::default();
-                custom_digraphs.insert("|-".into(), "⊢".into());
-                custom_digraphs.insert(":)".into(), "👨‍💻".into());
-                s.vim.get_or_insert_default().custom_digraphs = Some(custom_digraphs);
-            });
-        });
-
-        cx.set_state("ˇ", Mode::Normal);
-        cx.simulate_keystrokes("a ctrl-k | - escape");
-        cx.assert_state("ˇ⊢", Mode::Normal);
-
-        // Test support for multi-codepoint mappings
-        cx.set_state("ˇ", Mode::Normal);
-        cx.simulate_keystrokes("a ctrl-k : ) escape");
-        cx.assert_state("ˇ👨‍💻", Mode::Normal);
-    }
-
-    #[gpui::test]
-    async fn test_digraph_keymap_conflict(cx: &mut gpui::TestAppContext) {
-        let mut cx: NeovimBackedTestContext = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state("Hellˇo").await;
-        cx.simulate_shared_keystrokes("a ctrl-k s , escape").await;
-        cx.shared_state().await.assert_eq("Helloˇş");
-    }
-
-    #[gpui::test]
-    async fn test_ctrl_v(cx: &mut gpui::TestAppContext) {
-        let mut cx: NeovimBackedTestContext = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state("ˇ").await;
-        cx.simulate_shared_keystrokes("i ctrl-v 0 0 0").await;
-        cx.shared_state().await.assert_eq("\x00ˇ");
-
-        cx.simulate_shared_keystrokes("ctrl-v j").await;
-        cx.shared_state().await.assert_eq("\x00jˇ");
-        cx.simulate_shared_keystrokes("ctrl-v x 6 5").await;
-        cx.shared_state().await.assert_eq("\x00jeˇ");
-        cx.simulate_shared_keystrokes("ctrl-v U 1 F 6 4 0 space")
-            .await;
-        cx.shared_state().await.assert_eq("\x00je🙀 ˇ");
-    }
-
-    #[gpui::test]
-    async fn test_ctrl_v_escape(cx: &mut gpui::TestAppContext) {
-        let mut cx: NeovimBackedTestContext = NeovimBackedTestContext::new(cx).await;
-        cx.set_shared_state("ˇ").await;
-        cx.simulate_shared_keystrokes("i ctrl-v 9 escape").await;
-        cx.shared_state().await.assert_eq("ˇ\t");
-        cx.simulate_shared_keystrokes("i ctrl-v escape").await;
-        cx.shared_state().await.assert_eq("\x1bˇ\t");
-    }
-
-    #[gpui::test]
-    async fn test_ctrl_v_control(cx: &mut gpui::TestAppContext) {
-        let mut cx: NeovimBackedTestContext = NeovimBackedTestContext::new(cx).await;
-        cx.set_shared_state("ˇ").await;
-        cx.simulate_shared_keystrokes("i ctrl-v ctrl-d").await;
-        cx.shared_state().await.assert_eq("\x04ˇ");
-        cx.simulate_shared_keystrokes("ctrl-v ctrl-j").await;
-        cx.shared_state().await.assert_eq("\x04\x00ˇ");
-        cx.simulate_shared_keystrokes("ctrl-v tab").await;
-        cx.shared_state().await.assert_eq("\x04\x00\x09ˇ");
-    }
-}
diff --git a/crates/vim/src/digraph/default.rs b/crates/vim/src/digraph/default.rs
deleted file mode 100644
index 717fed3816..0000000000
--- a/crates/vim/src/digraph/default.rs
+++ /dev/null
@@ -1,1366 +0,0 @@
-/// Copied from https://github.com/neovim/neovim/blob/5fc25ecc7a383a4bed2199774ed2e26022456ca3/src/nvim/digraph.c#L65
-pub const DEFAULT_DIGRAPHS: &[(char, char, u32)] = &[
-    ('N', 'U', 0x00),
-    ('S', 'H', 0x01),
-    ('S', 'X', 0x02),
-    ('E', 'X', 0x03),
-    ('E', 'T', 0x04),
-    ('E', 'Q', 0x05),
-    ('A', 'K', 0x06),
-    ('B', 'L', 0x07),
-    ('B', 'S', 0x08),
-    ('H', 'T', 0x09),
-    ('L', 'F', 0x0a),
-    ('V', 'T', 0x0b),
-    ('F', 'F', 0x0c),
-    ('C', 'R', 0x0d),
-    ('S', 'O', 0x0e),
-    ('S', 'I', 0x0f),
-    ('D', 'L', 0x10),
-    ('D', '1', 0x11),
-    ('D', '2', 0x12),
-    ('D', '3', 0x13),
-    ('D', '4', 0x14),
-    ('N', 'K', 0x15),
-    ('S', 'Y', 0x16),
-    ('E', 'B', 0x17),
-    ('C', 'N', 0x18),
-    ('E', 'M', 0x19),
-    ('S', 'B', 0x1a),
-    ('E', 'C', 0x1b),
-    ('F', 'S', 0x1c),
-    ('G', 'S', 0x1d),
-    ('R', 'S', 0x1e),
-    ('U', 'S', 0x1f),
-    ('S', 'P', 0x20),
-    ('N', 'b', 0x23),
-    ('D', 'O', 0x24),
-    ('A', 't', 0x40),
-    ('<', '(', 0x5b),
-    ('/', '/', 0x5c),
-    (')', '>', 0x5d),
-    ('\'', '>', 0x5e),
-    ('\'', '!', 0x60),
-    ('(', '!', 0x7b),
-    ('!', '!', 0x7c),
-    ('!', ')', 0x7d),
-    ('\'', '?', 0x7e),
-    ('D', 'T', 0x7f),
-    ('P', 'A', 0x80),
-    ('H', 'O', 0x81),
-    ('B', 'H', 0x82),
-    ('N', 'H', 0x83),
-    ('I', 'N', 0x84),
-    ('N', 'L', 0x85),
-    ('S', 'A', 0x86),
-    ('E', 'S', 0x87),
-    ('H', 'S', 0x88),
-    ('H', 'J', 0x89),
-    ('V', 'S', 0x8a),
-    ('P', 'D', 0x8b),
-    ('P', 'U', 0x8c),
-    ('R', 'I', 0x8d),
-    ('S', '2', 0x8e),
-    ('S', '3', 0x8f),
-    ('D', 'C', 0x90),
-    ('P', '1', 0x91),
-    ('P', '2', 0x92),
-    ('T', 'S', 0x93),
-    ('C', 'C', 0x94),
-    ('M', 'W', 0x95),
-    ('S', 'G', 0x96),
-    ('E', 'G', 0x97),
-    ('S', 'S', 0x98),
-    ('G', 'C', 0x99),
-    ('S', 'C', 0x9a),
-    ('C', 'I', 0x9b),
-    ('S', 'T', 0x9c),
-    ('O', 'C', 0x9d),
-    ('P', 'M', 0x9e),
-    ('A', 'C', 0x9f),
-    ('N', 'S', 0xa0),
-    ('!', 'I', 0xa1),
-    ('~', '!', 0xa1),
-    ('C', 't', 0xa2),
-    ('c', '|', 0xa2),
-    ('P', 'd', 0xa3),
-    ('$', '$', 0xa3),
-    ('C', 'u', 0xa4),
-    ('o', 'x', 0xa4),
-    ('Y', 'e', 0xa5),
-    ('Y', '-', 0xa5),
-    ('B', 'B', 0xa6),
-    ('|', '|', 0xa6),
-    ('S', 'E', 0xa7),
-    ('\'', ':', 0xa8),
-    ('C', 'o', 0xa9),
-    ('c', 'O', 0xa9),
-    ('-', 'a', 0xaa),
-    ('<', '<', 0xab),
-    ('N', 'O', 0xac),
-    ('-', ',', 0xac),
-    ('-', '-', 0xad),
-    ('R', 'g', 0xae),
-    ('\'', 'm', 0xaf),
-    ('-', '=', 0xaf),
-    ('D', 'G', 0xb0),
-    ('~', 'o', 0xb0),
-    ('+', '-', 0xb1),
-    ('2', 'S', 0xb2),
-    ('2', '2', 0xb2),
-    ('3', 'S', 0xb3),
-    ('3', '3', 0xb3),
-    ('\'', '\'', 0xb4),
-    ('M', 'y', 0xb5),
-    ('P', 'I', 0xb6),
-    ('p', 'p', 0xb6),
-    ('.', 'M', 0xb7),
-    ('~', '.', 0xb7),
-    ('\'', ',', 0xb8),
-    ('1', 'S', 0xb9),
-    ('1', '1', 0xb9),
-    ('-', 'o', 0xba),
-    ('>', '>', 0xbb),
-    ('1', '4', 0xbc),
-    ('1', '2', 0xbd),
-    ('3', '4', 0xbe),
-    ('?', 'I', 0xbf),
-    ('~', '?', 0xbf),
-    ('A', '!', 0xc0),
-    ('A', '`', 0xc0),
-    ('A', '\'', 0xc1),
-    ('A', '>', 0xc2),
-    ('A', '^', 0xc2),
-    ('A', '?', 0xc3),
-    ('A', '~', 0xc3),
-    ('A', ':', 0xc4),
-    ('A', '"', 0xc4),
-    ('A', 'A', 0xc5),
-    ('A', '@', 0xc5),
-    ('A', 'E', 0xc6),
-    ('C', ',', 0xc7),
-    ('E', '!', 0xc8),
-    ('E', '`', 0xc8),
-    ('E', '\'', 0xc9),
-    ('E', '>', 0xca),
-    ('E', '^', 0xca),
-    ('E', ':', 0xcb),
-    ('E', '"', 0xcb),
-    ('I', '!', 0xcc),
-    ('I', '`', 0xcc),
-    ('I', '\'', 0xcd),
-    ('I', '>', 0xce),
-    ('I', '^', 0xce),
-    ('I', ':', 0xcf),
-    ('I', '"', 0xcf),
-    ('D', '-', 0xd0),
-    ('N', '?', 0xd1),
-    ('N', '~', 0xd1),
-    ('O', '!', 0xd2),
-    ('O', '`', 0xd2),
-    ('O', '\'', 0xd3),
-    ('O', '>', 0xd4),
-    ('O', '^', 0xd4),
-    ('O', '?', 0xd5),
-    ('O', '~', 0xd5),
-    ('O', ':', 0xd6),
-    ('*', 'X', 0xd7),
-    ('/', '\\', 0xd7),
-    ('O', '/', 0xd8),
-    ('U', '!', 0xd9),
-    ('U', '`', 0xd9),
-    ('U', '\'', 0xda),
-    ('U', '>', 0xdb),
-    ('U', '^', 0xdb),
-    ('U', ':', 0xdc),
-    ('Y', '\'', 0xdd),
-    ('T', 'H', 0xde),
-    ('I', 'p', 0xde),
-    ('s', 's', 0xdf),
-    ('a', '!', 0xe0),
-    ('a', '`', 0xe0),
-    ('a', '\'', 0xe1),
-    ('a', '>', 0xe2),
-    ('a', '^', 0xe2),
-    ('a', '?', 0xe3),
-    ('a', '~', 0xe3),
-    ('a', ':', 0xe4),
-    ('a', '"', 0xe4),
-    ('a', 'a', 0xe5),
-    ('a', '@', 0xe5),
-    ('a', 'e', 0xe6),
-    ('c', ',', 0xe7),
-    ('e', '!', 0xe8),
-    ('e', '`', 0xe8),
-    ('e', '\'', 0xe9),
-    ('e', '>', 0xea),
-    ('e', '^', 0xea),
-    ('e', ':', 0xeb),
-    ('e', '"', 0xeb),
-    ('i', '!', 0xec),
-    ('i', '`', 0xec),
-    ('i', '\'', 0xed),
-    ('i', '>', 0xee),
-    ('i', '^', 0xee),
-    ('i', ':', 0xef),
-    ('d', '-', 0xf0),
-    ('n', '?', 0xf1),
-    ('n', '~', 0xf1),
-    ('o', '!', 0xf2),
-    ('o', '`', 0xf2),
-    ('o', '\'', 0xf3),
-    ('o', '>', 0xf4),
-    ('o', '^', 0xf4),
-    ('o', '?', 0xf5),
-    ('o', '~', 0xf5),
-    ('o', ':', 0xf6),
-    ('-', ':', 0xf7),
-    ('o', '/', 0xf8),
-    ('u', '!', 0xf9),
-    ('u', '`', 0xf9),
-    ('u', '\'', 0xfa),
-    ('u', '>', 0xfb),
-    ('u', '^', 0xfb),
-    ('u', ':', 0xfc),
-    ('y', '\'', 0xfd),
-    ('t', 'h', 0xfe),
-    ('y', ':', 0xff),
-    ('y', '"', 0xff),
-    ('A', '-', 0x0100),
-    ('a', '-', 0x0101),
-    ('A', '(', 0x0102),
-    ('a', '(', 0x0103),
-    ('A', ';', 0x0104),
-    ('a', ';', 0x0105),
-    ('C', '\'', 0x0106),
-    ('c', '\'', 0x0107),
-    ('C', '>', 0x0108),
-    ('c', '>', 0x0109),
-    ('C', '.', 0x010a),
-    ('c', '.', 0x010b),
-    ('C', '<', 0x010c),
-    ('c', '<', 0x010d),
-    ('D', '<', 0x010e),
-    ('d', '<', 0x010f),
-    ('D', '/', 0x0110),
-    ('d', '/', 0x0111),
-    ('E', '-', 0x0112),
-    ('e', '-', 0x0113),
-    ('E', '(', 0x0114),
-    ('e', '(', 0x0115),
-    ('E', '.', 0x0116),
-    ('e', '.', 0x0117),
-    ('E', ';', 0x0118),
-    ('e', ';', 0x0119),
-    ('E', '<', 0x011a),
-    ('e', '<', 0x011b),
-    ('G', '>', 0x011c),
-    ('g', '>', 0x011d),
-    ('G', '(', 0x011e),
-    ('g', '(', 0x011f),
-    ('G', '.', 0x0120),
-    ('g', '.', 0x0121),
-    ('G', ',', 0x0122),
-    ('g', ',', 0x0123),
-    ('H', '>', 0x0124),
-    ('h', '>', 0x0125),
-    ('H', '/', 0x0126),
-    ('h', '/', 0x0127),
-    ('I', '?', 0x0128),
-    ('i', '?', 0x0129),
-    ('I', '-', 0x012a),
-    ('i', '-', 0x012b),
-    ('I', '(', 0x012c),
-    ('i', '(', 0x012d),
-    ('I', ';', 0x012e),
-    ('i', ';', 0x012f),
-    ('I', '.', 0x0130),
-    ('i', '.', 0x0131),
-    ('I', 'J', 0x0132),
-    ('i', 'j', 0x0133),
-    ('J', '>', 0x0134),
-    ('j', '>', 0x0135),
-    ('K', ',', 0x0136),
-    ('k', ',', 0x0137),
-    ('k', 'k', 0x0138),
-    ('L', '\'', 0x0139),
-    ('l', '\'', 0x013a),
-    ('L', ',', 0x013b),
-    ('l', ',', 0x013c),
-    ('L', '<', 0x013d),
-    ('l', '<', 0x013e),
-    ('L', '.', 0x013f),
-    ('l', '.', 0x0140),
-    ('L', '/', 0x0141),
-    ('l', '/', 0x0142),
-    ('N', '\'', 0x0143),
-    ('n', '\'', 0x0144),
-    ('N', ',', 0x0145),
-    ('n', ',', 0x0146),
-    ('N', '<', 0x0147),
-    ('n', '<', 0x0148),
-    ('\'', 'n', 0x0149),
-    ('N', 'G', 0x014a),
-    ('n', 'g', 0x014b),
-    ('O', '-', 0x014c),
-    ('o', '-', 0x014d),
-    ('O', '(', 0x014e),
-    ('o', '(', 0x014f),
-    ('O', '"', 0x0150),
-    ('o', '"', 0x0151),
-    ('O', 'E', 0x0152),
-    ('o', 'e', 0x0153),
-    ('R', '\'', 0x0154),
-    ('r', '\'', 0x0155),
-    ('R', ',', 0x0156),
-    ('r', ',', 0x0157),
-    ('R', '<', 0x0158),
-    ('r', '<', 0x0159),
-    ('S', '\'', 0x015a),
-    ('s', '\'', 0x015b),
-    ('S', '>', 0x015c),
-    ('s', '>', 0x015d),
-    ('S', ',', 0x015e),
-    ('s', ',', 0x015f),
-    ('S', '<', 0x0160),
-    ('s', '<', 0x0161),
-    ('T', ',', 0x0162),
-    ('t', ',', 0x0163),
-    ('T', '<', 0x0164),
-    ('t', '<', 0x0165),
-    ('T', '/', 0x0166),
-    ('t', '/', 0x0167),
-    ('U', '?', 0x0168),
-    ('u', '?', 0x0169),
-    ('U', '-', 0x016a),
-    ('u', '-', 0x016b),
-    ('U', '(', 0x016c),
-    ('u', '(', 0x016d),
-    ('U', '0', 0x016e),
-    ('u', '0', 0x016f),
-    ('U', '"', 0x0170),
-    ('u', '"', 0x0171),
-    ('U', ';', 0x0172),
-    ('u', ';', 0x0173),
-    ('W', '>', 0x0174),
-    ('w', '>', 0x0175),
-    ('Y', '>', 0x0176),
-    ('y', '>', 0x0177),
-    ('Y', ':', 0x0178),
-    ('Z', '\'', 0x0179),
-    ('z', '\'', 0x017a),
-    ('Z', '.', 0x017b),
-    ('z', '.', 0x017c),
-    ('Z', '<', 0x017d),
-    ('z', '<', 0x017e),
-    ('O', '9', 0x01a0),
-    ('o', '9', 0x01a1),
-    ('O', 'I', 0x01a2),
-    ('o', 'i', 0x01a3),
-    ('y', 'r', 0x01a6),
-    ('U', '9', 0x01af),
-    ('u', '9', 0x01b0),
-    ('Z', '/', 0x01b5),
-    ('z', '/', 0x01b6),
-    ('E', 'D', 0x01b7),
-    ('A', '<', 0x01cd),
-    ('a', '<', 0x01ce),
-    ('I', '<', 0x01cf),
-    ('i', '<', 0x01d0),
-    ('O', '<', 0x01d1),
-    ('o', '<', 0x01d2),
-    ('U', '<', 0x01d3),
-    ('u', '<', 0x01d4),
-    ('A', '1', 0x01de),
-    ('a', '1', 0x01df),
-    ('A', '7', 0x01e0),
-    ('a', '7', 0x01e1),
-    ('A', '3', 0x01e2),
-    ('a', '3', 0x01e3),
-    ('G', '/', 0x01e4),
-    ('g', '/', 0x01e5),
-    ('G', '<', 0x01e6),
-    ('g', '<', 0x01e7),
-    ('K', '<', 0x01e8),
-    ('k', '<', 0x01e9),
-    ('O', ';', 0x01ea),
-    ('o', ';', 0x01eb),
-    ('O', '1', 0x01ec),
-    ('o', '1', 0x01ed),
-    ('E', 'Z', 0x01ee),
-    ('e', 'z', 0x01ef),
-    ('j', '<', 0x01f0),
-    ('G', '\'', 0x01f4),
-    ('g', '\'', 0x01f5),
-    (';', 'S', 0x02bf),
-    ('\'', '<', 0x02c7),
-    ('\'', '(', 0x02d8),
-    ('\'', '.', 0x02d9),
-    ('\'', '0', 0x02da),
-    ('\'', ';', 0x02db),
-    ('\'', '"', 0x02dd),
-    ('A', '%', 0x0386),
-    ('E', '%', 0x0388),
-    ('Y', '%', 0x0389),
-    ('I', '%', 0x038a),
-    ('O', '%', 0x038c),
-    ('U', '%', 0x038e),
-    ('W', '%', 0x038f),
-    ('i', '3', 0x0390),
-    ('A', '*', 0x0391),
-    ('B', '*', 0x0392),
-    ('G', '*', 0x0393),
-    ('D', '*', 0x0394),
-    ('E', '*', 0x0395),
-    ('Z', '*', 0x0396),
-    ('Y', '*', 0x0397),
-    ('H', '*', 0x0398),
-    ('I', '*', 0x0399),
-    ('K', '*', 0x039a),
-    ('L', '*', 0x039b),
-    ('M', '*', 0x039c),
-    ('N', '*', 0x039d),
-    ('C', '*', 0x039e),
-    ('O', '*', 0x039f),
-    ('P', '*', 0x03a0),
-    ('R', '*', 0x03a1),
-    ('S', '*', 0x03a3),
-    ('T', '*', 0x03a4),
-    ('U', '*', 0x03a5),
-    ('F', '*', 0x03a6),
-    ('X', '*', 0x03a7),
-    ('Q', '*', 0x03a8),
-    ('W', '*', 0x03a9),
-    ('J', '*', 0x03aa),
-    ('V', '*', 0x03ab),
-    ('a', '%', 0x03ac),
-    ('e', '%', 0x03ad),
-    ('y', '%', 0x03ae),
-    ('i', '%', 0x03af),
-    ('u', '3', 0x03b0),
-    ('a', '*', 0x03b1),
-    ('b', '*', 0x03b2),
-    ('g', '*', 0x03b3),
-    ('d', '*', 0x03b4),
-    ('e', '*', 0x03b5),
-    ('z', '*', 0x03b6),
-    ('y', '*', 0x03b7),
-    ('h', '*', 0x03b8),
-    ('i', '*', 0x03b9),
-    ('k', '*', 0x03ba),
-    ('l', '*', 0x03bb),
-    ('m', '*', 0x03bc),
-    ('n', '*', 0x03bd),
-    ('c', '*', 0x03be),
-    ('o', '*', 0x03bf),
-    ('p', '*', 0x03c0),
-    ('r', '*', 0x03c1),
-    ('*', 's', 0x03c2),
-    ('s', '*', 0x03c3),
-    ('t', '*', 0x03c4),
-    ('u', '*', 0x03c5),
-    ('f', '*', 0x03c6),
-    ('x', '*', 0x03c7),
-    ('q', '*', 0x03c8),
-    ('w', '*', 0x03c9),
-    ('j', '*', 0x03ca),
-    ('v', '*', 0x03cb),
-    ('o', '%', 0x03cc),
-    ('u', '%', 0x03cd),
-    ('w', '%', 0x03ce),
-    ('\'', 'G', 0x03d8),
-    (',', 'G', 0x03d9),
-    ('T', '3', 0x03da),
-    ('t', '3', 0x03db),
-    ('M', '3', 0x03dc),
-    ('m', '3', 0x03dd),
-    ('K', '3', 0x03de),
-    ('k', '3', 0x03df),
-    ('P', '3', 0x03e0),
-    ('p', '3', 0x03e1),
-    ('\'', '%', 0x03f4),
-    ('j', '3', 0x03f5),
-    ('I', 'O', 0x0401),
-    ('D', '%', 0x0402),
-    ('G', '%', 0x0403),
-    ('I', 'E', 0x0404),
-    ('D', 'S', 0x0405),
-    ('I', 'I', 0x0406),
-    ('Y', 'I', 0x0407),
-    ('J', '%', 0x0408),
-    ('L', 'J', 0x0409),
-    ('N', 'J', 0x040a),
-    ('T', 's', 0x040b),
-    ('K', 'J', 0x040c),
-    ('V', '%', 0x040e),
-    ('D', 'Z', 0x040f),
-    ('A', '=', 0x0410),
-    ('B', '=', 0x0411),
-    ('V', '=', 0x0412),
-    ('G', '=', 0x0413),
-    ('D', '=', 0x0414),
-    ('E', '=', 0x0415),
-    ('Z', '%', 0x0416),
-    ('Z', '=', 0x0417),
-    ('I', '=', 0x0418),
-    ('J', '=', 0x0419),
-    ('K', '=', 0x041a),
-    ('L', '=', 0x041b),
-    ('M', '=', 0x041c),
-    ('N', '=', 0x041d),
-    ('O', '=', 0x041e),
-    ('P', '=', 0x041f),
-    ('R', '=', 0x0420),
-    ('S', '=', 0x0421),
-    ('T', '=', 0x0422),
-    ('U', '=', 0x0423),
-    ('F', '=', 0x0424),
-    ('H', '=', 0x0425),
-    ('C', '=', 0x0426),
-    ('C', '%', 0x0427),
-    ('S', '%', 0x0428),
-    ('S', 'c', 0x0429),
-    ('=', '"', 0x042a),
-    ('Y', '=', 0x042b),
-    ('%', '"', 0x042c),
-    ('J', 'E', 0x042d),
-    ('J', 'U', 0x042e),
-    ('J', 'A', 0x042f),
-    ('a', '=', 0x0430),
-    ('b', '=', 0x0431),
-    ('v', '=', 0x0432),
-    ('g', '=', 0x0433),
-    ('d', '=', 0x0434),
-    ('e', '=', 0x0435),
-    ('z', '%', 0x0436),
-    ('z', '=', 0x0437),
-    ('i', '=', 0x0438),
-    ('j', '=', 0x0439),
-    ('k', '=', 0x043a),
-    ('l', '=', 0x043b),
-    ('m', '=', 0x043c),
-    ('n', '=', 0x043d),
-    ('o', '=', 0x043e),
-    ('p', '=', 0x043f),
-    ('r', '=', 0x0440),
-    ('s', '=', 0x0441),
-    ('t', '=', 0x0442),
-    ('u', '=', 0x0443),
-    ('f', '=', 0x0444),
-    ('h', '=', 0x0445),
-    ('c', '=', 0x0446),
-    ('c', '%', 0x0447),
-    ('s', '%', 0x0448),
-    ('s', 'c', 0x0449),
-    ('=', '\'', 0x044a),
-    ('y', '=', 0x044b),
-    ('%', '\'', 0x044c),
-    ('j', 'e', 0x044d),
-    ('j', 'u', 0x044e),
-    ('j', 'a', 0x044f),
-    ('i', 'o', 0x0451),
-    ('d', '%', 0x0452),
-    ('g', '%', 0x0453),
-    ('i', 'e', 0x0454),
-    ('d', 's', 0x0455),
-    ('i', 'i', 0x0456),
-    ('y', 'i', 0x0457),
-    ('j', '%', 0x0458),
-    ('l', 'j', 0x0459),
-    ('n', 'j', 0x045a),
-    ('t', 's', 0x045b),
-    ('k', 'j', 0x045c),
-    ('v', '%', 0x045e),
-    ('d', 'z', 0x045f),
-    ('Y', '3', 0x0462),
-    ('y', '3', 0x0463),
-    ('O', '3', 0x046a),
-    ('o', '3', 0x046b),
-    ('F', '3', 0x0472),
-    ('f', '3', 0x0473),
-    ('V', '3', 0x0474),
-    ('v', '3', 0x0475),
-    ('C', '3', 0x0480),
-    ('c', '3', 0x0481),
-    ('G', '3', 0x0490),
-    ('g', '3', 0x0491),
-    ('A', '+', 0x05d0),
-    ('B', '+', 0x05d1),
-    ('G', '+', 0x05d2),
-    ('D', '+', 0x05d3),
-    ('H', '+', 0x05d4),
-    ('W', '+', 0x05d5),
-    ('Z', '+', 0x05d6),
-    ('X', '+', 0x05d7),
-    ('T', 'j', 0x05d8),
-    ('J', '+', 0x05d9),
-    ('K', '%', 0x05da),
-    ('K', '+', 0x05db),
-    ('L', '+', 0x05dc),
-    ('M', '%', 0x05dd),
-    ('M', '+', 0x05de),
-    ('N', '%', 0x05df),
-    ('N', '+', 0x05e0),
-    ('S', '+', 0x05e1),
-    ('E', '+', 0x05e2),
-    ('P', '%', 0x05e3),
-    ('P', '+', 0x05e4),
-    ('Z', 'j', 0x05e5),
-    ('Z', 'J', 0x05e6),
-    ('Q', '+', 0x05e7),
-    ('R', '+', 0x05e8),
-    ('S', 'h', 0x05e9),
-    ('T', '+', 0x05ea),
-    (',', '+', 0x060c),
-    (';', '+', 0x061b),
-    ('?', '+', 0x061f),
-    ('H', '\'', 0x0621),
-    ('a', 'M', 0x0622),
-    ('a', 'H', 0x0623),
-    ('w', 'H', 0x0624),
-    ('a', 'h', 0x0625),
-    ('y', 'H', 0x0626),
-    ('a', '+', 0x0627),
-    ('b', '+', 0x0628),
-    ('t', 'm', 0x0629),
-    ('t', '+', 0x062a),
-    ('t', 'k', 0x062b),
-    ('g', '+', 0x062c),
-    ('h', 'k', 0x062d),
-    ('x', '+', 0x062e),
-    ('d', '+', 0x062f),
-    ('d', 'k', 0x0630),
-    ('r', '+', 0x0631),
-    ('z', '+', 0x0632),
-    ('s', '+', 0x0633),
-    ('s', 'n', 0x0634),
-    ('c', '+', 0x0635),
-    ('d', 'd', 0x0636),
-    ('t', 'j', 0x0637),
-    ('z', 'H', 0x0638),
-    ('e', '+', 0x0639),
-    ('i', '+', 0x063a),
-    ('+', '+', 0x0640),
-    ('f', '+', 0x0641),
-    ('q', '+', 0x0642),
-    ('k', '+', 0x0643),
-    ('l', '+', 0x0644),
-    ('m', '+', 0x0645),
-    ('n', '+', 0x0646),
-    ('h', '+', 0x0647),
-    ('w', '+', 0x0648),
-    ('j', '+', 0x0649),
-    ('y', '+', 0x064a),
-    (':', '+', 0x064b),
-    ('"', '+', 0x064c),
-    ('=', '+', 0x064d),
-    ('/', '+', 0x064e),
-    ('\'', '+', 0x064f),
-    ('1', '+', 0x0650),
-    ('3', '+', 0x0651),
-    ('0', '+', 0x0652),
-    ('a', 'S', 0x0670),
-    ('p', '+', 0x067e),
-    ('v', '+', 0x06a4),
-    ('g', 'f', 0x06af),
-    ('0', 'a', 0x06f0),
-    ('1', 'a', 0x06f1),
-    ('2', 'a', 0x06f2),
-    ('3', 'a', 0x06f3),
-    ('4', 'a', 0x06f4),
-    ('5', 'a', 0x06f5),
-    ('6', 'a', 0x06f6),
-    ('7', 'a', 0x06f7),
-    ('8', 'a', 0x06f8),
-    ('9', 'a', 0x06f9),
-    ('B', '.', 0x1e02),
-    ('b', '.', 0x1e03),
-    ('B', '_', 0x1e06),
-    ('b', '_', 0x1e07),
-    ('D', '.', 0x1e0a),
-    ('d', '.', 0x1e0b),
-    ('D', '_', 0x1e0e),
-    ('d', '_', 0x1e0f),
-    ('D', ',', 0x1e10),
-    ('d', ',', 0x1e11),
-    ('F', '.', 0x1e1e),
-    ('f', '.', 0x1e1f),
-    ('G', '-', 0x1e20),
-    ('g', '-', 0x1e21),
-    ('H', '.', 0x1e22),
-    ('h', '.', 0x1e23),
-    ('H', ':', 0x1e26),
-    ('h', ':', 0x1e27),
-    ('H', ',', 0x1e28),
-    ('h', ',', 0x1e29),
-    ('K', '\'', 0x1e30),
-    ('k', '\'', 0x1e31),
-    ('K', '_', 0x1e34),
-    ('k', '_', 0x1e35),
-    ('L', '_', 0x1e3a),
-    ('l', '_', 0x1e3b),
-    ('M', '\'', 0x1e3e),
-    ('m', '\'', 0x1e3f),
-    ('M', '.', 0x1e40),
-    ('m', '.', 0x1e41),
-    ('N', '.', 0x1e44),
-    ('n', '.', 0x1e45),
-    ('N', '_', 0x1e48),
-    ('n', '_', 0x1e49),
-    ('P', '\'', 0x1e54),
-    ('p', '\'', 0x1e55),
-    ('P', '.', 0x1e56),
-    ('p', '.', 0x1e57),
-    ('R', '.', 0x1e58),
-    ('r', '.', 0x1e59),
-    ('R', '_', 0x1e5e),
-    ('r', '_', 0x1e5f),
-    ('S', '.', 0x1e60),
-    ('s', '.', 0x1e61),
-    ('T', '.', 0x1e6a),
-    ('t', '.', 0x1e6b),
-    ('T', '_', 0x1e6e),
-    ('t', '_', 0x1e6f),
-    ('V', '?', 0x1e7c),
-    ('v', '?', 0x1e7d),
-    ('W', '!', 0x1e80),
-    ('W', '`', 0x1e80),
-    ('w', '!', 0x1e81),
-    ('w', '`', 0x1e81),
-    ('W', '\'', 0x1e82),
-    ('w', '\'', 0x1e83),
-    ('W', ':', 0x1e84),
-    ('w', ':', 0x1e85),
-    ('W', '.', 0x1e86),
-    ('w', '.', 0x1e87),
-    ('X', '.', 0x1e8a),
-    ('x', '.', 0x1e8b),
-    ('X', ':', 0x1e8c),
-    ('x', ':', 0x1e8d),
-    ('Y', '.', 0x1e8e),
-    ('y', '.', 0x1e8f),
-    ('Z', '>', 0x1e90),
-    ('z', '>', 0x1e91),
-    ('Z', '_', 0x1e94),
-    ('z', '_', 0x1e95),
-    ('h', '_', 0x1e96),
-    ('t', ':', 0x1e97),
-    ('w', '0', 0x1e98),
-    ('y', '0', 0x1e99),
-    ('A', '2', 0x1ea2),
-    ('a', '2', 0x1ea3),
-    ('E', '2', 0x1eba),
-    ('e', '2', 0x1ebb),
-    ('E', '?', 0x1ebc),
-    ('e', '?', 0x1ebd),
-    ('I', '2', 0x1ec8),
-    ('i', '2', 0x1ec9),
-    ('O', '2', 0x1ece),
-    ('o', '2', 0x1ecf),
-    ('U', '2', 0x1ee6),
-    ('u', '2', 0x1ee7),
-    ('Y', '!', 0x1ef2),
-    ('Y', '`', 0x1ef2),
-    ('y', '!', 0x1ef3),
-    ('y', '`', 0x1ef3),
-    ('Y', '2', 0x1ef6),
-    ('y', '2', 0x1ef7),
-    ('Y', '?', 0x1ef8),
-    ('y', '?', 0x1ef9),
-    (';', '\'', 0x1f00),
-    (',', '\'', 0x1f01),
-    (';', '!', 0x1f02),
-    (',', '!', 0x1f03),
-    ('?', ';', 0x1f04),
-    ('?', ',', 0x1f05),
-    ('!', ':', 0x1f06),
-    ('?', ':', 0x1f07),
-    ('1', 'N', 0x2002),
-    ('1', 'M', 0x2003),
-    ('3', 'M', 0x2004),
-    ('4', 'M', 0x2005),
-    ('6', 'M', 0x2006),
-    ('1', 'T', 0x2009),
-    ('1', 'H', 0x200a),
-    ('-', '1', 0x2010),
-    ('-', 'N', 0x2013),
-    ('-', 'M', 0x2014),
-    ('-', '3', 0x2015),
-    ('!', '2', 0x2016),
-    ('=', '2', 0x2017),
-    ('\'', '6', 0x2018),
-    ('\'', '9', 0x2019),
-    ('.', '9', 0x201a),
-    ('9', '\'', 0x201b),
-    ('"', '6', 0x201c),
-    ('"', '9', 0x201d),
-    (':', '9', 0x201e),
-    ('9', '"', 0x201f),
-    ('/', '-', 0x2020),
-    ('/', '=', 0x2021),
-    ('o', 'o', 0x2022),
-    ('.', '.', 0x2025),
-    (',', '.', 0x2026),
-    ('%', '0', 0x2030),
-    ('1', '\'', 0x2032),
-    ('2', '\'', 0x2033),
-    ('3', '\'', 0x2034),
-    ('4', '\'', 0x2057),
-    ('1', '"', 0x2035),
-    ('2', '"', 0x2036),
-    ('3', '"', 0x2037),
-    ('C', 'a', 0x2038),
-    ('<', '1', 0x2039),
-    ('>', '1', 0x203a),
-    (':', 'X', 0x203b),
-    ('\'', '-', 0x203e),
-    ('/', 'f', 0x2044),
-    ('0', 'S', 0x2070),
-    ('4', 'S', 0x2074),
-    ('5', 'S', 0x2075),
-    ('6', 'S', 0x2076),
-    ('7', 'S', 0x2077),
-    ('8', 'S', 0x2078),
-    ('9', 'S', 0x2079),
-    ('+', 'S', 0x207a),
-    ('-', 'S', 0x207b),
-    ('=', 'S', 0x207c),
-    ('(', 'S', 0x207d),
-    (')', 'S', 0x207e),
-    ('n', 'S', 0x207f),
-    ('0', 's', 0x2080),
-    ('1', 's', 0x2081),
-    ('2', 's', 0x2082),
-    ('3', 's', 0x2083),
-    ('4', 's', 0x2084),
-    ('5', 's', 0x2085),
-    ('6', 's', 0x2086),
-    ('7', 's', 0x2087),
-    ('8', 's', 0x2088),
-    ('9', 's', 0x2089),
-    ('+', 's', 0x208a),
-    ('-', 's', 0x208b),
-    ('=', 's', 0x208c),
-    ('(', 's', 0x208d),
-    (')', 's', 0x208e),
-    ('L', 'i', 0x20a4),
-    ('P', 't', 0x20a7),
-    ('W', '=', 0x20a9),
-    ('=', 'e', 0x20ac),
-    ('E', 'u', 0x20ac),
-    ('=', 'R', 0x20bd),
-    ('=', 'P', 0x20bd),
-    ('o', 'C', 0x2103),
-    ('c', 'o', 0x2105),
-    ('o', 'F', 0x2109),
-    ('N', '0', 0x2116),
-    ('P', 'O', 0x2117),
-    ('R', 'x', 0x211e),
-    ('S', 'M', 0x2120),
-    ('T', 'M', 0x2122),
-    ('O', 'm', 0x2126),
-    ('A', 'O', 0x212b),
-    ('1', '3', 0x2153),
-    ('2', '3', 0x2154),
-    ('1', '5', 0x2155),
-    ('2', '5', 0x2156),
-    ('3', '5', 0x2157),
-    ('4', '5', 0x2158),
-    ('1', '6', 0x2159),
-    ('5', '6', 0x215a),
-    ('1', '8', 0x215b),
-    ('3', '8', 0x215c),
-    ('5', '8', 0x215d),
-    ('7', '8', 0x215e),
-    ('1', 'R', 0x2160),
-    ('2', 'R', 0x2161),
-    ('3', 'R', 0x2162),
-    ('4', 'R', 0x2163),
-    ('5', 'R', 0x2164),
-    ('6', 'R', 0x2165),
-    ('7', 'R', 0x2166),
-    ('8', 'R', 0x2167),
-    ('9', 'R', 0x2168),
-    ('a', 'R', 0x2169),
-    ('b', 'R', 0x216a),
-    ('c', 'R', 0x216b),
-    ('1', 'r', 0x2170),
-    ('2', 'r', 0x2171),
-    ('3', 'r', 0x2172),
-    ('4', 'r', 0x2173),
-    ('5', 'r', 0x2174),
-    ('6', 'r', 0x2175),
-    ('7', 'r', 0x2176),
-    ('8', 'r', 0x2177),
-    ('9', 'r', 0x2178),
-    ('a', 'r', 0x2179),
-    ('b', 'r', 0x217a),
-    ('c', 'r', 0x217b),
-    ('<', '-', 0x2190),
-    ('-', '!', 0x2191),
-    ('-', '>', 0x2192),
-    ('-', 'v', 0x2193),
-    ('<', '>', 0x2194),
-    ('U', 'D', 0x2195),
-    ('<', '=', 0x21d0),
-    ('=', '>', 0x21d2),
-    ('=', '=', 0x21d4),
-    ('F', 'A', 0x2200),
-    ('d', 'P', 0x2202),
-    ('T', 'E', 0x2203),
-    ('/', '0', 0x2205),
-    ('D', 'E', 0x2206),
-    ('N', 'B', 0x2207),
-    ('(', '-', 0x2208),
-    ('-', ')', 0x220b),
-    ('*', 'P', 0x220f),
-    ('+', 'Z', 0x2211),
-    ('-', '2', 0x2212),
-    ('-', '+', 0x2213),
-    ('*', '-', 0x2217),
-    ('O', 'b', 0x2218),
-    ('S', 'b', 0x2219),
-    ('R', 'T', 0x221a),
-    ('0', '(', 0x221d),
-    ('0', '0', 0x221e),
-    ('-', 'L', 0x221f),
-    ('-', 'V', 0x2220),
-    ('P', 'P', 0x2225),
-    ('A', 'N', 0x2227),
-    ('O', 'R', 0x2228),
-    ('(', 'U', 0x2229),
-    (')', 'U', 0x222a),
-    ('I', 'n', 0x222b),
-    ('D', 'I', 0x222c),
-    ('I', 'o', 0x222e),
-    ('.', ':', 0x2234),
-    (':', '.', 0x2235),
-    (':', 'R', 0x2236),
-    (':', ':', 0x2237),
-    ('?', '1', 0x223c),
-    ('C', 'G', 0x223e),
-    ('?', '-', 0x2243),
-    ('?', '=', 0x2245),
-    ('?', '2', 0x2248),
-    ('=', '?', 0x224c),
-    ('H', 'I', 0x2253),
-    ('!', '=', 0x2260),
-    ('=', '3', 0x2261),
-    ('=', '<', 0x2264),
-    ('>', '=', 0x2265),
-    ('<', '*', 0x226a),
-    ('*', '>', 0x226b),
-    ('!', '<', 0x226e),
-    ('!', '>', 0x226f),
-    ('(', 'C', 0x2282),
-    (')', 'C', 0x2283),
-    ('(', '_', 0x2286),
-    (')', '_', 0x2287),
-    ('0', '.', 0x2299),
-    ('0', '2', 0x229a),
-    ('-', 'T', 0x22a5),
-    ('.', 'P', 0x22c5),
-    (':', '3', 0x22ee),
-    ('.', '3', 0x22ef),
-    ('E', 'h', 0x2302),
-    ('<', '7', 0x2308),
-    ('>', '7', 0x2309),
-    ('7', '<', 0x230a),
-    ('7', '>', 0x230b),
-    ('N', 'I', 0x2310),
-    ('(', 'A', 0x2312),
-    ('T', 'R', 0x2315),
-    ('I', 'u', 0x2320),
-    ('I', 'l', 0x2321),
-    ('<', '/', 0x2329),
-    ('/', '>', 0x232a),
-    ('V', 's', 0x2423),
-    ('1', 'h', 0x2440),
-    ('3', 'h', 0x2441),
-    ('2', 'h', 0x2442),
-    ('4', 'h', 0x2443),
-    ('1', 'j', 0x2446),
-    ('2', 'j', 0x2447),
-    ('3', 'j', 0x2448),
-    ('4', 'j', 0x2449),
-    ('1', '.', 0x2488),
-    ('2', '.', 0x2489),
-    ('3', '.', 0x248a),
-    ('4', '.', 0x248b),
-    ('5', '.', 0x248c),
-    ('6', '.', 0x248d),
-    ('7', '.', 0x248e),
-    ('8', '.', 0x248f),
-    ('9', '.', 0x2490),
-    ('h', 'h', 0x2500),
-    ('H', 'H', 0x2501),
-    ('v', 'v', 0x2502),
-    ('V', 'V', 0x2503),
-    ('3', '-', 0x2504),
-    ('3', '_', 0x2505),
-    ('3', '!', 0x2506),
-    ('3', '/', 0x2507),
-    ('4', '-', 0x2508),
-    ('4', '_', 0x2509),
-    ('4', '!', 0x250a),
-    ('4', '/', 0x250b),
-    ('d', 'r', 0x250c),
-    ('d', 'R', 0x250d),
-    ('D', 'r', 0x250e),
-    ('D', 'R', 0x250f),
-    ('d', 'l', 0x2510),
-    ('d', 'L', 0x2511),
-    ('D', 'l', 0x2512),
-    ('L', 'D', 0x2513),
-    ('u', 'r', 0x2514),
-    ('u', 'R', 0x2515),
-    ('U', 'r', 0x2516),
-    ('U', 'R', 0x2517),
-    ('u', 'l', 0x2518),
-    ('u', 'L', 0x2519),
-    ('U', 'l', 0x251a),
-    ('U', 'L', 0x251b),
-    ('v', 'r', 0x251c),
-    ('v', 'R', 0x251d),
-    ('V', 'r', 0x2520),
-    ('V', 'R', 0x2523),
-    ('v', 'l', 0x2524),
-    ('v', 'L', 0x2525),
-    ('V', 'l', 0x2528),
-    ('V', 'L', 0x252b),
-    ('d', 'h', 0x252c),
-    ('d', 'H', 0x252f),
-    ('D', 'h', 0x2530),
-    ('D', 'H', 0x2533),
-    ('u', 'h', 0x2534),
-    ('u', 'H', 0x2537),
-    ('U', 'h', 0x2538),
-    ('U', 'H', 0x253b),
-    ('v', 'h', 0x253c),
-    ('v', 'H', 0x253f),
-    ('V', 'h', 0x2542),
-    ('V', 'H', 0x254b),
-    ('F', 'D', 0x2571),
-    ('B', 'D', 0x2572),
-    ('T', 'B', 0x2580),
-    ('L', 'B', 0x2584),
-    ('F', 'B', 0x2588),
-    ('l', 'B', 0x258c),
-    ('R', 'B', 0x2590),
-    ('.', 'S', 0x2591),
-    (':', 'S', 0x2592),
-    ('?', 'S', 0x2593),
-    ('f', 'S', 0x25a0),
-    ('O', 'S', 0x25a1),
-    ('R', 'O', 0x25a2),
-    ('R', 'r', 0x25a3),
-    ('R', 'F', 0x25a4),
-    ('R', 'Y', 0x25a5),
-    ('R', 'H', 0x25a6),
-    ('R', 'Z', 0x25a7),
-    ('R', 'K', 0x25a8),
-    ('R', 'X', 0x25a9),
-    ('s', 'B', 0x25aa),
-    ('S', 'R', 0x25ac),
-    ('O', 'r', 0x25ad),
-    ('U', 'T', 0x25b2),
-    ('u', 'T', 0x25b3),
-    ('P', 'R', 0x25b6),
-    ('T', 'r', 0x25b7),
-    ('D', 't', 0x25bc),
-    ('d', 'T', 0x25bd),
-    ('P', 'L', 0x25c0),
-    ('T', 'l', 0x25c1),
-    ('D', 'b', 0x25c6),
-    ('D', 'w', 0x25c7),
-    ('L', 'Z', 0x25ca),
-    ('0', 'm', 0x25cb),
-    ('0', 'o', 0x25ce),
-    ('0', 'M', 0x25cf),
-    ('0', 'L', 0x25d0),
-    ('0', 'R', 0x25d1),
-    ('S', 'n', 0x25d8),
-    ('I', 'c', 0x25d9),
-    ('F', 'd', 0x25e2),
-    ('B', 'd', 0x25e3),
-    ('*', '2', 0x2605),
-    ('*', '1', 0x2606),
-    ('<', 'H', 0x261c),
-    ('>', 'H', 0x261e),
-    ('0', 'u', 0x263a),
-    ('0', 'U', 0x263b),
-    ('S', 'U', 0x263c),
-    ('F', 'm', 0x2640),
-    ('M', 'l', 0x2642),
-    ('c', 'S', 0x2660),
-    ('c', 'H', 0x2661),
-    ('c', 'D', 0x2662),
-    ('c', 'C', 0x2663),
-    ('M', 'd', 0x2669),
-    ('M', '8', 0x266a),
-    ('M', '2', 0x266b),
-    ('M', 'b', 0x266d),
-    ('M', 'x', 0x266e),
-    ('M', 'X', 0x266f),
-    ('O', 'K', 0x2713),
-    ('X', 'X', 0x2717),
-    ('-', 'X', 0x2720),
-    ('I', 'S', 0x3000),
-    (',', '_', 0x3001),
-    ('.', '_', 0x3002),
-    ('+', '"', 0x3003),
-    ('+', '_', 0x3004),
-    ('*', '_', 0x3005),
-    (';', '_', 0x3006),
-    ('0', '_', 0x3007),
-    ('<', '+', 0x300a),
-    ('>', '+', 0x300b),
-    ('<', '\'', 0x300c),
-    ('>', '\'', 0x300d),
-    ('<', '"', 0x300e),
-    ('>', '"', 0x300f),
-    ('(', '"', 0x3010),
-    (')', '"', 0x3011),
-    ('=', 'T', 0x3012),
-    ('=', '_', 0x3013),
-    ('(', '\'', 0x3014),
-    (')', '\'', 0x3015),
-    ('(', 'I', 0x3016),
-    (')', 'I', 0x3017),
-    ('-', '?', 0x301c),
-    ('A', '5', 0x3041),
-    ('a', '5', 0x3042),
-    ('I', '5', 0x3043),
-    ('i', '5', 0x3044),
-    ('U', '5', 0x3045),
-    ('u', '5', 0x3046),
-    ('E', '5', 0x3047),
-    ('e', '5', 0x3048),
-    ('O', '5', 0x3049),
-    ('o', '5', 0x304a),
-    ('k', 'a', 0x304b),
-    ('g', 'a', 0x304c),
-    ('k', 'i', 0x304d),
-    ('g', 'i', 0x304e),
-    ('k', 'u', 0x304f),
-    ('g', 'u', 0x3050),
-    ('k', 'e', 0x3051),
-    ('g', 'e', 0x3052),
-    ('k', 'o', 0x3053),
-    ('g', 'o', 0x3054),
-    ('s', 'a', 0x3055),
-    ('z', 'a', 0x3056),
-    ('s', 'i', 0x3057),
-    ('z', 'i', 0x3058),
-    ('s', 'u', 0x3059),
-    ('z', 'u', 0x305a),
-    ('s', 'e', 0x305b),
-    ('z', 'e', 0x305c),
-    ('s', 'o', 0x305d),
-    ('z', 'o', 0x305e),
-    ('t', 'a', 0x305f),
-    ('d', 'a', 0x3060),
-    ('t', 'i', 0x3061),
-    ('d', 'i', 0x3062),
-    ('t', 'U', 0x3063),
-    ('t', 'u', 0x3064),
-    ('d', 'u', 0x3065),
-    ('t', 'e', 0x3066),
-    ('d', 'e', 0x3067),
-    ('t', 'o', 0x3068),
-    ('d', 'o', 0x3069),
-    ('n', 'a', 0x306a),
-    ('n', 'i', 0x306b),
-    ('n', 'u', 0x306c),
-    ('n', 'e', 0x306d),
-    ('n', 'o', 0x306e),
-    ('h', 'a', 0x306f),
-    ('b', 'a', 0x3070),
-    ('p', 'a', 0x3071),
-    ('h', 'i', 0x3072),
-    ('b', 'i', 0x3073),
-    ('p', 'i', 0x3074),
-    ('h', 'u', 0x3075),
-    ('b', 'u', 0x3076),
-    ('p', 'u', 0x3077),
-    ('h', 'e', 0x3078),
-    ('b', 'e', 0x3079),
-    ('p', 'e', 0x307a),
-    ('h', 'o', 0x307b),
-    ('b', 'o', 0x307c),
-    ('p', 'o', 0x307d),
-    ('m', 'a', 0x307e),
-    ('m', 'i', 0x307f),
-    ('m', 'u', 0x3080),
-    ('m', 'e', 0x3081),
-    ('m', 'o', 0x3082),
-    ('y', 'A', 0x3083),
-    ('y', 'a', 0x3084),
-    ('y', 'U', 0x3085),
-    ('y', 'u', 0x3086),
-    ('y', 'O', 0x3087),
-    ('y', 'o', 0x3088),
-    ('r', 'a', 0x3089),
-    ('r', 'i', 0x308a),
-    ('r', 'u', 0x308b),
-    ('r', 'e', 0x308c),
-    ('r', 'o', 0x308d),
-    ('w', 'A', 0x308e),
-    ('w', 'a', 0x308f),
-    ('w', 'i', 0x3090),
-    ('w', 'e', 0x3091),
-    ('w', 'o', 0x3092),
-    ('n', '5', 0x3093),
-    ('v', 'u', 0x3094),
-    ('"', '5', 0x309b),
-    ('0', '5', 0x309c),
-    ('*', '5', 0x309d),
-    ('+', '5', 0x309e),
-    ('a', '6', 0x30a1),
-    ('A', '6', 0x30a2),
-    ('i', '6', 0x30a3),
-    ('I', '6', 0x30a4),
-    ('u', '6', 0x30a5),
-    ('U', '6', 0x30a6),
-    ('e', '6', 0x30a7),
-    ('E', '6', 0x30a8),
-    ('o', '6', 0x30a9),
-    ('O', '6', 0x30aa),
-    ('K', 'a', 0x30ab),
-    ('G', 'a', 0x30ac),
-    ('K', 'i', 0x30ad),
-    ('G', 'i', 0x30ae),
-    ('K', 'u', 0x30af),
-    ('G', 'u', 0x30b0),
-    ('K', 'e', 0x30b1),
-    ('G', 'e', 0x30b2),
-    ('K', 'o', 0x30b3),
-    ('G', 'o', 0x30b4),
-    ('S', 'a', 0x30b5),
-    ('Z', 'a', 0x30b6),
-    ('S', 'i', 0x30b7),
-    ('Z', 'i', 0x30b8),
-    ('S', 'u', 0x30b9),
-    ('Z', 'u', 0x30ba),
-    ('S', 'e', 0x30bb),
-    ('Z', 'e', 0x30bc),
-    ('S', 'o', 0x30bd),
-    ('Z', 'o', 0x30be),
-    ('T', 'a', 0x30bf),
-    ('D', 'a', 0x30c0),
-    ('T', 'i', 0x30c1),
-    ('D', 'i', 0x30c2),
-    ('T', 'U', 0x30c3),
-    ('T', 'u', 0x30c4),
-    ('D', 'u', 0x30c5),
-    ('T', 'e', 0x30c6),
-    ('D', 'e', 0x30c7),
-    ('T', 'o', 0x30c8),
-    ('D', 'o', 0x30c9),
-    ('N', 'a', 0x30ca),
-    ('N', 'i', 0x30cb),
-    ('N', 'u', 0x30cc),
-    ('N', 'e', 0x30cd),
-    ('N', 'o', 0x30ce),
-    ('H', 'a', 0x30cf),
-    ('B', 'a', 0x30d0),
-    ('P', 'a', 0x30d1),
-    ('H', 'i', 0x30d2),
-    ('B', 'i', 0x30d3),
-    ('P', 'i', 0x30d4),
-    ('H', 'u', 0x30d5),
-    ('B', 'u', 0x30d6),
-    ('P', 'u', 0x30d7),
-    ('H', 'e', 0x30d8),
-    ('B', 'e', 0x30d9),
-    ('P', 'e', 0x30da),
-    ('H', 'o', 0x30db),
-    ('B', 'o', 0x30dc),
-    ('P', 'o', 0x30dd),
-    ('M', 'a', 0x30de),
-    ('M', 'i', 0x30df),
-    ('M', 'u', 0x30e0),
-    ('M', 'e', 0x30e1),
-    ('M', 'o', 0x30e2),
-    ('Y', 'A', 0x30e3),
-    ('Y', 'a', 0x30e4),
-    ('Y', 'U', 0x30e5),
-    ('Y', 'u', 0x30e6),
-    ('Y', 'O', 0x30e7),
-    ('Y', 'o', 0x30e8),
-    ('R', 'a', 0x30e9),
-    ('R', 'i', 0x30ea),
-    ('R', 'u', 0x30eb),
-    ('R', 'e', 0x30ec),
-    ('R', 'o', 0x30ed),
-    ('W', 'A', 0x30ee),
-    ('W', 'a', 0x30ef),
-    ('W', 'i', 0x30f0),
-    ('W', 'e', 0x30f1),
-    ('W', 'o', 0x30f2),
-    ('N', '6', 0x30f3),
-    ('V', 'u', 0x30f4),
-    ('K', 'A', 0x30f5),
-    ('K', 'E', 0x30f6),
-    ('V', 'a', 0x30f7),
-    ('V', 'i', 0x30f8),
-    ('V', 'e', 0x30f9),
-    ('V', 'o', 0x30fa),
-    ('.', '6', 0x30fb),
-    ('-', '6', 0x30fc),
-    ('*', '6', 0x30fd),
-    ('+', '6', 0x30fe),
-    ('b', '4', 0x3105),
-    ('p', '4', 0x3106),
-    ('m', '4', 0x3107),
-    ('f', '4', 0x3108),
-    ('d', '4', 0x3109),
-    ('t', '4', 0x310a),
-    ('n', '4', 0x310b),
-    ('l', '4', 0x310c),
-    ('g', '4', 0x310d),
-    ('k', '4', 0x310e),
-    ('h', '4', 0x310f),
-    ('j', '4', 0x3110),
-    ('q', '4', 0x3111),
-    ('x', '4', 0x3112),
-    ('z', 'h', 0x3113),
-    ('c', 'h', 0x3114),
-    ('s', 'h', 0x3115),
-    ('r', '4', 0x3116),
-    ('z', '4', 0x3117),
-    ('c', '4', 0x3118),
-    ('s', '4', 0x3119),
-    ('a', '4', 0x311a),
-    ('o', '4', 0x311b),
-    ('e', '4', 0x311c),
-    ('a', 'i', 0x311e),
-    ('e', 'i', 0x311f),
-    ('a', 'u', 0x3120),
-    ('o', 'u', 0x3121),
-    ('a', 'n', 0x3122),
-    ('e', 'n', 0x3123),
-    ('a', 'N', 0x3124),
-    ('e', 'N', 0x3125),
-    ('e', 'r', 0x3126),
-    ('i', '4', 0x3127),
-    ('u', '4', 0x3128),
-    ('i', 'u', 0x3129),
-    ('v', '4', 0x312a),
-    ('n', 'G', 0x312b),
-    ('g', 'n', 0x312c),
-    ('1', 'c', 0x3220),
-    ('2', 'c', 0x3221),
-    ('3', 'c', 0x3222),
-    ('4', 'c', 0x3223),
-    ('5', 'c', 0x3224),
-    ('6', 'c', 0x3225),
-    ('7', 'c', 0x3226),
-    ('8', 'c', 0x3227),
-    ('9', 'c', 0x3228),
-    ('f', 'f', 0xfb00),
-    ('f', 'i', 0xfb01),
-    ('f', 'l', 0xfb02),
-    ('f', 't', 0xfb05),
-    ('s', 't', 0xfb06),
-];
diff --git a/crates/vim/src/helix.rs b/crates/vim/src/helix.rs
deleted file mode 100644
index fae2bda578..0000000000
--- a/crates/vim/src/helix.rs
+++ /dev/null
@@ -1,1669 +0,0 @@
-mod boundary;
-mod duplicate;
-mod object;
-mod paste;
-mod select;
-
-use editor::display_map::DisplaySnapshot;
-use editor::{
-    DisplayPoint, Editor, EditorSettings, HideMouseCursorOrigin, MultiBufferOffset,
-    SelectionEffects, ToOffset, ToPoint, movement,
-};
-use gpui::actions;
-use gpui::{Context, Window};
-use language::{CharClassifier, CharKind, Point};
-use search::{BufferSearchBar, SearchOptions};
-use settings::Settings;
-use text::{Bias, SelectionGoal};
-use workspace::searchable::FilteredSearchRange;
-use workspace::searchable::{self, Direction};
-
-use crate::motion::{self, MotionKind};
-use crate::state::SearchState;
-use crate::{
-    Vim,
-    motion::{Motion, right},
-    state::Mode,
-};
-
-actions!(
-    vim,
-    [
-        /// Yanks the current selection or character if no selection.
-        HelixYank,
-        /// Inserts at the beginning of the selection.
-        HelixInsert,
-        /// Appends at the end of the selection.
-        HelixAppend,
-        /// Goes to the location of the last modification.
-        HelixGotoLastModification,
-        /// Select entire line or multiple lines, extending downwards.
-        HelixSelectLine,
-        /// Select all matches of a given pattern within the current selection.
-        HelixSelectRegex,
-        /// Removes all but the one selection that was created last.
-        /// `Newest` can eventually be `Primary`.
-        HelixKeepNewestSelection,
-        /// Copies all selections below.
-        HelixDuplicateBelow,
-        /// Copies all selections above.
-        HelixDuplicateAbove,
-        /// Delete the selection and enter edit mode.
-        HelixSubstitute,
-        /// Delete the selection and enter edit mode, without yanking the selection.
-        HelixSubstituteNoYank,
-        /// Delete the selection and enter edit mode.
-        HelixSelectNext,
-        /// Delete the selection and enter edit mode, without yanking the selection.
-        HelixSelectPrevious,
-    ]
-);
-
-pub fn register(editor: &mut Editor, cx: &mut Context<Vim>) {
-    Vim::action(editor, cx, Vim::helix_select_lines);
-    Vim::action(editor, cx, Vim::helix_insert);
-    Vim::action(editor, cx, Vim::helix_append);
-    Vim::action(editor, cx, Vim::helix_yank);
-    Vim::action(editor, cx, Vim::helix_goto_last_modification);
-    Vim::action(editor, cx, Vim::helix_paste);
-    Vim::action(editor, cx, Vim::helix_select_regex);
-    Vim::action(editor, cx, Vim::helix_keep_newest_selection);
-    Vim::action(editor, cx, |vim, _: &HelixDuplicateBelow, window, cx| {
-        let times = Vim::take_count(cx);
-        vim.helix_duplicate_selections_below(times, window, cx);
-    });
-    Vim::action(editor, cx, |vim, _: &HelixDuplicateAbove, window, cx| {
-        let times = Vim::take_count(cx);
-        vim.helix_duplicate_selections_above(times, window, cx);
-    });
-    Vim::action(editor, cx, Vim::helix_substitute);
-    Vim::action(editor, cx, Vim::helix_substitute_no_yank);
-    Vim::action(editor, cx, Vim::helix_select_next);
-    Vim::action(editor, cx, Vim::helix_select_previous);
-}
-
-impl Vim {
-    pub fn helix_normal_motion(
-        &mut self,
-        motion: Motion,
-        times: Option<usize>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.helix_move_cursor(motion, times, window, cx);
-    }
-
-    pub fn helix_select_motion(
-        &mut self,
-        motion: Motion,
-        times: Option<usize>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.update_editor(cx, |_, editor, cx| {
-            let text_layout_details = editor.text_layout_details(window);
-            editor.change_selections(Default::default(), window, cx, |s| {
-                if let Motion::ZedSearchResult { new_selections, .. } = &motion {
-                    s.select_anchor_ranges(new_selections.clone());
-                    return;
-                };
-
-                s.move_with(|map, selection| {
-                    let was_reversed = selection.reversed;
-                    let mut current_head = selection.head();
-
-                    // our motions assume the current character is after the cursor,
-                    // but in (forward) visual mode the current character is just
-                    // before the end of the selection.
-
-                    // If the file ends with a newline (which is common) we don't do this.
-                    // so that if you go to the end of such a file you can use "up" to go
-                    // to the previous line and have it work somewhat as expected.
-                    if !selection.reversed
-                        && !selection.is_empty()
-                        && !(selection.end.column() == 0 && selection.end == map.max_point())
-                    {
-                        current_head = movement::left(map, selection.end)
-                    }
-
-                    let (new_head, goal) = match motion {
-                        // Going to next word start is special cased
-                        // since Vim differs from Helix in that motion
-                        // Vim: `w` goes to the first character of a word
-                        // Helix: `w` goes to the character before a word
-                        Motion::NextWordStart { ignore_punctuation } => {
-                            let mut head = movement::right(map, current_head);
-                            let classifier =
-                                map.buffer_snapshot().char_classifier_at(head.to_point(map));
-                            for _ in 0..times.unwrap_or(1) {
-                                let (_, new_head) =
-                                    movement::find_boundary_trail(map, head, |left, right| {
-                                        Self::is_boundary_right(ignore_punctuation)(
-                                            left,
-                                            right,
-                                            &classifier,
-                                        )
-                                    });
-                                head = new_head;
-                            }
-                            head = movement::left(map, head);
-                            (head, SelectionGoal::None)
-                        }
-                        _ => motion
-                            .move_point(
-                                map,
-                                current_head,
-                                selection.goal,
-                                times,
-                                &text_layout_details,
-                            )
-                            .unwrap_or((current_head, selection.goal)),
-                    };
-
-                    selection.set_head(new_head, goal);
-
-                    // ensure the current character is included in the selection.
-                    if !selection.reversed {
-                        let next_point = movement::right(map, selection.end);
-
-                        if !(next_point.column() == 0 && next_point == map.max_point()) {
-                            selection.end = next_point;
-                        }
-                    }
-
-                    // vim always ensures the anchor character stays selected.
-                    // if our selection has reversed, we need to move the opposite end
-                    // to ensure the anchor is still selected.
-                    if was_reversed && !selection.reversed {
-                        selection.start = movement::left(map, selection.start);
-                    } else if !was_reversed && selection.reversed {
-                        selection.end = movement::right(map, selection.end);
-                    }
-                })
-            });
-        });
-    }
-
-    /// Updates all selections based on where the cursors are.
-    fn helix_new_selections(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-        mut change: impl FnMut(
-            // the start of the cursor
-            DisplayPoint,
-            &DisplaySnapshot,
-        ) -> Option<(DisplayPoint, DisplayPoint)>,
-    ) {
-        self.update_editor(cx, |_, editor, cx| {
-            editor.change_selections(Default::default(), window, cx, |s| {
-                s.move_with(|map, selection| {
-                    let cursor_start = if selection.reversed || selection.is_empty() {
-                        selection.head()
-                    } else {
-                        movement::left(map, selection.head())
-                    };
-                    let Some((head, tail)) = change(cursor_start, map) else {
-                        return;
-                    };
-
-                    selection.set_head_tail(head, tail, SelectionGoal::None);
-                });
-            });
-        });
-    }
-
-    fn helix_find_range_forward(
-        &mut self,
-        times: Option<usize>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-        mut is_boundary: impl FnMut(char, char, &CharClassifier) -> bool,
-    ) {
-        let times = times.unwrap_or(1);
-        self.helix_new_selections(window, cx, |cursor, map| {
-            let mut head = movement::right(map, cursor);
-            let mut tail = cursor;
-            let classifier = map.buffer_snapshot().char_classifier_at(head.to_point(map));
-            if head == map.max_point() {
-                return None;
-            }
-            for _ in 0..times {
-                let (maybe_next_tail, next_head) =
-                    movement::find_boundary_trail(map, head, |left, right| {
-                        is_boundary(left, right, &classifier)
-                    });
-
-                if next_head == head && maybe_next_tail.unwrap_or(next_head) == tail {
-                    break;
-                }
-
-                head = next_head;
-                if let Some(next_tail) = maybe_next_tail {
-                    tail = next_tail;
-                }
-            }
-            Some((head, tail))
-        });
-    }
-
-    fn helix_find_range_backward(
-        &mut self,
-        times: Option<usize>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-        mut is_boundary: impl FnMut(char, char, &CharClassifier) -> bool,
-    ) {
-        let times = times.unwrap_or(1);
-        self.helix_new_selections(window, cx, |cursor, map| {
-            let mut head = cursor;
-            // The original cursor was one character wide,
-            // but the search starts from the left side of it,
-            // so to include that space the selection must end one character to the right.
-            let mut tail = movement::right(map, cursor);
-            let classifier = map.buffer_snapshot().char_classifier_at(head.to_point(map));
-            if head == DisplayPoint::zero() {
-                return None;
-            }
-            for _ in 0..times {
-                let (maybe_next_tail, next_head) =
-                    movement::find_preceding_boundary_trail(map, head, |left, right| {
-                        is_boundary(left, right, &classifier)
-                    });
-
-                if next_head == head && maybe_next_tail.unwrap_or(next_head) == tail {
-                    break;
-                }
-
-                head = next_head;
-                if let Some(next_tail) = maybe_next_tail {
-                    tail = next_tail;
-                }
-            }
-            Some((head, tail))
-        });
-    }
-
-    pub fn helix_move_and_collapse(
-        &mut self,
-        motion: Motion,
-        times: Option<usize>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.update_editor(cx, |_, editor, cx| {
-            let text_layout_details = editor.text_layout_details(window);
-            editor.change_selections(Default::default(), window, cx, |s| {
-                s.move_with(|map, selection| {
-                    let goal = selection.goal;
-                    let cursor = if selection.is_empty() || selection.reversed {
-                        selection.head()
-                    } else {
-                        movement::left(map, selection.head())
-                    };
-
-                    let (point, goal) = motion
-                        .move_point(map, cursor, selection.goal, times, &text_layout_details)
-                        .unwrap_or((cursor, goal));
-
-                    selection.collapse_to(point, goal)
-                })
-            });
-        });
-    }
-
-    fn is_boundary_right(
-        ignore_punctuation: bool,
-    ) -> impl FnMut(char, char, &CharClassifier) -> bool {
-        move |left, right, classifier| {
-            let left_kind = classifier.kind_with(left, ignore_punctuation);
-            let right_kind = classifier.kind_with(right, ignore_punctuation);
-            let at_newline = (left == '\n') ^ (right == '\n');
-
-            (left_kind != right_kind && right_kind != CharKind::Whitespace) || at_newline
-        }
-    }
-
-    fn is_boundary_left(
-        ignore_punctuation: bool,
-    ) -> impl FnMut(char, char, &CharClassifier) -> bool {
-        move |left, right, classifier| {
-            let left_kind = classifier.kind_with(left, ignore_punctuation);
-            let right_kind = classifier.kind_with(right, ignore_punctuation);
-            let at_newline = (left == '\n') ^ (right == '\n');
-
-            (left_kind != right_kind && left_kind != CharKind::Whitespace) || at_newline
-        }
-    }
-
-    pub fn helix_move_cursor(
-        &mut self,
-        motion: Motion,
-        times: Option<usize>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        match motion {
-            Motion::NextWordStart { ignore_punctuation } => self.helix_find_range_forward(
-                times,
-                window,
-                cx,
-                Self::is_boundary_right(ignore_punctuation),
-            ),
-            Motion::NextWordEnd { ignore_punctuation } => self.helix_find_range_forward(
-                times,
-                window,
-                cx,
-                Self::is_boundary_left(ignore_punctuation),
-            ),
-            Motion::PreviousWordStart { ignore_punctuation } => self.helix_find_range_backward(
-                times,
-                window,
-                cx,
-                Self::is_boundary_left(ignore_punctuation),
-            ),
-            Motion::PreviousWordEnd { ignore_punctuation } => self.helix_find_range_backward(
-                times,
-                window,
-                cx,
-                Self::is_boundary_right(ignore_punctuation),
-            ),
-            Motion::EndOfLine { .. } => {
-                // In Helix mode, EndOfLine should position cursor ON the last character,
-                // not after it. We therefore need special handling for it.
-                self.update_editor(cx, |_, editor, cx| {
-                    let text_layout_details = editor.text_layout_details(window);
-                    editor.change_selections(Default::default(), window, cx, |s| {
-                        s.move_with(|map, selection| {
-                            let goal = selection.goal;
-                            let cursor = if selection.is_empty() || selection.reversed {
-                                selection.head()
-                            } else {
-                                movement::left(map, selection.head())
-                            };
-
-                            let (point, _goal) = motion
-                                .move_point(map, cursor, goal, times, &text_layout_details)
-                                .unwrap_or((cursor, goal));
-
-                            // Move left by one character to position on the last character
-                            let adjusted_point = movement::saturating_left(map, point);
-                            selection.collapse_to(adjusted_point, SelectionGoal::None)
-                        })
-                    });
-                });
-            }
-            Motion::FindForward {
-                before,
-                char,
-                mode,
-                smartcase,
-            } => {
-                self.helix_new_selections(window, cx, |cursor, map| {
-                    let start = cursor;
-                    let mut last_boundary = start;
-                    for _ in 0..times.unwrap_or(1) {
-                        last_boundary = movement::find_boundary(
-                            map,
-                            movement::right(map, last_boundary),
-                            mode,
-                            |left, right| {
-                                let current_char = if before { right } else { left };
-                                motion::is_character_match(char, current_char, smartcase)
-                            },
-                        );
-                    }
-                    Some((last_boundary, start))
-                });
-            }
-            Motion::FindBackward {
-                after,
-                char,
-                mode,
-                smartcase,
-            } => {
-                self.helix_new_selections(window, cx, |cursor, map| {
-                    let start = cursor;
-                    let mut last_boundary = start;
-                    for _ in 0..times.unwrap_or(1) {
-                        last_boundary = movement::find_preceding_boundary_display_point(
-                            map,
-                            last_boundary,
-                            mode,
-                            |left, right| {
-                                let current_char = if after { left } else { right };
-                                motion::is_character_match(char, current_char, smartcase)
-                            },
-                        );
-                    }
-                    // The original cursor was one character wide,
-                    // but the search started from the left side of it,
-                    // so to include that space the selection must end one character to the right.
-                    Some((last_boundary, movement::right(map, start)))
-                });
-            }
-            _ => self.helix_move_and_collapse(motion, times, window, cx),
-        }
-    }
-
-    pub fn helix_yank(&mut self, _: &HelixYank, window: &mut Window, cx: &mut Context<Self>) {
-        self.update_editor(cx, |vim, editor, cx| {
-            let has_selection = editor
-                .selections
-                .all_adjusted(&editor.display_snapshot(cx))
-                .iter()
-                .any(|selection| !selection.is_empty());
-
-            if !has_selection {
-                // If no selection, expand to current character (like 'v' does)
-                editor.change_selections(Default::default(), window, cx, |s| {
-                    s.move_with(|map, selection| {
-                        let head = selection.head();
-                        let new_head = movement::saturating_right(map, head);
-                        selection.set_tail(head, SelectionGoal::None);
-                        selection.set_head(new_head, SelectionGoal::None);
-                    });
-                });
-                vim.yank_selections_content(
-                    editor,
-                    crate::motion::MotionKind::Exclusive,
-                    window,
-                    cx,
-                );
-                editor.change_selections(Default::default(), window, cx, |s| {
-                    s.move_with(|_map, selection| {
-                        selection.collapse_to(selection.start, SelectionGoal::None);
-                    });
-                });
-            } else {
-                // Yank the selection(s)
-                vim.yank_selections_content(
-                    editor,
-                    crate::motion::MotionKind::Exclusive,
-                    window,
-                    cx,
-                );
-            }
-        });
-
-        // Drop back to normal mode after yanking
-        self.switch_mode(Mode::HelixNormal, true, window, cx);
-    }
-
-    fn helix_insert(&mut self, _: &HelixInsert, window: &mut Window, cx: &mut Context<Self>) {
-        self.start_recording(cx);
-        self.update_editor(cx, |_, editor, cx| {
-            editor.change_selections(Default::default(), window, cx, |s| {
-                s.move_with(|_map, selection| {
-                    // In helix normal mode, move cursor to start of selection and collapse
-                    if !selection.is_empty() {
-                        selection.collapse_to(selection.start, SelectionGoal::None);
-                    }
-                });
-            });
-        });
-        self.switch_mode(Mode::Insert, false, window, cx);
-    }
-
-    fn helix_select_regex(
-        &mut self,
-        _: &HelixSelectRegex,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        Vim::take_forced_motion(cx);
-        let Some(pane) = self.pane(window, cx) else {
-            return;
-        };
-        let prior_selections = self.editor_selections(window, cx);
-        pane.update(cx, |pane, cx| {
-            if let Some(search_bar) = pane.toolbar().read(cx).item_of_type::<BufferSearchBar>() {
-                search_bar.update(cx, |search_bar, cx| {
-                    if !search_bar.show(window, cx) {
-                        return;
-                    }
-
-                    search_bar.select_query(window, cx);
-                    cx.focus_self(window);
-
-                    search_bar.set_replacement(None, cx);
-                    let mut options = SearchOptions::NONE;
-                    options |= SearchOptions::REGEX;
-                    if EditorSettings::get_global(cx).search.case_sensitive {
-                        options |= SearchOptions::CASE_SENSITIVE;
-                    }
-                    search_bar.set_search_options(options, cx);
-                    if let Some(search) = search_bar.set_search_within_selection(
-                        Some(FilteredSearchRange::Selection),
-                        window,
-                        cx,
-                    ) {
-                        cx.spawn_in(window, async move |search_bar, cx| {
-                            if search.await.is_ok() {
-                                search_bar.update_in(cx, |search_bar, window, cx| {
-                                    search_bar.activate_current_match(window, cx)
-                                })
-                            } else {
-                                Ok(())
-                            }
-                        })
-                        .detach_and_log_err(cx);
-                    }
-                    self.search = SearchState {
-                        direction: searchable::Direction::Next,
-                        count: 1,
-                        prior_selections,
-                        prior_operator: self.operator_stack.last().cloned(),
-                        prior_mode: self.mode,
-                        helix_select: true,
-                    }
-                });
-            }
-        });
-        self.start_recording(cx);
-    }
-
-    fn helix_append(&mut self, _: &HelixAppend, window: &mut Window, cx: &mut Context<Self>) {
-        self.start_recording(cx);
-        self.switch_mode(Mode::Insert, false, window, cx);
-        self.update_editor(cx, |_, editor, cx| {
-            editor.change_selections(Default::default(), window, cx, |s| {
-                s.move_with(|map, selection| {
-                    let point = if selection.is_empty() {
-                        right(map, selection.head(), 1)
-                    } else {
-                        selection.end
-                    };
-                    selection.collapse_to(point, SelectionGoal::None);
-                });
-            });
-        });
-    }
-
-    pub fn helix_replace(&mut self, text: &str, window: &mut Window, cx: &mut Context<Self>) {
-        self.update_editor(cx, |_, editor, cx| {
-            editor.transact(window, cx, |editor, window, cx| {
-                let display_map = editor.display_snapshot(cx);
-                let selections = editor.selections.all_display(&display_map);
-
-                // Store selection info for positioning after edit
-                let selection_info: Vec<_> = selections
-                    .iter()
-                    .map(|selection| {
-                        let range = selection.range();
-                        let start_offset = range.start.to_offset(&display_map, Bias::Left);
-                        let end_offset = range.end.to_offset(&display_map, Bias::Left);
-                        let was_empty = range.is_empty();
-                        let was_reversed = selection.reversed;
-                        (
-                            display_map.buffer_snapshot().anchor_before(start_offset),
-                            end_offset - start_offset,
-                            was_empty,
-                            was_reversed,
-                        )
-                    })
-                    .collect();
-
-                let mut edits = Vec::new();
-                for selection in &selections {
-                    let mut range = selection.range();
-
-                    // For empty selections, extend to replace one character
-                    if range.is_empty() {
-                        range.end = movement::saturating_right(&display_map, range.start);
-                    }
-
-                    let byte_range = range.start.to_offset(&display_map, Bias::Left)
-                        ..range.end.to_offset(&display_map, Bias::Left);
-
-                    if !byte_range.is_empty() {
-                        let replacement_text = text.repeat(byte_range.end - byte_range.start);
-                        edits.push((byte_range, replacement_text));
-                    }
-                }
-
-                editor.edit(edits, cx);
-
-                // Restore selections based on original info
-                let snapshot = editor.buffer().read(cx).snapshot(cx);
-                let ranges: Vec<_> = selection_info
-                    .into_iter()
-                    .map(|(start_anchor, original_len, was_empty, was_reversed)| {
-                        let start_point = start_anchor.to_point(&snapshot);
-                        if was_empty {
-                            // For cursor-only, collapse to start
-                            start_point..start_point
-                        } else {
-                            // For selections, span the replaced text
-                            let replacement_len = text.len() * original_len;
-                            let end_offset = start_anchor.to_offset(&snapshot) + replacement_len;
-                            let end_point = snapshot.offset_to_point(end_offset);
-                            if was_reversed {
-                                end_point..start_point
-                            } else {
-                                start_point..end_point
-                            }
-                        }
-                    })
-                    .collect();
-
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.select_ranges(ranges);
-                });
-            });
-        });
-        self.switch_mode(Mode::HelixNormal, true, window, cx);
-    }
-
-    pub fn helix_goto_last_modification(
-        &mut self,
-        _: &HelixGotoLastModification,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.jump(".".into(), false, false, window, cx);
-    }
-
-    pub fn helix_select_lines(
-        &mut self,
-        _: &HelixSelectLine,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let count = Vim::take_count(cx).unwrap_or(1);
-        self.update_editor(cx, |_, editor, cx| {
-            editor.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx);
-            let display_map = editor.display_map.update(cx, |map, cx| map.snapshot(cx));
-            let mut selections = editor.selections.all::<Point>(&display_map);
-            let max_point = display_map.buffer_snapshot().max_point();
-            let buffer_snapshot = &display_map.buffer_snapshot();
-
-            for selection in &mut selections {
-                // Start always goes to column 0 of the first selected line
-                let start_row = selection.start.row;
-                let current_end_row = selection.end.row;
-
-                // Check if cursor is on empty line by checking first character
-                let line_start_offset = buffer_snapshot.point_to_offset(Point::new(start_row, 0));
-                let first_char = buffer_snapshot.chars_at(line_start_offset).next();
-                let extra_line = if first_char == Some('\n') { 1 } else { 0 };
-
-                let end_row = current_end_row + count as u32 + extra_line;
-
-                selection.start = Point::new(start_row, 0);
-                selection.end = if end_row > max_point.row {
-                    max_point
-                } else {
-                    Point::new(end_row, 0)
-                };
-                selection.reversed = false;
-            }
-
-            editor.change_selections(Default::default(), window, cx, |s| {
-                s.select(selections);
-            });
-        });
-    }
-
-    fn helix_keep_newest_selection(
-        &mut self,
-        _: &HelixKeepNewestSelection,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.update_editor(cx, |_, editor, cx| {
-            let newest = editor
-                .selections
-                .newest::<MultiBufferOffset>(&editor.display_snapshot(cx));
-            editor.change_selections(Default::default(), window, cx, |s| s.select(vec![newest]));
-        });
-    }
-
-    fn do_helix_substitute(&mut self, yank: bool, window: &mut Window, cx: &mut Context<Self>) {
-        self.update_editor(cx, |vim, editor, cx| {
-            editor.set_clip_at_line_ends(false, cx);
-            editor.transact(window, cx, |editor, window, cx| {
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.move_with(|map, selection| {
-                        if selection.start == selection.end {
-                            selection.end = movement::right(map, selection.end);
-                        }
-
-                        // If the selection starts and ends on a newline, we exclude the last one.
-                        if !selection.is_empty()
-                            && selection.start.column() == 0
-                            && selection.end.column() == 0
-                        {
-                            selection.end = movement::left(map, selection.end);
-                        }
-                    })
-                });
-                if yank {
-                    vim.copy_selections_content(editor, MotionKind::Exclusive, window, cx);
-                }
-                let selections = editor
-                    .selections
-                    .all::<Point>(&editor.display_snapshot(cx))
-                    .into_iter();
-                let edits = selections.map(|selection| (selection.start..selection.end, ""));
-                editor.edit(edits, cx);
-            });
-        });
-        self.switch_mode(Mode::Insert, true, window, cx);
-    }
-
-    fn helix_substitute(
-        &mut self,
-        _: &HelixSubstitute,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.do_helix_substitute(true, window, cx);
-    }
-
-    fn helix_substitute_no_yank(
-        &mut self,
-        _: &HelixSubstituteNoYank,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.do_helix_substitute(false, window, cx);
-    }
-
-    fn helix_select_next(
-        &mut self,
-        _: &HelixSelectNext,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.do_helix_select(Direction::Next, window, cx);
-    }
-
-    fn helix_select_previous(
-        &mut self,
-        _: &HelixSelectPrevious,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.do_helix_select(Direction::Prev, window, cx);
-    }
-
-    fn do_helix_select(
-        &mut self,
-        direction: searchable::Direction,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(pane) = self.pane(window, cx) else {
-            return;
-        };
-        let count = Vim::take_count(cx).unwrap_or(1);
-        Vim::take_forced_motion(cx);
-        let prior_selections = self.editor_selections(window, cx);
-
-        let success = pane.update(cx, |pane, cx| {
-            let Some(search_bar) = pane.toolbar().read(cx).item_of_type::<BufferSearchBar>() else {
-                return false;
-            };
-            search_bar.update(cx, |search_bar, cx| {
-                if !search_bar.has_active_match() || !search_bar.show(window, cx) {
-                    return false;
-                }
-                search_bar.select_match(direction, count, window, cx);
-                true
-            })
-        });
-
-        if !success {
-            return;
-        }
-        if self.mode == Mode::HelixSelect {
-            self.update_editor(cx, |_vim, editor, cx| {
-                let snapshot = editor.snapshot(window, cx);
-                editor.change_selections(SelectionEffects::default(), window, cx, |s| {
-                    s.select_anchor_ranges(
-                        prior_selections
-                            .iter()
-                            .cloned()
-                            .chain(s.all_anchors(&snapshot).iter().map(|s| s.range())),
-                    );
-                })
-            });
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use indoc::indoc;
-
-    use crate::{state::Mode, test::VimTestContext};
-
-    #[gpui::test]
-    async fn test_word_motions(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-        cx.enable_helix();
-        // «
-        // ˇ
-        // »
-        cx.set_state(
-            indoc! {"
-            Th«e quiˇ»ck brown
-            fox jumps over
-            the lazy dog."},
-            Mode::HelixNormal,
-        );
-
-        cx.simulate_keystrokes("w");
-
-        cx.assert_state(
-            indoc! {"
-            The qu«ick ˇ»brown
-            fox jumps over
-            the lazy dog."},
-            Mode::HelixNormal,
-        );
-
-        cx.simulate_keystrokes("w");
-
-        cx.assert_state(
-            indoc! {"
-            The quick «brownˇ»
-            fox jumps over
-            the lazy dog."},
-            Mode::HelixNormal,
-        );
-
-        cx.simulate_keystrokes("2 b");
-
-        cx.assert_state(
-            indoc! {"
-            The «ˇquick »brown
-            fox jumps over
-            the lazy dog."},
-            Mode::HelixNormal,
-        );
-
-        cx.simulate_keystrokes("down e up");
-
-        cx.assert_state(
-            indoc! {"
-            The quicˇk brown
-            fox jumps over
-            the lazy dog."},
-            Mode::HelixNormal,
-        );
-
-        cx.set_state("aa\n  «ˇbb»", Mode::HelixNormal);
-
-        cx.simulate_keystroke("b");
-
-        cx.assert_state("aa\n«ˇ  »bb", Mode::HelixNormal);
-    }
-
-    #[gpui::test]
-    async fn test_delete(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-        cx.enable_helix();
-
-        // test delete a selection
-        cx.set_state(
-            indoc! {"
-            The qu«ick ˇ»brown
-            fox jumps over
-            the lazy dog."},
-            Mode::HelixNormal,
-        );
-
-        cx.simulate_keystrokes("d");
-
-        cx.assert_state(
-            indoc! {"
-            The quˇbrown
-            fox jumps over
-            the lazy dog."},
-            Mode::HelixNormal,
-        );
-
-        // test deleting a single character
-        cx.simulate_keystrokes("d");
-
-        cx.assert_state(
-            indoc! {"
-            The quˇrown
-            fox jumps over
-            the lazy dog."},
-            Mode::HelixNormal,
-        );
-    }
-
-    #[gpui::test]
-    async fn test_delete_character_end_of_line(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        cx.set_state(
-            indoc! {"
-            The quick brownˇ
-            fox jumps over
-            the lazy dog."},
-            Mode::HelixNormal,
-        );
-
-        cx.simulate_keystrokes("d");
-
-        cx.assert_state(
-            indoc! {"
-            The quick brownˇfox jumps over
-            the lazy dog."},
-            Mode::HelixNormal,
-        );
-    }
-
-    // #[gpui::test]
-    // async fn test_delete_character_end_of_buffer(cx: &mut gpui::TestAppContext) {
-    //     let mut cx = VimTestContext::new(cx, true).await;
-
-    //     cx.set_state(
-    //         indoc! {"
-    //         The quick brown
-    //         fox jumps over
-    //         the lazy dog.ˇ"},
-    //         Mode::HelixNormal,
-    //     );
-
-    //     cx.simulate_keystrokes("d");
-
-    //     cx.assert_state(
-    //         indoc! {"
-    //         The quick brown
-    //         fox jumps over
-    //         the lazy dog.ˇ"},
-    //         Mode::HelixNormal,
-    //     );
-    // }
-
-    #[gpui::test]
-    async fn test_f_and_t(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-        cx.enable_helix();
-
-        cx.set_state(
-            indoc! {"
-            The quˇick brown
-            fox jumps over
-            the lazy dog."},
-            Mode::HelixNormal,
-        );
-
-        cx.simulate_keystrokes("f z");
-
-        cx.assert_state(
-            indoc! {"
-                The qu«ick brown
-                fox jumps over
-                the lazˇ»y dog."},
-            Mode::HelixNormal,
-        );
-
-        cx.simulate_keystrokes("F e F e");
-
-        cx.assert_state(
-            indoc! {"
-                The quick brown
-                fox jumps ov«ˇer
-                the» lazy dog."},
-            Mode::HelixNormal,
-        );
-
-        cx.simulate_keystrokes("e 2 F e");
-
-        cx.assert_state(
-            indoc! {"
-                Th«ˇe quick brown
-                fox jumps over»
-                the lazy dog."},
-            Mode::HelixNormal,
-        );
-
-        cx.simulate_keystrokes("t r t r");
-
-        cx.assert_state(
-            indoc! {"
-                The quick «brown
-                fox jumps oveˇ»r
-                the lazy dog."},
-            Mode::HelixNormal,
-        );
-    }
-
-    #[gpui::test]
-    async fn test_newline_char(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-        cx.enable_helix();
-
-        cx.set_state("aa«\nˇ»bb cc", Mode::HelixNormal);
-
-        cx.simulate_keystroke("w");
-
-        cx.assert_state("aa\n«bb ˇ»cc", Mode::HelixNormal);
-
-        cx.set_state("aa«\nˇ»", Mode::HelixNormal);
-
-        cx.simulate_keystroke("b");
-
-        cx.assert_state("«ˇaa»\n", Mode::HelixNormal);
-    }
-
-    #[gpui::test]
-    async fn test_insert_selected(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-        cx.enable_helix();
-        cx.set_state(
-            indoc! {"
-            «The ˇ»quick brown
-            fox jumps over
-            the lazy dog."},
-            Mode::HelixNormal,
-        );
-
-        cx.simulate_keystrokes("i");
-
-        cx.assert_state(
-            indoc! {"
-            ˇThe quick brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Insert,
-        );
-    }
-
-    #[gpui::test]
-    async fn test_append(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-        cx.enable_helix();
-        // test from the end of the selection
-        cx.set_state(
-            indoc! {"
-            «Theˇ» quick brown
-            fox jumps over
-            the lazy dog."},
-            Mode::HelixNormal,
-        );
-
-        cx.simulate_keystrokes("a");
-
-        cx.assert_state(
-            indoc! {"
-            Theˇ quick brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Insert,
-        );
-
-        // test from the beginning of the selection
-        cx.set_state(
-            indoc! {"
-            «ˇThe» quick brown
-            fox jumps over
-            the lazy dog."},
-            Mode::HelixNormal,
-        );
-
-        cx.simulate_keystrokes("a");
-
-        cx.assert_state(
-            indoc! {"
-            Theˇ quick brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Insert,
-        );
-    }
-
-    #[gpui::test]
-    async fn test_replace(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-        cx.enable_helix();
-
-        // No selection (single character)
-        cx.set_state("ˇaa", Mode::HelixNormal);
-
-        cx.simulate_keystrokes("r x");
-
-        cx.assert_state("ˇxa", Mode::HelixNormal);
-
-        // Cursor at the beginning
-        cx.set_state("«ˇaa»", Mode::HelixNormal);
-
-        cx.simulate_keystrokes("r x");
-
-        cx.assert_state("«ˇxx»", Mode::HelixNormal);
-
-        // Cursor at the end
-        cx.set_state("«aaˇ»", Mode::HelixNormal);
-
-        cx.simulate_keystrokes("r x");
-
-        cx.assert_state("«xxˇ»", Mode::HelixNormal);
-    }
-
-    #[gpui::test]
-    async fn test_helix_yank(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-        cx.enable_helix();
-
-        // Test yanking current character with no selection
-        cx.set_state("hello ˇworld", Mode::HelixNormal);
-        cx.simulate_keystrokes("y");
-
-        // Test cursor remains at the same position after yanking single character
-        cx.assert_state("hello ˇworld", Mode::HelixNormal);
-        cx.shared_clipboard().assert_eq("w");
-
-        // Move cursor and yank another character
-        cx.simulate_keystrokes("l");
-        cx.simulate_keystrokes("y");
-        cx.shared_clipboard().assert_eq("o");
-
-        // Test yanking with existing selection
-        cx.set_state("hello «worlˇ»d", Mode::HelixNormal);
-        cx.simulate_keystrokes("y");
-        cx.shared_clipboard().assert_eq("worl");
-        cx.assert_state("hello «worlˇ»d", Mode::HelixNormal);
-
-        // Test yanking in select mode character by character
-        cx.set_state("hello ˇworld", Mode::HelixNormal);
-        cx.simulate_keystroke("v");
-        cx.assert_state("hello «wˇ»orld", Mode::HelixSelect);
-        cx.simulate_keystroke("y");
-        cx.assert_state("hello «wˇ»orld", Mode::HelixNormal);
-        cx.shared_clipboard().assert_eq("w");
-    }
-
-    #[gpui::test]
-    async fn test_shift_r_paste(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-        cx.enable_helix();
-
-        // First copy some text to clipboard
-        cx.set_state("«hello worldˇ»", Mode::HelixNormal);
-        cx.simulate_keystrokes("y");
-
-        // Test paste with shift-r on single cursor
-        cx.set_state("foo ˇbar", Mode::HelixNormal);
-        cx.simulate_keystrokes("shift-r");
-
-        cx.assert_state("foo hello worldˇbar", Mode::HelixNormal);
-
-        // Test paste with shift-r on selection
-        cx.set_state("foo «barˇ» baz", Mode::HelixNormal);
-        cx.simulate_keystrokes("shift-r");
-
-        cx.assert_state("foo hello worldˇ baz", Mode::HelixNormal);
-    }
-
-    #[gpui::test]
-    async fn test_helix_select_mode(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        assert_eq!(cx.mode(), Mode::Normal);
-        cx.enable_helix();
-
-        cx.simulate_keystrokes("v");
-        assert_eq!(cx.mode(), Mode::HelixSelect);
-        cx.simulate_keystrokes("escape");
-        assert_eq!(cx.mode(), Mode::HelixNormal);
-    }
-
-    #[gpui::test]
-    async fn test_insert_mode_stickiness(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-        cx.enable_helix();
-
-        // Make a modification at a specific location
-        cx.set_state("ˇhello", Mode::HelixNormal);
-        assert_eq!(cx.mode(), Mode::HelixNormal);
-        cx.simulate_keystrokes("i");
-        assert_eq!(cx.mode(), Mode::Insert);
-        cx.simulate_keystrokes("escape");
-        assert_eq!(cx.mode(), Mode::HelixNormal);
-    }
-
-    #[gpui::test]
-    async fn test_goto_last_modification(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-        cx.enable_helix();
-
-        // Make a modification at a specific location
-        cx.set_state("line one\nline ˇtwo\nline three", Mode::HelixNormal);
-        cx.assert_state("line one\nline ˇtwo\nline three", Mode::HelixNormal);
-        cx.simulate_keystrokes("i");
-        cx.simulate_keystrokes("escape");
-        cx.simulate_keystrokes("i");
-        cx.simulate_keystrokes("m o d i f i e d space");
-        cx.simulate_keystrokes("escape");
-
-        // TODO: this fails, because state is no longer helix
-        cx.assert_state(
-            "line one\nline modified ˇtwo\nline three",
-            Mode::HelixNormal,
-        );
-
-        // Move cursor away from the modification
-        cx.simulate_keystrokes("up");
-
-        // Use "g ." to go back to last modification
-        cx.simulate_keystrokes("g .");
-
-        // Verify we're back at the modification location and still in HelixNormal mode
-        cx.assert_state(
-            "line one\nline modifiedˇ two\nline three",
-            Mode::HelixNormal,
-        );
-    }
-
-    #[gpui::test]
-    async fn test_helix_select_lines(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-        cx.set_state(
-            "line one\nline ˇtwo\nline three\nline four",
-            Mode::HelixNormal,
-        );
-        cx.simulate_keystrokes("2 x");
-        cx.assert_state(
-            "line one\n«line two\nline three\nˇ»line four",
-            Mode::HelixNormal,
-        );
-
-        // Test extending existing line selection
-        cx.set_state(
-            indoc! {"
-            li«ˇne one
-            li»ne two
-            line three
-            line four"},
-            Mode::HelixNormal,
-        );
-        cx.simulate_keystrokes("x");
-        cx.assert_state(
-            indoc! {"
-            «line one
-            line two
-            ˇ»line three
-            line four"},
-            Mode::HelixNormal,
-        );
-
-        // Pressing x in empty line, select next line (because helix considers cursor a selection)
-        cx.set_state(
-            indoc! {"
-            line one
-            ˇ
-            line three
-            line four"},
-            Mode::HelixNormal,
-        );
-        cx.simulate_keystrokes("x");
-        cx.assert_state(
-            indoc! {"
-            line one
-            «
-            line three
-            ˇ»line four"},
-            Mode::HelixNormal,
-        );
-
-        // Empty line with count selects extra + count lines
-        cx.set_state(
-            indoc! {"
-            line one
-            ˇ
-            line three
-            line four
-            line five"},
-            Mode::HelixNormal,
-        );
-        cx.simulate_keystrokes("2 x");
-        cx.assert_state(
-            indoc! {"
-            line one
-            «
-            line three
-            line four
-            ˇ»line five"},
-            Mode::HelixNormal,
-        );
-
-        // Compare empty vs non-empty line behavior
-        cx.set_state(
-            indoc! {"
-            ˇnon-empty line
-            line two
-            line three"},
-            Mode::HelixNormal,
-        );
-        cx.simulate_keystrokes("x");
-        cx.assert_state(
-            indoc! {"
-            «non-empty line
-            ˇ»line two
-            line three"},
-            Mode::HelixNormal,
-        );
-
-        // Same test but with empty line - should select one extra
-        cx.set_state(
-            indoc! {"
-            ˇ
-            line two
-            line three"},
-            Mode::HelixNormal,
-        );
-        cx.simulate_keystrokes("x");
-        cx.assert_state(
-            indoc! {"
-            «
-            line two
-            ˇ»line three"},
-            Mode::HelixNormal,
-        );
-
-        // Test selecting multiple lines with count
-        cx.set_state(
-            indoc! {"
-            ˇline one
-            line two
-            line threeˇ
-            line four
-            line five"},
-            Mode::HelixNormal,
-        );
-        cx.simulate_keystrokes("x");
-        cx.assert_state(
-            indoc! {"
-            «line one
-            ˇ»line two
-            «line three
-            ˇ»line four
-            line five"},
-            Mode::HelixNormal,
-        );
-        cx.simulate_keystrokes("x");
-        cx.assert_state(
-            indoc! {"
-            «line one
-            line two
-            line three
-            line four
-            ˇ»line five"},
-            Mode::HelixNormal,
-        );
-    }
-
-    #[gpui::test]
-    async fn test_helix_select_mode_motion(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        assert_eq!(cx.mode(), Mode::Normal);
-        cx.enable_helix();
-
-        cx.set_state("ˇhello", Mode::HelixNormal);
-        cx.simulate_keystrokes("l v l l");
-        cx.assert_state("h«ellˇ»o", Mode::HelixSelect);
-    }
-
-    #[gpui::test]
-    async fn test_helix_select_mode_motion_multiple_cursors(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        assert_eq!(cx.mode(), Mode::Normal);
-        cx.enable_helix();
-
-        // Start with multiple cursors (no selections)
-        cx.set_state("ˇhello\nˇworld", Mode::HelixNormal);
-
-        // Enter select mode and move right twice
-        cx.simulate_keystrokes("v l l");
-
-        // Each cursor should independently create and extend its own selection
-        cx.assert_state("«helˇ»lo\n«worˇ»ld", Mode::HelixSelect);
-    }
-
-    #[gpui::test]
-    async fn test_helix_select_word_motions(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        cx.set_state("ˇone two", Mode::Normal);
-        cx.simulate_keystrokes("v w");
-        cx.assert_state("«one tˇ»wo", Mode::Visual);
-
-        // In Vim, this selects "t". In helix selections stops just before "t"
-
-        cx.enable_helix();
-        cx.set_state("ˇone two", Mode::HelixNormal);
-        cx.simulate_keystrokes("v w");
-        cx.assert_state("«one ˇ»two", Mode::HelixSelect);
-    }
-
-    #[gpui::test]
-    async fn test_exit_visual_mode(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        cx.set_state("ˇone two", Mode::Normal);
-        cx.simulate_keystrokes("v w");
-        cx.assert_state("«one tˇ»wo", Mode::Visual);
-        cx.simulate_keystrokes("escape");
-        cx.assert_state("one ˇtwo", Mode::Normal);
-
-        cx.enable_helix();
-        cx.set_state("ˇone two", Mode::HelixNormal);
-        cx.simulate_keystrokes("v w");
-        cx.assert_state("«one ˇ»two", Mode::HelixSelect);
-        cx.simulate_keystrokes("escape");
-        cx.assert_state("«one ˇ»two", Mode::HelixNormal);
-    }
-
-    #[gpui::test]
-    async fn test_helix_select_motion(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-        cx.enable_helix();
-
-        cx.set_state("«ˇ»one two three", Mode::HelixSelect);
-        cx.simulate_keystrokes("w");
-        cx.assert_state("«one ˇ»two three", Mode::HelixSelect);
-
-        cx.set_state("«ˇ»one two three", Mode::HelixSelect);
-        cx.simulate_keystrokes("e");
-        cx.assert_state("«oneˇ» two three", Mode::HelixSelect);
-    }
-
-    #[gpui::test]
-    async fn test_helix_full_cursor_selection(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-        cx.enable_helix();
-
-        cx.set_state("ˇone two three", Mode::HelixNormal);
-        cx.simulate_keystrokes("l l v h h h");
-        cx.assert_state("«ˇone» two three", Mode::HelixSelect);
-    }
-
-    #[gpui::test]
-    async fn test_helix_select_regex(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-        cx.enable_helix();
-
-        cx.set_state("ˇone two one", Mode::HelixNormal);
-        cx.simulate_keystrokes("x");
-        cx.assert_state("«one two oneˇ»", Mode::HelixNormal);
-        cx.simulate_keystrokes("s o n e");
-        cx.run_until_parked();
-        cx.simulate_keystrokes("enter");
-        cx.assert_state("«oneˇ» two «oneˇ»", Mode::HelixNormal);
-
-        cx.simulate_keystrokes("x");
-        cx.simulate_keystrokes("s");
-        cx.run_until_parked();
-        cx.simulate_keystrokes("enter");
-        cx.assert_state("«oneˇ» two «oneˇ»", Mode::HelixNormal);
-
-        // TODO: change "search_in_selection" to not perform any search when in helix select mode with no selection
-        // cx.set_state("ˇstuff one two one", Mode::HelixNormal);
-        // cx.simulate_keystrokes("s o n e enter");
-        // cx.assert_state("ˇstuff one two one", Mode::HelixNormal);
-    }
-
-    #[gpui::test]
-    async fn test_helix_select_next_match(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        cx.set_state("ˇhello two one two one two one", Mode::Visual);
-        cx.simulate_keystrokes("/ o n e");
-        cx.simulate_keystrokes("enter");
-        cx.simulate_keystrokes("n n");
-        cx.assert_state("«hello two one two one two oˇ»ne", Mode::Visual);
-
-        cx.set_state("ˇhello two one two one two one", Mode::Normal);
-        cx.simulate_keystrokes("/ o n e");
-        cx.simulate_keystrokes("enter");
-        cx.simulate_keystrokes("n n");
-        cx.assert_state("hello two one two one two ˇone", Mode::Normal);
-
-        cx.set_state("ˇhello two one two one two one", Mode::Normal);
-        cx.simulate_keystrokes("/ o n e");
-        cx.simulate_keystrokes("enter");
-        cx.simulate_keystrokes("n g n g n");
-        cx.assert_state("hello two one two «one two oneˇ»", Mode::Visual);
-
-        cx.enable_helix();
-
-        cx.set_state("ˇhello two one two one two one", Mode::HelixNormal);
-        cx.simulate_keystrokes("/ o n e");
-        cx.simulate_keystrokes("enter");
-        cx.simulate_keystrokes("n n");
-        cx.assert_state("hello two one two one two «oneˇ»", Mode::HelixNormal);
-
-        cx.set_state("ˇhello two one two one two one", Mode::HelixSelect);
-        cx.simulate_keystrokes("/ o n e");
-        cx.simulate_keystrokes("enter");
-        cx.simulate_keystrokes("n n");
-        cx.assert_state("hello two «oneˇ» two «oneˇ» two «oneˇ»", Mode::HelixSelect);
-    }
-
-    #[gpui::test]
-    async fn test_helix_substitute(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        cx.set_state("ˇone two", Mode::HelixNormal);
-        cx.simulate_keystrokes("c");
-        cx.assert_state("ˇne two", Mode::Insert);
-
-        cx.set_state("«oneˇ» two", Mode::HelixNormal);
-        cx.simulate_keystrokes("c");
-        cx.assert_state("ˇ two", Mode::Insert);
-
-        cx.set_state(
-            indoc! {"
-            oneˇ two
-            three
-            "},
-            Mode::HelixNormal,
-        );
-        cx.simulate_keystrokes("x c");
-        cx.assert_state(
-            indoc! {"
-            ˇ
-            three
-            "},
-            Mode::Insert,
-        );
-
-        cx.set_state(
-            indoc! {"
-            one twoˇ
-            three
-            "},
-            Mode::HelixNormal,
-        );
-        cx.simulate_keystrokes("c");
-        cx.assert_state(
-            indoc! {"
-            one twoˇthree
-            "},
-            Mode::Insert,
-        );
-
-        // Helix doesn't set the cursor to the first non-blank one when
-        // replacing lines: it uses language-dependent indent queries instead.
-        cx.set_state(
-            indoc! {"
-            one two
-            «    indented
-            three not indentedˇ»
-            "},
-            Mode::HelixNormal,
-        );
-        cx.simulate_keystrokes("c");
-        cx.set_state(
-            indoc! {"
-            one two
-            ˇ
-            "},
-            Mode::Insert,
-        );
-    }
-
-    #[gpui::test]
-    async fn test_g_l_end_of_line(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-        cx.enable_helix();
-
-        // Test g l moves to last character, not after it
-        cx.set_state("hello ˇworld!", Mode::HelixNormal);
-        cx.simulate_keystrokes("g l");
-        cx.assert_state("hello worldˇ!", Mode::HelixNormal);
-
-        // Test with Chinese characters, test if work with UTF-8?
-        cx.set_state("ˇ你好世界", Mode::HelixNormal);
-        cx.simulate_keystrokes("g l");
-        cx.assert_state("你好世ˇ界", Mode::HelixNormal);
-
-        // Test with end of line
-        cx.set_state("endˇ", Mode::HelixNormal);
-        cx.simulate_keystrokes("g l");
-        cx.assert_state("enˇd", Mode::HelixNormal);
-
-        // Test with empty line
-        cx.set_state(
-            indoc! {"
-                hello
-                ˇ
-                world"},
-            Mode::HelixNormal,
-        );
-        cx.simulate_keystrokes("g l");
-        cx.assert_state(
-            indoc! {"
-                hello
-                ˇ
-                world"},
-            Mode::HelixNormal,
-        );
-
-        // Test with multiple lines
-        cx.set_state(
-            indoc! {"
-                ˇfirst line
-                second line
-                third line"},
-            Mode::HelixNormal,
-        );
-        cx.simulate_keystrokes("g l");
-        cx.assert_state(
-            indoc! {"
-                first linˇe
-                second line
-                third line"},
-            Mode::HelixNormal,
-        );
-    }
-}
diff --git a/crates/vim/src/helix/boundary.rs b/crates/vim/src/helix/boundary.rs
deleted file mode 100644
index 0c2ebbeef0..0000000000
--- a/crates/vim/src/helix/boundary.rs
+++ /dev/null
@@ -1,739 +0,0 @@
-use std::{cmp::Ordering, ops::Range};
-
-use editor::{
-    DisplayPoint, MultiBufferOffset,
-    display_map::{DisplaySnapshot, ToDisplayPoint},
-    movement,
-};
-use language::{CharClassifier, CharKind};
-use text::Bias;
-
-use crate::helix::object::HelixTextObject;
-
-/// Text objects (after helix definition) that can easily be
-/// found by reading a buffer and comparing two neighboring chars
-/// until a start / end is found
-trait BoundedObject {
-    /// The next start since `from` (inclusive).
-    /// If outer is true it is the start of "a" object (m a) rather than "inner" object (m i).
-    fn next_start(&self, map: &DisplaySnapshot, from: Offset, outer: bool) -> Option<Offset>;
-    /// The next end since `from` (inclusive).
-    /// If outer is true it is the end of "a" object (m a) rather than "inner" object (m i).
-    fn next_end(&self, map: &DisplaySnapshot, from: Offset, outer: bool) -> Option<Offset>;
-    /// The previous start since `from` (inclusive).
-    /// If outer is true it is the start of "a" object (m a) rather than "inner" object (m i).
-    fn previous_start(&self, map: &DisplaySnapshot, from: Offset, outer: bool) -> Option<Offset>;
-    /// The previous end since `from` (inclusive).
-    /// If outer is true it is the end of "a" object (m a) rather than "inner" object (m i).
-    fn previous_end(&self, map: &DisplaySnapshot, from: Offset, outer: bool) -> Option<Offset>;
-
-    /// Whether the range inside the object can be zero characters wide.
-    /// If so, the trait assumes that these ranges can't be directly adjacent to each other.
-    fn inner_range_can_be_zero_width(&self) -> bool;
-    /// Whether the "ma" can exceed the "mi" range on both sides at the same time
-    fn surround_on_both_sides(&self) -> bool;
-    /// Whether the outer range of an object could overlap with the outer range of the neighboring
-    /// object. If so, they can't be nested.
-    fn ambiguous_outer(&self) -> bool;
-
-    fn can_be_zero_width(&self, around: bool) -> bool {
-        if around {
-            false
-        } else {
-            self.inner_range_can_be_zero_width()
-        }
-    }
-
-    /// Switches from an "mi" range to an "ma" one.
-    /// Assumes the inner range is valid.
-    fn around(&self, map: &DisplaySnapshot, inner_range: Range<Offset>) -> Range<Offset> {
-        if self.surround_on_both_sides() {
-            let start = self
-                .previous_start(map, inner_range.start, true)
-                .unwrap_or(inner_range.start);
-            let end = self
-                .next_end(map, inner_range.end, true)
-                .unwrap_or(inner_range.end);
-
-            return start..end;
-        }
-
-        let mut start = inner_range.start;
-        let end = self
-            .next_end(map, inner_range.end, true)
-            .unwrap_or(inner_range.end);
-        if end == inner_range.end {
-            start = self
-                .previous_start(map, inner_range.start, true)
-                .unwrap_or(inner_range.start)
-        }
-
-        start..end
-    }
-    /// Switches from an "ma" range to an "mi" one.
-    /// Assumes the inner range is valid.
-    fn inside(&self, map: &DisplaySnapshot, outer_range: Range<Offset>) -> Range<Offset> {
-        let inner_start = self
-            .next_start(map, outer_range.start, false)
-            .unwrap_or_else(|| {
-                log::warn!("The motion might not have found the text object correctly");
-                outer_range.start
-            });
-        let inner_end = self
-            .previous_end(map, outer_range.end, false)
-            .unwrap_or_else(|| {
-                log::warn!("The motion might not have found the text object correctly");
-                outer_range.end
-            });
-        inner_start..inner_end
-    }
-
-    /// The next end since `start` (inclusive) on the same nesting level.
-    fn close_at_end(&self, start: Offset, map: &DisplaySnapshot, outer: bool) -> Option<Offset> {
-        let mut end_search_start = if self.can_be_zero_width(outer) {
-            start
-        } else {
-            start.next(map)?
-        };
-        let mut start_search_start = start.next(map)?;
-
-        loop {
-            let next_end = self.next_end(map, end_search_start, outer)?;
-            let maybe_next_start = self.next_start(map, start_search_start, outer);
-            if let Some(next_start) = maybe_next_start
-                && (next_start.0 < next_end.0
-                    || next_start.0 == next_end.0 && self.can_be_zero_width(outer))
-                && !self.ambiguous_outer()
-            {
-                let closing = self.close_at_end(next_start, map, outer)?;
-                end_search_start = closing.next(map)?;
-                start_search_start = if self.can_be_zero_width(outer) {
-                    closing.next(map)?
-                } else {
-                    closing
-                };
-            } else {
-                return Some(next_end);
-            }
-        }
-    }
-    /// The previous start since `end` (inclusive) on the same nesting level.
-    fn close_at_start(&self, end: Offset, map: &DisplaySnapshot, outer: bool) -> Option<Offset> {
-        let mut start_search_end = if self.can_be_zero_width(outer) {
-            end
-        } else {
-            end.previous(map)?
-        };
-        let mut end_search_end = end.previous(map)?;
-
-        loop {
-            let previous_start = self.previous_start(map, start_search_end, outer)?;
-            let maybe_previous_end = self.previous_end(map, end_search_end, outer);
-            if let Some(previous_end) = maybe_previous_end
-                && (previous_end.0 > previous_start.0
-                    || previous_end.0 == previous_start.0 && self.can_be_zero_width(outer))
-                && !self.ambiguous_outer()
-            {
-                let closing = self.close_at_start(previous_end, map, outer)?;
-                start_search_end = closing.previous(map)?;
-                end_search_end = if self.can_be_zero_width(outer) {
-                    closing.previous(map)?
-                } else {
-                    closing
-                };
-            } else {
-                return Some(previous_start);
-            }
-        }
-    }
-}
-
-#[derive(Clone, Copy, PartialEq, Debug, PartialOrd, Ord, Eq)]
-struct Offset(MultiBufferOffset);
-impl Offset {
-    fn next(self, map: &DisplaySnapshot) -> Option<Self> {
-        let next = Self(
-            map.buffer_snapshot()
-                .clip_offset(self.0 + 1usize, Bias::Right),
-        );
-        (next.0 > self.0).then(|| next)
-    }
-    fn previous(self, map: &DisplaySnapshot) -> Option<Self> {
-        if self.0 == MultiBufferOffset(0) {
-            return None;
-        }
-        Some(Self(
-            map.buffer_snapshot().clip_offset(self.0 - 1, Bias::Left),
-        ))
-    }
-    fn range(
-        start: (DisplayPoint, Bias),
-        end: (DisplayPoint, Bias),
-        map: &DisplaySnapshot,
-    ) -> Range<Self> {
-        Self(start.0.to_offset(map, start.1))..Self(end.0.to_offset(map, end.1))
-    }
-}
-
-impl<B: BoundedObject> HelixTextObject for B {
-    fn range(
-        &self,
-        map: &DisplaySnapshot,
-        relative_to: Range<DisplayPoint>,
-        around: bool,
-    ) -> Option<Range<DisplayPoint>> {
-        let relative_to = Offset::range(
-            (relative_to.start, Bias::Left),
-            (relative_to.end, Bias::Left),
-            map,
-        );
-
-        relative_range(self, around, map, |find_outer| {
-            let search_start = if self.can_be_zero_width(find_outer) {
-                relative_to.end
-            } else {
-                // If the objects can be directly next to each other an object end the
-                // cursor (relative_to) end would not count for close_at_end, so the search
-                // needs to start one character to the left.
-                relative_to.end.previous(map)?
-            };
-            let max_end = self.close_at_end(search_start, map, find_outer)?;
-            let min_start = self.close_at_start(max_end, map, find_outer)?;
-
-            (min_start <= relative_to.start).then(|| min_start..max_end)
-        })
-    }
-
-    fn next_range(
-        &self,
-        map: &DisplaySnapshot,
-        relative_to: Range<DisplayPoint>,
-        around: bool,
-    ) -> Option<Range<DisplayPoint>> {
-        let relative_to = Offset::range(
-            (relative_to.start, Bias::Left),
-            (relative_to.end, Bias::Left),
-            map,
-        );
-
-        relative_range(self, around, map, |find_outer| {
-            let min_start = self.next_start(map, relative_to.end, find_outer)?;
-            let max_end = self.close_at_end(min_start, map, find_outer)?;
-
-            Some(min_start..max_end)
-        })
-    }
-
-    fn previous_range(
-        &self,
-        map: &DisplaySnapshot,
-        relative_to: Range<DisplayPoint>,
-        around: bool,
-    ) -> Option<Range<DisplayPoint>> {
-        let relative_to = Offset::range(
-            (relative_to.start, Bias::Left),
-            (relative_to.end, Bias::Left),
-            map,
-        );
-
-        relative_range(self, around, map, |find_outer| {
-            let max_end = self.previous_end(map, relative_to.start, find_outer)?;
-            let min_start = self.close_at_start(max_end, map, find_outer)?;
-
-            Some(min_start..max_end)
-        })
-    }
-}
-
-fn relative_range<B: BoundedObject>(
-    object: &B,
-    outer: bool,
-    map: &DisplaySnapshot,
-    find_range: impl Fn(bool) -> Option<Range<Offset>>,
-) -> Option<Range<DisplayPoint>> {
-    // The cursor could be inside the outer range, but not the inner range.
-    // Whether that should count as found.
-    let find_outer = object.surround_on_both_sides() && !object.ambiguous_outer();
-    let range = find_range(find_outer)?;
-    let min_start = range.start;
-    let max_end = range.end;
-
-    let wanted_range = if outer && !find_outer {
-        // max_end is not yet the outer end
-        object.around(map, min_start..max_end)
-    } else if !outer && find_outer {
-        // max_end is the outer end, but the final result should have the inner end
-        object.inside(map, min_start..max_end)
-    } else {
-        min_start..max_end
-    };
-
-    let start = wanted_range.start.0.to_display_point(map);
-    let end = wanted_range.end.0.to_display_point(map);
-
-    Some(start..end)
-}
-
-/// A textobject whose boundaries can easily be found between two chars
-pub enum ImmediateBoundary {
-    Word { ignore_punctuation: bool },
-    Subword { ignore_punctuation: bool },
-    AngleBrackets,
-    BackQuotes,
-    CurlyBrackets,
-    DoubleQuotes,
-    Parentheses,
-    SingleQuotes,
-    SquareBrackets,
-    VerticalBars,
-}
-
-/// A textobject whose start and end can be found from an easy-to-find
-/// boundary between two chars by following a simple path from there
-pub enum FuzzyBoundary {
-    Sentence,
-    Paragraph,
-}
-
-impl ImmediateBoundary {
-    fn is_inner_start(&self, left: char, right: char, classifier: CharClassifier) -> bool {
-        match self {
-            Self::Word { ignore_punctuation } => {
-                let classifier = classifier.ignore_punctuation(*ignore_punctuation);
-                is_word_start(left, right, &classifier)
-                    || (is_buffer_start(left) && classifier.kind(right) != CharKind::Whitespace)
-            }
-            Self::Subword { ignore_punctuation } => {
-                let classifier = classifier.ignore_punctuation(*ignore_punctuation);
-                movement::is_subword_start(left, right, &classifier)
-                    || (is_buffer_start(left) && classifier.kind(right) != CharKind::Whitespace)
-            }
-            Self::AngleBrackets => left == '<',
-            Self::BackQuotes => left == '`',
-            Self::CurlyBrackets => left == '{',
-            Self::DoubleQuotes => left == '"',
-            Self::Parentheses => left == '(',
-            Self::SingleQuotes => left == '\'',
-            Self::SquareBrackets => left == '[',
-            Self::VerticalBars => left == '|',
-        }
-    }
-    fn is_inner_end(&self, left: char, right: char, classifier: CharClassifier) -> bool {
-        match self {
-            Self::Word { ignore_punctuation } => {
-                let classifier = classifier.ignore_punctuation(*ignore_punctuation);
-                is_word_end(left, right, &classifier)
-                    || (is_buffer_end(right) && classifier.kind(left) != CharKind::Whitespace)
-            }
-            Self::Subword { ignore_punctuation } => {
-                let classifier = classifier.ignore_punctuation(*ignore_punctuation);
-                movement::is_subword_start(left, right, &classifier)
-                    || (is_buffer_end(right) && classifier.kind(left) != CharKind::Whitespace)
-            }
-            Self::AngleBrackets => right == '>',
-            Self::BackQuotes => right == '`',
-            Self::CurlyBrackets => right == '}',
-            Self::DoubleQuotes => right == '"',
-            Self::Parentheses => right == ')',
-            Self::SingleQuotes => right == '\'',
-            Self::SquareBrackets => right == ']',
-            Self::VerticalBars => right == '|',
-        }
-    }
-    fn is_outer_start(&self, left: char, right: char, classifier: CharClassifier) -> bool {
-        match self {
-            word @ Self::Word { .. } => word.is_inner_end(left, right, classifier) || left == '\n',
-            subword @ Self::Subword { .. } => {
-                subword.is_inner_end(left, right, classifier) || left == '\n'
-            }
-            Self::AngleBrackets => right == '<',
-            Self::BackQuotes => right == '`',
-            Self::CurlyBrackets => right == '{',
-            Self::DoubleQuotes => right == '"',
-            Self::Parentheses => right == '(',
-            Self::SingleQuotes => right == '\'',
-            Self::SquareBrackets => right == '[',
-            Self::VerticalBars => right == '|',
-        }
-    }
-    fn is_outer_end(&self, left: char, right: char, classifier: CharClassifier) -> bool {
-        match self {
-            word @ Self::Word { .. } => {
-                word.is_inner_start(left, right, classifier) || right == '\n'
-            }
-            subword @ Self::Subword { .. } => {
-                subword.is_inner_start(left, right, classifier) || right == '\n'
-            }
-            Self::AngleBrackets => left == '>',
-            Self::BackQuotes => left == '`',
-            Self::CurlyBrackets => left == '}',
-            Self::DoubleQuotes => left == '"',
-            Self::Parentheses => left == ')',
-            Self::SingleQuotes => left == '\'',
-            Self::SquareBrackets => left == ']',
-            Self::VerticalBars => left == '|',
-        }
-    }
-}
-
-impl BoundedObject for ImmediateBoundary {
-    fn next_start(&self, map: &DisplaySnapshot, from: Offset, outer: bool) -> Option<Offset> {
-        try_find_boundary(map, from, |left, right| {
-            let classifier = map.buffer_snapshot().char_classifier_at(from.0);
-            if outer {
-                self.is_outer_start(left, right, classifier)
-            } else {
-                self.is_inner_start(left, right, classifier)
-            }
-        })
-    }
-    fn next_end(&self, map: &DisplaySnapshot, from: Offset, outer: bool) -> Option<Offset> {
-        try_find_boundary(map, from, |left, right| {
-            let classifier = map.buffer_snapshot().char_classifier_at(from.0);
-            if outer {
-                self.is_outer_end(left, right, classifier)
-            } else {
-                self.is_inner_end(left, right, classifier)
-            }
-        })
-    }
-    fn previous_start(&self, map: &DisplaySnapshot, from: Offset, outer: bool) -> Option<Offset> {
-        try_find_preceding_boundary(map, from, |left, right| {
-            let classifier = map.buffer_snapshot().char_classifier_at(from.0);
-            if outer {
-                self.is_outer_start(left, right, classifier)
-            } else {
-                self.is_inner_start(left, right, classifier)
-            }
-        })
-    }
-    fn previous_end(&self, map: &DisplaySnapshot, from: Offset, outer: bool) -> Option<Offset> {
-        try_find_preceding_boundary(map, from, |left, right| {
-            let classifier = map.buffer_snapshot().char_classifier_at(from.0);
-            if outer {
-                self.is_outer_end(left, right, classifier)
-            } else {
-                self.is_inner_end(left, right, classifier)
-            }
-        })
-    }
-    fn inner_range_can_be_zero_width(&self) -> bool {
-        match self {
-            Self::Subword { .. } | Self::Word { .. } => false,
-            _ => true,
-        }
-    }
-    fn surround_on_both_sides(&self) -> bool {
-        match self {
-            Self::Subword { .. } | Self::Word { .. } => false,
-            _ => true,
-        }
-    }
-    fn ambiguous_outer(&self) -> bool {
-        match self {
-            Self::BackQuotes
-            | Self::DoubleQuotes
-            | Self::SingleQuotes
-            | Self::VerticalBars
-            | Self::Subword { .. }
-            | Self::Word { .. } => true,
-            _ => false,
-        }
-    }
-}
-
-impl FuzzyBoundary {
-    /// When between two chars that form an easy-to-find identifier boundary,
-    /// what's the way to get to the actual start of the object, if any
-    fn is_near_potential_inner_start<'a>(
-        &self,
-        left: char,
-        right: char,
-        classifier: &CharClassifier,
-    ) -> Option<Box<dyn Fn(Offset, &'a DisplaySnapshot) -> Option<Offset>>> {
-        if is_buffer_start(left) {
-            return Some(Box::new(|identifier, _| Some(identifier)));
-        }
-        match self {
-            Self::Paragraph => {
-                if left != '\n' || right != '\n' {
-                    return None;
-                }
-                Some(Box::new(|identifier, map| {
-                    try_find_boundary(map, identifier, |left, right| left == '\n' && right != '\n')
-                }))
-            }
-            Self::Sentence => {
-                if let Some(find_paragraph_start) =
-                    Self::Paragraph.is_near_potential_inner_start(left, right, classifier)
-                {
-                    return Some(find_paragraph_start);
-                } else if !is_sentence_end(left, right, classifier) {
-                    return None;
-                }
-                Some(Box::new(|identifier, map| {
-                    let word = ImmediateBoundary::Word {
-                        ignore_punctuation: false,
-                    };
-                    word.next_start(map, identifier, false)
-                }))
-            }
-        }
-    }
-    /// When between two chars that form an easy-to-find identifier boundary,
-    /// what's the way to get to the actual end of the object, if any
-    fn is_near_potential_inner_end<'a>(
-        &self,
-        left: char,
-        right: char,
-        classifier: &CharClassifier,
-    ) -> Option<Box<dyn Fn(Offset, &'a DisplaySnapshot) -> Option<Offset>>> {
-        if is_buffer_end(right) {
-            return Some(Box::new(|identifier, _| Some(identifier)));
-        }
-        match self {
-            Self::Paragraph => {
-                if left != '\n' || right != '\n' {
-                    return None;
-                }
-                Some(Box::new(|identifier, map| {
-                    try_find_preceding_boundary(map, identifier, |left, right| {
-                        left != '\n' && right == '\n'
-                    })
-                }))
-            }
-            Self::Sentence => {
-                if let Some(find_paragraph_end) =
-                    Self::Paragraph.is_near_potential_inner_end(left, right, classifier)
-                {
-                    return Some(find_paragraph_end);
-                } else if !is_sentence_end(left, right, classifier) {
-                    return None;
-                }
-                Some(Box::new(|identifier, _| Some(identifier)))
-            }
-        }
-    }
-    /// When between two chars that form an easy-to-find identifier boundary,
-    /// what's the way to get to the actual end of the object, if any
-    fn is_near_potential_outer_start<'a>(
-        &self,
-        left: char,
-        right: char,
-        classifier: &CharClassifier,
-    ) -> Option<Box<dyn Fn(Offset, &'a DisplaySnapshot) -> Option<Offset>>> {
-        match self {
-            paragraph @ Self::Paragraph => {
-                paragraph.is_near_potential_inner_end(left, right, classifier)
-            }
-            sentence @ Self::Sentence => {
-                sentence.is_near_potential_inner_end(left, right, classifier)
-            }
-        }
-    }
-    /// When between two chars that form an easy-to-find identifier boundary,
-    /// what's the way to get to the actual end of the object, if any
-    fn is_near_potential_outer_end<'a>(
-        &self,
-        left: char,
-        right: char,
-        classifier: &CharClassifier,
-    ) -> Option<Box<dyn Fn(Offset, &'a DisplaySnapshot) -> Option<Offset>>> {
-        match self {
-            paragraph @ Self::Paragraph => {
-                paragraph.is_near_potential_inner_start(left, right, classifier)
-            }
-            sentence @ Self::Sentence => {
-                sentence.is_near_potential_inner_start(left, right, classifier)
-            }
-        }
-    }
-
-    // The boundary can be on the other side of `from` than the identifier, so the search needs to go both ways.
-    // Also, the distance (and direction) between identifier and boundary could vary, so a few ones need to be
-    // compared, even if one boundary was already found on the right side of `from`.
-    fn to_boundary(
-        &self,
-        map: &DisplaySnapshot,
-        from: Offset,
-        outer: bool,
-        backward: bool,
-        boundary_kind: Boundary,
-    ) -> Option<Offset> {
-        let generate_boundary_data = |left, right, point: Offset| {
-            let classifier = map.buffer_snapshot().char_classifier_at(from.0);
-            let reach_boundary = if outer && boundary_kind == Boundary::Start {
-                self.is_near_potential_outer_start(left, right, &classifier)
-            } else if !outer && boundary_kind == Boundary::Start {
-                self.is_near_potential_inner_start(left, right, &classifier)
-            } else if outer && boundary_kind == Boundary::End {
-                self.is_near_potential_outer_end(left, right, &classifier)
-            } else {
-                self.is_near_potential_inner_end(left, right, &classifier)
-            };
-
-            reach_boundary.map(|reach_start| (point, reach_start))
-        };
-
-        let forwards = try_find_boundary_data(map, from, generate_boundary_data);
-        let backwards = try_find_preceding_boundary_data(map, from, generate_boundary_data);
-        let boundaries = [forwards, backwards]
-            .into_iter()
-            .flatten()
-            .filter_map(|(identifier, reach_boundary)| reach_boundary(identifier, map))
-            .filter(|boundary| match boundary.cmp(&from) {
-                Ordering::Equal => true,
-                Ordering::Less => backward,
-                Ordering::Greater => !backward,
-            });
-        if backward {
-            boundaries.max_by_key(|boundary| *boundary)
-        } else {
-            boundaries.min_by_key(|boundary| *boundary)
-        }
-    }
-}
-
-#[derive(PartialEq)]
-enum Boundary {
-    Start,
-    End,
-}
-
-impl BoundedObject for FuzzyBoundary {
-    fn next_start(&self, map: &DisplaySnapshot, from: Offset, outer: bool) -> Option<Offset> {
-        self.to_boundary(map, from, outer, false, Boundary::Start)
-    }
-    fn next_end(&self, map: &DisplaySnapshot, from: Offset, outer: bool) -> Option<Offset> {
-        self.to_boundary(map, from, outer, false, Boundary::End)
-    }
-    fn previous_start(&self, map: &DisplaySnapshot, from: Offset, outer: bool) -> Option<Offset> {
-        self.to_boundary(map, from, outer, true, Boundary::Start)
-    }
-    fn previous_end(&self, map: &DisplaySnapshot, from: Offset, outer: bool) -> Option<Offset> {
-        self.to_boundary(map, from, outer, true, Boundary::End)
-    }
-    fn inner_range_can_be_zero_width(&self) -> bool {
-        false
-    }
-    fn surround_on_both_sides(&self) -> bool {
-        false
-    }
-    fn ambiguous_outer(&self) -> bool {
-        false
-    }
-}
-
-/// Returns the first boundary after or at `from` in text direction.
-/// The start and end of the file are the chars `'\0'`.
-fn try_find_boundary(
-    map: &DisplaySnapshot,
-    from: Offset,
-    is_boundary: impl Fn(char, char) -> bool,
-) -> Option<Offset> {
-    let boundary = try_find_boundary_data(map, from, |left, right, point| {
-        if is_boundary(left, right) {
-            Some(point)
-        } else {
-            None
-        }
-    })?;
-    Some(boundary)
-}
-
-/// Returns some information about it (of type `T`) as soon as
-/// there is a boundary after or at `from` in text direction
-/// The start and end of the file are the chars `'\0'`.
-fn try_find_boundary_data<T>(
-    map: &DisplaySnapshot,
-    mut from: Offset,
-    boundary_information: impl Fn(char, char, Offset) -> Option<T>,
-) -> Option<T> {
-    let mut prev_ch = map
-        .buffer_snapshot()
-        .reversed_chars_at(from.0)
-        .next()
-        .unwrap_or('\0');
-
-    for ch in map.buffer_snapshot().chars_at(from.0).chain(['\0']) {
-        if let Some(boundary_information) = boundary_information(prev_ch, ch, from) {
-            return Some(boundary_information);
-        }
-        from.0 += ch.len_utf8();
-        prev_ch = ch;
-    }
-
-    None
-}
-
-/// Returns the first boundary after or at `from` in text direction.
-/// The start and end of the file are the chars `'\0'`.
-fn try_find_preceding_boundary(
-    map: &DisplaySnapshot,
-    from: Offset,
-    is_boundary: impl Fn(char, char) -> bool,
-) -> Option<Offset> {
-    let boundary = try_find_preceding_boundary_data(map, from, |left, right, point| {
-        if is_boundary(left, right) {
-            Some(point)
-        } else {
-            None
-        }
-    })?;
-    Some(boundary)
-}
-
-/// Returns some information about it (of type `T`) as soon as
-/// there is a boundary before or at `from` in opposite text direction
-/// The start and end of the file are the chars `'\0'`.
-fn try_find_preceding_boundary_data<T>(
-    map: &DisplaySnapshot,
-    mut from: Offset,
-    is_boundary: impl Fn(char, char, Offset) -> Option<T>,
-) -> Option<T> {
-    let mut prev_ch = map
-        .buffer_snapshot()
-        .chars_at(from.0)
-        .next()
-        .unwrap_or('\0');
-
-    for ch in map
-        .buffer_snapshot()
-        .reversed_chars_at(from.0)
-        .chain(['\0'])
-    {
-        if let Some(boundary_information) = is_boundary(ch, prev_ch, from) {
-            return Some(boundary_information);
-        }
-        from.0.0 = from.0.0.saturating_sub(ch.len_utf8());
-        prev_ch = ch;
-    }
-
-    None
-}
-
-fn is_buffer_start(left: char) -> bool {
-    left == '\0'
-}
-
-fn is_buffer_end(right: char) -> bool {
-    right == '\0'
-}
-
-fn is_word_start(left: char, right: char, classifier: &CharClassifier) -> bool {
-    classifier.kind(left) != classifier.kind(right)
-        && classifier.kind(right) != CharKind::Whitespace
-}
-
-fn is_word_end(left: char, right: char, classifier: &CharClassifier) -> bool {
-    classifier.kind(left) != classifier.kind(right) && classifier.kind(left) != CharKind::Whitespace
-}
-
-fn is_sentence_end(left: char, right: char, classifier: &CharClassifier) -> bool {
-    const ENDS: [char; 1] = ['.'];
-
-    if classifier.kind(right) != CharKind::Whitespace {
-        return false;
-    }
-    ENDS.into_iter().any(|end| left == end)
-}
diff --git a/crates/vim/src/helix/duplicate.rs b/crates/vim/src/helix/duplicate.rs
deleted file mode 100644
index 37796c57aa..0000000000
--- a/crates/vim/src/helix/duplicate.rs
+++ /dev/null
@@ -1,234 +0,0 @@
-use std::ops::Range;
-
-use editor::{DisplayPoint, MultiBufferOffset, display_map::DisplaySnapshot};
-use gpui::Context;
-use text::Bias;
-use ui::Window;
-
-use crate::Vim;
-
-impl Vim {
-    /// Creates a duplicate of every selection below it in the first place that has both its start
-    /// and end
-    pub(super) fn helix_duplicate_selections_below(
-        &mut self,
-        times: Option<usize>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.duplicate_selections(
-            times,
-            window,
-            cx,
-            |prev_point| *prev_point.row_mut() += 1,
-            |prev_range, map| prev_range.end.row() >= map.max_point().row(),
-            false,
-        );
-    }
-
-    /// Creates a duplicate of every selection above it in the first place that has both its start
-    /// and end
-    pub(super) fn helix_duplicate_selections_above(
-        &mut self,
-        times: Option<usize>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.duplicate_selections(
-            times,
-            window,
-            cx,
-            |prev_point| *prev_point.row_mut() = prev_point.row().0.saturating_sub(1),
-            |prev_range, _| prev_range.start.row() == DisplayPoint::zero().row(),
-            true,
-        );
-    }
-
-    fn duplicate_selections(
-        &mut self,
-        times: Option<usize>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-        advance_search: impl Fn(&mut DisplayPoint),
-        end_search: impl Fn(&Range<DisplayPoint>, &DisplaySnapshot) -> bool,
-        above: bool,
-    ) {
-        let times = times.unwrap_or(1);
-        self.update_editor(cx, |_, editor, cx| {
-            let mut selections = Vec::new();
-            let map = editor.display_snapshot(cx);
-            let mut original_selections = editor.selections.all_display(&map);
-            // The order matters, because it is recorded when the selections are added.
-            if above {
-                original_selections.reverse();
-            }
-
-            for origin in original_selections {
-                let origin = origin.tail()..origin.head();
-                selections.push(display_point_range_to_offset_range(&origin, &map));
-                let mut last_origin = origin;
-                for _ in 1..=times {
-                    if let Some(duplicate) = find_next_valid_duplicate_space(
-                        last_origin.clone(),
-                        &map,
-                        &advance_search,
-                        &end_search,
-                    ) {
-                        selections.push(display_point_range_to_offset_range(&duplicate, &map));
-                        last_origin = duplicate;
-                    } else {
-                        break;
-                    }
-                }
-            }
-
-            editor.change_selections(Default::default(), window, cx, |s| {
-                s.select_ranges(selections);
-            });
-        });
-    }
-}
-
-fn find_next_valid_duplicate_space(
-    mut origin: Range<DisplayPoint>,
-    map: &DisplaySnapshot,
-    advance_search: &impl Fn(&mut DisplayPoint),
-    end_search: &impl Fn(&Range<DisplayPoint>, &DisplaySnapshot) -> bool,
-) -> Option<Range<DisplayPoint>> {
-    while !end_search(&origin, map) {
-        advance_search(&mut origin.start);
-        advance_search(&mut origin.end);
-
-        if map.clip_point(origin.start, Bias::Left) == origin.start
-            && map.clip_point(origin.end, Bias::Right) == origin.end
-        {
-            return Some(origin);
-        }
-    }
-    None
-}
-
-fn display_point_range_to_offset_range(
-    range: &Range<DisplayPoint>,
-    map: &DisplaySnapshot,
-) -> Range<MultiBufferOffset> {
-    range.start.to_offset(map, Bias::Left)..range.end.to_offset(map, Bias::Right)
-}
-
-#[cfg(test)]
-mod tests {
-    use db::indoc;
-
-    use crate::{state::Mode, test::VimTestContext};
-
-    #[gpui::test]
-    async fn test_selection_duplication(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-        cx.enable_helix();
-
-        cx.set_state(
-            indoc! {"
-            The quick brown
-            fox «jumpsˇ»
-            over the
-            lazy dog."},
-            Mode::HelixNormal,
-        );
-
-        cx.simulate_keystrokes("C");
-
-        cx.assert_state(
-            indoc! {"
-            The quick brown
-            fox «jumpsˇ»
-            over the
-            lazy« dog.ˇ»"},
-            Mode::HelixNormal,
-        );
-
-        cx.simulate_keystrokes("C");
-
-        cx.assert_state(
-            indoc! {"
-            The quick brown
-            fox «jumpsˇ»
-            over the
-            lazy« dog.ˇ»"},
-            Mode::HelixNormal,
-        );
-
-        cx.simulate_keystrokes("alt-C");
-
-        cx.assert_state(
-            indoc! {"
-            The «quickˇ» brown
-            fox «jumpsˇ»
-            over the
-            lazy« dog.ˇ»"},
-            Mode::HelixNormal,
-        );
-
-        cx.simulate_keystrokes(",");
-
-        cx.assert_state(
-            indoc! {"
-            The «quickˇ» brown
-            fox jumps
-            over the
-            lazy dog."},
-            Mode::HelixNormal,
-        );
-    }
-
-    #[gpui::test]
-    async fn test_selection_duplication_backwards(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-        cx.enable_helix();
-
-        cx.set_state(
-            indoc! {"
-            The quick brown
-            «ˇfox» jumps
-            over the
-            lazy dog."},
-            Mode::HelixNormal,
-        );
-
-        cx.simulate_keystrokes("C C alt-C");
-
-        cx.assert_state(
-            indoc! {"
-            «ˇThe» quick brown
-            «ˇfox» jumps
-            «ˇove»r the
-            «ˇlaz»y dog."},
-            Mode::HelixNormal,
-        );
-    }
-
-    #[gpui::test]
-    async fn test_selection_duplication_count(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-        cx.enable_helix();
-
-        cx.set_state(
-            indoc! {"
-            The «qˇ»uick brown
-            fox jumps
-            over the
-            lazy dog."},
-            Mode::HelixNormal,
-        );
-
-        cx.simulate_keystrokes("9 C");
-
-        cx.assert_state(
-            indoc! {"
-            The «qˇ»uick brown
-            fox «jˇ»umps
-            over« ˇ»the
-            lazy« ˇ»dog."},
-            Mode::HelixNormal,
-        );
-    }
-}
diff --git a/crates/vim/src/helix/object.rs b/crates/vim/src/helix/object.rs
deleted file mode 100644
index 798cd7162e..0000000000
--- a/crates/vim/src/helix/object.rs
+++ /dev/null
@@ -1,182 +0,0 @@
-use std::{
-    error::Error,
-    fmt::{self, Display},
-    ops::Range,
-};
-
-use editor::{DisplayPoint, display_map::DisplaySnapshot, movement};
-use text::Selection;
-
-use crate::{
-    helix::boundary::{FuzzyBoundary, ImmediateBoundary},
-    object::Object as VimObject,
-};
-
-/// A text object from helix or an extra one
-pub trait HelixTextObject {
-    fn range(
-        &self,
-        map: &DisplaySnapshot,
-        relative_to: Range<DisplayPoint>,
-        around: bool,
-    ) -> Option<Range<DisplayPoint>>;
-
-    fn next_range(
-        &self,
-        map: &DisplaySnapshot,
-        relative_to: Range<DisplayPoint>,
-        around: bool,
-    ) -> Option<Range<DisplayPoint>>;
-
-    fn previous_range(
-        &self,
-        map: &DisplaySnapshot,
-        relative_to: Range<DisplayPoint>,
-        around: bool,
-    ) -> Option<Range<DisplayPoint>>;
-}
-
-impl VimObject {
-    /// Returns the range of the object the cursor is over.
-    /// Follows helix convention.
-    pub fn helix_range(
-        self,
-        map: &DisplaySnapshot,
-        selection: Selection<DisplayPoint>,
-        around: bool,
-    ) -> Result<Option<Range<DisplayPoint>>, VimToHelixError> {
-        let cursor = cursor_range(&selection, map);
-        if let Some(helix_object) = self.to_helix_object() {
-            Ok(helix_object.range(map, cursor, around))
-        } else {
-            Err(VimToHelixError)
-        }
-    }
-    /// Returns the range of the next object the cursor is not over.
-    /// Follows helix convention.
-    pub fn helix_next_range(
-        self,
-        map: &DisplaySnapshot,
-        selection: Selection<DisplayPoint>,
-        around: bool,
-    ) -> Result<Option<Range<DisplayPoint>>, VimToHelixError> {
-        let cursor = cursor_range(&selection, map);
-        if let Some(helix_object) = self.to_helix_object() {
-            Ok(helix_object.next_range(map, cursor, around))
-        } else {
-            Err(VimToHelixError)
-        }
-    }
-    /// Returns the range of the previous object the cursor is not over.
-    /// Follows helix convention.
-    pub fn helix_previous_range(
-        self,
-        map: &DisplaySnapshot,
-        selection: Selection<DisplayPoint>,
-        around: bool,
-    ) -> Result<Option<Range<DisplayPoint>>, VimToHelixError> {
-        let cursor = cursor_range(&selection, map);
-        if let Some(helix_object) = self.to_helix_object() {
-            Ok(helix_object.previous_range(map, cursor, around))
-        } else {
-            Err(VimToHelixError)
-        }
-    }
-}
-
-#[derive(Debug)]
-pub struct VimToHelixError;
-impl Display for VimToHelixError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(
-            f,
-            "Not all vim text objects have an implemented helix equivalent"
-        )
-    }
-}
-impl Error for VimToHelixError {}
-
-impl VimObject {
-    fn to_helix_object(self) -> Option<Box<dyn HelixTextObject>> {
-        Some(match self {
-            Self::AngleBrackets => Box::new(ImmediateBoundary::AngleBrackets),
-            Self::BackQuotes => Box::new(ImmediateBoundary::BackQuotes),
-            Self::CurlyBrackets => Box::new(ImmediateBoundary::CurlyBrackets),
-            Self::DoubleQuotes => Box::new(ImmediateBoundary::DoubleQuotes),
-            Self::Paragraph => Box::new(FuzzyBoundary::Paragraph),
-            Self::Parentheses => Box::new(ImmediateBoundary::Parentheses),
-            Self::Quotes => Box::new(ImmediateBoundary::SingleQuotes),
-            Self::Sentence => Box::new(FuzzyBoundary::Sentence),
-            Self::SquareBrackets => Box::new(ImmediateBoundary::SquareBrackets),
-            Self::Subword { ignore_punctuation } => {
-                Box::new(ImmediateBoundary::Subword { ignore_punctuation })
-            }
-            Self::VerticalBars => Box::new(ImmediateBoundary::VerticalBars),
-            Self::Word { ignore_punctuation } => {
-                Box::new(ImmediateBoundary::Word { ignore_punctuation })
-            }
-            _ => return None,
-        })
-    }
-}
-
-/// Returns the start of the cursor of a selection, whether that is collapsed or not.
-pub(crate) fn cursor_range(
-    selection: &Selection<DisplayPoint>,
-    map: &DisplaySnapshot,
-) -> Range<DisplayPoint> {
-    if selection.is_empty() | selection.reversed {
-        selection.head()..movement::right(map, selection.head())
-    } else {
-        movement::left(map, selection.head())..selection.head()
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use db::indoc;
-
-    use crate::{state::Mode, test::VimTestContext};
-
-    #[gpui::test]
-    async fn test_select_word_object(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-        let start = indoc! {"
-                The quick brˇowˇnˇ
-                fox «ˇjumps» ov«er
-                the laˇ»zy dogˇ
-
-                "
-        };
-
-        cx.set_state(start, Mode::HelixNormal);
-
-        cx.simulate_keystrokes("m i w");
-
-        cx.assert_state(
-            indoc! {"
-            The quick «brownˇ»
-            fox «jumpsˇ» over
-            the «lazyˇ» dogˇ
-
-            "
-            },
-            Mode::HelixNormal,
-        );
-
-        cx.set_state(start, Mode::HelixNormal);
-
-        cx.simulate_keystrokes("m a w");
-
-        cx.assert_state(
-            indoc! {"
-            The quick« brownˇ»
-            fox «jumps ˇ»over
-            the «lazy ˇ»dogˇ
-
-            "
-            },
-            Mode::HelixNormal,
-        );
-    }
-}
diff --git a/crates/vim/src/helix/paste.rs b/crates/vim/src/helix/paste.rs
deleted file mode 100644
index d91b138853..0000000000
--- a/crates/vim/src/helix/paste.rs
+++ /dev/null
@@ -1,455 +0,0 @@
-use editor::{ToOffset, movement};
-use gpui::{Action, Context, Window};
-use schemars::JsonSchema;
-use serde::Deserialize;
-
-use crate::{Vim, state::Mode};
-
-/// Pastes text from the specified register at the cursor position.
-#[derive(Clone, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = vim)]
-#[serde(deny_unknown_fields)]
-pub struct HelixPaste {
-    #[serde(default)]
-    before: bool,
-}
-
-impl Vim {
-    pub fn helix_paste(
-        &mut self,
-        action: &HelixPaste,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.record_current_action(cx);
-        self.store_visual_marks(window, cx);
-        let count = Vim::take_count(cx).unwrap_or(1);
-        // TODO: vim paste calls take_forced_motion here, but I don't know what that does
-        // (none of the other helix_ methods call it)
-
-        self.update_editor(cx, |vim, editor, cx| {
-            editor.transact(window, cx, |editor, window, cx| {
-                editor.set_clip_at_line_ends(false, cx);
-
-                let selected_register = vim.selected_register.take();
-
-                let Some((text, clipboard_selections)) = Vim::update_globals(cx, |globals, cx| {
-                    globals.read_register(selected_register, Some(editor), cx)
-                })
-                .and_then(|reg| {
-                    (!reg.text.is_empty())
-                        .then_some(reg.text)
-                        .zip(reg.clipboard_selections)
-                }) else {
-                    return;
-                };
-
-                let display_map = editor.display_snapshot(cx);
-                let current_selections = editor.selections.all_adjusted_display(&display_map);
-
-                // The clipboard can have multiple selections, and there can
-                // be multiple selections. Helix zips them together, so the first
-                // clipboard entry gets pasted at the first selection, the second
-                // entry gets pasted at the second selection, and so on. If there
-                // are more clipboard selections than selections, the extra ones
-                // don't get pasted anywhere. If there are more selections than
-                // clipboard selections, the last clipboard selection gets
-                // pasted at all remaining selections.
-
-                let mut edits = Vec::new();
-                let mut new_selections = Vec::new();
-                let mut start_offset = 0;
-
-                let mut replacement_texts: Vec<String> = Vec::new();
-
-                for ix in 0..current_selections.len() {
-                    let to_insert = if let Some(clip_sel) = clipboard_selections.get(ix) {
-                        let end_offset = start_offset + clip_sel.len;
-                        let text = text[start_offset..end_offset].to_string();
-                        start_offset = end_offset + 1;
-                        text
-                    } else if let Some(last_text) = replacement_texts.last() {
-                        // We have more current selections than clipboard selections: repeat the last one.
-                        last_text.to_owned()
-                    } else {
-                        text.to_string()
-                    };
-                    replacement_texts.push(to_insert);
-                }
-
-                let line_mode = replacement_texts.iter().any(|text| text.ends_with('\n'));
-
-                for (to_insert, sel) in replacement_texts.into_iter().zip(current_selections) {
-                    // Helix doesn't care about the head/tail of the selection.
-                    // Pasting before means pasting before the whole selection.
-                    let display_point = if line_mode {
-                        if action.before {
-                            movement::line_beginning(&display_map, sel.start, false)
-                        } else {
-                            if sel.start == sel.end {
-                                movement::right(
-                                    &display_map,
-                                    movement::line_end(&display_map, sel.end, false),
-                                )
-                            } else {
-                                sel.end
-                            }
-                        }
-                    } else if action.before {
-                        sel.start
-                    } else if sel.start == sel.end {
-                        // Helix and Zed differ in how they understand
-                        // single-point cursors. In Helix, a single-point cursor
-                        // is "on top" of some character, and pasting after that
-                        // cursor means that the pasted content should go after
-                        // that character. (If the cursor is at the end of a
-                        // line, the pasted content goes on the next line.)
-                        movement::right(&display_map, sel.end)
-                    } else {
-                        sel.end
-                    };
-                    let point = display_point.to_point(&display_map);
-                    let anchor = if action.before {
-                        display_map.buffer_snapshot().anchor_after(point)
-                    } else {
-                        display_map.buffer_snapshot().anchor_before(point)
-                    };
-                    edits.push((point..point, to_insert.repeat(count)));
-                    new_selections.push((anchor, to_insert.len() * count));
-                }
-
-                editor.edit(edits, cx);
-
-                let snapshot = editor.buffer().read(cx).snapshot(cx);
-                editor.change_selections(Default::default(), window, cx, |s| {
-                    s.select_ranges(new_selections.into_iter().map(|(anchor, len)| {
-                        let offset = anchor.to_offset(&snapshot);
-                        if action.before {
-                            offset.saturating_sub_usize(len)..offset
-                        } else {
-                            offset..(offset + len)
-                        }
-                    }));
-                })
-            });
-        });
-
-        self.switch_mode(Mode::HelixNormal, true, window, cx);
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use indoc::indoc;
-
-    use crate::{state::Mode, test::VimTestContext};
-
-    #[gpui::test]
-    async fn test_paste(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-        cx.enable_helix();
-        cx.set_state(
-            indoc! {"
-            The «quiˇ»ck brown
-            fox jumps over
-            the lazy dog."},
-            Mode::HelixNormal,
-        );
-
-        cx.simulate_keystrokes("y w p");
-
-        cx.assert_state(
-            indoc! {"
-            The quick «quiˇ»brown
-            fox jumps over
-            the lazy dog."},
-            Mode::HelixNormal,
-        );
-
-        // Pasting before the selection:
-        cx.set_state(
-            indoc! {"
-            The quick brown
-            fox «jumpsˇ» over
-            the lazy dog."},
-            Mode::HelixNormal,
-        );
-        cx.simulate_keystrokes("shift-p");
-        cx.assert_state(
-            indoc! {"
-            The quick brown
-            fox «quiˇ»jumps over
-            the lazy dog."},
-            Mode::HelixNormal,
-        );
-    }
-
-    #[gpui::test]
-    async fn test_point_selection_paste(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-        cx.enable_helix();
-        cx.set_state(
-            indoc! {"
-            The quiˇck brown
-            fox jumps over
-            the lazy dog."},
-            Mode::HelixNormal,
-        );
-
-        cx.simulate_keystrokes("y");
-
-        // Pasting before the selection:
-        cx.set_state(
-            indoc! {"
-            The quick brown
-            fox jumpsˇ over
-            the lazy dog."},
-            Mode::HelixNormal,
-        );
-        cx.simulate_keystrokes("shift-p");
-        cx.assert_state(
-            indoc! {"
-            The quick brown
-            fox jumps«cˇ» over
-            the lazy dog."},
-            Mode::HelixNormal,
-        );
-
-        // Pasting after the selection:
-        cx.set_state(
-            indoc! {"
-            The quick brown
-            fox jumpsˇ over
-            the lazy dog."},
-            Mode::HelixNormal,
-        );
-        cx.simulate_keystrokes("p");
-        cx.assert_state(
-            indoc! {"
-            The quick brown
-            fox jumps «cˇ»over
-            the lazy dog."},
-            Mode::HelixNormal,
-        );
-
-        // Pasting after the selection at the end of a line:
-        cx.set_state(
-            indoc! {"
-            The quick brown
-            fox jumps overˇ
-            the lazy dog."},
-            Mode::HelixNormal,
-        );
-        cx.simulate_keystrokes("p");
-        cx.assert_state(
-            indoc! {"
-            The quick brown
-            fox jumps over
-            «cˇ»the lazy dog."},
-            Mode::HelixNormal,
-        );
-    }
-
-    #[gpui::test]
-    async fn test_multi_cursor_paste(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-        cx.enable_helix();
-        // Select two blocks of text.
-        cx.set_state(
-            indoc! {"
-            The «quiˇ»ck brown
-            fox ju«mpsˇ» over
-            the lazy dog."},
-            Mode::HelixNormal,
-        );
-        cx.simulate_keystrokes("y");
-
-        // Only one cursor: only the first block gets pasted.
-        cx.set_state(
-            indoc! {"
-            ˇThe quick brown
-            fox jumps over
-            the lazy dog."},
-            Mode::HelixNormal,
-        );
-        cx.simulate_keystrokes("shift-p");
-        cx.assert_state(
-            indoc! {"
-            «quiˇ»The quick brown
-            fox jumps over
-            the lazy dog."},
-            Mode::HelixNormal,
-        );
-
-        // Two cursors: both get pasted.
-        cx.set_state(
-            indoc! {"
-            ˇThe ˇquick brown
-            fox jumps over
-            the lazy dog."},
-            Mode::HelixNormal,
-        );
-        cx.simulate_keystrokes("shift-p");
-        cx.assert_state(
-            indoc! {"
-            «quiˇ»The «mpsˇ»quick brown
-            fox jumps over
-            the lazy dog."},
-            Mode::HelixNormal,
-        );
-
-        // Three cursors: the second yanked block is duplicated.
-        cx.set_state(
-            indoc! {"
-            ˇThe ˇquick brown
-            fox jumpsˇ over
-            the lazy dog."},
-            Mode::HelixNormal,
-        );
-        cx.simulate_keystrokes("shift-p");
-        cx.assert_state(
-            indoc! {"
-            «quiˇ»The «mpsˇ»quick brown
-            fox jumps«mpsˇ» over
-            the lazy dog."},
-            Mode::HelixNormal,
-        );
-
-        // Again with three cursors. All three should be pasted twice.
-        cx.set_state(
-            indoc! {"
-            ˇThe ˇquick brown
-            fox jumpsˇ over
-            the lazy dog."},
-            Mode::HelixNormal,
-        );
-        cx.simulate_keystrokes("2 shift-p");
-        cx.assert_state(
-            indoc! {"
-            «quiquiˇ»The «mpsmpsˇ»quick brown
-            fox jumps«mpsmpsˇ» over
-            the lazy dog."},
-            Mode::HelixNormal,
-        );
-    }
-
-    #[gpui::test]
-    async fn test_line_mode_paste(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-        cx.enable_helix();
-        cx.set_state(
-            indoc! {"
-            The quick brow«n
-            ˇ»fox jumps over
-            the lazy dog."},
-            Mode::HelixNormal,
-        );
-
-        cx.simulate_keystrokes("y shift-p");
-
-        cx.assert_state(
-            indoc! {"
-            «n
-            ˇ»The quick brown
-            fox jumps over
-            the lazy dog."},
-            Mode::HelixNormal,
-        );
-
-        // In line mode, if we're in the middle of a line then pasting before pastes on
-        // the line before.
-        cx.set_state(
-            indoc! {"
-            The quick brown
-            fox jumpsˇ over
-            the lazy dog."},
-            Mode::HelixNormal,
-        );
-        cx.simulate_keystrokes("shift-p");
-        cx.assert_state(
-            indoc! {"
-            The quick brown
-            «n
-            ˇ»fox jumps over
-            the lazy dog."},
-            Mode::HelixNormal,
-        );
-
-        // In line mode, if we're in the middle of a line then pasting after pastes on
-        // the line after.
-        cx.set_state(
-            indoc! {"
-            The quick brown
-            fox jumpsˇ over
-            the lazy dog."},
-            Mode::HelixNormal,
-        );
-        cx.simulate_keystrokes("p");
-        cx.assert_state(
-            indoc! {"
-            The quick brown
-            fox jumps over
-            «n
-            ˇ»the lazy dog."},
-            Mode::HelixNormal,
-        );
-
-        // If we're currently at the end of a line, "the line after"
-        // means right after the cursor.
-        cx.set_state(
-            indoc! {"
-            The quick brown
-            fox jumps overˇ
-            the lazy dog."},
-            Mode::HelixNormal,
-        );
-        cx.simulate_keystrokes("p");
-        cx.assert_state(
-            indoc! {"
-            The quick brown
-            fox jumps over
-            «n
-            ˇ»the lazy dog."},
-            Mode::HelixNormal,
-        );
-
-        cx.set_state(
-            indoc! {"
-
-            The quick brown
-            fox jumps overˇ
-            the lazy dog."},
-            Mode::HelixNormal,
-        );
-        cx.simulate_keystrokes("x y up up p");
-        cx.assert_state(
-            indoc! {"
-
-            «fox jumps over
-            ˇ»The quick brown
-            fox jumps over
-            the lazy dog."},
-            Mode::HelixNormal,
-        );
-
-        cx.set_state(
-            indoc! {"
-            «The quick brown
-            fox jumps over
-            ˇ»the lazy dog."},
-            Mode::HelixNormal,
-        );
-        cx.simulate_keystrokes("y p p");
-        cx.assert_state(
-            indoc! {"
-            The quick brown
-            fox jumps over
-            The quick brown
-            fox jumps over
-            «The quick brown
-            fox jumps over
-            ˇ»the lazy dog."},
-            Mode::HelixNormal,
-        );
-    }
-}
diff --git a/crates/vim/src/helix/select.rs b/crates/vim/src/helix/select.rs
deleted file mode 100644
index d782e8b450..0000000000
--- a/crates/vim/src/helix/select.rs
+++ /dev/null
@@ -1,84 +0,0 @@
-use text::SelectionGoal;
-use ui::{Context, Window};
-
-use crate::{Vim, helix::object::cursor_range, object::Object};
-
-impl Vim {
-    /// Selects the object each cursor is over.
-    /// Follows helix convention.
-    pub fn select_current_object(
-        &mut self,
-        object: Object,
-        around: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.stop_recording(cx);
-        self.update_editor(cx, |_, editor, cx| {
-            editor.change_selections(Default::default(), window, cx, |s| {
-                s.move_with(|map, selection| {
-                    let Some(range) = object
-                        .helix_range(map, selection.clone(), around)
-                        .unwrap_or({
-                            let vim_range = object.range(map, selection.clone(), around, None);
-                            vim_range.filter(|r| r.start <= cursor_range(selection, map).start)
-                        })
-                    else {
-                        return;
-                    };
-
-                    selection.set_head_tail(range.end, range.start, SelectionGoal::None);
-                });
-            });
-        });
-    }
-
-    /// Selects the next object from each cursor which the cursor is not over.
-    /// Follows helix convention.
-    pub fn select_next_object(
-        &mut self,
-        object: Object,
-        around: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.stop_recording(cx);
-        self.update_editor(cx, |_, editor, cx| {
-            editor.change_selections(Default::default(), window, cx, |s| {
-                s.move_with(|map, selection| {
-                    let Ok(Some(range)) = object.helix_next_range(map, selection.clone(), around)
-                    else {
-                        return;
-                    };
-
-                    selection.set_head_tail(range.end, range.start, SelectionGoal::None);
-                });
-            });
-        });
-    }
-
-    /// Selects the previous object from each cursor which the cursor is not over.
-    /// Follows helix convention.
-    pub fn select_previous_object(
-        &mut self,
-        object: Object,
-        around: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.stop_recording(cx);
-        self.update_editor(cx, |_, editor, cx| {
-            editor.change_selections(Default::default(), window, cx, |s| {
-                s.move_with(|map, selection| {
-                    let Ok(Some(range)) =
-                        object.helix_previous_range(map, selection.clone(), around)
-                    else {
-                        return;
-                    };
-
-                    selection.set_head_tail(range.start, range.end, SelectionGoal::None);
-                });
-            });
-        });
-    }
-}
diff --git a/crates/vim/src/indent.rs b/crates/vim/src/indent.rs
deleted file mode 100644
index 927edf4d9a..0000000000
--- a/crates/vim/src/indent.rs
+++ /dev/null
@@ -1,247 +0,0 @@
-use crate::{Vim, motion::Motion, object::Object, state::Mode};
-use collections::HashMap;
-use editor::SelectionEffects;
-use editor::{Bias, Editor, display_map::ToDisplayPoint};
-use gpui::actions;
-use gpui::{Context, Window};
-use language::SelectionGoal;
-use settings::Settings;
-use vim_mode_setting::HelixModeSetting;
-
-#[derive(PartialEq, Eq)]
-pub(crate) enum IndentDirection {
-    In,
-    Out,
-    Auto,
-}
-
-actions!(
-    vim,
-    [
-        /// Increases indentation of selected lines.
-        Indent,
-        /// Decreases indentation of selected lines.
-        Outdent,
-        /// Automatically adjusts indentation based on syntax.
-        AutoIndent
-    ]
-);
-
-pub(crate) fn register(editor: &mut Editor, cx: &mut Context<Vim>) {
-    Vim::action(editor, cx, |vim, _: &Indent, window, cx| {
-        vim.record_current_action(cx);
-        let count = Vim::take_count(cx).unwrap_or(1);
-        Vim::take_forced_motion(cx);
-        vim.store_visual_marks(window, cx);
-        vim.update_editor(cx, |vim, editor, cx| {
-            editor.transact(window, cx, |editor, window, cx| {
-                let original_positions = vim.save_selection_starts(editor, cx);
-                for _ in 0..count {
-                    editor.indent(&Default::default(), window, cx);
-                }
-                if !HelixModeSetting::get_global(cx).0 {
-                    vim.restore_selection_cursors(editor, window, cx, original_positions);
-                }
-            });
-        });
-        if vim.mode.is_visual() {
-            vim.switch_mode(Mode::Normal, true, window, cx)
-        }
-    });
-
-    Vim::action(editor, cx, |vim, _: &Outdent, window, cx| {
-        vim.record_current_action(cx);
-        let count = Vim::take_count(cx).unwrap_or(1);
-        Vim::take_forced_motion(cx);
-        vim.store_visual_marks(window, cx);
-        vim.update_editor(cx, |vim, editor, cx| {
-            editor.transact(window, cx, |editor, window, cx| {
-                let original_positions = vim.save_selection_starts(editor, cx);
-                for _ in 0..count {
-                    editor.outdent(&Default::default(), window, cx);
-                }
-                if !HelixModeSetting::get_global(cx).0 {
-                    vim.restore_selection_cursors(editor, window, cx, original_positions);
-                }
-            });
-        });
-        if vim.mode.is_visual() {
-            vim.switch_mode(Mode::Normal, true, window, cx)
-        }
-    });
-
-    Vim::action(editor, cx, |vim, _: &AutoIndent, window, cx| {
-        vim.record_current_action(cx);
-        let count = Vim::take_count(cx).unwrap_or(1);
-        Vim::take_forced_motion(cx);
-        vim.store_visual_marks(window, cx);
-        vim.update_editor(cx, |vim, editor, cx| {
-            editor.transact(window, cx, |editor, window, cx| {
-                let original_positions = vim.save_selection_starts(editor, cx);
-                for _ in 0..count {
-                    editor.autoindent(&Default::default(), window, cx);
-                }
-                vim.restore_selection_cursors(editor, window, cx, original_positions);
-            });
-        });
-        if vim.mode.is_visual() {
-            vim.switch_mode(Mode::Normal, true, window, cx)
-        }
-    });
-}
-
-impl Vim {
-    pub(crate) fn indent_motion(
-        &mut self,
-        motion: Motion,
-        times: Option<usize>,
-        forced_motion: bool,
-        dir: IndentDirection,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.stop_recording(cx);
-        self.update_editor(cx, |_, editor, cx| {
-            let text_layout_details = editor.text_layout_details(window);
-            editor.transact(window, cx, |editor, window, cx| {
-                let mut selection_starts: HashMap<_, _> = Default::default();
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.move_with(|map, selection| {
-                        let anchor = map.display_point_to_anchor(selection.head(), Bias::Right);
-                        selection_starts.insert(selection.id, anchor);
-                        motion.expand_selection(
-                            map,
-                            selection,
-                            times,
-                            &text_layout_details,
-                            forced_motion,
-                        );
-                    });
-                });
-                match dir {
-                    IndentDirection::In => editor.indent(&Default::default(), window, cx),
-                    IndentDirection::Out => editor.outdent(&Default::default(), window, cx),
-                    IndentDirection::Auto => editor.autoindent(&Default::default(), window, cx),
-                }
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.move_with(|map, selection| {
-                        let anchor = selection_starts.remove(&selection.id).unwrap();
-                        selection.collapse_to(anchor.to_display_point(map), SelectionGoal::None);
-                    });
-                });
-            });
-        });
-    }
-
-    pub(crate) fn indent_object(
-        &mut self,
-        object: Object,
-        around: bool,
-        dir: IndentDirection,
-        times: Option<usize>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.stop_recording(cx);
-        self.update_editor(cx, |_, editor, cx| {
-            editor.transact(window, cx, |editor, window, cx| {
-                let mut original_positions: HashMap<_, _> = Default::default();
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.move_with(|map, selection| {
-                        let anchor = map.display_point_to_anchor(selection.head(), Bias::Right);
-                        original_positions.insert(selection.id, anchor);
-                        object.expand_selection(map, selection, around, times);
-                    });
-                });
-                match dir {
-                    IndentDirection::In => editor.indent(&Default::default(), window, cx),
-                    IndentDirection::Out => editor.outdent(&Default::default(), window, cx),
-                    IndentDirection::Auto => editor.autoindent(&Default::default(), window, cx),
-                }
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.move_with(|map, selection| {
-                        let anchor = original_positions.remove(&selection.id).unwrap();
-                        selection.collapse_to(anchor.to_display_point(map), SelectionGoal::None);
-                    });
-                });
-            });
-        });
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use crate::{
-        state::Mode,
-        test::{NeovimBackedTestContext, VimTestContext},
-    };
-    use indoc::indoc;
-
-    #[gpui::test]
-    async fn test_indent_gv(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.set_neovim_option("shiftwidth=4").await;
-
-        cx.set_shared_state("ˇhello\nworld\n").await;
-        cx.simulate_shared_keystrokes("v j > g v").await;
-        cx.shared_state()
-            .await
-            .assert_eq("«    hello\n ˇ»   world\n");
-    }
-
-    #[gpui::test]
-    async fn test_indent_hx(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-        cx.enable_helix();
-
-        cx.set_state("«Hello\nWorldˇ»\n", Mode::HelixNormal);
-
-        cx.simulate_keystrokes(">");
-        cx.assert_state("    «Hello\n    Worldˇ»\n", Mode::HelixNormal);
-
-        cx.simulate_keystrokes("<");
-        cx.assert_state("«Hello\nWorldˇ»\n", Mode::HelixNormal);
-    }
-
-    #[gpui::test]
-    async fn test_autoindent_op(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        cx.set_state(
-            indoc!(
-                "
-            fn a() {
-                b();
-                c();
-
-                    d();
-                    ˇe();
-                    f();
-
-                g();
-            }
-        "
-            ),
-            Mode::Normal,
-        );
-
-        cx.simulate_keystrokes("= a p");
-        cx.assert_state(
-            indoc!(
-                "
-                fn a() {
-                    b();
-                    c();
-
-                    d();
-                    ˇe();
-                    f();
-
-                    g();
-                }
-            "
-            ),
-            Mode::Normal,
-        );
-    }
-}
diff --git a/crates/vim/src/insert.rs b/crates/vim/src/insert.rs
deleted file mode 100644
index d5323f31dc..0000000000
--- a/crates/vim/src/insert.rs
+++ /dev/null
@@ -1,205 +0,0 @@
-use crate::{Vim, state::Mode};
-use editor::{Bias, Editor};
-use gpui::{Action, Context, Window, actions};
-use language::SelectionGoal;
-use settings::Settings;
-use text::Point;
-use vim_mode_setting::HelixModeSetting;
-use workspace::searchable::Direction;
-
-actions!(
-    vim,
-    [
-        /// Switches to normal mode with cursor positioned before the current character.
-        NormalBefore,
-        /// Temporarily switches to normal mode for one command.
-        TemporaryNormal,
-        /// Inserts the next character from the line above into the current line.
-        InsertFromAbove,
-        /// Inserts the next character from the line below into the current line.
-        InsertFromBelow
-    ]
-);
-
-pub fn register(editor: &mut Editor, cx: &mut Context<Vim>) {
-    Vim::action(editor, cx, Vim::normal_before);
-    Vim::action(editor, cx, Vim::temporary_normal);
-    Vim::action(editor, cx, |vim, _: &InsertFromAbove, window, cx| {
-        vim.insert_around(Direction::Prev, window, cx)
-    });
-    Vim::action(editor, cx, |vim, _: &InsertFromBelow, window, cx| {
-        vim.insert_around(Direction::Next, window, cx)
-    })
-}
-
-impl Vim {
-    pub(crate) fn normal_before(
-        &mut self,
-        action: &NormalBefore,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.active_operator().is_some() {
-            self.operator_stack.clear();
-            self.sync_vim_settings(window, cx);
-            return;
-        }
-        let count = Vim::take_count(cx).unwrap_or(1);
-        Vim::take_forced_motion(cx);
-        self.stop_recording_immediately(action.boxed_clone(), cx);
-        if count <= 1 || Vim::globals(cx).dot_replaying {
-            self.create_mark("^".into(), window, cx);
-
-            if HelixModeSetting::get_global(cx).0 {
-                self.update_editor(cx, |_, editor, cx| {
-                    editor.dismiss_menus_and_popups(false, window, cx);
-                });
-                self.switch_mode(Mode::HelixNormal, false, window, cx);
-                return;
-            }
-
-            self.update_editor(cx, |_, editor, cx| {
-                editor.dismiss_menus_and_popups(false, window, cx);
-
-                editor.change_selections(Default::default(), window, cx, |s| {
-                    s.move_cursors_with(|map, mut cursor, _| {
-                        *cursor.column_mut() = cursor.column().saturating_sub(1);
-                        (map.clip_point(cursor, Bias::Left), SelectionGoal::None)
-                    });
-                });
-            });
-
-            self.switch_mode(Mode::Normal, false, window, cx);
-            return;
-        }
-
-        self.repeat(true, window, cx)
-    }
-
-    fn temporary_normal(
-        &mut self,
-        _: &TemporaryNormal,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.switch_mode(Mode::Normal, true, window, cx);
-        self.temp_mode = true;
-    }
-
-    fn insert_around(&mut self, direction: Direction, _: &mut Window, cx: &mut Context<Self>) {
-        self.update_editor(cx, |_, editor, cx| {
-            let snapshot = editor.buffer().read(cx).snapshot(cx);
-            let mut edits = Vec::new();
-            for selection in editor.selections.all::<Point>(&editor.display_snapshot(cx)) {
-                let point = selection.head();
-                let new_row = match direction {
-                    Direction::Next => point.row + 1,
-                    Direction::Prev if point.row > 0 => point.row - 1,
-                    _ => continue,
-                };
-                let source = snapshot.clip_point(Point::new(new_row, point.column), Bias::Left);
-                if let Some(c) = snapshot.chars_at(source).next()
-                    && c != '\n'
-                {
-                    edits.push((point..point, c.to_string()))
-                }
-            }
-
-            editor.edit(edits, cx);
-        });
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use crate::{
-        state::Mode,
-        test::{NeovimBackedTestContext, VimTestContext},
-    };
-
-    #[gpui::test]
-    async fn test_enter_and_exit_insert_mode(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-        cx.simulate_keystrokes("i");
-        assert_eq!(cx.mode(), Mode::Insert);
-        cx.simulate_keystrokes("T e s t");
-        cx.assert_editor_state("Testˇ");
-        cx.simulate_keystrokes("escape");
-        assert_eq!(cx.mode(), Mode::Normal);
-        cx.assert_editor_state("Tesˇt");
-    }
-
-    #[gpui::test]
-    async fn test_insert_with_counts(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state("ˇhello\n").await;
-        cx.simulate_shared_keystrokes("5 i - escape").await;
-        cx.shared_state().await.assert_eq("----ˇ-hello\n");
-
-        cx.set_shared_state("ˇhello\n").await;
-        cx.simulate_shared_keystrokes("5 a - escape").await;
-        cx.shared_state().await.assert_eq("h----ˇ-ello\n");
-
-        cx.simulate_shared_keystrokes("4 shift-i - escape").await;
-        cx.shared_state().await.assert_eq("---ˇ-h-----ello\n");
-
-        cx.simulate_shared_keystrokes("3 shift-a - escape").await;
-        cx.shared_state().await.assert_eq("----h-----ello--ˇ-\n");
-
-        cx.set_shared_state("ˇhello\n").await;
-        cx.simulate_shared_keystrokes("3 o o i escape").await;
-        cx.shared_state().await.assert_eq("hello\noi\noi\noˇi\n");
-
-        cx.set_shared_state("ˇhello\n").await;
-        cx.simulate_shared_keystrokes("3 shift-o o i escape").await;
-        cx.shared_state().await.assert_eq("oi\noi\noˇi\nhello\n");
-    }
-
-    #[gpui::test]
-    async fn test_insert_with_repeat(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state("ˇhello\n").await;
-        cx.simulate_shared_keystrokes("3 i - escape").await;
-        cx.shared_state().await.assert_eq("--ˇ-hello\n");
-        cx.simulate_shared_keystrokes(".").await;
-        cx.shared_state().await.assert_eq("----ˇ--hello\n");
-        cx.simulate_shared_keystrokes("2 .").await;
-        cx.shared_state().await.assert_eq("-----ˇ---hello\n");
-
-        cx.set_shared_state("ˇhello\n").await;
-        cx.simulate_shared_keystrokes("2 o k k escape").await;
-        cx.shared_state().await.assert_eq("hello\nkk\nkˇk\n");
-        cx.simulate_shared_keystrokes(".").await;
-        cx.shared_state()
-            .await
-            .assert_eq("hello\nkk\nkk\nkk\nkˇk\n");
-        cx.simulate_shared_keystrokes("1 .").await;
-        cx.shared_state()
-            .await
-            .assert_eq("hello\nkk\nkk\nkk\nkk\nkˇk\n");
-    }
-
-    #[gpui::test]
-    async fn test_insert_ctrl_r(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state("heˇllo\n").await;
-        cx.simulate_shared_keystrokes("y y i ctrl-r \"").await;
-        cx.shared_state().await.assert_eq("hehello\nˇllo\n");
-
-        cx.simulate_shared_keystrokes("ctrl-r x ctrl-r escape")
-            .await;
-        cx.shared_state().await.assert_eq("hehello\nˇllo\n");
-    }
-
-    #[gpui::test]
-    async fn test_insert_ctrl_y(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state("hello\nˇ\nworld").await;
-        cx.simulate_shared_keystrokes("i ctrl-y ctrl-e").await;
-        cx.shared_state().await.assert_eq("hello\nhoˇ\nworld");
-    }
-}
diff --git a/crates/vim/src/mode_indicator.rs b/crates/vim/src/mode_indicator.rs
deleted file mode 100644
index 42d4915fc5..0000000000
--- a/crates/vim/src/mode_indicator.rs
+++ /dev/null
@@ -1,180 +0,0 @@
-use gpui::{Context, Element, Entity, FontWeight, Render, Subscription, WeakEntity, Window, div};
-use ui::text_for_keystrokes;
-use workspace::{StatusItemView, item::ItemHandle, ui::prelude::*};
-
-use crate::{Vim, VimEvent, VimGlobals};
-
-/// The ModeIndicator displays the current mode in the status bar.
-pub struct ModeIndicator {
-    vim: Option<WeakEntity<Vim>>,
-    pending_keys: Option<String>,
-    vim_subscription: Option<Subscription>,
-}
-
-impl ModeIndicator {
-    /// Construct a new mode indicator in this window.
-    pub fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
-        cx.observe_pending_input(window, |this: &mut Self, window, cx| {
-            this.update_pending_keys(window, cx);
-            cx.notify();
-        })
-        .detach();
-
-        let handle = cx.entity();
-        let window_handle = window.window_handle();
-        cx.observe_new::<Vim>(move |_, window, cx| {
-            let Some(window) = window else {
-                return;
-            };
-            if window.window_handle() != window_handle {
-                return;
-            }
-            let vim = cx.entity();
-            handle.update(cx, |_, cx| {
-                cx.subscribe(&vim, |mode_indicator, vim, event, cx| match event {
-                    VimEvent::Focused => {
-                        mode_indicator.vim_subscription =
-                            Some(cx.observe(&vim, |_, _, cx| cx.notify()));
-                        mode_indicator.vim = Some(vim.downgrade());
-                    }
-                })
-                .detach()
-            })
-        })
-        .detach();
-
-        Self {
-            vim: None,
-            pending_keys: None,
-            vim_subscription: None,
-        }
-    }
-
-    fn update_pending_keys(&mut self, window: &mut Window, cx: &App) {
-        self.pending_keys = window
-            .pending_input_keystrokes()
-            .map(|keystrokes| text_for_keystrokes(keystrokes, cx));
-    }
-
-    fn vim(&self) -> Option<Entity<Vim>> {
-        self.vim.as_ref().and_then(|vim| vim.upgrade())
-    }
-
-    fn current_operators_description(&self, vim: Entity<Vim>, cx: &mut Context<Self>) -> String {
-        let recording = Vim::globals(cx)
-            .recording_register
-            .map(|reg| format!("recording @{reg} "))
-            .into_iter();
-
-        let vim = vim.read(cx);
-        recording
-            .chain(
-                cx.global::<VimGlobals>()
-                    .pre_count
-                    .map(|count| format!("{}", count)),
-            )
-            .chain(vim.selected_register.map(|reg| format!("\"{reg}")))
-            .chain(vim.operator_stack.iter().map(|item| item.status()))
-            .chain(
-                cx.global::<VimGlobals>()
-                    .post_count
-                    .map(|count| format!("{}", count)),
-            )
-            .collect::<Vec<_>>()
-            .join("")
-    }
-}
-
-impl Render for ModeIndicator {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let vim = self.vim();
-        let Some(vim) = vim else {
-            return div().hidden().into_any_element();
-        };
-
-        let vim_readable = vim.read(cx);
-        let status_label = vim_readable.status_label.clone();
-        let temp_mode = vim_readable.temp_mode;
-        let mode = vim_readable.mode;
-
-        let theme = cx.theme();
-        let colors = theme.colors();
-        let system_transparent = gpui::hsla(0.0, 0.0, 0.0, 0.0);
-        let vim_mode_text = colors.vim_mode_text;
-        let bg_color = match mode {
-            crate::state::Mode::Normal => colors.vim_normal_background,
-            crate::state::Mode::Insert => colors.vim_insert_background,
-            crate::state::Mode::Replace => colors.vim_replace_background,
-            crate::state::Mode::Visual => colors.vim_visual_background,
-            crate::state::Mode::VisualLine => colors.vim_visual_line_background,
-            crate::state::Mode::VisualBlock => colors.vim_visual_block_background,
-            crate::state::Mode::HelixNormal => colors.vim_helix_normal_background,
-            crate::state::Mode::HelixSelect => colors.vim_helix_select_background,
-        };
-
-        let (label, mode): (SharedString, Option<SharedString>) = if let Some(label) = status_label
-        {
-            (label, None)
-        } else {
-            let mode_str = if temp_mode {
-                format!("(insert) {}", mode)
-            } else {
-                mode.to_string()
-            };
-
-            let current_operators_description = self.current_operators_description(vim.clone(), cx);
-            let pending = self
-                .pending_keys
-                .as_ref()
-                .unwrap_or(&current_operators_description);
-            let mode = if bg_color != system_transparent {
-                mode_str.into()
-            } else {
-                format!("-- {} --", mode_str).into()
-            };
-            (pending.into(), Some(mode))
-        };
-        h_flex()
-            .gap_1()
-            .when(!label.is_empty(), |el| {
-                el.child(
-                    Label::new(label)
-                        .line_height_style(LineHeightStyle::UiLabel)
-                        .weight(FontWeight::MEDIUM),
-                )
-            })
-            .when_some(mode, |el, mode| {
-                el.child(
-                    v_flex()
-                        .when(bg_color != system_transparent, |el| el.px_2())
-                        // match with other icons at the bottom that use default buttons
-                        .h(ButtonSize::Default.rems())
-                        .justify_center()
-                        .rounded_sm()
-                        .bg(bg_color)
-                        .child(
-                            Label::new(mode)
-                                .size(LabelSize::Small)
-                                .line_height_style(LineHeightStyle::UiLabel)
-                                .weight(FontWeight::MEDIUM)
-                                .when(
-                                    bg_color != system_transparent
-                                        && vim_mode_text != system_transparent,
-                                    |el| el.color(Color::Custom(vim_mode_text)),
-                                ),
-                        ),
-                )
-            })
-            .into_any()
-    }
-}
-
-impl StatusItemView for ModeIndicator {
-    fn set_active_pane_item(
-        &mut self,
-        _active_pane_item: Option<&dyn ItemHandle>,
-        _window: &mut Window,
-        _cx: &mut Context<Self>,
-    ) {
-    }
-}
diff --git a/crates/vim/src/motion.rs b/crates/vim/src/motion.rs
deleted file mode 100644
index 6ba28a1c23..0000000000
--- a/crates/vim/src/motion.rs
+++ /dev/null
@@ -1,4484 +0,0 @@
-use editor::{
-    Anchor, Bias, BufferOffset, DisplayPoint, Editor, MultiBufferOffset, RowExt, ToOffset, ToPoint,
-    display_map::{DisplayRow, DisplaySnapshot, FoldPoint, ToDisplayPoint},
-    movement::{
-        self, FindRange, TextLayoutDetails, find_boundary, find_preceding_boundary_display_point,
-    },
-};
-use gpui::{Action, Context, Window, actions, px};
-use language::{CharKind, Point, Selection, SelectionGoal};
-use multi_buffer::MultiBufferRow;
-use schemars::JsonSchema;
-use serde::Deserialize;
-use std::ops::Range;
-use workspace::searchable::Direction;
-
-use crate::{
-    Vim,
-    normal::mark,
-    state::{Mode, Operator},
-    surrounds::SurroundsType,
-};
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub(crate) enum MotionKind {
-    Linewise,
-    Exclusive,
-    Inclusive,
-}
-
-impl MotionKind {
-    pub(crate) fn for_mode(mode: Mode) -> Self {
-        match mode {
-            Mode::VisualLine => MotionKind::Linewise,
-            _ => MotionKind::Exclusive,
-        }
-    }
-
-    pub(crate) fn linewise(&self) -> bool {
-        matches!(self, MotionKind::Linewise)
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum Motion {
-    Left,
-    WrappingLeft,
-    Down {
-        display_lines: bool,
-    },
-    Up {
-        display_lines: bool,
-    },
-    Right,
-    WrappingRight,
-    NextWordStart {
-        ignore_punctuation: bool,
-    },
-    NextWordEnd {
-        ignore_punctuation: bool,
-    },
-    PreviousWordStart {
-        ignore_punctuation: bool,
-    },
-    PreviousWordEnd {
-        ignore_punctuation: bool,
-    },
-    NextSubwordStart {
-        ignore_punctuation: bool,
-    },
-    NextSubwordEnd {
-        ignore_punctuation: bool,
-    },
-    PreviousSubwordStart {
-        ignore_punctuation: bool,
-    },
-    PreviousSubwordEnd {
-        ignore_punctuation: bool,
-    },
-    FirstNonWhitespace {
-        display_lines: bool,
-    },
-    CurrentLine,
-    StartOfLine {
-        display_lines: bool,
-    },
-    MiddleOfLine {
-        display_lines: bool,
-    },
-    EndOfLine {
-        display_lines: bool,
-    },
-    SentenceBackward,
-    SentenceForward,
-    StartOfParagraph,
-    EndOfParagraph,
-    StartOfDocument,
-    EndOfDocument,
-    Matching,
-    GoToPercentage,
-    UnmatchedForward {
-        char: char,
-    },
-    UnmatchedBackward {
-        char: char,
-    },
-    FindForward {
-        before: bool,
-        char: char,
-        mode: FindRange,
-        smartcase: bool,
-    },
-    FindBackward {
-        after: bool,
-        char: char,
-        mode: FindRange,
-        smartcase: bool,
-    },
-    Sneak {
-        first_char: char,
-        second_char: char,
-        smartcase: bool,
-    },
-    SneakBackward {
-        first_char: char,
-        second_char: char,
-        smartcase: bool,
-    },
-    RepeatFind {
-        last_find: Box<Motion>,
-    },
-    RepeatFindReversed {
-        last_find: Box<Motion>,
-    },
-    NextLineStart,
-    PreviousLineStart,
-    StartOfLineDownward,
-    EndOfLineDownward,
-    GoToColumn,
-    WindowTop,
-    WindowMiddle,
-    WindowBottom,
-    NextSectionStart,
-    NextSectionEnd,
-    PreviousSectionStart,
-    PreviousSectionEnd,
-    NextMethodStart,
-    NextMethodEnd,
-    PreviousMethodStart,
-    PreviousMethodEnd,
-    NextComment,
-    PreviousComment,
-    PreviousLesserIndent,
-    PreviousGreaterIndent,
-    PreviousSameIndent,
-    NextLesserIndent,
-    NextGreaterIndent,
-    NextSameIndent,
-
-    // we don't have a good way to run a search synchronously, so
-    // we handle search motions by running the search async and then
-    // calling back into motion with this
-    ZedSearchResult {
-        prior_selections: Vec<Range<Anchor>>,
-        new_selections: Vec<Range<Anchor>>,
-    },
-    Jump {
-        anchor: Anchor,
-        line: bool,
-    },
-}
-
-#[derive(Clone, Copy)]
-enum IndentType {
-    Lesser,
-    Greater,
-    Same,
-}
-
-/// Moves to the start of the next word.
-#[derive(Clone, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = vim)]
-#[serde(deny_unknown_fields)]
-struct NextWordStart {
-    #[serde(default)]
-    ignore_punctuation: bool,
-}
-
-/// Moves to the end of the next word.
-#[derive(Clone, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = vim)]
-#[serde(deny_unknown_fields)]
-struct NextWordEnd {
-    #[serde(default)]
-    ignore_punctuation: bool,
-}
-
-/// Moves to the start of the previous word.
-#[derive(Clone, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = vim)]
-#[serde(deny_unknown_fields)]
-struct PreviousWordStart {
-    #[serde(default)]
-    ignore_punctuation: bool,
-}
-
-/// Moves to the end of the previous word.
-#[derive(Clone, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = vim)]
-#[serde(deny_unknown_fields)]
-struct PreviousWordEnd {
-    #[serde(default)]
-    ignore_punctuation: bool,
-}
-
-/// Moves to the start of the next subword.
-#[derive(Clone, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = vim)]
-#[serde(deny_unknown_fields)]
-pub(crate) struct NextSubwordStart {
-    #[serde(default)]
-    pub(crate) ignore_punctuation: bool,
-}
-
-/// Moves to the end of the next subword.
-#[derive(Clone, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = vim)]
-#[serde(deny_unknown_fields)]
-pub(crate) struct NextSubwordEnd {
-    #[serde(default)]
-    pub(crate) ignore_punctuation: bool,
-}
-
-/// Moves to the start of the previous subword.
-#[derive(Clone, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = vim)]
-#[serde(deny_unknown_fields)]
-pub(crate) struct PreviousSubwordStart {
-    #[serde(default)]
-    pub(crate) ignore_punctuation: bool,
-}
-
-/// Moves to the end of the previous subword.
-#[derive(Clone, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = vim)]
-#[serde(deny_unknown_fields)]
-pub(crate) struct PreviousSubwordEnd {
-    #[serde(default)]
-    pub(crate) ignore_punctuation: bool,
-}
-
-/// Moves cursor up by the specified number of lines.
-#[derive(Clone, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = vim)]
-#[serde(deny_unknown_fields)]
-pub(crate) struct Up {
-    #[serde(default)]
-    pub(crate) display_lines: bool,
-}
-
-/// Moves cursor down by the specified number of lines.
-#[derive(Clone, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = vim)]
-#[serde(deny_unknown_fields)]
-pub(crate) struct Down {
-    #[serde(default)]
-    pub(crate) display_lines: bool,
-}
-
-/// Moves to the first non-whitespace character on the current line.
-#[derive(Clone, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = vim)]
-#[serde(deny_unknown_fields)]
-struct FirstNonWhitespace {
-    #[serde(default)]
-    display_lines: bool,
-}
-
-/// Moves to the end of the current line.
-#[derive(Clone, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = vim)]
-#[serde(deny_unknown_fields)]
-struct EndOfLine {
-    #[serde(default)]
-    display_lines: bool,
-}
-
-/// Moves to the start of the current line.
-#[derive(Clone, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = vim)]
-#[serde(deny_unknown_fields)]
-pub struct StartOfLine {
-    #[serde(default)]
-    pub(crate) display_lines: bool,
-}
-
-/// Moves to the middle of the current line.
-#[derive(Clone, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = vim)]
-#[serde(deny_unknown_fields)]
-struct MiddleOfLine {
-    #[serde(default)]
-    display_lines: bool,
-}
-
-/// Finds the next unmatched bracket or delimiter.
-#[derive(Clone, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = vim)]
-#[serde(deny_unknown_fields)]
-struct UnmatchedForward {
-    #[serde(default)]
-    char: char,
-}
-
-/// Finds the previous unmatched bracket or delimiter.
-#[derive(Clone, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = vim)]
-#[serde(deny_unknown_fields)]
-struct UnmatchedBackward {
-    #[serde(default)]
-    char: char,
-}
-
-actions!(
-    vim,
-    [
-        /// Moves cursor left one character.
-        Left,
-        /// Moves cursor left one character, wrapping to previous line.
-        #[action(deprecated_aliases = ["vim::Backspace"])]
-        WrappingLeft,
-        /// Moves cursor right one character.
-        Right,
-        /// Moves cursor right one character, wrapping to next line.
-        #[action(deprecated_aliases = ["vim::Space"])]
-        WrappingRight,
-        /// Selects the current line.
-        CurrentLine,
-        /// Moves to the start of the next sentence.
-        SentenceForward,
-        /// Moves to the start of the previous sentence.
-        SentenceBackward,
-        /// Moves to the start of the paragraph.
-        StartOfParagraph,
-        /// Moves to the end of the paragraph.
-        EndOfParagraph,
-        /// Moves to the start of the document.
-        StartOfDocument,
-        /// Moves to the end of the document.
-        EndOfDocument,
-        /// Moves to the matching bracket or delimiter.
-        Matching,
-        /// Goes to a percentage position in the file.
-        GoToPercentage,
-        /// Moves to the start of the next line.
-        NextLineStart,
-        /// Moves to the start of the previous line.
-        PreviousLineStart,
-        /// Moves to the start of a line downward.
-        StartOfLineDownward,
-        /// Moves to the end of a line downward.
-        EndOfLineDownward,
-        /// Goes to a specific column number.
-        GoToColumn,
-        /// Repeats the last character find.
-        RepeatFind,
-        /// Repeats the last character find in reverse.
-        RepeatFindReversed,
-        /// Moves to the top of the window.
-        WindowTop,
-        /// Moves to the middle of the window.
-        WindowMiddle,
-        /// Moves to the bottom of the window.
-        WindowBottom,
-        /// Moves to the start of the next section.
-        NextSectionStart,
-        /// Moves to the end of the next section.
-        NextSectionEnd,
-        /// Moves to the start of the previous section.
-        PreviousSectionStart,
-        /// Moves to the end of the previous section.
-        PreviousSectionEnd,
-        /// Moves to the start of the next method.
-        NextMethodStart,
-        /// Moves to the end of the next method.
-        NextMethodEnd,
-        /// Moves to the start of the previous method.
-        PreviousMethodStart,
-        /// Moves to the end of the previous method.
-        PreviousMethodEnd,
-        /// Moves to the next comment.
-        NextComment,
-        /// Moves to the previous comment.
-        PreviousComment,
-        /// Moves to the previous line with lesser indentation.
-        PreviousLesserIndent,
-        /// Moves to the previous line with greater indentation.
-        PreviousGreaterIndent,
-        /// Moves to the previous line with the same indentation.
-        PreviousSameIndent,
-        /// Moves to the next line with lesser indentation.
-        NextLesserIndent,
-        /// Moves to the next line with greater indentation.
-        NextGreaterIndent,
-        /// Moves to the next line with the same indentation.
-        NextSameIndent,
-    ]
-);
-
-pub fn register(editor: &mut Editor, cx: &mut Context<Vim>) {
-    Vim::action(editor, cx, |vim, _: &Left, window, cx| {
-        vim.motion(Motion::Left, window, cx)
-    });
-    Vim::action(editor, cx, |vim, _: &WrappingLeft, window, cx| {
-        vim.motion(Motion::WrappingLeft, window, cx)
-    });
-    Vim::action(editor, cx, |vim, action: &Down, window, cx| {
-        vim.motion(
-            Motion::Down {
-                display_lines: action.display_lines,
-            },
-            window,
-            cx,
-        )
-    });
-    Vim::action(editor, cx, |vim, action: &Up, window, cx| {
-        vim.motion(
-            Motion::Up {
-                display_lines: action.display_lines,
-            },
-            window,
-            cx,
-        )
-    });
-    Vim::action(editor, cx, |vim, _: &Right, window, cx| {
-        vim.motion(Motion::Right, window, cx)
-    });
-    Vim::action(editor, cx, |vim, _: &WrappingRight, window, cx| {
-        vim.motion(Motion::WrappingRight, window, cx)
-    });
-    Vim::action(
-        editor,
-        cx,
-        |vim, action: &FirstNonWhitespace, window, cx| {
-            vim.motion(
-                Motion::FirstNonWhitespace {
-                    display_lines: action.display_lines,
-                },
-                window,
-                cx,
-            )
-        },
-    );
-    Vim::action(editor, cx, |vim, action: &StartOfLine, window, cx| {
-        vim.motion(
-            Motion::StartOfLine {
-                display_lines: action.display_lines,
-            },
-            window,
-            cx,
-        )
-    });
-    Vim::action(editor, cx, |vim, action: &MiddleOfLine, window, cx| {
-        vim.motion(
-            Motion::MiddleOfLine {
-                display_lines: action.display_lines,
-            },
-            window,
-            cx,
-        )
-    });
-    Vim::action(editor, cx, |vim, action: &EndOfLine, window, cx| {
-        vim.motion(
-            Motion::EndOfLine {
-                display_lines: action.display_lines,
-            },
-            window,
-            cx,
-        )
-    });
-    Vim::action(editor, cx, |vim, _: &CurrentLine, window, cx| {
-        vim.motion(Motion::CurrentLine, window, cx)
-    });
-    Vim::action(editor, cx, |vim, _: &StartOfParagraph, window, cx| {
-        vim.motion(Motion::StartOfParagraph, window, cx)
-    });
-    Vim::action(editor, cx, |vim, _: &EndOfParagraph, window, cx| {
-        vim.motion(Motion::EndOfParagraph, window, cx)
-    });
-
-    Vim::action(editor, cx, |vim, _: &SentenceForward, window, cx| {
-        vim.motion(Motion::SentenceForward, window, cx)
-    });
-    Vim::action(editor, cx, |vim, _: &SentenceBackward, window, cx| {
-        vim.motion(Motion::SentenceBackward, window, cx)
-    });
-    Vim::action(editor, cx, |vim, _: &StartOfDocument, window, cx| {
-        vim.motion(Motion::StartOfDocument, window, cx)
-    });
-    Vim::action(editor, cx, |vim, _: &EndOfDocument, window, cx| {
-        vim.motion(Motion::EndOfDocument, window, cx)
-    });
-    Vim::action(editor, cx, |vim, _: &Matching, window, cx| {
-        vim.motion(Motion::Matching, window, cx)
-    });
-    Vim::action(editor, cx, |vim, _: &GoToPercentage, window, cx| {
-        vim.motion(Motion::GoToPercentage, window, cx)
-    });
-    Vim::action(
-        editor,
-        cx,
-        |vim, &UnmatchedForward { char }: &UnmatchedForward, window, cx| {
-            vim.motion(Motion::UnmatchedForward { char }, window, cx)
-        },
-    );
-    Vim::action(
-        editor,
-        cx,
-        |vim, &UnmatchedBackward { char }: &UnmatchedBackward, window, cx| {
-            vim.motion(Motion::UnmatchedBackward { char }, window, cx)
-        },
-    );
-    Vim::action(
-        editor,
-        cx,
-        |vim, &NextWordStart { ignore_punctuation }: &NextWordStart, window, cx| {
-            vim.motion(Motion::NextWordStart { ignore_punctuation }, window, cx)
-        },
-    );
-    Vim::action(
-        editor,
-        cx,
-        |vim, &NextWordEnd { ignore_punctuation }: &NextWordEnd, window, cx| {
-            vim.motion(Motion::NextWordEnd { ignore_punctuation }, window, cx)
-        },
-    );
-    Vim::action(
-        editor,
-        cx,
-        |vim, &PreviousWordStart { ignore_punctuation }: &PreviousWordStart, window, cx| {
-            vim.motion(Motion::PreviousWordStart { ignore_punctuation }, window, cx)
-        },
-    );
-    Vim::action(
-        editor,
-        cx,
-        |vim, &PreviousWordEnd { ignore_punctuation }, window, cx| {
-            vim.motion(Motion::PreviousWordEnd { ignore_punctuation }, window, cx)
-        },
-    );
-    Vim::action(
-        editor,
-        cx,
-        |vim, &NextSubwordStart { ignore_punctuation }: &NextSubwordStart, window, cx| {
-            vim.motion(Motion::NextSubwordStart { ignore_punctuation }, window, cx)
-        },
-    );
-    Vim::action(
-        editor,
-        cx,
-        |vim, &NextSubwordEnd { ignore_punctuation }: &NextSubwordEnd, window, cx| {
-            vim.motion(Motion::NextSubwordEnd { ignore_punctuation }, window, cx)
-        },
-    );
-    Vim::action(
-        editor,
-        cx,
-        |vim, &PreviousSubwordStart { ignore_punctuation }: &PreviousSubwordStart, window, cx| {
-            vim.motion(
-                Motion::PreviousSubwordStart { ignore_punctuation },
-                window,
-                cx,
-            )
-        },
-    );
-    Vim::action(
-        editor,
-        cx,
-        |vim, &PreviousSubwordEnd { ignore_punctuation }, window, cx| {
-            vim.motion(
-                Motion::PreviousSubwordEnd { ignore_punctuation },
-                window,
-                cx,
-            )
-        },
-    );
-    Vim::action(editor, cx, |vim, &NextLineStart, window, cx| {
-        vim.motion(Motion::NextLineStart, window, cx)
-    });
-    Vim::action(editor, cx, |vim, &PreviousLineStart, window, cx| {
-        vim.motion(Motion::PreviousLineStart, window, cx)
-    });
-    Vim::action(editor, cx, |vim, &StartOfLineDownward, window, cx| {
-        vim.motion(Motion::StartOfLineDownward, window, cx)
-    });
-    Vim::action(editor, cx, |vim, &EndOfLineDownward, window, cx| {
-        vim.motion(Motion::EndOfLineDownward, window, cx)
-    });
-    Vim::action(editor, cx, |vim, &GoToColumn, window, cx| {
-        vim.motion(Motion::GoToColumn, window, cx)
-    });
-
-    Vim::action(editor, cx, |vim, _: &RepeatFind, window, cx| {
-        if let Some(last_find) = Vim::globals(cx).last_find.clone().map(Box::new) {
-            vim.motion(Motion::RepeatFind { last_find }, window, cx);
-        }
-    });
-
-    Vim::action(editor, cx, |vim, _: &RepeatFindReversed, window, cx| {
-        if let Some(last_find) = Vim::globals(cx).last_find.clone().map(Box::new) {
-            vim.motion(Motion::RepeatFindReversed { last_find }, window, cx);
-        }
-    });
-    Vim::action(editor, cx, |vim, &WindowTop, window, cx| {
-        vim.motion(Motion::WindowTop, window, cx)
-    });
-    Vim::action(editor, cx, |vim, &WindowMiddle, window, cx| {
-        vim.motion(Motion::WindowMiddle, window, cx)
-    });
-    Vim::action(editor, cx, |vim, &WindowBottom, window, cx| {
-        vim.motion(Motion::WindowBottom, window, cx)
-    });
-
-    Vim::action(editor, cx, |vim, &PreviousSectionStart, window, cx| {
-        vim.motion(Motion::PreviousSectionStart, window, cx)
-    });
-    Vim::action(editor, cx, |vim, &NextSectionStart, window, cx| {
-        vim.motion(Motion::NextSectionStart, window, cx)
-    });
-    Vim::action(editor, cx, |vim, &PreviousSectionEnd, window, cx| {
-        vim.motion(Motion::PreviousSectionEnd, window, cx)
-    });
-    Vim::action(editor, cx, |vim, &NextSectionEnd, window, cx| {
-        vim.motion(Motion::NextSectionEnd, window, cx)
-    });
-    Vim::action(editor, cx, |vim, &PreviousMethodStart, window, cx| {
-        vim.motion(Motion::PreviousMethodStart, window, cx)
-    });
-    Vim::action(editor, cx, |vim, &NextMethodStart, window, cx| {
-        vim.motion(Motion::NextMethodStart, window, cx)
-    });
-    Vim::action(editor, cx, |vim, &PreviousMethodEnd, window, cx| {
-        vim.motion(Motion::PreviousMethodEnd, window, cx)
-    });
-    Vim::action(editor, cx, |vim, &NextMethodEnd, window, cx| {
-        vim.motion(Motion::NextMethodEnd, window, cx)
-    });
-    Vim::action(editor, cx, |vim, &NextComment, window, cx| {
-        vim.motion(Motion::NextComment, window, cx)
-    });
-    Vim::action(editor, cx, |vim, &PreviousComment, window, cx| {
-        vim.motion(Motion::PreviousComment, window, cx)
-    });
-    Vim::action(editor, cx, |vim, &PreviousLesserIndent, window, cx| {
-        vim.motion(Motion::PreviousLesserIndent, window, cx)
-    });
-    Vim::action(editor, cx, |vim, &PreviousGreaterIndent, window, cx| {
-        vim.motion(Motion::PreviousGreaterIndent, window, cx)
-    });
-    Vim::action(editor, cx, |vim, &PreviousSameIndent, window, cx| {
-        vim.motion(Motion::PreviousSameIndent, window, cx)
-    });
-    Vim::action(editor, cx, |vim, &NextLesserIndent, window, cx| {
-        vim.motion(Motion::NextLesserIndent, window, cx)
-    });
-    Vim::action(editor, cx, |vim, &NextGreaterIndent, window, cx| {
-        vim.motion(Motion::NextGreaterIndent, window, cx)
-    });
-    Vim::action(editor, cx, |vim, &NextSameIndent, window, cx| {
-        vim.motion(Motion::NextSameIndent, window, cx)
-    });
-}
-
-impl Vim {
-    pub(crate) fn search_motion(&mut self, m: Motion, window: &mut Window, cx: &mut Context<Self>) {
-        if let Motion::ZedSearchResult {
-            prior_selections, ..
-        } = &m
-        {
-            match self.mode {
-                Mode::Visual | Mode::VisualLine | Mode::VisualBlock => {
-                    if !prior_selections.is_empty() {
-                        self.update_editor(cx, |_, editor, cx| {
-                            editor.change_selections(Default::default(), window, cx, |s| {
-                                s.select_ranges(prior_selections.iter().cloned())
-                            })
-                        });
-                    }
-                }
-                Mode::Normal | Mode::Replace | Mode::Insert => {
-                    if self.active_operator().is_none() {
-                        return;
-                    }
-                }
-                Mode::HelixNormal | Mode::HelixSelect => {}
-            }
-        }
-
-        self.motion(m, window, cx)
-    }
-
-    pub(crate) fn motion(&mut self, motion: Motion, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(Operator::FindForward { .. })
-        | Some(Operator::Sneak { .. })
-        | Some(Operator::SneakBackward { .. })
-        | Some(Operator::FindBackward { .. }) = self.active_operator()
-        {
-            self.pop_operator(window, cx);
-        }
-
-        let count = Vim::take_count(cx);
-        let forced_motion = Vim::take_forced_motion(cx);
-        let active_operator = self.active_operator();
-        let mut waiting_operator: Option<Operator> = None;
-        match self.mode {
-            Mode::Normal | Mode::Replace | Mode::Insert => {
-                if active_operator == Some(Operator::AddSurrounds { target: None }) {
-                    waiting_operator = Some(Operator::AddSurrounds {
-                        target: Some(SurroundsType::Motion(motion)),
-                    });
-                } else {
-                    self.normal_motion(motion, active_operator, count, forced_motion, window, cx)
-                }
-            }
-            Mode::Visual | Mode::VisualLine | Mode::VisualBlock => {
-                self.visual_motion(motion, count, window, cx)
-            }
-
-            Mode::HelixNormal => self.helix_normal_motion(motion, count, window, cx),
-            Mode::HelixSelect => self.helix_select_motion(motion, count, window, cx),
-        }
-        self.clear_operator(window, cx);
-        if let Some(operator) = waiting_operator {
-            self.push_operator(operator, window, cx);
-            Vim::globals(cx).pre_count = count
-        }
-    }
-}
-
-// Motion handling is specified here:
-// https://github.com/vim/vim/blob/master/runtime/doc/motion.txt
-impl Motion {
-    fn default_kind(&self) -> MotionKind {
-        use Motion::*;
-        match self {
-            Down { .. }
-            | Up { .. }
-            | StartOfDocument
-            | EndOfDocument
-            | CurrentLine
-            | NextLineStart
-            | PreviousLineStart
-            | StartOfLineDownward
-            | WindowTop
-            | WindowMiddle
-            | WindowBottom
-            | NextSectionStart
-            | NextSectionEnd
-            | PreviousSectionStart
-            | PreviousSectionEnd
-            | NextMethodStart
-            | NextMethodEnd
-            | PreviousMethodStart
-            | PreviousMethodEnd
-            | NextComment
-            | PreviousComment
-            | PreviousLesserIndent
-            | PreviousGreaterIndent
-            | PreviousSameIndent
-            | NextLesserIndent
-            | NextGreaterIndent
-            | NextSameIndent
-            | GoToPercentage
-            | Jump { line: true, .. } => MotionKind::Linewise,
-            EndOfLine { .. }
-            | EndOfLineDownward
-            | Matching
-            | FindForward { .. }
-            | NextWordEnd { .. }
-            | PreviousWordEnd { .. }
-            | NextSubwordEnd { .. }
-            | PreviousSubwordEnd { .. } => MotionKind::Inclusive,
-            Left
-            | WrappingLeft
-            | Right
-            | WrappingRight
-            | StartOfLine { .. }
-            | StartOfParagraph
-            | EndOfParagraph
-            | SentenceBackward
-            | SentenceForward
-            | GoToColumn
-            | MiddleOfLine { .. }
-            | UnmatchedForward { .. }
-            | UnmatchedBackward { .. }
-            | NextWordStart { .. }
-            | PreviousWordStart { .. }
-            | NextSubwordStart { .. }
-            | PreviousSubwordStart { .. }
-            | FirstNonWhitespace { .. }
-            | FindBackward { .. }
-            | Sneak { .. }
-            | SneakBackward { .. }
-            | Jump { .. }
-            | ZedSearchResult { .. } => MotionKind::Exclusive,
-            RepeatFind { last_find: motion } | RepeatFindReversed { last_find: motion } => {
-                motion.default_kind()
-            }
-        }
-    }
-
-    fn skip_exclusive_special_case(&self) -> bool {
-        matches!(self, Motion::WrappingLeft | Motion::WrappingRight)
-    }
-
-    pub(crate) fn push_to_jump_list(&self) -> bool {
-        use Motion::*;
-        match self {
-            CurrentLine
-            | Down { .. }
-            | EndOfLine { .. }
-            | EndOfLineDownward
-            | FindBackward { .. }
-            | FindForward { .. }
-            | FirstNonWhitespace { .. }
-            | GoToColumn
-            | Left
-            | MiddleOfLine { .. }
-            | NextLineStart
-            | NextSubwordEnd { .. }
-            | NextSubwordStart { .. }
-            | NextWordEnd { .. }
-            | NextWordStart { .. }
-            | PreviousLineStart
-            | PreviousSubwordEnd { .. }
-            | PreviousSubwordStart { .. }
-            | PreviousWordEnd { .. }
-            | PreviousWordStart { .. }
-            | RepeatFind { .. }
-            | RepeatFindReversed { .. }
-            | Right
-            | StartOfLine { .. }
-            | StartOfLineDownward
-            | Up { .. }
-            | WrappingLeft
-            | WrappingRight => false,
-            EndOfDocument
-            | EndOfParagraph
-            | GoToPercentage
-            | Jump { .. }
-            | Matching
-            | NextComment
-            | NextGreaterIndent
-            | NextLesserIndent
-            | NextMethodEnd
-            | NextMethodStart
-            | NextSameIndent
-            | NextSectionEnd
-            | NextSectionStart
-            | PreviousComment
-            | PreviousGreaterIndent
-            | PreviousLesserIndent
-            | PreviousMethodEnd
-            | PreviousMethodStart
-            | PreviousSameIndent
-            | PreviousSectionEnd
-            | PreviousSectionStart
-            | SentenceBackward
-            | SentenceForward
-            | Sneak { .. }
-            | SneakBackward { .. }
-            | StartOfDocument
-            | StartOfParagraph
-            | UnmatchedBackward { .. }
-            | UnmatchedForward { .. }
-            | WindowBottom
-            | WindowMiddle
-            | WindowTop
-            | ZedSearchResult { .. } => true,
-        }
-    }
-
-    pub fn infallible(&self) -> bool {
-        use Motion::*;
-        match self {
-            StartOfDocument | EndOfDocument | CurrentLine => true,
-            Down { .. }
-            | Up { .. }
-            | EndOfLine { .. }
-            | MiddleOfLine { .. }
-            | Matching
-            | UnmatchedForward { .. }
-            | UnmatchedBackward { .. }
-            | FindForward { .. }
-            | RepeatFind { .. }
-            | Left
-            | WrappingLeft
-            | Right
-            | WrappingRight
-            | StartOfLine { .. }
-            | StartOfParagraph
-            | EndOfParagraph
-            | SentenceBackward
-            | SentenceForward
-            | StartOfLineDownward
-            | EndOfLineDownward
-            | GoToColumn
-            | GoToPercentage
-            | NextWordStart { .. }
-            | NextWordEnd { .. }
-            | PreviousWordStart { .. }
-            | PreviousWordEnd { .. }
-            | NextSubwordStart { .. }
-            | NextSubwordEnd { .. }
-            | PreviousSubwordStart { .. }
-            | PreviousSubwordEnd { .. }
-            | FirstNonWhitespace { .. }
-            | FindBackward { .. }
-            | Sneak { .. }
-            | SneakBackward { .. }
-            | RepeatFindReversed { .. }
-            | WindowTop
-            | WindowMiddle
-            | WindowBottom
-            | NextLineStart
-            | PreviousLineStart
-            | ZedSearchResult { .. }
-            | NextSectionStart
-            | NextSectionEnd
-            | PreviousSectionStart
-            | PreviousSectionEnd
-            | NextMethodStart
-            | NextMethodEnd
-            | PreviousMethodStart
-            | PreviousMethodEnd
-            | NextComment
-            | PreviousComment
-            | PreviousLesserIndent
-            | PreviousGreaterIndent
-            | PreviousSameIndent
-            | NextLesserIndent
-            | NextGreaterIndent
-            | NextSameIndent
-            | Jump { .. } => false,
-        }
-    }
-
-    pub fn move_point(
-        &self,
-        map: &DisplaySnapshot,
-        point: DisplayPoint,
-        goal: SelectionGoal,
-        maybe_times: Option<usize>,
-        text_layout_details: &TextLayoutDetails,
-    ) -> Option<(DisplayPoint, SelectionGoal)> {
-        let times = maybe_times.unwrap_or(1);
-        use Motion::*;
-        let infallible = self.infallible();
-        let (new_point, goal) = match self {
-            Left => (left(map, point, times), SelectionGoal::None),
-            WrappingLeft => (wrapping_left(map, point, times), SelectionGoal::None),
-            Down {
-                display_lines: false,
-            } => up_down_buffer_rows(map, point, goal, times as isize, text_layout_details),
-            Down {
-                display_lines: true,
-            } => down_display(map, point, goal, times, text_layout_details),
-            Up {
-                display_lines: false,
-            } => up_down_buffer_rows(map, point, goal, 0 - times as isize, text_layout_details),
-            Up {
-                display_lines: true,
-            } => up_display(map, point, goal, times, text_layout_details),
-            Right => (right(map, point, times), SelectionGoal::None),
-            WrappingRight => (wrapping_right(map, point, times), SelectionGoal::None),
-            NextWordStart { ignore_punctuation } => (
-                next_word_start(map, point, *ignore_punctuation, times),
-                SelectionGoal::None,
-            ),
-            NextWordEnd { ignore_punctuation } => (
-                next_word_end(map, point, *ignore_punctuation, times, true, true),
-                SelectionGoal::None,
-            ),
-            PreviousWordStart { ignore_punctuation } => (
-                previous_word_start(map, point, *ignore_punctuation, times),
-                SelectionGoal::None,
-            ),
-            PreviousWordEnd { ignore_punctuation } => (
-                previous_word_end(map, point, *ignore_punctuation, times),
-                SelectionGoal::None,
-            ),
-            NextSubwordStart { ignore_punctuation } => (
-                next_subword_start(map, point, *ignore_punctuation, times),
-                SelectionGoal::None,
-            ),
-            NextSubwordEnd { ignore_punctuation } => (
-                next_subword_end(map, point, *ignore_punctuation, times, true),
-                SelectionGoal::None,
-            ),
-            PreviousSubwordStart { ignore_punctuation } => (
-                previous_subword_start(map, point, *ignore_punctuation, times),
-                SelectionGoal::None,
-            ),
-            PreviousSubwordEnd { ignore_punctuation } => (
-                previous_subword_end(map, point, *ignore_punctuation, times),
-                SelectionGoal::None,
-            ),
-            FirstNonWhitespace { display_lines } => (
-                first_non_whitespace(map, *display_lines, point),
-                SelectionGoal::None,
-            ),
-            StartOfLine { display_lines } => (
-                start_of_line(map, *display_lines, point),
-                SelectionGoal::None,
-            ),
-            MiddleOfLine { display_lines } => (
-                middle_of_line(map, *display_lines, point, maybe_times),
-                SelectionGoal::None,
-            ),
-            EndOfLine { display_lines } => (
-                end_of_line(map, *display_lines, point, times),
-                SelectionGoal::None,
-            ),
-            SentenceBackward => (sentence_backwards(map, point, times), SelectionGoal::None),
-            SentenceForward => (sentence_forwards(map, point, times), SelectionGoal::None),
-            StartOfParagraph => (
-                movement::start_of_paragraph(map, point, times),
-                SelectionGoal::None,
-            ),
-            EndOfParagraph => (
-                map.clip_at_line_end(movement::end_of_paragraph(map, point, times)),
-                SelectionGoal::None,
-            ),
-            CurrentLine => (next_line_end(map, point, times), SelectionGoal::None),
-            StartOfDocument => (
-                start_of_document(map, point, maybe_times),
-                SelectionGoal::None,
-            ),
-            EndOfDocument => (
-                end_of_document(map, point, maybe_times),
-                SelectionGoal::None,
-            ),
-            Matching => (matching(map, point), SelectionGoal::None),
-            GoToPercentage => (go_to_percentage(map, point, times), SelectionGoal::None),
-            UnmatchedForward { char } => (
-                unmatched_forward(map, point, *char, times),
-                SelectionGoal::None,
-            ),
-            UnmatchedBackward { char } => (
-                unmatched_backward(map, point, *char, times),
-                SelectionGoal::None,
-            ),
-            // t f
-            FindForward {
-                before,
-                char,
-                mode,
-                smartcase,
-            } => {
-                return find_forward(map, point, *before, *char, times, *mode, *smartcase)
-                    .map(|new_point| (new_point, SelectionGoal::None));
-            }
-            // T F
-            FindBackward {
-                after,
-                char,
-                mode,
-                smartcase,
-            } => (
-                find_backward(map, point, *after, *char, times, *mode, *smartcase),
-                SelectionGoal::None,
-            ),
-            Sneak {
-                first_char,
-                second_char,
-                smartcase,
-            } => {
-                return sneak(map, point, *first_char, *second_char, times, *smartcase)
-                    .map(|new_point| (new_point, SelectionGoal::None));
-            }
-            SneakBackward {
-                first_char,
-                second_char,
-                smartcase,
-            } => {
-                return sneak_backward(map, point, *first_char, *second_char, times, *smartcase)
-                    .map(|new_point| (new_point, SelectionGoal::None));
-            }
-            // ; -- repeat the last find done with t, f, T, F
-            RepeatFind { last_find } => match **last_find {
-                Motion::FindForward {
-                    before,
-                    char,
-                    mode,
-                    smartcase,
-                } => {
-                    let mut new_point =
-                        find_forward(map, point, before, char, times, mode, smartcase);
-                    if new_point == Some(point) {
-                        new_point =
-                            find_forward(map, point, before, char, times + 1, mode, smartcase);
-                    }
-
-                    return new_point.map(|new_point| (new_point, SelectionGoal::None));
-                }
-
-                Motion::FindBackward {
-                    after,
-                    char,
-                    mode,
-                    smartcase,
-                } => {
-                    let mut new_point =
-                        find_backward(map, point, after, char, times, mode, smartcase);
-                    if new_point == point {
-                        new_point =
-                            find_backward(map, point, after, char, times + 1, mode, smartcase);
-                    }
-
-                    (new_point, SelectionGoal::None)
-                }
-                Motion::Sneak {
-                    first_char,
-                    second_char,
-                    smartcase,
-                } => {
-                    let mut new_point =
-                        sneak(map, point, first_char, second_char, times, smartcase);
-                    if new_point == Some(point) {
-                        new_point =
-                            sneak(map, point, first_char, second_char, times + 1, smartcase);
-                    }
-
-                    return new_point.map(|new_point| (new_point, SelectionGoal::None));
-                }
-
-                Motion::SneakBackward {
-                    first_char,
-                    second_char,
-                    smartcase,
-                } => {
-                    let mut new_point =
-                        sneak_backward(map, point, first_char, second_char, times, smartcase);
-                    if new_point == Some(point) {
-                        new_point = sneak_backward(
-                            map,
-                            point,
-                            first_char,
-                            second_char,
-                            times + 1,
-                            smartcase,
-                        );
-                    }
-
-                    return new_point.map(|new_point| (new_point, SelectionGoal::None));
-                }
-                _ => return None,
-            },
-            // , -- repeat the last find done with t, f, T, F, s, S, in opposite direction
-            RepeatFindReversed { last_find } => match **last_find {
-                Motion::FindForward {
-                    before,
-                    char,
-                    mode,
-                    smartcase,
-                } => {
-                    let mut new_point =
-                        find_backward(map, point, before, char, times, mode, smartcase);
-                    if new_point == point {
-                        new_point =
-                            find_backward(map, point, before, char, times + 1, mode, smartcase);
-                    }
-
-                    (new_point, SelectionGoal::None)
-                }
-
-                Motion::FindBackward {
-                    after,
-                    char,
-                    mode,
-                    smartcase,
-                } => {
-                    let mut new_point =
-                        find_forward(map, point, after, char, times, mode, smartcase);
-                    if new_point == Some(point) {
-                        new_point =
-                            find_forward(map, point, after, char, times + 1, mode, smartcase);
-                    }
-
-                    return new_point.map(|new_point| (new_point, SelectionGoal::None));
-                }
-
-                Motion::Sneak {
-                    first_char,
-                    second_char,
-                    smartcase,
-                } => {
-                    let mut new_point =
-                        sneak_backward(map, point, first_char, second_char, times, smartcase);
-                    if new_point == Some(point) {
-                        new_point = sneak_backward(
-                            map,
-                            point,
-                            first_char,
-                            second_char,
-                            times + 1,
-                            smartcase,
-                        );
-                    }
-
-                    return new_point.map(|new_point| (new_point, SelectionGoal::None));
-                }
-
-                Motion::SneakBackward {
-                    first_char,
-                    second_char,
-                    smartcase,
-                } => {
-                    let mut new_point =
-                        sneak(map, point, first_char, second_char, times, smartcase);
-                    if new_point == Some(point) {
-                        new_point =
-                            sneak(map, point, first_char, second_char, times + 1, smartcase);
-                    }
-
-                    return new_point.map(|new_point| (new_point, SelectionGoal::None));
-                }
-                _ => return None,
-            },
-            NextLineStart => (next_line_start(map, point, times), SelectionGoal::None),
-            PreviousLineStart => (previous_line_start(map, point, times), SelectionGoal::None),
-            StartOfLineDownward => (next_line_start(map, point, times - 1), SelectionGoal::None),
-            EndOfLineDownward => (last_non_whitespace(map, point, times), SelectionGoal::None),
-            GoToColumn => (go_to_column(map, point, times), SelectionGoal::None),
-            WindowTop => window_top(map, point, text_layout_details, times - 1),
-            WindowMiddle => window_middle(map, point, text_layout_details),
-            WindowBottom => window_bottom(map, point, text_layout_details, times - 1),
-            Jump { line, anchor } => mark::jump_motion(map, *anchor, *line),
-            ZedSearchResult { new_selections, .. } => {
-                // There will be only one selection, as
-                // Search::SelectNextMatch selects a single match.
-                if let Some(new_selection) = new_selections.first() {
-                    (
-                        new_selection.start.to_display_point(map),
-                        SelectionGoal::None,
-                    )
-                } else {
-                    return None;
-                }
-            }
-            NextSectionStart => (
-                section_motion(map, point, times, Direction::Next, true),
-                SelectionGoal::None,
-            ),
-            NextSectionEnd => (
-                section_motion(map, point, times, Direction::Next, false),
-                SelectionGoal::None,
-            ),
-            PreviousSectionStart => (
-                section_motion(map, point, times, Direction::Prev, true),
-                SelectionGoal::None,
-            ),
-            PreviousSectionEnd => (
-                section_motion(map, point, times, Direction::Prev, false),
-                SelectionGoal::None,
-            ),
-
-            NextMethodStart => (
-                method_motion(map, point, times, Direction::Next, true),
-                SelectionGoal::None,
-            ),
-            NextMethodEnd => (
-                method_motion(map, point, times, Direction::Next, false),
-                SelectionGoal::None,
-            ),
-            PreviousMethodStart => (
-                method_motion(map, point, times, Direction::Prev, true),
-                SelectionGoal::None,
-            ),
-            PreviousMethodEnd => (
-                method_motion(map, point, times, Direction::Prev, false),
-                SelectionGoal::None,
-            ),
-            NextComment => (
-                comment_motion(map, point, times, Direction::Next),
-                SelectionGoal::None,
-            ),
-            PreviousComment => (
-                comment_motion(map, point, times, Direction::Prev),
-                SelectionGoal::None,
-            ),
-            PreviousLesserIndent => (
-                indent_motion(map, point, times, Direction::Prev, IndentType::Lesser),
-                SelectionGoal::None,
-            ),
-            PreviousGreaterIndent => (
-                indent_motion(map, point, times, Direction::Prev, IndentType::Greater),
-                SelectionGoal::None,
-            ),
-            PreviousSameIndent => (
-                indent_motion(map, point, times, Direction::Prev, IndentType::Same),
-                SelectionGoal::None,
-            ),
-            NextLesserIndent => (
-                indent_motion(map, point, times, Direction::Next, IndentType::Lesser),
-                SelectionGoal::None,
-            ),
-            NextGreaterIndent => (
-                indent_motion(map, point, times, Direction::Next, IndentType::Greater),
-                SelectionGoal::None,
-            ),
-            NextSameIndent => (
-                indent_motion(map, point, times, Direction::Next, IndentType::Same),
-                SelectionGoal::None,
-            ),
-        };
-        (new_point != point || infallible).then_some((new_point, goal))
-    }
-
-    // Get the range value after self is applied to the specified selection.
-    pub fn range(
-        &self,
-        map: &DisplaySnapshot,
-        mut selection: Selection<DisplayPoint>,
-        times: Option<usize>,
-        text_layout_details: &TextLayoutDetails,
-        forced_motion: bool,
-    ) -> Option<(Range<DisplayPoint>, MotionKind)> {
-        if let Motion::ZedSearchResult {
-            prior_selections,
-            new_selections,
-        } = self
-        {
-            if let Some((prior_selection, new_selection)) =
-                prior_selections.first().zip(new_selections.first())
-            {
-                let start = prior_selection
-                    .start
-                    .to_display_point(map)
-                    .min(new_selection.start.to_display_point(map));
-                let end = new_selection
-                    .end
-                    .to_display_point(map)
-                    .max(prior_selection.end.to_display_point(map));
-
-                if start < end {
-                    return Some((start..end, MotionKind::Exclusive));
-                } else {
-                    return Some((end..start, MotionKind::Exclusive));
-                }
-            } else {
-                return None;
-            }
-        }
-        let maybe_new_point = self.move_point(
-            map,
-            selection.head(),
-            selection.goal,
-            times,
-            text_layout_details,
-        );
-
-        let (new_head, goal) = match (maybe_new_point, forced_motion) {
-            (Some((p, g)), _) => Some((p, g)),
-            (None, false) => None,
-            (None, true) => Some((selection.head(), selection.goal)),
-        }?;
-
-        selection.set_head(new_head, goal);
-
-        let mut kind = match (self.default_kind(), forced_motion) {
-            (MotionKind::Linewise, true) => MotionKind::Exclusive,
-            (MotionKind::Exclusive, true) => MotionKind::Inclusive,
-            (MotionKind::Inclusive, true) => MotionKind::Exclusive,
-            (kind, false) => kind,
-        };
-
-        if let Motion::NextWordStart {
-            ignore_punctuation: _,
-        } = self
-        {
-            // Another special case: When using the "w" motion in combination with an
-            // operator and the last word moved over is at the end of a line, the end of
-            // that word becomes the end of the operated text, not the first word in the
-            // next line.
-            let start = selection.start.to_point(map);
-            let end = selection.end.to_point(map);
-            let start_row = MultiBufferRow(selection.start.to_point(map).row);
-            if end.row > start.row {
-                selection.end = Point::new(start_row.0, map.buffer_snapshot().line_len(start_row))
-                    .to_display_point(map);
-
-                // a bit of a hack, we need `cw` on a blank line to not delete the newline,
-                // but dw on a blank line should. The `Linewise` returned from this method
-                // causes the `d` operator to include the trailing newline.
-                if selection.start == selection.end {
-                    return Some((selection.start..selection.end, MotionKind::Linewise));
-                }
-            }
-        } else if kind == MotionKind::Exclusive && !self.skip_exclusive_special_case() {
-            let start_point = selection.start.to_point(map);
-            let mut end_point = selection.end.to_point(map);
-            let mut next_point = selection.end;
-            *next_point.column_mut() += 1;
-            next_point = map.clip_point(next_point, Bias::Right);
-            if next_point.to_point(map) == end_point && forced_motion {
-                selection.end = movement::saturating_left(map, selection.end);
-            }
-
-            if end_point.row > start_point.row {
-                let first_non_blank_of_start_row = map
-                    .line_indent_for_buffer_row(MultiBufferRow(start_point.row))
-                    .raw_len();
-                // https://github.com/neovim/neovim/blob/ee143aaf65a0e662c42c636aa4a959682858b3e7/src/nvim/ops.c#L6178-L6203
-                if end_point.column == 0 {
-                    // If the motion is exclusive and the end of the motion is in column 1, the
-                    // end of the motion is moved to the end of the previous line and the motion
-                    // becomes inclusive. Example: "}" moves to the first line after a paragraph,
-                    // but "d}" will not include that line.
-                    //
-                    // If the motion is exclusive, the end of the motion is in column 1 and the
-                    // start of the motion was at or before the first non-blank in the line, the
-                    // motion becomes linewise.  Example: If a paragraph begins with some blanks
-                    // and you do "d}" while standing on the first non-blank, all the lines of
-                    // the paragraph are deleted, including the blanks.
-                    if start_point.column <= first_non_blank_of_start_row {
-                        kind = MotionKind::Linewise;
-                    } else {
-                        kind = MotionKind::Inclusive;
-                    }
-                    end_point.row -= 1;
-                    end_point.column = 0;
-                    selection.end = map.clip_point(map.next_line_boundary(end_point).1, Bias::Left);
-                } else if let Motion::EndOfParagraph = self {
-                    // Special case: When using the "}" motion, it's possible
-                    // that there's no blank lines after the paragraph the
-                    // cursor is currently on.
-                    // In this situation the `end_point.column` value will be
-                    // greater than 0, so the selection doesn't actually end on
-                    // the first character of a blank line. In that case, we'll
-                    // want to move one column to the right, to actually include
-                    // all characters of the last non-blank line.
-                    selection.end = movement::saturating_right(map, selection.end)
-                }
-            }
-        } else if kind == MotionKind::Inclusive {
-            selection.end = movement::saturating_right(map, selection.end)
-        }
-
-        if kind == MotionKind::Linewise {
-            selection.start = map.prev_line_boundary(selection.start.to_point(map)).1;
-            selection.end = map.next_line_boundary(selection.end.to_point(map)).1;
-        }
-        Some((selection.start..selection.end, kind))
-    }
-
-    // Expands a selection using self for an operator
-    pub fn expand_selection(
-        &self,
-        map: &DisplaySnapshot,
-        selection: &mut Selection<DisplayPoint>,
-        times: Option<usize>,
-        text_layout_details: &TextLayoutDetails,
-        forced_motion: bool,
-    ) -> Option<MotionKind> {
-        let (range, kind) = self.range(
-            map,
-            selection.clone(),
-            times,
-            text_layout_details,
-            forced_motion,
-        )?;
-        selection.start = range.start;
-        selection.end = range.end;
-        Some(kind)
-    }
-}
-
-fn left(map: &DisplaySnapshot, mut point: DisplayPoint, times: usize) -> DisplayPoint {
-    for _ in 0..times {
-        point = movement::saturating_left(map, point);
-        if point.column() == 0 {
-            break;
-        }
-    }
-    point
-}
-
-pub(crate) fn wrapping_left(
-    map: &DisplaySnapshot,
-    mut point: DisplayPoint,
-    times: usize,
-) -> DisplayPoint {
-    for _ in 0..times {
-        point = movement::left(map, point);
-        if point.is_zero() {
-            break;
-        }
-    }
-    point
-}
-
-fn wrapping_right(map: &DisplaySnapshot, mut point: DisplayPoint, times: usize) -> DisplayPoint {
-    for _ in 0..times {
-        point = wrapping_right_single(map, point);
-        if point == map.max_point() {
-            break;
-        }
-    }
-    point
-}
-
-fn wrapping_right_single(map: &DisplaySnapshot, point: DisplayPoint) -> DisplayPoint {
-    let mut next_point = point;
-    *next_point.column_mut() += 1;
-    next_point = map.clip_point(next_point, Bias::Right);
-    if next_point == point {
-        if next_point.row() == map.max_point().row() {
-            next_point
-        } else {
-            DisplayPoint::new(next_point.row().next_row(), 0)
-        }
-    } else {
-        next_point
-    }
-}
-
-fn up_down_buffer_rows(
-    map: &DisplaySnapshot,
-    mut point: DisplayPoint,
-    mut goal: SelectionGoal,
-    mut times: isize,
-    text_layout_details: &TextLayoutDetails,
-) -> (DisplayPoint, SelectionGoal) {
-    let bias = if times < 0 { Bias::Left } else { Bias::Right };
-
-    while map.is_folded_buffer_header(point.row()) {
-        if times < 0 {
-            (point, _) = movement::up(map, point, goal, true, text_layout_details);
-            times += 1;
-        } else if times > 0 {
-            (point, _) = movement::down(map, point, goal, true, text_layout_details);
-            times -= 1;
-        } else {
-            break;
-        }
-    }
-
-    let start = map.display_point_to_fold_point(point, Bias::Left);
-    let begin_folded_line = map.fold_point_to_display_point(
-        map.fold_snapshot()
-            .clip_point(FoldPoint::new(start.row(), 0), Bias::Left),
-    );
-    let select_nth_wrapped_row = point.row().0 - begin_folded_line.row().0;
-
-    let (goal_wrap, goal_x) = match goal {
-        SelectionGoal::WrappedHorizontalPosition((row, x)) => (row, x),
-        SelectionGoal::HorizontalRange { end, .. } => (select_nth_wrapped_row, end as f32),
-        SelectionGoal::HorizontalPosition(x) => (select_nth_wrapped_row, x as f32),
-        _ => {
-            let x = map.x_for_display_point(point, text_layout_details);
-            goal = SelectionGoal::WrappedHorizontalPosition((select_nth_wrapped_row, x.into()));
-            (select_nth_wrapped_row, x.into())
-        }
-    };
-
-    let target = start.row() as isize + times;
-    let new_row = (target.max(0) as u32).min(map.fold_snapshot().max_point().row());
-
-    let mut begin_folded_line = map.fold_point_to_display_point(
-        map.fold_snapshot()
-            .clip_point(FoldPoint::new(new_row, 0), bias),
-    );
-
-    let mut i = 0;
-    while i < goal_wrap && begin_folded_line.row() < map.max_point().row() {
-        let next_folded_line = DisplayPoint::new(begin_folded_line.row().next_row(), 0);
-        if map
-            .display_point_to_fold_point(next_folded_line, bias)
-            .row()
-            == new_row
-        {
-            i += 1;
-            begin_folded_line = next_folded_line;
-        } else {
-            break;
-        }
-    }
-
-    let new_col = if i == goal_wrap {
-        map.display_column_for_x(begin_folded_line.row(), px(goal_x), text_layout_details)
-    } else {
-        map.line_len(begin_folded_line.row())
-    };
-
-    let point = DisplayPoint::new(begin_folded_line.row(), new_col);
-    let mut clipped_point = map.clip_point(point, bias);
-
-    // When navigating vertically in vim mode with inlay hints present,
-    // we need to handle the case where clipping moves us to a different row.
-    // This can happen when moving down (Bias::Right) and hitting an inlay hint.
-    // Re-clip with opposite bias to stay on the intended line.
-    //
-    // See: https://github.com/zed-industries/zed/issues/29134
-    if clipped_point.row() > point.row() {
-        clipped_point = map.clip_point(point, Bias::Left);
-    }
-
-    (clipped_point, goal)
-}
-
-fn down_display(
-    map: &DisplaySnapshot,
-    mut point: DisplayPoint,
-    mut goal: SelectionGoal,
-    times: usize,
-    text_layout_details: &TextLayoutDetails,
-) -> (DisplayPoint, SelectionGoal) {
-    for _ in 0..times {
-        (point, goal) = movement::down(map, point, goal, true, text_layout_details);
-    }
-
-    (point, goal)
-}
-
-fn up_display(
-    map: &DisplaySnapshot,
-    mut point: DisplayPoint,
-    mut goal: SelectionGoal,
-    times: usize,
-    text_layout_details: &TextLayoutDetails,
-) -> (DisplayPoint, SelectionGoal) {
-    for _ in 0..times {
-        (point, goal) = movement::up(map, point, goal, true, text_layout_details);
-    }
-
-    (point, goal)
-}
-
-pub(crate) fn right(map: &DisplaySnapshot, mut point: DisplayPoint, times: usize) -> DisplayPoint {
-    for _ in 0..times {
-        let new_point = movement::saturating_right(map, point);
-        if point == new_point {
-            break;
-        }
-        point = new_point;
-    }
-    point
-}
-
-pub(crate) fn next_char(
-    map: &DisplaySnapshot,
-    point: DisplayPoint,
-    allow_cross_newline: bool,
-) -> DisplayPoint {
-    let mut new_point = point;
-    let mut max_column = map.line_len(new_point.row());
-    if !allow_cross_newline {
-        max_column -= 1;
-    }
-    if new_point.column() < max_column {
-        *new_point.column_mut() += 1;
-    } else if new_point < map.max_point() && allow_cross_newline {
-        *new_point.row_mut() += 1;
-        *new_point.column_mut() = 0;
-    }
-    map.clip_ignoring_line_ends(new_point, Bias::Right)
-}
-
-pub(crate) fn next_word_start(
-    map: &DisplaySnapshot,
-    mut point: DisplayPoint,
-    ignore_punctuation: bool,
-    times: usize,
-) -> DisplayPoint {
-    let classifier = map
-        .buffer_snapshot()
-        .char_classifier_at(point.to_point(map))
-        .ignore_punctuation(ignore_punctuation);
-    for _ in 0..times {
-        let mut crossed_newline = false;
-        let new_point = movement::find_boundary(map, point, FindRange::MultiLine, |left, right| {
-            let left_kind = classifier.kind(left);
-            let right_kind = classifier.kind(right);
-            let at_newline = right == '\n';
-
-            let found = (left_kind != right_kind && right_kind != CharKind::Whitespace)
-                || at_newline && crossed_newline
-                || at_newline && left == '\n'; // Prevents skipping repeated empty lines
-
-            crossed_newline |= at_newline;
-            found
-        });
-        if point == new_point {
-            break;
-        }
-        point = new_point;
-    }
-    point
-}
-
-pub(crate) fn next_word_end(
-    map: &DisplaySnapshot,
-    mut point: DisplayPoint,
-    ignore_punctuation: bool,
-    times: usize,
-    allow_cross_newline: bool,
-    always_advance: bool,
-) -> DisplayPoint {
-    let classifier = map
-        .buffer_snapshot()
-        .char_classifier_at(point.to_point(map))
-        .ignore_punctuation(ignore_punctuation);
-    for _ in 0..times {
-        let mut need_next_char = false;
-        let new_point = if always_advance {
-            next_char(map, point, allow_cross_newline)
-        } else {
-            point
-        };
-        let new_point = movement::find_boundary_exclusive(
-            map,
-            new_point,
-            FindRange::MultiLine,
-            |left, right| {
-                let left_kind = classifier.kind(left);
-                let right_kind = classifier.kind(right);
-                let at_newline = right == '\n';
-
-                if !allow_cross_newline && at_newline {
-                    need_next_char = true;
-                    return true;
-                }
-
-                left_kind != right_kind && left_kind != CharKind::Whitespace
-            },
-        );
-        let new_point = if need_next_char {
-            next_char(map, new_point, true)
-        } else {
-            new_point
-        };
-        let new_point = map.clip_point(new_point, Bias::Left);
-        if point == new_point {
-            break;
-        }
-        point = new_point;
-    }
-    point
-}
-
-fn previous_word_start(
-    map: &DisplaySnapshot,
-    mut point: DisplayPoint,
-    ignore_punctuation: bool,
-    times: usize,
-) -> DisplayPoint {
-    let classifier = map
-        .buffer_snapshot()
-        .char_classifier_at(point.to_point(map))
-        .ignore_punctuation(ignore_punctuation);
-    for _ in 0..times {
-        // This works even though find_preceding_boundary is called for every character in the line containing
-        // cursor because the newline is checked only once.
-        let new_point = movement::find_preceding_boundary_display_point(
-            map,
-            point,
-            FindRange::MultiLine,
-            |left, right| {
-                let left_kind = classifier.kind(left);
-                let right_kind = classifier.kind(right);
-
-                (left_kind != right_kind && !right.is_whitespace()) || left == '\n'
-            },
-        );
-        if point == new_point {
-            break;
-        }
-        point = new_point;
-    }
-    point
-}
-
-fn previous_word_end(
-    map: &DisplaySnapshot,
-    point: DisplayPoint,
-    ignore_punctuation: bool,
-    times: usize,
-) -> DisplayPoint {
-    let classifier = map
-        .buffer_snapshot()
-        .char_classifier_at(point.to_point(map))
-        .ignore_punctuation(ignore_punctuation);
-    let mut point = point.to_point(map);
-
-    if point.column < map.buffer_snapshot().line_len(MultiBufferRow(point.row))
-        && let Some(ch) = map.buffer_snapshot().chars_at(point).next()
-    {
-        point.column += ch.len_utf8() as u32;
-    }
-    for _ in 0..times {
-        let new_point = movement::find_preceding_boundary_point(
-            &map.buffer_snapshot(),
-            point,
-            FindRange::MultiLine,
-            |left, right| {
-                let left_kind = classifier.kind(left);
-                let right_kind = classifier.kind(right);
-                match (left_kind, right_kind) {
-                    (CharKind::Punctuation, CharKind::Whitespace)
-                    | (CharKind::Punctuation, CharKind::Word)
-                    | (CharKind::Word, CharKind::Whitespace)
-                    | (CharKind::Word, CharKind::Punctuation) => true,
-                    (CharKind::Whitespace, CharKind::Whitespace) => left == '\n' && right == '\n',
-                    _ => false,
-                }
-            },
-        );
-        if new_point == point {
-            break;
-        }
-        point = new_point;
-    }
-    movement::saturating_left(map, point.to_display_point(map))
-}
-
-fn next_subword_start(
-    map: &DisplaySnapshot,
-    mut point: DisplayPoint,
-    ignore_punctuation: bool,
-    times: usize,
-) -> DisplayPoint {
-    let classifier = map
-        .buffer_snapshot()
-        .char_classifier_at(point.to_point(map))
-        .ignore_punctuation(ignore_punctuation);
-    for _ in 0..times {
-        let mut crossed_newline = false;
-        let new_point = movement::find_boundary(map, point, FindRange::MultiLine, |left, right| {
-            let left_kind = classifier.kind(left);
-            let right_kind = classifier.kind(right);
-            let at_newline = right == '\n';
-
-            let is_word_start = (left_kind != right_kind) && !left.is_alphanumeric();
-            let is_subword_start =
-                left == '_' && right != '_' || left.is_lowercase() && right.is_uppercase();
-
-            let found = (!right.is_whitespace() && (is_word_start || is_subword_start))
-                || at_newline && crossed_newline
-                || at_newline && left == '\n'; // Prevents skipping repeated empty lines
-
-            crossed_newline |= at_newline;
-            found
-        });
-        if point == new_point {
-            break;
-        }
-        point = new_point;
-    }
-    point
-}
-
-pub(crate) fn next_subword_end(
-    map: &DisplaySnapshot,
-    mut point: DisplayPoint,
-    ignore_punctuation: bool,
-    times: usize,
-    allow_cross_newline: bool,
-) -> DisplayPoint {
-    let classifier = map
-        .buffer_snapshot()
-        .char_classifier_at(point.to_point(map))
-        .ignore_punctuation(ignore_punctuation);
-    for _ in 0..times {
-        let new_point = next_char(map, point, allow_cross_newline);
-
-        let mut crossed_newline = false;
-        let mut need_backtrack = false;
-        let new_point =
-            movement::find_boundary(map, new_point, FindRange::MultiLine, |left, right| {
-                let left_kind = classifier.kind(left);
-                let right_kind = classifier.kind(right);
-                let at_newline = right == '\n';
-
-                if !allow_cross_newline && at_newline {
-                    return true;
-                }
-
-                let is_word_end = (left_kind != right_kind) && !right.is_alphanumeric();
-                let is_subword_end =
-                    left != '_' && right == '_' || left.is_lowercase() && right.is_uppercase();
-
-                let found = !left.is_whitespace() && !at_newline && (is_word_end || is_subword_end);
-
-                if found && (is_word_end || is_subword_end) {
-                    need_backtrack = true;
-                }
-
-                crossed_newline |= at_newline;
-                found
-            });
-        let mut new_point = map.clip_point(new_point, Bias::Left);
-        if need_backtrack {
-            *new_point.column_mut() -= 1;
-        }
-        let new_point = map.clip_point(new_point, Bias::Left);
-        if point == new_point {
-            break;
-        }
-        point = new_point;
-    }
-    point
-}
-
-fn previous_subword_start(
-    map: &DisplaySnapshot,
-    mut point: DisplayPoint,
-    ignore_punctuation: bool,
-    times: usize,
-) -> DisplayPoint {
-    let classifier = map
-        .buffer_snapshot()
-        .char_classifier_at(point.to_point(map))
-        .ignore_punctuation(ignore_punctuation);
-    for _ in 0..times {
-        let mut crossed_newline = false;
-        // This works even though find_preceding_boundary is called for every character in the line containing
-        // cursor because the newline is checked only once.
-        let new_point = movement::find_preceding_boundary_display_point(
-            map,
-            point,
-            FindRange::MultiLine,
-            |left, right| {
-                let left_kind = classifier.kind(left);
-                let right_kind = classifier.kind(right);
-                let at_newline = right == '\n';
-
-                let is_word_start = (left_kind != right_kind) && !left.is_alphanumeric();
-                let is_subword_start =
-                    left == '_' && right != '_' || left.is_lowercase() && right.is_uppercase();
-
-                let found = (!right.is_whitespace() && (is_word_start || is_subword_start))
-                    || at_newline && crossed_newline
-                    || at_newline && left == '\n'; // Prevents skipping repeated empty lines
-
-                crossed_newline |= at_newline;
-
-                found
-            },
-        );
-        if point == new_point {
-            break;
-        }
-        point = new_point;
-    }
-    point
-}
-
-fn previous_subword_end(
-    map: &DisplaySnapshot,
-    point: DisplayPoint,
-    ignore_punctuation: bool,
-    times: usize,
-) -> DisplayPoint {
-    let classifier = map
-        .buffer_snapshot()
-        .char_classifier_at(point.to_point(map))
-        .ignore_punctuation(ignore_punctuation);
-    let mut point = point.to_point(map);
-
-    if point.column < map.buffer_snapshot().line_len(MultiBufferRow(point.row))
-        && let Some(ch) = map.buffer_snapshot().chars_at(point).next()
-    {
-        point.column += ch.len_utf8() as u32;
-    }
-    for _ in 0..times {
-        let new_point = movement::find_preceding_boundary_point(
-            &map.buffer_snapshot(),
-            point,
-            FindRange::MultiLine,
-            |left, right| {
-                let left_kind = classifier.kind(left);
-                let right_kind = classifier.kind(right);
-
-                let is_subword_end =
-                    left != '_' && right == '_' || left.is_lowercase() && right.is_uppercase();
-
-                if is_subword_end {
-                    return true;
-                }
-
-                match (left_kind, right_kind) {
-                    (CharKind::Word, CharKind::Whitespace)
-                    | (CharKind::Word, CharKind::Punctuation) => true,
-                    (CharKind::Whitespace, CharKind::Whitespace) => left == '\n' && right == '\n',
-                    _ => false,
-                }
-            },
-        );
-        if new_point == point {
-            break;
-        }
-        point = new_point;
-    }
-    movement::saturating_left(map, point.to_display_point(map))
-}
-
-pub(crate) fn first_non_whitespace(
-    map: &DisplaySnapshot,
-    display_lines: bool,
-    from: DisplayPoint,
-) -> DisplayPoint {
-    let mut start_offset = start_of_line(map, display_lines, from).to_offset(map, Bias::Left);
-    let classifier = map.buffer_snapshot().char_classifier_at(from.to_point(map));
-    for (ch, offset) in map.buffer_chars_at(start_offset) {
-        if ch == '\n' {
-            return from;
-        }
-
-        start_offset = offset;
-
-        if classifier.kind(ch) != CharKind::Whitespace {
-            break;
-        }
-    }
-
-    start_offset.to_display_point(map)
-}
-
-pub(crate) fn last_non_whitespace(
-    map: &DisplaySnapshot,
-    from: DisplayPoint,
-    count: usize,
-) -> DisplayPoint {
-    let mut end_of_line = end_of_line(map, false, from, count).to_offset(map, Bias::Left);
-    let classifier = map.buffer_snapshot().char_classifier_at(from.to_point(map));
-
-    // NOTE: depending on clip_at_line_end we may already be one char back from the end.
-    if let Some((ch, _)) = map.buffer_chars_at(end_of_line).next()
-        && classifier.kind(ch) != CharKind::Whitespace
-    {
-        return end_of_line.to_display_point(map);
-    }
-
-    for (ch, offset) in map.reverse_buffer_chars_at(end_of_line) {
-        if ch == '\n' {
-            break;
-        }
-        end_of_line = offset;
-        if classifier.kind(ch) != CharKind::Whitespace || ch == '\n' {
-            break;
-        }
-    }
-
-    end_of_line.to_display_point(map)
-}
-
-pub(crate) fn start_of_line(
-    map: &DisplaySnapshot,
-    display_lines: bool,
-    point: DisplayPoint,
-) -> DisplayPoint {
-    if display_lines {
-        map.clip_point(DisplayPoint::new(point.row(), 0), Bias::Right)
-    } else {
-        map.prev_line_boundary(point.to_point(map)).1
-    }
-}
-
-pub(crate) fn middle_of_line(
-    map: &DisplaySnapshot,
-    display_lines: bool,
-    point: DisplayPoint,
-    times: Option<usize>,
-) -> DisplayPoint {
-    let percent = if let Some(times) = times.filter(|&t| t <= 100) {
-        times as f64 / 100.
-    } else {
-        0.5
-    };
-    if display_lines {
-        map.clip_point(
-            DisplayPoint::new(
-                point.row(),
-                (map.line_len(point.row()) as f64 * percent) as u32,
-            ),
-            Bias::Left,
-        )
-    } else {
-        let mut buffer_point = point.to_point(map);
-        buffer_point.column = (map
-            .buffer_snapshot()
-            .line_len(MultiBufferRow(buffer_point.row)) as f64
-            * percent) as u32;
-
-        map.clip_point(buffer_point.to_display_point(map), Bias::Left)
-    }
-}
-
-pub(crate) fn end_of_line(
-    map: &DisplaySnapshot,
-    display_lines: bool,
-    mut point: DisplayPoint,
-    times: usize,
-) -> DisplayPoint {
-    if times > 1 {
-        point = map.start_of_relative_buffer_row(point, times as isize - 1);
-    }
-    if display_lines {
-        map.clip_point(
-            DisplayPoint::new(point.row(), map.line_len(point.row())),
-            Bias::Left,
-        )
-    } else {
-        map.clip_point(map.next_line_boundary(point.to_point(map)).1, Bias::Left)
-    }
-}
-
-pub(crate) fn sentence_backwards(
-    map: &DisplaySnapshot,
-    point: DisplayPoint,
-    mut times: usize,
-) -> DisplayPoint {
-    let mut start = point.to_point(map).to_offset(&map.buffer_snapshot());
-    let mut chars = map.reverse_buffer_chars_at(start).peekable();
-
-    let mut was_newline = map
-        .buffer_chars_at(start)
-        .next()
-        .is_some_and(|(c, _)| c == '\n');
-
-    while let Some((ch, offset)) = chars.next() {
-        let start_of_next_sentence = if was_newline && ch == '\n' {
-            Some(offset + ch.len_utf8())
-        } else if ch == '\n' && chars.peek().is_some_and(|(c, _)| *c == '\n') {
-            Some(next_non_blank(map, offset + ch.len_utf8()))
-        } else if ch == '.' || ch == '?' || ch == '!' {
-            start_of_next_sentence(map, offset + ch.len_utf8())
-        } else {
-            None
-        };
-
-        if let Some(start_of_next_sentence) = start_of_next_sentence {
-            if start_of_next_sentence < start {
-                times = times.saturating_sub(1);
-            }
-            if times == 0 || offset.0 == 0 {
-                return map.clip_point(
-                    start_of_next_sentence
-                        .to_offset(&map.buffer_snapshot())
-                        .to_display_point(map),
-                    Bias::Left,
-                );
-            }
-        }
-        if was_newline {
-            start = offset;
-        }
-        was_newline = ch == '\n';
-    }
-
-    DisplayPoint::zero()
-}
-
-pub(crate) fn sentence_forwards(
-    map: &DisplaySnapshot,
-    point: DisplayPoint,
-    mut times: usize,
-) -> DisplayPoint {
-    let start = point.to_point(map).to_offset(&map.buffer_snapshot());
-    let mut chars = map.buffer_chars_at(start).peekable();
-
-    let mut was_newline = map
-        .reverse_buffer_chars_at(start)
-        .next()
-        .is_some_and(|(c, _)| c == '\n')
-        && chars.peek().is_some_and(|(c, _)| *c == '\n');
-
-    while let Some((ch, offset)) = chars.next() {
-        if was_newline && ch == '\n' {
-            continue;
-        }
-        let start_of_next_sentence = if was_newline {
-            Some(next_non_blank(map, offset))
-        } else if ch == '\n' && chars.peek().is_some_and(|(c, _)| *c == '\n') {
-            Some(next_non_blank(map, offset + ch.len_utf8()))
-        } else if ch == '.' || ch == '?' || ch == '!' {
-            start_of_next_sentence(map, offset + ch.len_utf8())
-        } else {
-            None
-        };
-
-        if let Some(start_of_next_sentence) = start_of_next_sentence {
-            times = times.saturating_sub(1);
-            if times == 0 {
-                return map.clip_point(
-                    start_of_next_sentence
-                        .to_offset(&map.buffer_snapshot())
-                        .to_display_point(map),
-                    Bias::Right,
-                );
-            }
-        }
-
-        was_newline = ch == '\n' && chars.peek().is_some_and(|(c, _)| *c == '\n');
-    }
-
-    map.max_point()
-}
-
-fn next_non_blank(map: &DisplaySnapshot, start: MultiBufferOffset) -> MultiBufferOffset {
-    for (c, o) in map.buffer_chars_at(start) {
-        if c == '\n' || !c.is_whitespace() {
-            return o;
-        }
-    }
-
-    map.buffer_snapshot().len()
-}
-
-// given the offset after a ., !, or ? find the start of the next sentence.
-// if this is not a sentence boundary, returns None.
-fn start_of_next_sentence(
-    map: &DisplaySnapshot,
-    end_of_sentence: MultiBufferOffset,
-) -> Option<MultiBufferOffset> {
-    let chars = map.buffer_chars_at(end_of_sentence);
-    let mut seen_space = false;
-
-    for (char, offset) in chars {
-        if !seen_space && (char == ')' || char == ']' || char == '"' || char == '\'') {
-            continue;
-        }
-
-        if char == '\n' && seen_space {
-            return Some(offset);
-        } else if char.is_whitespace() {
-            seen_space = true;
-        } else if seen_space {
-            return Some(offset);
-        } else {
-            return None;
-        }
-    }
-
-    Some(map.buffer_snapshot().len())
-}
-
-fn go_to_line(map: &DisplaySnapshot, display_point: DisplayPoint, line: usize) -> DisplayPoint {
-    let point = map.display_point_to_point(display_point, Bias::Left);
-    let Some(mut excerpt) = map.buffer_snapshot().excerpt_containing(point..point) else {
-        return display_point;
-    };
-    let offset = excerpt.buffer().point_to_offset(
-        excerpt
-            .buffer()
-            .clip_point(Point::new((line - 1) as u32, point.column), Bias::Left),
-    );
-    let buffer_range = excerpt.buffer_range();
-    if offset >= buffer_range.start.0 && offset <= buffer_range.end.0 {
-        let point = map
-            .buffer_snapshot()
-            .offset_to_point(excerpt.map_offset_from_buffer(BufferOffset(offset)));
-        return map.clip_point(map.point_to_display_point(point, Bias::Left), Bias::Left);
-    }
-    let mut last_position = None;
-    for (excerpt, buffer, range) in map.buffer_snapshot().excerpts() {
-        let excerpt_range = language::ToOffset::to_offset(&range.context.start, buffer)
-            ..language::ToOffset::to_offset(&range.context.end, buffer);
-        if offset >= excerpt_range.start && offset <= excerpt_range.end {
-            let text_anchor = buffer.anchor_after(offset);
-            let anchor = Anchor::in_buffer(excerpt, text_anchor);
-            return anchor.to_display_point(map);
-        } else if offset <= excerpt_range.start {
-            let anchor = Anchor::in_buffer(excerpt, range.context.start);
-            return anchor.to_display_point(map);
-        } else {
-            last_position = Some(Anchor::in_buffer(excerpt, range.context.end));
-        }
-    }
-
-    let mut last_point = last_position.unwrap().to_point(&map.buffer_snapshot());
-    last_point.column = point.column;
-
-    map.clip_point(
-        map.point_to_display_point(
-            map.buffer_snapshot().clip_point(point, Bias::Left),
-            Bias::Left,
-        ),
-        Bias::Left,
-    )
-}
-
-fn start_of_document(
-    map: &DisplaySnapshot,
-    display_point: DisplayPoint,
-    maybe_times: Option<usize>,
-) -> DisplayPoint {
-    if let Some(times) = maybe_times {
-        return go_to_line(map, display_point, times);
-    }
-
-    let point = map.display_point_to_point(display_point, Bias::Left);
-    let mut first_point = Point::zero();
-    first_point.column = point.column;
-
-    map.clip_point(
-        map.point_to_display_point(
-            map.buffer_snapshot().clip_point(first_point, Bias::Left),
-            Bias::Left,
-        ),
-        Bias::Left,
-    )
-}
-
-fn end_of_document(
-    map: &DisplaySnapshot,
-    display_point: DisplayPoint,
-    maybe_times: Option<usize>,
-) -> DisplayPoint {
-    if let Some(times) = maybe_times {
-        return go_to_line(map, display_point, times);
-    };
-    let point = map.display_point_to_point(display_point, Bias::Left);
-    let mut last_point = map.buffer_snapshot().max_point();
-    last_point.column = point.column;
-
-    map.clip_point(
-        map.point_to_display_point(
-            map.buffer_snapshot().clip_point(last_point, Bias::Left),
-            Bias::Left,
-        ),
-        Bias::Left,
-    )
-}
-
-fn matching_tag(map: &DisplaySnapshot, head: DisplayPoint) -> Option<DisplayPoint> {
-    let inner = crate::object::surrounding_html_tag(map, head, head..head, false)?;
-    let outer = crate::object::surrounding_html_tag(map, head, head..head, true)?;
-
-    if head > outer.start && head < inner.start {
-        let mut offset = inner.end.to_offset(map, Bias::Left);
-        for c in map.buffer_snapshot().chars_at(offset) {
-            if c == '/' || c == '\n' || c == '>' {
-                return Some(offset.to_display_point(map));
-            }
-            offset += c.len_utf8();
-        }
-    } else {
-        let mut offset = outer.start.to_offset(map, Bias::Left);
-        for c in map.buffer_snapshot().chars_at(offset) {
-            offset += c.len_utf8();
-            if c == '<' || c == '\n' {
-                return Some(offset.to_display_point(map));
-            }
-        }
-    }
-
-    None
-}
-
-fn matching(map: &DisplaySnapshot, display_point: DisplayPoint) -> DisplayPoint {
-    if !map.is_singleton() {
-        return display_point;
-    }
-    // https://github.com/vim/vim/blob/1d87e11a1ef201b26ed87585fba70182ad0c468a/runtime/doc/motion.txt#L1200
-    let display_point = map.clip_at_line_end(display_point);
-    let point = display_point.to_point(map);
-    let offset = point.to_offset(&map.buffer_snapshot());
-    let snapshot = map.buffer_snapshot();
-
-    // Ensure the range is contained by the current line.
-    let mut line_end = map.next_line_boundary(point).0;
-    if line_end == point {
-        line_end = map.max_point().to_point(map);
-    }
-
-    // Attempt to find the smallest enclosing bracket range that also contains
-    // the offset, which only happens if the cursor is currently in a bracket.
-    let range_filter = |_buffer: &language::BufferSnapshot,
-                        opening_range: Range<BufferOffset>,
-                        closing_range: Range<BufferOffset>| {
-        opening_range.contains(&BufferOffset(offset.0))
-            || closing_range.contains(&BufferOffset(offset.0))
-    };
-
-    let bracket_ranges = snapshot
-        .innermost_enclosing_bracket_ranges(offset..offset, Some(&range_filter))
-        .or_else(|| snapshot.innermost_enclosing_bracket_ranges(offset..offset, None));
-
-    if let Some((opening_range, closing_range)) = bracket_ranges {
-        let mut chars = map.buffer_snapshot().chars_at(offset);
-        match chars.next() {
-            Some('/') => {}
-            _ => {
-                if opening_range.contains(&offset) {
-                    return closing_range.start.to_display_point(map);
-                } else if closing_range.contains(&offset) {
-                    return opening_range.start.to_display_point(map);
-                }
-            }
-        }
-    }
-
-    let line_range = map.prev_line_boundary(point).0..line_end;
-    let visible_line_range =
-        line_range.start..Point::new(line_range.end.row, line_range.end.column.saturating_sub(1));
-    let ranges = map.buffer_snapshot().bracket_ranges(visible_line_range);
-    if let Some(ranges) = ranges {
-        let line_range = line_range.start.to_offset(&map.buffer_snapshot())
-            ..line_range.end.to_offset(&map.buffer_snapshot());
-        let mut closest_pair_destination = None;
-        let mut closest_distance = usize::MAX;
-
-        for (open_range, close_range) in ranges {
-            if map.buffer_snapshot().chars_at(open_range.start).next() == Some('<') {
-                if offset > open_range.start && offset < close_range.start {
-                    let mut chars = map.buffer_snapshot().chars_at(close_range.start);
-                    if (Some('/'), Some('>')) == (chars.next(), chars.next()) {
-                        return display_point;
-                    }
-                    if let Some(tag) = matching_tag(map, display_point) {
-                        return tag;
-                    }
-                } else if close_range.contains(&offset) {
-                    return open_range.start.to_display_point(map);
-                } else if open_range.contains(&offset) {
-                    return (close_range.end - 1).to_display_point(map);
-                }
-            }
-
-            if (open_range.contains(&offset) || open_range.start >= offset)
-                && line_range.contains(&open_range.start)
-            {
-                let distance = open_range.start.saturating_sub(offset);
-                if distance < closest_distance {
-                    closest_pair_destination = Some(close_range.start);
-                    closest_distance = distance;
-                }
-            }
-
-            if (close_range.contains(&offset) || close_range.start >= offset)
-                && line_range.contains(&close_range.start)
-            {
-                let distance = close_range.start.saturating_sub(offset);
-                if distance < closest_distance {
-                    closest_pair_destination = Some(open_range.start);
-                    closest_distance = distance;
-                }
-            }
-
-            continue;
-        }
-
-        closest_pair_destination
-            .map(|destination| destination.to_display_point(map))
-            .unwrap_or(display_point)
-    } else {
-        display_point
-    }
-}
-
-// Go to {count} percentage in the file, on the first
-// non-blank in the line linewise.  To compute the new
-// line number this formula is used:
-// ({count} * number-of-lines + 99) / 100
-//
-// https://neovim.io/doc/user/motion.html#N%25
-fn go_to_percentage(map: &DisplaySnapshot, point: DisplayPoint, count: usize) -> DisplayPoint {
-    let total_lines = map.buffer_snapshot().max_point().row + 1;
-    let target_line = (count * total_lines as usize).div_ceil(100);
-    let target_point = DisplayPoint::new(
-        DisplayRow(target_line.saturating_sub(1) as u32),
-        point.column(),
-    );
-    map.clip_point(target_point, Bias::Left)
-}
-
-fn unmatched_forward(
-    map: &DisplaySnapshot,
-    mut display_point: DisplayPoint,
-    char: char,
-    times: usize,
-) -> DisplayPoint {
-    for _ in 0..times {
-        // https://github.com/vim/vim/blob/1d87e11a1ef201b26ed87585fba70182ad0c468a/runtime/doc/motion.txt#L1245
-        let point = display_point.to_point(map);
-        let offset = point.to_offset(&map.buffer_snapshot());
-
-        let ranges = map.buffer_snapshot().enclosing_bracket_ranges(point..point);
-        let Some(ranges) = ranges else { break };
-        let mut closest_closing_destination = None;
-        let mut closest_distance = usize::MAX;
-
-        for (_, close_range) in ranges {
-            if close_range.start > offset {
-                let mut chars = map.buffer_snapshot().chars_at(close_range.start);
-                if Some(char) == chars.next() {
-                    let distance = close_range.start - offset;
-                    if distance < closest_distance {
-                        closest_closing_destination = Some(close_range.start);
-                        closest_distance = distance;
-                        continue;
-                    }
-                }
-            }
-        }
-
-        let new_point = closest_closing_destination
-            .map(|destination| destination.to_display_point(map))
-            .unwrap_or(display_point);
-        if new_point == display_point {
-            break;
-        }
-        display_point = new_point;
-    }
-    display_point
-}
-
-fn unmatched_backward(
-    map: &DisplaySnapshot,
-    mut display_point: DisplayPoint,
-    char: char,
-    times: usize,
-) -> DisplayPoint {
-    for _ in 0..times {
-        // https://github.com/vim/vim/blob/1d87e11a1ef201b26ed87585fba70182ad0c468a/runtime/doc/motion.txt#L1239
-        let point = display_point.to_point(map);
-        let offset = point.to_offset(&map.buffer_snapshot());
-
-        let ranges = map.buffer_snapshot().enclosing_bracket_ranges(point..point);
-        let Some(ranges) = ranges else {
-            break;
-        };
-
-        let mut closest_starting_destination = None;
-        let mut closest_distance = usize::MAX;
-
-        for (start_range, _) in ranges {
-            if start_range.start < offset {
-                let mut chars = map.buffer_snapshot().chars_at(start_range.start);
-                if Some(char) == chars.next() {
-                    let distance = offset - start_range.start;
-                    if distance < closest_distance {
-                        closest_starting_destination = Some(start_range.start);
-                        closest_distance = distance;
-                        continue;
-                    }
-                }
-            }
-        }
-
-        let new_point = closest_starting_destination
-            .map(|destination| destination.to_display_point(map))
-            .unwrap_or(display_point);
-        if new_point == display_point {
-            break;
-        } else {
-            display_point = new_point;
-        }
-    }
-    display_point
-}
-
-fn find_forward(
-    map: &DisplaySnapshot,
-    from: DisplayPoint,
-    before: bool,
-    target: char,
-    times: usize,
-    mode: FindRange,
-    smartcase: bool,
-) -> Option<DisplayPoint> {
-    let mut to = from;
-    let mut found = false;
-
-    for _ in 0..times {
-        found = false;
-        let new_to = find_boundary(map, to, mode, |_, right| {
-            found = is_character_match(target, right, smartcase);
-            found
-        });
-        if to == new_to {
-            break;
-        }
-        to = new_to;
-    }
-
-    if found {
-        if before && to.column() > 0 {
-            *to.column_mut() -= 1;
-            Some(map.clip_point(to, Bias::Left))
-        } else if before && to.row().0 > 0 {
-            *to.row_mut() -= 1;
-            *to.column_mut() = map.line(to.row()).len() as u32;
-            Some(map.clip_point(to, Bias::Left))
-        } else {
-            Some(to)
-        }
-    } else {
-        None
-    }
-}
-
-fn find_backward(
-    map: &DisplaySnapshot,
-    from: DisplayPoint,
-    after: bool,
-    target: char,
-    times: usize,
-    mode: FindRange,
-    smartcase: bool,
-) -> DisplayPoint {
-    let mut to = from;
-
-    for _ in 0..times {
-        let new_to = find_preceding_boundary_display_point(map, to, mode, |_, right| {
-            is_character_match(target, right, smartcase)
-        });
-        if to == new_to {
-            break;
-        }
-        to = new_to;
-    }
-
-    let next = map.buffer_snapshot().chars_at(to.to_point(map)).next();
-    if next.is_some() && is_character_match(target, next.unwrap(), smartcase) {
-        if after {
-            *to.column_mut() += 1;
-            map.clip_point(to, Bias::Right)
-        } else {
-            to
-        }
-    } else {
-        from
-    }
-}
-
-/// Returns true if one char is equal to the other or its uppercase variant (if smartcase is true).
-pub fn is_character_match(target: char, other: char, smartcase: bool) -> bool {
-    if smartcase {
-        if target.is_uppercase() {
-            target == other
-        } else {
-            target == other.to_ascii_lowercase()
-        }
-    } else {
-        target == other
-    }
-}
-
-fn sneak(
-    map: &DisplaySnapshot,
-    from: DisplayPoint,
-    first_target: char,
-    second_target: char,
-    times: usize,
-    smartcase: bool,
-) -> Option<DisplayPoint> {
-    let mut to = from;
-    let mut found = false;
-
-    for _ in 0..times {
-        found = false;
-        let new_to = find_boundary(
-            map,
-            movement::right(map, to),
-            FindRange::MultiLine,
-            |left, right| {
-                found = is_character_match(first_target, left, smartcase)
-                    && is_character_match(second_target, right, smartcase);
-                found
-            },
-        );
-        if to == new_to {
-            break;
-        }
-        to = new_to;
-    }
-
-    if found {
-        Some(movement::left(map, to))
-    } else {
-        None
-    }
-}
-
-fn sneak_backward(
-    map: &DisplaySnapshot,
-    from: DisplayPoint,
-    first_target: char,
-    second_target: char,
-    times: usize,
-    smartcase: bool,
-) -> Option<DisplayPoint> {
-    let mut to = from;
-    let mut found = false;
-
-    for _ in 0..times {
-        found = false;
-        let new_to =
-            find_preceding_boundary_display_point(map, to, FindRange::MultiLine, |left, right| {
-                found = is_character_match(first_target, left, smartcase)
-                    && is_character_match(second_target, right, smartcase);
-                found
-            });
-        if to == new_to {
-            break;
-        }
-        to = new_to;
-    }
-
-    if found {
-        Some(movement::left(map, to))
-    } else {
-        None
-    }
-}
-
-fn next_line_start(map: &DisplaySnapshot, point: DisplayPoint, times: usize) -> DisplayPoint {
-    let correct_line = map.start_of_relative_buffer_row(point, times as isize);
-    first_non_whitespace(map, false, correct_line)
-}
-
-fn previous_line_start(map: &DisplaySnapshot, point: DisplayPoint, times: usize) -> DisplayPoint {
-    let correct_line = map.start_of_relative_buffer_row(point, -(times as isize));
-    first_non_whitespace(map, false, correct_line)
-}
-
-fn go_to_column(map: &DisplaySnapshot, point: DisplayPoint, times: usize) -> DisplayPoint {
-    let correct_line = map.start_of_relative_buffer_row(point, 0);
-    right(map, correct_line, times.saturating_sub(1))
-}
-
-pub(crate) fn next_line_end(
-    map: &DisplaySnapshot,
-    mut point: DisplayPoint,
-    times: usize,
-) -> DisplayPoint {
-    if times > 1 {
-        point = map.start_of_relative_buffer_row(point, times as isize - 1);
-    }
-    end_of_line(map, false, point, 1)
-}
-
-fn window_top(
-    map: &DisplaySnapshot,
-    point: DisplayPoint,
-    text_layout_details: &TextLayoutDetails,
-    mut times: usize,
-) -> (DisplayPoint, SelectionGoal) {
-    let first_visible_line = text_layout_details
-        .scroll_anchor
-        .anchor
-        .to_display_point(map);
-
-    if first_visible_line.row() != DisplayRow(0)
-        && text_layout_details.vertical_scroll_margin as usize > times
-    {
-        times = text_layout_details.vertical_scroll_margin.ceil() as usize;
-    }
-
-    if let Some(visible_rows) = text_layout_details.visible_rows {
-        let bottom_row = first_visible_line.row().0 + visible_rows as u32;
-        let new_row = (first_visible_line.row().0 + (times as u32))
-            .min(bottom_row)
-            .min(map.max_point().row().0);
-        let new_col = point.column().min(map.line_len(first_visible_line.row()));
-
-        let new_point = DisplayPoint::new(DisplayRow(new_row), new_col);
-        (map.clip_point(new_point, Bias::Left), SelectionGoal::None)
-    } else {
-        let new_row =
-            DisplayRow((first_visible_line.row().0 + (times as u32)).min(map.max_point().row().0));
-        let new_col = point.column().min(map.line_len(first_visible_line.row()));
-
-        let new_point = DisplayPoint::new(new_row, new_col);
-        (map.clip_point(new_point, Bias::Left), SelectionGoal::None)
-    }
-}
-
-fn window_middle(
-    map: &DisplaySnapshot,
-    point: DisplayPoint,
-    text_layout_details: &TextLayoutDetails,
-) -> (DisplayPoint, SelectionGoal) {
-    if let Some(visible_rows) = text_layout_details.visible_rows {
-        let first_visible_line = text_layout_details
-            .scroll_anchor
-            .anchor
-            .to_display_point(map);
-
-        let max_visible_rows =
-            (visible_rows as u32).min(map.max_point().row().0 - first_visible_line.row().0);
-
-        let new_row =
-            (first_visible_line.row().0 + (max_visible_rows / 2)).min(map.max_point().row().0);
-        let new_row = DisplayRow(new_row);
-        let new_col = point.column().min(map.line_len(new_row));
-        let new_point = DisplayPoint::new(new_row, new_col);
-        (map.clip_point(new_point, Bias::Left), SelectionGoal::None)
-    } else {
-        (point, SelectionGoal::None)
-    }
-}
-
-fn window_bottom(
-    map: &DisplaySnapshot,
-    point: DisplayPoint,
-    text_layout_details: &TextLayoutDetails,
-    mut times: usize,
-) -> (DisplayPoint, SelectionGoal) {
-    if let Some(visible_rows) = text_layout_details.visible_rows {
-        let first_visible_line = text_layout_details
-            .scroll_anchor
-            .anchor
-            .to_display_point(map);
-        let bottom_row = first_visible_line.row().0
-            + (visible_rows + text_layout_details.scroll_anchor.offset.y - 1.).floor() as u32;
-        if bottom_row < map.max_point().row().0
-            && text_layout_details.vertical_scroll_margin as usize > times
-        {
-            times = text_layout_details.vertical_scroll_margin.ceil() as usize;
-        }
-        let bottom_row_capped = bottom_row.min(map.max_point().row().0);
-        let new_row = if bottom_row_capped.saturating_sub(times as u32) < first_visible_line.row().0
-        {
-            first_visible_line.row()
-        } else {
-            DisplayRow(bottom_row_capped.saturating_sub(times as u32))
-        };
-        let new_col = point.column().min(map.line_len(new_row));
-        let new_point = DisplayPoint::new(new_row, new_col);
-        (map.clip_point(new_point, Bias::Left), SelectionGoal::None)
-    } else {
-        (point, SelectionGoal::None)
-    }
-}
-
-fn method_motion(
-    map: &DisplaySnapshot,
-    mut display_point: DisplayPoint,
-    times: usize,
-    direction: Direction,
-    is_start: bool,
-) -> DisplayPoint {
-    let Some((_, _, buffer)) = map.buffer_snapshot().as_singleton() else {
-        return display_point;
-    };
-
-    for _ in 0..times {
-        let point = map.display_point_to_point(display_point, Bias::Left);
-        let offset = point.to_offset(&map.buffer_snapshot()).0;
-        let range = if direction == Direction::Prev {
-            0..offset
-        } else {
-            offset..buffer.len()
-        };
-
-        let possibilities = buffer
-            .text_object_ranges(range, language::TreeSitterOptions::max_start_depth(4))
-            .filter_map(|(range, object)| {
-                if !matches!(object, language::TextObject::AroundFunction) {
-                    return None;
-                }
-
-                let relevant = if is_start { range.start } else { range.end };
-                if direction == Direction::Prev && relevant < offset {
-                    Some(relevant)
-                } else if direction == Direction::Next && relevant > offset + 1 {
-                    Some(relevant)
-                } else {
-                    None
-                }
-            });
-
-        let dest = if direction == Direction::Prev {
-            possibilities.max().unwrap_or(offset)
-        } else {
-            possibilities.min().unwrap_or(offset)
-        };
-        let new_point = map.clip_point(MultiBufferOffset(dest).to_display_point(map), Bias::Left);
-        if new_point == display_point {
-            break;
-        }
-        display_point = new_point;
-    }
-    display_point
-}
-
-fn comment_motion(
-    map: &DisplaySnapshot,
-    mut display_point: DisplayPoint,
-    times: usize,
-    direction: Direction,
-) -> DisplayPoint {
-    let Some((_, _, buffer)) = map.buffer_snapshot().as_singleton() else {
-        return display_point;
-    };
-
-    for _ in 0..times {
-        let point = map.display_point_to_point(display_point, Bias::Left);
-        let offset = point.to_offset(&map.buffer_snapshot()).0;
-        let range = if direction == Direction::Prev {
-            0..offset
-        } else {
-            offset..buffer.len()
-        };
-
-        let possibilities = buffer
-            .text_object_ranges(range, language::TreeSitterOptions::max_start_depth(6))
-            .filter_map(|(range, object)| {
-                if !matches!(object, language::TextObject::AroundComment) {
-                    return None;
-                }
-
-                let relevant = if direction == Direction::Prev {
-                    range.start
-                } else {
-                    range.end
-                };
-                if direction == Direction::Prev && relevant < offset {
-                    Some(relevant)
-                } else if direction == Direction::Next && relevant > offset + 1 {
-                    Some(relevant)
-                } else {
-                    None
-                }
-            });
-
-        let dest = if direction == Direction::Prev {
-            possibilities.max().unwrap_or(offset)
-        } else {
-            possibilities.min().unwrap_or(offset)
-        };
-        let new_point = map.clip_point(MultiBufferOffset(dest).to_display_point(map), Bias::Left);
-        if new_point == display_point {
-            break;
-        }
-        display_point = new_point;
-    }
-
-    display_point
-}
-
-fn section_motion(
-    map: &DisplaySnapshot,
-    mut display_point: DisplayPoint,
-    times: usize,
-    direction: Direction,
-    is_start: bool,
-) -> DisplayPoint {
-    if map.buffer_snapshot().as_singleton().is_some() {
-        for _ in 0..times {
-            let offset = map
-                .display_point_to_point(display_point, Bias::Left)
-                .to_offset(&map.buffer_snapshot());
-            let range = if direction == Direction::Prev {
-                MultiBufferOffset(0)..offset
-            } else {
-                offset..map.buffer_snapshot().len()
-            };
-
-            // we set a max start depth here because we want a section to only be "top level"
-            // similar to vim's default of '{' in the first column.
-            // (and without it, ]] at the start of editor.rs is -very- slow)
-            let mut possibilities = map
-                .buffer_snapshot()
-                .text_object_ranges(range, language::TreeSitterOptions::max_start_depth(3))
-                .filter(|(_, object)| {
-                    matches!(
-                        object,
-                        language::TextObject::AroundClass | language::TextObject::AroundFunction
-                    )
-                })
-                .collect::<Vec<_>>();
-            possibilities.sort_by_key(|(range_a, _)| range_a.start);
-            let mut prev_end = None;
-            let possibilities = possibilities.into_iter().filter_map(|(range, t)| {
-                if t == language::TextObject::AroundFunction
-                    && prev_end.is_some_and(|prev_end| prev_end > range.start)
-                {
-                    return None;
-                }
-                prev_end = Some(range.end);
-
-                let relevant = if is_start { range.start } else { range.end };
-                if direction == Direction::Prev && relevant < offset {
-                    Some(relevant)
-                } else if direction == Direction::Next && relevant > offset + 1usize {
-                    Some(relevant)
-                } else {
-                    None
-                }
-            });
-
-            let offset = if direction == Direction::Prev {
-                possibilities.max().unwrap_or(MultiBufferOffset(0))
-            } else {
-                possibilities.min().unwrap_or(map.buffer_snapshot().len())
-            };
-
-            let new_point = map.clip_point(offset.to_display_point(map), Bias::Left);
-            if new_point == display_point {
-                break;
-            }
-            display_point = new_point;
-        }
-        return display_point;
-    };
-
-    for _ in 0..times {
-        let next_point = if is_start {
-            movement::start_of_excerpt(map, display_point, direction)
-        } else {
-            movement::end_of_excerpt(map, display_point, direction)
-        };
-        if next_point == display_point {
-            break;
-        }
-        display_point = next_point;
-    }
-
-    display_point
-}
-
-fn matches_indent_type(
-    target_indent: &text::LineIndent,
-    current_indent: &text::LineIndent,
-    indent_type: IndentType,
-) -> bool {
-    match indent_type {
-        IndentType::Lesser => {
-            target_indent.spaces < current_indent.spaces || target_indent.tabs < current_indent.tabs
-        }
-        IndentType::Greater => {
-            target_indent.spaces > current_indent.spaces || target_indent.tabs > current_indent.tabs
-        }
-        IndentType::Same => {
-            target_indent.spaces == current_indent.spaces
-                && target_indent.tabs == current_indent.tabs
-        }
-    }
-}
-
-fn indent_motion(
-    map: &DisplaySnapshot,
-    mut display_point: DisplayPoint,
-    times: usize,
-    direction: Direction,
-    indent_type: IndentType,
-) -> DisplayPoint {
-    let buffer_point = map.display_point_to_point(display_point, Bias::Left);
-    let current_row = MultiBufferRow(buffer_point.row);
-    let current_indent = map.line_indent_for_buffer_row(current_row);
-    if current_indent.is_line_empty() {
-        return display_point;
-    }
-    let max_row = map.max_point().to_point(map).row;
-
-    for _ in 0..times {
-        let current_buffer_row = map.display_point_to_point(display_point, Bias::Left).row;
-
-        let target_row = match direction {
-            Direction::Next => (current_buffer_row + 1..=max_row).find(|&row| {
-                let indent = map.line_indent_for_buffer_row(MultiBufferRow(row));
-                !indent.is_line_empty()
-                    && matches_indent_type(&indent, &current_indent, indent_type)
-            }),
-            Direction::Prev => (0..current_buffer_row).rev().find(|&row| {
-                let indent = map.line_indent_for_buffer_row(MultiBufferRow(row));
-                !indent.is_line_empty()
-                    && matches_indent_type(&indent, &current_indent, indent_type)
-            }),
-        }
-        .unwrap_or(current_buffer_row);
-
-        let new_point = map.point_to_display_point(Point::new(target_row, 0), Bias::Right);
-        let new_point = first_non_whitespace(map, false, new_point);
-        if new_point == display_point {
-            break;
-        }
-        display_point = new_point;
-    }
-    display_point
-}
-
-#[cfg(test)]
-mod test {
-
-    use crate::{
-        state::Mode,
-        test::{NeovimBackedTestContext, VimTestContext},
-    };
-    use editor::Inlay;
-    use indoc::indoc;
-    use language::Point;
-    use multi_buffer::MultiBufferRow;
-
-    #[gpui::test]
-    async fn test_start_end_of_paragraph(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        let initial_state = indoc! {r"ˇabc
-            def
-
-            paragraph
-            the second
-
-
-
-            third and
-            final"};
-
-        // goes down once
-        cx.set_shared_state(initial_state).await;
-        cx.simulate_shared_keystrokes("}").await;
-        cx.shared_state().await.assert_eq(indoc! {r"abc
-            def
-            ˇ
-            paragraph
-            the second
-
-
-
-            third and
-            final"});
-
-        // goes up once
-        cx.simulate_shared_keystrokes("{").await;
-        cx.shared_state().await.assert_eq(initial_state);
-
-        // goes down twice
-        cx.simulate_shared_keystrokes("2 }").await;
-        cx.shared_state().await.assert_eq(indoc! {r"abc
-            def
-
-            paragraph
-            the second
-            ˇ
-
-
-            third and
-            final"});
-
-        // goes down over multiple blanks
-        cx.simulate_shared_keystrokes("}").await;
-        cx.shared_state().await.assert_eq(indoc! {r"abc
-                def
-
-                paragraph
-                the second
-
-
-
-                third and
-                finaˇl"});
-
-        // goes up twice
-        cx.simulate_shared_keystrokes("2 {").await;
-        cx.shared_state().await.assert_eq(indoc! {r"abc
-                def
-                ˇ
-                paragraph
-                the second
-
-
-
-                third and
-                final"});
-    }
-
-    #[gpui::test]
-    async fn test_matching(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {r"func ˇ(a string) {
-                do(something(with<Types>.and_arrays[0, 2]))
-            }"})
-            .await;
-        cx.simulate_shared_keystrokes("%").await;
-        cx.shared_state()
-            .await
-            .assert_eq(indoc! {r"func (a stringˇ) {
-                do(something(with<Types>.and_arrays[0, 2]))
-            }"});
-
-        // test it works on the last character of the line
-        cx.set_shared_state(indoc! {r"func (a string) ˇ{
-            do(something(with<Types>.and_arrays[0, 2]))
-            }"})
-            .await;
-        cx.simulate_shared_keystrokes("%").await;
-        cx.shared_state()
-            .await
-            .assert_eq(indoc! {r"func (a string) {
-            do(something(with<Types>.and_arrays[0, 2]))
-            ˇ}"});
-
-        // test it works on immediate nesting
-        cx.set_shared_state("ˇ{()}").await;
-        cx.simulate_shared_keystrokes("%").await;
-        cx.shared_state().await.assert_eq("{()ˇ}");
-        cx.simulate_shared_keystrokes("%").await;
-        cx.shared_state().await.assert_eq("ˇ{()}");
-
-        // test it works on immediate nesting inside braces
-        cx.set_shared_state("{\n    ˇ{()}\n}").await;
-        cx.simulate_shared_keystrokes("%").await;
-        cx.shared_state().await.assert_eq("{\n    {()ˇ}\n}");
-
-        // test it jumps to the next paren on a line
-        cx.set_shared_state("func ˇboop() {\n}").await;
-        cx.simulate_shared_keystrokes("%").await;
-        cx.shared_state().await.assert_eq("func boop(ˇ) {\n}");
-    }
-
-    #[gpui::test]
-    async fn test_unmatched_forward(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        // test it works with curly braces
-        cx.set_shared_state(indoc! {r"func (a string) {
-                do(something(with<Types>.anˇd_arrays[0, 2]))
-            }"})
-            .await;
-        cx.simulate_shared_keystrokes("] }").await;
-        cx.shared_state()
-            .await
-            .assert_eq(indoc! {r"func (a string) {
-                do(something(with<Types>.and_arrays[0, 2]))
-            ˇ}"});
-
-        // test it works with brackets
-        cx.set_shared_state(indoc! {r"func (a string) {
-                do(somethiˇng(with<Types>.and_arrays[0, 2]))
-            }"})
-            .await;
-        cx.simulate_shared_keystrokes("] )").await;
-        cx.shared_state()
-            .await
-            .assert_eq(indoc! {r"func (a string) {
-                do(something(with<Types>.and_arrays[0, 2])ˇ)
-            }"});
-
-        cx.set_shared_state(indoc! {r"func (a string) { a((b, cˇ))}"})
-            .await;
-        cx.simulate_shared_keystrokes("] )").await;
-        cx.shared_state()
-            .await
-            .assert_eq(indoc! {r"func (a string) { a((b, c)ˇ)}"});
-
-        // test it works on immediate nesting
-        cx.set_shared_state("{ˇ {}{}}").await;
-        cx.simulate_shared_keystrokes("] }").await;
-        cx.shared_state().await.assert_eq("{ {}{}ˇ}");
-        cx.set_shared_state("(ˇ ()())").await;
-        cx.simulate_shared_keystrokes("] )").await;
-        cx.shared_state().await.assert_eq("( ()()ˇ)");
-
-        // test it works on immediate nesting inside braces
-        cx.set_shared_state("{\n    ˇ {()}\n}").await;
-        cx.simulate_shared_keystrokes("] }").await;
-        cx.shared_state().await.assert_eq("{\n     {()}\nˇ}");
-        cx.set_shared_state("(\n    ˇ {()}\n)").await;
-        cx.simulate_shared_keystrokes("] )").await;
-        cx.shared_state().await.assert_eq("(\n     {()}\nˇ)");
-    }
-
-    #[gpui::test]
-    async fn test_unmatched_backward(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        // test it works with curly braces
-        cx.set_shared_state(indoc! {r"func (a string) {
-                do(something(with<Types>.anˇd_arrays[0, 2]))
-            }"})
-            .await;
-        cx.simulate_shared_keystrokes("[ {").await;
-        cx.shared_state()
-            .await
-            .assert_eq(indoc! {r"func (a string) ˇ{
-                do(something(with<Types>.and_arrays[0, 2]))
-            }"});
-
-        // test it works with brackets
-        cx.set_shared_state(indoc! {r"func (a string) {
-                do(somethiˇng(with<Types>.and_arrays[0, 2]))
-            }"})
-            .await;
-        cx.simulate_shared_keystrokes("[ (").await;
-        cx.shared_state()
-            .await
-            .assert_eq(indoc! {r"func (a string) {
-                doˇ(something(with<Types>.and_arrays[0, 2]))
-            }"});
-
-        // test it works on immediate nesting
-        cx.set_shared_state("{{}{} ˇ }").await;
-        cx.simulate_shared_keystrokes("[ {").await;
-        cx.shared_state().await.assert_eq("ˇ{{}{}  }");
-        cx.set_shared_state("(()() ˇ )").await;
-        cx.simulate_shared_keystrokes("[ (").await;
-        cx.shared_state().await.assert_eq("ˇ(()()  )");
-
-        // test it works on immediate nesting inside braces
-        cx.set_shared_state("{\n    {()} ˇ\n}").await;
-        cx.simulate_shared_keystrokes("[ {").await;
-        cx.shared_state().await.assert_eq("ˇ{\n    {()} \n}");
-        cx.set_shared_state("(\n    {()} ˇ\n)").await;
-        cx.simulate_shared_keystrokes("[ (").await;
-        cx.shared_state().await.assert_eq("ˇ(\n    {()} \n)");
-    }
-
-    #[gpui::test]
-    async fn test_unmatched_forward_markdown(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new_markdown_with_rust(cx).await;
-
-        cx.neovim.exec("set filetype=markdown").await;
-
-        cx.set_shared_state(indoc! {r"
-            ```rs
-            impl Worktree {
-                pub async fn open_buffers(&self, path: &Path) -> impl Iterator<&Buffer> {
-            ˇ    }
-            }
-            ```
-        "})
-            .await;
-        cx.simulate_shared_keystrokes("] }").await;
-        cx.shared_state().await.assert_eq(indoc! {r"
-            ```rs
-            impl Worktree {
-                pub async fn open_buffers(&self, path: &Path) -> impl Iterator<&Buffer> {
-                ˇ}
-            }
-            ```
-        "});
-
-        cx.set_shared_state(indoc! {r"
-            ```rs
-            impl Worktree {
-                pub async fn open_buffers(&self, path: &Path) -> impl Iterator<&Buffer> {
-                }   ˇ
-            }
-            ```
-        "})
-            .await;
-        cx.simulate_shared_keystrokes("] }").await;
-        cx.shared_state().await.assert_eq(indoc! {r"
-            ```rs
-            impl Worktree {
-                pub async fn open_buffers(&self, path: &Path) -> impl Iterator<&Buffer> {
-                }  •
-            ˇ}
-            ```
-        "});
-    }
-
-    #[gpui::test]
-    async fn test_unmatched_backward_markdown(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new_markdown_with_rust(cx).await;
-
-        cx.neovim.exec("set filetype=markdown").await;
-
-        cx.set_shared_state(indoc! {r"
-            ```rs
-            impl Worktree {
-                pub async fn open_buffers(&self, path: &Path) -> impl Iterator<&Buffer> {
-            ˇ    }
-            }
-            ```
-        "})
-            .await;
-        cx.simulate_shared_keystrokes("[ {").await;
-        cx.shared_state().await.assert_eq(indoc! {r"
-            ```rs
-            impl Worktree {
-                pub async fn open_buffers(&self, path: &Path) -> impl Iterator<&Buffer> ˇ{
-                }
-            }
-            ```
-        "});
-
-        cx.set_shared_state(indoc! {r"
-            ```rs
-            impl Worktree {
-                pub async fn open_buffers(&self, path: &Path) -> impl Iterator<&Buffer> {
-                }   ˇ
-            }
-            ```
-        "})
-            .await;
-        cx.simulate_shared_keystrokes("[ {").await;
-        cx.shared_state().await.assert_eq(indoc! {r"
-            ```rs
-            impl Worktree ˇ{
-                pub async fn open_buffers(&self, path: &Path) -> impl Iterator<&Buffer> {
-                }  •
-            }
-            ```
-        "});
-    }
-
-    #[gpui::test]
-    async fn test_matching_tags(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new_html(cx).await;
-
-        cx.neovim.exec("set filetype=html").await;
-
-        cx.set_shared_state(indoc! {r"<bˇody></body>"}).await;
-        cx.simulate_shared_keystrokes("%").await;
-        cx.shared_state()
-            .await
-            .assert_eq(indoc! {r"<body><ˇ/body>"});
-        cx.simulate_shared_keystrokes("%").await;
-
-        // test jumping backwards
-        cx.shared_state()
-            .await
-            .assert_eq(indoc! {r"<ˇbody></body>"});
-
-        // test self-closing tags
-        cx.set_shared_state(indoc! {r"<a><bˇr/></a>"}).await;
-        cx.simulate_shared_keystrokes("%").await;
-        cx.shared_state().await.assert_eq(indoc! {r"<a><bˇr/></a>"});
-
-        // test tag with attributes
-        cx.set_shared_state(indoc! {r"<div class='test' ˇid='main'>
-            </div>
-            "})
-            .await;
-        cx.simulate_shared_keystrokes("%").await;
-        cx.shared_state()
-            .await
-            .assert_eq(indoc! {r"<div class='test' id='main'>
-            <ˇ/div>
-            "});
-
-        // test multi-line self-closing tag
-        cx.set_shared_state(indoc! {r#"<a>
-            <br
-                test = "test"
-            /ˇ>
-        </a>"#})
-            .await;
-        cx.simulate_shared_keystrokes("%").await;
-        cx.shared_state().await.assert_eq(indoc! {r#"<a>
-            ˇ<br
-                test = "test"
-            />
-        </a>"#});
-
-        // test nested closing tag
-        cx.set_shared_state(indoc! {r#"<html>
-            <bˇody>
-            </body>
-        </html>"#})
-            .await;
-        cx.simulate_shared_keystrokes("%").await;
-        cx.shared_state().await.assert_eq(indoc! {r#"<html>
-            <body>
-            <ˇ/body>
-        </html>"#});
-        cx.simulate_shared_keystrokes("%").await;
-        cx.shared_state().await.assert_eq(indoc! {r#"<html>
-            <ˇbody>
-            </body>
-        </html>"#});
-    }
-
-    #[gpui::test]
-    async fn test_matching_braces_in_tag(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new_typescript(cx).await;
-
-        // test brackets within tags
-        cx.set_shared_state(indoc! {r"function f() {
-            return (
-                <div rules={ˇ[{ a: 1 }]}>
-                    <h1>test</h1>
-                </div>
-            );
-        }"})
-            .await;
-        cx.simulate_shared_keystrokes("%").await;
-        cx.shared_state().await.assert_eq(indoc! {r"function f() {
-            return (
-                <div rules={[{ a: 1 }ˇ]}>
-                    <h1>test</h1>
-                </div>
-            );
-        }"});
-    }
-
-    #[gpui::test]
-    async fn test_matching_nested_brackets(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new_tsx(cx).await;
-
-        cx.set_shared_state(indoc! {r"<Button onClick=ˇ{() => {}}></Button>"})
-            .await;
-        cx.simulate_shared_keystrokes("%").await;
-        cx.shared_state()
-            .await
-            .assert_eq(indoc! {r"<Button onClick={() => {}ˇ}></Button>"});
-        cx.simulate_shared_keystrokes("%").await;
-        cx.shared_state()
-            .await
-            .assert_eq(indoc! {r"<Button onClick=ˇ{() => {}}></Button>"});
-    }
-
-    #[gpui::test]
-    async fn test_comma_semicolon(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        // f and F
-        cx.set_shared_state("ˇone two three four").await;
-        cx.simulate_shared_keystrokes("f o").await;
-        cx.shared_state().await.assert_eq("one twˇo three four");
-        cx.simulate_shared_keystrokes(",").await;
-        cx.shared_state().await.assert_eq("ˇone two three four");
-        cx.simulate_shared_keystrokes("2 ;").await;
-        cx.shared_state().await.assert_eq("one two three fˇour");
-        cx.simulate_shared_keystrokes("shift-f e").await;
-        cx.shared_state().await.assert_eq("one two threˇe four");
-        cx.simulate_shared_keystrokes("2 ;").await;
-        cx.shared_state().await.assert_eq("onˇe two three four");
-        cx.simulate_shared_keystrokes(",").await;
-        cx.shared_state().await.assert_eq("one two thrˇee four");
-
-        // t and T
-        cx.set_shared_state("ˇone two three four").await;
-        cx.simulate_shared_keystrokes("t o").await;
-        cx.shared_state().await.assert_eq("one tˇwo three four");
-        cx.simulate_shared_keystrokes(",").await;
-        cx.shared_state().await.assert_eq("oˇne two three four");
-        cx.simulate_shared_keystrokes("2 ;").await;
-        cx.shared_state().await.assert_eq("one two three ˇfour");
-        cx.simulate_shared_keystrokes("shift-t e").await;
-        cx.shared_state().await.assert_eq("one two threeˇ four");
-        cx.simulate_shared_keystrokes("3 ;").await;
-        cx.shared_state().await.assert_eq("oneˇ two three four");
-        cx.simulate_shared_keystrokes(",").await;
-        cx.shared_state().await.assert_eq("one two thˇree four");
-    }
-
-    #[gpui::test]
-    async fn test_next_word_end_newline_last_char(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        let initial_state = indoc! {r"something(ˇfoo)"};
-        cx.set_shared_state(initial_state).await;
-        cx.simulate_shared_keystrokes("}").await;
-        cx.shared_state().await.assert_eq("something(fooˇ)");
-    }
-
-    #[gpui::test]
-    async fn test_next_line_start(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.set_shared_state("ˇone\n  two\nthree").await;
-        cx.simulate_shared_keystrokes("enter").await;
-        cx.shared_state().await.assert_eq("one\n  ˇtwo\nthree");
-    }
-
-    #[gpui::test]
-    async fn test_end_of_line_downward(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.set_shared_state("ˇ one\n two \nthree").await;
-        cx.simulate_shared_keystrokes("g _").await;
-        cx.shared_state().await.assert_eq(" onˇe\n two \nthree");
-
-        cx.set_shared_state("ˇ one \n two \nthree").await;
-        cx.simulate_shared_keystrokes("g _").await;
-        cx.shared_state().await.assert_eq(" onˇe \n two \nthree");
-        cx.simulate_shared_keystrokes("2 g _").await;
-        cx.shared_state().await.assert_eq(" one \n twˇo \nthree");
-    }
-
-    #[gpui::test]
-    async fn test_window_top(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        let initial_state = indoc! {r"abc
-          def
-          paragraph
-          the second
-          third ˇand
-          final"};
-
-        cx.set_shared_state(initial_state).await;
-        cx.simulate_shared_keystrokes("shift-h").await;
-        cx.shared_state().await.assert_eq(indoc! {r"abˇc
-          def
-          paragraph
-          the second
-          third and
-          final"});
-
-        // clip point
-        cx.set_shared_state(indoc! {r"
-          1 2 3
-          4 5 6
-          7 8 ˇ9
-          "})
-            .await;
-        cx.simulate_shared_keystrokes("shift-h").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-          1 2 ˇ3
-          4 5 6
-          7 8 9
-          "});
-
-        cx.set_shared_state(indoc! {r"
-          1 2 3
-          4 5 6
-          ˇ7 8 9
-          "})
-            .await;
-        cx.simulate_shared_keystrokes("shift-h").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-          ˇ1 2 3
-          4 5 6
-          7 8 9
-          "});
-
-        cx.set_shared_state(indoc! {r"
-          1 2 3
-          4 5 ˇ6
-          7 8 9"})
-            .await;
-        cx.simulate_shared_keystrokes("9 shift-h").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-          1 2 3
-          4 5 6
-          7 8 ˇ9"});
-    }
-
-    #[gpui::test]
-    async fn test_window_middle(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        let initial_state = indoc! {r"abˇc
-          def
-          paragraph
-          the second
-          third and
-          final"};
-
-        cx.set_shared_state(initial_state).await;
-        cx.simulate_shared_keystrokes("shift-m").await;
-        cx.shared_state().await.assert_eq(indoc! {r"abc
-          def
-          paˇragraph
-          the second
-          third and
-          final"});
-
-        cx.set_shared_state(indoc! {r"
-          1 2 3
-          4 5 6
-          7 8 ˇ9
-          "})
-            .await;
-        cx.simulate_shared_keystrokes("shift-m").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-          1 2 3
-          4 5 ˇ6
-          7 8 9
-          "});
-        cx.set_shared_state(indoc! {r"
-          1 2 3
-          4 5 6
-          ˇ7 8 9
-          "})
-            .await;
-        cx.simulate_shared_keystrokes("shift-m").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-          1 2 3
-          ˇ4 5 6
-          7 8 9
-          "});
-        cx.set_shared_state(indoc! {r"
-          ˇ1 2 3
-          4 5 6
-          7 8 9
-          "})
-            .await;
-        cx.simulate_shared_keystrokes("shift-m").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-          1 2 3
-          ˇ4 5 6
-          7 8 9
-          "});
-        cx.set_shared_state(indoc! {r"
-          1 2 3
-          ˇ4 5 6
-          7 8 9
-          "})
-            .await;
-        cx.simulate_shared_keystrokes("shift-m").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-          1 2 3
-          ˇ4 5 6
-          7 8 9
-          "});
-        cx.set_shared_state(indoc! {r"
-          1 2 3
-          4 5 ˇ6
-          7 8 9
-          "})
-            .await;
-        cx.simulate_shared_keystrokes("shift-m").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-          1 2 3
-          4 5 ˇ6
-          7 8 9
-          "});
-    }
-
-    #[gpui::test]
-    async fn test_window_bottom(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        let initial_state = indoc! {r"abc
-          deˇf
-          paragraph
-          the second
-          third and
-          final"};
-
-        cx.set_shared_state(initial_state).await;
-        cx.simulate_shared_keystrokes("shift-l").await;
-        cx.shared_state().await.assert_eq(indoc! {r"abc
-          def
-          paragraph
-          the second
-          third and
-          fiˇnal"});
-
-        cx.set_shared_state(indoc! {r"
-          1 2 3
-          4 5 ˇ6
-          7 8 9
-          "})
-            .await;
-        cx.simulate_shared_keystrokes("shift-l").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-          1 2 3
-          4 5 6
-          7 8 9
-          ˇ"});
-
-        cx.set_shared_state(indoc! {r"
-          1 2 3
-          ˇ4 5 6
-          7 8 9
-          "})
-            .await;
-        cx.simulate_shared_keystrokes("shift-l").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-          1 2 3
-          4 5 6
-          7 8 9
-          ˇ"});
-
-        cx.set_shared_state(indoc! {r"
-          1 2 ˇ3
-          4 5 6
-          7 8 9
-          "})
-            .await;
-        cx.simulate_shared_keystrokes("shift-l").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-          1 2 3
-          4 5 6
-          7 8 9
-          ˇ"});
-
-        cx.set_shared_state(indoc! {r"
-          ˇ1 2 3
-          4 5 6
-          7 8 9
-          "})
-            .await;
-        cx.simulate_shared_keystrokes("shift-l").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-          1 2 3
-          4 5 6
-          7 8 9
-          ˇ"});
-
-        cx.set_shared_state(indoc! {r"
-          1 2 3
-          4 5 ˇ6
-          7 8 9
-          "})
-            .await;
-        cx.simulate_shared_keystrokes("9 shift-l").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-          1 2 ˇ3
-          4 5 6
-          7 8 9
-          "});
-    }
-
-    #[gpui::test]
-    async fn test_previous_word_end(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.set_shared_state(indoc! {r"
-        456 5ˇ67 678
-        "})
-            .await;
-        cx.simulate_shared_keystrokes("g e").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-        45ˇ6 567 678
-        "});
-
-        // Test times
-        cx.set_shared_state(indoc! {r"
-        123 234 345
-        456 5ˇ67 678
-        "})
-            .await;
-        cx.simulate_shared_keystrokes("4 g e").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-        12ˇ3 234 345
-        456 567 678
-        "});
-
-        // With punctuation
-        cx.set_shared_state(indoc! {r"
-        123 234 345
-        4;5.6 5ˇ67 678
-        789 890 901
-        "})
-            .await;
-        cx.simulate_shared_keystrokes("g e").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-          123 234 345
-          4;5.ˇ6 567 678
-          789 890 901
-        "});
-
-        // With punctuation and count
-        cx.set_shared_state(indoc! {r"
-        123 234 345
-        4;5.6 5ˇ67 678
-        789 890 901
-        "})
-            .await;
-        cx.simulate_shared_keystrokes("5 g e").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-          123 234 345
-          ˇ4;5.6 567 678
-          789 890 901
-        "});
-
-        // newlines
-        cx.set_shared_state(indoc! {r"
-        123 234 345
-
-        78ˇ9 890 901
-        "})
-            .await;
-        cx.simulate_shared_keystrokes("g e").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-          123 234 345
-          ˇ
-          789 890 901
-        "});
-        cx.simulate_shared_keystrokes("g e").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-          123 234 34ˇ5
-
-          789 890 901
-        "});
-
-        // With punctuation
-        cx.set_shared_state(indoc! {r"
-        123 234 345
-        4;5.ˇ6 567 678
-        789 890 901
-        "})
-            .await;
-        cx.simulate_shared_keystrokes("g shift-e").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-          123 234 34ˇ5
-          4;5.6 567 678
-          789 890 901
-        "});
-
-        // With multi byte char
-        cx.set_shared_state(indoc! {r"
-        bar ˇó
-        "})
-            .await;
-        cx.simulate_shared_keystrokes("g e").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-        baˇr ó
-        "});
-    }
-
-    #[gpui::test]
-    async fn test_visual_match_eol(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {"
-            fn aˇ() {
-              return
-            }
-        "})
-            .await;
-        cx.simulate_shared_keystrokes("v $ %").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            fn a«() {
-              return
-            }ˇ»
-        "});
-    }
-
-    #[gpui::test]
-    async fn test_clipping_with_inlay_hints(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        cx.set_state(
-            indoc! {"
-                struct Foo {
-                ˇ
-                }
-            "},
-            Mode::Normal,
-        );
-
-        cx.update_editor(|editor, _window, cx| {
-            let range = editor.selections.newest_anchor().range();
-            let inlay_text = "  field: int,\n  field2: string\n  field3: float";
-            let inlay = Inlay::edit_prediction(1, range.start, inlay_text);
-            editor.splice_inlays(&[], vec![inlay], cx);
-        });
-
-        cx.simulate_keystrokes("j");
-        cx.assert_state(
-            indoc! {"
-                struct Foo {
-
-                ˇ}
-            "},
-            Mode::Normal,
-        );
-    }
-
-    #[gpui::test]
-    async fn test_clipping_with_inlay_hints_end_of_line(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        cx.set_state(
-            indoc! {"
-            ˇstruct Foo {
-
-            }
-        "},
-            Mode::Normal,
-        );
-        cx.update_editor(|editor, _window, cx| {
-            let snapshot = editor.buffer().read(cx).snapshot(cx);
-            let end_of_line =
-                snapshot.anchor_after(Point::new(0, snapshot.line_len(MultiBufferRow(0))));
-            let inlay_text = " hint";
-            let inlay = Inlay::edit_prediction(1, end_of_line, inlay_text);
-            editor.splice_inlays(&[], vec![inlay], cx);
-        });
-        cx.simulate_keystrokes("$");
-        cx.assert_state(
-            indoc! {"
-            struct Foo ˇ{
-
-            }
-        "},
-            Mode::Normal,
-        );
-    }
-
-    #[gpui::test]
-    async fn test_visual_mode_with_inlay_hints_on_empty_line(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        // Test the exact scenario from issue #29134
-        cx.set_state(
-            indoc! {"
-                fn main() {
-                    let this_is_a_long_name = Vec::<u32>::new();
-                    let new_oneˇ = this_is_a_long_name
-                        .iter()
-                        .map(|i| i + 1)
-                        .map(|i| i * 2)
-                        .collect::<Vec<_>>();
-                }
-            "},
-            Mode::Normal,
-        );
-
-        // Add type hint inlay on the empty line (line 3, after "this_is_a_long_name")
-        cx.update_editor(|editor, _window, cx| {
-            let snapshot = editor.buffer().read(cx).snapshot(cx);
-            // The empty line is at line 3 (0-indexed)
-            let line_start = snapshot.anchor_after(Point::new(3, 0));
-            let inlay_text = ": Vec<u32>";
-            let inlay = Inlay::edit_prediction(1, line_start, inlay_text);
-            editor.splice_inlays(&[], vec![inlay], cx);
-        });
-
-        // Enter visual mode
-        cx.simulate_keystrokes("v");
-        cx.assert_state(
-            indoc! {"
-                fn main() {
-                    let this_is_a_long_name = Vec::<u32>::new();
-                    let new_one« ˇ»= this_is_a_long_name
-                        .iter()
-                        .map(|i| i + 1)
-                        .map(|i| i * 2)
-                        .collect::<Vec<_>>();
-                }
-            "},
-            Mode::Visual,
-        );
-
-        // Move down - should go to the beginning of line 4, not skip to line 5
-        cx.simulate_keystrokes("j");
-        cx.assert_state(
-            indoc! {"
-                fn main() {
-                    let this_is_a_long_name = Vec::<u32>::new();
-                    let new_one« = this_is_a_long_name
-                      ˇ»  .iter()
-                        .map(|i| i + 1)
-                        .map(|i| i * 2)
-                        .collect::<Vec<_>>();
-                }
-            "},
-            Mode::Visual,
-        );
-
-        // Test with multiple movements
-        cx.set_state("let aˇ = 1;\nlet b = 2;\n\nlet c = 3;", Mode::Normal);
-
-        // Add type hint on the empty line
-        cx.update_editor(|editor, _window, cx| {
-            let snapshot = editor.buffer().read(cx).snapshot(cx);
-            let empty_line_start = snapshot.anchor_after(Point::new(2, 0));
-            let inlay_text = ": i32";
-            let inlay = Inlay::edit_prediction(2, empty_line_start, inlay_text);
-            editor.splice_inlays(&[], vec![inlay], cx);
-        });
-
-        // Enter visual mode and move down twice
-        cx.simulate_keystrokes("v j j");
-        cx.assert_state("let a« = 1;\nlet b = 2;\n\nˇ»let c = 3;", Mode::Visual);
-    }
-
-    #[gpui::test]
-    async fn test_go_to_percentage(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        // Normal mode
-        cx.set_shared_state(indoc! {"
-            The ˇquick brown
-            fox jumps over
-            the lazy dog
-            The quick brown
-            fox jumps over
-            the lazy dog
-            The quick brown
-            fox jumps over
-            the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("2 0 %").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            The quick brown
-            fox ˇjumps over
-            the lazy dog
-            The quick brown
-            fox jumps over
-            the lazy dog
-            The quick brown
-            fox jumps over
-            the lazy dog"});
-
-        cx.simulate_shared_keystrokes("2 5 %").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            The quick brown
-            fox jumps over
-            the ˇlazy dog
-            The quick brown
-            fox jumps over
-            the lazy dog
-            The quick brown
-            fox jumps over
-            the lazy dog"});
-
-        cx.simulate_shared_keystrokes("7 5 %").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            The quick brown
-            fox jumps over
-            the lazy dog
-            The quick brown
-            fox jumps over
-            the lazy dog
-            The ˇquick brown
-            fox jumps over
-            the lazy dog"});
-
-        // Visual mode
-        cx.set_shared_state(indoc! {"
-            The ˇquick brown
-            fox jumps over
-            the lazy dog
-            The quick brown
-            fox jumps over
-            the lazy dog
-            The quick brown
-            fox jumps over
-            the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("v 5 0 %").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            The «quick brown
-            fox jumps over
-            the lazy dog
-            The quick brown
-            fox jˇ»umps over
-            the lazy dog
-            The quick brown
-            fox jumps over
-            the lazy dog"});
-
-        cx.set_shared_state(indoc! {"
-            The ˇquick brown
-            fox jumps over
-            the lazy dog
-            The quick brown
-            fox jumps over
-            the lazy dog
-            The quick brown
-            fox jumps over
-            the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("v 1 0 0 %").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            The «quick brown
-            fox jumps over
-            the lazy dog
-            The quick brown
-            fox jumps over
-            the lazy dog
-            The quick brown
-            fox jumps over
-            the lˇ»azy dog"});
-    }
-
-    #[gpui::test]
-    async fn test_space_non_ascii(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state("ˇπππππ").await;
-        cx.simulate_shared_keystrokes("3 space").await;
-        cx.shared_state().await.assert_eq("πππˇππ");
-    }
-
-    #[gpui::test]
-    async fn test_space_non_ascii_eol(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {"
-            ππππˇπ
-            πanotherline"})
-            .await;
-        cx.simulate_shared_keystrokes("4 space").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            πππππ
-            πanˇotherline"});
-    }
-
-    #[gpui::test]
-    async fn test_backspace_non_ascii_bol(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {"
-                        ππππ
-                        πanˇotherline"})
-            .await;
-        cx.simulate_shared_keystrokes("4 backspace").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-                        πππˇπ
-                        πanotherline"});
-    }
-
-    #[gpui::test]
-    async fn test_go_to_indent(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-        cx.set_state(
-            indoc! {
-                "func empty(a string) bool {
-                     ˇif a == \"\" {
-                         return true
-                     }
-                     return false
-                }"
-            },
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("[ -");
-        cx.assert_state(
-            indoc! {
-                "ˇfunc empty(a string) bool {
-                     if a == \"\" {
-                         return true
-                     }
-                     return false
-                }"
-            },
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("] =");
-        cx.assert_state(
-            indoc! {
-                "func empty(a string) bool {
-                     if a == \"\" {
-                         return true
-                     }
-                     return false
-                ˇ}"
-            },
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("[ +");
-        cx.assert_state(
-            indoc! {
-                "func empty(a string) bool {
-                     if a == \"\" {
-                         return true
-                     }
-                     ˇreturn false
-                }"
-            },
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("2 [ =");
-        cx.assert_state(
-            indoc! {
-                "func empty(a string) bool {
-                     ˇif a == \"\" {
-                         return true
-                     }
-                     return false
-                }"
-            },
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("] +");
-        cx.assert_state(
-            indoc! {
-                "func empty(a string) bool {
-                     if a == \"\" {
-                         ˇreturn true
-                     }
-                     return false
-                }"
-            },
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("] -");
-        cx.assert_state(
-            indoc! {
-                "func empty(a string) bool {
-                     if a == \"\" {
-                         return true
-                     ˇ}
-                     return false
-                }"
-            },
-            Mode::Normal,
-        );
-    }
-
-    #[gpui::test]
-    async fn test_delete_key_can_remove_last_character(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.set_shared_state("abˇc").await;
-        cx.simulate_shared_keystrokes("delete").await;
-        cx.shared_state().await.assert_eq("aˇb");
-    }
-
-    #[gpui::test]
-    async fn test_forced_motion_delete_to_start_of_line(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {"
-             ˇthe quick brown fox
-             jumped over the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("d v 0").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-             ˇhe quick brown fox
-             jumped over the lazy dog"});
-        assert!(!cx.cx.forced_motion());
-
-        cx.set_shared_state(indoc! {"
-            the quick bˇrown fox
-            jumped over the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("d v 0").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            ˇown fox
-            jumped over the lazy dog"});
-        assert!(!cx.cx.forced_motion());
-
-        cx.set_shared_state(indoc! {"
-            the quick brown foˇx
-            jumped over the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("d v 0").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            ˇ
-            jumped over the lazy dog"});
-        assert!(!cx.cx.forced_motion());
-    }
-
-    #[gpui::test]
-    async fn test_forced_motion_delete_to_middle_of_line(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {"
-             ˇthe quick brown fox
-             jumped over the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("d v g shift-m").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-             ˇbrown fox
-             jumped over the lazy dog"});
-        assert!(!cx.cx.forced_motion());
-
-        cx.set_shared_state(indoc! {"
-            the quick bˇrown fox
-            jumped over the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("d v g shift-m").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            the quickˇown fox
-            jumped over the lazy dog"});
-        assert!(!cx.cx.forced_motion());
-
-        cx.set_shared_state(indoc! {"
-            the quick brown foˇx
-            jumped over the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("d v g shift-m").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            the quicˇk
-            jumped over the lazy dog"});
-        assert!(!cx.cx.forced_motion());
-
-        cx.set_shared_state(indoc! {"
-            ˇthe quick brown fox
-            jumped over the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("d v 7 5 g shift-m").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            ˇ fox
-            jumped over the lazy dog"});
-        assert!(!cx.cx.forced_motion());
-
-        cx.set_shared_state(indoc! {"
-            ˇthe quick brown fox
-            jumped over the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("d v 2 3 g shift-m").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            ˇuick brown fox
-            jumped over the lazy dog"});
-        assert!(!cx.cx.forced_motion());
-    }
-
-    #[gpui::test]
-    async fn test_forced_motion_delete_to_end_of_line(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {"
-             the quick brown foˇx
-             jumped over the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("d v $").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-             the quick brown foˇx
-             jumped over the lazy dog"});
-        assert!(!cx.cx.forced_motion());
-
-        cx.set_shared_state(indoc! {"
-             ˇthe quick brown fox
-             jumped over the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("d v $").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-             ˇx
-             jumped over the lazy dog"});
-        assert!(!cx.cx.forced_motion());
-    }
-
-    #[gpui::test]
-    async fn test_forced_motion_yank(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {"
-               ˇthe quick brown fox
-               jumped over the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("y v j p").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-               the quick brown fox
-               ˇthe quick brown fox
-               jumped over the lazy dog"});
-        assert!(!cx.cx.forced_motion());
-
-        cx.set_shared_state(indoc! {"
-              the quick bˇrown fox
-              jumped over the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("y v j p").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-              the quick brˇrown fox
-              jumped overown fox
-              jumped over the lazy dog"});
-        assert!(!cx.cx.forced_motion());
-
-        cx.set_shared_state(indoc! {"
-             the quick brown foˇx
-             jumped over the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("y v j p").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-             the quick brown foxˇx
-             jumped over the la
-             jumped over the lazy dog"});
-        assert!(!cx.cx.forced_motion());
-
-        cx.set_shared_state(indoc! {"
-             the quick brown fox
-             jˇumped over the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("y v k p").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            thˇhe quick brown fox
-            je quick brown fox
-            jumped over the lazy dog"});
-        assert!(!cx.cx.forced_motion());
-    }
-
-    #[gpui::test]
-    async fn test_inclusive_to_exclusive_delete(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {"
-              ˇthe quick brown fox
-              jumped over the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("d v e").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-              ˇe quick brown fox
-              jumped over the lazy dog"});
-        assert!(!cx.cx.forced_motion());
-
-        cx.set_shared_state(indoc! {"
-              the quick bˇrown fox
-              jumped over the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("d v e").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-              the quick bˇn fox
-              jumped over the lazy dog"});
-        assert!(!cx.cx.forced_motion());
-
-        cx.set_shared_state(indoc! {"
-             the quick brown foˇx
-             jumped over the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("d v e").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-        the quick brown foˇd over the lazy dog"});
-        assert!(!cx.cx.forced_motion());
-    }
-}
diff --git a/crates/vim/src/normal.rs b/crates/vim/src/normal.rs
deleted file mode 100644
index aee0b424f0..0000000000
--- a/crates/vim/src/normal.rs
+++ /dev/null
@@ -1,2320 +0,0 @@
-mod change;
-mod convert;
-mod delete;
-mod increment;
-pub(crate) mod mark;
-pub(crate) mod paste;
-pub(crate) mod repeat;
-mod scroll;
-pub(crate) mod search;
-pub mod substitute;
-mod toggle_comments;
-pub(crate) mod yank;
-
-use std::collections::HashMap;
-use std::sync::Arc;
-
-use crate::{
-    Vim,
-    indent::IndentDirection,
-    motion::{self, Motion, first_non_whitespace, next_line_end, right},
-    object::Object,
-    state::{Mark, Mode, Operator},
-    surrounds::SurroundsType,
-};
-use collections::BTreeSet;
-use convert::ConvertTarget;
-use editor::Editor;
-use editor::{Anchor, SelectionEffects};
-use editor::{Bias, ToPoint};
-use editor::{display_map::ToDisplayPoint, movement};
-use gpui::{Context, Window, actions};
-use language::{Point, SelectionGoal};
-use log::error;
-use multi_buffer::MultiBufferRow;
-
-actions!(
-    vim,
-    [
-        /// Inserts text after the cursor.
-        InsertAfter,
-        /// Inserts text before the cursor.
-        InsertBefore,
-        /// Inserts at the first non-whitespace character.
-        InsertFirstNonWhitespace,
-        /// Inserts at the end of the line.
-        InsertEndOfLine,
-        /// Inserts a new line above the current line.
-        InsertLineAbove,
-        /// Inserts a new line below the current line.
-        InsertLineBelow,
-        /// Inserts an empty line above without entering insert mode.
-        InsertEmptyLineAbove,
-        /// Inserts an empty line below without entering insert mode.
-        InsertEmptyLineBelow,
-        /// Inserts at the previous insert position.
-        InsertAtPrevious,
-        /// Joins the current line with the next line.
-        JoinLines,
-        /// Joins lines without adding whitespace.
-        JoinLinesNoWhitespace,
-        /// Deletes character to the left.
-        DeleteLeft,
-        /// Deletes character to the right.
-        DeleteRight,
-        /// Deletes using Helix-style behavior.
-        HelixDelete,
-        /// Collapse the current selection
-        HelixCollapseSelection,
-        /// Changes from cursor to end of line.
-        ChangeToEndOfLine,
-        /// Deletes from cursor to end of line.
-        DeleteToEndOfLine,
-        /// Yanks (copies) the selected text.
-        Yank,
-        /// Yanks the entire line.
-        YankLine,
-        /// Yanks from cursor to end of line.
-        YankToEndOfLine,
-        /// Toggles the case of selected text.
-        ChangeCase,
-        /// Converts selected text to uppercase.
-        ConvertToUpperCase,
-        /// Converts selected text to lowercase.
-        ConvertToLowerCase,
-        /// Applies ROT13 cipher to selected text.
-        ConvertToRot13,
-        /// Applies ROT47 cipher to selected text.
-        ConvertToRot47,
-        /// Toggles comments for selected lines.
-        ToggleComments,
-        /// Shows the current location in the file.
-        ShowLocation,
-        /// Undoes the last change.
-        Undo,
-        /// Redoes the last undone change.
-        Redo,
-        /// Undoes all changes to the most recently changed line.
-        UndoLastLine,
-        /// Go to tab page (with count support).
-        GoToTab,
-        /// Go to previous tab page (with count support).
-        GoToPreviousTab,
-        /// Go to tab page (with count support).
-        GoToPreviousReference,
-        /// Go to previous tab page (with count support).
-        GoToNextReference,
-    ]
-);
-
-pub(crate) fn register(editor: &mut Editor, cx: &mut Context<Vim>) {
-    Vim::action(editor, cx, Vim::insert_after);
-    Vim::action(editor, cx, Vim::insert_before);
-    Vim::action(editor, cx, Vim::insert_first_non_whitespace);
-    Vim::action(editor, cx, Vim::insert_end_of_line);
-    Vim::action(editor, cx, Vim::insert_line_above);
-    Vim::action(editor, cx, Vim::insert_line_below);
-    Vim::action(editor, cx, Vim::insert_empty_line_above);
-    Vim::action(editor, cx, Vim::insert_empty_line_below);
-    Vim::action(editor, cx, Vim::insert_at_previous);
-    Vim::action(editor, cx, Vim::change_case);
-    Vim::action(editor, cx, Vim::convert_to_upper_case);
-    Vim::action(editor, cx, Vim::convert_to_lower_case);
-    Vim::action(editor, cx, Vim::convert_to_rot13);
-    Vim::action(editor, cx, Vim::convert_to_rot47);
-    Vim::action(editor, cx, Vim::yank_line);
-    Vim::action(editor, cx, Vim::yank_to_end_of_line);
-    Vim::action(editor, cx, Vim::toggle_comments);
-    Vim::action(editor, cx, Vim::paste);
-    Vim::action(editor, cx, Vim::show_location);
-
-    Vim::action(editor, cx, |vim, _: &DeleteLeft, window, cx| {
-        vim.record_current_action(cx);
-        let times = Vim::take_count(cx);
-        let forced_motion = Vim::take_forced_motion(cx);
-        vim.delete_motion(Motion::Left, times, forced_motion, window, cx);
-    });
-    Vim::action(editor, cx, |vim, _: &DeleteRight, window, cx| {
-        vim.record_current_action(cx);
-        let times = Vim::take_count(cx);
-        let forced_motion = Vim::take_forced_motion(cx);
-        vim.delete_motion(Motion::Right, times, forced_motion, window, cx);
-    });
-
-    Vim::action(editor, cx, |vim, _: &HelixDelete, window, cx| {
-        vim.record_current_action(cx);
-        vim.update_editor(cx, |_, editor, cx| {
-            editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                s.move_with(|map, selection| {
-                    if selection.is_empty() {
-                        selection.end = movement::right(map, selection.end)
-                    }
-                })
-            })
-        });
-        vim.visual_delete(false, window, cx);
-        vim.switch_mode(Mode::HelixNormal, true, window, cx);
-    });
-
-    Vim::action(editor, cx, |vim, _: &HelixCollapseSelection, window, cx| {
-        vim.update_editor(cx, |_, editor, cx| {
-            editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                s.move_with(|map, selection| {
-                    let mut point = selection.head();
-                    if !selection.reversed && !selection.is_empty() {
-                        point = movement::left(map, selection.head());
-                    }
-                    selection.collapse_to(point, selection.goal)
-                });
-            });
-        });
-    });
-
-    Vim::action(editor, cx, |vim, _: &ChangeToEndOfLine, window, cx| {
-        vim.start_recording(cx);
-        let times = Vim::take_count(cx);
-        let forced_motion = Vim::take_forced_motion(cx);
-        vim.change_motion(
-            Motion::EndOfLine {
-                display_lines: false,
-            },
-            times,
-            forced_motion,
-            window,
-            cx,
-        );
-    });
-    Vim::action(editor, cx, |vim, _: &DeleteToEndOfLine, window, cx| {
-        vim.record_current_action(cx);
-        let times = Vim::take_count(cx);
-        let forced_motion = Vim::take_forced_motion(cx);
-        vim.delete_motion(
-            Motion::EndOfLine {
-                display_lines: false,
-            },
-            times,
-            forced_motion,
-            window,
-            cx,
-        );
-    });
-    Vim::action(editor, cx, |vim, _: &JoinLines, window, cx| {
-        vim.join_lines_impl(true, window, cx);
-    });
-
-    Vim::action(editor, cx, |vim, _: &JoinLinesNoWhitespace, window, cx| {
-        vim.join_lines_impl(false, window, cx);
-    });
-
-    Vim::action(editor, cx, |vim, _: &GoToPreviousReference, window, cx| {
-        let count = Vim::take_count(cx);
-        vim.update_editor(cx, |_, editor, cx| {
-            let task = editor.go_to_reference_before_or_after_position(
-                editor::Direction::Prev,
-                count.unwrap_or(1),
-                window,
-                cx,
-            );
-            if let Some(task) = task {
-                task.detach_and_log_err(cx);
-            };
-        });
-    });
-
-    Vim::action(editor, cx, |vim, _: &GoToNextReference, window, cx| {
-        let count = Vim::take_count(cx);
-        vim.update_editor(cx, |_, editor, cx| {
-            let task = editor.go_to_reference_before_or_after_position(
-                editor::Direction::Next,
-                count.unwrap_or(1),
-                window,
-                cx,
-            );
-            if let Some(task) = task {
-                task.detach_and_log_err(cx);
-            };
-        });
-    });
-
-    Vim::action(editor, cx, |vim, _: &Undo, window, cx| {
-        let times = Vim::take_count(cx);
-        Vim::take_forced_motion(cx);
-        vim.update_editor(cx, |_, editor, cx| {
-            for _ in 0..times.unwrap_or(1) {
-                editor.undo(&editor::actions::Undo, window, cx);
-            }
-        });
-    });
-    Vim::action(editor, cx, |vim, _: &Redo, window, cx| {
-        let times = Vim::take_count(cx);
-        Vim::take_forced_motion(cx);
-        vim.update_editor(cx, |_, editor, cx| {
-            for _ in 0..times.unwrap_or(1) {
-                editor.redo(&editor::actions::Redo, window, cx);
-            }
-        });
-    });
-    Vim::action(editor, cx, |vim, _: &UndoLastLine, window, cx| {
-        Vim::take_forced_motion(cx);
-        vim.update_editor(cx, |vim, editor, cx| {
-            let snapshot = editor.buffer().read(cx).snapshot(cx);
-            let Some(last_change) = editor.change_list.last_before_grouping() else {
-                return;
-            };
-
-            let anchors = last_change.to_vec();
-            let mut last_row = None;
-            let ranges: Vec<_> = anchors
-                .iter()
-                .filter_map(|anchor| {
-                    let point = anchor.to_point(&snapshot);
-                    if last_row == Some(point.row) {
-                        return None;
-                    }
-                    last_row = Some(point.row);
-                    let line_range = Point::new(point.row, 0)
-                        ..Point::new(point.row, snapshot.line_len(MultiBufferRow(point.row)));
-                    Some((
-                        snapshot.anchor_before(line_range.start)
-                            ..snapshot.anchor_after(line_range.end),
-                        line_range,
-                    ))
-                })
-                .collect();
-
-            let edits = editor.buffer().update(cx, |buffer, cx| {
-                let current_content = ranges
-                    .iter()
-                    .map(|(anchors, _)| {
-                        buffer
-                            .snapshot(cx)
-                            .text_for_range(anchors.clone())
-                            .collect::<String>()
-                    })
-                    .collect::<Vec<_>>();
-                let mut content_before_undo = current_content.clone();
-                let mut undo_count = 0;
-
-                loop {
-                    let undone_tx = buffer.undo(cx);
-                    undo_count += 1;
-                    let mut content_after_undo = Vec::new();
-
-                    let mut line_changed = false;
-                    for ((anchors, _), text_before_undo) in
-                        ranges.iter().zip(content_before_undo.iter())
-                    {
-                        let snapshot = buffer.snapshot(cx);
-                        let text_after_undo =
-                            snapshot.text_for_range(anchors.clone()).collect::<String>();
-
-                        if &text_after_undo != text_before_undo {
-                            line_changed = true;
-                        }
-                        content_after_undo.push(text_after_undo);
-                    }
-
-                    content_before_undo = content_after_undo;
-                    if !line_changed {
-                        break;
-                    }
-                    if undone_tx == vim.undo_last_line_tx {
-                        break;
-                    }
-                }
-
-                let edits = ranges
-                    .into_iter()
-                    .zip(content_before_undo.into_iter().zip(current_content))
-                    .filter_map(|((_, mut points), (mut old_text, new_text))| {
-                        if new_text == old_text {
-                            return None;
-                        }
-                        let common_suffix_starts_at = old_text
-                            .char_indices()
-                            .rev()
-                            .zip(new_text.chars().rev())
-                            .find_map(
-                                |((i, a), b)| {
-                                    if a != b { Some(i + a.len_utf8()) } else { None }
-                                },
-                            )
-                            .unwrap_or(old_text.len());
-                        points.end.column -= (old_text.len() - common_suffix_starts_at) as u32;
-                        old_text = old_text.split_at(common_suffix_starts_at).0.to_string();
-                        let common_prefix_len = old_text
-                            .char_indices()
-                            .zip(new_text.chars())
-                            .find_map(|((i, a), b)| if a != b { Some(i) } else { None })
-                            .unwrap_or(0);
-                        points.start.column = common_prefix_len as u32;
-                        old_text = old_text.split_at(common_prefix_len).1.to_string();
-
-                        Some((points, old_text))
-                    })
-                    .collect::<Vec<_>>();
-
-                for _ in 0..undo_count {
-                    buffer.redo(cx);
-                }
-                edits
-            });
-            vim.undo_last_line_tx = editor.transact(window, cx, |editor, window, cx| {
-                editor.change_list.invert_last_group();
-                editor.edit(edits, cx);
-                editor.change_selections(SelectionEffects::default(), window, cx, |s| {
-                    s.select_anchor_ranges(anchors.into_iter().map(|a| a..a));
-                })
-            });
-        });
-    });
-
-    repeat::register(editor, cx);
-    scroll::register(editor, cx);
-    search::register(editor, cx);
-    substitute::register(editor, cx);
-    increment::register(editor, cx);
-}
-
-impl Vim {
-    pub fn normal_motion(
-        &mut self,
-        motion: Motion,
-        operator: Option<Operator>,
-        times: Option<usize>,
-        forced_motion: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        match operator {
-            None => self.move_cursor(motion, times, window, cx),
-            Some(Operator::Change) => self.change_motion(motion, times, forced_motion, window, cx),
-            Some(Operator::Delete) => self.delete_motion(motion, times, forced_motion, window, cx),
-            Some(Operator::Yank) => self.yank_motion(motion, times, forced_motion, window, cx),
-            Some(Operator::AddSurrounds { target: None }) => {}
-            Some(Operator::Indent) => self.indent_motion(
-                motion,
-                times,
-                forced_motion,
-                IndentDirection::In,
-                window,
-                cx,
-            ),
-            Some(Operator::Rewrap) => self.rewrap_motion(motion, times, forced_motion, window, cx),
-            Some(Operator::Outdent) => self.indent_motion(
-                motion,
-                times,
-                forced_motion,
-                IndentDirection::Out,
-                window,
-                cx,
-            ),
-            Some(Operator::AutoIndent) => self.indent_motion(
-                motion,
-                times,
-                forced_motion,
-                IndentDirection::Auto,
-                window,
-                cx,
-            ),
-            Some(Operator::ShellCommand) => {
-                self.shell_command_motion(motion, times, forced_motion, window, cx)
-            }
-            Some(Operator::Lowercase) => self.convert_motion(
-                motion,
-                times,
-                forced_motion,
-                ConvertTarget::LowerCase,
-                window,
-                cx,
-            ),
-            Some(Operator::Uppercase) => self.convert_motion(
-                motion,
-                times,
-                forced_motion,
-                ConvertTarget::UpperCase,
-                window,
-                cx,
-            ),
-            Some(Operator::OppositeCase) => self.convert_motion(
-                motion,
-                times,
-                forced_motion,
-                ConvertTarget::OppositeCase,
-                window,
-                cx,
-            ),
-            Some(Operator::Rot13) => self.convert_motion(
-                motion,
-                times,
-                forced_motion,
-                ConvertTarget::Rot13,
-                window,
-                cx,
-            ),
-            Some(Operator::Rot47) => self.convert_motion(
-                motion,
-                times,
-                forced_motion,
-                ConvertTarget::Rot47,
-                window,
-                cx,
-            ),
-            Some(Operator::ToggleComments) => {
-                self.toggle_comments_motion(motion, times, forced_motion, window, cx)
-            }
-            Some(Operator::ReplaceWithRegister) => {
-                self.replace_with_register_motion(motion, times, forced_motion, window, cx)
-            }
-            Some(Operator::Exchange) => {
-                self.exchange_motion(motion, times, forced_motion, window, cx)
-            }
-            Some(operator) => {
-                // Can't do anything for text objects, Ignoring
-                error!("Unexpected normal mode motion operator: {:?}", operator)
-            }
-        }
-        // Exit temporary normal mode (if active).
-        self.exit_temporary_normal(window, cx);
-    }
-
-    pub fn normal_object(
-        &mut self,
-        object: Object,
-        times: Option<usize>,
-        opening: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let mut waiting_operator: Option<Operator> = None;
-        match self.maybe_pop_operator() {
-            Some(Operator::Object { around }) => match self.maybe_pop_operator() {
-                Some(Operator::Change) => self.change_object(object, around, times, window, cx),
-                Some(Operator::Delete) => self.delete_object(object, around, times, window, cx),
-                Some(Operator::Yank) => self.yank_object(object, around, times, window, cx),
-                Some(Operator::Indent) => {
-                    self.indent_object(object, around, IndentDirection::In, times, window, cx)
-                }
-                Some(Operator::Outdent) => {
-                    self.indent_object(object, around, IndentDirection::Out, times, window, cx)
-                }
-                Some(Operator::AutoIndent) => {
-                    self.indent_object(object, around, IndentDirection::Auto, times, window, cx)
-                }
-                Some(Operator::ShellCommand) => {
-                    self.shell_command_object(object, around, window, cx);
-                }
-                Some(Operator::Rewrap) => self.rewrap_object(object, around, times, window, cx),
-                Some(Operator::Lowercase) => {
-                    self.convert_object(object, around, ConvertTarget::LowerCase, times, window, cx)
-                }
-                Some(Operator::Uppercase) => {
-                    self.convert_object(object, around, ConvertTarget::UpperCase, times, window, cx)
-                }
-                Some(Operator::OppositeCase) => self.convert_object(
-                    object,
-                    around,
-                    ConvertTarget::OppositeCase,
-                    times,
-                    window,
-                    cx,
-                ),
-                Some(Operator::Rot13) => {
-                    self.convert_object(object, around, ConvertTarget::Rot13, times, window, cx)
-                }
-                Some(Operator::Rot47) => {
-                    self.convert_object(object, around, ConvertTarget::Rot47, times, window, cx)
-                }
-                Some(Operator::AddSurrounds { target: None }) => {
-                    waiting_operator = Some(Operator::AddSurrounds {
-                        target: Some(SurroundsType::Object(object, around)),
-                    });
-                }
-                Some(Operator::ToggleComments) => {
-                    self.toggle_comments_object(object, around, times, window, cx)
-                }
-                Some(Operator::ReplaceWithRegister) => {
-                    self.replace_with_register_object(object, around, window, cx)
-                }
-                Some(Operator::Exchange) => self.exchange_object(object, around, window, cx),
-                Some(Operator::HelixMatch) => {
-                    self.select_current_object(object, around, window, cx)
-                }
-                _ => {
-                    // Can't do anything for namespace operators. Ignoring
-                }
-            },
-            Some(Operator::HelixNext { around }) => {
-                self.select_next_object(object, around, window, cx);
-            }
-            Some(Operator::HelixPrevious { around }) => {
-                self.select_previous_object(object, around, window, cx);
-            }
-            Some(Operator::DeleteSurrounds) => {
-                waiting_operator = Some(Operator::DeleteSurrounds);
-            }
-            Some(Operator::ChangeSurrounds { target: None, .. }) => {
-                if self.check_and_move_to_valid_bracket_pair(object, window, cx) {
-                    waiting_operator = Some(Operator::ChangeSurrounds {
-                        target: Some(object),
-                        opening,
-                    });
-                }
-            }
-            _ => {
-                // Can't do anything with change/delete/yank/surrounds and text objects. Ignoring
-            }
-        }
-        self.clear_operator(window, cx);
-        if let Some(operator) = waiting_operator {
-            self.push_operator(operator, window, cx);
-        }
-    }
-
-    pub(crate) fn move_cursor(
-        &mut self,
-        motion: Motion,
-        times: Option<usize>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.update_editor(cx, |vim, editor, cx| {
-            let text_layout_details = editor.text_layout_details(window);
-
-            // If vim is in temporary mode and the motion being used is
-            // `EndOfLine` ($), we'll want to disable clipping at line ends so
-            // that the newline character can be selected so that, when moving
-            // back to visual mode, the cursor will be placed after the last
-            // character and not before it.
-            let clip_at_line_ends = editor.clip_at_line_ends(cx);
-            let should_disable_clip = matches!(motion, Motion::EndOfLine { .. }) && vim.temp_mode;
-
-            if should_disable_clip {
-                editor.set_clip_at_line_ends(false, cx)
-            };
-
-            editor.change_selections(
-                SelectionEffects::default().nav_history(motion.push_to_jump_list()),
-                window,
-                cx,
-                |s| {
-                    s.move_cursors_with(|map, cursor, goal| {
-                        motion
-                            .move_point(map, cursor, goal, times, &text_layout_details)
-                            .unwrap_or((cursor, goal))
-                    })
-                },
-            );
-
-            if should_disable_clip {
-                editor.set_clip_at_line_ends(clip_at_line_ends, cx);
-            };
-        });
-    }
-
-    fn insert_after(&mut self, _: &InsertAfter, window: &mut Window, cx: &mut Context<Self>) {
-        self.start_recording(cx);
-        self.switch_mode(Mode::Insert, false, window, cx);
-        self.update_editor(cx, |_, editor, cx| {
-            editor.change_selections(Default::default(), window, cx, |s| {
-                s.move_cursors_with(|map, cursor, _| (right(map, cursor, 1), SelectionGoal::None));
-            });
-        });
-    }
-
-    fn insert_before(&mut self, _: &InsertBefore, window: &mut Window, cx: &mut Context<Self>) {
-        self.start_recording(cx);
-        if self.mode.is_visual() {
-            let current_mode = self.mode;
-            self.update_editor(cx, |_, editor, cx| {
-                editor.change_selections(Default::default(), window, cx, |s| {
-                    s.move_with(|map, selection| {
-                        if current_mode == Mode::VisualLine {
-                            let start_of_line = motion::start_of_line(map, false, selection.start);
-                            selection.collapse_to(start_of_line, SelectionGoal::None)
-                        } else {
-                            selection.collapse_to(selection.start, SelectionGoal::None)
-                        }
-                    });
-                });
-            });
-        }
-        self.switch_mode(Mode::Insert, false, window, cx);
-    }
-
-    fn insert_first_non_whitespace(
-        &mut self,
-        _: &InsertFirstNonWhitespace,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.start_recording(cx);
-        self.switch_mode(Mode::Insert, false, window, cx);
-        self.update_editor(cx, |_, editor, cx| {
-            editor.change_selections(Default::default(), window, cx, |s| {
-                s.move_cursors_with(|map, cursor, _| {
-                    (
-                        first_non_whitespace(map, false, cursor),
-                        SelectionGoal::None,
-                    )
-                });
-            });
-        });
-    }
-
-    fn insert_end_of_line(
-        &mut self,
-        _: &InsertEndOfLine,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.start_recording(cx);
-        self.switch_mode(Mode::Insert, false, window, cx);
-        self.update_editor(cx, |_, editor, cx| {
-            editor.change_selections(Default::default(), window, cx, |s| {
-                s.move_cursors_with(|map, cursor, _| {
-                    (next_line_end(map, cursor, 1), SelectionGoal::None)
-                });
-            });
-        });
-    }
-
-    fn insert_at_previous(
-        &mut self,
-        _: &InsertAtPrevious,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.start_recording(cx);
-        self.switch_mode(Mode::Insert, false, window, cx);
-        self.update_editor(cx, |vim, editor, cx| {
-            if let Some(Mark::Local(marks)) = vim.get_mark("^", editor, window, cx)
-                && !marks.is_empty()
-            {
-                editor.change_selections(Default::default(), window, cx, |s| {
-                    s.select_anchor_ranges(marks.iter().map(|mark| *mark..*mark))
-                });
-            }
-        });
-    }
-
-    fn insert_line_above(
-        &mut self,
-        _: &InsertLineAbove,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.start_recording(cx);
-        self.switch_mode(Mode::Insert, false, window, cx);
-        self.update_editor(cx, |_, editor, cx| {
-            editor.transact(window, cx, |editor, window, cx| {
-                let selections = editor.selections.all::<Point>(&editor.display_snapshot(cx));
-                let snapshot = editor.buffer().read(cx).snapshot(cx);
-
-                let selection_start_rows: BTreeSet<u32> = selections
-                    .into_iter()
-                    .map(|selection| selection.start.row)
-                    .collect();
-                let edits = selection_start_rows
-                    .into_iter()
-                    .map(|row| {
-                        let indent = snapshot
-                            .indent_and_comment_for_line(MultiBufferRow(row), cx)
-                            .chars()
-                            .collect::<String>();
-
-                        let start_of_line = Point::new(row, 0);
-                        (start_of_line..start_of_line, indent + "\n")
-                    })
-                    .collect::<Vec<_>>();
-                editor.edit_with_autoindent(edits, cx);
-                editor.change_selections(Default::default(), window, cx, |s| {
-                    s.move_cursors_with(|map, cursor, _| {
-                        let previous_line = map.start_of_relative_buffer_row(cursor, -1);
-                        let insert_point = motion::end_of_line(map, false, previous_line, 1);
-                        (insert_point, SelectionGoal::None)
-                    });
-                });
-            });
-        });
-    }
-
-    fn insert_line_below(
-        &mut self,
-        _: &InsertLineBelow,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.start_recording(cx);
-        self.switch_mode(Mode::Insert, false, window, cx);
-        self.update_editor(cx, |_, editor, cx| {
-            let text_layout_details = editor.text_layout_details(window);
-            editor.transact(window, cx, |editor, window, cx| {
-                let selections = editor.selections.all::<Point>(&editor.display_snapshot(cx));
-                let snapshot = editor.buffer().read(cx).snapshot(cx);
-
-                let selection_end_rows: BTreeSet<u32> = selections
-                    .into_iter()
-                    .map(|selection| selection.end.row)
-                    .collect();
-                let edits = selection_end_rows
-                    .into_iter()
-                    .map(|row| {
-                        let indent = snapshot
-                            .indent_and_comment_for_line(MultiBufferRow(row), cx)
-                            .chars()
-                            .collect::<String>();
-
-                        let end_of_line = Point::new(row, snapshot.line_len(MultiBufferRow(row)));
-                        (end_of_line..end_of_line, "\n".to_string() + &indent)
-                    })
-                    .collect::<Vec<_>>();
-                editor.change_selections(Default::default(), window, cx, |s| {
-                    s.maybe_move_cursors_with(|map, cursor, goal| {
-                        Motion::CurrentLine.move_point(
-                            map,
-                            cursor,
-                            goal,
-                            None,
-                            &text_layout_details,
-                        )
-                    });
-                });
-                editor.edit_with_autoindent(edits, cx);
-            });
-        });
-    }
-
-    fn insert_empty_line_above(
-        &mut self,
-        _: &InsertEmptyLineAbove,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.record_current_action(cx);
-        let count = Vim::take_count(cx).unwrap_or(1);
-        Vim::take_forced_motion(cx);
-        self.update_editor(cx, |_, editor, cx| {
-            editor.transact(window, cx, |editor, _, cx| {
-                let selections = editor.selections.all::<Point>(&editor.display_snapshot(cx));
-
-                let selection_start_rows: BTreeSet<u32> = selections
-                    .into_iter()
-                    .map(|selection| selection.start.row)
-                    .collect();
-                let edits = selection_start_rows
-                    .into_iter()
-                    .map(|row| {
-                        let start_of_line = Point::new(row, 0);
-                        (start_of_line..start_of_line, "\n".repeat(count))
-                    })
-                    .collect::<Vec<_>>();
-                editor.edit(edits, cx);
-            });
-        });
-    }
-
-    fn insert_empty_line_below(
-        &mut self,
-        _: &InsertEmptyLineBelow,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.record_current_action(cx);
-        let count = Vim::take_count(cx).unwrap_or(1);
-        Vim::take_forced_motion(cx);
-        self.update_editor(cx, |_, editor, cx| {
-            editor.transact(window, cx, |editor, window, cx| {
-                let display_map = editor.display_snapshot(cx);
-                let selections = editor.selections.all::<Point>(&display_map);
-                let snapshot = editor.buffer().read(cx).snapshot(cx);
-                let display_selections = editor.selections.all_display(&display_map);
-                let original_positions = display_selections
-                    .iter()
-                    .map(|s| (s.id, s.head()))
-                    .collect::<HashMap<_, _>>();
-
-                let selection_end_rows: BTreeSet<u32> = selections
-                    .into_iter()
-                    .map(|selection| selection.end.row)
-                    .collect();
-                let edits = selection_end_rows
-                    .into_iter()
-                    .map(|row| {
-                        let end_of_line = Point::new(row, snapshot.line_len(MultiBufferRow(row)));
-                        (end_of_line..end_of_line, "\n".repeat(count))
-                    })
-                    .collect::<Vec<_>>();
-                editor.edit(edits, cx);
-
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.move_with(|_, selection| {
-                        if let Some(position) = original_positions.get(&selection.id) {
-                            selection.collapse_to(*position, SelectionGoal::None);
-                        }
-                    });
-                });
-            });
-        });
-    }
-
-    fn join_lines_impl(
-        &mut self,
-        insert_whitespace: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.record_current_action(cx);
-        let mut times = Vim::take_count(cx).unwrap_or(1);
-        Vim::take_forced_motion(cx);
-        if self.mode.is_visual() {
-            times = 1;
-        } else if times > 1 {
-            // 2J joins two lines together (same as J or 1J)
-            times -= 1;
-        }
-
-        self.update_editor(cx, |_, editor, cx| {
-            editor.transact(window, cx, |editor, window, cx| {
-                for _ in 0..times {
-                    editor.join_lines_impl(insert_whitespace, window, cx)
-                }
-            })
-        });
-        if self.mode.is_visual() {
-            self.switch_mode(Mode::Normal, true, window, cx)
-        }
-    }
-
-    fn yank_line(&mut self, _: &YankLine, window: &mut Window, cx: &mut Context<Self>) {
-        let count = Vim::take_count(cx);
-        let forced_motion = Vim::take_forced_motion(cx);
-        self.yank_motion(
-            motion::Motion::CurrentLine,
-            count,
-            forced_motion,
-            window,
-            cx,
-        )
-    }
-
-    fn yank_to_end_of_line(
-        &mut self,
-        _: &YankToEndOfLine,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let count = Vim::take_count(cx);
-        let forced_motion = Vim::take_forced_motion(cx);
-        self.yank_motion(
-            motion::Motion::EndOfLine {
-                display_lines: false,
-            },
-            count,
-            forced_motion,
-            window,
-            cx,
-        )
-    }
-
-    fn show_location(&mut self, _: &ShowLocation, _: &mut Window, cx: &mut Context<Self>) {
-        let count = Vim::take_count(cx);
-        Vim::take_forced_motion(cx);
-        self.update_editor(cx, |vim, editor, cx| {
-            let selection = editor.selections.newest_anchor();
-            let Some((buffer, point, _)) = editor
-                .buffer()
-                .read(cx)
-                .point_to_buffer_point(selection.head(), cx)
-            else {
-                return;
-            };
-            let filename = if let Some(file) = buffer.read(cx).file() {
-                if count.is_some() {
-                    if let Some(local) = file.as_local() {
-                        local.abs_path(cx).to_string_lossy().into_owned()
-                    } else {
-                        file.full_path(cx).to_string_lossy().into_owned()
-                    }
-                } else {
-                    file.path().display(file.path_style(cx)).into_owned()
-                }
-            } else {
-                "[No Name]".into()
-            };
-            let buffer = buffer.read(cx);
-            let lines = buffer.max_point().row + 1;
-            let current_line = point.row;
-            let percentage = current_line as f32 / lines as f32;
-            let modified = if buffer.is_dirty() { " [modified]" } else { "" };
-            vim.status_label = Some(
-                format!(
-                    "{}{} {} lines --{:.0}%--",
-                    filename,
-                    modified,
-                    lines,
-                    percentage * 100.0,
-                )
-                .into(),
-            );
-            cx.notify();
-        });
-    }
-
-    fn toggle_comments(&mut self, _: &ToggleComments, window: &mut Window, cx: &mut Context<Self>) {
-        self.record_current_action(cx);
-        self.store_visual_marks(window, cx);
-        self.update_editor(cx, |vim, editor, cx| {
-            editor.transact(window, cx, |editor, window, cx| {
-                let original_positions = vim.save_selection_starts(editor, cx);
-                editor.toggle_comments(&Default::default(), window, cx);
-                vim.restore_selection_cursors(editor, window, cx, original_positions);
-            });
-        });
-        if self.mode.is_visual() {
-            self.switch_mode(Mode::Normal, true, window, cx)
-        }
-    }
-
-    pub(crate) fn normal_replace(
-        &mut self,
-        text: Arc<str>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        // We need to use `text.chars().count()` instead of `text.len()` here as
-        // `len()` counts bytes, not characters.
-        let char_count = text.chars().count();
-        let count = Vim::take_count(cx).unwrap_or(char_count);
-        let is_return_char = text == "\n".into() || text == "\r".into();
-        let repeat_count = match (is_return_char, char_count) {
-            (true, _) => 0,
-            (_, 1) => count,
-            (_, _) => 1,
-        };
-
-        Vim::take_forced_motion(cx);
-        self.stop_recording(cx);
-        self.update_editor(cx, |_, editor, cx| {
-            editor.transact(window, cx, |editor, window, cx| {
-                editor.set_clip_at_line_ends(false, cx);
-                let display_map = editor.display_snapshot(cx);
-                let display_selections = editor.selections.all_display(&display_map);
-
-                let mut edits = Vec::with_capacity(display_selections.len());
-                for selection in &display_selections {
-                    let mut range = selection.range();
-                    for _ in 0..count {
-                        let new_point = movement::saturating_right(&display_map, range.end);
-                        if range.end == new_point {
-                            return;
-                        }
-                        range.end = new_point;
-                    }
-
-                    edits.push((
-                        range.start.to_offset(&display_map, Bias::Left)
-                            ..range.end.to_offset(&display_map, Bias::Left),
-                        text.repeat(repeat_count),
-                    ));
-                }
-
-                editor.edit(edits, cx);
-                if is_return_char {
-                    editor.newline(&editor::actions::Newline, window, cx);
-                }
-                editor.set_clip_at_line_ends(true, cx);
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.move_with(|map, selection| {
-                        let point = movement::saturating_left(map, selection.head());
-                        selection.collapse_to(point, SelectionGoal::None)
-                    });
-                });
-            });
-        });
-        self.pop_operator(window, cx);
-    }
-
-    pub fn save_selection_starts(
-        &self,
-        editor: &Editor,
-        cx: &mut Context<Editor>,
-    ) -> HashMap<usize, Anchor> {
-        let display_map = editor.display_snapshot(cx);
-        let selections = editor.selections.all_display(&display_map);
-        selections
-            .iter()
-            .map(|selection| {
-                (
-                    selection.id,
-                    display_map.display_point_to_anchor(selection.start, Bias::Right),
-                )
-            })
-            .collect::<HashMap<_, _>>()
-    }
-
-    pub fn restore_selection_cursors(
-        &self,
-        editor: &mut Editor,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-        mut positions: HashMap<usize, Anchor>,
-    ) {
-        editor.change_selections(Default::default(), window, cx, |s| {
-            s.move_with(|map, selection| {
-                if let Some(anchor) = positions.remove(&selection.id) {
-                    selection.collapse_to(anchor.to_display_point(map), SelectionGoal::None);
-                }
-            });
-        });
-    }
-
-    fn exit_temporary_normal(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if self.temp_mode {
-            self.switch_mode(Mode::Insert, true, window, cx);
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use gpui::{KeyBinding, TestAppContext, UpdateGlobal};
-    use indoc::indoc;
-    use settings::SettingsStore;
-
-    use crate::{
-        motion,
-        state::Mode::{self},
-        test::{NeovimBackedTestContext, VimTestContext},
-    };
-
-    #[gpui::test]
-    async fn test_h(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate_at_each_offset(
-            "h",
-            indoc! {"
-            ˇThe qˇuick
-            ˇbrown"
-            },
-        )
-        .await
-        .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_backspace(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate_at_each_offset(
-            "backspace",
-            indoc! {"
-            ˇThe qˇuick
-            ˇbrown"
-            },
-        )
-        .await
-        .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_j(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {"
-            aaˇaa
-            😃😃"
-        })
-        .await;
-        cx.simulate_shared_keystrokes("j").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            aaaa
-            😃ˇ😃"
-        });
-
-        cx.simulate_at_each_offset(
-            "j",
-            indoc! {"
-                ˇThe qˇuick broˇwn
-                ˇfox jumps"
-            },
-        )
-        .await
-        .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_enter(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate_at_each_offset(
-            "enter",
-            indoc! {"
-            ˇThe qˇuick broˇwn
-            ˇfox jumps"
-            },
-        )
-        .await
-        .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_k(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate_at_each_offset(
-            "k",
-            indoc! {"
-            ˇThe qˇuick
-            ˇbrown fˇox jumˇps"
-            },
-        )
-        .await
-        .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_l(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate_at_each_offset(
-            "l",
-            indoc! {"
-            ˇThe qˇuicˇk
-            ˇbrowˇn"},
-        )
-        .await
-        .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_jump_to_line_boundaries(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate_at_each_offset(
-            "$",
-            indoc! {"
-            ˇThe qˇuicˇk
-            ˇbrowˇn"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate_at_each_offset(
-            "0",
-            indoc! {"
-                ˇThe qˇuicˇk
-                ˇbrowˇn"},
-        )
-        .await
-        .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_jump_to_end(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.simulate_at_each_offset(
-            "shift-g",
-            indoc! {"
-                The ˇquick
-
-                brown fox jumps
-                overˇ the lazy doˇg"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "shift-g",
-            indoc! {"
-            The quiˇck
-
-            brown"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "shift-g",
-            indoc! {"
-            The quiˇck
-
-            "},
-        )
-        .await
-        .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_w(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate_at_each_offset(
-            "w",
-            indoc! {"
-            The ˇquickˇ-ˇbrown
-            ˇ
-            ˇ
-            ˇfox_jumps ˇover
-            ˇthˇe"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate_at_each_offset(
-            "shift-w",
-            indoc! {"
-            The ˇquickˇ-ˇbrown
-            ˇ
-            ˇ
-            ˇfox_jumps ˇover
-            ˇthˇe"},
-        )
-        .await
-        .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_end_of_word(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate_at_each_offset(
-            "e",
-            indoc! {"
-            Thˇe quicˇkˇ-browˇn
-
-
-            fox_jumpˇs oveˇr
-            thˇe"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate_at_each_offset(
-            "shift-e",
-            indoc! {"
-            Thˇe quicˇkˇ-browˇn
-
-
-            fox_jumpˇs oveˇr
-            thˇe"},
-        )
-        .await
-        .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_b(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate_at_each_offset(
-            "b",
-            indoc! {"
-            ˇThe ˇquickˇ-ˇbrown
-            ˇ
-            ˇ
-            ˇfox_jumps ˇover
-            ˇthe"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate_at_each_offset(
-            "shift-b",
-            indoc! {"
-            ˇThe ˇquickˇ-ˇbrown
-            ˇ
-            ˇ
-            ˇfox_jumps ˇover
-            ˇthe"},
-        )
-        .await
-        .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_gg(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate_at_each_offset(
-            "g g",
-            indoc! {"
-                The qˇuick
-
-                brown fox jumps
-                over ˇthe laˇzy dog"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "g g",
-            indoc! {"
-
-
-                brown fox jumps
-                over the laˇzy dog"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "2 g g",
-            indoc! {"
-                ˇ
-
-                brown fox jumps
-                over the lazydog"},
-        )
-        .await
-        .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_end_of_document(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate_at_each_offset(
-            "shift-g",
-            indoc! {"
-                The qˇuick
-
-                brown fox jumps
-                over ˇthe laˇzy dog"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "shift-g",
-            indoc! {"
-
-
-                brown fox jumps
-                over the laˇzy dog"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "2 shift-g",
-            indoc! {"
-                ˇ
-
-                brown fox jumps
-                over the lazydog"},
-        )
-        .await
-        .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_a(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate_at_each_offset("a", "The qˇuicˇk")
-            .await
-            .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_insert_end_of_line(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate_at_each_offset(
-            "shift-a",
-            indoc! {"
-            ˇ
-            The qˇuick
-            brown ˇfox "},
-        )
-        .await
-        .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_jump_to_first_non_whitespace(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate("^", "The qˇuick").await.assert_matches();
-        cx.simulate("^", " The qˇuick").await.assert_matches();
-        cx.simulate("^", "ˇ").await.assert_matches();
-        cx.simulate(
-            "^",
-            indoc! {"
-                The qˇuick
-                brown fox"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "^",
-            indoc! {"
-                ˇ
-                The quick"},
-        )
-        .await
-        .assert_matches();
-        // Indoc disallows trailing whitespace.
-        cx.simulate("^", "   ˇ \nThe quick").await.assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_insert_first_non_whitespace(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate("shift-i", "The qˇuick").await.assert_matches();
-        cx.simulate("shift-i", " The qˇuick").await.assert_matches();
-        cx.simulate("shift-i", "ˇ").await.assert_matches();
-        cx.simulate(
-            "shift-i",
-            indoc! {"
-                The qˇuick
-                brown fox"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "shift-i",
-            indoc! {"
-                ˇ
-                The quick"},
-        )
-        .await
-        .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_delete_to_end_of_line(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate(
-            "shift-d",
-            indoc! {"
-                The qˇuick
-                brown fox"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "shift-d",
-            indoc! {"
-                The quick
-                ˇ
-                brown fox"},
-        )
-        .await
-        .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_x(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate_at_each_offset("x", "ˇTeˇsˇt")
-            .await
-            .assert_matches();
-        cx.simulate(
-            "x",
-            indoc! {"
-                Tesˇt
-                test"},
-        )
-        .await
-        .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_delete_left(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate_at_each_offset("shift-x", "ˇTˇeˇsˇt")
-            .await
-            .assert_matches();
-        cx.simulate(
-            "shift-x",
-            indoc! {"
-                Test
-                ˇtest"},
-        )
-        .await
-        .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_o(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate("o", "ˇ").await.assert_matches();
-        cx.simulate("o", "The ˇquick").await.assert_matches();
-        cx.simulate_at_each_offset(
-            "o",
-            indoc! {"
-                The qˇuick
-                brown ˇfox
-                jumps ˇover"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "o",
-            indoc! {"
-                The quick
-                ˇ
-                brown fox"},
-        )
-        .await
-        .assert_matches();
-
-        cx.assert_binding(
-            "o",
-            indoc! {"
-                fn test() {
-                    println!(ˇ);
-                }"},
-            Mode::Normal,
-            indoc! {"
-                fn test() {
-                    println!();
-                    ˇ
-                }"},
-            Mode::Insert,
-        );
-
-        cx.assert_binding(
-            "o",
-            indoc! {"
-                fn test(ˇ) {
-                    println!();
-                }"},
-            Mode::Normal,
-            indoc! {"
-                fn test() {
-                    ˇ
-                    println!();
-                }"},
-            Mode::Insert,
-        );
-    }
-
-    #[gpui::test]
-    async fn test_insert_line_above(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate("shift-o", "ˇ").await.assert_matches();
-        cx.simulate("shift-o", "The ˇquick").await.assert_matches();
-        cx.simulate_at_each_offset(
-            "shift-o",
-            indoc! {"
-            The qˇuick
-            brown ˇfox
-            jumps ˇover"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "shift-o",
-            indoc! {"
-            The quick
-            ˇ
-            brown fox"},
-        )
-        .await
-        .assert_matches();
-
-        // Our indentation is smarter than vims. So we don't match here
-        cx.assert_binding(
-            "shift-o",
-            indoc! {"
-                fn test() {
-                    println!(ˇ);
-                }"},
-            Mode::Normal,
-            indoc! {"
-                fn test() {
-                    ˇ
-                    println!();
-                }"},
-            Mode::Insert,
-        );
-        cx.assert_binding(
-            "shift-o",
-            indoc! {"
-                fn test(ˇ) {
-                    println!();
-                }"},
-            Mode::Normal,
-            indoc! {"
-                ˇ
-                fn test() {
-                    println!();
-                }"},
-            Mode::Insert,
-        );
-    }
-
-    #[gpui::test]
-    async fn test_insert_empty_line(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate("[ space", "ˇ").await.assert_matches();
-        cx.simulate("[ space", "The ˇquick").await.assert_matches();
-        cx.simulate_at_each_offset(
-            "3 [ space",
-            indoc! {"
-            The qˇuick
-            brown ˇfox
-            jumps ˇover"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate_at_each_offset(
-            "[ space",
-            indoc! {"
-            The qˇuick
-            brown ˇfox
-            jumps ˇover"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "[ space",
-            indoc! {"
-            The quick
-            ˇ
-            brown fox"},
-        )
-        .await
-        .assert_matches();
-
-        cx.simulate("] space", "ˇ").await.assert_matches();
-        cx.simulate("] space", "The ˇquick").await.assert_matches();
-        cx.simulate_at_each_offset(
-            "3 ] space",
-            indoc! {"
-            The qˇuick
-            brown ˇfox
-            jumps ˇover"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate_at_each_offset(
-            "] space",
-            indoc! {"
-            The qˇuick
-            brown ˇfox
-            jumps ˇover"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "] space",
-            indoc! {"
-            The quick
-            ˇ
-            brown fox"},
-        )
-        .await
-        .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_dd(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate("d d", "ˇ").await.assert_matches();
-        cx.simulate("d d", "The ˇquick").await.assert_matches();
-        cx.simulate_at_each_offset(
-            "d d",
-            indoc! {"
-            The qˇuick
-            brown ˇfox
-            jumps ˇover"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "d d",
-            indoc! {"
-                The quick
-                ˇ
-                brown fox"},
-        )
-        .await
-        .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_cc(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate("c c", "ˇ").await.assert_matches();
-        cx.simulate("c c", "The ˇquick").await.assert_matches();
-        cx.simulate_at_each_offset(
-            "c c",
-            indoc! {"
-                The quˇick
-                brown ˇfox
-                jumps ˇover"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "c c",
-            indoc! {"
-                The quick
-                ˇ
-                brown fox"},
-        )
-        .await
-        .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_repeated_word(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        for count in 1..=5 {
-            cx.simulate_at_each_offset(
-                &format!("{count} w"),
-                indoc! {"
-                    ˇThe quˇickˇ browˇn
-                    ˇ
-                    ˇfox ˇjumpsˇ-ˇoˇver
-                    ˇthe lazy dog
-                "},
-            )
-            .await
-            .assert_matches();
-        }
-    }
-
-    #[gpui::test]
-    async fn test_h_through_unicode(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate_at_each_offset("h", "Testˇ├ˇ──ˇ┐ˇTest")
-            .await
-            .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_f_and_t(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        for count in 1..=3 {
-            let test_case = indoc! {"
-                ˇaaaˇbˇ ˇbˇ   ˇbˇbˇ aˇaaˇbaaa
-                ˇ    ˇbˇaaˇa ˇbˇbˇb
-                ˇ
-                ˇb
-            "};
-
-            cx.simulate_at_each_offset(&format!("{count} f b"), test_case)
-                .await
-                .assert_matches();
-
-            cx.simulate_at_each_offset(&format!("{count} t b"), test_case)
-                .await
-                .assert_matches();
-        }
-    }
-
-    #[gpui::test]
-    async fn test_capital_f_and_capital_t(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        let test_case = indoc! {"
-            ˇaaaˇbˇ ˇbˇ   ˇbˇbˇ aˇaaˇbaaa
-            ˇ    ˇbˇaaˇa ˇbˇbˇb
-            ˇ•••
-            ˇb
-            "
-        };
-
-        for count in 1..=3 {
-            cx.simulate_at_each_offset(&format!("{count} shift-f b"), test_case)
-                .await
-                .assert_matches();
-
-            cx.simulate_at_each_offset(&format!("{count} shift-t b"), test_case)
-                .await
-                .assert_matches();
-        }
-    }
-
-    #[gpui::test]
-    async fn test_f_and_t_smartcase(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-        cx.update_global(|store: &mut SettingsStore, cx| {
-            store.update_user_settings(cx, |s| {
-                s.vim.get_or_insert_default().use_smartcase_find = Some(true);
-            });
-        });
-
-        cx.assert_binding(
-            "f p",
-            indoc! {"ˇfmt.Println(\"Hello, World!\")"},
-            Mode::Normal,
-            indoc! {"fmt.ˇPrintln(\"Hello, World!\")"},
-            Mode::Normal,
-        );
-
-        cx.assert_binding(
-            "shift-f p",
-            indoc! {"fmt.Printlnˇ(\"Hello, World!\")"},
-            Mode::Normal,
-            indoc! {"fmt.ˇPrintln(\"Hello, World!\")"},
-            Mode::Normal,
-        );
-
-        cx.assert_binding(
-            "t p",
-            indoc! {"ˇfmt.Println(\"Hello, World!\")"},
-            Mode::Normal,
-            indoc! {"fmtˇ.Println(\"Hello, World!\")"},
-            Mode::Normal,
-        );
-
-        cx.assert_binding(
-            "shift-t p",
-            indoc! {"fmt.Printlnˇ(\"Hello, World!\")"},
-            Mode::Normal,
-            indoc! {"fmt.Pˇrintln(\"Hello, World!\")"},
-            Mode::Normal,
-        );
-    }
-
-    #[gpui::test]
-    async fn test_percent(cx: &mut TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate_at_each_offset("%", "ˇconsole.logˇ(ˇvaˇrˇ)ˇ;")
-            .await
-            .assert_matches();
-        cx.simulate_at_each_offset("%", "ˇconsole.logˇ(ˇ'var', ˇ[ˇ1, ˇ2, 3ˇ]ˇ)ˇ;")
-            .await
-            .assert_matches();
-        cx.simulate_at_each_offset("%", "let result = curried_funˇ(ˇ)ˇ(ˇ)ˇ;")
-            .await
-            .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_end_of_line_with_neovim(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        // goes to current line end
-        cx.set_shared_state(indoc! {"ˇaa\nbb\ncc"}).await;
-        cx.simulate_shared_keystrokes("$").await;
-        cx.shared_state().await.assert_eq("aˇa\nbb\ncc");
-
-        // goes to next line end
-        cx.simulate_shared_keystrokes("2 $").await;
-        cx.shared_state().await.assert_eq("aa\nbˇb\ncc");
-
-        // try to exceed the final line.
-        cx.simulate_shared_keystrokes("4 $").await;
-        cx.shared_state().await.assert_eq("aa\nbb\ncˇc");
-    }
-
-    #[gpui::test]
-    async fn test_subword_motions(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-        cx.update(|_, cx| {
-            cx.bind_keys(vec![
-                KeyBinding::new(
-                    "w",
-                    motion::NextSubwordStart {
-                        ignore_punctuation: false,
-                    },
-                    Some("Editor && VimControl && !VimWaiting && !menu"),
-                ),
-                KeyBinding::new(
-                    "b",
-                    motion::PreviousSubwordStart {
-                        ignore_punctuation: false,
-                    },
-                    Some("Editor && VimControl && !VimWaiting && !menu"),
-                ),
-                KeyBinding::new(
-                    "e",
-                    motion::NextSubwordEnd {
-                        ignore_punctuation: false,
-                    },
-                    Some("Editor && VimControl && !VimWaiting && !menu"),
-                ),
-                KeyBinding::new(
-                    "g e",
-                    motion::PreviousSubwordEnd {
-                        ignore_punctuation: false,
-                    },
-                    Some("Editor && VimControl && !VimWaiting && !menu"),
-                ),
-            ]);
-        });
-
-        cx.assert_binding_normal("w", indoc! {"ˇassert_binding"}, indoc! {"assert_ˇbinding"});
-        // Special case: In 'cw', 'w' acts like 'e'
-        cx.assert_binding(
-            "c w",
-            indoc! {"ˇassert_binding"},
-            Mode::Normal,
-            indoc! {"ˇ_binding"},
-            Mode::Insert,
-        );
-
-        cx.assert_binding_normal("e", indoc! {"ˇassert_binding"}, indoc! {"asserˇt_binding"});
-
-        cx.assert_binding_normal("b", indoc! {"assert_ˇbinding"}, indoc! {"ˇassert_binding"});
-
-        cx.assert_binding_normal(
-            "g e",
-            indoc! {"assert_bindinˇg"},
-            indoc! {"asserˇt_binding"},
-        );
-    }
-
-    #[gpui::test]
-    async fn test_r(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state("ˇhello\n").await;
-        cx.simulate_shared_keystrokes("r -").await;
-        cx.shared_state().await.assert_eq("ˇ-ello\n");
-
-        cx.set_shared_state("ˇhello\n").await;
-        cx.simulate_shared_keystrokes("3 r -").await;
-        cx.shared_state().await.assert_eq("--ˇ-lo\n");
-
-        cx.set_shared_state("ˇhello\n").await;
-        cx.simulate_shared_keystrokes("r - 2 l .").await;
-        cx.shared_state().await.assert_eq("-eˇ-lo\n");
-
-        cx.set_shared_state("ˇhello world\n").await;
-        cx.simulate_shared_keystrokes("2 r - f w .").await;
-        cx.shared_state().await.assert_eq("--llo -ˇ-rld\n");
-
-        cx.set_shared_state("ˇhello world\n").await;
-        cx.simulate_shared_keystrokes("2 0 r - ").await;
-        cx.shared_state().await.assert_eq("ˇhello world\n");
-
-        cx.set_shared_state("  helloˇ world\n").await;
-        cx.simulate_shared_keystrokes("r enter").await;
-        cx.shared_state().await.assert_eq("  hello\n ˇ world\n");
-
-        cx.set_shared_state("  helloˇ world\n").await;
-        cx.simulate_shared_keystrokes("2 r enter").await;
-        cx.shared_state().await.assert_eq("  hello\n ˇ orld\n");
-    }
-
-    #[gpui::test]
-    async fn test_gq(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.set_neovim_option("textwidth=5").await;
-
-        cx.update(|_, cx| {
-            SettingsStore::update_global(cx, |settings, cx| {
-                settings.update_user_settings(cx, |settings| {
-                    settings
-                        .project
-                        .all_languages
-                        .defaults
-                        .preferred_line_length = Some(5);
-                });
-            })
-        });
-
-        cx.set_shared_state("ˇth th th th th th\n").await;
-        cx.simulate_shared_keystrokes("g q q").await;
-        cx.shared_state().await.assert_eq("th th\nth th\nˇth th\n");
-
-        cx.set_shared_state("ˇth th th th th th\nth th th th th th\n")
-            .await;
-        cx.simulate_shared_keystrokes("v j g q").await;
-        cx.shared_state()
-            .await
-            .assert_eq("th th\nth th\nth th\nth th\nth th\nˇth th\n");
-    }
-
-    #[gpui::test]
-    async fn test_o_comment(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.set_neovim_option("filetype=rust").await;
-
-        cx.set_shared_state("// helloˇ\n").await;
-        cx.simulate_shared_keystrokes("o").await;
-        cx.shared_state().await.assert_eq("// hello\n// ˇ\n");
-        cx.simulate_shared_keystrokes("x escape shift-o").await;
-        cx.shared_state().await.assert_eq("// hello\n// ˇ\n// x\n");
-    }
-
-    #[gpui::test]
-    async fn test_yank_line_with_trailing_newline(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.set_shared_state("heˇllo\n").await;
-        cx.simulate_shared_keystrokes("y y p").await;
-        cx.shared_state().await.assert_eq("hello\nˇhello\n");
-    }
-
-    #[gpui::test]
-    async fn test_yank_line_without_trailing_newline(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.set_shared_state("heˇllo").await;
-        cx.simulate_shared_keystrokes("y y p").await;
-        cx.shared_state().await.assert_eq("hello\nˇhello");
-    }
-
-    #[gpui::test]
-    async fn test_yank_multiline_without_trailing_newline(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.set_shared_state("heˇllo\nhello").await;
-        cx.simulate_shared_keystrokes("2 y y p").await;
-        cx.shared_state()
-            .await
-            .assert_eq("hello\nˇhello\nhello\nhello");
-    }
-
-    #[gpui::test]
-    async fn test_dd_then_paste_without_trailing_newline(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.set_shared_state("heˇllo").await;
-        cx.simulate_shared_keystrokes("d d").await;
-        cx.shared_state().await.assert_eq("ˇ");
-        cx.simulate_shared_keystrokes("p p").await;
-        cx.shared_state().await.assert_eq("\nhello\nˇhello");
-    }
-
-    #[gpui::test]
-    async fn test_visual_mode_insert_before_after(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state("heˇllo").await;
-        cx.simulate_shared_keystrokes("v i w shift-i").await;
-        cx.shared_state().await.assert_eq("ˇhello");
-
-        cx.set_shared_state(indoc! {"
-            The quick brown
-            fox ˇjumps over
-            the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("shift-v shift-i").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            The quick brown
-            ˇfox jumps over
-            the lazy dog"});
-
-        cx.set_shared_state(indoc! {"
-            The quick brown
-            fox ˇjumps over
-            the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("shift-v shift-a").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            The quick brown
-            fox jˇumps over
-            the lazy dog"});
-    }
-
-    #[gpui::test]
-    async fn test_jump_list(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {"
-            ˇfn a() { }
-
-
-
-
-
-            fn b() { }
-
-
-
-
-
-            fn b() { }"})
-            .await;
-        cx.simulate_shared_keystrokes("3 }").await;
-        cx.shared_state().await.assert_matches();
-        cx.simulate_shared_keystrokes("ctrl-o").await;
-        cx.shared_state().await.assert_matches();
-        cx.simulate_shared_keystrokes("ctrl-i").await;
-        cx.shared_state().await.assert_matches();
-        cx.simulate_shared_keystrokes("1 1 k").await;
-        cx.shared_state().await.assert_matches();
-        cx.simulate_shared_keystrokes("ctrl-o").await;
-        cx.shared_state().await.assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_undo_last_line(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {"
-            ˇfn a() { }
-            fn a() { }
-            fn a() { }
-        "})
-            .await;
-        // do a jump to reset vim's undo grouping
-        cx.simulate_shared_keystrokes("shift-g").await;
-        cx.shared_state().await.assert_matches();
-        cx.simulate_shared_keystrokes("r a").await;
-        cx.shared_state().await.assert_matches();
-        cx.simulate_shared_keystrokes("shift-u").await;
-        cx.shared_state().await.assert_matches();
-        cx.simulate_shared_keystrokes("shift-u").await;
-        cx.shared_state().await.assert_matches();
-        cx.simulate_shared_keystrokes("g g shift-u").await;
-        cx.shared_state().await.assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_undo_last_line_newline(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {"
-            ˇfn a() { }
-            fn a() { }
-            fn a() { }
-        "})
-            .await;
-        // do a jump to reset vim's undo grouping
-        cx.simulate_shared_keystrokes("shift-g k").await;
-        cx.shared_state().await.assert_matches();
-        cx.simulate_shared_keystrokes("o h e l l o escape").await;
-        cx.shared_state().await.assert_matches();
-        cx.simulate_shared_keystrokes("shift-u").await;
-        cx.shared_state().await.assert_matches();
-        cx.simulate_shared_keystrokes("shift-u").await;
-    }
-
-    #[gpui::test]
-    async fn test_undo_last_line_newline_many_changes(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {"
-            ˇfn a() { }
-            fn a() { }
-            fn a() { }
-        "})
-            .await;
-        // do a jump to reset vim's undo grouping
-        cx.simulate_shared_keystrokes("x shift-g k").await;
-        cx.shared_state().await.assert_matches();
-        cx.simulate_shared_keystrokes("x f a x f { x").await;
-        cx.shared_state().await.assert_matches();
-        cx.simulate_shared_keystrokes("shift-u").await;
-        cx.shared_state().await.assert_matches();
-        cx.simulate_shared_keystrokes("shift-u").await;
-        cx.shared_state().await.assert_matches();
-        cx.simulate_shared_keystrokes("shift-u").await;
-        cx.shared_state().await.assert_matches();
-        cx.simulate_shared_keystrokes("shift-u").await;
-        cx.shared_state().await.assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_undo_last_line_multicursor(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        cx.set_state(
-            indoc! {"
-            ˇone two ˇone
-            two ˇone two
-        "},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("3 r a");
-        cx.assert_state(
-            indoc! {"
-            aaˇa two aaˇa
-            two aaˇa two
-        "},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("escape escape");
-        cx.simulate_keystrokes("shift-u");
-        cx.set_state(
-            indoc! {"
-            onˇe two onˇe
-            two onˇe two
-        "},
-            Mode::Normal,
-        );
-    }
-
-    #[gpui::test]
-    async fn test_go_to_tab_with_count(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        // Open 4 tabs.
-        cx.simulate_keystrokes(": tabnew");
-        cx.simulate_keystrokes("enter");
-        cx.simulate_keystrokes(": tabnew");
-        cx.simulate_keystrokes("enter");
-        cx.simulate_keystrokes(": tabnew");
-        cx.simulate_keystrokes("enter");
-        cx.workspace(|workspace, _, cx| {
-            assert_eq!(workspace.items(cx).count(), 4);
-            assert_eq!(workspace.active_pane().read(cx).active_item_index(), 3);
-        });
-
-        cx.simulate_keystrokes("1 g t");
-        cx.workspace(|workspace, _, cx| {
-            assert_eq!(workspace.active_pane().read(cx).active_item_index(), 0);
-        });
-
-        cx.simulate_keystrokes("3 g t");
-        cx.workspace(|workspace, _, cx| {
-            assert_eq!(workspace.active_pane().read(cx).active_item_index(), 2);
-        });
-
-        cx.simulate_keystrokes("4 g t");
-        cx.workspace(|workspace, _, cx| {
-            assert_eq!(workspace.active_pane().read(cx).active_item_index(), 3);
-        });
-
-        cx.simulate_keystrokes("1 g t");
-        cx.simulate_keystrokes("g t");
-        cx.workspace(|workspace, _, cx| {
-            assert_eq!(workspace.active_pane().read(cx).active_item_index(), 1);
-        });
-    }
-
-    #[gpui::test]
-    async fn test_go_to_previous_tab_with_count(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        // Open 4 tabs.
-        cx.simulate_keystrokes(": tabnew");
-        cx.simulate_keystrokes("enter");
-        cx.simulate_keystrokes(": tabnew");
-        cx.simulate_keystrokes("enter");
-        cx.simulate_keystrokes(": tabnew");
-        cx.simulate_keystrokes("enter");
-        cx.workspace(|workspace, _, cx| {
-            assert_eq!(workspace.items(cx).count(), 4);
-            assert_eq!(workspace.active_pane().read(cx).active_item_index(), 3);
-        });
-
-        cx.simulate_keystrokes("2 g shift-t");
-        cx.workspace(|workspace, _, cx| {
-            assert_eq!(workspace.active_pane().read(cx).active_item_index(), 1);
-        });
-
-        cx.simulate_keystrokes("g shift-t");
-        cx.workspace(|workspace, _, cx| {
-            assert_eq!(workspace.active_pane().read(cx).active_item_index(), 0);
-        });
-
-        // Wraparound: gT from first tab should go to last.
-        cx.simulate_keystrokes("g shift-t");
-        cx.workspace(|workspace, _, cx| {
-            assert_eq!(workspace.active_pane().read(cx).active_item_index(), 3);
-        });
-
-        cx.simulate_keystrokes("6 g shift-t");
-        cx.workspace(|workspace, _, cx| {
-            assert_eq!(workspace.active_pane().read(cx).active_item_index(), 1);
-        });
-    }
-
-    #[gpui::test]
-    async fn test_temporary_mode(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        // Test jumping to the end of the line ($).
-        cx.set_shared_state(indoc! {"lorem ˇipsum"}).await;
-        cx.simulate_shared_keystrokes("i").await;
-        cx.shared_state().await.assert_matches();
-        cx.simulate_shared_keystrokes("ctrl-o $").await;
-        cx.shared_state().await.assert_eq(indoc! {"lorem ipsumˇ"});
-
-        // Test jumping to the next word.
-        cx.set_shared_state(indoc! {"loremˇ ipsum dolor"}).await;
-        cx.simulate_shared_keystrokes("a").await;
-        cx.shared_state().await.assert_matches();
-        cx.simulate_shared_keystrokes("a n d space ctrl-o w").await;
-        cx.shared_state()
-            .await
-            .assert_eq(indoc! {"lorem and ipsum ˇdolor"});
-
-        // Test yanking to end of line ($).
-        cx.set_shared_state(indoc! {"lorem ˇipsum dolor"}).await;
-        cx.simulate_shared_keystrokes("i").await;
-        cx.shared_state().await.assert_matches();
-        cx.simulate_shared_keystrokes("a n d space ctrl-o y $")
-            .await;
-        cx.shared_state()
-            .await
-            .assert_eq(indoc! {"lorem and ˇipsum dolor"});
-    }
-}
diff --git a/crates/vim/src/normal/change.rs b/crates/vim/src/normal/change.rs
deleted file mode 100644
index b0b0bddae1..0000000000
--- a/crates/vim/src/normal/change.rs
+++ /dev/null
@@ -1,706 +0,0 @@
-use crate::{
-    Vim,
-    motion::{self, Motion, MotionKind},
-    object::Object,
-    state::Mode,
-};
-use editor::{
-    Bias, DisplayPoint,
-    display_map::{DisplaySnapshot, ToDisplayPoint},
-    movement::TextLayoutDetails,
-};
-use gpui::{Context, Window};
-use language::Selection;
-
-impl Vim {
-    pub fn change_motion(
-        &mut self,
-        motion: Motion,
-        times: Option<usize>,
-        forced_motion: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        // Some motions ignore failure when switching to normal mode
-        let mut motion_kind = if matches!(
-            motion,
-            Motion::Left
-                | Motion::Right
-                | Motion::EndOfLine { .. }
-                | Motion::WrappingLeft
-                | Motion::StartOfLine { .. }
-        ) {
-            Some(MotionKind::Exclusive)
-        } else {
-            None
-        };
-        self.update_editor(cx, |vim, editor, cx| {
-            let text_layout_details = editor.text_layout_details(window);
-            editor.transact(window, cx, |editor, window, cx| {
-                // We are swapping to insert mode anyway. Just set the line end clipping behavior now
-                editor.set_clip_at_line_ends(false, cx);
-                editor.change_selections(Default::default(), window, cx, |s| {
-                    s.move_with(|map, selection| {
-                        let kind = match motion {
-                            Motion::NextWordStart { ignore_punctuation }
-                            | Motion::NextSubwordStart { ignore_punctuation } => {
-                                expand_changed_word_selection(
-                                    map,
-                                    selection,
-                                    times,
-                                    ignore_punctuation,
-                                    &text_layout_details,
-                                    motion == Motion::NextSubwordStart { ignore_punctuation },
-                                    !matches!(motion, Motion::NextWordStart { .. }),
-                                )
-                            }
-                            _ => {
-                                let kind = motion.expand_selection(
-                                    map,
-                                    selection,
-                                    times,
-                                    &text_layout_details,
-                                    forced_motion,
-                                );
-                                if matches!(
-                                    motion,
-                                    Motion::CurrentLine | Motion::Down { .. } | Motion::Up { .. }
-                                ) {
-                                    let mut start_offset =
-                                        selection.start.to_offset(map, Bias::Left);
-                                    let classifier = map
-                                        .buffer_snapshot()
-                                        .char_classifier_at(selection.start.to_point(map));
-                                    for (ch, offset) in map.buffer_chars_at(start_offset) {
-                                        if ch == '\n' || !classifier.is_whitespace(ch) {
-                                            break;
-                                        }
-                                        start_offset = offset + ch.len_utf8();
-                                    }
-                                    selection.start = start_offset.to_display_point(map);
-                                }
-                                kind
-                            }
-                        };
-                        if let Some(kind) = kind {
-                            motion_kind.get_or_insert(kind);
-                        }
-                    });
-                });
-                if let Some(kind) = motion_kind {
-                    vim.copy_selections_content(editor, kind, window, cx);
-                    editor.insert("", window, cx);
-                    editor.refresh_edit_prediction(true, false, window, cx);
-                }
-            });
-        });
-
-        if motion_kind.is_some() {
-            self.switch_mode(Mode::Insert, false, window, cx)
-        } else {
-            self.switch_mode(Mode::Normal, false, window, cx)
-        }
-    }
-
-    pub fn change_object(
-        &mut self,
-        object: Object,
-        around: bool,
-        times: Option<usize>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let mut objects_found = false;
-        self.update_editor(cx, |vim, editor, cx| {
-            // We are swapping to insert mode anyway. Just set the line end clipping behavior now
-            editor.set_clip_at_line_ends(false, cx);
-            editor.transact(window, cx, |editor, window, cx| {
-                editor.change_selections(Default::default(), window, cx, |s| {
-                    s.move_with(|map, selection| {
-                        objects_found |= object.expand_selection(map, selection, around, times);
-                    });
-                });
-                if objects_found {
-                    let kind = match object.target_visual_mode(vim.mode, around) {
-                        Mode::VisualLine => MotionKind::Linewise,
-                        _ => MotionKind::Exclusive,
-                    };
-                    vim.copy_selections_content(editor, kind, window, cx);
-                    editor.insert("", window, cx);
-                    editor.refresh_edit_prediction(true, false, window, cx);
-                }
-            });
-        });
-
-        if objects_found {
-            self.switch_mode(Mode::Insert, false, window, cx);
-        } else {
-            self.switch_mode(Mode::Normal, false, window, cx);
-        }
-    }
-}
-
-// From the docs https://vimdoc.sourceforge.net/htmldoc/motion.html
-// Special case: "cw" and "cW" are treated like "ce" and "cE" if the cursor is
-// on a non-blank.  This is because "cw" is interpreted as change-word, and a
-// word does not include the following white space.  {Vi: "cw" when on a blank
-// followed by other blanks changes only the first blank; this is probably a
-// bug, because "dw" deletes all the blanks}
-fn expand_changed_word_selection(
-    map: &DisplaySnapshot,
-    selection: &mut Selection<DisplayPoint>,
-    times: Option<usize>,
-    ignore_punctuation: bool,
-    text_layout_details: &TextLayoutDetails,
-    use_subword: bool,
-    always_advance: bool,
-) -> Option<MotionKind> {
-    let is_in_word = || {
-        let classifier = map
-            .buffer_snapshot()
-            .char_classifier_at(selection.start.to_point(map));
-
-        map.buffer_chars_at(selection.head().to_offset(map, Bias::Left))
-            .next()
-            .map(|(c, _)| !classifier.is_whitespace(c))
-            .unwrap_or_default()
-    };
-    if (times.is_none() || times.unwrap() == 1) && is_in_word() {
-        let next_char = map
-            .buffer_chars_at(
-                motion::next_char(map, selection.end, false).to_offset(map, Bias::Left),
-            )
-            .next();
-        match next_char {
-            Some((' ', _)) => selection.end = motion::next_char(map, selection.end, false),
-            _ => {
-                if use_subword {
-                    selection.end =
-                        motion::next_subword_end(map, selection.end, ignore_punctuation, 1, false);
-                } else {
-                    selection.end = motion::next_word_end(
-                        map,
-                        selection.end,
-                        ignore_punctuation,
-                        1,
-                        false,
-                        always_advance,
-                    );
-                }
-                selection.end = motion::next_char(map, selection.end, false);
-            }
-        }
-        Some(MotionKind::Inclusive)
-    } else {
-        let motion = if use_subword {
-            Motion::NextSubwordStart { ignore_punctuation }
-        } else {
-            Motion::NextWordStart { ignore_punctuation }
-        };
-        motion.expand_selection(map, selection, times, text_layout_details, false)
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use indoc::indoc;
-
-    use crate::test::NeovimBackedTestContext;
-
-    #[gpui::test]
-    async fn test_change_h(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate("c h", "Teˇst").await.assert_matches();
-        cx.simulate("c h", "Tˇest").await.assert_matches();
-        cx.simulate("c h", "ˇTest").await.assert_matches();
-        cx.simulate(
-            "c h",
-            indoc! {"
-            Test
-            ˇtest"},
-        )
-        .await
-        .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_change_backspace(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate("c backspace", "Teˇst").await.assert_matches();
-        cx.simulate("c backspace", "Tˇest").await.assert_matches();
-        cx.simulate("c backspace", "ˇTest").await.assert_matches();
-        cx.simulate(
-            "c backspace",
-            indoc! {"
-            Test
-            ˇtest"},
-        )
-        .await
-        .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_change_l(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate("c l", "Teˇst").await.assert_matches();
-        cx.simulate("c l", "Tesˇt").await.assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_change_w(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate("c w", "Teˇst").await.assert_matches();
-        cx.simulate("c w", "Tˇest test").await.assert_matches();
-        cx.simulate("c w", "Testˇ  test").await.assert_matches();
-        cx.simulate("c w", "Tesˇt  test").await.assert_matches();
-        cx.simulate(
-            "c w",
-            indoc! {"
-                Test teˇst
-                test"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "c w",
-            indoc! {"
-                Test tesˇt
-                test"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "c w",
-            indoc! {"
-                Test test
-                ˇ
-                test"},
-        )
-        .await
-        .assert_matches();
-
-        cx.simulate("c shift-w", "Test teˇst-test test")
-            .await
-            .assert_matches();
-
-        // on last character of word, `cw` doesn't eat subsequent punctuation
-        // see https://github.com/zed-industries/zed/issues/35269
-        cx.simulate("c w", "tesˇt-test").await.assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_change_e(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate("c e", "Teˇst Test").await.assert_matches();
-        cx.simulate("c e", "Tˇest test").await.assert_matches();
-        cx.simulate(
-            "c e",
-            indoc! {"
-                Test teˇst
-                test"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "c e",
-            indoc! {"
-                Test tesˇt
-                test"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "c e",
-            indoc! {"
-                Test test
-                ˇ
-                test"},
-        )
-        .await
-        .assert_matches();
-
-        cx.simulate("c shift-e", "Test teˇst-test test")
-            .await
-            .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_change_b(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate("c b", "Teˇst Test").await.assert_matches();
-        cx.simulate("c b", "Test ˇtest").await.assert_matches();
-        cx.simulate("c b", "Test1 test2 ˇtest3")
-            .await
-            .assert_matches();
-        cx.simulate(
-            "c b",
-            indoc! {"
-                Test test
-                ˇtest"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "c b",
-            indoc! {"
-                Test test
-                ˇ
-                test"},
-        )
-        .await
-        .assert_matches();
-
-        cx.simulate("c shift-b", "Test test-test ˇtest")
-            .await
-            .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_change_end_of_line(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate(
-            "c $",
-            indoc! {"
-            The qˇuick
-            brown fox"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "c $",
-            indoc! {"
-            The quick
-            ˇ
-            brown fox"},
-        )
-        .await
-        .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_change_0(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.simulate(
-            "c 0",
-            indoc! {"
-            The qˇuick
-            brown fox"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "c 0",
-            indoc! {"
-            The quick
-            ˇ
-            brown fox"},
-        )
-        .await
-        .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_change_k(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.simulate(
-            "c k",
-            indoc! {"
-            The quick
-            brown ˇfox
-            jumps over"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "c k",
-            indoc! {"
-            The quick
-            brown fox
-            jumps ˇover"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "c k",
-            indoc! {"
-            The qˇuick
-            brown fox
-            jumps over"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "c k",
-            indoc! {"
-            ˇ
-            brown fox
-            jumps over"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "c k",
-            indoc! {"
-            The quick
-              brown fox
-              ˇjumps over"},
-        )
-        .await
-        .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_change_j(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate(
-            "c j",
-            indoc! {"
-            The quick
-            brown ˇfox
-            jumps over"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "c j",
-            indoc! {"
-            The quick
-            brown fox
-            jumps ˇover"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "c j",
-            indoc! {"
-            The qˇuick
-            brown fox
-            jumps over"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "c j",
-            indoc! {"
-            The quick
-            brown fox
-            ˇ"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "c j",
-            indoc! {"
-            The quick
-              ˇbrown fox
-              jumps over"},
-        )
-        .await
-        .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_change_end_of_document(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate(
-            "c shift-g",
-            indoc! {"
-            The quick
-            brownˇ fox
-            jumps over
-            the lazy"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "c shift-g",
-            indoc! {"
-            The quick
-            brownˇ fox
-            jumps over
-            the lazy"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "c shift-g",
-            indoc! {"
-            The quick
-            brown fox
-            jumps over
-            the lˇazy"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "c shift-g",
-            indoc! {"
-            The quick
-            brown fox
-            jumps over
-            ˇ"},
-        )
-        .await
-        .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_change_cc(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate(
-            "c c",
-            indoc! {"
-           The quick
-             brownˇ fox
-           jumps over
-           the lazy"},
-        )
-        .await
-        .assert_matches();
-
-        cx.simulate(
-            "c c",
-            indoc! {"
-           ˇThe quick
-           brown fox
-           jumps over
-           the lazy"},
-        )
-        .await
-        .assert_matches();
-
-        cx.simulate(
-            "c c",
-            indoc! {"
-           The quick
-             broˇwn fox
-           jumps over
-           the lazy"},
-        )
-        .await
-        .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_change_gg(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate(
-            "c g g",
-            indoc! {"
-            The quick
-            brownˇ fox
-            jumps over
-            the lazy"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "c g g",
-            indoc! {"
-            The quick
-            brown fox
-            jumps over
-            the lˇazy"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "c g g",
-            indoc! {"
-            The qˇuick
-            brown fox
-            jumps over
-            the lazy"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "c g g",
-            indoc! {"
-            ˇ
-            brown fox
-            jumps over
-            the lazy"},
-        )
-        .await
-        .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_repeated_cj(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        for count in 1..=5 {
-            cx.simulate_at_each_offset(
-                &format!("c {count} j"),
-                indoc! {"
-                    ˇThe quˇickˇ browˇn
-                    ˇ
-                    ˇfox ˇjumpsˇ-ˇoˇver
-                    ˇthe lazy dog
-                    "},
-            )
-            .await
-            .assert_matches();
-        }
-    }
-
-    #[gpui::test]
-    async fn test_repeated_cl(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        for count in 1..=5 {
-            cx.simulate_at_each_offset(
-                &format!("c {count} l"),
-                indoc! {"
-                    ˇThe quˇickˇ browˇn
-                    ˇ
-                    ˇfox ˇjumpsˇ-ˇoˇver
-                    ˇthe lazy dog
-                    "},
-            )
-            .await
-            .assert_matches();
-        }
-    }
-
-    #[gpui::test]
-    async fn test_repeated_cb(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        for count in 1..=5 {
-            cx.simulate_at_each_offset(
-                &format!("c {count} b"),
-                indoc! {"
-                ˇThe quˇickˇ browˇn
-                ˇ
-                ˇfox ˇjumpsˇ-ˇoˇver
-                ˇthe lazy dog
-                "},
-            )
-            .await
-            .assert_matches()
-        }
-    }
-
-    #[gpui::test]
-    async fn test_repeated_ce(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        for count in 1..=5 {
-            cx.simulate_at_each_offset(
-                &format!("c {count} e"),
-                indoc! {"
-                    ˇThe quˇickˇ browˇn
-                    ˇ
-                    ˇfox ˇjumpsˇ-ˇoˇver
-                    ˇthe lazy dog
-                    "},
-            )
-            .await
-            .assert_matches();
-        }
-    }
-}
diff --git a/crates/vim/src/normal/convert.rs b/crates/vim/src/normal/convert.rs
deleted file mode 100644
index 0ee132a44d..0000000000
--- a/crates/vim/src/normal/convert.rs
+++ /dev/null
@@ -1,469 +0,0 @@
-use collections::HashMap;
-use editor::{SelectionEffects, display_map::ToDisplayPoint};
-use gpui::{Context, Window};
-use language::{Bias, Point, SelectionGoal};
-use multi_buffer::MultiBufferRow;
-
-use crate::{
-    Vim,
-    motion::Motion,
-    normal::{ChangeCase, ConvertToLowerCase, ConvertToRot13, ConvertToRot47, ConvertToUpperCase},
-    object::Object,
-    state::Mode,
-};
-
-pub enum ConvertTarget {
-    LowerCase,
-    UpperCase,
-    OppositeCase,
-    Rot13,
-    Rot47,
-}
-
-impl Vim {
-    pub fn convert_motion(
-        &mut self,
-        motion: Motion,
-        times: Option<usize>,
-        forced_motion: bool,
-        mode: ConvertTarget,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.stop_recording(cx);
-        self.update_editor(cx, |_, editor, cx| {
-            editor.set_clip_at_line_ends(false, cx);
-            let text_layout_details = editor.text_layout_details(window);
-            editor.transact(window, cx, |editor, window, cx| {
-                let mut selection_starts: HashMap<_, _> = Default::default();
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.move_with(|map, selection| {
-                        let anchor = map.display_point_to_anchor(selection.head(), Bias::Left);
-                        selection_starts.insert(selection.id, anchor);
-                        motion.expand_selection(
-                            map,
-                            selection,
-                            times,
-                            &text_layout_details,
-                            forced_motion,
-                        );
-                    });
-                });
-                match mode {
-                    ConvertTarget::LowerCase => {
-                        editor.convert_to_lower_case(&Default::default(), window, cx)
-                    }
-                    ConvertTarget::UpperCase => {
-                        editor.convert_to_upper_case(&Default::default(), window, cx)
-                    }
-                    ConvertTarget::OppositeCase => {
-                        editor.convert_to_opposite_case(&Default::default(), window, cx)
-                    }
-                    ConvertTarget::Rot13 => {
-                        editor.convert_to_rot13(&Default::default(), window, cx)
-                    }
-                    ConvertTarget::Rot47 => {
-                        editor.convert_to_rot47(&Default::default(), window, cx)
-                    }
-                }
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.move_with(|map, selection| {
-                        let anchor = selection_starts.remove(&selection.id).unwrap();
-                        selection.collapse_to(anchor.to_display_point(map), SelectionGoal::None);
-                    });
-                });
-            });
-            editor.set_clip_at_line_ends(true, cx);
-        });
-    }
-
-    pub fn convert_object(
-        &mut self,
-        object: Object,
-        around: bool,
-        mode: ConvertTarget,
-        times: Option<usize>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.stop_recording(cx);
-        self.update_editor(cx, |_, editor, cx| {
-            editor.transact(window, cx, |editor, window, cx| {
-                editor.set_clip_at_line_ends(false, cx);
-                let mut original_positions: HashMap<_, _> = Default::default();
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.move_with(|map, selection| {
-                        object.expand_selection(map, selection, around, times);
-                        original_positions.insert(
-                            selection.id,
-                            map.display_point_to_anchor(selection.start, Bias::Left),
-                        );
-                    });
-                });
-                match mode {
-                    ConvertTarget::LowerCase => {
-                        editor.convert_to_lower_case(&Default::default(), window, cx)
-                    }
-                    ConvertTarget::UpperCase => {
-                        editor.convert_to_upper_case(&Default::default(), window, cx)
-                    }
-                    ConvertTarget::OppositeCase => {
-                        editor.convert_to_opposite_case(&Default::default(), window, cx)
-                    }
-                    ConvertTarget::Rot13 => {
-                        editor.convert_to_rot13(&Default::default(), window, cx)
-                    }
-                    ConvertTarget::Rot47 => {
-                        editor.convert_to_rot47(&Default::default(), window, cx)
-                    }
-                }
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.move_with(|map, selection| {
-                        let anchor = original_positions.remove(&selection.id).unwrap();
-                        selection.collapse_to(anchor.to_display_point(map), SelectionGoal::None);
-                    });
-                });
-                editor.set_clip_at_line_ends(true, cx);
-            });
-        });
-    }
-
-    pub fn change_case(&mut self, _: &ChangeCase, window: &mut Window, cx: &mut Context<Self>) {
-        self.manipulate_text(window, cx, |c| {
-            if c.is_lowercase() {
-                c.to_uppercase().collect::<Vec<char>>()
-            } else {
-                c.to_lowercase().collect::<Vec<char>>()
-            }
-        })
-    }
-
-    pub fn convert_to_upper_case(
-        &mut self,
-        _: &ConvertToUpperCase,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.manipulate_text(window, cx, |c| c.to_uppercase().collect::<Vec<char>>())
-    }
-
-    pub fn convert_to_lower_case(
-        &mut self,
-        _: &ConvertToLowerCase,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.manipulate_text(window, cx, |c| c.to_lowercase().collect::<Vec<char>>())
-    }
-
-    pub fn convert_to_rot13(
-        &mut self,
-        _: &ConvertToRot13,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.manipulate_text(window, cx, |c| {
-            vec![match c {
-                'A'..='M' | 'a'..='m' => ((c as u8) + 13) as char,
-                'N'..='Z' | 'n'..='z' => ((c as u8) - 13) as char,
-                _ => c,
-            }]
-        })
-    }
-
-    pub fn convert_to_rot47(
-        &mut self,
-        _: &ConvertToRot47,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.manipulate_text(window, cx, |c| {
-            let code_point = c as u32;
-            if code_point >= 33 && code_point <= 126 {
-                return vec![char::from_u32(33 + ((code_point + 14) % 94)).unwrap()];
-            }
-            vec![c]
-        })
-    }
-
-    fn manipulate_text<F>(&mut self, window: &mut Window, cx: &mut Context<Self>, transform: F)
-    where
-        F: Fn(char) -> Vec<char> + Copy,
-    {
-        self.record_current_action(cx);
-        self.store_visual_marks(window, cx);
-        let count = Vim::take_count(cx).unwrap_or(1) as u32;
-        Vim::take_forced_motion(cx);
-
-        self.update_editor(cx, |vim, editor, cx| {
-            let mut ranges = Vec::new();
-            let mut cursor_positions = Vec::new();
-            let snapshot = editor.buffer().read(cx).snapshot(cx);
-            for selection in editor.selections.all_adjusted(&editor.display_snapshot(cx)) {
-                match vim.mode {
-                    Mode::Visual | Mode::VisualLine => {
-                        ranges.push(selection.start..selection.end);
-                        cursor_positions.push(selection.start..selection.start);
-                    }
-                    Mode::VisualBlock => {
-                        ranges.push(selection.start..selection.end);
-                        if cursor_positions.is_empty() {
-                            cursor_positions.push(selection.start..selection.start);
-                        }
-                    }
-
-                    Mode::HelixNormal | Mode::HelixSelect => {
-                        if selection.is_empty() {
-                            // Handle empty selection by operating on single character
-                            let start = selection.start;
-                            let end = snapshot.clip_point(start + Point::new(0, 1), Bias::Right);
-                            ranges.push(start..end);
-                            cursor_positions.push(selection.start..selection.start);
-                        } else {
-                            ranges.push(selection.start..selection.end);
-                            cursor_positions.push(selection.start..selection.end);
-                        }
-                    }
-                    Mode::Insert | Mode::Normal | Mode::Replace => {
-                        let start = selection.start;
-                        let mut end = start;
-                        for _ in 0..count {
-                            end = snapshot.clip_point(end + Point::new(0, 1), Bias::Right);
-                        }
-                        ranges.push(start..end);
-
-                        if end.column == snapshot.line_len(MultiBufferRow(end.row))
-                            && end.column > 0
-                        {
-                            end = snapshot.clip_point(end - Point::new(0, 1), Bias::Left);
-                        }
-                        cursor_positions.push(end..end)
-                    }
-                }
-            }
-            editor.transact(window, cx, |editor, window, cx| {
-                for range in ranges.into_iter().rev() {
-                    let snapshot = editor.buffer().read(cx).snapshot(cx);
-                    let text = snapshot
-                        .text_for_range(range.start..range.end)
-                        .flat_map(|s| s.chars())
-                        .flat_map(transform)
-                        .collect::<String>();
-                    editor.edit([(range, text)], cx)
-                }
-                editor.change_selections(Default::default(), window, cx, |s| {
-                    s.select_ranges(cursor_positions)
-                })
-            });
-        });
-        if self.mode != Mode::HelixNormal {
-            self.switch_mode(Mode::Normal, true, window, cx)
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use crate::test::VimTestContext;
-
-    use crate::{state::Mode, test::NeovimBackedTestContext};
-
-    #[gpui::test]
-    async fn test_change_case(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.set_shared_state("ˇabC\n").await;
-        cx.simulate_shared_keystrokes("~").await;
-        cx.shared_state().await.assert_eq("AˇbC\n");
-        cx.simulate_shared_keystrokes("2 ~").await;
-        cx.shared_state().await.assert_eq("ABˇc\n");
-
-        // works in visual mode
-        cx.set_shared_state("a😀C«dÉ1*fˇ»\n").await;
-        cx.simulate_shared_keystrokes("~").await;
-        cx.shared_state().await.assert_eq("a😀CˇDé1*F\n");
-
-        // works with multibyte characters
-        cx.simulate_shared_keystrokes("~").await;
-        cx.set_shared_state("aˇC😀é1*F\n").await;
-        cx.simulate_shared_keystrokes("4 ~").await;
-        cx.shared_state().await.assert_eq("ac😀É1ˇ*F\n");
-
-        // works with line selections
-        cx.set_shared_state("abˇC\n").await;
-        cx.simulate_shared_keystrokes("shift-v ~").await;
-        cx.shared_state().await.assert_eq("ˇABc\n");
-
-        // works in visual block mode
-        cx.set_shared_state("ˇaa\nbb\ncc").await;
-        cx.simulate_shared_keystrokes("ctrl-v j ~").await;
-        cx.shared_state().await.assert_eq("ˇAa\nBb\ncc");
-
-        // works with multiple cursors (zed only)
-        cx.set_state("aˇßcdˇe\n", Mode::Normal);
-        cx.simulate_keystrokes("~");
-        cx.assert_state("aSSˇcdˇE\n", Mode::Normal);
-    }
-
-    #[gpui::test]
-    async fn test_convert_to_upper_case(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        // works in visual mode
-        cx.set_shared_state("a😀C«dÉ1*fˇ»\n").await;
-        cx.simulate_shared_keystrokes("shift-u").await;
-        cx.shared_state().await.assert_eq("a😀CˇDÉ1*F\n");
-
-        // works with line selections
-        cx.set_shared_state("abˇC\n").await;
-        cx.simulate_shared_keystrokes("shift-v shift-u").await;
-        cx.shared_state().await.assert_eq("ˇABC\n");
-
-        // works in visual block mode
-        cx.set_shared_state("ˇaa\nbb\ncc").await;
-        cx.simulate_shared_keystrokes("ctrl-v j shift-u").await;
-        cx.shared_state().await.assert_eq("ˇAa\nBb\ncc");
-    }
-
-    #[gpui::test]
-    async fn test_convert_to_lower_case(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        // works in visual mode
-        cx.set_shared_state("A😀c«DÉ1*fˇ»\n").await;
-        cx.simulate_shared_keystrokes("u").await;
-        cx.shared_state().await.assert_eq("A😀cˇdé1*f\n");
-
-        // works with line selections
-        cx.set_shared_state("ABˇc\n").await;
-        cx.simulate_shared_keystrokes("shift-v u").await;
-        cx.shared_state().await.assert_eq("ˇabc\n");
-
-        // works in visual block mode
-        cx.set_shared_state("ˇAa\nBb\nCc").await;
-        cx.simulate_shared_keystrokes("ctrl-v j u").await;
-        cx.shared_state().await.assert_eq("ˇaa\nbb\nCc");
-    }
-
-    #[gpui::test]
-    async fn test_change_case_motion(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state("ˇabc def").await;
-        cx.simulate_shared_keystrokes("g shift-u w").await;
-        cx.shared_state().await.assert_eq("ˇABC def");
-
-        cx.simulate_shared_keystrokes("g u w").await;
-        cx.shared_state().await.assert_eq("ˇabc def");
-
-        cx.simulate_shared_keystrokes("g ~ w").await;
-        cx.shared_state().await.assert_eq("ˇABC def");
-
-        cx.simulate_shared_keystrokes(".").await;
-        cx.shared_state().await.assert_eq("ˇabc def");
-
-        cx.set_shared_state("abˇc def").await;
-        cx.simulate_shared_keystrokes("g ~ i w").await;
-        cx.shared_state().await.assert_eq("ˇABC def");
-
-        cx.simulate_shared_keystrokes(".").await;
-        cx.shared_state().await.assert_eq("ˇabc def");
-
-        cx.simulate_shared_keystrokes("g shift-u $").await;
-        cx.shared_state().await.assert_eq("ˇABC DEF");
-    }
-
-    #[gpui::test]
-    async fn test_change_case_motion_object(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state("abc dˇef\n").await;
-        cx.simulate_shared_keystrokes("g shift-u i w").await;
-        cx.shared_state().await.assert_eq("abc ˇDEF\n");
-    }
-
-    #[gpui::test]
-    async fn test_convert_to_rot13(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        // works in visual mode
-        cx.set_shared_state("a😀C«dÉ1*fˇ»\n").await;
-        cx.simulate_shared_keystrokes("g ?").await;
-        cx.shared_state().await.assert_eq("a😀CˇqÉ1*s\n");
-
-        // works with line selections
-        cx.set_shared_state("abˇC\n").await;
-        cx.simulate_shared_keystrokes("shift-v g ?").await;
-        cx.shared_state().await.assert_eq("ˇnoP\n");
-
-        // works in visual block mode
-        cx.set_shared_state("ˇaa\nbb\ncc").await;
-        cx.simulate_shared_keystrokes("ctrl-v j g ?").await;
-        cx.shared_state().await.assert_eq("ˇna\nob\ncc");
-    }
-
-    #[gpui::test]
-    async fn test_change_rot13_motion(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state("ˇabc def").await;
-        cx.simulate_shared_keystrokes("g ? w").await;
-        cx.shared_state().await.assert_eq("ˇnop def");
-
-        cx.simulate_shared_keystrokes("g ? w").await;
-        cx.shared_state().await.assert_eq("ˇabc def");
-
-        cx.simulate_shared_keystrokes(".").await;
-        cx.shared_state().await.assert_eq("ˇnop def");
-
-        cx.set_shared_state("abˇc def").await;
-        cx.simulate_shared_keystrokes("g ? i w").await;
-        cx.shared_state().await.assert_eq("ˇnop def");
-
-        cx.simulate_shared_keystrokes(".").await;
-        cx.shared_state().await.assert_eq("ˇabc def");
-
-        cx.simulate_shared_keystrokes("g ? $").await;
-        cx.shared_state().await.assert_eq("ˇnop qrs");
-    }
-
-    #[gpui::test]
-    async fn test_change_rot13_object(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state("ˇabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")
-            .await;
-        cx.simulate_shared_keystrokes("g ? i w").await;
-        cx.shared_state()
-            .await
-            .assert_eq("ˇnopqrstuvwxyzabcdefghijklmNOPQRSTUVWXYZABCDEFGHIJKLM");
-    }
-
-    #[gpui::test]
-    async fn test_change_case_helix_mode(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        // Explicit selection
-        cx.set_state("«hello worldˇ»", Mode::HelixNormal);
-        cx.simulate_keystrokes("~");
-        cx.assert_state("«HELLO WORLDˇ»", Mode::HelixNormal);
-
-        // Cursor-only (empty) selection - switch case
-        cx.set_state("The ˇquick brown", Mode::HelixNormal);
-        cx.simulate_keystrokes("~");
-        cx.assert_state("The ˇQuick brown", Mode::HelixNormal);
-        cx.simulate_keystrokes("~");
-        cx.assert_state("The ˇquick brown", Mode::HelixNormal);
-
-        // Cursor-only (empty) selection - switch to uppercase and lowercase explicitly
-        cx.set_state("The ˇquick brown", Mode::HelixNormal);
-        cx.simulate_keystrokes("alt-`");
-        cx.assert_state("The ˇQuick brown", Mode::HelixNormal);
-        cx.simulate_keystrokes("`");
-        cx.assert_state("The ˇquick brown", Mode::HelixNormal);
-
-        // With `e` motion (which extends selection to end of word in Helix)
-        cx.set_state("The ˇquick brown fox", Mode::HelixNormal);
-        cx.simulate_keystrokes("e");
-        cx.simulate_keystrokes("~");
-        cx.assert_state("The «QUICKˇ» brown fox", Mode::HelixNormal);
-
-        // Cursor-only
-    }
-}
diff --git a/crates/vim/src/normal/delete.rs b/crates/vim/src/normal/delete.rs
deleted file mode 100644
index b1c41315a8..0000000000
--- a/crates/vim/src/normal/delete.rs
+++ /dev/null
@@ -1,763 +0,0 @@
-use crate::{
-    Vim,
-    motion::{Motion, MotionKind},
-    object::Object,
-    state::Mode,
-};
-use collections::{HashMap, HashSet};
-use editor::{
-    Bias, DisplayPoint,
-    display_map::{DisplaySnapshot, ToDisplayPoint},
-};
-use gpui::{Context, Window};
-use language::{Point, Selection};
-use multi_buffer::MultiBufferRow;
-
-impl Vim {
-    pub fn delete_motion(
-        &mut self,
-        motion: Motion,
-        times: Option<usize>,
-        forced_motion: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.stop_recording(cx);
-        self.update_editor(cx, |vim, editor, cx| {
-            let text_layout_details = editor.text_layout_details(window);
-            editor.transact(window, cx, |editor, window, cx| {
-                editor.set_clip_at_line_ends(false, cx);
-                let mut original_columns: HashMap<_, _> = Default::default();
-                let mut motion_kind = None;
-                let mut ranges_to_copy = Vec::new();
-                editor.change_selections(Default::default(), window, cx, |s| {
-                    s.move_with(|map, selection| {
-                        let original_head = selection.head();
-                        original_columns.insert(selection.id, original_head.column());
-                        let kind = motion.expand_selection(
-                            map,
-                            selection,
-                            times,
-                            &text_layout_details,
-                            forced_motion,
-                        );
-                        ranges_to_copy
-                            .push(selection.start.to_point(map)..selection.end.to_point(map));
-
-                        // When deleting line-wise, we always want to delete a newline.
-                        // If there is one after the current line, it goes; otherwise we
-                        // pick the one before.
-                        if kind == Some(MotionKind::Linewise) {
-                            let start = selection.start.to_point(map);
-                            let end = selection.end.to_point(map);
-                            if end.row < map.buffer_snapshot().max_point().row {
-                                selection.end = Point::new(end.row + 1, 0).to_display_point(map)
-                            } else if start.row > 0 {
-                                selection.start = Point::new(
-                                    start.row - 1,
-                                    map.buffer_snapshot()
-                                        .line_len(MultiBufferRow(start.row - 1)),
-                                )
-                                .to_display_point(map)
-                            }
-                        }
-                        if let Some(kind) = kind {
-                            motion_kind.get_or_insert(kind);
-                        }
-                    });
-                });
-                let Some(kind) = motion_kind else { return };
-                vim.copy_ranges(editor, kind, false, ranges_to_copy, window, cx);
-                editor.insert("", window, cx);
-
-                // Fixup cursor position after the deletion
-                editor.set_clip_at_line_ends(true, cx);
-                editor.change_selections(Default::default(), window, cx, |s| {
-                    s.move_with(|map, selection| {
-                        let mut cursor = selection.head();
-                        if kind.linewise()
-                            && let Some(column) = original_columns.get(&selection.id)
-                        {
-                            *cursor.column_mut() = *column
-                        }
-                        cursor = map.clip_point(cursor, Bias::Left);
-                        selection.collapse_to(cursor, selection.goal)
-                    });
-                });
-                editor.refresh_edit_prediction(true, false, window, cx);
-            });
-        });
-    }
-
-    pub fn delete_object(
-        &mut self,
-        object: Object,
-        around: bool,
-        times: Option<usize>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.stop_recording(cx);
-        self.update_editor(cx, |vim, editor, cx| {
-            editor.transact(window, cx, |editor, window, cx| {
-                editor.set_clip_at_line_ends(false, cx);
-                // Emulates behavior in vim where if we expanded backwards to include a newline
-                // the cursor gets set back to the start of the line
-                let mut should_move_to_start: HashSet<_> = Default::default();
-
-                // Emulates behavior in vim where after deletion the cursor should try to move
-                // to the same column it was before deletion if the line is not empty or only
-                // contains whitespace
-                let mut column_before_move: HashMap<_, _> = Default::default();
-                let target_mode = object.target_visual_mode(vim.mode, around);
-
-                editor.change_selections(Default::default(), window, cx, |s| {
-                    s.move_with(|map, selection| {
-                        let cursor_point = selection.head().to_point(map);
-                        if target_mode == Mode::VisualLine {
-                            column_before_move.insert(selection.id, cursor_point.column);
-                        }
-
-                        object.expand_selection(map, selection, around, times);
-                        let offset_range = selection.map(|p| p.to_offset(map, Bias::Left)).range();
-                        let mut move_selection_start_to_previous_line =
-                            |map: &DisplaySnapshot, selection: &mut Selection<DisplayPoint>| {
-                                let start = selection.start.to_offset(map, Bias::Left);
-                                if selection.start.row().0 > 0 {
-                                    should_move_to_start.insert(selection.id);
-                                    selection.start =
-                                        (start - '\n'.len_utf8()).to_display_point(map);
-                                }
-                            };
-                        let range = selection.start.to_offset(map, Bias::Left)
-                            ..selection.end.to_offset(map, Bias::Right);
-                        let contains_only_newlines = map
-                            .buffer_chars_at(range.start)
-                            .take_while(|(_, p)| p < &range.end)
-                            .all(|(char, _)| char == '\n')
-                            && !offset_range.is_empty();
-                        let end_at_newline = map
-                            .buffer_chars_at(range.end)
-                            .next()
-                            .map(|(c, _)| c == '\n')
-                            .unwrap_or(false);
-
-                        // If expanded range contains only newlines and
-                        // the object is around or sentence, expand to include a newline
-                        // at the end or start
-                        if (around || object == Object::Sentence) && contains_only_newlines {
-                            if end_at_newline {
-                                move_selection_end_to_next_line(map, selection);
-                            } else {
-                                move_selection_start_to_previous_line(map, selection);
-                            }
-                        }
-
-                        // Does post-processing for the trailing newline and EOF
-                        // when not cancelled.
-                        let cancelled = around && selection.start == selection.end;
-                        if object == Object::Paragraph && !cancelled {
-                            // EOF check should be done before including a trailing newline.
-                            if ends_at_eof(map, selection) {
-                                move_selection_start_to_previous_line(map, selection);
-                            }
-
-                            if end_at_newline {
-                                move_selection_end_to_next_line(map, selection);
-                            }
-                        }
-                    });
-                });
-                vim.copy_selections_content(editor, MotionKind::Exclusive, window, cx);
-                editor.insert("", window, cx);
-
-                // Fixup cursor position after the deletion
-                editor.set_clip_at_line_ends(true, cx);
-                editor.change_selections(Default::default(), window, cx, |s| {
-                    s.move_with(|map, selection| {
-                        let mut cursor = selection.head();
-                        if should_move_to_start.contains(&selection.id) {
-                            *cursor.column_mut() = 0;
-                        } else if let Some(column) = column_before_move.get(&selection.id)
-                            && *column > 0
-                        {
-                            let mut cursor_point = cursor.to_point(map);
-                            cursor_point.column = *column;
-                            cursor = map
-                                .buffer_snapshot()
-                                .clip_point(cursor_point, Bias::Left)
-                                .to_display_point(map);
-                        }
-                        cursor = map.clip_point(cursor, Bias::Left);
-                        selection.collapse_to(cursor, selection.goal)
-                    });
-                });
-                editor.refresh_edit_prediction(true, false, window, cx);
-            });
-        });
-    }
-}
-
-fn move_selection_end_to_next_line(map: &DisplaySnapshot, selection: &mut Selection<DisplayPoint>) {
-    let end = selection.end.to_offset(map, Bias::Left);
-    selection.end = (end + '\n'.len_utf8()).to_display_point(map);
-}
-
-fn ends_at_eof(map: &DisplaySnapshot, selection: &mut Selection<DisplayPoint>) -> bool {
-    selection.end.to_point(map) == map.buffer_snapshot().max_point()
-}
-
-#[cfg(test)]
-mod test {
-    use indoc::indoc;
-
-    use crate::{
-        state::Mode,
-        test::{NeovimBackedTestContext, VimTestContext},
-    };
-
-    #[gpui::test]
-    async fn test_delete_h(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate("d h", "Teˇst").await.assert_matches();
-        cx.simulate("d h", "Tˇest").await.assert_matches();
-        cx.simulate("d h", "ˇTest").await.assert_matches();
-        cx.simulate(
-            "d h",
-            indoc! {"
-            Test
-            ˇtest"},
-        )
-        .await
-        .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_delete_l(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate("d l", "ˇTest").await.assert_matches();
-        cx.simulate("d l", "Teˇst").await.assert_matches();
-        cx.simulate("d l", "Tesˇt").await.assert_matches();
-        cx.simulate(
-            "d l",
-            indoc! {"
-                Tesˇt
-                test"},
-        )
-        .await
-        .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_delete_w(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate(
-            "d w",
-            indoc! {"
-            Test tesˇt
-                test"},
-        )
-        .await
-        .assert_matches();
-
-        cx.simulate("d w", "Teˇst").await.assert_matches();
-        cx.simulate("d w", "Tˇest test").await.assert_matches();
-        cx.simulate(
-            "d w",
-            indoc! {"
-            Test teˇst
-            test"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "d w",
-            indoc! {"
-            Test tesˇt
-            test"},
-        )
-        .await
-        .assert_matches();
-
-        cx.simulate(
-            "d w",
-            indoc! {"
-            Test test
-            ˇ
-            test"},
-        )
-        .await
-        .assert_matches();
-
-        cx.simulate("d shift-w", "Test teˇst-test test")
-            .await
-            .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_delete_next_word_end(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate("d e", "Teˇst Test\n").await.assert_matches();
-        cx.simulate("d e", "Tˇest test\n").await.assert_matches();
-        cx.simulate(
-            "d e",
-            indoc! {"
-            Test teˇst
-            test"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "d e",
-            indoc! {"
-            Test tesˇt
-            test"},
-        )
-        .await
-        .assert_matches();
-
-        cx.simulate("d e", "Test teˇst-test test")
-            .await
-            .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_delete_b(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate("d b", "Teˇst Test").await.assert_matches();
-        cx.simulate("d b", "Test ˇtest").await.assert_matches();
-        cx.simulate("d b", "Test1 test2 ˇtest3")
-            .await
-            .assert_matches();
-        cx.simulate(
-            "d b",
-            indoc! {"
-            Test test
-            ˇtest"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "d b",
-            indoc! {"
-            Test test
-            ˇ
-            test"},
-        )
-        .await
-        .assert_matches();
-
-        cx.simulate("d shift-b", "Test test-test ˇtest")
-            .await
-            .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_delete_end_of_line(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate(
-            "d $",
-            indoc! {"
-            The qˇuick
-            brown fox"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "d $",
-            indoc! {"
-            The quick
-            ˇ
-            brown fox"},
-        )
-        .await
-        .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_delete_end_of_paragraph(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate(
-            "d }",
-            indoc! {"
-            ˇhello world.
-
-            hello world."},
-        )
-        .await
-        .assert_matches();
-
-        cx.simulate(
-            "d }",
-            indoc! {"
-            ˇhello world.
-            hello world."},
-        )
-        .await
-        .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_delete_0(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate(
-            "d 0",
-            indoc! {"
-            The qˇuick
-            brown fox"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "d 0",
-            indoc! {"
-            The quick
-            ˇ
-            brown fox"},
-        )
-        .await
-        .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_delete_k(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate(
-            "d k",
-            indoc! {"
-            The quick
-            brown ˇfox
-            jumps over"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "d k",
-            indoc! {"
-            The quick
-            brown fox
-            jumps ˇover"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "d k",
-            indoc! {"
-            The qˇuick
-            brown fox
-            jumps over"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "d k",
-            indoc! {"
-            ˇbrown fox
-            jumps over"},
-        )
-        .await
-        .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_delete_j(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate(
-            "d j",
-            indoc! {"
-            The quick
-            brown ˇfox
-            jumps over"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "d j",
-            indoc! {"
-            The quick
-            brown fox
-            jumps ˇover"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "d j",
-            indoc! {"
-            The qˇuick
-            brown fox
-            jumps over"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "d j",
-            indoc! {"
-            The quick
-            brown fox
-            ˇ"},
-        )
-        .await
-        .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_delete_end_of_document(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate(
-            "d shift-g",
-            indoc! {"
-            The quick
-            brownˇ fox
-            jumps over
-            the lazy"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "d shift-g",
-            indoc! {"
-            The quick
-            brownˇ fox
-            jumps over
-            the lazy"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "d shift-g",
-            indoc! {"
-            The quick
-            brown fox
-            jumps over
-            the lˇazy"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "d shift-g",
-            indoc! {"
-            The quick
-            brown fox
-            jumps over
-            ˇ"},
-        )
-        .await
-        .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_delete_to_line(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate(
-            "d 3 shift-g",
-            indoc! {"
-            The quick
-            brownˇ fox
-            jumps over
-            the lazy"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "d 3 shift-g",
-            indoc! {"
-            The quick
-            brown fox
-            jumps over
-            the lˇazy"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "d 2 shift-g",
-            indoc! {"
-            The quick
-            brown fox
-            jumps over
-            ˇ"},
-        )
-        .await
-        .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_delete_gg(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate(
-            "d g g",
-            indoc! {"
-            The quick
-            brownˇ fox
-            jumps over
-            the lazy"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "d g g",
-            indoc! {"
-            The quick
-            brown fox
-            jumps over
-            the lˇazy"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "d g g",
-            indoc! {"
-            The qˇuick
-            brown fox
-            jumps over
-            the lazy"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "d g g",
-            indoc! {"
-            ˇ
-            brown fox
-            jumps over
-            the lazy"},
-        )
-        .await
-        .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_cancel_delete_operator(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-        cx.set_state(
-            indoc! {"
-                The quick brown
-                fox juˇmps over
-                the lazy dog"},
-            Mode::Normal,
-        );
-
-        // Canceling operator twice reverts to normal mode with no active operator
-        cx.simulate_keystrokes("d escape k");
-        assert_eq!(cx.active_operator(), None);
-        assert_eq!(cx.mode(), Mode::Normal);
-        cx.assert_editor_state(indoc! {"
-            The quˇick brown
-            fox jumps over
-            the lazy dog"});
-    }
-
-    #[gpui::test]
-    async fn test_unbound_command_cancels_pending_operator(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-        cx.set_state(
-            indoc! {"
-                The quick brown
-                fox juˇmps over
-                the lazy dog"},
-            Mode::Normal,
-        );
-
-        // Canceling operator twice reverts to normal mode with no active operator
-        cx.simulate_keystrokes("d y");
-        assert_eq!(cx.active_operator(), None);
-        assert_eq!(cx.mode(), Mode::Normal);
-    }
-
-    #[gpui::test]
-    async fn test_delete_with_counts(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.set_shared_state(indoc! {"
-                The ˇquick brown
-                fox jumps over
-                the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("d 2 d").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-        the ˇlazy dog"});
-
-        cx.set_shared_state(indoc! {"
-                The ˇquick brown
-                fox jumps over
-                the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("2 d d").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-        the ˇlazy dog"});
-
-        cx.set_shared_state(indoc! {"
-                The ˇquick brown
-                fox jumps over
-                the moon,
-                a star, and
-                the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("2 d 2 d").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-        the ˇlazy dog"});
-    }
-
-    #[gpui::test]
-    async fn test_delete_to_adjacent_character(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate("d t x", "ˇax").await.assert_matches();
-        cx.simulate("d t x", "aˇx").await.assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_delete_sentence(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        // cx.simulate(
-        //     "d )",
-        //     indoc! {"
-        //     Fiˇrst. Second. Third.
-        //     Fourth.
-        //     "},
-        // )
-        // .await
-        // .assert_matches();
-
-        // cx.simulate(
-        //     "d )",
-        //     indoc! {"
-        //     First. Secˇond. Third.
-        //     Fourth.
-        //     "},
-        // )
-        // .await
-        // .assert_matches();
-
-        // // Two deletes
-        // cx.simulate(
-        //     "d ) d )",
-        //     indoc! {"
-        //     First. Second. Thirˇd.
-        //     Fourth.
-        //     "},
-        // )
-        // .await
-        // .assert_matches();
-
-        // Should delete whole line if done on first column
-        cx.simulate(
-            "d )",
-            indoc! {"
-            ˇFirst.
-            Fourth.
-            "},
-        )
-        .await
-        .assert_matches();
-
-        // Backwards it should also delete the whole first line
-        cx.simulate(
-            "d (",
-            indoc! {"
-            First.
-            ˇSecond.
-            Fourth.
-            "},
-        )
-        .await
-        .assert_matches();
-    }
-}
diff --git a/crates/vim/src/normal/increment.rs b/crates/vim/src/normal/increment.rs
deleted file mode 100644
index d9ef32deba..0000000000
--- a/crates/vim/src/normal/increment.rs
+++ /dev/null
@@ -1,849 +0,0 @@
-use editor::{Editor, MultiBufferSnapshot, ToOffset, ToPoint};
-use gpui::{Action, Context, Window};
-use language::{Bias, Point};
-use schemars::JsonSchema;
-use serde::Deserialize;
-use std::ops::Range;
-
-use crate::{Vim, state::Mode};
-
-const BOOLEAN_PAIRS: &[(&str, &str)] = &[("true", "false"), ("yes", "no"), ("on", "off")];
-
-/// Increments the number under the cursor or toggles boolean values.
-#[derive(Clone, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = vim)]
-#[serde(deny_unknown_fields)]
-struct Increment {
-    #[serde(default)]
-    step: bool,
-}
-
-/// Decrements the number under the cursor or toggles boolean values.
-#[derive(Clone, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = vim)]
-#[serde(deny_unknown_fields)]
-struct Decrement {
-    #[serde(default)]
-    step: bool,
-}
-
-pub fn register(editor: &mut Editor, cx: &mut Context<Vim>) {
-    Vim::action(editor, cx, |vim, action: &Increment, window, cx| {
-        vim.record_current_action(cx);
-        let count = Vim::take_count(cx).unwrap_or(1);
-        Vim::take_forced_motion(cx);
-        let step = if action.step { count as i32 } else { 0 };
-        vim.increment(count as i64, step, window, cx)
-    });
-    Vim::action(editor, cx, |vim, action: &Decrement, window, cx| {
-        vim.record_current_action(cx);
-        let count = Vim::take_count(cx).unwrap_or(1);
-        Vim::take_forced_motion(cx);
-        let step = if action.step { -1 * (count as i32) } else { 0 };
-        vim.increment(-(count as i64), step, window, cx)
-    });
-}
-
-impl Vim {
-    fn increment(
-        &mut self,
-        mut delta: i64,
-        step: i32,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.store_visual_marks(window, cx);
-        self.update_editor(cx, |vim, editor, cx| {
-            let mut edits = Vec::new();
-            let mut new_anchors = Vec::new();
-
-            let snapshot = editor.buffer().read(cx).snapshot(cx);
-            for selection in editor.selections.all_adjusted(&editor.display_snapshot(cx)) {
-                if !selection.is_empty()
-                    && (vim.mode != Mode::VisualBlock || new_anchors.is_empty())
-                {
-                    new_anchors.push((true, snapshot.anchor_before(selection.start)))
-                }
-                for row in selection.start.row..=selection.end.row {
-                    let start = if row == selection.start.row {
-                        selection.start
-                    } else {
-                        Point::new(row, 0)
-                    };
-                    let end = if row == selection.end.row {
-                        selection.end
-                    } else {
-                        Point::new(row, snapshot.line_len(multi_buffer::MultiBufferRow(row)))
-                    };
-
-                    let find_result = if !selection.is_empty() {
-                        find_target(&snapshot, start, end, true)
-                    } else {
-                        find_target(&snapshot, start, end, false)
-                    };
-
-                    if let Some((range, target, radix)) = find_result {
-                        let replace = match radix {
-                            10 => increment_decimal_string(&target, delta),
-                            16 => increment_hex_string(&target, delta),
-                            2 => increment_binary_string(&target, delta),
-                            0 => increment_toggle_string(&target),
-                            _ => unreachable!(),
-                        };
-                        delta += step as i64;
-                        edits.push((range.clone(), replace));
-                        if selection.is_empty() {
-                            new_anchors.push((false, snapshot.anchor_after(range.end)))
-                        }
-                    } else if selection.is_empty() {
-                        new_anchors.push((true, snapshot.anchor_after(start)))
-                    }
-                }
-            }
-            editor.transact(window, cx, |editor, window, cx| {
-                editor.edit(edits, cx);
-
-                let snapshot = editor.buffer().read(cx).snapshot(cx);
-                editor.change_selections(Default::default(), window, cx, |s| {
-                    let mut new_ranges = Vec::new();
-                    for (visual, anchor) in new_anchors.iter() {
-                        let mut point = anchor.to_point(&snapshot);
-                        if !*visual && point.column > 0 {
-                            point.column -= 1;
-                            point = snapshot.clip_point(point, Bias::Left)
-                        }
-                        new_ranges.push(point..point);
-                    }
-                    s.select_ranges(new_ranges)
-                })
-            });
-        });
-        self.switch_mode(Mode::Normal, true, window, cx)
-    }
-}
-
-fn increment_decimal_string(num: &str, delta: i64) -> String {
-    let (negative, delta, num_str) = match num.strip_prefix('-') {
-        Some(n) => (true, -delta, n),
-        None => (false, delta, num),
-    };
-    let num_length = num_str.len();
-    let leading_zero = num_str.starts_with('0');
-
-    let (result, new_negative) = match u64::from_str_radix(num_str, 10) {
-        Ok(value) => {
-            let wrapped = value.wrapping_add_signed(delta);
-            if delta < 0 && wrapped > value {
-                ((u64::MAX - wrapped).wrapping_add(1), !negative)
-            } else if delta > 0 && wrapped < value {
-                (u64::MAX - wrapped, !negative)
-            } else {
-                (wrapped, negative)
-            }
-        }
-        Err(_) => (u64::MAX, negative),
-    };
-
-    let formatted = format!("{}", result);
-    let new_significant_digits = formatted.len();
-    let padding = if leading_zero {
-        num_length.saturating_sub(new_significant_digits)
-    } else {
-        0
-    };
-
-    if new_negative && result != 0 {
-        format!("-{}{}", "0".repeat(padding), formatted)
-    } else {
-        format!("{}{}", "0".repeat(padding), formatted)
-    }
-}
-
-fn increment_hex_string(num: &str, delta: i64) -> String {
-    let result = if let Ok(val) = u64::from_str_radix(num, 16) {
-        val.wrapping_add_signed(delta)
-    } else {
-        u64::MAX
-    };
-    if should_use_lowercase(num) {
-        format!("{:0width$x}", result, width = num.len())
-    } else {
-        format!("{:0width$X}", result, width = num.len())
-    }
-}
-
-fn should_use_lowercase(num: &str) -> bool {
-    let mut use_uppercase = false;
-    for ch in num.chars() {
-        if ch.is_ascii_lowercase() {
-            return true;
-        }
-        if ch.is_ascii_uppercase() {
-            use_uppercase = true;
-        }
-    }
-    !use_uppercase
-}
-
-fn increment_binary_string(num: &str, delta: i64) -> String {
-    let result = if let Ok(val) = u64::from_str_radix(num, 2) {
-        val.wrapping_add_signed(delta)
-    } else {
-        u64::MAX
-    };
-    format!("{:0width$b}", result, width = num.len())
-}
-
-fn find_target(
-    snapshot: &MultiBufferSnapshot,
-    start: Point,
-    end: Point,
-    need_range: bool,
-) -> Option<(Range<Point>, String, u32)> {
-    let start_offset = start.to_offset(snapshot);
-    let end_offset = end.to_offset(snapshot);
-
-    let mut offset = start_offset;
-    let mut first_char_is_num = snapshot
-        .chars_at(offset)
-        .next()
-        .map_or(false, |ch| ch.is_ascii_hexdigit());
-    let mut pre_char = String::new();
-
-    let next_offset = offset
-        + snapshot
-            .chars_at(start_offset)
-            .next()
-            .map_or(0, |ch| ch.len_utf8());
-    // Backward scan to find the start of the number, but stop at start_offset
-    for ch in snapshot.reversed_chars_at(next_offset) {
-        // Search boundaries
-        if offset.0 == 0 || ch.is_whitespace() || (need_range && offset <= start_offset) {
-            break;
-        }
-
-        // Avoid the influence of hexadecimal letters
-        if first_char_is_num
-            && !ch.is_ascii_hexdigit()
-            && (ch != 'b' && ch != 'B')
-            && (ch != 'x' && ch != 'X')
-            && ch != '-'
-        {
-            // Used to determine if the initial character is a number.
-            if is_numeric_string(&pre_char) {
-                break;
-            } else {
-                first_char_is_num = false;
-            }
-        }
-
-        pre_char.insert(0, ch);
-        offset -= ch.len_utf8();
-    }
-
-    let mut begin = None;
-    let mut end = None;
-    let mut target = String::new();
-    let mut radix = 10;
-    let mut is_num = false;
-
-    let mut chars = snapshot.chars_at(offset).peekable();
-
-    while let Some(ch) = chars.next() {
-        if need_range && offset >= end_offset {
-            break; // stop at end of selection
-        }
-
-        if target == "0"
-            && (ch == 'b' || ch == 'B')
-            && chars.peek().is_some()
-            && chars.peek().unwrap().is_digit(2)
-        {
-            radix = 2;
-            begin = None;
-            target = String::new();
-        } else if target == "0"
-            && (ch == 'x' || ch == 'X')
-            && chars.peek().is_some()
-            && chars.peek().unwrap().is_ascii_hexdigit()
-        {
-            radix = 16;
-            begin = None;
-            target = String::new();
-        } else if ch == '.' {
-            is_num = false;
-            begin = None;
-            target = String::new();
-        } else if ch.is_digit(radix)
-            || ((begin.is_none() || !is_num)
-                && ch == '-'
-                && chars.peek().is_some()
-                && chars.peek().unwrap().is_digit(radix))
-        {
-            if !is_num {
-                is_num = true;
-                begin = Some(offset);
-                target = String::new();
-            } else if begin.is_none() {
-                begin = Some(offset);
-            }
-            target.push(ch);
-        } else if ch.is_ascii_alphabetic() && !is_num {
-            if begin.is_none() {
-                begin = Some(offset);
-            }
-            target.push(ch);
-        } else if begin.is_some() && (is_num || !is_num && is_toggle_word(&target)) {
-            // End of matching
-            end = Some(offset);
-            break;
-        } else if ch == '\n' {
-            break;
-        } else {
-            // To match the next word
-            is_num = false;
-            begin = None;
-            target = String::new();
-        }
-
-        offset += ch.len_utf8();
-    }
-
-    if let Some(begin) = begin
-        && (is_num || !is_num && is_toggle_word(&target))
-    {
-        if !is_num {
-            radix = 0;
-        }
-
-        let end = end.unwrap_or(offset);
-        Some((
-            begin.to_point(snapshot)..end.to_point(snapshot),
-            target,
-            radix,
-        ))
-    } else {
-        None
-    }
-}
-
-fn is_numeric_string(s: &str) -> bool {
-    if s.is_empty() {
-        return false;
-    }
-
-    let (_, rest) = if let Some(r) = s.strip_prefix('-') {
-        (true, r)
-    } else {
-        (false, s)
-    };
-
-    if rest.is_empty() {
-        return false;
-    }
-
-    if let Some(digits) = rest.strip_prefix("0b").or_else(|| rest.strip_prefix("0B")) {
-        digits.is_empty() || digits.chars().all(|c| c == '0' || c == '1')
-    } else if let Some(digits) = rest.strip_prefix("0x").or_else(|| rest.strip_prefix("0X")) {
-        digits.is_empty() || digits.chars().all(|c| c.is_ascii_hexdigit())
-    } else {
-        !rest.is_empty() && rest.chars().all(|c| c.is_ascii_digit())
-    }
-}
-
-fn is_toggle_word(word: &str) -> bool {
-    let lower = word.to_lowercase();
-    BOOLEAN_PAIRS
-        .iter()
-        .any(|(a, b)| lower == *a || lower == *b)
-}
-
-fn increment_toggle_string(boolean: &str) -> String {
-    let lower = boolean.to_lowercase();
-
-    let target = BOOLEAN_PAIRS
-        .iter()
-        .find_map(|(a, b)| {
-            if lower == *a {
-                Some(b)
-            } else if lower == *b {
-                Some(a)
-            } else {
-                None
-            }
-        })
-        .unwrap_or(&boolean);
-
-    if boolean.chars().all(|c| c.is_uppercase()) {
-        // Upper case
-        target.to_uppercase()
-    } else if boolean.chars().next().unwrap_or(' ').is_uppercase() {
-        // Title case
-        let mut chars = target.chars();
-        match chars.next() {
-            None => String::new(),
-            Some(c) => c.to_uppercase().collect::<String>() + chars.as_str(),
-        }
-    } else {
-        target.to_string()
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use indoc::indoc;
-
-    use crate::{
-        state::Mode,
-        test::{NeovimBackedTestContext, VimTestContext},
-    };
-
-    #[gpui::test]
-    async fn test_increment(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {"
-            1ˇ2
-            "})
-            .await;
-
-        cx.simulate_shared_keystrokes("ctrl-a").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            1ˇ3
-            "});
-        cx.simulate_shared_keystrokes("ctrl-x").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            1ˇ2
-            "});
-
-        cx.simulate_shared_keystrokes("9 9 ctrl-a").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            11ˇ1
-            "});
-        cx.simulate_shared_keystrokes("1 1 1 ctrl-x").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            ˇ0
-            "});
-        cx.simulate_shared_keystrokes(".").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            -11ˇ1
-            "});
-    }
-
-    #[gpui::test]
-    async fn test_increment_with_dot(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {"
-            1ˇ.2
-            "})
-            .await;
-
-        cx.simulate_shared_keystrokes("ctrl-a").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            1.ˇ3
-            "});
-        cx.simulate_shared_keystrokes("ctrl-x").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            1.ˇ2
-            "});
-    }
-
-    #[gpui::test]
-    async fn test_increment_with_leading_zeros(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {"
-            000ˇ9
-            "})
-            .await;
-
-        cx.simulate_shared_keystrokes("ctrl-a").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            001ˇ0
-            "});
-        cx.simulate_shared_keystrokes("2 ctrl-x").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            000ˇ8
-            "});
-    }
-
-    #[gpui::test]
-    async fn test_increment_with_leading_zeros_and_zero(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {"
-            01ˇ1
-            "})
-            .await;
-
-        cx.simulate_shared_keystrokes("ctrl-a").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            01ˇ2
-            "});
-        cx.simulate_shared_keystrokes("1 2 ctrl-x").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            00ˇ0
-            "});
-    }
-
-    #[gpui::test]
-    async fn test_increment_with_changing_leading_zeros(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {"
-            099ˇ9
-            "})
-            .await;
-
-        cx.simulate_shared_keystrokes("ctrl-a").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            100ˇ0
-            "});
-        cx.simulate_shared_keystrokes("2 ctrl-x").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            99ˇ8
-            "});
-    }
-
-    #[gpui::test]
-    async fn test_increment_with_two_dots(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {"
-            111.ˇ.2
-            "})
-            .await;
-
-        cx.simulate_shared_keystrokes("ctrl-a").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            111..ˇ3
-            "});
-        cx.simulate_shared_keystrokes("ctrl-x").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            111..ˇ2
-            "});
-    }
-
-    #[gpui::test]
-    async fn test_increment_sign_change(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.set_shared_state(indoc! {"
-                ˇ0
-                "})
-            .await;
-        cx.simulate_shared_keystrokes("ctrl-x").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-                -ˇ1
-                "});
-        cx.simulate_shared_keystrokes("2 ctrl-a").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-                ˇ1
-                "});
-    }
-
-    #[gpui::test]
-    async fn test_increment_sign_change_with_leading_zeros(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.set_shared_state(indoc! {"
-                00ˇ1
-                "})
-            .await;
-        cx.simulate_shared_keystrokes("ctrl-x").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-                00ˇ0
-                "});
-        cx.simulate_shared_keystrokes("ctrl-x").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-                -00ˇ1
-                "});
-        cx.simulate_shared_keystrokes("2 ctrl-a").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-                00ˇ1
-                "});
-    }
-
-    #[gpui::test]
-    async fn test_increment_bin_wrapping_and_padding(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.set_shared_state(indoc! {"
-                    0b111111111111111111111111111111111111111111111111111111111111111111111ˇ1
-                    "})
-            .await;
-
-        cx.simulate_shared_keystrokes("ctrl-a").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-                    0b000000111111111111111111111111111111111111111111111111111111111111111ˇ1
-                    "});
-        cx.simulate_shared_keystrokes("ctrl-a").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-                    0b000000000000000000000000000000000000000000000000000000000000000000000ˇ0
-                    "});
-
-        cx.simulate_shared_keystrokes("ctrl-a").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-                    0b000000000000000000000000000000000000000000000000000000000000000000000ˇ1
-                    "});
-        cx.simulate_shared_keystrokes("2 ctrl-x").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-                    0b000000111111111111111111111111111111111111111111111111111111111111111ˇ1
-                    "});
-    }
-
-    #[gpui::test]
-    async fn test_increment_hex_wrapping_and_padding(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.set_shared_state(indoc! {"
-                    0xfffffffffffffffffffˇf
-                    "})
-            .await;
-
-        cx.simulate_shared_keystrokes("ctrl-a").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-                    0x0000fffffffffffffffˇf
-                    "});
-        cx.simulate_shared_keystrokes("ctrl-a").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-                    0x0000000000000000000ˇ0
-                    "});
-        cx.simulate_shared_keystrokes("ctrl-a").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-                    0x0000000000000000000ˇ1
-                    "});
-        cx.simulate_shared_keystrokes("2 ctrl-x").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-                    0x0000fffffffffffffffˇf
-                    "});
-    }
-
-    #[gpui::test]
-    async fn test_increment_wrapping(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.set_shared_state(indoc! {"
-                    1844674407370955161ˇ9
-                    "})
-            .await;
-
-        cx.simulate_shared_keystrokes("ctrl-a").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-                    1844674407370955161ˇ5
-                    "});
-        cx.simulate_shared_keystrokes("ctrl-a").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-                    -1844674407370955161ˇ5
-                    "});
-        cx.simulate_shared_keystrokes("ctrl-a").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-                    -1844674407370955161ˇ4
-                    "});
-        cx.simulate_shared_keystrokes("3 ctrl-x").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-                    1844674407370955161ˇ4
-                    "});
-        cx.simulate_shared_keystrokes("2 ctrl-a").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-                    -1844674407370955161ˇ5
-                    "});
-    }
-
-    #[gpui::test]
-    async fn test_increment_inline(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.set_shared_state(indoc! {"
-                    inline0x3ˇ9u32
-                    "})
-            .await;
-
-        cx.simulate_shared_keystrokes("ctrl-a").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-                    inline0x3ˇau32
-                    "});
-        cx.simulate_shared_keystrokes("ctrl-a").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-                    inline0x3ˇbu32
-                    "});
-        cx.simulate_shared_keystrokes("l l l ctrl-a").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-                    inline0x3bu3ˇ3
-                    "});
-    }
-
-    #[gpui::test]
-    async fn test_increment_hex_casing(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.set_shared_state(indoc! {"
-                        0xFˇa
-                    "})
-            .await;
-
-        cx.simulate_shared_keystrokes("ctrl-a").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-                    0xfˇb
-                    "});
-        cx.simulate_shared_keystrokes("ctrl-a").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-                    0xfˇc
-                    "});
-    }
-
-    #[gpui::test]
-    async fn test_increment_radix(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.simulate("ctrl-a", "ˇ total: 0xff")
-            .await
-            .assert_matches();
-        cx.simulate("ctrl-x", "ˇ total: 0xff")
-            .await
-            .assert_matches();
-        cx.simulate("ctrl-x", "ˇ total: 0xFF")
-            .await
-            .assert_matches();
-        cx.simulate("ctrl-a", "(ˇ0b10f)").await.assert_matches();
-        cx.simulate("ctrl-a", "ˇ-1").await.assert_matches();
-        cx.simulate("ctrl-a", "banˇana").await.assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_increment_steps(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {"
-            ˇ1
-            1
-            1  2
-            1
-            1"})
-            .await;
-
-        cx.simulate_shared_keystrokes("j v shift-g g ctrl-a").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            1
-            ˇ2
-            3  2
-            4
-            5"});
-
-        cx.simulate_shared_keystrokes("shift-g ctrl-v g g").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            «1ˇ»
-            «2ˇ»
-            «3ˇ»  2
-            «4ˇ»
-            «5ˇ»"});
-
-        cx.simulate_shared_keystrokes("g ctrl-x").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            ˇ0
-            0
-            0  2
-            0
-            0"});
-        cx.simulate_shared_keystrokes("v shift-g g ctrl-a").await;
-        cx.simulate_shared_keystrokes("v shift-g 5 g ctrl-a").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            ˇ6
-            12
-            18  2
-            24
-            30"});
-    }
-
-    #[gpui::test]
-    async fn test_increment_toggle(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        cx.set_state("let enabled = trˇue;", Mode::Normal);
-        cx.simulate_keystrokes("ctrl-a");
-        cx.assert_state("let enabled = falsˇe;", Mode::Normal);
-
-        cx.simulate_keystrokes("0 ctrl-a");
-        cx.assert_state("let enabled = truˇe;", Mode::Normal);
-
-        cx.set_state(
-            indoc! {"
-                ˇlet enabled = TRUE;
-                let enabled = TRUE;
-                let enabled = TRUE;
-            "},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("shift-v j j ctrl-x");
-        cx.assert_state(
-            indoc! {"
-                ˇlet enabled = FALSE;
-                let enabled = FALSE;
-                let enabled = FALSE;
-            "},
-            Mode::Normal,
-        );
-
-        cx.set_state(
-            indoc! {"
-                let enabled = ˇYes;
-                let enabled = Yes;
-                let enabled = Yes;
-            "},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("ctrl-v j j e ctrl-x");
-        cx.assert_state(
-            indoc! {"
-                let enabled = ˇNo;
-                let enabled = No;
-                let enabled = No;
-            "},
-            Mode::Normal,
-        );
-
-        cx.set_state("ˇlet enabled = True;", Mode::Normal);
-        cx.simulate_keystrokes("ctrl-a");
-        cx.assert_state("let enabled = Falsˇe;", Mode::Normal);
-
-        cx.simulate_keystrokes("ctrl-a");
-        cx.assert_state("let enabled = Truˇe;", Mode::Normal);
-
-        cx.set_state("let enabled = Onˇ;", Mode::Normal);
-        cx.simulate_keystrokes("v b ctrl-a");
-        cx.assert_state("let enabled = ˇOff;", Mode::Normal);
-    }
-
-    #[gpui::test]
-    async fn test_increment_order(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        cx.set_state("aaˇa false 1 2 3", Mode::Normal);
-        cx.simulate_keystrokes("ctrl-a");
-        cx.assert_state("aaa truˇe 1 2 3", Mode::Normal);
-
-        cx.set_state("aaˇa 1 false 2 3", Mode::Normal);
-        cx.simulate_keystrokes("ctrl-a");
-        cx.assert_state("aaa ˇ2 false 2 3", Mode::Normal);
-
-        cx.set_state("trueˇ 1 2 3", Mode::Normal);
-        cx.simulate_keystrokes("ctrl-a");
-        cx.assert_state("true ˇ2 2 3", Mode::Normal);
-
-        cx.set_state("falseˇ", Mode::Normal);
-        cx.simulate_keystrokes("ctrl-a");
-        cx.assert_state("truˇe", Mode::Normal);
-
-        cx.set_state("⚡️ˇ⚡️", Mode::Normal);
-        cx.simulate_keystrokes("ctrl-a");
-        cx.assert_state("⚡️ˇ⚡️", Mode::Normal);
-    }
-
-    #[gpui::test]
-    async fn test_increment_visual_partial_number(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state("ˇ123").await;
-        cx.simulate_shared_keystrokes("v l ctrl-a").await;
-        cx.shared_state().await.assert_eq(indoc! {"ˇ133"});
-        cx.simulate_shared_keystrokes("l v l ctrl-a").await;
-        cx.shared_state().await.assert_eq(indoc! {"1ˇ34"});
-        cx.simulate_shared_keystrokes("shift-v y p p ctrl-v k k l ctrl-a")
-            .await;
-        cx.shared_state().await.assert_eq(indoc! {"ˇ144\n144\n144"});
-    }
-}
diff --git a/crates/vim/src/normal/mark.rs b/crates/vim/src/normal/mark.rs
deleted file mode 100644
index 3bb040511f..0000000000
--- a/crates/vim/src/normal/mark.rs
+++ /dev/null
@@ -1,397 +0,0 @@
-use std::{ops::Range, path::Path, sync::Arc};
-
-use editor::{
-    Anchor, Bias, DisplayPoint, Editor, MultiBuffer,
-    display_map::{DisplaySnapshot, ToDisplayPoint},
-    movement,
-};
-use gpui::{Context, Entity, EntityId, UpdateGlobal, Window};
-use language::SelectionGoal;
-use text::Point;
-use ui::App;
-use workspace::OpenOptions;
-
-use crate::{
-    Vim,
-    motion::{self, Motion},
-    state::{Mark, Mode, VimGlobals},
-};
-
-impl Vim {
-    pub fn create_mark(&mut self, text: Arc<str>, window: &mut Window, cx: &mut Context<Self>) {
-        self.update_editor(cx, |vim, editor, cx| {
-            let anchors = editor
-                .selections
-                .disjoint_anchors_arc()
-                .iter()
-                .map(|s| s.head())
-                .collect::<Vec<_>>();
-            vim.set_mark(text.to_string(), anchors, editor.buffer(), window, cx);
-        });
-        self.clear_operator(window, cx);
-    }
-
-    // When handling an action, you must create visual marks if you will switch to normal
-    // mode without the default selection behavior.
-    pub(crate) fn store_visual_marks(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if self.mode.is_visual() {
-            self.create_visual_marks(self.mode, window, cx);
-        }
-    }
-
-    pub(crate) fn create_visual_marks(
-        &mut self,
-        mode: Mode,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let mut starts = vec![];
-        let mut ends = vec![];
-        let mut reversed = vec![];
-
-        self.update_editor(cx, |vim, editor, cx| {
-            let display_map = editor.display_snapshot(cx);
-            let selections = editor.selections.all_display(&display_map);
-            for selection in selections {
-                let end = movement::saturating_left(&display_map, selection.end);
-                ends.push(
-                    display_map
-                        .buffer_snapshot()
-                        .anchor_before(end.to_offset(&display_map, Bias::Left)),
-                );
-                starts.push(
-                    display_map
-                        .buffer_snapshot()
-                        .anchor_before(selection.start.to_offset(&display_map, Bias::Left)),
-                );
-                reversed.push(selection.reversed)
-            }
-            vim.set_mark("<".to_string(), starts, editor.buffer(), window, cx);
-            vim.set_mark(">".to_string(), ends, editor.buffer(), window, cx);
-        });
-
-        self.stored_visual_mode.replace((mode, reversed));
-    }
-
-    fn open_buffer_mark(
-        &mut self,
-        line: bool,
-        entity_id: EntityId,
-        anchors: Vec<Anchor>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(workspace) = self.workspace(window) else {
-            return;
-        };
-        workspace.update(cx, |workspace, cx| {
-            let item = workspace.items(cx).find(|item| {
-                item.act_as::<Editor>(cx)
-                    .is_some_and(|editor| editor.read(cx).buffer().entity_id() == entity_id)
-            });
-            let Some(item) = item.cloned() else {
-                return;
-            };
-            if let Some(pane) = workspace.pane_for(item.as_ref()) {
-                pane.update(cx, |pane, cx| {
-                    if let Some(index) = pane.index_for_item(item.as_ref()) {
-                        pane.activate_item(index, true, true, window, cx);
-                    }
-                });
-            };
-
-            item.act_as::<Editor>(cx).unwrap().update(cx, |editor, cx| {
-                let map = editor.snapshot(window, cx);
-                let mut ranges: Vec<Range<Anchor>> = Vec::new();
-                for mut anchor in anchors {
-                    if line {
-                        let mut point = anchor.to_display_point(&map.display_snapshot);
-                        point = motion::first_non_whitespace(&map.display_snapshot, false, point);
-                        anchor = map
-                            .display_snapshot
-                            .buffer_snapshot()
-                            .anchor_before(point.to_point(&map.display_snapshot));
-                    }
-
-                    if ranges.last() != Some(&(anchor..anchor)) {
-                        ranges.push(anchor..anchor);
-                    }
-                }
-
-                editor.change_selections(Default::default(), window, cx, |s| {
-                    s.select_anchor_ranges(ranges)
-                });
-            })
-        });
-    }
-
-    fn open_path_mark(
-        &mut self,
-        line: bool,
-        path: Arc<Path>,
-        points: Vec<Point>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(workspace) = self.workspace(window) else {
-            return;
-        };
-        let task = workspace.update(cx, |workspace, cx| {
-            workspace.open_abs_path(
-                path.to_path_buf(),
-                OpenOptions {
-                    visible: Some(workspace::OpenVisible::All),
-                    focus: Some(true),
-                    ..Default::default()
-                },
-                window,
-                cx,
-            )
-        });
-        cx.spawn_in(window, async move |this, cx| {
-            let editor = task.await?;
-            this.update_in(cx, |_, window, cx| {
-                if let Some(editor) = editor.act_as::<Editor>(cx) {
-                    editor.update(cx, |editor, cx| {
-                        let map = editor.snapshot(window, cx);
-                        let points: Vec<_> = points
-                            .into_iter()
-                            .map(|p| {
-                                if line {
-                                    let point = p.to_display_point(&map.display_snapshot);
-                                    motion::first_non_whitespace(
-                                        &map.display_snapshot,
-                                        false,
-                                        point,
-                                    )
-                                    .to_point(&map.display_snapshot)
-                                } else {
-                                    p
-                                }
-                            })
-                            .collect();
-                        editor.change_selections(Default::default(), window, cx, |s| {
-                            s.select_ranges(points.into_iter().map(|p| p..p))
-                        })
-                    })
-                }
-            })
-        })
-        .detach_and_log_err(cx);
-    }
-
-    pub fn jump(
-        &mut self,
-        text: Arc<str>,
-        line: bool,
-        should_pop_operator: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if should_pop_operator {
-            self.pop_operator(window, cx);
-        }
-        let mark = self
-            .update_editor(cx, |vim, editor, cx| {
-                vim.get_mark(&text, editor, window, cx)
-            })
-            .flatten();
-        let anchors = match mark {
-            None => None,
-            Some(Mark::Local(anchors)) => Some(anchors),
-            Some(Mark::Buffer(entity_id, anchors)) => {
-                self.open_buffer_mark(line, entity_id, anchors, window, cx);
-                return;
-            }
-            Some(Mark::Path(path, points)) => {
-                self.open_path_mark(line, path, points, window, cx);
-                return;
-            }
-        };
-
-        let Some(mut anchors) = anchors else { return };
-
-        self.update_editor(cx, |_, editor, cx| {
-            editor.create_nav_history_entry(cx);
-        });
-        let is_active_operator = self.active_operator().is_some();
-        if is_active_operator {
-            if let Some(anchor) = anchors.last() {
-                self.motion(
-                    Motion::Jump {
-                        anchor: *anchor,
-                        line,
-                    },
-                    window,
-                    cx,
-                )
-            }
-        } else {
-            // Save the last anchor so as to jump to it later.
-            let anchor: Option<Anchor> = anchors.last_mut().map(|anchor| *anchor);
-            let should_jump = self.mode == Mode::Visual
-                || self.mode == Mode::VisualLine
-                || self.mode == Mode::VisualBlock;
-
-            self.update_editor(cx, |_, editor, cx| {
-                let map = editor.snapshot(window, cx);
-                let mut ranges: Vec<Range<Anchor>> = Vec::new();
-                for mut anchor in anchors {
-                    if line {
-                        let mut point = anchor.to_display_point(&map.display_snapshot);
-                        point = motion::first_non_whitespace(&map.display_snapshot, false, point);
-                        anchor = map
-                            .display_snapshot
-                            .buffer_snapshot()
-                            .anchor_before(point.to_point(&map.display_snapshot));
-                    }
-
-                    if ranges.last() != Some(&(anchor..anchor)) {
-                        ranges.push(anchor..anchor);
-                    }
-                }
-
-                if !should_jump && !ranges.is_empty() {
-                    editor.change_selections(Default::default(), window, cx, |s| {
-                        s.select_anchor_ranges(ranges)
-                    });
-                }
-            });
-
-            if should_jump && let Some(anchor) = anchor {
-                self.motion(Motion::Jump { anchor, line }, window, cx)
-            }
-        }
-    }
-
-    pub fn set_mark(
-        &mut self,
-        mut name: String,
-        anchors: Vec<Anchor>,
-        buffer_entity: &Entity<MultiBuffer>,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        let Some(workspace) = self.workspace(window) else {
-            return;
-        };
-        if name == "`" {
-            name = "'".to_string();
-        }
-        if matches!(&name[..], "-" | " ") {
-            // Not allowed marks
-            return;
-        }
-        let entity_id = workspace.entity_id();
-        Vim::update_globals(cx, |vim_globals, cx| {
-            let Some(marks_state) = vim_globals.marks.get(&entity_id) else {
-                return;
-            };
-            marks_state.update(cx, |ms, cx| {
-                ms.set_mark(name.clone(), buffer_entity, anchors, cx);
-            });
-        });
-    }
-
-    pub fn get_mark(
-        &self,
-        mut name: &str,
-        editor: &mut Editor,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<Mark> {
-        if name == "`" {
-            name = "'";
-        }
-        if matches!(name, "{" | "}" | "(" | ")") {
-            let display_map = editor.display_snapshot(cx);
-            let selections = editor.selections.all_display(&display_map);
-            let anchors = selections
-                .into_iter()
-                .map(|selection| {
-                    let point = match name {
-                        "{" => movement::start_of_paragraph(&display_map, selection.head(), 1),
-                        "}" => movement::end_of_paragraph(&display_map, selection.head(), 1),
-                        "(" => motion::sentence_backwards(&display_map, selection.head(), 1),
-                        ")" => motion::sentence_forwards(&display_map, selection.head(), 1),
-                        _ => unreachable!(),
-                    };
-                    display_map
-                        .buffer_snapshot()
-                        .anchor_before(point.to_offset(&display_map, Bias::Left))
-                })
-                .collect::<Vec<Anchor>>();
-            return Some(Mark::Local(anchors));
-        }
-        VimGlobals::update_global(cx, |globals, cx| {
-            let workspace_id = self.workspace(window)?.entity_id();
-            globals
-                .marks
-                .get_mut(&workspace_id)?
-                .update(cx, |ms, cx| ms.get_mark(name, editor.buffer(), cx))
-        })
-    }
-
-    pub fn delete_mark(
-        &self,
-        name: String,
-        editor: &mut Editor,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        let Some(workspace) = self.workspace(window) else {
-            return;
-        };
-        if name == "`" || name == "'" {
-            return;
-        }
-        let entity_id = workspace.entity_id();
-        Vim::update_globals(cx, |vim_globals, cx| {
-            let Some(marks_state) = vim_globals.marks.get(&entity_id) else {
-                return;
-            };
-            marks_state.update(cx, |ms, cx| {
-                ms.delete_mark(name.clone(), editor.buffer(), cx);
-            });
-        });
-    }
-}
-
-pub fn jump_motion(
-    map: &DisplaySnapshot,
-    anchor: Anchor,
-    line: bool,
-) -> (DisplayPoint, SelectionGoal) {
-    let mut point = anchor.to_display_point(map);
-    if line {
-        point = motion::first_non_whitespace(map, false, point)
-    }
-
-    (point, SelectionGoal::None)
-}
-
-#[cfg(test)]
-mod test {
-    use gpui::TestAppContext;
-
-    use crate::test::NeovimBackedTestContext;
-
-    #[gpui::test]
-    async fn test_quote_mark(cx: &mut TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state("ˇHello, world!").await;
-        cx.simulate_shared_keystrokes("w m o").await;
-        cx.shared_state().await.assert_eq("Helloˇ, world!");
-        cx.simulate_shared_keystrokes("$ ` o").await;
-        cx.shared_state().await.assert_eq("Helloˇ, world!");
-        cx.simulate_shared_keystrokes("` `").await;
-        cx.shared_state().await.assert_eq("Hello, worldˇ!");
-        cx.simulate_shared_keystrokes("` `").await;
-        cx.shared_state().await.assert_eq("Helloˇ, world!");
-        cx.simulate_shared_keystrokes("$ m '").await;
-        cx.shared_state().await.assert_eq("Hello, worldˇ!");
-        cx.simulate_shared_keystrokes("^ ` `").await;
-        cx.shared_state().await.assert_eq("Hello, worldˇ!");
-    }
-}
diff --git a/crates/vim/src/normal/paste.rs b/crates/vim/src/normal/paste.rs
deleted file mode 100644
index 82af828deb..0000000000
--- a/crates/vim/src/normal/paste.rs
+++ /dev/null
@@ -1,1086 +0,0 @@
-use editor::{
-    DisplayPoint, MultiBufferOffset, RowExt, SelectionEffects, display_map::ToDisplayPoint,
-    movement,
-};
-use gpui::{Action, Context, Window};
-use language::{Bias, SelectionGoal};
-use schemars::JsonSchema;
-use serde::Deserialize;
-use settings::Settings;
-use std::cmp;
-use vim_mode_setting::HelixModeSetting;
-
-use crate::{
-    Vim,
-    motion::{Motion, MotionKind},
-    object::Object,
-    state::{Mode, Register},
-};
-
-/// Pastes text from the specified register at the cursor position.
-#[derive(Clone, Default, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = vim)]
-#[serde(deny_unknown_fields)]
-pub struct Paste {
-    #[serde(default)]
-    before: bool,
-    #[serde(default)]
-    preserve_clipboard: bool,
-}
-
-impl Vim {
-    pub fn paste(&mut self, action: &Paste, window: &mut Window, cx: &mut Context<Self>) {
-        self.record_current_action(cx);
-        self.store_visual_marks(window, cx);
-        let count = Vim::take_count(cx).unwrap_or(1);
-        Vim::take_forced_motion(cx);
-
-        self.update_editor(cx, |vim, editor, cx| {
-            let text_layout_details = editor.text_layout_details(window);
-            editor.transact(window, cx, |editor, window, cx| {
-                editor.set_clip_at_line_ends(false, cx);
-
-                let selected_register = vim.selected_register.take();
-
-                let Some(Register {
-                    text,
-                    clipboard_selections,
-                }) = Vim::update_globals(cx, |globals, cx| {
-                    globals.read_register(selected_register, Some(editor), cx)
-                })
-                .filter(|reg| !reg.text.is_empty())
-                else {
-                    return;
-                };
-                let clipboard_selections = clipboard_selections
-                    .filter(|sel| sel.len() > 1 && vim.mode != Mode::VisualLine);
-
-                if !action.preserve_clipboard && vim.mode.is_visual() {
-                    vim.copy_selections_content(editor, MotionKind::for_mode(vim.mode), window, cx);
-                }
-
-                let display_map = editor.display_snapshot(cx);
-                let current_selections = editor.selections.all_adjusted_display(&display_map);
-
-                // unlike zed, if you have a multi-cursor selection from vim block mode,
-                // pasting it will paste it on subsequent lines, even if you don't yet
-                // have a cursor there.
-                let mut selections_to_process = Vec::new();
-                let mut i = 0;
-                while i < current_selections.len() {
-                    selections_to_process
-                        .push((current_selections[i].start..current_selections[i].end, true));
-                    i += 1;
-                }
-                if let Some(clipboard_selections) = clipboard_selections.as_ref() {
-                    let left = current_selections
-                        .iter()
-                        .map(|selection| cmp::min(selection.start.column(), selection.end.column()))
-                        .min()
-                        .unwrap();
-                    let mut row = current_selections.last().unwrap().end.row().next_row();
-                    while i < clipboard_selections.len() {
-                        let cursor =
-                            display_map.clip_point(DisplayPoint::new(row, left), Bias::Left);
-                        selections_to_process.push((cursor..cursor, false));
-                        i += 1;
-                        row.0 += 1;
-                    }
-                }
-
-                let first_selection_indent_column =
-                    clipboard_selections.as_ref().and_then(|zed_selections| {
-                        zed_selections
-                            .first()
-                            .map(|selection| selection.first_line_indent)
-                    });
-                let before = action.before || vim.mode == Mode::VisualLine;
-
-                let mut edits = Vec::new();
-                let mut new_selections = Vec::new();
-                let mut original_indent_columns = Vec::new();
-                let mut start_offset = 0;
-
-                for (ix, (selection, preserve)) in selections_to_process.iter().enumerate() {
-                    let (mut to_insert, original_indent_column) =
-                        if let Some(clipboard_selections) = &clipboard_selections {
-                            if let Some(clipboard_selection) = clipboard_selections.get(ix) {
-                                let end_offset = start_offset + clipboard_selection.len;
-                                let text = text[start_offset..end_offset].to_string();
-                                start_offset = end_offset + 1;
-                                (text, Some(clipboard_selection.first_line_indent))
-                            } else {
-                                ("".to_string(), first_selection_indent_column)
-                            }
-                        } else {
-                            (text.to_string(), first_selection_indent_column)
-                        };
-                    let line_mode = to_insert.ends_with('\n');
-                    let is_multiline = to_insert.contains('\n');
-
-                    if line_mode && !before {
-                        if selection.is_empty() {
-                            to_insert =
-                                "\n".to_owned() + &to_insert[..to_insert.len() - "\n".len()];
-                        } else {
-                            to_insert = "\n".to_owned() + &to_insert;
-                        }
-                    } else if line_mode && vim.mode == Mode::VisualLine {
-                        to_insert.pop();
-                    }
-
-                    let display_range = if !selection.is_empty() {
-                        // If vim is in VISUAL LINE mode and the column for the
-                        // selection's end point is 0, that means that the
-                        // cursor is at the newline character (\n) at the end of
-                        // the line. In this situation we'll want to move one
-                        // position to the left, ensuring we don't join the last
-                        // line of the selection with the line directly below.
-                        let end_point =
-                            if vim.mode == Mode::VisualLine && selection.end.column() == 0 {
-                                movement::left(&display_map, selection.end)
-                            } else {
-                                selection.end
-                            };
-
-                        selection.start..end_point
-                    } else if line_mode {
-                        let point = if before {
-                            movement::line_beginning(&display_map, selection.start, false)
-                        } else {
-                            movement::line_end(&display_map, selection.start, false)
-                        };
-                        point..point
-                    } else {
-                        let point = if before {
-                            selection.start
-                        } else {
-                            movement::saturating_right(&display_map, selection.start)
-                        };
-                        point..point
-                    };
-
-                    let point_range = display_range.start.to_point(&display_map)
-                        ..display_range.end.to_point(&display_map);
-                    let anchor = if is_multiline || vim.mode == Mode::VisualLine {
-                        display_map
-                            .buffer_snapshot()
-                            .anchor_before(point_range.start)
-                    } else {
-                        display_map.buffer_snapshot().anchor_after(point_range.end)
-                    };
-
-                    if *preserve {
-                        new_selections.push((anchor, line_mode, is_multiline));
-                    }
-                    edits.push((point_range, to_insert.repeat(count)));
-                    original_indent_columns.push(original_indent_column);
-                }
-
-                let cursor_offset = editor
-                    .selections
-                    .last::<MultiBufferOffset>(&display_map)
-                    .head();
-                if editor
-                    .buffer()
-                    .read(cx)
-                    .snapshot(cx)
-                    .language_settings_at(cursor_offset, cx)
-                    .auto_indent_on_paste
-                {
-                    editor.edit_with_block_indent(edits, original_indent_columns, cx);
-                } else {
-                    editor.edit(edits, cx);
-                }
-
-                // in line_mode vim will insert the new text on the next (or previous if before) line
-                // and put the cursor on the first non-blank character of the first inserted line (or at the end if the first line is blank).
-                // otherwise vim will insert the next text at (or before) the current cursor position,
-                // the cursor will go to the last (or first, if is_multiline) inserted character.
-                editor.change_selections(Default::default(), window, cx, |s| {
-                    s.replace_cursors_with(|map| {
-                        let mut cursors = Vec::new();
-                        for (anchor, line_mode, is_multiline) in &new_selections {
-                            let mut cursor = anchor.to_display_point(map);
-                            if *line_mode {
-                                if !before {
-                                    cursor = movement::down(
-                                        map,
-                                        cursor,
-                                        SelectionGoal::None,
-                                        false,
-                                        &text_layout_details,
-                                    )
-                                    .0;
-                                }
-                                cursor = movement::indented_line_beginning(map, cursor, true, true);
-                            } else if !is_multiline && !vim.temp_mode {
-                                cursor = movement::saturating_left(map, cursor)
-                            }
-                            cursors.push(cursor);
-                            if vim.mode == Mode::VisualBlock {
-                                break;
-                            }
-                        }
-
-                        cursors
-                    });
-                })
-            });
-        });
-
-        if HelixModeSetting::get_global(cx).0 {
-            self.switch_mode(Mode::HelixNormal, true, window, cx);
-        } else {
-            self.switch_mode(Mode::Normal, true, window, cx);
-        }
-    }
-
-    pub fn replace_with_register_object(
-        &mut self,
-        object: Object,
-        around: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.stop_recording(cx);
-        let selected_register = self.selected_register.take();
-        self.update_editor(cx, |_, editor, cx| {
-            editor.transact(window, cx, |editor, window, cx| {
-                editor.set_clip_at_line_ends(false, cx);
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.move_with(|map, selection| {
-                        object.expand_selection(map, selection, around, None);
-                    });
-                });
-
-                let Some(Register { text, .. }) = Vim::update_globals(cx, |globals, cx| {
-                    globals.read_register(selected_register, Some(editor), cx)
-                })
-                .filter(|reg| !reg.text.is_empty()) else {
-                    return;
-                };
-                editor.insert(&text, window, cx);
-                editor.set_clip_at_line_ends(true, cx);
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.move_with(|map, selection| {
-                        selection.start = map.clip_point(selection.start, Bias::Left);
-                        selection.end = selection.start
-                    })
-                })
-            });
-        });
-    }
-
-    pub fn replace_with_register_motion(
-        &mut self,
-        motion: Motion,
-        times: Option<usize>,
-        forced_motion: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.stop_recording(cx);
-        let selected_register = self.selected_register.take();
-        self.update_editor(cx, |_, editor, cx| {
-            let text_layout_details = editor.text_layout_details(window);
-            editor.transact(window, cx, |editor, window, cx| {
-                editor.set_clip_at_line_ends(false, cx);
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.move_with(|map, selection| {
-                        motion.expand_selection(
-                            map,
-                            selection,
-                            times,
-                            &text_layout_details,
-                            forced_motion,
-                        );
-                    });
-                });
-
-                let Some(Register { text, .. }) = Vim::update_globals(cx, |globals, cx| {
-                    globals.read_register(selected_register, Some(editor), cx)
-                })
-                .filter(|reg| !reg.text.is_empty()) else {
-                    return;
-                };
-                editor.insert(&text, window, cx);
-                editor.set_clip_at_line_ends(true, cx);
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.move_with(|map, selection| {
-                        selection.start = map.clip_point(selection.start, Bias::Left);
-                        selection.end = selection.start
-                    })
-                })
-            });
-        });
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use crate::{
-        state::{Mode, Register},
-        test::{NeovimBackedTestContext, VimTestContext},
-    };
-    use gpui::ClipboardItem;
-    use indoc::indoc;
-    use language::{LanguageName, language_settings::LanguageSettingsContent};
-    use settings::{SettingsStore, UseSystemClipboard};
-
-    #[gpui::test]
-    async fn test_paste(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        // single line
-        cx.set_shared_state(indoc! {"
-            The quick brown
-            fox ˇjumps over
-            the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("v w y").await;
-        cx.shared_clipboard().await.assert_eq("jumps o");
-        cx.set_shared_state(indoc! {"
-            The quick brown
-            fox jumps oveˇr
-            the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("p").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            The quick brown
-            fox jumps overjumps ˇo
-            the lazy dog"});
-
-        cx.set_shared_state(indoc! {"
-            The quick brown
-            fox jumps oveˇr
-            the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("shift-p").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            The quick brown
-            fox jumps ovejumps ˇor
-            the lazy dog"});
-
-        // line mode
-        cx.set_shared_state(indoc! {"
-            The quick brown
-            fox juˇmps over
-            the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("d d").await;
-        cx.shared_clipboard().await.assert_eq("fox jumps over\n");
-        cx.shared_state().await.assert_eq(indoc! {"
-            The quick brown
-            the laˇzy dog"});
-        cx.simulate_shared_keystrokes("p").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            The quick brown
-            the lazy dog
-            ˇfox jumps over"});
-        cx.simulate_shared_keystrokes("k shift-p").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            The quick brown
-            ˇfox jumps over
-            the lazy dog
-            fox jumps over"});
-
-        // multiline, cursor to first character of pasted text.
-        cx.set_shared_state(indoc! {"
-            The quick brown
-            fox jumps ˇover
-            the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("v j y").await;
-        cx.shared_clipboard().await.assert_eq("over\nthe lazy do");
-
-        cx.simulate_shared_keystrokes("p").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            The quick brown
-            fox jumps oˇover
-            the lazy dover
-            the lazy dog"});
-        cx.simulate_shared_keystrokes("u shift-p").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            The quick brown
-            fox jumps ˇover
-            the lazy doover
-            the lazy dog"});
-    }
-
-    #[gpui::test]
-    async fn test_yank_system_clipboard_never(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        cx.update_global(|store: &mut SettingsStore, cx| {
-            store.update_user_settings(cx, |s| {
-                s.vim.get_or_insert_default().use_system_clipboard = Some(UseSystemClipboard::Never)
-            });
-        });
-
-        cx.set_state(
-            indoc! {"
-                The quick brown
-                fox jˇumps over
-                the lazy dog"},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("v i w y");
-        cx.assert_state(
-            indoc! {"
-                The quick brown
-                fox ˇjumps over
-                the lazy dog"},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("p");
-        cx.assert_state(
-            indoc! {"
-                The quick brown
-                fox jjumpˇsumps over
-                the lazy dog"},
-            Mode::Normal,
-        );
-        assert_eq!(cx.read_from_clipboard(), None);
-    }
-
-    #[gpui::test]
-    async fn test_yank_system_clipboard_on_yank(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        cx.update_global(|store: &mut SettingsStore, cx| {
-            store.update_user_settings(cx, |s| {
-                s.vim.get_or_insert_default().use_system_clipboard =
-                    Some(UseSystemClipboard::OnYank)
-            });
-        });
-
-        // copy in visual mode
-        cx.set_state(
-            indoc! {"
-                The quick brown
-                fox jˇumps over
-                the lazy dog"},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("v i w y");
-        cx.assert_state(
-            indoc! {"
-                The quick brown
-                fox ˇjumps over
-                the lazy dog"},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("p");
-        cx.assert_state(
-            indoc! {"
-                The quick brown
-                fox jjumpˇsumps over
-                the lazy dog"},
-            Mode::Normal,
-        );
-        assert_eq!(
-            cx.read_from_clipboard().map(|item| item.text().unwrap()),
-            Some("jumps".into())
-        );
-        cx.simulate_keystrokes("d d p");
-        cx.assert_state(
-            indoc! {"
-                The quick brown
-                the lazy dog
-                ˇfox jjumpsumps over"},
-            Mode::Normal,
-        );
-        assert_eq!(
-            cx.read_from_clipboard().map(|item| item.text().unwrap()),
-            Some("jumps".into())
-        );
-        cx.write_to_clipboard(ClipboardItem::new_string("test-copy".to_string()));
-        cx.simulate_keystrokes("shift-p");
-        cx.assert_state(
-            indoc! {"
-                The quick brown
-                the lazy dog
-                test-copˇyfox jjumpsumps over"},
-            Mode::Normal,
-        );
-    }
-
-    #[gpui::test]
-    async fn test_paste_visual(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        // copy in visual mode
-        cx.set_shared_state(indoc! {"
-                The quick brown
-                fox jˇumps over
-                the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("v i w y").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-                The quick brown
-                fox ˇjumps over
-                the lazy dog"});
-        // paste in visual mode
-        cx.simulate_shared_keystrokes("w v i w p").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-                The quick brown
-                fox jumps jumpˇs
-                the lazy dog"});
-        cx.shared_clipboard().await.assert_eq("over");
-        // paste in visual line mode
-        cx.simulate_shared_keystrokes("up shift-v shift-p").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            ˇover
-            fox jumps jumps
-            the lazy dog"});
-        cx.shared_clipboard().await.assert_eq("over");
-        // paste in visual block mode
-        cx.simulate_shared_keystrokes("ctrl-v down down p").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            oveˇrver
-            overox jumps jumps
-            overhe lazy dog"});
-
-        // copy in visual line mode
-        cx.set_shared_state(indoc! {"
-                The quick brown
-                fox juˇmps over
-                the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("shift-v d").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-                The quick brown
-                the laˇzy dog"});
-        // paste in visual mode
-        cx.simulate_shared_keystrokes("v i w p").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-                The quick brown
-                the•
-                ˇfox jumps over
-                 dog"});
-        cx.shared_clipboard().await.assert_eq("lazy");
-        cx.set_shared_state(indoc! {"
-            The quick brown
-            fox juˇmps over
-            the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("shift-v d").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            The quick brown
-            the laˇzy dog"});
-        cx.shared_clipboard().await.assert_eq("fox jumps over\n");
-        // paste in visual line mode
-        cx.simulate_shared_keystrokes("k shift-v p").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            ˇfox jumps over
-            the lazy dog"});
-        cx.shared_clipboard().await.assert_eq("The quick brown\n");
-
-        // Copy line and paste in visual mode, with cursor on newline character.
-        cx.set_shared_state(indoc! {"
-            ˇThe quick brown
-            fox jumps over
-            the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("y y shift-v j $ p").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            ˇThe quick brown
-            the lazy dog"});
-    }
-
-    #[gpui::test]
-    async fn test_paste_visual_block(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        // copy in visual block mode
-        cx.set_shared_state(indoc! {"
-            The ˇquick brown
-            fox jumps over
-            the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("ctrl-v 2 j y").await;
-        cx.shared_clipboard().await.assert_eq("q\nj\nl");
-        cx.simulate_shared_keystrokes("p").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            The qˇquick brown
-            fox jjumps over
-            the llazy dog"});
-        cx.simulate_shared_keystrokes("v i w shift-p").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            The ˇq brown
-            fox jjjumps over
-            the lllazy dog"});
-        cx.simulate_shared_keystrokes("v i w shift-p").await;
-
-        cx.set_shared_state(indoc! {"
-            The ˇquick brown
-            fox jumps over
-            the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("ctrl-v j y").await;
-        cx.shared_clipboard().await.assert_eq("q\nj");
-        cx.simulate_shared_keystrokes("l ctrl-v 2 j shift-p").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            The qˇqick brown
-            fox jjmps over
-            the lzy dog"});
-
-        cx.simulate_shared_keystrokes("shift-v p").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            ˇq
-            j
-            fox jjmps over
-            the lzy dog"});
-    }
-
-    #[gpui::test]
-    async fn test_paste_indent(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new_typescript(cx).await;
-
-        cx.set_state(
-            indoc! {"
-            class A {ˇ
-            }
-        "},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("o a ( ) { escape");
-        cx.assert_state(
-            indoc! {"
-            class A {
-                a()ˇ{}
-            }
-            "},
-            Mode::Normal,
-        );
-        // cursor goes to the first non-blank character in the line;
-        cx.simulate_keystrokes("y y p");
-        cx.assert_state(
-            indoc! {"
-            class A {
-                a(){}
-                ˇa(){}
-            }
-            "},
-            Mode::Normal,
-        );
-        // indentation is preserved when pasting
-        cx.simulate_keystrokes("u shift-v up y shift-p");
-        cx.assert_state(
-            indoc! {"
-                ˇclass A {
-                    a(){}
-                class A {
-                    a(){}
-                }
-            "},
-            Mode::Normal,
-        );
-    }
-
-    #[gpui::test]
-    async fn test_paste_auto_indent(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        cx.set_state(
-            indoc! {"
-            mod some_module {
-                ˇfn main() {
-                }
-            }
-            "},
-            Mode::Normal,
-        );
-        // default auto indentation
-        cx.simulate_keystrokes("y y p");
-        cx.assert_state(
-            indoc! {"
-                mod some_module {
-                    fn main() {
-                        ˇfn main() {
-                    }
-                }
-                "},
-            Mode::Normal,
-        );
-        // back to previous state
-        cx.simulate_keystrokes("u u");
-        cx.assert_state(
-            indoc! {"
-                mod some_module {
-                    ˇfn main() {
-                    }
-                }
-                "},
-            Mode::Normal,
-        );
-        cx.update_global(|store: &mut SettingsStore, cx| {
-            store.update_user_settings(cx, |settings| {
-                settings.project.all_languages.languages.0.insert(
-                    LanguageName::new_static("Rust").0,
-                    LanguageSettingsContent {
-                        auto_indent_on_paste: Some(false),
-                        ..Default::default()
-                    },
-                );
-            });
-        });
-        // auto indentation turned off
-        cx.simulate_keystrokes("y y p");
-        cx.assert_state(
-            indoc! {"
-                mod some_module {
-                    fn main() {
-                    ˇfn main() {
-                    }
-                }
-                "},
-            Mode::Normal,
-        );
-    }
-
-    #[gpui::test]
-    async fn test_paste_count(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {"
-            onˇe
-            two
-            three
-        "})
-            .await;
-        cx.simulate_shared_keystrokes("y y 3 p").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            one
-            ˇone
-            one
-            one
-            two
-            three
-        "});
-
-        cx.set_shared_state(indoc! {"
-            one
-            ˇtwo
-            three
-        "})
-            .await;
-        cx.simulate_shared_keystrokes("y $ $ 3 p").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            one
-            twotwotwotwˇo
-            three
-        "});
-    }
-
-    #[gpui::test]
-    async fn test_paste_system_clipboard_never(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        cx.update_global(|store: &mut SettingsStore, cx| {
-            store.update_user_settings(cx, |s| {
-                s.vim.get_or_insert_default().use_system_clipboard = Some(UseSystemClipboard::Never)
-            });
-        });
-
-        cx.set_state(
-            indoc! {"
-                ˇThe quick brown
-                fox jumps over
-                the lazy dog"},
-            Mode::Normal,
-        );
-
-        cx.write_to_clipboard(ClipboardItem::new_string("something else".to_string()));
-
-        cx.simulate_keystrokes("d d");
-        cx.assert_state(
-            indoc! {"
-                ˇfox jumps over
-                the lazy dog"},
-            Mode::Normal,
-        );
-
-        cx.simulate_keystrokes("shift-v p");
-        cx.assert_state(
-            indoc! {"
-                ˇThe quick brown
-                the lazy dog"},
-            Mode::Normal,
-        );
-
-        cx.simulate_keystrokes("shift-v");
-        cx.dispatch_action(editor::actions::Paste);
-        cx.assert_state(
-            indoc! {"
-                ˇsomething else
-                the lazy dog"},
-            Mode::Normal,
-        );
-    }
-
-    #[gpui::test]
-    async fn test_numbered_registers(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.update_global(|store: &mut SettingsStore, cx| {
-            store.update_user_settings(cx, |s| {
-                s.vim.get_or_insert_default().use_system_clipboard = Some(UseSystemClipboard::Never)
-            });
-        });
-
-        cx.set_shared_state(indoc! {"
-                The quick brown
-                fox jˇumps over
-                the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("y y \" 0 p").await;
-        cx.shared_register('0').await.assert_eq("fox jumps over\n");
-        cx.shared_register('"').await.assert_eq("fox jumps over\n");
-
-        cx.shared_state().await.assert_eq(indoc! {"
-                The quick brown
-                fox jumps over
-                ˇfox jumps over
-                the lazy dog"});
-        cx.simulate_shared_keystrokes("k k d d").await;
-        cx.shared_register('0').await.assert_eq("fox jumps over\n");
-        cx.shared_register('1').await.assert_eq("The quick brown\n");
-        cx.shared_register('"').await.assert_eq("The quick brown\n");
-
-        cx.simulate_shared_keystrokes("d d shift-g d d").await;
-        cx.shared_register('0').await.assert_eq("fox jumps over\n");
-        cx.shared_register('3').await.assert_eq("The quick brown\n");
-        cx.shared_register('2').await.assert_eq("fox jumps over\n");
-        cx.shared_register('1').await.assert_eq("the lazy dog\n");
-
-        cx.shared_state().await.assert_eq(indoc! {"
-        ˇfox jumps over"});
-
-        cx.simulate_shared_keystrokes("d d \" 3 p p \" 1 p").await;
-        cx.set_shared_state(indoc! {"
-                The quick brown
-                fox jumps over
-                ˇthe lazy dog"})
-            .await;
-    }
-
-    #[gpui::test]
-    async fn test_named_registers(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.update_global(|store: &mut SettingsStore, cx| {
-            store.update_user_settings(cx, |s| {
-                s.vim.get_or_insert_default().use_system_clipboard = Some(UseSystemClipboard::Never)
-            });
-        });
-
-        cx.set_shared_state(indoc! {"
-                The quick brown
-                fox jˇumps over
-                the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("\" a d a w").await;
-        cx.shared_register('a').await.assert_eq("jumps ");
-        cx.simulate_shared_keystrokes("\" shift-a d i w").await;
-        cx.shared_register('a').await.assert_eq("jumps over");
-        cx.shared_register('"').await.assert_eq("jumps over");
-        cx.simulate_shared_keystrokes("\" a p").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-                The quick brown
-                fox jumps oveˇr
-                the lazy dog"});
-        cx.simulate_shared_keystrokes("\" a d a w").await;
-        cx.shared_register('a').await.assert_eq(" over");
-    }
-
-    #[gpui::test]
-    async fn test_special_registers(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.update_global(|store: &mut SettingsStore, cx| {
-            store.update_user_settings(cx, |s| {
-                s.vim.get_or_insert_default().use_system_clipboard = Some(UseSystemClipboard::Never)
-            });
-        });
-
-        cx.set_shared_state(indoc! {"
-                The quick brown
-                fox jˇumps over
-                the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("d i w").await;
-        cx.shared_register('-').await.assert_eq("jumps");
-        cx.simulate_shared_keystrokes("\" _ d d").await;
-        cx.shared_register('_').await.assert_eq("");
-
-        cx.simulate_shared_keystrokes("shift-v \" _ y w").await;
-        cx.shared_register('"').await.assert_eq("jumps");
-
-        cx.shared_state().await.assert_eq(indoc! {"
-                The quick brown
-                the ˇlazy dog"});
-        cx.simulate_shared_keystrokes("\" \" d ^").await;
-        cx.shared_register('0').await.assert_eq("the ");
-        cx.shared_register('"').await.assert_eq("the ");
-
-        cx.simulate_shared_keystrokes("^ \" + d $").await;
-        cx.shared_clipboard().await.assert_eq("lazy dog");
-        cx.shared_register('"').await.assert_eq("lazy dog");
-
-        cx.simulate_shared_keystrokes("/ d o g enter").await;
-        cx.shared_register('/').await.assert_eq("dog");
-        cx.simulate_shared_keystrokes("\" / shift-p").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-                The quick brown
-                doˇg"});
-
-        // not testing nvim as it doesn't have a filename
-        cx.simulate_keystrokes("\" % p");
-        #[cfg(not(target_os = "windows"))]
-        cx.assert_state(
-            indoc! {"
-                    The quick brown
-                    dogdir/file.rˇs"},
-            Mode::Normal,
-        );
-        #[cfg(target_os = "windows")]
-        cx.assert_state(
-            indoc! {"
-                    The quick brown
-                    dogdir\\file.rˇs"},
-            Mode::Normal,
-        );
-    }
-
-    #[gpui::test]
-    async fn test_multicursor_paste(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        cx.update_global(|store: &mut SettingsStore, cx| {
-            store.update_user_settings(cx, |s| {
-                s.vim.get_or_insert_default().use_system_clipboard = Some(UseSystemClipboard::Never)
-            });
-        });
-
-        cx.set_state(
-            indoc! {"
-               ˇfish one
-               fish two
-               fish red
-               fish blue
-                "},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("4 g l w escape d i w 0 shift-p");
-        cx.assert_state(
-            indoc! {"
-               onˇefish•
-               twˇofish•
-               reˇdfish•
-               bluˇefish•
-                "},
-            Mode::Normal,
-        );
-    }
-
-    #[gpui::test]
-    async fn test_replace_with_register(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        cx.set_state(
-            indoc! {"
-                   ˇfish one
-                   two three
-                   "},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("y i w");
-        cx.simulate_keystrokes("w");
-        cx.simulate_keystrokes("g shift-r i w");
-        cx.assert_state(
-            indoc! {"
-                fish fisˇh
-                two three
-                "},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("j b g shift-r e");
-        cx.assert_state(
-            indoc! {"
-            fish fish
-            two fisˇh
-            "},
-            Mode::Normal,
-        );
-        let clipboard: Register = cx.read_from_clipboard().unwrap().into();
-        assert_eq!(clipboard.text, "fish");
-
-        cx.set_state(
-            indoc! {"
-                   ˇfish one
-                   two three
-                   "},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("y i w");
-        cx.simulate_keystrokes("w");
-        cx.simulate_keystrokes("v i w g shift-r");
-        cx.assert_state(
-            indoc! {"
-                fish fisˇh
-                two three
-                "},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("g shift-r r");
-        cx.assert_state(
-            indoc! {"
-                fisˇh
-                two three
-                "},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("j w g shift-r $");
-        cx.assert_state(
-            indoc! {"
-                fish
-                two fisˇh
-            "},
-            Mode::Normal,
-        );
-        let clipboard: Register = cx.read_from_clipboard().unwrap().into();
-        assert_eq!(clipboard.text, "fish");
-    }
-
-    #[gpui::test]
-    async fn test_replace_with_register_dot_repeat(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        cx.set_state(
-            indoc! {"
-                   ˇfish one
-                   two three
-                   "},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("y i w");
-        cx.simulate_keystrokes("w");
-        cx.simulate_keystrokes("g shift-r i w");
-        cx.assert_state(
-            indoc! {"
-                fish fisˇh
-                two three
-                "},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("j .");
-        cx.assert_state(
-            indoc! {"
-                fish fish
-                two fisˇh
-                "},
-            Mode::Normal,
-        );
-    }
-}
diff --git a/crates/vim/src/normal/repeat.rs b/crates/vim/src/normal/repeat.rs
deleted file mode 100644
index e47b2b350f..0000000000
--- a/crates/vim/src/normal/repeat.rs
+++ /dev/null
@@ -1,911 +0,0 @@
-use std::{cell::RefCell, rc::Rc};
-
-use crate::{
-    Vim,
-    insert::NormalBefore,
-    motion::Motion,
-    normal::InsertBefore,
-    state::{Mode, Operator, RecordedSelection, ReplayableAction, VimGlobals},
-};
-use editor::Editor;
-use gpui::{Action, App, Context, Window, actions};
-use workspace::Workspace;
-
-actions!(
-    vim,
-    [
-        /// Repeats the last change.
-        Repeat,
-        /// Ends the repeat recording.
-        EndRepeat,
-        /// Toggles macro recording.
-        ToggleRecord,
-        /// Replays the last recorded macro.
-        ReplayLastRecording
-    ]
-);
-
-fn should_replay(action: &dyn Action) -> bool {
-    // skip so that we don't leave the character palette open
-    if editor::actions::ShowCharacterPalette.partial_eq(action) {
-        return false;
-    }
-    true
-}
-
-fn repeatable_insert(action: &ReplayableAction) -> Option<Box<dyn Action>> {
-    match action {
-        ReplayableAction::Action(action) => {
-            if super::InsertBefore.partial_eq(&**action)
-                || super::InsertAfter.partial_eq(&**action)
-                || super::InsertFirstNonWhitespace.partial_eq(&**action)
-                || super::InsertEndOfLine.partial_eq(&**action)
-            {
-                Some(super::InsertBefore.boxed_clone())
-            } else if super::InsertLineAbove.partial_eq(&**action)
-                || super::InsertLineBelow.partial_eq(&**action)
-            {
-                Some(super::InsertLineBelow.boxed_clone())
-            } else if crate::replace::ToggleReplace.partial_eq(&**action) {
-                Some(crate::replace::ToggleReplace.boxed_clone())
-            } else {
-                None
-            }
-        }
-        ReplayableAction::Insertion { .. } => None,
-    }
-}
-
-pub(crate) fn register(editor: &mut Editor, cx: &mut Context<Vim>) {
-    Vim::action(editor, cx, |vim, _: &EndRepeat, window, cx| {
-        Vim::globals(cx).dot_replaying = false;
-        vim.switch_mode(Mode::Normal, false, window, cx)
-    });
-
-    Vim::action(editor, cx, |vim, _: &Repeat, window, cx| {
-        vim.repeat(false, window, cx)
-    });
-
-    Vim::action(editor, cx, |vim, _: &ToggleRecord, window, cx| {
-        let globals = Vim::globals(cx);
-        if let Some(char) = globals.recording_register.take() {
-            globals.last_recorded_register = Some(char)
-        } else {
-            vim.push_operator(Operator::RecordRegister, window, cx);
-        }
-    });
-
-    Vim::action(editor, cx, |vim, _: &ReplayLastRecording, window, cx| {
-        let Some(register) = Vim::globals(cx).last_recorded_register else {
-            return;
-        };
-        vim.replay_register(register, window, cx)
-    });
-}
-
-pub struct ReplayerState {
-    actions: Vec<ReplayableAction>,
-    running: bool,
-    ix: usize,
-}
-
-#[derive(Clone)]
-pub struct Replayer(Rc<RefCell<ReplayerState>>);
-
-impl Replayer {
-    pub fn new() -> Self {
-        Self(Rc::new(RefCell::new(ReplayerState {
-            actions: vec![],
-            running: false,
-            ix: 0,
-        })))
-    }
-
-    pub fn replay(&mut self, actions: Vec<ReplayableAction>, window: &mut Window, cx: &mut App) {
-        let mut lock = self.0.borrow_mut();
-        let range = lock.ix..lock.ix;
-        lock.actions.splice(range, actions);
-        if lock.running {
-            return;
-        }
-        lock.running = true;
-        let this = self.clone();
-        window.defer(cx, move |window, cx| {
-            this.next(window, cx);
-            let Some(Some(workspace)) = window.root::<Workspace>() else {
-                return;
-            };
-            let Some(editor) = workspace
-                .read(cx)
-                .active_item(cx)
-                .and_then(|item| item.act_as::<Editor>(cx))
-            else {
-                return;
-            };
-            editor.update(cx, |editor, cx| {
-                editor
-                    .buffer()
-                    .update(cx, |multi, cx| multi.finalize_last_transaction(cx))
-            });
-        })
-    }
-
-    pub fn stop(self) {
-        self.0.borrow_mut().actions.clear()
-    }
-
-    pub fn next(self, window: &mut Window, cx: &mut App) {
-        let mut lock = self.0.borrow_mut();
-        let action = if lock.ix < 10000 {
-            lock.actions.get(lock.ix).cloned()
-        } else {
-            log::error!("Aborting replay after 10000 actions");
-            None
-        };
-        lock.ix += 1;
-        drop(lock);
-        let Some(action) = action else {
-            Vim::globals(cx).replayer.take();
-            return;
-        };
-        match action {
-            ReplayableAction::Action(action) => {
-                if should_replay(&*action) {
-                    window.dispatch_action(action.boxed_clone(), cx);
-                    cx.defer(move |cx| Vim::globals(cx).observe_action(action.boxed_clone()));
-                }
-            }
-            ReplayableAction::Insertion {
-                text,
-                utf16_range_to_replace,
-            } => {
-                let Some(Some(workspace)) = window.root::<Workspace>() else {
-                    return;
-                };
-                let Some(editor) = workspace
-                    .read(cx)
-                    .active_item(cx)
-                    .and_then(|item| item.act_as::<Editor>(cx))
-                else {
-                    return;
-                };
-                editor.update(cx, |editor, cx| {
-                    editor.replay_insert_event(&text, utf16_range_to_replace.clone(), window, cx)
-                })
-            }
-        }
-        window.defer(cx, move |window, cx| self.next(window, cx));
-    }
-}
-
-impl Vim {
-    pub(crate) fn record_register(
-        &mut self,
-        register: char,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let globals = Vim::globals(cx);
-        globals.recording_register = Some(register);
-        globals.recordings.remove(&register);
-        globals.ignore_current_insertion = true;
-        self.clear_operator(window, cx)
-    }
-
-    pub(crate) fn replay_register(
-        &mut self,
-        mut register: char,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let mut count = Vim::take_count(cx).unwrap_or(1);
-        Vim::take_forced_motion(cx);
-        self.clear_operator(window, cx);
-
-        let globals = Vim::globals(cx);
-        if register == '@' {
-            let Some(last) = globals.last_replayed_register else {
-                return;
-            };
-            register = last;
-        }
-        let Some(actions) = globals.recordings.get(&register) else {
-            return;
-        };
-
-        let mut repeated_actions = vec![];
-        while count > 0 {
-            repeated_actions.extend(actions.iter().cloned());
-            count -= 1
-        }
-
-        globals.last_replayed_register = Some(register);
-        let mut replayer = globals.replayer.get_or_insert_with(Replayer::new).clone();
-        replayer.replay(repeated_actions, window, cx);
-    }
-
-    pub(crate) fn repeat(
-        &mut self,
-        from_insert_mode: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.active_operator().is_some() {
-            Vim::update_globals(cx, |globals, _| {
-                globals.recording_actions.clear();
-                globals.recording_count = None;
-                globals.dot_recording = false;
-                globals.stop_recording_after_next_action = false;
-            });
-            self.clear_operator(window, cx);
-            return;
-        }
-
-        Vim::take_forced_motion(cx);
-        let count = Vim::take_count(cx);
-
-        let Some((mut actions, selection, mode)) = Vim::update_globals(cx, |globals, _| {
-            let actions = globals.recorded_actions.clone();
-            if actions.is_empty() {
-                return None;
-            }
-            if globals.replayer.is_none()
-                && let Some(recording_register) = globals.recording_register
-            {
-                globals
-                    .recordings
-                    .entry(recording_register)
-                    .or_default()
-                    .push(ReplayableAction::Action(Repeat.boxed_clone()));
-            }
-
-            let mut mode = None;
-            let selection = globals.recorded_selection.clone();
-            match selection {
-                RecordedSelection::SingleLine { .. } | RecordedSelection::Visual { .. } => {
-                    globals.recorded_count = None;
-                    mode = Some(Mode::Visual);
-                }
-                RecordedSelection::VisualLine { .. } => {
-                    globals.recorded_count = None;
-                    mode = Some(Mode::VisualLine)
-                }
-                RecordedSelection::VisualBlock { .. } => {
-                    globals.recorded_count = None;
-                    mode = Some(Mode::VisualBlock)
-                }
-                RecordedSelection::None => {
-                    if let Some(count) = count {
-                        globals.recorded_count = Some(count);
-                    }
-                }
-            }
-
-            Some((actions, selection, mode))
-        }) else {
-            return;
-        };
-        if mode != Some(self.mode) {
-            if let Some(mode) = mode {
-                self.switch_mode(mode, false, window, cx)
-            }
-
-            match selection {
-                RecordedSelection::SingleLine { cols } => {
-                    if cols > 1 {
-                        self.visual_motion(Motion::Right, Some(cols as usize - 1), window, cx)
-                    }
-                }
-                RecordedSelection::Visual { rows, cols } => {
-                    self.visual_motion(
-                        Motion::Down {
-                            display_lines: false,
-                        },
-                        Some(rows as usize),
-                        window,
-                        cx,
-                    );
-                    self.visual_motion(
-                        Motion::StartOfLine {
-                            display_lines: false,
-                        },
-                        None,
-                        window,
-                        cx,
-                    );
-                    if cols > 1 {
-                        self.visual_motion(Motion::Right, Some(cols as usize - 1), window, cx)
-                    }
-                }
-                RecordedSelection::VisualBlock { rows, cols } => {
-                    self.visual_motion(
-                        Motion::Down {
-                            display_lines: false,
-                        },
-                        Some(rows as usize),
-                        window,
-                        cx,
-                    );
-                    if cols > 1 {
-                        self.visual_motion(Motion::Right, Some(cols as usize - 1), window, cx);
-                    }
-                }
-                RecordedSelection::VisualLine { rows } => {
-                    self.visual_motion(
-                        Motion::Down {
-                            display_lines: false,
-                        },
-                        Some(rows as usize),
-                        window,
-                        cx,
-                    );
-                }
-                RecordedSelection::None => {}
-            }
-        }
-
-        // insert internally uses repeat to handle counts
-        // vim doesn't treat 3a1 as though you literally repeated a1
-        // 3 times, instead it inserts the content thrice at the insert position.
-        if let Some(to_repeat) = repeatable_insert(&actions[0]) {
-            if let Some(ReplayableAction::Action(action)) = actions.last()
-                && NormalBefore.partial_eq(&**action)
-            {
-                actions.pop();
-            }
-
-            let mut new_actions = actions.clone();
-            actions[0] = ReplayableAction::Action(to_repeat.boxed_clone());
-
-            let mut count = cx.global::<VimGlobals>().recorded_count.unwrap_or(1);
-
-            // if we came from insert mode we're just doing repetitions 2 onwards.
-            if from_insert_mode {
-                count -= 1;
-                new_actions[0] = actions[0].clone();
-            }
-
-            for _ in 1..count {
-                new_actions.append(actions.clone().as_mut());
-            }
-            new_actions.push(ReplayableAction::Action(NormalBefore.boxed_clone()));
-            actions = new_actions;
-        }
-
-        actions.push(ReplayableAction::Action(EndRepeat.boxed_clone()));
-
-        if self.temp_mode {
-            self.temp_mode = false;
-            actions.push(ReplayableAction::Action(InsertBefore.boxed_clone()));
-        }
-
-        let globals = Vim::globals(cx);
-        globals.dot_replaying = true;
-        let mut replayer = globals.replayer.get_or_insert_with(Replayer::new).clone();
-
-        replayer.replay(actions, window, cx);
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use editor::test::editor_lsp_test_context::EditorLspTestContext;
-    use futures::StreamExt;
-    use indoc::indoc;
-
-    use gpui::EntityInputHandler;
-
-    use crate::{
-        state::Mode,
-        test::{NeovimBackedTestContext, VimTestContext},
-    };
-
-    #[gpui::test]
-    async fn test_dot_repeat(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        // "o"
-        cx.set_shared_state("ˇhello").await;
-        cx.simulate_shared_keystrokes("o w o r l d escape").await;
-        cx.shared_state().await.assert_eq("hello\nworlˇd");
-        cx.simulate_shared_keystrokes(".").await;
-        cx.shared_state().await.assert_eq("hello\nworld\nworlˇd");
-
-        // "d"
-        cx.simulate_shared_keystrokes("^ d f o").await;
-        cx.simulate_shared_keystrokes("g g .").await;
-        cx.shared_state().await.assert_eq("ˇ\nworld\nrld");
-
-        // "p" (note that it pastes the current clipboard)
-        cx.simulate_shared_keystrokes("j y y p").await;
-        cx.simulate_shared_keystrokes("shift-g y y .").await;
-        cx.shared_state()
-            .await
-            .assert_eq("\nworld\nworld\nrld\nˇrld");
-
-        // "~" (note that counts apply to the action taken, not . itself)
-        cx.set_shared_state("ˇthe quick brown fox").await;
-        cx.simulate_shared_keystrokes("2 ~ .").await;
-        cx.set_shared_state("THE ˇquick brown fox").await;
-        cx.simulate_shared_keystrokes("3 .").await;
-        cx.set_shared_state("THE QUIˇck brown fox").await;
-        cx.run_until_parked();
-        cx.simulate_shared_keystrokes(".").await;
-        cx.shared_state().await.assert_eq("THE QUICK ˇbrown fox");
-    }
-
-    #[gpui::test]
-    async fn test_repeat_ime(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        cx.set_state("hˇllo", Mode::Normal);
-        cx.simulate_keystrokes("i");
-
-        // simulate brazilian input for ä.
-        cx.update_editor(|editor, window, cx| {
-            editor.replace_and_mark_text_in_range(None, "\"", Some(1..1), window, cx);
-            editor.replace_text_in_range(None, "ä", window, cx);
-        });
-        cx.simulate_keystrokes("escape");
-        cx.assert_state("hˇällo", Mode::Normal);
-        cx.simulate_keystrokes(".");
-        cx.assert_state("hˇäällo", Mode::Normal);
-    }
-
-    #[gpui::test]
-    async fn test_repeat_completion(cx: &mut gpui::TestAppContext) {
-        VimTestContext::init(cx);
-        let cx = EditorLspTestContext::new_rust(
-            lsp::ServerCapabilities {
-                completion_provider: Some(lsp::CompletionOptions {
-                    trigger_characters: Some(vec![".".to_string(), ":".to_string()]),
-                    resolve_provider: Some(true),
-                    ..Default::default()
-                }),
-                ..Default::default()
-            },
-            cx,
-        )
-        .await;
-        let mut cx = VimTestContext::new_with_lsp(cx, true);
-
-        cx.set_state(
-            indoc! {"
-            onˇe
-            two
-            three
-        "},
-            Mode::Normal,
-        );
-
-        let mut request = cx.set_request_handler::<lsp::request::Completion, _, _>(
-            move |_, params, _| async move {
-                let position = params.text_document_position.position;
-                Ok(Some(lsp::CompletionResponse::Array(vec![
-                    lsp::CompletionItem {
-                        label: "first".to_string(),
-                        text_edit: Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
-                            range: lsp::Range::new(position, position),
-                            new_text: "first".to_string(),
-                        })),
-                        ..Default::default()
-                    },
-                    lsp::CompletionItem {
-                        label: "second".to_string(),
-                        text_edit: Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
-                            range: lsp::Range::new(position, position),
-                            new_text: "second".to_string(),
-                        })),
-                        ..Default::default()
-                    },
-                ])))
-            },
-        );
-        cx.simulate_keystrokes("a .");
-        request.next().await;
-        cx.condition(|editor, _| editor.context_menu_visible())
-            .await;
-        cx.simulate_keystrokes("down enter ! escape");
-
-        cx.assert_state(
-            indoc! {"
-                one.secondˇ!
-                two
-                three
-            "},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("j .");
-        cx.assert_state(
-            indoc! {"
-                one.second!
-                two.secondˇ!
-                three
-            "},
-            Mode::Normal,
-        );
-    }
-
-    #[gpui::test]
-    async fn test_repeat_completion_unicode_bug(cx: &mut gpui::TestAppContext) {
-        VimTestContext::init(cx);
-        let cx = EditorLspTestContext::new_rust(
-            lsp::ServerCapabilities {
-                completion_provider: Some(lsp::CompletionOptions {
-                    trigger_characters: Some(vec![".".to_string(), ":".to_string()]),
-                    resolve_provider: Some(true),
-                    ..Default::default()
-                }),
-                ..Default::default()
-            },
-            cx,
-        )
-        .await;
-        let mut cx = VimTestContext::new_with_lsp(cx, true);
-
-        cx.set_state(
-            indoc! {"
-                ĩлˇк
-                ĩлк
-            "},
-            Mode::Normal,
-        );
-
-        let mut request = cx.set_request_handler::<lsp::request::Completion, _, _>(
-            move |_, params, _| async move {
-                let position = params.text_document_position.position;
-                let mut to_the_left = position;
-                to_the_left.character -= 2;
-                Ok(Some(lsp::CompletionResponse::Array(vec![
-                    lsp::CompletionItem {
-                        label: "oops".to_string(),
-                        text_edit: Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
-                            range: lsp::Range::new(to_the_left, position),
-                            new_text: "к!".to_string(),
-                        })),
-                        ..Default::default()
-                    },
-                ])))
-            },
-        );
-        cx.simulate_keystrokes("i .");
-        request.next().await;
-        cx.condition(|editor, _| editor.context_menu_visible())
-            .await;
-        cx.simulate_keystrokes("enter escape");
-        cx.assert_state(
-            indoc! {"
-                ĩкˇ!к
-                ĩлк
-            "},
-            Mode::Normal,
-        );
-    }
-
-    #[gpui::test]
-    async fn test_repeat_visual(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        // single-line (3 columns)
-        cx.set_shared_state(indoc! {
-            "ˇthe quick brown
-            fox jumps over
-            the lazy dog"
-        })
-        .await;
-        cx.simulate_shared_keystrokes("v i w s o escape").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "ˇo quick brown
-            fox jumps over
-            the lazy dog"
-        });
-        cx.simulate_shared_keystrokes("j w .").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "o quick brown
-            fox ˇops over
-            the lazy dog"
-        });
-        cx.simulate_shared_keystrokes("f r .").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "o quick brown
-            fox ops oveˇothe lazy dog"
-        });
-
-        // visual
-        cx.set_shared_state(indoc! {
-            "the ˇquick brown
-            fox jumps over
-            fox jumps over
-            fox jumps over
-            the lazy dog"
-        })
-        .await;
-        cx.simulate_shared_keystrokes("v j x").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "the ˇumps over
-            fox jumps over
-            fox jumps over
-            the lazy dog"
-        });
-        cx.simulate_shared_keystrokes(".").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "the ˇumps over
-            fox jumps over
-            the lazy dog"
-        });
-        cx.simulate_shared_keystrokes("w .").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "the umps ˇumps over
-            the lazy dog"
-        });
-        cx.simulate_shared_keystrokes("j .").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "the umps umps over
-            the ˇog"
-        });
-
-        // block mode (3 rows)
-        cx.set_shared_state(indoc! {
-            "ˇthe quick brown
-            fox jumps over
-            the lazy dog"
-        })
-        .await;
-        cx.simulate_shared_keystrokes("ctrl-v j j shift-i o escape")
-            .await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "ˇothe quick brown
-            ofox jumps over
-            othe lazy dog"
-        });
-        cx.simulate_shared_keystrokes("j 4 l .").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "othe quick brown
-            ofoxˇo jumps over
-            otheo lazy dog"
-        });
-
-        // line mode
-        cx.set_shared_state(indoc! {
-            "ˇthe quick brown
-            fox jumps over
-            the lazy dog"
-        })
-        .await;
-        cx.simulate_shared_keystrokes("shift-v shift-r o escape")
-            .await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "ˇo
-            fox jumps over
-            the lazy dog"
-        });
-        cx.simulate_shared_keystrokes("j .").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "o
-            ˇo
-            the lazy dog"
-        });
-    }
-
-    #[gpui::test]
-    async fn test_repeat_motion_counts(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {
-            "ˇthe quick brown
-            fox jumps over
-            the lazy dog"
-        })
-        .await;
-        cx.simulate_shared_keystrokes("3 d 3 l").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "ˇ brown
-            fox jumps over
-            the lazy dog"
-        });
-        cx.simulate_shared_keystrokes("j .").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            " brown
-            ˇ over
-            the lazy dog"
-        });
-        cx.simulate_shared_keystrokes("j 2 .").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            " brown
-             over
-            ˇe lazy dog"
-        });
-    }
-
-    #[gpui::test]
-    async fn test_record_interrupted(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        cx.set_state("ˇhello\n", Mode::Normal);
-        cx.simulate_keystrokes("4 i j cmd-shift-p escape");
-        cx.simulate_keystrokes("escape");
-        cx.assert_state("ˇjhello\n", Mode::Normal);
-    }
-
-    #[gpui::test]
-    async fn test_repeat_over_blur(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state("ˇhello hello hello\n").await;
-        cx.simulate_shared_keystrokes("c f o x escape").await;
-        cx.shared_state().await.assert_eq("ˇx hello hello\n");
-        cx.simulate_shared_keystrokes(": escape").await;
-        cx.simulate_shared_keystrokes(".").await;
-        cx.shared_state().await.assert_eq("ˇx hello\n");
-    }
-
-    #[gpui::test]
-    async fn test_undo_repeated_insert(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state("hellˇo").await;
-        cx.simulate_shared_keystrokes("3 a . escape").await;
-        cx.shared_state().await.assert_eq("hello..ˇ.");
-        cx.simulate_shared_keystrokes("u").await;
-        cx.shared_state().await.assert_eq("hellˇo");
-    }
-
-    #[gpui::test]
-    async fn test_record_replay(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state("ˇhello world").await;
-        cx.simulate_shared_keystrokes("q w c w j escape q").await;
-        cx.shared_state().await.assert_eq("ˇj world");
-        cx.simulate_shared_keystrokes("2 l @ w").await;
-        cx.shared_state().await.assert_eq("j ˇj");
-    }
-
-    #[gpui::test]
-    async fn test_record_replay_count(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state("ˇhello world!!").await;
-        cx.simulate_shared_keystrokes("q a v 3 l s 0 escape l q")
-            .await;
-        cx.shared_state().await.assert_eq("0ˇo world!!");
-        cx.simulate_shared_keystrokes("2 @ a").await;
-        cx.shared_state().await.assert_eq("000ˇ!");
-    }
-
-    #[gpui::test]
-    async fn test_record_replay_dot(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state("ˇhello world").await;
-        cx.simulate_shared_keystrokes("q a r a l r b l q").await;
-        cx.shared_state().await.assert_eq("abˇllo world");
-        cx.simulate_shared_keystrokes(".").await;
-        cx.shared_state().await.assert_eq("abˇblo world");
-        cx.simulate_shared_keystrokes("shift-q").await;
-        cx.shared_state().await.assert_eq("ababˇo world");
-        cx.simulate_shared_keystrokes(".").await;
-        cx.shared_state().await.assert_eq("ababˇb world");
-    }
-
-    #[gpui::test]
-    async fn test_record_replay_of_dot(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state("ˇhello world").await;
-        cx.simulate_shared_keystrokes("r o q w . q").await;
-        cx.shared_state().await.assert_eq("ˇoello world");
-        cx.simulate_shared_keystrokes("d l").await;
-        cx.shared_state().await.assert_eq("ˇello world");
-        cx.simulate_shared_keystrokes("@ w").await;
-        cx.shared_state().await.assert_eq("ˇllo world");
-    }
-
-    #[gpui::test]
-    async fn test_record_replay_interleaved(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state("ˇhello world").await;
-        cx.simulate_shared_keystrokes("q z r a l q").await;
-        cx.shared_state().await.assert_eq("aˇello world");
-        cx.simulate_shared_keystrokes("q b @ z @ z q").await;
-        cx.shared_state().await.assert_eq("aaaˇlo world");
-        cx.simulate_shared_keystrokes("@ @").await;
-        cx.shared_state().await.assert_eq("aaaaˇo world");
-        cx.simulate_shared_keystrokes("@ b").await;
-        cx.shared_state().await.assert_eq("aaaaaaˇworld");
-        cx.simulate_shared_keystrokes("@ @").await;
-        cx.shared_state().await.assert_eq("aaaaaaaˇorld");
-        cx.simulate_shared_keystrokes("q z r b l q").await;
-        cx.shared_state().await.assert_eq("aaaaaaabˇrld");
-        cx.simulate_shared_keystrokes("@ b").await;
-        cx.shared_state().await.assert_eq("aaaaaaabbbˇd");
-    }
-
-    #[gpui::test]
-    async fn test_repeat_clear(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        // Check that, when repeat is preceded by something other than a number,
-        // the current operator is cleared, in order to prevent infinite loops.
-        cx.set_state("ˇhello world", Mode::Normal);
-        cx.simulate_keystrokes("d .");
-        assert_eq!(cx.active_operator(), None);
-    }
-
-    #[gpui::test]
-    async fn test_repeat_clear_repeat(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {
-            "ˇthe quick brown
-            fox jumps over
-            the lazy dog"
-        })
-        .await;
-        cx.simulate_shared_keystrokes("d d").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "ˇfox jumps over
-            the lazy dog"
-        });
-        cx.simulate_shared_keystrokes("d . .").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "ˇthe lazy dog"
-        });
-    }
-
-    #[gpui::test]
-    async fn test_repeat_clear_count(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {
-            "ˇthe quick brown
-            fox jumps over
-            the lazy dog"
-        })
-        .await;
-        cx.simulate_shared_keystrokes("d d").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "ˇfox jumps over
-            the lazy dog"
-        });
-        cx.simulate_shared_keystrokes("2 d .").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "ˇfox jumps over
-            the lazy dog"
-        });
-        cx.simulate_shared_keystrokes(".").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "ˇthe lazy dog"
-        });
-
-        cx.set_shared_state(indoc! {
-            "ˇthe quick brown
-            fox jumps over
-            the lazy dog
-            the quick brown
-            fox jumps over
-            the lazy dog"
-        })
-        .await;
-        cx.simulate_shared_keystrokes("2 d d").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "ˇthe lazy dog
-            the quick brown
-            fox jumps over
-            the lazy dog"
-        });
-        cx.simulate_shared_keystrokes("5 d .").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "ˇthe lazy dog
-            the quick brown
-            fox jumps over
-            the lazy dog"
-        });
-        cx.simulate_shared_keystrokes(".").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "ˇfox jumps over
-            the lazy dog"
-        });
-    }
-}
diff --git a/crates/vim/src/normal/scroll.rs b/crates/vim/src/normal/scroll.rs
deleted file mode 100644
index 73209c8873..0000000000
--- a/crates/vim/src/normal/scroll.rs
+++ /dev/null
@@ -1,568 +0,0 @@
-use crate::Vim;
-use editor::{
-    DisplayPoint, Editor, EditorSettings, SelectionEffects,
-    display_map::{DisplayRow, ToDisplayPoint},
-    scroll::ScrollAmount,
-};
-use gpui::{Context, Window, actions};
-use language::Bias;
-use settings::Settings;
-use text::SelectionGoal;
-
-actions!(
-    vim,
-    [
-        /// Scrolls up by one line.
-        LineUp,
-        /// Scrolls down by one line.
-        LineDown,
-        /// Scrolls right by one column.
-        ColumnRight,
-        /// Scrolls left by one column.
-        ColumnLeft,
-        /// Scrolls up by half a page.
-        ScrollUp,
-        /// Scrolls down by half a page.
-        ScrollDown,
-        /// Scrolls up by one page.
-        PageUp,
-        /// Scrolls down by one page.
-        PageDown,
-        /// Scrolls right by half a page's width.
-        HalfPageRight,
-        /// Scrolls left by half a page's width.
-        HalfPageLeft,
-    ]
-);
-
-pub fn register(editor: &mut Editor, cx: &mut Context<Vim>) {
-    Vim::action(editor, cx, |vim, _: &LineDown, window, cx| {
-        vim.scroll(false, window, cx, |c| ScrollAmount::Line(c.unwrap_or(1.)))
-    });
-    Vim::action(editor, cx, |vim, _: &LineUp, window, cx| {
-        vim.scroll(false, window, cx, |c| ScrollAmount::Line(-c.unwrap_or(1.)))
-    });
-    Vim::action(editor, cx, |vim, _: &ColumnRight, window, cx| {
-        vim.scroll(false, window, cx, |c| ScrollAmount::Column(c.unwrap_or(1.)))
-    });
-    Vim::action(editor, cx, |vim, _: &ColumnLeft, window, cx| {
-        vim.scroll(false, window, cx, |c| {
-            ScrollAmount::Column(-c.unwrap_or(1.))
-        })
-    });
-    Vim::action(editor, cx, |vim, _: &PageDown, window, cx| {
-        vim.scroll(false, window, cx, |c| ScrollAmount::Page(c.unwrap_or(1.)))
-    });
-    Vim::action(editor, cx, |vim, _: &PageUp, window, cx| {
-        vim.scroll(false, window, cx, |c| ScrollAmount::Page(-c.unwrap_or(1.)))
-    });
-    Vim::action(editor, cx, |vim, _: &HalfPageRight, window, cx| {
-        vim.scroll(false, window, cx, |c| {
-            ScrollAmount::PageWidth(c.unwrap_or(0.5))
-        })
-    });
-    Vim::action(editor, cx, |vim, _: &HalfPageLeft, window, cx| {
-        vim.scroll(false, window, cx, |c| {
-            ScrollAmount::PageWidth(-c.unwrap_or(0.5))
-        })
-    });
-    Vim::action(editor, cx, |vim, _: &ScrollDown, window, cx| {
-        vim.scroll(true, window, cx, |c| {
-            if let Some(c) = c {
-                ScrollAmount::Line(c)
-            } else {
-                ScrollAmount::Page(0.5)
-            }
-        })
-    });
-    Vim::action(editor, cx, |vim, _: &ScrollUp, window, cx| {
-        vim.scroll(true, window, cx, |c| {
-            if let Some(c) = c {
-                ScrollAmount::Line(-c)
-            } else {
-                ScrollAmount::Page(-0.5)
-            }
-        })
-    });
-}
-
-impl Vim {
-    fn scroll(
-        &mut self,
-        move_cursor: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-        by: fn(c: Option<f32>) -> ScrollAmount,
-    ) {
-        let amount = by(Vim::take_count(cx).map(|c| c as f32));
-        Vim::take_forced_motion(cx);
-        self.exit_temporary_normal(window, cx);
-        self.update_editor(cx, |_, editor, cx| {
-            scroll_editor(editor, move_cursor, amount, window, cx)
-        });
-    }
-}
-
-fn scroll_editor(
-    editor: &mut Editor,
-    preserve_cursor_position: bool,
-    amount: ScrollAmount,
-    window: &mut Window,
-    cx: &mut Context<Editor>,
-) {
-    let should_move_cursor = editor.newest_selection_on_screen(cx).is_eq();
-    let old_top_anchor = editor.scroll_manager.anchor().anchor;
-
-    if editor.scroll_hover(amount, window, cx) {
-        return;
-    }
-
-    let full_page_up = amount.is_full_page() && amount.direction().is_upwards();
-    let amount = match (amount.is_full_page(), editor.visible_line_count()) {
-        (true, Some(visible_line_count)) => {
-            if amount.direction().is_upwards() {
-                ScrollAmount::Line((amount.lines(visible_line_count) + 1.0) as f32)
-            } else {
-                ScrollAmount::Line((amount.lines(visible_line_count) - 1.0) as f32)
-            }
-        }
-        _ => amount,
-    };
-
-    editor.scroll_screen(&amount, window, cx);
-    if !should_move_cursor {
-        return;
-    }
-
-    let Some(visible_line_count) = editor.visible_line_count() else {
-        return;
-    };
-
-    let Some(visible_column_count) = editor.visible_column_count() else {
-        return;
-    };
-
-    let top_anchor = editor.scroll_manager.anchor().anchor;
-    let vertical_scroll_margin = EditorSettings::get_global(cx).vertical_scroll_margin;
-
-    editor.change_selections(
-        SelectionEffects::no_scroll().nav_history(false),
-        window,
-        cx,
-        |s| {
-            s.move_with(|map, selection| {
-                // TODO: Improve the logic and function calls below to be dependent on
-                // the `amount`. If the amount is vertical, we don't care about
-                // columns, while if it's horizontal, we don't care about rows,
-                // so we don't need to calculate both and deal with logic for
-                // both.
-                let mut head = selection.head();
-                let top = top_anchor.to_display_point(map);
-                let max_point = map.max_point();
-                let starting_column = head.column();
-
-                let vertical_scroll_margin =
-                    (vertical_scroll_margin as u32).min(visible_line_count as u32 / 2);
-
-                if preserve_cursor_position {
-                    let old_top = old_top_anchor.to_display_point(map);
-                    let new_row = if old_top.row() == top.row() {
-                        DisplayRow(
-                            head.row()
-                                .0
-                                .saturating_add_signed(amount.lines(visible_line_count) as i32),
-                        )
-                    } else {
-                        DisplayRow(top.row().0 + selection.head().row().0 - old_top.row().0)
-                    };
-                    head = map.clip_point(DisplayPoint::new(new_row, head.column()), Bias::Left)
-                }
-
-                let min_row = if top.row().0 == 0 {
-                    DisplayRow(0)
-                } else {
-                    DisplayRow(top.row().0 + vertical_scroll_margin)
-                };
-
-                let max_visible_row = top.row().0.saturating_add(
-                    (visible_line_count as u32).saturating_sub(1 + vertical_scroll_margin),
-                );
-                // scroll off the end.
-                let max_row = if top.row().0 + visible_line_count as u32 >= max_point.row().0 {
-                    max_point.row()
-                } else {
-                    DisplayRow(
-                        (top.row().0 + visible_line_count as u32)
-                            .saturating_sub(1 + vertical_scroll_margin),
-                    )
-                };
-
-                let new_row = if full_page_up {
-                    // Special-casing ctrl-b/page-up, which is special-cased by Vim, it seems
-                    // to always put the cursor on the last line of the page, even if the cursor
-                    // was before that.
-                    DisplayRow(max_visible_row)
-                } else if head.row() < min_row {
-                    min_row
-                } else if head.row() > max_row {
-                    max_row
-                } else {
-                    head.row()
-                };
-
-                // The minimum column position that the cursor position can be
-                // at is either the scroll manager's anchor column, which is the
-                // left-most column in the visible area, or the scroll manager's
-                // old anchor column, in case the cursor position is being
-                // preserved. This is necessary for motions like `ctrl-d` in
-                // case there's not enough content to scroll half page down, in
-                // which case the scroll manager's anchor column will be the
-                // maximum column for the current line, so the minimum column
-                // would end up being the same as the maximum column.
-                let min_column = match preserve_cursor_position {
-                    true => old_top_anchor.to_display_point(map).column(),
-                    false => top.column(),
-                };
-
-                // As for the maximum column position, that should be either the
-                // right-most column in the visible area, which we can easily
-                // calculate by adding the visible column count to the minimum
-                // column position, or the right-most column in the current
-                // line, seeing as the cursor might be in a short line, in which
-                // case we don't want to go past its last column.
-                let max_row_column = if new_row <= map.max_point().row() {
-                    map.line_len(new_row)
-                } else {
-                    0
-                };
-                let max_column = match min_column + visible_column_count as u32 {
-                    max_column if max_column >= max_row_column => max_row_column,
-                    max_column => max_column,
-                };
-
-                // Ensure that the cursor's column stays within the visible
-                // area, otherwise clip it at either the left or right edge of
-                // the visible area.
-                let new_column = match (min_column, max_column) {
-                    (min_column, _) if starting_column < min_column => min_column,
-                    (_, max_column) if starting_column > max_column => max_column,
-                    _ => starting_column,
-                };
-
-                let new_head = map.clip_point(DisplayPoint::new(new_row, new_column), Bias::Left);
-                let goal = match amount {
-                    ScrollAmount::Column(_) | ScrollAmount::PageWidth(_) => SelectionGoal::None,
-                    _ => selection.goal,
-                };
-
-                if selection.is_empty() {
-                    selection.collapse_to(new_head, goal)
-                } else {
-                    selection.set_head(new_head, goal)
-                };
-            })
-        },
-    );
-}
-
-#[cfg(test)]
-mod test {
-    use crate::{
-        state::Mode,
-        test::{NeovimBackedTestContext, VimTestContext},
-    };
-    use editor::ScrollBeyondLastLine;
-    use gpui::{AppContext as _, point, px, size};
-    use indoc::indoc;
-    use language::Point;
-    use settings::SettingsStore;
-
-    pub fn sample_text(rows: usize, cols: usize, start_char: char) -> String {
-        let mut text = String::new();
-        for row in 0..rows {
-            let c: char = (start_char as u32 + row as u32) as u8 as char;
-            let mut line = c.to_string().repeat(cols);
-            if row < rows - 1 {
-                line.push('\n');
-            }
-            text += &line;
-        }
-        text
-    }
-
-    #[gpui::test]
-    async fn test_scroll(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        let (line_height, visible_line_count) = cx.update_editor(|editor, window, cx| {
-            (
-                editor
-                    .style(cx)
-                    .text
-                    .line_height_in_pixels(window.rem_size()),
-                editor.visible_line_count().unwrap(),
-            )
-        });
-
-        let window = cx.window;
-        let margin = cx
-            .update_window(window, |_, window, _cx| {
-                window.viewport_size().height - line_height * visible_line_count as f32
-            })
-            .unwrap();
-        cx.simulate_window_resize(
-            cx.window,
-            size(px(1000.), margin + 8. * line_height - px(1.0)),
-        );
-
-        cx.set_state(
-            indoc!(
-                "ˇone
-                two
-                three
-                four
-                five
-                six
-                seven
-                eight
-                nine
-                ten
-                eleven
-                twelve
-            "
-            ),
-            Mode::Normal,
-        );
-
-        cx.update_editor(|editor, window, cx| {
-            assert_eq!(editor.snapshot(window, cx).scroll_position(), point(0., 0.))
-        });
-        cx.simulate_keystrokes("ctrl-e");
-        cx.update_editor(|editor, window, cx| {
-            assert_eq!(editor.snapshot(window, cx).scroll_position(), point(0., 1.))
-        });
-        cx.simulate_keystrokes("2 ctrl-e");
-        cx.update_editor(|editor, window, cx| {
-            assert_eq!(editor.snapshot(window, cx).scroll_position(), point(0., 3.))
-        });
-        cx.simulate_keystrokes("ctrl-y");
-        cx.update_editor(|editor, window, cx| {
-            assert_eq!(editor.snapshot(window, cx).scroll_position(), point(0., 2.))
-        });
-
-        // does not select in normal mode
-        cx.simulate_keystrokes("g g");
-        cx.update_editor(|editor, window, cx| {
-            assert_eq!(editor.snapshot(window, cx).scroll_position(), point(0., 0.))
-        });
-        cx.simulate_keystrokes("ctrl-d");
-        cx.update_editor(|editor, window, cx| {
-            assert_eq!(
-                editor.snapshot(window, cx).scroll_position(),
-                point(0., 3.0)
-            );
-            assert_eq!(
-                editor
-                    .selections
-                    .newest(&editor.display_snapshot(cx))
-                    .range(),
-                Point::new(6, 0)..Point::new(6, 0)
-            )
-        });
-
-        // does select in visual mode
-        cx.simulate_keystrokes("g g");
-        cx.update_editor(|editor, window, cx| {
-            assert_eq!(editor.snapshot(window, cx).scroll_position(), point(0., 0.))
-        });
-        cx.simulate_keystrokes("v ctrl-d");
-        cx.update_editor(|editor, window, cx| {
-            assert_eq!(
-                editor.snapshot(window, cx).scroll_position(),
-                point(0., 3.0)
-            );
-            assert_eq!(
-                editor
-                    .selections
-                    .newest(&editor.display_snapshot(cx))
-                    .range(),
-                Point::new(0, 0)..Point::new(6, 1)
-            )
-        });
-    }
-
-    #[gpui::test]
-    async fn test_ctrl_d_u(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_scroll_height(10).await;
-
-        let content = "ˇ".to_owned() + &sample_text(26, 2, 'a');
-        cx.set_shared_state(&content).await;
-
-        // skip over the scrolloff at the top
-        // test ctrl-d
-        cx.simulate_shared_keystrokes("4 j ctrl-d").await;
-        cx.shared_state().await.assert_matches();
-        cx.simulate_shared_keystrokes("ctrl-d").await;
-        cx.shared_state().await.assert_matches();
-        cx.simulate_shared_keystrokes("g g ctrl-d").await;
-        cx.shared_state().await.assert_matches();
-
-        // test ctrl-u
-        cx.simulate_shared_keystrokes("ctrl-u").await;
-        cx.shared_state().await.assert_matches();
-        cx.simulate_shared_keystrokes("ctrl-d ctrl-d 4 j ctrl-u ctrl-u")
-            .await;
-        cx.shared_state().await.assert_matches();
-
-        // test returning to top
-        cx.simulate_shared_keystrokes("g g ctrl-d ctrl-u ctrl-u")
-            .await;
-        cx.shared_state().await.assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_ctrl_f_b(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        let visible_lines = 10;
-        cx.set_scroll_height(visible_lines).await;
-
-        // First test without vertical scroll margin
-        cx.neovim.set_option(&format!("scrolloff={}", 0)).await;
-        cx.update_global(|store: &mut SettingsStore, cx| {
-            store.update_user_settings(cx, |s| s.editor.vertical_scroll_margin = Some(0.0));
-        });
-
-        let content = "ˇ".to_owned() + &sample_text(26, 2, 'a');
-        cx.set_shared_state(&content).await;
-
-        // scroll down: ctrl-f
-        cx.simulate_shared_keystrokes("ctrl-f").await;
-        cx.shared_state().await.assert_matches();
-
-        cx.simulate_shared_keystrokes("ctrl-f").await;
-        cx.shared_state().await.assert_matches();
-
-        // scroll up: ctrl-b
-        cx.simulate_shared_keystrokes("ctrl-b").await;
-        cx.shared_state().await.assert_matches();
-
-        cx.simulate_shared_keystrokes("ctrl-b").await;
-        cx.shared_state().await.assert_matches();
-
-        // Now go back to start of file, and test with vertical scroll margin
-        cx.simulate_shared_keystrokes("g g").await;
-        cx.shared_state().await.assert_matches();
-
-        cx.neovim.set_option(&format!("scrolloff={}", 3)).await;
-        cx.update_global(|store: &mut SettingsStore, cx| {
-            store.update_user_settings(cx, |s| s.editor.vertical_scroll_margin = Some(3.0));
-        });
-
-        // scroll down: ctrl-f
-        cx.simulate_shared_keystrokes("ctrl-f").await;
-        cx.shared_state().await.assert_matches();
-
-        cx.simulate_shared_keystrokes("ctrl-f").await;
-        cx.shared_state().await.assert_matches();
-
-        // scroll up: ctrl-b
-        cx.simulate_shared_keystrokes("ctrl-b").await;
-        cx.shared_state().await.assert_matches();
-
-        cx.simulate_shared_keystrokes("ctrl-b").await;
-        cx.shared_state().await.assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_scroll_beyond_last_line(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_scroll_height(10).await;
-
-        let content = "ˇ".to_owned() + &sample_text(26, 2, 'a');
-        cx.set_shared_state(&content).await;
-
-        cx.update_global(|store: &mut SettingsStore, cx| {
-            store.update_user_settings(cx, |s| {
-                s.editor.scroll_beyond_last_line = Some(ScrollBeyondLastLine::Off);
-            });
-        });
-
-        // ctrl-d can reach the end and the cursor stays in the first column
-        cx.simulate_shared_keystrokes("shift-g k").await;
-        cx.shared_state().await.assert_matches();
-        cx.simulate_shared_keystrokes("ctrl-d").await;
-        cx.shared_state().await.assert_matches();
-
-        // ctrl-u from the last line
-        cx.simulate_shared_keystrokes("shift-g").await;
-        cx.shared_state().await.assert_matches();
-        cx.simulate_shared_keystrokes("ctrl-u").await;
-        cx.shared_state().await.assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_ctrl_y_e(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_scroll_height(10).await;
-
-        let content = "ˇ".to_owned() + &sample_text(26, 2, 'a');
-        cx.set_shared_state(&content).await;
-
-        for _ in 0..8 {
-            cx.simulate_shared_keystrokes("ctrl-e").await;
-            cx.shared_state().await.assert_matches();
-        }
-
-        for _ in 0..8 {
-            cx.simulate_shared_keystrokes("ctrl-y").await;
-            cx.shared_state().await.assert_matches();
-        }
-    }
-
-    #[gpui::test]
-    async fn test_scroll_jumps(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_scroll_height(20).await;
-
-        let content = "ˇ".to_owned() + &sample_text(52, 2, 'a');
-        cx.set_shared_state(&content).await;
-
-        cx.simulate_shared_keystrokes("shift-g g g").await;
-        cx.simulate_shared_keystrokes("ctrl-d ctrl-d ctrl-o").await;
-        cx.shared_state().await.assert_matches();
-        cx.simulate_shared_keystrokes("ctrl-o").await;
-        cx.shared_state().await.assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_horizontal_scroll(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_scroll_height(20).await;
-        cx.set_shared_wrap(12).await;
-        cx.set_neovim_option("nowrap").await;
-
-        let content = "ˇ01234567890123456789";
-        cx.set_shared_state(content).await;
-
-        cx.simulate_shared_keystrokes("z shift-l").await;
-        cx.shared_state().await.assert_eq("012345ˇ67890123456789");
-
-        // At this point, `z h` should not move the cursor as it should still be
-        // visible within the 12 column width.
-        cx.simulate_shared_keystrokes("z h").await;
-        cx.shared_state().await.assert_eq("012345ˇ67890123456789");
-
-        let content = "ˇ01234567890123456789";
-        cx.set_shared_state(content).await;
-
-        cx.simulate_shared_keystrokes("z l").await;
-        cx.shared_state().await.assert_eq("0ˇ1234567890123456789");
-    }
-}
diff --git a/crates/vim/src/normal/search.rs b/crates/vim/src/normal/search.rs
deleted file mode 100644
index 36a529da5d..0000000000
--- a/crates/vim/src/normal/search.rs
+++ /dev/null
@@ -1,1176 +0,0 @@
-use editor::{Editor, EditorSettings};
-use gpui::{Action, Context, Window, actions};
-use language::Point;
-use schemars::JsonSchema;
-use search::{BufferSearchBar, SearchOptions, buffer_search};
-use serde::Deserialize;
-use settings::Settings;
-use std::{iter::Peekable, str::Chars};
-use util::serde::default_true;
-use workspace::{notifications::NotifyResultExt, searchable::Direction};
-
-use crate::{
-    Vim,
-    command::CommandRange,
-    motion::Motion,
-    state::{Mode, SearchState},
-};
-
-/// Moves to the next search match.
-#[derive(Clone, Debug, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = vim)]
-#[serde(deny_unknown_fields)]
-pub(crate) struct MoveToNext {
-    #[serde(default = "default_true")]
-    case_sensitive: bool,
-    #[serde(default)]
-    partial_word: bool,
-    #[serde(default = "default_true")]
-    regex: bool,
-}
-
-/// Moves to the previous search match.
-#[derive(Clone, Debug, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = vim)]
-#[serde(deny_unknown_fields)]
-pub(crate) struct MoveToPrevious {
-    #[serde(default = "default_true")]
-    case_sensitive: bool,
-    #[serde(default)]
-    partial_word: bool,
-    #[serde(default = "default_true")]
-    regex: bool,
-}
-
-/// Initiates a search operation with the specified parameters.
-#[derive(Clone, Debug, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = vim)]
-#[serde(deny_unknown_fields)]
-pub(crate) struct Search {
-    #[serde(default)]
-    backwards: bool,
-    #[serde(default = "default_true")]
-    regex: bool,
-}
-
-/// Executes a find command to search for patterns in the buffer.
-#[derive(Clone, Debug, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = vim)]
-#[serde(deny_unknown_fields)]
-pub struct FindCommand {
-    pub query: String,
-    pub backwards: bool,
-}
-
-/// Executes a search and replace command within the specified range.
-#[derive(Clone, Debug, PartialEq, Action)]
-#[action(namespace = vim, no_json, no_register)]
-pub struct ReplaceCommand {
-    pub(crate) range: CommandRange,
-    pub(crate) replacement: Replacement,
-}
-
-#[derive(Clone, Debug, PartialEq)]
-pub struct Replacement {
-    search: String,
-    replacement: String,
-    case_sensitive: Option<bool>,
-    flag_n: bool,
-    flag_g: bool,
-    flag_c: bool,
-}
-
-actions!(
-    vim,
-    [
-        /// Submits the current search query.
-        SearchSubmit,
-        /// Moves to the next search match.
-        MoveToNextMatch,
-        /// Moves to the previous search match.
-        MoveToPreviousMatch
-    ]
-);
-
-pub(crate) fn register(editor: &mut Editor, cx: &mut Context<Vim>) {
-    Vim::action(editor, cx, Vim::move_to_next);
-    Vim::action(editor, cx, Vim::move_to_previous);
-    Vim::action(editor, cx, Vim::move_to_next_match);
-    Vim::action(editor, cx, Vim::move_to_previous_match);
-    Vim::action(editor, cx, Vim::search);
-    Vim::action(editor, cx, Vim::search_deploy);
-    Vim::action(editor, cx, Vim::find_command);
-    Vim::action(editor, cx, Vim::replace_command);
-}
-
-impl Vim {
-    fn move_to_next(&mut self, action: &MoveToNext, window: &mut Window, cx: &mut Context<Self>) {
-        self.move_to_internal(
-            Direction::Next,
-            action.case_sensitive,
-            !action.partial_word,
-            action.regex,
-            window,
-            cx,
-        )
-    }
-
-    fn move_to_previous(
-        &mut self,
-        action: &MoveToPrevious,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.move_to_internal(
-            Direction::Prev,
-            action.case_sensitive,
-            !action.partial_word,
-            action.regex,
-            window,
-            cx,
-        )
-    }
-
-    fn move_to_next_match(
-        &mut self,
-        _: &MoveToNextMatch,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.move_to_match_internal(self.search.direction, window, cx)
-    }
-
-    fn move_to_previous_match(
-        &mut self,
-        _: &MoveToPreviousMatch,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.move_to_match_internal(self.search.direction.opposite(), window, cx)
-    }
-
-    fn search(&mut self, action: &Search, window: &mut Window, cx: &mut Context<Self>) {
-        let Some(pane) = self.pane(window, cx) else {
-            return;
-        };
-        let direction = if action.backwards {
-            Direction::Prev
-        } else {
-            Direction::Next
-        };
-        let count = Vim::take_count(cx).unwrap_or(1);
-        Vim::take_forced_motion(cx);
-        let prior_selections = self.editor_selections(window, cx);
-        pane.update(cx, |pane, cx| {
-            if let Some(search_bar) = pane.toolbar().read(cx).item_of_type::<BufferSearchBar>() {
-                search_bar.update(cx, |search_bar, cx| {
-                    if !search_bar.show(window, cx) {
-                        return;
-                    }
-
-                    search_bar.select_query(window, cx);
-                    cx.focus_self(window);
-
-                    search_bar.set_replacement(None, cx);
-                    let mut options = SearchOptions::NONE;
-                    if action.regex {
-                        options |= SearchOptions::REGEX;
-                    }
-                    if action.backwards {
-                        options |= SearchOptions::BACKWARDS;
-                    }
-                    if EditorSettings::get_global(cx).search.case_sensitive {
-                        options |= SearchOptions::CASE_SENSITIVE;
-                    }
-                    search_bar.set_search_options(options, cx);
-                    let prior_mode = if self.temp_mode {
-                        Mode::Insert
-                    } else {
-                        self.mode
-                    };
-
-                    self.search = SearchState {
-                        direction,
-                        count,
-                        prior_selections,
-                        prior_operator: self.operator_stack.last().cloned(),
-                        prior_mode,
-                        helix_select: false,
-                    }
-                });
-            }
-        })
-    }
-
-    // hook into the existing to clear out any vim search state on cmd+f or edit -> find.
-    fn search_deploy(&mut self, _: &buffer_search::Deploy, _: &mut Window, cx: &mut Context<Self>) {
-        // Preserve the current mode when resetting search state
-        let current_mode = self.mode;
-        self.search = Default::default();
-        self.search.prior_mode = current_mode;
-        cx.propagate();
-    }
-
-    pub fn search_submit(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.store_visual_marks(window, cx);
-        let Some(pane) = self.pane(window, cx) else {
-            return;
-        };
-        let new_selections = self.editor_selections(window, cx);
-        let result = pane.update(cx, |pane, cx| {
-            let search_bar = pane.toolbar().read(cx).item_of_type::<BufferSearchBar>()?;
-            if self.search.helix_select {
-                search_bar.update(cx, |search_bar, cx| {
-                    search_bar.select_all_matches(&Default::default(), window, cx)
-                });
-                return None;
-            }
-            search_bar.update(cx, |search_bar, cx| {
-                let mut count = self.search.count;
-                let direction = self.search.direction;
-                search_bar.has_active_match();
-                let new_head = new_selections.last()?.start;
-                let is_different_head = self
-                    .search
-                    .prior_selections
-                    .last()
-                    .is_none_or(|range| range.start != new_head);
-
-                if is_different_head {
-                    count = count.saturating_sub(1)
-                }
-                self.search.count = 1;
-                search_bar.select_match(direction, count, window, cx);
-                search_bar.focus_editor(&Default::default(), window, cx);
-
-                let prior_selections: Vec<_> = self.search.prior_selections.drain(..).collect();
-                let prior_mode = self.search.prior_mode;
-                let prior_operator = self.search.prior_operator.take();
-
-                let query = search_bar.query(cx).into();
-                Vim::globals(cx).registers.insert('/', query);
-                Some((prior_selections, prior_mode, prior_operator))
-            })
-        });
-
-        let Some((mut prior_selections, prior_mode, prior_operator)) = result else {
-            return;
-        };
-
-        let new_selections = self.editor_selections(window, cx);
-
-        // If the active editor has changed during a search, don't panic.
-        if prior_selections.iter().any(|s| {
-            self.update_editor(cx, |_, editor, cx| {
-                !s.start
-                    .is_valid(&editor.snapshot(window, cx).buffer_snapshot())
-            })
-            .unwrap_or(true)
-        }) {
-            prior_selections.clear();
-        }
-
-        if prior_mode != self.mode {
-            self.switch_mode(prior_mode, true, window, cx);
-        }
-        if let Some(operator) = prior_operator {
-            self.push_operator(operator, window, cx);
-        };
-        self.search_motion(
-            Motion::ZedSearchResult {
-                prior_selections,
-                new_selections,
-            },
-            window,
-            cx,
-        );
-    }
-
-    pub fn move_to_match_internal(
-        &mut self,
-        direction: Direction,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(pane) = self.pane(window, cx) else {
-            return;
-        };
-        let count = Vim::take_count(cx).unwrap_or(1);
-        Vim::take_forced_motion(cx);
-        let prior_selections = self.editor_selections(window, cx);
-
-        let success = pane.update(cx, |pane, cx| {
-            let Some(search_bar) = pane.toolbar().read(cx).item_of_type::<BufferSearchBar>() else {
-                return false;
-            };
-            search_bar.update(cx, |search_bar, cx| {
-                if !search_bar.has_active_match() || !search_bar.show(window, cx) {
-                    return false;
-                }
-                search_bar.select_match(direction, count, window, cx);
-                true
-            })
-        });
-        if !success {
-            return;
-        }
-
-        let new_selections = self.editor_selections(window, cx);
-        self.search_motion(
-            Motion::ZedSearchResult {
-                prior_selections,
-                new_selections,
-            },
-            window,
-            cx,
-        );
-    }
-
-    pub fn move_to_internal(
-        &mut self,
-        direction: Direction,
-        case_sensitive: bool,
-        whole_word: bool,
-        regex: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(pane) = self.pane(window, cx) else {
-            return;
-        };
-        let count = Vim::take_count(cx).unwrap_or(1);
-        Vim::take_forced_motion(cx);
-        let prior_selections = self.editor_selections(window, cx);
-        let cursor_word = self.editor_cursor_word(window, cx);
-        let vim = cx.entity();
-
-        let searched = pane.update(cx, |pane, cx| {
-            self.search.direction = direction;
-            let Some(search_bar) = pane.toolbar().read(cx).item_of_type::<BufferSearchBar>() else {
-                return false;
-            };
-            let search = search_bar.update(cx, |search_bar, cx| {
-                let mut options = SearchOptions::NONE;
-                if case_sensitive {
-                    options |= SearchOptions::CASE_SENSITIVE;
-                }
-                if regex {
-                    options |= SearchOptions::REGEX;
-                }
-                if whole_word {
-                    options |= SearchOptions::WHOLE_WORD;
-                }
-                if !search_bar.show(window, cx) {
-                    return None;
-                }
-                let Some(query) = search_bar
-                    .query_suggestion(window, cx)
-                    .or_else(|| cursor_word)
-                else {
-                    drop(search_bar.search("", None, false, window, cx));
-                    return None;
-                };
-
-                let query = regex::escape(&query);
-                Some(search_bar.search(&query, Some(options), true, window, cx))
-            });
-
-            let Some(search) = search else { return false };
-
-            let search_bar = search_bar.downgrade();
-            cx.spawn_in(window, async move |_, cx| {
-                search.await?;
-                search_bar.update_in(cx, |search_bar, window, cx| {
-                    search_bar.select_match(direction, count, window, cx);
-
-                    vim.update(cx, |vim, cx| {
-                        let new_selections = vim.editor_selections(window, cx);
-                        vim.search_motion(
-                            Motion::ZedSearchResult {
-                                prior_selections,
-                                new_selections,
-                            },
-                            window,
-                            cx,
-                        )
-                    });
-                })?;
-                anyhow::Ok(())
-            })
-            .detach_and_log_err(cx);
-            true
-        });
-        if !searched {
-            self.clear_operator(window, cx)
-        }
-
-        if self.mode.is_visual() {
-            self.switch_mode(Mode::Normal, false, window, cx)
-        }
-    }
-
-    fn find_command(&mut self, action: &FindCommand, window: &mut Window, cx: &mut Context<Self>) {
-        let Some(pane) = self.pane(window, cx) else {
-            return;
-        };
-        pane.update(cx, |pane, cx| {
-            if let Some(search_bar) = pane.toolbar().read(cx).item_of_type::<BufferSearchBar>() {
-                let search = search_bar.update(cx, |search_bar, cx| {
-                    if !search_bar.show(window, cx) {
-                        return None;
-                    }
-                    let mut query = action.query.clone();
-                    if query.is_empty() {
-                        query = search_bar.query(cx);
-                    };
-
-                    let mut options = SearchOptions::REGEX | SearchOptions::CASE_SENSITIVE;
-                    if search_bar.should_use_smartcase_search(cx) {
-                        options.set(
-                            SearchOptions::CASE_SENSITIVE,
-                            search_bar.is_contains_uppercase(&query),
-                        );
-                    }
-
-                    Some(search_bar.search(&query, Some(options), true, window, cx))
-                });
-                let Some(search) = search else { return };
-                let search_bar = search_bar.downgrade();
-                let direction = if action.backwards {
-                    Direction::Prev
-                } else {
-                    Direction::Next
-                };
-                cx.spawn_in(window, async move |_, cx| {
-                    search.await?;
-                    search_bar.update_in(cx, |search_bar, window, cx| {
-                        search_bar.select_match(direction, 1, window, cx)
-                    })?;
-                    anyhow::Ok(())
-                })
-                .detach_and_log_err(cx);
-            }
-        })
-    }
-
-    fn replace_command(
-        &mut self,
-        action: &ReplaceCommand,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let replacement = action.replacement.clone();
-        let Some(((pane, workspace), editor)) = self
-            .pane(window, cx)
-            .zip(self.workspace(window))
-            .zip(self.editor())
-        else {
-            return;
-        };
-        if let Some(result) = self.update_editor(cx, |vim, editor, cx| {
-            let range = action.range.buffer_range(vim, editor, window, cx)?;
-            let snapshot = editor.snapshot(window, cx);
-            let snapshot = snapshot.buffer_snapshot();
-            let end_point = Point::new(range.end.0, snapshot.line_len(range.end));
-            let range = snapshot.anchor_before(Point::new(range.start.0, 0))
-                ..snapshot.anchor_after(end_point);
-            editor.set_search_within_ranges(&[range], cx);
-            anyhow::Ok(())
-        }) {
-            workspace.update(cx, |workspace, cx| {
-                result.notify_err(workspace, cx);
-            })
-        }
-        let Some(search_bar) = pane.update(cx, |pane, cx| {
-            pane.toolbar().read(cx).item_of_type::<BufferSearchBar>()
-        }) else {
-            return;
-        };
-        let mut options = SearchOptions::REGEX;
-        let search = search_bar.update(cx, |search_bar, cx| {
-            if !search_bar.show(window, cx) {
-                return None;
-            }
-
-            let search = if replacement.search.is_empty() {
-                search_bar.query(cx)
-            } else {
-                replacement.search
-            };
-
-            if let Some(case) = replacement.case_sensitive {
-                options.set(SearchOptions::CASE_SENSITIVE, case)
-            } else if search_bar.should_use_smartcase_search(cx) {
-                options.set(
-                    SearchOptions::CASE_SENSITIVE,
-                    search_bar.is_contains_uppercase(&search),
-                );
-            } else {
-                // Fallback: no explicit i/I flags and smartcase disabled;
-                // use global editor.search.case_sensitive.
-                options.set(
-                    SearchOptions::CASE_SENSITIVE,
-                    EditorSettings::get_global(cx).search.case_sensitive,
-                )
-            }
-
-            if !replacement.flag_g {
-                options.set(SearchOptions::ONE_MATCH_PER_LINE, true);
-            }
-
-            search_bar.set_replacement(Some(&replacement.replacement), cx);
-            if replacement.flag_c {
-                search_bar.focus_replace(window, cx);
-            }
-            Some(search_bar.search(&search, Some(options), true, window, cx))
-        });
-        if replacement.flag_n {
-            self.move_cursor(
-                Motion::StartOfLine {
-                    display_lines: false,
-                },
-                None,
-                window,
-                cx,
-            );
-            return;
-        }
-        let Some(search) = search else { return };
-        let search_bar = search_bar.downgrade();
-        cx.spawn_in(window, async move |vim, cx| {
-            search.await?;
-            search_bar.update_in(cx, |search_bar, window, cx| {
-                if replacement.flag_c {
-                    search_bar.select_first_match(window, cx);
-                    return;
-                }
-                search_bar.select_last_match(window, cx);
-                search_bar.replace_all(&Default::default(), window, cx);
-                editor.update(cx, |editor, cx| editor.clear_search_within_ranges(cx));
-                let _ = search_bar.search(&search_bar.query(cx), None, false, window, cx);
-                vim.update(cx, |vim, cx| {
-                    vim.move_cursor(
-                        Motion::StartOfLine {
-                            display_lines: false,
-                        },
-                        None,
-                        window,
-                        cx,
-                    )
-                })
-                .ok();
-
-                // Disable the `ONE_MATCH_PER_LINE` search option when finished, as
-                // this is not properly supported outside of vim mode, and
-                // not disabling it makes the "Replace All Matches" button
-                // actually replace only the first match on each line.
-                options.set(SearchOptions::ONE_MATCH_PER_LINE, false);
-                search_bar.set_search_options(options, cx);
-            })
-        })
-        .detach_and_log_err(cx);
-    }
-}
-
-impl Replacement {
-    // convert a vim query into something more usable by zed.
-    // we don't attempt to fully convert between the two regex syntaxes,
-    // but we do flip \( and \) to ( and ) (and vice-versa) in the pattern,
-    // and convert \0..\9 to $0..$9 in the replacement so that common idioms work.
-    pub(crate) fn parse(mut chars: Peekable<Chars>) -> Option<Replacement> {
-        let delimiter = chars
-            .next()
-            .filter(|c| !c.is_alphanumeric() && *c != '"' && *c != '|' && *c != '\'')?;
-
-        let mut search = String::new();
-        let mut replacement = String::new();
-        let mut flags = String::new();
-
-        let mut buffer = &mut search;
-
-        let mut escaped = false;
-        // 0 - parsing search
-        // 1 - parsing replacement
-        // 2 - parsing flags
-        let mut phase = 0;
-
-        for c in chars {
-            if escaped {
-                escaped = false;
-                if phase == 1 && c.is_ascii_digit() {
-                    buffer.push('$')
-                // unescape escaped parens
-                } else if phase == 0 && (c == '(' || c == ')') {
-                } else if c != delimiter {
-                    buffer.push('\\')
-                }
-                buffer.push(c)
-            } else if c == '\\' {
-                escaped = true;
-            } else if c == delimiter {
-                if phase == 0 {
-                    buffer = &mut replacement;
-                    phase = 1;
-                } else if phase == 1 {
-                    buffer = &mut flags;
-                    phase = 2;
-                } else {
-                    break;
-                }
-            } else {
-                // escape unescaped parens
-                if phase == 0 && (c == '(' || c == ')') {
-                    buffer.push('\\')
-                }
-                buffer.push(c)
-            }
-        }
-
-        let mut replacement = Replacement {
-            search,
-            replacement,
-            case_sensitive: None,
-            flag_g: false,
-            flag_n: false,
-            flag_c: false,
-        };
-
-        for c in flags.chars() {
-            match c {
-                'g' => replacement.flag_g = true,
-                'n' => replacement.flag_n = true,
-                'c' => replacement.flag_c = true,
-                'i' => replacement.case_sensitive = Some(false),
-                'I' => replacement.case_sensitive = Some(true),
-                _ => {}
-            }
-        }
-
-        Some(replacement)
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use std::time::Duration;
-
-    use crate::{
-        state::Mode,
-        test::{NeovimBackedTestContext, VimTestContext},
-    };
-    use editor::{DisplayPoint, display_map::DisplayRow};
-
-    use indoc::indoc;
-    use search::BufferSearchBar;
-    use settings::SettingsStore;
-
-    #[gpui::test]
-    async fn test_move_to_next(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-        cx.set_state("ˇhi\nhigh\nhi\n", Mode::Normal);
-
-        cx.simulate_keystrokes("*");
-        cx.run_until_parked();
-        cx.assert_state("hi\nhigh\nˇhi\n", Mode::Normal);
-
-        cx.simulate_keystrokes("*");
-        cx.run_until_parked();
-        cx.assert_state("ˇhi\nhigh\nhi\n", Mode::Normal);
-
-        cx.simulate_keystrokes("#");
-        cx.run_until_parked();
-        cx.assert_state("hi\nhigh\nˇhi\n", Mode::Normal);
-
-        cx.simulate_keystrokes("#");
-        cx.run_until_parked();
-        cx.assert_state("ˇhi\nhigh\nhi\n", Mode::Normal);
-
-        cx.simulate_keystrokes("2 *");
-        cx.run_until_parked();
-        cx.assert_state("ˇhi\nhigh\nhi\n", Mode::Normal);
-
-        cx.simulate_keystrokes("g *");
-        cx.run_until_parked();
-        cx.assert_state("hi\nˇhigh\nhi\n", Mode::Normal);
-
-        cx.simulate_keystrokes("n");
-        cx.assert_state("hi\nhigh\nˇhi\n", Mode::Normal);
-
-        cx.simulate_keystrokes("g #");
-        cx.run_until_parked();
-        cx.assert_state("hi\nˇhigh\nhi\n", Mode::Normal);
-    }
-
-    #[gpui::test]
-    async fn test_move_to_next_with_no_search_wrap(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        cx.update_global(|store: &mut SettingsStore, cx| {
-            store.update_user_settings(cx, |s| s.editor.search_wrap = Some(false));
-        });
-
-        cx.set_state("ˇhi\nhigh\nhi\n", Mode::Normal);
-
-        cx.simulate_keystrokes("*");
-        cx.run_until_parked();
-        cx.assert_state("hi\nhigh\nˇhi\n", Mode::Normal);
-
-        cx.simulate_keystrokes("*");
-        cx.run_until_parked();
-        cx.assert_state("hi\nhigh\nˇhi\n", Mode::Normal);
-
-        cx.simulate_keystrokes("#");
-        cx.run_until_parked();
-        cx.assert_state("ˇhi\nhigh\nhi\n", Mode::Normal);
-
-        cx.simulate_keystrokes("3 *");
-        cx.run_until_parked();
-        cx.assert_state("ˇhi\nhigh\nhi\n", Mode::Normal);
-
-        cx.simulate_keystrokes("g *");
-        cx.run_until_parked();
-        cx.assert_state("hi\nˇhigh\nhi\n", Mode::Normal);
-
-        cx.simulate_keystrokes("n");
-        cx.assert_state("hi\nhigh\nˇhi\n", Mode::Normal);
-
-        cx.simulate_keystrokes("g #");
-        cx.run_until_parked();
-        cx.assert_state("hi\nˇhigh\nhi\n", Mode::Normal);
-    }
-
-    #[gpui::test]
-    async fn test_search(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        cx.set_state("aa\nbˇb\ncc\ncc\ncc\n", Mode::Normal);
-        cx.simulate_keystrokes("/ c c");
-
-        let search_bar = cx.workspace(|workspace, _, cx| {
-            workspace
-                .active_pane()
-                .read(cx)
-                .toolbar()
-                .read(cx)
-                .item_of_type::<BufferSearchBar>()
-                .expect("Buffer search bar should be deployed")
-        });
-
-        cx.update_entity(search_bar, |bar, _window, cx| {
-            assert_eq!(bar.query(cx), "cc");
-        });
-
-        cx.run_until_parked();
-
-        cx.update_editor(|editor, window, cx| {
-            let highlights = editor.all_text_background_highlights(window, cx);
-            assert_eq!(3, highlights.len());
-            assert_eq!(
-                DisplayPoint::new(DisplayRow(2), 0)..DisplayPoint::new(DisplayRow(2), 2),
-                highlights[0].0
-            )
-        });
-
-        cx.simulate_keystrokes("enter");
-        cx.assert_state("aa\nbb\nˇcc\ncc\ncc\n", Mode::Normal);
-
-        // n to go to next/N to go to previous
-        cx.simulate_keystrokes("n");
-        cx.assert_state("aa\nbb\ncc\nˇcc\ncc\n", Mode::Normal);
-        cx.simulate_keystrokes("shift-n");
-        cx.assert_state("aa\nbb\nˇcc\ncc\ncc\n", Mode::Normal);
-
-        // ?<enter> to go to previous
-        cx.simulate_keystrokes("? enter");
-        cx.assert_state("aa\nbb\ncc\ncc\nˇcc\n", Mode::Normal);
-        cx.simulate_keystrokes("? enter");
-        cx.assert_state("aa\nbb\ncc\nˇcc\ncc\n", Mode::Normal);
-
-        // /<enter> to go to next
-        cx.simulate_keystrokes("/ enter");
-        cx.assert_state("aa\nbb\ncc\ncc\nˇcc\n", Mode::Normal);
-
-        // ?{search}<enter> to search backwards
-        cx.simulate_keystrokes("? b enter");
-        cx.assert_state("aa\nbˇb\ncc\ncc\ncc\n", Mode::Normal);
-
-        // works with counts
-        cx.simulate_keystrokes("4 / c");
-        cx.simulate_keystrokes("enter");
-        cx.assert_state("aa\nbb\ncc\ncˇc\ncc\n", Mode::Normal);
-
-        // check that searching resumes from cursor, not previous match
-        cx.set_state("ˇaa\nbb\ndd\ncc\nbb\n", Mode::Normal);
-        cx.simulate_keystrokes("/ d");
-        cx.simulate_keystrokes("enter");
-        cx.assert_state("aa\nbb\nˇdd\ncc\nbb\n", Mode::Normal);
-        cx.update_editor(|editor, window, cx| {
-            editor.move_to_beginning(&Default::default(), window, cx)
-        });
-        cx.assert_state("ˇaa\nbb\ndd\ncc\nbb\n", Mode::Normal);
-        cx.simulate_keystrokes("/ b");
-        cx.simulate_keystrokes("enter");
-        cx.assert_state("aa\nˇbb\ndd\ncc\nbb\n", Mode::Normal);
-
-        // check that searching switches to normal mode if in visual mode
-        cx.set_state("ˇone two one", Mode::Normal);
-        cx.simulate_keystrokes("v l l");
-        cx.assert_editor_state("«oneˇ» two one");
-        cx.simulate_keystrokes("*");
-        cx.assert_state("one two ˇone", Mode::Normal);
-
-        // check that a backward search after last match works correctly
-        cx.set_state("aa\naa\nbbˇ", Mode::Normal);
-        cx.simulate_keystrokes("? a a");
-        cx.simulate_keystrokes("enter");
-        cx.assert_state("aa\nˇaa\nbb", Mode::Normal);
-
-        // check that searching with unable search wrap
-        cx.update_global(|store: &mut SettingsStore, cx| {
-            store.update_user_settings(cx, |s| s.editor.search_wrap = Some(false));
-        });
-        cx.set_state("aa\nbˇb\ncc\ncc\ncc\n", Mode::Normal);
-        cx.simulate_keystrokes("/ c c enter");
-
-        cx.assert_state("aa\nbb\nˇcc\ncc\ncc\n", Mode::Normal);
-
-        // n to go to next/N to go to previous
-        cx.simulate_keystrokes("n");
-        cx.assert_state("aa\nbb\ncc\nˇcc\ncc\n", Mode::Normal);
-        cx.simulate_keystrokes("shift-n");
-        cx.assert_state("aa\nbb\nˇcc\ncc\ncc\n", Mode::Normal);
-
-        // ?<enter> to go to previous
-        cx.simulate_keystrokes("? enter");
-        cx.assert_state("aa\nbb\nˇcc\ncc\ncc\n", Mode::Normal);
-        cx.simulate_keystrokes("? enter");
-        cx.assert_state("aa\nbb\nˇcc\ncc\ncc\n", Mode::Normal);
-    }
-
-    #[gpui::test]
-    async fn test_non_vim_search(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, false).await;
-        cx.cx.set_state("ˇone one one one");
-        cx.run_until_parked();
-        cx.simulate_keystrokes("cmd-f");
-        cx.run_until_parked();
-
-        cx.assert_editor_state("«oneˇ» one one one");
-        cx.simulate_keystrokes("enter");
-        cx.assert_editor_state("one «oneˇ» one one");
-        cx.simulate_keystrokes("shift-enter");
-        cx.assert_editor_state("«oneˇ» one one one");
-    }
-
-    #[gpui::test]
-    async fn test_visual_star_hash(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state("ˇa.c. abcd a.c. abcd").await;
-        cx.simulate_shared_keystrokes("v 3 l *").await;
-        cx.shared_state().await.assert_eq("a.c. abcd ˇa.c. abcd");
-    }
-
-    #[gpui::test]
-    async fn test_d_search(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state("ˇa.c. abcd a.c. abcd").await;
-        cx.simulate_shared_keystrokes("d / c d").await;
-        cx.simulate_shared_keystrokes("enter").await;
-        cx.shared_state().await.assert_eq("ˇcd a.c. abcd");
-    }
-
-    #[gpui::test]
-    async fn test_backwards_n(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state("ˇa b a b a b a").await;
-        cx.simulate_shared_keystrokes("*").await;
-        cx.simulate_shared_keystrokes("n").await;
-        cx.shared_state().await.assert_eq("a b a b ˇa b a");
-        cx.simulate_shared_keystrokes("#").await;
-        cx.shared_state().await.assert_eq("a b ˇa b a b a");
-        cx.simulate_shared_keystrokes("n").await;
-        cx.shared_state().await.assert_eq("ˇa b a b a b a");
-    }
-
-    #[gpui::test]
-    async fn test_v_search(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state("ˇa.c. abcd a.c. abcd").await;
-        cx.simulate_shared_keystrokes("v / c d").await;
-        cx.simulate_shared_keystrokes("enter").await;
-        cx.shared_state().await.assert_eq("«a.c. abcˇ»d a.c. abcd");
-
-        cx.set_shared_state("a a aˇ a a a").await;
-        cx.simulate_shared_keystrokes("v / a").await;
-        cx.simulate_shared_keystrokes("enter").await;
-        cx.shared_state().await.assert_eq("a a a« aˇ» a a");
-        cx.simulate_shared_keystrokes("/ enter").await;
-        cx.shared_state().await.assert_eq("a a a« a aˇ» a");
-        cx.simulate_shared_keystrokes("? enter").await;
-        cx.shared_state().await.assert_eq("a a a« aˇ» a a");
-        cx.simulate_shared_keystrokes("? enter").await;
-        cx.shared_state().await.assert_eq("a a «ˇa »a a a");
-        cx.simulate_shared_keystrokes("/ enter").await;
-        cx.shared_state().await.assert_eq("a a a« aˇ» a a");
-        cx.simulate_shared_keystrokes("/ enter").await;
-        cx.shared_state().await.assert_eq("a a a« a aˇ» a");
-    }
-
-    #[gpui::test]
-    async fn test_v_search_aa(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state("ˇaa aa").await;
-        cx.simulate_shared_keystrokes("v / a a").await;
-        cx.simulate_shared_keystrokes("enter").await;
-        cx.shared_state().await.assert_eq("«aa aˇ»a");
-    }
-
-    #[gpui::test]
-    async fn test_visual_block_search(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {
-            "ˇone two
-             three four
-             five six
-             "
-        })
-        .await;
-        cx.simulate_shared_keystrokes("ctrl-v j / f").await;
-        cx.simulate_shared_keystrokes("enter").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "«one twoˇ»
-             «three fˇ»our
-             five six
-             "
-        });
-    }
-
-    #[gpui::test]
-    async fn test_replace_with_range_at_start(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {
-            "ˇa
-            a
-            a
-            a
-            a
-            a
-            a
-             "
-        })
-        .await;
-        cx.simulate_shared_keystrokes(": 2 , 5 s / ^ / b").await;
-        cx.simulate_shared_keystrokes("enter").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "a
-            ba
-            ba
-            ba
-            ˇba
-            a
-            a
-             "
-        });
-
-        cx.simulate_shared_keystrokes("/ a").await;
-        cx.simulate_shared_keystrokes("enter").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "a
-                ba
-                ba
-                ba
-                bˇa
-                a
-                a
-                 "
-        });
-    }
-
-    #[gpui::test]
-    async fn test_search_skipping(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.set_shared_state(indoc! {
-            "ˇaa aa aa"
-        })
-        .await;
-
-        cx.simulate_shared_keystrokes("/ a a").await;
-        cx.simulate_shared_keystrokes("enter").await;
-
-        cx.shared_state().await.assert_eq(indoc! {
-            "aa ˇaa aa"
-        });
-
-        cx.simulate_shared_keystrokes("left / a a").await;
-        cx.simulate_shared_keystrokes("enter").await;
-
-        cx.shared_state().await.assert_eq(indoc! {
-            "aa ˇaa aa"
-        });
-    }
-
-    #[gpui::test]
-    async fn test_replace_n(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.set_shared_state(indoc! {
-            "ˇaa
-            bb
-            aa"
-        })
-        .await;
-
-        cx.simulate_shared_keystrokes(": s / b b / d d / n").await;
-        cx.simulate_shared_keystrokes("enter").await;
-
-        cx.shared_state().await.assert_eq(indoc! {
-            "ˇaa
-            bb
-            aa"
-        });
-
-        let search_bar = cx.update_workspace(|workspace, _, cx| {
-            workspace.active_pane().update(cx, |pane, cx| {
-                pane.toolbar()
-                    .read(cx)
-                    .item_of_type::<BufferSearchBar>()
-                    .unwrap()
-            })
-        });
-        cx.update_entity(search_bar, |search_bar, _, cx| {
-            assert!(!search_bar.is_dismissed());
-            assert_eq!(search_bar.query(cx), "bb".to_string());
-            assert_eq!(search_bar.replacement(cx), "dd".to_string());
-        })
-    }
-
-    #[gpui::test]
-    async fn test_replace_g(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.set_shared_state(indoc! {
-            "ˇaa aa aa aa
-            aa
-            aa"
-        })
-        .await;
-
-        cx.simulate_shared_keystrokes(": s / a a / b b").await;
-        cx.simulate_shared_keystrokes("enter").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "ˇbb aa aa aa
-            aa
-            aa"
-        });
-        cx.simulate_shared_keystrokes(": s / a a / b b / g").await;
-        cx.simulate_shared_keystrokes("enter").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "ˇbb bb bb bb
-            aa
-            aa"
-        });
-    }
-
-    #[gpui::test]
-    async fn test_replace_c(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-        cx.set_state(
-            indoc! {
-                "ˇaa
-            aa
-            aa"
-            },
-            Mode::Normal,
-        );
-
-        cx.simulate_keystrokes("v j : s / a a / d d / c");
-        cx.simulate_keystrokes("enter");
-
-        cx.assert_state(
-            indoc! {
-                "ˇaa
-            aa
-            aa"
-            },
-            Mode::Normal,
-        );
-
-        cx.simulate_keystrokes("enter");
-
-        cx.assert_state(
-            indoc! {
-                "dd
-            ˇaa
-            aa"
-            },
-            Mode::Normal,
-        );
-
-        cx.simulate_keystrokes("enter");
-        cx.assert_state(
-            indoc! {
-                "dd
-            ddˇ
-            aa"
-            },
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("enter");
-        cx.assert_state(
-            indoc! {
-                "dd
-            ddˇ
-            aa"
-            },
-            Mode::Normal,
-        );
-    }
-
-    #[gpui::test]
-    async fn test_replace_with_range(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {
-            "ˇa
-            a
-            a
-            a
-            a
-            a
-            a
-             "
-        })
-        .await;
-        cx.simulate_shared_keystrokes(": 2 , 5 s / a / b").await;
-        cx.simulate_shared_keystrokes("enter").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "a
-            b
-            b
-            b
-            ˇb
-            a
-            a
-             "
-        });
-        cx.executor().advance_clock(Duration::from_millis(250));
-        cx.run_until_parked();
-
-        cx.simulate_shared_keystrokes("/ a enter").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "a
-                b
-                b
-                b
-                b
-                ˇa
-                a
-                 "
-        });
-    }
-}
diff --git a/crates/vim/src/normal/substitute.rs b/crates/vim/src/normal/substitute.rs
deleted file mode 100644
index df8d7b4879..0000000000
--- a/crates/vim/src/normal/substitute.rs
+++ /dev/null
@@ -1,312 +0,0 @@
-use editor::{Editor, SelectionEffects, movement};
-use gpui::{Context, Window, actions};
-use language::Point;
-
-use crate::{
-    Mode, Vim,
-    motion::{Motion, MotionKind},
-};
-
-actions!(
-    vim,
-    [
-        /// Substitutes characters in the current selection.
-        Substitute,
-        /// Substitutes the entire line.
-        SubstituteLine
-    ]
-);
-
-pub(crate) fn register(editor: &mut Editor, cx: &mut Context<Vim>) {
-    Vim::action(editor, cx, |vim, _: &Substitute, window, cx| {
-        vim.start_recording(cx);
-        let count = Vim::take_count(cx);
-        Vim::take_forced_motion(cx);
-        vim.substitute(count, vim.mode == Mode::VisualLine, window, cx);
-    });
-
-    Vim::action(editor, cx, |vim, _: &SubstituteLine, window, cx| {
-        vim.start_recording(cx);
-        if matches!(vim.mode, Mode::VisualBlock | Mode::Visual) {
-            vim.switch_mode(Mode::VisualLine, false, window, cx)
-        }
-        let count = Vim::take_count(cx);
-        Vim::take_forced_motion(cx);
-        vim.substitute(count, true, window, cx)
-    });
-}
-
-impl Vim {
-    pub fn substitute(
-        &mut self,
-        count: Option<usize>,
-        line_mode: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.store_visual_marks(window, cx);
-        self.update_editor(cx, |vim, editor, cx| {
-            editor.set_clip_at_line_ends(false, cx);
-            editor.transact(window, cx, |editor, window, cx| {
-                let text_layout_details = editor.text_layout_details(window);
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.move_with(|map, selection| {
-                        if selection.start == selection.end {
-                            Motion::Right.expand_selection(
-                                map,
-                                selection,
-                                count,
-                                &text_layout_details,
-                                false,
-                            );
-                        }
-                        if line_mode {
-                            // in Visual mode when the selection contains the newline at the end
-                            // of the line, we should exclude it.
-                            if !selection.is_empty() && selection.end.column() == 0 {
-                                selection.end = movement::left(map, selection.end);
-                            }
-                            Motion::CurrentLine.expand_selection(
-                                map,
-                                selection,
-                                None,
-                                &text_layout_details,
-                                false,
-                            );
-                            if let Some((point, _)) = (Motion::FirstNonWhitespace {
-                                display_lines: false,
-                            })
-                            .move_point(
-                                map,
-                                selection.start,
-                                selection.goal,
-                                None,
-                                &text_layout_details,
-                            ) {
-                                selection.start = point;
-                            }
-                        }
-                    })
-                });
-                let kind = if line_mode {
-                    MotionKind::Linewise
-                } else {
-                    MotionKind::Exclusive
-                };
-                vim.copy_selections_content(editor, kind, window, cx);
-                let selections = editor
-                    .selections
-                    .all::<Point>(&editor.display_snapshot(cx))
-                    .into_iter();
-                let edits = selections.map(|selection| (selection.start..selection.end, ""));
-                editor.edit(edits, cx);
-            });
-        });
-        self.switch_mode(Mode::Insert, true, window, cx);
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use crate::{
-        state::Mode,
-        test::{NeovimBackedTestContext, VimTestContext},
-    };
-    use indoc::indoc;
-
-    #[gpui::test]
-    async fn test_substitute(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        // supports a single cursor
-        cx.set_state(indoc! {"ˇabc\n"}, Mode::Normal);
-        cx.simulate_keystrokes("s x");
-        cx.assert_editor_state("xˇbc\n");
-
-        // supports a selection
-        cx.set_state(indoc! {"a«bcˇ»\n"}, Mode::Visual);
-        cx.assert_editor_state("a«bcˇ»\n");
-        cx.simulate_keystrokes("s x");
-        cx.assert_editor_state("axˇ\n");
-
-        // supports counts
-        cx.set_state(indoc! {"ˇabc\n"}, Mode::Normal);
-        cx.simulate_keystrokes("2 s x");
-        cx.assert_editor_state("xˇc\n");
-
-        // supports multiple cursors
-        cx.set_state(indoc! {"a«bcˇ»deˇffg\n"}, Mode::Normal);
-        cx.simulate_keystrokes("2 s x");
-        cx.assert_editor_state("axˇdexˇg\n");
-
-        // does not read beyond end of line
-        cx.set_state(indoc! {"ˇabc\n"}, Mode::Normal);
-        cx.simulate_keystrokes("5 s x");
-        cx.assert_editor_state("xˇ\n");
-
-        // it handles multibyte characters
-        cx.set_state(indoc! {"ˇcàfé\n"}, Mode::Normal);
-        cx.simulate_keystrokes("4 s");
-        cx.assert_editor_state("ˇ\n");
-
-        // should transactionally undo selection changes
-        cx.simulate_keystrokes("escape u");
-        cx.assert_editor_state("ˇcàfé\n");
-
-        // it handles visual line mode
-        cx.set_state(
-            indoc! {"
-            alpha
-              beˇta
-            gamma"},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("shift-v s");
-        cx.assert_editor_state(indoc! {"
-            alpha
-              ˇ
-            gamma"});
-    }
-
-    #[gpui::test]
-    async fn test_visual_change(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state("The quick ˇbrown").await;
-        cx.simulate_shared_keystrokes("v w c").await;
-        cx.shared_state().await.assert_eq("The quick ˇ");
-
-        cx.set_shared_state(indoc! {"
-            The ˇquick brown
-            fox jumps over
-            the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("v w j c").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            The ˇver
-            the lazy dog"});
-
-        cx.simulate_at_each_offset(
-            "v w j c",
-            indoc! {"
-                    The ˇquick brown
-                    fox jumps ˇover
-                    the ˇlazy dog"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate_at_each_offset(
-            "v w k c",
-            indoc! {"
-                    The ˇquick brown
-                    fox jumps ˇover
-                    the ˇlazy dog"},
-        )
-        .await
-        .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_visual_line_change(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.simulate(
-            "shift-v c",
-            indoc! {"
-            The quˇick brown
-            fox jumps over
-            the lazy dog"},
-        )
-        .await
-        .assert_matches();
-        // Test pasting code copied on change
-        cx.simulate_shared_keystrokes("escape j p").await;
-        cx.shared_state().await.assert_matches();
-
-        cx.simulate_at_each_offset(
-            "shift-v c",
-            indoc! {"
-            The quick brown
-            fox juˇmps over
-            the laˇzy dog"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate(
-            "shift-v j c",
-            indoc! {"
-            The quˇick brown
-            fox jumps over
-            the lazy dog"},
-        )
-        .await
-        .assert_matches();
-        // Test pasting code copied on delete
-        cx.simulate_shared_keystrokes("escape j p").await;
-        cx.shared_state().await.assert_matches();
-
-        cx.simulate_at_each_offset(
-            "shift-v j c",
-            indoc! {"
-            The quick brown
-            fox juˇmps over
-            the laˇzy dog"},
-        )
-        .await
-        .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_substitute_line(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        let initial_state = indoc! {"
-                    The quick brown
-                    fox juˇmps over
-                    the lazy dog
-                    "};
-
-        // normal mode
-        cx.set_shared_state(initial_state).await;
-        cx.simulate_shared_keystrokes("shift-s o").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            The quick brown
-            oˇ
-            the lazy dog
-            "});
-
-        // visual mode
-        cx.set_shared_state(initial_state).await;
-        cx.simulate_shared_keystrokes("v k shift-s o").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            oˇ
-            the lazy dog
-            "});
-
-        // visual block mode
-        cx.set_shared_state(initial_state).await;
-        cx.simulate_shared_keystrokes("ctrl-v j shift-s o").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            The quick brown
-            oˇ
-            "});
-
-        // visual mode including newline
-        cx.set_shared_state(initial_state).await;
-        cx.simulate_shared_keystrokes("v $ shift-s o").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            The quick brown
-            oˇ
-            the lazy dog
-            "});
-
-        // indentation
-        cx.set_neovim_option("shiftwidth=4").await;
-        cx.set_shared_state(initial_state).await;
-        cx.simulate_shared_keystrokes("> > shift-s o").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            The quick brown
-                oˇ
-            the lazy dog
-            "});
-    }
-}
diff --git a/crates/vim/src/normal/toggle_comments.rs b/crates/vim/src/normal/toggle_comments.rs
deleted file mode 100644
index 17c3b2d363..0000000000
--- a/crates/vim/src/normal/toggle_comments.rs
+++ /dev/null
@@ -1,74 +0,0 @@
-use crate::{Vim, motion::Motion, object::Object};
-use collections::HashMap;
-use editor::{Bias, SelectionEffects, display_map::ToDisplayPoint};
-use gpui::{Context, Window};
-use language::SelectionGoal;
-
-impl Vim {
-    pub fn toggle_comments_motion(
-        &mut self,
-        motion: Motion,
-        times: Option<usize>,
-        forced_motion: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.stop_recording(cx);
-        self.update_editor(cx, |_, editor, cx| {
-            let text_layout_details = editor.text_layout_details(window);
-            editor.transact(window, cx, |editor, window, cx| {
-                let mut selection_starts: HashMap<_, _> = Default::default();
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.move_with(|map, selection| {
-                        let anchor = map.display_point_to_anchor(selection.head(), Bias::Right);
-                        selection_starts.insert(selection.id, anchor);
-                        motion.expand_selection(
-                            map,
-                            selection,
-                            times,
-                            &text_layout_details,
-                            forced_motion,
-                        );
-                    });
-                });
-                editor.toggle_comments(&Default::default(), window, cx);
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.move_with(|map, selection| {
-                        let anchor = selection_starts.remove(&selection.id).unwrap();
-                        selection.collapse_to(anchor.to_display_point(map), SelectionGoal::None);
-                    });
-                });
-            });
-        });
-    }
-
-    pub fn toggle_comments_object(
-        &mut self,
-        object: Object,
-        around: bool,
-        times: Option<usize>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.stop_recording(cx);
-        self.update_editor(cx, |_, editor, cx| {
-            editor.transact(window, cx, |editor, window, cx| {
-                let mut original_positions: HashMap<_, _> = Default::default();
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.move_with(|map, selection| {
-                        let anchor = map.display_point_to_anchor(selection.head(), Bias::Right);
-                        original_positions.insert(selection.id, anchor);
-                        object.expand_selection(map, selection, around, times);
-                    });
-                });
-                editor.toggle_comments(&Default::default(), window, cx);
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.move_with(|map, selection| {
-                        let anchor = original_positions.remove(&selection.id).unwrap();
-                        selection.collapse_to(anchor.to_display_point(map), SelectionGoal::None);
-                    });
-                });
-            });
-        });
-    }
-}
diff --git a/crates/vim/src/normal/yank.rs b/crates/vim/src/normal/yank.rs
deleted file mode 100644
index 9920b8fc88..0000000000
--- a/crates/vim/src/normal/yank.rs
+++ /dev/null
@@ -1,246 +0,0 @@
-use std::{ops::Range, time::Duration};
-
-use crate::{
-    Vim, VimSettings,
-    motion::{Motion, MotionKind},
-    object::Object,
-    state::{Mode, Register},
-};
-use collections::HashMap;
-use editor::{ClipboardSelection, Editor, SelectionEffects};
-use gpui::Context;
-use gpui::Window;
-use language::Point;
-use settings::Settings;
-
-struct HighlightOnYank;
-
-impl Vim {
-    pub fn yank_motion(
-        &mut self,
-        motion: Motion,
-        times: Option<usize>,
-        forced_motion: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.update_editor(cx, |vim, editor, cx| {
-            let text_layout_details = editor.text_layout_details(window);
-            editor.transact(window, cx, |editor, window, cx| {
-                editor.set_clip_at_line_ends(false, cx);
-                let mut original_positions: HashMap<_, _> = Default::default();
-                let mut kind = None;
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.move_with(|map, selection| {
-                        let original_position = (selection.head(), selection.goal);
-                        kind = motion.expand_selection(
-                            map,
-                            selection,
-                            times,
-                            &text_layout_details,
-                            forced_motion,
-                        );
-                        if kind == Some(MotionKind::Exclusive) {
-                            original_positions
-                                .insert(selection.id, (selection.start, selection.goal));
-                        } else {
-                            original_positions.insert(selection.id, original_position);
-                        }
-                    })
-                });
-                let Some(kind) = kind else { return };
-                vim.yank_selections_content(editor, kind, window, cx);
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.move_with(|_, selection| {
-                        let (head, goal) = original_positions.remove(&selection.id).unwrap();
-                        selection.collapse_to(head, goal);
-                    });
-                });
-            });
-        });
-        self.exit_temporary_normal(window, cx);
-    }
-
-    pub fn yank_object(
-        &mut self,
-        object: Object,
-        around: bool,
-        times: Option<usize>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.update_editor(cx, |vim, editor, cx| {
-            editor.transact(window, cx, |editor, window, cx| {
-                editor.set_clip_at_line_ends(false, cx);
-                let mut start_positions: HashMap<_, _> = Default::default();
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.move_with(|map, selection| {
-                        object.expand_selection(map, selection, around, times);
-                        let start_position = (selection.start, selection.goal);
-                        start_positions.insert(selection.id, start_position);
-                    });
-                });
-                let kind = match object.target_visual_mode(vim.mode, around) {
-                    Mode::VisualLine => MotionKind::Linewise,
-                    _ => MotionKind::Exclusive,
-                };
-                vim.yank_selections_content(editor, kind, window, cx);
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.move_with(|_, selection| {
-                        let (head, goal) = start_positions.remove(&selection.id).unwrap();
-                        selection.collapse_to(head, goal);
-                    });
-                });
-            });
-        });
-        self.exit_temporary_normal(window, cx);
-    }
-
-    pub fn yank_selections_content(
-        &mut self,
-        editor: &mut Editor,
-        kind: MotionKind,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) {
-        self.copy_ranges(
-            editor,
-            kind,
-            true,
-            editor
-                .selections
-                .all_adjusted(&editor.display_snapshot(cx))
-                .iter()
-                .map(|s| s.range())
-                .collect(),
-            window,
-            cx,
-        )
-    }
-
-    pub fn copy_selections_content(
-        &mut self,
-        editor: &mut Editor,
-        kind: MotionKind,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) {
-        self.copy_ranges(
-            editor,
-            kind,
-            false,
-            editor
-                .selections
-                .all_adjusted(&editor.display_snapshot(cx))
-                .iter()
-                .map(|s| s.range())
-                .collect(),
-            window,
-            cx,
-        )
-    }
-
-    pub(crate) fn copy_ranges(
-        &mut self,
-        editor: &mut Editor,
-        kind: MotionKind,
-        is_yank: bool,
-        selections: Vec<Range<Point>>,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) {
-        let buffer = editor.buffer().read(cx).snapshot(cx);
-        self.set_mark(
-            "[".to_string(),
-            selections
-                .iter()
-                .map(|s| buffer.anchor_before(s.start))
-                .collect(),
-            editor.buffer(),
-            window,
-            cx,
-        );
-        self.set_mark(
-            "]".to_string(),
-            selections
-                .iter()
-                .map(|s| buffer.anchor_after(s.end))
-                .collect(),
-            editor.buffer(),
-            window,
-            cx,
-        );
-
-        let mut text = String::new();
-        let mut clipboard_selections = Vec::with_capacity(selections.len());
-        let mut ranges_to_highlight = Vec::new();
-
-        {
-            let mut is_first = true;
-            for selection in selections.iter() {
-                let start = selection.start;
-                let end = selection.end;
-                if is_first {
-                    is_first = false;
-                } else {
-                    text.push('\n');
-                }
-                let initial_len = text.len();
-
-                let start_anchor = buffer.anchor_after(start);
-                let end_anchor = buffer.anchor_before(end);
-                ranges_to_highlight.push(start_anchor..end_anchor);
-
-                for chunk in buffer.text_for_range(start..end) {
-                    text.push_str(chunk);
-                }
-                if kind.linewise() {
-                    text.push('\n');
-                }
-                clipboard_selections.push(ClipboardSelection::for_buffer(
-                    text.len() - initial_len,
-                    false,
-                    start..end,
-                    &buffer,
-                    editor.project(),
-                    cx,
-                ));
-            }
-        }
-
-        let selected_register = self.selected_register.take();
-        Vim::update_globals(cx, |globals, cx| {
-            globals.write_registers(
-                Register {
-                    text: text.into(),
-                    clipboard_selections: Some(clipboard_selections),
-                },
-                selected_register,
-                is_yank,
-                kind,
-                cx,
-            )
-        });
-
-        let highlight_duration = VimSettings::get_global(cx).highlight_on_yank_duration;
-        if !is_yank || self.mode == Mode::Visual || highlight_duration == 0 {
-            return;
-        }
-
-        editor.highlight_background::<HighlightOnYank>(
-            &ranges_to_highlight,
-            |_, colors| colors.colors().editor_document_highlight_read_background,
-            cx,
-        );
-        cx.spawn(async move |this, cx| {
-            cx.background_executor()
-                .timer(Duration::from_millis(highlight_duration))
-                .await;
-            this.update(cx, |editor, cx| {
-                editor.clear_background_highlights::<HighlightOnYank>(cx)
-            })
-            .ok();
-        })
-        .detach();
-    }
-}
diff --git a/crates/vim/src/object.rs b/crates/vim/src/object.rs
deleted file mode 100644
index f11386d02d..0000000000
--- a/crates/vim/src/object.rs
+++ /dev/null
@@ -1,3414 +0,0 @@
-use std::ops::Range;
-
-use crate::{
-    Vim,
-    motion::right,
-    state::{Mode, Operator},
-};
-use editor::{
-    Bias, BufferOffset, DisplayPoint, Editor, MultiBufferOffset, ToOffset,
-    display_map::{DisplaySnapshot, ToDisplayPoint},
-    movement::{self, FindRange},
-};
-use gpui::{Action, Window, actions};
-use itertools::Itertools;
-use language::{BufferSnapshot, CharKind, Point, Selection, TextObject, TreeSitterOptions};
-use multi_buffer::MultiBufferRow;
-use schemars::JsonSchema;
-use serde::Deserialize;
-use ui::Context;
-
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Deserialize, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum Object {
-    Word { ignore_punctuation: bool },
-    Subword { ignore_punctuation: bool },
-    Sentence,
-    Paragraph,
-    Quotes,
-    BackQuotes,
-    AnyQuotes,
-    MiniQuotes,
-    DoubleQuotes,
-    VerticalBars,
-    AnyBrackets,
-    MiniBrackets,
-    Parentheses,
-    SquareBrackets,
-    CurlyBrackets,
-    AngleBrackets,
-    Argument,
-    IndentObj { include_below: bool },
-    Tag,
-    Method,
-    Class,
-    Comment,
-    EntireFile,
-}
-
-/// Selects a word text object.
-#[derive(Clone, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = vim)]
-#[serde(deny_unknown_fields)]
-struct Word {
-    #[serde(default)]
-    ignore_punctuation: bool,
-}
-
-/// Selects a subword text object.
-#[derive(Clone, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = vim)]
-#[serde(deny_unknown_fields)]
-struct Subword {
-    #[serde(default)]
-    ignore_punctuation: bool,
-}
-/// Selects text at the same indentation level.
-#[derive(Clone, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = vim)]
-#[serde(deny_unknown_fields)]
-struct IndentObj {
-    #[serde(default)]
-    include_below: bool,
-}
-
-#[derive(Debug, Clone)]
-pub struct CandidateRange {
-    pub start: DisplayPoint,
-    pub end: DisplayPoint,
-}
-
-#[derive(Debug, Clone)]
-pub struct CandidateWithRanges {
-    candidate: CandidateRange,
-    open_range: Range<MultiBufferOffset>,
-    close_range: Range<MultiBufferOffset>,
-}
-
-/// Selects text at the same indentation level.
-#[derive(Clone, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = vim)]
-#[serde(deny_unknown_fields)]
-struct Parentheses {
-    #[serde(default)]
-    opening: bool,
-}
-
-/// Selects text at the same indentation level.
-#[derive(Clone, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = vim)]
-#[serde(deny_unknown_fields)]
-struct SquareBrackets {
-    #[serde(default)]
-    opening: bool,
-}
-
-/// Selects text at the same indentation level.
-#[derive(Clone, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = vim)]
-#[serde(deny_unknown_fields)]
-struct AngleBrackets {
-    #[serde(default)]
-    opening: bool,
-}
-/// Selects text at the same indentation level.
-#[derive(Clone, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = vim)]
-#[serde(deny_unknown_fields)]
-struct CurlyBrackets {
-    #[serde(default)]
-    opening: bool,
-}
-
-fn cover_or_next<I: Iterator<Item = (Range<MultiBufferOffset>, Range<MultiBufferOffset>)>>(
-    candidates: Option<I>,
-    caret: DisplayPoint,
-    map: &DisplaySnapshot,
-) -> Option<CandidateWithRanges> {
-    let caret_offset = caret.to_offset(map, Bias::Left);
-    let mut covering = vec![];
-    let mut next_ones = vec![];
-    let snapshot = map.buffer_snapshot();
-
-    if let Some(ranges) = candidates {
-        for (open_range, close_range) in ranges {
-            let start_off = open_range.start;
-            let end_off = close_range.end;
-            let candidate = CandidateWithRanges {
-                candidate: CandidateRange {
-                    start: start_off.to_display_point(map),
-                    end: end_off.to_display_point(map),
-                },
-                open_range: open_range.clone(),
-                close_range: close_range.clone(),
-            };
-
-            if open_range
-                .start
-                .to_offset(snapshot)
-                .to_display_point(map)
-                .row()
-                == caret_offset.to_display_point(map).row()
-            {
-                if start_off <= caret_offset && caret_offset < end_off {
-                    covering.push(candidate);
-                } else if start_off >= caret_offset {
-                    next_ones.push(candidate);
-                }
-            }
-        }
-    }
-
-    // 1) covering -> smallest width
-    if !covering.is_empty() {
-        return covering.into_iter().min_by_key(|r| {
-            r.candidate.end.to_offset(map, Bias::Right)
-                - r.candidate.start.to_offset(map, Bias::Left)
-        });
-    }
-
-    // 2) next -> closest by start
-    if !next_ones.is_empty() {
-        return next_ones.into_iter().min_by_key(|r| {
-            let start = r.candidate.start.to_offset(map, Bias::Left);
-            (start.0 as isize - caret_offset.0 as isize).abs()
-        });
-    }
-
-    None
-}
-
-type DelimiterPredicate = dyn Fn(&BufferSnapshot, usize, usize) -> bool;
-
-struct DelimiterRange {
-    open: Range<MultiBufferOffset>,
-    close: Range<MultiBufferOffset>,
-}
-
-impl DelimiterRange {
-    fn to_display_range(&self, map: &DisplaySnapshot, around: bool) -> Range<DisplayPoint> {
-        if around {
-            self.open.start.to_display_point(map)..self.close.end.to_display_point(map)
-        } else {
-            self.open.end.to_display_point(map)..self.close.start.to_display_point(map)
-        }
-    }
-}
-
-fn find_mini_delimiters(
-    map: &DisplaySnapshot,
-    display_point: DisplayPoint,
-    around: bool,
-    is_valid_delimiter: &DelimiterPredicate,
-) -> Option<Range<DisplayPoint>> {
-    let point = map.clip_at_line_end(display_point).to_point(map);
-    let offset = point.to_offset(&map.buffer_snapshot());
-
-    let line_range = get_line_range(map, point);
-    let visible_line_range = get_visible_line_range(&line_range);
-
-    let snapshot = &map.buffer_snapshot();
-    let mut excerpt = snapshot.excerpt_containing(offset..offset)?;
-    let buffer = excerpt.buffer();
-    let buffer_offset = excerpt.map_offset_to_buffer(offset);
-
-    let bracket_filter = |open: Range<usize>, close: Range<usize>| {
-        is_valid_delimiter(buffer, open.start, close.start)
-    };
-
-    // Try to find delimiters in visible range first
-    let ranges = map
-        .buffer_snapshot()
-        .bracket_ranges(visible_line_range)
-        .map(|ranges| {
-            ranges.filter_map(|(open, close)| {
-                // Convert the ranges from multibuffer space to buffer space as
-                // that is what `is_valid_delimiter` expects, otherwise it might
-                // panic as the values might be out of bounds.
-                let buffer_open = excerpt.map_range_to_buffer(open.clone());
-                let buffer_close = excerpt.map_range_to_buffer(close.clone());
-
-                if is_valid_delimiter(buffer, buffer_open.start.0, buffer_close.start.0) {
-                    Some((open, close))
-                } else {
-                    None
-                }
-            })
-        });
-
-    if let Some(candidate) = cover_or_next(ranges, display_point, map) {
-        return Some(
-            DelimiterRange {
-                open: candidate.open_range,
-                close: candidate.close_range,
-            }
-            .to_display_range(map, around),
-        );
-    }
-
-    // Fall back to innermost enclosing brackets
-    let (open_bracket, close_bracket) = buffer
-        .innermost_enclosing_bracket_ranges(buffer_offset..buffer_offset, Some(&bracket_filter))?;
-
-    Some(
-        DelimiterRange {
-            open: excerpt.map_range_from_buffer(
-                BufferOffset(open_bracket.start)..BufferOffset(open_bracket.end),
-            ),
-            close: excerpt.map_range_from_buffer(
-                BufferOffset(close_bracket.start)..BufferOffset(close_bracket.end),
-            ),
-        }
-        .to_display_range(map, around),
-    )
-}
-
-fn get_line_range(map: &DisplaySnapshot, point: Point) -> Range<Point> {
-    let (start, mut end) = (
-        map.prev_line_boundary(point).0,
-        map.next_line_boundary(point).0,
-    );
-
-    if end == point {
-        end = map.max_point().to_point(map);
-    }
-
-    start..end
-}
-
-fn get_visible_line_range(line_range: &Range<Point>) -> Range<Point> {
-    let end_column = line_range.end.column.saturating_sub(1);
-    line_range.start..Point::new(line_range.end.row, end_column)
-}
-
-fn is_quote_delimiter(buffer: &BufferSnapshot, _start: usize, end: usize) -> bool {
-    matches!(buffer.chars_at(end).next(), Some('\'' | '"' | '`'))
-}
-
-fn is_bracket_delimiter(buffer: &BufferSnapshot, start: usize, _end: usize) -> bool {
-    matches!(
-        buffer.chars_at(start).next(),
-        Some('(' | '[' | '{' | '<' | '|')
-    )
-}
-
-fn find_mini_quotes(
-    map: &DisplaySnapshot,
-    display_point: DisplayPoint,
-    around: bool,
-) -> Option<Range<DisplayPoint>> {
-    find_mini_delimiters(map, display_point, around, &is_quote_delimiter)
-}
-
-fn find_mini_brackets(
-    map: &DisplaySnapshot,
-    display_point: DisplayPoint,
-    around: bool,
-) -> Option<Range<DisplayPoint>> {
-    find_mini_delimiters(map, display_point, around, &is_bracket_delimiter)
-}
-
-actions!(
-    vim,
-    [
-        /// Selects a sentence text object.
-        Sentence,
-        /// Selects a paragraph text object.
-        Paragraph,
-        /// Selects text within single quotes.
-        Quotes,
-        /// Selects text within backticks.
-        BackQuotes,
-        /// Selects text within the nearest quotes (single or double).
-        MiniQuotes,
-        /// Selects text within any type of quotes.
-        AnyQuotes,
-        /// Selects text within double quotes.
-        DoubleQuotes,
-        /// Selects text within vertical bars (pipes).
-        VerticalBars,
-        /// Selects text within the nearest brackets.
-        MiniBrackets,
-        /// Selects text within any type of brackets.
-        AnyBrackets,
-        /// Selects a function argument.
-        Argument,
-        /// Selects an HTML/XML tag.
-        Tag,
-        /// Selects a method or function.
-        Method,
-        /// Selects a class definition.
-        Class,
-        /// Selects a comment block.
-        Comment,
-        /// Selects the entire file.
-        EntireFile
-    ]
-);
-
-pub fn register(editor: &mut Editor, cx: &mut Context<Vim>) {
-    Vim::action(
-        editor,
-        cx,
-        |vim, &Word { ignore_punctuation }: &Word, window, cx| {
-            vim.object(Object::Word { ignore_punctuation }, window, cx)
-        },
-    );
-    Vim::action(
-        editor,
-        cx,
-        |vim, &Subword { ignore_punctuation }: &Subword, window, cx| {
-            vim.object(Object::Subword { ignore_punctuation }, window, cx)
-        },
-    );
-    Vim::action(editor, cx, |vim, _: &Tag, window, cx| {
-        vim.object(Object::Tag, window, cx)
-    });
-    Vim::action(editor, cx, |vim, _: &Sentence, window, cx| {
-        vim.object(Object::Sentence, window, cx)
-    });
-    Vim::action(editor, cx, |vim, _: &Paragraph, window, cx| {
-        vim.object(Object::Paragraph, window, cx)
-    });
-    Vim::action(editor, cx, |vim, _: &Quotes, window, cx| {
-        vim.object(Object::Quotes, window, cx)
-    });
-    Vim::action(editor, cx, |vim, _: &BackQuotes, window, cx| {
-        vim.object(Object::BackQuotes, window, cx)
-    });
-    Vim::action(editor, cx, |vim, _: &MiniQuotes, window, cx| {
-        vim.object(Object::MiniQuotes, window, cx)
-    });
-    Vim::action(editor, cx, |vim, _: &MiniBrackets, window, cx| {
-        vim.object(Object::MiniBrackets, window, cx)
-    });
-    Vim::action(editor, cx, |vim, _: &AnyQuotes, window, cx| {
-        vim.object(Object::AnyQuotes, window, cx)
-    });
-    Vim::action(editor, cx, |vim, _: &AnyBrackets, window, cx| {
-        vim.object(Object::AnyBrackets, window, cx)
-    });
-    Vim::action(editor, cx, |vim, _: &BackQuotes, window, cx| {
-        vim.object(Object::BackQuotes, window, cx)
-    });
-    Vim::action(editor, cx, |vim, _: &DoubleQuotes, window, cx| {
-        vim.object(Object::DoubleQuotes, window, cx)
-    });
-    Vim::action(editor, cx, |vim, action: &Parentheses, window, cx| {
-        vim.object_impl(Object::Parentheses, action.opening, window, cx)
-    });
-    Vim::action(editor, cx, |vim, action: &SquareBrackets, window, cx| {
-        vim.object_impl(Object::SquareBrackets, action.opening, window, cx)
-    });
-    Vim::action(editor, cx, |vim, action: &CurlyBrackets, window, cx| {
-        vim.object_impl(Object::CurlyBrackets, action.opening, window, cx)
-    });
-    Vim::action(editor, cx, |vim, action: &AngleBrackets, window, cx| {
-        vim.object_impl(Object::AngleBrackets, action.opening, window, cx)
-    });
-    Vim::action(editor, cx, |vim, _: &VerticalBars, window, cx| {
-        vim.object(Object::VerticalBars, window, cx)
-    });
-    Vim::action(editor, cx, |vim, _: &Argument, window, cx| {
-        vim.object(Object::Argument, window, cx)
-    });
-    Vim::action(editor, cx, |vim, _: &Method, window, cx| {
-        vim.object(Object::Method, window, cx)
-    });
-    Vim::action(editor, cx, |vim, _: &Class, window, cx| {
-        vim.object(Object::Class, window, cx)
-    });
-    Vim::action(editor, cx, |vim, _: &EntireFile, window, cx| {
-        vim.object(Object::EntireFile, window, cx)
-    });
-    Vim::action(editor, cx, |vim, _: &Comment, window, cx| {
-        if !matches!(vim.active_operator(), Some(Operator::Object { .. })) {
-            vim.push_operator(Operator::Object { around: true }, window, cx);
-        }
-        vim.object(Object::Comment, window, cx)
-    });
-    Vim::action(
-        editor,
-        cx,
-        |vim, &IndentObj { include_below }: &IndentObj, window, cx| {
-            vim.object(Object::IndentObj { include_below }, window, cx)
-        },
-    );
-}
-
-impl Vim {
-    fn object(&mut self, object: Object, window: &mut Window, cx: &mut Context<Self>) {
-        self.object_impl(object, false, window, cx);
-    }
-
-    fn object_impl(
-        &mut self,
-        object: Object,
-        opening: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let count = Self::take_count(cx);
-
-        match self.mode {
-            Mode::Normal | Mode::HelixNormal => {
-                self.normal_object(object, count, opening, window, cx)
-            }
-            Mode::Visual | Mode::VisualLine | Mode::VisualBlock | Mode::HelixSelect => {
-                self.visual_object(object, count, window, cx)
-            }
-            Mode::Insert | Mode::Replace => {
-                // Shouldn't execute a text object in insert mode. Ignoring
-            }
-        }
-    }
-}
-
-impl Object {
-    pub fn is_multiline(self) -> bool {
-        match self {
-            Object::Word { .. }
-            | Object::Subword { .. }
-            | Object::Quotes
-            | Object::BackQuotes
-            | Object::AnyQuotes
-            | Object::MiniQuotes
-            | Object::VerticalBars
-            | Object::DoubleQuotes => false,
-            Object::Sentence
-            | Object::Paragraph
-            | Object::AnyBrackets
-            | Object::MiniBrackets
-            | Object::Parentheses
-            | Object::Tag
-            | Object::AngleBrackets
-            | Object::CurlyBrackets
-            | Object::SquareBrackets
-            | Object::Argument
-            | Object::Method
-            | Object::Class
-            | Object::EntireFile
-            | Object::Comment
-            | Object::IndentObj { .. } => true,
-        }
-    }
-
-    pub fn always_expands_both_ways(self) -> bool {
-        match self {
-            Object::Word { .. }
-            | Object::Subword { .. }
-            | Object::Sentence
-            | Object::Paragraph
-            | Object::Argument
-            | Object::IndentObj { .. } => false,
-            Object::Quotes
-            | Object::BackQuotes
-            | Object::AnyQuotes
-            | Object::MiniQuotes
-            | Object::DoubleQuotes
-            | Object::VerticalBars
-            | Object::AnyBrackets
-            | Object::MiniBrackets
-            | Object::Parentheses
-            | Object::SquareBrackets
-            | Object::Tag
-            | Object::Method
-            | Object::Class
-            | Object::Comment
-            | Object::EntireFile
-            | Object::CurlyBrackets
-            | Object::AngleBrackets => true,
-        }
-    }
-
-    pub fn target_visual_mode(self, current_mode: Mode, around: bool) -> Mode {
-        match self {
-            Object::Word { .. }
-            | Object::Subword { .. }
-            | Object::Sentence
-            | Object::Quotes
-            | Object::AnyQuotes
-            | Object::MiniQuotes
-            | Object::BackQuotes
-            | Object::DoubleQuotes => {
-                if current_mode == Mode::VisualBlock {
-                    Mode::VisualBlock
-                } else {
-                    Mode::Visual
-                }
-            }
-            Object::Parentheses
-            | Object::AnyBrackets
-            | Object::MiniBrackets
-            | Object::SquareBrackets
-            | Object::CurlyBrackets
-            | Object::AngleBrackets
-            | Object::VerticalBars
-            | Object::Tag
-            | Object::Comment
-            | Object::Argument
-            | Object::IndentObj { .. } => Mode::Visual,
-            Object::Method | Object::Class => {
-                if around {
-                    Mode::VisualLine
-                } else {
-                    Mode::Visual
-                }
-            }
-            Object::Paragraph | Object::EntireFile => Mode::VisualLine,
-        }
-    }
-
-    pub fn range(
-        self,
-        map: &DisplaySnapshot,
-        selection: Selection<DisplayPoint>,
-        around: bool,
-        times: Option<usize>,
-    ) -> Option<Range<DisplayPoint>> {
-        let relative_to = selection.head();
-        match self {
-            Object::Word { ignore_punctuation } => {
-                if around {
-                    around_word(map, relative_to, ignore_punctuation)
-                } else {
-                    in_word(map, relative_to, ignore_punctuation)
-                }
-            }
-            Object::Subword { ignore_punctuation } => {
-                if around {
-                    around_subword(map, relative_to, ignore_punctuation)
-                } else {
-                    in_subword(map, relative_to, ignore_punctuation)
-                }
-            }
-            Object::Sentence => sentence(map, relative_to, around),
-            //change others later
-            Object::Paragraph => paragraph(map, relative_to, around, times.unwrap_or(1)),
-            Object::Quotes => {
-                surrounding_markers(map, relative_to, around, self.is_multiline(), '\'', '\'')
-            }
-            Object::BackQuotes => {
-                surrounding_markers(map, relative_to, around, self.is_multiline(), '`', '`')
-            }
-            Object::AnyQuotes => {
-                let quote_types = ['\'', '"', '`'];
-                let cursor_offset = relative_to.to_offset(map, Bias::Left);
-
-                // Find innermost range directly without collecting all ranges
-                let mut innermost = None;
-                let mut min_size = usize::MAX;
-
-                // First pass: find innermost enclosing range
-                for quote in quote_types {
-                    if let Some(range) = surrounding_markers(
-                        map,
-                        relative_to,
-                        around,
-                        self.is_multiline(),
-                        quote,
-                        quote,
-                    ) {
-                        let start_offset = range.start.to_offset(map, Bias::Left);
-                        let end_offset = range.end.to_offset(map, Bias::Right);
-
-                        if cursor_offset >= start_offset && cursor_offset <= end_offset {
-                            let size = end_offset - start_offset;
-                            if size < min_size {
-                                min_size = size;
-                                innermost = Some(range);
-                            }
-                        }
-                    }
-                }
-
-                if let Some(range) = innermost {
-                    return Some(range);
-                }
-
-                // Fallback: find nearest pair if not inside any quotes
-                quote_types
-                    .iter()
-                    .flat_map(|&quote| {
-                        surrounding_markers(
-                            map,
-                            relative_to,
-                            around,
-                            self.is_multiline(),
-                            quote,
-                            quote,
-                        )
-                    })
-                    .min_by_key(|range| {
-                        let start_offset = range.start.to_offset(map, Bias::Left);
-                        let end_offset = range.end.to_offset(map, Bias::Right);
-                        if cursor_offset < start_offset {
-                            (start_offset - cursor_offset) as isize
-                        } else if cursor_offset > end_offset {
-                            (cursor_offset - end_offset) as isize
-                        } else {
-                            0
-                        }
-                    })
-            }
-            Object::MiniQuotes => find_mini_quotes(map, relative_to, around),
-            Object::DoubleQuotes => {
-                surrounding_markers(map, relative_to, around, self.is_multiline(), '"', '"')
-            }
-            Object::VerticalBars => {
-                surrounding_markers(map, relative_to, around, self.is_multiline(), '|', '|')
-            }
-            Object::Parentheses => {
-                surrounding_markers(map, relative_to, around, self.is_multiline(), '(', ')')
-            }
-            Object::Tag => {
-                let head = selection.head();
-                let range = selection.range();
-                surrounding_html_tag(map, head, range, around)
-            }
-            Object::AnyBrackets => {
-                let bracket_pairs = [('(', ')'), ('[', ']'), ('{', '}'), ('<', '>')];
-                let cursor_offset = relative_to.to_offset(map, Bias::Left);
-
-                // Find innermost enclosing bracket range
-                let mut innermost = None;
-                let mut min_size = usize::MAX;
-
-                for &(open, close) in bracket_pairs.iter() {
-                    if let Some(range) = surrounding_markers(
-                        map,
-                        relative_to,
-                        around,
-                        self.is_multiline(),
-                        open,
-                        close,
-                    ) {
-                        let start_offset = range.start.to_offset(map, Bias::Left);
-                        let end_offset = range.end.to_offset(map, Bias::Right);
-
-                        if cursor_offset >= start_offset && cursor_offset <= end_offset {
-                            let size = end_offset - start_offset;
-                            if size < min_size {
-                                min_size = size;
-                                innermost = Some(range);
-                            }
-                        }
-                    }
-                }
-
-                if let Some(range) = innermost {
-                    return Some(range);
-                }
-
-                // Fallback: find nearest bracket pair if not inside any
-                bracket_pairs
-                    .iter()
-                    .flat_map(|&(open, close)| {
-                        surrounding_markers(
-                            map,
-                            relative_to,
-                            around,
-                            self.is_multiline(),
-                            open,
-                            close,
-                        )
-                    })
-                    .min_by_key(|range| {
-                        let start_offset = range.start.to_offset(map, Bias::Left);
-                        let end_offset = range.end.to_offset(map, Bias::Right);
-                        if cursor_offset < start_offset {
-                            (start_offset - cursor_offset) as isize
-                        } else if cursor_offset > end_offset {
-                            (cursor_offset - end_offset) as isize
-                        } else {
-                            0
-                        }
-                    })
-            }
-            Object::MiniBrackets => find_mini_brackets(map, relative_to, around),
-            Object::SquareBrackets => {
-                surrounding_markers(map, relative_to, around, self.is_multiline(), '[', ']')
-            }
-            Object::CurlyBrackets => {
-                surrounding_markers(map, relative_to, around, self.is_multiline(), '{', '}')
-            }
-            Object::AngleBrackets => {
-                surrounding_markers(map, relative_to, around, self.is_multiline(), '<', '>')
-            }
-            Object::Method => text_object(
-                map,
-                relative_to,
-                if around {
-                    TextObject::AroundFunction
-                } else {
-                    TextObject::InsideFunction
-                },
-            ),
-            Object::Comment => text_object(
-                map,
-                relative_to,
-                if around {
-                    TextObject::AroundComment
-                } else {
-                    TextObject::InsideComment
-                },
-            ),
-            Object::Class => text_object(
-                map,
-                relative_to,
-                if around {
-                    TextObject::AroundClass
-                } else {
-                    TextObject::InsideClass
-                },
-            ),
-            Object::Argument => argument(map, relative_to, around),
-            Object::IndentObj { include_below } => indent(map, relative_to, around, include_below),
-            Object::EntireFile => entire_file(map),
-        }
-    }
-
-    pub fn expand_selection(
-        self,
-        map: &DisplaySnapshot,
-        selection: &mut Selection<DisplayPoint>,
-        around: bool,
-        times: Option<usize>,
-    ) -> bool {
-        if let Some(range) = self.range(map, selection.clone(), around, times) {
-            selection.start = range.start;
-            selection.end = range.end;
-            true
-        } else {
-            false
-        }
-    }
-}
-
-/// Returns a range that surrounds the word `relative_to` is in.
-///
-/// If `relative_to` is at the start of a word, return the word.
-/// If `relative_to` is between words, return the space between.
-fn in_word(
-    map: &DisplaySnapshot,
-    relative_to: DisplayPoint,
-    ignore_punctuation: bool,
-) -> Option<Range<DisplayPoint>> {
-    // Use motion::right so that we consider the character under the cursor when looking for the start
-    let classifier = map
-        .buffer_snapshot()
-        .char_classifier_at(relative_to.to_point(map))
-        .ignore_punctuation(ignore_punctuation);
-    let start = movement::find_preceding_boundary_display_point(
-        map,
-        right(map, relative_to, 1),
-        movement::FindRange::SingleLine,
-        |left, right| classifier.kind(left) != classifier.kind(right),
-    );
-
-    let end = movement::find_boundary(map, relative_to, FindRange::SingleLine, |left, right| {
-        classifier.kind(left) != classifier.kind(right)
-    });
-
-    Some(start..end)
-}
-
-fn in_subword(
-    map: &DisplaySnapshot,
-    relative_to: DisplayPoint,
-    ignore_punctuation: bool,
-) -> Option<Range<DisplayPoint>> {
-    let offset = relative_to.to_offset(map, Bias::Left);
-    // Use motion::right so that we consider the character under the cursor when looking for the start
-    let classifier = map
-        .buffer_snapshot()
-        .char_classifier_at(relative_to.to_point(map))
-        .ignore_punctuation(ignore_punctuation);
-    let in_subword = map
-        .buffer_chars_at(offset)
-        .next()
-        .map(|(c, _)| {
-            if classifier.is_word('-') {
-                !classifier.is_whitespace(c) && c != '_' && c != '-'
-            } else {
-                !classifier.is_whitespace(c) && c != '_'
-            }
-        })
-        .unwrap_or(false);
-
-    let start = if in_subword {
-        movement::find_preceding_boundary_display_point(
-            map,
-            right(map, relative_to, 1),
-            movement::FindRange::SingleLine,
-            |left, right| {
-                let is_word_start = classifier.kind(left) != classifier.kind(right);
-                let is_subword_start = classifier.is_word('-') && left == '-' && right != '-'
-                    || left == '_' && right != '_'
-                    || left.is_lowercase() && right.is_uppercase();
-                is_word_start || is_subword_start
-            },
-        )
-    } else {
-        movement::find_boundary(map, relative_to, FindRange::SingleLine, |left, right| {
-            let is_word_start = classifier.kind(left) != classifier.kind(right);
-            let is_subword_start = classifier.is_word('-') && left == '-' && right != '-'
-                || left == '_' && right != '_'
-                || left.is_lowercase() && right.is_uppercase();
-            is_word_start || is_subword_start
-        })
-    };
-
-    let end = movement::find_boundary(map, relative_to, FindRange::SingleLine, |left, right| {
-        let is_word_end = classifier.kind(left) != classifier.kind(right);
-        let is_subword_end = classifier.is_word('-') && left != '-' && right == '-'
-            || left != '_' && right == '_'
-            || left.is_lowercase() && right.is_uppercase();
-        is_word_end || is_subword_end
-    });
-
-    Some(start..end)
-}
-
-pub fn surrounding_html_tag(
-    map: &DisplaySnapshot,
-    head: DisplayPoint,
-    range: Range<DisplayPoint>,
-    around: bool,
-) -> Option<Range<DisplayPoint>> {
-    fn read_tag(chars: impl Iterator<Item = char>) -> String {
-        chars
-            .take_while(|c| c.is_alphanumeric() || *c == ':' || *c == '-' || *c == '_' || *c == '.')
-            .collect()
-    }
-    fn open_tag(mut chars: impl Iterator<Item = char>) -> Option<String> {
-        if Some('<') != chars.next() {
-            return None;
-        }
-        Some(read_tag(chars))
-    }
-    fn close_tag(mut chars: impl Iterator<Item = char>) -> Option<String> {
-        if (Some('<'), Some('/')) != (chars.next(), chars.next()) {
-            return None;
-        }
-        Some(read_tag(chars))
-    }
-
-    let snapshot = &map.buffer_snapshot();
-    let offset = head.to_offset(map, Bias::Left);
-    let mut excerpt = snapshot.excerpt_containing(offset..offset)?;
-    let buffer = excerpt.buffer();
-    let offset = excerpt.map_offset_to_buffer(offset);
-
-    // Find the most closest to current offset
-    let mut cursor = buffer.syntax_layer_at(offset)?.node().walk();
-    let mut last_child_node = cursor.node();
-    while cursor.goto_first_child_for_byte(offset.0).is_some() {
-        last_child_node = cursor.node();
-    }
-
-    let mut last_child_node = Some(last_child_node);
-    while let Some(cur_node) = last_child_node {
-        if cur_node.child_count() >= 2 {
-            let first_child = cur_node.child(0);
-            let last_child = cur_node.child(cur_node.child_count() - 1);
-            if let (Some(first_child), Some(last_child)) = (first_child, last_child) {
-                let open_tag = open_tag(buffer.chars_for_range(first_child.byte_range()));
-                let close_tag = close_tag(buffer.chars_for_range(last_child.byte_range()));
-                // It needs to be handled differently according to the selection length
-                let is_valid = if range.end.to_offset(map, Bias::Left)
-                    - range.start.to_offset(map, Bias::Left)
-                    <= 1
-                {
-                    offset.0 <= last_child.end_byte()
-                } else {
-                    excerpt
-                        .map_offset_to_buffer(range.start.to_offset(map, Bias::Left))
-                        .0
-                        >= first_child.start_byte()
-                        && excerpt
-                            .map_offset_to_buffer(range.end.to_offset(map, Bias::Left))
-                            .0
-                            <= last_child.start_byte() + 1
-                };
-                if open_tag.is_some() && open_tag == close_tag && is_valid {
-                    let range = if around {
-                        first_child.byte_range().start..last_child.byte_range().end
-                    } else {
-                        first_child.byte_range().end..last_child.byte_range().start
-                    };
-                    let range = BufferOffset(range.start)..BufferOffset(range.end);
-                    if excerpt.contains_buffer_range(range.clone()) {
-                        let result = excerpt.map_range_from_buffer(range);
-                        return Some(
-                            result.start.to_display_point(map)..result.end.to_display_point(map),
-                        );
-                    }
-                }
-            }
-        }
-        last_child_node = cur_node.parent();
-    }
-    None
-}
-
-/// Returns a range that surrounds the word and following whitespace
-/// relative_to is in.
-///
-/// If `relative_to` is at the start of a word, return the word and following whitespace.
-/// If `relative_to` is between words, return the whitespace back and the following word.
-///
-/// if in word
-///   delete that word
-///   if there is whitespace following the word, delete that as well
-///   otherwise, delete any preceding whitespace
-/// otherwise
-///   delete whitespace around cursor
-///   delete word following the cursor
-fn around_word(
-    map: &DisplaySnapshot,
-    relative_to: DisplayPoint,
-    ignore_punctuation: bool,
-) -> Option<Range<DisplayPoint>> {
-    let offset = relative_to.to_offset(map, Bias::Left);
-    let classifier = map
-        .buffer_snapshot()
-        .char_classifier_at(offset)
-        .ignore_punctuation(ignore_punctuation);
-    let in_word = map
-        .buffer_chars_at(offset)
-        .next()
-        .map(|(c, _)| !classifier.is_whitespace(c))
-        .unwrap_or(false);
-
-    if in_word {
-        around_containing_word(map, relative_to, ignore_punctuation)
-    } else {
-        around_next_word(map, relative_to, ignore_punctuation)
-    }
-}
-
-fn around_subword(
-    map: &DisplaySnapshot,
-    relative_to: DisplayPoint,
-    ignore_punctuation: bool,
-) -> Option<Range<DisplayPoint>> {
-    // Use motion::right so that we consider the character under the cursor when looking for the start
-    let classifier = map
-        .buffer_snapshot()
-        .char_classifier_at(relative_to.to_point(map))
-        .ignore_punctuation(ignore_punctuation);
-    let start = movement::find_preceding_boundary_display_point(
-        map,
-        right(map, relative_to, 1),
-        movement::FindRange::SingleLine,
-        |left, right| {
-            let is_word_start = classifier.kind(left) != classifier.kind(right);
-            let is_subword_start = classifier.is_word('-') && left != '-' && right == '-'
-                || left != '_' && right == '_'
-                || left.is_lowercase() && right.is_uppercase();
-            is_word_start || is_subword_start
-        },
-    );
-
-    let end = movement::find_boundary(map, relative_to, FindRange::SingleLine, |left, right| {
-        let is_word_end = classifier.kind(left) != classifier.kind(right);
-        let is_subword_end = classifier.is_word('-') && left != '-' && right == '-'
-            || left != '_' && right == '_'
-            || left.is_lowercase() && right.is_uppercase();
-        is_word_end || is_subword_end
-    });
-
-    Some(start..end).map(|range| expand_to_include_whitespace(map, range, true))
-}
-
-fn around_containing_word(
-    map: &DisplaySnapshot,
-    relative_to: DisplayPoint,
-    ignore_punctuation: bool,
-) -> Option<Range<DisplayPoint>> {
-    in_word(map, relative_to, ignore_punctuation).map(|range| {
-        let line_start = DisplayPoint::new(range.start.row(), 0);
-        let is_first_word = map
-            .buffer_chars_at(line_start.to_offset(map, Bias::Left))
-            .take_while(|(ch, offset)| {
-                offset < &range.start.to_offset(map, Bias::Left) && ch.is_whitespace()
-            })
-            .count()
-            > 0;
-
-        if is_first_word {
-            // For first word on line, trim indentation
-            let mut expanded = expand_to_include_whitespace(map, range.clone(), true);
-            expanded.start = range.start;
-            expanded
-        } else {
-            expand_to_include_whitespace(map, range, true)
-        }
-    })
-}
-
-fn around_next_word(
-    map: &DisplaySnapshot,
-    relative_to: DisplayPoint,
-    ignore_punctuation: bool,
-) -> Option<Range<DisplayPoint>> {
-    let classifier = map
-        .buffer_snapshot()
-        .char_classifier_at(relative_to.to_point(map))
-        .ignore_punctuation(ignore_punctuation);
-    // Get the start of the word
-    let start = movement::find_preceding_boundary_display_point(
-        map,
-        right(map, relative_to, 1),
-        FindRange::SingleLine,
-        |left, right| classifier.kind(left) != classifier.kind(right),
-    );
-
-    let mut word_found = false;
-    let end = movement::find_boundary(map, relative_to, FindRange::MultiLine, |left, right| {
-        let left_kind = classifier.kind(left);
-        let right_kind = classifier.kind(right);
-
-        let found = (word_found && left_kind != right_kind) || right == '\n' && left == '\n';
-
-        if right_kind != CharKind::Whitespace {
-            word_found = true;
-        }
-
-        found
-    });
-
-    Some(start..end)
-}
-
-fn entire_file(map: &DisplaySnapshot) -> Option<Range<DisplayPoint>> {
-    Some(DisplayPoint::zero()..map.max_point())
-}
-
-fn text_object(
-    map: &DisplaySnapshot,
-    relative_to: DisplayPoint,
-    target: TextObject,
-) -> Option<Range<DisplayPoint>> {
-    let snapshot = &map.buffer_snapshot();
-    let offset = relative_to.to_offset(map, Bias::Left);
-
-    let mut excerpt = snapshot.excerpt_containing(offset..offset)?;
-    let buffer = excerpt.buffer();
-    let offset = excerpt.map_offset_to_buffer(offset);
-
-    let mut matches: Vec<Range<usize>> = buffer
-        .text_object_ranges(offset..offset, TreeSitterOptions::default())
-        .filter_map(|(r, m)| if m == target { Some(r) } else { None })
-        .collect();
-    matches.sort_by_key(|r| r.end - r.start);
-    if let Some(buffer_range) = matches.first() {
-        let buffer_range = BufferOffset(buffer_range.start)..BufferOffset(buffer_range.end);
-        let range = excerpt.map_range_from_buffer(buffer_range);
-        return Some(range.start.to_display_point(map)..range.end.to_display_point(map));
-    }
-
-    let around = target.around()?;
-    let mut matches: Vec<Range<usize>> = buffer
-        .text_object_ranges(offset..offset, TreeSitterOptions::default())
-        .filter_map(|(r, m)| if m == around { Some(r) } else { None })
-        .collect();
-    matches.sort_by_key(|r| r.end - r.start);
-    let around_range = matches.first()?;
-
-    let mut matches: Vec<Range<usize>> = buffer
-        .text_object_ranges(around_range.clone(), TreeSitterOptions::default())
-        .filter_map(|(r, m)| if m == target { Some(r) } else { None })
-        .collect();
-    matches.sort_by_key(|r| r.start);
-    if let Some(buffer_range) = matches.first()
-        && !buffer_range.is_empty()
-    {
-        let buffer_range = BufferOffset(buffer_range.start)..BufferOffset(buffer_range.end);
-        let range = excerpt.map_range_from_buffer(buffer_range);
-        return Some(range.start.to_display_point(map)..range.end.to_display_point(map));
-    }
-    let around_range = BufferOffset(around_range.start)..BufferOffset(around_range.end);
-    let buffer_range = excerpt.map_range_from_buffer(around_range);
-    return Some(buffer_range.start.to_display_point(map)..buffer_range.end.to_display_point(map));
-}
-
-fn argument(
-    map: &DisplaySnapshot,
-    relative_to: DisplayPoint,
-    around: bool,
-) -> Option<Range<DisplayPoint>> {
-    let snapshot = &map.buffer_snapshot();
-    let offset = relative_to.to_offset(map, Bias::Left);
-
-    // The `argument` vim text object uses the syntax tree, so we operate at the buffer level and map back to the display level
-    let mut excerpt = snapshot.excerpt_containing(offset..offset)?;
-    let buffer = excerpt.buffer();
-
-    fn comma_delimited_range_at(
-        buffer: &BufferSnapshot,
-        mut offset: BufferOffset,
-        include_comma: bool,
-    ) -> Option<Range<BufferOffset>> {
-        // Seek to the first non-whitespace character
-        offset += buffer
-            .chars_at(offset)
-            .take_while(|c| c.is_whitespace())
-            .map(char::len_utf8)
-            .sum::<usize>();
-
-        let bracket_filter = |open: Range<usize>, close: Range<usize>| {
-            // Filter out empty ranges
-            if open.end == close.start {
-                return false;
-            }
-
-            // If the cursor is outside the brackets, ignore them
-            if open.start == offset.0 || close.end == offset.0 {
-                return false;
-            }
-
-            // TODO: Is there any better way to filter out string brackets?
-            // Used to filter out string brackets
-            matches!(
-                buffer.chars_at(open.start).next(),
-                Some('(' | '[' | '{' | '<' | '|')
-            )
-        };
-
-        // Find the brackets containing the cursor
-        let (open_bracket, close_bracket) =
-            buffer.innermost_enclosing_bracket_ranges(offset..offset, Some(&bracket_filter))?;
-
-        let inner_bracket_range = BufferOffset(open_bracket.end)..BufferOffset(close_bracket.start);
-
-        let layer = buffer.syntax_layer_at(offset)?;
-        let node = layer.node();
-        let mut cursor = node.walk();
-
-        // Loop until we find the smallest node whose parent covers the bracket range. This node is the argument in the parent argument list
-        let mut parent_covers_bracket_range = false;
-        loop {
-            let node = cursor.node();
-            let range = node.byte_range();
-            let covers_bracket_range =
-                range.start == open_bracket.start && range.end == close_bracket.end;
-            if parent_covers_bracket_range && !covers_bracket_range {
-                break;
-            }
-            parent_covers_bracket_range = covers_bracket_range;
-
-            // Unable to find a child node with a parent that covers the bracket range, so no argument to select
-            cursor.goto_first_child_for_byte(offset.0)?;
-        }
-
-        let mut argument_node = cursor.node();
-
-        // If the child node is the open bracket, move to the next sibling.
-        if argument_node.byte_range() == open_bracket {
-            if !cursor.goto_next_sibling() {
-                return Some(inner_bracket_range);
-            }
-            argument_node = cursor.node();
-        }
-        // While the child node is the close bracket or a comma, move to the previous sibling
-        while argument_node.byte_range() == close_bracket || argument_node.kind() == "," {
-            if !cursor.goto_previous_sibling() {
-                return Some(inner_bracket_range);
-            }
-            argument_node = cursor.node();
-            if argument_node.byte_range() == open_bracket {
-                return Some(inner_bracket_range);
-            }
-        }
-
-        // The start and end of the argument range, defaulting to the start and end of the argument node
-        let mut start = argument_node.start_byte();
-        let mut end = argument_node.end_byte();
-
-        let mut needs_surrounding_comma = include_comma;
-
-        // Seek backwards to find the start of the argument - either the previous comma or the opening bracket.
-        // We do this because multiple nodes can represent a single argument, such as with rust `vec![a.b.c, d.e.f]`
-        while cursor.goto_previous_sibling() {
-            let prev = cursor.node();
-
-            if prev.start_byte() < open_bracket.end {
-                start = open_bracket.end;
-                break;
-            } else if prev.kind() == "," {
-                if needs_surrounding_comma {
-                    start = prev.start_byte();
-                    needs_surrounding_comma = false;
-                }
-                break;
-            } else if prev.start_byte() < start {
-                start = prev.start_byte();
-            }
-        }
-
-        // Do the same for the end of the argument, extending to next comma or the end of the argument list
-        while cursor.goto_next_sibling() {
-            let next = cursor.node();
-
-            if next.end_byte() > close_bracket.start {
-                end = close_bracket.start;
-                break;
-            } else if next.kind() == "," {
-                if needs_surrounding_comma {
-                    // Select up to the beginning of the next argument if there is one, otherwise to the end of the comma
-                    if let Some(next_arg) = next.next_sibling() {
-                        end = next_arg.start_byte();
-                    } else {
-                        end = next.end_byte();
-                    }
-                }
-                break;
-            } else if next.end_byte() > end {
-                end = next.end_byte();
-            }
-        }
-
-        Some(BufferOffset(start)..BufferOffset(end))
-    }
-
-    let result = comma_delimited_range_at(buffer, excerpt.map_offset_to_buffer(offset), around)?;
-
-    if excerpt.contains_buffer_range(result.clone()) {
-        let result = excerpt.map_range_from_buffer(result);
-        Some(result.start.to_display_point(map)..result.end.to_display_point(map))
-    } else {
-        None
-    }
-}
-
-fn indent(
-    map: &DisplaySnapshot,
-    relative_to: DisplayPoint,
-    around: bool,
-    include_below: bool,
-) -> Option<Range<DisplayPoint>> {
-    let point = relative_to.to_point(map);
-    let row = point.row;
-
-    let desired_indent = map.line_indent_for_buffer_row(MultiBufferRow(row));
-
-    // Loop backwards until we find a non-blank line with less indent
-    let mut start_row = row;
-    for prev_row in (0..row).rev() {
-        let indent = map.line_indent_for_buffer_row(MultiBufferRow(prev_row));
-        if indent.is_line_empty() {
-            continue;
-        }
-        if indent.spaces < desired_indent.spaces || indent.tabs < desired_indent.tabs {
-            if around {
-                // When around is true, include the first line with less indent
-                start_row = prev_row;
-            }
-            break;
-        }
-        start_row = prev_row;
-    }
-
-    // Loop forwards until we find a non-blank line with less indent
-    let mut end_row = row;
-    let max_rows = map.buffer_snapshot().max_row().0;
-    for next_row in (row + 1)..=max_rows {
-        let indent = map.line_indent_for_buffer_row(MultiBufferRow(next_row));
-        if indent.is_line_empty() {
-            continue;
-        }
-        if indent.spaces < desired_indent.spaces || indent.tabs < desired_indent.tabs {
-            if around && include_below {
-                // When around is true and including below, include this line
-                end_row = next_row;
-            }
-            break;
-        }
-        end_row = next_row;
-    }
-
-    let end_len = map.buffer_snapshot().line_len(MultiBufferRow(end_row));
-    let start = map.point_to_display_point(Point::new(start_row, 0), Bias::Right);
-    let end = map.point_to_display_point(Point::new(end_row, end_len), Bias::Left);
-    Some(start..end)
-}
-
-fn sentence(
-    map: &DisplaySnapshot,
-    relative_to: DisplayPoint,
-    around: bool,
-) -> Option<Range<DisplayPoint>> {
-    let mut start = None;
-    let relative_offset = relative_to.to_offset(map, Bias::Left);
-    let mut previous_end = relative_offset;
-
-    let mut chars = map.buffer_chars_at(previous_end).peekable();
-
-    // Search backwards for the previous sentence end or current sentence start. Include the character under relative_to
-    for (char, offset) in chars
-        .peek()
-        .cloned()
-        .into_iter()
-        .chain(map.reverse_buffer_chars_at(previous_end))
-    {
-        if is_sentence_end(map, offset) {
-            break;
-        }
-
-        if is_possible_sentence_start(char) {
-            start = Some(offset);
-        }
-
-        previous_end = offset;
-    }
-
-    // Search forward for the end of the current sentence or if we are between sentences, the start of the next one
-    let mut end = relative_offset;
-    for (char, offset) in chars {
-        if start.is_none() && is_possible_sentence_start(char) {
-            if around {
-                start = Some(offset);
-                continue;
-            } else {
-                end = offset;
-                break;
-            }
-        }
-
-        if char != '\n' {
-            end = offset + char.len_utf8();
-        }
-
-        if is_sentence_end(map, end) {
-            break;
-        }
-    }
-
-    let mut range = start.unwrap_or(previous_end).to_display_point(map)..end.to_display_point(map);
-    if around {
-        range = expand_to_include_whitespace(map, range, false);
-    }
-
-    Some(range)
-}
-
-fn is_possible_sentence_start(character: char) -> bool {
-    !character.is_whitespace() && character != '.'
-}
-
-const SENTENCE_END_PUNCTUATION: &[char] = &['.', '!', '?'];
-const SENTENCE_END_FILLERS: &[char] = &[')', ']', '"', '\''];
-const SENTENCE_END_WHITESPACE: &[char] = &[' ', '\t', '\n'];
-fn is_sentence_end(map: &DisplaySnapshot, offset: MultiBufferOffset) -> bool {
-    let mut next_chars = map.buffer_chars_at(offset).peekable();
-    if let Some((char, _)) = next_chars.next() {
-        // We are at a double newline. This position is a sentence end.
-        if char == '\n' && next_chars.peek().map(|(c, _)| c == &'\n').unwrap_or(false) {
-            return true;
-        }
-
-        // The next text is not a valid whitespace. This is not a sentence end
-        if !SENTENCE_END_WHITESPACE.contains(&char) {
-            return false;
-        }
-    }
-
-    for (char, _) in map.reverse_buffer_chars_at(offset) {
-        if SENTENCE_END_PUNCTUATION.contains(&char) {
-            return true;
-        }
-
-        if !SENTENCE_END_FILLERS.contains(&char) {
-            return false;
-        }
-    }
-
-    false
-}
-
-/// Expands the passed range to include whitespace on one side or the other in a line. Attempts to add the
-/// whitespace to the end first and falls back to the start if there was none.
-pub fn expand_to_include_whitespace(
-    map: &DisplaySnapshot,
-    range: Range<DisplayPoint>,
-    stop_at_newline: bool,
-) -> Range<DisplayPoint> {
-    let mut range = range.start.to_offset(map, Bias::Left)..range.end.to_offset(map, Bias::Right);
-    let mut whitespace_included = false;
-
-    let chars = map.buffer_chars_at(range.end).peekable();
-    for (char, offset) in chars {
-        if char == '\n' && stop_at_newline {
-            break;
-        }
-
-        if char.is_whitespace() {
-            if char != '\n' {
-                range.end = offset + char.len_utf8();
-                whitespace_included = true;
-            }
-        } else {
-            // Found non whitespace. Quit out.
-            break;
-        }
-    }
-
-    if !whitespace_included {
-        for (char, point) in map.reverse_buffer_chars_at(range.start) {
-            if char == '\n' && stop_at_newline {
-                break;
-            }
-
-            if !char.is_whitespace() {
-                break;
-            }
-
-            range.start = point;
-        }
-    }
-
-    range.start.to_display_point(map)..range.end.to_display_point(map)
-}
-
-/// If not `around` (i.e. inner), returns a range that surrounds the paragraph
-/// where `relative_to` is in. If `around`, principally returns the range ending
-/// at the end of the next paragraph.
-///
-/// Here, the "paragraph" is defined as a block of non-blank lines or a block of
-/// blank lines. If the paragraph ends with a trailing newline (i.e. not with
-/// EOF), the returned range ends at the trailing newline of the paragraph (i.e.
-/// the trailing newline is not subject to subsequent operations).
-///
-/// Edge cases:
-/// - If `around` and if the current paragraph is the last paragraph of the
-///   file and is blank, then the selection results in an error.
-/// - If `around` and if the current paragraph is the last paragraph of the
-///   file and is not blank, then the returned range starts at the start of the
-///   previous paragraph, if it exists.
-fn paragraph(
-    map: &DisplaySnapshot,
-    relative_to: DisplayPoint,
-    around: bool,
-    times: usize,
-) -> Option<Range<DisplayPoint>> {
-    let mut paragraph_start = start_of_paragraph(map, relative_to);
-    let mut paragraph_end = end_of_paragraph(map, relative_to);
-
-    for i in 0..times {
-        let paragraph_end_row = paragraph_end.row();
-        let paragraph_ends_with_eof = paragraph_end_row == map.max_point().row();
-        let point = relative_to.to_point(map);
-        let current_line_is_empty = map
-            .buffer_snapshot()
-            .is_line_blank(MultiBufferRow(point.row));
-
-        if around {
-            if paragraph_ends_with_eof {
-                if current_line_is_empty {
-                    return None;
-                }
-
-                let paragraph_start_buffer_point = paragraph_start.to_point(map);
-                if paragraph_start_buffer_point.row != 0 {
-                    let previous_paragraph_last_line_start =
-                        Point::new(paragraph_start_buffer_point.row - 1, 0).to_display_point(map);
-                    paragraph_start = start_of_paragraph(map, previous_paragraph_last_line_start);
-                }
-            } else {
-                let paragraph_end_buffer_point = paragraph_end.to_point(map);
-                let mut start_row = paragraph_end_buffer_point.row + 1;
-                if i > 0 {
-                    start_row += 1;
-                }
-                let next_paragraph_start = Point::new(start_row, 0).to_display_point(map);
-                paragraph_end = end_of_paragraph(map, next_paragraph_start);
-            }
-        }
-    }
-
-    let range = paragraph_start..paragraph_end;
-    Some(range)
-}
-
-/// Returns a position of the start of the current paragraph, where a paragraph
-/// is defined as a run of non-blank lines or a run of blank lines.
-pub fn start_of_paragraph(map: &DisplaySnapshot, display_point: DisplayPoint) -> DisplayPoint {
-    let point = display_point.to_point(map);
-    if point.row == 0 {
-        return DisplayPoint::zero();
-    }
-
-    let is_current_line_blank = map
-        .buffer_snapshot()
-        .is_line_blank(MultiBufferRow(point.row));
-
-    for row in (0..point.row).rev() {
-        let blank = map.buffer_snapshot().is_line_blank(MultiBufferRow(row));
-        if blank != is_current_line_blank {
-            return Point::new(row + 1, 0).to_display_point(map);
-        }
-    }
-
-    DisplayPoint::zero()
-}
-
-/// Returns a position of the end of the current paragraph, where a paragraph
-/// is defined as a run of non-blank lines or a run of blank lines.
-/// The trailing newline is excluded from the paragraph.
-pub fn end_of_paragraph(map: &DisplaySnapshot, display_point: DisplayPoint) -> DisplayPoint {
-    let point = display_point.to_point(map);
-    if point.row == map.buffer_snapshot().max_row().0 {
-        return map.max_point();
-    }
-
-    let is_current_line_blank = map
-        .buffer_snapshot()
-        .is_line_blank(MultiBufferRow(point.row));
-
-    for row in point.row + 1..map.buffer_snapshot().max_row().0 + 1 {
-        let blank = map.buffer_snapshot().is_line_blank(MultiBufferRow(row));
-        if blank != is_current_line_blank {
-            let previous_row = row - 1;
-            return Point::new(
-                previous_row,
-                map.buffer_snapshot().line_len(MultiBufferRow(previous_row)),
-            )
-            .to_display_point(map);
-        }
-    }
-
-    map.max_point()
-}
-
-pub fn surrounding_markers(
-    map: &DisplaySnapshot,
-    relative_to: DisplayPoint,
-    around: bool,
-    search_across_lines: bool,
-    open_marker: char,
-    close_marker: char,
-) -> Option<Range<DisplayPoint>> {
-    let point = relative_to.to_offset(map, Bias::Left);
-
-    let mut matched_closes = 0;
-    let mut opening = None;
-
-    let mut before_ch = match movement::chars_before(map, point).next() {
-        Some((ch, _)) => ch,
-        _ => '\0',
-    };
-    if let Some((ch, range)) = movement::chars_after(map, point).next()
-        && ch == open_marker
-        && before_ch != '\\'
-    {
-        if open_marker == close_marker {
-            let mut total = 0;
-            for ((ch, _), (before_ch, _)) in movement::chars_before(map, point).tuple_windows() {
-                if ch == '\n' {
-                    break;
-                }
-                if ch == open_marker && before_ch != '\\' {
-                    total += 1;
-                }
-            }
-            if total % 2 == 0 {
-                opening = Some(range)
-            }
-        } else {
-            opening = Some(range)
-        }
-    }
-
-    if opening.is_none() {
-        let mut chars_before = movement::chars_before(map, point).peekable();
-        while let Some((ch, range)) = chars_before.next() {
-            if ch == '\n' && !search_across_lines {
-                break;
-            }
-
-            if let Some((before_ch, _)) = chars_before.peek()
-                && *before_ch == '\\'
-            {
-                continue;
-            }
-
-            if ch == open_marker {
-                if matched_closes == 0 {
-                    opening = Some(range);
-                    break;
-                }
-                matched_closes -= 1;
-            } else if ch == close_marker {
-                matched_closes += 1
-            }
-        }
-    }
-    if opening.is_none() {
-        for (ch, range) in movement::chars_after(map, point) {
-            if before_ch != '\\' {
-                if ch == open_marker {
-                    opening = Some(range);
-                    break;
-                } else if ch == close_marker {
-                    break;
-                }
-            }
-
-            before_ch = ch;
-        }
-    }
-
-    let mut opening = opening?;
-
-    let mut matched_opens = 0;
-    let mut closing = None;
-    before_ch = match movement::chars_before(map, opening.end).next() {
-        Some((ch, _)) => ch,
-        _ => '\0',
-    };
-    for (ch, range) in movement::chars_after(map, opening.end) {
-        if ch == '\n' && !search_across_lines {
-            break;
-        }
-
-        if before_ch != '\\' {
-            if ch == close_marker {
-                if matched_opens == 0 {
-                    closing = Some(range);
-                    break;
-                }
-                matched_opens -= 1;
-            } else if ch == open_marker {
-                matched_opens += 1;
-            }
-        }
-
-        before_ch = ch;
-    }
-
-    let mut closing = closing?;
-
-    if around && !search_across_lines {
-        let mut found = false;
-
-        for (ch, range) in movement::chars_after(map, closing.end) {
-            if ch.is_whitespace() && ch != '\n' {
-                found = true;
-                closing.end = range.end;
-            } else {
-                break;
-            }
-        }
-
-        if !found {
-            for (ch, range) in movement::chars_before(map, opening.start) {
-                if ch.is_whitespace() && ch != '\n' {
-                    opening.start = range.start
-                } else {
-                    break;
-                }
-            }
-        }
-    }
-
-    // Adjust selection to remove leading and trailing whitespace for multiline inner brackets
-    if !around && open_marker != close_marker {
-        let start_point = opening.end.to_display_point(map);
-        let end_point = closing.start.to_display_point(map);
-        let start_offset = start_point.to_offset(map, Bias::Left);
-        let end_offset = end_point.to_offset(map, Bias::Left);
-
-        if start_point.row() != end_point.row()
-            && map
-                .buffer_chars_at(start_offset)
-                .take_while(|(_, offset)| offset < &end_offset)
-                .any(|(ch, _)| !ch.is_whitespace())
-        {
-            let mut first_non_ws = None;
-            let mut last_non_ws = None;
-            for (ch, offset) in map.buffer_chars_at(start_offset) {
-                if !ch.is_whitespace() {
-                    first_non_ws = Some(offset);
-                    break;
-                }
-            }
-            for (ch, offset) in map.reverse_buffer_chars_at(end_offset) {
-                if !ch.is_whitespace() {
-                    last_non_ws = Some(offset + ch.len_utf8());
-                    break;
-                }
-            }
-            if let Some(start) = first_non_ws {
-                opening.end = start;
-            }
-            if let Some(end) = last_non_ws {
-                closing.start = end;
-            }
-        }
-    }
-
-    let result = if around {
-        opening.start..closing.end
-    } else {
-        opening.end..closing.start
-    };
-
-    Some(
-        map.clip_point(result.start.to_display_point(map), Bias::Left)
-            ..map.clip_point(result.end.to_display_point(map), Bias::Right),
-    )
-}
-
-#[cfg(test)]
-mod test {
-    use editor::{Editor, EditorMode, MultiBuffer, test::editor_test_context::EditorTestContext};
-    use gpui::KeyBinding;
-    use indoc::indoc;
-    use text::Point;
-
-    use crate::{
-        object::{AnyBrackets, AnyQuotes, MiniBrackets},
-        state::Mode,
-        test::{NeovimBackedTestContext, VimTestContext},
-    };
-
-    const WORD_LOCATIONS: &str = indoc! {"
-        The quick ˇbrowˇnˇ•••
-        fox ˇjuˇmpsˇ over
-        the lazy dogˇ••
-        ˇ
-        ˇ
-        ˇ
-        Thˇeˇ-ˇquˇickˇ ˇbrownˇ•
-        ˇ••
-        ˇ••
-        ˇ  fox-jumpˇs over
-        the lazy dogˇ•
-        ˇ
-        "
-    };
-
-    #[gpui::test]
-    async fn test_change_word_object(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.simulate_at_each_offset("c i w", WORD_LOCATIONS)
-            .await
-            .assert_matches();
-        cx.simulate_at_each_offset("c i shift-w", WORD_LOCATIONS)
-            .await
-            .assert_matches();
-        cx.simulate_at_each_offset("c a w", WORD_LOCATIONS)
-            .await
-            .assert_matches();
-        cx.simulate_at_each_offset("c a shift-w", WORD_LOCATIONS)
-            .await
-            .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_delete_word_object(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.simulate_at_each_offset("d i w", WORD_LOCATIONS)
-            .await
-            .assert_matches();
-        cx.simulate_at_each_offset("d i shift-w", WORD_LOCATIONS)
-            .await
-            .assert_matches();
-        cx.simulate_at_each_offset("d a w", WORD_LOCATIONS)
-            .await
-            .assert_matches();
-        cx.simulate_at_each_offset("d a shift-w", WORD_LOCATIONS)
-            .await
-            .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_visual_word_object(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        /*
-                cx.set_shared_state("The quick ˇbrown\nfox").await;
-                cx.simulate_shared_keystrokes(["v"]).await;
-                cx.assert_shared_state("The quick «bˇ»rown\nfox").await;
-                cx.simulate_shared_keystrokes(["i", "w"]).await;
-                cx.assert_shared_state("The quick «brownˇ»\nfox").await;
-        */
-        cx.set_shared_state("The quick brown\nˇ\nfox").await;
-        cx.simulate_shared_keystrokes("v").await;
-        cx.shared_state()
-            .await
-            .assert_eq("The quick brown\n«\nˇ»fox");
-        cx.simulate_shared_keystrokes("i w").await;
-        cx.shared_state()
-            .await
-            .assert_eq("The quick brown\n«\nˇ»fox");
-
-        cx.simulate_at_each_offset("v i w", WORD_LOCATIONS)
-            .await
-            .assert_matches();
-        cx.simulate_at_each_offset("v i shift-w", WORD_LOCATIONS)
-            .await
-            .assert_matches();
-    }
-
-    const PARAGRAPH_EXAMPLES: &[&str] = &[
-        // Single line
-        "ˇThe quick brown fox jumpˇs over the lazy dogˇ.ˇ",
-        // Multiple lines without empty lines
-        indoc! {"
-            ˇThe quick brownˇ
-            ˇfox jumps overˇ
-            the lazy dog.ˇ
-        "},
-        // Heading blank paragraph and trailing normal paragraph
-        indoc! {"
-            ˇ
-            ˇ
-            ˇThe quick brown fox jumps
-            ˇover the lazy dog.
-            ˇ
-            ˇ
-            ˇThe quick brown fox jumpsˇ
-            ˇover the lazy dog.ˇ
-        "},
-        // Inserted blank paragraph and trailing blank paragraph
-        indoc! {"
-            ˇThe quick brown fox jumps
-            ˇover the lazy dog.
-            ˇ
-            ˇ
-            ˇ
-            ˇThe quick brown fox jumpsˇ
-            ˇover the lazy dog.ˇ
-            ˇ
-            ˇ
-            ˇ
-        "},
-        // "Blank" paragraph with whitespace characters
-        indoc! {"
-            ˇThe quick brown fox jumps
-            over the lazy dog.
-
-            ˇ \t
-
-            ˇThe quick brown fox jumps
-            over the lazy dog.ˇ
-            ˇ
-            ˇ \t
-            \t \t
-        "},
-        // Single line "paragraphs", where selection size might be zero.
-        indoc! {"
-            ˇThe quick brown fox jumps over the lazy dog.
-            ˇ
-            ˇThe quick brown fox jumpˇs over the lazy dog.ˇ
-            ˇ
-        "},
-    ];
-
-    #[gpui::test]
-    async fn test_change_paragraph_object(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        for paragraph_example in PARAGRAPH_EXAMPLES {
-            cx.simulate_at_each_offset("c i p", paragraph_example)
-                .await
-                .assert_matches();
-            cx.simulate_at_each_offset("c a p", paragraph_example)
-                .await
-                .assert_matches();
-        }
-    }
-
-    #[gpui::test]
-    async fn test_delete_paragraph_object(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        for paragraph_example in PARAGRAPH_EXAMPLES {
-            cx.simulate_at_each_offset("d i p", paragraph_example)
-                .await
-                .assert_matches();
-            cx.simulate_at_each_offset("d a p", paragraph_example)
-                .await
-                .assert_matches();
-        }
-    }
-
-    #[gpui::test]
-    async fn test_visual_paragraph_object(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        const EXAMPLES: &[&str] = &[
-            indoc! {"
-                ˇThe quick brown
-                fox jumps over
-                the lazy dog.
-            "},
-            indoc! {"
-                ˇ
-
-                ˇThe quick brown fox jumps
-                over the lazy dog.
-                ˇ
-
-                ˇThe quick brown fox jumps
-                over the lazy dog.
-            "},
-            indoc! {"
-                ˇThe quick brown fox jumps over the lazy dog.
-                ˇ
-                ˇThe quick brown fox jumps over the lazy dog.
-
-            "},
-        ];
-
-        for paragraph_example in EXAMPLES {
-            cx.simulate_at_each_offset("v i p", paragraph_example)
-                .await
-                .assert_matches();
-            cx.simulate_at_each_offset("v a p", paragraph_example)
-                .await
-                .assert_matches();
-        }
-    }
-
-    #[gpui::test]
-    async fn test_change_paragraph_object_with_soft_wrap(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        const WRAPPING_EXAMPLE: &str = indoc! {"
-            ˇFirst paragraph with very long text that will wrap when soft wrap is enabled and line length is ˇlimited making it span multiple display lines.
-
-            ˇSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and ˇshould be handled correctly.
-
-            ˇThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping ˇsettings.ˇ
-        "};
-
-        cx.set_shared_wrap(20).await;
-
-        cx.simulate_at_each_offset("c i p", WRAPPING_EXAMPLE)
-            .await
-            .assert_matches();
-        cx.simulate_at_each_offset("c a p", WRAPPING_EXAMPLE)
-            .await
-            .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_delete_paragraph_object_with_soft_wrap(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        const WRAPPING_EXAMPLE: &str = indoc! {"
-            ˇFirst paragraph with very long text that will wrap when soft wrap is enabled and line length is ˇlimited making it span multiple display lines.
-
-            ˇSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and ˇshould be handled correctly.
-
-            ˇThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping ˇsettings.ˇ
-        "};
-
-        cx.set_shared_wrap(20).await;
-
-        cx.simulate_at_each_offset("d i p", WRAPPING_EXAMPLE)
-            .await
-            .assert_matches();
-        cx.simulate_at_each_offset("d a p", WRAPPING_EXAMPLE)
-            .await
-            .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_delete_paragraph_whitespace(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {"
-            a
-                   ˇ•
-            aaaaaaaaaaaaa
-        "})
-            .await;
-
-        cx.simulate_shared_keystrokes("d i p").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            a
-            aaaaaaaˇaaaaaa
-        "});
-    }
-
-    #[gpui::test]
-    async fn test_visual_paragraph_object_with_soft_wrap(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        const WRAPPING_EXAMPLE: &str = indoc! {"
-            ˇFirst paragraph with very long text that will wrap when soft wrap is enabled and line length is ˇlimited making it span multiple display lines.
-
-            ˇSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and ˇshould be handled correctly.
-
-            ˇThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping ˇsettings.ˇ
-        "};
-
-        cx.set_shared_wrap(20).await;
-
-        cx.simulate_at_each_offset("v i p", WRAPPING_EXAMPLE)
-            .await
-            .assert_matches();
-        cx.simulate_at_each_offset("v a p", WRAPPING_EXAMPLE)
-            .await
-            .assert_matches();
-    }
-
-    // Test string with "`" for opening surrounders and "'" for closing surrounders
-    const SURROUNDING_MARKER_STRING: &str = indoc! {"
-        ˇTh'ˇe ˇ`ˇ'ˇquˇi`ˇck broˇ'wn`
-        'ˇfox juˇmps ov`ˇer
-        the ˇlazy d'o`ˇg"};
-
-    const SURROUNDING_OBJECTS: &[(char, char)] = &[
-        ('"', '"'), // Double Quote
-        ('(', ')'), // Parentheses
-    ];
-
-    #[gpui::test]
-    async fn test_change_surrounding_character_objects(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        for (start, end) in SURROUNDING_OBJECTS {
-            let marked_string = SURROUNDING_MARKER_STRING
-                .replace('`', &start.to_string())
-                .replace('\'', &end.to_string());
-
-            cx.simulate_at_each_offset(&format!("c i {start}"), &marked_string)
-                .await
-                .assert_matches();
-            cx.simulate_at_each_offset(&format!("c i {end}"), &marked_string)
-                .await
-                .assert_matches();
-            cx.simulate_at_each_offset(&format!("c a {start}"), &marked_string)
-                .await
-                .assert_matches();
-            cx.simulate_at_each_offset(&format!("c a {end}"), &marked_string)
-                .await
-                .assert_matches();
-        }
-    }
-    #[gpui::test]
-    async fn test_singleline_surrounding_character_objects(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.set_shared_wrap(12).await;
-
-        cx.set_shared_state(indoc! {
-            "\"ˇhello world\"!"
-        })
-        .await;
-        cx.simulate_shared_keystrokes("v i \"").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "\"«hello worldˇ»\"!"
-        });
-
-        cx.set_shared_state(indoc! {
-            "\"hˇello world\"!"
-        })
-        .await;
-        cx.simulate_shared_keystrokes("v i \"").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "\"«hello worldˇ»\"!"
-        });
-
-        cx.set_shared_state(indoc! {
-            "helˇlo \"world\"!"
-        })
-        .await;
-        cx.simulate_shared_keystrokes("v i \"").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "hello \"«worldˇ»\"!"
-        });
-
-        cx.set_shared_state(indoc! {
-            "hello \"wˇorld\"!"
-        })
-        .await;
-        cx.simulate_shared_keystrokes("v i \"").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "hello \"«worldˇ»\"!"
-        });
-
-        cx.set_shared_state(indoc! {
-            "hello \"wˇorld\"!"
-        })
-        .await;
-        cx.simulate_shared_keystrokes("v a \"").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "hello« \"world\"ˇ»!"
-        });
-
-        cx.set_shared_state(indoc! {
-            "hello \"wˇorld\" !"
-        })
-        .await;
-        cx.simulate_shared_keystrokes("v a \"").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "hello «\"world\" ˇ»!"
-        });
-
-        cx.set_shared_state(indoc! {
-            "hello \"wˇorld\"•
-            goodbye"
-        })
-        .await;
-        cx.simulate_shared_keystrokes("v a \"").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "hello «\"world\" ˇ»
-            goodbye"
-        });
-    }
-
-    #[gpui::test]
-    async fn test_multiline_surrounding_character_objects(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        cx.set_state(
-            indoc! {
-                "func empty(a string) bool {
-                   if a == \"\" {
-                      return true
-                   }
-                   ˇreturn false
-                }"
-            },
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("v i {");
-        cx.assert_state(
-            indoc! {
-                "func empty(a string) bool {
-                   «if a == \"\" {
-                      return true
-                   }
-                   return falseˇ»
-                }"
-            },
-            Mode::Visual,
-        );
-
-        cx.set_state(
-            indoc! {
-                "func empty(a string) bool {
-                     if a == \"\" {
-                         ˇreturn true
-                     }
-                     return false
-                }"
-            },
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("v i {");
-        cx.assert_state(
-            indoc! {
-                "func empty(a string) bool {
-                     if a == \"\" {
-                         «return trueˇ»
-                     }
-                     return false
-                }"
-            },
-            Mode::Visual,
-        );
-
-        cx.set_state(
-            indoc! {
-                "func empty(a string) bool {
-                     if a == \"\" ˇ{
-                         return true
-                     }
-                     return false
-                }"
-            },
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("v i {");
-        cx.assert_state(
-            indoc! {
-                "func empty(a string) bool {
-                     if a == \"\" {
-                         «return trueˇ»
-                     }
-                     return false
-                }"
-            },
-            Mode::Visual,
-        );
-
-        cx.set_state(
-            indoc! {
-                "func empty(a string) bool {
-                     if a == \"\" {
-                         return true
-                     }
-                     return false
-                ˇ}"
-            },
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("v i {");
-        cx.assert_state(
-            indoc! {
-                "func empty(a string) bool {
-                     «if a == \"\" {
-                         return true
-                     }
-                     return falseˇ»
-                }"
-            },
-            Mode::Visual,
-        );
-
-        cx.set_state(
-            indoc! {
-                "func empty(a string) bool {
-                             if a == \"\" {
-                             ˇ
-
-                             }"
-            },
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("c i {");
-        cx.assert_state(
-            indoc! {
-                "func empty(a string) bool {
-                             if a == \"\" {ˇ}"
-            },
-            Mode::Insert,
-        );
-    }
-
-    #[gpui::test]
-    async fn test_singleline_surrounding_character_objects_with_escape(
-        cx: &mut gpui::TestAppContext,
-    ) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.set_shared_state(indoc! {
-            "h\"e\\\"lˇlo \\\"world\"!"
-        })
-        .await;
-        cx.simulate_shared_keystrokes("v i \"").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "h\"«e\\\"llo \\\"worldˇ»\"!"
-        });
-
-        cx.set_shared_state(indoc! {
-            "hello \"teˇst \\\"inside\\\" world\""
-        })
-        .await;
-        cx.simulate_shared_keystrokes("v i \"").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "hello \"«test \\\"inside\\\" worldˇ»\""
-        });
-    }
-
-    #[gpui::test]
-    async fn test_vertical_bars(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-        cx.set_state(
-            indoc! {"
-            fn boop() {
-                baz(ˇ|a, b| { bar(|j, k| { })})
-            }"
-            },
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("c i |");
-        cx.assert_state(
-            indoc! {"
-            fn boop() {
-                baz(|ˇ| { bar(|j, k| { })})
-            }"
-            },
-            Mode::Insert,
-        );
-        cx.simulate_keystrokes("escape 1 8 |");
-        cx.assert_state(
-            indoc! {"
-            fn boop() {
-                baz(|| { bar(ˇ|j, k| { })})
-            }"
-            },
-            Mode::Normal,
-        );
-
-        cx.simulate_keystrokes("v a |");
-        cx.assert_state(
-            indoc! {"
-            fn boop() {
-                baz(|| { bar(«|j, k| ˇ»{ })})
-            }"
-            },
-            Mode::Visual,
-        );
-    }
-
-    #[gpui::test]
-    async fn test_argument_object(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        // Generic arguments
-        cx.set_state("fn boop<A: ˇDebug, B>() {}", Mode::Normal);
-        cx.simulate_keystrokes("v i a");
-        cx.assert_state("fn boop<«A: Debugˇ», B>() {}", Mode::Visual);
-
-        // Function arguments
-        cx.set_state(
-            "fn boop(ˇarg_a: (Tuple, Of, Types), arg_b: String) {}",
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("d a a");
-        cx.assert_state("fn boop(ˇarg_b: String) {}", Mode::Normal);
-
-        cx.set_state("std::namespace::test(\"strinˇg\", a.b.c())", Mode::Normal);
-        cx.simulate_keystrokes("v a a");
-        cx.assert_state("std::namespace::test(«\"string\", ˇ»a.b.c())", Mode::Visual);
-
-        // Tuple, vec, and array arguments
-        cx.set_state(
-            "fn boop(arg_a: (Tuple, Ofˇ, Types), arg_b: String) {}",
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("c i a");
-        cx.assert_state(
-            "fn boop(arg_a: (Tuple, ˇ, Types), arg_b: String) {}",
-            Mode::Insert,
-        );
-
-        // TODO regressed with the up-to-date Rust grammar.
-        // cx.set_state("let a = (test::call(), 'p', my_macro!{ˇ});", Mode::Normal);
-        // cx.simulate_keystrokes("c a a");
-        // cx.assert_state("let a = (test::call(), 'p'ˇ);", Mode::Insert);
-
-        cx.set_state("let a = [test::call(ˇ), 300];", Mode::Normal);
-        cx.simulate_keystrokes("c i a");
-        cx.assert_state("let a = [ˇ, 300];", Mode::Insert);
-
-        cx.set_state(
-            "let a = vec![Vec::new(), vecˇ![test::call(), 300]];",
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("c a a");
-        cx.assert_state("let a = vec![Vec::new()ˇ];", Mode::Insert);
-
-        // Cursor immediately before / after brackets
-        cx.set_state("let a = [test::call(first_arg)ˇ]", Mode::Normal);
-        cx.simulate_keystrokes("v i a");
-        cx.assert_state("let a = [«test::call(first_arg)ˇ»]", Mode::Visual);
-
-        cx.set_state("let a = [test::callˇ(first_arg)]", Mode::Normal);
-        cx.simulate_keystrokes("v i a");
-        cx.assert_state("let a = [«test::call(first_arg)ˇ»]", Mode::Visual);
-    }
-
-    #[gpui::test]
-    async fn test_indent_object(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        // Base use case
-        cx.set_state(
-            indoc! {"
-                fn boop() {
-                    // Comment
-                    baz();ˇ
-
-                    loop {
-                        bar(1);
-                        bar(2);
-                    }
-
-                    result
-                }
-            "},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("v i i");
-        cx.assert_state(
-            indoc! {"
-                fn boop() {
-                «    // Comment
-                    baz();
-
-                    loop {
-                        bar(1);
-                        bar(2);
-                    }
-
-                    resultˇ»
-                }
-            "},
-            Mode::Visual,
-        );
-
-        // Around indent (include line above)
-        cx.set_state(
-            indoc! {"
-                const ABOVE: str = true;
-                fn boop() {
-
-                    hello();
-                    worˇld()
-                }
-            "},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("v a i");
-        cx.assert_state(
-            indoc! {"
-                const ABOVE: str = true;
-                «fn boop() {
-
-                    hello();
-                    world()ˇ»
-                }
-            "},
-            Mode::Visual,
-        );
-
-        // Around indent (include line above & below)
-        cx.set_state(
-            indoc! {"
-                const ABOVE: str = true;
-                fn boop() {
-                    hellˇo();
-                    world()
-
-                }
-                const BELOW: str = true;
-            "},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("c a shift-i");
-        cx.assert_state(
-            indoc! {"
-                const ABOVE: str = true;
-                ˇ
-                const BELOW: str = true;
-            "},
-            Mode::Insert,
-        );
-    }
-
-    #[gpui::test]
-    async fn test_delete_surrounding_character_objects(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        for (start, end) in SURROUNDING_OBJECTS {
-            let marked_string = SURROUNDING_MARKER_STRING
-                .replace('`', &start.to_string())
-                .replace('\'', &end.to_string());
-
-            cx.simulate_at_each_offset(&format!("d i {start}"), &marked_string)
-                .await
-                .assert_matches();
-            cx.simulate_at_each_offset(&format!("d i {end}"), &marked_string)
-                .await
-                .assert_matches();
-            cx.simulate_at_each_offset(&format!("d a {start}"), &marked_string)
-                .await
-                .assert_matches();
-            cx.simulate_at_each_offset(&format!("d a {end}"), &marked_string)
-                .await
-                .assert_matches();
-        }
-    }
-
-    #[gpui::test]
-    async fn test_anyquotes_object(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-        cx.update(|_, cx| {
-            cx.bind_keys([KeyBinding::new(
-                "q",
-                AnyQuotes,
-                Some("vim_operator == a || vim_operator == i || vim_operator == cs"),
-            )]);
-        });
-
-        const TEST_CASES: &[(&str, &str, &str, Mode)] = &[
-            // the false string in the middle should be considered
-            (
-                "c i q",
-                "'first' false ˇstring 'second'",
-                "'first'ˇ'second'",
-                Mode::Insert,
-            ),
-            // Single quotes
-            (
-                "c i q",
-                "Thisˇ is a 'quote' example.",
-                "This is a 'ˇ' example.",
-                Mode::Insert,
-            ),
-            (
-                "c a q",
-                "Thisˇ is a 'quote' example.",
-                "This is a ˇexample.",
-                Mode::Insert,
-            ),
-            (
-                "c i q",
-                "This is a \"simple 'qˇuote'\" example.",
-                "This is a \"simple 'ˇ'\" example.",
-                Mode::Insert,
-            ),
-            (
-                "c a q",
-                "This is a \"simple 'qˇuote'\" example.",
-                "This is a \"simpleˇ\" example.",
-                Mode::Insert,
-            ),
-            (
-                "c i q",
-                "This is a 'qˇuote' example.",
-                "This is a 'ˇ' example.",
-                Mode::Insert,
-            ),
-            (
-                "c a q",
-                "This is a 'qˇuote' example.",
-                "This is a ˇexample.",
-                Mode::Insert,
-            ),
-            (
-                "d i q",
-                "This is a 'qˇuote' example.",
-                "This is a 'ˇ' example.",
-                Mode::Normal,
-            ),
-            (
-                "d a q",
-                "This is a 'qˇuote' example.",
-                "This is a ˇexample.",
-                Mode::Normal,
-            ),
-            // Double quotes
-            (
-                "c i q",
-                "This is a \"qˇuote\" example.",
-                "This is a \"ˇ\" example.",
-                Mode::Insert,
-            ),
-            (
-                "c a q",
-                "This is a \"qˇuote\" example.",
-                "This is a ˇexample.",
-                Mode::Insert,
-            ),
-            (
-                "d i q",
-                "This is a \"qˇuote\" example.",
-                "This is a \"ˇ\" example.",
-                Mode::Normal,
-            ),
-            (
-                "d a q",
-                "This is a \"qˇuote\" example.",
-                "This is a ˇexample.",
-                Mode::Normal,
-            ),
-            // Back quotes
-            (
-                "c i q",
-                "This is a `qˇuote` example.",
-                "This is a `ˇ` example.",
-                Mode::Insert,
-            ),
-            (
-                "c a q",
-                "This is a `qˇuote` example.",
-                "This is a ˇexample.",
-                Mode::Insert,
-            ),
-            (
-                "d i q",
-                "This is a `qˇuote` example.",
-                "This is a `ˇ` example.",
-                Mode::Normal,
-            ),
-            (
-                "d a q",
-                "This is a `qˇuote` example.",
-                "This is a ˇexample.",
-                Mode::Normal,
-            ),
-        ];
-
-        for (keystrokes, initial_state, expected_state, expected_mode) in TEST_CASES {
-            cx.set_state(initial_state, Mode::Normal);
-
-            cx.simulate_keystrokes(keystrokes);
-
-            cx.assert_state(expected_state, *expected_mode);
-        }
-
-        const INVALID_CASES: &[(&str, &str, Mode)] = &[
-            ("c i q", "this is a 'qˇuote example.", Mode::Normal), // Missing closing simple quote
-            ("c a q", "this is a 'qˇuote example.", Mode::Normal), // Missing closing simple quote
-            ("d i q", "this is a 'qˇuote example.", Mode::Normal), // Missing closing simple quote
-            ("d a q", "this is a 'qˇuote example.", Mode::Normal), // Missing closing simple quote
-            ("c i q", "this is a \"qˇuote example.", Mode::Normal), // Missing closing double quote
-            ("c a q", "this is a \"qˇuote example.", Mode::Normal), // Missing closing double quote
-            ("d i q", "this is a \"qˇuote example.", Mode::Normal), // Missing closing double quote
-            ("d a q", "this is a \"qˇuote example.", Mode::Normal), // Missing closing back quote
-            ("c i q", "this is a `qˇuote example.", Mode::Normal), // Missing closing back quote
-            ("c a q", "this is a `qˇuote example.", Mode::Normal), // Missing closing back quote
-            ("d i q", "this is a `qˇuote example.", Mode::Normal), // Missing closing back quote
-            ("d a q", "this is a `qˇuote example.", Mode::Normal), // Missing closing back quote
-        ];
-
-        for (keystrokes, initial_state, mode) in INVALID_CASES {
-            cx.set_state(initial_state, Mode::Normal);
-
-            cx.simulate_keystrokes(keystrokes);
-
-            cx.assert_state(initial_state, *mode);
-        }
-    }
-
-    #[gpui::test]
-    async fn test_miniquotes_object(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new_typescript(cx).await;
-
-        const TEST_CASES: &[(&str, &str, &str, Mode)] = &[
-            // Special cases from mini.ai plugin
-            // the false string in the middle should not be considered
-            (
-                "c i q",
-                "'first' false ˇstring 'second'",
-                "'first' false string 'ˇ'",
-                Mode::Insert,
-            ),
-            // Multiline support :)! Same behavior as mini.ai plugin
-            (
-                "c i q",
-                indoc! {"
-                    `
-                    first
-                    middle ˇstring
-                    second
-                    `
-                "},
-                indoc! {"
-                    `ˇ`
-                "},
-                Mode::Insert,
-            ),
-            // If you are in the close quote and it is the only quote in the buffer, it should replace inside the quote
-            // This is not working with the core motion ci' for this special edge case, so I am happy to fix it in MiniQuotes :)
-            // Bug reference: https://github.com/zed-industries/zed/issues/23889
-            ("c i q", "'quote«'ˇ»", "'ˇ'", Mode::Insert),
-            // Single quotes
-            (
-                "c i q",
-                "Thisˇ is a 'quote' example.",
-                "This is a 'ˇ' example.",
-                Mode::Insert,
-            ),
-            (
-                "c a q",
-                "Thisˇ is a 'quote' example.",
-                "This is a ˇ example.", // same mini.ai plugin behavior
-                Mode::Insert,
-            ),
-            (
-                "c i q",
-                "This is a \"simple 'qˇuote'\" example.",
-                "This is a \"ˇ\" example.", // Not supported by Tree-sitter queries for now
-                Mode::Insert,
-            ),
-            (
-                "c a q",
-                "This is a \"simple 'qˇuote'\" example.",
-                "This is a ˇ example.", // Not supported by Tree-sitter queries for now
-                Mode::Insert,
-            ),
-            (
-                "c i q",
-                "This is a 'qˇuote' example.",
-                "This is a 'ˇ' example.",
-                Mode::Insert,
-            ),
-            (
-                "c a q",
-                "This is a 'qˇuote' example.",
-                "This is a ˇ example.", // same mini.ai plugin behavior
-                Mode::Insert,
-            ),
-            (
-                "d i q",
-                "This is a 'qˇuote' example.",
-                "This is a 'ˇ' example.",
-                Mode::Normal,
-            ),
-            (
-                "d a q",
-                "This is a 'qˇuote' example.",
-                "This is a ˇ example.", // same mini.ai plugin behavior
-                Mode::Normal,
-            ),
-            // Double quotes
-            (
-                "c i q",
-                "This is a \"qˇuote\" example.",
-                "This is a \"ˇ\" example.",
-                Mode::Insert,
-            ),
-            (
-                "c a q",
-                "This is a \"qˇuote\" example.",
-                "This is a ˇ example.", // same mini.ai plugin behavior
-                Mode::Insert,
-            ),
-            (
-                "d i q",
-                "This is a \"qˇuote\" example.",
-                "This is a \"ˇ\" example.",
-                Mode::Normal,
-            ),
-            (
-                "d a q",
-                "This is a \"qˇuote\" example.",
-                "This is a ˇ example.", // same mini.ai plugin behavior
-                Mode::Normal,
-            ),
-            // Back quotes
-            (
-                "c i q",
-                "This is a `qˇuote` example.",
-                "This is a `ˇ` example.",
-                Mode::Insert,
-            ),
-            (
-                "c a q",
-                "This is a `qˇuote` example.",
-                "This is a ˇ example.", // same mini.ai plugin behavior
-                Mode::Insert,
-            ),
-            (
-                "d i q",
-                "This is a `qˇuote` example.",
-                "This is a `ˇ` example.",
-                Mode::Normal,
-            ),
-            (
-                "d a q",
-                "This is a `qˇuote` example.",
-                "This is a ˇ example.", // same mini.ai plugin behavior
-                Mode::Normal,
-            ),
-        ];
-
-        for (keystrokes, initial_state, expected_state, expected_mode) in TEST_CASES {
-            cx.set_state(initial_state, Mode::Normal);
-
-            cx.simulate_keystrokes(keystrokes);
-
-            cx.assert_state(expected_state, *expected_mode);
-        }
-
-        const INVALID_CASES: &[(&str, &str, Mode)] = &[
-            ("c i q", "this is a 'qˇuote example.", Mode::Normal), // Missing closing simple quote
-            ("c a q", "this is a 'qˇuote example.", Mode::Normal), // Missing closing simple quote
-            ("d i q", "this is a 'qˇuote example.", Mode::Normal), // Missing closing simple quote
-            ("d a q", "this is a 'qˇuote example.", Mode::Normal), // Missing closing simple quote
-            ("c i q", "this is a \"qˇuote example.", Mode::Normal), // Missing closing double quote
-            ("c a q", "this is a \"qˇuote example.", Mode::Normal), // Missing closing double quote
-            ("d i q", "this is a \"qˇuote example.", Mode::Normal), // Missing closing double quote
-            ("d a q", "this is a \"qˇuote example.", Mode::Normal), // Missing closing back quote
-            ("c i q", "this is a `qˇuote example.", Mode::Normal), // Missing closing back quote
-            ("c a q", "this is a `qˇuote example.", Mode::Normal), // Missing closing back quote
-            ("d i q", "this is a `qˇuote example.", Mode::Normal), // Missing closing back quote
-            ("d a q", "this is a `qˇuote example.", Mode::Normal), // Missing closing back quote
-        ];
-
-        for (keystrokes, initial_state, mode) in INVALID_CASES {
-            cx.set_state(initial_state, Mode::Normal);
-
-            cx.simulate_keystrokes(keystrokes);
-
-            cx.assert_state(initial_state, *mode);
-        }
-    }
-
-    #[gpui::test]
-    async fn test_anybrackets_object(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-        cx.update(|_, cx| {
-            cx.bind_keys([KeyBinding::new(
-                "b",
-                AnyBrackets,
-                Some("vim_operator == a || vim_operator == i || vim_operator == cs"),
-            )]);
-        });
-
-        const TEST_CASES: &[(&str, &str, &str, Mode)] = &[
-            (
-                "c i b",
-                indoc! {"
-                    {
-                        {
-                            ˇprint('hello')
-                        }
-                    }
-                "},
-                indoc! {"
-                    {
-                        {
-                            ˇ
-                        }
-                    }
-                "},
-                Mode::Insert,
-            ),
-            // Bracket (Parentheses)
-            (
-                "c i b",
-                "Thisˇ is a (simple [quote]) example.",
-                "This is a (ˇ) example.",
-                Mode::Insert,
-            ),
-            (
-                "c i b",
-                "This is a [simple (qˇuote)] example.",
-                "This is a [simple (ˇ)] example.",
-                Mode::Insert,
-            ),
-            (
-                "c a b",
-                "This is a [simple (qˇuote)] example.",
-                "This is a [simple ˇ] example.",
-                Mode::Insert,
-            ),
-            (
-                "c a b",
-                "Thisˇ is a (simple [quote]) example.",
-                "This is a ˇ example.",
-                Mode::Insert,
-            ),
-            (
-                "c i b",
-                "This is a (qˇuote) example.",
-                "This is a (ˇ) example.",
-                Mode::Insert,
-            ),
-            (
-                "c a b",
-                "This is a (qˇuote) example.",
-                "This is a ˇ example.",
-                Mode::Insert,
-            ),
-            (
-                "d i b",
-                "This is a (qˇuote) example.",
-                "This is a (ˇ) example.",
-                Mode::Normal,
-            ),
-            (
-                "d a b",
-                "This is a (qˇuote) example.",
-                "This is a ˇ example.",
-                Mode::Normal,
-            ),
-            // Square brackets
-            (
-                "c i b",
-                "This is a [qˇuote] example.",
-                "This is a [ˇ] example.",
-                Mode::Insert,
-            ),
-            (
-                "c a b",
-                "This is a [qˇuote] example.",
-                "This is a ˇ example.",
-                Mode::Insert,
-            ),
-            (
-                "d i b",
-                "This is a [qˇuote] example.",
-                "This is a [ˇ] example.",
-                Mode::Normal,
-            ),
-            (
-                "d a b",
-                "This is a [qˇuote] example.",
-                "This is a ˇ example.",
-                Mode::Normal,
-            ),
-            // Curly brackets
-            (
-                "c i b",
-                "This is a {qˇuote} example.",
-                "This is a {ˇ} example.",
-                Mode::Insert,
-            ),
-            (
-                "c a b",
-                "This is a {qˇuote} example.",
-                "This is a ˇ example.",
-                Mode::Insert,
-            ),
-            (
-                "d i b",
-                "This is a {qˇuote} example.",
-                "This is a {ˇ} example.",
-                Mode::Normal,
-            ),
-            (
-                "d a b",
-                "This is a {qˇuote} example.",
-                "This is a ˇ example.",
-                Mode::Normal,
-            ),
-        ];
-
-        for (keystrokes, initial_state, expected_state, expected_mode) in TEST_CASES {
-            cx.set_state(initial_state, Mode::Normal);
-
-            cx.simulate_keystrokes(keystrokes);
-
-            cx.assert_state(expected_state, *expected_mode);
-        }
-
-        const INVALID_CASES: &[(&str, &str, Mode)] = &[
-            ("c i b", "this is a (qˇuote example.", Mode::Normal), // Missing closing bracket
-            ("c a b", "this is a (qˇuote example.", Mode::Normal), // Missing closing bracket
-            ("d i b", "this is a (qˇuote example.", Mode::Normal), // Missing closing bracket
-            ("d a b", "this is a (qˇuote example.", Mode::Normal), // Missing closing bracket
-            ("c i b", "this is a [qˇuote example.", Mode::Normal), // Missing closing square bracket
-            ("c a b", "this is a [qˇuote example.", Mode::Normal), // Missing closing square bracket
-            ("d i b", "this is a [qˇuote example.", Mode::Normal), // Missing closing square bracket
-            ("d a b", "this is a [qˇuote example.", Mode::Normal), // Missing closing square bracket
-            ("c i b", "this is a {qˇuote example.", Mode::Normal), // Missing closing curly bracket
-            ("c a b", "this is a {qˇuote example.", Mode::Normal), // Missing closing curly bracket
-            ("d i b", "this is a {qˇuote example.", Mode::Normal), // Missing closing curly bracket
-            ("d a b", "this is a {qˇuote example.", Mode::Normal), // Missing closing curly bracket
-        ];
-
-        for (keystrokes, initial_state, mode) in INVALID_CASES {
-            cx.set_state(initial_state, Mode::Normal);
-
-            cx.simulate_keystrokes(keystrokes);
-
-            cx.assert_state(initial_state, *mode);
-        }
-    }
-
-    #[gpui::test]
-    async fn test_minibrackets_object(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-        cx.update(|_, cx| {
-            cx.bind_keys([KeyBinding::new(
-                "b",
-                MiniBrackets,
-                Some("vim_operator == a || vim_operator == i || vim_operator == cs"),
-            )]);
-        });
-
-        const TEST_CASES: &[(&str, &str, &str, Mode)] = &[
-            // Special cases from mini.ai plugin
-            // Current line has more priority for the cover or next algorithm, to avoid changing curly brackets which is supper anoying
-            // Same behavior as mini.ai plugin
-            (
-                "c i b",
-                indoc! {"
-                    {
-                        {
-                            ˇprint('hello')
-                        }
-                    }
-                "},
-                indoc! {"
-                    {
-                        {
-                            print(ˇ)
-                        }
-                    }
-                "},
-                Mode::Insert,
-            ),
-            // If the current line doesn't have brackets then it should consider if the caret is inside an external bracket
-            // Same behavior as mini.ai plugin
-            (
-                "c i b",
-                indoc! {"
-                    {
-                        {
-                            ˇ
-                            print('hello')
-                        }
-                    }
-                "},
-                indoc! {"
-                    {
-                        {ˇ}
-                    }
-                "},
-                Mode::Insert,
-            ),
-            // If you are in the open bracket then it has higher priority
-            (
-                "c i b",
-                indoc! {"
-                    «{ˇ»
-                        {
-                            print('hello')
-                        }
-                    }
-                "},
-                indoc! {"
-                    {ˇ}
-                "},
-                Mode::Insert,
-            ),
-            // If you are in the close bracket then it has higher priority
-            (
-                "c i b",
-                indoc! {"
-                    {
-                        {
-                            print('hello')
-                        }
-                    «}ˇ»
-                "},
-                indoc! {"
-                    {ˇ}
-                "},
-                Mode::Insert,
-            ),
-            // Bracket (Parentheses)
-            (
-                "c i b",
-                "Thisˇ is a (simple [quote]) example.",
-                "This is a (ˇ) example.",
-                Mode::Insert,
-            ),
-            (
-                "c i b",
-                "This is a [simple (qˇuote)] example.",
-                "This is a [simple (ˇ)] example.",
-                Mode::Insert,
-            ),
-            (
-                "c a b",
-                "This is a [simple (qˇuote)] example.",
-                "This is a [simple ˇ] example.",
-                Mode::Insert,
-            ),
-            (
-                "c a b",
-                "Thisˇ is a (simple [quote]) example.",
-                "This is a ˇ example.",
-                Mode::Insert,
-            ),
-            (
-                "c i b",
-                "This is a (qˇuote) example.",
-                "This is a (ˇ) example.",
-                Mode::Insert,
-            ),
-            (
-                "c a b",
-                "This is a (qˇuote) example.",
-                "This is a ˇ example.",
-                Mode::Insert,
-            ),
-            (
-                "d i b",
-                "This is a (qˇuote) example.",
-                "This is a (ˇ) example.",
-                Mode::Normal,
-            ),
-            (
-                "d a b",
-                "This is a (qˇuote) example.",
-                "This is a ˇ example.",
-                Mode::Normal,
-            ),
-            // Square brackets
-            (
-                "c i b",
-                "This is a [qˇuote] example.",
-                "This is a [ˇ] example.",
-                Mode::Insert,
-            ),
-            (
-                "c a b",
-                "This is a [qˇuote] example.",
-                "This is a ˇ example.",
-                Mode::Insert,
-            ),
-            (
-                "d i b",
-                "This is a [qˇuote] example.",
-                "This is a [ˇ] example.",
-                Mode::Normal,
-            ),
-            (
-                "d a b",
-                "This is a [qˇuote] example.",
-                "This is a ˇ example.",
-                Mode::Normal,
-            ),
-            // Curly brackets
-            (
-                "c i b",
-                "This is a {qˇuote} example.",
-                "This is a {ˇ} example.",
-                Mode::Insert,
-            ),
-            (
-                "c a b",
-                "This is a {qˇuote} example.",
-                "This is a ˇ example.",
-                Mode::Insert,
-            ),
-            (
-                "d i b",
-                "This is a {qˇuote} example.",
-                "This is a {ˇ} example.",
-                Mode::Normal,
-            ),
-            (
-                "d a b",
-                "This is a {qˇuote} example.",
-                "This is a ˇ example.",
-                Mode::Normal,
-            ),
-        ];
-
-        for (keystrokes, initial_state, expected_state, expected_mode) in TEST_CASES {
-            cx.set_state(initial_state, Mode::Normal);
-
-            cx.simulate_keystrokes(keystrokes);
-
-            cx.assert_state(expected_state, *expected_mode);
-        }
-
-        const INVALID_CASES: &[(&str, &str, Mode)] = &[
-            ("c i b", "this is a (qˇuote example.", Mode::Normal), // Missing closing bracket
-            ("c a b", "this is a (qˇuote example.", Mode::Normal), // Missing closing bracket
-            ("d i b", "this is a (qˇuote example.", Mode::Normal), // Missing closing bracket
-            ("d a b", "this is a (qˇuote example.", Mode::Normal), // Missing closing bracket
-            ("c i b", "this is a [qˇuote example.", Mode::Normal), // Missing closing square bracket
-            ("c a b", "this is a [qˇuote example.", Mode::Normal), // Missing closing square bracket
-            ("d i b", "this is a [qˇuote example.", Mode::Normal), // Missing closing square bracket
-            ("d a b", "this is a [qˇuote example.", Mode::Normal), // Missing closing square bracket
-            ("c i b", "this is a {qˇuote example.", Mode::Normal), // Missing closing curly bracket
-            ("c a b", "this is a {qˇuote example.", Mode::Normal), // Missing closing curly bracket
-            ("d i b", "this is a {qˇuote example.", Mode::Normal), // Missing closing curly bracket
-            ("d a b", "this is a {qˇuote example.", Mode::Normal), // Missing closing curly bracket
-        ];
-
-        for (keystrokes, initial_state, mode) in INVALID_CASES {
-            cx.set_state(initial_state, Mode::Normal);
-
-            cx.simulate_keystrokes(keystrokes);
-
-            cx.assert_state(initial_state, *mode);
-        }
-    }
-
-    #[gpui::test]
-    async fn test_minibrackets_multibuffer(cx: &mut gpui::TestAppContext) {
-        // Initialize test context with the TypeScript language loaded, so we
-        // can actually get brackets definition.
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        // Update `b` to `MiniBrackets` so we can later use it when simulating
-        // keystrokes.
-        cx.update(|_, cx| {
-            cx.bind_keys([KeyBinding::new("b", MiniBrackets, None)]);
-        });
-
-        let (editor, cx) = cx.add_window_view(|window, cx| {
-            let multi_buffer = MultiBuffer::build_multi(
-                [
-                    ("111\n222\n333\n444\n", vec![Point::row_range(0..2)]),
-                    ("111\na {bracket} example\n", vec![Point::row_range(0..2)]),
-                ],
-                cx,
-            );
-
-            // In order for the brackets to actually be found, we need to update
-            // the language used for the second buffer. This is something that
-            // is handled automatically when simply using `VimTestContext::new`
-            // but, since this is being set manually, the language isn't
-            // automatically set.
-            let editor = Editor::new(EditorMode::full(), multi_buffer.clone(), None, window, cx);
-            let buffer_ids = multi_buffer.read(cx).excerpt_buffer_ids();
-            if let Some(buffer) = multi_buffer.read(cx).buffer(buffer_ids[1]) {
-                buffer.update(cx, |buffer, cx| {
-                    buffer.set_language(Some(language::rust_lang()), cx);
-                })
-            };
-
-            editor
-        });
-
-        let mut cx = EditorTestContext::for_editor_in(editor.clone(), cx).await;
-
-        cx.assert_excerpts_with_selections(indoc! {"
-            [EXCERPT]
-            ˇ111
-            222
-            [EXCERPT]
-            111
-            a {bracket} example
-            "
-        });
-
-        cx.simulate_keystrokes("j j j j f r");
-        cx.assert_excerpts_with_selections(indoc! {"
-            [EXCERPT]
-            111
-            222
-            [EXCERPT]
-            111
-            a {bˇracket} example
-            "
-        });
-
-        cx.simulate_keystrokes("d i b");
-        cx.assert_excerpts_with_selections(indoc! {"
-            [EXCERPT]
-            111
-            222
-            [EXCERPT]
-            111
-            a {ˇ} example
-            "
-        });
-    }
-
-    #[gpui::test]
-    async fn test_minibrackets_trailing_space(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.set_shared_state("(trailingˇ whitespace          )")
-            .await;
-        cx.simulate_shared_keystrokes("v i b").await;
-        cx.shared_state().await.assert_matches();
-        cx.simulate_shared_keystrokes("escape y i b").await;
-        cx.shared_clipboard()
-            .await
-            .assert_eq("trailing whitespace          ");
-    }
-
-    #[gpui::test]
-    async fn test_tags(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new_html(cx).await;
-
-        cx.set_state("<html><head></head><body><b>hˇi!</b></body>", Mode::Normal);
-        cx.simulate_keystrokes("v i t");
-        cx.assert_state(
-            "<html><head></head><body><b>«hi!ˇ»</b></body>",
-            Mode::Visual,
-        );
-        cx.simulate_keystrokes("a t");
-        cx.assert_state(
-            "<html><head></head><body>«<b>hi!</b>ˇ»</body>",
-            Mode::Visual,
-        );
-        cx.simulate_keystrokes("a t");
-        cx.assert_state(
-            "<html><head></head>«<body><b>hi!</b></body>ˇ»",
-            Mode::Visual,
-        );
-
-        // The cursor is before the tag
-        cx.set_state(
-            "<html><head></head><body> ˇ  <b>hi!</b></body>",
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("v i t");
-        cx.assert_state(
-            "<html><head></head><body>   <b>«hi!ˇ»</b></body>",
-            Mode::Visual,
-        );
-        cx.simulate_keystrokes("a t");
-        cx.assert_state(
-            "<html><head></head><body>   «<b>hi!</b>ˇ»</body>",
-            Mode::Visual,
-        );
-
-        // The cursor is in the open tag
-        cx.set_state(
-            "<html><head></head><body><bˇ>hi!</b><b>hello!</b></body>",
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("v a t");
-        cx.assert_state(
-            "<html><head></head><body>«<b>hi!</b>ˇ»<b>hello!</b></body>",
-            Mode::Visual,
-        );
-        cx.simulate_keystrokes("i t");
-        cx.assert_state(
-            "<html><head></head><body>«<b>hi!</b><b>hello!</b>ˇ»</body>",
-            Mode::Visual,
-        );
-
-        // current selection length greater than 1
-        cx.set_state(
-            "<html><head></head><body><«b>hi!ˇ»</b></body>",
-            Mode::Visual,
-        );
-        cx.simulate_keystrokes("i t");
-        cx.assert_state(
-            "<html><head></head><body><b>«hi!ˇ»</b></body>",
-            Mode::Visual,
-        );
-        cx.simulate_keystrokes("a t");
-        cx.assert_state(
-            "<html><head></head><body>«<b>hi!</b>ˇ»</body>",
-            Mode::Visual,
-        );
-
-        cx.set_state(
-            "<html><head></head><body><«b>hi!</ˇ»b></body>",
-            Mode::Visual,
-        );
-        cx.simulate_keystrokes("a t");
-        cx.assert_state(
-            "<html><head></head>«<body><b>hi!</b></body>ˇ»",
-            Mode::Visual,
-        );
-    }
-    #[gpui::test]
-    async fn test_around_containing_word_indent(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state("    ˇconst f = (x: unknown) => {")
-            .await;
-        cx.simulate_shared_keystrokes("v a w").await;
-        cx.shared_state()
-            .await
-            .assert_eq("    «const ˇ»f = (x: unknown) => {");
-
-        cx.set_shared_state("    ˇconst f = (x: unknown) => {")
-            .await;
-        cx.simulate_shared_keystrokes("y a w").await;
-        cx.shared_clipboard().await.assert_eq("const ");
-
-        cx.set_shared_state("    ˇconst f = (x: unknown) => {")
-            .await;
-        cx.simulate_shared_keystrokes("d a w").await;
-        cx.shared_state()
-            .await
-            .assert_eq("    ˇf = (x: unknown) => {");
-        cx.shared_clipboard().await.assert_eq("const ");
-
-        cx.set_shared_state("    ˇconst f = (x: unknown) => {")
-            .await;
-        cx.simulate_shared_keystrokes("c a w").await;
-        cx.shared_state()
-            .await
-            .assert_eq("    ˇf = (x: unknown) => {");
-        cx.shared_clipboard().await.assert_eq("const ");
-    }
-}
diff --git a/crates/vim/src/replace.rs b/crates/vim/src/replace.rs
deleted file mode 100644
index 63d452f84b..0000000000
--- a/crates/vim/src/replace.rs
+++ /dev/null
@@ -1,559 +0,0 @@
-use crate::{
-    Operator, Vim,
-    motion::{self, Motion},
-    object::Object,
-    state::Mode,
-};
-use editor::{
-    Anchor, Bias, Editor, EditorSnapshot, SelectionEffects, ToOffset, ToPoint,
-    display_map::ToDisplayPoint,
-};
-use gpui::{ClipboardEntry, Context, Window, actions};
-use language::{Point, SelectionGoal};
-use std::ops::Range;
-use std::sync::Arc;
-
-actions!(
-    vim,
-    [
-        /// Toggles replace mode.
-        ToggleReplace,
-        /// Undoes the last replacement.
-        UndoReplace
-    ]
-);
-
-pub fn register(editor: &mut Editor, cx: &mut Context<Vim>) {
-    Vim::action(editor, cx, |vim, _: &ToggleReplace, window, cx| {
-        vim.replacements = vec![];
-        vim.start_recording(cx);
-        vim.switch_mode(Mode::Replace, false, window, cx);
-    });
-
-    Vim::action(editor, cx, |vim, _: &UndoReplace, window, cx| {
-        if vim.mode != Mode::Replace {
-            return;
-        }
-        let count = Vim::take_count(cx);
-        Vim::take_forced_motion(cx);
-        vim.undo_replace(count, window, cx)
-    });
-}
-
-struct VimExchange;
-
-impl Vim {
-    pub(crate) fn multi_replace(
-        &mut self,
-        text: Arc<str>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.update_editor(cx, |vim, editor, cx| {
-            editor.transact(window, cx, |editor, window, cx| {
-                editor.set_clip_at_line_ends(false, cx);
-                let map = editor.snapshot(window, cx);
-                let display_selections = editor.selections.all::<Point>(&map.display_snapshot);
-
-                // Handles all string that require manipulation, including inserts and replaces
-                let edits = display_selections
-                    .into_iter()
-                    .map(|selection| {
-                        let is_new_line = text.as_ref() == "\n";
-                        let mut range = selection.range();
-                        // "\n" need to be handled separately, because when a "\n" is typing,
-                        // we don't do a replace, we need insert a "\n"
-                        if !is_new_line {
-                            range.end.column += 1;
-                            range.end = map.buffer_snapshot().clip_point(range.end, Bias::Right);
-                        }
-                        let replace_range = map.buffer_snapshot().anchor_before(range.start)
-                            ..map.buffer_snapshot().anchor_after(range.end);
-                        let current_text = map
-                            .buffer_snapshot()
-                            .text_for_range(replace_range.clone())
-                            .collect();
-                        vim.replacements.push((replace_range.clone(), current_text));
-                        (replace_range, text.clone())
-                    })
-                    .collect::<Vec<_>>();
-
-                editor.edit_with_block_indent(edits.clone(), Vec::new(), cx);
-
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.select_anchor_ranges(edits.iter().map(|(range, _)| range.end..range.end));
-                });
-                editor.set_clip_at_line_ends(true, cx);
-            });
-        });
-    }
-
-    fn undo_replace(
-        &mut self,
-        maybe_times: Option<usize>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.update_editor(cx, |vim, editor, cx| {
-            editor.transact(window, cx, |editor, window, cx| {
-                editor.set_clip_at_line_ends(false, cx);
-                let map = editor.snapshot(window, cx);
-                let selections = editor.selections.all::<Point>(&map.display_snapshot);
-                let mut new_selections = vec![];
-                let edits: Vec<(Range<Point>, String)> = selections
-                    .into_iter()
-                    .filter_map(|selection| {
-                        let end = selection.head();
-                        let start = motion::wrapping_left(
-                            &map,
-                            end.to_display_point(&map),
-                            maybe_times.unwrap_or(1),
-                        )
-                        .to_point(&map);
-                        new_selections.push(
-                            map.buffer_snapshot().anchor_before(start)
-                                ..map.buffer_snapshot().anchor_before(start),
-                        );
-
-                        let mut undo = None;
-                        let edit_range = start..end;
-                        for (i, (range, inverse)) in vim.replacements.iter().rev().enumerate() {
-                            if range.start.to_point(&map.buffer_snapshot()) <= edit_range.start
-                                && range.end.to_point(&map.buffer_snapshot()) >= edit_range.end
-                            {
-                                undo = Some(inverse.clone());
-                                vim.replacements.remove(vim.replacements.len() - i - 1);
-                                break;
-                            }
-                        }
-                        Some((edit_range, undo?))
-                    })
-                    .collect::<Vec<_>>();
-
-                editor.edit(edits, cx);
-
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.select_ranges(new_selections);
-                });
-                editor.set_clip_at_line_ends(true, cx);
-            });
-        });
-    }
-
-    pub fn exchange_object(
-        &mut self,
-        object: Object,
-        around: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.stop_recording(cx);
-        self.update_editor(cx, |vim, editor, cx| {
-            editor.set_clip_at_line_ends(false, cx);
-            let mut selection = editor
-                .selections
-                .newest_display(&editor.display_snapshot(cx));
-            let snapshot = editor.snapshot(window, cx);
-            object.expand_selection(&snapshot, &mut selection, around, None);
-            let start = snapshot
-                .buffer_snapshot()
-                .anchor_before(selection.start.to_point(&snapshot));
-            let end = snapshot
-                .buffer_snapshot()
-                .anchor_before(selection.end.to_point(&snapshot));
-            let new_range = start..end;
-            vim.exchange_impl(new_range, editor, &snapshot, window, cx);
-            editor.set_clip_at_line_ends(true, cx);
-        });
-    }
-
-    pub fn exchange_visual(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.stop_recording(cx);
-        self.update_editor(cx, |vim, editor, cx| {
-            let selection = editor.selections.newest_anchor();
-            let new_range = selection.start..selection.end;
-            let snapshot = editor.snapshot(window, cx);
-            vim.exchange_impl(new_range, editor, &snapshot, window, cx);
-        });
-        self.switch_mode(Mode::Normal, false, window, cx);
-    }
-
-    pub fn clear_exchange(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.stop_recording(cx);
-        self.update_editor(cx, |_, editor, cx| {
-            editor.clear_background_highlights::<VimExchange>(cx);
-        });
-        self.clear_operator(window, cx);
-    }
-
-    pub fn exchange_motion(
-        &mut self,
-        motion: Motion,
-        times: Option<usize>,
-        forced_motion: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.stop_recording(cx);
-        self.update_editor(cx, |vim, editor, cx| {
-            editor.set_clip_at_line_ends(false, cx);
-            let text_layout_details = editor.text_layout_details(window);
-            let mut selection = editor
-                .selections
-                .newest_display(&editor.display_snapshot(cx));
-            let snapshot = editor.snapshot(window, cx);
-            motion.expand_selection(
-                &snapshot,
-                &mut selection,
-                times,
-                &text_layout_details,
-                forced_motion,
-            );
-            let start = snapshot
-                .buffer_snapshot()
-                .anchor_before(selection.start.to_point(&snapshot));
-            let end = snapshot
-                .buffer_snapshot()
-                .anchor_before(selection.end.to_point(&snapshot));
-            let new_range = start..end;
-            vim.exchange_impl(new_range, editor, &snapshot, window, cx);
-            editor.set_clip_at_line_ends(true, cx);
-        });
-    }
-
-    pub fn exchange_impl(
-        &self,
-        new_range: Range<Anchor>,
-        editor: &mut Editor,
-        snapshot: &EditorSnapshot,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-    ) {
-        if let Some((_, ranges)) = editor.clear_background_highlights::<VimExchange>(cx) {
-            let previous_range = ranges[0].clone();
-
-            let new_range_start = new_range.start.to_offset(&snapshot.buffer_snapshot());
-            let new_range_end = new_range.end.to_offset(&snapshot.buffer_snapshot());
-            let previous_range_end = previous_range.end.to_offset(&snapshot.buffer_snapshot());
-            let previous_range_start = previous_range.start.to_offset(&snapshot.buffer_snapshot());
-
-            let text_for = |range: Range<Anchor>| {
-                snapshot
-                    .buffer_snapshot()
-                    .text_for_range(range)
-                    .collect::<String>()
-            };
-
-            let mut final_cursor_position = None;
-
-            if previous_range_end < new_range_start || new_range_end < previous_range_start {
-                let previous_text = text_for(previous_range.clone());
-                let new_text = text_for(new_range.clone());
-                final_cursor_position = Some(new_range.start.to_display_point(snapshot));
-
-                editor.edit([(previous_range, new_text), (new_range, previous_text)], cx);
-            } else if new_range_start <= previous_range_start && new_range_end >= previous_range_end
-            {
-                final_cursor_position = Some(new_range.start.to_display_point(snapshot));
-                editor.edit([(new_range, text_for(previous_range))], cx);
-            } else if previous_range_start <= new_range_start && previous_range_end >= new_range_end
-            {
-                final_cursor_position = Some(previous_range.start.to_display_point(snapshot));
-                editor.edit([(previous_range, text_for(new_range))], cx);
-            }
-
-            if let Some(position) = final_cursor_position {
-                editor.change_selections(Default::default(), window, cx, |s| {
-                    s.move_with(|_map, selection| {
-                        selection.collapse_to(position, SelectionGoal::None);
-                    });
-                })
-            }
-        } else {
-            let ranges = [new_range];
-            editor.highlight_background::<VimExchange>(
-                &ranges,
-                |_, theme| theme.colors().editor_document_highlight_read_background,
-                cx,
-            );
-        }
-    }
-
-    /// Pastes the clipboard contents, replacing the same number of characters
-    /// as the clipboard's contents.
-    pub fn paste_replace(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let clipboard_text =
-            cx.read_from_clipboard()
-                .and_then(|item| match item.entries().first() {
-                    Some(ClipboardEntry::String(text)) => Some(text.text().to_string()),
-                    _ => None,
-                });
-
-        if let Some(text) = clipboard_text {
-            self.push_operator(Operator::Replace, window, cx);
-            self.normal_replace(Arc::from(text), window, cx);
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use gpui::ClipboardItem;
-    use indoc::indoc;
-
-    use crate::{
-        state::Mode,
-        test::{NeovimBackedTestContext, VimTestContext},
-    };
-
-    #[gpui::test]
-    async fn test_enter_and_exit_replace_mode(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-        cx.simulate_keystrokes("shift-r");
-        assert_eq!(cx.mode(), Mode::Replace);
-        cx.simulate_keystrokes("escape");
-        assert_eq!(cx.mode(), Mode::Normal);
-    }
-
-    #[gpui::test]
-    #[cfg(not(any(target_os = "linux", target_os = "freebsd")))]
-    async fn test_replace_mode(cx: &mut gpui::TestAppContext) {
-        let mut cx: NeovimBackedTestContext = NeovimBackedTestContext::new(cx).await;
-
-        // test normal replace
-        cx.set_shared_state(indoc! {"
-            ˇThe quick brown
-            fox jumps over
-            the lazy dog."})
-            .await;
-        cx.simulate_shared_keystrokes("shift-r O n e").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            Oneˇ quick brown
-            fox jumps over
-            the lazy dog."});
-
-        // test replace with line ending
-        cx.set_shared_state(indoc! {"
-            The quick browˇn
-            fox jumps over
-            the lazy dog."})
-            .await;
-        cx.simulate_shared_keystrokes("shift-r O n e").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            The quick browOneˇ
-            fox jumps over
-            the lazy dog."});
-
-        // test replace with blank line
-        cx.set_shared_state(indoc! {"
-        The quick brown
-        ˇ
-        fox jumps over
-        the lazy dog."})
-            .await;
-        cx.simulate_shared_keystrokes("shift-r O n e").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            The quick brown
-            Oneˇ
-            fox jumps over
-            the lazy dog."});
-
-        // test replace with newline
-        cx.set_shared_state(indoc! {"
-            The quˇick brown
-            fox jumps over
-            the lazy dog."})
-            .await;
-        cx.simulate_shared_keystrokes("shift-r enter O n e").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            The qu
-            Oneˇ brown
-            fox jumps over
-            the lazy dog."});
-
-        // test replace with multi cursor and newline
-        cx.set_state(
-            indoc! {"
-            ˇThe quick brown
-            fox jumps over
-            the lazy ˇdog."},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("shift-r O n e");
-        cx.assert_state(
-            indoc! {"
-            Oneˇ quick brown
-            fox jumps over
-            the lazy Oneˇ."},
-            Mode::Replace,
-        );
-        cx.simulate_keystrokes("enter T w o");
-        cx.assert_state(
-            indoc! {"
-            One
-            Twoˇck brown
-            fox jumps over
-            the lazy One
-            Twoˇ"},
-            Mode::Replace,
-        );
-    }
-
-    #[gpui::test]
-    async fn test_replace_mode_with_counts(cx: &mut gpui::TestAppContext) {
-        let mut cx: NeovimBackedTestContext = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state("ˇhello\n").await;
-        cx.simulate_shared_keystrokes("3 shift-r - escape").await;
-        cx.shared_state().await.assert_eq("--ˇ-lo\n");
-
-        cx.set_shared_state("ˇhello\n").await;
-        cx.simulate_shared_keystrokes("3 shift-r a b c escape")
-            .await;
-        cx.shared_state().await.assert_eq("abcabcabˇc\n");
-    }
-
-    #[gpui::test]
-    async fn test_replace_mode_repeat(cx: &mut gpui::TestAppContext) {
-        let mut cx: NeovimBackedTestContext = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state("ˇhello world\n").await;
-        cx.simulate_shared_keystrokes("shift-r - - - escape 4 l .")
-            .await;
-        cx.shared_state().await.assert_eq("---lo --ˇ-ld\n");
-    }
-
-    #[gpui::test]
-    async fn test_replace_mode_undo(cx: &mut gpui::TestAppContext) {
-        let mut cx: NeovimBackedTestContext = NeovimBackedTestContext::new(cx).await;
-
-        const UNDO_REPLACE_EXAMPLES: &[&str] = &[
-            // replace undo with single line
-            "ˇThe quick brown fox jumps over the lazy dog.",
-            // replace undo with ending line
-            indoc! {"
-                The quick browˇn
-                fox jumps over
-                the lazy dog."
-            },
-            // replace undo with empty line
-            indoc! {"
-                The quick brown
-                ˇ
-                fox jumps over
-                the lazy dog."
-            },
-        ];
-
-        for example in UNDO_REPLACE_EXAMPLES {
-            // normal undo
-            cx.simulate("shift-r O n e backspace backspace backspace", example)
-                .await
-                .assert_matches();
-            // undo with new line
-            cx.simulate("shift-r O enter e backspace backspace backspace", example)
-                .await
-                .assert_matches();
-            cx.simulate(
-                "shift-r O enter n enter e backspace backspace backspace backspace backspace",
-                example,
-            )
-            .await
-            .assert_matches();
-        }
-    }
-
-    #[gpui::test]
-    async fn test_replace_multicursor(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-        cx.set_state("ˇabcˇabcabc", Mode::Normal);
-        cx.simulate_keystrokes("shift-r 1 2 3 4");
-        cx.assert_state("1234ˇ234ˇbc", Mode::Replace);
-        assert_eq!(cx.mode(), Mode::Replace);
-        cx.simulate_keystrokes("backspace backspace backspace backspace backspace");
-        cx.assert_state("ˇabˇcabcabc", Mode::Replace);
-    }
-
-    #[gpui::test]
-    async fn test_replace_undo(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        cx.set_state("ˇaaaa", Mode::Normal);
-        cx.simulate_keystrokes("0 shift-r b b b escape u");
-        cx.assert_state("ˇaaaa", Mode::Normal);
-    }
-
-    #[gpui::test]
-    async fn test_exchange_separate_range(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        cx.set_state("ˇhello world", Mode::Normal);
-        cx.simulate_keystrokes("c x i w w c x i w");
-        cx.assert_state("world ˇhello", Mode::Normal);
-    }
-
-    #[gpui::test]
-    async fn test_exchange_complete_overlap(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        cx.set_state("ˇhello world", Mode::Normal);
-        cx.simulate_keystrokes("c x x w c x i w");
-        cx.assert_state("ˇworld", Mode::Normal);
-
-        // the focus should still be at the start of the word if we reverse the
-        // order of selections (smaller -> larger)
-        cx.set_state("ˇhello world", Mode::Normal);
-        cx.simulate_keystrokes("c x i w c x x");
-        cx.assert_state("ˇhello", Mode::Normal);
-    }
-
-    #[gpui::test]
-    async fn test_exchange_partial_overlap(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        cx.set_state("ˇhello world", Mode::Normal);
-        cx.simulate_keystrokes("c x t r w c x i w");
-        cx.assert_state("hello ˇworld", Mode::Normal);
-    }
-
-    #[gpui::test]
-    async fn test_clear_exchange_clears_operator(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        cx.set_state("ˇirrelevant", Mode::Normal);
-        cx.simulate_keystrokes("c x c");
-
-        assert_eq!(cx.active_operator(), None);
-    }
-
-    #[gpui::test]
-    async fn test_clear_exchange(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        cx.set_state("ˇhello world", Mode::Normal);
-        cx.simulate_keystrokes("c x i w c x c");
-
-        cx.update_editor(|editor, window, cx| {
-            let highlights = editor.all_text_background_highlights(window, cx);
-            assert_eq!(0, highlights.len());
-        });
-    }
-
-    #[gpui::test]
-    async fn test_paste_replace(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        cx.set_state(indoc! {"ˇ123"}, Mode::Replace);
-        cx.write_to_clipboard(ClipboardItem::new_string("456".to_string()));
-        cx.dispatch_action(editor::actions::Paste);
-        cx.assert_state(indoc! {"45ˇ6"}, Mode::Replace);
-
-        // If the clipboard's contents length is greater than the remaining text
-        // length, nothing sould be replace and cursor should remain in the same
-        // position.
-        cx.set_state(indoc! {"ˇ123"}, Mode::Replace);
-        cx.write_to_clipboard(ClipboardItem::new_string("4567".to_string()));
-        cx.dispatch_action(editor::actions::Paste);
-        cx.assert_state(indoc! {"ˇ123"}, Mode::Replace);
-    }
-}
diff --git a/crates/vim/src/rewrap.rs b/crates/vim/src/rewrap.rs
deleted file mode 100644
index 85e1967af0..0000000000
--- a/crates/vim/src/rewrap.rs
+++ /dev/null
@@ -1,148 +0,0 @@
-use crate::{Vim, motion::Motion, object::Object, state::Mode};
-use collections::HashMap;
-use editor::{Bias, Editor, RewrapOptions, SelectionEffects, display_map::ToDisplayPoint};
-use gpui::{Context, Window, actions};
-use language::SelectionGoal;
-
-actions!(
-    vim,
-    [
-        /// Rewraps the selected text to fit within the line width.
-        Rewrap
-    ]
-);
-
-pub(crate) fn register(editor: &mut Editor, cx: &mut Context<Vim>) {
-    Vim::action(editor, cx, |vim, _: &Rewrap, window, cx| {
-        vim.record_current_action(cx);
-        Vim::take_count(cx);
-        Vim::take_forced_motion(cx);
-        vim.store_visual_marks(window, cx);
-        vim.update_editor(cx, |vim, editor, cx| {
-            editor.transact(window, cx, |editor, window, cx| {
-                let mut positions = vim.save_selection_starts(editor, cx);
-                editor.rewrap_impl(
-                    RewrapOptions {
-                        override_language_settings: true,
-                        ..Default::default()
-                    },
-                    cx,
-                );
-                editor.change_selections(Default::default(), window, cx, |s| {
-                    s.move_with(|map, selection| {
-                        if let Some(anchor) = positions.remove(&selection.id) {
-                            let mut point = anchor.to_display_point(map);
-                            *point.column_mut() = 0;
-                            selection.collapse_to(point, SelectionGoal::None);
-                        }
-                    });
-                });
-            });
-        });
-        if vim.mode.is_visual() {
-            vim.switch_mode(Mode::Normal, true, window, cx)
-        }
-    });
-}
-
-impl Vim {
-    pub(crate) fn rewrap_motion(
-        &mut self,
-        motion: Motion,
-        times: Option<usize>,
-        forced_motion: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.stop_recording(cx);
-        self.update_editor(cx, |_, editor, cx| {
-            let text_layout_details = editor.text_layout_details(window);
-            editor.transact(window, cx, |editor, window, cx| {
-                let mut selection_starts: HashMap<_, _> = Default::default();
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.move_with(|map, selection| {
-                        let anchor = map.display_point_to_anchor(selection.head(), Bias::Right);
-                        selection_starts.insert(selection.id, anchor);
-                        motion.expand_selection(
-                            map,
-                            selection,
-                            times,
-                            &text_layout_details,
-                            forced_motion,
-                        );
-                    });
-                });
-                editor.rewrap_impl(
-                    RewrapOptions {
-                        override_language_settings: true,
-                        ..Default::default()
-                    },
-                    cx,
-                );
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.move_with(|map, selection| {
-                        let anchor = selection_starts.remove(&selection.id).unwrap();
-                        let mut point = anchor.to_display_point(map);
-                        *point.column_mut() = 0;
-                        selection.collapse_to(point, SelectionGoal::None);
-                    });
-                });
-            });
-        });
-    }
-
-    pub(crate) fn rewrap_object(
-        &mut self,
-        object: Object,
-        around: bool,
-        times: Option<usize>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.stop_recording(cx);
-        self.update_editor(cx, |_, editor, cx| {
-            editor.transact(window, cx, |editor, window, cx| {
-                let mut original_positions: HashMap<_, _> = Default::default();
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.move_with(|map, selection| {
-                        let anchor = map.display_point_to_anchor(selection.head(), Bias::Right);
-                        original_positions.insert(selection.id, anchor);
-                        object.expand_selection(map, selection, around, times);
-                    });
-                });
-                editor.rewrap_impl(
-                    RewrapOptions {
-                        override_language_settings: true,
-                        ..Default::default()
-                    },
-                    cx,
-                );
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.move_with(|map, selection| {
-                        let anchor = original_positions.remove(&selection.id).unwrap();
-                        let mut point = anchor.to_display_point(map);
-                        *point.column_mut() = 0;
-                        selection.collapse_to(point, SelectionGoal::None);
-                    });
-                });
-            });
-        });
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use crate::test::NeovimBackedTestContext;
-
-    #[gpui::test]
-    async fn test_indent_gv(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.set_neovim_option("shiftwidth=4").await;
-
-        cx.set_shared_state("ˇhello\nworld\n").await;
-        cx.simulate_shared_keystrokes("v j > g v").await;
-        cx.shared_state()
-            .await
-            .assert_eq("«    hello\n ˇ»   world\n");
-    }
-}
diff --git a/crates/vim/src/state.rs b/crates/vim/src/state.rs
deleted file mode 100644
index e96fd3a329..0000000000
--- a/crates/vim/src/state.rs
+++ /dev/null
@@ -1,1835 +0,0 @@
-use crate::command::command_interceptor;
-use crate::motion::MotionKind;
-use crate::normal::repeat::Replayer;
-use crate::surrounds::SurroundsType;
-use crate::{ToggleMarksView, ToggleRegistersView, UseSystemClipboard, Vim, VimAddon, VimSettings};
-use crate::{motion::Motion, object::Object};
-use anyhow::Result;
-use collections::HashMap;
-use command_palette_hooks::{CommandPaletteFilter, GlobalCommandPaletteInterceptor};
-use db::{
-    sqlez::{domain::Domain, thread_safe_connection::ThreadSafeConnection},
-    sqlez_macros::sql,
-};
-use editor::display_map::{is_invisible, replacement};
-use editor::{Anchor, ClipboardSelection, Editor, MultiBuffer, ToPoint as EditorToPoint};
-use gpui::{
-    Action, App, AppContext, BorrowAppContext, ClipboardEntry, ClipboardItem, DismissEvent, Entity,
-    EntityId, Global, HighlightStyle, StyledText, Subscription, Task, TextStyle, WeakEntity,
-};
-use language::{Buffer, BufferEvent, BufferId, Chunk, Point};
-use multi_buffer::MultiBufferRow;
-use picker::{Picker, PickerDelegate};
-use project::{Project, ProjectItem, ProjectPath};
-use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsStore};
-use std::borrow::BorrowMut;
-use std::collections::HashSet;
-use std::path::Path;
-use std::{fmt::Display, ops::Range, sync::Arc};
-use text::{Bias, ToPoint};
-use theme::ThemeSettings;
-use ui::{
-    ActiveTheme, Context, Div, FluentBuilder, KeyBinding, ParentElement, SharedString, Styled,
-    StyledTypography, Window, h_flex, rems,
-};
-use util::ResultExt;
-use util::rel_path::RelPath;
-use workspace::searchable::Direction;
-use workspace::{Workspace, WorkspaceDb, WorkspaceId};
-
-#[derive(Clone, Copy, Default, Debug, PartialEq, Serialize, Deserialize)]
-pub enum Mode {
-    #[default]
-    Normal,
-    Insert,
-    Replace,
-    Visual,
-    VisualLine,
-    VisualBlock,
-    HelixNormal,
-    HelixSelect,
-}
-
-impl Display for Mode {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Mode::Normal => write!(f, "NORMAL"),
-            Mode::Insert => write!(f, "INSERT"),
-            Mode::Replace => write!(f, "REPLACE"),
-            Mode::Visual => write!(f, "VISUAL"),
-            Mode::VisualLine => write!(f, "VISUAL LINE"),
-            Mode::VisualBlock => write!(f, "VISUAL BLOCK"),
-            Mode::HelixNormal => write!(f, "NORMAL"),
-            Mode::HelixSelect => write!(f, "SELECT"),
-        }
-    }
-}
-
-impl Mode {
-    pub fn is_visual(&self) -> bool {
-        match self {
-            Self::Visual | Self::VisualLine | Self::VisualBlock | Self::HelixSelect => true,
-            Self::Normal | Self::Insert | Self::Replace | Self::HelixNormal => false,
-        }
-    }
-}
-
-#[derive(Clone, Debug, PartialEq)]
-pub enum Operator {
-    Change,
-    Delete,
-    Yank,
-    Replace,
-    Object {
-        around: bool,
-    },
-    FindForward {
-        before: bool,
-        multiline: bool,
-    },
-    FindBackward {
-        after: bool,
-        multiline: bool,
-    },
-    Sneak {
-        first_char: Option<char>,
-    },
-    SneakBackward {
-        first_char: Option<char>,
-    },
-    AddSurrounds {
-        // Typically no need to configure this as `SendKeystrokes` can be used - see #23088.
-        target: Option<SurroundsType>,
-    },
-    ChangeSurrounds {
-        target: Option<Object>,
-        /// Represents whether the opening bracket was used for the target
-        /// object.
-        opening: bool,
-    },
-    DeleteSurrounds,
-    Mark,
-    Jump {
-        line: bool,
-    },
-    Indent,
-    Outdent,
-    AutoIndent,
-    Rewrap,
-    ShellCommand,
-    Lowercase,
-    Uppercase,
-    OppositeCase,
-    Rot13,
-    Rot47,
-    Digraph {
-        first_char: Option<char>,
-    },
-    Literal {
-        prefix: Option<String>,
-    },
-    Register,
-    RecordRegister,
-    ReplayRegister,
-    ToggleComments,
-    ReplaceWithRegister,
-    Exchange,
-    HelixMatch,
-    HelixNext {
-        around: bool,
-    },
-    HelixPrevious {
-        around: bool,
-    },
-}
-
-#[derive(Default, Clone, Debug)]
-pub enum RecordedSelection {
-    #[default]
-    None,
-    Visual {
-        rows: u32,
-        cols: u32,
-    },
-    SingleLine {
-        cols: u32,
-    },
-    VisualBlock {
-        rows: u32,
-        cols: u32,
-    },
-    VisualLine {
-        rows: u32,
-    },
-}
-
-#[derive(Default, Clone, Debug)]
-pub struct Register {
-    pub(crate) text: SharedString,
-    pub(crate) clipboard_selections: Option<Vec<ClipboardSelection>>,
-}
-
-impl From<Register> for ClipboardItem {
-    fn from(register: Register) -> Self {
-        if let Some(clipboard_selections) = register.clipboard_selections {
-            ClipboardItem::new_string_with_json_metadata(register.text.into(), clipboard_selections)
-        } else {
-            ClipboardItem::new_string(register.text.into())
-        }
-    }
-}
-
-impl From<ClipboardItem> for Register {
-    fn from(item: ClipboardItem) -> Self {
-        // For now, we don't store metadata for multiple entries.
-        match item.entries().first() {
-            Some(ClipboardEntry::String(value)) if item.entries().len() == 1 => Register {
-                text: value.text().to_owned().into(),
-                clipboard_selections: value.metadata_json::<Vec<ClipboardSelection>>(),
-            },
-            // For now, registers can't store images. This could change in the future.
-            _ => Register::default(),
-        }
-    }
-}
-
-impl From<String> for Register {
-    fn from(text: String) -> Self {
-        Register {
-            text: text.into(),
-            clipboard_selections: None,
-        }
-    }
-}
-
-#[derive(Default)]
-pub struct VimGlobals {
-    pub last_find: Option<Motion>,
-
-    pub dot_recording: bool,
-    pub dot_replaying: bool,
-
-    /// pre_count is the number before an operator is specified (3 in 3d2d)
-    pub pre_count: Option<usize>,
-    /// post_count is the number after an operator is specified (2 in 3d2d)
-    pub post_count: Option<usize>,
-    pub forced_motion: bool,
-    pub stop_recording_after_next_action: bool,
-    pub ignore_current_insertion: bool,
-    pub recording_count: Option<usize>,
-    pub recorded_count: Option<usize>,
-    pub recording_actions: Vec<ReplayableAction>,
-    pub recorded_actions: Vec<ReplayableAction>,
-    pub recorded_selection: RecordedSelection,
-
-    pub recording_register: Option<char>,
-    pub last_recorded_register: Option<char>,
-    pub last_replayed_register: Option<char>,
-    pub replayer: Option<Replayer>,
-
-    pub last_yank: Option<SharedString>,
-    pub registers: HashMap<char, Register>,
-    pub recordings: HashMap<char, Vec<ReplayableAction>>,
-
-    pub focused_vim: Option<WeakEntity<Vim>>,
-
-    pub marks: HashMap<EntityId, Entity<MarksState>>,
-}
-
-pub struct MarksState {
-    workspace: WeakEntity<Workspace>,
-
-    multibuffer_marks: HashMap<EntityId, HashMap<String, Vec<Anchor>>>,
-    buffer_marks: HashMap<BufferId, HashMap<String, Vec<text::Anchor>>>,
-    watched_buffers: HashMap<BufferId, (MarkLocation, Subscription, Subscription)>,
-
-    serialized_marks: HashMap<Arc<Path>, HashMap<String, Vec<Point>>>,
-    global_marks: HashMap<String, MarkLocation>,
-
-    _subscription: Subscription,
-}
-
-#[derive(Debug, PartialEq, Eq, Clone)]
-pub enum MarkLocation {
-    Buffer(EntityId),
-    Path(Arc<Path>),
-}
-
-pub enum Mark {
-    Local(Vec<Anchor>),
-    Buffer(EntityId, Vec<Anchor>),
-    Path(Arc<Path>, Vec<Point>),
-}
-
-impl MarksState {
-    pub fn new(workspace: &Workspace, cx: &mut App) -> Entity<MarksState> {
-        cx.new(|cx| {
-            let buffer_store = workspace.project().read(cx).buffer_store().clone();
-            let subscription = cx.subscribe(&buffer_store, move |this: &mut Self, _, event, cx| {
-                if let project::buffer_store::BufferStoreEvent::BufferAdded(buffer) = event {
-                    this.on_buffer_loaded(buffer, cx);
-                }
-            });
-
-            let mut this = Self {
-                workspace: workspace.weak_handle(),
-                multibuffer_marks: HashMap::default(),
-                buffer_marks: HashMap::default(),
-                watched_buffers: HashMap::default(),
-                serialized_marks: HashMap::default(),
-                global_marks: HashMap::default(),
-                _subscription: subscription,
-            };
-
-            this.load(cx);
-            this
-        })
-    }
-
-    fn workspace_id(&self, cx: &App) -> Option<WorkspaceId> {
-        self.workspace
-            .read_with(cx, |workspace, _| workspace.database_id())
-            .ok()
-            .flatten()
-    }
-
-    fn project(&self, cx: &App) -> Option<Entity<Project>> {
-        self.workspace
-            .read_with(cx, |workspace, _| workspace.project().clone())
-            .ok()
-    }
-
-    fn load(&mut self, cx: &mut Context<Self>) {
-        cx.spawn(async move |this, cx| {
-            let Some(workspace_id) = this.update(cx, |this, cx| this.workspace_id(cx)).ok()? else {
-                return None;
-            };
-            let (marks, paths) = cx
-                .background_spawn(async move {
-                    let marks = DB.get_marks(workspace_id)?;
-                    let paths = DB.get_global_marks_paths(workspace_id)?;
-                    anyhow::Ok((marks, paths))
-                })
-                .await
-                .log_err()?;
-            this.update(cx, |this, cx| this.loaded(marks, paths, cx))
-                .ok()
-        })
-        .detach();
-    }
-
-    fn loaded(
-        &mut self,
-        marks: Vec<SerializedMark>,
-        global_mark_paths: Vec<(String, Arc<Path>)>,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(project) = self.project(cx) else {
-            return;
-        };
-
-        for mark in marks {
-            self.serialized_marks
-                .entry(mark.path)
-                .or_default()
-                .insert(mark.name, mark.points);
-        }
-
-        for (name, path) in global_mark_paths {
-            self.global_marks
-                .insert(name, MarkLocation::Path(path.clone()));
-
-            let project_path = project
-                .read(cx)
-                .worktrees(cx)
-                .filter_map(|worktree| {
-                    let relative = path.strip_prefix(worktree.read(cx).abs_path()).ok()?;
-                    let path = RelPath::new(relative, worktree.read(cx).path_style()).log_err()?;
-                    Some(ProjectPath {
-                        worktree_id: worktree.read(cx).id(),
-                        path: path.into_arc(),
-                    })
-                })
-                .next();
-            if let Some(buffer) = project_path
-                .and_then(|project_path| project.read(cx).get_open_buffer(&project_path, cx))
-            {
-                self.on_buffer_loaded(&buffer, cx)
-            }
-        }
-    }
-
-    pub fn on_buffer_loaded(&mut self, buffer_handle: &Entity<Buffer>, cx: &mut Context<Self>) {
-        let Some(project) = self.project(cx) else {
-            return;
-        };
-        let Some(project_path) = buffer_handle.read(cx).project_path(cx) else {
-            return;
-        };
-        let Some(abs_path) = project.read(cx).absolute_path(&project_path, cx) else {
-            return;
-        };
-        let abs_path: Arc<Path> = abs_path.into();
-
-        let Some(serialized_marks) = self.serialized_marks.get(&abs_path) else {
-            return;
-        };
-
-        let mut loaded_marks = HashMap::default();
-        let buffer = buffer_handle.read(cx);
-        for (name, points) in serialized_marks.iter() {
-            loaded_marks.insert(
-                name.clone(),
-                points
-                    .iter()
-                    .map(|point| buffer.anchor_before(buffer.clip_point(*point, Bias::Left)))
-                    .collect(),
-            );
-        }
-        self.buffer_marks.insert(buffer.remote_id(), loaded_marks);
-        self.watch_buffer(MarkLocation::Path(abs_path), buffer_handle, cx)
-    }
-
-    fn serialize_buffer_marks(
-        &mut self,
-        path: Arc<Path>,
-        buffer: &Entity<Buffer>,
-        cx: &mut Context<Self>,
-    ) {
-        let new_points: HashMap<String, Vec<Point>> =
-            if let Some(anchors) = self.buffer_marks.get(&buffer.read(cx).remote_id()) {
-                anchors
-                    .iter()
-                    .map(|(name, anchors)| {
-                        (
-                            name.clone(),
-                            buffer
-                                .read(cx)
-                                .summaries_for_anchors::<Point, _>(anchors)
-                                .collect(),
-                        )
-                    })
-                    .collect()
-            } else {
-                HashMap::default()
-            };
-        let old_points = self.serialized_marks.get(&path);
-        if old_points == Some(&new_points) {
-            return;
-        }
-        let mut to_write = HashMap::default();
-
-        for (key, value) in &new_points {
-            if self.is_global_mark(key)
-                && self.global_marks.get(key) != Some(&MarkLocation::Path(path.clone()))
-            {
-                if let Some(workspace_id) = self.workspace_id(cx) {
-                    let path = path.clone();
-                    let key = key.clone();
-                    cx.background_spawn(async move {
-                        DB.set_global_mark_path(workspace_id, key, path).await
-                    })
-                    .detach_and_log_err(cx);
-                }
-
-                self.global_marks
-                    .insert(key.clone(), MarkLocation::Path(path.clone()));
-            }
-            if old_points.and_then(|o| o.get(key)) != Some(value) {
-                to_write.insert(key.clone(), value.clone());
-            }
-        }
-
-        self.serialized_marks.insert(path.clone(), new_points);
-
-        if let Some(workspace_id) = self.workspace_id(cx) {
-            cx.background_spawn(async move {
-                DB.set_marks(workspace_id, path.clone(), to_write).await?;
-                anyhow::Ok(())
-            })
-            .detach_and_log_err(cx);
-        }
-    }
-
-    fn is_global_mark(&self, key: &str) -> bool {
-        key.chars()
-            .next()
-            .is_some_and(|c| c.is_uppercase() || c.is_digit(10))
-    }
-
-    fn rename_buffer(
-        &mut self,
-        old_path: MarkLocation,
-        new_path: Arc<Path>,
-        buffer: &Entity<Buffer>,
-        cx: &mut Context<Self>,
-    ) {
-        if let MarkLocation::Buffer(entity_id) = old_path
-            && let Some(old_marks) = self.multibuffer_marks.remove(&entity_id)
-        {
-            let buffer_marks = old_marks
-                .into_iter()
-                .map(|(k, v)| (k, v.into_iter().map(|anchor| anchor.text_anchor).collect()))
-                .collect();
-            self.buffer_marks
-                .insert(buffer.read(cx).remote_id(), buffer_marks);
-        }
-        self.watch_buffer(MarkLocation::Path(new_path.clone()), buffer, cx);
-        self.serialize_buffer_marks(new_path, buffer, cx);
-    }
-
-    fn path_for_buffer(&self, buffer: &Entity<Buffer>, cx: &App) -> Option<Arc<Path>> {
-        let project_path = buffer.read(cx).project_path(cx)?;
-        let project = self.project(cx)?;
-        let abs_path = project.read(cx).absolute_path(&project_path, cx)?;
-        Some(abs_path.into())
-    }
-
-    fn points_at(
-        &self,
-        location: &MarkLocation,
-        multi_buffer: &Entity<MultiBuffer>,
-        cx: &App,
-    ) -> bool {
-        match location {
-            MarkLocation::Buffer(entity_id) => entity_id == &multi_buffer.entity_id(),
-            MarkLocation::Path(path) => {
-                let Some(singleton) = multi_buffer.read(cx).as_singleton() else {
-                    return false;
-                };
-                self.path_for_buffer(&singleton, cx).as_ref() == Some(path)
-            }
-        }
-    }
-
-    pub fn watch_buffer(
-        &mut self,
-        mark_location: MarkLocation,
-        buffer_handle: &Entity<Buffer>,
-        cx: &mut Context<Self>,
-    ) {
-        let on_change = cx.subscribe(buffer_handle, move |this, buffer, event, cx| match event {
-            BufferEvent::Edited => {
-                if let Some(path) = this.path_for_buffer(&buffer, cx) {
-                    this.serialize_buffer_marks(path, &buffer, cx);
-                }
-            }
-            BufferEvent::FileHandleChanged => {
-                let buffer_id = buffer.read(cx).remote_id();
-                if let Some(old_path) = this
-                    .watched_buffers
-                    .get(&buffer_id.clone())
-                    .map(|(path, _, _)| path.clone())
-                    && let Some(new_path) = this.path_for_buffer(&buffer, cx)
-                {
-                    this.rename_buffer(old_path, new_path, &buffer, cx)
-                }
-            }
-            _ => {}
-        });
-
-        let on_release = cx.observe_release(buffer_handle, |this, buffer, _| {
-            this.watched_buffers.remove(&buffer.remote_id());
-            this.buffer_marks.remove(&buffer.remote_id());
-        });
-
-        self.watched_buffers.insert(
-            buffer_handle.read(cx).remote_id(),
-            (mark_location, on_change, on_release),
-        );
-    }
-
-    pub fn set_mark(
-        &mut self,
-        name: String,
-        multibuffer: &Entity<MultiBuffer>,
-        anchors: Vec<Anchor>,
-        cx: &mut Context<Self>,
-    ) {
-        let buffer = multibuffer.read(cx).as_singleton();
-        let abs_path = buffer.as_ref().and_then(|b| self.path_for_buffer(b, cx));
-
-        let Some(abs_path) = abs_path else {
-            self.multibuffer_marks
-                .entry(multibuffer.entity_id())
-                .or_default()
-                .insert(name.clone(), anchors);
-            if self.is_global_mark(&name) {
-                self.global_marks
-                    .insert(name, MarkLocation::Buffer(multibuffer.entity_id()));
-            }
-            if let Some(buffer) = buffer {
-                let buffer_id = buffer.read(cx).remote_id();
-                if !self.watched_buffers.contains_key(&buffer_id) {
-                    self.watch_buffer(MarkLocation::Buffer(multibuffer.entity_id()), &buffer, cx)
-                }
-            }
-            return;
-        };
-        let Some(buffer) = buffer else {
-            return;
-        };
-
-        let buffer_id = buffer.read(cx).remote_id();
-        self.buffer_marks.entry(buffer_id).or_default().insert(
-            name,
-            anchors
-                .into_iter()
-                .map(|anchor| anchor.text_anchor)
-                .collect(),
-        );
-        if !self.watched_buffers.contains_key(&buffer_id) {
-            self.watch_buffer(MarkLocation::Path(abs_path.clone()), &buffer, cx)
-        }
-        self.serialize_buffer_marks(abs_path, &buffer, cx)
-    }
-
-    pub fn get_mark(
-        &self,
-        name: &str,
-        multi_buffer: &Entity<MultiBuffer>,
-        cx: &App,
-    ) -> Option<Mark> {
-        let target = self.global_marks.get(name);
-
-        if !self.is_global_mark(name) || target.is_some_and(|t| self.points_at(t, multi_buffer, cx))
-        {
-            if let Some(anchors) = self.multibuffer_marks.get(&multi_buffer.entity_id()) {
-                return Some(Mark::Local(anchors.get(name)?.clone()));
-            }
-
-            let singleton = multi_buffer.read(cx).as_singleton()?;
-            let excerpt_id = *multi_buffer.read(cx).excerpt_ids().first()?;
-            let buffer_id = singleton.read(cx).remote_id();
-            if let Some(anchors) = self.buffer_marks.get(&buffer_id) {
-                let text_anchors = anchors.get(name)?;
-                let anchors = text_anchors
-                    .iter()
-                    .map(|anchor| Anchor::in_buffer(excerpt_id, *anchor))
-                    .collect();
-                return Some(Mark::Local(anchors));
-            }
-        }
-
-        match target? {
-            MarkLocation::Buffer(entity_id) => {
-                let anchors = self.multibuffer_marks.get(entity_id)?;
-                Some(Mark::Buffer(*entity_id, anchors.get(name)?.clone()))
-            }
-            MarkLocation::Path(path) => {
-                let points = self.serialized_marks.get(path)?;
-                Some(Mark::Path(path.clone(), points.get(name)?.clone()))
-            }
-        }
-    }
-    pub fn delete_mark(
-        &mut self,
-        mark_name: String,
-        multi_buffer: &Entity<MultiBuffer>,
-        cx: &mut Context<Self>,
-    ) {
-        let path = if let Some(target) = self.global_marks.get(&mark_name.clone()) {
-            let name = mark_name.clone();
-            if let Some(workspace_id) = self.workspace_id(cx) {
-                cx.background_spawn(async move {
-                    DB.delete_global_marks_path(workspace_id, name).await
-                })
-                .detach_and_log_err(cx);
-            }
-            self.buffer_marks.iter_mut().for_each(|(_, m)| {
-                m.remove(&mark_name.clone());
-            });
-
-            match target {
-                MarkLocation::Buffer(entity_id) => {
-                    self.multibuffer_marks
-                        .get_mut(entity_id)
-                        .map(|m| m.remove(&mark_name.clone()));
-                    return;
-                }
-                MarkLocation::Path(path) => path.clone(),
-            }
-        } else {
-            self.multibuffer_marks
-                .get_mut(&multi_buffer.entity_id())
-                .map(|m| m.remove(&mark_name.clone()));
-
-            if let Some(singleton) = multi_buffer.read(cx).as_singleton() {
-                let buffer_id = singleton.read(cx).remote_id();
-                self.buffer_marks
-                    .get_mut(&buffer_id)
-                    .map(|m| m.remove(&mark_name.clone()));
-                let Some(path) = self.path_for_buffer(&singleton, cx) else {
-                    return;
-                };
-                path
-            } else {
-                return;
-            }
-        };
-        self.global_marks.remove(&mark_name);
-        self.serialized_marks
-            .get_mut(&path)
-            .map(|m| m.remove(&mark_name.clone()));
-        if let Some(workspace_id) = self.workspace_id(cx) {
-            cx.background_spawn(async move { DB.delete_mark(workspace_id, path, mark_name).await })
-                .detach_and_log_err(cx);
-        }
-    }
-}
-
-impl Global for VimGlobals {}
-
-impl VimGlobals {
-    pub(crate) fn register(cx: &mut App) {
-        cx.set_global(VimGlobals::default());
-
-        cx.observe_keystrokes(|event, _, cx| {
-            let Some(action) = event.action.as_ref().map(|action| action.boxed_clone()) else {
-                return;
-            };
-            Vim::globals(cx).observe_action(action.boxed_clone())
-        })
-        .detach();
-
-        cx.observe_new(|workspace: &mut Workspace, window, _| {
-            RegistersView::register(workspace, window);
-        })
-        .detach();
-
-        cx.observe_new(move |workspace: &mut Workspace, window, _| {
-            MarksView::register(workspace, window);
-        })
-        .detach();
-
-        let mut was_enabled = None;
-
-        cx.observe_global::<SettingsStore>(move |cx| {
-            let is_enabled = Vim::enabled(cx);
-            if was_enabled == Some(is_enabled) {
-                return;
-            }
-            was_enabled = Some(is_enabled);
-            if is_enabled {
-                KeyBinding::set_vim_mode(cx, true);
-                CommandPaletteFilter::update_global(cx, |filter, _| {
-                    filter.show_namespace(Vim::NAMESPACE);
-                });
-                GlobalCommandPaletteInterceptor::set(cx, command_interceptor);
-                for window in cx.windows() {
-                    if let Some(workspace) = window.downcast::<Workspace>() {
-                        workspace
-                            .update(cx, |workspace, _, cx| {
-                                Vim::update_globals(cx, |globals, cx| {
-                                    globals.register_workspace(workspace, cx)
-                                });
-                            })
-                            .ok();
-                    }
-                }
-            } else {
-                KeyBinding::set_vim_mode(cx, false);
-                *Vim::globals(cx) = VimGlobals::default();
-                GlobalCommandPaletteInterceptor::clear(cx);
-                CommandPaletteFilter::update_global(cx, |filter, _| {
-                    filter.hide_namespace(Vim::NAMESPACE);
-                });
-            }
-        })
-        .detach();
-        cx.observe_new(|workspace: &mut Workspace, _, cx| {
-            Vim::update_globals(cx, |globals, cx| globals.register_workspace(workspace, cx));
-        })
-        .detach()
-    }
-
-    fn register_workspace(&mut self, workspace: &Workspace, cx: &mut Context<Workspace>) {
-        let entity_id = cx.entity_id();
-        self.marks.insert(entity_id, MarksState::new(workspace, cx));
-        cx.observe_release(&cx.entity(), move |_, _, cx| {
-            Vim::update_globals(cx, |globals, _| {
-                globals.marks.remove(&entity_id);
-            })
-        })
-        .detach();
-    }
-
-    pub(crate) fn write_registers(
-        &mut self,
-        content: Register,
-        register: Option<char>,
-        is_yank: bool,
-        kind: MotionKind,
-        cx: &mut Context<Editor>,
-    ) {
-        if let Some(register) = register {
-            let lower = register.to_lowercase().next().unwrap_or(register);
-            if lower != register {
-                let current = self.registers.entry(lower).or_default();
-                current.text = (current.text.to_string() + &content.text).into();
-                // not clear how to support appending to registers with multiple cursors
-                current.clipboard_selections.take();
-                let yanked = current.clone();
-                self.registers.insert('"', yanked);
-            } else {
-                match lower {
-                    '_' | ':' | '.' | '%' | '#' | '=' | '/' => {}
-                    '+' => {
-                        self.registers.insert('"', content.clone());
-                        cx.write_to_clipboard(content.into());
-                    }
-                    '*' => {
-                        self.registers.insert('"', content.clone());
-                        #[cfg(any(target_os = "linux", target_os = "freebsd"))]
-                        cx.write_to_primary(content.into());
-                        #[cfg(not(any(target_os = "linux", target_os = "freebsd")))]
-                        cx.write_to_clipboard(content.into());
-                    }
-                    '"' => {
-                        self.registers.insert('"', content.clone());
-                        self.registers.insert('0', content);
-                    }
-                    _ => {
-                        self.registers.insert('"', content.clone());
-                        self.registers.insert(lower, content);
-                    }
-                }
-            }
-        } else {
-            let setting = VimSettings::get_global(cx).use_system_clipboard;
-            if setting == UseSystemClipboard::Always
-                || setting == UseSystemClipboard::OnYank && is_yank
-            {
-                self.last_yank.replace(content.text.clone());
-                cx.write_to_clipboard(content.clone().into());
-            } else {
-                if let Some(text) = cx.read_from_clipboard().and_then(|i| i.text()) {
-                    self.last_yank.replace(text.into());
-                }
-            }
-            self.registers.insert('"', content.clone());
-            if is_yank {
-                self.registers.insert('0', content);
-            } else {
-                let contains_newline = content.text.contains('\n');
-                if !contains_newline {
-                    self.registers.insert('-', content.clone());
-                }
-                if kind.linewise() || contains_newline {
-                    let mut content = content;
-                    for i in '1'..='9' {
-                        if let Some(moved) = self.registers.insert(i, content) {
-                            content = moved;
-                        } else {
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    pub(crate) fn read_register(
-        &self,
-        register: Option<char>,
-        editor: Option<&mut Editor>,
-        cx: &mut App,
-    ) -> Option<Register> {
-        let Some(register) = register.filter(|reg| *reg != '"') else {
-            let setting = VimSettings::get_global(cx).use_system_clipboard;
-            return match setting {
-                UseSystemClipboard::Always => cx.read_from_clipboard().map(|item| item.into()),
-                UseSystemClipboard::OnYank if self.system_clipboard_is_newer(cx) => {
-                    cx.read_from_clipboard().map(|item| item.into())
-                }
-                _ => self.registers.get(&'"').cloned(),
-            };
-        };
-        let lower = register.to_lowercase().next().unwrap_or(register);
-        match lower {
-            '_' | ':' | '.' | '#' | '=' => None,
-            '+' => cx.read_from_clipboard().map(|item| item.into()),
-            '*' => {
-                #[cfg(any(target_os = "linux", target_os = "freebsd"))]
-                {
-                    cx.read_from_primary().map(|item| item.into())
-                }
-                #[cfg(not(any(target_os = "linux", target_os = "freebsd")))]
-                {
-                    cx.read_from_clipboard().map(|item| item.into())
-                }
-            }
-            '%' => editor.and_then(|editor| {
-                let selection = editor
-                    .selections
-                    .newest::<Point>(&editor.display_snapshot(cx));
-                if let Some((_, buffer, _)) = editor
-                    .buffer()
-                    .read(cx)
-                    .excerpt_containing(selection.head(), cx)
-                {
-                    buffer
-                        .read(cx)
-                        .file()
-                        .map(|file| file.path().display(file.path_style(cx)).into_owned().into())
-                } else {
-                    None
-                }
-            }),
-            _ => self.registers.get(&lower).cloned(),
-        }
-    }
-
-    fn system_clipboard_is_newer(&self, cx: &App) -> bool {
-        cx.read_from_clipboard().is_some_and(|item| {
-            match (item.text().as_deref(), &self.last_yank) {
-                (Some(new), Some(last)) => last.as_ref() != new,
-                (Some(_), None) => true,
-                (None, _) => false,
-            }
-        })
-    }
-
-    pub fn observe_action(&mut self, action: Box<dyn Action>) {
-        if self.dot_recording {
-            self.recording_actions
-                .push(ReplayableAction::Action(action.boxed_clone()));
-
-            if self.stop_recording_after_next_action {
-                self.dot_recording = false;
-                self.recorded_actions = std::mem::take(&mut self.recording_actions);
-                self.recorded_count = self.recording_count.take();
-                self.stop_recording_after_next_action = false;
-            }
-        }
-        if self.replayer.is_none()
-            && let Some(recording_register) = self.recording_register
-        {
-            self.recordings
-                .entry(recording_register)
-                .or_default()
-                .push(ReplayableAction::Action(action));
-        }
-    }
-
-    pub fn observe_insertion(&mut self, text: &Arc<str>, range_to_replace: Option<Range<isize>>) {
-        if self.ignore_current_insertion {
-            self.ignore_current_insertion = false;
-            return;
-        }
-        if self.dot_recording {
-            self.recording_actions.push(ReplayableAction::Insertion {
-                text: text.clone(),
-                utf16_range_to_replace: range_to_replace.clone(),
-            });
-            if self.stop_recording_after_next_action {
-                self.dot_recording = false;
-                self.recorded_actions = std::mem::take(&mut self.recording_actions);
-                self.recorded_count = self.recording_count.take();
-                self.stop_recording_after_next_action = false;
-            }
-        }
-        if let Some(recording_register) = self.recording_register {
-            self.recordings.entry(recording_register).or_default().push(
-                ReplayableAction::Insertion {
-                    text: text.clone(),
-                    utf16_range_to_replace: range_to_replace,
-                },
-            );
-        }
-    }
-
-    pub fn focused_vim(&self) -> Option<Entity<Vim>> {
-        self.focused_vim.as_ref().and_then(|vim| vim.upgrade())
-    }
-}
-
-impl Vim {
-    pub fn globals(cx: &mut App) -> &mut VimGlobals {
-        cx.global_mut::<VimGlobals>()
-    }
-
-    pub fn update_globals<C, R>(cx: &mut C, f: impl FnOnce(&mut VimGlobals, &mut C) -> R) -> R
-    where
-        C: BorrowMut<App>,
-    {
-        cx.update_global(f)
-    }
-}
-
-#[derive(Debug)]
-pub enum ReplayableAction {
-    Action(Box<dyn Action>),
-    Insertion {
-        text: Arc<str>,
-        utf16_range_to_replace: Option<Range<isize>>,
-    },
-}
-
-impl Clone for ReplayableAction {
-    fn clone(&self) -> Self {
-        match self {
-            Self::Action(action) => Self::Action(action.boxed_clone()),
-            Self::Insertion {
-                text,
-                utf16_range_to_replace,
-            } => Self::Insertion {
-                text: text.clone(),
-                utf16_range_to_replace: utf16_range_to_replace.clone(),
-            },
-        }
-    }
-}
-
-#[derive(Clone, Default, Debug)]
-pub struct SearchState {
-    pub direction: Direction,
-    pub count: usize,
-
-    pub prior_selections: Vec<Range<Anchor>>,
-    pub prior_operator: Option<Operator>,
-    pub prior_mode: Mode,
-    pub helix_select: bool,
-}
-
-impl Operator {
-    pub fn id(&self) -> &'static str {
-        match self {
-            Operator::Object { around: false } => "i",
-            Operator::Object { around: true } => "a",
-            Operator::Change => "c",
-            Operator::Delete => "d",
-            Operator::Yank => "y",
-            Operator::Replace => "r",
-            Operator::Digraph { .. } => "^K",
-            Operator::Literal { .. } => "^V",
-            Operator::FindForward { before: false, .. } => "f",
-            Operator::FindForward { before: true, .. } => "t",
-            Operator::Sneak { .. } => "s",
-            Operator::SneakBackward { .. } => "S",
-            Operator::FindBackward { after: false, .. } => "F",
-            Operator::FindBackward { after: true, .. } => "T",
-            Operator::AddSurrounds { .. } => "ys",
-            Operator::ChangeSurrounds { .. } => "cs",
-            Operator::DeleteSurrounds => "ds",
-            Operator::Mark => "m",
-            Operator::Jump { line: true } => "'",
-            Operator::Jump { line: false } => "`",
-            Operator::Indent => ">",
-            Operator::AutoIndent => "eq",
-            Operator::ShellCommand => "sh",
-            Operator::Rewrap => "gq",
-            Operator::ReplaceWithRegister => "gR",
-            Operator::Exchange => "cx",
-            Operator::Outdent => "<",
-            Operator::Uppercase => "gU",
-            Operator::Lowercase => "gu",
-            Operator::OppositeCase => "g~",
-            Operator::Rot13 => "g?",
-            Operator::Rot47 => "g?",
-            Operator::Register => "\"",
-            Operator::RecordRegister => "q",
-            Operator::ReplayRegister => "@",
-            Operator::ToggleComments => "gc",
-            Operator::HelixMatch => "helix_m",
-            Operator::HelixNext { .. } => "helix_next",
-            Operator::HelixPrevious { .. } => "helix_previous",
-        }
-    }
-
-    pub fn status(&self) -> String {
-        fn make_visible(c: &str) -> &str {
-            match c {
-                "\n" => "enter",
-                "\t" => "tab",
-                " " => "space",
-                c => c,
-            }
-        }
-        match self {
-            Operator::Digraph {
-                first_char: Some(first_char),
-            } => format!("^K{}", make_visible(&first_char.to_string())),
-            Operator::Literal {
-                prefix: Some(prefix),
-            } => format!("^V{}", make_visible(prefix)),
-            Operator::AutoIndent => "=".to_string(),
-            Operator::ShellCommand => "=".to_string(),
-            Operator::HelixMatch => "m".to_string(),
-            Operator::HelixNext { .. } => "]".to_string(),
-            Operator::HelixPrevious { .. } => "[".to_string(),
-            _ => self.id().to_string(),
-        }
-    }
-
-    pub fn is_waiting(&self, mode: Mode) -> bool {
-        match self {
-            Operator::AddSurrounds { target } => target.is_some() || mode.is_visual(),
-            Operator::FindForward { .. }
-            | Operator::Mark
-            | Operator::Jump { .. }
-            | Operator::FindBackward { .. }
-            | Operator::Sneak { .. }
-            | Operator::SneakBackward { .. }
-            | Operator::Register
-            | Operator::RecordRegister
-            | Operator::ReplayRegister
-            | Operator::Replace
-            | Operator::Digraph { .. }
-            | Operator::Literal { .. }
-            | Operator::ChangeSurrounds {
-                target: Some(_), ..
-            }
-            | Operator::DeleteSurrounds => true,
-            Operator::Change
-            | Operator::Delete
-            | Operator::Yank
-            | Operator::Rewrap
-            | Operator::Indent
-            | Operator::Outdent
-            | Operator::AutoIndent
-            | Operator::ShellCommand
-            | Operator::Lowercase
-            | Operator::Uppercase
-            | Operator::Rot13
-            | Operator::Rot47
-            | Operator::ReplaceWithRegister
-            | Operator::Exchange
-            | Operator::Object { .. }
-            | Operator::ChangeSurrounds { target: None, .. }
-            | Operator::OppositeCase
-            | Operator::ToggleComments
-            | Operator::HelixMatch
-            | Operator::HelixNext { .. }
-            | Operator::HelixPrevious { .. } => false,
-        }
-    }
-
-    pub fn starts_dot_recording(&self) -> bool {
-        match self {
-            Operator::Change
-            | Operator::Delete
-            | Operator::Replace
-            | Operator::Indent
-            | Operator::Outdent
-            | Operator::AutoIndent
-            | Operator::Lowercase
-            | Operator::Uppercase
-            | Operator::OppositeCase
-            | Operator::Rot13
-            | Operator::Rot47
-            | Operator::ToggleComments
-            | Operator::ReplaceWithRegister
-            | Operator::Rewrap
-            | Operator::ShellCommand
-            | Operator::AddSurrounds { target: None }
-            | Operator::ChangeSurrounds { target: None, .. }
-            | Operator::DeleteSurrounds
-            | Operator::Exchange
-            | Operator::HelixNext { .. }
-            | Operator::HelixPrevious { .. } => true,
-            Operator::Yank
-            | Operator::Object { .. }
-            | Operator::FindForward { .. }
-            | Operator::FindBackward { .. }
-            | Operator::Sneak { .. }
-            | Operator::SneakBackward { .. }
-            | Operator::Mark
-            | Operator::Digraph { .. }
-            | Operator::Literal { .. }
-            | Operator::AddSurrounds { .. }
-            | Operator::ChangeSurrounds { .. }
-            | Operator::Jump { .. }
-            | Operator::Register
-            | Operator::RecordRegister
-            | Operator::ReplayRegister
-            | Operator::HelixMatch => false,
-        }
-    }
-}
-
-struct RegisterMatch {
-    name: char,
-    contents: SharedString,
-}
-
-pub struct RegistersViewDelegate {
-    selected_index: usize,
-    matches: Vec<RegisterMatch>,
-}
-
-impl PickerDelegate for RegistersViewDelegate {
-    type ListItem = Div;
-
-    fn match_count(&self) -> usize {
-        self.matches.len()
-    }
-
-    fn selected_index(&self) -> usize {
-        self.selected_index
-    }
-
-    fn set_selected_index(&mut self, ix: usize, _: &mut Window, cx: &mut Context<Picker<Self>>) {
-        self.selected_index = ix;
-        cx.notify();
-    }
-
-    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
-        Arc::default()
-    }
-
-    fn update_matches(
-        &mut self,
-        _: String,
-        _: &mut Window,
-        _: &mut Context<Picker<Self>>,
-    ) -> gpui::Task<()> {
-        Task::ready(())
-    }
-
-    fn confirm(&mut self, _: bool, _: &mut Window, _: &mut Context<Picker<Self>>) {}
-
-    fn dismissed(&mut self, _: &mut Window, _: &mut Context<Picker<Self>>) {}
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        _: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<Self::ListItem> {
-        let register_match = self.matches.get(ix)?;
-
-        let mut output = String::new();
-        let mut runs = Vec::new();
-        output.push('"');
-        output.push(register_match.name);
-        runs.push((
-            0..output.len(),
-            HighlightStyle::color(cx.theme().colors().text_accent),
-        ));
-        output.push(' ');
-        output.push(' ');
-        let mut base = output.len();
-        for (ix, c) in register_match.contents.char_indices() {
-            if ix > 100 {
-                break;
-            }
-            let replace = match c {
-                '\t' => Some("\\t".to_string()),
-                '\n' => Some("\\n".to_string()),
-                '\r' => Some("\\r".to_string()),
-                c if is_invisible(c) => {
-                    if c <= '\x1f' {
-                        replacement(c).map(|s| s.to_string())
-                    } else {
-                        Some(format!("\\u{:04X}", c as u32))
-                    }
-                }
-                _ => None,
-            };
-            let Some(replace) = replace else {
-                output.push(c);
-                continue;
-            };
-            output.push_str(&replace);
-            runs.push((
-                base + ix..base + ix + replace.len(),
-                HighlightStyle::color(cx.theme().colors().text_muted),
-            ));
-            base += replace.len() - c.len_utf8();
-        }
-
-        let theme = ThemeSettings::get_global(cx);
-        let text_style = TextStyle {
-            color: cx.theme().colors().editor_foreground,
-            font_family: theme.buffer_font.family.clone(),
-            font_features: theme.buffer_font.features.clone(),
-            font_fallbacks: theme.buffer_font.fallbacks.clone(),
-            font_size: theme.buffer_font_size(cx).into(),
-            line_height: (theme.line_height() * theme.buffer_font_size(cx)).into(),
-            font_weight: theme.buffer_font.weight,
-            font_style: theme.buffer_font.style,
-            ..Default::default()
-        };
-
-        Some(
-            h_flex()
-                .when(selected, |el| el.bg(cx.theme().colors().element_selected))
-                .font_buffer(cx)
-                .text_buffer(cx)
-                .h(theme.buffer_font_size(cx) * theme.line_height())
-                .px_2()
-                .gap_1()
-                .child(StyledText::new(output).with_default_highlights(&text_style, runs)),
-        )
-    }
-}
-
-pub struct RegistersView {}
-
-impl RegistersView {
-    fn register(workspace: &mut Workspace, _window: Option<&mut Window>) {
-        workspace.register_action(|workspace, _: &ToggleRegistersView, window, cx| {
-            Self::toggle(workspace, window, cx);
-        });
-    }
-
-    pub fn toggle(workspace: &mut Workspace, window: &mut Window, cx: &mut Context<Workspace>) {
-        let editor = workspace
-            .active_item(cx)
-            .and_then(|item| item.act_as::<Editor>(cx));
-        workspace.toggle_modal(window, cx, move |window, cx| {
-            RegistersView::new(editor, window, cx)
-        });
-    }
-
-    fn new(
-        editor: Option<Entity<Editor>>,
-        window: &mut Window,
-        cx: &mut Context<Picker<RegistersViewDelegate>>,
-    ) -> Picker<RegistersViewDelegate> {
-        let mut matches = Vec::default();
-        cx.update_global(|globals: &mut VimGlobals, cx| {
-            for name in ['"', '+', '*'] {
-                if let Some(register) = globals.read_register(Some(name), None, cx) {
-                    matches.push(RegisterMatch {
-                        name,
-                        contents: register.text.clone(),
-                    })
-                }
-            }
-            if let Some(editor) = editor {
-                let register = editor.update(cx, |editor, cx| {
-                    globals.read_register(Some('%'), Some(editor), cx)
-                });
-                if let Some(register) = register {
-                    matches.push(RegisterMatch {
-                        name: '%',
-                        contents: register.text,
-                    })
-                }
-            }
-            for (name, register) in globals.registers.iter() {
-                if ['"', '+', '*', '%'].contains(name) {
-                    continue;
-                };
-                matches.push(RegisterMatch {
-                    name: *name,
-                    contents: register.text.clone(),
-                })
-            }
-        });
-        matches.sort_by(|a, b| a.name.cmp(&b.name));
-        let delegate = RegistersViewDelegate {
-            selected_index: 0,
-            matches,
-        };
-
-        Picker::nonsearchable_uniform_list(delegate, window, cx)
-            .width(rems(36.))
-            .modal(true)
-    }
-}
-
-enum MarksMatchInfo {
-    Path(Arc<Path>),
-    Title(String),
-    Content {
-        line: String,
-        highlights: Vec<(Range<usize>, HighlightStyle)>,
-    },
-}
-
-impl MarksMatchInfo {
-    fn from_chunks<'a>(chunks: impl Iterator<Item = Chunk<'a>>, cx: &App) -> Self {
-        let mut line = String::new();
-        let mut highlights = Vec::new();
-        let mut offset = 0;
-        for chunk in chunks {
-            line.push_str(chunk.text);
-            if let Some(highlight_style) = chunk.syntax_highlight_id
-                && let Some(highlight) = highlight_style.style(cx.theme().syntax())
-            {
-                highlights.push((offset..offset + chunk.text.len(), highlight))
-            }
-            offset += chunk.text.len();
-        }
-        MarksMatchInfo::Content { line, highlights }
-    }
-}
-
-struct MarksMatch {
-    name: String,
-    position: Point,
-    info: MarksMatchInfo,
-}
-
-pub struct MarksViewDelegate {
-    selected_index: usize,
-    matches: Vec<MarksMatch>,
-    point_column_width: usize,
-    workspace: WeakEntity<Workspace>,
-}
-
-impl PickerDelegate for MarksViewDelegate {
-    type ListItem = Div;
-
-    fn match_count(&self) -> usize {
-        self.matches.len()
-    }
-
-    fn selected_index(&self) -> usize {
-        self.selected_index
-    }
-
-    fn set_selected_index(&mut self, ix: usize, _: &mut Window, cx: &mut Context<Picker<Self>>) {
-        self.selected_index = ix;
-        cx.notify();
-    }
-
-    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
-        Arc::default()
-    }
-
-    fn update_matches(
-        &mut self,
-        _: String,
-        _: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> gpui::Task<()> {
-        let Some(workspace) = self.workspace.upgrade() else {
-            return Task::ready(());
-        };
-        cx.spawn(async move |picker, cx| {
-            let mut matches = Vec::new();
-            let _ = workspace.update(cx, |workspace, cx| {
-                let entity_id = cx.entity_id();
-                let Some(editor) = workspace
-                    .active_item(cx)
-                    .and_then(|item| item.act_as::<Editor>(cx))
-                else {
-                    return;
-                };
-                let editor = editor.read(cx);
-                let mut has_seen = HashSet::new();
-                let Some(marks_state) = cx.global::<VimGlobals>().marks.get(&entity_id) else {
-                    return;
-                };
-                let marks_state = marks_state.read(cx);
-
-                if let Some(map) = marks_state
-                    .multibuffer_marks
-                    .get(&editor.buffer().entity_id())
-                {
-                    for (name, anchors) in map {
-                        if has_seen.contains(name) {
-                            continue;
-                        }
-                        has_seen.insert(name.clone());
-                        let Some(anchor) = anchors.first() else {
-                            continue;
-                        };
-
-                        let snapshot = editor.buffer().read(cx).snapshot(cx);
-                        let position = anchor.to_point(&snapshot);
-
-                        let chunks = snapshot.chunks(
-                            Point::new(position.row, 0)
-                                ..Point::new(
-                                    position.row,
-                                    snapshot.line_len(MultiBufferRow(position.row)),
-                                ),
-                            true,
-                        );
-                        matches.push(MarksMatch {
-                            name: name.clone(),
-                            position,
-                            info: MarksMatchInfo::from_chunks(chunks, cx),
-                        })
-                    }
-                }
-
-                if let Some(buffer) = editor.buffer().read(cx).as_singleton() {
-                    let buffer = buffer.read(cx);
-                    if let Some(map) = marks_state.buffer_marks.get(&buffer.remote_id()) {
-                        for (name, anchors) in map {
-                            if has_seen.contains(name) {
-                                continue;
-                            }
-                            has_seen.insert(name.clone());
-                            let Some(anchor) = anchors.first() else {
-                                continue;
-                            };
-                            let snapshot = buffer.snapshot();
-                            let position = anchor.to_point(&snapshot);
-                            let chunks = snapshot.chunks(
-                                Point::new(position.row, 0)
-                                    ..Point::new(position.row, snapshot.line_len(position.row)),
-                                true,
-                            );
-
-                            matches.push(MarksMatch {
-                                name: name.clone(),
-                                position,
-                                info: MarksMatchInfo::from_chunks(chunks, cx),
-                            })
-                        }
-                    }
-                }
-
-                for (name, mark_location) in marks_state.global_marks.iter() {
-                    if has_seen.contains(name) {
-                        continue;
-                    }
-                    has_seen.insert(name.clone());
-
-                    match mark_location {
-                        MarkLocation::Buffer(entity_id) => {
-                            if let Some(&anchor) = marks_state
-                                .multibuffer_marks
-                                .get(entity_id)
-                                .and_then(|map| map.get(name))
-                                .and_then(|anchors| anchors.first())
-                            {
-                                let Some((info, snapshot)) = workspace
-                                    .items(cx)
-                                    .filter_map(|item| item.act_as::<Editor>(cx))
-                                    .map(|entity| entity.read(cx).buffer())
-                                    .find(|buffer| buffer.entity_id().eq(entity_id))
-                                    .map(|buffer| {
-                                        (
-                                            MarksMatchInfo::Title(
-                                                buffer.read(cx).title(cx).to_string(),
-                                            ),
-                                            buffer.read(cx).snapshot(cx),
-                                        )
-                                    })
-                                else {
-                                    continue;
-                                };
-                                matches.push(MarksMatch {
-                                    name: name.clone(),
-                                    position: anchor.to_point(&snapshot),
-                                    info,
-                                });
-                            }
-                        }
-                        MarkLocation::Path(path) => {
-                            if let Some(&position) = marks_state
-                                .serialized_marks
-                                .get(path.as_ref())
-                                .and_then(|map| map.get(name))
-                                .and_then(|points| points.first())
-                            {
-                                let info = MarksMatchInfo::Path(path.clone());
-                                matches.push(MarksMatch {
-                                    name: name.clone(),
-                                    position,
-                                    info,
-                                });
-                            }
-                        }
-                    }
-                }
-            });
-            let _ = picker.update(cx, |picker, cx| {
-                matches.sort_by_key(|a| {
-                    (
-                        a.name.chars().next().map(|c| c.is_ascii_uppercase()),
-                        a.name.clone(),
-                    )
-                });
-                let digits = matches
-                    .iter()
-                    .map(|m| (m.position.row + 1).ilog10() + (m.position.column + 1).ilog10())
-                    .max()
-                    .unwrap_or_default();
-                picker.delegate.matches = matches;
-                picker.delegate.point_column_width = (digits + 4) as usize;
-                cx.notify();
-            });
-        })
-    }
-
-    fn confirm(&mut self, _: bool, window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        let Some(vim) = self
-            .workspace
-            .upgrade()
-            .map(|w| w.read(cx))
-            .and_then(|w| w.focused_pane(window, cx).read(cx).active_item())
-            .and_then(|item| item.act_as::<Editor>(cx))
-            .and_then(|editor| editor.read(cx).addon::<VimAddon>().cloned())
-            .map(|addon| addon.entity)
-        else {
-            return;
-        };
-        let Some(text): Option<Arc<str>> = self
-            .matches
-            .get(self.selected_index)
-            .map(|m| Arc::from(m.name.to_string().into_boxed_str()))
-        else {
-            return;
-        };
-        vim.update(cx, |vim, cx| {
-            vim.jump(text, false, false, window, cx);
-        });
-
-        cx.emit(DismissEvent);
-    }
-
-    fn dismissed(&mut self, _: &mut Window, _: &mut Context<Picker<Self>>) {}
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        _: &mut Window,
-        cx: &mut Context<Picker<Self>>,
-    ) -> Option<Self::ListItem> {
-        let mark_match = self.matches.get(ix)?;
-
-        let mut left_output = String::new();
-        let mut left_runs = Vec::new();
-        left_output.push('`');
-        left_output.push_str(&mark_match.name);
-        left_runs.push((
-            0..left_output.len(),
-            HighlightStyle::color(cx.theme().colors().text_accent),
-        ));
-        left_output.push(' ');
-        left_output.push(' ');
-        let point_column = format!(
-            "{},{}",
-            mark_match.position.row + 1,
-            mark_match.position.column + 1
-        );
-        left_output.push_str(&point_column);
-        if let Some(padding) = self.point_column_width.checked_sub(point_column.len()) {
-            left_output.push_str(&" ".repeat(padding));
-        }
-
-        let (right_output, right_runs): (String, Vec<_>) = match &mark_match.info {
-            MarksMatchInfo::Path(path) => {
-                let s = path.to_string_lossy().into_owned();
-                (
-                    s.clone(),
-                    vec![(0..s.len(), HighlightStyle::color(cx.theme().colors().text))],
-                )
-            }
-            MarksMatchInfo::Title(title) => (
-                title.clone(),
-                vec![(
-                    0..title.len(),
-                    HighlightStyle::color(cx.theme().colors().text),
-                )],
-            ),
-            MarksMatchInfo::Content { line, highlights } => (line.clone(), highlights.clone()),
-        };
-
-        let theme = ThemeSettings::get_global(cx);
-        let text_style = TextStyle {
-            color: cx.theme().colors().editor_foreground,
-            font_family: theme.buffer_font.family.clone(),
-            font_features: theme.buffer_font.features.clone(),
-            font_fallbacks: theme.buffer_font.fallbacks.clone(),
-            font_size: theme.buffer_font_size(cx).into(),
-            line_height: (theme.line_height() * theme.buffer_font_size(cx)).into(),
-            font_weight: theme.buffer_font.weight,
-            font_style: theme.buffer_font.style,
-            ..Default::default()
-        };
-
-        Some(
-            h_flex()
-                .when(selected, |el| el.bg(cx.theme().colors().element_selected))
-                .font_buffer(cx)
-                .text_buffer(cx)
-                .h(theme.buffer_font_size(cx) * theme.line_height())
-                .px_2()
-                .child(StyledText::new(left_output).with_default_highlights(&text_style, left_runs))
-                .child(
-                    StyledText::new(right_output).with_default_highlights(&text_style, right_runs),
-                ),
-        )
-    }
-}
-
-pub struct MarksView {}
-
-impl MarksView {
-    fn register(workspace: &mut Workspace, _window: Option<&mut Window>) {
-        workspace.register_action(|workspace, _: &ToggleMarksView, window, cx| {
-            Self::toggle(workspace, window, cx);
-        });
-    }
-
-    pub fn toggle(workspace: &mut Workspace, window: &mut Window, cx: &mut Context<Workspace>) {
-        let handle = cx.weak_entity();
-        workspace.toggle_modal(window, cx, move |window, cx| {
-            MarksView::new(handle, window, cx)
-        });
-    }
-
-    fn new(
-        workspace: WeakEntity<Workspace>,
-        window: &mut Window,
-        cx: &mut Context<Picker<MarksViewDelegate>>,
-    ) -> Picker<MarksViewDelegate> {
-        let matches = Vec::default();
-        let delegate = MarksViewDelegate {
-            selected_index: 0,
-            point_column_width: 0,
-            matches,
-            workspace,
-        };
-        Picker::nonsearchable_uniform_list(delegate, window, cx)
-            .width(rems(36.))
-            .modal(true)
-    }
-}
-
-pub struct VimDb(ThreadSafeConnection);
-
-impl Domain for VimDb {
-    const NAME: &str = stringify!(VimDb);
-
-    const MIGRATIONS: &[&str] = &[
-        sql! (
-            CREATE TABLE vim_marks (
-              workspace_id INTEGER,
-              mark_name TEXT,
-              path BLOB,
-              value TEXT
-            );
-            CREATE UNIQUE INDEX idx_vim_marks ON vim_marks (workspace_id, mark_name, path);
-        ),
-        sql! (
-            CREATE TABLE vim_global_marks_paths(
-                workspace_id INTEGER,
-                mark_name TEXT,
-                path BLOB
-            );
-            CREATE UNIQUE INDEX idx_vim_global_marks_paths
-            ON vim_global_marks_paths(workspace_id, mark_name);
-        ),
-    ];
-}
-
-db::static_connection!(DB, VimDb, [WorkspaceDb]);
-
-struct SerializedMark {
-    path: Arc<Path>,
-    name: String,
-    points: Vec<Point>,
-}
-
-impl VimDb {
-    pub(crate) async fn set_marks(
-        &self,
-        workspace_id: WorkspaceId,
-        path: Arc<Path>,
-        marks: HashMap<String, Vec<Point>>,
-    ) -> Result<()> {
-        log::debug!("Setting path {path:?} for {} marks", marks.len());
-
-        self.write(move |conn| {
-            let mut query = conn.exec_bound(sql!(
-                INSERT OR REPLACE INTO vim_marks
-                    (workspace_id, mark_name, path, value)
-                VALUES
-                    (?, ?, ?, ?)
-            ))?;
-            for (mark_name, value) in marks {
-                let pairs: Vec<(u32, u32)> = value
-                    .into_iter()
-                    .map(|point| (point.row, point.column))
-                    .collect();
-                let serialized = serde_json::to_string(&pairs)?;
-                query((workspace_id, mark_name, path.clone(), serialized))?;
-            }
-            Ok(())
-        })
-        .await
-    }
-
-    fn get_marks(&self, workspace_id: WorkspaceId) -> Result<Vec<SerializedMark>> {
-        let result: Vec<(Arc<Path>, String, String)> = self.select_bound(sql!(
-            SELECT path, mark_name, value FROM vim_marks
-                WHERE workspace_id = ?
-        ))?(workspace_id)?;
-
-        Ok(result
-            .into_iter()
-            .filter_map(|(path, name, value)| {
-                let pairs: Vec<(u32, u32)> = serde_json::from_str(&value).log_err()?;
-                Some(SerializedMark {
-                    path,
-                    name,
-                    points: pairs
-                        .into_iter()
-                        .map(|(row, column)| Point { row, column })
-                        .collect(),
-                })
-            })
-            .collect())
-    }
-
-    pub(crate) async fn delete_mark(
-        &self,
-        workspace_id: WorkspaceId,
-        path: Arc<Path>,
-        mark_name: String,
-    ) -> Result<()> {
-        self.write(move |conn| {
-            conn.exec_bound(sql!(
-                DELETE FROM vim_marks
-                WHERE workspace_id = ? AND mark_name = ? AND path = ?
-            ))?((workspace_id, mark_name, path))
-        })
-        .await
-    }
-
-    pub(crate) async fn set_global_mark_path(
-        &self,
-        workspace_id: WorkspaceId,
-        mark_name: String,
-        path: Arc<Path>,
-    ) -> Result<()> {
-        log::debug!("Setting global mark path {path:?} for {mark_name}");
-        self.write(move |conn| {
-            conn.exec_bound(sql!(
-                INSERT OR REPLACE INTO vim_global_marks_paths
-                    (workspace_id, mark_name, path)
-                VALUES
-                    (?, ?, ?)
-            ))?((workspace_id, mark_name, path))
-        })
-        .await
-    }
-
-    pub fn get_global_marks_paths(
-        &self,
-        workspace_id: WorkspaceId,
-    ) -> Result<Vec<(String, Arc<Path>)>> {
-        self.select_bound(sql!(
-        SELECT mark_name, path FROM vim_global_marks_paths
-            WHERE workspace_id = ?
-        ))?(workspace_id)
-    }
-
-    pub(crate) async fn delete_global_marks_path(
-        &self,
-        workspace_id: WorkspaceId,
-        mark_name: String,
-    ) -> Result<()> {
-        self.write(move |conn| {
-            conn.exec_bound(sql!(
-                DELETE FROM vim_global_marks_paths
-                WHERE workspace_id = ? AND mark_name = ?
-            ))?((workspace_id, mark_name))
-        })
-        .await
-    }
-}
diff --git a/crates/vim/src/surrounds.rs b/crates/vim/src/surrounds.rs
deleted file mode 100644
index b3f9307aac..0000000000
--- a/crates/vim/src/surrounds.rs
+++ /dev/null
@@ -1,1705 +0,0 @@
-use crate::{
-    Vim,
-    motion::{self, Motion},
-    object::{Object, surrounding_markers},
-    state::Mode,
-};
-use editor::{Bias, MultiBufferOffset, movement};
-use gpui::{Context, Window};
-use language::BracketPair;
-
-use std::sync::Arc;
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum SurroundsType {
-    Motion(Motion),
-    Object(Object, bool),
-    Selection,
-}
-
-impl Vim {
-    pub fn add_surrounds(
-        &mut self,
-        text: Arc<str>,
-        target: SurroundsType,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.stop_recording(cx);
-        let count = Vim::take_count(cx);
-        let forced_motion = Vim::take_forced_motion(cx);
-        let mode = self.mode;
-        self.update_editor(cx, |_, editor, cx| {
-            let text_layout_details = editor.text_layout_details(window);
-            editor.transact(window, cx, |editor, window, cx| {
-                editor.set_clip_at_line_ends(false, cx);
-
-                let pair = match find_surround_pair(&all_support_surround_pair(), &text) {
-                    Some(pair) => pair.clone(),
-                    None => BracketPair {
-                        start: text.to_string(),
-                        end: text.to_string(),
-                        close: true,
-                        surround: true,
-                        newline: false,
-                    },
-                };
-                let surround = pair.end != surround_alias((*text).as_ref());
-                let display_map = editor.display_snapshot(cx);
-                let display_selections = editor.selections.all_adjusted_display(&display_map);
-                let mut edits = Vec::new();
-                let mut anchors = Vec::new();
-
-                for selection in &display_selections {
-                    let range = match &target {
-                        SurroundsType::Object(object, around) => {
-                            object.range(&display_map, selection.clone(), *around, None)
-                        }
-                        SurroundsType::Motion(motion) => {
-                            motion
-                                .range(
-                                    &display_map,
-                                    selection.clone(),
-                                    count,
-                                    &text_layout_details,
-                                    forced_motion,
-                                )
-                                .map(|(mut range, _)| {
-                                    // The Motion::CurrentLine operation will contain the newline of the current line and leading/trailing whitespace
-                                    if let Motion::CurrentLine = motion {
-                                        range.start = motion::first_non_whitespace(
-                                            &display_map,
-                                            false,
-                                            range.start,
-                                        );
-                                        range.end = movement::saturating_right(
-                                            &display_map,
-                                            motion::last_non_whitespace(&display_map, range.end, 1),
-                                        );
-                                    }
-                                    range
-                                })
-                        }
-                        SurroundsType::Selection => Some(selection.range()),
-                    };
-
-                    if let Some(range) = range {
-                        let start = range.start.to_offset(&display_map, Bias::Right);
-                        let end = range.end.to_offset(&display_map, Bias::Left);
-                        let (start_cursor_str, end_cursor_str) = if mode == Mode::VisualLine {
-                            (format!("{}\n", pair.start), format!("\n{}", pair.end))
-                        } else {
-                            let maybe_space = if surround { " " } else { "" };
-                            (
-                                format!("{}{}", pair.start, maybe_space),
-                                format!("{}{}", maybe_space, pair.end),
-                            )
-                        };
-                        let start_anchor = display_map.buffer_snapshot().anchor_before(start);
-
-                        edits.push((start..start, start_cursor_str));
-                        edits.push((end..end, end_cursor_str));
-                        anchors.push(start_anchor..start_anchor);
-                    } else {
-                        let start_anchor = display_map
-                            .buffer_snapshot()
-                            .anchor_before(selection.head().to_offset(&display_map, Bias::Left));
-                        anchors.push(start_anchor..start_anchor);
-                    }
-                }
-
-                editor.edit(edits, cx);
-                editor.set_clip_at_line_ends(true, cx);
-                editor.change_selections(Default::default(), window, cx, |s| {
-                    if mode == Mode::VisualBlock {
-                        s.select_anchor_ranges(anchors.into_iter().take(1))
-                    } else {
-                        s.select_anchor_ranges(anchors)
-                    }
-                });
-            });
-        });
-        self.switch_mode(Mode::Normal, false, window, cx);
-    }
-
-    pub fn delete_surrounds(
-        &mut self,
-        text: Arc<str>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.stop_recording(cx);
-
-        // only legitimate surrounds can be removed
-        let pair = match find_surround_pair(&all_support_surround_pair(), &text) {
-            Some(pair) => pair.clone(),
-            None => return,
-        };
-        let pair_object = match pair_to_object(&pair) {
-            Some(pair_object) => pair_object,
-            None => return,
-        };
-        let surround = pair.end != *text;
-
-        self.update_editor(cx, |_, editor, cx| {
-            editor.transact(window, cx, |editor, window, cx| {
-                editor.set_clip_at_line_ends(false, cx);
-
-                let display_map = editor.display_snapshot(cx);
-                let display_selections = editor.selections.all_display(&display_map);
-                let mut edits = Vec::new();
-                let mut anchors = Vec::new();
-
-                for selection in &display_selections {
-                    let start = selection.start.to_offset(&display_map, Bias::Left);
-                    if let Some(range) =
-                        pair_object.range(&display_map, selection.clone(), true, None)
-                    {
-                        // If the current parenthesis object is single-line,
-                        // then we need to filter whether it is the current line or not
-                        if !pair_object.is_multiline() {
-                            let is_same_row = selection.start.row() == range.start.row()
-                                && selection.end.row() == range.end.row();
-                            if !is_same_row {
-                                anchors.push(start..start);
-                                continue;
-                            }
-                        }
-                        // This is a bit cumbersome, and it is written to deal with some special cases, as shown below
-                        // hello«ˇ  "hello in a word"  »again.
-                        // Sometimes the expand_selection will not be matched at both ends, and there will be extra spaces
-                        // In order to be able to accurately match and replace in this case, some cumbersome methods are used
-                        let mut chars_and_offset = display_map
-                            .buffer_chars_at(range.start.to_offset(&display_map, Bias::Left))
-                            .peekable();
-                        while let Some((ch, offset)) = chars_and_offset.next() {
-                            if ch.to_string() == pair.start {
-                                let start = offset;
-                                let mut end = start + 1usize;
-                                if surround
-                                    && let Some((next_ch, _)) = chars_and_offset.peek()
-                                    && next_ch.eq(&' ')
-                                {
-                                    end += 1;
-                                }
-                                edits.push((start..end, ""));
-                                anchors.push(start..start);
-                                break;
-                            }
-                        }
-                        let mut reverse_chars_and_offsets = display_map
-                            .reverse_buffer_chars_at(range.end.to_offset(&display_map, Bias::Left))
-                            .peekable();
-                        while let Some((ch, offset)) = reverse_chars_and_offsets.next() {
-                            if ch.to_string() == pair.end {
-                                let mut start = offset;
-                                let end = start + 1usize;
-                                if surround
-                                    && let Some((next_ch, _)) = reverse_chars_and_offsets.peek()
-                                    && next_ch.eq(&' ')
-                                {
-                                    start -= 1;
-                                }
-                                edits.push((start..end, ""));
-                                break;
-                            }
-                        }
-                    } else {
-                        anchors.push(start..start);
-                    }
-                }
-
-                editor.change_selections(Default::default(), window, cx, |s| {
-                    s.select_ranges(anchors);
-                });
-                edits.sort_by_key(|(range, _)| range.start);
-                editor.edit(edits, cx);
-                editor.set_clip_at_line_ends(true, cx);
-            });
-        });
-    }
-
-    pub fn change_surrounds(
-        &mut self,
-        text: Arc<str>,
-        target: Object,
-        opening: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(will_replace_pair) = self.object_to_bracket_pair(target, cx) {
-            self.stop_recording(cx);
-            self.update_editor(cx, |_, editor, cx| {
-                editor.transact(window, cx, |editor, window, cx| {
-                    editor.set_clip_at_line_ends(false, cx);
-
-                    let pair = match find_surround_pair(&all_support_surround_pair(), &text) {
-                        Some(pair) => pair.clone(),
-                        None => BracketPair {
-                            start: text.to_string(),
-                            end: text.to_string(),
-                            close: true,
-                            surround: true,
-                            newline: false,
-                        },
-                    };
-
-                    // A single space should be added if the new surround is a
-                    // bracket and not a quote (pair.start != pair.end) and if
-                    // the bracket used is the opening bracket.
-                    let add_space =
-                        !(pair.start == pair.end) && (pair.end != surround_alias((*text).as_ref()));
-
-                    // Space should be preserved if either the surrounding
-                    // characters being updated are quotes
-                    // (will_replace_pair.start == will_replace_pair.end) or if
-                    // the bracket used in the command is not an opening
-                    // bracket.
-                    let preserve_space =
-                        will_replace_pair.start == will_replace_pair.end || !opening;
-
-                    let display_map = editor.display_snapshot(cx);
-                    let selections = editor.selections.all_adjusted_display(&display_map);
-                    let mut edits = Vec::new();
-                    let mut anchors = Vec::new();
-
-                    for selection in &selections {
-                        let start = selection.start.to_offset(&display_map, Bias::Left);
-                        if let Some(range) =
-                            target.range(&display_map, selection.clone(), true, None)
-                        {
-                            if !target.is_multiline() {
-                                let is_same_row = selection.start.row() == range.start.row()
-                                    && selection.end.row() == range.end.row();
-                                if !is_same_row {
-                                    anchors.push(start..start);
-                                    continue;
-                                }
-                            }
-
-                            // Keeps track of the length of the string that is
-                            // going to be edited on the start so we can ensure
-                            // that the end replacement string does not exceed
-                            // this value. Helpful when dealing with newlines.
-                            let mut edit_len = 0;
-                            let mut open_range_end = MultiBufferOffset(0);
-                            let mut chars_and_offset = display_map
-                                .buffer_chars_at(range.start.to_offset(&display_map, Bias::Left))
-                                .peekable();
-
-                            while let Some((ch, offset)) = chars_and_offset.next() {
-                                if ch.to_string() == will_replace_pair.start {
-                                    let mut open_str = pair.start.clone();
-                                    let start = offset;
-                                    open_range_end = start + 1usize;
-                                    while let Some((next_ch, _)) = chars_and_offset.next()
-                                        && next_ch == ' '
-                                    {
-                                        open_range_end += 1;
-
-                                        if preserve_space {
-                                            open_str.push(next_ch);
-                                        }
-                                    }
-
-                                    if add_space {
-                                        open_str.push(' ');
-                                    };
-
-                                    edit_len = open_range_end - start;
-                                    edits.push((start..open_range_end, open_str));
-                                    anchors.push(start..start);
-                                    break;
-                                }
-                            }
-
-                            let mut reverse_chars_and_offsets = display_map
-                                .reverse_buffer_chars_at(
-                                    range.end.to_offset(&display_map, Bias::Left),
-                                )
-                                .peekable();
-                            while let Some((ch, offset)) = reverse_chars_and_offsets.next() {
-                                if ch.to_string() == will_replace_pair.end {
-                                    let mut close_str = String::new();
-                                    let mut start = offset;
-                                    let end = start + 1usize;
-                                    while let Some((next_ch, _)) = reverse_chars_and_offsets.next()
-                                        && next_ch == ' '
-                                        && close_str.len() < edit_len - 1
-                                        && start > open_range_end
-                                    {
-                                        start -= 1;
-
-                                        if preserve_space {
-                                            close_str.push(next_ch);
-                                        }
-                                    }
-
-                                    if add_space {
-                                        close_str.push(' ');
-                                    };
-
-                                    close_str.push_str(&pair.end);
-                                    edits.push((start..end, close_str));
-                                    break;
-                                }
-                            }
-                        } else {
-                            anchors.push(start..start);
-                        }
-                    }
-
-                    let stable_anchors = editor
-                        .selections
-                        .disjoint_anchors_arc()
-                        .iter()
-                        .map(|selection| {
-                            let start = selection.start.bias_left(&display_map.buffer_snapshot());
-                            start..start
-                        })
-                        .collect::<Vec<_>>();
-                    edits.sort_by_key(|(range, _)| range.start);
-                    editor.edit(edits, cx);
-                    editor.set_clip_at_line_ends(true, cx);
-                    editor.change_selections(Default::default(), window, cx, |s| {
-                        s.select_anchor_ranges(stable_anchors);
-                    });
-                });
-            });
-        }
-    }
-
-    /// Checks if any of the current cursors are surrounded by a valid pair of brackets.
-    ///
-    /// This method supports multiple cursors and checks each cursor for a valid pair of brackets.
-    /// A pair of brackets is considered valid if it is well-formed and properly closed.
-    ///
-    /// If a valid pair of brackets is found, the method returns `true` and the cursor is automatically moved to the start of the bracket pair.
-    /// If no valid pair of brackets is found for any cursor, the method returns `false`.
-    pub fn check_and_move_to_valid_bracket_pair(
-        &mut self,
-        object: Object,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> bool {
-        let mut valid = false;
-        if let Some(pair) = self.object_to_bracket_pair(object, cx) {
-            self.update_editor(cx, |_, editor, cx| {
-                editor.transact(window, cx, |editor, window, cx| {
-                    editor.set_clip_at_line_ends(false, cx);
-                    let display_map = editor.display_snapshot(cx);
-                    let selections = editor.selections.all_adjusted_display(&display_map);
-                    let mut anchors = Vec::new();
-
-                    for selection in &selections {
-                        let start = selection.start.to_offset(&display_map, Bias::Left);
-                        if let Some(range) =
-                            object.range(&display_map, selection.clone(), true, None)
-                        {
-                            // If the current parenthesis object is single-line,
-                            // then we need to filter whether it is the current line or not
-                            if object.is_multiline()
-                                || (!object.is_multiline()
-                                    && selection.start.row() == range.start.row()
-                                    && selection.end.row() == range.end.row())
-                            {
-                                valid = true;
-                                let chars_and_offset = display_map
-                                    .buffer_chars_at(
-                                        range.start.to_offset(&display_map, Bias::Left),
-                                    )
-                                    .peekable();
-                                for (ch, offset) in chars_and_offset {
-                                    if ch.to_string() == pair.start {
-                                        anchors.push(offset..offset);
-                                        break;
-                                    }
-                                }
-                            } else {
-                                anchors.push(start..start)
-                            }
-                        } else {
-                            anchors.push(start..start)
-                        }
-                    }
-                    editor.change_selections(Default::default(), window, cx, |s| {
-                        s.select_ranges(anchors);
-                    });
-                    editor.set_clip_at_line_ends(true, cx);
-                });
-            });
-        }
-        valid
-    }
-
-    fn object_to_bracket_pair(
-        &self,
-        object: Object,
-        cx: &mut Context<Self>,
-    ) -> Option<BracketPair> {
-        match object {
-            Object::Quotes => Some(BracketPair {
-                start: "'".to_string(),
-                end: "'".to_string(),
-                close: true,
-                surround: true,
-                newline: false,
-            }),
-            Object::BackQuotes => Some(BracketPair {
-                start: "`".to_string(),
-                end: "`".to_string(),
-                close: true,
-                surround: true,
-                newline: false,
-            }),
-            Object::DoubleQuotes => Some(BracketPair {
-                start: "\"".to_string(),
-                end: "\"".to_string(),
-                close: true,
-                surround: true,
-                newline: false,
-            }),
-            Object::VerticalBars => Some(BracketPair {
-                start: "|".to_string(),
-                end: "|".to_string(),
-                close: true,
-                surround: true,
-                newline: false,
-            }),
-            Object::Parentheses => Some(BracketPair {
-                start: "(".to_string(),
-                end: ")".to_string(),
-                close: true,
-                surround: true,
-                newline: false,
-            }),
-            Object::SquareBrackets => Some(BracketPair {
-                start: "[".to_string(),
-                end: "]".to_string(),
-                close: true,
-                surround: true,
-                newline: false,
-            }),
-            Object::CurlyBrackets { .. } => Some(BracketPair {
-                start: "{".to_string(),
-                end: "}".to_string(),
-                close: true,
-                surround: true,
-                newline: false,
-            }),
-            Object::AngleBrackets => Some(BracketPair {
-                start: "<".to_string(),
-                end: ">".to_string(),
-                close: true,
-                surround: true,
-                newline: false,
-            }),
-            Object::AnyBrackets => {
-                // If we're dealing with `AnyBrackets`, which can map to multiple
-                // bracket pairs, we'll need to first determine which `BracketPair` to
-                // target.
-                // As such, we keep track of the smallest range size, so
-                // that in cases like `({ name: "John" })` if the cursor is
-                // inside the curly brackets, we target the curly brackets
-                // instead of the parentheses.
-                let mut bracket_pair = None;
-                let mut min_range_size = usize::MAX;
-
-                let _ = self.editor.update(cx, |editor, cx| {
-                    let display_map = editor.display_snapshot(cx);
-                    let selections = editor.selections.all_adjusted_display(&display_map);
-                    // Even if there's multiple cursors, we'll simply rely on
-                    // the first one to understand what bracket pair to map to.
-                    // I believe we could, if worth it, go one step above and
-                    // have a `BracketPair` per selection, so that `AnyBracket`
-                    // could work in situations where the transformation below
-                    // could be done.
-                    //
-                    // ```
-                    // (< name:ˇ'Zed' >)
-                    // <[ name:ˇ'DeltaDB' ]>
-                    // ```
-                    //
-                    // After using `csb{`:
-                    //
-                    // ```
-                    // (ˇ{ name:'Zed' })
-                    // <ˇ{ name:'DeltaDB' }>
-                    // ```
-                    if let Some(selection) = selections.first() {
-                        let relative_to = selection.head();
-                        let bracket_pairs = [('(', ')'), ('[', ']'), ('{', '}'), ('<', '>')];
-                        let cursor_offset = relative_to.to_offset(&display_map, Bias::Left);
-
-                        for &(open, close) in bracket_pairs.iter() {
-                            if let Some(range) = surrounding_markers(
-                                &display_map,
-                                relative_to,
-                                true,
-                                false,
-                                open,
-                                close,
-                            ) {
-                                let start_offset = range.start.to_offset(&display_map, Bias::Left);
-                                let end_offset = range.end.to_offset(&display_map, Bias::Right);
-
-                                if cursor_offset >= start_offset && cursor_offset <= end_offset {
-                                    let size = end_offset - start_offset;
-                                    if size < min_range_size {
-                                        min_range_size = size;
-                                        bracket_pair = Some(BracketPair {
-                                            start: open.to_string(),
-                                            end: close.to_string(),
-                                            close: true,
-                                            surround: true,
-                                            newline: false,
-                                        })
-                                    }
-                                }
-                            }
-                        }
-                    }
-                });
-
-                bracket_pair
-            }
-            _ => None,
-        }
-    }
-}
-
-fn find_surround_pair<'a>(pairs: &'a [BracketPair], ch: &str) -> Option<&'a BracketPair> {
-    pairs
-        .iter()
-        .find(|pair| pair.start == surround_alias(ch) || pair.end == surround_alias(ch))
-}
-
-fn surround_alias(ch: &str) -> &str {
-    match ch {
-        "b" => ")",
-        "B" => "}",
-        "a" => ">",
-        "r" => "]",
-        _ => ch,
-    }
-}
-
-fn all_support_surround_pair() -> Vec<BracketPair> {
-    vec![
-        BracketPair {
-            start: "{".into(),
-            end: "}".into(),
-            close: true,
-            surround: true,
-            newline: false,
-        },
-        BracketPair {
-            start: "'".into(),
-            end: "'".into(),
-            close: true,
-            surround: true,
-            newline: false,
-        },
-        BracketPair {
-            start: "`".into(),
-            end: "`".into(),
-            close: true,
-            surround: true,
-            newline: false,
-        },
-        BracketPair {
-            start: "\"".into(),
-            end: "\"".into(),
-            close: true,
-            surround: true,
-            newline: false,
-        },
-        BracketPair {
-            start: "(".into(),
-            end: ")".into(),
-            close: true,
-            surround: true,
-            newline: false,
-        },
-        BracketPair {
-            start: "|".into(),
-            end: "|".into(),
-            close: true,
-            surround: true,
-            newline: false,
-        },
-        BracketPair {
-            start: "[".into(),
-            end: "]".into(),
-            close: true,
-            surround: true,
-            newline: false,
-        },
-        BracketPair {
-            start: "<".into(),
-            end: ">".into(),
-            close: true,
-            surround: true,
-            newline: false,
-        },
-    ]
-}
-
-fn pair_to_object(pair: &BracketPair) -> Option<Object> {
-    match pair.start.as_str() {
-        "'" => Some(Object::Quotes),
-        "`" => Some(Object::BackQuotes),
-        "\"" => Some(Object::DoubleQuotes),
-        "|" => Some(Object::VerticalBars),
-        "(" => Some(Object::Parentheses),
-        "[" => Some(Object::SquareBrackets),
-        "{" => Some(Object::CurlyBrackets),
-        "<" => Some(Object::AngleBrackets),
-        _ => None,
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use gpui::KeyBinding;
-    use indoc::indoc;
-
-    use crate::{PushAddSurrounds, object::AnyBrackets, state::Mode, test::VimTestContext};
-
-    #[gpui::test]
-    async fn test_add_surrounds(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        // test add surrounds with around
-        cx.set_state(
-            indoc! {"
-            The quˇick brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("y s i w {");
-        cx.assert_state(
-            indoc! {"
-            The ˇ{ quick } brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-
-        // test add surrounds not with around
-        cx.set_state(
-            indoc! {"
-            The quˇick brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("y s i w }");
-        cx.assert_state(
-            indoc! {"
-            The ˇ{quick} brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-
-        // test add surrounds with motion
-        cx.set_state(
-            indoc! {"
-            The quˇick brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("y s $ }");
-        cx.assert_state(
-            indoc! {"
-            The quˇ{ick brown}
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-
-        // test add surrounds with multi cursor
-        cx.set_state(
-            indoc! {"
-            The quˇick brown
-            fox jumps over
-            the laˇzy dog."},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("y s i w '");
-        cx.assert_state(
-            indoc! {"
-            The ˇ'quick' brown
-            fox jumps over
-            the ˇ'lazy' dog."},
-            Mode::Normal,
-        );
-
-        // test multi cursor add surrounds with motion
-        cx.set_state(
-            indoc! {"
-            The quˇick brown
-            fox jumps over
-            the laˇzy dog."},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("y s $ '");
-        cx.assert_state(
-            indoc! {"
-            The quˇ'ick brown'
-            fox jumps over
-            the laˇ'zy dog.'"},
-            Mode::Normal,
-        );
-
-        // test multi cursor add surrounds with motion and custom string
-        cx.set_state(
-            indoc! {"
-            The quˇick brown
-            fox jumps over
-            the laˇzy dog."},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("y s $ 1");
-        cx.assert_state(
-            indoc! {"
-            The quˇ1ick brown1
-            fox jumps over
-            the laˇ1zy dog.1"},
-            Mode::Normal,
-        );
-
-        // test add surrounds with motion current line
-        cx.set_state(
-            indoc! {"
-            The quˇick brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("y s s {");
-        cx.assert_state(
-            indoc! {"
-            ˇ{ The quick brown }
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-
-        cx.set_state(
-            indoc! {"
-                The quˇick brown•
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("y s s {");
-        cx.assert_state(
-            indoc! {"
-                ˇ{ The quick brown }•
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("2 y s s )");
-        cx.assert_state(
-            indoc! {"
-                ˇ({ The quick brown }•
-            fox jumps over)
-            the lazy dog."},
-            Mode::Normal,
-        );
-
-        // test add surrounds around object
-        cx.set_state(
-            indoc! {"
-            The [quˇick] brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("y s a ] )");
-        cx.assert_state(
-            indoc! {"
-            The ˇ([quick]) brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-
-        // test add surrounds inside object
-        cx.set_state(
-            indoc! {"
-            The [quˇick] brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("y s i ] )");
-        cx.assert_state(
-            indoc! {"
-            The [ˇ(quick)] brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-    }
-
-    #[gpui::test]
-    async fn test_add_surrounds_visual(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        cx.update(|_, cx| {
-            cx.bind_keys([KeyBinding::new(
-                "shift-s",
-                PushAddSurrounds {},
-                Some("vim_mode == visual"),
-            )])
-        });
-
-        // test add surrounds with around
-        cx.set_state(
-            indoc! {"
-            The quˇick brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("v i w shift-s {");
-        cx.assert_state(
-            indoc! {"
-            The ˇ{ quick } brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-
-        // test add surrounds not with around
-        cx.set_state(
-            indoc! {"
-            The quˇick brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("v i w shift-s }");
-        cx.assert_state(
-            indoc! {"
-            The ˇ{quick} brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-
-        // test add surrounds with motion
-        cx.set_state(
-            indoc! {"
-            The quˇick brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("v e shift-s }");
-        cx.assert_state(
-            indoc! {"
-            The quˇ{ick} brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-
-        // test add surrounds with multi cursor
-        cx.set_state(
-            indoc! {"
-            The quˇick brown
-            fox jumps over
-            the laˇzy dog."},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("v i w shift-s '");
-        cx.assert_state(
-            indoc! {"
-            The ˇ'quick' brown
-            fox jumps over
-            the ˇ'lazy' dog."},
-            Mode::Normal,
-        );
-
-        // test add surrounds with visual block
-        cx.set_state(
-            indoc! {"
-            The quˇick brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("ctrl-v i w j j shift-s '");
-        cx.assert_state(
-            indoc! {"
-            The ˇ'quick' brown
-            fox 'jumps' over
-            the 'lazy 'dog."},
-            Mode::Normal,
-        );
-
-        // test add surrounds with visual line
-        cx.set_state(
-            indoc! {"
-            The quˇick brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("j shift-v shift-s '");
-        cx.assert_state(
-            indoc! {"
-            The quick brown
-            ˇ'
-            fox jumps over
-            '
-            the lazy dog."},
-            Mode::Normal,
-        );
-    }
-
-    #[gpui::test]
-    async fn test_delete_surrounds(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        // test delete surround
-        cx.set_state(
-            indoc! {"
-            The {quˇick} brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("d s {");
-        cx.assert_state(
-            indoc! {"
-            The ˇquick brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-
-        // test delete not exist surrounds
-        cx.set_state(
-            indoc! {"
-            The {quˇick} brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("d s [");
-        cx.assert_state(
-            indoc! {"
-            The {quˇick} brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-
-        // test delete surround forward exist, in the surrounds plugin of other editors,
-        // the bracket pair in front of the current line will be deleted here, which is not implemented at the moment
-        cx.set_state(
-            indoc! {"
-            The {quick} brˇown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("d s {");
-        cx.assert_state(
-            indoc! {"
-            The {quick} brˇown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-
-        // test cursor delete inner surrounds
-        cx.set_state(
-            indoc! {"
-            The { quick brown
-            fox jumˇps over }
-            the lazy dog."},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("d s {");
-        cx.assert_state(
-            indoc! {"
-            The ˇquick brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-
-        // test multi cursor delete surrounds
-        cx.set_state(
-            indoc! {"
-            The [quˇick] brown
-            fox jumps over
-            the [laˇzy] dog."},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("d s ]");
-        cx.assert_state(
-            indoc! {"
-            The ˇquick brown
-            fox jumps over
-            the ˇlazy dog."},
-            Mode::Normal,
-        );
-
-        // test multi cursor delete surrounds with around
-        cx.set_state(
-            indoc! {"
-            Tˇhe [ quick ] brown
-            fox jumps over
-            the [laˇzy] dog."},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("d s [");
-        cx.assert_state(
-            indoc! {"
-            The ˇquick brown
-            fox jumps over
-            the ˇlazy dog."},
-            Mode::Normal,
-        );
-
-        cx.set_state(
-            indoc! {"
-            Tˇhe [ quick ] brown
-            fox jumps over
-            the [laˇzy ] dog."},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("d s [");
-        cx.assert_state(
-            indoc! {"
-            The ˇquick brown
-            fox jumps over
-            the ˇlazy dog."},
-            Mode::Normal,
-        );
-
-        // test multi cursor delete different surrounds
-        // the pair corresponding to the two cursors is the same,
-        // so they are combined into one cursor
-        cx.set_state(
-            indoc! {"
-            The [quˇick] brown
-            fox jumps over
-            the {laˇzy} dog."},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("d s {");
-        cx.assert_state(
-            indoc! {"
-            The [quick] brown
-            fox jumps over
-            the ˇlazy dog."},
-            Mode::Normal,
-        );
-
-        // test delete surround with multi cursor and nest surrounds
-        cx.set_state(
-            indoc! {"
-            fn test_surround() {
-                ifˇ 2 > 1 {
-                    ˇprintln!(\"it is fine\");
-                };
-            }"},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("d s }");
-        cx.assert_state(
-            indoc! {"
-            fn test_surround() ˇ
-                if 2 > 1 ˇ
-                    println!(\"it is fine\");
-                ;
-            "},
-            Mode::Normal,
-        );
-    }
-
-    #[gpui::test]
-    async fn test_change_surrounds(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        cx.set_state(
-            indoc! {"
-            The {quˇick} brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("c s { [");
-        cx.assert_state(
-            indoc! {"
-            The ˇ[ quick ] brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-
-        // test multi cursor change surrounds
-        cx.set_state(
-            indoc! {"
-            The {quˇick} brown
-            fox jumps over
-            the {laˇzy} dog."},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("c s { [");
-        cx.assert_state(
-            indoc! {"
-            The ˇ[ quick ] brown
-            fox jumps over
-            the ˇ[ lazy ] dog."},
-            Mode::Normal,
-        );
-
-        // test multi cursor delete different surrounds with after cursor
-        cx.set_state(
-            indoc! {"
-            Thˇe {quick} brown
-            fox jumps over
-            the {laˇzy} dog."},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("c s { [");
-        cx.assert_state(
-            indoc! {"
-            The ˇ[ quick ] brown
-            fox jumps over
-            the ˇ[ lazy ] dog."},
-            Mode::Normal,
-        );
-
-        // test multi cursor change surrount with not around
-        cx.set_state(
-            indoc! {"
-            Thˇe { quick } brown
-            fox jumps over
-            the {laˇzy} dog."},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("c s { ]");
-        cx.assert_state(
-            indoc! {"
-            The ˇ[quick] brown
-            fox jumps over
-            the ˇ[lazy] dog."},
-            Mode::Normal,
-        );
-
-        // test multi cursor change with not exist surround
-        cx.set_state(
-            indoc! {"
-            The {quˇick} brown
-            fox jumps over
-            the [laˇzy] dog."},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("c s [ '");
-        cx.assert_state(
-            indoc! {"
-            The {quick} brown
-            fox jumps over
-            the ˇ'lazy' dog."},
-            Mode::Normal,
-        );
-
-        // test change nesting surrounds
-        cx.set_state(
-            indoc! {"
-            fn test_surround() {
-                ifˇ 2 > 1 {
-                    ˇprintln!(\"it is fine\");
-                }
-            };"},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("c s } ]");
-        cx.assert_state(
-            indoc! {"
-            fn test_surround() ˇ[
-                if 2 > 1 ˇ[
-                    println!(\"it is fine\");
-                ]
-            ];"},
-            Mode::Normal,
-        );
-
-        // test spaces with quote change surrounds
-        cx.set_state(
-            indoc! {"
-            fn test_surround() {
-                \"ˇ \"
-            };"},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("c s \" '");
-        cx.assert_state(
-            indoc! {"
-            fn test_surround() {
-                ˇ' '
-            };"},
-            Mode::Normal,
-        );
-
-        // Currently, the same test case but using the closing bracket `]`
-        // actually removes a whitespace before the closing bracket, something
-        // that might need to be fixed?
-        cx.set_state(
-            indoc! {"
-            fn test_surround() {
-                ifˇ 2 > 1 {
-                    ˇprintln!(\"it is fine\");
-                }
-            };"},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("c s { ]");
-        cx.assert_state(
-            indoc! {"
-            fn test_surround() ˇ[
-                if 2 > 1 ˇ[
-                    println!(\"it is fine\");
-                ]
-            ];"},
-            Mode::Normal,
-        );
-
-        // test change quotes.
-        cx.set_state(indoc! {"'  ˇstr  '"}, Mode::Normal);
-        cx.simulate_keystrokes("c s ' \"");
-        cx.assert_state(indoc! {"ˇ\"  str  \""}, Mode::Normal);
-
-        // test multi cursor change quotes
-        cx.set_state(
-            indoc! {"
-            '  ˇstr  '
-            some example text here
-            ˇ'  str  '
-        "},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("c s ' \"");
-        cx.assert_state(
-            indoc! {"
-            ˇ\"  str  \"
-            some example text here
-            ˇ\"  str  \"
-        "},
-            Mode::Normal,
-        );
-
-        // test quote to bracket spacing.
-        cx.set_state(indoc! {"'ˇfoobar'"}, Mode::Normal);
-        cx.simulate_keystrokes("c s ' {");
-        cx.assert_state(indoc! {"ˇ{ foobar }"}, Mode::Normal);
-
-        cx.set_state(indoc! {"'ˇfoobar'"}, Mode::Normal);
-        cx.simulate_keystrokes("c s ' }");
-        cx.assert_state(indoc! {"ˇ{foobar}"}, Mode::Normal);
-    }
-
-    #[gpui::test]
-    async fn test_change_surrounds_any_brackets(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        // Update keybindings so that using `csb` triggers Vim's `AnyBrackets`
-        // action.
-        cx.update(|_, cx| {
-            cx.bind_keys([KeyBinding::new(
-                "b",
-                AnyBrackets,
-                Some("vim_operator == a || vim_operator == i || vim_operator == cs"),
-            )]);
-        });
-
-        cx.set_state(indoc! {"{braˇcketed}"}, Mode::Normal);
-        cx.simulate_keystrokes("c s b [");
-        cx.assert_state(indoc! {"ˇ[ bracketed ]"}, Mode::Normal);
-
-        cx.set_state(indoc! {"[braˇcketed]"}, Mode::Normal);
-        cx.simulate_keystrokes("c s b {");
-        cx.assert_state(indoc! {"ˇ{ bracketed }"}, Mode::Normal);
-
-        cx.set_state(indoc! {"<braˇcketed>"}, Mode::Normal);
-        cx.simulate_keystrokes("c s b [");
-        cx.assert_state(indoc! {"ˇ[ bracketed ]"}, Mode::Normal);
-
-        cx.set_state(indoc! {"(braˇcketed)"}, Mode::Normal);
-        cx.simulate_keystrokes("c s b [");
-        cx.assert_state(indoc! {"ˇ[ bracketed ]"}, Mode::Normal);
-
-        cx.set_state(indoc! {"(< name: ˇ'Zed' >)"}, Mode::Normal);
-        cx.simulate_keystrokes("c s b }");
-        cx.assert_state(indoc! {"(ˇ{ name: 'Zed' })"}, Mode::Normal);
-
-        cx.set_state(
-            indoc! {"
-            (< name: ˇ'Zed' >)
-            (< nˇame: 'DeltaDB' >)
-        "},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("c s b {");
-        cx.set_state(
-            indoc! {"
-            (ˇ{ name: 'Zed' })
-            (ˇ{ name: 'DeltaDB' })
-        "},
-            Mode::Normal,
-        );
-    }
-
-    // The following test cases all follow tpope/vim-surround's behaviour
-    // and are more focused on how whitespace is handled.
-    #[gpui::test]
-    async fn test_change_surrounds_vim(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        // Changing quote to quote should never change the surrounding
-        // whitespace.
-        cx.set_state(indoc! {"'  ˇa  '"}, Mode::Normal);
-        cx.simulate_keystrokes("c s ' \"");
-        cx.assert_state(indoc! {"ˇ\"  a  \""}, Mode::Normal);
-
-        cx.set_state(indoc! {"\"  ˇa  \""}, Mode::Normal);
-        cx.simulate_keystrokes("c s \" '");
-        cx.assert_state(indoc! {"ˇ'  a  '"}, Mode::Normal);
-
-        // Changing quote to bracket adds one more space when the opening
-        // bracket is used, does not affect whitespace when the closing bracket
-        // is used.
-        cx.set_state(indoc! {"'  ˇa  '"}, Mode::Normal);
-        cx.simulate_keystrokes("c s ' {");
-        cx.assert_state(indoc! {"ˇ{   a   }"}, Mode::Normal);
-
-        cx.set_state(indoc! {"'  ˇa  '"}, Mode::Normal);
-        cx.simulate_keystrokes("c s ' }");
-        cx.assert_state(indoc! {"ˇ{  a  }"}, Mode::Normal);
-
-        // Changing bracket to quote should remove all space when the
-        // opening bracket is used and preserve all space when the
-        // closing one is used.
-        cx.set_state(indoc! {"{  ˇa  }"}, Mode::Normal);
-        cx.simulate_keystrokes("c s { '");
-        cx.assert_state(indoc! {"ˇ'a'"}, Mode::Normal);
-
-        cx.set_state(indoc! {"{  ˇa  }"}, Mode::Normal);
-        cx.simulate_keystrokes("c s } '");
-        cx.assert_state(indoc! {"ˇ'  a  '"}, Mode::Normal);
-
-        // Changing bracket to bracket follows these rules:
-        // * opening → opening – keeps only one space.
-        // * opening → closing – removes all space.
-        // * closing → opening – adds one space.
-        // * closing → closing – does not change space.
-        cx.set_state(indoc! {"{   ˇa   }"}, Mode::Normal);
-        cx.simulate_keystrokes("c s { [");
-        cx.assert_state(indoc! {"ˇ[ a ]"}, Mode::Normal);
-
-        cx.set_state(indoc! {"{   ˇa   }"}, Mode::Normal);
-        cx.simulate_keystrokes("c s { ]");
-        cx.assert_state(indoc! {"ˇ[a]"}, Mode::Normal);
-
-        cx.set_state(indoc! {"{  ˇa  }"}, Mode::Normal);
-        cx.simulate_keystrokes("c s } [");
-        cx.assert_state(indoc! {"ˇ[   a   ]"}, Mode::Normal);
-
-        cx.set_state(indoc! {"{  ˇa  }"}, Mode::Normal);
-        cx.simulate_keystrokes("c s } ]");
-        cx.assert_state(indoc! {"ˇ[  a  ]"}, Mode::Normal);
-    }
-
-    #[gpui::test]
-    async fn test_surrounds(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        cx.set_state(
-            indoc! {"
-            The quˇick brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("y s i w [");
-        cx.assert_state(
-            indoc! {"
-            The ˇ[ quick ] brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-
-        cx.simulate_keystrokes("c s [ }");
-        cx.assert_state(
-            indoc! {"
-            The ˇ{quick} brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-
-        cx.simulate_keystrokes("d s {");
-        cx.assert_state(
-            indoc! {"
-            The ˇquick brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-
-        cx.simulate_keystrokes("u");
-        cx.assert_state(
-            indoc! {"
-            The ˇ{quick} brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-    }
-
-    #[gpui::test]
-    async fn test_surround_aliases(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        // add aliases
-        cx.set_state(
-            indoc! {"
-            The quˇick brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("y s i w b");
-        cx.assert_state(
-            indoc! {"
-            The ˇ(quick) brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-
-        cx.set_state(
-            indoc! {"
-            The quˇick brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("y s i w B");
-        cx.assert_state(
-            indoc! {"
-            The ˇ{quick} brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-
-        cx.set_state(
-            indoc! {"
-            The quˇick brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("y s i w a");
-        cx.assert_state(
-            indoc! {"
-            The ˇ<quick> brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-
-        cx.set_state(
-            indoc! {"
-            The quˇick brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("y s i w r");
-        cx.assert_state(
-            indoc! {"
-            The ˇ[quick] brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-
-        // change aliases
-        cx.set_state(
-            indoc! {"
-            The {quˇick} brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("c s { b");
-        cx.assert_state(
-            indoc! {"
-            The ˇ(quick) brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-
-        cx.set_state(
-            indoc! {"
-            The (quˇick) brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("c s ( B");
-        cx.assert_state(
-            indoc! {"
-            The ˇ{quick} brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-
-        cx.set_state(
-            indoc! {"
-            The (quˇick) brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("c s ( a");
-        cx.assert_state(
-            indoc! {"
-            The ˇ<quick> brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-
-        cx.set_state(
-            indoc! {"
-            The <quˇick> brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("c s < b");
-        cx.assert_state(
-            indoc! {"
-            The ˇ(quick) brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-
-        cx.set_state(
-            indoc! {"
-            The (quˇick) brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("c s ( r");
-        cx.assert_state(
-            indoc! {"
-            The ˇ[quick] brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-
-        cx.set_state(
-            indoc! {"
-            The [quˇick] brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("c s [ b");
-        cx.assert_state(
-            indoc! {"
-            The ˇ(quick) brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-
-        // delete alias
-        cx.set_state(
-            indoc! {"
-            The {quˇick} brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("d s B");
-        cx.assert_state(
-            indoc! {"
-            The ˇquick brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-
-        cx.set_state(
-            indoc! {"
-            The (quˇick) brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("d s b");
-        cx.assert_state(
-            indoc! {"
-            The ˇquick brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-
-        cx.set_state(
-            indoc! {"
-            The [quˇick] brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("d s r");
-        cx.assert_state(
-            indoc! {"
-            The ˇquick brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-
-        cx.set_state(
-            indoc! {"
-            The <quˇick> brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("d s a");
-        cx.assert_state(
-            indoc! {"
-            The ˇquick brown
-            fox jumps over
-            the lazy dog."},
-            Mode::Normal,
-        );
-    }
-}
diff --git a/crates/vim/src/test.rs b/crates/vim/src/test.rs
deleted file mode 100644
index 4c61479157..0000000000
--- a/crates/vim/src/test.rs
+++ /dev/null
@@ -1,2503 +0,0 @@
-mod neovim_backed_test_context;
-mod neovim_connection;
-mod vim_test_context;
-
-use std::{sync::Arc, time::Duration};
-
-use collections::HashMap;
-use command_palette::CommandPalette;
-use editor::{
-    AnchorRangeExt, DisplayPoint, Editor, EditorMode, MultiBuffer, MultiBufferOffset,
-    actions::{DeleteLine, WrapSelectionsInTag},
-    code_context_menus::CodeContextMenu,
-    display_map::DisplayRow,
-    test::editor_test_context::EditorTestContext,
-};
-use futures::StreamExt;
-use gpui::{KeyBinding, Modifiers, MouseButton, TestAppContext, px};
-use itertools::Itertools;
-use language::{CursorShape, Language, LanguageConfig, Point};
-pub use neovim_backed_test_context::*;
-use settings::SettingsStore;
-use ui::Pixels;
-use util::test::marked_text_ranges;
-pub use vim_test_context::*;
-
-use indoc::indoc;
-use search::BufferSearchBar;
-
-use crate::{PushSneak, PushSneakBackward, insert::NormalBefore, motion, state::Mode};
-
-use util_macros::perf;
-
-#[perf]
-#[gpui::test]
-async fn test_initially_disabled(cx: &mut gpui::TestAppContext) {
-    let mut cx = VimTestContext::new(cx, false).await;
-    cx.simulate_keystrokes("h j k l");
-    cx.assert_editor_state("hjklˇ");
-}
-
-#[perf]
-#[gpui::test]
-async fn test_neovim(cx: &mut gpui::TestAppContext) {
-    let mut cx = NeovimBackedTestContext::new(cx).await;
-
-    cx.simulate_shared_keystrokes("i").await;
-    cx.shared_state().await.assert_matches();
-    cx.simulate_shared_keystrokes("shift-t e s t space t e s t escape 0 d w")
-        .await;
-    cx.shared_state().await.assert_matches();
-    cx.assert_editor_state("ˇtest");
-}
-
-#[perf]
-#[gpui::test]
-async fn test_toggle_through_settings(cx: &mut gpui::TestAppContext) {
-    let mut cx = VimTestContext::new(cx, true).await;
-
-    cx.simulate_keystrokes("i");
-    assert_eq!(cx.mode(), Mode::Insert);
-
-    // Editor acts as though vim is disabled
-    cx.disable_vim();
-    cx.simulate_keystrokes("h j k l");
-    cx.assert_editor_state("hjklˇ");
-
-    // Selections aren't changed if editor is blurred but vim-mode is still disabled.
-    cx.cx.set_state("«hjklˇ»");
-    cx.assert_editor_state("«hjklˇ»");
-    cx.update_editor(|_, window, _cx| window.blur());
-    cx.assert_editor_state("«hjklˇ»");
-    cx.update_editor(|_, window, cx| cx.focus_self(window));
-    cx.assert_editor_state("«hjklˇ»");
-
-    // Enabling dynamically sets vim mode again and restores normal mode
-    cx.enable_vim();
-    assert_eq!(cx.mode(), Mode::Normal);
-    cx.simulate_keystrokes("h h h l");
-    assert_eq!(cx.buffer_text(), "hjkl".to_owned());
-    cx.assert_editor_state("hˇjkl");
-    cx.simulate_keystrokes("i T e s t");
-    cx.assert_editor_state("hTestˇjkl");
-
-    // Disabling and enabling resets to normal mode
-    assert_eq!(cx.mode(), Mode::Insert);
-    cx.disable_vim();
-    cx.enable_vim();
-    assert_eq!(cx.mode(), Mode::Normal);
-}
-
-#[perf]
-#[gpui::test]
-async fn test_cancel_selection(cx: &mut gpui::TestAppContext) {
-    let mut cx = VimTestContext::new(cx, true).await;
-
-    cx.set_state(
-        indoc! {"The quick brown fox juˇmps over the lazy dog"},
-        Mode::Normal,
-    );
-    // jumps
-    cx.simulate_keystrokes("v l l");
-    cx.assert_editor_state("The quick brown fox ju«mpsˇ» over the lazy dog");
-
-    cx.simulate_keystrokes("escape");
-    cx.assert_editor_state("The quick brown fox jumpˇs over the lazy dog");
-
-    // go back to the same selection state
-    cx.simulate_keystrokes("v h h");
-    cx.assert_editor_state("The quick brown fox ju«ˇmps» over the lazy dog");
-
-    // Ctrl-[ should behave like Esc
-    cx.simulate_keystrokes("ctrl-[");
-    cx.assert_editor_state("The quick brown fox juˇmps over the lazy dog");
-}
-
-#[perf]
-#[gpui::test]
-async fn test_buffer_search(cx: &mut gpui::TestAppContext) {
-    let mut cx = VimTestContext::new(cx, true).await;
-
-    cx.set_state(
-        indoc! {"
-            The quick brown
-            fox juˇmps over
-            the lazy dog"},
-        Mode::Normal,
-    );
-    cx.simulate_keystrokes("/");
-
-    let search_bar = cx.workspace(|workspace, _, cx| {
-        workspace
-            .active_pane()
-            .read(cx)
-            .toolbar()
-            .read(cx)
-            .item_of_type::<BufferSearchBar>()
-            .expect("Buffer search bar should be deployed")
-    });
-
-    cx.update_entity(search_bar, |bar, _, cx| {
-        assert_eq!(bar.query(cx), "");
-    })
-}
-
-#[perf]
-#[gpui::test]
-async fn test_count_down(cx: &mut gpui::TestAppContext) {
-    let mut cx = VimTestContext::new(cx, true).await;
-
-    cx.set_state(indoc! {"aˇa\nbb\ncc\ndd\nee"}, Mode::Normal);
-    cx.simulate_keystrokes("2 down");
-    cx.assert_editor_state("aa\nbb\ncˇc\ndd\nee");
-    cx.simulate_keystrokes("9 down");
-    cx.assert_editor_state("aa\nbb\ncc\ndd\neˇe");
-}
-
-#[perf]
-#[gpui::test]
-async fn test_end_of_document_710(cx: &mut gpui::TestAppContext) {
-    let mut cx = VimTestContext::new(cx, true).await;
-
-    // goes to end by default
-    cx.set_state(indoc! {"aˇa\nbb\ncc"}, Mode::Normal);
-    cx.simulate_keystrokes("shift-g");
-    cx.assert_editor_state("aa\nbb\ncˇc");
-
-    // can go to line 1 (https://github.com/zed-industries/zed/issues/5812)
-    cx.simulate_keystrokes("1 shift-g");
-    cx.assert_editor_state("aˇa\nbb\ncc");
-}
-
-#[perf]
-#[gpui::test]
-async fn test_end_of_line_with_times(cx: &mut gpui::TestAppContext) {
-    let mut cx = VimTestContext::new(cx, true).await;
-
-    // goes to current line end
-    cx.set_state(indoc! {"ˇaa\nbb\ncc"}, Mode::Normal);
-    cx.simulate_keystrokes("$");
-    cx.assert_editor_state("aˇa\nbb\ncc");
-
-    // goes to next line end
-    cx.simulate_keystrokes("2 $");
-    cx.assert_editor_state("aa\nbˇb\ncc");
-
-    // try to exceed the final line.
-    cx.simulate_keystrokes("4 $");
-    cx.assert_editor_state("aa\nbb\ncˇc");
-}
-
-#[perf]
-#[gpui::test]
-async fn test_indent_outdent(cx: &mut gpui::TestAppContext) {
-    let mut cx = VimTestContext::new(cx, true).await;
-
-    // works in normal mode
-    cx.set_state(indoc! {"aa\nbˇb\ncc"}, Mode::Normal);
-    cx.simulate_keystrokes("> >");
-    cx.assert_editor_state("aa\n    bˇb\ncc");
-    cx.simulate_keystrokes("< <");
-    cx.assert_editor_state("aa\nbˇb\ncc");
-
-    // works in visual mode
-    cx.simulate_keystrokes("shift-v down >");
-    cx.assert_editor_state("aa\n    bˇb\n    cc");
-
-    // works as operator
-    cx.set_state("aa\nbˇb\ncc\n", Mode::Normal);
-    cx.simulate_keystrokes("> j");
-    cx.assert_editor_state("aa\n    bˇb\n    cc\n");
-    cx.simulate_keystrokes("< k");
-    cx.assert_editor_state("aa\nbˇb\n    cc\n");
-    cx.simulate_keystrokes("> i p");
-    cx.assert_editor_state("    aa\n    bˇb\n        cc\n");
-    cx.simulate_keystrokes("< i p");
-    cx.assert_editor_state("aa\nbˇb\n    cc\n");
-    cx.simulate_keystrokes("< i p");
-    cx.assert_editor_state("aa\nbˇb\ncc\n");
-
-    cx.set_state("ˇaa\nbb\ncc\n", Mode::Normal);
-    cx.simulate_keystrokes("> 2 j");
-    cx.assert_editor_state("    ˇaa\n    bb\n    cc\n");
-
-    cx.set_state("aa\nbb\nˇcc\n", Mode::Normal);
-    cx.simulate_keystrokes("> 2 k");
-    cx.assert_editor_state("    aa\n    bb\n    ˇcc\n");
-
-    // works with repeat
-    cx.set_state("a\nb\nccˇc\n", Mode::Normal);
-    cx.simulate_keystrokes("> 2 k");
-    cx.assert_editor_state("    a\n    b\n    ccˇc\n");
-    cx.simulate_keystrokes(".");
-    cx.assert_editor_state("        a\n        b\n        ccˇc\n");
-    cx.simulate_keystrokes("v k <");
-    cx.assert_editor_state("        a\n    bˇ\n    ccc\n");
-    cx.simulate_keystrokes(".");
-    cx.assert_editor_state("        a\nbˇ\nccc\n");
-}
-
-#[perf]
-#[gpui::test]
-async fn test_escape_command_palette(cx: &mut gpui::TestAppContext) {
-    let mut cx = VimTestContext::new(cx, true).await;
-
-    cx.set_state("aˇbc\n", Mode::Normal);
-    cx.simulate_keystrokes("i cmd-shift-p");
-
-    assert!(
-        cx.workspace(|workspace, _, cx| workspace.active_modal::<CommandPalette>(cx).is_some())
-    );
-    cx.simulate_keystrokes("escape");
-    cx.run_until_parked();
-    assert!(
-        !cx.workspace(|workspace, _, cx| workspace.active_modal::<CommandPalette>(cx).is_some())
-    );
-    cx.assert_state("aˇbc\n", Mode::Insert);
-}
-
-#[perf]
-#[gpui::test]
-async fn test_escape_cancels(cx: &mut gpui::TestAppContext) {
-    let mut cx = VimTestContext::new(cx, true).await;
-
-    cx.set_state("aˇbˇc", Mode::Normal);
-    cx.simulate_keystrokes("escape");
-
-    cx.assert_state("aˇbc", Mode::Normal);
-}
-
-#[perf]
-#[gpui::test]
-async fn test_selection_on_search(cx: &mut gpui::TestAppContext) {
-    let mut cx = VimTestContext::new(cx, true).await;
-
-    cx.set_state(indoc! {"aa\nbˇb\ncc\ncc\ncc\n"}, Mode::Normal);
-    cx.simulate_keystrokes("/ c c");
-
-    let search_bar = cx.workspace(|workspace, _, cx| {
-        workspace
-            .active_pane()
-            .read(cx)
-            .toolbar()
-            .read(cx)
-            .item_of_type::<BufferSearchBar>()
-            .expect("Buffer search bar should be deployed")
-    });
-
-    cx.update_entity(search_bar, |bar, _, cx| {
-        assert_eq!(bar.query(cx), "cc");
-    });
-
-    cx.update_editor(|editor, window, cx| {
-        let highlights = editor.all_text_background_highlights(window, cx);
-        assert_eq!(3, highlights.len());
-        assert_eq!(
-            DisplayPoint::new(DisplayRow(2), 0)..DisplayPoint::new(DisplayRow(2), 2),
-            highlights[0].0
-        )
-    });
-    cx.simulate_keystrokes("enter");
-
-    cx.assert_state(indoc! {"aa\nbb\nˇcc\ncc\ncc\n"}, Mode::Normal);
-    cx.simulate_keystrokes("n");
-    cx.assert_state(indoc! {"aa\nbb\ncc\nˇcc\ncc\n"}, Mode::Normal);
-    cx.simulate_keystrokes("shift-n");
-    cx.assert_state(indoc! {"aa\nbb\nˇcc\ncc\ncc\n"}, Mode::Normal);
-}
-
-#[perf]
-#[gpui::test]
-async fn test_word_characters(cx: &mut gpui::TestAppContext) {
-    let mut cx = VimTestContext::new_typescript(cx).await;
-    cx.set_state(
-        indoc! { "
-        class A {
-            #ˇgoop = 99;
-            $ˇgoop () { return this.#gˇoop };
-        };
-        console.log(new A().$gooˇp())
-    "},
-        Mode::Normal,
-    );
-    cx.simulate_keystrokes("v i w");
-    cx.assert_state(
-        indoc! {"
-        class A {
-            «#goopˇ» = 99;
-            «$goopˇ» () { return this.«#goopˇ» };
-        };
-        console.log(new A().«$goopˇ»())
-    "},
-        Mode::Visual,
-    )
-}
-
-#[perf]
-#[gpui::test]
-async fn test_kebab_case(cx: &mut gpui::TestAppContext) {
-    let mut cx = VimTestContext::new_html(cx).await;
-    cx.set_state(
-        indoc! { r#"
-            <div><a class="bg-rˇed"></a></div>
-            "#},
-        Mode::Normal,
-    );
-    cx.simulate_keystrokes("v i w");
-    cx.assert_state(
-        indoc! { r#"
-        <div><a class="bg-«redˇ»"></a></div>
-        "#
-        },
-        Mode::Visual,
-    )
-}
-
-#[perf]
-#[gpui::test]
-async fn test_join_lines(cx: &mut gpui::TestAppContext) {
-    let mut cx = NeovimBackedTestContext::new(cx).await;
-
-    cx.set_shared_state(indoc! {"
-      ˇone
-      two
-      three
-      four
-      five
-      six
-      "})
-        .await;
-    cx.simulate_shared_keystrokes("shift-j").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-          oneˇ two
-          three
-          four
-          five
-          six
-          "});
-    cx.simulate_shared_keystrokes("3 shift-j").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-          one two threeˇ four
-          five
-          six
-          "});
-
-    cx.set_shared_state(indoc! {"
-      ˇone
-      two
-      three
-      four
-      five
-      six
-      "})
-        .await;
-    cx.simulate_shared_keystrokes("j v 3 j shift-j").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-      one
-      two three fourˇ five
-      six
-      "});
-
-    cx.set_shared_state(indoc! {"
-      ˇone
-      two
-      three
-      four
-      five
-      six
-      "})
-        .await;
-    cx.simulate_shared_keystrokes("g shift-j").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-          oneˇtwo
-          three
-          four
-          five
-          six
-          "});
-    cx.simulate_shared_keystrokes("3 g shift-j").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-          onetwothreeˇfour
-          five
-          six
-          "});
-
-    cx.set_shared_state(indoc! {"
-      ˇone
-      two
-      three
-      four
-      five
-      six
-      "})
-        .await;
-    cx.simulate_shared_keystrokes("j v 3 j g shift-j").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-      one
-      twothreefourˇfive
-      six
-      "});
-}
-
-#[cfg(target_os = "macos")]
-#[perf]
-#[gpui::test]
-async fn test_wrapped_lines(cx: &mut gpui::TestAppContext) {
-    let mut cx = NeovimBackedTestContext::new(cx).await;
-
-    cx.set_shared_wrap(12).await;
-    // tests line wrap as follows:
-    //  1: twelve char
-    //     twelve char
-    //  2: twelve char
-    cx.set_shared_state(indoc! { "
-        tˇwelve char twelve char
-        twelve char
-    "})
-        .await;
-    cx.simulate_shared_keystrokes("j").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-        twelve char twelve char
-        tˇwelve char
-    "});
-    cx.simulate_shared_keystrokes("k").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-        tˇwelve char twelve char
-        twelve char
-    "});
-    cx.simulate_shared_keystrokes("g j").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-        twelve char tˇwelve char
-        twelve char
-    "});
-    cx.simulate_shared_keystrokes("g j").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-        twelve char twelve char
-        tˇwelve char
-    "});
-
-    cx.simulate_shared_keystrokes("g k").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-        twelve char tˇwelve char
-        twelve char
-    "});
-
-    cx.simulate_shared_keystrokes("g ^").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-        twelve char ˇtwelve char
-        twelve char
-    "});
-
-    cx.simulate_shared_keystrokes("^").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-        ˇtwelve char twelve char
-        twelve char
-    "});
-
-    cx.simulate_shared_keystrokes("g $").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-        twelve charˇ twelve char
-        twelve char
-    "});
-    cx.simulate_shared_keystrokes("$").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-        twelve char twelve chaˇr
-        twelve char
-    "});
-
-    cx.set_shared_state(indoc! { "
-        tˇwelve char twelve char
-        twelve char
-    "})
-        .await;
-    cx.simulate_shared_keystrokes("enter").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-            twelve char twelve char
-            ˇtwelve char
-        "});
-
-    cx.set_shared_state(indoc! { "
-        twelve char
-        tˇwelve char twelve char
-        twelve char
-    "})
-        .await;
-    cx.simulate_shared_keystrokes("o o escape").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-        twelve char
-        twelve char twelve char
-        ˇo
-        twelve char
-    "});
-
-    cx.set_shared_state(indoc! { "
-        twelve char
-        tˇwelve char twelve char
-        twelve char
-    "})
-        .await;
-    cx.simulate_shared_keystrokes("shift-a a escape").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-        twelve char
-        twelve char twelve charˇa
-        twelve char
-    "});
-    cx.simulate_shared_keystrokes("shift-i i escape").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-        twelve char
-        ˇitwelve char twelve chara
-        twelve char
-    "});
-    cx.simulate_shared_keystrokes("shift-d").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-        twelve char
-        ˇ
-        twelve char
-    "});
-
-    cx.set_shared_state(indoc! { "
-        twelve char
-        twelve char tˇwelve char
-        twelve char
-    "})
-        .await;
-    cx.simulate_shared_keystrokes("shift-o o escape").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-        twelve char
-        ˇo
-        twelve char twelve char
-        twelve char
-    "});
-
-    // line wraps as:
-    // fourteen ch
-    // ar
-    // fourteen ch
-    // ar
-    cx.set_shared_state(indoc! { "
-        fourteen chaˇr
-        fourteen char
-    "})
-        .await;
-
-    cx.simulate_shared_keystrokes("d i w").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-        fourteenˇ•
-        fourteen char
-    "});
-    cx.simulate_shared_keystrokes("j shift-f e f r").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-        fourteen•
-        fourteen chaˇr
-    "});
-}
-
-#[perf]
-#[gpui::test]
-async fn test_folds(cx: &mut gpui::TestAppContext) {
-    let mut cx = NeovimBackedTestContext::new(cx).await;
-    cx.set_neovim_option("foldmethod=manual").await;
-
-    cx.set_shared_state(indoc! { "
-        fn boop() {
-          ˇbarp()
-          bazp()
-        }
-    "})
-        .await;
-    cx.simulate_shared_keystrokes("shift-v j z f").await;
-
-    // visual display is now:
-    // fn boop () {
-    //  [FOLDED]
-    // }
-
-    // TODO: this should not be needed but currently zf does not
-    // return to normal mode.
-    cx.simulate_shared_keystrokes("escape").await;
-
-    // skip over fold downward
-    cx.simulate_shared_keystrokes("g g").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-        ˇfn boop() {
-          barp()
-          bazp()
-        }
-    "});
-
-    cx.simulate_shared_keystrokes("j j").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-        fn boop() {
-          barp()
-          bazp()
-        ˇ}
-    "});
-
-    // skip over fold upward
-    cx.simulate_shared_keystrokes("2 k").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-        ˇfn boop() {
-          barp()
-          bazp()
-        }
-    "});
-
-    // yank the fold
-    cx.simulate_shared_keystrokes("down y y").await;
-    cx.shared_clipboard()
-        .await
-        .assert_eq("  barp()\n  bazp()\n");
-
-    // re-open
-    cx.simulate_shared_keystrokes("z o").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-        fn boop() {
-        ˇ  barp()
-          bazp()
-        }
-    "});
-}
-
-#[perf]
-#[gpui::test]
-async fn test_folds_panic(cx: &mut gpui::TestAppContext) {
-    let mut cx = NeovimBackedTestContext::new(cx).await;
-    cx.set_neovim_option("foldmethod=manual").await;
-
-    cx.set_shared_state(indoc! { "
-        fn boop() {
-          ˇbarp()
-          bazp()
-        }
-    "})
-        .await;
-    cx.simulate_shared_keystrokes("shift-v j z f").await;
-    cx.simulate_shared_keystrokes("escape").await;
-    cx.simulate_shared_keystrokes("g g").await;
-    cx.simulate_shared_keystrokes("5 d j").await;
-    cx.shared_state().await.assert_eq("ˇ");
-    cx.set_shared_state(indoc! {"
-        fn boop() {
-          ˇbarp()
-          bazp()
-        }
-    "})
-        .await;
-    cx.simulate_shared_keystrokes("shift-v j j z f").await;
-    cx.simulate_shared_keystrokes("escape").await;
-    cx.simulate_shared_keystrokes("shift-g shift-v").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-        fn boop() {
-          barp()
-          bazp()
-        }
-        ˇ"});
-}
-
-#[perf]
-#[gpui::test]
-async fn test_clear_counts(cx: &mut gpui::TestAppContext) {
-    let mut cx = NeovimBackedTestContext::new(cx).await;
-
-    cx.set_shared_state(indoc! {"
-        The quick brown
-        fox juˇmps over
-        the lazy dog"})
-        .await;
-
-    cx.simulate_shared_keystrokes("4 escape 3 d l").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-        The quick brown
-        fox juˇ over
-        the lazy dog"});
-}
-
-#[perf]
-#[gpui::test]
-async fn test_zero(cx: &mut gpui::TestAppContext) {
-    let mut cx = NeovimBackedTestContext::new(cx).await;
-
-    cx.set_shared_state(indoc! {"
-        The quˇick brown
-        fox jumps over
-        the lazy dog"})
-        .await;
-
-    cx.simulate_shared_keystrokes("0").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-        ˇThe quick brown
-        fox jumps over
-        the lazy dog"});
-
-    cx.simulate_shared_keystrokes("1 0 l").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-        The quick ˇbrown
-        fox jumps over
-        the lazy dog"});
-}
-
-#[perf]
-#[gpui::test]
-async fn test_selection_goal(cx: &mut gpui::TestAppContext) {
-    let mut cx = NeovimBackedTestContext::new(cx).await;
-
-    cx.set_shared_state(indoc! {"
-        ;;ˇ;
-        Lorem Ipsum"})
-        .await;
-
-    cx.simulate_shared_keystrokes("a down up ; down up").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-        ;;;;ˇ
-        Lorem Ipsum"});
-}
-
-#[cfg(target_os = "macos")]
-#[perf]
-#[gpui::test]
-async fn test_wrapped_motions(cx: &mut gpui::TestAppContext) {
-    let mut cx = NeovimBackedTestContext::new(cx).await;
-
-    cx.set_shared_wrap(12).await;
-
-    cx.set_shared_state(indoc! {"
-                aaˇaa
-                😃😃"
-    })
-    .await;
-    cx.simulate_shared_keystrokes("j").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-                aaaa
-                😃ˇ😃"
-    });
-
-    cx.set_shared_state(indoc! {"
-                123456789012aaˇaa
-                123456789012😃😃"
-    })
-    .await;
-    cx.simulate_shared_keystrokes("j").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-        123456789012aaaa
-        123456789012😃ˇ😃"
-    });
-
-    cx.set_shared_state(indoc! {"
-                123456789012aaˇaa
-                123456789012😃😃"
-    })
-    .await;
-    cx.simulate_shared_keystrokes("j").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-        123456789012aaaa
-        123456789012😃ˇ😃"
-    });
-
-    cx.set_shared_state(indoc! {"
-        123456789012aaaaˇaaaaaaaa123456789012
-        wow
-        123456789012😃😃😃😃😃😃123456789012"
-    })
-    .await;
-    cx.simulate_shared_keystrokes("j j").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-        123456789012aaaaaaaaaaaa123456789012
-        wow
-        123456789012😃😃ˇ😃😃😃😃123456789012"
-    });
-}
-
-#[perf]
-#[gpui::test]
-async fn test_wrapped_delete_end_document(cx: &mut gpui::TestAppContext) {
-    let mut cx = NeovimBackedTestContext::new(cx).await;
-
-    cx.set_shared_wrap(12).await;
-
-    cx.set_shared_state(indoc! {"
-                aaˇaaaaaaaaaaaaaaaaaa
-                bbbbbbbbbbbbbbbbbbbb
-                cccccccccccccccccccc"
-    })
-    .await;
-    cx.simulate_shared_keystrokes("d shift-g i z z z").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-                zzzˇ"
-    });
-}
-
-#[perf]
-#[gpui::test]
-async fn test_paragraphs_dont_wrap(cx: &mut gpui::TestAppContext) {
-    let mut cx = NeovimBackedTestContext::new(cx).await;
-
-    cx.set_shared_state(indoc! {"
-        one
-        ˇ
-        two"})
-        .await;
-
-    cx.simulate_shared_keystrokes("} }").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-        one
-
-        twˇo"});
-
-    cx.simulate_shared_keystrokes("{ { {").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-        ˇone
-
-        two"});
-}
-
-#[perf]
-#[gpui::test]
-async fn test_select_all_issue_2170(cx: &mut gpui::TestAppContext) {
-    let mut cx = VimTestContext::new(cx, true).await;
-
-    cx.set_state(
-        indoc! {"
-        defmodule Test do
-            def test(a, ˇ[_, _] = b), do: IO.puts('hi')
-        end
-    "},
-        Mode::Normal,
-    );
-    cx.simulate_keystrokes("g a");
-    cx.assert_state(
-        indoc! {"
-        defmodule Test do
-            def test(a, «[ˇ»_, _] = b), do: IO.puts('hi')
-        end
-    "},
-        Mode::Visual,
-    );
-}
-
-#[perf]
-#[gpui::test]
-async fn test_jk(cx: &mut gpui::TestAppContext) {
-    let mut cx = NeovimBackedTestContext::new(cx).await;
-
-    cx.update(|_, cx| {
-        cx.bind_keys([KeyBinding::new(
-            "j k",
-            NormalBefore,
-            Some("vim_mode == insert"),
-        )])
-    });
-    cx.neovim.exec("imap jk <esc>").await;
-
-    cx.set_shared_state("ˇhello").await;
-    cx.simulate_shared_keystrokes("i j o j k").await;
-    cx.shared_state().await.assert_eq("jˇohello");
-}
-
-fn assert_pending_input(cx: &mut VimTestContext, expected: &str) {
-    cx.update_editor(|editor, window, cx| {
-        let snapshot = editor.snapshot(window, cx);
-        let highlights = editor
-            .text_highlights::<editor::PendingInput>(cx)
-            .unwrap()
-            .1;
-        let (_, ranges) = marked_text_ranges(expected, false);
-
-        assert_eq!(
-            highlights
-                .iter()
-                .map(|highlight| highlight.to_offset(&snapshot.buffer_snapshot()))
-                .collect::<Vec<_>>(),
-            ranges
-                .iter()
-                .map(|range| MultiBufferOffset(range.start)..MultiBufferOffset(range.end))
-                .collect::<Vec<_>>()
-        )
-    });
-}
-
-#[perf]
-#[gpui::test]
-async fn test_jk_multi(cx: &mut gpui::TestAppContext) {
-    let mut cx = VimTestContext::new(cx, true).await;
-
-    cx.update(|_, cx| {
-        cx.bind_keys([KeyBinding::new(
-            "j k l",
-            NormalBefore,
-            Some("vim_mode == insert"),
-        )])
-    });
-
-    cx.set_state("ˇone ˇone ˇone", Mode::Normal);
-    cx.simulate_keystrokes("i j");
-    cx.simulate_keystrokes("k");
-    cx.assert_state("ˇjkone ˇjkone ˇjkone", Mode::Insert);
-    assert_pending_input(&mut cx, "«jk»one «jk»one «jk»one");
-    cx.simulate_keystrokes("o j k");
-    cx.assert_state("jkoˇjkone jkoˇjkone jkoˇjkone", Mode::Insert);
-    assert_pending_input(&mut cx, "jko«jk»one jko«jk»one jko«jk»one");
-    cx.simulate_keystrokes("l");
-    cx.assert_state("jkˇoone jkˇoone jkˇoone", Mode::Normal);
-}
-
-#[perf]
-#[gpui::test]
-async fn test_jk_delay(cx: &mut gpui::TestAppContext) {
-    let mut cx = VimTestContext::new(cx, true).await;
-
-    cx.update(|_, cx| {
-        cx.bind_keys([KeyBinding::new(
-            "j k",
-            NormalBefore,
-            Some("vim_mode == insert"),
-        )])
-    });
-
-    cx.set_state("ˇhello", Mode::Normal);
-    cx.simulate_keystrokes("i j");
-    cx.executor().advance_clock(Duration::from_millis(500));
-    cx.run_until_parked();
-    cx.assert_state("ˇjhello", Mode::Insert);
-    cx.update_editor(|editor, window, cx| {
-        let snapshot = editor.snapshot(window, cx);
-        let highlights = editor
-            .text_highlights::<editor::PendingInput>(cx)
-            .unwrap()
-            .1;
-
-        assert_eq!(
-            highlights
-                .iter()
-                .map(|highlight| highlight.to_offset(&snapshot.buffer_snapshot()))
-                .collect::<Vec<_>>(),
-            vec![MultiBufferOffset(0)..MultiBufferOffset(1)]
-        )
-    });
-    cx.executor().advance_clock(Duration::from_millis(500));
-    cx.run_until_parked();
-    cx.assert_state("jˇhello", Mode::Insert);
-    cx.simulate_keystrokes("k j k");
-    cx.assert_state("jˇkhello", Mode::Normal);
-}
-
-#[perf]
-#[gpui::test]
-async fn test_jk_max_count(cx: &mut gpui::TestAppContext) {
-    let mut cx = NeovimBackedTestContext::new(cx).await;
-
-    cx.set_shared_state("1\nˇ2\n3").await;
-    cx.simulate_shared_keystrokes("9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 j")
-        .await;
-    cx.shared_state().await.assert_eq("1\n2\nˇ3");
-
-    let number: String = usize::MAX.to_string().split("").join(" ");
-    cx.simulate_shared_keystrokes(&format!("{number} k")).await;
-    cx.shared_state().await.assert_eq("ˇ1\n2\n3");
-}
-
-#[perf]
-#[gpui::test]
-async fn test_comma_w(cx: &mut gpui::TestAppContext) {
-    let mut cx = NeovimBackedTestContext::new(cx).await;
-
-    cx.update(|_, cx| {
-        cx.bind_keys([KeyBinding::new(
-            ", w",
-            motion::Down {
-                display_lines: false,
-            },
-            Some("vim_mode == normal"),
-        )])
-    });
-    cx.neovim.exec("map ,w j").await;
-
-    cx.set_shared_state("ˇhello hello\nhello hello").await;
-    cx.simulate_shared_keystrokes("f o ; , w").await;
-    cx.shared_state()
-        .await
-        .assert_eq("hello hello\nhello hellˇo");
-
-    cx.set_shared_state("ˇhello hello\nhello hello").await;
-    cx.simulate_shared_keystrokes("f o ; , i").await;
-    cx.shared_state()
-        .await
-        .assert_eq("hellˇo hello\nhello hello");
-}
-
-#[perf]
-#[gpui::test]
-async fn test_completion_menu_scroll_aside(cx: &mut TestAppContext) {
-    let mut cx = VimTestContext::new_typescript(cx).await;
-
-    cx.lsp
-        .set_request_handler::<lsp::request::Completion, _, _>(move |_, _| async move {
-            Ok(Some(lsp::CompletionResponse::Array(vec![
-                lsp::CompletionItem {
-                    label: "Test Item".to_string(),
-                    documentation: Some(lsp::Documentation::String(
-                        "This is some very long documentation content that will be displayed in the aside panel for scrolling.\n".repeat(50)
-                    )),
-                    ..Default::default()
-                },
-            ])))
-        });
-
-    cx.set_state("variableˇ", Mode::Insert);
-    cx.simulate_keystroke(".");
-    cx.executor().run_until_parked();
-
-    let mut initial_offset: Pixels = px(0.0);
-
-    cx.update_editor(|editor, _, _| {
-        let binding = editor.context_menu().borrow();
-        let Some(CodeContextMenu::Completions(menu)) = binding.as_ref() else {
-            panic!("Should have completions menu open");
-        };
-
-        initial_offset = menu.scroll_handle_aside.offset().y;
-    });
-
-    // The `ctrl-e` shortcut should scroll the completion menu's aside content
-    // down, so the updated offset should be lower than the initial offset.
-    cx.simulate_keystroke("ctrl-e");
-    cx.update_editor(|editor, _, _| {
-        let binding = editor.context_menu().borrow();
-        let Some(CodeContextMenu::Completions(menu)) = binding.as_ref() else {
-            panic!("Should have completions menu open");
-        };
-
-        assert!(menu.scroll_handle_aside.offset().y < initial_offset);
-    });
-
-    // The `ctrl-y` shortcut should do the inverse scrolling as `ctrl-e`, so the
-    // offset should now be the same as the initial offset.
-    cx.simulate_keystroke("ctrl-y");
-    cx.update_editor(|editor, _, _| {
-        let binding = editor.context_menu().borrow();
-        let Some(CodeContextMenu::Completions(menu)) = binding.as_ref() else {
-            panic!("Should have completions menu open");
-        };
-
-        assert_eq!(menu.scroll_handle_aside.offset().y, initial_offset);
-    });
-
-    // The `ctrl-d` shortcut should scroll the completion menu's aside content
-    // down, so the updated offset should be lower than the initial offset.
-    cx.simulate_keystroke("ctrl-d");
-    cx.update_editor(|editor, _, _| {
-        let binding = editor.context_menu().borrow();
-        let Some(CodeContextMenu::Completions(menu)) = binding.as_ref() else {
-            panic!("Should have completions menu open");
-        };
-
-        assert!(menu.scroll_handle_aside.offset().y < initial_offset);
-    });
-
-    // The `ctrl-u` shortcut should do the inverse scrolling as `ctrl-u`, so the
-    // offset should now be the same as the initial offset.
-    cx.simulate_keystroke("ctrl-u");
-    cx.update_editor(|editor, _, _| {
-        let binding = editor.context_menu().borrow();
-        let Some(CodeContextMenu::Completions(menu)) = binding.as_ref() else {
-            panic!("Should have completions menu open");
-        };
-
-        assert_eq!(menu.scroll_handle_aside.offset().y, initial_offset);
-    });
-}
-
-#[perf]
-#[gpui::test]
-async fn test_rename(cx: &mut gpui::TestAppContext) {
-    let mut cx = VimTestContext::new_typescript(cx).await;
-
-    cx.set_state("const beˇfore = 2; console.log(before)", Mode::Normal);
-    let def_range = cx.lsp_range("const «beforeˇ» = 2; console.log(before)");
-    let tgt_range = cx.lsp_range("const before = 2; console.log(«beforeˇ»)");
-    let mut prepare_request = cx.set_request_handler::<lsp::request::PrepareRenameRequest, _, _>(
-        move |_, _, _| async move { Ok(Some(lsp::PrepareRenameResponse::Range(def_range))) },
-    );
-    let mut rename_request =
-        cx.set_request_handler::<lsp::request::Rename, _, _>(move |url, params, _| async move {
-            Ok(Some(lsp::WorkspaceEdit {
-                changes: Some(
-                    [(
-                        url.clone(),
-                        vec![
-                            lsp::TextEdit::new(def_range, params.new_name.clone()),
-                            lsp::TextEdit::new(tgt_range, params.new_name),
-                        ],
-                    )]
-                    .into(),
-                ),
-                ..Default::default()
-            }))
-        });
-
-    cx.simulate_keystrokes("c d");
-    prepare_request.next().await.unwrap();
-    cx.simulate_input("after");
-    cx.simulate_keystrokes("enter");
-    rename_request.next().await.unwrap();
-    cx.assert_state("const afterˇ = 2; console.log(after)", Mode::Normal)
-}
-
-#[gpui::test]
-async fn test_go_to_definition(cx: &mut gpui::TestAppContext) {
-    let mut cx = VimTestContext::new_typescript(cx).await;
-
-    cx.set_state("const before = 2; console.log(beforˇe)", Mode::Normal);
-    let def_range = cx.lsp_range("const «beforeˇ» = 2; console.log(before)");
-    let mut go_to_request =
-        cx.set_request_handler::<lsp::request::GotoDefinition, _, _>(move |url, _, _| async move {
-            Ok(Some(lsp::GotoDefinitionResponse::Scalar(
-                lsp::Location::new(url.clone(), def_range),
-            )))
-        });
-
-    cx.simulate_keystrokes("g d");
-    go_to_request.next().await.unwrap();
-    cx.run_until_parked();
-
-    cx.assert_state("const ˇbefore = 2; console.log(before)", Mode::Normal);
-}
-
-#[perf]
-#[gpui::test]
-async fn test_remap(cx: &mut gpui::TestAppContext) {
-    let mut cx = VimTestContext::new(cx, true).await;
-
-    // test moving the cursor
-    cx.update(|_, cx| {
-        cx.bind_keys([KeyBinding::new(
-            "g z",
-            workspace::SendKeystrokes("l l l l".to_string()),
-            None,
-        )])
-    });
-    cx.set_state("ˇ123456789", Mode::Normal);
-    cx.simulate_keystrokes("g z");
-    cx.assert_state("1234ˇ56789", Mode::Normal);
-
-    // test switching modes
-    cx.update(|_, cx| {
-        cx.bind_keys([KeyBinding::new(
-            "g y",
-            workspace::SendKeystrokes("i f o o escape l".to_string()),
-            None,
-        )])
-    });
-    cx.set_state("ˇ123456789", Mode::Normal);
-    cx.simulate_keystrokes("g y");
-    cx.assert_state("fooˇ123456789", Mode::Normal);
-
-    // test recursion
-    cx.update(|_, cx| {
-        cx.bind_keys([KeyBinding::new(
-            "g x",
-            workspace::SendKeystrokes("g z g y".to_string()),
-            None,
-        )])
-    });
-    cx.set_state("ˇ123456789", Mode::Normal);
-    cx.simulate_keystrokes("g x");
-    cx.assert_state("1234fooˇ56789", Mode::Normal);
-
-    // test command
-    cx.update(|_, cx| {
-        cx.bind_keys([KeyBinding::new(
-            "g w",
-            workspace::SendKeystrokes(": j enter".to_string()),
-            None,
-        )])
-    });
-    cx.set_state("ˇ1234\n56789", Mode::Normal);
-    cx.simulate_keystrokes("g w");
-    cx.assert_state("1234ˇ 56789", Mode::Normal);
-
-    // test leaving command
-    cx.update(|_, cx| {
-        cx.bind_keys([KeyBinding::new(
-            "g u",
-            workspace::SendKeystrokes("g w g z".to_string()),
-            None,
-        )])
-    });
-    cx.set_state("ˇ1234\n56789", Mode::Normal);
-    cx.simulate_keystrokes("g u");
-    cx.assert_state("1234 567ˇ89", Mode::Normal);
-
-    // test leaving command
-    cx.update(|_, cx| {
-        cx.bind_keys([KeyBinding::new(
-            "g t",
-            workspace::SendKeystrokes("i space escape".to_string()),
-            None,
-        )])
-    });
-    cx.set_state("12ˇ34", Mode::Normal);
-    cx.simulate_keystrokes("g t");
-    cx.assert_state("12ˇ 34", Mode::Normal);
-}
-
-#[perf]
-#[gpui::test]
-async fn test_undo(cx: &mut gpui::TestAppContext) {
-    let mut cx = NeovimBackedTestContext::new(cx).await;
-
-    cx.set_shared_state("hello quˇoel world").await;
-    cx.simulate_shared_keystrokes("v i w s c o escape u").await;
-    cx.shared_state().await.assert_eq("hello ˇquoel world");
-    cx.simulate_shared_keystrokes("ctrl-r").await;
-    cx.shared_state().await.assert_eq("hello ˇco world");
-    cx.simulate_shared_keystrokes("a o right l escape").await;
-    cx.shared_state().await.assert_eq("hello cooˇl world");
-    cx.simulate_shared_keystrokes("u").await;
-    cx.shared_state().await.assert_eq("hello cooˇ world");
-    cx.simulate_shared_keystrokes("u").await;
-    cx.shared_state().await.assert_eq("hello cˇo world");
-    cx.simulate_shared_keystrokes("u").await;
-    cx.shared_state().await.assert_eq("hello ˇquoel world");
-
-    cx.set_shared_state("hello quˇoel world").await;
-    cx.simulate_shared_keystrokes("v i w ~ u").await;
-    cx.shared_state().await.assert_eq("hello ˇquoel world");
-
-    cx.set_shared_state("\nhello quˇoel world\n").await;
-    cx.simulate_shared_keystrokes("shift-v s c escape u").await;
-    cx.shared_state().await.assert_eq("\nˇhello quoel world\n");
-
-    cx.set_shared_state(indoc! {"
-        ˇ1
-        2
-        3"})
-        .await;
-
-    cx.simulate_shared_keystrokes("ctrl-v shift-g ctrl-a").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-        ˇ2
-        3
-        4"});
-
-    cx.simulate_shared_keystrokes("u").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-        ˇ1
-        2
-        3"});
-}
-
-#[perf]
-#[gpui::test]
-async fn test_mouse_selection(cx: &mut TestAppContext) {
-    let mut cx = VimTestContext::new(cx, true).await;
-
-    cx.set_state("ˇone two three", Mode::Normal);
-
-    let start_point = cx.pixel_position("one twˇo three");
-    let end_point = cx.pixel_position("one ˇtwo three");
-
-    cx.simulate_mouse_down(start_point, MouseButton::Left, Modifiers::none());
-    cx.simulate_mouse_move(end_point, MouseButton::Left, Modifiers::none());
-    cx.simulate_mouse_up(end_point, MouseButton::Left, Modifiers::none());
-
-    cx.assert_state("one «ˇtwo» three", Mode::Visual)
-}
-
-#[perf]
-#[gpui::test]
-async fn test_lowercase_marks(cx: &mut TestAppContext) {
-    let mut cx = NeovimBackedTestContext::new(cx).await;
-
-    cx.set_shared_state("line one\nline ˇtwo\nline three").await;
-    cx.simulate_shared_keystrokes("m a l ' a").await;
-    cx.shared_state()
-        .await
-        .assert_eq("line one\nˇline two\nline three");
-    cx.simulate_shared_keystrokes("` a").await;
-    cx.shared_state()
-        .await
-        .assert_eq("line one\nline ˇtwo\nline three");
-
-    cx.simulate_shared_keystrokes("^ d ` a").await;
-    cx.shared_state()
-        .await
-        .assert_eq("line one\nˇtwo\nline three");
-}
-
-#[perf]
-#[gpui::test]
-async fn test_lt_gt_marks(cx: &mut TestAppContext) {
-    let mut cx = NeovimBackedTestContext::new(cx).await;
-
-    cx.set_shared_state(indoc!(
-        "
-        Line one
-        Line two
-        Line ˇthree
-        Line four
-        Line five
-    "
-    ))
-    .await;
-
-    cx.simulate_shared_keystrokes("v j escape k k").await;
-
-    cx.simulate_shared_keystrokes("' <").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-        Line one
-        Line two
-        ˇLine three
-        Line four
-        Line five
-    "});
-
-    cx.simulate_shared_keystrokes("` <").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-        Line one
-        Line two
-        Line ˇthree
-        Line four
-        Line five
-    "});
-
-    cx.simulate_shared_keystrokes("' >").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-        Line one
-        Line two
-        Line three
-        ˇLine four
-        Line five
-    "
-    });
-
-    cx.simulate_shared_keystrokes("` >").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-        Line one
-        Line two
-        Line three
-        Line ˇfour
-        Line five
-    "
-    });
-
-    cx.simulate_shared_keystrokes("v i w o escape").await;
-    cx.simulate_shared_keystrokes("` >").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-        Line one
-        Line two
-        Line three
-        Line fouˇr
-        Line five
-    "
-    });
-    cx.simulate_shared_keystrokes("` <").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-        Line one
-        Line two
-        Line three
-        Line ˇfour
-        Line five
-    "
-    });
-}
-
-#[perf]
-#[gpui::test]
-async fn test_caret_mark(cx: &mut TestAppContext) {
-    let mut cx = NeovimBackedTestContext::new(cx).await;
-
-    cx.set_shared_state(indoc!(
-        "
-        Line one
-        Line two
-        Line three
-        ˇLine four
-        Line five
-    "
-    ))
-    .await;
-
-    cx.simulate_shared_keystrokes("c w shift-s t r a i g h t space t h i n g escape j j")
-        .await;
-
-    cx.simulate_shared_keystrokes("' ^").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-        Line one
-        Line two
-        Line three
-        ˇStraight thing four
-        Line five
-    "
-    });
-
-    cx.simulate_shared_keystrokes("` ^").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-        Line one
-        Line two
-        Line three
-        Straight thingˇ four
-        Line five
-    "
-    });
-
-    cx.simulate_shared_keystrokes("k a ! escape k g i ?").await;
-    cx.shared_state().await.assert_eq(indoc! {"
-        Line one
-        Line two
-        Line three!?ˇ
-        Straight thing four
-        Line five
-    "
-    });
-}
-
-#[cfg(target_os = "macos")]
-#[perf]
-#[gpui::test]
-async fn test_dw_eol(cx: &mut gpui::TestAppContext) {
-    let mut cx = NeovimBackedTestContext::new(cx).await;
-
-    cx.set_shared_wrap(12).await;
-    cx.set_shared_state("twelve ˇchar twelve char\ntwelve char")
-        .await;
-    cx.simulate_shared_keystrokes("d w").await;
-    cx.shared_state()
-        .await
-        .assert_eq("twelve ˇtwelve char\ntwelve char");
-}
-
-#[perf]
-#[gpui::test]
-async fn test_toggle_comments(cx: &mut gpui::TestAppContext) {
-    let mut cx = VimTestContext::new(cx, true).await;
-
-    let language = std::sync::Arc::new(language::Language::new(
-        language::LanguageConfig {
-            line_comments: vec!["// ".into(), "//! ".into(), "/// ".into()],
-            ..Default::default()
-        },
-        Some(language::tree_sitter_rust::LANGUAGE.into()),
-    ));
-    cx.update_buffer(|buffer, cx| buffer.set_language(Some(language), cx));
-
-    // works in normal model
-    cx.set_state(
-        indoc! {"
-      ˇone
-      two
-      three
-      "},
-        Mode::Normal,
-    );
-    cx.simulate_keystrokes("g c c");
-    cx.assert_state(
-        indoc! {"
-          // ˇone
-          two
-          three
-          "},
-        Mode::Normal,
-    );
-
-    // works in visual mode
-    cx.simulate_keystrokes("v j g c");
-    cx.assert_state(
-        indoc! {"
-          // // ˇone
-          // two
-          three
-          "},
-        Mode::Normal,
-    );
-
-    // works in visual line mode
-    cx.simulate_keystrokes("shift-v j g c");
-    cx.assert_state(
-        indoc! {"
-          // ˇone
-          two
-          three
-          "},
-        Mode::Normal,
-    );
-
-    // works with count
-    cx.simulate_keystrokes("g c 2 j");
-    cx.assert_state(
-        indoc! {"
-            // // ˇone
-            // two
-            // three
-            "},
-        Mode::Normal,
-    );
-
-    // works with motion object
-    cx.simulate_keystrokes("shift-g");
-    cx.simulate_keystrokes("g c g g");
-    cx.assert_state(
-        indoc! {"
-            // one
-            two
-            three
-            ˇ"},
-        Mode::Normal,
-    );
-}
-
-#[perf]
-#[gpui::test]
-async fn test_find_multibyte(cx: &mut gpui::TestAppContext) {
-    let mut cx = NeovimBackedTestContext::new(cx).await;
-
-    cx.set_shared_state(r#"<label for="guests">ˇPočet hostů</label>"#)
-        .await;
-
-    cx.simulate_shared_keystrokes("c t < o escape").await;
-    cx.shared_state()
-        .await
-        .assert_eq(r#"<label for="guests">ˇo</label>"#);
-}
-
-#[perf]
-#[gpui::test]
-async fn test_sneak(cx: &mut gpui::TestAppContext) {
-    let mut cx = VimTestContext::new(cx, true).await;
-
-    cx.update(|_window, cx| {
-        cx.bind_keys([
-            KeyBinding::new(
-                "s",
-                PushSneak { first_char: None },
-                Some("vim_mode == normal"),
-            ),
-            KeyBinding::new(
-                "shift-s",
-                PushSneakBackward { first_char: None },
-                Some("vim_mode == normal"),
-            ),
-            KeyBinding::new(
-                "shift-s",
-                PushSneakBackward { first_char: None },
-                Some("vim_mode == visual"),
-            ),
-        ])
-    });
-
-    // Sneak forwards multibyte & multiline
-    cx.set_state(
-        indoc! {
-            r#"<labelˇ for="guests">
-                    Počet hostů
-                </label>"#
-        },
-        Mode::Normal,
-    );
-    cx.simulate_keystrokes("s t ů");
-    cx.assert_state(
-        indoc! {
-            r#"<label for="guests">
-                Počet hosˇtů
-            </label>"#
-        },
-        Mode::Normal,
-    );
-
-    // Visual sneak backwards multibyte & multiline
-    cx.simulate_keystrokes("v S < l");
-    cx.assert_state(
-        indoc! {
-            r#"«ˇ<label for="guests">
-                Počet host»ů
-            </label>"#
-        },
-        Mode::Visual,
-    );
-
-    // Sneak backwards repeated
-    cx.set_state(r#"11 12 13 ˇ14"#, Mode::Normal);
-    cx.simulate_keystrokes("S space 1");
-    cx.assert_state(r#"11 12ˇ 13 14"#, Mode::Normal);
-    cx.simulate_keystrokes(";");
-    cx.assert_state(r#"11ˇ 12 13 14"#, Mode::Normal);
-}
-
-#[perf]
-#[gpui::test]
-async fn test_plus_minus(cx: &mut gpui::TestAppContext) {
-    let mut cx = NeovimBackedTestContext::new(cx).await;
-
-    cx.set_shared_state(indoc! {
-        "one
-           two
-        thrˇee
-    "})
-        .await;
-
-    cx.simulate_shared_keystrokes("-").await;
-    cx.shared_state().await.assert_matches();
-    cx.simulate_shared_keystrokes("-").await;
-    cx.shared_state().await.assert_matches();
-    cx.simulate_shared_keystrokes("+").await;
-    cx.shared_state().await.assert_matches();
-}
-
-#[perf]
-#[gpui::test]
-async fn test_command_alias(cx: &mut gpui::TestAppContext) {
-    let mut cx = VimTestContext::new(cx, true).await;
-    cx.update_global(|store: &mut SettingsStore, cx| {
-        store.update_user_settings(cx, |s| {
-            let mut aliases = HashMap::default();
-            aliases.insert("Q".to_string(), "upper".to_string());
-            s.workspace.command_aliases = aliases
-        });
-    });
-
-    cx.set_state("ˇhello world", Mode::Normal);
-    cx.simulate_keystrokes(": Q");
-    cx.set_state("ˇHello world", Mode::Normal);
-}
-
-#[perf]
-#[gpui::test]
-async fn test_remap_adjacent_dog_cat(cx: &mut gpui::TestAppContext) {
-    let mut cx = NeovimBackedTestContext::new(cx).await;
-    cx.update(|_, cx| {
-        cx.bind_keys([
-            KeyBinding::new(
-                "d o g",
-                workspace::SendKeystrokes("🐶".to_string()),
-                Some("vim_mode == insert"),
-            ),
-            KeyBinding::new(
-                "c a t",
-                workspace::SendKeystrokes("🐱".to_string()),
-                Some("vim_mode == insert"),
-            ),
-        ])
-    });
-    cx.neovim.exec("imap dog 🐶").await;
-    cx.neovim.exec("imap cat 🐱").await;
-
-    cx.set_shared_state("ˇ").await;
-    cx.simulate_shared_keystrokes("i d o g").await;
-    cx.shared_state().await.assert_eq("🐶ˇ");
-
-    cx.set_shared_state("ˇ").await;
-    cx.simulate_shared_keystrokes("i d o d o g").await;
-    cx.shared_state().await.assert_eq("do🐶ˇ");
-
-    cx.set_shared_state("ˇ").await;
-    cx.simulate_shared_keystrokes("i d o c a t").await;
-    cx.shared_state().await.assert_eq("do🐱ˇ");
-}
-
-#[perf]
-#[gpui::test]
-async fn test_remap_nested_pineapple(cx: &mut gpui::TestAppContext) {
-    let mut cx = NeovimBackedTestContext::new(cx).await;
-    cx.update(|_, cx| {
-        cx.bind_keys([
-            KeyBinding::new(
-                "p i n",
-                workspace::SendKeystrokes("📌".to_string()),
-                Some("vim_mode == insert"),
-            ),
-            KeyBinding::new(
-                "p i n e",
-                workspace::SendKeystrokes("🌲".to_string()),
-                Some("vim_mode == insert"),
-            ),
-            KeyBinding::new(
-                "p i n e a p p l e",
-                workspace::SendKeystrokes("🍍".to_string()),
-                Some("vim_mode == insert"),
-            ),
-        ])
-    });
-    cx.neovim.exec("imap pin 📌").await;
-    cx.neovim.exec("imap pine 🌲").await;
-    cx.neovim.exec("imap pineapple 🍍").await;
-
-    cx.set_shared_state("ˇ").await;
-    cx.simulate_shared_keystrokes("i p i n").await;
-    cx.executor().advance_clock(Duration::from_millis(1000));
-    cx.run_until_parked();
-    cx.shared_state().await.assert_eq("📌ˇ");
-
-    cx.set_shared_state("ˇ").await;
-    cx.simulate_shared_keystrokes("i p i n e").await;
-    cx.executor().advance_clock(Duration::from_millis(1000));
-    cx.run_until_parked();
-    cx.shared_state().await.assert_eq("🌲ˇ");
-
-    cx.set_shared_state("ˇ").await;
-    cx.simulate_shared_keystrokes("i p i n e a p p l e").await;
-    cx.shared_state().await.assert_eq("🍍ˇ");
-}
-
-#[perf]
-#[gpui::test]
-async fn test_remap_recursion(cx: &mut gpui::TestAppContext) {
-    let mut cx = NeovimBackedTestContext::new(cx).await;
-    cx.update(|_, cx| {
-        cx.bind_keys([KeyBinding::new(
-            "x",
-            workspace::SendKeystrokes("\" _ x".to_string()),
-            Some("VimControl"),
-        )]);
-        cx.bind_keys([KeyBinding::new(
-            "y",
-            workspace::SendKeystrokes("2 x".to_string()),
-            Some("VimControl"),
-        )])
-    });
-    cx.neovim.exec("noremap x \"_x").await;
-    cx.neovim.exec("map y 2x").await;
-
-    cx.set_shared_state("ˇhello").await;
-    cx.simulate_shared_keystrokes("d l").await;
-    cx.shared_clipboard().await.assert_eq("h");
-    cx.simulate_shared_keystrokes("y").await;
-    cx.shared_clipboard().await.assert_eq("h");
-    cx.shared_state().await.assert_eq("ˇlo");
-}
-
-#[perf]
-#[gpui::test]
-async fn test_escape_while_waiting(cx: &mut gpui::TestAppContext) {
-    let mut cx = NeovimBackedTestContext::new(cx).await;
-    cx.set_shared_state("ˇhi").await;
-    cx.simulate_shared_keystrokes("\" + escape x").await;
-    cx.shared_state().await.assert_eq("ˇi");
-}
-
-#[perf]
-#[gpui::test]
-async fn test_ctrl_w_override(cx: &mut gpui::TestAppContext) {
-    let mut cx = NeovimBackedTestContext::new(cx).await;
-    cx.update(|_, cx| {
-        cx.bind_keys([KeyBinding::new("ctrl-w", DeleteLine, None)]);
-    });
-    cx.neovim.exec("map <c-w> D").await;
-    cx.set_shared_state("ˇhi").await;
-    cx.simulate_shared_keystrokes("ctrl-w").await;
-    cx.shared_state().await.assert_eq("ˇ");
-}
-
-#[perf]
-#[gpui::test]
-async fn test_visual_indent_count(cx: &mut gpui::TestAppContext) {
-    let mut cx = VimTestContext::new(cx, true).await;
-    cx.set_state("ˇhi", Mode::Normal);
-    cx.simulate_keystrokes("shift-v 3 >");
-    cx.assert_state("            ˇhi", Mode::Normal);
-    cx.simulate_keystrokes("shift-v 2 <");
-    cx.assert_state("    ˇhi", Mode::Normal);
-}
-
-#[perf]
-#[gpui::test]
-async fn test_record_replay_recursion(cx: &mut gpui::TestAppContext) {
-    let mut cx = NeovimBackedTestContext::new(cx).await;
-
-    cx.set_shared_state("ˇhello world").await;
-    cx.simulate_shared_keystrokes(">").await;
-    cx.simulate_shared_keystrokes(".").await;
-    cx.simulate_shared_keystrokes(".").await;
-    cx.simulate_shared_keystrokes(".").await;
-    cx.shared_state().await.assert_eq("ˇhello world");
-}
-
-#[perf]
-#[gpui::test]
-async fn test_blackhole_register(cx: &mut gpui::TestAppContext) {
-    let mut cx = NeovimBackedTestContext::new(cx).await;
-
-    cx.set_shared_state("ˇhello world").await;
-    cx.simulate_shared_keystrokes("d i w \" _ d a w").await;
-    cx.simulate_shared_keystrokes("p").await;
-    cx.shared_state().await.assert_eq("hellˇo");
-}
-
-#[perf]
-#[gpui::test]
-async fn test_sentence_backwards(cx: &mut gpui::TestAppContext) {
-    let mut cx = NeovimBackedTestContext::new(cx).await;
-
-    cx.set_shared_state("one\n\ntwo\nthree\nˇ\nfour").await;
-    cx.simulate_shared_keystrokes("(").await;
-    cx.shared_state()
-        .await
-        .assert_eq("one\n\nˇtwo\nthree\n\nfour");
-
-    cx.set_shared_state("hello.\n\n\nworˇld.").await;
-    cx.simulate_shared_keystrokes("(").await;
-    cx.shared_state().await.assert_eq("hello.\n\n\nˇworld.");
-    cx.simulate_shared_keystrokes("(").await;
-    cx.shared_state().await.assert_eq("hello.\n\nˇ\nworld.");
-    cx.simulate_shared_keystrokes("(").await;
-    cx.shared_state().await.assert_eq("ˇhello.\n\n\nworld.");
-
-    cx.set_shared_state("hello. worlˇd.").await;
-    cx.simulate_shared_keystrokes("(").await;
-    cx.shared_state().await.assert_eq("hello. ˇworld.");
-    cx.simulate_shared_keystrokes("(").await;
-    cx.shared_state().await.assert_eq("ˇhello. world.");
-
-    cx.set_shared_state(". helˇlo.").await;
-    cx.simulate_shared_keystrokes("(").await;
-    cx.shared_state().await.assert_eq(". ˇhello.");
-    cx.simulate_shared_keystrokes("(").await;
-    cx.shared_state().await.assert_eq(". ˇhello.");
-
-    cx.set_shared_state(indoc! {
-        "{
-            hello_world();
-        ˇ}"
-    })
-    .await;
-    cx.simulate_shared_keystrokes("(").await;
-    cx.shared_state().await.assert_eq(indoc! {
-        "ˇ{
-            hello_world();
-        }"
-    });
-
-    cx.set_shared_state(indoc! {
-        "Hello! World..?
-
-        \tHello! World... ˇ"
-    })
-    .await;
-    cx.simulate_shared_keystrokes("(").await;
-    cx.shared_state().await.assert_eq(indoc! {
-        "Hello! World..?
-
-        \tHello! ˇWorld... "
-    });
-    cx.simulate_shared_keystrokes("(").await;
-    cx.shared_state().await.assert_eq(indoc! {
-        "Hello! World..?
-
-        \tˇHello! World... "
-    });
-    cx.simulate_shared_keystrokes("(").await;
-    cx.shared_state().await.assert_eq(indoc! {
-        "Hello! World..?
-        ˇ
-        \tHello! World... "
-    });
-    cx.simulate_shared_keystrokes("(").await;
-    cx.shared_state().await.assert_eq(indoc! {
-        "Hello! ˇWorld..?
-
-        \tHello! World... "
-    });
-}
-
-#[perf]
-#[gpui::test]
-async fn test_sentence_forwards(cx: &mut gpui::TestAppContext) {
-    let mut cx = NeovimBackedTestContext::new(cx).await;
-
-    cx.set_shared_state("helˇlo.\n\n\nworld.").await;
-    cx.simulate_shared_keystrokes(")").await;
-    cx.shared_state().await.assert_eq("hello.\nˇ\n\nworld.");
-    cx.simulate_shared_keystrokes(")").await;
-    cx.shared_state().await.assert_eq("hello.\n\n\nˇworld.");
-    cx.simulate_shared_keystrokes(")").await;
-    cx.shared_state().await.assert_eq("hello.\n\n\nworldˇ.");
-
-    cx.set_shared_state("helˇlo.\n\n\nworld.").await;
-}
-
-#[perf]
-#[gpui::test]
-async fn test_ctrl_o_visual(cx: &mut gpui::TestAppContext) {
-    let mut cx = NeovimBackedTestContext::new(cx).await;
-
-    cx.set_shared_state("helloˇ world.").await;
-    cx.simulate_shared_keystrokes("i ctrl-o v b r l").await;
-    cx.shared_state().await.assert_eq("ˇllllllworld.");
-    cx.simulate_shared_keystrokes("ctrl-o v f w d").await;
-    cx.shared_state().await.assert_eq("ˇorld.");
-}
-
-#[perf]
-#[gpui::test]
-async fn test_ctrl_o_position(cx: &mut gpui::TestAppContext) {
-    let mut cx = NeovimBackedTestContext::new(cx).await;
-
-    cx.set_shared_state("helˇlo world.").await;
-    cx.simulate_shared_keystrokes("i ctrl-o d i w").await;
-    cx.shared_state().await.assert_eq("ˇ world.");
-    cx.simulate_shared_keystrokes("ctrl-o p").await;
-    cx.shared_state().await.assert_eq(" helloˇworld.");
-}
-
-#[perf]
-#[gpui::test]
-async fn test_ctrl_o_dot(cx: &mut gpui::TestAppContext) {
-    let mut cx = NeovimBackedTestContext::new(cx).await;
-
-    cx.set_shared_state("heˇllo world.").await;
-    cx.simulate_shared_keystrokes("x i ctrl-o .").await;
-    cx.shared_state().await.assert_eq("heˇo world.");
-    cx.simulate_shared_keystrokes("l l escape .").await;
-    cx.shared_state().await.assert_eq("hellˇllo world.");
-}
-
-#[perf(iterations = 1)]
-#[gpui::test]
-async fn test_folded_multibuffer_excerpts(cx: &mut gpui::TestAppContext) {
-    VimTestContext::init(cx);
-    cx.update(|cx| {
-        VimTestContext::init_keybindings(true, cx);
-    });
-    let (editor, cx) = cx.add_window_view(|window, cx| {
-        let multi_buffer = MultiBuffer::build_multi(
-            [
-                ("111\n222\n333\n444\n", vec![Point::row_range(0..2)]),
-                ("aaa\nbbb\nccc\nddd\n", vec![Point::row_range(0..2)]),
-                ("AAA\nBBB\nCCC\nDDD\n", vec![Point::row_range(0..2)]),
-                ("one\ntwo\nthr\nfou\n", vec![Point::row_range(0..2)]),
-            ],
-            cx,
-        );
-        let mut editor = Editor::new(EditorMode::full(), multi_buffer.clone(), None, window, cx);
-
-        let buffer_ids = multi_buffer.read(cx).excerpt_buffer_ids();
-        // fold all but the second buffer, so that we test navigating between two
-        // adjacent folded buffers, as well as folded buffers at the start and
-        // end the multibuffer
-        editor.fold_buffer(buffer_ids[0], cx);
-        editor.fold_buffer(buffer_ids[2], cx);
-        editor.fold_buffer(buffer_ids[3], cx);
-
-        editor
-    });
-    let mut cx = EditorTestContext::for_editor_in(editor.clone(), cx).await;
-
-    cx.assert_excerpts_with_selections(indoc! {"
-        [EXCERPT]
-        ˇ[FOLDED]
-        [EXCERPT]
-        aaa
-        bbb
-        [EXCERPT]
-        [FOLDED]
-        [EXCERPT]
-        [FOLDED]
-        "
-    });
-    cx.simulate_keystroke("j");
-    cx.assert_excerpts_with_selections(indoc! {"
-        [EXCERPT]
-        [FOLDED]
-        [EXCERPT]
-        ˇaaa
-        bbb
-        [EXCERPT]
-        [FOLDED]
-        [EXCERPT]
-        [FOLDED]
-        "
-    });
-    cx.simulate_keystroke("j");
-    cx.simulate_keystroke("j");
-    cx.assert_excerpts_with_selections(indoc! {"
-        [EXCERPT]
-        [FOLDED]
-        [EXCERPT]
-        aaa
-        bbb
-        ˇ[EXCERPT]
-        [FOLDED]
-        [EXCERPT]
-        [FOLDED]
-        "
-    });
-    cx.simulate_keystroke("j");
-    cx.assert_excerpts_with_selections(indoc! {"
-        [EXCERPT]
-        [FOLDED]
-        [EXCERPT]
-        aaa
-        bbb
-        [EXCERPT]
-        ˇ[FOLDED]
-        [EXCERPT]
-        [FOLDED]
-        "
-    });
-    cx.simulate_keystroke("j");
-    cx.assert_excerpts_with_selections(indoc! {"
-        [EXCERPT]
-        [FOLDED]
-        [EXCERPT]
-        aaa
-        bbb
-        [EXCERPT]
-        [FOLDED]
-        [EXCERPT]
-        ˇ[FOLDED]
-        "
-    });
-    cx.simulate_keystroke("k");
-    cx.assert_excerpts_with_selections(indoc! {"
-        [EXCERPT]
-        [FOLDED]
-        [EXCERPT]
-        aaa
-        bbb
-        [EXCERPT]
-        ˇ[FOLDED]
-        [EXCERPT]
-        [FOLDED]
-        "
-    });
-    cx.simulate_keystroke("k");
-    cx.simulate_keystroke("k");
-    cx.simulate_keystroke("k");
-    cx.assert_excerpts_with_selections(indoc! {"
-        [EXCERPT]
-        [FOLDED]
-        [EXCERPT]
-        ˇaaa
-        bbb
-        [EXCERPT]
-        [FOLDED]
-        [EXCERPT]
-        [FOLDED]
-        "
-    });
-    cx.simulate_keystroke("k");
-    cx.assert_excerpts_with_selections(indoc! {"
-        [EXCERPT]
-        ˇ[FOLDED]
-        [EXCERPT]
-        aaa
-        bbb
-        [EXCERPT]
-        [FOLDED]
-        [EXCERPT]
-        [FOLDED]
-        "
-    });
-    cx.simulate_keystroke("shift-g");
-    cx.assert_excerpts_with_selections(indoc! {"
-        [EXCERPT]
-        [FOLDED]
-        [EXCERPT]
-        aaa
-        bbb
-        [EXCERPT]
-        [FOLDED]
-        [EXCERPT]
-        ˇ[FOLDED]
-        "
-    });
-    cx.simulate_keystrokes("g g");
-    cx.assert_excerpts_with_selections(indoc! {"
-        [EXCERPT]
-        ˇ[FOLDED]
-        [EXCERPT]
-        aaa
-        bbb
-        [EXCERPT]
-        [FOLDED]
-        [EXCERPT]
-        [FOLDED]
-        "
-    });
-    cx.update_editor(|editor, _, cx| {
-        let buffer_ids = editor.buffer().read(cx).excerpt_buffer_ids();
-        editor.fold_buffer(buffer_ids[1], cx);
-    });
-
-    cx.assert_excerpts_with_selections(indoc! {"
-        [EXCERPT]
-        ˇ[FOLDED]
-        [EXCERPT]
-        [FOLDED]
-        [EXCERPT]
-        [FOLDED]
-        [EXCERPT]
-        [FOLDED]
-        "
-    });
-    cx.simulate_keystrokes("2 j");
-    cx.assert_excerpts_with_selections(indoc! {"
-        [EXCERPT]
-        [FOLDED]
-        [EXCERPT]
-        [FOLDED]
-        [EXCERPT]
-        ˇ[FOLDED]
-        [EXCERPT]
-        [FOLDED]
-        "
-    });
-}
-
-#[perf]
-#[gpui::test]
-async fn test_delete_paragraph_motion(cx: &mut gpui::TestAppContext) {
-    let mut cx = NeovimBackedTestContext::new(cx).await;
-    cx.set_shared_state(indoc! {
-        "ˇhello world.
-
-        hello world.
-        "
-    })
-    .await;
-    cx.simulate_shared_keystrokes("y }").await;
-    cx.shared_clipboard().await.assert_eq("hello world.\n");
-    cx.simulate_shared_keystrokes("d }").await;
-    cx.shared_state().await.assert_eq("ˇ\nhello world.\n");
-    cx.shared_clipboard().await.assert_eq("hello world.\n");
-
-    cx.set_shared_state(indoc! {
-        "helˇlo world.
-
-            hello world.
-            "
-    })
-    .await;
-    cx.simulate_shared_keystrokes("y }").await;
-    cx.shared_clipboard().await.assert_eq("lo world.");
-    cx.simulate_shared_keystrokes("d }").await;
-    cx.shared_state().await.assert_eq("heˇl\n\nhello world.\n");
-    cx.shared_clipboard().await.assert_eq("lo world.");
-}
-
-#[perf]
-#[gpui::test]
-async fn test_delete_unmatched_brace(cx: &mut gpui::TestAppContext) {
-    let mut cx = NeovimBackedTestContext::new(cx).await;
-    cx.set_shared_state(indoc! {
-        "fn o(wow: i32) {
-          othˇ(wow)
-          oth(wow)
-        }
-        "
-    })
-    .await;
-    cx.simulate_shared_keystrokes("d ] }").await;
-    cx.shared_state().await.assert_eq(indoc! {
-        "fn o(wow: i32) {
-          otˇh
-        }
-        "
-    });
-    cx.shared_clipboard().await.assert_eq("(wow)\n  oth(wow)");
-    cx.set_shared_state(indoc! {
-        "fn o(wow: i32) {
-          ˇoth(wow)
-          oth(wow)
-        }
-        "
-    })
-    .await;
-    cx.simulate_shared_keystrokes("d ] }").await;
-    cx.shared_state().await.assert_eq(indoc! {
-        "fn o(wow: i32) {
-         ˇ}
-        "
-    });
-    cx.shared_clipboard()
-        .await
-        .assert_eq("  oth(wow)\n  oth(wow)\n");
-}
-
-#[perf]
-#[gpui::test]
-async fn test_paragraph_multi_delete(cx: &mut gpui::TestAppContext) {
-    let mut cx = NeovimBackedTestContext::new(cx).await;
-    cx.set_shared_state(indoc! {
-        "
-        Emacs is
-        ˇa great
-
-        operating system
-
-        all it lacks
-        is a
-
-        decent text editor
-        "
-    })
-    .await;
-
-    cx.simulate_shared_keystrokes("2 d a p").await;
-    cx.shared_state().await.assert_eq(indoc! {
-        "
-        ˇall it lacks
-        is a
-
-        decent text editor
-        "
-    });
-
-    cx.simulate_shared_keystrokes("d a p").await;
-    cx.shared_clipboard()
-        .await
-        .assert_eq("all it lacks\nis a\n\n");
-
-    //reset to initial state
-    cx.simulate_shared_keystrokes("2 u").await;
-
-    cx.simulate_shared_keystrokes("4 d a p").await;
-    cx.shared_state().await.assert_eq(indoc! {"ˇ"});
-}
-
-#[perf]
-#[gpui::test]
-async fn test_yank_paragraph_with_paste(cx: &mut gpui::TestAppContext) {
-    let mut cx = NeovimBackedTestContext::new(cx).await;
-    cx.set_shared_state(indoc! {
-        "
-        first paragraph
-        ˇstill first
-
-        second paragraph
-        still second
-
-        third paragraph
-        "
-    })
-    .await;
-
-    cx.simulate_shared_keystrokes("y a p").await;
-    cx.shared_clipboard()
-        .await
-        .assert_eq("first paragraph\nstill first\n\n");
-
-    cx.simulate_shared_keystrokes("j j p").await;
-    cx.shared_state().await.assert_eq(indoc! {
-        "
-        first paragraph
-        still first
-
-        ˇfirst paragraph
-        still first
-
-        second paragraph
-        still second
-
-        third paragraph
-        "
-    });
-}
-
-#[perf]
-#[gpui::test]
-async fn test_change_paragraph(cx: &mut gpui::TestAppContext) {
-    let mut cx = NeovimBackedTestContext::new(cx).await;
-    cx.set_shared_state(indoc! {
-        "
-        first paragraph
-        ˇstill first
-
-        second paragraph
-        still second
-
-        third paragraph
-        "
-    })
-    .await;
-
-    cx.simulate_shared_keystrokes("c a p").await;
-    cx.shared_clipboard()
-        .await
-        .assert_eq("first paragraph\nstill first\n\n");
-
-    cx.simulate_shared_keystrokes("escape").await;
-    cx.shared_state().await.assert_eq(indoc! {
-        "
-        ˇ
-        second paragraph
-        still second
-
-        third paragraph
-        "
-    });
-}
-
-#[perf]
-#[gpui::test]
-async fn test_multi_cursor_replay(cx: &mut gpui::TestAppContext) {
-    let mut cx = VimTestContext::new(cx, true).await;
-    cx.set_state(
-        indoc! {
-            "
-        oˇne one one
-
-        two two two
-        "
-        },
-        Mode::Normal,
-    );
-
-    cx.simulate_keystrokes("3 g l s wow escape escape");
-    cx.assert_state(
-        indoc! {
-            "
-        woˇw wow wow
-
-        two two two
-        "
-        },
-        Mode::Normal,
-    );
-
-    cx.simulate_keystrokes("2 j 3 g l .");
-    cx.assert_state(
-        indoc! {
-            "
-        wow wow wow
-
-        woˇw woˇw woˇw
-        "
-        },
-        Mode::Normal,
-    );
-}
-
-#[gpui::test]
-async fn test_clipping_on_mode_change(cx: &mut gpui::TestAppContext) {
-    let mut cx = VimTestContext::new(cx, true).await;
-
-    cx.set_state(
-        indoc! {
-        "
-        ˇverylongline
-        andsomelinebelow
-        "
-        },
-        Mode::Normal,
-    );
-
-    cx.simulate_keystrokes("v e");
-    cx.assert_state(
-        indoc! {
-        "
-        «verylonglineˇ»
-        andsomelinebelow
-        "
-        },
-        Mode::Visual,
-    );
-
-    let mut pixel_position = cx.update_editor(|editor, window, cx| {
-        let snapshot = editor.snapshot(window, cx);
-        let current_head = editor
-            .selections
-            .newest_display(&snapshot.display_snapshot)
-            .end;
-        editor.last_bounds().unwrap().origin
-            + editor
-                .display_to_pixel_point(current_head, &snapshot, window, cx)
-                .unwrap()
-    });
-    pixel_position.x += px(100.);
-    // click beyond end of the line
-    cx.simulate_click(pixel_position, Modifiers::default());
-    cx.run_until_parked();
-
-    cx.assert_state(
-        indoc! {
-        "
-        verylonglinˇe
-        andsomelinebelow
-        "
-        },
-        Mode::Normal,
-    );
-}
-
-#[gpui::test]
-async fn test_wrap_selections_in_tag_line_mode(cx: &mut gpui::TestAppContext) {
-    let mut cx = VimTestContext::new(cx, true).await;
-
-    let js_language = Arc::new(Language::new(
-        LanguageConfig {
-            name: "JavaScript".into(),
-            wrap_characters: Some(language::WrapCharactersConfig {
-                start_prefix: "<".into(),
-                start_suffix: ">".into(),
-                end_prefix: "</".into(),
-                end_suffix: ">".into(),
-            }),
-            ..LanguageConfig::default()
-        },
-        None,
-    ));
-
-    cx.update_buffer(|buffer, cx| buffer.set_language(Some(js_language), cx));
-
-    cx.set_state(
-        indoc! {
-        "
-        ˇaaaaa
-        bbbbb
-        "
-        },
-        Mode::Normal,
-    );
-
-    cx.simulate_keystrokes("shift-v j");
-    cx.dispatch_action(WrapSelectionsInTag);
-
-    cx.assert_state(
-        indoc! {
-            "
-            <ˇ>aaaaa
-            bbbbb</ˇ>
-            "
-        },
-        Mode::VisualLine,
-    );
-}
-
-#[gpui::test]
-async fn test_repeat_grouping_41735(cx: &mut gpui::TestAppContext) {
-    let mut cx = NeovimBackedTestContext::new(cx).await;
-
-    // typically transaction gropuing is disabled in tests, but here we need to test it.
-    cx.update_buffer(|buffer, _cx| buffer.set_group_interval(Duration::from_millis(300)));
-
-    cx.set_shared_state("ˇ").await;
-
-    cx.simulate_shared_keystrokes("i a escape").await;
-    cx.simulate_shared_keystrokes(". . .").await;
-    cx.shared_state().await.assert_eq("ˇaaaa");
-    cx.simulate_shared_keystrokes("u").await;
-    cx.shared_state().await.assert_eq("ˇaaa");
-}
-
-#[gpui::test]
-async fn test_deactivate(cx: &mut gpui::TestAppContext) {
-    let mut cx = VimTestContext::new(cx, true).await;
-
-    cx.update_global(|store: &mut SettingsStore, cx| {
-        store.update_user_settings(cx, |settings| {
-            settings.editor.cursor_shape = Some(settings::CursorShape::Underline);
-        });
-    });
-
-    // Assert that, while in `Normal` mode, the cursor shape is `Block` but,
-    // after deactivating vim mode, it should revert to the one specified in the
-    // user's settings, if set.
-    cx.update_editor(|editor, _window, _cx| {
-        assert_eq!(editor.cursor_shape(), CursorShape::Block);
-    });
-
-    cx.disable_vim();
-
-    cx.update_editor(|editor, _window, _cx| {
-        assert_eq!(editor.cursor_shape(), CursorShape::Underline);
-    });
-}
diff --git a/crates/vim/src/test/neovim_backed_test_context.rs b/crates/vim/src/test/neovim_backed_test_context.rs
deleted file mode 100644
index d20464ccc4..0000000000
--- a/crates/vim/src/test/neovim_backed_test_context.rs
+++ /dev/null
@@ -1,427 +0,0 @@
-use gpui::{AppContext as _, UpdateGlobal, px, size};
-use indoc::indoc;
-use settings::SettingsStore;
-use std::{
-    ops::{Deref, DerefMut},
-    panic, thread,
-};
-
-use language::language_settings::SoftWrap;
-use util::test::marked_text_offsets;
-
-use super::{VimTestContext, neovim_connection::NeovimConnection};
-use crate::state::{Mode, VimGlobals};
-
-pub struct NeovimBackedTestContext {
-    pub(crate) cx: VimTestContext,
-    pub(crate) neovim: NeovimConnection,
-
-    last_set_state: Option<String>,
-    recent_keystrokes: Vec<String>,
-}
-
-#[derive(Default)]
-pub struct SharedState {
-    neovim: String,
-    editor: String,
-    initial: String,
-    neovim_mode: Mode,
-    editor_mode: Mode,
-    recent_keystrokes: String,
-}
-
-impl SharedState {
-    /// Assert that both Zed and NeoVim have the same content and mode.
-    #[track_caller]
-    pub fn assert_matches(&self) {
-        if self.neovim != self.editor || self.neovim_mode != self.editor_mode {
-            panic!(
-                indoc! {"Test failed (zed does not match nvim behavior)
-                    # initial state:
-                    {}
-                    # keystrokes:
-                    {}
-                    # neovim ({}):
-                    {}
-                    # zed ({}):
-                    {}"},
-                self.initial,
-                self.recent_keystrokes,
-                self.neovim_mode,
-                self.neovim,
-                self.editor_mode,
-                self.editor,
-            )
-        }
-    }
-
-    #[track_caller]
-    pub fn assert_eq(&mut self, marked_text: &str) {
-        let marked_text = marked_text.replace('•', " ");
-        if self.neovim == marked_text
-            && self.neovim == self.editor
-            && self.neovim_mode == self.editor_mode
-        {
-            return;
-        }
-
-        let message = if self.neovim != marked_text {
-            "Test is incorrect (currently expected != neovim_state)"
-        } else {
-            "Editor does not match nvim behavior"
-        };
-        panic!(
-            indoc! {"{}
-                # initial state:
-                {}
-                # keystrokes:
-                {}
-                # currently expected:
-                {}
-                # neovim ({}):
-                {}
-                # zed ({}):
-                {}"},
-            message,
-            self.initial,
-            self.recent_keystrokes,
-            marked_text.replace(" \n", "•\n"),
-            self.neovim_mode,
-            self.neovim.replace(" \n", "•\n"),
-            self.editor_mode,
-            self.editor.replace(" \n", "•\n"),
-        )
-    }
-}
-
-pub struct SharedClipboard {
-    register: char,
-    neovim: String,
-    editor: String,
-    state: SharedState,
-}
-
-impl SharedClipboard {
-    #[track_caller]
-    pub fn assert_eq(&self, expected: &str) {
-        if expected == self.neovim && self.neovim == self.editor {
-            return;
-        }
-
-        let message = if expected != self.neovim {
-            "Test is incorrect (currently expected != neovim_state)"
-        } else {
-            "Editor does not match nvim behavior"
-        };
-
-        panic!(
-            indoc! {"{}
-                # initial state:
-                {}
-                # keystrokes:
-                {}
-                # currently expected: {:?}
-                # neovim register \"{}: {:?}
-                # zed register \"{}: {:?}"},
-            message,
-            self.state.initial,
-            self.state.recent_keystrokes,
-            expected,
-            self.register,
-            self.neovim,
-            self.register,
-            self.editor
-        )
-    }
-}
-
-impl NeovimBackedTestContext {
-    pub async fn new(cx: &mut gpui::TestAppContext) -> NeovimBackedTestContext {
-        #[cfg(feature = "neovim")]
-        cx.executor().allow_parking();
-        // rust stores the name of the test on the current thread.
-        // We use this to automatically name a file that will store
-        // the neovim connection's requests/responses so that we can
-        // run without neovim on CI.
-        let thread = thread::current();
-        let test_name = thread
-            .name()
-            .expect("thread is not named")
-            .split(':')
-            .next_back()
-            .unwrap()
-            .to_string();
-        Self {
-            cx: VimTestContext::new(cx, true).await,
-            neovim: NeovimConnection::new(test_name).await,
-
-            last_set_state: None,
-            recent_keystrokes: Default::default(),
-        }
-    }
-
-    pub async fn new_html(cx: &mut gpui::TestAppContext) -> NeovimBackedTestContext {
-        #[cfg(feature = "neovim")]
-        cx.executor().allow_parking();
-        // rust stores the name of the test on the current thread.
-        // We use this to automatically name a file that will store
-        // the neovim connection's requests/responses so that we can
-        // run without neovim on CI.
-        let thread = thread::current();
-        let test_name = thread
-            .name()
-            .expect("thread is not named")
-            .split(':')
-            .next_back()
-            .unwrap()
-            .to_string();
-        Self {
-            cx: VimTestContext::new_html(cx).await,
-            neovim: NeovimConnection::new(test_name).await,
-
-            last_set_state: None,
-            recent_keystrokes: Default::default(),
-        }
-    }
-
-    pub async fn new_markdown_with_rust(cx: &mut gpui::TestAppContext) -> NeovimBackedTestContext {
-        #[cfg(feature = "neovim")]
-        cx.executor().allow_parking();
-        let thread = thread::current();
-        let test_name = thread
-            .name()
-            .expect("thread is not named")
-            .split(':')
-            .next_back()
-            .unwrap()
-            .to_string();
-        Self {
-            cx: VimTestContext::new_markdown_with_rust(cx).await,
-            neovim: NeovimConnection::new(test_name).await,
-
-            last_set_state: None,
-            recent_keystrokes: Default::default(),
-        }
-    }
-
-    pub async fn new_typescript(cx: &mut gpui::TestAppContext) -> NeovimBackedTestContext {
-        #[cfg(feature = "neovim")]
-        cx.executor().allow_parking();
-        // rust stores the name of the test on the current thread.
-        // We use this to automatically name a file that will store
-        // the neovim connection's requests/responses so that we can
-        // run without neovim on CI.
-        let thread = thread::current();
-        let test_name = thread
-            .name()
-            .expect("thread is not named")
-            .split(':')
-            .next_back()
-            .unwrap()
-            .to_string();
-        Self {
-            cx: VimTestContext::new_typescript(cx).await,
-            neovim: NeovimConnection::new(test_name).await,
-
-            last_set_state: None,
-            recent_keystrokes: Default::default(),
-        }
-    }
-
-    pub async fn new_tsx(cx: &mut gpui::TestAppContext) -> NeovimBackedTestContext {
-        #[cfg(feature = "neovim")]
-        cx.executor().allow_parking();
-        let thread = thread::current();
-        let test_name = thread
-            .name()
-            .expect("thread is not named")
-            .split(':')
-            .next_back()
-            .unwrap()
-            .to_string();
-        Self {
-            cx: VimTestContext::new_tsx(cx).await,
-            neovim: NeovimConnection::new(test_name).await,
-
-            last_set_state: None,
-            recent_keystrokes: Default::default(),
-        }
-    }
-
-    pub async fn set_shared_state(&mut self, marked_text: &str) {
-        let mode = if marked_text.contains('»') {
-            Mode::Visual
-        } else {
-            Mode::Normal
-        };
-        self.set_state(marked_text, mode);
-        self.last_set_state = Some(marked_text.to_string());
-        self.recent_keystrokes = Vec::new();
-        self.neovim.set_state(marked_text).await;
-    }
-
-    pub async fn simulate_shared_keystrokes(&mut self, keystroke_texts: &str) {
-        for keystroke_text in keystroke_texts.split(' ') {
-            self.recent_keystrokes.push(keystroke_text.to_string());
-            self.neovim.send_keystroke(keystroke_text).await;
-        }
-        self.simulate_keystrokes(keystroke_texts);
-    }
-
-    #[must_use]
-    pub async fn simulate(&mut self, keystrokes: &str, initial_state: &str) -> SharedState {
-        self.set_shared_state(initial_state).await;
-        self.simulate_shared_keystrokes(keystrokes).await;
-        self.shared_state().await
-    }
-
-    pub async fn set_shared_wrap(&mut self, columns: u32) {
-        if columns < 12 {
-            panic!("nvim doesn't support columns < 12")
-        }
-        self.neovim.set_option("wrap").await;
-        self.neovim
-            .set_option(&format!("columns={}", columns))
-            .await;
-
-        self.update(|_, cx| {
-            SettingsStore::update_global(cx, |settings, cx| {
-                settings.update_user_settings(cx, |settings| {
-                    settings.project.all_languages.defaults.soft_wrap =
-                        Some(SoftWrap::PreferredLineLength);
-                    settings
-                        .project
-                        .all_languages
-                        .defaults
-                        .preferred_line_length = Some(columns);
-                });
-            })
-        })
-    }
-
-    pub async fn set_scroll_height(&mut self, rows: u32) {
-        // match Zed's scrolling behavior
-        self.neovim.set_option(&format!("scrolloff={}", 3)).await;
-        // +2 to account for the vim command UI at the bottom.
-        self.neovim.set_option(&format!("lines={}", rows + 2)).await;
-        let (line_height, visible_line_count) = self.update_editor(|editor, window, cx| {
-            (
-                editor
-                    .style(cx)
-                    .text
-                    .line_height_in_pixels(window.rem_size()),
-                editor.visible_line_count().unwrap(),
-            )
-        });
-
-        let window = self.window;
-        let margin = self
-            .update_window(window, |_, window, _cx| {
-                window.viewport_size().height - line_height * (visible_line_count as f32)
-            })
-            .unwrap();
-
-        self.simulate_window_resize(
-            self.window,
-            size(px(1000.), margin + (rows as f32) * line_height),
-        );
-    }
-
-    pub async fn set_neovim_option(&mut self, option: &str) {
-        self.neovim.set_option(option).await;
-    }
-
-    #[must_use]
-    pub async fn shared_clipboard(&mut self) -> SharedClipboard {
-        SharedClipboard {
-            register: '"',
-            state: self.shared_state().await,
-            neovim: self.neovim.read_register('"').await,
-            editor: self.read_from_clipboard().unwrap().text().unwrap(),
-        }
-    }
-
-    #[must_use]
-    pub async fn shared_register(&mut self, register: char) -> SharedClipboard {
-        SharedClipboard {
-            register,
-            state: self.shared_state().await,
-            neovim: self.neovim.read_register(register).await,
-            editor: self.update(|_, cx| {
-                cx.global::<VimGlobals>()
-                    .registers
-                    .get(&register)
-                    .cloned()
-                    .unwrap_or_default()
-                    .text
-                    .into()
-            }),
-        }
-    }
-
-    #[must_use]
-    pub async fn shared_state(&mut self) -> SharedState {
-        let (mode, marked_text) = self.neovim.state().await;
-        SharedState {
-            neovim: marked_text,
-            neovim_mode: mode,
-            editor: self.editor_state(),
-            editor_mode: self.mode(),
-            initial: self
-                .last_set_state
-                .as_ref()
-                .cloned()
-                .unwrap_or("N/A".to_string()),
-            recent_keystrokes: self.recent_keystrokes.join(" "),
-        }
-    }
-
-    #[must_use]
-    pub async fn simulate_at_each_offset(
-        &mut self,
-        keystrokes: &str,
-        marked_positions: &str,
-    ) -> SharedState {
-        let (unmarked_text, cursor_offsets) = marked_text_offsets(marked_positions);
-
-        for cursor_offset in cursor_offsets.iter() {
-            let mut marked_text = unmarked_text.clone();
-            marked_text.insert(*cursor_offset, 'ˇ');
-
-            let state = self.simulate(keystrokes, &marked_text).await;
-            if state.neovim != state.editor || state.neovim_mode != state.editor_mode {
-                return state;
-            }
-        }
-
-        SharedState::default()
-    }
-}
-
-impl Deref for NeovimBackedTestContext {
-    type Target = VimTestContext;
-
-    fn deref(&self) -> &Self::Target {
-        &self.cx
-    }
-}
-
-impl DerefMut for NeovimBackedTestContext {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.cx
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use crate::test::NeovimBackedTestContext;
-    use gpui::TestAppContext;
-
-    #[gpui::test]
-    async fn neovim_backed_test_context_works(cx: &mut TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.shared_state().await.assert_matches();
-        cx.set_shared_state("This is a tesˇt").await;
-        cx.shared_state().await.assert_matches();
-    }
-}
diff --git a/crates/vim/src/test/neovim_connection.rs b/crates/vim/src/test/neovim_connection.rs
deleted file mode 100644
index dbc4068507..0000000000
--- a/crates/vim/src/test/neovim_connection.rs
+++ /dev/null
@@ -1,624 +0,0 @@
-use std::path::PathBuf;
-#[cfg(feature = "neovim")]
-use std::{
-    cmp,
-    ops::{Deref, DerefMut, Range},
-};
-
-#[cfg(feature = "neovim")]
-use async_compat::Compat;
-#[cfg(feature = "neovim")]
-use async_trait::async_trait;
-#[cfg(feature = "neovim")]
-use gpui::Keystroke;
-
-#[cfg(feature = "neovim")]
-use language::Point;
-
-#[cfg(feature = "neovim")]
-use nvim_rs::{
-    Handler, Neovim, UiAttachOptions, Value, create::tokio::new_child_cmd, error::LoopError,
-};
-#[cfg(feature = "neovim")]
-use parking_lot::ReentrantMutex;
-use serde::{Deserialize, Serialize};
-#[cfg(feature = "neovim")]
-use tokio::{
-    process::{Child, ChildStdin, Command},
-    task::JoinHandle,
-};
-
-use crate::state::Mode;
-use collections::VecDeque;
-
-// Neovim doesn't like to be started simultaneously from multiple threads. We use this lock
-// to ensure we are only constructing one neovim connection at a time.
-#[cfg(feature = "neovim")]
-static NEOVIM_LOCK: ReentrantMutex<()> = ReentrantMutex::new(());
-
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
-pub enum NeovimData {
-    Put { state: String },
-    Key(String),
-    Get { state: String, mode: Mode },
-    ReadRegister { name: char, value: String },
-    Exec { command: String },
-    SetOption { value: String },
-}
-
-pub struct NeovimConnection {
-    data: VecDeque<NeovimData>,
-    #[cfg(feature = "neovim")]
-    test_case_id: String,
-    #[cfg(feature = "neovim")]
-    nvim: Neovim<nvim_rs::compat::tokio::Compat<ChildStdin>>,
-    #[cfg(feature = "neovim")]
-    _join_handle: JoinHandle<Result<(), Box<LoopError>>>,
-    #[cfg(feature = "neovim")]
-    _child: Child,
-}
-
-impl NeovimConnection {
-    pub async fn new(mut test_case_id: String) -> Self {
-        // When running under perf, don't create duplicate files.
-        if cfg!(perf_enabled) {
-            if test_case_id.ends_with(perf::consts::SUF_NORMAL) {
-                test_case_id.truncate(test_case_id.len() - perf::consts::SUF_NORMAL.len());
-            }
-        }
-        #[cfg(feature = "neovim")]
-        let handler = NvimHandler {};
-        #[cfg(feature = "neovim")]
-        let (nvim, join_handle, child) = Compat::new(async {
-            // Ensure we don't create neovim connections in parallel
-            let _lock = NEOVIM_LOCK.lock();
-            let (nvim, join_handle, child) = new_child_cmd(
-                Command::new("nvim")
-                    .arg("--embed")
-                    .arg("--clean")
-                    // disable swap (otherwise after about 1000 test runs you run out of swap file names)
-                    .arg("-n")
-                    // disable writing files (just in case)
-                    .arg("-m"),
-                handler,
-            )
-            .await
-            .expect("Could not connect to neovim process");
-
-            nvim.ui_attach(100, 100, &UiAttachOptions::default())
-                .await
-                .expect("Could not attach to ui");
-
-            // Makes system act a little more like zed in terms of indentation
-            nvim.set_option("smartindent", nvim_rs::Value::Boolean(true))
-                .await
-                .expect("Could not set smartindent on startup");
-
-            (nvim, join_handle, child)
-        })
-        .await;
-
-        Self {
-            #[cfg(feature = "neovim")]
-            data: Default::default(),
-            #[cfg(not(feature = "neovim"))]
-            data: Self::read_test_data(&test_case_id),
-            #[cfg(feature = "neovim")]
-            test_case_id,
-            #[cfg(feature = "neovim")]
-            nvim,
-            #[cfg(feature = "neovim")]
-            _join_handle: join_handle,
-            #[cfg(feature = "neovim")]
-            _child: child,
-        }
-    }
-
-    // Sends a keystroke to the neovim process.
-    #[cfg(feature = "neovim")]
-    pub async fn send_keystroke(&mut self, keystroke_text: &str) {
-        let mut keystroke = Keystroke::parse(keystroke_text).unwrap();
-
-        if keystroke.key == "<" {
-            keystroke.key = "lt".to_string()
-        }
-
-        let special = keystroke.modifiers.shift
-            || keystroke.modifiers.control
-            || keystroke.modifiers.alt
-            || keystroke.modifiers.platform
-            || keystroke.key.len() > 1;
-        let start = if special { "<" } else { "" };
-        let shift = if keystroke.modifiers.shift { "S-" } else { "" };
-        let ctrl = if keystroke.modifiers.control {
-            "C-"
-        } else {
-            ""
-        };
-        let alt = if keystroke.modifiers.alt { "M-" } else { "" };
-        let cmd = if keystroke.modifiers.platform {
-            "D-"
-        } else {
-            ""
-        };
-        let end = if special { ">" } else { "" };
-
-        let key = format!("{start}{shift}{ctrl}{alt}{cmd}{}{end}", keystroke.key);
-
-        self.data
-            .push_back(NeovimData::Key(keystroke_text.to_string()));
-        self.nvim
-            .input(&key)
-            .await
-            .expect("Could not input keystroke");
-    }
-
-    #[cfg(not(feature = "neovim"))]
-    pub async fn send_keystroke(&mut self, keystroke_text: &str) {
-        if matches!(self.data.front(), Some(NeovimData::Get { .. })) {
-            self.data.pop_front();
-        }
-        assert_eq!(
-            self.data.pop_front(),
-            Some(NeovimData::Key(keystroke_text.to_string())),
-            "operation does not match recorded script. re-record with --features=neovim"
-        );
-    }
-
-    #[cfg(feature = "neovim")]
-    pub async fn set_state(&mut self, marked_text: &str) {
-        let (text, selections) = parse_state(marked_text);
-
-        let nvim_buffer = self
-            .nvim
-            .get_current_buf()
-            .await
-            .expect("Could not get neovim buffer");
-        let lines = text
-            .split('\n')
-            .map(|line| line.to_string())
-            .collect::<Vec<_>>();
-
-        nvim_buffer
-            .set_lines(0, -1, false, lines)
-            .await
-            .expect("Could not set nvim buffer text");
-
-        self.nvim
-            .input("<escape>")
-            .await
-            .expect("Could not send escape to nvim");
-        self.nvim
-            .input("<escape>")
-            .await
-            .expect("Could not send escape to nvim");
-
-        let nvim_window = self
-            .nvim
-            .get_current_win()
-            .await
-            .expect("Could not get neovim window");
-
-        if selections.len() != 1 {
-            panic!("must have one selection");
-        }
-        let selection = &selections[0];
-
-        let cursor = selection.start;
-        nvim_window
-            .set_cursor((cursor.row as i64 + 1, cursor.column as i64))
-            .await
-            .expect("Could not set nvim cursor position");
-
-        if !selection.is_empty() {
-            self.nvim
-                .input("v")
-                .await
-                .expect("could not enter visual mode");
-
-            let cursor = selection.end;
-            nvim_window
-                .set_cursor((cursor.row as i64 + 1, cursor.column as i64))
-                .await
-                .expect("Could not set nvim cursor position");
-        }
-
-        if let Some(NeovimData::Get { mode, state }) = self.data.back()
-            && *mode == Mode::Normal
-            && *state == marked_text
-        {
-            return;
-        }
-        self.data.push_back(NeovimData::Put {
-            state: marked_text.to_string(),
-        })
-    }
-
-    #[cfg(not(feature = "neovim"))]
-    pub async fn set_state(&mut self, marked_text: &str) {
-        if let Some(NeovimData::Get { mode, state: text }) = self.data.front() {
-            if *mode == Mode::Normal && *text == marked_text {
-                return;
-            }
-            self.data.pop_front();
-        }
-        assert_eq!(
-            self.data.pop_front(),
-            Some(NeovimData::Put {
-                state: marked_text.to_string()
-            }),
-            "operation does not match recorded script. re-record with --features=neovim"
-        );
-    }
-
-    #[cfg(feature = "neovim")]
-    pub async fn set_option(&mut self, value: &str) {
-        self.nvim
-            .command_output(format!("set {}", value).as_str())
-            .await
-            .unwrap();
-
-        self.data.push_back(NeovimData::SetOption {
-            value: value.to_string(),
-        })
-    }
-
-    #[cfg(not(feature = "neovim"))]
-    pub async fn set_option(&mut self, value: &str) {
-        if let Some(NeovimData::Get { .. }) = self.data.front() {
-            self.data.pop_front();
-        };
-        assert_eq!(
-            self.data.pop_front(),
-            Some(NeovimData::SetOption {
-                value: value.to_string(),
-            }),
-            "operation does not match recorded script. re-record with --features=neovim"
-        );
-    }
-
-    #[cfg(feature = "neovim")]
-    pub async fn exec(&mut self, value: &str) {
-        self.nvim.command_output(value).await.unwrap();
-
-        self.data.push_back(NeovimData::Exec {
-            command: value.to_string(),
-        })
-    }
-
-    #[cfg(not(feature = "neovim"))]
-    pub async fn exec(&mut self, value: &str) {
-        if let Some(NeovimData::Get { .. }) = self.data.front() {
-            self.data.pop_front();
-        };
-        assert_eq!(
-            self.data.pop_front(),
-            Some(NeovimData::Exec {
-                command: value.to_string(),
-            }),
-            "operation does not match recorded script. re-record with --features=neovim"
-        );
-    }
-
-    #[cfg(not(feature = "neovim"))]
-    pub async fn read_register(&mut self, register: char) -> String {
-        if let Some(NeovimData::Get { .. }) = self.data.front() {
-            self.data.pop_front();
-        };
-        if let Some(NeovimData::ReadRegister { name, value }) = self.data.pop_front()
-            && name == register
-        {
-            return value;
-        }
-
-        panic!("operation does not match recorded script. re-record with --features=neovim")
-    }
-
-    #[cfg(feature = "neovim")]
-    pub async fn read_register(&mut self, name: char) -> String {
-        let value = self
-            .nvim
-            .command_output(format!("echo getreg('{}')", name).as_str())
-            .await
-            .unwrap();
-
-        self.data.push_back(NeovimData::ReadRegister {
-            name,
-            value: value.clone(),
-        });
-
-        value
-    }
-
-    #[cfg(feature = "neovim")]
-    async fn read_position(&mut self, cmd: &str) -> u32 {
-        self.nvim
-            .command_output(cmd)
-            .await
-            .unwrap()
-            .parse::<u32>()
-            .unwrap()
-    }
-
-    #[cfg(feature = "neovim")]
-    pub async fn state(&mut self) -> (Mode, String) {
-        let nvim_buffer = self
-            .nvim
-            .get_current_buf()
-            .await
-            .expect("Could not get neovim buffer");
-        let text = nvim_buffer
-            .get_lines(0, -1, false)
-            .await
-            .expect("Could not get buffer text")
-            .join("\n");
-
-        // nvim columns are 1-based, so -1.
-        let mut cursor_row = self.read_position("echo line('.')").await - 1;
-        let mut cursor_col = self.read_position("echo col('.')").await - 1;
-        let mut selection_row = self.read_position("echo line('v')").await - 1;
-        let mut selection_col = self.read_position("echo col('v')").await - 1;
-        let total_rows = self.read_position("echo line('$')").await - 1;
-
-        let nvim_mode_text = self
-            .nvim
-            .get_mode()
-            .await
-            .expect("Could not get mode")
-            .into_iter()
-            .find_map(|(key, value)| {
-                if key.as_str() == Some("mode") {
-                    Some(value.as_str().unwrap().to_owned())
-                } else {
-                    None
-                }
-            })
-            .expect("Could not find mode value");
-
-        let mode = match nvim_mode_text.as_ref() {
-            "i" => Mode::Insert,
-            "n" => Mode::Normal,
-            "v" => Mode::Visual,
-            "V" => Mode::VisualLine,
-            "R" => Mode::Replace,
-            "\x16" => Mode::VisualBlock,
-            _ => panic!("unexpected vim mode: {nvim_mode_text}"),
-        };
-
-        let mut selections = Vec::new();
-        // Vim uses the index of the first and last character in the selection
-        // Zed uses the index of the positions between the characters, so we need
-        // to add one to the end in visual mode.
-        match mode {
-            Mode::VisualBlock if selection_row != cursor_row => {
-                // in zed we fake a block selection by using multiple cursors (one per line)
-                // this code emulates that.
-                // to deal with casees where the selection is not perfectly rectangular we extract
-                // the content of the selection via the "a register to get the shape correctly.
-                self.nvim.input("\"aygv").await.unwrap();
-                let content = self.nvim.command_output("echo getreg('a')").await.unwrap();
-                let lines = content.split('\n').collect::<Vec<_>>();
-                let top = cmp::min(selection_row, cursor_row);
-                let left = cmp::min(selection_col, cursor_col);
-                for row in top..=cmp::max(selection_row, cursor_row) {
-                    let content = if row - top >= lines.len() as u32 {
-                        ""
-                    } else {
-                        lines[(row - top) as usize]
-                    };
-                    let line_len = self
-                        .read_position(format!("echo strlen(getline({}))", row + 1).as_str())
-                        .await;
-
-                    if left > line_len {
-                        continue;
-                    }
-
-                    let start = Point::new(row, left);
-                    let end = Point::new(row, left + content.len() as u32);
-                    if cursor_col >= selection_col {
-                        selections.push(start..end)
-                    } else {
-                        selections.push(end..start)
-                    }
-                }
-            }
-            Mode::Visual | Mode::VisualLine | Mode::VisualBlock => {
-                if (selection_row, selection_col) > (cursor_row, cursor_col) {
-                    let selection_line_length =
-                        self.read_position("echo strlen(getline(line('v')))").await;
-                    if selection_line_length > selection_col {
-                        selection_col += 1;
-                    } else if selection_row < total_rows {
-                        selection_col = 0;
-                        selection_row += 1;
-                    }
-                } else {
-                    let cursor_line_length =
-                        self.read_position("echo strlen(getline(line('.')))").await;
-                    if cursor_line_length > cursor_col {
-                        cursor_col += 1;
-                    } else if cursor_row < total_rows {
-                        cursor_col = 0;
-                        cursor_row += 1;
-                    }
-                }
-                selections.push(
-                    Point::new(selection_row, selection_col)..Point::new(cursor_row, cursor_col),
-                )
-            }
-            Mode::Insert | Mode::Normal | Mode::Replace => selections
-                .push(Point::new(selection_row, selection_col)..Point::new(cursor_row, cursor_col)),
-            Mode::HelixNormal | Mode::HelixSelect => unreachable!(),
-        }
-
-        let ranges = encode_ranges(&text, &selections);
-        let state = NeovimData::Get {
-            mode,
-            state: ranges.clone(),
-        };
-
-        if self.data.back() != Some(&state) {
-            self.data.push_back(state);
-        }
-
-        (mode, ranges)
-    }
-
-    #[cfg(not(feature = "neovim"))]
-    pub async fn state(&mut self) -> (Mode, String) {
-        if let Some(NeovimData::Get { state: raw, mode }) = self.data.front() {
-            (*mode, raw.to_string())
-        } else {
-            panic!("operation does not match recorded script. re-record with --features=neovim");
-        }
-    }
-
-    fn test_data_path(test_case_id: &str) -> PathBuf {
-        let mut data_path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-        data_path.push("test_data");
-        data_path.push(format!("{}.json", test_case_id));
-        data_path
-    }
-
-    #[cfg(not(feature = "neovim"))]
-    fn read_test_data(test_case_id: &str) -> VecDeque<NeovimData> {
-        let path = Self::test_data_path(test_case_id);
-        let json = std::fs::read_to_string(path).expect(
-            "Could not read test data. Is it generated? Try running test with '--features neovim'",
-        );
-
-        let mut result = VecDeque::new();
-        for line in json.lines() {
-            result.push_back(
-                serde_json::from_str(line)
-                    .expect("invalid test data. regenerate it with '--features neovim'"),
-            );
-        }
-        result
-    }
-
-    #[cfg(feature = "neovim")]
-    fn write_test_data(test_case_id: &str, data: &VecDeque<NeovimData>) {
-        let path = Self::test_data_path(test_case_id);
-        let mut json = Vec::new();
-        for entry in data {
-            serde_json::to_writer(&mut json, entry).unwrap();
-            json.push(b'\n');
-        }
-        std::fs::create_dir_all(path.parent().unwrap())
-            .expect("could not create test data directory");
-        std::fs::write(path, json).expect("could not write out test data");
-    }
-}
-
-#[cfg(feature = "neovim")]
-impl Deref for NeovimConnection {
-    type Target = Neovim<nvim_rs::compat::tokio::Compat<ChildStdin>>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.nvim
-    }
-}
-
-#[cfg(feature = "neovim")]
-impl DerefMut for NeovimConnection {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.nvim
-    }
-}
-
-#[cfg(feature = "neovim")]
-impl Drop for NeovimConnection {
-    fn drop(&mut self) {
-        Self::write_test_data(&self.test_case_id, &self.data);
-    }
-}
-
-#[cfg(feature = "neovim")]
-#[derive(Clone)]
-struct NvimHandler {}
-
-#[cfg(feature = "neovim")]
-#[async_trait]
-impl Handler for NvimHandler {
-    type Writer = nvim_rs::compat::tokio::Compat<ChildStdin>;
-
-    async fn handle_request(
-        &self,
-        _event_name: String,
-        _arguments: Vec<Value>,
-        _neovim: Neovim<Self::Writer>,
-    ) -> Result<Value, Value> {
-        unimplemented!();
-    }
-
-    async fn handle_notify(
-        &self,
-        _event_name: String,
-        _arguments: Vec<Value>,
-        _neovim: Neovim<Self::Writer>,
-    ) {
-    }
-}
-
-#[cfg(feature = "neovim")]
-fn parse_state(marked_text: &str) -> (String, Vec<Range<Point>>) {
-    let (text, ranges) = util::test::marked_text_ranges(marked_text, true);
-    let point_ranges = ranges
-        .into_iter()
-        .map(|byte_range| {
-            let mut point_range = Point::zero()..Point::zero();
-            let mut ix = 0;
-            let mut position = Point::zero();
-            for c in text.chars().chain(['\0']) {
-                if ix == byte_range.start {
-                    point_range.start = position;
-                }
-                if ix == byte_range.end {
-                    point_range.end = position;
-                }
-                let len_utf8 = c.len_utf8();
-                ix += len_utf8;
-                if c == '\n' {
-                    position.row += 1;
-                    position.column = 0;
-                } else {
-                    position.column += len_utf8 as u32;
-                }
-            }
-            point_range
-        })
-        .collect::<Vec<_>>();
-    (text, point_ranges)
-}
-
-#[cfg(feature = "neovim")]
-fn encode_ranges(text: &str, point_ranges: &Vec<Range<Point>>) -> String {
-    let byte_ranges = point_ranges
-        .iter()
-        .map(|range| {
-            let mut byte_range = 0..0;
-            let mut ix = 0;
-            let mut position = Point::zero();
-            for c in text.chars().chain(['\0']) {
-                if position == range.start {
-                    byte_range.start = ix;
-                }
-                if position == range.end {
-                    byte_range.end = ix;
-                }
-                let len_utf8 = c.len_utf8();
-                ix += len_utf8;
-                if c == '\n' {
-                    position.row += 1;
-                    position.column = 0;
-                } else {
-                    position.column += len_utf8 as u32;
-                }
-            }
-            byte_range
-        })
-        .collect::<Vec<_>>();
-    util::test::generate_marked_text(text, &byte_ranges[..], true)
-}
diff --git a/crates/vim/src/test/vim_test_context.rs b/crates/vim/src/test/vim_test_context.rs
deleted file mode 100644
index acd77839f2..0000000000
--- a/crates/vim/src/test/vim_test_context.rs
+++ /dev/null
@@ -1,289 +0,0 @@
-use std::ops::{Deref, DerefMut};
-
-use editor::test::editor_lsp_test_context::EditorLspTestContext;
-use gpui::{Context, Entity, UpdateGlobal};
-use search::{BufferSearchBar, project_search::ProjectSearchBar};
-use semver::Version;
-
-use crate::{state::Operator, *};
-
-pub struct VimTestContext {
-    cx: EditorLspTestContext,
-}
-
-impl VimTestContext {
-    pub fn init(cx: &mut gpui::TestAppContext) {
-        if cx.has_global::<VimGlobals>() {
-            return;
-        }
-        env_logger::try_init().ok();
-        cx.update(|cx| {
-            let settings = SettingsStore::test(cx);
-            cx.set_global(settings);
-            release_channel::init(Version::new(0, 0, 0), cx);
-            command_palette::init(cx);
-            project_panel::init(cx);
-            git_ui::init(cx);
-            crate::init(cx);
-            search::init(cx);
-            theme::init(theme::LoadThemes::JustBase, cx);
-            settings_ui::init(cx);
-            markdown_preview::init(cx);
-        });
-    }
-
-    pub async fn new(cx: &mut gpui::TestAppContext, enabled: bool) -> VimTestContext {
-        Self::init(cx);
-        let lsp = EditorLspTestContext::new_rust(Default::default(), cx).await;
-        Self::new_with_lsp(lsp, enabled)
-    }
-
-    pub async fn new_html(cx: &mut gpui::TestAppContext) -> VimTestContext {
-        Self::init(cx);
-        Self::new_with_lsp(EditorLspTestContext::new_html(cx).await, true)
-    }
-
-    pub async fn new_markdown_with_rust(cx: &mut gpui::TestAppContext) -> VimTestContext {
-        Self::init(cx);
-        Self::new_with_lsp(EditorLspTestContext::new_markdown_with_rust(cx).await, true)
-    }
-
-    pub async fn new_typescript(cx: &mut gpui::TestAppContext) -> VimTestContext {
-        Self::init(cx);
-        Self::new_with_lsp(
-            EditorLspTestContext::new_typescript(
-                lsp::ServerCapabilities {
-                    completion_provider: Some(lsp::CompletionOptions {
-                        trigger_characters: Some(vec![".".to_string()]),
-                        ..Default::default()
-                    }),
-                    rename_provider: Some(lsp::OneOf::Right(lsp::RenameOptions {
-                        prepare_provider: Some(true),
-                        work_done_progress_options: Default::default(),
-                    })),
-                    definition_provider: Some(lsp::OneOf::Left(true)),
-                    ..Default::default()
-                },
-                cx,
-            )
-            .await,
-            true,
-        )
-    }
-
-    pub async fn new_tsx(cx: &mut gpui::TestAppContext) -> VimTestContext {
-        Self::init(cx);
-        Self::new_with_lsp(
-            EditorLspTestContext::new_tsx(
-                lsp::ServerCapabilities {
-                    completion_provider: Some(lsp::CompletionOptions {
-                        trigger_characters: Some(vec![".".to_string()]),
-                        ..Default::default()
-                    }),
-                    rename_provider: Some(lsp::OneOf::Right(lsp::RenameOptions {
-                        prepare_provider: Some(true),
-                        work_done_progress_options: Default::default(),
-                    })),
-                    ..Default::default()
-                },
-                cx,
-            )
-            .await,
-            true,
-        )
-    }
-
-    pub fn init_keybindings(enabled: bool, cx: &mut App) {
-        SettingsStore::update_global(cx, |store, cx| {
-            store.update_user_settings(cx, |s| s.vim_mode = Some(enabled));
-        });
-        let mut default_key_bindings = settings::KeymapFile::load_asset_allow_partial_failure(
-            "keymaps/default-macos.json",
-            cx,
-        )
-        .unwrap();
-        for key_binding in &mut default_key_bindings {
-            key_binding.set_meta(settings::KeybindSource::Default.meta());
-        }
-        cx.bind_keys(default_key_bindings);
-        if enabled {
-            let vim_key_bindings = settings::KeymapFile::load_asset(
-                "keymaps/vim.json",
-                Some(settings::KeybindSource::Vim),
-                cx,
-            )
-            .unwrap();
-            cx.bind_keys(vim_key_bindings);
-        }
-    }
-
-    pub fn new_with_lsp(mut cx: EditorLspTestContext, enabled: bool) -> VimTestContext {
-        cx.update(|_, cx| {
-            Self::init_keybindings(enabled, cx);
-        });
-
-        // Setup search toolbars and keypress hook
-        cx.update_workspace(|workspace, window, cx| {
-            workspace.active_pane().update(cx, |pane, cx| {
-                pane.toolbar().update(cx, |toolbar, cx| {
-                    let buffer_search_bar = cx.new(|cx| BufferSearchBar::new(None, window, cx));
-                    toolbar.add_item(buffer_search_bar, window, cx);
-
-                    let project_search_bar = cx.new(|_| ProjectSearchBar::new());
-                    toolbar.add_item(project_search_bar, window, cx);
-                })
-            });
-            workspace.status_bar().update(cx, |status_bar, cx| {
-                let vim_mode_indicator = cx.new(|cx| ModeIndicator::new(window, cx));
-                status_bar.add_right_item(vim_mode_indicator, window, cx);
-            });
-        });
-
-        Self { cx }
-    }
-
-    pub fn update_entity<F, T, R>(&mut self, entity: Entity<T>, update: F) -> R
-    where
-        T: 'static,
-        F: FnOnce(&mut T, &mut Window, &mut Context<T>) -> R + 'static,
-    {
-        let window = self.window;
-        self.update_window(window, move |_, window, cx| {
-            entity.update(cx, |t, cx| update(t, window, cx))
-        })
-        .unwrap()
-    }
-
-    pub fn workspace<F, T>(&mut self, update: F) -> T
-    where
-        F: FnOnce(&mut Workspace, &mut Window, &mut Context<Workspace>) -> T,
-    {
-        self.cx.update_workspace(update)
-    }
-
-    pub fn enable_vim(&mut self) {
-        self.cx.update(|_, cx| {
-            SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |s| s.vim_mode = Some(true));
-            });
-        })
-    }
-
-    pub fn disable_vim(&mut self) {
-        self.cx.update(|_, cx| {
-            SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |s| s.vim_mode = Some(false));
-            });
-        })
-    }
-
-    pub fn enable_helix(&mut self) {
-        self.cx.update(|_, cx| {
-            SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |s| s.helix_mode = Some(true));
-            });
-        })
-    }
-
-    pub fn mode(&mut self) -> Mode {
-        self.update_editor(|editor, _, cx| editor.addon::<VimAddon>().unwrap().entity.read(cx).mode)
-    }
-
-    pub fn forced_motion(&mut self) -> bool {
-        self.update_editor(|_, _, cx| cx.global::<VimGlobals>().forced_motion)
-    }
-
-    pub fn active_operator(&mut self) -> Option<Operator> {
-        self.update_editor(|editor, _, cx| {
-            editor
-                .addon::<VimAddon>()
-                .unwrap()
-                .entity
-                .read(cx)
-                .operator_stack
-                .last()
-                .cloned()
-        })
-    }
-
-    pub fn set_state(&mut self, text: &str, mode: Mode) {
-        self.cx.set_state(text);
-        let vim =
-            self.update_editor(|editor, _window, _cx| editor.addon::<VimAddon>().cloned().unwrap());
-
-        self.update(|window, cx| {
-            vim.entity.update(cx, |vim, cx| {
-                vim.switch_mode(mode, true, window, cx);
-            });
-        });
-        self.cx.cx.cx.run_until_parked();
-    }
-
-    #[track_caller]
-    pub fn assert_state(&mut self, text: &str, mode: Mode) {
-        self.assert_editor_state(text);
-        assert_eq!(self.mode(), mode, "{}", self.assertion_context());
-    }
-
-    pub fn assert_binding(
-        &mut self,
-        keystrokes: &str,
-        initial_state: &str,
-        initial_mode: Mode,
-        state_after: &str,
-        mode_after: Mode,
-    ) {
-        self.set_state(initial_state, initial_mode);
-        self.cx.simulate_keystrokes(keystrokes);
-        self.cx.assert_editor_state(state_after);
-        assert_eq!(self.mode(), mode_after, "{}", self.assertion_context());
-        assert_eq!(self.active_operator(), None, "{}", self.assertion_context());
-    }
-
-    pub fn assert_binding_normal(
-        &mut self,
-        keystrokes: &str,
-        initial_state: &str,
-        state_after: &str,
-    ) {
-        self.set_state(initial_state, Mode::Normal);
-        self.cx.simulate_keystrokes(keystrokes);
-        self.cx.assert_editor_state(state_after);
-        assert_eq!(self.mode(), Mode::Normal, "{}", self.assertion_context());
-        assert_eq!(self.active_operator(), None, "{}", self.assertion_context());
-    }
-
-    pub fn shared_clipboard(&mut self) -> VimClipboard {
-        VimClipboard {
-            editor: self
-                .read_from_clipboard()
-                .map(|item| item.text().unwrap())
-                .unwrap_or_default(),
-        }
-    }
-}
-
-pub struct VimClipboard {
-    editor: String,
-}
-
-impl VimClipboard {
-    #[track_caller]
-    pub fn assert_eq(&self, expected: &str) {
-        assert_eq!(self.editor, expected);
-    }
-}
-
-impl Deref for VimTestContext {
-    type Target = EditorLspTestContext;
-
-    fn deref(&self) -> &Self::Target {
-        &self.cx
-    }
-}
-
-impl DerefMut for VimTestContext {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.cx
-    }
-}
diff --git a/crates/vim/src/vim.rs b/crates/vim/src/vim.rs
deleted file mode 100644
index 9a9a1a001c..0000000000
--- a/crates/vim/src/vim.rs
+++ /dev/null
@@ -1,2022 +0,0 @@
-//! Vim support for Zed.
-
-#[cfg(test)]
-mod test;
-
-mod change_list;
-mod command;
-mod digraph;
-mod helix;
-mod indent;
-mod insert;
-mod mode_indicator;
-mod motion;
-mod normal;
-mod object;
-mod replace;
-mod rewrap;
-mod state;
-mod surrounds;
-mod visual;
-
-use crate::normal::paste::Paste as VimPaste;
-use collections::HashMap;
-use editor::{
-    Anchor, Bias, Editor, EditorEvent, EditorSettings, HideMouseCursorOrigin, MultiBufferOffset,
-    SelectionEffects, ToPoint,
-    actions::Paste,
-    movement::{self, FindRange},
-};
-use gpui::{
-    Action, App, AppContext, Axis, Context, Entity, EventEmitter, KeyContext, KeystrokeEvent,
-    Render, Subscription, Task, WeakEntity, Window, actions,
-};
-use insert::{NormalBefore, TemporaryNormal};
-use language::{
-    CharKind, CharScopeContext, CursorShape, Point, Selection, SelectionGoal, TransactionId,
-};
-pub use mode_indicator::ModeIndicator;
-use motion::Motion;
-use normal::search::SearchSubmit;
-use object::Object;
-use schemars::JsonSchema;
-use serde::Deserialize;
-use settings::RegisterSetting;
-pub use settings::{
-    ModeContent, Settings, SettingsStore, UseSystemClipboard, update_settings_file,
-};
-use state::{Mode, Operator, RecordedSelection, SearchState, VimGlobals};
-use std::{mem, ops::Range, sync::Arc};
-use surrounds::SurroundsType;
-use theme::ThemeSettings;
-use ui::{IntoElement, SharedString, px};
-use vim_mode_setting::HelixModeSetting;
-use vim_mode_setting::VimModeSetting;
-use workspace::{self, Pane, Workspace};
-
-use crate::{
-    normal::{GoToPreviousTab, GoToTab},
-    state::ReplayableAction,
-};
-
-/// Number is used to manage vim's count. Pushing a digit
-/// multiplies the current value by 10 and adds the digit.
-#[derive(Clone, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = vim)]
-struct Number(usize);
-
-#[derive(Clone, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = vim)]
-struct SelectRegister(String);
-
-#[derive(Clone, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = vim)]
-#[serde(deny_unknown_fields)]
-struct PushObject {
-    around: bool,
-}
-
-#[derive(Clone, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = vim)]
-#[serde(deny_unknown_fields)]
-struct PushFindForward {
-    before: bool,
-    multiline: bool,
-}
-
-#[derive(Clone, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = vim)]
-#[serde(deny_unknown_fields)]
-struct PushFindBackward {
-    after: bool,
-    multiline: bool,
-}
-
-#[derive(Clone, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = vim)]
-#[serde(deny_unknown_fields)]
-/// Selects the next object.
-struct PushHelixNext {
-    around: bool,
-}
-
-#[derive(Clone, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = vim)]
-#[serde(deny_unknown_fields)]
-/// Selects the previous object.
-struct PushHelixPrevious {
-    around: bool,
-}
-
-#[derive(Clone, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = vim)]
-#[serde(deny_unknown_fields)]
-struct PushSneak {
-    first_char: Option<char>,
-}
-
-#[derive(Clone, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = vim)]
-#[serde(deny_unknown_fields)]
-struct PushSneakBackward {
-    first_char: Option<char>,
-}
-
-#[derive(Clone, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = vim)]
-#[serde(deny_unknown_fields)]
-struct PushAddSurrounds;
-
-#[derive(Clone, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = vim)]
-#[serde(deny_unknown_fields)]
-struct PushChangeSurrounds {
-    target: Option<Object>,
-}
-
-#[derive(Clone, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = vim)]
-#[serde(deny_unknown_fields)]
-struct PushJump {
-    line: bool,
-}
-
-#[derive(Clone, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = vim)]
-#[serde(deny_unknown_fields)]
-struct PushDigraph {
-    first_char: Option<char>,
-}
-
-#[derive(Clone, Deserialize, JsonSchema, PartialEq, Action)]
-#[action(namespace = vim)]
-#[serde(deny_unknown_fields)]
-struct PushLiteral {
-    prefix: Option<String>,
-}
-
-actions!(
-    vim,
-    [
-        /// Switches to normal mode.
-        SwitchToNormalMode,
-        /// Switches to insert mode.
-        SwitchToInsertMode,
-        /// Switches to replace mode.
-        SwitchToReplaceMode,
-        /// Switches to visual mode.
-        SwitchToVisualMode,
-        /// Switches to visual line mode.
-        SwitchToVisualLineMode,
-        /// Switches to visual block mode.
-        SwitchToVisualBlockMode,
-        /// Switches to Helix-style normal mode.
-        SwitchToHelixNormalMode,
-        /// Clears any pending operators.
-        ClearOperators,
-        /// Clears the exchange register.
-        ClearExchange,
-        /// Inserts a tab character.
-        Tab,
-        /// Inserts a newline.
-        Enter,
-        /// Selects inner text object.
-        InnerObject,
-        /// Maximizes the current pane.
-        MaximizePane,
-        /// Resets all pane sizes to default.
-        ResetPaneSizes,
-        /// Resizes the pane to the right.
-        ResizePaneRight,
-        /// Resizes the pane to the left.
-        ResizePaneLeft,
-        /// Resizes the pane upward.
-        ResizePaneUp,
-        /// Resizes the pane downward.
-        ResizePaneDown,
-        /// Starts a change operation.
-        PushChange,
-        /// Starts a delete operation.
-        PushDelete,
-        /// Exchanges text regions.
-        Exchange,
-        /// Starts a yank operation.
-        PushYank,
-        /// Starts a replace operation.
-        PushReplace,
-        /// Deletes surrounding characters.
-        PushDeleteSurrounds,
-        /// Sets a mark at the current position.
-        PushMark,
-        /// Toggles the marks view.
-        ToggleMarksView,
-        /// Starts a forced motion.
-        PushForcedMotion,
-        /// Starts an indent operation.
-        PushIndent,
-        /// Starts an outdent operation.
-        PushOutdent,
-        /// Starts an auto-indent operation.
-        PushAutoIndent,
-        /// Starts a rewrap operation.
-        PushRewrap,
-        /// Starts a shell command operation.
-        PushShellCommand,
-        /// Converts to lowercase.
-        PushLowercase,
-        /// Converts to uppercase.
-        PushUppercase,
-        /// Toggles case.
-        PushOppositeCase,
-        /// Applies ROT13 encoding.
-        PushRot13,
-        /// Applies ROT47 encoding.
-        PushRot47,
-        /// Toggles the registers view.
-        ToggleRegistersView,
-        /// Selects a register.
-        PushRegister,
-        /// Starts recording to a register.
-        PushRecordRegister,
-        /// Replays a register.
-        PushReplayRegister,
-        /// Replaces with register contents.
-        PushReplaceWithRegister,
-        /// Toggles comments.
-        PushToggleComments,
-        /// Selects (count) next menu item
-        MenuSelectNext,
-        /// Selects (count) previous menu item
-        MenuSelectPrevious,
-        /// Clears count or toggles project panel focus
-        ToggleProjectPanelFocus,
-        /// Starts a match operation.
-        PushHelixMatch,
-    ]
-);
-
-// in the workspace namespace so it's not filtered out when vim is disabled.
-actions!(
-    workspace,
-    [
-        /// Toggles Vim mode on or off.
-        ToggleVimMode,
-        /// Toggles Helix mode on or off.
-        ToggleHelixMode,
-    ]
-);
-
-/// Initializes the `vim` crate.
-pub fn init(cx: &mut App) {
-    VimGlobals::register(cx);
-
-    cx.observe_new(Vim::register).detach();
-
-    cx.observe_new(|workspace: &mut Workspace, _, _| {
-        workspace.register_action(|workspace, _: &ToggleVimMode, _, cx| {
-            let fs = workspace.app_state().fs.clone();
-            let currently_enabled = VimModeSetting::get_global(cx).0;
-            update_settings_file(fs, cx, move |setting, _| {
-                setting.vim_mode = Some(!currently_enabled);
-                if let Some(helix_mode) = &mut setting.helix_mode {
-                    *helix_mode = false;
-                }
-            })
-        });
-
-        workspace.register_action(|workspace, _: &ToggleHelixMode, _, cx| {
-            let fs = workspace.app_state().fs.clone();
-            let currently_enabled = HelixModeSetting::get_global(cx).0;
-            update_settings_file(fs, cx, move |setting, _| {
-                setting.helix_mode = Some(!currently_enabled);
-                if let Some(vim_mode) = &mut setting.vim_mode {
-                    *vim_mode = false;
-                }
-            })
-        });
-
-        workspace.register_action(|_, _: &MenuSelectNext, window, cx| {
-            let count = Vim::take_count(cx).unwrap_or(1);
-
-            for _ in 0..count {
-                window.dispatch_action(menu::SelectNext.boxed_clone(), cx);
-            }
-        });
-
-        workspace.register_action(|_, _: &MenuSelectPrevious, window, cx| {
-            let count = Vim::take_count(cx).unwrap_or(1);
-
-            for _ in 0..count {
-                window.dispatch_action(menu::SelectPrevious.boxed_clone(), cx);
-            }
-        });
-
-        workspace.register_action(|_, _: &ToggleProjectPanelFocus, window, cx| {
-            if Vim::take_count(cx).is_none() {
-                window.dispatch_action(zed_actions::project_panel::ToggleFocus.boxed_clone(), cx);
-            }
-        });
-
-        workspace.register_action(|workspace, n: &Number, window, cx| {
-            let vim = workspace
-                .focused_pane(window, cx)
-                .read(cx)
-                .active_item()
-                .and_then(|item| item.act_as::<Editor>(cx))
-                .and_then(|editor| editor.read(cx).addon::<VimAddon>().cloned());
-            if let Some(vim) = vim {
-                let digit = n.0;
-                vim.entity.update(cx, |_, cx| {
-                    cx.defer_in(window, move |vim, window, cx| {
-                        vim.push_count_digit(digit, window, cx)
-                    })
-                });
-            } else {
-                let count = Vim::globals(cx).pre_count.unwrap_or(0);
-                Vim::globals(cx).pre_count = Some(
-                    count
-                        .checked_mul(10)
-                        .and_then(|c| c.checked_add(n.0))
-                        .unwrap_or(count),
-                );
-            };
-        });
-
-        workspace.register_action(|_, _: &zed_actions::vim::OpenDefaultKeymap, _, cx| {
-            cx.emit(workspace::Event::OpenBundledFile {
-                text: settings::vim_keymap(),
-                title: "Default Vim Bindings",
-                language: "JSON",
-            });
-        });
-
-        workspace.register_action(|workspace, _: &ResetPaneSizes, _, cx| {
-            workspace.reset_pane_sizes(cx);
-        });
-
-        workspace.register_action(|workspace, _: &MaximizePane, window, cx| {
-            let pane = workspace.active_pane();
-            let Some(size) = workspace.bounding_box_for_pane(pane) else {
-                return;
-            };
-
-            let theme = ThemeSettings::get_global(cx);
-            let height = theme.buffer_font_size(cx) * theme.buffer_line_height.value();
-
-            let desired_size = if let Some(count) = Vim::take_count(cx) {
-                height * count
-            } else {
-                px(10000.)
-            };
-            workspace.resize_pane(Axis::Vertical, desired_size - size.size.height, window, cx)
-        });
-
-        workspace.register_action(|workspace, _: &ResizePaneRight, window, cx| {
-            let count = Vim::take_count(cx).unwrap_or(1) as f32;
-            Vim::take_forced_motion(cx);
-            let theme = ThemeSettings::get_global(cx);
-            let font_id = window.text_system().resolve_font(&theme.buffer_font);
-            let Ok(width) = window
-                .text_system()
-                .advance(font_id, theme.buffer_font_size(cx), 'm')
-            else {
-                return;
-            };
-            workspace.resize_pane(Axis::Horizontal, width.width * count, window, cx);
-        });
-
-        workspace.register_action(|workspace, _: &ResizePaneLeft, window, cx| {
-            let count = Vim::take_count(cx).unwrap_or(1) as f32;
-            Vim::take_forced_motion(cx);
-            let theme = ThemeSettings::get_global(cx);
-            let font_id = window.text_system().resolve_font(&theme.buffer_font);
-            let Ok(width) = window
-                .text_system()
-                .advance(font_id, theme.buffer_font_size(cx), 'm')
-            else {
-                return;
-            };
-            workspace.resize_pane(Axis::Horizontal, -width.width * count, window, cx);
-        });
-
-        workspace.register_action(|workspace, _: &ResizePaneUp, window, cx| {
-            let count = Vim::take_count(cx).unwrap_or(1) as f32;
-            Vim::take_forced_motion(cx);
-            let theme = ThemeSettings::get_global(cx);
-            let height = theme.buffer_font_size(cx) * theme.buffer_line_height.value();
-            workspace.resize_pane(Axis::Vertical, height * count, window, cx);
-        });
-
-        workspace.register_action(|workspace, _: &ResizePaneDown, window, cx| {
-            let count = Vim::take_count(cx).unwrap_or(1) as f32;
-            Vim::take_forced_motion(cx);
-            let theme = ThemeSettings::get_global(cx);
-            let height = theme.buffer_font_size(cx) * theme.buffer_line_height.value();
-            workspace.resize_pane(Axis::Vertical, -height * count, window, cx);
-        });
-
-        workspace.register_action(|workspace, _: &SearchSubmit, window, cx| {
-            let vim = workspace
-                .focused_pane(window, cx)
-                .read(cx)
-                .active_item()
-                .and_then(|item| item.act_as::<Editor>(cx))
-                .and_then(|editor| editor.read(cx).addon::<VimAddon>().cloned());
-            let Some(vim) = vim else { return };
-            vim.entity.update(cx, |_, cx| {
-                cx.defer_in(window, |vim, window, cx| vim.search_submit(window, cx))
-            })
-        });
-        workspace.register_action(|_, _: &GoToTab, window, cx| {
-            let count = Vim::take_count(cx);
-            Vim::take_forced_motion(cx);
-
-            if let Some(tab_index) = count {
-                // <count>gt goes to tab <count> (1-based).
-                let zero_based_index = tab_index.saturating_sub(1);
-                window.dispatch_action(
-                    workspace::pane::ActivateItem(zero_based_index).boxed_clone(),
-                    cx,
-                );
-            } else {
-                // If no count is provided, go to the next tab.
-                window.dispatch_action(workspace::pane::ActivateNextItem.boxed_clone(), cx);
-            }
-        });
-
-        workspace.register_action(|workspace, _: &GoToPreviousTab, window, cx| {
-            let count = Vim::take_count(cx);
-            Vim::take_forced_motion(cx);
-
-            if let Some(count) = count {
-                // gT with count goes back that many tabs with wraparound (not the same as gt!).
-                let pane = workspace.active_pane().read(cx);
-                let item_count = pane.items().count();
-                if item_count > 0 {
-                    let current_index = pane.active_item_index();
-                    let target_index = (current_index as isize - count as isize)
-                        .rem_euclid(item_count as isize)
-                        as usize;
-                    window.dispatch_action(
-                        workspace::pane::ActivateItem(target_index).boxed_clone(),
-                        cx,
-                    );
-                }
-            } else {
-                // No count provided, go to the previous tab.
-                window.dispatch_action(workspace::pane::ActivatePreviousItem.boxed_clone(), cx);
-            }
-        });
-    })
-    .detach();
-}
-
-#[derive(Clone)]
-pub(crate) struct VimAddon {
-    pub(crate) entity: Entity<Vim>,
-}
-
-impl editor::Addon for VimAddon {
-    fn extend_key_context(&self, key_context: &mut KeyContext, cx: &App) {
-        self.entity.read(cx).extend_key_context(key_context, cx)
-    }
-
-    fn to_any(&self) -> &dyn std::any::Any {
-        self
-    }
-}
-
-/// The state pertaining to Vim mode.
-pub(crate) struct Vim {
-    pub(crate) mode: Mode,
-    pub last_mode: Mode,
-    pub temp_mode: bool,
-    pub status_label: Option<SharedString>,
-    pub exit_temporary_mode: bool,
-
-    operator_stack: Vec<Operator>,
-    pub(crate) replacements: Vec<(Range<editor::Anchor>, String)>,
-
-    pub(crate) stored_visual_mode: Option<(Mode, Vec<bool>)>,
-
-    pub(crate) current_tx: Option<TransactionId>,
-    pub(crate) current_anchor: Option<Selection<Anchor>>,
-    pub(crate) undo_modes: HashMap<TransactionId, Mode>,
-    pub(crate) undo_last_line_tx: Option<TransactionId>,
-
-    selected_register: Option<char>,
-    pub search: SearchState,
-
-    editor: WeakEntity<Editor>,
-
-    last_command: Option<String>,
-    running_command: Option<Task<()>>,
-    _subscriptions: Vec<Subscription>,
-}
-
-// Hack: Vim intercepts events dispatched to a window and updates the view in response.
-// This means it needs a VisualContext. The easiest way to satisfy that constraint is
-// to make Vim a "View" that is just never actually rendered.
-impl Render for Vim {
-    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
-        gpui::Empty
-    }
-}
-
-enum VimEvent {
-    Focused,
-}
-impl EventEmitter<VimEvent> for Vim {}
-
-impl Vim {
-    /// The namespace for Vim actions.
-    const NAMESPACE: &'static str = "vim";
-
-    pub fn new(window: &mut Window, cx: &mut Context<Editor>) -> Entity<Self> {
-        let editor = cx.entity();
-
-        let initial_vim_mode = VimSettings::get_global(cx).default_mode;
-        let (mode, last_mode) = if HelixModeSetting::get_global(cx).0 {
-            let initial_helix_mode = match initial_vim_mode {
-                Mode::Normal => Mode::HelixNormal,
-                Mode::Insert => Mode::Insert,
-                // Otherwise, we panic with a note that we should never get there due to the
-                // possible values of VimSettings::get_global(cx).default_mode being either Mode::Normal or Mode::Insert.
-                _ => unreachable!("Invalid default mode"),
-            };
-            (initial_helix_mode, Mode::HelixNormal)
-        } else {
-            (initial_vim_mode, Mode::Normal)
-        };
-
-        cx.new(|cx| Vim {
-            mode,
-            last_mode,
-            temp_mode: false,
-            exit_temporary_mode: false,
-            operator_stack: Vec::new(),
-            replacements: Vec::new(),
-
-            stored_visual_mode: None,
-            current_tx: None,
-            undo_last_line_tx: None,
-            current_anchor: None,
-            undo_modes: HashMap::default(),
-
-            status_label: None,
-            selected_register: None,
-            search: SearchState::default(),
-
-            last_command: None,
-            running_command: None,
-
-            editor: editor.downgrade(),
-            _subscriptions: vec![
-                cx.observe_keystrokes(Self::observe_keystrokes),
-                cx.subscribe_in(&editor, window, |this, _, event, window, cx| {
-                    this.handle_editor_event(event, window, cx)
-                }),
-            ],
-        })
-    }
-
-    fn register(editor: &mut Editor, window: Option<&mut Window>, cx: &mut Context<Editor>) {
-        let Some(window) = window else {
-            return;
-        };
-
-        if !editor.use_modal_editing() {
-            return;
-        }
-
-        let mut was_enabled = Vim::enabled(cx);
-        let mut was_toggle = VimSettings::get_global(cx).toggle_relative_line_numbers;
-        cx.observe_global_in::<SettingsStore>(window, move |editor, window, cx| {
-            let enabled = Vim::enabled(cx);
-            let toggle = VimSettings::get_global(cx).toggle_relative_line_numbers;
-            if enabled && was_enabled && (toggle != was_toggle) {
-                if toggle {
-                    let is_relative = editor
-                        .addon::<VimAddon>()
-                        .map(|vim| vim.entity.read(cx).mode != Mode::Insert);
-                    editor.set_relative_line_number(is_relative, cx)
-                } else {
-                    editor.set_relative_line_number(None, cx)
-                }
-            }
-            was_toggle = VimSettings::get_global(cx).toggle_relative_line_numbers;
-            if was_enabled == enabled {
-                return;
-            }
-            was_enabled = enabled;
-            if enabled {
-                Self::activate(editor, window, cx)
-            } else {
-                Self::deactivate(editor, cx)
-            }
-        })
-        .detach();
-        if was_enabled {
-            Self::activate(editor, window, cx)
-        }
-    }
-
-    fn activate(editor: &mut Editor, window: &mut Window, cx: &mut Context<Editor>) {
-        let vim = Vim::new(window, cx);
-
-        if !editor.mode().is_full() {
-            vim.update(cx, |vim, _| {
-                vim.mode = Mode::Insert;
-            });
-        }
-
-        editor.register_addon(VimAddon {
-            entity: vim.clone(),
-        });
-
-        vim.update(cx, |_, cx| {
-            Vim::action(editor, cx, |vim, _: &SwitchToNormalMode, window, cx| {
-                vim.switch_mode(Mode::Normal, false, window, cx)
-            });
-
-            Vim::action(editor, cx, |vim, _: &SwitchToInsertMode, window, cx| {
-                vim.switch_mode(Mode::Insert, false, window, cx)
-            });
-
-            Vim::action(editor, cx, |vim, _: &SwitchToReplaceMode, window, cx| {
-                vim.switch_mode(Mode::Replace, false, window, cx)
-            });
-
-            Vim::action(editor, cx, |vim, _: &SwitchToVisualMode, window, cx| {
-                vim.switch_mode(Mode::Visual, false, window, cx)
-            });
-
-            Vim::action(editor, cx, |vim, _: &SwitchToVisualLineMode, window, cx| {
-                vim.switch_mode(Mode::VisualLine, false, window, cx)
-            });
-
-            Vim::action(
-                editor,
-                cx,
-                |vim, _: &SwitchToVisualBlockMode, window, cx| {
-                    vim.switch_mode(Mode::VisualBlock, false, window, cx)
-                },
-            );
-
-            Vim::action(
-                editor,
-                cx,
-                |vim, _: &SwitchToHelixNormalMode, window, cx| {
-                    vim.switch_mode(Mode::HelixNormal, true, window, cx)
-                },
-            );
-            Vim::action(editor, cx, |_, _: &PushForcedMotion, _, cx| {
-                Vim::globals(cx).forced_motion = true;
-            });
-            Vim::action(editor, cx, |vim, action: &PushObject, window, cx| {
-                vim.push_operator(
-                    Operator::Object {
-                        around: action.around,
-                    },
-                    window,
-                    cx,
-                )
-            });
-
-            Vim::action(editor, cx, |vim, action: &PushFindForward, window, cx| {
-                vim.push_operator(
-                    Operator::FindForward {
-                        before: action.before,
-                        multiline: action.multiline,
-                    },
-                    window,
-                    cx,
-                )
-            });
-
-            Vim::action(editor, cx, |vim, action: &PushFindBackward, window, cx| {
-                vim.push_operator(
-                    Operator::FindBackward {
-                        after: action.after,
-                        multiline: action.multiline,
-                    },
-                    window,
-                    cx,
-                )
-            });
-
-            Vim::action(editor, cx, |vim, action: &PushSneak, window, cx| {
-                vim.push_operator(
-                    Operator::Sneak {
-                        first_char: action.first_char,
-                    },
-                    window,
-                    cx,
-                )
-            });
-
-            Vim::action(editor, cx, |vim, action: &PushSneakBackward, window, cx| {
-                vim.push_operator(
-                    Operator::SneakBackward {
-                        first_char: action.first_char,
-                    },
-                    window,
-                    cx,
-                )
-            });
-
-            Vim::action(editor, cx, |vim, _: &PushAddSurrounds, window, cx| {
-                vim.push_operator(Operator::AddSurrounds { target: None }, window, cx)
-            });
-
-            Vim::action(
-                editor,
-                cx,
-                |vim, action: &PushChangeSurrounds, window, cx| {
-                    vim.push_operator(
-                        Operator::ChangeSurrounds {
-                            target: action.target,
-                            opening: false,
-                        },
-                        window,
-                        cx,
-                    )
-                },
-            );
-
-            Vim::action(editor, cx, |vim, action: &PushJump, window, cx| {
-                vim.push_operator(Operator::Jump { line: action.line }, window, cx)
-            });
-
-            Vim::action(editor, cx, |vim, action: &PushDigraph, window, cx| {
-                vim.push_operator(
-                    Operator::Digraph {
-                        first_char: action.first_char,
-                    },
-                    window,
-                    cx,
-                )
-            });
-
-            Vim::action(editor, cx, |vim, action: &PushLiteral, window, cx| {
-                vim.push_operator(
-                    Operator::Literal {
-                        prefix: action.prefix.clone(),
-                    },
-                    window,
-                    cx,
-                )
-            });
-
-            Vim::action(editor, cx, |vim, _: &PushChange, window, cx| {
-                vim.push_operator(Operator::Change, window, cx)
-            });
-
-            Vim::action(editor, cx, |vim, _: &PushDelete, window, cx| {
-                vim.push_operator(Operator::Delete, window, cx)
-            });
-
-            Vim::action(editor, cx, |vim, _: &PushYank, window, cx| {
-                vim.push_operator(Operator::Yank, window, cx)
-            });
-
-            Vim::action(editor, cx, |vim, _: &PushReplace, window, cx| {
-                vim.push_operator(Operator::Replace, window, cx)
-            });
-
-            Vim::action(editor, cx, |vim, _: &PushDeleteSurrounds, window, cx| {
-                vim.push_operator(Operator::DeleteSurrounds, window, cx)
-            });
-
-            Vim::action(editor, cx, |vim, _: &PushMark, window, cx| {
-                vim.push_operator(Operator::Mark, window, cx)
-            });
-
-            Vim::action(editor, cx, |vim, _: &PushIndent, window, cx| {
-                vim.push_operator(Operator::Indent, window, cx)
-            });
-
-            Vim::action(editor, cx, |vim, _: &PushOutdent, window, cx| {
-                vim.push_operator(Operator::Outdent, window, cx)
-            });
-
-            Vim::action(editor, cx, |vim, _: &PushAutoIndent, window, cx| {
-                vim.push_operator(Operator::AutoIndent, window, cx)
-            });
-
-            Vim::action(editor, cx, |vim, _: &PushRewrap, window, cx| {
-                vim.push_operator(Operator::Rewrap, window, cx)
-            });
-
-            Vim::action(editor, cx, |vim, _: &PushShellCommand, window, cx| {
-                vim.push_operator(Operator::ShellCommand, window, cx)
-            });
-
-            Vim::action(editor, cx, |vim, _: &PushLowercase, window, cx| {
-                vim.push_operator(Operator::Lowercase, window, cx)
-            });
-
-            Vim::action(editor, cx, |vim, _: &PushUppercase, window, cx| {
-                vim.push_operator(Operator::Uppercase, window, cx)
-            });
-
-            Vim::action(editor, cx, |vim, _: &PushOppositeCase, window, cx| {
-                vim.push_operator(Operator::OppositeCase, window, cx)
-            });
-
-            Vim::action(editor, cx, |vim, _: &PushRot13, window, cx| {
-                vim.push_operator(Operator::Rot13, window, cx)
-            });
-
-            Vim::action(editor, cx, |vim, _: &PushRot47, window, cx| {
-                vim.push_operator(Operator::Rot47, window, cx)
-            });
-
-            Vim::action(editor, cx, |vim, _: &PushRegister, window, cx| {
-                vim.push_operator(Operator::Register, window, cx)
-            });
-
-            Vim::action(editor, cx, |vim, _: &PushRecordRegister, window, cx| {
-                vim.push_operator(Operator::RecordRegister, window, cx)
-            });
-
-            Vim::action(editor, cx, |vim, _: &PushReplayRegister, window, cx| {
-                vim.push_operator(Operator::ReplayRegister, window, cx)
-            });
-
-            Vim::action(
-                editor,
-                cx,
-                |vim, _: &PushReplaceWithRegister, window, cx| {
-                    vim.push_operator(Operator::ReplaceWithRegister, window, cx)
-                },
-            );
-
-            Vim::action(editor, cx, |vim, _: &Exchange, window, cx| {
-                if vim.mode.is_visual() {
-                    vim.exchange_visual(window, cx)
-                } else {
-                    vim.push_operator(Operator::Exchange, window, cx)
-                }
-            });
-
-            Vim::action(editor, cx, |vim, _: &ClearExchange, window, cx| {
-                vim.clear_exchange(window, cx)
-            });
-
-            Vim::action(editor, cx, |vim, _: &PushToggleComments, window, cx| {
-                vim.push_operator(Operator::ToggleComments, window, cx)
-            });
-
-            Vim::action(editor, cx, |vim, _: &ClearOperators, window, cx| {
-                vim.clear_operator(window, cx)
-            });
-            Vim::action(editor, cx, |vim, n: &Number, window, cx| {
-                vim.push_count_digit(n.0, window, cx);
-            });
-            Vim::action(editor, cx, |vim, _: &Tab, window, cx| {
-                vim.input_ignored(" ".into(), window, cx)
-            });
-            Vim::action(
-                editor,
-                cx,
-                |vim, action: &editor::actions::AcceptEditPrediction, window, cx| {
-                    vim.update_editor(cx, |_, editor, cx| {
-                        editor.accept_edit_prediction(action, window, cx);
-                    });
-                    // In non-insertion modes, predictions will be hidden and instead a jump will be
-                    // displayed (and performed by `accept_edit_prediction`). This switches to
-                    // insert mode so that the prediction is displayed after the jump.
-                    match vim.mode {
-                        Mode::Replace => {}
-                        _ => vim.switch_mode(Mode::Insert, true, window, cx),
-                    };
-                },
-            );
-            Vim::action(editor, cx, |vim, _: &Enter, window, cx| {
-                vim.input_ignored("\n".into(), window, cx)
-            });
-            Vim::action(editor, cx, |vim, _: &PushHelixMatch, window, cx| {
-                vim.push_operator(Operator::HelixMatch, window, cx)
-            });
-            Vim::action(editor, cx, |vim, action: &PushHelixNext, window, cx| {
-                vim.push_operator(
-                    Operator::HelixNext {
-                        around: action.around,
-                    },
-                    window,
-                    cx,
-                );
-            });
-            Vim::action(editor, cx, |vim, action: &PushHelixPrevious, window, cx| {
-                vim.push_operator(
-                    Operator::HelixPrevious {
-                        around: action.around,
-                    },
-                    window,
-                    cx,
-                );
-            });
-
-            Vim::action(
-                editor,
-                cx,
-                |vim, _: &editor::actions::Paste, window, cx| match vim.mode {
-                    Mode::Replace => vim.paste_replace(window, cx),
-                    Mode::Visual | Mode::VisualLine | Mode::VisualBlock => {
-                        vim.selected_register.replace('+');
-                        vim.paste(&VimPaste::default(), window, cx);
-                    }
-                    _ => {
-                        vim.update_editor(cx, |_, editor, cx| editor.paste(&Paste, window, cx));
-                    }
-                },
-            );
-
-            normal::register(editor, cx);
-            insert::register(editor, cx);
-            helix::register(editor, cx);
-            motion::register(editor, cx);
-            command::register(editor, cx);
-            replace::register(editor, cx);
-            indent::register(editor, cx);
-            rewrap::register(editor, cx);
-            object::register(editor, cx);
-            visual::register(editor, cx);
-            change_list::register(editor, cx);
-            digraph::register(editor, cx);
-
-            if editor.is_focused(window) {
-                cx.defer_in(window, |vim, window, cx| {
-                    vim.focused(false, window, cx);
-                })
-            }
-        })
-    }
-
-    fn deactivate(editor: &mut Editor, cx: &mut Context<Editor>) {
-        editor.set_cursor_shape(
-            EditorSettings::get_global(cx)
-                .cursor_shape
-                .unwrap_or_default(),
-            cx,
-        );
-        editor.set_clip_at_line_ends(false, cx);
-        editor.set_collapse_matches(false);
-        editor.set_input_enabled(true);
-        editor.set_autoindent(true);
-        editor.selections.set_line_mode(false);
-        editor.unregister_addon::<VimAddon>();
-        editor.set_relative_line_number(None, cx);
-        if let Some(vim) = Vim::globals(cx).focused_vim()
-            && vim.entity_id() == cx.entity().entity_id()
-        {
-            Vim::globals(cx).focused_vim = None;
-        }
-    }
-
-    /// Register an action on the editor.
-    pub fn action<A: Action>(
-        editor: &mut Editor,
-        cx: &mut Context<Vim>,
-        f: impl Fn(&mut Vim, &A, &mut Window, &mut Context<Vim>) + 'static,
-    ) {
-        let subscription = editor.register_action(cx.listener(f));
-        cx.on_release(|_, _| drop(subscription)).detach();
-    }
-
-    pub fn editor(&self) -> Option<Entity<Editor>> {
-        self.editor.upgrade()
-    }
-
-    pub fn workspace(&self, window: &mut Window) -> Option<Entity<Workspace>> {
-        window.root::<Workspace>().flatten()
-    }
-
-    pub fn pane(&self, window: &mut Window, cx: &mut Context<Self>) -> Option<Entity<Pane>> {
-        self.workspace(window)
-            .map(|workspace| workspace.read(cx).focused_pane(window, cx))
-    }
-
-    pub fn enabled(cx: &mut App) -> bool {
-        VimModeSetting::get_global(cx).0 || HelixModeSetting::get_global(cx).0
-    }
-
-    /// Called whenever an keystroke is typed so vim can observe all actions
-    /// and keystrokes accordingly.
-    fn observe_keystrokes(
-        &mut self,
-        keystroke_event: &KeystrokeEvent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.exit_temporary_mode {
-            self.exit_temporary_mode = false;
-            // Don't switch to insert mode if the action is temporary_normal.
-            if let Some(action) = keystroke_event.action.as_ref()
-                && action.as_any().downcast_ref::<TemporaryNormal>().is_some()
-            {
-                return;
-            }
-            self.switch_mode(Mode::Insert, false, window, cx)
-        }
-        if let Some(action) = keystroke_event.action.as_ref() {
-            // Keystroke is handled by the vim system, so continue forward
-            if action.name().starts_with("vim::") {
-                self.update_editor(cx, |_, editor, cx| {
-                    editor.hide_mouse_cursor(HideMouseCursorOrigin::MovementAction, cx)
-                });
-
-                return;
-            }
-        } else if window.has_pending_keystrokes() || keystroke_event.keystroke.is_ime_in_progress()
-        {
-            return;
-        }
-
-        if let Some(operator) = self.active_operator() {
-            match operator {
-                Operator::Literal { prefix } => {
-                    self.handle_literal_keystroke(
-                        keystroke_event,
-                        prefix.unwrap_or_default(),
-                        window,
-                        cx,
-                    );
-                }
-                _ if !operator.is_waiting(self.mode) => {
-                    self.clear_operator(window, cx);
-                    self.stop_recording_immediately(Box::new(ClearOperators), cx)
-                }
-                _ => {}
-            }
-        }
-    }
-
-    fn handle_editor_event(
-        &mut self,
-        event: &EditorEvent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            EditorEvent::Focused => self.focused(true, window, cx),
-            EditorEvent::Blurred => self.blurred(window, cx),
-            EditorEvent::SelectionsChanged { local: true } => {
-                self.local_selections_changed(window, cx);
-            }
-            EditorEvent::InputIgnored { text } => {
-                self.input_ignored(text.clone(), window, cx);
-                Vim::globals(cx).observe_insertion(text, None)
-            }
-            EditorEvent::InputHandled {
-                text,
-                utf16_range_to_replace: range_to_replace,
-            } => Vim::globals(cx).observe_insertion(text, range_to_replace.clone()),
-            EditorEvent::TransactionBegun { transaction_id } => {
-                self.transaction_begun(*transaction_id, window, cx)
-            }
-            EditorEvent::TransactionUndone { transaction_id } => {
-                self.transaction_undone(transaction_id, window, cx)
-            }
-            EditorEvent::Edited { .. } => self.push_to_change_list(window, cx),
-            EditorEvent::FocusedIn => self.sync_vim_settings(window, cx),
-            EditorEvent::CursorShapeChanged => self.cursor_shape_changed(window, cx),
-            EditorEvent::PushedToNavHistory {
-                anchor,
-                is_deactivate,
-            } => {
-                self.update_editor(cx, |vim, editor, cx| {
-                    let mark = if *is_deactivate {
-                        "\"".to_string()
-                    } else {
-                        "'".to_string()
-                    };
-                    vim.set_mark(mark, vec![*anchor], editor.buffer(), window, cx);
-                });
-            }
-            _ => {}
-        }
-    }
-
-    fn push_operator(&mut self, operator: Operator, window: &mut Window, cx: &mut Context<Self>) {
-        if operator.starts_dot_recording() {
-            self.start_recording(cx);
-        }
-        // Since these operations can only be entered with pre-operators,
-        // we need to clear the previous operators when pushing,
-        // so that the current stack is the most correct
-        if matches!(
-            operator,
-            Operator::AddSurrounds { .. }
-                | Operator::ChangeSurrounds { .. }
-                | Operator::DeleteSurrounds
-                | Operator::Exchange
-        ) {
-            self.operator_stack.clear();
-        };
-        self.operator_stack.push(operator);
-        self.sync_vim_settings(window, cx);
-    }
-
-    pub fn switch_mode(
-        &mut self,
-        mode: Mode,
-        leave_selections: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.temp_mode && mode == Mode::Normal {
-            self.temp_mode = false;
-            self.switch_mode(Mode::Normal, leave_selections, window, cx);
-            self.switch_mode(Mode::Insert, false, window, cx);
-            return;
-        } else if self.temp_mode
-            && !matches!(mode, Mode::Visual | Mode::VisualLine | Mode::VisualBlock)
-        {
-            self.temp_mode = false;
-        }
-
-        let last_mode = self.mode;
-        let prior_mode = self.last_mode;
-        let prior_tx = self.current_tx;
-        self.status_label.take();
-        self.last_mode = last_mode;
-        self.mode = mode;
-        self.operator_stack.clear();
-        self.selected_register.take();
-        self.cancel_running_command(window, cx);
-        if mode == Mode::Normal || mode != last_mode {
-            self.current_tx.take();
-            self.current_anchor.take();
-            self.update_editor(cx, |_, editor, _| {
-                editor.clear_selection_drag_state();
-            });
-        }
-        Vim::take_forced_motion(cx);
-        if mode != Mode::Insert && mode != Mode::Replace {
-            Vim::take_count(cx);
-        }
-
-        // Sync editor settings like clip mode
-        self.sync_vim_settings(window, cx);
-
-        if VimSettings::get_global(cx).toggle_relative_line_numbers
-            && self.mode != self.last_mode
-            && (self.mode == Mode::Insert || self.last_mode == Mode::Insert)
-        {
-            self.update_editor(cx, |vim, editor, cx| {
-                let is_relative = vim.mode != Mode::Insert;
-                editor.set_relative_line_number(Some(is_relative), cx)
-            });
-        }
-        if HelixModeSetting::get_global(cx).0 {
-            if self.mode == Mode::Normal {
-                self.mode = Mode::HelixNormal
-            } else if self.mode == Mode::Visual {
-                self.mode = Mode::HelixSelect
-            }
-        }
-
-        if leave_selections {
-            return;
-        }
-
-        if !mode.is_visual() && last_mode.is_visual() {
-            self.create_visual_marks(last_mode, window, cx);
-        }
-
-        // Adjust selections
-        self.update_editor(cx, |vim, editor, cx| {
-            if last_mode != Mode::VisualBlock && last_mode.is_visual() && mode == Mode::VisualBlock
-            {
-                vim.visual_block_motion(true, editor, window, cx, |_, point, goal| {
-                    Some((point, goal))
-                })
-            }
-            if (last_mode == Mode::Insert || last_mode == Mode::Replace)
-                && let Some(prior_tx) = prior_tx
-            {
-                editor.group_until_transaction(prior_tx, cx)
-            }
-
-            editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                // we cheat with visual block mode and use multiple cursors.
-                // the cost of this cheat is we need to convert back to a single
-                // cursor whenever vim would.
-                if last_mode == Mode::VisualBlock
-                    && (mode != Mode::VisualBlock && mode != Mode::Insert)
-                {
-                    let tail = s.oldest_anchor().tail();
-                    let head = s.newest_anchor().head();
-                    s.select_anchor_ranges(vec![tail..head]);
-                } else if last_mode == Mode::Insert
-                    && prior_mode == Mode::VisualBlock
-                    && mode != Mode::VisualBlock
-                {
-                    let pos = s.first_anchor().head();
-                    s.select_anchor_ranges(vec![pos..pos])
-                }
-
-                let snapshot = s.display_snapshot();
-                if let Some(pending) = s.pending_anchor_mut()
-                    && pending.reversed
-                    && mode.is_visual()
-                    && !last_mode.is_visual()
-                {
-                    let mut end = pending.end.to_point(&snapshot.buffer_snapshot());
-                    end = snapshot
-                        .buffer_snapshot()
-                        .clip_point(end + Point::new(0, 1), Bias::Right);
-                    pending.end = snapshot.buffer_snapshot().anchor_before(end);
-                }
-
-                s.move_with(|map, selection| {
-                    if last_mode.is_visual() && !mode.is_visual() {
-                        let mut point = selection.head();
-                        if !selection.reversed && !selection.is_empty() {
-                            point = movement::left(map, selection.head());
-                        } else if selection.is_empty() {
-                            point = map.clip_point(point, Bias::Left);
-                        }
-                        selection.collapse_to(point, selection.goal)
-                    } else if !last_mode.is_visual() && mode.is_visual() && selection.is_empty() {
-                        selection.end = movement::right(map, selection.start);
-                    }
-                });
-            })
-        });
-    }
-
-    pub fn take_count(cx: &mut App) -> Option<usize> {
-        let global_state = cx.global_mut::<VimGlobals>();
-        if global_state.dot_replaying {
-            return global_state.recorded_count;
-        }
-
-        let count = if global_state.post_count.is_none() && global_state.pre_count.is_none() {
-            return None;
-        } else {
-            Some(
-                global_state.post_count.take().unwrap_or(1)
-                    * global_state.pre_count.take().unwrap_or(1),
-            )
-        };
-
-        if global_state.dot_recording {
-            global_state.recording_count = count;
-        }
-        count
-    }
-
-    pub fn take_forced_motion(cx: &mut App) -> bool {
-        let global_state = cx.global_mut::<VimGlobals>();
-        let forced_motion = global_state.forced_motion;
-        global_state.forced_motion = false;
-        forced_motion
-    }
-
-    pub fn cursor_shape(&self, cx: &mut App) -> CursorShape {
-        let cursor_shape = VimSettings::get_global(cx).cursor_shape;
-        match self.mode {
-            Mode::Normal => {
-                if let Some(operator) = self.operator_stack.last() {
-                    match operator {
-                        // Navigation operators -> Block cursor
-                        Operator::FindForward { .. }
-                        | Operator::FindBackward { .. }
-                        | Operator::Mark
-                        | Operator::Jump { .. }
-                        | Operator::Register
-                        | Operator::RecordRegister
-                        | Operator::ReplayRegister => CursorShape::Block,
-
-                        // All other operators -> Underline cursor
-                        _ => CursorShape::Underline,
-                    }
-                } else {
-                    cursor_shape.normal.unwrap_or(CursorShape::Block)
-                }
-            }
-            Mode::HelixNormal => cursor_shape.normal.unwrap_or(CursorShape::Block),
-            Mode::Replace => cursor_shape.replace.unwrap_or(CursorShape::Underline),
-            Mode::Visual | Mode::VisualLine | Mode::VisualBlock | Mode::HelixSelect => {
-                cursor_shape.visual.unwrap_or(CursorShape::Block)
-            }
-            Mode::Insert => cursor_shape.insert.unwrap_or({
-                let editor_settings = EditorSettings::get_global(cx);
-                editor_settings.cursor_shape.unwrap_or_default()
-            }),
-        }
-    }
-
-    pub fn editor_input_enabled(&self) -> bool {
-        match self.mode {
-            Mode::Insert => {
-                if let Some(operator) = self.operator_stack.last() {
-                    !operator.is_waiting(self.mode)
-                } else {
-                    true
-                }
-            }
-            Mode::Normal
-            | Mode::HelixNormal
-            | Mode::Replace
-            | Mode::Visual
-            | Mode::VisualLine
-            | Mode::VisualBlock
-            | Mode::HelixSelect => false,
-        }
-    }
-
-    pub fn should_autoindent(&self) -> bool {
-        !(self.mode == Mode::Insert && self.last_mode == Mode::VisualBlock)
-    }
-
-    pub fn clip_at_line_ends(&self) -> bool {
-        match self.mode {
-            Mode::Insert
-            | Mode::Visual
-            | Mode::VisualLine
-            | Mode::VisualBlock
-            | Mode::Replace
-            | Mode::HelixNormal
-            | Mode::HelixSelect => false,
-            Mode::Normal => true,
-        }
-    }
-
-    pub fn extend_key_context(&self, context: &mut KeyContext, cx: &App) {
-        let mut mode = match self.mode {
-            Mode::Normal => "normal",
-            Mode::Visual | Mode::VisualLine | Mode::VisualBlock => "visual",
-            Mode::Insert => "insert",
-            Mode::Replace => "replace",
-            Mode::HelixNormal => "helix_normal",
-            Mode::HelixSelect => "helix_select",
-        }
-        .to_string();
-
-        let mut operator_id = "none";
-
-        let active_operator = self.active_operator();
-        if active_operator.is_none() && cx.global::<VimGlobals>().pre_count.is_some()
-            || active_operator.is_some() && cx.global::<VimGlobals>().post_count.is_some()
-        {
-            context.add("VimCount");
-        }
-
-        if let Some(active_operator) = active_operator {
-            if active_operator.is_waiting(self.mode) {
-                if matches!(active_operator, Operator::Literal { .. }) {
-                    mode = "literal".to_string();
-                } else {
-                    mode = "waiting".to_string();
-                }
-            } else {
-                operator_id = active_operator.id();
-                mode = "operator".to_string();
-            }
-        }
-
-        if mode == "normal"
-            || mode == "visual"
-            || mode == "operator"
-            || mode == "helix_normal"
-            || mode == "helix_select"
-        {
-            context.add("VimControl");
-        }
-        context.set("vim_mode", mode);
-        context.set("vim_operator", operator_id);
-    }
-
-    fn focused(&mut self, preserve_selection: bool, window: &mut Window, cx: &mut Context<Self>) {
-        let Some(editor) = self.editor() else {
-            return;
-        };
-        let newest_selection_empty = editor.update(cx, |editor, cx| {
-            editor
-                .selections
-                .newest::<MultiBufferOffset>(&editor.display_snapshot(cx))
-                .is_empty()
-        });
-        let editor = editor.read(cx);
-        let editor_mode = editor.mode();
-
-        if editor_mode.is_full()
-            && !newest_selection_empty
-            && self.mode == Mode::Normal
-            // When following someone, don't switch vim mode.
-            && editor.leader_id().is_none()
-        {
-            if preserve_selection {
-                self.switch_mode(Mode::Visual, true, window, cx);
-            } else {
-                self.update_editor(cx, |_, editor, cx| {
-                    editor.set_clip_at_line_ends(false, cx);
-                    editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                        s.move_with(|_, selection| {
-                            selection.collapse_to(selection.start, selection.goal)
-                        })
-                    });
-                });
-            }
-        }
-
-        cx.emit(VimEvent::Focused);
-        self.sync_vim_settings(window, cx);
-
-        if VimSettings::get_global(cx).toggle_relative_line_numbers {
-            if let Some(old_vim) = Vim::globals(cx).focused_vim() {
-                if old_vim.entity_id() != cx.entity().entity_id() {
-                    old_vim.update(cx, |vim, cx| {
-                        vim.update_editor(cx, |_, editor, cx| {
-                            editor.set_relative_line_number(None, cx)
-                        });
-                    });
-
-                    self.update_editor(cx, |vim, editor, cx| {
-                        let is_relative = vim.mode != Mode::Insert;
-                        editor.set_relative_line_number(Some(is_relative), cx)
-                    });
-                }
-            } else {
-                self.update_editor(cx, |vim, editor, cx| {
-                    let is_relative = vim.mode != Mode::Insert;
-                    editor.set_relative_line_number(Some(is_relative), cx)
-                });
-            }
-        }
-        Vim::globals(cx).focused_vim = Some(cx.entity().downgrade());
-    }
-
-    fn blurred(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.stop_recording_immediately(NormalBefore.boxed_clone(), cx);
-        self.store_visual_marks(window, cx);
-        self.clear_operator(window, cx);
-        self.update_editor(cx, |vim, editor, cx| {
-            if vim.cursor_shape(cx) == CursorShape::Block {
-                editor.set_cursor_shape(CursorShape::Hollow, cx);
-            }
-        });
-    }
-
-    fn cursor_shape_changed(&mut self, _: &mut Window, cx: &mut Context<Self>) {
-        self.update_editor(cx, |vim, editor, cx| {
-            editor.set_cursor_shape(vim.cursor_shape(cx), cx);
-        });
-    }
-
-    fn update_editor<S>(
-        &mut self,
-        cx: &mut Context<Self>,
-        update: impl FnOnce(&mut Self, &mut Editor, &mut Context<Editor>) -> S,
-    ) -> Option<S> {
-        let editor = self.editor.upgrade()?;
-        Some(editor.update(cx, |editor, cx| update(self, editor, cx)))
-    }
-
-    fn editor_selections(&mut self, _: &mut Window, cx: &mut Context<Self>) -> Vec<Range<Anchor>> {
-        self.update_editor(cx, |_, editor, _| {
-            editor
-                .selections
-                .disjoint_anchors_arc()
-                .iter()
-                .map(|selection| selection.tail()..selection.head())
-                .collect()
-        })
-        .unwrap_or_default()
-    }
-
-    fn editor_cursor_word(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<String> {
-        self.update_editor(cx, |_, editor, cx| {
-            let snapshot = &editor.snapshot(window, cx);
-            let selection = editor
-                .selections
-                .newest::<MultiBufferOffset>(&snapshot.display_snapshot);
-
-            let snapshot = snapshot.buffer_snapshot();
-            let (range, kind) =
-                snapshot.surrounding_word(selection.start, Some(CharScopeContext::Completion));
-            if kind == Some(CharKind::Word) {
-                let text: String = snapshot.text_for_range(range).collect();
-                if !text.trim().is_empty() {
-                    return Some(text);
-                }
-            }
-
-            None
-        })
-        .unwrap_or_default()
-    }
-
-    /// When doing an action that modifies the buffer, we start recording so that `.`
-    /// will replay the action.
-    pub fn start_recording(&mut self, cx: &mut Context<Self>) {
-        Vim::update_globals(cx, |globals, cx| {
-            if !globals.dot_replaying {
-                globals.dot_recording = true;
-                globals.recording_actions = Default::default();
-                globals.recording_count = None;
-
-                let selections = self.editor().map(|editor| {
-                    editor.update(cx, |editor, cx| {
-                        let snapshot = editor.display_snapshot(cx);
-
-                        (
-                            editor.selections.oldest::<Point>(&snapshot),
-                            editor.selections.newest::<Point>(&snapshot),
-                        )
-                    })
-                });
-
-                if let Some((oldest, newest)) = selections {
-                    globals.recorded_selection = match self.mode {
-                        Mode::Visual if newest.end.row == newest.start.row => {
-                            RecordedSelection::SingleLine {
-                                cols: newest.end.column - newest.start.column,
-                            }
-                        }
-                        Mode::Visual => RecordedSelection::Visual {
-                            rows: newest.end.row - newest.start.row,
-                            cols: newest.end.column,
-                        },
-                        Mode::VisualLine => RecordedSelection::VisualLine {
-                            rows: newest.end.row - newest.start.row,
-                        },
-                        Mode::VisualBlock => RecordedSelection::VisualBlock {
-                            rows: newest.end.row.abs_diff(oldest.start.row),
-                            cols: newest.end.column.abs_diff(oldest.start.column),
-                        },
-                        _ => RecordedSelection::None,
-                    }
-                } else {
-                    globals.recorded_selection = RecordedSelection::None;
-                }
-            }
-        })
-    }
-
-    pub fn stop_replaying(&mut self, cx: &mut Context<Self>) {
-        let globals = Vim::globals(cx);
-        globals.dot_replaying = false;
-        if let Some(replayer) = globals.replayer.take() {
-            replayer.stop();
-        }
-    }
-
-    /// When finishing an action that modifies the buffer, stop recording.
-    /// as you usually call this within a keystroke handler we also ensure that
-    /// the current action is recorded.
-    pub fn stop_recording(&mut self, cx: &mut Context<Self>) {
-        let globals = Vim::globals(cx);
-        if globals.dot_recording {
-            globals.stop_recording_after_next_action = true;
-        }
-        self.exit_temporary_mode = self.temp_mode;
-    }
-
-    /// Stops recording actions immediately rather than waiting until after the
-    /// next action to stop recording.
-    ///
-    /// This doesn't include the current action.
-    pub fn stop_recording_immediately(&mut self, action: Box<dyn Action>, cx: &mut Context<Self>) {
-        let globals = Vim::globals(cx);
-        if globals.dot_recording {
-            globals
-                .recording_actions
-                .push(ReplayableAction::Action(action.boxed_clone()));
-            globals.recorded_actions = mem::take(&mut globals.recording_actions);
-            globals.recorded_count = globals.recording_count.take();
-            globals.dot_recording = false;
-            globals.stop_recording_after_next_action = false;
-        }
-        self.exit_temporary_mode = self.temp_mode;
-    }
-
-    /// Explicitly record one action (equivalents to start_recording and stop_recording)
-    pub fn record_current_action(&mut self, cx: &mut Context<Self>) {
-        self.start_recording(cx);
-        self.stop_recording(cx);
-    }
-
-    fn push_count_digit(&mut self, number: usize, window: &mut Window, cx: &mut Context<Self>) {
-        if self.active_operator().is_some() {
-            let post_count = Vim::globals(cx).post_count.unwrap_or(0);
-
-            Vim::globals(cx).post_count = Some(
-                post_count
-                    .checked_mul(10)
-                    .and_then(|post_count| post_count.checked_add(number))
-                    .filter(|post_count| *post_count < isize::MAX as usize)
-                    .unwrap_or(post_count),
-            )
-        } else {
-            let pre_count = Vim::globals(cx).pre_count.unwrap_or(0);
-
-            Vim::globals(cx).pre_count = Some(
-                pre_count
-                    .checked_mul(10)
-                    .and_then(|pre_count| pre_count.checked_add(number))
-                    .filter(|pre_count| *pre_count < isize::MAX as usize)
-                    .unwrap_or(pre_count),
-            )
-        }
-        // update the keymap so that 0 works
-        self.sync_vim_settings(window, cx)
-    }
-
-    fn select_register(&mut self, register: Arc<str>, window: &mut Window, cx: &mut Context<Self>) {
-        if register.chars().count() == 1 {
-            self.selected_register
-                .replace(register.chars().next().unwrap());
-        }
-        self.operator_stack.clear();
-        self.sync_vim_settings(window, cx);
-    }
-
-    fn maybe_pop_operator(&mut self) -> Option<Operator> {
-        self.operator_stack.pop()
-    }
-
-    fn pop_operator(&mut self, window: &mut Window, cx: &mut Context<Self>) -> Operator {
-        let popped_operator = self.operator_stack.pop()
-            .expect("Operator popped when no operator was on the stack. This likely means there is an invalid keymap config");
-        self.sync_vim_settings(window, cx);
-        popped_operator
-    }
-
-    fn clear_operator(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        Vim::take_count(cx);
-        Vim::take_forced_motion(cx);
-        self.selected_register.take();
-        self.operator_stack.clear();
-        self.sync_vim_settings(window, cx);
-    }
-
-    fn active_operator(&self) -> Option<Operator> {
-        self.operator_stack.last().cloned()
-    }
-
-    fn transaction_begun(
-        &mut self,
-        transaction_id: TransactionId,
-        _window: &mut Window,
-        _: &mut Context<Self>,
-    ) {
-        let mode = if (self.mode == Mode::Insert
-            || self.mode == Mode::Replace
-            || self.mode == Mode::Normal)
-            && self.current_tx.is_none()
-        {
-            self.current_tx = Some(transaction_id);
-            self.last_mode
-        } else {
-            self.mode
-        };
-        if mode == Mode::VisualLine || mode == Mode::VisualBlock {
-            self.undo_modes.insert(transaction_id, mode);
-        }
-    }
-
-    fn transaction_undone(
-        &mut self,
-        transaction_id: &TransactionId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        match self.mode {
-            Mode::VisualLine | Mode::VisualBlock | Mode::Visual | Mode::HelixSelect => {
-                self.update_editor(cx, |vim, editor, cx| {
-                    let original_mode = vim.undo_modes.get(transaction_id);
-                    editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                        match original_mode {
-                            Some(Mode::VisualLine) => {
-                                s.move_with(|map, selection| {
-                                    selection.collapse_to(
-                                        map.prev_line_boundary(selection.start.to_point(map)).1,
-                                        SelectionGoal::None,
-                                    )
-                                });
-                            }
-                            Some(Mode::VisualBlock) => {
-                                let mut first = s.first_anchor();
-                                first.collapse_to(first.start, first.goal);
-                                s.select_anchors(vec![first]);
-                            }
-                            _ => {
-                                s.move_with(|map, selection| {
-                                    selection.collapse_to(
-                                        map.clip_at_line_end(selection.start),
-                                        selection.goal,
-                                    );
-                                });
-                            }
-                        }
-                    });
-                });
-                self.switch_mode(Mode::Normal, true, window, cx)
-            }
-            Mode::Normal => {
-                self.update_editor(cx, |_, editor, cx| {
-                    editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                        s.move_with(|map, selection| {
-                            selection
-                                .collapse_to(map.clip_at_line_end(selection.end), selection.goal)
-                        })
-                    })
-                });
-            }
-            Mode::Insert | Mode::Replace | Mode::HelixNormal => {}
-        }
-    }
-
-    fn local_selections_changed(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let Some(editor) = self.editor() else { return };
-
-        if editor.read(cx).leader_id().is_some() {
-            return;
-        }
-
-        let newest = editor.read(cx).selections.newest_anchor().clone();
-        let is_multicursor = editor.read(cx).selections.count() > 1;
-        if self.mode == Mode::Insert && self.current_tx.is_some() {
-            if self.current_anchor.is_none() {
-                self.current_anchor = Some(newest);
-            } else if self.current_anchor.as_ref().unwrap() != &newest
-                && let Some(tx_id) = self.current_tx.take()
-            {
-                self.update_editor(cx, |_, editor, cx| {
-                    editor.group_until_transaction(tx_id, cx)
-                });
-            }
-        } else if self.mode == Mode::Normal && newest.start != newest.end {
-            if matches!(newest.goal, SelectionGoal::HorizontalRange { .. }) {
-                self.switch_mode(Mode::VisualBlock, false, window, cx);
-            } else {
-                self.switch_mode(Mode::Visual, false, window, cx)
-            }
-        } else if newest.start == newest.end
-            && !is_multicursor
-            && [Mode::Visual, Mode::VisualLine, Mode::VisualBlock].contains(&self.mode)
-        {
-            self.switch_mode(Mode::Normal, false, window, cx);
-        }
-    }
-
-    fn input_ignored(&mut self, text: Arc<str>, window: &mut Window, cx: &mut Context<Self>) {
-        if text.is_empty() {
-            return;
-        }
-
-        match self.active_operator() {
-            Some(Operator::FindForward { before, multiline }) => {
-                let find = Motion::FindForward {
-                    before,
-                    char: text.chars().next().unwrap(),
-                    mode: if multiline {
-                        FindRange::MultiLine
-                    } else {
-                        FindRange::SingleLine
-                    },
-                    smartcase: VimSettings::get_global(cx).use_smartcase_find,
-                };
-                Vim::globals(cx).last_find = Some(find.clone());
-                self.motion(find, window, cx)
-            }
-            Some(Operator::FindBackward { after, multiline }) => {
-                let find = Motion::FindBackward {
-                    after,
-                    char: text.chars().next().unwrap(),
-                    mode: if multiline {
-                        FindRange::MultiLine
-                    } else {
-                        FindRange::SingleLine
-                    },
-                    smartcase: VimSettings::get_global(cx).use_smartcase_find,
-                };
-                Vim::globals(cx).last_find = Some(find.clone());
-                self.motion(find, window, cx)
-            }
-            Some(Operator::Sneak { first_char }) => {
-                if let Some(first_char) = first_char {
-                    if let Some(second_char) = text.chars().next() {
-                        let sneak = Motion::Sneak {
-                            first_char,
-                            second_char,
-                            smartcase: VimSettings::get_global(cx).use_smartcase_find,
-                        };
-                        Vim::globals(cx).last_find = Some(sneak.clone());
-                        self.motion(sneak, window, cx)
-                    }
-                } else {
-                    let first_char = text.chars().next();
-                    self.pop_operator(window, cx);
-                    self.push_operator(Operator::Sneak { first_char }, window, cx);
-                }
-            }
-            Some(Operator::SneakBackward { first_char }) => {
-                if let Some(first_char) = first_char {
-                    if let Some(second_char) = text.chars().next() {
-                        let sneak = Motion::SneakBackward {
-                            first_char,
-                            second_char,
-                            smartcase: VimSettings::get_global(cx).use_smartcase_find,
-                        };
-                        Vim::globals(cx).last_find = Some(sneak.clone());
-                        self.motion(sneak, window, cx)
-                    }
-                } else {
-                    let first_char = text.chars().next();
-                    self.pop_operator(window, cx);
-                    self.push_operator(Operator::SneakBackward { first_char }, window, cx);
-                }
-            }
-            Some(Operator::Replace) => match self.mode {
-                Mode::Normal => self.normal_replace(text, window, cx),
-                Mode::Visual | Mode::VisualLine | Mode::VisualBlock => {
-                    self.visual_replace(text, window, cx)
-                }
-                Mode::HelixNormal => self.helix_replace(&text, window, cx),
-                _ => self.clear_operator(window, cx),
-            },
-            Some(Operator::Digraph { first_char }) => {
-                if let Some(first_char) = first_char {
-                    if let Some(second_char) = text.chars().next() {
-                        self.insert_digraph(first_char, second_char, window, cx);
-                    }
-                } else {
-                    let first_char = text.chars().next();
-                    self.pop_operator(window, cx);
-                    self.push_operator(Operator::Digraph { first_char }, window, cx);
-                }
-            }
-            Some(Operator::Literal { prefix }) => {
-                self.handle_literal_input(prefix.unwrap_or_default(), &text, window, cx)
-            }
-            Some(Operator::AddSurrounds { target }) => match self.mode {
-                Mode::Normal => {
-                    if let Some(target) = target {
-                        self.add_surrounds(text, target, window, cx);
-                        self.clear_operator(window, cx);
-                    }
-                }
-                Mode::Visual | Mode::VisualLine | Mode::VisualBlock => {
-                    self.add_surrounds(text, SurroundsType::Selection, window, cx);
-                    self.clear_operator(window, cx);
-                }
-                _ => self.clear_operator(window, cx),
-            },
-            Some(Operator::ChangeSurrounds { target, opening }) => match self.mode {
-                Mode::Normal => {
-                    if let Some(target) = target {
-                        self.change_surrounds(text, target, opening, window, cx);
-                        self.clear_operator(window, cx);
-                    }
-                }
-                _ => self.clear_operator(window, cx),
-            },
-            Some(Operator::DeleteSurrounds) => match self.mode {
-                Mode::Normal => {
-                    self.delete_surrounds(text, window, cx);
-                    self.clear_operator(window, cx);
-                }
-                _ => self.clear_operator(window, cx),
-            },
-            Some(Operator::Mark) => self.create_mark(text, window, cx),
-            Some(Operator::RecordRegister) => {
-                self.record_register(text.chars().next().unwrap(), window, cx)
-            }
-            Some(Operator::ReplayRegister) => {
-                self.replay_register(text.chars().next().unwrap(), window, cx)
-            }
-            Some(Operator::Register) => match self.mode {
-                Mode::Insert => {
-                    self.update_editor(cx, |_, editor, cx| {
-                        if let Some(register) = Vim::update_globals(cx, |globals, cx| {
-                            globals.read_register(text.chars().next(), Some(editor), cx)
-                        }) {
-                            editor.do_paste(
-                                &register.text.to_string(),
-                                register.clipboard_selections,
-                                false,
-                                window,
-                                cx,
-                            )
-                        }
-                    });
-                    self.clear_operator(window, cx);
-                }
-                _ => {
-                    self.select_register(text, window, cx);
-                }
-            },
-            Some(Operator::Jump { line }) => self.jump(text, line, true, window, cx),
-            _ => {
-                if self.mode == Mode::Replace {
-                    self.multi_replace(text, window, cx)
-                }
-
-                if self.mode == Mode::Normal {
-                    self.update_editor(cx, |_, editor, cx| {
-                        editor.accept_edit_prediction(
-                            &editor::actions::AcceptEditPrediction {},
-                            window,
-                            cx,
-                        );
-                    });
-                }
-            }
-        }
-    }
-
-    fn sync_vim_settings(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.update_editor(cx, |vim, editor, cx| {
-            editor.set_cursor_shape(vim.cursor_shape(cx), cx);
-            editor.set_clip_at_line_ends(vim.clip_at_line_ends(), cx);
-            let collapse_matches = !HelixModeSetting::get_global(cx).0;
-            editor.set_collapse_matches(collapse_matches);
-            editor.set_input_enabled(vim.editor_input_enabled());
-            editor.set_autoindent(vim.should_autoindent());
-            editor
-                .selections
-                .set_line_mode(matches!(vim.mode, Mode::VisualLine));
-
-            let hide_edit_predictions = !matches!(vim.mode, Mode::Insert | Mode::Replace);
-            editor.set_edit_predictions_hidden_for_vim_mode(hide_edit_predictions, window, cx);
-        });
-        cx.notify()
-    }
-}
-
-#[derive(RegisterSetting)]
-struct VimSettings {
-    pub default_mode: Mode,
-    pub toggle_relative_line_numbers: bool,
-    pub use_system_clipboard: settings::UseSystemClipboard,
-    pub use_smartcase_find: bool,
-    pub custom_digraphs: HashMap<String, Arc<str>>,
-    pub highlight_on_yank_duration: u64,
-    pub cursor_shape: CursorShapeSettings,
-}
-
-/// The settings for cursor shape.
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub struct CursorShapeSettings {
-    /// Cursor shape for the normal mode.
-    ///
-    /// Default: block
-    pub normal: Option<CursorShape>,
-    /// Cursor shape for the replace mode.
-    ///
-    /// Default: underline
-    pub replace: Option<CursorShape>,
-    /// Cursor shape for the visual mode.
-    ///
-    /// Default: block
-    pub visual: Option<CursorShape>,
-    /// Cursor shape for the insert mode.
-    ///
-    /// The default value follows the primary cursor_shape.
-    pub insert: Option<CursorShape>,
-}
-
-impl From<settings::CursorShapeSettings> for CursorShapeSettings {
-    fn from(settings: settings::CursorShapeSettings) -> Self {
-        Self {
-            normal: settings.normal.map(Into::into),
-            replace: settings.replace.map(Into::into),
-            visual: settings.visual.map(Into::into),
-            insert: settings.insert.map(Into::into),
-        }
-    }
-}
-
-impl From<settings::ModeContent> for Mode {
-    fn from(mode: ModeContent) -> Self {
-        match mode {
-            ModeContent::Normal => Self::Normal,
-            ModeContent::Insert => Self::Insert,
-        }
-    }
-}
-
-impl Settings for VimSettings {
-    fn from_settings(content: &settings::SettingsContent) -> Self {
-        let vim = content.vim.clone().unwrap();
-        Self {
-            default_mode: vim.default_mode.unwrap().into(),
-            toggle_relative_line_numbers: vim.toggle_relative_line_numbers.unwrap(),
-            use_system_clipboard: vim.use_system_clipboard.unwrap(),
-            use_smartcase_find: vim.use_smartcase_find.unwrap(),
-            custom_digraphs: vim.custom_digraphs.unwrap(),
-            highlight_on_yank_duration: vim.highlight_on_yank_duration.unwrap(),
-            cursor_shape: vim.cursor_shape.unwrap().into(),
-        }
-    }
-}
diff --git a/crates/vim/src/visual.rs b/crates/vim/src/visual.rs
deleted file mode 100644
index 3c6f237435..0000000000
--- a/crates/vim/src/visual.rs
+++ /dev/null
@@ -1,1978 +0,0 @@
-use std::sync::Arc;
-
-use collections::HashMap;
-use editor::{
-    Bias, DisplayPoint, Editor, MultiBufferOffset, SelectionEffects,
-    display_map::{DisplaySnapshot, ToDisplayPoint},
-    movement,
-};
-use gpui::{Context, Window, actions};
-use language::{Point, Selection, SelectionGoal};
-use multi_buffer::MultiBufferRow;
-use search::BufferSearchBar;
-use util::ResultExt;
-use workspace::searchable::Direction;
-
-use crate::{
-    Vim,
-    motion::{Motion, MotionKind, first_non_whitespace, next_line_end, start_of_line},
-    object::Object,
-    state::{Mark, Mode, Operator},
-};
-
-actions!(
-    vim,
-    [
-        /// Toggles visual mode.
-        ToggleVisual,
-        /// Toggles visual line mode.
-        ToggleVisualLine,
-        /// Toggles visual block mode.
-        ToggleVisualBlock,
-        /// Deletes the visual selection.
-        VisualDelete,
-        /// Deletes entire lines in visual selection.
-        VisualDeleteLine,
-        /// Yanks (copies) the visual selection.
-        VisualYank,
-        /// Yanks entire lines in visual selection.
-        VisualYankLine,
-        /// Moves cursor to the other end of the selection.
-        OtherEnd,
-        /// Moves cursor to the other end of the selection (row-aware).
-        OtherEndRowAware,
-        /// Selects the next occurrence of the current selection.
-        SelectNext,
-        /// Selects the previous occurrence of the current selection.
-        SelectPrevious,
-        /// Selects the next match of the current selection.
-        SelectNextMatch,
-        /// Selects the previous match of the current selection.
-        SelectPreviousMatch,
-        /// Selects the next smaller syntax node.
-        SelectSmallerSyntaxNode,
-        /// Selects the next larger syntax node.
-        SelectLargerSyntaxNode,
-        /// Selects the next syntax node sibling.
-        SelectNextSyntaxNode,
-        /// Selects the previous syntax node sibling.
-        SelectPreviousSyntaxNode,
-        /// Restores the previous visual selection.
-        RestoreVisualSelection,
-        /// Inserts at the end of each line in visual selection.
-        VisualInsertEndOfLine,
-        /// Inserts at the first non-whitespace character of each line.
-        VisualInsertFirstNonWhiteSpace,
-    ]
-);
-
-pub fn register(editor: &mut Editor, cx: &mut Context<Vim>) {
-    Vim::action(editor, cx, |vim, _: &ToggleVisual, window, cx| {
-        vim.toggle_mode(Mode::Visual, window, cx)
-    });
-    Vim::action(editor, cx, |vim, _: &ToggleVisualLine, window, cx| {
-        vim.toggle_mode(Mode::VisualLine, window, cx)
-    });
-    Vim::action(editor, cx, |vim, _: &ToggleVisualBlock, window, cx| {
-        vim.toggle_mode(Mode::VisualBlock, window, cx)
-    });
-    Vim::action(editor, cx, Vim::other_end);
-    Vim::action(editor, cx, Vim::other_end_row_aware);
-    Vim::action(editor, cx, Vim::visual_insert_end_of_line);
-    Vim::action(editor, cx, Vim::visual_insert_first_non_white_space);
-    Vim::action(editor, cx, |vim, _: &VisualDelete, window, cx| {
-        vim.record_current_action(cx);
-        vim.visual_delete(false, window, cx);
-    });
-    Vim::action(editor, cx, |vim, _: &VisualDeleteLine, window, cx| {
-        vim.record_current_action(cx);
-        vim.visual_delete(true, window, cx);
-    });
-    Vim::action(editor, cx, |vim, _: &VisualYank, window, cx| {
-        vim.visual_yank(false, window, cx)
-    });
-    Vim::action(editor, cx, |vim, _: &VisualYankLine, window, cx| {
-        vim.visual_yank(true, window, cx)
-    });
-
-    Vim::action(editor, cx, Vim::select_next);
-    Vim::action(editor, cx, Vim::select_previous);
-    Vim::action(editor, cx, |vim, _: &SelectNextMatch, window, cx| {
-        vim.select_match(Direction::Next, window, cx);
-    });
-    Vim::action(editor, cx, |vim, _: &SelectPreviousMatch, window, cx| {
-        vim.select_match(Direction::Prev, window, cx);
-    });
-
-    Vim::action(editor, cx, |vim, _: &SelectLargerSyntaxNode, window, cx| {
-        let count = Vim::take_count(cx).unwrap_or(1);
-        Vim::take_forced_motion(cx);
-        for _ in 0..count {
-            vim.update_editor(cx, |_, editor, cx| {
-                editor.select_larger_syntax_node(&Default::default(), window, cx);
-            });
-        }
-    });
-
-    Vim::action(editor, cx, |vim, _: &SelectNextSyntaxNode, window, cx| {
-        let count = Vim::take_count(cx).unwrap_or(1);
-        Vim::take_forced_motion(cx);
-        for _ in 0..count {
-            vim.update_editor(cx, |_, editor, cx| {
-                editor.select_next_syntax_node(&Default::default(), window, cx);
-            });
-        }
-    });
-
-    Vim::action(
-        editor,
-        cx,
-        |vim, _: &SelectPreviousSyntaxNode, window, cx| {
-            let count = Vim::take_count(cx).unwrap_or(1);
-            Vim::take_forced_motion(cx);
-            for _ in 0..count {
-                vim.update_editor(cx, |_, editor, cx| {
-                    editor.select_prev_syntax_node(&Default::default(), window, cx);
-                });
-            }
-        },
-    );
-
-    Vim::action(
-        editor,
-        cx,
-        |vim, _: &SelectSmallerSyntaxNode, window, cx| {
-            let count = Vim::take_count(cx).unwrap_or(1);
-            Vim::take_forced_motion(cx);
-            for _ in 0..count {
-                vim.update_editor(cx, |_, editor, cx| {
-                    editor.select_smaller_syntax_node(&Default::default(), window, cx);
-                });
-            }
-        },
-    );
-
-    Vim::action(editor, cx, |vim, _: &RestoreVisualSelection, window, cx| {
-        let Some((stored_mode, reversed)) = vim.stored_visual_mode.take() else {
-            return;
-        };
-        let marks = vim
-            .update_editor(cx, |vim, editor, cx| {
-                vim.get_mark("<", editor, window, cx)
-                    .zip(vim.get_mark(">", editor, window, cx))
-            })
-            .flatten();
-        let Some((Mark::Local(start), Mark::Local(end))) = marks else {
-            return;
-        };
-        let ranges = start
-            .iter()
-            .zip(end)
-            .zip(reversed)
-            .map(|((start, end), reversed)| (*start, end, reversed))
-            .collect::<Vec<_>>();
-
-        if vim.mode.is_visual() {
-            vim.create_visual_marks(vim.mode, window, cx);
-        }
-
-        vim.update_editor(cx, |_, editor, cx| {
-            editor.set_clip_at_line_ends(false, cx);
-            editor.change_selections(Default::default(), window, cx, |s| {
-                let map = s.display_snapshot();
-                let ranges = ranges
-                    .into_iter()
-                    .map(|(start, end, reversed)| {
-                        let mut new_end =
-                            movement::saturating_right(&map, end.to_display_point(&map));
-                        let mut new_start = start.to_display_point(&map);
-                        if new_start >= new_end {
-                            if new_end.column() == 0 {
-                                new_end = movement::right(&map, new_end)
-                            } else {
-                                new_start = movement::saturating_left(&map, new_end);
-                            }
-                        }
-                        Selection {
-                            id: s.new_selection_id(),
-                            start: new_start.to_point(&map),
-                            end: new_end.to_point(&map),
-                            reversed,
-                            goal: SelectionGoal::None,
-                        }
-                    })
-                    .collect();
-                s.select(ranges);
-            })
-        });
-        vim.switch_mode(stored_mode, true, window, cx)
-    });
-}
-
-impl Vim {
-    pub fn visual_motion(
-        &mut self,
-        motion: Motion,
-        times: Option<usize>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.update_editor(cx, |vim, editor, cx| {
-            let text_layout_details = editor.text_layout_details(window);
-            if vim.mode == Mode::VisualBlock
-                && !matches!(
-                    motion,
-                    Motion::EndOfLine {
-                        display_lines: false
-                    }
-                )
-            {
-                let is_up_or_down = matches!(motion, Motion::Up { .. } | Motion::Down { .. });
-                vim.visual_block_motion(is_up_or_down, editor, window, cx, |map, point, goal| {
-                    motion.move_point(map, point, goal, times, &text_layout_details)
-                })
-            } else {
-                editor.change_selections(Default::default(), window, cx, |s| {
-                    s.move_with(|map, selection| {
-                        let was_reversed = selection.reversed;
-                        let mut current_head = selection.head();
-
-                        // our motions assume the current character is after the cursor,
-                        // but in (forward) visual mode the current character is just
-                        // before the end of the selection.
-
-                        // If the file ends with a newline (which is common) we don't do this.
-                        // so that if you go to the end of such a file you can use "up" to go
-                        // to the previous line and have it work somewhat as expected.
-                        if !selection.reversed
-                            && !selection.is_empty()
-                            && !(selection.end.column() == 0 && selection.end == map.max_point())
-                        {
-                            current_head = movement::left(map, selection.end)
-                        }
-
-                        let Some((new_head, goal)) = motion.move_point(
-                            map,
-                            current_head,
-                            selection.goal,
-                            times,
-                            &text_layout_details,
-                        ) else {
-                            return;
-                        };
-
-                        selection.set_head(new_head, goal);
-
-                        // ensure the current character is included in the selection.
-                        if !selection.reversed {
-                            let next_point = if vim.mode == Mode::VisualBlock {
-                                movement::saturating_right(map, selection.end)
-                            } else {
-                                movement::right(map, selection.end)
-                            };
-
-                            if !(next_point.column() == 0 && next_point == map.max_point()) {
-                                selection.end = next_point;
-                            }
-                        }
-
-                        // vim always ensures the anchor character stays selected.
-                        // if our selection has reversed, we need to move the opposite end
-                        // to ensure the anchor is still selected.
-                        if was_reversed && !selection.reversed {
-                            selection.start = movement::left(map, selection.start);
-                        } else if !was_reversed && selection.reversed {
-                            selection.end = movement::right(map, selection.end);
-                        }
-                    })
-                });
-            }
-        });
-    }
-
-    pub fn visual_block_motion(
-        &mut self,
-        preserve_goal: bool,
-        editor: &mut Editor,
-        window: &mut Window,
-        cx: &mut Context<Editor>,
-        mut move_selection: impl FnMut(
-            &DisplaySnapshot,
-            DisplayPoint,
-            SelectionGoal,
-        ) -> Option<(DisplayPoint, SelectionGoal)>,
-    ) {
-        let text_layout_details = editor.text_layout_details(window);
-        editor.change_selections(Default::default(), window, cx, |s| {
-            let map = &s.display_snapshot();
-            let mut head = s.newest_anchor().head().to_display_point(map);
-            let mut tail = s.oldest_anchor().tail().to_display_point(map);
-
-            let mut head_x = map.x_for_display_point(head, &text_layout_details);
-            let mut tail_x = map.x_for_display_point(tail, &text_layout_details);
-
-            let (start, end) = match s.newest_anchor().goal {
-                SelectionGoal::HorizontalRange { start, end } if preserve_goal => (start, end),
-                SelectionGoal::HorizontalPosition(start) if preserve_goal => (start, start),
-                _ => (tail_x.into(), head_x.into()),
-            };
-            let mut goal = SelectionGoal::HorizontalRange { start, end };
-
-            let was_reversed = tail_x > head_x;
-            if !was_reversed && !preserve_goal {
-                head = movement::saturating_left(map, head);
-            }
-
-            let reverse_aware_goal = if was_reversed {
-                SelectionGoal::HorizontalRange {
-                    start: end,
-                    end: start,
-                }
-            } else {
-                goal
-            };
-
-            let Some((new_head, _)) = move_selection(map, head, reverse_aware_goal) else {
-                return;
-            };
-            head = new_head;
-            head_x = map.x_for_display_point(head, &text_layout_details);
-
-            let is_reversed = tail_x > head_x;
-            if was_reversed && !is_reversed {
-                tail = movement::saturating_left(map, tail);
-                tail_x = map.x_for_display_point(tail, &text_layout_details);
-            } else if !was_reversed && is_reversed {
-                tail = movement::saturating_right(map, tail);
-                tail_x = map.x_for_display_point(tail, &text_layout_details);
-            }
-            if !is_reversed && !preserve_goal {
-                head = movement::saturating_right(map, head);
-                head_x = map.x_for_display_point(head, &text_layout_details);
-            }
-
-            let positions = if is_reversed {
-                head_x..tail_x
-            } else {
-                tail_x..head_x
-            };
-
-            if !preserve_goal {
-                goal = SelectionGoal::HorizontalRange {
-                    start: f64::from(positions.start),
-                    end: f64::from(positions.end),
-                };
-            }
-
-            let mut selections = Vec::new();
-            let mut row = tail.row();
-            let going_up = tail.row() > head.row();
-            let direction = if going_up { -1 } else { 1 };
-
-            loop {
-                let laid_out_line = map.layout_row(row, &text_layout_details);
-                let start = DisplayPoint::new(
-                    row,
-                    laid_out_line.closest_index_for_x(positions.start) as u32,
-                );
-                let mut end =
-                    DisplayPoint::new(row, laid_out_line.closest_index_for_x(positions.end) as u32);
-                if end <= start {
-                    if start.column() == map.line_len(start.row()) {
-                        end = start;
-                    } else {
-                        end = movement::saturating_right(map, start);
-                    }
-                }
-
-                if positions.start <= laid_out_line.width {
-                    let selection = Selection {
-                        id: s.new_selection_id(),
-                        start: start.to_point(map),
-                        end: end.to_point(map),
-                        reversed: is_reversed &&
-                                    // For neovim parity: cursor is not reversed when column is a single character
-                                    end.column() - start.column() > 1,
-                        goal,
-                    };
-
-                    selections.push(selection);
-                }
-
-                // When dealing with soft wrapped lines, it's possible that
-                // `row` ends up being set to a value other than `head.row()` as
-                // `head.row()` might be a `DisplayPoint` mapped to a soft
-                // wrapped line, hence the need for `<=` and `>=` instead of
-                // `==`.
-                if going_up && row <= head.row() || !going_up && row >= head.row() {
-                    break;
-                }
-
-                // Find the next or previous buffer row where the `row` should
-                // be moved to, so that wrapped lines are skipped.
-                row = map
-                    .start_of_relative_buffer_row(DisplayPoint::new(row, 0), direction)
-                    .row();
-            }
-
-            s.select(selections);
-        })
-    }
-
-    pub fn visual_object(
-        &mut self,
-        object: Object,
-        count: Option<usize>,
-        window: &mut Window,
-        cx: &mut Context<Vim>,
-    ) {
-        if let Some(Operator::Object { around }) = self.active_operator() {
-            self.pop_operator(window, cx);
-            let current_mode = self.mode;
-            let target_mode = object.target_visual_mode(current_mode, around);
-            if target_mode != current_mode {
-                self.switch_mode(target_mode, true, window, cx);
-            }
-
-            self.update_editor(cx, |_, editor, cx| {
-                editor.change_selections(Default::default(), window, cx, |s| {
-                    s.move_with(|map, selection| {
-                        let mut mut_selection = selection.clone();
-
-                        // all our motions assume that the current character is
-                        // after the cursor; however in the case of a visual selection
-                        // the current character is before the cursor.
-                        // But this will affect the judgment of the html tag
-                        // so the html tag needs to skip this logic.
-                        if !selection.reversed && object != Object::Tag {
-                            mut_selection.set_head(
-                                movement::left(map, mut_selection.head()),
-                                mut_selection.goal,
-                            );
-                        }
-
-                        let original_point = selection.tail().to_point(map);
-
-                        if let Some(range) = object.range(map, mut_selection, around, count) {
-                            if !range.is_empty() {
-                                let expand_both_ways = object.always_expands_both_ways()
-                                    || selection.is_empty()
-                                    || movement::right(map, selection.start) == selection.end;
-
-                                if expand_both_ways {
-                                    if selection.start == range.start
-                                        && selection.end == range.end
-                                        && object.always_expands_both_ways()
-                                    {
-                                        if let Some(range) =
-                                            object.range(map, selection.clone(), around, count)
-                                        {
-                                            selection.start = range.start;
-                                            selection.end = range.end;
-                                        }
-                                    } else {
-                                        selection.start = range.start;
-                                        selection.end = range.end;
-                                    }
-                                } else if selection.reversed {
-                                    selection.start = range.start;
-                                } else {
-                                    selection.end = range.end;
-                                }
-                            }
-
-                            // In the visual selection result of a paragraph object, the cursor is
-                            // placed at the start of the last line. And in the visual mode, the
-                            // selection end is located after the end character. So, adjustment of
-                            // selection end is needed.
-                            //
-                            // We don't do this adjustment for a one-line blank paragraph since the
-                            // trailing newline is included in its selection from the beginning.
-                            if object == Object::Paragraph && range.start != range.end {
-                                let row_of_selection_end_line = selection.end.to_point(map).row;
-                                let new_selection_end = if map
-                                    .buffer_snapshot()
-                                    .line_len(MultiBufferRow(row_of_selection_end_line))
-                                    == 0
-                                {
-                                    Point::new(row_of_selection_end_line + 1, 0)
-                                } else {
-                                    Point::new(row_of_selection_end_line, 1)
-                                };
-                                selection.end = new_selection_end.to_display_point(map);
-                            }
-
-                            // To match vim, if the range starts of the same line as it originally
-                            // did, we keep the tail of the selection in the same place instead of
-                            // snapping it to the start of the line
-                            if target_mode == Mode::VisualLine {
-                                let new_start_point = selection.start.to_point(map);
-                                if new_start_point.row == original_point.row {
-                                    if selection.end.to_point(map).row > new_start_point.row {
-                                        if original_point.column
-                                            == map
-                                                .buffer_snapshot()
-                                                .line_len(MultiBufferRow(original_point.row))
-                                        {
-                                            selection.start = movement::saturating_left(
-                                                map,
-                                                original_point.to_display_point(map),
-                                            )
-                                        } else {
-                                            selection.start = original_point.to_display_point(map)
-                                        }
-                                    } else {
-                                        selection.end = movement::saturating_right(
-                                            map,
-                                            original_point.to_display_point(map),
-                                        );
-                                        if original_point.column > 0 {
-                                            selection.reversed = true
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    });
-                });
-            });
-        }
-    }
-
-    fn visual_insert_end_of_line(
-        &mut self,
-        _: &VisualInsertEndOfLine,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.update_editor(cx, |_, editor, cx| {
-            editor.split_selection_into_lines(&Default::default(), window, cx);
-            editor.change_selections(Default::default(), window, cx, |s| {
-                s.move_cursors_with(|map, cursor, _| {
-                    (next_line_end(map, cursor, 1), SelectionGoal::None)
-                });
-            });
-        });
-
-        self.switch_mode(Mode::Insert, false, window, cx);
-    }
-
-    fn visual_insert_first_non_white_space(
-        &mut self,
-        _: &VisualInsertFirstNonWhiteSpace,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.update_editor(cx, |_, editor, cx| {
-            editor.split_selection_into_lines(&Default::default(), window, cx);
-            editor.change_selections(Default::default(), window, cx, |s| {
-                s.move_cursors_with(|map, cursor, _| {
-                    (
-                        first_non_whitespace(map, false, cursor),
-                        SelectionGoal::None,
-                    )
-                });
-            });
-        });
-
-        self.switch_mode(Mode::Insert, false, window, cx);
-    }
-
-    fn toggle_mode(&mut self, mode: Mode, window: &mut Window, cx: &mut Context<Self>) {
-        if self.mode == mode {
-            self.switch_mode(Mode::Normal, false, window, cx);
-        } else {
-            self.switch_mode(mode, false, window, cx);
-        }
-    }
-
-    pub fn other_end(&mut self, _: &OtherEnd, window: &mut Window, cx: &mut Context<Self>) {
-        self.update_editor(cx, |_, editor, cx| {
-            editor.change_selections(Default::default(), window, cx, |s| {
-                s.move_with(|_, selection| {
-                    selection.reversed = !selection.reversed;
-                });
-            })
-        });
-    }
-
-    pub fn other_end_row_aware(
-        &mut self,
-        _: &OtherEndRowAware,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let mode = self.mode;
-        self.update_editor(cx, |_, editor, cx| {
-            editor.change_selections(Default::default(), window, cx, |s| {
-                s.move_with(|_, selection| {
-                    selection.reversed = !selection.reversed;
-                });
-                if mode == Mode::VisualBlock {
-                    s.reverse_selections();
-                }
-            })
-        });
-    }
-
-    pub fn visual_delete(&mut self, line_mode: bool, window: &mut Window, cx: &mut Context<Self>) {
-        self.store_visual_marks(window, cx);
-        self.update_editor(cx, |vim, editor, cx| {
-            let mut original_columns: HashMap<_, _> = Default::default();
-            let line_mode = line_mode || editor.selections.line_mode();
-            editor.selections.set_line_mode(false);
-
-            editor.transact(window, cx, |editor, window, cx| {
-                editor.change_selections(Default::default(), window, cx, |s| {
-                    s.move_with(|map, selection| {
-                        if line_mode {
-                            let mut position = selection.head();
-                            if !selection.reversed {
-                                position = movement::left(map, position);
-                            }
-                            original_columns.insert(selection.id, position.to_point(map).column);
-                            if vim.mode == Mode::VisualBlock {
-                                *selection.end.column_mut() = map.line_len(selection.end.row())
-                            } else {
-                                let start = selection.start.to_point(map);
-                                let end = selection.end.to_point(map);
-                                selection.start = map.prev_line_boundary(start).1;
-                                if end.column == 0 && end > start {
-                                    let row = end.row.saturating_sub(1);
-                                    selection.end = Point::new(
-                                        row,
-                                        map.buffer_snapshot().line_len(MultiBufferRow(row)),
-                                    )
-                                    .to_display_point(map)
-                                } else {
-                                    selection.end = map.next_line_boundary(end).1;
-                                }
-                            }
-                        }
-                        selection.goal = SelectionGoal::None;
-                    });
-                });
-                let kind = if line_mode {
-                    MotionKind::Linewise
-                } else {
-                    MotionKind::Exclusive
-                };
-                vim.copy_selections_content(editor, kind, window, cx);
-
-                if line_mode && vim.mode != Mode::VisualBlock {
-                    editor.change_selections(Default::default(), window, cx, |s| {
-                        s.move_with(|map, selection| {
-                            let end = selection.end.to_point(map);
-                            let start = selection.start.to_point(map);
-                            if end.row < map.buffer_snapshot().max_point().row {
-                                selection.end = Point::new(end.row + 1, 0).to_display_point(map)
-                            } else if start.row > 0 {
-                                selection.start = Point::new(
-                                    start.row - 1,
-                                    map.buffer_snapshot()
-                                        .line_len(MultiBufferRow(start.row - 1)),
-                                )
-                                .to_display_point(map)
-                            }
-                        });
-                    });
-                }
-                editor.insert("", window, cx);
-
-                // Fixup cursor position after the deletion
-                editor.set_clip_at_line_ends(true, cx);
-                editor.change_selections(Default::default(), window, cx, |s| {
-                    s.move_with(|map, selection| {
-                        let mut cursor = selection.head().to_point(map);
-
-                        if let Some(column) = original_columns.get(&selection.id) {
-                            cursor.column = *column
-                        }
-                        let cursor = map.clip_point(cursor.to_display_point(map), Bias::Left);
-                        selection.collapse_to(cursor, selection.goal)
-                    });
-                    if vim.mode == Mode::VisualBlock {
-                        s.select_anchors(vec![s.first_anchor()])
-                    }
-                });
-            })
-        });
-        self.switch_mode(Mode::Normal, true, window, cx);
-    }
-
-    pub fn visual_yank(&mut self, line_mode: bool, window: &mut Window, cx: &mut Context<Self>) {
-        self.store_visual_marks(window, cx);
-        self.update_editor(cx, |vim, editor, cx| {
-            let line_mode = line_mode || editor.selections.line_mode();
-
-            // For visual line mode, adjust selections to avoid yanking the next line when on \n
-            if line_mode && vim.mode != Mode::VisualBlock {
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.move_with(|map, selection| {
-                        let start = selection.start.to_point(map);
-                        let end = selection.end.to_point(map);
-                        if end.column == 0 && end > start {
-                            let row = end.row.saturating_sub(1);
-                            selection.end = Point::new(
-                                row,
-                                map.buffer_snapshot().line_len(MultiBufferRow(row)),
-                            )
-                            .to_display_point(map);
-                        }
-                    });
-                });
-            }
-
-            editor.selections.set_line_mode(line_mode);
-            let kind = if line_mode {
-                MotionKind::Linewise
-            } else {
-                MotionKind::Exclusive
-            };
-            vim.yank_selections_content(editor, kind, window, cx);
-            editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                s.move_with(|map, selection| {
-                    if line_mode {
-                        selection.start = start_of_line(map, false, selection.start);
-                    };
-                    selection.collapse_to(selection.start, SelectionGoal::None)
-                });
-                if vim.mode == Mode::VisualBlock {
-                    s.select_anchors(vec![s.first_anchor()])
-                }
-            });
-        });
-        self.switch_mode(Mode::Normal, true, window, cx);
-    }
-
-    pub(crate) fn visual_replace(
-        &mut self,
-        text: Arc<str>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.stop_recording(cx);
-        self.update_editor(cx, |_, editor, cx| {
-            editor.transact(window, cx, |editor, window, cx| {
-                let display_map = editor.display_snapshot(cx);
-                let selections = editor.selections.all_adjusted_display(&display_map);
-
-                // Selections are biased right at the start. So we need to store
-                // anchors that are biased left so that we can restore the selections
-                // after the change
-                let stable_anchors = editor
-                    .selections
-                    .disjoint_anchors_arc()
-                    .iter()
-                    .map(|selection| {
-                        let start = selection.start.bias_left(&display_map.buffer_snapshot());
-                        start..start
-                    })
-                    .collect::<Vec<_>>();
-
-                let mut edits = Vec::new();
-                for selection in selections.iter() {
-                    let selection = selection.clone();
-                    for row_range in
-                        movement::split_display_range_by_lines(&display_map, selection.range())
-                    {
-                        let range = row_range.start.to_offset(&display_map, Bias::Right)
-                            ..row_range.end.to_offset(&display_map, Bias::Right);
-                        let text = text.repeat(range.end - range.start);
-                        edits.push((range, text));
-                    }
-                }
-
-                editor.edit(edits, cx);
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.select_ranges(stable_anchors)
-                });
-            });
-        });
-        self.switch_mode(Mode::Normal, false, window, cx);
-    }
-
-    pub fn select_next(&mut self, _: &SelectNext, window: &mut Window, cx: &mut Context<Self>) {
-        Vim::take_forced_motion(cx);
-        let count =
-            Vim::take_count(cx).unwrap_or_else(|| if self.mode.is_visual() { 1 } else { 2 });
-        self.update_editor(cx, |_, editor, cx| {
-            editor.set_clip_at_line_ends(false, cx);
-            for _ in 0..count {
-                if editor
-                    .select_next(&Default::default(), window, cx)
-                    .log_err()
-                    .is_none()
-                {
-                    break;
-                }
-            }
-        });
-    }
-
-    pub fn select_previous(
-        &mut self,
-        _: &SelectPrevious,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        Vim::take_forced_motion(cx);
-        let count =
-            Vim::take_count(cx).unwrap_or_else(|| if self.mode.is_visual() { 1 } else { 2 });
-        self.update_editor(cx, |_, editor, cx| {
-            for _ in 0..count {
-                if editor
-                    .select_previous(&Default::default(), window, cx)
-                    .log_err()
-                    .is_none()
-                {
-                    break;
-                }
-            }
-        });
-    }
-
-    pub fn select_match(
-        &mut self,
-        direction: Direction,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        Vim::take_forced_motion(cx);
-        let count = Vim::take_count(cx).unwrap_or(1);
-        let Some(pane) = self.pane(window, cx) else {
-            return;
-        };
-        let vim_is_normal = self.mode == Mode::Normal;
-        let mut start_selection = MultiBufferOffset(0);
-        let mut end_selection = MultiBufferOffset(0);
-
-        self.update_editor(cx, |_, editor, _| {
-            editor.set_collapse_matches(false);
-        });
-        if vim_is_normal {
-            pane.update(cx, |pane, cx| {
-                if let Some(search_bar) = pane.toolbar().read(cx).item_of_type::<BufferSearchBar>()
-                {
-                    search_bar.update(cx, |search_bar, cx| {
-                        if !search_bar.has_active_match() || !search_bar.show(window, cx) {
-                            return;
-                        }
-                        // without update_match_index there is a bug when the cursor is before the first match
-                        search_bar.update_match_index(window, cx);
-                        search_bar.select_match(direction.opposite(), 1, window, cx);
-                    });
-                }
-            });
-        }
-        self.update_editor(cx, |_, editor, cx| {
-            let latest = editor
-                .selections
-                .newest::<MultiBufferOffset>(&editor.display_snapshot(cx));
-            start_selection = latest.start;
-            end_selection = latest.end;
-        });
-
-        let mut match_exists = false;
-        pane.update(cx, |pane, cx| {
-            if let Some(search_bar) = pane.toolbar().read(cx).item_of_type::<BufferSearchBar>() {
-                search_bar.update(cx, |search_bar, cx| {
-                    search_bar.update_match_index(window, cx);
-                    search_bar.select_match(direction, count, window, cx);
-                    match_exists = search_bar.match_exists(window, cx);
-                });
-            }
-        });
-        if !match_exists {
-            self.clear_operator(window, cx);
-            self.stop_replaying(cx);
-            return;
-        }
-        self.update_editor(cx, |_, editor, cx| {
-            let latest = editor
-                .selections
-                .newest::<MultiBufferOffset>(&editor.display_snapshot(cx));
-            if vim_is_normal {
-                start_selection = latest.start;
-                end_selection = latest.end;
-            } else {
-                start_selection = start_selection.min(latest.start);
-                end_selection = end_selection.max(latest.end);
-            }
-            if direction == Direction::Prev {
-                std::mem::swap(&mut start_selection, &mut end_selection);
-            }
-            editor.change_selections(Default::default(), window, cx, |s| {
-                s.select_ranges([start_selection..end_selection]);
-            });
-            editor.set_collapse_matches(true);
-        });
-
-        match self.maybe_pop_operator() {
-            Some(Operator::Change) => self.substitute(None, false, window, cx),
-            Some(Operator::Delete) => {
-                self.stop_recording(cx);
-                self.visual_delete(false, window, cx)
-            }
-            Some(Operator::Yank) => self.visual_yank(false, window, cx),
-            _ => {} // Ignoring other operators
-        }
-    }
-}
-#[cfg(test)]
-mod test {
-    use indoc::indoc;
-    use workspace::item::Item;
-
-    use crate::{
-        state::Mode,
-        test::{NeovimBackedTestContext, VimTestContext},
-    };
-
-    #[gpui::test]
-    async fn test_enter_visual_mode(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {
-            "The ˇquick brown
-            fox jumps over
-            the lazy dog"
-        })
-        .await;
-        let cursor = cx.update_editor(|editor, _, cx| editor.pixel_position_of_cursor(cx));
-
-        // entering visual mode should select the character
-        // under cursor
-        cx.simulate_shared_keystrokes("v").await;
-        cx.shared_state()
-            .await
-            .assert_eq(indoc! { "The «qˇ»uick brown
-            fox jumps over
-            the lazy dog"});
-        cx.update_editor(|editor, _, cx| assert_eq!(cursor, editor.pixel_position_of_cursor(cx)));
-
-        // forwards motions should extend the selection
-        cx.simulate_shared_keystrokes("w j").await;
-        cx.shared_state().await.assert_eq(indoc! { "The «quick brown
-            fox jumps oˇ»ver
-            the lazy dog"});
-
-        cx.simulate_shared_keystrokes("escape").await;
-        cx.shared_state().await.assert_eq(indoc! { "The quick brown
-            fox jumps ˇover
-            the lazy dog"});
-
-        // motions work backwards
-        cx.simulate_shared_keystrokes("v k b").await;
-        cx.shared_state()
-            .await
-            .assert_eq(indoc! { "The «ˇquick brown
-            fox jumps o»ver
-            the lazy dog"});
-
-        // works on empty lines
-        cx.set_shared_state(indoc! {"
-            a
-            ˇ
-            b
-            "})
-            .await;
-        let cursor = cx.update_editor(|editor, _, cx| editor.pixel_position_of_cursor(cx));
-        cx.simulate_shared_keystrokes("v").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            a
-            «
-            ˇ»b
-        "});
-        cx.update_editor(|editor, _, cx| assert_eq!(cursor, editor.pixel_position_of_cursor(cx)));
-
-        // toggles off again
-        cx.simulate_shared_keystrokes("v").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            a
-            ˇ
-            b
-            "});
-
-        // works at the end of a document
-        cx.set_shared_state(indoc! {"
-            a
-            b
-            ˇ"})
-            .await;
-
-        cx.simulate_shared_keystrokes("v").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            a
-            b
-            ˇ"});
-    }
-
-    #[gpui::test]
-    async fn test_visual_insert_first_non_whitespace(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        cx.set_state(
-            indoc! {
-                "«The quick brown
-                fox jumps over
-                the lazy dogˇ»"
-            },
-            Mode::Visual,
-        );
-        cx.simulate_keystrokes("g shift-i");
-        cx.assert_state(
-            indoc! {
-                "ˇThe quick brown
-                ˇfox jumps over
-                ˇthe lazy dog"
-            },
-            Mode::Insert,
-        );
-    }
-
-    #[gpui::test]
-    async fn test_visual_insert_end_of_line(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        cx.set_state(
-            indoc! {
-                "«The quick brown
-                fox jumps over
-                the lazy dogˇ»"
-            },
-            Mode::Visual,
-        );
-        cx.simulate_keystrokes("g shift-a");
-        cx.assert_state(
-            indoc! {
-                "The quick brownˇ
-                fox jumps overˇ
-                the lazy dogˇ"
-            },
-            Mode::Insert,
-        );
-    }
-
-    #[gpui::test]
-    async fn test_enter_visual_line_mode(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {
-            "The ˇquick brown
-            fox jumps over
-            the lazy dog"
-        })
-        .await;
-        cx.simulate_shared_keystrokes("shift-v").await;
-        cx.shared_state()
-            .await
-            .assert_eq(indoc! { "The «qˇ»uick brown
-            fox jumps over
-            the lazy dog"});
-        cx.simulate_shared_keystrokes("x").await;
-        cx.shared_state().await.assert_eq(indoc! { "fox ˇjumps over
-        the lazy dog"});
-
-        // it should work on empty lines
-        cx.set_shared_state(indoc! {"
-            a
-            ˇ
-            b"})
-            .await;
-        cx.simulate_shared_keystrokes("shift-v").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            a
-            «
-            ˇ»b"});
-        cx.simulate_shared_keystrokes("x").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            a
-            ˇb"});
-
-        // it should work at the end of the document
-        cx.set_shared_state(indoc! {"
-            a
-            b
-            ˇ"})
-            .await;
-        let cursor = cx.update_editor(|editor, _, cx| editor.pixel_position_of_cursor(cx));
-        cx.simulate_shared_keystrokes("shift-v").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            a
-            b
-            ˇ"});
-        cx.update_editor(|editor, _, cx| assert_eq!(cursor, editor.pixel_position_of_cursor(cx)));
-        cx.simulate_shared_keystrokes("x").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            a
-            ˇb"});
-    }
-
-    #[gpui::test]
-    async fn test_visual_delete(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.simulate("v w", "The quick ˇbrown")
-            .await
-            .assert_matches();
-
-        cx.simulate("v w x", "The quick ˇbrown")
-            .await
-            .assert_matches();
-        cx.simulate(
-            "v w j x",
-            indoc! {"
-                The ˇquick brown
-                fox jumps over
-                the lazy dog"},
-        )
-        .await
-        .assert_matches();
-        // Test pasting code copied on delete
-        cx.simulate_shared_keystrokes("j p").await;
-        cx.shared_state().await.assert_matches();
-
-        cx.simulate_at_each_offset(
-            "v w j x",
-            indoc! {"
-                The ˇquick brown
-                fox jumps over
-                the ˇlazy dog"},
-        )
-        .await
-        .assert_matches();
-        cx.simulate_at_each_offset(
-            "v b k x",
-            indoc! {"
-                The ˇquick brown
-                fox jumps ˇover
-                the ˇlazy dog"},
-        )
-        .await
-        .assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_visual_line_delete(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {"
-                The quˇick brown
-                fox jumps over
-                the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("shift-v x").await;
-        cx.shared_state().await.assert_matches();
-
-        // Test pasting code copied on delete
-        cx.simulate_shared_keystrokes("p").await;
-        cx.shared_state().await.assert_matches();
-
-        cx.set_shared_state(indoc! {"
-                The quick brown
-                fox jumps over
-                the laˇzy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("shift-v x").await;
-        cx.shared_state().await.assert_matches();
-        cx.shared_clipboard().await.assert_eq("the lazy dog\n");
-
-        cx.set_shared_state(indoc! {"
-                                The quˇick brown
-                                fox jumps over
-                                the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("shift-v j x").await;
-        cx.shared_state().await.assert_matches();
-        // Test pasting code copied on delete
-        cx.simulate_shared_keystrokes("p").await;
-        cx.shared_state().await.assert_matches();
-
-        cx.set_shared_state(indoc! {"
-            The ˇlong line
-            should not
-            crash
-            "})
-            .await;
-        cx.simulate_shared_keystrokes("shift-v $ x").await;
-        cx.shared_state().await.assert_matches();
-    }
-
-    #[gpui::test]
-    async fn test_visual_yank(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state("The quick ˇbrown").await;
-        cx.simulate_shared_keystrokes("v w y").await;
-        cx.shared_state().await.assert_eq("The quick ˇbrown");
-        cx.shared_clipboard().await.assert_eq("brown");
-
-        cx.set_shared_state(indoc! {"
-                The ˇquick brown
-                fox jumps over
-                the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("v w j y").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-                    The ˇquick brown
-                    fox jumps over
-                    the lazy dog"});
-        cx.shared_clipboard().await.assert_eq(indoc! {"
-                quick brown
-                fox jumps o"});
-
-        cx.set_shared_state(indoc! {"
-                    The quick brown
-                    fox jumps over
-                    the ˇlazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("v w j y").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-                    The quick brown
-                    fox jumps over
-                    the ˇlazy dog"});
-        cx.shared_clipboard().await.assert_eq("lazy d");
-        cx.simulate_shared_keystrokes("shift-v y").await;
-        cx.shared_clipboard().await.assert_eq("the lazy dog\n");
-
-        cx.set_shared_state(indoc! {"
-                    The ˇquick brown
-                    fox jumps over
-                    the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("v b k y").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-                    ˇThe quick brown
-                    fox jumps over
-                    the lazy dog"});
-        assert_eq!(
-            cx.read_from_clipboard()
-                .map(|item| item.text().unwrap())
-                .unwrap(),
-            "The q"
-        );
-
-        cx.set_shared_state(indoc! {"
-                    The quick brown
-                    fox ˇjumps over
-                    the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("shift-v shift-g shift-y")
-            .await;
-        cx.shared_state().await.assert_eq(indoc! {"
-                    The quick brown
-                    ˇfox jumps over
-                    the lazy dog"});
-        cx.shared_clipboard()
-            .await
-            .assert_eq("fox jumps over\nthe lazy dog\n");
-
-        cx.set_shared_state(indoc! {"
-                    The quick brown
-                    fox ˇjumps over
-                    the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("shift-v $ shift-y").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-                    The quick brown
-                    ˇfox jumps over
-                    the lazy dog"});
-        cx.shared_clipboard().await.assert_eq("fox jumps over\n");
-    }
-
-    #[gpui::test]
-    async fn test_visual_block_mode(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {
-            "The ˇquick brown
-             fox jumps over
-             the lazy dog"
-        })
-        .await;
-        cx.simulate_shared_keystrokes("ctrl-v").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "The «qˇ»uick brown
-            fox jumps over
-            the lazy dog"
-        });
-        cx.simulate_shared_keystrokes("2 down").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "The «qˇ»uick brown
-            fox «jˇ»umps over
-            the «lˇ»azy dog"
-        });
-        cx.simulate_shared_keystrokes("e").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "The «quicˇ»k brown
-            fox «jumpˇ»s over
-            the «lazyˇ» dog"
-        });
-        cx.simulate_shared_keystrokes("^").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "«ˇThe q»uick brown
-            «ˇfox j»umps over
-            «ˇthe l»azy dog"
-        });
-        cx.simulate_shared_keystrokes("$").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "The «quick brownˇ»
-            fox «jumps overˇ»
-            the «lazy dogˇ»"
-        });
-        cx.simulate_shared_keystrokes("shift-f space").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "The «quickˇ» brown
-            fox «jumpsˇ» over
-            the «lazy ˇ»dog"
-        });
-
-        // toggling through visual mode works as expected
-        cx.simulate_shared_keystrokes("v").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "The «quick brown
-            fox jumps over
-            the lazy ˇ»dog"
-        });
-        cx.simulate_shared_keystrokes("ctrl-v").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "The «quickˇ» brown
-            fox «jumpsˇ» over
-            the «lazy ˇ»dog"
-        });
-
-        cx.set_shared_state(indoc! {
-            "The ˇquick
-             brown
-             fox
-             jumps over the
-
-             lazy dog
-            "
-        })
-        .await;
-        cx.simulate_shared_keystrokes("ctrl-v down down").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "The«ˇ q»uick
-            bro«ˇwn»
-            foxˇ
-            jumps over the
-
-            lazy dog
-            "
-        });
-        cx.simulate_shared_keystrokes("down").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "The «qˇ»uick
-            brow«nˇ»
-            fox
-            jump«sˇ» over the
-
-            lazy dog
-            "
-        });
-        cx.simulate_shared_keystrokes("left").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "The«ˇ q»uick
-            bro«ˇwn»
-            foxˇ
-            jum«ˇps» over the
-
-            lazy dog
-            "
-        });
-        cx.simulate_shared_keystrokes("s o escape").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "Theˇouick
-            broo
-            foxo
-            jumo over the
-
-            lazy dog
-            "
-        });
-
-        // https://github.com/zed-industries/zed/issues/6274
-        cx.set_shared_state(indoc! {
-            "Theˇ quick brown
-
-            fox jumps over
-            the lazy dog
-            "
-        })
-        .await;
-        cx.simulate_shared_keystrokes("l ctrl-v j j").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "The «qˇ»uick brown
-
-            fox «jˇ»umps over
-            the lazy dog
-            "
-        });
-    }
-
-    #[gpui::test]
-    async fn test_visual_block_issue_2123(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {
-            "The ˇquick brown
-            fox jumps over
-            the lazy dog
-            "
-        })
-        .await;
-        cx.simulate_shared_keystrokes("ctrl-v right down").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "The «quˇ»ick brown
-            fox «juˇ»mps over
-            the lazy dog
-            "
-        });
-    }
-    #[gpui::test]
-    async fn test_visual_block_mode_down_right(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.set_shared_state(indoc! {"
-            The ˇquick brown
-            fox jumps over
-            the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("ctrl-v l l l l l j").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            The «quick ˇ»brown
-            fox «jumps ˇ»over
-            the lazy dog"});
-    }
-
-    #[gpui::test]
-    async fn test_visual_block_mode_up_left(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.set_shared_state(indoc! {"
-            The quick brown
-            fox jumpsˇ over
-            the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("ctrl-v h h h h h k").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            The «ˇquick »brown
-            fox «ˇjumps »over
-            the lazy dog"});
-    }
-
-    #[gpui::test]
-    async fn test_visual_block_mode_other_end(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.set_shared_state(indoc! {"
-            The quick brown
-            fox jˇumps over
-            the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("ctrl-v l l l l j").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            The quick brown
-            fox j«umps ˇ»over
-            the l«azy dˇ»og"});
-        cx.simulate_shared_keystrokes("o k").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            The q«ˇuick »brown
-            fox j«ˇumps »over
-            the l«ˇazy d»og"});
-    }
-
-    #[gpui::test]
-    async fn test_visual_block_mode_shift_other_end(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-        cx.set_shared_state(indoc! {"
-            The quick brown
-            fox jˇumps over
-            the lazy dog"})
-            .await;
-        cx.simulate_shared_keystrokes("ctrl-v l l l l j").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            The quick brown
-            fox j«umps ˇ»over
-            the l«azy dˇ»og"});
-        cx.simulate_shared_keystrokes("shift-o k").await;
-        cx.shared_state().await.assert_eq(indoc! {"
-            The quick brown
-            fox j«ˇumps »over
-            the lazy dog"});
-    }
-
-    #[gpui::test]
-    async fn test_visual_block_insert(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {
-            "ˇThe quick brown
-            fox jumps over
-            the lazy dog
-            "
-        })
-        .await;
-        cx.simulate_shared_keystrokes("ctrl-v 9 down").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "«Tˇ»he quick brown
-            «fˇ»ox jumps over
-            «tˇ»he lazy dog
-            ˇ"
-        });
-
-        cx.simulate_shared_keystrokes("shift-i k escape").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "ˇkThe quick brown
-            kfox jumps over
-            kthe lazy dog
-            k"
-        });
-
-        cx.set_shared_state(indoc! {
-            "ˇThe quick brown
-            fox jumps over
-            the lazy dog
-            "
-        })
-        .await;
-        cx.simulate_shared_keystrokes("ctrl-v 9 down").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "«Tˇ»he quick brown
-            «fˇ»ox jumps over
-            «tˇ»he lazy dog
-            ˇ"
-        });
-        cx.simulate_shared_keystrokes("c k escape").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "ˇkhe quick brown
-            kox jumps over
-            khe lazy dog
-            k"
-        });
-    }
-
-    #[gpui::test]
-    async fn test_visual_block_wrapping_selection(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        // Ensure that the editor is wrapping lines at 12 columns so that each
-        // of the lines ends up being wrapped.
-        cx.set_shared_wrap(12).await;
-        cx.set_shared_state(indoc! {
-            "ˇ12345678901234567890
-            12345678901234567890
-            12345678901234567890
-            "
-        })
-        .await;
-        cx.simulate_shared_keystrokes("ctrl-v j").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "«1ˇ»2345678901234567890
-            «1ˇ»2345678901234567890
-            12345678901234567890
-            "
-        });
-
-        // Test with lines taking up different amounts of display rows to ensure
-        // that, even in that case, only the buffer rows are taken into account.
-        cx.set_shared_state(indoc! {
-            "ˇ123456789012345678901234567890123456789012345678901234567890
-            1234567890123456789012345678901234567890
-            12345678901234567890
-            "
-        })
-        .await;
-        cx.simulate_shared_keystrokes("ctrl-v 2 j").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "«1ˇ»23456789012345678901234567890123456789012345678901234567890
-            «1ˇ»234567890123456789012345678901234567890
-            «1ˇ»2345678901234567890
-            "
-        });
-
-        // Same scenario as above, but using the up motion to ensure that the
-        // result is the same.
-        cx.set_shared_state(indoc! {
-            "123456789012345678901234567890123456789012345678901234567890
-            1234567890123456789012345678901234567890
-            ˇ12345678901234567890
-            "
-        })
-        .await;
-        cx.simulate_shared_keystrokes("ctrl-v 2 k").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "«1ˇ»23456789012345678901234567890123456789012345678901234567890
-            «1ˇ»234567890123456789012345678901234567890
-            «1ˇ»2345678901234567890
-            "
-        });
-    }
-
-    #[gpui::test]
-    async fn test_visual_object(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state("hello (in [parˇens] o)").await;
-        cx.simulate_shared_keystrokes("ctrl-v l").await;
-        cx.simulate_shared_keystrokes("a ]").await;
-        cx.shared_state()
-            .await
-            .assert_eq("hello (in «[parens]ˇ» o)");
-        cx.simulate_shared_keystrokes("i (").await;
-        cx.shared_state()
-            .await
-            .assert_eq("hello («in [parens] oˇ»)");
-
-        cx.set_shared_state("hello in a wˇord again.").await;
-        cx.simulate_shared_keystrokes("ctrl-v l i w").await;
-        cx.shared_state()
-            .await
-            .assert_eq("hello in a w«ordˇ» again.");
-        assert_eq!(cx.mode(), Mode::VisualBlock);
-        cx.simulate_shared_keystrokes("o a s").await;
-        cx.shared_state()
-            .await
-            .assert_eq("«ˇhello in a word» again.");
-    }
-
-    #[gpui::test]
-    async fn test_visual_object_expands(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {
-            "{
-                {
-               ˇ }
-            }
-            {
-            }
-            "
-        })
-        .await;
-        cx.simulate_shared_keystrokes("v l").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "{
-                {
-               « }ˇ»
-            }
-            {
-            }
-            "
-        });
-        cx.simulate_shared_keystrokes("a {").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "{
-                «{
-                }ˇ»
-            }
-            {
-            }
-            "
-        });
-        cx.simulate_shared_keystrokes("a {").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "«{
-                {
-                }
-            }ˇ»
-            {
-            }
-            "
-        });
-        // cx.simulate_shared_keystrokes("a {").await;
-        // cx.shared_state().await.assert_eq(indoc! {
-        //     "{
-        //         «{
-        //         }ˇ»
-        //     }
-        //     {
-        //     }
-        //     "
-        // });
-    }
-
-    #[gpui::test]
-    async fn test_mode_across_command(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        cx.set_state("aˇbc", Mode::Normal);
-        cx.simulate_keystrokes("ctrl-v");
-        assert_eq!(cx.mode(), Mode::VisualBlock);
-        cx.simulate_keystrokes("cmd-shift-p escape");
-        assert_eq!(cx.mode(), Mode::VisualBlock);
-    }
-
-    #[gpui::test]
-    async fn test_gn(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state("aaˇ aa aa aa aa").await;
-        cx.simulate_shared_keystrokes("/ a a enter").await;
-        cx.shared_state().await.assert_eq("aa ˇaa aa aa aa");
-        cx.simulate_shared_keystrokes("g n").await;
-        cx.shared_state().await.assert_eq("aa «aaˇ» aa aa aa");
-        cx.simulate_shared_keystrokes("g n").await;
-        cx.shared_state().await.assert_eq("aa «aa aaˇ» aa aa");
-        cx.simulate_shared_keystrokes("escape d g n").await;
-        cx.shared_state().await.assert_eq("aa aa ˇ aa aa");
-
-        cx.set_shared_state("aaˇ aa aa aa aa").await;
-        cx.simulate_shared_keystrokes("/ a a enter").await;
-        cx.shared_state().await.assert_eq("aa ˇaa aa aa aa");
-        cx.simulate_shared_keystrokes("3 g n").await;
-        cx.shared_state().await.assert_eq("aa aa aa «aaˇ» aa");
-
-        cx.set_shared_state("aaˇ aa aa aa aa").await;
-        cx.simulate_shared_keystrokes("/ a a enter").await;
-        cx.shared_state().await.assert_eq("aa ˇaa aa aa aa");
-        cx.simulate_shared_keystrokes("g shift-n").await;
-        cx.shared_state().await.assert_eq("aa «ˇaa» aa aa aa");
-        cx.simulate_shared_keystrokes("g shift-n").await;
-        cx.shared_state().await.assert_eq("«ˇaa aa» aa aa aa");
-    }
-
-    #[gpui::test]
-    async fn test_gl(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        cx.set_state("aaˇ aa\naa", Mode::Normal);
-        cx.simulate_keystrokes("g l");
-        cx.assert_state("«aaˇ» «aaˇ»\naa", Mode::Visual);
-        cx.simulate_keystrokes("g >");
-        cx.assert_state("«aaˇ» aa\n«aaˇ»", Mode::Visual);
-    }
-
-    #[gpui::test]
-    async fn test_dgn_repeat(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state("aaˇ aa aa aa aa").await;
-        cx.simulate_shared_keystrokes("/ a a enter").await;
-        cx.shared_state().await.assert_eq("aa ˇaa aa aa aa");
-        cx.simulate_shared_keystrokes("d g n").await;
-
-        cx.shared_state().await.assert_eq("aa ˇ aa aa aa");
-        cx.simulate_shared_keystrokes(".").await;
-        cx.shared_state().await.assert_eq("aa  ˇ aa aa");
-        cx.simulate_shared_keystrokes(".").await;
-        cx.shared_state().await.assert_eq("aa   ˇ aa");
-    }
-
-    #[gpui::test]
-    async fn test_cgn_repeat(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state("aaˇ aa aa aa aa").await;
-        cx.simulate_shared_keystrokes("/ a a enter").await;
-        cx.shared_state().await.assert_eq("aa ˇaa aa aa aa");
-        cx.simulate_shared_keystrokes("c g n x escape").await;
-        cx.shared_state().await.assert_eq("aa ˇx aa aa aa");
-        cx.simulate_shared_keystrokes(".").await;
-        cx.shared_state().await.assert_eq("aa x ˇx aa aa");
-    }
-
-    #[gpui::test]
-    async fn test_cgn_nomatch(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state("aaˇ aa aa aa aa").await;
-        cx.simulate_shared_keystrokes("/ b b enter").await;
-        cx.shared_state().await.assert_eq("aaˇ aa aa aa aa");
-        cx.simulate_shared_keystrokes("c g n x escape").await;
-        cx.shared_state().await.assert_eq("aaˇaa aa aa aa");
-        cx.simulate_shared_keystrokes(".").await;
-        cx.shared_state().await.assert_eq("aaˇa aa aa aa");
-
-        cx.set_shared_state("aaˇ bb aa aa aa").await;
-        cx.simulate_shared_keystrokes("/ b b enter").await;
-        cx.shared_state().await.assert_eq("aa ˇbb aa aa aa");
-        cx.simulate_shared_keystrokes("c g n x escape").await;
-        cx.shared_state().await.assert_eq("aa ˇx aa aa aa");
-        cx.simulate_shared_keystrokes(".").await;
-        cx.shared_state().await.assert_eq("aa ˇx aa aa aa");
-    }
-
-    #[gpui::test]
-    async fn test_visual_shift_d(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {
-            "The ˇquick brown
-            fox jumps over
-            the lazy dog
-            "
-        })
-        .await;
-        cx.simulate_shared_keystrokes("v down shift-d").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "the ˇlazy dog\n"
-        });
-
-        cx.set_shared_state(indoc! {
-            "The ˇquick brown
-            fox jumps over
-            the lazy dog
-            "
-        })
-        .await;
-        cx.simulate_shared_keystrokes("ctrl-v down shift-d").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "Theˇ•
-            fox•
-            the lazy dog
-            "
-        });
-    }
-
-    #[gpui::test]
-    async fn test_shift_y(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {
-            "The ˇquick brown\n"
-        })
-        .await;
-        cx.simulate_shared_keystrokes("v i w shift-y").await;
-        cx.shared_clipboard().await.assert_eq(indoc! {
-            "The quick brown\n"
-        });
-    }
-
-    #[gpui::test]
-    async fn test_gv(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {
-            "The ˇquick brown"
-        })
-        .await;
-        cx.simulate_shared_keystrokes("v i w escape g v").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "The «quickˇ» brown"
-        });
-
-        cx.simulate_shared_keystrokes("o escape g v").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "The «ˇquick» brown"
-        });
-
-        cx.simulate_shared_keystrokes("escape ^ ctrl-v l").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "«Thˇ»e quick brown"
-        });
-        cx.simulate_shared_keystrokes("g v").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "The «ˇquick» brown"
-        });
-        cx.simulate_shared_keystrokes("g v").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "«Thˇ»e quick brown"
-        });
-
-        cx.set_state(
-            indoc! {"
-            fiˇsh one
-            fish two
-            fish red
-            fish blue
-        "},
-            Mode::Normal,
-        );
-        cx.simulate_keystrokes("4 g l escape escape g v");
-        cx.assert_state(
-            indoc! {"
-                «fishˇ» one
-                «fishˇ» two
-                «fishˇ» red
-                «fishˇ» blue
-            "},
-            Mode::Visual,
-        );
-        cx.simulate_keystrokes("y g v");
-        cx.assert_state(
-            indoc! {"
-                «fishˇ» one
-                «fishˇ» two
-                «fishˇ» red
-                «fishˇ» blue
-            "},
-            Mode::Visual,
-        );
-    }
-
-    #[gpui::test]
-    async fn test_p_g_v_y(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {
-            "The
-            quicˇk
-            brown
-            fox"
-        })
-        .await;
-        cx.simulate_shared_keystrokes("y y j shift-v p g v y").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "The
-            quick
-            ˇquick
-            fox"
-        });
-        cx.shared_clipboard().await.assert_eq("quick\n");
-    }
-
-    #[gpui::test]
-    async fn test_v2ap(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await;
-
-        cx.set_shared_state(indoc! {
-            "The
-            quicˇk
-
-            brown
-            fox"
-        })
-        .await;
-        cx.simulate_shared_keystrokes("v 2 a p").await;
-        cx.shared_state().await.assert_eq(indoc! {
-            "«The
-            quick
-
-            brown
-            fˇ»ox"
-        });
-    }
-
-    #[gpui::test]
-    async fn test_visual_syntax_sibling_selection(cx: &mut gpui::TestAppContext) {
-        let mut cx = VimTestContext::new(cx, true).await;
-
-        cx.set_state(
-            indoc! {"
-                fn test() {
-                    let ˇa = 1;
-                    let b = 2;
-                    let c = 3;
-                }
-            "},
-            Mode::Normal,
-        );
-
-        // Enter visual mode and select the statement
-        cx.simulate_keystrokes("v w w w");
-        cx.assert_state(
-            indoc! {"
-                fn test() {
-                    let «a = 1;ˇ»
-                    let b = 2;
-                    let c = 3;
-                }
-            "},
-            Mode::Visual,
-        );
-
-        // The specific behavior of syntax sibling selection in vim mode
-        // would depend on the key bindings configured, but the actions
-        // are now available for use
-    }
-}
diff --git a/crates/vim/test_data/neovim_backed_test_context_works.json b/crates/vim/test_data/neovim_backed_test_context_works.json
deleted file mode 100644
index 3ed9f40f88..0000000000
--- a/crates/vim/test_data/neovim_backed_test_context_works.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{"Get":{"state":"ˇ","mode":"Normal"}}
-{"Put":{"state":"This is a tesˇt"}}
-{"Get":{"state":"This is a tesˇt","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_a.json b/crates/vim/test_data/test_a.json
deleted file mode 100644
index 8094974f98..0000000000
--- a/crates/vim/test_data/test_a.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"Put":{"state":"The qˇuick"}}
-{"Key":"a"}
-{"Get":{"state":"The quˇick","mode":"Insert"}}
-{"Put":{"state":"The quicˇk"}}
-{"Key":"a"}
-{"Get":{"state":"The quickˇ","mode":"Insert"}}
diff --git a/crates/vim/test_data/test_around_containing_word_indent.json b/crates/vim/test_data/test_around_containing_word_indent.json
deleted file mode 100644
index 6707ff6804..0000000000
--- a/crates/vim/test_data/test_around_containing_word_indent.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{"Put":{"state":"    ˇconst f = (x: unknown) => {"}}
-{"Key":"v"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"    «const ˇ»f = (x: unknown) => {","mode":"Visual"}}
-{"Put":{"state":"    ˇconst f = (x: unknown) => {"}}
-{"Key":"y"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"    ˇconst f = (x: unknown) => {","mode":"Normal"}}
-{"ReadRegister":{"name":"\"","value":"const "}}
-{"Put":{"state":"    ˇconst f = (x: unknown) => {"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"    ˇf = (x: unknown) => {","mode":"Normal"}}
-{"ReadRegister":{"name":"\"","value":"const "}}
-{"Put":{"state":"    ˇconst f = (x: unknown) => {"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"    ˇf = (x: unknown) => {","mode":"Insert"}}
-{"ReadRegister":{"name":"\"","value":"const "}}
diff --git a/crates/vim/test_data/test_b.json b/crates/vim/test_data/test_b.json
deleted file mode 100644
index 4324f9610d..0000000000
--- a/crates/vim/test_data/test_b.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{"Put":{"state":"ˇThe quick-brown\n\n\nfox_jumps over\nthe"}}
-{"Key":"b"}
-{"Get":{"state":"ˇThe quick-brown\n\n\nfox_jumps over\nthe","mode":"Normal"}}
-{"Put":{"state":"The ˇquick-brown\n\n\nfox_jumps over\nthe"}}
-{"Key":"b"}
-{"Get":{"state":"ˇThe quick-brown\n\n\nfox_jumps over\nthe","mode":"Normal"}}
-{"Put":{"state":"The quickˇ-brown\n\n\nfox_jumps over\nthe"}}
-{"Key":"b"}
-{"Get":{"state":"The ˇquick-brown\n\n\nfox_jumps over\nthe","mode":"Normal"}}
-{"Put":{"state":"The quick-ˇbrown\n\n\nfox_jumps over\nthe"}}
-{"Key":"b"}
-{"Get":{"state":"The quickˇ-brown\n\n\nfox_jumps over\nthe","mode":"Normal"}}
-{"Put":{"state":"The quick-brown\nˇ\n\nfox_jumps over\nthe"}}
-{"Key":"b"}
-{"Get":{"state":"The quick-ˇbrown\n\n\nfox_jumps over\nthe","mode":"Normal"}}
-{"Put":{"state":"The quick-brown\n\nˇ\nfox_jumps over\nthe"}}
-{"Key":"b"}
-{"Get":{"state":"The quick-brown\nˇ\n\nfox_jumps over\nthe","mode":"Normal"}}
-{"Put":{"state":"The quick-brown\n\n\nˇfox_jumps over\nthe"}}
-{"Key":"b"}
-{"Get":{"state":"The quick-brown\n\nˇ\nfox_jumps over\nthe","mode":"Normal"}}
-{"Put":{"state":"The quick-brown\n\n\nfox_jumps ˇover\nthe"}}
-{"Key":"b"}
-{"Get":{"state":"The quick-brown\n\n\nˇfox_jumps over\nthe","mode":"Normal"}}
-{"Put":{"state":"The quick-brown\n\n\nfox_jumps over\nˇthe"}}
-{"Key":"b"}
-{"Get":{"state":"The quick-brown\n\n\nfox_jumps ˇover\nthe","mode":"Normal"}}
-{"Put":{"state":"ˇThe quick-brown\n\n\nfox_jumps over\nthe"}}
-{"Key":"shift-b"}
-{"Get":{"state":"ˇThe quick-brown\n\n\nfox_jumps over\nthe","mode":"Normal"}}
-{"Put":{"state":"The ˇquick-brown\n\n\nfox_jumps over\nthe"}}
-{"Key":"shift-b"}
-{"Get":{"state":"ˇThe quick-brown\n\n\nfox_jumps over\nthe","mode":"Normal"}}
-{"Put":{"state":"The quickˇ-brown\n\n\nfox_jumps over\nthe"}}
-{"Key":"shift-b"}
-{"Get":{"state":"The ˇquick-brown\n\n\nfox_jumps over\nthe","mode":"Normal"}}
-{"Put":{"state":"The quick-ˇbrown\n\n\nfox_jumps over\nthe"}}
-{"Key":"shift-b"}
-{"Get":{"state":"The ˇquick-brown\n\n\nfox_jumps over\nthe","mode":"Normal"}}
-{"Put":{"state":"The quick-brown\nˇ\n\nfox_jumps over\nthe"}}
-{"Key":"shift-b"}
-{"Get":{"state":"The ˇquick-brown\n\n\nfox_jumps over\nthe","mode":"Normal"}}
-{"Put":{"state":"The quick-brown\n\nˇ\nfox_jumps over\nthe"}}
-{"Key":"shift-b"}
-{"Get":{"state":"The quick-brown\nˇ\n\nfox_jumps over\nthe","mode":"Normal"}}
-{"Put":{"state":"The quick-brown\n\n\nˇfox_jumps over\nthe"}}
-{"Key":"shift-b"}
-{"Get":{"state":"The quick-brown\n\nˇ\nfox_jumps over\nthe","mode":"Normal"}}
-{"Put":{"state":"The quick-brown\n\n\nfox_jumps ˇover\nthe"}}
-{"Key":"shift-b"}
-{"Get":{"state":"The quick-brown\n\n\nˇfox_jumps over\nthe","mode":"Normal"}}
-{"Put":{"state":"The quick-brown\n\n\nfox_jumps over\nˇthe"}}
-{"Key":"shift-b"}
-{"Get":{"state":"The quick-brown\n\n\nfox_jumps ˇover\nthe","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_backspace.json b/crates/vim/test_data/test_backspace.json
deleted file mode 100644
index b11a2562db..0000000000
--- a/crates/vim/test_data/test_backspace.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{"Put":{"state":"ˇThe quick\nbrown"}}
-{"Key":"backspace"}
-{"Get":{"state":"ˇThe quick\nbrown","mode":"Normal"}}
-{"Put":{"state":"The qˇuick\nbrown"}}
-{"Key":"backspace"}
-{"Get":{"state":"The ˇquick\nbrown","mode":"Normal"}}
-{"Put":{"state":"The quick\nˇbrown"}}
-{"Key":"backspace"}
-{"Get":{"state":"The quicˇk\nbrown","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_backspace_non_ascii_bol.json b/crates/vim/test_data/test_backspace_non_ascii_bol.json
deleted file mode 100644
index 88536bc50d..0000000000
--- a/crates/vim/test_data/test_backspace_non_ascii_bol.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{"Put":{"state":"ππππ\nπanˇotherline"}}
-{"Key":"4"}
-{"Key":"backspace"}
-{"Get":{"state":"πππˇπ\nπanotherline","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_backwards_n.json b/crates/vim/test_data/test_backwards_n.json
deleted file mode 100644
index a08cc84d21..0000000000
--- a/crates/vim/test_data/test_backwards_n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{"Put":{"state":"ˇa b a b a b a"}}
-{"Key":"*"}
-{"Key":"n"}
-{"Get":{"state":"a b a b ˇa b a","mode":"Normal"}}
-{"Key":"#"}
-{"Get":{"state":"a b ˇa b a b a","mode":"Normal"}}
-{"Key":"n"}
-{"Get":{"state":"ˇa b a b a b a","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_blackhole_register.json b/crates/vim/test_data/test_blackhole_register.json
deleted file mode 100644
index e16bb3abe3..0000000000
--- a/crates/vim/test_data/test_blackhole_register.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{"Put":{"state":"ˇhello world"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"w"}
-{"Key":"\""}
-{"Key":"_"}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"w"}
-{"Key":"p"}
-{"Get":{"state":"hellˇo","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_builtin_marks.json b/crates/vim/test_data/test_builtin_marks.json
deleted file mode 100644
index 0d05385960..0000000000
--- a/crates/vim/test_data/test_builtin_marks.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{"Put":{"state":"Line one\nLine two\nLine ˇthree\nLine four\nLine five\n"}}
-{"Key":"v"}
-{"Key":"j"}
-{"Key":"escape"}
-{"Key":"k"}
-{"Key":"k"}
-{"Key":"'"}
-{"Key":"<"}
-{"Get":{"state":"Line one\nLine two\nˇLine three\nLine four\nLine five\n","mode":"Normal"}}
-{"Key":"`"}
-{"Key":"<"}
-{"Get":{"state":"Line one\nLine two\nLine ˇthree\nLine four\nLine five\n","mode":"Normal"}}
-{"Key":"'"}
-{"Key":">"}
-{"Get":{"state":"Line one\nLine two\nLine three\nˇLine four\nLine five\n","mode":"Normal"}}
-{"Key":"`"}
-{"Key":">"}
-{"Get":{"state":"Line one\nLine two\nLine three\nLine ˇfour\nLine five\n","mode":"Normal"}}
-{"Key":"g"}
-{"Key":"g"}
-{"Key":"^"}
-{"Key":"j"}
-{"Key":"j"}
-{"Key":"l"}
-{"Key":"l"}
-{"Key":"c"}
-{"Key":"e"}
-{"Key":"k"}
-{"Key":"e"}
-{"Key":"escape"}
-{"Key":"'"}
-{"Key":"."}
-{"Get":{"state":"Line one\nLine two\nˇLike three\nLine four\nLine five\n","mode":"Normal"}}
-{"Key":"`"}
-{"Key":"."}
-{"Get":{"state":"Line one\nLine two\nLiˇke three\nLine four\nLine five\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_capital_f_and_capital_t.json b/crates/vim/test_data/test_capital_f_and_capital_t.json
deleted file mode 100644
index 8ef45ec623..0000000000
--- a/crates/vim/test_data/test_capital_f_and_capital_t.json
+++ /dev/null
@@ -1,570 +0,0 @@
-{"Put":{"state":"ˇaaab b   bb aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"1"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"ˇaaab b   bb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaaˇb b   bb aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"1"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaaˇb b   bb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaabˇ b   bb aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"1"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaaˇb b   bb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab ˇb   bb aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"1"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaaˇb b   bb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab bˇ   bb aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"1"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaab ˇb   bb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   ˇbb aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"1"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaab ˇb   bb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bˇb aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"1"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   ˇbb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bbˇ aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"1"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bˇb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aˇaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"1"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bˇb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaaˇbaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"1"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bˇb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\nˇ    baaa bbb\n   \nb\n"}}
-{"Key":"1"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\nˇ    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    ˇbaaa bbb\n   \nb\n"}}
-{"Key":"1"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    ˇbaaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    bˇaaa bbb\n   \nb\n"}}
-{"Key":"1"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    ˇbaaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaˇa bbb\n   \nb\n"}}
-{"Key":"1"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    ˇbaaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa ˇbbb\n   \nb\n"}}
-{"Key":"1"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    ˇbaaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa bˇbb\n   \nb\n"}}
-{"Key":"1"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa ˇbbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa bbˇb\n   \nb\n"}}
-{"Key":"1"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bˇbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa bbb\nˇ   \nb\n"}}
-{"Key":"1"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bbb\nˇ   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa bbb\n   \nˇb\n"}}
-{"Key":"1"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bbb\n   \nˇb\n","mode":"Normal"}}
-{"Put":{"state":"ˇaaab b   bb aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"1"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"ˇaaab b   bb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaaˇb b   bb aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"1"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaaˇb b   bb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaabˇ b   bb aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"1"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaabˇ b   bb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab ˇb   bb aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"1"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaabˇ b   bb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab bˇ   bb aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"1"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaab bˇ   bb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   ˇbb aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"1"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaab bˇ   bb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bˇb aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"1"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bˇb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bbˇ aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"1"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bbˇ aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aˇaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"1"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bbˇ aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaaˇbaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"1"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bbˇ aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\nˇ    baaa bbb\n   \nb\n"}}
-{"Key":"1"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\nˇ    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    ˇbaaa bbb\n   \nb\n"}}
-{"Key":"1"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    ˇbaaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    bˇaaa bbb\n   \nb\n"}}
-{"Key":"1"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    bˇaaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaˇa bbb\n   \nb\n"}}
-{"Key":"1"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    bˇaaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa ˇbbb\n   \nb\n"}}
-{"Key":"1"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    bˇaaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa bˇbb\n   \nb\n"}}
-{"Key":"1"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bˇbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa bbˇb\n   \nb\n"}}
-{"Key":"1"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bbˇb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa bbb\nˇ   \nb\n"}}
-{"Key":"1"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bbb\nˇ   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa bbb\n   \nˇb\n"}}
-{"Key":"1"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bbb\n   \nˇb\n","mode":"Normal"}}
-{"Put":{"state":"ˇaaab b   bb aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"2"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"ˇaaab b   bb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaaˇb b   bb aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"2"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaaˇb b   bb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaabˇ b   bb aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"2"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaabˇ b   bb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab ˇb   bb aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"2"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaab ˇb   bb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab bˇ   bb aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"2"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaaˇb b   bb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   ˇbb aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"2"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaaˇb b   bb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bˇb aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"2"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaab ˇb   bb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bbˇ aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"2"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   ˇbb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aˇaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"2"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   ˇbb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaaˇbaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"2"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   ˇbb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\nˇ    baaa bbb\n   \nb\n"}}
-{"Key":"2"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\nˇ    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    ˇbaaa bbb\n   \nb\n"}}
-{"Key":"2"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    ˇbaaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    bˇaaa bbb\n   \nb\n"}}
-{"Key":"2"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    bˇaaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaˇa bbb\n   \nb\n"}}
-{"Key":"2"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaˇa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa ˇbbb\n   \nb\n"}}
-{"Key":"2"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa ˇbbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa bˇbb\n   \nb\n"}}
-{"Key":"2"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    ˇbaaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa bbˇb\n   \nb\n"}}
-{"Key":"2"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa ˇbbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa bbb\nˇ   \nb\n"}}
-{"Key":"2"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bbb\nˇ   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa bbb\n   \nˇb\n"}}
-{"Key":"2"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bbb\n   \nˇb\n","mode":"Normal"}}
-{"Put":{"state":"ˇaaab b   bb aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"2"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"ˇaaab b   bb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaaˇb b   bb aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"2"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaaˇb b   bb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaabˇ b   bb aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"2"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaabˇ b   bb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab ˇb   bb aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"2"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaab ˇb   bb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab bˇ   bb aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"2"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaabˇ b   bb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   ˇbb aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"2"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaabˇ b   bb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bˇb aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"2"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaab bˇ   bb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bbˇ aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"2"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bˇb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aˇaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"2"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bˇb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaaˇbaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"2"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bˇb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\nˇ    baaa bbb\n   \nb\n"}}
-{"Key":"2"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\nˇ    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    ˇbaaa bbb\n   \nb\n"}}
-{"Key":"2"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    ˇbaaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    bˇaaa bbb\n   \nb\n"}}
-{"Key":"2"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    bˇaaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaˇa bbb\n   \nb\n"}}
-{"Key":"2"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaˇa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa ˇbbb\n   \nb\n"}}
-{"Key":"2"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa ˇbbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa bˇbb\n   \nb\n"}}
-{"Key":"2"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    bˇaaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa bbˇb\n   \nb\n"}}
-{"Key":"2"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bˇbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa bbb\nˇ   \nb\n"}}
-{"Key":"2"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bbb\nˇ   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa bbb\n   \nˇb\n"}}
-{"Key":"2"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bbb\n   \nˇb\n","mode":"Normal"}}
-{"Put":{"state":"ˇaaab b   bb aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"3"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"ˇaaab b   bb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaaˇb b   bb aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"3"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaaˇb b   bb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaabˇ b   bb aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"3"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaabˇ b   bb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab ˇb   bb aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"3"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaab ˇb   bb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab bˇ   bb aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"3"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaab bˇ   bb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   ˇbb aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"3"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   ˇbb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bˇb aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"3"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaaˇb b   bb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bbˇ aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"3"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaab ˇb   bb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aˇaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"3"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaab ˇb   bb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaaˇbaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"3"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaab ˇb   bb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\nˇ    baaa bbb\n   \nb\n"}}
-{"Key":"3"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\nˇ    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    ˇbaaa bbb\n   \nb\n"}}
-{"Key":"3"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    ˇbaaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    bˇaaa bbb\n   \nb\n"}}
-{"Key":"3"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    bˇaaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaˇa bbb\n   \nb\n"}}
-{"Key":"3"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaˇa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa ˇbbb\n   \nb\n"}}
-{"Key":"3"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa ˇbbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa bˇbb\n   \nb\n"}}
-{"Key":"3"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bˇbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa bbˇb\n   \nb\n"}}
-{"Key":"3"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    ˇbaaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa bbb\nˇ   \nb\n"}}
-{"Key":"3"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bbb\nˇ   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa bbb\n   \nˇb\n"}}
-{"Key":"3"}
-{"Key":"shift-f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bbb\n   \nˇb\n","mode":"Normal"}}
-{"Put":{"state":"ˇaaab b   bb aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"3"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"ˇaaab b   bb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaaˇb b   bb aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"3"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaaˇb b   bb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaabˇ b   bb aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"3"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaabˇ b   bb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab ˇb   bb aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"3"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaab ˇb   bb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab bˇ   bb aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"3"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaab bˇ   bb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   ˇbb aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"3"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   ˇbb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bˇb aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"3"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaabˇ b   bb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bbˇ aaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"3"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaab bˇ   bb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aˇaabaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"3"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaab bˇ   bb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaaˇbaaa\n    baaa bbb\n   \nb\n"}}
-{"Key":"3"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaab bˇ   bb aaabaaa\n    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\nˇ    baaa bbb\n   \nb\n"}}
-{"Key":"3"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\nˇ    baaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    ˇbaaa bbb\n   \nb\n"}}
-{"Key":"3"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    ˇbaaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    bˇaaa bbb\n   \nb\n"}}
-{"Key":"3"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    bˇaaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaˇa bbb\n   \nb\n"}}
-{"Key":"3"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaˇa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa ˇbbb\n   \nb\n"}}
-{"Key":"3"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa ˇbbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa bˇbb\n   \nb\n"}}
-{"Key":"3"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bˇbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa bbˇb\n   \nb\n"}}
-{"Key":"3"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    bˇaaa bbb\n   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa bbb\nˇ   \nb\n"}}
-{"Key":"3"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bbb\nˇ   \nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa bbb\n   \nˇb\n"}}
-{"Key":"3"}
-{"Key":"shift-t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bbb\n   \nˇb\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_caret_mark.json b/crates/vim/test_data/test_caret_mark.json
deleted file mode 100644
index 6a117e9968..0000000000
--- a/crates/vim/test_data/test_caret_mark.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{"Put":{"state":"Line one\nLine two\nLine three\nˇLine four\nLine five\n"}}
-{"Key":"c"}
-{"Key":"w"}
-{"Key":"shift-s"}
-{"Key":"t"}
-{"Key":"r"}
-{"Key":"a"}
-{"Key":"i"}
-{"Key":"g"}
-{"Key":"h"}
-{"Key":"t"}
-{"Key":"space"}
-{"Key":"t"}
-{"Key":"h"}
-{"Key":"i"}
-{"Key":"n"}
-{"Key":"g"}
-{"Key":"escape"}
-{"Key":"j"}
-{"Key":"j"}
-{"Key":"'"}
-{"Key":"^"}
-{"Get":{"state":"Line one\nLine two\nLine three\nˇStraight thing four\nLine five\n","mode":"Normal"}}
-{"Key":"`"}
-{"Key":"^"}
-{"Get":{"state":"Line one\nLine two\nLine three\nStraight thingˇ four\nLine five\n","mode":"Normal"}}
-{"Key":"k"}
-{"Key":"a"}
-{"Key":"!"}
-{"Key":"escape"}
-{"Key":"k"}
-{"Key":"g"}
-{"Key":"i"}
-{"Key":"?"}
-{"Get":{"state":"Line one\nLine two\nLine three!?ˇ\nStraight thing four\nLine five\n","mode":"Insert"}}
diff --git a/crates/vim/test_data/test_cc.json b/crates/vim/test_data/test_cc.json
deleted file mode 100644
index d4b4a499bb..0000000000
--- a/crates/vim/test_data/test_cc.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{"Put":{"state":"ˇ"}}
-{"Key":"c"}
-{"Key":"c"}
-{"Get":{"state":"ˇ","mode":"Insert"}}
-{"Put":{"state":"The ˇquick"}}
-{"Key":"c"}
-{"Key":"c"}
-{"Get":{"state":"ˇ","mode":"Insert"}}
-{"Put":{"state":"The quˇick\nbrown fox\njumps over"}}
-{"Key":"c"}
-{"Key":"c"}
-{"Get":{"state":"ˇ\nbrown fox\njumps over","mode":"Insert"}}
-{"Put":{"state":"The quick\nbrown ˇfox\njumps over"}}
-{"Key":"c"}
-{"Key":"c"}
-{"Get":{"state":"The quick\nˇ\njumps over","mode":"Insert"}}
-{"Put":{"state":"The quick\nbrown fox\njumps ˇover"}}
-{"Key":"c"}
-{"Key":"c"}
-{"Get":{"state":"The quick\nbrown fox\nˇ","mode":"Insert"}}
-{"Put":{"state":"The quick\nˇ\nbrown fox"}}
-{"Key":"c"}
-{"Key":"c"}
-{"Get":{"state":"The quick\nˇ\nbrown fox","mode":"Insert"}}
diff --git a/crates/vim/test_data/test_cgn_nomatch.json b/crates/vim/test_data/test_cgn_nomatch.json
deleted file mode 100644
index 9c2f02bb85..0000000000
--- a/crates/vim/test_data/test_cgn_nomatch.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{"Put":{"state":"aaˇ aa aa aa aa"}}
-{"Key":"/"}
-{"Key":"b"}
-{"Key":"b"}
-{"Key":"enter"}
-{"Get":{"state":"aaˇ aa aa aa aa","mode":"Normal"}}
-{"Key":"c"}
-{"Key":"g"}
-{"Key":"n"}
-{"Key":"x"}
-{"Key":"escape"}
-{"Get":{"state":"aaˇaa aa aa aa","mode":"Normal"}}
-{"Key":"."}
-{"Get":{"state":"aaˇa aa aa aa","mode":"Normal"}}
-{"Put":{"state":"aaˇ bb aa aa aa"}}
-{"Key":"/"}
-{"Key":"b"}
-{"Key":"b"}
-{"Key":"enter"}
-{"Get":{"state":"aa ˇbb aa aa aa","mode":"Normal"}}
-{"Key":"c"}
-{"Key":"g"}
-{"Key":"n"}
-{"Key":"x"}
-{"Key":"escape"}
-{"Get":{"state":"aa ˇx aa aa aa","mode":"Normal"}}
-{"Key":"."}
-{"Get":{"state":"aa ˇx aa aa aa","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_cgn_repeat.json b/crates/vim/test_data/test_cgn_repeat.json
deleted file mode 100644
index 4683a83d07..0000000000
--- a/crates/vim/test_data/test_cgn_repeat.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{"Put":{"state":"aaˇ aa aa aa aa"}}
-{"Key":"/"}
-{"Key":"a"}
-{"Key":"a"}
-{"Key":"enter"}
-{"Get":{"state":"aa ˇaa aa aa aa","mode":"Normal"}}
-{"Key":"c"}
-{"Key":"g"}
-{"Key":"n"}
-{"Key":"x"}
-{"Key":"escape"}
-{"Get":{"state":"aa ˇx aa aa aa","mode":"Normal"}}
-{"Key":"."}
-{"Get":{"state":"aa x ˇx aa aa","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_change_0.json b/crates/vim/test_data/test_change_0.json
deleted file mode 100644
index 90668f4a17..0000000000
--- a/crates/vim/test_data/test_change_0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{"Put":{"state":"The qˇuick\nbrown fox"}}
-{"Key":"c"}
-{"Key":"0"}
-{"Get":{"state":"ˇuick\nbrown fox","mode":"Insert"}}
-{"Put":{"state":"The quick\nˇ\nbrown fox"}}
-{"Key":"c"}
-{"Key":"0"}
-{"Get":{"state":"The quick\nˇ\nbrown fox","mode":"Insert"}}
diff --git a/crates/vim/test_data/test_change_b.json b/crates/vim/test_data/test_change_b.json
deleted file mode 100644
index d43cc04c45..0000000000
--- a/crates/vim/test_data/test_change_b.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{"Put":{"state":"Teˇst Test"}}
-{"Key":"c"}
-{"Key":"b"}
-{"Get":{"state":"ˇst Test","mode":"Insert"}}
-{"Put":{"state":"Test ˇtest"}}
-{"Key":"c"}
-{"Key":"b"}
-{"Get":{"state":"ˇtest","mode":"Insert"}}
-{"Put":{"state":"Test1 test2 ˇtest3"}}
-{"Key":"c"}
-{"Key":"b"}
-{"Get":{"state":"Test1 ˇtest3","mode":"Insert"}}
-{"Put":{"state":"Test test\nˇtest"}}
-{"Key":"c"}
-{"Key":"b"}
-{"Get":{"state":"Test ˇ\ntest","mode":"Insert"}}
-{"Put":{"state":"Test test\nˇ\ntest"}}
-{"Key":"c"}
-{"Key":"b"}
-{"Get":{"state":"Test ˇ\n\ntest","mode":"Insert"}}
-{"Put":{"state":"Test test-test ˇtest"}}
-{"Key":"c"}
-{"Key":"shift-b"}
-{"Get":{"state":"Test ˇtest","mode":"Insert"}}
diff --git a/crates/vim/test_data/test_change_backspace.json b/crates/vim/test_data/test_change_backspace.json
deleted file mode 100644
index 508500163b..0000000000
--- a/crates/vim/test_data/test_change_backspace.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{"Put":{"state":"Teˇst"}}
-{"Key":"c"}
-{"Key":"backspace"}
-{"Get":{"state":"Tˇst","mode":"Insert"}}
-{"Put":{"state":"Tˇest"}}
-{"Key":"c"}
-{"Key":"backspace"}
-{"Get":{"state":"ˇest","mode":"Insert"}}
-{"Put":{"state":"ˇTest"}}
-{"Key":"c"}
-{"Key":"backspace"}
-{"Get":{"state":"ˇTest","mode":"Insert"}}
-{"Put":{"state":"Test\nˇtest"}}
-{"Key":"c"}
-{"Key":"backspace"}
-{"Get":{"state":"Testˇtest","mode":"Insert"}}
diff --git a/crates/vim/test_data/test_change_case.json b/crates/vim/test_data/test_change_case.json
deleted file mode 100644
index 10eb93b227..0000000000
--- a/crates/vim/test_data/test_change_case.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{"Put":{"state":"ˇabC\n"}}
-{"Key":"~"}
-{"Get":{"state":"AˇbC\n","mode":"Normal"}}
-{"Key":"2"}
-{"Key":"~"}
-{"Get":{"state":"ABˇc\n","mode":"Normal"}}
-{"Put":{"state":"a😀C«dÉ1*fˇ»\n"}}
-{"Key":"~"}
-{"Get":{"state":"a😀CˇDé1*F\n","mode":"Normal"}}
-{"Key":"~"}
-{"Put":{"state":"aˇC😀é1*F\n"}}
-{"Key":"4"}
-{"Key":"~"}
-{"Get":{"state":"ac😀É1ˇ*F\n","mode":"Normal"}}
-{"Put":{"state":"abˇC\n"}}
-{"Key":"shift-v"}
-{"Key":"~"}
-{"Get":{"state":"ˇABc\n","mode":"Normal"}}
-{"Put":{"state":"ˇaa\nbb\ncc"}}
-{"Key":"ctrl-v"}
-{"Key":"j"}
-{"Key":"~"}
-{"Get":{"state":"ˇAa\nBb\ncc","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_change_case_motion.json b/crates/vim/test_data/test_change_case_motion.json
deleted file mode 100644
index 18921f08a2..0000000000
--- a/crates/vim/test_data/test_change_case_motion.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{"Put":{"state":"ˇabc def"}}
-{"Key":"g"}
-{"Key":"shift-u"}
-{"Key":"w"}
-{"Get":{"state":"ˇABC def","mode":"Normal"}}
-{"Key":"g"}
-{"Key":"u"}
-{"Key":"w"}
-{"Get":{"state":"ˇabc def","mode":"Normal"}}
-{"Key":"g"}
-{"Key":"~"}
-{"Key":"w"}
-{"Get":{"state":"ˇABC def","mode":"Normal"}}
-{"Key":"."}
-{"Get":{"state":"ˇabc def","mode":"Normal"}}
-{"Put":{"state":"abˇc def"}}
-{"Key":"g"}
-{"Key":"~"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"ˇABC def","mode":"Normal"}}
-{"Key":"."}
-{"Get":{"state":"ˇabc def","mode":"Normal"}}
-{"Key":"g"}
-{"Key":"shift-u"}
-{"Key":"$"}
-{"Get":{"state":"ˇABC DEF","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_change_case_motion_object.json b/crates/vim/test_data/test_change_case_motion_object.json
deleted file mode 100644
index b2157975bd..0000000000
--- a/crates/vim/test_data/test_change_case_motion_object.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"Put":{"state":"abc dˇef\n"}}
-{"Key":"g"}
-{"Key":"shift-u"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"abc ˇDEF\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_change_cc.json b/crates/vim/test_data/test_change_cc.json
deleted file mode 100644
index e2d1cb8d21..0000000000
--- a/crates/vim/test_data/test_change_cc.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{"Put":{"state":"The quick\n  brownˇ fox\njumps over\nthe lazy"}}
-{"Key":"c"}
-{"Key":"c"}
-{"Get":{"state":"The quick\n  ˇ\njumps over\nthe lazy","mode":"Insert"}}
-{"Put":{"state":"ˇThe quick\nbrown fox\njumps over\nthe lazy"}}
-{"Key":"c"}
-{"Key":"c"}
-{"Get":{"state":"ˇ\nbrown fox\njumps over\nthe lazy","mode":"Insert"}}
-{"Put":{"state":"The quick\n  broˇwn fox\njumps over\nthe lazy"}}
-{"Key":"c"}
-{"Key":"c"}
-{"Get":{"state":"The quick\n  ˇ\njumps over\nthe lazy","mode":"Insert"}}
diff --git a/crates/vim/test_data/test_change_e.json b/crates/vim/test_data/test_change_e.json
deleted file mode 100644
index fc9f91fe02..0000000000
--- a/crates/vim/test_data/test_change_e.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{"Put":{"state":"Teˇst Test"}}
-{"Key":"c"}
-{"Key":"e"}
-{"Get":{"state":"Teˇ Test","mode":"Insert"}}
-{"Put":{"state":"Tˇest test"}}
-{"Key":"c"}
-{"Key":"e"}
-{"Get":{"state":"Tˇ test","mode":"Insert"}}
-{"Put":{"state":"Test teˇst\ntest"}}
-{"Key":"c"}
-{"Key":"e"}
-{"Get":{"state":"Test teˇ\ntest","mode":"Insert"}}
-{"Put":{"state":"Test tesˇt\ntest"}}
-{"Key":"c"}
-{"Key":"e"}
-{"Get":{"state":"Test tesˇ","mode":"Insert"}}
-{"Put":{"state":"Test test\nˇ\ntest"}}
-{"Key":"c"}
-{"Key":"e"}
-{"Get":{"state":"Test test\nˇ","mode":"Insert"}}
-{"Put":{"state":"Test teˇst-test test"}}
-{"Key":"c"}
-{"Key":"shift-e"}
-{"Get":{"state":"Test teˇ test","mode":"Insert"}}
diff --git a/crates/vim/test_data/test_change_end_of_document.json b/crates/vim/test_data/test_change_end_of_document.json
deleted file mode 100644
index a3f09e4453..0000000000
--- a/crates/vim/test_data/test_change_end_of_document.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{"Put":{"state":"The quick\nbrownˇ fox\njumps over\nthe lazy"}}
-{"Key":"c"}
-{"Key":"shift-g"}
-{"Get":{"state":"The quick\nˇ","mode":"Insert"}}
-{"Put":{"state":"The quick\nbrownˇ fox\njumps over\nthe lazy"}}
-{"Key":"c"}
-{"Key":"shift-g"}
-{"Get":{"state":"The quick\nˇ","mode":"Insert"}}
-{"Put":{"state":"The quick\nbrown fox\njumps over\nthe lˇazy"}}
-{"Key":"c"}
-{"Key":"shift-g"}
-{"Get":{"state":"The quick\nbrown fox\njumps over\nˇ","mode":"Insert"}}
-{"Put":{"state":"The quick\nbrown fox\njumps over\nˇ"}}
-{"Key":"c"}
-{"Key":"shift-g"}
-{"Get":{"state":"The quick\nbrown fox\njumps over\nˇ","mode":"Insert"}}
diff --git a/crates/vim/test_data/test_change_end_of_line.json b/crates/vim/test_data/test_change_end_of_line.json
deleted file mode 100644
index 44766df85e..0000000000
--- a/crates/vim/test_data/test_change_end_of_line.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{"Put":{"state":"The qˇuick\nbrown fox"}}
-{"Key":"c"}
-{"Key":"$"}
-{"Get":{"state":"The qˇ\nbrown fox","mode":"Insert"}}
-{"Put":{"state":"The quick\nˇ\nbrown fox"}}
-{"Key":"c"}
-{"Key":"$"}
-{"Get":{"state":"The quick\nˇ\nbrown fox","mode":"Insert"}}
diff --git a/crates/vim/test_data/test_change_gg.json b/crates/vim/test_data/test_change_gg.json
deleted file mode 100644
index f4271f7120..0000000000
--- a/crates/vim/test_data/test_change_gg.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{"Put":{"state":"The quick\nbrownˇ fox\njumps over\nthe lazy"}}
-{"Key":"c"}
-{"Key":"g"}
-{"Key":"g"}
-{"Get":{"state":"ˇ\njumps over\nthe lazy","mode":"Insert"}}
-{"Put":{"state":"The quick\nbrown fox\njumps over\nthe lˇazy"}}
-{"Key":"c"}
-{"Key":"g"}
-{"Key":"g"}
-{"Get":{"state":"ˇ","mode":"Insert"}}
-{"Put":{"state":"The qˇuick\nbrown fox\njumps over\nthe lazy"}}
-{"Key":"c"}
-{"Key":"g"}
-{"Key":"g"}
-{"Get":{"state":"ˇ\nbrown fox\njumps over\nthe lazy","mode":"Insert"}}
-{"Put":{"state":"ˇ\nbrown fox\njumps over\nthe lazy"}}
-{"Key":"c"}
-{"Key":"g"}
-{"Key":"g"}
-{"Get":{"state":"ˇ\nbrown fox\njumps over\nthe lazy","mode":"Insert"}}
diff --git a/crates/vim/test_data/test_change_h.json b/crates/vim/test_data/test_change_h.json
deleted file mode 100644
index 6acfb5d080..0000000000
--- a/crates/vim/test_data/test_change_h.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{"Put":{"state":"Teˇst"}}
-{"Key":"c"}
-{"Key":"h"}
-{"Get":{"state":"Tˇst","mode":"Insert"}}
-{"Put":{"state":"Tˇest"}}
-{"Key":"c"}
-{"Key":"h"}
-{"Get":{"state":"ˇest","mode":"Insert"}}
-{"Put":{"state":"ˇTest"}}
-{"Key":"c"}
-{"Key":"h"}
-{"Get":{"state":"ˇTest","mode":"Insert"}}
-{"Put":{"state":"Test\nˇtest"}}
-{"Key":"c"}
-{"Key":"h"}
-{"Get":{"state":"Test\nˇtest","mode":"Insert"}}
diff --git a/crates/vim/test_data/test_change_j.json b/crates/vim/test_data/test_change_j.json
deleted file mode 100644
index 3808bb21e2..0000000000
--- a/crates/vim/test_data/test_change_j.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{"Put":{"state":"The quick\nbrown ˇfox\njumps over"}}
-{"Key":"c"}
-{"Key":"j"}
-{"Get":{"state":"The quick\nˇ","mode":"Insert"}}
-{"Put":{"state":"The quick\nbrown fox\njumps ˇover"}}
-{"Key":"c"}
-{"Key":"j"}
-{"Get":{"state":"The quick\nbrown fox\njumps ˇover","mode":"Normal"}}
-{"Put":{"state":"The qˇuick\nbrown fox\njumps over"}}
-{"Key":"c"}
-{"Key":"j"}
-{"Get":{"state":"ˇ\njumps over","mode":"Insert"}}
-{"Put":{"state":"The quick\nbrown fox\nˇ"}}
-{"Key":"c"}
-{"Key":"j"}
-{"Get":{"state":"The quick\nbrown fox\nˇ","mode":"Normal"}}
-{"Put":{"state":"The quick\n  ˇbrown fox\n  jumps over"}}
-{"Key":"c"}
-{"Key":"j"}
-{"Get":{"state":"The quick\n  ˇ","mode":"Insert"}}
diff --git a/crates/vim/test_data/test_change_k.json b/crates/vim/test_data/test_change_k.json
deleted file mode 100644
index 5ac92744d1..0000000000
--- a/crates/vim/test_data/test_change_k.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{"Put":{"state":"The quick\nbrown ˇfox\njumps over"}}
-{"Key":"c"}
-{"Key":"k"}
-{"Get":{"state":"ˇ\njumps over","mode":"Insert"}}
-{"Put":{"state":"The quick\nbrown fox\njumps ˇover"}}
-{"Key":"c"}
-{"Key":"k"}
-{"Get":{"state":"The quick\nˇ","mode":"Insert"}}
-{"Put":{"state":"The qˇuick\nbrown fox\njumps over"}}
-{"Key":"c"}
-{"Key":"k"}
-{"Get":{"state":"The qˇuick\nbrown fox\njumps over","mode":"Normal"}}
-{"Put":{"state":"ˇ\nbrown fox\njumps over"}}
-{"Key":"c"}
-{"Key":"k"}
-{"Get":{"state":"ˇ\nbrown fox\njumps over","mode":"Normal"}}
-{"Put":{"state":"The quick\n  brown fox\n  ˇjumps over"}}
-{"Key":"c"}
-{"Key":"k"}
-{"Get":{"state":"The quick\n  ˇ","mode":"Insert"}}
diff --git a/crates/vim/test_data/test_change_l.json b/crates/vim/test_data/test_change_l.json
deleted file mode 100644
index 378c5dc7ca..0000000000
--- a/crates/vim/test_data/test_change_l.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{"Put":{"state":"Teˇst"}}
-{"Key":"c"}
-{"Key":"l"}
-{"Get":{"state":"Teˇt","mode":"Insert"}}
-{"Put":{"state":"Tesˇt"}}
-{"Key":"c"}
-{"Key":"l"}
-{"Get":{"state":"Tesˇ","mode":"Insert"}}
diff --git a/crates/vim/test_data/test_change_list_delete.json b/crates/vim/test_data/test_change_list_delete.json
deleted file mode 100644
index ad8b1cbd9e..0000000000
--- a/crates/vim/test_data/test_change_list_delete.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{"Put":{"state":"one two\nthree fˇour"}}
-{"Key":"x"}
-{"Key":"k"}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"w"}
-{"Key":"^"}
-{"Key":"x"}
-{"Get":{"state":"ˇne \nthree fur","mode":"Normal"}}
-{"Key":"2"}
-{"Key":"g"}
-{"Key":";"}
-{"Get":{"state":"ne \nthree fˇur","mode":"Normal"}}
-{"Key":"g"}
-{"Key":","}
-{"Get":{"state":"ˇne \nthree fur","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_change_list_insert.json b/crates/vim/test_data/test_change_list_insert.json
deleted file mode 100644
index d72878d255..0000000000
--- a/crates/vim/test_data/test_change_list_insert.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{"Put":{"state":"ˇ"}}
-{"Key":"i"}
-{"Key":"1"}
-{"Key":"1"}
-{"Key":"escape"}
-{"Key":"shift-o"}
-{"Key":"2"}
-{"Key":"2"}
-{"Key":"escape"}
-{"Key":"shift-g"}
-{"Key":"o"}
-{"Key":"3"}
-{"Key":"3"}
-{"Key":"escape"}
-{"Get":{"state":"22\n11\n3ˇ3","mode":"Normal"}}
-{"Key":"g"}
-{"Key":";"}
-{"Key":"g"}
-{"Key":";"}
-{"Key":"g"}
-{"Key":";"}
-{"Key":"g"}
-{"Key":","}
-{"Key":"shift-g"}
-{"Key":"i"}
-{"Key":"4"}
-{"Key":"4"}
-{"Key":"escape"}
-{"Key":"g"}
-{"Key":";"}
-{"Key":"g"}
-{"Key":";"}
diff --git a/crates/vim/test_data/test_change_paragraph.json b/crates/vim/test_data/test_change_paragraph.json
deleted file mode 100644
index 6d235d9f36..0000000000
--- a/crates/vim/test_data/test_change_paragraph.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{"Put":{"state":"first paragraph\nˇstill first\n\nsecond paragraph\nstill second\n\nthird paragraph\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"ˇ\nsecond paragraph\nstill second\n\nthird paragraph\n","mode":"Insert"}}
-{"ReadRegister":{"name":"\"","value":"first paragraph\nstill first\n\n"}}
-{"Key":"escape"}
-{"Get":{"state":"ˇ\nsecond paragraph\nstill second\n\nthird paragraph\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_change_paragraph_object.json b/crates/vim/test_data/test_change_paragraph_object.json
deleted file mode 100644
index 7de16dac5b..0000000000
--- a/crates/vim/test_data/test_change_paragraph_object.json
+++ /dev/null
@@ -1,430 +0,0 @@
-{"Put":{"state":"ˇThe quick brown fox jumps over the lazy dog."}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"ˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown fox jumpˇs over the lazy dog."}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"ˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown fox jumps over the lazy dogˇ."}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"ˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown fox jumps over the lazy dog.ˇ"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"ˇ","mode":"Insert"}}
-{"Put":{"state":"ˇThe quick brown fox jumps over the lazy dog."}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"ˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown fox jumpˇs over the lazy dog."}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"ˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown fox jumps over the lazy dogˇ."}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"ˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown fox jumps over the lazy dog.ˇ"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"ˇ","mode":"Insert"}}
-{"Put":{"state":"ˇThe quick brown\nfox jumps over\nthe lazy dog.\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"ˇ\n","mode":"Insert"}}
-{"Put":{"state":"The quick brownˇ\nfox jumps over\nthe lazy dog.\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"ˇ\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nˇfox jumps over\nthe lazy dog.\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"ˇ\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nfox jumps overˇ\nthe lazy dog.\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"ˇ\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nfox jumps over\nthe lazy dog.ˇ\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"ˇ\n","mode":"Insert"}}
-{"Put":{"state":"ˇThe quick brown\nfox jumps over\nthe lazy dog.\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"ˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brownˇ\nfox jumps over\nthe lazy dog.\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"ˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nˇfox jumps over\nthe lazy dog.\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"ˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nfox jumps overˇ\nthe lazy dog.\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"ˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nfox jumps over\nthe lazy dog.ˇ\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"ˇ","mode":"Insert"}}
-{"Put":{"state":"ˇ\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\nThe quick brown fox jumps\nover the lazy dog.\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"ˇ\nThe quick brown fox jumps\nover the lazy dog.\n\n\nThe quick brown fox jumps\nover the lazy dog.\n","mode":"Insert"}}
-{"Put":{"state":"\nˇ\nThe quick brown fox jumps\nover the lazy dog.\n\n\nThe quick brown fox jumps\nover the lazy dog.\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"ˇ\nThe quick brown fox jumps\nover the lazy dog.\n\n\nThe quick brown fox jumps\nover the lazy dog.\n","mode":"Insert"}}
-{"Put":{"state":"\n\nˇThe quick brown fox jumps\nover the lazy dog.\n\n\nThe quick brown fox jumps\nover the lazy dog.\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"\n\nˇ\n\n\nThe quick brown fox jumps\nover the lazy dog.\n","mode":"Insert"}}
-{"Put":{"state":"\n\nThe quick brown fox jumps\nˇover the lazy dog.\n\n\nThe quick brown fox jumps\nover the lazy dog.\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"\n\nˇ\n\n\nThe quick brown fox jumps\nover the lazy dog.\n","mode":"Insert"}}
-{"Put":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\nˇ\n\nThe quick brown fox jumps\nover the lazy dog.\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\nˇ\nThe quick brown fox jumps\nover the lazy dog.\n","mode":"Insert"}}
-{"Put":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\n\nˇ\nThe quick brown fox jumps\nover the lazy dog.\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\nˇ\nThe quick brown fox jumps\nover the lazy dog.\n","mode":"Insert"}}
-{"Put":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\nˇThe quick brown fox jumps\nover the lazy dog.\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\nˇ\n","mode":"Insert"}}
-{"Put":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\nThe quick brown fox jumpsˇ\nover the lazy dog.\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\nˇ\n","mode":"Insert"}}
-{"Put":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\nThe quick brown fox jumps\nˇover the lazy dog.\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\nˇ\n","mode":"Insert"}}
-{"Put":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\nThe quick brown fox jumps\nover the lazy dog.ˇ\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\nˇ\n","mode":"Insert"}}
-{"Put":{"state":"ˇ\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\nThe quick brown fox jumps\nover the lazy dog.\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"ˇ\n\n\nThe quick brown fox jumps\nover the lazy dog.\n","mode":"Insert"}}
-{"Put":{"state":"\nˇ\nThe quick brown fox jumps\nover the lazy dog.\n\n\nThe quick brown fox jumps\nover the lazy dog.\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"ˇ\n\n\nThe quick brown fox jumps\nover the lazy dog.\n","mode":"Insert"}}
-{"Put":{"state":"\n\nˇThe quick brown fox jumps\nover the lazy dog.\n\n\nThe quick brown fox jumps\nover the lazy dog.\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"\n\nˇ\nThe quick brown fox jumps\nover the lazy dog.\n","mode":"Insert"}}
-{"Put":{"state":"\n\nThe quick brown fox jumps\nˇover the lazy dog.\n\n\nThe quick brown fox jumps\nover the lazy dog.\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"\n\nˇ\nThe quick brown fox jumps\nover the lazy dog.\n","mode":"Insert"}}
-{"Put":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\nˇ\n\nThe quick brown fox jumps\nover the lazy dog.\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\nˇ\n","mode":"Insert"}}
-{"Put":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\n\nˇ\nThe quick brown fox jumps\nover the lazy dog.\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\nˇ\n","mode":"Insert"}}
-{"Put":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\nˇThe quick brown fox jumps\nover the lazy dog.\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\nˇ","mode":"Insert"}}
-{"Put":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\nThe quick brown fox jumpsˇ\nover the lazy dog.\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\nˇ","mode":"Insert"}}
-{"Put":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\nThe quick brown fox jumps\nˇover the lazy dog.\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\nˇ","mode":"Insert"}}
-{"Put":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\nThe quick brown fox jumps\nover the lazy dog.ˇ\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\nˇ","mode":"Insert"}}
-{"Put":{"state":"ˇThe quick brown fox jumps\nover the lazy dog.\n\n\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"ˇ\n\n\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown fox jumps\nˇover the lazy dog.\n\n\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"ˇ\n\n\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\nˇ\n\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\nˇ\nThe quick brown fox jumps\nover the lazy dog.\n\n\n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\nˇ\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\nˇ\nThe quick brown fox jumps\nover the lazy dog.\n\n\n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\nˇ\nThe quick brown fox jumps\nover the lazy dog.\n\n\n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\nˇ\nThe quick brown fox jumps\nover the lazy dog.\n\n\n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nˇThe quick brown fox jumps\nover the lazy dog.\n\n\n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nˇ\n\n\n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nThe quick brown fox jumpsˇ\nover the lazy dog.\n\n\n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nˇ\n\n\n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nThe quick brown fox jumps\nˇover the lazy dog.\n\n\n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nˇ\n\n\n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nThe quick brown fox jumps\nover the lazy dog.ˇ\n\n\n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nˇ\n\n\n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nThe quick brown fox jumps\nover the lazy dog.\nˇ\n\n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nThe quick brown fox jumps\nover the lazy dog.\nˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nThe quick brown fox jumps\nover the lazy dog.\n\nˇ\n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nThe quick brown fox jumps\nover the lazy dog.\nˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\nˇ\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nThe quick brown fox jumps\nover the lazy dog.\nˇ","mode":"Insert"}}
-{"Put":{"state":"ˇThe quick brown fox jumps\nover the lazy dog.\n\n\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"ˇ\nThe quick brown fox jumps\nover the lazy dog.\n\n\n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown fox jumps\nˇover the lazy dog.\n\n\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"ˇ\nThe quick brown fox jumps\nover the lazy dog.\n\n\n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\nˇ\n\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\nˇ\n\n\n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\nˇ\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\nˇ\n\n\n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\nˇ\nThe quick brown fox jumps\nover the lazy dog.\n\n\n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\nˇ\n\n\n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nˇThe quick brown fox jumps\nover the lazy dog.\n\n\n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nThe quick brown fox jumpsˇ\nover the lazy dog.\n\n\n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nThe quick brown fox jumps\nˇover the lazy dog.\n\n\n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nThe quick brown fox jumps\nover the lazy dog.ˇ\n\n\n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nThe quick brown fox jumps\nover the lazy dog.\nˇ\n\n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nThe quick brown fox jumps\nover the lazy dog.\nˇ\n\n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nThe quick brown fox jumps\nover the lazy dog.\n\nˇ\n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nThe quick brown fox jumps\nover the lazy dog.\n\nˇ\n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\nˇ\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\nˇ\n","mode":"Normal"}}
-{"Put":{"state":"ˇThe quick brown fox jumps\nover the lazy dog.\n\n \t\n\nThe quick brown fox jumps\nover the lazy dog.\n\n \t\n\t \t\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"ˇ\n\n \t\n\nThe quick brown fox jumps\nover the lazy dog.\n\n \t\n\t \t\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\nˇ \t\n\nThe quick brown fox jumps\nover the lazy dog.\n\n \t\n\t \t\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\nˇ\nThe quick brown fox jumps\nover the lazy dog.\n\n \t\n\t \t\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n \t\n\nˇThe quick brown fox jumps\nover the lazy dog.\n\n \t\n\t \t\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n \t\n\nˇ\n\n \t\n\t \t\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n \t\n\nThe quick brown fox jumps\nover the lazy dog.ˇ\n\n \t\n\t \t\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n \t\n\nˇ\n\n \t\n\t \t\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n \t\n\nThe quick brown fox jumps\nover the lazy dog.\nˇ\n \t\n\t \t\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n \t\n\nThe quick brown fox jumps\nover the lazy dog.\nˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n \t\n\nThe quick brown fox jumps\nover the lazy dog.\n\nˇ \t\n\t \t\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n \t\n\nThe quick brown fox jumps\nover the lazy dog.\nˇ","mode":"Insert"}}
-{"Put":{"state":"ˇThe quick brown fox jumps\nover the lazy dog.\n\n \t\n\nThe quick brown fox jumps\nover the lazy dog.\n\n \t\n\t \t\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"ˇ\nThe quick brown fox jumps\nover the lazy dog.\n\n \t\n\t \t\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\nˇ \t\n\nThe quick brown fox jumps\nover the lazy dog.\n\n \t\n\t \t\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\nˇ\n\n \t\n\t \t\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n \t\n\nˇThe quick brown fox jumps\nover the lazy dog.\n\n \t\n\t \t\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n \t\n\nˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n \t\n\nThe quick brown fox jumps\nover the lazy dog.ˇ\n\n \t\n\t \t\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n \t\n\nˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n \t\n\nThe quick brown fox jumps\nover the lazy dog.\nˇ\n \t\n\t \t\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n \t\n\nThe quick brown fox jumps\nover the lazy dog.\nˇ\n \t\n\t \t\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n \t\n\nThe quick brown fox jumps\nover the lazy dog.\n\nˇ \t\n\t \t\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n \t\n\nThe quick brown fox jumps\nover the lazy dog.\n\nˇ \t\n\t \t\n","mode":"Normal"}}
-{"Put":{"state":"ˇThe quick brown fox jumps over the lazy dog.\n\nThe quick brown fox jumps over the lazy dog.\n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"ˇ\n\nThe quick brown fox jumps over the lazy dog.\n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown fox jumps over the lazy dog.\nˇ\nThe quick brown fox jumps over the lazy dog.\n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps over the lazy dog.\nˇ\nThe quick brown fox jumps over the lazy dog.\n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown fox jumps over the lazy dog.\n\nˇThe quick brown fox jumps over the lazy dog.\n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps over the lazy dog.\n\nˇ\n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown fox jumps over the lazy dog.\n\nThe quick brown fox jumpˇs over the lazy dog.\n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps over the lazy dog.\n\nˇ\n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown fox jumps over the lazy dog.\n\nThe quick brown fox jumps over the lazy dog.ˇ\n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps over the lazy dog.\n\nˇ\n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown fox jumps over the lazy dog.\n\nThe quick brown fox jumps over the lazy dog.\nˇ\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps over the lazy dog.\n\nThe quick brown fox jumps over the lazy dog.\nˇ","mode":"Insert"}}
-{"Put":{"state":"ˇThe quick brown fox jumps over the lazy dog.\n\nThe quick brown fox jumps over the lazy dog.\n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"ˇ\nThe quick brown fox jumps over the lazy dog.\n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown fox jumps over the lazy dog.\nˇ\nThe quick brown fox jumps over the lazy dog.\n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps over the lazy dog.\nˇ\n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown fox jumps over the lazy dog.\n\nˇThe quick brown fox jumps over the lazy dog.\n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps over the lazy dog.\n\nˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown fox jumps over the lazy dog.\n\nThe quick brown fox jumpˇs over the lazy dog.\n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps over the lazy dog.\n\nˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown fox jumps over the lazy dog.\n\nThe quick brown fox jumps over the lazy dog.ˇ\n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps over the lazy dog.\n\nˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown fox jumps over the lazy dog.\n\nThe quick brown fox jumps over the lazy dog.\nˇ\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps over the lazy dog.\n\nThe quick brown fox jumps over the lazy dog.\nˇ\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_change_paragraph_object_with_soft_wrap.json b/crates/vim/test_data/test_change_paragraph_object_with_soft_wrap.json
deleted file mode 100644
index 47d68e13a6..0000000000
--- a/crates/vim/test_data/test_change_paragraph_object_with_soft_wrap.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{"SetOption":{"value":"wrap"}}
-{"SetOption":{"value":"columns=20"}}
-{"Put":{"state":"ˇFirst paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"ˇ\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"Insert"}}
-{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is ˇlimited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"ˇ\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"Insert"}}
-{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nˇSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nˇ\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"Insert"}}
-{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and ˇshould be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nˇ\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"Insert"}}
-{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nˇThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nˇ\n","mode":"Insert"}}
-{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping ˇsettings.\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nˇ\n","mode":"Insert"}}
-{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.ˇ\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nˇ\n","mode":"Insert"}}
-{"Put":{"state":"ˇFirst paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"ˇ\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"Insert"}}
-{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is ˇlimited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"ˇ\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"Insert"}}
-{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nˇSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nˇ\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"Insert"}}
-{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and ˇshould be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nˇ\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"Insert"}}
-{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nˇThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nˇ","mode":"Insert"}}
-{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping ˇsettings.\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nˇ","mode":"Insert"}}
-{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.ˇ\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nˇ","mode":"Insert"}}
diff --git a/crates/vim/test_data/test_change_rot13_motion.json b/crates/vim/test_data/test_change_rot13_motion.json
deleted file mode 100644
index 62c39887ff..0000000000
--- a/crates/vim/test_data/test_change_rot13_motion.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{"Put":{"state":"ˇabc def"}}
-{"Key":"g"}
-{"Key":"?"}
-{"Key":"w"}
-{"Get":{"state":"ˇnop def","mode":"Normal"}}
-{"Key":"g"}
-{"Key":"?"}
-{"Key":"w"}
-{"Get":{"state":"ˇabc def","mode":"Normal"}}
-{"Key":"."}
-{"Get":{"state":"ˇnop def","mode":"Normal"}}
-{"Put":{"state":"abˇc def"}}
-{"Key":"g"}
-{"Key":"?"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"ˇnop def","mode":"Normal"}}
-{"Key":"."}
-{"Get":{"state":"ˇabc def","mode":"Normal"}}
-{"Key":"g"}
-{"Key":"?"}
-{"Key":"$"}
-{"Get":{"state":"ˇnop qrs","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_change_rot13_object.json b/crates/vim/test_data/test_change_rot13_object.json
deleted file mode 100644
index 19db51b946..0000000000
--- a/crates/vim/test_data/test_change_rot13_object.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"Put":{"state":"ˇabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"}}
-{"Key":"g"}
-{"Key":"?"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"ˇnopqrstuvwxyzabcdefghijklmNOPQRSTUVWXYZABCDEFGHIJKLM","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_change_sentence_object.json b/crates/vim/test_data/test_change_sentence_object.json
deleted file mode 100644
index 4afbae2713..0000000000
--- a/crates/vim/test_data/test_change_sentence_object.json
+++ /dev/null
@@ -1,270 +0,0 @@
-{"Put":{"state":"ˇThe quick brown? Fox Jumps! Over the lazy."}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"ˇ Fox Jumps! Over the lazy.","mode":"Insert"}}
-{"Put":{"state":"The quick ˇbrown? Fox Jumps! Over the lazy."}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"ˇ Fox Jumps! Over the lazy.","mode":"Insert"}}
-{"Put":{"state":"The quick brownˇ? Fox Jumps! Over the lazy."}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"ˇ Fox Jumps! Over the lazy.","mode":"Insert"}}
-{"Put":{"state":"The quick brown?ˇ Fox Jumps! Over the lazy."}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown?ˇFox Jumps! Over the lazy.","mode":"Insert"}}
-{"Put":{"state":"The quick brown? ˇFox Jumps! Over the lazy."}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown? ˇ Over the lazy.","mode":"Insert"}}
-{"Put":{"state":"The quick brown? Fox Jˇumps! Over the lazy."}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown? ˇ Over the lazy.","mode":"Insert"}}
-{"Put":{"state":"The quick brown? Fox Jumpsˇ! Over the lazy."}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown? ˇ Over the lazy.","mode":"Insert"}}
-{"Put":{"state":"The quick brown? Fox Jumps!ˇ Over the lazy."}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown? Fox Jumps!ˇOver the lazy.","mode":"Insert"}}
-{"Put":{"state":"The quick brown? Fox Jumps! Ovˇer the lazy."}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown? Fox Jumps! ˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown? Fox Jumps! Over theˇ lazy."}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown? Fox Jumps! ˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown? Fox Jumps! Over the lazyˇ."}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown? Fox Jumps! ˇ","mode":"Insert"}}
-{"Put":{"state":"ˇThe quick brown\nfox jumps over\nthe lazy dog. The quick \nbrown fox jumps over\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"ˇ The quick \nbrown fox jumps over\n","mode":"Insert"}}
-{"Put":{"state":"The quick ˇbrown\nfox jumps over\nthe lazy dog. The quick \nbrown fox jumps over\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"ˇ The quick \nbrown fox jumps over\n","mode":"Insert"}}
-{"Put":{"state":"The quick brownˇ\nfox jumps over\nthe lazy dog. The quick \nbrown fox jumps over\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"ˇ The quick \nbrown fox jumps over\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nfox jumps over\nthe lazy doˇg. The quick \nbrown fox jumps over\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"ˇ The quick \nbrown fox jumps over\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nfox jumps over\nthe lazy dogˇ. The quick \nbrown fox jumps over\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"ˇ The quick \nbrown fox jumps over\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nfox jumps over\nthe lazy dog.ˇ The quick \nbrown fox jumps over\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown\nfox jumps over\nthe lazy dog.ˇThe quick \nbrown fox jumps over\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nfox jumps over\nthe lazy dog. ˇThe quick \nbrown fox jumps over\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown\nfox jumps over\nthe lazy dog. ˇ\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nfox jumps over\nthe lazy dog. The quick ˇ\nbrown fox jumps over\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown\nfox jumps over\nthe lazy dog. ˇ\n","mode":"Insert"}}
-{"Put":{"state":"ˇThe quick brown.)]'\" Brown fox jumps. "}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"ˇ Brown fox jumps. ","mode":"Insert"}}
-{"Put":{"state":"The ˇquick brown.)]'\" Brown fox jumps. "}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"ˇ Brown fox jumps. ","mode":"Insert"}}
-{"Put":{"state":"The quick brownˇ.)]'\" Brown fox jumps. "}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"ˇ Brown fox jumps. ","mode":"Insert"}}
-{"Put":{"state":"The quick brown.)ˇ]'\" Brown fox jumps. "}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"ˇ Brown fox jumps. ","mode":"Insert"}}
-{"Put":{"state":"The quick brown.)]ˇ'\" Brown fox jumps. "}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"ˇ Brown fox jumps. ","mode":"Insert"}}
-{"Put":{"state":"The quick brown.)]'ˇ\" Brown fox jumps. "}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"ˇ Brown fox jumps. ","mode":"Insert"}}
-{"Put":{"state":"The quick brown.)]'\" Brown ˇfox jumps. "}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown.)]'\" ˇ ","mode":"Insert"}}
-{"Put":{"state":"The quick brown.)]'\" Brown fox jumpsˇ. "}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown.)]'\" ˇ ","mode":"Insert"}}
-{"Put":{"state":"The quick brown.)]'\" Brown fox jumps.ˇ "}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown.)]'\" Brown fox jumps.ˇ","mode":"Insert"}}
-{"Put":{"state":"ˇThe quick brown? Fox Jumps! Over the lazy."}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"ˇFox Jumps! Over the lazy.","mode":"Insert"}}
-{"Put":{"state":"The quick ˇbrown? Fox Jumps! Over the lazy."}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"ˇFox Jumps! Over the lazy.","mode":"Insert"}}
-{"Put":{"state":"The quick brownˇ? Fox Jumps! Over the lazy."}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"ˇFox Jumps! Over the lazy.","mode":"Insert"}}
-{"Put":{"state":"The quick brown? ˇFox Jumps! Over the lazy."}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown? ˇOver the lazy.","mode":"Insert"}}
-{"Put":{"state":"The quick brown? Fox Jˇumps! Over the lazy."}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown? ˇOver the lazy.","mode":"Insert"}}
-{"Put":{"state":"The quick brown? Fox Jumpsˇ! Over the lazy."}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown? ˇOver the lazy.","mode":"Insert"}}
-{"Put":{"state":"The quick brown? Fox Jumps!ˇ Over the lazy."}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown? Fox Jumps!ˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown? Fox Jumps! Ovˇer the lazy."}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown? Fox Jumps!ˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown? Fox Jumps! Over theˇ lazy."}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown? Fox Jumps!ˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown? Fox Jumps! Over the lazyˇ."}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown? Fox Jumps!ˇ","mode":"Insert"}}
-{"Put":{"state":"ˇThe quick brown\nfox jumps over\nthe lazy dog. The quick \nbrown fox jumps over\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"ˇThe quick \nbrown fox jumps over\n","mode":"Insert"}}
-{"Put":{"state":"The quick ˇbrown\nfox jumps over\nthe lazy dog. The quick \nbrown fox jumps over\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"ˇThe quick \nbrown fox jumps over\n","mode":"Insert"}}
-{"Put":{"state":"The quick brownˇ\nfox jumps over\nthe lazy dog. The quick \nbrown fox jumps over\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"ˇThe quick \nbrown fox jumps over\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nfox jumps over\nthe lazy doˇg. The quick \nbrown fox jumps over\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"ˇThe quick \nbrown fox jumps over\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nfox jumps over\nthe lazy dogˇ. The quick \nbrown fox jumps over\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"ˇThe quick \nbrown fox jumps over\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nfox jumps over\nthe lazy dog.ˇ The quick \nbrown fox jumps over\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown\nfox jumps over\nthe lazy dog.ˇ\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nfox jumps over\nthe lazy dog. ˇThe quick \nbrown fox jumps over\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown\nfox jumps over\nthe lazy dog.ˇ\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nfox jumps over\nthe lazy dog. The quick ˇ\nbrown fox jumps over\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown\nfox jumps over\nthe lazy dog.ˇ\n","mode":"Insert"}}
-{"Put":{"state":"ˇThe quick brown.)]'\" Brown fox jumps. "}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"ˇBrown fox jumps. ","mode":"Insert"}}
-{"Put":{"state":"The ˇquick brown.)]'\" Brown fox jumps. "}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"ˇBrown fox jumps. ","mode":"Insert"}}
-{"Put":{"state":"The quick brownˇ.)]'\" Brown fox jumps. "}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"ˇBrown fox jumps. ","mode":"Insert"}}
-{"Put":{"state":"The quick brown.)ˇ]'\" Brown fox jumps. "}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"ˇBrown fox jumps. ","mode":"Insert"}}
-{"Put":{"state":"The quick brown.)]ˇ'\" Brown fox jumps. "}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"ˇBrown fox jumps. ","mode":"Insert"}}
-{"Put":{"state":"The quick brown.)]'ˇ\" Brown fox jumps. "}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"ˇBrown fox jumps. ","mode":"Insert"}}
-{"Put":{"state":"The quick brown.)]'\" Brown ˇfox jumps. "}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown.)]'\" ˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown.)]'\" Brown fox jumpsˇ. "}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown.)]'\" ˇ","mode":"Insert"}}
diff --git a/crates/vim/test_data/test_change_surrounding_character_objects.json b/crates/vim/test_data/test_change_surrounding_character_objects.json
deleted file mode 100644
index 4710e228a6..0000000000
--- a/crates/vim/test_data/test_change_surrounding_character_objects.json
+++ /dev/null
@@ -1,520 +0,0 @@
-{"Put":{"state":"ˇTh\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"ˇ\"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Insert"}}
-{"Put":{"state":"Th\"ˇe \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"ˇ\"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Insert"}}
-{"Put":{"state":"Th\"e ˇ\"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"ˇ\"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Insert"}}
-{"Put":{"state":"Th\"e \"ˇ\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"ˇ\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Insert"}}
-{"Put":{"state":"Th\"e \"\"ˇqui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"ˇ\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Insert"}}
-{"Put":{"state":"Th\"e \"\"quˇi\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"ˇ\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Insert"}}
-{"Put":{"state":"Th\"e \"\"qui\"ˇck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ˇ\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Insert"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck broˇ\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck bro\"ˇ\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Insert"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"ˇfox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"ˇ\"er\nthe lazy d\"o\"g","mode":"Insert"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox juˇmps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"ˇ\"er\nthe lazy d\"o\"g","mode":"Insert"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"ˇer\nthe lazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"ˇer\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe ˇlazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"ˇ\"g","mode":"Insert"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"ˇg"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"ˇg","mode":"Normal"}}
-{"Put":{"state":"ˇTh\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"ˇ\"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Insert"}}
-{"Put":{"state":"Th\"ˇe \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"ˇ\"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Insert"}}
-{"Put":{"state":"Th\"e ˇ\"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"ˇ\"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Insert"}}
-{"Put":{"state":"Th\"e \"ˇ\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"ˇ\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Insert"}}
-{"Put":{"state":"Th\"e \"\"ˇqui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"ˇ\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Insert"}}
-{"Put":{"state":"Th\"e \"\"quˇi\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"ˇ\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Insert"}}
-{"Put":{"state":"Th\"e \"\"qui\"ˇck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ˇ\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Insert"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck broˇ\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck bro\"ˇ\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Insert"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"ˇfox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"ˇ\"er\nthe lazy d\"o\"g","mode":"Insert"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox juˇmps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"ˇ\"er\nthe lazy d\"o\"g","mode":"Insert"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"ˇer\nthe lazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"ˇer\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe ˇlazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"ˇ\"g","mode":"Insert"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"ˇg"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"ˇg","mode":"Normal"}}
-{"Put":{"state":"ˇTh\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Thˇ\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Insert"}}
-{"Put":{"state":"Th\"ˇe \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Thˇ\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Insert"}}
-{"Put":{"state":"Th\"e ˇ\"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Thˇ\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Insert"}}
-{"Put":{"state":"Th\"e \"ˇ\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"ˇck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Insert"}}
-{"Put":{"state":"Th\"e \"\"ˇqui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"ˇck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Insert"}}
-{"Put":{"state":"Th\"e \"\"quˇi\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"ˇck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Insert"}}
-{"Put":{"state":"Th\"e \"\"qui\"ˇck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"quiˇwn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Insert"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck broˇ\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck broˇ\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Insert"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"ˇfox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\nˇer\nthe lazy d\"o\"g","mode":"Insert"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox juˇmps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\nˇer\nthe lazy d\"o\"g","mode":"Insert"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"ˇer\nthe lazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"ˇer\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe ˇlazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy dˇg","mode":"Insert"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"ˇg"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"ˇg","mode":"Normal"}}
-{"Put":{"state":"ˇTh\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Thˇ\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Insert"}}
-{"Put":{"state":"Th\"ˇe \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Thˇ\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Insert"}}
-{"Put":{"state":"Th\"e ˇ\"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Thˇ\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Insert"}}
-{"Put":{"state":"Th\"e \"ˇ\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"ˇck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Insert"}}
-{"Put":{"state":"Th\"e \"\"ˇqui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"ˇck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Insert"}}
-{"Put":{"state":"Th\"e \"\"quˇi\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"ˇck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Insert"}}
-{"Put":{"state":"Th\"e \"\"qui\"ˇck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"quiˇwn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Insert"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck broˇ\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck broˇ\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Insert"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"ˇfox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\nˇer\nthe lazy d\"o\"g","mode":"Insert"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox juˇmps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\nˇer\nthe lazy d\"o\"g","mode":"Insert"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"ˇer\nthe lazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"ˇer\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe ˇlazy d\"o\"g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy dˇg","mode":"Insert"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"ˇg"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"ˇg","mode":"Normal"}}
-{"Put":{"state":"ˇTh)e ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"("}
-{"Get":{"state":"ˇTh)e ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Normal"}}
-{"Put":{"state":"Th)ˇe ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"("}
-{"Get":{"state":"Th)e (ˇ)qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Insert"}}
-{"Put":{"state":"Th)e ˇ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"("}
-{"Get":{"state":"Th)e (ˇ)qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Insert"}}
-{"Put":{"state":"Th)e (ˇ)qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"("}
-{"Get":{"state":"Th)e (ˇ)qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Insert"}}
-{"Put":{"state":"Th)e ()ˇqui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"("}
-{"Get":{"state":"Th)e ()qui(ˇ)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Insert"}}
-{"Put":{"state":"Th)e ()quˇi(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"("}
-{"Get":{"state":"Th)e ()qui(ˇ)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Insert"}}
-{"Put":{"state":"Th)e ()qui(ˇck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"("}
-{"Get":{"state":"Th)e ()qui(ˇ)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Insert"}}
-{"Put":{"state":"Th)e ()qui(ck broˇ)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"("}
-{"Get":{"state":"Th)e ()qui(ˇ)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Insert"}}
-{"Put":{"state":"Th)e ()qui(ck bro)wn(\n)ˇfox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"("}
-{"Get":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(ˇ)o(g","mode":"Insert"}}
-{"Put":{"state":"Th)e ()qui(ck bro)wn(\n)fox juˇmps ov(er\nthe lazy d)o(g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"("}
-{"Get":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(ˇ)o(g","mode":"Insert"}}
-{"Put":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(ˇer\nthe lazy d)o(g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"("}
-{"Get":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(ˇ)o(g","mode":"Insert"}}
-{"Put":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(er\nthe ˇlazy d)o(g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"("}
-{"Get":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(ˇ)o(g","mode":"Insert"}}
-{"Put":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(ˇg"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"("}
-{"Get":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(ˇg","mode":"Normal"}}
-{"Put":{"state":"ˇTh)e ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":")"}
-{"Get":{"state":"ˇTh)e ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Normal"}}
-{"Put":{"state":"Th)ˇe ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":")"}
-{"Get":{"state":"Th)e (ˇ)qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Insert"}}
-{"Put":{"state":"Th)e ˇ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":")"}
-{"Get":{"state":"Th)e (ˇ)qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Insert"}}
-{"Put":{"state":"Th)e (ˇ)qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":")"}
-{"Get":{"state":"Th)e (ˇ)qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Insert"}}
-{"Put":{"state":"Th)e ()ˇqui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":")"}
-{"Get":{"state":"Th)e ()qui(ˇ)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Insert"}}
-{"Put":{"state":"Th)e ()quˇi(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":")"}
-{"Get":{"state":"Th)e ()qui(ˇ)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Insert"}}
-{"Put":{"state":"Th)e ()qui(ˇck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":")"}
-{"Get":{"state":"Th)e ()qui(ˇ)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Insert"}}
-{"Put":{"state":"Th)e ()qui(ck broˇ)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":")"}
-{"Get":{"state":"Th)e ()qui(ˇ)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Insert"}}
-{"Put":{"state":"Th)e ()qui(ck bro)wn(\n)ˇfox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":")"}
-{"Get":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(ˇ)o(g","mode":"Insert"}}
-{"Put":{"state":"Th)e ()qui(ck bro)wn(\n)fox juˇmps ov(er\nthe lazy d)o(g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":")"}
-{"Get":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(ˇ)o(g","mode":"Insert"}}
-{"Put":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(ˇer\nthe lazy d)o(g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":")"}
-{"Get":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(ˇ)o(g","mode":"Insert"}}
-{"Put":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(er\nthe ˇlazy d)o(g"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":")"}
-{"Get":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(ˇ)o(g","mode":"Insert"}}
-{"Put":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(ˇg"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":")"}
-{"Get":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(ˇg","mode":"Normal"}}
-{"Put":{"state":"ˇTh)e ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"("}
-{"Get":{"state":"ˇTh)e ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Normal"}}
-{"Put":{"state":"Th)ˇe ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"("}
-{"Get":{"state":"Th)e ˇqui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Insert"}}
-{"Put":{"state":"Th)e ˇ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"("}
-{"Get":{"state":"Th)e ˇqui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Insert"}}
-{"Put":{"state":"Th)e (ˇ)qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"("}
-{"Get":{"state":"Th)e ˇqui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Insert"}}
-{"Put":{"state":"Th)e ()ˇqui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"("}
-{"Get":{"state":"Th)e ()quiˇwn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Insert"}}
-{"Put":{"state":"Th)e ()quˇi(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"("}
-{"Get":{"state":"Th)e ()quiˇwn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Insert"}}
-{"Put":{"state":"Th)e ()qui(ˇck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"("}
-{"Get":{"state":"Th)e ()quiˇwn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Insert"}}
-{"Put":{"state":"Th)e ()qui(ck broˇ)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"("}
-{"Get":{"state":"Th)e ()quiˇwn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Insert"}}
-{"Put":{"state":"Th)e ()qui(ck bro)wn(\n)ˇfox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"("}
-{"Get":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ovˇo(g","mode":"Insert"}}
-{"Put":{"state":"Th)e ()qui(ck bro)wn(\n)fox juˇmps ov(er\nthe lazy d)o(g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"("}
-{"Get":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ovˇo(g","mode":"Insert"}}
-{"Put":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(ˇer\nthe lazy d)o(g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"("}
-{"Get":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ovˇo(g","mode":"Insert"}}
-{"Put":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(er\nthe ˇlazy d)o(g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"("}
-{"Get":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ovˇo(g","mode":"Insert"}}
-{"Put":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(ˇg"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"("}
-{"Get":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(ˇg","mode":"Normal"}}
-{"Put":{"state":"ˇTh)e ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":")"}
-{"Get":{"state":"ˇTh)e ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Normal"}}
-{"Put":{"state":"Th)ˇe ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":")"}
-{"Get":{"state":"Th)e ˇqui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Insert"}}
-{"Put":{"state":"Th)e ˇ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":")"}
-{"Get":{"state":"Th)e ˇqui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Insert"}}
-{"Put":{"state":"Th)e (ˇ)qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":")"}
-{"Get":{"state":"Th)e ˇqui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Insert"}}
-{"Put":{"state":"Th)e ()ˇqui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":")"}
-{"Get":{"state":"Th)e ()quiˇwn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Insert"}}
-{"Put":{"state":"Th)e ()quˇi(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":")"}
-{"Get":{"state":"Th)e ()quiˇwn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Insert"}}
-{"Put":{"state":"Th)e ()qui(ˇck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":")"}
-{"Get":{"state":"Th)e ()quiˇwn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Insert"}}
-{"Put":{"state":"Th)e ()qui(ck broˇ)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":")"}
-{"Get":{"state":"Th)e ()quiˇwn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Insert"}}
-{"Put":{"state":"Th)e ()qui(ck bro)wn(\n)ˇfox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":")"}
-{"Get":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ovˇo(g","mode":"Insert"}}
-{"Put":{"state":"Th)e ()qui(ck bro)wn(\n)fox juˇmps ov(er\nthe lazy d)o(g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":")"}
-{"Get":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ovˇo(g","mode":"Insert"}}
-{"Put":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(ˇer\nthe lazy d)o(g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":")"}
-{"Get":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ovˇo(g","mode":"Insert"}}
-{"Put":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(er\nthe ˇlazy d)o(g"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":")"}
-{"Get":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ovˇo(g","mode":"Insert"}}
-{"Put":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(ˇg"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":")"}
-{"Get":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(ˇg","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_change_w.json b/crates/vim/test_data/test_change_w.json
deleted file mode 100644
index 149dac8420..0000000000
--- a/crates/vim/test_data/test_change_w.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{"Put":{"state":"Teˇst"}}
-{"Key":"c"}
-{"Key":"w"}
-{"Get":{"state":"Teˇ","mode":"Insert"}}
-{"Put":{"state":"Tˇest test"}}
-{"Key":"c"}
-{"Key":"w"}
-{"Get":{"state":"Tˇ test","mode":"Insert"}}
-{"Put":{"state":"Testˇ  test"}}
-{"Key":"c"}
-{"Key":"w"}
-{"Get":{"state":"Testˇtest","mode":"Insert"}}
-{"Put":{"state":"Tesˇt  test"}}
-{"Key":"c"}
-{"Key":"w"}
-{"Get":{"state":"Tesˇ  test","mode":"Insert"}}
-{"Put":{"state":"Test teˇst\ntest"}}
-{"Key":"c"}
-{"Key":"w"}
-{"Get":{"state":"Test teˇ\ntest","mode":"Insert"}}
-{"Put":{"state":"Test tesˇt\ntest"}}
-{"Key":"c"}
-{"Key":"w"}
-{"Get":{"state":"Test tesˇ\ntest","mode":"Insert"}}
-{"Put":{"state":"Test test\nˇ\ntest"}}
-{"Key":"c"}
-{"Key":"w"}
-{"Get":{"state":"Test test\nˇ\ntest","mode":"Insert"}}
-{"Put":{"state":"Test teˇst-test test"}}
-{"Key":"c"}
-{"Key":"shift-w"}
-{"Get":{"state":"Test teˇ test","mode":"Insert"}}
-{"Put":{"state":"tesˇt-test"}}
-{"Key":"c"}
-{"Key":"w"}
-{"Get":{"state":"tesˇ-test","mode":"Insert"}}
diff --git a/crates/vim/test_data/test_change_word_object.json b/crates/vim/test_data/test_change_word_object.json
deleted file mode 100644
index 18baf78c6e..0000000000
--- a/crates/vim/test_data/test_change_word_object.json
+++ /dev/null
@@ -1,460 +0,0 @@
-{"Put":{"state":"The quick ˇbrown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick ˇ   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick browˇn   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick ˇ   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brownˇ   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brownˇ\nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox ˇjumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox ˇ over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox juˇmps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox ˇ over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumpsˇ over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumpsˇover\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dogˇ  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dogˇ\n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \nˇ\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \nˇ\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\nˇ\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\nˇ\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\nˇ\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\nˇ\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThˇe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nˇ-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nTheˇ-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nTheˇquick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-ˇquick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-ˇ brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quˇick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-ˇ brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quickˇ brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quickˇbrown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick ˇbrown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick ˇ \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brownˇ \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brownˇ\n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \nˇ  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \nˇ\n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \nˇ  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \nˇ\n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \nˇ  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \nˇfox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumpˇs over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-ˇ over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dogˇ \n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dogˇ\n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \nˇ\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \nˇ\n","mode":"Insert"}}
-{"Put":{"state":"The quick ˇbrown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick ˇ   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick browˇn   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick ˇ   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brownˇ   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brownˇ\nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox ˇjumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox ˇ over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox juˇmps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox ˇ over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumpsˇ over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumpsˇover\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dogˇ  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dogˇ\n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \nˇ\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \nˇ\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\nˇ\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\nˇ\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\nˇ\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\nˇ\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThˇe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nˇ brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nTheˇ-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nˇ brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-ˇquick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nˇ brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quˇick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nˇ brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quickˇ brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quickˇbrown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick ˇbrown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick ˇ \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brownˇ \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brownˇ\n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \nˇ  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \nˇ\n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \nˇ  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \nˇ\n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \nˇ  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \nˇfox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumpˇs over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  ˇ over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dogˇ \n\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dogˇ\n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \nˇ\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \nˇ\n","mode":"Insert"}}
-{"Put":{"state":"The quick ˇbrown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quick ˇ\nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick browˇn   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quick ˇ\nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brownˇ   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quick brownˇ jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox ˇjumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox ˇover\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox juˇmps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox ˇover\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumpsˇ over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumpsˇ\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dogˇ  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dogˇ\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \nˇ\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \nˇ\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\nˇ\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\nˇ\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\nˇ\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\nˇ-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThˇe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nˇ-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nTheˇ-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nTheˇquick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-ˇquick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-ˇbrown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quˇick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-ˇbrown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quickˇ brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quickˇ \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick ˇbrown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick ˇ\n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brownˇ \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brownˇ-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \nˇ  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \nˇ-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \nˇ  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \nˇ-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \nˇ  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \nˇ-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumpˇs over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-ˇover\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dogˇ \n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dogˇ\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \nˇ\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \nˇ","mode":"Insert"}}
-{"Put":{"state":"The quick ˇbrown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick ˇ\nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick browˇn   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick ˇ\nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brownˇ   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brownˇ jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox ˇjumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox ˇover\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox juˇmps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox ˇover\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumpsˇ over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumpsˇ\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dogˇ  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dogˇ\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \nˇ\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \nˇ\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\nˇ\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\nˇ\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\nˇ\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\nˇ brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThˇe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nˇbrown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nTheˇ-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nˇbrown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-ˇquick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nˇbrown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quˇick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nˇbrown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quickˇ brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quickˇ \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick ˇbrown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick ˇ\n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brownˇ \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brownˇ over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \nˇ  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \nˇ over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \nˇ  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \nˇ over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \nˇ  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \nˇ over\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumpˇs over\nthe lazy dog \n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  ˇover\nthe lazy dog \n\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dogˇ \n\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dogˇ\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \nˇ\n"}}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \nˇ","mode":"Insert"}}
diff --git a/crates/vim/test_data/test_clear_counts.json b/crates/vim/test_data/test_clear_counts.json
deleted file mode 100644
index 6ef6b36017..0000000000
--- a/crates/vim/test_data/test_clear_counts.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{"Put":{"state":"The quick brown\nfox juˇmps over\nthe lazy dog"}}
-{"Key":"4"}
-{"Key":"escape"}
-{"Key":"3"}
-{"Key":"d"}
-{"Key":"l"}
-{"Get":{"state":"The quick brown\nfox juˇ over\nthe lazy dog","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_comma_semicolon.json b/crates/vim/test_data/test_comma_semicolon.json
deleted file mode 100644
index e08b6963fa..0000000000
--- a/crates/vim/test_data/test_comma_semicolon.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{"Put":{"state":"ˇone two three four"}}
-{"Key":"f"}
-{"Key":"o"}
-{"Get":{"state":"one twˇo three four","mode":"Normal"}}
-{"Key":","}
-{"Get":{"state":"ˇone two three four","mode":"Normal"}}
-{"Key":"2"}
-{"Key":";"}
-{"Get":{"state":"one two three fˇour","mode":"Normal"}}
-{"Key":"shift-f"}
-{"Key":"e"}
-{"Get":{"state":"one two threˇe four","mode":"Normal"}}
-{"Key":"2"}
-{"Key":";"}
-{"Get":{"state":"onˇe two three four","mode":"Normal"}}
-{"Key":","}
-{"Get":{"state":"one two thrˇee four","mode":"Normal"}}
-{"Put":{"state":"ˇone two three four"}}
-{"Key":"t"}
-{"Key":"o"}
-{"Get":{"state":"one tˇwo three four","mode":"Normal"}}
-{"Key":","}
-{"Get":{"state":"oˇne two three four","mode":"Normal"}}
-{"Key":"2"}
-{"Key":";"}
-{"Get":{"state":"one two three ˇfour","mode":"Normal"}}
-{"Key":"shift-t"}
-{"Key":"e"}
-{"Get":{"state":"one two threeˇ four","mode":"Normal"}}
-{"Key":"3"}
-{"Key":";"}
-{"Get":{"state":"oneˇ two three four","mode":"Normal"}}
-{"Key":","}
-{"Get":{"state":"one two thˇree four","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_comma_w.json b/crates/vim/test_data/test_comma_w.json
deleted file mode 100644
index ac7a91c80c..0000000000
--- a/crates/vim/test_data/test_comma_w.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{"Exec":{"command":"map ,w j"}}
-{"Put":{"state":"ˇhello hello\nhello hello"}}
-{"Key":"f"}
-{"Key":"o"}
-{"Key":";"}
-{"Key":","}
-{"Key":"w"}
-{"Get":{"state":"hello hello\nhello hellˇo","mode":"Normal"}}
-{"Put":{"state":"ˇhello hello\nhello hello"}}
-{"Key":"f"}
-{"Key":"o"}
-{"Key":";"}
-{"Key":","}
-{"Key":"i"}
-{"Get":{"state":"hellˇo hello\nhello hello","mode":"Insert"}}
diff --git a/crates/vim/test_data/test_command_basics.json b/crates/vim/test_data/test_command_basics.json
deleted file mode 100644
index 669d34409f..0000000000
--- a/crates/vim/test_data/test_command_basics.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"Put":{"state":"ˇa\nb\nc"}}
-{"Key":":"}
-{"Key":"j"}
-{"Key":"enter"}
-{"Key":"^"}
-{"Get":{"state":"ˇa b\nc","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_command_goto.json b/crates/vim/test_data/test_command_goto.json
deleted file mode 100644
index 2f7ed10eeb..0000000000
--- a/crates/vim/test_data/test_command_goto.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{"Put":{"state":"ˇa\nb\nc"}}
-{"Key":":"}
-{"Key":"3"}
-{"Key":"enter"}
-{"Get":{"state":"a\nb\nˇc","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_command_matching_lines.json b/crates/vim/test_data/test_command_matching_lines.json
deleted file mode 100644
index 450aae0de0..0000000000
--- a/crates/vim/test_data/test_command_matching_lines.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{"Put":{"state":"ˇa\nb\na\nb\na\n"}}
-{"Key":":"}
-{"Key":"g"}
-{"Key":"/"}
-{"Key":"a"}
-{"Key":"/"}
-{"Key":"d"}
-{"Key":"enter"}
-{"Get":{"state":"b\nb\nˇ","mode":"Normal"}}
-{"Key":"u"}
-{"Get":{"state":"ˇa\nb\na\nb\na\n","mode":"Normal"}}
-{"Key":":"}
-{"Key":"v"}
-{"Key":"/"}
-{"Key":"a"}
-{"Key":"/"}
-{"Key":"d"}
-{"Key":"enter"}
-{"Get":{"state":"a\na\nˇa","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_command_ranges.json b/crates/vim/test_data/test_command_ranges.json
deleted file mode 100644
index d0e4928c6a..0000000000
--- a/crates/vim/test_data/test_command_ranges.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{"Put":{"state":"ˇ1\n2\n3\n4\n4\n3\n2\n1"}}
-{"Key":":"}
-{"Key":"2"}
-{"Key":","}
-{"Key":"4"}
-{"Key":"d"}
-{"Key":"enter"}
-{"Get":{"state":"1\nˇ4\n3\n2\n1","mode":"Normal"}}
-{"Key":":"}
-{"Key":"2"}
-{"Key":","}
-{"Key":"4"}
-{"Key":"s"}
-{"Key":"o"}
-{"Key":"r"}
-{"Key":"t"}
-{"Key":"enter"}
-{"Get":{"state":"1\nˇ2\n3\n4\n1","mode":"Normal"}}
-{"Key":":"}
-{"Key":"2"}
-{"Key":","}
-{"Key":"4"}
-{"Key":"j"}
-{"Key":"o"}
-{"Key":"i"}
-{"Key":"n"}
-{"Key":"enter"}
-{"Get":{"state":"1\nˇ2 3 4\n1","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_command_replace.json b/crates/vim/test_data/test_command_replace.json
deleted file mode 100644
index d14a8a78ce..0000000000
--- a/crates/vim/test_data/test_command_replace.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{"Put":{"state":"ˇa\nb\nb\nc"}}
-{"Key":":"}
-{"Key":"%"}
-{"Key":"s"}
-{"Key":"/"}
-{"Key":"b"}
-{"Key":"/"}
-{"Key":"d"}
-{"Key":"enter"}
-{"Get":{"state":"a\nd\nˇd\nc","mode":"Normal"}}
-{"Key":":"}
-{"Key":"%"}
-{"Key":"s"}
-{"Key":":"}
-{"Key":"."}
-{"Key":":"}
-{"Key":"\\"}
-{"Key":"0"}
-{"Key":"\\"}
-{"Key":"0"}
-{"Key":"enter"}
-{"Get":{"state":"aa\ndd\ndd\nˇcc","mode":"Normal"}}
-{"Key":"k"}
-{"Key":":"}
-{"Key":"s"}
-{"Key":"/"}
-{"Key":"d"}
-{"Key":"d"}
-{"Key":"/"}
-{"Key":"e"}
-{"Key":"e"}
-{"Key":"enter"}
-{"Get":{"state":"aa\ndd\nˇee\ncc","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_command_search.json b/crates/vim/test_data/test_command_search.json
deleted file mode 100644
index 705ce51fb7..0000000000
--- a/crates/vim/test_data/test_command_search.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{"Put":{"state":"ˇa\nb\na\nc"}}
-{"Key":":"}
-{"Key":"/"}
-{"Key":"b"}
-{"Key":"enter"}
-{"Get":{"state":"a\nˇb\na\nc","mode":"Normal"}}
-{"Key":":"}
-{"Key":"?"}
-{"Key":"a"}
-{"Key":"enter"}
-{"Get":{"state":"ˇa\nb\na\nc","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_command_visual_replace.json b/crates/vim/test_data/test_command_visual_replace.json
deleted file mode 100644
index 69713b19ee..0000000000
--- a/crates/vim/test_data/test_command_visual_replace.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{"Put":{"state":"ˇ1\n2\n3\n4\n4\n3\n2\n1"}}
-{"Key":"v"}
-{"Key":"2"}
-{"Key":"j"}
-{"Key":":"}
-{"Key":"s"}
-{"Key":"/"}
-{"Key":"."}
-{"Key":"/"}
-{"Key":"k"}
-{"Key":"enter"}
-{"Get":{"state":"k\nk\nˇk\n4\n4\n3\n2\n1","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_convert_to_lower_case.json b/crates/vim/test_data/test_convert_to_lower_case.json
deleted file mode 100644
index 83d7435c89..0000000000
--- a/crates/vim/test_data/test_convert_to_lower_case.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{"Put":{"state":"A😀c«DÉ1*fˇ»\n"}}
-{"Key":"u"}
-{"Get":{"state":"A😀cˇdé1*f\n","mode":"Normal"}}
-{"Put":{"state":"ABˇc\n"}}
-{"Key":"shift-v"}
-{"Key":"u"}
-{"Get":{"state":"ˇabc\n","mode":"Normal"}}
-{"Put":{"state":"ˇAa\nBb\nCc"}}
-{"Key":"ctrl-v"}
-{"Key":"j"}
-{"Key":"u"}
-{"Get":{"state":"ˇaa\nbb\nCc","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_convert_to_rot13.json b/crates/vim/test_data/test_convert_to_rot13.json
deleted file mode 100644
index 7ac67c885c..0000000000
--- a/crates/vim/test_data/test_convert_to_rot13.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{"Put":{"state":"a😀C«dÉ1*fˇ»\n"}}
-{"Key":"g"}
-{"Key":"?"}
-{"Get":{"state":"a😀CˇqÉ1*s\n","mode":"Normal"}}
-{"Put":{"state":"abˇC\n"}}
-{"Key":"shift-v"}
-{"Key":"g"}
-{"Key":"?"}
-{"Get":{"state":"ˇnoP\n","mode":"Normal"}}
-{"Put":{"state":"ˇaa\nbb\ncc"}}
-{"Key":"ctrl-v"}
-{"Key":"j"}
-{"Key":"g"}
-{"Key":"?"}
-{"Get":{"state":"ˇna\nob\ncc","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_convert_to_upper_case.json b/crates/vim/test_data/test_convert_to_upper_case.json
deleted file mode 100644
index ffc9771073..0000000000
--- a/crates/vim/test_data/test_convert_to_upper_case.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{"Put":{"state":"a😀C«dÉ1*fˇ»\n"}}
-{"Key":"shift-u"}
-{"Get":{"state":"a😀CˇDÉ1*F\n","mode":"Normal"}}
-{"Put":{"state":"abˇC\n"}}
-{"Key":"shift-v"}
-{"Key":"shift-u"}
-{"Get":{"state":"ˇABC\n","mode":"Normal"}}
-{"Put":{"state":"ˇaa\nbb\ncc"}}
-{"Key":"ctrl-v"}
-{"Key":"j"}
-{"Key":"shift-u"}
-{"Get":{"state":"ˇAa\nBb\ncc","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_ctrl_d_u.json b/crates/vim/test_data/test_ctrl_d_u.json
deleted file mode 100644
index 77c35f24b9..0000000000
--- a/crates/vim/test_data/test_ctrl_d_u.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{"SetOption":{"value":"scrolloff=3"}}
-{"SetOption":{"value":"lines=12"}}
-{"Put":{"state":"ˇaa\nbb\ncc\ndd\nee\nff\ngg\nhh\nii\njj\nkk\nll\nmm\nnn\noo\npp\nqq\nrr\nss\ntt\nuu\nvv\nww\nxx\nyy\nzz"}}
-{"Key":"4"}
-{"Key":"j"}
-{"Key":"ctrl-d"}
-{"Get":{"state":"aa\nbb\ncc\ndd\nee\nff\ngg\nhh\nii\nˇjj\nkk\nll\nmm\nnn\noo\npp\nqq\nrr\nss\ntt\nuu\nvv\nww\nxx\nyy\nzz","mode":"Normal"}}
-{"Key":"ctrl-d"}
-{"Get":{"state":"aa\nbb\ncc\ndd\nee\nff\ngg\nhh\nii\njj\nkk\nll\nmm\nnn\nˇoo\npp\nqq\nrr\nss\ntt\nuu\nvv\nww\nxx\nyy\nzz","mode":"Normal"}}
-{"Key":"g"}
-{"Key":"g"}
-{"Key":"ctrl-d"}
-{"Get":{"state":"aa\nbb\ncc\ndd\nee\nff\ngg\nhh\nˇii\njj\nkk\nll\nmm\nnn\noo\npp\nqq\nrr\nss\ntt\nuu\nvv\nww\nxx\nyy\nzz","mode":"Normal"}}
-{"Key":"ctrl-u"}
-{"Get":{"state":"aa\nbb\ncc\nˇdd\nee\nff\ngg\nhh\nii\njj\nkk\nll\nmm\nnn\noo\npp\nqq\nrr\nss\ntt\nuu\nvv\nww\nxx\nyy\nzz","mode":"Normal"}}
-{"Key":"ctrl-d"}
-{"Key":"ctrl-d"}
-{"Key":"4"}
-{"Key":"j"}
-{"Key":"ctrl-u"}
-{"Key":"ctrl-u"}
-{"Get":{"state":"aa\nbb\ncc\ndd\nee\nff\ngg\nˇhh\nii\njj\nkk\nll\nmm\nnn\noo\npp\nqq\nrr\nss\ntt\nuu\nvv\nww\nxx\nyy\nzz","mode":"Normal"}}
-{"Key":"g"}
-{"Key":"g"}
-{"Key":"ctrl-d"}
-{"Key":"ctrl-u"}
-{"Key":"ctrl-u"}
-{"Get":{"state":"ˇaa\nbb\ncc\ndd\nee\nff\ngg\nhh\nii\njj\nkk\nll\nmm\nnn\noo\npp\nqq\nrr\nss\ntt\nuu\nvv\nww\nxx\nyy\nzz","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_ctrl_f_b.json b/crates/vim/test_data/test_ctrl_f_b.json
deleted file mode 100644
index 19c94d8b6e..0000000000
--- a/crates/vim/test_data/test_ctrl_f_b.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{"SetOption":{"value":"scrolloff=3"}}
-{"SetOption":{"value":"lines=12"}}
-{"SetOption":{"value":"scrolloff=0"}}
-{"Put":{"state":"ˇaa\nbb\ncc\ndd\nee\nff\ngg\nhh\nii\njj\nkk\nll\nmm\nnn\noo\npp\nqq\nrr\nss\ntt\nuu\nvv\nww\nxx\nyy\nzz"}}
-{"Key":"ctrl-f"}
-{"Get":{"state":"aa\nbb\ncc\ndd\nee\nff\ngg\nhh\nˇii\njj\nkk\nll\nmm\nnn\noo\npp\nqq\nrr\nss\ntt\nuu\nvv\nww\nxx\nyy\nzz","mode":"Normal"}}
-{"Key":"ctrl-f"}
-{"Get":{"state":"aa\nbb\ncc\ndd\nee\nff\ngg\nhh\nii\njj\nkk\nll\nmm\nnn\noo\npp\nˇqq\nrr\nss\ntt\nuu\nvv\nww\nxx\nyy\nzz","mode":"Normal"}}
-{"Key":"ctrl-b"}
-{"Get":{"state":"aa\nbb\ncc\ndd\nee\nff\ngg\nhh\nii\njj\nkk\nll\nmm\nnn\noo\npp\nqq\nˇrr\nss\ntt\nuu\nvv\nww\nxx\nyy\nzz","mode":"Normal"}}
-{"Key":"ctrl-b"}
-{"Get":{"state":"aa\nbb\ncc\ndd\nee\nff\ngg\nhh\nii\nˇjj\nkk\nll\nmm\nnn\noo\npp\nqq\nrr\nss\ntt\nuu\nvv\nww\nxx\nyy\nzz","mode":"Normal"}}
-{"Key":"g"}
-{"Key":"g"}
-{"Get":{"state":"ˇaa\nbb\ncc\ndd\nee\nff\ngg\nhh\nii\njj\nkk\nll\nmm\nnn\noo\npp\nqq\nrr\nss\ntt\nuu\nvv\nww\nxx\nyy\nzz","mode":"Normal"}}
-{"SetOption":{"value":"scrolloff=3"}}
-{"Key":"ctrl-f"}
-{"Get":{"state":"aa\nbb\ncc\ndd\nee\nff\ngg\nhh\nii\njj\nkk\nˇll\nmm\nnn\noo\npp\nqq\nrr\nss\ntt\nuu\nvv\nww\nxx\nyy\nzz","mode":"Normal"}}
-{"Key":"ctrl-f"}
-{"Get":{"state":"aa\nbb\ncc\ndd\nee\nff\ngg\nhh\nii\njj\nkk\nll\nmm\nnn\noo\npp\nqq\nrr\nss\nˇtt\nuu\nvv\nww\nxx\nyy\nzz","mode":"Normal"}}
-{"Key":"ctrl-b"}
-{"Get":{"state":"aa\nbb\ncc\ndd\nee\nff\ngg\nhh\nii\njj\nkk\nll\nmm\nnn\nˇoo\npp\nqq\nrr\nss\ntt\nuu\nvv\nww\nxx\nyy\nzz","mode":"Normal"}}
-{"Key":"ctrl-b"}
-{"Get":{"state":"aa\nbb\ncc\ndd\nee\nff\nˇgg\nhh\nii\njj\nkk\nll\nmm\nnn\noo\npp\nqq\nrr\nss\ntt\nuu\nvv\nww\nxx\nyy\nzz","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_ctrl_o_dot.json b/crates/vim/test_data/test_ctrl_o_dot.json
deleted file mode 100644
index e414d785bf..0000000000
--- a/crates/vim/test_data/test_ctrl_o_dot.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{"Put":{"state":"heˇllo world."}}
-{"Key":"x"}
-{"Key":"i"}
-{"Key":"ctrl-o"}
-{"Key":"."}
-{"Get":{"state":"heˇo world.","mode":"Insert"}}
-{"Key":"l"}
-{"Key":"l"}
-{"Key":"escape"}
-{"Key":"."}
-{"Get":{"state":"hellˇllo world.","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_ctrl_o_position.json b/crates/vim/test_data/test_ctrl_o_position.json
deleted file mode 100644
index d8d76ac188..0000000000
--- a/crates/vim/test_data/test_ctrl_o_position.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{"Put":{"state":"helˇlo world."}}
-{"Key":"i"}
-{"Key":"ctrl-o"}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"ˇ world.","mode":"Insert"}}
-{"Key":"ctrl-o"}
-{"Key":"p"}
-{"Get":{"state":" helloˇworld.","mode":"Insert"}}
diff --git a/crates/vim/test_data/test_ctrl_o_visual.json b/crates/vim/test_data/test_ctrl_o_visual.json
deleted file mode 100644
index 23ec11d766..0000000000
--- a/crates/vim/test_data/test_ctrl_o_visual.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{"Put":{"state":"helloˇ world."}}
-{"Key":"i"}
-{"Key":"ctrl-o"}
-{"Key":"v"}
-{"Key":"b"}
-{"Key":"r"}
-{"Key":"l"}
-{"Get":{"state":"ˇllllllworld.","mode":"Insert"}}
-{"Key":"ctrl-o"}
-{"Key":"v"}
-{"Key":"f"}
-{"Key":"w"}
-{"Key":"d"}
-{"Get":{"state":"ˇorld.","mode":"Insert"}}
diff --git a/crates/vim/test_data/test_ctrl_v.json b/crates/vim/test_data/test_ctrl_v.json
deleted file mode 100644
index dfc090ab18..0000000000
--- a/crates/vim/test_data/test_ctrl_v.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{"Put":{"state":"ˇ"}}
-{"Key":"i"}
-{"Key":"ctrl-v"}
-{"Key":"0"}
-{"Key":"0"}
-{"Key":"0"}
-{"Get":{"state":"\u0000ˇ","mode":"Insert"}}
-{"Key":"ctrl-v"}
-{"Key":"j"}
-{"Get":{"state":"\u0000jˇ","mode":"Insert"}}
-{"Key":"ctrl-v"}
-{"Key":"x"}
-{"Key":"6"}
-{"Key":"5"}
-{"Get":{"state":"\u0000jeˇ","mode":"Insert"}}
-{"Key":"ctrl-v"}
-{"Key":"U"}
-{"Key":"1"}
-{"Key":"F"}
-{"Key":"6"}
-{"Key":"4"}
-{"Key":"0"}
-{"Key":"space"}
-{"Get":{"state":"\u0000je🙀 ˇ","mode":"Insert"}}
diff --git a/crates/vim/test_data/test_ctrl_v_control.json b/crates/vim/test_data/test_ctrl_v_control.json
deleted file mode 100644
index a5a55cf6d5..0000000000
--- a/crates/vim/test_data/test_ctrl_v_control.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{"Put":{"state":"ˇ"}}
-{"Key":"i"}
-{"Key":"ctrl-v"}
-{"Key":"ctrl-d"}
-{"Get":{"state":"\u0004ˇ","mode":"Insert"}}
-{"Key":"ctrl-v"}
-{"Key":"ctrl-j"}
-{"Get":{"state":"\u0004\u0000ˇ","mode":"Insert"}}
-{"Key":"ctrl-v"}
-{"Key":"tab"}
-{"Get":{"state":"\u0004\u0000\tˇ","mode":"Insert"}}
diff --git a/crates/vim/test_data/test_ctrl_v_escape.json b/crates/vim/test_data/test_ctrl_v_escape.json
deleted file mode 100644
index 8c0397ef0a..0000000000
--- a/crates/vim/test_data/test_ctrl_v_escape.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{"Put":{"state":"ˇ"}}
-{"Key":"i"}
-{"Key":"ctrl-v"}
-{"Key":"9"}
-{"Key":"escape"}
-{"Get":{"state":"ˇ\t","mode":"Normal"}}
-{"Key":"i"}
-{"Key":"ctrl-v"}
-{"Key":"escape"}
-{"Get":{"state":"\u001bˇ\t","mode":"Insert"}}
diff --git a/crates/vim/test_data/test_ctrl_w_override.json b/crates/vim/test_data/test_ctrl_w_override.json
deleted file mode 100644
index fe8ae94a77..0000000000
--- a/crates/vim/test_data/test_ctrl_w_override.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{"Exec":{"command":"map <c-w> D"}}
-{"Put":{"state":"ˇhi"}}
-{"Key":"ctrl-w"}
-{"Get":{"state":"ˇ","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_ctrl_y_e.json b/crates/vim/test_data/test_ctrl_y_e.json
deleted file mode 100644
index c43977a6ad..0000000000
--- a/crates/vim/test_data/test_ctrl_y_e.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{"SetOption":{"value":"scrolloff=3"}}
-{"SetOption":{"value":"lines=12"}}
-{"Put":{"state":"ˇaa\nbb\ncc\ndd\nee\nff\ngg\nhh\nii\njj\nkk\nll\nmm\nnn\noo\npp\nqq\nrr\nss\ntt\nuu\nvv\nww\nxx\nyy\nzz"}}
-{"Key":"ctrl-e"}
-{"Get":{"state":"aa\nbb\ncc\ndd\nˇee\nff\ngg\nhh\nii\njj\nkk\nll\nmm\nnn\noo\npp\nqq\nrr\nss\ntt\nuu\nvv\nww\nxx\nyy\nzz","mode":"Normal"}}
-{"Key":"ctrl-e"}
-{"Get":{"state":"aa\nbb\ncc\ndd\nee\nˇff\ngg\nhh\nii\njj\nkk\nll\nmm\nnn\noo\npp\nqq\nrr\nss\ntt\nuu\nvv\nww\nxx\nyy\nzz","mode":"Normal"}}
-{"Key":"ctrl-e"}
-{"Get":{"state":"aa\nbb\ncc\ndd\nee\nff\nˇgg\nhh\nii\njj\nkk\nll\nmm\nnn\noo\npp\nqq\nrr\nss\ntt\nuu\nvv\nww\nxx\nyy\nzz","mode":"Normal"}}
-{"Key":"ctrl-e"}
-{"Get":{"state":"aa\nbb\ncc\ndd\nee\nff\ngg\nˇhh\nii\njj\nkk\nll\nmm\nnn\noo\npp\nqq\nrr\nss\ntt\nuu\nvv\nww\nxx\nyy\nzz","mode":"Normal"}}
-{"Key":"ctrl-e"}
-{"Get":{"state":"aa\nbb\ncc\ndd\nee\nff\ngg\nhh\nˇii\njj\nkk\nll\nmm\nnn\noo\npp\nqq\nrr\nss\ntt\nuu\nvv\nww\nxx\nyy\nzz","mode":"Normal"}}
-{"Key":"ctrl-e"}
-{"Get":{"state":"aa\nbb\ncc\ndd\nee\nff\ngg\nhh\nii\nˇjj\nkk\nll\nmm\nnn\noo\npp\nqq\nrr\nss\ntt\nuu\nvv\nww\nxx\nyy\nzz","mode":"Normal"}}
-{"Key":"ctrl-e"}
-{"Get":{"state":"aa\nbb\ncc\ndd\nee\nff\ngg\nhh\nii\njj\nˇkk\nll\nmm\nnn\noo\npp\nqq\nrr\nss\ntt\nuu\nvv\nww\nxx\nyy\nzz","mode":"Normal"}}
-{"Key":"ctrl-e"}
-{"Get":{"state":"aa\nbb\ncc\ndd\nee\nff\ngg\nhh\nii\njj\nkk\nˇll\nmm\nnn\noo\npp\nqq\nrr\nss\ntt\nuu\nvv\nww\nxx\nyy\nzz","mode":"Normal"}}
-{"Key":"ctrl-y"}
-{"Get":{"state":"aa\nbb\ncc\ndd\nee\nff\ngg\nhh\nii\njj\nkk\nˇll\nmm\nnn\noo\npp\nqq\nrr\nss\ntt\nuu\nvv\nww\nxx\nyy\nzz","mode":"Normal"}}
-{"Key":"ctrl-y"}
-{"Get":{"state":"aa\nbb\ncc\ndd\nee\nff\ngg\nhh\nii\njj\nkk\nˇll\nmm\nnn\noo\npp\nqq\nrr\nss\ntt\nuu\nvv\nww\nxx\nyy\nzz","mode":"Normal"}}
-{"Key":"ctrl-y"}
-{"Get":{"state":"aa\nbb\ncc\ndd\nee\nff\ngg\nhh\nii\njj\nkk\nˇll\nmm\nnn\noo\npp\nqq\nrr\nss\ntt\nuu\nvv\nww\nxx\nyy\nzz","mode":"Normal"}}
-{"Key":"ctrl-y"}
-{"Get":{"state":"aa\nbb\ncc\ndd\nee\nff\ngg\nhh\nii\njj\nˇkk\nll\nmm\nnn\noo\npp\nqq\nrr\nss\ntt\nuu\nvv\nww\nxx\nyy\nzz","mode":"Normal"}}
-{"Key":"ctrl-y"}
-{"Get":{"state":"aa\nbb\ncc\ndd\nee\nff\ngg\nhh\nii\nˇjj\nkk\nll\nmm\nnn\noo\npp\nqq\nrr\nss\ntt\nuu\nvv\nww\nxx\nyy\nzz","mode":"Normal"}}
-{"Key":"ctrl-y"}
-{"Get":{"state":"aa\nbb\ncc\ndd\nee\nff\ngg\nhh\nˇii\njj\nkk\nll\nmm\nnn\noo\npp\nqq\nrr\nss\ntt\nuu\nvv\nww\nxx\nyy\nzz","mode":"Normal"}}
-{"Key":"ctrl-y"}
-{"Get":{"state":"aa\nbb\ncc\ndd\nee\nff\ngg\nˇhh\nii\njj\nkk\nll\nmm\nnn\noo\npp\nqq\nrr\nss\ntt\nuu\nvv\nww\nxx\nyy\nzz","mode":"Normal"}}
-{"Key":"ctrl-y"}
-{"Get":{"state":"aa\nbb\ncc\ndd\nee\nff\nˇgg\nhh\nii\njj\nkk\nll\nmm\nnn\noo\npp\nqq\nrr\nss\ntt\nuu\nvv\nww\nxx\nyy\nzz","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_d_search.json b/crates/vim/test_data/test_d_search.json
deleted file mode 100644
index 9cdc855dbf..0000000000
--- a/crates/vim/test_data/test_d_search.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{"Put":{"state":"ˇa.c. abcd a.c. abcd"}}
-{"Key":"d"}
-{"Key":"/"}
-{"Key":"c"}
-{"Key":"d"}
-{"Key":"enter"}
-{"Get":{"state":"ˇcd a.c. abcd","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_dd.json b/crates/vim/test_data/test_dd.json
deleted file mode 100644
index c6dc30882e..0000000000
--- a/crates/vim/test_data/test_dd.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{"Put":{"state":"ˇ"}}
-{"Key":"d"}
-{"Key":"d"}
-{"Get":{"state":"ˇ","mode":"Normal"}}
-{"Put":{"state":"The ˇquick"}}
-{"Key":"d"}
-{"Key":"d"}
-{"Get":{"state":"ˇ","mode":"Normal"}}
-{"Put":{"state":"The qˇuick\nbrown fox\njumps over"}}
-{"Key":"d"}
-{"Key":"d"}
-{"Get":{"state":"brownˇ fox\njumps over","mode":"Normal"}}
-{"Put":{"state":"The quick\nbrown ˇfox\njumps over"}}
-{"Key":"d"}
-{"Key":"d"}
-{"Get":{"state":"The quick\njumps ˇover","mode":"Normal"}}
-{"Put":{"state":"The quick\nbrown fox\njumps ˇover"}}
-{"Key":"d"}
-{"Key":"d"}
-{"Get":{"state":"The quick\nbrown ˇfox","mode":"Normal"}}
-{"Put":{"state":"The quick\nˇ\nbrown fox"}}
-{"Key":"d"}
-{"Key":"d"}
-{"Get":{"state":"The quick\nˇbrown fox","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_dd_then_paste_without_trailing_newline.json b/crates/vim/test_data/test_dd_then_paste_without_trailing_newline.json
deleted file mode 100644
index 5b10a2fe28..0000000000
--- a/crates/vim/test_data/test_dd_then_paste_without_trailing_newline.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{"Put":{"state":"heˇllo"}}
-{"Key":"d"}
-{"Key":"d"}
-{"Get":{"state":"ˇ","mode":"Normal"}}
-{"Key":"p"}
-{"Key":"p"}
-{"Get":{"state":"\nhello\nˇhello","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_del_marks.json b/crates/vim/test_data/test_del_marks.json
deleted file mode 100644
index c326c6d61e..0000000000
--- a/crates/vim/test_data/test_del_marks.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{"Put":{"state":"ˇa\nb\na\nb\na\n"}}
-{"Key":"m"}
-{"Key":"a"}
-{"Key":":"}
-{"Key":"d"}
-{"Key":"e"}
-{"Key":"l"}
-{"Key":"m"}
-{"Key":"space"}
-{"Key":"a"}
-{"Key":"enter"}
diff --git a/crates/vim/test_data/test_delete_0.json b/crates/vim/test_data/test_delete_0.json
deleted file mode 100644
index 10095cefbb..0000000000
--- a/crates/vim/test_data/test_delete_0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{"Put":{"state":"The qˇuick\nbrown fox"}}
-{"Key":"d"}
-{"Key":"0"}
-{"Get":{"state":"ˇuick\nbrown fox","mode":"Normal"}}
-{"Put":{"state":"The quick\nˇ\nbrown fox"}}
-{"Key":"d"}
-{"Key":"0"}
-{"Get":{"state":"The quick\nˇ\nbrown fox","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_delete_b.json b/crates/vim/test_data/test_delete_b.json
deleted file mode 100644
index 932a4c1967..0000000000
--- a/crates/vim/test_data/test_delete_b.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{"Put":{"state":"Teˇst Test"}}
-{"Key":"d"}
-{"Key":"b"}
-{"Get":{"state":"ˇst Test","mode":"Normal"}}
-{"Put":{"state":"Test ˇtest"}}
-{"Key":"d"}
-{"Key":"b"}
-{"Get":{"state":"ˇtest","mode":"Normal"}}
-{"Put":{"state":"Test1 test2 ˇtest3"}}
-{"Key":"d"}
-{"Key":"b"}
-{"Get":{"state":"Test1 ˇtest3","mode":"Normal"}}
-{"Put":{"state":"Test test\nˇtest"}}
-{"Key":"d"}
-{"Key":"b"}
-{"Get":{"state":"Testˇ \ntest","mode":"Normal"}}
-{"Put":{"state":"Test test\nˇ\ntest"}}
-{"Key":"d"}
-{"Key":"b"}
-{"Get":{"state":"Testˇ \n\ntest","mode":"Normal"}}
-{"Put":{"state":"Test test-test ˇtest"}}
-{"Key":"d"}
-{"Key":"shift-b"}
-{"Get":{"state":"Test ˇtest","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_delete_end_of_document.json b/crates/vim/test_data/test_delete_end_of_document.json
deleted file mode 100644
index 863d15aca1..0000000000
--- a/crates/vim/test_data/test_delete_end_of_document.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{"Put":{"state":"The quick\nbrownˇ fox\njumps over\nthe lazy"}}
-{"Key":"d"}
-{"Key":"shift-g"}
-{"Get":{"state":"The qˇuick","mode":"Normal"}}
-{"Put":{"state":"The quick\nbrownˇ fox\njumps over\nthe lazy"}}
-{"Key":"d"}
-{"Key":"shift-g"}
-{"Get":{"state":"The qˇuick","mode":"Normal"}}
-{"Put":{"state":"The quick\nbrown fox\njumps over\nthe lˇazy"}}
-{"Key":"d"}
-{"Key":"shift-g"}
-{"Get":{"state":"The quick\nbrown fox\njumpsˇ over","mode":"Normal"}}
-{"Put":{"state":"The quick\nbrown fox\njumps over\nˇ"}}
-{"Key":"d"}
-{"Key":"shift-g"}
-{"Get":{"state":"The quick\nbrown fox\nˇjumps over","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_delete_end_of_line.json b/crates/vim/test_data/test_delete_end_of_line.json
deleted file mode 100644
index 93f0cc2459..0000000000
--- a/crates/vim/test_data/test_delete_end_of_line.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{"Put":{"state":"The qˇuick\nbrown fox"}}
-{"Key":"d"}
-{"Key":"$"}
-{"Get":{"state":"The ˇq\nbrown fox","mode":"Normal"}}
-{"Put":{"state":"The quick\nˇ\nbrown fox"}}
-{"Key":"d"}
-{"Key":"$"}
-{"Get":{"state":"The quick\nˇ\nbrown fox","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_delete_end_of_paragraph.json b/crates/vim/test_data/test_delete_end_of_paragraph.json
deleted file mode 100644
index 860fed7a68..0000000000
--- a/crates/vim/test_data/test_delete_end_of_paragraph.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{"Put":{"state":"ˇhello world.\n\nhello world."}}
-{"Key":"d"}
-{"Key":"}"}
-{"Get":{"state":"ˇ\nhello world.","mode":"Normal"}}
-{"Put":{"state":"ˇhello world.\nhello world."}}
-{"Key":"d"}
-{"Key":"}"}
-{"Get":{"state":"ˇ","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_delete_gg.json b/crates/vim/test_data/test_delete_gg.json
deleted file mode 100644
index de6aca9665..0000000000
--- a/crates/vim/test_data/test_delete_gg.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{"Put":{"state":"The quick\nbrownˇ fox\njumps over\nthe lazy"}}
-{"Key":"d"}
-{"Key":"g"}
-{"Key":"g"}
-{"Get":{"state":"jumpsˇ over\nthe lazy","mode":"Normal"}}
-{"Put":{"state":"The quick\nbrown fox\njumps over\nthe lˇazy"}}
-{"Key":"d"}
-{"Key":"g"}
-{"Key":"g"}
-{"Get":{"state":"ˇ","mode":"Normal"}}
-{"Put":{"state":"The qˇuick\nbrown fox\njumps over\nthe lazy"}}
-{"Key":"d"}
-{"Key":"g"}
-{"Key":"g"}
-{"Get":{"state":"brownˇ fox\njumps over\nthe lazy","mode":"Normal"}}
-{"Put":{"state":"ˇ\nbrown fox\njumps over\nthe lazy"}}
-{"Key":"d"}
-{"Key":"g"}
-{"Key":"g"}
-{"Get":{"state":"ˇbrown fox\njumps over\nthe lazy","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_delete_h.json b/crates/vim/test_data/test_delete_h.json
deleted file mode 100644
index cf842a386e..0000000000
--- a/crates/vim/test_data/test_delete_h.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{"Put":{"state":"Teˇst"}}
-{"Key":"d"}
-{"Key":"h"}
-{"Get":{"state":"Tˇst","mode":"Normal"}}
-{"Put":{"state":"Tˇest"}}
-{"Key":"d"}
-{"Key":"h"}
-{"Get":{"state":"ˇest","mode":"Normal"}}
-{"Put":{"state":"ˇTest"}}
-{"Key":"d"}
-{"Key":"h"}
-{"Get":{"state":"ˇTest","mode":"Normal"}}
-{"Put":{"state":"Test\nˇtest"}}
-{"Key":"d"}
-{"Key":"h"}
-{"Get":{"state":"Test\nˇtest","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_delete_j.json b/crates/vim/test_data/test_delete_j.json
deleted file mode 100644
index 76c2f098d3..0000000000
--- a/crates/vim/test_data/test_delete_j.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{"Put":{"state":"The quick\nbrown ˇfox\njumps over"}}
-{"Key":"d"}
-{"Key":"j"}
-{"Get":{"state":"The quˇick","mode":"Normal"}}
-{"Put":{"state":"The quick\nbrown fox\njumps ˇover"}}
-{"Key":"d"}
-{"Key":"j"}
-{"Get":{"state":"The quick\nbrown fox\njumps ˇover","mode":"Normal"}}
-{"Put":{"state":"The qˇuick\nbrown fox\njumps over"}}
-{"Key":"d"}
-{"Key":"j"}
-{"Get":{"state":"jumpsˇ over","mode":"Normal"}}
-{"Put":{"state":"The quick\nbrown fox\nˇ"}}
-{"Key":"d"}
-{"Key":"j"}
-{"Get":{"state":"The quick\nbrown fox\nˇ","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_delete_k.json b/crates/vim/test_data/test_delete_k.json
deleted file mode 100644
index 75c032430c..0000000000
--- a/crates/vim/test_data/test_delete_k.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{"Put":{"state":"The quick\nbrown ˇfox\njumps over"}}
-{"Key":"d"}
-{"Key":"k"}
-{"Get":{"state":"jumps ˇover","mode":"Normal"}}
-{"Put":{"state":"The quick\nbrown fox\njumps ˇover"}}
-{"Key":"d"}
-{"Key":"k"}
-{"Get":{"state":"The quˇick","mode":"Normal"}}
-{"Put":{"state":"The qˇuick\nbrown fox\njumps over"}}
-{"Key":"d"}
-{"Key":"k"}
-{"Get":{"state":"The qˇuick\nbrown fox\njumps over","mode":"Normal"}}
-{"Put":{"state":"ˇbrown fox\njumps over"}}
-{"Key":"d"}
-{"Key":"k"}
-{"Get":{"state":"ˇbrown fox\njumps over","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_delete_key_can_remove_last_character.json b/crates/vim/test_data/test_delete_key_can_remove_last_character.json
deleted file mode 100644
index ea4cd71e9f..0000000000
--- a/crates/vim/test_data/test_delete_key_can_remove_last_character.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{"Put":{"state":"abˇc"}}
-{"Key":"delete"}
-{"Get":{"state":"aˇb","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_delete_l.json b/crates/vim/test_data/test_delete_l.json
deleted file mode 100644
index 60b3a6c9b1..0000000000
--- a/crates/vim/test_data/test_delete_l.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{"Put":{"state":"ˇTest"}}
-{"Key":"d"}
-{"Key":"l"}
-{"Get":{"state":"ˇest","mode":"Normal"}}
-{"Put":{"state":"Teˇst"}}
-{"Key":"d"}
-{"Key":"l"}
-{"Get":{"state":"Teˇt","mode":"Normal"}}
-{"Put":{"state":"Tesˇt"}}
-{"Key":"d"}
-{"Key":"l"}
-{"Get":{"state":"Teˇs","mode":"Normal"}}
-{"Put":{"state":"Tesˇt\ntest"}}
-{"Key":"d"}
-{"Key":"l"}
-{"Get":{"state":"Teˇs\ntest","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_delete_left.json b/crates/vim/test_data/test_delete_left.json
deleted file mode 100644
index a8a242f1f6..0000000000
--- a/crates/vim/test_data/test_delete_left.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{"Put":{"state":"ˇTest"}}
-{"Key":"shift-x"}
-{"Get":{"state":"ˇTest","mode":"Normal"}}
-{"Put":{"state":"Tˇest"}}
-{"Key":"shift-x"}
-{"Get":{"state":"ˇest","mode":"Normal"}}
-{"Put":{"state":"Teˇst"}}
-{"Key":"shift-x"}
-{"Get":{"state":"Tˇst","mode":"Normal"}}
-{"Put":{"state":"Tesˇt"}}
-{"Key":"shift-x"}
-{"Get":{"state":"Teˇt","mode":"Normal"}}
-{"Put":{"state":"Test\nˇtest"}}
-{"Key":"shift-x"}
-{"Get":{"state":"Test\nˇtest","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_delete_next_word_end.json b/crates/vim/test_data/test_delete_next_word_end.json
deleted file mode 100644
index 2467813b49..0000000000
--- a/crates/vim/test_data/test_delete_next_word_end.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{"Put":{"state":"Teˇst Test\n"}}
-{"Key":"d"}
-{"Key":"e"}
-{"Get":{"state":"Teˇ Test\n","mode":"Normal"}}
-{"Put":{"state":"Tˇest test\n"}}
-{"Key":"d"}
-{"Key":"e"}
-{"Get":{"state":"Tˇ test\n","mode":"Normal"}}
-{"Put":{"state":"Test teˇst\ntest"}}
-{"Key":"d"}
-{"Key":"e"}
-{"Get":{"state":"Test tˇe\ntest","mode":"Normal"}}
-{"Put":{"state":"Test tesˇt\ntest"}}
-{"Key":"d"}
-{"Key":"e"}
-{"Get":{"state":"Test teˇs","mode":"Normal"}}
-{"Put":{"state":"Test teˇst-test test"}}
-{"Key":"d"}
-{"Key":"e"}
-{"Get":{"state":"Test teˇ-test test","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_delete_paragraph.json b/crates/vim/test_data/test_delete_paragraph.json
deleted file mode 100644
index 3b09749bab..0000000000
--- a/crates/vim/test_data/test_delete_paragraph.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{"Put":{"state":"helˇlo world.\n\nhello world.\n"}}
-{"Key":"y"}
-{"Key":"}"}
-{"Key":"d"}
-{"Key":"}"}
-{"Get":{"state":"heˇl\n\nhello world.\n","mode":"Normal"}}
-{"ReadRegister":{"name":"\"","value":"lo world."}}
-{"Get":{"state":"heˇl\n\nhello world.\n","mode":"Normal"}}
-{"Put":{"state":"ˇhello world.\n\nhello world.\n"}}
-{"Key":"y"}
-{"Key":"}"}
-{"Key":"d"}
-{"Key":"}"}
-{"Get":{"state":"ˇ\nhello world.\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_delete_paragraph_motion.json b/crates/vim/test_data/test_delete_paragraph_motion.json
deleted file mode 100644
index d4086a8ca5..0000000000
--- a/crates/vim/test_data/test_delete_paragraph_motion.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{"Put":{"state":"ˇhello world.\n\nhello world.\n"}}
-{"Key":"y"}
-{"Key":"}"}
-{"Get":{"state":"ˇhello world.\n\nhello world.\n","mode":"Normal"}}
-{"ReadRegister":{"name":"\"","value":"hello world.\n"}}
-{"Key":"d"}
-{"Key":"}"}
-{"Get":{"state":"ˇ\nhello world.\n","mode":"Normal"}}
-{"ReadRegister":{"name":"\"","value":"hello world.\n"}}
-{"Put":{"state":"helˇlo world.\n\nhello world.\n"}}
-{"Key":"y"}
-{"Key":"}"}
-{"Get":{"state":"helˇlo world.\n\nhello world.\n","mode":"Normal"}}
-{"ReadRegister":{"name":"\"","value":"lo world."}}
-{"Key":"d"}
-{"Key":"}"}
-{"Get":{"state":"heˇl\n\nhello world.\n","mode":"Normal"}}
-{"ReadRegister":{"name":"\"","value":"lo world."}}
diff --git a/crates/vim/test_data/test_delete_paragraph_object.json b/crates/vim/test_data/test_delete_paragraph_object.json
deleted file mode 100644
index 2cf1402ae3..0000000000
--- a/crates/vim/test_data/test_delete_paragraph_object.json
+++ /dev/null
@@ -1,430 +0,0 @@
-{"Put":{"state":"ˇThe quick brown fox jumps over the lazy dog."}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"ˇ","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumpˇs over the lazy dog."}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"ˇ","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps over the lazy dogˇ."}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"ˇ","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps over the lazy dog.ˇ"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"ˇ","mode":"Normal"}}
-{"Put":{"state":"ˇThe quick brown fox jumps over the lazy dog."}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"ˇ","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumpˇs over the lazy dog."}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"ˇ","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps over the lazy dogˇ."}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"ˇ","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps over the lazy dog.ˇ"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"ˇ","mode":"Normal"}}
-{"Put":{"state":"ˇThe quick brown\nfox jumps over\nthe lazy dog.\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"ˇ","mode":"Normal"}}
-{"Put":{"state":"The quick brownˇ\nfox jumps over\nthe lazy dog.\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"ˇ","mode":"Normal"}}
-{"Put":{"state":"The quick brown\nˇfox jumps over\nthe lazy dog.\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"ˇ","mode":"Normal"}}
-{"Put":{"state":"The quick brown\nfox jumps overˇ\nthe lazy dog.\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"ˇ","mode":"Normal"}}
-{"Put":{"state":"The quick brown\nfox jumps over\nthe lazy dog.ˇ\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"ˇ","mode":"Normal"}}
-{"Put":{"state":"ˇThe quick brown\nfox jumps over\nthe lazy dog.\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"ˇ","mode":"Normal"}}
-{"Put":{"state":"The quick brownˇ\nfox jumps over\nthe lazy dog.\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"ˇ","mode":"Normal"}}
-{"Put":{"state":"The quick brown\nˇfox jumps over\nthe lazy dog.\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"ˇ","mode":"Normal"}}
-{"Put":{"state":"The quick brown\nfox jumps overˇ\nthe lazy dog.\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"ˇ","mode":"Normal"}}
-{"Put":{"state":"The quick brown\nfox jumps over\nthe lazy dog.ˇ\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"ˇ","mode":"Normal"}}
-{"Put":{"state":"ˇ\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\nThe quick brown fox jumps\nover the lazy dog.\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"ˇThe quick brown fox jumps\nover the lazy dog.\n\n\nThe quick brown fox jumps\nover the lazy dog.\n","mode":"Normal"}}
-{"Put":{"state":"\nˇ\nThe quick brown fox jumps\nover the lazy dog.\n\n\nThe quick brown fox jumps\nover the lazy dog.\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"ˇThe quick brown fox jumps\nover the lazy dog.\n\n\nThe quick brown fox jumps\nover the lazy dog.\n","mode":"Normal"}}
-{"Put":{"state":"\n\nˇThe quick brown fox jumps\nover the lazy dog.\n\n\nThe quick brown fox jumps\nover the lazy dog.\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"\n\nˇ\n\nThe quick brown fox jumps\nover the lazy dog.\n","mode":"Normal"}}
-{"Put":{"state":"\n\nThe quick brown fox jumps\nˇover the lazy dog.\n\n\nThe quick brown fox jumps\nover the lazy dog.\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"\n\nˇ\n\nThe quick brown fox jumps\nover the lazy dog.\n","mode":"Normal"}}
-{"Put":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\nˇ\n\nThe quick brown fox jumps\nover the lazy dog.\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\nˇThe quick brown fox jumps\nover the lazy dog.\n","mode":"Normal"}}
-{"Put":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\n\nˇ\nThe quick brown fox jumps\nover the lazy dog.\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\nˇThe quick brown fox jumps\nover the lazy dog.\n","mode":"Normal"}}
-{"Put":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\nˇThe quick brown fox jumps\nover the lazy dog.\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\nˇ","mode":"Normal"}}
-{"Put":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\nThe quick brown fox jumpsˇ\nover the lazy dog.\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\nˇ","mode":"Normal"}}
-{"Put":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\nThe quick brown fox jumps\nˇover the lazy dog.\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\nˇ","mode":"Normal"}}
-{"Put":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\nThe quick brown fox jumps\nover the lazy dog.ˇ\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\nˇ","mode":"Normal"}}
-{"Put":{"state":"ˇ\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\nThe quick brown fox jumps\nover the lazy dog.\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"ˇ\n\nThe quick brown fox jumps\nover the lazy dog.\n","mode":"Normal"}}
-{"Put":{"state":"\nˇ\nThe quick brown fox jumps\nover the lazy dog.\n\n\nThe quick brown fox jumps\nover the lazy dog.\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"ˇ\n\nThe quick brown fox jumps\nover the lazy dog.\n","mode":"Normal"}}
-{"Put":{"state":"\n\nˇThe quick brown fox jumps\nover the lazy dog.\n\n\nThe quick brown fox jumps\nover the lazy dog.\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"\n\nˇThe quick brown fox jumps\nover the lazy dog.\n","mode":"Normal"}}
-{"Put":{"state":"\n\nThe quick brown fox jumps\nˇover the lazy dog.\n\n\nThe quick brown fox jumps\nover the lazy dog.\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"\n\nˇThe quick brown fox jumps\nover the lazy dog.\n","mode":"Normal"}}
-{"Put":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\nˇ\n\nThe quick brown fox jumps\nover the lazy dog.\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\nˇ","mode":"Normal"}}
-{"Put":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\n\nˇ\nThe quick brown fox jumps\nover the lazy dog.\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\nˇ","mode":"Normal"}}
-{"Put":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\nˇThe quick brown fox jumps\nover the lazy dog.\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\n\nˇ","mode":"Normal"}}
-{"Put":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\nThe quick brown fox jumpsˇ\nover the lazy dog.\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\n\nˇ","mode":"Normal"}}
-{"Put":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\nThe quick brown fox jumps\nˇover the lazy dog.\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\n\nˇ","mode":"Normal"}}
-{"Put":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\nThe quick brown fox jumps\nover the lazy dog.ˇ\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\n\nˇ","mode":"Normal"}}
-{"Put":{"state":"ˇThe quick brown fox jumps\nover the lazy dog.\n\n\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"ˇ\n\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps\nˇover the lazy dog.\n\n\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"ˇ\n\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\nˇ\n\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\nˇThe quick brown fox jumps\nover the lazy dog.\n\n\n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\nˇ\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\nˇThe quick brown fox jumps\nover the lazy dog.\n\n\n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\nˇ\nThe quick brown fox jumps\nover the lazy dog.\n\n\n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\nˇThe quick brown fox jumps\nover the lazy dog.\n\n\n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nˇThe quick brown fox jumps\nover the lazy dog.\n\n\n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nˇ\n\n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nThe quick brown fox jumpsˇ\nover the lazy dog.\n\n\n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nˇ\n\n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nThe quick brown fox jumps\nˇover the lazy dog.\n\n\n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nˇ\n\n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nThe quick brown fox jumps\nover the lazy dog.ˇ\n\n\n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nˇ\n\n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nThe quick brown fox jumps\nover the lazy dog.\nˇ\n\n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nThe quick brown fox jumps\nˇover the lazy dog.","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nThe quick brown fox jumps\nover the lazy dog.\n\nˇ\n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nThe quick brown fox jumps\nˇover the lazy dog.","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\nˇ\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nThe quick brown fox jumps\nˇover the lazy dog.","mode":"Normal"}}
-{"Put":{"state":"ˇThe quick brown fox jumps\nover the lazy dog.\n\n\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"ˇThe quick brown fox jumps\nover the lazy dog.\n\n\n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps\nˇover the lazy dog.\n\n\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"ˇThe quick brown fox jumps\nover the lazy dog.\n\n\n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\nˇ\n\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\nˇ\n\n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\nˇ\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\nˇ\n\n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\nˇ\nThe quick brown fox jumps\nover the lazy dog.\n\n\n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\nˇ\n\n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nˇThe quick brown fox jumps\nover the lazy dog.\n\n\n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\nˇ","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nThe quick brown fox jumpsˇ\nover the lazy dog.\n\n\n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\nˇ","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nThe quick brown fox jumps\nˇover the lazy dog.\n\n\n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\nˇ","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nThe quick brown fox jumps\nover the lazy dog.ˇ\n\n\n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\nˇ","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nThe quick brown fox jumps\nover the lazy dog.\nˇ\n\n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nThe quick brown fox jumps\nover the lazy dog.\nˇ\n\n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nThe quick brown fox jumps\nover the lazy dog.\n\nˇ\n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nThe quick brown fox jumps\nover the lazy dog.\n\nˇ\n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\nˇ\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\nˇ\n","mode":"Normal"}}
-{"Put":{"state":"ˇThe quick brown fox jumps\nover the lazy dog.\n\n \t\n\nThe quick brown fox jumps\nover the lazy dog.\n\n \t\n\t \t\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"ˇ\n \t\n\nThe quick brown fox jumps\nover the lazy dog.\n\n \t\n\t \t\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\nˇ \t\n\nThe quick brown fox jumps\nover the lazy dog.\n\n \t\n\t \t\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\nˇThe quick brown fox jumps\nover the lazy dog.\n\n \t\n\t \t\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n \t\n\nˇThe quick brown fox jumps\nover the lazy dog.\n\n \t\n\t \t\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n \t\n\nˇ\n \t\n\t \t\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n \t\n\nThe quick brown fox jumps\nover the lazy dog.ˇ\n\n \t\n\t \t\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n \t\n\nˇ\n \t\n\t \t\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n \t\n\nThe quick brown fox jumps\nover the lazy dog.\nˇ\n \t\n\t \t\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n \t\n\nThe quick brown fox jumps\nˇover the lazy dog.","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n \t\n\nThe quick brown fox jumps\nover the lazy dog.\n\nˇ \t\n\t \t\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n \t\n\nThe quick brown fox jumps\nˇover the lazy dog.","mode":"Normal"}}
-{"Put":{"state":"ˇThe quick brown fox jumps\nover the lazy dog.\n\n \t\n\nThe quick brown fox jumps\nover the lazy dog.\n\n \t\n\t \t\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"ˇThe quick brown fox jumps\nover the lazy dog.\n\n \t\n\t \t\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\nˇ \t\n\nThe quick brown fox jumps\nover the lazy dog.\n\n \t\n\t \t\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\nˇ\n \t\n\t \t\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n \t\n\nˇThe quick brown fox jumps\nover the lazy dog.\n\n \t\n\t \t\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n \t\nˇ","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n \t\n\nThe quick brown fox jumps\nover the lazy dog.ˇ\n\n \t\n\t \t\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n \t\nˇ","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n \t\n\nThe quick brown fox jumps\nover the lazy dog.\nˇ\n \t\n\t \t\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n \t\n\nThe quick brown fox jumps\nover the lazy dog.\nˇ\n \t\n\t \t\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n \t\n\nThe quick brown fox jumps\nover the lazy dog.\n\nˇ \t\n\t \t\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps\nover the lazy dog.\n\n \t\n\nThe quick brown fox jumps\nover the lazy dog.\n\nˇ \t\n\t \t\n","mode":"Normal"}}
-{"Put":{"state":"ˇThe quick brown fox jumps over the lazy dog.\n\nThe quick brown fox jumps over the lazy dog.\n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"ˇ\nThe quick brown fox jumps over the lazy dog.\n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps over the lazy dog.\nˇ\nThe quick brown fox jumps over the lazy dog.\n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps over the lazy dog.\nˇThe quick brown fox jumps over the lazy dog.\n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps over the lazy dog.\n\nˇThe quick brown fox jumps over the lazy dog.\n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps over the lazy dog.\n\nˇ\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps over the lazy dog.\n\nThe quick brown fox jumpˇs over the lazy dog.\n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps over the lazy dog.\n\nˇ\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps over the lazy dog.\n\nThe quick brown fox jumps over the lazy dog.ˇ\n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps over the lazy dog.\n\nˇ\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps over the lazy dog.\n\nThe quick brown fox jumps over the lazy dog.\nˇ\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps over the lazy dog.\n\nˇThe quick brown fox jumps over the lazy dog.","mode":"Normal"}}
-{"Put":{"state":"ˇThe quick brown fox jumps over the lazy dog.\n\nThe quick brown fox jumps over the lazy dog.\n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"ˇThe quick brown fox jumps over the lazy dog.\n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps over the lazy dog.\nˇ\nThe quick brown fox jumps over the lazy dog.\n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps over the lazy dog.\nˇ\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps over the lazy dog.\n\nˇThe quick brown fox jumps over the lazy dog.\n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps over the lazy dog.\nˇ","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps over the lazy dog.\n\nThe quick brown fox jumpˇs over the lazy dog.\n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps over the lazy dog.\nˇ","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps over the lazy dog.\n\nThe quick brown fox jumps over the lazy dog.ˇ\n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps over the lazy dog.\nˇ","mode":"Normal"}}
-{"Put":{"state":"The quick brown fox jumps over the lazy dog.\n\nThe quick brown fox jumps over the lazy dog.\nˇ\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps over the lazy dog.\n\nThe quick brown fox jumps over the lazy dog.\nˇ\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_delete_paragraph_object_with_soft_wrap.json b/crates/vim/test_data/test_delete_paragraph_object_with_soft_wrap.json
deleted file mode 100644
index 19dcd175b3..0000000000
--- a/crates/vim/test_data/test_delete_paragraph_object_with_soft_wrap.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{"SetOption":{"value":"wrap"}}
-{"SetOption":{"value":"columns=20"}}
-{"Put":{"state":"ˇFirst paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"ˇ\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"Normal"}}
-{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is ˇlimited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"ˇ\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"Normal"}}
-{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nˇSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nˇ\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"Normal"}}
-{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and ˇshould be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nˇ\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"Normal"}}
-{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nˇThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nˇ","mode":"Normal"}}
-{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping ˇsettings.\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nˇ","mode":"Normal"}}
-{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.ˇ\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nˇ","mode":"Normal"}}
-{"Put":{"state":"ˇFirst paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"ˇSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"Normal"}}
-{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is ˇlimited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"Second paragraph that is also quite long and will definitely wrap under soft wrap conditions andˇ should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"Normal"}}
-{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nˇSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nˇThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"Normal"}}
-{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and ˇshould be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nThird paragraph with additional long text content that will also wrap when line length is constraˇined by the wrapping settings.\n","mode":"Normal"}}
-{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nˇThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\nˇ","mode":"Normal"}}
-{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping ˇsettings.\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\nˇ","mode":"Normal"}}
-{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.ˇ\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\nˇ","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_delete_paragraph_whitespace.json b/crates/vim/test_data/test_delete_paragraph_whitespace.json
deleted file mode 100644
index e07b18eaa3..0000000000
--- a/crates/vim/test_data/test_delete_paragraph_whitespace.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{"Put":{"state":"a\n       ˇ•\naaaaaaaaaaaaa\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"a\naaaaaaaˇaaaaaa\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_delete_sentence.json b/crates/vim/test_data/test_delete_sentence.json
deleted file mode 100644
index 6056b207e4..0000000000
--- a/crates/vim/test_data/test_delete_sentence.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{"Put":{"state":"ˇFirst.\nFourth.\n"}}
-{"Key":"d"}
-{"Key":")"}
-{"Get":{"state":"ˇFourth.\n","mode":"Normal"}}
-{"Put":{"state":"First.\nˇSecond.\nFourth.\n"}}
-{"Key":"d"}
-{"Key":"("}
-{"Get":{"state":"ˇSecond.\nFourth.\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_delete_sentence_object.json b/crates/vim/test_data/test_delete_sentence_object.json
deleted file mode 100644
index e45ebd5c4e..0000000000
--- a/crates/vim/test_data/test_delete_sentence_object.json
+++ /dev/null
@@ -1,270 +0,0 @@
-{"Put":{"state":"ˇThe quick brown? Fox Jumps! Over the lazy."}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"ˇ Fox Jumps! Over the lazy.","mode":"Normal"}}
-{"Put":{"state":"The quick ˇbrown? Fox Jumps! Over the lazy."}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"ˇ Fox Jumps! Over the lazy.","mode":"Normal"}}
-{"Put":{"state":"The quick brownˇ? Fox Jumps! Over the lazy."}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"ˇ Fox Jumps! Over the lazy.","mode":"Normal"}}
-{"Put":{"state":"The quick brown?ˇ Fox Jumps! Over the lazy."}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown?ˇFox Jumps! Over the lazy.","mode":"Normal"}}
-{"Put":{"state":"The quick brown? ˇFox Jumps! Over the lazy."}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown? ˇ Over the lazy.","mode":"Normal"}}
-{"Put":{"state":"The quick brown? Fox Jˇumps! Over the lazy."}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown? ˇ Over the lazy.","mode":"Normal"}}
-{"Put":{"state":"The quick brown? Fox Jumpsˇ! Over the lazy."}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown? ˇ Over the lazy.","mode":"Normal"}}
-{"Put":{"state":"The quick brown? Fox Jumps!ˇ Over the lazy."}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown? Fox Jumps!ˇOver the lazy.","mode":"Normal"}}
-{"Put":{"state":"The quick brown? Fox Jumps! Ovˇer the lazy."}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown? Fox Jumps!ˇ ","mode":"Normal"}}
-{"Put":{"state":"The quick brown? Fox Jumps! Over theˇ lazy."}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown? Fox Jumps!ˇ ","mode":"Normal"}}
-{"Put":{"state":"The quick brown? Fox Jumps! Over the lazyˇ."}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown? Fox Jumps!ˇ ","mode":"Normal"}}
-{"Put":{"state":"ˇThe quick brown\nfox jumps over\nthe lazy dog. The quick \nbrown fox jumps over\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"ˇ The quick \nbrown fox jumps over\n","mode":"Normal"}}
-{"Put":{"state":"The quick ˇbrown\nfox jumps over\nthe lazy dog. The quick \nbrown fox jumps over\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"ˇ The quick \nbrown fox jumps over\n","mode":"Normal"}}
-{"Put":{"state":"The quick brownˇ\nfox jumps over\nthe lazy dog. The quick \nbrown fox jumps over\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"ˇ The quick \nbrown fox jumps over\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown\nfox jumps over\nthe lazy doˇg. The quick \nbrown fox jumps over\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"ˇ The quick \nbrown fox jumps over\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown\nfox jumps over\nthe lazy dogˇ. The quick \nbrown fox jumps over\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"ˇ The quick \nbrown fox jumps over\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown\nfox jumps over\nthe lazy dog.ˇ The quick \nbrown fox jumps over\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown\nfox jumps over\nthe lazy dog.ˇThe quick \nbrown fox jumps over\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown\nfox jumps over\nthe lazy dog. ˇThe quick \nbrown fox jumps over\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown\nfox jumps over\nthe lazy dog.ˇ \n","mode":"Normal"}}
-{"Put":{"state":"The quick brown\nfox jumps over\nthe lazy dog. The quick ˇ\nbrown fox jumps over\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown\nfox jumps over\nthe lazy dog.ˇ \n","mode":"Normal"}}
-{"Put":{"state":"ˇThe quick brown.)]'\" Brown fox jumps. "}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"ˇ Brown fox jumps. ","mode":"Normal"}}
-{"Put":{"state":"The ˇquick brown.)]'\" Brown fox jumps. "}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"ˇ Brown fox jumps. ","mode":"Normal"}}
-{"Put":{"state":"The quick brownˇ.)]'\" Brown fox jumps. "}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"ˇ Brown fox jumps. ","mode":"Normal"}}
-{"Put":{"state":"The quick brown.)ˇ]'\" Brown fox jumps. "}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"ˇ Brown fox jumps. ","mode":"Normal"}}
-{"Put":{"state":"The quick brown.)]ˇ'\" Brown fox jumps. "}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"ˇ Brown fox jumps. ","mode":"Normal"}}
-{"Put":{"state":"The quick brown.)]'ˇ\" Brown fox jumps. "}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"ˇ Brown fox jumps. ","mode":"Normal"}}
-{"Put":{"state":"The quick brown.)]'\" Brown ˇfox jumps. "}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown.)]'\" ˇ ","mode":"Normal"}}
-{"Put":{"state":"The quick brown.)]'\" Brown fox jumpsˇ. "}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown.)]'\" ˇ ","mode":"Normal"}}
-{"Put":{"state":"The quick brown.)]'\" Brown fox jumps.ˇ "}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown.)]'\" Brown fox jumpsˇ.","mode":"Normal"}}
-{"Put":{"state":"ˇThe quick brown? Fox Jumps! Over the lazy."}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"ˇFox Jumps! Over the lazy.","mode":"Normal"}}
-{"Put":{"state":"The quick ˇbrown? Fox Jumps! Over the lazy."}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"ˇFox Jumps! Over the lazy.","mode":"Normal"}}
-{"Put":{"state":"The quick brownˇ? Fox Jumps! Over the lazy."}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"ˇFox Jumps! Over the lazy.","mode":"Normal"}}
-{"Put":{"state":"The quick brown? ˇFox Jumps! Over the lazy."}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown? ˇOver the lazy.","mode":"Normal"}}
-{"Put":{"state":"The quick brown? Fox Jˇumps! Over the lazy."}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown? ˇOver the lazy.","mode":"Normal"}}
-{"Put":{"state":"The quick brown? Fox Jumpsˇ! Over the lazy."}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown? ˇOver the lazy.","mode":"Normal"}}
-{"Put":{"state":"The quick brown? Fox Jumps!ˇ Over the lazy."}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown? Fox Jumpsˇ!","mode":"Normal"}}
-{"Put":{"state":"The quick brown? Fox Jumps! Ovˇer the lazy."}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown? Fox Jumpsˇ!","mode":"Normal"}}
-{"Put":{"state":"The quick brown? Fox Jumps! Over theˇ lazy."}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown? Fox Jumpsˇ!","mode":"Normal"}}
-{"Put":{"state":"The quick brown? Fox Jumps! Over the lazyˇ."}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown? Fox Jumpsˇ!","mode":"Normal"}}
-{"Put":{"state":"ˇThe quick brown\nfox jumps over\nthe lazy dog. The quick \nbrown fox jumps over\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"ˇThe quick \nbrown fox jumps over\n","mode":"Normal"}}
-{"Put":{"state":"The quick ˇbrown\nfox jumps over\nthe lazy dog. The quick \nbrown fox jumps over\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"ˇThe quick \nbrown fox jumps over\n","mode":"Normal"}}
-{"Put":{"state":"The quick brownˇ\nfox jumps over\nthe lazy dog. The quick \nbrown fox jumps over\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"ˇThe quick \nbrown fox jumps over\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown\nfox jumps over\nthe lazy doˇg. The quick \nbrown fox jumps over\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"ˇThe quick \nbrown fox jumps over\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown\nfox jumps over\nthe lazy dogˇ. The quick \nbrown fox jumps over\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"ˇThe quick \nbrown fox jumps over\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown\nfox jumps over\nthe lazy dog.ˇ The quick \nbrown fox jumps over\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown\nfox jumps over\nthe lazy dogˇ.\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown\nfox jumps over\nthe lazy dog. ˇThe quick \nbrown fox jumps over\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown\nfox jumps over\nthe lazy dogˇ.\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown\nfox jumps over\nthe lazy dog. The quick ˇ\nbrown fox jumps over\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown\nfox jumps over\nthe lazy dogˇ.\n","mode":"Normal"}}
-{"Put":{"state":"ˇThe quick brown.)]'\" Brown fox jumps. "}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"ˇBrown fox jumps. ","mode":"Normal"}}
-{"Put":{"state":"The ˇquick brown.)]'\" Brown fox jumps. "}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"ˇBrown fox jumps. ","mode":"Normal"}}
-{"Put":{"state":"The quick brownˇ.)]'\" Brown fox jumps. "}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"ˇBrown fox jumps. ","mode":"Normal"}}
-{"Put":{"state":"The quick brown.)ˇ]'\" Brown fox jumps. "}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"ˇBrown fox jumps. ","mode":"Normal"}}
-{"Put":{"state":"The quick brown.)]ˇ'\" Brown fox jumps. "}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"ˇBrown fox jumps. ","mode":"Normal"}}
-{"Put":{"state":"The quick brown.)]'ˇ\" Brown fox jumps. "}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"ˇBrown fox jumps. ","mode":"Normal"}}
-{"Put":{"state":"The quick brown.)]'\" Brown ˇfox jumps. "}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown.)]'\"ˇ ","mode":"Normal"}}
-{"Put":{"state":"The quick brown.)]'\" Brown fox jumpsˇ. "}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"The quick brown.)]'\"ˇ ","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_delete_surrounding_character_objects.json b/crates/vim/test_data/test_delete_surrounding_character_objects.json
deleted file mode 100644
index 3d4e6aeec0..0000000000
--- a/crates/vim/test_data/test_delete_surrounding_character_objects.json
+++ /dev/null
@@ -1,518 +0,0 @@
-{"Put":{"state":"ˇTh\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"ˇ\"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"ˇe \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"ˇ\"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"e ˇ\"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"ˇ\"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"e \"ˇ\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"ˇ\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"e \"\"ˇqui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"ˇ\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"e \"\"quˇi\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"ˇ\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"e \"\"qui\"ˇck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ˇ\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck broˇ\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck bro\"ˇ\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"ˇfox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"ˇ\"er\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox juˇmps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"ˇ\"er\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"ˇer\nthe lazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"ˇer\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe ˇlazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"ˇ\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"ˇg"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"ˇg","mode":"Normal"}}
-{"Put":{"state":"ˇTh\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"ˇ\"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"ˇe \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"ˇ\"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"e ˇ\"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"ˇ\"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"e \"ˇ\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"ˇ\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"e \"\"ˇqui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"ˇ\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"e \"\"quˇi\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"ˇ\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"e \"\"qui\"ˇck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ˇ\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck broˇ\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck bro\"ˇ\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"ˇfox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"ˇ\"er\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox juˇmps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"ˇ\"er\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"ˇer\nthe lazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"ˇer\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe ˇlazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"ˇ\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"ˇg"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"ˇg","mode":"Normal"}}
-{"Put":{"state":"ˇTh\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Thˇ\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"ˇe \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Thˇ\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"e ˇ\"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Thˇ\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"e \"ˇ\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"ˇck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"e \"\"ˇqui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"ˇck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"e \"\"quˇi\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"ˇck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"e \"\"qui\"ˇck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"quiˇwn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck broˇ\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck brˇo\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"ˇfox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\nˇer\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox juˇmps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\nˇer\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"ˇer\nthe lazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"ˇer\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe ˇlazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy dˇg","mode":"Normal"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"ˇg"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"ˇg","mode":"Normal"}}
-{"Put":{"state":"ˇTh\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Thˇ\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"ˇe \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Thˇ\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"e ˇ\"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Thˇ\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"e \"ˇ\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"ˇck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"e \"\"ˇqui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"ˇck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"e \"\"quˇi\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"ˇck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"e \"\"qui\"ˇck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"quiˇwn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck broˇ\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck brˇo\n\"fox jumps ov\"er\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"ˇfox jumps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\nˇer\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox juˇmps ov\"er\nthe lazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\nˇer\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"ˇer\nthe lazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"ˇer\nthe lazy d\"o\"g","mode":"Normal"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe ˇlazy d\"o\"g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy dˇg","mode":"Normal"}}
-{"Put":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"ˇg"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"Th\"e \"\"qui\"ck bro\"wn\"\n\"fox jumps ov\"er\nthe lazy d\"o\"ˇg","mode":"Normal"}}
-{"Put":{"state":"ˇTh)e ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"("}
-{"Get":{"state":"ˇTh)e ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Normal"}}
-{"Put":{"state":"Th)ˇe ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"("}
-{"Get":{"state":"Th)e (ˇ)qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Normal"}}
-{"Put":{"state":"Th)e ˇ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"("}
-{"Get":{"state":"Th)e (ˇ)qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Normal"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"("}
-{"Get":{"state":"Th)e (ˇ)qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Normal"}}
-{"Put":{"state":"Th)e ()ˇqui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"("}
-{"Get":{"state":"Th)e ()qui(ˇ)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Normal"}}
-{"Put":{"state":"Th)e ()quˇi(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"("}
-{"Get":{"state":"Th)e ()qui(ˇ)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Normal"}}
-{"Put":{"state":"Th)e ()qui(ˇck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"("}
-{"Get":{"state":"Th)e ()qui(ˇ)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Normal"}}
-{"Put":{"state":"Th)e ()qui(ck broˇ)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"("}
-{"Get":{"state":"Th)e ()qui(ˇ)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Normal"}}
-{"Put":{"state":"Th)e ()qui(ck bro)wn(\n)ˇfox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"("}
-{"Get":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(ˇ)o(g","mode":"Normal"}}
-{"Put":{"state":"Th)e ()qui(ck bro)wn(\n)fox juˇmps ov(er\nthe lazy d)o(g"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"("}
-{"Get":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(ˇ)o(g","mode":"Normal"}}
-{"Put":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(ˇer\nthe lazy d)o(g"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"("}
-{"Get":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(ˇ)o(g","mode":"Normal"}}
-{"Put":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(er\nthe ˇlazy d)o(g"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"("}
-{"Get":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(ˇ)o(g","mode":"Normal"}}
-{"Put":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(ˇg"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"("}
-{"Get":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(ˇg","mode":"Normal"}}
-{"Put":{"state":"ˇTh)e ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":")"}
-{"Get":{"state":"ˇTh)e ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Normal"}}
-{"Put":{"state":"Th)ˇe ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":")"}
-{"Get":{"state":"Th)e (ˇ)qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Normal"}}
-{"Put":{"state":"Th)e ˇ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":")"}
-{"Get":{"state":"Th)e (ˇ)qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Normal"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":")"}
-{"Get":{"state":"Th)e (ˇ)qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Normal"}}
-{"Put":{"state":"Th)e ()ˇqui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":")"}
-{"Get":{"state":"Th)e ()qui(ˇ)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Normal"}}
-{"Put":{"state":"Th)e ()quˇi(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":")"}
-{"Get":{"state":"Th)e ()qui(ˇ)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Normal"}}
-{"Put":{"state":"Th)e ()qui(ˇck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":")"}
-{"Get":{"state":"Th)e ()qui(ˇ)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Normal"}}
-{"Put":{"state":"Th)e ()qui(ck broˇ)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":")"}
-{"Get":{"state":"Th)e ()qui(ˇ)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Normal"}}
-{"Put":{"state":"Th)e ()qui(ck bro)wn(\n)ˇfox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":")"}
-{"Get":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(ˇ)o(g","mode":"Normal"}}
-{"Put":{"state":"Th)e ()qui(ck bro)wn(\n)fox juˇmps ov(er\nthe lazy d)o(g"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":")"}
-{"Get":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(ˇ)o(g","mode":"Normal"}}
-{"Put":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(ˇer\nthe lazy d)o(g"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":")"}
-{"Get":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(ˇ)o(g","mode":"Normal"}}
-{"Put":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(er\nthe ˇlazy d)o(g"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":")"}
-{"Get":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(ˇ)o(g","mode":"Normal"}}
-{"Put":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(ˇg"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":")"}
-{"Get":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(ˇg","mode":"Normal"}}
-{"Put":{"state":"ˇTh)e ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"("}
-{"Get":{"state":"ˇTh)e ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Normal"}}
-{"Put":{"state":"Th)ˇe ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"("}
-{"Get":{"state":"Th)e ˇqui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Normal"}}
-{"Put":{"state":"Th)e ˇ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"("}
-{"Get":{"state":"Th)e ˇqui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Normal"}}
-{"Put":{"state":"Th)e (ˇ)qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"("}
-{"Get":{"state":"Th)e ˇqui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Normal"}}
-{"Put":{"state":"Th)e ()ˇqui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"("}
-{"Get":{"state":"Th)e ()quiˇwn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Normal"}}
-{"Put":{"state":"Th)e ()quˇi(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"("}
-{"Get":{"state":"Th)e ()quiˇwn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Normal"}}
-{"Put":{"state":"Th)e ()qui(ˇck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"("}
-{"Get":{"state":"Th)e ()quiˇwn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Normal"}}
-{"Put":{"state":"Th)e ()qui(ck broˇ)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"("}
-{"Get":{"state":"Th)e ()quiˇwn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Normal"}}
-{"Put":{"state":"Th)e ()qui(ck bro)wn(\n)ˇfox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"("}
-{"Get":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ovˇo(g","mode":"Normal"}}
-{"Put":{"state":"Th)e ()qui(ck bro)wn(\n)fox juˇmps ov(er\nthe lazy d)o(g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"("}
-{"Get":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ovˇo(g","mode":"Normal"}}
-{"Put":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(ˇer\nthe lazy d)o(g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"("}
-{"Get":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ovˇo(g","mode":"Normal"}}
-{"Put":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(er\nthe ˇlazy d)o(g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"("}
-{"Get":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ovˇo(g","mode":"Normal"}}
-{"Put":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(ˇg"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"("}
-{"Get":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(ˇg","mode":"Normal"}}
-{"Put":{"state":"ˇTh)e ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":")"}
-{"Get":{"state":"ˇTh)e ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Normal"}}
-{"Put":{"state":"Th)ˇe ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":")"}
-{"Get":{"state":"Th)e ˇqui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Normal"}}
-{"Put":{"state":"Th)e ˇ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":")"}
-{"Get":{"state":"Th)e ˇqui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Normal"}}
-{"Put":{"state":"Th)e (ˇ)qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":")"}
-{"Get":{"state":"Th)e ˇqui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Normal"}}
-{"Put":{"state":"Th)e ()ˇqui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":")"}
-{"Get":{"state":"Th)e ()quiˇwn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Normal"}}
-{"Put":{"state":"Th)e ()quˇi(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":")"}
-{"Get":{"state":"Th)e ()quiˇwn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Normal"}}
-{"Put":{"state":"Th)e ()qui(ˇck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":")"}
-{"Get":{"state":"Th)e ()quiˇwn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Normal"}}
-{"Put":{"state":"Th)e ()qui(ck broˇ)wn(\n)fox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":")"}
-{"Get":{"state":"Th)e ()quiˇwn(\n)fox jumps ov(er\nthe lazy d)o(g","mode":"Normal"}}
-{"Put":{"state":"Th)e ()qui(ck bro)wn(\n)ˇfox jumps ov(er\nthe lazy d)o(g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":")"}
-{"Get":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ovˇo(g","mode":"Normal"}}
-{"Put":{"state":"Th)e ()qui(ck bro)wn(\n)fox juˇmps ov(er\nthe lazy d)o(g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":")"}
-{"Get":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ovˇo(g","mode":"Normal"}}
-{"Put":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(ˇer\nthe lazy d)o(g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":")"}
-{"Get":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ovˇo(g","mode":"Normal"}}
-{"Put":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(er\nthe ˇlazy d)o(g"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":")"}
-{"Get":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ovˇo(g","mode":"Normal"}}
-{"Put":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(ˇg"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":")"}
-{"Get":{"state":"Th)e ()qui(ck bro)wn(\n)fox jumps ov(er\nthe lazy d)o(ˇg","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_delete_to_adjacent_character.json b/crates/vim/test_data/test_delete_to_adjacent_character.json
deleted file mode 100644
index 130719c890..0000000000
--- a/crates/vim/test_data/test_delete_to_adjacent_character.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{"Put":{"state":"ˇax"}}
-{"Key":"d"}
-{"Key":"t"}
-{"Key":"x"}
-{"Get":{"state":"ˇx","mode":"Normal"}}
-{"Put":{"state":"aˇx"}}
-{"Key":"d"}
-{"Key":"t"}
-{"Key":"x"}
-{"Get":{"state":"aˇx","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_delete_to_end_of_line.json b/crates/vim/test_data/test_delete_to_end_of_line.json
deleted file mode 100644
index e15d5d0c4a..0000000000
--- a/crates/vim/test_data/test_delete_to_end_of_line.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"Put":{"state":"The qˇuick\nbrown fox"}}
-{"Key":"shift-d"}
-{"Get":{"state":"The ˇq\nbrown fox","mode":"Normal"}}
-{"Put":{"state":"The quick\nˇ\nbrown fox"}}
-{"Key":"shift-d"}
-{"Get":{"state":"The quick\nˇ\nbrown fox","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_delete_to_line.json b/crates/vim/test_data/test_delete_to_line.json
deleted file mode 100644
index eae919b039..0000000000
--- a/crates/vim/test_data/test_delete_to_line.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{"Put":{"state":"The quick\nbrownˇ fox\njumps over\nthe lazy"}}
-{"Key":"d"}
-{"Key":"3"}
-{"Key":"shift-g"}
-{"Get":{"state":"The quick\nthe lˇazy","mode":"Normal"}}
-{"Put":{"state":"The quick\nbrown fox\njumps over\nthe lˇazy"}}
-{"Key":"d"}
-{"Key":"3"}
-{"Key":"shift-g"}
-{"Get":{"state":"The quick\nbrownˇ fox","mode":"Normal"}}
-{"Put":{"state":"The quick\nbrown fox\njumps over\nˇ"}}
-{"Key":"d"}
-{"Key":"2"}
-{"Key":"shift-g"}
-{"Get":{"state":"ˇThe quick","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_delete_unmatched_brace.json b/crates/vim/test_data/test_delete_unmatched_brace.json
deleted file mode 100644
index e9308edc8b..0000000000
--- a/crates/vim/test_data/test_delete_unmatched_brace.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{"Put":{"state":"fn o(wow: i32) {\n  othˇ(wow)\n  oth(wow)\n}\n"}}
-{"Key":"d"}
-{"Key":"]"}
-{"Key":"}"}
-{"Get":{"state":"fn o(wow: i32) {\n  otˇh\n}\n","mode":"Normal"}}
-{"ReadRegister":{"name":"\"","value":"(wow)\n  oth(wow)"}}
-{"Put":{"state":"fn o(wow: i32) {\n  ˇoth(wow)\n  oth(wow)\n}\n"}}
-{"Key":"d"}
-{"Key":"]"}
-{"Key":"}"}
-{"Get":{"state":"fn o(wow: i32) {\nˇ}\n","mode":"Normal"}}
-{"ReadRegister":{"name":"\"","value":"  oth(wow)\n  oth(wow)\n"}}
diff --git a/crates/vim/test_data/test_delete_w.json b/crates/vim/test_data/test_delete_w.json
deleted file mode 100644
index e5e48ca444..0000000000
--- a/crates/vim/test_data/test_delete_w.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{"Put":{"state":"Test tesˇt\n    test"}}
-{"Key":"d"}
-{"Key":"w"}
-{"Get":{"state":"Test teˇs\n    test","mode":"Normal"}}
-{"Put":{"state":"Teˇst"}}
-{"Key":"d"}
-{"Key":"w"}
-{"Get":{"state":"Tˇe","mode":"Normal"}}
-{"Put":{"state":"Tˇest test"}}
-{"Key":"d"}
-{"Key":"w"}
-{"Get":{"state":"Tˇtest","mode":"Normal"}}
-{"Put":{"state":"Test teˇst\ntest"}}
-{"Key":"d"}
-{"Key":"w"}
-{"Get":{"state":"Test tˇe\ntest","mode":"Normal"}}
-{"Put":{"state":"Test tesˇt\ntest"}}
-{"Key":"d"}
-{"Key":"w"}
-{"Get":{"state":"Test teˇs\ntest","mode":"Normal"}}
-{"Put":{"state":"Test test\nˇ\ntest"}}
-{"Key":"d"}
-{"Key":"w"}
-{"Get":{"state":"Test test\nˇtest","mode":"Normal"}}
-{"Put":{"state":"Test teˇst-test test"}}
-{"Key":"d"}
-{"Key":"shift-w"}
-{"Get":{"state":"Test teˇtest","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_delete_with_counts.json b/crates/vim/test_data/test_delete_with_counts.json
deleted file mode 100644
index de19c5d29d..0000000000
--- a/crates/vim/test_data/test_delete_with_counts.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{"Put":{"state":"The ˇquick brown\nfox jumps over\nthe lazy dog"}}
-{"Key":"d"}
-{"Key":"2"}
-{"Key":"d"}
-{"Get":{"state":"the ˇlazy dog","mode":"Normal"}}
-{"Put":{"state":"The ˇquick brown\nfox jumps over\nthe lazy dog"}}
-{"Key":"2"}
-{"Key":"d"}
-{"Key":"d"}
-{"Get":{"state":"the ˇlazy dog","mode":"Normal"}}
-{"Put":{"state":"The ˇquick brown\nfox jumps over\nthe moon,\na star, and\nthe lazy dog"}}
-{"Key":"2"}
-{"Key":"d"}
-{"Key":"2"}
-{"Key":"d"}
-{"Get":{"state":"the ˇlazy dog","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_delete_word_object.json b/crates/vim/test_data/test_delete_word_object.json
deleted file mode 100644
index 9c11d89a12..0000000000
--- a/crates/vim/test_data/test_delete_word_object.json
+++ /dev/null
@@ -1,460 +0,0 @@
-{"Put":{"state":"The quick ˇbrown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick ˇ   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick browˇn   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick ˇ   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brownˇ   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick browˇn\nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox ˇjumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox ˇ over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox juˇmps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox ˇ over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumpsˇ over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumpsˇover\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dogˇ  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy doˇg\n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \nˇ\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \nˇ\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\nˇ\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\nˇ\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\nˇ\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\nˇ\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThˇe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nˇ-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nTheˇ-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nTheˇquick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-ˇquick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-ˇ brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quˇick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-ˇ brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quickˇ brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quickˇbrown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick ˇbrown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick ˇ \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brownˇ \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick browˇn\n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \nˇ  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \nˇ\n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \nˇ  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \nˇ\n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \nˇ  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \nˇfox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumpˇs over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-ˇ over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dogˇ \n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy doˇg\n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \nˇ\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \nˇ\n","mode":"Normal"}}
-{"Put":{"state":"The quick ˇbrown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick ˇ   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick browˇn   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick ˇ   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brownˇ   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick browˇn\nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox ˇjumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox ˇ over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox juˇmps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox ˇ over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumpsˇ over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumpsˇover\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dogˇ  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy doˇg\n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \nˇ\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \nˇ\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\nˇ\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\nˇ\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\nˇ\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\nˇ\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThˇe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nˇ brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nTheˇ-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nˇ brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-ˇquick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nˇ brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quˇick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nˇ brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quickˇ brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quickˇbrown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick ˇbrown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick ˇ \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brownˇ \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick browˇn\n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \nˇ  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \nˇ\n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \nˇ  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \nˇ\n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \nˇ  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \nˇfox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumpˇs over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  ˇ over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dogˇ \n\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy doˇg\n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \nˇ\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \nˇ\n","mode":"Normal"}}
-{"Put":{"state":"The quick ˇbrown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quickˇ \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick browˇn   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quickˇ \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brownˇ   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quick brownˇ jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox ˇjumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox ˇover\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox juˇmps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox ˇover\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumpsˇ over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumpˇs\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dogˇ  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy doˇg\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \nˇ\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \nˇ\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\nˇ\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\nˇThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\nˇ\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\nˇ-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThˇe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nˇ-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nTheˇ-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nTheˇquick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-ˇquick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-ˇbrown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quˇick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-ˇbrown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quickˇ brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quickˇ \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick ˇbrown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quickˇ \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brownˇ \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brownˇ-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \nˇ  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \nˇ-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \nˇ  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \nˇ-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \nˇ  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \nˇ-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumpˇs over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-ˇover\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dogˇ \n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy doˇg\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \nˇ\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nˇthe lazy dog ","mode":"Normal"}}
-{"Put":{"state":"The quick ˇbrown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quickˇ \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick browˇn   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quickˇ \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brownˇ   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brownˇ jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox ˇjumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox ˇover\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox juˇmps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox ˇover\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumpsˇ over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumpˇs\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dogˇ  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy doˇg\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \nˇ\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \nˇ\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\nˇ\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\nˇThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\nˇ\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\nˇ brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThˇe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nˇbrown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nTheˇ-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nˇbrown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-ˇquick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nˇbrown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quˇick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nˇbrown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quickˇ brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quickˇ \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick ˇbrown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quickˇ \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brownˇ \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brownˇ over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \nˇ  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \nˇ over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \nˇ  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \nˇ over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \nˇ  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \nˇ over\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumpˇs over\nthe lazy dog \n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  ˇover\nthe lazy dog \n\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dogˇ \n\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy doˇg\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \nˇ\n"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nˇthe lazy dog ","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_dgn_repeat.json b/crates/vim/test_data/test_dgn_repeat.json
deleted file mode 100644
index fc1db9e778..0000000000
--- a/crates/vim/test_data/test_dgn_repeat.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{"Put":{"state":"aaˇ aa aa aa aa"}}
-{"Key":"/"}
-{"Key":"a"}
-{"Key":"a"}
-{"Key":"enter"}
-{"Get":{"state":"aa ˇaa aa aa aa","mode":"Normal"}}
-{"Key":"d"}
-{"Key":"g"}
-{"Key":"n"}
-{"Get":{"state":"aa ˇ aa aa aa","mode":"Normal"}}
-{"Key":"."}
-{"Get":{"state":"aa  ˇ aa aa","mode":"Normal"}}
-{"Key":"."}
-{"Get":{"state":"aa   ˇ aa","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_digraph_find.json b/crates/vim/test_data/test_digraph_find.json
deleted file mode 100644
index 7d5811bd4d..0000000000
--- a/crates/vim/test_data/test_digraph_find.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{"Put":{"state":"ˇHellö world"}}
-{"Key":"f"}
-{"Key":"ctrl-k"}
-{"Key":"o"}
-{"Key":":"}
-{"Get":{"state":"Hellˇö world","mode":"Normal"}}
-{"Put":{"state":"ˇHellö world"}}
-{"Key":"t"}
-{"Key":"ctrl-k"}
-{"Key":"o"}
-{"Key":":"}
-{"Get":{"state":"Helˇlö world","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_digraph_insert_mode.json b/crates/vim/test_data/test_digraph_insert_mode.json
deleted file mode 100644
index e7cebb262e..0000000000
--- a/crates/vim/test_data/test_digraph_insert_mode.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{"Put":{"state":"Hellˇo"}}
-{"Key":"a"}
-{"Key":"ctrl-k"}
-{"Key":"o"}
-{"Key":":"}
-{"Key":"escape"}
-{"Get":{"state":"Helloˇö","mode":"Normal"}}
-{"Put":{"state":"Hellˇo"}}
-{"Key":"a"}
-{"Key":"ctrl-k"}
-{"Key":":"}
-{"Key":"o"}
-{"Key":"escape"}
-{"Get":{"state":"Helloˇö","mode":"Normal"}}
-{"Put":{"state":"Hellˇo"}}
-{"Key":"i"}
-{"Key":"ctrl-k"}
-{"Key":"o"}
-{"Key":":"}
-{"Key":"escape"}
-{"Get":{"state":"Hellˇöo","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_digraph_insert_multicursor.json b/crates/vim/test_data/test_digraph_insert_multicursor.json
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/crates/vim/test_data/test_digraph_keymap_conflict.json b/crates/vim/test_data/test_digraph_keymap_conflict.json
deleted file mode 100644
index 0481fbb724..0000000000
--- a/crates/vim/test_data/test_digraph_keymap_conflict.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{"Put":{"state":"Hellˇo"}}
-{"Key":"a"}
-{"Key":"ctrl-k"}
-{"Key":"s"}
-{"Key":","}
-{"Key":"escape"}
-{"Get":{"state":"Helloˇş","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_digraph_replace.json b/crates/vim/test_data/test_digraph_replace.json
deleted file mode 100644
index 7615263339..0000000000
--- a/crates/vim/test_data/test_digraph_replace.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"Put":{"state":"Hellˇo"}}
-{"Key":"r"}
-{"Key":"ctrl-k"}
-{"Key":"o"}
-{"Key":":"}
-{"Get":{"state":"Hellˇö","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_digraph_replace_mode.json b/crates/vim/test_data/test_digraph_replace_mode.json
deleted file mode 100644
index 0030fde850..0000000000
--- a/crates/vim/test_data/test_digraph_replace_mode.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{"Put":{"state":"ˇHello"}}
-{"Key":"shift-r"}
-{"Key":"ctrl-k"}
-{"Key":"a"}
-{"Key":"'"}
-{"Key":"ctrl-k"}
-{"Key":"e"}
-{"Key":"`"}
-{"Key":"ctrl-k"}
-{"Key":"i"}
-{"Key":":"}
-{"Key":"ctrl-k"}
-{"Key":"o"}
-{"Key":"~"}
-{"Key":"ctrl-k"}
-{"Key":"u"}
-{"Key":"-"}
-{"Key":"escape"}
-{"Get":{"state":"áèïõˇū","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_dot_mark.json b/crates/vim/test_data/test_dot_mark.json
deleted file mode 100644
index 27edd9d2ab..0000000000
--- a/crates/vim/test_data/test_dot_mark.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{"Put":{"state":"one two\nthree fˇr"}}
-{"Key":"i"}
-{"Key":"o"}
-{"Key":"escape"}
-{"Key":"k"}
-{"Key":"`"}
-{"Key":"."}
-{"Get":{"state":"one two\nthree fˇor","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_dot_repeat.json b/crates/vim/test_data/test_dot_repeat.json
deleted file mode 100644
index 331ef52ecb..0000000000
--- a/crates/vim/test_data/test_dot_repeat.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{"Put":{"state":"ˇhello"}}
-{"Key":"o"}
-{"Key":"w"}
-{"Key":"o"}
-{"Key":"r"}
-{"Key":"l"}
-{"Key":"d"}
-{"Key":"escape"}
-{"Get":{"state":"hello\nworlˇd","mode":"Normal"}}
-{"Key":"."}
-{"Get":{"state":"hello\nworld\nworlˇd","mode":"Normal"}}
-{"Key":"^"}
-{"Key":"d"}
-{"Key":"f"}
-{"Key":"o"}
-{"Key":"g"}
-{"Key":"g"}
-{"Key":"."}
-{"Get":{"state":"ˇ\nworld\nrld","mode":"Normal"}}
-{"Key":"j"}
-{"Key":"y"}
-{"Key":"y"}
-{"Key":"p"}
-{"Key":"shift-g"}
-{"Key":"y"}
-{"Key":"y"}
-{"Key":"."}
-{"Get":{"state":"\nworld\nworld\nrld\nˇrld","mode":"Normal"}}
-{"Put":{"state":"ˇthe quick brown fox"}}
-{"Key":"2"}
-{"Key":"~"}
-{"Key":"."}
-{"Put":{"state":"THE ˇquick brown fox"}}
-{"Key":"3"}
-{"Key":"."}
-{"Put":{"state":"THE QUIˇck brown fox"}}
-{"Key":"."}
-{"Get":{"state":"THE QUICK ˇbrown fox","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_dw_eol.json b/crates/vim/test_data/test_dw_eol.json
deleted file mode 100644
index 93ec9b1066..0000000000
--- a/crates/vim/test_data/test_dw_eol.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"SetOption":{"value":"wrap"}}
-{"SetOption":{"value":"columns=12"}}
-{"Put":{"state":"twelve ˇchar twelve char\ntwelve char"}}
-{"Key":"d"}
-{"Key":"w"}
-{"Get":{"state":"twelve ˇtwelve char\ntwelve char","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_end_of_document.json b/crates/vim/test_data/test_end_of_document.json
deleted file mode 100644
index 2ad056170c..0000000000
--- a/crates/vim/test_data/test_end_of_document.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{"Put":{"state":"The qˇuick\n\nbrown fox jumps\nover the lazy dog"}}
-{"Key":"shift-g"}
-{"Get":{"state":"The quick\n\nbrown fox jumps\nover ˇthe lazy dog","mode":"Normal"}}
-{"Key":"shift-g"}
-{"Get":{"state":"The quick\n\nbrown fox jumps\nover ˇthe lazy dog","mode":"Normal"}}
-{"Put":{"state":"The quick\n\nbrown fox jumps\nover the laˇzy dog"}}
-{"Key":"shift-g"}
-{"Get":{"state":"The quick\n\nbrown fox jumps\nover the laˇzy dog","mode":"Normal"}}
-{"Put":{"state":"\n\nbrown fox jumps\nover the laˇzy dog"}}
-{"Key":"shift-g"}
-{"Get":{"state":"\n\nbrown fox jumps\nover the laˇzy dog","mode":"Normal"}}
-{"Put":{"state":"ˇ\n\nbrown fox jumps\nover the lazydog"}}
-{"Key":"2"}
-{"Key":"shift-g"}
-{"Get":{"state":"\nˇ\nbrown fox jumps\nover the lazydog","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_end_of_line_downward.json b/crates/vim/test_data/test_end_of_line_downward.json
deleted file mode 100644
index e3563f6b3f..0000000000
--- a/crates/vim/test_data/test_end_of_line_downward.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{"Put":{"state":"ˇ one\n two \nthree"}}
-{"Key":"g"}
-{"Key":"_"}
-{"Get":{"state":" onˇe\n two \nthree","mode":"Normal"}}
-{"Put":{"state":"ˇ one \n two \nthree"}}
-{"Key":"g"}
-{"Key":"_"}
-{"Get":{"state":" onˇe \n two \nthree","mode":"Normal"}}
-{"Key":"2"}
-{"Key":"g"}
-{"Key":"_"}
-{"Get":{"state":" one \n twˇo \nthree","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_end_of_line_with_neovim.json b/crates/vim/test_data/test_end_of_line_with_neovim.json
deleted file mode 100644
index 58ac05134a..0000000000
--- a/crates/vim/test_data/test_end_of_line_with_neovim.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{"Put":{"state":"ˇaa\nbb\ncc"}}
-{"Key":"$"}
-{"Get":{"state":"aˇa\nbb\ncc","mode":"Normal"}}
-{"Key":"2"}
-{"Key":"$"}
-{"Get":{"state":"aa\nbˇb\ncc","mode":"Normal"}}
-{"Key":"4"}
-{"Key":"$"}
-{"Get":{"state":"aa\nbb\ncˇc","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_end_of_word.json b/crates/vim/test_data/test_end_of_word.json
deleted file mode 100644
index 06f80dc245..0000000000
--- a/crates/vim/test_data/test_end_of_word.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{"Put":{"state":"Thˇe quick-brown\n\n\nfox_jumps over\nthe"}}
-{"Key":"e"}
-{"Get":{"state":"The quicˇk-brown\n\n\nfox_jumps over\nthe","mode":"Normal"}}
-{"Key":"e"}
-{"Get":{"state":"The quickˇ-brown\n\n\nfox_jumps over\nthe","mode":"Normal"}}
-{"Key":"e"}
-{"Get":{"state":"The quick-browˇn\n\n\nfox_jumps over\nthe","mode":"Normal"}}
-{"Key":"e"}
-{"Get":{"state":"The quick-brown\n\n\nfox_jumpˇs over\nthe","mode":"Normal"}}
-{"Key":"e"}
-{"Get":{"state":"The quick-brown\n\n\nfox_jumps oveˇr\nthe","mode":"Normal"}}
-{"Key":"e"}
-{"Get":{"state":"The quick-brown\n\n\nfox_jumps over\nthˇe","mode":"Normal"}}
-{"Key":"e"}
-{"Get":{"state":"The quick-brown\n\n\nfox_jumps over\nthˇe","mode":"Normal"}}
-{"Put":{"state":"Thˇe quick-brown\n\n\nfox_jumps over\nthe"}}
-{"Key":"shift-e"}
-{"Get":{"state":"The quick-browˇn\n\n\nfox_jumps over\nthe","mode":"Normal"}}
-{"Put":{"state":"The quicˇk-brown\n\n\nfox_jumps over\nthe"}}
-{"Key":"shift-e"}
-{"Get":{"state":"The quick-browˇn\n\n\nfox_jumps over\nthe","mode":"Normal"}}
-{"Put":{"state":"The quickˇ-brown\n\n\nfox_jumps over\nthe"}}
-{"Key":"shift-e"}
-{"Get":{"state":"The quick-browˇn\n\n\nfox_jumps over\nthe","mode":"Normal"}}
-{"Key":"shift-e"}
-{"Get":{"state":"The quick-brown\n\n\nfox_jumpˇs over\nthe","mode":"Normal"}}
-{"Key":"shift-e"}
-{"Get":{"state":"The quick-brown\n\n\nfox_jumps oveˇr\nthe","mode":"Normal"}}
-{"Key":"shift-e"}
-{"Get":{"state":"The quick-brown\n\n\nfox_jumps over\nthˇe","mode":"Normal"}}
-{"Key":"shift-e"}
-{"Get":{"state":"The quick-brown\n\n\nfox_jumps over\nthˇe","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_enter.json b/crates/vim/test_data/test_enter.json
deleted file mode 100644
index c010a1ffd2..0000000000
--- a/crates/vim/test_data/test_enter.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{"Put":{"state":"ˇThe quick brown\nfox jumps"}}
-{"Key":"enter"}
-{"Get":{"state":"The quick brown\nˇfox jumps","mode":"Normal"}}
-{"Put":{"state":"The qˇuick brown\nfox jumps"}}
-{"Key":"enter"}
-{"Get":{"state":"The quick brown\nˇfox jumps","mode":"Normal"}}
-{"Put":{"state":"The quick broˇwn\nfox jumps"}}
-{"Key":"enter"}
-{"Get":{"state":"The quick brown\nˇfox jumps","mode":"Normal"}}
-{"Key":"enter"}
-{"Get":{"state":"The quick brown\nˇfox jumps","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_enter_visual_line_mode.json b/crates/vim/test_data/test_enter_visual_line_mode.json
deleted file mode 100644
index bf14ae2495..0000000000
--- a/crates/vim/test_data/test_enter_visual_line_mode.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{"Put":{"state":"The ˇquick brown\nfox jumps over\nthe lazy dog"}}
-{"Key":"shift-v"}
-{"Get":{"state":"The «qˇ»uick brown\nfox jumps over\nthe lazy dog","mode":"VisualLine"}}
-{"Key":"x"}
-{"Get":{"state":"fox ˇjumps over\nthe lazy dog","mode":"Normal"}}
-{"Put":{"state":"a\nˇ\nb"}}
-{"Key":"shift-v"}
-{"Get":{"state":"a\n«\nˇ»b","mode":"VisualLine"}}
-{"Key":"x"}
-{"Get":{"state":"a\nˇb","mode":"Normal"}}
-{"Put":{"state":"a\nb\nˇ"}}
-{"Key":"shift-v"}
-{"Get":{"state":"a\nb\nˇ","mode":"VisualLine"}}
-{"Key":"x"}
-{"Get":{"state":"a\nˇb","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_enter_visual_mode.json b/crates/vim/test_data/test_enter_visual_mode.json
deleted file mode 100644
index 090e35cc5d..0000000000
--- a/crates/vim/test_data/test_enter_visual_mode.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{"Put":{"state":"The ˇquick brown\nfox jumps over\nthe lazy dog"}}
-{"Key":"v"}
-{"Get":{"state":"The «qˇ»uick brown\nfox jumps over\nthe lazy dog","mode":"Visual"}}
-{"Key":"w"}
-{"Key":"j"}
-{"Get":{"state":"The «quick brown\nfox jumps oˇ»ver\nthe lazy dog","mode":"Visual"}}
-{"Key":"escape"}
-{"Get":{"state":"The quick brown\nfox jumps ˇover\nthe lazy dog","mode":"Normal"}}
-{"Key":"v"}
-{"Key":"k"}
-{"Key":"b"}
-{"Get":{"state":"The «ˇquick brown\nfox jumps o»ver\nthe lazy dog","mode":"Visual"}}
-{"Put":{"state":"a\nˇ\nb\n"}}
-{"Key":"v"}
-{"Get":{"state":"a\n«\nˇ»b\n","mode":"Visual"}}
-{"Key":"v"}
-{"Get":{"state":"a\nˇ\nb\n","mode":"Normal"}}
-{"Put":{"state":"a\nb\nˇ"}}
-{"Key":"v"}
-{"Get":{"state":"a\nb\nˇ","mode":"Visual"}}
diff --git a/crates/vim/test_data/test_escape_while_waiting.json b/crates/vim/test_data/test_escape_while_waiting.json
deleted file mode 100644
index d81822cf79..0000000000
--- a/crates/vim/test_data/test_escape_while_waiting.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"Put":{"state":"ˇhi"}}
-{"Key":"\""}
-{"Key":"+"}
-{"Key":"escape"}
-{"Key":"x"}
-{"Get":{"state":"ˇi","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_f_and_t.json b/crates/vim/test_data/test_f_and_t.json
deleted file mode 100644
index 2d2a358452..0000000000
--- a/crates/vim/test_data/test_f_and_t.json
+++ /dev/null
@@ -1,557 +0,0 @@
-{"Put":{"state":"ˇaaab b   bb aaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"1"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaaˇb b   bb aaabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Key":"1"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab ˇb   bb aaabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaabˇ b   bb aaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"1"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab ˇb   bb aaabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Key":"1"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   ˇbb aaabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab bˇ   bb aaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"1"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   ˇbb aaabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Key":"1"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bˇb aaabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Key":"1"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaaˇbaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bbˇ aaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"1"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaaˇbaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aˇaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"1"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaaˇbaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Key":"1"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaaˇbaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\nˇ    baaa bbb\n\nb\n"}}
-{"Key":"1"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    ˇbaaa bbb\n\nb\n","mode":"Normal"}}
-{"Key":"1"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa ˇbbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    bˇaaa bbb\n\nb\n"}}
-{"Key":"1"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa ˇbbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaˇa bbb\n\nb\n"}}
-{"Key":"1"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa ˇbbb\n\nb\n","mode":"Normal"}}
-{"Key":"1"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bˇbb\n\nb\n","mode":"Normal"}}
-{"Key":"1"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bbˇb\n\nb\n","mode":"Normal"}}
-{"Key":"1"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bbˇb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa bbb\nˇ\nb\n"}}
-{"Key":"1"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bbb\nˇ\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa bbb\n\nˇb\n"}}
-{"Key":"1"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bbb\n\nˇb\n","mode":"Normal"}}
-{"Put":{"state":"ˇaaab b   bb aaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"1"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaˇab b   bb aaabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaaˇb b   bb aaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"1"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaabˇ b   bb aaabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Key":"1"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaabˇ b   bb aaabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab ˇb   bb aaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"1"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b  ˇ bb aaabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab bˇ   bb aaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"1"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b  ˇ bb aaabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   ˇbb aaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"1"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   ˇbb aaabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bˇb aaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"1"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaˇabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bbˇ aaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"1"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaˇabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aˇaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"1"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaˇabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaaˇbaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"1"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaaˇbaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\nˇ    baaa bbb\n\nb\n"}}
-{"Key":"1"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n   ˇ baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    ˇbaaa bbb\n\nb\n"}}
-{"Key":"1"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaaˇ bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    bˇaaa bbb\n\nb\n"}}
-{"Key":"1"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaaˇ bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaˇa bbb\n\nb\n"}}
-{"Key":"1"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaaˇ bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa ˇbbb\n\nb\n"}}
-{"Key":"1"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa ˇbbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa bˇbb\n\nb\n"}}
-{"Key":"1"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bˇbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa bbˇb\n\nb\n"}}
-{"Key":"1"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bbˇb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa bbb\nˇ\nb\n"}}
-{"Key":"1"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bbb\nˇ\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa bbb\n\nˇb\n"}}
-{"Key":"1"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bbb\n\nˇb\n","mode":"Normal"}}
-{"Put":{"state":"ˇaaab b   bb aaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"2"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab ˇb   bb aaabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaaˇb b   bb aaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"2"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   ˇbb aaabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaabˇ b   bb aaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"2"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   ˇbb aaabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab ˇb   bb aaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"2"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bˇb aaabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab bˇ   bb aaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"2"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bˇb aaabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   ˇbb aaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"2"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaaˇbaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bˇb aaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"2"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bˇb aaabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bbˇ aaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"2"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bbˇ aaabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aˇaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"2"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aˇaabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaaˇbaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"2"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaaˇbaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\nˇ    baaa bbb\n\nb\n"}}
-{"Key":"2"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa ˇbbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    ˇbaaa bbb\n\nb\n"}}
-{"Key":"2"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bˇbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    bˇaaa bbb\n\nb\n"}}
-{"Key":"2"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bˇbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaˇa bbb\n\nb\n"}}
-{"Key":"2"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bˇbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa ˇbbb\n\nb\n"}}
-{"Key":"2"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bbˇb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa bˇbb\n\nb\n"}}
-{"Key":"2"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bˇbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa bbˇb\n\nb\n"}}
-{"Key":"2"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bbˇb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa bbb\nˇ\nb\n"}}
-{"Key":"2"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bbb\nˇ\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa bbb\n\nˇb\n"}}
-{"Key":"2"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bbb\n\nˇb\n","mode":"Normal"}}
-{"Put":{"state":"ˇaaab b   bb aaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"2"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaabˇ b   bb aaabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaaˇb b   bb aaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"2"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b  ˇ bb aaabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaabˇ b   bb aaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"2"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b  ˇ bb aaabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab ˇb   bb aaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"2"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   ˇbb aaabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab bˇ   bb aaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"2"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   ˇbb aaabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Key":"2"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaˇabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bˇb aaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"2"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bˇb aaabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bbˇ aaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"2"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bbˇ aaabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aˇaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"2"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aˇaabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaaˇbaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"2"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaaˇbaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\nˇ    baaa bbb\n\nb\n"}}
-{"Key":"2"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaaˇ bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    ˇbaaa bbb\n\nb\n"}}
-{"Key":"2"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa ˇbbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    bˇaaa bbb\n\nb\n"}}
-{"Key":"2"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa ˇbbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaˇa bbb\n\nb\n"}}
-{"Key":"2"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa ˇbbb\n\nb\n","mode":"Normal"}}
-{"Key":"2"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bˇbb\n\nb\n","mode":"Normal"}}
-{"Key":"2"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bˇbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa bbˇb\n\nb\n"}}
-{"Key":"2"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bbˇb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa bbb\nˇ\nb\n"}}
-{"Key":"2"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bbb\nˇ\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa bbb\n\nˇb\n"}}
-{"Key":"2"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bbb\n\nˇb\n","mode":"Normal"}}
-{"Put":{"state":"ˇaaab b   bb aaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"3"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   ˇbb aaabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaaˇb b   bb aaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"3"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bˇb aaabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaabˇ b   bb aaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"3"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bˇb aaabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab ˇb   bb aaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"3"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaaˇbaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab bˇ   bb aaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"3"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaaˇbaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   ˇbb aaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"3"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   ˇbb aaabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bˇb aaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"3"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bˇb aaabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bbˇ aaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"3"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bbˇ aaabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aˇaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"3"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aˇaabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaaˇbaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"3"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaaˇbaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\nˇ    baaa bbb\n\nb\n"}}
-{"Key":"3"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bˇbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    ˇbaaa bbb\n\nb\n"}}
-{"Key":"3"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bbˇb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    bˇaaa bbb\n\nb\n"}}
-{"Key":"3"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bbˇb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaˇa bbb\n\nb\n"}}
-{"Key":"3"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bbˇb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa ˇbbb\n\nb\n"}}
-{"Key":"3"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa ˇbbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa bˇbb\n\nb\n"}}
-{"Key":"3"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bˇbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa bbˇb\n\nb\n"}}
-{"Key":"3"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bbˇb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa bbb\nˇ\nb\n"}}
-{"Key":"3"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bbb\nˇ\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa bbb\n\nˇb\n"}}
-{"Key":"3"}
-{"Key":"f"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bbb\n\nˇb\n","mode":"Normal"}}
-{"Put":{"state":"ˇaaab b   bb aaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"3"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b  ˇ bb aaabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaaˇb b   bb aaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"3"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   ˇbb aaabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaabˇ b   bb aaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"3"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   ˇbb aaabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab ˇb   bb aaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"3"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaˇabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab bˇ   bb aaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"3"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaˇabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   ˇbb aaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"3"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   ˇbb aaabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bˇb aaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"3"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bˇb aaabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bbˇ aaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"3"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bbˇ aaabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aˇaabaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"3"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aˇaabaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaaˇbaaa\n    baaa bbb\n\nb\n"}}
-{"Key":"3"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaaˇbaaa\n    baaa bbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\nˇ    baaa bbb\n\nb\n"}}
-{"Key":"3"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa ˇbbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    ˇbaaa bbb\n\nb\n"}}
-{"Key":"3"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bˇbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    bˇaaa bbb\n\nb\n"}}
-{"Key":"3"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bˇbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaˇa bbb\n\nb\n"}}
-{"Key":"3"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bˇbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa ˇbbb\n\nb\n"}}
-{"Key":"3"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa ˇbbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa bˇbb\n\nb\n"}}
-{"Key":"3"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bˇbb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa bbˇb\n\nb\n"}}
-{"Key":"3"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bbˇb\n\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa bbb\nˇ\nb\n"}}
-{"Key":"3"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bbb\nˇ\nb\n","mode":"Normal"}}
-{"Put":{"state":"aaab b   bb aaabaaa\n    baaa bbb\n\nˇb\n"}}
-{"Key":"3"}
-{"Key":"t"}
-{"Key":"b"}
-{"Get":{"state":"aaab b   bb aaabaaa\n    baaa bbb\n\nˇb\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_find_multibyte.json b/crates/vim/test_data/test_find_multibyte.json
deleted file mode 100644
index 710a89aede..0000000000
--- a/crates/vim/test_data/test_find_multibyte.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{"Put":{"state":"<label for=\"guests\">ˇPočet hostů</label>"}}
-{"Key":"c"}
-{"Key":"t"}
-{"Key":"<"}
-{"Key":"o"}
-{"Key":"escape"}
-{"Get":{"state":"<label for=\"guests\">ˇo</label>","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_folds.json b/crates/vim/test_data/test_folds.json
deleted file mode 100644
index c1972480d1..0000000000
--- a/crates/vim/test_data/test_folds.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{"SetOption":{"value":"foldmethod=manual"}}
-{"Put":{"state":"fn boop() {\n  ˇbarp()\n  bazp()\n}\n"}}
-{"Key":"shift-v"}
-{"Key":"j"}
-{"Key":"z"}
-{"Key":"f"}
-{"Key":"escape"}
-{"Key":"g"}
-{"Key":"g"}
-{"Get":{"state":"ˇfn boop() {\n  barp()\n  bazp()\n}\n","mode":"Normal"}}
-{"Key":"j"}
-{"Key":"j"}
-{"Get":{"state":"fn boop() {\n  barp()\n  bazp()\nˇ}\n","mode":"Normal"}}
-{"Key":"2"}
-{"Key":"k"}
-{"Get":{"state":"ˇfn boop() {\n  barp()\n  bazp()\n}\n","mode":"Normal"}}
-{"Key":"down"}
-{"Key":"y"}
-{"Key":"y"}
-{"Get":{"state":"fn boop() {\nˇ  barp()\n  bazp()\n}\n","mode":"Normal"}}
-{"ReadRegister":{"name":"\"","value":"  barp()\n  bazp()\n"}}
-{"Key":"z"}
-{"Key":"o"}
-{"Get":{"state":"fn boop() {\nˇ  barp()\n  bazp()\n}\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_folds_panic.json b/crates/vim/test_data/test_folds_panic.json
deleted file mode 100644
index a215765b04..0000000000
--- a/crates/vim/test_data/test_folds_panic.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{"SetOption":{"value":"foldmethod=manual"}}
-{"Put":{"state":"fn boop() {\n  ˇbarp()\n  bazp()\n}\n"}}
-{"Key":"shift-v"}
-{"Key":"j"}
-{"Key":"z"}
-{"Key":"f"}
-{"Key":"escape"}
-{"Key":"g"}
-{"Key":"g"}
-{"Key":"5"}
-{"Key":"d"}
-{"Key":"j"}
-{"Get":{"state":"ˇ","mode":"Normal"}}
-{"Put":{"state":"fn boop() {\n  ˇbarp()\n  bazp()\n}\n"}}
-{"Key":"shift-v"}
-{"Key":"j"}
-{"Key":"j"}
-{"Key":"z"}
-{"Key":"f"}
-{"Key":"escape"}
-{"Key":"shift-g"}
-{"Key":"shift-v"}
-{"Get":{"state":"fn boop() {\n  barp()\n  bazp()\n}\nˇ","mode":"VisualLine"}}
diff --git a/crates/vim/test_data/test_forced_motion_delete_to_end_of_line.json b/crates/vim/test_data/test_forced_motion_delete_to_end_of_line.json
deleted file mode 100644
index 4df916befb..0000000000
--- a/crates/vim/test_data/test_forced_motion_delete_to_end_of_line.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{"Put":{"state":"the quick brown foˇx\njumped over the lazy dog"}}
-{"Key":"d"}
-{"Key":"v"}
-{"Key":"$"}
-{"Get":{"state":"the quick brown foˇx\njumped over the lazy dog","mode":"Normal"}}
-{"Put":{"state":"ˇthe quick brown fox\njumped over the lazy dog"}}
-{"Key":"d"}
-{"Key":"v"}
-{"Key":"$"}
-{"Get":{"state":"ˇx\njumped over the lazy dog","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_forced_motion_delete_to_middle_of_line.json b/crates/vim/test_data/test_forced_motion_delete_to_middle_of_line.json
deleted file mode 100644
index ca6aa52804..0000000000
--- a/crates/vim/test_data/test_forced_motion_delete_to_middle_of_line.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{"Put":{"state":"ˇthe quick brown fox\njumped over the lazy dog"}}
-{"Key":"d"}
-{"Key":"v"}
-{"Key":"g"}
-{"Key":"shift-m"}
-{"Get":{"state":"ˇbrown fox\njumped over the lazy dog","mode":"Normal"}}
-{"Put":{"state":"the quick bˇrown fox\njumped over the lazy dog"}}
-{"Key":"d"}
-{"Key":"v"}
-{"Key":"g"}
-{"Key":"shift-m"}
-{"Get":{"state":"the quickˇown fox\njumped over the lazy dog","mode":"Normal"}}
-{"Put":{"state":"the quick brown foˇx\njumped over the lazy dog"}}
-{"Key":"d"}
-{"Key":"v"}
-{"Key":"g"}
-{"Key":"shift-m"}
-{"Get":{"state":"the quicˇk\njumped over the lazy dog","mode":"Normal"}}
-{"Put":{"state":"ˇthe quick brown fox\njumped over the lazy dog"}}
-{"Key":"d"}
-{"Key":"v"}
-{"Key":"7"}
-{"Key":"5"}
-{"Key":"g"}
-{"Key":"shift-m"}
-{"Get":{"state":"ˇ fox\njumped over the lazy dog","mode":"Normal"}}
-{"Put":{"state":"ˇthe quick brown fox\njumped over the lazy dog"}}
-{"Key":"d"}
-{"Key":"v"}
-{"Key":"2"}
-{"Key":"3"}
-{"Key":"g"}
-{"Key":"shift-m"}
-{"Get":{"state":"ˇuick brown fox\njumped over the lazy dog","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_forced_motion_delete_to_start_of_line.json b/crates/vim/test_data/test_forced_motion_delete_to_start_of_line.json
deleted file mode 100644
index 8aae77c8de..0000000000
--- a/crates/vim/test_data/test_forced_motion_delete_to_start_of_line.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{"Put":{"state":"ˇthe quick brown fox\njumped over the lazy dog"}}
-{"Key":"d"}
-{"Key":"v"}
-{"Key":"0"}
-{"Get":{"state":"ˇhe quick brown fox\njumped over the lazy dog","mode":"Normal"}}
-{"Put":{"state":"the quick bˇrown fox\njumped over the lazy dog"}}
-{"Key":"d"}
-{"Key":"v"}
-{"Key":"0"}
-{"Get":{"state":"ˇown fox\njumped over the lazy dog","mode":"Normal"}}
-{"Put":{"state":"the quick brown foˇx\njumped over the lazy dog"}}
-{"Key":"d"}
-{"Key":"v"}
-{"Key":"0"}
-{"Get":{"state":"ˇ\njumped over the lazy dog","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_forced_motion_yank.json b/crates/vim/test_data/test_forced_motion_yank.json
deleted file mode 100644
index 208c22d689..0000000000
--- a/crates/vim/test_data/test_forced_motion_yank.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{"Put":{"state":"ˇthe quick brown fox\njumped over the lazy dog"}}
-{"Key":"y"}
-{"Key":"v"}
-{"Key":"j"}
-{"Key":"p"}
-{"Get":{"state":"the quick brown fox\nˇthe quick brown fox\njumped over the lazy dog","mode":"Normal"}}
-{"Put":{"state":"the quick bˇrown fox\njumped over the lazy dog"}}
-{"Key":"y"}
-{"Key":"v"}
-{"Key":"j"}
-{"Key":"p"}
-{"Get":{"state":"the quick brˇrown fox\njumped overown fox\njumped over the lazy dog","mode":"Normal"}}
-{"Put":{"state":"the quick brown foˇx\njumped over the lazy dog"}}
-{"Key":"y"}
-{"Key":"v"}
-{"Key":"j"}
-{"Key":"p"}
-{"Get":{"state":"the quick brown foxˇx\njumped over the la\njumped over the lazy dog","mode":"Normal"}}
-{"Put":{"state":"the quick brown fox\njˇumped over the lazy dog"}}
-{"Key":"y"}
-{"Key":"v"}
-{"Key":"k"}
-{"Key":"p"}
-{"Get":{"state":"thˇhe quick brown fox\nje quick brown fox\njumped over the lazy dog","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_gg.json b/crates/vim/test_data/test_gg.json
deleted file mode 100644
index 7cc8291b13..0000000000
--- a/crates/vim/test_data/test_gg.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{"Put":{"state":"The qˇuick\n\nbrown fox jumps\nover the lazy dog"}}
-{"Key":"g"}
-{"Key":"g"}
-{"Get":{"state":"The qˇuick\n\nbrown fox jumps\nover the lazy dog","mode":"Normal"}}
-{"Put":{"state":"The quick\n\nbrown fox jumps\nover ˇthe lazy dog"}}
-{"Key":"g"}
-{"Key":"g"}
-{"Get":{"state":"The qˇuick\n\nbrown fox jumps\nover the lazy dog","mode":"Normal"}}
-{"Put":{"state":"The quick\n\nbrown fox jumps\nover the laˇzy dog"}}
-{"Key":"g"}
-{"Key":"g"}
-{"Get":{"state":"The quicˇk\n\nbrown fox jumps\nover the lazy dog","mode":"Normal"}}
-{"Put":{"state":"\n\nbrown fox jumps\nover the laˇzy dog"}}
-{"Key":"g"}
-{"Key":"g"}
-{"Get":{"state":"ˇ\n\nbrown fox jumps\nover the lazy dog","mode":"Normal"}}
-{"Put":{"state":"ˇ\n\nbrown fox jumps\nover the lazydog"}}
-{"Key":"2"}
-{"Key":"g"}
-{"Key":"g"}
-{"Get":{"state":"\nˇ\nbrown fox jumps\nover the lazydog","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_gi.json b/crates/vim/test_data/test_gi.json
deleted file mode 100644
index a36a919751..0000000000
--- a/crates/vim/test_data/test_gi.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{"Put":{"state":"one two\nthree fˇr"}}
-{"Key":"i"}
-{"Key":"o"}
-{"Key":"escape"}
-{"Key":"k"}
-{"Key":"g"}
-{"Key":"i"}
-{"Key":"u"}
-{"Key":"escape"}
-{"Get":{"state":"one two\nthree foˇur","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_gn.json b/crates/vim/test_data/test_gn.json
deleted file mode 100644
index b9e0558fca..0000000000
--- a/crates/vim/test_data/test_gn.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{"Put":{"state":"aaˇ aa aa aa aa"}}
-{"Key":"/"}
-{"Key":"a"}
-{"Key":"a"}
-{"Key":"enter"}
-{"Get":{"state":"aa ˇaa aa aa aa","mode":"Normal"}}
-{"Key":"g"}
-{"Key":"n"}
-{"Get":{"state":"aa «aaˇ» aa aa aa","mode":"Visual"}}
-{"Key":"g"}
-{"Key":"n"}
-{"Get":{"state":"aa «aa aaˇ» aa aa","mode":"Visual"}}
-{"Key":"escape"}
-{"Key":"d"}
-{"Key":"g"}
-{"Key":"n"}
-{"Get":{"state":"aa aa ˇ aa aa","mode":"Normal"}}
-{"Put":{"state":"aaˇ aa aa aa aa"}}
-{"Key":"/"}
-{"Key":"a"}
-{"Key":"a"}
-{"Key":"enter"}
-{"Get":{"state":"aa ˇaa aa aa aa","mode":"Normal"}}
-{"Key":"3"}
-{"Key":"g"}
-{"Key":"n"}
-{"Get":{"state":"aa aa aa «aaˇ» aa","mode":"Visual"}}
-{"Put":{"state":"aaˇ aa aa aa aa"}}
-{"Key":"/"}
-{"Key":"a"}
-{"Key":"a"}
-{"Key":"enter"}
-{"Get":{"state":"aa ˇaa aa aa aa","mode":"Normal"}}
-{"Key":"g"}
-{"Key":"shift-n"}
-{"Get":{"state":"aa «ˇaa» aa aa aa","mode":"Visual"}}
-{"Key":"g"}
-{"Key":"shift-n"}
-{"Get":{"state":"«ˇaa aa» aa aa aa","mode":"Visual"}}
diff --git a/crates/vim/test_data/test_go_to_percentage.json b/crates/vim/test_data/test_go_to_percentage.json
deleted file mode 100644
index d7efd170f2..0000000000
--- a/crates/vim/test_data/test_go_to_percentage.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{"Put":{"state":"The ˇquick brown\nfox jumps over\nthe lazy dog\nThe quick brown\nfox jumps over\nthe lazy dog\nThe quick brown\nfox jumps over\nthe lazy dog"}}
-{"Key":"2"}
-{"Key":"0"}
-{"Key":"%"}
-{"Get":{"state":"The quick brown\nfox ˇjumps over\nthe lazy dog\nThe quick brown\nfox jumps over\nthe lazy dog\nThe quick brown\nfox jumps over\nthe lazy dog","mode":"Normal"}}
-{"Key":"2"}
-{"Key":"5"}
-{"Key":"%"}
-{"Get":{"state":"The quick brown\nfox jumps over\nthe ˇlazy dog\nThe quick brown\nfox jumps over\nthe lazy dog\nThe quick brown\nfox jumps over\nthe lazy dog","mode":"Normal"}}
-{"Key":"7"}
-{"Key":"5"}
-{"Key":"%"}
-{"Get":{"state":"The quick brown\nfox jumps over\nthe lazy dog\nThe quick brown\nfox jumps over\nthe lazy dog\nThe ˇquick brown\nfox jumps over\nthe lazy dog","mode":"Normal"}}
-{"Put":{"state":"The ˇquick brown\nfox jumps over\nthe lazy dog\nThe quick brown\nfox jumps over\nthe lazy dog\nThe quick brown\nfox jumps over\nthe lazy dog"}}
-{"Key":"v"}
-{"Key":"5"}
-{"Key":"0"}
-{"Key":"%"}
-{"Get":{"state":"The «quick brown\nfox jumps over\nthe lazy dog\nThe quick brown\nfox jˇ»umps over\nthe lazy dog\nThe quick brown\nfox jumps over\nthe lazy dog","mode":"Visual"}}
-{"Put":{"state":"The ˇquick brown\nfox jumps over\nthe lazy dog\nThe quick brown\nfox jumps over\nthe lazy dog\nThe quick brown\nfox jumps over\nthe lazy dog"}}
-{"Key":"v"}
-{"Key":"1"}
-{"Key":"0"}
-{"Key":"0"}
-{"Key":"%"}
-{"Get":{"state":"The «quick brown\nfox jumps over\nthe lazy dog\nThe quick brown\nfox jumps over\nthe lazy dog\nThe quick brown\nfox jumps over\nthe lˇ»azy dog","mode":"Visual"}}
diff --git a/crates/vim/test_data/test_gq.json b/crates/vim/test_data/test_gq.json
deleted file mode 100644
index 08cdb12315..0000000000
--- a/crates/vim/test_data/test_gq.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{"SetOption":{"value":"textwidth=5"}}
-{"Put":{"state":"ˇth th th th th th\n"}}
-{"Key":"g"}
-{"Key":"q"}
-{"Key":"q"}
-{"Get":{"state":"th th\nth th\nˇth th\n","mode":"Normal"}}
-{"Put":{"state":"ˇth th th th th th\nth th th th th th\n"}}
-{"Key":"v"}
-{"Key":"j"}
-{"Key":"g"}
-{"Key":"q"}
-{"Get":{"state":"th th\nth th\nth th\nth th\nth th\nˇth th\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_gv.json b/crates/vim/test_data/test_gv.json
deleted file mode 100644
index 7d33535098..0000000000
--- a/crates/vim/test_data/test_gv.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{"Put":{"state":"The ˇquick brown"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"w"}
-{"Key":"escape"}
-{"Key":"g"}
-{"Key":"v"}
-{"Get":{"state":"The «quickˇ» brown","mode":"Visual"}}
-{"Key":"o"}
-{"Key":"escape"}
-{"Key":"g"}
-{"Key":"v"}
-{"Get":{"state":"The «ˇquick» brown","mode":"Visual"}}
-{"Key":"escape"}
-{"Key":"^"}
-{"Key":"ctrl-v"}
-{"Key":"l"}
-{"Get":{"state":"«Thˇ»e quick brown","mode":"VisualBlock"}}
-{"Key":"g"}
-{"Key":"v"}
-{"Get":{"state":"The «ˇquick» brown","mode":"Visual"}}
-{"Key":"g"}
-{"Key":"v"}
-{"Get":{"state":"«Thˇ»e quick brown","mode":"VisualBlock"}}
diff --git a/crates/vim/test_data/test_h.json b/crates/vim/test_data/test_h.json
deleted file mode 100644
index 4cdf210326..0000000000
--- a/crates/vim/test_data/test_h.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{"Put":{"state":"ˇThe quick\nbrown"}}
-{"Key":"h"}
-{"Get":{"state":"ˇThe quick\nbrown","mode":"Normal"}}
-{"Put":{"state":"The qˇuick\nbrown"}}
-{"Key":"h"}
-{"Get":{"state":"The ˇquick\nbrown","mode":"Normal"}}
-{"Put":{"state":"The quick\nˇbrown"}}
-{"Key":"h"}
-{"Get":{"state":"The quick\nˇbrown","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_h_through_unicode.json b/crates/vim/test_data/test_h_through_unicode.json
deleted file mode 100644
index 95b18396d0..0000000000
--- a/crates/vim/test_data/test_h_through_unicode.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{"Put":{"state":"Testˇ├──┐Test"}}
-{"Key":"h"}
-{"Get":{"state":"Tesˇt├──┐Test","mode":"Normal"}}
-{"Put":{"state":"Test├ˇ──┐Test"}}
-{"Key":"h"}
-{"Get":{"state":"Testˇ├──┐Test","mode":"Normal"}}
-{"Put":{"state":"Test├──ˇ┐Test"}}
-{"Key":"h"}
-{"Get":{"state":"Test├─ˇ─┐Test","mode":"Normal"}}
-{"Put":{"state":"Test├──┐ˇTest"}}
-{"Key":"h"}
-{"Get":{"state":"Test├──ˇ┐Test","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_horizontal_scroll.json b/crates/vim/test_data/test_horizontal_scroll.json
deleted file mode 100644
index c6cbac8be5..0000000000
--- a/crates/vim/test_data/test_horizontal_scroll.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{"SetOption":{"value":"scrolloff=3"}}
-{"SetOption":{"value":"lines=22"}}
-{"SetOption":{"value":"wrap"}}
-{"SetOption":{"value":"columns=12"}}
-{"SetOption":{"value":"nowrap"}}
-{"Put":{"state":"ˇ01234567890123456789"}}
-{"Key":"z"}
-{"Key":"shift-l"}
-{"Get":{"state":"012345ˇ67890123456789","mode":"Normal"}}
-{"Key":"z"}
-{"Key":"h"}
-{"Get":{"state":"012345ˇ67890123456789","mode":"Normal"}}
-{"Put":{"state":"ˇ01234567890123456789"}}
-{"Key":"z"}
-{"Key":"l"}
-{"Get":{"state":"0ˇ1234567890123456789","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_inclusive_to_exclusive_delete.json b/crates/vim/test_data/test_inclusive_to_exclusive_delete.json
deleted file mode 100644
index 3d25b9fc67..0000000000
--- a/crates/vim/test_data/test_inclusive_to_exclusive_delete.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{"Put":{"state":"ˇthe quick brown fox\njumped over the lazy dog"}}
-{"Key":"d"}
-{"Key":"v"}
-{"Key":"e"}
-{"Get":{"state":"ˇe quick brown fox\njumped over the lazy dog","mode":"Normal"}}
-{"Put":{"state":"the quick bˇrown fox\njumped over the lazy dog"}}
-{"Key":"d"}
-{"Key":"v"}
-{"Key":"e"}
-{"Get":{"state":"the quick bˇn fox\njumped over the lazy dog","mode":"Normal"}}
-{"Put":{"state":"the quick brown foˇx\njumped over the lazy dog"}}
-{"Key":"d"}
-{"Key":"v"}
-{"Key":"e"}
-{"Get":{"state":"the quick brown foˇd over the lazy dog","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_increment.json b/crates/vim/test_data/test_increment.json
deleted file mode 100644
index fe893bca97..0000000000
--- a/crates/vim/test_data/test_increment.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{"Put":{"state":"1ˇ2\n"}}
-{"Key":"ctrl-a"}
-{"Get":{"state":"1ˇ3\n","mode":"Normal"}}
-{"Key":"ctrl-x"}
-{"Get":{"state":"1ˇ2\n","mode":"Normal"}}
-{"Key":"9"}
-{"Key":"9"}
-{"Key":"ctrl-a"}
-{"Get":{"state":"11ˇ1\n","mode":"Normal"}}
-{"Key":"1"}
-{"Key":"1"}
-{"Key":"1"}
-{"Key":"ctrl-x"}
-{"Get":{"state":"ˇ0\n","mode":"Normal"}}
-{"Key":"."}
-{"Get":{"state":"-11ˇ1\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_increment_bin_wrapping_and_padding.json b/crates/vim/test_data/test_increment_bin_wrapping_and_padding.json
deleted file mode 100644
index 69c118c0ad..0000000000
--- a/crates/vim/test_data/test_increment_bin_wrapping_and_padding.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{"Put":{"state":"0b111111111111111111111111111111111111111111111111111111111111111111111ˇ1\n"}}
-{"Key":"ctrl-a"}
-{"Get":{"state":"0b000000111111111111111111111111111111111111111111111111111111111111111ˇ1\n","mode":"Normal"}}
-{"Key":"ctrl-a"}
-{"Get":{"state":"0b000000000000000000000000000000000000000000000000000000000000000000000ˇ0\n","mode":"Normal"}}
-{"Key":"ctrl-a"}
-{"Get":{"state":"0b000000000000000000000000000000000000000000000000000000000000000000000ˇ1\n","mode":"Normal"}}
-{"Key":"2"}
-{"Key":"ctrl-x"}
-{"Get":{"state":"0b000000111111111111111111111111111111111111111111111111111111111111111ˇ1\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_increment_hex_casing.json b/crates/vim/test_data/test_increment_hex_casing.json
deleted file mode 100644
index 951906fa25..0000000000
--- a/crates/vim/test_data/test_increment_hex_casing.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{"Put":{"state":"0xFˇa\n"}}
-{"Key":"ctrl-a"}
-{"Get":{"state":"0xfˇb\n","mode":"Normal"}}
-{"Key":"ctrl-a"}
-{"Get":{"state":"0xfˇc\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_increment_hex_wrapping_and_padding.json b/crates/vim/test_data/test_increment_hex_wrapping_and_padding.json
deleted file mode 100644
index 562b368812..0000000000
--- a/crates/vim/test_data/test_increment_hex_wrapping_and_padding.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{"Put":{"state":"0xfffffffffffffffffffˇf\n"}}
-{"Key":"ctrl-a"}
-{"Get":{"state":"0x0000fffffffffffffffˇf\n","mode":"Normal"}}
-{"Key":"ctrl-a"}
-{"Get":{"state":"0x0000000000000000000ˇ0\n","mode":"Normal"}}
-{"Key":"ctrl-a"}
-{"Get":{"state":"0x0000000000000000000ˇ1\n","mode":"Normal"}}
-{"Key":"2"}
-{"Key":"ctrl-x"}
-{"Get":{"state":"0x0000fffffffffffffffˇf\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_increment_inline.json b/crates/vim/test_data/test_increment_inline.json
deleted file mode 100644
index 1e3d8fbd90..0000000000
--- a/crates/vim/test_data/test_increment_inline.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{"Put":{"state":"inline0x3ˇ9u32\n"}}
-{"Key":"ctrl-a"}
-{"Get":{"state":"inline0x3ˇau32\n","mode":"Normal"}}
-{"Key":"ctrl-a"}
-{"Get":{"state":"inline0x3ˇbu32\n","mode":"Normal"}}
-{"Key":"l"}
-{"Key":"l"}
-{"Key":"l"}
-{"Key":"ctrl-a"}
-{"Get":{"state":"inline0x3bu3ˇ3\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_increment_radix.json b/crates/vim/test_data/test_increment_radix.json
deleted file mode 100644
index 0f41c01599..0000000000
--- a/crates/vim/test_data/test_increment_radix.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{"Put":{"state":"ˇ total: 0xff"}}
-{"Key":"ctrl-a"}
-{"Get":{"state":" total: 0x10ˇ0","mode":"Normal"}}
-{"Put":{"state":"ˇ total: 0xff"}}
-{"Key":"ctrl-x"}
-{"Get":{"state":" total: 0xfˇe","mode":"Normal"}}
-{"Put":{"state":"ˇ total: 0xFF"}}
-{"Key":"ctrl-x"}
-{"Get":{"state":" total: 0xFˇE","mode":"Normal"}}
-{"Put":{"state":"(ˇ0b10f)"}}
-{"Key":"ctrl-a"}
-{"Get":{"state":"(0b1ˇ1f)","mode":"Normal"}}
-{"Put":{"state":"ˇ-1"}}
-{"Key":"ctrl-a"}
-{"Get":{"state":"ˇ0","mode":"Normal"}}
-{"Put":{"state":"banˇana"}}
-{"Key":"ctrl-a"}
-{"Get":{"state":"banˇana","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_increment_sign_change.json b/crates/vim/test_data/test_increment_sign_change.json
deleted file mode 100644
index 8f2ee7f2f3..0000000000
--- a/crates/vim/test_data/test_increment_sign_change.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"Put":{"state":"ˇ0\n"}}
-{"Key":"ctrl-x"}
-{"Get":{"state":"-ˇ1\n","mode":"Normal"}}
-{"Key":"2"}
-{"Key":"ctrl-a"}
-{"Get":{"state":"ˇ1\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_increment_sign_change_with_leading_zeros.json b/crates/vim/test_data/test_increment_sign_change_with_leading_zeros.json
deleted file mode 100644
index c1257012b5..0000000000
--- a/crates/vim/test_data/test_increment_sign_change_with_leading_zeros.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{"Put":{"state":"00ˇ1\n"}}
-{"Key":"ctrl-x"}
-{"Get":{"state":"00ˇ0\n","mode":"Normal"}}
-{"Key":"ctrl-x"}
-{"Get":{"state":"-00ˇ1\n","mode":"Normal"}}
-{"Key":"2"}
-{"Key":"ctrl-a"}
-{"Get":{"state":"00ˇ1\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_increment_steps.json b/crates/vim/test_data/test_increment_steps.json
deleted file mode 100644
index 5e16efed53..0000000000
--- a/crates/vim/test_data/test_increment_steps.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{"Put":{"state":"ˇ1\n1\n1  2\n1\n1"}}
-{"Key":"j"}
-{"Key":"v"}
-{"Key":"shift-g"}
-{"Key":"g"}
-{"Key":"ctrl-a"}
-{"Get":{"state":"1\nˇ2\n3  2\n4\n5","mode":"Normal"}}
-{"Key":"shift-g"}
-{"Key":"ctrl-v"}
-{"Key":"g"}
-{"Key":"g"}
-{"Get":{"state":"«1ˇ»\n«2ˇ»\n«3ˇ»  2\n«4ˇ»\n«5ˇ»","mode":"VisualBlock"}}
-{"Key":"g"}
-{"Key":"ctrl-x"}
-{"Get":{"state":"ˇ0\n0\n0  2\n0\n0","mode":"Normal"}}
-{"Key":"v"}
-{"Key":"shift-g"}
-{"Key":"g"}
-{"Key":"ctrl-a"}
-{"Key":"v"}
-{"Key":"shift-g"}
-{"Key":"5"}
-{"Key":"g"}
-{"Key":"ctrl-a"}
-{"Get":{"state":"ˇ6\n12\n18  2\n24\n30","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_increment_visual_partial_number.json b/crates/vim/test_data/test_increment_visual_partial_number.json
deleted file mode 100644
index ebb4eece78..0000000000
--- a/crates/vim/test_data/test_increment_visual_partial_number.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{"Put":{"state":"ˇ123"}}
-{"Key":"v"}
-{"Key":"l"}
-{"Key":"ctrl-a"}
-{"Get":{"state":"ˇ133","mode":"Normal"}}
-{"Key":"l"}
-{"Key":"v"}
-{"Key":"l"}
-{"Key":"ctrl-a"}
-{"Get":{"state":"1ˇ34","mode":"Normal"}}
-{"Key":"shift-v"}
-{"Key":"y"}
-{"Key":"p"}
-{"Key":"p"}
-{"Key":"ctrl-v"}
-{"Key":"k"}
-{"Key":"k"}
-{"Key":"l"}
-{"Key":"ctrl-a"}
-{"Get":{"state":"ˇ144\n144\n144","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_increment_with_changing_leading_zeros.json b/crates/vim/test_data/test_increment_with_changing_leading_zeros.json
deleted file mode 100644
index dce392e25f..0000000000
--- a/crates/vim/test_data/test_increment_with_changing_leading_zeros.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"Put":{"state":"099ˇ9\n"}}
-{"Key":"ctrl-a"}
-{"Get":{"state":"100ˇ0\n","mode":"Normal"}}
-{"Key":"2"}
-{"Key":"ctrl-x"}
-{"Get":{"state":"99ˇ8\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_increment_with_dot.json b/crates/vim/test_data/test_increment_with_dot.json
deleted file mode 100644
index b5c5b0914e..0000000000
--- a/crates/vim/test_data/test_increment_with_dot.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{"Put":{"state":"1ˇ.2\n"}}
-{"Key":"ctrl-a"}
-{"Get":{"state":"1.ˇ3\n","mode":"Normal"}}
-{"Key":"ctrl-x"}
-{"Get":{"state":"1.ˇ2\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_increment_with_leading_zeros.json b/crates/vim/test_data/test_increment_with_leading_zeros.json
deleted file mode 100644
index bab262463f..0000000000
--- a/crates/vim/test_data/test_increment_with_leading_zeros.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"Put":{"state":"000ˇ9\n"}}
-{"Key":"ctrl-a"}
-{"Get":{"state":"001ˇ0\n","mode":"Normal"}}
-{"Key":"2"}
-{"Key":"ctrl-x"}
-{"Get":{"state":"000ˇ8\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_increment_with_leading_zeros_and_zero.json b/crates/vim/test_data/test_increment_with_leading_zeros_and_zero.json
deleted file mode 100644
index 94a1a1a715..0000000000
--- a/crates/vim/test_data/test_increment_with_leading_zeros_and_zero.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{"Put":{"state":"01ˇ1\n"}}
-{"Key":"ctrl-a"}
-{"Get":{"state":"01ˇ2\n","mode":"Normal"}}
-{"Key":"1"}
-{"Key":"2"}
-{"Key":"ctrl-x"}
-{"Get":{"state":"00ˇ0\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_increment_with_two_dots.json b/crates/vim/test_data/test_increment_with_two_dots.json
deleted file mode 100644
index 38b38f1005..0000000000
--- a/crates/vim/test_data/test_increment_with_two_dots.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{"Put":{"state":"111.ˇ.2\n"}}
-{"Key":"ctrl-a"}
-{"Get":{"state":"111..ˇ3\n","mode":"Normal"}}
-{"Key":"ctrl-x"}
-{"Get":{"state":"111..ˇ2\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_increment_wrapping.json b/crates/vim/test_data/test_increment_wrapping.json
deleted file mode 100644
index 9f189991a6..0000000000
--- a/crates/vim/test_data/test_increment_wrapping.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{"Put":{"state":"1844674407370955161ˇ9\n"}}
-{"Key":"ctrl-a"}
-{"Get":{"state":"1844674407370955161ˇ5\n","mode":"Normal"}}
-{"Key":"ctrl-a"}
-{"Get":{"state":"-1844674407370955161ˇ5\n","mode":"Normal"}}
-{"Key":"ctrl-a"}
-{"Get":{"state":"-1844674407370955161ˇ4\n","mode":"Normal"}}
-{"Key":"3"}
-{"Key":"ctrl-x"}
-{"Get":{"state":"1844674407370955161ˇ4\n","mode":"Normal"}}
-{"Key":"2"}
-{"Key":"ctrl-a"}
-{"Get":{"state":"-1844674407370955161ˇ5\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_increment_zero_leading_zeros.json b/crates/vim/test_data/test_increment_zero_leading_zeros.json
deleted file mode 100644
index 5361fcbc7f..0000000000
--- a/crates/vim/test_data/test_increment_zero_leading_zeros.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{"Put":{"state":"001ˇ0\n"}}
-{"Key":"10"}
-{"Key":"ctrl-x"}
-{"Get":{"state":"000ˇ9\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_indent_gv.json b/crates/vim/test_data/test_indent_gv.json
deleted file mode 100644
index 2c24406aee..0000000000
--- a/crates/vim/test_data/test_indent_gv.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{"SetOption":{"value":"shiftwidth=4"}}
-{"Put":{"state":"ˇhello\nworld\n"}}
-{"Key":"v"}
-{"Key":"j"}
-{"Key":">"}
-{"Key":"g"}
-{"Key":"v"}
-{"Get":{"state":"«    hello\n ˇ»   world\n","mode":"Visual"}}
diff --git a/crates/vim/test_data/test_insert_ctrl_r.json b/crates/vim/test_data/test_insert_ctrl_r.json
deleted file mode 100644
index 6167bc3f33..0000000000
--- a/crates/vim/test_data/test_insert_ctrl_r.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{"Put":{"state":"heˇllo\n"}}
-{"Key":"y"}
-{"Key":"y"}
-{"Key":"i"}
-{"Key":"ctrl-r"}
-{"Key":"\""}
-{"Get":{"state":"hehello\nˇllo\n","mode":"Insert"}}
-{"Key":"ctrl-r"}
-{"Key":"x"}
-{"Key":"ctrl-r"}
-{"Key":"escape"}
-{"Get":{"state":"hehello\nˇllo\n","mode":"Insert"}}
diff --git a/crates/vim/test_data/test_insert_ctrl_y.json b/crates/vim/test_data/test_insert_ctrl_y.json
deleted file mode 100644
index 09b707a198..0000000000
--- a/crates/vim/test_data/test_insert_ctrl_y.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{"Put":{"state":"hello\nˇ\nworld"}}
-{"Key":"i"}
-{"Key":"ctrl-y"}
-{"Key":"ctrl-e"}
-{"Get":{"state":"hello\nhoˇ\nworld","mode":"Insert"}}
diff --git a/crates/vim/test_data/test_insert_empty_line.json b/crates/vim/test_data/test_insert_empty_line.json
deleted file mode 100644
index 534db2c457..0000000000
--- a/crates/vim/test_data/test_insert_empty_line.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{"Put":{"state":"ˇ"}}
-{"Key":"["}
-{"Key":"space"}
-{"Get":{"state":"\nˇ","mode":"Normal"}}
-{"Put":{"state":"The ˇquick"}}
-{"Key":"["}
-{"Key":"space"}
-{"Get":{"state":"\nThe ˇquick","mode":"Normal"}}
-{"Put":{"state":"The qˇuick\nbrown fox\njumps over"}}
-{"Key":"3"}
-{"Key":"["}
-{"Key":"space"}
-{"Get":{"state":"\n\n\nThe qˇuick\nbrown fox\njumps over","mode":"Normal"}}
-{"Put":{"state":"The quick\nbrown ˇfox\njumps over"}}
-{"Key":"3"}
-{"Key":"["}
-{"Key":"space"}
-{"Get":{"state":"The quick\n\n\n\nbrown ˇfox\njumps over","mode":"Normal"}}
-{"Put":{"state":"The quick\nbrown fox\njumps ˇover"}}
-{"Key":"3"}
-{"Key":"["}
-{"Key":"space"}
-{"Get":{"state":"The quick\nbrown fox\n\n\n\njumps ˇover","mode":"Normal"}}
-{"Put":{"state":"The qˇuick\nbrown fox\njumps over"}}
-{"Key":"["}
-{"Key":"space"}
-{"Get":{"state":"\nThe qˇuick\nbrown fox\njumps over","mode":"Normal"}}
-{"Put":{"state":"The quick\nbrown ˇfox\njumps over"}}
-{"Key":"["}
-{"Key":"space"}
-{"Get":{"state":"The quick\n\nbrown ˇfox\njumps over","mode":"Normal"}}
-{"Put":{"state":"The quick\nbrown fox\njumps ˇover"}}
-{"Key":"["}
-{"Key":"space"}
-{"Get":{"state":"The quick\nbrown fox\n\njumps ˇover","mode":"Normal"}}
-{"Put":{"state":"The quick\nˇ\nbrown fox"}}
-{"Key":"["}
-{"Key":"space"}
-{"Get":{"state":"The quick\n\nˇ\nbrown fox","mode":"Normal"}}
-{"Put":{"state":"ˇ"}}
-{"Key":"]"}
-{"Key":"space"}
-{"Get":{"state":"ˇ\n","mode":"Normal"}}
-{"Put":{"state":"The ˇquick"}}
-{"Key":"]"}
-{"Key":"space"}
-{"Get":{"state":"The ˇquick\n","mode":"Normal"}}
-{"Put":{"state":"The qˇuick\nbrown fox\njumps over"}}
-{"Key":"3"}
-{"Key":"]"}
-{"Key":"space"}
-{"Get":{"state":"The qˇuick\n\n\n\nbrown fox\njumps over","mode":"Normal"}}
-{"Put":{"state":"The quick\nbrown ˇfox\njumps over"}}
-{"Key":"3"}
-{"Key":"]"}
-{"Key":"space"}
-{"Get":{"state":"The quick\nbrown ˇfox\n\n\n\njumps over","mode":"Normal"}}
-{"Put":{"state":"The quick\nbrown fox\njumps ˇover"}}
-{"Key":"3"}
-{"Key":"]"}
-{"Key":"space"}
-{"Get":{"state":"The quick\nbrown fox\njumps ˇover\n\n\n","mode":"Normal"}}
-{"Put":{"state":"The qˇuick\nbrown fox\njumps over"}}
-{"Key":"]"}
-{"Key":"space"}
-{"Get":{"state":"The qˇuick\n\nbrown fox\njumps over","mode":"Normal"}}
-{"Put":{"state":"The quick\nbrown ˇfox\njumps over"}}
-{"Key":"]"}
-{"Key":"space"}
-{"Get":{"state":"The quick\nbrown ˇfox\n\njumps over","mode":"Normal"}}
-{"Put":{"state":"The quick\nbrown fox\njumps ˇover"}}
-{"Key":"]"}
-{"Key":"space"}
-{"Get":{"state":"The quick\nbrown fox\njumps ˇover\n","mode":"Normal"}}
-{"Put":{"state":"The quick\nˇ\nbrown fox"}}
-{"Key":"]"}
-{"Key":"space"}
-{"Get":{"state":"The quick\nˇ\n\nbrown fox","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_insert_end_of_line.json b/crates/vim/test_data/test_insert_end_of_line.json
deleted file mode 100644
index a37ad24d39..0000000000
--- a/crates/vim/test_data/test_insert_end_of_line.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{"Put":{"state":"ˇ\nThe quick\nbrown fox "}}
-{"Key":"shift-a"}
-{"Get":{"state":"ˇ\nThe quick\nbrown fox ","mode":"Insert"}}
-{"Put":{"state":"\nThe qˇuick\nbrown fox "}}
-{"Key":"shift-a"}
-{"Get":{"state":"\nThe quickˇ\nbrown fox ","mode":"Insert"}}
-{"Put":{"state":"\nThe quick\nbrown ˇfox "}}
-{"Key":"shift-a"}
-{"Get":{"state":"\nThe quick\nbrown fox ˇ","mode":"Insert"}}
diff --git a/crates/vim/test_data/test_insert_first_non_whitespace.json b/crates/vim/test_data/test_insert_first_non_whitespace.json
deleted file mode 100644
index 4d13cdb81c..0000000000
--- a/crates/vim/test_data/test_insert_first_non_whitespace.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{"Put":{"state":"The qˇuick"}}
-{"Key":"shift-i"}
-{"Get":{"state":"ˇThe quick","mode":"Insert"}}
-{"Put":{"state":" The qˇuick"}}
-{"Key":"shift-i"}
-{"Get":{"state":" ˇThe quick","mode":"Insert"}}
-{"Put":{"state":"ˇ"}}
-{"Key":"shift-i"}
-{"Get":{"state":"ˇ","mode":"Insert"}}
-{"Put":{"state":"The qˇuick\nbrown fox"}}
-{"Key":"shift-i"}
-{"Get":{"state":"ˇThe quick\nbrown fox","mode":"Insert"}}
-{"Put":{"state":"ˇ\nThe quick"}}
-{"Key":"shift-i"}
-{"Get":{"state":"ˇ\nThe quick","mode":"Insert"}}
diff --git a/crates/vim/test_data/test_insert_line_above.json b/crates/vim/test_data/test_insert_line_above.json
deleted file mode 100644
index ce5d0d7ac1..0000000000
--- a/crates/vim/test_data/test_insert_line_above.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{"Put":{"state":"ˇ"}}
-{"Key":"shift-o"}
-{"Get":{"state":"ˇ\n","mode":"Insert"}}
-{"Put":{"state":"The ˇquick"}}
-{"Key":"shift-o"}
-{"Get":{"state":"ˇ\nThe quick","mode":"Insert"}}
-{"Put":{"state":"The qˇuick\nbrown fox\njumps over"}}
-{"Key":"shift-o"}
-{"Get":{"state":"ˇ\nThe quick\nbrown fox\njumps over","mode":"Insert"}}
-{"Put":{"state":"The quick\nbrown ˇfox\njumps over"}}
-{"Key":"shift-o"}
-{"Get":{"state":"The quick\nˇ\nbrown fox\njumps over","mode":"Insert"}}
-{"Put":{"state":"The quick\nbrown fox\njumps ˇover"}}
-{"Key":"shift-o"}
-{"Get":{"state":"The quick\nbrown fox\nˇ\njumps over","mode":"Insert"}}
-{"Put":{"state":"The quick\nˇ\nbrown fox"}}
-{"Key":"shift-o"}
-{"Get":{"state":"The quick\nˇ\n\nbrown fox","mode":"Insert"}}
diff --git a/crates/vim/test_data/test_insert_with_counts.json b/crates/vim/test_data/test_insert_with_counts.json
deleted file mode 100644
index 470888cf6e..0000000000
--- a/crates/vim/test_data/test_insert_with_counts.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{"Put":{"state":"ˇhello\n"}}
-{"Key":"5"}
-{"Key":"i"}
-{"Key":"-"}
-{"Key":"escape"}
-{"Get":{"state":"----ˇ-hello\n","mode":"Normal"}}
-{"Put":{"state":"ˇhello\n"}}
-{"Key":"5"}
-{"Key":"a"}
-{"Key":"-"}
-{"Key":"escape"}
-{"Get":{"state":"h----ˇ-ello\n","mode":"Normal"}}
-{"Key":"4"}
-{"Key":"shift-i"}
-{"Key":"-"}
-{"Key":"escape"}
-{"Get":{"state":"---ˇ-h-----ello\n","mode":"Normal"}}
-{"Key":"3"}
-{"Key":"shift-a"}
-{"Key":"-"}
-{"Key":"escape"}
-{"Get":{"state":"----h-----ello--ˇ-\n","mode":"Normal"}}
-{"Put":{"state":"ˇhello\n"}}
-{"Key":"3"}
-{"Key":"o"}
-{"Key":"o"}
-{"Key":"i"}
-{"Key":"escape"}
-{"Get":{"state":"hello\noi\noi\noˇi\n","mode":"Normal"}}
-{"Put":{"state":"ˇhello\n"}}
-{"Key":"3"}
-{"Key":"shift-o"}
-{"Key":"o"}
-{"Key":"i"}
-{"Key":"escape"}
-{"Get":{"state":"oi\noi\noˇi\nhello\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_insert_with_repeat.json b/crates/vim/test_data/test_insert_with_repeat.json
deleted file mode 100644
index ac6637633c..0000000000
--- a/crates/vim/test_data/test_insert_with_repeat.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{"Put":{"state":"ˇhello\n"}}
-{"Key":"3"}
-{"Key":"i"}
-{"Key":"-"}
-{"Key":"escape"}
-{"Get":{"state":"--ˇ-hello\n","mode":"Normal"}}
-{"Key":"."}
-{"Get":{"state":"----ˇ--hello\n","mode":"Normal"}}
-{"Key":"2"}
-{"Key":"."}
-{"Get":{"state":"-----ˇ---hello\n","mode":"Normal"}}
-{"Put":{"state":"ˇhello\n"}}
-{"Key":"2"}
-{"Key":"o"}
-{"Key":"k"}
-{"Key":"k"}
-{"Key":"escape"}
-{"Get":{"state":"hello\nkk\nkˇk\n","mode":"Normal"}}
-{"Key":"."}
-{"Get":{"state":"hello\nkk\nkk\nkk\nkˇk\n","mode":"Normal"}}
-{"Key":"1"}
-{"Key":"."}
-{"Get":{"state":"hello\nkk\nkk\nkk\nkk\nkˇk\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_j.json b/crates/vim/test_data/test_j.json
deleted file mode 100644
index 703f69d22c..0000000000
--- a/crates/vim/test_data/test_j.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{"Put":{"state":"aaˇaa\n😃😃"}}
-{"Key":"j"}
-{"Get":{"state":"aaaa\n😃ˇ😃","mode":"Normal"}}
-{"Put":{"state":"ˇThe quick brown\nfox jumps"}}
-{"Key":"j"}
-{"Get":{"state":"The quick brown\nˇfox jumps","mode":"Normal"}}
-{"Put":{"state":"The qˇuick brown\nfox jumps"}}
-{"Key":"j"}
-{"Get":{"state":"The quick brown\nfox jˇumps","mode":"Normal"}}
-{"Put":{"state":"The quick broˇwn\nfox jumps"}}
-{"Key":"j"}
-{"Get":{"state":"The quick brown\nfox jumpˇs","mode":"Normal"}}
-{"Put":{"state":"The quick brown\nˇfox jumps"}}
-{"Key":"j"}
-{"Get":{"state":"The quick brown\nˇfox jumps","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_jk.json b/crates/vim/test_data/test_jk.json
deleted file mode 100644
index bc1a6a4ba5..0000000000
--- a/crates/vim/test_data/test_jk.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{"Exec":{"command":"imap jk <esc>"}}
-{"Put":{"state":"ˇhello"}}
-{"Key":"i"}
-{"Key":"j"}
-{"Key":"o"}
-{"Key":"j"}
-{"Key":"k"}
-{"Get":{"state":"jˇohello","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_jk_max_count.json b/crates/vim/test_data/test_jk_max_count.json
deleted file mode 100644
index 83eab46a18..0000000000
--- a/crates/vim/test_data/test_jk_max_count.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{"Put":{"state":"1\nˇ2\n3"}}
-{"Key":"9"}
-{"Key":"9"}
-{"Key":"9"}
-{"Key":"9"}
-{"Key":"9"}
-{"Key":"9"}
-{"Key":"9"}
-{"Key":"9"}
-{"Key":"9"}
-{"Key":"9"}
-{"Key":"9"}
-{"Key":"9"}
-{"Key":"9"}
-{"Key":"9"}
-{"Key":"9"}
-{"Key":"9"}
-{"Key":"9"}
-{"Key":"9"}
-{"Key":"9"}
-{"Key":"9"}
-{"Key":"j"}
-{"Get":{"state":"1\n2\nˇ3","mode":"Normal"}}
-{"Key":""}
-{"Key":"1"}
-{"Key":"8"}
-{"Key":"4"}
-{"Key":"4"}
-{"Key":"6"}
-{"Key":"7"}
-{"Key":"4"}
-{"Key":"4"}
-{"Key":"0"}
-{"Key":"7"}
-{"Key":"3"}
-{"Key":"7"}
-{"Key":"0"}
-{"Key":"9"}
-{"Key":"5"}
-{"Key":"5"}
-{"Key":"1"}
-{"Key":"6"}
-{"Key":"1"}
-{"Key":"5"}
-{"Key":""}
-{"Key":"k"}
-{"Get":{"state":"ˇ1\n2\n3","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_join_lines.json b/crates/vim/test_data/test_join_lines.json
deleted file mode 100644
index 55aa8b1dcb..0000000000
--- a/crates/vim/test_data/test_join_lines.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{"Put":{"state":"ˇone\ntwo\nthree\nfour\nfive\nsix\n"}}
-{"Key":"shift-j"}
-{"Get":{"state":"oneˇ two\nthree\nfour\nfive\nsix\n","mode":"Normal"}}
-{"Key":"3"}
-{"Key":"shift-j"}
-{"Get":{"state":"one two threeˇ four\nfive\nsix\n","mode":"Normal"}}
-{"Put":{"state":"ˇone\ntwo\nthree\nfour\nfive\nsix\n"}}
-{"Key":"j"}
-{"Key":"v"}
-{"Key":"3"}
-{"Key":"j"}
-{"Key":"shift-j"}
-{"Get":{"state":"one\ntwo three fourˇ five\nsix\n","mode":"Normal"}}
-{"Put":{"state":"ˇone\ntwo\nthree\nfour\nfive\nsix\n"}}
-{"Key":"g"}
-{"Key":"shift-j"}
-{"Get":{"state":"oneˇtwo\nthree\nfour\nfive\nsix\n","mode":"Normal"}}
-{"Key":"3"}
-{"Key":"g"}
-{"Key":"shift-j"}
-{"Get":{"state":"onetwothreeˇfour\nfive\nsix\n","mode":"Normal"}}
-{"Put":{"state":"ˇone\ntwo\nthree\nfour\nfive\nsix\n"}}
-{"Key":"j"}
-{"Key":"v"}
-{"Key":"3"}
-{"Key":"j"}
-{"Key":"g"}
-{"Key":"shift-j"}
-{"Get":{"state":"one\ntwothreefourˇfive\nsix\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_jump_list.json b/crates/vim/test_data/test_jump_list.json
deleted file mode 100644
index 833d1adadb..0000000000
--- a/crates/vim/test_data/test_jump_list.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{"Put":{"state":"ˇfn a() { }\n\n\n\n\n\nfn b() { }\n\n\n\n\n\nfn b() { }"}}
-{"Key":"3"}
-{"Key":"}"}
-{"Get":{"state":"fn a() { }\n\n\n\n\n\nfn b() { }\n\n\n\n\n\nfn b() { ˇ}","mode":"Normal"}}
-{"Key":"ctrl-o"}
-{"Get":{"state":"ˇfn a() { }\n\n\n\n\n\nfn b() { }\n\n\n\n\n\nfn b() { }","mode":"Normal"}}
-{"Key":"ctrl-i"}
-{"Get":{"state":"fn a() { }\n\n\n\n\n\nfn b() { }\n\n\n\n\n\nfn b() { ˇ}","mode":"Normal"}}
-{"Key":"1"}
-{"Key":"1"}
-{"Key":"k"}
-{"Get":{"state":"fn a() { }\nˇ\n\n\n\n\nfn b() { }\n\n\n\n\n\nfn b() { }","mode":"Normal"}}
-{"Key":"ctrl-o"}
-{"Get":{"state":"ˇfn a() { }\n\n\n\n\n\nfn b() { }\n\n\n\n\n\nfn b() { }","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_jump_to_end.json b/crates/vim/test_data/test_jump_to_end.json
deleted file mode 100644
index fe9a948d43..0000000000
--- a/crates/vim/test_data/test_jump_to_end.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{"Put":{"state":"The ˇquick\n\nbrown fox jumps\nover the lazy dog"}}
-{"Key":"shift-g"}
-{"Get":{"state":"The quick\n\nbrown fox jumps\noverˇ the lazy dog","mode":"Normal"}}
-{"Key":"shift-g"}
-{"Get":{"state":"The quick\n\nbrown fox jumps\noverˇ the lazy dog","mode":"Normal"}}
-{"Put":{"state":"The quick\n\nbrown fox jumps\nover the lazy doˇg"}}
-{"Key":"shift-g"}
-{"Get":{"state":"The quick\n\nbrown fox jumps\nover the lazy doˇg","mode":"Normal"}}
-{"Put":{"state":"The quiˇck\n\nbrown"}}
-{"Key":"shift-g"}
-{"Get":{"state":"The quick\n\nbrowˇn","mode":"Normal"}}
-{"Put":{"state":"The quiˇck\n\n"}}
-{"Key":"shift-g"}
-{"Get":{"state":"The quick\n\nˇ","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_jump_to_first_non_whitespace.json b/crates/vim/test_data/test_jump_to_first_non_whitespace.json
deleted file mode 100644
index c992662195..0000000000
--- a/crates/vim/test_data/test_jump_to_first_non_whitespace.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{"Put":{"state":"The qˇuick"}}
-{"Key":"^"}
-{"Get":{"state":"ˇThe quick","mode":"Normal"}}
-{"Put":{"state":" The qˇuick"}}
-{"Key":"^"}
-{"Get":{"state":" ˇThe quick","mode":"Normal"}}
-{"Put":{"state":"ˇ"}}
-{"Key":"^"}
-{"Get":{"state":"ˇ","mode":"Normal"}}
-{"Put":{"state":"The qˇuick\nbrown fox"}}
-{"Key":"^"}
-{"Get":{"state":"ˇThe quick\nbrown fox","mode":"Normal"}}
-{"Put":{"state":"ˇ\nThe quick"}}
-{"Key":"^"}
-{"Get":{"state":"ˇ\nThe quick","mode":"Normal"}}
-{"Put":{"state":"   ˇ \nThe quick"}}
-{"Key":"^"}
-{"Get":{"state":"   ˇ \nThe quick","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_jump_to_line_boundaries.json b/crates/vim/test_data/test_jump_to_line_boundaries.json
deleted file mode 100644
index 6d4a76ffd6..0000000000
--- a/crates/vim/test_data/test_jump_to_line_boundaries.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{"Put":{"state":"ˇThe quick\nbrown"}}
-{"Key":"$"}
-{"Get":{"state":"The quicˇk\nbrown","mode":"Normal"}}
-{"Put":{"state":"The qˇuick\nbrown"}}
-{"Key":"$"}
-{"Get":{"state":"The quicˇk\nbrown","mode":"Normal"}}
-{"Key":"$"}
-{"Get":{"state":"The quicˇk\nbrown","mode":"Normal"}}
-{"Put":{"state":"The quick\nˇbrown"}}
-{"Key":"$"}
-{"Get":{"state":"The quick\nbrowˇn","mode":"Normal"}}
-{"Key":"$"}
-{"Get":{"state":"The quick\nbrowˇn","mode":"Normal"}}
-{"Put":{"state":"ˇThe quick\nbrown"}}
-{"Key":"0"}
-{"Get":{"state":"ˇThe quick\nbrown","mode":"Normal"}}
-{"Put":{"state":"The qˇuick\nbrown"}}
-{"Key":"0"}
-{"Get":{"state":"ˇThe quick\nbrown","mode":"Normal"}}
-{"Put":{"state":"The quicˇk\nbrown"}}
-{"Key":"0"}
-{"Get":{"state":"ˇThe quick\nbrown","mode":"Normal"}}
-{"Put":{"state":"The quick\nˇbrown"}}
-{"Key":"0"}
-{"Get":{"state":"The quick\nˇbrown","mode":"Normal"}}
-{"Put":{"state":"The quick\nbrowˇn"}}
-{"Key":"0"}
-{"Get":{"state":"The quick\nˇbrown","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_k.json b/crates/vim/test_data/test_k.json
deleted file mode 100644
index f064fa9fd9..0000000000
--- a/crates/vim/test_data/test_k.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{"Put":{"state":"ˇThe quick\nbrown fox jumps"}}
-{"Key":"k"}
-{"Get":{"state":"ˇThe quick\nbrown fox jumps","mode":"Normal"}}
-{"Put":{"state":"The qˇuick\nbrown fox jumps"}}
-{"Key":"k"}
-{"Get":{"state":"The qˇuick\nbrown fox jumps","mode":"Normal"}}
-{"Put":{"state":"The quick\nˇbrown fox jumps"}}
-{"Key":"k"}
-{"Get":{"state":"ˇThe quick\nbrown fox jumps","mode":"Normal"}}
-{"Put":{"state":"The quick\nbrown fˇox jumps"}}
-{"Key":"k"}
-{"Get":{"state":"The quiˇck\nbrown fox jumps","mode":"Normal"}}
-{"Put":{"state":"The quick\nbrown fox jumˇps"}}
-{"Key":"k"}
-{"Get":{"state":"The quicˇk\nbrown fox jumps","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_l.json b/crates/vim/test_data/test_l.json
deleted file mode 100644
index b0db891bce..0000000000
--- a/crates/vim/test_data/test_l.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{"Put":{"state":"ˇThe quick\nbrown"}}
-{"Key":"l"}
-{"Get":{"state":"Tˇhe quick\nbrown","mode":"Normal"}}
-{"Put":{"state":"The qˇuick\nbrown"}}
-{"Key":"l"}
-{"Get":{"state":"The quˇick\nbrown","mode":"Normal"}}
-{"Put":{"state":"The quicˇk\nbrown"}}
-{"Key":"l"}
-{"Get":{"state":"The quicˇk\nbrown","mode":"Normal"}}
-{"Put":{"state":"The quick\nˇbrown"}}
-{"Key":"l"}
-{"Get":{"state":"The quick\nbˇrown","mode":"Normal"}}
-{"Put":{"state":"The quick\nbrowˇn"}}
-{"Key":"l"}
-{"Get":{"state":"The quick\nbrowˇn","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_lowercase_marks.json b/crates/vim/test_data/test_lowercase_marks.json
deleted file mode 100644
index ff02c58728..0000000000
--- a/crates/vim/test_data/test_lowercase_marks.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{"Put":{"state":"line one\nline ˇtwo\nline three"}}
-{"Key":"m"}
-{"Key":"a"}
-{"Key":"l"}
-{"Key":"'"}
-{"Key":"a"}
-{"Get":{"state":"line one\nˇline two\nline three","mode":"Normal"}}
-{"Key":"`"}
-{"Key":"a"}
-{"Get":{"state":"line one\nline ˇtwo\nline three","mode":"Normal"}}
-{"Key":"^"}
-{"Key":"d"}
-{"Key":"`"}
-{"Key":"a"}
-{"Get":{"state":"line one\nˇtwo\nline three","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_lt_gt_marks.json b/crates/vim/test_data/test_lt_gt_marks.json
deleted file mode 100644
index 142ceb9b95..0000000000
--- a/crates/vim/test_data/test_lt_gt_marks.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{"Put":{"state":"Line one\nLine two\nLine ˇthree\nLine four\nLine five\n"}}
-{"Key":"v"}
-{"Key":"j"}
-{"Key":"escape"}
-{"Key":"k"}
-{"Key":"k"}
-{"Key":"'"}
-{"Key":"<"}
-{"Get":{"state":"Line one\nLine two\nˇLine three\nLine four\nLine five\n","mode":"Normal"}}
-{"Key":"`"}
-{"Key":"<"}
-{"Get":{"state":"Line one\nLine two\nLine ˇthree\nLine four\nLine five\n","mode":"Normal"}}
-{"Key":"'"}
-{"Key":">"}
-{"Get":{"state":"Line one\nLine two\nLine three\nˇLine four\nLine five\n","mode":"Normal"}}
-{"Key":"`"}
-{"Key":">"}
-{"Get":{"state":"Line one\nLine two\nLine three\nLine ˇfour\nLine five\n","mode":"Normal"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"w"}
-{"Key":"o"}
-{"Key":"escape"}
-{"Key":"`"}
-{"Key":">"}
-{"Get":{"state":"Line one\nLine two\nLine three\nLine fouˇr\nLine five\n","mode":"Normal"}}
-{"Key":"`"}
-{"Key":"<"}
-{"Get":{"state":"Line one\nLine two\nLine three\nLine ˇfour\nLine five\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_marks.json b/crates/vim/test_data/test_marks.json
deleted file mode 100644
index ff02c58728..0000000000
--- a/crates/vim/test_data/test_marks.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{"Put":{"state":"line one\nline ˇtwo\nline three"}}
-{"Key":"m"}
-{"Key":"a"}
-{"Key":"l"}
-{"Key":"'"}
-{"Key":"a"}
-{"Get":{"state":"line one\nˇline two\nline three","mode":"Normal"}}
-{"Key":"`"}
-{"Key":"a"}
-{"Get":{"state":"line one\nline ˇtwo\nline three","mode":"Normal"}}
-{"Key":"^"}
-{"Key":"d"}
-{"Key":"`"}
-{"Key":"a"}
-{"Get":{"state":"line one\nˇtwo\nline three","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_matching.json b/crates/vim/test_data/test_matching.json
deleted file mode 100644
index 5c8d7529b9..0000000000
--- a/crates/vim/test_data/test_matching.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{"Put":{"state":"func ˇ(a string) {\n    do(something(with<Types>.and_arrays[0, 2]))\n}"}}
-{"Key":"%"}
-{"Get":{"state":"func (a stringˇ) {\n    do(something(with<Types>.and_arrays[0, 2]))\n}","mode":"Normal"}}
-{"Put":{"state":"func (a string) ˇ{\ndo(something(with<Types>.and_arrays[0, 2]))\n}"}}
-{"Key":"%"}
-{"Get":{"state":"func (a string) {\ndo(something(with<Types>.and_arrays[0, 2]))\nˇ}","mode":"Normal"}}
-{"Put":{"state":"ˇ{()}"}}
-{"Key":"%"}
-{"Get":{"state":"{()ˇ}","mode":"Normal"}}
-{"Key":"%"}
-{"Get":{"state":"ˇ{()}","mode":"Normal"}}
-{"Put":{"state":"{\n    ˇ{()}\n}"}}
-{"Key":"%"}
-{"Get":{"state":"{\n    {()ˇ}\n}","mode":"Normal"}}
-{"Put":{"state":"func ˇboop() {\n}"}}
-{"Key":"%"}
-{"Get":{"state":"func boop(ˇ) {\n}","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_matching_braces_in_tag.json b/crates/vim/test_data/test_matching_braces_in_tag.json
deleted file mode 100644
index 44201548a7..0000000000
--- a/crates/vim/test_data/test_matching_braces_in_tag.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{"Put":{"state":"function f() {\n    return (\n        <div rules={ˇ[{ a: 1 }]}>\n            <h1>test</h1>\n        </div>\n    );\n}"}}
-{"Key":"%"}
-{"Get":{"state":"function f() {\n    return (\n        <div rules={[{ a: 1 }ˇ]}>\n            <h1>test</h1>\n        </div>\n    );\n}","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_matching_nested_brackets.json b/crates/vim/test_data/test_matching_nested_brackets.json
deleted file mode 100644
index d90b38416e..0000000000
--- a/crates/vim/test_data/test_matching_nested_brackets.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{"Put":{"state":"<Button onClick=ˇ{() => {}}></Button>"}}
-{"Key":"%"}
-{"Get":{"state":"<Button onClick={() => {}ˇ}></Button>","mode":"Normal"}}
-{"Key":"%"}
-{"Get":{"state":"<Button onClick=ˇ{() => {}}></Button>","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_matching_tags.json b/crates/vim/test_data/test_matching_tags.json
deleted file mode 100644
index b401033a94..0000000000
--- a/crates/vim/test_data/test_matching_tags.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{"Exec":{"command":"set filetype=html"}}
-{"Put":{"state":"<bˇody></body>"}}
-{"Key":"%"}
-{"Get":{"state":"<body><ˇ/body>","mode":"Normal"}}
-{"Key":"%"}
-{"Get":{"state":"<ˇbody></body>","mode":"Normal"}}
-{"Put":{"state":"<a><bˇr/></a>"}}
-{"Key":"%"}
-{"Get":{"state":"<a><bˇr/></a>","mode":"Normal"}}
-{"Put":{"state":"<div class='test' ˇid='main'>\n</div>\n"}}
-{"Key":"%"}
-{"Get":{"state":"<div class='test' id='main'>\n<ˇ/div>\n","mode":"Normal"}}
-{"Put":{"state":"<a>\n    <br\n        test = \"test\"\n    /ˇ>\n</a>"}}
-{"Key":"%"}
-{"Get":{"state":"<a>\n    ˇ<br\n        test = \"test\"\n    />\n</a>","mode":"Normal"}}
-{"Put":{"state":"<html>\n    <bˇody>\n    </body>\n</html>"}}
-{"Key":"%"}
-{"Get":{"state":"<html>\n    <body>\n    <ˇ/body>\n</html>","mode":"Normal"}}
-{"Key":"%"}
-{"Get":{"state":"<html>\n    <ˇbody>\n    </body>\n</html>","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_minibrackets_trailing_space.json b/crates/vim/test_data/test_minibrackets_trailing_space.json
deleted file mode 100644
index ed3f47df6c..0000000000
--- a/crates/vim/test_data/test_minibrackets_trailing_space.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{"Put":{"state":"(trailingˇ whitespace          )"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"b"}
-{"Get":{"state":"(«trailing whitespace          ˇ»)","mode":"Visual"}}
-{"Key":"escape"}
-{"Key":"y"}
-{"Key":"i"}
-{"Key":"b"}
-{"Get":{"state":"(ˇtrailing whitespace          )","mode":"Normal"}}
-{"ReadRegister":{"name":"\"","value":"trailing whitespace          "}}
diff --git a/crates/vim/test_data/test_named_registers.json b/crates/vim/test_data/test_named_registers.json
deleted file mode 100644
index 789f17f93f..0000000000
--- a/crates/vim/test_data/test_named_registers.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{"Put":{"state":"The quick brown\nfox jˇumps over\nthe lazy dog"}}
-{"Key":"\""}
-{"Key":"a"}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\nfox ˇover\nthe lazy dog","mode":"Normal"}}
-{"ReadRegister":{"name":"a","value":"jumps "}}
-{"Key":"\""}
-{"Key":"shift-a"}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\nfoxˇ \nthe lazy dog","mode":"Normal"}}
-{"ReadRegister":{"name":"a","value":"jumps over"}}
-{"Get":{"state":"The quick brown\nfoxˇ \nthe lazy dog","mode":"Normal"}}
-{"ReadRegister":{"name":"\"","value":"jumps over"}}
-{"Key":"\""}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown\nfox jumps oveˇr\nthe lazy dog","mode":"Normal"}}
-{"Key":"\""}
-{"Key":"a"}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\nfox jumpˇs\nthe lazy dog","mode":"Normal"}}
-{"ReadRegister":{"name":"a","value":" over"}}
diff --git a/crates/vim/test_data/test_neovim.json b/crates/vim/test_data/test_neovim.json
deleted file mode 100644
index 3fb5d6b3f4..0000000000
--- a/crates/vim/test_data/test_neovim.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{"Key":"i"}
-{"Get":{"state":"ˇ","mode":"Insert"}}
-{"Key":"shift-t"}
-{"Key":"e"}
-{"Key":"s"}
-{"Key":"t"}
-{"Key":"space"}
-{"Key":"t"}
-{"Key":"e"}
-{"Key":"s"}
-{"Key":"t"}
-{"Key":"escape"}
-{"Key":"0"}
-{"Key":"d"}
-{"Key":"w"}
-{"Get":{"state":"ˇtest","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_next_line_start.json b/crates/vim/test_data/test_next_line_start.json
deleted file mode 100644
index 90ed4a4f03..0000000000
--- a/crates/vim/test_data/test_next_line_start.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{"Put":{"state":"ˇone\n  two\nthree"}}
-{"Key":"enter"}
-{"Get":{"state":"one\n  ˇtwo\nthree","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_next_word_end_newline_last_char.json b/crates/vim/test_data/test_next_word_end_newline_last_char.json
deleted file mode 100644
index 9dac2979f5..0000000000
--- a/crates/vim/test_data/test_next_word_end_newline_last_char.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{"Put":{"state":"something(ˇfoo)"}}
-{"Key":"}"}
-{"Get":{"state":"something(fooˇ)","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_normal_command.json b/crates/vim/test_data/test_normal_command.json
deleted file mode 100644
index efd1d532c4..0000000000
--- a/crates/vim/test_data/test_normal_command.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{"Put":{"state":"The quick\nbrown« fox\njumpsˇ» over\nthe lazy dog\n"}}
-{"Key":":"}
-{"Key":"n"}
-{"Key":"o"}
-{"Key":"r"}
-{"Key":"m"}
-{"Key":"space"}
-{"Key":"w"}
-{"Key":"C"}
-{"Key":"w"}
-{"Key":"o"}
-{"Key":"r"}
-{"Key":"d"}
-{"Key":"enter"}
-{"Get":{"state":"The quick\nbrown word\njumps worˇd\nthe lazy dog\n","mode":"Normal"}}
-{"Key":":"}
-{"Key":"n"}
-{"Key":"o"}
-{"Key":"r"}
-{"Key":"m"}
-{"Key":"space"}
-{"Key":"_"}
-{"Key":"w"}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"w"}
-{"Key":"t"}
-{"Key":"e"}
-{"Key":"s"}
-{"Key":"t"}
-{"Key":"enter"}
-{"Get":{"state":"The quick\nbrown word\njumps tesˇt\nthe lazy dog\n","mode":"Normal"}}
-{"Key":"_"}
-{"Key":"l"}
-{"Key":"v"}
-{"Key":"l"}
-{"Key":":"}
-{"Key":"n"}
-{"Key":"o"}
-{"Key":"r"}
-{"Key":"m"}
-{"Key":"space"}
-{"Key":"s"}
-{"Key":"l"}
-{"Key":"a"}
-{"Key":"enter"}
-{"Get":{"state":"The quick\nbrown word\nlˇaumps test\nthe lazy dog\n","mode":"Normal"}}
-{"Put":{"state":"ˇThe quick\nbrown fox\njumps over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"i"}
-{"Key":"w"}
-{"Key":"M"}
-{"Key":"y"}
-{"Key":"escape"}
-{"Get":{"state":"Mˇy quick\nbrown fox\njumps over\nthe lazy dog\n","mode":"Normal"}}
-{"Key":":"}
-{"Key":"n"}
-{"Key":"o"}
-{"Key":"r"}
-{"Key":"m"}
-{"Key":"space"}
-{"Key":"u"}
-{"Key":"enter"}
-{"Get":{"state":"ˇThe quick\nbrown fox\njumps over\nthe lazy dog\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_numbered_registers.json b/crates/vim/test_data/test_numbered_registers.json
deleted file mode 100644
index 191a58e01f..0000000000
--- a/crates/vim/test_data/test_numbered_registers.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{"Put":{"state":"The quick brown\nfox jˇumps over\nthe lazy dog"}}
-{"Key":"y"}
-{"Key":"y"}
-{"Key":"\""}
-{"Key":"0"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown\nfox jumps over\nˇfox jumps over\nthe lazy dog","mode":"Normal"}}
-{"ReadRegister":{"name":"0","value":"fox jumps over\n"}}
-{"Get":{"state":"The quick brown\nfox jumps over\nˇfox jumps over\nthe lazy dog","mode":"Normal"}}
-{"ReadRegister":{"name":"\"","value":"fox jumps over\n"}}
-{"Get":{"state":"The quick brown\nfox jumps over\nˇfox jumps over\nthe lazy dog","mode":"Normal"}}
-{"Key":"k"}
-{"Key":"k"}
-{"Key":"d"}
-{"Key":"d"}
-{"Get":{"state":"ˇfox jumps over\nfox jumps over\nthe lazy dog","mode":"Normal"}}
-{"ReadRegister":{"name":"0","value":"fox jumps over\n"}}
-{"Get":{"state":"ˇfox jumps over\nfox jumps over\nthe lazy dog","mode":"Normal"}}
-{"ReadRegister":{"name":"1","value":"The quick brown\n"}}
-{"Get":{"state":"ˇfox jumps over\nfox jumps over\nthe lazy dog","mode":"Normal"}}
-{"ReadRegister":{"name":"\"","value":"The quick brown\n"}}
-{"Key":"d"}
-{"Key":"d"}
-{"Key":"shift-g"}
-{"Key":"d"}
-{"Key":"d"}
-{"Get":{"state":"ˇfox jumps over","mode":"Normal"}}
-{"ReadRegister":{"name":"0","value":"fox jumps over\n"}}
-{"Get":{"state":"ˇfox jumps over","mode":"Normal"}}
-{"ReadRegister":{"name":"3","value":"The quick brown\n"}}
-{"Get":{"state":"ˇfox jumps over","mode":"Normal"}}
-{"ReadRegister":{"name":"2","value":"fox jumps over\n"}}
-{"Get":{"state":"ˇfox jumps over","mode":"Normal"}}
-{"ReadRegister":{"name":"1","value":"the lazy dog\n"}}
-{"Get":{"state":"ˇfox jumps over","mode":"Normal"}}
-{"Key":"d"}
-{"Key":"d"}
-{"Key":"\""}
-{"Key":"3"}
-{"Key":"p"}
-{"Key":"p"}
-{"Key":"\""}
-{"Key":"1"}
-{"Key":"p"}
-{"Put":{"state":"The quick brown\nfox jumps over\nˇthe lazy dog"}}
diff --git a/crates/vim/test_data/test_o.json b/crates/vim/test_data/test_o.json
deleted file mode 100644
index 015890ac36..0000000000
--- a/crates/vim/test_data/test_o.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{"Put":{"state":"ˇ"}}
-{"Key":"o"}
-{"Get":{"state":"\nˇ","mode":"Insert"}}
-{"Put":{"state":"The ˇquick"}}
-{"Key":"o"}
-{"Get":{"state":"The quick\nˇ","mode":"Insert"}}
-{"Put":{"state":"The qˇuick\nbrown fox\njumps over"}}
-{"Key":"o"}
-{"Get":{"state":"The quick\nˇ\nbrown fox\njumps over","mode":"Insert"}}
-{"Put":{"state":"The quick\nbrown ˇfox\njumps over"}}
-{"Key":"o"}
-{"Get":{"state":"The quick\nbrown fox\nˇ\njumps over","mode":"Insert"}}
-{"Put":{"state":"The quick\nbrown fox\njumps ˇover"}}
-{"Key":"o"}
-{"Get":{"state":"The quick\nbrown fox\njumps over\nˇ","mode":"Insert"}}
-{"Put":{"state":"The quick\nˇ\nbrown fox"}}
-{"Key":"o"}
-{"Get":{"state":"The quick\n\nˇ\nbrown fox","mode":"Insert"}}
diff --git a/crates/vim/test_data/test_o_comment.json b/crates/vim/test_data/test_o_comment.json
deleted file mode 100644
index b0b84da0e6..0000000000
--- a/crates/vim/test_data/test_o_comment.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{"SetOption":{"value":"filetype=rust"}}
-{"Put":{"state":"// helloˇ\n"}}
-{"Key":"o"}
-{"Get":{"state":"// hello\n// ˇ\n","mode":"Insert"}}
-{"Key":"x"}
-{"Key":"escape"}
-{"Key":"shift-o"}
-{"Get":{"state":"// hello\n// ˇ\n// x\n","mode":"Insert"}}
diff --git a/crates/vim/test_data/test_offsets.json b/crates/vim/test_data/test_offsets.json
deleted file mode 100644
index 065a234817..0000000000
--- a/crates/vim/test_data/test_offsets.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{"Put":{"state":"ˇ1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n"}}
-{"Key":":"}
-{"Key":"+"}
-{"Key":"enter"}
-{"Get":{"state":"1\nˇ2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n","mode":"Normal"}}
-{"Key":":"}
-{"Key":"1"}
-{"Key":"0"}
-{"Key":"-"}
-{"Key":"enter"}
-{"Get":{"state":"1\n2\n3\n4\n5\n6\n7\n8\nˇ9\n10\n11\n","mode":"Normal"}}
-{"Key":":"}
-{"Key":"."}
-{"Key":"-"}
-{"Key":"2"}
-{"Key":"enter"}
-{"Get":{"state":"1\n2\n3\n4\n5\n6\nˇ7\n8\n9\n10\n11\n","mode":"Normal"}}
-{"Key":":"}
-{"Key":"%"}
-{"Key":"enter"}
-{"Get":{"state":"1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\nˇ","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_p_g_v_y.json b/crates/vim/test_data/test_p_g_v_y.json
deleted file mode 100644
index a275c333a3..0000000000
--- a/crates/vim/test_data/test_p_g_v_y.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{"Put":{"state":"The\nquicˇk\nbrown\nfox"}}
-{"Key":"y"}
-{"Key":"y"}
-{"Key":"j"}
-{"Key":"shift-v"}
-{"Key":"p"}
-{"Key":"g"}
-{"Key":"v"}
-{"Key":"y"}
-{"Get":{"state":"The\nquick\nˇquick\nfox","mode":"Normal"}}
-{"ReadRegister":{"name":"\"","value":"quick\n"}}
diff --git a/crates/vim/test_data/test_paragraph_multi_delete.json b/crates/vim/test_data/test_paragraph_multi_delete.json
deleted file mode 100644
index f706827a24..0000000000
--- a/crates/vim/test_data/test_paragraph_multi_delete.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{"Put":{"state":"Emacs is\nˇa great\n\noperating system\n\nall it lacks\nis a\n\ndecent text editor\n"}}
-{"Key":"2"}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"ˇall it lacks\nis a\n\ndecent text editor\n","mode":"Normal"}}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"ˇdecent text editor\n","mode":"Normal"}}
-{"ReadRegister":{"name":"\"","value":"all it lacks\nis a\n\n"}}
-{"Key":"2"}
-{"Key":"u"}
-{"Key":"4"}
-{"Key":"d"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"ˇ","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_paragraph_object_with_landing_positions_not_at_beginning_of_line.json b/crates/vim/test_data/test_paragraph_object_with_landing_positions_not_at_beginning_of_line.json
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/crates/vim/test_data/test_paragraphs_dont_wrap.json b/crates/vim/test_data/test_paragraphs_dont_wrap.json
deleted file mode 100644
index 9e729651be..0000000000
--- a/crates/vim/test_data/test_paragraphs_dont_wrap.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{"Put":{"state":"one\nˇ\ntwo"}}
-{"Key":"}"}
-{"Key":"}"}
-{"Get":{"state":"one\n\ntwˇo","mode":"Normal"}}
-{"Key":"{"}
-{"Key":"{"}
-{"Key":"{"}
-{"Get":{"state":"ˇone\n\ntwo","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_paste.json b/crates/vim/test_data/test_paste.json
deleted file mode 100644
index 21b7e9346a..0000000000
--- a/crates/vim/test_data/test_paste.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{"Put":{"state":"The quick brown\nfox ˇjumps over\nthe lazy dog"}}
-{"Key":"v"}
-{"Key":"w"}
-{"Key":"y"}
-{"Get":{"state":"The quick brown\nfox ˇjumps over\nthe lazy dog","mode":"Normal"}}
-{"ReadRegister":{"name":"\"","value":"jumps o"}}
-{"Put":{"state":"The quick brown\nfox jumps oveˇr\nthe lazy dog"}}
-{"Key":"p"}
-{"Get":{"state":"The quick brown\nfox jumps overjumps ˇo\nthe lazy dog","mode":"Normal"}}
-{"Put":{"state":"The quick brown\nfox jumps oveˇr\nthe lazy dog"}}
-{"Key":"shift-p"}
-{"Get":{"state":"The quick brown\nfox jumps ovejumps ˇor\nthe lazy dog","mode":"Normal"}}
-{"Put":{"state":"The quick brown\nfox juˇmps over\nthe lazy dog"}}
-{"Key":"d"}
-{"Key":"d"}
-{"Get":{"state":"The quick brown\nthe laˇzy dog","mode":"Normal"}}
-{"ReadRegister":{"name":"\"","value":"fox jumps over\n"}}
-{"Get":{"state":"The quick brown\nthe laˇzy dog","mode":"Normal"}}
-{"Key":"p"}
-{"Get":{"state":"The quick brown\nthe lazy dog\nˇfox jumps over","mode":"Normal"}}
-{"Key":"k"}
-{"Key":"shift-p"}
-{"Get":{"state":"The quick brown\nˇfox jumps over\nthe lazy dog\nfox jumps over","mode":"Normal"}}
-{"Put":{"state":"The quick brown\nfox jumps ˇover\nthe lazy dog"}}
-{"Key":"v"}
-{"Key":"j"}
-{"Key":"y"}
-{"Get":{"state":"The quick brown\nfox jumps ˇover\nthe lazy dog","mode":"Normal"}}
-{"ReadRegister":{"name":"\"","value":"over\nthe lazy do"}}
-{"Key":"p"}
-{"Get":{"state":"The quick brown\nfox jumps oˇover\nthe lazy dover\nthe lazy dog","mode":"Normal"}}
-{"Key":"u"}
-{"Key":"shift-p"}
-{"Get":{"state":"The quick brown\nfox jumps ˇover\nthe lazy doover\nthe lazy dog","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_paste_count.json b/crates/vim/test_data/test_paste_count.json
deleted file mode 100644
index 7dd4dc4d91..0000000000
--- a/crates/vim/test_data/test_paste_count.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{"Put":{"state":"onˇe\ntwo\nthree\n"}}
-{"Key":"y"}
-{"Key":"y"}
-{"Key":"3"}
-{"Key":"p"}
-{"Get":{"state":"one\nˇone\none\none\ntwo\nthree\n","mode":"Normal"}}
-{"Put":{"state":"one\nˇtwo\nthree\n"}}
-{"Key":"y"}
-{"Key":"$"}
-{"Key":"$"}
-{"Key":"3"}
-{"Key":"p"}
-{"Get":{"state":"one\ntwotwotwotwˇo\nthree\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_paste_visual.json b/crates/vim/test_data/test_paste_visual.json
deleted file mode 100644
index fb10f94782..0000000000
--- a/crates/vim/test_data/test_paste_visual.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{"Put":{"state":"The quick brown\nfox jˇumps over\nthe lazy dog"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"w"}
-{"Key":"y"}
-{"Get":{"state":"The quick brown\nfox ˇjumps over\nthe lazy dog","mode":"Normal"}}
-{"Key":"w"}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"w"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown\nfox jumps jumpˇs\nthe lazy dog","mode":"Normal"}}
-{"ReadRegister":{"name":"\"","value":"over"}}
-{"Key":"up"}
-{"Key":"shift-v"}
-{"Key":"shift-p"}
-{"Get":{"state":"ˇover\nfox jumps jumps\nthe lazy dog","mode":"Normal"}}
-{"ReadRegister":{"name":"\"","value":"over"}}
-{"Key":"ctrl-v"}
-{"Key":"down"}
-{"Key":"down"}
-{"Key":"p"}
-{"Get":{"state":"oveˇrver\noverox jumps jumps\noverhe lazy dog","mode":"Normal"}}
-{"Put":{"state":"The quick brown\nfox juˇmps over\nthe lazy dog"}}
-{"Key":"shift-v"}
-{"Key":"d"}
-{"Get":{"state":"The quick brown\nthe laˇzy dog","mode":"Normal"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"w"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown\nthe \nˇfox jumps over\n dog","mode":"Normal"}}
-{"ReadRegister":{"name":"\"","value":"lazy"}}
-{"Put":{"state":"The quick brown\nfox juˇmps over\nthe lazy dog"}}
-{"Key":"shift-v"}
-{"Key":"d"}
-{"Get":{"state":"The quick brown\nthe laˇzy dog","mode":"Normal"}}
-{"ReadRegister":{"name":"\"","value":"fox jumps over\n"}}
-{"Key":"k"}
-{"Key":"shift-v"}
-{"Key":"p"}
-{"Get":{"state":"ˇfox jumps over\nthe lazy dog","mode":"Normal"}}
-{"ReadRegister":{"name":"\"","value":"The quick brown\n"}}
-{"Put":{"state":"ˇThe quick brown\nfox jumps over\nthe lazy dog"}}
-{"Key":"y"}
-{"Key":"y"}
-{"Key":"shift-v"}
-{"Key":"j"}
-{"Key":"$"}
-{"Key":"p"}
-{"Get":{"state":"ˇThe quick brown\nthe lazy dog","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_paste_visual_block.json b/crates/vim/test_data/test_paste_visual_block.json
deleted file mode 100644
index 5560b7529d..0000000000
--- a/crates/vim/test_data/test_paste_visual_block.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{"Put":{"state":"The ˇquick brown\nfox jumps over\nthe lazy dog"}}
-{"Key":"ctrl-v"}
-{"Key":"2"}
-{"Key":"j"}
-{"Key":"y"}
-{"Get":{"state":"The ˇquick brown\nfox jumps over\nthe lazy dog","mode":"Normal"}}
-{"ReadRegister":{"name":"\"","value":"q\nj\nl"}}
-{"Key":"p"}
-{"Get":{"state":"The qˇquick brown\nfox jjumps over\nthe llazy dog","mode":"Normal"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"w"}
-{"Key":"shift-p"}
-{"Get":{"state":"The ˇq brown\nfox jjjumps over\nthe lllazy dog","mode":"Normal"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"w"}
-{"Key":"shift-p"}
-{"Put":{"state":"The ˇquick brown\nfox jumps over\nthe lazy dog"}}
-{"Key":"ctrl-v"}
-{"Key":"j"}
-{"Key":"y"}
-{"Get":{"state":"The ˇquick brown\nfox jumps over\nthe lazy dog","mode":"Normal"}}
-{"ReadRegister":{"name":"\"","value":"q\nj"}}
-{"Key":"l"}
-{"Key":"ctrl-v"}
-{"Key":"2"}
-{"Key":"j"}
-{"Key":"shift-p"}
-{"Get":{"state":"The qˇqick brown\nfox jjmps over\nthe lzy dog","mode":"Normal"}}
-{"Key":"shift-v"}
-{"Key":"p"}
-{"Get":{"state":"ˇq\nj\nfox jjmps over\nthe lzy dog","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_percent.json b/crates/vim/test_data/test_percent.json
deleted file mode 100644
index 2382cc9e49..0000000000
--- a/crates/vim/test_data/test_percent.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{"Put":{"state":"ˇconsole.log(var);"}}
-{"Key":"%"}
-{"Get":{"state":"console.log(varˇ);","mode":"Normal"}}
-{"Put":{"state":"console.logˇ(var);"}}
-{"Key":"%"}
-{"Get":{"state":"console.log(varˇ);","mode":"Normal"}}
-{"Put":{"state":"console.log(ˇvar);"}}
-{"Key":"%"}
-{"Get":{"state":"console.logˇ(var);","mode":"Normal"}}
-{"Put":{"state":"console.log(vaˇr);"}}
-{"Key":"%"}
-{"Get":{"state":"console.logˇ(var);","mode":"Normal"}}
-{"Put":{"state":"console.log(varˇ);"}}
-{"Key":"%"}
-{"Get":{"state":"console.logˇ(var);","mode":"Normal"}}
-{"Put":{"state":"console.log(var)ˇ;"}}
-{"Key":"%"}
-{"Get":{"state":"console.log(var)ˇ;","mode":"Normal"}}
-{"Put":{"state":"ˇconsole.log('var', [1, 2, 3]);"}}
-{"Key":"%"}
-{"Get":{"state":"console.log('var', [1, 2, 3]ˇ);","mode":"Normal"}}
-{"Put":{"state":"console.logˇ('var', [1, 2, 3]);"}}
-{"Key":"%"}
-{"Get":{"state":"console.log('var', [1, 2, 3]ˇ);","mode":"Normal"}}
-{"Put":{"state":"console.log(ˇ'var', [1, 2, 3]);"}}
-{"Key":"%"}
-{"Get":{"state":"console.log('var', [1, 2, 3ˇ]);","mode":"Normal"}}
-{"Put":{"state":"console.log('var', ˇ[1, 2, 3]);"}}
-{"Key":"%"}
-{"Get":{"state":"console.log('var', [1, 2, 3ˇ]);","mode":"Normal"}}
-{"Put":{"state":"console.log('var', [ˇ1, 2, 3]);"}}
-{"Key":"%"}
-{"Get":{"state":"console.log('var', ˇ[1, 2, 3]);","mode":"Normal"}}
-{"Put":{"state":"console.log('var', [1, ˇ2, 3]);"}}
-{"Key":"%"}
-{"Get":{"state":"console.log('var', ˇ[1, 2, 3]);","mode":"Normal"}}
-{"Put":{"state":"console.log('var', [1, 2, 3ˇ]);"}}
-{"Key":"%"}
-{"Get":{"state":"console.log('var', ˇ[1, 2, 3]);","mode":"Normal"}}
-{"Put":{"state":"console.log('var', [1, 2, 3]ˇ);"}}
-{"Key":"%"}
-{"Get":{"state":"console.logˇ('var', [1, 2, 3]);","mode":"Normal"}}
-{"Put":{"state":"console.log('var', [1, 2, 3])ˇ;"}}
-{"Key":"%"}
-{"Get":{"state":"console.log('var', [1, 2, 3])ˇ;","mode":"Normal"}}
-{"Put":{"state":"let result = curried_funˇ()();"}}
-{"Key":"%"}
-{"Get":{"state":"let result = curried_fun(ˇ)();","mode":"Normal"}}
-{"Key":"%"}
-{"Get":{"state":"let result = curried_funˇ()();","mode":"Normal"}}
-{"Put":{"state":"let result = curried_fun()ˇ();"}}
-{"Key":"%"}
-{"Get":{"state":"let result = curried_fun()(ˇ);","mode":"Normal"}}
-{"Key":"%"}
-{"Get":{"state":"let result = curried_fun()ˇ();","mode":"Normal"}}
-{"Put":{"state":"let result = curried_fun()()ˇ;"}}
-{"Key":"%"}
-{"Get":{"state":"let result = curried_fun()()ˇ;","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_period_mark.json b/crates/vim/test_data/test_period_mark.json
deleted file mode 100644
index 6d3acea83c..0000000000
--- a/crates/vim/test_data/test_period_mark.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{"Put":{"state":"Line one\nLine two\nLiˇne three\nLine four\nLine five\n"}}
-{"Key":"c"}
-{"Key":"e"}
-{"Key":"k"}
-{"Key":"e"}
-{"Key":"escape"}
-{"Key":"j"}
-{"Key":"j"}
-{"Key":"'"}
-{"Key":"."}
-{"Get":{"state":"Line one\nLine two\nˇLike three\nLine four\nLine five\n","mode":"Normal"}}
-{"Key":"`"}
-{"Key":"."}
-{"Get":{"state":"Line one\nLine two\nLiˇke three\nLine four\nLine five\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_plus_minus.json b/crates/vim/test_data/test_plus_minus.json
deleted file mode 100644
index 277d92ef6a..0000000000
--- a/crates/vim/test_data/test_plus_minus.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{"Put":{"state":"one\n   two\nthrˇee\n"}}
-{"Key":"-"}
-{"Get":{"state":"one\n   ˇtwo\nthree\n","mode":"Normal"}}
-{"Key":"-"}
-{"Get":{"state":"ˇone\n   two\nthree\n","mode":"Normal"}}
-{"Key":"+"}
-{"Get":{"state":"one\n   ˇtwo\nthree\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_previous_word_end.json b/crates/vim/test_data/test_previous_word_end.json
deleted file mode 100644
index f1e3540240..0000000000
--- a/crates/vim/test_data/test_previous_word_end.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{"Put":{"state":"456 5ˇ67 678\n"}}
-{"Key":"g"}
-{"Key":"e"}
-{"Get":{"state":"45ˇ6 567 678\n","mode":"Normal"}}
-{"Put":{"state":"123 234 345\n456 5ˇ67 678\n"}}
-{"Key":"4"}
-{"Key":"g"}
-{"Key":"e"}
-{"Get":{"state":"12ˇ3 234 345\n456 567 678\n","mode":"Normal"}}
-{"Put":{"state":"123 234 345\n4;5.6 5ˇ67 678\n789 890 901\n"}}
-{"Key":"g"}
-{"Key":"e"}
-{"Get":{"state":"123 234 345\n4;5.ˇ6 567 678\n789 890 901\n","mode":"Normal"}}
-{"Put":{"state":"123 234 345\n4;5.6 5ˇ67 678\n789 890 901\n"}}
-{"Key":"5"}
-{"Key":"g"}
-{"Key":"e"}
-{"Get":{"state":"123 234 345\nˇ4;5.6 567 678\n789 890 901\n","mode":"Normal"}}
-{"Put":{"state":"123 234 345\n\n78ˇ9 890 901\n"}}
-{"Key":"g"}
-{"Key":"e"}
-{"Get":{"state":"123 234 345\nˇ\n789 890 901\n","mode":"Normal"}}
-{"Key":"g"}
-{"Key":"e"}
-{"Get":{"state":"123 234 34ˇ5\n\n789 890 901\n","mode":"Normal"}}
-{"Put":{"state":"123 234 345\n4;5.ˇ6 567 678\n789 890 901\n"}}
-{"Key":"g"}
-{"Key":"shift-e"}
-{"Get":{"state":"123 234 34ˇ5\n4;5.6 567 678\n789 890 901\n","mode":"Normal"}}
-{"Put":{"state":"bar ˇó\n"}}
-{"Key":"g"}
-{"Key":"e"}
-{"Get":{"state":"baˇr ó\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_quote_mark.json b/crates/vim/test_data/test_quote_mark.json
deleted file mode 100644
index 6eb85580e8..0000000000
--- a/crates/vim/test_data/test_quote_mark.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{"Put":{"state":"ˇHello, world!"}}
-{"Key":"w"}
-{"Key":"m"}
-{"Key":"o"}
-{"Get":{"state":"Helloˇ, world!","mode":"Normal"}}
-{"Key":"$"}
-{"Key":"`"}
-{"Key":"o"}
-{"Get":{"state":"Helloˇ, world!","mode":"Normal"}}
-{"Key":"`"}
-{"Key":"`"}
-{"Get":{"state":"Hello, worldˇ!","mode":"Normal"}}
-{"Key":"`"}
-{"Key":"`"}
-{"Get":{"state":"Helloˇ, world!","mode":"Normal"}}
-{"Key":"$"}
-{"Key":"m"}
-{"Key":"'"}
-{"Get":{"state":"Hello, worldˇ!","mode":"Normal"}}
-{"Key":"^"}
-{"Key":"`"}
-{"Key":"`"}
-{"Get":{"state":"Hello, worldˇ!","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_r.json b/crates/vim/test_data/test_r.json
deleted file mode 100644
index 6cb0aec3f5..0000000000
--- a/crates/vim/test_data/test_r.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{"Put":{"state":"ˇhello\n"}}
-{"Key":"r"}
-{"Key":"-"}
-{"Get":{"state":"ˇ-ello\n","mode":"Normal"}}
-{"Put":{"state":"ˇhello\n"}}
-{"Key":"3"}
-{"Key":"r"}
-{"Key":"-"}
-{"Get":{"state":"--ˇ-lo\n","mode":"Normal"}}
-{"Put":{"state":"ˇhello\n"}}
-{"Key":"r"}
-{"Key":"-"}
-{"Key":"2"}
-{"Key":"l"}
-{"Key":"."}
-{"Get":{"state":"-eˇ-lo\n","mode":"Normal"}}
-{"Put":{"state":"ˇhello world\n"}}
-{"Key":"2"}
-{"Key":"r"}
-{"Key":"-"}
-{"Key":"f"}
-{"Key":"w"}
-{"Key":"."}
-{"Get":{"state":"--llo -ˇ-rld\n","mode":"Normal"}}
-{"Put":{"state":"ˇhello world\n"}}
-{"Key":"2"}
-{"Key":"0"}
-{"Key":"r"}
-{"Key":"-"}
-{"Key":""}
-{"Get":{"state":"ˇhello world\n","mode":"Normal"}}
-{"Put":{"state":"  helloˇ world\n"}}
-{"Key":"r"}
-{"Key":"enter"}
-{"Get":{"state":"  hello\n ˇ world\n","mode":"Normal"}}
-{"Put":{"state":"  helloˇ world\n"}}
-{"Key":"2"}
-{"Key":"r"}
-{"Key":"enter"}
-{"Get":{"state":"  hello\n ˇ orld\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_record_replay.json b/crates/vim/test_data/test_record_replay.json
deleted file mode 100644
index 8346d9ad8b..0000000000
--- a/crates/vim/test_data/test_record_replay.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{"Put":{"state":"ˇhello world"}}
-{"Key":"q"}
-{"Key":"w"}
-{"Key":"c"}
-{"Key":"w"}
-{"Key":"j"}
-{"Key":"escape"}
-{"Key":"q"}
-{"Get":{"state":"ˇj world","mode":"Normal"}}
-{"Key":"2"}
-{"Key":"l"}
-{"Key":"@"}
-{"Key":"w"}
-{"Get":{"state":"j ˇj","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_record_replay_count.json b/crates/vim/test_data/test_record_replay_count.json
deleted file mode 100644
index 78023ef350..0000000000
--- a/crates/vim/test_data/test_record_replay_count.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{"Put":{"state":"ˇhello world!!"}}
-{"Key":"q"}
-{"Key":"a"}
-{"Key":"v"}
-{"Key":"3"}
-{"Key":"l"}
-{"Key":"s"}
-{"Key":"0"}
-{"Key":"escape"}
-{"Key":"l"}
-{"Key":"q"}
-{"Get":{"state":"0ˇo world!!","mode":"Normal"}}
-{"Key":"2"}
-{"Key":"@"}
-{"Key":"a"}
-{"Get":{"state":"000ˇ!","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_record_replay_dot.json b/crates/vim/test_data/test_record_replay_dot.json
deleted file mode 100644
index 9cc565f160..0000000000
--- a/crates/vim/test_data/test_record_replay_dot.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{"Put":{"state":"ˇhello world"}}
-{"Key":"q"}
-{"Key":"a"}
-{"Key":"r"}
-{"Key":"a"}
-{"Key":"l"}
-{"Key":"r"}
-{"Key":"b"}
-{"Key":"l"}
-{"Key":"q"}
-{"Get":{"state":"abˇllo world","mode":"Normal"}}
-{"Key":"."}
-{"Get":{"state":"abˇblo world","mode":"Normal"}}
-{"Key":"shift-q"}
-{"Get":{"state":"ababˇo world","mode":"Normal"}}
-{"Key":"."}
-{"Get":{"state":"ababˇb world","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_record_replay_interleaved.json b/crates/vim/test_data/test_record_replay_interleaved.json
deleted file mode 100644
index aefb5eac2a..0000000000
--- a/crates/vim/test_data/test_record_replay_interleaved.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{"Put":{"state":"ˇhello world"}}
-{"Key":"q"}
-{"Key":"z"}
-{"Key":"r"}
-{"Key":"a"}
-{"Key":"l"}
-{"Key":"q"}
-{"Get":{"state":"aˇello world","mode":"Normal"}}
-{"Key":"q"}
-{"Key":"b"}
-{"Key":"@"}
-{"Key":"z"}
-{"Key":"@"}
-{"Key":"z"}
-{"Key":"q"}
-{"Get":{"state":"aaaˇlo world","mode":"Normal"}}
-{"Key":"@"}
-{"Key":"@"}
-{"Get":{"state":"aaaaˇo world","mode":"Normal"}}
-{"Key":"@"}
-{"Key":"b"}
-{"Get":{"state":"aaaaaaˇworld","mode":"Normal"}}
-{"Key":"@"}
-{"Key":"@"}
-{"Get":{"state":"aaaaaaaˇorld","mode":"Normal"}}
-{"Key":"q"}
-{"Key":"z"}
-{"Key":"r"}
-{"Key":"b"}
-{"Key":"l"}
-{"Key":"q"}
-{"Get":{"state":"aaaaaaabˇrld","mode":"Normal"}}
-{"Key":"@"}
-{"Key":"b"}
-{"Get":{"state":"aaaaaaabbbˇd","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_record_replay_of_dot.json b/crates/vim/test_data/test_record_replay_of_dot.json
deleted file mode 100644
index f4cce4bb3d..0000000000
--- a/crates/vim/test_data/test_record_replay_of_dot.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{"Put":{"state":"ˇhello world"}}
-{"Key":"r"}
-{"Key":"o"}
-{"Key":"q"}
-{"Key":"w"}
-{"Key":"."}
-{"Key":"q"}
-{"Get":{"state":"ˇoello world","mode":"Normal"}}
-{"Key":"d"}
-{"Key":"l"}
-{"Get":{"state":"ˇello world","mode":"Normal"}}
-{"Key":"@"}
-{"Key":"w"}
-{"Get":{"state":"ˇllo world","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_record_replay_recursion.json b/crates/vim/test_data/test_record_replay_recursion.json
deleted file mode 100644
index d02817db57..0000000000
--- a/crates/vim/test_data/test_record_replay_recursion.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"Put":{"state":"ˇhello world"}}
-{"Key":">"}
-{"Key":"."}
-{"Key":"."}
-{"Key":"."}
-{"Get":{"state":"ˇhello world","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_remap_adjacent_dog_cat.json b/crates/vim/test_data/test_remap_adjacent_dog_cat.json
deleted file mode 100644
index 91af9ccac6..0000000000
--- a/crates/vim/test_data/test_remap_adjacent_dog_cat.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{"Exec":{"command":"imap dog 🐶"}}
-{"Exec":{"command":"imap cat 🐱"}}
-{"Put":{"state":"ˇ"}}
-{"Key":"i"}
-{"Key":"d"}
-{"Key":"o"}
-{"Key":"g"}
-{"Get":{"state":"🐶ˇ","mode":"Insert"}}
-{"Put":{"state":"ˇ"}}
-{"Key":"i"}
-{"Key":"d"}
-{"Key":"o"}
-{"Key":"d"}
-{"Key":"o"}
-{"Key":"g"}
-{"Get":{"state":"do🐶ˇ","mode":"Insert"}}
-{"Put":{"state":"ˇ"}}
-{"Key":"i"}
-{"Key":"d"}
-{"Key":"o"}
-{"Key":"c"}
-{"Key":"a"}
-{"Key":"t"}
-{"Get":{"state":"do🐱ˇ","mode":"Insert"}}
diff --git a/crates/vim/test_data/test_remap_nested_pineapple.json b/crates/vim/test_data/test_remap_nested_pineapple.json
deleted file mode 100644
index b4a4acdd2b..0000000000
--- a/crates/vim/test_data/test_remap_nested_pineapple.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{"Exec":{"command":"imap pin 📌"}}
-{"Exec":{"command":"imap pine 🌲"}}
-{"Exec":{"command":"imap pineapple 🍍"}}
-{"Put":{"state":"ˇ"}}
-{"Key":"i"}
-{"Key":"p"}
-{"Key":"i"}
-{"Key":"n"}
-{"Get":{"state":"📌ˇ","mode":"Insert"}}
-{"Put":{"state":"ˇ"}}
-{"Key":"i"}
-{"Key":"p"}
-{"Key":"i"}
-{"Key":"n"}
-{"Key":"e"}
-{"Get":{"state":"🌲ˇ","mode":"Insert"}}
-{"Put":{"state":"ˇ"}}
-{"Key":"i"}
-{"Key":"p"}
-{"Key":"i"}
-{"Key":"n"}
-{"Key":"e"}
-{"Key":"a"}
-{"Key":"p"}
-{"Key":"p"}
-{"Key":"l"}
-{"Key":"e"}
-{"Get":{"state":"🍍ˇ","mode":"Insert"}}
diff --git a/crates/vim/test_data/test_remap_recursion.json b/crates/vim/test_data/test_remap_recursion.json
deleted file mode 100644
index 27e3c64b16..0000000000
--- a/crates/vim/test_data/test_remap_recursion.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{"Exec":{"command":"noremap x \"_x"}}
-{"Exec":{"command":"map y 2x"}}
-{"Put":{"state":"ˇhello"}}
-{"Key":"d"}
-{"Key":"l"}
-{"Get":{"state":"ˇello","mode":"Normal"}}
-{"ReadRegister":{"name":"\"","value":"h"}}
-{"Key":"y"}
-{"Get":{"state":"ˇlo","mode":"Normal"}}
-{"ReadRegister":{"name":"\"","value":"h"}}
-{"Get":{"state":"ˇlo","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_repeat_clear_count.json b/crates/vim/test_data/test_repeat_clear_count.json
deleted file mode 100644
index 352c6ca4a8..0000000000
--- a/crates/vim/test_data/test_repeat_clear_count.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{"Put":{"state":"ˇthe quick brown\nfox jumps over\nthe lazy dog"}}
-{"Key":"d"}
-{"Key":"d"}
-{"Get":{"state":"ˇfox jumps over\nthe lazy dog","mode":"Normal"}}
-{"Key":"2"}
-{"Key":"d"}
-{"Key":"."}
-{"Get":{"state":"ˇfox jumps over\nthe lazy dog","mode":"Normal"}}
-{"Key":"."}
-{"Get":{"state":"ˇthe lazy dog","mode":"Normal"}}
-{"Put":{"state":"ˇthe quick brown\nfox jumps over\nthe lazy dog\nthe quick brown\nfox jumps over\nthe lazy dog"}}
-{"Key":"2"}
-{"Key":"d"}
-{"Key":"d"}
-{"Get":{"state":"ˇthe lazy dog\nthe quick brown\nfox jumps over\nthe lazy dog","mode":"Normal"}}
-{"Key":"5"}
-{"Key":"d"}
-{"Key":"."}
-{"Get":{"state":"ˇthe lazy dog\nthe quick brown\nfox jumps over\nthe lazy dog","mode":"Normal"}}
-{"Key":"."}
-{"Get":{"state":"ˇfox jumps over\nthe lazy dog","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_repeat_clear_repeat.json b/crates/vim/test_data/test_repeat_clear_repeat.json
deleted file mode 100644
index 39d96e2a37..0000000000
--- a/crates/vim/test_data/test_repeat_clear_repeat.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{"Put":{"state":"ˇthe quick brown\nfox jumps over\nthe lazy dog"}}
-{"Key":"d"}
-{"Key":"d"}
-{"Get":{"state":"ˇfox jumps over\nthe lazy dog","mode":"Normal"}}
-{"Key":"d"}
-{"Key":"."}
-{"Key":"."}
-{"Get":{"state":"ˇthe lazy dog","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_repeat_grouping_41735.json b/crates/vim/test_data/test_repeat_grouping_41735.json
deleted file mode 100644
index 6523be6e4b..0000000000
--- a/crates/vim/test_data/test_repeat_grouping_41735.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{"Put":{"state":"ˇ"}}
-{"Key":"i"}
-{"Key":"a"}
-{"Key":"escape"}
-{"Key":"."}
-{"Key":"."}
-{"Key":"."}
-{"Get":{"state":"ˇaaaa","mode":"Normal"}}
-{"Key":"u"}
-{"Get":{"state":"ˇaaa","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_repeat_motion_counts.json b/crates/vim/test_data/test_repeat_motion_counts.json
deleted file mode 100644
index c39b8b09c0..0000000000
--- a/crates/vim/test_data/test_repeat_motion_counts.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{"Put":{"state":"ˇthe quick brown\nfox jumps over\nthe lazy dog"}}
-{"Key":"3"}
-{"Key":"d"}
-{"Key":"3"}
-{"Key":"l"}
-{"Get":{"state":"ˇ brown\nfox jumps over\nthe lazy dog","mode":"Normal"}}
-{"Key":"j"}
-{"Key":"."}
-{"Get":{"state":" brown\nˇ over\nthe lazy dog","mode":"Normal"}}
-{"Key":"j"}
-{"Key":"2"}
-{"Key":"."}
-{"Get":{"state":" brown\n over\nˇe lazy dog","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_repeat_over_blur.json b/crates/vim/test_data/test_repeat_over_blur.json
deleted file mode 100644
index 3929711e49..0000000000
--- a/crates/vim/test_data/test_repeat_over_blur.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{"Put":{"state":"ˇhello hello hello\n"}}
-{"Key":"c"}
-{"Key":"f"}
-{"Key":"o"}
-{"Key":"x"}
-{"Key":"escape"}
-{"Get":{"state":"ˇx hello hello\n","mode":"Normal"}}
-{"Key":":"}
-{"Key":"escape"}
-{"Key":"."}
-{"Get":{"state":"ˇx hello\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_repeat_visual.json b/crates/vim/test_data/test_repeat_visual.json
deleted file mode 100644
index cb83addcfb..0000000000
--- a/crates/vim/test_data/test_repeat_visual.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{"Put":{"state":"ˇthe quick brown\nfox jumps over\nthe lazy dog"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"w"}
-{"Key":"s"}
-{"Key":"o"}
-{"Key":"escape"}
-{"Get":{"state":"ˇo quick brown\nfox jumps over\nthe lazy dog","mode":"Normal"}}
-{"Key":"j"}
-{"Key":"w"}
-{"Key":"."}
-{"Get":{"state":"o quick brown\nfox ˇops over\nthe lazy dog","mode":"Normal"}}
-{"Key":"f"}
-{"Key":"r"}
-{"Key":"."}
-{"Get":{"state":"o quick brown\nfox ops oveˇothe lazy dog","mode":"Normal"}}
-{"Put":{"state":"the ˇquick brown\nfox jumps over\nfox jumps over\nfox jumps over\nthe lazy dog"}}
-{"Key":"v"}
-{"Key":"j"}
-{"Key":"x"}
-{"Get":{"state":"the ˇumps over\nfox jumps over\nfox jumps over\nthe lazy dog","mode":"Normal"}}
-{"Key":"."}
-{"Get":{"state":"the ˇumps over\nfox jumps over\nthe lazy dog","mode":"Normal"}}
-{"Key":"w"}
-{"Key":"."}
-{"Get":{"state":"the umps ˇumps over\nthe lazy dog","mode":"Normal"}}
-{"Key":"j"}
-{"Key":"."}
-{"Get":{"state":"the umps umps over\nthe ˇog","mode":"Normal"}}
-{"Put":{"state":"ˇthe quick brown\nfox jumps over\nthe lazy dog"}}
-{"Key":"ctrl-v"}
-{"Key":"j"}
-{"Key":"j"}
-{"Key":"shift-i"}
-{"Key":"o"}
-{"Key":"escape"}
-{"Get":{"state":"ˇothe quick brown\nofox jumps over\nothe lazy dog","mode":"Normal"}}
-{"Key":"j"}
-{"Key":"4"}
-{"Key":"l"}
-{"Key":"."}
-{"Get":{"state":"othe quick brown\nofoxˇo jumps over\notheo lazy dog","mode":"Normal"}}
-{"Put":{"state":"ˇthe quick brown\nfox jumps over\nthe lazy dog"}}
-{"Key":"shift-v"}
-{"Key":"shift-r"}
-{"Key":"o"}
-{"Key":"escape"}
-{"Get":{"state":"ˇo\nfox jumps over\nthe lazy dog","mode":"Normal"}}
-{"Key":"j"}
-{"Key":"."}
-{"Get":{"state":"o\nˇo\nthe lazy dog","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_repeated_cb.json b/crates/vim/test_data/test_repeated_cb.json
deleted file mode 100644
index 437b55ef29..0000000000
--- a/crates/vim/test_data/test_repeated_cb.json
+++ /dev/null
@@ -1,275 +0,0 @@
-{"Put":{"state":"ˇThe quick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"1"}
-{"Key":"b"}
-{"Get":{"state":"ˇThe quick brown\n\nfox jumps-over\nthe lazy dog\n","mode":"Normal"}}
-{"Put":{"state":"The quˇick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"1"}
-{"Key":"b"}
-{"Get":{"state":"The ˇick brown\n\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quickˇ brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"1"}
-{"Key":"b"}
-{"Get":{"state":"The ˇ brown\n\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick browˇn\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"1"}
-{"Key":"b"}
-{"Get":{"state":"The quick ˇn\n\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nˇ\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"1"}
-{"Key":"b"}
-{"Get":{"state":"The quick ˇ\n\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nˇfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"1"}
-{"Key":"b"}
-{"Get":{"state":"The quick brown\nˇ\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox ˇjumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"1"}
-{"Key":"b"}
-{"Get":{"state":"The quick brown\n\nˇjumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumpsˇ-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"1"}
-{"Key":"b"}
-{"Get":{"state":"The quick brown\n\nfox ˇ-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-ˇover\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"1"}
-{"Key":"b"}
-{"Get":{"state":"The quick brown\n\nfox jumpsˇover\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-oˇver\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"1"}
-{"Key":"b"}
-{"Get":{"state":"The quick brown\n\nfox jumps-ˇver\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-over\nˇthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"1"}
-{"Key":"b"}
-{"Get":{"state":"The quick brown\n\nfox jumps-ˇ\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"ˇThe quick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"2"}
-{"Key":"b"}
-{"Get":{"state":"ˇThe quick brown\n\nfox jumps-over\nthe lazy dog\n","mode":"Normal"}}
-{"Put":{"state":"The quˇick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"2"}
-{"Key":"b"}
-{"Get":{"state":"ˇick brown\n\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quickˇ brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"2"}
-{"Key":"b"}
-{"Get":{"state":"ˇ brown\n\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick browˇn\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"2"}
-{"Key":"b"}
-{"Get":{"state":"The ˇn\n\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nˇ\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"2"}
-{"Key":"b"}
-{"Get":{"state":"The ˇ\n\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nˇfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"2"}
-{"Key":"b"}
-{"Get":{"state":"The quick ˇ\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox ˇjumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"2"}
-{"Key":"b"}
-{"Get":{"state":"The quick brown\nˇjumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumpsˇ-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"2"}
-{"Key":"b"}
-{"Get":{"state":"The quick brown\n\nˇ-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-ˇover\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"2"}
-{"Key":"b"}
-{"Get":{"state":"The quick brown\n\nfox ˇover\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-oˇver\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"2"}
-{"Key":"b"}
-{"Get":{"state":"The quick brown\n\nfox jumpsˇver\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-over\nˇthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"2"}
-{"Key":"b"}
-{"Get":{"state":"The quick brown\n\nfox jumpsˇ\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"ˇThe quick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"3"}
-{"Key":"b"}
-{"Get":{"state":"ˇThe quick brown\n\nfox jumps-over\nthe lazy dog\n","mode":"Normal"}}
-{"Put":{"state":"The quˇick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"3"}
-{"Key":"b"}
-{"Get":{"state":"ˇick brown\n\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quickˇ brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"3"}
-{"Key":"b"}
-{"Get":{"state":"ˇ brown\n\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick browˇn\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"3"}
-{"Key":"b"}
-{"Get":{"state":"ˇn\n\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nˇ\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"3"}
-{"Key":"b"}
-{"Get":{"state":"ˇ\n\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nˇfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"3"}
-{"Key":"b"}
-{"Get":{"state":"The ˇ\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox ˇjumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"3"}
-{"Key":"b"}
-{"Get":{"state":"The quick ˇjumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumpsˇ-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"3"}
-{"Key":"b"}
-{"Get":{"state":"The quick brown\nˇ-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-ˇover\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"3"}
-{"Key":"b"}
-{"Get":{"state":"The quick brown\n\nˇover\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-oˇver\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"3"}
-{"Key":"b"}
-{"Get":{"state":"The quick brown\n\nfox ˇver\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-over\nˇthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"3"}
-{"Key":"b"}
-{"Get":{"state":"The quick brown\n\nfox ˇ\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"ˇThe quick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"4"}
-{"Key":"b"}
-{"Get":{"state":"ˇThe quick brown\n\nfox jumps-over\nthe lazy dog\n","mode":"Normal"}}
-{"Put":{"state":"The quˇick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"4"}
-{"Key":"b"}
-{"Get":{"state":"ˇick brown\n\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quickˇ brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"4"}
-{"Key":"b"}
-{"Get":{"state":"ˇ brown\n\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick browˇn\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"4"}
-{"Key":"b"}
-{"Get":{"state":"ˇn\n\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nˇ\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"4"}
-{"Key":"b"}
-{"Get":{"state":"ˇ\n\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nˇfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"4"}
-{"Key":"b"}
-{"Get":{"state":"ˇ\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox ˇjumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"4"}
-{"Key":"b"}
-{"Get":{"state":"The ˇjumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumpsˇ-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"4"}
-{"Key":"b"}
-{"Get":{"state":"The quick ˇ-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-ˇover\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"4"}
-{"Key":"b"}
-{"Get":{"state":"The quick brown\nˇover\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-oˇver\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"4"}
-{"Key":"b"}
-{"Get":{"state":"The quick brown\n\nˇver\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-over\nˇthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"4"}
-{"Key":"b"}
-{"Get":{"state":"The quick brown\n\nˇ\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"ˇThe quick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"5"}
-{"Key":"b"}
-{"Get":{"state":"ˇThe quick brown\n\nfox jumps-over\nthe lazy dog\n","mode":"Normal"}}
-{"Put":{"state":"The quˇick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"5"}
-{"Key":"b"}
-{"Get":{"state":"ˇick brown\n\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quickˇ brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"5"}
-{"Key":"b"}
-{"Get":{"state":"ˇ brown\n\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick browˇn\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"5"}
-{"Key":"b"}
-{"Get":{"state":"ˇn\n\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nˇ\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"5"}
-{"Key":"b"}
-{"Get":{"state":"ˇ\n\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nˇfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"5"}
-{"Key":"b"}
-{"Get":{"state":"ˇ\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox ˇjumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"5"}
-{"Key":"b"}
-{"Get":{"state":"ˇjumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumpsˇ-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"5"}
-{"Key":"b"}
-{"Get":{"state":"The ˇ-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-ˇover\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"5"}
-{"Key":"b"}
-{"Get":{"state":"The quick ˇover\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-oˇver\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"5"}
-{"Key":"b"}
-{"Get":{"state":"The quick brown\nˇver\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-over\nˇthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"5"}
-{"Key":"b"}
-{"Get":{"state":"The quick brown\nˇ\nthe lazy dog\n","mode":"Insert"}}
diff --git a/crates/vim/test_data/test_repeated_ce.json b/crates/vim/test_data/test_repeated_ce.json
deleted file mode 100644
index 3032185d64..0000000000
--- a/crates/vim/test_data/test_repeated_ce.json
+++ /dev/null
@@ -1,275 +0,0 @@
-{"Put":{"state":"ˇThe quick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"1"}
-{"Key":"e"}
-{"Get":{"state":"ˇ quick brown\n\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quˇick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"1"}
-{"Key":"e"}
-{"Get":{"state":"The quˇ brown\n\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quickˇ brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"1"}
-{"Key":"e"}
-{"Get":{"state":"The quickˇ\n\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick browˇn\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"1"}
-{"Key":"e"}
-{"Get":{"state":"The quick browˇ jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nˇ\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"1"}
-{"Key":"e"}
-{"Get":{"state":"The quick brown\nˇ jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nˇfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"1"}
-{"Key":"e"}
-{"Get":{"state":"The quick brown\n\nˇ jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox ˇjumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"1"}
-{"Key":"e"}
-{"Get":{"state":"The quick brown\n\nfox ˇ-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumpsˇ-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"1"}
-{"Key":"e"}
-{"Get":{"state":"The quick brown\n\nfox jumpsˇ\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-ˇover\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"1"}
-{"Key":"e"}
-{"Get":{"state":"The quick brown\n\nfox jumps-ˇ\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-oˇver\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"1"}
-{"Key":"e"}
-{"Get":{"state":"The quick brown\n\nfox jumps-oˇ\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-over\nˇthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"1"}
-{"Key":"e"}
-{"Get":{"state":"The quick brown\n\nfox jumps-over\nˇ lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"ˇThe quick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"2"}
-{"Key":"e"}
-{"Get":{"state":"ˇ brown\n\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quˇick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"2"}
-{"Key":"e"}
-{"Get":{"state":"The quˇ\n\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quickˇ brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"2"}
-{"Key":"e"}
-{"Get":{"state":"The quickˇ jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick browˇn\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"2"}
-{"Key":"e"}
-{"Get":{"state":"The quick browˇ-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nˇ\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"2"}
-{"Key":"e"}
-{"Get":{"state":"The quick brown\nˇ-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nˇfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"2"}
-{"Key":"e"}
-{"Get":{"state":"The quick brown\n\nˇ-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox ˇjumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"2"}
-{"Key":"e"}
-{"Get":{"state":"The quick brown\n\nfox ˇover\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumpsˇ-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"2"}
-{"Key":"e"}
-{"Get":{"state":"The quick brown\n\nfox jumpsˇ lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-ˇover\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"2"}
-{"Key":"e"}
-{"Get":{"state":"The quick brown\n\nfox jumps-ˇ lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-oˇver\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"2"}
-{"Key":"e"}
-{"Get":{"state":"The quick brown\n\nfox jumps-oˇ lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-over\nˇthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"2"}
-{"Key":"e"}
-{"Get":{"state":"The quick brown\n\nfox jumps-over\nˇ dog\n","mode":"Insert"}}
-{"Put":{"state":"ˇThe quick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"3"}
-{"Key":"e"}
-{"Get":{"state":"ˇ\n\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quˇick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"3"}
-{"Key":"e"}
-{"Get":{"state":"The quˇ jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quickˇ brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"3"}
-{"Key":"e"}
-{"Get":{"state":"The quickˇ-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick browˇn\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"3"}
-{"Key":"e"}
-{"Get":{"state":"The quick browˇover\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nˇ\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"3"}
-{"Key":"e"}
-{"Get":{"state":"The quick brown\nˇover\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nˇfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"3"}
-{"Key":"e"}
-{"Get":{"state":"The quick brown\n\nˇover\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox ˇjumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"3"}
-{"Key":"e"}
-{"Get":{"state":"The quick brown\n\nfox ˇ\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumpsˇ-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"3"}
-{"Key":"e"}
-{"Get":{"state":"The quick brown\n\nfox jumpsˇ dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-ˇover\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"3"}
-{"Key":"e"}
-{"Get":{"state":"The quick brown\n\nfox jumps-ˇ dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-oˇver\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"3"}
-{"Key":"e"}
-{"Get":{"state":"The quick brown\n\nfox jumps-oˇ dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-over\nˇthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"3"}
-{"Key":"e"}
-{"Get":{"state":"The quick brown\n\nfox jumps-over\nˇ\n","mode":"Insert"}}
-{"Put":{"state":"ˇThe quick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"4"}
-{"Key":"e"}
-{"Get":{"state":"ˇ jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quˇick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"4"}
-{"Key":"e"}
-{"Get":{"state":"The quˇ-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quickˇ brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"4"}
-{"Key":"e"}
-{"Get":{"state":"The quickˇover\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick browˇn\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"4"}
-{"Key":"e"}
-{"Get":{"state":"The quick browˇ\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nˇ\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"4"}
-{"Key":"e"}
-{"Get":{"state":"The quick brown\nˇ\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nˇfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"4"}
-{"Key":"e"}
-{"Get":{"state":"The quick brown\n\nˇ\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox ˇjumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"4"}
-{"Key":"e"}
-{"Get":{"state":"The quick brown\n\nfox ˇ lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumpsˇ-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"4"}
-{"Key":"e"}
-{"Get":{"state":"The quick brown\n\nfox jumpsˇ\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-ˇover\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"4"}
-{"Key":"e"}
-{"Get":{"state":"The quick brown\n\nfox jumps-ˇ\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-oˇver\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"4"}
-{"Key":"e"}
-{"Get":{"state":"The quick brown\n\nfox jumps-oˇ\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-over\nˇthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"4"}
-{"Key":"e"}
-{"Get":{"state":"The quick brown\n\nfox jumps-over\nˇ","mode":"Insert"}}
-{"Put":{"state":"ˇThe quick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"5"}
-{"Key":"e"}
-{"Get":{"state":"ˇ-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quˇick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"5"}
-{"Key":"e"}
-{"Get":{"state":"The quˇover\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quickˇ brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"5"}
-{"Key":"e"}
-{"Get":{"state":"The quickˇ\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick browˇn\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"5"}
-{"Key":"e"}
-{"Get":{"state":"The quick browˇ lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nˇ\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"5"}
-{"Key":"e"}
-{"Get":{"state":"The quick brown\nˇ lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nˇfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"5"}
-{"Key":"e"}
-{"Get":{"state":"The quick brown\n\nˇ lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox ˇjumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"5"}
-{"Key":"e"}
-{"Get":{"state":"The quick brown\n\nfox ˇ dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumpsˇ-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"5"}
-{"Key":"e"}
-{"Get":{"state":"The quick brown\n\nfox jumpsˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-ˇover\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"5"}
-{"Key":"e"}
-{"Get":{"state":"The quick brown\n\nfox jumps-ˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-oˇver\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"5"}
-{"Key":"e"}
-{"Get":{"state":"The quick brown\n\nfox jumps-oˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-over\nˇthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"5"}
-{"Key":"e"}
-{"Get":{"state":"The quick brown\n\nfox jumps-over\nˇ","mode":"Insert"}}
diff --git a/crates/vim/test_data/test_repeated_cj.json b/crates/vim/test_data/test_repeated_cj.json
deleted file mode 100644
index e20270f97c..0000000000
--- a/crates/vim/test_data/test_repeated_cj.json
+++ /dev/null
@@ -1,275 +0,0 @@
-{"Put":{"state":"ˇThe quick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"1"}
-{"Key":"j"}
-{"Get":{"state":"ˇ\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quˇick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"1"}
-{"Key":"j"}
-{"Get":{"state":"ˇ\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quickˇ brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"1"}
-{"Key":"j"}
-{"Get":{"state":"ˇ\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick browˇn\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"1"}
-{"Key":"j"}
-{"Get":{"state":"ˇ\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nˇ\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"1"}
-{"Key":"j"}
-{"Get":{"state":"The quick brown\nˇ\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nˇfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"1"}
-{"Key":"j"}
-{"Get":{"state":"The quick brown\n\nˇ\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox ˇjumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"1"}
-{"Key":"j"}
-{"Get":{"state":"The quick brown\n\nˇ\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumpsˇ-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"1"}
-{"Key":"j"}
-{"Get":{"state":"The quick brown\n\nˇ\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-ˇover\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"1"}
-{"Key":"j"}
-{"Get":{"state":"The quick brown\n\nˇ\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-oˇver\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"1"}
-{"Key":"j"}
-{"Get":{"state":"The quick brown\n\nˇ\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-over\nˇthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"1"}
-{"Key":"j"}
-{"Get":{"state":"The quick brown\n\nfox jumps-over\nˇ","mode":"Insert"}}
-{"Put":{"state":"ˇThe quick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"2"}
-{"Key":"j"}
-{"Get":{"state":"ˇ\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quˇick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"2"}
-{"Key":"j"}
-{"Get":{"state":"ˇ\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quickˇ brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"2"}
-{"Key":"j"}
-{"Get":{"state":"ˇ\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick browˇn\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"2"}
-{"Key":"j"}
-{"Get":{"state":"ˇ\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nˇ\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"2"}
-{"Key":"j"}
-{"Get":{"state":"The quick brown\nˇ\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nˇfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"2"}
-{"Key":"j"}
-{"Get":{"state":"The quick brown\n\nˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox ˇjumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"2"}
-{"Key":"j"}
-{"Get":{"state":"The quick brown\n\nˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumpsˇ-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"2"}
-{"Key":"j"}
-{"Get":{"state":"The quick brown\n\nˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-ˇover\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"2"}
-{"Key":"j"}
-{"Get":{"state":"The quick brown\n\nˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-oˇver\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"2"}
-{"Key":"j"}
-{"Get":{"state":"The quick brown\n\nˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-over\nˇthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"2"}
-{"Key":"j"}
-{"Get":{"state":"The quick brown\n\nfox jumps-over\nˇ","mode":"Insert"}}
-{"Put":{"state":"ˇThe quick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"3"}
-{"Key":"j"}
-{"Get":{"state":"ˇ\n","mode":"Insert"}}
-{"Put":{"state":"The quˇick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"3"}
-{"Key":"j"}
-{"Get":{"state":"ˇ\n","mode":"Insert"}}
-{"Put":{"state":"The quickˇ brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"3"}
-{"Key":"j"}
-{"Get":{"state":"ˇ\n","mode":"Insert"}}
-{"Put":{"state":"The quick browˇn\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"3"}
-{"Key":"j"}
-{"Get":{"state":"ˇ\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nˇ\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"3"}
-{"Key":"j"}
-{"Get":{"state":"The quick brown\nˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nˇfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"3"}
-{"Key":"j"}
-{"Get":{"state":"The quick brown\n\nˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox ˇjumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"3"}
-{"Key":"j"}
-{"Get":{"state":"The quick brown\n\nˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumpsˇ-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"3"}
-{"Key":"j"}
-{"Get":{"state":"The quick brown\n\nˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-ˇover\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"3"}
-{"Key":"j"}
-{"Get":{"state":"The quick brown\n\nˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-oˇver\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"3"}
-{"Key":"j"}
-{"Get":{"state":"The quick brown\n\nˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-over\nˇthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"3"}
-{"Key":"j"}
-{"Get":{"state":"The quick brown\n\nfox jumps-over\nˇ","mode":"Insert"}}
-{"Put":{"state":"ˇThe quick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"4"}
-{"Key":"j"}
-{"Get":{"state":"ˇ","mode":"Insert"}}
-{"Put":{"state":"The quˇick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"4"}
-{"Key":"j"}
-{"Get":{"state":"ˇ","mode":"Insert"}}
-{"Put":{"state":"The quickˇ brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"4"}
-{"Key":"j"}
-{"Get":{"state":"ˇ","mode":"Insert"}}
-{"Put":{"state":"The quick browˇn\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"4"}
-{"Key":"j"}
-{"Get":{"state":"ˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nˇ\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"4"}
-{"Key":"j"}
-{"Get":{"state":"The quick brown\nˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nˇfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"4"}
-{"Key":"j"}
-{"Get":{"state":"The quick brown\n\nˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox ˇjumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"4"}
-{"Key":"j"}
-{"Get":{"state":"The quick brown\n\nˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumpsˇ-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"4"}
-{"Key":"j"}
-{"Get":{"state":"The quick brown\n\nˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-ˇover\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"4"}
-{"Key":"j"}
-{"Get":{"state":"The quick brown\n\nˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-oˇver\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"4"}
-{"Key":"j"}
-{"Get":{"state":"The quick brown\n\nˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-over\nˇthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"4"}
-{"Key":"j"}
-{"Get":{"state":"The quick brown\n\nfox jumps-over\nˇ","mode":"Insert"}}
-{"Put":{"state":"ˇThe quick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"5"}
-{"Key":"j"}
-{"Get":{"state":"ˇ","mode":"Insert"}}
-{"Put":{"state":"The quˇick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"5"}
-{"Key":"j"}
-{"Get":{"state":"ˇ","mode":"Insert"}}
-{"Put":{"state":"The quickˇ brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"5"}
-{"Key":"j"}
-{"Get":{"state":"ˇ","mode":"Insert"}}
-{"Put":{"state":"The quick browˇn\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"5"}
-{"Key":"j"}
-{"Get":{"state":"ˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nˇ\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"5"}
-{"Key":"j"}
-{"Get":{"state":"The quick brown\nˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nˇfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"5"}
-{"Key":"j"}
-{"Get":{"state":"The quick brown\n\nˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox ˇjumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"5"}
-{"Key":"j"}
-{"Get":{"state":"The quick brown\n\nˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumpsˇ-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"5"}
-{"Key":"j"}
-{"Get":{"state":"The quick brown\n\nˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-ˇover\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"5"}
-{"Key":"j"}
-{"Get":{"state":"The quick brown\n\nˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-oˇver\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"5"}
-{"Key":"j"}
-{"Get":{"state":"The quick brown\n\nˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-over\nˇthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"5"}
-{"Key":"j"}
-{"Get":{"state":"The quick brown\n\nfox jumps-over\nˇ","mode":"Insert"}}
diff --git a/crates/vim/test_data/test_repeated_cl.json b/crates/vim/test_data/test_repeated_cl.json
deleted file mode 100644
index 397a364e5a..0000000000
--- a/crates/vim/test_data/test_repeated_cl.json
+++ /dev/null
@@ -1,275 +0,0 @@
-{"Put":{"state":"ˇThe quick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"1"}
-{"Key":"l"}
-{"Get":{"state":"ˇhe quick brown\n\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quˇick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"1"}
-{"Key":"l"}
-{"Get":{"state":"The quˇck brown\n\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quickˇ brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"1"}
-{"Key":"l"}
-{"Get":{"state":"The quickˇbrown\n\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick browˇn\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"1"}
-{"Key":"l"}
-{"Get":{"state":"The quick browˇ\n\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nˇ\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"1"}
-{"Key":"l"}
-{"Get":{"state":"The quick brown\nˇ\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nˇfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"1"}
-{"Key":"l"}
-{"Get":{"state":"The quick brown\n\nˇox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox ˇjumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"1"}
-{"Key":"l"}
-{"Get":{"state":"The quick brown\n\nfox ˇumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumpsˇ-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"1"}
-{"Key":"l"}
-{"Get":{"state":"The quick brown\n\nfox jumpsˇover\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-ˇover\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"1"}
-{"Key":"l"}
-{"Get":{"state":"The quick brown\n\nfox jumps-ˇver\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-oˇver\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"1"}
-{"Key":"l"}
-{"Get":{"state":"The quick brown\n\nfox jumps-oˇer\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-over\nˇthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"1"}
-{"Key":"l"}
-{"Get":{"state":"The quick brown\n\nfox jumps-over\nˇhe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"ˇThe quick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"2"}
-{"Key":"l"}
-{"Get":{"state":"ˇe quick brown\n\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quˇick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"2"}
-{"Key":"l"}
-{"Get":{"state":"The quˇk brown\n\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quickˇ brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"2"}
-{"Key":"l"}
-{"Get":{"state":"The quickˇrown\n\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick browˇn\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"2"}
-{"Key":"l"}
-{"Get":{"state":"The quick browˇ\n\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nˇ\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"2"}
-{"Key":"l"}
-{"Get":{"state":"The quick brown\nˇ\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nˇfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"2"}
-{"Key":"l"}
-{"Get":{"state":"The quick brown\n\nˇx jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox ˇjumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"2"}
-{"Key":"l"}
-{"Get":{"state":"The quick brown\n\nfox ˇmps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumpsˇ-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"2"}
-{"Key":"l"}
-{"Get":{"state":"The quick brown\n\nfox jumpsˇver\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-ˇover\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"2"}
-{"Key":"l"}
-{"Get":{"state":"The quick brown\n\nfox jumps-ˇer\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-oˇver\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"2"}
-{"Key":"l"}
-{"Get":{"state":"The quick brown\n\nfox jumps-oˇr\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-over\nˇthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"2"}
-{"Key":"l"}
-{"Get":{"state":"The quick brown\n\nfox jumps-over\nˇe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"ˇThe quick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"3"}
-{"Key":"l"}
-{"Get":{"state":"ˇ quick brown\n\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quˇick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"3"}
-{"Key":"l"}
-{"Get":{"state":"The quˇ brown\n\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quickˇ brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"3"}
-{"Key":"l"}
-{"Get":{"state":"The quickˇown\n\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick browˇn\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"3"}
-{"Key":"l"}
-{"Get":{"state":"The quick browˇ\n\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nˇ\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"3"}
-{"Key":"l"}
-{"Get":{"state":"The quick brown\nˇ\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nˇfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"3"}
-{"Key":"l"}
-{"Get":{"state":"The quick brown\n\nˇ jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox ˇjumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"3"}
-{"Key":"l"}
-{"Get":{"state":"The quick brown\n\nfox ˇps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumpsˇ-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"3"}
-{"Key":"l"}
-{"Get":{"state":"The quick brown\n\nfox jumpsˇer\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-ˇover\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"3"}
-{"Key":"l"}
-{"Get":{"state":"The quick brown\n\nfox jumps-ˇr\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-oˇver\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"3"}
-{"Key":"l"}
-{"Get":{"state":"The quick brown\n\nfox jumps-oˇ\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-over\nˇthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"3"}
-{"Key":"l"}
-{"Get":{"state":"The quick brown\n\nfox jumps-over\nˇ lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"ˇThe quick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"4"}
-{"Key":"l"}
-{"Get":{"state":"ˇquick brown\n\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quˇick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"4"}
-{"Key":"l"}
-{"Get":{"state":"The quˇbrown\n\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quickˇ brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"4"}
-{"Key":"l"}
-{"Get":{"state":"The quickˇwn\n\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick browˇn\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"4"}
-{"Key":"l"}
-{"Get":{"state":"The quick browˇ\n\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nˇ\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"4"}
-{"Key":"l"}
-{"Get":{"state":"The quick brown\nˇ\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nˇfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"4"}
-{"Key":"l"}
-{"Get":{"state":"The quick brown\n\nˇjumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox ˇjumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"4"}
-{"Key":"l"}
-{"Get":{"state":"The quick brown\n\nfox ˇs-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumpsˇ-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"4"}
-{"Key":"l"}
-{"Get":{"state":"The quick brown\n\nfox jumpsˇr\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-ˇover\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"4"}
-{"Key":"l"}
-{"Get":{"state":"The quick brown\n\nfox jumps-ˇ\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-oˇver\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"4"}
-{"Key":"l"}
-{"Get":{"state":"The quick brown\n\nfox jumps-oˇ\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-over\nˇthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"4"}
-{"Key":"l"}
-{"Get":{"state":"The quick brown\n\nfox jumps-over\nˇlazy dog\n","mode":"Insert"}}
-{"Put":{"state":"ˇThe quick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"5"}
-{"Key":"l"}
-{"Get":{"state":"ˇuick brown\n\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quˇick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"5"}
-{"Key":"l"}
-{"Get":{"state":"The quˇrown\n\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quickˇ brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"5"}
-{"Key":"l"}
-{"Get":{"state":"The quickˇn\n\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick browˇn\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"5"}
-{"Key":"l"}
-{"Get":{"state":"The quick browˇ\n\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nˇ\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"5"}
-{"Key":"l"}
-{"Get":{"state":"The quick brown\nˇ\nfox jumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nˇfox jumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"5"}
-{"Key":"l"}
-{"Get":{"state":"The quick brown\n\nˇumps-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox ˇjumps-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"5"}
-{"Key":"l"}
-{"Get":{"state":"The quick brown\n\nfox ˇ-over\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumpsˇ-over\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"5"}
-{"Key":"l"}
-{"Get":{"state":"The quick brown\n\nfox jumpsˇ\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-ˇover\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"5"}
-{"Key":"l"}
-{"Get":{"state":"The quick brown\n\nfox jumps-ˇ\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-oˇver\nthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"5"}
-{"Key":"l"}
-{"Get":{"state":"The quick brown\n\nfox jumps-oˇ\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-over\nˇthe lazy dog\n"}}
-{"Key":"c"}
-{"Key":"5"}
-{"Key":"l"}
-{"Get":{"state":"The quick brown\n\nfox jumps-over\nˇazy dog\n","mode":"Insert"}}
diff --git a/crates/vim/test_data/test_repeated_word.json b/crates/vim/test_data/test_repeated_word.json
deleted file mode 100644
index caa7ed7367..0000000000
--- a/crates/vim/test_data/test_repeated_word.json
+++ /dev/null
@@ -1,214 +0,0 @@
-{"Put":{"state":"ˇThe quick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"1"}
-{"Key":"w"}
-{"Get":{"state":"The ˇquick brown\n\nfox jumps-over\nthe lazy dog\n","mode":"Normal"}}
-{"Put":{"state":"The quˇick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"1"}
-{"Key":"w"}
-{"Get":{"state":"The quick ˇbrown\n\nfox jumps-over\nthe lazy dog\n","mode":"Normal"}}
-{"Put":{"state":"The quickˇ brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"1"}
-{"Key":"w"}
-{"Get":{"state":"The quick ˇbrown\n\nfox jumps-over\nthe lazy dog\n","mode":"Normal"}}
-{"Put":{"state":"The quick browˇn\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"1"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\nˇ\nfox jumps-over\nthe lazy dog\n","mode":"Normal"}}
-{"Key":"1"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nˇfox jumps-over\nthe lazy dog\n","mode":"Normal"}}
-{"Key":"1"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nfox ˇjumps-over\nthe lazy dog\n","mode":"Normal"}}
-{"Key":"1"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nfox jumpsˇ-over\nthe lazy dog\n","mode":"Normal"}}
-{"Key":"1"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nfox jumps-ˇover\nthe lazy dog\n","mode":"Normal"}}
-{"Key":"1"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nfox jumps-over\nˇthe lazy dog\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-oˇver\nthe lazy dog\n"}}
-{"Key":"1"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nfox jumps-over\nˇthe lazy dog\n","mode":"Normal"}}
-{"Key":"1"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nfox jumps-over\nthe ˇlazy dog\n","mode":"Normal"}}
-{"Put":{"state":"ˇThe quick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"2"}
-{"Key":"w"}
-{"Get":{"state":"The quick ˇbrown\n\nfox jumps-over\nthe lazy dog\n","mode":"Normal"}}
-{"Put":{"state":"The quˇick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"2"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\nˇ\nfox jumps-over\nthe lazy dog\n","mode":"Normal"}}
-{"Put":{"state":"The quickˇ brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"2"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\nˇ\nfox jumps-over\nthe lazy dog\n","mode":"Normal"}}
-{"Put":{"state":"The quick browˇn\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"2"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nˇfox jumps-over\nthe lazy dog\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown\nˇ\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"2"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nfox ˇjumps-over\nthe lazy dog\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown\n\nˇfox jumps-over\nthe lazy dog\n"}}
-{"Key":"2"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nfox jumpsˇ-over\nthe lazy dog\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown\n\nfox ˇjumps-over\nthe lazy dog\n"}}
-{"Key":"2"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nfox jumps-ˇover\nthe lazy dog\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown\n\nfox jumpsˇ-over\nthe lazy dog\n"}}
-{"Key":"2"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nfox jumps-over\nˇthe lazy dog\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-ˇover\nthe lazy dog\n"}}
-{"Key":"2"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nfox jumps-over\nthe ˇlazy dog\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-oˇver\nthe lazy dog\n"}}
-{"Key":"2"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nfox jumps-over\nthe ˇlazy dog\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-over\nˇthe lazy dog\n"}}
-{"Key":"2"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nfox jumps-over\nthe lazy ˇdog\n","mode":"Normal"}}
-{"Put":{"state":"ˇThe quick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"3"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\nˇ\nfox jumps-over\nthe lazy dog\n","mode":"Normal"}}
-{"Put":{"state":"The quˇick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"3"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nˇfox jumps-over\nthe lazy dog\n","mode":"Normal"}}
-{"Put":{"state":"The quickˇ brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"3"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nˇfox jumps-over\nthe lazy dog\n","mode":"Normal"}}
-{"Put":{"state":"The quick browˇn\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"3"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nfox ˇjumps-over\nthe lazy dog\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown\nˇ\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"3"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nfox jumpsˇ-over\nthe lazy dog\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown\n\nˇfox jumps-over\nthe lazy dog\n"}}
-{"Key":"3"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nfox jumps-ˇover\nthe lazy dog\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown\n\nfox ˇjumps-over\nthe lazy dog\n"}}
-{"Key":"3"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nfox jumps-over\nˇthe lazy dog\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown\n\nfox jumpsˇ-over\nthe lazy dog\n"}}
-{"Key":"3"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nfox jumps-over\nthe ˇlazy dog\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-ˇover\nthe lazy dog\n"}}
-{"Key":"3"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nfox jumps-over\nthe lazy ˇdog\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-oˇver\nthe lazy dog\n"}}
-{"Key":"3"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nfox jumps-over\nthe lazy ˇdog\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-over\nˇthe lazy dog\n"}}
-{"Key":"3"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nfox jumps-over\nthe lazy dog\nˇ","mode":"Normal"}}
-{"Put":{"state":"ˇThe quick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"4"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nˇfox jumps-over\nthe lazy dog\n","mode":"Normal"}}
-{"Put":{"state":"The quˇick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"4"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nfox ˇjumps-over\nthe lazy dog\n","mode":"Normal"}}
-{"Put":{"state":"The quickˇ brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"4"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nfox ˇjumps-over\nthe lazy dog\n","mode":"Normal"}}
-{"Put":{"state":"The quick browˇn\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"4"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nfox jumpsˇ-over\nthe lazy dog\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown\nˇ\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"4"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nfox jumps-ˇover\nthe lazy dog\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown\n\nˇfox jumps-over\nthe lazy dog\n"}}
-{"Key":"4"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nfox jumps-over\nˇthe lazy dog\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown\n\nfox ˇjumps-over\nthe lazy dog\n"}}
-{"Key":"4"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nfox jumps-over\nthe ˇlazy dog\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown\n\nfox jumpsˇ-over\nthe lazy dog\n"}}
-{"Key":"4"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nfox jumps-over\nthe lazy ˇdog\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-ˇover\nthe lazy dog\n"}}
-{"Key":"4"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nfox jumps-over\nthe lazy dog\nˇ","mode":"Normal"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-oˇver\nthe lazy dog\n"}}
-{"Key":"4"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nfox jumps-over\nthe lazy dog\nˇ","mode":"Normal"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-over\nˇthe lazy dog\n"}}
-{"Key":"4"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nfox jumps-over\nthe lazy dog\nˇ","mode":"Normal"}}
-{"Put":{"state":"ˇThe quick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"5"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nfox ˇjumps-over\nthe lazy dog\n","mode":"Normal"}}
-{"Put":{"state":"The quˇick brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"5"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nfox jumpsˇ-over\nthe lazy dog\n","mode":"Normal"}}
-{"Put":{"state":"The quickˇ brown\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"5"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nfox jumpsˇ-over\nthe lazy dog\n","mode":"Normal"}}
-{"Put":{"state":"The quick browˇn\n\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"5"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nfox jumps-ˇover\nthe lazy dog\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown\nˇ\nfox jumps-over\nthe lazy dog\n"}}
-{"Key":"5"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nfox jumps-over\nˇthe lazy dog\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown\n\nˇfox jumps-over\nthe lazy dog\n"}}
-{"Key":"5"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nfox jumps-over\nthe ˇlazy dog\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown\n\nfox ˇjumps-over\nthe lazy dog\n"}}
-{"Key":"5"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nfox jumps-over\nthe lazy ˇdog\n","mode":"Normal"}}
-{"Put":{"state":"The quick brown\n\nfox jumpsˇ-over\nthe lazy dog\n"}}
-{"Key":"5"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nfox jumps-over\nthe lazy dog\nˇ","mode":"Normal"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-ˇover\nthe lazy dog\n"}}
-{"Key":"5"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nfox jumps-over\nthe lazy dog\nˇ","mode":"Normal"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-oˇver\nthe lazy dog\n"}}
-{"Key":"5"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nfox jumps-over\nthe lazy dog\nˇ","mode":"Normal"}}
-{"Put":{"state":"The quick brown\n\nfox jumps-over\nˇthe lazy dog\n"}}
-{"Key":"5"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n\nfox jumps-over\nthe lazy dog\nˇ","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_replace_g.json b/crates/vim/test_data/test_replace_g.json
deleted file mode 100644
index 583d1f89bc..0000000000
--- a/crates/vim/test_data/test_replace_g.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{"Put":{"state":"ˇaa aa aa aa\naa\naa"}}
-{"Key":":"}
-{"Key":"s"}
-{"Key":"/"}
-{"Key":"a"}
-{"Key":"a"}
-{"Key":"/"}
-{"Key":"b"}
-{"Key":"b"}
-{"Key":"enter"}
-{"Get":{"state":"ˇbb aa aa aa\naa\naa","mode":"Normal"}}
-{"Key":":"}
-{"Key":"s"}
-{"Key":"/"}
-{"Key":"a"}
-{"Key":"a"}
-{"Key":"/"}
-{"Key":"b"}
-{"Key":"b"}
-{"Key":"/"}
-{"Key":"g"}
-{"Key":"enter"}
-{"Get":{"state":"ˇbb bb bb bb\naa\naa","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_replace_mode.json b/crates/vim/test_data/test_replace_mode.json
deleted file mode 100644
index 32b2cc64d3..0000000000
--- a/crates/vim/test_data/test_replace_mode.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{"Put":{"state":"ˇThe quick brown\nfox jumps over\nthe lazy dog."}}
-{"Key":"shift-r"}
-{"Key":"O"}
-{"Key":"n"}
-{"Key":"e"}
-{"Get":{"state":"Oneˇ quick brown\nfox jumps over\nthe lazy dog.","mode":"Replace"}}
-{"Put":{"state":"The quick browˇn\nfox jumps over\nthe lazy dog."}}
-{"Key":"shift-r"}
-{"Key":"O"}
-{"Key":"n"}
-{"Key":"e"}
-{"Get":{"state":"The quick browOneˇ\nfox jumps over\nthe lazy dog.","mode":"Replace"}}
-{"Put":{"state":"The quick brown\nˇ\nfox jumps over\nthe lazy dog."}}
-{"Key":"shift-r"}
-{"Key":"O"}
-{"Key":"n"}
-{"Key":"e"}
-{"Get":{"state":"The quick brown\nOneˇ\nfox jumps over\nthe lazy dog.","mode":"Replace"}}
-{"Put":{"state":"The quˇick brown\nfox jumps over\nthe lazy dog."}}
-{"Key":"shift-r"}
-{"Key":"enter"}
-{"Key":"O"}
-{"Key":"n"}
-{"Key":"e"}
-{"Get":{"state":"The qu\nOneˇ brown\nfox jumps over\nthe lazy dog.","mode":"Replace"}}
diff --git a/crates/vim/test_data/test_replace_mode_repeat.json b/crates/vim/test_data/test_replace_mode_repeat.json
deleted file mode 100644
index ab7cace51c..0000000000
--- a/crates/vim/test_data/test_replace_mode_repeat.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{"Put":{"state":"ˇhello world\n"}}
-{"Key":"shift-r"}
-{"Key":"-"}
-{"Key":"-"}
-{"Key":"-"}
-{"Key":"escape"}
-{"Key":"4"}
-{"Key":"l"}
-{"Key":"."}
-{"Get":{"state":"---lo --ˇ-ld\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_replace_mode_undo.json b/crates/vim/test_data/test_replace_mode_undo.json
deleted file mode 100644
index fbad2f5042..0000000000
--- a/crates/vim/test_data/test_replace_mode_undo.json
+++ /dev/null
@@ -1,93 +0,0 @@
-{"Put":{"state":"ˇThe quick brown fox jumps over the lazy dog."}}
-{"Key":"shift-r"}
-{"Key":"O"}
-{"Key":"n"}
-{"Key":"e"}
-{"Key":"backspace"}
-{"Key":"backspace"}
-{"Key":"backspace"}
-{"Get":{"state":"ˇThe quick brown fox jumps over the lazy dog.","mode":"Replace"}}
-{"Put":{"state":"ˇThe quick brown fox jumps over the lazy dog."}}
-{"Key":"shift-r"}
-{"Key":"O"}
-{"Key":"enter"}
-{"Key":"e"}
-{"Key":"backspace"}
-{"Key":"backspace"}
-{"Key":"backspace"}
-{"Get":{"state":"ˇThe quick brown fox jumps over the lazy dog.","mode":"Replace"}}
-{"Put":{"state":"ˇThe quick brown fox jumps over the lazy dog."}}
-{"Key":"shift-r"}
-{"Key":"O"}
-{"Key":"enter"}
-{"Key":"n"}
-{"Key":"enter"}
-{"Key":"e"}
-{"Key":"backspace"}
-{"Key":"backspace"}
-{"Key":"backspace"}
-{"Key":"backspace"}
-{"Key":"backspace"}
-{"Get":{"state":"ˇThe quick brown fox jumps over the lazy dog.","mode":"Replace"}}
-{"Put":{"state":"The quick browˇn\nfox jumps over\nthe lazy dog."}}
-{"Key":"shift-r"}
-{"Key":"O"}
-{"Key":"n"}
-{"Key":"e"}
-{"Key":"backspace"}
-{"Key":"backspace"}
-{"Key":"backspace"}
-{"Get":{"state":"The quick browˇn\nfox jumps over\nthe lazy dog.","mode":"Replace"}}
-{"Put":{"state":"The quick browˇn\nfox jumps over\nthe lazy dog."}}
-{"Key":"shift-r"}
-{"Key":"O"}
-{"Key":"enter"}
-{"Key":"e"}
-{"Key":"backspace"}
-{"Key":"backspace"}
-{"Key":"backspace"}
-{"Get":{"state":"The quick browˇn\nfox jumps over\nthe lazy dog.","mode":"Replace"}}
-{"Put":{"state":"The quick browˇn\nfox jumps over\nthe lazy dog."}}
-{"Key":"shift-r"}
-{"Key":"O"}
-{"Key":"enter"}
-{"Key":"n"}
-{"Key":"enter"}
-{"Key":"e"}
-{"Key":"backspace"}
-{"Key":"backspace"}
-{"Key":"backspace"}
-{"Key":"backspace"}
-{"Key":"backspace"}
-{"Get":{"state":"The quick browˇn\nfox jumps over\nthe lazy dog.","mode":"Replace"}}
-{"Put":{"state":"The quick brown\nˇ\nfox jumps over\nthe lazy dog."}}
-{"Key":"shift-r"}
-{"Key":"O"}
-{"Key":"n"}
-{"Key":"e"}
-{"Key":"backspace"}
-{"Key":"backspace"}
-{"Key":"backspace"}
-{"Get":{"state":"The quick brown\nˇ\nfox jumps over\nthe lazy dog.","mode":"Replace"}}
-{"Put":{"state":"The quick brown\nˇ\nfox jumps over\nthe lazy dog."}}
-{"Key":"shift-r"}
-{"Key":"O"}
-{"Key":"enter"}
-{"Key":"e"}
-{"Key":"backspace"}
-{"Key":"backspace"}
-{"Key":"backspace"}
-{"Get":{"state":"The quick brown\nˇ\nfox jumps over\nthe lazy dog.","mode":"Replace"}}
-{"Put":{"state":"The quick brown\nˇ\nfox jumps over\nthe lazy dog."}}
-{"Key":"shift-r"}
-{"Key":"O"}
-{"Key":"enter"}
-{"Key":"n"}
-{"Key":"enter"}
-{"Key":"e"}
-{"Key":"backspace"}
-{"Key":"backspace"}
-{"Key":"backspace"}
-{"Key":"backspace"}
-{"Key":"backspace"}
-{"Get":{"state":"The quick brown\nˇ\nfox jumps over\nthe lazy dog.","mode":"Replace"}}
diff --git a/crates/vim/test_data/test_replace_mode_with_counts.json b/crates/vim/test_data/test_replace_mode_with_counts.json
deleted file mode 100644
index d88c856fe3..0000000000
--- a/crates/vim/test_data/test_replace_mode_with_counts.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{"Put":{"state":"ˇhello\n"}}
-{"Key":"3"}
-{"Key":"shift-r"}
-{"Key":"-"}
-{"Key":"escape"}
-{"Get":{"state":"--ˇ-lo\n","mode":"Normal"}}
-{"Put":{"state":"ˇhello\n"}}
-{"Key":"3"}
-{"Key":"shift-r"}
-{"Key":"a"}
-{"Key":"b"}
-{"Key":"c"}
-{"Key":"escape"}
-{"Get":{"state":"abcabcabˇc\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_replace_n.json b/crates/vim/test_data/test_replace_n.json
deleted file mode 100644
index a03c69e9b2..0000000000
--- a/crates/vim/test_data/test_replace_n.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{"Put":{"state":"ˇaa\nbb\naa"}}
-{"Key":":"}
-{"Key":"s"}
-{"Key":"/"}
-{"Key":"b"}
-{"Key":"b"}
-{"Key":"/"}
-{"Key":"d"}
-{"Key":"d"}
-{"Key":"/"}
-{"Key":"n"}
-{"Key":"enter"}
-{"Get":{"state":"ˇaa\nbb\naa","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_replace_with_range.json b/crates/vim/test_data/test_replace_with_range.json
deleted file mode 100644
index 8385af9a7f..0000000000
--- a/crates/vim/test_data/test_replace_with_range.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{"Put":{"state":"ˇa\na\na\na\na\na\na\n "}}
-{"Key":":"}
-{"Key":"2"}
-{"Key":","}
-{"Key":"5"}
-{"Key":"s"}
-{"Key":"/"}
-{"Key":"a"}
-{"Key":"/"}
-{"Key":"b"}
-{"Key":"enter"}
-{"Get":{"state":"a\nb\nb\nb\nˇb\na\na\n ","mode":"Normal"}}
-{"Key":"/"}
-{"Key":"a"}
-{"Key":"enter"}
-{"Get":{"state":"a\nb\nb\nb\nb\nˇa\na\n ","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_replace_with_range_at_start.json b/crates/vim/test_data/test_replace_with_range_at_start.json
deleted file mode 100644
index e3810a7ba2..0000000000
--- a/crates/vim/test_data/test_replace_with_range_at_start.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{"Put":{"state":"ˇa\na\na\na\na\na\na\n "}}
-{"Key":":"}
-{"Key":"2"}
-{"Key":","}
-{"Key":"5"}
-{"Key":"s"}
-{"Key":"/"}
-{"Key":"^"}
-{"Key":"/"}
-{"Key":"b"}
-{"Key":"enter"}
-{"Get":{"state":"a\nba\nba\nba\nˇba\na\na\n ","mode":"Normal"}}
-{"Key":"/"}
-{"Key":"a"}
-{"Key":"enter"}
-{"Get":{"state":"a\nba\nba\nba\nbˇa\na\na\n ","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_scroll_beyond_last_line.json b/crates/vim/test_data/test_scroll_beyond_last_line.json
deleted file mode 100644
index e983bda3f2..0000000000
--- a/crates/vim/test_data/test_scroll_beyond_last_line.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{"SetOption":{"value":"scrolloff=3"}}
-{"SetOption":{"value":"lines=12"}}
-{"Put":{"state":"ˇaa\nbb\ncc\ndd\nee\nff\ngg\nhh\nii\njj\nkk\nll\nmm\nnn\noo\npp\nqq\nrr\nss\ntt\nuu\nvv\nww\nxx\nyy\nzz"}}
-{"Key":"shift-g"}
-{"Key":"k"}
-{"Get":{"state":"aa\nbb\ncc\ndd\nee\nff\ngg\nhh\nii\njj\nkk\nll\nmm\nnn\noo\npp\nqq\nrr\nss\ntt\nuu\nvv\nww\nxx\nˇyy\nzz","mode":"Normal"}}
-{"Key":"ctrl-d"}
-{"Get":{"state":"aa\nbb\ncc\ndd\nee\nff\ngg\nhh\nii\njj\nkk\nll\nmm\nnn\noo\npp\nqq\nrr\nss\ntt\nuu\nvv\nww\nxx\nyy\nˇzz","mode":"Normal"}}
-{"Key":"shift-g"}
-{"Get":{"state":"aa\nbb\ncc\ndd\nee\nff\ngg\nhh\nii\njj\nkk\nll\nmm\nnn\noo\npp\nqq\nrr\nss\ntt\nuu\nvv\nww\nxx\nyy\nˇzz","mode":"Normal"}}
-{"Key":"ctrl-u"}
-{"Get":{"state":"aa\nbb\ncc\ndd\nee\nff\ngg\nhh\nii\njj\nkk\nll\nmm\nnn\noo\npp\nqq\nˇrr\nss\ntt\nuu\nvv\nww\nxx\nyy\nzz","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_scroll_jumps.json b/crates/vim/test_data/test_scroll_jumps.json
deleted file mode 100644
index 8d44457bf9..0000000000
--- a/crates/vim/test_data/test_scroll_jumps.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{"SetOption":{"value":"scrolloff=3"}}
-{"SetOption":{"value":"lines=22"}}
-{"Put":{"state":"ˇaa\nbb\ncc\ndd\nee\nff\ngg\nhh\nii\njj\nkk\nll\nmm\nnn\noo\npp\nqq\nrr\nss\ntt\nuu\nvv\nww\nxx\nyy\nzz\n{{\n||\n}}\n~~\n\n€€\n\n‚‚\nƒƒ\n„„\n……\n††\n‡‡\nˆˆ\n‰‰\nŠŠ\n‹‹\nŒŒ\n\nŽŽ\n\n\n‘‘\n’’\n““\n””"}}
-{"Key":"shift-g"}
-{"Key":"g"}
-{"Key":"g"}
-{"Key":"ctrl-d"}
-{"Key":"ctrl-d"}
-{"Key":"ctrl-o"}
-{"Get":{"state":"aa\nbb\ncc\ndd\nee\nff\ngg\nhh\nii\njj\nkk\nll\nmm\nnn\noo\npp\nqq\nrr\nss\ntt\nuu\nvv\nww\nxx\nyy\nzz\n{{\n||\n}}\n~~\n\n€€\n\n‚‚\nƒƒ\n„„\n……\n††\n‡‡\nˆˆ\n‰‰\nŠŠ\n‹‹\nŒŒ\n\nŽŽ\n\n\n‘‘\n’’\n““\nˇ””","mode":"Normal"}}
-{"Key":"ctrl-o"}
-{"Get":{"state":"ˇaa\nbb\ncc\ndd\nee\nff\ngg\nhh\nii\njj\nkk\nll\nmm\nnn\noo\npp\nqq\nrr\nss\ntt\nuu\nvv\nww\nxx\nyy\nzz\n{{\n||\n}}\n~~\n\n€€\n\n‚‚\nƒƒ\n„„\n……\n††\n‡‡\nˆˆ\n‰‰\nŠŠ\n‹‹\nŒŒ\n\nŽŽ\n\n\n‘‘\n’’\n““\n””","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_search_skipping.json b/crates/vim/test_data/test_search_skipping.json
deleted file mode 100644
index 6dae5e909f..0000000000
--- a/crates/vim/test_data/test_search_skipping.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{"Put":{"state":"ˇaa aa aa"}}
-{"Key":"/"}
-{"Key":"a"}
-{"Key":"a"}
-{"Key":"enter"}
-{"Get":{"state":"aa ˇaa aa","mode":"Normal"}}
-{"Key":"left"}
-{"Key":"/"}
-{"Key":"a"}
-{"Key":"a"}
-{"Key":"enter"}
-{"Get":{"state":"aa ˇaa aa","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_selection_goal.json b/crates/vim/test_data/test_selection_goal.json
deleted file mode 100644
index ada2ab4c8e..0000000000
--- a/crates/vim/test_data/test_selection_goal.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{"Put":{"state":";;ˇ;\nLorem Ipsum"}}
-{"Key":"a"}
-{"Key":"down"}
-{"Key":"up"}
-{"Key":";"}
-{"Key":"down"}
-{"Key":"up"}
-{"Get":{"state":";;;;ˇ\nLorem Ipsum","mode":"Insert"}}
diff --git a/crates/vim/test_data/test_sentence_backwards.json b/crates/vim/test_data/test_sentence_backwards.json
deleted file mode 100644
index 3126c3d39c..0000000000
--- a/crates/vim/test_data/test_sentence_backwards.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{"Put":{"state":"one\n\ntwo\nthree\nˇ\nfour"}}
-{"Key":"("}
-{"Get":{"state":"one\n\nˇtwo\nthree\n\nfour","mode":"Normal"}}
-{"Put":{"state":"hello.\n\n\nworˇld."}}
-{"Key":"("}
-{"Get":{"state":"hello.\n\n\nˇworld.","mode":"Normal"}}
-{"Key":"("}
-{"Get":{"state":"hello.\n\nˇ\nworld.","mode":"Normal"}}
-{"Key":"("}
-{"Get":{"state":"ˇhello.\n\n\nworld.","mode":"Normal"}}
-{"Put":{"state":"hello. worlˇd."}}
-{"Key":"("}
-{"Get":{"state":"hello. ˇworld.","mode":"Normal"}}
-{"Key":"("}
-{"Get":{"state":"ˇhello. world.","mode":"Normal"}}
-{"Put":{"state":". helˇlo."}}
-{"Key":"("}
-{"Get":{"state":". ˇhello.","mode":"Normal"}}
-{"Key":"("}
-{"Get":{"state":". ˇhello.","mode":"Normal"}}
-{"Put":{"state":"{\n    hello_world();\nˇ}"}}
-{"Key":"("}
-{"Get":{"state":"ˇ{\n    hello_world();\n}","mode":"Normal"}}
-{"Put":{"state":"Hello! World..?\n\n\tHello! World... ˇ"}}
-{"Key":"("}
-{"Get":{"state":"Hello! World..?\n\n\tHello! ˇWorld... ","mode":"Normal"}}
-{"Key":"("}
-{"Get":{"state":"Hello! World..?\n\n\tˇHello! World... ","mode":"Normal"}}
-{"Key":"("}
-{"Get":{"state":"Hello! World..?\nˇ\n\tHello! World... ","mode":"Normal"}}
-{"Key":"("}
-{"Get":{"state":"Hello! ˇWorld..?\n\n\tHello! World... ","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_sentence_forwards.json b/crates/vim/test_data/test_sentence_forwards.json
deleted file mode 100644
index 47939aae37..0000000000
--- a/crates/vim/test_data/test_sentence_forwards.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{"Put":{"state":"helˇlo.\n\n\nworld."}}
-{"Key":")"}
-{"Get":{"state":"hello.\nˇ\n\nworld.","mode":"Normal"}}
-{"Key":")"}
-{"Get":{"state":"hello.\n\n\nˇworld.","mode":"Normal"}}
-{"Key":")"}
-{"Get":{"state":"hello.\n\n\nworldˇ.","mode":"Normal"}}
-{"Put":{"state":"helˇlo.\n\n\nworld."}}
diff --git a/crates/vim/test_data/test_shift_y.json b/crates/vim/test_data/test_shift_y.json
deleted file mode 100644
index f68f1df18d..0000000000
--- a/crates/vim/test_data/test_shift_y.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{"Put":{"state":"The ˇquick brown\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"w"}
-{"Key":"shift-y"}
-{"Get":{"state":"ˇThe quick brown\n","mode":"Normal"}}
-{"ReadRegister":{"name":"\"","value":"The quick brown\n"}}
diff --git a/crates/vim/test_data/test_singleline_surrounding_character_objects.json b/crates/vim/test_data/test_singleline_surrounding_character_objects.json
deleted file mode 100644
index 2499786c72..0000000000
--- a/crates/vim/test_data/test_singleline_surrounding_character_objects.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{"SetOption":{"value":"wrap"}}
-{"SetOption":{"value":"columns=12"}}
-{"Put":{"state":"\"ˇhello world\"!"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"\"«hello worldˇ»\"!","mode":"Visual"}}
-{"Put":{"state":"\"hˇello world\"!"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"\"«hello worldˇ»\"!","mode":"Visual"}}
-{"Put":{"state":"helˇlo \"world\"!"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"hello \"«worldˇ»\"!","mode":"Visual"}}
-{"Put":{"state":"hello \"wˇorld\"!"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"hello \"«worldˇ»\"!","mode":"Visual"}}
-{"Put":{"state":"hello \"wˇorld\"!"}}
-{"Key":"v"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"hello« \"world\"ˇ»!","mode":"Visual"}}
-{"Put":{"state":"hello \"wˇorld\" !"}}
-{"Key":"v"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"hello «\"world\" ˇ»!","mode":"Visual"}}
-{"Put":{"state":"hello \"wˇorld\"•\ngoodbye"}}
-{"Key":"v"}
-{"Key":"a"}
-{"Key":"\""}
-{"Get":{"state":"hello «\"world\" ˇ»\ngoodbye","mode":"Visual"}}
diff --git a/crates/vim/test_data/test_singleline_surrounding_character_objects_with_escape.json b/crates/vim/test_data/test_singleline_surrounding_character_objects_with_escape.json
deleted file mode 100644
index 0de952ac91..0000000000
--- a/crates/vim/test_data/test_singleline_surrounding_character_objects_with_escape.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{"Put":{"state":"h\"e\\\"lˇlo \\\"world\"!"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"h\"«e\\\"llo \\\"worldˇ»\"!","mode":"Visual"}}
-{"Put":{"state":"hello \"teˇst \\\"inside\\\" world\""}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"\""}
-{"Get":{"state":"hello \"«test \\\"inside\\\" worldˇ»\"","mode":"Visual"}}
diff --git a/crates/vim/test_data/test_space_non_ascii.json b/crates/vim/test_data/test_space_non_ascii.json
deleted file mode 100644
index 9caed6cb59..0000000000
--- a/crates/vim/test_data/test_space_non_ascii.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{"Put":{"state":"ˇπππππ"}}
-{"Key":"3"}
-{"Key":"space"}
-{"Get":{"state":"πππˇππ","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_space_non_ascii_eol.json b/crates/vim/test_data/test_space_non_ascii_eol.json
deleted file mode 100644
index 6c1bb73fa5..0000000000
--- a/crates/vim/test_data/test_space_non_ascii_eol.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{"Put":{"state":"ππππˇπ\nπanotherline"}}
-{"Key":"4"}
-{"Key":"space"}
-{"Get":{"state":"πππππ\nπanˇotherline","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_space_only_ascii_eol.json b/crates/vim/test_data/test_space_only_ascii_eol.json
deleted file mode 100644
index 43a3af7945..0000000000
--- a/crates/vim/test_data/test_space_only_ascii_eol.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{"Put":{"state":"aaaaˇaa\nanotherline"}}
-{"Key":"4"}
-{"Key":"space"}
-{"Get":{"state":"aaaaaa\nanˇotherline","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_special_registers.json b/crates/vim/test_data/test_special_registers.json
deleted file mode 100644
index 35f181a05c..0000000000
--- a/crates/vim/test_data/test_special_registers.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{"Put":{"state":"The quick brown\nfox jˇumps over\nthe lazy dog"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\nfox ˇ over\nthe lazy dog","mode":"Normal"}}
-{"ReadRegister":{"name":"-","value":"jumps"}}
-{"Key":"\""}
-{"Key":"_"}
-{"Key":"d"}
-{"Key":"d"}
-{"Get":{"state":"The quick brown\nthe ˇlazy dog","mode":"Normal"}}
-{"ReadRegister":{"name":"_","value":""}}
-{"Key":"shift-v"}
-{"Key":"\""}
-{"Key":"_"}
-{"Key":"y"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\nthe ˇlazy dog","mode":"Normal"}}
-{"ReadRegister":{"name":"\"","value":"jumps"}}
-{"Get":{"state":"The quick brown\nthe ˇlazy dog","mode":"Normal"}}
-{"Key":"\""}
-{"Key":"\""}
-{"Key":"d"}
-{"Key":"^"}
-{"Get":{"state":"The quick brown\nˇlazy dog","mode":"Normal"}}
-{"ReadRegister":{"name":"0","value":"the "}}
-{"Get":{"state":"The quick brown\nˇlazy dog","mode":"Normal"}}
-{"ReadRegister":{"name":"\"","value":"the "}}
-{"Key":"^"}
-{"Key":"\""}
-{"Key":"+"}
-{"Key":"d"}
-{"Key":"$"}
-{"Get":{"state":"The quick brown\nˇ","mode":"Normal"}}
-{"ReadRegister":{"name":"\"","value":"lazy dog"}}
-{"Get":{"state":"The quick brown\nˇ","mode":"Normal"}}
-{"ReadRegister":{"name":"\"","value":"lazy dog"}}
-{"Key":"/"}
-{"Key":"d"}
-{"Key":"o"}
-{"Key":"g"}
-{"Key":"enter"}
-{"Get":{"state":"The quick brown\nˇ","mode":"Normal"}}
-{"ReadRegister":{"name":"/","value":"dog"}}
-{"Key":"\""}
-{"Key":"/"}
-{"Key":"shift-p"}
-{"Get":{"state":"The quick brown\ndoˇg","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_start_end_of_paragraph.json b/crates/vim/test_data/test_start_end_of_paragraph.json
deleted file mode 100644
index 0de4d84f50..0000000000
--- a/crates/vim/test_data/test_start_end_of_paragraph.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{"Put":{"state":"ˇabc\ndef\n\nparagraph\nthe second\n\n\n\nthird and\nfinal"}}
-{"Key":"}"}
-{"Get":{"state":"abc\ndef\nˇ\nparagraph\nthe second\n\n\n\nthird and\nfinal","mode":"Normal"}}
-{"Key":"{"}
-{"Get":{"state":"ˇabc\ndef\n\nparagraph\nthe second\n\n\n\nthird and\nfinal","mode":"Normal"}}
-{"Key":"2"}
-{"Key":"}"}
-{"Get":{"state":"abc\ndef\n\nparagraph\nthe second\nˇ\n\n\nthird and\nfinal","mode":"Normal"}}
-{"Key":"}"}
-{"Get":{"state":"abc\ndef\n\nparagraph\nthe second\n\n\n\nthird and\nfinaˇl","mode":"Normal"}}
-{"Key":"2"}
-{"Key":"{"}
-{"Get":{"state":"abc\ndef\nˇ\nparagraph\nthe second\n\n\n\nthird and\nfinal","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_substitute_line.json b/crates/vim/test_data/test_substitute_line.json
deleted file mode 100644
index eb0a9825f8..0000000000
--- a/crates/vim/test_data/test_substitute_line.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{"Put":{"state":"The quick brown\nfox juˇmps over\nthe lazy dog\n"}}
-{"Key":"shift-s"}
-{"Key":"o"}
-{"Get":{"state":"The quick brown\noˇ\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nfox juˇmps over\nthe lazy dog\n"}}
-{"Key":"v"}
-{"Key":"k"}
-{"Key":"shift-s"}
-{"Key":"o"}
-{"Get":{"state":"oˇ\nthe lazy dog\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nfox juˇmps over\nthe lazy dog\n"}}
-{"Key":"ctrl-v"}
-{"Key":"j"}
-{"Key":"shift-s"}
-{"Key":"o"}
-{"Get":{"state":"The quick brown\noˇ\n","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nfox juˇmps over\nthe lazy dog\n"}}
-{"Key":"v"}
-{"Key":"$"}
-{"Key":"shift-s"}
-{"Key":"o"}
-{"Get":{"state":"The quick brown\noˇ\nthe lazy dog\n","mode":"Insert"}}
-{"SetOption":{"value":"shiftwidth=4"}}
-{"Put":{"state":"The quick brown\nfox juˇmps over\nthe lazy dog\n"}}
-{"Key":">"}
-{"Key":">"}
-{"Key":"shift-s"}
-{"Key":"o"}
-{"Get":{"state":"The quick brown\n    oˇ\nthe lazy dog\n","mode":"Insert"}}
diff --git a/crates/vim/test_data/test_temporary_mode.json b/crates/vim/test_data/test_temporary_mode.json
deleted file mode 100644
index be370cf744..0000000000
--- a/crates/vim/test_data/test_temporary_mode.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{"Put":{"state":"lorem ˇipsum"}}
-{"Key":"i"}
-{"Get":{"state":"lorem ˇipsum","mode":"Insert"}}
-{"Key":"ctrl-o"}
-{"Key":"$"}
-{"Get":{"state":"lorem ipsumˇ","mode":"Insert"}}
-{"Put":{"state":"loremˇ ipsum dolor"}}
-{"Key":"a"}
-{"Get":{"state":"lorem ˇipsum dolor","mode":"Insert"}}
-{"Key":"a"}
-{"Key":"n"}
-{"Key":"d"}
-{"Key":"space"}
-{"Key":"ctrl-o"}
-{"Key":"w"}
-{"Get":{"state":"lorem and ipsum ˇdolor","mode":"Insert"}}
-{"Put":{"state":"lorem ˇipsum dolor"}}
-{"Key":"i"}
-{"Get":{"state":"lorem ˇipsum dolor","mode":"Insert"}}
-{"Key":"a"}
-{"Key":"n"}
-{"Key":"d"}
-{"Key":"space"}
-{"Key":"ctrl-o"}
-{"Key":"y"}
-{"Key":"$"}
-{"Get":{"state":"lorem and ˇipsum dolor","mode":"Insert"}}
diff --git a/crates/vim/test_data/test_undo.json b/crates/vim/test_data/test_undo.json
deleted file mode 100644
index e7f275743e..0000000000
--- a/crates/vim/test_data/test_undo.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{"Put":{"state":"hello quˇoel world"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"w"}
-{"Key":"s"}
-{"Key":"c"}
-{"Key":"o"}
-{"Key":"escape"}
-{"Key":"u"}
-{"Get":{"state":"hello ˇquoel world","mode":"Normal"}}
-{"Key":"ctrl-r"}
-{"Get":{"state":"hello ˇco world","mode":"Normal"}}
-{"Key":"a"}
-{"Key":"o"}
-{"Key":"right"}
-{"Key":"l"}
-{"Key":"escape"}
-{"Get":{"state":"hello cooˇl world","mode":"Normal"}}
-{"Key":"u"}
-{"Get":{"state":"hello cooˇ world","mode":"Normal"}}
-{"Key":"u"}
-{"Get":{"state":"hello cˇo world","mode":"Normal"}}
-{"Key":"u"}
-{"Get":{"state":"hello ˇquoel world","mode":"Normal"}}
-{"Put":{"state":"hello quˇoel world"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"w"}
-{"Key":"~"}
-{"Key":"u"}
-{"Get":{"state":"hello ˇquoel world","mode":"Normal"}}
-{"Put":{"state":"\nhello quˇoel world\n"}}
-{"Key":"shift-v"}
-{"Key":"s"}
-{"Key":"c"}
-{"Key":"escape"}
-{"Key":"u"}
-{"Get":{"state":"\nˇhello quoel world\n","mode":"Normal"}}
-{"Put":{"state":"ˇ1\n2\n3"}}
-{"Key":"ctrl-v"}
-{"Key":"shift-g"}
-{"Key":"ctrl-a"}
-{"Get":{"state":"ˇ2\n3\n4","mode":"Normal"}}
-{"Key":"u"}
-{"Get":{"state":"ˇ1\n2\n3","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_undo_last_line.json b/crates/vim/test_data/test_undo_last_line.json
deleted file mode 100644
index a2f6fc0995..0000000000
--- a/crates/vim/test_data/test_undo_last_line.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{"Put":{"state":"ˇfn a() { }\nfn a() { }\nfn a() { }\n"}}
-{"Key":"shift-g"}
-{"Get":{"state":"fn a() { }\nfn a() { }\nfn a() { }\nˇ","mode":"Normal"}}
-{"Key":"r"}
-{"Key":"a"}
-{"Get":{"state":"fn a() { }\nfn a() { }\nfn a() { }\nˇ","mode":"Normal"}}
-{"Key":"shift-u"}
-{"Get":{"state":"ˇ\nfn a() { }\nfn a() { }\n","mode":"Normal"}}
-{"Key":"shift-u"}
-{"Get":{"state":"ˇfn a() { }\nfn a() { }\nfn a() { }\n","mode":"Normal"}}
-{"Key":"g"}
-{"Key":"g"}
-{"Key":"shift-u"}
-{"Get":{"state":"ˇ\nfn a() { }\nfn a() { }\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_undo_last_line_newline.json b/crates/vim/test_data/test_undo_last_line_newline.json
deleted file mode 100644
index 2b21ccef09..0000000000
--- a/crates/vim/test_data/test_undo_last_line_newline.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{"Put":{"state":"ˇfn a() { }\nfn a() { }\nfn a() { }\n"}}
-{"Key":"shift-g"}
-{"Key":"k"}
-{"Get":{"state":"fn a() { }\nfn a() { }\nˇfn a() { }\n","mode":"Normal"}}
-{"Key":"o"}
-{"Key":"h"}
-{"Key":"e"}
-{"Key":"l"}
-{"Key":"l"}
-{"Key":"o"}
-{"Key":"escape"}
-{"Get":{"state":"fn a() { }\nfn a() { }\nfn a() { }\nhellˇo\n","mode":"Normal"}}
-{"Key":"shift-u"}
-{"Get":{"state":"fn a() { }\nfn a() { }\nfn a() { }\nˇ\n","mode":"Normal"}}
-{"Key":"shift-u"}
diff --git a/crates/vim/test_data/test_undo_last_line_newline_many_changes.json b/crates/vim/test_data/test_undo_last_line_newline_many_changes.json
deleted file mode 100644
index 6615e8d79a..0000000000
--- a/crates/vim/test_data/test_undo_last_line_newline_many_changes.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{"Put":{"state":"ˇfn a() { }\nfn a() { }\nfn a() { }\n"}}
-{"Key":"x"}
-{"Key":"shift-g"}
-{"Key":"k"}
-{"Get":{"state":"n a() { }\nfn a() { }\nˇfn a() { }\n","mode":"Normal"}}
-{"Key":"x"}
-{"Key":"f"}
-{"Key":"a"}
-{"Key":"x"}
-{"Key":"f"}
-{"Key":"{"}
-{"Key":"x"}
-{"Get":{"state":"n a() { }\nfn a() { }\nn () ˇ }\n","mode":"Normal"}}
-{"Key":"shift-u"}
-{"Get":{"state":"n a() { }\nfn a() { }\nˇfn a() { }\n","mode":"Normal"}}
-{"Key":"shift-u"}
-{"Get":{"state":"n a() { }\nfn a() { }\nn () ˇ }\n","mode":"Normal"}}
-{"Key":"shift-u"}
-{"Get":{"state":"n a() { }\nfn a() { }\nˇfn a() { }\n","mode":"Normal"}}
-{"Key":"shift-u"}
-{"Get":{"state":"n a() { }\nfn a() { }\nn () ˇ }\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_undo_repeated_insert.json b/crates/vim/test_data/test_undo_repeated_insert.json
deleted file mode 100644
index 98a00968c1..0000000000
--- a/crates/vim/test_data/test_undo_repeated_insert.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{"Put":{"state":"hellˇo"}}
-{"Key":"3"}
-{"Key":"a"}
-{"Key":"."}
-{"Key":"escape"}
-{"Get":{"state":"hello..ˇ.","mode":"Normal"}}
-{"Key":"u"}
-{"Get":{"state":"hellˇo","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_unmatched_backward.json b/crates/vim/test_data/test_unmatched_backward.json
deleted file mode 100644
index bb3825dcd2..0000000000
--- a/crates/vim/test_data/test_unmatched_backward.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{"Put":{"state":"func (a string) {\n    do(something(with<Types>.anˇd_arrays[0, 2]))\n}"}}
-{"Key":"["}
-{"Key":"{"}
-{"Get":{"state":"func (a string) ˇ{\n    do(something(with<Types>.and_arrays[0, 2]))\n}","mode":"Normal"}}
-{"Put":{"state":"func (a string) {\n    do(somethiˇng(with<Types>.and_arrays[0, 2]))\n}"}}
-{"Key":"["}
-{"Key":"("}
-{"Get":{"state":"func (a string) {\n    doˇ(something(with<Types>.and_arrays[0, 2]))\n}","mode":"Normal"}}
-{"Put":{"state":"{{}{} ˇ }"}}
-{"Key":"["}
-{"Key":"{"}
-{"Get":{"state":"ˇ{{}{}  }","mode":"Normal"}}
-{"Put":{"state":"(()() ˇ )"}}
-{"Key":"["}
-{"Key":"("}
-{"Get":{"state":"ˇ(()()  )","mode":"Normal"}}
-{"Put":{"state":"{\n    {()} ˇ\n}"}}
-{"Key":"["}
-{"Key":"{"}
-{"Get":{"state":"ˇ{\n    {()} \n}","mode":"Normal"}}
-{"Put":{"state":"(\n    {()} ˇ\n)"}}
-{"Key":"["}
-{"Key":"("}
-{"Get":{"state":"ˇ(\n    {()} \n)","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_unmatched_backward_markdown.json b/crates/vim/test_data/test_unmatched_backward_markdown.json
deleted file mode 100644
index c2df848b81..0000000000
--- a/crates/vim/test_data/test_unmatched_backward_markdown.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{"Exec":{"command":"set filetype=markdown"}}
-{"Put":{"state":"```rs\nimpl Worktree {\n    pub async fn open_buffers(&self, path: &Path) -> impl Iterator<&Buffer> {\nˇ    }\n}\n```\n"}}
-{"Key":"["}
-{"Key":"{"}
-{"Get":{"state":"```rs\nimpl Worktree {\n    pub async fn open_buffers(&self, path: &Path) -> impl Iterator<&Buffer> ˇ{\n    }\n}\n```\n","mode":"Normal"}}
-{"Put":{"state":"```rs\nimpl Worktree {\n    pub async fn open_buffers(&self, path: &Path) -> impl Iterator<&Buffer> {\n    }   ˇ\n}\n```\n"}}
-{"Key":"["}
-{"Key":"{"}
-{"Get":{"state":"```rs\nimpl Worktree ˇ{\n    pub async fn open_buffers(&self, path: &Path) -> impl Iterator<&Buffer> {\n    }   \n}\n```\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_unmatched_forward.json b/crates/vim/test_data/test_unmatched_forward.json
deleted file mode 100644
index a6b4a38f29..0000000000
--- a/crates/vim/test_data/test_unmatched_forward.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{"Put":{"state":"func (a string) {\n    do(something(with<Types>.anˇd_arrays[0, 2]))\n}"}}
-{"Key":"]"}
-{"Key":"}"}
-{"Get":{"state":"func (a string) {\n    do(something(with<Types>.and_arrays[0, 2]))\nˇ}","mode":"Normal"}}
-{"Put":{"state":"func (a string) {\n    do(somethiˇng(with<Types>.and_arrays[0, 2]))\n}"}}
-{"Key":"]"}
-{"Key":")"}
-{"Get":{"state":"func (a string) {\n    do(something(with<Types>.and_arrays[0, 2])ˇ)\n}","mode":"Normal"}}
-{"Put":{"state":"func (a string) { a((b, cˇ))}"}}
-{"Key":"]"}
-{"Key":")"}
-{"Get":{"state":"func (a string) { a((b, c)ˇ)}","mode":"Normal"}}
-{"Put":{"state":"{ˇ {}{}}"}}
-{"Key":"]"}
-{"Key":"}"}
-{"Get":{"state":"{ {}{}ˇ}","mode":"Normal"}}
-{"Put":{"state":"(ˇ ()())"}}
-{"Key":"]"}
-{"Key":")"}
-{"Get":{"state":"( ()()ˇ)","mode":"Normal"}}
-{"Put":{"state":"{\n    ˇ {()}\n}"}}
-{"Key":"]"}
-{"Key":"}"}
-{"Get":{"state":"{\n     {()}\nˇ}","mode":"Normal"}}
-{"Put":{"state":"(\n    ˇ {()}\n)"}}
-{"Key":"]"}
-{"Key":")"}
-{"Get":{"state":"(\n     {()}\nˇ)","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_unmatched_forward_markdown.json b/crates/vim/test_data/test_unmatched_forward_markdown.json
deleted file mode 100644
index 753f68d04f..0000000000
--- a/crates/vim/test_data/test_unmatched_forward_markdown.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{"Exec":{"command":"set filetype=markdown"}}
-{"Put":{"state":"```rs\nimpl Worktree {\n    pub async fn open_buffers(&self, path: &Path) -> impl Iterator<&Buffer> {\nˇ    }\n}\n```\n"}}
-{"Key":"]"}
-{"Key":"}"}
-{"Get":{"state":"```rs\nimpl Worktree {\n    pub async fn open_buffers(&self, path: &Path) -> impl Iterator<&Buffer> {\n    ˇ}\n}\n```\n","mode":"Normal"}}
-{"Put":{"state":"```rs\nimpl Worktree {\n    pub async fn open_buffers(&self, path: &Path) -> impl Iterator<&Buffer> {\n    }   ˇ\n}\n```\n"}}
-{"Key":"]"}
-{"Key":"}"}
-{"Get":{"state":"```rs\nimpl Worktree {\n    pub async fn open_buffers(&self, path: &Path) -> impl Iterator<&Buffer> {\n    }   \nˇ}\n```\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_v2ap.json b/crates/vim/test_data/test_v2ap.json
deleted file mode 100644
index 7b4d31a5dc..0000000000
--- a/crates/vim/test_data/test_v2ap.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"Put":{"state":"The\nquicˇk\n\nbrown\nfox"}}
-{"Key":"v"}
-{"Key":"2"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"«The\nquick\n\nbrown\nfˇ»ox","mode":"VisualLine"}}
diff --git a/crates/vim/test_data/test_v_search.json b/crates/vim/test_data/test_v_search.json
deleted file mode 100644
index b8af915519..0000000000
--- a/crates/vim/test_data/test_v_search.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{"Put":{"state":"ˇa.c. abcd a.c. abcd"}}
-{"Key":"v"}
-{"Key":"/"}
-{"Key":"c"}
-{"Key":"d"}
-{"Key":"enter"}
-{"Get":{"state":"«a.c. abcˇ»d a.c. abcd","mode":"Visual"}}
-{"Put":{"state":"a a aˇ a a a"}}
-{"Key":"v"}
-{"Key":"/"}
-{"Key":"a"}
-{"Key":"enter"}
-{"Get":{"state":"a a a« aˇ» a a","mode":"Visual"}}
-{"Key":"/"}
-{"Key":"enter"}
-{"Get":{"state":"a a a« a aˇ» a","mode":"Visual"}}
-{"Key":"?"}
-{"Key":"enter"}
-{"Get":{"state":"a a a« aˇ» a a","mode":"Visual"}}
-{"Key":"?"}
-{"Key":"enter"}
-{"Get":{"state":"a a «ˇa »a a a","mode":"Visual"}}
-{"Key":"/"}
-{"Key":"enter"}
-{"Get":{"state":"a a a« aˇ» a a","mode":"Visual"}}
-{"Key":"/"}
-{"Key":"enter"}
-{"Get":{"state":"a a a« a aˇ» a","mode":"Visual"}}
diff --git a/crates/vim/test_data/test_v_search_aa.json b/crates/vim/test_data/test_v_search_aa.json
deleted file mode 100644
index 12d4f51601..0000000000
--- a/crates/vim/test_data/test_v_search_aa.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{"Put":{"state":"ˇaa aa"}}
-{"Key":"v"}
-{"Key":"/"}
-{"Key":"a"}
-{"Key":"a"}
-{"Key":"enter"}
-{"Get":{"state":"«aa aˇ»a","mode":"Visual"}}
diff --git a/crates/vim/test_data/test_visual_block_insert.json b/crates/vim/test_data/test_visual_block_insert.json
deleted file mode 100644
index d3d2689bd3..0000000000
--- a/crates/vim/test_data/test_visual_block_insert.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{"Put":{"state":"ˇThe quick brown\nfox jumps over\nthe lazy dog\n"}}
-{"Key":"ctrl-v"}
-{"Key":"9"}
-{"Key":"down"}
-{"Get":{"state":"«Tˇ»he quick brown\n«fˇ»ox jumps over\n«tˇ»he lazy dog\nˇ","mode":"VisualBlock"}}
-{"Key":"shift-i"}
-{"Key":"k"}
-{"Key":"escape"}
-{"Get":{"state":"ˇkThe quick brown\nkfox jumps over\nkthe lazy dog\nk","mode":"Normal"}}
-{"Put":{"state":"ˇThe quick brown\nfox jumps over\nthe lazy dog\n"}}
-{"Key":"ctrl-v"}
-{"Key":"9"}
-{"Key":"down"}
-{"Get":{"state":"«Tˇ»he quick brown\n«fˇ»ox jumps over\n«tˇ»he lazy dog\nˇ","mode":"VisualBlock"}}
-{"Key":"c"}
-{"Key":"k"}
-{"Key":"escape"}
-{"Get":{"state":"ˇkhe quick brown\nkox jumps over\nkhe lazy dog\nk","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_visual_block_issue_2123.json b/crates/vim/test_data/test_visual_block_issue_2123.json
deleted file mode 100644
index 0f48bcc890..0000000000
--- a/crates/vim/test_data/test_visual_block_issue_2123.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{"Put":{"state":"The ˇquick brown\nfox jumps over\nthe lazy dog\n"}}
-{"Key":"ctrl-v"}
-{"Key":"right"}
-{"Key":"down"}
-{"Get":{"state":"The «quˇ»ick brown\nfox «juˇ»mps over\nthe lazy dog\n","mode":"VisualBlock"}}
diff --git a/crates/vim/test_data/test_visual_block_mode.json b/crates/vim/test_data/test_visual_block_mode.json
deleted file mode 100644
index 2c5ad576c4..0000000000
--- a/crates/vim/test_data/test_visual_block_mode.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{"Put":{"state":"The ˇquick brown\nfox jumps over\nthe lazy dog"}}
-{"Key":"ctrl-v"}
-{"Get":{"state":"The «qˇ»uick brown\nfox jumps over\nthe lazy dog","mode":"VisualBlock"}}
-{"Key":"2"}
-{"Key":"down"}
-{"Get":{"state":"The «qˇ»uick brown\nfox «jˇ»umps over\nthe «lˇ»azy dog","mode":"VisualBlock"}}
-{"Key":"e"}
-{"Get":{"state":"The «quicˇ»k brown\nfox «jumpˇ»s over\nthe «lazyˇ» dog","mode":"VisualBlock"}}
-{"Key":"^"}
-{"Get":{"state":"«ˇThe q»uick brown\n«ˇfox j»umps over\n«ˇthe l»azy dog","mode":"VisualBlock"}}
-{"Key":"$"}
-{"Get":{"state":"The «quick brownˇ»\nfox «jumps overˇ»\nthe «lazy dogˇ»","mode":"VisualBlock"}}
-{"Key":"shift-f"}
-{"Key":"space"}
-{"Get":{"state":"The «quickˇ» brown\nfox «jumpsˇ» over\nthe «lazy ˇ»dog","mode":"VisualBlock"}}
-{"Key":"v"}
-{"Get":{"state":"The «quick brown\nfox jumps over\nthe lazy ˇ»dog","mode":"Visual"}}
-{"Key":"ctrl-v"}
-{"Get":{"state":"The «quickˇ» brown\nfox «jumpsˇ» over\nthe «lazy ˇ»dog","mode":"VisualBlock"}}
-{"Put":{"state":"The ˇquick\nbrown\nfox\njumps over the\n\nlazy dog\n"}}
-{"Key":"ctrl-v"}
-{"Key":"down"}
-{"Key":"down"}
-{"Get":{"state":"The«ˇ q»uick\nbro«ˇwn»\nfoxˇ\njumps over the\n\nlazy dog\n","mode":"VisualBlock"}}
-{"Key":"down"}
-{"Get":{"state":"The «qˇ»uick\nbrow«nˇ»\nfox\njump«sˇ» over the\n\nlazy dog\n","mode":"VisualBlock"}}
-{"Key":"left"}
-{"Get":{"state":"The«ˇ q»uick\nbro«ˇwn»\nfoxˇ\njum«ˇps» over the\n\nlazy dog\n","mode":"VisualBlock"}}
-{"Key":"s"}
-{"Key":"o"}
-{"Key":"escape"}
-{"Get":{"state":"Theˇouick\nbroo\nfoxo\njumo over the\n\nlazy dog\n","mode":"Normal"}}
-{"Put":{"state":"Theˇ quick brown\n\nfox jumps over\nthe lazy dog\n"}}
-{"Key":"l"}
-{"Key":"ctrl-v"}
-{"Key":"j"}
-{"Key":"j"}
-{"Get":{"state":"The «qˇ»uick brown\n\nfox «jˇ»umps over\nthe lazy dog\n","mode":"VisualBlock"}}
diff --git a/crates/vim/test_data/test_visual_block_mode_down_right.json b/crates/vim/test_data/test_visual_block_mode_down_right.json
deleted file mode 100644
index fbb0558a89..0000000000
--- a/crates/vim/test_data/test_visual_block_mode_down_right.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{"Put":{"state":"The ˇquick brown\nfox jumps over\nthe lazy dog"}}
-{"Key":"ctrl-v"}
-{"Key":"l"}
-{"Key":"l"}
-{"Key":"l"}
-{"Key":"l"}
-{"Key":"l"}
-{"Key":"j"}
-{"Get":{"state":"The «quick ˇ»brown\nfox «jumps ˇ»over\nthe lazy dog","mode":"VisualBlock"}}
diff --git a/crates/vim/test_data/test_visual_block_mode_other_end.json b/crates/vim/test_data/test_visual_block_mode_other_end.json
deleted file mode 100644
index bf7956f0e8..0000000000
--- a/crates/vim/test_data/test_visual_block_mode_other_end.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{"Put":{"state":"The quick brown\nfox jˇumps over\nthe lazy dog"}}
-{"Key":"ctrl-v"}
-{"Key":"l"}
-{"Key":"l"}
-{"Key":"l"}
-{"Key":"l"}
-{"Key":"j"}
-{"Get":{"state":"The quick brown\nfox j«umps ˇ»over\nthe l«azy dˇ»og","mode":"VisualBlock"}}
-{"Key":"o"}
-{"Key":"k"}
-{"Get":{"state":"The q«ˇuick »brown\nfox j«ˇumps »over\nthe l«ˇazy d»og","mode":"VisualBlock"}}
diff --git a/crates/vim/test_data/test_visual_block_mode_shift_other_end.json b/crates/vim/test_data/test_visual_block_mode_shift_other_end.json
deleted file mode 100644
index 03882167b4..0000000000
--- a/crates/vim/test_data/test_visual_block_mode_shift_other_end.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{"Put":{"state":"The quick brown\nfox jˇumps over\nthe lazy dog"}}
-{"Key":"ctrl-v"}
-{"Key":"l"}
-{"Key":"l"}
-{"Key":"l"}
-{"Key":"l"}
-{"Key":"j"}
-{"Get":{"state":"The quick brown\nfox j«umps ˇ»over\nthe l«azy dˇ»og","mode":"VisualBlock"}}
-{"Key":"shift-o"}
-{"Key":"k"}
-{"Get":{"state":"The quick brown\nfox j«ˇumps »over\nthe lazy dog","mode":"VisualBlock"}}
diff --git a/crates/vim/test_data/test_visual_block_mode_up_left.json b/crates/vim/test_data/test_visual_block_mode_up_left.json
deleted file mode 100644
index 00bbd577c3..0000000000
--- a/crates/vim/test_data/test_visual_block_mode_up_left.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{"Put":{"state":"The quick brown\nfox jumpsˇ over\nthe lazy dog"}}
-{"Key":"ctrl-v"}
-{"Key":"h"}
-{"Key":"h"}
-{"Key":"h"}
-{"Key":"h"}
-{"Key":"h"}
-{"Key":"k"}
-{"Get":{"state":"The «ˇquick »brown\nfox «ˇjumps »over\nthe lazy dog","mode":"VisualBlock"}}
diff --git a/crates/vim/test_data/test_visual_block_search.json b/crates/vim/test_data/test_visual_block_search.json
deleted file mode 100644
index 1943ce906f..0000000000
--- a/crates/vim/test_data/test_visual_block_search.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{"Put":{"state":"ˇone two\nthree four\nfive six\n"}}
-{"Key":"ctrl-v"}
-{"Key":"j"}
-{"Key":"/"}
-{"Key":"f"}
-{"Key":"enter"}
-{"Get":{"state":"«one twoˇ»\n«three fˇ»our\nfive six\n","mode":"VisualBlock"}}
diff --git a/crates/vim/test_data/test_visual_block_wrapping_selection.json b/crates/vim/test_data/test_visual_block_wrapping_selection.json
deleted file mode 100644
index bbe945cfef..0000000000
--- a/crates/vim/test_data/test_visual_block_wrapping_selection.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{"SetOption":{"value":"wrap"}}
-{"SetOption":{"value":"columns=12"}}
-{"Put":{"state":"ˇ12345678901234567890\n12345678901234567890\n12345678901234567890\n"}}
-{"Key":"ctrl-v"}
-{"Key":"j"}
-{"Get":{"state":"«1ˇ»2345678901234567890\n«1ˇ»2345678901234567890\n12345678901234567890\n","mode":"VisualBlock"}}
-{"Put":{"state":"ˇ123456789012345678901234567890123456789012345678901234567890\n1234567890123456789012345678901234567890\n12345678901234567890\n"}}
-{"Key":"ctrl-v"}
-{"Key":"2"}
-{"Key":"j"}
-{"Get":{"state":"«1ˇ»23456789012345678901234567890123456789012345678901234567890\n«1ˇ»234567890123456789012345678901234567890\n«1ˇ»2345678901234567890\n","mode":"VisualBlock"}}
-{"Put":{"state":"123456789012345678901234567890123456789012345678901234567890\n1234567890123456789012345678901234567890\nˇ12345678901234567890\n"}}
-{"Key":"ctrl-v"}
-{"Key":"2"}
-{"Key":"k"}
-{"Get":{"state":"«1ˇ»23456789012345678901234567890123456789012345678901234567890\n«1ˇ»234567890123456789012345678901234567890\n«1ˇ»2345678901234567890\n","mode":"VisualBlock"}}
diff --git a/crates/vim/test_data/test_visual_change.json b/crates/vim/test_data/test_visual_change.json
deleted file mode 100644
index 297ad0d0d6..0000000000
--- a/crates/vim/test_data/test_visual_change.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{"Put":{"state":"The quick ˇbrown"}}
-{"Key":"v"}
-{"Key":"w"}
-{"Key":"c"}
-{"Get":{"state":"The quick ˇ","mode":"Insert"}}
-{"Put":{"state":"The ˇquick brown\nfox jumps over\nthe lazy dog"}}
-{"Key":"v"}
-{"Key":"w"}
-{"Key":"j"}
-{"Key":"c"}
-{"Get":{"state":"The ˇver\nthe lazy dog","mode":"Insert"}}
-{"Put":{"state":"The ˇquick brown\nfox jumps over\nthe lazy dog"}}
-{"Key":"v"}
-{"Key":"w"}
-{"Key":"j"}
-{"Key":"c"}
-{"Get":{"state":"The ˇver\nthe lazy dog","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nfox jumps ˇover\nthe lazy dog"}}
-{"Key":"v"}
-{"Key":"w"}
-{"Key":"j"}
-{"Key":"c"}
-{"Get":{"state":"The quick brown\nfox jumps ˇhe lazy dog","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nfox jumps over\nthe ˇlazy dog"}}
-{"Key":"v"}
-{"Key":"w"}
-{"Key":"j"}
-{"Key":"c"}
-{"Get":{"state":"The quick brown\nfox jumps over\nthe ˇog","mode":"Insert"}}
-{"Put":{"state":"The ˇquick brown\nfox jumps over\nthe lazy dog"}}
-{"Key":"v"}
-{"Key":"w"}
-{"Key":"k"}
-{"Key":"c"}
-{"Get":{"state":"The ˇrown\nfox jumps over\nthe lazy dog","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nfox jumps ˇover\nthe lazy dog"}}
-{"Key":"v"}
-{"Key":"w"}
-{"Key":"k"}
-{"Key":"c"}
-{"Get":{"state":"The quick brown\nˇver\nthe lazy dog","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nfox jumps over\nthe ˇlazy dog"}}
-{"Key":"v"}
-{"Key":"w"}
-{"Key":"k"}
-{"Key":"c"}
-{"Get":{"state":"The quick brown\nfox jumpsˇazy dog","mode":"Insert"}}
diff --git a/crates/vim/test_data/test_visual_delete.json b/crates/vim/test_data/test_visual_delete.json
deleted file mode 100644
index d9f8055600..0000000000
--- a/crates/vim/test_data/test_visual_delete.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{"Put":{"state":"The quick ˇbrown"}}
-{"Key":"v"}
-{"Key":"w"}
-{"Get":{"state":"The quick «brownˇ»","mode":"Visual"}}
-{"Put":{"state":"The quick ˇbrown"}}
-{"Key":"v"}
-{"Key":"w"}
-{"Key":"x"}
-{"Get":{"state":"The quickˇ ","mode":"Normal"}}
-{"Put":{"state":"The ˇquick brown\nfox jumps over\nthe lazy dog"}}
-{"Key":"v"}
-{"Key":"w"}
-{"Key":"j"}
-{"Key":"x"}
-{"Get":{"state":"The ˇver\nthe lazy dog","mode":"Normal"}}
-{"Key":"j"}
-{"Key":"p"}
-{"Get":{"state":"The ver\nthe lˇquick brown\nfox jumps oazy dog","mode":"Normal"}}
-{"Put":{"state":"The ˇquick brown\nfox jumps over\nthe lazy dog"}}
-{"Key":"v"}
-{"Key":"w"}
-{"Key":"j"}
-{"Key":"x"}
-{"Get":{"state":"The ˇver\nthe lazy dog","mode":"Normal"}}
-{"Put":{"state":"The quick brown\nfox jumps over\nthe ˇlazy dog"}}
-{"Key":"v"}
-{"Key":"w"}
-{"Key":"j"}
-{"Key":"x"}
-{"Get":{"state":"The quick brown\nfox jumps over\nthe ˇog","mode":"Normal"}}
-{"Put":{"state":"The ˇquick brown\nfox jumps over\nthe lazy dog"}}
-{"Key":"v"}
-{"Key":"b"}
-{"Key":"k"}
-{"Key":"x"}
-{"Get":{"state":"ˇuick brown\nfox jumps over\nthe lazy dog","mode":"Normal"}}
-{"Put":{"state":"The quick brown\nfox jumps ˇover\nthe lazy dog"}}
-{"Key":"v"}
-{"Key":"b"}
-{"Key":"k"}
-{"Key":"x"}
-{"Get":{"state":"The ˇver\nthe lazy dog","mode":"Normal"}}
-{"Put":{"state":"The quick brown\nfox jumps over\nthe ˇlazy dog"}}
-{"Key":"v"}
-{"Key":"b"}
-{"Key":"k"}
-{"Key":"x"}
-{"Get":{"state":"The quick brown\nˇazy dog","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_visual_line_change.json b/crates/vim/test_data/test_visual_line_change.json
deleted file mode 100644
index 336108c6cb..0000000000
--- a/crates/vim/test_data/test_visual_line_change.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{"Put":{"state":"The quˇick brown\nfox jumps over\nthe lazy dog"}}
-{"Key":"shift-v"}
-{"Key":"c"}
-{"Get":{"state":"ˇ\nfox jumps over\nthe lazy dog","mode":"Insert"}}
-{"Key":"escape"}
-{"Key":"j"}
-{"Key":"p"}
-{"Get":{"state":"\nfox jumps over\nˇThe quick brown\nthe lazy dog","mode":"Normal"}}
-{"Put":{"state":"The quick brown\nfox juˇmps over\nthe lazy dog"}}
-{"Key":"shift-v"}
-{"Key":"c"}
-{"Get":{"state":"The quick brown\nˇ\nthe lazy dog","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nfox jumps over\nthe laˇzy dog"}}
-{"Key":"shift-v"}
-{"Key":"c"}
-{"Get":{"state":"The quick brown\nfox jumps over\nˇ","mode":"Insert"}}
-{"Put":{"state":"The quˇick brown\nfox jumps over\nthe lazy dog"}}
-{"Key":"shift-v"}
-{"Key":"j"}
-{"Key":"c"}
-{"Get":{"state":"ˇ\nthe lazy dog","mode":"Insert"}}
-{"Key":"escape"}
-{"Key":"j"}
-{"Key":"p"}
-{"Get":{"state":"\nthe lazy dog\nˇThe quick brown\nfox jumps over","mode":"Normal"}}
-{"Put":{"state":"The quick brown\nfox juˇmps over\nthe lazy dog"}}
-{"Key":"shift-v"}
-{"Key":"j"}
-{"Key":"c"}
-{"Get":{"state":"The quick brown\nˇ","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nfox jumps over\nthe laˇzy dog"}}
-{"Key":"shift-v"}
-{"Key":"j"}
-{"Key":"c"}
-{"Get":{"state":"The quick brown\nfox jumps over\nˇ","mode":"Insert"}}
diff --git a/crates/vim/test_data/test_visual_line_delete.json b/crates/vim/test_data/test_visual_line_delete.json
deleted file mode 100644
index e221a4ad5f..0000000000
--- a/crates/vim/test_data/test_visual_line_delete.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{"Put":{"state":"The quˇick brown\nfox jumps over\nthe lazy dog"}}
-{"Key":"shift-v"}
-{"Key":"x"}
-{"Get":{"state":"fox juˇmps over\nthe lazy dog","mode":"Normal"}}
-{"Key":"p"}
-{"Get":{"state":"fox jumps over\nˇThe quick brown\nthe lazy dog","mode":"Normal"}}
-{"Put":{"state":"The quick brown\nfox jumps over\nthe laˇzy dog"}}
-{"Key":"shift-v"}
-{"Key":"x"}
-{"Get":{"state":"The quick brown\nfox juˇmps over","mode":"Normal"}}
-{"ReadRegister":{"name":"\"","value":"the lazy dog\n"}}
-{"Put":{"state":"The quˇick brown\nfox jumps over\nthe lazy dog"}}
-{"Key":"shift-v"}
-{"Key":"j"}
-{"Key":"x"}
-{"Get":{"state":"the laˇzy dog","mode":"Normal"}}
-{"Key":"p"}
-{"Get":{"state":"the lazy dog\nˇThe quick brown\nfox jumps over","mode":"Normal"}}
-{"Put":{"state":"The ˇlong line\nshould not\ncrash\n"}}
-{"Key":"shift-v"}
-{"Key":"$"}
-{"Key":"x"}
-{"Get":{"state":"should noˇt\ncrash\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_visual_match_eol.json b/crates/vim/test_data/test_visual_match_eol.json
deleted file mode 100644
index 9909638e3f..0000000000
--- a/crates/vim/test_data/test_visual_match_eol.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{"Put":{"state":"fn aˇ() {\n  return\n}\n"}}
-{"Key":"v"}
-{"Key":"$"}
-{"Key":"%"}
-{"Get":{"state":"fn a«() {\n  return\n}ˇ»\n","mode":"Visual"}}
diff --git a/crates/vim/test_data/test_visual_mode_insert_before_after.json b/crates/vim/test_data/test_visual_mode_insert_before_after.json
deleted file mode 100644
index 065f05dea4..0000000000
--- a/crates/vim/test_data/test_visual_mode_insert_before_after.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{"Put":{"state":"heˇllo"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"w"}
-{"Key":"shift-i"}
-{"Get":{"state":"ˇhello","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nfox ˇjumps over\nthe lazy dog"}}
-{"Key":"shift-v"}
-{"Key":"shift-i"}
-{"Get":{"state":"The quick brown\nˇfox jumps over\nthe lazy dog","mode":"Insert"}}
-{"Put":{"state":"The quick brown\nfox ˇjumps over\nthe lazy dog"}}
-{"Key":"shift-v"}
-{"Key":"shift-a"}
-{"Get":{"state":"The quick brown\nfox jˇumps over\nthe lazy dog","mode":"Insert"}}
diff --git a/crates/vim/test_data/test_visual_object.json b/crates/vim/test_data/test_visual_object.json
deleted file mode 100644
index 7c95a8dc73..0000000000
--- a/crates/vim/test_data/test_visual_object.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{"Put":{"state":"hello (in [parˇens] o)"}}
-{"Key":"ctrl-v"}
-{"Key":"l"}
-{"Key":"a"}
-{"Key":"]"}
-{"Get":{"state":"hello (in «[parens]ˇ» o)","mode":"Visual"}}
-{"Key":"i"}
-{"Key":"("}
-{"Get":{"state":"hello («in [parens] oˇ»)","mode":"Visual"}}
-{"Put":{"state":"hello in a wˇord again."}}
-{"Key":"ctrl-v"}
-{"Key":"l"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"hello in a w«ordˇ» again.","mode":"VisualBlock"}}
-{"Key":"o"}
-{"Key":"a"}
-{"Key":"s"}
-{"Get":{"state":"«ˇhello in a word» again.","mode":"VisualBlock"}}
diff --git a/crates/vim/test_data/test_visual_object_expands.json b/crates/vim/test_data/test_visual_object_expands.json
deleted file mode 100644
index ea285ea5be..0000000000
--- a/crates/vim/test_data/test_visual_object_expands.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{"Put":{"state":"{\n    {\n   ˇ }\n}\n{\n}\n"}}
-{"Key":"v"}
-{"Key":"l"}
-{"Get":{"state":"{\n    {\n   « }ˇ»\n}\n{\n}\n","mode":"Visual"}}
-{"Key":"a"}
-{"Key":"{"}
-{"Get":{"state":"{\n    «{\n    }ˇ»\n}\n{\n}\n","mode":"Visual"}}
-{"Key":"a"}
-{"Key":"{"}
-{"Get":{"state":"«{\n    {\n    }\n}ˇ»\n{\n}\n","mode":"Visual"}}
diff --git a/crates/vim/test_data/test_visual_paragraph_object.json b/crates/vim/test_data/test_visual_paragraph_object.json
deleted file mode 100644
index 604d6dc93f..0000000000
--- a/crates/vim/test_data/test_visual_paragraph_object.json
+++ /dev/null
@@ -1,80 +0,0 @@
-{"Put":{"state":"ˇThe quick brown\nfox jumps over\nthe lazy dog.\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"«The quick brown\nfox jumps over\ntˇ»he lazy dog.\n","mode":"VisualLine"}}
-{"Put":{"state":"ˇThe quick brown\nfox jumps over\nthe lazy dog.\n"}}
-{"Key":"v"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"«The quick brown\nfox jumps over\nthe lazy dog.\nˇ»","mode":"VisualLine"}}
-{"Put":{"state":"ˇ\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\nThe quick brown fox jumps\nover the lazy dog.\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"«\n\nˇ»The quick brown fox jumps\nover the lazy dog.\n\n\nThe quick brown fox jumps\nover the lazy dog.\n","mode":"VisualLine"}}
-{"Put":{"state":"\n\nˇThe quick brown fox jumps\nover the lazy dog.\n\n\nThe quick brown fox jumps\nover the lazy dog.\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"\n\n«The quick brown fox jumps\noˇ»ver the lazy dog.\n\n\nThe quick brown fox jumps\nover the lazy dog.\n","mode":"VisualLine"}}
-{"Put":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\nˇ\n\nThe quick brown fox jumps\nover the lazy dog.\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\n«\n\nˇ»The quick brown fox jumps\nover the lazy dog.\n","mode":"VisualLine"}}
-{"Put":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\nˇThe quick brown fox jumps\nover the lazy dog.\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\n«The quick brown fox jumps\noˇ»ver the lazy dog.\n","mode":"VisualLine"}}
-{"Put":{"state":"ˇ\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\nThe quick brown fox jumps\nover the lazy dog.\n"}}
-{"Key":"v"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"«\n\nThe quick brown fox jumps\noˇ»ver the lazy dog.\n\n\nThe quick brown fox jumps\nover the lazy dog.\n","mode":"VisualLine"}}
-{"Put":{"state":"\n\nˇThe quick brown fox jumps\nover the lazy dog.\n\n\nThe quick brown fox jumps\nover the lazy dog.\n"}}
-{"Key":"v"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"\n\n«The quick brown fox jumps\nover the lazy dog.\n\n\nˇ»The quick brown fox jumps\nover the lazy dog.\n","mode":"VisualLine"}}
-{"Put":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\nˇ\n\nThe quick brown fox jumps\nover the lazy dog.\n"}}
-{"Key":"v"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\n«\n\nThe quick brown fox jumps\noˇ»ver the lazy dog.\n","mode":"VisualLine"}}
-{"Put":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\nˇThe quick brown fox jumps\nover the lazy dog.\n"}}
-{"Key":"v"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"\n\nThe quick brown fox jumps\nover the lazy dog.\n\n\n«The quick brown fox jumps\nover the lazy dog.\nˇ»","mode":"VisualLine"}}
-{"Put":{"state":"ˇThe quick brown fox jumps over the lazy dog.\n\nThe quick brown fox jumps over the lazy dog.\n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"«Tˇ»he quick brown fox jumps over the lazy dog.\n\nThe quick brown fox jumps over the lazy dog.\n\n","mode":"VisualLine"}}
-{"Put":{"state":"The quick brown fox jumps over the lazy dog.\nˇ\nThe quick brown fox jumps over the lazy dog.\n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps over the lazy dog.\n«\nˇ»The quick brown fox jumps over the lazy dog.\n\n","mode":"VisualLine"}}
-{"Put":{"state":"The quick brown fox jumps over the lazy dog.\n\nˇThe quick brown fox jumps over the lazy dog.\n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps over the lazy dog.\n\n«Tˇ»he quick brown fox jumps over the lazy dog.\n\n","mode":"VisualLine"}}
-{"Put":{"state":"ˇThe quick brown fox jumps over the lazy dog.\n\nThe quick brown fox jumps over the lazy dog.\n\n"}}
-{"Key":"v"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"«The quick brown fox jumps over the lazy dog.\n\nˇ»The quick brown fox jumps over the lazy dog.\n\n","mode":"VisualLine"}}
-{"Put":{"state":"The quick brown fox jumps over the lazy dog.\nˇ\nThe quick brown fox jumps over the lazy dog.\n\n"}}
-{"Key":"v"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps over the lazy dog.\n«\nTˇ»he quick brown fox jumps over the lazy dog.\n\n","mode":"VisualLine"}}
-{"Put":{"state":"The quick brown fox jumps over the lazy dog.\n\nˇThe quick brown fox jumps over the lazy dog.\n\n"}}
-{"Key":"v"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"The quick brown fox jumps over the lazy dog.\n\n«The quick brown fox jumps over the lazy dog.\n\nˇ»","mode":"VisualLine"}}
diff --git a/crates/vim/test_data/test_visual_paragraph_object_with_soft_wrap.json b/crates/vim/test_data/test_visual_paragraph_object_with_soft_wrap.json
deleted file mode 100644
index 6bfce2f955..0000000000
--- a/crates/vim/test_data/test_visual_paragraph_object_with_soft_wrap.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{"SetOption":{"value":"wrap"}}
-{"SetOption":{"value":"columns=20"}}
-{"Put":{"state":"ˇFirst paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"«Fˇ»irst paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"VisualLine"}}
-{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is ˇlimited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"«ˇFirst paragraph with very long text that will wrap when soft wrap is enabled and line length is l»imited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"VisualLine"}}
-{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nˇSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\n«Sˇ»econd paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"VisualLine"}}
-{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and ˇshould be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\n«ˇSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and s»hould be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"VisualLine"}}
-{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nˇThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\n«Tˇ»hird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"VisualLine"}}
-{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping ˇsettings.\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\n«ˇThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping s»ettings.\n","mode":"VisualLine"}}
-{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.ˇ\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"p"}
-{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\n«ˇThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.»\n","mode":"VisualLine"}}
-{"Put":{"state":"ˇFirst paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
-{"Key":"v"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"«First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nˇ»Second paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"VisualLine"}}
-{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is ˇlimited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
-{"Key":"v"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is «limited making it span multiple display lines.\n\nˇ»Second paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"VisualLine"}}
-{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nˇSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
-{"Key":"v"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\n«Second paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nˇ»Third paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"VisualLine"}}
-{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and ˇshould be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
-{"Key":"v"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and «should be handled correctly.\n\nˇ»Third paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n","mode":"VisualLine"}}
-{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nˇThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\n"}}
-{"Key":"v"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\n«Third paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.\nˇ»","mode":"VisualLine"}}
-{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping ˇsettings.\n"}}
-{"Key":"v"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping «settings.\nˇ»","mode":"VisualLine"}}
-{"Put":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings.ˇ\n"}}
-{"Key":"v"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"First paragraph with very long text that will wrap when soft wrap is enabled and line length is limited making it span multiple display lines.\n\nSecond paragraph that is also quite long and will definitely wrap under soft wrap conditions and should be handled correctly.\n\nThird paragraph with additional long text content that will also wrap when line length is constrained by the wrapping settings«.\nˇ»","mode":"VisualLine"}}
diff --git a/crates/vim/test_data/test_visual_sentence_object.json b/crates/vim/test_data/test_visual_sentence_object.json
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/crates/vim/test_data/test_visual_shift_d.json b/crates/vim/test_data/test_visual_shift_d.json
deleted file mode 100644
index de037d788c..0000000000
--- a/crates/vim/test_data/test_visual_shift_d.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{"Put":{"state":"The ˇquick brown\nfox jumps over\nthe lazy dog\n"}}
-{"Key":"v"}
-{"Key":"down"}
-{"Key":"shift-d"}
-{"Get":{"state":"the ˇlazy dog\n","mode":"Normal"}}
-{"Put":{"state":"The ˇquick brown\nfox jumps over\nthe lazy dog\n"}}
-{"Key":"ctrl-v"}
-{"Key":"down"}
-{"Key":"shift-d"}
-{"Get":{"state":"Theˇ \nfox \nthe lazy dog\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_visual_star_hash.json b/crates/vim/test_data/test_visual_star_hash.json
deleted file mode 100644
index d6523c4a45..0000000000
--- a/crates/vim/test_data/test_visual_star_hash.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"Put":{"state":"ˇa.c. abcd a.c. abcd"}}
-{"Key":"v"}
-{"Key":"3"}
-{"Key":"l"}
-{"Key":"*"}
-{"Get":{"state":"a.c. abcd ˇa.c. abcd","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_visual_word_object.json b/crates/vim/test_data/test_visual_word_object.json
deleted file mode 100644
index 5e1a9839e9..0000000000
--- a/crates/vim/test_data/test_visual_word_object.json
+++ /dev/null
@@ -1,236 +0,0 @@
-{"Put":{"state":"The quick brown\nˇ\nfox"}}
-{"Key":"v"}
-{"Get":{"state":"The quick brown\n«\nˇ»fox","mode":"Visual"}}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown\n«\nˇ»fox","mode":"Visual"}}
-{"Put":{"state":"The quick ˇbrown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick «brownˇ»   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Visual"}}
-{"Put":{"state":"The quick browˇn   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick «brownˇ»   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Visual"}}
-{"Put":{"state":"The quick brownˇ   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown«   ˇ»\nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Visual"}}
-{"Put":{"state":"The quick brown   \nfox ˇjumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox «jumpsˇ» over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Visual"}}
-{"Put":{"state":"The quick brown   \nfox juˇmps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox «jumpsˇ» over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Visual"}}
-{"Put":{"state":"The quick brown   \nfox jumpsˇ over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps« ˇ»over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Visual"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dogˇ  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog«  ˇ»\n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Visual"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \nˇ\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n«\nˇ»\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Visual"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\nˇ\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n«\nˇ»\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Visual"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\nˇ\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n«\nˇ»The-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Visual"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThˇe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\n«Theˇ»-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Visual"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nTheˇ-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe«-ˇ»quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Visual"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-ˇquick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-«quickˇ» brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Visual"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quˇick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-«quickˇ» brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Visual"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quickˇ brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick« ˇ»brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Visual"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick ˇbrown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick «brownˇ» \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Visual"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brownˇ \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown« ˇ»\n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Visual"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \nˇ  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n«  ˇ»\n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Visual"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \nˇ  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n«  ˇ»\n  fox-jumps over\nthe lazy dog \n\n","mode":"Visual"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \nˇ  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n«  ˇ»fox-jumps over\nthe lazy dog \n\n","mode":"Visual"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumpˇs over\nthe lazy dog \n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-«jumpsˇ» over\nthe lazy dog \n\n","mode":"Visual"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dogˇ \n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog« ˇ»\n\n","mode":"Visual"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \nˇ\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n«\nˇ»","mode":"Visual"}}
-{"Put":{"state":"The quick ˇbrown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick «brownˇ»   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Visual"}}
-{"Put":{"state":"The quick browˇn   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick «brownˇ»   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Visual"}}
-{"Put":{"state":"The quick brownˇ   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown«   ˇ»\nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Visual"}}
-{"Put":{"state":"The quick brown   \nfox ˇjumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox «jumpsˇ» over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Visual"}}
-{"Put":{"state":"The quick brown   \nfox juˇmps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox «jumpsˇ» over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Visual"}}
-{"Put":{"state":"The quick brown   \nfox jumpsˇ over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps« ˇ»over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Visual"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dogˇ  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog«  ˇ»\n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Visual"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \nˇ\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n«\nˇ»\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Visual"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\nˇ\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n«\nˇ»\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Visual"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\nˇ\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n«\nˇ»The-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Visual"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThˇe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\n«The-quickˇ» brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Visual"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nTheˇ-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\n«The-quickˇ» brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Visual"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-ˇquick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\n«The-quickˇ» brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Visual"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quˇick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\n«The-quickˇ» brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Visual"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quickˇ brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick« ˇ»brown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Visual"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick ˇbrown \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick «brownˇ» \n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Visual"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brownˇ \n  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown« ˇ»\n  \n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Visual"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \nˇ  \n  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n«  ˇ»\n  \n  fox-jumps over\nthe lazy dog \n\n","mode":"Visual"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \nˇ  \n  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n«  ˇ»\n  fox-jumps over\nthe lazy dog \n\n","mode":"Visual"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \nˇ  fox-jumps over\nthe lazy dog \n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n«  ˇ»fox-jumps over\nthe lazy dog \n\n","mode":"Visual"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumpˇs over\nthe lazy dog \n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  «fox-jumpsˇ» over\nthe lazy dog \n\n","mode":"Visual"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dogˇ \n\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog« ˇ»\n\n","mode":"Visual"}}
-{"Put":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \nˇ\n"}}
-{"Key":"v"}
-{"Key":"i"}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick brown   \nfox jumps over\nthe lazy dog  \n\n\n\nThe-quick brown \n  \n  \n  fox-jumps over\nthe lazy dog \n«\nˇ»","mode":"Visual"}}
diff --git a/crates/vim/test_data/test_visual_yank.json b/crates/vim/test_data/test_visual_yank.json
deleted file mode 100644
index ed1ff2eb3f..0000000000
--- a/crates/vim/test_data/test_visual_yank.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{"Put":{"state":"The quick ˇbrown"}}
-{"Key":"v"}
-{"Key":"w"}
-{"Key":"y"}
-{"Get":{"state":"The quick ˇbrown","mode":"Normal"}}
-{"ReadRegister":{"name":"\"","value":"brown"}}
-{"Put":{"state":"The ˇquick brown\nfox jumps over\nthe lazy dog"}}
-{"Key":"v"}
-{"Key":"w"}
-{"Key":"j"}
-{"Key":"y"}
-{"Get":{"state":"The ˇquick brown\nfox jumps over\nthe lazy dog","mode":"Normal"}}
-{"ReadRegister":{"name":"\"","value":"quick brown\nfox jumps o"}}
-{"Put":{"state":"The quick brown\nfox jumps over\nthe ˇlazy dog"}}
-{"Key":"v"}
-{"Key":"w"}
-{"Key":"j"}
-{"Key":"y"}
-{"Get":{"state":"The quick brown\nfox jumps over\nthe ˇlazy dog","mode":"Normal"}}
-{"ReadRegister":{"name":"\"","value":"lazy d"}}
-{"Key":"shift-v"}
-{"Key":"y"}
-{"Get":{"state":"The quick brown\nfox jumps over\nˇthe lazy dog","mode":"Normal"}}
-{"ReadRegister":{"name":"\"","value":"the lazy dog\n"}}
-{"Put":{"state":"The ˇquick brown\nfox jumps over\nthe lazy dog"}}
-{"Key":"v"}
-{"Key":"b"}
-{"Key":"k"}
-{"Key":"y"}
-{"Get":{"state":"ˇThe quick brown\nfox jumps over\nthe lazy dog","mode":"Normal"}}
-{"Put":{"state":"The quick brown\nfox ˇjumps over\nthe lazy dog"}}
-{"Key":"shift-v"}
-{"Key":"shift-g"}
-{"Key":"shift-y"}
-{"Get":{"state":"The quick brown\nˇfox jumps over\nthe lazy dog","mode":"Normal"}}
-{"ReadRegister":{"name":"\"","value":"fox jumps over\nthe lazy dog\n"}}
-{"Put":{"state":"The quick brown\nfox ˇjumps over\nthe lazy dog"}}
-{"Key":"shift-v"}
-{"Key":"$"}
-{"Key":"shift-y"}
-{"Get":{"state":"The quick brown\nˇfox jumps over\nthe lazy dog","mode":"Normal"}}
-{"ReadRegister":{"name":"\"","value":"fox jumps over\n"}}
diff --git a/crates/vim/test_data/test_w.json b/crates/vim/test_data/test_w.json
deleted file mode 100644
index b7b3bd0e63..0000000000
--- a/crates/vim/test_data/test_w.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{"Put":{"state":"The ˇquick-brown\n\n\nfox_jumps over\nthe"}}
-{"Key":"w"}
-{"Get":{"state":"The quickˇ-brown\n\n\nfox_jumps over\nthe","mode":"Normal"}}
-{"Key":"w"}
-{"Get":{"state":"The quick-ˇbrown\n\n\nfox_jumps over\nthe","mode":"Normal"}}
-{"Key":"w"}
-{"Get":{"state":"The quick-brown\nˇ\n\nfox_jumps over\nthe","mode":"Normal"}}
-{"Key":"w"}
-{"Get":{"state":"The quick-brown\n\nˇ\nfox_jumps over\nthe","mode":"Normal"}}
-{"Key":"w"}
-{"Get":{"state":"The quick-brown\n\n\nˇfox_jumps over\nthe","mode":"Normal"}}
-{"Key":"w"}
-{"Get":{"state":"The quick-brown\n\n\nfox_jumps ˇover\nthe","mode":"Normal"}}
-{"Key":"w"}
-{"Get":{"state":"The quick-brown\n\n\nfox_jumps over\nˇthe","mode":"Normal"}}
-{"Key":"w"}
-{"Get":{"state":"The quick-brown\n\n\nfox_jumps over\nthˇe","mode":"Normal"}}
-{"Key":"w"}
-{"Get":{"state":"The quick-brown\n\n\nfox_jumps over\nthˇe","mode":"Normal"}}
-{"Put":{"state":"The ˇquick-brown\n\n\nfox_jumps over\nthe"}}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick-brown\nˇ\n\nfox_jumps over\nthe","mode":"Normal"}}
-{"Put":{"state":"The quickˇ-brown\n\n\nfox_jumps over\nthe"}}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick-brown\nˇ\n\nfox_jumps over\nthe","mode":"Normal"}}
-{"Put":{"state":"The quick-ˇbrown\n\n\nfox_jumps over\nthe"}}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick-brown\nˇ\n\nfox_jumps over\nthe","mode":"Normal"}}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick-brown\n\nˇ\nfox_jumps over\nthe","mode":"Normal"}}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick-brown\n\n\nˇfox_jumps over\nthe","mode":"Normal"}}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick-brown\n\n\nfox_jumps ˇover\nthe","mode":"Normal"}}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick-brown\n\n\nfox_jumps over\nˇthe","mode":"Normal"}}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick-brown\n\n\nfox_jumps over\nthˇe","mode":"Normal"}}
-{"Key":"shift-w"}
-{"Get":{"state":"The quick-brown\n\n\nfox_jumps over\nthˇe","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_window_bottom.json b/crates/vim/test_data/test_window_bottom.json
deleted file mode 100644
index a4855ccb96..0000000000
--- a/crates/vim/test_data/test_window_bottom.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{"Put":{"state":"abc\ndeˇf\nparagraph\nthe second\nthird and\nfinal"}}
-{"Key":"shift-l"}
-{"Get":{"state":"abc\ndef\nparagraph\nthe second\nthird and\nfiˇnal","mode":"Normal"}}
-{"Put":{"state":"1 2 3\n4 5 ˇ6\n7 8 9\n"}}
-{"Key":"shift-l"}
-{"Get":{"state":"1 2 3\n4 5 6\n7 8 9\nˇ","mode":"Normal"}}
-{"Put":{"state":"1 2 3\nˇ4 5 6\n7 8 9\n"}}
-{"Key":"shift-l"}
-{"Get":{"state":"1 2 3\n4 5 6\n7 8 9\nˇ","mode":"Normal"}}
-{"Put":{"state":"1 2 ˇ3\n4 5 6\n7 8 9\n"}}
-{"Key":"shift-l"}
-{"Get":{"state":"1 2 3\n4 5 6\n7 8 9\nˇ","mode":"Normal"}}
-{"Put":{"state":"ˇ1 2 3\n4 5 6\n7 8 9\n"}}
-{"Key":"shift-l"}
-{"Get":{"state":"1 2 3\n4 5 6\n7 8 9\nˇ","mode":"Normal"}}
-{"Put":{"state":"1 2 3\n4 5 ˇ6\n7 8 9\n"}}
-{"Key":"9"}
-{"Key":"shift-l"}
-{"Get":{"state":"1 2 ˇ3\n4 5 6\n7 8 9\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_window_middle.json b/crates/vim/test_data/test_window_middle.json
deleted file mode 100644
index 91154923e4..0000000000
--- a/crates/vim/test_data/test_window_middle.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{"Put":{"state":"abˇc\ndef\nparagraph\nthe second\nthird and\nfinal"}}
-{"Key":"shift-m"}
-{"Get":{"state":"abc\ndef\npaˇragraph\nthe second\nthird and\nfinal","mode":"Normal"}}
-{"Put":{"state":"1 2 3\n4 5 6\n7 8 ˇ9\n"}}
-{"Key":"shift-m"}
-{"Get":{"state":"1 2 3\n4 5 ˇ6\n7 8 9\n","mode":"Normal"}}
-{"Put":{"state":"1 2 3\n4 5 6\nˇ7 8 9\n"}}
-{"Key":"shift-m"}
-{"Get":{"state":"1 2 3\nˇ4 5 6\n7 8 9\n","mode":"Normal"}}
-{"Put":{"state":"ˇ1 2 3\n4 5 6\n7 8 9\n"}}
-{"Key":"shift-m"}
-{"Get":{"state":"1 2 3\nˇ4 5 6\n7 8 9\n","mode":"Normal"}}
-{"Key":"shift-m"}
-{"Get":{"state":"1 2 3\nˇ4 5 6\n7 8 9\n","mode":"Normal"}}
-{"Put":{"state":"1 2 3\n4 5 ˇ6\n7 8 9\n"}}
-{"Key":"shift-m"}
-{"Get":{"state":"1 2 3\n4 5 ˇ6\n7 8 9\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_window_top.json b/crates/vim/test_data/test_window_top.json
deleted file mode 100644
index aab6bd6280..0000000000
--- a/crates/vim/test_data/test_window_top.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{"Put":{"state":"abc\ndef\nparagraph\nthe second\nthird ˇand\nfinal"}}
-{"Key":"shift-h"}
-{"Get":{"state":"abˇc\ndef\nparagraph\nthe second\nthird and\nfinal","mode":"Normal"}}
-{"Put":{"state":"1 2 3\n4 5 6\n7 8 ˇ9\n"}}
-{"Key":"shift-h"}
-{"Get":{"state":"1 2 ˇ3\n4 5 6\n7 8 9\n","mode":"Normal"}}
-{"Put":{"state":"1 2 3\n4 5 6\nˇ7 8 9\n"}}
-{"Key":"shift-h"}
-{"Get":{"state":"ˇ1 2 3\n4 5 6\n7 8 9\n","mode":"Normal"}}
-{"Put":{"state":"1 2 3\n4 5 ˇ6\n7 8 9"}}
-{"Key":"9"}
-{"Key":"shift-h"}
-{"Get":{"state":"1 2 3\n4 5 6\n7 8 ˇ9","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_wrapped_delete_end_document.json b/crates/vim/test_data/test_wrapped_delete_end_document.json
deleted file mode 100644
index f1dc0cb238..0000000000
--- a/crates/vim/test_data/test_wrapped_delete_end_document.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{"SetOption":{"value":"wrap"}}
-{"SetOption":{"value":"columns=12"}}
-{"Put":{"state":"aaˇaaaaaaaaaaaaaaaaaa\nbbbbbbbbbbbbbbbbbbbb\ncccccccccccccccccccc"}}
-{"Key":"d"}
-{"Key":"shift-g"}
-{"Key":"i"}
-{"Key":"z"}
-{"Key":"z"}
-{"Key":"z"}
-{"Get":{"state":"zzzˇ","mode":"Insert"}}
diff --git a/crates/vim/test_data/test_wrapped_lines.json b/crates/vim/test_data/test_wrapped_lines.json
deleted file mode 100644
index e5b5d0eac0..0000000000
--- a/crates/vim/test_data/test_wrapped_lines.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{"SetOption":{"value":"wrap"}}
-{"SetOption":{"value":"columns=12"}}
-{"Put":{"state":"tˇwelve char twelve char\ntwelve char\n"}}
-{"Key":"j"}
-{"Get":{"state":"twelve char twelve char\ntˇwelve char\n","mode":"Normal"}}
-{"Key":"k"}
-{"Get":{"state":"tˇwelve char twelve char\ntwelve char\n","mode":"Normal"}}
-{"Key":"g"}
-{"Key":"j"}
-{"Get":{"state":"twelve char tˇwelve char\ntwelve char\n","mode":"Normal"}}
-{"Key":"g"}
-{"Key":"j"}
-{"Get":{"state":"twelve char twelve char\ntˇwelve char\n","mode":"Normal"}}
-{"Key":"g"}
-{"Key":"k"}
-{"Get":{"state":"twelve char tˇwelve char\ntwelve char\n","mode":"Normal"}}
-{"Key":"g"}
-{"Key":"^"}
-{"Get":{"state":"twelve char ˇtwelve char\ntwelve char\n","mode":"Normal"}}
-{"Key":"^"}
-{"Get":{"state":"ˇtwelve char twelve char\ntwelve char\n","mode":"Normal"}}
-{"Key":"g"}
-{"Key":"$"}
-{"Get":{"state":"twelve charˇ twelve char\ntwelve char\n","mode":"Normal"}}
-{"Key":"$"}
-{"Get":{"state":"twelve char twelve chaˇr\ntwelve char\n","mode":"Normal"}}
-{"Put":{"state":"tˇwelve char twelve char\ntwelve char\n"}}
-{"Key":"enter"}
-{"Get":{"state":"twelve char twelve char\nˇtwelve char\n","mode":"Normal"}}
-{"Put":{"state":"twelve char\ntˇwelve char twelve char\ntwelve char\n"}}
-{"Key":"o"}
-{"Key":"o"}
-{"Key":"escape"}
-{"Get":{"state":"twelve char\ntwelve char twelve char\nˇo\ntwelve char\n","mode":"Normal"}}
-{"Put":{"state":"twelve char\ntˇwelve char twelve char\ntwelve char\n"}}
-{"Key":"shift-a"}
-{"Key":"a"}
-{"Key":"escape"}
-{"Get":{"state":"twelve char\ntwelve char twelve charˇa\ntwelve char\n","mode":"Normal"}}
-{"Key":"shift-i"}
-{"Key":"i"}
-{"Key":"escape"}
-{"Get":{"state":"twelve char\nˇitwelve char twelve chara\ntwelve char\n","mode":"Normal"}}
-{"Key":"shift-d"}
-{"Get":{"state":"twelve char\nˇ\ntwelve char\n","mode":"Normal"}}
-{"Put":{"state":"twelve char\ntwelve char tˇwelve char\ntwelve char\n"}}
-{"Key":"shift-o"}
-{"Key":"o"}
-{"Key":"escape"}
-{"Get":{"state":"twelve char\nˇo\ntwelve char twelve char\ntwelve char\n","mode":"Normal"}}
-{"Put":{"state":"fourteen chaˇr\nfourteen char\n"}}
-{"Key":"d"}
-{"Key":"i"}
-{"Key":"w"}
-{"Get":{"state":"fourteenˇ \nfourteen char\n","mode":"Normal"}}
-{"Key":"j"}
-{"Key":"shift-f"}
-{"Key":"e"}
-{"Key":"f"}
-{"Key":"r"}
-{"Get":{"state":"fourteen \nfourteen chaˇr\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_wrapped_motions.json b/crates/vim/test_data/test_wrapped_motions.json
deleted file mode 100644
index 195a58f6b5..0000000000
--- a/crates/vim/test_data/test_wrapped_motions.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{"SetOption":{"value":"wrap"}}
-{"SetOption":{"value":"columns=12"}}
-{"Put":{"state":"aaˇaa\n😃😃"}}
-{"Key":"j"}
-{"Get":{"state":"aaaa\n😃ˇ😃","mode":"Normal"}}
-{"Put":{"state":"123456789012aaˇaa\n123456789012😃😃"}}
-{"Key":"j"}
-{"Get":{"state":"123456789012aaaa\n123456789012😃ˇ😃","mode":"Normal"}}
-{"Put":{"state":"123456789012aaˇaa\n123456789012😃😃"}}
-{"Key":"j"}
-{"Get":{"state":"123456789012aaaa\n123456789012😃ˇ😃","mode":"Normal"}}
-{"Put":{"state":"123456789012aaaaˇaaaaaaaa123456789012\nwow\n123456789012😃😃😃😃😃😃123456789012"}}
-{"Key":"j"}
-{"Key":"j"}
-{"Get":{"state":"123456789012aaaaaaaaaaaa123456789012\nwow\n123456789012😃😃ˇ😃😃😃😃123456789012","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_x.json b/crates/vim/test_data/test_x.json
deleted file mode 100644
index cb7eb53472..0000000000
--- a/crates/vim/test_data/test_x.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{"Put":{"state":"ˇTest"}}
-{"Key":"x"}
-{"Get":{"state":"ˇest","mode":"Normal"}}
-{"Put":{"state":"Teˇst"}}
-{"Key":"x"}
-{"Get":{"state":"Teˇt","mode":"Normal"}}
-{"Put":{"state":"Tesˇt"}}
-{"Key":"x"}
-{"Get":{"state":"Teˇs","mode":"Normal"}}
-{"Put":{"state":"Tesˇt\ntest"}}
-{"Key":"x"}
-{"Get":{"state":"Teˇs\ntest","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_yank_line_with_trailing_newline.json b/crates/vim/test_data/test_yank_line_with_trailing_newline.json
deleted file mode 100644
index 8b4438737a..0000000000
--- a/crates/vim/test_data/test_yank_line_with_trailing_newline.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{"Put":{"state":"heˇllo\n"}}
-{"Key":"y"}
-{"Key":"y"}
-{"Key":"p"}
-{"Get":{"state":"hello\nˇhello\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_yank_line_without_trailing_newline.json b/crates/vim/test_data/test_yank_line_without_trailing_newline.json
deleted file mode 100644
index a1158ff2d5..0000000000
--- a/crates/vim/test_data/test_yank_line_without_trailing_newline.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{"Put":{"state":"heˇllo"}}
-{"Key":"y"}
-{"Key":"y"}
-{"Key":"p"}
-{"Get":{"state":"hello\nˇhello","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_yank_multiline_without_trailing_newline.json b/crates/vim/test_data/test_yank_multiline_without_trailing_newline.json
deleted file mode 100644
index ec38e81f2e..0000000000
--- a/crates/vim/test_data/test_yank_multiline_without_trailing_newline.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"Put":{"state":"heˇllo\nhello"}}
-{"Key":"2"}
-{"Key":"y"}
-{"Key":"y"}
-{"Key":"p"}
-{"Get":{"state":"hello\nˇhello\nhello\nhello","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_yank_paragraph_with_paste.json b/crates/vim/test_data/test_yank_paragraph_with_paste.json
deleted file mode 100644
index d73d1f6d3b..0000000000
--- a/crates/vim/test_data/test_yank_paragraph_with_paste.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{"Put":{"state":"first paragraph\nˇstill first\n\nsecond paragraph\nstill second\n\nthird paragraph\n"}}
-{"Key":"y"}
-{"Key":"a"}
-{"Key":"p"}
-{"Get":{"state":"ˇfirst paragraph\nstill first\n\nsecond paragraph\nstill second\n\nthird paragraph\n","mode":"Normal"}}
-{"ReadRegister":{"name":"\"","value":"first paragraph\nstill first\n\n"}}
-{"Key":"j"}
-{"Key":"j"}
-{"Key":"p"}
-{"Get":{"state":"first paragraph\nstill first\n\nˇfirst paragraph\nstill first\n\nsecond paragraph\nstill second\n\nthird paragraph\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_zero.json b/crates/vim/test_data/test_zero.json
deleted file mode 100644
index bc1253deb5..0000000000
--- a/crates/vim/test_data/test_zero.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{"Put":{"state":"The quˇick brown\nfox jumps over\nthe lazy dog"}}
-{"Key":"0"}
-{"Get":{"state":"ˇThe quick brown\nfox jumps over\nthe lazy dog","mode":"Normal"}}
-{"Key":"1"}
-{"Key":"0"}
-{"Key":"l"}
-{"Get":{"state":"The quick ˇbrown\nfox jumps over\nthe lazy dog","mode":"Normal"}}
diff --git a/crates/vim_mode_setting/Cargo.toml b/crates/vim_mode_setting/Cargo.toml
deleted file mode 100644
index 0ae75d9d55..0000000000
--- a/crates/vim_mode_setting/Cargo.toml
+++ /dev/null
@@ -1,15 +0,0 @@
-[package]
-name = "vim_mode_setting"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/vim_mode_setting.rs"
-
-[dependencies]
-settings.workspace = true
diff --git a/crates/vim_mode_setting/LICENSE-GPL b/crates/vim_mode_setting/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/vim_mode_setting/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/vim_mode_setting/src/vim_mode_setting.rs b/crates/vim_mode_setting/src/vim_mode_setting.rs
deleted file mode 100644
index e229913a80..0000000000
--- a/crates/vim_mode_setting/src/vim_mode_setting.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-//! Contains the [`VimModeSetting`] and [`HelixModeSetting`] used to enable/disable Vim and Helix modes.
-//!
-//! This is in its own crate as we want other crates to be able to enable or
-//! disable Vim/Helix modes without having to depend on the `vim` crate in its
-//! entirety.
-
-use settings::{RegisterSetting, Settings, SettingsContent};
-
-#[derive(RegisterSetting)]
-pub struct VimModeSetting(pub bool);
-
-impl Settings for VimModeSetting {
-    fn from_settings(content: &SettingsContent) -> Self {
-        Self(content.vim_mode.unwrap())
-    }
-}
-
-#[derive(RegisterSetting)]
-pub struct HelixModeSetting(pub bool);
-
-impl Settings for HelixModeSetting {
-    fn from_settings(content: &SettingsContent) -> Self {
-        Self(content.helix_mode.unwrap())
-    }
-}
diff --git a/crates/watch/Cargo.toml b/crates/watch/Cargo.toml
index 9d77eaedde..8f61d1f031 100644
--- a/crates/watch/Cargo.toml
+++ b/crates/watch/Cargo.toml
@@ -17,7 +17,8 @@ parking_lot.workspace = true
 
 [dev-dependencies]
 ctor.workspace = true
+env_logger.workspace = true
 futures.workspace = true
 gpui = { workspace = true, features = ["test-support"] }
+log.workspace = true
 rand.workspace = true
-zlog.workspace = true
diff --git a/crates/watch/src/watch.rs b/crates/watch/src/watch.rs
index 71dab74820..aee602db86 100644
--- a/crates/watch/src/watch.rs
+++ b/crates/watch/src/watch.rs
@@ -238,7 +238,7 @@ mod tests {
                 for _ in 0..16 {
                     executor.simulate_random_delay().await;
                     let id = next_id.fetch_add(1, SeqCst);
-                    zlog::info!("sending {}", id);
+                    log::info!("sending {}", id);
                     tx.send(id).ok();
                 }
                 closed.store(true, SeqCst);
@@ -255,23 +255,23 @@ mod tests {
                 for _ in 0..16 {
                     executor.simulate_random_delay().await;
 
-                    zlog::info!("{}: receiving", receiver_id);
+                    log::info!("{}: receiving", receiver_id);
                     let mut timeout = executor.simulate_random_delay().fuse();
                     let mut recv = pin!(rx.recv().fuse());
                     select_biased! {
                         _ = timeout => {
-                            zlog::info!("{}: dropping recv future", receiver_id);
+                            log::info!("{}: dropping recv future", receiver_id);
                         }
                         result = recv => {
                             match result {
                                 Ok(value) => {
-                                    zlog::info!("{}: received {}", receiver_id, value);
+                                    log::info!("{}: received {}", receiver_id, value);
                                     assert_eq!(value, next_id.load(SeqCst) - 1);
                                     assert_ne!(value, prev_observed_value);
                                     prev_observed_value = value;
                                 }
                                 Err(NoSenderError) => {
-                                    zlog::info!("{}: closed", receiver_id);
+                                    log::info!("{}: closed", receiver_id);
                                     assert!(closed.load(SeqCst));
                                     break;
                                 }
@@ -287,6 +287,6 @@ mod tests {
 
     #[ctor::ctor]
     fn init_logger() {
-        zlog::init_test();
+        let _ = env_logger::try_init();
     }
 }
diff --git a/crates/web_search/Cargo.toml b/crates/web_search/Cargo.toml
deleted file mode 100644
index d0e32e71f0..0000000000
--- a/crates/web_search/Cargo.toml
+++ /dev/null
@@ -1,19 +0,0 @@
-[package]
-name = "web_search"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/web_search.rs"
-
-[dependencies]
-anyhow.workspace = true
-cloud_llm_client.workspace = true
-collections.workspace = true
-gpui.workspace = true
-serde.workspace = true
diff --git a/crates/web_search/LICENSE-GPL b/crates/web_search/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/web_search/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/web_search/src/web_search.rs b/crates/web_search/src/web_search.rs
deleted file mode 100644
index c381b91f39..0000000000
--- a/crates/web_search/src/web_search.rs
+++ /dev/null
@@ -1,72 +0,0 @@
-use std::sync::Arc;
-
-use anyhow::Result;
-use cloud_llm_client::WebSearchResponse;
-use collections::HashMap;
-use gpui::{App, AppContext as _, Context, Entity, Global, SharedString, Task};
-
-pub fn init(cx: &mut App) {
-    let registry = cx.new(|_cx| WebSearchRegistry::default());
-    cx.set_global(GlobalWebSearchRegistry(registry));
-}
-
-#[derive(Clone, Eq, PartialEq, Hash, Debug, Ord, PartialOrd)]
-pub struct WebSearchProviderId(pub SharedString);
-
-pub trait WebSearchProvider {
-    fn id(&self) -> WebSearchProviderId;
-    fn search(&self, query: String, cx: &mut App) -> Task<Result<WebSearchResponse>>;
-}
-
-struct GlobalWebSearchRegistry(Entity<WebSearchRegistry>);
-
-impl Global for GlobalWebSearchRegistry {}
-
-#[derive(Default)]
-pub struct WebSearchRegistry {
-    providers: HashMap<WebSearchProviderId, Arc<dyn WebSearchProvider>>,
-    active_provider: Option<Arc<dyn WebSearchProvider>>,
-}
-
-impl WebSearchRegistry {
-    pub fn global(cx: &App) -> Entity<Self> {
-        cx.global::<GlobalWebSearchRegistry>().0.clone()
-    }
-
-    pub fn read_global(cx: &App) -> &Self {
-        cx.global::<GlobalWebSearchRegistry>().0.read(cx)
-    }
-
-    pub fn providers(&self) -> impl Iterator<Item = &Arc<dyn WebSearchProvider>> {
-        self.providers.values()
-    }
-
-    pub fn active_provider(&self) -> Option<Arc<dyn WebSearchProvider>> {
-        self.active_provider.clone()
-    }
-
-    pub fn set_active_provider(&mut self, provider: Arc<dyn WebSearchProvider>) {
-        self.active_provider = Some(provider.clone());
-        self.providers.insert(provider.id(), provider);
-    }
-
-    pub fn register_provider<T: WebSearchProvider + 'static>(
-        &mut self,
-        provider: T,
-        _cx: &mut Context<Self>,
-    ) {
-        let id = provider.id();
-        let provider = Arc::new(provider);
-        self.providers.insert(id, provider.clone());
-        if self.active_provider.is_none() {
-            self.active_provider = Some(provider);
-        }
-    }
-
-    pub fn unregister_provider(&mut self, id: WebSearchProviderId) {
-        self.providers.remove(&id);
-        if self.active_provider.as_ref().map(|provider| provider.id()) == Some(id) {
-            self.active_provider = None;
-        }
-    }
-}
diff --git a/crates/web_search_providers/Cargo.toml b/crates/web_search_providers/Cargo.toml
deleted file mode 100644
index ecdca5883f..0000000000
--- a/crates/web_search_providers/Cargo.toml
+++ /dev/null
@@ -1,24 +0,0 @@
-[package]
-name = "web_search_providers"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/web_search_providers.rs"
-
-[dependencies]
-anyhow.workspace = true
-client.workspace = true
-cloud_llm_client.workspace = true
-futures.workspace = true
-gpui.workspace = true
-http_client.workspace = true
-language_model.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-web_search.workspace = true
diff --git a/crates/web_search_providers/LICENSE-GPL b/crates/web_search_providers/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/web_search_providers/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/web_search_providers/src/cloud.rs b/crates/web_search_providers/src/cloud.rs
deleted file mode 100644
index 75ffb1da63..0000000000
--- a/crates/web_search_providers/src/cloud.rs
+++ /dev/null
@@ -1,120 +0,0 @@
-use std::sync::Arc;
-
-use anyhow::{Context as _, Result};
-use client::Client;
-use cloud_llm_client::{EXPIRED_LLM_TOKEN_HEADER_NAME, WebSearchBody, WebSearchResponse};
-use futures::AsyncReadExt as _;
-use gpui::{App, AppContext, Context, Entity, Subscription, Task};
-use http_client::{HttpClient, Method};
-use language_model::{LlmApiToken, RefreshLlmTokenListener};
-use web_search::{WebSearchProvider, WebSearchProviderId};
-
-pub struct CloudWebSearchProvider {
-    state: Entity<State>,
-}
-
-impl CloudWebSearchProvider {
-    pub fn new(client: Arc<Client>, cx: &mut App) -> Self {
-        let state = cx.new(|cx| State::new(client, cx));
-
-        Self { state }
-    }
-}
-
-pub struct State {
-    client: Arc<Client>,
-    llm_api_token: LlmApiToken,
-    _llm_token_subscription: Subscription,
-}
-
-impl State {
-    pub fn new(client: Arc<Client>, cx: &mut Context<Self>) -> Self {
-        let refresh_llm_token_listener = RefreshLlmTokenListener::global(cx);
-
-        Self {
-            client,
-            llm_api_token: LlmApiToken::default(),
-            _llm_token_subscription: cx.subscribe(
-                &refresh_llm_token_listener,
-                |this, _, _event, cx| {
-                    let client = this.client.clone();
-                    let llm_api_token = this.llm_api_token.clone();
-                    cx.spawn(async move |_this, _cx| {
-                        llm_api_token.refresh(&client).await?;
-                        anyhow::Ok(())
-                    })
-                    .detach_and_log_err(cx);
-                },
-            ),
-        }
-    }
-}
-
-pub const ZED_WEB_SEARCH_PROVIDER_ID: &str = "zed.dev";
-
-impl WebSearchProvider for CloudWebSearchProvider {
-    fn id(&self) -> WebSearchProviderId {
-        WebSearchProviderId(ZED_WEB_SEARCH_PROVIDER_ID.into())
-    }
-
-    fn search(&self, query: String, cx: &mut App) -> Task<Result<WebSearchResponse>> {
-        let state = self.state.read(cx);
-        let client = state.client.clone();
-        let llm_api_token = state.llm_api_token.clone();
-        let body = WebSearchBody { query };
-        cx.background_spawn(async move { perform_web_search(client, llm_api_token, body).await })
-    }
-}
-
-async fn perform_web_search(
-    client: Arc<Client>,
-    llm_api_token: LlmApiToken,
-    body: WebSearchBody,
-) -> Result<WebSearchResponse> {
-    const MAX_RETRIES: usize = 3;
-
-    let http_client = &client.http_client();
-    let mut retries_remaining = MAX_RETRIES;
-    let mut token = llm_api_token.acquire(&client).await?;
-
-    loop {
-        if retries_remaining == 0 {
-            return Err(anyhow::anyhow!(
-                "error performing web search, max retries exceeded"
-            ));
-        }
-
-        let request = http_client::Request::builder()
-            .method(Method::POST)
-            .uri(http_client.build_zed_llm_url("/web_search", &[])?.as_ref())
-            .header("Content-Type", "application/json")
-            .header("Authorization", format!("Bearer {token}"))
-            .body(serde_json::to_string(&body)?.into())?;
-        let mut response = http_client
-            .send(request)
-            .await
-            .context("failed to send web search request")?;
-
-        if response.status().is_success() {
-            let mut body = String::new();
-            response.body_mut().read_to_string(&mut body).await?;
-            return Ok(serde_json::from_str(&body)?);
-        } else if response
-            .headers()
-            .get(EXPIRED_LLM_TOKEN_HEADER_NAME)
-            .is_some()
-        {
-            token = llm_api_token.refresh(&client).await?;
-            retries_remaining -= 1;
-        } else {
-            // For now we will only retry if the LLM token is expired,
-            // not if the request failed for any other reason.
-            let mut body = String::new();
-            response.body_mut().read_to_string(&mut body).await?;
-            anyhow::bail!(
-                "error performing web search.\nStatus: {:?}\nBody: {body}",
-                response.status(),
-            );
-        }
-    }
-}
diff --git a/crates/web_search_providers/src/web_search_providers.rs b/crates/web_search_providers/src/web_search_providers.rs
deleted file mode 100644
index 8ab0aee47a..0000000000
--- a/crates/web_search_providers/src/web_search_providers.rs
+++ /dev/null
@@ -1,56 +0,0 @@
-mod cloud;
-
-use client::Client;
-use gpui::{App, Context, Entity};
-use language_model::LanguageModelRegistry;
-use std::sync::Arc;
-use web_search::{WebSearchProviderId, WebSearchRegistry};
-
-pub fn init(client: Arc<Client>, cx: &mut App) {
-    let registry = WebSearchRegistry::global(cx);
-    registry.update(cx, |registry, cx| {
-        register_web_search_providers(registry, client, cx);
-    });
-}
-
-fn register_web_search_providers(
-    registry: &mut WebSearchRegistry,
-    client: Arc<Client>,
-    cx: &mut Context<WebSearchRegistry>,
-) {
-    register_zed_web_search_provider(
-        registry,
-        client.clone(),
-        &LanguageModelRegistry::global(cx),
-        cx,
-    );
-
-    cx.subscribe(
-        &LanguageModelRegistry::global(cx),
-        move |this, registry, event, cx| {
-            if let language_model::Event::DefaultModelChanged = event {
-                register_zed_web_search_provider(this, client.clone(), &registry, cx)
-            }
-        },
-    )
-    .detach();
-}
-
-fn register_zed_web_search_provider(
-    registry: &mut WebSearchRegistry,
-    client: Arc<Client>,
-    language_model_registry: &Entity<LanguageModelRegistry>,
-    cx: &mut Context<WebSearchRegistry>,
-) {
-    let using_zed_provider = language_model_registry
-        .read(cx)
-        .default_model()
-        .is_some_and(|default| default.is_provided_by_zed());
-    if using_zed_provider {
-        registry.register_provider(cloud::CloudWebSearchProvider::new(client, cx), cx)
-    } else {
-        registry.unregister_provider(WebSearchProviderId(
-            cloud::ZED_WEB_SEARCH_PROVIDER_ID.into(),
-        ));
-    }
-}
diff --git a/crates/workspace/Cargo.toml b/crates/workspace/Cargo.toml
deleted file mode 100644
index d5d3016ab2..0000000000
--- a/crates/workspace/Cargo.toml
+++ /dev/null
@@ -1,83 +0,0 @@
-[package]
-name = "workspace"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/workspace.rs"
-doctest = false
-
-[features]
-test-support = [
-    "call/test-support",
-    "client/test-support",
-    "http_client/test-support",
-    "db/test-support",
-    "project/test-support",
-    "session/test-support",
-    "settings/test-support",
-    "gpui/test-support",
-    "fs/test-support",
-]
-
-[dependencies]
-any_vec.workspace = true
-anyhow.workspace = true
-async-recursion.workspace = true
-call.workspace = true
-client.workspace = true
-clock.workspace = true
-collections.workspace = true
-component.workspace = true
-db.workspace = true
-fs.workspace = true
-futures.workspace = true
-gpui.workspace = true
-http_client.workspace = true
-itertools.workspace = true
-language.workspace = true
-log.workspace = true
-menu.workspace = true
-node_runtime.workspace = true
-parking_lot.workspace = true
-postage.workspace = true
-project.workspace = true
-remote.workspace = true
-schemars.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-session.workspace = true
-settings.workspace = true
-smallvec.workspace = true
-sqlez.workspace = true
-strum.workspace = true
-task.workspace = true
-telemetry.workspace = true
-theme.workspace = true
-ui.workspace = true
-util.workspace = true
-uuid.workspace = true
-zed_actions.workspace = true
-
-[target.'cfg(target_os = "windows")'.dependencies]
-windows.workspace = true
-
-[dev-dependencies]
-call = { workspace = true, features = ["test-support"] }
-client = { workspace = true, features = ["test-support"] }
-dap = { workspace = true, features = ["test-support"] }
-db = { workspace = true, features = ["test-support"] }
-fs = { workspace = true, features = ["test-support"] }
-gpui = { workspace = true, features = ["test-support"] }
-project = { workspace = true, features = ["test-support"] }
-session = { workspace = true, features = ["test-support"] }
-settings = { workspace = true, features = ["test-support"] }
-http_client = { workspace = true, features = ["test-support"] }
-pretty_assertions.workspace = true
-tempfile.workspace = true
-zlog.workspace = true
diff --git a/crates/workspace/LICENSE-GPL b/crates/workspace/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/workspace/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/workspace/src/dock.rs b/crates/workspace/src/dock.rs
deleted file mode 100644
index dfc341db9c..0000000000
--- a/crates/workspace/src/dock.rs
+++ /dev/null
@@ -1,1095 +0,0 @@
-use crate::persistence::model::DockData;
-use crate::{DraggedDock, Event, ModalLayer, Pane};
-use crate::{Workspace, status_bar::StatusItemView};
-use anyhow::Context as _;
-use client::proto;
-use gpui::{
-    Action, AnyView, App, Axis, Context, Corner, Entity, EntityId, EventEmitter, FocusHandle,
-    Focusable, IntoElement, KeyContext, MouseButton, MouseDownEvent, MouseUpEvent, ParentElement,
-    Render, SharedString, StyleRefinement, Styled, Subscription, WeakEntity, Window, deferred, div,
-    px,
-};
-use settings::SettingsStore;
-use std::sync::Arc;
-use ui::{ContextMenu, Divider, DividerColor, IconButton, Tooltip, h_flex};
-use ui::{prelude::*, right_click_menu};
-
-pub(crate) const RESIZE_HANDLE_SIZE: Pixels = px(6.);
-
-pub enum PanelEvent {
-    ZoomIn,
-    ZoomOut,
-    Activate,
-    Close,
-}
-
-pub use proto::PanelId;
-
-pub trait Panel: Focusable + EventEmitter<PanelEvent> + Render + Sized {
-    fn persistent_name() -> &'static str;
-    fn panel_key() -> &'static str;
-    fn position(&self, window: &Window, cx: &App) -> DockPosition;
-    fn position_is_valid(&self, position: DockPosition) -> bool;
-    fn set_position(&mut self, position: DockPosition, window: &mut Window, cx: &mut Context<Self>);
-    fn size(&self, window: &Window, cx: &App) -> Pixels;
-    fn set_size(&mut self, size: Option<Pixels>, window: &mut Window, cx: &mut Context<Self>);
-    fn icon(&self, window: &Window, cx: &App) -> Option<ui::IconName>;
-    fn icon_tooltip(&self, window: &Window, cx: &App) -> Option<&'static str>;
-    fn toggle_action(&self) -> Box<dyn Action>;
-    fn icon_label(&self, _window: &Window, _: &App) -> Option<String> {
-        None
-    }
-    fn is_zoomed(&self, _window: &Window, _cx: &App) -> bool {
-        false
-    }
-    fn starts_open(&self, _window: &Window, _cx: &App) -> bool {
-        false
-    }
-    fn set_zoomed(&mut self, _zoomed: bool, _window: &mut Window, _cx: &mut Context<Self>) {}
-    fn set_active(&mut self, _active: bool, _window: &mut Window, _cx: &mut Context<Self>) {}
-    fn pane(&self) -> Option<Entity<Pane>> {
-        None
-    }
-    fn remote_id() -> Option<proto::PanelId> {
-        None
-    }
-    fn activation_priority(&self) -> u32;
-    fn enabled(&self, _cx: &App) -> bool {
-        true
-    }
-}
-
-pub trait PanelHandle: Send + Sync {
-    fn panel_id(&self) -> EntityId;
-    fn persistent_name(&self) -> &'static str;
-    fn panel_key(&self) -> &'static str;
-    fn position(&self, window: &Window, cx: &App) -> DockPosition;
-    fn position_is_valid(&self, position: DockPosition, cx: &App) -> bool;
-    fn set_position(&self, position: DockPosition, window: &mut Window, cx: &mut App);
-    fn is_zoomed(&self, window: &Window, cx: &App) -> bool;
-    fn set_zoomed(&self, zoomed: bool, window: &mut Window, cx: &mut App);
-    fn set_active(&self, active: bool, window: &mut Window, cx: &mut App);
-    fn remote_id(&self) -> Option<proto::PanelId>;
-    fn pane(&self, cx: &App) -> Option<Entity<Pane>>;
-    fn size(&self, window: &Window, cx: &App) -> Pixels;
-    fn set_size(&self, size: Option<Pixels>, window: &mut Window, cx: &mut App);
-    fn icon(&self, window: &Window, cx: &App) -> Option<ui::IconName>;
-    fn icon_tooltip(&self, window: &Window, cx: &App) -> Option<&'static str>;
-    fn toggle_action(&self, window: &Window, cx: &App) -> Box<dyn Action>;
-    fn icon_label(&self, window: &Window, cx: &App) -> Option<String>;
-    fn panel_focus_handle(&self, cx: &App) -> FocusHandle;
-    fn to_any(&self) -> AnyView;
-    fn activation_priority(&self, cx: &App) -> u32;
-    fn enabled(&self, cx: &App) -> bool;
-    fn move_to_next_position(&self, window: &mut Window, cx: &mut App) {
-        let current_position = self.position(window, cx);
-        let next_position = [
-            DockPosition::Left,
-            DockPosition::Bottom,
-            DockPosition::Right,
-        ]
-        .into_iter()
-        .filter(|position| self.position_is_valid(*position, cx))
-        .skip_while(|valid_position| *valid_position != current_position)
-        .nth(1)
-        .unwrap_or(DockPosition::Left);
-
-        self.set_position(next_position, window, cx);
-    }
-}
-
-impl<T> PanelHandle for Entity<T>
-where
-    T: Panel,
-{
-    fn panel_id(&self) -> EntityId {
-        Entity::entity_id(self)
-    }
-
-    fn persistent_name(&self) -> &'static str {
-        T::persistent_name()
-    }
-
-    fn panel_key(&self) -> &'static str {
-        T::panel_key()
-    }
-
-    fn position(&self, window: &Window, cx: &App) -> DockPosition {
-        self.read(cx).position(window, cx)
-    }
-
-    fn position_is_valid(&self, position: DockPosition, cx: &App) -> bool {
-        self.read(cx).position_is_valid(position)
-    }
-
-    fn set_position(&self, position: DockPosition, window: &mut Window, cx: &mut App) {
-        self.update(cx, |this, cx| this.set_position(position, window, cx))
-    }
-
-    fn is_zoomed(&self, window: &Window, cx: &App) -> bool {
-        self.read(cx).is_zoomed(window, cx)
-    }
-
-    fn set_zoomed(&self, zoomed: bool, window: &mut Window, cx: &mut App) {
-        self.update(cx, |this, cx| this.set_zoomed(zoomed, window, cx))
-    }
-
-    fn set_active(&self, active: bool, window: &mut Window, cx: &mut App) {
-        self.update(cx, |this, cx| this.set_active(active, window, cx))
-    }
-
-    fn pane(&self, cx: &App) -> Option<Entity<Pane>> {
-        self.read(cx).pane()
-    }
-
-    fn remote_id(&self) -> Option<PanelId> {
-        T::remote_id()
-    }
-
-    fn size(&self, window: &Window, cx: &App) -> Pixels {
-        self.read(cx).size(window, cx)
-    }
-
-    fn set_size(&self, size: Option<Pixels>, window: &mut Window, cx: &mut App) {
-        self.update(cx, |this, cx| this.set_size(size, window, cx))
-    }
-
-    fn icon(&self, window: &Window, cx: &App) -> Option<ui::IconName> {
-        self.read(cx).icon(window, cx)
-    }
-
-    fn icon_tooltip(&self, window: &Window, cx: &App) -> Option<&'static str> {
-        self.read(cx).icon_tooltip(window, cx)
-    }
-
-    fn toggle_action(&self, _: &Window, cx: &App) -> Box<dyn Action> {
-        self.read(cx).toggle_action()
-    }
-
-    fn icon_label(&self, window: &Window, cx: &App) -> Option<String> {
-        self.read(cx).icon_label(window, cx)
-    }
-
-    fn to_any(&self) -> AnyView {
-        self.clone().into()
-    }
-
-    fn panel_focus_handle(&self, cx: &App) -> FocusHandle {
-        self.read(cx).focus_handle(cx)
-    }
-
-    fn activation_priority(&self, cx: &App) -> u32 {
-        self.read(cx).activation_priority()
-    }
-
-    fn enabled(&self, cx: &App) -> bool {
-        self.read(cx).enabled(cx)
-    }
-}
-
-impl From<&dyn PanelHandle> for AnyView {
-    fn from(val: &dyn PanelHandle) -> Self {
-        val.to_any()
-    }
-}
-
-/// A container with a fixed [`DockPosition`] adjacent to a certain widown edge.
-/// Can contain multiple panels and show/hide itself with all contents.
-pub struct Dock {
-    position: DockPosition,
-    panel_entries: Vec<PanelEntry>,
-    workspace: WeakEntity<Workspace>,
-    is_open: bool,
-    active_panel_index: Option<usize>,
-    focus_handle: FocusHandle,
-    pub(crate) serialized_dock: Option<DockData>,
-    zoom_layer_open: bool,
-    modal_layer: Entity<ModalLayer>,
-    _subscriptions: [Subscription; 2],
-}
-
-impl Focusable for Dock {
-    fn focus_handle(&self, _: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub enum DockPosition {
-    Left,
-    Bottom,
-    Right,
-}
-
-impl From<settings::DockPosition> for DockPosition {
-    fn from(value: settings::DockPosition) -> Self {
-        match value {
-            settings::DockPosition::Left => Self::Left,
-            settings::DockPosition::Bottom => Self::Bottom,
-            settings::DockPosition::Right => Self::Right,
-        }
-    }
-}
-
-impl Into<settings::DockPosition> for DockPosition {
-    fn into(self) -> settings::DockPosition {
-        match self {
-            Self::Left => settings::DockPosition::Left,
-            Self::Bottom => settings::DockPosition::Bottom,
-            Self::Right => settings::DockPosition::Right,
-        }
-    }
-}
-
-impl DockPosition {
-    fn label(&self) -> &'static str {
-        match self {
-            Self::Left => "Left",
-            Self::Bottom => "Bottom",
-            Self::Right => "Right",
-        }
-    }
-
-    pub fn axis(&self) -> Axis {
-        match self {
-            Self::Left | Self::Right => Axis::Horizontal,
-            Self::Bottom => Axis::Vertical,
-        }
-    }
-}
-
-struct PanelEntry {
-    panel: Arc<dyn PanelHandle>,
-    _subscriptions: [Subscription; 3],
-}
-
-pub struct PanelButtons {
-    dock: Entity<Dock>,
-    _settings_subscription: Subscription,
-}
-
-impl Dock {
-    pub fn new(
-        position: DockPosition,
-        modal_layer: Entity<ModalLayer>,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) -> Entity<Self> {
-        let focus_handle = cx.focus_handle();
-        let workspace = cx.entity();
-        let dock = cx.new(|cx| {
-            let focus_subscription =
-                cx.on_focus(&focus_handle, window, |dock: &mut Dock, window, cx| {
-                    if let Some(active_entry) = dock.active_panel_entry() {
-                        active_entry.panel.panel_focus_handle(cx).focus(window)
-                    }
-                });
-            let zoom_subscription = cx.subscribe(&workspace, |dock, workspace, e: &Event, cx| {
-                if matches!(e, Event::ZoomChanged) {
-                    let is_zoomed = workspace.read(cx).zoomed.is_some();
-                    dock.zoom_layer_open = is_zoomed;
-                }
-            });
-            Self {
-                position,
-                workspace: workspace.downgrade(),
-                panel_entries: Default::default(),
-                active_panel_index: None,
-                is_open: false,
-                focus_handle: focus_handle.clone(),
-                _subscriptions: [focus_subscription, zoom_subscription],
-                serialized_dock: None,
-                zoom_layer_open: false,
-                modal_layer,
-            }
-        });
-
-        cx.on_focus_in(&focus_handle, window, {
-            let dock = dock.downgrade();
-            move |workspace, window, cx| {
-                let Some(dock) = dock.upgrade() else {
-                    return;
-                };
-                let Some(panel) = dock.read(cx).active_panel() else {
-                    return;
-                };
-                if panel.is_zoomed(window, cx) {
-                    workspace.zoomed = Some(panel.to_any().downgrade());
-                    workspace.zoomed_position = Some(position);
-                } else {
-                    workspace.zoomed = None;
-                    workspace.zoomed_position = None;
-                }
-                cx.emit(Event::ZoomChanged);
-                workspace.dismiss_zoomed_items_to_reveal(Some(position), window, cx);
-                workspace.update_active_view_for_followers(window, cx)
-            }
-        })
-        .detach();
-
-        cx.observe_in(&dock, window, move |workspace, dock, window, cx| {
-            if dock.read(cx).is_open()
-                && let Some(panel) = dock.read(cx).active_panel()
-                && panel.is_zoomed(window, cx)
-            {
-                workspace.zoomed = Some(panel.to_any().downgrade());
-                workspace.zoomed_position = Some(position);
-                cx.emit(Event::ZoomChanged);
-                return;
-            }
-            if workspace.zoomed_position == Some(position) {
-                workspace.zoomed = None;
-                workspace.zoomed_position = None;
-                cx.emit(Event::ZoomChanged);
-            }
-        })
-        .detach();
-
-        dock
-    }
-
-    pub fn position(&self) -> DockPosition {
-        self.position
-    }
-
-    pub fn is_open(&self) -> bool {
-        self.is_open
-    }
-
-    fn resizable(&self, cx: &App) -> bool {
-        !(self.zoom_layer_open || self.modal_layer.read(cx).has_active_modal())
-    }
-
-    pub fn panel<T: Panel>(&self) -> Option<Entity<T>> {
-        self.panel_entries
-            .iter()
-            .find_map(|entry| entry.panel.to_any().downcast().ok())
-    }
-
-    pub fn panel_index_for_type<T: Panel>(&self) -> Option<usize> {
-        self.panel_entries
-            .iter()
-            .position(|entry| entry.panel.to_any().downcast::<T>().is_ok())
-    }
-
-    pub fn panel_index_for_persistent_name(&self, ui_name: &str, _cx: &App) -> Option<usize> {
-        self.panel_entries
-            .iter()
-            .position(|entry| entry.panel.persistent_name() == ui_name)
-    }
-
-    pub fn panel_index_for_proto_id(&self, panel_id: PanelId) -> Option<usize> {
-        self.panel_entries
-            .iter()
-            .position(|entry| entry.panel.remote_id() == Some(panel_id))
-    }
-
-    pub fn first_enabled_panel_idx(&mut self, cx: &mut Context<Self>) -> anyhow::Result<usize> {
-        self.panel_entries
-            .iter()
-            .position(|entry| entry.panel.enabled(cx))
-            .with_context(|| {
-                format!(
-                    "Couldn't find any enabled panel for the {} dock.",
-                    self.position.label()
-                )
-            })
-    }
-
-    fn active_panel_entry(&self) -> Option<&PanelEntry> {
-        self.active_panel_index
-            .and_then(|index| self.panel_entries.get(index))
-    }
-
-    pub fn active_panel_index(&self) -> Option<usize> {
-        self.active_panel_index
-    }
-
-    pub fn set_open(&mut self, open: bool, window: &mut Window, cx: &mut Context<Self>) {
-        if open != self.is_open {
-            self.is_open = open;
-            if let Some(active_panel) = self.active_panel_entry() {
-                active_panel.panel.set_active(open, window, cx);
-            }
-
-            cx.notify();
-        }
-    }
-
-    pub fn set_panel_zoomed(
-        &mut self,
-        panel: &AnyView,
-        zoomed: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        for entry in &mut self.panel_entries {
-            if entry.panel.panel_id() == panel.entity_id() {
-                if zoomed != entry.panel.is_zoomed(window, cx) {
-                    entry.panel.set_zoomed(zoomed, window, cx);
-                }
-            } else if entry.panel.is_zoomed(window, cx) {
-                entry.panel.set_zoomed(false, window, cx);
-            }
-        }
-
-        self.workspace
-            .update(cx, |workspace, cx| {
-                workspace.serialize_workspace(window, cx);
-            })
-            .ok();
-        cx.notify();
-    }
-
-    pub fn zoom_out(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        for entry in &mut self.panel_entries {
-            if entry.panel.is_zoomed(window, cx) {
-                entry.panel.set_zoomed(false, window, cx);
-            }
-        }
-    }
-
-    pub(crate) fn add_panel<T: Panel>(
-        &mut self,
-        panel: Entity<T>,
-        workspace: WeakEntity<Workspace>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> usize {
-        let subscriptions = [
-            cx.observe(&panel, |_, _, cx| cx.notify()),
-            cx.observe_global_in::<SettingsStore>(window, {
-                let workspace = workspace.clone();
-                let panel = panel.clone();
-
-                move |this, window, cx| {
-                    let new_position = panel.read(cx).position(window, cx);
-                    if new_position == this.position {
-                        return;
-                    }
-
-                    let Ok(new_dock) = workspace.update(cx, |workspace, cx| {
-                        if panel.is_zoomed(window, cx) {
-                            workspace.zoomed_position = Some(new_position);
-                        }
-                        match new_position {
-                            DockPosition::Left => &workspace.left_dock,
-                            DockPosition::Bottom => &workspace.bottom_dock,
-                            DockPosition::Right => &workspace.right_dock,
-                        }
-                        .clone()
-                    }) else {
-                        return;
-                    };
-
-                    let was_visible = this.is_open()
-                        && this.visible_panel().is_some_and(|active_panel| {
-                            active_panel.panel_id() == Entity::entity_id(&panel)
-                        });
-
-                    this.remove_panel(&panel, window, cx);
-
-                    new_dock.update(cx, |new_dock, cx| {
-                        new_dock.remove_panel(&panel, window, cx);
-                        let index =
-                            new_dock.add_panel(panel.clone(), workspace.clone(), window, cx);
-                        if was_visible {
-                            new_dock.set_open(true, window, cx);
-                            new_dock.activate_panel(index, window, cx);
-                        }
-                    });
-                }
-            }),
-            cx.subscribe_in(
-                &panel,
-                window,
-                move |this, panel, event, window, cx| match event {
-                    PanelEvent::ZoomIn => {
-                        this.set_panel_zoomed(&panel.to_any(), true, window, cx);
-                        if !PanelHandle::panel_focus_handle(panel, cx).contains_focused(window, cx)
-                        {
-                            window.focus(&panel.focus_handle(cx));
-                        }
-                        workspace
-                            .update(cx, |workspace, cx| {
-                                workspace.zoomed = Some(panel.downgrade().into());
-                                workspace.zoomed_position =
-                                    Some(panel.read(cx).position(window, cx));
-                                cx.emit(Event::ZoomChanged);
-                            })
-                            .ok();
-                    }
-                    PanelEvent::ZoomOut => {
-                        this.set_panel_zoomed(&panel.to_any(), false, window, cx);
-                        workspace
-                            .update(cx, |workspace, cx| {
-                                if workspace.zoomed_position == Some(this.position) {
-                                    workspace.zoomed = None;
-                                    workspace.zoomed_position = None;
-                                    cx.emit(Event::ZoomChanged);
-                                }
-                                cx.notify();
-                            })
-                            .ok();
-                    }
-                    PanelEvent::Activate => {
-                        if let Some(ix) = this
-                            .panel_entries
-                            .iter()
-                            .position(|entry| entry.panel.panel_id() == Entity::entity_id(panel))
-                        {
-                            this.set_open(true, window, cx);
-                            this.activate_panel(ix, window, cx);
-                            window.focus(&panel.read(cx).focus_handle(cx));
-                        }
-                    }
-                    PanelEvent::Close => {
-                        if this
-                            .visible_panel()
-                            .is_some_and(|p| p.panel_id() == Entity::entity_id(panel))
-                        {
-                            this.set_open(false, window, cx);
-                        }
-                    }
-                },
-            ),
-        ];
-
-        let index = match self
-            .panel_entries
-            .binary_search_by_key(&panel.read(cx).activation_priority(), |entry| {
-                entry.panel.activation_priority(cx)
-            }) {
-            Ok(ix) => {
-                if cfg!(debug_assertions) {
-                    panic!(
-                        "Panels `{}` and `{}` have the same activation priority. Each panel must have a unique priority so the status bar order is deterministic.",
-                        T::panel_key(),
-                        self.panel_entries[ix].panel.panel_key()
-                    );
-                }
-                ix
-            }
-            Err(ix) => ix,
-        };
-        if let Some(active_index) = self.active_panel_index.as_mut()
-            && *active_index >= index
-        {
-            *active_index += 1;
-        }
-        self.panel_entries.insert(
-            index,
-            PanelEntry {
-                panel: Arc::new(panel.clone()),
-                _subscriptions: subscriptions,
-            },
-        );
-
-        self.restore_state(window, cx);
-        if panel.read(cx).starts_open(window, cx) {
-            self.activate_panel(index, window, cx);
-            self.set_open(true, window, cx);
-        }
-
-        cx.notify();
-        index
-    }
-
-    pub fn restore_state(&mut self, window: &mut Window, cx: &mut Context<Self>) -> bool {
-        if let Some(serialized) = self.serialized_dock.clone() {
-            if let Some(active_panel) = serialized.active_panel.filter(|_| serialized.visible)
-                && let Some(idx) = self.panel_index_for_persistent_name(active_panel.as_str(), cx)
-            {
-                self.activate_panel(idx, window, cx);
-            }
-
-            if serialized.zoom
-                && let Some(panel) = self.active_panel()
-            {
-                panel.set_zoomed(true, window, cx)
-            }
-            self.set_open(serialized.visible, window, cx);
-            return true;
-        }
-        false
-    }
-
-    pub fn remove_panel<T: Panel>(
-        &mut self,
-        panel: &Entity<T>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(panel_ix) = self
-            .panel_entries
-            .iter()
-            .position(|entry| entry.panel.panel_id() == Entity::entity_id(panel))
-        {
-            if let Some(active_panel_index) = self.active_panel_index.as_mut() {
-                match panel_ix.cmp(active_panel_index) {
-                    std::cmp::Ordering::Less => {
-                        *active_panel_index -= 1;
-                    }
-                    std::cmp::Ordering::Equal => {
-                        self.active_panel_index = None;
-                        self.set_open(false, window, cx);
-                    }
-                    std::cmp::Ordering::Greater => {}
-                }
-            }
-            self.panel_entries.remove(panel_ix);
-            cx.notify();
-        }
-    }
-
-    pub fn panels_len(&self) -> usize {
-        self.panel_entries.len()
-    }
-
-    pub fn activate_panel(&mut self, panel_ix: usize, window: &mut Window, cx: &mut Context<Self>) {
-        if Some(panel_ix) != self.active_panel_index {
-            if let Some(active_panel) = self.active_panel_entry() {
-                active_panel.panel.set_active(false, window, cx);
-            }
-
-            self.active_panel_index = Some(panel_ix);
-            if let Some(active_panel) = self.active_panel_entry() {
-                active_panel.panel.set_active(true, window, cx);
-            }
-
-            cx.notify();
-        }
-    }
-
-    pub fn visible_panel(&self) -> Option<&Arc<dyn PanelHandle>> {
-        let entry = self.visible_entry()?;
-        Some(&entry.panel)
-    }
-
-    pub fn active_panel(&self) -> Option<&Arc<dyn PanelHandle>> {
-        let panel_entry = self.active_panel_entry()?;
-        Some(&panel_entry.panel)
-    }
-
-    fn visible_entry(&self) -> Option<&PanelEntry> {
-        if self.is_open {
-            self.active_panel_entry()
-        } else {
-            None
-        }
-    }
-
-    pub fn zoomed_panel(&self, window: &Window, cx: &App) -> Option<Arc<dyn PanelHandle>> {
-        let entry = self.visible_entry()?;
-        if entry.panel.is_zoomed(window, cx) {
-            Some(entry.panel.clone())
-        } else {
-            None
-        }
-    }
-
-    pub fn panel_size(&self, panel: &dyn PanelHandle, window: &Window, cx: &App) -> Option<Pixels> {
-        self.panel_entries
-            .iter()
-            .find(|entry| entry.panel.panel_id() == panel.panel_id())
-            .map(|entry| entry.panel.size(window, cx))
-    }
-
-    pub fn active_panel_size(&self, window: &Window, cx: &App) -> Option<Pixels> {
-        if self.is_open {
-            self.active_panel_entry()
-                .map(|entry| entry.panel.size(window, cx))
-        } else {
-            None
-        }
-    }
-
-    pub fn resize_active_panel(
-        &mut self,
-        size: Option<Pixels>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(entry) = self.active_panel_entry() {
-            let size = size.map(|size| size.max(RESIZE_HANDLE_SIZE).round());
-
-            entry.panel.set_size(size, window, cx);
-            cx.notify();
-        }
-    }
-
-    pub fn resize_all_panels(
-        &mut self,
-        size: Option<Pixels>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        for entry in &mut self.panel_entries {
-            let size = size.map(|size| size.max(RESIZE_HANDLE_SIZE).round());
-            entry.panel.set_size(size, window, cx);
-        }
-        cx.notify();
-    }
-
-    pub fn toggle_action(&self) -> Box<dyn Action> {
-        match self.position {
-            DockPosition::Left => crate::ToggleLeftDock.boxed_clone(),
-            DockPosition::Bottom => crate::ToggleBottomDock.boxed_clone(),
-            DockPosition::Right => crate::ToggleRightDock.boxed_clone(),
-        }
-    }
-
-    fn dispatch_context() -> KeyContext {
-        let mut dispatch_context = KeyContext::new_with_defaults();
-        dispatch_context.add("Dock");
-
-        dispatch_context
-    }
-
-    pub fn clamp_panel_size(&mut self, max_size: Pixels, window: &mut Window, cx: &mut App) {
-        let max_size = (max_size - RESIZE_HANDLE_SIZE).abs();
-        for panel in self.panel_entries.iter().map(|entry| &entry.panel) {
-            if panel.size(window, cx) > max_size {
-                panel.set_size(Some(max_size.max(RESIZE_HANDLE_SIZE)), window, cx);
-            }
-        }
-    }
-}
-
-impl Render for Dock {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let dispatch_context = Self::dispatch_context();
-        if let Some(entry) = self.visible_entry() {
-            let size = entry.panel.size(window, cx);
-
-            let position = self.position;
-            let create_resize_handle = || {
-                let handle = div()
-                    .id("resize-handle")
-                    .on_drag(DraggedDock(position), |dock, _, _, cx| {
-                        cx.stop_propagation();
-                        cx.new(|_| dock.clone())
-                    })
-                    .on_mouse_down(
-                        MouseButton::Left,
-                        cx.listener(|_, _: &MouseDownEvent, _, cx| {
-                            cx.stop_propagation();
-                        }),
-                    )
-                    .on_mouse_up(
-                        MouseButton::Left,
-                        cx.listener(|dock, e: &MouseUpEvent, window, cx| {
-                            if e.click_count == 2 {
-                                dock.resize_active_panel(None, window, cx);
-                                dock.workspace
-                                    .update(cx, |workspace, cx| {
-                                        workspace.serialize_workspace(window, cx);
-                                    })
-                                    .ok();
-                                cx.stop_propagation();
-                            }
-                        }),
-                    )
-                    .occlude();
-                match self.position() {
-                    DockPosition::Left => deferred(
-                        handle
-                            .absolute()
-                            .right(-RESIZE_HANDLE_SIZE / 2.)
-                            .top(px(0.))
-                            .h_full()
-                            .w(RESIZE_HANDLE_SIZE)
-                            .cursor_col_resize(),
-                    ),
-                    DockPosition::Bottom => deferred(
-                        handle
-                            .absolute()
-                            .top(-RESIZE_HANDLE_SIZE / 2.)
-                            .left(px(0.))
-                            .w_full()
-                            .h(RESIZE_HANDLE_SIZE)
-                            .cursor_row_resize(),
-                    ),
-                    DockPosition::Right => deferred(
-                        handle
-                            .absolute()
-                            .top(px(0.))
-                            .left(-RESIZE_HANDLE_SIZE / 2.)
-                            .h_full()
-                            .w(RESIZE_HANDLE_SIZE)
-                            .cursor_col_resize(),
-                    ),
-                }
-            };
-
-            div()
-                .key_context(dispatch_context)
-                .track_focus(&self.focus_handle(cx))
-                .flex()
-                .bg(cx.theme().colors().panel_background)
-                .border_color(cx.theme().colors().border)
-                .overflow_hidden()
-                .map(|this| match self.position().axis() {
-                    Axis::Horizontal => this.w(size).h_full().flex_row(),
-                    Axis::Vertical => this.h(size).w_full().flex_col(),
-                })
-                .map(|this| match self.position() {
-                    DockPosition::Left => this.border_r_1(),
-                    DockPosition::Right => this.border_l_1(),
-                    DockPosition::Bottom => this.border_t_1(),
-                })
-                .child(
-                    div()
-                        .map(|this| match self.position().axis() {
-                            Axis::Horizontal => this.min_w(size).h_full(),
-                            Axis::Vertical => this.min_h(size).w_full(),
-                        })
-                        .child(
-                            entry
-                                .panel
-                                .to_any()
-                                .cached(StyleRefinement::default().v_flex().size_full()),
-                        ),
-                )
-                .when(self.resizable(cx), |this| {
-                    this.child(create_resize_handle())
-                })
-        } else {
-            div()
-                .key_context(dispatch_context)
-                .track_focus(&self.focus_handle(cx))
-        }
-    }
-}
-
-impl PanelButtons {
-    pub fn new(dock: Entity<Dock>, cx: &mut Context<Self>) -> Self {
-        cx.observe(&dock, |_, _, cx| cx.notify()).detach();
-        let settings_subscription = cx.observe_global::<SettingsStore>(|_, cx| cx.notify());
-        Self {
-            dock,
-            _settings_subscription: settings_subscription,
-        }
-    }
-}
-
-impl Render for PanelButtons {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let dock = self.dock.read(cx);
-        let active_index = dock.active_panel_index;
-        let is_open = dock.is_open;
-        let dock_position = dock.position;
-
-        let (menu_anchor, menu_attach) = match dock.position {
-            DockPosition::Left => (Corner::BottomLeft, Corner::TopLeft),
-            DockPosition::Bottom | DockPosition::Right => (Corner::BottomRight, Corner::TopRight),
-        };
-
-        let buttons: Vec<_> = dock
-            .panel_entries
-            .iter()
-            .enumerate()
-            .filter_map(|(i, entry)| {
-                let icon = entry.panel.icon(window, cx)?;
-                let icon_tooltip = entry.panel.icon_tooltip(window, cx)?;
-                let name = entry.panel.persistent_name();
-                let panel = entry.panel.clone();
-
-                let is_active_button = Some(i) == active_index && is_open;
-                let (action, tooltip) = if is_active_button {
-                    let action = dock.toggle_action();
-
-                    let tooltip: SharedString =
-                        format!("Close {} Dock", dock.position.label()).into();
-
-                    (action, tooltip)
-                } else {
-                    let action = entry.panel.toggle_action(window, cx);
-
-                    (action, icon_tooltip.into())
-                };
-
-                let focus_handle = dock.focus_handle(cx);
-
-                Some(
-                    right_click_menu(name)
-                        .menu(move |window, cx| {
-                            const POSITIONS: [DockPosition; 3] = [
-                                DockPosition::Left,
-                                DockPosition::Right,
-                                DockPosition::Bottom,
-                            ];
-
-                            ContextMenu::build(window, cx, |mut menu, _, cx| {
-                                for position in POSITIONS {
-                                    if position != dock_position
-                                        && panel.position_is_valid(position, cx)
-                                    {
-                                        let panel = panel.clone();
-                                        menu = menu.entry(
-                                            format!("Dock {}", position.label()),
-                                            None,
-                                            move |window, cx| {
-                                                panel.set_position(position, window, cx);
-                                            },
-                                        )
-                                    }
-                                }
-                                menu
-                            })
-                        })
-                        .anchor(menu_anchor)
-                        .attach(menu_attach)
-                        .trigger(move |is_active, _window, _cx| {
-                            IconButton::new(name, icon)
-                                .icon_size(IconSize::Small)
-                                .toggle_state(is_active_button)
-                                .on_click({
-                                    let action = action.boxed_clone();
-                                    move |_, window, cx| {
-                                        telemetry::event!(
-                                            "Panel Button Clicked",
-                                            name = name,
-                                            toggle_state = !is_open
-                                        );
-                                        window.focus(&focus_handle);
-                                        window.dispatch_action(action.boxed_clone(), cx)
-                                    }
-                                })
-                                .when(!is_active, |this| {
-                                    this.tooltip(move |_window, cx| {
-                                        Tooltip::for_action(tooltip.clone(), &*action, cx)
-                                    })
-                                })
-                        }),
-                )
-            })
-            .collect();
-
-        let has_buttons = !buttons.is_empty();
-
-        h_flex()
-            .gap_1()
-            .when(
-                has_buttons && dock.position == DockPosition::Bottom,
-                |this| this.child(Divider::vertical().color(DividerColor::Border)),
-            )
-            .children(buttons)
-            .when(has_buttons && dock.position == DockPosition::Left, |this| {
-                this.child(Divider::vertical().color(DividerColor::Border))
-            })
-    }
-}
-
-impl StatusItemView for PanelButtons {
-    fn set_active_pane_item(
-        &mut self,
-        _active_pane_item: Option<&dyn crate::ItemHandle>,
-        _window: &mut Window,
-        _cx: &mut Context<Self>,
-    ) {
-        // Nothing to do, panel buttons don't depend on the active center item
-    }
-}
-
-#[cfg(any(test, feature = "test-support"))]
-pub mod test {
-    use super::*;
-    use gpui::{App, Context, Window, actions, div};
-
-    pub struct TestPanel {
-        pub position: DockPosition,
-        pub zoomed: bool,
-        pub active: bool,
-        pub focus_handle: FocusHandle,
-        pub size: Pixels,
-        pub activation_priority: u32,
-    }
-    actions!(test_only, [ToggleTestPanel]);
-
-    impl EventEmitter<PanelEvent> for TestPanel {}
-
-    impl TestPanel {
-        pub fn new(position: DockPosition, activation_priority: u32, cx: &mut App) -> Self {
-            Self {
-                position,
-                zoomed: false,
-                active: false,
-                focus_handle: cx.focus_handle(),
-                size: px(300.),
-                activation_priority,
-            }
-        }
-    }
-
-    impl Render for TestPanel {
-        fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-            div().id("test").track_focus(&self.focus_handle(cx))
-        }
-    }
-
-    impl Panel for TestPanel {
-        fn persistent_name() -> &'static str {
-            "TestPanel"
-        }
-
-        fn panel_key() -> &'static str {
-            "TestPanel"
-        }
-
-        fn position(&self, _window: &Window, _: &App) -> super::DockPosition {
-            self.position
-        }
-
-        fn position_is_valid(&self, _: super::DockPosition) -> bool {
-            true
-        }
-
-        fn set_position(&mut self, position: DockPosition, _: &mut Window, cx: &mut Context<Self>) {
-            self.position = position;
-            cx.update_global::<SettingsStore, _>(|_, _| {});
-        }
-
-        fn size(&self, _window: &Window, _: &App) -> Pixels {
-            self.size
-        }
-
-        fn set_size(&mut self, size: Option<Pixels>, _window: &mut Window, _: &mut Context<Self>) {
-            self.size = size.unwrap_or(px(300.));
-        }
-
-        fn icon(&self, _window: &Window, _: &App) -> Option<ui::IconName> {
-            None
-        }
-
-        fn icon_tooltip(&self, _window: &Window, _cx: &App) -> Option<&'static str> {
-            None
-        }
-
-        fn toggle_action(&self) -> Box<dyn Action> {
-            ToggleTestPanel.boxed_clone()
-        }
-
-        fn is_zoomed(&self, _window: &Window, _: &App) -> bool {
-            self.zoomed
-        }
-
-        fn set_zoomed(&mut self, zoomed: bool, _window: &mut Window, _cx: &mut Context<Self>) {
-            self.zoomed = zoomed;
-        }
-
-        fn set_active(&mut self, active: bool, _window: &mut Window, _cx: &mut Context<Self>) {
-            self.active = active;
-        }
-
-        fn activation_priority(&self) -> u32 {
-            self.activation_priority
-        }
-    }
-
-    impl Focusable for TestPanel {
-        fn focus_handle(&self, _cx: &App) -> FocusHandle {
-            self.focus_handle.clone()
-        }
-    }
-}
diff --git a/crates/workspace/src/history_manager.rs b/crates/workspace/src/history_manager.rs
deleted file mode 100644
index 1b80e7c012..0000000000
--- a/crates/workspace/src/history_manager.rs
+++ /dev/null
@@ -1,136 +0,0 @@
-use std::path::PathBuf;
-
-use gpui::{AppContext, Entity, Global, MenuItem};
-use smallvec::SmallVec;
-use ui::App;
-use util::{ResultExt, paths::PathExt};
-
-use crate::{
-    NewWindow, SerializedWorkspaceLocation, WORKSPACE_DB, WorkspaceId, path_list::PathList,
-};
-
-pub fn init(cx: &mut App) {
-    let manager = cx.new(|_| HistoryManager::new());
-    HistoryManager::set_global(manager.clone(), cx);
-    HistoryManager::init(manager, cx);
-}
-
-pub struct HistoryManager {
-    /// The history of workspaces that have been opened in the past, in reverse order.
-    /// The most recent workspace is at the end of the vector.
-    history: Vec<HistoryManagerEntry>,
-}
-
-#[derive(Debug)]
-pub struct HistoryManagerEntry {
-    pub id: WorkspaceId,
-    pub path: SmallVec<[PathBuf; 2]>,
-}
-
-struct GlobalHistoryManager(Entity<HistoryManager>);
-
-impl Global for GlobalHistoryManager {}
-
-impl HistoryManager {
-    fn new() -> Self {
-        Self {
-            history: Vec::new(),
-        }
-    }
-
-    fn init(this: Entity<HistoryManager>, cx: &App) {
-        cx.spawn(async move |cx| {
-            let recent_folders = WORKSPACE_DB
-                .recent_workspaces_on_disk()
-                .await
-                .unwrap_or_default()
-                .into_iter()
-                .rev()
-                .filter_map(|(id, location, paths)| {
-                    if matches!(location, SerializedWorkspaceLocation::Local) {
-                        Some(HistoryManagerEntry::new(id, &paths))
-                    } else {
-                        None
-                    }
-                })
-                .collect::<Vec<_>>();
-            this.update(cx, |this, cx| {
-                this.history = recent_folders;
-                this.update_jump_list(cx);
-            })
-        })
-        .detach();
-    }
-
-    pub fn global(cx: &App) -> Option<Entity<Self>> {
-        cx.try_global::<GlobalHistoryManager>()
-            .map(|model| model.0.clone())
-    }
-
-    fn set_global(history_manager: Entity<Self>, cx: &mut App) {
-        cx.set_global(GlobalHistoryManager(history_manager));
-    }
-
-    pub fn update_history(&mut self, id: WorkspaceId, entry: HistoryManagerEntry, cx: &App) {
-        if let Some(pos) = self.history.iter().position(|e| e.id == id) {
-            self.history.remove(pos);
-        }
-        self.history.push(entry);
-        self.update_jump_list(cx);
-    }
-
-    pub fn delete_history(&mut self, id: WorkspaceId, cx: &App) {
-        let Some(pos) = self.history.iter().position(|e| e.id == id) else {
-            return;
-        };
-        self.history.remove(pos);
-        self.update_jump_list(cx);
-    }
-
-    fn update_jump_list(&mut self, cx: &App) {
-        let menus = vec![MenuItem::action("New Window", NewWindow)];
-        let entries = self
-            .history
-            .iter()
-            .rev()
-            .map(|entry| entry.path.clone())
-            .collect::<Vec<_>>();
-        let user_removed = cx.update_jump_list(menus, entries);
-        self.remove_user_removed_workspaces(user_removed, cx);
-    }
-
-    pub fn remove_user_removed_workspaces(
-        &mut self,
-        user_removed: Vec<SmallVec<[PathBuf; 2]>>,
-        cx: &App,
-    ) {
-        if user_removed.is_empty() {
-            return;
-        }
-        let mut deleted_ids = Vec::new();
-        for idx in (0..self.history.len()).rev() {
-            if let Some(entry) = self.history.get(idx)
-                && user_removed.contains(&entry.path)
-            {
-                deleted_ids.push(entry.id);
-                self.history.remove(idx);
-            }
-        }
-        cx.spawn(async move |_| {
-            for id in deleted_ids.iter() {
-                WORKSPACE_DB.delete_workspace_by_id(*id).await.log_err();
-            }
-        })
-        .detach();
-    }
-}
-
-impl HistoryManagerEntry {
-    pub fn new(id: WorkspaceId, paths: &PathList) -> Self {
-        let path = paths
-            .ordered_paths()
-            .map(|path| path.compact())
-            .collect::<SmallVec<[PathBuf; 2]>>();
-        Self { id, path }
-    }
-}
diff --git a/crates/workspace/src/invalid_item_view.rs b/crates/workspace/src/invalid_item_view.rs
deleted file mode 100644
index 08242a1ed0..0000000000
--- a/crates/workspace/src/invalid_item_view.rs
+++ /dev/null
@@ -1,114 +0,0 @@
-use std::{path::Path, sync::Arc};
-
-use gpui::{EventEmitter, FocusHandle, Focusable};
-use ui::{
-    App, Button, ButtonCommon, ButtonStyle, Clickable, Context, FluentBuilder, InteractiveElement,
-    KeyBinding, Label, LabelCommon, LabelSize, ParentElement, Render, SharedString, Styled as _,
-    Window, h_flex, v_flex,
-};
-use zed_actions::workspace::OpenWithSystem;
-
-use crate::Item;
-
-/// A view to display when a certain buffer/image/other item fails to open.
-#[derive(Debug)]
-pub struct InvalidItemView {
-    /// Which path was attempted to open.
-    pub abs_path: Arc<Path>,
-    /// An error message, happened when opening the item.
-    pub error: SharedString,
-    is_local: bool,
-    focus_handle: FocusHandle,
-}
-
-impl InvalidItemView {
-    pub fn new(
-        abs_path: &Path,
-        is_local: bool,
-        e: &anyhow::Error,
-        _: &mut Window,
-        cx: &mut App,
-    ) -> Self {
-        Self {
-            is_local,
-            abs_path: Arc::from(abs_path),
-            error: format!("{}", e.root_cause()).into(),
-            focus_handle: cx.focus_handle(),
-        }
-    }
-}
-
-impl Item for InvalidItemView {
-    type Event = ();
-
-    fn tab_content_text(&self, mut detail: usize, _: &App) -> SharedString {
-        // Ensure we always render at least the filename.
-        detail += 1;
-
-        let path = self.abs_path.as_ref();
-
-        let mut prefix = path;
-        while detail > 0 {
-            if let Some(parent) = prefix.parent() {
-                prefix = parent;
-                detail -= 1;
-            } else {
-                break;
-            }
-        }
-
-        let path = if detail > 0 {
-            path
-        } else {
-            path.strip_prefix(prefix).unwrap_or(path)
-        };
-
-        SharedString::new(path.to_string_lossy())
-    }
-}
-
-impl EventEmitter<()> for InvalidItemView {}
-
-impl Focusable for InvalidItemView {
-    fn focus_handle(&self, _: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl Render for InvalidItemView {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl gpui::IntoElement {
-        let abs_path = self.abs_path.clone();
-        v_flex()
-            .size_full()
-            .track_focus(&self.focus_handle(cx))
-            .flex_none()
-            .justify_center()
-            .overflow_hidden()
-            .key_context("InvalidItem")
-            .child(
-                h_flex().size_full().justify_center().child(
-                    v_flex()
-                        .justify_center()
-                        .gap_2()
-                        .child(h_flex().justify_center().child("Could not open file"))
-                        .child(
-                            h_flex()
-                                .justify_center()
-                                .child(Label::new(self.error.clone()).size(LabelSize::Small)),
-                        )
-                        .when(self.is_local, |contents| {
-                            contents.child(
-                                h_flex().justify_center().child(
-                                    Button::new("open-with-system", "Open in Default App")
-                                        .on_click(move |_, _, cx| {
-                                            cx.open_with_system(&abs_path);
-                                        })
-                                        .style(ButtonStyle::Outlined)
-                                        .key_binding(KeyBinding::for_action(&OpenWithSystem, cx)),
-                                ),
-                            )
-                        }),
-                ),
-            )
-    }
-}
diff --git a/crates/workspace/src/item.rs b/crates/workspace/src/item.rs
deleted file mode 100644
index 42eb754c21..0000000000
--- a/crates/workspace/src/item.rs
+++ /dev/null
@@ -1,1694 +0,0 @@
-use crate::{
-    CollaboratorId, DelayedDebouncedEditAction, FollowableViewRegistry, ItemNavHistory,
-    SerializableItemRegistry, ToolbarItemLocation, ViewId, Workspace, WorkspaceId,
-    invalid_item_view::InvalidItemView,
-    pane::{self, Pane},
-    persistence::model::ItemId,
-    searchable::SearchableItemHandle,
-    workspace_settings::{AutosaveSetting, WorkspaceSettings},
-};
-use anyhow::Result;
-use client::{Client, proto};
-use futures::{StreamExt, channel::mpsc};
-use gpui::{
-    Action, AnyElement, AnyEntity, AnyView, App, AppContext, Context, Entity, EntityId,
-    EventEmitter, FocusHandle, Focusable, Font, HighlightStyle, Pixels, Point, Render,
-    SharedString, Task, WeakEntity, Window,
-};
-use project::{Project, ProjectEntryId, ProjectPath};
-pub use settings::{
-    ActivateOnClose, ClosePosition, RegisterSetting, Settings, SettingsLocation, ShowCloseButton,
-    ShowDiagnostics,
-};
-use smallvec::SmallVec;
-use std::{
-    any::{Any, TypeId},
-    cell::RefCell,
-    ops::Range,
-    path::Path,
-    rc::Rc,
-    sync::Arc,
-    time::Duration,
-};
-use theme::Theme;
-use ui::{Color, Icon, IntoElement, Label, LabelCommon};
-use util::ResultExt;
-
-pub const LEADER_UPDATE_THROTTLE: Duration = Duration::from_millis(200);
-
-#[derive(Clone, Copy, Debug)]
-pub struct SaveOptions {
-    pub format: bool,
-    pub autosave: bool,
-}
-
-impl Default for SaveOptions {
-    fn default() -> Self {
-        Self {
-            format: true,
-            autosave: false,
-        }
-    }
-}
-
-#[derive(RegisterSetting)]
-pub struct ItemSettings {
-    pub git_status: bool,
-    pub close_position: ClosePosition,
-    pub activate_on_close: ActivateOnClose,
-    pub file_icons: bool,
-    pub show_diagnostics: ShowDiagnostics,
-    pub show_close_button: ShowCloseButton,
-}
-
-#[derive(RegisterSetting)]
-pub struct PreviewTabsSettings {
-    pub enabled: bool,
-    pub enable_preview_from_project_panel: bool,
-    pub enable_preview_from_file_finder: bool,
-    pub enable_preview_from_multibuffer: bool,
-    pub enable_preview_multibuffer_from_code_navigation: bool,
-    pub enable_preview_file_from_code_navigation: bool,
-    pub enable_keep_preview_on_code_navigation: bool,
-}
-
-impl Settings for ItemSettings {
-    fn from_settings(content: &settings::SettingsContent) -> Self {
-        let tabs = content.tabs.as_ref().unwrap();
-        Self {
-            git_status: tabs.git_status.unwrap(),
-            close_position: tabs.close_position.unwrap(),
-            activate_on_close: tabs.activate_on_close.unwrap(),
-            file_icons: tabs.file_icons.unwrap(),
-            show_diagnostics: tabs.show_diagnostics.unwrap(),
-            show_close_button: tabs.show_close_button.unwrap(),
-        }
-    }
-}
-
-impl Settings for PreviewTabsSettings {
-    fn from_settings(content: &settings::SettingsContent) -> Self {
-        let preview_tabs = content.preview_tabs.as_ref().unwrap();
-        Self {
-            enabled: preview_tabs.enabled.unwrap(),
-            enable_preview_from_project_panel: preview_tabs
-                .enable_preview_from_project_panel
-                .unwrap(),
-            enable_preview_from_file_finder: preview_tabs.enable_preview_from_file_finder.unwrap(),
-            enable_preview_from_multibuffer: preview_tabs.enable_preview_from_multibuffer.unwrap(),
-            enable_preview_multibuffer_from_code_navigation: preview_tabs
-                .enable_preview_multibuffer_from_code_navigation
-                .unwrap(),
-            enable_preview_file_from_code_navigation: preview_tabs
-                .enable_preview_file_from_code_navigation
-                .unwrap(),
-            enable_keep_preview_on_code_navigation: preview_tabs
-                .enable_keep_preview_on_code_navigation
-                .unwrap(),
-        }
-    }
-}
-
-#[derive(Clone, Copy, Eq, PartialEq, Hash, Debug)]
-pub enum ItemEvent {
-    CloseItem,
-    UpdateTab,
-    UpdateBreadcrumbs,
-    Edit,
-}
-
-// TODO: Combine this with existing HighlightedText struct?
-pub struct BreadcrumbText {
-    pub text: String,
-    pub highlights: Option<Vec<(Range<usize>, HighlightStyle)>>,
-    pub font: Option<Font>,
-}
-
-#[derive(Clone, Copy, Default, Debug)]
-pub struct TabContentParams {
-    pub detail: Option<usize>,
-    pub selected: bool,
-    pub preview: bool,
-    /// Tab content should be deemphasized when active pane does not have focus.
-    pub deemphasized: bool,
-}
-
-impl TabContentParams {
-    /// Returns the text color to be used for the tab content.
-    pub fn text_color(&self) -> Color {
-        if self.deemphasized {
-            if self.selected {
-                Color::Muted
-            } else {
-                Color::Hidden
-            }
-        } else if self.selected {
-            Color::Default
-        } else {
-            Color::Muted
-        }
-    }
-}
-
-pub enum TabTooltipContent {
-    Text(SharedString),
-    Custom(Box<dyn Fn(&mut Window, &mut App) -> AnyView>),
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub enum ItemBufferKind {
-    Multibuffer,
-    Singleton,
-    None,
-}
-
-pub trait Item: Focusable + EventEmitter<Self::Event> + Render + Sized {
-    type Event;
-
-    /// Returns the tab contents.
-    ///
-    /// By default this returns a [`Label`] that displays that text from
-    /// `tab_content_text`.
-    fn tab_content(&self, params: TabContentParams, _window: &Window, cx: &App) -> AnyElement {
-        let text = self.tab_content_text(params.detail.unwrap_or_default(), cx);
-
-        Label::new(text)
-            .color(params.text_color())
-            .into_any_element()
-    }
-
-    /// Returns the textual contents of the tab.
-    fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString;
-
-    /// Returns the suggested filename for saving this item.
-    /// By default, returns the tab content text.
-    fn suggested_filename(&self, cx: &App) -> SharedString {
-        self.tab_content_text(0, cx)
-    }
-
-    fn tab_icon(&self, _window: &Window, _cx: &App) -> Option<Icon> {
-        None
-    }
-
-    /// Returns the tab tooltip text.
-    ///
-    /// Use this if you don't need to customize the tab tooltip content.
-    fn tab_tooltip_text(&self, _: &App) -> Option<SharedString> {
-        None
-    }
-
-    /// Returns the tab tooltip content.
-    ///
-    /// By default this returns a Tooltip text from
-    /// `tab_tooltip_text`.
-    fn tab_tooltip_content(&self, cx: &App) -> Option<TabTooltipContent> {
-        self.tab_tooltip_text(cx).map(TabTooltipContent::Text)
-    }
-
-    fn to_item_events(_event: &Self::Event, _f: impl FnMut(ItemEvent)) {}
-
-    fn deactivated(&mut self, _window: &mut Window, _: &mut Context<Self>) {}
-    fn discarded(&self, _project: Entity<Project>, _window: &mut Window, _cx: &mut Context<Self>) {}
-    fn on_removed(&self, _cx: &App) {}
-    fn workspace_deactivated(&mut self, _window: &mut Window, _: &mut Context<Self>) {}
-    fn navigate(&mut self, _: Box<dyn Any>, _window: &mut Window, _: &mut Context<Self>) -> bool {
-        false
-    }
-
-    fn telemetry_event_text(&self) -> Option<&'static str> {
-        None
-    }
-
-    /// (model id, Item)
-    fn for_each_project_item(
-        &self,
-        _: &App,
-        _: &mut dyn FnMut(EntityId, &dyn project::ProjectItem),
-    ) {
-    }
-    fn buffer_kind(&self, _cx: &App) -> ItemBufferKind {
-        ItemBufferKind::None
-    }
-    fn set_nav_history(&mut self, _: ItemNavHistory, _window: &mut Window, _: &mut Context<Self>) {}
-
-    fn can_split(&self) -> bool {
-        false
-    }
-    fn clone_on_split(
-        &self,
-        workspace_id: Option<WorkspaceId>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Option<Entity<Self>>>
-    where
-        Self: Sized,
-    {
-        _ = (workspace_id, window, cx);
-        unimplemented!("clone_on_split() must be implemented if can_split() returns true")
-    }
-    fn is_dirty(&self, _: &App) -> bool {
-        false
-    }
-    fn has_deleted_file(&self, _: &App) -> bool {
-        false
-    }
-    fn has_conflict(&self, _: &App) -> bool {
-        false
-    }
-    fn can_save(&self, _cx: &App) -> bool {
-        false
-    }
-    fn can_save_as(&self, _: &App) -> bool {
-        false
-    }
-    fn save(
-        &mut self,
-        _options: SaveOptions,
-        _project: Entity<Project>,
-        _window: &mut Window,
-        _cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        unimplemented!("save() must be implemented if can_save() returns true")
-    }
-    fn save_as(
-        &mut self,
-        _project: Entity<Project>,
-        _path: ProjectPath,
-        _window: &mut Window,
-        _cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        unimplemented!("save_as() must be implemented if can_save() returns true")
-    }
-    fn reload(
-        &mut self,
-        _project: Entity<Project>,
-        _window: &mut Window,
-        _cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        unimplemented!("reload() must be implemented if can_save() returns true")
-    }
-
-    fn act_as_type<'a>(
-        &'a self,
-        type_id: TypeId,
-        self_handle: &'a Entity<Self>,
-        _: &'a App,
-    ) -> Option<AnyEntity> {
-        if TypeId::of::<Self>() == type_id {
-            Some(self_handle.clone().into())
-        } else {
-            None
-        }
-    }
-
-    fn as_searchable(&self, _: &Entity<Self>, _: &App) -> Option<Box<dyn SearchableItemHandle>> {
-        None
-    }
-
-    fn breadcrumb_location(&self, _: &App) -> ToolbarItemLocation {
-        ToolbarItemLocation::Hidden
-    }
-
-    fn breadcrumbs(&self, _theme: &Theme, _cx: &App) -> Option<Vec<BreadcrumbText>> {
-        None
-    }
-
-    /// Returns optional elements to render to the left of the breadcrumb.
-    fn breadcrumb_prefix(
-        &self,
-        _window: &mut Window,
-        _cx: &mut Context<Self>,
-    ) -> Option<gpui::AnyElement> {
-        None
-    }
-
-    fn added_to_workspace(
-        &mut self,
-        _workspace: &mut Workspace,
-        _window: &mut Window,
-        _cx: &mut Context<Self>,
-    ) {
-    }
-
-    fn show_toolbar(&self) -> bool {
-        true
-    }
-
-    fn pixel_position_of_cursor(&self, _: &App) -> Option<Point<Pixels>> {
-        None
-    }
-
-    fn preserve_preview(&self, _cx: &App) -> bool {
-        false
-    }
-
-    fn include_in_nav_history() -> bool {
-        true
-    }
-}
-
-pub trait SerializableItem: Item {
-    fn serialized_item_kind() -> &'static str;
-
-    fn cleanup(
-        workspace_id: WorkspaceId,
-        alive_items: Vec<ItemId>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<()>>;
-
-    fn deserialize(
-        _project: Entity<Project>,
-        _workspace: WeakEntity<Workspace>,
-        _workspace_id: WorkspaceId,
-        _item_id: ItemId,
-        _window: &mut Window,
-        _cx: &mut App,
-    ) -> Task<Result<Entity<Self>>>;
-
-    fn serialize(
-        &mut self,
-        workspace: &mut Workspace,
-        item_id: ItemId,
-        closing: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Task<Result<()>>>;
-
-    fn should_serialize(&self, event: &Self::Event) -> bool;
-}
-
-pub trait SerializableItemHandle: ItemHandle {
-    fn serialized_item_kind(&self) -> &'static str;
-    fn serialize(
-        &self,
-        workspace: &mut Workspace,
-        closing: bool,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<Task<Result<()>>>;
-    fn should_serialize(&self, event: &dyn Any, cx: &App) -> bool;
-}
-
-impl<T> SerializableItemHandle for Entity<T>
-where
-    T: SerializableItem,
-{
-    fn serialized_item_kind(&self) -> &'static str {
-        T::serialized_item_kind()
-    }
-
-    fn serialize(
-        &self,
-        workspace: &mut Workspace,
-        closing: bool,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<Task<Result<()>>> {
-        self.update(cx, |this, cx| {
-            this.serialize(workspace, cx.entity_id().as_u64(), closing, window, cx)
-        })
-    }
-
-    fn should_serialize(&self, event: &dyn Any, cx: &App) -> bool {
-        event
-            .downcast_ref::<T::Event>()
-            .is_some_and(|event| self.read(cx).should_serialize(event))
-    }
-}
-
-pub trait ItemHandle: 'static + Send {
-    fn item_focus_handle(&self, cx: &App) -> FocusHandle;
-    fn subscribe_to_item_events(
-        &self,
-        window: &mut Window,
-        cx: &mut App,
-        handler: Box<dyn Fn(ItemEvent, &mut Window, &mut App)>,
-    ) -> gpui::Subscription;
-    fn tab_content(&self, params: TabContentParams, window: &Window, cx: &App) -> AnyElement;
-    fn tab_content_text(&self, detail: usize, cx: &App) -> SharedString;
-    fn suggested_filename(&self, cx: &App) -> SharedString;
-    fn tab_icon(&self, window: &Window, cx: &App) -> Option<Icon>;
-    fn tab_tooltip_text(&self, cx: &App) -> Option<SharedString>;
-    fn tab_tooltip_content(&self, cx: &App) -> Option<TabTooltipContent>;
-    fn telemetry_event_text(&self, cx: &App) -> Option<&'static str>;
-    fn dragged_tab_content(
-        &self,
-        params: TabContentParams,
-        window: &Window,
-        cx: &App,
-    ) -> AnyElement;
-    fn project_path(&self, cx: &App) -> Option<ProjectPath>;
-    fn project_entry_ids(&self, cx: &App) -> SmallVec<[ProjectEntryId; 3]>;
-    fn project_paths(&self, cx: &App) -> SmallVec<[ProjectPath; 3]>;
-    fn project_item_model_ids(&self, cx: &App) -> SmallVec<[EntityId; 3]>;
-    fn for_each_project_item(
-        &self,
-        _: &App,
-        _: &mut dyn FnMut(EntityId, &dyn project::ProjectItem),
-    );
-    fn buffer_kind(&self, cx: &App) -> ItemBufferKind;
-    fn boxed_clone(&self) -> Box<dyn ItemHandle>;
-    fn can_split(&self, cx: &App) -> bool;
-    fn clone_on_split(
-        &self,
-        workspace_id: Option<WorkspaceId>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Option<Box<dyn ItemHandle>>>;
-    fn added_to_pane(
-        &self,
-        workspace: &mut Workspace,
-        pane: Entity<Pane>,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    );
-    fn deactivated(&self, window: &mut Window, cx: &mut App);
-    fn on_removed(&self, cx: &App);
-    fn workspace_deactivated(&self, window: &mut Window, cx: &mut App);
-    fn navigate(&self, data: Box<dyn Any>, window: &mut Window, cx: &mut App) -> bool;
-    fn item_id(&self) -> EntityId;
-    fn to_any_view(&self) -> AnyView;
-    fn is_dirty(&self, cx: &App) -> bool;
-    fn has_deleted_file(&self, cx: &App) -> bool;
-    fn has_conflict(&self, cx: &App) -> bool;
-    fn can_save(&self, cx: &App) -> bool;
-    fn can_save_as(&self, cx: &App) -> bool;
-    fn save(
-        &self,
-        options: SaveOptions,
-        project: Entity<Project>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<()>>;
-    fn save_as(
-        &self,
-        project: Entity<Project>,
-        path: ProjectPath,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<()>>;
-    fn reload(
-        &self,
-        project: Entity<Project>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<()>>;
-    fn act_as_type(&self, type_id: TypeId, cx: &App) -> Option<AnyEntity>;
-    fn to_followable_item_handle(&self, cx: &App) -> Option<Box<dyn FollowableItemHandle>>;
-    fn to_serializable_item_handle(&self, cx: &App) -> Option<Box<dyn SerializableItemHandle>>;
-    fn on_release(
-        &self,
-        cx: &mut App,
-        callback: Box<dyn FnOnce(&mut App) + Send>,
-    ) -> gpui::Subscription;
-    fn to_searchable_item_handle(&self, cx: &App) -> Option<Box<dyn SearchableItemHandle>>;
-    fn breadcrumb_location(&self, cx: &App) -> ToolbarItemLocation;
-    fn breadcrumbs(&self, theme: &Theme, cx: &App) -> Option<Vec<BreadcrumbText>>;
-    fn breadcrumb_prefix(&self, window: &mut Window, cx: &mut App) -> Option<gpui::AnyElement>;
-    fn show_toolbar(&self, cx: &App) -> bool;
-    fn pixel_position_of_cursor(&self, cx: &App) -> Option<Point<Pixels>>;
-    fn downgrade_item(&self) -> Box<dyn WeakItemHandle>;
-    fn workspace_settings<'a>(&self, cx: &'a App) -> &'a WorkspaceSettings;
-    fn preserve_preview(&self, cx: &App) -> bool;
-    fn include_in_nav_history(&self) -> bool;
-    fn relay_action(&self, action: Box<dyn Action>, window: &mut Window, cx: &mut App);
-    fn can_autosave(&self, cx: &App) -> bool {
-        let is_deleted = self.project_entry_ids(cx).is_empty();
-        self.is_dirty(cx) && !self.has_conflict(cx) && self.can_save(cx) && !is_deleted
-    }
-}
-
-pub trait WeakItemHandle: Send + Sync {
-    fn id(&self) -> EntityId;
-    fn boxed_clone(&self) -> Box<dyn WeakItemHandle>;
-    fn upgrade(&self) -> Option<Box<dyn ItemHandle>>;
-}
-
-impl dyn ItemHandle {
-    pub fn downcast<V: 'static>(&self) -> Option<Entity<V>> {
-        self.to_any_view().downcast().ok()
-    }
-
-    pub fn act_as<V: 'static>(&self, cx: &App) -> Option<Entity<V>> {
-        self.act_as_type(TypeId::of::<V>(), cx)
-            .and_then(|t| t.downcast().ok())
-    }
-}
-
-impl<T: Item> ItemHandle for Entity<T> {
-    fn subscribe_to_item_events(
-        &self,
-        window: &mut Window,
-        cx: &mut App,
-        handler: Box<dyn Fn(ItemEvent, &mut Window, &mut App)>,
-    ) -> gpui::Subscription {
-        window.subscribe(self, cx, move |_, event, window, cx| {
-            T::to_item_events(event, |item_event| handler(item_event, window, cx));
-        })
-    }
-
-    fn item_focus_handle(&self, cx: &App) -> FocusHandle {
-        self.read(cx).focus_handle(cx)
-    }
-
-    fn telemetry_event_text(&self, cx: &App) -> Option<&'static str> {
-        self.read(cx).telemetry_event_text()
-    }
-
-    fn tab_content(&self, params: TabContentParams, window: &Window, cx: &App) -> AnyElement {
-        self.read(cx).tab_content(params, window, cx)
-    }
-    fn tab_content_text(&self, detail: usize, cx: &App) -> SharedString {
-        self.read(cx).tab_content_text(detail, cx)
-    }
-
-    fn suggested_filename(&self, cx: &App) -> SharedString {
-        self.read(cx).suggested_filename(cx)
-    }
-
-    fn tab_icon(&self, window: &Window, cx: &App) -> Option<Icon> {
-        self.read(cx).tab_icon(window, cx)
-    }
-
-    fn tab_tooltip_content(&self, cx: &App) -> Option<TabTooltipContent> {
-        self.read(cx).tab_tooltip_content(cx)
-    }
-
-    fn tab_tooltip_text(&self, cx: &App) -> Option<SharedString> {
-        self.read(cx).tab_tooltip_text(cx)
-    }
-
-    fn dragged_tab_content(
-        &self,
-        params: TabContentParams,
-        window: &Window,
-        cx: &App,
-    ) -> AnyElement {
-        self.read(cx).tab_content(
-            TabContentParams {
-                selected: true,
-                ..params
-            },
-            window,
-            cx,
-        )
-    }
-
-    fn project_path(&self, cx: &App) -> Option<ProjectPath> {
-        let this = self.read(cx);
-        let mut result = None;
-        if this.buffer_kind(cx) == ItemBufferKind::Singleton {
-            this.for_each_project_item(cx, &mut |_, item| {
-                result = item.project_path(cx);
-            });
-        }
-        result
-    }
-
-    fn workspace_settings<'a>(&self, cx: &'a App) -> &'a WorkspaceSettings {
-        if let Some(project_path) = self.project_path(cx) {
-            WorkspaceSettings::get(
-                Some(SettingsLocation {
-                    worktree_id: project_path.worktree_id,
-                    path: &project_path.path,
-                }),
-                cx,
-            )
-        } else {
-            WorkspaceSettings::get_global(cx)
-        }
-    }
-
-    fn project_entry_ids(&self, cx: &App) -> SmallVec<[ProjectEntryId; 3]> {
-        let mut result = SmallVec::new();
-        self.read(cx).for_each_project_item(cx, &mut |_, item| {
-            if let Some(id) = item.entry_id(cx) {
-                result.push(id);
-            }
-        });
-        result
-    }
-
-    fn project_paths(&self, cx: &App) -> SmallVec<[ProjectPath; 3]> {
-        let mut result = SmallVec::new();
-        self.read(cx).for_each_project_item(cx, &mut |_, item| {
-            if let Some(id) = item.project_path(cx) {
-                result.push(id);
-            }
-        });
-        result
-    }
-
-    fn project_item_model_ids(&self, cx: &App) -> SmallVec<[EntityId; 3]> {
-        let mut result = SmallVec::new();
-        self.read(cx).for_each_project_item(cx, &mut |id, _| {
-            result.push(id);
-        });
-        result
-    }
-
-    fn for_each_project_item(
-        &self,
-        cx: &App,
-        f: &mut dyn FnMut(EntityId, &dyn project::ProjectItem),
-    ) {
-        self.read(cx).for_each_project_item(cx, f)
-    }
-
-    fn buffer_kind(&self, cx: &App) -> ItemBufferKind {
-        self.read(cx).buffer_kind(cx)
-    }
-
-    fn boxed_clone(&self) -> Box<dyn ItemHandle> {
-        Box::new(self.clone())
-    }
-
-    fn can_split(&self, cx: &App) -> bool {
-        self.read(cx).can_split()
-    }
-
-    fn clone_on_split(
-        &self,
-        workspace_id: Option<WorkspaceId>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Option<Box<dyn ItemHandle>>> {
-        let task = self.update(cx, |item, cx| item.clone_on_split(workspace_id, window, cx));
-        cx.background_spawn(async move {
-            task.await
-                .map(|handle| Box::new(handle) as Box<dyn ItemHandle>)
-        })
-    }
-
-    fn added_to_pane(
-        &self,
-        workspace: &mut Workspace,
-        pane: Entity<Pane>,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        let weak_item = self.downgrade();
-        let history = pane.read(cx).nav_history_for_item(self);
-        self.update(cx, |this, cx| {
-            this.set_nav_history(history, window, cx);
-            this.added_to_workspace(workspace, window, cx);
-        });
-
-        if let Some(serializable_item) = self.to_serializable_item_handle(cx) {
-            workspace
-                .enqueue_item_serialization(serializable_item)
-                .log_err();
-        }
-
-        if workspace
-            .panes_by_item
-            .insert(self.item_id(), pane.downgrade())
-            .is_none()
-        {
-            let mut pending_autosave = DelayedDebouncedEditAction::new();
-            let (pending_update_tx, mut pending_update_rx) = mpsc::unbounded();
-            let pending_update = Rc::new(RefCell::new(None));
-
-            let mut send_follower_updates = None;
-            if let Some(item) = self.to_followable_item_handle(cx) {
-                let is_project_item = item.is_project_item(window, cx);
-                let item = item.downgrade();
-
-                send_follower_updates = Some(cx.spawn_in(window, {
-                    let pending_update = pending_update.clone();
-                    async move |workspace, cx| {
-                        while let Some(mut leader_id) = pending_update_rx.next().await {
-                            while let Ok(Some(id)) = pending_update_rx.try_next() {
-                                leader_id = id;
-                            }
-
-                            workspace.update_in(cx, |workspace, window, cx| {
-                                let Some(item) = item.upgrade() else { return };
-                                workspace.update_followers(
-                                    is_project_item,
-                                    proto::update_followers::Variant::UpdateView(
-                                        proto::UpdateView {
-                                            id: item
-                                                .remote_id(workspace.client(), window, cx)
-                                                .and_then(|id| id.to_proto()),
-                                            variant: pending_update.borrow_mut().take(),
-                                            leader_id,
-                                        },
-                                    ),
-                                    window,
-                                    cx,
-                                );
-                            })?;
-                            cx.background_executor().timer(LEADER_UPDATE_THROTTLE).await;
-                        }
-                        anyhow::Ok(())
-                    }
-                }));
-            }
-
-            let mut event_subscription = Some(cx.subscribe_in(
-                self,
-                window,
-                move |workspace, item: &Entity<T>, event, window, cx| {
-                    let pane = if let Some(pane) = workspace
-                        .panes_by_item
-                        .get(&item.item_id())
-                        .and_then(|pane| pane.upgrade())
-                    {
-                        pane
-                    } else {
-                        return;
-                    };
-
-                    if let Some(item) = item.to_followable_item_handle(cx) {
-                        let leader_id = workspace.leader_for_pane(&pane);
-
-                        if let Some(leader_id) = leader_id
-                            && let Some(FollowEvent::Unfollow) = item.to_follow_event(event)
-                        {
-                            workspace.unfollow(leader_id, window, cx);
-                        }
-
-                        if item.item_focus_handle(cx).contains_focused(window, cx) {
-                            match leader_id {
-                                Some(CollaboratorId::Agent) => {}
-                                Some(CollaboratorId::PeerId(leader_peer_id)) => {
-                                    item.add_event_to_update_proto(
-                                        event,
-                                        &mut pending_update.borrow_mut(),
-                                        window,
-                                        cx,
-                                    );
-                                    pending_update_tx.unbounded_send(Some(leader_peer_id)).ok();
-                                }
-                                None => {
-                                    item.add_event_to_update_proto(
-                                        event,
-                                        &mut pending_update.borrow_mut(),
-                                        window,
-                                        cx,
-                                    );
-                                    pending_update_tx.unbounded_send(None).ok();
-                                }
-                            }
-                        }
-                    }
-
-                    if let Some(item) = item.to_serializable_item_handle(cx)
-                        && item.should_serialize(event, cx)
-                    {
-                        workspace.enqueue_item_serialization(item).ok();
-                    }
-
-                    T::to_item_events(event, |event| match event {
-                        ItemEvent::CloseItem => {
-                            pane.update(cx, |pane, cx| {
-                                pane.close_item_by_id(
-                                    item.item_id(),
-                                    crate::SaveIntent::Close,
-                                    window,
-                                    cx,
-                                )
-                            })
-                            .detach_and_log_err(cx);
-                        }
-
-                        ItemEvent::UpdateTab => {
-                            workspace.update_item_dirty_state(item, window, cx);
-
-                            if item.has_deleted_file(cx)
-                                && !item.is_dirty(cx)
-                                && item.workspace_settings(cx).close_on_file_delete
-                            {
-                                let item_id = item.item_id();
-                                let close_item_task = pane.update(cx, |pane, cx| {
-                                    pane.close_item_by_id(
-                                        item_id,
-                                        crate::SaveIntent::Close,
-                                        window,
-                                        cx,
-                                    )
-                                });
-                                cx.spawn_in(window, {
-                                    let pane = pane.clone();
-                                    async move |_workspace, cx| {
-                                        close_item_task.await?;
-                                        pane.update(cx, |pane, _cx| {
-                                            pane.nav_history_mut().remove_item(item_id);
-                                        })
-                                    }
-                                })
-                                .detach_and_log_err(cx);
-                            } else {
-                                pane.update(cx, |_, cx| {
-                                    cx.emit(pane::Event::ChangeItemTitle);
-                                    cx.notify();
-                                });
-                            }
-                        }
-
-                        ItemEvent::Edit => {
-                            let autosave = item.workspace_settings(cx).autosave;
-
-                            if let AutosaveSetting::AfterDelay { milliseconds } = autosave {
-                                let delay = Duration::from_millis(milliseconds.0);
-                                let item = item.clone();
-                                pending_autosave.fire_new(
-                                    delay,
-                                    window,
-                                    cx,
-                                    move |workspace, window, cx| {
-                                        Pane::autosave_item(
-                                            &item,
-                                            workspace.project().clone(),
-                                            window,
-                                            cx,
-                                        )
-                                    },
-                                );
-                            }
-                            pane.update(cx, |pane, cx| pane.handle_item_edit(item.item_id(), cx));
-                        }
-
-                        _ => {}
-                    });
-                },
-            ));
-
-            cx.on_blur(
-                &self.read(cx).focus_handle(cx),
-                window,
-                move |workspace, window, cx| {
-                    if let Some(item) = weak_item.upgrade()
-                        && item.workspace_settings(cx).autosave == AutosaveSetting::OnFocusChange
-                    {
-                        Pane::autosave_item(&item, workspace.project.clone(), window, cx)
-                            .detach_and_log_err(cx);
-                    }
-                },
-            )
-            .detach();
-
-            let item_id = self.item_id();
-            workspace.update_item_dirty_state(self, window, cx);
-            cx.observe_release_in(self, window, move |workspace, _, _, _| {
-                workspace.panes_by_item.remove(&item_id);
-                event_subscription.take();
-                send_follower_updates.take();
-            })
-            .detach();
-        }
-
-        cx.defer_in(window, |workspace, window, cx| {
-            workspace.serialize_workspace(window, cx);
-        });
-    }
-
-    fn deactivated(&self, window: &mut Window, cx: &mut App) {
-        self.update(cx, |this, cx| this.deactivated(window, cx));
-    }
-
-    fn on_removed(&self, cx: &App) {
-        self.read(cx).on_removed(cx);
-    }
-
-    fn workspace_deactivated(&self, window: &mut Window, cx: &mut App) {
-        self.update(cx, |this, cx| this.workspace_deactivated(window, cx));
-    }
-
-    fn navigate(&self, data: Box<dyn Any>, window: &mut Window, cx: &mut App) -> bool {
-        self.update(cx, |this, cx| this.navigate(data, window, cx))
-    }
-
-    fn item_id(&self) -> EntityId {
-        self.entity_id()
-    }
-
-    fn to_any_view(&self) -> AnyView {
-        self.clone().into()
-    }
-
-    fn is_dirty(&self, cx: &App) -> bool {
-        self.read(cx).is_dirty(cx)
-    }
-
-    fn has_deleted_file(&self, cx: &App) -> bool {
-        self.read(cx).has_deleted_file(cx)
-    }
-
-    fn has_conflict(&self, cx: &App) -> bool {
-        self.read(cx).has_conflict(cx)
-    }
-
-    fn can_save(&self, cx: &App) -> bool {
-        self.read(cx).can_save(cx)
-    }
-
-    fn can_save_as(&self, cx: &App) -> bool {
-        self.read(cx).can_save_as(cx)
-    }
-
-    fn save(
-        &self,
-        options: SaveOptions,
-        project: Entity<Project>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<()>> {
-        self.update(cx, |item, cx| item.save(options, project, window, cx))
-    }
-
-    fn save_as(
-        &self,
-        project: Entity<Project>,
-        path: ProjectPath,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<anyhow::Result<()>> {
-        self.update(cx, |item, cx| item.save_as(project, path, window, cx))
-    }
-
-    fn reload(
-        &self,
-        project: Entity<Project>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<()>> {
-        self.update(cx, |item, cx| item.reload(project, window, cx))
-    }
-
-    fn act_as_type<'a>(&'a self, type_id: TypeId, cx: &'a App) -> Option<AnyEntity> {
-        self.read(cx).act_as_type(type_id, self, cx)
-    }
-
-    fn to_followable_item_handle(&self, cx: &App) -> Option<Box<dyn FollowableItemHandle>> {
-        FollowableViewRegistry::to_followable_view(self.clone(), cx)
-    }
-
-    fn on_release(
-        &self,
-        cx: &mut App,
-        callback: Box<dyn FnOnce(&mut App) + Send>,
-    ) -> gpui::Subscription {
-        cx.observe_release(self, move |_, cx| callback(cx))
-    }
-
-    fn to_searchable_item_handle(&self, cx: &App) -> Option<Box<dyn SearchableItemHandle>> {
-        self.read(cx).as_searchable(self, cx)
-    }
-
-    fn breadcrumb_location(&self, cx: &App) -> ToolbarItemLocation {
-        self.read(cx).breadcrumb_location(cx)
-    }
-
-    fn breadcrumbs(&self, theme: &Theme, cx: &App) -> Option<Vec<BreadcrumbText>> {
-        self.read(cx).breadcrumbs(theme, cx)
-    }
-
-    fn breadcrumb_prefix(&self, window: &mut Window, cx: &mut App) -> Option<gpui::AnyElement> {
-        self.update(cx, |item, cx| item.breadcrumb_prefix(window, cx))
-    }
-
-    fn show_toolbar(&self, cx: &App) -> bool {
-        self.read(cx).show_toolbar()
-    }
-
-    fn pixel_position_of_cursor(&self, cx: &App) -> Option<Point<Pixels>> {
-        self.read(cx).pixel_position_of_cursor(cx)
-    }
-
-    fn downgrade_item(&self) -> Box<dyn WeakItemHandle> {
-        Box::new(self.downgrade())
-    }
-
-    fn to_serializable_item_handle(&self, cx: &App) -> Option<Box<dyn SerializableItemHandle>> {
-        SerializableItemRegistry::view_to_serializable_item_handle(self.to_any_view(), cx)
-    }
-
-    fn preserve_preview(&self, cx: &App) -> bool {
-        self.read(cx).preserve_preview(cx)
-    }
-
-    fn include_in_nav_history(&self) -> bool {
-        T::include_in_nav_history()
-    }
-
-    fn relay_action(&self, action: Box<dyn Action>, window: &mut Window, cx: &mut App) {
-        self.update(cx, |this, cx| {
-            this.focus_handle(cx).focus(window);
-            window.dispatch_action(action, cx);
-        })
-    }
-}
-
-impl From<Box<dyn ItemHandle>> for AnyView {
-    fn from(val: Box<dyn ItemHandle>) -> Self {
-        val.to_any_view()
-    }
-}
-
-impl From<&Box<dyn ItemHandle>> for AnyView {
-    fn from(val: &Box<dyn ItemHandle>) -> Self {
-        val.to_any_view()
-    }
-}
-
-impl Clone for Box<dyn ItemHandle> {
-    fn clone(&self) -> Box<dyn ItemHandle> {
-        self.boxed_clone()
-    }
-}
-
-impl<T: Item> WeakItemHandle for WeakEntity<T> {
-    fn id(&self) -> EntityId {
-        self.entity_id()
-    }
-
-    fn boxed_clone(&self) -> Box<dyn WeakItemHandle> {
-        Box::new(self.clone())
-    }
-
-    fn upgrade(&self) -> Option<Box<dyn ItemHandle>> {
-        self.upgrade().map(|v| Box::new(v) as Box<dyn ItemHandle>)
-    }
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct ProjectItemKind(pub &'static str);
-
-pub trait ProjectItem: Item {
-    type Item: project::ProjectItem;
-
-    fn project_item_kind() -> Option<ProjectItemKind> {
-        None
-    }
-
-    fn for_project_item(
-        project: Entity<Project>,
-        pane: Option<&Pane>,
-        item: Entity<Self::Item>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self
-    where
-        Self: Sized;
-
-    /// A fallback handler, which will be called after [`project::ProjectItem::try_open`] fails,
-    /// with the error from that failure as an argument.
-    /// Allows to open an item that can gracefully display and handle errors.
-    fn for_broken_project_item(
-        _abs_path: &Path,
-        _is_local: bool,
-        _e: &anyhow::Error,
-        _window: &mut Window,
-        _cx: &mut App,
-    ) -> Option<InvalidItemView>
-    where
-        Self: Sized,
-    {
-        None
-    }
-}
-
-#[derive(Debug)]
-pub enum FollowEvent {
-    Unfollow,
-}
-
-pub enum Dedup {
-    KeepExisting,
-    ReplaceExisting,
-}
-
-pub trait FollowableItem: Item {
-    fn remote_id(&self) -> Option<ViewId>;
-    fn to_state_proto(&self, window: &Window, cx: &App) -> Option<proto::view::Variant>;
-    fn from_state_proto(
-        project: Entity<Workspace>,
-        id: ViewId,
-        state: &mut Option<proto::view::Variant>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<Task<Result<Entity<Self>>>>;
-    fn to_follow_event(event: &Self::Event) -> Option<FollowEvent>;
-    fn add_event_to_update_proto(
-        &self,
-        event: &Self::Event,
-        update: &mut Option<proto::update_view::Variant>,
-        window: &Window,
-        cx: &App,
-    ) -> bool;
-    fn apply_update_proto(
-        &mut self,
-        project: &Entity<Project>,
-        message: proto::update_view::Variant,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>>;
-    fn is_project_item(&self, window: &Window, cx: &App) -> bool;
-    fn set_leader_id(
-        &mut self,
-        leader_peer_id: Option<CollaboratorId>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    );
-    fn dedup(&self, existing: &Self, window: &Window, cx: &App) -> Option<Dedup>;
-    fn update_agent_location(
-        &mut self,
-        _location: language::Anchor,
-        _window: &mut Window,
-        _cx: &mut Context<Self>,
-    ) {
-    }
-}
-
-pub trait FollowableItemHandle: ItemHandle {
-    fn remote_id(&self, client: &Arc<Client>, window: &mut Window, cx: &mut App) -> Option<ViewId>;
-    fn downgrade(&self) -> Box<dyn WeakFollowableItemHandle>;
-    fn set_leader_id(
-        &self,
-        leader_peer_id: Option<CollaboratorId>,
-        window: &mut Window,
-        cx: &mut App,
-    );
-    fn to_state_proto(&self, window: &mut Window, cx: &mut App) -> Option<proto::view::Variant>;
-    fn add_event_to_update_proto(
-        &self,
-        event: &dyn Any,
-        update: &mut Option<proto::update_view::Variant>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> bool;
-    fn to_follow_event(&self, event: &dyn Any) -> Option<FollowEvent>;
-    fn apply_update_proto(
-        &self,
-        project: &Entity<Project>,
-        message: proto::update_view::Variant,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<()>>;
-    fn is_project_item(&self, window: &mut Window, cx: &mut App) -> bool;
-    fn dedup(
-        &self,
-        existing: &dyn FollowableItemHandle,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<Dedup>;
-    fn update_agent_location(&self, location: language::Anchor, window: &mut Window, cx: &mut App);
-}
-
-impl<T: FollowableItem> FollowableItemHandle for Entity<T> {
-    fn remote_id(&self, client: &Arc<Client>, _: &mut Window, cx: &mut App) -> Option<ViewId> {
-        self.read(cx).remote_id().or_else(|| {
-            client.peer_id().map(|creator| ViewId {
-                creator: CollaboratorId::PeerId(creator),
-                id: self.item_id().as_u64(),
-            })
-        })
-    }
-
-    fn downgrade(&self) -> Box<dyn WeakFollowableItemHandle> {
-        Box::new(self.downgrade())
-    }
-
-    fn set_leader_id(&self, leader_id: Option<CollaboratorId>, window: &mut Window, cx: &mut App) {
-        self.update(cx, |this, cx| this.set_leader_id(leader_id, window, cx))
-    }
-
-    fn to_state_proto(&self, window: &mut Window, cx: &mut App) -> Option<proto::view::Variant> {
-        self.read(cx).to_state_proto(window, cx)
-    }
-
-    fn add_event_to_update_proto(
-        &self,
-        event: &dyn Any,
-        update: &mut Option<proto::update_view::Variant>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> bool {
-        if let Some(event) = event.downcast_ref() {
-            self.read(cx)
-                .add_event_to_update_proto(event, update, window, cx)
-        } else {
-            false
-        }
-    }
-
-    fn to_follow_event(&self, event: &dyn Any) -> Option<FollowEvent> {
-        T::to_follow_event(event.downcast_ref()?)
-    }
-
-    fn apply_update_proto(
-        &self,
-        project: &Entity<Project>,
-        message: proto::update_view::Variant,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<()>> {
-        self.update(cx, |this, cx| {
-            this.apply_update_proto(project, message, window, cx)
-        })
-    }
-
-    fn is_project_item(&self, window: &mut Window, cx: &mut App) -> bool {
-        self.read(cx).is_project_item(window, cx)
-    }
-
-    fn dedup(
-        &self,
-        existing: &dyn FollowableItemHandle,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<Dedup> {
-        let existing = existing.to_any_view().downcast::<T>().ok()?;
-        self.read(cx).dedup(existing.read(cx), window, cx)
-    }
-
-    fn update_agent_location(&self, location: language::Anchor, window: &mut Window, cx: &mut App) {
-        self.update(cx, |this, cx| {
-            this.update_agent_location(location, window, cx)
-        })
-    }
-}
-
-pub trait WeakFollowableItemHandle: Send + Sync {
-    fn upgrade(&self) -> Option<Box<dyn FollowableItemHandle>>;
-}
-
-impl<T: FollowableItem> WeakFollowableItemHandle for WeakEntity<T> {
-    fn upgrade(&self) -> Option<Box<dyn FollowableItemHandle>> {
-        Some(Box::new(self.upgrade()?))
-    }
-}
-
-#[cfg(any(test, feature = "test-support"))]
-pub mod test {
-    use super::{Item, ItemEvent, SerializableItem, TabContentParams};
-    use crate::{
-        ItemId, ItemNavHistory, Workspace, WorkspaceId,
-        item::{ItemBufferKind, SaveOptions},
-    };
-    use gpui::{
-        AnyElement, App, AppContext as _, Context, Entity, EntityId, EventEmitter, Focusable,
-        InteractiveElement, IntoElement, Render, SharedString, Task, WeakEntity, Window,
-    };
-    use project::{Project, ProjectEntryId, ProjectPath, WorktreeId};
-    use std::{any::Any, cell::Cell};
-    use util::rel_path::rel_path;
-
-    pub struct TestProjectItem {
-        pub entry_id: Option<ProjectEntryId>,
-        pub project_path: Option<ProjectPath>,
-        pub is_dirty: bool,
-    }
-
-    pub struct TestItem {
-        pub workspace_id: Option<WorkspaceId>,
-        pub state: String,
-        pub label: String,
-        pub save_count: usize,
-        pub save_as_count: usize,
-        pub reload_count: usize,
-        pub is_dirty: bool,
-        pub buffer_kind: ItemBufferKind,
-        pub has_conflict: bool,
-        pub has_deleted_file: bool,
-        pub project_items: Vec<Entity<TestProjectItem>>,
-        pub nav_history: Option<ItemNavHistory>,
-        pub tab_descriptions: Option<Vec<&'static str>>,
-        pub tab_detail: Cell<Option<usize>>,
-        serialize: Option<Box<dyn Fn() -> Option<Task<anyhow::Result<()>>>>>,
-        focus_handle: gpui::FocusHandle,
-    }
-
-    impl project::ProjectItem for TestProjectItem {
-        fn try_open(
-            _project: &Entity<Project>,
-            _path: &ProjectPath,
-            _cx: &mut App,
-        ) -> Option<Task<anyhow::Result<Entity<Self>>>> {
-            None
-        }
-        fn entry_id(&self, _: &App) -> Option<ProjectEntryId> {
-            self.entry_id
-        }
-
-        fn project_path(&self, _: &App) -> Option<ProjectPath> {
-            self.project_path.clone()
-        }
-
-        fn is_dirty(&self) -> bool {
-            self.is_dirty
-        }
-    }
-
-    pub enum TestItemEvent {
-        Edit,
-    }
-
-    impl TestProjectItem {
-        pub fn new(id: u64, path: &str, cx: &mut App) -> Entity<Self> {
-            let entry_id = Some(ProjectEntryId::from_proto(id));
-            let project_path = Some(ProjectPath {
-                worktree_id: WorktreeId::from_usize(0),
-                path: rel_path(path).into(),
-            });
-            cx.new(|_| Self {
-                entry_id,
-                project_path,
-                is_dirty: false,
-            })
-        }
-
-        pub fn new_untitled(cx: &mut App) -> Entity<Self> {
-            cx.new(|_| Self {
-                project_path: None,
-                entry_id: None,
-                is_dirty: false,
-            })
-        }
-
-        pub fn new_dirty(id: u64, path: &str, cx: &mut App) -> Entity<Self> {
-            let entry_id = Some(ProjectEntryId::from_proto(id));
-            let project_path = Some(ProjectPath {
-                worktree_id: WorktreeId::from_usize(0),
-                path: rel_path(path).into(),
-            });
-            cx.new(|_| Self {
-                entry_id,
-                project_path,
-                is_dirty: true,
-            })
-        }
-    }
-
-    impl TestItem {
-        pub fn new(cx: &mut Context<Self>) -> Self {
-            Self {
-                state: String::new(),
-                label: String::new(),
-                save_count: 0,
-                save_as_count: 0,
-                reload_count: 0,
-                is_dirty: false,
-                has_conflict: false,
-                has_deleted_file: false,
-                project_items: Vec::new(),
-                buffer_kind: ItemBufferKind::Singleton,
-                nav_history: None,
-                tab_descriptions: None,
-                tab_detail: Default::default(),
-                workspace_id: Default::default(),
-                focus_handle: cx.focus_handle(),
-                serialize: None,
-            }
-        }
-
-        pub fn new_deserialized(id: WorkspaceId, cx: &mut Context<Self>) -> Self {
-            let mut this = Self::new(cx);
-            this.workspace_id = Some(id);
-            this
-        }
-
-        pub fn with_label(mut self, state: &str) -> Self {
-            self.label = state.to_string();
-            self
-        }
-
-        pub fn with_buffer_kind(mut self, buffer_kind: ItemBufferKind) -> Self {
-            self.buffer_kind = buffer_kind;
-            self
-        }
-
-        pub fn set_has_deleted_file(&mut self, deleted: bool) {
-            self.has_deleted_file = deleted;
-        }
-
-        pub fn with_dirty(mut self, dirty: bool) -> Self {
-            self.is_dirty = dirty;
-            self
-        }
-
-        pub fn with_conflict(mut self, has_conflict: bool) -> Self {
-            self.has_conflict = has_conflict;
-            self
-        }
-
-        pub fn with_project_items(mut self, items: &[Entity<TestProjectItem>]) -> Self {
-            self.project_items.clear();
-            self.project_items.extend(items.iter().cloned());
-            self
-        }
-
-        pub fn with_serialize(
-            mut self,
-            serialize: impl Fn() -> Option<Task<anyhow::Result<()>>> + 'static,
-        ) -> Self {
-            self.serialize = Some(Box::new(serialize));
-            self
-        }
-
-        pub fn set_state(&mut self, state: String, cx: &mut Context<Self>) {
-            self.push_to_nav_history(cx);
-            self.state = state;
-        }
-
-        fn push_to_nav_history(&mut self, cx: &mut Context<Self>) {
-            if let Some(history) = &mut self.nav_history {
-                history.push(Some(Box::new(self.state.clone())), cx);
-            }
-        }
-    }
-
-    impl Render for TestItem {
-        fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-            gpui::div().track_focus(&self.focus_handle(cx))
-        }
-    }
-
-    impl EventEmitter<ItemEvent> for TestItem {}
-
-    impl Focusable for TestItem {
-        fn focus_handle(&self, _: &App) -> gpui::FocusHandle {
-            self.focus_handle.clone()
-        }
-    }
-
-    impl Item for TestItem {
-        type Event = ItemEvent;
-
-        fn to_item_events(event: &Self::Event, mut f: impl FnMut(ItemEvent)) {
-            f(*event)
-        }
-
-        fn tab_content_text(&self, detail: usize, _cx: &App) -> SharedString {
-            self.tab_descriptions
-                .as_ref()
-                .and_then(|descriptions| {
-                    let description = *descriptions.get(detail).or_else(|| descriptions.last())?;
-                    description.into()
-                })
-                .unwrap_or_default()
-                .into()
-        }
-
-        fn telemetry_event_text(&self) -> Option<&'static str> {
-            None
-        }
-
-        fn tab_content(&self, params: TabContentParams, _window: &Window, _cx: &App) -> AnyElement {
-            self.tab_detail.set(params.detail);
-            gpui::div().into_any_element()
-        }
-
-        fn for_each_project_item(
-            &self,
-            cx: &App,
-            f: &mut dyn FnMut(EntityId, &dyn project::ProjectItem),
-        ) {
-            self.project_items
-                .iter()
-                .for_each(|item| f(item.entity_id(), item.read(cx)))
-        }
-
-        fn buffer_kind(&self, _: &App) -> ItemBufferKind {
-            self.buffer_kind
-        }
-
-        fn set_nav_history(
-            &mut self,
-            history: ItemNavHistory,
-            _window: &mut Window,
-            _: &mut Context<Self>,
-        ) {
-            self.nav_history = Some(history);
-        }
-
-        fn navigate(
-            &mut self,
-            state: Box<dyn Any>,
-            _window: &mut Window,
-            _: &mut Context<Self>,
-        ) -> bool {
-            let state = *state.downcast::<String>().unwrap_or_default();
-            if state != self.state {
-                self.state = state;
-                true
-            } else {
-                false
-            }
-        }
-
-        fn deactivated(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
-            self.push_to_nav_history(cx);
-        }
-
-        fn can_split(&self) -> bool {
-            true
-        }
-
-        fn clone_on_split(
-            &self,
-            _workspace_id: Option<WorkspaceId>,
-            _: &mut Window,
-            cx: &mut Context<Self>,
-        ) -> Task<Option<Entity<Self>>>
-        where
-            Self: Sized,
-        {
-            Task::ready(Some(cx.new(|cx| Self {
-                state: self.state.clone(),
-                label: self.label.clone(),
-                save_count: self.save_count,
-                save_as_count: self.save_as_count,
-                reload_count: self.reload_count,
-                is_dirty: self.is_dirty,
-                buffer_kind: self.buffer_kind,
-                has_conflict: self.has_conflict,
-                has_deleted_file: self.has_deleted_file,
-                project_items: self.project_items.clone(),
-                nav_history: None,
-                tab_descriptions: None,
-                tab_detail: Default::default(),
-                workspace_id: self.workspace_id,
-                focus_handle: cx.focus_handle(),
-                serialize: None,
-            })))
-        }
-
-        fn is_dirty(&self, _: &App) -> bool {
-            self.is_dirty
-        }
-
-        fn has_conflict(&self, _: &App) -> bool {
-            self.has_conflict
-        }
-
-        fn has_deleted_file(&self, _: &App) -> bool {
-            self.has_deleted_file
-        }
-
-        fn can_save(&self, cx: &App) -> bool {
-            !self.project_items.is_empty()
-                && self
-                    .project_items
-                    .iter()
-                    .all(|item| item.read(cx).entry_id.is_some())
-        }
-
-        fn can_save_as(&self, _cx: &App) -> bool {
-            self.buffer_kind == ItemBufferKind::Singleton
-        }
-
-        fn save(
-            &mut self,
-            _: SaveOptions,
-            _: Entity<Project>,
-            _window: &mut Window,
-            cx: &mut Context<Self>,
-        ) -> Task<anyhow::Result<()>> {
-            self.save_count += 1;
-            self.is_dirty = false;
-            for item in &self.project_items {
-                item.update(cx, |item, _| {
-                    if item.is_dirty {
-                        item.is_dirty = false;
-                    }
-                })
-            }
-            Task::ready(Ok(()))
-        }
-
-        fn save_as(
-            &mut self,
-            _: Entity<Project>,
-            _: ProjectPath,
-            _window: &mut Window,
-            _: &mut Context<Self>,
-        ) -> Task<anyhow::Result<()>> {
-            self.save_as_count += 1;
-            self.is_dirty = false;
-            Task::ready(Ok(()))
-        }
-
-        fn reload(
-            &mut self,
-            _: Entity<Project>,
-            _window: &mut Window,
-            _: &mut Context<Self>,
-        ) -> Task<anyhow::Result<()>> {
-            self.reload_count += 1;
-            self.is_dirty = false;
-            Task::ready(Ok(()))
-        }
-    }
-
-    impl SerializableItem for TestItem {
-        fn serialized_item_kind() -> &'static str {
-            "TestItem"
-        }
-
-        fn deserialize(
-            _project: Entity<Project>,
-            _workspace: WeakEntity<Workspace>,
-            workspace_id: WorkspaceId,
-            _item_id: ItemId,
-            _window: &mut Window,
-            cx: &mut App,
-        ) -> Task<anyhow::Result<Entity<Self>>> {
-            let entity = cx.new(|cx| Self::new_deserialized(workspace_id, cx));
-            Task::ready(Ok(entity))
-        }
-
-        fn cleanup(
-            _workspace_id: WorkspaceId,
-            _alive_items: Vec<ItemId>,
-            _window: &mut Window,
-            _cx: &mut App,
-        ) -> Task<anyhow::Result<()>> {
-            Task::ready(Ok(()))
-        }
-
-        fn serialize(
-            &mut self,
-            _workspace: &mut Workspace,
-            _item_id: ItemId,
-            _closing: bool,
-            _window: &mut Window,
-            _cx: &mut Context<Self>,
-        ) -> Option<Task<anyhow::Result<()>>> {
-            if let Some(serialize) = self.serialize.take() {
-                let result = serialize();
-                self.serialize = Some(serialize);
-                result
-            } else {
-                None
-            }
-        }
-
-        fn should_serialize(&self, _event: &Self::Event) -> bool {
-            false
-        }
-    }
-}
diff --git a/crates/workspace/src/modal_layer.rs b/crates/workspace/src/modal_layer.rs
deleted file mode 100644
index bcd7db3a82..0000000000
--- a/crates/workspace/src/modal_layer.rs
+++ /dev/null
@@ -1,208 +0,0 @@
-use gpui::{
-    AnyView, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable as _, ManagedView,
-    MouseButton, Subscription,
-};
-use ui::prelude::*;
-
-#[derive(Debug)]
-pub enum DismissDecision {
-    Dismiss(bool),
-    Pending,
-}
-
-pub trait ModalView: ManagedView {
-    fn on_before_dismiss(
-        &mut self,
-        _window: &mut Window,
-        _: &mut Context<Self>,
-    ) -> DismissDecision {
-        DismissDecision::Dismiss(true)
-    }
-
-    fn fade_out_background(&self) -> bool {
-        false
-    }
-}
-
-trait ModalViewHandle {
-    fn on_before_dismiss(&mut self, window: &mut Window, cx: &mut App) -> DismissDecision;
-    fn view(&self) -> AnyView;
-    fn fade_out_background(&self, cx: &mut App) -> bool;
-}
-
-impl<V: ModalView> ModalViewHandle for Entity<V> {
-    fn on_before_dismiss(&mut self, window: &mut Window, cx: &mut App) -> DismissDecision {
-        self.update(cx, |this, cx| this.on_before_dismiss(window, cx))
-    }
-
-    fn view(&self) -> AnyView {
-        self.clone().into()
-    }
-
-    fn fade_out_background(&self, cx: &mut App) -> bool {
-        self.read(cx).fade_out_background()
-    }
-}
-
-pub struct ActiveModal {
-    modal: Box<dyn ModalViewHandle>,
-    _subscriptions: [Subscription; 2],
-    previous_focus_handle: Option<FocusHandle>,
-    focus_handle: FocusHandle,
-}
-
-pub struct ModalLayer {
-    active_modal: Option<ActiveModal>,
-    dismiss_on_focus_lost: bool,
-}
-
-pub(crate) struct ModalOpenedEvent;
-
-impl EventEmitter<ModalOpenedEvent> for ModalLayer {}
-
-impl Default for ModalLayer {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl ModalLayer {
-    pub fn new() -> Self {
-        Self {
-            active_modal: None,
-            dismiss_on_focus_lost: false,
-        }
-    }
-
-    pub fn toggle_modal<V, B>(&mut self, window: &mut Window, cx: &mut Context<Self>, build_view: B)
-    where
-        V: ModalView,
-        B: FnOnce(&mut Window, &mut Context<V>) -> V,
-    {
-        if let Some(active_modal) = &self.active_modal {
-            let is_close = active_modal.modal.view().downcast::<V>().is_ok();
-            let did_close = self.hide_modal(window, cx);
-            if is_close || !did_close {
-                return;
-            }
-        }
-        let new_modal = cx.new(|cx| build_view(window, cx));
-        self.show_modal(new_modal, window, cx);
-        cx.emit(ModalOpenedEvent);
-    }
-
-    fn show_modal<V>(&mut self, new_modal: Entity<V>, window: &mut Window, cx: &mut Context<Self>)
-    where
-        V: ModalView,
-    {
-        let focus_handle = cx.focus_handle();
-        self.active_modal = Some(ActiveModal {
-            modal: Box::new(new_modal.clone()),
-            _subscriptions: [
-                cx.subscribe_in(
-                    &new_modal,
-                    window,
-                    |this, _, _: &DismissEvent, window, cx| {
-                        this.hide_modal(window, cx);
-                    },
-                ),
-                cx.on_focus_out(&focus_handle, window, |this, _event, window, cx| {
-                    if this.dismiss_on_focus_lost {
-                        this.hide_modal(window, cx);
-                    }
-                }),
-            ],
-            previous_focus_handle: window.focused(cx),
-            focus_handle,
-        });
-        cx.defer_in(window, move |_, window, cx| {
-            window.focus(&new_modal.focus_handle(cx));
-        });
-        cx.notify();
-    }
-
-    pub fn hide_modal(&mut self, window: &mut Window, cx: &mut Context<Self>) -> bool {
-        let Some(active_modal) = self.active_modal.as_mut() else {
-            self.dismiss_on_focus_lost = false;
-            return false;
-        };
-
-        match active_modal.modal.on_before_dismiss(window, cx) {
-            DismissDecision::Dismiss(dismiss) => {
-                self.dismiss_on_focus_lost = !dismiss;
-                if !dismiss {
-                    return false;
-                }
-            }
-            DismissDecision::Pending => {
-                self.dismiss_on_focus_lost = false;
-                return false;
-            }
-        }
-
-        if let Some(active_modal) = self.active_modal.take() {
-            if let Some(previous_focus) = active_modal.previous_focus_handle
-                && active_modal.focus_handle.contains_focused(window, cx)
-            {
-                previous_focus.focus(window);
-            }
-            cx.notify();
-        }
-        true
-    }
-
-    pub fn active_modal<V>(&self) -> Option<Entity<V>>
-    where
-        V: 'static,
-    {
-        let active_modal = self.active_modal.as_ref()?;
-        active_modal.modal.view().downcast::<V>().ok()
-    }
-
-    pub fn has_active_modal(&self) -> bool {
-        self.active_modal.is_some()
-    }
-}
-
-impl Render for ModalLayer {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let Some(active_modal) = &self.active_modal else {
-            return div();
-        };
-
-        div()
-            .occlude()
-            .absolute()
-            .size_full()
-            .top_0()
-            .left_0()
-            .when(active_modal.modal.fade_out_background(cx), |el| {
-                let mut background = cx.theme().colors().elevated_surface_background;
-                background.fade_out(0.2);
-                el.bg(background)
-            })
-            .on_mouse_down(
-                MouseButton::Left,
-                cx.listener(|this, _, window, cx| {
-                    this.hide_modal(window, cx);
-                }),
-            )
-            .child(
-                v_flex()
-                    .h(px(0.0))
-                    .top_20()
-                    .flex()
-                    .flex_col()
-                    .items_center()
-                    .track_focus(&active_modal.focus_handle)
-                    .child(
-                        h_flex()
-                            .occlude()
-                            .child(active_modal.modal.view())
-                            .on_mouse_down(MouseButton::Left, |_, _, cx| {
-                                cx.stop_propagation();
-                            }),
-                    ),
-            )
-    }
-}
diff --git a/crates/workspace/src/notifications.rs b/crates/workspace/src/notifications.rs
deleted file mode 100644
index cfdc730b4d..0000000000
--- a/crates/workspace/src/notifications.rs
+++ /dev/null
@@ -1,1115 +0,0 @@
-use crate::{SuppressNotification, Toast, Workspace};
-use anyhow::Context as _;
-use gpui::{
-    AnyView, App, AppContext as _, AsyncWindowContext, ClickEvent, ClipboardItem, Context,
-    DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, PromptLevel, Render, ScrollHandle,
-    Task, svg,
-};
-use parking_lot::Mutex;
-
-use std::ops::Deref;
-use std::sync::{Arc, LazyLock};
-use std::{any::TypeId, time::Duration};
-use ui::{Tooltip, prelude::*};
-use util::ResultExt;
-
-#[derive(Default)]
-pub struct Notifications {
-    notifications: Vec<(NotificationId, AnyView)>,
-}
-
-impl Deref for Notifications {
-    type Target = Vec<(NotificationId, AnyView)>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.notifications
-    }
-}
-
-impl std::ops::DerefMut for Notifications {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.notifications
-    }
-}
-
-#[derive(Debug, Eq, PartialEq, Clone, Hash)]
-pub enum NotificationId {
-    Unique(TypeId),
-    Composite(TypeId, ElementId),
-    Named(SharedString),
-}
-
-impl NotificationId {
-    /// Returns a unique [`NotificationId`] for the given type.
-    pub fn unique<T: 'static>() -> Self {
-        Self::Unique(TypeId::of::<T>())
-    }
-
-    /// Returns a [`NotificationId`] for the given type that is also identified
-    /// by the provided ID.
-    pub fn composite<T: 'static>(id: impl Into<ElementId>) -> Self {
-        Self::Composite(TypeId::of::<T>(), id.into())
-    }
-
-    /// Builds a `NotificationId` out of the given string.
-    pub fn named(id: SharedString) -> Self {
-        Self::Named(id)
-    }
-}
-
-pub trait Notification:
-    EventEmitter<DismissEvent> + EventEmitter<SuppressEvent> + Focusable + Render
-{
-}
-
-pub struct SuppressEvent;
-
-impl Workspace {
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn notification_ids(&self) -> Vec<NotificationId> {
-        self.notifications
-            .iter()
-            .map(|(id, _)| id)
-            .cloned()
-            .collect()
-    }
-
-    pub fn show_notification<V: Notification>(
-        &mut self,
-        id: NotificationId,
-        cx: &mut Context<Self>,
-        build_notification: impl FnOnce(&mut Context<Self>) -> Entity<V>,
-    ) {
-        self.show_notification_without_handling_dismiss_events(&id, cx, |cx| {
-            let notification = build_notification(cx);
-            cx.subscribe(&notification, {
-                let id = id.clone();
-                move |this, _, _: &DismissEvent, cx| {
-                    this.dismiss_notification(&id, cx);
-                }
-            })
-            .detach();
-            cx.subscribe(&notification, {
-                let id = id.clone();
-                move |workspace: &mut Workspace, _, _: &SuppressEvent, cx| {
-                    workspace.suppress_notification(&id, cx);
-                }
-            })
-            .detach();
-            notification.into()
-        });
-    }
-
-    /// Shows a notification in this workspace's window. Caller must handle dismiss.
-    ///
-    /// This exists so that the `build_notification` closures stored for app notifications can
-    /// return `AnyView`. Subscribing to events from an `AnyView` is not supported, so instead that
-    /// responsibility is pushed to the caller where the `V` type is known.
-    pub(crate) fn show_notification_without_handling_dismiss_events(
-        &mut self,
-        id: &NotificationId,
-        cx: &mut Context<Self>,
-        build_notification: impl FnOnce(&mut Context<Self>) -> AnyView,
-    ) {
-        if self.suppressed_notifications.contains(id) {
-            return;
-        }
-        self.dismiss_notification(id, cx);
-        self.notifications
-            .push((id.clone(), build_notification(cx)));
-        cx.notify();
-    }
-
-    pub fn show_error<E>(&mut self, err: &E, cx: &mut Context<Self>)
-    where
-        E: std::fmt::Debug + std::fmt::Display,
-    {
-        self.show_notification(workspace_error_notification_id(), cx, |cx| {
-            cx.new(|cx| ErrorMessagePrompt::new(format!("Error: {err}"), cx))
-        });
-    }
-
-    pub fn show_portal_error(&mut self, err: String, cx: &mut Context<Self>) {
-        struct PortalError;
-
-        self.show_notification(NotificationId::unique::<PortalError>(), cx, |cx| {
-            cx.new(|cx| {
-                ErrorMessagePrompt::new(err.to_string(), cx).with_link_button(
-                    "See docs",
-                    "https://zed.dev/docs/linux#i-cant-open-any-files",
-                )
-            })
-        });
-    }
-
-    pub fn dismiss_notification(&mut self, id: &NotificationId, cx: &mut Context<Self>) {
-        self.notifications.retain(|(existing_id, _)| {
-            if existing_id == id {
-                cx.notify();
-                false
-            } else {
-                true
-            }
-        });
-    }
-
-    pub fn show_toast(&mut self, toast: Toast, cx: &mut Context<Self>) {
-        self.dismiss_notification(&toast.id, cx);
-        self.show_notification(toast.id.clone(), cx, |cx| {
-            cx.new(|cx| match toast.on_click.as_ref() {
-                Some((click_msg, on_click)) => {
-                    let on_click = on_click.clone();
-                    simple_message_notification::MessageNotification::new(toast.msg.clone(), cx)
-                        .primary_message(click_msg.clone())
-                        .primary_on_click(move |window, cx| on_click(window, cx))
-                }
-                None => {
-                    simple_message_notification::MessageNotification::new(toast.msg.clone(), cx)
-                }
-            })
-        });
-        if toast.autohide {
-            cx.spawn(async move |workspace, cx| {
-                cx.background_executor()
-                    .timer(Duration::from_millis(5000))
-                    .await;
-                workspace
-                    .update(cx, |workspace, cx| workspace.dismiss_toast(&toast.id, cx))
-                    .ok();
-            })
-            .detach();
-        }
-    }
-
-    pub fn dismiss_toast(&mut self, id: &NotificationId, cx: &mut Context<Self>) {
-        self.dismiss_notification(id, cx);
-    }
-
-    pub fn clear_all_notifications(&mut self, cx: &mut Context<Self>) {
-        self.notifications.clear();
-        cx.notify();
-    }
-
-    /// Hide all notifications matching the given ID
-    pub fn suppress_notification(&mut self, id: &NotificationId, cx: &mut Context<Self>) {
-        self.dismiss_notification(id, cx);
-        self.suppressed_notifications.insert(id.clone());
-    }
-
-    pub fn show_initial_notifications(&mut self, cx: &mut Context<Self>) {
-        // Allow absence of the global so that tests don't need to initialize it.
-        let app_notifications = GLOBAL_APP_NOTIFICATIONS
-            .lock()
-            .app_notifications
-            .iter()
-            .cloned()
-            .collect::<Vec<_>>();
-        for (id, build_notification) in app_notifications {
-            self.show_notification_without_handling_dismiss_events(&id, cx, |cx| {
-                build_notification(cx)
-            });
-        }
-    }
-}
-
-pub struct LanguageServerPrompt {
-    focus_handle: FocusHandle,
-    request: Option<project::LanguageServerPromptRequest>,
-    scroll_handle: ScrollHandle,
-}
-
-impl Focusable for LanguageServerPrompt {
-    fn focus_handle(&self, _cx: &App) -> gpui::FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl Notification for LanguageServerPrompt {}
-
-impl LanguageServerPrompt {
-    pub fn new(request: project::LanguageServerPromptRequest, cx: &mut App) -> Self {
-        Self {
-            focus_handle: cx.focus_handle(),
-            request: Some(request),
-            scroll_handle: ScrollHandle::new(),
-        }
-    }
-
-    async fn select_option(this: Entity<Self>, ix: usize, cx: &mut AsyncWindowContext) {
-        util::maybe!(async move {
-            let potential_future = this.update(cx, |this, _| {
-                this.request.take().map(|request| request.respond(ix))
-            });
-
-            potential_future? // App Closed
-                .context("Response already sent")?
-                .await
-                .context("Stream already closed")?;
-
-            this.update(cx, |_, cx| cx.emit(DismissEvent))?;
-
-            anyhow::Ok(())
-        })
-        .await
-        .log_err();
-    }
-}
-
-impl Render for LanguageServerPrompt {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let Some(request) = &self.request else {
-            return div().id("language_server_prompt_notification");
-        };
-
-        let (icon, color) = match request.level {
-            PromptLevel::Info => (IconName::Info, Color::Accent),
-            PromptLevel::Warning => (IconName::Warning, Color::Warning),
-            PromptLevel::Critical => (IconName::XCircle, Color::Error),
-        };
-
-        let suppress = window.modifiers().shift;
-        let (close_id, close_icon) = if suppress {
-            ("suppress", IconName::Minimize)
-        } else {
-            ("close", IconName::Close)
-        };
-
-        div()
-            .id("language_server_prompt_notification")
-            .group("language_server_prompt_notification")
-            .occlude()
-            .w_full()
-            .max_h(vh(0.8, window))
-            .elevation_3(cx)
-            .overflow_y_scroll()
-            .track_scroll(&self.scroll_handle)
-            .on_modifiers_changed(cx.listener(|_, _, _, cx| cx.notify()))
-            .child(
-                v_flex()
-                    .p_3()
-                    .overflow_hidden()
-                    .child(
-                        h_flex()
-                            .justify_between()
-                            .items_start()
-                            .child(
-                                h_flex()
-                                    .gap_2()
-                                    .child(Icon::new(icon).color(color))
-                                    .child(Label::new(request.lsp_name.clone())),
-                            )
-                            .child(
-                                h_flex()
-                                    .gap_2()
-                                    .child(
-                                        IconButton::new("copy", IconName::Copy)
-                                            .on_click({
-                                                let message = request.message.clone();
-                                                move |_, _, cx| {
-                                                    cx.write_to_clipboard(
-                                                        ClipboardItem::new_string(message.clone()),
-                                                    )
-                                                }
-                                            })
-                                            .tooltip(Tooltip::text("Copy Description")),
-                                    )
-                                    .child(
-                                        IconButton::new(close_id, close_icon)
-                                            .tooltip(move |_window, cx| {
-                                                if suppress {
-                                                    Tooltip::for_action(
-                                                        "Suppress.\nClose with click.",
-                                                        &SuppressNotification,
-                                                        cx,
-                                                    )
-                                                } else {
-                                                    Tooltip::for_action(
-                                                        "Close.\nSuppress with shift-click.",
-                                                        &menu::Cancel,
-                                                        cx,
-                                                    )
-                                                }
-                                            })
-                                            .on_click(cx.listener(
-                                                move |_, _: &ClickEvent, _, cx| {
-                                                    if suppress {
-                                                        cx.emit(SuppressEvent);
-                                                    } else {
-                                                        cx.emit(DismissEvent);
-                                                    }
-                                                },
-                                            )),
-                                    ),
-                            ),
-                    )
-                    .child(Label::new(request.message.to_string()).size(LabelSize::Small))
-                    .children(request.actions.iter().enumerate().map(|(ix, action)| {
-                        let this_handle = cx.entity();
-                        Button::new(ix, action.title.clone())
-                            .size(ButtonSize::Large)
-                            .on_click(move |_, window, cx| {
-                                let this_handle = this_handle.clone();
-                                window
-                                    .spawn(cx, async move |cx| {
-                                        LanguageServerPrompt::select_option(this_handle, ix, cx)
-                                            .await
-                                    })
-                                    .detach()
-                            })
-                    })),
-            )
-    }
-}
-
-impl EventEmitter<DismissEvent> for LanguageServerPrompt {}
-impl EventEmitter<SuppressEvent> for LanguageServerPrompt {}
-
-fn workspace_error_notification_id() -> NotificationId {
-    struct WorkspaceErrorNotification;
-    NotificationId::unique::<WorkspaceErrorNotification>()
-}
-
-#[derive(Debug, Clone)]
-pub struct ErrorMessagePrompt {
-    message: SharedString,
-    focus_handle: gpui::FocusHandle,
-    label_and_url_button: Option<(SharedString, SharedString)>,
-}
-
-impl ErrorMessagePrompt {
-    pub fn new<S>(message: S, cx: &mut App) -> Self
-    where
-        S: Into<SharedString>,
-    {
-        Self {
-            message: message.into(),
-            focus_handle: cx.focus_handle(),
-            label_and_url_button: None,
-        }
-    }
-
-    pub fn with_link_button<S>(mut self, label: S, url: S) -> Self
-    where
-        S: Into<SharedString>,
-    {
-        self.label_and_url_button = Some((label.into(), url.into()));
-        self
-    }
-}
-
-impl Render for ErrorMessagePrompt {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        h_flex()
-            .id("error_message_prompt_notification")
-            .occlude()
-            .elevation_3(cx)
-            .items_start()
-            .justify_between()
-            .p_2()
-            .gap_2()
-            .w_full()
-            .child(
-                v_flex()
-                    .w_full()
-                    .child(
-                        h_flex()
-                            .w_full()
-                            .justify_between()
-                            .child(
-                                svg()
-                                    .size(window.text_style().font_size)
-                                    .flex_none()
-                                    .mr_2()
-                                    .mt(px(-2.0))
-                                    .map(|icon| {
-                                        icon.path(IconName::Warning.path())
-                                            .text_color(Color::Error.color(cx))
-                                    }),
-                            )
-                            .child(
-                                ui::IconButton::new("close", ui::IconName::Close)
-                                    .on_click(cx.listener(|_, _, _, cx| cx.emit(DismissEvent))),
-                            ),
-                    )
-                    .child(
-                        div()
-                            .id("error_message")
-                            .max_w_96()
-                            .max_h_40()
-                            .overflow_y_scroll()
-                            .child(Label::new(self.message.clone()).size(LabelSize::Small)),
-                    )
-                    .when_some(self.label_and_url_button.clone(), |elm, (label, url)| {
-                        elm.child(
-                            div().mt_2().child(
-                                ui::Button::new("error_message_prompt_notification_button", label)
-                                    .on_click(move |_, _, cx| cx.open_url(&url)),
-                            ),
-                        )
-                    }),
-            )
-    }
-}
-
-impl Focusable for ErrorMessagePrompt {
-    fn focus_handle(&self, _cx: &App) -> gpui::FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl EventEmitter<DismissEvent> for ErrorMessagePrompt {}
-impl EventEmitter<SuppressEvent> for ErrorMessagePrompt {}
-
-impl Notification for ErrorMessagePrompt {}
-
-#[derive(IntoElement, RegisterComponent)]
-pub struct NotificationFrame {
-    title: Option<SharedString>,
-    show_suppress_button: bool,
-    show_close_button: bool,
-    close: Option<Box<dyn Fn(&bool, &mut Window, &mut App) + 'static>>,
-    contents: Option<AnyElement>,
-    suffix: Option<AnyElement>,
-}
-
-impl NotificationFrame {
-    pub fn new() -> Self {
-        Self {
-            title: None,
-            contents: None,
-            suffix: None,
-            show_suppress_button: true,
-            show_close_button: true,
-            close: None,
-        }
-    }
-
-    pub fn with_title(mut self, title: Option<impl Into<SharedString>>) -> Self {
-        self.title = title.map(Into::into);
-        self
-    }
-
-    pub fn with_content(self, content: impl IntoElement) -> Self {
-        Self {
-            contents: Some(content.into_any_element()),
-            ..self
-        }
-    }
-
-    /// Determines whether the given notification ID should be suppressible
-    /// Suppressed notifications will not be shown anymore
-    pub fn show_suppress_button(mut self, show: bool) -> Self {
-        self.show_suppress_button = show;
-        self
-    }
-
-    pub fn show_close_button(mut self, show: bool) -> Self {
-        self.show_close_button = show;
-        self
-    }
-
-    pub fn on_close(self, on_close: impl Fn(&bool, &mut Window, &mut App) + 'static) -> Self {
-        Self {
-            close: Some(Box::new(on_close)),
-            ..self
-        }
-    }
-
-    pub fn with_suffix(mut self, suffix: impl IntoElement) -> Self {
-        self.suffix = Some(suffix.into_any_element());
-        self
-    }
-}
-
-impl RenderOnce for NotificationFrame {
-    fn render(mut self, window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let entity = window.current_view();
-        let show_suppress_button = self.show_suppress_button;
-        let suppress = show_suppress_button && window.modifiers().shift;
-        let (close_id, close_icon) = if suppress {
-            ("suppress", IconName::Minimize)
-        } else {
-            ("close", IconName::Close)
-        };
-
-        v_flex()
-            .occlude()
-            .p_3()
-            .gap_2()
-            .elevation_3(cx)
-            .child(
-                h_flex()
-                    .gap_4()
-                    .justify_between()
-                    .items_start()
-                    .child(
-                        v_flex()
-                            .gap_0p5()
-                            .when_some(self.title.clone(), |div, title| {
-                                div.child(Label::new(title))
-                            })
-                            .child(div().max_w_96().children(self.contents)),
-                    )
-                    .when(self.show_close_button, |this| {
-                        this.on_modifiers_changed(move |_, _, cx| cx.notify(entity))
-                            .child(
-                                IconButton::new(close_id, close_icon)
-                                    .tooltip(move |_window, cx| {
-                                        if suppress {
-                                            Tooltip::for_action(
-                                                "Suppress.\nClose with click.",
-                                                &SuppressNotification,
-                                                cx,
-                                            )
-                                        } else if show_suppress_button {
-                                            Tooltip::for_action(
-                                                "Close.\nSuppress with shift-click.",
-                                                &menu::Cancel,
-                                                cx,
-                                            )
-                                        } else {
-                                            Tooltip::for_action("Close", &menu::Cancel, cx)
-                                        }
-                                    })
-                                    .on_click({
-                                        let close = self.close.take();
-                                        move |_, window, cx| {
-                                            if let Some(close) = &close {
-                                                close(&suppress, window, cx)
-                                            }
-                                        }
-                                    }),
-                            )
-                    }),
-            )
-            .children(self.suffix)
-    }
-}
-
-impl Component for NotificationFrame {}
-
-pub mod simple_message_notification {
-    use std::sync::Arc;
-
-    use gpui::{
-        AnyElement, DismissEvent, EventEmitter, FocusHandle, Focusable, ParentElement, Render,
-        ScrollHandle, SharedString, Styled,
-    };
-    use ui::{WithScrollbar, prelude::*};
-
-    use crate::notifications::NotificationFrame;
-
-    use super::{Notification, SuppressEvent};
-
-    pub struct MessageNotification {
-        focus_handle: FocusHandle,
-        build_content: Box<dyn Fn(&mut Window, &mut Context<Self>) -> AnyElement>,
-        primary_message: Option<SharedString>,
-        primary_icon: Option<IconName>,
-        primary_icon_color: Option<Color>,
-        primary_on_click: Option<Arc<dyn Fn(&mut Window, &mut Context<Self>)>>,
-        secondary_message: Option<SharedString>,
-        secondary_icon: Option<IconName>,
-        secondary_icon_color: Option<Color>,
-        secondary_on_click: Option<Arc<dyn Fn(&mut Window, &mut Context<Self>)>>,
-        more_info_message: Option<SharedString>,
-        more_info_url: Option<Arc<str>>,
-        show_close_button: bool,
-        show_suppress_button: bool,
-        title: Option<SharedString>,
-        scroll_handle: ScrollHandle,
-    }
-
-    impl Focusable for MessageNotification {
-        fn focus_handle(&self, _: &App) -> FocusHandle {
-            self.focus_handle.clone()
-        }
-    }
-
-    impl EventEmitter<DismissEvent> for MessageNotification {}
-    impl EventEmitter<SuppressEvent> for MessageNotification {}
-
-    impl Notification for MessageNotification {}
-
-    impl MessageNotification {
-        pub fn new<S>(message: S, cx: &mut App) -> MessageNotification
-        where
-            S: Into<SharedString>,
-        {
-            let message = message.into();
-            Self::new_from_builder(cx, move |_, _| {
-                Label::new(message.clone()).into_any_element()
-            })
-        }
-
-        pub fn new_from_builder<F>(cx: &mut App, content: F) -> MessageNotification
-        where
-            F: 'static + Fn(&mut Window, &mut Context<Self>) -> AnyElement,
-        {
-            Self {
-                build_content: Box::new(content),
-                primary_message: None,
-                primary_icon: None,
-                primary_icon_color: None,
-                primary_on_click: None,
-                secondary_message: None,
-                secondary_icon: None,
-                secondary_icon_color: None,
-                secondary_on_click: None,
-                more_info_message: None,
-                more_info_url: None,
-                show_close_button: true,
-                show_suppress_button: true,
-                title: None,
-                focus_handle: cx.focus_handle(),
-                scroll_handle: ScrollHandle::new(),
-            }
-        }
-
-        pub fn primary_message<S>(mut self, message: S) -> Self
-        where
-            S: Into<SharedString>,
-        {
-            self.primary_message = Some(message.into());
-            self
-        }
-
-        pub fn primary_icon(mut self, icon: IconName) -> Self {
-            self.primary_icon = Some(icon);
-            self
-        }
-
-        pub fn primary_icon_color(mut self, color: Color) -> Self {
-            self.primary_icon_color = Some(color);
-            self
-        }
-
-        pub fn primary_on_click<F>(mut self, on_click: F) -> Self
-        where
-            F: 'static + Fn(&mut Window, &mut Context<Self>),
-        {
-            self.primary_on_click = Some(Arc::new(on_click));
-            self
-        }
-
-        pub fn primary_on_click_arc<F>(mut self, on_click: Arc<F>) -> Self
-        where
-            F: 'static + Fn(&mut Window, &mut Context<Self>),
-        {
-            self.primary_on_click = Some(on_click);
-            self
-        }
-
-        pub fn secondary_message<S>(mut self, message: S) -> Self
-        where
-            S: Into<SharedString>,
-        {
-            self.secondary_message = Some(message.into());
-            self
-        }
-
-        pub fn secondary_icon(mut self, icon: IconName) -> Self {
-            self.secondary_icon = Some(icon);
-            self
-        }
-
-        pub fn secondary_icon_color(mut self, color: Color) -> Self {
-            self.secondary_icon_color = Some(color);
-            self
-        }
-
-        pub fn secondary_on_click<F>(mut self, on_click: F) -> Self
-        where
-            F: 'static + Fn(&mut Window, &mut Context<Self>),
-        {
-            self.secondary_on_click = Some(Arc::new(on_click));
-            self
-        }
-
-        pub fn secondary_on_click_arc<F>(mut self, on_click: Arc<F>) -> Self
-        where
-            F: 'static + Fn(&mut Window, &mut Context<Self>),
-        {
-            self.secondary_on_click = Some(on_click);
-            self
-        }
-
-        pub fn more_info_message<S>(mut self, message: S) -> Self
-        where
-            S: Into<SharedString>,
-        {
-            self.more_info_message = Some(message.into());
-            self
-        }
-
-        pub fn more_info_url<S>(mut self, url: S) -> Self
-        where
-            S: Into<Arc<str>>,
-        {
-            self.more_info_url = Some(url.into());
-            self
-        }
-
-        pub fn dismiss(&mut self, cx: &mut Context<Self>) {
-            cx.emit(DismissEvent);
-        }
-
-        pub fn show_close_button(mut self, show: bool) -> Self {
-            self.show_close_button = show;
-            self
-        }
-
-        /// Determines whether the given notification ID should be suppressible
-        /// Suppressed notifications will not be shown anymor
-        pub fn show_suppress_button(mut self, show: bool) -> Self {
-            self.show_suppress_button = show;
-            self
-        }
-
-        pub fn with_title<S>(mut self, title: S) -> Self
-        where
-            S: Into<SharedString>,
-        {
-            self.title = Some(title.into());
-            self
-        }
-    }
-
-    impl Render for MessageNotification {
-        fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-            NotificationFrame::new()
-                .with_title(self.title.clone())
-                .with_content(
-                    div()
-                        .child(
-                            div()
-                                .id("message-notification-content")
-                                .max_h(vh(0.6, window))
-                                .overflow_y_scroll()
-                                .track_scroll(&self.scroll_handle.clone())
-                                .child((self.build_content)(window, cx)),
-                        )
-                        .vertical_scrollbar_for(&self.scroll_handle, window, cx),
-                )
-                .show_close_button(self.show_close_button)
-                .show_suppress_button(self.show_suppress_button)
-                .on_close(cx.listener(|_, suppress, _, cx| {
-                    if *suppress {
-                        cx.emit(SuppressEvent);
-                    } else {
-                        cx.emit(DismissEvent);
-                    }
-                }))
-                .with_suffix(
-                    h_flex()
-                        .gap_1()
-                        .children(self.primary_message.iter().map(|message| {
-                            let mut button = Button::new(message.clone(), message.clone())
-                                .label_size(LabelSize::Small)
-                                .on_click(cx.listener(|this, _, window, cx| {
-                                    if let Some(on_click) = this.primary_on_click.as_ref() {
-                                        (on_click)(window, cx)
-                                    };
-                                    this.dismiss(cx)
-                                }));
-
-                            if let Some(icon) = self.primary_icon {
-                                button = button
-                                    .icon(icon)
-                                    .icon_color(self.primary_icon_color.unwrap_or(Color::Muted))
-                                    .icon_position(IconPosition::Start)
-                                    .icon_size(IconSize::Small);
-                            }
-
-                            button
-                        }))
-                        .children(self.secondary_message.iter().map(|message| {
-                            let mut button = Button::new(message.clone(), message.clone())
-                                .label_size(LabelSize::Small)
-                                .on_click(cx.listener(|this, _, window, cx| {
-                                    if let Some(on_click) = this.secondary_on_click.as_ref() {
-                                        (on_click)(window, cx)
-                                    };
-                                    this.dismiss(cx)
-                                }));
-
-                            if let Some(icon) = self.secondary_icon {
-                                button = button
-                                    .icon(icon)
-                                    .icon_position(IconPosition::Start)
-                                    .icon_size(IconSize::Small)
-                                    .icon_color(self.secondary_icon_color.unwrap_or(Color::Muted));
-                            }
-
-                            button
-                        }))
-                        .child(
-                            h_flex().w_full().justify_end().children(
-                                self.more_info_message
-                                    .iter()
-                                    .zip(self.more_info_url.iter())
-                                    .map(|(message, url)| {
-                                        let url = url.clone();
-                                        Button::new(message.clone(), message.clone())
-                                            .label_size(LabelSize::Small)
-                                            .icon(IconName::ArrowUpRight)
-                                            .icon_size(IconSize::Indicator)
-                                            .icon_color(Color::Muted)
-                                            .on_click(cx.listener(move |_, _, _, cx| {
-                                                cx.open_url(&url);
-                                            }))
-                                    }),
-                            ),
-                        ),
-                )
-        }
-    }
-}
-
-static GLOBAL_APP_NOTIFICATIONS: LazyLock<Mutex<AppNotifications>> = LazyLock::new(|| {
-    Mutex::new(AppNotifications {
-        app_notifications: Vec::new(),
-    })
-});
-
-/// Stores app notifications so that they can be shown in new workspaces.
-struct AppNotifications {
-    app_notifications: Vec<(
-        NotificationId,
-        Arc<dyn Fn(&mut Context<Workspace>) -> AnyView + Send + Sync>,
-    )>,
-}
-
-impl AppNotifications {
-    pub fn insert(
-        &mut self,
-        id: NotificationId,
-        build_notification: Arc<dyn Fn(&mut Context<Workspace>) -> AnyView + Send + Sync>,
-    ) {
-        self.remove(&id);
-        self.app_notifications.push((id, build_notification))
-    }
-
-    pub fn remove(&mut self, id: &NotificationId) {
-        self.app_notifications
-            .retain(|(existing_id, _)| existing_id != id);
-    }
-}
-
-/// Shows a notification in all workspaces. New workspaces will also receive the notification - this
-/// is particularly to handle notifications that occur on initialization before any workspaces
-/// exist. If the notification is dismissed within any workspace, it will be removed from all.
-pub fn show_app_notification<V: Notification + 'static>(
-    id: NotificationId,
-    cx: &mut App,
-    build_notification: impl Fn(&mut Context<Workspace>) -> Entity<V> + 'static + Send + Sync,
-) {
-    // Defer notification creation so that windows on the stack can be returned to GPUI
-    cx.defer(move |cx| {
-        // Handle dismiss events by removing the notification from all workspaces.
-        let build_notification: Arc<dyn Fn(&mut Context<Workspace>) -> AnyView + Send + Sync> =
-            Arc::new({
-                let id = id.clone();
-                move |cx| {
-                    let notification = build_notification(cx);
-                    cx.subscribe(&notification, {
-                        let id = id.clone();
-                        move |_, _, _: &DismissEvent, cx| {
-                            dismiss_app_notification(&id, cx);
-                        }
-                    })
-                    .detach();
-                    cx.subscribe(&notification, {
-                        let id = id.clone();
-                        move |workspace: &mut Workspace, _, _: &SuppressEvent, cx| {
-                            workspace.suppress_notification(&id, cx);
-                        }
-                    })
-                    .detach();
-                    notification.into()
-                }
-            });
-
-        // Store the notification so that new workspaces also receive it.
-        GLOBAL_APP_NOTIFICATIONS
-            .lock()
-            .insert(id.clone(), build_notification.clone());
-
-        for window in cx.windows() {
-            if let Some(workspace_window) = window.downcast::<Workspace>() {
-                workspace_window
-                    .update(cx, |workspace, _window, cx| {
-                        workspace.show_notification_without_handling_dismiss_events(
-                            &id,
-                            cx,
-                            |cx| build_notification(cx),
-                        );
-                    })
-                    .ok(); // Doesn't matter if the windows are dropped
-            }
-        }
-    });
-}
-
-pub fn dismiss_app_notification(id: &NotificationId, cx: &mut App) {
-    let id = id.clone();
-    // Defer notification dismissal so that windows on the stack can be returned to GPUI
-    cx.defer(move |cx| {
-        GLOBAL_APP_NOTIFICATIONS.lock().remove(&id);
-        for window in cx.windows() {
-            if let Some(workspace_window) = window.downcast::<Workspace>() {
-                let id = id.clone();
-                workspace_window
-                    .update(cx, |workspace, _window, cx| {
-                        workspace.dismiss_notification(&id, cx)
-                    })
-                    .ok();
-            }
-        }
-    });
-}
-
-pub trait NotifyResultExt {
-    type Ok;
-
-    fn notify_err(self, workspace: &mut Workspace, cx: &mut Context<Workspace>)
-    -> Option<Self::Ok>;
-
-    fn notify_async_err(self, cx: &mut AsyncWindowContext) -> Option<Self::Ok>;
-
-    /// Notifies the active workspace if there is one, otherwise notifies all workspaces.
-    fn notify_app_err(self, cx: &mut App) -> Option<Self::Ok>;
-}
-
-impl<T, E> NotifyResultExt for std::result::Result<T, E>
-where
-    E: std::fmt::Debug + std::fmt::Display,
-{
-    type Ok = T;
-
-    fn notify_err(self, workspace: &mut Workspace, cx: &mut Context<Workspace>) -> Option<T> {
-        match self {
-            Ok(value) => Some(value),
-            Err(err) => {
-                log::error!("Showing error notification in workspace: {err:?}");
-                workspace.show_error(&err, cx);
-                None
-            }
-        }
-    }
-
-    fn notify_async_err(self, cx: &mut AsyncWindowContext) -> Option<T> {
-        match self {
-            Ok(value) => Some(value),
-            Err(err) => {
-                log::error!("{err:?}");
-                cx.update_root(|view, _, cx| {
-                    if let Ok(workspace) = view.downcast::<Workspace>() {
-                        workspace.update(cx, |workspace, cx| workspace.show_error(&err, cx))
-                    }
-                })
-                .ok();
-                None
-            }
-        }
-    }
-
-    fn notify_app_err(self, cx: &mut App) -> Option<T> {
-        match self {
-            Ok(value) => Some(value),
-            Err(err) => {
-                let message: SharedString = format!("Error: {err}").into();
-                log::error!("Showing error notification in app: {message}");
-                show_app_notification(workspace_error_notification_id(), cx, {
-                    move |cx| {
-                        cx.new({
-                            let message = message.clone();
-                            move |cx| ErrorMessagePrompt::new(message, cx)
-                        })
-                    }
-                });
-
-                None
-            }
-        }
-    }
-}
-
-pub trait NotifyTaskExt {
-    fn detach_and_notify_err(self, window: &mut Window, cx: &mut App);
-}
-
-impl<R, E> NotifyTaskExt for Task<std::result::Result<R, E>>
-where
-    E: std::fmt::Debug + std::fmt::Display + Sized + 'static,
-    R: 'static,
-{
-    fn detach_and_notify_err(self, window: &mut Window, cx: &mut App) {
-        window
-            .spawn(cx, async move |cx| self.await.notify_async_err(cx))
-            .detach();
-    }
-}
-
-pub trait DetachAndPromptErr<R> {
-    fn prompt_err(
-        self,
-        msg: &str,
-        window: &Window,
-        cx: &App,
-        f: impl FnOnce(&anyhow::Error, &mut Window, &mut App) -> Option<String> + 'static,
-    ) -> Task<Option<R>>;
-
-    fn detach_and_prompt_err(
-        self,
-        msg: &str,
-        window: &Window,
-        cx: &App,
-        f: impl FnOnce(&anyhow::Error, &mut Window, &mut App) -> Option<String> + 'static,
-    );
-}
-
-impl<R> DetachAndPromptErr<R> for Task<anyhow::Result<R>>
-where
-    R: 'static,
-{
-    fn prompt_err(
-        self,
-        msg: &str,
-        window: &Window,
-        cx: &App,
-        f: impl FnOnce(&anyhow::Error, &mut Window, &mut App) -> Option<String> + 'static,
-    ) -> Task<Option<R>> {
-        let msg = msg.to_owned();
-        window.spawn(cx, async move |cx| {
-            let result = self.await;
-            if let Err(err) = result.as_ref() {
-                log::error!("{err:#}");
-                if let Ok(prompt) = cx.update(|window, cx| {
-                    let mut display = format!("{err:#}");
-                    if !display.ends_with('\n') {
-                        display.push('.');
-                        display.push(' ')
-                    }
-                    let detail =
-                        f(err, window, cx).unwrap_or_else(|| format!("{display}Please try again."));
-                    window.prompt(PromptLevel::Critical, &msg, Some(&detail), &["Ok"], cx)
-                }) {
-                    prompt.await.ok();
-                }
-                return None;
-            }
-            Some(result.unwrap())
-        })
-    }
-
-    fn detach_and_prompt_err(
-        self,
-        msg: &str,
-        window: &Window,
-        cx: &App,
-        f: impl FnOnce(&anyhow::Error, &mut Window, &mut App) -> Option<String> + 'static,
-    ) {
-        self.prompt_err(msg, window, cx, f).detach();
-    }
-}
diff --git a/crates/workspace/src/pane.rs b/crates/workspace/src/pane.rs
deleted file mode 100644
index e99f8d1dc9..0000000000
--- a/crates/workspace/src/pane.rs
+++ /dev/null
@@ -1,7010 +0,0 @@
-use crate::{
-    CloseWindow, NewFile, NewTerminal, OpenInTerminal, OpenOptions, OpenTerminal, OpenVisible,
-    SplitDirection, ToggleFileFinder, ToggleProjectSymbols, ToggleZoom, Workspace,
-    WorkspaceItemBuilder,
-    invalid_item_view::InvalidItemView,
-    item::{
-        ActivateOnClose, ClosePosition, Item, ItemBufferKind, ItemHandle, ItemSettings,
-        PreviewTabsSettings, ProjectItemKind, SaveOptions, ShowCloseButton, ShowDiagnostics,
-        TabContentParams, TabTooltipContent, WeakItemHandle,
-    },
-    move_item,
-    notifications::NotifyResultExt,
-    toolbar::Toolbar,
-    workspace_settings::{AutosaveSetting, TabBarSettings, WorkspaceSettings},
-};
-use anyhow::Result;
-use collections::{BTreeSet, HashMap, HashSet, VecDeque};
-use futures::{StreamExt, stream::FuturesUnordered};
-use gpui::{
-    Action, AnyElement, App, AsyncWindowContext, ClickEvent, ClipboardItem, Context, Corner, Div,
-    DragMoveEvent, Entity, EntityId, EventEmitter, ExternalPaths, FocusHandle, FocusOutEvent,
-    Focusable, KeyContext, MouseButton, MouseDownEvent, NavigationDirection, Pixels, Point,
-    PromptLevel, Render, ScrollHandle, Subscription, Task, WeakEntity, WeakFocusHandle, Window,
-    actions, anchored, deferred, prelude::*,
-};
-use itertools::Itertools;
-use language::DiagnosticSeverity;
-use parking_lot::Mutex;
-use project::{DirectoryLister, Project, ProjectEntryId, ProjectPath, WorktreeId};
-use schemars::JsonSchema;
-use serde::Deserialize;
-use settings::{Settings, SettingsStore};
-use std::{
-    any::Any,
-    cmp, fmt, mem,
-    num::NonZeroUsize,
-    ops::ControlFlow,
-    path::PathBuf,
-    rc::Rc,
-    sync::{
-        Arc,
-        atomic::{AtomicUsize, Ordering},
-    },
-    time::Duration,
-};
-use theme::ThemeSettings;
-use ui::{
-    ButtonSize, Color, ContextMenu, ContextMenuEntry, ContextMenuItem, DecoratedIcon, IconButton,
-    IconButtonShape, IconDecoration, IconDecorationKind, IconName, IconSize, Indicator, Label,
-    PopoverMenu, PopoverMenuHandle, Tab, TabBar, TabPosition, Tooltip, prelude::*,
-    right_click_menu,
-};
-use util::{ResultExt, debug_panic, maybe, paths::PathStyle, truncate_and_remove_front};
-
-/// A selected entry in e.g. project panel.
-#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct SelectedEntry {
-    pub worktree_id: WorktreeId,
-    pub entry_id: ProjectEntryId,
-}
-
-/// A group of selected entries from project panel.
-#[derive(Debug)]
-pub struct DraggedSelection {
-    pub active_selection: SelectedEntry,
-    pub marked_selections: Arc<[SelectedEntry]>,
-}
-
-impl DraggedSelection {
-    pub fn items<'a>(&'a self) -> Box<dyn Iterator<Item = &'a SelectedEntry> + 'a> {
-        if self.marked_selections.contains(&self.active_selection) {
-            Box::new(self.marked_selections.iter())
-        } else {
-            Box::new(std::iter::once(&self.active_selection))
-        }
-    }
-}
-
-#[derive(Clone, Copy, PartialEq, Debug, Deserialize, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum SaveIntent {
-    /// write all files (even if unchanged)
-    /// prompt before overwriting on-disk changes
-    Save,
-    /// same as Save, but without auto formatting
-    SaveWithoutFormat,
-    /// write any files that have local changes
-    /// prompt before overwriting on-disk changes
-    SaveAll,
-    /// always prompt for a new path
-    SaveAs,
-    /// prompt "you have unsaved changes" before writing
-    Close,
-    /// write all dirty files, don't prompt on conflict
-    Overwrite,
-    /// skip all save-related behavior
-    Skip,
-}
-
-/// Activates a specific item in the pane by its index.
-#[derive(Clone, PartialEq, Debug, Deserialize, JsonSchema, Default, Action)]
-#[action(namespace = pane)]
-pub struct ActivateItem(pub usize);
-
-/// Closes the currently active item in the pane.
-#[derive(Clone, PartialEq, Debug, Deserialize, JsonSchema, Default, Action)]
-#[action(namespace = pane)]
-#[serde(deny_unknown_fields)]
-pub struct CloseActiveItem {
-    #[serde(default)]
-    pub save_intent: Option<SaveIntent>,
-    #[serde(default)]
-    pub close_pinned: bool,
-}
-
-/// Closes all inactive items in the pane.
-#[derive(Clone, PartialEq, Debug, Deserialize, JsonSchema, Default, Action)]
-#[action(namespace = pane)]
-#[serde(deny_unknown_fields)]
-#[action(deprecated_aliases = ["pane::CloseInactiveItems"])]
-pub struct CloseOtherItems {
-    #[serde(default)]
-    pub save_intent: Option<SaveIntent>,
-    #[serde(default)]
-    pub close_pinned: bool,
-}
-
-/// Closes all multibuffers in the pane.
-#[derive(Clone, PartialEq, Debug, Deserialize, JsonSchema, Default, Action)]
-#[action(namespace = pane)]
-#[serde(deny_unknown_fields)]
-pub struct CloseMultibufferItems {
-    #[serde(default)]
-    pub save_intent: Option<SaveIntent>,
-    #[serde(default)]
-    pub close_pinned: bool,
-}
-
-/// Closes all items in the pane.
-#[derive(Clone, PartialEq, Debug, Deserialize, JsonSchema, Default, Action)]
-#[action(namespace = pane)]
-#[serde(deny_unknown_fields)]
-pub struct CloseAllItems {
-    #[serde(default)]
-    pub save_intent: Option<SaveIntent>,
-    #[serde(default)]
-    pub close_pinned: bool,
-}
-
-/// Closes all items that have no unsaved changes.
-#[derive(Clone, PartialEq, Debug, Deserialize, JsonSchema, Default, Action)]
-#[action(namespace = pane)]
-#[serde(deny_unknown_fields)]
-pub struct CloseCleanItems {
-    #[serde(default)]
-    pub close_pinned: bool,
-}
-
-/// Closes all items to the right of the current item.
-#[derive(Clone, PartialEq, Debug, Deserialize, JsonSchema, Default, Action)]
-#[action(namespace = pane)]
-#[serde(deny_unknown_fields)]
-pub struct CloseItemsToTheRight {
-    #[serde(default)]
-    pub close_pinned: bool,
-}
-
-/// Closes all items to the left of the current item.
-#[derive(Clone, PartialEq, Debug, Deserialize, JsonSchema, Default, Action)]
-#[action(namespace = pane)]
-#[serde(deny_unknown_fields)]
-pub struct CloseItemsToTheLeft {
-    #[serde(default)]
-    pub close_pinned: bool,
-}
-
-/// Reveals the current item in the project panel.
-#[derive(Clone, PartialEq, Debug, Deserialize, JsonSchema, Default, Action)]
-#[action(namespace = pane)]
-#[serde(deny_unknown_fields)]
-pub struct RevealInProjectPanel {
-    #[serde(skip)]
-    pub entry_id: Option<u64>,
-}
-
-/// Opens the search interface with the specified configuration.
-#[derive(Clone, PartialEq, Debug, Deserialize, JsonSchema, Default, Action)]
-#[action(namespace = pane)]
-#[serde(deny_unknown_fields)]
-pub struct DeploySearch {
-    #[serde(default)]
-    pub replace_enabled: bool,
-    #[serde(default)]
-    pub included_files: Option<String>,
-    #[serde(default)]
-    pub excluded_files: Option<String>,
-}
-
-actions!(
-    pane,
-    [
-        /// Activates the previous item in the pane.
-        ActivatePreviousItem,
-        /// Activates the next item in the pane.
-        ActivateNextItem,
-        /// Activates the last item in the pane.
-        ActivateLastItem,
-        /// Switches to the alternate file.
-        AlternateFile,
-        /// Navigates back in history.
-        GoBack,
-        /// Navigates forward in history.
-        GoForward,
-        /// Joins this pane into the next pane.
-        JoinIntoNext,
-        /// Joins all panes into one.
-        JoinAll,
-        /// Reopens the most recently closed item.
-        ReopenClosedItem,
-        /// Splits the pane to the left, cloning the current item.
-        SplitLeft,
-        /// Splits the pane upward, cloning the current item.
-        SplitUp,
-        /// Splits the pane to the right, cloning the current item.
-        SplitRight,
-        /// Splits the pane downward, cloning the current item.
-        SplitDown,
-        /// Splits the pane to the left, moving the current item.
-        SplitAndMoveLeft,
-        /// Splits the pane upward, moving the current item.
-        SplitAndMoveUp,
-        /// Splits the pane to the right, moving the current item.
-        SplitAndMoveRight,
-        /// Splits the pane downward, moving the current item.
-        SplitAndMoveDown,
-        /// Splits the pane horizontally.
-        SplitHorizontal,
-        /// Splits the pane vertically.
-        SplitVertical,
-        /// Swaps the current item with the one to the left.
-        SwapItemLeft,
-        /// Swaps the current item with the one to the right.
-        SwapItemRight,
-        /// Toggles preview mode for the current tab.
-        TogglePreviewTab,
-        /// Toggles pin status for the current tab.
-        TogglePinTab,
-        /// Unpins all tabs in the pane.
-        UnpinAllTabs,
-    ]
-);
-
-impl DeploySearch {
-    pub fn find() -> Self {
-        Self {
-            replace_enabled: false,
-            included_files: None,
-            excluded_files: None,
-        }
-    }
-}
-
-const MAX_NAVIGATION_HISTORY_LEN: usize = 1024;
-
-pub enum Event {
-    AddItem {
-        item: Box<dyn ItemHandle>,
-    },
-    ActivateItem {
-        local: bool,
-        focus_changed: bool,
-    },
-    Remove {
-        focus_on_pane: Option<Entity<Pane>>,
-    },
-    RemovedItem {
-        item: Box<dyn ItemHandle>,
-    },
-    Split {
-        direction: SplitDirection,
-        clone_active_item: bool,
-    },
-    ItemPinned,
-    ItemUnpinned,
-    JoinAll,
-    JoinIntoNext,
-    ChangeItemTitle,
-    Focus,
-    ZoomIn,
-    ZoomOut,
-    UserSavedItem {
-        item: Box<dyn WeakItemHandle>,
-        save_intent: SaveIntent,
-    },
-}
-
-impl fmt::Debug for Event {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Event::AddItem { item } => f
-                .debug_struct("AddItem")
-                .field("item", &item.item_id())
-                .finish(),
-            Event::ActivateItem { local, .. } => f
-                .debug_struct("ActivateItem")
-                .field("local", local)
-                .finish(),
-            Event::Remove { .. } => f.write_str("Remove"),
-            Event::RemovedItem { item } => f
-                .debug_struct("RemovedItem")
-                .field("item", &item.item_id())
-                .finish(),
-            Event::Split {
-                direction,
-                clone_active_item,
-            } => f
-                .debug_struct("Split")
-                .field("direction", direction)
-                .field("clone_active_item", clone_active_item)
-                .finish(),
-            Event::JoinAll => f.write_str("JoinAll"),
-            Event::JoinIntoNext => f.write_str("JoinIntoNext"),
-            Event::ChangeItemTitle => f.write_str("ChangeItemTitle"),
-            Event::Focus => f.write_str("Focus"),
-            Event::ZoomIn => f.write_str("ZoomIn"),
-            Event::ZoomOut => f.write_str("ZoomOut"),
-            Event::UserSavedItem { item, save_intent } => f
-                .debug_struct("UserSavedItem")
-                .field("item", &item.id())
-                .field("save_intent", save_intent)
-                .finish(),
-            Event::ItemPinned => f.write_str("ItemPinned"),
-            Event::ItemUnpinned => f.write_str("ItemUnpinned"),
-        }
-    }
-}
-
-/// A container for 0 to many items that are open in the workspace.
-/// Treats all items uniformly via the [`ItemHandle`] trait, whether it's an editor, search results multibuffer, terminal or something else,
-/// responsible for managing item tabs, focus and zoom states and drag and drop features.
-/// Can be split, see `PaneGroup` for more details.
-pub struct Pane {
-    alternate_file_items: (
-        Option<Box<dyn WeakItemHandle>>,
-        Option<Box<dyn WeakItemHandle>>,
-    ),
-    focus_handle: FocusHandle,
-    items: Vec<Box<dyn ItemHandle>>,
-    activation_history: Vec<ActivationHistoryEntry>,
-    next_activation_timestamp: Arc<AtomicUsize>,
-    zoomed: bool,
-    was_focused: bool,
-    active_item_index: usize,
-    preview_item_id: Option<EntityId>,
-    last_focus_handle_by_item: HashMap<EntityId, WeakFocusHandle>,
-    nav_history: NavHistory,
-    toolbar: Entity<Toolbar>,
-    pub(crate) workspace: WeakEntity<Workspace>,
-    project: WeakEntity<Project>,
-    pub drag_split_direction: Option<SplitDirection>,
-    can_drop_predicate: Option<Arc<dyn Fn(&dyn Any, &mut Window, &mut App) -> bool>>,
-    custom_drop_handle: Option<
-        Arc<dyn Fn(&mut Pane, &dyn Any, &mut Window, &mut Context<Pane>) -> ControlFlow<(), ()>>,
-    >,
-    can_split_predicate:
-        Option<Arc<dyn Fn(&mut Self, &dyn Any, &mut Window, &mut Context<Self>) -> bool>>,
-    can_toggle_zoom: bool,
-    should_display_tab_bar: Rc<dyn Fn(&Window, &mut Context<Pane>) -> bool>,
-    render_tab_bar_buttons: Rc<
-        dyn Fn(
-            &mut Pane,
-            &mut Window,
-            &mut Context<Pane>,
-        ) -> (Option<AnyElement>, Option<AnyElement>),
-    >,
-    render_tab_bar: Rc<dyn Fn(&mut Pane, &mut Window, &mut Context<Pane>) -> AnyElement>,
-    show_tab_bar_buttons: bool,
-    max_tabs: Option<NonZeroUsize>,
-    use_max_tabs: bool,
-    _subscriptions: Vec<Subscription>,
-    tab_bar_scroll_handle: ScrollHandle,
-    /// This is set to true if a user scroll has occurred more recently than a system scroll
-    /// We want to suppress certain system scrolls when the user has intentionally scrolled
-    suppress_scroll: bool,
-    /// Is None if navigation buttons are permanently turned off (and should not react to setting changes).
-    /// Otherwise, when `display_nav_history_buttons` is Some, it determines whether nav buttons should be displayed.
-    display_nav_history_buttons: Option<bool>,
-    double_click_dispatch_action: Box<dyn Action>,
-    save_modals_spawned: HashSet<EntityId>,
-    close_pane_if_empty: bool,
-    pub new_item_context_menu_handle: PopoverMenuHandle<ContextMenu>,
-    pub split_item_context_menu_handle: PopoverMenuHandle<ContextMenu>,
-    pinned_tab_count: usize,
-    diagnostics: HashMap<ProjectPath, DiagnosticSeverity>,
-    zoom_out_on_close: bool,
-    diagnostic_summary_update: Task<()>,
-    /// If a certain project item wants to get recreated with specific data, it can persist its data before the recreation here.
-    pub project_item_restoration_data: HashMap<ProjectItemKind, Box<dyn Any + Send>>,
-}
-
-pub struct ActivationHistoryEntry {
-    pub entity_id: EntityId,
-    pub timestamp: usize,
-}
-
-pub struct ItemNavHistory {
-    history: NavHistory,
-    item: Arc<dyn WeakItemHandle>,
-    is_preview: bool,
-}
-
-#[derive(Clone)]
-pub struct NavHistory(Arc<Mutex<NavHistoryState>>);
-
-struct NavHistoryState {
-    mode: NavigationMode,
-    backward_stack: VecDeque<NavigationEntry>,
-    forward_stack: VecDeque<NavigationEntry>,
-    closed_stack: VecDeque<NavigationEntry>,
-    paths_by_item: HashMap<EntityId, (ProjectPath, Option<PathBuf>)>,
-    pane: WeakEntity<Pane>,
-    next_timestamp: Arc<AtomicUsize>,
-}
-
-#[derive(Debug, Default, Copy, Clone)]
-pub enum NavigationMode {
-    #[default]
-    Normal,
-    GoingBack,
-    GoingForward,
-    ClosingItem,
-    ReopeningClosedItem,
-    Disabled,
-}
-
-pub struct NavigationEntry {
-    pub item: Arc<dyn WeakItemHandle>,
-    pub data: Option<Box<dyn Any + Send>>,
-    pub timestamp: usize,
-    pub is_preview: bool,
-}
-
-#[derive(Clone)]
-pub struct DraggedTab {
-    pub pane: Entity<Pane>,
-    pub item: Box<dyn ItemHandle>,
-    pub ix: usize,
-    pub detail: usize,
-    pub is_active: bool,
-}
-
-impl EventEmitter<Event> for Pane {}
-
-pub enum Side {
-    Left,
-    Right,
-}
-
-#[derive(Copy, Clone)]
-enum PinOperation {
-    Pin,
-    Unpin,
-}
-
-impl Pane {
-    pub fn new(
-        workspace: WeakEntity<Workspace>,
-        project: Entity<Project>,
-        next_timestamp: Arc<AtomicUsize>,
-        can_drop_predicate: Option<Arc<dyn Fn(&dyn Any, &mut Window, &mut App) -> bool + 'static>>,
-        double_click_dispatch_action: Box<dyn Action>,
-        use_max_tabs: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let focus_handle = cx.focus_handle();
-        let max_tabs = if use_max_tabs {
-            WorkspaceSettings::get_global(cx).max_tabs
-        } else {
-            None
-        };
-
-        let subscriptions = vec![
-            cx.on_focus(&focus_handle, window, Pane::focus_in),
-            cx.on_focus_in(&focus_handle, window, Pane::focus_in),
-            cx.on_focus_out(&focus_handle, window, Pane::focus_out),
-            cx.observe_global_in::<SettingsStore>(window, Self::settings_changed),
-            cx.subscribe(&project, Self::project_events),
-        ];
-
-        let handle = cx.entity().downgrade();
-
-        Self {
-            alternate_file_items: (None, None),
-            focus_handle,
-            items: Vec::new(),
-            activation_history: Vec::new(),
-            next_activation_timestamp: next_timestamp.clone(),
-            was_focused: false,
-            zoomed: false,
-            active_item_index: 0,
-            preview_item_id: None,
-            max_tabs,
-            use_max_tabs,
-            last_focus_handle_by_item: Default::default(),
-            nav_history: NavHistory(Arc::new(Mutex::new(NavHistoryState {
-                mode: NavigationMode::Normal,
-                backward_stack: Default::default(),
-                forward_stack: Default::default(),
-                closed_stack: Default::default(),
-                paths_by_item: Default::default(),
-                pane: handle,
-                next_timestamp,
-            }))),
-            toolbar: cx.new(|_| Toolbar::new()),
-            tab_bar_scroll_handle: ScrollHandle::new(),
-            suppress_scroll: false,
-            drag_split_direction: None,
-            workspace,
-            project: project.downgrade(),
-            can_drop_predicate,
-            custom_drop_handle: None,
-            can_split_predicate: None,
-            can_toggle_zoom: true,
-            should_display_tab_bar: Rc::new(|_, cx| TabBarSettings::get_global(cx).show),
-            render_tab_bar_buttons: Rc::new(default_render_tab_bar_buttons),
-            render_tab_bar: Rc::new(Self::render_tab_bar),
-            show_tab_bar_buttons: TabBarSettings::get_global(cx).show_tab_bar_buttons,
-            display_nav_history_buttons: Some(
-                TabBarSettings::get_global(cx).show_nav_history_buttons,
-            ),
-            _subscriptions: subscriptions,
-            double_click_dispatch_action,
-            save_modals_spawned: HashSet::default(),
-            close_pane_if_empty: true,
-            split_item_context_menu_handle: Default::default(),
-            new_item_context_menu_handle: Default::default(),
-            pinned_tab_count: 0,
-            diagnostics: Default::default(),
-            zoom_out_on_close: true,
-            diagnostic_summary_update: Task::ready(()),
-            project_item_restoration_data: HashMap::default(),
-        }
-    }
-
-    fn alternate_file(&mut self, _: &AlternateFile, window: &mut Window, cx: &mut Context<Pane>) {
-        let (_, alternative) = &self.alternate_file_items;
-        if let Some(alternative) = alternative {
-            let existing = self
-                .items()
-                .find_position(|item| item.item_id() == alternative.id());
-            if let Some((ix, _)) = existing {
-                self.activate_item(ix, true, true, window, cx);
-            } else if let Some(upgraded) = alternative.upgrade() {
-                self.add_item(upgraded, true, true, None, window, cx);
-            }
-        }
-    }
-
-    pub fn track_alternate_file_items(&mut self) {
-        if let Some(item) = self.active_item().map(|item| item.downgrade_item()) {
-            let (current, _) = &self.alternate_file_items;
-            match current {
-                Some(current) => {
-                    if current.id() != item.id() {
-                        self.alternate_file_items =
-                            (Some(item), self.alternate_file_items.0.take());
-                    }
-                }
-                None => {
-                    self.alternate_file_items = (Some(item), None);
-                }
-            }
-        }
-    }
-
-    pub fn has_focus(&self, window: &Window, cx: &App) -> bool {
-        // We not only check whether our focus handle contains focus, but also
-        // whether the active item might have focus, because we might have just activated an item
-        // that hasn't rendered yet.
-        // Before the next render, we might transfer focus
-        // to the item, and `focus_handle.contains_focus` returns false because the `active_item`
-        // is not hooked up to us in the dispatch tree.
-        self.focus_handle.contains_focused(window, cx)
-            || self
-                .active_item()
-                .is_some_and(|item| item.item_focus_handle(cx).contains_focused(window, cx))
-    }
-
-    fn focus_in(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if !self.was_focused {
-            self.was_focused = true;
-            self.update_history(self.active_item_index);
-            if !self.suppress_scroll && self.items.get(self.active_item_index).is_some() {
-                self.update_active_tab(self.active_item_index);
-            }
-            cx.emit(Event::Focus);
-            cx.notify();
-        }
-
-        self.toolbar.update(cx, |toolbar, cx| {
-            toolbar.focus_changed(true, window, cx);
-        });
-
-        if let Some(active_item) = self.active_item() {
-            if self.focus_handle.is_focused(window) {
-                // Schedule a redraw next frame, so that the focus changes below take effect
-                cx.on_next_frame(window, |_, _, cx| {
-                    cx.notify();
-                });
-
-                // Pane was focused directly. We need to either focus a view inside the active item,
-                // or focus the active item itself
-                if let Some(weak_last_focus_handle) =
-                    self.last_focus_handle_by_item.get(&active_item.item_id())
-                    && let Some(focus_handle) = weak_last_focus_handle.upgrade()
-                {
-                    focus_handle.focus(window);
-                    return;
-                }
-
-                active_item.item_focus_handle(cx).focus(window);
-            } else if let Some(focused) = window.focused(cx)
-                && !self.context_menu_focused(window, cx)
-            {
-                self.last_focus_handle_by_item
-                    .insert(active_item.item_id(), focused.downgrade());
-            }
-        }
-    }
-
-    pub fn context_menu_focused(&self, window: &mut Window, cx: &mut Context<Self>) -> bool {
-        self.new_item_context_menu_handle.is_focused(window, cx)
-            || self.split_item_context_menu_handle.is_focused(window, cx)
-    }
-
-    fn focus_out(&mut self, _event: FocusOutEvent, window: &mut Window, cx: &mut Context<Self>) {
-        self.was_focused = false;
-        self.toolbar.update(cx, |toolbar, cx| {
-            toolbar.focus_changed(false, window, cx);
-        });
-
-        cx.notify();
-    }
-
-    fn project_events(
-        &mut self,
-        _project: Entity<Project>,
-        event: &project::Event,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            project::Event::DiskBasedDiagnosticsFinished { .. }
-            | project::Event::DiagnosticsUpdated { .. } => {
-                if ItemSettings::get_global(cx).show_diagnostics != ShowDiagnostics::Off {
-                    self.diagnostic_summary_update = cx.spawn(async move |this, cx| {
-                        cx.background_executor()
-                            .timer(Duration::from_millis(30))
-                            .await;
-                        this.update(cx, |this, cx| {
-                            this.update_diagnostics(cx);
-                            cx.notify();
-                        })
-                        .log_err();
-                    });
-                }
-            }
-            _ => {}
-        }
-    }
-
-    fn update_diagnostics(&mut self, cx: &mut Context<Self>) {
-        let Some(project) = self.project.upgrade() else {
-            return;
-        };
-        let show_diagnostics = ItemSettings::get_global(cx).show_diagnostics;
-        self.diagnostics = if show_diagnostics != ShowDiagnostics::Off {
-            project
-                .read(cx)
-                .diagnostic_summaries(false, cx)
-                .filter_map(|(project_path, _, diagnostic_summary)| {
-                    if diagnostic_summary.error_count > 0 {
-                        Some((project_path, DiagnosticSeverity::ERROR))
-                    } else if diagnostic_summary.warning_count > 0
-                        && show_diagnostics != ShowDiagnostics::Errors
-                    {
-                        Some((project_path, DiagnosticSeverity::WARNING))
-                    } else {
-                        None
-                    }
-                })
-                .collect()
-        } else {
-            HashMap::default()
-        }
-    }
-
-    fn settings_changed(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let tab_bar_settings = TabBarSettings::get_global(cx);
-        let new_max_tabs = WorkspaceSettings::get_global(cx).max_tabs;
-
-        if let Some(display_nav_history_buttons) = self.display_nav_history_buttons.as_mut() {
-            *display_nav_history_buttons = tab_bar_settings.show_nav_history_buttons;
-        }
-
-        self.show_tab_bar_buttons = tab_bar_settings.show_tab_bar_buttons;
-
-        if !PreviewTabsSettings::get_global(cx).enabled {
-            self.preview_item_id = None;
-        }
-
-        if self.use_max_tabs && new_max_tabs != self.max_tabs {
-            self.max_tabs = new_max_tabs;
-            self.close_items_on_settings_change(window, cx);
-        }
-
-        self.update_diagnostics(cx);
-        cx.notify();
-    }
-
-    pub fn active_item_index(&self) -> usize {
-        self.active_item_index
-    }
-
-    pub fn activation_history(&self) -> &[ActivationHistoryEntry] {
-        &self.activation_history
-    }
-
-    pub fn set_should_display_tab_bar<F>(&mut self, should_display_tab_bar: F)
-    where
-        F: 'static + Fn(&Window, &mut Context<Pane>) -> bool,
-    {
-        self.should_display_tab_bar = Rc::new(should_display_tab_bar);
-    }
-
-    pub fn set_can_split(
-        &mut self,
-        can_split_predicate: Option<
-            Arc<dyn Fn(&mut Self, &dyn Any, &mut Window, &mut Context<Self>) -> bool + 'static>,
-        >,
-    ) {
-        self.can_split_predicate = can_split_predicate;
-    }
-
-    pub fn set_can_toggle_zoom(&mut self, can_toggle_zoom: bool, cx: &mut Context<Self>) {
-        self.can_toggle_zoom = can_toggle_zoom;
-        cx.notify();
-    }
-
-    pub fn set_close_pane_if_empty(&mut self, close_pane_if_empty: bool, cx: &mut Context<Self>) {
-        self.close_pane_if_empty = close_pane_if_empty;
-        cx.notify();
-    }
-
-    pub fn set_can_navigate(&mut self, can_navigate: bool, cx: &mut Context<Self>) {
-        self.toolbar.update(cx, |toolbar, cx| {
-            toolbar.set_can_navigate(can_navigate, cx);
-        });
-        cx.notify();
-    }
-
-    pub fn set_render_tab_bar<F>(&mut self, cx: &mut Context<Self>, render: F)
-    where
-        F: 'static + Fn(&mut Pane, &mut Window, &mut Context<Pane>) -> AnyElement,
-    {
-        self.render_tab_bar = Rc::new(render);
-        cx.notify();
-    }
-
-    pub fn set_render_tab_bar_buttons<F>(&mut self, cx: &mut Context<Self>, render: F)
-    where
-        F: 'static
-            + Fn(
-                &mut Pane,
-                &mut Window,
-                &mut Context<Pane>,
-            ) -> (Option<AnyElement>, Option<AnyElement>),
-    {
-        self.render_tab_bar_buttons = Rc::new(render);
-        cx.notify();
-    }
-
-    pub fn set_custom_drop_handle<F>(&mut self, cx: &mut Context<Self>, handle: F)
-    where
-        F: 'static
-            + Fn(&mut Pane, &dyn Any, &mut Window, &mut Context<Pane>) -> ControlFlow<(), ()>,
-    {
-        self.custom_drop_handle = Some(Arc::new(handle));
-        cx.notify();
-    }
-
-    pub fn nav_history_for_item<T: Item>(&self, item: &Entity<T>) -> ItemNavHistory {
-        ItemNavHistory {
-            history: self.nav_history.clone(),
-            item: Arc::new(item.downgrade()),
-            is_preview: self.preview_item_id == Some(item.item_id()),
-        }
-    }
-
-    pub fn nav_history(&self) -> &NavHistory {
-        &self.nav_history
-    }
-
-    pub fn nav_history_mut(&mut self) -> &mut NavHistory {
-        &mut self.nav_history
-    }
-
-    pub fn disable_history(&mut self) {
-        self.nav_history.disable();
-    }
-
-    pub fn enable_history(&mut self) {
-        self.nav_history.enable();
-    }
-
-    pub fn can_navigate_backward(&self) -> bool {
-        !self.nav_history.0.lock().backward_stack.is_empty()
-    }
-
-    pub fn can_navigate_forward(&self) -> bool {
-        !self.nav_history.0.lock().forward_stack.is_empty()
-    }
-
-    pub fn navigate_backward(&mut self, _: &GoBack, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(workspace) = self.workspace.upgrade() {
-            let pane = cx.entity().downgrade();
-            window.defer(cx, move |window, cx| {
-                workspace.update(cx, |workspace, cx| {
-                    workspace.go_back(pane, window, cx).detach_and_log_err(cx)
-                })
-            })
-        }
-    }
-
-    fn navigate_forward(&mut self, _: &GoForward, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(workspace) = self.workspace.upgrade() {
-            let pane = cx.entity().downgrade();
-            window.defer(cx, move |window, cx| {
-                workspace.update(cx, |workspace, cx| {
-                    workspace
-                        .go_forward(pane, window, cx)
-                        .detach_and_log_err(cx)
-                })
-            })
-        }
-    }
-
-    fn history_updated(&mut self, cx: &mut Context<Self>) {
-        self.toolbar.update(cx, |_, cx| cx.notify());
-    }
-
-    pub fn preview_item_id(&self) -> Option<EntityId> {
-        self.preview_item_id
-    }
-
-    pub fn preview_item(&self) -> Option<Box<dyn ItemHandle>> {
-        self.preview_item_id
-            .and_then(|id| self.items.iter().find(|item| item.item_id() == id))
-            .cloned()
-    }
-
-    pub fn preview_item_idx(&self) -> Option<usize> {
-        if let Some(preview_item_id) = self.preview_item_id {
-            self.items
-                .iter()
-                .position(|item| item.item_id() == preview_item_id)
-        } else {
-            None
-        }
-    }
-
-    pub fn is_active_preview_item(&self, item_id: EntityId) -> bool {
-        self.preview_item_id == Some(item_id)
-    }
-
-    /// Promotes the item with the given ID to not be a preview item.
-    /// This does nothing if it wasn't already a preview item.
-    pub fn unpreview_item_if_preview(&mut self, item_id: EntityId) {
-        if self.is_active_preview_item(item_id) {
-            self.preview_item_id = None;
-        }
-    }
-
-    /// Marks the item with the given ID as the preview item.
-    /// This will be ignored if the global setting `preview_tabs` is disabled.
-    ///
-    /// The old preview item (if there was one) is closed and its index is returned.
-    pub fn replace_preview_item_id(
-        &mut self,
-        item_id: EntityId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<usize> {
-        let idx = self.close_current_preview_item(window, cx);
-        self.set_preview_item_id(Some(item_id), cx);
-        idx
-    }
-
-    /// Marks the item with the given ID as the preview item.
-    /// This will be ignored if the global setting `preview_tabs` is disabled.
-    ///
-    /// This is a low-level method. Prefer `unpreview_item_if_preview()` or `set_new_preview_item()`.
-    pub(crate) fn set_preview_item_id(&mut self, item_id: Option<EntityId>, cx: &App) {
-        if item_id.is_none() || PreviewTabsSettings::get_global(cx).enabled {
-            self.preview_item_id = item_id;
-        }
-    }
-
-    /// Should only be used when deserializing a pane.
-    pub fn set_pinned_count(&mut self, count: usize) {
-        self.pinned_tab_count = count;
-    }
-
-    pub fn pinned_count(&self) -> usize {
-        self.pinned_tab_count
-    }
-
-    pub fn handle_item_edit(&mut self, item_id: EntityId, cx: &App) {
-        if let Some(preview_item) = self.preview_item()
-            && preview_item.item_id() == item_id
-            && !preview_item.preserve_preview(cx)
-        {
-            self.unpreview_item_if_preview(item_id);
-        }
-    }
-
-    pub(crate) fn open_item(
-        &mut self,
-        project_entry_id: Option<ProjectEntryId>,
-        project_path: ProjectPath,
-        focus_item: bool,
-        allow_preview: bool,
-        activate: bool,
-        suggested_position: Option<usize>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-        build_item: WorkspaceItemBuilder,
-    ) -> Box<dyn ItemHandle> {
-        let mut existing_item = None;
-        if let Some(project_entry_id) = project_entry_id {
-            for (index, item) in self.items.iter().enumerate() {
-                if item.buffer_kind(cx) == ItemBufferKind::Singleton
-                    && item.project_entry_ids(cx).as_slice() == [project_entry_id]
-                {
-                    let item = item.boxed_clone();
-                    existing_item = Some((index, item));
-                    break;
-                }
-            }
-        } else {
-            for (index, item) in self.items.iter().enumerate() {
-                if item.buffer_kind(cx) == ItemBufferKind::Singleton
-                    && item.project_path(cx).as_ref() == Some(&project_path)
-                {
-                    let item = item.boxed_clone();
-                    existing_item = Some((index, item));
-                    break;
-                }
-            }
-        }
-
-        let set_up_existing_item =
-            |index: usize, pane: &mut Self, window: &mut Window, cx: &mut Context<Self>| {
-                if !allow_preview && let Some(item) = pane.items.get(index) {
-                    pane.unpreview_item_if_preview(item.item_id());
-                }
-                if activate {
-                    pane.activate_item(index, focus_item, focus_item, window, cx);
-                }
-            };
-        let set_up_new_item = |new_item: Box<dyn ItemHandle>,
-                               destination_index: Option<usize>,
-                               pane: &mut Self,
-                               window: &mut Window,
-                               cx: &mut Context<Self>| {
-            if allow_preview {
-                pane.replace_preview_item_id(new_item.item_id(), window, cx);
-            }
-
-            if let Some(text) = new_item.telemetry_event_text(cx) {
-                telemetry::event!(text);
-            }
-
-            pane.add_item_inner(
-                new_item,
-                true,
-                focus_item,
-                activate,
-                destination_index,
-                window,
-                cx,
-            );
-        };
-
-        if let Some((index, existing_item)) = existing_item {
-            set_up_existing_item(index, self, window, cx);
-            existing_item
-        } else {
-            // If the item is being opened as preview and we have an existing preview tab,
-            // open the new item in the position of the existing preview tab.
-            let destination_index = if allow_preview {
-                self.close_current_preview_item(window, cx)
-            } else {
-                suggested_position
-            };
-
-            let new_item = build_item(self, window, cx);
-            // A special case that won't ever get a `project_entry_id` but has to be deduplicated nonetheless.
-            if let Some(invalid_buffer_view) = new_item.downcast::<InvalidItemView>() {
-                let mut already_open_view = None;
-                let mut views_to_close = HashSet::default();
-                for existing_error_view in self
-                    .items_of_type::<InvalidItemView>()
-                    .filter(|item| item.read(cx).abs_path == invalid_buffer_view.read(cx).abs_path)
-                {
-                    if already_open_view.is_none()
-                        && existing_error_view.read(cx).error == invalid_buffer_view.read(cx).error
-                    {
-                        already_open_view = Some(existing_error_view);
-                    } else {
-                        views_to_close.insert(existing_error_view.item_id());
-                    }
-                }
-
-                let resulting_item = match already_open_view {
-                    Some(already_open_view) => {
-                        if let Some(index) = self.index_for_item_id(already_open_view.item_id()) {
-                            set_up_existing_item(index, self, window, cx);
-                        }
-                        Box::new(already_open_view) as Box<_>
-                    }
-                    None => {
-                        set_up_new_item(new_item.clone(), destination_index, self, window, cx);
-                        new_item
-                    }
-                };
-
-                self.close_items(window, cx, SaveIntent::Skip, |existing_item| {
-                    views_to_close.contains(&existing_item)
-                })
-                .detach();
-
-                resulting_item
-            } else {
-                set_up_new_item(new_item.clone(), destination_index, self, window, cx);
-                new_item
-            }
-        }
-    }
-
-    pub fn close_current_preview_item(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<usize> {
-        let item_idx = self.preview_item_idx()?;
-        let id = self.preview_item_id()?;
-        self.set_preview_item_id(None, cx);
-
-        let prev_active_item_index = self.active_item_index;
-        self.remove_item(id, false, false, window, cx);
-        self.active_item_index = prev_active_item_index;
-
-        if item_idx < self.items.len() {
-            Some(item_idx)
-        } else {
-            None
-        }
-    }
-
-    pub fn add_item_inner(
-        &mut self,
-        item: Box<dyn ItemHandle>,
-        activate_pane: bool,
-        focus_item: bool,
-        activate: bool,
-        destination_index: Option<usize>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let item_already_exists = self
-            .items
-            .iter()
-            .any(|existing_item| existing_item.item_id() == item.item_id());
-
-        if !item_already_exists {
-            self.close_items_on_item_open(window, cx);
-        }
-
-        if item.buffer_kind(cx) == ItemBufferKind::Singleton
-            && let Some(&entry_id) = item.project_entry_ids(cx).first()
-        {
-            let Some(project) = self.project.upgrade() else {
-                return;
-            };
-
-            let project = project.read(cx);
-            if let Some(project_path) = project.path_for_entry(entry_id, cx) {
-                let abs_path = project.absolute_path(&project_path, cx);
-                self.nav_history
-                    .0
-                    .lock()
-                    .paths_by_item
-                    .insert(item.item_id(), (project_path, abs_path));
-            }
-        }
-        // If no destination index is specified, add or move the item after the
-        // active item (or at the start of tab bar, if the active item is pinned)
-        let mut insertion_index = {
-            cmp::min(
-                if let Some(destination_index) = destination_index {
-                    destination_index
-                } else {
-                    cmp::max(self.active_item_index + 1, self.pinned_count())
-                },
-                self.items.len(),
-            )
-        };
-
-        // Does the item already exist?
-        let project_entry_id = if item.buffer_kind(cx) == ItemBufferKind::Singleton {
-            item.project_entry_ids(cx).first().copied()
-        } else {
-            None
-        };
-
-        let existing_item_index = self.items.iter().position(|existing_item| {
-            if existing_item.item_id() == item.item_id() {
-                true
-            } else if existing_item.buffer_kind(cx) == ItemBufferKind::Singleton {
-                existing_item
-                    .project_entry_ids(cx)
-                    .first()
-                    .is_some_and(|existing_entry_id| {
-                        Some(existing_entry_id) == project_entry_id.as_ref()
-                    })
-            } else {
-                false
-            }
-        });
-        if let Some(existing_item_index) = existing_item_index {
-            // If the item already exists, move it to the desired destination and activate it
-
-            if existing_item_index != insertion_index {
-                let existing_item_is_active = existing_item_index == self.active_item_index;
-
-                // If the caller didn't specify a destination and the added item is already
-                // the active one, don't move it
-                if existing_item_is_active && destination_index.is_none() {
-                    insertion_index = existing_item_index;
-                } else {
-                    self.items.remove(existing_item_index);
-                    if existing_item_index < self.active_item_index {
-                        self.active_item_index -= 1;
-                    }
-                    insertion_index = insertion_index.min(self.items.len());
-
-                    self.items.insert(insertion_index, item.clone());
-
-                    if existing_item_is_active {
-                        self.active_item_index = insertion_index;
-                    } else if insertion_index <= self.active_item_index {
-                        self.active_item_index += 1;
-                    }
-                }
-
-                cx.notify();
-            }
-
-            if activate {
-                self.activate_item(insertion_index, activate_pane, focus_item, window, cx);
-            }
-        } else {
-            self.items.insert(insertion_index, item.clone());
-            cx.notify();
-
-            if activate {
-                if insertion_index <= self.active_item_index
-                    && self.preview_item_idx() != Some(self.active_item_index)
-                {
-                    self.active_item_index += 1;
-                }
-
-                self.activate_item(insertion_index, activate_pane, focus_item, window, cx);
-            }
-        }
-
-        cx.emit(Event::AddItem { item });
-    }
-
-    pub fn add_item(
-        &mut self,
-        item: Box<dyn ItemHandle>,
-        activate_pane: bool,
-        focus_item: bool,
-        destination_index: Option<usize>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(text) = item.telemetry_event_text(cx) {
-            telemetry::event!(text);
-        }
-
-        self.add_item_inner(
-            item,
-            activate_pane,
-            focus_item,
-            true,
-            destination_index,
-            window,
-            cx,
-        )
-    }
-
-    pub fn items_len(&self) -> usize {
-        self.items.len()
-    }
-
-    pub fn items(&self) -> impl DoubleEndedIterator<Item = &Box<dyn ItemHandle>> {
-        self.items.iter()
-    }
-
-    pub fn items_of_type<T: Render>(&self) -> impl '_ + Iterator<Item = Entity<T>> {
-        self.items
-            .iter()
-            .filter_map(|item| item.to_any_view().downcast().ok())
-    }
-
-    pub fn active_item(&self) -> Option<Box<dyn ItemHandle>> {
-        self.items.get(self.active_item_index).cloned()
-    }
-
-    fn active_item_id(&self) -> EntityId {
-        self.items[self.active_item_index].item_id()
-    }
-
-    pub fn pixel_position_of_cursor(&self, cx: &App) -> Option<Point<Pixels>> {
-        self.items
-            .get(self.active_item_index)?
-            .pixel_position_of_cursor(cx)
-    }
-
-    pub fn item_for_entry(
-        &self,
-        entry_id: ProjectEntryId,
-        cx: &App,
-    ) -> Option<Box<dyn ItemHandle>> {
-        self.items.iter().find_map(|item| {
-            if item.buffer_kind(cx) == ItemBufferKind::Singleton
-                && (item.project_entry_ids(cx).as_slice() == [entry_id])
-            {
-                Some(item.boxed_clone())
-            } else {
-                None
-            }
-        })
-    }
-
-    pub fn item_for_path(
-        &self,
-        project_path: ProjectPath,
-        cx: &App,
-    ) -> Option<Box<dyn ItemHandle>> {
-        self.items.iter().find_map(move |item| {
-            if item.buffer_kind(cx) == ItemBufferKind::Singleton
-                && (item.project_path(cx).as_slice() == [project_path.clone()])
-            {
-                Some(item.boxed_clone())
-            } else {
-                None
-            }
-        })
-    }
-
-    pub fn index_for_item(&self, item: &dyn ItemHandle) -> Option<usize> {
-        self.index_for_item_id(item.item_id())
-    }
-
-    fn index_for_item_id(&self, item_id: EntityId) -> Option<usize> {
-        self.items.iter().position(|i| i.item_id() == item_id)
-    }
-
-    pub fn item_for_index(&self, ix: usize) -> Option<&dyn ItemHandle> {
-        self.items.get(ix).map(|i| i.as_ref())
-    }
-
-    pub fn toggle_zoom(&mut self, _: &ToggleZoom, window: &mut Window, cx: &mut Context<Self>) {
-        if !self.can_toggle_zoom {
-            cx.propagate();
-        } else if self.zoomed {
-            cx.emit(Event::ZoomOut);
-        } else if !self.items.is_empty() {
-            if !self.focus_handle.contains_focused(window, cx) {
-                cx.focus_self(window);
-            }
-            cx.emit(Event::ZoomIn);
-        }
-    }
-
-    pub fn activate_item(
-        &mut self,
-        index: usize,
-        activate_pane: bool,
-        focus_item: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        use NavigationMode::{GoingBack, GoingForward};
-        if index < self.items.len() {
-            let prev_active_item_ix = mem::replace(&mut self.active_item_index, index);
-            if (prev_active_item_ix != self.active_item_index
-                || matches!(self.nav_history.mode(), GoingBack | GoingForward))
-                && let Some(prev_item) = self.items.get(prev_active_item_ix)
-            {
-                prev_item.deactivated(window, cx);
-            }
-            self.update_history(index);
-            self.update_toolbar(window, cx);
-            self.update_status_bar(window, cx);
-
-            if focus_item {
-                self.focus_active_item(window, cx);
-            }
-
-            cx.emit(Event::ActivateItem {
-                local: activate_pane,
-                focus_changed: focus_item,
-            });
-
-            self.update_active_tab(index);
-            cx.notify();
-        }
-    }
-
-    fn update_active_tab(&mut self, index: usize) {
-        if !self.is_tab_pinned(index) {
-            self.suppress_scroll = false;
-            self.tab_bar_scroll_handle.scroll_to_item(index);
-        }
-    }
-
-    fn update_history(&mut self, index: usize) {
-        if let Some(newly_active_item) = self.items.get(index) {
-            self.activation_history
-                .retain(|entry| entry.entity_id != newly_active_item.item_id());
-            self.activation_history.push(ActivationHistoryEntry {
-                entity_id: newly_active_item.item_id(),
-                timestamp: self
-                    .next_activation_timestamp
-                    .fetch_add(1, Ordering::SeqCst),
-            });
-        }
-    }
-
-    pub fn activate_previous_item(
-        &mut self,
-        _: &ActivatePreviousItem,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let mut index = self.active_item_index;
-        if index > 0 {
-            index -= 1;
-        } else if !self.items.is_empty() {
-            index = self.items.len() - 1;
-        }
-        self.activate_item(index, true, true, window, cx);
-    }
-
-    pub fn activate_next_item(
-        &mut self,
-        _: &ActivateNextItem,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let mut index = self.active_item_index;
-        if index + 1 < self.items.len() {
-            index += 1;
-        } else {
-            index = 0;
-        }
-        self.activate_item(index, true, true, window, cx);
-    }
-
-    pub fn swap_item_left(
-        &mut self,
-        _: &SwapItemLeft,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let index = self.active_item_index;
-        if index == 0 {
-            return;
-        }
-
-        self.items.swap(index, index - 1);
-        self.activate_item(index - 1, true, true, window, cx);
-    }
-
-    pub fn swap_item_right(
-        &mut self,
-        _: &SwapItemRight,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let index = self.active_item_index;
-        if index + 1 >= self.items.len() {
-            return;
-        }
-
-        self.items.swap(index, index + 1);
-        self.activate_item(index + 1, true, true, window, cx);
-    }
-
-    pub fn activate_last_item(
-        &mut self,
-        _: &ActivateLastItem,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let index = self.items.len().saturating_sub(1);
-        self.activate_item(index, true, true, window, cx);
-    }
-
-    pub fn close_active_item(
-        &mut self,
-        action: &CloseActiveItem,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        if self.items.is_empty() {
-            // Close the window when there's no active items to close, if configured
-            if WorkspaceSettings::get_global(cx)
-                .when_closing_with_no_tabs
-                .should_close()
-            {
-                window.dispatch_action(Box::new(CloseWindow), cx);
-            }
-
-            return Task::ready(Ok(()));
-        }
-        if self.is_tab_pinned(self.active_item_index) && !action.close_pinned {
-            // Activate any non-pinned tab in same pane
-            let non_pinned_tab_index = self
-                .items()
-                .enumerate()
-                .find(|(index, _item)| !self.is_tab_pinned(*index))
-                .map(|(index, _item)| index);
-            if let Some(index) = non_pinned_tab_index {
-                self.activate_item(index, false, false, window, cx);
-                return Task::ready(Ok(()));
-            }
-
-            // Activate any non-pinned tab in different pane
-            let current_pane = cx.entity();
-            self.workspace
-                .update(cx, |workspace, cx| {
-                    let panes = workspace.center.panes();
-                    let pane_with_unpinned_tab = panes.iter().find(|pane| {
-                        if **pane == &current_pane {
-                            return false;
-                        }
-                        pane.read(cx).has_unpinned_tabs()
-                    });
-                    if let Some(pane) = pane_with_unpinned_tab {
-                        pane.update(cx, |pane, cx| pane.activate_unpinned_tab(window, cx));
-                    }
-                })
-                .ok();
-
-            return Task::ready(Ok(()));
-        };
-
-        let active_item_id = self.active_item_id();
-
-        self.close_item_by_id(
-            active_item_id,
-            action.save_intent.unwrap_or(SaveIntent::Close),
-            window,
-            cx,
-        )
-    }
-
-    pub fn close_item_by_id(
-        &mut self,
-        item_id_to_close: EntityId,
-        save_intent: SaveIntent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        self.close_items(window, cx, save_intent, move |view_id| {
-            view_id == item_id_to_close
-        })
-    }
-
-    pub fn close_other_items(
-        &mut self,
-        action: &CloseOtherItems,
-        target_item_id: Option<EntityId>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        if self.items.is_empty() {
-            return Task::ready(Ok(()));
-        }
-
-        let active_item_id = match target_item_id {
-            Some(result) => result,
-            None => self.active_item_id(),
-        };
-
-        let pinned_item_ids = self.pinned_item_ids();
-
-        self.close_items(
-            window,
-            cx,
-            action.save_intent.unwrap_or(SaveIntent::Close),
-            move |item_id| {
-                item_id != active_item_id
-                    && (action.close_pinned || !pinned_item_ids.contains(&item_id))
-            },
-        )
-    }
-
-    pub fn close_multibuffer_items(
-        &mut self,
-        action: &CloseMultibufferItems,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        if self.items.is_empty() {
-            return Task::ready(Ok(()));
-        }
-
-        let pinned_item_ids = self.pinned_item_ids();
-        let multibuffer_items = self.multibuffer_item_ids(cx);
-
-        self.close_items(
-            window,
-            cx,
-            action.save_intent.unwrap_or(SaveIntent::Close),
-            move |item_id| {
-                (action.close_pinned || !pinned_item_ids.contains(&item_id))
-                    && multibuffer_items.contains(&item_id)
-            },
-        )
-    }
-
-    pub fn close_clean_items(
-        &mut self,
-        action: &CloseCleanItems,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        if self.items.is_empty() {
-            return Task::ready(Ok(()));
-        }
-
-        let clean_item_ids = self.clean_item_ids(cx);
-        let pinned_item_ids = self.pinned_item_ids();
-
-        self.close_items(window, cx, SaveIntent::Close, move |item_id| {
-            clean_item_ids.contains(&item_id)
-                && (action.close_pinned || !pinned_item_ids.contains(&item_id))
-        })
-    }
-
-    pub fn close_items_to_the_left_by_id(
-        &mut self,
-        item_id: Option<EntityId>,
-        action: &CloseItemsToTheLeft,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        self.close_items_to_the_side_by_id(item_id, Side::Left, action.close_pinned, window, cx)
-    }
-
-    pub fn close_items_to_the_right_by_id(
-        &mut self,
-        item_id: Option<EntityId>,
-        action: &CloseItemsToTheRight,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        self.close_items_to_the_side_by_id(item_id, Side::Right, action.close_pinned, window, cx)
-    }
-
-    pub fn close_items_to_the_side_by_id(
-        &mut self,
-        item_id: Option<EntityId>,
-        side: Side,
-        close_pinned: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        if self.items.is_empty() {
-            return Task::ready(Ok(()));
-        }
-
-        let item_id = item_id.unwrap_or_else(|| self.active_item_id());
-        let to_the_side_item_ids = self.to_the_side_item_ids(item_id, side);
-        let pinned_item_ids = self.pinned_item_ids();
-
-        self.close_items(window, cx, SaveIntent::Close, move |item_id| {
-            to_the_side_item_ids.contains(&item_id)
-                && (close_pinned || !pinned_item_ids.contains(&item_id))
-        })
-    }
-
-    pub fn close_all_items(
-        &mut self,
-        action: &CloseAllItems,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        if self.items.is_empty() {
-            return Task::ready(Ok(()));
-        }
-
-        let pinned_item_ids = self.pinned_item_ids();
-
-        self.close_items(
-            window,
-            cx,
-            action.save_intent.unwrap_or(SaveIntent::Close),
-            |item_id| action.close_pinned || !pinned_item_ids.contains(&item_id),
-        )
-    }
-
-    fn close_items_on_item_open(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let target = self.max_tabs.map(|m| m.get());
-        let protect_active_item = false;
-        self.close_items_to_target_count(target, protect_active_item, window, cx);
-    }
-
-    fn close_items_on_settings_change(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let target = self.max_tabs.map(|m| m.get() + 1);
-        // The active item in this case is the settings.json file, which should be protected from being closed
-        let protect_active_item = true;
-        self.close_items_to_target_count(target, protect_active_item, window, cx);
-    }
-
-    fn close_items_to_target_count(
-        &mut self,
-        target_count: Option<usize>,
-        protect_active_item: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(target_count) = target_count else {
-            return;
-        };
-
-        let mut index_list = Vec::new();
-        let mut items_len = self.items_len();
-        let mut indexes: HashMap<EntityId, usize> = HashMap::default();
-        let active_ix = self.active_item_index();
-
-        for (index, item) in self.items.iter().enumerate() {
-            indexes.insert(item.item_id(), index);
-        }
-
-        // Close least recently used items to reach target count.
-        // The target count is allowed to be exceeded, as we protect pinned
-        // items, dirty items, and sometimes, the active item.
-        for entry in self.activation_history.iter() {
-            if items_len < target_count {
-                break;
-            }
-
-            let Some(&index) = indexes.get(&entry.entity_id) else {
-                continue;
-            };
-
-            if protect_active_item && index == active_ix {
-                continue;
-            }
-
-            if let Some(true) = self.items.get(index).map(|item| item.is_dirty(cx)) {
-                continue;
-            }
-
-            if self.is_tab_pinned(index) {
-                continue;
-            }
-
-            index_list.push(index);
-            items_len -= 1;
-        }
-        // The sort and reverse is necessary since we remove items
-        // using their index position, hence removing from the end
-        // of the list first to avoid changing indexes.
-        index_list.sort_unstable();
-        index_list
-            .iter()
-            .rev()
-            .for_each(|&index| self._remove_item(index, false, false, None, window, cx));
-    }
-
-    // Usually when you close an item that has unsaved changes, we prompt you to
-    // save it. That said, if you still have the buffer open in a different pane
-    // we can close this one without fear of losing data.
-    pub fn skip_save_on_close(item: &dyn ItemHandle, workspace: &Workspace, cx: &App) -> bool {
-        let mut dirty_project_item_ids = Vec::new();
-        item.for_each_project_item(cx, &mut |project_item_id, project_item| {
-            if project_item.is_dirty() {
-                dirty_project_item_ids.push(project_item_id);
-            }
-        });
-        if dirty_project_item_ids.is_empty() {
-            return !(item.buffer_kind(cx) == ItemBufferKind::Singleton && item.is_dirty(cx));
-        }
-
-        for open_item in workspace.items(cx) {
-            if open_item.item_id() == item.item_id() {
-                continue;
-            }
-            if open_item.buffer_kind(cx) != ItemBufferKind::Singleton {
-                continue;
-            }
-            let other_project_item_ids = open_item.project_item_model_ids(cx);
-            dirty_project_item_ids.retain(|id| !other_project_item_ids.contains(id));
-        }
-        dirty_project_item_ids.is_empty()
-    }
-
-    pub(super) fn file_names_for_prompt(
-        items: &mut dyn Iterator<Item = &Box<dyn ItemHandle>>,
-        cx: &App,
-    ) -> String {
-        let mut file_names = BTreeSet::default();
-        for item in items {
-            item.for_each_project_item(cx, &mut |_, project_item| {
-                if !project_item.is_dirty() {
-                    return;
-                }
-                let filename = project_item
-                    .project_path(cx)
-                    .and_then(|path| path.path.file_name().map(ToOwned::to_owned));
-                file_names.insert(filename.unwrap_or("untitled".to_string()));
-            });
-        }
-        if file_names.len() > 6 {
-            format!(
-                "{}\n.. and {} more",
-                file_names.iter().take(5).join("\n"),
-                file_names.len() - 5
-            )
-        } else {
-            file_names.into_iter().join("\n")
-        }
-    }
-
-    pub fn close_items(
-        &self,
-        window: &mut Window,
-        cx: &mut Context<Pane>,
-        mut save_intent: SaveIntent,
-        should_close: impl Fn(EntityId) -> bool,
-    ) -> Task<Result<()>> {
-        // Find the items to close.
-        let mut items_to_close = Vec::new();
-        for item in &self.items {
-            if should_close(item.item_id()) {
-                items_to_close.push(item.boxed_clone());
-            }
-        }
-
-        let active_item_id = self.active_item().map(|item| item.item_id());
-
-        items_to_close.sort_by_key(|item| {
-            let path = item.project_path(cx);
-            // Put the currently active item at the end, because if the currently active item is not closed last
-            // closing the currently active item will cause the focus to switch to another item
-            // This will cause Zed to expand the content of the currently active item
-            //
-            // Beyond that sort in order of project path, with untitled files and multibuffers coming last.
-            (active_item_id == Some(item.item_id()), path.is_none(), path)
-        });
-
-        let workspace = self.workspace.clone();
-        let Some(project) = self.project.upgrade() else {
-            return Task::ready(Ok(()));
-        };
-        cx.spawn_in(window, async move |pane, cx| {
-            let dirty_items = workspace.update(cx, |workspace, cx| {
-                items_to_close
-                    .iter()
-                    .filter(|item| {
-                        item.is_dirty(cx) && !Self::skip_save_on_close(item.as_ref(), workspace, cx)
-                    })
-                    .map(|item| item.boxed_clone())
-                    .collect::<Vec<_>>()
-            })?;
-
-            if save_intent == SaveIntent::Close && dirty_items.len() > 1 {
-                let answer = pane.update_in(cx, |_, window, cx| {
-                    let detail = Self::file_names_for_prompt(&mut dirty_items.iter(), cx);
-                    window.prompt(
-                        PromptLevel::Warning,
-                        "Do you want to save changes to the following files?",
-                        Some(&detail),
-                        &["Save all", "Discard all", "Cancel"],
-                        cx,
-                    )
-                })?;
-                match answer.await {
-                    Ok(0) => save_intent = SaveIntent::SaveAll,
-                    Ok(1) => save_intent = SaveIntent::Skip,
-                    Ok(2) => return Ok(()),
-                    _ => {}
-                }
-            }
-
-            for item_to_close in items_to_close {
-                let mut should_save = true;
-                if save_intent == SaveIntent::Close {
-                    workspace.update(cx, |workspace, cx| {
-                        if Self::skip_save_on_close(item_to_close.as_ref(), workspace, cx) {
-                            should_save = false;
-                        }
-                    })?;
-                }
-
-                if should_save {
-                    match Self::save_item(project.clone(), &pane, &*item_to_close, save_intent, cx)
-                        .await
-                    {
-                        Ok(success) => {
-                            if !success {
-                                break;
-                            }
-                        }
-                        Err(err) => {
-                            let answer = pane.update_in(cx, |_, window, cx| {
-                                let detail = Self::file_names_for_prompt(
-                                    &mut [&item_to_close].into_iter(),
-                                    cx,
-                                );
-                                window.prompt(
-                                    PromptLevel::Warning,
-                                    &format!("Unable to save file: {}", &err),
-                                    Some(&detail),
-                                    &["Close Without Saving", "Cancel"],
-                                    cx,
-                                )
-                            })?;
-                            match answer.await {
-                                Ok(0) => {}
-                                Ok(1..) | Err(_) => break,
-                            }
-                        }
-                    }
-                }
-
-                // Remove the item from the pane.
-                pane.update_in(cx, |pane, window, cx| {
-                    pane.remove_item(
-                        item_to_close.item_id(),
-                        false,
-                        pane.close_pane_if_empty,
-                        window,
-                        cx,
-                    );
-                })
-                .ok();
-            }
-
-            pane.update(cx, |_, cx| cx.notify()).ok();
-            Ok(())
-        })
-    }
-
-    pub fn take_active_item(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Box<dyn ItemHandle>> {
-        let item = self.active_item()?;
-        self.remove_item(item.item_id(), false, false, window, cx);
-        Some(item)
-    }
-
-    pub fn remove_item(
-        &mut self,
-        item_id: EntityId,
-        activate_pane: bool,
-        close_pane_if_empty: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(item_index) = self.index_for_item_id(item_id) else {
-            return;
-        };
-        self._remove_item(
-            item_index,
-            activate_pane,
-            close_pane_if_empty,
-            None,
-            window,
-            cx,
-        )
-    }
-
-    pub fn remove_item_and_focus_on_pane(
-        &mut self,
-        item_index: usize,
-        activate_pane: bool,
-        focus_on_pane_if_closed: Entity<Pane>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self._remove_item(
-            item_index,
-            activate_pane,
-            true,
-            Some(focus_on_pane_if_closed),
-            window,
-            cx,
-        )
-    }
-
-    fn _remove_item(
-        &mut self,
-        item_index: usize,
-        activate_pane: bool,
-        close_pane_if_empty: bool,
-        focus_on_pane_if_closed: Option<Entity<Pane>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let activate_on_close = &ItemSettings::get_global(cx).activate_on_close;
-        self.activation_history
-            .retain(|entry| entry.entity_id != self.items[item_index].item_id());
-
-        if self.is_tab_pinned(item_index) {
-            self.pinned_tab_count -= 1;
-        }
-        if item_index == self.active_item_index {
-            let left_neighbour_index = || item_index.min(self.items.len()).saturating_sub(1);
-            let index_to_activate = match activate_on_close {
-                ActivateOnClose::History => self
-                    .activation_history
-                    .pop()
-                    .and_then(|last_activated_item| {
-                        self.items.iter().enumerate().find_map(|(index, item)| {
-                            (item.item_id() == last_activated_item.entity_id).then_some(index)
-                        })
-                    })
-                    // We didn't have a valid activation history entry, so fallback
-                    // to activating the item to the left
-                    .unwrap_or_else(left_neighbour_index),
-                ActivateOnClose::Neighbour => {
-                    self.activation_history.pop();
-                    if item_index + 1 < self.items.len() {
-                        item_index + 1
-                    } else {
-                        item_index.saturating_sub(1)
-                    }
-                }
-                ActivateOnClose::LeftNeighbour => {
-                    self.activation_history.pop();
-                    left_neighbour_index()
-                }
-            };
-
-            let should_activate = activate_pane || self.has_focus(window, cx);
-            if self.items.len() == 1 && should_activate {
-                self.focus_handle.focus(window);
-            } else {
-                self.activate_item(
-                    index_to_activate,
-                    should_activate,
-                    should_activate,
-                    window,
-                    cx,
-                );
-            }
-        }
-
-        let item = self.items.remove(item_index);
-
-        cx.emit(Event::RemovedItem { item: item.clone() });
-        if self.items.is_empty() {
-            item.deactivated(window, cx);
-            if close_pane_if_empty {
-                self.update_toolbar(window, cx);
-                cx.emit(Event::Remove {
-                    focus_on_pane: focus_on_pane_if_closed,
-                });
-            }
-        }
-
-        if item_index < self.active_item_index {
-            self.active_item_index -= 1;
-        }
-
-        let mode = self.nav_history.mode();
-        self.nav_history.set_mode(NavigationMode::ClosingItem);
-        item.deactivated(window, cx);
-        item.on_removed(cx);
-        self.nav_history.set_mode(mode);
-
-        self.unpreview_item_if_preview(item.item_id());
-
-        if let Some(path) = item.project_path(cx) {
-            let abs_path = self
-                .nav_history
-                .0
-                .lock()
-                .paths_by_item
-                .get(&item.item_id())
-                .and_then(|(_, abs_path)| abs_path.clone());
-
-            self.nav_history
-                .0
-                .lock()
-                .paths_by_item
-                .insert(item.item_id(), (path, abs_path));
-        } else {
-            self.nav_history
-                .0
-                .lock()
-                .paths_by_item
-                .remove(&item.item_id());
-        }
-
-        if self.zoom_out_on_close && self.items.is_empty() && close_pane_if_empty && self.zoomed {
-            cx.emit(Event::ZoomOut);
-        }
-
-        cx.notify();
-    }
-
-    pub async fn save_item(
-        project: Entity<Project>,
-        pane: &WeakEntity<Pane>,
-        item: &dyn ItemHandle,
-        save_intent: SaveIntent,
-        cx: &mut AsyncWindowContext,
-    ) -> Result<bool> {
-        const CONFLICT_MESSAGE: &str = "This file has changed on disk since you started editing it. Do you want to overwrite it?";
-
-        const DELETED_MESSAGE: &str = "This file has been deleted on disk since you started editing it. Do you want to recreate it?";
-
-        let path_style = project.read_with(cx, |project, cx| project.path_style(cx))?;
-        if save_intent == SaveIntent::Skip {
-            return Ok(true);
-        };
-        let Some(item_ix) = pane
-            .read_with(cx, |pane, _| pane.index_for_item(item))
-            .ok()
-            .flatten()
-        else {
-            return Ok(true);
-        };
-
-        let (
-            mut has_conflict,
-            mut is_dirty,
-            mut can_save,
-            can_save_as,
-            is_singleton,
-            has_deleted_file,
-        ) = cx.update(|_window, cx| {
-            (
-                item.has_conflict(cx),
-                item.is_dirty(cx),
-                item.can_save(cx),
-                item.can_save_as(cx),
-                item.buffer_kind(cx) == ItemBufferKind::Singleton,
-                item.has_deleted_file(cx),
-            )
-        })?;
-
-        // when saving a single buffer, we ignore whether or not it's dirty.
-        if save_intent == SaveIntent::Save || save_intent == SaveIntent::SaveWithoutFormat {
-            is_dirty = true;
-        }
-
-        if save_intent == SaveIntent::SaveAs {
-            is_dirty = true;
-            has_conflict = false;
-            can_save = false;
-        }
-
-        if save_intent == SaveIntent::Overwrite {
-            has_conflict = false;
-        }
-
-        let should_format = save_intent != SaveIntent::SaveWithoutFormat;
-
-        if has_conflict && can_save {
-            if has_deleted_file && is_singleton {
-                let answer = pane.update_in(cx, |pane, window, cx| {
-                    pane.activate_item(item_ix, true, true, window, cx);
-                    window.prompt(
-                        PromptLevel::Warning,
-                        DELETED_MESSAGE,
-                        None,
-                        &["Save", "Close", "Cancel"],
-                        cx,
-                    )
-                })?;
-                match answer.await {
-                    Ok(0) => {
-                        pane.update_in(cx, |_, window, cx| {
-                            item.save(
-                                SaveOptions {
-                                    format: should_format,
-                                    autosave: false,
-                                },
-                                project,
-                                window,
-                                cx,
-                            )
-                        })?
-                        .await?
-                    }
-                    Ok(1) => {
-                        pane.update_in(cx, |pane, window, cx| {
-                            pane.remove_item(item.item_id(), false, true, window, cx)
-                        })?;
-                    }
-                    _ => return Ok(false),
-                }
-                return Ok(true);
-            } else {
-                let answer = pane.update_in(cx, |pane, window, cx| {
-                    pane.activate_item(item_ix, true, true, window, cx);
-                    window.prompt(
-                        PromptLevel::Warning,
-                        CONFLICT_MESSAGE,
-                        None,
-                        &["Overwrite", "Discard", "Cancel"],
-                        cx,
-                    )
-                })?;
-                match answer.await {
-                    Ok(0) => {
-                        pane.update_in(cx, |_, window, cx| {
-                            item.save(
-                                SaveOptions {
-                                    format: should_format,
-                                    autosave: false,
-                                },
-                                project,
-                                window,
-                                cx,
-                            )
-                        })?
-                        .await?
-                    }
-                    Ok(1) => {
-                        pane.update_in(cx, |_, window, cx| item.reload(project, window, cx))?
-                            .await?
-                    }
-                    _ => return Ok(false),
-                }
-            }
-        } else if is_dirty && (can_save || can_save_as) {
-            if save_intent == SaveIntent::Close {
-                let will_autosave = cx.update(|_window, cx| {
-                    item.can_autosave(cx)
-                        && item.workspace_settings(cx).autosave.should_save_on_close()
-                })?;
-                if !will_autosave {
-                    let item_id = item.item_id();
-                    let answer_task = pane.update_in(cx, |pane, window, cx| {
-                        if pane.save_modals_spawned.insert(item_id) {
-                            pane.activate_item(item_ix, true, true, window, cx);
-                            let prompt = dirty_message_for(item.project_path(cx), path_style);
-                            Some(window.prompt(
-                                PromptLevel::Warning,
-                                &prompt,
-                                None,
-                                &["Save", "Don't Save", "Cancel"],
-                                cx,
-                            ))
-                        } else {
-                            None
-                        }
-                    })?;
-                    if let Some(answer_task) = answer_task {
-                        let answer = answer_task.await;
-                        pane.update(cx, |pane, _| {
-                            if !pane.save_modals_spawned.remove(&item_id) {
-                                debug_panic!(
-                                    "save modal was not present in spawned modals after awaiting for its answer"
-                                )
-                            }
-                        })?;
-                        match answer {
-                            Ok(0) => {}
-                            Ok(1) => {
-                                // Don't save this file
-                                pane.update_in(cx, |pane, _, cx| {
-                                    if pane.is_tab_pinned(item_ix) && !item.can_save(cx) {
-                                        pane.pinned_tab_count -= 1;
-                                    }
-                                })
-                                .log_err();
-                                return Ok(true);
-                            }
-                            _ => return Ok(false), // Cancel
-                        }
-                    } else {
-                        return Ok(false);
-                    }
-                }
-            }
-
-            if can_save {
-                pane.update_in(cx, |pane, window, cx| {
-                    pane.unpreview_item_if_preview(item.item_id());
-                    item.save(
-                        SaveOptions {
-                            format: should_format,
-                            autosave: false,
-                        },
-                        project,
-                        window,
-                        cx,
-                    )
-                })?
-                .await?;
-            } else if can_save_as && is_singleton {
-                let suggested_name =
-                    cx.update(|_window, cx| item.suggested_filename(cx).to_string())?;
-                let new_path = pane.update_in(cx, |pane, window, cx| {
-                    pane.activate_item(item_ix, true, true, window, cx);
-                    pane.workspace.update(cx, |workspace, cx| {
-                        let lister = if workspace.project().read(cx).is_local() {
-                            DirectoryLister::Local(
-                                workspace.project().clone(),
-                                workspace.app_state().fs.clone(),
-                            )
-                        } else {
-                            DirectoryLister::Project(workspace.project().clone())
-                        };
-                        workspace.prompt_for_new_path(lister, Some(suggested_name), window, cx)
-                    })
-                })??;
-                let Some(new_path) = new_path.await.ok().flatten().into_iter().flatten().next()
-                else {
-                    return Ok(false);
-                };
-
-                let project_path = pane
-                    .update(cx, |pane, cx| {
-                        pane.project
-                            .update(cx, |project, cx| {
-                                project.find_or_create_worktree(new_path, true, cx)
-                            })
-                            .ok()
-                    })
-                    .ok()
-                    .flatten();
-                let save_task = if let Some(project_path) = project_path {
-                    let (worktree, path) = project_path.await?;
-                    let worktree_id = worktree.read_with(cx, |worktree, _| worktree.id())?;
-                    let new_path = ProjectPath {
-                        worktree_id,
-                        path: path,
-                    };
-
-                    pane.update_in(cx, |pane, window, cx| {
-                        if let Some(item) = pane.item_for_path(new_path.clone(), cx) {
-                            pane.remove_item(item.item_id(), false, false, window, cx);
-                        }
-
-                        item.save_as(project, new_path, window, cx)
-                    })?
-                } else {
-                    return Ok(false);
-                };
-
-                save_task.await?;
-                return Ok(true);
-            }
-        }
-
-        pane.update(cx, |_, cx| {
-            cx.emit(Event::UserSavedItem {
-                item: item.downgrade_item(),
-                save_intent,
-            });
-            true
-        })
-    }
-
-    pub fn autosave_item(
-        item: &dyn ItemHandle,
-        project: Entity<Project>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<()>> {
-        let format = !matches!(
-            item.workspace_settings(cx).autosave,
-            AutosaveSetting::AfterDelay { .. }
-        );
-        if item.can_autosave(cx) {
-            item.save(
-                SaveOptions {
-                    format,
-                    autosave: true,
-                },
-                project,
-                window,
-                cx,
-            )
-        } else {
-            Task::ready(Ok(()))
-        }
-    }
-
-    pub fn focus_active_item(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(active_item) = self.active_item() {
-            let focus_handle = active_item.item_focus_handle(cx);
-            window.focus(&focus_handle);
-        }
-    }
-
-    pub fn split(&mut self, direction: SplitDirection, cx: &mut Context<Self>) {
-        cx.emit(Event::Split {
-            direction,
-            clone_active_item: true,
-        });
-    }
-
-    pub fn split_and_move(&mut self, direction: SplitDirection, cx: &mut Context<Self>) {
-        if self.items.len() > 1 {
-            cx.emit(Event::Split {
-                direction,
-                clone_active_item: false,
-            });
-        }
-    }
-
-    pub fn toolbar(&self) -> &Entity<Toolbar> {
-        &self.toolbar
-    }
-
-    pub fn handle_deleted_project_item(
-        &mut self,
-        entry_id: ProjectEntryId,
-        window: &mut Window,
-        cx: &mut Context<Pane>,
-    ) -> Option<()> {
-        let item_id = self.items().find_map(|item| {
-            if item.buffer_kind(cx) == ItemBufferKind::Singleton
-                && item.project_entry_ids(cx).as_slice() == [entry_id]
-            {
-                Some(item.item_id())
-            } else {
-                None
-            }
-        })?;
-
-        self.remove_item(item_id, false, true, window, cx);
-        self.nav_history.remove_item(item_id);
-
-        Some(())
-    }
-
-    fn update_toolbar(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let active_item = self
-            .items
-            .get(self.active_item_index)
-            .map(|item| item.as_ref());
-        self.toolbar.update(cx, |toolbar, cx| {
-            toolbar.set_active_item(active_item, window, cx);
-        });
-    }
-
-    fn update_status_bar(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let workspace = self.workspace.clone();
-        let pane = cx.entity();
-
-        window.defer(cx, move |window, cx| {
-            let Ok(status_bar) =
-                workspace.read_with(cx, |workspace, _| workspace.status_bar.clone())
-            else {
-                return;
-            };
-
-            status_bar.update(cx, move |status_bar, cx| {
-                status_bar.set_active_pane(&pane, window, cx);
-            });
-        });
-    }
-
-    fn entry_abs_path(&self, entry: ProjectEntryId, cx: &App) -> Option<PathBuf> {
-        let worktree = self
-            .workspace
-            .upgrade()?
-            .read(cx)
-            .project()
-            .read(cx)
-            .worktree_for_entry(entry, cx)?
-            .read(cx);
-        let entry = worktree.entry_for_id(entry)?;
-        Some(match &entry.canonical_path {
-            Some(canonical_path) => canonical_path.to_path_buf(),
-            None => worktree.absolutize(&entry.path),
-        })
-    }
-
-    pub fn icon_color(selected: bool) -> Color {
-        if selected {
-            Color::Default
-        } else {
-            Color::Muted
-        }
-    }
-
-    fn toggle_pin_tab(&mut self, _: &TogglePinTab, window: &mut Window, cx: &mut Context<Self>) {
-        if self.items.is_empty() {
-            return;
-        }
-        let active_tab_ix = self.active_item_index();
-        if self.is_tab_pinned(active_tab_ix) {
-            self.unpin_tab_at(active_tab_ix, window, cx);
-        } else {
-            self.pin_tab_at(active_tab_ix, window, cx);
-        }
-    }
-
-    fn unpin_all_tabs(&mut self, _: &UnpinAllTabs, window: &mut Window, cx: &mut Context<Self>) {
-        if self.items.is_empty() {
-            return;
-        }
-
-        let pinned_item_ids = self.pinned_item_ids().into_iter().rev();
-
-        for pinned_item_id in pinned_item_ids {
-            if let Some(ix) = self.index_for_item_id(pinned_item_id) {
-                self.unpin_tab_at(ix, window, cx);
-            }
-        }
-    }
-
-    fn pin_tab_at(&mut self, ix: usize, window: &mut Window, cx: &mut Context<Self>) {
-        self.change_tab_pin_state(ix, PinOperation::Pin, window, cx);
-    }
-
-    fn unpin_tab_at(&mut self, ix: usize, window: &mut Window, cx: &mut Context<Self>) {
-        self.change_tab_pin_state(ix, PinOperation::Unpin, window, cx);
-    }
-
-    fn change_tab_pin_state(
-        &mut self,
-        ix: usize,
-        operation: PinOperation,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        maybe!({
-            let pane = cx.entity();
-
-            let destination_index = match operation {
-                PinOperation::Pin => self.pinned_tab_count.min(ix),
-                PinOperation::Unpin => self.pinned_tab_count.checked_sub(1)?,
-            };
-
-            let id = self.item_for_index(ix)?.item_id();
-            let should_activate = ix == self.active_item_index;
-
-            if matches!(operation, PinOperation::Pin) {
-                self.unpreview_item_if_preview(id);
-            }
-
-            match operation {
-                PinOperation::Pin => self.pinned_tab_count += 1,
-                PinOperation::Unpin => self.pinned_tab_count -= 1,
-            }
-
-            if ix == destination_index {
-                cx.notify();
-            } else {
-                self.workspace
-                    .update(cx, |_, cx| {
-                        cx.defer_in(window, move |_, window, cx| {
-                            move_item(
-                                &pane,
-                                &pane,
-                                id,
-                                destination_index,
-                                should_activate,
-                                window,
-                                cx,
-                            );
-                        });
-                    })
-                    .ok()?;
-            }
-
-            let event = match operation {
-                PinOperation::Pin => Event::ItemPinned,
-                PinOperation::Unpin => Event::ItemUnpinned,
-            };
-
-            cx.emit(event);
-
-            Some(())
-        });
-    }
-
-    fn is_tab_pinned(&self, ix: usize) -> bool {
-        self.pinned_tab_count > ix
-    }
-
-    fn has_unpinned_tabs(&self) -> bool {
-        self.pinned_tab_count < self.items.len()
-    }
-
-    fn activate_unpinned_tab(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if self.items.is_empty() {
-            return;
-        }
-        let Some(index) = self
-            .items()
-            .enumerate()
-            .find_map(|(index, _item)| (!self.is_tab_pinned(index)).then_some(index))
-        else {
-            return;
-        };
-        self.activate_item(index, true, true, window, cx);
-    }
-
-    fn render_tab(
-        &self,
-        ix: usize,
-        item: &dyn ItemHandle,
-        detail: usize,
-        focus_handle: &FocusHandle,
-        window: &mut Window,
-        cx: &mut Context<Pane>,
-    ) -> impl IntoElement + use<> {
-        let is_active = ix == self.active_item_index;
-        let is_preview = self
-            .preview_item_id
-            .map(|id| id == item.item_id())
-            .unwrap_or(false);
-
-        let label = item.tab_content(
-            TabContentParams {
-                detail: Some(detail),
-                selected: is_active,
-                preview: is_preview,
-                deemphasized: !self.has_focus(window, cx),
-            },
-            window,
-            cx,
-        );
-
-        let item_diagnostic = item
-            .project_path(cx)
-            .map_or(None, |project_path| self.diagnostics.get(&project_path));
-
-        let decorated_icon = item_diagnostic.map_or(None, |diagnostic| {
-            let icon = match item.tab_icon(window, cx) {
-                Some(icon) => icon,
-                None => return None,
-            };
-
-            let knockout_item_color = if is_active {
-                cx.theme().colors().tab_active_background
-            } else {
-                cx.theme().colors().tab_bar_background
-            };
-
-            let (icon_decoration, icon_color) = if matches!(diagnostic, &DiagnosticSeverity::ERROR)
-            {
-                (IconDecorationKind::X, Color::Error)
-            } else {
-                (IconDecorationKind::Triangle, Color::Warning)
-            };
-
-            Some(DecoratedIcon::new(
-                icon.size(IconSize::Small).color(Color::Muted),
-                Some(
-                    IconDecoration::new(icon_decoration, knockout_item_color, cx)
-                        .color(icon_color.color(cx))
-                        .position(Point {
-                            x: px(-2.),
-                            y: px(-2.),
-                        }),
-                ),
-            ))
-        });
-
-        let icon = if decorated_icon.is_none() {
-            match item_diagnostic {
-                Some(&DiagnosticSeverity::ERROR) => None,
-                Some(&DiagnosticSeverity::WARNING) => None,
-                _ => item
-                    .tab_icon(window, cx)
-                    .map(|icon| icon.color(Color::Muted)),
-            }
-            .map(|icon| icon.size(IconSize::Small))
-        } else {
-            None
-        };
-
-        let settings = ItemSettings::get_global(cx);
-        let close_side = &settings.close_position;
-        let show_close_button = &settings.show_close_button;
-        let indicator = render_item_indicator(item.boxed_clone(), cx);
-        let tab_tooltip_content = item.tab_tooltip_content(cx);
-        let item_id = item.item_id();
-        let is_first_item = ix == 0;
-        let is_last_item = ix == self.items.len() - 1;
-        let is_pinned = self.is_tab_pinned(ix);
-        let position_relative_to_active_item = ix.cmp(&self.active_item_index);
-
-        let tab = Tab::new(ix)
-            .position(if is_first_item {
-                TabPosition::First
-            } else if is_last_item {
-                TabPosition::Last
-            } else {
-                TabPosition::Middle(position_relative_to_active_item)
-            })
-            .close_side(match close_side {
-                ClosePosition::Left => ui::TabCloseSide::Start,
-                ClosePosition::Right => ui::TabCloseSide::End,
-            })
-            .toggle_state(is_active)
-            .on_click(cx.listener(move |pane: &mut Self, _, window, cx| {
-                pane.activate_item(ix, true, true, window, cx)
-            }))
-            // TODO: This should be a click listener with the middle mouse button instead of a mouse down listener.
-            .on_mouse_down(
-                MouseButton::Middle,
-                cx.listener(move |pane, _event, window, cx| {
-                    pane.close_item_by_id(item_id, SaveIntent::Close, window, cx)
-                        .detach_and_log_err(cx);
-                }),
-            )
-            .on_mouse_down(
-                MouseButton::Left,
-                cx.listener(move |pane, event: &MouseDownEvent, _, _| {
-                    if event.click_count > 1 {
-                        pane.unpreview_item_if_preview(item_id);
-                    }
-                }),
-            )
-            .on_drag(
-                DraggedTab {
-                    item: item.boxed_clone(),
-                    pane: cx.entity(),
-                    detail,
-                    is_active,
-                    ix,
-                },
-                |tab, _, _, cx| cx.new(|_| tab.clone()),
-            )
-            .drag_over::<DraggedTab>(move |tab, dragged_tab: &DraggedTab, _, cx| {
-                let mut styled_tab = tab
-                    .bg(cx.theme().colors().drop_target_background)
-                    .border_color(cx.theme().colors().drop_target_border)
-                    .border_0();
-
-                if ix < dragged_tab.ix {
-                    styled_tab = styled_tab.border_l_2();
-                } else if ix > dragged_tab.ix {
-                    styled_tab = styled_tab.border_r_2();
-                }
-
-                styled_tab
-            })
-            .drag_over::<DraggedSelection>(|tab, _, _, cx| {
-                tab.bg(cx.theme().colors().drop_target_background)
-            })
-            .when_some(self.can_drop_predicate.clone(), |this, p| {
-                this.can_drop(move |a, window, cx| p(a, window, cx))
-            })
-            .on_drop(
-                cx.listener(move |this, dragged_tab: &DraggedTab, window, cx| {
-                    this.drag_split_direction = None;
-                    this.handle_tab_drop(dragged_tab, ix, window, cx)
-                }),
-            )
-            .on_drop(
-                cx.listener(move |this, selection: &DraggedSelection, window, cx| {
-                    this.drag_split_direction = None;
-                    this.handle_dragged_selection_drop(selection, Some(ix), window, cx)
-                }),
-            )
-            .on_drop(cx.listener(move |this, paths, window, cx| {
-                this.drag_split_direction = None;
-                this.handle_external_paths_drop(paths, window, cx)
-            }))
-            .start_slot::<Indicator>(indicator)
-            .map(|this| {
-                let end_slot_action: &'static dyn Action;
-                let end_slot_tooltip_text: &'static str;
-                let end_slot = if is_pinned {
-                    end_slot_action = &TogglePinTab;
-                    end_slot_tooltip_text = "Unpin Tab";
-                    IconButton::new("unpin tab", IconName::Pin)
-                        .shape(IconButtonShape::Square)
-                        .icon_color(Color::Muted)
-                        .size(ButtonSize::None)
-                        .icon_size(IconSize::Small)
-                        .on_click(cx.listener(move |pane, _, window, cx| {
-                            pane.unpin_tab_at(ix, window, cx);
-                        }))
-                } else {
-                    end_slot_action = &CloseActiveItem {
-                        save_intent: None,
-                        close_pinned: false,
-                    };
-                    end_slot_tooltip_text = "Close Tab";
-                    match show_close_button {
-                        ShowCloseButton::Always => IconButton::new("close tab", IconName::Close),
-                        ShowCloseButton::Hover => {
-                            IconButton::new("close tab", IconName::Close).visible_on_hover("")
-                        }
-                        ShowCloseButton::Hidden => return this,
-                    }
-                    .shape(IconButtonShape::Square)
-                    .icon_color(Color::Muted)
-                    .size(ButtonSize::None)
-                    .icon_size(IconSize::Small)
-                    .on_click(cx.listener(move |pane, _, window, cx| {
-                        pane.close_item_by_id(item_id, SaveIntent::Close, window, cx)
-                            .detach_and_log_err(cx);
-                    }))
-                }
-                .map(|this| {
-                    if is_active {
-                        let focus_handle = focus_handle.clone();
-                        this.tooltip(move |window, cx| {
-                            Tooltip::for_action_in(
-                                end_slot_tooltip_text,
-                                end_slot_action,
-                                &window.focused(cx).unwrap_or_else(|| focus_handle.clone()),
-                                cx,
-                            )
-                        })
-                    } else {
-                        this.tooltip(Tooltip::text(end_slot_tooltip_text))
-                    }
-                });
-                this.end_slot(end_slot)
-            })
-            .child(
-                h_flex()
-                    .gap_1()
-                    .items_center()
-                    .children(
-                        std::iter::once(if let Some(decorated_icon) = decorated_icon {
-                            Some(div().child(decorated_icon.into_any_element()))
-                        } else {
-                            icon.map(|icon| div().child(icon.into_any_element()))
-                        })
-                        .flatten(),
-                    )
-                    .child(label)
-                    .id(("pane-tab-content", ix))
-                    .map(|this| match tab_tooltip_content {
-                        Some(TabTooltipContent::Text(text)) => this.tooltip(Tooltip::text(text)),
-                        Some(TabTooltipContent::Custom(element_fn)) => {
-                            this.tooltip(move |window, cx| element_fn(window, cx))
-                        }
-                        None => this,
-                    }),
-            );
-
-        let single_entry_to_resolve = (self.items[ix].buffer_kind(cx) == ItemBufferKind::Singleton)
-            .then(|| self.items[ix].project_entry_ids(cx).get(0).copied())
-            .flatten();
-
-        let total_items = self.items.len();
-        let has_multibuffer_items = self
-            .items
-            .iter()
-            .any(|item| item.buffer_kind(cx) == ItemBufferKind::Multibuffer);
-        let has_items_to_left = ix > 0;
-        let has_items_to_right = ix < total_items - 1;
-        let has_clean_items = self.items.iter().any(|item| !item.is_dirty(cx));
-        let is_pinned = self.is_tab_pinned(ix);
-        let pane = cx.entity().downgrade();
-        let menu_context = item.item_focus_handle(cx);
-        right_click_menu(ix)
-            .trigger(|_, _, _| tab)
-            .menu(move |window, cx| {
-                let pane = pane.clone();
-                let menu_context = menu_context.clone();
-                ContextMenu::build(window, cx, move |mut menu, window, cx| {
-                    let close_active_item_action = CloseActiveItem {
-                        save_intent: None,
-                        close_pinned: true,
-                    };
-                    let close_inactive_items_action = CloseOtherItems {
-                        save_intent: None,
-                        close_pinned: false,
-                    };
-                    let close_multibuffers_action = CloseMultibufferItems {
-                        save_intent: None,
-                        close_pinned: false,
-                    };
-                    let close_items_to_the_left_action = CloseItemsToTheLeft {
-                        close_pinned: false,
-                    };
-                    let close_items_to_the_right_action = CloseItemsToTheRight {
-                        close_pinned: false,
-                    };
-                    let close_clean_items_action = CloseCleanItems {
-                        close_pinned: false,
-                    };
-                    let close_all_items_action = CloseAllItems {
-                        save_intent: None,
-                        close_pinned: false,
-                    };
-                    if let Some(pane) = pane.upgrade() {
-                        menu = menu
-                            .entry(
-                                "Close",
-                                Some(Box::new(close_active_item_action)),
-                                window.handler_for(&pane, move |pane, window, cx| {
-                                    pane.close_item_by_id(item_id, SaveIntent::Close, window, cx)
-                                        .detach_and_log_err(cx);
-                                }),
-                            )
-                            .item(ContextMenuItem::Entry(
-                                ContextMenuEntry::new("Close Others")
-                                    .action(Box::new(close_inactive_items_action.clone()))
-                                    .disabled(total_items == 1)
-                                    .handler(window.handler_for(&pane, move |pane, window, cx| {
-                                        pane.close_other_items(
-                                            &close_inactive_items_action,
-                                            Some(item_id),
-                                            window,
-                                            cx,
-                                        )
-                                        .detach_and_log_err(cx);
-                                    })),
-                            ))
-                            // We make this optional, instead of using disabled as to not overwhelm the context menu unnecessarily
-                            .extend(has_multibuffer_items.then(|| {
-                                ContextMenuItem::Entry(
-                                    ContextMenuEntry::new("Close Multibuffers")
-                                        .action(Box::new(close_multibuffers_action.clone()))
-                                        .handler(window.handler_for(
-                                            &pane,
-                                            move |pane, window, cx| {
-                                                pane.close_multibuffer_items(
-                                                    &close_multibuffers_action,
-                                                    window,
-                                                    cx,
-                                                )
-                                                .detach_and_log_err(cx);
-                                            },
-                                        )),
-                                )
-                            }))
-                            .separator()
-                            .item(ContextMenuItem::Entry(
-                                ContextMenuEntry::new("Close Left")
-                                    .action(Box::new(close_items_to_the_left_action.clone()))
-                                    .disabled(!has_items_to_left)
-                                    .handler(window.handler_for(&pane, move |pane, window, cx| {
-                                        pane.close_items_to_the_left_by_id(
-                                            Some(item_id),
-                                            &close_items_to_the_left_action,
-                                            window,
-                                            cx,
-                                        )
-                                        .detach_and_log_err(cx);
-                                    })),
-                            ))
-                            .item(ContextMenuItem::Entry(
-                                ContextMenuEntry::new("Close Right")
-                                    .action(Box::new(close_items_to_the_right_action.clone()))
-                                    .disabled(!has_items_to_right)
-                                    .handler(window.handler_for(&pane, move |pane, window, cx| {
-                                        pane.close_items_to_the_right_by_id(
-                                            Some(item_id),
-                                            &close_items_to_the_right_action,
-                                            window,
-                                            cx,
-                                        )
-                                        .detach_and_log_err(cx);
-                                    })),
-                            ))
-                            .separator()
-                            .item(ContextMenuItem::Entry(
-                                ContextMenuEntry::new("Close Clean")
-                                    .action(Box::new(close_clean_items_action.clone()))
-                                    .disabled(!has_clean_items)
-                                    .handler(window.handler_for(&pane, move |pane, window, cx| {
-                                        pane.close_clean_items(
-                                            &close_clean_items_action,
-                                            window,
-                                            cx,
-                                        )
-                                        .detach_and_log_err(cx)
-                                    })),
-                            ))
-                            .entry(
-                                "Close All",
-                                Some(Box::new(close_all_items_action.clone())),
-                                window.handler_for(&pane, move |pane, window, cx| {
-                                    pane.close_all_items(&close_all_items_action, window, cx)
-                                        .detach_and_log_err(cx)
-                                }),
-                            );
-
-                        let pin_tab_entries = |menu: ContextMenu| {
-                            menu.separator().map(|this| {
-                                if is_pinned {
-                                    this.entry(
-                                        "Unpin Tab",
-                                        Some(TogglePinTab.boxed_clone()),
-                                        window.handler_for(&pane, move |pane, window, cx| {
-                                            pane.unpin_tab_at(ix, window, cx);
-                                        }),
-                                    )
-                                } else {
-                                    this.entry(
-                                        "Pin Tab",
-                                        Some(TogglePinTab.boxed_clone()),
-                                        window.handler_for(&pane, move |pane, window, cx| {
-                                            pane.pin_tab_at(ix, window, cx);
-                                        }),
-                                    )
-                                }
-                            })
-                        };
-                        if let Some(entry) = single_entry_to_resolve {
-                            let project_path = pane
-                                .read(cx)
-                                .item_for_entry(entry, cx)
-                                .and_then(|item| item.project_path(cx));
-                            let worktree = project_path.as_ref().and_then(|project_path| {
-                                pane.read(cx)
-                                    .project
-                                    .upgrade()?
-                                    .read(cx)
-                                    .worktree_for_id(project_path.worktree_id, cx)
-                            });
-                            let has_relative_path = worktree.as_ref().is_some_and(|worktree| {
-                                worktree
-                                    .read(cx)
-                                    .root_entry()
-                                    .is_some_and(|entry| entry.is_dir())
-                            });
-
-                            let entry_abs_path = pane.read(cx).entry_abs_path(entry, cx);
-                            let parent_abs_path = entry_abs_path
-                                .as_deref()
-                                .and_then(|abs_path| Some(abs_path.parent()?.to_path_buf()));
-                            let relative_path = project_path
-                                .map(|project_path| project_path.path)
-                                .filter(|_| has_relative_path);
-
-                            let visible_in_project_panel = relative_path.is_some()
-                                && worktree.is_some_and(|worktree| worktree.read(cx).is_visible());
-
-                            let entry_id = entry.to_proto();
-                            menu = menu
-                                .separator()
-                                .when_some(entry_abs_path, |menu, abs_path| {
-                                    menu.entry(
-                                        "Copy Path",
-                                        Some(Box::new(zed_actions::workspace::CopyPath)),
-                                        window.handler_for(&pane, move |_, _, cx| {
-                                            cx.write_to_clipboard(ClipboardItem::new_string(
-                                                abs_path.to_string_lossy().into_owned(),
-                                            ));
-                                        }),
-                                    )
-                                })
-                                .when_some(relative_path, |menu, relative_path| {
-                                    menu.entry(
-                                        "Copy Relative Path",
-                                        Some(Box::new(zed_actions::workspace::CopyRelativePath)),
-                                        window.handler_for(&pane, move |this, _, cx| {
-                                            let Some(project) = this.project.upgrade() else {
-                                                return;
-                                            };
-                                            let path_style = project
-                                                .update(cx, |project, cx| project.path_style(cx));
-                                            cx.write_to_clipboard(ClipboardItem::new_string(
-                                                relative_path.display(path_style).to_string(),
-                                            ));
-                                        }),
-                                    )
-                                })
-                                .map(pin_tab_entries)
-                                .separator()
-                                .when(visible_in_project_panel, |menu| {
-                                    menu.entry(
-                                        "Reveal In Project Panel",
-                                        Some(Box::new(RevealInProjectPanel::default())),
-                                        window.handler_for(&pane, move |pane, _, cx| {
-                                            pane.project
-                                                .update(cx, |_, cx| {
-                                                    cx.emit(project::Event::RevealInProjectPanel(
-                                                        ProjectEntryId::from_proto(entry_id),
-                                                    ))
-                                                })
-                                                .ok();
-                                        }),
-                                    )
-                                })
-                                .when_some(parent_abs_path, |menu, parent_abs_path| {
-                                    menu.entry(
-                                        "Open in Terminal",
-                                        Some(Box::new(OpenInTerminal)),
-                                        window.handler_for(&pane, move |_, window, cx| {
-                                            window.dispatch_action(
-                                                OpenTerminal {
-                                                    working_directory: parent_abs_path.clone(),
-                                                }
-                                                .boxed_clone(),
-                                                cx,
-                                            );
-                                        }),
-                                    )
-                                });
-                        } else {
-                            menu = menu.map(pin_tab_entries);
-                        }
-                    }
-
-                    menu.context(menu_context)
-                })
-            })
-    }
-
-    fn render_tab_bar(&mut self, window: &mut Window, cx: &mut Context<Pane>) -> AnyElement {
-        let focus_handle = self.focus_handle.clone();
-        let navigate_backward = IconButton::new("navigate_backward", IconName::ArrowLeft)
-            .icon_size(IconSize::Small)
-            .on_click({
-                let entity = cx.entity();
-                move |_, window, cx| {
-                    entity.update(cx, |pane, cx| {
-                        pane.navigate_backward(&Default::default(), window, cx)
-                    })
-                }
-            })
-            .disabled(!self.can_navigate_backward())
-            .tooltip({
-                let focus_handle = focus_handle.clone();
-                move |window, cx| {
-                    Tooltip::for_action_in(
-                        "Go Back",
-                        &GoBack,
-                        &window.focused(cx).unwrap_or_else(|| focus_handle.clone()),
-                        cx,
-                    )
-                }
-            });
-
-        let navigate_forward = IconButton::new("navigate_forward", IconName::ArrowRight)
-            .icon_size(IconSize::Small)
-            .on_click({
-                let entity = cx.entity();
-                move |_, window, cx| {
-                    entity.update(cx, |pane, cx| {
-                        pane.navigate_forward(&Default::default(), window, cx)
-                    })
-                }
-            })
-            .disabled(!self.can_navigate_forward())
-            .tooltip({
-                let focus_handle = focus_handle.clone();
-                move |window, cx| {
-                    Tooltip::for_action_in(
-                        "Go Forward",
-                        &GoForward,
-                        &window.focused(cx).unwrap_or_else(|| focus_handle.clone()),
-                        cx,
-                    )
-                }
-            });
-
-        let mut tab_items = self
-            .items
-            .iter()
-            .enumerate()
-            .zip(tab_details(&self.items, window, cx))
-            .map(|((ix, item), detail)| {
-                self.render_tab(ix, &**item, detail, &focus_handle, window, cx)
-            })
-            .collect::<Vec<_>>();
-        let tab_count = tab_items.len();
-        if self.is_tab_pinned(tab_count) {
-            log::warn!(
-                "Pinned tab count ({}) exceeds actual tab count ({}). \
-                This should not happen. If possible, add reproduction steps, \
-                in a comment, to https://github.com/zed-industries/zed/issues/33342",
-                self.pinned_tab_count,
-                tab_count
-            );
-            self.pinned_tab_count = tab_count;
-        }
-        let unpinned_tabs = tab_items.split_off(self.pinned_tab_count);
-        let pinned_tabs = tab_items;
-
-        TabBar::new("tab_bar")
-            .when(
-                self.display_nav_history_buttons.unwrap_or_default(),
-                |tab_bar| {
-                    tab_bar
-                        .start_child(navigate_backward)
-                        .start_child(navigate_forward)
-                },
-            )
-            .map(|tab_bar| {
-                if self.show_tab_bar_buttons {
-                    let render_tab_buttons = self.render_tab_bar_buttons.clone();
-                    let (left_children, right_children) = render_tab_buttons(self, window, cx);
-                    tab_bar
-                        .start_children(left_children)
-                        .end_children(right_children)
-                } else {
-                    tab_bar
-                }
-            })
-            .children(pinned_tabs.len().ne(&0).then(|| {
-                let max_scroll = self.tab_bar_scroll_handle.max_offset().width;
-                // We need to check both because offset returns delta values even when the scroll handle is not scrollable
-                let is_scrolled = self.tab_bar_scroll_handle.offset().x < px(0.);
-                // Avoid flickering when max_offset is very small (< 2px).
-                // The border adds 1-2px which can push max_offset back to 0, creating a loop.
-                let is_scrollable = max_scroll > px(2.0);
-                let has_active_unpinned_tab = self.active_item_index >= self.pinned_tab_count;
-                h_flex()
-                    .children(pinned_tabs)
-                    .when(is_scrollable && is_scrolled, |this| {
-                        this.when(has_active_unpinned_tab, |this| this.border_r_2())
-                            .when(!has_active_unpinned_tab, |this| this.border_r_1())
-                            .border_color(cx.theme().colors().border)
-                    })
-            }))
-            .child(
-                h_flex()
-                    .id("unpinned tabs")
-                    .overflow_x_scroll()
-                    .w_full()
-                    .track_scroll(&self.tab_bar_scroll_handle)
-                    .on_scroll_wheel(cx.listener(|this, _, _, _| {
-                        this.suppress_scroll = true;
-                    }))
-                    .children(unpinned_tabs)
-                    .child(
-                        div()
-                            .id("tab_bar_drop_target")
-                            .min_w_6()
-                            // HACK: This empty child is currently necessary to force the drop target to appear
-                            // despite us setting a min width above.
-                            .child("")
-                            // HACK: h_full doesn't occupy the complete height, using fixed height instead
-                            .h(Tab::container_height(cx))
-                            .flex_grow()
-                            .drag_over::<DraggedTab>(|bar, _, _, cx| {
-                                bar.bg(cx.theme().colors().drop_target_background)
-                            })
-                            .drag_over::<DraggedSelection>(|bar, _, _, cx| {
-                                bar.bg(cx.theme().colors().drop_target_background)
-                            })
-                            .on_drop(cx.listener(
-                                move |this, dragged_tab: &DraggedTab, window, cx| {
-                                    this.drag_split_direction = None;
-                                    this.handle_tab_drop(dragged_tab, this.items.len(), window, cx)
-                                },
-                            ))
-                            .on_drop(cx.listener(
-                                move |this, selection: &DraggedSelection, window, cx| {
-                                    this.drag_split_direction = None;
-                                    this.handle_project_entry_drop(
-                                        &selection.active_selection.entry_id,
-                                        Some(tab_count),
-                                        window,
-                                        cx,
-                                    )
-                                },
-                            ))
-                            .on_drop(cx.listener(move |this, paths, window, cx| {
-                                this.drag_split_direction = None;
-                                this.handle_external_paths_drop(paths, window, cx)
-                            }))
-                            .on_click(cx.listener(move |this, event: &ClickEvent, window, cx| {
-                                if event.click_count() == 2 {
-                                    window.dispatch_action(
-                                        this.double_click_dispatch_action.boxed_clone(),
-                                        cx,
-                                    );
-                                }
-                            })),
-                    ),
-            )
-            .into_any_element()
-    }
-
-    pub fn render_menu_overlay(menu: &Entity<ContextMenu>) -> Div {
-        div().absolute().bottom_0().right_0().size_0().child(
-            deferred(anchored().anchor(Corner::TopRight).child(menu.clone())).with_priority(1),
-        )
-    }
-
-    pub fn set_zoomed(&mut self, zoomed: bool, cx: &mut Context<Self>) {
-        self.zoomed = zoomed;
-        cx.notify();
-    }
-
-    pub fn is_zoomed(&self) -> bool {
-        self.zoomed
-    }
-
-    fn handle_drag_move<T: 'static>(
-        &mut self,
-        event: &DragMoveEvent<T>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let can_split_predicate = self.can_split_predicate.take();
-        let can_split = match &can_split_predicate {
-            Some(can_split_predicate) => {
-                can_split_predicate(self, event.dragged_item(), window, cx)
-            }
-            None => false,
-        };
-        self.can_split_predicate = can_split_predicate;
-        if !can_split {
-            return;
-        }
-
-        let rect = event.bounds.size;
-
-        let size = event.bounds.size.width.min(event.bounds.size.height)
-            * WorkspaceSettings::get_global(cx).drop_target_size;
-
-        let relative_cursor = Point::new(
-            event.event.position.x - event.bounds.left(),
-            event.event.position.y - event.bounds.top(),
-        );
-
-        let direction = if relative_cursor.x < size
-            || relative_cursor.x > rect.width - size
-            || relative_cursor.y < size
-            || relative_cursor.y > rect.height - size
-        {
-            [
-                SplitDirection::Up,
-                SplitDirection::Right,
-                SplitDirection::Down,
-                SplitDirection::Left,
-            ]
-            .iter()
-            .min_by_key(|side| match side {
-                SplitDirection::Up => relative_cursor.y,
-                SplitDirection::Right => rect.width - relative_cursor.x,
-                SplitDirection::Down => rect.height - relative_cursor.y,
-                SplitDirection::Left => relative_cursor.x,
-            })
-            .cloned()
-        } else {
-            None
-        };
-
-        if direction != self.drag_split_direction {
-            self.drag_split_direction = direction;
-        }
-    }
-
-    pub fn handle_tab_drop(
-        &mut self,
-        dragged_tab: &DraggedTab,
-        ix: usize,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(custom_drop_handle) = self.custom_drop_handle.clone()
-            && let ControlFlow::Break(()) = custom_drop_handle(self, dragged_tab, window, cx)
-        {
-            return;
-        }
-        let mut to_pane = cx.entity();
-        let split_direction = self.drag_split_direction;
-        let item_id = dragged_tab.item.item_id();
-        self.unpreview_item_if_preview(item_id);
-
-        let is_clone = cfg!(target_os = "macos") && window.modifiers().alt
-            || cfg!(not(target_os = "macos")) && window.modifiers().control;
-
-        let from_pane = dragged_tab.pane.clone();
-
-        self.workspace
-            .update(cx, |_, cx| {
-                cx.defer_in(window, move |workspace, window, cx| {
-                    if let Some(split_direction) = split_direction {
-                        to_pane = workspace.split_pane(to_pane, split_direction, window, cx);
-                    }
-                    let database_id = workspace.database_id();
-                    let was_pinned_in_from_pane = from_pane.read_with(cx, |pane, _| {
-                        pane.index_for_item_id(item_id)
-                            .is_some_and(|ix| pane.is_tab_pinned(ix))
-                    });
-                    let to_pane_old_length = to_pane.read(cx).items.len();
-                    if is_clone {
-                        let Some(item) = from_pane
-                            .read(cx)
-                            .items()
-                            .find(|item| item.item_id() == item_id)
-                            .cloned()
-                        else {
-                            return;
-                        };
-                        if item.can_split(cx) {
-                            let task = item.clone_on_split(database_id, window, cx);
-                            let to_pane = to_pane.downgrade();
-                            cx.spawn_in(window, async move |_, cx| {
-                                if let Some(item) = task.await {
-                                    to_pane
-                                        .update_in(cx, |pane, window, cx| {
-                                            pane.add_item(item, true, true, None, window, cx)
-                                        })
-                                        .ok();
-                                }
-                            })
-                            .detach();
-                        } else {
-                            move_item(&from_pane, &to_pane, item_id, ix, true, window, cx);
-                        }
-                    } else {
-                        move_item(&from_pane, &to_pane, item_id, ix, true, window, cx);
-                    }
-                    to_pane.update(cx, |this, _| {
-                        if to_pane == from_pane {
-                            let actual_ix = this
-                                .items
-                                .iter()
-                                .position(|item| item.item_id() == item_id)
-                                .unwrap_or(0);
-
-                            let is_pinned_in_to_pane = this.is_tab_pinned(actual_ix);
-
-                            if !was_pinned_in_from_pane && is_pinned_in_to_pane {
-                                this.pinned_tab_count += 1;
-                            } else if was_pinned_in_from_pane && !is_pinned_in_to_pane {
-                                this.pinned_tab_count -= 1;
-                            }
-                        } else if this.items.len() >= to_pane_old_length {
-                            let is_pinned_in_to_pane = this.is_tab_pinned(ix);
-                            let item_created_pane = to_pane_old_length == 0;
-                            let is_first_position = ix == 0;
-                            let was_dropped_at_beginning = item_created_pane || is_first_position;
-                            let should_remain_pinned = is_pinned_in_to_pane
-                                || (was_pinned_in_from_pane && was_dropped_at_beginning);
-
-                            if should_remain_pinned {
-                                this.pinned_tab_count += 1;
-                            }
-                        }
-                    });
-                });
-            })
-            .log_err();
-    }
-
-    fn handle_dragged_selection_drop(
-        &mut self,
-        dragged_selection: &DraggedSelection,
-        dragged_onto: Option<usize>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(custom_drop_handle) = self.custom_drop_handle.clone()
-            && let ControlFlow::Break(()) = custom_drop_handle(self, dragged_selection, window, cx)
-        {
-            return;
-        }
-        self.handle_project_entry_drop(
-            &dragged_selection.active_selection.entry_id,
-            dragged_onto,
-            window,
-            cx,
-        );
-    }
-
-    fn handle_project_entry_drop(
-        &mut self,
-        project_entry_id: &ProjectEntryId,
-        target: Option<usize>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(custom_drop_handle) = self.custom_drop_handle.clone()
-            && let ControlFlow::Break(()) = custom_drop_handle(self, project_entry_id, window, cx)
-        {
-            return;
-        }
-        let mut to_pane = cx.entity();
-        let split_direction = self.drag_split_direction;
-        let project_entry_id = *project_entry_id;
-        self.workspace
-            .update(cx, |_, cx| {
-                cx.defer_in(window, move |workspace, window, cx| {
-                    if let Some(project_path) = workspace
-                        .project()
-                        .read(cx)
-                        .path_for_entry(project_entry_id, cx)
-                    {
-                        let load_path_task = workspace.load_path(project_path.clone(), window, cx);
-                        cx.spawn_in(window, async move |workspace, cx| {
-                            if let Some((project_entry_id, build_item)) =
-                                load_path_task.await.notify_async_err(cx)
-                            {
-                                let (to_pane, new_item_handle) = workspace
-                                    .update_in(cx, |workspace, window, cx| {
-                                        if let Some(split_direction) = split_direction {
-                                            to_pane = workspace.split_pane(
-                                                to_pane,
-                                                split_direction,
-                                                window,
-                                                cx,
-                                            );
-                                        }
-                                        let new_item_handle = to_pane.update(cx, |pane, cx| {
-                                            pane.open_item(
-                                                project_entry_id,
-                                                project_path,
-                                                true,
-                                                false,
-                                                true,
-                                                target,
-                                                window,
-                                                cx,
-                                                build_item,
-                                            )
-                                        });
-                                        (to_pane, new_item_handle)
-                                    })
-                                    .log_err()?;
-                                to_pane
-                                    .update_in(cx, |this, window, cx| {
-                                        let Some(index) = this.index_for_item(&*new_item_handle)
-                                        else {
-                                            return;
-                                        };
-
-                                        if target.is_some_and(|target| this.is_tab_pinned(target)) {
-                                            this.pin_tab_at(index, window, cx);
-                                        }
-                                    })
-                                    .ok()?
-                            }
-                            Some(())
-                        })
-                        .detach();
-                    };
-                });
-            })
-            .log_err();
-    }
-
-    fn handle_external_paths_drop(
-        &mut self,
-        paths: &ExternalPaths,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(custom_drop_handle) = self.custom_drop_handle.clone()
-            && let ControlFlow::Break(()) = custom_drop_handle(self, paths, window, cx)
-        {
-            return;
-        }
-        let mut to_pane = cx.entity();
-        let mut split_direction = self.drag_split_direction;
-        let paths = paths.paths().to_vec();
-        let is_remote = self
-            .workspace
-            .update(cx, |workspace, cx| {
-                if workspace.project().read(cx).is_via_collab() {
-                    workspace.show_error(
-                        &anyhow::anyhow!("Cannot drop files on a remote project"),
-                        cx,
-                    );
-                    true
-                } else {
-                    false
-                }
-            })
-            .unwrap_or(true);
-        if is_remote {
-            return;
-        }
-
-        self.workspace
-            .update(cx, |workspace, cx| {
-                let fs = Arc::clone(workspace.project().read(cx).fs());
-                cx.spawn_in(window, async move |workspace, cx| {
-                    let mut is_file_checks = FuturesUnordered::new();
-                    for path in &paths {
-                        is_file_checks.push(fs.is_file(path))
-                    }
-                    let mut has_files_to_open = false;
-                    while let Some(is_file) = is_file_checks.next().await {
-                        if is_file {
-                            has_files_to_open = true;
-                            break;
-                        }
-                    }
-                    drop(is_file_checks);
-                    if !has_files_to_open {
-                        split_direction = None;
-                    }
-
-                    if let Ok((open_task, to_pane)) =
-                        workspace.update_in(cx, |workspace, window, cx| {
-                            if let Some(split_direction) = split_direction {
-                                to_pane =
-                                    workspace.split_pane(to_pane, split_direction, window, cx);
-                            }
-                            (
-                                workspace.open_paths(
-                                    paths,
-                                    OpenOptions {
-                                        visible: Some(OpenVisible::OnlyDirectories),
-                                        ..Default::default()
-                                    },
-                                    Some(to_pane.downgrade()),
-                                    window,
-                                    cx,
-                                ),
-                                to_pane,
-                            )
-                        })
-                    {
-                        let opened_items: Vec<_> = open_task.await;
-                        _ = workspace.update_in(cx, |workspace, window, cx| {
-                            for item in opened_items.into_iter().flatten() {
-                                if let Err(e) = item {
-                                    workspace.show_error(&e, cx);
-                                }
-                            }
-                            if to_pane.read(cx).items_len() == 0 {
-                                workspace.remove_pane(to_pane, None, window, cx);
-                            }
-                        });
-                    }
-                })
-                .detach();
-            })
-            .log_err();
-    }
-
-    pub fn display_nav_history_buttons(&mut self, display: Option<bool>) {
-        self.display_nav_history_buttons = display;
-    }
-
-    fn pinned_item_ids(&self) -> Vec<EntityId> {
-        self.items
-            .iter()
-            .enumerate()
-            .filter_map(|(index, item)| {
-                if self.is_tab_pinned(index) {
-                    return Some(item.item_id());
-                }
-
-                None
-            })
-            .collect()
-    }
-
-    fn clean_item_ids(&self, cx: &mut Context<Pane>) -> Vec<EntityId> {
-        self.items()
-            .filter_map(|item| {
-                if !item.is_dirty(cx) {
-                    return Some(item.item_id());
-                }
-
-                None
-            })
-            .collect()
-    }
-
-    fn to_the_side_item_ids(&self, item_id: EntityId, side: Side) -> Vec<EntityId> {
-        match side {
-            Side::Left => self
-                .items()
-                .take_while(|item| item.item_id() != item_id)
-                .map(|item| item.item_id())
-                .collect(),
-            Side::Right => self
-                .items()
-                .rev()
-                .take_while(|item| item.item_id() != item_id)
-                .map(|item| item.item_id())
-                .collect(),
-        }
-    }
-
-    fn multibuffer_item_ids(&self, cx: &mut Context<Pane>) -> Vec<EntityId> {
-        self.items()
-            .filter(|item| item.buffer_kind(cx) == ItemBufferKind::Multibuffer)
-            .map(|item| item.item_id())
-            .collect()
-    }
-
-    pub fn drag_split_direction(&self) -> Option<SplitDirection> {
-        self.drag_split_direction
-    }
-
-    pub fn set_zoom_out_on_close(&mut self, zoom_out_on_close: bool) {
-        self.zoom_out_on_close = zoom_out_on_close;
-    }
-}
-
-fn default_render_tab_bar_buttons(
-    pane: &mut Pane,
-    window: &mut Window,
-    cx: &mut Context<Pane>,
-) -> (Option<AnyElement>, Option<AnyElement>) {
-    if !pane.has_focus(window, cx) && !pane.context_menu_focused(window, cx) {
-        return (None, None);
-    }
-    let (can_clone, can_split_move) = match pane.active_item() {
-        Some(active_item) if active_item.can_split(cx) => (true, false),
-        Some(_) => (false, pane.items_len() > 1),
-        None => (false, false),
-    };
-    // Ideally we would return a vec of elements here to pass directly to the [TabBar]'s
-    // `end_slot`, but due to needing a view here that isn't possible.
-    let right_children = h_flex()
-        // Instead we need to replicate the spacing from the [TabBar]'s `end_slot` here.
-        .gap(DynamicSpacing::Base04.rems(cx))
-        .child(
-            PopoverMenu::new("pane-tab-bar-popover-menu")
-                .trigger_with_tooltip(
-                    IconButton::new("plus", IconName::Plus).icon_size(IconSize::Small),
-                    Tooltip::text("New..."),
-                )
-                .anchor(Corner::TopRight)
-                .with_handle(pane.new_item_context_menu_handle.clone())
-                .menu(move |window, cx| {
-                    Some(ContextMenu::build(window, cx, |menu, _, _| {
-                        menu.action("New File", NewFile.boxed_clone())
-                            .action("Open File", ToggleFileFinder::default().boxed_clone())
-                            .separator()
-                            .action(
-                                "Search Project",
-                                DeploySearch {
-                                    replace_enabled: false,
-                                    included_files: None,
-                                    excluded_files: None,
-                                }
-                                .boxed_clone(),
-                            )
-                            .action("Search Symbols", ToggleProjectSymbols.boxed_clone())
-                            .separator()
-                            .action("New Terminal", NewTerminal.boxed_clone())
-                    }))
-                }),
-        )
-        .child(
-            PopoverMenu::new("pane-tab-bar-split")
-                .trigger_with_tooltip(
-                    IconButton::new("split", IconName::Split)
-                        .icon_size(IconSize::Small)
-                        .disabled(!can_clone && !can_split_move),
-                    Tooltip::text("Split Pane"),
-                )
-                .anchor(Corner::TopRight)
-                .with_handle(pane.split_item_context_menu_handle.clone())
-                .menu(move |window, cx| {
-                    ContextMenu::build(window, cx, |menu, _, _| {
-                        if can_split_move {
-                            menu.action("Split Right", SplitAndMoveRight.boxed_clone())
-                                .action("Split Left", SplitAndMoveLeft.boxed_clone())
-                                .action("Split Up", SplitAndMoveUp.boxed_clone())
-                                .action("Split Down", SplitAndMoveDown.boxed_clone())
-                        } else {
-                            menu.action("Split Right", SplitRight.boxed_clone())
-                                .action("Split Left", SplitLeft.boxed_clone())
-                                .action("Split Up", SplitUp.boxed_clone())
-                                .action("Split Down", SplitDown.boxed_clone())
-                        }
-                    })
-                    .into()
-                }),
-        )
-        .child({
-            let zoomed = pane.is_zoomed();
-            IconButton::new("toggle_zoom", IconName::Maximize)
-                .icon_size(IconSize::Small)
-                .toggle_state(zoomed)
-                .selected_icon(IconName::Minimize)
-                .on_click(cx.listener(|pane, _, window, cx| {
-                    pane.toggle_zoom(&crate::ToggleZoom, window, cx);
-                }))
-                .tooltip(move |_window, cx| {
-                    Tooltip::for_action(
-                        if zoomed { "Zoom Out" } else { "Zoom In" },
-                        &ToggleZoom,
-                        cx,
-                    )
-                })
-        })
-        .into_any_element()
-        .into();
-    (None, right_children)
-}
-
-impl Focusable for Pane {
-    fn focus_handle(&self, _cx: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl Render for Pane {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let mut key_context = KeyContext::new_with_defaults();
-        key_context.add("Pane");
-        if self.active_item().is_none() {
-            key_context.add("EmptyPane");
-        }
-
-        self.toolbar
-            .read(cx)
-            .contribute_context(&mut key_context, cx);
-
-        let should_display_tab_bar = self.should_display_tab_bar.clone();
-        let display_tab_bar = should_display_tab_bar(window, cx);
-        let Some(project) = self.project.upgrade() else {
-            return div().track_focus(&self.focus_handle(cx));
-        };
-        let is_local = project.read(cx).is_local();
-
-        v_flex()
-            .key_context(key_context)
-            .track_focus(&self.focus_handle(cx))
-            .size_full()
-            .flex_none()
-            .overflow_hidden()
-            .on_action(
-                cx.listener(|pane, _: &SplitLeft, _, cx| pane.split(SplitDirection::Left, cx)),
-            )
-            .on_action(cx.listener(|pane, _: &SplitUp, _, cx| pane.split(SplitDirection::Up, cx)))
-            .on_action(cx.listener(|pane, _: &SplitHorizontal, _, cx| {
-                pane.split(SplitDirection::horizontal(cx), cx)
-            }))
-            .on_action(cx.listener(|pane, _: &SplitVertical, _, cx| {
-                pane.split(SplitDirection::vertical(cx), cx)
-            }))
-            .on_action(
-                cx.listener(|pane, _: &SplitRight, _, cx| pane.split(SplitDirection::Right, cx)),
-            )
-            .on_action(
-                cx.listener(|pane, _: &SplitDown, _, cx| pane.split(SplitDirection::Down, cx)),
-            )
-            .on_action(cx.listener(|pane, _: &SplitAndMoveUp, _, cx| {
-                pane.split_and_move(SplitDirection::Up, cx)
-            }))
-            .on_action(cx.listener(|pane, _: &SplitAndMoveDown, _, cx| {
-                pane.split_and_move(SplitDirection::Down, cx)
-            }))
-            .on_action(cx.listener(|pane, _: &SplitAndMoveLeft, _, cx| {
-                pane.split_and_move(SplitDirection::Left, cx)
-            }))
-            .on_action(cx.listener(|pane, _: &SplitAndMoveRight, _, cx| {
-                pane.split_and_move(SplitDirection::Right, cx)
-            }))
-            .on_action(cx.listener(|_, _: &JoinIntoNext, _, cx| {
-                cx.emit(Event::JoinIntoNext);
-            }))
-            .on_action(cx.listener(|_, _: &JoinAll, _, cx| {
-                cx.emit(Event::JoinAll);
-            }))
-            .on_action(cx.listener(Pane::toggle_zoom))
-            .on_action(cx.listener(Self::navigate_backward))
-            .on_action(cx.listener(Self::navigate_forward))
-            .on_action(
-                cx.listener(|pane: &mut Pane, action: &ActivateItem, window, cx| {
-                    pane.activate_item(
-                        action.0.min(pane.items.len().saturating_sub(1)),
-                        true,
-                        true,
-                        window,
-                        cx,
-                    );
-                }),
-            )
-            .on_action(cx.listener(Self::alternate_file))
-            .on_action(cx.listener(Self::activate_last_item))
-            .on_action(cx.listener(Self::activate_previous_item))
-            .on_action(cx.listener(Self::activate_next_item))
-            .on_action(cx.listener(Self::swap_item_left))
-            .on_action(cx.listener(Self::swap_item_right))
-            .on_action(cx.listener(Self::toggle_pin_tab))
-            .on_action(cx.listener(Self::unpin_all_tabs))
-            .when(PreviewTabsSettings::get_global(cx).enabled, |this| {
-                this.on_action(
-                    cx.listener(|pane: &mut Pane, _: &TogglePreviewTab, window, cx| {
-                        if let Some(active_item_id) = pane.active_item().map(|i| i.item_id()) {
-                            if pane.is_active_preview_item(active_item_id) {
-                                pane.unpreview_item_if_preview(active_item_id);
-                            } else {
-                                pane.replace_preview_item_id(active_item_id, window, cx);
-                            }
-                        }
-                    }),
-                )
-            })
-            .on_action(
-                cx.listener(|pane: &mut Self, action: &CloseActiveItem, window, cx| {
-                    pane.close_active_item(action, window, cx)
-                        .detach_and_log_err(cx)
-                }),
-            )
-            .on_action(
-                cx.listener(|pane: &mut Self, action: &CloseOtherItems, window, cx| {
-                    pane.close_other_items(action, None, window, cx)
-                        .detach_and_log_err(cx);
-                }),
-            )
-            .on_action(
-                cx.listener(|pane: &mut Self, action: &CloseCleanItems, window, cx| {
-                    pane.close_clean_items(action, window, cx)
-                        .detach_and_log_err(cx)
-                }),
-            )
-            .on_action(cx.listener(
-                |pane: &mut Self, action: &CloseItemsToTheLeft, window, cx| {
-                    pane.close_items_to_the_left_by_id(None, action, window, cx)
-                        .detach_and_log_err(cx)
-                },
-            ))
-            .on_action(cx.listener(
-                |pane: &mut Self, action: &CloseItemsToTheRight, window, cx| {
-                    pane.close_items_to_the_right_by_id(None, action, window, cx)
-                        .detach_and_log_err(cx)
-                },
-            ))
-            .on_action(
-                cx.listener(|pane: &mut Self, action: &CloseAllItems, window, cx| {
-                    pane.close_all_items(action, window, cx)
-                        .detach_and_log_err(cx)
-                }),
-            )
-            .on_action(cx.listener(
-                |pane: &mut Self, action: &CloseMultibufferItems, window, cx| {
-                    pane.close_multibuffer_items(action, window, cx)
-                        .detach_and_log_err(cx)
-                },
-            ))
-            .on_action(
-                cx.listener(|pane: &mut Self, action: &RevealInProjectPanel, _, cx| {
-                    let entry_id = action
-                        .entry_id
-                        .map(ProjectEntryId::from_proto)
-                        .or_else(|| pane.active_item()?.project_entry_ids(cx).first().copied());
-                    if let Some(entry_id) = entry_id {
-                        pane.project
-                            .update(cx, |_, cx| {
-                                cx.emit(project::Event::RevealInProjectPanel(entry_id))
-                            })
-                            .ok();
-                    }
-                }),
-            )
-            .on_action(cx.listener(|_, _: &menu::Cancel, window, cx| {
-                if cx.stop_active_drag(window) {
-                } else {
-                    cx.propagate();
-                }
-            }))
-            .when(self.active_item().is_some() && display_tab_bar, |pane| {
-                pane.child((self.render_tab_bar.clone())(self, window, cx))
-            })
-            .child({
-                let has_worktrees = project.read(cx).visible_worktrees(cx).next().is_some();
-                // main content
-                div()
-                    .flex_1()
-                    .relative()
-                    .group("")
-                    .overflow_hidden()
-                    .on_drag_move::<DraggedTab>(cx.listener(Self::handle_drag_move))
-                    .on_drag_move::<DraggedSelection>(cx.listener(Self::handle_drag_move))
-                    .when(is_local, |div| {
-                        div.on_drag_move::<ExternalPaths>(cx.listener(Self::handle_drag_move))
-                    })
-                    .map(|div| {
-                        if let Some(item) = self.active_item() {
-                            div.id("pane_placeholder")
-                                .v_flex()
-                                .size_full()
-                                .overflow_hidden()
-                                .child(self.toolbar.clone())
-                                .child(item.to_any_view())
-                        } else {
-                            let placeholder = div
-                                .id("pane_placeholder")
-                                .h_flex()
-                                .size_full()
-                                .justify_center()
-                                .on_click(cx.listener(
-                                    move |this, event: &ClickEvent, window, cx| {
-                                        if event.click_count() == 2 {
-                                            window.dispatch_action(
-                                                this.double_click_dispatch_action.boxed_clone(),
-                                                cx,
-                                            );
-                                        }
-                                    },
-                                ));
-                            if has_worktrees {
-                                placeholder
-                            } else {
-                                placeholder.child(
-                                    Label::new("Open a file or project to get started.")
-                                        .color(Color::Muted),
-                                )
-                            }
-                        }
-                    })
-                    .child(
-                        // drag target
-                        div()
-                            .invisible()
-                            .absolute()
-                            .bg(cx.theme().colors().drop_target_background)
-                            .group_drag_over::<DraggedTab>("", |style| style.visible())
-                            .group_drag_over::<DraggedSelection>("", |style| style.visible())
-                            .when(is_local, |div| {
-                                div.group_drag_over::<ExternalPaths>("", |style| style.visible())
-                            })
-                            .when_some(self.can_drop_predicate.clone(), |this, p| {
-                                this.can_drop(move |a, window, cx| p(a, window, cx))
-                            })
-                            .on_drop(cx.listener(move |this, dragged_tab, window, cx| {
-                                this.handle_tab_drop(
-                                    dragged_tab,
-                                    this.active_item_index(),
-                                    window,
-                                    cx,
-                                )
-                            }))
-                            .on_drop(cx.listener(
-                                move |this, selection: &DraggedSelection, window, cx| {
-                                    this.handle_dragged_selection_drop(selection, None, window, cx)
-                                },
-                            ))
-                            .on_drop(cx.listener(move |this, paths, window, cx| {
-                                this.handle_external_paths_drop(paths, window, cx)
-                            }))
-                            .map(|div| {
-                                let size = DefiniteLength::Fraction(0.5);
-                                match self.drag_split_direction {
-                                    None => div.top_0().right_0().bottom_0().left_0(),
-                                    Some(SplitDirection::Up) => {
-                                        div.top_0().left_0().right_0().h(size)
-                                    }
-                                    Some(SplitDirection::Down) => {
-                                        div.left_0().bottom_0().right_0().h(size)
-                                    }
-                                    Some(SplitDirection::Left) => {
-                                        div.top_0().left_0().bottom_0().w(size)
-                                    }
-                                    Some(SplitDirection::Right) => {
-                                        div.top_0().bottom_0().right_0().w(size)
-                                    }
-                                }
-                            }),
-                    )
-            })
-            .on_mouse_down(
-                MouseButton::Navigate(NavigationDirection::Back),
-                cx.listener(|pane, _, window, cx| {
-                    if let Some(workspace) = pane.workspace.upgrade() {
-                        let pane = cx.entity().downgrade();
-                        window.defer(cx, move |window, cx| {
-                            workspace.update(cx, |workspace, cx| {
-                                workspace.go_back(pane, window, cx).detach_and_log_err(cx)
-                            })
-                        })
-                    }
-                }),
-            )
-            .on_mouse_down(
-                MouseButton::Navigate(NavigationDirection::Forward),
-                cx.listener(|pane, _, window, cx| {
-                    if let Some(workspace) = pane.workspace.upgrade() {
-                        let pane = cx.entity().downgrade();
-                        window.defer(cx, move |window, cx| {
-                            workspace.update(cx, |workspace, cx| {
-                                workspace
-                                    .go_forward(pane, window, cx)
-                                    .detach_and_log_err(cx)
-                            })
-                        })
-                    }
-                }),
-            )
-    }
-}
-
-impl ItemNavHistory {
-    pub fn push<D: 'static + Send + Any>(&mut self, data: Option<D>, cx: &mut App) {
-        if self
-            .item
-            .upgrade()
-            .is_some_and(|item| item.include_in_nav_history())
-        {
-            self.history
-                .push(data, self.item.clone(), self.is_preview, cx);
-        }
-    }
-
-    pub fn pop_backward(&mut self, cx: &mut App) -> Option<NavigationEntry> {
-        self.history.pop(NavigationMode::GoingBack, cx)
-    }
-
-    pub fn pop_forward(&mut self, cx: &mut App) -> Option<NavigationEntry> {
-        self.history.pop(NavigationMode::GoingForward, cx)
-    }
-}
-
-impl NavHistory {
-    pub fn for_each_entry(
-        &self,
-        cx: &App,
-        mut f: impl FnMut(&NavigationEntry, (ProjectPath, Option<PathBuf>)),
-    ) {
-        let borrowed_history = self.0.lock();
-        borrowed_history
-            .forward_stack
-            .iter()
-            .chain(borrowed_history.backward_stack.iter())
-            .chain(borrowed_history.closed_stack.iter())
-            .for_each(|entry| {
-                if let Some(project_and_abs_path) =
-                    borrowed_history.paths_by_item.get(&entry.item.id())
-                {
-                    f(entry, project_and_abs_path.clone());
-                } else if let Some(item) = entry.item.upgrade()
-                    && let Some(path) = item.project_path(cx)
-                {
-                    f(entry, (path, None));
-                }
-            })
-    }
-
-    pub fn set_mode(&mut self, mode: NavigationMode) {
-        self.0.lock().mode = mode;
-    }
-
-    pub fn mode(&self) -> NavigationMode {
-        self.0.lock().mode
-    }
-
-    pub fn disable(&mut self) {
-        self.0.lock().mode = NavigationMode::Disabled;
-    }
-
-    pub fn enable(&mut self) {
-        self.0.lock().mode = NavigationMode::Normal;
-    }
-
-    pub fn clear(&mut self, cx: &mut App) {
-        let mut state = self.0.lock();
-
-        if state.backward_stack.is_empty()
-            && state.forward_stack.is_empty()
-            && state.closed_stack.is_empty()
-            && state.paths_by_item.is_empty()
-        {
-            return;
-        }
-
-        state.mode = NavigationMode::Normal;
-        state.backward_stack.clear();
-        state.forward_stack.clear();
-        state.closed_stack.clear();
-        state.paths_by_item.clear();
-        state.did_update(cx);
-    }
-
-    pub fn pop(&mut self, mode: NavigationMode, cx: &mut App) -> Option<NavigationEntry> {
-        let mut state = self.0.lock();
-        let entry = match mode {
-            NavigationMode::Normal | NavigationMode::Disabled | NavigationMode::ClosingItem => {
-                return None;
-            }
-            NavigationMode::GoingBack => &mut state.backward_stack,
-            NavigationMode::GoingForward => &mut state.forward_stack,
-            NavigationMode::ReopeningClosedItem => &mut state.closed_stack,
-        }
-        .pop_back();
-        if entry.is_some() {
-            state.did_update(cx);
-        }
-        entry
-    }
-
-    pub fn push<D: 'static + Send + Any>(
-        &mut self,
-        data: Option<D>,
-        item: Arc<dyn WeakItemHandle>,
-        is_preview: bool,
-        cx: &mut App,
-    ) {
-        let state = &mut *self.0.lock();
-        match state.mode {
-            NavigationMode::Disabled => {}
-            NavigationMode::Normal | NavigationMode::ReopeningClosedItem => {
-                if state.backward_stack.len() >= MAX_NAVIGATION_HISTORY_LEN {
-                    state.backward_stack.pop_front();
-                }
-                state.backward_stack.push_back(NavigationEntry {
-                    item,
-                    data: data.map(|data| Box::new(data) as Box<dyn Any + Send>),
-                    timestamp: state.next_timestamp.fetch_add(1, Ordering::SeqCst),
-                    is_preview,
-                });
-                state.forward_stack.clear();
-            }
-            NavigationMode::GoingBack => {
-                if state.forward_stack.len() >= MAX_NAVIGATION_HISTORY_LEN {
-                    state.forward_stack.pop_front();
-                }
-                state.forward_stack.push_back(NavigationEntry {
-                    item,
-                    data: data.map(|data| Box::new(data) as Box<dyn Any + Send>),
-                    timestamp: state.next_timestamp.fetch_add(1, Ordering::SeqCst),
-                    is_preview,
-                });
-            }
-            NavigationMode::GoingForward => {
-                if state.backward_stack.len() >= MAX_NAVIGATION_HISTORY_LEN {
-                    state.backward_stack.pop_front();
-                }
-                state.backward_stack.push_back(NavigationEntry {
-                    item,
-                    data: data.map(|data| Box::new(data) as Box<dyn Any + Send>),
-                    timestamp: state.next_timestamp.fetch_add(1, Ordering::SeqCst),
-                    is_preview,
-                });
-            }
-            NavigationMode::ClosingItem if is_preview => return,
-            NavigationMode::ClosingItem => {
-                if state.closed_stack.len() >= MAX_NAVIGATION_HISTORY_LEN {
-                    state.closed_stack.pop_front();
-                }
-                state.closed_stack.push_back(NavigationEntry {
-                    item,
-                    data: data.map(|data| Box::new(data) as Box<dyn Any + Send>),
-                    timestamp: state.next_timestamp.fetch_add(1, Ordering::SeqCst),
-                    is_preview,
-                });
-            }
-        }
-        state.did_update(cx);
-    }
-
-    pub fn remove_item(&mut self, item_id: EntityId) {
-        let mut state = self.0.lock();
-        state.paths_by_item.remove(&item_id);
-        state
-            .backward_stack
-            .retain(|entry| entry.item.id() != item_id);
-        state
-            .forward_stack
-            .retain(|entry| entry.item.id() != item_id);
-        state
-            .closed_stack
-            .retain(|entry| entry.item.id() != item_id);
-    }
-
-    pub fn rename_item(
-        &mut self,
-        item_id: EntityId,
-        project_path: ProjectPath,
-        abs_path: Option<PathBuf>,
-    ) {
-        let mut state = self.0.lock();
-        let path_for_item = state.paths_by_item.get_mut(&item_id);
-        if let Some(path_for_item) = path_for_item {
-            path_for_item.0 = project_path;
-            path_for_item.1 = abs_path;
-        }
-    }
-
-    pub fn path_for_item(&self, item_id: EntityId) -> Option<(ProjectPath, Option<PathBuf>)> {
-        self.0.lock().paths_by_item.get(&item_id).cloned()
-    }
-}
-
-impl NavHistoryState {
-    pub fn did_update(&self, cx: &mut App) {
-        if let Some(pane) = self.pane.upgrade() {
-            cx.defer(move |cx| {
-                pane.update(cx, |pane, cx| pane.history_updated(cx));
-            });
-        }
-    }
-}
-
-fn dirty_message_for(buffer_path: Option<ProjectPath>, path_style: PathStyle) -> String {
-    let path = buffer_path
-        .as_ref()
-        .and_then(|p| {
-            let path = p.path.display(path_style);
-            if path.is_empty() { None } else { Some(path) }
-        })
-        .unwrap_or("This buffer".into());
-    let path = truncate_and_remove_front(&path, 80);
-    format!("{path} contains unsaved edits. Do you want to save it?")
-}
-
-pub fn tab_details(items: &[Box<dyn ItemHandle>], _window: &Window, cx: &App) -> Vec<usize> {
-    let mut tab_details = items.iter().map(|_| 0).collect::<Vec<_>>();
-    let mut tab_descriptions = HashMap::default();
-    let mut done = false;
-    while !done {
-        done = true;
-
-        // Store item indices by their tab description.
-        for (ix, (item, detail)) in items.iter().zip(&tab_details).enumerate() {
-            let description = item.tab_content_text(*detail, cx);
-            if *detail == 0 || description != item.tab_content_text(detail - 1, cx) {
-                tab_descriptions
-                    .entry(description)
-                    .or_insert(Vec::new())
-                    .push(ix);
-            }
-        }
-
-        // If two or more items have the same tab description, increase their level
-        // of detail and try again.
-        for (_, item_ixs) in tab_descriptions.drain() {
-            if item_ixs.len() > 1 {
-                done = false;
-                for ix in item_ixs {
-                    tab_details[ix] += 1;
-                }
-            }
-        }
-    }
-
-    tab_details
-}
-
-pub fn render_item_indicator(item: Box<dyn ItemHandle>, cx: &App) -> Option<Indicator> {
-    maybe!({
-        let indicator_color = match (item.has_conflict(cx), item.is_dirty(cx)) {
-            (true, _) => Color::Warning,
-            (_, true) => Color::Accent,
-            (false, false) => return None,
-        };
-
-        Some(Indicator::dot().color(indicator_color))
-    })
-}
-
-impl Render for DraggedTab {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let ui_font = ThemeSettings::get_global(cx).ui_font.clone();
-        let label = self.item.tab_content(
-            TabContentParams {
-                detail: Some(self.detail),
-                selected: false,
-                preview: false,
-                deemphasized: false,
-            },
-            window,
-            cx,
-        );
-        Tab::new("")
-            .toggle_state(self.is_active)
-            .child(label)
-            .render(window, cx)
-            .font(ui_font)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::num::NonZero;
-
-    use super::*;
-    use crate::item::test::{TestItem, TestProjectItem};
-    use gpui::{TestAppContext, VisualTestContext, size};
-    use project::FakeFs;
-    use settings::SettingsStore;
-    use theme::LoadThemes;
-    use util::TryFutureExt;
-
-    #[gpui::test]
-    async fn test_add_item_capped_to_max_tabs(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        for i in 0..7 {
-            add_labeled_item(&pane, format!("{}", i).as_str(), false, cx);
-        }
-
-        set_max_tabs(cx, Some(5));
-        add_labeled_item(&pane, "7", false, cx);
-        // Remove items to respect the max tab cap.
-        assert_item_labels(&pane, ["3", "4", "5", "6", "7*"], cx);
-        pane.update_in(cx, |pane, window, cx| {
-            pane.activate_item(0, false, false, window, cx);
-        });
-        add_labeled_item(&pane, "X", false, cx);
-        // Respect activation order.
-        assert_item_labels(&pane, ["3", "X*", "5", "6", "7"], cx);
-
-        for i in 0..7 {
-            add_labeled_item(&pane, format!("D{}", i).as_str(), true, cx);
-        }
-        // Keeps dirty items, even over max tab cap.
-        assert_item_labels(
-            &pane,
-            ["D0^", "D1^", "D2^", "D3^", "D4^", "D5^", "D6*^"],
-            cx,
-        );
-
-        set_max_tabs(cx, None);
-        for i in 0..7 {
-            add_labeled_item(&pane, format!("N{}", i).as_str(), false, cx);
-        }
-        // No cap when max tabs is None.
-        assert_item_labels(
-            &pane,
-            [
-                "D0^", "D1^", "D2^", "D3^", "D4^", "D5^", "D6^", "N0", "N1", "N2", "N3", "N4",
-                "N5", "N6*",
-            ],
-            cx,
-        );
-    }
-
-    #[gpui::test]
-    async fn test_reduce_max_tabs_closes_existing_items(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        add_labeled_item(&pane, "A", false, cx);
-        add_labeled_item(&pane, "B", false, cx);
-        let item_c = add_labeled_item(&pane, "C", false, cx);
-        let item_d = add_labeled_item(&pane, "D", false, cx);
-        add_labeled_item(&pane, "E", false, cx);
-        add_labeled_item(&pane, "Settings", false, cx);
-        assert_item_labels(&pane, ["A", "B", "C", "D", "E", "Settings*"], cx);
-
-        set_max_tabs(cx, Some(5));
-        assert_item_labels(&pane, ["B", "C", "D", "E", "Settings*"], cx);
-
-        set_max_tabs(cx, Some(4));
-        assert_item_labels(&pane, ["C", "D", "E", "Settings*"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_c.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-
-            let ix = pane.index_for_item_id(item_d.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-        });
-        assert_item_labels(&pane, ["C!", "D!", "E", "Settings*"], cx);
-
-        set_max_tabs(cx, Some(2));
-        assert_item_labels(&pane, ["C!", "D!", "Settings*"], cx);
-    }
-
-    #[gpui::test]
-    async fn test_allow_pinning_dirty_item_at_max_tabs(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        set_max_tabs(cx, Some(1));
-        let item_a = add_labeled_item(&pane, "A", true, cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_a.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-        });
-        assert_item_labels(&pane, ["A*^!"], cx);
-    }
-
-    #[gpui::test]
-    async fn test_allow_pinning_non_dirty_item_at_max_tabs(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        set_max_tabs(cx, Some(1));
-        let item_a = add_labeled_item(&pane, "A", false, cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_a.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-        });
-        assert_item_labels(&pane, ["A*!"], cx);
-    }
-
-    #[gpui::test]
-    async fn test_pin_tabs_incrementally_at_max_capacity(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        set_max_tabs(cx, Some(3));
-
-        let item_a = add_labeled_item(&pane, "A", false, cx);
-        assert_item_labels(&pane, ["A*"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_a.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-        });
-        assert_item_labels(&pane, ["A*!"], cx);
-
-        let item_b = add_labeled_item(&pane, "B", false, cx);
-        assert_item_labels(&pane, ["A!", "B*"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_b.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-        });
-        assert_item_labels(&pane, ["A!", "B*!"], cx);
-
-        let item_c = add_labeled_item(&pane, "C", false, cx);
-        assert_item_labels(&pane, ["A!", "B!", "C*"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_c.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-        });
-        assert_item_labels(&pane, ["A!", "B!", "C*!"], cx);
-    }
-
-    #[gpui::test]
-    async fn test_pin_tabs_left_to_right_after_opening_at_max_capacity(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        set_max_tabs(cx, Some(3));
-
-        let item_a = add_labeled_item(&pane, "A", false, cx);
-        assert_item_labels(&pane, ["A*"], cx);
-
-        let item_b = add_labeled_item(&pane, "B", false, cx);
-        assert_item_labels(&pane, ["A", "B*"], cx);
-
-        let item_c = add_labeled_item(&pane, "C", false, cx);
-        assert_item_labels(&pane, ["A", "B", "C*"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_a.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-        });
-        assert_item_labels(&pane, ["A!", "B", "C*"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_b.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-        });
-        assert_item_labels(&pane, ["A!", "B!", "C*"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_c.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-        });
-        assert_item_labels(&pane, ["A!", "B!", "C*!"], cx);
-    }
-
-    #[gpui::test]
-    async fn test_pin_tabs_right_to_left_after_opening_at_max_capacity(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        set_max_tabs(cx, Some(3));
-
-        let item_a = add_labeled_item(&pane, "A", false, cx);
-        assert_item_labels(&pane, ["A*"], cx);
-
-        let item_b = add_labeled_item(&pane, "B", false, cx);
-        assert_item_labels(&pane, ["A", "B*"], cx);
-
-        let item_c = add_labeled_item(&pane, "C", false, cx);
-        assert_item_labels(&pane, ["A", "B", "C*"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_c.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-        });
-        assert_item_labels(&pane, ["C*!", "A", "B"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_b.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-        });
-        assert_item_labels(&pane, ["C*!", "B!", "A"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_a.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-        });
-        assert_item_labels(&pane, ["C*!", "B!", "A!"], cx);
-    }
-
-    #[gpui::test]
-    async fn test_pinned_tabs_never_closed_at_max_tabs(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        let item_a = add_labeled_item(&pane, "A", false, cx);
-        pane.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_a.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-        });
-
-        let item_b = add_labeled_item(&pane, "B", false, cx);
-        pane.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_b.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-        });
-
-        add_labeled_item(&pane, "C", false, cx);
-        add_labeled_item(&pane, "D", false, cx);
-        add_labeled_item(&pane, "E", false, cx);
-        assert_item_labels(&pane, ["A!", "B!", "C", "D", "E*"], cx);
-
-        set_max_tabs(cx, Some(3));
-        add_labeled_item(&pane, "F", false, cx);
-        assert_item_labels(&pane, ["A!", "B!", "F*"], cx);
-
-        add_labeled_item(&pane, "G", false, cx);
-        assert_item_labels(&pane, ["A!", "B!", "G*"], cx);
-
-        add_labeled_item(&pane, "H", false, cx);
-        assert_item_labels(&pane, ["A!", "B!", "H*"], cx);
-    }
-
-    #[gpui::test]
-    async fn test_always_allows_one_unpinned_item_over_max_tabs_regardless_of_pinned_count(
-        cx: &mut TestAppContext,
-    ) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        set_max_tabs(cx, Some(3));
-
-        let item_a = add_labeled_item(&pane, "A", false, cx);
-        pane.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_a.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-        });
-
-        let item_b = add_labeled_item(&pane, "B", false, cx);
-        pane.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_b.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-        });
-
-        let item_c = add_labeled_item(&pane, "C", false, cx);
-        pane.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_c.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-        });
-
-        assert_item_labels(&pane, ["A!", "B!", "C*!"], cx);
-
-        let item_d = add_labeled_item(&pane, "D", false, cx);
-        assert_item_labels(&pane, ["A!", "B!", "C!", "D*"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_d.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-        });
-        assert_item_labels(&pane, ["A!", "B!", "C!", "D*!"], cx);
-
-        add_labeled_item(&pane, "E", false, cx);
-        assert_item_labels(&pane, ["A!", "B!", "C!", "D!", "E*"], cx);
-
-        add_labeled_item(&pane, "F", false, cx);
-        assert_item_labels(&pane, ["A!", "B!", "C!", "D!", "F*"], cx);
-    }
-
-    #[gpui::test]
-    async fn test_can_open_one_item_when_all_tabs_are_dirty_at_max(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        set_max_tabs(cx, Some(3));
-
-        add_labeled_item(&pane, "A", true, cx);
-        assert_item_labels(&pane, ["A*^"], cx);
-
-        add_labeled_item(&pane, "B", true, cx);
-        assert_item_labels(&pane, ["A^", "B*^"], cx);
-
-        add_labeled_item(&pane, "C", true, cx);
-        assert_item_labels(&pane, ["A^", "B^", "C*^"], cx);
-
-        add_labeled_item(&pane, "D", false, cx);
-        assert_item_labels(&pane, ["A^", "B^", "C^", "D*"], cx);
-
-        add_labeled_item(&pane, "E", false, cx);
-        assert_item_labels(&pane, ["A^", "B^", "C^", "E*"], cx);
-
-        add_labeled_item(&pane, "F", false, cx);
-        assert_item_labels(&pane, ["A^", "B^", "C^", "F*"], cx);
-
-        add_labeled_item(&pane, "G", true, cx);
-        assert_item_labels(&pane, ["A^", "B^", "C^", "G*^"], cx);
-    }
-
-    #[gpui::test]
-    async fn test_toggle_pin_tab(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        set_labeled_items(&pane, ["A", "B*", "C"], cx);
-        assert_item_labels(&pane, ["A", "B*", "C"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            pane.toggle_pin_tab(&TogglePinTab, window, cx);
-        });
-        assert_item_labels(&pane, ["B*!", "A", "C"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            pane.toggle_pin_tab(&TogglePinTab, window, cx);
-        });
-        assert_item_labels(&pane, ["B*", "A", "C"], cx);
-    }
-
-    #[gpui::test]
-    async fn test_unpin_all_tabs(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        // Unpin all, in an empty pane
-        pane.update_in(cx, |pane, window, cx| {
-            pane.unpin_all_tabs(&UnpinAllTabs, window, cx);
-        });
-
-        assert_item_labels(&pane, [], cx);
-
-        let item_a = add_labeled_item(&pane, "A", false, cx);
-        let item_b = add_labeled_item(&pane, "B", false, cx);
-        let item_c = add_labeled_item(&pane, "C", false, cx);
-        assert_item_labels(&pane, ["A", "B", "C*"], cx);
-
-        // Unpin all, when no tabs are pinned
-        pane.update_in(cx, |pane, window, cx| {
-            pane.unpin_all_tabs(&UnpinAllTabs, window, cx);
-        });
-
-        assert_item_labels(&pane, ["A", "B", "C*"], cx);
-
-        // Pin inactive tabs only
-        pane.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_a.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-
-            let ix = pane.index_for_item_id(item_b.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-        });
-        assert_item_labels(&pane, ["A!", "B!", "C*"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            pane.unpin_all_tabs(&UnpinAllTabs, window, cx);
-        });
-
-        assert_item_labels(&pane, ["A", "B", "C*"], cx);
-
-        // Pin all tabs
-        pane.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_a.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-
-            let ix = pane.index_for_item_id(item_b.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-
-            let ix = pane.index_for_item_id(item_c.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-        });
-        assert_item_labels(&pane, ["A!", "B!", "C*!"], cx);
-
-        // Activate middle tab
-        pane.update_in(cx, |pane, window, cx| {
-            pane.activate_item(1, false, false, window, cx);
-        });
-        assert_item_labels(&pane, ["A!", "B*!", "C!"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            pane.unpin_all_tabs(&UnpinAllTabs, window, cx);
-        });
-
-        // Order has not changed
-        assert_item_labels(&pane, ["A", "B*", "C"], cx);
-    }
-
-    #[gpui::test]
-    async fn test_pinning_active_tab_without_position_change_maintains_focus(
-        cx: &mut TestAppContext,
-    ) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        // Add A
-        let item_a = add_labeled_item(&pane, "A", false, cx);
-        assert_item_labels(&pane, ["A*"], cx);
-
-        // Add B
-        add_labeled_item(&pane, "B", false, cx);
-        assert_item_labels(&pane, ["A", "B*"], cx);
-
-        // Activate A again
-        pane.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_a.item_id()).unwrap();
-            pane.activate_item(ix, true, true, window, cx);
-        });
-        assert_item_labels(&pane, ["A*", "B"], cx);
-
-        // Pin A - remains active
-        pane.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_a.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-        });
-        assert_item_labels(&pane, ["A*!", "B"], cx);
-
-        // Unpin A - remain active
-        pane.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_a.item_id()).unwrap();
-            pane.unpin_tab_at(ix, window, cx);
-        });
-        assert_item_labels(&pane, ["A*", "B"], cx);
-    }
-
-    #[gpui::test]
-    async fn test_pinning_active_tab_with_position_change_maintains_focus(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        // Add A, B, C
-        add_labeled_item(&pane, "A", false, cx);
-        add_labeled_item(&pane, "B", false, cx);
-        let item_c = add_labeled_item(&pane, "C", false, cx);
-        assert_item_labels(&pane, ["A", "B", "C*"], cx);
-
-        // Pin C - moves to pinned area, remains active
-        pane.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_c.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-        });
-        assert_item_labels(&pane, ["C*!", "A", "B"], cx);
-
-        // Unpin C - moves after pinned area, remains active
-        pane.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_c.item_id()).unwrap();
-            pane.unpin_tab_at(ix, window, cx);
-        });
-        assert_item_labels(&pane, ["C*", "A", "B"], cx);
-    }
-
-    #[gpui::test]
-    async fn test_pinning_inactive_tab_without_position_change_preserves_existing_focus(
-        cx: &mut TestAppContext,
-    ) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        // Add A, B
-        let item_a = add_labeled_item(&pane, "A", false, cx);
-        add_labeled_item(&pane, "B", false, cx);
-        assert_item_labels(&pane, ["A", "B*"], cx);
-
-        // Pin A - already in pinned area, B remains active
-        pane.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_a.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-        });
-        assert_item_labels(&pane, ["A!", "B*"], cx);
-
-        // Unpin A - stays in place, B remains active
-        pane.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_a.item_id()).unwrap();
-            pane.unpin_tab_at(ix, window, cx);
-        });
-        assert_item_labels(&pane, ["A", "B*"], cx);
-    }
-
-    #[gpui::test]
-    async fn test_pinning_inactive_tab_with_position_change_preserves_existing_focus(
-        cx: &mut TestAppContext,
-    ) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        // Add A, B, C
-        add_labeled_item(&pane, "A", false, cx);
-        let item_b = add_labeled_item(&pane, "B", false, cx);
-        let item_c = add_labeled_item(&pane, "C", false, cx);
-        assert_item_labels(&pane, ["A", "B", "C*"], cx);
-
-        // Activate B
-        pane.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_b.item_id()).unwrap();
-            pane.activate_item(ix, true, true, window, cx);
-        });
-        assert_item_labels(&pane, ["A", "B*", "C"], cx);
-
-        // Pin C - moves to pinned area, B remains active
-        pane.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_c.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-        });
-        assert_item_labels(&pane, ["C!", "A", "B*"], cx);
-
-        // Unpin C - moves after pinned area, B remains active
-        pane.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_c.item_id()).unwrap();
-            pane.unpin_tab_at(ix, window, cx);
-        });
-        assert_item_labels(&pane, ["C", "A", "B*"], cx);
-    }
-
-    #[gpui::test]
-    async fn test_drag_unpinned_tab_to_split_creates_pane_with_unpinned_tab(
-        cx: &mut TestAppContext,
-    ) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane_a = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        // Add A, B. Pin B. Activate A
-        let item_a = add_labeled_item(&pane_a, "A", false, cx);
-        let item_b = add_labeled_item(&pane_a, "B", false, cx);
-
-        pane_a.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_b.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-
-            let ix = pane.index_for_item_id(item_a.item_id()).unwrap();
-            pane.activate_item(ix, true, true, window, cx);
-        });
-
-        // Drag A to create new split
-        pane_a.update_in(cx, |pane, window, cx| {
-            pane.drag_split_direction = Some(SplitDirection::Right);
-
-            let dragged_tab = DraggedTab {
-                pane: pane_a.clone(),
-                item: item_a.boxed_clone(),
-                ix: 0,
-                detail: 0,
-                is_active: true,
-            };
-            pane.handle_tab_drop(&dragged_tab, 0, window, cx);
-        });
-
-        // A should be moved to new pane. B should remain pinned, A should not be pinned
-        let (pane_a, pane_b) = workspace.read_with(cx, |workspace, _| {
-            let panes = workspace.panes();
-            (panes[0].clone(), panes[1].clone())
-        });
-        assert_item_labels(&pane_a, ["B*!"], cx);
-        assert_item_labels(&pane_b, ["A*"], cx);
-    }
-
-    #[gpui::test]
-    async fn test_drag_pinned_tab_to_split_creates_pane_with_pinned_tab(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane_a = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        // Add A, B. Pin both. Activate A
-        let item_a = add_labeled_item(&pane_a, "A", false, cx);
-        let item_b = add_labeled_item(&pane_a, "B", false, cx);
-
-        pane_a.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_a.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-
-            let ix = pane.index_for_item_id(item_b.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-
-            let ix = pane.index_for_item_id(item_a.item_id()).unwrap();
-            pane.activate_item(ix, true, true, window, cx);
-        });
-        assert_item_labels(&pane_a, ["A*!", "B!"], cx);
-
-        // Drag A to create new split
-        pane_a.update_in(cx, |pane, window, cx| {
-            pane.drag_split_direction = Some(SplitDirection::Right);
-
-            let dragged_tab = DraggedTab {
-                pane: pane_a.clone(),
-                item: item_a.boxed_clone(),
-                ix: 0,
-                detail: 0,
-                is_active: true,
-            };
-            pane.handle_tab_drop(&dragged_tab, 0, window, cx);
-        });
-
-        // A should be moved to new pane. Both A and B should still be pinned
-        let (pane_a, pane_b) = workspace.read_with(cx, |workspace, _| {
-            let panes = workspace.panes();
-            (panes[0].clone(), panes[1].clone())
-        });
-        assert_item_labels(&pane_a, ["B*!"], cx);
-        assert_item_labels(&pane_b, ["A*!"], cx);
-    }
-
-    #[gpui::test]
-    async fn test_drag_pinned_tab_into_existing_panes_pinned_region(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane_a = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        // Add A to pane A and pin
-        let item_a = add_labeled_item(&pane_a, "A", false, cx);
-        pane_a.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_a.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-        });
-        assert_item_labels(&pane_a, ["A*!"], cx);
-
-        // Add B to pane B and pin
-        let pane_b = workspace.update_in(cx, |workspace, window, cx| {
-            workspace.split_pane(pane_a.clone(), SplitDirection::Right, window, cx)
-        });
-        let item_b = add_labeled_item(&pane_b, "B", false, cx);
-        pane_b.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_b.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-        });
-        assert_item_labels(&pane_b, ["B*!"], cx);
-
-        // Move A from pane A to pane B's pinned region
-        pane_b.update_in(cx, |pane, window, cx| {
-            let dragged_tab = DraggedTab {
-                pane: pane_a.clone(),
-                item: item_a.boxed_clone(),
-                ix: 0,
-                detail: 0,
-                is_active: true,
-            };
-            pane.handle_tab_drop(&dragged_tab, 0, window, cx);
-        });
-
-        // A should stay pinned
-        assert_item_labels(&pane_a, [], cx);
-        assert_item_labels(&pane_b, ["A*!", "B!"], cx);
-    }
-
-    #[gpui::test]
-    async fn test_drag_pinned_tab_into_existing_panes_unpinned_region(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane_a = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        // Add A to pane A and pin
-        let item_a = add_labeled_item(&pane_a, "A", false, cx);
-        pane_a.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_a.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-        });
-        assert_item_labels(&pane_a, ["A*!"], cx);
-
-        // Create pane B with pinned item B
-        let pane_b = workspace.update_in(cx, |workspace, window, cx| {
-            workspace.split_pane(pane_a.clone(), SplitDirection::Right, window, cx)
-        });
-        let item_b = add_labeled_item(&pane_b, "B", false, cx);
-        assert_item_labels(&pane_b, ["B*"], cx);
-
-        pane_b.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_b.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-        });
-        assert_item_labels(&pane_b, ["B*!"], cx);
-
-        // Move A from pane A to pane B's unpinned region
-        pane_b.update_in(cx, |pane, window, cx| {
-            let dragged_tab = DraggedTab {
-                pane: pane_a.clone(),
-                item: item_a.boxed_clone(),
-                ix: 0,
-                detail: 0,
-                is_active: true,
-            };
-            pane.handle_tab_drop(&dragged_tab, 1, window, cx);
-        });
-
-        // A should become pinned
-        assert_item_labels(&pane_a, [], cx);
-        assert_item_labels(&pane_b, ["B!", "A*"], cx);
-    }
-
-    #[gpui::test]
-    async fn test_drag_pinned_tab_into_existing_panes_first_position_with_no_pinned_tabs(
-        cx: &mut TestAppContext,
-    ) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane_a = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        // Add A to pane A and pin
-        let item_a = add_labeled_item(&pane_a, "A", false, cx);
-        pane_a.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_a.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-        });
-        assert_item_labels(&pane_a, ["A*!"], cx);
-
-        // Add B to pane B
-        let pane_b = workspace.update_in(cx, |workspace, window, cx| {
-            workspace.split_pane(pane_a.clone(), SplitDirection::Right, window, cx)
-        });
-        add_labeled_item(&pane_b, "B", false, cx);
-        assert_item_labels(&pane_b, ["B*"], cx);
-
-        // Move A from pane A to position 0 in pane B, indicating it should stay pinned
-        pane_b.update_in(cx, |pane, window, cx| {
-            let dragged_tab = DraggedTab {
-                pane: pane_a.clone(),
-                item: item_a.boxed_clone(),
-                ix: 0,
-                detail: 0,
-                is_active: true,
-            };
-            pane.handle_tab_drop(&dragged_tab, 0, window, cx);
-        });
-
-        // A should stay pinned
-        assert_item_labels(&pane_a, [], cx);
-        assert_item_labels(&pane_b, ["A*!", "B"], cx);
-    }
-
-    #[gpui::test]
-    async fn test_drag_pinned_tab_into_existing_pane_at_max_capacity_closes_unpinned_tabs(
-        cx: &mut TestAppContext,
-    ) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane_a = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-        set_max_tabs(cx, Some(2));
-
-        // Add A, B to pane A. Pin both
-        let item_a = add_labeled_item(&pane_a, "A", false, cx);
-        let item_b = add_labeled_item(&pane_a, "B", false, cx);
-        pane_a.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_a.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-
-            let ix = pane.index_for_item_id(item_b.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-        });
-        assert_item_labels(&pane_a, ["A!", "B*!"], cx);
-
-        // Add C, D to pane B. Pin both
-        let pane_b = workspace.update_in(cx, |workspace, window, cx| {
-            workspace.split_pane(pane_a.clone(), SplitDirection::Right, window, cx)
-        });
-        let item_c = add_labeled_item(&pane_b, "C", false, cx);
-        let item_d = add_labeled_item(&pane_b, "D", false, cx);
-        pane_b.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_c.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-
-            let ix = pane.index_for_item_id(item_d.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-        });
-        assert_item_labels(&pane_b, ["C!", "D*!"], cx);
-
-        // Add a third unpinned item to pane B (exceeds max tabs), but is allowed,
-        // as we allow 1 tab over max if the others are pinned or dirty
-        add_labeled_item(&pane_b, "E", false, cx);
-        assert_item_labels(&pane_b, ["C!", "D!", "E*"], cx);
-
-        // Drag pinned A from pane A to position 0 in pane B
-        pane_b.update_in(cx, |pane, window, cx| {
-            let dragged_tab = DraggedTab {
-                pane: pane_a.clone(),
-                item: item_a.boxed_clone(),
-                ix: 0,
-                detail: 0,
-                is_active: true,
-            };
-            pane.handle_tab_drop(&dragged_tab, 0, window, cx);
-        });
-
-        // E (unpinned) should be closed, leaving 3 pinned items
-        assert_item_labels(&pane_a, ["B*!"], cx);
-        assert_item_labels(&pane_b, ["A*!", "C!", "D!"], cx);
-    }
-
-    #[gpui::test]
-    async fn test_drag_last_pinned_tab_to_same_position_stays_pinned(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane_a = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        // Add A to pane A and pin it
-        let item_a = add_labeled_item(&pane_a, "A", false, cx);
-        pane_a.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_a.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-        });
-        assert_item_labels(&pane_a, ["A*!"], cx);
-
-        // Drag pinned A to position 1 (directly to the right) in the same pane
-        pane_a.update_in(cx, |pane, window, cx| {
-            let dragged_tab = DraggedTab {
-                pane: pane_a.clone(),
-                item: item_a.boxed_clone(),
-                ix: 0,
-                detail: 0,
-                is_active: true,
-            };
-            pane.handle_tab_drop(&dragged_tab, 1, window, cx);
-        });
-
-        // A should still be pinned and active
-        assert_item_labels(&pane_a, ["A*!"], cx);
-    }
-
-    #[gpui::test]
-    async fn test_drag_pinned_tab_beyond_last_pinned_tab_in_same_pane_stays_pinned(
-        cx: &mut TestAppContext,
-    ) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane_a = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        // Add A, B to pane A and pin both
-        let item_a = add_labeled_item(&pane_a, "A", false, cx);
-        let item_b = add_labeled_item(&pane_a, "B", false, cx);
-        pane_a.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_a.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-
-            let ix = pane.index_for_item_id(item_b.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-        });
-        assert_item_labels(&pane_a, ["A!", "B*!"], cx);
-
-        // Drag pinned A right of B in the same pane
-        pane_a.update_in(cx, |pane, window, cx| {
-            let dragged_tab = DraggedTab {
-                pane: pane_a.clone(),
-                item: item_a.boxed_clone(),
-                ix: 0,
-                detail: 0,
-                is_active: true,
-            };
-            pane.handle_tab_drop(&dragged_tab, 2, window, cx);
-        });
-
-        // A stays pinned
-        assert_item_labels(&pane_a, ["B!", "A*!"], cx);
-    }
-
-    #[gpui::test]
-    async fn test_dragging_pinned_tab_onto_unpinned_tab_reduces_unpinned_tab_count(
-        cx: &mut TestAppContext,
-    ) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane_a = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        // Add A, B to pane A and pin A
-        let item_a = add_labeled_item(&pane_a, "A", false, cx);
-        add_labeled_item(&pane_a, "B", false, cx);
-        pane_a.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_a.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-        });
-        assert_item_labels(&pane_a, ["A!", "B*"], cx);
-
-        // Drag pinned A on top of B in the same pane, which changes tab order to B, A
-        pane_a.update_in(cx, |pane, window, cx| {
-            let dragged_tab = DraggedTab {
-                pane: pane_a.clone(),
-                item: item_a.boxed_clone(),
-                ix: 0,
-                detail: 0,
-                is_active: true,
-            };
-            pane.handle_tab_drop(&dragged_tab, 1, window, cx);
-        });
-
-        // Neither are pinned
-        assert_item_labels(&pane_a, ["B", "A*"], cx);
-    }
-
-    #[gpui::test]
-    async fn test_drag_pinned_tab_beyond_unpinned_tab_in_same_pane_becomes_unpinned(
-        cx: &mut TestAppContext,
-    ) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane_a = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        // Add A, B to pane A and pin A
-        let item_a = add_labeled_item(&pane_a, "A", false, cx);
-        add_labeled_item(&pane_a, "B", false, cx);
-        pane_a.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_a.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-        });
-        assert_item_labels(&pane_a, ["A!", "B*"], cx);
-
-        // Drag pinned A right of B in the same pane
-        pane_a.update_in(cx, |pane, window, cx| {
-            let dragged_tab = DraggedTab {
-                pane: pane_a.clone(),
-                item: item_a.boxed_clone(),
-                ix: 0,
-                detail: 0,
-                is_active: true,
-            };
-            pane.handle_tab_drop(&dragged_tab, 2, window, cx);
-        });
-
-        // A becomes unpinned
-        assert_item_labels(&pane_a, ["B", "A*"], cx);
-    }
-
-    #[gpui::test]
-    async fn test_drag_unpinned_tab_in_front_of_pinned_tab_in_same_pane_becomes_pinned(
-        cx: &mut TestAppContext,
-    ) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane_a = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        // Add A, B to pane A and pin A
-        let item_a = add_labeled_item(&pane_a, "A", false, cx);
-        let item_b = add_labeled_item(&pane_a, "B", false, cx);
-        pane_a.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_a.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-        });
-        assert_item_labels(&pane_a, ["A!", "B*"], cx);
-
-        // Drag pinned B left of A in the same pane
-        pane_a.update_in(cx, |pane, window, cx| {
-            let dragged_tab = DraggedTab {
-                pane: pane_a.clone(),
-                item: item_b.boxed_clone(),
-                ix: 1,
-                detail: 0,
-                is_active: true,
-            };
-            pane.handle_tab_drop(&dragged_tab, 0, window, cx);
-        });
-
-        // A becomes unpinned
-        assert_item_labels(&pane_a, ["B*!", "A!"], cx);
-    }
-
-    #[gpui::test]
-    async fn test_drag_unpinned_tab_to_the_pinned_region_stays_pinned(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane_a = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        // Add A, B, C to pane A and pin A
-        let item_a = add_labeled_item(&pane_a, "A", false, cx);
-        add_labeled_item(&pane_a, "B", false, cx);
-        let item_c = add_labeled_item(&pane_a, "C", false, cx);
-        pane_a.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_a.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-        });
-        assert_item_labels(&pane_a, ["A!", "B", "C*"], cx);
-
-        // Drag pinned C left of B in the same pane
-        pane_a.update_in(cx, |pane, window, cx| {
-            let dragged_tab = DraggedTab {
-                pane: pane_a.clone(),
-                item: item_c.boxed_clone(),
-                ix: 2,
-                detail: 0,
-                is_active: true,
-            };
-            pane.handle_tab_drop(&dragged_tab, 1, window, cx);
-        });
-
-        // A stays pinned, B and C remain unpinned
-        assert_item_labels(&pane_a, ["A!", "C*", "B"], cx);
-    }
-
-    #[gpui::test]
-    async fn test_drag_unpinned_tab_into_existing_panes_pinned_region(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane_a = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        // Add unpinned item A to pane A
-        let item_a = add_labeled_item(&pane_a, "A", false, cx);
-        assert_item_labels(&pane_a, ["A*"], cx);
-
-        // Create pane B with pinned item B
-        let pane_b = workspace.update_in(cx, |workspace, window, cx| {
-            workspace.split_pane(pane_a.clone(), SplitDirection::Right, window, cx)
-        });
-        let item_b = add_labeled_item(&pane_b, "B", false, cx);
-        pane_b.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_b.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-        });
-        assert_item_labels(&pane_b, ["B*!"], cx);
-
-        // Move A from pane A to pane B's pinned region
-        pane_b.update_in(cx, |pane, window, cx| {
-            let dragged_tab = DraggedTab {
-                pane: pane_a.clone(),
-                item: item_a.boxed_clone(),
-                ix: 0,
-                detail: 0,
-                is_active: true,
-            };
-            pane.handle_tab_drop(&dragged_tab, 0, window, cx);
-        });
-
-        // A should become pinned since it was dropped in the pinned region
-        assert_item_labels(&pane_a, [], cx);
-        assert_item_labels(&pane_b, ["A*!", "B!"], cx);
-    }
-
-    #[gpui::test]
-    async fn test_drag_unpinned_tab_into_existing_panes_unpinned_region(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane_a = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        // Add unpinned item A to pane A
-        let item_a = add_labeled_item(&pane_a, "A", false, cx);
-        assert_item_labels(&pane_a, ["A*"], cx);
-
-        // Create pane B with one pinned item B
-        let pane_b = workspace.update_in(cx, |workspace, window, cx| {
-            workspace.split_pane(pane_a.clone(), SplitDirection::Right, window, cx)
-        });
-        let item_b = add_labeled_item(&pane_b, "B", false, cx);
-        pane_b.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_b.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-        });
-        assert_item_labels(&pane_b, ["B*!"], cx);
-
-        // Move A from pane A to pane B's unpinned region
-        pane_b.update_in(cx, |pane, window, cx| {
-            let dragged_tab = DraggedTab {
-                pane: pane_a.clone(),
-                item: item_a.boxed_clone(),
-                ix: 0,
-                detail: 0,
-                is_active: true,
-            };
-            pane.handle_tab_drop(&dragged_tab, 1, window, cx);
-        });
-
-        // A should remain unpinned since it was dropped outside the pinned region
-        assert_item_labels(&pane_a, [], cx);
-        assert_item_labels(&pane_b, ["B!", "A*"], cx);
-    }
-
-    #[gpui::test]
-    async fn test_drag_pinned_tab_throughout_entire_range_of_pinned_tabs_both_directions(
-        cx: &mut TestAppContext,
-    ) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane_a = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        // Add A, B, C and pin all
-        let item_a = add_labeled_item(&pane_a, "A", false, cx);
-        let item_b = add_labeled_item(&pane_a, "B", false, cx);
-        let item_c = add_labeled_item(&pane_a, "C", false, cx);
-        assert_item_labels(&pane_a, ["A", "B", "C*"], cx);
-
-        pane_a.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_a.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-
-            let ix = pane.index_for_item_id(item_b.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-
-            let ix = pane.index_for_item_id(item_c.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-        });
-        assert_item_labels(&pane_a, ["A!", "B!", "C*!"], cx);
-
-        // Move A to right of B
-        pane_a.update_in(cx, |pane, window, cx| {
-            let dragged_tab = DraggedTab {
-                pane: pane_a.clone(),
-                item: item_a.boxed_clone(),
-                ix: 0,
-                detail: 0,
-                is_active: true,
-            };
-            pane.handle_tab_drop(&dragged_tab, 1, window, cx);
-        });
-
-        // A should be after B and all are pinned
-        assert_item_labels(&pane_a, ["B!", "A*!", "C!"], cx);
-
-        // Move A to right of C
-        pane_a.update_in(cx, |pane, window, cx| {
-            let dragged_tab = DraggedTab {
-                pane: pane_a.clone(),
-                item: item_a.boxed_clone(),
-                ix: 1,
-                detail: 0,
-                is_active: true,
-            };
-            pane.handle_tab_drop(&dragged_tab, 2, window, cx);
-        });
-
-        // A should be after C and all are pinned
-        assert_item_labels(&pane_a, ["B!", "C!", "A*!"], cx);
-
-        // Move A to left of C
-        pane_a.update_in(cx, |pane, window, cx| {
-            let dragged_tab = DraggedTab {
-                pane: pane_a.clone(),
-                item: item_a.boxed_clone(),
-                ix: 2,
-                detail: 0,
-                is_active: true,
-            };
-            pane.handle_tab_drop(&dragged_tab, 1, window, cx);
-        });
-
-        // A should be before C and all are pinned
-        assert_item_labels(&pane_a, ["B!", "A*!", "C!"], cx);
-
-        // Move A to left of B
-        pane_a.update_in(cx, |pane, window, cx| {
-            let dragged_tab = DraggedTab {
-                pane: pane_a.clone(),
-                item: item_a.boxed_clone(),
-                ix: 1,
-                detail: 0,
-                is_active: true,
-            };
-            pane.handle_tab_drop(&dragged_tab, 0, window, cx);
-        });
-
-        // A should be before B and all are pinned
-        assert_item_labels(&pane_a, ["A*!", "B!", "C!"], cx);
-    }
-
-    #[gpui::test]
-    async fn test_drag_first_tab_to_last_position(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane_a = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        // Add A, B, C
-        let item_a = add_labeled_item(&pane_a, "A", false, cx);
-        add_labeled_item(&pane_a, "B", false, cx);
-        add_labeled_item(&pane_a, "C", false, cx);
-        assert_item_labels(&pane_a, ["A", "B", "C*"], cx);
-
-        // Move A to the end
-        pane_a.update_in(cx, |pane, window, cx| {
-            let dragged_tab = DraggedTab {
-                pane: pane_a.clone(),
-                item: item_a.boxed_clone(),
-                ix: 0,
-                detail: 0,
-                is_active: true,
-            };
-            pane.handle_tab_drop(&dragged_tab, 2, window, cx);
-        });
-
-        // A should be at the end
-        assert_item_labels(&pane_a, ["B", "C", "A*"], cx);
-    }
-
-    #[gpui::test]
-    async fn test_drag_last_tab_to_first_position(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane_a = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        // Add A, B, C
-        add_labeled_item(&pane_a, "A", false, cx);
-        add_labeled_item(&pane_a, "B", false, cx);
-        let item_c = add_labeled_item(&pane_a, "C", false, cx);
-        assert_item_labels(&pane_a, ["A", "B", "C*"], cx);
-
-        // Move C to the beginning
-        pane_a.update_in(cx, |pane, window, cx| {
-            let dragged_tab = DraggedTab {
-                pane: pane_a.clone(),
-                item: item_c.boxed_clone(),
-                ix: 2,
-                detail: 0,
-                is_active: true,
-            };
-            pane.handle_tab_drop(&dragged_tab, 0, window, cx);
-        });
-
-        // C should be at the beginning
-        assert_item_labels(&pane_a, ["C*", "A", "B"], cx);
-    }
-
-    #[gpui::test]
-    async fn test_add_item_with_new_item(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        // 1. Add with a destination index
-        //   a. Add before the active item
-        set_labeled_items(&pane, ["A", "B*", "C"], cx);
-        pane.update_in(cx, |pane, window, cx| {
-            pane.add_item(
-                Box::new(cx.new(|cx| TestItem::new(cx).with_label("D"))),
-                false,
-                false,
-                Some(0),
-                window,
-                cx,
-            );
-        });
-        assert_item_labels(&pane, ["D*", "A", "B", "C"], cx);
-
-        //   b. Add after the active item
-        set_labeled_items(&pane, ["A", "B*", "C"], cx);
-        pane.update_in(cx, |pane, window, cx| {
-            pane.add_item(
-                Box::new(cx.new(|cx| TestItem::new(cx).with_label("D"))),
-                false,
-                false,
-                Some(2),
-                window,
-                cx,
-            );
-        });
-        assert_item_labels(&pane, ["A", "B", "D*", "C"], cx);
-
-        //   c. Add at the end of the item list (including off the length)
-        set_labeled_items(&pane, ["A", "B*", "C"], cx);
-        pane.update_in(cx, |pane, window, cx| {
-            pane.add_item(
-                Box::new(cx.new(|cx| TestItem::new(cx).with_label("D"))),
-                false,
-                false,
-                Some(5),
-                window,
-                cx,
-            );
-        });
-        assert_item_labels(&pane, ["A", "B", "C", "D*"], cx);
-
-        // 2. Add without a destination index
-        //   a. Add with active item at the start of the item list
-        set_labeled_items(&pane, ["A*", "B", "C"], cx);
-        pane.update_in(cx, |pane, window, cx| {
-            pane.add_item(
-                Box::new(cx.new(|cx| TestItem::new(cx).with_label("D"))),
-                false,
-                false,
-                None,
-                window,
-                cx,
-            );
-        });
-        set_labeled_items(&pane, ["A", "D*", "B", "C"], cx);
-
-        //   b. Add with active item at the end of the item list
-        set_labeled_items(&pane, ["A", "B", "C*"], cx);
-        pane.update_in(cx, |pane, window, cx| {
-            pane.add_item(
-                Box::new(cx.new(|cx| TestItem::new(cx).with_label("D"))),
-                false,
-                false,
-                None,
-                window,
-                cx,
-            );
-        });
-        assert_item_labels(&pane, ["A", "B", "C", "D*"], cx);
-    }
-
-    #[gpui::test]
-    async fn test_add_item_with_existing_item(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        // 1. Add with a destination index
-        //   1a. Add before the active item
-        let [_, _, _, d] = set_labeled_items(&pane, ["A", "B*", "C", "D"], cx);
-        pane.update_in(cx, |pane, window, cx| {
-            pane.add_item(d, false, false, Some(0), window, cx);
-        });
-        assert_item_labels(&pane, ["D*", "A", "B", "C"], cx);
-
-        //   1b. Add after the active item
-        let [_, _, _, d] = set_labeled_items(&pane, ["A", "B*", "C", "D"], cx);
-        pane.update_in(cx, |pane, window, cx| {
-            pane.add_item(d, false, false, Some(2), window, cx);
-        });
-        assert_item_labels(&pane, ["A", "B", "D*", "C"], cx);
-
-        //   1c. Add at the end of the item list (including off the length)
-        let [a, _, _, _] = set_labeled_items(&pane, ["A", "B*", "C", "D"], cx);
-        pane.update_in(cx, |pane, window, cx| {
-            pane.add_item(a, false, false, Some(5), window, cx);
-        });
-        assert_item_labels(&pane, ["B", "C", "D", "A*"], cx);
-
-        //   1d. Add same item to active index
-        let [_, b, _] = set_labeled_items(&pane, ["A", "B*", "C"], cx);
-        pane.update_in(cx, |pane, window, cx| {
-            pane.add_item(b, false, false, Some(1), window, cx);
-        });
-        assert_item_labels(&pane, ["A", "B*", "C"], cx);
-
-        //   1e. Add item to index after same item in last position
-        let [_, _, c] = set_labeled_items(&pane, ["A", "B*", "C"], cx);
-        pane.update_in(cx, |pane, window, cx| {
-            pane.add_item(c, false, false, Some(2), window, cx);
-        });
-        assert_item_labels(&pane, ["A", "B", "C*"], cx);
-
-        // 2. Add without a destination index
-        //   2a. Add with active item at the start of the item list
-        let [_, _, _, d] = set_labeled_items(&pane, ["A*", "B", "C", "D"], cx);
-        pane.update_in(cx, |pane, window, cx| {
-            pane.add_item(d, false, false, None, window, cx);
-        });
-        assert_item_labels(&pane, ["A", "D*", "B", "C"], cx);
-
-        //   2b. Add with active item at the end of the item list
-        let [a, _, _, _] = set_labeled_items(&pane, ["A", "B", "C", "D*"], cx);
-        pane.update_in(cx, |pane, window, cx| {
-            pane.add_item(a, false, false, None, window, cx);
-        });
-        assert_item_labels(&pane, ["B", "C", "D", "A*"], cx);
-
-        //   2c. Add active item to active item at end of list
-        let [_, _, c] = set_labeled_items(&pane, ["A", "B", "C*"], cx);
-        pane.update_in(cx, |pane, window, cx| {
-            pane.add_item(c, false, false, None, window, cx);
-        });
-        assert_item_labels(&pane, ["A", "B", "C*"], cx);
-
-        //   2d. Add active item to active item at start of list
-        let [a, _, _] = set_labeled_items(&pane, ["A*", "B", "C"], cx);
-        pane.update_in(cx, |pane, window, cx| {
-            pane.add_item(a, false, false, None, window, cx);
-        });
-        assert_item_labels(&pane, ["A*", "B", "C"], cx);
-    }
-
-    #[gpui::test]
-    async fn test_add_item_with_same_project_entries(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        // singleton view
-        pane.update_in(cx, |pane, window, cx| {
-            pane.add_item(
-                Box::new(cx.new(|cx| {
-                    TestItem::new(cx)
-                        .with_buffer_kind(ItemBufferKind::Singleton)
-                        .with_label("buffer 1")
-                        .with_project_items(&[TestProjectItem::new(1, "one.txt", cx)])
-                })),
-                false,
-                false,
-                None,
-                window,
-                cx,
-            );
-        });
-        assert_item_labels(&pane, ["buffer 1*"], cx);
-
-        // new singleton view with the same project entry
-        pane.update_in(cx, |pane, window, cx| {
-            pane.add_item(
-                Box::new(cx.new(|cx| {
-                    TestItem::new(cx)
-                        .with_buffer_kind(ItemBufferKind::Singleton)
-                        .with_label("buffer 1")
-                        .with_project_items(&[TestProjectItem::new(1, "1.txt", cx)])
-                })),
-                false,
-                false,
-                None,
-                window,
-                cx,
-            );
-        });
-        assert_item_labels(&pane, ["buffer 1*"], cx);
-
-        // new singleton view with different project entry
-        pane.update_in(cx, |pane, window, cx| {
-            pane.add_item(
-                Box::new(cx.new(|cx| {
-                    TestItem::new(cx)
-                        .with_buffer_kind(ItemBufferKind::Singleton)
-                        .with_label("buffer 2")
-                        .with_project_items(&[TestProjectItem::new(2, "2.txt", cx)])
-                })),
-                false,
-                false,
-                None,
-                window,
-                cx,
-            );
-        });
-        assert_item_labels(&pane, ["buffer 1", "buffer 2*"], cx);
-
-        // new multibuffer view with the same project entry
-        pane.update_in(cx, |pane, window, cx| {
-            pane.add_item(
-                Box::new(cx.new(|cx| {
-                    TestItem::new(cx)
-                        .with_buffer_kind(ItemBufferKind::Multibuffer)
-                        .with_label("multibuffer 1")
-                        .with_project_items(&[TestProjectItem::new(1, "1.txt", cx)])
-                })),
-                false,
-                false,
-                None,
-                window,
-                cx,
-            );
-        });
-        assert_item_labels(&pane, ["buffer 1", "buffer 2", "multibuffer 1*"], cx);
-
-        // another multibuffer view with the same project entry
-        pane.update_in(cx, |pane, window, cx| {
-            pane.add_item(
-                Box::new(cx.new(|cx| {
-                    TestItem::new(cx)
-                        .with_buffer_kind(ItemBufferKind::Multibuffer)
-                        .with_label("multibuffer 1b")
-                        .with_project_items(&[TestProjectItem::new(1, "1.txt", cx)])
-                })),
-                false,
-                false,
-                None,
-                window,
-                cx,
-            );
-        });
-        assert_item_labels(
-            &pane,
-            ["buffer 1", "buffer 2", "multibuffer 1", "multibuffer 1b*"],
-            cx,
-        );
-    }
-
-    #[gpui::test]
-    async fn test_remove_item_ordering_history(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        add_labeled_item(&pane, "A", false, cx);
-        add_labeled_item(&pane, "B", false, cx);
-        add_labeled_item(&pane, "C", false, cx);
-        add_labeled_item(&pane, "D", false, cx);
-        assert_item_labels(&pane, ["A", "B", "C", "D*"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            pane.activate_item(1, false, false, window, cx)
-        });
-        add_labeled_item(&pane, "1", false, cx);
-        assert_item_labels(&pane, ["A", "B", "1*", "C", "D"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            pane.close_active_item(
-                &CloseActiveItem {
-                    save_intent: None,
-                    close_pinned: false,
-                },
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-        assert_item_labels(&pane, ["A", "B*", "C", "D"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            pane.activate_item(3, false, false, window, cx)
-        });
-        assert_item_labels(&pane, ["A", "B", "C", "D*"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            pane.close_active_item(
-                &CloseActiveItem {
-                    save_intent: None,
-                    close_pinned: false,
-                },
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-        assert_item_labels(&pane, ["A", "B*", "C"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            pane.close_active_item(
-                &CloseActiveItem {
-                    save_intent: None,
-                    close_pinned: false,
-                },
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-        assert_item_labels(&pane, ["A", "C*"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            pane.close_active_item(
-                &CloseActiveItem {
-                    save_intent: None,
-                    close_pinned: false,
-                },
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-        assert_item_labels(&pane, ["A*"], cx);
-    }
-
-    #[gpui::test]
-    async fn test_remove_item_ordering_neighbour(cx: &mut TestAppContext) {
-        init_test(cx);
-        cx.update_global::<SettingsStore, ()>(|s, cx| {
-            s.update_user_settings(cx, |s| {
-                s.tabs.get_or_insert_default().activate_on_close = Some(ActivateOnClose::Neighbour);
-            });
-        });
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        add_labeled_item(&pane, "A", false, cx);
-        add_labeled_item(&pane, "B", false, cx);
-        add_labeled_item(&pane, "C", false, cx);
-        add_labeled_item(&pane, "D", false, cx);
-        assert_item_labels(&pane, ["A", "B", "C", "D*"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            pane.activate_item(1, false, false, window, cx)
-        });
-        add_labeled_item(&pane, "1", false, cx);
-        assert_item_labels(&pane, ["A", "B", "1*", "C", "D"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            pane.close_active_item(
-                &CloseActiveItem {
-                    save_intent: None,
-                    close_pinned: false,
-                },
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-        assert_item_labels(&pane, ["A", "B", "C*", "D"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            pane.activate_item(3, false, false, window, cx)
-        });
-        assert_item_labels(&pane, ["A", "B", "C", "D*"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            pane.close_active_item(
-                &CloseActiveItem {
-                    save_intent: None,
-                    close_pinned: false,
-                },
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-        assert_item_labels(&pane, ["A", "B", "C*"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            pane.close_active_item(
-                &CloseActiveItem {
-                    save_intent: None,
-                    close_pinned: false,
-                },
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-        assert_item_labels(&pane, ["A", "B*"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            pane.close_active_item(
-                &CloseActiveItem {
-                    save_intent: None,
-                    close_pinned: false,
-                },
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-        assert_item_labels(&pane, ["A*"], cx);
-    }
-
-    #[gpui::test]
-    async fn test_remove_item_ordering_left_neighbour(cx: &mut TestAppContext) {
-        init_test(cx);
-        cx.update_global::<SettingsStore, ()>(|s, cx| {
-            s.update_user_settings(cx, |s| {
-                s.tabs.get_or_insert_default().activate_on_close =
-                    Some(ActivateOnClose::LeftNeighbour);
-            });
-        });
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        add_labeled_item(&pane, "A", false, cx);
-        add_labeled_item(&pane, "B", false, cx);
-        add_labeled_item(&pane, "C", false, cx);
-        add_labeled_item(&pane, "D", false, cx);
-        assert_item_labels(&pane, ["A", "B", "C", "D*"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            pane.activate_item(1, false, false, window, cx)
-        });
-        add_labeled_item(&pane, "1", false, cx);
-        assert_item_labels(&pane, ["A", "B", "1*", "C", "D"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            pane.close_active_item(
-                &CloseActiveItem {
-                    save_intent: None,
-                    close_pinned: false,
-                },
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-        assert_item_labels(&pane, ["A", "B*", "C", "D"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            pane.activate_item(3, false, false, window, cx)
-        });
-        assert_item_labels(&pane, ["A", "B", "C", "D*"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            pane.close_active_item(
-                &CloseActiveItem {
-                    save_intent: None,
-                    close_pinned: false,
-                },
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-        assert_item_labels(&pane, ["A", "B", "C*"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            pane.activate_item(0, false, false, window, cx)
-        });
-        assert_item_labels(&pane, ["A*", "B", "C"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            pane.close_active_item(
-                &CloseActiveItem {
-                    save_intent: None,
-                    close_pinned: false,
-                },
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-        assert_item_labels(&pane, ["B*", "C"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            pane.close_active_item(
-                &CloseActiveItem {
-                    save_intent: None,
-                    close_pinned: false,
-                },
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-        assert_item_labels(&pane, ["C*"], cx);
-    }
-
-    #[gpui::test]
-    async fn test_close_inactive_items(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        let item_a = add_labeled_item(&pane, "A", false, cx);
-        pane.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_a.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-        });
-        assert_item_labels(&pane, ["A*!"], cx);
-
-        let item_b = add_labeled_item(&pane, "B", false, cx);
-        pane.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_b.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-        });
-        assert_item_labels(&pane, ["A!", "B*!"], cx);
-
-        add_labeled_item(&pane, "C", false, cx);
-        assert_item_labels(&pane, ["A!", "B!", "C*"], cx);
-
-        add_labeled_item(&pane, "D", false, cx);
-        add_labeled_item(&pane, "E", false, cx);
-        assert_item_labels(&pane, ["A!", "B!", "C", "D", "E*"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            pane.close_other_items(
-                &CloseOtherItems {
-                    save_intent: None,
-                    close_pinned: false,
-                },
-                None,
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-        assert_item_labels(&pane, ["A!", "B!", "E*"], cx);
-    }
-
-    #[gpui::test]
-    async fn test_running_close_inactive_items_via_an_inactive_item(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        add_labeled_item(&pane, "A", false, cx);
-        assert_item_labels(&pane, ["A*"], cx);
-
-        let item_b = add_labeled_item(&pane, "B", false, cx);
-        assert_item_labels(&pane, ["A", "B*"], cx);
-
-        add_labeled_item(&pane, "C", false, cx);
-        add_labeled_item(&pane, "D", false, cx);
-        add_labeled_item(&pane, "E", false, cx);
-        assert_item_labels(&pane, ["A", "B", "C", "D", "E*"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            pane.close_other_items(
-                &CloseOtherItems {
-                    save_intent: None,
-                    close_pinned: false,
-                },
-                Some(item_b.item_id()),
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-        assert_item_labels(&pane, ["B*"], cx);
-    }
-
-    #[gpui::test]
-    async fn test_close_clean_items(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        add_labeled_item(&pane, "A", true, cx);
-        add_labeled_item(&pane, "B", false, cx);
-        add_labeled_item(&pane, "C", true, cx);
-        add_labeled_item(&pane, "D", false, cx);
-        add_labeled_item(&pane, "E", false, cx);
-        assert_item_labels(&pane, ["A^", "B", "C^", "D", "E*"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            pane.close_clean_items(
-                &CloseCleanItems {
-                    close_pinned: false,
-                },
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-        assert_item_labels(&pane, ["A^", "C*^"], cx);
-    }
-
-    #[gpui::test]
-    async fn test_close_items_to_the_left(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        set_labeled_items(&pane, ["A", "B", "C*", "D", "E"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            pane.close_items_to_the_left_by_id(
-                None,
-                &CloseItemsToTheLeft {
-                    close_pinned: false,
-                },
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-        assert_item_labels(&pane, ["C*", "D", "E"], cx);
-    }
-
-    #[gpui::test]
-    async fn test_close_items_to_the_right(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        set_labeled_items(&pane, ["A", "B", "C*", "D", "E"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            pane.close_items_to_the_right_by_id(
-                None,
-                &CloseItemsToTheRight {
-                    close_pinned: false,
-                },
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-        assert_item_labels(&pane, ["A", "B", "C*"], cx);
-    }
-
-    #[gpui::test]
-    async fn test_close_all_items(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        let item_a = add_labeled_item(&pane, "A", false, cx);
-        add_labeled_item(&pane, "B", false, cx);
-        add_labeled_item(&pane, "C", false, cx);
-        assert_item_labels(&pane, ["A", "B", "C*"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_a.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-            pane.close_all_items(
-                &CloseAllItems {
-                    save_intent: None,
-                    close_pinned: false,
-                },
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-        assert_item_labels(&pane, ["A*!"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_a.item_id()).unwrap();
-            pane.unpin_tab_at(ix, window, cx);
-            pane.close_all_items(
-                &CloseAllItems {
-                    save_intent: None,
-                    close_pinned: false,
-                },
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-
-        assert_item_labels(&pane, [], cx);
-
-        add_labeled_item(&pane, "A", true, cx).update(cx, |item, cx| {
-            item.project_items
-                .push(TestProjectItem::new_dirty(1, "A.txt", cx))
-        });
-        add_labeled_item(&pane, "B", true, cx).update(cx, |item, cx| {
-            item.project_items
-                .push(TestProjectItem::new_dirty(2, "B.txt", cx))
-        });
-        add_labeled_item(&pane, "C", true, cx).update(cx, |item, cx| {
-            item.project_items
-                .push(TestProjectItem::new_dirty(3, "C.txt", cx))
-        });
-        assert_item_labels(&pane, ["A^", "B^", "C*^"], cx);
-
-        let save = pane.update_in(cx, |pane, window, cx| {
-            pane.close_all_items(
-                &CloseAllItems {
-                    save_intent: None,
-                    close_pinned: false,
-                },
-                window,
-                cx,
-            )
-        });
-
-        cx.executor().run_until_parked();
-        cx.simulate_prompt_answer("Save all");
-        save.await.unwrap();
-        assert_item_labels(&pane, [], cx);
-
-        add_labeled_item(&pane, "A", true, cx);
-        add_labeled_item(&pane, "B", true, cx);
-        add_labeled_item(&pane, "C", true, cx);
-        assert_item_labels(&pane, ["A^", "B^", "C*^"], cx);
-        let save = pane.update_in(cx, |pane, window, cx| {
-            pane.close_all_items(
-                &CloseAllItems {
-                    save_intent: None,
-                    close_pinned: false,
-                },
-                window,
-                cx,
-            )
-        });
-
-        cx.executor().run_until_parked();
-        cx.simulate_prompt_answer("Discard all");
-        save.await.unwrap();
-        assert_item_labels(&pane, [], cx);
-    }
-
-    #[gpui::test]
-    async fn test_close_multibuffer_items(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        let add_labeled_item = |pane: &Entity<Pane>,
-                                label,
-                                is_dirty,
-                                kind: ItemBufferKind,
-                                cx: &mut VisualTestContext| {
-            pane.update_in(cx, |pane, window, cx| {
-                let labeled_item = Box::new(cx.new(|cx| {
-                    TestItem::new(cx)
-                        .with_label(label)
-                        .with_dirty(is_dirty)
-                        .with_buffer_kind(kind)
-                }));
-                pane.add_item(labeled_item.clone(), false, false, None, window, cx);
-                labeled_item
-            })
-        };
-
-        let item_a = add_labeled_item(&pane, "A", false, ItemBufferKind::Multibuffer, cx);
-        add_labeled_item(&pane, "B", false, ItemBufferKind::Multibuffer, cx);
-        add_labeled_item(&pane, "C", false, ItemBufferKind::Singleton, cx);
-        assert_item_labels(&pane, ["A", "B", "C*"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_a.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-            pane.close_multibuffer_items(
-                &CloseMultibufferItems {
-                    save_intent: None,
-                    close_pinned: false,
-                },
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-        assert_item_labels(&pane, ["A!", "C*"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_a.item_id()).unwrap();
-            pane.unpin_tab_at(ix, window, cx);
-            pane.close_multibuffer_items(
-                &CloseMultibufferItems {
-                    save_intent: None,
-                    close_pinned: false,
-                },
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-
-        assert_item_labels(&pane, ["C*"], cx);
-
-        add_labeled_item(&pane, "A", true, ItemBufferKind::Singleton, cx).update(cx, |item, cx| {
-            item.project_items
-                .push(TestProjectItem::new_dirty(1, "A.txt", cx))
-        });
-        add_labeled_item(&pane, "B", true, ItemBufferKind::Multibuffer, cx).update(
-            cx,
-            |item, cx| {
-                item.project_items
-                    .push(TestProjectItem::new_dirty(2, "B.txt", cx))
-            },
-        );
-        add_labeled_item(&pane, "D", true, ItemBufferKind::Multibuffer, cx).update(
-            cx,
-            |item, cx| {
-                item.project_items
-                    .push(TestProjectItem::new_dirty(3, "D.txt", cx))
-            },
-        );
-        assert_item_labels(&pane, ["C", "A^", "B^", "D*^"], cx);
-
-        let save = pane.update_in(cx, |pane, window, cx| {
-            pane.close_multibuffer_items(
-                &CloseMultibufferItems {
-                    save_intent: None,
-                    close_pinned: false,
-                },
-                window,
-                cx,
-            )
-        });
-
-        cx.executor().run_until_parked();
-        cx.simulate_prompt_answer("Save all");
-        save.await.unwrap();
-        assert_item_labels(&pane, ["C", "A*^"], cx);
-
-        add_labeled_item(&pane, "B", true, ItemBufferKind::Multibuffer, cx).update(
-            cx,
-            |item, cx| {
-                item.project_items
-                    .push(TestProjectItem::new_dirty(2, "B.txt", cx))
-            },
-        );
-        add_labeled_item(&pane, "D", true, ItemBufferKind::Multibuffer, cx).update(
-            cx,
-            |item, cx| {
-                item.project_items
-                    .push(TestProjectItem::new_dirty(3, "D.txt", cx))
-            },
-        );
-        assert_item_labels(&pane, ["C", "A^", "B^", "D*^"], cx);
-        let save = pane.update_in(cx, |pane, window, cx| {
-            pane.close_multibuffer_items(
-                &CloseMultibufferItems {
-                    save_intent: None,
-                    close_pinned: false,
-                },
-                window,
-                cx,
-            )
-        });
-
-        cx.executor().run_until_parked();
-        cx.simulate_prompt_answer("Discard all");
-        save.await.unwrap();
-        assert_item_labels(&pane, ["C", "A*^"], cx);
-    }
-
-    #[gpui::test]
-    async fn test_close_with_save_intent(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        let a = cx.update(|_, cx| TestProjectItem::new_dirty(1, "A.txt", cx));
-        let b = cx.update(|_, cx| TestProjectItem::new_dirty(1, "B.txt", cx));
-        let c = cx.update(|_, cx| TestProjectItem::new_dirty(1, "C.txt", cx));
-
-        add_labeled_item(&pane, "AB", true, cx).update(cx, |item, _| {
-            item.project_items.push(a.clone());
-            item.project_items.push(b.clone());
-        });
-        add_labeled_item(&pane, "C", true, cx)
-            .update(cx, |item, _| item.project_items.push(c.clone()));
-        assert_item_labels(&pane, ["AB^", "C*^"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            pane.close_all_items(
-                &CloseAllItems {
-                    save_intent: Some(SaveIntent::Save),
-                    close_pinned: false,
-                },
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-
-        assert_item_labels(&pane, [], cx);
-        cx.update(|_, cx| {
-            assert!(!a.read(cx).is_dirty);
-            assert!(!b.read(cx).is_dirty);
-            assert!(!c.read(cx).is_dirty);
-        });
-    }
-
-    #[gpui::test]
-    async fn test_new_tab_scrolls_into_view_completely(cx: &mut TestAppContext) {
-        // Arrange
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        cx.simulate_resize(size(px(300.), px(300.)));
-
-        add_labeled_item(&pane, "untitled", false, cx);
-        add_labeled_item(&pane, "untitled", false, cx);
-        add_labeled_item(&pane, "untitled", false, cx);
-        add_labeled_item(&pane, "untitled", false, cx);
-        // Act: this should trigger a scroll
-        add_labeled_item(&pane, "untitled", false, cx);
-        // Assert
-        let tab_bar_scroll_handle =
-            pane.update_in(cx, |pane, _window, _cx| pane.tab_bar_scroll_handle.clone());
-        assert_eq!(tab_bar_scroll_handle.children_count(), 6);
-        let tab_bounds = cx.debug_bounds("TAB-3").unwrap();
-        let new_tab_button_bounds = cx.debug_bounds("ICON-Plus").unwrap();
-        let scroll_bounds = tab_bar_scroll_handle.bounds();
-        let scroll_offset = tab_bar_scroll_handle.offset();
-        assert!(tab_bounds.right() <= scroll_bounds.right() + scroll_offset.x);
-        // -39.5 is the magic number for this setup
-        assert_eq!(scroll_offset.x, px(-39.5));
-        assert!(
-            !tab_bounds.intersects(&new_tab_button_bounds),
-            "Tab should not overlap with the new tab button, if this is failing check if there's been a redesign!"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_close_all_items_including_pinned(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        let item_a = add_labeled_item(&pane, "A", false, cx);
-        add_labeled_item(&pane, "B", false, cx);
-        add_labeled_item(&pane, "C", false, cx);
-        assert_item_labels(&pane, ["A", "B", "C*"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            let ix = pane.index_for_item_id(item_a.item_id()).unwrap();
-            pane.pin_tab_at(ix, window, cx);
-            pane.close_all_items(
-                &CloseAllItems {
-                    save_intent: None,
-                    close_pinned: true,
-                },
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-        assert_item_labels(&pane, [], cx);
-    }
-
-    #[gpui::test]
-    async fn test_close_pinned_tab_with_non_pinned_in_same_pane(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-
-        // Non-pinned tabs in same pane
-        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-        add_labeled_item(&pane, "A", false, cx);
-        add_labeled_item(&pane, "B", false, cx);
-        add_labeled_item(&pane, "C", false, cx);
-        pane.update_in(cx, |pane, window, cx| {
-            pane.pin_tab_at(0, window, cx);
-        });
-        set_labeled_items(&pane, ["A*", "B", "C"], cx);
-        pane.update_in(cx, |pane, window, cx| {
-            pane.close_active_item(
-                &CloseActiveItem {
-                    save_intent: None,
-                    close_pinned: false,
-                },
-                window,
-                cx,
-            )
-            .unwrap();
-        });
-        // Non-pinned tab should be active
-        assert_item_labels(&pane, ["A!", "B*", "C"], cx);
-    }
-
-    #[gpui::test]
-    async fn test_close_pinned_tab_with_non_pinned_in_different_pane(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-
-        // No non-pinned tabs in same pane, non-pinned tabs in another pane
-        let pane1 = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-        let pane2 = workspace.update_in(cx, |workspace, window, cx| {
-            workspace.split_pane(pane1.clone(), SplitDirection::Right, window, cx)
-        });
-        add_labeled_item(&pane1, "A", false, cx);
-        pane1.update_in(cx, |pane, window, cx| {
-            pane.pin_tab_at(0, window, cx);
-        });
-        set_labeled_items(&pane1, ["A*"], cx);
-        add_labeled_item(&pane2, "B", false, cx);
-        set_labeled_items(&pane2, ["B"], cx);
-        pane1.update_in(cx, |pane, window, cx| {
-            pane.close_active_item(
-                &CloseActiveItem {
-                    save_intent: None,
-                    close_pinned: false,
-                },
-                window,
-                cx,
-            )
-            .unwrap();
-        });
-        //  Non-pinned tab of other pane should be active
-        assert_item_labels(&pane2, ["B*"], cx);
-    }
-
-    #[gpui::test]
-    async fn ensure_item_closing_actions_do_not_panic_when_no_items_exist(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-
-        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-        assert_item_labels(&pane, [], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            pane.close_active_item(
-                &CloseActiveItem {
-                    save_intent: None,
-                    close_pinned: false,
-                },
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-
-        pane.update_in(cx, |pane, window, cx| {
-            pane.close_other_items(
-                &CloseOtherItems {
-                    save_intent: None,
-                    close_pinned: false,
-                },
-                None,
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-
-        pane.update_in(cx, |pane, window, cx| {
-            pane.close_all_items(
-                &CloseAllItems {
-                    save_intent: None,
-                    close_pinned: false,
-                },
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-
-        pane.update_in(cx, |pane, window, cx| {
-            pane.close_clean_items(
-                &CloseCleanItems {
-                    close_pinned: false,
-                },
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-
-        pane.update_in(cx, |pane, window, cx| {
-            pane.close_items_to_the_right_by_id(
-                None,
-                &CloseItemsToTheRight {
-                    close_pinned: false,
-                },
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-
-        pane.update_in(cx, |pane, window, cx| {
-            pane.close_items_to_the_left_by_id(
-                None,
-                &CloseItemsToTheLeft {
-                    close_pinned: false,
-                },
-                window,
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-    }
-
-    #[gpui::test]
-    async fn test_item_swapping_actions(cx: &mut TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-
-        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-        assert_item_labels(&pane, [], cx);
-
-        // Test that these actions do not panic
-        pane.update_in(cx, |pane, window, cx| {
-            pane.swap_item_right(&Default::default(), window, cx);
-        });
-
-        pane.update_in(cx, |pane, window, cx| {
-            pane.swap_item_left(&Default::default(), window, cx);
-        });
-
-        add_labeled_item(&pane, "A", false, cx);
-        add_labeled_item(&pane, "B", false, cx);
-        add_labeled_item(&pane, "C", false, cx);
-        assert_item_labels(&pane, ["A", "B", "C*"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            pane.swap_item_right(&Default::default(), window, cx);
-        });
-        assert_item_labels(&pane, ["A", "B", "C*"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            pane.swap_item_left(&Default::default(), window, cx);
-        });
-        assert_item_labels(&pane, ["A", "C*", "B"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            pane.swap_item_left(&Default::default(), window, cx);
-        });
-        assert_item_labels(&pane, ["C*", "A", "B"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            pane.swap_item_left(&Default::default(), window, cx);
-        });
-        assert_item_labels(&pane, ["C*", "A", "B"], cx);
-
-        pane.update_in(cx, |pane, window, cx| {
-            pane.swap_item_right(&Default::default(), window, cx);
-        });
-        assert_item_labels(&pane, ["A", "C*", "B"], cx);
-    }
-
-    fn init_test(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-            theme::init(LoadThemes::JustBase, cx);
-        });
-    }
-
-    fn set_max_tabs(cx: &mut TestAppContext, value: Option<usize>) {
-        cx.update_global(|store: &mut SettingsStore, cx| {
-            store.update_user_settings(cx, |settings| {
-                settings.workspace.max_tabs = value.map(|v| NonZero::new(v).unwrap())
-            });
-        });
-    }
-
-    fn add_labeled_item(
-        pane: &Entity<Pane>,
-        label: &str,
-        is_dirty: bool,
-        cx: &mut VisualTestContext,
-    ) -> Box<Entity<TestItem>> {
-        pane.update_in(cx, |pane, window, cx| {
-            let labeled_item =
-                Box::new(cx.new(|cx| TestItem::new(cx).with_label(label).with_dirty(is_dirty)));
-            pane.add_item(labeled_item.clone(), false, false, None, window, cx);
-            labeled_item
-        })
-    }
-
-    fn set_labeled_items<const COUNT: usize>(
-        pane: &Entity<Pane>,
-        labels: [&str; COUNT],
-        cx: &mut VisualTestContext,
-    ) -> [Box<Entity<TestItem>>; COUNT] {
-        pane.update_in(cx, |pane, window, cx| {
-            pane.items.clear();
-            let mut active_item_index = 0;
-
-            let mut index = 0;
-            let items = labels.map(|mut label| {
-                if label.ends_with('*') {
-                    label = label.trim_end_matches('*');
-                    active_item_index = index;
-                }
-
-                let labeled_item = Box::new(cx.new(|cx| TestItem::new(cx).with_label(label)));
-                pane.add_item(labeled_item.clone(), false, false, None, window, cx);
-                index += 1;
-                labeled_item
-            });
-
-            pane.activate_item(active_item_index, false, false, window, cx);
-
-            items
-        })
-    }
-
-    // Assert the item label, with the active item label suffixed with a '*'
-    #[track_caller]
-    fn assert_item_labels<const COUNT: usize>(
-        pane: &Entity<Pane>,
-        expected_states: [&str; COUNT],
-        cx: &mut VisualTestContext,
-    ) {
-        let actual_states = pane.update(cx, |pane, cx| {
-            pane.items
-                .iter()
-                .enumerate()
-                .map(|(ix, item)| {
-                    let mut state = item
-                        .to_any_view()
-                        .downcast::<TestItem>()
-                        .unwrap()
-                        .read(cx)
-                        .label
-                        .clone();
-                    if ix == pane.active_item_index {
-                        state.push('*');
-                    }
-                    if item.is_dirty(cx) {
-                        state.push('^');
-                    }
-                    if pane.is_tab_pinned(ix) {
-                        state.push('!');
-                    }
-                    state
-                })
-                .collect::<Vec<_>>()
-        });
-        assert_eq!(
-            actual_states, expected_states,
-            "pane items do not match expectation"
-        );
-    }
-}
diff --git a/crates/workspace/src/pane_group.rs b/crates/workspace/src/pane_group.rs
deleted file mode 100644
index c9d9897713..0000000000
--- a/crates/workspace/src/pane_group.rs
+++ /dev/null
@@ -1,1456 +0,0 @@
-use crate::{
-    AppState, CollaboratorId, FollowerState, Pane, Workspace, WorkspaceSettings,
-    pane_group::element::pane_axis,
-    workspace_settings::{PaneSplitDirectionHorizontal, PaneSplitDirectionVertical},
-};
-use anyhow::Result;
-use call::{ActiveCall, ParticipantLocation};
-use collections::HashMap;
-use gpui::{
-    Along, AnyView, AnyWeakView, Axis, Bounds, Entity, Hsla, IntoElement, MouseButton, Pixels,
-    Point, StyleRefinement, WeakEntity, Window, point, size,
-};
-use parking_lot::Mutex;
-use project::Project;
-use schemars::JsonSchema;
-use serde::Deserialize;
-use settings::Settings;
-use std::sync::Arc;
-use ui::prelude::*;
-
-pub const HANDLE_HITBOX_SIZE: f32 = 4.0;
-const HORIZONTAL_MIN_SIZE: f32 = 80.;
-const VERTICAL_MIN_SIZE: f32 = 100.;
-
-/// One or many panes, arranged in a horizontal or vertical axis due to a split.
-/// Panes have all their tabs and capabilities preserved, and can be split again or resized.
-/// Single-pane group is a regular pane.
-#[derive(Clone)]
-pub struct PaneGroup {
-    pub root: Member,
-}
-
-pub struct PaneRenderResult {
-    pub element: gpui::AnyElement,
-    pub contains_active_pane: bool,
-}
-
-impl PaneGroup {
-    pub fn with_root(root: Member) -> Self {
-        Self { root }
-    }
-
-    pub fn new(pane: Entity<Pane>) -> Self {
-        Self {
-            root: Member::Pane(pane),
-        }
-    }
-
-    pub fn split(
-        &mut self,
-        old_pane: &Entity<Pane>,
-        new_pane: &Entity<Pane>,
-        direction: SplitDirection,
-    ) -> Result<()> {
-        match &mut self.root {
-            Member::Pane(pane) => {
-                if pane == old_pane {
-                    self.root = Member::new_axis(old_pane.clone(), new_pane.clone(), direction);
-                    Ok(())
-                } else {
-                    anyhow::bail!("Pane not found");
-                }
-            }
-            Member::Axis(axis) => axis.split(old_pane, new_pane, direction),
-        }
-    }
-
-    pub fn bounding_box_for_pane(&self, pane: &Entity<Pane>) -> Option<Bounds<Pixels>> {
-        match &self.root {
-            Member::Pane(_) => None,
-            Member::Axis(axis) => axis.bounding_box_for_pane(pane),
-        }
-    }
-
-    pub fn pane_at_pixel_position(&self, coordinate: Point<Pixels>) -> Option<&Entity<Pane>> {
-        match &self.root {
-            Member::Pane(pane) => Some(pane),
-            Member::Axis(axis) => axis.pane_at_pixel_position(coordinate),
-        }
-    }
-
-    /// Moves active pane to span the entire border in the given direction,
-    /// similar to Vim ctrl+w shift-[hjkl] motion.
-    ///
-    /// Returns:
-    /// - Ok(true) if it found and moved a pane
-    /// - Ok(false) if it found but did not move the pane
-    /// - Err(_) if it did not find the pane
-    pub fn move_to_border(
-        &mut self,
-        active_pane: &Entity<Pane>,
-        direction: SplitDirection,
-    ) -> Result<bool> {
-        if let Some(pane) = self.find_pane_at_border(direction)
-            && pane == active_pane
-        {
-            return Ok(false);
-        }
-
-        if !self.remove(active_pane)? {
-            return Ok(false);
-        }
-
-        if let Member::Axis(root) = &mut self.root
-            && direction.axis() == root.axis
-        {
-            let idx = if direction.increasing() {
-                root.members.len()
-            } else {
-                0
-            };
-            root.insert_pane(idx, active_pane);
-            return Ok(true);
-        }
-
-        let members = if direction.increasing() {
-            vec![self.root.clone(), Member::Pane(active_pane.clone())]
-        } else {
-            vec![Member::Pane(active_pane.clone()), self.root.clone()]
-        };
-        self.root = Member::Axis(PaneAxis::new(direction.axis(), members));
-        Ok(true)
-    }
-
-    fn find_pane_at_border(&self, direction: SplitDirection) -> Option<&Entity<Pane>> {
-        match &self.root {
-            Member::Pane(pane) => Some(pane),
-            Member::Axis(axis) => axis.find_pane_at_border(direction),
-        }
-    }
-
-    /// Returns:
-    /// - Ok(true) if it found and removed a pane
-    /// - Ok(false) if it found but did not remove the pane
-    /// - Err(_) if it did not find the pane
-    pub fn remove(&mut self, pane: &Entity<Pane>) -> Result<bool> {
-        match &mut self.root {
-            Member::Pane(_) => Ok(false),
-            Member::Axis(axis) => {
-                if let Some(last_pane) = axis.remove(pane)? {
-                    self.root = last_pane;
-                }
-                Ok(true)
-            }
-        }
-    }
-
-    pub fn resize(
-        &mut self,
-        pane: &Entity<Pane>,
-        direction: Axis,
-        amount: Pixels,
-        bounds: &Bounds<Pixels>,
-    ) {
-        match &mut self.root {
-            Member::Pane(_) => {}
-            Member::Axis(axis) => {
-                let _ = axis.resize(pane, direction, amount, bounds);
-            }
-        };
-    }
-
-    pub fn reset_pane_sizes(&mut self) {
-        match &mut self.root {
-            Member::Pane(_) => {}
-            Member::Axis(axis) => {
-                let _ = axis.reset_pane_sizes();
-            }
-        };
-    }
-
-    pub fn swap(&mut self, from: &Entity<Pane>, to: &Entity<Pane>) {
-        match &mut self.root {
-            Member::Pane(_) => {}
-            Member::Axis(axis) => axis.swap(from, to),
-        };
-    }
-
-    pub fn render(
-        &self,
-        zoomed: Option<&AnyWeakView>,
-        render_cx: &dyn PaneLeaderDecorator,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> impl IntoElement {
-        self.root.render(0, zoomed, render_cx, window, cx).element
-    }
-
-    pub fn panes(&self) -> Vec<&Entity<Pane>> {
-        let mut panes = Vec::new();
-        self.root.collect_panes(&mut panes);
-        panes
-    }
-
-    pub fn first_pane(&self) -> Entity<Pane> {
-        self.root.first_pane()
-    }
-
-    pub fn last_pane(&self) -> Entity<Pane> {
-        self.root.last_pane()
-    }
-
-    pub fn find_pane_in_direction(
-        &mut self,
-        active_pane: &Entity<Pane>,
-        direction: SplitDirection,
-        cx: &App,
-    ) -> Option<&Entity<Pane>> {
-        let bounding_box = self.bounding_box_for_pane(active_pane)?;
-        let cursor = active_pane.read(cx).pixel_position_of_cursor(cx);
-        let center = match cursor {
-            Some(cursor) if bounding_box.contains(&cursor) => cursor,
-            _ => bounding_box.center(),
-        };
-
-        let distance_to_next = crate::HANDLE_HITBOX_SIZE;
-
-        let target = match direction {
-            SplitDirection::Left => {
-                Point::new(bounding_box.left() - distance_to_next.into(), center.y)
-            }
-            SplitDirection::Right => {
-                Point::new(bounding_box.right() + distance_to_next.into(), center.y)
-            }
-            SplitDirection::Up => {
-                Point::new(center.x, bounding_box.top() - distance_to_next.into())
-            }
-            SplitDirection::Down => {
-                Point::new(center.x, bounding_box.bottom() + distance_to_next.into())
-            }
-        };
-        self.pane_at_pixel_position(target)
-    }
-
-    pub fn invert_axies(&mut self) {
-        self.root.invert_pane_axies();
-    }
-}
-
-#[derive(Debug, Clone)]
-pub enum Member {
-    Axis(PaneAxis),
-    Pane(Entity<Pane>),
-}
-
-#[derive(Clone, Copy)]
-pub struct PaneRenderContext<'a> {
-    pub project: &'a Entity<Project>,
-    pub follower_states: &'a HashMap<CollaboratorId, FollowerState>,
-    pub active_call: Option<&'a Entity<ActiveCall>>,
-    pub active_pane: &'a Entity<Pane>,
-    pub app_state: &'a Arc<AppState>,
-    pub workspace: &'a WeakEntity<Workspace>,
-}
-
-#[derive(Default)]
-pub struct LeaderDecoration {
-    border: Option<Hsla>,
-    status_box: Option<AnyElement>,
-}
-
-pub trait PaneLeaderDecorator {
-    fn decorate(&self, pane: &Entity<Pane>, cx: &App) -> LeaderDecoration;
-    fn active_pane(&self) -> &Entity<Pane>;
-    fn workspace(&self) -> &WeakEntity<Workspace>;
-}
-
-pub struct ActivePaneDecorator<'a> {
-    active_pane: &'a Entity<Pane>,
-    workspace: &'a WeakEntity<Workspace>,
-}
-
-impl<'a> ActivePaneDecorator<'a> {
-    pub fn new(active_pane: &'a Entity<Pane>, workspace: &'a WeakEntity<Workspace>) -> Self {
-        Self {
-            active_pane,
-            workspace,
-        }
-    }
-}
-
-impl PaneLeaderDecorator for ActivePaneDecorator<'_> {
-    fn decorate(&self, _: &Entity<Pane>, _: &App) -> LeaderDecoration {
-        LeaderDecoration::default()
-    }
-    fn active_pane(&self) -> &Entity<Pane> {
-        self.active_pane
-    }
-
-    fn workspace(&self) -> &WeakEntity<Workspace> {
-        self.workspace
-    }
-}
-
-impl PaneLeaderDecorator for PaneRenderContext<'_> {
-    fn decorate(&self, pane: &Entity<Pane>, cx: &App) -> LeaderDecoration {
-        let follower_state = self.follower_states.iter().find_map(|(leader_id, state)| {
-            if state.center_pane == *pane {
-                Some((*leader_id, state))
-            } else {
-                None
-            }
-        });
-        let Some((leader_id, follower_state)) = follower_state else {
-            return LeaderDecoration::default();
-        };
-
-        let mut leader_color;
-        let status_box;
-        match leader_id {
-            CollaboratorId::PeerId(peer_id) => {
-                let Some(leader) = self.active_call.as_ref().and_then(|call| {
-                    let room = call.read(cx).room()?.read(cx);
-                    room.remote_participant_for_peer_id(peer_id)
-                }) else {
-                    return LeaderDecoration::default();
-                };
-
-                let is_in_unshared_view = follower_state.active_view_id.is_some_and(|view_id| {
-                    !follower_state
-                        .items_by_leader_view_id
-                        .contains_key(&view_id)
-                });
-
-                let mut leader_join_data = None;
-                let leader_status_box = match leader.location {
-                    ParticipantLocation::SharedProject {
-                        project_id: leader_project_id,
-                    } => {
-                        if Some(leader_project_id) == self.project.read(cx).remote_id() {
-                            is_in_unshared_view.then(|| {
-                                Label::new(format!(
-                                    "{} is in an unshared pane",
-                                    leader.user.github_login
-                                ))
-                            })
-                        } else {
-                            leader_join_data = Some((leader_project_id, leader.user.id));
-                            Some(Label::new(format!(
-                                "Follow {} to their active project",
-                                leader.user.github_login,
-                            )))
-                        }
-                    }
-                    ParticipantLocation::UnsharedProject => Some(Label::new(format!(
-                        "{} is viewing an unshared Zed project",
-                        leader.user.github_login
-                    ))),
-                    ParticipantLocation::External => Some(Label::new(format!(
-                        "{} is viewing a window outside of Zed",
-                        leader.user.github_login
-                    ))),
-                };
-                status_box = leader_status_box.map(|status| {
-                    div()
-                        .absolute()
-                        .w_96()
-                        .bottom_3()
-                        .right_3()
-                        .elevation_2(cx)
-                        .p_1()
-                        .child(status)
-                        .when_some(
-                            leader_join_data,
-                            |this, (leader_project_id, leader_user_id)| {
-                                let app_state = self.app_state.clone();
-                                this.cursor_pointer().on_mouse_down(
-                                    MouseButton::Left,
-                                    move |_, _, cx| {
-                                        crate::join_in_room_project(
-                                            leader_project_id,
-                                            leader_user_id,
-                                            app_state.clone(),
-                                            cx,
-                                        )
-                                        .detach_and_log_err(cx);
-                                    },
-                                )
-                            },
-                        )
-                        .into_any_element()
-                });
-                leader_color = cx
-                    .theme()
-                    .players()
-                    .color_for_participant(leader.participant_index.0)
-                    .cursor;
-            }
-            CollaboratorId::Agent => {
-                status_box = None;
-                leader_color = cx.theme().players().agent().cursor;
-            }
-        }
-
-        let is_in_panel = follower_state.dock_pane.is_some();
-        if is_in_panel {
-            leader_color.fade_out(0.75);
-        } else {
-            leader_color.fade_out(0.3);
-        }
-
-        LeaderDecoration {
-            status_box,
-            border: Some(leader_color),
-        }
-    }
-
-    fn active_pane(&self) -> &Entity<Pane> {
-        self.active_pane
-    }
-
-    fn workspace(&self) -> &WeakEntity<Workspace> {
-        self.workspace
-    }
-}
-
-impl Member {
-    fn new_axis(old_pane: Entity<Pane>, new_pane: Entity<Pane>, direction: SplitDirection) -> Self {
-        use Axis::*;
-        use SplitDirection::*;
-
-        let axis = match direction {
-            Up | Down => Vertical,
-            Left | Right => Horizontal,
-        };
-
-        let members = match direction {
-            Up | Left => vec![Member::Pane(new_pane), Member::Pane(old_pane)],
-            Down | Right => vec![Member::Pane(old_pane), Member::Pane(new_pane)],
-        };
-
-        Member::Axis(PaneAxis::new(axis, members))
-    }
-
-    fn first_pane(&self) -> Entity<Pane> {
-        match self {
-            Member::Axis(axis) => axis.members[0].first_pane(),
-            Member::Pane(pane) => pane.clone(),
-        }
-    }
-
-    fn last_pane(&self) -> Entity<Pane> {
-        match self {
-            Member::Axis(axis) => axis.members.last().unwrap().last_pane(),
-            Member::Pane(pane) => pane.clone(),
-        }
-    }
-
-    pub fn render(
-        &self,
-        basis: usize,
-        zoomed: Option<&AnyWeakView>,
-        render_cx: &dyn PaneLeaderDecorator,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> PaneRenderResult {
-        match self {
-            Member::Pane(pane) => {
-                if zoomed == Some(&pane.downgrade().into()) {
-                    return PaneRenderResult {
-                        element: div().into_any(),
-                        contains_active_pane: false,
-                    };
-                }
-
-                let decoration = render_cx.decorate(pane, cx);
-                let is_active = pane == render_cx.active_pane();
-
-                PaneRenderResult {
-                    element: div()
-                        .relative()
-                        .flex_1()
-                        .size_full()
-                        .child(
-                            AnyView::from(pane.clone())
-                                .cached(StyleRefinement::default().v_flex().size_full()),
-                        )
-                        .when_some(decoration.border, |this, color| {
-                            this.child(
-                                div()
-                                    .absolute()
-                                    .size_full()
-                                    .left_0()
-                                    .top_0()
-                                    .border_2()
-                                    .border_color(color),
-                            )
-                        })
-                        .children(decoration.status_box)
-                        .into_any(),
-                    contains_active_pane: is_active,
-                }
-            }
-            Member::Axis(axis) => axis.render(basis + 1, zoomed, render_cx, window, cx),
-        }
-    }
-
-    fn collect_panes<'a>(&'a self, panes: &mut Vec<&'a Entity<Pane>>) {
-        match self {
-            Member::Axis(axis) => {
-                for member in &axis.members {
-                    member.collect_panes(panes);
-                }
-            }
-            Member::Pane(pane) => panes.push(pane),
-        }
-    }
-
-    fn invert_pane_axies(&mut self) {
-        match self {
-            Self::Axis(axis) => {
-                axis.axis = axis.axis.invert();
-                for member in axis.members.iter_mut() {
-                    member.invert_pane_axies();
-                }
-            }
-            Self::Pane(_) => {}
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct PaneAxis {
-    pub axis: Axis,
-    pub members: Vec<Member>,
-    pub flexes: Arc<Mutex<Vec<f32>>>,
-    pub bounding_boxes: Arc<Mutex<Vec<Option<Bounds<Pixels>>>>>,
-}
-
-impl PaneAxis {
-    pub fn new(axis: Axis, members: Vec<Member>) -> Self {
-        let flexes = Arc::new(Mutex::new(vec![1.; members.len()]));
-        let bounding_boxes = Arc::new(Mutex::new(vec![None; members.len()]));
-        Self {
-            axis,
-            members,
-            flexes,
-            bounding_boxes,
-        }
-    }
-
-    pub fn load(axis: Axis, members: Vec<Member>, flexes: Option<Vec<f32>>) -> Self {
-        let mut flexes = flexes.unwrap_or_else(|| vec![1.; members.len()]);
-        if flexes.len() != members.len()
-            || (flexes.iter().copied().sum::<f32>() - flexes.len() as f32).abs() >= 0.001
-        {
-            flexes = vec![1.; members.len()];
-        }
-
-        let flexes = Arc::new(Mutex::new(flexes));
-        let bounding_boxes = Arc::new(Mutex::new(vec![None; members.len()]));
-        Self {
-            axis,
-            members,
-            flexes,
-            bounding_boxes,
-        }
-    }
-
-    fn split(
-        &mut self,
-        old_pane: &Entity<Pane>,
-        new_pane: &Entity<Pane>,
-        direction: SplitDirection,
-    ) -> Result<()> {
-        for (mut idx, member) in self.members.iter_mut().enumerate() {
-            match member {
-                Member::Axis(axis) => {
-                    if axis.split(old_pane, new_pane, direction).is_ok() {
-                        return Ok(());
-                    }
-                }
-                Member::Pane(pane) => {
-                    if pane == old_pane {
-                        if direction.axis() == self.axis {
-                            if direction.increasing() {
-                                idx += 1;
-                            }
-                            self.insert_pane(idx, new_pane);
-                        } else {
-                            *member =
-                                Member::new_axis(old_pane.clone(), new_pane.clone(), direction);
-                        }
-                        return Ok(());
-                    }
-                }
-            }
-        }
-        anyhow::bail!("Pane not found");
-    }
-
-    fn insert_pane(&mut self, idx: usize, new_pane: &Entity<Pane>) {
-        self.members.insert(idx, Member::Pane(new_pane.clone()));
-        *self.flexes.lock() = vec![1.; self.members.len()];
-    }
-
-    fn find_pane_at_border(&self, direction: SplitDirection) -> Option<&Entity<Pane>> {
-        if self.axis != direction.axis() {
-            return None;
-        }
-        let member = if direction.increasing() {
-            self.members.last()
-        } else {
-            self.members.first()
-        };
-        member.and_then(|e| match e {
-            Member::Pane(pane) => Some(pane),
-            Member::Axis(_) => None,
-        })
-    }
-
-    fn remove(&mut self, pane_to_remove: &Entity<Pane>) -> Result<Option<Member>> {
-        let mut found_pane = false;
-        let mut remove_member = None;
-        for (idx, member) in self.members.iter_mut().enumerate() {
-            match member {
-                Member::Axis(axis) => {
-                    if let Ok(last_pane) = axis.remove(pane_to_remove) {
-                        if let Some(last_pane) = last_pane {
-                            *member = last_pane;
-                        }
-                        found_pane = true;
-                        break;
-                    }
-                }
-                Member::Pane(pane) => {
-                    if pane == pane_to_remove {
-                        found_pane = true;
-                        remove_member = Some(idx);
-                        break;
-                    }
-                }
-            }
-        }
-
-        if found_pane {
-            if let Some(idx) = remove_member {
-                self.members.remove(idx);
-                *self.flexes.lock() = vec![1.; self.members.len()];
-            }
-
-            if self.members.len() == 1 {
-                let result = self.members.pop();
-                *self.flexes.lock() = vec![1.; self.members.len()];
-                Ok(result)
-            } else {
-                Ok(None)
-            }
-        } else {
-            anyhow::bail!("Pane not found");
-        }
-    }
-
-    fn reset_pane_sizes(&self) {
-        *self.flexes.lock() = vec![1.; self.members.len()];
-        for member in self.members.iter() {
-            if let Member::Axis(axis) = member {
-                axis.reset_pane_sizes();
-            }
-        }
-    }
-
-    fn resize(
-        &mut self,
-        pane: &Entity<Pane>,
-        axis: Axis,
-        amount: Pixels,
-        bounds: &Bounds<Pixels>,
-    ) -> Option<bool> {
-        let container_size = self
-            .bounding_boxes
-            .lock()
-            .iter()
-            .filter_map(|e| *e)
-            .reduce(|acc, e| acc.union(&e))
-            .unwrap_or(*bounds)
-            .size;
-
-        let found_pane = self
-            .members
-            .iter()
-            .any(|member| matches!(member, Member::Pane(p) if p == pane));
-
-        if found_pane && self.axis != axis {
-            return Some(false); // pane found but this is not the correct axis direction
-        }
-        let mut found_axis_index: Option<usize> = None;
-        if !found_pane {
-            for (i, pa) in self.members.iter_mut().enumerate() {
-                if let Member::Axis(pa) = pa
-                    && let Some(done) = pa.resize(pane, axis, amount, bounds)
-                {
-                    if done {
-                        return Some(true); // pane found and operations already done
-                    } else if self.axis != axis {
-                        return Some(false); // pane found but this is not the correct axis direction
-                    } else {
-                        found_axis_index = Some(i); // pane found and this is correct direction
-                    }
-                }
-            }
-            found_axis_index?; // no pane found
-        }
-
-        let min_size = match axis {
-            Axis::Horizontal => px(HORIZONTAL_MIN_SIZE),
-            Axis::Vertical => px(VERTICAL_MIN_SIZE),
-        };
-        let mut flexes = self.flexes.lock();
-
-        let ix = if found_pane {
-            self.members.iter().position(|m| {
-                if let Member::Pane(p) = m {
-                    p == pane
-                } else {
-                    false
-                }
-            })
-        } else {
-            found_axis_index
-        };
-
-        if ix.is_none() {
-            return Some(true);
-        }
-
-        let ix = ix.unwrap_or(0);
-
-        let size = move |ix, flexes: &[f32]| {
-            container_size.along(axis) * (flexes[ix] / flexes.len() as f32)
-        };
-
-        // Don't allow resizing to less than the minimum size, if elements are already too small
-        if min_size - px(1.) > size(ix, flexes.as_slice()) {
-            return Some(true);
-        }
-
-        let flex_changes = |pixel_dx, target_ix, next: isize, flexes: &[f32]| {
-            let flex_change = flexes.len() as f32 * pixel_dx / container_size.along(axis);
-            let current_target_flex = flexes[target_ix] + flex_change;
-            let next_target_flex = flexes[(target_ix as isize + next) as usize] - flex_change;
-            (current_target_flex, next_target_flex)
-        };
-
-        let apply_changes =
-            |current_ix: usize, proposed_current_pixel_change: Pixels, flexes: &mut [f32]| {
-                let next_target_size = Pixels::max(
-                    size(current_ix + 1, flexes) - proposed_current_pixel_change,
-                    min_size,
-                );
-                let current_target_size = Pixels::max(
-                    size(current_ix, flexes) + size(current_ix + 1, flexes) - next_target_size,
-                    min_size,
-                );
-
-                let current_pixel_change = current_target_size - size(current_ix, flexes);
-
-                let (current_target_flex, next_target_flex) =
-                    flex_changes(current_pixel_change, current_ix, 1, flexes);
-
-                flexes[current_ix] = current_target_flex;
-                flexes[current_ix + 1] = next_target_flex;
-            };
-
-        if ix + 1 == flexes.len() {
-            apply_changes(ix - 1, -1.0 * amount, flexes.as_mut_slice());
-        } else {
-            apply_changes(ix, amount, flexes.as_mut_slice());
-        }
-        Some(true)
-    }
-
-    fn swap(&mut self, from: &Entity<Pane>, to: &Entity<Pane>) {
-        for member in self.members.iter_mut() {
-            match member {
-                Member::Axis(axis) => axis.swap(from, to),
-                Member::Pane(pane) => {
-                    if pane == from {
-                        *member = Member::Pane(to.clone());
-                    } else if pane == to {
-                        *member = Member::Pane(from.clone())
-                    }
-                }
-            }
-        }
-    }
-
-    fn bounding_box_for_pane(&self, pane: &Entity<Pane>) -> Option<Bounds<Pixels>> {
-        debug_assert!(self.members.len() == self.bounding_boxes.lock().len());
-
-        for (idx, member) in self.members.iter().enumerate() {
-            match member {
-                Member::Pane(found) => {
-                    if pane == found {
-                        return self.bounding_boxes.lock()[idx];
-                    }
-                }
-                Member::Axis(axis) => {
-                    if let Some(rect) = axis.bounding_box_for_pane(pane) {
-                        return Some(rect);
-                    }
-                }
-            }
-        }
-        None
-    }
-
-    fn pane_at_pixel_position(&self, coordinate: Point<Pixels>) -> Option<&Entity<Pane>> {
-        debug_assert!(self.members.len() == self.bounding_boxes.lock().len());
-
-        let bounding_boxes = self.bounding_boxes.lock();
-
-        for (idx, member) in self.members.iter().enumerate() {
-            if let Some(coordinates) = bounding_boxes[idx]
-                && coordinates.contains(&coordinate)
-            {
-                return match member {
-                    Member::Pane(found) => Some(found),
-                    Member::Axis(axis) => axis.pane_at_pixel_position(coordinate),
-                };
-            }
-        }
-        None
-    }
-
-    fn render(
-        &self,
-        basis: usize,
-        zoomed: Option<&AnyWeakView>,
-        render_cx: &dyn PaneLeaderDecorator,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> PaneRenderResult {
-        debug_assert!(self.members.len() == self.flexes.lock().len());
-        let mut active_pane_ix = None;
-        let mut contains_active_pane = false;
-        let mut is_leaf_pane = vec![false; self.members.len()];
-
-        let rendered_children = self
-            .members
-            .iter()
-            .enumerate()
-            .map(|(ix, member)| {
-                match member {
-                    Member::Pane(pane) => {
-                        is_leaf_pane[ix] = true;
-                        if pane == render_cx.active_pane() {
-                            active_pane_ix = Some(ix);
-                            contains_active_pane = true;
-                        }
-                    }
-                    Member::Axis(_) => {
-                        is_leaf_pane[ix] = false;
-                    }
-                }
-
-                let result = member.render((basis + ix) * 10, zoomed, render_cx, window, cx);
-                if result.contains_active_pane {
-                    contains_active_pane = true;
-                }
-                result.element.into_any_element()
-            })
-            .collect::<Vec<_>>();
-
-        let element = pane_axis(
-            self.axis,
-            basis,
-            self.flexes.clone(),
-            self.bounding_boxes.clone(),
-            render_cx.workspace().clone(),
-        )
-        .with_is_leaf_pane_mask(is_leaf_pane)
-        .children(rendered_children)
-        .with_active_pane(active_pane_ix)
-        .into_any_element();
-
-        PaneRenderResult {
-            element,
-            contains_active_pane,
-        }
-    }
-}
-
-#[derive(Clone, Copy, Debug, Deserialize, PartialEq, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum SplitDirection {
-    Up,
-    Down,
-    Left,
-    Right,
-}
-
-impl std::fmt::Display for SplitDirection {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            SplitDirection::Up => write!(f, "up"),
-            SplitDirection::Down => write!(f, "down"),
-            SplitDirection::Left => write!(f, "left"),
-            SplitDirection::Right => write!(f, "right"),
-        }
-    }
-}
-
-impl SplitDirection {
-    pub fn all() -> [Self; 4] {
-        [Self::Up, Self::Down, Self::Left, Self::Right]
-    }
-
-    pub fn vertical(cx: &mut App) -> Self {
-        match WorkspaceSettings::get_global(cx).pane_split_direction_vertical {
-            PaneSplitDirectionVertical::Left => SplitDirection::Left,
-            PaneSplitDirectionVertical::Right => SplitDirection::Right,
-        }
-    }
-
-    pub fn horizontal(cx: &mut App) -> Self {
-        match WorkspaceSettings::get_global(cx).pane_split_direction_horizontal {
-            PaneSplitDirectionHorizontal::Down => SplitDirection::Down,
-            PaneSplitDirectionHorizontal::Up => SplitDirection::Up,
-        }
-    }
-
-    pub fn edge(&self, rect: Bounds<Pixels>) -> Pixels {
-        match self {
-            Self::Up => rect.origin.y,
-            Self::Down => rect.bottom_left().y,
-            Self::Left => rect.bottom_left().x,
-            Self::Right => rect.bottom_right().x,
-        }
-    }
-
-    pub fn along_edge(&self, bounds: Bounds<Pixels>, length: Pixels) -> Bounds<Pixels> {
-        match self {
-            Self::Up => Bounds {
-                origin: bounds.origin,
-                size: size(bounds.size.width, length),
-            },
-            Self::Down => Bounds {
-                origin: point(bounds.bottom_left().x, bounds.bottom_left().y - length),
-                size: size(bounds.size.width, length),
-            },
-            Self::Left => Bounds {
-                origin: bounds.origin,
-                size: size(length, bounds.size.height),
-            },
-            Self::Right => Bounds {
-                origin: point(bounds.bottom_right().x - length, bounds.bottom_left().y),
-                size: size(length, bounds.size.height),
-            },
-        }
-    }
-
-    pub fn axis(&self) -> Axis {
-        match self {
-            Self::Up | Self::Down => Axis::Vertical,
-            Self::Left | Self::Right => Axis::Horizontal,
-        }
-    }
-
-    pub fn increasing(&self) -> bool {
-        match self {
-            Self::Left | Self::Up => false,
-            Self::Down | Self::Right => true,
-        }
-    }
-
-    pub fn opposite(&self) -> SplitDirection {
-        match self {
-            Self::Down => Self::Up,
-            Self::Up => Self::Down,
-            Self::Left => Self::Right,
-            Self::Right => Self::Left,
-        }
-    }
-}
-
-mod element {
-    use std::mem;
-    use std::{cell::RefCell, iter, rc::Rc, sync::Arc};
-
-    use gpui::{
-        Along, AnyElement, App, Axis, BorderStyle, Bounds, Element, GlobalElementId,
-        HitboxBehavior, IntoElement, MouseDownEvent, MouseMoveEvent, MouseUpEvent, ParentElement,
-        Pixels, Point, Size, Style, WeakEntity, Window, px, relative, size,
-    };
-    use gpui::{CursorStyle, Hitbox};
-    use parking_lot::Mutex;
-    use settings::Settings;
-    use smallvec::SmallVec;
-    use ui::prelude::*;
-    use util::ResultExt;
-
-    use crate::Workspace;
-
-    use crate::WorkspaceSettings;
-
-    use super::{HANDLE_HITBOX_SIZE, HORIZONTAL_MIN_SIZE, VERTICAL_MIN_SIZE};
-
-    const DIVIDER_SIZE: f32 = 1.0;
-
-    pub(super) fn pane_axis(
-        axis: Axis,
-        basis: usize,
-        flexes: Arc<Mutex<Vec<f32>>>,
-        bounding_boxes: Arc<Mutex<Vec<Option<Bounds<Pixels>>>>>,
-        workspace: WeakEntity<Workspace>,
-    ) -> PaneAxisElement {
-        PaneAxisElement {
-            axis,
-            basis,
-            flexes,
-            bounding_boxes,
-            children: SmallVec::new(),
-            active_pane_ix: None,
-            workspace,
-            is_leaf_pane_mask: Vec::new(),
-        }
-    }
-
-    pub struct PaneAxisElement {
-        axis: Axis,
-        basis: usize,
-        /// Equivalent to ColumnWidths (but in terms of flexes instead of percentages)
-        /// For example, flexes "1.33, 1, 1", instead of "40%, 30%, 30%"
-        flexes: Arc<Mutex<Vec<f32>>>,
-        bounding_boxes: Arc<Mutex<Vec<Option<Bounds<Pixels>>>>>,
-        children: SmallVec<[AnyElement; 2]>,
-        active_pane_ix: Option<usize>,
-        workspace: WeakEntity<Workspace>,
-        // Track which children are leaf panes (Member::Pane) vs axes (Member::Axis)
-        is_leaf_pane_mask: Vec<bool>,
-    }
-
-    pub struct PaneAxisLayout {
-        dragged_handle: Rc<RefCell<Option<usize>>>,
-        children: Vec<PaneAxisChildLayout>,
-    }
-
-    struct PaneAxisChildLayout {
-        bounds: Bounds<Pixels>,
-        element: AnyElement,
-        handle: Option<PaneAxisHandleLayout>,
-        is_leaf_pane: bool,
-    }
-
-    struct PaneAxisHandleLayout {
-        hitbox: Hitbox,
-        divider_bounds: Bounds<Pixels>,
-    }
-
-    impl PaneAxisElement {
-        pub fn with_active_pane(mut self, active_pane_ix: Option<usize>) -> Self {
-            self.active_pane_ix = active_pane_ix;
-            self
-        }
-
-        pub fn with_is_leaf_pane_mask(mut self, mask: Vec<bool>) -> Self {
-            self.is_leaf_pane_mask = mask;
-            self
-        }
-
-        fn compute_resize(
-            flexes: &Arc<Mutex<Vec<f32>>>,
-            e: &MouseMoveEvent,
-            ix: usize,
-            axis: Axis,
-            child_start: Point<Pixels>,
-            container_size: Size<Pixels>,
-            workspace: WeakEntity<Workspace>,
-            window: &mut Window,
-            cx: &mut App,
-        ) {
-            let min_size = match axis {
-                Axis::Horizontal => px(HORIZONTAL_MIN_SIZE),
-                Axis::Vertical => px(VERTICAL_MIN_SIZE),
-            };
-            let mut flexes = flexes.lock();
-            debug_assert!(flex_values_in_bounds(flexes.as_slice()));
-
-            // Math to convert a flex value to a pixel value
-            let size = move |ix, flexes: &[f32]| {
-                container_size.along(axis) * (flexes[ix] / flexes.len() as f32)
-            };
-
-            // Don't allow resizing to less than the minimum size, if elements are already too small
-            if min_size - px(1.) > size(ix, flexes.as_slice()) {
-                return;
-            }
-
-            // This is basically a "bucket" of pixel changes that need to be applied in response to this
-            // mouse event. Probably a small, fractional number like 0.5 or 1.5 pixels
-            let mut proposed_current_pixel_change =
-                (e.position - child_start).along(axis) - size(ix, flexes.as_slice());
-
-            // This takes a pixel change, and computes the flex changes that correspond to this pixel change
-            // as well as the next one, for some reason
-            let flex_changes = |pixel_dx, target_ix, next: isize, flexes: &[f32]| {
-                let flex_change = pixel_dx / container_size.along(axis);
-                let current_target_flex = flexes[target_ix] + flex_change;
-                let next_target_flex = flexes[(target_ix as isize + next) as usize] - flex_change;
-                (current_target_flex, next_target_flex)
-            };
-
-            // Generate the list of flex successors, from the current index.
-            // If you're dragging column 3 forward, out of 6 columns, then this code will produce [4, 5, 6]
-            // If you're dragging column 3 backward, out of 6 columns, then this code will produce [2, 1, 0]
-            let mut successors = iter::from_fn({
-                let forward = proposed_current_pixel_change > px(0.);
-                let mut ix_offset = 0;
-                let len = flexes.len();
-                move || {
-                    let result = if forward {
-                        (ix + 1 + ix_offset < len).then(|| ix + ix_offset)
-                    } else {
-                        (ix as isize - ix_offset as isize >= 0).then(|| ix - ix_offset)
-                    };
-
-                    ix_offset += 1;
-
-                    result
-                }
-            });
-
-            // Now actually loop over these, and empty our bucket of pixel changes
-            while proposed_current_pixel_change.abs() > px(0.) {
-                let Some(current_ix) = successors.next() else {
-                    break;
-                };
-
-                let next_target_size = Pixels::max(
-                    size(current_ix + 1, flexes.as_slice()) - proposed_current_pixel_change,
-                    min_size,
-                );
-
-                let current_target_size = Pixels::max(
-                    size(current_ix, flexes.as_slice()) + size(current_ix + 1, flexes.as_slice())
-                        - next_target_size,
-                    min_size,
-                );
-
-                let current_pixel_change =
-                    current_target_size - size(current_ix, flexes.as_slice());
-
-                let (current_target_flex, next_target_flex) =
-                    flex_changes(current_pixel_change, current_ix, 1, flexes.as_slice());
-
-                flexes[current_ix] = current_target_flex;
-                flexes[current_ix + 1] = next_target_flex;
-
-                proposed_current_pixel_change -= current_pixel_change;
-            }
-
-            workspace
-                .update(cx, |this, cx| this.serialize_workspace(window, cx))
-                .log_err();
-            cx.stop_propagation();
-            window.refresh();
-        }
-
-        fn layout_handle(
-            axis: Axis,
-            pane_bounds: Bounds<Pixels>,
-            window: &mut Window,
-            _cx: &mut App,
-        ) -> PaneAxisHandleLayout {
-            let handle_bounds = Bounds {
-                origin: pane_bounds.origin.apply_along(axis, |origin| {
-                    origin + pane_bounds.size.along(axis) - px(HANDLE_HITBOX_SIZE / 2.)
-                }),
-                size: pane_bounds
-                    .size
-                    .apply_along(axis, |_| px(HANDLE_HITBOX_SIZE)),
-            };
-            let divider_bounds = Bounds {
-                origin: pane_bounds
-                    .origin
-                    .apply_along(axis, |origin| origin + pane_bounds.size.along(axis)),
-                size: pane_bounds.size.apply_along(axis, |_| px(DIVIDER_SIZE)),
-            };
-
-            PaneAxisHandleLayout {
-                hitbox: window.insert_hitbox(handle_bounds, HitboxBehavior::BlockMouse),
-                divider_bounds,
-            }
-        }
-    }
-
-    impl IntoElement for PaneAxisElement {
-        type Element = Self;
-
-        fn into_element(self) -> Self::Element {
-            self
-        }
-    }
-
-    impl Element for PaneAxisElement {
-        type RequestLayoutState = ();
-        type PrepaintState = PaneAxisLayout;
-
-        fn id(&self) -> Option<ElementId> {
-            Some(self.basis.into())
-        }
-
-        fn source_location(&self) -> Option<&'static core::panic::Location<'static>> {
-            None
-        }
-
-        fn request_layout(
-            &mut self,
-            _global_id: Option<&GlobalElementId>,
-            _inspector_id: Option<&gpui::InspectorElementId>,
-            window: &mut Window,
-            cx: &mut App,
-        ) -> (gpui::LayoutId, Self::RequestLayoutState) {
-            let style = Style {
-                flex_grow: 1.,
-                flex_shrink: 1.,
-                flex_basis: relative(0.).into(),
-                size: size(relative(1.).into(), relative(1.).into()),
-                ..Style::default()
-            };
-            (window.request_layout(style, None, cx), ())
-        }
-
-        fn prepaint(
-            &mut self,
-            global_id: Option<&GlobalElementId>,
-            _inspector_id: Option<&gpui::InspectorElementId>,
-            bounds: Bounds<Pixels>,
-            _state: &mut Self::RequestLayoutState,
-            window: &mut Window,
-            cx: &mut App,
-        ) -> PaneAxisLayout {
-            let dragged_handle = window.with_element_state::<Rc<RefCell<Option<usize>>>, _>(
-                global_id.unwrap(),
-                |state, _cx| {
-                    let state = state.unwrap_or_else(|| Rc::new(RefCell::new(None)));
-                    (state.clone(), state)
-                },
-            );
-            let flexes = self.flexes.lock().clone();
-            let len = self.children.len();
-            debug_assert!(flexes.len() == len);
-            debug_assert!(flex_values_in_bounds(flexes.as_slice()));
-
-            let total_flex = len as f32;
-
-            let mut origin = bounds.origin;
-            let space_per_flex = bounds.size.along(self.axis) / total_flex;
-
-            let mut bounding_boxes = self.bounding_boxes.lock();
-            bounding_boxes.clear();
-
-            let mut layout = PaneAxisLayout {
-                dragged_handle,
-                children: Vec::new(),
-            };
-            for (ix, mut child) in mem::take(&mut self.children).into_iter().enumerate() {
-                let child_flex = flexes[ix];
-
-                let child_size = bounds
-                    .size
-                    .apply_along(self.axis, |_| space_per_flex * child_flex)
-                    .map(|d| d.round());
-
-                let child_bounds = Bounds {
-                    origin,
-                    size: child_size,
-                };
-
-                bounding_boxes.push(Some(child_bounds));
-                child.layout_as_root(child_size.into(), window, cx);
-                child.prepaint_at(origin, window, cx);
-
-                origin = origin.apply_along(self.axis, |val| val + child_size.along(self.axis));
-
-                let is_leaf_pane = self.is_leaf_pane_mask.get(ix).copied().unwrap_or(true);
-
-                layout.children.push(PaneAxisChildLayout {
-                    bounds: child_bounds,
-                    element: child,
-                    handle: None,
-                    is_leaf_pane,
-                })
-            }
-
-            for (ix, child_layout) in layout.children.iter_mut().enumerate() {
-                if ix < len - 1 {
-                    child_layout.handle = Some(Self::layout_handle(
-                        self.axis,
-                        child_layout.bounds,
-                        window,
-                        cx,
-                    ));
-                }
-            }
-
-            layout
-        }
-
-        fn paint(
-            &mut self,
-            _id: Option<&GlobalElementId>,
-            _inspector_id: Option<&gpui::InspectorElementId>,
-            bounds: gpui::Bounds<ui::prelude::Pixels>,
-            _: &mut Self::RequestLayoutState,
-            layout: &mut Self::PrepaintState,
-            window: &mut Window,
-            cx: &mut App,
-        ) {
-            for child in &mut layout.children {
-                child.element.paint(window, cx);
-            }
-
-            let overlay_opacity = WorkspaceSettings::get(None, cx)
-                .active_pane_modifiers
-                .inactive_opacity
-                .map(|val| val.0.clamp(0.0, 1.0))
-                .and_then(|val| (val <= 1.).then_some(val));
-
-            let mut overlay_background = cx.theme().colors().editor_background;
-            if let Some(opacity) = overlay_opacity {
-                overlay_background.fade_out(opacity);
-            }
-
-            let overlay_border = WorkspaceSettings::get(None, cx)
-                .active_pane_modifiers
-                .border_size
-                .and_then(|val| (val >= 0.).then_some(val));
-
-            for (ix, child) in &mut layout.children.iter_mut().enumerate() {
-                if overlay_opacity.is_some() || overlay_border.is_some() {
-                    // the overlay has to be painted in origin+1px with size width-1px
-                    // in order to accommodate the divider between panels
-                    let overlay_bounds = Bounds {
-                        origin: child
-                            .bounds
-                            .origin
-                            .apply_along(Axis::Horizontal, |val| val + px(1.)),
-                        size: child
-                            .bounds
-                            .size
-                            .apply_along(Axis::Horizontal, |val| val - px(1.)),
-                    };
-
-                    if overlay_opacity.is_some()
-                        && child.is_leaf_pane
-                        && self.active_pane_ix != Some(ix)
-                    {
-                        window.paint_quad(gpui::fill(overlay_bounds, overlay_background));
-                    }
-
-                    if let Some(border) = overlay_border
-                        && self.active_pane_ix == Some(ix)
-                        && child.is_leaf_pane
-                    {
-                        window.paint_quad(gpui::quad(
-                            overlay_bounds,
-                            0.,
-                            gpui::transparent_black(),
-                            border,
-                            cx.theme().colors().border_selected,
-                            BorderStyle::Solid,
-                        ));
-                    }
-                }
-
-                if let Some(handle) = child.handle.as_mut() {
-                    let cursor_style = match self.axis {
-                        Axis::Vertical => CursorStyle::ResizeRow,
-                        Axis::Horizontal => CursorStyle::ResizeColumn,
-                    };
-
-                    if layout
-                        .dragged_handle
-                        .borrow()
-                        .is_some_and(|dragged_ix| dragged_ix == ix)
-                    {
-                        window.set_window_cursor_style(cursor_style);
-                    } else {
-                        window.set_cursor_style(cursor_style, &handle.hitbox);
-                    }
-
-                    window.paint_quad(gpui::fill(
-                        handle.divider_bounds,
-                        cx.theme().colors().pane_group_border,
-                    ));
-
-                    window.on_mouse_event({
-                        let dragged_handle = layout.dragged_handle.clone();
-                        let flexes = self.flexes.clone();
-                        let workspace = self.workspace.clone();
-                        let handle_hitbox = handle.hitbox.clone();
-                        move |e: &MouseDownEvent, phase, window, cx| {
-                            if phase.bubble() && handle_hitbox.is_hovered(window) {
-                                dragged_handle.replace(Some(ix));
-                                if e.click_count >= 2 {
-                                    let mut borrow = flexes.lock();
-                                    *borrow = vec![1.; borrow.len()];
-                                    workspace
-                                        .update(cx, |this, cx| this.serialize_workspace(window, cx))
-                                        .log_err();
-
-                                    window.refresh();
-                                }
-                                cx.stop_propagation();
-                            }
-                        }
-                    });
-                    window.on_mouse_event({
-                        let workspace = self.workspace.clone();
-                        let dragged_handle = layout.dragged_handle.clone();
-                        let flexes = self.flexes.clone();
-                        let child_bounds = child.bounds;
-                        let axis = self.axis;
-                        move |e: &MouseMoveEvent, phase, window, cx| {
-                            let dragged_handle = dragged_handle.borrow();
-                            if phase.bubble() && *dragged_handle == Some(ix) {
-                                Self::compute_resize(
-                                    &flexes,
-                                    e,
-                                    ix,
-                                    axis,
-                                    child_bounds.origin,
-                                    bounds.size,
-                                    workspace.clone(),
-                                    window,
-                                    cx,
-                                )
-                            }
-                        }
-                    });
-                }
-            }
-
-            window.on_mouse_event({
-                let dragged_handle = layout.dragged_handle.clone();
-                move |_: &MouseUpEvent, phase, _window, _cx| {
-                    if phase.bubble() {
-                        dragged_handle.replace(None);
-                    }
-                }
-            });
-        }
-    }
-
-    impl ParentElement for PaneAxisElement {
-        fn extend(&mut self, elements: impl IntoIterator<Item = AnyElement>) {
-            self.children.extend(elements)
-        }
-    }
-
-    fn flex_values_in_bounds(flexes: &[f32]) -> bool {
-        (flexes.iter().copied().sum::<f32>() - flexes.len() as f32).abs() < 0.001
-    }
-}
diff --git a/crates/workspace/src/path_list.rs b/crates/workspace/src/path_list.rs
deleted file mode 100644
index 035f9e44fc..0000000000
--- a/crates/workspace/src/path_list.rs
+++ /dev/null
@@ -1,196 +0,0 @@
-use std::{
-    path::{Path, PathBuf},
-    sync::Arc,
-};
-
-use itertools::Itertools;
-use util::paths::SanitizedPath;
-
-/// A list of absolute paths, in a specific order.
-///
-/// The paths are stored in lexicographic order, so that they can be compared to
-/// other path lists without regard to the order of the paths.
-///
-/// The paths can be retrieved in the original order using `ordered_paths()`.
-#[derive(Default, PartialEq, Eq, Debug, Clone)]
-pub struct PathList {
-    /// The paths, in lexicographic order.
-    paths: Arc<[PathBuf]>,
-    /// The order in which the paths were provided.
-    ///
-    /// See `ordered_paths()` for a way to get the paths in the original order.
-    order: Arc<[usize]>,
-}
-
-#[derive(Debug)]
-pub struct SerializedPathList {
-    pub paths: String,
-    pub order: String,
-}
-
-impl PathList {
-    pub fn new<P: AsRef<Path>>(paths: &[P]) -> Self {
-        let mut indexed_paths: Vec<(usize, PathBuf)> = paths
-            .iter()
-            .enumerate()
-            .map(|(ix, path)| (ix, SanitizedPath::new(path).into()))
-            .collect();
-        indexed_paths.sort_by(|(_, a), (_, b)| a.cmp(b));
-        let order = indexed_paths.iter().map(|e| e.0).collect::<Vec<_>>().into();
-        let paths = indexed_paths
-            .into_iter()
-            .map(|e| e.1)
-            .collect::<Vec<_>>()
-            .into();
-        Self { order, paths }
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.paths.is_empty()
-    }
-
-    /// Get the paths in lexicographic order.
-    pub fn paths(&self) -> &[PathBuf] {
-        self.paths.as_ref()
-    }
-
-    /// Get the order in which the paths were provided.
-    pub fn order(&self) -> &[usize] {
-        self.order.as_ref()
-    }
-
-    /// Get the paths in the original order.
-    pub fn ordered_paths(&self) -> impl Iterator<Item = &PathBuf> {
-        self.order
-            .iter()
-            .zip(self.paths.iter())
-            .sorted_by_key(|(i, _)| **i)
-            .map(|(_, path)| path)
-    }
-
-    pub fn is_lexicographically_ordered(&self) -> bool {
-        self.order.iter().enumerate().all(|(i, &j)| i == j)
-    }
-
-    pub fn deserialize(serialized: &SerializedPathList) -> Self {
-        let mut paths: Vec<PathBuf> = if serialized.paths.is_empty() {
-            Vec::new()
-        } else {
-            serialized.paths.split('\n').map(PathBuf::from).collect()
-        };
-
-        let mut order: Vec<usize> = serialized
-            .order
-            .split(',')
-            .filter_map(|s| s.parse().ok())
-            .collect();
-
-        if !paths.is_sorted() || order.len() != paths.len() {
-            order = (0..paths.len()).collect();
-            paths.sort();
-        }
-
-        Self {
-            paths: paths.into(),
-            order: order.into(),
-        }
-    }
-
-    pub fn serialize(&self) -> SerializedPathList {
-        use std::fmt::Write as _;
-
-        let mut paths = String::new();
-        for path in self.paths.iter() {
-            if !paths.is_empty() {
-                paths.push('\n');
-            }
-            paths.push_str(&path.to_string_lossy());
-        }
-
-        let mut order = String::new();
-        for ix in self.order.iter() {
-            if !order.is_empty() {
-                order.push(',');
-            }
-            write!(&mut order, "{}", *ix).unwrap();
-        }
-        SerializedPathList { paths, order }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_path_list() {
-        let list1 = PathList::new(&["a/d", "a/c"]);
-        let list2 = PathList::new(&["a/c", "a/d"]);
-
-        assert_eq!(list1.paths(), list2.paths(), "paths differ");
-        assert_eq!(list1.order(), &[1, 0], "list1 order incorrect");
-        assert_eq!(list2.order(), &[0, 1], "list2 order incorrect");
-
-        let list1_deserialized = PathList::deserialize(&list1.serialize());
-        assert_eq!(list1_deserialized, list1, "list1 deserialization failed");
-
-        let list2_deserialized = PathList::deserialize(&list2.serialize());
-        assert_eq!(list2_deserialized, list2, "list2 deserialization failed");
-
-        assert_eq!(
-            list1.ordered_paths().collect_array().unwrap(),
-            [&PathBuf::from("a/d"), &PathBuf::from("a/c")],
-            "list1 ordered paths incorrect"
-        );
-        assert_eq!(
-            list2.ordered_paths().collect_array().unwrap(),
-            [&PathBuf::from("a/c"), &PathBuf::from("a/d")],
-            "list2 ordered paths incorrect"
-        );
-    }
-
-    #[test]
-    fn test_path_list_ordering() {
-        let list = PathList::new(&["b", "a", "c"]);
-        assert_eq!(
-            list.paths(),
-            &[PathBuf::from("a"), PathBuf::from("b"), PathBuf::from("c")]
-        );
-        assert_eq!(list.order(), &[1, 0, 2]);
-        assert!(!list.is_lexicographically_ordered());
-
-        let serialized = list.serialize();
-        let deserialized = PathList::deserialize(&serialized);
-        assert_eq!(deserialized, list);
-
-        assert_eq!(
-            deserialized.ordered_paths().collect_array().unwrap(),
-            [
-                &PathBuf::from("b"),
-                &PathBuf::from("a"),
-                &PathBuf::from("c")
-            ]
-        );
-
-        let list = PathList::new(&["b", "c", "a"]);
-        assert_eq!(
-            list.paths(),
-            &[PathBuf::from("a"), PathBuf::from("b"), PathBuf::from("c")]
-        );
-        assert_eq!(list.order(), &[2, 0, 1]);
-        assert!(!list.is_lexicographically_ordered());
-
-        let serialized = list.serialize();
-        let deserialized = PathList::deserialize(&serialized);
-        assert_eq!(deserialized, list);
-
-        assert_eq!(
-            deserialized.ordered_paths().collect_array().unwrap(),
-            [
-                &PathBuf::from("b"),
-                &PathBuf::from("c"),
-                &PathBuf::from("a"),
-            ]
-        );
-    }
-}
diff --git a/crates/workspace/src/persistence.rs b/crates/workspace/src/persistence.rs
deleted file mode 100644
index f1835caf8d..0000000000
--- a/crates/workspace/src/persistence.rs
+++ /dev/null
@@ -1,3051 +0,0 @@
-pub mod model;
-
-use std::{
-    borrow::Cow,
-    collections::BTreeMap,
-    path::{Path, PathBuf},
-    str::FromStr,
-    sync::Arc,
-};
-
-use anyhow::{Context as _, Result, bail};
-use collections::{HashMap, IndexSet};
-use db::{
-    query,
-    sqlez::{connection::Connection, domain::Domain},
-    sqlez_macros::sql,
-};
-use gpui::{Axis, Bounds, Task, WindowBounds, WindowId, point, size};
-use project::debugger::breakpoint_store::{BreakpointState, SourceBreakpoint};
-
-use language::{LanguageName, Toolchain, ToolchainScope};
-use project::WorktreeId;
-use remote::{
-    DockerConnectionOptions, RemoteConnectionOptions, SshConnectionOptions, WslConnectionOptions,
-};
-use sqlez::{
-    bindable::{Bind, Column, StaticColumnCount},
-    statement::Statement,
-    thread_safe_connection::ThreadSafeConnection,
-};
-
-use ui::{App, SharedString, px};
-use util::{ResultExt, maybe, rel_path::RelPath};
-use uuid::Uuid;
-
-use crate::{
-    WorkspaceId,
-    path_list::{PathList, SerializedPathList},
-    persistence::model::RemoteConnectionKind,
-};
-
-use model::{
-    GroupId, ItemId, PaneId, RemoteConnectionId, SerializedItem, SerializedPane,
-    SerializedPaneGroup, SerializedWorkspace,
-};
-
-use self::model::{DockStructure, SerializedWorkspaceLocation};
-
-#[derive(Copy, Clone, Debug, PartialEq)]
-pub(crate) struct SerializedAxis(pub(crate) gpui::Axis);
-impl sqlez::bindable::StaticColumnCount for SerializedAxis {}
-impl sqlez::bindable::Bind for SerializedAxis {
-    fn bind(
-        &self,
-        statement: &sqlez::statement::Statement,
-        start_index: i32,
-    ) -> anyhow::Result<i32> {
-        match self.0 {
-            gpui::Axis::Horizontal => "Horizontal",
-            gpui::Axis::Vertical => "Vertical",
-        }
-        .bind(statement, start_index)
-    }
-}
-
-impl sqlez::bindable::Column for SerializedAxis {
-    fn column(
-        statement: &mut sqlez::statement::Statement,
-        start_index: i32,
-    ) -> anyhow::Result<(Self, i32)> {
-        String::column(statement, start_index).and_then(|(axis_text, next_index)| {
-            Ok((
-                match axis_text.as_str() {
-                    "Horizontal" => Self(Axis::Horizontal),
-                    "Vertical" => Self(Axis::Vertical),
-                    _ => anyhow::bail!("Stored serialized item kind is incorrect"),
-                },
-                next_index,
-            ))
-        })
-    }
-}
-
-#[derive(Copy, Clone, Debug, PartialEq, Default)]
-pub(crate) struct SerializedWindowBounds(pub(crate) WindowBounds);
-
-impl StaticColumnCount for SerializedWindowBounds {
-    fn column_count() -> usize {
-        5
-    }
-}
-
-impl Bind for SerializedWindowBounds {
-    fn bind(&self, statement: &Statement, start_index: i32) -> Result<i32> {
-        match self.0 {
-            WindowBounds::Windowed(bounds) => {
-                let next_index = statement.bind(&"Windowed", start_index)?;
-                statement.bind(
-                    &(
-                        SerializedPixels(bounds.origin.x),
-                        SerializedPixels(bounds.origin.y),
-                        SerializedPixels(bounds.size.width),
-                        SerializedPixels(bounds.size.height),
-                    ),
-                    next_index,
-                )
-            }
-            WindowBounds::Maximized(bounds) => {
-                let next_index = statement.bind(&"Maximized", start_index)?;
-                statement.bind(
-                    &(
-                        SerializedPixels(bounds.origin.x),
-                        SerializedPixels(bounds.origin.y),
-                        SerializedPixels(bounds.size.width),
-                        SerializedPixels(bounds.size.height),
-                    ),
-                    next_index,
-                )
-            }
-            WindowBounds::Fullscreen(bounds) => {
-                let next_index = statement.bind(&"FullScreen", start_index)?;
-                statement.bind(
-                    &(
-                        SerializedPixels(bounds.origin.x),
-                        SerializedPixels(bounds.origin.y),
-                        SerializedPixels(bounds.size.width),
-                        SerializedPixels(bounds.size.height),
-                    ),
-                    next_index,
-                )
-            }
-        }
-    }
-}
-
-impl Column for SerializedWindowBounds {
-    fn column(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
-        let (window_state, next_index) = String::column(statement, start_index)?;
-        let ((x, y, width, height), _): ((i32, i32, i32, i32), _) =
-            Column::column(statement, next_index)?;
-        let bounds = Bounds {
-            origin: point(px(x as f32), px(y as f32)),
-            size: size(px(width as f32), px(height as f32)),
-        };
-
-        let status = match window_state.as_str() {
-            "Windowed" | "Fixed" => SerializedWindowBounds(WindowBounds::Windowed(bounds)),
-            "Maximized" => SerializedWindowBounds(WindowBounds::Maximized(bounds)),
-            "FullScreen" => SerializedWindowBounds(WindowBounds::Fullscreen(bounds)),
-            _ => bail!("Window State did not have a valid string"),
-        };
-
-        Ok((status, next_index + 4))
-    }
-}
-
-#[derive(Debug)]
-pub struct Breakpoint {
-    pub position: u32,
-    pub message: Option<Arc<str>>,
-    pub condition: Option<Arc<str>>,
-    pub hit_condition: Option<Arc<str>>,
-    pub state: BreakpointState,
-}
-
-/// Wrapper for DB type of a breakpoint
-struct BreakpointStateWrapper<'a>(Cow<'a, BreakpointState>);
-
-impl From<BreakpointState> for BreakpointStateWrapper<'static> {
-    fn from(kind: BreakpointState) -> Self {
-        BreakpointStateWrapper(Cow::Owned(kind))
-    }
-}
-
-impl StaticColumnCount for BreakpointStateWrapper<'_> {
-    fn column_count() -> usize {
-        1
-    }
-}
-
-impl Bind for BreakpointStateWrapper<'_> {
-    fn bind(&self, statement: &Statement, start_index: i32) -> anyhow::Result<i32> {
-        statement.bind(&self.0.to_int(), start_index)
-    }
-}
-
-impl Column for BreakpointStateWrapper<'_> {
-    fn column(statement: &mut Statement, start_index: i32) -> anyhow::Result<(Self, i32)> {
-        let state = statement.column_int(start_index)?;
-
-        match state {
-            0 => Ok((BreakpointState::Enabled.into(), start_index + 1)),
-            1 => Ok((BreakpointState::Disabled.into(), start_index + 1)),
-            _ => anyhow::bail!("Invalid BreakpointState discriminant {state}"),
-        }
-    }
-}
-
-impl sqlez::bindable::StaticColumnCount for Breakpoint {
-    fn column_count() -> usize {
-        // Position, log message, condition message, and hit condition message
-        4 + BreakpointStateWrapper::column_count()
-    }
-}
-
-impl sqlez::bindable::Bind for Breakpoint {
-    fn bind(
-        &self,
-        statement: &sqlez::statement::Statement,
-        start_index: i32,
-    ) -> anyhow::Result<i32> {
-        let next_index = statement.bind(&self.position, start_index)?;
-        let next_index = statement.bind(&self.message, next_index)?;
-        let next_index = statement.bind(&self.condition, next_index)?;
-        let next_index = statement.bind(&self.hit_condition, next_index)?;
-        statement.bind(
-            &BreakpointStateWrapper(Cow::Borrowed(&self.state)),
-            next_index,
-        )
-    }
-}
-
-impl Column for Breakpoint {
-    fn column(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
-        let position = statement
-            .column_int(start_index)
-            .with_context(|| format!("Failed to read BreakPoint at index {start_index}"))?
-            as u32;
-        let (message, next_index) = Option::<String>::column(statement, start_index + 1)?;
-        let (condition, next_index) = Option::<String>::column(statement, next_index)?;
-        let (hit_condition, next_index) = Option::<String>::column(statement, next_index)?;
-        let (state, next_index) = BreakpointStateWrapper::column(statement, next_index)?;
-
-        Ok((
-            Breakpoint {
-                position,
-                message: message.map(Arc::from),
-                condition: condition.map(Arc::from),
-                hit_condition: hit_condition.map(Arc::from),
-                state: state.0.into_owned(),
-            },
-            next_index,
-        ))
-    }
-}
-
-#[derive(Clone, Debug, PartialEq)]
-struct SerializedPixels(gpui::Pixels);
-impl sqlez::bindable::StaticColumnCount for SerializedPixels {}
-
-impl sqlez::bindable::Bind for SerializedPixels {
-    fn bind(
-        &self,
-        statement: &sqlez::statement::Statement,
-        start_index: i32,
-    ) -> anyhow::Result<i32> {
-        let this: i32 = u32::from(self.0) as _;
-        this.bind(statement, start_index)
-    }
-}
-
-pub struct WorkspaceDb(ThreadSafeConnection);
-
-impl Domain for WorkspaceDb {
-    const NAME: &str = stringify!(WorkspaceDb);
-
-    const MIGRATIONS: &[&str] = &[
-        sql!(
-            CREATE TABLE workspaces(
-                workspace_id INTEGER PRIMARY KEY,
-                workspace_location BLOB UNIQUE,
-                dock_visible INTEGER, // Deprecated. Preserving so users can downgrade Zed.
-                dock_anchor TEXT, // Deprecated. Preserving so users can downgrade Zed.
-                dock_pane INTEGER, // Deprecated.  Preserving so users can downgrade Zed.
-                left_sidebar_open INTEGER, // Boolean
-                timestamp TEXT DEFAULT CURRENT_TIMESTAMP NOT NULL,
-                FOREIGN KEY(dock_pane) REFERENCES panes(pane_id)
-            ) STRICT;
-
-            CREATE TABLE pane_groups(
-                group_id INTEGER PRIMARY KEY,
-                workspace_id INTEGER NOT NULL,
-                parent_group_id INTEGER, // NULL indicates that this is a root node
-                position INTEGER, // NULL indicates that this is a root node
-                axis TEXT NOT NULL, // Enum: 'Vertical' / 'Horizontal'
-                FOREIGN KEY(workspace_id) REFERENCES workspaces(workspace_id)
-                ON DELETE CASCADE
-                ON UPDATE CASCADE,
-                FOREIGN KEY(parent_group_id) REFERENCES pane_groups(group_id) ON DELETE CASCADE
-            ) STRICT;
-
-            CREATE TABLE panes(
-                pane_id INTEGER PRIMARY KEY,
-                workspace_id INTEGER NOT NULL,
-                active INTEGER NOT NULL, // Boolean
-                FOREIGN KEY(workspace_id) REFERENCES workspaces(workspace_id)
-                ON DELETE CASCADE
-                ON UPDATE CASCADE
-            ) STRICT;
-
-            CREATE TABLE center_panes(
-                pane_id INTEGER PRIMARY KEY,
-                parent_group_id INTEGER, // NULL means that this is a root pane
-                position INTEGER, // NULL means that this is a root pane
-                FOREIGN KEY(pane_id) REFERENCES panes(pane_id)
-                ON DELETE CASCADE,
-                FOREIGN KEY(parent_group_id) REFERENCES pane_groups(group_id) ON DELETE CASCADE
-            ) STRICT;
-
-            CREATE TABLE items(
-                item_id INTEGER NOT NULL, // This is the item's view id, so this is not unique
-                workspace_id INTEGER NOT NULL,
-                pane_id INTEGER NOT NULL,
-                kind TEXT NOT NULL,
-                position INTEGER NOT NULL,
-                active INTEGER NOT NULL,
-                FOREIGN KEY(workspace_id) REFERENCES workspaces(workspace_id)
-                ON DELETE CASCADE
-                ON UPDATE CASCADE,
-                FOREIGN KEY(pane_id) REFERENCES panes(pane_id)
-                ON DELETE CASCADE,
-                PRIMARY KEY(item_id, workspace_id)
-            ) STRICT;
-        ),
-        sql!(
-            ALTER TABLE workspaces ADD COLUMN window_state TEXT;
-            ALTER TABLE workspaces ADD COLUMN window_x REAL;
-            ALTER TABLE workspaces ADD COLUMN window_y REAL;
-            ALTER TABLE workspaces ADD COLUMN window_width REAL;
-            ALTER TABLE workspaces ADD COLUMN window_height REAL;
-            ALTER TABLE workspaces ADD COLUMN display BLOB;
-        ),
-        // Drop foreign key constraint from workspaces.dock_pane to panes table.
-        sql!(
-            CREATE TABLE workspaces_2(
-                workspace_id INTEGER PRIMARY KEY,
-                workspace_location BLOB UNIQUE,
-                dock_visible INTEGER, // Deprecated. Preserving so users can downgrade Zed.
-                dock_anchor TEXT, // Deprecated. Preserving so users can downgrade Zed.
-                dock_pane INTEGER, // Deprecated.  Preserving so users can downgrade Zed.
-                left_sidebar_open INTEGER, // Boolean
-                timestamp TEXT DEFAULT CURRENT_TIMESTAMP NOT NULL,
-                window_state TEXT,
-                window_x REAL,
-                window_y REAL,
-                window_width REAL,
-                window_height REAL,
-                display BLOB
-            ) STRICT;
-            INSERT INTO workspaces_2 SELECT * FROM workspaces;
-            DROP TABLE workspaces;
-            ALTER TABLE workspaces_2 RENAME TO workspaces;
-        ),
-        // Add panels related information
-        sql!(
-            ALTER TABLE workspaces ADD COLUMN left_dock_visible INTEGER; //bool
-            ALTER TABLE workspaces ADD COLUMN left_dock_active_panel TEXT;
-            ALTER TABLE workspaces ADD COLUMN right_dock_visible INTEGER; //bool
-            ALTER TABLE workspaces ADD COLUMN right_dock_active_panel TEXT;
-            ALTER TABLE workspaces ADD COLUMN bottom_dock_visible INTEGER; //bool
-            ALTER TABLE workspaces ADD COLUMN bottom_dock_active_panel TEXT;
-        ),
-        // Add panel zoom persistence
-        sql!(
-            ALTER TABLE workspaces ADD COLUMN left_dock_zoom INTEGER; //bool
-            ALTER TABLE workspaces ADD COLUMN right_dock_zoom INTEGER; //bool
-            ALTER TABLE workspaces ADD COLUMN bottom_dock_zoom INTEGER; //bool
-        ),
-        // Add pane group flex data
-        sql!(
-            ALTER TABLE pane_groups ADD COLUMN flexes TEXT;
-        ),
-        // Add fullscreen field to workspace
-        // Deprecated, `WindowBounds` holds the fullscreen state now.
-        // Preserving so users can downgrade Zed.
-        sql!(
-            ALTER TABLE workspaces ADD COLUMN fullscreen INTEGER; //bool
-        ),
-        // Add preview field to items
-        sql!(
-            ALTER TABLE items ADD COLUMN preview INTEGER; //bool
-        ),
-        // Add centered_layout field to workspace
-        sql!(
-            ALTER TABLE workspaces ADD COLUMN centered_layout INTEGER; //bool
-        ),
-        sql!(
-            CREATE TABLE remote_projects (
-                remote_project_id INTEGER NOT NULL UNIQUE,
-                path TEXT,
-                dev_server_name TEXT
-            );
-            ALTER TABLE workspaces ADD COLUMN remote_project_id INTEGER;
-            ALTER TABLE workspaces RENAME COLUMN workspace_location TO local_paths;
-        ),
-        sql!(
-            DROP TABLE remote_projects;
-            CREATE TABLE dev_server_projects (
-                id INTEGER NOT NULL UNIQUE,
-                path TEXT,
-                dev_server_name TEXT
-            );
-            ALTER TABLE workspaces DROP COLUMN remote_project_id;
-            ALTER TABLE workspaces ADD COLUMN dev_server_project_id INTEGER;
-        ),
-        sql!(
-            ALTER TABLE workspaces ADD COLUMN local_paths_order BLOB;
-        ),
-        sql!(
-            ALTER TABLE workspaces ADD COLUMN session_id TEXT DEFAULT NULL;
-        ),
-        sql!(
-            ALTER TABLE workspaces ADD COLUMN window_id INTEGER DEFAULT NULL;
-        ),
-        sql!(
-            ALTER TABLE panes ADD COLUMN pinned_count INTEGER DEFAULT 0;
-        ),
-        sql!(
-            CREATE TABLE ssh_projects (
-                id INTEGER PRIMARY KEY,
-                host TEXT NOT NULL,
-                port INTEGER,
-                path TEXT NOT NULL,
-                user TEXT
-            );
-            ALTER TABLE workspaces ADD COLUMN ssh_project_id INTEGER REFERENCES ssh_projects(id) ON DELETE CASCADE;
-        ),
-        sql!(
-            ALTER TABLE ssh_projects RENAME COLUMN path TO paths;
-        ),
-        sql!(
-            CREATE TABLE toolchains (
-                workspace_id INTEGER,
-                worktree_id INTEGER,
-                language_name TEXT NOT NULL,
-                name TEXT NOT NULL,
-                path TEXT NOT NULL,
-                PRIMARY KEY (workspace_id, worktree_id, language_name)
-            );
-        ),
-        sql!(
-            ALTER TABLE toolchains ADD COLUMN raw_json TEXT DEFAULT "{}";
-        ),
-        sql!(
-            CREATE TABLE breakpoints (
-                workspace_id INTEGER NOT NULL,
-                path TEXT NOT NULL,
-                breakpoint_location INTEGER NOT NULL,
-                kind INTEGER NOT NULL,
-                log_message TEXT,
-                FOREIGN KEY(workspace_id) REFERENCES workspaces(workspace_id)
-                ON DELETE CASCADE
-                ON UPDATE CASCADE
-            );
-        ),
-        sql!(
-            ALTER TABLE workspaces ADD COLUMN local_paths_array TEXT;
-            CREATE UNIQUE INDEX local_paths_array_uq ON workspaces(local_paths_array);
-            ALTER TABLE workspaces ADD COLUMN local_paths_order_array TEXT;
-        ),
-        sql!(
-            ALTER TABLE breakpoints ADD COLUMN state INTEGER DEFAULT(0) NOT NULL
-        ),
-        sql!(
-            ALTER TABLE breakpoints DROP COLUMN kind
-        ),
-        sql!(ALTER TABLE toolchains ADD COLUMN relative_worktree_path TEXT DEFAULT "" NOT NULL),
-        sql!(
-            ALTER TABLE breakpoints ADD COLUMN condition TEXT;
-            ALTER TABLE breakpoints ADD COLUMN hit_condition TEXT;
-        ),
-        sql!(CREATE TABLE toolchains2 (
-            workspace_id INTEGER,
-            worktree_id INTEGER,
-            language_name TEXT NOT NULL,
-            name TEXT NOT NULL,
-            path TEXT NOT NULL,
-            raw_json TEXT NOT NULL,
-            relative_worktree_path TEXT NOT NULL,
-            PRIMARY KEY (workspace_id, worktree_id, language_name, relative_worktree_path)) STRICT;
-            INSERT INTO toolchains2
-                SELECT * FROM toolchains;
-            DROP TABLE toolchains;
-            ALTER TABLE toolchains2 RENAME TO toolchains;
-        ),
-        sql!(
-            CREATE TABLE ssh_connections (
-                id INTEGER PRIMARY KEY,
-                host TEXT NOT NULL,
-                port INTEGER,
-                user TEXT
-            );
-
-            INSERT INTO ssh_connections (host, port, user)
-            SELECT DISTINCT host, port, user
-            FROM ssh_projects;
-
-            CREATE TABLE workspaces_2(
-                workspace_id INTEGER PRIMARY KEY,
-                paths TEXT,
-                paths_order TEXT,
-                ssh_connection_id INTEGER REFERENCES ssh_connections(id),
-                timestamp TEXT DEFAULT CURRENT_TIMESTAMP NOT NULL,
-                window_state TEXT,
-                window_x REAL,
-                window_y REAL,
-                window_width REAL,
-                window_height REAL,
-                display BLOB,
-                left_dock_visible INTEGER,
-                left_dock_active_panel TEXT,
-                right_dock_visible INTEGER,
-                right_dock_active_panel TEXT,
-                bottom_dock_visible INTEGER,
-                bottom_dock_active_panel TEXT,
-                left_dock_zoom INTEGER,
-                right_dock_zoom INTEGER,
-                bottom_dock_zoom INTEGER,
-                fullscreen INTEGER,
-                centered_layout INTEGER,
-                session_id TEXT,
-                window_id INTEGER
-            ) STRICT;
-
-            INSERT
-            INTO workspaces_2
-            SELECT
-                workspaces.workspace_id,
-                CASE
-                    WHEN ssh_projects.id IS NOT NULL THEN ssh_projects.paths
-                    ELSE
-                        CASE
-                            WHEN workspaces.local_paths_array IS NULL OR workspaces.local_paths_array = "" THEN
-                                NULL
-                            ELSE
-                                replace(workspaces.local_paths_array, ',', CHAR(10))
-                        END
-                END as paths,
-
-                CASE
-                    WHEN ssh_projects.id IS NOT NULL THEN ""
-                    ELSE workspaces.local_paths_order_array
-                END as paths_order,
-
-                CASE
-                    WHEN ssh_projects.id IS NOT NULL THEN (
-                        SELECT ssh_connections.id
-                        FROM ssh_connections
-                        WHERE
-                            ssh_connections.host IS ssh_projects.host AND
-                            ssh_connections.port IS ssh_projects.port AND
-                            ssh_connections.user IS ssh_projects.user
-                    )
-                    ELSE NULL
-                END as ssh_connection_id,
-
-                workspaces.timestamp,
-                workspaces.window_state,
-                workspaces.window_x,
-                workspaces.window_y,
-                workspaces.window_width,
-                workspaces.window_height,
-                workspaces.display,
-                workspaces.left_dock_visible,
-                workspaces.left_dock_active_panel,
-                workspaces.right_dock_visible,
-                workspaces.right_dock_active_panel,
-                workspaces.bottom_dock_visible,
-                workspaces.bottom_dock_active_panel,
-                workspaces.left_dock_zoom,
-                workspaces.right_dock_zoom,
-                workspaces.bottom_dock_zoom,
-                workspaces.fullscreen,
-                workspaces.centered_layout,
-                workspaces.session_id,
-                workspaces.window_id
-            FROM
-                workspaces LEFT JOIN
-                ssh_projects ON
-                workspaces.ssh_project_id = ssh_projects.id;
-
-            DELETE FROM workspaces_2
-            WHERE workspace_id NOT IN (
-                SELECT MAX(workspace_id)
-                FROM workspaces_2
-                GROUP BY ssh_connection_id, paths
-            );
-
-            DROP TABLE ssh_projects;
-            DROP TABLE workspaces;
-            ALTER TABLE workspaces_2 RENAME TO workspaces;
-
-            CREATE UNIQUE INDEX ix_workspaces_location ON workspaces(ssh_connection_id, paths);
-        ),
-        // Fix any data from when workspaces.paths were briefly encoded as JSON arrays
-        sql!(
-            UPDATE workspaces
-            SET paths = CASE
-                WHEN substr(paths, 1, 2) = '[' || '"' AND substr(paths, -2, 2) = '"' || ']' THEN
-                    replace(
-                        substr(paths, 3, length(paths) - 4),
-                        '"' || ',' || '"',
-                        CHAR(10)
-                    )
-                ELSE
-                    replace(paths, ',', CHAR(10))
-            END
-            WHERE paths IS NOT NULL
-        ),
-        sql!(
-            CREATE TABLE remote_connections(
-                id INTEGER PRIMARY KEY,
-                kind TEXT NOT NULL,
-                host TEXT,
-                port INTEGER,
-                user TEXT,
-                distro TEXT
-            );
-
-            CREATE TABLE workspaces_2(
-                workspace_id INTEGER PRIMARY KEY,
-                paths TEXT,
-                paths_order TEXT,
-                remote_connection_id INTEGER REFERENCES remote_connections(id),
-                timestamp TEXT DEFAULT CURRENT_TIMESTAMP NOT NULL,
-                window_state TEXT,
-                window_x REAL,
-                window_y REAL,
-                window_width REAL,
-                window_height REAL,
-                display BLOB,
-                left_dock_visible INTEGER,
-                left_dock_active_panel TEXT,
-                right_dock_visible INTEGER,
-                right_dock_active_panel TEXT,
-                bottom_dock_visible INTEGER,
-                bottom_dock_active_panel TEXT,
-                left_dock_zoom INTEGER,
-                right_dock_zoom INTEGER,
-                bottom_dock_zoom INTEGER,
-                fullscreen INTEGER,
-                centered_layout INTEGER,
-                session_id TEXT,
-                window_id INTEGER
-            ) STRICT;
-
-            INSERT INTO remote_connections
-            SELECT
-                id,
-                "ssh" as kind,
-                host,
-                port,
-                user,
-                NULL as distro
-            FROM ssh_connections;
-
-            INSERT
-            INTO workspaces_2
-            SELECT
-                workspace_id,
-                paths,
-                paths_order,
-                ssh_connection_id as remote_connection_id,
-                timestamp,
-                window_state,
-                window_x,
-                window_y,
-                window_width,
-                window_height,
-                display,
-                left_dock_visible,
-                left_dock_active_panel,
-                right_dock_visible,
-                right_dock_active_panel,
-                bottom_dock_visible,
-                bottom_dock_active_panel,
-                left_dock_zoom,
-                right_dock_zoom,
-                bottom_dock_zoom,
-                fullscreen,
-                centered_layout,
-                session_id,
-                window_id
-            FROM
-                workspaces;
-
-            DROP TABLE workspaces;
-            ALTER TABLE workspaces_2 RENAME TO workspaces;
-
-            CREATE UNIQUE INDEX ix_workspaces_location ON workspaces(remote_connection_id, paths);
-        ),
-        sql!(CREATE TABLE user_toolchains (
-            remote_connection_id INTEGER,
-            workspace_id INTEGER NOT NULL,
-            worktree_id INTEGER NOT NULL,
-            relative_worktree_path TEXT NOT NULL,
-            language_name TEXT NOT NULL,
-            name TEXT NOT NULL,
-            path TEXT NOT NULL,
-            raw_json TEXT NOT NULL,
-
-            PRIMARY KEY (workspace_id, worktree_id, relative_worktree_path, language_name, name, path, raw_json)
-        ) STRICT;),
-        sql!(
-            DROP TABLE ssh_connections;
-        ),
-        sql!(
-            ALTER TABLE remote_connections ADD COLUMN name TEXT;
-            ALTER TABLE remote_connections ADD COLUMN container_id TEXT;
-        ),
-    ];
-
-    // Allow recovering from bad migration that was initially shipped to nightly
-    // when introducing the ssh_connections table.
-    fn should_allow_migration_change(_index: usize, old: &str, new: &str) -> bool {
-        old.starts_with("CREATE TABLE ssh_connections")
-            && new.starts_with("CREATE TABLE ssh_connections")
-    }
-}
-
-db::static_connection!(DB, WorkspaceDb, []);
-
-impl WorkspaceDb {
-    /// Returns a serialized workspace for the given worktree_roots. If the passed array
-    /// is empty, the most recent workspace is returned instead. If no workspace for the
-    /// passed roots is stored, returns none.
-    pub(crate) fn workspace_for_roots<P: AsRef<Path>>(
-        &self,
-        worktree_roots: &[P],
-    ) -> Option<SerializedWorkspace> {
-        self.workspace_for_roots_internal(worktree_roots, None)
-    }
-
-    pub(crate) fn remote_workspace_for_roots<P: AsRef<Path>>(
-        &self,
-        worktree_roots: &[P],
-        remote_project_id: RemoteConnectionId,
-    ) -> Option<SerializedWorkspace> {
-        self.workspace_for_roots_internal(worktree_roots, Some(remote_project_id))
-    }
-
-    pub(crate) fn workspace_for_roots_internal<P: AsRef<Path>>(
-        &self,
-        worktree_roots: &[P],
-        remote_connection_id: Option<RemoteConnectionId>,
-    ) -> Option<SerializedWorkspace> {
-        // paths are sorted before db interactions to ensure that the order of the paths
-        // doesn't affect the workspace selection for existing workspaces
-        let root_paths = PathList::new(worktree_roots);
-
-        // Note that we re-assign the workspace_id here in case it's empty
-        // and we've grabbed the most recent workspace
-        let (
-            workspace_id,
-            paths,
-            paths_order,
-            window_bounds,
-            display,
-            centered_layout,
-            docks,
-            window_id,
-        ): (
-            WorkspaceId,
-            String,
-            String,
-            Option<SerializedWindowBounds>,
-            Option<Uuid>,
-            Option<bool>,
-            DockStructure,
-            Option<u64>,
-        ) = self
-            .select_row_bound(sql! {
-                SELECT
-                    workspace_id,
-                    paths,
-                    paths_order,
-                    window_state,
-                    window_x,
-                    window_y,
-                    window_width,
-                    window_height,
-                    display,
-                    centered_layout,
-                    left_dock_visible,
-                    left_dock_active_panel,
-                    left_dock_zoom,
-                    right_dock_visible,
-                    right_dock_active_panel,
-                    right_dock_zoom,
-                    bottom_dock_visible,
-                    bottom_dock_active_panel,
-                    bottom_dock_zoom,
-                    window_id
-                FROM workspaces
-                WHERE
-                    paths IS ? AND
-                    remote_connection_id IS ?
-                LIMIT 1
-            })
-            .and_then(|mut prepared_statement| {
-                (prepared_statement)((
-                    root_paths.serialize().paths,
-                    remote_connection_id.map(|id| id.0 as i32),
-                ))
-            })
-            .context("No workspaces found")
-            .warn_on_err()
-            .flatten()?;
-
-        let paths = PathList::deserialize(&SerializedPathList {
-            paths,
-            order: paths_order,
-        });
-
-        let remote_connection_options = if let Some(remote_connection_id) = remote_connection_id {
-            self.remote_connection(remote_connection_id)
-                .context("Get remote connection")
-                .log_err()
-        } else {
-            None
-        };
-
-        Some(SerializedWorkspace {
-            id: workspace_id,
-            location: match remote_connection_options {
-                Some(options) => SerializedWorkspaceLocation::Remote(options),
-                None => SerializedWorkspaceLocation::Local,
-            },
-            paths,
-            center_group: self
-                .get_center_pane_group(workspace_id)
-                .context("Getting center group")
-                .log_err()?,
-            window_bounds,
-            centered_layout: centered_layout.unwrap_or(false),
-            display,
-            docks,
-            session_id: None,
-            breakpoints: self.breakpoints(workspace_id),
-            window_id,
-            user_toolchains: self.user_toolchains(workspace_id, remote_connection_id),
-        })
-    }
-
-    fn breakpoints(&self, workspace_id: WorkspaceId) -> BTreeMap<Arc<Path>, Vec<SourceBreakpoint>> {
-        let breakpoints: Result<Vec<(PathBuf, Breakpoint)>> = self
-            .select_bound(sql! {
-                SELECT path, breakpoint_location, log_message, condition, hit_condition, state
-                FROM breakpoints
-                WHERE workspace_id = ?
-            })
-            .and_then(|mut prepared_statement| (prepared_statement)(workspace_id));
-
-        match breakpoints {
-            Ok(bp) => {
-                if bp.is_empty() {
-                    log::debug!("Breakpoints are empty after querying database for them");
-                }
-
-                let mut map: BTreeMap<Arc<Path>, Vec<SourceBreakpoint>> = Default::default();
-
-                for (path, breakpoint) in bp {
-                    let path: Arc<Path> = path.into();
-                    map.entry(path.clone()).or_default().push(SourceBreakpoint {
-                        row: breakpoint.position,
-                        path,
-                        message: breakpoint.message,
-                        condition: breakpoint.condition,
-                        hit_condition: breakpoint.hit_condition,
-                        state: breakpoint.state,
-                    });
-                }
-
-                for (path, bps) in map.iter() {
-                    log::info!(
-                        "Got {} breakpoints from database at path: {}",
-                        bps.len(),
-                        path.to_string_lossy()
-                    );
-                }
-
-                map
-            }
-            Err(msg) => {
-                log::error!("Breakpoints query failed with msg: {msg}");
-                Default::default()
-            }
-        }
-    }
-
-    fn user_toolchains(
-        &self,
-        workspace_id: WorkspaceId,
-        remote_connection_id: Option<RemoteConnectionId>,
-    ) -> BTreeMap<ToolchainScope, IndexSet<Toolchain>> {
-        type RowKind = (WorkspaceId, u64, String, String, String, String, String);
-
-        let toolchains: Vec<RowKind> = self
-            .select_bound(sql! {
-                SELECT workspace_id, worktree_id, relative_worktree_path,
-                language_name, name, path, raw_json
-                FROM user_toolchains WHERE remote_connection_id IS ?1 AND (
-                      workspace_id IN (0, ?2)
-                )
-            })
-            .and_then(|mut statement| {
-                (statement)((remote_connection_id.map(|id| id.0), workspace_id))
-            })
-            .unwrap_or_default();
-        let mut ret = BTreeMap::<_, IndexSet<_>>::default();
-
-        for (
-            _workspace_id,
-            worktree_id,
-            relative_worktree_path,
-            language_name,
-            name,
-            path,
-            raw_json,
-        ) in toolchains
-        {
-            // INTEGER's that are primary keys (like workspace ids, remote connection ids and such) start at 1, so we're safe to
-            let scope = if _workspace_id == WorkspaceId(0) {
-                debug_assert_eq!(worktree_id, u64::MAX);
-                debug_assert_eq!(relative_worktree_path, String::default());
-                ToolchainScope::Global
-            } else {
-                debug_assert_eq!(workspace_id, _workspace_id);
-                debug_assert_eq!(
-                    worktree_id == u64::MAX,
-                    relative_worktree_path == String::default()
-                );
-
-                let Some(relative_path) = RelPath::unix(&relative_worktree_path).log_err() else {
-                    continue;
-                };
-                if worktree_id != u64::MAX && relative_worktree_path != String::default() {
-                    ToolchainScope::Subproject(
-                        WorktreeId::from_usize(worktree_id as usize),
-                        relative_path.into(),
-                    )
-                } else {
-                    ToolchainScope::Project
-                }
-            };
-            let Ok(as_json) = serde_json::from_str(&raw_json) else {
-                continue;
-            };
-            let toolchain = Toolchain {
-                name: SharedString::from(name),
-                path: SharedString::from(path),
-                language_name: LanguageName::from_proto(language_name),
-                as_json,
-            };
-            ret.entry(scope).or_default().insert(toolchain);
-        }
-
-        ret
-    }
-
-    /// Saves a workspace using the worktree roots. Will garbage collect any workspaces
-    /// that used this workspace previously
-    pub(crate) async fn save_workspace(&self, workspace: SerializedWorkspace) {
-        let paths = workspace.paths.serialize();
-        log::debug!("Saving workspace at location: {:?}", workspace.location);
-        self.write(move |conn| {
-            conn.with_savepoint("update_worktrees", || {
-                let remote_connection_id = match workspace.location.clone() {
-                    SerializedWorkspaceLocation::Local => None,
-                    SerializedWorkspaceLocation::Remote(connection_options) => {
-                        Some(Self::get_or_create_remote_connection_internal(
-                            conn,
-                            connection_options
-                        )?.0)
-                    }
-                };
-
-                // Clear out panes and pane_groups
-                conn.exec_bound(sql!(
-                    DELETE FROM pane_groups WHERE workspace_id = ?1;
-                    DELETE FROM panes WHERE workspace_id = ?1;))?(workspace.id)
-                    .context("Clearing old panes")?;
-
-                conn.exec_bound(
-                    sql!(
-                        DELETE FROM breakpoints WHERE workspace_id = ?1;
-                    )
-                )?(workspace.id).context("Clearing old breakpoints")?;
-
-                for (path, breakpoints) in workspace.breakpoints {
-                    for bp in breakpoints {
-                        let state = BreakpointStateWrapper::from(bp.state);
-                        match conn.exec_bound(sql!(
-                            INSERT INTO breakpoints (workspace_id, path, breakpoint_location,  log_message, condition, hit_condition, state)
-                            VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7);))?
-
-                        ((
-                            workspace.id,
-                            path.as_ref(),
-                            bp.row,
-                            bp.message,
-                            bp.condition,
-                            bp.hit_condition,
-                            state,
-                        )) {
-                            Ok(_) => {
-                                log::debug!("Stored breakpoint at row: {} in path: {}", bp.row, path.to_string_lossy())
-                            }
-                            Err(err) => {
-                                log::error!("{err}");
-                                continue;
-                            }
-                        }
-                    }
-                }
-
-                conn.exec_bound(
-                    sql!(
-                        DELETE FROM user_toolchains WHERE workspace_id = ?1;
-                    )
-                )?(workspace.id).context("Clearing old user toolchains")?;
-
-                for (scope, toolchains) in workspace.user_toolchains {
-                    for toolchain in toolchains {
-                        let query = sql!(INSERT OR REPLACE INTO user_toolchains(remote_connection_id, workspace_id, worktree_id, relative_worktree_path, language_name, name, path, raw_json) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8));
-                        let (workspace_id, worktree_id, relative_worktree_path) = match scope {
-                            ToolchainScope::Subproject(worktree_id, ref path) => (Some(workspace.id), Some(worktree_id), Some(path.as_unix_str().to_owned())),
-                            ToolchainScope::Project => (Some(workspace.id), None, None),
-                            ToolchainScope::Global => (None, None, None),
-                        };
-                        let args = (remote_connection_id, workspace_id.unwrap_or(WorkspaceId(0)), worktree_id.map_or(usize::MAX,|id| id.to_usize()), relative_worktree_path.unwrap_or_default(),
-                        toolchain.language_name.as_ref().to_owned(), toolchain.name.to_string(), toolchain.path.to_string(), toolchain.as_json.to_string());
-                        if let Err(err) = conn.exec_bound(query)?(args) {
-                            log::error!("{err}");
-                            continue;
-                        }
-                    }
-                }
-
-                conn.exec_bound(sql!(
-                    DELETE
-                    FROM workspaces
-                    WHERE
-                        workspace_id != ?1 AND
-                        paths IS ?2 AND
-                        remote_connection_id IS ?3
-                ))?((
-                    workspace.id,
-                    paths.paths.clone(),
-                    remote_connection_id,
-                ))
-                .context("clearing out old locations")?;
-
-                // Upsert
-                let query = sql!(
-                    INSERT INTO workspaces(
-                        workspace_id,
-                        paths,
-                        paths_order,
-                        remote_connection_id,
-                        left_dock_visible,
-                        left_dock_active_panel,
-                        left_dock_zoom,
-                        right_dock_visible,
-                        right_dock_active_panel,
-                        right_dock_zoom,
-                        bottom_dock_visible,
-                        bottom_dock_active_panel,
-                        bottom_dock_zoom,
-                        session_id,
-                        window_id,
-                        timestamp
-                    )
-                    VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13, ?14, ?15, CURRENT_TIMESTAMP)
-                    ON CONFLICT DO
-                    UPDATE SET
-                        paths = ?2,
-                        paths_order = ?3,
-                        remote_connection_id = ?4,
-                        left_dock_visible = ?5,
-                        left_dock_active_panel = ?6,
-                        left_dock_zoom = ?7,
-                        right_dock_visible = ?8,
-                        right_dock_active_panel = ?9,
-                        right_dock_zoom = ?10,
-                        bottom_dock_visible = ?11,
-                        bottom_dock_active_panel = ?12,
-                        bottom_dock_zoom = ?13,
-                        session_id = ?14,
-                        window_id = ?15,
-                        timestamp = CURRENT_TIMESTAMP
-                );
-                let mut prepared_query = conn.exec_bound(query)?;
-                let args = (
-                    workspace.id,
-                    paths.paths.clone(),
-                    paths.order.clone(),
-                    remote_connection_id,
-                    workspace.docks,
-                    workspace.session_id,
-                    workspace.window_id,
-                );
-
-                prepared_query(args).context("Updating workspace")?;
-
-                // Save center pane group
-                Self::save_pane_group(conn, workspace.id, &workspace.center_group, None)
-                    .context("save pane group in save workspace")?;
-
-                Ok(())
-            })
-            .log_err();
-        })
-        .await;
-    }
-
-    pub(crate) async fn get_or_create_remote_connection(
-        &self,
-        options: RemoteConnectionOptions,
-    ) -> Result<RemoteConnectionId> {
-        self.write(move |conn| Self::get_or_create_remote_connection_internal(conn, options))
-            .await
-    }
-
-    fn get_or_create_remote_connection_internal(
-        this: &Connection,
-        options: RemoteConnectionOptions,
-    ) -> Result<RemoteConnectionId> {
-        let kind;
-        let mut user = None;
-        let mut host = None;
-        let mut port = None;
-        let mut distro = None;
-        let mut name = None;
-        let mut container_id = None;
-        match options {
-            RemoteConnectionOptions::Ssh(options) => {
-                kind = RemoteConnectionKind::Ssh;
-                host = Some(options.host);
-                port = options.port;
-                user = options.username;
-            }
-            RemoteConnectionOptions::Wsl(options) => {
-                kind = RemoteConnectionKind::Wsl;
-                distro = Some(options.distro_name);
-                user = options.user;
-            }
-            RemoteConnectionOptions::Docker(options) => {
-                kind = RemoteConnectionKind::Docker;
-                container_id = Some(options.container_id);
-                name = Some(options.name);
-            }
-        }
-        Self::get_or_create_remote_connection_query(
-            this,
-            kind,
-            host,
-            port,
-            user,
-            distro,
-            name,
-            container_id,
-        )
-    }
-
-    fn get_or_create_remote_connection_query(
-        this: &Connection,
-        kind: RemoteConnectionKind,
-        host: Option<String>,
-        port: Option<u16>,
-        user: Option<String>,
-        distro: Option<String>,
-        name: Option<String>,
-        container_id: Option<String>,
-    ) -> Result<RemoteConnectionId> {
-        if let Some(id) = this.select_row_bound(sql!(
-            SELECT id
-            FROM remote_connections
-            WHERE
-                kind IS ? AND
-                host IS ? AND
-                port IS ? AND
-                user IS ? AND
-                distro IS ? AND
-                name IS ? AND
-                container_id IS ?
-            LIMIT 1
-        ))?((
-            kind.serialize(),
-            host.clone(),
-            port,
-            user.clone(),
-            distro.clone(),
-            name.clone(),
-            container_id.clone(),
-        ))? {
-            Ok(RemoteConnectionId(id))
-        } else {
-            let id = this.select_row_bound(sql!(
-                INSERT INTO remote_connections (
-                    kind,
-                    host,
-                    port,
-                    user,
-                    distro,
-                    name,
-                    container_id
-                ) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7)
-                RETURNING id
-            ))?((
-                kind.serialize(),
-                host,
-                port,
-                user,
-                distro,
-                name,
-                container_id,
-            ))?
-            .context("failed to insert remote project")?;
-            Ok(RemoteConnectionId(id))
-        }
-    }
-
-    query! {
-        pub async fn next_id() -> Result<WorkspaceId> {
-            INSERT INTO workspaces DEFAULT VALUES RETURNING workspace_id
-        }
-    }
-
-    fn recent_workspaces(
-        &self,
-    ) -> Result<Vec<(WorkspaceId, PathList, Option<RemoteConnectionId>)>> {
-        Ok(self
-            .recent_workspaces_query()?
-            .into_iter()
-            .map(|(id, paths, order, remote_connection_id)| {
-                (
-                    id,
-                    PathList::deserialize(&SerializedPathList { paths, order }),
-                    remote_connection_id.map(RemoteConnectionId),
-                )
-            })
-            .collect())
-    }
-
-    query! {
-        fn recent_workspaces_query() -> Result<Vec<(WorkspaceId, String, String, Option<u64>)>> {
-            SELECT workspace_id, paths, paths_order, remote_connection_id
-            FROM workspaces
-            WHERE
-                paths IS NOT NULL OR
-                remote_connection_id IS NOT NULL
-            ORDER BY timestamp DESC
-        }
-    }
-
-    fn session_workspaces(
-        &self,
-        session_id: String,
-    ) -> Result<Vec<(PathList, Option<u64>, Option<RemoteConnectionId>)>> {
-        Ok(self
-            .session_workspaces_query(session_id)?
-            .into_iter()
-            .map(|(paths, order, window_id, remote_connection_id)| {
-                (
-                    PathList::deserialize(&SerializedPathList { paths, order }),
-                    window_id,
-                    remote_connection_id.map(RemoteConnectionId),
-                )
-            })
-            .collect())
-    }
-
-    query! {
-        fn session_workspaces_query(session_id: String) -> Result<Vec<(String, String, Option<u64>, Option<u64>)>> {
-            SELECT paths, paths_order, window_id, remote_connection_id
-            FROM workspaces
-            WHERE session_id = ?1
-            ORDER BY timestamp DESC
-        }
-    }
-
-    query! {
-        pub fn breakpoints_for_file(workspace_id: WorkspaceId, file_path: &Path) -> Result<Vec<Breakpoint>> {
-            SELECT breakpoint_location
-            FROM breakpoints
-            WHERE  workspace_id= ?1 AND path = ?2
-        }
-    }
-
-    query! {
-        pub fn clear_breakpoints(file_path: &Path) -> Result<()> {
-            DELETE FROM breakpoints
-            WHERE file_path = ?2
-        }
-    }
-
-    fn remote_connections(&self) -> Result<HashMap<RemoteConnectionId, RemoteConnectionOptions>> {
-        Ok(self.select(sql!(
-            SELECT
-                id, kind, host, port, user, distro, container_id, name
-            FROM
-                remote_connections
-        ))?()?
-        .into_iter()
-        .filter_map(|(id, kind, host, port, user, distro, container_id, name)| {
-            Some((
-                RemoteConnectionId(id),
-                Self::remote_connection_from_row(
-                    kind,
-                    host,
-                    port,
-                    user,
-                    distro,
-                    container_id,
-                    name,
-                )?,
-            ))
-        })
-        .collect())
-    }
-
-    pub(crate) fn remote_connection(
-        &self,
-        id: RemoteConnectionId,
-    ) -> Result<RemoteConnectionOptions> {
-        let (kind, host, port, user, distro, container_id, name) = self.select_row_bound(sql!(
-            SELECT kind, host, port, user, distro, container_id, name
-            FROM remote_connections
-            WHERE id = ?
-        ))?(id.0)?
-        .context("no such remote connection")?;
-        Self::remote_connection_from_row(kind, host, port, user, distro, container_id, name)
-            .context("invalid remote_connection row")
-    }
-
-    fn remote_connection_from_row(
-        kind: String,
-        host: Option<String>,
-        port: Option<u16>,
-        user: Option<String>,
-        distro: Option<String>,
-        container_id: Option<String>,
-        name: Option<String>,
-    ) -> Option<RemoteConnectionOptions> {
-        match RemoteConnectionKind::deserialize(&kind)? {
-            RemoteConnectionKind::Wsl => Some(RemoteConnectionOptions::Wsl(WslConnectionOptions {
-                distro_name: distro?,
-                user: user,
-            })),
-            RemoteConnectionKind::Ssh => Some(RemoteConnectionOptions::Ssh(SshConnectionOptions {
-                host: host?,
-                port,
-                username: user,
-                ..Default::default()
-            })),
-            RemoteConnectionKind::Docker => {
-                Some(RemoteConnectionOptions::Docker(DockerConnectionOptions {
-                    container_id: container_id?,
-                    name: name?,
-                    upload_binary_over_docker_exec: false,
-                }))
-            }
-        }
-    }
-
-    pub(crate) fn last_window(
-        &self,
-    ) -> anyhow::Result<(Option<Uuid>, Option<SerializedWindowBounds>)> {
-        let mut prepared_query =
-            self.select::<(Option<Uuid>, Option<SerializedWindowBounds>)>(sql!(
-                SELECT
-                display,
-                window_state, window_x, window_y, window_width, window_height
-                FROM workspaces
-                WHERE paths
-                IS NOT NULL
-                ORDER BY timestamp DESC
-                LIMIT 1
-            ))?;
-        let result = prepared_query()?;
-        Ok(result.into_iter().next().unwrap_or((None, None)))
-    }
-
-    query! {
-        pub async fn delete_workspace_by_id(id: WorkspaceId) -> Result<()> {
-            DELETE FROM workspaces
-            WHERE workspace_id IS ?
-        }
-    }
-
-    // Returns the recent locations which are still valid on disk and deletes ones which no longer
-    // exist.
-    pub async fn recent_workspaces_on_disk(
-        &self,
-    ) -> Result<Vec<(WorkspaceId, SerializedWorkspaceLocation, PathList)>> {
-        let mut result = Vec::new();
-        let mut delete_tasks = Vec::new();
-        let remote_connections = self.remote_connections()?;
-
-        for (id, paths, remote_connection_id) in self.recent_workspaces()? {
-            if let Some(remote_connection_id) = remote_connection_id {
-                if let Some(connection_options) = remote_connections.get(&remote_connection_id) {
-                    result.push((
-                        id,
-                        SerializedWorkspaceLocation::Remote(connection_options.clone()),
-                        paths,
-                    ));
-                } else {
-                    delete_tasks.push(self.delete_workspace_by_id(id));
-                }
-                continue;
-            }
-
-            let has_wsl_path = if cfg!(windows) {
-                paths
-                    .paths()
-                    .iter()
-                    .any(|path| util::paths::WslPath::from_path(path).is_some())
-            } else {
-                false
-            };
-
-            // Delete the workspace if any of the paths are WSL paths.
-            // If a local workspace points to WSL, this check will cause us to wait for the
-            // WSL VM and file server to boot up. This can block for many seconds.
-            // Supported scenarios use remote workspaces.
-            if !has_wsl_path && paths.paths().iter().all(|path| path.exists()) {
-                // Only show directories in recent projects
-                if paths.paths().iter().any(|path| path.is_dir()) {
-                    result.push((id, SerializedWorkspaceLocation::Local, paths));
-                }
-            } else {
-                delete_tasks.push(self.delete_workspace_by_id(id));
-            }
-        }
-
-        futures::future::join_all(delete_tasks).await;
-        Ok(result)
-    }
-
-    pub async fn last_workspace(&self) -> Result<Option<(SerializedWorkspaceLocation, PathList)>> {
-        Ok(self
-            .recent_workspaces_on_disk()
-            .await?
-            .into_iter()
-            .next()
-            .map(|(_, location, paths)| (location, paths)))
-    }
-
-    // Returns the locations of the workspaces that were still opened when the last
-    // session was closed (i.e. when Zed was quit).
-    // If `last_session_window_order` is provided, the returned locations are ordered
-    // according to that.
-    pub fn last_session_workspace_locations(
-        &self,
-        last_session_id: &str,
-        last_session_window_stack: Option<Vec<WindowId>>,
-    ) -> Result<Vec<(SerializedWorkspaceLocation, PathList)>> {
-        let mut workspaces = Vec::new();
-
-        for (paths, window_id, remote_connection_id) in
-            self.session_workspaces(last_session_id.to_owned())?
-        {
-            if let Some(remote_connection_id) = remote_connection_id {
-                workspaces.push((
-                    SerializedWorkspaceLocation::Remote(
-                        self.remote_connection(remote_connection_id)?,
-                    ),
-                    paths,
-                    window_id.map(WindowId::from),
-                ));
-            } else if paths.paths().iter().all(|path| path.exists())
-                && paths.paths().iter().any(|path| path.is_dir())
-            {
-                workspaces.push((
-                    SerializedWorkspaceLocation::Local,
-                    paths,
-                    window_id.map(WindowId::from),
-                ));
-            }
-        }
-
-        if let Some(stack) = last_session_window_stack {
-            workspaces.sort_by_key(|(_, _, window_id)| {
-                window_id
-                    .and_then(|id| stack.iter().position(|&order_id| order_id == id))
-                    .unwrap_or(usize::MAX)
-            });
-        }
-
-        Ok(workspaces
-            .into_iter()
-            .map(|(location, paths, _)| (location, paths))
-            .collect::<Vec<_>>())
-    }
-
-    fn get_center_pane_group(&self, workspace_id: WorkspaceId) -> Result<SerializedPaneGroup> {
-        Ok(self
-            .get_pane_group(workspace_id, None)?
-            .into_iter()
-            .next()
-            .unwrap_or_else(|| {
-                SerializedPaneGroup::Pane(SerializedPane {
-                    active: true,
-                    children: vec![],
-                    pinned_count: 0,
-                })
-            }))
-    }
-
-    fn get_pane_group(
-        &self,
-        workspace_id: WorkspaceId,
-        group_id: Option<GroupId>,
-    ) -> Result<Vec<SerializedPaneGroup>> {
-        type GroupKey = (Option<GroupId>, WorkspaceId);
-        type GroupOrPane = (
-            Option<GroupId>,
-            Option<SerializedAxis>,
-            Option<PaneId>,
-            Option<bool>,
-            Option<usize>,
-            Option<String>,
-        );
-        self.select_bound::<GroupKey, GroupOrPane>(sql!(
-            SELECT group_id, axis, pane_id, active, pinned_count, flexes
-                FROM (SELECT
-                        group_id,
-                        axis,
-                        NULL as pane_id,
-                        NULL as active,
-                        NULL as pinned_count,
-                        position,
-                        parent_group_id,
-                        workspace_id,
-                        flexes
-                      FROM pane_groups
-                    UNION
-                      SELECT
-                        NULL,
-                        NULL,
-                        center_panes.pane_id,
-                        panes.active as active,
-                        pinned_count,
-                        position,
-                        parent_group_id,
-                        panes.workspace_id as workspace_id,
-                        NULL
-                      FROM center_panes
-                      JOIN panes ON center_panes.pane_id = panes.pane_id)
-                WHERE parent_group_id IS ? AND workspace_id = ?
-                ORDER BY position
-        ))?((group_id, workspace_id))?
-        .into_iter()
-        .map(|(group_id, axis, pane_id, active, pinned_count, flexes)| {
-            let maybe_pane = maybe!({ Some((pane_id?, active?, pinned_count?)) });
-            if let Some((group_id, axis)) = group_id.zip(axis) {
-                let flexes = flexes
-                    .map(|flexes: String| serde_json::from_str::<Vec<f32>>(&flexes))
-                    .transpose()?;
-
-                Ok(SerializedPaneGroup::Group {
-                    axis,
-                    children: self.get_pane_group(workspace_id, Some(group_id))?,
-                    flexes,
-                })
-            } else if let Some((pane_id, active, pinned_count)) = maybe_pane {
-                Ok(SerializedPaneGroup::Pane(SerializedPane::new(
-                    self.get_items(pane_id)?,
-                    active,
-                    pinned_count,
-                )))
-            } else {
-                bail!("Pane Group Child was neither a pane group or a pane");
-            }
-        })
-        // Filter out panes and pane groups which don't have any children or items
-        .filter(|pane_group| match pane_group {
-            Ok(SerializedPaneGroup::Group { children, .. }) => !children.is_empty(),
-            Ok(SerializedPaneGroup::Pane(pane)) => !pane.children.is_empty(),
-            _ => true,
-        })
-        .collect::<Result<_>>()
-    }
-
-    fn save_pane_group(
-        conn: &Connection,
-        workspace_id: WorkspaceId,
-        pane_group: &SerializedPaneGroup,
-        parent: Option<(GroupId, usize)>,
-    ) -> Result<()> {
-        if parent.is_none() {
-            log::debug!("Saving a pane group for workspace {workspace_id:?}");
-        }
-        match pane_group {
-            SerializedPaneGroup::Group {
-                axis,
-                children,
-                flexes,
-            } => {
-                let (parent_id, position) = parent.unzip();
-
-                let flex_string = flexes
-                    .as_ref()
-                    .map(|flexes| serde_json::json!(flexes).to_string());
-
-                let group_id = conn.select_row_bound::<_, i64>(sql!(
-                    INSERT INTO pane_groups(
-                        workspace_id,
-                        parent_group_id,
-                        position,
-                        axis,
-                        flexes
-                    )
-                    VALUES (?, ?, ?, ?, ?)
-                    RETURNING group_id
-                ))?((
-                    workspace_id,
-                    parent_id,
-                    position,
-                    *axis,
-                    flex_string,
-                ))?
-                .context("Couldn't retrieve group_id from inserted pane_group")?;
-
-                for (position, group) in children.iter().enumerate() {
-                    Self::save_pane_group(conn, workspace_id, group, Some((group_id, position)))?
-                }
-
-                Ok(())
-            }
-            SerializedPaneGroup::Pane(pane) => {
-                Self::save_pane(conn, workspace_id, pane, parent)?;
-                Ok(())
-            }
-        }
-    }
-
-    fn save_pane(
-        conn: &Connection,
-        workspace_id: WorkspaceId,
-        pane: &SerializedPane,
-        parent: Option<(GroupId, usize)>,
-    ) -> Result<PaneId> {
-        let pane_id = conn.select_row_bound::<_, i64>(sql!(
-            INSERT INTO panes(workspace_id, active, pinned_count)
-            VALUES (?, ?, ?)
-            RETURNING pane_id
-        ))?((workspace_id, pane.active, pane.pinned_count))?
-        .context("Could not retrieve inserted pane_id")?;
-
-        let (parent_id, order) = parent.unzip();
-        conn.exec_bound(sql!(
-            INSERT INTO center_panes(pane_id, parent_group_id, position)
-            VALUES (?, ?, ?)
-        ))?((pane_id, parent_id, order))?;
-
-        Self::save_items(conn, workspace_id, pane_id, &pane.children).context("Saving items")?;
-
-        Ok(pane_id)
-    }
-
-    fn get_items(&self, pane_id: PaneId) -> Result<Vec<SerializedItem>> {
-        self.select_bound(sql!(
-            SELECT kind, item_id, active, preview FROM items
-            WHERE pane_id = ?
-                ORDER BY position
-        ))?(pane_id)
-    }
-
-    fn save_items(
-        conn: &Connection,
-        workspace_id: WorkspaceId,
-        pane_id: PaneId,
-        items: &[SerializedItem],
-    ) -> Result<()> {
-        let mut insert = conn.exec_bound(sql!(
-            INSERT INTO items(workspace_id, pane_id, position, kind, item_id, active, preview) VALUES (?, ?, ?, ?, ?, ?, ?)
-        )).context("Preparing insertion")?;
-        for (position, item) in items.iter().enumerate() {
-            insert((workspace_id, pane_id, position, item))?;
-        }
-
-        Ok(())
-    }
-
-    query! {
-        pub async fn update_timestamp(workspace_id: WorkspaceId) -> Result<()> {
-            UPDATE workspaces
-            SET timestamp = CURRENT_TIMESTAMP
-            WHERE workspace_id = ?
-        }
-    }
-
-    query! {
-        pub(crate) async fn set_window_open_status(workspace_id: WorkspaceId, bounds: SerializedWindowBounds, display: Uuid) -> Result<()> {
-            UPDATE workspaces
-            SET window_state = ?2,
-                window_x = ?3,
-                window_y = ?4,
-                window_width = ?5,
-                window_height = ?6,
-                display = ?7
-            WHERE workspace_id = ?1
-        }
-    }
-
-    query! {
-        pub(crate) async fn set_centered_layout(workspace_id: WorkspaceId, centered_layout: bool) -> Result<()> {
-            UPDATE workspaces
-            SET centered_layout = ?2
-            WHERE workspace_id = ?1
-        }
-    }
-
-    query! {
-        pub(crate) async fn set_session_id(workspace_id: WorkspaceId, session_id: Option<String>) -> Result<()> {
-            UPDATE workspaces
-            SET session_id = ?2
-            WHERE workspace_id = ?1
-        }
-    }
-
-    pub(crate) async fn toolchains(
-        &self,
-        workspace_id: WorkspaceId,
-    ) -> Result<Vec<(Toolchain, WorktreeId, Arc<RelPath>)>> {
-        self.write(move |this| {
-            let mut select = this
-                .select_bound(sql!(
-                    SELECT
-                        name, path, worktree_id, relative_worktree_path, language_name, raw_json
-                    FROM toolchains
-                    WHERE workspace_id = ?
-                ))
-                .context("select toolchains")?;
-
-            let toolchain: Vec<(String, String, u64, String, String, String)> =
-                select(workspace_id)?;
-
-            Ok(toolchain
-                .into_iter()
-                .filter_map(
-                    |(name, path, worktree_id, relative_worktree_path, language, json)| {
-                        Some((
-                            Toolchain {
-                                name: name.into(),
-                                path: path.into(),
-                                language_name: LanguageName::new(&language),
-                                as_json: serde_json::Value::from_str(&json).ok()?,
-                            },
-                            WorktreeId::from_proto(worktree_id),
-                            RelPath::from_proto(&relative_worktree_path).log_err()?,
-                        ))
-                    },
-                )
-                .collect())
-        })
-        .await
-    }
-
-    pub async fn set_toolchain(
-        &self,
-        workspace_id: WorkspaceId,
-        worktree_id: WorktreeId,
-        relative_worktree_path: Arc<RelPath>,
-        toolchain: Toolchain,
-    ) -> Result<()> {
-        log::debug!(
-            "Setting toolchain for workspace, worktree: {worktree_id:?}, relative path: {relative_worktree_path:?}, toolchain: {}",
-            toolchain.name
-        );
-        self.write(move |conn| {
-            let mut insert = conn
-                .exec_bound(sql!(
-                    INSERT INTO toolchains(workspace_id, worktree_id, relative_worktree_path, language_name, name, path, raw_json) VALUES (?, ?, ?, ?, ?,  ?, ?)
-                    ON CONFLICT DO
-                    UPDATE SET
-                        name = ?5,
-                        path = ?6,
-                        raw_json = ?7
-                ))
-                .context("Preparing insertion")?;
-
-            insert((
-                workspace_id,
-                worktree_id.to_usize(),
-                relative_worktree_path.as_unix_str(),
-                toolchain.language_name.as_ref(),
-                toolchain.name.as_ref(),
-                toolchain.path.as_ref(),
-                toolchain.as_json.to_string(),
-            ))?;
-
-            Ok(())
-        }).await
-    }
-}
-
-pub fn delete_unloaded_items(
-    alive_items: Vec<ItemId>,
-    workspace_id: WorkspaceId,
-    table: &'static str,
-    db: &ThreadSafeConnection,
-    cx: &mut App,
-) -> Task<Result<()>> {
-    let db = db.clone();
-    cx.spawn(async move |_| {
-        let placeholders = alive_items
-            .iter()
-            .map(|_| "?")
-            .collect::<Vec<&str>>()
-            .join(", ");
-
-        let query = format!(
-            "DELETE FROM {table} WHERE workspace_id = ? AND item_id NOT IN ({placeholders})"
-        );
-
-        db.write(move |conn| {
-            let mut statement = Statement::prepare(conn, query)?;
-            let mut next_index = statement.bind(&workspace_id, 1)?;
-            for id in alive_items {
-                next_index = statement.bind(&id, next_index)?;
-            }
-            statement.exec()
-        })
-        .await
-    })
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::persistence::model::{
-        SerializedItem, SerializedPane, SerializedPaneGroup, SerializedWorkspace,
-    };
-    use gpui;
-    use pretty_assertions::assert_eq;
-    use remote::SshConnectionOptions;
-    use std::{thread, time::Duration};
-
-    #[gpui::test]
-    async fn test_breakpoints() {
-        zlog::init_test();
-
-        let db = WorkspaceDb::open_test_db("test_breakpoints").await;
-        let id = db.next_id().await.unwrap();
-
-        let path = Path::new("/tmp/test.rs");
-
-        let breakpoint = Breakpoint {
-            position: 123,
-            message: None,
-            state: BreakpointState::Enabled,
-            condition: None,
-            hit_condition: None,
-        };
-
-        let log_breakpoint = Breakpoint {
-            position: 456,
-            message: Some("Test log message".into()),
-            state: BreakpointState::Enabled,
-            condition: None,
-            hit_condition: None,
-        };
-
-        let disable_breakpoint = Breakpoint {
-            position: 578,
-            message: None,
-            state: BreakpointState::Disabled,
-            condition: None,
-            hit_condition: None,
-        };
-
-        let condition_breakpoint = Breakpoint {
-            position: 789,
-            message: None,
-            state: BreakpointState::Enabled,
-            condition: Some("x > 5".into()),
-            hit_condition: None,
-        };
-
-        let hit_condition_breakpoint = Breakpoint {
-            position: 999,
-            message: None,
-            state: BreakpointState::Enabled,
-            condition: None,
-            hit_condition: Some(">= 3".into()),
-        };
-
-        let workspace = SerializedWorkspace {
-            id,
-            paths: PathList::new(&["/tmp"]),
-            location: SerializedWorkspaceLocation::Local,
-            center_group: Default::default(),
-            window_bounds: Default::default(),
-            display: Default::default(),
-            docks: Default::default(),
-            centered_layout: false,
-            breakpoints: {
-                let mut map = collections::BTreeMap::default();
-                map.insert(
-                    Arc::from(path),
-                    vec![
-                        SourceBreakpoint {
-                            row: breakpoint.position,
-                            path: Arc::from(path),
-                            message: breakpoint.message.clone(),
-                            state: breakpoint.state,
-                            condition: breakpoint.condition.clone(),
-                            hit_condition: breakpoint.hit_condition.clone(),
-                        },
-                        SourceBreakpoint {
-                            row: log_breakpoint.position,
-                            path: Arc::from(path),
-                            message: log_breakpoint.message.clone(),
-                            state: log_breakpoint.state,
-                            condition: log_breakpoint.condition.clone(),
-                            hit_condition: log_breakpoint.hit_condition.clone(),
-                        },
-                        SourceBreakpoint {
-                            row: disable_breakpoint.position,
-                            path: Arc::from(path),
-                            message: disable_breakpoint.message.clone(),
-                            state: disable_breakpoint.state,
-                            condition: disable_breakpoint.condition.clone(),
-                            hit_condition: disable_breakpoint.hit_condition.clone(),
-                        },
-                        SourceBreakpoint {
-                            row: condition_breakpoint.position,
-                            path: Arc::from(path),
-                            message: condition_breakpoint.message.clone(),
-                            state: condition_breakpoint.state,
-                            condition: condition_breakpoint.condition.clone(),
-                            hit_condition: condition_breakpoint.hit_condition.clone(),
-                        },
-                        SourceBreakpoint {
-                            row: hit_condition_breakpoint.position,
-                            path: Arc::from(path),
-                            message: hit_condition_breakpoint.message.clone(),
-                            state: hit_condition_breakpoint.state,
-                            condition: hit_condition_breakpoint.condition.clone(),
-                            hit_condition: hit_condition_breakpoint.hit_condition.clone(),
-                        },
-                    ],
-                );
-                map
-            },
-            session_id: None,
-            window_id: None,
-            user_toolchains: Default::default(),
-        };
-
-        db.save_workspace(workspace.clone()).await;
-
-        let loaded = db.workspace_for_roots(&["/tmp"]).unwrap();
-        let loaded_breakpoints = loaded.breakpoints.get(&Arc::from(path)).unwrap();
-
-        assert_eq!(loaded_breakpoints.len(), 5);
-
-        // normal breakpoint
-        assert_eq!(loaded_breakpoints[0].row, breakpoint.position);
-        assert_eq!(loaded_breakpoints[0].message, breakpoint.message);
-        assert_eq!(loaded_breakpoints[0].condition, breakpoint.condition);
-        assert_eq!(
-            loaded_breakpoints[0].hit_condition,
-            breakpoint.hit_condition
-        );
-        assert_eq!(loaded_breakpoints[0].state, breakpoint.state);
-        assert_eq!(loaded_breakpoints[0].path, Arc::from(path));
-
-        // enabled breakpoint
-        assert_eq!(loaded_breakpoints[1].row, log_breakpoint.position);
-        assert_eq!(loaded_breakpoints[1].message, log_breakpoint.message);
-        assert_eq!(loaded_breakpoints[1].condition, log_breakpoint.condition);
-        assert_eq!(
-            loaded_breakpoints[1].hit_condition,
-            log_breakpoint.hit_condition
-        );
-        assert_eq!(loaded_breakpoints[1].state, log_breakpoint.state);
-        assert_eq!(loaded_breakpoints[1].path, Arc::from(path));
-
-        // disable breakpoint
-        assert_eq!(loaded_breakpoints[2].row, disable_breakpoint.position);
-        assert_eq!(loaded_breakpoints[2].message, disable_breakpoint.message);
-        assert_eq!(
-            loaded_breakpoints[2].condition,
-            disable_breakpoint.condition
-        );
-        assert_eq!(
-            loaded_breakpoints[2].hit_condition,
-            disable_breakpoint.hit_condition
-        );
-        assert_eq!(loaded_breakpoints[2].state, disable_breakpoint.state);
-        assert_eq!(loaded_breakpoints[2].path, Arc::from(path));
-
-        // condition breakpoint
-        assert_eq!(loaded_breakpoints[3].row, condition_breakpoint.position);
-        assert_eq!(loaded_breakpoints[3].message, condition_breakpoint.message);
-        assert_eq!(
-            loaded_breakpoints[3].condition,
-            condition_breakpoint.condition
-        );
-        assert_eq!(
-            loaded_breakpoints[3].hit_condition,
-            condition_breakpoint.hit_condition
-        );
-        assert_eq!(loaded_breakpoints[3].state, condition_breakpoint.state);
-        assert_eq!(loaded_breakpoints[3].path, Arc::from(path));
-
-        // hit condition breakpoint
-        assert_eq!(loaded_breakpoints[4].row, hit_condition_breakpoint.position);
-        assert_eq!(
-            loaded_breakpoints[4].message,
-            hit_condition_breakpoint.message
-        );
-        assert_eq!(
-            loaded_breakpoints[4].condition,
-            hit_condition_breakpoint.condition
-        );
-        assert_eq!(
-            loaded_breakpoints[4].hit_condition,
-            hit_condition_breakpoint.hit_condition
-        );
-        assert_eq!(loaded_breakpoints[4].state, hit_condition_breakpoint.state);
-        assert_eq!(loaded_breakpoints[4].path, Arc::from(path));
-    }
-
-    #[gpui::test]
-    async fn test_remove_last_breakpoint() {
-        zlog::init_test();
-
-        let db = WorkspaceDb::open_test_db("test_remove_last_breakpoint").await;
-        let id = db.next_id().await.unwrap();
-
-        let singular_path = Path::new("/tmp/test_remove_last_breakpoint.rs");
-
-        let breakpoint_to_remove = Breakpoint {
-            position: 100,
-            message: None,
-            state: BreakpointState::Enabled,
-            condition: None,
-            hit_condition: None,
-        };
-
-        let workspace = SerializedWorkspace {
-            id,
-            paths: PathList::new(&["/tmp"]),
-            location: SerializedWorkspaceLocation::Local,
-            center_group: Default::default(),
-            window_bounds: Default::default(),
-            display: Default::default(),
-            docks: Default::default(),
-            centered_layout: false,
-            breakpoints: {
-                let mut map = collections::BTreeMap::default();
-                map.insert(
-                    Arc::from(singular_path),
-                    vec![SourceBreakpoint {
-                        row: breakpoint_to_remove.position,
-                        path: Arc::from(singular_path),
-                        message: None,
-                        state: BreakpointState::Enabled,
-                        condition: None,
-                        hit_condition: None,
-                    }],
-                );
-                map
-            },
-            session_id: None,
-            window_id: None,
-            user_toolchains: Default::default(),
-        };
-
-        db.save_workspace(workspace.clone()).await;
-
-        let loaded = db.workspace_for_roots(&["/tmp"]).unwrap();
-        let loaded_breakpoints = loaded.breakpoints.get(&Arc::from(singular_path)).unwrap();
-
-        assert_eq!(loaded_breakpoints.len(), 1);
-        assert_eq!(loaded_breakpoints[0].row, breakpoint_to_remove.position);
-        assert_eq!(loaded_breakpoints[0].message, breakpoint_to_remove.message);
-        assert_eq!(
-            loaded_breakpoints[0].condition,
-            breakpoint_to_remove.condition
-        );
-        assert_eq!(
-            loaded_breakpoints[0].hit_condition,
-            breakpoint_to_remove.hit_condition
-        );
-        assert_eq!(loaded_breakpoints[0].state, breakpoint_to_remove.state);
-        assert_eq!(loaded_breakpoints[0].path, Arc::from(singular_path));
-
-        let workspace_without_breakpoint = SerializedWorkspace {
-            id,
-            paths: PathList::new(&["/tmp"]),
-            location: SerializedWorkspaceLocation::Local,
-            center_group: Default::default(),
-            window_bounds: Default::default(),
-            display: Default::default(),
-            docks: Default::default(),
-            centered_layout: false,
-            breakpoints: collections::BTreeMap::default(),
-            session_id: None,
-            window_id: None,
-            user_toolchains: Default::default(),
-        };
-
-        db.save_workspace(workspace_without_breakpoint.clone())
-            .await;
-
-        let loaded_after_remove = db.workspace_for_roots(&["/tmp"]).unwrap();
-        let empty_breakpoints = loaded_after_remove
-            .breakpoints
-            .get(&Arc::from(singular_path));
-
-        assert!(empty_breakpoints.is_none());
-    }
-
-    #[gpui::test]
-    async fn test_next_id_stability() {
-        zlog::init_test();
-
-        let db = WorkspaceDb::open_test_db("test_next_id_stability").await;
-
-        db.write(|conn| {
-            conn.migrate(
-                "test_table",
-                &[sql!(
-                    CREATE TABLE test_table(
-                        text TEXT,
-                        workspace_id INTEGER,
-                        FOREIGN KEY(workspace_id) REFERENCES workspaces(workspace_id)
-                        ON DELETE CASCADE
-                    ) STRICT;
-                )],
-                |_, _, _| false,
-            )
-            .unwrap();
-        })
-        .await;
-
-        let id = db.next_id().await.unwrap();
-        // Assert the empty row got inserted
-        assert_eq!(
-            Some(id),
-            db.select_row_bound::<WorkspaceId, WorkspaceId>(sql!(
-                SELECT workspace_id FROM workspaces WHERE workspace_id = ?
-            ))
-            .unwrap()(id)
-            .unwrap()
-        );
-
-        db.write(move |conn| {
-            conn.exec_bound(sql!(INSERT INTO test_table(text, workspace_id) VALUES (?, ?)))
-                .unwrap()(("test-text-1", id))
-            .unwrap()
-        })
-        .await;
-
-        let test_text_1 = db
-            .select_row_bound::<_, String>(sql!(SELECT text FROM test_table WHERE workspace_id = ?))
-            .unwrap()(1)
-        .unwrap()
-        .unwrap();
-        assert_eq!(test_text_1, "test-text-1");
-    }
-
-    #[gpui::test]
-    async fn test_workspace_id_stability() {
-        zlog::init_test();
-
-        let db = WorkspaceDb::open_test_db("test_workspace_id_stability").await;
-
-        db.write(|conn| {
-            conn.migrate(
-                "test_table",
-                &[sql!(
-                        CREATE TABLE test_table(
-                            text TEXT,
-                            workspace_id INTEGER,
-                            FOREIGN KEY(workspace_id)
-                                REFERENCES workspaces(workspace_id)
-                            ON DELETE CASCADE
-                        ) STRICT;)],
-                |_, _, _| false,
-            )
-        })
-        .await
-        .unwrap();
-
-        let mut workspace_1 = SerializedWorkspace {
-            id: WorkspaceId(1),
-            paths: PathList::new(&["/tmp", "/tmp2"]),
-            location: SerializedWorkspaceLocation::Local,
-            center_group: Default::default(),
-            window_bounds: Default::default(),
-            display: Default::default(),
-            docks: Default::default(),
-            centered_layout: false,
-            breakpoints: Default::default(),
-            session_id: None,
-            window_id: None,
-            user_toolchains: Default::default(),
-        };
-
-        let workspace_2 = SerializedWorkspace {
-            id: WorkspaceId(2),
-            paths: PathList::new(&["/tmp"]),
-            location: SerializedWorkspaceLocation::Local,
-            center_group: Default::default(),
-            window_bounds: Default::default(),
-            display: Default::default(),
-            docks: Default::default(),
-            centered_layout: false,
-            breakpoints: Default::default(),
-            session_id: None,
-            window_id: None,
-            user_toolchains: Default::default(),
-        };
-
-        db.save_workspace(workspace_1.clone()).await;
-
-        db.write(|conn| {
-            conn.exec_bound(sql!(INSERT INTO test_table(text, workspace_id) VALUES (?, ?)))
-                .unwrap()(("test-text-1", 1))
-            .unwrap();
-        })
-        .await;
-
-        db.save_workspace(workspace_2.clone()).await;
-
-        db.write(|conn| {
-            conn.exec_bound(sql!(INSERT INTO test_table(text, workspace_id) VALUES (?, ?)))
-                .unwrap()(("test-text-2", 2))
-            .unwrap();
-        })
-        .await;
-
-        workspace_1.paths = PathList::new(&["/tmp", "/tmp3"]);
-        db.save_workspace(workspace_1.clone()).await;
-        db.save_workspace(workspace_1).await;
-        db.save_workspace(workspace_2).await;
-
-        let test_text_2 = db
-            .select_row_bound::<_, String>(sql!(SELECT text FROM test_table WHERE workspace_id = ?))
-            .unwrap()(2)
-        .unwrap()
-        .unwrap();
-        assert_eq!(test_text_2, "test-text-2");
-
-        let test_text_1 = db
-            .select_row_bound::<_, String>(sql!(SELECT text FROM test_table WHERE workspace_id = ?))
-            .unwrap()(1)
-        .unwrap()
-        .unwrap();
-        assert_eq!(test_text_1, "test-text-1");
-    }
-
-    fn group(axis: Axis, children: Vec<SerializedPaneGroup>) -> SerializedPaneGroup {
-        SerializedPaneGroup::Group {
-            axis: SerializedAxis(axis),
-            flexes: None,
-            children,
-        }
-    }
-
-    #[gpui::test]
-    async fn test_full_workspace_serialization() {
-        zlog::init_test();
-
-        let db = WorkspaceDb::open_test_db("test_full_workspace_serialization").await;
-
-        //  -----------------
-        //  | 1,2   | 5,6   |
-        //  | - - - |       |
-        //  | 3,4   |       |
-        //  -----------------
-        let center_group = group(
-            Axis::Horizontal,
-            vec![
-                group(
-                    Axis::Vertical,
-                    vec![
-                        SerializedPaneGroup::Pane(SerializedPane::new(
-                            vec![
-                                SerializedItem::new("Terminal", 5, false, false),
-                                SerializedItem::new("Terminal", 6, true, false),
-                            ],
-                            false,
-                            0,
-                        )),
-                        SerializedPaneGroup::Pane(SerializedPane::new(
-                            vec![
-                                SerializedItem::new("Terminal", 7, true, false),
-                                SerializedItem::new("Terminal", 8, false, false),
-                            ],
-                            false,
-                            0,
-                        )),
-                    ],
-                ),
-                SerializedPaneGroup::Pane(SerializedPane::new(
-                    vec![
-                        SerializedItem::new("Terminal", 9, false, false),
-                        SerializedItem::new("Terminal", 10, true, false),
-                    ],
-                    false,
-                    0,
-                )),
-            ],
-        );
-
-        let workspace = SerializedWorkspace {
-            id: WorkspaceId(5),
-            paths: PathList::new(&["/tmp", "/tmp2"]),
-            location: SerializedWorkspaceLocation::Local,
-            center_group,
-            window_bounds: Default::default(),
-            breakpoints: Default::default(),
-            display: Default::default(),
-            docks: Default::default(),
-            centered_layout: false,
-            session_id: None,
-            window_id: Some(999),
-            user_toolchains: Default::default(),
-        };
-
-        db.save_workspace(workspace.clone()).await;
-
-        let round_trip_workspace = db.workspace_for_roots(&["/tmp2", "/tmp"]);
-        assert_eq!(workspace, round_trip_workspace.unwrap());
-
-        // Test guaranteed duplicate IDs
-        db.save_workspace(workspace.clone()).await;
-        db.save_workspace(workspace.clone()).await;
-
-        let round_trip_workspace = db.workspace_for_roots(&["/tmp", "/tmp2"]);
-        assert_eq!(workspace, round_trip_workspace.unwrap());
-    }
-
-    #[gpui::test]
-    async fn test_workspace_assignment() {
-        zlog::init_test();
-
-        let db = WorkspaceDb::open_test_db("test_basic_functionality").await;
-
-        let workspace_1 = SerializedWorkspace {
-            id: WorkspaceId(1),
-            paths: PathList::new(&["/tmp", "/tmp2"]),
-            location: SerializedWorkspaceLocation::Local,
-            center_group: Default::default(),
-            window_bounds: Default::default(),
-            breakpoints: Default::default(),
-            display: Default::default(),
-            docks: Default::default(),
-            centered_layout: false,
-            session_id: None,
-            window_id: Some(1),
-            user_toolchains: Default::default(),
-        };
-
-        let mut workspace_2 = SerializedWorkspace {
-            id: WorkspaceId(2),
-            paths: PathList::new(&["/tmp"]),
-            location: SerializedWorkspaceLocation::Local,
-            center_group: Default::default(),
-            window_bounds: Default::default(),
-            display: Default::default(),
-            docks: Default::default(),
-            centered_layout: false,
-            breakpoints: Default::default(),
-            session_id: None,
-            window_id: Some(2),
-            user_toolchains: Default::default(),
-        };
-
-        db.save_workspace(workspace_1.clone()).await;
-        db.save_workspace(workspace_2.clone()).await;
-
-        // Test that paths are treated as a set
-        assert_eq!(
-            db.workspace_for_roots(&["/tmp", "/tmp2"]).unwrap(),
-            workspace_1
-        );
-        assert_eq!(
-            db.workspace_for_roots(&["/tmp2", "/tmp"]).unwrap(),
-            workspace_1
-        );
-
-        // Make sure that other keys work
-        assert_eq!(db.workspace_for_roots(&["/tmp"]).unwrap(), workspace_2);
-        assert_eq!(db.workspace_for_roots(&["/tmp3", "/tmp2", "/tmp4"]), None);
-
-        // Test 'mutate' case of updating a pre-existing id
-        workspace_2.paths = PathList::new(&["/tmp", "/tmp2"]);
-
-        db.save_workspace(workspace_2.clone()).await;
-        assert_eq!(
-            db.workspace_for_roots(&["/tmp", "/tmp2"]).unwrap(),
-            workspace_2
-        );
-
-        // Test other mechanism for mutating
-        let mut workspace_3 = SerializedWorkspace {
-            id: WorkspaceId(3),
-            paths: PathList::new(&["/tmp2", "/tmp"]),
-            location: SerializedWorkspaceLocation::Local,
-            center_group: Default::default(),
-            window_bounds: Default::default(),
-            breakpoints: Default::default(),
-            display: Default::default(),
-            docks: Default::default(),
-            centered_layout: false,
-            session_id: None,
-            window_id: Some(3),
-            user_toolchains: Default::default(),
-        };
-
-        db.save_workspace(workspace_3.clone()).await;
-        assert_eq!(
-            db.workspace_for_roots(&["/tmp", "/tmp2"]).unwrap(),
-            workspace_3
-        );
-
-        // Make sure that updating paths differently also works
-        workspace_3.paths = PathList::new(&["/tmp3", "/tmp4", "/tmp2"]);
-        db.save_workspace(workspace_3.clone()).await;
-        assert_eq!(db.workspace_for_roots(&["/tmp2", "tmp"]), None);
-        assert_eq!(
-            db.workspace_for_roots(&["/tmp2", "/tmp3", "/tmp4"])
-                .unwrap(),
-            workspace_3
-        );
-    }
-
-    #[gpui::test]
-    async fn test_session_workspaces() {
-        zlog::init_test();
-
-        let db = WorkspaceDb::open_test_db("test_serializing_workspaces_session_id").await;
-
-        let workspace_1 = SerializedWorkspace {
-            id: WorkspaceId(1),
-            paths: PathList::new(&["/tmp1"]),
-            location: SerializedWorkspaceLocation::Local,
-            center_group: Default::default(),
-            window_bounds: Default::default(),
-            display: Default::default(),
-            docks: Default::default(),
-            centered_layout: false,
-            breakpoints: Default::default(),
-            session_id: Some("session-id-1".to_owned()),
-            window_id: Some(10),
-            user_toolchains: Default::default(),
-        };
-
-        let workspace_2 = SerializedWorkspace {
-            id: WorkspaceId(2),
-            paths: PathList::new(&["/tmp2"]),
-            location: SerializedWorkspaceLocation::Local,
-            center_group: Default::default(),
-            window_bounds: Default::default(),
-            display: Default::default(),
-            docks: Default::default(),
-            centered_layout: false,
-            breakpoints: Default::default(),
-            session_id: Some("session-id-1".to_owned()),
-            window_id: Some(20),
-            user_toolchains: Default::default(),
-        };
-
-        let workspace_3 = SerializedWorkspace {
-            id: WorkspaceId(3),
-            paths: PathList::new(&["/tmp3"]),
-            location: SerializedWorkspaceLocation::Local,
-            center_group: Default::default(),
-            window_bounds: Default::default(),
-            display: Default::default(),
-            docks: Default::default(),
-            centered_layout: false,
-            breakpoints: Default::default(),
-            session_id: Some("session-id-2".to_owned()),
-            window_id: Some(30),
-            user_toolchains: Default::default(),
-        };
-
-        let workspace_4 = SerializedWorkspace {
-            id: WorkspaceId(4),
-            paths: PathList::new(&["/tmp4"]),
-            location: SerializedWorkspaceLocation::Local,
-            center_group: Default::default(),
-            window_bounds: Default::default(),
-            display: Default::default(),
-            docks: Default::default(),
-            centered_layout: false,
-            breakpoints: Default::default(),
-            session_id: None,
-            window_id: None,
-            user_toolchains: Default::default(),
-        };
-
-        let connection_id = db
-            .get_or_create_remote_connection(RemoteConnectionOptions::Ssh(SshConnectionOptions {
-                host: "my-host".to_string(),
-                port: Some(1234),
-                ..Default::default()
-            }))
-            .await
-            .unwrap();
-
-        let workspace_5 = SerializedWorkspace {
-            id: WorkspaceId(5),
-            paths: PathList::default(),
-            location: SerializedWorkspaceLocation::Remote(
-                db.remote_connection(connection_id).unwrap(),
-            ),
-            center_group: Default::default(),
-            window_bounds: Default::default(),
-            display: Default::default(),
-            docks: Default::default(),
-            centered_layout: false,
-            breakpoints: Default::default(),
-            session_id: Some("session-id-2".to_owned()),
-            window_id: Some(50),
-            user_toolchains: Default::default(),
-        };
-
-        let workspace_6 = SerializedWorkspace {
-            id: WorkspaceId(6),
-            paths: PathList::new(&["/tmp6c", "/tmp6b", "/tmp6a"]),
-            location: SerializedWorkspaceLocation::Local,
-            center_group: Default::default(),
-            window_bounds: Default::default(),
-            breakpoints: Default::default(),
-            display: Default::default(),
-            docks: Default::default(),
-            centered_layout: false,
-            session_id: Some("session-id-3".to_owned()),
-            window_id: Some(60),
-            user_toolchains: Default::default(),
-        };
-
-        db.save_workspace(workspace_1.clone()).await;
-        thread::sleep(Duration::from_millis(1000)); // Force timestamps to increment
-        db.save_workspace(workspace_2.clone()).await;
-        db.save_workspace(workspace_3.clone()).await;
-        thread::sleep(Duration::from_millis(1000)); // Force timestamps to increment
-        db.save_workspace(workspace_4.clone()).await;
-        db.save_workspace(workspace_5.clone()).await;
-        db.save_workspace(workspace_6.clone()).await;
-
-        let locations = db.session_workspaces("session-id-1".to_owned()).unwrap();
-        assert_eq!(locations.len(), 2);
-        assert_eq!(locations[0].0, PathList::new(&["/tmp2"]));
-        assert_eq!(locations[0].1, Some(20));
-        assert_eq!(locations[1].0, PathList::new(&["/tmp1"]));
-        assert_eq!(locations[1].1, Some(10));
-
-        let locations = db.session_workspaces("session-id-2".to_owned()).unwrap();
-        assert_eq!(locations.len(), 2);
-        assert_eq!(locations[0].0, PathList::default());
-        assert_eq!(locations[0].1, Some(50));
-        assert_eq!(locations[0].2, Some(connection_id));
-        assert_eq!(locations[1].0, PathList::new(&["/tmp3"]));
-        assert_eq!(locations[1].1, Some(30));
-
-        let locations = db.session_workspaces("session-id-3".to_owned()).unwrap();
-        assert_eq!(locations.len(), 1);
-        assert_eq!(
-            locations[0].0,
-            PathList::new(&["/tmp6c", "/tmp6b", "/tmp6a"]),
-        );
-        assert_eq!(locations[0].1, Some(60));
-    }
-
-    fn default_workspace<P: AsRef<Path>>(
-        paths: &[P],
-        center_group: &SerializedPaneGroup,
-    ) -> SerializedWorkspace {
-        SerializedWorkspace {
-            id: WorkspaceId(4),
-            paths: PathList::new(paths),
-            location: SerializedWorkspaceLocation::Local,
-            center_group: center_group.clone(),
-            window_bounds: Default::default(),
-            display: Default::default(),
-            docks: Default::default(),
-            breakpoints: Default::default(),
-            centered_layout: false,
-            session_id: None,
-            window_id: None,
-            user_toolchains: Default::default(),
-        }
-    }
-
-    #[gpui::test]
-    async fn test_last_session_workspace_locations() {
-        let dir1 = tempfile::TempDir::with_prefix("dir1").unwrap();
-        let dir2 = tempfile::TempDir::with_prefix("dir2").unwrap();
-        let dir3 = tempfile::TempDir::with_prefix("dir3").unwrap();
-        let dir4 = tempfile::TempDir::with_prefix("dir4").unwrap();
-
-        let db =
-            WorkspaceDb::open_test_db("test_serializing_workspaces_last_session_workspaces").await;
-
-        let workspaces = [
-            (1, vec![dir1.path()], 9),
-            (2, vec![dir2.path()], 5),
-            (3, vec![dir3.path()], 8),
-            (4, vec![dir4.path()], 2),
-            (5, vec![dir1.path(), dir2.path(), dir3.path()], 3),
-            (6, vec![dir4.path(), dir3.path(), dir2.path()], 4),
-        ]
-        .into_iter()
-        .map(|(id, paths, window_id)| SerializedWorkspace {
-            id: WorkspaceId(id),
-            paths: PathList::new(paths.as_slice()),
-            location: SerializedWorkspaceLocation::Local,
-            center_group: Default::default(),
-            window_bounds: Default::default(),
-            display: Default::default(),
-            docks: Default::default(),
-            centered_layout: false,
-            session_id: Some("one-session".to_owned()),
-            breakpoints: Default::default(),
-            window_id: Some(window_id),
-            user_toolchains: Default::default(),
-        })
-        .collect::<Vec<_>>();
-
-        for workspace in workspaces.iter() {
-            db.save_workspace(workspace.clone()).await;
-        }
-
-        let stack = Some(Vec::from([
-            WindowId::from(2), // Top
-            WindowId::from(8),
-            WindowId::from(5),
-            WindowId::from(9),
-            WindowId::from(3),
-            WindowId::from(4), // Bottom
-        ]));
-
-        let locations = db
-            .last_session_workspace_locations("one-session", stack)
-            .unwrap();
-        assert_eq!(
-            locations,
-            [
-                (
-                    SerializedWorkspaceLocation::Local,
-                    PathList::new(&[dir4.path()])
-                ),
-                (
-                    SerializedWorkspaceLocation::Local,
-                    PathList::new(&[dir3.path()])
-                ),
-                (
-                    SerializedWorkspaceLocation::Local,
-                    PathList::new(&[dir2.path()])
-                ),
-                (
-                    SerializedWorkspaceLocation::Local,
-                    PathList::new(&[dir1.path()])
-                ),
-                (
-                    SerializedWorkspaceLocation::Local,
-                    PathList::new(&[dir1.path(), dir2.path(), dir3.path()])
-                ),
-                (
-                    SerializedWorkspaceLocation::Local,
-                    PathList::new(&[dir4.path(), dir3.path(), dir2.path()])
-                ),
-            ]
-        );
-    }
-
-    #[gpui::test]
-    async fn test_last_session_workspace_locations_remote() {
-        let db =
-            WorkspaceDb::open_test_db("test_serializing_workspaces_last_session_workspaces_remote")
-                .await;
-
-        let remote_connections = [
-            ("host-1", "my-user-1"),
-            ("host-2", "my-user-2"),
-            ("host-3", "my-user-3"),
-            ("host-4", "my-user-4"),
-        ]
-        .into_iter()
-        .map(|(host, user)| async {
-            let options = RemoteConnectionOptions::Ssh(SshConnectionOptions {
-                host: host.to_string(),
-                username: Some(user.to_string()),
-                ..Default::default()
-            });
-            db.get_or_create_remote_connection(options.clone())
-                .await
-                .unwrap();
-            options
-        })
-        .collect::<Vec<_>>();
-
-        let remote_connections = futures::future::join_all(remote_connections).await;
-
-        let workspaces = [
-            (1, remote_connections[0].clone(), 9),
-            (2, remote_connections[1].clone(), 5),
-            (3, remote_connections[2].clone(), 8),
-            (4, remote_connections[3].clone(), 2),
-        ]
-        .into_iter()
-        .map(|(id, remote_connection, window_id)| SerializedWorkspace {
-            id: WorkspaceId(id),
-            paths: PathList::default(),
-            location: SerializedWorkspaceLocation::Remote(remote_connection),
-            center_group: Default::default(),
-            window_bounds: Default::default(),
-            display: Default::default(),
-            docks: Default::default(),
-            centered_layout: false,
-            session_id: Some("one-session".to_owned()),
-            breakpoints: Default::default(),
-            window_id: Some(window_id),
-            user_toolchains: Default::default(),
-        })
-        .collect::<Vec<_>>();
-
-        for workspace in workspaces.iter() {
-            db.save_workspace(workspace.clone()).await;
-        }
-
-        let stack = Some(Vec::from([
-            WindowId::from(2), // Top
-            WindowId::from(8),
-            WindowId::from(5),
-            WindowId::from(9), // Bottom
-        ]));
-
-        let have = db
-            .last_session_workspace_locations("one-session", stack)
-            .unwrap();
-        assert_eq!(have.len(), 4);
-        assert_eq!(
-            have[0],
-            (
-                SerializedWorkspaceLocation::Remote(remote_connections[3].clone()),
-                PathList::default()
-            )
-        );
-        assert_eq!(
-            have[1],
-            (
-                SerializedWorkspaceLocation::Remote(remote_connections[2].clone()),
-                PathList::default()
-            )
-        );
-        assert_eq!(
-            have[2],
-            (
-                SerializedWorkspaceLocation::Remote(remote_connections[1].clone()),
-                PathList::default()
-            )
-        );
-        assert_eq!(
-            have[3],
-            (
-                SerializedWorkspaceLocation::Remote(remote_connections[0].clone()),
-                PathList::default()
-            )
-        );
-    }
-
-    #[gpui::test]
-    async fn test_get_or_create_ssh_project() {
-        let db = WorkspaceDb::open_test_db("test_get_or_create_ssh_project").await;
-
-        let host = "example.com".to_string();
-        let port = Some(22_u16);
-        let user = Some("user".to_string());
-
-        let connection_id = db
-            .get_or_create_remote_connection(RemoteConnectionOptions::Ssh(SshConnectionOptions {
-                host: host.clone(),
-                port,
-                username: user.clone(),
-                ..Default::default()
-            }))
-            .await
-            .unwrap();
-
-        // Test that calling the function again with the same parameters returns the same project
-        let same_connection = db
-            .get_or_create_remote_connection(RemoteConnectionOptions::Ssh(SshConnectionOptions {
-                host: host.clone(),
-                port,
-                username: user.clone(),
-                ..Default::default()
-            }))
-            .await
-            .unwrap();
-
-        assert_eq!(connection_id, same_connection);
-
-        // Test with different parameters
-        let host2 = "otherexample.com".to_string();
-        let port2 = None;
-        let user2 = Some("otheruser".to_string());
-
-        let different_connection = db
-            .get_or_create_remote_connection(RemoteConnectionOptions::Ssh(SshConnectionOptions {
-                host: host2.clone(),
-                port: port2,
-                username: user2.clone(),
-                ..Default::default()
-            }))
-            .await
-            .unwrap();
-
-        assert_ne!(connection_id, different_connection);
-    }
-
-    #[gpui::test]
-    async fn test_get_or_create_ssh_project_with_null_user() {
-        let db = WorkspaceDb::open_test_db("test_get_or_create_ssh_project_with_null_user").await;
-
-        let (host, port, user) = ("example.com".to_string(), None, None);
-
-        let connection_id = db
-            .get_or_create_remote_connection(RemoteConnectionOptions::Ssh(SshConnectionOptions {
-                host: host.clone(),
-                port,
-                username: None,
-                ..Default::default()
-            }))
-            .await
-            .unwrap();
-
-        let same_connection_id = db
-            .get_or_create_remote_connection(RemoteConnectionOptions::Ssh(SshConnectionOptions {
-                host: host.clone(),
-                port,
-                username: user.clone(),
-                ..Default::default()
-            }))
-            .await
-            .unwrap();
-
-        assert_eq!(connection_id, same_connection_id);
-    }
-
-    #[gpui::test]
-    async fn test_get_remote_connections() {
-        let db = WorkspaceDb::open_test_db("test_get_remote_connections").await;
-
-        let connections = [
-            ("example.com".to_string(), None, None),
-            (
-                "anotherexample.com".to_string(),
-                Some(123_u16),
-                Some("user2".to_string()),
-            ),
-            ("yetanother.com".to_string(), Some(345_u16), None),
-        ];
-
-        let mut ids = Vec::new();
-        for (host, port, user) in connections.iter() {
-            ids.push(
-                db.get_or_create_remote_connection(RemoteConnectionOptions::Ssh(
-                    SshConnectionOptions {
-                        host: host.clone(),
-                        port: *port,
-                        username: user.clone(),
-                        ..Default::default()
-                    },
-                ))
-                .await
-                .unwrap(),
-            );
-        }
-
-        let stored_connections = db.remote_connections().unwrap();
-        assert_eq!(
-            stored_connections,
-            [
-                (
-                    ids[0],
-                    RemoteConnectionOptions::Ssh(SshConnectionOptions {
-                        host: "example.com".into(),
-                        port: None,
-                        username: None,
-                        ..Default::default()
-                    }),
-                ),
-                (
-                    ids[1],
-                    RemoteConnectionOptions::Ssh(SshConnectionOptions {
-                        host: "anotherexample.com".into(),
-                        port: Some(123),
-                        username: Some("user2".into()),
-                        ..Default::default()
-                    }),
-                ),
-                (
-                    ids[2],
-                    RemoteConnectionOptions::Ssh(SshConnectionOptions {
-                        host: "yetanother.com".into(),
-                        port: Some(345),
-                        username: None,
-                        ..Default::default()
-                    }),
-                ),
-            ]
-            .into_iter()
-            .collect::<HashMap<_, _>>(),
-        );
-    }
-
-    #[gpui::test]
-    async fn test_simple_split() {
-        zlog::init_test();
-
-        let db = WorkspaceDb::open_test_db("simple_split").await;
-
-        //  -----------------
-        //  | 1,2   | 5,6   |
-        //  | - - - |       |
-        //  | 3,4   |       |
-        //  -----------------
-        let center_pane = group(
-            Axis::Horizontal,
-            vec![
-                group(
-                    Axis::Vertical,
-                    vec![
-                        SerializedPaneGroup::Pane(SerializedPane::new(
-                            vec![
-                                SerializedItem::new("Terminal", 1, false, false),
-                                SerializedItem::new("Terminal", 2, true, false),
-                            ],
-                            false,
-                            0,
-                        )),
-                        SerializedPaneGroup::Pane(SerializedPane::new(
-                            vec![
-                                SerializedItem::new("Terminal", 4, false, false),
-                                SerializedItem::new("Terminal", 3, true, false),
-                            ],
-                            true,
-                            0,
-                        )),
-                    ],
-                ),
-                SerializedPaneGroup::Pane(SerializedPane::new(
-                    vec![
-                        SerializedItem::new("Terminal", 5, true, false),
-                        SerializedItem::new("Terminal", 6, false, false),
-                    ],
-                    false,
-                    0,
-                )),
-            ],
-        );
-
-        let workspace = default_workspace(&["/tmp"], &center_pane);
-
-        db.save_workspace(workspace.clone()).await;
-
-        let new_workspace = db.workspace_for_roots(&["/tmp"]).unwrap();
-
-        assert_eq!(workspace.center_group, new_workspace.center_group);
-    }
-
-    #[gpui::test]
-    async fn test_cleanup_panes() {
-        zlog::init_test();
-
-        let db = WorkspaceDb::open_test_db("test_cleanup_panes").await;
-
-        let center_pane = group(
-            Axis::Horizontal,
-            vec![
-                group(
-                    Axis::Vertical,
-                    vec![
-                        SerializedPaneGroup::Pane(SerializedPane::new(
-                            vec![
-                                SerializedItem::new("Terminal", 1, false, false),
-                                SerializedItem::new("Terminal", 2, true, false),
-                            ],
-                            false,
-                            0,
-                        )),
-                        SerializedPaneGroup::Pane(SerializedPane::new(
-                            vec![
-                                SerializedItem::new("Terminal", 4, false, false),
-                                SerializedItem::new("Terminal", 3, true, false),
-                            ],
-                            true,
-                            0,
-                        )),
-                    ],
-                ),
-                SerializedPaneGroup::Pane(SerializedPane::new(
-                    vec![
-                        SerializedItem::new("Terminal", 5, false, false),
-                        SerializedItem::new("Terminal", 6, true, false),
-                    ],
-                    false,
-                    0,
-                )),
-            ],
-        );
-
-        let id = &["/tmp"];
-
-        let mut workspace = default_workspace(id, &center_pane);
-
-        db.save_workspace(workspace.clone()).await;
-
-        workspace.center_group = group(
-            Axis::Vertical,
-            vec![
-                SerializedPaneGroup::Pane(SerializedPane::new(
-                    vec![
-                        SerializedItem::new("Terminal", 1, false, false),
-                        SerializedItem::new("Terminal", 2, true, false),
-                    ],
-                    false,
-                    0,
-                )),
-                SerializedPaneGroup::Pane(SerializedPane::new(
-                    vec![
-                        SerializedItem::new("Terminal", 4, true, false),
-                        SerializedItem::new("Terminal", 3, false, false),
-                    ],
-                    true,
-                    0,
-                )),
-            ],
-        );
-
-        db.save_workspace(workspace.clone()).await;
-
-        let new_workspace = db.workspace_for_roots(id).unwrap();
-
-        assert_eq!(workspace.center_group, new_workspace.center_group);
-    }
-}
diff --git a/crates/workspace/src/persistence/model.rs b/crates/workspace/src/persistence/model.rs
deleted file mode 100644
index 08a3adf9eb..0000000000
--- a/crates/workspace/src/persistence/model.rs
+++ /dev/null
@@ -1,399 +0,0 @@
-use super::{SerializedAxis, SerializedWindowBounds};
-use crate::{
-    Member, Pane, PaneAxis, SerializableItemRegistry, Workspace, WorkspaceId, item::ItemHandle,
-    path_list::PathList,
-};
-use anyhow::{Context, Result};
-use async_recursion::async_recursion;
-use collections::IndexSet;
-use db::sqlez::{
-    bindable::{Bind, Column, StaticColumnCount},
-    statement::Statement,
-};
-use gpui::{AsyncWindowContext, Entity, WeakEntity};
-
-use language::{Toolchain, ToolchainScope};
-use project::{Project, debugger::breakpoint_store::SourceBreakpoint};
-use remote::RemoteConnectionOptions;
-use std::{
-    collections::BTreeMap,
-    path::{Path, PathBuf},
-    sync::Arc,
-};
-use util::ResultExt;
-use uuid::Uuid;
-
-#[derive(
-    Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy, serde::Serialize, serde::Deserialize,
-)]
-pub(crate) struct RemoteConnectionId(pub u64);
-
-#[derive(Debug, PartialEq, Eq, Clone, Copy)]
-pub(crate) enum RemoteConnectionKind {
-    Ssh,
-    Wsl,
-    Docker,
-}
-
-#[derive(Debug, PartialEq, Clone)]
-pub enum SerializedWorkspaceLocation {
-    Local,
-    Remote(RemoteConnectionOptions),
-}
-
-impl SerializedWorkspaceLocation {
-    /// Get sorted paths
-    pub fn sorted_paths(&self) -> Arc<Vec<PathBuf>> {
-        unimplemented!()
-    }
-}
-
-#[derive(Debug, PartialEq, Clone)]
-pub(crate) struct SerializedWorkspace {
-    pub(crate) id: WorkspaceId,
-    pub(crate) location: SerializedWorkspaceLocation,
-    pub(crate) paths: PathList,
-    pub(crate) center_group: SerializedPaneGroup,
-    pub(crate) window_bounds: Option<SerializedWindowBounds>,
-    pub(crate) centered_layout: bool,
-    pub(crate) display: Option<Uuid>,
-    pub(crate) docks: DockStructure,
-    pub(crate) session_id: Option<String>,
-    pub(crate) breakpoints: BTreeMap<Arc<Path>, Vec<SourceBreakpoint>>,
-    pub(crate) user_toolchains: BTreeMap<ToolchainScope, IndexSet<Toolchain>>,
-    pub(crate) window_id: Option<u64>,
-}
-
-#[derive(Debug, PartialEq, Clone, Default)]
-pub struct DockStructure {
-    pub(crate) left: DockData,
-    pub(crate) right: DockData,
-    pub(crate) bottom: DockData,
-}
-
-impl RemoteConnectionKind {
-    pub(crate) fn serialize(&self) -> &'static str {
-        match self {
-            RemoteConnectionKind::Ssh => "ssh",
-            RemoteConnectionKind::Wsl => "wsl",
-            RemoteConnectionKind::Docker => "docker",
-        }
-    }
-
-    pub(crate) fn deserialize(text: &str) -> Option<Self> {
-        match text {
-            "ssh" => Some(Self::Ssh),
-            "wsl" => Some(Self::Wsl),
-            "docker" => Some(Self::Docker),
-            _ => None,
-        }
-    }
-}
-
-impl Column for DockStructure {
-    fn column(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
-        let (left, next_index) = DockData::column(statement, start_index)?;
-        let (right, next_index) = DockData::column(statement, next_index)?;
-        let (bottom, next_index) = DockData::column(statement, next_index)?;
-        Ok((
-            DockStructure {
-                left,
-                right,
-                bottom,
-            },
-            next_index,
-        ))
-    }
-}
-
-impl Bind for DockStructure {
-    fn bind(&self, statement: &Statement, start_index: i32) -> Result<i32> {
-        let next_index = statement.bind(&self.left, start_index)?;
-        let next_index = statement.bind(&self.right, next_index)?;
-        statement.bind(&self.bottom, next_index)
-    }
-}
-
-#[derive(Debug, PartialEq, Clone, Default)]
-pub struct DockData {
-    pub(crate) visible: bool,
-    pub(crate) active_panel: Option<String>,
-    pub(crate) zoom: bool,
-}
-
-impl Column for DockData {
-    fn column(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
-        let (visible, next_index) = Option::<bool>::column(statement, start_index)?;
-        let (active_panel, next_index) = Option::<String>::column(statement, next_index)?;
-        let (zoom, next_index) = Option::<bool>::column(statement, next_index)?;
-        Ok((
-            DockData {
-                visible: visible.unwrap_or(false),
-                active_panel,
-                zoom: zoom.unwrap_or(false),
-            },
-            next_index,
-        ))
-    }
-}
-
-impl Bind for DockData {
-    fn bind(&self, statement: &Statement, start_index: i32) -> Result<i32> {
-        let next_index = statement.bind(&self.visible, start_index)?;
-        let next_index = statement.bind(&self.active_panel, next_index)?;
-        statement.bind(&self.zoom, next_index)
-    }
-}
-
-#[derive(Debug, PartialEq, Clone)]
-pub(crate) enum SerializedPaneGroup {
-    Group {
-        axis: SerializedAxis,
-        flexes: Option<Vec<f32>>,
-        children: Vec<SerializedPaneGroup>,
-    },
-    Pane(SerializedPane),
-}
-
-#[cfg(test)]
-impl Default for SerializedPaneGroup {
-    fn default() -> Self {
-        Self::Pane(SerializedPane {
-            children: vec![SerializedItem::default()],
-            active: false,
-            pinned_count: 0,
-        })
-    }
-}
-
-impl SerializedPaneGroup {
-    #[async_recursion(?Send)]
-    pub(crate) async fn deserialize(
-        self,
-        project: &Entity<Project>,
-        workspace_id: WorkspaceId,
-        workspace: WeakEntity<Workspace>,
-        cx: &mut AsyncWindowContext,
-    ) -> Option<(
-        Member,
-        Option<Entity<Pane>>,
-        Vec<Option<Box<dyn ItemHandle>>>,
-    )> {
-        match self {
-            SerializedPaneGroup::Group {
-                axis,
-                children,
-                flexes,
-            } => {
-                let mut current_active_pane = None;
-                let mut members = Vec::new();
-                let mut items = Vec::new();
-                for child in children {
-                    if let Some((new_member, active_pane, new_items)) = child
-                        .deserialize(project, workspace_id, workspace.clone(), cx)
-                        .await
-                    {
-                        members.push(new_member);
-                        items.extend(new_items);
-                        current_active_pane = current_active_pane.or(active_pane);
-                    }
-                }
-
-                if members.is_empty() {
-                    return None;
-                }
-
-                if members.len() == 1 {
-                    return Some((members.remove(0), current_active_pane, items));
-                }
-
-                Some((
-                    Member::Axis(PaneAxis::load(axis.0, members, flexes)),
-                    current_active_pane,
-                    items,
-                ))
-            }
-            SerializedPaneGroup::Pane(serialized_pane) => {
-                let pane = workspace
-                    .update_in(cx, |workspace, window, cx| {
-                        workspace.add_pane(window, cx).downgrade()
-                    })
-                    .log_err()?;
-                let active = serialized_pane.active;
-                let new_items = serialized_pane
-                    .deserialize_to(project, &pane, workspace_id, workspace.clone(), cx)
-                    .await
-                    .context("Could not deserialize pane)")
-                    .log_err()?;
-
-                if pane
-                    .read_with(cx, |pane, _| pane.items_len() != 0)
-                    .log_err()?
-                {
-                    let pane = pane.upgrade()?;
-                    Some((
-                        Member::Pane(pane.clone()),
-                        active.then_some(pane),
-                        new_items,
-                    ))
-                } else {
-                    let pane = pane.upgrade()?;
-                    workspace
-                        .update_in(cx, |workspace, window, cx| {
-                            workspace.force_remove_pane(&pane, &None, window, cx)
-                        })
-                        .log_err()?;
-                    None
-                }
-            }
-        }
-    }
-}
-
-#[derive(Debug, PartialEq, Eq, Default, Clone)]
-pub struct SerializedPane {
-    pub(crate) active: bool,
-    pub(crate) children: Vec<SerializedItem>,
-    pub(crate) pinned_count: usize,
-}
-
-impl SerializedPane {
-    pub fn new(children: Vec<SerializedItem>, active: bool, pinned_count: usize) -> Self {
-        SerializedPane {
-            children,
-            active,
-            pinned_count,
-        }
-    }
-
-    pub async fn deserialize_to(
-        &self,
-        project: &Entity<Project>,
-        pane: &WeakEntity<Pane>,
-        workspace_id: WorkspaceId,
-        workspace: WeakEntity<Workspace>,
-        cx: &mut AsyncWindowContext,
-    ) -> Result<Vec<Option<Box<dyn ItemHandle>>>> {
-        let mut item_tasks = Vec::new();
-        let mut active_item_index = None;
-        let mut preview_item_index = None;
-        for (index, item) in self.children.iter().enumerate() {
-            let project = project.clone();
-            item_tasks.push(pane.update_in(cx, |_, window, cx| {
-                SerializableItemRegistry::deserialize(
-                    &item.kind,
-                    project,
-                    workspace.clone(),
-                    workspace_id,
-                    item.item_id,
-                    window,
-                    cx,
-                )
-            })?);
-            if item.active {
-                active_item_index = Some(index);
-            }
-            if item.preview {
-                preview_item_index = Some(index);
-            }
-        }
-
-        let mut items = Vec::new();
-        for item_handle in futures::future::join_all(item_tasks).await {
-            let item_handle = item_handle.log_err();
-            items.push(item_handle.clone());
-
-            if let Some(item_handle) = item_handle {
-                pane.update_in(cx, |pane, window, cx| {
-                    pane.add_item(item_handle.clone(), true, true, None, window, cx);
-                })?;
-            }
-        }
-
-        if let Some(active_item_index) = active_item_index {
-            pane.update_in(cx, |pane, window, cx| {
-                pane.activate_item(active_item_index, false, false, window, cx);
-            })?;
-        }
-
-        if let Some(preview_item_index) = preview_item_index {
-            pane.update(cx, |pane, cx| {
-                if let Some(item) = pane.item_for_index(preview_item_index) {
-                    pane.set_preview_item_id(Some(item.item_id()), cx);
-                }
-            })?;
-        }
-        pane.update(cx, |pane, _| {
-            pane.set_pinned_count(self.pinned_count.min(items.len()));
-        })?;
-
-        anyhow::Ok(items)
-    }
-}
-
-pub type GroupId = i64;
-pub type PaneId = i64;
-pub type ItemId = u64;
-
-#[derive(Debug, PartialEq, Eq, Clone)]
-pub struct SerializedItem {
-    pub kind: Arc<str>,
-    pub item_id: ItemId,
-    pub active: bool,
-    pub preview: bool,
-}
-
-impl SerializedItem {
-    pub fn new(kind: impl AsRef<str>, item_id: ItemId, active: bool, preview: bool) -> Self {
-        Self {
-            kind: Arc::from(kind.as_ref()),
-            item_id,
-            active,
-            preview,
-        }
-    }
-}
-
-#[cfg(test)]
-impl Default for SerializedItem {
-    fn default() -> Self {
-        SerializedItem {
-            kind: Arc::from("Terminal"),
-            item_id: 100000,
-            active: false,
-            preview: false,
-        }
-    }
-}
-
-impl StaticColumnCount for SerializedItem {
-    fn column_count() -> usize {
-        4
-    }
-}
-impl Bind for &SerializedItem {
-    fn bind(&self, statement: &Statement, start_index: i32) -> Result<i32> {
-        let next_index = statement.bind(&self.kind, start_index)?;
-        let next_index = statement.bind(&self.item_id, next_index)?;
-        let next_index = statement.bind(&self.active, next_index)?;
-        statement.bind(&self.preview, next_index)
-    }
-}
-
-impl Column for SerializedItem {
-    fn column(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
-        let (kind, next_index) = Arc::<str>::column(statement, start_index)?;
-        let (item_id, next_index) = ItemId::column(statement, next_index)?;
-        let (active, next_index) = bool::column(statement, next_index)?;
-        let (preview, next_index) = bool::column(statement, next_index)?;
-        Ok((
-            SerializedItem {
-                kind,
-                item_id,
-                active,
-                preview,
-            },
-            next_index,
-        ))
-    }
-}
diff --git a/crates/workspace/src/searchable.rs b/crates/workspace/src/searchable.rs
deleted file mode 100644
index badfe7d243..0000000000
--- a/crates/workspace/src/searchable.rs
+++ /dev/null
@@ -1,461 +0,0 @@
-use std::{any::Any, sync::Arc};
-
-use any_vec::AnyVec;
-use gpui::{
-    AnyView, AnyWeakEntity, App, Context, Entity, EventEmitter, Subscription, Task, WeakEntity,
-    Window,
-};
-use project::search::SearchQuery;
-
-use crate::{
-    ItemHandle,
-    item::{Item, WeakItemHandle},
-};
-
-#[derive(Clone, Debug)]
-pub enum SearchEvent {
-    MatchesInvalidated,
-    ActiveMatchChanged,
-}
-
-#[derive(Clone, Copy, PartialEq, Eq, Debug, Default)]
-pub enum Direction {
-    Prev,
-    #[default]
-    Next,
-}
-
-impl Direction {
-    pub fn opposite(&self) -> Self {
-        match self {
-            Direction::Prev => Direction::Next,
-            Direction::Next => Direction::Prev,
-        }
-    }
-}
-
-#[derive(Clone, Copy, Debug, Default)]
-pub struct SearchOptions {
-    pub case: bool,
-    pub word: bool,
-    pub regex: bool,
-    /// Specifies whether the  supports search & replace.
-    pub replacement: bool,
-    pub selection: bool,
-    pub find_in_results: bool,
-}
-
-// Whether to always select the current selection (even if empty)
-// or to use the default (restoring the previous search ranges if some,
-// otherwise using the whole file).
-#[derive(Clone, Copy, Debug, Default, PartialEq)]
-pub enum FilteredSearchRange {
-    Selection,
-    #[default]
-    Default,
-}
-
-pub trait SearchableItem: Item + EventEmitter<SearchEvent> {
-    type Match: Any + Sync + Send + Clone;
-
-    fn supported_options(&self) -> SearchOptions {
-        SearchOptions {
-            case: true,
-            word: true,
-            regex: true,
-            replacement: true,
-            selection: true,
-            find_in_results: false,
-        }
-    }
-
-    fn search_bar_visibility_changed(
-        &mut self,
-        _visible: bool,
-        _window: &mut Window,
-        _cx: &mut Context<Self>,
-    ) {
-    }
-
-    fn has_filtered_search_ranges(&mut self) -> bool {
-        self.supported_options().selection
-    }
-
-    fn toggle_filtered_search_ranges(
-        &mut self,
-        _enabled: Option<FilteredSearchRange>,
-        _window: &mut Window,
-        _cx: &mut Context<Self>,
-    ) {
-    }
-
-    fn get_matches(&self, _window: &mut Window, _: &mut App) -> Vec<Self::Match> {
-        Vec::new()
-    }
-    fn clear_matches(&mut self, window: &mut Window, cx: &mut Context<Self>);
-    fn update_matches(
-        &mut self,
-        matches: &[Self::Match],
-        active_match_index: Option<usize>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    );
-    fn query_suggestion(&mut self, window: &mut Window, cx: &mut Context<Self>) -> String;
-    fn activate_match(
-        &mut self,
-        index: usize,
-        matches: &[Self::Match],
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    );
-    fn select_matches(
-        &mut self,
-        matches: &[Self::Match],
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    );
-    fn replace(
-        &mut self,
-        _: &Self::Match,
-        _: &SearchQuery,
-        _window: &mut Window,
-        _: &mut Context<Self>,
-    );
-    fn replace_all(
-        &mut self,
-        matches: &mut dyn Iterator<Item = &Self::Match>,
-        query: &SearchQuery,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        for item in matches {
-            self.replace(item, query, window, cx);
-        }
-    }
-    fn match_index_for_direction(
-        &mut self,
-        matches: &[Self::Match],
-        current_index: usize,
-        direction: Direction,
-        count: usize,
-        _window: &mut Window,
-        _: &mut Context<Self>,
-    ) -> usize {
-        match direction {
-            Direction::Prev => {
-                let count = count % matches.len();
-                if current_index >= count {
-                    current_index - count
-                } else {
-                    matches.len() - (count - current_index)
-                }
-            }
-            Direction::Next => (current_index + count) % matches.len(),
-        }
-    }
-    fn find_matches(
-        &mut self,
-        query: Arc<SearchQuery>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Vec<Self::Match>>;
-    fn active_match_index(
-        &mut self,
-        direction: Direction,
-        matches: &[Self::Match],
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<usize>;
-    fn set_search_is_case_sensitive(&mut self, _: Option<bool>, _: &mut Context<Self>) {}
-}
-
-pub trait SearchableItemHandle: ItemHandle {
-    fn downgrade(&self) -> Box<dyn WeakSearchableItemHandle>;
-    fn boxed_clone(&self) -> Box<dyn SearchableItemHandle>;
-    fn supported_options(&self, cx: &App) -> SearchOptions;
-    fn subscribe_to_search_events(
-        &self,
-        window: &mut Window,
-        cx: &mut App,
-        handler: Box<dyn Fn(&SearchEvent, &mut Window, &mut App) + Send>,
-    ) -> Subscription;
-    fn clear_matches(&self, window: &mut Window, cx: &mut App);
-    fn update_matches(
-        &self,
-        matches: &AnyVec<dyn Send>,
-        active_match_index: Option<usize>,
-        window: &mut Window,
-        cx: &mut App,
-    );
-    fn query_suggestion(&self, window: &mut Window, cx: &mut App) -> String;
-    fn activate_match(
-        &self,
-        index: usize,
-        matches: &AnyVec<dyn Send>,
-        window: &mut Window,
-        cx: &mut App,
-    );
-    fn select_matches(&self, matches: &AnyVec<dyn Send>, window: &mut Window, cx: &mut App);
-    fn replace(
-        &self,
-        _: any_vec::element::ElementRef<'_, dyn Send>,
-        _: &SearchQuery,
-        _window: &mut Window,
-        _: &mut App,
-    );
-    fn replace_all(
-        &self,
-        matches: &mut dyn Iterator<Item = any_vec::element::ElementRef<'_, dyn Send>>,
-        query: &SearchQuery,
-        window: &mut Window,
-        cx: &mut App,
-    );
-    fn match_index_for_direction(
-        &self,
-        matches: &AnyVec<dyn Send>,
-        current_index: usize,
-        direction: Direction,
-        count: usize,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> usize;
-    fn find_matches(
-        &self,
-        query: Arc<SearchQuery>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<AnyVec<dyn Send>>;
-    fn active_match_index(
-        &self,
-        direction: Direction,
-        matches: &AnyVec<dyn Send>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<usize>;
-    fn search_bar_visibility_changed(&self, visible: bool, window: &mut Window, cx: &mut App);
-
-    fn toggle_filtered_search_ranges(
-        &mut self,
-        enabled: Option<FilteredSearchRange>,
-        window: &mut Window,
-        cx: &mut App,
-    );
-
-    fn set_search_is_case_sensitive(&self, is_case_sensitive: Option<bool>, cx: &mut App);
-}
-
-impl<T: SearchableItem> SearchableItemHandle for Entity<T> {
-    fn downgrade(&self) -> Box<dyn WeakSearchableItemHandle> {
-        Box::new(self.downgrade())
-    }
-
-    fn boxed_clone(&self) -> Box<dyn SearchableItemHandle> {
-        Box::new(self.clone())
-    }
-
-    fn supported_options(&self, cx: &App) -> SearchOptions {
-        self.read(cx).supported_options()
-    }
-
-    fn subscribe_to_search_events(
-        &self,
-        window: &mut Window,
-        cx: &mut App,
-        handler: Box<dyn Fn(&SearchEvent, &mut Window, &mut App) + Send>,
-    ) -> Subscription {
-        window.subscribe(self, cx, move |_, event: &SearchEvent, window, cx| {
-            handler(event, window, cx)
-        })
-    }
-
-    fn clear_matches(&self, window: &mut Window, cx: &mut App) {
-        self.update(cx, |this, cx| this.clear_matches(window, cx));
-    }
-    fn update_matches(
-        &self,
-        matches: &AnyVec<dyn Send>,
-        active_match_index: Option<usize>,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        let matches = matches.downcast_ref().unwrap();
-        self.update(cx, |this, cx| {
-            this.update_matches(matches.as_slice(), active_match_index, window, cx)
-        });
-    }
-    fn query_suggestion(&self, window: &mut Window, cx: &mut App) -> String {
-        self.update(cx, |this, cx| this.query_suggestion(window, cx))
-    }
-    fn activate_match(
-        &self,
-        index: usize,
-        matches: &AnyVec<dyn Send>,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        let matches = matches.downcast_ref().unwrap();
-        self.update(cx, |this, cx| {
-            this.activate_match(index, matches.as_slice(), window, cx)
-        });
-    }
-
-    fn select_matches(&self, matches: &AnyVec<dyn Send>, window: &mut Window, cx: &mut App) {
-        let matches = matches.downcast_ref().unwrap();
-        self.update(cx, |this, cx| {
-            this.select_matches(matches.as_slice(), window, cx)
-        });
-    }
-
-    fn match_index_for_direction(
-        &self,
-        matches: &AnyVec<dyn Send>,
-        current_index: usize,
-        direction: Direction,
-        count: usize,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> usize {
-        let matches = matches.downcast_ref().unwrap();
-        self.update(cx, |this, cx| {
-            this.match_index_for_direction(
-                matches.as_slice(),
-                current_index,
-                direction,
-                count,
-                window,
-                cx,
-            )
-        })
-    }
-    fn find_matches(
-        &self,
-        query: Arc<SearchQuery>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<AnyVec<dyn Send>> {
-        let matches = self.update(cx, |this, cx| this.find_matches(query, window, cx));
-        window.spawn(cx, async |_| {
-            let matches = matches.await;
-            let mut any_matches = AnyVec::with_capacity::<T::Match>(matches.len());
-            {
-                let mut any_matches = any_matches.downcast_mut::<T::Match>().unwrap();
-                for mat in matches {
-                    any_matches.push(mat);
-                }
-            }
-            any_matches
-        })
-    }
-    fn active_match_index(
-        &self,
-        direction: Direction,
-        matches: &AnyVec<dyn Send>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<usize> {
-        let matches = matches.downcast_ref()?;
-        self.update(cx, |this, cx| {
-            this.active_match_index(direction, matches.as_slice(), window, cx)
-        })
-    }
-
-    fn replace(
-        &self,
-        mat: any_vec::element::ElementRef<'_, dyn Send>,
-        query: &SearchQuery,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        let mat = mat.downcast_ref().unwrap();
-        self.update(cx, |this, cx| this.replace(mat, query, window, cx))
-    }
-
-    fn replace_all(
-        &self,
-        matches: &mut dyn Iterator<Item = any_vec::element::ElementRef<'_, dyn Send>>,
-        query: &SearchQuery,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        self.update(cx, |this, cx| {
-            this.replace_all(
-                &mut matches.map(|m| m.downcast_ref().unwrap()),
-                query,
-                window,
-                cx,
-            );
-        })
-    }
-
-    fn search_bar_visibility_changed(&self, visible: bool, window: &mut Window, cx: &mut App) {
-        self.update(cx, |this, cx| {
-            this.search_bar_visibility_changed(visible, window, cx)
-        });
-    }
-
-    fn toggle_filtered_search_ranges(
-        &mut self,
-        enabled: Option<FilteredSearchRange>,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        self.update(cx, |this, cx| {
-            this.toggle_filtered_search_ranges(enabled, window, cx)
-        });
-    }
-    fn set_search_is_case_sensitive(&self, enabled: Option<bool>, cx: &mut App) {
-        self.update(cx, |this, cx| {
-            this.set_search_is_case_sensitive(enabled, cx)
-        });
-    }
-}
-
-impl From<Box<dyn SearchableItemHandle>> for AnyView {
-    fn from(this: Box<dyn SearchableItemHandle>) -> Self {
-        this.to_any_view()
-    }
-}
-
-impl From<&Box<dyn SearchableItemHandle>> for AnyView {
-    fn from(this: &Box<dyn SearchableItemHandle>) -> Self {
-        this.to_any_view()
-    }
-}
-
-impl PartialEq for Box<dyn SearchableItemHandle> {
-    fn eq(&self, other: &Self) -> bool {
-        self.item_id() == other.item_id()
-    }
-}
-
-impl Eq for Box<dyn SearchableItemHandle> {}
-
-pub trait WeakSearchableItemHandle: WeakItemHandle {
-    fn upgrade(&self, cx: &App) -> Option<Box<dyn SearchableItemHandle>>;
-
-    fn into_any(self) -> AnyWeakEntity;
-}
-
-impl<T: SearchableItem> WeakSearchableItemHandle for WeakEntity<T> {
-    fn upgrade(&self, _cx: &App) -> Option<Box<dyn SearchableItemHandle>> {
-        Some(Box::new(self.upgrade()?))
-    }
-
-    fn into_any(self) -> AnyWeakEntity {
-        self.into()
-    }
-}
-
-impl PartialEq for Box<dyn WeakSearchableItemHandle> {
-    fn eq(&self, other: &Self) -> bool {
-        self.id() == other.id()
-    }
-}
-
-impl Eq for Box<dyn WeakSearchableItemHandle> {}
-
-impl std::hash::Hash for Box<dyn WeakSearchableItemHandle> {
-    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-        self.id().hash(state)
-    }
-}
diff --git a/crates/workspace/src/shared_screen.rs b/crates/workspace/src/shared_screen.rs
deleted file mode 100644
index 3c009f613e..0000000000
--- a/crates/workspace/src/shared_screen.rs
+++ /dev/null
@@ -1,136 +0,0 @@
-use crate::{
-    ItemNavHistory, WorkspaceId,
-    item::{Item, ItemEvent},
-};
-use call::{RemoteVideoTrack, RemoteVideoTrackView, Room};
-use client::{User, proto::PeerId};
-use gpui::{
-    AppContext as _, Entity, EventEmitter, FocusHandle, Focusable, InteractiveElement,
-    ParentElement, Render, SharedString, Styled, Task, div,
-};
-use std::sync::Arc;
-use ui::{Icon, IconName, prelude::*};
-
-pub enum Event {
-    Close,
-}
-
-pub struct SharedScreen {
-    pub peer_id: PeerId,
-    user: Arc<User>,
-    nav_history: Option<ItemNavHistory>,
-    view: Entity<RemoteVideoTrackView>,
-    focus: FocusHandle,
-}
-
-impl SharedScreen {
-    pub fn new(
-        track: RemoteVideoTrack,
-        peer_id: PeerId,
-        user: Arc<User>,
-        room: Entity<Room>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let my_sid = track.sid();
-        cx.subscribe(&room, move |_, _, ev, cx| {
-            if let call::room::Event::RemoteVideoTrackUnsubscribed { sid } = ev
-                && sid == &my_sid
-            {
-                cx.emit(Event::Close)
-            }
-        })
-        .detach();
-
-        let view = cx.new(|cx| RemoteVideoTrackView::new(track.clone(), window, cx));
-        cx.subscribe(&view, |_, _, ev, cx| match ev {
-            call::RemoteVideoTrackViewEvent::Close => cx.emit(Event::Close),
-        })
-        .detach();
-        Self {
-            view,
-            peer_id,
-            user,
-            nav_history: Default::default(),
-            focus: cx.focus_handle(),
-        }
-    }
-}
-
-impl EventEmitter<Event> for SharedScreen {}
-
-impl Focusable for SharedScreen {
-    fn focus_handle(&self, _: &App) -> FocusHandle {
-        self.focus.clone()
-    }
-}
-impl Render for SharedScreen {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        div()
-            .bg(cx.theme().colors().editor_background)
-            .track_focus(&self.focus)
-            .key_context("SharedScreen")
-            .size_full()
-            .child(self.view.clone())
-    }
-}
-
-impl Item for SharedScreen {
-    type Event = Event;
-
-    fn tab_tooltip_text(&self, _: &App) -> Option<SharedString> {
-        Some(format!("{}'s screen", self.user.github_login).into())
-    }
-
-    fn deactivated(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(nav_history) = self.nav_history.as_mut() {
-            nav_history.push::<()>(None, cx);
-        }
-    }
-
-    fn tab_icon(&self, _window: &Window, _cx: &App) -> Option<Icon> {
-        Some(Icon::new(IconName::Screen))
-    }
-
-    fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString {
-        format!("{}'s screen", self.user.github_login).into()
-    }
-
-    fn telemetry_event_text(&self) -> Option<&'static str> {
-        None
-    }
-
-    fn set_nav_history(
-        &mut self,
-        history: ItemNavHistory,
-        _window: &mut Window,
-        _cx: &mut Context<Self>,
-    ) {
-        self.nav_history = Some(history);
-    }
-
-    fn can_split(&self) -> bool {
-        true
-    }
-
-    fn clone_on_split(
-        &self,
-        _workspace_id: Option<WorkspaceId>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Option<Entity<Self>>> {
-        Task::ready(Some(cx.new(|cx| Self {
-            view: self.view.update(cx, |view, cx| view.clone(window, cx)),
-            peer_id: self.peer_id,
-            user: self.user.clone(),
-            nav_history: Default::default(),
-            focus: cx.focus_handle(),
-        })))
-    }
-
-    fn to_item_events(event: &Self::Event, mut f: impl FnMut(ItemEvent)) {
-        match event {
-            Event::Close => f(ItemEvent::CloseItem),
-        }
-    }
-}
diff --git a/crates/workspace/src/status_bar.rs b/crates/workspace/src/status_bar.rs
deleted file mode 100644
index 9087cbba42..0000000000
--- a/crates/workspace/src/status_bar.rs
+++ /dev/null
@@ -1,223 +0,0 @@
-use crate::{ItemHandle, Pane};
-use gpui::{
-    AnyView, App, Context, Decorations, Entity, IntoElement, ParentElement, Render, Styled,
-    Subscription, Window,
-};
-use std::any::TypeId;
-use theme::CLIENT_SIDE_DECORATION_ROUNDING;
-use ui::{h_flex, prelude::*};
-use util::ResultExt;
-
-pub trait StatusItemView: Render {
-    /// Event callback that is triggered when the active pane item changes.
-    fn set_active_pane_item(
-        &mut self,
-        active_pane_item: Option<&dyn crate::ItemHandle>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    );
-}
-
-trait StatusItemViewHandle: Send {
-    fn to_any(&self) -> AnyView;
-    fn set_active_pane_item(
-        &self,
-        active_pane_item: Option<&dyn ItemHandle>,
-        window: &mut Window,
-        cx: &mut App,
-    );
-    fn item_type(&self) -> TypeId;
-}
-
-pub struct StatusBar {
-    left_items: Vec<Box<dyn StatusItemViewHandle>>,
-    right_items: Vec<Box<dyn StatusItemViewHandle>>,
-    active_pane: Entity<Pane>,
-    _observe_active_pane: Subscription,
-}
-
-impl Render for StatusBar {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        h_flex()
-            .w_full()
-            .justify_between()
-            .gap(DynamicSpacing::Base08.rems(cx))
-            .py(DynamicSpacing::Base04.rems(cx))
-            .px(DynamicSpacing::Base06.rems(cx))
-            .bg(cx.theme().colors().status_bar_background)
-            .map(|el| match window.window_decorations() {
-                Decorations::Server => el,
-                Decorations::Client { tiling, .. } => el
-                    .when(!(tiling.bottom || tiling.right), |el| {
-                        el.rounded_br(CLIENT_SIDE_DECORATION_ROUNDING)
-                    })
-                    .when(!(tiling.bottom || tiling.left), |el| {
-                        el.rounded_bl(CLIENT_SIDE_DECORATION_ROUNDING)
-                    })
-                    // This border is to avoid a transparent gap in the rounded corners
-                    .mb(px(-1.))
-                    .border_b(px(1.0))
-                    .border_color(cx.theme().colors().status_bar_background),
-            })
-            .child(self.render_left_tools())
-            .child(self.render_right_tools())
-    }
-}
-
-impl StatusBar {
-    fn render_left_tools(&self) -> impl IntoElement {
-        h_flex()
-            .gap_1()
-            .overflow_x_hidden()
-            .children(self.left_items.iter().map(|item| item.to_any()))
-    }
-
-    fn render_right_tools(&self) -> impl IntoElement {
-        h_flex()
-            .gap_1()
-            .overflow_x_hidden()
-            .children(self.right_items.iter().rev().map(|item| item.to_any()))
-    }
-}
-
-impl StatusBar {
-    pub fn new(active_pane: &Entity<Pane>, window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let mut this = Self {
-            left_items: Default::default(),
-            right_items: Default::default(),
-            active_pane: active_pane.clone(),
-            _observe_active_pane: cx.observe_in(active_pane, window, |this, _, window, cx| {
-                this.update_active_pane_item(window, cx)
-            }),
-        };
-        this.update_active_pane_item(window, cx);
-        this
-    }
-
-    pub fn add_left_item<T>(&mut self, item: Entity<T>, window: &mut Window, cx: &mut Context<Self>)
-    where
-        T: 'static + StatusItemView,
-    {
-        let active_pane_item = self.active_pane.read(cx).active_item();
-        item.set_active_pane_item(active_pane_item.as_deref(), window, cx);
-
-        self.left_items.push(Box::new(item));
-        cx.notify();
-    }
-
-    pub fn item_of_type<T: StatusItemView>(&self) -> Option<Entity<T>> {
-        self.left_items
-            .iter()
-            .chain(self.right_items.iter())
-            .find_map(|item| item.to_any().downcast().log_err())
-    }
-
-    pub fn position_of_item<T>(&self) -> Option<usize>
-    where
-        T: StatusItemView,
-    {
-        for (index, item) in self.left_items.iter().enumerate() {
-            if item.item_type() == TypeId::of::<T>() {
-                return Some(index);
-            }
-        }
-        for (index, item) in self.right_items.iter().enumerate() {
-            if item.item_type() == TypeId::of::<T>() {
-                return Some(index + self.left_items.len());
-            }
-        }
-        None
-    }
-
-    pub fn insert_item_after<T>(
-        &mut self,
-        position: usize,
-        item: Entity<T>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) where
-        T: 'static + StatusItemView,
-    {
-        let active_pane_item = self.active_pane.read(cx).active_item();
-        item.set_active_pane_item(active_pane_item.as_deref(), window, cx);
-
-        if position < self.left_items.len() {
-            self.left_items.insert(position + 1, Box::new(item))
-        } else {
-            self.right_items
-                .insert(position + 1 - self.left_items.len(), Box::new(item))
-        }
-        cx.notify()
-    }
-
-    pub fn remove_item_at(&mut self, position: usize, cx: &mut Context<Self>) {
-        if position < self.left_items.len() {
-            self.left_items.remove(position);
-        } else {
-            self.right_items.remove(position - self.left_items.len());
-        }
-        cx.notify();
-    }
-
-    pub fn add_right_item<T>(
-        &mut self,
-        item: Entity<T>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) where
-        T: 'static + StatusItemView,
-    {
-        let active_pane_item = self.active_pane.read(cx).active_item();
-        item.set_active_pane_item(active_pane_item.as_deref(), window, cx);
-
-        self.right_items.push(Box::new(item));
-        cx.notify();
-    }
-
-    pub fn set_active_pane(
-        &mut self,
-        active_pane: &Entity<Pane>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.active_pane = active_pane.clone();
-        self._observe_active_pane = cx.observe_in(active_pane, window, |this, _, window, cx| {
-            this.update_active_pane_item(window, cx)
-        });
-        self.update_active_pane_item(window, cx);
-    }
-
-    fn update_active_pane_item(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let active_pane_item = self.active_pane.read(cx).active_item();
-        for item in self.left_items.iter().chain(&self.right_items) {
-            item.set_active_pane_item(active_pane_item.as_deref(), window, cx);
-        }
-    }
-}
-
-impl<T: StatusItemView> StatusItemViewHandle for Entity<T> {
-    fn to_any(&self) -> AnyView {
-        self.clone().into()
-    }
-
-    fn set_active_pane_item(
-        &self,
-        active_pane_item: Option<&dyn ItemHandle>,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        self.update(cx, |this, cx| {
-            this.set_active_pane_item(active_pane_item, window, cx)
-        });
-    }
-
-    fn item_type(&self) -> TypeId {
-        TypeId::of::<T>()
-    }
-}
-
-impl From<&dyn StatusItemViewHandle> for AnyView {
-    fn from(val: &dyn StatusItemViewHandle) -> Self {
-        val.to_any()
-    }
-}
diff --git a/crates/workspace/src/tasks.rs b/crates/workspace/src/tasks.rs
deleted file mode 100644
index 5f52cb49e7..0000000000
--- a/crates/workspace/src/tasks.rs
+++ /dev/null
@@ -1,134 +0,0 @@
-use std::process::ExitStatus;
-
-use anyhow::Result;
-use gpui::{AppContext, Context, Entity, Task};
-use language::Buffer;
-use project::{TaskSourceKind, WorktreeId};
-use remote::ConnectionState;
-use task::{DebugScenario, ResolvedTask, SpawnInTerminal, TaskContext, TaskTemplate};
-use ui::Window;
-
-use crate::{Toast, Workspace, notifications::NotificationId};
-
-impl Workspace {
-    pub fn schedule_task(
-        self: &mut Workspace,
-        task_source_kind: TaskSourceKind,
-        task_to_resolve: &TaskTemplate,
-        task_cx: &TaskContext,
-        omit_history: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        match self.project.read(cx).remote_connection_state(cx) {
-            None | Some(ConnectionState::Connected) => {}
-            Some(
-                ConnectionState::Connecting
-                | ConnectionState::Disconnected
-                | ConnectionState::HeartbeatMissed
-                | ConnectionState::Reconnecting,
-            ) => {
-                log::warn!("Cannot schedule tasks when disconnected from a remote host");
-                return;
-            }
-        }
-
-        if let Some(spawn_in_terminal) =
-            task_to_resolve.resolve_task(&task_source_kind.to_id_base(), task_cx)
-        {
-            self.schedule_resolved_task(
-                task_source_kind,
-                spawn_in_terminal,
-                omit_history,
-                window,
-                cx,
-            );
-        }
-    }
-
-    pub fn schedule_resolved_task(
-        self: &mut Workspace,
-        task_source_kind: TaskSourceKind,
-        resolved_task: ResolvedTask,
-        omit_history: bool,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        let spawn_in_terminal = resolved_task.resolved.clone();
-        if !omit_history {
-            if let Some(debugger_provider) = self.debugger_provider.as_ref() {
-                debugger_provider.task_scheduled(cx);
-            }
-
-            self.project().update(cx, |project, cx| {
-                if let Some(task_inventory) =
-                    project.task_store().read(cx).task_inventory().cloned()
-                {
-                    task_inventory.update(cx, |inventory, _| {
-                        inventory.task_scheduled(task_source_kind, resolved_task);
-                    })
-                }
-            });
-        }
-
-        if let Some(terminal_provider) = self.terminal_provider.as_ref() {
-            let task_status = terminal_provider.spawn(spawn_in_terminal, window, cx);
-
-            let task = cx.spawn(async |w, cx| {
-                let res = cx.background_spawn(task_status).await;
-                match res {
-                    Some(Ok(status)) => {
-                        if status.success() {
-                            log::debug!("Task spawn succeeded");
-                        } else {
-                            log::debug!("Task spawn failed, code: {:?}", status.code());
-                        }
-                    }
-                    Some(Err(e)) => {
-                        log::error!("Task spawn failed: {e:#}");
-                        _ = w.update(cx, |w, cx| {
-                            let id = NotificationId::unique::<ResolvedTask>();
-                            w.show_toast(Toast::new(id, format!("Task spawn failed: {e}")), cx);
-                        })
-                    }
-                    None => log::debug!("Task spawn got cancelled"),
-                };
-            });
-            self.scheduled_tasks.push(task);
-        }
-    }
-
-    pub fn start_debug_session(
-        &mut self,
-        scenario: DebugScenario,
-        task_context: TaskContext,
-        active_buffer: Option<Entity<Buffer>>,
-        worktree_id: Option<WorktreeId>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(provider) = self.debugger_provider.as_mut() {
-            provider.start_session(
-                scenario,
-                task_context,
-                active_buffer,
-                worktree_id,
-                window,
-                cx,
-            )
-        }
-    }
-
-    pub fn spawn_in_terminal(
-        self: &mut Workspace,
-        spawn_in_terminal: SpawnInTerminal,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) -> Task<Option<Result<ExitStatus>>> {
-        if let Some(terminal_provider) = self.terminal_provider.as_ref() {
-            terminal_provider.spawn(spawn_in_terminal, window, cx)
-        } else {
-            Task::ready(None)
-        }
-    }
-}
diff --git a/crates/workspace/src/theme_preview.rs b/crates/workspace/src/theme_preview.rs
deleted file mode 100644
index f978da706b..0000000000
--- a/crates/workspace/src/theme_preview.rs
+++ /dev/null
@@ -1,429 +0,0 @@
-#![allow(unused, dead_code)]
-use gpui::{
-    AnyElement, App, Entity, EventEmitter, FocusHandle, Focusable, Hsla, Task, actions, hsla,
-};
-use strum::IntoEnumIterator;
-use theme::all_theme_colors;
-use ui::{
-    AudioStatus, Avatar, AvatarAudioStatusIndicator, AvatarAvailabilityIndicator, ButtonLike,
-    Checkbox, CollaboratorAvailability, ContentGroup, DecoratedIcon, ElevationIndex, Facepile,
-    IconDecoration, Indicator, KeybindingHint, Switch, TintColor, Tooltip, prelude::*,
-    utils::calculate_contrast_ratio,
-};
-
-use crate::{Item, Workspace};
-
-actions!(
-    dev,
-    [
-        /// Opens the theme preview window.
-        OpenThemePreview
-    ]
-);
-
-pub fn init(cx: &mut App) {
-    cx.observe_new(|workspace: &mut Workspace, _, _| {
-        workspace.register_action(|workspace, _: &OpenThemePreview, window, cx| {
-            let theme_preview = cx.new(|cx| ThemePreview::new(window, cx));
-            workspace.add_item_to_active_pane(Box::new(theme_preview), None, true, window, cx)
-        });
-    })
-    .detach();
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, PartialOrd, strum::EnumIter)]
-enum ThemePreviewPage {
-    Overview,
-    Typography,
-}
-
-impl ThemePreviewPage {
-    pub fn name(&self) -> &'static str {
-        match self {
-            Self::Overview => "Overview",
-            Self::Typography => "Typography",
-        }
-    }
-}
-
-struct ThemePreview {
-    current_page: ThemePreviewPage,
-    focus_handle: FocusHandle,
-}
-
-impl ThemePreview {
-    pub fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
-        Self {
-            current_page: ThemePreviewPage::Overview,
-            focus_handle: cx.focus_handle(),
-        }
-    }
-
-    pub fn view(
-        &self,
-        page: ThemePreviewPage,
-        window: &mut Window,
-        cx: &mut Context<ThemePreview>,
-    ) -> impl IntoElement {
-        match page {
-            ThemePreviewPage::Overview => self.render_overview_page(window, cx).into_any_element(),
-            ThemePreviewPage::Typography => {
-                self.render_typography_page(window, cx).into_any_element()
-            }
-        }
-    }
-}
-
-impl EventEmitter<()> for ThemePreview {}
-
-impl Focusable for ThemePreview {
-    fn focus_handle(&self, _: &App) -> gpui::FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-impl ThemePreview {}
-
-impl Item for ThemePreview {
-    type Event = ();
-
-    fn to_item_events(_: &Self::Event, _: impl FnMut(crate::item::ItemEvent)) {}
-
-    fn tab_content_text(&self, _detail: usize, cx: &App) -> SharedString {
-        let name = cx.theme().name.clone();
-        format!("{} Preview", name).into()
-    }
-
-    fn telemetry_event_text(&self) -> Option<&'static str> {
-        None
-    }
-
-    fn can_split(&self) -> bool {
-        true
-    }
-
-    fn clone_on_split(
-        &self,
-        _workspace_id: Option<crate::WorkspaceId>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Option<Entity<Self>>>
-    where
-        Self: Sized,
-    {
-        Task::ready(Some(cx.new(|cx| Self::new(window, cx))))
-    }
-}
-
-const AVATAR_URL: &str = "https://avatars.githubusercontent.com/u/1714999?v=4";
-
-impl ThemePreview {
-    fn preview_bg(window: &mut Window, cx: &mut App) -> Hsla {
-        cx.theme().colors().editor_background
-    }
-
-    fn render_text(
-        &self,
-        layer: ElevationIndex,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let bg = layer.bg(cx);
-
-        let label_with_contrast = |label: &str, fg: Hsla| {
-            let contrast = calculate_contrast_ratio(fg, bg);
-            format!("{} ({:.2})", label, contrast)
-        };
-
-        v_flex()
-            .gap_1()
-            .child(Headline::new("Text").size(HeadlineSize::Small).color(Color::Muted))
-            .child(
-                h_flex()
-                    .items_start()
-                    .gap_4()
-                    .child(
-                        v_flex()
-                            .gap_1()
-                            .child(Headline::new("Headline Sizes").size(HeadlineSize::Small).color(Color::Muted))
-                            .child(Headline::new("XLarge Headline").size(HeadlineSize::XLarge))
-                            .child(Headline::new("Large Headline").size(HeadlineSize::Large))
-                            .child(Headline::new("Medium Headline").size(HeadlineSize::Medium))
-                            .child(Headline::new("Small Headline").size(HeadlineSize::Small))
-                            .child(Headline::new("XSmall Headline").size(HeadlineSize::XSmall)),
-                    )
-                    .child(
-                        v_flex()
-                            .gap_1()
-                            .child(Headline::new("Text Colors").size(HeadlineSize::Small).color(Color::Muted))
-                            .child(
-                                Label::new(label_with_contrast(
-                                    "Default Text",
-                                    Color::Default.color(cx),
-                                ))
-                                .color(Color::Default),
-                            )
-                            .child(
-                                Label::new(label_with_contrast(
-                                    "Accent Text",
-                                    Color::Accent.color(cx),
-                                ))
-                                .color(Color::Accent),
-                            )
-                            .child(
-                                Label::new(label_with_contrast(
-                                    "Conflict Text",
-                                    Color::Conflict.color(cx),
-                                ))
-                                .color(Color::Conflict),
-                            )
-                            .child(
-                                Label::new(label_with_contrast(
-                                    "Created Text",
-                                    Color::Created.color(cx),
-                                ))
-                                .color(Color::Created),
-                            )
-                            .child(
-                                Label::new(label_with_contrast(
-                                    "Deleted Text",
-                                    Color::Deleted.color(cx),
-                                ))
-                                .color(Color::Deleted),
-                            )
-                            .child(
-                                Label::new(label_with_contrast(
-                                    "Disabled Text",
-                                    Color::Disabled.color(cx),
-                                ))
-                                .color(Color::Disabled),
-                            )
-                            .child(
-                                Label::new(label_with_contrast(
-                                    "Error Text",
-                                    Color::Error.color(cx),
-                                ))
-                                .color(Color::Error),
-                            )
-                            .child(
-                                Label::new(label_with_contrast(
-                                    "Hidden Text",
-                                    Color::Hidden.color(cx),
-                                ))
-                                .color(Color::Hidden),
-                            )
-                            .child(
-                                Label::new(label_with_contrast(
-                                    "Hint Text",
-                                    Color::Hint.color(cx),
-                                ))
-                                .color(Color::Hint),
-                            )
-                            .child(
-                                Label::new(label_with_contrast(
-                                    "Ignored Text",
-                                    Color::Ignored.color(cx),
-                                ))
-                                .color(Color::Ignored),
-                            )
-                            .child(
-                                Label::new(label_with_contrast(
-                                    "Info Text",
-                                    Color::Info.color(cx),
-                                ))
-                                .color(Color::Info),
-                            )
-                            .child(
-                                Label::new(label_with_contrast(
-                                    "Modified Text",
-                                    Color::Modified.color(cx),
-                                ))
-                                .color(Color::Modified),
-                            )
-                            .child(
-                                Label::new(label_with_contrast(
-                                    "Muted Text",
-                                    Color::Muted.color(cx),
-                                ))
-                                .color(Color::Muted),
-                            )
-                            .child(
-                                Label::new(label_with_contrast(
-                                    "Placeholder Text",
-                                    Color::Placeholder.color(cx),
-                                ))
-                                .color(Color::Placeholder),
-                            )
-                            .child(
-                                Label::new(label_with_contrast(
-                                    "Selected Text",
-                                    Color::Selected.color(cx),
-                                ))
-                                .color(Color::Selected),
-                            )
-                            .child(
-                                Label::new(label_with_contrast(
-                                    "Success Text",
-                                    Color::Success.color(cx),
-                                ))
-                                .color(Color::Success),
-                            )
-                            .child(
-                                Label::new(label_with_contrast(
-                                    "Warning Text",
-                                    Color::Warning.color(cx),
-                                ))
-                                .color(Color::Warning),
-                            )
-                    )
-                    .child(
-                        v_flex()
-                            .gap_1()
-                            .child(Headline::new("Wrapping Text").size(HeadlineSize::Small).color(Color::Muted))
-                            .child(
-                                div().max_w(px(200.)).child(
-                                "This is a longer piece of text that should wrap to multiple lines. It demonstrates how text behaves when it exceeds the width of its container."
-                            ))
-                    )
-            )
-    }
-
-    fn render_colors(
-        &self,
-        layer: ElevationIndex,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let bg = layer.bg(cx);
-        let all_colors = all_theme_colors(cx);
-
-        v_flex()
-            .gap_1()
-            .child(
-                Headline::new("Colors")
-                    .size(HeadlineSize::Small)
-                    .color(Color::Muted),
-            )
-            .child(
-                h_flex()
-                    .flex_wrap()
-                    .gap_1()
-                    .children(all_colors.into_iter().map(|(color, name)| {
-                        let id = ElementId::Name(format!("{:?}-preview", color).into());
-                        div().size_8().flex_none().child(
-                            ButtonLike::new(id)
-                                .child(
-                                    div()
-                                        .size_8()
-                                        .bg(color)
-                                        .border_1()
-                                        .border_color(cx.theme().colors().border)
-                                        .overflow_hidden(),
-                                )
-                                .size(ButtonSize::None)
-                                .style(ButtonStyle::Transparent)
-                                .tooltip(move |window, cx| {
-                                    let name = name.clone();
-                                    Tooltip::with_meta(name, None, format!("{:?}", color), cx)
-                                }),
-                        )
-                    })),
-            )
-    }
-
-    fn render_theme_layer(
-        &self,
-        layer: ElevationIndex,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        v_flex()
-            .p_4()
-            .bg(layer.bg(cx))
-            .text_color(cx.theme().colors().text)
-            .gap_2()
-            .child(Headline::new(layer.clone().to_string()).size(HeadlineSize::Medium))
-            .child(self.render_text(layer, window, cx))
-            .child(self.render_colors(layer, window, cx))
-    }
-
-    fn render_overview_page(
-        &self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        v_flex()
-            .id("theme-preview-overview")
-            .overflow_scroll()
-            .size_full()
-            .child(
-                v_flex()
-                    .child(Headline::new("Theme Preview").size(HeadlineSize::Large))
-                    .child(div().w_full().text_color(cx.theme().colors().text_muted).child("This view lets you preview a range of UI elements across a theme. Use it for testing out changes to the theme."))
-                    )
-            .child(self.render_theme_layer(ElevationIndex::Background, window, cx))
-            .child(self.render_theme_layer(ElevationIndex::Surface, window, cx))
-            .child(self.render_theme_layer(ElevationIndex::EditorSurface, window, cx))
-            .child(self.render_theme_layer(ElevationIndex::ElevatedSurface, window, cx))
-    }
-
-    fn render_typography_page(
-        &self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        v_flex()
-            .id("theme-preview-typography")
-            .overflow_scroll()
-            .size_full()
-            .child(v_flex()
-                .gap_4()
-                .child(Headline::new("Headline 1").size(HeadlineSize::XLarge))
-                .child(Label::new("Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."))
-                .child(Headline::new("Headline 2").size(HeadlineSize::Large))
-                .child(Label::new("Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat."))
-                .child(Headline::new("Headline 3").size(HeadlineSize::Medium))
-                .child(Label::new("Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur."))
-                .child(Headline::new("Headline 4").size(HeadlineSize::Small))
-                .child(Label::new("Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."))
-                .child(Headline::new("Headline 5").size(HeadlineSize::XSmall))
-                .child(Label::new("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat."))
-                .child(Headline::new("Body Text").size(HeadlineSize::Small))
-                .child(Label::new("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."))
-            )
-    }
-
-    fn render_page_nav(&self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        h_flex()
-            .id("theme-preview-nav")
-            .items_center()
-            .gap_4()
-            .py_2()
-            .bg(Self::preview_bg(window, cx))
-            .children(ThemePreviewPage::iter().map(|p| {
-                Button::new(ElementId::Name(p.name().into()), p.name())
-                    .on_click(cx.listener(move |this, _, window, cx| {
-                        this.current_page = p;
-                        cx.notify();
-                    }))
-                    .toggle_state(p == self.current_page)
-                    .selected_style(ButtonStyle::Tinted(TintColor::Accent))
-            }))
-    }
-}
-
-impl Render for ThemePreview {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl ui::IntoElement {
-        v_flex()
-            .id("theme-preview")
-            .key_context("ThemePreview")
-            .items_start()
-            .overflow_hidden()
-            .size_full()
-            .max_h_full()
-            .track_focus(&self.focus_handle)
-            .px_2()
-            .bg(Self::preview_bg(window, cx))
-            .child(self.render_page_nav(window, cx))
-            .child(self.view(self.current_page, window, cx))
-    }
-}
diff --git a/crates/workspace/src/toast_layer.rs b/crates/workspace/src/toast_layer.rs
deleted file mode 100644
index 5157945548..0000000000
--- a/crates/workspace/src/toast_layer.rs
+++ /dev/null
@@ -1,252 +0,0 @@
-use std::{
-    rc::Rc,
-    time::{Duration, Instant},
-};
-
-use gpui::{AnyView, DismissEvent, Entity, EntityId, FocusHandle, ManagedView, Subscription, Task};
-use ui::{animation::DefaultAnimations, prelude::*};
-use zed_actions::toast;
-
-use crate::Workspace;
-
-const DEFAULT_TOAST_DURATION: Duration = Duration::from_secs(10);
-const MINIMUM_RESUME_DURATION: Duration = Duration::from_millis(800);
-
-pub fn init(cx: &mut App) {
-    cx.observe_new(|workspace: &mut Workspace, _window, _cx| {
-        workspace.register_action(|_workspace, _: &toast::RunAction, window, cx| {
-            let workspace = cx.entity();
-            let window = window.window_handle();
-            cx.defer(move |cx| {
-                let action = workspace
-                    .read(cx)
-                    .toast_layer
-                    .read(cx)
-                    .active_toast
-                    .as_ref()
-                    .and_then(|active_toast| active_toast.action.clone());
-
-                if let Some(on_click) = action.and_then(|action| action.on_click) {
-                    window
-                        .update(cx, |_, window, cx| {
-                            on_click(window, cx);
-                        })
-                        .ok();
-                }
-            });
-        });
-    })
-    .detach();
-}
-
-pub trait ToastView: ManagedView {
-    fn action(&self) -> Option<ToastAction>;
-}
-
-#[derive(Clone)]
-pub struct ToastAction {
-    pub id: ElementId,
-    pub label: SharedString,
-    pub on_click: Option<Rc<dyn Fn(&mut Window, &mut App) + 'static>>,
-}
-
-impl ToastAction {
-    pub fn new(
-        label: SharedString,
-        on_click: Option<Rc<dyn Fn(&mut Window, &mut App) + 'static>>,
-    ) -> Self {
-        let id = ElementId::Name(label.clone());
-
-        Self {
-            id,
-            label,
-            on_click,
-        }
-    }
-}
-
-trait ToastViewHandle {
-    fn view(&self) -> AnyView;
-}
-
-impl<V: ToastView> ToastViewHandle for Entity<V> {
-    fn view(&self) -> AnyView {
-        self.clone().into()
-    }
-}
-
-pub struct ActiveToast {
-    id: EntityId,
-    toast: Box<dyn ToastViewHandle>,
-    action: Option<ToastAction>,
-    _subscriptions: [Subscription; 1],
-    focus_handle: FocusHandle,
-}
-
-struct DismissTimer {
-    instant_started: Instant,
-    _task: Task<()>,
-}
-
-pub struct ToastLayer {
-    active_toast: Option<ActiveToast>,
-    duration_remaining: Option<Duration>,
-    dismiss_timer: Option<DismissTimer>,
-}
-
-impl Default for ToastLayer {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl ToastLayer {
-    pub fn new() -> Self {
-        Self {
-            active_toast: None,
-            duration_remaining: None,
-            dismiss_timer: None,
-        }
-    }
-
-    pub fn toggle_toast<V>(&mut self, cx: &mut Context<Self>, new_toast: Entity<V>)
-    where
-        V: ToastView,
-    {
-        if let Some(active_toast) = &self.active_toast {
-            let show_new = active_toast.id != new_toast.entity_id();
-            self.hide_toast(cx);
-            if !show_new {
-                return;
-            }
-        }
-        self.show_toast(new_toast, cx);
-    }
-
-    pub fn show_toast<V>(&mut self, new_toast: Entity<V>, cx: &mut Context<Self>)
-    where
-        V: ToastView,
-    {
-        let action = new_toast.read(cx).action();
-        let focus_handle = cx.focus_handle();
-
-        self.active_toast = Some(ActiveToast {
-            _subscriptions: [cx.subscribe(&new_toast, |this, _, _: &DismissEvent, cx| {
-                this.hide_toast(cx);
-            })],
-            id: new_toast.entity_id(),
-            toast: Box::new(new_toast),
-            action,
-            focus_handle,
-        });
-
-        self.start_dismiss_timer(DEFAULT_TOAST_DURATION, cx);
-
-        cx.notify();
-    }
-
-    pub fn hide_toast(&mut self, cx: &mut Context<Self>) {
-        self.active_toast.take();
-        cx.notify();
-    }
-
-    pub fn active_toast<V>(&self) -> Option<Entity<V>>
-    where
-        V: 'static,
-    {
-        let active_toast = self.active_toast.as_ref()?;
-        active_toast.toast.view().downcast::<V>().ok()
-    }
-
-    pub fn has_active_toast(&self) -> bool {
-        self.active_toast.is_some()
-    }
-
-    fn pause_dismiss_timer(&mut self) {
-        let Some(dismiss_timer) = self.dismiss_timer.take() else {
-            return;
-        };
-        let Some(duration_remaining) = self.duration_remaining.as_mut() else {
-            return;
-        };
-        *duration_remaining =
-            duration_remaining.saturating_sub(dismiss_timer.instant_started.elapsed());
-        if *duration_remaining < MINIMUM_RESUME_DURATION {
-            *duration_remaining = MINIMUM_RESUME_DURATION;
-        }
-    }
-
-    /// Starts a timer to automatically dismiss the toast after the specified duration
-    pub fn start_dismiss_timer(&mut self, duration: Duration, cx: &mut Context<Self>) {
-        self.clear_dismiss_timer(cx);
-
-        let instant_started = std::time::Instant::now();
-        let task = cx.spawn(async move |this, cx| {
-            cx.background_executor().timer(duration).await;
-
-            if let Some(this) = this.upgrade() {
-                this.update(cx, |this, cx| this.hide_toast(cx)).ok();
-            }
-        });
-
-        self.duration_remaining = Some(duration);
-        self.dismiss_timer = Some(DismissTimer {
-            instant_started,
-            _task: task,
-        });
-        cx.notify();
-    }
-
-    /// Restarts the dismiss timer with a new duration
-    pub fn restart_dismiss_timer(&mut self, cx: &mut Context<Self>) {
-        let Some(duration) = self.duration_remaining else {
-            return;
-        };
-        self.start_dismiss_timer(duration, cx);
-        cx.notify();
-    }
-
-    /// Clears the dismiss timer if one exists
-    pub fn clear_dismiss_timer(&mut self, cx: &mut Context<Self>) {
-        self.dismiss_timer.take();
-        cx.notify();
-    }
-}
-
-impl Render for ToastLayer {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let Some(active_toast) = &self.active_toast else {
-            return div();
-        };
-
-        div().absolute().size_full().bottom_0().left_0().child(
-            v_flex()
-                .id(("toast-layer-container", active_toast.id))
-                .absolute()
-                .w_full()
-                .bottom(px(0.))
-                .flex()
-                .flex_col()
-                .items_center()
-                .track_focus(&active_toast.focus_handle)
-                .child(
-                    h_flex()
-                        .id("active-toast-container")
-                        .occlude()
-                        .on_hover(cx.listener(|this, hover_start, _window, cx| {
-                            if *hover_start {
-                                this.pause_dismiss_timer();
-                            } else {
-                                this.restart_dismiss_timer(cx);
-                            }
-                            cx.stop_propagation();
-                        }))
-                        .on_click(|_, _, cx| {
-                            cx.stop_propagation();
-                        })
-                        .child(active_toast.toast.view()),
-                )
-                .animate_in(AnimationDirection::FromBottom, true),
-        )
-    }
-}
diff --git a/crates/workspace/src/toolbar.rs b/crates/workspace/src/toolbar.rs
deleted file mode 100644
index 6e26be6dc7..0000000000
--- a/crates/workspace/src/toolbar.rs
+++ /dev/null
@@ -1,282 +0,0 @@
-use crate::ItemHandle;
-use gpui::{
-    AnyView, App, Context, Entity, EntityId, EventEmitter, KeyContext, ParentElement as _, Render,
-    Styled, Window,
-};
-use ui::prelude::*;
-use ui::{h_flex, v_flex};
-
-pub enum ToolbarItemEvent {
-    ChangeLocation(ToolbarItemLocation),
-}
-
-pub trait ToolbarItemView: Render + EventEmitter<ToolbarItemEvent> {
-    fn set_active_pane_item(
-        &mut self,
-        active_pane_item: Option<&dyn crate::ItemHandle>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> ToolbarItemLocation;
-
-    fn pane_focus_update(
-        &mut self,
-        _pane_focused: bool,
-        _window: &mut Window,
-        _cx: &mut Context<Self>,
-    ) {
-    }
-
-    fn contribute_context(&self, _context: &mut KeyContext, _cx: &App) {}
-}
-
-trait ToolbarItemViewHandle: Send {
-    fn id(&self) -> EntityId;
-    fn to_any(&self) -> AnyView;
-    fn set_active_pane_item(
-        &self,
-        active_pane_item: Option<&dyn ItemHandle>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> ToolbarItemLocation;
-    fn focus_changed(&mut self, pane_focused: bool, window: &mut Window, cx: &mut App);
-    fn contribute_context(&self, context: &mut KeyContext, cx: &App);
-}
-
-#[derive(Copy, Clone, Debug, PartialEq)]
-pub enum ToolbarItemLocation {
-    Hidden,
-    PrimaryLeft,
-    PrimaryRight,
-    Secondary,
-}
-
-pub struct Toolbar {
-    active_item: Option<Box<dyn ItemHandle>>,
-    hidden: bool,
-    can_navigate: bool,
-    items: Vec<(Box<dyn ToolbarItemViewHandle>, ToolbarItemLocation)>,
-}
-
-impl Toolbar {
-    fn has_any_visible_items(&self) -> bool {
-        self.items
-            .iter()
-            .any(|(_item, location)| *location != ToolbarItemLocation::Hidden)
-    }
-
-    fn left_items(&self) -> impl Iterator<Item = &dyn ToolbarItemViewHandle> {
-        self.items.iter().filter_map(|(item, location)| {
-            if *location == ToolbarItemLocation::PrimaryLeft {
-                Some(item.as_ref())
-            } else {
-                None
-            }
-        })
-    }
-
-    fn right_items(&self) -> impl Iterator<Item = &dyn ToolbarItemViewHandle> {
-        self.items.iter().filter_map(|(item, location)| {
-            if *location == ToolbarItemLocation::PrimaryRight {
-                Some(item.as_ref())
-            } else {
-                None
-            }
-        })
-    }
-
-    fn secondary_items(&self) -> impl Iterator<Item = &dyn ToolbarItemViewHandle> {
-        self.items.iter().rev().filter_map(|(item, location)| {
-            if *location == ToolbarItemLocation::Secondary {
-                Some(item.as_ref())
-            } else {
-                None
-            }
-        })
-    }
-}
-
-impl Render for Toolbar {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        if !self.has_any_visible_items() {
-            return div();
-        }
-
-        let secondary_items = self.secondary_items().map(|item| item.to_any());
-
-        let has_left_items = self.left_items().count() > 0;
-        let has_right_items = self.right_items().count() > 0;
-
-        v_flex()
-            .group("toolbar")
-            .relative()
-            .p(DynamicSpacing::Base08.rems(cx))
-            .when(has_left_items || has_right_items, |this| {
-                this.gap(DynamicSpacing::Base08.rems(cx))
-            })
-            .border_b_1()
-            .border_color(cx.theme().colors().border_variant)
-            .bg(cx.theme().colors().toolbar_background)
-            .when(has_left_items || has_right_items, |this| {
-                this.child(
-                    h_flex()
-                        .min_h_6()
-                        .justify_between()
-                        .gap(DynamicSpacing::Base08.rems(cx))
-                        .when(has_left_items, |this| {
-                            this.child(
-                                h_flex()
-                                    .flex_auto()
-                                    .justify_start()
-                                    .overflow_x_hidden()
-                                    .children(self.left_items().map(|item| item.to_any())),
-                            )
-                        })
-                        .when(has_right_items, |this| {
-                            this.child(
-                                h_flex()
-                                    .h_full()
-                                    .flex_row_reverse()
-                                    .map(|el| {
-                                        if has_left_items {
-                                            // We're using `flex_none` here to prevent some flickering that can occur when the
-                                            // size of the left items container changes.
-                                            el.flex_none()
-                                        } else {
-                                            el.flex_auto()
-                                        }
-                                    })
-                                    .justify_end()
-                                    .children(self.right_items().map(|item| item.to_any())),
-                            )
-                        }),
-                )
-            })
-            .children(secondary_items)
-    }
-}
-
-impl Default for Toolbar {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl Toolbar {
-    pub fn new() -> Self {
-        Self {
-            active_item: None,
-            items: Default::default(),
-            hidden: false,
-            can_navigate: true,
-        }
-    }
-
-    pub fn set_can_navigate(&mut self, can_navigate: bool, cx: &mut Context<Self>) {
-        self.can_navigate = can_navigate;
-        cx.notify();
-    }
-
-    pub fn add_item<T>(&mut self, item: Entity<T>, window: &mut Window, cx: &mut Context<Self>)
-    where
-        T: 'static + ToolbarItemView,
-    {
-        let location = item.set_active_pane_item(self.active_item.as_deref(), window, cx);
-        cx.subscribe(&item, |this, item, event, cx| {
-            if let Some((_, current_location)) = this
-                .items
-                .iter_mut()
-                .find(|(i, _)| i.id() == item.entity_id())
-            {
-                match event {
-                    ToolbarItemEvent::ChangeLocation(new_location) => {
-                        if new_location != current_location {
-                            *current_location = *new_location;
-                            cx.notify();
-                        }
-                    }
-                }
-            }
-        })
-        .detach();
-        self.items.push((Box::new(item), location));
-        cx.notify();
-    }
-
-    pub fn set_active_item(
-        &mut self,
-        item: Option<&dyn ItemHandle>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.active_item = item.map(|item| item.boxed_clone());
-        self.hidden = self
-            .active_item
-            .as_ref()
-            .map(|item| !item.show_toolbar(cx))
-            .unwrap_or(false);
-
-        for (toolbar_item, current_location) in self.items.iter_mut() {
-            let new_location = toolbar_item.set_active_pane_item(item, window, cx);
-            if new_location != *current_location {
-                *current_location = new_location;
-                cx.notify();
-            }
-        }
-    }
-
-    pub fn focus_changed(&mut self, focused: bool, window: &mut Window, cx: &mut Context<Self>) {
-        for (toolbar_item, _) in self.items.iter_mut() {
-            toolbar_item.focus_changed(focused, window, cx);
-        }
-    }
-
-    pub fn item_of_type<T: ToolbarItemView>(&self) -> Option<Entity<T>> {
-        self.items
-            .iter()
-            .find_map(|(item, _)| item.to_any().downcast().ok())
-    }
-
-    pub fn hidden(&self) -> bool {
-        self.hidden
-    }
-
-    pub fn contribute_context(&self, context: &mut KeyContext, cx: &App) {
-        for (item, location) in &self.items {
-            if *location != ToolbarItemLocation::Hidden {
-                item.contribute_context(context, cx);
-            }
-        }
-    }
-}
-
-impl<T: ToolbarItemView> ToolbarItemViewHandle for Entity<T> {
-    fn id(&self) -> EntityId {
-        self.entity_id()
-    }
-
-    fn to_any(&self) -> AnyView {
-        self.clone().into()
-    }
-
-    fn set_active_pane_item(
-        &self,
-        active_pane_item: Option<&dyn ItemHandle>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> ToolbarItemLocation {
-        self.update(cx, |this, cx| {
-            this.set_active_pane_item(active_pane_item, window, cx)
-        })
-    }
-
-    fn focus_changed(&mut self, pane_focused: bool, window: &mut Window, cx: &mut App) {
-        self.update(cx, |this, cx| {
-            this.pane_focus_update(pane_focused, window, cx);
-            cx.notify();
-        });
-    }
-
-    fn contribute_context(&self, context: &mut KeyContext, cx: &App) {
-        self.read(cx).contribute_context(context, cx)
-    }
-}
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
deleted file mode 100644
index d2a9ef71fc..0000000000
--- a/crates/workspace/src/workspace.rs
+++ /dev/null
@@ -1,11487 +0,0 @@
-pub mod dock;
-pub mod history_manager;
-pub mod invalid_item_view;
-pub mod item;
-mod modal_layer;
-pub mod notifications;
-pub mod pane;
-pub mod pane_group;
-mod path_list;
-mod persistence;
-pub mod searchable;
-pub mod shared_screen;
-mod status_bar;
-pub mod tasks;
-mod theme_preview;
-mod toast_layer;
-mod toolbar;
-mod workspace_settings;
-
-pub use crate::notifications::NotificationFrame;
-pub use dock::Panel;
-pub use path_list::PathList;
-pub use toast_layer::{ToastAction, ToastLayer, ToastView};
-
-use anyhow::{Context as _, Result, anyhow};
-use call::{ActiveCall, call_settings::CallSettings};
-use client::{
-    ChannelId, Client, ErrorExt, Status, TypedEnvelope, UserStore,
-    proto::{self, ErrorCode, PanelId, PeerId},
-};
-use collections::{HashMap, HashSet, hash_map};
-use dock::{Dock, DockPosition, PanelButtons, PanelHandle, RESIZE_HANDLE_SIZE};
-use futures::{
-    Future, FutureExt, StreamExt,
-    channel::{
-        mpsc::{self, UnboundedReceiver, UnboundedSender},
-        oneshot,
-    },
-    future::{Shared, try_join_all},
-};
-use gpui::{
-    Action, AnyEntity, AnyView, AnyWeakView, App, AsyncApp, AsyncWindowContext, Bounds, Context,
-    CursorStyle, Decorations, DragMoveEvent, Entity, EntityId, EventEmitter, FocusHandle,
-    Focusable, Global, HitboxBehavior, Hsla, KeyContext, Keystroke, ManagedView, MouseButton,
-    PathPromptOptions, Point, PromptLevel, Render, ResizeEdge, Size, Stateful, Subscription,
-    SystemWindowTabController, Task, Tiling, WeakEntity, WindowBounds, WindowHandle, WindowId,
-    WindowOptions, actions, canvas, point, relative, size, transparent_black,
-};
-pub use history_manager::*;
-pub use item::{
-    FollowableItem, FollowableItemHandle, Item, ItemHandle, ItemSettings, PreviewTabsSettings,
-    ProjectItem, SerializableItem, SerializableItemHandle, WeakItemHandle,
-};
-use itertools::Itertools;
-use language::{Buffer, LanguageRegistry, Rope, language_settings::all_language_settings};
-pub use modal_layer::*;
-use node_runtime::NodeRuntime;
-use notifications::{
-    DetachAndPromptErr, Notifications, dismiss_app_notification,
-    simple_message_notification::MessageNotification,
-};
-pub use pane::*;
-pub use pane_group::{
-    ActivePaneDecorator, HANDLE_HITBOX_SIZE, Member, PaneAxis, PaneGroup, PaneRenderContext,
-    SplitDirection,
-};
-use persistence::{DB, SerializedWindowBounds, model::SerializedWorkspace};
-pub use persistence::{
-    DB as WORKSPACE_DB, WorkspaceDb, delete_unloaded_items,
-    model::{ItemId, SerializedWorkspaceLocation},
-};
-use postage::stream::Stream;
-use project::{
-    DirectoryLister, Project, ProjectEntryId, ProjectPath, ResolvedPath, Worktree, WorktreeId,
-    WorktreeSettings,
-    debugger::{breakpoint_store::BreakpointStoreEvent, session::ThreadStatus},
-    toolchain_store::ToolchainStoreEvent,
-};
-use remote::{
-    RemoteClientDelegate, RemoteConnection, RemoteConnectionOptions,
-    remote_client::ConnectionIdentifier,
-};
-use schemars::JsonSchema;
-use serde::Deserialize;
-use session::AppSession;
-use settings::{CenteredPaddingSettings, Settings, SettingsLocation, update_settings_file};
-use shared_screen::SharedScreen;
-use sqlez::{
-    bindable::{Bind, Column, StaticColumnCount},
-    statement::Statement,
-};
-use status_bar::StatusBar;
-pub use status_bar::StatusItemView;
-use std::{
-    any::TypeId,
-    borrow::Cow,
-    cell::RefCell,
-    cmp,
-    collections::{VecDeque, hash_map::DefaultHasher},
-    env,
-    hash::{Hash, Hasher},
-    path::{Path, PathBuf},
-    process::ExitStatus,
-    rc::Rc,
-    sync::{
-        Arc, LazyLock, Weak,
-        atomic::{AtomicBool, AtomicUsize},
-    },
-    time::Duration,
-};
-use task::{DebugScenario, SpawnInTerminal, TaskContext};
-use theme::{ActiveTheme, GlobalTheme, SystemAppearance, ThemeSettings};
-pub use toolbar::{Toolbar, ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView};
-pub use ui;
-use ui::{Window, prelude::*};
-use util::{
-    ResultExt, TryFutureExt,
-    paths::{PathStyle, SanitizedPath},
-    rel_path::RelPath,
-    serde::default_true,
-};
-use uuid::Uuid;
-pub use workspace_settings::{
-    AutosaveSetting, BottomDockLayout, RestoreOnStartupBehavior, StatusBarSettings, TabBarSettings,
-    WorkspaceSettings,
-};
-use zed_actions::{Spawn, feedback::FileBugReport};
-
-use crate::persistence::{
-    SerializedAxis,
-    model::{DockData, DockStructure, SerializedItem, SerializedPane, SerializedPaneGroup},
-};
-use crate::{item::ItemBufferKind, notifications::NotificationId};
-
-pub const SERIALIZATION_THROTTLE_TIME: Duration = Duration::from_millis(200);
-
-static ZED_WINDOW_SIZE: LazyLock<Option<Size<Pixels>>> = LazyLock::new(|| {
-    env::var("ZED_WINDOW_SIZE")
-        .ok()
-        .as_deref()
-        .and_then(parse_pixel_size_env_var)
-});
-
-static ZED_WINDOW_POSITION: LazyLock<Option<Point<Pixels>>> = LazyLock::new(|| {
-    env::var("ZED_WINDOW_POSITION")
-        .ok()
-        .as_deref()
-        .and_then(parse_pixel_position_env_var)
-});
-
-pub trait TerminalProvider {
-    fn spawn(
-        &self,
-        task: SpawnInTerminal,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Option<Result<ExitStatus>>>;
-}
-
-pub trait DebuggerProvider {
-    // `active_buffer` is used to resolve build task's name against language-specific tasks.
-    fn start_session(
-        &self,
-        definition: DebugScenario,
-        task_context: TaskContext,
-        active_buffer: Option<Entity<Buffer>>,
-        worktree_id: Option<WorktreeId>,
-        window: &mut Window,
-        cx: &mut App,
-    );
-
-    fn spawn_task_or_modal(
-        &self,
-        workspace: &mut Workspace,
-        action: &Spawn,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    );
-
-    fn task_scheduled(&self, cx: &mut App);
-    fn debug_scenario_scheduled(&self, cx: &mut App);
-    fn debug_scenario_scheduled_last(&self, cx: &App) -> bool;
-
-    fn active_thread_state(&self, cx: &App) -> Option<ThreadStatus>;
-}
-
-actions!(
-    workspace,
-    [
-        /// Activates the next pane in the workspace.
-        ActivateNextPane,
-        /// Activates the previous pane in the workspace.
-        ActivatePreviousPane,
-        /// Switches to the next window.
-        ActivateNextWindow,
-        /// Switches to the previous window.
-        ActivatePreviousWindow,
-        /// Adds a folder to the current project.
-        AddFolderToProject,
-        /// Clears all notifications.
-        ClearAllNotifications,
-        /// Clears all navigation history, including forward/backward navigation, recently opened files, and recently closed tabs. **This action is irreversible**.
-        ClearNavigationHistory,
-        /// Closes the active dock.
-        CloseActiveDock,
-        /// Closes all docks.
-        CloseAllDocks,
-        /// Toggles all docks.
-        ToggleAllDocks,
-        /// Closes the current window.
-        CloseWindow,
-        /// Opens the feedback dialog.
-        Feedback,
-        /// Follows the next collaborator in the session.
-        FollowNextCollaborator,
-        /// Moves the focused panel to the next position.
-        MoveFocusedPanelToNextPosition,
-        /// Opens a new terminal in the center.
-        NewCenterTerminal,
-        /// Creates a new file.
-        NewFile,
-        /// Creates a new file in a vertical split.
-        NewFileSplitVertical,
-        /// Creates a new file in a horizontal split.
-        NewFileSplitHorizontal,
-        /// Opens a new search.
-        NewSearch,
-        /// Opens a new terminal.
-        NewTerminal,
-        /// Opens a new window.
-        NewWindow,
-        /// Opens a file or directory.
-        Open,
-        /// Opens multiple files.
-        OpenFiles,
-        /// Opens the current location in terminal.
-        OpenInTerminal,
-        /// Opens the component preview.
-        OpenComponentPreview,
-        /// Reloads the active item.
-        ReloadActiveItem,
-        /// Resets the active dock to its default size.
-        ResetActiveDockSize,
-        /// Resets all open docks to their default sizes.
-        ResetOpenDocksSize,
-        /// Reloads the application
-        Reload,
-        /// Saves the current file with a new name.
-        SaveAs,
-        /// Saves without formatting.
-        SaveWithoutFormat,
-        /// Shuts down all debug adapters.
-        ShutdownDebugAdapters,
-        /// Suppresses the current notification.
-        SuppressNotification,
-        /// Toggles the bottom dock.
-        ToggleBottomDock,
-        /// Toggles centered layout mode.
-        ToggleCenteredLayout,
-        /// Toggles edit prediction feature globally for all files.
-        ToggleEditPrediction,
-        /// Toggles the left dock.
-        ToggleLeftDock,
-        /// Toggles the right dock.
-        ToggleRightDock,
-        /// Toggles zoom on the active pane.
-        ToggleZoom,
-        /// Stops following a collaborator.
-        Unfollow,
-        /// Restores the banner.
-        RestoreBanner,
-        /// Toggles expansion of the selected item.
-        ToggleExpandItem,
-    ]
-);
-
-/// Activates a specific pane by its index.
-#[derive(Clone, Deserialize, PartialEq, JsonSchema, Action)]
-#[action(namespace = workspace)]
-pub struct ActivatePane(pub usize);
-
-/// Moves an item to a specific pane by index.
-#[derive(Clone, Deserialize, PartialEq, JsonSchema, Action)]
-#[action(namespace = workspace)]
-#[serde(deny_unknown_fields)]
-pub struct MoveItemToPane {
-    #[serde(default = "default_1")]
-    pub destination: usize,
-    #[serde(default = "default_true")]
-    pub focus: bool,
-    #[serde(default)]
-    pub clone: bool,
-}
-
-fn default_1() -> usize {
-    1
-}
-
-/// Moves an item to a pane in the specified direction.
-#[derive(Clone, Deserialize, PartialEq, JsonSchema, Action)]
-#[action(namespace = workspace)]
-#[serde(deny_unknown_fields)]
-pub struct MoveItemToPaneInDirection {
-    #[serde(default = "default_right")]
-    pub direction: SplitDirection,
-    #[serde(default = "default_true")]
-    pub focus: bool,
-    #[serde(default)]
-    pub clone: bool,
-}
-
-/// Creates a new file in a split of the desired direction.
-#[derive(Clone, Deserialize, PartialEq, JsonSchema, Action)]
-#[action(namespace = workspace)]
-#[serde(deny_unknown_fields)]
-pub struct NewFileSplit(pub SplitDirection);
-
-fn default_right() -> SplitDirection {
-    SplitDirection::Right
-}
-
-/// Saves all open files in the workspace.
-#[derive(Clone, PartialEq, Debug, Deserialize, JsonSchema, Action)]
-#[action(namespace = workspace)]
-#[serde(deny_unknown_fields)]
-pub struct SaveAll {
-    #[serde(default)]
-    pub save_intent: Option<SaveIntent>,
-}
-
-/// Saves the current file with the specified options.
-#[derive(Clone, PartialEq, Debug, Deserialize, JsonSchema, Action)]
-#[action(namespace = workspace)]
-#[serde(deny_unknown_fields)]
-pub struct Save {
-    #[serde(default)]
-    pub save_intent: Option<SaveIntent>,
-}
-
-/// Closes all items and panes in the workspace.
-#[derive(Clone, PartialEq, Debug, Deserialize, Default, JsonSchema, Action)]
-#[action(namespace = workspace)]
-#[serde(deny_unknown_fields)]
-pub struct CloseAllItemsAndPanes {
-    #[serde(default)]
-    pub save_intent: Option<SaveIntent>,
-}
-
-/// Closes all inactive tabs and panes in the workspace.
-#[derive(Clone, PartialEq, Debug, Deserialize, Default, JsonSchema, Action)]
-#[action(namespace = workspace)]
-#[serde(deny_unknown_fields)]
-pub struct CloseInactiveTabsAndPanes {
-    #[serde(default)]
-    pub save_intent: Option<SaveIntent>,
-}
-
-/// Sends a sequence of keystrokes to the active element.
-#[derive(Clone, Deserialize, PartialEq, JsonSchema, Action)]
-#[action(namespace = workspace)]
-pub struct SendKeystrokes(pub String);
-
-actions!(
-    project_symbols,
-    [
-        /// Toggles the project symbols search.
-        #[action(name = "Toggle")]
-        ToggleProjectSymbols
-    ]
-);
-
-/// Toggles the file finder interface.
-#[derive(Default, PartialEq, Eq, Clone, Deserialize, JsonSchema, Action)]
-#[action(namespace = file_finder, name = "Toggle")]
-#[serde(deny_unknown_fields)]
-pub struct ToggleFileFinder {
-    #[serde(default)]
-    pub separate_history: bool,
-}
-
-/// Increases size of a currently focused dock by a given amount of pixels.
-#[derive(Clone, PartialEq, Deserialize, JsonSchema, Action)]
-#[action(namespace = workspace)]
-#[serde(deny_unknown_fields)]
-pub struct IncreaseActiveDockSize {
-    /// For 0px parameter, uses UI font size value.
-    #[serde(default)]
-    pub px: u32,
-}
-
-/// Decreases size of a currently focused dock by a given amount of pixels.
-#[derive(Clone, PartialEq, Deserialize, JsonSchema, Action)]
-#[action(namespace = workspace)]
-#[serde(deny_unknown_fields)]
-pub struct DecreaseActiveDockSize {
-    /// For 0px parameter, uses UI font size value.
-    #[serde(default)]
-    pub px: u32,
-}
-
-/// Increases size of all currently visible docks uniformly, by a given amount of pixels.
-#[derive(Clone, PartialEq, Deserialize, JsonSchema, Action)]
-#[action(namespace = workspace)]
-#[serde(deny_unknown_fields)]
-pub struct IncreaseOpenDocksSize {
-    /// For 0px parameter, uses UI font size value.
-    #[serde(default)]
-    pub px: u32,
-}
-
-/// Decreases size of all currently visible docks uniformly, by a given amount of pixels.
-#[derive(Clone, PartialEq, Deserialize, JsonSchema, Action)]
-#[action(namespace = workspace)]
-#[serde(deny_unknown_fields)]
-pub struct DecreaseOpenDocksSize {
-    /// For 0px parameter, uses UI font size value.
-    #[serde(default)]
-    pub px: u32,
-}
-
-actions!(
-    workspace,
-    [
-        /// Activates the pane to the left.
-        ActivatePaneLeft,
-        /// Activates the pane to the right.
-        ActivatePaneRight,
-        /// Activates the pane above.
-        ActivatePaneUp,
-        /// Activates the pane below.
-        ActivatePaneDown,
-        /// Swaps the current pane with the one to the left.
-        SwapPaneLeft,
-        /// Swaps the current pane with the one to the right.
-        SwapPaneRight,
-        /// Swaps the current pane with the one above.
-        SwapPaneUp,
-        /// Swaps the current pane with the one below.
-        SwapPaneDown,
-        // Swaps the current pane with the first available adjacent pane (searching in order: below, above, right, left) and activates that pane.
-        SwapPaneAdjacent,
-        /// Move the current pane to be at the far left.
-        MovePaneLeft,
-        /// Move the current pane to be at the far right.
-        MovePaneRight,
-        /// Move the current pane to be at the very top.
-        MovePaneUp,
-        /// Move the current pane to be at the very bottom.
-        MovePaneDown,
-    ]
-);
-
-#[derive(PartialEq, Eq, Debug)]
-pub enum CloseIntent {
-    /// Quit the program entirely.
-    Quit,
-    /// Close a window.
-    CloseWindow,
-    /// Replace the workspace in an existing window.
-    ReplaceWindow,
-}
-
-#[derive(Clone)]
-pub struct Toast {
-    id: NotificationId,
-    msg: Cow<'static, str>,
-    autohide: bool,
-    on_click: Option<(Cow<'static, str>, Arc<dyn Fn(&mut Window, &mut App)>)>,
-}
-
-impl Toast {
-    pub fn new<I: Into<Cow<'static, str>>>(id: NotificationId, msg: I) -> Self {
-        Toast {
-            id,
-            msg: msg.into(),
-            on_click: None,
-            autohide: false,
-        }
-    }
-
-    pub fn on_click<F, M>(mut self, message: M, on_click: F) -> Self
-    where
-        M: Into<Cow<'static, str>>,
-        F: Fn(&mut Window, &mut App) + 'static,
-    {
-        self.on_click = Some((message.into(), Arc::new(on_click)));
-        self
-    }
-
-    pub fn autohide(mut self) -> Self {
-        self.autohide = true;
-        self
-    }
-}
-
-impl PartialEq for Toast {
-    fn eq(&self, other: &Self) -> bool {
-        self.id == other.id
-            && self.msg == other.msg
-            && self.on_click.is_some() == other.on_click.is_some()
-    }
-}
-
-/// Opens a new terminal with the specified working directory.
-#[derive(Debug, Default, Clone, Deserialize, PartialEq, JsonSchema, Action)]
-#[action(namespace = workspace)]
-#[serde(deny_unknown_fields)]
-pub struct OpenTerminal {
-    pub working_directory: PathBuf,
-}
-
-#[derive(Clone, Copy, Debug, Default, Hash, PartialEq, Eq, PartialOrd, Ord)]
-pub struct WorkspaceId(i64);
-
-impl StaticColumnCount for WorkspaceId {}
-impl Bind for WorkspaceId {
-    fn bind(&self, statement: &Statement, start_index: i32) -> Result<i32> {
-        self.0.bind(statement, start_index)
-    }
-}
-impl Column for WorkspaceId {
-    fn column(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
-        i64::column(statement, start_index)
-            .map(|(i, next_index)| (Self(i), next_index))
-            .with_context(|| format!("Failed to read WorkspaceId at index {start_index}"))
-    }
-}
-impl From<WorkspaceId> for i64 {
-    fn from(val: WorkspaceId) -> Self {
-        val.0
-    }
-}
-
-fn prompt_and_open_paths(app_state: Arc<AppState>, options: PathPromptOptions, cx: &mut App) {
-    let paths = cx.prompt_for_paths(options);
-    cx.spawn(
-        async move |cx| match paths.await.anyhow().and_then(|res| res) {
-            Ok(Some(paths)) => {
-                cx.update(|cx| {
-                    open_paths(&paths, app_state, OpenOptions::default(), cx).detach_and_log_err(cx)
-                })
-                .ok();
-            }
-            Ok(None) => {}
-            Err(err) => {
-                util::log_err(&err);
-                cx.update(|cx| {
-                    if let Some(workspace_window) = cx
-                        .active_window()
-                        .and_then(|window| window.downcast::<Workspace>())
-                    {
-                        workspace_window
-                            .update(cx, |workspace, _, cx| {
-                                workspace.show_portal_error(err.to_string(), cx);
-                            })
-                            .ok();
-                    }
-                })
-                .ok();
-            }
-        },
-    )
-    .detach();
-}
-
-pub fn init(app_state: Arc<AppState>, cx: &mut App) {
-    component::init();
-    theme_preview::init(cx);
-    toast_layer::init(cx);
-    history_manager::init(cx);
-
-    cx.on_action(|_: &CloseWindow, cx| Workspace::close_global(cx));
-    cx.on_action(|_: &Reload, cx| reload(cx));
-
-    cx.on_action({
-        let app_state = Arc::downgrade(&app_state);
-        move |_: &Open, cx: &mut App| {
-            if let Some(app_state) = app_state.upgrade() {
-                prompt_and_open_paths(
-                    app_state,
-                    PathPromptOptions {
-                        files: true,
-                        directories: true,
-                        multiple: true,
-                        prompt: None,
-                    },
-                    cx,
-                );
-            }
-        }
-    });
-    cx.on_action({
-        let app_state = Arc::downgrade(&app_state);
-        move |_: &OpenFiles, cx: &mut App| {
-            let directories = cx.can_select_mixed_files_and_dirs();
-            if let Some(app_state) = app_state.upgrade() {
-                prompt_and_open_paths(
-                    app_state,
-                    PathPromptOptions {
-                        files: true,
-                        directories,
-                        multiple: true,
-                        prompt: None,
-                    },
-                    cx,
-                );
-            }
-        }
-    });
-}
-
-type BuildProjectItemFn =
-    fn(AnyEntity, Entity<Project>, Option<&Pane>, &mut Window, &mut App) -> Box<dyn ItemHandle>;
-
-type BuildProjectItemForPathFn =
-    fn(
-        &Entity<Project>,
-        &ProjectPath,
-        &mut Window,
-        &mut App,
-    ) -> Option<Task<Result<(Option<ProjectEntryId>, WorkspaceItemBuilder)>>>;
-
-#[derive(Clone, Default)]
-struct ProjectItemRegistry {
-    build_project_item_fns_by_type: HashMap<TypeId, BuildProjectItemFn>,
-    build_project_item_for_path_fns: Vec<BuildProjectItemForPathFn>,
-}
-
-impl ProjectItemRegistry {
-    fn register<T: ProjectItem>(&mut self) {
-        self.build_project_item_fns_by_type.insert(
-            TypeId::of::<T::Item>(),
-            |item, project, pane, window, cx| {
-                let item = item.downcast().unwrap();
-                Box::new(cx.new(|cx| T::for_project_item(project, pane, item, window, cx)))
-                    as Box<dyn ItemHandle>
-            },
-        );
-        self.build_project_item_for_path_fns
-            .push(|project, project_path, window, cx| {
-                let project_path = project_path.clone();
-                let is_file = project
-                    .read(cx)
-                    .entry_for_path(&project_path, cx)
-                    .is_some_and(|entry| entry.is_file());
-                let entry_abs_path = project.read(cx).absolute_path(&project_path, cx);
-                let is_local = project.read(cx).is_local();
-                let project_item =
-                    <T::Item as project::ProjectItem>::try_open(project, &project_path, cx)?;
-                let project = project.clone();
-                Some(window.spawn(cx, async move |cx| {
-                    match project_item.await.with_context(|| {
-                        format!(
-                            "opening project path {:?}",
-                            entry_abs_path.as_deref().unwrap_or(&project_path.path.as_std_path())
-                        )
-                    }) {
-                        Ok(project_item) => {
-                            let project_item = project_item;
-                            let project_entry_id: Option<ProjectEntryId> =
-                                project_item.read_with(cx, project::ProjectItem::entry_id)?;
-                            let build_workspace_item = Box::new(
-                                |pane: &mut Pane, window: &mut Window, cx: &mut Context<Pane>| {
-                                    Box::new(cx.new(|cx| {
-                                        T::for_project_item(
-                                            project,
-                                            Some(pane),
-                                            project_item,
-                                            window,
-                                            cx,
-                                        )
-                                    })) as Box<dyn ItemHandle>
-                                },
-                            ) as Box<_>;
-                            Ok((project_entry_id, build_workspace_item))
-                        }
-                        Err(e) => {
-                            log::warn!("Failed to open a project item: {e:#}");
-                            if e.error_code() == ErrorCode::Internal {
-                                if let Some(abs_path) =
-                                    entry_abs_path.as_deref().filter(|_| is_file)
-                                {
-                                    if let Some(broken_project_item_view) =
-                                        cx.update(|window, cx| {
-                                            T::for_broken_project_item(
-                                                abs_path, is_local, &e, window, cx,
-                                            )
-                                        })?
-                                    {
-                                        let build_workspace_item = Box::new(
-                                            move |_: &mut Pane, _: &mut Window, cx: &mut Context<Pane>| {
-                                                cx.new(|_| broken_project_item_view).boxed_clone()
-                                            },
-                                        )
-                                        as Box<_>;
-                                        return Ok((None, build_workspace_item));
-                                    }
-                                }
-                            }
-                            Err(e)
-                        }
-                    }
-                }))
-            });
-    }
-
-    fn open_path(
-        &self,
-        project: &Entity<Project>,
-        path: &ProjectPath,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<(Option<ProjectEntryId>, WorkspaceItemBuilder)>> {
-        let Some(open_project_item) = self
-            .build_project_item_for_path_fns
-            .iter()
-            .rev()
-            .find_map(|open_project_item| open_project_item(project, path, window, cx))
-        else {
-            return Task::ready(Err(anyhow!("cannot open file {:?}", path.path)));
-        };
-        open_project_item
-    }
-
-    fn build_item<T: project::ProjectItem>(
-        &self,
-        item: Entity<T>,
-        project: Entity<Project>,
-        pane: Option<&Pane>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<Box<dyn ItemHandle>> {
-        let build = self
-            .build_project_item_fns_by_type
-            .get(&TypeId::of::<T>())?;
-        Some(build(item.into_any(), project, pane, window, cx))
-    }
-}
-
-type WorkspaceItemBuilder =
-    Box<dyn FnOnce(&mut Pane, &mut Window, &mut Context<Pane>) -> Box<dyn ItemHandle>>;
-
-impl Global for ProjectItemRegistry {}
-
-/// Registers a [ProjectItem] for the app. When opening a file, all the registered
-/// items will get a chance to open the file, starting from the project item that
-/// was added last.
-pub fn register_project_item<I: ProjectItem>(cx: &mut App) {
-    cx.default_global::<ProjectItemRegistry>().register::<I>();
-}
-
-#[derive(Default)]
-pub struct FollowableViewRegistry(HashMap<TypeId, FollowableViewDescriptor>);
-
-struct FollowableViewDescriptor {
-    from_state_proto: fn(
-        Entity<Workspace>,
-        ViewId,
-        &mut Option<proto::view::Variant>,
-        &mut Window,
-        &mut App,
-    ) -> Option<Task<Result<Box<dyn FollowableItemHandle>>>>,
-    to_followable_view: fn(&AnyView) -> Box<dyn FollowableItemHandle>,
-}
-
-impl Global for FollowableViewRegistry {}
-
-impl FollowableViewRegistry {
-    pub fn register<I: FollowableItem>(cx: &mut App) {
-        cx.default_global::<Self>().0.insert(
-            TypeId::of::<I>(),
-            FollowableViewDescriptor {
-                from_state_proto: |workspace, id, state, window, cx| {
-                    I::from_state_proto(workspace, id, state, window, cx).map(|task| {
-                        cx.foreground_executor()
-                            .spawn(async move { Ok(Box::new(task.await?) as Box<_>) })
-                    })
-                },
-                to_followable_view: |view| Box::new(view.clone().downcast::<I>().unwrap()),
-            },
-        );
-    }
-
-    pub fn from_state_proto(
-        workspace: Entity<Workspace>,
-        view_id: ViewId,
-        mut state: Option<proto::view::Variant>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<Task<Result<Box<dyn FollowableItemHandle>>>> {
-        cx.update_default_global(|this: &mut Self, cx| {
-            this.0.values().find_map(|descriptor| {
-                (descriptor.from_state_proto)(workspace.clone(), view_id, &mut state, window, cx)
-            })
-        })
-    }
-
-    pub fn to_followable_view(
-        view: impl Into<AnyView>,
-        cx: &App,
-    ) -> Option<Box<dyn FollowableItemHandle>> {
-        let this = cx.try_global::<Self>()?;
-        let view = view.into();
-        let descriptor = this.0.get(&view.entity_type())?;
-        Some((descriptor.to_followable_view)(&view))
-    }
-}
-
-#[derive(Copy, Clone)]
-struct SerializableItemDescriptor {
-    deserialize: fn(
-        Entity<Project>,
-        WeakEntity<Workspace>,
-        WorkspaceId,
-        ItemId,
-        &mut Window,
-        &mut Context<Pane>,
-    ) -> Task<Result<Box<dyn ItemHandle>>>,
-    cleanup: fn(WorkspaceId, Vec<ItemId>, &mut Window, &mut App) -> Task<Result<()>>,
-    view_to_serializable_item: fn(AnyView) -> Box<dyn SerializableItemHandle>,
-}
-
-#[derive(Default)]
-struct SerializableItemRegistry {
-    descriptors_by_kind: HashMap<Arc<str>, SerializableItemDescriptor>,
-    descriptors_by_type: HashMap<TypeId, SerializableItemDescriptor>,
-}
-
-impl Global for SerializableItemRegistry {}
-
-impl SerializableItemRegistry {
-    fn deserialize(
-        item_kind: &str,
-        project: Entity<Project>,
-        workspace: WeakEntity<Workspace>,
-        workspace_id: WorkspaceId,
-        item_item: ItemId,
-        window: &mut Window,
-        cx: &mut Context<Pane>,
-    ) -> Task<Result<Box<dyn ItemHandle>>> {
-        let Some(descriptor) = Self::descriptor(item_kind, cx) else {
-            return Task::ready(Err(anyhow!(
-                "cannot deserialize {}, descriptor not found",
-                item_kind
-            )));
-        };
-
-        (descriptor.deserialize)(project, workspace, workspace_id, item_item, window, cx)
-    }
-
-    fn cleanup(
-        item_kind: &str,
-        workspace_id: WorkspaceId,
-        loaded_items: Vec<ItemId>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<()>> {
-        let Some(descriptor) = Self::descriptor(item_kind, cx) else {
-            return Task::ready(Err(anyhow!(
-                "cannot cleanup {}, descriptor not found",
-                item_kind
-            )));
-        };
-
-        (descriptor.cleanup)(workspace_id, loaded_items, window, cx)
-    }
-
-    fn view_to_serializable_item_handle(
-        view: AnyView,
-        cx: &App,
-    ) -> Option<Box<dyn SerializableItemHandle>> {
-        let this = cx.try_global::<Self>()?;
-        let descriptor = this.descriptors_by_type.get(&view.entity_type())?;
-        Some((descriptor.view_to_serializable_item)(view))
-    }
-
-    fn descriptor(item_kind: &str, cx: &App) -> Option<SerializableItemDescriptor> {
-        let this = cx.try_global::<Self>()?;
-        this.descriptors_by_kind.get(item_kind).copied()
-    }
-}
-
-pub fn register_serializable_item<I: SerializableItem>(cx: &mut App) {
-    let serialized_item_kind = I::serialized_item_kind();
-
-    let registry = cx.default_global::<SerializableItemRegistry>();
-    let descriptor = SerializableItemDescriptor {
-        deserialize: |project, workspace, workspace_id, item_id, window, cx| {
-            let task = I::deserialize(project, workspace, workspace_id, item_id, window, cx);
-            cx.foreground_executor()
-                .spawn(async { Ok(Box::new(task.await?) as Box<_>) })
-        },
-        cleanup: |workspace_id, loaded_items, window, cx| {
-            I::cleanup(workspace_id, loaded_items, window, cx)
-        },
-        view_to_serializable_item: |view| Box::new(view.downcast::<I>().unwrap()),
-    };
-    registry
-        .descriptors_by_kind
-        .insert(Arc::from(serialized_item_kind), descriptor);
-    registry
-        .descriptors_by_type
-        .insert(TypeId::of::<I>(), descriptor);
-}
-
-pub struct AppState {
-    pub languages: Arc<LanguageRegistry>,
-    pub client: Arc<Client>,
-    pub user_store: Entity<UserStore>,
-    pub workspace_store: Entity<WorkspaceStore>,
-    pub fs: Arc<dyn fs::Fs>,
-    pub build_window_options: fn(Option<Uuid>, &mut App) -> WindowOptions,
-    pub node_runtime: NodeRuntime,
-    pub session: Entity<AppSession>,
-}
-
-struct GlobalAppState(Weak<AppState>);
-
-impl Global for GlobalAppState {}
-
-pub struct WorkspaceStore {
-    workspaces: HashSet<WindowHandle<Workspace>>,
-    client: Arc<Client>,
-    _subscriptions: Vec<client::Subscription>,
-}
-
-#[derive(Copy, Clone, Debug, Hash, Eq, PartialEq, PartialOrd, Ord)]
-pub enum CollaboratorId {
-    PeerId(PeerId),
-    Agent,
-}
-
-impl From<PeerId> for CollaboratorId {
-    fn from(peer_id: PeerId) -> Self {
-        CollaboratorId::PeerId(peer_id)
-    }
-}
-
-impl From<&PeerId> for CollaboratorId {
-    fn from(peer_id: &PeerId) -> Self {
-        CollaboratorId::PeerId(*peer_id)
-    }
-}
-
-#[derive(PartialEq, Eq, PartialOrd, Ord, Debug)]
-struct Follower {
-    project_id: Option<u64>,
-    peer_id: PeerId,
-}
-
-impl AppState {
-    #[track_caller]
-    pub fn global(cx: &App) -> Weak<Self> {
-        cx.global::<GlobalAppState>().0.clone()
-    }
-    pub fn try_global(cx: &App) -> Option<Weak<Self>> {
-        cx.try_global::<GlobalAppState>()
-            .map(|state| state.0.clone())
-    }
-    pub fn set_global(state: Weak<AppState>, cx: &mut App) {
-        cx.set_global(GlobalAppState(state));
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn test(cx: &mut App) -> Arc<Self> {
-        use node_runtime::NodeRuntime;
-        use session::Session;
-        use settings::SettingsStore;
-
-        if !cx.has_global::<SettingsStore>() {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-        }
-
-        let fs = fs::FakeFs::new(cx.background_executor().clone());
-        let languages = Arc::new(LanguageRegistry::test(cx.background_executor().clone()));
-        let clock = Arc::new(clock::FakeSystemClock::new());
-        let http_client = http_client::FakeHttpClient::with_404_response();
-        let client = Client::new(clock, http_client, cx);
-        let session = cx.new(|cx| AppSession::new(Session::test(), cx));
-        let user_store = cx.new(|cx| UserStore::new(client.clone(), cx));
-        let workspace_store = cx.new(|cx| WorkspaceStore::new(client.clone(), cx));
-
-        theme::init(theme::LoadThemes::JustBase, cx);
-        client::init(&client, cx);
-
-        Arc::new(Self {
-            client,
-            fs,
-            languages,
-            user_store,
-            workspace_store,
-            node_runtime: NodeRuntime::unavailable(),
-            build_window_options: |_, _| Default::default(),
-            session,
-        })
-    }
-}
-
-struct DelayedDebouncedEditAction {
-    task: Option<Task<()>>,
-    cancel_channel: Option<oneshot::Sender<()>>,
-}
-
-impl DelayedDebouncedEditAction {
-    fn new() -> DelayedDebouncedEditAction {
-        DelayedDebouncedEditAction {
-            task: None,
-            cancel_channel: None,
-        }
-    }
-
-    fn fire_new<F>(
-        &mut self,
-        delay: Duration,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-        func: F,
-    ) where
-        F: 'static
-            + Send
-            + FnOnce(&mut Workspace, &mut Window, &mut Context<Workspace>) -> Task<Result<()>>,
-    {
-        if let Some(channel) = self.cancel_channel.take() {
-            _ = channel.send(());
-        }
-
-        let (sender, mut receiver) = oneshot::channel::<()>();
-        self.cancel_channel = Some(sender);
-
-        let previous_task = self.task.take();
-        self.task = Some(cx.spawn_in(window, async move |workspace, cx| {
-            let mut timer = cx.background_executor().timer(delay).fuse();
-            if let Some(previous_task) = previous_task {
-                previous_task.await;
-            }
-
-            futures::select_biased! {
-                _ = receiver => return,
-                    _ = timer => {}
-            }
-
-            if let Some(result) = workspace
-                .update_in(cx, |workspace, window, cx| (func)(workspace, window, cx))
-                .log_err()
-            {
-                result.await.log_err();
-            }
-        }));
-    }
-}
-
-pub enum Event {
-    PaneAdded(Entity<Pane>),
-    PaneRemoved,
-    ItemAdded {
-        item: Box<dyn ItemHandle>,
-    },
-    ActiveItemChanged,
-    ItemRemoved {
-        item_id: EntityId,
-    },
-    UserSavedItem {
-        pane: WeakEntity<Pane>,
-        item: Box<dyn WeakItemHandle>,
-        save_intent: SaveIntent,
-    },
-    ContactRequestedJoin(u64),
-    WorkspaceCreated(WeakEntity<Workspace>),
-    OpenBundledFile {
-        text: Cow<'static, str>,
-        title: &'static str,
-        language: &'static str,
-    },
-    ZoomChanged,
-    ModalOpened,
-}
-
-#[derive(Debug)]
-pub enum OpenVisible {
-    All,
-    None,
-    OnlyFiles,
-    OnlyDirectories,
-}
-
-enum WorkspaceLocation {
-    // Valid local paths or SSH project to serialize
-    Location(SerializedWorkspaceLocation, PathList),
-    // No valid location found hence clear session id
-    DetachFromSession,
-    // No valid location found to serialize
-    None,
-}
-
-type PromptForNewPath = Box<
-    dyn Fn(
-        &mut Workspace,
-        DirectoryLister,
-        &mut Window,
-        &mut Context<Workspace>,
-    ) -> oneshot::Receiver<Option<Vec<PathBuf>>>,
->;
-
-type PromptForOpenPath = Box<
-    dyn Fn(
-        &mut Workspace,
-        DirectoryLister,
-        &mut Window,
-        &mut Context<Workspace>,
-    ) -> oneshot::Receiver<Option<Vec<PathBuf>>>,
->;
-
-#[derive(Default)]
-struct DispatchingKeystrokes {
-    dispatched: HashSet<Vec<Keystroke>>,
-    queue: VecDeque<Keystroke>,
-    task: Option<Shared<Task<()>>>,
-}
-
-/// Collects everything project-related for a certain window opened.
-/// In some way, is a counterpart of a window, as the [`WindowHandle`] could be downcast into `Workspace`.
-///
-/// A `Workspace` usually consists of 1 or more projects, a central pane group, 3 docks and a status bar.
-/// The `Workspace` owns everybody's state and serves as a default, "global context",
-/// that can be used to register a global action to be triggered from any place in the window.
-pub struct Workspace {
-    weak_self: WeakEntity<Self>,
-    workspace_actions: Vec<Box<dyn Fn(Div, &Workspace, &mut Window, &mut Context<Self>) -> Div>>,
-    zoomed: Option<AnyWeakView>,
-    previous_dock_drag_coordinates: Option<Point<Pixels>>,
-    zoomed_position: Option<DockPosition>,
-    center: PaneGroup,
-    left_dock: Entity<Dock>,
-    bottom_dock: Entity<Dock>,
-    right_dock: Entity<Dock>,
-    panes: Vec<Entity<Pane>>,
-    panes_by_item: HashMap<EntityId, WeakEntity<Pane>>,
-    active_pane: Entity<Pane>,
-    last_active_center_pane: Option<WeakEntity<Pane>>,
-    last_active_view_id: Option<proto::ViewId>,
-    status_bar: Entity<StatusBar>,
-    modal_layer: Entity<ModalLayer>,
-    toast_layer: Entity<ToastLayer>,
-    titlebar_item: Option<AnyView>,
-    notifications: Notifications,
-    suppressed_notifications: HashSet<NotificationId>,
-    project: Entity<Project>,
-    follower_states: HashMap<CollaboratorId, FollowerState>,
-    last_leaders_by_pane: HashMap<WeakEntity<Pane>, CollaboratorId>,
-    window_edited: bool,
-    last_window_title: Option<String>,
-    dirty_items: HashMap<EntityId, Subscription>,
-    active_call: Option<(Entity<ActiveCall>, Vec<Subscription>)>,
-    leader_updates_tx: mpsc::UnboundedSender<(PeerId, proto::UpdateFollowers)>,
-    database_id: Option<WorkspaceId>,
-    app_state: Arc<AppState>,
-    dispatching_keystrokes: Rc<RefCell<DispatchingKeystrokes>>,
-    _subscriptions: Vec<Subscription>,
-    _apply_leader_updates: Task<Result<()>>,
-    _observe_current_user: Task<Result<()>>,
-    _schedule_serialize_workspace: Option<Task<()>>,
-    _schedule_serialize_ssh_paths: Option<Task<()>>,
-    pane_history_timestamp: Arc<AtomicUsize>,
-    bounds: Bounds<Pixels>,
-    pub centered_layout: bool,
-    bounds_save_task_queued: Option<Task<()>>,
-    on_prompt_for_new_path: Option<PromptForNewPath>,
-    on_prompt_for_open_path: Option<PromptForOpenPath>,
-    terminal_provider: Option<Box<dyn TerminalProvider>>,
-    debugger_provider: Option<Arc<dyn DebuggerProvider>>,
-    serializable_items_tx: UnboundedSender<Box<dyn SerializableItemHandle>>,
-    _items_serializer: Task<Result<()>>,
-    session_id: Option<String>,
-    scheduled_tasks: Vec<Task<()>>,
-    last_open_dock_positions: Vec<DockPosition>,
-    removing: bool,
-}
-
-impl EventEmitter<Event> for Workspace {}
-
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
-pub struct ViewId {
-    pub creator: CollaboratorId,
-    pub id: u64,
-}
-
-pub struct FollowerState {
-    center_pane: Entity<Pane>,
-    dock_pane: Option<Entity<Pane>>,
-    active_view_id: Option<ViewId>,
-    items_by_leader_view_id: HashMap<ViewId, FollowerView>,
-}
-
-struct FollowerView {
-    view: Box<dyn FollowableItemHandle>,
-    location: Option<proto::PanelId>,
-}
-
-impl Workspace {
-    pub fn new(
-        workspace_id: Option<WorkspaceId>,
-        project: Entity<Project>,
-        app_state: Arc<AppState>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        cx.subscribe_in(&project, window, move |this, _, event, window, cx| {
-            match event {
-                project::Event::RemoteIdChanged(_) => {
-                    this.update_window_title(window, cx);
-                }
-
-                project::Event::CollaboratorLeft(peer_id) => {
-                    this.collaborator_left(*peer_id, window, cx);
-                }
-
-                project::Event::WorktreeRemoved(_) | project::Event::WorktreeAdded(_) => {
-                    this.update_window_title(window, cx);
-                    this.serialize_workspace(window, cx);
-                    // This event could be triggered by `AddFolderToProject` or `RemoveFromProject`.
-                    this.update_history(cx);
-                }
-
-                project::Event::DisconnectedFromHost => {
-                    this.update_window_edited(window, cx);
-                    let leaders_to_unfollow =
-                        this.follower_states.keys().copied().collect::<Vec<_>>();
-                    for leader_id in leaders_to_unfollow {
-                        this.unfollow(leader_id, window, cx);
-                    }
-                }
-
-                project::Event::DisconnectedFromSshRemote => {
-                    this.update_window_edited(window, cx);
-                }
-
-                project::Event::Closed => {
-                    window.remove_window();
-                }
-
-                project::Event::DeletedEntry(_, entry_id) => {
-                    for pane in this.panes.iter() {
-                        pane.update(cx, |pane, cx| {
-                            pane.handle_deleted_project_item(*entry_id, window, cx)
-                        });
-                    }
-                }
-
-                project::Event::Toast {
-                    notification_id,
-                    message,
-                } => this.show_notification(
-                    NotificationId::named(notification_id.clone()),
-                    cx,
-                    |cx| cx.new(|cx| MessageNotification::new(message.clone(), cx)),
-                ),
-
-                project::Event::HideToast { notification_id } => {
-                    this.dismiss_notification(&NotificationId::named(notification_id.clone()), cx)
-                }
-
-                project::Event::LanguageServerPrompt(request) => {
-                    struct LanguageServerPrompt;
-
-                    let mut hasher = DefaultHasher::new();
-                    request.lsp_name.as_str().hash(&mut hasher);
-                    let id = hasher.finish();
-
-                    this.show_notification(
-                        NotificationId::composite::<LanguageServerPrompt>(id as usize),
-                        cx,
-                        |cx| {
-                            cx.new(|cx| {
-                                notifications::LanguageServerPrompt::new(request.clone(), cx)
-                            })
-                        },
-                    );
-                }
-
-                project::Event::AgentLocationChanged => {
-                    this.handle_agent_location_changed(window, cx)
-                }
-
-                _ => {}
-            }
-            cx.notify()
-        })
-        .detach();
-
-        cx.subscribe_in(
-            &project.read(cx).breakpoint_store(),
-            window,
-            |workspace, _, event, window, cx| match event {
-                BreakpointStoreEvent::BreakpointsUpdated(_, _)
-                | BreakpointStoreEvent::BreakpointsCleared(_) => {
-                    workspace.serialize_workspace(window, cx);
-                }
-                BreakpointStoreEvent::SetDebugLine | BreakpointStoreEvent::ClearDebugLines => {}
-            },
-        )
-        .detach();
-        if let Some(toolchain_store) = project.read(cx).toolchain_store() {
-            cx.subscribe_in(
-                &toolchain_store,
-                window,
-                |workspace, _, event, window, cx| match event {
-                    ToolchainStoreEvent::CustomToolchainsModified => {
-                        workspace.serialize_workspace(window, cx);
-                    }
-                    _ => {}
-                },
-            )
-            .detach();
-        }
-
-        cx.on_focus_lost(window, |this, window, cx| {
-            let focus_handle = this.focus_handle(cx);
-            window.focus(&focus_handle);
-        })
-        .detach();
-
-        let weak_handle = cx.entity().downgrade();
-        let pane_history_timestamp = Arc::new(AtomicUsize::new(0));
-
-        let center_pane = cx.new(|cx| {
-            let mut center_pane = Pane::new(
-                weak_handle.clone(),
-                project.clone(),
-                pane_history_timestamp.clone(),
-                None,
-                NewFile.boxed_clone(),
-                true,
-                window,
-                cx,
-            );
-            center_pane.set_can_split(Some(Arc::new(|_, _, _, _| true)));
-            center_pane
-        });
-        cx.subscribe_in(&center_pane, window, Self::handle_pane_event)
-            .detach();
-
-        window.focus(&center_pane.focus_handle(cx));
-
-        cx.emit(Event::PaneAdded(center_pane.clone()));
-
-        let window_handle = window.window_handle().downcast::<Workspace>().unwrap();
-        app_state.workspace_store.update(cx, |store, _| {
-            store.workspaces.insert(window_handle);
-        });
-
-        let mut current_user = app_state.user_store.read(cx).watch_current_user();
-        let mut connection_status = app_state.client.status();
-        let _observe_current_user = cx.spawn_in(window, async move |this, cx| {
-            current_user.next().await;
-            connection_status.next().await;
-            let mut stream =
-                Stream::map(current_user, drop).merge(Stream::map(connection_status, drop));
-
-            while stream.recv().await.is_some() {
-                this.update(cx, |_, cx| cx.notify())?;
-            }
-            anyhow::Ok(())
-        });
-
-        // All leader updates are enqueued and then processed in a single task, so
-        // that each asynchronous operation can be run in order.
-        let (leader_updates_tx, mut leader_updates_rx) =
-            mpsc::unbounded::<(PeerId, proto::UpdateFollowers)>();
-        let _apply_leader_updates = cx.spawn_in(window, async move |this, cx| {
-            while let Some((leader_id, update)) = leader_updates_rx.next().await {
-                Self::process_leader_update(&this, leader_id, update, cx)
-                    .await
-                    .log_err();
-            }
-
-            Ok(())
-        });
-
-        cx.emit(Event::WorkspaceCreated(weak_handle.clone()));
-        let modal_layer = cx.new(|_| ModalLayer::new());
-        let toast_layer = cx.new(|_| ToastLayer::new());
-        cx.subscribe(
-            &modal_layer,
-            |_, _, _: &modal_layer::ModalOpenedEvent, cx| {
-                cx.emit(Event::ModalOpened);
-            },
-        )
-        .detach();
-
-        let left_dock = Dock::new(DockPosition::Left, modal_layer.clone(), window, cx);
-        let bottom_dock = Dock::new(DockPosition::Bottom, modal_layer.clone(), window, cx);
-        let right_dock = Dock::new(DockPosition::Right, modal_layer.clone(), window, cx);
-        let left_dock_buttons = cx.new(|cx| PanelButtons::new(left_dock.clone(), cx));
-        let bottom_dock_buttons = cx.new(|cx| PanelButtons::new(bottom_dock.clone(), cx));
-        let right_dock_buttons = cx.new(|cx| PanelButtons::new(right_dock.clone(), cx));
-        let status_bar = cx.new(|cx| {
-            let mut status_bar = StatusBar::new(&center_pane.clone(), window, cx);
-            status_bar.add_left_item(left_dock_buttons, window, cx);
-            status_bar.add_right_item(right_dock_buttons, window, cx);
-            status_bar.add_right_item(bottom_dock_buttons, window, cx);
-            status_bar
-        });
-
-        let session_id = app_state.session.read(cx).id().to_owned();
-
-        let mut active_call = None;
-        if let Some(call) = ActiveCall::try_global(cx) {
-            let subscriptions = vec![cx.subscribe_in(&call, window, Self::on_active_call_event)];
-            active_call = Some((call, subscriptions));
-        }
-
-        let (serializable_items_tx, serializable_items_rx) =
-            mpsc::unbounded::<Box<dyn SerializableItemHandle>>();
-        let _items_serializer = cx.spawn_in(window, async move |this, cx| {
-            Self::serialize_items(&this, serializable_items_rx, cx).await
-        });
-
-        let subscriptions = vec![
-            cx.observe_window_activation(window, Self::on_window_activation_changed),
-            cx.observe_window_bounds(window, move |this, window, cx| {
-                if this.bounds_save_task_queued.is_some() {
-                    return;
-                }
-                this.bounds_save_task_queued = Some(cx.spawn_in(window, async move |this, cx| {
-                    cx.background_executor()
-                        .timer(Duration::from_millis(100))
-                        .await;
-                    this.update_in(cx, |this, window, cx| {
-                        if let Some(display) = window.display(cx)
-                            && let Ok(display_uuid) = display.uuid()
-                        {
-                            let window_bounds = window.inner_window_bounds();
-                            if let Some(database_id) = workspace_id {
-                                cx.background_executor()
-                                    .spawn(DB.set_window_open_status(
-                                        database_id,
-                                        SerializedWindowBounds(window_bounds),
-                                        display_uuid,
-                                    ))
-                                    .detach_and_log_err(cx);
-                            }
-                        }
-                        this.bounds_save_task_queued.take();
-                    })
-                    .ok();
-                }));
-                cx.notify();
-            }),
-            cx.observe_window_appearance(window, |_, window, cx| {
-                let window_appearance = window.appearance();
-
-                *SystemAppearance::global_mut(cx) = SystemAppearance(window_appearance.into());
-
-                GlobalTheme::reload_theme(cx);
-                GlobalTheme::reload_icon_theme(cx);
-            }),
-            cx.on_release(move |this, cx| {
-                this.app_state.workspace_store.update(cx, move |store, _| {
-                    store.workspaces.remove(&window_handle);
-                })
-            }),
-        ];
-
-        cx.defer_in(window, |this, window, cx| {
-            this.update_window_title(window, cx);
-            this.show_initial_notifications(cx);
-        });
-        Workspace {
-            weak_self: weak_handle.clone(),
-            zoomed: None,
-            zoomed_position: None,
-            previous_dock_drag_coordinates: None,
-            center: PaneGroup::new(center_pane.clone()),
-            panes: vec![center_pane.clone()],
-            panes_by_item: Default::default(),
-            active_pane: center_pane.clone(),
-            last_active_center_pane: Some(center_pane.downgrade()),
-            last_active_view_id: None,
-            status_bar,
-            modal_layer,
-            toast_layer,
-            titlebar_item: None,
-            notifications: Notifications::default(),
-            suppressed_notifications: HashSet::default(),
-            left_dock,
-            bottom_dock,
-            right_dock,
-            project: project.clone(),
-            follower_states: Default::default(),
-            last_leaders_by_pane: Default::default(),
-            dispatching_keystrokes: Default::default(),
-            window_edited: false,
-            last_window_title: None,
-            dirty_items: Default::default(),
-            active_call,
-            database_id: workspace_id,
-            app_state,
-            _observe_current_user,
-            _apply_leader_updates,
-            _schedule_serialize_workspace: None,
-            _schedule_serialize_ssh_paths: None,
-            leader_updates_tx,
-            _subscriptions: subscriptions,
-            pane_history_timestamp,
-            workspace_actions: Default::default(),
-            // This data will be incorrect, but it will be overwritten by the time it needs to be used.
-            bounds: Default::default(),
-            centered_layout: false,
-            bounds_save_task_queued: None,
-            on_prompt_for_new_path: None,
-            on_prompt_for_open_path: None,
-            terminal_provider: None,
-            debugger_provider: None,
-            serializable_items_tx,
-            _items_serializer,
-            session_id: Some(session_id),
-
-            scheduled_tasks: Vec::new(),
-            last_open_dock_positions: Vec::new(),
-            removing: false,
-        }
-    }
-
-    pub fn new_local(
-        abs_paths: Vec<PathBuf>,
-        app_state: Arc<AppState>,
-        requesting_window: Option<WindowHandle<Workspace>>,
-        env: Option<HashMap<String, String>>,
-        cx: &mut App,
-    ) -> Task<
-        anyhow::Result<(
-            WindowHandle<Workspace>,
-            Vec<Option<anyhow::Result<Box<dyn ItemHandle>>>>,
-        )>,
-    > {
-        let project_handle = Project::local(
-            app_state.client.clone(),
-            app_state.node_runtime.clone(),
-            app_state.user_store.clone(),
-            app_state.languages.clone(),
-            app_state.fs.clone(),
-            env,
-            cx,
-        );
-
-        cx.spawn(async move |cx| {
-            let mut paths_to_open = Vec::with_capacity(abs_paths.len());
-            for path in abs_paths.into_iter() {
-                if let Some(canonical) = app_state.fs.canonicalize(&path).await.ok() {
-                    paths_to_open.push(canonical)
-                } else {
-                    paths_to_open.push(path)
-                }
-            }
-
-            let serialized_workspace =
-                persistence::DB.workspace_for_roots(paths_to_open.as_slice());
-
-            if let Some(paths) = serialized_workspace.as_ref().map(|ws| &ws.paths) {
-                paths_to_open = paths.ordered_paths().cloned().collect();
-                if !paths.is_lexicographically_ordered() {
-                    project_handle
-                        .update(cx, |project, cx| {
-                            project.set_worktrees_reordered(true, cx);
-                        })
-                        .log_err();
-                }
-            }
-
-            // Get project paths for all of the abs_paths
-            let mut project_paths: Vec<(PathBuf, Option<ProjectPath>)> =
-                Vec::with_capacity(paths_to_open.len());
-
-            for path in paths_to_open.into_iter() {
-                if let Some((_, project_entry)) = cx
-                    .update(|cx| {
-                        Workspace::project_path_for_path(project_handle.clone(), &path, true, cx)
-                    })?
-                    .await
-                    .log_err()
-                {
-                    project_paths.push((path, Some(project_entry)));
-                } else {
-                    project_paths.push((path, None));
-                }
-            }
-
-            let workspace_id = if let Some(serialized_workspace) = serialized_workspace.as_ref() {
-                serialized_workspace.id
-            } else {
-                DB.next_id().await.unwrap_or_else(|_| Default::default())
-            };
-
-            let toolchains = DB.toolchains(workspace_id).await?;
-
-            for (toolchain, worktree_id, path) in toolchains {
-                let toolchain_path = PathBuf::from(toolchain.path.clone().to_string());
-                if !app_state.fs.is_file(toolchain_path.as_path()).await {
-                    continue;
-                }
-
-                project_handle
-                    .update(cx, |this, cx| {
-                        this.activate_toolchain(ProjectPath { worktree_id, path }, toolchain, cx)
-                    })?
-                    .await;
-            }
-            if let Some(workspace) = serialized_workspace.as_ref() {
-                project_handle.update(cx, |this, cx| {
-                    for (scope, toolchains) in &workspace.user_toolchains {
-                        for toolchain in toolchains {
-                            this.add_toolchain(toolchain.clone(), scope.clone(), cx);
-                        }
-                    }
-                })?;
-            }
-
-            let window = if let Some(window) = requesting_window {
-                let centered_layout = serialized_workspace
-                    .as_ref()
-                    .map(|w| w.centered_layout)
-                    .unwrap_or(false);
-
-                cx.update_window(window.into(), |_, window, cx| {
-                    window.replace_root(cx, |window, cx| {
-                        let mut workspace = Workspace::new(
-                            Some(workspace_id),
-                            project_handle.clone(),
-                            app_state.clone(),
-                            window,
-                            cx,
-                        );
-
-                        workspace.centered_layout = centered_layout;
-                        workspace
-                    });
-                })?;
-                window
-            } else {
-                let window_bounds_override = window_bounds_env_override();
-
-                let (window_bounds, display) = if let Some(bounds) = window_bounds_override {
-                    (Some(WindowBounds::Windowed(bounds)), None)
-                } else if let Some(workspace) = serialized_workspace.as_ref() {
-                    // Reopening an existing workspace - restore its saved bounds
-                    if let (Some(display), Some(bounds)) =
-                        (workspace.display, workspace.window_bounds.as_ref())
-                    {
-                        (Some(bounds.0), Some(display))
-                    } else {
-                        (None, None)
-                    }
-                } else {
-                    // New window - let GPUI's default_bounds() handle cascading
-                    (None, None)
-                };
-
-                // Use the serialized workspace to construct the new window
-                let mut options = cx.update(|cx| (app_state.build_window_options)(display, cx))?;
-                options.window_bounds = window_bounds;
-                let centered_layout = serialized_workspace
-                    .as_ref()
-                    .map(|w| w.centered_layout)
-                    .unwrap_or(false);
-                cx.open_window(options, {
-                    let app_state = app_state.clone();
-                    let project_handle = project_handle.clone();
-                    move |window, cx| {
-                        cx.new(|cx| {
-                            let mut workspace = Workspace::new(
-                                Some(workspace_id),
-                                project_handle,
-                                app_state,
-                                window,
-                                cx,
-                            );
-                            workspace.centered_layout = centered_layout;
-                            workspace
-                        })
-                    }
-                })?
-            };
-
-            notify_if_database_failed(window, cx);
-            let opened_items = window
-                .update(cx, |_workspace, window, cx| {
-                    open_items(serialized_workspace, project_paths, window, cx)
-                })?
-                .await
-                .unwrap_or_default();
-
-            window
-                .update(cx, |workspace, window, cx| {
-                    window.activate_window();
-                    workspace.update_history(cx);
-                })
-                .log_err();
-            Ok((window, opened_items))
-        })
-    }
-
-    pub fn weak_handle(&self) -> WeakEntity<Self> {
-        self.weak_self.clone()
-    }
-
-    pub fn left_dock(&self) -> &Entity<Dock> {
-        &self.left_dock
-    }
-
-    pub fn bottom_dock(&self) -> &Entity<Dock> {
-        &self.bottom_dock
-    }
-
-    pub fn set_bottom_dock_layout(
-        &mut self,
-        layout: BottomDockLayout,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let fs = self.project().read(cx).fs();
-        settings::update_settings_file(fs.clone(), cx, move |content, _cx| {
-            content.workspace.bottom_dock_layout = Some(layout);
-        });
-
-        cx.notify();
-        self.serialize_workspace(window, cx);
-    }
-
-    pub fn right_dock(&self) -> &Entity<Dock> {
-        &self.right_dock
-    }
-
-    pub fn all_docks(&self) -> [&Entity<Dock>; 3] {
-        [&self.left_dock, &self.bottom_dock, &self.right_dock]
-    }
-
-    pub fn dock_at_position(&self, position: DockPosition) -> &Entity<Dock> {
-        match position {
-            DockPosition::Left => &self.left_dock,
-            DockPosition::Bottom => &self.bottom_dock,
-            DockPosition::Right => &self.right_dock,
-        }
-    }
-
-    pub fn is_edited(&self) -> bool {
-        self.window_edited
-    }
-
-    pub fn add_panel<T: Panel>(
-        &mut self,
-        panel: Entity<T>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let focus_handle = panel.panel_focus_handle(cx);
-        cx.on_focus_in(&focus_handle, window, Self::handle_panel_focused)
-            .detach();
-
-        let dock_position = panel.position(window, cx);
-        let dock = self.dock_at_position(dock_position);
-
-        dock.update(cx, |dock, cx| {
-            dock.add_panel(panel, self.weak_self.clone(), window, cx)
-        });
-    }
-
-    pub fn remove_panel<T: Panel>(
-        &mut self,
-        panel: &Entity<T>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        for dock in [&self.left_dock, &self.bottom_dock, &self.right_dock] {
-            dock.update(cx, |dock, cx| {
-                dock.remove_panel(panel, window, cx);
-            })
-        }
-    }
-
-    pub fn status_bar(&self) -> &Entity<StatusBar> {
-        &self.status_bar
-    }
-
-    pub fn status_bar_visible(&self, cx: &App) -> bool {
-        StatusBarSettings::get_global(cx).show
-    }
-
-    pub fn app_state(&self) -> &Arc<AppState> {
-        &self.app_state
-    }
-
-    pub fn user_store(&self) -> &Entity<UserStore> {
-        &self.app_state.user_store
-    }
-
-    pub fn project(&self) -> &Entity<Project> {
-        &self.project
-    }
-
-    pub fn path_style(&self, cx: &App) -> PathStyle {
-        self.project.read(cx).path_style(cx)
-    }
-
-    pub fn recently_activated_items(&self, cx: &App) -> HashMap<EntityId, usize> {
-        let mut history: HashMap<EntityId, usize> = HashMap::default();
-
-        for pane_handle in &self.panes {
-            let pane = pane_handle.read(cx);
-
-            for entry in pane.activation_history() {
-                history.insert(
-                    entry.entity_id,
-                    history
-                        .get(&entry.entity_id)
-                        .cloned()
-                        .unwrap_or(0)
-                        .max(entry.timestamp),
-                );
-            }
-        }
-
-        history
-    }
-
-    pub fn recent_active_item_by_type<T: 'static>(&self, cx: &App) -> Option<Entity<T>> {
-        let mut recent_item: Option<Entity<T>> = None;
-        let mut recent_timestamp = 0;
-        for pane_handle in &self.panes {
-            let pane = pane_handle.read(cx);
-            let item_map: HashMap<EntityId, &Box<dyn ItemHandle>> =
-                pane.items().map(|item| (item.item_id(), item)).collect();
-            for entry in pane.activation_history() {
-                if entry.timestamp > recent_timestamp
-                    && let Some(&item) = item_map.get(&entry.entity_id)
-                    && let Some(typed_item) = item.act_as::<T>(cx)
-                {
-                    recent_timestamp = entry.timestamp;
-                    recent_item = Some(typed_item);
-                }
-            }
-        }
-        recent_item
-    }
-
-    pub fn recent_navigation_history_iter(
-        &self,
-        cx: &App,
-    ) -> impl Iterator<Item = (ProjectPath, Option<PathBuf>)> + use<> {
-        let mut abs_paths_opened: HashMap<PathBuf, HashSet<ProjectPath>> = HashMap::default();
-        let mut history: HashMap<ProjectPath, (Option<PathBuf>, usize)> = HashMap::default();
-
-        for pane in &self.panes {
-            let pane = pane.read(cx);
-
-            pane.nav_history()
-                .for_each_entry(cx, |entry, (project_path, fs_path)| {
-                    if let Some(fs_path) = &fs_path {
-                        abs_paths_opened
-                            .entry(fs_path.clone())
-                            .or_default()
-                            .insert(project_path.clone());
-                    }
-                    let timestamp = entry.timestamp;
-                    match history.entry(project_path) {
-                        hash_map::Entry::Occupied(mut entry) => {
-                            let (_, old_timestamp) = entry.get();
-                            if &timestamp > old_timestamp {
-                                entry.insert((fs_path, timestamp));
-                            }
-                        }
-                        hash_map::Entry::Vacant(entry) => {
-                            entry.insert((fs_path, timestamp));
-                        }
-                    }
-                });
-
-            if let Some(item) = pane.active_item()
-                && let Some(project_path) = item.project_path(cx)
-            {
-                let fs_path = self.project.read(cx).absolute_path(&project_path, cx);
-
-                if let Some(fs_path) = &fs_path {
-                    abs_paths_opened
-                        .entry(fs_path.clone())
-                        .or_default()
-                        .insert(project_path.clone());
-                }
-
-                history.insert(project_path, (fs_path, std::usize::MAX));
-            }
-        }
-
-        history
-            .into_iter()
-            .sorted_by_key(|(_, (_, order))| *order)
-            .map(|(project_path, (fs_path, _))| (project_path, fs_path))
-            .rev()
-            .filter(move |(history_path, abs_path)| {
-                let latest_project_path_opened = abs_path
-                    .as_ref()
-                    .and_then(|abs_path| abs_paths_opened.get(abs_path))
-                    .and_then(|project_paths| {
-                        project_paths
-                            .iter()
-                            .max_by(|b1, b2| b1.worktree_id.cmp(&b2.worktree_id))
-                    });
-
-                latest_project_path_opened.is_none_or(|path| path == history_path)
-            })
-    }
-
-    pub fn recent_navigation_history(
-        &self,
-        limit: Option<usize>,
-        cx: &App,
-    ) -> Vec<(ProjectPath, Option<PathBuf>)> {
-        self.recent_navigation_history_iter(cx)
-            .take(limit.unwrap_or(usize::MAX))
-            .collect()
-    }
-
-    pub fn clear_navigation_history(&mut self, _window: &mut Window, cx: &mut Context<Workspace>) {
-        for pane in &self.panes {
-            pane.update(cx, |pane, cx| pane.nav_history_mut().clear(cx));
-        }
-    }
-
-    fn navigate_history(
-        &mut self,
-        pane: WeakEntity<Pane>,
-        mode: NavigationMode,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) -> Task<Result<()>> {
-        let to_load = if let Some(pane) = pane.upgrade() {
-            pane.update(cx, |pane, cx| {
-                window.focus(&pane.focus_handle(cx));
-                loop {
-                    // Retrieve the weak item handle from the history.
-                    let entry = pane.nav_history_mut().pop(mode, cx)?;
-
-                    // If the item is still present in this pane, then activate it.
-                    if let Some(index) = entry
-                        .item
-                        .upgrade()
-                        .and_then(|v| pane.index_for_item(v.as_ref()))
-                    {
-                        let prev_active_item_index = pane.active_item_index();
-                        pane.nav_history_mut().set_mode(mode);
-                        pane.activate_item(index, true, true, window, cx);
-                        pane.nav_history_mut().set_mode(NavigationMode::Normal);
-
-                        let mut navigated = prev_active_item_index != pane.active_item_index();
-                        if let Some(data) = entry.data {
-                            navigated |= pane.active_item()?.navigate(data, window, cx);
-                        }
-
-                        if navigated {
-                            break None;
-                        }
-                    } else {
-                        // If the item is no longer present in this pane, then retrieve its
-                        // path info in order to reopen it.
-                        break pane
-                            .nav_history()
-                            .path_for_item(entry.item.id())
-                            .map(|(project_path, abs_path)| (project_path, abs_path, entry));
-                    }
-                }
-            })
-        } else {
-            None
-        };
-
-        if let Some((project_path, abs_path, entry)) = to_load {
-            // If the item was no longer present, then load it again from its previous path, first try the local path
-            let open_by_project_path = self.load_path(project_path.clone(), window, cx);
-
-            cx.spawn_in(window, async move  |workspace, cx| {
-                let open_by_project_path = open_by_project_path.await;
-                let mut navigated = false;
-                match open_by_project_path
-                    .with_context(|| format!("Navigating to {project_path:?}"))
-                {
-                    Ok((project_entry_id, build_item)) => {
-                        let prev_active_item_id = pane.update(cx, |pane, _| {
-                            pane.nav_history_mut().set_mode(mode);
-                            pane.active_item().map(|p| p.item_id())
-                        })?;
-
-                        pane.update_in(cx, |pane, window, cx| {
-                            let item = pane.open_item(
-                                project_entry_id,
-                                project_path,
-                                true,
-                                entry.is_preview,
-                                true,
-                                None,
-                                window, cx,
-                                build_item,
-                            );
-                            navigated |= Some(item.item_id()) != prev_active_item_id;
-                            pane.nav_history_mut().set_mode(NavigationMode::Normal);
-                            if let Some(data) = entry.data {
-                                navigated |= item.navigate(data, window, cx);
-                            }
-                        })?;
-                    }
-                    Err(open_by_project_path_e) => {
-                        // Fall back to opening by abs path, in case an external file was opened and closed,
-                        // and its worktree is now dropped
-                        if let Some(abs_path) = abs_path {
-                            let prev_active_item_id = pane.update(cx, |pane, _| {
-                                pane.nav_history_mut().set_mode(mode);
-                                pane.active_item().map(|p| p.item_id())
-                            })?;
-                            let open_by_abs_path = workspace.update_in(cx, |workspace, window, cx| {
-                                workspace.open_abs_path(abs_path.clone(), OpenOptions { visible: Some(OpenVisible::None), ..Default::default() }, window, cx)
-                            })?;
-                            match open_by_abs_path
-                                .await
-                                .with_context(|| format!("Navigating to {abs_path:?}"))
-                            {
-                                Ok(item) => {
-                                    pane.update_in(cx, |pane, window, cx| {
-                                        navigated |= Some(item.item_id()) != prev_active_item_id;
-                                        pane.nav_history_mut().set_mode(NavigationMode::Normal);
-                                        if let Some(data) = entry.data {
-                                            navigated |= item.navigate(data, window, cx);
-                                        }
-                                    })?;
-                                }
-                                Err(open_by_abs_path_e) => {
-                                    log::error!("Failed to navigate history: {open_by_project_path_e:#} and {open_by_abs_path_e:#}");
-                                }
-                            }
-                        }
-                    }
-                }
-
-                if !navigated {
-                    workspace
-                        .update_in(cx, |workspace, window, cx| {
-                            Self::navigate_history(workspace, pane, mode, window, cx)
-                        })?
-                        .await?;
-                }
-
-                Ok(())
-            })
-        } else {
-            Task::ready(Ok(()))
-        }
-    }
-
-    pub fn go_back(
-        &mut self,
-        pane: WeakEntity<Pane>,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) -> Task<Result<()>> {
-        self.navigate_history(pane, NavigationMode::GoingBack, window, cx)
-    }
-
-    pub fn go_forward(
-        &mut self,
-        pane: WeakEntity<Pane>,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) -> Task<Result<()>> {
-        self.navigate_history(pane, NavigationMode::GoingForward, window, cx)
-    }
-
-    pub fn reopen_closed_item(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) -> Task<Result<()>> {
-        self.navigate_history(
-            self.active_pane().downgrade(),
-            NavigationMode::ReopeningClosedItem,
-            window,
-            cx,
-        )
-    }
-
-    pub fn client(&self) -> &Arc<Client> {
-        &self.app_state.client
-    }
-
-    pub fn set_titlebar_item(&mut self, item: AnyView, _: &mut Window, cx: &mut Context<Self>) {
-        self.titlebar_item = Some(item);
-        cx.notify();
-    }
-
-    pub fn set_prompt_for_new_path(&mut self, prompt: PromptForNewPath) {
-        self.on_prompt_for_new_path = Some(prompt)
-    }
-
-    pub fn set_prompt_for_open_path(&mut self, prompt: PromptForOpenPath) {
-        self.on_prompt_for_open_path = Some(prompt)
-    }
-
-    pub fn set_terminal_provider(&mut self, provider: impl TerminalProvider + 'static) {
-        self.terminal_provider = Some(Box::new(provider));
-    }
-
-    pub fn set_debugger_provider(&mut self, provider: impl DebuggerProvider + 'static) {
-        self.debugger_provider = Some(Arc::new(provider));
-    }
-
-    pub fn debugger_provider(&self) -> Option<Arc<dyn DebuggerProvider>> {
-        self.debugger_provider.clone()
-    }
-
-    pub fn prompt_for_open_path(
-        &mut self,
-        path_prompt_options: PathPromptOptions,
-        lister: DirectoryLister,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> oneshot::Receiver<Option<Vec<PathBuf>>> {
-        if !lister.is_local(cx) || !WorkspaceSettings::get_global(cx).use_system_path_prompts {
-            let prompt = self.on_prompt_for_open_path.take().unwrap();
-            let rx = prompt(self, lister, window, cx);
-            self.on_prompt_for_open_path = Some(prompt);
-            rx
-        } else {
-            let (tx, rx) = oneshot::channel();
-            let abs_path = cx.prompt_for_paths(path_prompt_options);
-
-            cx.spawn_in(window, async move |workspace, cx| {
-                let Ok(result) = abs_path.await else {
-                    return Ok(());
-                };
-
-                match result {
-                    Ok(result) => {
-                        tx.send(result).ok();
-                    }
-                    Err(err) => {
-                        let rx = workspace.update_in(cx, |workspace, window, cx| {
-                            workspace.show_portal_error(err.to_string(), cx);
-                            let prompt = workspace.on_prompt_for_open_path.take().unwrap();
-                            let rx = prompt(workspace, lister, window, cx);
-                            workspace.on_prompt_for_open_path = Some(prompt);
-                            rx
-                        })?;
-                        if let Ok(path) = rx.await {
-                            tx.send(path).ok();
-                        }
-                    }
-                };
-                anyhow::Ok(())
-            })
-            .detach();
-
-            rx
-        }
-    }
-
-    pub fn prompt_for_new_path(
-        &mut self,
-        lister: DirectoryLister,
-        suggested_name: Option<String>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> oneshot::Receiver<Option<Vec<PathBuf>>> {
-        if self.project.read(cx).is_via_collab()
-            || self.project.read(cx).is_via_remote_server()
-            || !WorkspaceSettings::get_global(cx).use_system_path_prompts
-        {
-            let prompt = self.on_prompt_for_new_path.take().unwrap();
-            let rx = prompt(self, lister, window, cx);
-            self.on_prompt_for_new_path = Some(prompt);
-            return rx;
-        }
-
-        let (tx, rx) = oneshot::channel();
-        cx.spawn_in(window, async move |workspace, cx| {
-            let abs_path = workspace.update(cx, |workspace, cx| {
-                let relative_to = workspace
-                    .most_recent_active_path(cx)
-                    .and_then(|p| p.parent().map(|p| p.to_path_buf()))
-                    .or_else(|| {
-                        let project = workspace.project.read(cx);
-                        project.visible_worktrees(cx).find_map(|worktree| {
-                            Some(worktree.read(cx).as_local()?.abs_path().to_path_buf())
-                        })
-                    })
-                    .or_else(std::env::home_dir)
-                    .unwrap_or_else(|| PathBuf::from(""));
-                cx.prompt_for_new_path(&relative_to, suggested_name.as_deref())
-            })?;
-            let abs_path = match abs_path.await? {
-                Ok(path) => path,
-                Err(err) => {
-                    let rx = workspace.update_in(cx, |workspace, window, cx| {
-                        workspace.show_portal_error(err.to_string(), cx);
-
-                        let prompt = workspace.on_prompt_for_new_path.take().unwrap();
-                        let rx = prompt(workspace, lister, window, cx);
-                        workspace.on_prompt_for_new_path = Some(prompt);
-                        rx
-                    })?;
-                    if let Ok(path) = rx.await {
-                        tx.send(path).ok();
-                    }
-                    return anyhow::Ok(());
-                }
-            };
-
-            tx.send(abs_path.map(|path| vec![path])).ok();
-            anyhow::Ok(())
-        })
-        .detach();
-
-        rx
-    }
-
-    pub fn titlebar_item(&self) -> Option<AnyView> {
-        self.titlebar_item.clone()
-    }
-
-    /// Call the given callback with a workspace whose project is local.
-    ///
-    /// If the given workspace has a local project, then it will be passed
-    /// to the callback. Otherwise, a new empty window will be created.
-    pub fn with_local_workspace<T, F>(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-        callback: F,
-    ) -> Task<Result<T>>
-    where
-        T: 'static,
-        F: 'static + FnOnce(&mut Workspace, &mut Window, &mut Context<Workspace>) -> T,
-    {
-        if self.project.read(cx).is_local() {
-            Task::ready(Ok(callback(self, window, cx)))
-        } else {
-            let env = self.project.read(cx).cli_environment(cx);
-            let task = Self::new_local(Vec::new(), self.app_state.clone(), None, env, cx);
-            cx.spawn_in(window, async move |_vh, cx| {
-                let (workspace, _) = task.await?;
-                workspace.update(cx, callback)
-            })
-        }
-    }
-
-    pub fn worktrees<'a>(&self, cx: &'a App) -> impl 'a + Iterator<Item = Entity<Worktree>> {
-        self.project.read(cx).worktrees(cx)
-    }
-
-    pub fn visible_worktrees<'a>(
-        &self,
-        cx: &'a App,
-    ) -> impl 'a + Iterator<Item = Entity<Worktree>> {
-        self.project.read(cx).visible_worktrees(cx)
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn worktree_scans_complete(&self, cx: &App) -> impl Future<Output = ()> + 'static + use<> {
-        let futures = self
-            .worktrees(cx)
-            .filter_map(|worktree| worktree.read(cx).as_local())
-            .map(|worktree| worktree.scan_complete())
-            .collect::<Vec<_>>();
-        async move {
-            for future in futures {
-                future.await;
-            }
-        }
-    }
-
-    pub fn close_global(cx: &mut App) {
-        cx.defer(|cx| {
-            cx.windows().iter().find(|window| {
-                window
-                    .update(cx, |_, window, _| {
-                        if window.is_window_active() {
-                            //This can only get called when the window's project connection has been lost
-                            //so we don't need to prompt the user for anything and instead just close the window
-                            window.remove_window();
-                            true
-                        } else {
-                            false
-                        }
-                    })
-                    .unwrap_or(false)
-            });
-        });
-    }
-
-    pub fn close_window(&mut self, _: &CloseWindow, window: &mut Window, cx: &mut Context<Self>) {
-        let prepare = self.prepare_to_close(CloseIntent::CloseWindow, window, cx);
-        cx.spawn_in(window, async move |_, cx| {
-            if prepare.await? {
-                cx.update(|window, _cx| window.remove_window())?;
-            }
-            anyhow::Ok(())
-        })
-        .detach_and_log_err(cx)
-    }
-
-    pub fn move_focused_panel_to_next_position(
-        &mut self,
-        _: &MoveFocusedPanelToNextPosition,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let docks = self.all_docks();
-        let active_dock = docks
-            .into_iter()
-            .find(|dock| dock.focus_handle(cx).contains_focused(window, cx));
-
-        if let Some(dock) = active_dock {
-            dock.update(cx, |dock, cx| {
-                let active_panel = dock
-                    .active_panel()
-                    .filter(|panel| panel.panel_focus_handle(cx).contains_focused(window, cx));
-
-                if let Some(panel) = active_panel {
-                    panel.move_to_next_position(window, cx);
-                }
-            })
-        }
-    }
-
-    pub fn prepare_to_close(
-        &mut self,
-        close_intent: CloseIntent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<bool>> {
-        let active_call = self.active_call().cloned();
-
-        cx.spawn_in(window, async move |this, cx| {
-            this.update(cx, |this, _| {
-                if close_intent == CloseIntent::CloseWindow {
-                    this.removing = true;
-                }
-            })?;
-
-            let workspace_count = cx.update(|_window, cx| {
-                cx.windows()
-                    .iter()
-                    .filter(|window| window.downcast::<Workspace>().is_some())
-                    .count()
-            })?;
-
-            #[cfg(target_os = "macos")]
-            let save_last_workspace = false;
-
-            // On Linux and Windows, closing the last window should restore the last workspace.
-            #[cfg(not(target_os = "macos"))]
-            let save_last_workspace = {
-                let remaining_workspaces = cx.update(|_window, cx| {
-                    cx.windows()
-                        .iter()
-                        .filter_map(|window| window.downcast::<Workspace>())
-                        .filter_map(|workspace| {
-                            workspace
-                                .update(cx, |workspace, _, _| workspace.removing)
-                                .ok()
-                        })
-                        .filter(|removing| !removing)
-                        .count()
-                })?;
-
-                close_intent != CloseIntent::ReplaceWindow && remaining_workspaces == 0
-            };
-
-            if let Some(active_call) = active_call
-                && workspace_count == 1
-                && active_call.read_with(cx, |call, _| call.room().is_some())?
-            {
-                if close_intent == CloseIntent::CloseWindow {
-                    let answer = cx.update(|window, cx| {
-                        window.prompt(
-                            PromptLevel::Warning,
-                            "Do you want to leave the current call?",
-                            None,
-                            &["Close window and hang up", "Cancel"],
-                            cx,
-                        )
-                    })?;
-
-                    if answer.await.log_err() == Some(1) {
-                        return anyhow::Ok(false);
-                    } else {
-                        active_call
-                            .update(cx, |call, cx| call.hang_up(cx))?
-                            .await
-                            .log_err();
-                    }
-                }
-                if close_intent == CloseIntent::ReplaceWindow {
-                    _ = active_call.update(cx, |this, cx| {
-                        let workspace = cx
-                            .windows()
-                            .iter()
-                            .filter_map(|window| window.downcast::<Workspace>())
-                            .next()
-                            .unwrap();
-                        let project = workspace.read(cx)?.project.clone();
-                        if project.read(cx).is_shared() {
-                            this.unshare_project(project, cx)?;
-                        }
-                        Ok::<_, anyhow::Error>(())
-                    })?;
-                }
-            }
-
-            let save_result = this
-                .update_in(cx, |this, window, cx| {
-                    this.save_all_internal(SaveIntent::Close, window, cx)
-                })?
-                .await;
-
-            // If we're not quitting, but closing, we remove the workspace from
-            // the current session.
-            if close_intent != CloseIntent::Quit
-                && !save_last_workspace
-                && save_result.as_ref().is_ok_and(|&res| res)
-            {
-                this.update_in(cx, |this, window, cx| this.remove_from_session(window, cx))?
-                    .await;
-            }
-
-            save_result
-        })
-    }
-
-    fn save_all(&mut self, action: &SaveAll, window: &mut Window, cx: &mut Context<Self>) {
-        self.save_all_internal(
-            action.save_intent.unwrap_or(SaveIntent::SaveAll),
-            window,
-            cx,
-        )
-        .detach_and_log_err(cx);
-    }
-
-    fn send_keystrokes(
-        &mut self,
-        action: &SendKeystrokes,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let keystrokes: Vec<Keystroke> = action
-            .0
-            .split(' ')
-            .flat_map(|k| Keystroke::parse(k).log_err())
-            .map(|k| {
-                cx.keyboard_mapper()
-                    .map_key_equivalent(k, true)
-                    .inner()
-                    .clone()
-            })
-            .collect();
-        let _ = self.send_keystrokes_impl(keystrokes, window, cx);
-    }
-
-    pub fn send_keystrokes_impl(
-        &mut self,
-        keystrokes: Vec<Keystroke>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Shared<Task<()>> {
-        let mut state = self.dispatching_keystrokes.borrow_mut();
-        if !state.dispatched.insert(keystrokes.clone()) {
-            cx.propagate();
-            return state.task.clone().unwrap();
-        }
-
-        state.queue.extend(keystrokes);
-
-        let keystrokes = self.dispatching_keystrokes.clone();
-        if state.task.is_none() {
-            state.task = Some(
-                window
-                    .spawn(cx, async move |cx| {
-                        // limit to 100 keystrokes to avoid infinite recursion.
-                        for _ in 0..100 {
-                            let mut state = keystrokes.borrow_mut();
-                            let Some(keystroke) = state.queue.pop_front() else {
-                                state.dispatched.clear();
-                                state.task.take();
-                                return;
-                            };
-                            drop(state);
-                            cx.update(|window, cx| {
-                                let focused = window.focused(cx);
-                                window.dispatch_keystroke(keystroke.clone(), cx);
-                                if window.focused(cx) != focused {
-                                    // dispatch_keystroke may cause the focus to change.
-                                    // draw's side effect is to schedule the FocusChanged events in the current flush effect cycle
-                                    // And we need that to happen before the next keystroke to keep vim mode happy...
-                                    // (Note that the tests always do this implicitly, so you must manually test with something like:
-                                    //   "bindings": { "g z": ["workspace::SendKeystrokes", ": j <enter> u"]}
-                                    // )
-                                    window.draw(cx).clear();
-                                }
-                            })
-                            .ok();
-                        }
-
-                        *keystrokes.borrow_mut() = Default::default();
-                        log::error!("over 100 keystrokes passed to send_keystrokes");
-                    })
-                    .shared(),
-            );
-        }
-        state.task.clone().unwrap()
-    }
-
-    fn save_all_internal(
-        &mut self,
-        mut save_intent: SaveIntent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<bool>> {
-        if self.project.read(cx).is_disconnected(cx) {
-            return Task::ready(Ok(true));
-        }
-        let dirty_items = self
-            .panes
-            .iter()
-            .flat_map(|pane| {
-                pane.read(cx).items().filter_map(|item| {
-                    if item.is_dirty(cx) {
-                        item.tab_content_text(0, cx);
-                        Some((pane.downgrade(), item.boxed_clone()))
-                    } else {
-                        None
-                    }
-                })
-            })
-            .collect::<Vec<_>>();
-
-        let project = self.project.clone();
-        cx.spawn_in(window, async move |workspace, cx| {
-            let dirty_items = if save_intent == SaveIntent::Close && !dirty_items.is_empty() {
-                let (serialize_tasks, remaining_dirty_items) =
-                    workspace.update_in(cx, |workspace, window, cx| {
-                        let mut remaining_dirty_items = Vec::new();
-                        let mut serialize_tasks = Vec::new();
-                        for (pane, item) in dirty_items {
-                            if let Some(task) = item
-                                .to_serializable_item_handle(cx)
-                                .and_then(|handle| handle.serialize(workspace, true, window, cx))
-                            {
-                                serialize_tasks.push(task);
-                            } else {
-                                remaining_dirty_items.push((pane, item));
-                            }
-                        }
-                        (serialize_tasks, remaining_dirty_items)
-                    })?;
-
-                futures::future::try_join_all(serialize_tasks).await?;
-
-                if remaining_dirty_items.len() > 1 {
-                    let answer = workspace.update_in(cx, |_, window, cx| {
-                        let detail = Pane::file_names_for_prompt(
-                            &mut remaining_dirty_items.iter().map(|(_, handle)| handle),
-                            cx,
-                        );
-                        window.prompt(
-                            PromptLevel::Warning,
-                            "Do you want to save all changes in the following files?",
-                            Some(&detail),
-                            &["Save all", "Discard all", "Cancel"],
-                            cx,
-                        )
-                    })?;
-                    match answer.await.log_err() {
-                        Some(0) => save_intent = SaveIntent::SaveAll,
-                        Some(1) => save_intent = SaveIntent::Skip,
-                        Some(2) => return Ok(false),
-                        _ => {}
-                    }
-                }
-
-                remaining_dirty_items
-            } else {
-                dirty_items
-            };
-
-            for (pane, item) in dirty_items {
-                let (singleton, project_entry_ids) = cx.update(|_, cx| {
-                    (
-                        item.buffer_kind(cx) == ItemBufferKind::Singleton,
-                        item.project_entry_ids(cx),
-                    )
-                })?;
-                if (singleton || !project_entry_ids.is_empty())
-                    && !Pane::save_item(project.clone(), &pane, &*item, save_intent, cx).await?
-                {
-                    return Ok(false);
-                }
-            }
-            Ok(true)
-        })
-    }
-
-    pub fn open_workspace_for_paths(
-        &mut self,
-        replace_current_window: bool,
-        paths: Vec<PathBuf>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let window_handle = window.window_handle().downcast::<Self>();
-        let is_remote = self.project.read(cx).is_via_collab();
-        let has_worktree = self.project.read(cx).worktrees(cx).next().is_some();
-        let has_dirty_items = self.items(cx).any(|item| item.is_dirty(cx));
-
-        let window_to_replace = if replace_current_window {
-            window_handle
-        } else if is_remote || has_worktree || has_dirty_items {
-            None
-        } else {
-            window_handle
-        };
-        let app_state = self.app_state.clone();
-
-        cx.spawn(async move |_, cx| {
-            cx.update(|cx| {
-                open_paths(
-                    &paths,
-                    app_state,
-                    OpenOptions {
-                        replace_window: window_to_replace,
-                        ..Default::default()
-                    },
-                    cx,
-                )
-            })?
-            .await?;
-            Ok(())
-        })
-    }
-
-    #[allow(clippy::type_complexity)]
-    pub fn open_paths(
-        &mut self,
-        mut abs_paths: Vec<PathBuf>,
-        options: OpenOptions,
-        pane: Option<WeakEntity<Pane>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Vec<Option<anyhow::Result<Box<dyn ItemHandle>>>>> {
-        let fs = self.app_state.fs.clone();
-
-        // Sort the paths to ensure we add worktrees for parents before their children.
-        abs_paths.sort_unstable();
-        cx.spawn_in(window, async move |this, cx| {
-            let mut tasks = Vec::with_capacity(abs_paths.len());
-
-            for abs_path in &abs_paths {
-                let visible = match options.visible.as_ref().unwrap_or(&OpenVisible::None) {
-                    OpenVisible::All => Some(true),
-                    OpenVisible::None => Some(false),
-                    OpenVisible::OnlyFiles => match fs.metadata(abs_path).await.log_err() {
-                        Some(Some(metadata)) => Some(!metadata.is_dir),
-                        Some(None) => Some(true),
-                        None => None,
-                    },
-                    OpenVisible::OnlyDirectories => match fs.metadata(abs_path).await.log_err() {
-                        Some(Some(metadata)) => Some(metadata.is_dir),
-                        Some(None) => Some(false),
-                        None => None,
-                    },
-                };
-                let project_path = match visible {
-                    Some(visible) => match this
-                        .update(cx, |this, cx| {
-                            Workspace::project_path_for_path(
-                                this.project.clone(),
-                                abs_path,
-                                visible,
-                                cx,
-                            )
-                        })
-                        .log_err()
-                    {
-                        Some(project_path) => project_path.await.log_err(),
-                        None => None,
-                    },
-                    None => None,
-                };
-
-                let this = this.clone();
-                let abs_path: Arc<Path> = SanitizedPath::new(&abs_path).as_path().into();
-                let fs = fs.clone();
-                let pane = pane.clone();
-                let task = cx.spawn(async move |cx| {
-                    let (worktree, project_path) = project_path?;
-                    if fs.is_dir(&abs_path).await {
-                        this.update(cx, |workspace, cx| {
-                            let worktree = worktree.read(cx);
-                            let worktree_abs_path = worktree.abs_path();
-                            let entry_id = if abs_path.as_ref() == worktree_abs_path.as_ref() {
-                                worktree.root_entry()
-                            } else {
-                                abs_path
-                                    .strip_prefix(worktree_abs_path.as_ref())
-                                    .ok()
-                                    .and_then(|relative_path| {
-                                        let relative_path =
-                                            RelPath::new(relative_path, PathStyle::local())
-                                                .log_err()?;
-                                        worktree.entry_for_path(&relative_path)
-                                    })
-                            }
-                            .map(|entry| entry.id);
-                            if let Some(entry_id) = entry_id {
-                                workspace.project.update(cx, |_, cx| {
-                                    cx.emit(project::Event::ActiveEntryChanged(Some(entry_id)));
-                                })
-                            }
-                        })
-                        .ok()?;
-                        None
-                    } else {
-                        Some(
-                            this.update_in(cx, |this, window, cx| {
-                                this.open_path(
-                                    project_path,
-                                    pane,
-                                    options.focus.unwrap_or(true),
-                                    window,
-                                    cx,
-                                )
-                            })
-                            .ok()?
-                            .await,
-                        )
-                    }
-                });
-                tasks.push(task);
-            }
-
-            futures::future::join_all(tasks).await
-        })
-    }
-
-    pub fn open_resolved_path(
-        &mut self,
-        path: ResolvedPath,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<anyhow::Result<Box<dyn ItemHandle>>> {
-        match path {
-            ResolvedPath::ProjectPath { project_path, .. } => {
-                self.open_path(project_path, None, true, window, cx)
-            }
-            ResolvedPath::AbsPath { path, .. } => self.open_abs_path(
-                PathBuf::from(path),
-                OpenOptions {
-                    visible: Some(OpenVisible::None),
-                    ..Default::default()
-                },
-                window,
-                cx,
-            ),
-        }
-    }
-
-    pub fn absolute_path_of_worktree(
-        &self,
-        worktree_id: WorktreeId,
-        cx: &mut Context<Self>,
-    ) -> Option<PathBuf> {
-        self.project
-            .read(cx)
-            .worktree_for_id(worktree_id, cx)
-            // TODO: use `abs_path` or `root_dir`
-            .map(|wt| wt.read(cx).abs_path().as_ref().to_path_buf())
-    }
-
-    fn add_folder_to_project(
-        &mut self,
-        _: &AddFolderToProject,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let project = self.project.read(cx);
-        if project.is_via_collab() {
-            self.show_error(
-                &anyhow!("You cannot add folders to someone else's project"),
-                cx,
-            );
-            return;
-        }
-        let paths = self.prompt_for_open_path(
-            PathPromptOptions {
-                files: false,
-                directories: true,
-                multiple: true,
-                prompt: None,
-            },
-            DirectoryLister::Project(self.project.clone()),
-            window,
-            cx,
-        );
-        cx.spawn_in(window, async move |this, cx| {
-            if let Some(paths) = paths.await.log_err().flatten() {
-                let results = this
-                    .update_in(cx, |this, window, cx| {
-                        this.open_paths(
-                            paths,
-                            OpenOptions {
-                                visible: Some(OpenVisible::All),
-                                ..Default::default()
-                            },
-                            None,
-                            window,
-                            cx,
-                        )
-                    })?
-                    .await;
-                for result in results.into_iter().flatten() {
-                    result.log_err();
-                }
-            }
-            anyhow::Ok(())
-        })
-        .detach_and_log_err(cx);
-    }
-
-    pub fn project_path_for_path(
-        project: Entity<Project>,
-        abs_path: &Path,
-        visible: bool,
-        cx: &mut App,
-    ) -> Task<Result<(Entity<Worktree>, ProjectPath)>> {
-        let entry = project.update(cx, |project, cx| {
-            project.find_or_create_worktree(abs_path, visible, cx)
-        });
-        cx.spawn(async move |cx| {
-            let (worktree, path) = entry.await?;
-            let worktree_id = worktree.read_with(cx, |t, _| t.id())?;
-            Ok((
-                worktree,
-                ProjectPath {
-                    worktree_id,
-                    path: path,
-                },
-            ))
-        })
-    }
-
-    pub fn items<'a>(&'a self, cx: &'a App) -> impl 'a + Iterator<Item = &'a Box<dyn ItemHandle>> {
-        self.panes.iter().flat_map(|pane| pane.read(cx).items())
-    }
-
-    pub fn item_of_type<T: Item>(&self, cx: &App) -> Option<Entity<T>> {
-        self.items_of_type(cx).max_by_key(|item| item.item_id())
-    }
-
-    pub fn items_of_type<'a, T: Item>(
-        &'a self,
-        cx: &'a App,
-    ) -> impl 'a + Iterator<Item = Entity<T>> {
-        self.panes
-            .iter()
-            .flat_map(|pane| pane.read(cx).items_of_type())
-    }
-
-    pub fn active_item(&self, cx: &App) -> Option<Box<dyn ItemHandle>> {
-        self.active_pane().read(cx).active_item()
-    }
-
-    pub fn active_item_as<I: 'static>(&self, cx: &App) -> Option<Entity<I>> {
-        let item = self.active_item(cx)?;
-        item.to_any_view().downcast::<I>().ok()
-    }
-
-    fn active_project_path(&self, cx: &App) -> Option<ProjectPath> {
-        self.active_item(cx).and_then(|item| item.project_path(cx))
-    }
-
-    pub fn most_recent_active_path(&self, cx: &App) -> Option<PathBuf> {
-        self.recent_navigation_history_iter(cx)
-            .filter_map(|(path, abs_path)| {
-                let worktree = self
-                    .project
-                    .read(cx)
-                    .worktree_for_id(path.worktree_id, cx)?;
-                if worktree.read(cx).is_visible() {
-                    abs_path
-                } else {
-                    None
-                }
-            })
-            .next()
-    }
-
-    pub fn save_active_item(
-        &mut self,
-        save_intent: SaveIntent,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<()>> {
-        let project = self.project.clone();
-        let pane = self.active_pane();
-        let item = pane.read(cx).active_item();
-        let pane = pane.downgrade();
-
-        window.spawn(cx, async move |cx| {
-            if let Some(item) = item {
-                Pane::save_item(project, &pane, item.as_ref(), save_intent, cx)
-                    .await
-                    .map(|_| ())
-            } else {
-                Ok(())
-            }
-        })
-    }
-
-    pub fn close_inactive_items_and_panes(
-        &mut self,
-        action: &CloseInactiveTabsAndPanes,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(task) = self.close_all_internal(
-            true,
-            action.save_intent.unwrap_or(SaveIntent::Close),
-            window,
-            cx,
-        ) {
-            task.detach_and_log_err(cx)
-        }
-    }
-
-    pub fn close_all_items_and_panes(
-        &mut self,
-        action: &CloseAllItemsAndPanes,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(task) = self.close_all_internal(
-            false,
-            action.save_intent.unwrap_or(SaveIntent::Close),
-            window,
-            cx,
-        ) {
-            task.detach_and_log_err(cx)
-        }
-    }
-
-    fn close_all_internal(
-        &mut self,
-        retain_active_pane: bool,
-        save_intent: SaveIntent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Task<Result<()>>> {
-        let current_pane = self.active_pane();
-
-        let mut tasks = Vec::new();
-
-        if retain_active_pane {
-            let current_pane_close = current_pane.update(cx, |pane, cx| {
-                pane.close_other_items(
-                    &CloseOtherItems {
-                        save_intent: None,
-                        close_pinned: false,
-                    },
-                    None,
-                    window,
-                    cx,
-                )
-            });
-
-            tasks.push(current_pane_close);
-        }
-
-        for pane in self.panes() {
-            if retain_active_pane && pane.entity_id() == current_pane.entity_id() {
-                continue;
-            }
-
-            let close_pane_items = pane.update(cx, |pane: &mut Pane, cx| {
-                pane.close_all_items(
-                    &CloseAllItems {
-                        save_intent: Some(save_intent),
-                        close_pinned: false,
-                    },
-                    window,
-                    cx,
-                )
-            });
-
-            tasks.push(close_pane_items)
-        }
-
-        if tasks.is_empty() {
-            None
-        } else {
-            Some(cx.spawn_in(window, async move |_, _| {
-                for task in tasks {
-                    task.await?
-                }
-                Ok(())
-            }))
-        }
-    }
-
-    pub fn is_dock_at_position_open(&self, position: DockPosition, cx: &mut Context<Self>) -> bool {
-        self.dock_at_position(position).read(cx).is_open()
-    }
-
-    pub fn toggle_dock(
-        &mut self,
-        dock_side: DockPosition,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let mut focus_center = false;
-        let mut reveal_dock = false;
-
-        let other_is_zoomed = self.zoomed.is_some() && self.zoomed_position != Some(dock_side);
-        let was_visible = self.is_dock_at_position_open(dock_side, cx) && !other_is_zoomed;
-        if was_visible {
-            self.save_open_dock_positions(cx);
-        }
-
-        let dock = self.dock_at_position(dock_side);
-        dock.update(cx, |dock, cx| {
-            dock.set_open(!was_visible, window, cx);
-
-            if dock.active_panel().is_none() {
-                let Some(panel_ix) = dock
-                    .first_enabled_panel_idx(cx)
-                    .log_with_level(log::Level::Info)
-                else {
-                    return;
-                };
-                dock.activate_panel(panel_ix, window, cx);
-            }
-
-            if let Some(active_panel) = dock.active_panel() {
-                if was_visible {
-                    if active_panel
-                        .panel_focus_handle(cx)
-                        .contains_focused(window, cx)
-                    {
-                        focus_center = true;
-                    }
-                } else {
-                    let focus_handle = &active_panel.panel_focus_handle(cx);
-                    window.focus(focus_handle);
-                    reveal_dock = true;
-                }
-            }
-        });
-
-        if reveal_dock {
-            self.dismiss_zoomed_items_to_reveal(Some(dock_side), window, cx);
-        }
-
-        if focus_center {
-            self.active_pane
-                .update(cx, |pane, cx| window.focus(&pane.focus_handle(cx)))
-        }
-
-        cx.notify();
-        self.serialize_workspace(window, cx);
-    }
-
-    fn active_dock(&self, window: &Window, cx: &Context<Self>) -> Option<&Entity<Dock>> {
-        self.all_docks().into_iter().find(|&dock| {
-            dock.read(cx).is_open() && dock.focus_handle(cx).contains_focused(window, cx)
-        })
-    }
-
-    fn close_active_dock(&mut self, window: &mut Window, cx: &mut Context<Self>) -> bool {
-        if let Some(dock) = self.active_dock(window, cx).cloned() {
-            self.save_open_dock_positions(cx);
-            dock.update(cx, |dock, cx| {
-                dock.set_open(false, window, cx);
-            });
-            return true;
-        }
-        false
-    }
-
-    pub fn close_all_docks(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.save_open_dock_positions(cx);
-        for dock in self.all_docks() {
-            dock.update(cx, |dock, cx| {
-                dock.set_open(false, window, cx);
-            });
-        }
-
-        cx.focus_self(window);
-        cx.notify();
-        self.serialize_workspace(window, cx);
-    }
-
-    fn get_open_dock_positions(&self, cx: &Context<Self>) -> Vec<DockPosition> {
-        self.all_docks()
-            .into_iter()
-            .filter_map(|dock| {
-                let dock_ref = dock.read(cx);
-                if dock_ref.is_open() {
-                    Some(dock_ref.position())
-                } else {
-                    None
-                }
-            })
-            .collect()
-    }
-
-    /// Saves the positions of currently open docks.
-    ///
-    /// Updates `last_open_dock_positions` with positions of all currently open
-    /// docks, to later be restored by the 'Toggle All Docks' action.
-    fn save_open_dock_positions(&mut self, cx: &mut Context<Self>) {
-        let open_dock_positions = self.get_open_dock_positions(cx);
-        if !open_dock_positions.is_empty() {
-            self.last_open_dock_positions = open_dock_positions;
-        }
-    }
-
-    /// Toggles all docks between open and closed states.
-    ///
-    /// If any docks are open, closes all and remembers their positions. If all
-    /// docks are closed, restores the last remembered dock configuration.
-    fn toggle_all_docks(
-        &mut self,
-        _: &ToggleAllDocks,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let open_dock_positions = self.get_open_dock_positions(cx);
-
-        if !open_dock_positions.is_empty() {
-            self.close_all_docks(window, cx);
-        } else if !self.last_open_dock_positions.is_empty() {
-            self.restore_last_open_docks(window, cx);
-        }
-    }
-
-    /// Reopens docks from the most recently remembered configuration.
-    ///
-    /// Opens all docks whose positions are stored in `last_open_dock_positions`
-    /// and clears the stored positions.
-    fn restore_last_open_docks(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let positions_to_open = std::mem::take(&mut self.last_open_dock_positions);
-
-        for position in positions_to_open {
-            let dock = self.dock_at_position(position);
-            dock.update(cx, |dock, cx| dock.set_open(true, window, cx));
-        }
-
-        cx.focus_self(window);
-        cx.notify();
-        self.serialize_workspace(window, cx);
-    }
-
-    /// Transfer focus to the panel of the given type.
-    pub fn focus_panel<T: Panel>(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Entity<T>> {
-        let panel = self.focus_or_unfocus_panel::<T>(window, cx, |_, _, _| true)?;
-        panel.to_any().downcast().ok()
-    }
-
-    /// Focus the panel of the given type if it isn't already focused. If it is
-    /// already focused, then transfer focus back to the workspace center.
-    pub fn toggle_panel_focus<T: Panel>(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> bool {
-        let mut did_focus_panel = false;
-        self.focus_or_unfocus_panel::<T>(window, cx, |panel, window, cx| {
-            did_focus_panel = !panel.panel_focus_handle(cx).contains_focused(window, cx);
-            did_focus_panel
-        });
-        did_focus_panel
-    }
-
-    pub fn activate_panel_for_proto_id(
-        &mut self,
-        panel_id: PanelId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Arc<dyn PanelHandle>> {
-        let mut panel = None;
-        for dock in self.all_docks() {
-            if let Some(panel_index) = dock.read(cx).panel_index_for_proto_id(panel_id) {
-                panel = dock.update(cx, |dock, cx| {
-                    dock.activate_panel(panel_index, window, cx);
-                    dock.set_open(true, window, cx);
-                    dock.active_panel().cloned()
-                });
-                break;
-            }
-        }
-
-        if panel.is_some() {
-            cx.notify();
-            self.serialize_workspace(window, cx);
-        }
-
-        panel
-    }
-
-    /// Focus or unfocus the given panel type, depending on the given callback.
-    fn focus_or_unfocus_panel<T: Panel>(
-        &mut self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-        mut should_focus: impl FnMut(&dyn PanelHandle, &mut Window, &mut Context<Dock>) -> bool,
-    ) -> Option<Arc<dyn PanelHandle>> {
-        let mut result_panel = None;
-        let mut serialize = false;
-        for dock in self.all_docks() {
-            if let Some(panel_index) = dock.read(cx).panel_index_for_type::<T>() {
-                let mut focus_center = false;
-                let panel = dock.update(cx, |dock, cx| {
-                    dock.activate_panel(panel_index, window, cx);
-
-                    let panel = dock.active_panel().cloned();
-                    if let Some(panel) = panel.as_ref() {
-                        if should_focus(&**panel, window, cx) {
-                            dock.set_open(true, window, cx);
-                            panel.panel_focus_handle(cx).focus(window);
-                        } else {
-                            focus_center = true;
-                        }
-                    }
-                    panel
-                });
-
-                if focus_center {
-                    self.active_pane
-                        .update(cx, |pane, cx| window.focus(&pane.focus_handle(cx)))
-                }
-
-                result_panel = panel;
-                serialize = true;
-                break;
-            }
-        }
-
-        if serialize {
-            self.serialize_workspace(window, cx);
-        }
-
-        cx.notify();
-        result_panel
-    }
-
-    /// Open the panel of the given type
-    pub fn open_panel<T: Panel>(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        for dock in self.all_docks() {
-            if let Some(panel_index) = dock.read(cx).panel_index_for_type::<T>() {
-                dock.update(cx, |dock, cx| {
-                    dock.activate_panel(panel_index, window, cx);
-                    dock.set_open(true, window, cx);
-                });
-            }
-        }
-    }
-
-    pub fn close_panel<T: Panel>(&self, window: &mut Window, cx: &mut Context<Self>) {
-        for dock in self.all_docks().iter() {
-            dock.update(cx, |dock, cx| {
-                if dock.panel::<T>().is_some() {
-                    dock.set_open(false, window, cx)
-                }
-            })
-        }
-    }
-
-    pub fn panel<T: Panel>(&self, cx: &App) -> Option<Entity<T>> {
-        self.all_docks()
-            .iter()
-            .find_map(|dock| dock.read(cx).panel::<T>())
-    }
-
-    fn dismiss_zoomed_items_to_reveal(
-        &mut self,
-        dock_to_reveal: Option<DockPosition>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        // If a center pane is zoomed, unzoom it.
-        for pane in &self.panes {
-            if pane != &self.active_pane || dock_to_reveal.is_some() {
-                pane.update(cx, |pane, cx| pane.set_zoomed(false, cx));
-            }
-        }
-
-        // If another dock is zoomed, hide it.
-        let mut focus_center = false;
-        for dock in self.all_docks() {
-            dock.update(cx, |dock, cx| {
-                if Some(dock.position()) != dock_to_reveal
-                    && let Some(panel) = dock.active_panel()
-                    && panel.is_zoomed(window, cx)
-                {
-                    focus_center |= panel.panel_focus_handle(cx).contains_focused(window, cx);
-                    dock.set_open(false, window, cx);
-                }
-            });
-        }
-
-        if focus_center {
-            self.active_pane
-                .update(cx, |pane, cx| window.focus(&pane.focus_handle(cx)))
-        }
-
-        if self.zoomed_position != dock_to_reveal {
-            self.zoomed = None;
-            self.zoomed_position = None;
-            cx.emit(Event::ZoomChanged);
-        }
-
-        cx.notify();
-    }
-
-    fn add_pane(&mut self, window: &mut Window, cx: &mut Context<Self>) -> Entity<Pane> {
-        let pane = cx.new(|cx| {
-            let mut pane = Pane::new(
-                self.weak_handle(),
-                self.project.clone(),
-                self.pane_history_timestamp.clone(),
-                None,
-                NewFile.boxed_clone(),
-                true,
-                window,
-                cx,
-            );
-            pane.set_can_split(Some(Arc::new(|_, _, _, _| true)));
-            pane
-        });
-        cx.subscribe_in(&pane, window, Self::handle_pane_event)
-            .detach();
-        self.panes.push(pane.clone());
-
-        window.focus(&pane.focus_handle(cx));
-
-        cx.emit(Event::PaneAdded(pane.clone()));
-        pane
-    }
-
-    pub fn add_item_to_center(
-        &mut self,
-        item: Box<dyn ItemHandle>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> bool {
-        if let Some(center_pane) = self.last_active_center_pane.clone() {
-            if let Some(center_pane) = center_pane.upgrade() {
-                center_pane.update(cx, |pane, cx| {
-                    pane.add_item(item, true, true, None, window, cx)
-                });
-                true
-            } else {
-                false
-            }
-        } else {
-            false
-        }
-    }
-
-    pub fn add_item_to_active_pane(
-        &mut self,
-        item: Box<dyn ItemHandle>,
-        destination_index: Option<usize>,
-        focus_item: bool,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        self.add_item(
-            self.active_pane.clone(),
-            item,
-            destination_index,
-            false,
-            focus_item,
-            window,
-            cx,
-        )
-    }
-
-    pub fn add_item(
-        &mut self,
-        pane: Entity<Pane>,
-        item: Box<dyn ItemHandle>,
-        destination_index: Option<usize>,
-        activate_pane: bool,
-        focus_item: bool,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        pane.update(cx, |pane, cx| {
-            pane.add_item(
-                item,
-                activate_pane,
-                focus_item,
-                destination_index,
-                window,
-                cx,
-            )
-        });
-    }
-
-    pub fn split_item(
-        &mut self,
-        split_direction: SplitDirection,
-        item: Box<dyn ItemHandle>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let new_pane = self.split_pane(self.active_pane.clone(), split_direction, window, cx);
-        self.add_item(new_pane, item, None, true, true, window, cx);
-    }
-
-    pub fn open_abs_path(
-        &mut self,
-        abs_path: PathBuf,
-        options: OpenOptions,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<anyhow::Result<Box<dyn ItemHandle>>> {
-        cx.spawn_in(window, async move |workspace, cx| {
-            let open_paths_task_result = workspace
-                .update_in(cx, |workspace, window, cx| {
-                    workspace.open_paths(vec![abs_path.clone()], options, None, window, cx)
-                })
-                .with_context(|| format!("open abs path {abs_path:?} task spawn"))?
-                .await;
-            anyhow::ensure!(
-                open_paths_task_result.len() == 1,
-                "open abs path {abs_path:?} task returned incorrect number of results"
-            );
-            match open_paths_task_result
-                .into_iter()
-                .next()
-                .expect("ensured single task result")
-            {
-                Some(open_result) => {
-                    open_result.with_context(|| format!("open abs path {abs_path:?} task join"))
-                }
-                None => anyhow::bail!("open abs path {abs_path:?} task returned None"),
-            }
-        })
-    }
-
-    pub fn split_abs_path(
-        &mut self,
-        abs_path: PathBuf,
-        visible: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<anyhow::Result<Box<dyn ItemHandle>>> {
-        let project_path_task =
-            Workspace::project_path_for_path(self.project.clone(), &abs_path, visible, cx);
-        cx.spawn_in(window, async move |this, cx| {
-            let (_, path) = project_path_task.await?;
-            this.update_in(cx, |this, window, cx| this.split_path(path, window, cx))?
-                .await
-        })
-    }
-
-    pub fn open_path(
-        &mut self,
-        path: impl Into<ProjectPath>,
-        pane: Option<WeakEntity<Pane>>,
-        focus_item: bool,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<anyhow::Result<Box<dyn ItemHandle>>> {
-        self.open_path_preview(path, pane, focus_item, false, true, window, cx)
-    }
-
-    pub fn open_path_preview(
-        &mut self,
-        path: impl Into<ProjectPath>,
-        pane: Option<WeakEntity<Pane>>,
-        focus_item: bool,
-        allow_preview: bool,
-        activate: bool,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<anyhow::Result<Box<dyn ItemHandle>>> {
-        let pane = pane.unwrap_or_else(|| {
-            self.last_active_center_pane.clone().unwrap_or_else(|| {
-                self.panes
-                    .first()
-                    .expect("There must be an active pane")
-                    .downgrade()
-            })
-        });
-
-        let project_path = path.into();
-        let task = self.load_path(project_path.clone(), window, cx);
-        window.spawn(cx, async move |cx| {
-            let (project_entry_id, build_item) = task.await?;
-
-            pane.update_in(cx, |pane, window, cx| {
-                pane.open_item(
-                    project_entry_id,
-                    project_path,
-                    focus_item,
-                    allow_preview,
-                    activate,
-                    None,
-                    window,
-                    cx,
-                    build_item,
-                )
-            })
-        })
-    }
-
-    pub fn split_path(
-        &mut self,
-        path: impl Into<ProjectPath>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<anyhow::Result<Box<dyn ItemHandle>>> {
-        self.split_path_preview(path, false, None, window, cx)
-    }
-
-    pub fn split_path_preview(
-        &mut self,
-        path: impl Into<ProjectPath>,
-        allow_preview: bool,
-        split_direction: Option<SplitDirection>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<anyhow::Result<Box<dyn ItemHandle>>> {
-        let pane = self.last_active_center_pane.clone().unwrap_or_else(|| {
-            self.panes
-                .first()
-                .expect("There must be an active pane")
-                .downgrade()
-        });
-
-        if let Member::Pane(center_pane) = &self.center.root
-            && center_pane.read(cx).items_len() == 0
-        {
-            return self.open_path(path, Some(pane), true, window, cx);
-        }
-
-        let project_path = path.into();
-        let task = self.load_path(project_path.clone(), window, cx);
-        cx.spawn_in(window, async move |this, cx| {
-            let (project_entry_id, build_item) = task.await?;
-            this.update_in(cx, move |this, window, cx| -> Option<_> {
-                let pane = pane.upgrade()?;
-                let new_pane = this.split_pane(
-                    pane,
-                    split_direction.unwrap_or(SplitDirection::Right),
-                    window,
-                    cx,
-                );
-                new_pane.update(cx, |new_pane, cx| {
-                    Some(new_pane.open_item(
-                        project_entry_id,
-                        project_path,
-                        true,
-                        allow_preview,
-                        true,
-                        None,
-                        window,
-                        cx,
-                        build_item,
-                    ))
-                })
-            })
-            .map(|option| option.context("pane was dropped"))?
-        })
-    }
-
-    fn load_path(
-        &mut self,
-        path: ProjectPath,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<(Option<ProjectEntryId>, WorkspaceItemBuilder)>> {
-        let registry = cx.default_global::<ProjectItemRegistry>().clone();
-        registry.open_path(self.project(), &path, window, cx)
-    }
-
-    pub fn find_project_item<T>(
-        &self,
-        pane: &Entity<Pane>,
-        project_item: &Entity<T::Item>,
-        cx: &App,
-    ) -> Option<Entity<T>>
-    where
-        T: ProjectItem,
-    {
-        use project::ProjectItem as _;
-        let project_item = project_item.read(cx);
-        let entry_id = project_item.entry_id(cx);
-        let project_path = project_item.project_path(cx);
-
-        let mut item = None;
-        if let Some(entry_id) = entry_id {
-            item = pane.read(cx).item_for_entry(entry_id, cx);
-        }
-        if item.is_none()
-            && let Some(project_path) = project_path
-        {
-            item = pane.read(cx).item_for_path(project_path, cx);
-        }
-
-        item.and_then(|item| item.downcast::<T>())
-    }
-
-    pub fn is_project_item_open<T>(
-        &self,
-        pane: &Entity<Pane>,
-        project_item: &Entity<T::Item>,
-        cx: &App,
-    ) -> bool
-    where
-        T: ProjectItem,
-    {
-        self.find_project_item::<T>(pane, project_item, cx)
-            .is_some()
-    }
-
-    pub fn open_project_item<T>(
-        &mut self,
-        pane: Entity<Pane>,
-        project_item: Entity<T::Item>,
-        activate_pane: bool,
-        focus_item: bool,
-        keep_old_preview: bool,
-        allow_new_preview: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Entity<T>
-    where
-        T: ProjectItem,
-    {
-        let old_item_id = pane.read(cx).active_item().map(|item| item.item_id());
-
-        if let Some(item) = self.find_project_item(&pane, &project_item, cx) {
-            if !keep_old_preview
-                && let Some(old_id) = old_item_id
-                && old_id != item.item_id()
-            {
-                // switching to a different item, so unpreview old active item
-                pane.update(cx, |pane, _| {
-                    pane.unpreview_item_if_preview(old_id);
-                });
-            }
-
-            self.activate_item(&item, activate_pane, focus_item, window, cx);
-            if !allow_new_preview {
-                pane.update(cx, |pane, _| {
-                    pane.unpreview_item_if_preview(item.item_id());
-                });
-            }
-            return item;
-        }
-
-        let item = pane.update(cx, |pane, cx| {
-            cx.new(|cx| {
-                T::for_project_item(self.project().clone(), Some(pane), project_item, window, cx)
-            })
-        });
-        let mut destination_index = None;
-        pane.update(cx, |pane, cx| {
-            if !keep_old_preview && let Some(old_id) = old_item_id {
-                pane.unpreview_item_if_preview(old_id);
-            }
-            if allow_new_preview {
-                destination_index = pane.replace_preview_item_id(item.item_id(), window, cx);
-            }
-        });
-
-        self.add_item(
-            pane,
-            Box::new(item.clone()),
-            destination_index,
-            activate_pane,
-            focus_item,
-            window,
-            cx,
-        );
-        item
-    }
-
-    pub fn open_shared_screen(
-        &mut self,
-        peer_id: PeerId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(shared_screen) =
-            self.shared_screen_for_peer(peer_id, &self.active_pane, window, cx)
-        {
-            self.active_pane.update(cx, |pane, cx| {
-                pane.add_item(Box::new(shared_screen), false, true, None, window, cx)
-            });
-        }
-    }
-
-    pub fn activate_item(
-        &mut self,
-        item: &dyn ItemHandle,
-        activate_pane: bool,
-        focus_item: bool,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> bool {
-        let result = self.panes.iter().find_map(|pane| {
-            pane.read(cx)
-                .index_for_item(item)
-                .map(|ix| (pane.clone(), ix))
-        });
-        if let Some((pane, ix)) = result {
-            pane.update(cx, |pane, cx| {
-                pane.activate_item(ix, activate_pane, focus_item, window, cx)
-            });
-            true
-        } else {
-            false
-        }
-    }
-
-    fn activate_pane_at_index(
-        &mut self,
-        action: &ActivatePane,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let panes = self.center.panes();
-        if let Some(pane) = panes.get(action.0).map(|p| (*p).clone()) {
-            window.focus(&pane.focus_handle(cx));
-        } else {
-            self.split_and_clone(self.active_pane.clone(), SplitDirection::Right, window, cx)
-                .detach();
-        }
-    }
-
-    fn move_item_to_pane_at_index(
-        &mut self,
-        action: &MoveItemToPane,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let panes = self.center.panes();
-        let destination = match panes.get(action.destination) {
-            Some(&destination) => destination.clone(),
-            None => {
-                if !action.clone && self.active_pane.read(cx).items_len() < 2 {
-                    return;
-                }
-                let direction = SplitDirection::Right;
-                let split_off_pane = self
-                    .find_pane_in_direction(direction, cx)
-                    .unwrap_or_else(|| self.active_pane.clone());
-                let new_pane = self.add_pane(window, cx);
-                if self
-                    .center
-                    .split(&split_off_pane, &new_pane, direction)
-                    .log_err()
-                    .is_none()
-                {
-                    return;
-                };
-                new_pane
-            }
-        };
-
-        if action.clone {
-            if self
-                .active_pane
-                .read(cx)
-                .active_item()
-                .is_some_and(|item| item.can_split(cx))
-            {
-                clone_active_item(
-                    self.database_id(),
-                    &self.active_pane,
-                    &destination,
-                    action.focus,
-                    window,
-                    cx,
-                );
-                return;
-            }
-        }
-        move_active_item(
-            &self.active_pane,
-            &destination,
-            action.focus,
-            true,
-            window,
-            cx,
-        )
-    }
-
-    pub fn activate_next_pane(&mut self, window: &mut Window, cx: &mut App) {
-        let panes = self.center.panes();
-        if let Some(ix) = panes.iter().position(|pane| **pane == self.active_pane) {
-            let next_ix = (ix + 1) % panes.len();
-            let next_pane = panes[next_ix].clone();
-            window.focus(&next_pane.focus_handle(cx));
-        }
-    }
-
-    pub fn activate_previous_pane(&mut self, window: &mut Window, cx: &mut App) {
-        let panes = self.center.panes();
-        if let Some(ix) = panes.iter().position(|pane| **pane == self.active_pane) {
-            let prev_ix = cmp::min(ix.wrapping_sub(1), panes.len() - 1);
-            let prev_pane = panes[prev_ix].clone();
-            window.focus(&prev_pane.focus_handle(cx));
-        }
-    }
-
-    pub fn activate_pane_in_direction(
-        &mut self,
-        direction: SplitDirection,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        use ActivateInDirectionTarget as Target;
-        enum Origin {
-            LeftDock,
-            RightDock,
-            BottomDock,
-            Center,
-        }
-
-        let origin: Origin = [
-            (&self.left_dock, Origin::LeftDock),
-            (&self.right_dock, Origin::RightDock),
-            (&self.bottom_dock, Origin::BottomDock),
-        ]
-        .into_iter()
-        .find_map(|(dock, origin)| {
-            if dock.focus_handle(cx).contains_focused(window, cx) && dock.read(cx).is_open() {
-                Some(origin)
-            } else {
-                None
-            }
-        })
-        .unwrap_or(Origin::Center);
-
-        let get_last_active_pane = || {
-            let pane = self
-                .last_active_center_pane
-                .clone()
-                .unwrap_or_else(|| {
-                    self.panes
-                        .first()
-                        .expect("There must be an active pane")
-                        .downgrade()
-                })
-                .upgrade()?;
-            (pane.read(cx).items_len() != 0).then_some(pane)
-        };
-
-        let try_dock =
-            |dock: &Entity<Dock>| dock.read(cx).is_open().then(|| Target::Dock(dock.clone()));
-
-        let target = match (origin, direction) {
-            // We're in the center, so we first try to go to a different pane,
-            // otherwise try to go to a dock.
-            (Origin::Center, direction) => {
-                if let Some(pane) = self.find_pane_in_direction(direction, cx) {
-                    Some(Target::Pane(pane))
-                } else {
-                    match direction {
-                        SplitDirection::Up => None,
-                        SplitDirection::Down => try_dock(&self.bottom_dock),
-                        SplitDirection::Left => try_dock(&self.left_dock),
-                        SplitDirection::Right => try_dock(&self.right_dock),
-                    }
-                }
-            }
-
-            (Origin::LeftDock, SplitDirection::Right) => {
-                if let Some(last_active_pane) = get_last_active_pane() {
-                    Some(Target::Pane(last_active_pane))
-                } else {
-                    try_dock(&self.bottom_dock).or_else(|| try_dock(&self.right_dock))
-                }
-            }
-
-            (Origin::LeftDock, SplitDirection::Down)
-            | (Origin::RightDock, SplitDirection::Down) => try_dock(&self.bottom_dock),
-
-            (Origin::BottomDock, SplitDirection::Up) => get_last_active_pane().map(Target::Pane),
-            (Origin::BottomDock, SplitDirection::Left) => try_dock(&self.left_dock),
-            (Origin::BottomDock, SplitDirection::Right) => try_dock(&self.right_dock),
-
-            (Origin::RightDock, SplitDirection::Left) => {
-                if let Some(last_active_pane) = get_last_active_pane() {
-                    Some(Target::Pane(last_active_pane))
-                } else {
-                    try_dock(&self.bottom_dock).or_else(|| try_dock(&self.left_dock))
-                }
-            }
-
-            _ => None,
-        };
-
-        match target {
-            Some(ActivateInDirectionTarget::Pane(pane)) => {
-                let pane = pane.read(cx);
-                if let Some(item) = pane.active_item() {
-                    item.item_focus_handle(cx).focus(window);
-                } else {
-                    log::error!(
-                        "Could not find a focus target when in switching focus in {direction} direction for a pane",
-                    );
-                }
-            }
-            Some(ActivateInDirectionTarget::Dock(dock)) => {
-                // Defer this to avoid a panic when the dock's active panel is already on the stack.
-                window.defer(cx, move |window, cx| {
-                    let dock = dock.read(cx);
-                    if let Some(panel) = dock.active_panel() {
-                        panel.panel_focus_handle(cx).focus(window);
-                    } else {
-                        log::error!("Could not find a focus target when in switching focus in {direction} direction for a {:?} dock", dock.position());
-                    }
-                })
-            }
-            None => {}
-        }
-    }
-
-    pub fn move_item_to_pane_in_direction(
-        &mut self,
-        action: &MoveItemToPaneInDirection,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let destination = match self.find_pane_in_direction(action.direction, cx) {
-            Some(destination) => destination,
-            None => {
-                if !action.clone && self.active_pane.read(cx).items_len() < 2 {
-                    return;
-                }
-                let new_pane = self.add_pane(window, cx);
-                if self
-                    .center
-                    .split(&self.active_pane, &new_pane, action.direction)
-                    .log_err()
-                    .is_none()
-                {
-                    return;
-                };
-                new_pane
-            }
-        };
-
-        if action.clone {
-            if self
-                .active_pane
-                .read(cx)
-                .active_item()
-                .is_some_and(|item| item.can_split(cx))
-            {
-                clone_active_item(
-                    self.database_id(),
-                    &self.active_pane,
-                    &destination,
-                    action.focus,
-                    window,
-                    cx,
-                );
-                return;
-            }
-        }
-        move_active_item(
-            &self.active_pane,
-            &destination,
-            action.focus,
-            true,
-            window,
-            cx,
-        );
-    }
-
-    pub fn bounding_box_for_pane(&self, pane: &Entity<Pane>) -> Option<Bounds<Pixels>> {
-        self.center.bounding_box_for_pane(pane)
-    }
-
-    pub fn find_pane_in_direction(
-        &mut self,
-        direction: SplitDirection,
-        cx: &App,
-    ) -> Option<Entity<Pane>> {
-        self.center
-            .find_pane_in_direction(&self.active_pane, direction, cx)
-            .cloned()
-    }
-
-    pub fn swap_pane_in_direction(&mut self, direction: SplitDirection, cx: &mut Context<Self>) {
-        if let Some(to) = self.find_pane_in_direction(direction, cx) {
-            self.center.swap(&self.active_pane, &to);
-            cx.notify();
-        }
-    }
-
-    pub fn move_pane_to_border(&mut self, direction: SplitDirection, cx: &mut Context<Self>) {
-        if self
-            .center
-            .move_to_border(&self.active_pane, direction)
-            .unwrap()
-        {
-            cx.notify();
-        }
-    }
-
-    pub fn resize_pane(
-        &mut self,
-        axis: gpui::Axis,
-        amount: Pixels,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let docks = self.all_docks();
-        let active_dock = docks
-            .into_iter()
-            .find(|dock| dock.focus_handle(cx).contains_focused(window, cx));
-
-        if let Some(dock) = active_dock {
-            let Some(panel_size) = dock.read(cx).active_panel_size(window, cx) else {
-                return;
-            };
-            match dock.read(cx).position() {
-                DockPosition::Left => self.resize_left_dock(panel_size + amount, window, cx),
-                DockPosition::Bottom => self.resize_bottom_dock(panel_size + amount, window, cx),
-                DockPosition::Right => self.resize_right_dock(panel_size + amount, window, cx),
-            }
-        } else {
-            self.center
-                .resize(&self.active_pane, axis, amount, &self.bounds);
-        }
-        cx.notify();
-    }
-
-    pub fn reset_pane_sizes(&mut self, cx: &mut Context<Self>) {
-        self.center.reset_pane_sizes();
-        cx.notify();
-    }
-
-    fn handle_pane_focused(
-        &mut self,
-        pane: Entity<Pane>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        // This is explicitly hoisted out of the following check for pane identity as
-        // terminal panel panes are not registered as a center panes.
-        self.status_bar.update(cx, |status_bar, cx| {
-            status_bar.set_active_pane(&pane, window, cx);
-        });
-        if self.active_pane != pane {
-            self.set_active_pane(&pane, window, cx);
-        }
-
-        if self.last_active_center_pane.is_none() {
-            self.last_active_center_pane = Some(pane.downgrade());
-        }
-
-        self.dismiss_zoomed_items_to_reveal(None, window, cx);
-        if pane.read(cx).is_zoomed() {
-            self.zoomed = Some(pane.downgrade().into());
-        } else {
-            self.zoomed = None;
-        }
-        self.zoomed_position = None;
-        cx.emit(Event::ZoomChanged);
-        self.update_active_view_for_followers(window, cx);
-        pane.update(cx, |pane, _| {
-            pane.track_alternate_file_items();
-        });
-
-        cx.notify();
-    }
-
-    fn set_active_pane(
-        &mut self,
-        pane: &Entity<Pane>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.active_pane = pane.clone();
-        self.active_item_path_changed(window, cx);
-        self.last_active_center_pane = Some(pane.downgrade());
-    }
-
-    fn handle_panel_focused(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.update_active_view_for_followers(window, cx);
-    }
-
-    fn handle_pane_event(
-        &mut self,
-        pane: &Entity<Pane>,
-        event: &pane::Event,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let mut serialize_workspace = true;
-        match event {
-            pane::Event::AddItem { item } => {
-                item.added_to_pane(self, pane.clone(), window, cx);
-                cx.emit(Event::ItemAdded {
-                    item: item.boxed_clone(),
-                });
-            }
-            pane::Event::Split {
-                direction,
-                clone_active_item,
-            } => {
-                if *clone_active_item {
-                    self.split_and_clone(pane.clone(), *direction, window, cx)
-                        .detach();
-                } else {
-                    self.split_and_move(pane.clone(), *direction, window, cx);
-                }
-            }
-            pane::Event::JoinIntoNext => {
-                self.join_pane_into_next(pane.clone(), window, cx);
-            }
-            pane::Event::JoinAll => {
-                self.join_all_panes(window, cx);
-            }
-            pane::Event::Remove { focus_on_pane } => {
-                self.remove_pane(pane.clone(), focus_on_pane.clone(), window, cx);
-            }
-            pane::Event::ActivateItem {
-                local,
-                focus_changed,
-            } => {
-                window.invalidate_character_coordinates();
-
-                pane.update(cx, |pane, _| {
-                    pane.track_alternate_file_items();
-                });
-                if *local {
-                    self.unfollow_in_pane(pane, window, cx);
-                }
-                serialize_workspace = *focus_changed || pane != self.active_pane();
-                if pane == self.active_pane() {
-                    self.active_item_path_changed(window, cx);
-                    self.update_active_view_for_followers(window, cx);
-                } else if *local {
-                    self.set_active_pane(pane, window, cx);
-                }
-            }
-            pane::Event::UserSavedItem { item, save_intent } => {
-                cx.emit(Event::UserSavedItem {
-                    pane: pane.downgrade(),
-                    item: item.boxed_clone(),
-                    save_intent: *save_intent,
-                });
-                serialize_workspace = false;
-            }
-            pane::Event::ChangeItemTitle => {
-                if *pane == self.active_pane {
-                    self.active_item_path_changed(window, cx);
-                }
-                serialize_workspace = false;
-            }
-            pane::Event::RemovedItem { item } => {
-                cx.emit(Event::ActiveItemChanged);
-                self.update_window_edited(window, cx);
-                if let hash_map::Entry::Occupied(entry) = self.panes_by_item.entry(item.item_id())
-                    && entry.get().entity_id() == pane.entity_id()
-                {
-                    entry.remove();
-                }
-                cx.emit(Event::ItemRemoved {
-                    item_id: item.item_id(),
-                });
-            }
-            pane::Event::Focus => {
-                window.invalidate_character_coordinates();
-                self.handle_pane_focused(pane.clone(), window, cx);
-            }
-            pane::Event::ZoomIn => {
-                if *pane == self.active_pane {
-                    pane.update(cx, |pane, cx| pane.set_zoomed(true, cx));
-                    if pane.read(cx).has_focus(window, cx) {
-                        self.zoomed = Some(pane.downgrade().into());
-                        self.zoomed_position = None;
-                        cx.emit(Event::ZoomChanged);
-                    }
-                    cx.notify();
-                }
-            }
-            pane::Event::ZoomOut => {
-                pane.update(cx, |pane, cx| pane.set_zoomed(false, cx));
-                if self.zoomed_position.is_none() {
-                    self.zoomed = None;
-                    cx.emit(Event::ZoomChanged);
-                }
-                cx.notify();
-            }
-            pane::Event::ItemPinned | pane::Event::ItemUnpinned => {}
-        }
-
-        if serialize_workspace {
-            self.serialize_workspace(window, cx);
-        }
-    }
-
-    pub fn unfollow_in_pane(
-        &mut self,
-        pane: &Entity<Pane>,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) -> Option<CollaboratorId> {
-        let leader_id = self.leader_for_pane(pane)?;
-        self.unfollow(leader_id, window, cx);
-        Some(leader_id)
-    }
-
-    pub fn split_pane(
-        &mut self,
-        pane_to_split: Entity<Pane>,
-        split_direction: SplitDirection,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Entity<Pane> {
-        let new_pane = self.add_pane(window, cx);
-        self.center
-            .split(&pane_to_split, &new_pane, split_direction)
-            .unwrap();
-        cx.notify();
-        new_pane
-    }
-
-    pub fn split_and_move(
-        &mut self,
-        pane: Entity<Pane>,
-        direction: SplitDirection,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(item) = pane.update(cx, |pane, cx| pane.take_active_item(window, cx)) else {
-            return;
-        };
-        let new_pane = self.add_pane(window, cx);
-        new_pane.update(cx, |pane, cx| {
-            pane.add_item(item, true, true, None, window, cx)
-        });
-        self.center.split(&pane, &new_pane, direction).unwrap();
-        cx.notify();
-    }
-
-    pub fn split_and_clone(
-        &mut self,
-        pane: Entity<Pane>,
-        direction: SplitDirection,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Option<Entity<Pane>>> {
-        let Some(item) = pane.read(cx).active_item() else {
-            return Task::ready(None);
-        };
-        if !item.can_split(cx) {
-            return Task::ready(None);
-        }
-        let task = item.clone_on_split(self.database_id(), window, cx);
-        cx.spawn_in(window, async move |this, cx| {
-            if let Some(clone) = task.await {
-                this.update_in(cx, |this, window, cx| {
-                    let new_pane = this.add_pane(window, cx);
-                    new_pane.update(cx, |pane, cx| {
-                        pane.add_item(clone, true, true, None, window, cx)
-                    });
-                    this.center.split(&pane, &new_pane, direction).unwrap();
-                    cx.notify();
-                    new_pane
-                })
-                .ok()
-            } else {
-                None
-            }
-        })
-    }
-
-    pub fn join_all_panes(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let active_item = self.active_pane.read(cx).active_item();
-        for pane in &self.panes {
-            join_pane_into_active(&self.active_pane, pane, window, cx);
-        }
-        if let Some(active_item) = active_item {
-            self.activate_item(active_item.as_ref(), true, true, window, cx);
-        }
-        cx.notify();
-    }
-
-    pub fn join_pane_into_next(
-        &mut self,
-        pane: Entity<Pane>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let next_pane = self
-            .find_pane_in_direction(SplitDirection::Right, cx)
-            .or_else(|| self.find_pane_in_direction(SplitDirection::Down, cx))
-            .or_else(|| self.find_pane_in_direction(SplitDirection::Left, cx))
-            .or_else(|| self.find_pane_in_direction(SplitDirection::Up, cx));
-        let Some(next_pane) = next_pane else {
-            return;
-        };
-        move_all_items(&pane, &next_pane, window, cx);
-        cx.notify();
-    }
-
-    fn remove_pane(
-        &mut self,
-        pane: Entity<Pane>,
-        focus_on: Option<Entity<Pane>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.center.remove(&pane).unwrap() {
-            self.force_remove_pane(&pane, &focus_on, window, cx);
-            self.unfollow_in_pane(&pane, window, cx);
-            self.last_leaders_by_pane.remove(&pane.downgrade());
-            for removed_item in pane.read(cx).items() {
-                self.panes_by_item.remove(&removed_item.item_id());
-            }
-
-            cx.notify();
-        } else {
-            self.active_item_path_changed(window, cx);
-        }
-        cx.emit(Event::PaneRemoved);
-    }
-
-    pub fn panes_mut(&mut self) -> &mut [Entity<Pane>] {
-        &mut self.panes
-    }
-
-    pub fn panes(&self) -> &[Entity<Pane>] {
-        &self.panes
-    }
-
-    pub fn active_pane(&self) -> &Entity<Pane> {
-        &self.active_pane
-    }
-
-    pub fn focused_pane(&self, window: &Window, cx: &App) -> Entity<Pane> {
-        for dock in self.all_docks() {
-            if dock.focus_handle(cx).contains_focused(window, cx)
-                && let Some(pane) = dock
-                    .read(cx)
-                    .active_panel()
-                    .and_then(|panel| panel.pane(cx))
-            {
-                return pane;
-            }
-        }
-        self.active_pane().clone()
-    }
-
-    pub fn adjacent_pane(&mut self, window: &mut Window, cx: &mut Context<Self>) -> Entity<Pane> {
-        self.find_pane_in_direction(SplitDirection::Right, cx)
-            .unwrap_or_else(|| {
-                self.split_pane(self.active_pane.clone(), SplitDirection::Right, window, cx)
-            })
-    }
-
-    pub fn pane_for(&self, handle: &dyn ItemHandle) -> Option<Entity<Pane>> {
-        let weak_pane = self.panes_by_item.get(&handle.item_id())?;
-        weak_pane.upgrade()
-    }
-
-    fn collaborator_left(&mut self, peer_id: PeerId, window: &mut Window, cx: &mut Context<Self>) {
-        self.follower_states.retain(|leader_id, state| {
-            if *leader_id == CollaboratorId::PeerId(peer_id) {
-                for item in state.items_by_leader_view_id.values() {
-                    item.view.set_leader_id(None, window, cx);
-                }
-                false
-            } else {
-                true
-            }
-        });
-        cx.notify();
-    }
-
-    pub fn start_following(
-        &mut self,
-        leader_id: impl Into<CollaboratorId>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Task<Result<()>>> {
-        let leader_id = leader_id.into();
-        let pane = self.active_pane().clone();
-
-        self.last_leaders_by_pane
-            .insert(pane.downgrade(), leader_id);
-        self.unfollow(leader_id, window, cx);
-        self.unfollow_in_pane(&pane, window, cx);
-        self.follower_states.insert(
-            leader_id,
-            FollowerState {
-                center_pane: pane.clone(),
-                dock_pane: None,
-                active_view_id: None,
-                items_by_leader_view_id: Default::default(),
-            },
-        );
-        cx.notify();
-
-        match leader_id {
-            CollaboratorId::PeerId(leader_peer_id) => {
-                let room_id = self.active_call()?.read(cx).room()?.read(cx).id();
-                let project_id = self.project.read(cx).remote_id();
-                let request = self.app_state.client.request(proto::Follow {
-                    room_id,
-                    project_id,
-                    leader_id: Some(leader_peer_id),
-                });
-
-                Some(cx.spawn_in(window, async move |this, cx| {
-                    let response = request.await?;
-                    this.update(cx, |this, _| {
-                        let state = this
-                            .follower_states
-                            .get_mut(&leader_id)
-                            .context("following interrupted")?;
-                        state.active_view_id = response
-                            .active_view
-                            .as_ref()
-                            .and_then(|view| ViewId::from_proto(view.id.clone()?).ok());
-                        anyhow::Ok(())
-                    })??;
-                    if let Some(view) = response.active_view {
-                        Self::add_view_from_leader(this.clone(), leader_peer_id, &view, cx).await?;
-                    }
-                    this.update_in(cx, |this, window, cx| {
-                        this.leader_updated(leader_id, window, cx)
-                    })?;
-                    Ok(())
-                }))
-            }
-            CollaboratorId::Agent => {
-                self.leader_updated(leader_id, window, cx)?;
-                Some(Task::ready(Ok(())))
-            }
-        }
-    }
-
-    pub fn follow_next_collaborator(
-        &mut self,
-        _: &FollowNextCollaborator,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let collaborators = self.project.read(cx).collaborators();
-        let next_leader_id = if let Some(leader_id) = self.leader_for_pane(&self.active_pane) {
-            let mut collaborators = collaborators.keys().copied();
-            for peer_id in collaborators.by_ref() {
-                if CollaboratorId::PeerId(peer_id) == leader_id {
-                    break;
-                }
-            }
-            collaborators.next().map(CollaboratorId::PeerId)
-        } else if let Some(last_leader_id) =
-            self.last_leaders_by_pane.get(&self.active_pane.downgrade())
-        {
-            match last_leader_id {
-                CollaboratorId::PeerId(peer_id) => {
-                    if collaborators.contains_key(peer_id) {
-                        Some(*last_leader_id)
-                    } else {
-                        None
-                    }
-                }
-                CollaboratorId::Agent => Some(CollaboratorId::Agent),
-            }
-        } else {
-            None
-        };
-
-        let pane = self.active_pane.clone();
-        let Some(leader_id) = next_leader_id.or_else(|| {
-            Some(CollaboratorId::PeerId(
-                collaborators.keys().copied().next()?,
-            ))
-        }) else {
-            return;
-        };
-        if self.unfollow_in_pane(&pane, window, cx) == Some(leader_id) {
-            return;
-        }
-        if let Some(task) = self.start_following(leader_id, window, cx) {
-            task.detach_and_log_err(cx)
-        }
-    }
-
-    pub fn follow(
-        &mut self,
-        leader_id: impl Into<CollaboratorId>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let leader_id = leader_id.into();
-
-        if let CollaboratorId::PeerId(peer_id) = leader_id {
-            let Some(room) = ActiveCall::global(cx).read(cx).room() else {
-                return;
-            };
-            let room = room.read(cx);
-            let Some(remote_participant) = room.remote_participant_for_peer_id(peer_id) else {
-                return;
-            };
-
-            let project = self.project.read(cx);
-
-            let other_project_id = match remote_participant.location {
-                call::ParticipantLocation::External => None,
-                call::ParticipantLocation::UnsharedProject => None,
-                call::ParticipantLocation::SharedProject { project_id } => {
-                    if Some(project_id) == project.remote_id() {
-                        None
-                    } else {
-                        Some(project_id)
-                    }
-                }
-            };
-
-            // if they are active in another project, follow there.
-            if let Some(project_id) = other_project_id {
-                let app_state = self.app_state.clone();
-                crate::join_in_room_project(project_id, remote_participant.user.id, app_state, cx)
-                    .detach_and_log_err(cx);
-            }
-        }
-
-        // if you're already following, find the right pane and focus it.
-        if let Some(follower_state) = self.follower_states.get(&leader_id) {
-            window.focus(&follower_state.pane().focus_handle(cx));
-
-            return;
-        }
-
-        // Otherwise, follow.
-        if let Some(task) = self.start_following(leader_id, window, cx) {
-            task.detach_and_log_err(cx)
-        }
-    }
-
-    pub fn unfollow(
-        &mut self,
-        leader_id: impl Into<CollaboratorId>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<()> {
-        cx.notify();
-
-        let leader_id = leader_id.into();
-        let state = self.follower_states.remove(&leader_id)?;
-        for (_, item) in state.items_by_leader_view_id {
-            item.view.set_leader_id(None, window, cx);
-        }
-
-        if let CollaboratorId::PeerId(leader_peer_id) = leader_id {
-            let project_id = self.project.read(cx).remote_id();
-            let room_id = self.active_call()?.read(cx).room()?.read(cx).id();
-            self.app_state
-                .client
-                .send(proto::Unfollow {
-                    room_id,
-                    project_id,
-                    leader_id: Some(leader_peer_id),
-                })
-                .log_err();
-        }
-
-        Some(())
-    }
-
-    pub fn is_being_followed(&self, id: impl Into<CollaboratorId>) -> bool {
-        self.follower_states.contains_key(&id.into())
-    }
-
-    fn active_item_path_changed(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        cx.emit(Event::ActiveItemChanged);
-        let active_entry = self.active_project_path(cx);
-        self.project.update(cx, |project, cx| {
-            project.set_active_path(active_entry.clone(), cx)
-        });
-
-        if let Some(project_path) = &active_entry {
-            let git_store_entity = self.project.read(cx).git_store().clone();
-            git_store_entity.update(cx, |git_store, cx| {
-                git_store.set_active_repo_for_path(project_path, cx);
-            });
-        }
-
-        self.update_window_title(window, cx);
-    }
-
-    fn update_window_title(&mut self, window: &mut Window, cx: &mut App) {
-        let project = self.project().read(cx);
-        let mut title = String::new();
-
-        for (i, worktree) in project.visible_worktrees(cx).enumerate() {
-            let name = {
-                let settings_location = SettingsLocation {
-                    worktree_id: worktree.read(cx).id(),
-                    path: RelPath::empty(),
-                };
-
-                let settings = WorktreeSettings::get(Some(settings_location), cx);
-                match &settings.project_name {
-                    Some(name) => name.as_str(),
-                    None => worktree.read(cx).root_name_str(),
-                }
-            };
-            if i > 0 {
-                title.push_str(", ");
-            }
-            title.push_str(name);
-        }
-
-        if title.is_empty() {
-            title = "empty project".to_string();
-        }
-
-        if let Some(path) = self.active_item(cx).and_then(|item| item.project_path(cx)) {
-            let filename = path.path.file_name().or_else(|| {
-                Some(
-                    project
-                        .worktree_for_id(path.worktree_id, cx)?
-                        .read(cx)
-                        .root_name_str(),
-                )
-            });
-
-            if let Some(filename) = filename {
-                title.push_str(" — ");
-                title.push_str(filename.as_ref());
-            }
-        }
-
-        if project.is_via_collab() {
-            title.push_str(" ↙");
-        } else if project.is_shared() {
-            title.push_str(" ↗");
-        }
-
-        if let Some(last_title) = self.last_window_title.as_ref()
-            && &title == last_title
-        {
-            return;
-        }
-        window.set_window_title(&title);
-        SystemWindowTabController::update_tab_title(
-            cx,
-            window.window_handle().window_id(),
-            SharedString::from(&title),
-        );
-        self.last_window_title = Some(title);
-    }
-
-    fn update_window_edited(&mut self, window: &mut Window, cx: &mut App) {
-        let is_edited = !self.project.read(cx).is_disconnected(cx) && !self.dirty_items.is_empty();
-        if is_edited != self.window_edited {
-            self.window_edited = is_edited;
-            window.set_window_edited(self.window_edited)
-        }
-    }
-
-    fn update_item_dirty_state(
-        &mut self,
-        item: &dyn ItemHandle,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        let is_dirty = item.is_dirty(cx);
-        let item_id = item.item_id();
-        let was_dirty = self.dirty_items.contains_key(&item_id);
-        if is_dirty == was_dirty {
-            return;
-        }
-        if was_dirty {
-            self.dirty_items.remove(&item_id);
-            self.update_window_edited(window, cx);
-            return;
-        }
-        if let Some(window_handle) = window.window_handle().downcast::<Self>() {
-            let s = item.on_release(
-                cx,
-                Box::new(move |cx| {
-                    window_handle
-                        .update(cx, |this, window, cx| {
-                            this.dirty_items.remove(&item_id);
-                            this.update_window_edited(window, cx)
-                        })
-                        .ok();
-                }),
-            );
-            self.dirty_items.insert(item_id, s);
-            self.update_window_edited(window, cx);
-        }
-    }
-
-    fn render_notifications(&self, _window: &mut Window, _cx: &mut Context<Self>) -> Option<Div> {
-        if self.notifications.is_empty() {
-            None
-        } else {
-            Some(
-                div()
-                    .absolute()
-                    .right_3()
-                    .bottom_3()
-                    .w_112()
-                    .h_full()
-                    .flex()
-                    .flex_col()
-                    .justify_end()
-                    .gap_2()
-                    .children(
-                        self.notifications
-                            .iter()
-                            .map(|(_, notification)| notification.clone().into_any()),
-                    ),
-            )
-        }
-    }
-
-    // RPC handlers
-
-    fn active_view_for_follower(
-        &self,
-        follower_project_id: Option<u64>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<proto::View> {
-        let (item, panel_id) = self.active_item_for_followers(window, cx);
-        let item = item?;
-        let leader_id = self
-            .pane_for(&*item)
-            .and_then(|pane| self.leader_for_pane(&pane));
-        let leader_peer_id = match leader_id {
-            Some(CollaboratorId::PeerId(peer_id)) => Some(peer_id),
-            Some(CollaboratorId::Agent) | None => None,
-        };
-
-        let item_handle = item.to_followable_item_handle(cx)?;
-        let id = item_handle.remote_id(&self.app_state.client, window, cx)?;
-        let variant = item_handle.to_state_proto(window, cx)?;
-
-        if item_handle.is_project_item(window, cx)
-            && (follower_project_id.is_none()
-                || follower_project_id != self.project.read(cx).remote_id())
-        {
-            return None;
-        }
-
-        Some(proto::View {
-            id: id.to_proto(),
-            leader_id: leader_peer_id,
-            variant: Some(variant),
-            panel_id: panel_id.map(|id| id as i32),
-        })
-    }
-
-    fn handle_follow(
-        &mut self,
-        follower_project_id: Option<u64>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> proto::FollowResponse {
-        let active_view = self.active_view_for_follower(follower_project_id, window, cx);
-
-        cx.notify();
-        proto::FollowResponse {
-            // TODO: Remove after version 0.145.x stabilizes.
-            active_view_id: active_view.as_ref().and_then(|view| view.id.clone()),
-            views: active_view.iter().cloned().collect(),
-            active_view,
-        }
-    }
-
-    fn handle_update_followers(
-        &mut self,
-        leader_id: PeerId,
-        message: proto::UpdateFollowers,
-        _window: &mut Window,
-        _cx: &mut Context<Self>,
-    ) {
-        self.leader_updates_tx
-            .unbounded_send((leader_id, message))
-            .ok();
-    }
-
-    async fn process_leader_update(
-        this: &WeakEntity<Self>,
-        leader_id: PeerId,
-        update: proto::UpdateFollowers,
-        cx: &mut AsyncWindowContext,
-    ) -> Result<()> {
-        match update.variant.context("invalid update")? {
-            proto::update_followers::Variant::CreateView(view) => {
-                let view_id = ViewId::from_proto(view.id.clone().context("invalid view id")?)?;
-                let should_add_view = this.update(cx, |this, _| {
-                    if let Some(state) = this.follower_states.get_mut(&leader_id.into()) {
-                        anyhow::Ok(!state.items_by_leader_view_id.contains_key(&view_id))
-                    } else {
-                        anyhow::Ok(false)
-                    }
-                })??;
-
-                if should_add_view {
-                    Self::add_view_from_leader(this.clone(), leader_id, &view, cx).await?
-                }
-            }
-            proto::update_followers::Variant::UpdateActiveView(update_active_view) => {
-                let should_add_view = this.update(cx, |this, _| {
-                    if let Some(state) = this.follower_states.get_mut(&leader_id.into()) {
-                        state.active_view_id = update_active_view
-                            .view
-                            .as_ref()
-                            .and_then(|view| ViewId::from_proto(view.id.clone()?).ok());
-
-                        if state.active_view_id.is_some_and(|view_id| {
-                            !state.items_by_leader_view_id.contains_key(&view_id)
-                        }) {
-                            anyhow::Ok(true)
-                        } else {
-                            anyhow::Ok(false)
-                        }
-                    } else {
-                        anyhow::Ok(false)
-                    }
-                })??;
-
-                if should_add_view && let Some(view) = update_active_view.view {
-                    Self::add_view_from_leader(this.clone(), leader_id, &view, cx).await?
-                }
-            }
-            proto::update_followers::Variant::UpdateView(update_view) => {
-                let variant = update_view.variant.context("missing update view variant")?;
-                let id = update_view.id.context("missing update view id")?;
-                let mut tasks = Vec::new();
-                this.update_in(cx, |this, window, cx| {
-                    let project = this.project.clone();
-                    if let Some(state) = this.follower_states.get(&leader_id.into()) {
-                        let view_id = ViewId::from_proto(id.clone())?;
-                        if let Some(item) = state.items_by_leader_view_id.get(&view_id) {
-                            tasks.push(item.view.apply_update_proto(
-                                &project,
-                                variant.clone(),
-                                window,
-                                cx,
-                            ));
-                        }
-                    }
-                    anyhow::Ok(())
-                })??;
-                try_join_all(tasks).await.log_err();
-            }
-        }
-        this.update_in(cx, |this, window, cx| {
-            this.leader_updated(leader_id, window, cx)
-        })?;
-        Ok(())
-    }
-
-    async fn add_view_from_leader(
-        this: WeakEntity<Self>,
-        leader_id: PeerId,
-        view: &proto::View,
-        cx: &mut AsyncWindowContext,
-    ) -> Result<()> {
-        let this = this.upgrade().context("workspace dropped")?;
-
-        let Some(id) = view.id.clone() else {
-            anyhow::bail!("no id for view");
-        };
-        let id = ViewId::from_proto(id)?;
-        let panel_id = view.panel_id.and_then(proto::PanelId::from_i32);
-
-        let pane = this.update(cx, |this, _cx| {
-            let state = this
-                .follower_states
-                .get(&leader_id.into())
-                .context("stopped following")?;
-            anyhow::Ok(state.pane().clone())
-        })??;
-        let existing_item = pane.update_in(cx, |pane, window, cx| {
-            let client = this.read(cx).client().clone();
-            pane.items().find_map(|item| {
-                let item = item.to_followable_item_handle(cx)?;
-                if item.remote_id(&client, window, cx) == Some(id) {
-                    Some(item)
-                } else {
-                    None
-                }
-            })
-        })?;
-        let item = if let Some(existing_item) = existing_item {
-            existing_item
-        } else {
-            let variant = view.variant.clone();
-            anyhow::ensure!(variant.is_some(), "missing view variant");
-
-            let task = cx.update(|window, cx| {
-                FollowableViewRegistry::from_state_proto(this.clone(), id, variant, window, cx)
-            })?;
-
-            let Some(task) = task else {
-                anyhow::bail!(
-                    "failed to construct view from leader (maybe from a different version of zed?)"
-                );
-            };
-
-            let mut new_item = task.await?;
-            pane.update_in(cx, |pane, window, cx| {
-                let mut item_to_remove = None;
-                for (ix, item) in pane.items().enumerate() {
-                    if let Some(item) = item.to_followable_item_handle(cx) {
-                        match new_item.dedup(item.as_ref(), window, cx) {
-                            Some(item::Dedup::KeepExisting) => {
-                                new_item =
-                                    item.boxed_clone().to_followable_item_handle(cx).unwrap();
-                                break;
-                            }
-                            Some(item::Dedup::ReplaceExisting) => {
-                                item_to_remove = Some((ix, item.item_id()));
-                                break;
-                            }
-                            None => {}
-                        }
-                    }
-                }
-
-                if let Some((ix, id)) = item_to_remove {
-                    pane.remove_item(id, false, false, window, cx);
-                    pane.add_item(new_item.boxed_clone(), false, false, Some(ix), window, cx);
-                }
-            })?;
-
-            new_item
-        };
-
-        this.update_in(cx, |this, window, cx| {
-            let state = this.follower_states.get_mut(&leader_id.into())?;
-            item.set_leader_id(Some(leader_id.into()), window, cx);
-            state.items_by_leader_view_id.insert(
-                id,
-                FollowerView {
-                    view: item,
-                    location: panel_id,
-                },
-            );
-
-            Some(())
-        })?;
-
-        Ok(())
-    }
-
-    fn handle_agent_location_changed(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let Some(follower_state) = self.follower_states.get_mut(&CollaboratorId::Agent) else {
-            return;
-        };
-
-        if let Some(agent_location) = self.project.read(cx).agent_location() {
-            let buffer_entity_id = agent_location.buffer.entity_id();
-            let view_id = ViewId {
-                creator: CollaboratorId::Agent,
-                id: buffer_entity_id.as_u64(),
-            };
-            follower_state.active_view_id = Some(view_id);
-
-            let item = match follower_state.items_by_leader_view_id.entry(view_id) {
-                hash_map::Entry::Occupied(entry) => Some(entry.into_mut()),
-                hash_map::Entry::Vacant(entry) => {
-                    let existing_view =
-                        follower_state
-                            .center_pane
-                            .read(cx)
-                            .items()
-                            .find_map(|item| {
-                                let item = item.to_followable_item_handle(cx)?;
-                                if item.buffer_kind(cx) == ItemBufferKind::Singleton
-                                    && item.project_item_model_ids(cx).as_slice()
-                                        == [buffer_entity_id]
-                                {
-                                    Some(item)
-                                } else {
-                                    None
-                                }
-                            });
-                    let view = existing_view.or_else(|| {
-                        agent_location.buffer.upgrade().and_then(|buffer| {
-                            cx.update_default_global(|registry: &mut ProjectItemRegistry, cx| {
-                                registry.build_item(buffer, self.project.clone(), None, window, cx)
-                            })?
-                            .to_followable_item_handle(cx)
-                        })
-                    });
-
-                    view.map(|view| {
-                        entry.insert(FollowerView {
-                            view,
-                            location: None,
-                        })
-                    })
-                }
-            };
-
-            if let Some(item) = item {
-                item.view
-                    .set_leader_id(Some(CollaboratorId::Agent), window, cx);
-                item.view
-                    .update_agent_location(agent_location.position, window, cx);
-            }
-        } else {
-            follower_state.active_view_id = None;
-        }
-
-        self.leader_updated(CollaboratorId::Agent, window, cx);
-    }
-
-    pub fn update_active_view_for_followers(&mut self, window: &mut Window, cx: &mut App) {
-        let mut is_project_item = true;
-        let mut update = proto::UpdateActiveView::default();
-        if window.is_window_active() {
-            let (active_item, panel_id) = self.active_item_for_followers(window, cx);
-
-            if let Some(item) = active_item
-                && item.item_focus_handle(cx).contains_focused(window, cx)
-            {
-                let leader_id = self
-                    .pane_for(&*item)
-                    .and_then(|pane| self.leader_for_pane(&pane));
-                let leader_peer_id = match leader_id {
-                    Some(CollaboratorId::PeerId(peer_id)) => Some(peer_id),
-                    Some(CollaboratorId::Agent) | None => None,
-                };
-
-                if let Some(item) = item.to_followable_item_handle(cx) {
-                    let id = item
-                        .remote_id(&self.app_state.client, window, cx)
-                        .map(|id| id.to_proto());
-
-                    if let Some(id) = id
-                        && let Some(variant) = item.to_state_proto(window, cx)
-                    {
-                        let view = Some(proto::View {
-                            id: id.clone(),
-                            leader_id: leader_peer_id,
-                            variant: Some(variant),
-                            panel_id: panel_id.map(|id| id as i32),
-                        });
-
-                        is_project_item = item.is_project_item(window, cx);
-                        update = proto::UpdateActiveView {
-                            view,
-                            // TODO: Remove after version 0.145.x stabilizes.
-                            id,
-                            leader_id: leader_peer_id,
-                        };
-                    };
-                }
-            }
-        }
-
-        let active_view_id = update.view.as_ref().and_then(|view| view.id.as_ref());
-        if active_view_id != self.last_active_view_id.as_ref() {
-            self.last_active_view_id = active_view_id.cloned();
-            self.update_followers(
-                is_project_item,
-                proto::update_followers::Variant::UpdateActiveView(update),
-                window,
-                cx,
-            );
-        }
-    }
-
-    fn active_item_for_followers(
-        &self,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> (Option<Box<dyn ItemHandle>>, Option<proto::PanelId>) {
-        let mut active_item = None;
-        let mut panel_id = None;
-        for dock in self.all_docks() {
-            if dock.focus_handle(cx).contains_focused(window, cx)
-                && let Some(panel) = dock.read(cx).active_panel()
-                && let Some(pane) = panel.pane(cx)
-                && let Some(item) = pane.read(cx).active_item()
-            {
-                active_item = Some(item);
-                panel_id = panel.remote_id();
-                break;
-            }
-        }
-
-        if active_item.is_none() {
-            active_item = self.active_pane().read(cx).active_item();
-        }
-        (active_item, panel_id)
-    }
-
-    fn update_followers(
-        &self,
-        project_only: bool,
-        update: proto::update_followers::Variant,
-        _: &mut Window,
-        cx: &mut App,
-    ) -> Option<()> {
-        // If this update only applies to for followers in the current project,
-        // then skip it unless this project is shared. If it applies to all
-        // followers, regardless of project, then set `project_id` to none,
-        // indicating that it goes to all followers.
-        let project_id = if project_only {
-            Some(self.project.read(cx).remote_id()?)
-        } else {
-            None
-        };
-        self.app_state().workspace_store.update(cx, |store, cx| {
-            store.update_followers(project_id, update, cx)
-        })
-    }
-
-    pub fn leader_for_pane(&self, pane: &Entity<Pane>) -> Option<CollaboratorId> {
-        self.follower_states.iter().find_map(|(leader_id, state)| {
-            if state.center_pane == *pane || state.dock_pane.as_ref() == Some(pane) {
-                Some(*leader_id)
-            } else {
-                None
-            }
-        })
-    }
-
-    fn leader_updated(
-        &mut self,
-        leader_id: impl Into<CollaboratorId>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Box<dyn ItemHandle>> {
-        cx.notify();
-
-        let leader_id = leader_id.into();
-        let (panel_id, item) = match leader_id {
-            CollaboratorId::PeerId(peer_id) => self.active_item_for_peer(peer_id, window, cx)?,
-            CollaboratorId::Agent => (None, self.active_item_for_agent()?),
-        };
-
-        let state = self.follower_states.get(&leader_id)?;
-        let mut transfer_focus = state.center_pane.read(cx).has_focus(window, cx);
-        let pane;
-        if let Some(panel_id) = panel_id {
-            pane = self
-                .activate_panel_for_proto_id(panel_id, window, cx)?
-                .pane(cx)?;
-            let state = self.follower_states.get_mut(&leader_id)?;
-            state.dock_pane = Some(pane.clone());
-        } else {
-            pane = state.center_pane.clone();
-            let state = self.follower_states.get_mut(&leader_id)?;
-            if let Some(dock_pane) = state.dock_pane.take() {
-                transfer_focus |= dock_pane.focus_handle(cx).contains_focused(window, cx);
-            }
-        }
-
-        pane.update(cx, |pane, cx| {
-            let focus_active_item = pane.has_focus(window, cx) || transfer_focus;
-            if let Some(index) = pane.index_for_item(item.as_ref()) {
-                pane.activate_item(index, false, false, window, cx);
-            } else {
-                pane.add_item(item.boxed_clone(), false, false, None, window, cx)
-            }
-
-            if focus_active_item {
-                pane.focus_active_item(window, cx)
-            }
-        });
-
-        Some(item)
-    }
-
-    fn active_item_for_agent(&self) -> Option<Box<dyn ItemHandle>> {
-        let state = self.follower_states.get(&CollaboratorId::Agent)?;
-        let active_view_id = state.active_view_id?;
-        Some(
-            state
-                .items_by_leader_view_id
-                .get(&active_view_id)?
-                .view
-                .boxed_clone(),
-        )
-    }
-
-    fn active_item_for_peer(
-        &self,
-        peer_id: PeerId,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<(Option<PanelId>, Box<dyn ItemHandle>)> {
-        let call = self.active_call()?;
-        let room = call.read(cx).room()?.read(cx);
-        let participant = room.remote_participant_for_peer_id(peer_id)?;
-        let leader_in_this_app;
-        let leader_in_this_project;
-        match participant.location {
-            call::ParticipantLocation::SharedProject { project_id } => {
-                leader_in_this_app = true;
-                leader_in_this_project = Some(project_id) == self.project.read(cx).remote_id();
-            }
-            call::ParticipantLocation::UnsharedProject => {
-                leader_in_this_app = true;
-                leader_in_this_project = false;
-            }
-            call::ParticipantLocation::External => {
-                leader_in_this_app = false;
-                leader_in_this_project = false;
-            }
-        };
-        let state = self.follower_states.get(&peer_id.into())?;
-        let mut item_to_activate = None;
-        if let (Some(active_view_id), true) = (state.active_view_id, leader_in_this_app) {
-            if let Some(item) = state.items_by_leader_view_id.get(&active_view_id)
-                && (leader_in_this_project || !item.view.is_project_item(window, cx))
-            {
-                item_to_activate = Some((item.location, item.view.boxed_clone()));
-            }
-        } else if let Some(shared_screen) =
-            self.shared_screen_for_peer(peer_id, &state.center_pane, window, cx)
-        {
-            item_to_activate = Some((None, Box::new(shared_screen)));
-        }
-        item_to_activate
-    }
-
-    fn shared_screen_for_peer(
-        &self,
-        peer_id: PeerId,
-        pane: &Entity<Pane>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<Entity<SharedScreen>> {
-        let call = self.active_call()?;
-        let room = call.read(cx).room()?.clone();
-        let participant = room.read(cx).remote_participant_for_peer_id(peer_id)?;
-        let track = participant.video_tracks.values().next()?.clone();
-        let user = participant.user.clone();
-
-        for item in pane.read(cx).items_of_type::<SharedScreen>() {
-            if item.read(cx).peer_id == peer_id {
-                return Some(item);
-            }
-        }
-
-        Some(cx.new(|cx| SharedScreen::new(track, peer_id, user.clone(), room.clone(), window, cx)))
-    }
-
-    pub fn on_window_activation_changed(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if window.is_window_active() {
-            self.update_active_view_for_followers(window, cx);
-
-            if let Some(database_id) = self.database_id {
-                cx.background_spawn(persistence::DB.update_timestamp(database_id))
-                    .detach();
-            }
-        } else {
-            for pane in &self.panes {
-                pane.update(cx, |pane, cx| {
-                    if let Some(item) = pane.active_item() {
-                        item.workspace_deactivated(window, cx);
-                    }
-                    for item in pane.items() {
-                        if matches!(
-                            item.workspace_settings(cx).autosave,
-                            AutosaveSetting::OnWindowChange | AutosaveSetting::OnFocusChange
-                        ) {
-                            Pane::autosave_item(item.as_ref(), self.project.clone(), window, cx)
-                                .detach_and_log_err(cx);
-                        }
-                    }
-                });
-            }
-        }
-    }
-
-    pub fn active_call(&self) -> Option<&Entity<ActiveCall>> {
-        self.active_call.as_ref().map(|(call, _)| call)
-    }
-
-    fn on_active_call_event(
-        &mut self,
-        _: &Entity<ActiveCall>,
-        event: &call::room::Event,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            call::room::Event::ParticipantLocationChanged { participant_id }
-            | call::room::Event::RemoteVideoTracksChanged { participant_id } => {
-                self.leader_updated(participant_id, window, cx);
-            }
-            _ => {}
-        }
-    }
-
-    pub fn database_id(&self) -> Option<WorkspaceId> {
-        self.database_id
-    }
-
-    pub fn session_id(&self) -> Option<String> {
-        self.session_id.clone()
-    }
-
-    pub fn root_paths(&self, cx: &App) -> Vec<Arc<Path>> {
-        let project = self.project().read(cx);
-        project
-            .visible_worktrees(cx)
-            .map(|worktree| worktree.read(cx).abs_path())
-            .collect::<Vec<_>>()
-    }
-
-    fn remove_panes(&mut self, member: Member, window: &mut Window, cx: &mut Context<Workspace>) {
-        match member {
-            Member::Axis(PaneAxis { members, .. }) => {
-                for child in members.iter() {
-                    self.remove_panes(child.clone(), window, cx)
-                }
-            }
-            Member::Pane(pane) => {
-                self.force_remove_pane(&pane, &None, window, cx);
-            }
-        }
-    }
-
-    fn remove_from_session(&mut self, window: &mut Window, cx: &mut App) -> Task<()> {
-        self.session_id.take();
-        self.serialize_workspace_internal(window, cx)
-    }
-
-    fn force_remove_pane(
-        &mut self,
-        pane: &Entity<Pane>,
-        focus_on: &Option<Entity<Pane>>,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) {
-        self.panes.retain(|p| p != pane);
-        if let Some(focus_on) = focus_on {
-            focus_on.update(cx, |pane, cx| window.focus(&pane.focus_handle(cx)));
-        } else if self.active_pane() == pane {
-            self.panes
-                .last()
-                .unwrap()
-                .update(cx, |pane, cx| window.focus(&pane.focus_handle(cx)));
-        }
-        if self.last_active_center_pane == Some(pane.downgrade()) {
-            self.last_active_center_pane = None;
-        }
-        cx.notify();
-    }
-
-    fn serialize_workspace(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if self._schedule_serialize_workspace.is_none() {
-            self._schedule_serialize_workspace =
-                Some(cx.spawn_in(window, async move |this, cx| {
-                    cx.background_executor()
-                        .timer(SERIALIZATION_THROTTLE_TIME)
-                        .await;
-                    this.update_in(cx, |this, window, cx| {
-                        this.serialize_workspace_internal(window, cx).detach();
-                        this._schedule_serialize_workspace.take();
-                    })
-                    .log_err();
-                }));
-        }
-    }
-
-    fn serialize_workspace_internal(&self, window: &mut Window, cx: &mut App) -> Task<()> {
-        let Some(database_id) = self.database_id() else {
-            return Task::ready(());
-        };
-
-        fn serialize_pane_handle(
-            pane_handle: &Entity<Pane>,
-            window: &mut Window,
-            cx: &mut App,
-        ) -> SerializedPane {
-            let (items, active, pinned_count) = {
-                let pane = pane_handle.read(cx);
-                let active_item_id = pane.active_item().map(|item| item.item_id());
-                (
-                    pane.items()
-                        .filter_map(|handle| {
-                            let handle = handle.to_serializable_item_handle(cx)?;
-
-                            Some(SerializedItem {
-                                kind: Arc::from(handle.serialized_item_kind()),
-                                item_id: handle.item_id().as_u64(),
-                                active: Some(handle.item_id()) == active_item_id,
-                                preview: pane.is_active_preview_item(handle.item_id()),
-                            })
-                        })
-                        .collect::<Vec<_>>(),
-                    pane.has_focus(window, cx),
-                    pane.pinned_count(),
-                )
-            };
-
-            SerializedPane::new(items, active, pinned_count)
-        }
-
-        fn build_serialized_pane_group(
-            pane_group: &Member,
-            window: &mut Window,
-            cx: &mut App,
-        ) -> SerializedPaneGroup {
-            match pane_group {
-                Member::Axis(PaneAxis {
-                    axis,
-                    members,
-                    flexes,
-                    bounding_boxes: _,
-                }) => SerializedPaneGroup::Group {
-                    axis: SerializedAxis(*axis),
-                    children: members
-                        .iter()
-                        .map(|member| build_serialized_pane_group(member, window, cx))
-                        .collect::<Vec<_>>(),
-                    flexes: Some(flexes.lock().clone()),
-                },
-                Member::Pane(pane_handle) => {
-                    SerializedPaneGroup::Pane(serialize_pane_handle(pane_handle, window, cx))
-                }
-            }
-        }
-
-        fn build_serialized_docks(
-            this: &Workspace,
-            window: &mut Window,
-            cx: &mut App,
-        ) -> DockStructure {
-            let left_dock = this.left_dock.read(cx);
-            let left_visible = left_dock.is_open();
-            let left_active_panel = left_dock
-                .active_panel()
-                .map(|panel| panel.persistent_name().to_string());
-            let left_dock_zoom = left_dock
-                .active_panel()
-                .map(|panel| panel.is_zoomed(window, cx))
-                .unwrap_or(false);
-
-            let right_dock = this.right_dock.read(cx);
-            let right_visible = right_dock.is_open();
-            let right_active_panel = right_dock
-                .active_panel()
-                .map(|panel| panel.persistent_name().to_string());
-            let right_dock_zoom = right_dock
-                .active_panel()
-                .map(|panel| panel.is_zoomed(window, cx))
-                .unwrap_or(false);
-
-            let bottom_dock = this.bottom_dock.read(cx);
-            let bottom_visible = bottom_dock.is_open();
-            let bottom_active_panel = bottom_dock
-                .active_panel()
-                .map(|panel| panel.persistent_name().to_string());
-            let bottom_dock_zoom = bottom_dock
-                .active_panel()
-                .map(|panel| panel.is_zoomed(window, cx))
-                .unwrap_or(false);
-
-            DockStructure {
-                left: DockData {
-                    visible: left_visible,
-                    active_panel: left_active_panel,
-                    zoom: left_dock_zoom,
-                },
-                right: DockData {
-                    visible: right_visible,
-                    active_panel: right_active_panel,
-                    zoom: right_dock_zoom,
-                },
-                bottom: DockData {
-                    visible: bottom_visible,
-                    active_panel: bottom_active_panel,
-                    zoom: bottom_dock_zoom,
-                },
-            }
-        }
-
-        match self.serialize_workspace_location(cx) {
-            WorkspaceLocation::Location(location, paths) => {
-                let breakpoints = self.project.update(cx, |project, cx| {
-                    project
-                        .breakpoint_store()
-                        .read(cx)
-                        .all_source_breakpoints(cx)
-                });
-                let user_toolchains = self
-                    .project
-                    .read(cx)
-                    .user_toolchains(cx)
-                    .unwrap_or_default();
-
-                let center_group = build_serialized_pane_group(&self.center.root, window, cx);
-                let docks = build_serialized_docks(self, window, cx);
-                let window_bounds = Some(SerializedWindowBounds(window.window_bounds()));
-
-                let serialized_workspace = SerializedWorkspace {
-                    id: database_id,
-                    location,
-                    paths,
-                    center_group,
-                    window_bounds,
-                    display: Default::default(),
-                    docks,
-                    centered_layout: self.centered_layout,
-                    session_id: self.session_id.clone(),
-                    breakpoints,
-                    window_id: Some(window.window_handle().window_id().as_u64()),
-                    user_toolchains,
-                };
-
-                window.spawn(cx, async move |_| {
-                    persistence::DB.save_workspace(serialized_workspace).await;
-                })
-            }
-            WorkspaceLocation::DetachFromSession => window.spawn(cx, async move |_| {
-                persistence::DB
-                    .set_session_id(database_id, None)
-                    .await
-                    .log_err();
-            }),
-            WorkspaceLocation::None => Task::ready(()),
-        }
-    }
-
-    fn serialize_workspace_location(&self, cx: &App) -> WorkspaceLocation {
-        let paths = PathList::new(&self.root_paths(cx));
-        if let Some(connection) = self.project.read(cx).remote_connection_options(cx) {
-            WorkspaceLocation::Location(SerializedWorkspaceLocation::Remote(connection), paths)
-        } else if self.project.read(cx).is_local() {
-            if !paths.is_empty() {
-                WorkspaceLocation::Location(SerializedWorkspaceLocation::Local, paths)
-            } else {
-                WorkspaceLocation::DetachFromSession
-            }
-        } else {
-            WorkspaceLocation::None
-        }
-    }
-
-    fn update_history(&self, cx: &mut App) {
-        let Some(id) = self.database_id() else {
-            return;
-        };
-        if !self.project.read(cx).is_local() {
-            return;
-        }
-        if let Some(manager) = HistoryManager::global(cx) {
-            let paths = PathList::new(&self.root_paths(cx));
-            manager.update(cx, |this, cx| {
-                this.update_history(id, HistoryManagerEntry::new(id, &paths), cx);
-            });
-        }
-    }
-
-    async fn serialize_items(
-        this: &WeakEntity<Self>,
-        items_rx: UnboundedReceiver<Box<dyn SerializableItemHandle>>,
-        cx: &mut AsyncWindowContext,
-    ) -> Result<()> {
-        const CHUNK_SIZE: usize = 200;
-
-        let mut serializable_items = items_rx.ready_chunks(CHUNK_SIZE);
-
-        while let Some(items_received) = serializable_items.next().await {
-            let unique_items =
-                items_received
-                    .into_iter()
-                    .fold(HashMap::default(), |mut acc, item| {
-                        acc.entry(item.item_id()).or_insert(item);
-                        acc
-                    });
-
-            // We use into_iter() here so that the references to the items are moved into
-            // the tasks and not kept alive while we're sleeping.
-            for (_, item) in unique_items.into_iter() {
-                if let Ok(Some(task)) = this.update_in(cx, |workspace, window, cx| {
-                    item.serialize(workspace, false, window, cx)
-                }) {
-                    cx.background_spawn(async move { task.await.log_err() })
-                        .detach();
-                }
-            }
-
-            cx.background_executor()
-                .timer(SERIALIZATION_THROTTLE_TIME)
-                .await;
-        }
-
-        Ok(())
-    }
-
-    pub(crate) fn enqueue_item_serialization(
-        &mut self,
-        item: Box<dyn SerializableItemHandle>,
-    ) -> Result<()> {
-        self.serializable_items_tx
-            .unbounded_send(item)
-            .map_err(|err| anyhow!("failed to send serializable item over channel: {err}"))
-    }
-
-    pub(crate) fn load_workspace(
-        serialized_workspace: SerializedWorkspace,
-        paths_to_open: Vec<Option<ProjectPath>>,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) -> Task<Result<Vec<Option<Box<dyn ItemHandle>>>>> {
-        cx.spawn_in(window, async move |workspace, cx| {
-            let project = workspace.read_with(cx, |workspace, _| workspace.project().clone())?;
-
-            let mut center_group = None;
-            let mut center_items = None;
-
-            // Traverse the splits tree and add to things
-            if let Some((group, active_pane, items)) = serialized_workspace
-                .center_group
-                .deserialize(&project, serialized_workspace.id, workspace.clone(), cx)
-                .await
-            {
-                center_items = Some(items);
-                center_group = Some((group, active_pane))
-            }
-
-            let mut items_by_project_path = HashMap::default();
-            let mut item_ids_by_kind = HashMap::default();
-            let mut all_deserialized_items = Vec::default();
-            cx.update(|_, cx| {
-                for item in center_items.unwrap_or_default().into_iter().flatten() {
-                    if let Some(serializable_item_handle) = item.to_serializable_item_handle(cx) {
-                        item_ids_by_kind
-                            .entry(serializable_item_handle.serialized_item_kind())
-                            .or_insert(Vec::new())
-                            .push(item.item_id().as_u64() as ItemId);
-                    }
-
-                    if let Some(project_path) = item.project_path(cx) {
-                        items_by_project_path.insert(project_path, item.clone());
-                    }
-                    all_deserialized_items.push(item);
-                }
-            })?;
-
-            let opened_items = paths_to_open
-                .into_iter()
-                .map(|path_to_open| {
-                    path_to_open
-                        .and_then(|path_to_open| items_by_project_path.remove(&path_to_open))
-                })
-                .collect::<Vec<_>>();
-
-            // Remove old panes from workspace panes list
-            workspace.update_in(cx, |workspace, window, cx| {
-                if let Some((center_group, active_pane)) = center_group {
-                    workspace.remove_panes(workspace.center.root.clone(), window, cx);
-
-                    // Swap workspace center group
-                    workspace.center = PaneGroup::with_root(center_group);
-                    if let Some(active_pane) = active_pane {
-                        workspace.set_active_pane(&active_pane, window, cx);
-                        cx.focus_self(window);
-                    } else {
-                        workspace.set_active_pane(&workspace.center.first_pane(), window, cx);
-                    }
-                }
-
-                let docks = serialized_workspace.docks;
-
-                for (dock, serialized_dock) in [
-                    (&mut workspace.right_dock, docks.right),
-                    (&mut workspace.left_dock, docks.left),
-                    (&mut workspace.bottom_dock, docks.bottom),
-                ]
-                .iter_mut()
-                {
-                    dock.update(cx, |dock, cx| {
-                        dock.serialized_dock = Some(serialized_dock.clone());
-                        dock.restore_state(window, cx);
-                    });
-                }
-
-                cx.notify();
-            })?;
-
-            let _ = project
-                .update(cx, |project, cx| {
-                    project
-                        .breakpoint_store()
-                        .update(cx, |breakpoint_store, cx| {
-                            breakpoint_store
-                                .with_serialized_breakpoints(serialized_workspace.breakpoints, cx)
-                        })
-                })?
-                .await;
-
-            // Clean up all the items that have _not_ been loaded. Our ItemIds aren't stable. That means
-            // after loading the items, we might have different items and in order to avoid
-            // the database filling up, we delete items that haven't been loaded now.
-            //
-            // The items that have been loaded, have been saved after they've been added to the workspace.
-            let clean_up_tasks = workspace.update_in(cx, |_, window, cx| {
-                item_ids_by_kind
-                    .into_iter()
-                    .map(|(item_kind, loaded_items)| {
-                        SerializableItemRegistry::cleanup(
-                            item_kind,
-                            serialized_workspace.id,
-                            loaded_items,
-                            window,
-                            cx,
-                        )
-                        .log_err()
-                    })
-                    .collect::<Vec<_>>()
-            })?;
-
-            futures::future::join_all(clean_up_tasks).await;
-
-            workspace
-                .update_in(cx, |workspace, window, cx| {
-                    // Serialize ourself to make sure our timestamps and any pane / item changes are replicated
-                    workspace.serialize_workspace_internal(window, cx).detach();
-
-                    // Ensure that we mark the window as edited if we did load dirty items
-                    workspace.update_window_edited(window, cx);
-                })
-                .ok();
-
-            Ok(opened_items)
-        })
-    }
-
-    fn actions(&self, div: Div, window: &mut Window, cx: &mut Context<Self>) -> Div {
-        self.add_workspace_actions_listeners(div, window, cx)
-            .on_action(cx.listener(
-                |_workspace, action_sequence: &settings::ActionSequence, window, cx| {
-                    for action in &action_sequence.0 {
-                        window.dispatch_action(action.boxed_clone(), cx);
-                    }
-                },
-            ))
-            .on_action(cx.listener(Self::close_inactive_items_and_panes))
-            .on_action(cx.listener(Self::close_all_items_and_panes))
-            .on_action(cx.listener(Self::save_all))
-            .on_action(cx.listener(Self::send_keystrokes))
-            .on_action(cx.listener(Self::add_folder_to_project))
-            .on_action(cx.listener(Self::follow_next_collaborator))
-            .on_action(cx.listener(Self::close_window))
-            .on_action(cx.listener(Self::activate_pane_at_index))
-            .on_action(cx.listener(Self::move_item_to_pane_at_index))
-            .on_action(cx.listener(Self::move_focused_panel_to_next_position))
-            .on_action(cx.listener(Self::toggle_edit_predictions_all_files))
-            .on_action(cx.listener(|workspace, _: &Unfollow, window, cx| {
-                let pane = workspace.active_pane().clone();
-                workspace.unfollow_in_pane(&pane, window, cx);
-            }))
-            .on_action(cx.listener(|workspace, action: &Save, window, cx| {
-                workspace
-                    .save_active_item(action.save_intent.unwrap_or(SaveIntent::Save), window, cx)
-                    .detach_and_prompt_err("Failed to save", window, cx, |_, _, _| None);
-            }))
-            .on_action(cx.listener(|workspace, _: &SaveWithoutFormat, window, cx| {
-                workspace
-                    .save_active_item(SaveIntent::SaveWithoutFormat, window, cx)
-                    .detach_and_prompt_err("Failed to save", window, cx, |_, _, _| None);
-            }))
-            .on_action(cx.listener(|workspace, _: &SaveAs, window, cx| {
-                workspace
-                    .save_active_item(SaveIntent::SaveAs, window, cx)
-                    .detach_and_prompt_err("Failed to save", window, cx, |_, _, _| None);
-            }))
-            .on_action(
-                cx.listener(|workspace, _: &ActivatePreviousPane, window, cx| {
-                    workspace.activate_previous_pane(window, cx)
-                }),
-            )
-            .on_action(cx.listener(|workspace, _: &ActivateNextPane, window, cx| {
-                workspace.activate_next_pane(window, cx)
-            }))
-            .on_action(
-                cx.listener(|workspace, _: &ActivateNextWindow, _window, cx| {
-                    workspace.activate_next_window(cx)
-                }),
-            )
-            .on_action(
-                cx.listener(|workspace, _: &ActivatePreviousWindow, _window, cx| {
-                    workspace.activate_previous_window(cx)
-                }),
-            )
-            .on_action(cx.listener(|workspace, _: &ActivatePaneLeft, window, cx| {
-                workspace.activate_pane_in_direction(SplitDirection::Left, window, cx)
-            }))
-            .on_action(cx.listener(|workspace, _: &ActivatePaneRight, window, cx| {
-                workspace.activate_pane_in_direction(SplitDirection::Right, window, cx)
-            }))
-            .on_action(cx.listener(|workspace, _: &ActivatePaneUp, window, cx| {
-                workspace.activate_pane_in_direction(SplitDirection::Up, window, cx)
-            }))
-            .on_action(cx.listener(|workspace, _: &ActivatePaneDown, window, cx| {
-                workspace.activate_pane_in_direction(SplitDirection::Down, window, cx)
-            }))
-            .on_action(cx.listener(|workspace, _: &ActivateNextPane, window, cx| {
-                workspace.activate_next_pane(window, cx)
-            }))
-            .on_action(cx.listener(
-                |workspace, action: &MoveItemToPaneInDirection, window, cx| {
-                    workspace.move_item_to_pane_in_direction(action, window, cx)
-                },
-            ))
-            .on_action(cx.listener(|workspace, _: &SwapPaneLeft, _, cx| {
-                workspace.swap_pane_in_direction(SplitDirection::Left, cx)
-            }))
-            .on_action(cx.listener(|workspace, _: &SwapPaneRight, _, cx| {
-                workspace.swap_pane_in_direction(SplitDirection::Right, cx)
-            }))
-            .on_action(cx.listener(|workspace, _: &SwapPaneUp, _, cx| {
-                workspace.swap_pane_in_direction(SplitDirection::Up, cx)
-            }))
-            .on_action(cx.listener(|workspace, _: &SwapPaneDown, _, cx| {
-                workspace.swap_pane_in_direction(SplitDirection::Down, cx)
-            }))
-            .on_action(cx.listener(|workspace, _: &SwapPaneAdjacent, window, cx| {
-                const DIRECTION_PRIORITY: [SplitDirection; 4] = [
-                    SplitDirection::Down,
-                    SplitDirection::Up,
-                    SplitDirection::Right,
-                    SplitDirection::Left,
-                ];
-                for dir in DIRECTION_PRIORITY {
-                    if workspace.find_pane_in_direction(dir, cx).is_some() {
-                        workspace.swap_pane_in_direction(dir, cx);
-                        workspace.activate_pane_in_direction(dir.opposite(), window, cx);
-                        break;
-                    }
-                }
-            }))
-            .on_action(cx.listener(|workspace, _: &MovePaneLeft, _, cx| {
-                workspace.move_pane_to_border(SplitDirection::Left, cx)
-            }))
-            .on_action(cx.listener(|workspace, _: &MovePaneRight, _, cx| {
-                workspace.move_pane_to_border(SplitDirection::Right, cx)
-            }))
-            .on_action(cx.listener(|workspace, _: &MovePaneUp, _, cx| {
-                workspace.move_pane_to_border(SplitDirection::Up, cx)
-            }))
-            .on_action(cx.listener(|workspace, _: &MovePaneDown, _, cx| {
-                workspace.move_pane_to_border(SplitDirection::Down, cx)
-            }))
-            .on_action(cx.listener(|this, _: &ToggleLeftDock, window, cx| {
-                this.toggle_dock(DockPosition::Left, window, cx);
-            }))
-            .on_action(cx.listener(
-                |workspace: &mut Workspace, _: &ToggleRightDock, window, cx| {
-                    workspace.toggle_dock(DockPosition::Right, window, cx);
-                },
-            ))
-            .on_action(cx.listener(
-                |workspace: &mut Workspace, _: &ToggleBottomDock, window, cx| {
-                    workspace.toggle_dock(DockPosition::Bottom, window, cx);
-                },
-            ))
-            .on_action(cx.listener(
-                |workspace: &mut Workspace, _: &CloseActiveDock, window, cx| {
-                    if !workspace.close_active_dock(window, cx) {
-                        cx.propagate();
-                    }
-                },
-            ))
-            .on_action(
-                cx.listener(|workspace: &mut Workspace, _: &CloseAllDocks, window, cx| {
-                    workspace.close_all_docks(window, cx);
-                }),
-            )
-            .on_action(cx.listener(Self::toggle_all_docks))
-            .on_action(cx.listener(
-                |workspace: &mut Workspace, _: &ClearAllNotifications, _, cx| {
-                    workspace.clear_all_notifications(cx);
-                },
-            ))
-            .on_action(cx.listener(
-                |workspace: &mut Workspace, _: &ClearNavigationHistory, window, cx| {
-                    workspace.clear_navigation_history(window, cx);
-                },
-            ))
-            .on_action(cx.listener(
-                |workspace: &mut Workspace, _: &SuppressNotification, _, cx| {
-                    if let Some((notification_id, _)) = workspace.notifications.pop() {
-                        workspace.suppress_notification(&notification_id, cx);
-                    }
-                },
-            ))
-            .on_action(cx.listener(
-                |workspace: &mut Workspace, _: &ReopenClosedItem, window, cx| {
-                    workspace.reopen_closed_item(window, cx).detach();
-                },
-            ))
-            .on_action(cx.listener(
-                |workspace: &mut Workspace, _: &ResetActiveDockSize, window, cx| {
-                    for dock in workspace.all_docks() {
-                        if dock.focus_handle(cx).contains_focused(window, cx) {
-                            let Some(panel) = dock.read(cx).active_panel() else {
-                                return;
-                            };
-
-                            // Set to `None`, then the size will fall back to the default.
-                            panel.clone().set_size(None, window, cx);
-
-                            return;
-                        }
-                    }
-                },
-            ))
-            .on_action(cx.listener(
-                |workspace: &mut Workspace, _: &ResetOpenDocksSize, window, cx| {
-                    for dock in workspace.all_docks() {
-                        if let Some(panel) = dock.read(cx).visible_panel() {
-                            // Set to `None`, then the size will fall back to the default.
-                            panel.clone().set_size(None, window, cx);
-                        }
-                    }
-                },
-            ))
-            .on_action(cx.listener(
-                |workspace: &mut Workspace, act: &IncreaseActiveDockSize, window, cx| {
-                    adjust_active_dock_size_by_px(
-                        px_with_ui_font_fallback(act.px, cx),
-                        workspace,
-                        window,
-                        cx,
-                    );
-                },
-            ))
-            .on_action(cx.listener(
-                |workspace: &mut Workspace, act: &DecreaseActiveDockSize, window, cx| {
-                    adjust_active_dock_size_by_px(
-                        px_with_ui_font_fallback(act.px, cx) * -1.,
-                        workspace,
-                        window,
-                        cx,
-                    );
-                },
-            ))
-            .on_action(cx.listener(
-                |workspace: &mut Workspace, act: &IncreaseOpenDocksSize, window, cx| {
-                    adjust_open_docks_size_by_px(
-                        px_with_ui_font_fallback(act.px, cx),
-                        workspace,
-                        window,
-                        cx,
-                    );
-                },
-            ))
-            .on_action(cx.listener(
-                |workspace: &mut Workspace, act: &DecreaseOpenDocksSize, window, cx| {
-                    adjust_open_docks_size_by_px(
-                        px_with_ui_font_fallback(act.px, cx) * -1.,
-                        workspace,
-                        window,
-                        cx,
-                    );
-                },
-            ))
-            .on_action(cx.listener(Workspace::toggle_centered_layout))
-            .on_action(cx.listener(
-                |workspace: &mut Workspace, _action: &pane::ActivateNextItem, window, cx| {
-                    if let Some(active_dock) = workspace.active_dock(window, cx) {
-                        let dock = active_dock.read(cx);
-                        if let Some(active_panel) = dock.active_panel() {
-                            if active_panel.pane(cx).is_none() {
-                                let mut recent_pane: Option<Entity<Pane>> = None;
-                                let mut recent_timestamp = 0;
-                                for pane_handle in workspace.panes() {
-                                    let pane = pane_handle.read(cx);
-                                    for entry in pane.activation_history() {
-                                        if entry.timestamp > recent_timestamp {
-                                            recent_timestamp = entry.timestamp;
-                                            recent_pane = Some(pane_handle.clone());
-                                        }
-                                    }
-                                }
-
-                                if let Some(pane) = recent_pane {
-                                    pane.update(cx, |pane, cx| {
-                                        let current_index = pane.active_item_index();
-                                        let items_len = pane.items_len();
-                                        if items_len > 0 {
-                                            let next_index = if current_index + 1 < items_len {
-                                                current_index + 1
-                                            } else {
-                                                0
-                                            };
-                                            pane.activate_item(
-                                                next_index, false, false, window, cx,
-                                            );
-                                        }
-                                    });
-                                    return;
-                                }
-                            }
-                        }
-                    }
-                    cx.propagate();
-                },
-            ))
-            .on_action(cx.listener(
-                |workspace: &mut Workspace, _action: &pane::ActivatePreviousItem, window, cx| {
-                    if let Some(active_dock) = workspace.active_dock(window, cx) {
-                        let dock = active_dock.read(cx);
-                        if let Some(active_panel) = dock.active_panel() {
-                            if active_panel.pane(cx).is_none() {
-                                let mut recent_pane: Option<Entity<Pane>> = None;
-                                let mut recent_timestamp = 0;
-                                for pane_handle in workspace.panes() {
-                                    let pane = pane_handle.read(cx);
-                                    for entry in pane.activation_history() {
-                                        if entry.timestamp > recent_timestamp {
-                                            recent_timestamp = entry.timestamp;
-                                            recent_pane = Some(pane_handle.clone());
-                                        }
-                                    }
-                                }
-
-                                if let Some(pane) = recent_pane {
-                                    pane.update(cx, |pane, cx| {
-                                        let current_index = pane.active_item_index();
-                                        let items_len = pane.items_len();
-                                        if items_len > 0 {
-                                            let prev_index = if current_index > 0 {
-                                                current_index - 1
-                                            } else {
-                                                items_len.saturating_sub(1)
-                                            };
-                                            pane.activate_item(
-                                                prev_index, false, false, window, cx,
-                                            );
-                                        }
-                                    });
-                                    return;
-                                }
-                            }
-                        }
-                    }
-                    cx.propagate();
-                },
-            ))
-            .on_action(cx.listener(Workspace::cancel))
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn set_random_database_id(&mut self) {
-        self.database_id = Some(WorkspaceId(Uuid::new_v4().as_u64_pair().0 as i64));
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn test_new(project: Entity<Project>, window: &mut Window, cx: &mut Context<Self>) -> Self {
-        use node_runtime::NodeRuntime;
-        use session::Session;
-
-        let client = project.read(cx).client();
-        let user_store = project.read(cx).user_store();
-        let workspace_store = cx.new(|cx| WorkspaceStore::new(client.clone(), cx));
-        let session = cx.new(|cx| AppSession::new(Session::test(), cx));
-        window.activate_window();
-        let app_state = Arc::new(AppState {
-            languages: project.read(cx).languages().clone(),
-            workspace_store,
-            client,
-            user_store,
-            fs: project.read(cx).fs().clone(),
-            build_window_options: |_, _| Default::default(),
-            node_runtime: NodeRuntime::unavailable(),
-            session,
-        });
-        let workspace = Self::new(Default::default(), project, app_state, window, cx);
-        workspace
-            .active_pane
-            .update(cx, |pane, cx| window.focus(&pane.focus_handle(cx)));
-        workspace
-    }
-
-    pub fn register_action<A: Action>(
-        &mut self,
-        callback: impl Fn(&mut Self, &A, &mut Window, &mut Context<Self>) + 'static,
-    ) -> &mut Self {
-        let callback = Arc::new(callback);
-
-        self.workspace_actions.push(Box::new(move |div, _, _, cx| {
-            let callback = callback.clone();
-            div.on_action(cx.listener(move |workspace, event, window, cx| {
-                (callback)(workspace, event, window, cx)
-            }))
-        }));
-        self
-    }
-    pub fn register_action_renderer(
-        &mut self,
-        callback: impl Fn(Div, &Workspace, &mut Window, &mut Context<Self>) -> Div + 'static,
-    ) -> &mut Self {
-        self.workspace_actions.push(Box::new(callback));
-        self
-    }
-
-    fn add_workspace_actions_listeners(
-        &self,
-        mut div: Div,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Div {
-        for action in self.workspace_actions.iter() {
-            div = (action)(div, self, window, cx)
-        }
-        div
-    }
-
-    pub fn has_active_modal(&self, _: &mut Window, cx: &mut App) -> bool {
-        self.modal_layer.read(cx).has_active_modal()
-    }
-
-    pub fn active_modal<V: ManagedView + 'static>(&self, cx: &App) -> Option<Entity<V>> {
-        self.modal_layer.read(cx).active_modal()
-    }
-
-    pub fn toggle_modal<V: ModalView, B>(&mut self, window: &mut Window, cx: &mut App, build: B)
-    where
-        B: FnOnce(&mut Window, &mut Context<V>) -> V,
-    {
-        self.modal_layer.update(cx, |modal_layer, cx| {
-            modal_layer.toggle_modal(window, cx, build)
-        })
-    }
-
-    pub fn hide_modal(&mut self, window: &mut Window, cx: &mut App) -> bool {
-        self.modal_layer
-            .update(cx, |modal_layer, cx| modal_layer.hide_modal(window, cx))
-    }
-
-    pub fn toggle_status_toast<V: ToastView>(&mut self, entity: Entity<V>, cx: &mut App) {
-        self.toast_layer
-            .update(cx, |toast_layer, cx| toast_layer.toggle_toast(cx, entity))
-    }
-
-    pub fn toggle_centered_layout(
-        &mut self,
-        _: &ToggleCenteredLayout,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.centered_layout = !self.centered_layout;
-        if let Some(database_id) = self.database_id() {
-            cx.background_spawn(DB.set_centered_layout(database_id, self.centered_layout))
-                .detach_and_log_err(cx);
-        }
-        cx.notify();
-    }
-
-    fn adjust_padding(padding: Option<f32>) -> f32 {
-        padding
-            .unwrap_or(CenteredPaddingSettings::default().0)
-            .clamp(
-                CenteredPaddingSettings::MIN_PADDING,
-                CenteredPaddingSettings::MAX_PADDING,
-            )
-    }
-
-    fn render_dock(
-        &self,
-        position: DockPosition,
-        dock: &Entity<Dock>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<Div> {
-        if self.zoomed_position == Some(position) {
-            return None;
-        }
-
-        let leader_border = dock.read(cx).active_panel().and_then(|panel| {
-            let pane = panel.pane(cx)?;
-            let follower_states = &self.follower_states;
-            leader_border_for_pane(follower_states, &pane, window, cx)
-        });
-
-        Some(
-            div()
-                .flex()
-                .flex_none()
-                .overflow_hidden()
-                .child(dock.clone())
-                .children(leader_border),
-        )
-    }
-
-    pub fn for_window(window: &mut Window, _: &mut App) -> Option<Entity<Workspace>> {
-        window.root().flatten()
-    }
-
-    pub fn zoomed_item(&self) -> Option<&AnyWeakView> {
-        self.zoomed.as_ref()
-    }
-
-    pub fn activate_next_window(&mut self, cx: &mut Context<Self>) {
-        let Some(current_window_id) = cx.active_window().map(|a| a.window_id()) else {
-            return;
-        };
-        let windows = cx.windows();
-        let next_window =
-            SystemWindowTabController::get_next_tab_group_window(cx, current_window_id).or_else(
-                || {
-                    windows
-                        .iter()
-                        .cycle()
-                        .skip_while(|window| window.window_id() != current_window_id)
-                        .nth(1)
-                },
-            );
-
-        if let Some(window) = next_window {
-            window
-                .update(cx, |_, window, _| window.activate_window())
-                .ok();
-        }
-    }
-
-    pub fn activate_previous_window(&mut self, cx: &mut Context<Self>) {
-        let Some(current_window_id) = cx.active_window().map(|a| a.window_id()) else {
-            return;
-        };
-        let windows = cx.windows();
-        let prev_window =
-            SystemWindowTabController::get_prev_tab_group_window(cx, current_window_id).or_else(
-                || {
-                    windows
-                        .iter()
-                        .rev()
-                        .cycle()
-                        .skip_while(|window| window.window_id() != current_window_id)
-                        .nth(1)
-                },
-            );
-
-        if let Some(window) = prev_window {
-            window
-                .update(cx, |_, window, _| window.activate_window())
-                .ok();
-        }
-    }
-
-    pub fn cancel(&mut self, _: &menu::Cancel, window: &mut Window, cx: &mut Context<Self>) {
-        if cx.stop_active_drag(window) {
-        } else if let Some((notification_id, _)) = self.notifications.pop() {
-            dismiss_app_notification(&notification_id, cx);
-        } else {
-            cx.propagate();
-        }
-    }
-
-    fn adjust_dock_size_by_px(
-        &mut self,
-        panel_size: Pixels,
-        dock_pos: DockPosition,
-        px: Pixels,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        match dock_pos {
-            DockPosition::Left => self.resize_left_dock(panel_size + px, window, cx),
-            DockPosition::Right => self.resize_right_dock(panel_size + px, window, cx),
-            DockPosition::Bottom => self.resize_bottom_dock(panel_size + px, window, cx),
-        }
-    }
-
-    fn resize_left_dock(&mut self, new_size: Pixels, window: &mut Window, cx: &mut App) {
-        let size = new_size.min(self.bounds.right() - RESIZE_HANDLE_SIZE);
-
-        self.left_dock.update(cx, |left_dock, cx| {
-            if WorkspaceSettings::get_global(cx)
-                .resize_all_panels_in_dock
-                .contains(&DockPosition::Left)
-            {
-                left_dock.resize_all_panels(Some(size), window, cx);
-            } else {
-                left_dock.resize_active_panel(Some(size), window, cx);
-            }
-        });
-    }
-
-    fn resize_right_dock(&mut self, new_size: Pixels, window: &mut Window, cx: &mut App) {
-        let mut size = new_size.max(self.bounds.left() - RESIZE_HANDLE_SIZE);
-        self.left_dock.read_with(cx, |left_dock, cx| {
-            let left_dock_size = left_dock
-                .active_panel_size(window, cx)
-                .unwrap_or(Pixels::ZERO);
-            if left_dock_size + size > self.bounds.right() {
-                size = self.bounds.right() - left_dock_size
-            }
-        });
-        self.right_dock.update(cx, |right_dock, cx| {
-            if WorkspaceSettings::get_global(cx)
-                .resize_all_panels_in_dock
-                .contains(&DockPosition::Right)
-            {
-                right_dock.resize_all_panels(Some(size), window, cx);
-            } else {
-                right_dock.resize_active_panel(Some(size), window, cx);
-            }
-        });
-    }
-
-    fn resize_bottom_dock(&mut self, new_size: Pixels, window: &mut Window, cx: &mut App) {
-        let size = new_size.min(self.bounds.bottom() - RESIZE_HANDLE_SIZE - self.bounds.top());
-        self.bottom_dock.update(cx, |bottom_dock, cx| {
-            if WorkspaceSettings::get_global(cx)
-                .resize_all_panels_in_dock
-                .contains(&DockPosition::Bottom)
-            {
-                bottom_dock.resize_all_panels(Some(size), window, cx);
-            } else {
-                bottom_dock.resize_active_panel(Some(size), window, cx);
-            }
-        });
-    }
-
-    fn toggle_edit_predictions_all_files(
-        &mut self,
-        _: &ToggleEditPrediction,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let fs = self.project().read(cx).fs().clone();
-        let show_edit_predictions = all_language_settings(None, cx).show_edit_predictions(None, cx);
-        update_settings_file(fs, cx, move |file, _| {
-            file.project.all_languages.defaults.show_edit_predictions = Some(!show_edit_predictions)
-        });
-    }
-}
-
-fn leader_border_for_pane(
-    follower_states: &HashMap<CollaboratorId, FollowerState>,
-    pane: &Entity<Pane>,
-    _: &Window,
-    cx: &App,
-) -> Option<Div> {
-    let (leader_id, _follower_state) = follower_states.iter().find_map(|(leader_id, state)| {
-        if state.pane() == pane {
-            Some((*leader_id, state))
-        } else {
-            None
-        }
-    })?;
-
-    let mut leader_color = match leader_id {
-        CollaboratorId::PeerId(leader_peer_id) => {
-            let room = ActiveCall::try_global(cx)?.read(cx).room()?.read(cx);
-            let leader = room.remote_participant_for_peer_id(leader_peer_id)?;
-
-            cx.theme()
-                .players()
-                .color_for_participant(leader.participant_index.0)
-                .cursor
-        }
-        CollaboratorId::Agent => cx.theme().players().agent().cursor,
-    };
-    leader_color.fade_out(0.3);
-    Some(
-        div()
-            .absolute()
-            .size_full()
-            .left_0()
-            .top_0()
-            .border_2()
-            .border_color(leader_color),
-    )
-}
-
-fn window_bounds_env_override() -> Option<Bounds<Pixels>> {
-    ZED_WINDOW_POSITION
-        .zip(*ZED_WINDOW_SIZE)
-        .map(|(position, size)| Bounds {
-            origin: position,
-            size,
-        })
-}
-
-fn open_items(
-    serialized_workspace: Option<SerializedWorkspace>,
-    mut project_paths_to_open: Vec<(PathBuf, Option<ProjectPath>)>,
-    window: &mut Window,
-    cx: &mut Context<Workspace>,
-) -> impl 'static + Future<Output = Result<Vec<Option<Result<Box<dyn ItemHandle>>>>>> + use<> {
-    let restored_items = serialized_workspace.map(|serialized_workspace| {
-        Workspace::load_workspace(
-            serialized_workspace,
-            project_paths_to_open
-                .iter()
-                .map(|(_, project_path)| project_path)
-                .cloned()
-                .collect(),
-            window,
-            cx,
-        )
-    });
-
-    cx.spawn_in(window, async move |workspace, cx| {
-        let mut opened_items = Vec::with_capacity(project_paths_to_open.len());
-
-        if let Some(restored_items) = restored_items {
-            let restored_items = restored_items.await?;
-
-            let restored_project_paths = restored_items
-                .iter()
-                .filter_map(|item| {
-                    cx.update(|_, cx| item.as_ref()?.project_path(cx))
-                        .ok()
-                        .flatten()
-                })
-                .collect::<HashSet<_>>();
-
-            for restored_item in restored_items {
-                opened_items.push(restored_item.map(Ok));
-            }
-
-            project_paths_to_open
-                .iter_mut()
-                .for_each(|(_, project_path)| {
-                    if let Some(project_path_to_open) = project_path
-                        && restored_project_paths.contains(project_path_to_open)
-                    {
-                        *project_path = None;
-                    }
-                });
-        } else {
-            for _ in 0..project_paths_to_open.len() {
-                opened_items.push(None);
-            }
-        }
-        assert!(opened_items.len() == project_paths_to_open.len());
-
-        let tasks =
-            project_paths_to_open
-                .into_iter()
-                .enumerate()
-                .map(|(ix, (abs_path, project_path))| {
-                    let workspace = workspace.clone();
-                    cx.spawn(async move |cx| {
-                        let file_project_path = project_path?;
-                        let abs_path_task = workspace.update(cx, |workspace, cx| {
-                            workspace.project().update(cx, |project, cx| {
-                                project.resolve_abs_path(abs_path.to_string_lossy().as_ref(), cx)
-                            })
-                        });
-
-                        // We only want to open file paths here. If one of the items
-                        // here is a directory, it was already opened further above
-                        // with a `find_or_create_worktree`.
-                        if let Ok(task) = abs_path_task
-                            && task.await.is_none_or(|p| p.is_file())
-                        {
-                            return Some((
-                                ix,
-                                workspace
-                                    .update_in(cx, |workspace, window, cx| {
-                                        workspace.open_path(
-                                            file_project_path,
-                                            None,
-                                            true,
-                                            window,
-                                            cx,
-                                        )
-                                    })
-                                    .log_err()?
-                                    .await,
-                            ));
-                        }
-                        None
-                    })
-                });
-
-        let tasks = tasks.collect::<Vec<_>>();
-
-        let tasks = futures::future::join_all(tasks);
-        for (ix, path_open_result) in tasks.await.into_iter().flatten() {
-            opened_items[ix] = Some(path_open_result);
-        }
-
-        Ok(opened_items)
-    })
-}
-
-enum ActivateInDirectionTarget {
-    Pane(Entity<Pane>),
-    Dock(Entity<Dock>),
-}
-
-fn notify_if_database_failed(workspace: WindowHandle<Workspace>, cx: &mut AsyncApp) {
-    workspace
-        .update(cx, |workspace, _, cx| {
-            if (*db::ALL_FILE_DB_FAILED).load(std::sync::atomic::Ordering::Acquire) {
-                struct DatabaseFailedNotification;
-
-                workspace.show_notification(
-                    NotificationId::unique::<DatabaseFailedNotification>(),
-                    cx,
-                    |cx| {
-                        cx.new(|cx| {
-                            MessageNotification::new("Failed to load the database file.", cx)
-                                .primary_message("File an Issue")
-                                .primary_icon(IconName::Plus)
-                                .primary_on_click(|window, cx| {
-                                    window.dispatch_action(Box::new(FileBugReport), cx)
-                                })
-                        })
-                    },
-                );
-            }
-        })
-        .log_err();
-}
-
-fn px_with_ui_font_fallback(val: u32, cx: &Context<Workspace>) -> Pixels {
-    if val == 0 {
-        ThemeSettings::get_global(cx).ui_font_size(cx)
-    } else {
-        px(val as f32)
-    }
-}
-
-fn adjust_active_dock_size_by_px(
-    px: Pixels,
-    workspace: &mut Workspace,
-    window: &mut Window,
-    cx: &mut Context<Workspace>,
-) {
-    let Some(active_dock) = workspace
-        .all_docks()
-        .into_iter()
-        .find(|dock| dock.focus_handle(cx).contains_focused(window, cx))
-    else {
-        return;
-    };
-    let dock = active_dock.read(cx);
-    let Some(panel_size) = dock.active_panel_size(window, cx) else {
-        return;
-    };
-    let dock_pos = dock.position();
-    workspace.adjust_dock_size_by_px(panel_size, dock_pos, px, window, cx);
-}
-
-fn adjust_open_docks_size_by_px(
-    px: Pixels,
-    workspace: &mut Workspace,
-    window: &mut Window,
-    cx: &mut Context<Workspace>,
-) {
-    let docks = workspace
-        .all_docks()
-        .into_iter()
-        .filter_map(|dock| {
-            if dock.read(cx).is_open() {
-                let dock = dock.read(cx);
-                let panel_size = dock.active_panel_size(window, cx)?;
-                let dock_pos = dock.position();
-                Some((panel_size, dock_pos, px))
-            } else {
-                None
-            }
-        })
-        .collect::<Vec<_>>();
-
-    docks
-        .into_iter()
-        .for_each(|(panel_size, dock_pos, offset)| {
-            workspace.adjust_dock_size_by_px(panel_size, dock_pos, offset, window, cx);
-        });
-}
-
-impl Focusable for Workspace {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        self.active_pane.focus_handle(cx)
-    }
-}
-
-#[derive(Clone)]
-struct DraggedDock(DockPosition);
-
-impl Render for DraggedDock {
-    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
-        gpui::Empty
-    }
-}
-
-impl Render for Workspace {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        static FIRST_PAINT: AtomicBool = AtomicBool::new(true);
-        if FIRST_PAINT.swap(false, std::sync::atomic::Ordering::Relaxed) {
-            log::info!("Rendered first frame");
-        }
-        let mut context = KeyContext::new_with_defaults();
-        context.add("Workspace");
-        context.set("keyboard_layout", cx.keyboard_layout().name().to_string());
-        if let Some(status) = self
-            .debugger_provider
-            .as_ref()
-            .and_then(|provider| provider.active_thread_state(cx))
-        {
-            match status {
-                ThreadStatus::Running | ThreadStatus::Stepping => {
-                    context.add("debugger_running");
-                }
-                ThreadStatus::Stopped => context.add("debugger_stopped"),
-                ThreadStatus::Exited | ThreadStatus::Ended => {}
-            }
-        }
-
-        if self.left_dock.read(cx).is_open() {
-            if let Some(active_panel) = self.left_dock.read(cx).active_panel() {
-                context.set("left_dock", active_panel.panel_key());
-            }
-        }
-
-        if self.right_dock.read(cx).is_open() {
-            if let Some(active_panel) = self.right_dock.read(cx).active_panel() {
-                context.set("right_dock", active_panel.panel_key());
-            }
-        }
-
-        if self.bottom_dock.read(cx).is_open() {
-            if let Some(active_panel) = self.bottom_dock.read(cx).active_panel() {
-                context.set("bottom_dock", active_panel.panel_key());
-            }
-        }
-
-        let centered_layout = self.centered_layout
-            && self.center.panes().len() == 1
-            && self.active_item(cx).is_some();
-        let render_padding = |size| {
-            (size > 0.0).then(|| {
-                div()
-                    .h_full()
-                    .w(relative(size))
-                    .bg(cx.theme().colors().editor_background)
-                    .border_color(cx.theme().colors().pane_group_border)
-            })
-        };
-        let paddings = if centered_layout {
-            let settings = WorkspaceSettings::get_global(cx).centered_layout;
-            (
-                render_padding(Self::adjust_padding(
-                    settings.left_padding.map(|padding| padding.0),
-                )),
-                render_padding(Self::adjust_padding(
-                    settings.right_padding.map(|padding| padding.0),
-                )),
-            )
-        } else {
-            (None, None)
-        };
-        let ui_font = theme::setup_ui_font(window, cx);
-
-        let theme = cx.theme().clone();
-        let colors = theme.colors();
-        let notification_entities = self
-            .notifications
-            .iter()
-            .map(|(_, notification)| notification.entity_id())
-            .collect::<Vec<_>>();
-        let bottom_dock_layout = WorkspaceSettings::get_global(cx).bottom_dock_layout;
-
-        client_side_decorations(
-            self.actions(div(), window, cx)
-                .key_context(context)
-                .relative()
-                .size_full()
-                .flex()
-                .flex_col()
-                .font(ui_font)
-                .gap_0()
-                .justify_start()
-                .items_start()
-                .text_color(colors.text)
-                .overflow_hidden()
-                .children(self.titlebar_item.clone())
-                .on_modifiers_changed(move |_, _, cx| {
-                    for &id in &notification_entities {
-                        cx.notify(id);
-                    }
-                })
-                .child(
-                    div()
-                        .size_full()
-                        .relative()
-                        .flex_1()
-                        .flex()
-                        .flex_col()
-                        .child(
-                            div()
-                                .id("workspace")
-                                .bg(colors.background)
-                                .relative()
-                                .flex_1()
-                                .w_full()
-                                .flex()
-                                .flex_col()
-                                .overflow_hidden()
-                                .border_t_1()
-                                .border_b_1()
-                                .border_color(colors.border)
-                                .child({
-                                    let this = cx.entity();
-                                    canvas(
-                                        move |bounds, window, cx| {
-                                            this.update(cx, |this, cx| {
-                                                let bounds_changed = this.bounds != bounds;
-                                                this.bounds = bounds;
-
-                                                if bounds_changed {
-                                                    this.left_dock.update(cx, |dock, cx| {
-                                                        dock.clamp_panel_size(
-                                                            bounds.size.width,
-                                                            window,
-                                                            cx,
-                                                        )
-                                                    });
-
-                                                    this.right_dock.update(cx, |dock, cx| {
-                                                        dock.clamp_panel_size(
-                                                            bounds.size.width,
-                                                            window,
-                                                            cx,
-                                                        )
-                                                    });
-
-                                                    this.bottom_dock.update(cx, |dock, cx| {
-                                                        dock.clamp_panel_size(
-                                                            bounds.size.height,
-                                                            window,
-                                                            cx,
-                                                        )
-                                                    });
-                                                }
-                                            })
-                                        },
-                                        |_, _, _, _| {},
-                                    )
-                                    .absolute()
-                                    .size_full()
-                                })
-                                .when(self.zoomed.is_none(), |this| {
-                                    this.on_drag_move(cx.listener(
-                                        move |workspace,
-                                              e: &DragMoveEvent<DraggedDock>,
-                                              window,
-                                              cx| {
-                                            if workspace.previous_dock_drag_coordinates
-                                                != Some(e.event.position)
-                                            {
-                                                workspace.previous_dock_drag_coordinates =
-                                                    Some(e.event.position);
-                                                match e.drag(cx).0 {
-                                                    DockPosition::Left => {
-                                                        workspace.resize_left_dock(
-                                                            e.event.position.x
-                                                                - workspace.bounds.left(),
-                                                            window,
-                                                            cx,
-                                                        );
-                                                    }
-                                                    DockPosition::Right => {
-                                                        workspace.resize_right_dock(
-                                                            workspace.bounds.right()
-                                                                - e.event.position.x,
-                                                            window,
-                                                            cx,
-                                                        );
-                                                    }
-                                                    DockPosition::Bottom => {
-                                                        workspace.resize_bottom_dock(
-                                                            workspace.bounds.bottom()
-                                                                - e.event.position.y,
-                                                            window,
-                                                            cx,
-                                                        );
-                                                    }
-                                                };
-                                                workspace.serialize_workspace(window, cx);
-                                            }
-                                        },
-                                    ))
-                                })
-                                .child({
-                                    match bottom_dock_layout {
-                                        BottomDockLayout::Full => div()
-                                            .flex()
-                                            .flex_col()
-                                            .h_full()
-                                            .child(
-                                                div()
-                                                    .flex()
-                                                    .flex_row()
-                                                    .flex_1()
-                                                    .overflow_hidden()
-                                                    .children(self.render_dock(
-                                                        DockPosition::Left,
-                                                        &self.left_dock,
-                                                        window,
-                                                        cx,
-                                                    ))
-                                                    .child(
-                                                        div()
-                                                            .flex()
-                                                            .flex_col()
-                                                            .flex_1()
-                                                            .overflow_hidden()
-                                                            .child(
-                                                                h_flex()
-                                                                    .flex_1()
-                                                                    .when_some(
-                                                                        paddings.0,
-                                                                        |this, p| {
-                                                                            this.child(
-                                                                                p.border_r_1(),
-                                                                            )
-                                                                        },
-                                                                    )
-                                                                    .child(self.center.render(
-                                                                        self.zoomed.as_ref(),
-                                                                        &PaneRenderContext {
-                                                                            follower_states:
-                                                                                &self.follower_states,
-                                                                            active_call: self.active_call(),
-                                                                            active_pane: &self.active_pane,
-                                                                            app_state: &self.app_state,
-                                                                            project: &self.project,
-                                                                            workspace: &self.weak_self,
-                                                                        },
-                                                                        window,
-                                                                        cx,
-                                                                    ))
-                                                                    .when_some(
-                                                                        paddings.1,
-                                                                        |this, p| {
-                                                                            this.child(
-                                                                                p.border_l_1(),
-                                                                            )
-                                                                        },
-                                                                    ),
-                                                            ),
-                                                    )
-                                                    .children(self.render_dock(
-                                                        DockPosition::Right,
-                                                        &self.right_dock,
-                                                        window,
-                                                        cx,
-                                                    )),
-                                            )
-                                            .child(div().w_full().children(self.render_dock(
-                                                DockPosition::Bottom,
-                                                &self.bottom_dock,
-                                                window,
-                                                cx
-                                            ))),
-
-                                        BottomDockLayout::LeftAligned => div()
-                                            .flex()
-                                            .flex_row()
-                                            .h_full()
-                                            .child(
-                                                div()
-                                                    .flex()
-                                                    .flex_col()
-                                                    .flex_1()
-                                                    .h_full()
-                                                    .child(
-                                                        div()
-                                                            .flex()
-                                                            .flex_row()
-                                                            .flex_1()
-                                                            .children(self.render_dock(DockPosition::Left, &self.left_dock, window, cx))
-                                                            .child(
-                                                                div()
-                                                                    .flex()
-                                                                    .flex_col()
-                                                                    .flex_1()
-                                                                    .overflow_hidden()
-                                                                    .child(
-                                                                        h_flex()
-                                                                            .flex_1()
-                                                                            .when_some(paddings.0, |this, p| this.child(p.border_r_1()))
-                                                                            .child(self.center.render(
-                                                                                self.zoomed.as_ref(),
-                                                                                &PaneRenderContext {
-                                                                                    follower_states:
-                                                                                        &self.follower_states,
-                                                                                    active_call: self.active_call(),
-                                                                                    active_pane: &self.active_pane,
-                                                                                    app_state: &self.app_state,
-                                                                                    project: &self.project,
-                                                                                    workspace: &self.weak_self,
-                                                                                },
-                                                                                window,
-                                                                                cx,
-                                                                            ))
-                                                                            .when_some(paddings.1, |this, p| this.child(p.border_l_1())),
-                                                                    )
-                                                            )
-                                                    )
-                                                    .child(
-                                                        div()
-                                                            .w_full()
-                                                            .children(self.render_dock(DockPosition::Bottom, &self.bottom_dock, window, cx))
-                                                    ),
-                                            )
-                                            .children(self.render_dock(
-                                                DockPosition::Right,
-                                                &self.right_dock,
-                                                window,
-                                                cx,
-                                            )),
-
-                                        BottomDockLayout::RightAligned => div()
-                                            .flex()
-                                            .flex_row()
-                                            .h_full()
-                                            .children(self.render_dock(
-                                                DockPosition::Left,
-                                                &self.left_dock,
-                                                window,
-                                                cx,
-                                            ))
-                                            .child(
-                                                div()
-                                                    .flex()
-                                                    .flex_col()
-                                                    .flex_1()
-                                                    .h_full()
-                                                    .child(
-                                                        div()
-                                                            .flex()
-                                                            .flex_row()
-                                                            .flex_1()
-                                                            .child(
-                                                                div()
-                                                                    .flex()
-                                                                    .flex_col()
-                                                                    .flex_1()
-                                                                    .overflow_hidden()
-                                                                    .child(
-                                                                        h_flex()
-                                                                            .flex_1()
-                                                                            .when_some(paddings.0, |this, p| this.child(p.border_r_1()))
-                                                                            .child(self.center.render(
-                                                                                self.zoomed.as_ref(),
-                                                                                &PaneRenderContext {
-                                                                                    follower_states:
-                                                                                        &self.follower_states,
-                                                                                    active_call: self.active_call(),
-                                                                                    active_pane: &self.active_pane,
-                                                                                    app_state: &self.app_state,
-                                                                                    project: &self.project,
-                                                                                    workspace: &self.weak_self,
-                                                                                },
-                                                                                window,
-                                                                                cx,
-                                                                            ))
-                                                                            .when_some(paddings.1, |this, p| this.child(p.border_l_1())),
-                                                                    )
-                                                            )
-                                                            .children(self.render_dock(DockPosition::Right, &self.right_dock, window, cx))
-                                                    )
-                                                    .child(
-                                                        div()
-                                                            .w_full()
-                                                            .children(self.render_dock(DockPosition::Bottom, &self.bottom_dock, window, cx))
-                                                    ),
-                                            ),
-
-                                        BottomDockLayout::Contained => div()
-                                            .flex()
-                                            .flex_row()
-                                            .h_full()
-                                            .children(self.render_dock(
-                                                DockPosition::Left,
-                                                &self.left_dock,
-                                                window,
-                                                cx,
-                                            ))
-                                            .child(
-                                                div()
-                                                    .flex()
-                                                    .flex_col()
-                                                    .flex_1()
-                                                    .overflow_hidden()
-                                                    .child(
-                                                        h_flex()
-                                                            .flex_1()
-                                                            .when_some(paddings.0, |this, p| {
-                                                                this.child(p.border_r_1())
-                                                            })
-                                                            .child(self.center.render(
-                                                                self.zoomed.as_ref(),
-                                                                &PaneRenderContext {
-                                                                    follower_states:
-                                                                        &self.follower_states,
-                                                                    active_call: self.active_call(),
-                                                                    active_pane: &self.active_pane,
-                                                                    app_state: &self.app_state,
-                                                                    project: &self.project,
-                                                                    workspace: &self.weak_self,
-                                                                },
-                                                                window,
-                                                                cx,
-                                                            ))
-                                                            .when_some(paddings.1, |this, p| {
-                                                                this.child(p.border_l_1())
-                                                            }),
-                                                    )
-                                                    .children(self.render_dock(
-                                                        DockPosition::Bottom,
-                                                        &self.bottom_dock,
-                                                        window,
-                                                        cx,
-                                                    )),
-                                            )
-                                            .children(self.render_dock(
-                                                DockPosition::Right,
-                                                &self.right_dock,
-                                                window,
-                                                cx,
-                                            )),
-                                    }
-                                })
-                                .children(self.zoomed.as_ref().and_then(|view| {
-                                    let zoomed_view = view.upgrade()?;
-                                    let div = div()
-                                        .occlude()
-                                        .absolute()
-                                        .overflow_hidden()
-                                        .border_color(colors.border)
-                                        .bg(colors.background)
-                                        .child(zoomed_view)
-                                        .inset_0()
-                                        .shadow_lg();
-
-                                    if !WorkspaceSettings::get_global(cx).zoomed_padding {
-                                       return Some(div);
-                                    }
-
-                                    Some(match self.zoomed_position {
-                                        Some(DockPosition::Left) => div.right_2().border_r_1(),
-                                        Some(DockPosition::Right) => div.left_2().border_l_1(),
-                                        Some(DockPosition::Bottom) => div.top_2().border_t_1(),
-                                        None => {
-                                            div.top_2().bottom_2().left_2().right_2().border_1()
-                                        }
-                                    })
-                                }))
-                                .children(self.render_notifications(window, cx)),
-                        )
-                        .when(self.status_bar_visible(cx), |parent| {
-                            parent.child(self.status_bar.clone())
-                        })
-                        .child(self.modal_layer.clone())
-                        .child(self.toast_layer.clone()),
-                ),
-            window,
-            cx,
-        )
-    }
-}
-
-impl WorkspaceStore {
-    pub fn new(client: Arc<Client>, cx: &mut Context<Self>) -> Self {
-        Self {
-            workspaces: Default::default(),
-            _subscriptions: vec![
-                client.add_request_handler(cx.weak_entity(), Self::handle_follow),
-                client.add_message_handler(cx.weak_entity(), Self::handle_update_followers),
-            ],
-            client,
-        }
-    }
-
-    pub fn update_followers(
-        &self,
-        project_id: Option<u64>,
-        update: proto::update_followers::Variant,
-        cx: &App,
-    ) -> Option<()> {
-        let active_call = ActiveCall::try_global(cx)?;
-        let room_id = active_call.read(cx).room()?.read(cx).id();
-        self.client
-            .send(proto::UpdateFollowers {
-                room_id,
-                project_id,
-                variant: Some(update),
-            })
-            .log_err()
-    }
-
-    pub async fn handle_follow(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::Follow>,
-        mut cx: AsyncApp,
-    ) -> Result<proto::FollowResponse> {
-        this.update(&mut cx, |this, cx| {
-            let follower = Follower {
-                project_id: envelope.payload.project_id,
-                peer_id: envelope.original_sender_id()?,
-            };
-
-            let mut response = proto::FollowResponse::default();
-            this.workspaces.retain(|workspace| {
-                workspace
-                    .update(cx, |workspace, window, cx| {
-                        let handler_response =
-                            workspace.handle_follow(follower.project_id, window, cx);
-                        if let Some(active_view) = handler_response.active_view
-                            && workspace.project.read(cx).remote_id() == follower.project_id
-                        {
-                            response.active_view = Some(active_view)
-                        }
-                    })
-                    .is_ok()
-            });
-
-            Ok(response)
-        })?
-    }
-
-    async fn handle_update_followers(
-        this: Entity<Self>,
-        envelope: TypedEnvelope<proto::UpdateFollowers>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        let leader_id = envelope.original_sender_id()?;
-        let update = envelope.payload;
-
-        this.update(&mut cx, |this, cx| {
-            this.workspaces.retain(|workspace| {
-                workspace
-                    .update(cx, |workspace, window, cx| {
-                        let project_id = workspace.project.read(cx).remote_id();
-                        if update.project_id != project_id && update.project_id.is_some() {
-                            return;
-                        }
-                        workspace.handle_update_followers(leader_id, update.clone(), window, cx);
-                    })
-                    .is_ok()
-            });
-            Ok(())
-        })?
-    }
-
-    pub fn workspaces(&self) -> &HashSet<WindowHandle<Workspace>> {
-        &self.workspaces
-    }
-}
-
-impl ViewId {
-    pub(crate) fn from_proto(message: proto::ViewId) -> Result<Self> {
-        Ok(Self {
-            creator: message
-                .creator
-                .map(CollaboratorId::PeerId)
-                .context("creator is missing")?,
-            id: message.id,
-        })
-    }
-
-    pub(crate) fn to_proto(self) -> Option<proto::ViewId> {
-        if let CollaboratorId::PeerId(peer_id) = self.creator {
-            Some(proto::ViewId {
-                creator: Some(peer_id),
-                id: self.id,
-            })
-        } else {
-            None
-        }
-    }
-}
-
-impl FollowerState {
-    fn pane(&self) -> &Entity<Pane> {
-        self.dock_pane.as_ref().unwrap_or(&self.center_pane)
-    }
-}
-
-pub trait WorkspaceHandle {
-    fn file_project_paths(&self, cx: &App) -> Vec<ProjectPath>;
-}
-
-impl WorkspaceHandle for Entity<Workspace> {
-    fn file_project_paths(&self, cx: &App) -> Vec<ProjectPath> {
-        self.read(cx)
-            .worktrees(cx)
-            .flat_map(|worktree| {
-                let worktree_id = worktree.read(cx).id();
-                worktree.read(cx).files(true, 0).map(move |f| ProjectPath {
-                    worktree_id,
-                    path: f.path.clone(),
-                })
-            })
-            .collect::<Vec<_>>()
-    }
-}
-
-pub async fn last_opened_workspace_location() -> Option<(SerializedWorkspaceLocation, PathList)> {
-    DB.last_workspace().await.log_err().flatten()
-}
-
-pub fn last_session_workspace_locations(
-    last_session_id: &str,
-    last_session_window_stack: Option<Vec<WindowId>>,
-) -> Option<Vec<(SerializedWorkspaceLocation, PathList)>> {
-    DB.last_session_workspace_locations(last_session_id, last_session_window_stack)
-        .log_err()
-}
-
-actions!(
-    collab,
-    [
-        /// Opens the channel notes for the current call.
-        ///
-        /// Use `collab_panel::OpenSelectedChannelNotes` to open the channel notes for the selected
-        /// channel in the collab panel.
-        ///
-        /// If you want to open a specific channel, use `zed::OpenZedUrl` with a channel notes URL -
-        /// can be copied via "Copy link to section" in the context menu of the channel notes
-        /// buffer. These URLs look like `https://zed.dev/channel/channel-name-CHANNEL_ID/notes`.
-        OpenChannelNotes,
-        /// Mutes your microphone.
-        Mute,
-        /// Deafens yourself (mute both microphone and speakers).
-        Deafen,
-        /// Leaves the current call.
-        LeaveCall,
-        /// Shares the current project with collaborators.
-        ShareProject,
-        /// Shares your screen with collaborators.
-        ScreenShare,
-        /// Copies the current room name and session id for debugging purposes.
-        CopyRoomId,
-    ]
-);
-actions!(
-    zed,
-    [
-        /// Opens the Zed log file.
-        OpenLog,
-        /// Reveals the Zed log file in the system file manager.
-        RevealLogInFileManager
-    ]
-);
-
-async fn join_channel_internal(
-    channel_id: ChannelId,
-    app_state: &Arc<AppState>,
-    requesting_window: Option<WindowHandle<Workspace>>,
-    active_call: &Entity<ActiveCall>,
-    cx: &mut AsyncApp,
-) -> Result<bool> {
-    let (should_prompt, open_room) = active_call.update(cx, |active_call, cx| {
-        let Some(room) = active_call.room().map(|room| room.read(cx)) else {
-            return (false, None);
-        };
-
-        let already_in_channel = room.channel_id() == Some(channel_id);
-        let should_prompt = room.is_sharing_project()
-            && !room.remote_participants().is_empty()
-            && !already_in_channel;
-        let open_room = if already_in_channel {
-            active_call.room().cloned()
-        } else {
-            None
-        };
-        (should_prompt, open_room)
-    })?;
-
-    if let Some(room) = open_room {
-        let task = room.update(cx, |room, cx| {
-            if let Some((project, host)) = room.most_active_project(cx) {
-                return Some(join_in_room_project(project, host, app_state.clone(), cx));
-            }
-
-            None
-        })?;
-        if let Some(task) = task {
-            task.await?;
-        }
-        return anyhow::Ok(true);
-    }
-
-    if should_prompt {
-        if let Some(workspace) = requesting_window {
-            let answer = workspace
-                .update(cx, |_, window, cx| {
-                    window.prompt(
-                        PromptLevel::Warning,
-                        "Do you want to switch channels?",
-                        Some("Leaving this call will unshare your current project."),
-                        &["Yes, Join Channel", "Cancel"],
-                        cx,
-                    )
-                })?
-                .await;
-
-            if answer == Ok(1) {
-                return Ok(false);
-            }
-        } else {
-            return Ok(false); // unreachable!() hopefully
-        }
-    }
-
-    let client = cx.update(|cx| active_call.read(cx).client())?;
-
-    let mut client_status = client.status();
-
-    // this loop will terminate within client::CONNECTION_TIMEOUT seconds.
-    'outer: loop {
-        let Some(status) = client_status.recv().await else {
-            anyhow::bail!("error connecting");
-        };
-
-        match status {
-            Status::Connecting
-            | Status::Authenticating
-            | Status::Authenticated
-            | Status::Reconnecting
-            | Status::Reauthenticating
-            | Status::Reauthenticated => continue,
-            Status::Connected { .. } => break 'outer,
-            Status::SignedOut | Status::AuthenticationError => {
-                return Err(ErrorCode::SignedOut.into());
-            }
-            Status::UpgradeRequired => return Err(ErrorCode::UpgradeRequired.into()),
-            Status::ConnectionError | Status::ConnectionLost | Status::ReconnectionError { .. } => {
-                return Err(ErrorCode::Disconnected.into());
-            }
-        }
-    }
-
-    let room = active_call
-        .update(cx, |active_call, cx| {
-            active_call.join_channel(channel_id, cx)
-        })?
-        .await?;
-
-    let Some(room) = room else {
-        return anyhow::Ok(true);
-    };
-
-    room.update(cx, |room, _| room.room_update_completed())?
-        .await;
-
-    let task = room.update(cx, |room, cx| {
-        if let Some((project, host)) = room.most_active_project(cx) {
-            return Some(join_in_room_project(project, host, app_state.clone(), cx));
-        }
-
-        // If you are the first to join a channel, see if you should share your project.
-        if room.remote_participants().is_empty()
-            && !room.local_participant_is_guest()
-            && let Some(workspace) = requesting_window
-        {
-            let project = workspace.update(cx, |workspace, _, cx| {
-                let project = workspace.project.read(cx);
-
-                if !CallSettings::get_global(cx).share_on_join {
-                    return None;
-                }
-
-                if (project.is_local() || project.is_via_remote_server())
-                    && project.visible_worktrees(cx).any(|tree| {
-                        tree.read(cx)
-                            .root_entry()
-                            .is_some_and(|entry| entry.is_dir())
-                    })
-                {
-                    Some(workspace.project.clone())
-                } else {
-                    None
-                }
-            });
-            if let Ok(Some(project)) = project {
-                return Some(cx.spawn(async move |room, cx| {
-                    room.update(cx, |room, cx| room.share_project(project, cx))?
-                        .await?;
-                    Ok(())
-                }));
-            }
-        }
-
-        None
-    })?;
-    if let Some(task) = task {
-        task.await?;
-        return anyhow::Ok(true);
-    }
-    anyhow::Ok(false)
-}
-
-pub fn join_channel(
-    channel_id: ChannelId,
-    app_state: Arc<AppState>,
-    requesting_window: Option<WindowHandle<Workspace>>,
-    cx: &mut App,
-) -> Task<Result<()>> {
-    let active_call = ActiveCall::global(cx);
-    cx.spawn(async move |cx| {
-        let result =
-            join_channel_internal(channel_id, &app_state, requesting_window, &active_call, cx)
-                .await;
-
-        // join channel succeeded, and opened a window
-        if matches!(result, Ok(true)) {
-            return anyhow::Ok(());
-        }
-
-        // find an existing workspace to focus and show call controls
-        let mut active_window = requesting_window.or_else(|| activate_any_workspace_window(cx));
-        if active_window.is_none() {
-            // no open workspaces, make one to show the error in (blergh)
-            let (window_handle, _) = cx
-                .update(|cx| {
-                    Workspace::new_local(vec![], app_state.clone(), requesting_window, None, cx)
-                })?
-                .await?;
-
-            if result.is_ok() {
-                cx.update(|cx| {
-                    cx.dispatch_action(&OpenChannelNotes);
-                })
-                .log_err();
-            }
-
-            active_window = Some(window_handle);
-        }
-
-        if let Err(err) = result {
-            log::error!("failed to join channel: {}", err);
-            if let Some(active_window) = active_window {
-                active_window
-                    .update(cx, |_, window, cx| {
-                        let detail: SharedString = match err.error_code() {
-                            ErrorCode::SignedOut => "Please sign in to continue.".into(),
-                            ErrorCode::UpgradeRequired => concat!(
-                                "Your are running an unsupported version of Zed. ",
-                                "Please update to continue."
-                            )
-                            .into(),
-                            ErrorCode::NoSuchChannel => concat!(
-                                "No matching channel was found. ",
-                                "Please check the link and try again."
-                            )
-                            .into(),
-                            ErrorCode::Forbidden => concat!(
-                                "This channel is private, and you do not have access. ",
-                                "Please ask someone to add you and try again."
-                            )
-                            .into(),
-                            ErrorCode::Disconnected => {
-                                "Please check your internet connection and try again.".into()
-                            }
-                            _ => format!("{}\n\nPlease try again.", err).into(),
-                        };
-                        window.prompt(
-                            PromptLevel::Critical,
-                            "Failed to join channel",
-                            Some(&detail),
-                            &["Ok"],
-                            cx,
-                        )
-                    })?
-                    .await
-                    .ok();
-            }
-        }
-
-        // return ok, we showed the error to the user.
-        anyhow::Ok(())
-    })
-}
-
-pub async fn get_any_active_workspace(
-    app_state: Arc<AppState>,
-    mut cx: AsyncApp,
-) -> anyhow::Result<WindowHandle<Workspace>> {
-    // find an existing workspace to focus and show call controls
-    let active_window = activate_any_workspace_window(&mut cx);
-    if active_window.is_none() {
-        cx.update(|cx| Workspace::new_local(vec![], app_state.clone(), None, None, cx))?
-            .await?;
-    }
-    activate_any_workspace_window(&mut cx).context("could not open zed")
-}
-
-fn activate_any_workspace_window(cx: &mut AsyncApp) -> Option<WindowHandle<Workspace>> {
-    cx.update(|cx| {
-        if let Some(workspace_window) = cx
-            .active_window()
-            .and_then(|window| window.downcast::<Workspace>())
-        {
-            return Some(workspace_window);
-        }
-
-        for window in cx.windows() {
-            if let Some(workspace_window) = window.downcast::<Workspace>() {
-                workspace_window
-                    .update(cx, |_, window, _| window.activate_window())
-                    .ok();
-                return Some(workspace_window);
-            }
-        }
-        None
-    })
-    .ok()
-    .flatten()
-}
-
-pub fn local_workspace_windows(cx: &App) -> Vec<WindowHandle<Workspace>> {
-    cx.windows()
-        .into_iter()
-        .filter_map(|window| window.downcast::<Workspace>())
-        .filter(|workspace| {
-            workspace
-                .read(cx)
-                .is_ok_and(|workspace| workspace.project.read(cx).is_local())
-        })
-        .collect()
-}
-
-#[derive(Default)]
-pub struct OpenOptions {
-    pub visible: Option<OpenVisible>,
-    pub focus: Option<bool>,
-    pub open_new_workspace: Option<bool>,
-    pub prefer_focused_window: bool,
-    pub replace_window: Option<WindowHandle<Workspace>>,
-    pub env: Option<HashMap<String, String>>,
-}
-
-#[allow(clippy::type_complexity)]
-pub fn open_paths(
-    abs_paths: &[PathBuf],
-    app_state: Arc<AppState>,
-    open_options: OpenOptions,
-    cx: &mut App,
-) -> Task<
-    anyhow::Result<(
-        WindowHandle<Workspace>,
-        Vec<Option<anyhow::Result<Box<dyn ItemHandle>>>>,
-    )>,
-> {
-    let abs_paths = abs_paths.to_vec();
-    let mut existing = None;
-    let mut best_match = None;
-    let mut open_visible = OpenVisible::All;
-    #[cfg(target_os = "windows")]
-    let wsl_path = abs_paths
-        .iter()
-        .find_map(|p| util::paths::WslPath::from_path(p));
-
-    cx.spawn(async move |cx| {
-        if open_options.open_new_workspace != Some(true) {
-            let all_paths = abs_paths.iter().map(|path| app_state.fs.metadata(path));
-            let all_metadatas = futures::future::join_all(all_paths)
-                .await
-                .into_iter()
-                .filter_map(|result| result.ok().flatten())
-                .collect::<Vec<_>>();
-
-            cx.update(|cx| {
-                for window in local_workspace_windows(cx) {
-                    if let Ok(workspace) = window.read(cx) {
-                        let m = workspace.project.read(cx).visibility_for_paths(
-                            &abs_paths,
-                            &all_metadatas,
-                            open_options.open_new_workspace == None,
-                            cx,
-                        );
-                        if m > best_match {
-                            existing = Some(window);
-                            best_match = m;
-                        } else if best_match.is_none()
-                            && open_options.open_new_workspace == Some(false)
-                        {
-                            existing = Some(window)
-                        }
-                    }
-                }
-            })?;
-
-            if open_options.open_new_workspace.is_none()
-                && (existing.is_none() || open_options.prefer_focused_window)
-                && all_metadatas.iter().all(|file| !file.is_dir)
-            {
-                cx.update(|cx| {
-                    if let Some(window) = cx
-                        .active_window()
-                        .and_then(|window| window.downcast::<Workspace>())
-                        && let Ok(workspace) = window.read(cx)
-                    {
-                        let project = workspace.project().read(cx);
-                        if project.is_local() && !project.is_via_collab() {
-                            existing = Some(window);
-                            open_visible = OpenVisible::None;
-                            return;
-                        }
-                    }
-                    for window in local_workspace_windows(cx) {
-                        if let Ok(workspace) = window.read(cx) {
-                            let project = workspace.project().read(cx);
-                            if project.is_via_collab() {
-                                continue;
-                            }
-                            existing = Some(window);
-                            open_visible = OpenVisible::None;
-                            break;
-                        }
-                    }
-                })?;
-            }
-        }
-
-        let result = if let Some(existing) = existing {
-            let open_task = existing
-                .update(cx, |workspace, window, cx| {
-                    window.activate_window();
-                    workspace.open_paths(
-                        abs_paths,
-                        OpenOptions {
-                            visible: Some(open_visible),
-                            ..Default::default()
-                        },
-                        None,
-                        window,
-                        cx,
-                    )
-                })?
-                .await;
-
-            _ = existing.update(cx, |workspace, _, cx| {
-                for item in open_task.iter().flatten() {
-                    if let Err(e) = item {
-                        workspace.show_error(&e, cx);
-                    }
-                }
-            });
-
-            Ok((existing, open_task))
-        } else {
-            cx.update(move |cx| {
-                Workspace::new_local(
-                    abs_paths,
-                    app_state.clone(),
-                    open_options.replace_window,
-                    open_options.env,
-                    cx,
-                )
-            })?
-            .await
-        };
-
-        #[cfg(target_os = "windows")]
-        if let Some(util::paths::WslPath{distro, path}) = wsl_path
-            && let Ok((workspace, _)) = &result
-        {
-            workspace
-                .update(cx, move |workspace, _window, cx| {
-                    struct OpenInWsl;
-                    workspace.show_notification(NotificationId::unique::<OpenInWsl>(), cx, move |cx| {
-                        let display_path = util::markdown::MarkdownInlineCode(&path.to_string_lossy());
-                        let msg = format!("{display_path} is inside a WSL filesystem, some features may not work unless you open it with WSL remote");
-                        cx.new(move |cx| {
-                            MessageNotification::new(msg, cx)
-                                .primary_message("Open in WSL")
-                                .primary_icon(IconName::FolderOpen)
-                                .primary_on_click(move |window, cx| {
-                                    window.dispatch_action(Box::new(remote::OpenWslPath {
-                                            distro: remote::WslConnectionOptions {
-                                                    distro_name: distro.clone(),
-                                                user: None,
-                                            },
-                                            paths: vec![path.clone().into()],
-                                        }), cx)
-                                })
-                        })
-                    });
-                })
-                .unwrap();
-        };
-        result
-    })
-}
-
-pub fn open_new(
-    open_options: OpenOptions,
-    app_state: Arc<AppState>,
-    cx: &mut App,
-    init: impl FnOnce(&mut Workspace, &mut Window, &mut Context<Workspace>) + 'static + Send,
-) -> Task<anyhow::Result<()>> {
-    let task = Workspace::new_local(Vec::new(), app_state, None, open_options.env, cx);
-    cx.spawn(async move |cx| {
-        let (workspace, opened_paths) = task.await?;
-        workspace.update(cx, |workspace, window, cx| {
-            if opened_paths.is_empty() {
-                init(workspace, window, cx)
-            }
-        })?;
-        Ok(())
-    })
-}
-
-pub fn create_and_open_local_file(
-    path: &'static Path,
-    window: &mut Window,
-    cx: &mut Context<Workspace>,
-    default_content: impl 'static + Send + FnOnce() -> Rope,
-) -> Task<Result<Box<dyn ItemHandle>>> {
-    cx.spawn_in(window, async move |workspace, cx| {
-        let fs = workspace.read_with(cx, |workspace, _| workspace.app_state().fs.clone())?;
-        if !fs.is_file(path).await {
-            fs.create_file(path, Default::default()).await?;
-            fs.save(path, &default_content(), Default::default())
-                .await?;
-        }
-
-        let mut items = workspace
-            .update_in(cx, |workspace, window, cx| {
-                workspace.with_local_workspace(window, cx, |workspace, window, cx| {
-                    workspace.open_paths(
-                        vec![path.to_path_buf()],
-                        OpenOptions {
-                            visible: Some(OpenVisible::None),
-                            ..Default::default()
-                        },
-                        None,
-                        window,
-                        cx,
-                    )
-                })
-            })?
-            .await?
-            .await;
-
-        let item = items.pop().flatten();
-        item.with_context(|| format!("path {path:?} is not a file"))?
-    })
-}
-
-pub fn open_remote_project_with_new_connection(
-    window: WindowHandle<Workspace>,
-    remote_connection: Arc<dyn RemoteConnection>,
-    cancel_rx: oneshot::Receiver<()>,
-    delegate: Arc<dyn RemoteClientDelegate>,
-    app_state: Arc<AppState>,
-    paths: Vec<PathBuf>,
-    cx: &mut App,
-) -> Task<Result<Vec<Option<Box<dyn ItemHandle>>>>> {
-    cx.spawn(async move |cx| {
-        let (workspace_id, serialized_workspace) =
-            deserialize_remote_project(remote_connection.connection_options(), paths.clone(), cx)
-                .await?;
-
-        let session = match cx
-            .update(|cx| {
-                remote::RemoteClient::new(
-                    ConnectionIdentifier::Workspace(workspace_id.0),
-                    remote_connection,
-                    cancel_rx,
-                    delegate,
-                    cx,
-                )
-            })?
-            .await?
-        {
-            Some(result) => result,
-            None => return Ok(Vec::new()),
-        };
-
-        let project = cx.update(|cx| {
-            project::Project::remote(
-                session,
-                app_state.client.clone(),
-                app_state.node_runtime.clone(),
-                app_state.user_store.clone(),
-                app_state.languages.clone(),
-                app_state.fs.clone(),
-                cx,
-            )
-        })?;
-
-        open_remote_project_inner(
-            project,
-            paths,
-            workspace_id,
-            serialized_workspace,
-            app_state,
-            window,
-            cx,
-        )
-        .await
-    })
-}
-
-pub fn open_remote_project_with_existing_connection(
-    connection_options: RemoteConnectionOptions,
-    project: Entity<Project>,
-    paths: Vec<PathBuf>,
-    app_state: Arc<AppState>,
-    window: WindowHandle<Workspace>,
-    cx: &mut AsyncApp,
-) -> Task<Result<Vec<Option<Box<dyn ItemHandle>>>>> {
-    cx.spawn(async move |cx| {
-        let (workspace_id, serialized_workspace) =
-            deserialize_remote_project(connection_options.clone(), paths.clone(), cx).await?;
-
-        open_remote_project_inner(
-            project,
-            paths,
-            workspace_id,
-            serialized_workspace,
-            app_state,
-            window,
-            cx,
-        )
-        .await
-    })
-}
-
-async fn open_remote_project_inner(
-    project: Entity<Project>,
-    paths: Vec<PathBuf>,
-    workspace_id: WorkspaceId,
-    serialized_workspace: Option<SerializedWorkspace>,
-    app_state: Arc<AppState>,
-    window: WindowHandle<Workspace>,
-    cx: &mut AsyncApp,
-) -> Result<Vec<Option<Box<dyn ItemHandle>>>> {
-    let toolchains = DB.toolchains(workspace_id).await?;
-    for (toolchain, worktree_id, path) in toolchains {
-        project
-            .update(cx, |this, cx| {
-                this.activate_toolchain(ProjectPath { worktree_id, path }, toolchain, cx)
-            })?
-            .await;
-    }
-    let mut project_paths_to_open = vec![];
-    let mut project_path_errors = vec![];
-
-    for path in paths {
-        let result = cx
-            .update(|cx| Workspace::project_path_for_path(project.clone(), &path, true, cx))?
-            .await;
-        match result {
-            Ok((_, project_path)) => {
-                project_paths_to_open.push((path.clone(), Some(project_path)));
-            }
-            Err(error) => {
-                project_path_errors.push(error);
-            }
-        };
-    }
-
-    if project_paths_to_open.is_empty() {
-        return Err(project_path_errors.pop().context("no paths given")?);
-    }
-
-    if let Some(detach_session_task) = window
-        .update(cx, |_workspace, window, cx| {
-            cx.spawn_in(window, async move |this, cx| {
-                this.update_in(cx, |this, window, cx| this.remove_from_session(window, cx))
-            })
-        })
-        .ok()
-    {
-        detach_session_task.await.ok();
-    }
-
-    cx.update_window(window.into(), |_, window, cx| {
-        window.replace_root(cx, |window, cx| {
-            telemetry::event!("SSH Project Opened");
-
-            let mut workspace =
-                Workspace::new(Some(workspace_id), project, app_state.clone(), window, cx);
-            workspace.update_history(cx);
-
-            if let Some(ref serialized) = serialized_workspace {
-                workspace.centered_layout = serialized.centered_layout;
-            }
-
-            workspace
-        });
-    })?;
-
-    let items = window
-        .update(cx, |_, window, cx| {
-            window.activate_window();
-            open_items(serialized_workspace, project_paths_to_open, window, cx)
-        })?
-        .await?;
-
-    window.update(cx, |workspace, _, cx| {
-        for error in project_path_errors {
-            if error.error_code() == proto::ErrorCode::DevServerProjectPathDoesNotExist {
-                if let Some(path) = error.error_tag("path") {
-                    workspace.show_error(&anyhow!("'{path}' does not exist"), cx)
-                }
-            } else {
-                workspace.show_error(&error, cx)
-            }
-        }
-    })?;
-
-    Ok(items.into_iter().map(|item| item?.ok()).collect())
-}
-
-fn deserialize_remote_project(
-    connection_options: RemoteConnectionOptions,
-    paths: Vec<PathBuf>,
-    cx: &AsyncApp,
-) -> Task<Result<(WorkspaceId, Option<SerializedWorkspace>)>> {
-    cx.background_spawn(async move {
-        let remote_connection_id = persistence::DB
-            .get_or_create_remote_connection(connection_options)
-            .await?;
-
-        let serialized_workspace =
-            persistence::DB.remote_workspace_for_roots(&paths, remote_connection_id);
-
-        let workspace_id = if let Some(workspace_id) =
-            serialized_workspace.as_ref().map(|workspace| workspace.id)
-        {
-            workspace_id
-        } else {
-            persistence::DB.next_id().await?
-        };
-
-        Ok((workspace_id, serialized_workspace))
-    })
-}
-
-pub fn join_in_room_project(
-    project_id: u64,
-    follow_user_id: u64,
-    app_state: Arc<AppState>,
-    cx: &mut App,
-) -> Task<Result<()>> {
-    let windows = cx.windows();
-    cx.spawn(async move |cx| {
-        let existing_workspace = windows.into_iter().find_map(|window_handle| {
-            window_handle
-                .downcast::<Workspace>()
-                .and_then(|window_handle| {
-                    window_handle
-                        .update(cx, |workspace, _window, cx| {
-                            if workspace.project().read(cx).remote_id() == Some(project_id) {
-                                Some(window_handle)
-                            } else {
-                                None
-                            }
-                        })
-                        .unwrap_or(None)
-                })
-        });
-
-        let workspace = if let Some(existing_workspace) = existing_workspace {
-            existing_workspace
-        } else {
-            let active_call = cx.update(|cx| ActiveCall::global(cx))?;
-            let room = active_call
-                .read_with(cx, |call, _| call.room().cloned())?
-                .context("not in a call")?;
-            let project = room
-                .update(cx, |room, cx| {
-                    room.join_project(
-                        project_id,
-                        app_state.languages.clone(),
-                        app_state.fs.clone(),
-                        cx,
-                    )
-                })?
-                .await?;
-
-            let window_bounds_override = window_bounds_env_override();
-            cx.update(|cx| {
-                let mut options = (app_state.build_window_options)(None, cx);
-                options.window_bounds = window_bounds_override.map(WindowBounds::Windowed);
-                cx.open_window(options, |window, cx| {
-                    cx.new(|cx| {
-                        Workspace::new(Default::default(), project, app_state.clone(), window, cx)
-                    })
-                })
-            })??
-        };
-
-        workspace.update(cx, |workspace, window, cx| {
-            cx.activate(true);
-            window.activate_window();
-
-            if let Some(room) = ActiveCall::global(cx).read(cx).room().cloned() {
-                let follow_peer_id = room
-                    .read(cx)
-                    .remote_participants()
-                    .iter()
-                    .find(|(_, participant)| participant.user.id == follow_user_id)
-                    .map(|(_, p)| p.peer_id)
-                    .or_else(|| {
-                        // If we couldn't follow the given user, follow the host instead.
-                        let collaborator = workspace
-                            .project()
-                            .read(cx)
-                            .collaborators()
-                            .values()
-                            .find(|collaborator| collaborator.is_host)?;
-                        Some(collaborator.peer_id)
-                    });
-
-                if let Some(follow_peer_id) = follow_peer_id {
-                    workspace.follow(follow_peer_id, window, cx);
-                }
-            }
-        })?;
-
-        anyhow::Ok(())
-    })
-}
-
-pub fn reload(cx: &mut App) {
-    let should_confirm = WorkspaceSettings::get_global(cx).confirm_quit;
-    let mut workspace_windows = cx
-        .windows()
-        .into_iter()
-        .filter_map(|window| window.downcast::<Workspace>())
-        .collect::<Vec<_>>();
-
-    // If multiple windows have unsaved changes, and need a save prompt,
-    // prompt in the active window before switching to a different window.
-    workspace_windows.sort_by_key(|window| window.is_active(cx) == Some(false));
-
-    let mut prompt = None;
-    if let (true, Some(window)) = (should_confirm, workspace_windows.first()) {
-        prompt = window
-            .update(cx, |_, window, cx| {
-                window.prompt(
-                    PromptLevel::Info,
-                    "Are you sure you want to restart?",
-                    None,
-                    &["Restart", "Cancel"],
-                    cx,
-                )
-            })
-            .ok();
-    }
-
-    cx.spawn(async move |cx| {
-        if let Some(prompt) = prompt {
-            let answer = prompt.await?;
-            if answer != 0 {
-                return Ok(());
-            }
-        }
-
-        // If the user cancels any save prompt, then keep the app open.
-        for window in workspace_windows {
-            if let Ok(should_close) = window.update(cx, |workspace, window, cx| {
-                workspace.prepare_to_close(CloseIntent::Quit, window, cx)
-            }) && !should_close.await?
-            {
-                return Ok(());
-            }
-        }
-        cx.update(|cx| cx.restart())
-    })
-    .detach_and_log_err(cx);
-}
-
-fn parse_pixel_position_env_var(value: &str) -> Option<Point<Pixels>> {
-    let mut parts = value.split(',');
-    let x: usize = parts.next()?.parse().ok()?;
-    let y: usize = parts.next()?.parse().ok()?;
-    Some(point(px(x as f32), px(y as f32)))
-}
-
-fn parse_pixel_size_env_var(value: &str) -> Option<Size<Pixels>> {
-    let mut parts = value.split(',');
-    let width: usize = parts.next()?.parse().ok()?;
-    let height: usize = parts.next()?.parse().ok()?;
-    Some(size(px(width as f32), px(height as f32)))
-}
-
-/// Add client-side decorations (rounded corners, shadows, resize handling) when appropriate.
-pub fn client_side_decorations(
-    element: impl IntoElement,
-    window: &mut Window,
-    cx: &mut App,
-) -> Stateful<Div> {
-    const BORDER_SIZE: Pixels = px(1.0);
-    let decorations = window.window_decorations();
-
-    match decorations {
-        Decorations::Client { .. } => window.set_client_inset(theme::CLIENT_SIDE_DECORATION_SHADOW),
-        Decorations::Server => window.set_client_inset(px(0.0)),
-    }
-
-    struct GlobalResizeEdge(ResizeEdge);
-    impl Global for GlobalResizeEdge {}
-
-    div()
-        .id("window-backdrop")
-        .bg(transparent_black())
-        .map(|div| match decorations {
-            Decorations::Server => div,
-            Decorations::Client { tiling, .. } => div
-                .when(!(tiling.top || tiling.right), |div| {
-                    div.rounded_tr(theme::CLIENT_SIDE_DECORATION_ROUNDING)
-                })
-                .when(!(tiling.top || tiling.left), |div| {
-                    div.rounded_tl(theme::CLIENT_SIDE_DECORATION_ROUNDING)
-                })
-                .when(!(tiling.bottom || tiling.right), |div| {
-                    div.rounded_br(theme::CLIENT_SIDE_DECORATION_ROUNDING)
-                })
-                .when(!(tiling.bottom || tiling.left), |div| {
-                    div.rounded_bl(theme::CLIENT_SIDE_DECORATION_ROUNDING)
-                })
-                .when(!tiling.top, |div| {
-                    div.pt(theme::CLIENT_SIDE_DECORATION_SHADOW)
-                })
-                .when(!tiling.bottom, |div| {
-                    div.pb(theme::CLIENT_SIDE_DECORATION_SHADOW)
-                })
-                .when(!tiling.left, |div| {
-                    div.pl(theme::CLIENT_SIDE_DECORATION_SHADOW)
-                })
-                .when(!tiling.right, |div| {
-                    div.pr(theme::CLIENT_SIDE_DECORATION_SHADOW)
-                })
-                .on_mouse_move(move |e, window, cx| {
-                    let size = window.window_bounds().get_bounds().size;
-                    let pos = e.position;
-
-                    let new_edge =
-                        resize_edge(pos, theme::CLIENT_SIDE_DECORATION_SHADOW, size, tiling);
-
-                    let edge = cx.try_global::<GlobalResizeEdge>();
-                    if new_edge != edge.map(|edge| edge.0) {
-                        window
-                            .window_handle()
-                            .update(cx, |workspace, _, cx| {
-                                cx.notify(workspace.entity_id());
-                            })
-                            .ok();
-                    }
-                })
-                .on_mouse_down(MouseButton::Left, move |e, window, _| {
-                    let size = window.window_bounds().get_bounds().size;
-                    let pos = e.position;
-
-                    let edge = match resize_edge(
-                        pos,
-                        theme::CLIENT_SIDE_DECORATION_SHADOW,
-                        size,
-                        tiling,
-                    ) {
-                        Some(value) => value,
-                        None => return,
-                    };
-
-                    window.start_window_resize(edge);
-                }),
-        })
-        .size_full()
-        .child(
-            div()
-                .cursor(CursorStyle::Arrow)
-                .map(|div| match decorations {
-                    Decorations::Server => div,
-                    Decorations::Client { tiling } => div
-                        .border_color(cx.theme().colors().border)
-                        .when(!(tiling.top || tiling.right), |div| {
-                            div.rounded_tr(theme::CLIENT_SIDE_DECORATION_ROUNDING)
-                        })
-                        .when(!(tiling.top || tiling.left), |div| {
-                            div.rounded_tl(theme::CLIENT_SIDE_DECORATION_ROUNDING)
-                        })
-                        .when(!(tiling.bottom || tiling.right), |div| {
-                            div.rounded_br(theme::CLIENT_SIDE_DECORATION_ROUNDING)
-                        })
-                        .when(!(tiling.bottom || tiling.left), |div| {
-                            div.rounded_bl(theme::CLIENT_SIDE_DECORATION_ROUNDING)
-                        })
-                        .when(!tiling.top, |div| div.border_t(BORDER_SIZE))
-                        .when(!tiling.bottom, |div| div.border_b(BORDER_SIZE))
-                        .when(!tiling.left, |div| div.border_l(BORDER_SIZE))
-                        .when(!tiling.right, |div| div.border_r(BORDER_SIZE))
-                        .when(!tiling.is_tiled(), |div| {
-                            div.shadow(vec![gpui::BoxShadow {
-                                color: Hsla {
-                                    h: 0.,
-                                    s: 0.,
-                                    l: 0.,
-                                    a: 0.4,
-                                },
-                                blur_radius: theme::CLIENT_SIDE_DECORATION_SHADOW / 2.,
-                                spread_radius: px(0.),
-                                offset: point(px(0.0), px(0.0)),
-                            }])
-                        }),
-                })
-                .on_mouse_move(|_e, _, cx| {
-                    cx.stop_propagation();
-                })
-                .size_full()
-                .child(element),
-        )
-        .map(|div| match decorations {
-            Decorations::Server => div,
-            Decorations::Client { tiling, .. } => div.child(
-                canvas(
-                    |_bounds, window, _| {
-                        window.insert_hitbox(
-                            Bounds::new(
-                                point(px(0.0), px(0.0)),
-                                window.window_bounds().get_bounds().size,
-                            ),
-                            HitboxBehavior::Normal,
-                        )
-                    },
-                    move |_bounds, hitbox, window, cx| {
-                        let mouse = window.mouse_position();
-                        let size = window.window_bounds().get_bounds().size;
-                        let Some(edge) =
-                            resize_edge(mouse, theme::CLIENT_SIDE_DECORATION_SHADOW, size, tiling)
-                        else {
-                            return;
-                        };
-                        cx.set_global(GlobalResizeEdge(edge));
-                        window.set_cursor_style(
-                            match edge {
-                                ResizeEdge::Top | ResizeEdge::Bottom => CursorStyle::ResizeUpDown,
-                                ResizeEdge::Left | ResizeEdge::Right => {
-                                    CursorStyle::ResizeLeftRight
-                                }
-                                ResizeEdge::TopLeft | ResizeEdge::BottomRight => {
-                                    CursorStyle::ResizeUpLeftDownRight
-                                }
-                                ResizeEdge::TopRight | ResizeEdge::BottomLeft => {
-                                    CursorStyle::ResizeUpRightDownLeft
-                                }
-                            },
-                            &hitbox,
-                        );
-                    },
-                )
-                .size_full()
-                .absolute(),
-            ),
-        })
-}
-
-fn resize_edge(
-    pos: Point<Pixels>,
-    shadow_size: Pixels,
-    window_size: Size<Pixels>,
-    tiling: Tiling,
-) -> Option<ResizeEdge> {
-    let bounds = Bounds::new(Point::default(), window_size).inset(shadow_size * 1.5);
-    if bounds.contains(&pos) {
-        return None;
-    }
-
-    let corner_size = size(shadow_size * 1.5, shadow_size * 1.5);
-    let top_left_bounds = Bounds::new(Point::new(px(0.), px(0.)), corner_size);
-    if !tiling.top && top_left_bounds.contains(&pos) {
-        return Some(ResizeEdge::TopLeft);
-    }
-
-    let top_right_bounds = Bounds::new(
-        Point::new(window_size.width - corner_size.width, px(0.)),
-        corner_size,
-    );
-    if !tiling.top && top_right_bounds.contains(&pos) {
-        return Some(ResizeEdge::TopRight);
-    }
-
-    let bottom_left_bounds = Bounds::new(
-        Point::new(px(0.), window_size.height - corner_size.height),
-        corner_size,
-    );
-    if !tiling.bottom && bottom_left_bounds.contains(&pos) {
-        return Some(ResizeEdge::BottomLeft);
-    }
-
-    let bottom_right_bounds = Bounds::new(
-        Point::new(
-            window_size.width - corner_size.width,
-            window_size.height - corner_size.height,
-        ),
-        corner_size,
-    );
-    if !tiling.bottom && bottom_right_bounds.contains(&pos) {
-        return Some(ResizeEdge::BottomRight);
-    }
-
-    if !tiling.top && pos.y < shadow_size {
-        Some(ResizeEdge::Top)
-    } else if !tiling.bottom && pos.y > window_size.height - shadow_size {
-        Some(ResizeEdge::Bottom)
-    } else if !tiling.left && pos.x < shadow_size {
-        Some(ResizeEdge::Left)
-    } else if !tiling.right && pos.x > window_size.width - shadow_size {
-        Some(ResizeEdge::Right)
-    } else {
-        None
-    }
-}
-
-fn join_pane_into_active(
-    active_pane: &Entity<Pane>,
-    pane: &Entity<Pane>,
-    window: &mut Window,
-    cx: &mut App,
-) {
-    if pane == active_pane {
-    } else if pane.read(cx).items_len() == 0 {
-        pane.update(cx, |_, cx| {
-            cx.emit(pane::Event::Remove {
-                focus_on_pane: None,
-            });
-        })
-    } else {
-        move_all_items(pane, active_pane, window, cx);
-    }
-}
-
-fn move_all_items(
-    from_pane: &Entity<Pane>,
-    to_pane: &Entity<Pane>,
-    window: &mut Window,
-    cx: &mut App,
-) {
-    let destination_is_different = from_pane != to_pane;
-    let mut moved_items = 0;
-    for (item_ix, item_handle) in from_pane
-        .read(cx)
-        .items()
-        .enumerate()
-        .map(|(ix, item)| (ix, item.clone()))
-        .collect::<Vec<_>>()
-    {
-        let ix = item_ix - moved_items;
-        if destination_is_different {
-            // Close item from previous pane
-            from_pane.update(cx, |source, cx| {
-                source.remove_item_and_focus_on_pane(ix, false, to_pane.clone(), window, cx);
-            });
-            moved_items += 1;
-        }
-
-        // This automatically removes duplicate items in the pane
-        to_pane.update(cx, |destination, cx| {
-            destination.add_item(item_handle, true, true, None, window, cx);
-            window.focus(&destination.focus_handle(cx))
-        });
-    }
-}
-
-pub fn move_item(
-    source: &Entity<Pane>,
-    destination: &Entity<Pane>,
-    item_id_to_move: EntityId,
-    destination_index: usize,
-    activate: bool,
-    window: &mut Window,
-    cx: &mut App,
-) {
-    let Some((item_ix, item_handle)) = source
-        .read(cx)
-        .items()
-        .enumerate()
-        .find(|(_, item_handle)| item_handle.item_id() == item_id_to_move)
-        .map(|(ix, item)| (ix, item.clone()))
-    else {
-        // Tab was closed during drag
-        return;
-    };
-
-    if source != destination {
-        // Close item from previous pane
-        source.update(cx, |source, cx| {
-            source.remove_item_and_focus_on_pane(item_ix, false, destination.clone(), window, cx);
-        });
-    }
-
-    // This automatically removes duplicate items in the pane
-    destination.update(cx, |destination, cx| {
-        destination.add_item_inner(
-            item_handle,
-            activate,
-            activate,
-            activate,
-            Some(destination_index),
-            window,
-            cx,
-        );
-        if activate {
-            window.focus(&destination.focus_handle(cx))
-        }
-    });
-}
-
-pub fn move_active_item(
-    source: &Entity<Pane>,
-    destination: &Entity<Pane>,
-    focus_destination: bool,
-    close_if_empty: bool,
-    window: &mut Window,
-    cx: &mut App,
-) {
-    if source == destination {
-        return;
-    }
-    let Some(active_item) = source.read(cx).active_item() else {
-        return;
-    };
-    source.update(cx, |source_pane, cx| {
-        let item_id = active_item.item_id();
-        source_pane.remove_item(item_id, false, close_if_empty, window, cx);
-        destination.update(cx, |target_pane, cx| {
-            target_pane.add_item(
-                active_item,
-                focus_destination,
-                focus_destination,
-                Some(target_pane.items_len()),
-                window,
-                cx,
-            );
-        });
-    });
-}
-
-pub fn clone_active_item(
-    workspace_id: Option<WorkspaceId>,
-    source: &Entity<Pane>,
-    destination: &Entity<Pane>,
-    focus_destination: bool,
-    window: &mut Window,
-    cx: &mut App,
-) {
-    if source == destination {
-        return;
-    }
-    let Some(active_item) = source.read(cx).active_item() else {
-        return;
-    };
-    if !active_item.can_split(cx) {
-        return;
-    }
-    let destination = destination.downgrade();
-    let task = active_item.clone_on_split(workspace_id, window, cx);
-    window
-        .spawn(cx, async move |cx| {
-            let Some(clone) = task.await else {
-                return;
-            };
-            destination
-                .update_in(cx, |target_pane, window, cx| {
-                    target_pane.add_item(
-                        clone,
-                        focus_destination,
-                        focus_destination,
-                        Some(target_pane.items_len()),
-                        window,
-                        cx,
-                    );
-                })
-                .log_err();
-        })
-        .detach();
-}
-
-#[derive(Debug)]
-pub struct WorkspacePosition {
-    pub window_bounds: Option<WindowBounds>,
-    pub display: Option<Uuid>,
-    pub centered_layout: bool,
-}
-
-pub fn remote_workspace_position_from_db(
-    connection_options: RemoteConnectionOptions,
-    paths_to_open: &[PathBuf],
-    cx: &App,
-) -> Task<Result<WorkspacePosition>> {
-    let paths = paths_to_open.to_vec();
-
-    cx.background_spawn(async move {
-        let remote_connection_id = persistence::DB
-            .get_or_create_remote_connection(connection_options)
-            .await
-            .context("fetching serialized ssh project")?;
-        let serialized_workspace =
-            persistence::DB.remote_workspace_for_roots(&paths, remote_connection_id);
-
-        let (window_bounds, display) = if let Some(bounds) = window_bounds_env_override() {
-            (Some(WindowBounds::Windowed(bounds)), None)
-        } else {
-            let restorable_bounds = serialized_workspace
-                .as_ref()
-                .and_then(|workspace| Some((workspace.display?, workspace.window_bounds?)))
-                .or_else(|| {
-                    let (display, window_bounds) = DB.last_window().log_err()?;
-                    Some((display?, window_bounds?))
-                });
-
-            if let Some((serialized_display, serialized_status)) = restorable_bounds {
-                (Some(serialized_status.0), Some(serialized_display))
-            } else {
-                (None, None)
-            }
-        };
-
-        let centered_layout = serialized_workspace
-            .as_ref()
-            .map(|w| w.centered_layout)
-            .unwrap_or(false);
-
-        Ok(WorkspacePosition {
-            window_bounds,
-            display,
-            centered_layout,
-        })
-    })
-}
-
-pub fn with_active_or_new_workspace(
-    cx: &mut App,
-    f: impl FnOnce(&mut Workspace, &mut Window, &mut Context<Workspace>) + Send + 'static,
-) {
-    match cx.active_window().and_then(|w| w.downcast::<Workspace>()) {
-        Some(workspace) => {
-            cx.defer(move |cx| {
-                workspace
-                    .update(cx, |workspace, window, cx| f(workspace, window, cx))
-                    .log_err();
-            });
-        }
-        None => {
-            let app_state = AppState::global(cx);
-            if let Some(app_state) = app_state.upgrade() {
-                open_new(
-                    OpenOptions::default(),
-                    app_state,
-                    cx,
-                    move |workspace, window, cx| f(workspace, window, cx),
-                )
-                .detach_and_log_err(cx);
-            }
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::{cell::RefCell, rc::Rc};
-
-    use super::*;
-    use crate::{
-        dock::{PanelEvent, test::TestPanel},
-        item::{
-            ItemBufferKind, ItemEvent,
-            test::{TestItem, TestProjectItem},
-        },
-    };
-    use fs::FakeFs;
-    use gpui::{
-        DismissEvent, Empty, EventEmitter, FocusHandle, Focusable, Render, TestAppContext,
-        UpdateGlobal, VisualTestContext, px,
-    };
-    use project::{Project, ProjectEntryId};
-    use serde_json::json;
-    use settings::SettingsStore;
-    use util::rel_path::rel_path;
-
-    #[gpui::test]
-    async fn test_tab_disambiguation(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, [], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-        // Adding an item with no ambiguity renders the tab without detail.
-        let item1 = cx.new(|cx| {
-            let mut item = TestItem::new(cx);
-            item.tab_descriptions = Some(vec!["c", "b1/c", "a/b1/c"]);
-            item
-        });
-        workspace.update_in(cx, |workspace, window, cx| {
-            workspace.add_item_to_active_pane(Box::new(item1.clone()), None, true, window, cx);
-        });
-        item1.read_with(cx, |item, _| assert_eq!(item.tab_detail.get(), Some(0)));
-
-        // Adding an item that creates ambiguity increases the level of detail on
-        // both tabs.
-        let item2 = cx.new_window_entity(|_window, cx| {
-            let mut item = TestItem::new(cx);
-            item.tab_descriptions = Some(vec!["c", "b2/c", "a/b2/c"]);
-            item
-        });
-        workspace.update_in(cx, |workspace, window, cx| {
-            workspace.add_item_to_active_pane(Box::new(item2.clone()), None, true, window, cx);
-        });
-        item1.read_with(cx, |item, _| assert_eq!(item.tab_detail.get(), Some(1)));
-        item2.read_with(cx, |item, _| assert_eq!(item.tab_detail.get(), Some(1)));
-
-        // Adding an item that creates ambiguity increases the level of detail only
-        // on the ambiguous tabs. In this case, the ambiguity can't be resolved so
-        // we stop at the highest detail available.
-        let item3 = cx.new(|cx| {
-            let mut item = TestItem::new(cx);
-            item.tab_descriptions = Some(vec!["c", "b2/c", "a/b2/c"]);
-            item
-        });
-        workspace.update_in(cx, |workspace, window, cx| {
-            workspace.add_item_to_active_pane(Box::new(item3.clone()), None, true, window, cx);
-        });
-        item1.read_with(cx, |item, _| assert_eq!(item.tab_detail.get(), Some(1)));
-        item2.read_with(cx, |item, _| assert_eq!(item.tab_detail.get(), Some(3)));
-        item3.read_with(cx, |item, _| assert_eq!(item.tab_detail.get(), Some(3)));
-    }
-
-    #[gpui::test]
-    async fn test_tracking_active_path(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            "/root1",
-            json!({
-                "one.txt": "",
-                "two.txt": "",
-            }),
-        )
-        .await;
-        fs.insert_tree(
-            "/root2",
-            json!({
-                "three.txt": "",
-            }),
-        )
-        .await;
-
-        let project = Project::test(fs, ["root1".as_ref()], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-        let worktree_id = project.update(cx, |project, cx| {
-            project.worktrees(cx).next().unwrap().read(cx).id()
-        });
-
-        let item1 = cx.new(|cx| {
-            TestItem::new(cx).with_project_items(&[TestProjectItem::new(1, "one.txt", cx)])
-        });
-        let item2 = cx.new(|cx| {
-            TestItem::new(cx).with_project_items(&[TestProjectItem::new(2, "two.txt", cx)])
-        });
-
-        // Add an item to an empty pane
-        workspace.update_in(cx, |workspace, window, cx| {
-            workspace.add_item_to_active_pane(Box::new(item1), None, true, window, cx)
-        });
-        project.update(cx, |project, cx| {
-            assert_eq!(
-                project.active_entry(),
-                project
-                    .entry_for_path(&(worktree_id, rel_path("one.txt")).into(), cx)
-                    .map(|e| e.id)
-            );
-        });
-        assert_eq!(cx.window_title().as_deref(), Some("root1 — one.txt"));
-
-        // Add a second item to a non-empty pane
-        workspace.update_in(cx, |workspace, window, cx| {
-            workspace.add_item_to_active_pane(Box::new(item2), None, true, window, cx)
-        });
-        assert_eq!(cx.window_title().as_deref(), Some("root1 — two.txt"));
-        project.update(cx, |project, cx| {
-            assert_eq!(
-                project.active_entry(),
-                project
-                    .entry_for_path(&(worktree_id, rel_path("two.txt")).into(), cx)
-                    .map(|e| e.id)
-            );
-        });
-
-        // Close the active item
-        pane.update_in(cx, |pane, window, cx| {
-            pane.close_active_item(&Default::default(), window, cx)
-        })
-        .await
-        .unwrap();
-        assert_eq!(cx.window_title().as_deref(), Some("root1 — one.txt"));
-        project.update(cx, |project, cx| {
-            assert_eq!(
-                project.active_entry(),
-                project
-                    .entry_for_path(&(worktree_id, rel_path("one.txt")).into(), cx)
-                    .map(|e| e.id)
-            );
-        });
-
-        // Add a project folder
-        project
-            .update(cx, |project, cx| {
-                project.find_or_create_worktree("root2", true, cx)
-            })
-            .await
-            .unwrap();
-        assert_eq!(cx.window_title().as_deref(), Some("root1, root2 — one.txt"));
-
-        // Remove a project folder
-        project.update(cx, |project, cx| project.remove_worktree(worktree_id, cx));
-        assert_eq!(cx.window_title().as_deref(), Some("root2 — one.txt"));
-    }
-
-    #[gpui::test]
-    async fn test_close_window(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree("/root", json!({ "one": "" })).await;
-
-        let project = Project::test(fs, ["root".as_ref()], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-        // When there are no dirty items, there's nothing to do.
-        let item1 = cx.new(TestItem::new);
-        workspace.update_in(cx, |w, window, cx| {
-            w.add_item_to_active_pane(Box::new(item1.clone()), None, true, window, cx)
-        });
-        let task = workspace.update_in(cx, |w, window, cx| {
-            w.prepare_to_close(CloseIntent::CloseWindow, window, cx)
-        });
-        assert!(task.await.unwrap());
-
-        // When there are dirty untitled items, prompt to save each one. If the user
-        // cancels any prompt, then abort.
-        let item2 = cx.new(|cx| TestItem::new(cx).with_dirty(true));
-        let item3 = cx.new(|cx| {
-            TestItem::new(cx)
-                .with_dirty(true)
-                .with_project_items(&[TestProjectItem::new(1, "1.txt", cx)])
-        });
-        workspace.update_in(cx, |w, window, cx| {
-            w.add_item_to_active_pane(Box::new(item2.clone()), None, true, window, cx);
-            w.add_item_to_active_pane(Box::new(item3.clone()), None, true, window, cx);
-        });
-        let task = workspace.update_in(cx, |w, window, cx| {
-            w.prepare_to_close(CloseIntent::CloseWindow, window, cx)
-        });
-        cx.executor().run_until_parked();
-        cx.simulate_prompt_answer("Cancel"); // cancel save all
-        cx.executor().run_until_parked();
-        assert!(!cx.has_pending_prompt());
-        assert!(!task.await.unwrap());
-    }
-
-    #[gpui::test]
-    async fn test_close_window_with_serializable_items(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        // Register TestItem as a serializable item
-        cx.update(|cx| {
-            register_serializable_item::<TestItem>(cx);
-        });
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree("/root", json!({ "one": "" })).await;
-
-        let project = Project::test(fs, ["root".as_ref()], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-        // When there are dirty untitled items, but they can serialize, then there is no prompt.
-        let item1 = cx.new(|cx| {
-            TestItem::new(cx)
-                .with_dirty(true)
-                .with_serialize(|| Some(Task::ready(Ok(()))))
-        });
-        let item2 = cx.new(|cx| {
-            TestItem::new(cx)
-                .with_dirty(true)
-                .with_project_items(&[TestProjectItem::new(1, "1.txt", cx)])
-                .with_serialize(|| Some(Task::ready(Ok(()))))
-        });
-        workspace.update_in(cx, |w, window, cx| {
-            w.add_item_to_active_pane(Box::new(item1.clone()), None, true, window, cx);
-            w.add_item_to_active_pane(Box::new(item2.clone()), None, true, window, cx);
-        });
-        let task = workspace.update_in(cx, |w, window, cx| {
-            w.prepare_to_close(CloseIntent::CloseWindow, window, cx)
-        });
-        assert!(task.await.unwrap());
-    }
-
-    #[gpui::test]
-    async fn test_close_pane_items(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-
-        let item1 = cx.new(|cx| {
-            TestItem::new(cx)
-                .with_dirty(true)
-                .with_project_items(&[dirty_project_item(1, "1.txt", cx)])
-        });
-        let item2 = cx.new(|cx| {
-            TestItem::new(cx)
-                .with_dirty(true)
-                .with_conflict(true)
-                .with_project_items(&[dirty_project_item(2, "2.txt", cx)])
-        });
-        let item3 = cx.new(|cx| {
-            TestItem::new(cx)
-                .with_dirty(true)
-                .with_conflict(true)
-                .with_project_items(&[dirty_project_item(3, "3.txt", cx)])
-        });
-        let item4 = cx.new(|cx| {
-            TestItem::new(cx).with_dirty(true).with_project_items(&[{
-                let project_item = TestProjectItem::new_untitled(cx);
-                project_item.update(cx, |project_item, _| project_item.is_dirty = true);
-                project_item
-            }])
-        });
-        let pane = workspace.update_in(cx, |workspace, window, cx| {
-            workspace.add_item_to_active_pane(Box::new(item1.clone()), None, true, window, cx);
-            workspace.add_item_to_active_pane(Box::new(item2.clone()), None, true, window, cx);
-            workspace.add_item_to_active_pane(Box::new(item3.clone()), None, true, window, cx);
-            workspace.add_item_to_active_pane(Box::new(item4.clone()), None, true, window, cx);
-            workspace.active_pane().clone()
-        });
-
-        let close_items = pane.update_in(cx, |pane, window, cx| {
-            pane.activate_item(1, true, true, window, cx);
-            assert_eq!(pane.active_item().unwrap().item_id(), item2.item_id());
-            let item1_id = item1.item_id();
-            let item3_id = item3.item_id();
-            let item4_id = item4.item_id();
-            pane.close_items(window, cx, SaveIntent::Close, move |id| {
-                [item1_id, item3_id, item4_id].contains(&id)
-            })
-        });
-        cx.executor().run_until_parked();
-
-        assert!(cx.has_pending_prompt());
-        cx.simulate_prompt_answer("Save all");
-
-        cx.executor().run_until_parked();
-
-        // Item 1 is saved. There's a prompt to save item 3.
-        pane.update(cx, |pane, cx| {
-            assert_eq!(item1.read(cx).save_count, 1);
-            assert_eq!(item1.read(cx).save_as_count, 0);
-            assert_eq!(item1.read(cx).reload_count, 0);
-            assert_eq!(pane.items_len(), 3);
-            assert_eq!(pane.active_item().unwrap().item_id(), item3.item_id());
-        });
-        assert!(cx.has_pending_prompt());
-
-        // Cancel saving item 3.
-        cx.simulate_prompt_answer("Discard");
-        cx.executor().run_until_parked();
-
-        // Item 3 is reloaded. There's a prompt to save item 4.
-        pane.update(cx, |pane, cx| {
-            assert_eq!(item3.read(cx).save_count, 0);
-            assert_eq!(item3.read(cx).save_as_count, 0);
-            assert_eq!(item3.read(cx).reload_count, 1);
-            assert_eq!(pane.items_len(), 2);
-            assert_eq!(pane.active_item().unwrap().item_id(), item4.item_id());
-        });
-
-        // There's a prompt for a path for item 4.
-        cx.simulate_new_path_selection(|_| Some(Default::default()));
-        close_items.await.unwrap();
-
-        // The requested items are closed.
-        pane.update(cx, |pane, cx| {
-            assert_eq!(item4.read(cx).save_count, 0);
-            assert_eq!(item4.read(cx).save_as_count, 1);
-            assert_eq!(item4.read(cx).reload_count, 0);
-            assert_eq!(pane.items_len(), 1);
-            assert_eq!(pane.active_item().unwrap().item_id(), item2.item_id());
-        });
-    }
-
-    #[gpui::test]
-    async fn test_prompting_to_save_only_on_last_item_for_entry(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, [], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-
-        // Create several workspace items with single project entries, and two
-        // workspace items with multiple project entries.
-        let single_entry_items = (0..=4)
-            .map(|project_entry_id| {
-                cx.new(|cx| {
-                    TestItem::new(cx)
-                        .with_dirty(true)
-                        .with_project_items(&[dirty_project_item(
-                            project_entry_id,
-                            &format!("{project_entry_id}.txt"),
-                            cx,
-                        )])
-                })
-            })
-            .collect::<Vec<_>>();
-        let item_2_3 = cx.new(|cx| {
-            TestItem::new(cx)
-                .with_dirty(true)
-                .with_buffer_kind(ItemBufferKind::Multibuffer)
-                .with_project_items(&[
-                    single_entry_items[2].read(cx).project_items[0].clone(),
-                    single_entry_items[3].read(cx).project_items[0].clone(),
-                ])
-        });
-        let item_3_4 = cx.new(|cx| {
-            TestItem::new(cx)
-                .with_dirty(true)
-                .with_buffer_kind(ItemBufferKind::Multibuffer)
-                .with_project_items(&[
-                    single_entry_items[3].read(cx).project_items[0].clone(),
-                    single_entry_items[4].read(cx).project_items[0].clone(),
-                ])
-        });
-
-        // Create two panes that contain the following project entries:
-        //   left pane:
-        //     multi-entry items:   (2, 3)
-        //     single-entry items:  0, 2, 3, 4
-        //   right pane:
-        //     single-entry items:  4, 1
-        //     multi-entry items:   (3, 4)
-        let (left_pane, right_pane) = workspace.update_in(cx, |workspace, window, cx| {
-            let left_pane = workspace.active_pane().clone();
-            workspace.add_item_to_active_pane(Box::new(item_2_3.clone()), None, true, window, cx);
-            workspace.add_item_to_active_pane(
-                single_entry_items[0].boxed_clone(),
-                None,
-                true,
-                window,
-                cx,
-            );
-            workspace.add_item_to_active_pane(
-                single_entry_items[2].boxed_clone(),
-                None,
-                true,
-                window,
-                cx,
-            );
-            workspace.add_item_to_active_pane(
-                single_entry_items[3].boxed_clone(),
-                None,
-                true,
-                window,
-                cx,
-            );
-            workspace.add_item_to_active_pane(
-                single_entry_items[4].boxed_clone(),
-                None,
-                true,
-                window,
-                cx,
-            );
-
-            let right_pane =
-                workspace.split_and_clone(left_pane.clone(), SplitDirection::Right, window, cx);
-
-            let boxed_clone = single_entry_items[1].boxed_clone();
-            let right_pane = window.spawn(cx, async move |cx| {
-                right_pane.await.inspect(|right_pane| {
-                    right_pane
-                        .update_in(cx, |pane, window, cx| {
-                            pane.add_item(boxed_clone, true, true, None, window, cx);
-                            pane.add_item(Box::new(item_3_4.clone()), true, true, None, window, cx);
-                        })
-                        .unwrap();
-                })
-            });
-
-            (left_pane, right_pane)
-        });
-        let right_pane = right_pane.await.unwrap();
-        cx.focus(&right_pane);
-
-        let mut close = right_pane.update_in(cx, |pane, window, cx| {
-            pane.close_all_items(&CloseAllItems::default(), window, cx)
-                .unwrap()
-        });
-        cx.executor().run_until_parked();
-
-        let msg = cx.pending_prompt().unwrap().0;
-        assert!(msg.contains("1.txt"));
-        assert!(!msg.contains("2.txt"));
-        assert!(!msg.contains("3.txt"));
-        assert!(!msg.contains("4.txt"));
-
-        cx.simulate_prompt_answer("Cancel");
-        close.await;
-
-        left_pane
-            .update_in(cx, |left_pane, window, cx| {
-                left_pane.close_item_by_id(
-                    single_entry_items[3].entity_id(),
-                    SaveIntent::Skip,
-                    window,
-                    cx,
-                )
-            })
-            .await
-            .unwrap();
-
-        close = right_pane.update_in(cx, |pane, window, cx| {
-            pane.close_all_items(&CloseAllItems::default(), window, cx)
-                .unwrap()
-        });
-        cx.executor().run_until_parked();
-
-        let details = cx.pending_prompt().unwrap().1;
-        assert!(details.contains("1.txt"));
-        assert!(!details.contains("2.txt"));
-        assert!(details.contains("3.txt"));
-        // ideally this assertion could be made, but today we can only
-        // save whole items not project items, so the orphaned item 3 causes
-        // 4 to be saved too.
-        // assert!(!details.contains("4.txt"));
-
-        cx.simulate_prompt_answer("Save all");
-
-        cx.executor().run_until_parked();
-        close.await;
-        right_pane.read_with(cx, |pane, _| {
-            assert_eq!(pane.items_len(), 0);
-        });
-    }
-
-    #[gpui::test]
-    async fn test_autosave(cx: &mut gpui::TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, [], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        let item = cx.new(|cx| {
-            TestItem::new(cx).with_project_items(&[TestProjectItem::new(1, "1.txt", cx)])
-        });
-        let item_id = item.entity_id();
-        workspace.update_in(cx, |workspace, window, cx| {
-            workspace.add_item_to_active_pane(Box::new(item.clone()), None, true, window, cx);
-        });
-
-        // Autosave on window change.
-        item.update(cx, |item, cx| {
-            SettingsStore::update_global(cx, |settings, cx| {
-                settings.update_user_settings(cx, |settings| {
-                    settings.workspace.autosave = Some(AutosaveSetting::OnWindowChange);
-                })
-            });
-            item.is_dirty = true;
-        });
-
-        // Deactivating the window saves the file.
-        cx.deactivate_window();
-        item.read_with(cx, |item, _| assert_eq!(item.save_count, 1));
-
-        // Re-activating the window doesn't save the file.
-        cx.update(|window, _| window.activate_window());
-        cx.executor().run_until_parked();
-        item.read_with(cx, |item, _| assert_eq!(item.save_count, 1));
-
-        // Autosave on focus change.
-        item.update_in(cx, |item, window, cx| {
-            cx.focus_self(window);
-            SettingsStore::update_global(cx, |settings, cx| {
-                settings.update_user_settings(cx, |settings| {
-                    settings.workspace.autosave = Some(AutosaveSetting::OnFocusChange);
-                })
-            });
-            item.is_dirty = true;
-        });
-        // Blurring the item saves the file.
-        item.update_in(cx, |_, window, _| window.blur());
-        cx.executor().run_until_parked();
-        item.read_with(cx, |item, _| assert_eq!(item.save_count, 2));
-
-        // Deactivating the window still saves the file.
-        item.update_in(cx, |item, window, cx| {
-            cx.focus_self(window);
-            item.is_dirty = true;
-        });
-        cx.deactivate_window();
-        item.update(cx, |item, _| assert_eq!(item.save_count, 3));
-
-        // Autosave after delay.
-        item.update(cx, |item, cx| {
-            SettingsStore::update_global(cx, |settings, cx| {
-                settings.update_user_settings(cx, |settings| {
-                    settings.workspace.autosave = Some(AutosaveSetting::AfterDelay {
-                        milliseconds: 500.into(),
-                    });
-                })
-            });
-            item.is_dirty = true;
-            cx.emit(ItemEvent::Edit);
-        });
-
-        // Delay hasn't fully expired, so the file is still dirty and unsaved.
-        cx.executor().advance_clock(Duration::from_millis(250));
-        item.read_with(cx, |item, _| assert_eq!(item.save_count, 3));
-
-        // After delay expires, the file is saved.
-        cx.executor().advance_clock(Duration::from_millis(250));
-        item.read_with(cx, |item, _| assert_eq!(item.save_count, 4));
-
-        // Autosave after delay, should save earlier than delay if tab is closed
-        item.update(cx, |item, cx| {
-            item.is_dirty = true;
-            cx.emit(ItemEvent::Edit);
-        });
-        cx.executor().advance_clock(Duration::from_millis(250));
-        item.read_with(cx, |item, _| assert_eq!(item.save_count, 4));
-
-        // // Ensure auto save with delay saves the item on close, even if the timer hasn't yet run out.
-        pane.update_in(cx, |pane, window, cx| {
-            pane.close_items(window, cx, SaveIntent::Close, move |id| id == item_id)
-        })
-        .await
-        .unwrap();
-        assert!(!cx.has_pending_prompt());
-        item.read_with(cx, |item, _| assert_eq!(item.save_count, 5));
-
-        // Add the item again, ensuring autosave is prevented if the underlying file has been deleted.
-        workspace.update_in(cx, |workspace, window, cx| {
-            workspace.add_item_to_active_pane(Box::new(item.clone()), None, true, window, cx);
-        });
-        item.update_in(cx, |item, _window, cx| {
-            item.is_dirty = true;
-            for project_item in &mut item.project_items {
-                project_item.update(cx, |project_item, _| project_item.is_dirty = true);
-            }
-        });
-        cx.run_until_parked();
-        item.read_with(cx, |item, _| assert_eq!(item.save_count, 5));
-
-        // Autosave on focus change, ensuring closing the tab counts as such.
-        item.update(cx, |item, cx| {
-            SettingsStore::update_global(cx, |settings, cx| {
-                settings.update_user_settings(cx, |settings| {
-                    settings.workspace.autosave = Some(AutosaveSetting::OnFocusChange);
-                })
-            });
-            item.is_dirty = true;
-            for project_item in &mut item.project_items {
-                project_item.update(cx, |project_item, _| project_item.is_dirty = true);
-            }
-        });
-
-        pane.update_in(cx, |pane, window, cx| {
-            pane.close_items(window, cx, SaveIntent::Close, move |id| id == item_id)
-        })
-        .await
-        .unwrap();
-        assert!(!cx.has_pending_prompt());
-        item.read_with(cx, |item, _| assert_eq!(item.save_count, 6));
-
-        // Add the item again, ensuring autosave is prevented if the underlying file has been deleted.
-        workspace.update_in(cx, |workspace, window, cx| {
-            workspace.add_item_to_active_pane(Box::new(item.clone()), None, true, window, cx);
-        });
-        item.update_in(cx, |item, window, cx| {
-            item.project_items[0].update(cx, |item, _| {
-                item.entry_id = None;
-            });
-            item.is_dirty = true;
-            window.blur();
-        });
-        cx.run_until_parked();
-        item.read_with(cx, |item, _| assert_eq!(item.save_count, 6));
-
-        // Ensure autosave is prevented for deleted files also when closing the buffer.
-        let _close_items = pane.update_in(cx, |pane, window, cx| {
-            pane.close_items(window, cx, SaveIntent::Close, move |id| id == item_id)
-        });
-        cx.run_until_parked();
-        assert!(cx.has_pending_prompt());
-        item.read_with(cx, |item, _| assert_eq!(item.save_count, 6));
-    }
-
-    #[gpui::test]
-    async fn test_pane_navigation(cx: &mut gpui::TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, [], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-
-        let item = cx.new(|cx| {
-            TestItem::new(cx).with_project_items(&[TestProjectItem::new(1, "1.txt", cx)])
-        });
-        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-        let toolbar = pane.read_with(cx, |pane, _| pane.toolbar().clone());
-        let toolbar_notify_count = Rc::new(RefCell::new(0));
-
-        workspace.update_in(cx, |workspace, window, cx| {
-            workspace.add_item_to_active_pane(Box::new(item.clone()), None, true, window, cx);
-            let toolbar_notification_count = toolbar_notify_count.clone();
-            cx.observe_in(&toolbar, window, move |_, _, _, _| {
-                *toolbar_notification_count.borrow_mut() += 1
-            })
-            .detach();
-        });
-
-        pane.read_with(cx, |pane, _| {
-            assert!(!pane.can_navigate_backward());
-            assert!(!pane.can_navigate_forward());
-        });
-
-        item.update_in(cx, |item, _, cx| {
-            item.set_state("one".to_string(), cx);
-        });
-
-        // Toolbar must be notified to re-render the navigation buttons
-        assert_eq!(*toolbar_notify_count.borrow(), 1);
-
-        pane.read_with(cx, |pane, _| {
-            assert!(pane.can_navigate_backward());
-            assert!(!pane.can_navigate_forward());
-        });
-
-        workspace
-            .update_in(cx, |workspace, window, cx| {
-                workspace.go_back(pane.downgrade(), window, cx)
-            })
-            .await
-            .unwrap();
-
-        assert_eq!(*toolbar_notify_count.borrow(), 2);
-        pane.read_with(cx, |pane, _| {
-            assert!(!pane.can_navigate_backward());
-            assert!(pane.can_navigate_forward());
-        });
-    }
-
-    #[gpui::test]
-    async fn test_toggle_docks_and_panels(cx: &mut gpui::TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, [], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-
-        let panel = workspace.update_in(cx, |workspace, window, cx| {
-            let panel = cx.new(|cx| TestPanel::new(DockPosition::Right, 100, cx));
-            workspace.add_panel(panel.clone(), window, cx);
-
-            workspace
-                .right_dock()
-                .update(cx, |right_dock, cx| right_dock.set_open(true, window, cx));
-
-            panel
-        });
-
-        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-        pane.update_in(cx, |pane, window, cx| {
-            let item = cx.new(TestItem::new);
-            pane.add_item(Box::new(item), true, true, None, window, cx);
-        });
-
-        // Transfer focus from center to panel
-        workspace.update_in(cx, |workspace, window, cx| {
-            workspace.toggle_panel_focus::<TestPanel>(window, cx);
-        });
-
-        workspace.update_in(cx, |workspace, window, cx| {
-            assert!(workspace.right_dock().read(cx).is_open());
-            assert!(!panel.is_zoomed(window, cx));
-            assert!(panel.read(cx).focus_handle(cx).contains_focused(window, cx));
-        });
-
-        // Transfer focus from panel to center
-        workspace.update_in(cx, |workspace, window, cx| {
-            workspace.toggle_panel_focus::<TestPanel>(window, cx);
-        });
-
-        workspace.update_in(cx, |workspace, window, cx| {
-            assert!(workspace.right_dock().read(cx).is_open());
-            assert!(!panel.is_zoomed(window, cx));
-            assert!(!panel.read(cx).focus_handle(cx).contains_focused(window, cx));
-        });
-
-        // Close the dock
-        workspace.update_in(cx, |workspace, window, cx| {
-            workspace.toggle_dock(DockPosition::Right, window, cx);
-        });
-
-        workspace.update_in(cx, |workspace, window, cx| {
-            assert!(!workspace.right_dock().read(cx).is_open());
-            assert!(!panel.is_zoomed(window, cx));
-            assert!(!panel.read(cx).focus_handle(cx).contains_focused(window, cx));
-        });
-
-        // Open the dock
-        workspace.update_in(cx, |workspace, window, cx| {
-            workspace.toggle_dock(DockPosition::Right, window, cx);
-        });
-
-        workspace.update_in(cx, |workspace, window, cx| {
-            assert!(workspace.right_dock().read(cx).is_open());
-            assert!(!panel.is_zoomed(window, cx));
-            assert!(panel.read(cx).focus_handle(cx).contains_focused(window, cx));
-        });
-
-        // Focus and zoom panel
-        panel.update_in(cx, |panel, window, cx| {
-            cx.focus_self(window);
-            panel.set_zoomed(true, window, cx)
-        });
-
-        workspace.update_in(cx, |workspace, window, cx| {
-            assert!(workspace.right_dock().read(cx).is_open());
-            assert!(panel.is_zoomed(window, cx));
-            assert!(panel.read(cx).focus_handle(cx).contains_focused(window, cx));
-        });
-
-        // Transfer focus to the center closes the dock
-        workspace.update_in(cx, |workspace, window, cx| {
-            workspace.toggle_panel_focus::<TestPanel>(window, cx);
-        });
-
-        workspace.update_in(cx, |workspace, window, cx| {
-            assert!(!workspace.right_dock().read(cx).is_open());
-            assert!(panel.is_zoomed(window, cx));
-            assert!(!panel.read(cx).focus_handle(cx).contains_focused(window, cx));
-        });
-
-        // Transferring focus back to the panel keeps it zoomed
-        workspace.update_in(cx, |workspace, window, cx| {
-            workspace.toggle_panel_focus::<TestPanel>(window, cx);
-        });
-
-        workspace.update_in(cx, |workspace, window, cx| {
-            assert!(workspace.right_dock().read(cx).is_open());
-            assert!(panel.is_zoomed(window, cx));
-            assert!(panel.read(cx).focus_handle(cx).contains_focused(window, cx));
-        });
-
-        // Close the dock while it is zoomed
-        workspace.update_in(cx, |workspace, window, cx| {
-            workspace.toggle_dock(DockPosition::Right, window, cx)
-        });
-
-        workspace.update_in(cx, |workspace, window, cx| {
-            assert!(!workspace.right_dock().read(cx).is_open());
-            assert!(panel.is_zoomed(window, cx));
-            assert!(workspace.zoomed.is_none());
-            assert!(!panel.read(cx).focus_handle(cx).contains_focused(window, cx));
-        });
-
-        // Opening the dock, when it's zoomed, retains focus
-        workspace.update_in(cx, |workspace, window, cx| {
-            workspace.toggle_dock(DockPosition::Right, window, cx)
-        });
-
-        workspace.update_in(cx, |workspace, window, cx| {
-            assert!(workspace.right_dock().read(cx).is_open());
-            assert!(panel.is_zoomed(window, cx));
-            assert!(workspace.zoomed.is_some());
-            assert!(panel.read(cx).focus_handle(cx).contains_focused(window, cx));
-        });
-
-        // Unzoom and close the panel, zoom the active pane.
-        panel.update_in(cx, |panel, window, cx| panel.set_zoomed(false, window, cx));
-        workspace.update_in(cx, |workspace, window, cx| {
-            workspace.toggle_dock(DockPosition::Right, window, cx)
-        });
-        pane.update_in(cx, |pane, window, cx| {
-            pane.toggle_zoom(&Default::default(), window, cx)
-        });
-
-        // Opening a dock unzooms the pane.
-        workspace.update_in(cx, |workspace, window, cx| {
-            workspace.toggle_dock(DockPosition::Right, window, cx)
-        });
-        workspace.update_in(cx, |workspace, window, cx| {
-            let pane = pane.read(cx);
-            assert!(!pane.is_zoomed());
-            assert!(!pane.focus_handle(cx).is_focused(window));
-            assert!(workspace.right_dock().read(cx).is_open());
-            assert!(workspace.zoomed.is_none());
-        });
-    }
-
-    #[gpui::test]
-    async fn test_toggle_all_docks(cx: &mut gpui::TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, [], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-        workspace.update_in(cx, |workspace, window, cx| {
-            // Open two docks
-            let left_dock = workspace.dock_at_position(DockPosition::Left);
-            let right_dock = workspace.dock_at_position(DockPosition::Right);
-
-            left_dock.update(cx, |dock, cx| dock.set_open(true, window, cx));
-            right_dock.update(cx, |dock, cx| dock.set_open(true, window, cx));
-
-            assert!(left_dock.read(cx).is_open());
-            assert!(right_dock.read(cx).is_open());
-        });
-
-        workspace.update_in(cx, |workspace, window, cx| {
-            // Toggle all docks - should close both
-            workspace.toggle_all_docks(&ToggleAllDocks, window, cx);
-
-            let left_dock = workspace.dock_at_position(DockPosition::Left);
-            let right_dock = workspace.dock_at_position(DockPosition::Right);
-            assert!(!left_dock.read(cx).is_open());
-            assert!(!right_dock.read(cx).is_open());
-        });
-
-        workspace.update_in(cx, |workspace, window, cx| {
-            // Toggle again - should reopen both
-            workspace.toggle_all_docks(&ToggleAllDocks, window, cx);
-
-            let left_dock = workspace.dock_at_position(DockPosition::Left);
-            let right_dock = workspace.dock_at_position(DockPosition::Right);
-            assert!(left_dock.read(cx).is_open());
-            assert!(right_dock.read(cx).is_open());
-        });
-    }
-
-    #[gpui::test]
-    async fn test_toggle_all_with_manual_close(cx: &mut gpui::TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, [], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-        workspace.update_in(cx, |workspace, window, cx| {
-            // Open two docks
-            let left_dock = workspace.dock_at_position(DockPosition::Left);
-            let right_dock = workspace.dock_at_position(DockPosition::Right);
-
-            left_dock.update(cx, |dock, cx| dock.set_open(true, window, cx));
-            right_dock.update(cx, |dock, cx| dock.set_open(true, window, cx));
-
-            assert!(left_dock.read(cx).is_open());
-            assert!(right_dock.read(cx).is_open());
-        });
-
-        workspace.update_in(cx, |workspace, window, cx| {
-            // Close them manually
-            workspace.toggle_dock(DockPosition::Left, window, cx);
-            workspace.toggle_dock(DockPosition::Right, window, cx);
-
-            let left_dock = workspace.dock_at_position(DockPosition::Left);
-            let right_dock = workspace.dock_at_position(DockPosition::Right);
-            assert!(!left_dock.read(cx).is_open());
-            assert!(!right_dock.read(cx).is_open());
-        });
-
-        workspace.update_in(cx, |workspace, window, cx| {
-            // Toggle all docks - only last closed (right dock) should reopen
-            workspace.toggle_all_docks(&ToggleAllDocks, window, cx);
-
-            let left_dock = workspace.dock_at_position(DockPosition::Left);
-            let right_dock = workspace.dock_at_position(DockPosition::Right);
-            assert!(!left_dock.read(cx).is_open());
-            assert!(right_dock.read(cx).is_open());
-        });
-    }
-
-    #[gpui::test]
-    async fn test_toggle_all_docks_after_dock_move(cx: &mut gpui::TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, [], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-
-        // Open two docks (left and right) with one panel each
-        let (left_panel, right_panel) = workspace.update_in(cx, |workspace, window, cx| {
-            let left_panel = cx.new(|cx| TestPanel::new(DockPosition::Left, 100, cx));
-            workspace.add_panel(left_panel.clone(), window, cx);
-
-            let right_panel = cx.new(|cx| TestPanel::new(DockPosition::Right, 101, cx));
-            workspace.add_panel(right_panel.clone(), window, cx);
-
-            workspace.toggle_dock(DockPosition::Left, window, cx);
-            workspace.toggle_dock(DockPosition::Right, window, cx);
-
-            // Verify initial state
-            assert!(
-                workspace.left_dock().read(cx).is_open(),
-                "Left dock should be open"
-            );
-            assert_eq!(
-                workspace
-                    .left_dock()
-                    .read(cx)
-                    .visible_panel()
-                    .unwrap()
-                    .panel_id(),
-                left_panel.panel_id(),
-                "Left panel should be visible in left dock"
-            );
-            assert!(
-                workspace.right_dock().read(cx).is_open(),
-                "Right dock should be open"
-            );
-            assert_eq!(
-                workspace
-                    .right_dock()
-                    .read(cx)
-                    .visible_panel()
-                    .unwrap()
-                    .panel_id(),
-                right_panel.panel_id(),
-                "Right panel should be visible in right dock"
-            );
-            assert!(
-                !workspace.bottom_dock().read(cx).is_open(),
-                "Bottom dock should be closed"
-            );
-
-            (left_panel, right_panel)
-        });
-
-        // Focus the left panel and move it to the next position (bottom dock)
-        workspace.update_in(cx, |workspace, window, cx| {
-            workspace.toggle_panel_focus::<TestPanel>(window, cx); // Focus left panel
-            assert!(
-                left_panel.read(cx).focus_handle(cx).is_focused(window),
-                "Left panel should be focused"
-            );
-        });
-
-        cx.dispatch_action(MoveFocusedPanelToNextPosition);
-
-        // Verify the left panel has moved to the bottom dock, and the bottom dock is now open
-        workspace.update(cx, |workspace, cx| {
-            assert!(
-                !workspace.left_dock().read(cx).is_open(),
-                "Left dock should be closed"
-            );
-            assert!(
-                workspace.bottom_dock().read(cx).is_open(),
-                "Bottom dock should now be open"
-            );
-            assert_eq!(
-                left_panel.read(cx).position,
-                DockPosition::Bottom,
-                "Left panel should now be in the bottom dock"
-            );
-            assert_eq!(
-                workspace
-                    .bottom_dock()
-                    .read(cx)
-                    .visible_panel()
-                    .unwrap()
-                    .panel_id(),
-                left_panel.panel_id(),
-                "Left panel should be the visible panel in the bottom dock"
-            );
-        });
-
-        // Toggle all docks off
-        workspace.update_in(cx, |workspace, window, cx| {
-            workspace.toggle_all_docks(&ToggleAllDocks, window, cx);
-            assert!(
-                !workspace.left_dock().read(cx).is_open(),
-                "Left dock should be closed"
-            );
-            assert!(
-                !workspace.right_dock().read(cx).is_open(),
-                "Right dock should be closed"
-            );
-            assert!(
-                !workspace.bottom_dock().read(cx).is_open(),
-                "Bottom dock should be closed"
-            );
-        });
-
-        // Toggle all docks back on and verify positions are restored
-        workspace.update_in(cx, |workspace, window, cx| {
-            workspace.toggle_all_docks(&ToggleAllDocks, window, cx);
-            assert!(
-                !workspace.left_dock().read(cx).is_open(),
-                "Left dock should remain closed"
-            );
-            assert!(
-                workspace.right_dock().read(cx).is_open(),
-                "Right dock should remain open"
-            );
-            assert!(
-                workspace.bottom_dock().read(cx).is_open(),
-                "Bottom dock should remain open"
-            );
-            assert_eq!(
-                left_panel.read(cx).position,
-                DockPosition::Bottom,
-                "Left panel should remain in the bottom dock"
-            );
-            assert_eq!(
-                right_panel.read(cx).position,
-                DockPosition::Right,
-                "Right panel should remain in the right dock"
-            );
-            assert_eq!(
-                workspace
-                    .bottom_dock()
-                    .read(cx)
-                    .visible_panel()
-                    .unwrap()
-                    .panel_id(),
-                left_panel.panel_id(),
-                "Left panel should be the visible panel in the right dock"
-            );
-        });
-    }
-
-    #[gpui::test]
-    async fn test_join_pane_into_next(cx: &mut gpui::TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-
-        // Let's arrange the panes like this:
-        //
-        // +-----------------------+
-        // |         top           |
-        // +------+--------+-------+
-        // | left | center | right |
-        // +------+--------+-------+
-        // |        bottom         |
-        // +-----------------------+
-
-        let top_item = cx.new(|cx| {
-            TestItem::new(cx).with_project_items(&[TestProjectItem::new(1, "top.txt", cx)])
-        });
-        let bottom_item = cx.new(|cx| {
-            TestItem::new(cx).with_project_items(&[TestProjectItem::new(2, "bottom.txt", cx)])
-        });
-        let left_item = cx.new(|cx| {
-            TestItem::new(cx).with_project_items(&[TestProjectItem::new(3, "left.txt", cx)])
-        });
-        let right_item = cx.new(|cx| {
-            TestItem::new(cx).with_project_items(&[TestProjectItem::new(4, "right.txt", cx)])
-        });
-        let center_item = cx.new(|cx| {
-            TestItem::new(cx).with_project_items(&[TestProjectItem::new(5, "center.txt", cx)])
-        });
-
-        let top_pane_id = workspace.update_in(cx, |workspace, window, cx| {
-            let top_pane_id = workspace.active_pane().entity_id();
-            workspace.add_item_to_active_pane(Box::new(top_item.clone()), None, false, window, cx);
-            workspace.split_pane(
-                workspace.active_pane().clone(),
-                SplitDirection::Down,
-                window,
-                cx,
-            );
-            top_pane_id
-        });
-        let bottom_pane_id = workspace.update_in(cx, |workspace, window, cx| {
-            let bottom_pane_id = workspace.active_pane().entity_id();
-            workspace.add_item_to_active_pane(
-                Box::new(bottom_item.clone()),
-                None,
-                false,
-                window,
-                cx,
-            );
-            workspace.split_pane(
-                workspace.active_pane().clone(),
-                SplitDirection::Up,
-                window,
-                cx,
-            );
-            bottom_pane_id
-        });
-        let left_pane_id = workspace.update_in(cx, |workspace, window, cx| {
-            let left_pane_id = workspace.active_pane().entity_id();
-            workspace.add_item_to_active_pane(Box::new(left_item.clone()), None, false, window, cx);
-            workspace.split_pane(
-                workspace.active_pane().clone(),
-                SplitDirection::Right,
-                window,
-                cx,
-            );
-            left_pane_id
-        });
-        let right_pane_id = workspace.update_in(cx, |workspace, window, cx| {
-            let right_pane_id = workspace.active_pane().entity_id();
-            workspace.add_item_to_active_pane(
-                Box::new(right_item.clone()),
-                None,
-                false,
-                window,
-                cx,
-            );
-            workspace.split_pane(
-                workspace.active_pane().clone(),
-                SplitDirection::Left,
-                window,
-                cx,
-            );
-            right_pane_id
-        });
-        let center_pane_id = workspace.update_in(cx, |workspace, window, cx| {
-            let center_pane_id = workspace.active_pane().entity_id();
-            workspace.add_item_to_active_pane(
-                Box::new(center_item.clone()),
-                None,
-                false,
-                window,
-                cx,
-            );
-            center_pane_id
-        });
-        cx.executor().run_until_parked();
-
-        workspace.update_in(cx, |workspace, window, cx| {
-            assert_eq!(center_pane_id, workspace.active_pane().entity_id());
-
-            // Join into next from center pane into right
-            workspace.join_pane_into_next(workspace.active_pane().clone(), window, cx);
-        });
-
-        workspace.update_in(cx, |workspace, window, cx| {
-            let active_pane = workspace.active_pane();
-            assert_eq!(right_pane_id, active_pane.entity_id());
-            assert_eq!(2, active_pane.read(cx).items_len());
-            let item_ids_in_pane =
-                HashSet::from_iter(active_pane.read(cx).items().map(|item| item.item_id()));
-            assert!(item_ids_in_pane.contains(&center_item.item_id()));
-            assert!(item_ids_in_pane.contains(&right_item.item_id()));
-
-            // Join into next from right pane into bottom
-            workspace.join_pane_into_next(workspace.active_pane().clone(), window, cx);
-        });
-
-        workspace.update_in(cx, |workspace, window, cx| {
-            let active_pane = workspace.active_pane();
-            assert_eq!(bottom_pane_id, active_pane.entity_id());
-            assert_eq!(3, active_pane.read(cx).items_len());
-            let item_ids_in_pane =
-                HashSet::from_iter(active_pane.read(cx).items().map(|item| item.item_id()));
-            assert!(item_ids_in_pane.contains(&center_item.item_id()));
-            assert!(item_ids_in_pane.contains(&right_item.item_id()));
-            assert!(item_ids_in_pane.contains(&bottom_item.item_id()));
-
-            // Join into next from bottom pane into left
-            workspace.join_pane_into_next(workspace.active_pane().clone(), window, cx);
-        });
-
-        workspace.update_in(cx, |workspace, window, cx| {
-            let active_pane = workspace.active_pane();
-            assert_eq!(left_pane_id, active_pane.entity_id());
-            assert_eq!(4, active_pane.read(cx).items_len());
-            let item_ids_in_pane =
-                HashSet::from_iter(active_pane.read(cx).items().map(|item| item.item_id()));
-            assert!(item_ids_in_pane.contains(&center_item.item_id()));
-            assert!(item_ids_in_pane.contains(&right_item.item_id()));
-            assert!(item_ids_in_pane.contains(&bottom_item.item_id()));
-            assert!(item_ids_in_pane.contains(&left_item.item_id()));
-
-            // Join into next from left pane into top
-            workspace.join_pane_into_next(workspace.active_pane().clone(), window, cx);
-        });
-
-        workspace.update_in(cx, |workspace, window, cx| {
-            let active_pane = workspace.active_pane();
-            assert_eq!(top_pane_id, active_pane.entity_id());
-            assert_eq!(5, active_pane.read(cx).items_len());
-            let item_ids_in_pane =
-                HashSet::from_iter(active_pane.read(cx).items().map(|item| item.item_id()));
-            assert!(item_ids_in_pane.contains(&center_item.item_id()));
-            assert!(item_ids_in_pane.contains(&right_item.item_id()));
-            assert!(item_ids_in_pane.contains(&bottom_item.item_id()));
-            assert!(item_ids_in_pane.contains(&left_item.item_id()));
-            assert!(item_ids_in_pane.contains(&top_item.item_id()));
-
-            // Single pane left: no-op
-            workspace.join_pane_into_next(workspace.active_pane().clone(), window, cx)
-        });
-
-        workspace.update(cx, |workspace, _cx| {
-            let active_pane = workspace.active_pane();
-            assert_eq!(top_pane_id, active_pane.entity_id());
-        });
-    }
-
-    fn add_an_item_to_active_pane(
-        cx: &mut VisualTestContext,
-        workspace: &Entity<Workspace>,
-        item_id: u64,
-    ) -> Entity<TestItem> {
-        let item = cx.new(|cx| {
-            TestItem::new(cx).with_project_items(&[TestProjectItem::new(
-                item_id,
-                "item{item_id}.txt",
-                cx,
-            )])
-        });
-        workspace.update_in(cx, |workspace, window, cx| {
-            workspace.add_item_to_active_pane(Box::new(item.clone()), None, false, window, cx);
-        });
-        item
-    }
-
-    fn split_pane(cx: &mut VisualTestContext, workspace: &Entity<Workspace>) -> Entity<Pane> {
-        workspace.update_in(cx, |workspace, window, cx| {
-            workspace.split_pane(
-                workspace.active_pane().clone(),
-                SplitDirection::Right,
-                window,
-                cx,
-            )
-        })
-    }
-
-    #[gpui::test]
-    async fn test_join_all_panes(cx: &mut gpui::TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, None, cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-
-        add_an_item_to_active_pane(cx, &workspace, 1);
-        split_pane(cx, &workspace);
-        add_an_item_to_active_pane(cx, &workspace, 2);
-        split_pane(cx, &workspace); // empty pane
-        split_pane(cx, &workspace);
-        let last_item = add_an_item_to_active_pane(cx, &workspace, 3);
-
-        cx.executor().run_until_parked();
-
-        workspace.update(cx, |workspace, cx| {
-            let num_panes = workspace.panes().len();
-            let num_items_in_current_pane = workspace.active_pane().read(cx).items().count();
-            let active_item = workspace
-                .active_pane()
-                .read(cx)
-                .active_item()
-                .expect("item is in focus");
-
-            assert_eq!(num_panes, 4);
-            assert_eq!(num_items_in_current_pane, 1);
-            assert_eq!(active_item.item_id(), last_item.item_id());
-        });
-
-        workspace.update_in(cx, |workspace, window, cx| {
-            workspace.join_all_panes(window, cx);
-        });
-
-        workspace.update(cx, |workspace, cx| {
-            let num_panes = workspace.panes().len();
-            let num_items_in_current_pane = workspace.active_pane().read(cx).items().count();
-            let active_item = workspace
-                .active_pane()
-                .read(cx)
-                .active_item()
-                .expect("item is in focus");
-
-            assert_eq!(num_panes, 1);
-            assert_eq!(num_items_in_current_pane, 3);
-            assert_eq!(active_item.item_id(), last_item.item_id());
-        });
-    }
-    struct TestModal(FocusHandle);
-
-    impl TestModal {
-        fn new(_: &mut Window, cx: &mut Context<Self>) -> Self {
-            Self(cx.focus_handle())
-        }
-    }
-
-    impl EventEmitter<DismissEvent> for TestModal {}
-
-    impl Focusable for TestModal {
-        fn focus_handle(&self, _cx: &App) -> FocusHandle {
-            self.0.clone()
-        }
-    }
-
-    impl ModalView for TestModal {}
-
-    impl Render for TestModal {
-        fn render(
-            &mut self,
-            _window: &mut Window,
-            _cx: &mut Context<TestModal>,
-        ) -> impl IntoElement {
-            div().track_focus(&self.0)
-        }
-    }
-
-    #[gpui::test]
-    async fn test_panels(cx: &mut gpui::TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-
-        let project = Project::test(fs, [], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-
-        let (panel_1, panel_2) = workspace.update_in(cx, |workspace, window, cx| {
-            let panel_1 = cx.new(|cx| TestPanel::new(DockPosition::Left, 100, cx));
-            workspace.add_panel(panel_1.clone(), window, cx);
-            workspace.toggle_dock(DockPosition::Left, window, cx);
-            let panel_2 = cx.new(|cx| TestPanel::new(DockPosition::Right, 101, cx));
-            workspace.add_panel(panel_2.clone(), window, cx);
-            workspace.toggle_dock(DockPosition::Right, window, cx);
-
-            let left_dock = workspace.left_dock();
-            assert_eq!(
-                left_dock.read(cx).visible_panel().unwrap().panel_id(),
-                panel_1.panel_id()
-            );
-            assert_eq!(
-                left_dock.read(cx).active_panel_size(window, cx).unwrap(),
-                panel_1.size(window, cx)
-            );
-
-            left_dock.update(cx, |left_dock, cx| {
-                left_dock.resize_active_panel(Some(px(1337.)), window, cx)
-            });
-            assert_eq!(
-                workspace
-                    .right_dock()
-                    .read(cx)
-                    .visible_panel()
-                    .unwrap()
-                    .panel_id(),
-                panel_2.panel_id(),
-            );
-
-            (panel_1, panel_2)
-        });
-
-        // Move panel_1 to the right
-        panel_1.update_in(cx, |panel_1, window, cx| {
-            panel_1.set_position(DockPosition::Right, window, cx)
-        });
-
-        workspace.update_in(cx, |workspace, window, cx| {
-            // Since panel_1 was visible on the left, it should now be visible now that it's been moved to the right.
-            // Since it was the only panel on the left, the left dock should now be closed.
-            assert!(!workspace.left_dock().read(cx).is_open());
-            assert!(workspace.left_dock().read(cx).visible_panel().is_none());
-            let right_dock = workspace.right_dock();
-            assert_eq!(
-                right_dock.read(cx).visible_panel().unwrap().panel_id(),
-                panel_1.panel_id()
-            );
-            assert_eq!(
-                right_dock.read(cx).active_panel_size(window, cx).unwrap(),
-                px(1337.)
-            );
-
-            // Now we move panel_2 to the left
-            panel_2.set_position(DockPosition::Left, window, cx);
-        });
-
-        workspace.update(cx, |workspace, cx| {
-            // Since panel_2 was not visible on the right, we don't open the left dock.
-            assert!(!workspace.left_dock().read(cx).is_open());
-            // And the right dock is unaffected in its displaying of panel_1
-            assert!(workspace.right_dock().read(cx).is_open());
-            assert_eq!(
-                workspace
-                    .right_dock()
-                    .read(cx)
-                    .visible_panel()
-                    .unwrap()
-                    .panel_id(),
-                panel_1.panel_id(),
-            );
-        });
-
-        // Move panel_1 back to the left
-        panel_1.update_in(cx, |panel_1, window, cx| {
-            panel_1.set_position(DockPosition::Left, window, cx)
-        });
-
-        workspace.update_in(cx, |workspace, window, cx| {
-            // Since panel_1 was visible on the right, we open the left dock and make panel_1 active.
-            let left_dock = workspace.left_dock();
-            assert!(left_dock.read(cx).is_open());
-            assert_eq!(
-                left_dock.read(cx).visible_panel().unwrap().panel_id(),
-                panel_1.panel_id()
-            );
-            assert_eq!(
-                left_dock.read(cx).active_panel_size(window, cx).unwrap(),
-                px(1337.)
-            );
-            // And the right dock should be closed as it no longer has any panels.
-            assert!(!workspace.right_dock().read(cx).is_open());
-
-            // Now we move panel_1 to the bottom
-            panel_1.set_position(DockPosition::Bottom, window, cx);
-        });
-
-        workspace.update_in(cx, |workspace, window, cx| {
-            // Since panel_1 was visible on the left, we close the left dock.
-            assert!(!workspace.left_dock().read(cx).is_open());
-            // The bottom dock is sized based on the panel's default size,
-            // since the panel orientation changed from vertical to horizontal.
-            let bottom_dock = workspace.bottom_dock();
-            assert_eq!(
-                bottom_dock.read(cx).active_panel_size(window, cx).unwrap(),
-                panel_1.size(window, cx),
-            );
-            // Close bottom dock and move panel_1 back to the left.
-            bottom_dock.update(cx, |bottom_dock, cx| {
-                bottom_dock.set_open(false, window, cx)
-            });
-            panel_1.set_position(DockPosition::Left, window, cx);
-        });
-
-        // Emit activated event on panel 1
-        panel_1.update(cx, |_, cx| cx.emit(PanelEvent::Activate));
-
-        // Now the left dock is open and panel_1 is active and focused.
-        workspace.update_in(cx, |workspace, window, cx| {
-            let left_dock = workspace.left_dock();
-            assert!(left_dock.read(cx).is_open());
-            assert_eq!(
-                left_dock.read(cx).visible_panel().unwrap().panel_id(),
-                panel_1.panel_id(),
-            );
-            assert!(panel_1.focus_handle(cx).is_focused(window));
-        });
-
-        // Emit closed event on panel 2, which is not active
-        panel_2.update(cx, |_, cx| cx.emit(PanelEvent::Close));
-
-        // Wo don't close the left dock, because panel_2 wasn't the active panel
-        workspace.update(cx, |workspace, cx| {
-            let left_dock = workspace.left_dock();
-            assert!(left_dock.read(cx).is_open());
-            assert_eq!(
-                left_dock.read(cx).visible_panel().unwrap().panel_id(),
-                panel_1.panel_id(),
-            );
-        });
-
-        // Emitting a ZoomIn event shows the panel as zoomed.
-        panel_1.update(cx, |_, cx| cx.emit(PanelEvent::ZoomIn));
-        workspace.read_with(cx, |workspace, _| {
-            assert_eq!(workspace.zoomed, Some(panel_1.to_any().downgrade()));
-            assert_eq!(workspace.zoomed_position, Some(DockPosition::Left));
-        });
-
-        // Move panel to another dock while it is zoomed
-        panel_1.update_in(cx, |panel, window, cx| {
-            panel.set_position(DockPosition::Right, window, cx)
-        });
-        workspace.read_with(cx, |workspace, _| {
-            assert_eq!(workspace.zoomed, Some(panel_1.to_any().downgrade()));
-
-            assert_eq!(workspace.zoomed_position, Some(DockPosition::Right));
-        });
-
-        // This is a helper for getting a:
-        // - valid focus on an element,
-        // - that isn't a part of the panes and panels system of the Workspace,
-        // - and doesn't trigger the 'on_focus_lost' API.
-        let focus_other_view = {
-            let workspace = workspace.clone();
-            move |cx: &mut VisualTestContext| {
-                workspace.update_in(cx, |workspace, window, cx| {
-                    if workspace.active_modal::<TestModal>(cx).is_some() {
-                        workspace.toggle_modal(window, cx, TestModal::new);
-                        workspace.toggle_modal(window, cx, TestModal::new);
-                    } else {
-                        workspace.toggle_modal(window, cx, TestModal::new);
-                    }
-                })
-            }
-        };
-
-        // If focus is transferred to another view that's not a panel or another pane, we still show
-        // the panel as zoomed.
-        focus_other_view(cx);
-        workspace.read_with(cx, |workspace, _| {
-            assert_eq!(workspace.zoomed, Some(panel_1.to_any().downgrade()));
-            assert_eq!(workspace.zoomed_position, Some(DockPosition::Right));
-        });
-
-        // If focus is transferred elsewhere in the workspace, the panel is no longer zoomed.
-        workspace.update_in(cx, |_workspace, window, cx| {
-            cx.focus_self(window);
-        });
-        workspace.read_with(cx, |workspace, _| {
-            assert_eq!(workspace.zoomed, None);
-            assert_eq!(workspace.zoomed_position, None);
-        });
-
-        // If focus is transferred again to another view that's not a panel or a pane, we won't
-        // show the panel as zoomed because it wasn't zoomed before.
-        focus_other_view(cx);
-        workspace.read_with(cx, |workspace, _| {
-            assert_eq!(workspace.zoomed, None);
-            assert_eq!(workspace.zoomed_position, None);
-        });
-
-        // When the panel is activated, it is zoomed again.
-        cx.dispatch_action(ToggleRightDock);
-        workspace.read_with(cx, |workspace, _| {
-            assert_eq!(workspace.zoomed, Some(panel_1.to_any().downgrade()));
-            assert_eq!(workspace.zoomed_position, Some(DockPosition::Right));
-        });
-
-        // Emitting a ZoomOut event unzooms the panel.
-        panel_1.update(cx, |_, cx| cx.emit(PanelEvent::ZoomOut));
-        workspace.read_with(cx, |workspace, _| {
-            assert_eq!(workspace.zoomed, None);
-            assert_eq!(workspace.zoomed_position, None);
-        });
-
-        // Emit closed event on panel 1, which is active
-        panel_1.update(cx, |_, cx| cx.emit(PanelEvent::Close));
-
-        // Now the left dock is closed, because panel_1 was the active panel
-        workspace.update(cx, |workspace, cx| {
-            let right_dock = workspace.right_dock();
-            assert!(!right_dock.read(cx).is_open());
-        });
-    }
-
-    #[gpui::test]
-    async fn test_no_save_prompt_when_multi_buffer_dirty_items_closed(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.background_executor.clone());
-        let project = Project::test(fs, [], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        let dirty_regular_buffer = cx.new(|cx| {
-            TestItem::new(cx)
-                .with_dirty(true)
-                .with_label("1.txt")
-                .with_project_items(&[dirty_project_item(1, "1.txt", cx)])
-        });
-        let dirty_regular_buffer_2 = cx.new(|cx| {
-            TestItem::new(cx)
-                .with_dirty(true)
-                .with_label("2.txt")
-                .with_project_items(&[dirty_project_item(2, "2.txt", cx)])
-        });
-        let dirty_multi_buffer_with_both = cx.new(|cx| {
-            TestItem::new(cx)
-                .with_dirty(true)
-                .with_buffer_kind(ItemBufferKind::Multibuffer)
-                .with_label("Fake Project Search")
-                .with_project_items(&[
-                    dirty_regular_buffer.read(cx).project_items[0].clone(),
-                    dirty_regular_buffer_2.read(cx).project_items[0].clone(),
-                ])
-        });
-        let multi_buffer_with_both_files_id = dirty_multi_buffer_with_both.item_id();
-        workspace.update_in(cx, |workspace, window, cx| {
-            workspace.add_item(
-                pane.clone(),
-                Box::new(dirty_regular_buffer.clone()),
-                None,
-                false,
-                false,
-                window,
-                cx,
-            );
-            workspace.add_item(
-                pane.clone(),
-                Box::new(dirty_regular_buffer_2.clone()),
-                None,
-                false,
-                false,
-                window,
-                cx,
-            );
-            workspace.add_item(
-                pane.clone(),
-                Box::new(dirty_multi_buffer_with_both.clone()),
-                None,
-                false,
-                false,
-                window,
-                cx,
-            );
-        });
-
-        pane.update_in(cx, |pane, window, cx| {
-            pane.activate_item(2, true, true, window, cx);
-            assert_eq!(
-                pane.active_item().unwrap().item_id(),
-                multi_buffer_with_both_files_id,
-                "Should select the multi buffer in the pane"
-            );
-        });
-        let close_all_but_multi_buffer_task = pane.update_in(cx, |pane, window, cx| {
-            pane.close_other_items(
-                &CloseOtherItems {
-                    save_intent: Some(SaveIntent::Save),
-                    close_pinned: true,
-                },
-                None,
-                window,
-                cx,
-            )
-        });
-        cx.background_executor.run_until_parked();
-        assert!(!cx.has_pending_prompt());
-        close_all_but_multi_buffer_task
-            .await
-            .expect("Closing all buffers but the multi buffer failed");
-        pane.update(cx, |pane, cx| {
-            assert_eq!(dirty_regular_buffer.read(cx).save_count, 1);
-            assert_eq!(dirty_multi_buffer_with_both.read(cx).save_count, 0);
-            assert_eq!(dirty_regular_buffer_2.read(cx).save_count, 1);
-            assert_eq!(pane.items_len(), 1);
-            assert_eq!(
-                pane.active_item().unwrap().item_id(),
-                multi_buffer_with_both_files_id,
-                "Should have only the multi buffer left in the pane"
-            );
-            assert!(
-                dirty_multi_buffer_with_both.read(cx).is_dirty,
-                "The multi buffer containing the unsaved buffer should still be dirty"
-            );
-        });
-
-        dirty_regular_buffer.update(cx, |buffer, cx| {
-            buffer.project_items[0].update(cx, |pi, _| pi.is_dirty = true)
-        });
-
-        let close_multi_buffer_task = pane.update_in(cx, |pane, window, cx| {
-            pane.close_active_item(
-                &CloseActiveItem {
-                    save_intent: Some(SaveIntent::Close),
-                    close_pinned: false,
-                },
-                window,
-                cx,
-            )
-        });
-        cx.background_executor.run_until_parked();
-        assert!(
-            cx.has_pending_prompt(),
-            "Dirty multi buffer should prompt a save dialog"
-        );
-        cx.simulate_prompt_answer("Save");
-        cx.background_executor.run_until_parked();
-        close_multi_buffer_task
-            .await
-            .expect("Closing the multi buffer failed");
-        pane.update(cx, |pane, cx| {
-            assert_eq!(
-                dirty_multi_buffer_with_both.read(cx).save_count,
-                1,
-                "Multi buffer item should get be saved"
-            );
-            // Test impl does not save inner items, so we do not assert them
-            assert_eq!(
-                pane.items_len(),
-                0,
-                "No more items should be left in the pane"
-            );
-            assert!(pane.active_item().is_none());
-        });
-    }
-
-    #[gpui::test]
-    async fn test_save_prompt_when_dirty_multi_buffer_closed_with_some_of_its_dirty_items_not_present_in_the_pane(
-        cx: &mut TestAppContext,
-    ) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.background_executor.clone());
-        let project = Project::test(fs, [], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        let dirty_regular_buffer = cx.new(|cx| {
-            TestItem::new(cx)
-                .with_dirty(true)
-                .with_label("1.txt")
-                .with_project_items(&[dirty_project_item(1, "1.txt", cx)])
-        });
-        let dirty_regular_buffer_2 = cx.new(|cx| {
-            TestItem::new(cx)
-                .with_dirty(true)
-                .with_label("2.txt")
-                .with_project_items(&[dirty_project_item(2, "2.txt", cx)])
-        });
-        let clear_regular_buffer = cx.new(|cx| {
-            TestItem::new(cx)
-                .with_label("3.txt")
-                .with_project_items(&[TestProjectItem::new(3, "3.txt", cx)])
-        });
-
-        let dirty_multi_buffer_with_both = cx.new(|cx| {
-            TestItem::new(cx)
-                .with_dirty(true)
-                .with_buffer_kind(ItemBufferKind::Multibuffer)
-                .with_label("Fake Project Search")
-                .with_project_items(&[
-                    dirty_regular_buffer.read(cx).project_items[0].clone(),
-                    dirty_regular_buffer_2.read(cx).project_items[0].clone(),
-                    clear_regular_buffer.read(cx).project_items[0].clone(),
-                ])
-        });
-        let multi_buffer_with_both_files_id = dirty_multi_buffer_with_both.item_id();
-        workspace.update_in(cx, |workspace, window, cx| {
-            workspace.add_item(
-                pane.clone(),
-                Box::new(dirty_regular_buffer.clone()),
-                None,
-                false,
-                false,
-                window,
-                cx,
-            );
-            workspace.add_item(
-                pane.clone(),
-                Box::new(dirty_multi_buffer_with_both.clone()),
-                None,
-                false,
-                false,
-                window,
-                cx,
-            );
-        });
-
-        pane.update_in(cx, |pane, window, cx| {
-            pane.activate_item(1, true, true, window, cx);
-            assert_eq!(
-                pane.active_item().unwrap().item_id(),
-                multi_buffer_with_both_files_id,
-                "Should select the multi buffer in the pane"
-            );
-        });
-        let _close_multi_buffer_task = pane.update_in(cx, |pane, window, cx| {
-            pane.close_active_item(
-                &CloseActiveItem {
-                    save_intent: None,
-                    close_pinned: false,
-                },
-                window,
-                cx,
-            )
-        });
-        cx.background_executor.run_until_parked();
-        assert!(
-            cx.has_pending_prompt(),
-            "With one dirty item from the multi buffer not being in the pane, a save prompt should be shown"
-        );
-    }
-
-    /// Tests that when `close_on_file_delete` is enabled, files are automatically
-    /// closed when they are deleted from disk.
-    #[gpui::test]
-    async fn test_close_on_disk_deletion_enabled(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        // Enable the close_on_disk_deletion setting
-        cx.update_global(|store: &mut SettingsStore, cx| {
-            store.update_user_settings(cx, |settings| {
-                settings.workspace.close_on_file_delete = Some(true);
-            });
-        });
-
-        let fs = FakeFs::new(cx.background_executor.clone());
-        let project = Project::test(fs, [], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        // Create a test item that simulates a file
-        let item = cx.new(|cx| {
-            TestItem::new(cx)
-                .with_label("test.txt")
-                .with_project_items(&[TestProjectItem::new(1, "test.txt", cx)])
-        });
-
-        // Add item to workspace
-        workspace.update_in(cx, |workspace, window, cx| {
-            workspace.add_item(
-                pane.clone(),
-                Box::new(item.clone()),
-                None,
-                false,
-                false,
-                window,
-                cx,
-            );
-        });
-
-        // Verify the item is in the pane
-        pane.read_with(cx, |pane, _| {
-            assert_eq!(pane.items().count(), 1);
-        });
-
-        // Simulate file deletion by setting the item's deleted state
-        item.update(cx, |item, _| {
-            item.set_has_deleted_file(true);
-        });
-
-        // Emit UpdateTab event to trigger the close behavior
-        cx.run_until_parked();
-        item.update(cx, |_, cx| {
-            cx.emit(ItemEvent::UpdateTab);
-        });
-
-        // Allow the close operation to complete
-        cx.run_until_parked();
-
-        // Verify the item was automatically closed
-        pane.read_with(cx, |pane, _| {
-            assert_eq!(
-                pane.items().count(),
-                0,
-                "Item should be automatically closed when file is deleted"
-            );
-        });
-    }
-
-    /// Tests that when `close_on_file_delete` is disabled (default), files remain
-    /// open with a strikethrough when they are deleted from disk.
-    #[gpui::test]
-    async fn test_close_on_disk_deletion_disabled(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        // Ensure close_on_disk_deletion is disabled (default)
-        cx.update_global(|store: &mut SettingsStore, cx| {
-            store.update_user_settings(cx, |settings| {
-                settings.workspace.close_on_file_delete = Some(false);
-            });
-        });
-
-        let fs = FakeFs::new(cx.background_executor.clone());
-        let project = Project::test(fs, [], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        // Create a test item that simulates a file
-        let item = cx.new(|cx| {
-            TestItem::new(cx)
-                .with_label("test.txt")
-                .with_project_items(&[TestProjectItem::new(1, "test.txt", cx)])
-        });
-
-        // Add item to workspace
-        workspace.update_in(cx, |workspace, window, cx| {
-            workspace.add_item(
-                pane.clone(),
-                Box::new(item.clone()),
-                None,
-                false,
-                false,
-                window,
-                cx,
-            );
-        });
-
-        // Verify the item is in the pane
-        pane.read_with(cx, |pane, _| {
-            assert_eq!(pane.items().count(), 1);
-        });
-
-        // Simulate file deletion
-        item.update(cx, |item, _| {
-            item.set_has_deleted_file(true);
-        });
-
-        // Emit UpdateTab event
-        cx.run_until_parked();
-        item.update(cx, |_, cx| {
-            cx.emit(ItemEvent::UpdateTab);
-        });
-
-        // Allow any potential close operation to complete
-        cx.run_until_parked();
-
-        // Verify the item remains open (with strikethrough)
-        pane.read_with(cx, |pane, _| {
-            assert_eq!(
-                pane.items().count(),
-                1,
-                "Item should remain open when close_on_disk_deletion is disabled"
-            );
-        });
-
-        // Verify the item shows as deleted
-        item.read_with(cx, |item, _| {
-            assert!(
-                item.has_deleted_file,
-                "Item should be marked as having deleted file"
-            );
-        });
-    }
-
-    /// Tests that dirty files are not automatically closed when deleted from disk,
-    /// even when `close_on_file_delete` is enabled. This ensures users don't lose
-    /// unsaved changes without being prompted.
-    #[gpui::test]
-    async fn test_close_on_disk_deletion_with_dirty_file(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        // Enable the close_on_file_delete setting
-        cx.update_global(|store: &mut SettingsStore, cx| {
-            store.update_user_settings(cx, |settings| {
-                settings.workspace.close_on_file_delete = Some(true);
-            });
-        });
-
-        let fs = FakeFs::new(cx.background_executor.clone());
-        let project = Project::test(fs, [], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        // Create a dirty test item
-        let item = cx.new(|cx| {
-            TestItem::new(cx)
-                .with_dirty(true)
-                .with_label("test.txt")
-                .with_project_items(&[TestProjectItem::new(1, "test.txt", cx)])
-        });
-
-        // Add item to workspace
-        workspace.update_in(cx, |workspace, window, cx| {
-            workspace.add_item(
-                pane.clone(),
-                Box::new(item.clone()),
-                None,
-                false,
-                false,
-                window,
-                cx,
-            );
-        });
-
-        // Simulate file deletion
-        item.update(cx, |item, _| {
-            item.set_has_deleted_file(true);
-        });
-
-        // Emit UpdateTab event to trigger the close behavior
-        cx.run_until_parked();
-        item.update(cx, |_, cx| {
-            cx.emit(ItemEvent::UpdateTab);
-        });
-
-        // Allow any potential close operation to complete
-        cx.run_until_parked();
-
-        // Verify the item remains open (dirty files are not auto-closed)
-        pane.read_with(cx, |pane, _| {
-            assert_eq!(
-                pane.items().count(),
-                1,
-                "Dirty items should not be automatically closed even when file is deleted"
-            );
-        });
-
-        // Verify the item is marked as deleted and still dirty
-        item.read_with(cx, |item, _| {
-            assert!(
-                item.has_deleted_file,
-                "Item should be marked as having deleted file"
-            );
-            assert!(item.is_dirty, "Item should still be dirty");
-        });
-    }
-
-    /// Tests that navigation history is cleaned up when files are auto-closed
-    /// due to deletion from disk.
-    #[gpui::test]
-    async fn test_close_on_disk_deletion_cleans_navigation_history(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        // Enable the close_on_file_delete setting
-        cx.update_global(|store: &mut SettingsStore, cx| {
-            store.update_user_settings(cx, |settings| {
-                settings.workspace.close_on_file_delete = Some(true);
-            });
-        });
-
-        let fs = FakeFs::new(cx.background_executor.clone());
-        let project = Project::test(fs, [], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        // Create test items
-        let item1 = cx.new(|cx| {
-            TestItem::new(cx)
-                .with_label("test1.txt")
-                .with_project_items(&[TestProjectItem::new(1, "test1.txt", cx)])
-        });
-        let item1_id = item1.item_id();
-
-        let item2 = cx.new(|cx| {
-            TestItem::new(cx)
-                .with_label("test2.txt")
-                .with_project_items(&[TestProjectItem::new(2, "test2.txt", cx)])
-        });
-
-        // Add items to workspace
-        workspace.update_in(cx, |workspace, window, cx| {
-            workspace.add_item(
-                pane.clone(),
-                Box::new(item1.clone()),
-                None,
-                false,
-                false,
-                window,
-                cx,
-            );
-            workspace.add_item(
-                pane.clone(),
-                Box::new(item2.clone()),
-                None,
-                false,
-                false,
-                window,
-                cx,
-            );
-        });
-
-        // Activate item1 to ensure it gets navigation entries
-        pane.update_in(cx, |pane, window, cx| {
-            pane.activate_item(0, true, true, window, cx);
-        });
-
-        // Switch to item2 and back to create navigation history
-        pane.update_in(cx, |pane, window, cx| {
-            pane.activate_item(1, true, true, window, cx);
-        });
-        cx.run_until_parked();
-
-        pane.update_in(cx, |pane, window, cx| {
-            pane.activate_item(0, true, true, window, cx);
-        });
-        cx.run_until_parked();
-
-        // Simulate file deletion for item1
-        item1.update(cx, |item, _| {
-            item.set_has_deleted_file(true);
-        });
-
-        // Emit UpdateTab event to trigger the close behavior
-        item1.update(cx, |_, cx| {
-            cx.emit(ItemEvent::UpdateTab);
-        });
-        cx.run_until_parked();
-
-        // Verify item1 was closed
-        pane.read_with(cx, |pane, _| {
-            assert_eq!(
-                pane.items().count(),
-                1,
-                "Should have 1 item remaining after auto-close"
-            );
-        });
-
-        // Check navigation history after close
-        let has_item = pane.read_with(cx, |pane, cx| {
-            let mut has_item = false;
-            pane.nav_history().for_each_entry(cx, |entry, _| {
-                if entry.item.id() == item1_id {
-                    has_item = true;
-                }
-            });
-            has_item
-        });
-
-        assert!(
-            !has_item,
-            "Navigation history should not contain closed item entries"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_no_save_prompt_when_dirty_multi_buffer_closed_with_all_of_its_dirty_items_present_in_the_pane(
-        cx: &mut TestAppContext,
-    ) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.background_executor.clone());
-        let project = Project::test(fs, [], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-        let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
-
-        let dirty_regular_buffer = cx.new(|cx| {
-            TestItem::new(cx)
-                .with_dirty(true)
-                .with_label("1.txt")
-                .with_project_items(&[dirty_project_item(1, "1.txt", cx)])
-        });
-        let dirty_regular_buffer_2 = cx.new(|cx| {
-            TestItem::new(cx)
-                .with_dirty(true)
-                .with_label("2.txt")
-                .with_project_items(&[dirty_project_item(2, "2.txt", cx)])
-        });
-        let clear_regular_buffer = cx.new(|cx| {
-            TestItem::new(cx)
-                .with_label("3.txt")
-                .with_project_items(&[TestProjectItem::new(3, "3.txt", cx)])
-        });
-
-        let dirty_multi_buffer = cx.new(|cx| {
-            TestItem::new(cx)
-                .with_dirty(true)
-                .with_buffer_kind(ItemBufferKind::Multibuffer)
-                .with_label("Fake Project Search")
-                .with_project_items(&[
-                    dirty_regular_buffer.read(cx).project_items[0].clone(),
-                    dirty_regular_buffer_2.read(cx).project_items[0].clone(),
-                    clear_regular_buffer.read(cx).project_items[0].clone(),
-                ])
-        });
-        workspace.update_in(cx, |workspace, window, cx| {
-            workspace.add_item(
-                pane.clone(),
-                Box::new(dirty_regular_buffer.clone()),
-                None,
-                false,
-                false,
-                window,
-                cx,
-            );
-            workspace.add_item(
-                pane.clone(),
-                Box::new(dirty_regular_buffer_2.clone()),
-                None,
-                false,
-                false,
-                window,
-                cx,
-            );
-            workspace.add_item(
-                pane.clone(),
-                Box::new(dirty_multi_buffer.clone()),
-                None,
-                false,
-                false,
-                window,
-                cx,
-            );
-        });
-
-        pane.update_in(cx, |pane, window, cx| {
-            pane.activate_item(2, true, true, window, cx);
-            assert_eq!(
-                pane.active_item().unwrap().item_id(),
-                dirty_multi_buffer.item_id(),
-                "Should select the multi buffer in the pane"
-            );
-        });
-        let close_multi_buffer_task = pane.update_in(cx, |pane, window, cx| {
-            pane.close_active_item(
-                &CloseActiveItem {
-                    save_intent: None,
-                    close_pinned: false,
-                },
-                window,
-                cx,
-            )
-        });
-        cx.background_executor.run_until_parked();
-        assert!(
-            !cx.has_pending_prompt(),
-            "All dirty items from the multi buffer are in the pane still, no save prompts should be shown"
-        );
-        close_multi_buffer_task
-            .await
-            .expect("Closing multi buffer failed");
-        pane.update(cx, |pane, cx| {
-            assert_eq!(dirty_regular_buffer.read(cx).save_count, 0);
-            assert_eq!(dirty_multi_buffer.read(cx).save_count, 0);
-            assert_eq!(dirty_regular_buffer_2.read(cx).save_count, 0);
-            assert_eq!(
-                pane.items()
-                    .map(|item| item.item_id())
-                    .sorted()
-                    .collect::<Vec<_>>(),
-                vec![
-                    dirty_regular_buffer.item_id(),
-                    dirty_regular_buffer_2.item_id(),
-                ],
-                "Should have no multi buffer left in the pane"
-            );
-            assert!(dirty_regular_buffer.read(cx).is_dirty);
-            assert!(dirty_regular_buffer_2.read(cx).is_dirty);
-        });
-    }
-
-    #[gpui::test]
-    async fn test_move_focused_panel_to_next_position(cx: &mut gpui::TestAppContext) {
-        init_test(cx);
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, [], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
-
-        // Add a new panel to the right dock, opening the dock and setting the
-        // focus to the new panel.
-        let panel = workspace.update_in(cx, |workspace, window, cx| {
-            let panel = cx.new(|cx| TestPanel::new(DockPosition::Right, 100, cx));
-            workspace.add_panel(panel.clone(), window, cx);
-
-            workspace
-                .right_dock()
-                .update(cx, |right_dock, cx| right_dock.set_open(true, window, cx));
-
-            workspace.toggle_panel_focus::<TestPanel>(window, cx);
-
-            panel
-        });
-
-        // Dispatch the `MoveFocusedPanelToNextPosition` action, moving the
-        // panel to the next valid position which, in this case, is the left
-        // dock.
-        cx.dispatch_action(MoveFocusedPanelToNextPosition);
-        workspace.update(cx, |workspace, cx| {
-            assert!(workspace.left_dock().read(cx).is_open());
-            assert_eq!(panel.read(cx).position, DockPosition::Left);
-        });
-
-        // Dispatch the `MoveFocusedPanelToNextPosition` action, moving the
-        // panel to the next valid position which, in this case, is the bottom
-        // dock.
-        cx.dispatch_action(MoveFocusedPanelToNextPosition);
-        workspace.update(cx, |workspace, cx| {
-            assert!(workspace.bottom_dock().read(cx).is_open());
-            assert_eq!(panel.read(cx).position, DockPosition::Bottom);
-        });
-
-        // Dispatch the `MoveFocusedPanelToNextPosition` action again, this time
-        // around moving the panel to its initial position, the right dock.
-        cx.dispatch_action(MoveFocusedPanelToNextPosition);
-        workspace.update(cx, |workspace, cx| {
-            assert!(workspace.right_dock().read(cx).is_open());
-            assert_eq!(panel.read(cx).position, DockPosition::Right);
-        });
-
-        // Remove focus from the panel, ensuring that, if the panel is not
-        // focused, the `MoveFocusedPanelToNextPosition` action does not update
-        // the panel's position, so the panel is still in the right dock.
-        workspace.update_in(cx, |workspace, window, cx| {
-            workspace.toggle_panel_focus::<TestPanel>(window, cx);
-        });
-
-        cx.dispatch_action(MoveFocusedPanelToNextPosition);
-        workspace.update(cx, |workspace, cx| {
-            assert!(workspace.right_dock().read(cx).is_open());
-            assert_eq!(panel.read(cx).position, DockPosition::Right);
-        });
-    }
-
-    #[gpui::test]
-    async fn test_moving_items_create_panes(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, [], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-        let item_1 = cx.new(|cx| {
-            TestItem::new(cx).with_project_items(&[TestProjectItem::new(1, "first.txt", cx)])
-        });
-        workspace.update_in(cx, |workspace, window, cx| {
-            workspace.add_item_to_active_pane(Box::new(item_1), None, true, window, cx);
-            workspace.move_item_to_pane_in_direction(
-                &MoveItemToPaneInDirection {
-                    direction: SplitDirection::Right,
-                    focus: true,
-                    clone: false,
-                },
-                window,
-                cx,
-            );
-            workspace.move_item_to_pane_at_index(
-                &MoveItemToPane {
-                    destination: 3,
-                    focus: true,
-                    clone: false,
-                },
-                window,
-                cx,
-            );
-
-            assert_eq!(workspace.panes.len(), 1, "No new panes were created");
-            assert_eq!(
-                pane_items_paths(&workspace.active_pane, cx),
-                vec!["first.txt".to_string()],
-                "Single item was not moved anywhere"
-            );
-        });
-
-        let item_2 = cx.new(|cx| {
-            TestItem::new(cx).with_project_items(&[TestProjectItem::new(2, "second.txt", cx)])
-        });
-        workspace.update_in(cx, |workspace, window, cx| {
-            workspace.add_item_to_active_pane(Box::new(item_2), None, true, window, cx);
-            assert_eq!(
-                pane_items_paths(&workspace.panes[0], cx),
-                vec!["first.txt".to_string(), "second.txt".to_string()],
-            );
-            workspace.move_item_to_pane_in_direction(
-                &MoveItemToPaneInDirection {
-                    direction: SplitDirection::Right,
-                    focus: true,
-                    clone: false,
-                },
-                window,
-                cx,
-            );
-
-            assert_eq!(workspace.panes.len(), 2, "A new pane should be created");
-            assert_eq!(
-                pane_items_paths(&workspace.panes[0], cx),
-                vec!["first.txt".to_string()],
-                "After moving, one item should be left in the original pane"
-            );
-            assert_eq!(
-                pane_items_paths(&workspace.panes[1], cx),
-                vec!["second.txt".to_string()],
-                "New item should have been moved to the new pane"
-            );
-        });
-
-        let item_3 = cx.new(|cx| {
-            TestItem::new(cx).with_project_items(&[TestProjectItem::new(3, "third.txt", cx)])
-        });
-        workspace.update_in(cx, |workspace, window, cx| {
-            let original_pane = workspace.panes[0].clone();
-            workspace.set_active_pane(&original_pane, window, cx);
-            workspace.add_item_to_active_pane(Box::new(item_3), None, true, window, cx);
-            assert_eq!(workspace.panes.len(), 2, "No new panes were created");
-            assert_eq!(
-                pane_items_paths(&workspace.active_pane, cx),
-                vec!["first.txt".to_string(), "third.txt".to_string()],
-                "New pane should be ready to move one item out"
-            );
-
-            workspace.move_item_to_pane_at_index(
-                &MoveItemToPane {
-                    destination: 3,
-                    focus: true,
-                    clone: false,
-                },
-                window,
-                cx,
-            );
-            assert_eq!(workspace.panes.len(), 3, "A new pane should be created");
-            assert_eq!(
-                pane_items_paths(&workspace.active_pane, cx),
-                vec!["first.txt".to_string()],
-                "After moving, one item should be left in the original pane"
-            );
-            assert_eq!(
-                pane_items_paths(&workspace.panes[1], cx),
-                vec!["second.txt".to_string()],
-                "Previously created pane should be unchanged"
-            );
-            assert_eq!(
-                pane_items_paths(&workspace.panes[2], cx),
-                vec!["third.txt".to_string()],
-                "New item should have been moved to the new pane"
-            );
-        });
-    }
-
-    #[gpui::test]
-    async fn test_moving_items_can_clone_panes(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, [], cx).await;
-        let (workspace, cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-        let item_1 = cx.new(|cx| {
-            TestItem::new(cx).with_project_items(&[TestProjectItem::new(1, "first.txt", cx)])
-        });
-        workspace.update_in(cx, |workspace, window, cx| {
-            workspace.add_item_to_active_pane(Box::new(item_1), None, true, window, cx);
-            workspace.move_item_to_pane_in_direction(
-                &MoveItemToPaneInDirection {
-                    direction: SplitDirection::Right,
-                    focus: true,
-                    clone: true,
-                },
-                window,
-                cx,
-            );
-            workspace.move_item_to_pane_at_index(
-                &MoveItemToPane {
-                    destination: 3,
-                    focus: true,
-                    clone: true,
-                },
-                window,
-                cx,
-            );
-        });
-        cx.run_until_parked();
-
-        workspace.update(cx, |workspace, cx| {
-            assert_eq!(workspace.panes.len(), 3, "Two new panes were created");
-            for pane in workspace.panes() {
-                assert_eq!(
-                    pane_items_paths(pane, cx),
-                    vec!["first.txt".to_string()],
-                    "Single item exists in all panes"
-                );
-            }
-        });
-
-        // verify that the active pane has been updated after waiting for the
-        // pane focus event to fire and resolve
-        workspace.read_with(cx, |workspace, _app| {
-            assert_eq!(
-                workspace.active_pane(),
-                &workspace.panes[2],
-                "The third pane should be the active one: {:?}",
-                workspace.panes
-            );
-        })
-    }
-
-    mod register_project_item_tests {
-
-        use super::*;
-
-        // View
-        struct TestPngItemView {
-            focus_handle: FocusHandle,
-        }
-        // Model
-        struct TestPngItem {}
-
-        impl project::ProjectItem for TestPngItem {
-            fn try_open(
-                _project: &Entity<Project>,
-                path: &ProjectPath,
-                cx: &mut App,
-            ) -> Option<Task<anyhow::Result<Entity<Self>>>> {
-                if path.path.extension().unwrap() == "png" {
-                    Some(cx.spawn(async move |cx| cx.new(|_| TestPngItem {})))
-                } else {
-                    None
-                }
-            }
-
-            fn entry_id(&self, _: &App) -> Option<ProjectEntryId> {
-                None
-            }
-
-            fn project_path(&self, _: &App) -> Option<ProjectPath> {
-                None
-            }
-
-            fn is_dirty(&self) -> bool {
-                false
-            }
-        }
-
-        impl Item for TestPngItemView {
-            type Event = ();
-            fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString {
-                "".into()
-            }
-        }
-        impl EventEmitter<()> for TestPngItemView {}
-        impl Focusable for TestPngItemView {
-            fn focus_handle(&self, _cx: &App) -> FocusHandle {
-                self.focus_handle.clone()
-            }
-        }
-
-        impl Render for TestPngItemView {
-            fn render(
-                &mut self,
-                _window: &mut Window,
-                _cx: &mut Context<Self>,
-            ) -> impl IntoElement {
-                Empty
-            }
-        }
-
-        impl ProjectItem for TestPngItemView {
-            type Item = TestPngItem;
-
-            fn for_project_item(
-                _project: Entity<Project>,
-                _pane: Option<&Pane>,
-                _item: Entity<Self::Item>,
-                _: &mut Window,
-                cx: &mut Context<Self>,
-            ) -> Self
-            where
-                Self: Sized,
-            {
-                Self {
-                    focus_handle: cx.focus_handle(),
-                }
-            }
-        }
-
-        // View
-        struct TestIpynbItemView {
-            focus_handle: FocusHandle,
-        }
-        // Model
-        struct TestIpynbItem {}
-
-        impl project::ProjectItem for TestIpynbItem {
-            fn try_open(
-                _project: &Entity<Project>,
-                path: &ProjectPath,
-                cx: &mut App,
-            ) -> Option<Task<anyhow::Result<Entity<Self>>>> {
-                if path.path.extension().unwrap() == "ipynb" {
-                    Some(cx.spawn(async move |cx| cx.new(|_| TestIpynbItem {})))
-                } else {
-                    None
-                }
-            }
-
-            fn entry_id(&self, _: &App) -> Option<ProjectEntryId> {
-                None
-            }
-
-            fn project_path(&self, _: &App) -> Option<ProjectPath> {
-                None
-            }
-
-            fn is_dirty(&self) -> bool {
-                false
-            }
-        }
-
-        impl Item for TestIpynbItemView {
-            type Event = ();
-            fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString {
-                "".into()
-            }
-        }
-        impl EventEmitter<()> for TestIpynbItemView {}
-        impl Focusable for TestIpynbItemView {
-            fn focus_handle(&self, _cx: &App) -> FocusHandle {
-                self.focus_handle.clone()
-            }
-        }
-
-        impl Render for TestIpynbItemView {
-            fn render(
-                &mut self,
-                _window: &mut Window,
-                _cx: &mut Context<Self>,
-            ) -> impl IntoElement {
-                Empty
-            }
-        }
-
-        impl ProjectItem for TestIpynbItemView {
-            type Item = TestIpynbItem;
-
-            fn for_project_item(
-                _project: Entity<Project>,
-                _pane: Option<&Pane>,
-                _item: Entity<Self::Item>,
-                _: &mut Window,
-                cx: &mut Context<Self>,
-            ) -> Self
-            where
-                Self: Sized,
-            {
-                Self {
-                    focus_handle: cx.focus_handle(),
-                }
-            }
-        }
-
-        struct TestAlternatePngItemView {
-            focus_handle: FocusHandle,
-        }
-
-        impl Item for TestAlternatePngItemView {
-            type Event = ();
-            fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString {
-                "".into()
-            }
-        }
-
-        impl EventEmitter<()> for TestAlternatePngItemView {}
-        impl Focusable for TestAlternatePngItemView {
-            fn focus_handle(&self, _cx: &App) -> FocusHandle {
-                self.focus_handle.clone()
-            }
-        }
-
-        impl Render for TestAlternatePngItemView {
-            fn render(
-                &mut self,
-                _window: &mut Window,
-                _cx: &mut Context<Self>,
-            ) -> impl IntoElement {
-                Empty
-            }
-        }
-
-        impl ProjectItem for TestAlternatePngItemView {
-            type Item = TestPngItem;
-
-            fn for_project_item(
-                _project: Entity<Project>,
-                _pane: Option<&Pane>,
-                _item: Entity<Self::Item>,
-                _: &mut Window,
-                cx: &mut Context<Self>,
-            ) -> Self
-            where
-                Self: Sized,
-            {
-                Self {
-                    focus_handle: cx.focus_handle(),
-                }
-            }
-        }
-
-        #[gpui::test]
-        async fn test_register_project_item(cx: &mut TestAppContext) {
-            init_test(cx);
-
-            cx.update(|cx| {
-                register_project_item::<TestPngItemView>(cx);
-                register_project_item::<TestIpynbItemView>(cx);
-            });
-
-            let fs = FakeFs::new(cx.executor());
-            fs.insert_tree(
-                "/root1",
-                json!({
-                    "one.png": "BINARYDATAHERE",
-                    "two.ipynb": "{ totally a notebook }",
-                    "three.txt": "editing text, sure why not?"
-                }),
-            )
-            .await;
-
-            let project = Project::test(fs, ["root1".as_ref()], cx).await;
-            let (workspace, cx) =
-                cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-            let worktree_id = project.update(cx, |project, cx| {
-                project.worktrees(cx).next().unwrap().read(cx).id()
-            });
-
-            let handle = workspace
-                .update_in(cx, |workspace, window, cx| {
-                    let project_path = (worktree_id, rel_path("one.png"));
-                    workspace.open_path(project_path, None, true, window, cx)
-                })
-                .await
-                .unwrap();
-
-            // Now we can check if the handle we got back errored or not
-            assert_eq!(
-                handle.to_any_view().entity_type(),
-                TypeId::of::<TestPngItemView>()
-            );
-
-            let handle = workspace
-                .update_in(cx, |workspace, window, cx| {
-                    let project_path = (worktree_id, rel_path("two.ipynb"));
-                    workspace.open_path(project_path, None, true, window, cx)
-                })
-                .await
-                .unwrap();
-
-            assert_eq!(
-                handle.to_any_view().entity_type(),
-                TypeId::of::<TestIpynbItemView>()
-            );
-
-            let handle = workspace
-                .update_in(cx, |workspace, window, cx| {
-                    let project_path = (worktree_id, rel_path("three.txt"));
-                    workspace.open_path(project_path, None, true, window, cx)
-                })
-                .await;
-            assert!(handle.is_err());
-        }
-
-        #[gpui::test]
-        async fn test_register_project_item_two_enter_one_leaves(cx: &mut TestAppContext) {
-            init_test(cx);
-
-            cx.update(|cx| {
-                register_project_item::<TestPngItemView>(cx);
-                register_project_item::<TestAlternatePngItemView>(cx);
-            });
-
-            let fs = FakeFs::new(cx.executor());
-            fs.insert_tree(
-                "/root1",
-                json!({
-                    "one.png": "BINARYDATAHERE",
-                    "two.ipynb": "{ totally a notebook }",
-                    "three.txt": "editing text, sure why not?"
-                }),
-            )
-            .await;
-            let project = Project::test(fs, ["root1".as_ref()], cx).await;
-            let (workspace, cx) =
-                cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-            let worktree_id = project.update(cx, |project, cx| {
-                project.worktrees(cx).next().unwrap().read(cx).id()
-            });
-
-            let handle = workspace
-                .update_in(cx, |workspace, window, cx| {
-                    let project_path = (worktree_id, rel_path("one.png"));
-                    workspace.open_path(project_path, None, true, window, cx)
-                })
-                .await
-                .unwrap();
-
-            // This _must_ be the second item registered
-            assert_eq!(
-                handle.to_any_view().entity_type(),
-                TypeId::of::<TestAlternatePngItemView>()
-            );
-
-            let handle = workspace
-                .update_in(cx, |workspace, window, cx| {
-                    let project_path = (worktree_id, rel_path("three.txt"));
-                    workspace.open_path(project_path, None, true, window, cx)
-                })
-                .await;
-            assert!(handle.is_err());
-        }
-    }
-
-    #[gpui::test]
-    async fn test_status_bar_visibility(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, [], cx).await;
-        let (workspace, _cx) =
-            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-        // Test with status bar shown (default)
-        workspace.read_with(cx, |workspace, cx| {
-            let visible = workspace.status_bar_visible(cx);
-            assert!(visible, "Status bar should be visible by default");
-        });
-
-        // Test with status bar hidden
-        cx.update_global(|store: &mut SettingsStore, cx| {
-            store.update_user_settings(cx, |settings| {
-                settings.status_bar.get_or_insert_default().show = Some(false);
-            });
-        });
-
-        workspace.read_with(cx, |workspace, cx| {
-            let visible = workspace.status_bar_visible(cx);
-            assert!(!visible, "Status bar should be hidden when show is false");
-        });
-
-        // Test with status bar shown explicitly
-        cx.update_global(|store: &mut SettingsStore, cx| {
-            store.update_user_settings(cx, |settings| {
-                settings.status_bar.get_or_insert_default().show = Some(true);
-            });
-        });
-
-        workspace.read_with(cx, |workspace, cx| {
-            let visible = workspace.status_bar_visible(cx);
-            assert!(visible, "Status bar should be visible when show is true");
-        });
-    }
-
-    fn pane_items_paths(pane: &Entity<Pane>, cx: &App) -> Vec<String> {
-        pane.read(cx)
-            .items()
-            .flat_map(|item| {
-                item.project_paths(cx)
-                    .into_iter()
-                    .map(|path| path.path.display(PathStyle::local()).into_owned())
-            })
-            .collect()
-    }
-
-    pub fn init_test(cx: &mut TestAppContext) {
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-            theme::init(theme::LoadThemes::JustBase, cx);
-        });
-    }
-
-    fn dirty_project_item(id: u64, path: &str, cx: &mut App) -> Entity<TestProjectItem> {
-        let item = TestProjectItem::new(id, path, cx);
-        item.update(cx, |item, _| {
-            item.is_dirty = true;
-        });
-        item
-    }
-}
diff --git a/crates/workspace/src/workspace_settings.rs b/crates/workspace/src/workspace_settings.rs
deleted file mode 100644
index 4ce0394fe5..0000000000
--- a/crates/workspace/src/workspace_settings.rs
+++ /dev/null
@@ -1,143 +0,0 @@
-use std::num::NonZeroUsize;
-
-use crate::DockPosition;
-use collections::HashMap;
-use serde::Deserialize;
-pub use settings::{
-    AutosaveSetting, BottomDockLayout, InactiveOpacity, PaneSplitDirectionHorizontal,
-    PaneSplitDirectionVertical, RegisterSetting, RestoreOnStartupBehavior, Settings,
-};
-
-#[derive(RegisterSetting)]
-pub struct WorkspaceSettings {
-    pub active_pane_modifiers: ActivePanelModifiers,
-    pub bottom_dock_layout: settings::BottomDockLayout,
-    pub pane_split_direction_horizontal: settings::PaneSplitDirectionHorizontal,
-    pub pane_split_direction_vertical: settings::PaneSplitDirectionVertical,
-    pub centered_layout: settings::CenteredLayoutSettings,
-    pub confirm_quit: bool,
-    pub show_call_status_icon: bool,
-    pub autosave: AutosaveSetting,
-    pub restore_on_startup: settings::RestoreOnStartupBehavior,
-    pub restore_on_file_reopen: bool,
-    pub drop_target_size: f32,
-    pub use_system_path_prompts: bool,
-    pub use_system_prompts: bool,
-    pub command_aliases: HashMap<String, String>,
-    pub max_tabs: Option<NonZeroUsize>,
-    pub when_closing_with_no_tabs: settings::CloseWindowWhenNoItems,
-    pub on_last_window_closed: settings::OnLastWindowClosed,
-    pub resize_all_panels_in_dock: Vec<DockPosition>,
-    pub close_on_file_delete: bool,
-    pub use_system_window_tabs: bool,
-    pub zoomed_padding: bool,
-    pub window_decorations: settings::WindowDecorations,
-}
-
-#[derive(Copy, Clone, PartialEq, Debug, Default)]
-pub struct ActivePanelModifiers {
-    /// Size of the border surrounding the active pane.
-    /// When set to 0, the active pane doesn't have any border.
-    /// The border is drawn inset.
-    ///
-    /// Default: `0.0`
-    // TODO: make this not an option, it is never None
-    pub border_size: Option<f32>,
-    /// Opacity of inactive panels.
-    /// When set to 1.0, the inactive panes have the same opacity as the active one.
-    /// If set to 0, the inactive panes content will not be visible at all.
-    /// Values are clamped to the [0.0, 1.0] range.
-    ///
-    /// Default: `1.0`
-    // TODO: make this not an option, it is never None
-    pub inactive_opacity: Option<InactiveOpacity>,
-}
-
-#[derive(Deserialize, RegisterSetting)]
-pub struct TabBarSettings {
-    pub show: bool,
-    pub show_nav_history_buttons: bool,
-    pub show_tab_bar_buttons: bool,
-}
-
-impl Settings for WorkspaceSettings {
-    fn from_settings(content: &settings::SettingsContent) -> Self {
-        let workspace = &content.workspace;
-        Self {
-            active_pane_modifiers: ActivePanelModifiers {
-                border_size: Some(
-                    workspace
-                        .active_pane_modifiers
-                        .unwrap()
-                        .border_size
-                        .unwrap(),
-                ),
-                inactive_opacity: Some(
-                    workspace
-                        .active_pane_modifiers
-                        .unwrap()
-                        .inactive_opacity
-                        .unwrap(),
-                ),
-            },
-            bottom_dock_layout: workspace.bottom_dock_layout.unwrap(),
-            pane_split_direction_horizontal: workspace.pane_split_direction_horizontal.unwrap(),
-            pane_split_direction_vertical: workspace.pane_split_direction_vertical.unwrap(),
-            centered_layout: workspace.centered_layout.unwrap(),
-            confirm_quit: workspace.confirm_quit.unwrap(),
-            show_call_status_icon: workspace.show_call_status_icon.unwrap(),
-            autosave: workspace.autosave.unwrap(),
-            restore_on_startup: workspace.restore_on_startup.unwrap(),
-            restore_on_file_reopen: workspace.restore_on_file_reopen.unwrap(),
-            drop_target_size: workspace.drop_target_size.unwrap(),
-            use_system_path_prompts: workspace.use_system_path_prompts.unwrap(),
-            use_system_prompts: workspace.use_system_prompts.unwrap(),
-            command_aliases: workspace.command_aliases.clone(),
-            max_tabs: workspace.max_tabs,
-            when_closing_with_no_tabs: workspace.when_closing_with_no_tabs.unwrap(),
-            on_last_window_closed: workspace.on_last_window_closed.unwrap(),
-            resize_all_panels_in_dock: workspace
-                .resize_all_panels_in_dock
-                .clone()
-                .unwrap()
-                .into_iter()
-                .map(Into::into)
-                .collect(),
-            close_on_file_delete: workspace.close_on_file_delete.unwrap(),
-            use_system_window_tabs: workspace.use_system_window_tabs.unwrap(),
-            zoomed_padding: workspace.zoomed_padding.unwrap(),
-            window_decorations: workspace.window_decorations.unwrap(),
-        }
-    }
-}
-
-impl Settings for TabBarSettings {
-    fn from_settings(content: &settings::SettingsContent) -> Self {
-        let tab_bar = content.tab_bar.clone().unwrap();
-        TabBarSettings {
-            show: tab_bar.show.unwrap(),
-            show_nav_history_buttons: tab_bar.show_nav_history_buttons.unwrap(),
-            show_tab_bar_buttons: tab_bar.show_tab_bar_buttons.unwrap(),
-        }
-    }
-}
-
-#[derive(Deserialize, RegisterSetting)]
-pub struct StatusBarSettings {
-    pub show: bool,
-    pub active_language_button: bool,
-    pub cursor_position_button: bool,
-    pub line_endings_button: bool,
-}
-
-impl Settings for StatusBarSettings {
-    fn from_settings(content: &settings::SettingsContent) -> Self {
-        let status_bar = content.status_bar.clone().unwrap();
-        StatusBarSettings {
-            show: status_bar.show.unwrap(),
-            active_language_button: status_bar.active_language_button.unwrap(),
-            cursor_position_button: status_bar.cursor_position_button.unwrap(),
-            line_endings_button: status_bar.line_endings_button.unwrap(),
-        }
-    }
-}
diff --git a/crates/worktree/Cargo.toml b/crates/worktree/Cargo.toml
deleted file mode 100644
index 6d132fbd2c..0000000000
--- a/crates/worktree/Cargo.toml
+++ /dev/null
@@ -1,63 +0,0 @@
-[package]
-name = "worktree"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lib]
-path = "src/worktree.rs"
-doctest = false
-
-[lints]
-workspace = true
-
-[features]
-test-support = [
-    "gpui/test-support",
-    "http_client/test-support",
-    "language/test-support",
-    "settings/test-support",
-    "text/test-support",
-    "util/test-support",
-]
-
-[dependencies]
-anyhow.workspace = true
-async-lock.workspace = true
-clock.workspace = true
-collections.workspace = true
-fs.workspace = true
-futures.workspace = true
-fuzzy.workspace = true
-git.workspace = true
-gpui.workspace = true
-ignore.workspace = true
-language.workspace = true
-log.workspace = true
-parking_lot.workspace = true
-paths.workspace = true
-postage.workspace = true
-rpc = { workspace = true, features = ["gpui"] }
-serde.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-smallvec.workspace = true
-smol.workspace = true
-sum_tree.workspace = true
-text.workspace = true
-util.workspace = true
-
-[dev-dependencies]
-clock = { workspace = true, features = ["test-support"] }
-collections = { workspace = true, features = ["test-support"] }
-git2.workspace = true
-gpui = { workspace = true, features = ["test-support"] }
-http_client.workspace = true
-paths = { workspace = true, features = ["test-support"] }
-pretty_assertions.workspace = true
-rand.workspace = true
-rpc = { workspace = true, features = ["test-support"] }
-settings = { workspace = true, features = ["test-support"] }
-util = { workspace = true, features = ["test-support"] }
-zlog.workspace = true
diff --git a/crates/worktree/LICENSE-GPL b/crates/worktree/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/worktree/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/worktree/src/ignore.rs b/crates/worktree/src/ignore.rs
deleted file mode 100644
index 17c362e2d7..0000000000
--- a/crates/worktree/src/ignore.rs
+++ /dev/null
@@ -1,102 +0,0 @@
-use ignore::gitignore::Gitignore;
-use std::{ffi::OsStr, path::Path, sync::Arc};
-
-#[derive(Clone, Debug)]
-pub struct IgnoreStack {
-    pub repo_root: Option<Arc<Path>>,
-    pub top: Arc<IgnoreStackEntry>,
-}
-
-#[derive(Debug)]
-pub enum IgnoreStackEntry {
-    None,
-    Global {
-        ignore: Arc<Gitignore>,
-    },
-    Some {
-        abs_base_path: Arc<Path>,
-        ignore: Arc<Gitignore>,
-        parent: Arc<IgnoreStackEntry>,
-    },
-    All,
-}
-
-impl IgnoreStack {
-    pub fn none() -> Self {
-        Self {
-            repo_root: None,
-            top: Arc::new(IgnoreStackEntry::None),
-        }
-    }
-
-    pub fn all() -> Self {
-        Self {
-            repo_root: None,
-            top: Arc::new(IgnoreStackEntry::All),
-        }
-    }
-
-    pub fn global(ignore: Arc<Gitignore>) -> Self {
-        Self {
-            repo_root: None,
-            top: Arc::new(IgnoreStackEntry::Global { ignore }),
-        }
-    }
-
-    pub fn append(self, abs_base_path: Arc<Path>, ignore: Arc<Gitignore>) -> Self {
-        let top = match self.top.as_ref() {
-            IgnoreStackEntry::All => self.top.clone(),
-            _ => Arc::new(IgnoreStackEntry::Some {
-                abs_base_path,
-                ignore,
-                parent: self.top.clone(),
-            }),
-        };
-        Self {
-            repo_root: self.repo_root,
-            top,
-        }
-    }
-
-    pub fn is_abs_path_ignored(&self, abs_path: &Path, is_dir: bool) -> bool {
-        if is_dir && abs_path.file_name() == Some(OsStr::new(".git")) {
-            return true;
-        }
-
-        match self.top.as_ref() {
-            IgnoreStackEntry::None => false,
-            IgnoreStackEntry::All => true,
-            IgnoreStackEntry::Global { ignore } => {
-                let combined_path;
-                let abs_path = if let Some(repo_root) = self.repo_root.as_ref() {
-                    combined_path = ignore.path().join(
-                        abs_path
-                            .strip_prefix(repo_root)
-                            .expect("repo root should be a parent of matched path"),
-                    );
-                    &combined_path
-                } else {
-                    abs_path
-                };
-                match ignore.matched(abs_path, is_dir) {
-                    ignore::Match::None => false,
-                    ignore::Match::Ignore(_) => true,
-                    ignore::Match::Whitelist(_) => false,
-                }
-            }
-            IgnoreStackEntry::Some {
-                abs_base_path,
-                ignore,
-                parent: prev,
-            } => match ignore.matched(abs_path.strip_prefix(abs_base_path).unwrap(), is_dir) {
-                ignore::Match::None => IgnoreStack {
-                    repo_root: self.repo_root.clone(),
-                    top: prev.clone(),
-                }
-                .is_abs_path_ignored(abs_path, is_dir),
-                ignore::Match::Ignore(_) => true,
-                ignore::Match::Whitelist(_) => false,
-            },
-        }
-    }
-}
diff --git a/crates/worktree/src/worktree.rs b/crates/worktree/src/worktree.rs
deleted file mode 100644
index e1ce31c038..0000000000
--- a/crates/worktree/src/worktree.rs
+++ /dev/null
@@ -1,5677 +0,0 @@
-mod ignore;
-mod worktree_settings;
-#[cfg(test)]
-mod worktree_tests;
-
-use ::ignore::gitignore::{Gitignore, GitignoreBuilder};
-use anyhow::{Context as _, Result, anyhow};
-use clock::ReplicaId;
-use collections::{HashMap, HashSet, VecDeque};
-use fs::{Fs, MTime, PathEvent, RemoveOptions, Watcher, copy_recursive, read_dir_items};
-use futures::{
-    FutureExt as _, Stream, StreamExt,
-    channel::{
-        mpsc::{self, UnboundedSender},
-        oneshot,
-    },
-    select_biased, stream,
-    task::Poll,
-};
-use fuzzy::CharBag;
-use git::{
-    COMMIT_MESSAGE, DOT_GIT, FSMONITOR_DAEMON, GITIGNORE, INDEX_LOCK, LFS_DIR, status::GitSummary,
-};
-use gpui::{
-    App, AppContext as _, AsyncApp, BackgroundExecutor, Context, Entity, EventEmitter, Priority,
-    Task,
-};
-use ignore::IgnoreStack;
-use language::DiskState;
-
-use parking_lot::Mutex;
-use paths::{local_settings_folder_name, local_vscode_folder_name};
-use postage::{
-    barrier,
-    prelude::{Sink as _, Stream as _},
-    watch,
-};
-use rpc::{
-    AnyProtoClient,
-    proto::{self, split_worktree_update},
-};
-pub use settings::WorktreeId;
-use settings::{Settings, SettingsLocation, SettingsStore};
-use smallvec::{SmallVec, smallvec};
-use smol::channel::{self, Sender};
-use std::{
-    any::Any,
-    borrow::Borrow as _,
-    cmp::Ordering,
-    collections::hash_map,
-    convert::TryFrom,
-    ffi::OsStr,
-    fmt,
-    future::Future,
-    mem::{self},
-    ops::{Deref, DerefMut, Range},
-    path::{Path, PathBuf},
-    pin::Pin,
-    sync::{
-        Arc,
-        atomic::{AtomicUsize, Ordering::SeqCst},
-    },
-    time::{Duration, Instant},
-};
-use sum_tree::{Bias, Dimensions, Edit, KeyedItem, SeekTarget, SumTree, Summary, TreeMap, TreeSet};
-use text::{LineEnding, Rope};
-use util::{
-    ResultExt, debug_panic, maybe,
-    paths::{PathMatcher, PathStyle, SanitizedPath, home_dir},
-    rel_path::RelPath,
-};
-pub use worktree_settings::WorktreeSettings;
-
-pub const FS_WATCH_LATENCY: Duration = Duration::from_millis(100);
-
-/// A set of local or remote files that are being opened as part of a project.
-/// Responsible for tracking related FS (for local)/collab (for remote) events and corresponding updates.
-/// Stores git repositories data and the diagnostics for the file(s).
-///
-/// Has an absolute path, and may be set to be visible in Zed UI or not.
-/// May correspond to a directory or a single file.
-/// Possible examples:
-/// * a drag and dropped file — may be added as an invisible, "ephemeral" entry to the current worktree
-/// * a directory opened in Zed — may be added as a visible entry to the current worktree
-///
-/// Uses [`Entry`] to track the state of each file/directory, can look up absolute paths for entries.
-pub enum Worktree {
-    Local(LocalWorktree),
-    Remote(RemoteWorktree),
-}
-
-/// An entry, created in the worktree.
-#[derive(Debug)]
-pub enum CreatedEntry {
-    /// Got created and indexed by the worktree, receiving a corresponding entry.
-    Included(Entry),
-    /// Got created, but not indexed due to falling under exclusion filters.
-    Excluded { abs_path: PathBuf },
-}
-
-#[derive(Debug)]
-pub struct LoadedFile {
-    pub file: Arc<File>,
-    pub text: String,
-}
-
-pub struct LoadedBinaryFile {
-    pub file: Arc<File>,
-    pub content: Vec<u8>,
-}
-
-impl fmt::Debug for LoadedBinaryFile {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("LoadedBinaryFile")
-            .field("file", &self.file)
-            .field("content_bytes", &self.content.len())
-            .finish()
-    }
-}
-
-pub struct LocalWorktree {
-    snapshot: LocalSnapshot,
-    scan_requests_tx: channel::Sender<ScanRequest>,
-    path_prefixes_to_scan_tx: channel::Sender<PathPrefixScanRequest>,
-    is_scanning: (watch::Sender<bool>, watch::Receiver<bool>),
-    _background_scanner_tasks: Vec<Task<()>>,
-    update_observer: Option<UpdateObservationState>,
-    fs: Arc<dyn Fs>,
-    fs_case_sensitive: bool,
-    visible: bool,
-    next_entry_id: Arc<AtomicUsize>,
-    settings: WorktreeSettings,
-    share_private_files: bool,
-    scanning_enabled: bool,
-}
-
-pub struct PathPrefixScanRequest {
-    path: Arc<RelPath>,
-    done: SmallVec<[barrier::Sender; 1]>,
-}
-
-struct ScanRequest {
-    relative_paths: Vec<Arc<RelPath>>,
-    done: SmallVec<[barrier::Sender; 1]>,
-}
-
-pub struct RemoteWorktree {
-    snapshot: Snapshot,
-    background_snapshot: Arc<Mutex<(Snapshot, Vec<proto::UpdateWorktree>)>>,
-    project_id: u64,
-    client: AnyProtoClient,
-    file_scan_inclusions: PathMatcher,
-    updates_tx: Option<UnboundedSender<proto::UpdateWorktree>>,
-    update_observer: Option<mpsc::UnboundedSender<proto::UpdateWorktree>>,
-    snapshot_subscriptions: VecDeque<(usize, oneshot::Sender<()>)>,
-    replica_id: ReplicaId,
-    visible: bool,
-    disconnected: bool,
-}
-
-#[derive(Clone)]
-pub struct Snapshot {
-    id: WorktreeId,
-    /// The absolute path of the worktree root.
-    abs_path: Arc<SanitizedPath>,
-    path_style: PathStyle,
-    root_name: Arc<RelPath>,
-    root_char_bag: CharBag,
-    entries_by_path: SumTree<Entry>,
-    entries_by_id: SumTree<PathEntry>,
-    always_included_entries: Vec<Arc<RelPath>>,
-
-    /// A number that increases every time the worktree begins scanning
-    /// a set of paths from the filesystem. This scanning could be caused
-    /// by some operation performed on the worktree, such as reading or
-    /// writing a file, or by an event reported by the filesystem.
-    scan_id: usize,
-
-    /// The latest scan id that has completed, and whose preceding scans
-    /// have all completed. The current `scan_id` could be more than one
-    /// greater than the `completed_scan_id` if operations are performed
-    /// on the worktree while it is processing a file-system event.
-    completed_scan_id: usize,
-}
-
-/// This path corresponds to the 'content path' of a repository in relation
-/// to Zed's project root.
-/// In the majority of the cases, this is the folder that contains the .git folder.
-/// But if a sub-folder of a git repository is opened, this corresponds to the
-/// project root and the .git folder is located in a parent directory.
-#[derive(Clone, Debug, Ord, PartialOrd, Eq, PartialEq, Hash)]
-pub enum WorkDirectory {
-    InProject {
-        relative_path: Arc<RelPath>,
-    },
-    AboveProject {
-        absolute_path: Arc<Path>,
-        location_in_repo: Arc<Path>,
-    },
-}
-
-impl WorkDirectory {
-    fn path_key(&self) -> PathKey {
-        match self {
-            WorkDirectory::InProject { relative_path } => PathKey(relative_path.clone()),
-            WorkDirectory::AboveProject { .. } => PathKey(RelPath::empty().into()),
-        }
-    }
-
-    /// Returns true if the given path is a child of the work directory.
-    ///
-    /// Note that the path may not be a member of this repository, if there
-    /// is a repository in a directory between these two paths
-    /// external .git folder in a parent folder of the project root.
-    #[track_caller]
-    pub fn directory_contains(&self, path: &RelPath) -> bool {
-        match self {
-            WorkDirectory::InProject { relative_path } => path.starts_with(relative_path),
-            WorkDirectory::AboveProject { .. } => true,
-        }
-    }
-}
-
-impl Default for WorkDirectory {
-    fn default() -> Self {
-        Self::InProject {
-            relative_path: Arc::from(RelPath::empty()),
-        }
-    }
-}
-
-#[derive(Clone)]
-pub struct LocalSnapshot {
-    snapshot: Snapshot,
-    global_gitignore: Option<Arc<Gitignore>>,
-    /// All of the gitignore files in the worktree, indexed by their absolute path.
-    /// The boolean indicates whether the gitignore needs to be updated.
-    ignores_by_parent_abs_path: HashMap<Arc<Path>, (Arc<Gitignore>, bool)>,
-    /// All of the git repositories in the worktree, indexed by the project entry
-    /// id of their parent directory.
-    git_repositories: TreeMap<ProjectEntryId, LocalRepositoryEntry>,
-    /// The file handle of the worktree root
-    /// (so we can find it after it's been moved)
-    root_file_handle: Option<Arc<dyn fs::FileHandle>>,
-    executor: BackgroundExecutor,
-}
-
-struct BackgroundScannerState {
-    snapshot: LocalSnapshot,
-    scanned_dirs: HashSet<ProjectEntryId>,
-    path_prefixes_to_scan: HashSet<Arc<RelPath>>,
-    paths_to_scan: HashSet<Arc<RelPath>>,
-    /// The ids of all of the entries that were removed from the snapshot
-    /// as part of the current update. These entry ids may be re-used
-    /// if the same inode is discovered at a new path, or if the given
-    /// path is re-created after being deleted.
-    removed_entries: HashMap<u64, Entry>,
-    changed_paths: Vec<Arc<RelPath>>,
-    prev_snapshot: Snapshot,
-}
-
-#[derive(Debug, Clone)]
-struct LocalRepositoryEntry {
-    work_directory_id: ProjectEntryId,
-    work_directory: WorkDirectory,
-    work_directory_abs_path: Arc<Path>,
-    git_dir_scan_id: usize,
-    /// Absolute path to the original .git entry that caused us to create this repository.
-    ///
-    /// This is normally a directory, but may be a "gitfile" that points to a directory elsewhere
-    /// (whose path we then store in `repository_dir_abs_path`).
-    dot_git_abs_path: Arc<Path>,
-    /// Absolute path to the "commondir" for this repository.
-    ///
-    /// This is always a directory. For a normal repository, this is the same as dot_git_abs_path,
-    /// but in the case of a submodule or a worktree it is the path to the "parent" .git directory
-    /// from which the submodule/worktree was derived.
-    common_dir_abs_path: Arc<Path>,
-    /// Absolute path to the directory holding the repository's state.
-    ///
-    /// For a normal repository, this is a directory and coincides with `dot_git_abs_path` and
-    /// `common_dir_abs_path`. For a submodule or worktree, this is some subdirectory of the
-    /// commondir like `/project/.git/modules/foo`.
-    repository_dir_abs_path: Arc<Path>,
-}
-
-impl sum_tree::Item for LocalRepositoryEntry {
-    type Summary = PathSummary<sum_tree::NoSummary>;
-
-    fn summary(&self, _: <Self::Summary as Summary>::Context<'_>) -> Self::Summary {
-        PathSummary {
-            max_path: self.work_directory.path_key().0,
-            item_summary: sum_tree::NoSummary,
-        }
-    }
-}
-
-impl KeyedItem for LocalRepositoryEntry {
-    type Key = PathKey;
-
-    fn key(&self) -> Self::Key {
-        self.work_directory.path_key()
-    }
-}
-
-impl Deref for LocalRepositoryEntry {
-    type Target = WorkDirectory;
-
-    fn deref(&self) -> &Self::Target {
-        &self.work_directory
-    }
-}
-
-impl Deref for LocalSnapshot {
-    type Target = Snapshot;
-
-    fn deref(&self) -> &Self::Target {
-        &self.snapshot
-    }
-}
-
-impl DerefMut for LocalSnapshot {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.snapshot
-    }
-}
-
-enum ScanState {
-    Started,
-    Updated {
-        snapshot: LocalSnapshot,
-        changes: UpdatedEntriesSet,
-        barrier: SmallVec<[barrier::Sender; 1]>,
-        scanning: bool,
-    },
-    RootUpdated {
-        new_path: Arc<SanitizedPath>,
-    },
-}
-
-struct UpdateObservationState {
-    snapshots_tx: mpsc::UnboundedSender<(LocalSnapshot, UpdatedEntriesSet)>,
-    resume_updates: watch::Sender<()>,
-    _maintain_remote_snapshot: Task<Option<()>>,
-}
-
-#[derive(Clone)]
-pub enum Event {
-    UpdatedEntries(UpdatedEntriesSet),
-    UpdatedGitRepositories(UpdatedGitRepositoriesSet),
-    DeletedEntry(ProjectEntryId),
-}
-
-impl EventEmitter<Event> for Worktree {}
-
-impl Worktree {
-    pub async fn local(
-        path: impl Into<Arc<Path>>,
-        visible: bool,
-        fs: Arc<dyn Fs>,
-        next_entry_id: Arc<AtomicUsize>,
-        scanning_enabled: bool,
-        cx: &mut AsyncApp,
-    ) -> Result<Entity<Self>> {
-        let abs_path = path.into();
-        let metadata = fs
-            .metadata(&abs_path)
-            .await
-            .context("failed to stat worktree path")?;
-
-        let fs_case_sensitive = fs.is_case_sensitive().await.unwrap_or_else(|e| {
-            log::error!(
-                "Failed to determine whether filesystem is case sensitive (falling back to true) due to error: {e:#}"
-            );
-            true
-        });
-
-        let root_file_handle = if metadata.as_ref().is_some() {
-            fs.open_handle(&abs_path)
-                .await
-                .with_context(|| {
-                    format!(
-                        "failed to open local worktree root at {}",
-                        abs_path.display()
-                    )
-                })
-                .log_err()
-        } else {
-            None
-        };
-
-        cx.new(move |cx: &mut Context<Worktree>| {
-            let mut snapshot = LocalSnapshot {
-                ignores_by_parent_abs_path: Default::default(),
-                global_gitignore: Default::default(),
-                git_repositories: Default::default(),
-                snapshot: Snapshot::new(
-                    cx.entity_id().as_u64(),
-                    abs_path
-                        .file_name()
-                        .and_then(|f| f.to_str())
-                        .map_or(RelPath::empty().into(), |f| {
-                            RelPath::unix(f).unwrap().into()
-                        }),
-                    abs_path.clone(),
-                    PathStyle::local(),
-                ),
-                root_file_handle,
-                executor: cx.background_executor().clone(),
-            };
-
-            let worktree_id = snapshot.id();
-            let settings_location = Some(SettingsLocation {
-                worktree_id,
-                path: RelPath::empty(),
-            });
-
-            let settings = WorktreeSettings::get(settings_location, cx).clone();
-            cx.observe_global::<SettingsStore>(move |this, cx| {
-                if let Self::Local(this) = this {
-                    let settings = WorktreeSettings::get(settings_location, cx).clone();
-                    if this.settings != settings {
-                        this.settings = settings;
-                        this.restart_background_scanners(cx);
-                    }
-                }
-            })
-            .detach();
-
-            let share_private_files = false;
-            if let Some(metadata) = metadata {
-                let mut entry = Entry::new(
-                    RelPath::empty().into(),
-                    &metadata,
-                    ProjectEntryId::new(&next_entry_id),
-                    snapshot.root_char_bag,
-                    None,
-                );
-                if !metadata.is_dir {
-                    if let Some(file_name) = abs_path.file_name()
-                        && let Some(file_name) = file_name.to_str()
-                        && let Ok(path) = RelPath::unix(file_name)
-                    {
-                        entry.is_private = !share_private_files && settings.is_path_private(path);
-                        entry.is_hidden = settings.is_path_hidden(path);
-                    }
-                }
-                snapshot.insert_entry(entry, fs.as_ref());
-            }
-
-            let (scan_requests_tx, scan_requests_rx) = channel::unbounded();
-            let (path_prefixes_to_scan_tx, path_prefixes_to_scan_rx) = channel::unbounded();
-            let mut worktree = LocalWorktree {
-                share_private_files,
-                next_entry_id,
-                snapshot,
-                is_scanning: watch::channel_with(true),
-                update_observer: None,
-                scan_requests_tx,
-                path_prefixes_to_scan_tx,
-                _background_scanner_tasks: Vec::new(),
-                fs,
-                fs_case_sensitive,
-                visible,
-                settings,
-                scanning_enabled,
-            };
-            worktree.start_background_scanner(scan_requests_rx, path_prefixes_to_scan_rx, cx);
-            Worktree::Local(worktree)
-        })
-    }
-
-    pub fn remote(
-        project_id: u64,
-        replica_id: ReplicaId,
-        worktree: proto::WorktreeMetadata,
-        client: AnyProtoClient,
-        path_style: PathStyle,
-        cx: &mut App,
-    ) -> Entity<Self> {
-        cx.new(|cx: &mut Context<Self>| {
-            let snapshot = Snapshot::new(
-                worktree.id,
-                RelPath::from_proto(&worktree.root_name)
-                    .unwrap_or_else(|_| RelPath::empty().into()),
-                Path::new(&worktree.abs_path).into(),
-                path_style,
-            );
-
-            let background_snapshot = Arc::new(Mutex::new((
-                snapshot.clone(),
-                Vec::<proto::UpdateWorktree>::new(),
-            )));
-            let (background_updates_tx, mut background_updates_rx) =
-                mpsc::unbounded::<proto::UpdateWorktree>();
-            let (mut snapshot_updated_tx, mut snapshot_updated_rx) = watch::channel();
-
-            let worktree_id = snapshot.id();
-            let settings_location = Some(SettingsLocation {
-                worktree_id,
-                path: RelPath::empty(),
-            });
-
-            let settings = WorktreeSettings::get(settings_location, cx).clone();
-            let worktree = RemoteWorktree {
-                client,
-                project_id,
-                replica_id,
-                snapshot,
-                file_scan_inclusions: settings.parent_dir_scan_inclusions.clone(),
-                background_snapshot: background_snapshot.clone(),
-                updates_tx: Some(background_updates_tx),
-                update_observer: None,
-                snapshot_subscriptions: Default::default(),
-                visible: worktree.visible,
-                disconnected: false,
-            };
-
-            // Apply updates to a separate snapshot in a background task, then
-            // send them to a foreground task which updates the model.
-            cx.background_spawn(async move {
-                while let Some(update) = background_updates_rx.next().await {
-                    {
-                        let mut lock = background_snapshot.lock();
-                        lock.0.apply_remote_update(
-                            update.clone(),
-                            &settings.parent_dir_scan_inclusions,
-                        );
-                        lock.1.push(update);
-                    }
-                    snapshot_updated_tx.send(()).await.ok();
-                }
-            })
-            .detach();
-
-            // On the foreground task, update to the latest snapshot and notify
-            // any update observer of all updates that led to that snapshot.
-            cx.spawn(async move |this, cx| {
-                while (snapshot_updated_rx.recv().await).is_some() {
-                    this.update(cx, |this, cx| {
-                        let mut entries_changed = false;
-                        let this = this.as_remote_mut().unwrap();
-                        {
-                            let mut lock = this.background_snapshot.lock();
-                            this.snapshot = lock.0.clone();
-                            for update in lock.1.drain(..) {
-                                entries_changed |= !update.updated_entries.is_empty()
-                                    || !update.removed_entries.is_empty();
-                                if let Some(tx) = &this.update_observer {
-                                    tx.unbounded_send(update).ok();
-                                }
-                            }
-                        };
-
-                        if entries_changed {
-                            cx.emit(Event::UpdatedEntries(Arc::default()));
-                        }
-                        cx.notify();
-                        while let Some((scan_id, _)) = this.snapshot_subscriptions.front() {
-                            if this.observed_snapshot(*scan_id) {
-                                let (_, tx) = this.snapshot_subscriptions.pop_front().unwrap();
-                                let _ = tx.send(());
-                            } else {
-                                break;
-                            }
-                        }
-                    })?;
-                }
-                anyhow::Ok(())
-            })
-            .detach();
-
-            Worktree::Remote(worktree)
-        })
-    }
-
-    pub fn as_local(&self) -> Option<&LocalWorktree> {
-        if let Worktree::Local(worktree) = self {
-            Some(worktree)
-        } else {
-            None
-        }
-    }
-
-    pub fn as_remote(&self) -> Option<&RemoteWorktree> {
-        if let Worktree::Remote(worktree) = self {
-            Some(worktree)
-        } else {
-            None
-        }
-    }
-
-    pub fn as_local_mut(&mut self) -> Option<&mut LocalWorktree> {
-        if let Worktree::Local(worktree) = self {
-            Some(worktree)
-        } else {
-            None
-        }
-    }
-
-    pub fn as_remote_mut(&mut self) -> Option<&mut RemoteWorktree> {
-        if let Worktree::Remote(worktree) = self {
-            Some(worktree)
-        } else {
-            None
-        }
-    }
-
-    pub fn is_local(&self) -> bool {
-        matches!(self, Worktree::Local(_))
-    }
-
-    pub fn is_remote(&self) -> bool {
-        !self.is_local()
-    }
-
-    pub fn settings_location(&self, _: &Context<Self>) -> SettingsLocation<'static> {
-        SettingsLocation {
-            worktree_id: self.id(),
-            path: RelPath::empty(),
-        }
-    }
-
-    pub fn snapshot(&self) -> Snapshot {
-        match self {
-            Worktree::Local(worktree) => worktree.snapshot.snapshot.clone(),
-            Worktree::Remote(worktree) => worktree.snapshot.clone(),
-        }
-    }
-
-    pub fn scan_id(&self) -> usize {
-        match self {
-            Worktree::Local(worktree) => worktree.snapshot.scan_id,
-            Worktree::Remote(worktree) => worktree.snapshot.scan_id,
-        }
-    }
-
-    pub fn metadata_proto(&self) -> proto::WorktreeMetadata {
-        proto::WorktreeMetadata {
-            id: self.id().to_proto(),
-            root_name: self.root_name().to_proto(),
-            visible: self.is_visible(),
-            abs_path: self.abs_path().to_string_lossy().into_owned(),
-        }
-    }
-
-    pub fn completed_scan_id(&self) -> usize {
-        match self {
-            Worktree::Local(worktree) => worktree.snapshot.completed_scan_id,
-            Worktree::Remote(worktree) => worktree.snapshot.completed_scan_id,
-        }
-    }
-
-    pub fn is_visible(&self) -> bool {
-        match self {
-            Worktree::Local(worktree) => worktree.visible,
-            Worktree::Remote(worktree) => worktree.visible,
-        }
-    }
-
-    pub fn replica_id(&self) -> ReplicaId {
-        match self {
-            Worktree::Local(_) => ReplicaId::LOCAL,
-            Worktree::Remote(worktree) => worktree.replica_id,
-        }
-    }
-
-    pub fn abs_path(&self) -> Arc<Path> {
-        match self {
-            Worktree::Local(worktree) => SanitizedPath::cast_arc(worktree.abs_path.clone()),
-            Worktree::Remote(worktree) => SanitizedPath::cast_arc(worktree.abs_path.clone()),
-        }
-    }
-
-    pub fn root_file(&self, cx: &Context<Self>) -> Option<Arc<File>> {
-        let entry = self.root_entry()?;
-        Some(File::for_entry(entry.clone(), cx.entity()))
-    }
-
-    pub fn observe_updates<F, Fut>(&mut self, project_id: u64, cx: &Context<Worktree>, callback: F)
-    where
-        F: 'static + Send + Fn(proto::UpdateWorktree) -> Fut,
-        Fut: 'static + Send + Future<Output = bool>,
-    {
-        match self {
-            Worktree::Local(this) => this.observe_updates(project_id, cx, callback),
-            Worktree::Remote(this) => this.observe_updates(project_id, cx, callback),
-        }
-    }
-
-    pub fn stop_observing_updates(&mut self) {
-        match self {
-            Worktree::Local(this) => {
-                this.update_observer.take();
-            }
-            Worktree::Remote(this) => {
-                this.update_observer.take();
-            }
-        }
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn has_update_observer(&self) -> bool {
-        match self {
-            Worktree::Local(this) => this.update_observer.is_some(),
-            Worktree::Remote(this) => this.update_observer.is_some(),
-        }
-    }
-
-    pub fn load_file(&self, path: &RelPath, cx: &Context<Worktree>) -> Task<Result<LoadedFile>> {
-        match self {
-            Worktree::Local(this) => this.load_file(path, cx),
-            Worktree::Remote(_) => {
-                Task::ready(Err(anyhow!("remote worktrees can't yet load files")))
-            }
-        }
-    }
-
-    pub fn load_binary_file(
-        &self,
-        path: &RelPath,
-        cx: &Context<Worktree>,
-    ) -> Task<Result<LoadedBinaryFile>> {
-        match self {
-            Worktree::Local(this) => this.load_binary_file(path, cx),
-            Worktree::Remote(_) => {
-                Task::ready(Err(anyhow!("remote worktrees can't yet load binary files")))
-            }
-        }
-    }
-
-    pub fn write_file(
-        &self,
-        path: Arc<RelPath>,
-        text: Rope,
-        line_ending: LineEnding,
-        cx: &Context<Worktree>,
-    ) -> Task<Result<Arc<File>>> {
-        match self {
-            Worktree::Local(this) => this.write_file(path, text, line_ending, cx),
-            Worktree::Remote(_) => {
-                Task::ready(Err(anyhow!("remote worktree can't yet write files")))
-            }
-        }
-    }
-
-    pub fn create_entry(
-        &mut self,
-        path: Arc<RelPath>,
-        is_directory: bool,
-        content: Option<Vec<u8>>,
-        cx: &Context<Worktree>,
-    ) -> Task<Result<CreatedEntry>> {
-        let worktree_id = self.id();
-        match self {
-            Worktree::Local(this) => this.create_entry(path, is_directory, content, cx),
-            Worktree::Remote(this) => {
-                let project_id = this.project_id;
-                let request = this.client.request(proto::CreateProjectEntry {
-                    worktree_id: worktree_id.to_proto(),
-                    project_id,
-                    path: path.as_ref().to_proto(),
-                    content,
-                    is_directory,
-                });
-                cx.spawn(async move |this, cx| {
-                    let response = request.await?;
-                    match response.entry {
-                        Some(entry) => this
-                            .update(cx, |worktree, cx| {
-                                worktree.as_remote_mut().unwrap().insert_entry(
-                                    entry,
-                                    response.worktree_scan_id as usize,
-                                    cx,
-                                )
-                            })?
-                            .await
-                            .map(CreatedEntry::Included),
-                        None => {
-                            let abs_path =
-                                this.read_with(cx, |worktree, _| worktree.absolutize(&path))?;
-                            Ok(CreatedEntry::Excluded { abs_path })
-                        }
-                    }
-                })
-            }
-        }
-    }
-
-    pub fn delete_entry(
-        &mut self,
-        entry_id: ProjectEntryId,
-        trash: bool,
-        cx: &mut Context<Worktree>,
-    ) -> Option<Task<Result<()>>> {
-        let task = match self {
-            Worktree::Local(this) => this.delete_entry(entry_id, trash, cx),
-            Worktree::Remote(this) => this.delete_entry(entry_id, trash, cx),
-        }?;
-
-        let entry = match &*self {
-            Worktree::Local(this) => this.entry_for_id(entry_id),
-            Worktree::Remote(this) => this.entry_for_id(entry_id),
-        }?;
-
-        let mut ids = vec![entry_id];
-        let path = &*entry.path;
-
-        self.get_children_ids_recursive(path, &mut ids);
-
-        for id in ids {
-            cx.emit(Event::DeletedEntry(id));
-        }
-        Some(task)
-    }
-
-    fn get_children_ids_recursive(&self, path: &RelPath, ids: &mut Vec<ProjectEntryId>) {
-        let children_iter = self.child_entries(path);
-        for child in children_iter {
-            ids.push(child.id);
-            self.get_children_ids_recursive(&child.path, ids);
-        }
-    }
-
-    // pub fn rename_entry(
-    //     &mut self,
-    //     entry_id: ProjectEntryId,
-    //     new_path: Arc<RelPath>,
-    //     cx: &Context<Self>,
-    // ) -> Task<Result<CreatedEntry>> {
-    //     match self {
-    //         Worktree::Local(this) => this.rename_entry(entry_id, new_path, cx),
-    //         Worktree::Remote(this) => this.rename_entry(entry_id, new_path, cx),
-    //     }
-    // }
-
-    pub fn copy_external_entries(
-        &mut self,
-        target_directory: Arc<RelPath>,
-        paths: Vec<Arc<Path>>,
-        fs: Arc<dyn Fs>,
-        cx: &Context<Worktree>,
-    ) -> Task<Result<Vec<ProjectEntryId>>> {
-        match self {
-            Worktree::Local(this) => this.copy_external_entries(target_directory, paths, cx),
-            Worktree::Remote(this) => this.copy_external_entries(target_directory, paths, fs, cx),
-        }
-    }
-
-    pub fn expand_entry(
-        &mut self,
-        entry_id: ProjectEntryId,
-        cx: &Context<Worktree>,
-    ) -> Option<Task<Result<()>>> {
-        match self {
-            Worktree::Local(this) => this.expand_entry(entry_id, cx),
-            Worktree::Remote(this) => {
-                let response = this.client.request(proto::ExpandProjectEntry {
-                    project_id: this.project_id,
-                    entry_id: entry_id.to_proto(),
-                });
-                Some(cx.spawn(async move |this, cx| {
-                    let response = response.await?;
-                    this.update(cx, |this, _| {
-                        this.as_remote_mut()
-                            .unwrap()
-                            .wait_for_snapshot(response.worktree_scan_id as usize)
-                    })?
-                    .await?;
-                    Ok(())
-                }))
-            }
-        }
-    }
-
-    pub fn expand_all_for_entry(
-        &mut self,
-        entry_id: ProjectEntryId,
-        cx: &Context<Worktree>,
-    ) -> Option<Task<Result<()>>> {
-        match self {
-            Worktree::Local(this) => this.expand_all_for_entry(entry_id, cx),
-            Worktree::Remote(this) => {
-                let response = this.client.request(proto::ExpandAllForProjectEntry {
-                    project_id: this.project_id,
-                    entry_id: entry_id.to_proto(),
-                });
-                Some(cx.spawn(async move |this, cx| {
-                    let response = response.await?;
-                    this.update(cx, |this, _| {
-                        this.as_remote_mut()
-                            .unwrap()
-                            .wait_for_snapshot(response.worktree_scan_id as usize)
-                    })?
-                    .await?;
-                    Ok(())
-                }))
-            }
-        }
-    }
-
-    pub async fn handle_create_entry(
-        this: Entity<Self>,
-        request: proto::CreateProjectEntry,
-        mut cx: AsyncApp,
-    ) -> Result<proto::ProjectEntryResponse> {
-        let (scan_id, entry) = this.update(&mut cx, |this, cx| {
-            anyhow::Ok((
-                this.scan_id(),
-                this.create_entry(
-                    RelPath::from_proto(&request.path).with_context(|| {
-                        format!("received invalid relative path {:?}", request.path)
-                    })?,
-                    request.is_directory,
-                    request.content,
-                    cx,
-                ),
-            ))
-        })??;
-        Ok(proto::ProjectEntryResponse {
-            entry: match &entry.await? {
-                CreatedEntry::Included(entry) => Some(entry.into()),
-                CreatedEntry::Excluded { .. } => None,
-            },
-            worktree_scan_id: scan_id as u64,
-        })
-    }
-
-    pub async fn handle_delete_entry(
-        this: Entity<Self>,
-        request: proto::DeleteProjectEntry,
-        mut cx: AsyncApp,
-    ) -> Result<proto::ProjectEntryResponse> {
-        let (scan_id, task) = this.update(&mut cx, |this, cx| {
-            (
-                this.scan_id(),
-                this.delete_entry(
-                    ProjectEntryId::from_proto(request.entry_id),
-                    request.use_trash,
-                    cx,
-                ),
-            )
-        })?;
-        task.context("invalid entry")?.await?;
-        Ok(proto::ProjectEntryResponse {
-            entry: None,
-            worktree_scan_id: scan_id as u64,
-        })
-    }
-
-    pub async fn handle_expand_entry(
-        this: Entity<Self>,
-        request: proto::ExpandProjectEntry,
-        mut cx: AsyncApp,
-    ) -> Result<proto::ExpandProjectEntryResponse> {
-        let task = this.update(&mut cx, |this, cx| {
-            this.expand_entry(ProjectEntryId::from_proto(request.entry_id), cx)
-        })?;
-        task.context("no such entry")?.await?;
-        let scan_id = this.read_with(&cx, |this, _| this.scan_id())?;
-        Ok(proto::ExpandProjectEntryResponse {
-            worktree_scan_id: scan_id as u64,
-        })
-    }
-
-    pub async fn handle_expand_all_for_entry(
-        this: Entity<Self>,
-        request: proto::ExpandAllForProjectEntry,
-        mut cx: AsyncApp,
-    ) -> Result<proto::ExpandAllForProjectEntryResponse> {
-        let task = this.update(&mut cx, |this, cx| {
-            this.expand_all_for_entry(ProjectEntryId::from_proto(request.entry_id), cx)
-        })?;
-        task.context("no such entry")?.await?;
-        let scan_id = this.read_with(&cx, |this, _| this.scan_id())?;
-        Ok(proto::ExpandAllForProjectEntryResponse {
-            worktree_scan_id: scan_id as u64,
-        })
-    }
-
-    pub fn is_single_file(&self) -> bool {
-        self.root_dir().is_none()
-    }
-
-    /// For visible worktrees, returns the path with the worktree name as the first component.
-    /// Otherwise, returns an absolute path.
-    pub fn full_path(&self, worktree_relative_path: &RelPath) -> PathBuf {
-        if self.is_visible() {
-            self.root_name()
-                .join(worktree_relative_path)
-                .display(self.path_style)
-                .to_string()
-                .into()
-        } else {
-            let full_path = self.abs_path();
-            let mut full_path_string = if self.is_local()
-                && let Ok(stripped) = full_path.strip_prefix(home_dir())
-            {
-                self.path_style
-                    .join("~", &*stripped.to_string_lossy())
-                    .unwrap()
-            } else {
-                full_path.to_string_lossy().into_owned()
-            };
-
-            if worktree_relative_path.components().next().is_some() {
-                full_path_string.push_str(self.path_style.primary_separator());
-                full_path_string.push_str(&worktree_relative_path.display(self.path_style));
-            }
-
-            full_path_string.into()
-        }
-    }
-}
-
-impl LocalWorktree {
-    pub fn fs(&self) -> &Arc<dyn Fs> {
-        &self.fs
-    }
-
-    pub fn is_path_private(&self, path: &RelPath) -> bool {
-        !self.share_private_files && self.settings.is_path_private(path)
-    }
-
-    pub fn fs_is_case_sensitive(&self) -> bool {
-        self.fs_case_sensitive
-    }
-
-    fn restart_background_scanners(&mut self, cx: &Context<Worktree>) {
-        let (scan_requests_tx, scan_requests_rx) = channel::unbounded();
-        let (path_prefixes_to_scan_tx, path_prefixes_to_scan_rx) = channel::unbounded();
-        self.scan_requests_tx = scan_requests_tx;
-        self.path_prefixes_to_scan_tx = path_prefixes_to_scan_tx;
-
-        self.start_background_scanner(scan_requests_rx, path_prefixes_to_scan_rx, cx);
-        let always_included_entries = mem::take(&mut self.snapshot.always_included_entries);
-        log::debug!(
-            "refreshing entries for the following always included paths: {:?}",
-            always_included_entries
-        );
-
-        // Cleans up old always included entries to ensure they get updated properly. Otherwise,
-        // nested always included entries may not get updated and will result in out-of-date info.
-        self.refresh_entries_for_paths(always_included_entries);
-    }
-
-    fn start_background_scanner(
-        &mut self,
-        scan_requests_rx: channel::Receiver<ScanRequest>,
-        path_prefixes_to_scan_rx: channel::Receiver<PathPrefixScanRequest>,
-        cx: &Context<Worktree>,
-    ) {
-        let snapshot = self.snapshot();
-        let share_private_files = self.share_private_files;
-        let next_entry_id = self.next_entry_id.clone();
-        let fs = self.fs.clone();
-        let scanning_enabled = self.scanning_enabled;
-        let settings = self.settings.clone();
-        let (scan_states_tx, mut scan_states_rx) = mpsc::unbounded();
-        let background_scanner = cx.background_spawn({
-            let abs_path = snapshot.abs_path.as_path().to_path_buf();
-            let background = cx.background_executor().clone();
-            async move {
-                let (events, watcher) = if scanning_enabled {
-                    fs.watch(&abs_path, FS_WATCH_LATENCY).await
-                } else {
-                    (Box::pin(stream::pending()) as _, Arc::new(NullWatcher) as _)
-                };
-                let fs_case_sensitive = fs.is_case_sensitive().await.unwrap_or_else(|e| {
-                    log::error!("Failed to determine whether filesystem is case sensitive: {e:#}");
-                    true
-                });
-
-                let mut scanner = BackgroundScanner {
-                    fs,
-                    fs_case_sensitive,
-                    status_updates_tx: scan_states_tx,
-                    executor: background,
-                    scan_requests_rx,
-                    path_prefixes_to_scan_rx,
-                    next_entry_id,
-                    state: async_lock::Mutex::new(BackgroundScannerState {
-                        prev_snapshot: snapshot.snapshot.clone(),
-                        snapshot,
-                        scanned_dirs: Default::default(),
-                        path_prefixes_to_scan: Default::default(),
-                        paths_to_scan: Default::default(),
-                        removed_entries: Default::default(),
-                        changed_paths: Default::default(),
-                    }),
-                    phase: BackgroundScannerPhase::InitialScan,
-                    share_private_files,
-                    scanning_enabled,
-                    settings,
-                    watcher,
-                };
-
-                scanner
-                    .run(Box::pin(events.map(|events| events.into_iter().collect())))
-                    .await;
-            }
-        });
-        let scan_state_updater = cx.spawn(async move |this, cx| {
-            while let Some((state, this)) = scan_states_rx.next().await.zip(this.upgrade()) {
-                this.update(cx, |this, cx| {
-                    let this = this.as_local_mut().unwrap();
-                    match state {
-                        ScanState::Started => {
-                            *this.is_scanning.0.borrow_mut() = true;
-                        }
-                        ScanState::Updated {
-                            snapshot,
-                            changes,
-                            barrier,
-                            scanning,
-                        } => {
-                            *this.is_scanning.0.borrow_mut() = scanning;
-                            this.set_snapshot(snapshot, changes, cx);
-                            drop(barrier);
-                        }
-                        ScanState::RootUpdated { new_path } => {
-                            this.update_abs_path_and_refresh(new_path, cx);
-                        }
-                    }
-                })
-                .ok();
-            }
-        });
-        self._background_scanner_tasks = vec![background_scanner, scan_state_updater];
-        *self.is_scanning.0.borrow_mut() = true;
-    }
-
-    fn set_snapshot(
-        &mut self,
-        mut new_snapshot: LocalSnapshot,
-        entry_changes: UpdatedEntriesSet,
-        cx: &mut Context<Worktree>,
-    ) {
-        let repo_changes = self.changed_repos(&self.snapshot, &mut new_snapshot);
-        self.snapshot = new_snapshot;
-
-        if let Some(share) = self.update_observer.as_mut() {
-            share
-                .snapshots_tx
-                .unbounded_send((self.snapshot.clone(), entry_changes.clone()))
-                .ok();
-        }
-
-        if !entry_changes.is_empty() {
-            cx.emit(Event::UpdatedEntries(entry_changes));
-        }
-        if !repo_changes.is_empty() {
-            cx.emit(Event::UpdatedGitRepositories(repo_changes));
-        }
-    }
-
-    fn changed_repos(
-        &self,
-        old_snapshot: &LocalSnapshot,
-        new_snapshot: &mut LocalSnapshot,
-    ) -> UpdatedGitRepositoriesSet {
-        let mut changes = Vec::new();
-        let mut old_repos = old_snapshot.git_repositories.iter().peekable();
-        let new_repos = new_snapshot.git_repositories.clone();
-        let mut new_repos = new_repos.iter().peekable();
-
-        loop {
-            match (new_repos.peek().map(clone), old_repos.peek().map(clone)) {
-                (Some((new_entry_id, new_repo)), Some((old_entry_id, old_repo))) => {
-                    match Ord::cmp(&new_entry_id, &old_entry_id) {
-                        Ordering::Less => {
-                            changes.push(UpdatedGitRepository {
-                                work_directory_id: new_entry_id,
-                                old_work_directory_abs_path: None,
-                                new_work_directory_abs_path: Some(
-                                    new_repo.work_directory_abs_path.clone(),
-                                ),
-                                dot_git_abs_path: Some(new_repo.dot_git_abs_path.clone()),
-                                repository_dir_abs_path: Some(
-                                    new_repo.repository_dir_abs_path.clone(),
-                                ),
-                                common_dir_abs_path: Some(new_repo.common_dir_abs_path.clone()),
-                            });
-                            new_repos.next();
-                        }
-                        Ordering::Equal => {
-                            if new_repo.git_dir_scan_id != old_repo.git_dir_scan_id
-                                || new_repo.work_directory_abs_path
-                                    != old_repo.work_directory_abs_path
-                            {
-                                changes.push(UpdatedGitRepository {
-                                    work_directory_id: new_entry_id,
-                                    old_work_directory_abs_path: Some(
-                                        old_repo.work_directory_abs_path.clone(),
-                                    ),
-                                    new_work_directory_abs_path: Some(
-                                        new_repo.work_directory_abs_path.clone(),
-                                    ),
-                                    dot_git_abs_path: Some(new_repo.dot_git_abs_path.clone()),
-                                    repository_dir_abs_path: Some(
-                                        new_repo.repository_dir_abs_path.clone(),
-                                    ),
-                                    common_dir_abs_path: Some(new_repo.common_dir_abs_path.clone()),
-                                });
-                            }
-                            new_repos.next();
-                            old_repos.next();
-                        }
-                        Ordering::Greater => {
-                            changes.push(UpdatedGitRepository {
-                                work_directory_id: old_entry_id,
-                                old_work_directory_abs_path: Some(
-                                    old_repo.work_directory_abs_path.clone(),
-                                ),
-                                new_work_directory_abs_path: None,
-                                dot_git_abs_path: None,
-                                repository_dir_abs_path: None,
-                                common_dir_abs_path: None,
-                            });
-                            old_repos.next();
-                        }
-                    }
-                }
-                (Some((entry_id, repo)), None) => {
-                    changes.push(UpdatedGitRepository {
-                        work_directory_id: entry_id,
-                        old_work_directory_abs_path: None,
-                        new_work_directory_abs_path: Some(repo.work_directory_abs_path.clone()),
-                        dot_git_abs_path: Some(repo.dot_git_abs_path.clone()),
-                        repository_dir_abs_path: Some(repo.repository_dir_abs_path.clone()),
-                        common_dir_abs_path: Some(repo.common_dir_abs_path.clone()),
-                    });
-                    new_repos.next();
-                }
-                (None, Some((entry_id, repo))) => {
-                    changes.push(UpdatedGitRepository {
-                        work_directory_id: entry_id,
-                        old_work_directory_abs_path: Some(repo.work_directory_abs_path.clone()),
-                        new_work_directory_abs_path: None,
-                        dot_git_abs_path: Some(repo.dot_git_abs_path.clone()),
-                        repository_dir_abs_path: Some(repo.repository_dir_abs_path.clone()),
-                        common_dir_abs_path: Some(repo.common_dir_abs_path.clone()),
-                    });
-                    old_repos.next();
-                }
-                (None, None) => break,
-            }
-        }
-
-        fn clone<T: Clone, U: Clone>(value: &(&T, &U)) -> (T, U) {
-            (value.0.clone(), value.1.clone())
-        }
-
-        changes.into()
-    }
-
-    pub fn scan_complete(&self) -> impl Future<Output = ()> + use<> {
-        let mut is_scanning_rx = self.is_scanning.1.clone();
-        async move {
-            let mut is_scanning = *is_scanning_rx.borrow();
-            while is_scanning {
-                if let Some(value) = is_scanning_rx.recv().await {
-                    is_scanning = value;
-                } else {
-                    break;
-                }
-            }
-        }
-    }
-
-    pub fn snapshot(&self) -> LocalSnapshot {
-        self.snapshot.clone()
-    }
-
-    pub fn settings(&self) -> WorktreeSettings {
-        self.settings.clone()
-    }
-
-    fn load_binary_file(
-        &self,
-        path: &RelPath,
-        cx: &Context<Worktree>,
-    ) -> Task<Result<LoadedBinaryFile>> {
-        let path = Arc::from(path);
-        let abs_path = self.absolutize(&path);
-        let fs = self.fs.clone();
-        let entry = self.refresh_entry(path.clone(), None, cx);
-        let is_private = self.is_path_private(&path);
-
-        let worktree = cx.weak_entity();
-        cx.background_spawn(async move {
-            let content = fs.load_bytes(&abs_path).await?;
-
-            let worktree = worktree.upgrade().context("worktree was dropped")?;
-            let file = match entry.await? {
-                Some(entry) => File::for_entry(entry, worktree),
-                None => {
-                    let metadata = fs
-                        .metadata(&abs_path)
-                        .await
-                        .with_context(|| {
-                            format!("Loading metadata for excluded file {abs_path:?}")
-                        })?
-                        .with_context(|| {
-                            format!("Excluded file {abs_path:?} got removed during loading")
-                        })?;
-                    Arc::new(File {
-                        entry_id: None,
-                        worktree,
-                        path,
-                        disk_state: DiskState::Present {
-                            mtime: metadata.mtime,
-                        },
-                        is_local: true,
-                        is_private,
-                    })
-                }
-            };
-
-            Ok(LoadedBinaryFile { file, content })
-        })
-    }
-
-    fn load_file(&self, path: &RelPath, cx: &Context<Worktree>) -> Task<Result<LoadedFile>> {
-        let path = Arc::from(path);
-        let abs_path = self.absolutize(&path);
-        let fs = self.fs.clone();
-        let entry = self.refresh_entry(path.clone(), None, cx);
-        let is_private = self.is_path_private(path.as_ref());
-
-        let this = cx.weak_entity();
-        cx.background_spawn(async move {
-            // WARN: Temporary workaround for #27283.
-            //       We are not efficient with our memory usage per file, and use in excess of 64GB for a 10GB file
-            //       Therefore, as a temporary workaround to prevent system freezes, we just bail before opening a file
-            //       if it is too large
-            //       5GB seems to be more reasonable, peaking at ~16GB, while 6GB jumps up to >24GB which seems like a
-            //       reasonable limit
-            {
-                const FILE_SIZE_MAX: u64 = 6 * 1024 * 1024 * 1024; // 6GB
-                if let Ok(Some(metadata)) = fs.metadata(&abs_path).await
-                    && metadata.len >= FILE_SIZE_MAX
-                {
-                    anyhow::bail!("File is too large to load");
-                }
-            }
-            let text = fs.load(&abs_path).await?;
-
-            let worktree = this.upgrade().context("worktree was dropped")?;
-            let file = match entry.await? {
-                Some(entry) => File::for_entry(entry, worktree),
-                None => {
-                    let metadata = fs
-                        .metadata(&abs_path)
-                        .await
-                        .with_context(|| {
-                            format!("Loading metadata for excluded file {abs_path:?}")
-                        })?
-                        .with_context(|| {
-                            format!("Excluded file {abs_path:?} got removed during loading")
-                        })?;
-                    Arc::new(File {
-                        entry_id: None,
-                        worktree,
-                        path,
-                        disk_state: DiskState::Present {
-                            mtime: metadata.mtime,
-                        },
-                        is_local: true,
-                        is_private,
-                    })
-                }
-            };
-
-            Ok(LoadedFile { file, text })
-        })
-    }
-
-    /// Find the lowest path in the worktree's datastructures that is an ancestor
-    fn lowest_ancestor(&self, path: &RelPath) -> Arc<RelPath> {
-        let mut lowest_ancestor = None;
-        for path in path.ancestors() {
-            if self.entry_for_path(path).is_some() {
-                lowest_ancestor = Some(path.into());
-                break;
-            }
-        }
-
-        lowest_ancestor.unwrap_or_else(|| RelPath::empty().into())
-    }
-
-    fn create_entry(
-        &self,
-        path: Arc<RelPath>,
-        is_dir: bool,
-        content: Option<Vec<u8>>,
-        cx: &Context<Worktree>,
-    ) -> Task<Result<CreatedEntry>> {
-        let abs_path = self.absolutize(&path);
-        let path_excluded = self.settings.is_path_excluded(&path);
-        let fs = self.fs.clone();
-        let task_abs_path = abs_path.clone();
-        let write = cx.background_spawn(async move {
-            if is_dir {
-                fs.create_dir(&task_abs_path)
-                    .await
-                    .with_context(|| format!("creating directory {task_abs_path:?}"))
-            } else {
-                fs.write(&task_abs_path, content.as_deref().unwrap_or(&[]))
-                    .await
-                    .with_context(|| format!("creating file {task_abs_path:?}"))
-            }
-        });
-
-        let lowest_ancestor = self.lowest_ancestor(&path);
-        cx.spawn(async move |this, cx| {
-            write.await?;
-            if path_excluded {
-                return Ok(CreatedEntry::Excluded { abs_path });
-            }
-
-            let (result, refreshes) = this.update(cx, |this, cx| {
-                let mut refreshes = Vec::new();
-                let refresh_paths = path.strip_prefix(&lowest_ancestor).unwrap();
-                for refresh_path in refresh_paths.ancestors() {
-                    if refresh_path == RelPath::empty() {
-                        continue;
-                    }
-                    let refresh_full_path = lowest_ancestor.join(refresh_path);
-
-                    refreshes.push(this.as_local_mut().unwrap().refresh_entry(
-                        refresh_full_path,
-                        None,
-                        cx,
-                    ));
-                }
-                (
-                    this.as_local_mut().unwrap().refresh_entry(path, None, cx),
-                    refreshes,
-                )
-            })?;
-            for refresh in refreshes {
-                refresh.await.log_err();
-            }
-
-            Ok(result
-                .await?
-                .map(CreatedEntry::Included)
-                .unwrap_or_else(|| CreatedEntry::Excluded { abs_path }))
-        })
-    }
-
-    fn write_file(
-        &self,
-        path: Arc<RelPath>,
-        text: Rope,
-        line_ending: LineEnding,
-        cx: &Context<Worktree>,
-    ) -> Task<Result<Arc<File>>> {
-        let fs = self.fs.clone();
-        let is_private = self.is_path_private(&path);
-        let abs_path = self.absolutize(&path);
-
-        let write = cx.background_spawn({
-            let fs = fs.clone();
-            let abs_path = abs_path.clone();
-            async move { fs.save(&abs_path, &text, line_ending).await }
-        });
-
-        cx.spawn(async move |this, cx| {
-            write.await?;
-            let entry = this
-                .update(cx, |this, cx| {
-                    this.as_local_mut()
-                        .unwrap()
-                        .refresh_entry(path.clone(), None, cx)
-                })?
-                .await?;
-            let worktree = this.upgrade().context("worktree dropped")?;
-            if let Some(entry) = entry {
-                Ok(File::for_entry(entry, worktree))
-            } else {
-                let metadata = fs
-                    .metadata(&abs_path)
-                    .await
-                    .with_context(|| {
-                        format!("Fetching metadata after saving the excluded buffer {abs_path:?}")
-                    })?
-                    .with_context(|| {
-                        format!("Excluded buffer {path:?} got removed during saving")
-                    })?;
-                Ok(Arc::new(File {
-                    worktree,
-                    path,
-                    disk_state: DiskState::Present {
-                        mtime: metadata.mtime,
-                    },
-                    entry_id: None,
-                    is_local: true,
-                    is_private,
-                }))
-            }
-        })
-    }
-
-    fn delete_entry(
-        &self,
-        entry_id: ProjectEntryId,
-        trash: bool,
-        cx: &Context<Worktree>,
-    ) -> Option<Task<Result<()>>> {
-        let entry = self.entry_for_id(entry_id)?.clone();
-        let abs_path = self.absolutize(&entry.path);
-        let fs = self.fs.clone();
-
-        let delete = cx.background_spawn(async move {
-            if entry.is_file() {
-                if trash {
-                    fs.trash_file(&abs_path, Default::default()).await?;
-                } else {
-                    fs.remove_file(&abs_path, Default::default()).await?;
-                }
-            } else if trash {
-                fs.trash_dir(
-                    &abs_path,
-                    RemoveOptions {
-                        recursive: true,
-                        ignore_if_not_exists: false,
-                    },
-                )
-                .await?;
-            } else {
-                fs.remove_dir(
-                    &abs_path,
-                    RemoveOptions {
-                        recursive: true,
-                        ignore_if_not_exists: false,
-                    },
-                )
-                .await?;
-            }
-            anyhow::Ok(entry.path)
-        });
-
-        Some(cx.spawn(async move |this, cx| {
-            let path = delete.await?;
-            this.update(cx, |this, _| {
-                this.as_local_mut()
-                    .unwrap()
-                    .refresh_entries_for_paths(vec![path])
-            })?
-            .recv()
-            .await;
-            Ok(())
-        }))
-    }
-
-    pub fn copy_external_entries(
-        &self,
-        target_directory: Arc<RelPath>,
-        paths: Vec<Arc<Path>>,
-        cx: &Context<Worktree>,
-    ) -> Task<Result<Vec<ProjectEntryId>>> {
-        let target_directory = self.absolutize(&target_directory);
-        let worktree_path = self.abs_path().clone();
-        let fs = self.fs.clone();
-        let paths = paths
-            .into_iter()
-            .filter_map(|source| {
-                let file_name = source.file_name()?;
-                let mut target = target_directory.clone();
-                target.push(file_name);
-
-                // Do not allow copying the same file to itself.
-                if source.as_ref() != target.as_path() {
-                    Some((source, target))
-                } else {
-                    None
-                }
-            })
-            .collect::<Vec<_>>();
-
-        let paths_to_refresh = paths
-            .iter()
-            .filter_map(|(_, target)| {
-                RelPath::new(
-                    target.strip_prefix(&worktree_path).ok()?,
-                    PathStyle::local(),
-                )
-                .ok()
-                .map(|path| path.into_arc())
-            })
-            .collect::<Vec<_>>();
-
-        cx.spawn(async move |this, cx| {
-            cx.background_spawn(async move {
-                for (source, target) in paths {
-                    copy_recursive(
-                        fs.as_ref(),
-                        &source,
-                        &target,
-                        fs::CopyOptions {
-                            overwrite: true,
-                            ..Default::default()
-                        },
-                    )
-                    .await
-                    .with_context(|| {
-                        format!("Failed to copy file from {source:?} to {target:?}")
-                    })?;
-                }
-                anyhow::Ok(())
-            })
-            .await
-            .log_err();
-            let mut refresh = cx.read_entity(
-                &this.upgrade().with_context(|| "Dropped worktree")?,
-                |this, _| {
-                    anyhow::Ok::<postage::barrier::Receiver>(
-                        this.as_local()
-                            .with_context(|| "Worktree is not local")?
-                            .refresh_entries_for_paths(paths_to_refresh.clone()),
-                    )
-                },
-            )??;
-
-            cx.background_spawn(async move {
-                refresh.next().await;
-                anyhow::Ok(())
-            })
-            .await
-            .log_err();
-
-            let this = this.upgrade().with_context(|| "Dropped worktree")?;
-            cx.read_entity(&this, |this, _| {
-                paths_to_refresh
-                    .iter()
-                    .filter_map(|path| Some(this.entry_for_path(path)?.id))
-                    .collect()
-            })
-        })
-    }
-
-    fn expand_entry(
-        &self,
-        entry_id: ProjectEntryId,
-        cx: &Context<Worktree>,
-    ) -> Option<Task<Result<()>>> {
-        let path = self.entry_for_id(entry_id)?.path.clone();
-        let mut refresh = self.refresh_entries_for_paths(vec![path]);
-        Some(cx.background_spawn(async move {
-            refresh.next().await;
-            Ok(())
-        }))
-    }
-
-    fn expand_all_for_entry(
-        &self,
-        entry_id: ProjectEntryId,
-        cx: &Context<Worktree>,
-    ) -> Option<Task<Result<()>>> {
-        let path = self.entry_for_id(entry_id).unwrap().path.clone();
-        let mut rx = self.add_path_prefix_to_scan(path);
-        Some(cx.background_spawn(async move {
-            rx.next().await;
-            Ok(())
-        }))
-    }
-
-    pub fn refresh_entries_for_paths(&self, paths: Vec<Arc<RelPath>>) -> barrier::Receiver {
-        let (tx, rx) = barrier::channel();
-        self.scan_requests_tx
-            .try_send(ScanRequest {
-                relative_paths: paths,
-                done: smallvec![tx],
-            })
-            .ok();
-        rx
-    }
-
-    #[cfg(feature = "test-support")]
-    pub fn manually_refresh_entries_for_paths(
-        &self,
-        paths: Vec<Arc<RelPath>>,
-    ) -> barrier::Receiver {
-        self.refresh_entries_for_paths(paths)
-    }
-
-    pub fn add_path_prefix_to_scan(&self, path_prefix: Arc<RelPath>) -> barrier::Receiver {
-        let (tx, rx) = barrier::channel();
-        self.path_prefixes_to_scan_tx
-            .try_send(PathPrefixScanRequest {
-                path: path_prefix,
-                done: smallvec![tx],
-            })
-            .ok();
-        rx
-    }
-
-    pub fn refresh_entry(
-        &self,
-        path: Arc<RelPath>,
-        old_path: Option<Arc<RelPath>>,
-        cx: &Context<Worktree>,
-    ) -> Task<Result<Option<Entry>>> {
-        if self.settings.is_path_excluded(&path) {
-            return Task::ready(Ok(None));
-        }
-        let paths = if let Some(old_path) = old_path.as_ref() {
-            vec![old_path.clone(), path.clone()]
-        } else {
-            vec![path.clone()]
-        };
-        let t0 = Instant::now();
-        let mut refresh = self.refresh_entries_for_paths(paths);
-        // todo(lw): Hot foreground spawn
-        cx.spawn(async move |this, cx| {
-            refresh.recv().await;
-            log::trace!("refreshed entry {path:?} in {:?}", t0.elapsed());
-            let new_entry = this.read_with(cx, |this, _| {
-                this.entry_for_path(&path).cloned().with_context(|| {
-                    format!("Could not find entry in worktree for {path:?} after refresh")
-                })
-            })??;
-            Ok(Some(new_entry))
-        })
-    }
-
-    fn observe_updates<F, Fut>(&mut self, project_id: u64, cx: &Context<Worktree>, callback: F)
-    where
-        F: 'static + Send + Fn(proto::UpdateWorktree) -> Fut,
-        Fut: 'static + Send + Future<Output = bool>,
-    {
-        if let Some(observer) = self.update_observer.as_mut() {
-            *observer.resume_updates.borrow_mut() = ();
-            return;
-        }
-
-        let (resume_updates_tx, mut resume_updates_rx) = watch::channel::<()>();
-        let (snapshots_tx, mut snapshots_rx) =
-            mpsc::unbounded::<(LocalSnapshot, UpdatedEntriesSet)>();
-        snapshots_tx
-            .unbounded_send((self.snapshot(), Arc::default()))
-            .ok();
-
-        let worktree_id = cx.entity_id().as_u64();
-        let _maintain_remote_snapshot = cx.background_spawn(async move {
-            let mut is_first = true;
-            while let Some((snapshot, entry_changes)) = snapshots_rx.next().await {
-                let update = if is_first {
-                    is_first = false;
-                    snapshot.build_initial_update(project_id, worktree_id)
-                } else {
-                    snapshot.build_update(project_id, worktree_id, entry_changes)
-                };
-
-                for update in proto::split_worktree_update(update) {
-                    let _ = resume_updates_rx.try_recv();
-                    loop {
-                        let result = callback(update.clone());
-                        if result.await {
-                            break;
-                        } else {
-                            log::info!("waiting to resume updates");
-                            if resume_updates_rx.next().await.is_none() {
-                                return Some(());
-                            }
-                        }
-                    }
-                }
-            }
-            Some(())
-        });
-
-        self.update_observer = Some(UpdateObservationState {
-            snapshots_tx,
-            resume_updates: resume_updates_tx,
-            _maintain_remote_snapshot,
-        });
-    }
-
-    pub fn share_private_files(&mut self, cx: &Context<Worktree>) {
-        self.share_private_files = true;
-        self.restart_background_scanners(cx);
-    }
-
-    pub fn update_abs_path_and_refresh(
-        &mut self,
-        new_path: Arc<SanitizedPath>,
-        cx: &Context<Worktree>,
-    ) {
-        self.snapshot.git_repositories = Default::default();
-        self.snapshot.ignores_by_parent_abs_path = Default::default();
-        let root_name = new_path
-            .as_path()
-            .file_name()
-            .and_then(|f| f.to_str())
-            .map_or(RelPath::empty().into(), |f| {
-                RelPath::unix(f).unwrap().into()
-            });
-        self.snapshot.update_abs_path(new_path, root_name);
-        self.restart_background_scanners(cx);
-    }
-}
-
-impl RemoteWorktree {
-    pub fn project_id(&self) -> u64 {
-        self.project_id
-    }
-
-    pub fn client(&self) -> AnyProtoClient {
-        self.client.clone()
-    }
-
-    pub fn disconnected_from_host(&mut self) {
-        self.updates_tx.take();
-        self.snapshot_subscriptions.clear();
-        self.disconnected = true;
-    }
-
-    pub fn update_from_remote(&self, update: proto::UpdateWorktree) {
-        if let Some(updates_tx) = &self.updates_tx {
-            updates_tx
-                .unbounded_send(update)
-                .expect("consumer runs to completion");
-        }
-    }
-
-    fn observe_updates<F, Fut>(&mut self, project_id: u64, cx: &Context<Worktree>, callback: F)
-    where
-        F: 'static + Send + Fn(proto::UpdateWorktree) -> Fut,
-        Fut: 'static + Send + Future<Output = bool>,
-    {
-        let (tx, mut rx) = mpsc::unbounded();
-        let initial_update = self
-            .snapshot
-            .build_initial_update(project_id, self.id().to_proto());
-        self.update_observer = Some(tx);
-        cx.spawn(async move |this, cx| {
-            let mut update = initial_update;
-            'outer: loop {
-                // SSH projects use a special project ID of 0, and we need to
-                // remap it to the correct one here.
-                update.project_id = project_id;
-
-                for chunk in split_worktree_update(update) {
-                    if !callback(chunk).await {
-                        break 'outer;
-                    }
-                }
-
-                if let Some(next_update) = rx.next().await {
-                    update = next_update;
-                } else {
-                    break;
-                }
-            }
-            this.update(cx, |this, _| {
-                let this = this.as_remote_mut().unwrap();
-                this.update_observer.take();
-            })
-        })
-        .detach();
-    }
-
-    fn observed_snapshot(&self, scan_id: usize) -> bool {
-        self.completed_scan_id >= scan_id
-    }
-
-    pub fn wait_for_snapshot(
-        &mut self,
-        scan_id: usize,
-    ) -> impl Future<Output = Result<()>> + use<> {
-        let (tx, rx) = oneshot::channel();
-        if self.observed_snapshot(scan_id) {
-            let _ = tx.send(());
-        } else if self.disconnected {
-            drop(tx);
-        } else {
-            match self
-                .snapshot_subscriptions
-                .binary_search_by_key(&scan_id, |probe| probe.0)
-            {
-                Ok(ix) | Err(ix) => self.snapshot_subscriptions.insert(ix, (scan_id, tx)),
-            }
-        }
-
-        async move {
-            rx.await?;
-            Ok(())
-        }
-    }
-
-    pub fn insert_entry(
-        &mut self,
-        entry: proto::Entry,
-        scan_id: usize,
-        cx: &Context<Worktree>,
-    ) -> Task<Result<Entry>> {
-        let wait_for_snapshot = self.wait_for_snapshot(scan_id);
-        cx.spawn(async move |this, cx| {
-            wait_for_snapshot.await?;
-            this.update(cx, |worktree, _| {
-                let worktree = worktree.as_remote_mut().unwrap();
-                let snapshot = &mut worktree.background_snapshot.lock().0;
-                let entry = snapshot.insert_entry(entry, &worktree.file_scan_inclusions);
-                worktree.snapshot = snapshot.clone();
-                entry
-            })?
-        })
-    }
-
-    fn delete_entry(
-        &self,
-        entry_id: ProjectEntryId,
-        trash: bool,
-        cx: &Context<Worktree>,
-    ) -> Option<Task<Result<()>>> {
-        let response = self.client.request(proto::DeleteProjectEntry {
-            project_id: self.project_id,
-            entry_id: entry_id.to_proto(),
-            use_trash: trash,
-        });
-        Some(cx.spawn(async move |this, cx| {
-            let response = response.await?;
-            let scan_id = response.worktree_scan_id as usize;
-
-            this.update(cx, move |this, _| {
-                this.as_remote_mut().unwrap().wait_for_snapshot(scan_id)
-            })?
-            .await?;
-
-            this.update(cx, |this, _| {
-                let this = this.as_remote_mut().unwrap();
-                let snapshot = &mut this.background_snapshot.lock().0;
-                snapshot.delete_entry(entry_id);
-                this.snapshot = snapshot.clone();
-            })
-        }))
-    }
-
-    // fn rename_entry(
-    //     &self,
-    //     entry_id: ProjectEntryId,
-    //     new_path: impl Into<Arc<RelPath>>,
-    //     cx: &Context<Worktree>,
-    // ) -> Task<Result<CreatedEntry>> {
-    //     let new_path: Arc<RelPath> = new_path.into();
-    //     let response = self.client.request(proto::RenameProjectEntry {
-    //         project_id: self.project_id,
-    //         entry_id: entry_id.to_proto(),
-    //         new_worktree_id: new_path.worktree_id,
-    //         new_path: new_path.as_ref().to_proto(),
-    //     });
-    //     cx.spawn(async move |this, cx| {
-    //         let response = response.await?;
-    //         match response.entry {
-    //             Some(entry) => this
-    //                 .update(cx, |this, cx| {
-    //                     this.as_remote_mut().unwrap().insert_entry(
-    //                         entry,
-    //                         response.worktree_scan_id as usize,
-    //                         cx,
-    //                     )
-    //                 })?
-    //                 .await
-    //                 .map(CreatedEntry::Included),
-    //             None => {
-    //                 let abs_path =
-    //                     this.read_with(cx, |worktree, _| worktree.absolutize(&new_path))?;
-    //                 Ok(CreatedEntry::Excluded { abs_path })
-    //             }
-    //         }
-    //     })
-    // }
-
-    fn copy_external_entries(
-        &self,
-        target_directory: Arc<RelPath>,
-        paths_to_copy: Vec<Arc<Path>>,
-        local_fs: Arc<dyn Fs>,
-        cx: &Context<Worktree>,
-    ) -> Task<anyhow::Result<Vec<ProjectEntryId>>> {
-        let client = self.client.clone();
-        let worktree_id = self.id().to_proto();
-        let project_id = self.project_id;
-
-        cx.background_spawn(async move {
-            let mut requests = Vec::new();
-            for root_path_to_copy in paths_to_copy {
-                let Some(filename) = root_path_to_copy
-                    .file_name()
-                    .and_then(|name| name.to_str())
-                    .and_then(|filename| RelPath::unix(filename).ok())
-                else {
-                    continue;
-                };
-                for (abs_path, is_directory) in
-                    read_dir_items(local_fs.as_ref(), &root_path_to_copy).await?
-                {
-                    let Some(relative_path) = abs_path
-                        .strip_prefix(&root_path_to_copy)
-                        .map_err(|e| anyhow::Error::from(e))
-                        .and_then(|relative_path| RelPath::new(relative_path, PathStyle::local()))
-                        .log_err()
-                    else {
-                        continue;
-                    };
-                    let content = if is_directory {
-                        None
-                    } else {
-                        Some(local_fs.load_bytes(&abs_path).await?)
-                    };
-
-                    let mut target_path = target_directory.join(filename);
-                    if relative_path.file_name().is_some() {
-                        target_path = target_path.join(&relative_path);
-                    }
-
-                    requests.push(proto::CreateProjectEntry {
-                        project_id,
-                        worktree_id,
-                        path: target_path.to_proto(),
-                        is_directory,
-                        content,
-                    });
-                }
-            }
-            requests.sort_unstable_by(|a, b| a.path.cmp(&b.path));
-            requests.dedup();
-
-            let mut copied_entry_ids = Vec::new();
-            for request in requests {
-                let response = client.request(request).await?;
-                copied_entry_ids.extend(response.entry.map(|e| ProjectEntryId::from_proto(e.id)));
-            }
-
-            Ok(copied_entry_ids)
-        })
-    }
-}
-
-impl Snapshot {
-    pub fn new(
-        id: u64,
-        root_name: Arc<RelPath>,
-        abs_path: Arc<Path>,
-        path_style: PathStyle,
-    ) -> Self {
-        Snapshot {
-            id: WorktreeId::from_usize(id as usize),
-            abs_path: SanitizedPath::from_arc(abs_path),
-            path_style,
-            root_char_bag: root_name
-                .as_unix_str()
-                .chars()
-                .map(|c| c.to_ascii_lowercase())
-                .collect(),
-            root_name,
-            always_included_entries: Default::default(),
-            entries_by_path: Default::default(),
-            entries_by_id: Default::default(),
-            scan_id: 1,
-            completed_scan_id: 0,
-        }
-    }
-
-    pub fn id(&self) -> WorktreeId {
-        self.id
-    }
-
-    // TODO:
-    // Consider the following:
-    //
-    // ```rust
-    // let abs_path: Arc<Path> = snapshot.abs_path(); // e.g. "C:\Users\user\Desktop\project"
-    // let some_non_trimmed_path = Path::new("\\\\?\\C:\\Users\\user\\Desktop\\project\\main.rs");
-    // // The caller perform some actions here:
-    // some_non_trimmed_path.strip_prefix(abs_path);  // This fails
-    // some_non_trimmed_path.starts_with(abs_path);   // This fails too
-    // ```
-    //
-    // This is definitely a bug, but it's not clear if we should handle it here or not.
-    pub fn abs_path(&self) -> &Arc<Path> {
-        SanitizedPath::cast_arc_ref(&self.abs_path)
-    }
-
-    fn build_initial_update(&self, project_id: u64, worktree_id: u64) -> proto::UpdateWorktree {
-        let mut updated_entries = self
-            .entries_by_path
-            .iter()
-            .map(proto::Entry::from)
-            .collect::<Vec<_>>();
-        updated_entries.sort_unstable_by_key(|e| e.id);
-
-        proto::UpdateWorktree {
-            project_id,
-            worktree_id,
-            abs_path: self.abs_path().to_string_lossy().into_owned(),
-            root_name: self.root_name().to_proto(),
-            updated_entries,
-            removed_entries: Vec::new(),
-            scan_id: self.scan_id as u64,
-            is_last_update: self.completed_scan_id == self.scan_id,
-            // Sent in separate messages.
-            updated_repositories: Vec::new(),
-            removed_repositories: Vec::new(),
-        }
-    }
-
-    pub fn work_directory_abs_path(&self, work_directory: &WorkDirectory) -> PathBuf {
-        match work_directory {
-            WorkDirectory::InProject { relative_path } => self.absolutize(relative_path),
-            WorkDirectory::AboveProject { absolute_path, .. } => absolute_path.as_ref().to_owned(),
-        }
-    }
-
-    pub fn absolutize(&self, path: &RelPath) -> PathBuf {
-        if path.file_name().is_some() {
-            let mut abs_path = self.abs_path.to_string();
-            for component in path.components() {
-                if !abs_path.ends_with(self.path_style.primary_separator()) {
-                    abs_path.push_str(self.path_style.primary_separator());
-                }
-                abs_path.push_str(component);
-            }
-            PathBuf::from(abs_path)
-        } else {
-            self.abs_path.as_path().to_path_buf()
-        }
-    }
-
-    pub fn contains_entry(&self, entry_id: ProjectEntryId) -> bool {
-        self.entries_by_id.get(&entry_id, ()).is_some()
-    }
-
-    fn insert_entry(
-        &mut self,
-        entry: proto::Entry,
-        always_included_paths: &PathMatcher,
-    ) -> Result<Entry> {
-        let entry = Entry::try_from((&self.root_char_bag, always_included_paths, entry))?;
-        let old_entry = self.entries_by_id.insert_or_replace(
-            PathEntry {
-                id: entry.id,
-                path: entry.path.clone(),
-                is_ignored: entry.is_ignored,
-                scan_id: 0,
-            },
-            (),
-        );
-        if let Some(old_entry) = old_entry {
-            self.entries_by_path.remove(&PathKey(old_entry.path), ());
-        }
-        self.entries_by_path.insert_or_replace(entry.clone(), ());
-        Ok(entry)
-    }
-
-    fn delete_entry(&mut self, entry_id: ProjectEntryId) -> Option<Arc<RelPath>> {
-        let removed_entry = self.entries_by_id.remove(&entry_id, ())?;
-        self.entries_by_path = {
-            let mut cursor = self.entries_by_path.cursor::<TraversalProgress>(());
-            let mut new_entries_by_path =
-                cursor.slice(&TraversalTarget::path(&removed_entry.path), Bias::Left);
-            while let Some(entry) = cursor.item() {
-                if entry.path.starts_with(&removed_entry.path) {
-                    self.entries_by_id.remove(&entry.id, ());
-                    cursor.next();
-                } else {
-                    break;
-                }
-            }
-            new_entries_by_path.append(cursor.suffix(), ());
-            new_entries_by_path
-        };
-
-        Some(removed_entry.path)
-    }
-
-    fn update_abs_path(&mut self, abs_path: Arc<SanitizedPath>, root_name: Arc<RelPath>) {
-        self.abs_path = abs_path;
-        if root_name != self.root_name {
-            self.root_char_bag = root_name
-                .as_unix_str()
-                .chars()
-                .map(|c| c.to_ascii_lowercase())
-                .collect();
-            self.root_name = root_name;
-        }
-    }
-
-    fn apply_remote_update(
-        &mut self,
-        update: proto::UpdateWorktree,
-        always_included_paths: &PathMatcher,
-    ) {
-        log::debug!(
-            "applying remote worktree update. {} entries updated, {} removed",
-            update.updated_entries.len(),
-            update.removed_entries.len()
-        );
-        if let Some(root_name) = RelPath::from_proto(&update.root_name).log_err() {
-            self.update_abs_path(
-                SanitizedPath::new_arc(&Path::new(&update.abs_path)),
-                root_name,
-            );
-        }
-
-        let mut entries_by_path_edits = Vec::new();
-        let mut entries_by_id_edits = Vec::new();
-
-        for entry_id in update.removed_entries {
-            let entry_id = ProjectEntryId::from_proto(entry_id);
-            entries_by_id_edits.push(Edit::Remove(entry_id));
-            if let Some(entry) = self.entry_for_id(entry_id) {
-                entries_by_path_edits.push(Edit::Remove(PathKey(entry.path.clone())));
-            }
-        }
-
-        for entry in update.updated_entries {
-            let Some(entry) =
-                Entry::try_from((&self.root_char_bag, always_included_paths, entry)).log_err()
-            else {
-                continue;
-            };
-            if let Some(PathEntry { path, .. }) = self.entries_by_id.get(&entry.id, ()) {
-                entries_by_path_edits.push(Edit::Remove(PathKey(path.clone())));
-            }
-            if let Some(old_entry) = self.entries_by_path.get(&PathKey(entry.path.clone()), ())
-                && old_entry.id != entry.id
-            {
-                entries_by_id_edits.push(Edit::Remove(old_entry.id));
-            }
-            entries_by_id_edits.push(Edit::Insert(PathEntry {
-                id: entry.id,
-                path: entry.path.clone(),
-                is_ignored: entry.is_ignored,
-                scan_id: 0,
-            }));
-            entries_by_path_edits.push(Edit::Insert(entry));
-        }
-
-        self.entries_by_path.edit(entries_by_path_edits, ());
-        self.entries_by_id.edit(entries_by_id_edits, ());
-
-        self.scan_id = update.scan_id as usize;
-        if update.is_last_update {
-            self.completed_scan_id = update.scan_id as usize;
-        }
-    }
-
-    pub fn entry_count(&self) -> usize {
-        self.entries_by_path.summary().count
-    }
-
-    pub fn visible_entry_count(&self) -> usize {
-        self.entries_by_path.summary().non_ignored_count
-    }
-
-    pub fn dir_count(&self) -> usize {
-        let summary = self.entries_by_path.summary();
-        summary.count - summary.file_count
-    }
-
-    pub fn visible_dir_count(&self) -> usize {
-        let summary = self.entries_by_path.summary();
-        summary.non_ignored_count - summary.non_ignored_file_count
-    }
-
-    pub fn file_count(&self) -> usize {
-        self.entries_by_path.summary().file_count
-    }
-
-    pub fn visible_file_count(&self) -> usize {
-        self.entries_by_path.summary().non_ignored_file_count
-    }
-
-    fn traverse_from_offset(
-        &self,
-        include_files: bool,
-        include_dirs: bool,
-        include_ignored: bool,
-        start_offset: usize,
-    ) -> Traversal<'_> {
-        let mut cursor = self.entries_by_path.cursor(());
-        cursor.seek(
-            &TraversalTarget::Count {
-                count: start_offset,
-                include_files,
-                include_dirs,
-                include_ignored,
-            },
-            Bias::Right,
-        );
-        Traversal {
-            snapshot: self,
-            cursor,
-            include_files,
-            include_dirs,
-            include_ignored,
-        }
-    }
-
-    pub fn traverse_from_path(
-        &self,
-        include_files: bool,
-        include_dirs: bool,
-        include_ignored: bool,
-        path: &RelPath,
-    ) -> Traversal<'_> {
-        Traversal::new(self, include_files, include_dirs, include_ignored, path)
-    }
-
-    pub fn files(&self, include_ignored: bool, start: usize) -> Traversal<'_> {
-        self.traverse_from_offset(true, false, include_ignored, start)
-    }
-
-    pub fn directories(&self, include_ignored: bool, start: usize) -> Traversal<'_> {
-        self.traverse_from_offset(false, true, include_ignored, start)
-    }
-
-    pub fn entries(&self, include_ignored: bool, start: usize) -> Traversal<'_> {
-        self.traverse_from_offset(true, true, include_ignored, start)
-    }
-
-    pub fn paths(&self) -> impl Iterator<Item = &RelPath> {
-        self.entries_by_path
-            .cursor::<()>(())
-            .filter(move |entry| !entry.path.is_empty())
-            .map(|entry| entry.path.as_ref())
-    }
-
-    pub fn child_entries<'a>(&'a self, parent_path: &'a RelPath) -> ChildEntriesIter<'a> {
-        let options = ChildEntriesOptions {
-            include_files: true,
-            include_dirs: true,
-            include_ignored: true,
-        };
-        self.child_entries_with_options(parent_path, options)
-    }
-
-    pub fn child_entries_with_options<'a>(
-        &'a self,
-        parent_path: &'a RelPath,
-        options: ChildEntriesOptions,
-    ) -> ChildEntriesIter<'a> {
-        let mut cursor = self.entries_by_path.cursor(());
-        cursor.seek(&TraversalTarget::path(parent_path), Bias::Right);
-        let traversal = Traversal {
-            snapshot: self,
-            cursor,
-            include_files: options.include_files,
-            include_dirs: options.include_dirs,
-            include_ignored: options.include_ignored,
-        };
-        ChildEntriesIter {
-            traversal,
-            parent_path,
-        }
-    }
-
-    pub fn root_entry(&self) -> Option<&Entry> {
-        self.entries_by_path.first()
-    }
-
-    /// Returns `None` for a single file worktree, or `Some(self.abs_path())` if
-    /// it is a directory.
-    pub fn root_dir(&self) -> Option<Arc<Path>> {
-        self.root_entry()
-            .filter(|entry| entry.is_dir())
-            .map(|_| self.abs_path().clone())
-    }
-
-    pub fn root_name(&self) -> &RelPath {
-        &self.root_name
-    }
-
-    pub fn root_name_str(&self) -> &str {
-        self.root_name.as_unix_str()
-    }
-
-    pub fn scan_id(&self) -> usize {
-        self.scan_id
-    }
-
-    pub fn entry_for_path(&self, path: &RelPath) -> Option<&Entry> {
-        self.traverse_from_path(true, true, true, path)
-            .entry()
-            .and_then(|entry| {
-                if entry.path.as_ref() == path {
-                    Some(entry)
-                } else {
-                    None
-                }
-            })
-    }
-
-    /// Resolves a path to an executable using the following heuristics:
-    ///
-    /// 1. If the path starts with `~`, it is expanded to the user's home directory.
-    /// 2. If the path is relative and contains more than one component,
-    ///    it is joined to the worktree root path.
-    /// 3. If the path is relative and exists in the worktree
-    ///    (even if falls under an exclusion filter),
-    ///    it is joined to the worktree root path.
-    /// 4. Otherwise the path is returned unmodified.
-    ///
-    /// Relative paths that do not exist in the worktree may
-    /// still be found using the `PATH` environment variable.
-    pub fn resolve_executable_path(&self, path: PathBuf) -> PathBuf {
-        if let Some(path_str) = path.to_str() {
-            if let Some(remaining_path) = path_str.strip_prefix("~/") {
-                return home_dir().join(remaining_path);
-            } else if path_str == "~" {
-                return home_dir().to_path_buf();
-            }
-        }
-
-        if let Ok(rel_path) = RelPath::new(&path, self.path_style)
-            && (path.components().count() > 1 || self.entry_for_path(&rel_path).is_some())
-        {
-            self.abs_path().join(path)
-        } else {
-            path
-        }
-    }
-
-    pub fn entry_for_id(&self, id: ProjectEntryId) -> Option<&Entry> {
-        let entry = self.entries_by_id.get(&id, ())?;
-        self.entry_for_path(&entry.path)
-    }
-
-    pub fn path_style(&self) -> PathStyle {
-        self.path_style
-    }
-}
-
-impl LocalSnapshot {
-    fn local_repo_for_work_directory_path(&self, path: &RelPath) -> Option<&LocalRepositoryEntry> {
-        self.git_repositories
-            .iter()
-            .map(|(_, entry)| entry)
-            .find(|entry| entry.work_directory.path_key() == PathKey(path.into()))
-    }
-
-    fn build_update(
-        &self,
-        project_id: u64,
-        worktree_id: u64,
-        entry_changes: UpdatedEntriesSet,
-    ) -> proto::UpdateWorktree {
-        let mut updated_entries = Vec::new();
-        let mut removed_entries = Vec::new();
-
-        for (_, entry_id, path_change) in entry_changes.iter() {
-            if let PathChange::Removed = path_change {
-                removed_entries.push(entry_id.0 as u64);
-            } else if let Some(entry) = self.entry_for_id(*entry_id) {
-                updated_entries.push(proto::Entry::from(entry));
-            }
-        }
-
-        removed_entries.sort_unstable();
-        updated_entries.sort_unstable_by_key(|e| e.id);
-
-        // TODO - optimize, knowing that removed_entries are sorted.
-        removed_entries.retain(|id| updated_entries.binary_search_by_key(id, |e| e.id).is_err());
-
-        proto::UpdateWorktree {
-            project_id,
-            worktree_id,
-            abs_path: self.abs_path().to_string_lossy().into_owned(),
-            root_name: self.root_name().to_proto(),
-            updated_entries,
-            removed_entries,
-            scan_id: self.scan_id as u64,
-            is_last_update: self.completed_scan_id == self.scan_id,
-            // Sent in separate messages.
-            updated_repositories: Vec::new(),
-            removed_repositories: Vec::new(),
-        }
-    }
-
-    fn insert_entry(&mut self, mut entry: Entry, fs: &dyn Fs) -> Entry {
-        log::trace!("insert entry {:?}", entry.path);
-        if entry.is_file() && entry.path.file_name() == Some(&GITIGNORE) {
-            let abs_path = self.absolutize(&entry.path);
-            match self.executor.block(build_gitignore(&abs_path, fs)) {
-                Ok(ignore) => {
-                    self.ignores_by_parent_abs_path
-                        .insert(abs_path.parent().unwrap().into(), (Arc::new(ignore), true));
-                }
-                Err(error) => {
-                    log::error!(
-                        "error loading .gitignore file {:?} - {:?}",
-                        &entry.path,
-                        error
-                    );
-                }
-            }
-        }
-
-        if entry.kind == EntryKind::PendingDir
-            && let Some(existing_entry) = self.entries_by_path.get(&PathKey(entry.path.clone()), ())
-        {
-            entry.kind = existing_entry.kind;
-        }
-
-        let scan_id = self.scan_id;
-        let removed = self.entries_by_path.insert_or_replace(entry.clone(), ());
-        if let Some(removed) = removed
-            && removed.id != entry.id
-        {
-            self.entries_by_id.remove(&removed.id, ());
-        }
-        self.entries_by_id.insert_or_replace(
-            PathEntry {
-                id: entry.id,
-                path: entry.path.clone(),
-                is_ignored: entry.is_ignored,
-                scan_id,
-            },
-            (),
-        );
-
-        entry
-    }
-
-    fn ancestor_inodes_for_path(&self, path: &RelPath) -> TreeSet<u64> {
-        let mut inodes = TreeSet::default();
-        for ancestor in path.ancestors().skip(1) {
-            if let Some(entry) = self.entry_for_path(ancestor) {
-                inodes.insert(entry.inode);
-            }
-        }
-        inodes
-    }
-
-    async fn ignore_stack_for_abs_path(
-        &self,
-        abs_path: &Path,
-        is_dir: bool,
-        fs: &dyn Fs,
-    ) -> IgnoreStack {
-        let mut new_ignores = Vec::new();
-        let mut repo_root = None;
-        for (index, ancestor) in abs_path.ancestors().enumerate() {
-            if index > 0 {
-                if let Some((ignore, _)) = self.ignores_by_parent_abs_path.get(ancestor) {
-                    new_ignores.push((ancestor, Some(ignore.clone())));
-                } else {
-                    new_ignores.push((ancestor, None));
-                }
-            }
-
-            let metadata = fs.metadata(&ancestor.join(DOT_GIT)).await.ok().flatten();
-            if metadata.is_some() {
-                repo_root = Some(Arc::from(ancestor));
-                break;
-            }
-        }
-
-        let mut ignore_stack = if let Some(global_gitignore) = self.global_gitignore.clone() {
-            IgnoreStack::global(global_gitignore)
-        } else {
-            IgnoreStack::none()
-        };
-        ignore_stack.repo_root = repo_root;
-        for (parent_abs_path, ignore) in new_ignores.into_iter().rev() {
-            if ignore_stack.is_abs_path_ignored(parent_abs_path, true) {
-                ignore_stack = IgnoreStack::all();
-                break;
-            } else if let Some(ignore) = ignore {
-                ignore_stack = ignore_stack.append(parent_abs_path.into(), ignore);
-            }
-        }
-
-        if ignore_stack.is_abs_path_ignored(abs_path, is_dir) {
-            ignore_stack = IgnoreStack::all();
-        }
-
-        ignore_stack
-    }
-
-    #[cfg(test)]
-    fn expanded_entries(&self) -> impl Iterator<Item = &Entry> {
-        self.entries_by_path
-            .cursor::<()>(())
-            .filter(|entry| entry.kind == EntryKind::Dir && (entry.is_external || entry.is_ignored))
-    }
-
-    #[cfg(test)]
-    pub fn check_invariants(&self, git_state: bool) {
-        use pretty_assertions::assert_eq;
-
-        assert_eq!(
-            self.entries_by_path
-                .cursor::<()>(())
-                .map(|e| (&e.path, e.id))
-                .collect::<Vec<_>>(),
-            self.entries_by_id
-                .cursor::<()>(())
-                .map(|e| (&e.path, e.id))
-                .collect::<collections::BTreeSet<_>>()
-                .into_iter()
-                .collect::<Vec<_>>(),
-            "entries_by_path and entries_by_id are inconsistent"
-        );
-
-        let mut files = self.files(true, 0);
-        let mut visible_files = self.files(false, 0);
-        for entry in self.entries_by_path.cursor::<()>(()) {
-            if entry.is_file() {
-                assert_eq!(files.next().unwrap().inode, entry.inode);
-                if (!entry.is_ignored && !entry.is_external) || entry.is_always_included {
-                    assert_eq!(visible_files.next().unwrap().inode, entry.inode);
-                }
-            }
-        }
-
-        assert!(files.next().is_none());
-        assert!(visible_files.next().is_none());
-
-        let mut bfs_paths = Vec::new();
-        let mut stack = self
-            .root_entry()
-            .map(|e| e.path.as_ref())
-            .into_iter()
-            .collect::<Vec<_>>();
-        while let Some(path) = stack.pop() {
-            bfs_paths.push(path);
-            let ix = stack.len();
-            for child_entry in self.child_entries(path) {
-                stack.insert(ix, &child_entry.path);
-            }
-        }
-
-        let dfs_paths_via_iter = self
-            .entries_by_path
-            .cursor::<()>(())
-            .map(|e| e.path.as_ref())
-            .collect::<Vec<_>>();
-        assert_eq!(bfs_paths, dfs_paths_via_iter);
-
-        let dfs_paths_via_traversal = self
-            .entries(true, 0)
-            .map(|e| e.path.as_ref())
-            .collect::<Vec<_>>();
-
-        assert_eq!(dfs_paths_via_traversal, dfs_paths_via_iter);
-
-        if git_state {
-            for ignore_parent_abs_path in self.ignores_by_parent_abs_path.keys() {
-                let ignore_parent_path = &RelPath::new(
-                    ignore_parent_abs_path
-                        .strip_prefix(self.abs_path.as_path())
-                        .unwrap(),
-                    PathStyle::local(),
-                )
-                .unwrap();
-                assert!(self.entry_for_path(ignore_parent_path).is_some());
-                assert!(
-                    self.entry_for_path(
-                        &ignore_parent_path.join(RelPath::unix(GITIGNORE).unwrap())
-                    )
-                    .is_some()
-                );
-            }
-        }
-    }
-
-    #[cfg(test)]
-    pub fn entries_without_ids(&self, include_ignored: bool) -> Vec<(&RelPath, u64, bool)> {
-        let mut paths = Vec::new();
-        for entry in self.entries_by_path.cursor::<()>(()) {
-            if include_ignored || !entry.is_ignored {
-                paths.push((entry.path.as_ref(), entry.inode, entry.is_ignored));
-            }
-        }
-        paths.sort_by(|a, b| a.0.cmp(b.0));
-        paths
-    }
-}
-
-impl BackgroundScannerState {
-    fn should_scan_directory(&self, entry: &Entry) -> bool {
-        (!entry.is_external && (!entry.is_ignored || entry.is_always_included))
-            || entry.path.file_name() == Some(DOT_GIT)
-            || entry.path.file_name() == Some(local_settings_folder_name())
-            || entry.path.file_name() == Some(local_vscode_folder_name())
-            || self.scanned_dirs.contains(&entry.id) // If we've ever scanned it, keep scanning
-            || self
-                .paths_to_scan
-                .iter()
-                .any(|p| p.starts_with(&entry.path))
-            || self
-                .path_prefixes_to_scan
-                .iter()
-                .any(|p| entry.path.starts_with(p))
-    }
-
-    async fn enqueue_scan_dir(
-        &self,
-        abs_path: Arc<Path>,
-        entry: &Entry,
-        scan_job_tx: &Sender<ScanJob>,
-        fs: &dyn Fs,
-    ) {
-        let path = entry.path.clone();
-        let ignore_stack = self
-            .snapshot
-            .ignore_stack_for_abs_path(&abs_path, true, fs)
-            .await;
-        let mut ancestor_inodes = self.snapshot.ancestor_inodes_for_path(&path);
-
-        if !ancestor_inodes.contains(&entry.inode) {
-            ancestor_inodes.insert(entry.inode);
-            scan_job_tx
-                .try_send(ScanJob {
-                    abs_path,
-                    path,
-                    ignore_stack,
-                    scan_queue: scan_job_tx.clone(),
-                    ancestor_inodes,
-                    is_external: entry.is_external,
-                })
-                .unwrap();
-        }
-    }
-
-    fn reuse_entry_id(&mut self, entry: &mut Entry) {
-        if let Some(mtime) = entry.mtime {
-            // If an entry with the same inode was removed from the worktree during this scan,
-            // then it *might* represent the same file or directory. But the OS might also have
-            // re-used the inode for a completely different file or directory.
-            //
-            // Conditionally reuse the old entry's id:
-            // * if the mtime is the same, the file was probably been renamed.
-            // * if the path is the same, the file may just have been updated
-            if let Some(removed_entry) = self.removed_entries.remove(&entry.inode) {
-                if removed_entry.mtime == Some(mtime) || removed_entry.path == entry.path {
-                    entry.id = removed_entry.id;
-                }
-            } else if let Some(existing_entry) = self.snapshot.entry_for_path(&entry.path) {
-                entry.id = existing_entry.id;
-            }
-        }
-    }
-
-    fn entry_id_for(
-        &mut self,
-        next_entry_id: &AtomicUsize,
-        path: &RelPath,
-        metadata: &fs::Metadata,
-    ) -> ProjectEntryId {
-        // If an entry with the same inode was removed from the worktree during this scan,
-        // then it *might* represent the same file or directory. But the OS might also have
-        // re-used the inode for a completely different file or directory.
-        //
-        // Conditionally reuse the old entry's id:
-        // * if the mtime is the same, the file was probably been renamed.
-        // * if the path is the same, the file may just have been updated
-        if let Some(removed_entry) = self.removed_entries.remove(&metadata.inode) {
-            if removed_entry.mtime == Some(metadata.mtime) || *removed_entry.path == *path {
-                return removed_entry.id;
-            }
-        } else if let Some(existing_entry) = self.snapshot.entry_for_path(path) {
-            return existing_entry.id;
-        }
-        ProjectEntryId::new(next_entry_id)
-    }
-
-    async fn insert_entry(&mut self, entry: Entry, fs: &dyn Fs, watcher: &dyn Watcher) -> Entry {
-        let entry = self.snapshot.insert_entry(entry, fs);
-        if entry.path.file_name() == Some(&DOT_GIT) {
-            self.insert_git_repository(entry.path.clone(), fs, watcher)
-                .await;
-        }
-
-        #[cfg(test)]
-        self.snapshot.check_invariants(false);
-
-        entry
-    }
-
-    fn populate_dir(
-        &mut self,
-        parent_path: Arc<RelPath>,
-        entries: impl IntoIterator<Item = Entry>,
-        ignore: Option<Arc<Gitignore>>,
-    ) {
-        let mut parent_entry = if let Some(parent_entry) = self
-            .snapshot
-            .entries_by_path
-            .get(&PathKey(parent_path.clone()), ())
-        {
-            parent_entry.clone()
-        } else {
-            log::warn!(
-                "populating a directory {:?} that has been removed",
-                parent_path
-            );
-            return;
-        };
-
-        match parent_entry.kind {
-            EntryKind::PendingDir | EntryKind::UnloadedDir => parent_entry.kind = EntryKind::Dir,
-            EntryKind::Dir => {}
-            _ => return,
-        }
-
-        if let Some(ignore) = ignore {
-            let abs_parent_path = self
-                .snapshot
-                .abs_path
-                .as_path()
-                .join(parent_path.as_std_path())
-                .into();
-            self.snapshot
-                .ignores_by_parent_abs_path
-                .insert(abs_parent_path, (ignore, false));
-        }
-
-        let parent_entry_id = parent_entry.id;
-        self.scanned_dirs.insert(parent_entry_id);
-        let mut entries_by_path_edits = vec![Edit::Insert(parent_entry)];
-        let mut entries_by_id_edits = Vec::new();
-
-        for entry in entries {
-            entries_by_id_edits.push(Edit::Insert(PathEntry {
-                id: entry.id,
-                path: entry.path.clone(),
-                is_ignored: entry.is_ignored,
-                scan_id: self.snapshot.scan_id,
-            }));
-            entries_by_path_edits.push(Edit::Insert(entry));
-        }
-
-        self.snapshot
-            .entries_by_path
-            .edit(entries_by_path_edits, ());
-        self.snapshot.entries_by_id.edit(entries_by_id_edits, ());
-
-        if let Err(ix) = self.changed_paths.binary_search(&parent_path) {
-            self.changed_paths.insert(ix, parent_path.clone());
-        }
-
-        #[cfg(test)]
-        self.snapshot.check_invariants(false);
-    }
-
-    fn remove_path(&mut self, path: &RelPath) {
-        log::trace!("background scanner removing path {path:?}");
-        let mut new_entries;
-        let removed_entries;
-        {
-            let mut cursor = self
-                .snapshot
-                .entries_by_path
-                .cursor::<TraversalProgress>(());
-            new_entries = cursor.slice(&TraversalTarget::path(path), Bias::Left);
-            removed_entries = cursor.slice(&TraversalTarget::successor(path), Bias::Left);
-            new_entries.append(cursor.suffix(), ());
-        }
-        self.snapshot.entries_by_path = new_entries;
-
-        let mut removed_ids = Vec::with_capacity(removed_entries.summary().count);
-        for entry in removed_entries.cursor::<()>(()) {
-            match self.removed_entries.entry(entry.inode) {
-                hash_map::Entry::Occupied(mut e) => {
-                    let prev_removed_entry = e.get_mut();
-                    if entry.id > prev_removed_entry.id {
-                        *prev_removed_entry = entry.clone();
-                    }
-                }
-                hash_map::Entry::Vacant(e) => {
-                    e.insert(entry.clone());
-                }
-            }
-
-            if entry.path.file_name() == Some(GITIGNORE) {
-                let abs_parent_path = self.snapshot.absolutize(&entry.path.parent().unwrap());
-                if let Some((_, needs_update)) = self
-                    .snapshot
-                    .ignores_by_parent_abs_path
-                    .get_mut(abs_parent_path.as_path())
-                {
-                    *needs_update = true;
-                }
-            }
-
-            if let Err(ix) = removed_ids.binary_search(&entry.id) {
-                removed_ids.insert(ix, entry.id);
-            }
-        }
-
-        self.snapshot
-            .entries_by_id
-            .edit(removed_ids.iter().map(|&id| Edit::Remove(id)).collect(), ());
-        self.snapshot
-            .git_repositories
-            .retain(|id, _| removed_ids.binary_search(id).is_err());
-
-        #[cfg(test)]
-        self.snapshot.check_invariants(false);
-    }
-
-    async fn insert_git_repository(
-        &mut self,
-        dot_git_path: Arc<RelPath>,
-        fs: &dyn Fs,
-        watcher: &dyn Watcher,
-    ) {
-        let work_dir_path: Arc<RelPath> = match dot_git_path.parent() {
-            Some(parent_dir) => {
-                // Guard against repositories inside the repository metadata
-                if parent_dir
-                    .components()
-                    .any(|component| component == DOT_GIT)
-                {
-                    log::debug!(
-                        "not building git repository for nested `.git` directory, `.git` path in the worktree: {dot_git_path:?}"
-                    );
-                    return;
-                };
-
-                parent_dir.into()
-            }
-            None => {
-                // `dot_git_path.parent().is_none()` means `.git` directory is the opened worktree itself,
-                // no files inside that directory are tracked by git, so no need to build the repo around it
-                log::debug!(
-                    "not building git repository for the worktree itself, `.git` path in the worktree: {dot_git_path:?}"
-                );
-                return;
-            }
-        };
-
-        let dot_git_abs_path = Arc::from(self.snapshot.absolutize(&dot_git_path).as_ref());
-
-        self.insert_git_repository_for_path(
-            WorkDirectory::InProject {
-                relative_path: work_dir_path,
-            },
-            dot_git_abs_path,
-            fs,
-            watcher,
-        )
-        .await
-        .log_err();
-    }
-
-    async fn insert_git_repository_for_path(
-        &mut self,
-        work_directory: WorkDirectory,
-        dot_git_abs_path: Arc<Path>,
-        fs: &dyn Fs,
-        watcher: &dyn Watcher,
-    ) -> Result<LocalRepositoryEntry> {
-        let work_dir_entry = self
-            .snapshot
-            .entry_for_path(&work_directory.path_key().0)
-            .with_context(|| {
-                format!(
-                    "working directory `{}` not indexed",
-                    work_directory
-                        .path_key()
-                        .0
-                        .display(self.snapshot.path_style)
-                )
-            })?;
-        let work_directory_abs_path = self.snapshot.work_directory_abs_path(&work_directory);
-
-        let (repository_dir_abs_path, common_dir_abs_path) =
-            discover_git_paths(&dot_git_abs_path, fs).await;
-        watcher
-            .add(&common_dir_abs_path)
-            .context("failed to add common directory to watcher")
-            .log_err();
-        if !repository_dir_abs_path.starts_with(&common_dir_abs_path) {
-            watcher
-                .add(&repository_dir_abs_path)
-                .context("failed to add repository directory to watcher")
-                .log_err();
-        }
-
-        let work_directory_id = work_dir_entry.id;
-
-        let local_repository = LocalRepositoryEntry {
-            work_directory_id,
-            work_directory,
-            work_directory_abs_path: work_directory_abs_path.as_path().into(),
-            git_dir_scan_id: 0,
-            dot_git_abs_path,
-            common_dir_abs_path,
-            repository_dir_abs_path,
-        };
-
-        self.snapshot
-            .git_repositories
-            .insert(work_directory_id, local_repository.clone());
-
-        log::trace!("inserting new local git repository");
-        Ok(local_repository)
-    }
-}
-
-async fn is_git_dir(path: &Path, fs: &dyn Fs) -> bool {
-    if let Some(file_name) = path.file_name()
-        && file_name == DOT_GIT
-    {
-        return true;
-    }
-
-    // If we're in a bare repository, we are not inside a `.git` folder. In a
-    // bare repository, the root folder contains what would normally be in the
-    // `.git` folder.
-    let head_metadata = fs.metadata(&path.join("HEAD")).await;
-    if !matches!(head_metadata, Ok(Some(_))) {
-        return false;
-    }
-    let config_metadata = fs.metadata(&path.join("config")).await;
-    matches!(config_metadata, Ok(Some(_)))
-}
-
-async fn build_gitignore(abs_path: &Path, fs: &dyn Fs) -> Result<Gitignore> {
-    let contents = fs
-        .load(abs_path)
-        .await
-        .with_context(|| format!("failed to load gitignore file at {}", abs_path.display()))?;
-    let parent = abs_path.parent().unwrap_or_else(|| Path::new("/"));
-    let mut builder = GitignoreBuilder::new(parent);
-    for line in contents.lines() {
-        builder.add_line(Some(abs_path.into()), line)?;
-    }
-    Ok(builder.build()?)
-}
-
-impl Deref for Worktree {
-    type Target = Snapshot;
-
-    fn deref(&self) -> &Self::Target {
-        match self {
-            Worktree::Local(worktree) => &worktree.snapshot,
-            Worktree::Remote(worktree) => &worktree.snapshot,
-        }
-    }
-}
-
-impl Deref for LocalWorktree {
-    type Target = LocalSnapshot;
-
-    fn deref(&self) -> &Self::Target {
-        &self.snapshot
-    }
-}
-
-impl Deref for RemoteWorktree {
-    type Target = Snapshot;
-
-    fn deref(&self) -> &Self::Target {
-        &self.snapshot
-    }
-}
-
-impl fmt::Debug for LocalWorktree {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        self.snapshot.fmt(f)
-    }
-}
-
-impl fmt::Debug for Snapshot {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        struct EntriesById<'a>(&'a SumTree<PathEntry>);
-        struct EntriesByPath<'a>(&'a SumTree<Entry>);
-
-        impl fmt::Debug for EntriesByPath<'_> {
-            fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-                f.debug_map()
-                    .entries(self.0.iter().map(|entry| (&entry.path, entry.id)))
-                    .finish()
-            }
-        }
-
-        impl fmt::Debug for EntriesById<'_> {
-            fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-                f.debug_list().entries(self.0.iter()).finish()
-            }
-        }
-
-        f.debug_struct("Snapshot")
-            .field("id", &self.id)
-            .field("root_name", &self.root_name)
-            .field("entries_by_path", &EntriesByPath(&self.entries_by_path))
-            .field("entries_by_id", &EntriesById(&self.entries_by_id))
-            .finish()
-    }
-}
-
-#[derive(Debug, Clone, PartialEq)]
-pub struct File {
-    pub worktree: Entity<Worktree>,
-    pub path: Arc<RelPath>,
-    pub disk_state: DiskState,
-    pub entry_id: Option<ProjectEntryId>,
-    pub is_local: bool,
-    pub is_private: bool,
-}
-
-impl language::File for File {
-    fn as_local(&self) -> Option<&dyn language::LocalFile> {
-        if self.is_local { Some(self) } else { None }
-    }
-
-    fn disk_state(&self) -> DiskState {
-        self.disk_state
-    }
-
-    fn path(&self) -> &Arc<RelPath> {
-        &self.path
-    }
-
-    fn full_path(&self, cx: &App) -> PathBuf {
-        self.worktree.read(cx).full_path(&self.path)
-    }
-
-    /// Returns the last component of this handle's absolute path. If this handle refers to the root
-    /// of its worktree, then this method will return the name of the worktree itself.
-    fn file_name<'a>(&'a self, cx: &'a App) -> &'a str {
-        self.path
-            .file_name()
-            .unwrap_or_else(|| self.worktree.read(cx).root_name_str())
-    }
-
-    fn worktree_id(&self, cx: &App) -> WorktreeId {
-        self.worktree.read(cx).id()
-    }
-
-    fn to_proto(&self, cx: &App) -> rpc::proto::File {
-        rpc::proto::File {
-            worktree_id: self.worktree.read(cx).id().to_proto(),
-            entry_id: self.entry_id.map(|id| id.to_proto()),
-            path: self.path.as_ref().to_proto(),
-            mtime: self.disk_state.mtime().map(|time| time.into()),
-            is_deleted: self.disk_state == DiskState::Deleted,
-        }
-    }
-
-    fn is_private(&self) -> bool {
-        self.is_private
-    }
-
-    fn path_style(&self, cx: &App) -> PathStyle {
-        self.worktree.read(cx).path_style()
-    }
-}
-
-impl language::LocalFile for File {
-    fn abs_path(&self, cx: &App) -> PathBuf {
-        self.worktree.read(cx).absolutize(&self.path)
-    }
-
-    fn load(&self, cx: &App) -> Task<Result<String>> {
-        let worktree = self.worktree.read(cx).as_local().unwrap();
-        let abs_path = worktree.absolutize(&self.path);
-        let fs = worktree.fs.clone();
-        cx.background_spawn(async move { fs.load(&abs_path).await })
-    }
-
-    fn load_bytes(&self, cx: &App) -> Task<Result<Vec<u8>>> {
-        let worktree = self.worktree.read(cx).as_local().unwrap();
-        let abs_path = worktree.absolutize(&self.path);
-        let fs = worktree.fs.clone();
-        cx.background_spawn(async move { fs.load_bytes(&abs_path).await })
-    }
-}
-
-impl File {
-    pub fn for_entry(entry: Entry, worktree: Entity<Worktree>) -> Arc<Self> {
-        Arc::new(Self {
-            worktree,
-            path: entry.path.clone(),
-            disk_state: if let Some(mtime) = entry.mtime {
-                DiskState::Present { mtime }
-            } else {
-                DiskState::New
-            },
-            entry_id: Some(entry.id),
-            is_local: true,
-            is_private: entry.is_private,
-        })
-    }
-
-    pub fn from_proto(
-        proto: rpc::proto::File,
-        worktree: Entity<Worktree>,
-        cx: &App,
-    ) -> Result<Self> {
-        let worktree_id = worktree.read(cx).as_remote().context("not remote")?.id();
-
-        anyhow::ensure!(
-            worktree_id.to_proto() == proto.worktree_id,
-            "worktree id does not match file"
-        );
-
-        let disk_state = if proto.is_deleted {
-            DiskState::Deleted
-        } else if let Some(mtime) = proto.mtime.map(&Into::into) {
-            DiskState::Present { mtime }
-        } else {
-            DiskState::New
-        };
-
-        Ok(Self {
-            worktree,
-            path: RelPath::from_proto(&proto.path).context("invalid path in file protobuf")?,
-            disk_state,
-            entry_id: proto.entry_id.map(ProjectEntryId::from_proto),
-            is_local: false,
-            is_private: false,
-        })
-    }
-
-    pub fn from_dyn(file: Option<&Arc<dyn language::File>>) -> Option<&Self> {
-        file.and_then(|f| {
-            let f: &dyn language::File = f.borrow();
-            let f: &dyn Any = f;
-            f.downcast_ref()
-        })
-    }
-
-    pub fn worktree_id(&self, cx: &App) -> WorktreeId {
-        self.worktree.read(cx).id()
-    }
-
-    pub fn project_entry_id(&self) -> Option<ProjectEntryId> {
-        match self.disk_state {
-            DiskState::Deleted => None,
-            _ => self.entry_id,
-        }
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct Entry {
-    pub id: ProjectEntryId,
-    pub kind: EntryKind,
-    pub path: Arc<RelPath>,
-    pub inode: u64,
-    pub mtime: Option<MTime>,
-
-    pub canonical_path: Option<Arc<Path>>,
-    /// Whether this entry is ignored by Git.
-    ///
-    /// We only scan ignored entries once the directory is expanded and
-    /// exclude them from searches.
-    pub is_ignored: bool,
-
-    /// Whether this entry is hidden or inside hidden directory.
-    ///
-    /// We only scan hidden entries once the directory is expanded.
-    pub is_hidden: bool,
-
-    /// Whether this entry is always included in searches.
-    ///
-    /// This is used for entries that are always included in searches, even
-    /// if they are ignored by git. Overridden by file_scan_exclusions.
-    pub is_always_included: bool,
-
-    /// Whether this entry's canonical path is outside of the worktree.
-    /// This means the entry is only accessible from the worktree root via a
-    /// symlink.
-    ///
-    /// We only scan entries outside of the worktree once the symlinked
-    /// directory is expanded. External entries are treated like gitignored
-    /// entries in that they are not included in searches.
-    pub is_external: bool,
-
-    /// Whether this entry is considered to be a `.env` file.
-    pub is_private: bool,
-    /// The entry's size on disk, in bytes.
-    pub size: u64,
-    pub char_bag: CharBag,
-    pub is_fifo: bool,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum EntryKind {
-    UnloadedDir,
-    PendingDir,
-    Dir,
-    File,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub enum PathChange {
-    /// A filesystem entry was was created.
-    Added,
-    /// A filesystem entry was removed.
-    Removed,
-    /// A filesystem entry was updated.
-    Updated,
-    /// A filesystem entry was either updated or added. We don't know
-    /// whether or not it already existed, because the path had not
-    /// been loaded before the event.
-    AddedOrUpdated,
-    /// A filesystem entry was found during the initial scan of the worktree.
-    Loaded,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct UpdatedGitRepository {
-    /// ID of the repository's working directory.
-    ///
-    /// For a repo that's above the worktree root, this is the ID of the worktree root, and hence not unique.
-    /// It's included here to aid the GitStore in detecting when a repository's working directory is renamed.
-    pub work_directory_id: ProjectEntryId,
-    pub old_work_directory_abs_path: Option<Arc<Path>>,
-    pub new_work_directory_abs_path: Option<Arc<Path>>,
-    /// For a normal git repository checkout, the absolute path to the .git directory.
-    /// For a worktree, the absolute path to the worktree's subdirectory inside the .git directory.
-    pub dot_git_abs_path: Option<Arc<Path>>,
-    pub repository_dir_abs_path: Option<Arc<Path>>,
-    pub common_dir_abs_path: Option<Arc<Path>>,
-}
-
-pub type UpdatedEntriesSet = Arc<[(Arc<RelPath>, ProjectEntryId, PathChange)]>;
-pub type UpdatedGitRepositoriesSet = Arc<[UpdatedGitRepository]>;
-
-#[derive(Clone, Debug)]
-pub struct PathProgress<'a> {
-    pub max_path: &'a RelPath,
-}
-
-#[derive(Clone, Debug)]
-pub struct PathSummary<S> {
-    pub max_path: Arc<RelPath>,
-    pub item_summary: S,
-}
-
-impl<S: Summary> Summary for PathSummary<S> {
-    type Context<'a> = S::Context<'a>;
-
-    fn zero(cx: Self::Context<'_>) -> Self {
-        Self {
-            max_path: RelPath::empty().into(),
-            item_summary: S::zero(cx),
-        }
-    }
-
-    fn add_summary(&mut self, rhs: &Self, cx: Self::Context<'_>) {
-        self.max_path = rhs.max_path.clone();
-        self.item_summary.add_summary(&rhs.item_summary, cx);
-    }
-}
-
-impl<'a, S: Summary> sum_tree::Dimension<'a, PathSummary<S>> for PathProgress<'a> {
-    fn zero(_: <PathSummary<S> as Summary>::Context<'_>) -> Self {
-        Self {
-            max_path: RelPath::empty(),
-        }
-    }
-
-    fn add_summary(
-        &mut self,
-        summary: &'a PathSummary<S>,
-        _: <PathSummary<S> as Summary>::Context<'_>,
-    ) {
-        self.max_path = summary.max_path.as_ref()
-    }
-}
-
-impl<'a> sum_tree::Dimension<'a, PathSummary<GitSummary>> for GitSummary {
-    fn zero(_cx: ()) -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, summary: &'a PathSummary<GitSummary>, _: ()) {
-        *self += summary.item_summary
-    }
-}
-
-impl<'a>
-    sum_tree::SeekTarget<'a, PathSummary<GitSummary>, Dimensions<TraversalProgress<'a>, GitSummary>>
-    for PathTarget<'_>
-{
-    fn cmp(
-        &self,
-        cursor_location: &Dimensions<TraversalProgress<'a>, GitSummary>,
-        _: (),
-    ) -> Ordering {
-        self.cmp_path(cursor_location.0.max_path)
-    }
-}
-
-impl<'a, S: Summary> sum_tree::Dimension<'a, PathSummary<S>> for PathKey {
-    fn zero(_: S::Context<'_>) -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, summary: &'a PathSummary<S>, _: S::Context<'_>) {
-        self.0 = summary.max_path.clone();
-    }
-}
-
-impl<'a, S: Summary> sum_tree::Dimension<'a, PathSummary<S>> for TraversalProgress<'a> {
-    fn zero(_cx: S::Context<'_>) -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, summary: &'a PathSummary<S>, _: S::Context<'_>) {
-        self.max_path = summary.max_path.as_ref();
-    }
-}
-
-impl Entry {
-    fn new(
-        path: Arc<RelPath>,
-        metadata: &fs::Metadata,
-        id: ProjectEntryId,
-        root_char_bag: CharBag,
-        canonical_path: Option<Arc<Path>>,
-    ) -> Self {
-        let char_bag = char_bag_for_path(root_char_bag, &path);
-        Self {
-            id,
-            kind: if metadata.is_dir {
-                EntryKind::PendingDir
-            } else {
-                EntryKind::File
-            },
-            path,
-            inode: metadata.inode,
-            mtime: Some(metadata.mtime),
-            size: metadata.len,
-            canonical_path,
-            is_ignored: false,
-            is_hidden: false,
-            is_always_included: false,
-            is_external: false,
-            is_private: false,
-            char_bag,
-            is_fifo: metadata.is_fifo,
-        }
-    }
-
-    pub fn is_created(&self) -> bool {
-        self.mtime.is_some()
-    }
-
-    pub fn is_dir(&self) -> bool {
-        self.kind.is_dir()
-    }
-
-    pub fn is_file(&self) -> bool {
-        self.kind.is_file()
-    }
-}
-
-impl EntryKind {
-    pub fn is_dir(&self) -> bool {
-        matches!(
-            self,
-            EntryKind::Dir | EntryKind::PendingDir | EntryKind::UnloadedDir
-        )
-    }
-
-    pub fn is_unloaded(&self) -> bool {
-        matches!(self, EntryKind::UnloadedDir)
-    }
-
-    pub fn is_file(&self) -> bool {
-        matches!(self, EntryKind::File)
-    }
-}
-
-impl sum_tree::Item for Entry {
-    type Summary = EntrySummary;
-
-    fn summary(&self, _cx: ()) -> Self::Summary {
-        let non_ignored_count = if (self.is_ignored || self.is_external) && !self.is_always_included
-        {
-            0
-        } else {
-            1
-        };
-        let file_count;
-        let non_ignored_file_count;
-        if self.is_file() {
-            file_count = 1;
-            non_ignored_file_count = non_ignored_count;
-        } else {
-            file_count = 0;
-            non_ignored_file_count = 0;
-        }
-
-        EntrySummary {
-            max_path: self.path.clone(),
-            count: 1,
-            non_ignored_count,
-            file_count,
-            non_ignored_file_count,
-        }
-    }
-}
-
-impl sum_tree::KeyedItem for Entry {
-    type Key = PathKey;
-
-    fn key(&self) -> Self::Key {
-        PathKey(self.path.clone())
-    }
-}
-
-#[derive(Clone, Debug)]
-pub struct EntrySummary {
-    max_path: Arc<RelPath>,
-    count: usize,
-    non_ignored_count: usize,
-    file_count: usize,
-    non_ignored_file_count: usize,
-}
-
-impl Default for EntrySummary {
-    fn default() -> Self {
-        Self {
-            max_path: Arc::from(RelPath::empty()),
-            count: 0,
-            non_ignored_count: 0,
-            file_count: 0,
-            non_ignored_file_count: 0,
-        }
-    }
-}
-
-impl sum_tree::ContextLessSummary for EntrySummary {
-    fn zero() -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, rhs: &Self) {
-        self.max_path = rhs.max_path.clone();
-        self.count += rhs.count;
-        self.non_ignored_count += rhs.non_ignored_count;
-        self.file_count += rhs.file_count;
-        self.non_ignored_file_count += rhs.non_ignored_file_count;
-    }
-}
-
-#[derive(Clone, Debug)]
-struct PathEntry {
-    id: ProjectEntryId,
-    path: Arc<RelPath>,
-    is_ignored: bool,
-    scan_id: usize,
-}
-
-impl sum_tree::Item for PathEntry {
-    type Summary = PathEntrySummary;
-
-    fn summary(&self, _cx: ()) -> Self::Summary {
-        PathEntrySummary { max_id: self.id }
-    }
-}
-
-impl sum_tree::KeyedItem for PathEntry {
-    type Key = ProjectEntryId;
-
-    fn key(&self) -> Self::Key {
-        self.id
-    }
-}
-
-#[derive(Clone, Debug, Default)]
-struct PathEntrySummary {
-    max_id: ProjectEntryId,
-}
-
-impl sum_tree::ContextLessSummary for PathEntrySummary {
-    fn zero() -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, summary: &Self) {
-        self.max_id = summary.max_id;
-    }
-}
-
-impl<'a> sum_tree::Dimension<'a, PathEntrySummary> for ProjectEntryId {
-    fn zero(_cx: ()) -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, summary: &'a PathEntrySummary, _: ()) {
-        *self = summary.max_id;
-    }
-}
-
-#[derive(Clone, Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
-pub struct PathKey(pub Arc<RelPath>);
-
-impl Default for PathKey {
-    fn default() -> Self {
-        Self(RelPath::empty().into())
-    }
-}
-
-impl<'a> sum_tree::Dimension<'a, EntrySummary> for PathKey {
-    fn zero(_cx: ()) -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, summary: &'a EntrySummary, _: ()) {
-        self.0 = summary.max_path.clone();
-    }
-}
-
-struct BackgroundScanner {
-    state: async_lock::Mutex<BackgroundScannerState>,
-    fs: Arc<dyn Fs>,
-    fs_case_sensitive: bool,
-    status_updates_tx: UnboundedSender<ScanState>,
-    executor: BackgroundExecutor,
-    scan_requests_rx: channel::Receiver<ScanRequest>,
-    path_prefixes_to_scan_rx: channel::Receiver<PathPrefixScanRequest>,
-    next_entry_id: Arc<AtomicUsize>,
-    phase: BackgroundScannerPhase,
-    watcher: Arc<dyn Watcher>,
-    settings: WorktreeSettings,
-    share_private_files: bool,
-    scanning_enabled: bool,
-}
-
-#[derive(Copy, Clone, PartialEq)]
-enum BackgroundScannerPhase {
-    InitialScan,
-    EventsReceivedDuringInitialScan,
-    Events,
-}
-
-impl BackgroundScanner {
-    async fn run(&mut self, mut fs_events_rx: Pin<Box<dyn Send + Stream<Item = Vec<PathEvent>>>>) {
-        // If the worktree root does not contain a git repository, then find
-        // the git repository in an ancestor directory. Find any gitignore files
-        // in ancestor directories.
-        let root_abs_path = self.state.lock().await.snapshot.abs_path.clone();
-
-        let repo = if self.scanning_enabled {
-            let (ignores, repo) = discover_ancestor_git_repo(self.fs.clone(), &root_abs_path).await;
-            self.state
-                .lock()
-                .await
-                .snapshot
-                .ignores_by_parent_abs_path
-                .extend(ignores);
-            repo
-        } else {
-            None
-        };
-
-        let containing_git_repository = if let Some((ancestor_dot_git, work_directory)) = repo
-            && self.scanning_enabled
-        {
-            maybe!(async {
-                self.state
-                    .lock()
-                    .await
-                    .insert_git_repository_for_path(
-                        work_directory,
-                        ancestor_dot_git.clone().into(),
-                        self.fs.as_ref(),
-                        self.watcher.as_ref(),
-                    )
-                    .await
-                    .log_err()?;
-                Some(ancestor_dot_git)
-            })
-            .await
-        } else {
-            None
-        };
-
-        log::trace!("containing git repository: {containing_git_repository:?}");
-
-        let mut global_gitignore_events = if let Some(global_gitignore_path) =
-            &paths::global_gitignore_path()
-            && self.scanning_enabled
-        {
-            let is_file = self.fs.is_file(&global_gitignore_path).await;
-            self.state.lock().await.snapshot.global_gitignore = if is_file {
-                build_gitignore(global_gitignore_path, self.fs.as_ref())
-                    .await
-                    .ok()
-                    .map(Arc::new)
-            } else {
-                None
-            };
-            if is_file
-                || matches!(global_gitignore_path.parent(), Some(path) if self.fs.is_dir(path).await)
-            {
-                self.fs
-                    .watch(global_gitignore_path, FS_WATCH_LATENCY)
-                    .await
-                    .0
-            } else {
-                Box::pin(futures::stream::pending())
-            }
-        } else {
-            self.state.lock().await.snapshot.global_gitignore = None;
-            Box::pin(futures::stream::pending())
-        };
-
-        let (scan_job_tx, scan_job_rx) = channel::unbounded();
-        {
-            let mut state = self.state.lock().await;
-            state.snapshot.scan_id += 1;
-            if let Some(mut root_entry) = state.snapshot.root_entry().cloned() {
-                let ignore_stack = state
-                    .snapshot
-                    .ignore_stack_for_abs_path(root_abs_path.as_path(), true, self.fs.as_ref())
-                    .await;
-                if ignore_stack.is_abs_path_ignored(root_abs_path.as_path(), true) {
-                    root_entry.is_ignored = true;
-                    let mut root_entry = root_entry.clone();
-                    state.reuse_entry_id(&mut root_entry);
-                    state
-                        .insert_entry(root_entry, self.fs.as_ref(), self.watcher.as_ref())
-                        .await;
-                }
-                if root_entry.is_dir() && self.scanning_enabled {
-                    state
-                        .enqueue_scan_dir(
-                            root_abs_path.as_path().into(),
-                            &root_entry,
-                            &scan_job_tx,
-                            self.fs.as_ref(),
-                        )
-                        .await;
-                }
-            }
-        };
-
-        // Perform an initial scan of the directory.
-        drop(scan_job_tx);
-        self.scan_dirs(true, scan_job_rx).await;
-        {
-            let mut state = self.state.lock().await;
-            state.snapshot.completed_scan_id = state.snapshot.scan_id;
-        }
-
-        self.send_status_update(false, SmallVec::new()).await;
-
-        // Process any any FS events that occurred while performing the initial scan.
-        // For these events, update events cannot be as precise, because we didn't
-        // have the previous state loaded yet.
-        self.phase = BackgroundScannerPhase::EventsReceivedDuringInitialScan;
-        if let Poll::Ready(Some(mut paths)) = futures::poll!(fs_events_rx.next()) {
-            while let Poll::Ready(Some(more_paths)) = futures::poll!(fs_events_rx.next()) {
-                paths.extend(more_paths);
-            }
-            self.process_events(
-                paths
-                    .into_iter()
-                    .filter(|e| e.kind.is_some())
-                    .map(Into::into)
-                    .collect(),
-            )
-            .await;
-        }
-        if let Some(abs_path) = containing_git_repository {
-            self.process_events(vec![abs_path]).await;
-        }
-
-        // Continue processing events until the worktree is dropped.
-        self.phase = BackgroundScannerPhase::Events;
-
-        loop {
-            select_biased! {
-                // Process any path refresh requests from the worktree. Prioritize
-                // these before handling changes reported by the filesystem.
-                request = self.next_scan_request().fuse() => {
-                    let Ok(request) = request else { break };
-                    if !self.process_scan_request(request, false).await {
-                        return;
-                    }
-                }
-
-                path_prefix_request = self.path_prefixes_to_scan_rx.recv().fuse() => {
-                    let Ok(request) = path_prefix_request else { break };
-                    log::trace!("adding path prefix {:?}", request.path);
-
-                    let did_scan = self.forcibly_load_paths(std::slice::from_ref(&request.path)).await;
-                    if did_scan {
-                        let abs_path =
-                        {
-                            let mut state = self.state.lock().await;
-                            state.path_prefixes_to_scan.insert(request.path.clone());
-                            state.snapshot.absolutize(&request.path)
-                        };
-
-                        if let Some(abs_path) = self.fs.canonicalize(&abs_path).await.log_err() {
-                            self.process_events(vec![abs_path]).await;
-                        }
-                    }
-                    self.send_status_update(false, request.done).await;
-                }
-
-                paths = fs_events_rx.next().fuse() => {
-                    let Some(mut paths) = paths else { break };
-                    while let Poll::Ready(Some(more_paths)) = futures::poll!(fs_events_rx.next()) {
-                        paths.extend(more_paths);
-                    }
-                    self.process_events(paths.into_iter().filter(|e| e.kind.is_some()).map(Into::into).collect()).await;
-                }
-
-                paths = global_gitignore_events.next().fuse() => {
-                    match paths.as_deref() {
-                        Some([event, ..]) => {
-                            self.update_global_gitignore(&event.path).await;
-                        }
-                        _ => (),
-                    }
-                }
-            }
-        }
-    }
-
-    async fn process_scan_request(&self, mut request: ScanRequest, scanning: bool) -> bool {
-        log::debug!("rescanning paths {:?}", request.relative_paths);
-
-        request.relative_paths.sort_unstable();
-        self.forcibly_load_paths(&request.relative_paths).await;
-
-        let root_path = self.state.lock().await.snapshot.abs_path.clone();
-        let root_canonical_path = self.fs.canonicalize(root_path.as_path()).await;
-        let root_canonical_path = match &root_canonical_path {
-            Ok(path) => SanitizedPath::new(path),
-            Err(err) => {
-                log::error!("failed to canonicalize root path {root_path:?}: {err:#}");
-                return true;
-            }
-        };
-        let abs_paths = request
-            .relative_paths
-            .iter()
-            .map(|path| {
-                if path.file_name().is_some() {
-                    root_canonical_path.as_path().join(path.as_std_path())
-                } else {
-                    root_canonical_path.as_path().to_path_buf()
-                }
-            })
-            .collect::<Vec<_>>();
-
-        {
-            let mut state = self.state.lock().await;
-            let is_idle = state.snapshot.completed_scan_id == state.snapshot.scan_id;
-            state.snapshot.scan_id += 1;
-            if is_idle {
-                state.snapshot.completed_scan_id = state.snapshot.scan_id;
-            }
-        }
-
-        self.reload_entries_for_paths(
-            &root_path,
-            &root_canonical_path,
-            &request.relative_paths,
-            abs_paths,
-            None,
-        )
-        .await;
-
-        self.send_status_update(scanning, request.done).await
-    }
-
-    async fn process_events(&self, mut abs_paths: Vec<PathBuf>) {
-        log::trace!("process events: {abs_paths:?}");
-        let root_path = self.state.lock().await.snapshot.abs_path.clone();
-        let root_canonical_path = self.fs.canonicalize(root_path.as_path()).await;
-        let root_canonical_path = match &root_canonical_path {
-            Ok(path) => SanitizedPath::new(path),
-            Err(err) => {
-                let new_path = self
-                    .state
-                    .lock()
-                    .await
-                    .snapshot
-                    .root_file_handle
-                    .clone()
-                    .and_then(|handle| handle.current_path(&self.fs).log_err())
-                    .map(|path| SanitizedPath::new_arc(&path))
-                    .filter(|new_path| *new_path != root_path);
-
-                if let Some(new_path) = new_path {
-                    log::info!(
-                        "root renamed from {} to {}",
-                        root_path.as_path().display(),
-                        new_path.as_path().display()
-                    );
-                    self.status_updates_tx
-                        .unbounded_send(ScanState::RootUpdated { new_path })
-                        .ok();
-                } else {
-                    log::warn!("root path could not be canonicalized: {:#}", err);
-                }
-                return;
-            }
-        };
-
-        // Certain directories may have FS changes, but do not lead to git data changes that Zed cares about.
-        // Ignore these, to avoid Zed unnecessarily rescanning git metadata.
-        let skipped_files_in_dot_git = [COMMIT_MESSAGE, INDEX_LOCK];
-        let skipped_dirs_in_dot_git = [FSMONITOR_DAEMON, LFS_DIR];
-
-        let mut relative_paths = Vec::with_capacity(abs_paths.len());
-        let mut dot_git_abs_paths = Vec::new();
-        abs_paths.sort_unstable();
-        abs_paths.dedup_by(|a, b| a.starts_with(b));
-        {
-            let snapshot = &self.state.lock().await.snapshot;
-
-            let mut ranges_to_drop = SmallVec::<[Range<usize>; 4]>::new();
-
-            fn skip_ix(ranges: &mut SmallVec<[Range<usize>; 4]>, ix: usize) {
-                if let Some(last_range) = ranges.last_mut()
-                    && last_range.end == ix
-                {
-                    last_range.end += 1;
-                } else {
-                    ranges.push(ix..ix + 1);
-                }
-            }
-
-            for (ix, abs_path) in abs_paths.iter().enumerate() {
-                let abs_path = &SanitizedPath::new(&abs_path);
-
-                let mut is_git_related = false;
-                let mut dot_git_paths = None;
-
-                for ancestor in abs_path.as_path().ancestors() {
-                    if is_git_dir(ancestor, self.fs.as_ref()).await {
-                        let path_in_git_dir = abs_path
-                            .as_path()
-                            .strip_prefix(ancestor)
-                            .expect("stripping off the ancestor");
-                        dot_git_paths = Some((ancestor.to_owned(), path_in_git_dir.to_owned()));
-                        break;
-                    }
-                }
-
-                if let Some((dot_git_abs_path, path_in_git_dir)) = dot_git_paths {
-                    if skipped_files_in_dot_git
-                        .iter()
-                        .any(|skipped| OsStr::new(skipped) == path_in_git_dir.as_path().as_os_str())
-                        || skipped_dirs_in_dot_git.iter().any(|skipped_git_subdir| {
-                            path_in_git_dir.starts_with(skipped_git_subdir)
-                        })
-                    {
-                        log::debug!(
-                            "ignoring event {abs_path:?} as it's in the .git directory among skipped files or directories"
-                        );
-                        skip_ix(&mut ranges_to_drop, ix);
-                        continue;
-                    }
-
-                    is_git_related = true;
-                    if !dot_git_abs_paths.contains(&dot_git_abs_path) {
-                        dot_git_abs_paths.push(dot_git_abs_path);
-                    }
-                }
-
-                let relative_path = if let Ok(path) = abs_path.strip_prefix(&root_canonical_path)
-                    && let Ok(path) = RelPath::new(path, PathStyle::local())
-                {
-                    path
-                } else {
-                    if is_git_related {
-                        log::debug!(
-                            "ignoring event {abs_path:?}, since it's in git dir outside of root path {root_canonical_path:?}",
-                        );
-                    } else {
-                        log::error!(
-                            "ignoring event {abs_path:?} outside of root path {root_canonical_path:?}",
-                        );
-                    }
-                    skip_ix(&mut ranges_to_drop, ix);
-                    continue;
-                };
-
-                if abs_path.file_name() == Some(OsStr::new(GITIGNORE)) {
-                    for (_, repo) in snapshot
-                        .git_repositories
-                        .iter()
-                        .filter(|(_, repo)| repo.directory_contains(&relative_path))
-                    {
-                        if !dot_git_abs_paths.iter().any(|dot_git_abs_path| {
-                            dot_git_abs_path == repo.common_dir_abs_path.as_ref()
-                        }) {
-                            dot_git_abs_paths.push(repo.common_dir_abs_path.to_path_buf());
-                        }
-                    }
-                }
-
-                let parent_dir_is_loaded = relative_path.parent().is_none_or(|parent| {
-                    snapshot
-                        .entry_for_path(parent)
-                        .is_some_and(|entry| entry.kind == EntryKind::Dir)
-                });
-                if !parent_dir_is_loaded {
-                    log::debug!("ignoring event {relative_path:?} within unloaded directory");
-                    skip_ix(&mut ranges_to_drop, ix);
-                    continue;
-                }
-
-                if self.settings.is_path_excluded(&relative_path) {
-                    if !is_git_related {
-                        log::debug!("ignoring FS event for excluded path {relative_path:?}");
-                    }
-                    skip_ix(&mut ranges_to_drop, ix);
-                    continue;
-                }
-
-                relative_paths.push(relative_path.into_arc());
-            }
-
-            for range_to_drop in ranges_to_drop.into_iter().rev() {
-                abs_paths.drain(range_to_drop);
-            }
-        }
-
-        if relative_paths.is_empty() && dot_git_abs_paths.is_empty() {
-            return;
-        }
-
-        self.state.lock().await.snapshot.scan_id += 1;
-
-        let (scan_job_tx, scan_job_rx) = channel::unbounded();
-        log::debug!("received fs events {:?}", relative_paths);
-        self.reload_entries_for_paths(
-            &root_path,
-            &root_canonical_path,
-            &relative_paths,
-            abs_paths,
-            Some(scan_job_tx.clone()),
-        )
-        .await;
-
-        let affected_repo_roots = if !dot_git_abs_paths.is_empty() {
-            self.update_git_repositories(dot_git_abs_paths).await
-        } else {
-            Vec::new()
-        };
-
-        {
-            let mut ignores_to_update = self.ignores_needing_update().await;
-            ignores_to_update.extend(affected_repo_roots);
-            let ignores_to_update = self.order_ignores(ignores_to_update).await;
-            let snapshot = self.state.lock().await.snapshot.clone();
-            self.update_ignore_statuses_for_paths(scan_job_tx, snapshot, ignores_to_update)
-                .await;
-            self.scan_dirs(false, scan_job_rx).await;
-        }
-
-        {
-            let mut state = self.state.lock().await;
-            state.snapshot.completed_scan_id = state.snapshot.scan_id;
-            for (_, entry) in mem::take(&mut state.removed_entries) {
-                state.scanned_dirs.remove(&entry.id);
-            }
-        }
-        self.send_status_update(false, SmallVec::new()).await;
-    }
-
-    async fn update_global_gitignore(&self, abs_path: &Path) {
-        let ignore = build_gitignore(abs_path, self.fs.as_ref())
-            .await
-            .log_err()
-            .map(Arc::new);
-        let (prev_snapshot, ignore_stack, abs_path) = {
-            let mut state = self.state.lock().await;
-            state.snapshot.global_gitignore = ignore;
-            let abs_path = state.snapshot.abs_path().clone();
-            let ignore_stack = state
-                .snapshot
-                .ignore_stack_for_abs_path(&abs_path, true, self.fs.as_ref())
-                .await;
-            (state.snapshot.clone(), ignore_stack, abs_path)
-        };
-        let (scan_job_tx, scan_job_rx) = channel::unbounded();
-        self.update_ignore_statuses_for_paths(
-            scan_job_tx,
-            prev_snapshot,
-            vec![(abs_path, ignore_stack)],
-        )
-        .await;
-        self.scan_dirs(false, scan_job_rx).await;
-        self.send_status_update(false, SmallVec::new()).await;
-    }
-
-    async fn forcibly_load_paths(&self, paths: &[Arc<RelPath>]) -> bool {
-        let (scan_job_tx, scan_job_rx) = channel::unbounded();
-        {
-            let mut state = self.state.lock().await;
-            let root_path = state.snapshot.abs_path.clone();
-            for path in paths {
-                for ancestor in path.ancestors() {
-                    if let Some(entry) = state.snapshot.entry_for_path(ancestor)
-                        && entry.kind == EntryKind::UnloadedDir
-                    {
-                        let abs_path = root_path.join(ancestor.as_std_path());
-                        state
-                            .enqueue_scan_dir(
-                                abs_path.into(),
-                                entry,
-                                &scan_job_tx,
-                                self.fs.as_ref(),
-                            )
-                            .await;
-                        state.paths_to_scan.insert(path.clone());
-                        break;
-                    }
-                }
-            }
-            drop(scan_job_tx);
-        }
-        while let Ok(job) = scan_job_rx.recv().await {
-            self.scan_dir(&job).await.log_err();
-        }
-
-        !mem::take(&mut self.state.lock().await.paths_to_scan).is_empty()
-    }
-
-    async fn scan_dirs(
-        &self,
-        enable_progress_updates: bool,
-        scan_jobs_rx: channel::Receiver<ScanJob>,
-    ) {
-        if self
-            .status_updates_tx
-            .unbounded_send(ScanState::Started)
-            .is_err()
-        {
-            return;
-        }
-
-        let progress_update_count = AtomicUsize::new(0);
-        self.executor
-            .scoped_priority(Priority::Low, |scope| {
-                for _ in 0..self.executor.num_cpus() {
-                    scope.spawn(async {
-                        let mut last_progress_update_count = 0;
-                        let progress_update_timer = self.progress_timer(enable_progress_updates).fuse();
-                        futures::pin_mut!(progress_update_timer);
-
-                        loop {
-                            select_biased! {
-                                // Process any path refresh requests before moving on to process
-                                // the scan queue, so that user operations are prioritized.
-                                request = self.next_scan_request().fuse() => {
-                                    let Ok(request) = request else { break };
-                                    if !self.process_scan_request(request, true).await {
-                                        return;
-                                    }
-                                }
-
-                                // Send periodic progress updates to the worktree. Use an atomic counter
-                                // to ensure that only one of the workers sends a progress update after
-                                // the update interval elapses.
-                                _ = progress_update_timer => {
-                                    match progress_update_count.compare_exchange(
-                                        last_progress_update_count,
-                                        last_progress_update_count + 1,
-                                        SeqCst,
-                                        SeqCst
-                                    ) {
-                                        Ok(_) => {
-                                            last_progress_update_count += 1;
-                                            self.send_status_update(true, SmallVec::new()).await;
-                                        }
-                                        Err(count) => {
-                                            last_progress_update_count = count;
-                                        }
-                                    }
-                                    progress_update_timer.set(self.progress_timer(enable_progress_updates).fuse());
-                                }
-
-                                // Recursively load directories from the file system.
-                                job = scan_jobs_rx.recv().fuse() => {
-                                    let Ok(job) = job else { break };
-                                    if let Err(err) = self.scan_dir(&job).await
-                                        && job.path.is_empty() {
-                                            log::error!("error scanning directory {:?}: {}", job.abs_path, err);
-                                        }
-                                }
-                            }
-                        }
-                    });
-                }
-            })
-            .await;
-    }
-
-    async fn send_status_update(
-        &self,
-        scanning: bool,
-        barrier: SmallVec<[barrier::Sender; 1]>,
-    ) -> bool {
-        let mut state = self.state.lock().await;
-        if state.changed_paths.is_empty() && scanning {
-            return true;
-        }
-
-        let new_snapshot = state.snapshot.clone();
-        let old_snapshot = mem::replace(&mut state.prev_snapshot, new_snapshot.snapshot.clone());
-        let changes = build_diff(
-            self.phase,
-            &old_snapshot,
-            &new_snapshot,
-            &state.changed_paths,
-        );
-        state.changed_paths.clear();
-
-        self.status_updates_tx
-            .unbounded_send(ScanState::Updated {
-                snapshot: new_snapshot,
-                changes,
-                scanning,
-                barrier,
-            })
-            .is_ok()
-    }
-
-    async fn scan_dir(&self, job: &ScanJob) -> Result<()> {
-        let root_abs_path;
-        let root_char_bag;
-        {
-            let snapshot = &self.state.lock().await.snapshot;
-            if self.settings.is_path_excluded(&job.path) {
-                log::error!("skipping excluded directory {:?}", job.path);
-                return Ok(());
-            }
-            log::trace!("scanning directory {:?}", job.path);
-            root_abs_path = snapshot.abs_path().clone();
-            root_char_bag = snapshot.root_char_bag;
-        }
-
-        let next_entry_id = self.next_entry_id.clone();
-        let mut ignore_stack = job.ignore_stack.clone();
-        let mut new_ignore = None;
-        let mut root_canonical_path = None;
-        let mut new_entries: Vec<Entry> = Vec::new();
-        let mut new_jobs: Vec<Option<ScanJob>> = Vec::new();
-        let mut child_paths = self
-            .fs
-            .read_dir(&job.abs_path)
-            .await?
-            .filter_map(|entry| async {
-                match entry {
-                    Ok(entry) => Some(entry),
-                    Err(error) => {
-                        log::error!("error processing entry {:?}", error);
-                        None
-                    }
-                }
-            })
-            .collect::<Vec<_>>()
-            .await;
-
-        // Ensure that .git and .gitignore are processed first.
-        swap_to_front(&mut child_paths, GITIGNORE);
-        swap_to_front(&mut child_paths, DOT_GIT);
-
-        if let Some(path) = child_paths.first()
-            && path.ends_with(DOT_GIT)
-        {
-            ignore_stack.repo_root = Some(job.abs_path.clone());
-        }
-
-        for child_abs_path in child_paths {
-            let child_abs_path: Arc<Path> = child_abs_path.into();
-            let child_name = child_abs_path.file_name().unwrap();
-            let Some(child_path) = child_name
-                .to_str()
-                .and_then(|name| Some(job.path.join(RelPath::unix(name).ok()?)))
-            else {
-                continue;
-            };
-
-            if child_name == DOT_GIT {
-                let mut state = self.state.lock().await;
-                state
-                    .insert_git_repository(
-                        child_path.clone(),
-                        self.fs.as_ref(),
-                        self.watcher.as_ref(),
-                    )
-                    .await;
-            } else if child_name == GITIGNORE {
-                match build_gitignore(&child_abs_path, self.fs.as_ref()).await {
-                    Ok(ignore) => {
-                        let ignore = Arc::new(ignore);
-                        ignore_stack = ignore_stack.append(job.abs_path.clone(), ignore.clone());
-                        new_ignore = Some(ignore);
-                    }
-                    Err(error) => {
-                        log::error!(
-                            "error loading .gitignore file {:?} - {:?}",
-                            child_name,
-                            error
-                        );
-                    }
-                }
-            }
-
-            if self.settings.is_path_excluded(&child_path) {
-                log::debug!("skipping excluded child entry {child_path:?}");
-                self.state.lock().await.remove_path(&child_path);
-                continue;
-            }
-
-            let child_metadata = match self.fs.metadata(&child_abs_path).await {
-                Ok(Some(metadata)) => metadata,
-                Ok(None) => continue,
-                Err(err) => {
-                    log::error!("error processing {child_abs_path:?}: {err:?}");
-                    continue;
-                }
-            };
-
-            let mut child_entry = Entry::new(
-                child_path.clone(),
-                &child_metadata,
-                ProjectEntryId::new(&next_entry_id),
-                root_char_bag,
-                None,
-            );
-
-            if job.is_external {
-                child_entry.is_external = true;
-            } else if child_metadata.is_symlink {
-                let canonical_path = match self.fs.canonicalize(&child_abs_path).await {
-                    Ok(path) => path,
-                    Err(err) => {
-                        log::error!("error reading target of symlink {child_abs_path:?}: {err:#}",);
-                        continue;
-                    }
-                };
-
-                // lazily canonicalize the root path in order to determine if
-                // symlinks point outside of the worktree.
-                let root_canonical_path = match &root_canonical_path {
-                    Some(path) => path,
-                    None => match self.fs.canonicalize(&root_abs_path).await {
-                        Ok(path) => root_canonical_path.insert(path),
-                        Err(err) => {
-                            log::error!("error canonicalizing root {:?}: {:?}", root_abs_path, err);
-                            continue;
-                        }
-                    },
-                };
-
-                if !canonical_path.starts_with(root_canonical_path) {
-                    child_entry.is_external = true;
-                }
-
-                child_entry.canonical_path = Some(canonical_path.into());
-            }
-
-            if child_entry.is_dir() {
-                child_entry.is_ignored = ignore_stack.is_abs_path_ignored(&child_abs_path, true);
-                child_entry.is_always_included =
-                    self.settings.is_path_always_included(&child_path, true);
-
-                // Avoid recursing until crash in the case of a recursive symlink
-                if job.ancestor_inodes.contains(&child_entry.inode) {
-                    new_jobs.push(None);
-                } else {
-                    let mut ancestor_inodes = job.ancestor_inodes.clone();
-                    ancestor_inodes.insert(child_entry.inode);
-
-                    new_jobs.push(Some(ScanJob {
-                        abs_path: child_abs_path.clone(),
-                        path: child_path,
-                        is_external: child_entry.is_external,
-                        ignore_stack: if child_entry.is_ignored {
-                            IgnoreStack::all()
-                        } else {
-                            ignore_stack.clone()
-                        },
-                        ancestor_inodes,
-                        scan_queue: job.scan_queue.clone(),
-                    }));
-                }
-            } else {
-                child_entry.is_ignored = ignore_stack.is_abs_path_ignored(&child_abs_path, false);
-                child_entry.is_always_included =
-                    self.settings.is_path_always_included(&child_path, false);
-            }
-
-            {
-                let relative_path = job
-                    .path
-                    .join(RelPath::unix(child_name.to_str().unwrap()).unwrap());
-                if self.is_path_private(&relative_path) {
-                    log::debug!("detected private file: {relative_path:?}");
-                    child_entry.is_private = true;
-                }
-                if self.settings.is_path_hidden(&relative_path) {
-                    log::debug!("detected hidden file: {relative_path:?}");
-                    child_entry.is_hidden = true;
-                }
-            }
-
-            new_entries.push(child_entry);
-        }
-
-        let mut state = self.state.lock().await;
-
-        // Identify any subdirectories that should not be scanned.
-        let mut job_ix = 0;
-        for entry in &mut new_entries {
-            state.reuse_entry_id(entry);
-            if entry.is_dir() {
-                if state.should_scan_directory(entry) {
-                    job_ix += 1;
-                } else {
-                    log::debug!("defer scanning directory {:?}", entry.path);
-                    entry.kind = EntryKind::UnloadedDir;
-                    new_jobs.remove(job_ix);
-                }
-            }
-            if entry.is_always_included {
-                state
-                    .snapshot
-                    .always_included_entries
-                    .push(entry.path.clone());
-            }
-        }
-
-        state.populate_dir(job.path.clone(), new_entries, new_ignore);
-        self.watcher.add(job.abs_path.as_ref()).log_err();
-
-        for new_job in new_jobs.into_iter().flatten() {
-            job.scan_queue
-                .try_send(new_job)
-                .expect("channel is unbounded");
-        }
-
-        Ok(())
-    }
-
-    /// All list arguments should be sorted before calling this function
-    async fn reload_entries_for_paths(
-        &self,
-        root_abs_path: &SanitizedPath,
-        root_canonical_path: &SanitizedPath,
-        relative_paths: &[Arc<RelPath>],
-        abs_paths: Vec<PathBuf>,
-        scan_queue_tx: Option<Sender<ScanJob>>,
-    ) {
-        // grab metadata for all requested paths
-        let metadata = futures::future::join_all(
-            abs_paths
-                .iter()
-                .map(|abs_path| async move {
-                    let metadata = self.fs.metadata(abs_path).await?;
-                    if let Some(metadata) = metadata {
-                        let canonical_path = self.fs.canonicalize(abs_path).await?;
-
-                        // If we're on a case-insensitive filesystem (default on macOS), we want
-                        // to only ignore metadata for non-symlink files if their absolute-path matches
-                        // the canonical-path.
-                        // Because if not, this might be a case-only-renaming (`mv test.txt TEST.TXT`)
-                        // and we want to ignore the metadata for the old path (`test.txt`) so it's
-                        // treated as removed.
-                        if !self.fs_case_sensitive && !metadata.is_symlink {
-                            let canonical_file_name = canonical_path.file_name();
-                            let file_name = abs_path.file_name();
-                            if canonical_file_name != file_name {
-                                return Ok(None);
-                            }
-                        }
-
-                        anyhow::Ok(Some((metadata, SanitizedPath::new_arc(&canonical_path))))
-                    } else {
-                        Ok(None)
-                    }
-                })
-                .collect::<Vec<_>>(),
-        )
-        .await;
-
-        let mut new_ancestor_repo = if relative_paths.iter().any(|path| path.is_empty()) {
-            Some(discover_ancestor_git_repo(self.fs.clone(), &root_abs_path).await)
-        } else {
-            None
-        };
-
-        let mut state = self.state.lock().await;
-        let doing_recursive_update = scan_queue_tx.is_some();
-
-        // Remove any entries for paths that no longer exist or are being recursively
-        // refreshed. Do this before adding any new entries, so that renames can be
-        // detected regardless of the order of the paths.
-        for (path, metadata) in relative_paths.iter().zip(metadata.iter()) {
-            if matches!(metadata, Ok(None)) || doing_recursive_update {
-                state.remove_path(path);
-            }
-        }
-
-        for (path, metadata) in relative_paths.iter().zip(metadata.into_iter()) {
-            let abs_path: Arc<Path> = root_abs_path.join(path.as_std_path()).into();
-            match metadata {
-                Ok(Some((metadata, canonical_path))) => {
-                    let ignore_stack = state
-                        .snapshot
-                        .ignore_stack_for_abs_path(&abs_path, metadata.is_dir, self.fs.as_ref())
-                        .await;
-                    let is_external = !canonical_path.starts_with(&root_canonical_path);
-                    let entry_id = state.entry_id_for(self.next_entry_id.as_ref(), path, &metadata);
-                    let mut fs_entry = Entry::new(
-                        path.clone(),
-                        &metadata,
-                        entry_id,
-                        state.snapshot.root_char_bag,
-                        if metadata.is_symlink {
-                            Some(canonical_path.as_path().to_path_buf().into())
-                        } else {
-                            None
-                        },
-                    );
-
-                    let is_dir = fs_entry.is_dir();
-                    fs_entry.is_ignored = ignore_stack.is_abs_path_ignored(&abs_path, is_dir);
-                    fs_entry.is_external = is_external;
-                    fs_entry.is_private = self.is_path_private(path);
-                    fs_entry.is_always_included =
-                        self.settings.is_path_always_included(path, is_dir);
-                    fs_entry.is_hidden = self.settings.is_path_hidden(path);
-
-                    if let (Some(scan_queue_tx), true) = (&scan_queue_tx, is_dir) {
-                        if state.should_scan_directory(&fs_entry)
-                            || (fs_entry.path.is_empty()
-                                && abs_path.file_name() == Some(OsStr::new(DOT_GIT)))
-                        {
-                            state
-                                .enqueue_scan_dir(
-                                    abs_path,
-                                    &fs_entry,
-                                    scan_queue_tx,
-                                    self.fs.as_ref(),
-                                )
-                                .await;
-                        } else {
-                            fs_entry.kind = EntryKind::UnloadedDir;
-                        }
-                    }
-
-                    state
-                        .insert_entry(fs_entry.clone(), self.fs.as_ref(), self.watcher.as_ref())
-                        .await;
-
-                    if path.is_empty()
-                        && let Some((ignores, repo)) = new_ancestor_repo.take()
-                    {
-                        log::trace!("updating ancestor git repository");
-                        state.snapshot.ignores_by_parent_abs_path.extend(ignores);
-                        if let Some((ancestor_dot_git, work_directory)) = repo {
-                            state
-                                .insert_git_repository_for_path(
-                                    work_directory,
-                                    ancestor_dot_git.into(),
-                                    self.fs.as_ref(),
-                                    self.watcher.as_ref(),
-                                )
-                                .await
-                                .log_err();
-                        }
-                    }
-                }
-                Ok(None) => {
-                    self.remove_repo_path(path.clone(), &mut state.snapshot);
-                }
-                Err(err) => {
-                    log::error!("error reading file {abs_path:?} on event: {err:#}");
-                }
-            }
-        }
-
-        util::extend_sorted(
-            &mut state.changed_paths,
-            relative_paths.iter().cloned(),
-            usize::MAX,
-            Ord::cmp,
-        );
-    }
-
-    fn remove_repo_path(&self, path: Arc<RelPath>, snapshot: &mut LocalSnapshot) -> Option<()> {
-        if !path.components().any(|component| component == DOT_GIT)
-            && let Some(local_repo) = snapshot.local_repo_for_work_directory_path(&path)
-        {
-            let id = local_repo.work_directory_id;
-            log::debug!("remove repo path: {:?}", path);
-            snapshot.git_repositories.remove(&id);
-            return Some(());
-        }
-
-        Some(())
-    }
-
-    async fn update_ignore_statuses_for_paths(
-        &self,
-        scan_job_tx: Sender<ScanJob>,
-        prev_snapshot: LocalSnapshot,
-        ignores_to_update: Vec<(Arc<Path>, IgnoreStack)>,
-    ) {
-        let (ignore_queue_tx, ignore_queue_rx) = channel::unbounded();
-        {
-            for (parent_abs_path, ignore_stack) in ignores_to_update {
-                ignore_queue_tx
-                    .send_blocking(UpdateIgnoreStatusJob {
-                        abs_path: parent_abs_path,
-                        ignore_stack,
-                        ignore_queue: ignore_queue_tx.clone(),
-                        scan_queue: scan_job_tx.clone(),
-                    })
-                    .unwrap();
-            }
-        }
-        drop(ignore_queue_tx);
-
-        self.executor
-            .scoped(|scope| {
-                for _ in 0..self.executor.num_cpus() {
-                    scope.spawn(async {
-                        loop {
-                            select_biased! {
-                                // Process any path refresh requests before moving on to process
-                                // the queue of ignore statuses.
-                                request = self.next_scan_request().fuse() => {
-                                    let Ok(request) = request else { break };
-                                    if !self.process_scan_request(request, true).await {
-                                        return;
-                                    }
-                                }
-
-                                // Recursively process directories whose ignores have changed.
-                                job = ignore_queue_rx.recv().fuse() => {
-                                    let Ok(job) = job else { break };
-                                    self.update_ignore_status(job, &prev_snapshot).await;
-                                }
-                            }
-                        }
-                    });
-                }
-            })
-            .await;
-    }
-
-    async fn ignores_needing_update(&self) -> Vec<Arc<Path>> {
-        let mut ignores_to_update = Vec::new();
-
-        {
-            let snapshot = &mut self.state.lock().await.snapshot;
-            let abs_path = snapshot.abs_path.clone();
-            snapshot
-                .ignores_by_parent_abs_path
-                .retain(|parent_abs_path, (_, needs_update)| {
-                    if let Ok(parent_path) = parent_abs_path.strip_prefix(abs_path.as_path())
-                        && let Some(parent_path) =
-                            RelPath::new(&parent_path, PathStyle::local()).log_err()
-                    {
-                        if *needs_update {
-                            *needs_update = false;
-                            if snapshot.snapshot.entry_for_path(&parent_path).is_some() {
-                                ignores_to_update.push(parent_abs_path.clone());
-                            }
-                        }
-
-                        let ignore_path = parent_path.join(RelPath::unix(GITIGNORE).unwrap());
-                        if snapshot.snapshot.entry_for_path(&ignore_path).is_none() {
-                            return false;
-                        }
-                    }
-                    true
-                });
-        }
-
-        ignores_to_update
-    }
-
-    async fn order_ignores(&self, mut ignores: Vec<Arc<Path>>) -> Vec<(Arc<Path>, IgnoreStack)> {
-        let fs = self.fs.clone();
-        let snapshot = self.state.lock().await.snapshot.clone();
-        ignores.sort_unstable();
-        let mut ignores_to_update = ignores.into_iter().peekable();
-
-        let mut result = vec![];
-        while let Some(parent_abs_path) = ignores_to_update.next() {
-            while ignores_to_update
-                .peek()
-                .map_or(false, |p| p.starts_with(&parent_abs_path))
-            {
-                ignores_to_update.next().unwrap();
-            }
-            let ignore_stack = snapshot
-                .ignore_stack_for_abs_path(&parent_abs_path, true, fs.as_ref())
-                .await;
-            result.push((parent_abs_path, ignore_stack));
-        }
-
-        result
-    }
-
-    async fn update_ignore_status(&self, job: UpdateIgnoreStatusJob, snapshot: &LocalSnapshot) {
-        log::trace!("update ignore status {:?}", job.abs_path);
-
-        let mut ignore_stack = job.ignore_stack;
-        if let Some((ignore, _)) = snapshot.ignores_by_parent_abs_path.get(&job.abs_path) {
-            ignore_stack = ignore_stack.append(job.abs_path.clone(), ignore.clone());
-        }
-
-        let mut entries_by_id_edits = Vec::new();
-        let mut entries_by_path_edits = Vec::new();
-        let Some(path) = job
-            .abs_path
-            .strip_prefix(snapshot.abs_path.as_path())
-            .map_err(|_| {
-                anyhow::anyhow!(
-                    "Failed to strip prefix '{}' from path '{}'",
-                    snapshot.abs_path.as_path().display(),
-                    job.abs_path.display()
-                )
-            })
-            .log_err()
-        else {
-            return;
-        };
-
-        let Some(path) = RelPath::new(&path, PathStyle::local()).log_err() else {
-            return;
-        };
-
-        if let Ok(Some(metadata)) = self.fs.metadata(&job.abs_path.join(DOT_GIT)).await
-            && metadata.is_dir
-        {
-            ignore_stack.repo_root = Some(job.abs_path.clone());
-        }
-
-        for mut entry in snapshot.child_entries(&path).cloned() {
-            let was_ignored = entry.is_ignored;
-            let abs_path: Arc<Path> = snapshot.absolutize(&entry.path).into();
-            entry.is_ignored = ignore_stack.is_abs_path_ignored(&abs_path, entry.is_dir());
-
-            if entry.is_dir() {
-                let child_ignore_stack = if entry.is_ignored {
-                    IgnoreStack::all()
-                } else {
-                    ignore_stack.clone()
-                };
-
-                // Scan any directories that were previously ignored and weren't previously scanned.
-                if was_ignored && !entry.is_ignored && entry.kind.is_unloaded() {
-                    let state = self.state.lock().await;
-                    if state.should_scan_directory(&entry) {
-                        state
-                            .enqueue_scan_dir(
-                                abs_path.clone(),
-                                &entry,
-                                &job.scan_queue,
-                                self.fs.as_ref(),
-                            )
-                            .await;
-                    }
-                }
-
-                job.ignore_queue
-                    .send(UpdateIgnoreStatusJob {
-                        abs_path: abs_path.clone(),
-                        ignore_stack: child_ignore_stack,
-                        ignore_queue: job.ignore_queue.clone(),
-                        scan_queue: job.scan_queue.clone(),
-                    })
-                    .await
-                    .unwrap();
-            }
-
-            if entry.is_ignored != was_ignored {
-                let mut path_entry = snapshot.entries_by_id.get(&entry.id, ()).unwrap().clone();
-                path_entry.scan_id = snapshot.scan_id;
-                path_entry.is_ignored = entry.is_ignored;
-                entries_by_id_edits.push(Edit::Insert(path_entry));
-                entries_by_path_edits.push(Edit::Insert(entry));
-            }
-        }
-
-        let state = &mut self.state.lock().await;
-        for edit in &entries_by_path_edits {
-            if let Edit::Insert(entry) = edit
-                && let Err(ix) = state.changed_paths.binary_search(&entry.path)
-            {
-                state.changed_paths.insert(ix, entry.path.clone());
-            }
-        }
-
-        state
-            .snapshot
-            .entries_by_path
-            .edit(entries_by_path_edits, ());
-        state.snapshot.entries_by_id.edit(entries_by_id_edits, ());
-    }
-
-    async fn update_git_repositories(&self, dot_git_paths: Vec<PathBuf>) -> Vec<Arc<Path>> {
-        log::trace!("reloading repositories: {dot_git_paths:?}");
-        let mut state = self.state.lock().await;
-        let scan_id = state.snapshot.scan_id;
-        let mut affected_repo_roots = Vec::new();
-        for dot_git_dir in dot_git_paths {
-            let existing_repository_entry =
-                state
-                    .snapshot
-                    .git_repositories
-                    .iter()
-                    .find_map(|(_, repo)| {
-                        let dot_git_dir = SanitizedPath::new(&dot_git_dir);
-                        if SanitizedPath::new(repo.common_dir_abs_path.as_ref()) == dot_git_dir
-                            || SanitizedPath::new(repo.repository_dir_abs_path.as_ref())
-                                == dot_git_dir
-                        {
-                            Some(repo.clone())
-                        } else {
-                            None
-                        }
-                    });
-
-            match existing_repository_entry {
-                None => {
-                    let Ok(relative) = dot_git_dir.strip_prefix(state.snapshot.abs_path()) else {
-                        debug_panic!(
-                            "update_git_repositories called with .git directory outside the worktree root"
-                        );
-                        return Vec::new();
-                    };
-                    affected_repo_roots.push(dot_git_dir.parent().unwrap().into());
-                    state
-                        .insert_git_repository(
-                            RelPath::new(relative, PathStyle::local())
-                                .unwrap()
-                                .into_arc(),
-                            self.fs.as_ref(),
-                            self.watcher.as_ref(),
-                        )
-                        .await;
-                }
-                Some(local_repository) => {
-                    state.snapshot.git_repositories.update(
-                        &local_repository.work_directory_id,
-                        |entry| {
-                            entry.git_dir_scan_id = scan_id;
-                        },
-                    );
-                }
-            };
-        }
-
-        // Remove any git repositories whose .git entry no longer exists.
-        let snapshot = &mut state.snapshot;
-        let mut ids_to_preserve = HashSet::default();
-        for (&work_directory_id, entry) in snapshot.git_repositories.iter() {
-            let exists_in_snapshot =
-                snapshot
-                    .entry_for_id(work_directory_id)
-                    .is_some_and(|entry| {
-                        snapshot
-                            .entry_for_path(&entry.path.join(RelPath::unix(DOT_GIT).unwrap()))
-                            .is_some()
-                    });
-
-            if exists_in_snapshot
-                || matches!(
-                    self.fs.metadata(&entry.common_dir_abs_path).await,
-                    Ok(Some(_))
-                )
-            {
-                ids_to_preserve.insert(work_directory_id);
-            }
-        }
-
-        snapshot
-            .git_repositories
-            .retain(|work_directory_id, entry| {
-                let preserve = ids_to_preserve.contains(work_directory_id);
-                if !preserve {
-                    affected_repo_roots.push(entry.dot_git_abs_path.parent().unwrap().into());
-                }
-                preserve
-            });
-
-        affected_repo_roots
-    }
-
-    async fn progress_timer(&self, running: bool) {
-        if !running {
-            return futures::future::pending().await;
-        }
-
-        #[cfg(any(test, feature = "test-support"))]
-        if self.fs.is_fake() {
-            return self.executor.simulate_random_delay().await;
-        }
-
-        smol::Timer::after(FS_WATCH_LATENCY).await;
-    }
-
-    fn is_path_private(&self, path: &RelPath) -> bool {
-        !self.share_private_files && self.settings.is_path_private(path)
-    }
-
-    async fn next_scan_request(&self) -> Result<ScanRequest> {
-        let mut request = self.scan_requests_rx.recv().await?;
-        while let Ok(next_request) = self.scan_requests_rx.try_recv() {
-            request.relative_paths.extend(next_request.relative_paths);
-            request.done.extend(next_request.done);
-        }
-        Ok(request)
-    }
-}
-
-async fn discover_ancestor_git_repo(
-    fs: Arc<dyn Fs>,
-    root_abs_path: &SanitizedPath,
-) -> (
-    HashMap<Arc<Path>, (Arc<Gitignore>, bool)>,
-    Option<(PathBuf, WorkDirectory)>,
-) {
-    let mut ignores = HashMap::default();
-    for (index, ancestor) in root_abs_path.as_path().ancestors().enumerate() {
-        if index != 0 {
-            if ancestor == paths::home_dir() {
-                // Unless $HOME is itself the worktree root, don't consider it as a
-                // containing git repository---expensive and likely unwanted.
-                break;
-            } else if let Ok(ignore) = build_gitignore(&ancestor.join(GITIGNORE), fs.as_ref()).await
-            {
-                ignores.insert(ancestor.into(), (ignore.into(), false));
-            }
-        }
-
-        let ancestor_dot_git = ancestor.join(DOT_GIT);
-        log::trace!("considering ancestor: {ancestor_dot_git:?}");
-        // Check whether the directory or file called `.git` exists (in the
-        // case of worktrees it's a file.)
-        if fs
-            .metadata(&ancestor_dot_git)
-            .await
-            .is_ok_and(|metadata| metadata.is_some())
-        {
-            if index != 0 {
-                // We canonicalize, since the FS events use the canonicalized path.
-                if let Some(ancestor_dot_git) = fs.canonicalize(&ancestor_dot_git).await.log_err() {
-                    let location_in_repo = root_abs_path
-                        .as_path()
-                        .strip_prefix(ancestor)
-                        .unwrap()
-                        .into();
-                    log::info!("inserting parent git repo for this worktree: {location_in_repo:?}");
-                    // We associate the external git repo with our root folder and
-                    // also mark where in the git repo the root folder is located.
-                    return (
-                        ignores,
-                        Some((
-                            ancestor_dot_git,
-                            WorkDirectory::AboveProject {
-                                absolute_path: ancestor.into(),
-                                location_in_repo,
-                            },
-                        )),
-                    );
-                };
-            }
-
-            // Reached root of git repository.
-            break;
-        }
-    }
-
-    (ignores, None)
-}
-
-fn build_diff(
-    phase: BackgroundScannerPhase,
-    old_snapshot: &Snapshot,
-    new_snapshot: &Snapshot,
-    event_paths: &[Arc<RelPath>],
-) -> UpdatedEntriesSet {
-    use BackgroundScannerPhase::*;
-    use PathChange::{Added, AddedOrUpdated, Loaded, Removed, Updated};
-
-    // Identify which paths have changed. Use the known set of changed
-    // parent paths to optimize the search.
-    let mut changes = Vec::new();
-    let mut old_paths = old_snapshot.entries_by_path.cursor::<PathKey>(());
-    let mut new_paths = new_snapshot.entries_by_path.cursor::<PathKey>(());
-    let mut last_newly_loaded_dir_path = None;
-    old_paths.next();
-    new_paths.next();
-    for path in event_paths {
-        let path = PathKey(path.clone());
-        if old_paths.item().is_some_and(|e| e.path < path.0) {
-            old_paths.seek_forward(&path, Bias::Left);
-        }
-        if new_paths.item().is_some_and(|e| e.path < path.0) {
-            new_paths.seek_forward(&path, Bias::Left);
-        }
-        loop {
-            match (old_paths.item(), new_paths.item()) {
-                (Some(old_entry), Some(new_entry)) => {
-                    if old_entry.path > path.0
-                        && new_entry.path > path.0
-                        && !old_entry.path.starts_with(&path.0)
-                        && !new_entry.path.starts_with(&path.0)
-                    {
-                        break;
-                    }
-
-                    match Ord::cmp(&old_entry.path, &new_entry.path) {
-                        Ordering::Less => {
-                            changes.push((old_entry.path.clone(), old_entry.id, Removed));
-                            old_paths.next();
-                        }
-                        Ordering::Equal => {
-                            if phase == EventsReceivedDuringInitialScan {
-                                if old_entry.id != new_entry.id {
-                                    changes.push((old_entry.path.clone(), old_entry.id, Removed));
-                                }
-                                // If the worktree was not fully initialized when this event was generated,
-                                // we can't know whether this entry was added during the scan or whether
-                                // it was merely updated.
-                                changes.push((
-                                    new_entry.path.clone(),
-                                    new_entry.id,
-                                    AddedOrUpdated,
-                                ));
-                            } else if old_entry.id != new_entry.id {
-                                changes.push((old_entry.path.clone(), old_entry.id, Removed));
-                                changes.push((new_entry.path.clone(), new_entry.id, Added));
-                            } else if old_entry != new_entry {
-                                if old_entry.kind.is_unloaded() {
-                                    last_newly_loaded_dir_path = Some(&new_entry.path);
-                                    changes.push((new_entry.path.clone(), new_entry.id, Loaded));
-                                } else {
-                                    changes.push((new_entry.path.clone(), new_entry.id, Updated));
-                                }
-                            }
-                            old_paths.next();
-                            new_paths.next();
-                        }
-                        Ordering::Greater => {
-                            let is_newly_loaded = phase == InitialScan
-                                || last_newly_loaded_dir_path
-                                    .as_ref()
-                                    .is_some_and(|dir| new_entry.path.starts_with(dir));
-                            changes.push((
-                                new_entry.path.clone(),
-                                new_entry.id,
-                                if is_newly_loaded { Loaded } else { Added },
-                            ));
-                            new_paths.next();
-                        }
-                    }
-                }
-                (Some(old_entry), None) => {
-                    changes.push((old_entry.path.clone(), old_entry.id, Removed));
-                    old_paths.next();
-                }
-                (None, Some(new_entry)) => {
-                    let is_newly_loaded = phase == InitialScan
-                        || last_newly_loaded_dir_path
-                            .as_ref()
-                            .is_some_and(|dir| new_entry.path.starts_with(dir));
-                    changes.push((
-                        new_entry.path.clone(),
-                        new_entry.id,
-                        if is_newly_loaded { Loaded } else { Added },
-                    ));
-                    new_paths.next();
-                }
-                (None, None) => break,
-            }
-        }
-    }
-
-    changes.into()
-}
-
-fn swap_to_front(child_paths: &mut Vec<PathBuf>, file: &str) {
-    let position = child_paths
-        .iter()
-        .position(|path| path.file_name().unwrap() == file);
-    if let Some(position) = position {
-        let temp = child_paths.remove(position);
-        child_paths.insert(0, temp);
-    }
-}
-
-fn char_bag_for_path(root_char_bag: CharBag, path: &RelPath) -> CharBag {
-    let mut result = root_char_bag;
-    result.extend(path.as_unix_str().chars().map(|c| c.to_ascii_lowercase()));
-    result
-}
-
-#[derive(Debug)]
-struct ScanJob {
-    abs_path: Arc<Path>,
-    path: Arc<RelPath>,
-    ignore_stack: IgnoreStack,
-    scan_queue: Sender<ScanJob>,
-    ancestor_inodes: TreeSet<u64>,
-    is_external: bool,
-}
-
-struct UpdateIgnoreStatusJob {
-    abs_path: Arc<Path>,
-    ignore_stack: IgnoreStack,
-    ignore_queue: Sender<UpdateIgnoreStatusJob>,
-    scan_queue: Sender<ScanJob>,
-}
-
-pub trait WorktreeModelHandle {
-    #[cfg(any(test, feature = "test-support"))]
-    fn flush_fs_events<'a>(
-        &self,
-        cx: &'a mut gpui::TestAppContext,
-    ) -> futures::future::LocalBoxFuture<'a, ()>;
-
-    #[cfg(any(test, feature = "test-support"))]
-    fn flush_fs_events_in_root_git_repository<'a>(
-        &self,
-        cx: &'a mut gpui::TestAppContext,
-    ) -> futures::future::LocalBoxFuture<'a, ()>;
-}
-
-impl WorktreeModelHandle for Entity<Worktree> {
-    // When the worktree's FS event stream sometimes delivers "redundant" events for FS changes that
-    // occurred before the worktree was constructed. These events can cause the worktree to perform
-    // extra directory scans, and emit extra scan-state notifications.
-    //
-    // This function mutates the worktree's directory and waits for those mutations to be picked up,
-    // to ensure that all redundant FS events have already been processed.
-    #[cfg(any(test, feature = "test-support"))]
-    fn flush_fs_events<'a>(
-        &self,
-        cx: &'a mut gpui::TestAppContext,
-    ) -> futures::future::LocalBoxFuture<'a, ()> {
-        let file_name = "fs-event-sentinel";
-
-        let tree = self.clone();
-        let (fs, root_path) = self.read_with(cx, |tree, _| {
-            let tree = tree.as_local().unwrap();
-            (tree.fs.clone(), tree.abs_path.clone())
-        });
-
-        async move {
-            fs.create_file(&root_path.join(file_name), Default::default())
-                .await
-                .unwrap();
-
-            let mut events = cx.events(&tree);
-            while events.next().await.is_some() {
-                if tree.read_with(cx, |tree, _| {
-                    tree.entry_for_path(RelPath::unix(file_name).unwrap())
-                        .is_some()
-                }) {
-                    break;
-                }
-            }
-
-            fs.remove_file(&root_path.join(file_name), Default::default())
-                .await
-                .unwrap();
-            while events.next().await.is_some() {
-                if tree.read_with(cx, |tree, _| {
-                    tree.entry_for_path(RelPath::unix(file_name).unwrap())
-                        .is_none()
-                }) {
-                    break;
-                }
-            }
-
-            cx.update(|cx| tree.read(cx).as_local().unwrap().scan_complete())
-                .await;
-        }
-        .boxed_local()
-    }
-
-    // This function is similar to flush_fs_events, except that it waits for events to be flushed in
-    // the .git folder of the root repository.
-    // The reason for its existence is that a repository's .git folder might live *outside* of the
-    // worktree and thus its FS events might go through a different path.
-    // In order to flush those, we need to create artificial events in the .git folder and wait
-    // for the repository to be reloaded.
-    #[cfg(any(test, feature = "test-support"))]
-    fn flush_fs_events_in_root_git_repository<'a>(
-        &self,
-        cx: &'a mut gpui::TestAppContext,
-    ) -> futures::future::LocalBoxFuture<'a, ()> {
-        let file_name = "fs-event-sentinel";
-
-        let tree = self.clone();
-        let (fs, root_path, mut git_dir_scan_id) = self.read_with(cx, |tree, _| {
-            let tree = tree.as_local().unwrap();
-            let local_repo_entry = tree
-                .git_repositories
-                .values()
-                .min_by_key(|local_repo_entry| local_repo_entry.work_directory.clone())
-                .unwrap();
-            (
-                tree.fs.clone(),
-                local_repo_entry.common_dir_abs_path.clone(),
-                local_repo_entry.git_dir_scan_id,
-            )
-        });
-
-        let scan_id_increased = |tree: &mut Worktree, git_dir_scan_id: &mut usize| {
-            let tree = tree.as_local().unwrap();
-            // let repository = tree.repositories.first().unwrap();
-            let local_repo_entry = tree
-                .git_repositories
-                .values()
-                .min_by_key(|local_repo_entry| local_repo_entry.work_directory.clone())
-                .unwrap();
-
-            if local_repo_entry.git_dir_scan_id > *git_dir_scan_id {
-                *git_dir_scan_id = local_repo_entry.git_dir_scan_id;
-                true
-            } else {
-                false
-            }
-        };
-
-        async move {
-            fs.create_file(&root_path.join(file_name), Default::default())
-                .await
-                .unwrap();
-
-            let mut events = cx.events(&tree);
-            while events.next().await.is_some() {
-                if tree.update(cx, |tree, _| scan_id_increased(tree, &mut git_dir_scan_id)) {
-                    break;
-                }
-            }
-
-            fs.remove_file(&root_path.join(file_name), Default::default())
-                .await
-                .unwrap();
-
-            while events.next().await.is_some() {
-                if tree.update(cx, |tree, _| scan_id_increased(tree, &mut git_dir_scan_id)) {
-                    break;
-                }
-            }
-
-            cx.update(|cx| tree.read(cx).as_local().unwrap().scan_complete())
-                .await;
-        }
-        .boxed_local()
-    }
-}
-
-#[derive(Clone, Debug)]
-struct TraversalProgress<'a> {
-    max_path: &'a RelPath,
-    count: usize,
-    non_ignored_count: usize,
-    file_count: usize,
-    non_ignored_file_count: usize,
-}
-
-impl TraversalProgress<'_> {
-    fn count(&self, include_files: bool, include_dirs: bool, include_ignored: bool) -> usize {
-        match (include_files, include_dirs, include_ignored) {
-            (true, true, true) => self.count,
-            (true, true, false) => self.non_ignored_count,
-            (true, false, true) => self.file_count,
-            (true, false, false) => self.non_ignored_file_count,
-            (false, true, true) => self.count - self.file_count,
-            (false, true, false) => self.non_ignored_count - self.non_ignored_file_count,
-            (false, false, _) => 0,
-        }
-    }
-}
-
-impl<'a> sum_tree::Dimension<'a, EntrySummary> for TraversalProgress<'a> {
-    fn zero(_cx: ()) -> Self {
-        Default::default()
-    }
-
-    fn add_summary(&mut self, summary: &'a EntrySummary, _: ()) {
-        self.max_path = summary.max_path.as_ref();
-        self.count += summary.count;
-        self.non_ignored_count += summary.non_ignored_count;
-        self.file_count += summary.file_count;
-        self.non_ignored_file_count += summary.non_ignored_file_count;
-    }
-}
-
-impl Default for TraversalProgress<'_> {
-    fn default() -> Self {
-        Self {
-            max_path: RelPath::empty(),
-            count: 0,
-            non_ignored_count: 0,
-            file_count: 0,
-            non_ignored_file_count: 0,
-        }
-    }
-}
-
-#[derive(Debug)]
-pub struct Traversal<'a> {
-    snapshot: &'a Snapshot,
-    cursor: sum_tree::Cursor<'a, 'static, Entry, TraversalProgress<'a>>,
-    include_ignored: bool,
-    include_files: bool,
-    include_dirs: bool,
-}
-
-impl<'a> Traversal<'a> {
-    fn new(
-        snapshot: &'a Snapshot,
-        include_files: bool,
-        include_dirs: bool,
-        include_ignored: bool,
-        start_path: &RelPath,
-    ) -> Self {
-        let mut cursor = snapshot.entries_by_path.cursor(());
-        cursor.seek(&TraversalTarget::path(start_path), Bias::Left);
-        let mut traversal = Self {
-            snapshot,
-            cursor,
-            include_files,
-            include_dirs,
-            include_ignored,
-        };
-        if traversal.end_offset() == traversal.start_offset() {
-            traversal.next();
-        }
-        traversal
-    }
-
-    pub fn advance(&mut self) -> bool {
-        self.advance_by(1)
-    }
-
-    pub fn advance_by(&mut self, count: usize) -> bool {
-        self.cursor.seek_forward(
-            &TraversalTarget::Count {
-                count: self.end_offset() + count,
-                include_dirs: self.include_dirs,
-                include_files: self.include_files,
-                include_ignored: self.include_ignored,
-            },
-            Bias::Left,
-        )
-    }
-
-    pub fn advance_to_sibling(&mut self) -> bool {
-        while let Some(entry) = self.cursor.item() {
-            self.cursor
-                .seek_forward(&TraversalTarget::successor(&entry.path), Bias::Left);
-            if let Some(entry) = self.cursor.item()
-                && (self.include_files || !entry.is_file())
-                && (self.include_dirs || !entry.is_dir())
-                && (self.include_ignored || !entry.is_ignored || entry.is_always_included)
-            {
-                return true;
-            }
-        }
-        false
-    }
-
-    pub fn back_to_parent(&mut self) -> bool {
-        let Some(parent_path) = self.cursor.item().and_then(|entry| entry.path.parent()) else {
-            return false;
-        };
-        self.cursor
-            .seek(&TraversalTarget::path(parent_path), Bias::Left)
-    }
-
-    pub fn entry(&self) -> Option<&'a Entry> {
-        self.cursor.item()
-    }
-
-    pub fn snapshot(&self) -> &'a Snapshot {
-        self.snapshot
-    }
-
-    pub fn start_offset(&self) -> usize {
-        self.cursor
-            .start()
-            .count(self.include_files, self.include_dirs, self.include_ignored)
-    }
-
-    pub fn end_offset(&self) -> usize {
-        self.cursor
-            .end()
-            .count(self.include_files, self.include_dirs, self.include_ignored)
-    }
-}
-
-impl<'a> Iterator for Traversal<'a> {
-    type Item = &'a Entry;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        if let Some(item) = self.entry() {
-            self.advance();
-            Some(item)
-        } else {
-            None
-        }
-    }
-}
-
-#[derive(Debug, Clone, Copy)]
-pub enum PathTarget<'a> {
-    Path(&'a RelPath),
-    Successor(&'a RelPath),
-}
-
-impl PathTarget<'_> {
-    fn cmp_path(&self, other: &RelPath) -> Ordering {
-        match self {
-            PathTarget::Path(path) => path.cmp(&other),
-            PathTarget::Successor(path) => {
-                if other.starts_with(path) {
-                    Ordering::Greater
-                } else {
-                    Ordering::Equal
-                }
-            }
-        }
-    }
-}
-
-impl<'a, S: Summary> SeekTarget<'a, PathSummary<S>, PathProgress<'a>> for PathTarget<'_> {
-    fn cmp(&self, cursor_location: &PathProgress<'a>, _: S::Context<'_>) -> Ordering {
-        self.cmp_path(cursor_location.max_path)
-    }
-}
-
-impl<'a, S: Summary> SeekTarget<'a, PathSummary<S>, TraversalProgress<'a>> for PathTarget<'_> {
-    fn cmp(&self, cursor_location: &TraversalProgress<'a>, _: S::Context<'_>) -> Ordering {
-        self.cmp_path(cursor_location.max_path)
-    }
-}
-
-#[derive(Debug)]
-enum TraversalTarget<'a> {
-    Path(PathTarget<'a>),
-    Count {
-        count: usize,
-        include_files: bool,
-        include_ignored: bool,
-        include_dirs: bool,
-    },
-}
-
-impl<'a> TraversalTarget<'a> {
-    fn path(path: &'a RelPath) -> Self {
-        Self::Path(PathTarget::Path(path))
-    }
-
-    fn successor(path: &'a RelPath) -> Self {
-        Self::Path(PathTarget::Successor(path))
-    }
-
-    fn cmp_progress(&self, progress: &TraversalProgress) -> Ordering {
-        match self {
-            TraversalTarget::Path(path) => path.cmp_path(progress.max_path),
-            TraversalTarget::Count {
-                count,
-                include_files,
-                include_dirs,
-                include_ignored,
-            } => Ord::cmp(
-                count,
-                &progress.count(*include_files, *include_dirs, *include_ignored),
-            ),
-        }
-    }
-}
-
-impl<'a> SeekTarget<'a, EntrySummary, TraversalProgress<'a>> for TraversalTarget<'_> {
-    fn cmp(&self, cursor_location: &TraversalProgress<'a>, _: ()) -> Ordering {
-        self.cmp_progress(cursor_location)
-    }
-}
-
-impl<'a> SeekTarget<'a, PathSummary<sum_tree::NoSummary>, TraversalProgress<'a>>
-    for TraversalTarget<'_>
-{
-    fn cmp(&self, cursor_location: &TraversalProgress<'a>, _: ()) -> Ordering {
-        self.cmp_progress(cursor_location)
-    }
-}
-
-pub struct ChildEntriesOptions {
-    pub include_files: bool,
-    pub include_dirs: bool,
-    pub include_ignored: bool,
-}
-
-pub struct ChildEntriesIter<'a> {
-    parent_path: &'a RelPath,
-    traversal: Traversal<'a>,
-}
-
-impl<'a> Iterator for ChildEntriesIter<'a> {
-    type Item = &'a Entry;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        if let Some(item) = self.traversal.entry()
-            && item.path.starts_with(self.parent_path)
-        {
-            self.traversal.advance_to_sibling();
-            return Some(item);
-        }
-        None
-    }
-}
-
-impl<'a> From<&'a Entry> for proto::Entry {
-    fn from(entry: &'a Entry) -> Self {
-        Self {
-            id: entry.id.to_proto(),
-            is_dir: entry.is_dir(),
-            path: entry.path.as_ref().to_proto(),
-            inode: entry.inode,
-            mtime: entry.mtime.map(|time| time.into()),
-            is_ignored: entry.is_ignored,
-            is_hidden: entry.is_hidden,
-            is_external: entry.is_external,
-            is_fifo: entry.is_fifo,
-            size: Some(entry.size),
-            canonical_path: entry
-                .canonical_path
-                .as_ref()
-                .map(|path| path.to_string_lossy().into_owned()),
-        }
-    }
-}
-
-impl TryFrom<(&CharBag, &PathMatcher, proto::Entry)> for Entry {
-    type Error = anyhow::Error;
-
-    fn try_from(
-        (root_char_bag, always_included, entry): (&CharBag, &PathMatcher, proto::Entry),
-    ) -> Result<Self> {
-        let kind = if entry.is_dir {
-            EntryKind::Dir
-        } else {
-            EntryKind::File
-        };
-
-        let path =
-            RelPath::from_proto(&entry.path).context("invalid relative path in proto message")?;
-        let char_bag = char_bag_for_path(*root_char_bag, &path);
-        let is_always_included = always_included.is_match(&path);
-        Ok(Entry {
-            id: ProjectEntryId::from_proto(entry.id),
-            kind,
-            path,
-            inode: entry.inode,
-            mtime: entry.mtime.map(|time| time.into()),
-            size: entry.size.unwrap_or(0),
-            canonical_path: entry
-                .canonical_path
-                .map(|path_string| Arc::from(PathBuf::from(path_string))),
-            is_ignored: entry.is_ignored,
-            is_hidden: entry.is_hidden,
-            is_always_included,
-            is_external: entry.is_external,
-            is_private: false,
-            char_bag,
-            is_fifo: entry.is_fifo,
-        })
-    }
-}
-
-#[derive(Clone, Copy, Debug, Default, Hash, PartialEq, Eq, PartialOrd, Ord)]
-pub struct ProjectEntryId(usize);
-
-impl ProjectEntryId {
-    pub const MAX: Self = Self(usize::MAX);
-    pub const MIN: Self = Self(usize::MIN);
-
-    pub fn new(counter: &AtomicUsize) -> Self {
-        Self(counter.fetch_add(1, SeqCst))
-    }
-
-    pub fn from_proto(id: u64) -> Self {
-        Self(id as usize)
-    }
-
-    pub fn to_proto(self) -> u64 {
-        self.0 as u64
-    }
-
-    pub fn from_usize(id: usize) -> Self {
-        ProjectEntryId(id)
-    }
-
-    pub fn to_usize(self) -> usize {
-        self.0
-    }
-}
-
-#[cfg(any(test, feature = "test-support"))]
-impl CreatedEntry {
-    pub fn into_included(self) -> Option<Entry> {
-        match self {
-            CreatedEntry::Included(entry) => Some(entry),
-            CreatedEntry::Excluded { .. } => None,
-        }
-    }
-}
-
-fn parse_gitfile(content: &str) -> anyhow::Result<&Path> {
-    let path = content
-        .strip_prefix("gitdir:")
-        .with_context(|| format!("parsing gitfile content {content:?}"))?;
-    Ok(Path::new(path.trim()))
-}
-
-async fn discover_git_paths(dot_git_abs_path: &Arc<Path>, fs: &dyn Fs) -> (Arc<Path>, Arc<Path>) {
-    let mut repository_dir_abs_path = dot_git_abs_path.clone();
-    let mut common_dir_abs_path = dot_git_abs_path.clone();
-
-    if let Some(path) = fs
-        .load(dot_git_abs_path)
-        .await
-        .ok()
-        .as_ref()
-        .and_then(|contents| parse_gitfile(contents).log_err())
-    {
-        let path = dot_git_abs_path
-            .parent()
-            .unwrap_or(Path::new(""))
-            .join(path);
-        if let Some(path) = fs.canonicalize(&path).await.log_err() {
-            repository_dir_abs_path = Path::new(&path).into();
-            common_dir_abs_path = repository_dir_abs_path.clone();
-
-            if let Some(commondir_contents) = fs.load(&path.join("commondir")).await.ok()
-                && let Some(commondir_path) = fs
-                    .canonicalize(&path.join(commondir_contents.trim()))
-                    .await
-                    .log_err()
-            {
-                common_dir_abs_path = commondir_path.as_path().into();
-            }
-        }
-    };
-    (repository_dir_abs_path, common_dir_abs_path)
-}
-
-struct NullWatcher;
-
-impl fs::Watcher for NullWatcher {
-    fn add(&self, _path: &Path) -> Result<()> {
-        Ok(())
-    }
-
-    fn remove(&self, _path: &Path) -> Result<()> {
-        Ok(())
-    }
-}
diff --git a/crates/worktree/src/worktree_settings.rs b/crates/worktree/src/worktree_settings.rs
deleted file mode 100644
index a86720184e..0000000000
--- a/crates/worktree/src/worktree_settings.rs
+++ /dev/null
@@ -1,95 +0,0 @@
-use std::path::Path;
-
-use anyhow::Context as _;
-use settings::{RegisterSetting, Settings};
-use util::{
-    ResultExt,
-    paths::{PathMatcher, PathStyle},
-    rel_path::RelPath,
-};
-
-#[derive(Clone, PartialEq, Eq, RegisterSetting)]
-pub struct WorktreeSettings {
-    pub project_name: Option<String>,
-    /// Whether to prevent this project from being shared in public channels.
-    pub prevent_sharing_in_public_channels: bool,
-    pub file_scan_exclusions: PathMatcher,
-    pub file_scan_inclusions: PathMatcher,
-    /// This field contains all ancestors of the `file_scan_inclusions`. It's used to
-    /// determine whether to terminate worktree scanning for a given dir.
-    pub parent_dir_scan_inclusions: PathMatcher,
-    pub private_files: PathMatcher,
-    pub hidden_files: PathMatcher,
-}
-
-impl WorktreeSettings {
-    pub fn is_path_private(&self, path: &RelPath) -> bool {
-        path.ancestors()
-            .any(|ancestor| self.private_files.is_match(ancestor))
-    }
-
-    pub fn is_path_excluded(&self, path: &RelPath) -> bool {
-        path.ancestors()
-            .any(|ancestor| self.file_scan_exclusions.is_match(ancestor))
-    }
-
-    pub fn is_path_always_included(&self, path: &RelPath, is_dir: bool) -> bool {
-        if is_dir {
-            self.parent_dir_scan_inclusions.is_match(path)
-        } else {
-            self.file_scan_inclusions.is_match(path)
-        }
-    }
-
-    pub fn is_path_hidden(&self, path: &RelPath) -> bool {
-        path.ancestors()
-            .any(|ancestor| self.hidden_files.is_match(ancestor))
-    }
-}
-
-impl Settings for WorktreeSettings {
-    fn from_settings(content: &settings::SettingsContent) -> Self {
-        let worktree = content.project.worktree.clone();
-        let file_scan_exclusions = worktree.file_scan_exclusions.unwrap();
-        let file_scan_inclusions = worktree.file_scan_inclusions.unwrap();
-        let private_files = worktree.private_files.unwrap().0;
-        let hidden_files = worktree.hidden_files.unwrap();
-        let parsed_file_scan_inclusions: Vec<String> = file_scan_inclusions
-            .iter()
-            .flat_map(|glob| {
-                Path::new(glob)
-                    .ancestors()
-                    .skip(1)
-                    .map(|a| a.to_string_lossy().into())
-            })
-            .filter(|p: &String| !p.is_empty())
-            .collect();
-
-        Self {
-            project_name: worktree.project_name,
-            prevent_sharing_in_public_channels: worktree.prevent_sharing_in_public_channels,
-            file_scan_exclusions: path_matchers(file_scan_exclusions, "file_scan_exclusions")
-                .log_err()
-                .unwrap_or_default(),
-            parent_dir_scan_inclusions: path_matchers(
-                parsed_file_scan_inclusions,
-                "file_scan_inclusions",
-            )
-            .unwrap(),
-            file_scan_inclusions: path_matchers(file_scan_inclusions, "file_scan_inclusions")
-                .unwrap(),
-            private_files: path_matchers(private_files, "private_files")
-                .log_err()
-                .unwrap_or_default(),
-            hidden_files: path_matchers(hidden_files, "hidden_files")
-                .log_err()
-                .unwrap_or_default(),
-        }
-    }
-}
-
-fn path_matchers(mut values: Vec<String>, context: &'static str) -> anyhow::Result<PathMatcher> {
-    values.sort();
-    PathMatcher::new(values, PathStyle::local())
-        .with_context(|| format!("Failed to parse globs from {}", context))
-}
diff --git a/crates/worktree/src/worktree_tests.rs b/crates/worktree/src/worktree_tests.rs
deleted file mode 100644
index e58e99ea68..0000000000
--- a/crates/worktree/src/worktree_tests.rs
+++ /dev/null
@@ -1,2466 +0,0 @@
-use crate::{Entry, EntryKind, Event, PathChange, Worktree, WorktreeModelHandle};
-use anyhow::Result;
-use fs::{FakeFs, Fs, RealFs, RemoveOptions};
-use git::GITIGNORE;
-use gpui::{AppContext as _, BackgroundExecutor, BorrowAppContext, Context, Task, TestAppContext};
-use parking_lot::Mutex;
-use postage::stream::Stream;
-use pretty_assertions::assert_eq;
-use rand::prelude::*;
-
-use serde_json::json;
-use settings::SettingsStore;
-use std::{
-    env,
-    fmt::Write,
-    mem,
-    path::{Path, PathBuf},
-    sync::Arc,
-};
-use util::{
-    ResultExt, path,
-    rel_path::{RelPath, rel_path},
-    test::TempTree,
-};
-
-#[gpui::test]
-async fn test_traversal(cx: &mut TestAppContext) {
-    init_test(cx);
-    let fs = FakeFs::new(cx.background_executor.clone());
-    fs.insert_tree(
-        "/root",
-        json!({
-           ".gitignore": "a/b\n",
-           "a": {
-               "b": "",
-               "c": "",
-           }
-        }),
-    )
-    .await;
-
-    let tree = Worktree::local(
-        Path::new("/root"),
-        true,
-        fs,
-        Default::default(),
-        true,
-        &mut cx.to_async(),
-    )
-    .await
-    .unwrap();
-    cx.read(|cx| tree.read(cx).as_local().unwrap().scan_complete())
-        .await;
-
-    tree.read_with(cx, |tree, _| {
-        assert_eq!(
-            tree.entries(false, 0)
-                .map(|entry| entry.path.as_ref())
-                .collect::<Vec<_>>(),
-            vec![
-                rel_path(""),
-                rel_path(".gitignore"),
-                rel_path("a"),
-                rel_path("a/c"),
-            ]
-        );
-        assert_eq!(
-            tree.entries(true, 0)
-                .map(|entry| entry.path.as_ref())
-                .collect::<Vec<_>>(),
-            vec![
-                rel_path(""),
-                rel_path(".gitignore"),
-                rel_path("a"),
-                rel_path("a/b"),
-                rel_path("a/c"),
-            ]
-        );
-    })
-}
-
-#[gpui::test(iterations = 10)]
-async fn test_circular_symlinks(cx: &mut TestAppContext) {
-    init_test(cx);
-    let fs = FakeFs::new(cx.background_executor.clone());
-    fs.insert_tree(
-        "/root",
-        json!({
-            "lib": {
-                "a": {
-                    "a.txt": ""
-                },
-                "b": {
-                    "b.txt": ""
-                }
-            }
-        }),
-    )
-    .await;
-    fs.create_symlink("/root/lib/a/lib".as_ref(), "..".into())
-        .await
-        .unwrap();
-    fs.create_symlink("/root/lib/b/lib".as_ref(), "..".into())
-        .await
-        .unwrap();
-
-    let tree = Worktree::local(
-        Path::new("/root"),
-        true,
-        fs.clone(),
-        Default::default(),
-        true,
-        &mut cx.to_async(),
-    )
-    .await
-    .unwrap();
-
-    cx.read(|cx| tree.read(cx).as_local().unwrap().scan_complete())
-        .await;
-
-    tree.read_with(cx, |tree, _| {
-        assert_eq!(
-            tree.entries(false, 0)
-                .map(|entry| entry.path.as_ref())
-                .collect::<Vec<_>>(),
-            vec![
-                rel_path(""),
-                rel_path("lib"),
-                rel_path("lib/a"),
-                rel_path("lib/a/a.txt"),
-                rel_path("lib/a/lib"),
-                rel_path("lib/b"),
-                rel_path("lib/b/b.txt"),
-                rel_path("lib/b/lib"),
-            ]
-        );
-    });
-
-    fs.rename(
-        Path::new("/root/lib/a/lib"),
-        Path::new("/root/lib/a/lib-2"),
-        Default::default(),
-    )
-    .await
-    .unwrap();
-    cx.executor().run_until_parked();
-    tree.read_with(cx, |tree, _| {
-        assert_eq!(
-            tree.entries(false, 0)
-                .map(|entry| entry.path.as_ref())
-                .collect::<Vec<_>>(),
-            vec![
-                rel_path(""),
-                rel_path("lib"),
-                rel_path("lib/a"),
-                rel_path("lib/a/a.txt"),
-                rel_path("lib/a/lib-2"),
-                rel_path("lib/b"),
-                rel_path("lib/b/b.txt"),
-                rel_path("lib/b/lib"),
-            ]
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_symlinks_pointing_outside(cx: &mut TestAppContext) {
-    init_test(cx);
-    let fs = FakeFs::new(cx.background_executor.clone());
-    fs.insert_tree(
-        "/root",
-        json!({
-            "dir1": {
-                "deps": {
-                    // symlinks here
-                },
-                "src": {
-                    "a.rs": "",
-                    "b.rs": "",
-                },
-            },
-            "dir2": {
-                "src": {
-                    "c.rs": "",
-                    "d.rs": "",
-                }
-            },
-            "dir3": {
-                "deps": {},
-                "src": {
-                    "e.rs": "",
-                    "f.rs": "",
-                },
-            }
-        }),
-    )
-    .await;
-
-    // These symlinks point to directories outside of the worktree's root, dir1.
-    fs.create_symlink("/root/dir1/deps/dep-dir2".as_ref(), "../../dir2".into())
-        .await
-        .unwrap();
-    fs.create_symlink("/root/dir1/deps/dep-dir3".as_ref(), "../../dir3".into())
-        .await
-        .unwrap();
-
-    let tree = Worktree::local(
-        Path::new("/root/dir1"),
-        true,
-        fs.clone(),
-        Default::default(),
-        true,
-        &mut cx.to_async(),
-    )
-    .await
-    .unwrap();
-
-    cx.read(|cx| tree.read(cx).as_local().unwrap().scan_complete())
-        .await;
-
-    let tree_updates = Arc::new(Mutex::new(Vec::new()));
-    tree.update(cx, |_, cx| {
-        let tree_updates = tree_updates.clone();
-        cx.subscribe(&tree, move |_, _, event, _| {
-            if let Event::UpdatedEntries(update) = event {
-                tree_updates.lock().extend(
-                    update
-                        .iter()
-                        .map(|(path, _, change)| (path.clone(), *change)),
-                );
-            }
-        })
-        .detach();
-    });
-
-    // The symlinked directories are not scanned by default.
-    tree.read_with(cx, |tree, _| {
-        assert_eq!(
-            tree.entries(true, 0)
-                .map(|entry| (entry.path.as_ref(), entry.is_external))
-                .collect::<Vec<_>>(),
-            vec![
-                (rel_path(""), false),
-                (rel_path("deps"), false),
-                (rel_path("deps/dep-dir2"), true),
-                (rel_path("deps/dep-dir3"), true),
-                (rel_path("src"), false),
-                (rel_path("src/a.rs"), false),
-                (rel_path("src/b.rs"), false),
-            ]
-        );
-
-        assert_eq!(
-            tree.entry_for_path(rel_path("deps/dep-dir2")).unwrap().kind,
-            EntryKind::UnloadedDir
-        );
-    });
-
-    // Expand one of the symlinked directories.
-    tree.read_with(cx, |tree, _| {
-        tree.as_local()
-            .unwrap()
-            .refresh_entries_for_paths(vec![rel_path("deps/dep-dir3").into()])
-    })
-    .recv()
-    .await;
-
-    // The expanded directory's contents are loaded. Subdirectories are
-    // not scanned yet.
-    tree.read_with(cx, |tree, _| {
-        assert_eq!(
-            tree.entries(true, 0)
-                .map(|entry| (entry.path.as_ref(), entry.is_external))
-                .collect::<Vec<_>>(),
-            vec![
-                (rel_path(""), false),
-                (rel_path("deps"), false),
-                (rel_path("deps/dep-dir2"), true),
-                (rel_path("deps/dep-dir3"), true),
-                (rel_path("deps/dep-dir3/deps"), true),
-                (rel_path("deps/dep-dir3/src"), true),
-                (rel_path("src"), false),
-                (rel_path("src/a.rs"), false),
-                (rel_path("src/b.rs"), false),
-            ]
-        );
-    });
-    assert_eq!(
-        mem::take(&mut *tree_updates.lock()),
-        &[
-            (rel_path("deps/dep-dir3").into(), PathChange::Loaded),
-            (rel_path("deps/dep-dir3/deps").into(), PathChange::Loaded),
-            (rel_path("deps/dep-dir3/src").into(), PathChange::Loaded)
-        ]
-    );
-
-    // Expand a subdirectory of one of the symlinked directories.
-    tree.read_with(cx, |tree, _| {
-        tree.as_local()
-            .unwrap()
-            .refresh_entries_for_paths(vec![rel_path("deps/dep-dir3/src").into()])
-    })
-    .recv()
-    .await;
-
-    // The expanded subdirectory's contents are loaded.
-    tree.read_with(cx, |tree, _| {
-        assert_eq!(
-            tree.entries(true, 0)
-                .map(|entry| (entry.path.as_ref(), entry.is_external))
-                .collect::<Vec<_>>(),
-            vec![
-                (rel_path(""), false),
-                (rel_path("deps"), false),
-                (rel_path("deps/dep-dir2"), true),
-                (rel_path("deps/dep-dir3"), true),
-                (rel_path("deps/dep-dir3/deps"), true),
-                (rel_path("deps/dep-dir3/src"), true),
-                (rel_path("deps/dep-dir3/src/e.rs"), true),
-                (rel_path("deps/dep-dir3/src/f.rs"), true),
-                (rel_path("src"), false),
-                (rel_path("src/a.rs"), false),
-                (rel_path("src/b.rs"), false),
-            ]
-        );
-    });
-
-    assert_eq!(
-        mem::take(&mut *tree_updates.lock()),
-        &[
-            (rel_path("deps/dep-dir3/src").into(), PathChange::Loaded),
-            (
-                rel_path("deps/dep-dir3/src/e.rs").into(),
-                PathChange::Loaded
-            ),
-            (
-                rel_path("deps/dep-dir3/src/f.rs").into(),
-                PathChange::Loaded
-            )
-        ]
-    );
-}
-
-#[cfg(target_os = "macos")]
-#[gpui::test]
-async fn test_renaming_case_only(cx: &mut TestAppContext) {
-    cx.executor().allow_parking();
-    init_test(cx);
-
-    const OLD_NAME: &str = "aaa.rs";
-    const NEW_NAME: &str = "AAA.rs";
-
-    let fs = Arc::new(RealFs::new(None, cx.executor()));
-    let temp_root = TempTree::new(json!({
-        OLD_NAME: "",
-    }));
-
-    let tree = Worktree::local(
-        temp_root.path(),
-        true,
-        fs.clone(),
-        Default::default(),
-        true,
-        &mut cx.to_async(),
-    )
-    .await
-    .unwrap();
-
-    cx.read(|cx| tree.read(cx).as_local().unwrap().scan_complete())
-        .await;
-    tree.read_with(cx, |tree, _| {
-        assert_eq!(
-            tree.entries(true, 0)
-                .map(|entry| entry.path.as_ref())
-                .collect::<Vec<_>>(),
-            vec![rel_path(""), rel_path(OLD_NAME)]
-        );
-    });
-
-    fs.rename(
-        &temp_root.path().join(OLD_NAME),
-        &temp_root.path().join(NEW_NAME),
-        fs::RenameOptions {
-            overwrite: true,
-            ignore_if_exists: true,
-            create_parents: false,
-        },
-    )
-    .await
-    .unwrap();
-
-    tree.flush_fs_events(cx).await;
-
-    tree.read_with(cx, |tree, _| {
-        assert_eq!(
-            tree.entries(true, 0)
-                .map(|entry| entry.path.as_ref())
-                .collect::<Vec<_>>(),
-            vec![rel_path(""), rel_path(NEW_NAME)]
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_open_gitignored_files(cx: &mut TestAppContext) {
-    init_test(cx);
-    let fs = FakeFs::new(cx.background_executor.clone());
-    fs.insert_tree(
-        "/root",
-        json!({
-            ".gitignore": "node_modules\n",
-            "one": {
-                "node_modules": {
-                    "a": {
-                        "a1.js": "a1",
-                        "a2.js": "a2",
-                    },
-                    "b": {
-                        "b1.js": "b1",
-                        "b2.js": "b2",
-                    },
-                    "c": {
-                        "c1.js": "c1",
-                        "c2.js": "c2",
-                    }
-                },
-            },
-            "two": {
-                "x.js": "",
-                "y.js": "",
-            },
-        }),
-    )
-    .await;
-
-    let tree = Worktree::local(
-        Path::new("/root"),
-        true,
-        fs.clone(),
-        Default::default(),
-        true,
-        &mut cx.to_async(),
-    )
-    .await
-    .unwrap();
-
-    cx.read(|cx| tree.read(cx).as_local().unwrap().scan_complete())
-        .await;
-
-    tree.read_with(cx, |tree, _| {
-        assert_eq!(
-            tree.entries(true, 0)
-                .map(|entry| (entry.path.as_ref(), entry.is_ignored))
-                .collect::<Vec<_>>(),
-            vec![
-                (rel_path(""), false),
-                (rel_path(".gitignore"), false),
-                (rel_path("one"), false),
-                (rel_path("one/node_modules"), true),
-                (rel_path("two"), false),
-                (rel_path("two/x.js"), false),
-                (rel_path("two/y.js"), false),
-            ]
-        );
-    });
-
-    // Open a file that is nested inside of a gitignored directory that
-    // has not yet been expanded.
-    let prev_read_dir_count = fs.read_dir_call_count();
-    let loaded = tree
-        .update(cx, |tree, cx| {
-            tree.load_file(rel_path("one/node_modules/b/b1.js"), cx)
-        })
-        .await
-        .unwrap();
-
-    tree.read_with(cx, |tree, _| {
-        assert_eq!(
-            tree.entries(true, 0)
-                .map(|entry| (entry.path.as_ref(), entry.is_ignored))
-                .collect::<Vec<_>>(),
-            vec![
-                (rel_path(""), false),
-                (rel_path(".gitignore"), false),
-                (rel_path("one"), false),
-                (rel_path("one/node_modules"), true),
-                (rel_path("one/node_modules/a"), true),
-                (rel_path("one/node_modules/b"), true),
-                (rel_path("one/node_modules/b/b1.js"), true),
-                (rel_path("one/node_modules/b/b2.js"), true),
-                (rel_path("one/node_modules/c"), true),
-                (rel_path("two"), false),
-                (rel_path("two/x.js"), false),
-                (rel_path("two/y.js"), false),
-            ]
-        );
-
-        assert_eq!(
-            loaded.file.path.as_ref(),
-            rel_path("one/node_modules/b/b1.js")
-        );
-
-        // Only the newly-expanded directories are scanned.
-        assert_eq!(fs.read_dir_call_count() - prev_read_dir_count, 2);
-    });
-
-    // Open another file in a different subdirectory of the same
-    // gitignored directory.
-    let prev_read_dir_count = fs.read_dir_call_count();
-    let loaded = tree
-        .update(cx, |tree, cx| {
-            tree.load_file(rel_path("one/node_modules/a/a2.js"), cx)
-        })
-        .await
-        .unwrap();
-
-    tree.read_with(cx, |tree, _| {
-        assert_eq!(
-            tree.entries(true, 0)
-                .map(|entry| (entry.path.as_ref(), entry.is_ignored))
-                .collect::<Vec<_>>(),
-            vec![
-                (rel_path(""), false),
-                (rel_path(".gitignore"), false),
-                (rel_path("one"), false),
-                (rel_path("one/node_modules"), true),
-                (rel_path("one/node_modules/a"), true),
-                (rel_path("one/node_modules/a/a1.js"), true),
-                (rel_path("one/node_modules/a/a2.js"), true),
-                (rel_path("one/node_modules/b"), true),
-                (rel_path("one/node_modules/b/b1.js"), true),
-                (rel_path("one/node_modules/b/b2.js"), true),
-                (rel_path("one/node_modules/c"), true),
-                (rel_path("two"), false),
-                (rel_path("two/x.js"), false),
-                (rel_path("two/y.js"), false),
-            ]
-        );
-
-        assert_eq!(
-            loaded.file.path.as_ref(),
-            rel_path("one/node_modules/a/a2.js")
-        );
-
-        // Only the newly-expanded directory is scanned.
-        assert_eq!(fs.read_dir_call_count() - prev_read_dir_count, 1);
-    });
-
-    let path = PathBuf::from("/root/one/node_modules/c/lib");
-
-    // No work happens when files and directories change within an unloaded directory.
-    let prev_fs_call_count = fs.read_dir_call_count() + fs.metadata_call_count();
-    // When we open a directory, we check each ancestor whether it's a git
-    // repository. That means we have an fs.metadata call per ancestor that we
-    // need to subtract here.
-    let ancestors = path.ancestors().count();
-
-    fs.create_dir(path.as_ref()).await.unwrap();
-    cx.executor().run_until_parked();
-
-    assert_eq!(
-        fs.read_dir_call_count() + fs.metadata_call_count() - prev_fs_call_count - ancestors,
-        0
-    );
-}
-
-#[gpui::test]
-async fn test_dirs_no_longer_ignored(cx: &mut TestAppContext) {
-    init_test(cx);
-    let fs = FakeFs::new(cx.background_executor.clone());
-    fs.insert_tree(
-        "/root",
-        json!({
-            ".gitignore": "node_modules\n",
-            "a": {
-                "a.js": "",
-            },
-            "b": {
-                "b.js": "",
-            },
-            "node_modules": {
-                "c": {
-                    "c.js": "",
-                },
-                "d": {
-                    "d.js": "",
-                    "e": {
-                        "e1.js": "",
-                        "e2.js": "",
-                    },
-                    "f": {
-                        "f1.js": "",
-                        "f2.js": "",
-                    }
-                },
-            },
-        }),
-    )
-    .await;
-
-    let tree = Worktree::local(
-        Path::new("/root"),
-        true,
-        fs.clone(),
-        Default::default(),
-        true,
-        &mut cx.to_async(),
-    )
-    .await
-    .unwrap();
-
-    cx.read(|cx| tree.read(cx).as_local().unwrap().scan_complete())
-        .await;
-
-    // Open a file within the gitignored directory, forcing some of its
-    // subdirectories to be read, but not all.
-    let read_dir_count_1 = fs.read_dir_call_count();
-    tree.read_with(cx, |tree, _| {
-        tree.as_local()
-            .unwrap()
-            .refresh_entries_for_paths(vec![rel_path("node_modules/d/d.js").into()])
-    })
-    .recv()
-    .await;
-
-    // Those subdirectories are now loaded.
-    tree.read_with(cx, |tree, _| {
-        assert_eq!(
-            tree.entries(true, 0)
-                .map(|e| (e.path.as_ref(), e.is_ignored))
-                .collect::<Vec<_>>(),
-            &[
-                (rel_path(""), false),
-                (rel_path(".gitignore"), false),
-                (rel_path("a"), false),
-                (rel_path("a/a.js"), false),
-                (rel_path("b"), false),
-                (rel_path("b/b.js"), false),
-                (rel_path("node_modules"), true),
-                (rel_path("node_modules/c"), true),
-                (rel_path("node_modules/d"), true),
-                (rel_path("node_modules/d/d.js"), true),
-                (rel_path("node_modules/d/e"), true),
-                (rel_path("node_modules/d/f"), true),
-            ]
-        );
-    });
-    let read_dir_count_2 = fs.read_dir_call_count();
-    assert_eq!(read_dir_count_2 - read_dir_count_1, 2);
-
-    // Update the gitignore so that node_modules is no longer ignored,
-    // but a subdirectory is ignored
-    fs.save("/root/.gitignore".as_ref(), &"e".into(), Default::default())
-        .await
-        .unwrap();
-    cx.executor().run_until_parked();
-
-    // All of the directories that are no longer ignored are now loaded.
-    tree.read_with(cx, |tree, _| {
-        assert_eq!(
-            tree.entries(true, 0)
-                .map(|e| (e.path.as_ref(), e.is_ignored))
-                .collect::<Vec<_>>(),
-            &[
-                (rel_path(""), false),
-                (rel_path(".gitignore"), false),
-                (rel_path("a"), false),
-                (rel_path("a/a.js"), false),
-                (rel_path("b"), false),
-                (rel_path("b/b.js"), false),
-                // This directory is no longer ignored
-                (rel_path("node_modules"), false),
-                (rel_path("node_modules/c"), false),
-                (rel_path("node_modules/c/c.js"), false),
-                (rel_path("node_modules/d"), false),
-                (rel_path("node_modules/d/d.js"), false),
-                // This subdirectory is now ignored
-                (rel_path("node_modules/d/e"), true),
-                (rel_path("node_modules/d/f"), false),
-                (rel_path("node_modules/d/f/f1.js"), false),
-                (rel_path("node_modules/d/f/f2.js"), false),
-            ]
-        );
-    });
-
-    // Each of the newly-loaded directories is scanned only once.
-    let read_dir_count_3 = fs.read_dir_call_count();
-    assert_eq!(read_dir_count_3 - read_dir_count_2, 2);
-}
-
-#[gpui::test]
-async fn test_write_file(cx: &mut TestAppContext) {
-    init_test(cx);
-    cx.executor().allow_parking();
-    let dir = TempTree::new(json!({
-        ".git": {},
-        ".gitignore": "ignored-dir\n",
-        "tracked-dir": {},
-        "ignored-dir": {}
-    }));
-
-    let worktree = Worktree::local(
-        dir.path(),
-        true,
-        Arc::new(RealFs::new(None, cx.executor())),
-        Default::default(),
-        true,
-        &mut cx.to_async(),
-    )
-    .await
-    .unwrap();
-
-    #[cfg(not(target_os = "macos"))]
-    fs::fs_watcher::global(|_| {}).unwrap();
-
-    cx.read(|cx| worktree.read(cx).as_local().unwrap().scan_complete())
-        .await;
-    worktree.flush_fs_events(cx).await;
-
-    worktree
-        .update(cx, |tree, cx| {
-            tree.write_file(
-                rel_path("tracked-dir/file.txt").into(),
-                "hello".into(),
-                Default::default(),
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-    worktree
-        .update(cx, |tree, cx| {
-            tree.write_file(
-                rel_path("ignored-dir/file.txt").into(),
-                "world".into(),
-                Default::default(),
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-    worktree.read_with(cx, |tree, _| {
-        let tracked = tree
-            .entry_for_path(rel_path("tracked-dir/file.txt"))
-            .unwrap();
-        let ignored = tree
-            .entry_for_path(rel_path("ignored-dir/file.txt"))
-            .unwrap();
-        assert!(!tracked.is_ignored);
-        assert!(ignored.is_ignored);
-    });
-}
-
-#[gpui::test]
-async fn test_file_scan_inclusions(cx: &mut TestAppContext) {
-    init_test(cx);
-    cx.executor().allow_parking();
-    let dir = TempTree::new(json!({
-        ".gitignore": "**/target\n/node_modules\ntop_level.txt\n",
-        "target": {
-            "index": "blah2"
-        },
-        "node_modules": {
-            ".DS_Store": "",
-            "prettier": {
-                "package.json": "{}",
-            },
-            "package.json": "//package.json"
-        },
-        "src": {
-            ".DS_Store": "",
-            "foo": {
-                "foo.rs": "mod another;\n",
-                "another.rs": "// another",
-            },
-            "bar": {
-                "bar.rs": "// bar",
-            },
-            "lib.rs": "mod foo;\nmod bar;\n",
-        },
-        "top_level.txt": "top level file",
-        ".DS_Store": "",
-    }));
-    cx.update(|cx| {
-        cx.update_global::<SettingsStore, _>(|store, cx| {
-            store.update_user_settings(cx, |settings| {
-                settings.project.worktree.file_scan_exclusions = Some(vec![]);
-                settings.project.worktree.file_scan_inclusions = Some(vec![
-                    "node_modules/**/package.json".to_string(),
-                    "**/.DS_Store".to_string(),
-                ]);
-            });
-        });
-    });
-
-    let tree = Worktree::local(
-        dir.path(),
-        true,
-        Arc::new(RealFs::new(None, cx.executor())),
-        Default::default(),
-        true,
-        &mut cx.to_async(),
-    )
-    .await
-    .unwrap();
-    cx.read(|cx| tree.read(cx).as_local().unwrap().scan_complete())
-        .await;
-    tree.flush_fs_events(cx).await;
-    tree.read_with(cx, |tree, _| {
-        // Assert that file_scan_inclusions overrides  file_scan_exclusions.
-        check_worktree_entries(
-            tree,
-            &[],
-            &["target", "node_modules"],
-            &["src/lib.rs", "src/bar/bar.rs", ".gitignore"],
-            &[
-                "node_modules/prettier/package.json",
-                ".DS_Store",
-                "node_modules/.DS_Store",
-                "src/.DS_Store",
-            ],
-        )
-    });
-}
-
-#[gpui::test]
-async fn test_file_scan_exclusions_overrules_inclusions(cx: &mut TestAppContext) {
-    init_test(cx);
-    cx.executor().allow_parking();
-    let dir = TempTree::new(json!({
-        ".gitignore": "**/target\n/node_modules\n",
-        "target": {
-            "index": "blah2"
-        },
-        "node_modules": {
-            ".DS_Store": "",
-            "prettier": {
-                "package.json": "{}",
-            },
-        },
-        "src": {
-            ".DS_Store": "",
-            "foo": {
-                "foo.rs": "mod another;\n",
-                "another.rs": "// another",
-            },
-        },
-        ".DS_Store": "",
-    }));
-
-    cx.update(|cx| {
-        cx.update_global::<SettingsStore, _>(|store, cx| {
-            store.update_user_settings(cx, |settings| {
-                settings.project.worktree.file_scan_exclusions =
-                    Some(vec!["**/.DS_Store".to_string()]);
-                settings.project.worktree.file_scan_inclusions =
-                    Some(vec!["**/.DS_Store".to_string()]);
-            });
-        });
-    });
-
-    let tree = Worktree::local(
-        dir.path(),
-        true,
-        Arc::new(RealFs::new(None, cx.executor())),
-        Default::default(),
-        true,
-        &mut cx.to_async(),
-    )
-    .await
-    .unwrap();
-    cx.read(|cx| tree.read(cx).as_local().unwrap().scan_complete())
-        .await;
-    tree.flush_fs_events(cx).await;
-    tree.read_with(cx, |tree, _| {
-        // Assert that file_scan_inclusions overrides  file_scan_exclusions.
-        check_worktree_entries(
-            tree,
-            &[".DS_Store, src/.DS_Store"],
-            &["target", "node_modules"],
-            &["src/foo/another.rs", "src/foo/foo.rs", ".gitignore"],
-            &[],
-        )
-    });
-}
-
-#[gpui::test]
-async fn test_file_scan_inclusions_reindexes_on_setting_change(cx: &mut TestAppContext) {
-    init_test(cx);
-    cx.executor().allow_parking();
-    let dir = TempTree::new(json!({
-        ".gitignore": "**/target\n/node_modules/\n",
-        "target": {
-            "index": "blah2"
-        },
-        "node_modules": {
-            ".DS_Store": "",
-            "prettier": {
-                "package.json": "{}",
-            },
-        },
-        "src": {
-            ".DS_Store": "",
-            "foo": {
-                "foo.rs": "mod another;\n",
-                "another.rs": "// another",
-            },
-        },
-        ".DS_Store": "",
-    }));
-
-    cx.update(|cx| {
-        cx.update_global::<SettingsStore, _>(|store, cx| {
-            store.update_user_settings(cx, |settings| {
-                settings.project.worktree.file_scan_exclusions = Some(vec![]);
-                settings.project.worktree.file_scan_inclusions =
-                    Some(vec!["node_modules/**".to_string()]);
-            });
-        });
-    });
-    let tree = Worktree::local(
-        dir.path(),
-        true,
-        Arc::new(RealFs::new(None, cx.executor())),
-        Default::default(),
-        true,
-        &mut cx.to_async(),
-    )
-    .await
-    .unwrap();
-    cx.read(|cx| tree.read(cx).as_local().unwrap().scan_complete())
-        .await;
-    tree.flush_fs_events(cx).await;
-
-    tree.read_with(cx, |tree, _| {
-        assert!(
-            tree.entry_for_path(rel_path("node_modules"))
-                .is_some_and(|f| f.is_always_included)
-        );
-        assert!(
-            tree.entry_for_path(rel_path("node_modules/prettier/package.json"))
-                .is_some_and(|f| f.is_always_included)
-        );
-    });
-
-    cx.update(|cx| {
-        cx.update_global::<SettingsStore, _>(|store, cx| {
-            store.update_user_settings(cx, |settings| {
-                settings.project.worktree.file_scan_exclusions = Some(vec![]);
-                settings.project.worktree.file_scan_inclusions = Some(vec![]);
-            });
-        });
-    });
-    cx.read(|cx| tree.read(cx).as_local().unwrap().scan_complete())
-        .await;
-    tree.flush_fs_events(cx).await;
-
-    tree.read_with(cx, |tree, _| {
-        assert!(
-            tree.entry_for_path(rel_path("node_modules"))
-                .is_some_and(|f| !f.is_always_included)
-        );
-        assert!(
-            tree.entry_for_path(rel_path("node_modules/prettier/package.json"))
-                .is_some_and(|f| !f.is_always_included)
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_file_scan_exclusions(cx: &mut TestAppContext) {
-    init_test(cx);
-    cx.executor().allow_parking();
-    let dir = TempTree::new(json!({
-        ".gitignore": "**/target\n/node_modules\n",
-        "target": {
-            "index": "blah2"
-        },
-        "node_modules": {
-            ".DS_Store": "",
-            "prettier": {
-                "package.json": "{}",
-            },
-        },
-        "src": {
-            ".DS_Store": "",
-            "foo": {
-                "foo.rs": "mod another;\n",
-                "another.rs": "// another",
-            },
-            "bar": {
-                "bar.rs": "// bar",
-            },
-            "lib.rs": "mod foo;\nmod bar;\n",
-        },
-        ".DS_Store": "",
-    }));
-    cx.update(|cx| {
-        cx.update_global::<SettingsStore, _>(|store, cx| {
-            store.update_user_settings(cx, |settings| {
-                settings.project.worktree.file_scan_exclusions =
-                    Some(vec!["**/foo/**".to_string(), "**/.DS_Store".to_string()]);
-            });
-        });
-    });
-
-    let tree = Worktree::local(
-        dir.path(),
-        true,
-        Arc::new(RealFs::new(None, cx.executor())),
-        Default::default(),
-        true,
-        &mut cx.to_async(),
-    )
-    .await
-    .unwrap();
-    cx.read(|cx| tree.read(cx).as_local().unwrap().scan_complete())
-        .await;
-    tree.flush_fs_events(cx).await;
-    tree.read_with(cx, |tree, _| {
-        check_worktree_entries(
-            tree,
-            &[
-                "src/foo/foo.rs",
-                "src/foo/another.rs",
-                "node_modules/.DS_Store",
-                "src/.DS_Store",
-                ".DS_Store",
-            ],
-            &["target", "node_modules"],
-            &["src/lib.rs", "src/bar/bar.rs", ".gitignore"],
-            &[],
-        )
-    });
-
-    cx.update(|cx| {
-        cx.update_global::<SettingsStore, _>(|store, cx| {
-            store.update_user_settings(cx, |settings| {
-                settings.project.worktree.file_scan_exclusions =
-                    Some(vec!["**/node_modules/**".to_string()]);
-            });
-        });
-    });
-    tree.flush_fs_events(cx).await;
-    cx.executor().run_until_parked();
-    tree.read_with(cx, |tree, _| {
-        check_worktree_entries(
-            tree,
-            &[
-                "node_modules/prettier/package.json",
-                "node_modules/.DS_Store",
-                "node_modules",
-            ],
-            &["target"],
-            &[
-                ".gitignore",
-                "src/lib.rs",
-                "src/bar/bar.rs",
-                "src/foo/foo.rs",
-                "src/foo/another.rs",
-                "src/.DS_Store",
-                ".DS_Store",
-            ],
-            &[],
-        )
-    });
-}
-
-#[gpui::test]
-async fn test_hidden_files(cx: &mut TestAppContext) {
-    init_test(cx);
-    cx.executor().allow_parking();
-    let dir = TempTree::new(json!({
-        ".gitignore": "**/target\n",
-        ".hidden_file": "content",
-        ".hidden_dir": {
-            "nested.rs": "code",
-        },
-        "src": {
-            "visible.rs": "code",
-        },
-        "logs": {
-            "app.log": "logs",
-            "debug.log": "logs",
-        },
-        "visible.txt": "content",
-    }));
-
-    let tree = Worktree::local(
-        dir.path(),
-        true,
-        Arc::new(RealFs::new(None, cx.executor())),
-        Default::default(),
-        true,
-        &mut cx.to_async(),
-    )
-    .await
-    .unwrap();
-    cx.read(|cx| tree.read(cx).as_local().unwrap().scan_complete())
-        .await;
-    tree.flush_fs_events(cx).await;
-
-    tree.read_with(cx, |tree, _| {
-        assert_eq!(
-            tree.entries(true, 0)
-                .map(|entry| (entry.path.as_ref(), entry.is_hidden))
-                .collect::<Vec<_>>(),
-            vec![
-                (rel_path(""), false),
-                (rel_path(".gitignore"), true),
-                (rel_path(".hidden_dir"), true),
-                (rel_path(".hidden_dir/nested.rs"), true),
-                (rel_path(".hidden_file"), true),
-                (rel_path("logs"), false),
-                (rel_path("logs/app.log"), false),
-                (rel_path("logs/debug.log"), false),
-                (rel_path("src"), false),
-                (rel_path("src/visible.rs"), false),
-                (rel_path("visible.txt"), false),
-            ]
-        );
-    });
-
-    cx.update(|cx| {
-        cx.update_global::<SettingsStore, _>(|store, cx| {
-            store.update_user_settings(cx, |settings| {
-                settings.project.worktree.hidden_files = Some(vec!["**/*.log".to_string()]);
-            });
-        });
-    });
-    tree.flush_fs_events(cx).await;
-    cx.executor().run_until_parked();
-
-    tree.read_with(cx, |tree, _| {
-        assert_eq!(
-            tree.entries(true, 0)
-                .map(|entry| (entry.path.as_ref(), entry.is_hidden))
-                .collect::<Vec<_>>(),
-            vec![
-                (rel_path(""), false),
-                (rel_path(".gitignore"), false),
-                (rel_path(".hidden_dir"), false),
-                (rel_path(".hidden_dir/nested.rs"), false),
-                (rel_path(".hidden_file"), false),
-                (rel_path("logs"), false),
-                (rel_path("logs/app.log"), true),
-                (rel_path("logs/debug.log"), true),
-                (rel_path("src"), false),
-                (rel_path("src/visible.rs"), false),
-                (rel_path("visible.txt"), false),
-            ]
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_fs_events_in_exclusions(cx: &mut TestAppContext) {
-    init_test(cx);
-    cx.executor().allow_parking();
-    let dir = TempTree::new(json!({
-        ".git": {
-            "HEAD": "ref: refs/heads/main\n",
-            "foo": "bar",
-        },
-        ".gitignore": "**/target\n/node_modules\ntest_output\n",
-        "target": {
-            "index": "blah2"
-        },
-        "node_modules": {
-            ".DS_Store": "",
-            "prettier": {
-                "package.json": "{}",
-            },
-        },
-        "src": {
-            ".DS_Store": "",
-            "foo": {
-                "foo.rs": "mod another;\n",
-                "another.rs": "// another",
-            },
-            "bar": {
-                "bar.rs": "// bar",
-            },
-            "lib.rs": "mod foo;\nmod bar;\n",
-        },
-        ".DS_Store": "",
-    }));
-    cx.update(|cx| {
-        cx.update_global::<SettingsStore, _>(|store, cx| {
-            store.update_user_settings(cx, |settings| {
-                settings.project.worktree.file_scan_exclusions = Some(vec![
-                    "**/.git".to_string(),
-                    "node_modules/".to_string(),
-                    "build_output".to_string(),
-                ]);
-            });
-        });
-    });
-
-    let tree = Worktree::local(
-        dir.path(),
-        true,
-        Arc::new(RealFs::new(None, cx.executor())),
-        Default::default(),
-        true,
-        &mut cx.to_async(),
-    )
-    .await
-    .unwrap();
-    cx.read(|cx| tree.read(cx).as_local().unwrap().scan_complete())
-        .await;
-    tree.flush_fs_events(cx).await;
-    tree.read_with(cx, |tree, _| {
-        check_worktree_entries(
-            tree,
-            &[
-                ".git/HEAD",
-                ".git/foo",
-                "node_modules",
-                "node_modules/.DS_Store",
-                "node_modules/prettier",
-                "node_modules/prettier/package.json",
-            ],
-            &["target"],
-            &[
-                ".DS_Store",
-                "src/.DS_Store",
-                "src/lib.rs",
-                "src/foo/foo.rs",
-                "src/foo/another.rs",
-                "src/bar/bar.rs",
-                ".gitignore",
-            ],
-            &[],
-        )
-    });
-
-    let new_excluded_dir = dir.path().join("build_output");
-    let new_ignored_dir = dir.path().join("test_output");
-    std::fs::create_dir_all(&new_excluded_dir)
-        .unwrap_or_else(|e| panic!("Failed to create a {new_excluded_dir:?} directory: {e}"));
-    std::fs::create_dir_all(&new_ignored_dir)
-        .unwrap_or_else(|e| panic!("Failed to create a {new_ignored_dir:?} directory: {e}"));
-    let node_modules_dir = dir.path().join("node_modules");
-    let dot_git_dir = dir.path().join(".git");
-    let src_dir = dir.path().join("src");
-    for existing_dir in [&node_modules_dir, &dot_git_dir, &src_dir] {
-        assert!(
-            existing_dir.is_dir(),
-            "Expect {existing_dir:?} to be present in the FS already"
-        );
-    }
-
-    for directory_for_new_file in [
-        new_excluded_dir,
-        new_ignored_dir,
-        node_modules_dir,
-        dot_git_dir,
-        src_dir,
-    ] {
-        std::fs::write(directory_for_new_file.join("new_file"), "new file contents")
-            .unwrap_or_else(|e| {
-                panic!("Failed to create in {directory_for_new_file:?} a new file: {e}")
-            });
-    }
-    tree.flush_fs_events(cx).await;
-
-    tree.read_with(cx, |tree, _| {
-        check_worktree_entries(
-            tree,
-            &[
-                ".git/HEAD",
-                ".git/foo",
-                ".git/new_file",
-                "node_modules",
-                "node_modules/.DS_Store",
-                "node_modules/prettier",
-                "node_modules/prettier/package.json",
-                "node_modules/new_file",
-                "build_output",
-                "build_output/new_file",
-                "test_output/new_file",
-            ],
-            &["target", "test_output"],
-            &[
-                ".DS_Store",
-                "src/.DS_Store",
-                "src/lib.rs",
-                "src/foo/foo.rs",
-                "src/foo/another.rs",
-                "src/bar/bar.rs",
-                "src/new_file",
-                ".gitignore",
-            ],
-            &[],
-        )
-    });
-}
-
-#[gpui::test]
-async fn test_fs_events_in_dot_git_worktree(cx: &mut TestAppContext) {
-    init_test(cx);
-    cx.executor().allow_parking();
-    let dir = TempTree::new(json!({
-        ".git": {
-            "HEAD": "ref: refs/heads/main\n",
-            "foo": "foo contents",
-        },
-    }));
-    let dot_git_worktree_dir = dir.path().join(".git");
-
-    let tree = Worktree::local(
-        dot_git_worktree_dir.clone(),
-        true,
-        Arc::new(RealFs::new(None, cx.executor())),
-        Default::default(),
-        true,
-        &mut cx.to_async(),
-    )
-    .await
-    .unwrap();
-    cx.read(|cx| tree.read(cx).as_local().unwrap().scan_complete())
-        .await;
-    tree.flush_fs_events(cx).await;
-    tree.read_with(cx, |tree, _| {
-        check_worktree_entries(tree, &[], &["HEAD", "foo"], &[], &[])
-    });
-
-    std::fs::write(dot_git_worktree_dir.join("new_file"), "new file contents")
-        .unwrap_or_else(|e| panic!("Failed to create in {dot_git_worktree_dir:?} a new file: {e}"));
-    tree.flush_fs_events(cx).await;
-    tree.read_with(cx, |tree, _| {
-        check_worktree_entries(tree, &[], &["HEAD", "foo", "new_file"], &[], &[])
-    });
-}
-
-#[gpui::test(iterations = 30)]
-async fn test_create_directory_during_initial_scan(cx: &mut TestAppContext) {
-    init_test(cx);
-    let fs = FakeFs::new(cx.background_executor.clone());
-    fs.insert_tree(
-        "/root",
-        json!({
-            "b": {},
-            "c": {},
-            "d": {},
-        }),
-    )
-    .await;
-
-    let tree = Worktree::local(
-        "/root".as_ref(),
-        true,
-        fs,
-        Default::default(),
-        true,
-        &mut cx.to_async(),
-    )
-    .await
-    .unwrap();
-
-    let snapshot1 = tree.update(cx, |tree, cx| {
-        let tree = tree.as_local_mut().unwrap();
-        let snapshot = Arc::new(Mutex::new(tree.snapshot()));
-        tree.observe_updates(0, cx, {
-            let snapshot = snapshot.clone();
-            let settings = tree.settings();
-            move |update| {
-                snapshot
-                    .lock()
-                    .apply_remote_update(update, &settings.file_scan_inclusions);
-                async { true }
-            }
-        });
-        snapshot
-    });
-
-    let entry = tree
-        .update(cx, |tree, cx| {
-            tree.as_local_mut()
-                .unwrap()
-                .create_entry(rel_path("a/e").into(), true, None, cx)
-        })
-        .await
-        .unwrap()
-        .into_included()
-        .unwrap();
-    assert!(entry.is_dir());
-
-    cx.executor().run_until_parked();
-    tree.read_with(cx, |tree, _| {
-        assert_eq!(
-            tree.entry_for_path(rel_path("a/e")).unwrap().kind,
-            EntryKind::Dir
-        );
-    });
-
-    let snapshot2 = tree.update(cx, |tree, _| tree.as_local().unwrap().snapshot());
-    assert_eq!(
-        snapshot1.lock().entries(true, 0).collect::<Vec<_>>(),
-        snapshot2.entries(true, 0).collect::<Vec<_>>()
-    );
-}
-
-#[gpui::test]
-async fn test_create_dir_all_on_create_entry(cx: &mut TestAppContext) {
-    init_test(cx);
-    cx.executor().allow_parking();
-
-    let fs_fake = FakeFs::new(cx.background_executor.clone());
-    fs_fake
-        .insert_tree(
-            "/root",
-            json!({
-                "a": {},
-            }),
-        )
-        .await;
-
-    let tree_fake = Worktree::local(
-        "/root".as_ref(),
-        true,
-        fs_fake,
-        Default::default(),
-        true,
-        &mut cx.to_async(),
-    )
-    .await
-    .unwrap();
-
-    let entry = tree_fake
-        .update(cx, |tree, cx| {
-            tree.as_local_mut().unwrap().create_entry(
-                rel_path("a/b/c/d.txt").into(),
-                false,
-                None,
-                cx,
-            )
-        })
-        .await
-        .unwrap()
-        .into_included()
-        .unwrap();
-    assert!(entry.is_file());
-
-    cx.executor().run_until_parked();
-    tree_fake.read_with(cx, |tree, _| {
-        assert!(
-            tree.entry_for_path(rel_path("a/b/c/d.txt"))
-                .unwrap()
-                .is_file()
-        );
-        assert!(tree.entry_for_path(rel_path("a/b/c")).unwrap().is_dir());
-        assert!(tree.entry_for_path(rel_path("a/b")).unwrap().is_dir());
-    });
-
-    let fs_real = Arc::new(RealFs::new(None, cx.executor()));
-    let temp_root = TempTree::new(json!({
-        "a": {}
-    }));
-
-    let tree_real = Worktree::local(
-        temp_root.path(),
-        true,
-        fs_real,
-        Default::default(),
-        true,
-        &mut cx.to_async(),
-    )
-    .await
-    .unwrap();
-
-    let entry = tree_real
-        .update(cx, |tree, cx| {
-            tree.as_local_mut().unwrap().create_entry(
-                rel_path("a/b/c/d.txt").into(),
-                false,
-                None,
-                cx,
-            )
-        })
-        .await
-        .unwrap()
-        .into_included()
-        .unwrap();
-    assert!(entry.is_file());
-
-    cx.executor().run_until_parked();
-    tree_real.read_with(cx, |tree, _| {
-        assert!(
-            tree.entry_for_path(rel_path("a/b/c/d.txt"))
-                .unwrap()
-                .is_file()
-        );
-        assert!(tree.entry_for_path(rel_path("a/b/c")).unwrap().is_dir());
-        assert!(tree.entry_for_path(rel_path("a/b")).unwrap().is_dir());
-    });
-
-    // Test smallest change
-    let entry = tree_real
-        .update(cx, |tree, cx| {
-            tree.as_local_mut().unwrap().create_entry(
-                rel_path("a/b/c/e.txt").into(),
-                false,
-                None,
-                cx,
-            )
-        })
-        .await
-        .unwrap()
-        .into_included()
-        .unwrap();
-    assert!(entry.is_file());
-
-    cx.executor().run_until_parked();
-    tree_real.read_with(cx, |tree, _| {
-        assert!(
-            tree.entry_for_path(rel_path("a/b/c/e.txt"))
-                .unwrap()
-                .is_file()
-        );
-    });
-
-    // Test largest change
-    let entry = tree_real
-        .update(cx, |tree, cx| {
-            tree.as_local_mut().unwrap().create_entry(
-                rel_path("d/e/f/g.txt").into(),
-                false,
-                None,
-                cx,
-            )
-        })
-        .await
-        .unwrap()
-        .into_included()
-        .unwrap();
-    assert!(entry.is_file());
-
-    cx.executor().run_until_parked();
-    tree_real.read_with(cx, |tree, _| {
-        assert!(
-            tree.entry_for_path(rel_path("d/e/f/g.txt"))
-                .unwrap()
-                .is_file()
-        );
-        assert!(tree.entry_for_path(rel_path("d/e/f")).unwrap().is_dir());
-        assert!(tree.entry_for_path(rel_path("d/e")).unwrap().is_dir());
-        assert!(tree.entry_for_path(rel_path("d")).unwrap().is_dir());
-    });
-}
-
-#[gpui::test]
-async fn test_create_file_in_expanded_gitignored_dir(cx: &mut TestAppContext) {
-    // Tests the behavior of our worktree refresh when a file in a gitignored directory
-    // is created.
-    init_test(cx);
-    let fs = FakeFs::new(cx.background_executor.clone());
-    fs.insert_tree(
-        "/root",
-        json!({
-            ".gitignore": "ignored_dir\n",
-            "ignored_dir": {
-                "existing_file.txt": "existing content",
-                "another_file.txt": "another content",
-            },
-        }),
-    )
-    .await;
-
-    let tree = Worktree::local(
-        Path::new("/root"),
-        true,
-        fs.clone(),
-        Default::default(),
-        true,
-        &mut cx.to_async(),
-    )
-    .await
-    .unwrap();
-
-    cx.read(|cx| tree.read(cx).as_local().unwrap().scan_complete())
-        .await;
-
-    tree.read_with(cx, |tree, _| {
-        let ignored_dir = tree.entry_for_path(rel_path("ignored_dir")).unwrap();
-        assert!(ignored_dir.is_ignored);
-        assert_eq!(ignored_dir.kind, EntryKind::UnloadedDir);
-    });
-
-    tree.update(cx, |tree, cx| {
-        tree.load_file(rel_path("ignored_dir/existing_file.txt"), cx)
-    })
-    .await
-    .unwrap();
-
-    tree.read_with(cx, |tree, _| {
-        let ignored_dir = tree.entry_for_path(rel_path("ignored_dir")).unwrap();
-        assert!(ignored_dir.is_ignored);
-        assert_eq!(ignored_dir.kind, EntryKind::Dir);
-
-        assert!(
-            tree.entry_for_path(rel_path("ignored_dir/existing_file.txt"))
-                .is_some()
-        );
-        assert!(
-            tree.entry_for_path(rel_path("ignored_dir/another_file.txt"))
-                .is_some()
-        );
-    });
-
-    let entry = tree
-        .update(cx, |tree, cx| {
-            tree.create_entry(rel_path("ignored_dir/new_file.txt").into(), false, None, cx)
-        })
-        .await
-        .unwrap();
-    assert!(entry.into_included().is_some());
-
-    cx.executor().run_until_parked();
-
-    tree.read_with(cx, |tree, _| {
-        let ignored_dir = tree.entry_for_path(rel_path("ignored_dir")).unwrap();
-        assert!(ignored_dir.is_ignored);
-        assert_eq!(
-            ignored_dir.kind,
-            EntryKind::Dir,
-            "ignored_dir should still be loaded, not UnloadedDir"
-        );
-
-        assert!(
-            tree.entry_for_path(rel_path("ignored_dir/existing_file.txt"))
-                .is_some(),
-            "existing_file.txt should still be visible"
-        );
-        assert!(
-            tree.entry_for_path(rel_path("ignored_dir/another_file.txt"))
-                .is_some(),
-            "another_file.txt should still be visible"
-        );
-        assert!(
-            tree.entry_for_path(rel_path("ignored_dir/new_file.txt"))
-                .is_some(),
-            "new_file.txt should be visible"
-        );
-    });
-}
-
-#[gpui::test]
-async fn test_fs_event_for_gitignored_dir_does_not_lose_contents(cx: &mut TestAppContext) {
-    // Tests the behavior of our worktree refresh when a directory modification for a gitignored directory
-    // is triggered.
-    init_test(cx);
-    let fs = FakeFs::new(cx.background_executor.clone());
-    fs.insert_tree(
-        "/root",
-        json!({
-            ".gitignore": "ignored_dir\n",
-            "ignored_dir": {
-                "file1.txt": "content1",
-                "file2.txt": "content2",
-            },
-        }),
-    )
-    .await;
-
-    let tree = Worktree::local(
-        Path::new("/root"),
-        true,
-        fs.clone(),
-        Default::default(),
-        true,
-        &mut cx.to_async(),
-    )
-    .await
-    .unwrap();
-
-    cx.read(|cx| tree.read(cx).as_local().unwrap().scan_complete())
-        .await;
-
-    // Load a file to expand the ignored directory
-    tree.update(cx, |tree, cx| {
-        tree.load_file(rel_path("ignored_dir/file1.txt"), cx)
-    })
-    .await
-    .unwrap();
-
-    tree.read_with(cx, |tree, _| {
-        let ignored_dir = tree.entry_for_path(rel_path("ignored_dir")).unwrap();
-        assert_eq!(ignored_dir.kind, EntryKind::Dir);
-        assert!(
-            tree.entry_for_path(rel_path("ignored_dir/file1.txt"))
-                .is_some()
-        );
-        assert!(
-            tree.entry_for_path(rel_path("ignored_dir/file2.txt"))
-                .is_some()
-        );
-    });
-
-    fs.emit_fs_event("/root/ignored_dir", Some(fs::PathEventKind::Changed));
-    tree.flush_fs_events(cx).await;
-
-    tree.read_with(cx, |tree, _| {
-        let ignored_dir = tree.entry_for_path(rel_path("ignored_dir")).unwrap();
-        assert_eq!(
-            ignored_dir.kind,
-            EntryKind::Dir,
-            "ignored_dir should still be loaded (Dir), not UnloadedDir"
-        );
-        assert!(
-            tree.entry_for_path(rel_path("ignored_dir/file1.txt"))
-                .is_some(),
-            "file1.txt should still be visible after directory fs event"
-        );
-        assert!(
-            tree.entry_for_path(rel_path("ignored_dir/file2.txt"))
-                .is_some(),
-            "file2.txt should still be visible after directory fs event"
-        );
-    });
-}
-
-#[gpui::test(iterations = 100)]
-async fn test_random_worktree_operations_during_initial_scan(
-    cx: &mut TestAppContext,
-    mut rng: StdRng,
-) {
-    init_test(cx);
-    let operations = env::var("OPERATIONS")
-        .map(|o| o.parse().unwrap())
-        .unwrap_or(5);
-    let initial_entries = env::var("INITIAL_ENTRIES")
-        .map(|o| o.parse().unwrap())
-        .unwrap_or(20);
-
-    let root_dir = Path::new(path!("/test"));
-    let fs = FakeFs::new(cx.background_executor.clone()) as Arc<dyn Fs>;
-    fs.as_fake().insert_tree(root_dir, json!({})).await;
-    for _ in 0..initial_entries {
-        randomly_mutate_fs(&fs, root_dir, 1.0, &mut rng).await;
-    }
-    log::info!("generated initial tree");
-
-    let worktree = Worktree::local(
-        root_dir,
-        true,
-        fs.clone(),
-        Default::default(),
-        true,
-        &mut cx.to_async(),
-    )
-    .await
-    .unwrap();
-
-    let mut snapshots = vec![worktree.read_with(cx, |tree, _| tree.as_local().unwrap().snapshot())];
-    let updates = Arc::new(Mutex::new(Vec::new()));
-    worktree.update(cx, |tree, cx| {
-        check_worktree_change_events(tree, cx);
-
-        tree.as_local_mut().unwrap().observe_updates(0, cx, {
-            let updates = updates.clone();
-            move |update| {
-                updates.lock().push(update);
-                async { true }
-            }
-        });
-    });
-
-    for _ in 0..operations {
-        worktree
-            .update(cx, |worktree, cx| {
-                randomly_mutate_worktree(worktree, &mut rng, cx)
-            })
-            .await
-            .log_err();
-        worktree.read_with(cx, |tree, _| {
-            tree.as_local().unwrap().snapshot().check_invariants(true)
-        });
-
-        if rng.random_bool(0.6) {
-            snapshots.push(worktree.read_with(cx, |tree, _| tree.as_local().unwrap().snapshot()));
-        }
-    }
-
-    worktree
-        .update(cx, |tree, _| tree.as_local_mut().unwrap().scan_complete())
-        .await;
-
-    cx.executor().run_until_parked();
-
-    let final_snapshot = worktree.read_with(cx, |tree, _| {
-        let tree = tree.as_local().unwrap();
-        let snapshot = tree.snapshot();
-        snapshot.check_invariants(true);
-        snapshot
-    });
-
-    let settings = worktree.read_with(cx, |tree, _| tree.as_local().unwrap().settings());
-
-    for (i, snapshot) in snapshots.into_iter().enumerate().rev() {
-        let mut updated_snapshot = snapshot.clone();
-        for update in updates.lock().iter() {
-            if update.scan_id >= updated_snapshot.scan_id() as u64 {
-                updated_snapshot
-                    .apply_remote_update(update.clone(), &settings.file_scan_inclusions);
-            }
-        }
-
-        assert_eq!(
-            updated_snapshot.entries(true, 0).collect::<Vec<_>>(),
-            final_snapshot.entries(true, 0).collect::<Vec<_>>(),
-            "wrong updates after snapshot {i}: {updates:#?}",
-        );
-    }
-}
-
-#[gpui::test(iterations = 100)]
-async fn test_random_worktree_changes(cx: &mut TestAppContext, mut rng: StdRng) {
-    init_test(cx);
-    let operations = env::var("OPERATIONS")
-        .map(|o| o.parse().unwrap())
-        .unwrap_or(40);
-    let initial_entries = env::var("INITIAL_ENTRIES")
-        .map(|o| o.parse().unwrap())
-        .unwrap_or(20);
-
-    let root_dir = Path::new(path!("/test"));
-    let fs = FakeFs::new(cx.background_executor.clone()) as Arc<dyn Fs>;
-    fs.as_fake().insert_tree(root_dir, json!({})).await;
-    for _ in 0..initial_entries {
-        randomly_mutate_fs(&fs, root_dir, 1.0, &mut rng).await;
-    }
-    log::info!("generated initial tree");
-
-    let worktree = Worktree::local(
-        root_dir,
-        true,
-        fs.clone(),
-        Default::default(),
-        true,
-        &mut cx.to_async(),
-    )
-    .await
-    .unwrap();
-
-    let updates = Arc::new(Mutex::new(Vec::new()));
-    worktree.update(cx, |tree, cx| {
-        check_worktree_change_events(tree, cx);
-
-        tree.as_local_mut().unwrap().observe_updates(0, cx, {
-            let updates = updates.clone();
-            move |update| {
-                updates.lock().push(update);
-                async { true }
-            }
-        });
-    });
-
-    worktree
-        .update(cx, |tree, _| tree.as_local_mut().unwrap().scan_complete())
-        .await;
-
-    fs.as_fake().pause_events();
-    let mut snapshots = Vec::new();
-    let mut mutations_len = operations;
-    while mutations_len > 1 {
-        if rng.random_bool(0.2) {
-            worktree
-                .update(cx, |worktree, cx| {
-                    randomly_mutate_worktree(worktree, &mut rng, cx)
-                })
-                .await
-                .log_err();
-        } else {
-            randomly_mutate_fs(&fs, root_dir, 1.0, &mut rng).await;
-        }
-
-        let buffered_event_count = fs.as_fake().buffered_event_count();
-        if buffered_event_count > 0 && rng.random_bool(0.3) {
-            let len = rng.random_range(0..=buffered_event_count);
-            log::info!("flushing {} events", len);
-            fs.as_fake().flush_events(len);
-        } else {
-            randomly_mutate_fs(&fs, root_dir, 0.6, &mut rng).await;
-            mutations_len -= 1;
-        }
-
-        cx.executor().run_until_parked();
-        if rng.random_bool(0.2) {
-            log::info!("storing snapshot {}", snapshots.len());
-            let snapshot = worktree.read_with(cx, |tree, _| tree.as_local().unwrap().snapshot());
-            snapshots.push(snapshot);
-        }
-    }
-
-    log::info!("quiescing");
-    fs.as_fake().flush_events(usize::MAX);
-    cx.executor().run_until_parked();
-
-    let snapshot = worktree.read_with(cx, |tree, _| tree.as_local().unwrap().snapshot());
-    snapshot.check_invariants(true);
-    let expanded_paths = snapshot
-        .expanded_entries()
-        .map(|e| e.path.clone())
-        .collect::<Vec<_>>();
-
-    {
-        let new_worktree = Worktree::local(
-            root_dir,
-            true,
-            fs.clone(),
-            Default::default(),
-            true,
-            &mut cx.to_async(),
-        )
-        .await
-        .unwrap();
-        new_worktree
-            .update(cx, |tree, _| tree.as_local_mut().unwrap().scan_complete())
-            .await;
-        new_worktree
-            .update(cx, |tree, _| {
-                tree.as_local_mut()
-                    .unwrap()
-                    .refresh_entries_for_paths(expanded_paths)
-            })
-            .recv()
-            .await;
-        let new_snapshot =
-            new_worktree.read_with(cx, |tree, _| tree.as_local().unwrap().snapshot());
-        assert_eq!(
-            snapshot.entries_without_ids(true),
-            new_snapshot.entries_without_ids(true)
-        );
-    }
-
-    let settings = worktree.read_with(cx, |tree, _| tree.as_local().unwrap().settings());
-
-    for (i, mut prev_snapshot) in snapshots.into_iter().enumerate().rev() {
-        for update in updates.lock().iter() {
-            if update.scan_id >= prev_snapshot.scan_id() as u64 {
-                prev_snapshot.apply_remote_update(update.clone(), &settings.file_scan_inclusions);
-            }
-        }
-
-        assert_eq!(
-            prev_snapshot
-                .entries(true, 0)
-                .map(ignore_pending_dir)
-                .collect::<Vec<_>>(),
-            snapshot
-                .entries(true, 0)
-                .map(ignore_pending_dir)
-                .collect::<Vec<_>>(),
-            "wrong updates after snapshot {i}: {updates:#?}",
-        );
-    }
-
-    fn ignore_pending_dir(entry: &Entry) -> Entry {
-        let mut entry = entry.clone();
-        if entry.kind.is_dir() {
-            entry.kind = EntryKind::Dir
-        }
-        entry
-    }
-}
-
-// The worktree's `UpdatedEntries` event can be used to follow along with
-// all changes to the worktree's snapshot.
-fn check_worktree_change_events(tree: &mut Worktree, cx: &mut Context<Worktree>) {
-    let mut entries = tree.entries(true, 0).cloned().collect::<Vec<_>>();
-    cx.subscribe(&cx.entity(), move |tree, _, event, _| {
-        if let Event::UpdatedEntries(changes) = event {
-            for (path, _, change_type) in changes.iter() {
-                let entry = tree.entry_for_path(path).cloned();
-                let ix = match entries.binary_search_by_key(&path, |e| &e.path) {
-                    Ok(ix) | Err(ix) => ix,
-                };
-                match change_type {
-                    PathChange::Added => entries.insert(ix, entry.unwrap()),
-                    PathChange::Removed => drop(entries.remove(ix)),
-                    PathChange::Updated => {
-                        let entry = entry.unwrap();
-                        let existing_entry = entries.get_mut(ix).unwrap();
-                        assert_eq!(existing_entry.path, entry.path);
-                        *existing_entry = entry;
-                    }
-                    PathChange::AddedOrUpdated | PathChange::Loaded => {
-                        let entry = entry.unwrap();
-                        if entries.get(ix).map(|e| &e.path) == Some(&entry.path) {
-                            *entries.get_mut(ix).unwrap() = entry;
-                        } else {
-                            entries.insert(ix, entry);
-                        }
-                    }
-                }
-            }
-
-            let new_entries = tree.entries(true, 0).cloned().collect::<Vec<_>>();
-            assert_eq!(entries, new_entries, "incorrect changes: {:?}", changes);
-        }
-    })
-    .detach();
-}
-
-fn randomly_mutate_worktree(
-    worktree: &mut Worktree,
-    rng: &mut impl Rng,
-    cx: &mut Context<Worktree>,
-) -> Task<Result<()>> {
-    log::info!("mutating worktree");
-    let worktree = worktree.as_local_mut().unwrap();
-    let snapshot = worktree.snapshot();
-    let entry = snapshot.entries(false, 0).choose(rng).unwrap();
-
-    match rng.random_range(0_u32..100) {
-        0..=33 if entry.path.as_ref() != RelPath::empty() => {
-            log::info!("deleting entry {:?} ({})", entry.path, entry.id.0);
-            worktree.delete_entry(entry.id, false, cx).unwrap()
-        }
-        _ => {
-            if entry.is_dir() {
-                let child_path = entry.path.join(rel_path(&random_filename(rng)));
-                let is_dir = rng.random_bool(0.3);
-                log::info!(
-                    "creating {} at {:?}",
-                    if is_dir { "dir" } else { "file" },
-                    child_path,
-                );
-                let task = worktree.create_entry(child_path, is_dir, None, cx);
-                cx.background_spawn(async move {
-                    task.await?;
-                    Ok(())
-                })
-            } else {
-                log::info!("overwriting file {:?} ({})", &entry.path, entry.id.0);
-                let task =
-                    worktree.write_file(entry.path.clone(), "".into(), Default::default(), cx);
-                cx.background_spawn(async move {
-                    task.await?;
-                    Ok(())
-                })
-            }
-        }
-    }
-}
-
-async fn randomly_mutate_fs(
-    fs: &Arc<dyn Fs>,
-    root_path: &Path,
-    insertion_probability: f64,
-    rng: &mut impl Rng,
-) {
-    log::info!("mutating fs");
-    let mut files = Vec::new();
-    let mut dirs = Vec::new();
-    for path in fs.as_fake().paths(false) {
-        if path.starts_with(root_path) {
-            if fs.is_file(&path).await {
-                files.push(path);
-            } else {
-                dirs.push(path);
-            }
-        }
-    }
-
-    if (files.is_empty() && dirs.len() == 1) || rng.random_bool(insertion_probability) {
-        let path = dirs.choose(rng).unwrap();
-        let new_path = path.join(random_filename(rng));
-
-        if rng.random() {
-            log::info!(
-                "creating dir {:?}",
-                new_path.strip_prefix(root_path).unwrap()
-            );
-            fs.create_dir(&new_path).await.unwrap();
-        } else {
-            log::info!(
-                "creating file {:?}",
-                new_path.strip_prefix(root_path).unwrap()
-            );
-            fs.create_file(&new_path, Default::default()).await.unwrap();
-        }
-    } else if rng.random_bool(0.05) {
-        let ignore_dir_path = dirs.choose(rng).unwrap();
-        let ignore_path = ignore_dir_path.join(GITIGNORE);
-
-        let subdirs = dirs
-            .iter()
-            .filter(|d| d.starts_with(ignore_dir_path))
-            .cloned()
-            .collect::<Vec<_>>();
-        let subfiles = files
-            .iter()
-            .filter(|d| d.starts_with(ignore_dir_path))
-            .cloned()
-            .collect::<Vec<_>>();
-        let files_to_ignore = {
-            let len = rng.random_range(0..=subfiles.len());
-            subfiles.choose_multiple(rng, len)
-        };
-        let dirs_to_ignore = {
-            let len = rng.random_range(0..subdirs.len());
-            subdirs.choose_multiple(rng, len)
-        };
-
-        let mut ignore_contents = String::new();
-        for path_to_ignore in files_to_ignore.chain(dirs_to_ignore) {
-            writeln!(
-                ignore_contents,
-                "{}",
-                path_to_ignore
-                    .strip_prefix(ignore_dir_path)
-                    .unwrap()
-                    .to_str()
-                    .unwrap()
-            )
-            .unwrap();
-        }
-        log::info!(
-            "creating gitignore {:?} with contents:\n{}",
-            ignore_path.strip_prefix(root_path).unwrap(),
-            ignore_contents
-        );
-        fs.save(
-            &ignore_path,
-            &ignore_contents.as_str().into(),
-            Default::default(),
-        )
-        .await
-        .unwrap();
-    } else {
-        let old_path = {
-            let file_path = files.choose(rng);
-            let dir_path = dirs[1..].choose(rng);
-            file_path.into_iter().chain(dir_path).choose(rng).unwrap()
-        };
-
-        let is_rename = rng.random();
-        if is_rename {
-            let new_path_parent = dirs
-                .iter()
-                .filter(|d| !d.starts_with(old_path))
-                .choose(rng)
-                .unwrap();
-
-            let overwrite_existing_dir =
-                !old_path.starts_with(new_path_parent) && rng.random_bool(0.3);
-            let new_path = if overwrite_existing_dir {
-                fs.remove_dir(
-                    new_path_parent,
-                    RemoveOptions {
-                        recursive: true,
-                        ignore_if_not_exists: true,
-                    },
-                )
-                .await
-                .unwrap();
-                new_path_parent.to_path_buf()
-            } else {
-                new_path_parent.join(random_filename(rng))
-            };
-
-            log::info!(
-                "renaming {:?} to {}{:?}",
-                old_path.strip_prefix(root_path).unwrap(),
-                if overwrite_existing_dir {
-                    "overwrite "
-                } else {
-                    ""
-                },
-                new_path.strip_prefix(root_path).unwrap()
-            );
-            fs.rename(
-                old_path,
-                &new_path,
-                fs::RenameOptions {
-                    overwrite: true,
-                    ignore_if_exists: true,
-                    create_parents: false,
-                },
-            )
-            .await
-            .unwrap();
-        } else if fs.is_file(old_path).await {
-            log::info!(
-                "deleting file {:?}",
-                old_path.strip_prefix(root_path).unwrap()
-            );
-            fs.remove_file(old_path, Default::default()).await.unwrap();
-        } else {
-            log::info!(
-                "deleting dir {:?}",
-                old_path.strip_prefix(root_path).unwrap()
-            );
-            fs.remove_dir(
-                old_path,
-                RemoveOptions {
-                    recursive: true,
-                    ignore_if_not_exists: true,
-                },
-            )
-            .await
-            .unwrap();
-        }
-    }
-}
-
-fn random_filename(rng: &mut impl Rng) -> String {
-    (0..6)
-        .map(|_| rng.sample(rand::distr::Alphanumeric))
-        .map(char::from)
-        .collect()
-}
-
-#[gpui::test]
-async fn test_private_single_file_worktree(cx: &mut TestAppContext) {
-    init_test(cx);
-    let fs = FakeFs::new(cx.background_executor.clone());
-    fs.insert_tree("/", json!({".env": "PRIVATE=secret\n"}))
-        .await;
-    let tree = Worktree::local(
-        Path::new("/.env"),
-        true,
-        fs.clone(),
-        Default::default(),
-        true,
-        &mut cx.to_async(),
-    )
-    .await
-    .unwrap();
-    cx.read(|cx| tree.read(cx).as_local().unwrap().scan_complete())
-        .await;
-    tree.read_with(cx, |tree, _| {
-        let entry = tree.entry_for_path(rel_path("")).unwrap();
-        assert!(entry.is_private);
-    });
-}
-
-#[gpui::test]
-async fn test_repository_above_root(executor: BackgroundExecutor, cx: &mut TestAppContext) {
-    init_test(cx);
-
-    let fs = FakeFs::new(executor);
-    fs.insert_tree(
-        path!("/root"),
-        json!({
-            ".git": {},
-            "subproject": {
-                "a.txt": "A"
-            }
-        }),
-    )
-    .await;
-    let worktree = Worktree::local(
-        path!("/root/subproject").as_ref(),
-        true,
-        fs.clone(),
-        Arc::default(),
-        true,
-        &mut cx.to_async(),
-    )
-    .await
-    .unwrap();
-    worktree
-        .update(cx, |worktree, _| {
-            worktree.as_local().unwrap().scan_complete()
-        })
-        .await;
-    cx.run_until_parked();
-    let repos = worktree.update(cx, |worktree, _| {
-        worktree
-            .as_local()
-            .unwrap()
-            .git_repositories
-            .values()
-            .map(|entry| entry.work_directory_abs_path.clone())
-            .collect::<Vec<_>>()
-    });
-    pretty_assertions::assert_eq!(repos, [Path::new(path!("/root")).into()]);
-
-    fs.touch_path(path!("/root/subproject")).await;
-    worktree
-        .update(cx, |worktree, _| {
-            worktree.as_local().unwrap().scan_complete()
-        })
-        .await;
-    cx.run_until_parked();
-
-    let repos = worktree.update(cx, |worktree, _| {
-        worktree
-            .as_local()
-            .unwrap()
-            .git_repositories
-            .values()
-            .map(|entry| entry.work_directory_abs_path.clone())
-            .collect::<Vec<_>>()
-    });
-    pretty_assertions::assert_eq!(repos, [Path::new(path!("/root")).into()]);
-}
-
-#[gpui::test]
-async fn test_global_gitignore(executor: BackgroundExecutor, cx: &mut TestAppContext) {
-    init_test(cx);
-
-    let home = paths::home_dir();
-    let fs = FakeFs::new(executor);
-    fs.insert_tree(
-        home,
-        json!({
-            ".config": {
-                "git": {
-                    "ignore": "foo\n/bar\nbaz\n"
-                }
-            },
-            "project": {
-                ".git": {},
-                ".gitignore": "!baz",
-                "foo": "",
-                "bar": "",
-                "sub": {
-                    "bar": "",
-                },
-                "subrepo": {
-                    ".git": {},
-                    "bar": ""
-                },
-                "baz": ""
-            }
-        }),
-    )
-    .await;
-    let worktree = Worktree::local(
-        home.join("project"),
-        true,
-        fs.clone(),
-        Arc::default(),
-        true,
-        &mut cx.to_async(),
-    )
-    .await
-    .unwrap();
-    worktree
-        .update(cx, |worktree, _| {
-            worktree.as_local().unwrap().scan_complete()
-        })
-        .await;
-    cx.run_until_parked();
-
-    // .gitignore overrides excludesFile, and anchored paths in excludesFile are resolved
-    // relative to the nearest containing repository
-    worktree.update(cx, |worktree, _cx| {
-        check_worktree_entries(
-            worktree,
-            &[],
-            &["foo", "bar", "subrepo/bar"],
-            &["sub/bar", "baz"],
-            &[],
-        );
-    });
-
-    // Ignore statuses are updated when excludesFile changes
-    fs.write(
-        &home.join(".config").join("git").join("ignore"),
-        "/bar\nbaz\n".as_bytes(),
-    )
-    .await
-    .unwrap();
-    worktree
-        .update(cx, |worktree, _| {
-            worktree.as_local().unwrap().scan_complete()
-        })
-        .await;
-    cx.run_until_parked();
-
-    worktree.update(cx, |worktree, _cx| {
-        check_worktree_entries(
-            worktree,
-            &[],
-            &["bar", "subrepo/bar"],
-            &["foo", "sub/bar", "baz"],
-            &[],
-        );
-    });
-
-    // Statuses are updated when .git added/removed
-    fs.remove_dir(
-        &home.join("project").join("subrepo").join(".git"),
-        RemoveOptions {
-            recursive: true,
-            ..Default::default()
-        },
-    )
-    .await
-    .unwrap();
-    worktree
-        .update(cx, |worktree, _| {
-            worktree.as_local().unwrap().scan_complete()
-        })
-        .await;
-    cx.run_until_parked();
-
-    worktree.update(cx, |worktree, _cx| {
-        check_worktree_entries(
-            worktree,
-            &[],
-            &["bar"],
-            &["foo", "sub/bar", "baz", "subrepo/bar"],
-            &[],
-        );
-    });
-}
-
-#[track_caller]
-fn check_worktree_entries(
-    tree: &Worktree,
-    expected_excluded_paths: &[&str],
-    expected_ignored_paths: &[&str],
-    expected_tracked_paths: &[&str],
-    expected_included_paths: &[&str],
-) {
-    for path in expected_excluded_paths {
-        let entry = tree.entry_for_path(rel_path(path));
-        assert!(
-            entry.is_none(),
-            "expected path '{path}' to be excluded, but got entry: {entry:?}",
-        );
-    }
-    for path in expected_ignored_paths {
-        let entry = tree
-            .entry_for_path(rel_path(path))
-            .unwrap_or_else(|| panic!("Missing entry for expected ignored path '{path}'"));
-        assert!(
-            entry.is_ignored,
-            "expected path '{path}' to be ignored, but got entry: {entry:?}",
-        );
-    }
-    for path in expected_tracked_paths {
-        let entry = tree
-            .entry_for_path(rel_path(path))
-            .unwrap_or_else(|| panic!("Missing entry for expected tracked path '{path}'"));
-        assert!(
-            !entry.is_ignored || entry.is_always_included,
-            "expected path '{path}' to be tracked, but got entry: {entry:?}",
-        );
-    }
-    for path in expected_included_paths {
-        let entry = tree
-            .entry_for_path(rel_path(path))
-            .unwrap_or_else(|| panic!("Missing entry for expected included path '{path}'"));
-        assert!(
-            entry.is_always_included,
-            "expected path '{path}' to always be included, but got entry: {entry:?}",
-        );
-    }
-}
-
-fn init_test(cx: &mut gpui::TestAppContext) {
-    zlog::init_test();
-
-    cx.update(|cx| {
-        let settings_store = SettingsStore::test(cx);
-        cx.set_global(settings_store);
-    });
-}
diff --git a/crates/worktree_benchmarks/Cargo.toml b/crates/worktree_benchmarks/Cargo.toml
deleted file mode 100644
index 29681573ad..0000000000
--- a/crates/worktree_benchmarks/Cargo.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-[package]
-name = "worktree_benchmarks"
-version = "0.1.0"
-publish.workspace = true
-edition.workspace = true
-
-[dependencies]
-fs.workspace = true
-gpui = { workspace = true, features = ["windows-manifest"] }
-settings.workspace = true
-worktree.workspace = true
-
-[lints]
-workspace = true
diff --git a/crates/worktree_benchmarks/LICENSE-GPL b/crates/worktree_benchmarks/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/worktree_benchmarks/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/worktree_benchmarks/src/main.rs b/crates/worktree_benchmarks/src/main.rs
deleted file mode 100644
index 00f268b75f..0000000000
--- a/crates/worktree_benchmarks/src/main.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-use std::{
-    path::Path,
-    sync::{Arc, atomic::AtomicUsize},
-};
-
-use fs::RealFs;
-use gpui::Application;
-use settings::Settings;
-use worktree::{Worktree, WorktreeSettings};
-
-fn main() {
-    let Some(worktree_root_path) = std::env::args().nth(1) else {
-        println!(
-            "Missing path to worktree root\nUsage: bench_background_scan PATH_TO_WORKTREE_ROOT"
-        );
-        return;
-    };
-    let app = Application::headless();
-
-    app.run(|cx| {
-        settings::init(cx);
-        let fs = Arc::new(RealFs::new(None, cx.background_executor().clone()));
-
-        cx.spawn(async move |cx| {
-            let worktree = Worktree::local(
-                Path::new(&worktree_root_path),
-                true,
-                fs,
-                Arc::new(AtomicUsize::new(0)),
-                cx,
-            )
-            .await
-            .expect("Worktree initialization to succeed");
-            let did_finish_scan = worktree
-                .update(cx, |this, _| this.as_local().unwrap().scan_complete())
-                .unwrap();
-            let start = std::time::Instant::now();
-            did_finish_scan.await;
-            let elapsed = start.elapsed();
-            let (files, directories) = worktree
-                .read_with(cx, |this, _| (this.file_count(), this.dir_count()))
-                .unwrap();
-            println!(
-                "{:?} for {directories} directories and {files} files",
-                elapsed
-            );
-            cx.update(|cx| {
-                cx.quit();
-            })
-        })
-        .detach();
-    })
-}
diff --git a/crates/x_ai/Cargo.toml b/crates/x_ai/Cargo.toml
deleted file mode 100644
index 8ff020df8c..0000000000
--- a/crates/x_ai/Cargo.toml
+++ /dev/null
@@ -1,22 +0,0 @@
-[package]
-name = "x_ai"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/x_ai.rs"
-
-[features]
-default = []
-schemars = ["dep:schemars"]
-
-[dependencies]
-anyhow.workspace = true
-schemars = { workspace = true, optional = true }
-serde.workspace = true
-strum.workspace = true
diff --git a/crates/x_ai/LICENSE-GPL b/crates/x_ai/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/x_ai/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/x_ai/src/x_ai.rs b/crates/x_ai/src/x_ai.rs
deleted file mode 100644
index 072a893a6a..0000000000
--- a/crates/x_ai/src/x_ai.rs
+++ /dev/null
@@ -1,208 +0,0 @@
-use anyhow::Result;
-use serde::{Deserialize, Serialize};
-use strum::EnumIter;
-
-pub const XAI_API_URL: &str = "https://api.x.ai/v1";
-
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
-#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq, EnumIter)]
-pub enum Model {
-    #[serde(rename = "grok-2-vision-latest")]
-    Grok2Vision,
-    #[default]
-    #[serde(rename = "grok-3-latest")]
-    Grok3,
-    #[serde(rename = "grok-3-mini-latest")]
-    Grok3Mini,
-    #[serde(rename = "grok-3-fast-latest")]
-    Grok3Fast,
-    #[serde(rename = "grok-3-mini-fast-latest")]
-    Grok3MiniFast,
-    #[serde(rename = "grok-4", alias = "grok-4-latest")]
-    Grok4,
-    #[serde(
-        rename = "grok-4-fast-reasoning",
-        alias = "grok-4-fast-reasoning-latest"
-    )]
-    Grok4FastReasoning,
-    #[serde(
-        rename = "grok-4-fast-non-reasoning",
-        alias = "grok-4-fast-non-reasoning-latest"
-    )]
-    Grok4FastNonReasoning,
-    #[serde(
-        rename = "grok-4-1-fast-non-reasoning",
-        alias = "grok-4-1-fast-non-reasoning-latest"
-    )]
-    Grok41FastNonReasoning,
-    #[serde(
-        rename = "grok-4-1-fast-reasoning",
-        alias = "grok-4-1-fast-reasoning-latest",
-        alias = "grok-4-1-fast"
-    )]
-    Grok41FastReasoning,
-    #[serde(rename = "grok-code-fast-1", alias = "grok-code-fast-1-0825")]
-    GrokCodeFast1,
-    #[serde(rename = "custom")]
-    Custom {
-        name: String,
-        /// The name displayed in the UI, such as in the assistant panel model dropdown menu.
-        display_name: Option<String>,
-        max_tokens: u64,
-        max_output_tokens: Option<u64>,
-        max_completion_tokens: Option<u64>,
-        supports_images: Option<bool>,
-        supports_tools: Option<bool>,
-        parallel_tool_calls: Option<bool>,
-    },
-}
-
-impl Model {
-    pub fn default_fast() -> Self {
-        Self::Grok3Fast
-    }
-
-    pub fn from_id(id: &str) -> Result<Self> {
-        match id {
-            "grok-4" => Ok(Self::Grok4),
-            "grok-4-fast-reasoning" => Ok(Self::Grok4FastReasoning),
-            "grok-4-fast-non-reasoning" => Ok(Self::Grok4FastNonReasoning),
-            "grok-4-1-fast-non-reasoning" => Ok(Self::Grok41FastNonReasoning),
-            "grok-4-1-fast-reasoning" => Ok(Self::Grok41FastReasoning),
-            "grok-4-1-fast" => Ok(Self::Grok41FastReasoning),
-            "grok-2-vision" => Ok(Self::Grok2Vision),
-            "grok-3" => Ok(Self::Grok3),
-            "grok-3-mini" => Ok(Self::Grok3Mini),
-            "grok-3-fast" => Ok(Self::Grok3Fast),
-            "grok-3-mini-fast" => Ok(Self::Grok3MiniFast),
-            "grok-code-fast-1" => Ok(Self::GrokCodeFast1),
-            _ => anyhow::bail!("invalid model id '{id}'"),
-        }
-    }
-
-    pub fn id(&self) -> &str {
-        match self {
-            Self::Grok2Vision => "grok-2-vision",
-            Self::Grok3 => "grok-3",
-            Self::Grok3Mini => "grok-3-mini",
-            Self::Grok3Fast => "grok-3-fast",
-            Self::Grok3MiniFast => "grok-3-mini-fast",
-            Self::Grok4 => "grok-4",
-            Self::Grok4FastReasoning => "grok-4-fast-reasoning",
-            Self::Grok4FastNonReasoning => "grok-4-fast-non-reasoning",
-            Self::Grok41FastNonReasoning => "grok-4-1-fast-non-reasoning",
-            Self::Grok41FastReasoning => "grok-4-1-fast-reasoning",
-            Self::GrokCodeFast1 => "grok-code-fast-1",
-            Self::Custom { name, .. } => name,
-        }
-    }
-
-    pub fn display_name(&self) -> &str {
-        match self {
-            Self::Grok2Vision => "Grok 2 Vision",
-            Self::Grok3 => "Grok 3",
-            Self::Grok3Mini => "Grok 3 Mini",
-            Self::Grok3Fast => "Grok 3 Fast",
-            Self::Grok3MiniFast => "Grok 3 Mini Fast",
-            Self::Grok4 => "Grok 4",
-            Self::Grok4FastReasoning => "Grok 4 Fast",
-            Self::Grok4FastNonReasoning => "Grok 4 Fast (Non-Reasoning)",
-            Self::Grok41FastNonReasoning => "Grok 4.1 Fast (Non-Reasoning)",
-            Self::Grok41FastReasoning => "Grok 4.1 Fast",
-            Self::GrokCodeFast1 => "Grok Code Fast 1",
-            Self::Custom {
-                name, display_name, ..
-            } => display_name.as_ref().unwrap_or(name),
-        }
-    }
-
-    pub fn max_token_count(&self) -> u64 {
-        match self {
-            Self::Grok3 | Self::Grok3Mini | Self::Grok3Fast | Self::Grok3MiniFast => 131_072,
-            Self::Grok4 | Self::GrokCodeFast1 => 256_000,
-            Self::Grok4FastReasoning
-            | Self::Grok4FastNonReasoning
-            | Self::Grok41FastNonReasoning
-            | Self::Grok41FastReasoning => 2_000_000,
-            Self::Grok2Vision => 8_192,
-            Self::Custom { max_tokens, .. } => *max_tokens,
-        }
-    }
-
-    pub fn max_output_tokens(&self) -> Option<u64> {
-        match self {
-            Self::Grok3 | Self::Grok3Mini | Self::Grok3Fast | Self::Grok3MiniFast => Some(8_192),
-            Self::Grok4
-            | Self::Grok4FastReasoning
-            | Self::Grok4FastNonReasoning
-            | Self::Grok41FastNonReasoning
-            | Self::Grok41FastReasoning
-            | Self::GrokCodeFast1 => Some(64_000),
-            Self::Grok2Vision => Some(4_096),
-            Self::Custom {
-                max_output_tokens, ..
-            } => *max_output_tokens,
-        }
-    }
-
-    pub fn supports_parallel_tool_calls(&self) -> bool {
-        match self {
-            Self::Grok2Vision
-            | Self::Grok3
-            | Self::Grok3Mini
-            | Self::Grok3Fast
-            | Self::Grok3MiniFast
-            | Self::Grok4
-            | Self::Grok4FastReasoning
-            | Self::Grok4FastNonReasoning
-            | Self::Grok41FastNonReasoning
-            | Self::Grok41FastReasoning => true,
-            Self::Custom {
-                parallel_tool_calls: Some(support),
-                ..
-            } => *support,
-            Self::GrokCodeFast1 | Model::Custom { .. } => false,
-        }
-    }
-
-    pub fn supports_prompt_cache_key(&self) -> bool {
-        false
-    }
-
-    pub fn supports_tool(&self) -> bool {
-        match self {
-            Self::Grok2Vision
-            | Self::Grok3
-            | Self::Grok3Mini
-            | Self::Grok3Fast
-            | Self::Grok3MiniFast
-            | Self::Grok4
-            | Self::Grok4FastReasoning
-            | Self::Grok4FastNonReasoning
-            | Self::Grok41FastNonReasoning
-            | Self::Grok41FastReasoning
-            | Self::GrokCodeFast1 => true,
-            Self::Custom {
-                supports_tools: Some(support),
-                ..
-            } => *support,
-            Model::Custom { .. } => false,
-        }
-    }
-
-    pub fn supports_images(&self) -> bool {
-        match self {
-            Self::Grok2Vision
-            | Self::Grok4
-            | Self::Grok4FastReasoning
-            | Self::Grok4FastNonReasoning
-            | Self::Grok41FastNonReasoning
-            | Self::Grok41FastReasoning => true,
-            Self::Custom {
-                supports_images: Some(support),
-                ..
-            } => *support,
-            _ => false,
-        }
-    }
-}
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
deleted file mode 100644
index 92a274da96..0000000000
--- a/crates/zed/Cargo.toml
+++ /dev/null
@@ -1,231 +0,0 @@
-[package]
-description = "The fast, collaborative code editor."
-edition.workspace = true
-name = "zed"
-version = "0.218.0"
-publish.workspace = true
-license = "GPL-3.0-or-later"
-authors = ["Zed Team <hi@zed.dev>"]
-
-[lints]
-workspace = true
-
-[features]
-tracy = ["ztracing/tracy"]
-
-[[bin]]
-name = "zed"
-path = "src/zed-main.rs"
-
-[lib]
-name = "zed"
-path = "src/main.rs"
-
-[dependencies]
-acp_tools.workspace = true
-activity_indicator.workspace = true
-agent_settings.workspace = true
-agent_ui.workspace = true
-anyhow.workspace = true
-askpass.workspace = true
-assets.workspace = true
-audio.workspace = true
-auto_update.workspace = true
-auto_update_ui.workspace = true
-bincode.workspace = true
-breadcrumbs.workspace = true
-call.workspace = true
-channel.workspace = true
-clap.workspace = true
-cli.workspace = true
-client.workspace = true
-codestral.workspace = true
-collab_ui.workspace = true
-collections.workspace = true
-command_palette.workspace = true
-component.workspace = true
-copilot.workspace = true
-crashes.workspace = true
-dap_adapters.workspace = true
-db.workspace = true
-debug_adapter_extension.workspace = true
-debugger_tools.workspace = true
-debugger_ui.workspace = true
-diagnostics.workspace = true
-editor.workspace = true
-env_logger.workspace = true
-extension.workspace = true
-extension_host.workspace = true
-extensions_ui.workspace = true
-feature_flags.workspace = true
-feedback.workspace = true
-file_finder.workspace = true
-fs.workspace = true
-futures.workspace = true
-git.workspace = true
-git_hosting_providers.workspace = true
-git_ui.workspace = true
-go_to_line.workspace = true
-system_specs.workspace = true
-gpui = { workspace = true, features = [
-    "wayland",
-    "x11",
-    "font-kit",
-    "windows-manifest",
-] }
-gpui_tokio.workspace = true
-rayon.workspace = true
-
-edit_prediction.workspace = true
-edit_prediction_ui.workspace = true
-http_client.workspace = true
-image_viewer.workspace = true
-inspector_ui.workspace = true
-install_cli.workspace = true
-journal.workspace = true
-json_schema_store.workspace = true
-keymap_editor.workspace = true
-language.workspace = true
-language_extension.workspace = true
-language_model.workspace = true
-language_models.workspace = true
-language_onboarding.workspace = true
-language_selector.workspace = true
-language_tools.workspace = true
-languages = { workspace = true, features = ["load-grammars"] }
-line_ending_selector.workspace = true
-log.workspace = true
-markdown.workspace = true
-markdown_preview.workspace = true
-menu.workspace = true
-migrator.workspace = true
-miniprofiler_ui.workspace = true
-mimalloc = { version = "0.1", optional = true }
-nc.workspace = true
-node_runtime.workspace = true
-notifications.workspace = true
-onboarding.workspace = true
-outline.workspace = true
-outline_panel.workspace = true
-parking_lot.workspace = true
-paths.workspace = true
-picker.workspace = true
-profiling.workspace = true
-project.workspace = true
-project_panel.workspace = true
-project_symbols.workspace = true
-prompt_store.workspace = true
-proto.workspace = true
-recent_projects.workspace = true
-release_channel.workspace = true
-remote.workspace = true
-repl.workspace = true
-reqwest.workspace = true
-reqwest_client.workspace = true
-rope.workspace = true
-search.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-session.workspace = true
-settings.workspace = true
-settings_profile_selector.workspace = true
-settings_ui.workspace = true
-shellexpand.workspace = true
-smol.workspace = true
-snippet_provider.workspace = true
-snippets_ui.workspace = true
-supermaven.workspace = true
-svg_preview.workspace = true
-sysinfo.workspace = true
-tab_switcher.workspace = true
-task.workspace = true
-tasks_ui.workspace = true
-telemetry.workspace = true
-terminal_view.workspace = true
-theme.workspace = true
-theme_extension.workspace = true
-theme_selector.workspace = true
-time.workspace = true
-title_bar.workspace = true
-ztracing.workspace = true
-tracing.workspace = true
-toolchain_selector.workspace = true
-ui.workspace = true
-ui_input.workspace = true
-ui_prompt.workspace = true
-url.workspace = true
-urlencoding.workspace = true
-util.workspace = true
-uuid.workspace = true
-vim.workspace = true
-vim_mode_setting.workspace = true
-watch.workspace = true
-web_search.workspace = true
-web_search_providers.workspace = true
-workspace.workspace = true
-zed_actions.workspace = true
-zed_env_vars.workspace = true
-zlog.workspace = true
-zlog_settings.workspace = true
-chrono.workspace = true
-
-[target.'cfg(target_os = "windows")'.dependencies]
-windows.workspace = true
-chrono.workspace = true
-
-[target.'cfg(target_os = "windows")'.build-dependencies]
-winresource = "0.1"
-
-[target.'cfg(any(target_os = "linux", target_os = "freebsd"))'.dependencies]
-ashpd.workspace = true
-
-[dev-dependencies]
-call = { workspace = true, features = ["test-support"] }
-dap = { workspace = true, features = ["test-support"] }
-editor = { workspace = true, features = ["test-support"] }
-gpui = { workspace = true, features = ["test-support"] }
-image_viewer = { workspace = true, features = ["test-support"] }
-itertools.workspace = true
-language = { workspace = true, features = ["test-support"] }
-pretty_assertions.workspace = true
-project = { workspace = true, features = ["test-support"] }
-semver.workspace = true
-terminal_view = { workspace = true, features = ["test-support"] }
-tree-sitter-md.workspace = true
-tree-sitter-rust.workspace = true
-workspace = { workspace = true, features = ["test-support"] }
-
-[package.metadata.bundle-dev]
-icon = ["resources/app-icon-dev@2x.png", "resources/app-icon-dev.png"]
-identifier = "dev.zed.Zed-Dev"
-name = "Zed Dev"
-osx_minimum_system_version = "10.15.7"
-osx_info_plist_exts = ["resources/info/*"]
-osx_url_schemes = ["zed"]
-
-[package.metadata.bundle-nightly]
-icon = ["resources/app-icon-nightly@2x.png", "resources/app-icon-nightly.png"]
-identifier = "dev.zed.Zed-Nightly"
-name = "Zed Nightly"
-osx_minimum_system_version = "10.15.7"
-osx_info_plist_exts = ["resources/info/*"]
-osx_url_schemes = ["zed"]
-
-[package.metadata.bundle-preview]
-icon = ["resources/app-icon-preview@2x.png", "resources/app-icon-preview.png"]
-identifier = "dev.zed.Zed-Preview"
-name = "Zed Preview"
-osx_minimum_system_version = "10.15.7"
-osx_info_plist_exts = ["resources/info/*"]
-osx_url_schemes = ["zed"]
-
-[package.metadata.bundle-stable]
-icon = ["resources/app-icon@2x.png", "resources/app-icon.png"]
-identifier = "dev.zed.Zed"
-name = "Zed"
-osx_minimum_system_version = "10.15.7"
-osx_info_plist_exts = ["resources/info/*"]
-osx_url_schemes = ["zed"]
-
-[package.metadata.cargo-machete]
-ignored = ["profiling", "zstd", "tracing"]
diff --git a/crates/zed/LICENSE-GPL b/crates/zed/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/zed/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/zed/RELEASE_CHANNEL b/crates/zed/RELEASE_CHANNEL
deleted file mode 100644
index 38f8e886e1..0000000000
--- a/crates/zed/RELEASE_CHANNEL
+++ /dev/null
@@ -1 +0,0 @@
-dev
diff --git a/crates/zed/build.rs b/crates/zed/build.rs
deleted file mode 100644
index dd26a1152e..0000000000
--- a/crates/zed/build.rs
+++ /dev/null
@@ -1,105 +0,0 @@
-#![allow(clippy::disallowed_methods, reason = "build scripts are exempt")]
-use std::process::Command;
-
-fn main() {
-    if cfg!(target_os = "macos") {
-        println!("cargo:rustc-env=MACOSX_DEPLOYMENT_TARGET=10.15.7");
-
-        // Weakly link ReplayKit to ensure Zed can be used on macOS 10.15+.
-        println!("cargo:rustc-link-arg=-Wl,-weak_framework,ReplayKit");
-
-        // Seems to be required to enable Swift concurrency
-        println!("cargo:rustc-link-arg=-Wl,-rpath,/usr/lib/swift");
-
-        // Register exported Objective-C selectors, protocols, etc
-        println!("cargo:rustc-link-arg=-Wl,-ObjC");
-
-        // weak link to support Catalina
-        println!("cargo:rustc-link-arg=-Wl,-weak_framework,ScreenCaptureKit");
-    }
-
-    // Populate git sha environment variable if git is available
-    println!("cargo:rerun-if-changed=../../.git/logs/HEAD");
-    println!(
-        "cargo:rustc-env=TARGET={}",
-        std::env::var("TARGET").unwrap()
-    );
-    if let Ok(output) = Command::new("git").args(["rev-parse", "HEAD"]).output()
-        && output.status.success()
-    {
-        let git_sha = String::from_utf8_lossy(&output.stdout);
-        let git_sha = git_sha.trim();
-
-        println!("cargo:rustc-env=ZED_COMMIT_SHA={git_sha}");
-
-        if let Some(build_identifier) = option_env!("GITHUB_RUN_NUMBER") {
-            println!("cargo:rustc-env=ZED_BUILD_ID={build_identifier}");
-        }
-
-        if let Ok(build_profile) = std::env::var("PROFILE")
-            && build_profile == "release"
-        {
-            // This is currently the best way to make `cargo build ...`'s build script
-            // to print something to stdout without extra verbosity.
-            println!("cargo::warning=Info: using '{git_sha}' hash for ZED_COMMIT_SHA env var");
-        }
-    }
-
-    #[cfg(target_os = "windows")]
-    {
-        #[cfg(target_env = "msvc")]
-        {
-            // todo(windows): This is to avoid stack overflow. Remove it when solved.
-            println!("cargo:rustc-link-arg=/stack:{}", 8 * 1024 * 1024);
-        }
-
-        if cfg!(target_arch = "x86_64") {
-            println!("cargo::rerun-if-changed=resources\\windows\\bin\\x64\\conpty.dll");
-            println!("cargo::rerun-if-changed=resources\\windows\\bin\\x64\\OpenConsole.exe");
-            let conpty_target = std::env::var("OUT_DIR").unwrap() + "\\..\\..\\..\\conpty.dll";
-            match std::fs::copy("resources/windows/bin/x64/conpty.dll", &conpty_target) {
-                Ok(_) => println!("Copied conpty.dll to {conpty_target}"),
-                Err(e) => println!("cargo::warning=Failed to copy conpty.dll: {}", e),
-            }
-            let open_console_target =
-                std::env::var("OUT_DIR").unwrap() + "\\..\\..\\..\\OpenConsole.exe";
-            match std::fs::copy(
-                "resources/windows/bin/x64/OpenConsole.exe",
-                &open_console_target,
-            ) {
-                Ok(_) => println!("Copied OpenConsole.exe to {open_console_target}"),
-                Err(e) => println!("cargo::warning=Failed to copy OpenConsole.exe: {}", e),
-            }
-        }
-
-        let release_channel = option_env!("RELEASE_CHANNEL").unwrap_or("dev");
-        let icon = match release_channel {
-            "stable" => "resources/windows/app-icon.ico",
-            "preview" => "resources/windows/app-icon-preview.ico",
-            "nightly" => "resources/windows/app-icon-nightly.ico",
-            "dev" => "resources/windows/app-icon-dev.ico",
-            _ => "resources/windows/app-icon-dev.ico",
-        };
-        let icon = std::path::Path::new(icon);
-
-        println!("cargo:rerun-if-env-changed=RELEASE_CHANNEL");
-        println!("cargo:rerun-if-changed={}", icon.display());
-
-        let mut res = winresource::WindowsResource::new();
-
-        // Depending on the security applied to the computer, winresource might fail
-        // fetching the RC path. Therefore, we add a way to explicitly specify the
-        // toolkit path, allowing winresource to use a valid RC path.
-        if let Some(explicit_rc_toolkit_path) = std::env::var("ZED_RC_TOOLKIT_PATH").ok() {
-            res.set_toolkit_path(explicit_rc_toolkit_path.as_str());
-        }
-        res.set_icon(icon.to_str().unwrap());
-        res.set("FileDescription", "Zed");
-        res.set("ProductName", "Zed");
-
-        if let Err(e) = res.compile() {
-            eprintln!("{}", e);
-            std::process::exit(1);
-        }
-    }
-}
diff --git a/crates/zed/contents/dev/embedded.provisionprofile b/crates/zed/contents/dev/embedded.provisionprofile
deleted file mode 100644
index 8979e1fb9f..0000000000
Binary files a/crates/zed/contents/dev/embedded.provisionprofile and /dev/null differ
diff --git a/crates/zed/contents/nightly/embedded.provisionprofile b/crates/zed/contents/nightly/embedded.provisionprofile
deleted file mode 100644
index 8979e1fb9f..0000000000
Binary files a/crates/zed/contents/nightly/embedded.provisionprofile and /dev/null differ
diff --git a/crates/zed/contents/preview/embedded.provisionprofile b/crates/zed/contents/preview/embedded.provisionprofile
deleted file mode 100644
index 6eea317c37..0000000000
Binary files a/crates/zed/contents/preview/embedded.provisionprofile and /dev/null differ
diff --git a/crates/zed/contents/stable/embedded.provisionprofile b/crates/zed/contents/stable/embedded.provisionprofile
deleted file mode 100644
index 0b2abe1838..0000000000
Binary files a/crates/zed/contents/stable/embedded.provisionprofile and /dev/null differ
diff --git a/crates/zed/resources/app-icon-dev.png b/crates/zed/resources/app-icon-dev.png
deleted file mode 100644
index cbe2ac3ef7..0000000000
Binary files a/crates/zed/resources/app-icon-dev.png and /dev/null differ
diff --git a/crates/zed/resources/app-icon-dev@2x.png b/crates/zed/resources/app-icon-dev@2x.png
deleted file mode 100644
index 8ab9979698..0000000000
Binary files a/crates/zed/resources/app-icon-dev@2x.png and /dev/null differ
diff --git a/crates/zed/resources/app-icon-nightly.png b/crates/zed/resources/app-icon-nightly.png
deleted file mode 100644
index 776cd06b1b..0000000000
Binary files a/crates/zed/resources/app-icon-nightly.png and /dev/null differ
diff --git a/crates/zed/resources/app-icon-nightly@2x.png b/crates/zed/resources/app-icon-nightly@2x.png
deleted file mode 100644
index 6d781594ac..0000000000
Binary files a/crates/zed/resources/app-icon-nightly@2x.png and /dev/null differ
diff --git a/crates/zed/resources/app-icon-preview.png b/crates/zed/resources/app-icon-preview.png
deleted file mode 100644
index b76e578858..0000000000
Binary files a/crates/zed/resources/app-icon-preview.png and /dev/null differ
diff --git a/crates/zed/resources/app-icon-preview@2x.png b/crates/zed/resources/app-icon-preview@2x.png
deleted file mode 100644
index 6e08503927..0000000000
Binary files a/crates/zed/resources/app-icon-preview@2x.png and /dev/null differ
diff --git a/crates/zed/resources/app-icon.png b/crates/zed/resources/app-icon.png
deleted file mode 100644
index 08b6d8afa0..0000000000
Binary files a/crates/zed/resources/app-icon.png and /dev/null differ
diff --git a/crates/zed/resources/app-icon@2x.png b/crates/zed/resources/app-icon@2x.png
deleted file mode 100644
index 5bb5754bc1..0000000000
Binary files a/crates/zed/resources/app-icon@2x.png and /dev/null differ
diff --git a/crates/zed/resources/flatpak/manifest-template.json b/crates/zed/resources/flatpak/manifest-template.json
deleted file mode 100644
index 0a14a1c2b0..0000000000
--- a/crates/zed/resources/flatpak/manifest-template.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "id": "$APP_ID",
-  "runtime": "org.freedesktop.Platform",
-  "runtime-version": "23.08",
-  "sdk": "org.freedesktop.Sdk",
-  "sdk-extensions": [
-    "org.freedesktop.Sdk.Extension.rust-stable"
-  ],
-  "command": "zed",
-  "finish-args": [
-    "--talk-name=org.freedesktop.Flatpak",
-    "--device=dri",
-    "--share=ipc",
-    "--share=network",
-    "--socket=wayland",
-    "--socket=fallback-x11",
-    "--socket=pulseaudio",
-    "--filesystem=host"
-  ],
-  "build-options": {
-    "append-path": "/usr/lib/sdk/rust-stable/bin"
-  },
-  "modules": [
-    {
-      "name": "zed",
-      "buildsystem": "simple",
-      "build-options": {
-        "env": {
-          "APP_ID": "$APP_ID",
-          "APP_ICON": "$APP_ID",
-          "APP_NAME": "$APP_NAME",
-          "BRANDING_LIGHT": "$BRANDING_LIGHT",
-          "BRANDING_DARK": "$BRANDING_DARK",
-          "APP_CLI": "zed",
-          "APP_ARGS": "--foreground %U",
-          "DO_STARTUP_NOTIFY": "false"
-        }
-      },
-      "build-commands": [
-        "install -Dm644 $ICON_FILE.png /app/share/icons/hicolor/512x512/apps/$APP_ID.png",
-        "envsubst < zed.desktop.in > zed.desktop && install -Dm755 zed.desktop /app/share/applications/$APP_ID.desktop",
-        "envsubst < flatpak/zed.metainfo.xml.in > zed.metainfo.xml && install -Dm644 zed.metainfo.xml /app/share/metainfo/$APP_ID.metainfo.xml",
-        "sed -i -e '/@release_info@/{r flatpak/release-info/$CHANNEL' -e 'd}' /app/share/metainfo/$APP_ID.metainfo.xml",
-        "install -Dm755 bin/zed /app/bin/zed",
-        "install -Dm755 libexec/zed-editor /app/libexec/zed-editor",
-        "install -Dm755 lib/* -t /app/lib"
-      ],
-      "sources": [
-        {
-          "type": "archive",
-          "path": "./target/release/$ARCHIVE"
-        },
-        {
-          "type": "dir",
-          "path": "./crates/zed/resources"
-        }
-      ]
-    }
-  ]
-}
diff --git a/crates/zed/resources/flatpak/release-info/dev b/crates/zed/resources/flatpak/release-info/dev
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/crates/zed/resources/flatpak/release-info/nightly b/crates/zed/resources/flatpak/release-info/nightly
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/crates/zed/resources/flatpak/release-info/preview b/crates/zed/resources/flatpak/release-info/preview
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/crates/zed/resources/flatpak/release-info/stable b/crates/zed/resources/flatpak/release-info/stable
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/crates/zed/resources/flatpak/zed.metainfo.xml.in b/crates/zed/resources/flatpak/zed.metainfo.xml.in
deleted file mode 100644
index b8a88d9221..0000000000
--- a/crates/zed/resources/flatpak/zed.metainfo.xml.in
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop-application">
-    <id>$APP_ID</id>
-    <metadata_license>MIT</metadata_license>
-    <project_license>AGPL-3.0-or-later and Apache-2.0 and GPL-3.0-or-later</project_license>
-
-    <name>$APP_NAME</name>
-    <summary>High-performance, multiplayer code editor</summary>
-    <developer id="dev.zed">
-        <name translate="no">Zed Industries, Inc.</name>
-    </developer>
-    <description>
-        <p>
-            Productive coding starts with a tool that stays out of your way. Zed blends the power of an IDE with the speed of a lightweight editor for productivity you can feel under your fingertips.
-        </p>
-        <p>Features:</p>
-        <ul>
-            <li>Performance: Efficiently uses every CPU core and your GPU for instant startup, quick file loading, and responsive keystrokes.</li>
-            <li>Language-aware: Maintains a syntax tree for precise highlighting, and auto-indent, with LSP support for autocompletion and refactoring.</li>
-            <li>Collaboration: Real-time editing and navigation for multiple developers in a shared workspace.</li>
-            <li>AI Integration: Integrates GitHub Copilot and GPT-4 for natural language code generation.</li>
-        </ul>
-    </description>
-
-    <launchable type="desktop-id">$APP_ID.desktop</launchable>
-
-    <branding>
-        <color type="primary" scheme_preference="light">$BRANDING_LIGHT</color>
-        <color type="primary" scheme_preference="dark">$BRANDING_DARK</color>
-    </branding>
-
-    <content_rating type="oars-1.1">
-        <content_attribute id="social-chat">intense</content_attribute>
-        <content_attribute id="social-audio">intense</content_attribute>
-    </content_rating>
-
-    <url type="homepage">https://zed.dev</url>
-    <url type="bugtracker">https://github.com/zed-industries/zed/issues</url>
-    <url type="faq">https://zed.dev/faq</url>
-    <url type="help">https://zed.dev/docs/getting-started</url>
-    <url type="contact">https://zed.dev/community-links</url>
-    <url type="vcs-browser">https://github.com/zed-industries/zed</url>
-    <url type="contribute">https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md</url>
-
-    <supports>
-        <internet>offline-only</internet>
-    </supports>
-    <recommends>
-        <control>pointing</control>
-        <control>keyboard</control>
-        <display_length compare="ge">768</display_length>
-    </recommends>
-
-    <screenshots>
-        <screenshot type="default">
-            <caption>Zed with a large project open, showing language server and gitblame support</caption>
-            <image>https://zed.dev/img/flatpak/flatpak-1.png</image>
-        </screenshot>
-        <screenshot>
-            <caption>Zed with a file open and a channel message thread in the right sidebar</caption>
-            <image>https://zed.dev/img/flatpak/flatpak-2.png</image>
-        </screenshot>
-        <screenshot>
-            <caption>Example of a channel's shared document</caption>
-            <image>https://zed.dev/img/flatpak/flatpak-3.png</image>
-        </screenshot>
-        <screenshot>
-            <caption>Zed's extension list</caption>
-            <image>https://zed.dev/img/flatpak/flatpak-4.png</image>
-        </screenshot>
-        <screenshot>
-            <caption>Theme switcher UI and example theme</caption>
-            <image>https://zed.dev/img/flatpak/flatpak-5.png</image>
-        </screenshot>
-    </screenshots>
-
-    <releases>
-		@release_info@
-		<release version="0.0.0" date="1970-01-01">
-			<description>
-				<p>Dummy release to keep flatpak-builder AppStream metadata validation from complaining</p>
-			</description>
-		</release>
-    </releases>
-</component>
diff --git a/crates/zed/resources/info/DocumentTypes.plist b/crates/zed/resources/info/DocumentTypes.plist
deleted file mode 100644
index 0a509d9ddc..0000000000
--- a/crates/zed/resources/info/DocumentTypes.plist
+++ /dev/null
@@ -1,63 +0,0 @@
-<key>CFBundleDocumentTypes</key>
-<array>
-    <dict>
-        <key>CFBundleTypeIconFile</key>
-        <string>Document</string>
-        <key>CFBundleTypeRole</key>
-        <string>Editor</string>
-        <key>LSHandlerRank</key>
-        <string>Alternate</string>
-        <key>LSItemContentTypes</key>
-        <array>
-            <string>public.folder</string>
-            <string>public.plain-text</string>
-            <string>public.text</string>
-            <string>public.utf8-plain-text</string>
-        </array>
-    </dict>
-    <dict>
-        <key>CFBundleTypeIconFile</key>
-        <string>Document</string>
-        <key>CFBundleTypeName</key>
-        <string>Zed Text Document</string>
-        <key>CFBundleTypeRole</key>
-        <string>Editor</string>
-        <key>CFBundleTypeOSTypes</key>
-        <array>
-            <string>****</string>
-        </array>
-        <key>LSHandlerRank</key>
-        <string>Default</string>
-        <key>CFBundleTypeExtensions</key>
-        <array>
-            <string>Gemfile</string>
-            <string>c</string>
-            <string>c++</string>
-            <string>cc</string>
-            <string>cpp</string>
-            <string>css</string>
-            <string>erb</string>
-            <string>ex</string>
-            <string>exs</string>
-            <string>go</string>
-            <string>h</string>
-            <string>h++</string>
-            <string>hh</string>
-            <string>hpp</string>
-            <string>html</string>
-            <string>js</string>
-            <string>json</string>
-            <string>jsx</string>
-            <string>md</string>
-            <string>py</string>
-            <string>rb</string>
-            <string>rkt</string>
-            <string>rs</string>
-            <string>scm</string>
-            <string>toml</string>
-            <string>ts</string>
-            <string>tsx</string>
-            <string>txt</string>
-        </array>
-    </dict>
-</array>
diff --git a/crates/zed/resources/info/Permissions.plist b/crates/zed/resources/info/Permissions.plist
deleted file mode 100644
index bded5a82e2..0000000000
--- a/crates/zed/resources/info/Permissions.plist
+++ /dev/null
@@ -1,24 +0,0 @@
-<key>NSSystemAdministrationUsageDescription</key>
-<string>The operation being performed by a program in Zed requires elevated permission.</string>
-<key>NSAppleEventsUsageDescription</key>
-<string>An application in Zed wants to use AppleScript.</string>
-<key>NSBluetoothAlwaysUsageDescription</key>
-<string>An application in Zed wants to use Bluetooth.</string>
-<key>NSCalendarsUsageDescription</key>
-<string>An application in Zed wants to use Calendar data.</string>
-<key>NSCameraUsageDescription</key>
-<string>An application in Zed wants to use the camera.</string>
-<key>NSContactsUsageDescription</key>
-<string>An application in Zed wants to use your contacts.</string>
-<key>NSLocationAlwaysUsageDescription</key>
-<string>An application in Zed wants to use your location information, even in the background.</string>
-<key>NSLocationUsageDescription</key>
-<string>An application in Zed wants to use your location information.</string>
-<key>NSLocationWhenInUseUsageDescription</key>
-<string>An application in Zed wants to use your location information while active.</string>
-<key>NSMicrophoneUsageDescription</key>
-<string>An application in Zed wants to use your microphone.</string>
-<key>NSSpeechRecognitionUsageDescription</key>
-<string>An application in Zed wants to use speech recognition.</string>
-<key>NSRemindersUsageDescription</key>
-<string>An application in Zed wants to use your reminders.</string>
diff --git a/crates/zed/resources/info/SupportedPlatforms.plist b/crates/zed/resources/info/SupportedPlatforms.plist
deleted file mode 100644
index fd2a4101d8..0000000000
--- a/crates/zed/resources/info/SupportedPlatforms.plist
+++ /dev/null
@@ -1,4 +0,0 @@
-<key>CFBundleSupportedPlatforms</key>
-<array>
-    <string>MacOSX</string>
-</array>
diff --git a/crates/zed/resources/snap/snapcraft.yaml.in b/crates/zed/resources/snap/snapcraft.yaml.in
deleted file mode 100644
index 4c94a9fd03..0000000000
--- a/crates/zed/resources/snap/snapcraft.yaml.in
+++ /dev/null
@@ -1,59 +0,0 @@
-name: zed
-title: Zed
-base: core24
-version: "$RELEASE_VERSION"
-summary: The editor for what's next
-description: |
-  Zed is a modern open-source code editor, built from the ground up in Rust with
-  a GPU-accelerated renderer. We help you build software faster than ever before.
-grade: stable
-confinement: classic
-compression: lzo
-website: https://zed.dev/
-source-code: https://github.com/zed-industries/zed
-issues: https://github.com/zed-industries/zed/issues
-contact: https://zed.dev/community-links#support-and-feedback
-
-parts:
-  zed:
-    plugin: dump
-    source: "https://github.com/zed-industries/zed/releases/download/v$RELEASE_VERSION/zed-linux-x86_64.tar.gz"
-
-    organize:
-      # These renames seem to not be necessary, but it's tidier.
-      bin: usr/bin
-      libexec: usr/libexec
-
-    stage-packages:
-      - libasound2t64
-      # snapcraft has a lint that this is unused, but without it Zed exits with
-      # "Missing Vulkan entry points: LibraryLoadFailure" in blade_graphics.
-      - libvulkan1
-      # snapcraft has a lint that this is unused, but without it Zed exits with
-      # "NoWaylandLib" when run with Wayland.
-      - libwayland-client0
-      - libxcb1
-      - libxkbcommon-x11-0
-      - libxkbcommon0
-
-    build-attributes:
-      - enable-patchelf
-
-    prime:
-      # Omit unneeded files from the tarball
-      - -lib
-      - -licenses.md
-      - -share
-
-      # Omit unneeded files from stage-packages
-      - -etc
-      - -usr/share/doc
-      - -usr/share/lintian
-      - -usr/share/man
-
-apps:
-  zed:
-    command: usr/bin/zed
-    common-id: dev.zed.Zed
-    environment:
-      ZED_BUNDLE_TYPE: snap
diff --git a/crates/zed/resources/windows/app-icon-dev.ico b/crates/zed/resources/windows/app-icon-dev.ico
deleted file mode 100644
index 1d6367b788..0000000000
Binary files a/crates/zed/resources/windows/app-icon-dev.ico and /dev/null differ
diff --git a/crates/zed/resources/windows/app-icon-nightly.ico b/crates/zed/resources/windows/app-icon-nightly.ico
deleted file mode 100644
index 875c0d7b35..0000000000
Binary files a/crates/zed/resources/windows/app-icon-nightly.ico and /dev/null differ
diff --git a/crates/zed/resources/windows/app-icon-preview.ico b/crates/zed/resources/windows/app-icon-preview.ico
deleted file mode 100644
index 5c8601d314..0000000000
Binary files a/crates/zed/resources/windows/app-icon-preview.ico and /dev/null differ
diff --git a/crates/zed/resources/windows/app-icon.ico b/crates/zed/resources/windows/app-icon.ico
deleted file mode 100644
index 9c5761b9e9..0000000000
Binary files a/crates/zed/resources/windows/app-icon.ico and /dev/null differ
diff --git a/crates/zed/resources/windows/bin/x64/OpenConsole.exe b/crates/zed/resources/windows/bin/x64/OpenConsole.exe
deleted file mode 100644
index 8bb6ab2188..0000000000
Binary files a/crates/zed/resources/windows/bin/x64/OpenConsole.exe and /dev/null differ
diff --git a/crates/zed/resources/windows/bin/x64/conpty.dll b/crates/zed/resources/windows/bin/x64/conpty.dll
deleted file mode 100644
index 555d6bf655..0000000000
Binary files a/crates/zed/resources/windows/bin/x64/conpty.dll and /dev/null differ
diff --git a/crates/zed/resources/windows/messages/Default.zh-cn.isl b/crates/zed/resources/windows/messages/Default.zh-cn.isl
deleted file mode 100644
index d900c7d448..0000000000
--- a/crates/zed/resources/windows/messages/Default.zh-cn.isl
+++ /dev/null
@@ -1,403 +0,0 @@
-; *** Inno Setup version 6.4.0+ Chinese Simplified messages ***
-;
-; To download user-contributed translations of this file, go to:
-;   https://jrsoftware.org/files/istrans/
-;
-; Note: When translating this text, do not add periods (.) to the end of
-; messages that didn't have them already, because on those messages Inno
-; Setup adds the periods automatically (appending a period would result in
-; two periods being displayed).
-;
-; Maintained by Zhenghan Yang
-; Email: 847320916@QQ.com
-; Translation based on network resource
-; The latest Translation is on https://github.com/kira-96/Inno-Setup-Chinese-Simplified-Translation
-;
-
-[LangOptions]
-; The following three entries are very important. Be sure to read and 
-; understand the '[LangOptions] section' topic in the help file.
-LanguageName=简体中文
-; If Language Name display incorrect, uncomment next line
-; LanguageName=<7B80><4F53><4E2D><6587>
-; About LanguageID, to reference link:
-; https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-lcid/a9eac961-e77d-41a6-90a5-ce1a8b0cdb9c
-LanguageID=$0804
-; About CodePage, to reference link:
-; https://docs.microsoft.com/en-us/windows/win32/intl/code-page-identifiers
-LanguageCodePage=936
-; If the language you are translating to requires special font faces or
-; sizes, uncomment any of the following entries and change them accordingly.
-;DialogFontName=
-;DialogFontSize=8
-;WelcomeFontName=Verdana
-;WelcomeFontSize=12
-;TitleFontName=Arial
-;TitleFontSize=29
-;CopyrightFontName=Arial
-;CopyrightFontSize=8
-
-[Messages]
-
-; *** 应用程序标题
-SetupAppTitle=安装
-SetupWindowTitle=安装 - %1
-UninstallAppTitle=卸载
-UninstallAppFullTitle=%1 卸载
-
-; *** Misc. common
-InformationTitle=信息
-ConfirmTitle=确认
-ErrorTitle=错误
-
-; *** SetupLdr messages
-SetupLdrStartupMessage=现在将安装 %1。您想要继续吗？
-LdrCannotCreateTemp=无法创建临时文件。安装程序已中止
-LdrCannotExecTemp=无法执行临时目录中的文件。安装程序已中止
-HelpTextNote=
-
-; *** 启动错误消息
-LastErrorMessage=%1。%n%n错误 %2: %3
-SetupFileMissing=安装目录中缺少文件 %1。请修正这个问题或者获取程序的新副本。
-SetupFileCorrupt=安装文件已损坏。请获取程序的新副本。
-SetupFileCorruptOrWrongVer=安装文件已损坏，或是与这个安装程序的版本不兼容。请修正这个问题或获取新的程序副本。
-InvalidParameter=无效的命令行参数：%n%n%1
-SetupAlreadyRunning=安装程序正在运行。
-WindowsVersionNotSupported=此程序不支持当前计算机运行的 Windows 版本。
-WindowsServicePackRequired=此程序需要 %1 服务包 %2 或更高版本。
-NotOnThisPlatform=此程序不能在 %1 上运行。
-OnlyOnThisPlatform=此程序只能在 %1 上运行。
-OnlyOnTheseArchitectures=此程序只能安装到为下列处理器架构设计的 Windows 版本中：%n%n%1
-WinVersionTooLowError=此程序需要 %1 版本 %2 或更高。
-WinVersionTooHighError=此程序不能安装于 %1 版本 %2 或更高。
-AdminPrivilegesRequired=在安装此程序时您必须以管理员身份登录。
-PowerUserPrivilegesRequired=在安装此程序时您必须以管理员身份或有权限的用户组身份登录。
-SetupAppRunningError=安装程序发现 %1 当前正在运行。%n%n请先关闭正在运行的程序，然后点击“确定”继续，或点击“取消”退出。
-UninstallAppRunningError=卸载程序发现 %1 当前正在运行。%n%n请先关闭正在运行的程序，然后点击“确定”继续，或点击“取消”退出。
-
-; *** 启动问题
-PrivilegesRequiredOverrideTitle=选择安装程序模式
-PrivilegesRequiredOverrideInstruction=选择安装模式
-PrivilegesRequiredOverrideText1=%1 可以为所有用户安装(需要管理员权限)，或仅为您安装。
-PrivilegesRequiredOverrideText2=%1 只能为您安装，或为所有用户安装(需要管理员权限)。
-PrivilegesRequiredOverrideAllUsers=为所有用户安装(&A)
-PrivilegesRequiredOverrideAllUsersRecommended=为所有用户安装(&A) (建议选项)
-PrivilegesRequiredOverrideCurrentUser=只为我安装(&M)
-PrivilegesRequiredOverrideCurrentUserRecommended=只为我安装(&M) (建议选项)
-
-; *** 其他错误
-ErrorCreatingDir=安装程序无法创建目录“%1”
-ErrorTooManyFilesInDir=无法在目录“%1”中创建文件，因为里面包含太多文件
-
-; *** 安装程序公共消息
-ExitSetupTitle=退出安装程序
-ExitSetupMessage=安装程序尚未完成。如果现在退出，将不会安装该程序。%n%n您之后可以再次运行安装程序完成安装。%n%n现在退出安装程序吗？
-AboutSetupMenuItem=关于安装程序(&A)...
-AboutSetupTitle=关于安装程序
-AboutSetupMessage=%1 版本 %2%n%3%n%n%1 主页：%n%4
-AboutSetupNote=
-TranslatorNote=简体中文翻译由Kira(847320916@qq.com)维护。项目地址：https://github.com/kira-96/Inno-Setup-Chinese-Simplified-Translation
-
-; *** 按钮
-ButtonBack=< 上一步(&B)
-ButtonNext=下一步(&N) >
-ButtonInstall=安装(&I)
-ButtonOK=确定
-ButtonCancel=取消
-ButtonYes=是(&Y)
-ButtonYesToAll=全是(&A)
-ButtonNo=否(&N)
-ButtonNoToAll=全否(&O)
-ButtonFinish=完成(&F)
-ButtonBrowse=浏览(&B)...
-ButtonWizardBrowse=浏览(&R)...
-ButtonNewFolder=新建文件夹(&M)
-
-; *** “选择语言”对话框消息
-SelectLanguageTitle=选择安装语言
-SelectLanguageLabel=选择安装时使用的语言。
-
-; *** 公共向导文字
-ClickNext=点击“下一步”继续，或点击“取消”退出安装程序。
-BeveledLabel=
-BrowseDialogTitle=浏览文件夹
-BrowseDialogLabel=在下面的列表中选择一个文件夹，然后点击“确定”。
-NewFolderName=新建文件夹
-
-; *** “欢迎”向导页
-WelcomeLabel1=欢迎使用 [name] 安装向导
-WelcomeLabel2=现在将安装 [name/ver] 到您的电脑中。%n%n建议您在继续安装前关闭所有其他应用程序。
-
-; *** “密码”向导页
-WizardPassword=密码
-PasswordLabel1=这个安装程序有密码保护。
-PasswordLabel3=请输入密码，然后点击“下一步”继续。密码区分大小写。
-PasswordEditLabel=密码(&P)：
-IncorrectPassword=您输入的密码不正确，请重新输入。
-
-; *** “许可协议”向导页
-WizardLicense=许可协议
-LicenseLabel=请在继续安装前阅读以下重要信息。
-LicenseLabel3=请仔细阅读下列许可协议。在继续安装前您必须同意这些协议条款。
-LicenseAccepted=我同意此协议(&A)
-LicenseNotAccepted=我不同意此协议(&D)
-
-; *** “信息”向导页
-WizardInfoBefore=信息
-InfoBeforeLabel=请在继续安装前阅读以下重要信息。
-InfoBeforeClickLabel=准备好继续安装后，点击“下一步”。
-WizardInfoAfter=信息
-InfoAfterLabel=请在继续安装前阅读以下重要信息。
-InfoAfterClickLabel=准备好继续安装后，点击“下一步”。
-
-; *** “用户信息”向导页
-WizardUserInfo=用户信息
-UserInfoDesc=请输入您的信息。
-UserInfoName=用户名(&U)：
-UserInfoOrg=组织(&O)：
-UserInfoSerial=序列号(&S)：
-UserInfoNameRequired=您必须输入用户名。
-
-; *** “选择目标目录”向导页
-WizardSelectDir=选择目标位置
-SelectDirDesc=您想将 [name] 安装在哪里？
-SelectDirLabel3=安装程序将安装 [name] 到下面的文件夹中。
-SelectDirBrowseLabel=点击“下一步”继续。如果您想选择其他文件夹，点击“浏览”。
-DiskSpaceGBLabel=至少需要有 [gb] GB 的可用磁盘空间。
-DiskSpaceMBLabel=至少需要有 [mb] MB 的可用磁盘空间。
-CannotInstallToNetworkDrive=安装程序无法安装到一个网络驱动器。
-CannotInstallToUNCPath=安装程序无法安装到一个 UNC 路径。
-InvalidPath=您必须输入一个带驱动器卷标的完整路径，例如：%n%nC:\APP%n%n或UNC路径：%n%n\\server\share
-InvalidDrive=您选定的驱动器或 UNC 共享不存在或不能访问。请选择其他位置。
-DiskSpaceWarningTitle=磁盘空间不足
-DiskSpaceWarning=安装程序至少需要 %1 KB 的可用空间才能安装，但选定驱动器只有 %2 KB 的可用空间。%n%n您一定要继续吗？
-DirNameTooLong=文件夹名称或路径太长。
-InvalidDirName=文件夹名称无效。
-BadDirName32=文件夹名称不能包含下列任何字符：%n%n%1
-DirExistsTitle=文件夹已存在
-DirExists=文件夹：%n%n%1%n%n已经存在。您一定要安装到这个文件夹中吗？
-DirDoesntExistTitle=文件夹不存在
-DirDoesntExist=文件夹：%n%n%1%n%n不存在。您想要创建此文件夹吗？
-
-; *** “选择组件”向导页
-WizardSelectComponents=选择组件
-SelectComponentsDesc=您想安装哪些程序组件？
-SelectComponentsLabel2=选中您想安装的组件；取消您不想安装的组件。然后点击“下一步”继续。
-FullInstallation=完全安装
-; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
-CompactInstallation=简洁安装
-CustomInstallation=自定义安装
-NoUninstallWarningTitle=组件已存在
-NoUninstallWarning=安装程序检测到下列组件已安装在您的电脑中：%n%n%1%n%n取消选中这些组件不会卸载它们。%n%n确定要继续吗？
-ComponentSize1=%1 KB
-ComponentSize2=%1 MB
-ComponentsDiskSpaceGBLabel=当前选择的组件需要至少 [gb] GB 的磁盘空间。
-ComponentsDiskSpaceMBLabel=当前选择的组件需要至少 [mb] MB 的磁盘空间。
-
-; *** “选择附加任务”向导页
-WizardSelectTasks=选择附加任务
-SelectTasksDesc=您想要安装程序执行哪些附加任务？
-SelectTasksLabel2=选择您想要安装程序在安装 [name] 时执行的附加任务，然后点击“下一步”。
-
-; *** “选择开始菜单文件夹”向导页
-WizardSelectProgramGroup=选择开始菜单文件夹
-SelectStartMenuFolderDesc=安装程序应该在哪里放置程序的快捷方式？
-SelectStartMenuFolderLabel3=安装程序将在下列“开始”菜单文件夹中创建程序的快捷方式。
-SelectStartMenuFolderBrowseLabel=点击“下一步”继续。如果您想选择其他文件夹，点击“浏览”。
-MustEnterGroupName=您必须输入一个文件夹名。
-GroupNameTooLong=文件夹名或路径太长。
-InvalidGroupName=无效的文件夹名字。
-BadGroupName=文件夹名不能包含下列任何字符：%n%n%1
-NoProgramGroupCheck2=不创建开始菜单文件夹(&D)
-
-; *** “准备安装”向导页
-WizardReady=准备安装
-ReadyLabel1=安装程序准备就绪，现在可以开始安装 [name] 到您的电脑。
-ReadyLabel2a=点击“安装”继续此安装程序。如果您想重新考虑或修改任何设置，点击“上一步”。
-ReadyLabel2b=点击“安装”继续此安装程序。
-ReadyMemoUserInfo=用户信息：
-ReadyMemoDir=目标位置：
-ReadyMemoType=安装类型：
-ReadyMemoComponents=已选择组件：
-ReadyMemoGroup=开始菜单文件夹：
-ReadyMemoTasks=附加任务：
-
-; *** TExtractionWizardPage wizard page and Extract7ZipArchive
-ExtractionLabel=正在提取附加文件...
-ButtonStopExtraction=停止提取(&S)
-StopExtraction=您确定要停止提取吗？
-ErrorExtractionAborted=提取已中止
-ErrorExtractionFailed=提取失败：%1
-
-; *** TDownloadWizardPage wizard page and DownloadTemporaryFile
-DownloadingLabel=正在下载附加文件...
-ButtonStopDownload=停止下载(&S)
-StopDownload=您确定要停止下载吗？
-ErrorDownloadAborted=下载已中止
-ErrorDownloadFailed=下载失败：%1 %2
-ErrorDownloadSizeFailed=获取下载大小失败：%1 %2
-ErrorFileHash1=校验文件哈希失败：%1
-ErrorFileHash2=无效的文件哈希：预期 %1，实际 %2
-ErrorProgress=无效的进度：%1 / %2
-ErrorFileSize=文件大小错误：预期 %1，实际 %2
-
-; *** “正在准备安装”向导页
-WizardPreparing=正在准备安装
-PreparingDesc=安装程序正在准备安装 [name] 到您的电脑。
-PreviousInstallNotCompleted=先前的程序安装或卸载未完成，您需要重启您的电脑以完成。%n%n在重启电脑后，再次运行安装程序以完成 [name] 的安装。
-CannotContinue=安装程序不能继续。请点击“取消”退出。
-ApplicationsFound=以下应用程序正在使用将由安装程序更新的文件。建议您允许安装程序自动关闭这些应用程序。
-ApplicationsFound2=以下应用程序正在使用将由安装程序更新的文件。建议您允许安装程序自动关闭这些应用程序。安装完成后，安装程序将尝试重新启动这些应用程序。
-CloseApplications=自动关闭应用程序(&A)
-DontCloseApplications=不要关闭应用程序(&D)
-ErrorCloseApplications=安装程序无法自动关闭所有应用程序。建议您在继续之前，关闭所有在使用需要由安装程序更新的文件的应用程序。
-PrepareToInstallNeedsRestart=安装程序必须重启您的计算机。计算机重启后，请再次运行安装程序以完成 [name] 的安装。%n%n是否立即重新启动？
-
-; *** “正在安装”向导页
-WizardInstalling=正在安装
-InstallingLabel=安装程序正在安装 [name] 到您的电脑，请稍候。
-
-; *** “安装完成”向导页
-FinishedHeadingLabel=[name] 安装完成
-FinishedLabelNoIcons=安装程序已在您的电脑中安装了 [name]。
-FinishedLabel=安装程序已在您的电脑中安装了 [name]。您可以通过已安装的快捷方式运行此应用程序。
-ClickFinish=点击“完成”退出安装程序。
-FinishedRestartLabel=为完成 [name] 的安装，安装程序必须重新启动您的电脑。要立即重启吗？
-FinishedRestartMessage=为完成 [name] 的安装，安装程序必须重新启动您的电脑。%n%n要立即重启吗？
-ShowReadmeCheck=是，我想查阅自述文件
-YesRadio=是，立即重启电脑(&Y)
-NoRadio=否，稍后重启电脑(&N)
-; used for example as 'Run MyProg.exe'
-RunEntryExec=运行 %1
-; used for example as 'View Readme.txt'
-RunEntryShellExec=查阅 %1
-
-; *** “安装程序需要下一张磁盘”提示
-ChangeDiskTitle=安装程序需要下一张磁盘
-SelectDiskLabel2=请插入磁盘 %1 并点击“确定”。%n%n如果这个磁盘中的文件可以在下列文件夹之外的文件夹中找到，请输入正确的路径或点击“浏览”。
-PathLabel=路径(&P)：
-FileNotInDir2=“%2”中找不到文件“%1”。请插入正确的磁盘或选择其他文件夹。
-SelectDirectoryLabel=请指定下一张磁盘的位置。
-
-; *** 安装状态消息
-SetupAborted=安装程序未完成安装。%n%n请修正这个问题并重新运行安装程序。
-AbortRetryIgnoreSelectAction=选择操作
-AbortRetryIgnoreRetry=重试(&T)
-AbortRetryIgnoreIgnore=忽略错误并继续(&I)
-AbortRetryIgnoreCancel=关闭安装程序
-
-; *** 安装状态消息
-StatusClosingApplications=正在关闭应用程序...
-StatusCreateDirs=正在创建目录...
-StatusExtractFiles=正在解压缩文件...
-StatusCreateIcons=正在创建快捷方式...
-StatusCreateIniEntries=正在创建 INI 条目...
-StatusCreateRegistryEntries=正在创建注册表条目...
-StatusRegisterFiles=正在注册文件...
-StatusSavingUninstall=正在保存卸载信息...
-StatusRunProgram=正在完成安装...
-StatusRestartingApplications=正在重启应用程序...
-StatusRollback=正在撤销更改...
-
-; *** 其他错误
-ErrorInternal2=内部错误：%1
-ErrorFunctionFailedNoCode=%1 失败
-ErrorFunctionFailed=%1 失败；错误代码 %2
-ErrorFunctionFailedWithMessage=%1 失败；错误代码 %2.%n%3
-ErrorExecutingProgram=无法执行文件：%n%1
-
-; *** 注册表错误
-ErrorRegOpenKey=打开注册表项时出错：%n%1\%2
-ErrorRegCreateKey=创建注册表项时出错：%n%1\%2
-ErrorRegWriteKey=写入注册表项时出错：%n%1\%2
-
-; *** INI 错误
-ErrorIniEntry=在文件“%1”中创建 INI 条目时出错。
-
-; *** 文件复制错误
-FileAbortRetryIgnoreSkipNotRecommended=跳过此文件(&S) (不推荐)
-FileAbortRetryIgnoreIgnoreNotRecommended=忽略错误并继续(&I) (不推荐)
-SourceIsCorrupted=源文件已损坏
-SourceDoesntExist=源文件“%1”不存在
-ExistingFileReadOnly2=无法替换现有文件，它是只读的。
-ExistingFileReadOnlyRetry=移除只读属性并重试(&R)
-ExistingFileReadOnlyKeepExisting=保留现有文件(&K)
-ErrorReadingExistingDest=尝试读取现有文件时出错：
-FileExistsSelectAction=选择操作
-FileExists2=文件已经存在。
-FileExistsOverwriteExisting=覆盖已存在的文件(&O)
-FileExistsKeepExisting=保留现有的文件(&K)
-FileExistsOverwriteOrKeepAll=为所有冲突文件执行此操作(&D)
-ExistingFileNewerSelectAction=选择操作
-ExistingFileNewer2=现有的文件比安装程序将要安装的文件还要新。
-ExistingFileNewerOverwriteExisting=覆盖已存在的文件(&O)
-ExistingFileNewerKeepExisting=保留现有的文件(&K) (推荐)
-ExistingFileNewerOverwriteOrKeepAll=为所有冲突文件执行此操作(&D)
-ErrorChangingAttr=尝试更改下列现有文件的属性时出错：
-ErrorCreatingTemp=尝试在目标目录创建文件时出错：
-ErrorReadingSource=尝试读取下列源文件时出错：
-ErrorCopying=尝试复制下列文件时出错：
-ErrorReplacingExistingFile=尝试替换现有文件时出错：
-ErrorRestartReplace=重启并替换失败：
-ErrorRenamingTemp=尝试重命名下列目标目录中的一个文件时出错：
-ErrorRegisterServer=无法注册 DLL/OCX：%1
-ErrorRegSvr32Failed=RegSvr32 失败；退出代码 %1
-ErrorRegisterTypeLib=无法注册类库：%1
-
-; *** 卸载显示名字标记
-; used for example as 'My Program (32-bit)'
-UninstallDisplayNameMark=%1 (%2)
-; used for example as 'My Program (32-bit, All users)'
-UninstallDisplayNameMarks=%1 (%2, %3)
-UninstallDisplayNameMark32Bit=32 位
-UninstallDisplayNameMark64Bit=64 位
-UninstallDisplayNameMarkAllUsers=所有用户
-UninstallDisplayNameMarkCurrentUser=当前用户
-
-; *** 安装后错误
-ErrorOpeningReadme=尝试打开自述文件时出错。
-ErrorRestartingComputer=安装程序无法重启电脑，请手动重启。
-
-; *** 卸载消息
-UninstallNotFound=文件“%1”不存在。无法卸载。
-UninstallOpenError=文件“%1”不能被打开。无法卸载。
-UninstallUnsupportedVer=此版本的卸载程序无法识别卸载日志文件“%1”的格式。无法卸载
-UninstallUnknownEntry=卸载日志中遇到一个未知条目 (%1)
-ConfirmUninstall=您确认要完全移除 %1 及其所有组件吗？
-UninstallOnlyOnWin64=仅允许在 64 位 Windows 中卸载此程序。
-OnlyAdminCanUninstall=仅使用管理员权限的用户能完成此卸载。
-UninstallStatusLabel=正在从您的电脑中移除 %1，请稍候。
-UninstalledAll=已顺利从您的电脑中移除 %1。
-UninstalledMost=%1 卸载完成。%n%n有部分内容未能被删除，但您可以手动删除它们。
-UninstalledAndNeedsRestart=为完成 %1 的卸载，需要重启您的电脑。%n%n立即重启电脑吗？
-UninstallDataCorrupted=文件“%1”已损坏。无法卸载
-
-; *** 卸载状态消息
-ConfirmDeleteSharedFileTitle=删除共享的文件吗？
-ConfirmDeleteSharedFile2=系统表示下列共享的文件已不有其他程序使用。您希望卸载程序删除这些共享的文件吗？%n%n如果删除这些文件，但仍有程序在使用这些文件，则这些程序可能出现异常。如果您不能确定，请选择“否”，在系统中保留这些文件以免引发问题。
-SharedFileNameLabel=文件名：
-SharedFileLocationLabel=位置：
-WizardUninstalling=卸载状态
-StatusUninstalling=正在卸载 %1...
-
-; *** Shutdown block reasons
-ShutdownBlockReasonInstallingApp=正在安装 %1。
-ShutdownBlockReasonUninstallingApp=正在卸载 %1。
-
-; The custom messages below aren't used by Setup itself, but if you make
-; use of them in your scripts, you'll want to translate them.
-
-[CustomMessages]
-
-NameAndVersion=%1 版本 %2
-AdditionalIcons=附加快捷方式：
-CreateDesktopIcon=创建桌面快捷方式(&D)
-CreateQuickLaunchIcon=创建快速启动栏快捷方式(&Q)
-ProgramOnTheWeb=%1 网站
-UninstallProgram=卸载 %1
-LaunchProgram=运行 %1
-AssocFileExtension=将 %2 文件扩展名与 %1 建立关联(&A)
-AssocingFileExtension=正在将 %2 文件扩展名与 %1 建立关联...
-AutoStartProgramGroupDescription=启动：
-AutoStartProgram=自动启动 %1
-AddonHostProgramNotFound=您选择的文件夹中无法找到 %1。%n%n您要继续吗？
diff --git a/crates/zed/resources/windows/messages/en.isl b/crates/zed/resources/windows/messages/en.isl
deleted file mode 100644
index 2e82bea4ff..0000000000
--- a/crates/zed/resources/windows/messages/en.isl
+++ /dev/null
@@ -1,15 +0,0 @@
-[Messages]
-FinishedLabel=Setup has finished installing [name] on your computer. The application may be launched by selecting the installed shortcuts.
-ConfirmUninstall=Are you sure you want to completely remove %1 and all of its components?
-
-[CustomMessages]
-AdditionalIcons=Additional icons:
-CreateDesktopIcon=Create a &desktop icon
-AddContextMenuFiles=Add "Open with %1" action to Windows Explorer file context menu
-AddContextMenuFolders=Add "Open with %1" action to Windows Explorer directory context menu
-AssociateWithFiles=Register %1 as an editor for supported file types
-AddToPath=Add to PATH (requires shell restart)
-RunAfter=Run %1 after installation
-Other=Other:
-SourceFile=%1 Source File
-OpenWithContextMenu=Open w&ith %1
diff --git a/crates/zed/resources/windows/messages/zh-cn.isl b/crates/zed/resources/windows/messages/zh-cn.isl
deleted file mode 100644
index 50c03ccaaf..0000000000
--- a/crates/zed/resources/windows/messages/zh-cn.isl
+++ /dev/null
@@ -1,9 +0,0 @@
-[CustomMessages]
-AddContextMenuFiles=将“通过 %1 打开”操作添加到 Windows 资源管理器文件上下文菜单
-AddContextMenuFolders=将“通过 %1 打开”操作添加到 Windows 资源管理器目录上下文菜单
-AssociateWithFiles=将 %1 注册为受支持的文件类型的编辑器
-AddToPath=添加到 PATH (重启后生效)
-RunAfter=安装后运行 %1
-Other=其他:
-SourceFile=%1 源文件
-OpenWithContextMenu=通过 %1 打开
diff --git a/crates/zed/resources/windows/sign.ps1 b/crates/zed/resources/windows/sign.ps1
deleted file mode 100644
index d00b33c0fc..0000000000
--- a/crates/zed/resources/windows/sign.ps1
+++ /dev/null
@@ -1,53 +0,0 @@
-param (
-    [Parameter(Mandatory = $true)]
-    [string]$filePath
-)
-
-$params = @{}
-
-$endpoint = $ENV:ENDPOINT
-if ([string]::IsNullOrWhiteSpace($endpoint)) {
-    throw "The 'ENDPOINT' env is required."
-}
-$params["Endpoint"] = $endpoint
-
-$trustedSigningAccountName = $ENV:ACCOUNT_NAME
-if ([string]::IsNullOrWhiteSpace($trustedSigningAccountName)) {
-    throw "The 'ACCOUNT_NAME' env is required."
-}
-$params["CodeSigningAccountName"] = $trustedSigningAccountName
-
-$certificateProfileName = $ENV:CERT_PROFILE_NAME
-if ([string]::IsNullOrWhiteSpace($certificateProfileName)) {
-    throw "The 'CERT_PROFILE_NAME' env is required."
-}
-$params["CertificateProfileName"] = $certificateProfileName
-
-$fileDigest = $ENV:FILE_DIGEST
-if ([string]::IsNullOrWhiteSpace($fileDigest)) {
-    throw "The 'FILE_DIGEST' env is required."
-}
-$params["FileDigest"] = $fileDigest
-
-$timeStampDigest = $ENV:TIMESTAMP_DIGEST
-if ([string]::IsNullOrWhiteSpace($timeStampDigest)) {
-    throw "The 'TIMESTAMP_DIGEST' env is required."
-}
-$params["TimestampDigest"] = $timeStampDigest
-
-$timeStampServer = $ENV:TIMESTAMP_SERVER
-if ([string]::IsNullOrWhiteSpace($timeStampServer)) {
-    throw "The 'TIMESTAMP_SERVER' env is required."
-}
-$params["TimestampRfc3161"] = $timeStampServer
-
-$params["Files"] = $filePath
-
-$trace = $ENV:TRACE
-if (-Not [string]::IsNullOrWhiteSpace($trace)) {
-    if ([System.Convert]::ToBoolean($trace)) {
-        Set-PSDebug -Trace 2
-    }
-}
-
-Invoke-TrustedSigning @params
diff --git a/crates/zed/resources/windows/zed.iss b/crates/zed/resources/windows/zed.iss
deleted file mode 100644
index 9df6d3b228..0000000000
--- a/crates/zed/resources/windows/zed.iss
+++ /dev/null
@@ -1,1421 +0,0 @@
-[Setup]
-AppId={#AppId}
-AppName={#AppName}
-AppVerName={#AppDisplayName}
-AppPublisher=Zed Industries
-AppPublisherURL=https://www.zed.dev/
-AppSupportURL=https://www.zed.dev/
-AppUpdatesURL=https://www.zed.dev/
-DefaultGroupName={#AppName}
-DisableProgramGroupPage=yes
-DisableReadyPage=yes
-AllowNoIcons=yes
-OutputDir={#OutputDir}
-OutputBaseFilename={#AppSetupName}
-Compression=lzma
-SolidCompression=yes
-AppMutex={code:GetAppMutex}
-SetupMutex={#AppMutex}Setup
-; WizardImageFile="{#ResourcesDir}\inno-100.bmp,{#ResourcesDir}\inno-125.bmp,{#ResourcesDir}\inno-150.bmp,{#ResourcesDir}\inno-175.bmp,{#ResourcesDir}\inno-200.bmp,{#ResourcesDir}\inno-225.bmp,{#ResourcesDir}\inno-250.bmp"
-; WizardSmallImageFile="{#ResourcesDir}\inno-small-100.bmp,{#ResourcesDir}\inno-small-125.bmp,{#ResourcesDir}\inno-small-150.bmp,{#ResourcesDir}\inno-small-175.bmp,{#ResourcesDir}\inno-small-200.bmp,{#ResourcesDir}\inno-small-225.bmp,{#ResourcesDir}\inno-small-250.bmp"
-SetupIconFile={#ResourcesDir}\{#AppIconName}.ico
-UninstallDisplayIcon={app}\{#AppExeName}.exe
-ChangesEnvironment=true
-ChangesAssociations=true
-MinVersion=10.0.16299
-SourceDir={#SourceDir}
-AppVersion={#Version}
-VersionInfoVersion={#Version}
-ShowLanguageDialog=auto
-WizardStyle=modern
-
-CloseApplications=force
-
-#if GetEnv("CI") != ""
-SignTool=Defaultsign
-#endif
-
-DefaultDirName={autopf}\{#AppName}
-PrivilegesRequired=lowest
-
-ArchitecturesAllowed=x64compatible
-ArchitecturesInstallIn64BitMode=x64compatible
-
-[Languages]
-Name: "english"; MessagesFile: "compiler:Default.isl,{#ResourcesDir}\messages\en.isl"; LicenseFile: "script\terms\terms.rtf"
-Name: "simplifiedChinese"; MessagesFile: "{#ResourcesDir}\messages\Default.zh-cn.isl,{#ResourcesDir}\messages\zh-cn.isl"; LicenseFile: "script\terms\terms.rtf"
-
-[UninstallDelete]
-; Delete logs
-Type: filesandordirs; Name: "{app}\tools"
-Type: filesandordirs; Name: "{app}\updates"
-; Delete newer files which may not have been added by the initial installation
-Type: filesandordirs; Name: "{app}\x64"
-Type: filesandordirs; Name: "{app}\arm64"
-
-
-[Tasks]
-Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
-Name: "addcontextmenufiles"; Description: "{cm:AddContextMenuFiles,{#AppDisplayName}}"; GroupDescription: "{cm:Other}"
-Name: "addcontextmenufolders"; Description: "{cm:AddContextMenuFolders,{#AppDisplayName}}"; GroupDescription: "{cm:Other}"; Flags: unchecked; Check: not IsWindows11OrLater
-Name: "associatewithfiles"; Description: "{cm:AssociateWithFiles,{#AppDisplayName}}"; GroupDescription: "{cm:Other}"
-Name: "addtopath"; Description: "{cm:AddToPath}"; GroupDescription: "{cm:Other}"
-
-[Dirs]
-Name: "{app}"; AfterInstall: DisableAppDirInheritance
-
-[Files]
-Source: "{#ResourcesDir}\Zed.exe"; DestDir: "{code:GetInstallDir}"; Flags: ignoreversion
-Source: "{#ResourcesDir}\bin\*"; DestDir: "{code:GetInstallDir}\bin"; Flags: ignoreversion
-Source: "{#ResourcesDir}\tools\*"; DestDir: "{app}\tools"; Flags: ignoreversion
-Source: "{#ResourcesDir}\appx\*"; DestDir: "{app}\appx";  BeforeInstall: RemoveAppxPackage; AfterInstall: AddAppxPackage; Flags: ignoreversion; Check: IsWindows11OrLater
-#ifexist ResourcesDir + "\amd_ags_x64.dll"
-Source: "{#ResourcesDir}\amd_ags_x64.dll"; DestDir: "{app}"; Flags: ignoreversion
-#endif
-#ifexist ResourcesDir + "\x64\OpenConsole.exe"
-Source: "{#ResourcesDir}\x64\OpenConsole.exe"; DestDir: "{code:GetInstallDir}\x64"; Flags: ignoreversion
-#endif
-#ifexist ResourcesDir + "\arm64\OpenConsole.exe"
-Source: "{#ResourcesDir}\arm64\OpenConsole.exe"; DestDir: "{code:GetInstallDir}\arm64"; Flags: ignoreversion
-#endif
-Source: "{#ResourcesDir}\conpty.dll"; DestDir: "{code:GetInstallDir}"; Flags: ignoreversion
-
-[Icons]
-Name: "{group}\{#AppName}"; Filename: "{app}\{#AppExeName}.exe"; AppUserModelID: "{#AppUserId}"
-Name: "{autodesktop}\{#AppName}"; Filename: "{app}\{#AppExeName}.exe"; Tasks: desktopicon; AppUserModelID: "{#AppUserId}"
-
-[Run]
-Filename: "{app}\{#AppExeName}.exe"; Description: "{cm:LaunchProgram,{#AppName}}"; Flags: nowait postinstall; Check: WizardNotSilent
-
-[UninstallRun]
-Filename: "powershell.exe"; Parameters: "Invoke-Command -ScriptBlock {{Remove-AppxPackage -Package ""{#AppxFullName}""}"; Check: IsWindows11OrLater; Flags: shellexec waituntilterminated runhidden
-
-[Registry]
-Root: HKCU; Subkey: "Software\Classes\.ascx\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.ascx\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.ascx"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.ascx"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,ASCX}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.ascx"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.ascx\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.ascx\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.ascx\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.asp\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.asp\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.asp"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.asp"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,ASP}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.asp"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.asp\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.asp\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.asp\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.aspx\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.aspx\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.aspx"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.aspx"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,ASPX}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.aspx"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.aspx\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.aspx\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.aspx\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.bash\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.bash\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.bash"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.bash"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Bash}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.bash"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.bash\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.bash\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.bash\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.bash_login\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.bash_login\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.bash_login"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.bash_login"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Bash Login}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.bash_login"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.bash_login\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.bash_login\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.bash_login\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.bash_logout\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.bash_logout\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.bash_logout"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.bash_logout"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Bash Logout}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.bash_logout"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.bash_logout\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.bash_logout\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.bash_logout\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.bash_profile\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.bash_profile\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.bash_profile"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.bash_profile"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Bash Profile}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.bash_profile"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.bash_profile\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.bash_profile\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.bash_profile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.bashrc\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.bashrc\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.bashrc"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.bashrc"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Bash RC}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.bashrc"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.bashrc\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.bashrc\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.bashrc\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.bib\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.bib\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.bib"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.bib"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,BibTeX}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.bib"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.bib\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.bib\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.bib\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.bowerrc\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.bowerrc\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.bowerrc"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.bowerrc"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Bower RC}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.bowerrc"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.bowerrc\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.bowerrc\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.bowerrc\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.c++\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.c++\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.c++"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.c++"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C++}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.c++"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.c++\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.c++\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.c\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.c\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.c"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.c"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.c"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.c\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.c\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.c\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.cc\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.cc\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.cc"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cc"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C++}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cc"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cc\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cc\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cc\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.cfg\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.cfg\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.cfg"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cfg"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Configuration}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cfg"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cfg\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cfg\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cfg\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.cjs\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.cjs\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.cjs"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cjs"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,JavaScript}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cjs"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cjs\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cjs\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cjs\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.clj\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.clj\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.clj"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.clj"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Clojure}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.clj"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.clj\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.clj\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.clj\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.cljs\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.cljs\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.cljs"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cljs"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,ClojureScript}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cljs"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cljs\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cljs\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cljs\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.cljx\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.cljx\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.cljx"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cljx"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,CLJX}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cljx"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cljx\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cljx\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cljx\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.clojure\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.clojure\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.clojure"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.clojure"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Clojure}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.clojure"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.clojure\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.clojure\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.clojure\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.cls\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.cls\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.cls"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cls"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,LaTeX}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cls"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cls\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cls\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cls\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.code-workspace\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.code-workspace\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.code-workspace"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.code-workspace"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Code Workspace}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.code"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.code-workspace\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.code-workspace\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.code-workspace\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.cmake\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.cmake\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.cmake"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cmake"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,CMake}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cmake"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cmake\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cmake\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cmake\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.coffee\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.coffee\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.coffee"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.coffee"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,CoffeeScript}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.coffee"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.coffee\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.coffee\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.coffee\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.config\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.config\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.config"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.config"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Configuration}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.config"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.config\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.config\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.config\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.containerfile\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.containerfile\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.containerfile"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.containerfile"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Containerfile}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.containerfile"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.containerfile\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.containerfile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.cpp\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.cpp\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.cpp"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cpp"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C++}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cpp"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cpp\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cpp\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cpp\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.cs\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.cs\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.cs"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cs"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C#}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cs"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cs\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cs\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cs\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.cshtml\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.cshtml\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.cshtml"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cshtml"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,CSHTML}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cshtml"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cshtml\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cshtml\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cshtml\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.csproj\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.csproj\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.csproj"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.csproj"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C# Project}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.csproj"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.csproj\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.csproj\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.csproj\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.css\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.css\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.css"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.css"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,CSS}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.css"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.css\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.css\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.css\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.csv\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.csv\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.csv"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.csv"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Comma Separated Values}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.csv"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.csv\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.csv\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.csv\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.csx\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.csx\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.csx"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.csx"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C# Script}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.csx"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.csx\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.csx\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.csx\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.ctp\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.ctp\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.ctp"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.ctp"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,CakePHP Template}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.ctp"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.ctp\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.ctp\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.ctp\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.cxx\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.cxx\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.cxx"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cxx"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C++}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cxx"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cxx\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cxx\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.cxx\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.dart\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.dart\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.dart"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.dart"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Dart}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.dart"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.dart\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.dart\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.dart\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.diff\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.diff\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.diff"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.diff"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Diff}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.diff"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.diff\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.diff\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.diff\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.dockerfile\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.dockerfile\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.dockerfile"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.dockerfile"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Dockerfile}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.dockerfile"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.dockerfile\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.dockerfile\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.dockerfile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.dot\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.dot\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.dot"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.dot"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Dot}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.dot"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.dot\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.dot\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.dot\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.dtd\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.dtd\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.dtd"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.dtd"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Document Type Definition}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.dtd"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.dtd\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.dtd\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.dtd\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.editorconfig\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.editorconfig\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.editorconfig"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.editorconfig"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Editor Config}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.editorconfig"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.editorconfig\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.editorconfig\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.editorconfig\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.edn\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.edn\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.edn"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.edn"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Extensible Data Notation}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.edn"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.edn\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.edn\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.edn\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.erb\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.erb\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.erb"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.erb"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Ruby}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.erb"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.erb\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.erb\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.erb\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.eyaml\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.eyaml\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.eyaml"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.eyaml"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Hiera Eyaml}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.eyaml"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.eyaml\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.eyaml\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.eyaml\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.eyml\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.eyml\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.eyml"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.eyml"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Hiera Eyaml}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.eyml"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.eyml\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.eyml\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.eyml\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.fs\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.fs\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.fs"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.fs"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,F#}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.fs"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.fs\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.fs\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.fs\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.fsi\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.fsi\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.fsi"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.fsi"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,F# Signature}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.fsi"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.fsi\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.fsi\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.fsi\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.fsscript\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.fsscript\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.fsscript"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.fsscript"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,F# Script}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.fsscript"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.fsscript\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.fsscript\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.fsscript\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.fsx\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.fsx\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.fsx"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.fsx"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,F# Script}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.fsx"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.fsx\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.fsx\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.fsx\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.gemspec\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.gemspec\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.gemspec"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.gemspec"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Gemspec}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.gemspec"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.gemspec\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.gemspec\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.gemspec\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.gitattributes\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.gitattributes\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.gitattributes"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.gitattributes"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Git Attributes}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.gitattributes"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.gitattributes"; ValueType: string; ValueName: "AlwaysShowExt"; ValueData: ""; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.gitattributes\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.gitattributes\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.gitattributes\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.gitconfig\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.gitconfig\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.gitconfig"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.gitconfig"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Git Config}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.gitconfig"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.gitconfig"; ValueType: string; ValueName: "AlwaysShowExt"; ValueData: ""; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.gitconfig\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.gitconfig\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.gitconfig\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.gitignore\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.gitignore\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.gitignore"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.gitignore"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Git Ignore}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.gitignore"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.gitignore"; ValueType: string; ValueName: "AlwaysShowExt"; ValueData: ""; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.gitignore\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.gitignore\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.gitignore\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.go\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.go\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.go"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.go"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Go}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.go"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.go\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.go\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.go\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.gradle\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.gradle\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.gradle"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.gradle"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Gradle}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.gradle"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.gradle\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.gradle\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.gradle\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.groovy\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.groovy\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.groovy"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.groovy"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Groovy}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.groovy"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.groovy\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.groovy\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.groovy\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.h\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.h\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.h"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.h"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C Header}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.h"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.h\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.h\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.h\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.handlebars\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.handlebars\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.handlebars"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.handlebars"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Handlebars}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.handlebars"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.handlebars\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.handlebars\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.handlebars\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.hbs\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.hbs\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.hbs"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.hbs"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Handlebars}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.hbs"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.hbs\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.hbs\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.hbs\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.h++\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.h++\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.h++"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.h++"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C++ Header}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.h++"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.h++\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.h++\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.hh\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.hh\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.hh"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.hh"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C++ Header}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.hh"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.hh\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.hh\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.hh\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.hpp\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.hpp\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.hpp"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.hpp"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C++ Header}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.hpp"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.hpp\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.hpp\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.hpp\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.htm\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.htm\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.htm"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.htm"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,HTML}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.htm"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.htm\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.htm\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.htm\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.html\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.html\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.html"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.html"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,HTML}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.html"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.html\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.html\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.html\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.hxx\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.hxx\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.hxx"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.hxx"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C++ Header}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.hxx"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.hxx\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.hxx\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.hxx\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.ini\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.ini\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.ini"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.ini"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,INI}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.ini"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.ini\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.ini\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.ini\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.ipynb\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.ipynb\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.ipynb"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.ipynb"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Jupyter}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.ipynb"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.ipynb\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.ipynb\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.ipynb\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.jade\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.jade\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.jade"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.jade"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Jade}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.jade"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.jade\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.jade\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.jade\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.jav\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.jav\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.jav"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.jav"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Java}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.jav"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.jav\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.jav\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.jav\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.java\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.java\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.java"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.java"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Java}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.java"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.java\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.java\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.java\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.js\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.js\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.js"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.js"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,JavaScript}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.js"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.js\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.js\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.js\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.jsx\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.jsx\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.jsx"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.jsx"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,JavaScript}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.jsx"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.jsx\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.jsx\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.jsx\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.jscsrc\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.jscsrc\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.jscsrc"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.jscsrc"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,JSCS RC}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.jscsrc"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.jscsrc\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.jscsrc\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.jscsrc\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.jshintrc\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.jshintrc\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.jshintrc"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.jshintrc"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,JSHint RC}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.jshintrc"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.jshintrc\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.jshintrc\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.jshintrc\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.jshtm\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.jshtm\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.jshtm"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.jshtm"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,JavaScript HTML Template}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.jshtm"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.jshtm\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.jshtm\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.jshtm\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.json\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.json\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.json"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.json"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,JSON}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.json"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.json\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.json\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.json\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.jsp\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.jsp\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.jsp"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.jsp"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Java Server Pages}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.jsp"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.jsp\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.jsp\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.jsp\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.less\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.less\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.less"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.less"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,LESS}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.less"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.less\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.less\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.less\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.log\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.log\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.log"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.log"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Log file}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.log"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.log\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.log\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.log\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.lua\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.lua\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.lua"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.lua"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Lua}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.lua"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.lua\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.lua\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.lua\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.m\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.m\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.m"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.m"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Objective C}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.m"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.m\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.m\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.m\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.makefile\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.makefile\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.makefile"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.makefile"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Makefile}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.makefile"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.makefile\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.makefile\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.makefile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.markdown\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.markdown\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.markdown"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.markdown"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Markdown}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.markdown"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.markdown\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.markdown\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.markdown\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.md\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.md\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.md"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.md"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Markdown}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.md"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.md\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.md\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.md\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.mdoc\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.mdoc\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.mdoc"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mdoc"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,MDoc}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mdoc"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mdoc\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mdoc\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mdoc\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.mdown\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.mdown\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.mdown"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mdown"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Markdown}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mdown"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mdown\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mdown\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mdown\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.mdtext\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.mdtext\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.mdtext"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mdtext"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Markdown}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mdtext"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mdtext\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mdtext\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mdtext\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.mdtxt\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.mdtxt\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.mdtxt"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mdtxt"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Markdown}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mdtxt"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mdtxt\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mdtxt\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mdtxt\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.mdwn\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.mdwn\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.mdwn"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mdwn"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Markdown}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mdwn"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mdwn\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mdwn\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mdwn\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.mk\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.mk\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.mk"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mk"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Makefile}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mk"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mk\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mk\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mk\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.mkd\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.mkd\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.mkd"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mkd"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Markdown}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mkd"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mkd\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mkd\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mkd\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.mkdn\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.mkdn\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.mkdn"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mkdn"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Markdown}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mkdn"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mkdn\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mkdn\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mkdn\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.ml\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.ml\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.ml"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.ml"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,OCaml}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.ml"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.ml\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.ml\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.ml\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.mli\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.mli\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.mli"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mli"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,OCaml}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mli"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mli\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mli\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mli\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.mjs\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.mjs\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.mjs"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mjs"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,JavaScript}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mjs"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mjs\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mjs\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.mjs\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.npmignore\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.npmignore\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.npmignore"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.npmignore"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,NPM Ignore}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.npmignore"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.npmignore"; ValueType: string; ValueName: "AlwaysShowExt"; ValueData: ""; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.npmignore\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.npmignore\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.npmignore\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.php\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.php\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.php"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.php"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,PHP}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.php"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.php\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.php\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.php\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.phtml\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.phtml\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.phtml"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.phtml"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,PHP HTML}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.phtml"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.phtml\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.phtml\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.phtml\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.pl\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.pl\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.pl"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.pl"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Perl}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.pl"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.pl\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.pl\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.pl\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.pl6\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.pl6\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.pl6"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.pl6"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Perl 6}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.pl6"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.pl6\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.pl6\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.pl6\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.plist\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.plist\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.plist"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.plist"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Properties file}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.plist"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.plist\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.plist\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.plist\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.pm\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.pm\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.pm"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.pm"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Perl Module}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.pm"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.pm\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.pm\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.pm\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.pm6\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.pm6\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.pm6"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.pm6"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Perl 6 Module}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.pm6"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.pm6\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.pm6\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.pm6\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.pod\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.pod\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.pod"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.pod"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Perl POD}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.pod"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.pod\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.pod\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.pod\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.pp\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.pp\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.pp"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.pp"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Perl}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.pp"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.pp\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.pp\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.pp\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.profile\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.profile\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.profile"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.profile"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Profile}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.profile"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.profile\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.profile\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.profile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.properties\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.properties\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.properties"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.properties"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Properties}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.properties"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.properties\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.properties\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.properties\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.ps1\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.ps1\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.ps1"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.ps1"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,PowerShell}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.ps1"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.ps1\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.ps1\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.ps1\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.psd1\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.psd1\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.psd1"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.psd1"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,PowerShell Module Manifest}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.psd1"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.psd1\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.psd1\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.psd1\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.psgi\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.psgi\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.psgi"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.psgi"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Perl CGI}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.psgi"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.psgi\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.psgi\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.psgi\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.psm1\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.psm1\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.psm1"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.psm1"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,PowerShell Module}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.psm1"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.psm1\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.psm1\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.psm1\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.py\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.py\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.py"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.py"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Python}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.py"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.py\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.py\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.py\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.pyi\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.pyi\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.pyi"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.pyi"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Python}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.pyi"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.pyi\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.pyi\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.pyi\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.r\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.r\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.r"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.r"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,R}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.r"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.r\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.r\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.r\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.rb\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.rb\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.rb"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.rb"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Ruby}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.rb"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.rb\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.rb\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.rb\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.rhistory\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.rhistory\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.rhistory"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.rhistory"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,R History}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.rhistory"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.rhistory\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.rhistory\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.rhistory\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.rprofile\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.rprofile\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.rprofile"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.rprofile"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,R Profile}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.rprofile"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.rprofile\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.rprofile\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.rprofile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.rs\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.rs\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.rs"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.rs"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Rust}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.rs"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.rs\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.rs\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.rs\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.rst\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.rst\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.rst"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.rst"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Restructured Text}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.rst"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.rst\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.rst\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.rst\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.rt\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.rt\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.rt"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.rt"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Rich Text}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.rt"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.rt\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.rt\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.rt\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.sass\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.sass\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.sass"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.sass"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Sass}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.sass"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.sass\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.sass\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.sass\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.scss\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.scss\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.scss"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.scss"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Sass}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.scss"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.scss\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.scss\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.scss\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.sh\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.sh\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.sh"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.sh"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,SH}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.sh"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.sh\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.sh\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.sh\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.shtml\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.shtml\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.shtml"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.shtml"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,SHTML}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.shtml"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.shtml\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.shtml\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.shtml\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.sql\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.sql\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.sql"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.sql"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,SQL}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.sql"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.sql\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.sql\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.sql\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.svg\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.svg\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.svg"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.svg"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,SVG}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.svg"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.svg\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.svg\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.svg\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.t\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.t\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.t"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.t"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Perl}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.t"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.t\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.t\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.t\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.tex\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.tex\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.tex"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.tex"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,LaTeX}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.tex"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.tex\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.tex\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.tex\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.ts\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.ts\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.ts"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.ts"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,TypeScript}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.ts"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.ts\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.ts\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.ts\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.toml\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.toml\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.toml"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.toml"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Toml}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.toml"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.toml\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.toml\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.toml\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.tsx\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.tsx\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.tsx"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.tsx"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,TypeScript}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.tsx"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.tsx\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.tsx\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.tsx\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.txt\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.txt\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.txt"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.txt"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Text}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.txt"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.txt\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.txt\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.txt\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.vb\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.vb\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.vb"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.vb"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Visual Basic}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.vb"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.vb\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.vb\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.vb\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.vue\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.vue\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.vue"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.vue"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,VUE}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.vue"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.vue\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.vue\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.vue\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.wxi\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.wxi\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.wxi"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.wxi"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,WiX Include}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.wxi"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.wxi\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.wxi\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.wxi\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.wxl\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.wxl\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.wxl"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.wxl"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,WiX Localization}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.wxl"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.wxl\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.wxl\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.wxl\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.wxs\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.wxs\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.wxs"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.wxs"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,WiX}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.wxs"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.wxs\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.wxs\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.wxs\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.xaml\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.xaml\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.xaml"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.xaml"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,XAML}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.xaml"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.xaml\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.xaml\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.xaml\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.xhtml\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.xhtml\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.xhtml"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.xhtml"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,HTML}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.xhtml"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.xhtml\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.xhtml\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.xhtml\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.xml\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.xml\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.xml"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.xml"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,XML}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.xml"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.xml\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.xml\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.xml\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.yaml\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.yaml\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.yaml"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.yaml"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Yaml}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.yaml"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.yaml\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.yaml\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.yaml\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.yml\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.yml\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.yml"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.yml"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Yaml}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.yml"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.yml\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.yml\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.yml\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\.zsh\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\.zsh\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.zsh"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.zsh"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,ZSH}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.zsh"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.zsh\DefaultIcon"; ValueType: none; Flags: deletekey; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.zsh\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""; Tasks: associatewithfiles
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.zsh\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: associatewithfiles
-
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}SourceFile"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,{#AppName}}"; Flags: uninsdeletekey
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}SourceFile\DefaultIcon"; ValueType: none; Flags: deletekey
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}SourceFile\shell\open"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"""
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}SourceFile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""
-
-Root: HKCU; Subkey: "Software\Classes\Applications\{#AppExeName}.exe"; ValueType: none; ValueName: ""; Flags: uninsdeletekey
-Root: HKCU; Subkey: "Software\Classes\Applications\{#AppExeName}.exe\DefaultIcon"; ValueType: none; Flags: deletekey
-Root: HKCU; Subkey: "Software\Classes\Applications\{#AppExeName}.exe\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#AppExeName}.exe"""
-Root: HKCU; Subkey: "Software\Classes\Applications\{#AppExeName}.exe\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""
-
-Root: HKCU; Subkey: "Software\Classes\{#RegValueName}ContextMenu"; ValueType: expandsz; ValueName: "Title"; ValueData: "{cm:OpenWithContextMenu,{#ShellNameShort}}"; Tasks: addcontextmenufiles; Flags: uninsdeletekey; Check: IsWindows11OrLater
-Root: HKCU; Subkey: "Software\Classes\*\shell\{#RegValueName}"; ValueType: expandsz; ValueName: ""; ValueData: "{cm:OpenWithContextMenu,{#ShellNameShort}}"; Tasks: addcontextmenufiles; Flags: uninsdeletekey; Check: not IsWindows11OrLater
-Root: HKCU; Subkey: "Software\Classes\*\shell\{#RegValueName}"; ValueType: expandsz; ValueName: "Icon"; ValueData: "{app}\{#AppExeName}.exe"; Tasks: addcontextmenufiles; Check: not IsWindows11OrLater
-Root: HKCU; Subkey: "Software\Classes\*\shell\{#RegValueName}\command"; ValueType: expandsz; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%1"""; Tasks: addcontextmenufiles; Check: not IsWindows11OrLater
-Root: HKCU; Subkey: "Software\Classes\directory\shell\{#RegValueName}"; ValueType: expandsz; ValueName: ""; ValueData: "{cm:OpenWithContextMenu,{#ShellNameShort}}"; Tasks: addcontextmenufolders; Flags: uninsdeletekey; Check: IsWindows11OrLater
-Root: HKCU; Subkey: "Software\Classes\directory\shell\{#RegValueName}"; ValueType: expandsz; ValueName: "Icon"; ValueData: "{app}\{#AppExeName}.exe"; Tasks: addcontextmenufolders; Check: not IsWindows11OrLater
-Root: HKCU; Subkey: "Software\Classes\directory\shell\{#RegValueName}\command"; ValueType: expandsz; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%V"""; Tasks: addcontextmenufolders; Check: not IsWindows11OrLater
-Root: HKCU; Subkey: "Software\Classes\directory\background\shell\{#RegValueName}"; ValueType: expandsz; ValueName: ""; ValueData: "{cm:OpenWithContextMenu,{#ShellNameShort}}"; Tasks: addcontextmenufolders; Flags: uninsdeletekey; Check: not IsWindows11OrLater
-Root: HKCU; Subkey: "Software\Classes\directory\background\shell\{#RegValueName}"; ValueType: expandsz; ValueName: "Icon"; ValueData: "{app}\{#AppExeName}.exe"; Tasks: addcontextmenufolders; Check: not IsWindows11OrLater
-Root: HKCU; Subkey: "Software\Classes\directory\background\shell\{#RegValueName}\command"; ValueType: expandsz; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%V"""; Tasks: addcontextmenufolders; Check: not IsWindows11OrLater
-Root: HKCU; Subkey: "Software\Classes\Drive\shell\{#RegValueName}"; ValueType: expandsz; ValueName: ""; ValueData: "{cm:OpenWithContextMenu,{#ShellNameShort}}"; Tasks: addcontextmenufolders; Flags: uninsdeletekey; Check: not IsWindows11OrLater
-Root: HKCU; Subkey: "Software\Classes\Drive\shell\{#RegValueName}"; ValueType: expandsz; ValueName: "Icon"; ValueData: "{app}\{#AppExeName}.exe"; Tasks: addcontextmenufolders; Check: not IsWindows11OrLater
-Root: HKCU; Subkey: "Software\Classes\Drive\shell\{#RegValueName}\command"; ValueType: expandsz; ValueName: ""; ValueData: """{app}\{#AppExeName}.exe"" ""%V"""; Tasks: addcontextmenufolders; Check: not IsWindows11OrLater
-
-; Environment
-Root: HKCU; Subkey: "Environment"; ValueType: expandsz; ValueName: "Path"; ValueData: "{code:AddToPath|{app}\bin}"; Tasks: addtopath; Check: NeedsAddToPath(ExpandConstant('{app}\bin'))
-
-; URI Scheme
-Root: HKCU; Subkey: "Software\Classes\zed"; ValueType: "string"; ValueData: "URL:zed Protocol"; Flags: uninsdeletekey
-Root: HKCU; Subkey: "Software\Classes\zed"; ValueType: "string"; ValueName: "URL Protocol"; ValueData: ""
-Root: HKCU; Subkey: "Software\Classes\zed\DefaultIcon"; ValueType: "string"; ValueData: "{app}\Zed.exe,1"
-Root: HKCU; Subkey: "Software\Classes\zed\shell\open\command"; ValueType: "string"; ValueData: """{app}\Zed.exe"" ""%1"""
-
-[Code]
-function WizardNotSilent(): Boolean;
-begin
-  Result := not WizardSilent();
-end;
-
-function IsWindows11OrLater(): Boolean;
-begin
-  Result := (GetWindowsVersion >= $0A0055F0);
-end;
-
-// https://stackoverflow.com/a/23838239/261019
-procedure Explode(var Dest: TArrayOfString; Text: String; Separator: String);
-var
-  i, p: Integer;
-begin
-  i := 0;
-  repeat
-    SetArrayLength(Dest, i+1);
-    p := Pos(Separator,Text);
-    if p > 0 then begin
-      Dest[i] := Copy(Text, 1, p-1);
-      Text := Copy(Text, p + Length(Separator), Length(Text));
-      i := i + 1;
-    end else begin
-      Dest[i] := Text;
-      Text := '';
-    end;
-  until Length(Text)=0;
-end;
-
-function NeedsAddToPath(path: string): boolean;
-var
-  OrigPath: string;
-begin
-  if not RegQueryStringValue(HKCU, 'Environment', 'Path', OrigPath)
-  then begin
-    Result := True;
-    exit;
-  end;
-  Result := Pos(';' + path + ';', ';' + OrigPath + ';') = 0;
-end;
-
-function AddToPath(path: string): string;
-var
-  OrigPath: string;
-begin
-  RegQueryStringValue(HKCU, 'Environment', 'Path', OrigPath)
-
-  if (Length(OrigPath) > 0) and (OrigPath[Length(OrigPath)] = ';') then
-    Result := OrigPath + path
-  else
-    Result := OrigPath + ';' + path
-end;
-
-procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep);
-var
-  Path: string;
-  InstalledPath: string;
-  Parts: TArrayOfString;
-  NewPath: string;
-  i: Integer;
-begin
-  if not CurUninstallStep = usUninstall then begin
-    exit;
-  end;
-  if not RegQueryStringValue(HKCU, 'Environment', 'Path', Path)
-  then begin
-    exit;
-  end;
-  NewPath := '';
-  InstalledPath := ExpandConstant('{app}\bin')
-  Explode(Parts, Path, ';');
-  for i:=0 to GetArrayLength(Parts)-1 do begin
-    if CompareText(Parts[i], InstalledPath) <> 0 then begin
-      NewPath := NewPath + Parts[i];
-
-      if i < GetArrayLength(Parts) - 1 then begin
-        NewPath := NewPath + ';';
-      end;
-    end;
-  end;
-  RegWriteExpandStringValue(HKCU, 'Environment', 'Path', NewPath);
-end;
-
-// https://docs.microsoft.com/en-us/windows-server/administration/windows-commands/icacls
-// https://docs.microsoft.com/en-US/windows/security/identity-protection/access-control/security-identifiers
-procedure DisableAppDirInheritance();
-var
-  ResultCode: Integer;
-  Permissions: string;
-begin
-  Permissions := '/grant:r "*S-1-5-18:(OI)(CI)F" /grant:r "*S-1-5-32-544:(OI)(CI)F" /grant:r "*S-1-5-11:(OI)(CI)RX" /grant:r "*S-1-5-32-545:(OI)(CI)RX"';
-
-  Permissions := Permissions + Format(' /grant:r "*S-1-3-0:(OI)(CI)F" /grant:r "%s:(OI)(CI)F"', [GetUserNameString()]);
-
-  Exec(ExpandConstant('{sys}\icacls.exe'), ExpandConstant('"{app}" /inheritancelevel:r ') + Permissions, '', SW_HIDE, ewWaitUntilTerminated, ResultCode);
-end;
-
-procedure AddAppxPackage();
-var
-  AddAppxPackageResultCode: Integer;
-begin
-  if WizardIsTaskSelected('addcontextmenufiles') then begin
-    ShellExec('', 'powershell.exe', '-Command ' + AddQuotes('Add-AppxPackage -Path ''' + ExpandConstant('{app}\appx\zed_explorer_command_injector.appx') + ''' -ExternalLocation ''' + ExpandConstant('{app}\appx') + ''''), '', SW_HIDE, ewWaitUntilTerminated, AddAppxPackageResultCode);
-    RegDeleteKeyIncludingSubkeys(HKCU, 'Software\Classes\*\shell\{#RegValueName}');
-    RegDeleteKeyIncludingSubkeys(HKCU, 'Software\Classes\directory\shell\{#RegValueName}');
-    RegDeleteKeyIncludingSubkeys(HKCU, 'Software\Classes\directory\background\shell\{#RegValueName}');
-    RegDeleteKeyIncludingSubkeys(HKCU, 'Software\Classes\Drive\shell\{#RegValueName}');
-  end;
-end;
-
-procedure RemoveAppxPackage();
-var
-  RemoveAppxPackageResultCode: Integer;
-begin
-  ShellExec('', 'powershell.exe', '-Command ' + AddQuotes('Remove-AppxPackage -Package ''{#AppxFullName}'''), '', SW_HIDE, ewWaitUntilTerminated, RemoveAppxPackageResultCode);
-  if not WizardIsTaskSelected('addcontextmenufiles') then begin
-    RegDeleteKeyIncludingSubkeys(HKCU, 'Software\Classes\{#RegValueName}ContextMenu');
-  end;
-end;
-
-function SwitchHasValue(Name: string; Value: string): Boolean;
-begin
-  Result := CompareText(ExpandConstant('{param:' + Name + '}'), Value) = 0;
-end;
-
-function IsUpdating(): Boolean;
-begin
-  Result := SwitchHasValue('update', 'true') and WizardSilent();
-end;
-
-procedure CurStepChanged(CurStep: TSetupStep);
-begin
-  if CurStep = ssPostInstall then
-  begin
-    if IsUpdating() then
-    begin
-      SaveStringToFile(ExpandConstant('{app}\updates\versions.txt'), '{#Version}' + #13#10, True);
-    end
-  end;
-end;
-
-function GetAppMutex(Param: string): string;
-begin
-  if IsUpdating() then
-    Result := ''
-  else
-    Result := '{#AppMutex}';
-end;
-
-function GetInstallDir(Param: string): string;
-begin
-  if IsUpdating() then
-    Result := ExpandConstant('{app}\install')
-  else
-    Result := ExpandConstant('{app}');
-end;
diff --git a/crates/zed/resources/windows/zed.sh b/crates/zed/resources/windows/zed.sh
deleted file mode 100644
index 734b1a7eb0..0000000000
--- a/crates/zed/resources/windows/zed.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env sh
-
-if [ "$ZED_WSL_DEBUG_INFO" = true ]; then
-	set -x
-fi
-
-ZED_PATH="$(dirname "$(realpath "$0")")"
-
-IN_WSL=false
-if [ -n "$WSL_DISTRO_NAME" ]; then
-	# $WSL_DISTRO_NAME is available since WSL builds 18362, also for WSL2
-	IN_WSL=true
-fi
-
-if [ $IN_WSL = true ]; then
-    WSL_USER="$USER"
-    if [ -z "$WSL_USER" ]; then
-        WSL_USER="$USERNAME"
-    fi
-    "$ZED_PATH/zed.exe" --wsl "$WSL_USER@$WSL_DISTRO_NAME" "$@"
-    exit $?
-else
-    "$ZED_PATH/zed.exe" "$@"
-    exit $?
-fi
diff --git a/crates/zed/resources/zed.desktop.in b/crates/zed/resources/zed.desktop.in
deleted file mode 100644
index eaace153dd..0000000000
--- a/crates/zed/resources/zed.desktop.in
+++ /dev/null
@@ -1,21 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=$APP_NAME
-GenericName=Text Editor
-Comment=A high-performance, multiplayer code editor.
-TryExec=$APP_CLI
-StartupNotify=$DO_STARTUP_NOTIFY
-Exec=$APP_CLI $APP_ARGS
-Icon=$APP_ICON
-Categories=Utility;TextEditor;Development;IDE;
-Keywords=zed;
-# To add Zed to "Open Folder With..." context menu, add `inode/directory` to the MimeType field (semicolon separated)
-# Arch linux users have reported this setting Zed as default file browser. See https://github.com/zed-industries/zed/pull/39076 and related issues.
-# If this happens to you, an unconfirmed fix may be to install Arch's `gnome-defaults-list` package.
-MimeType=text/plain;application/x-zerosize;x-scheme-handler/zed;
-Actions=NewWorkspace;
-
-[Desktop Action NewWorkspace]
-Exec=$APP_CLI --new $APP_ARGS
-Name=Open a new workspace
diff --git a/crates/zed/resources/zed.entitlements b/crates/zed/resources/zed.entitlements
deleted file mode 100644
index 2a16afe755..0000000000
--- a/crates/zed/resources/zed.entitlements
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>com.apple.security.automation.apple-events</key>
-	<true/>
-	<key>com.apple.security.cs.allow-jit</key>
-	<true/>
-	<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
-	<true/>
-	<!-- <key>com.apple.security.cs.disable-library-validation</key>
-	<true/> -->
-	<key>com.apple.security.device.audio-input</key>
-	<true/>
-	<key>com.apple.security.device.camera</key>
-	<true/>
-	<key>com.apple.security.personal-information.addressbook</key>
-	<true/>
-	<key>com.apple.security.personal-information.calendars</key>
-	<true/>
-	<key>com.apple.security.personal-information.location</key>
-	<true/>
-	<key>com.apple.security.personal-information.photos-library</key>
-	<true/>
-	<key>com.apple.security.files.user-selected.read-write</key>
-	<true/>
-	<key>com.apple.security.files.downloads.read-write</key>
-	<true/>
-</dict>
-</plist>
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
deleted file mode 100644
index dfbc57d293..0000000000
--- a/crates/zed/src/main.rs
+++ /dev/null
@@ -1,1532 +0,0 @@
-mod reliability;
-mod zed;
-
-use agent_ui::AgentPanel;
-use anyhow::{Context as _, Error, Result};
-use clap::Parser;
-use cli::FORCE_CLI_MODE_ENV_VAR_NAME;
-use client::{Client, ProxySettings, UserStore, parse_zed_link};
-use collab_ui::channel_view::ChannelView;
-use collections::HashMap;
-use crashes::InitCrashHandler;
-use db::kvp::{GLOBAL_KEY_VALUE_STORE, KEY_VALUE_STORE};
-use editor::Editor;
-use extension::ExtensionHostProxy;
-use fs::{Fs, RealFs};
-use futures::{StreamExt, channel::oneshot, future};
-use git::GitHostingProviderRegistry;
-use gpui::{App, AppContext, Application, AsyncApp, Focusable as _, QuitMode, UpdateGlobal as _};
-
-use gpui_tokio::Tokio;
-use language::LanguageRegistry;
-use onboarding::{FIRST_OPEN, show_onboarding_view};
-use prompt_store::PromptBuilder;
-use remote::RemoteConnectionOptions;
-use reqwest_client::ReqwestClient;
-
-use assets::Assets;
-use node_runtime::{NodeBinaryOptions, NodeRuntime};
-use parking_lot::Mutex;
-use project::project_settings::ProjectSettings;
-use recent_projects::{SshSettings, open_remote_project};
-use release_channel::{AppCommitSha, AppVersion, ReleaseChannel};
-use session::{AppSession, Session};
-use settings::{BaseKeymap, Settings, SettingsStore, watch_config_file};
-use std::{
-    env,
-    io::{self, IsTerminal},
-    path::{Path, PathBuf},
-    process,
-    sync::{Arc, OnceLock},
-    time::Instant,
-};
-use theme::{ActiveTheme, GlobalTheme, ThemeRegistry};
-use util::{ResultExt, TryFutureExt, maybe};
-use uuid::Uuid;
-use workspace::{
-    AppState, PathList, SerializedWorkspaceLocation, Toast, Workspace, WorkspaceSettings,
-    WorkspaceStore, notifications::NotificationId,
-};
-use zed::{
-    OpenListener, OpenRequest, RawOpenRequest, app_menus, build_window_options,
-    derive_paths_with_position, edit_prediction_registry, handle_cli_connection,
-    handle_keymap_file_changes, handle_settings_file_changes, initialize_workspace,
-    open_paths_with_positions,
-};
-
-use crate::zed::{OpenRequestKind, eager_load_active_theme_and_icon_theme};
-
-#[cfg(feature = "mimalloc")]
-#[global_allocator]
-static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
-
-fn files_not_created_on_launch(errors: HashMap<io::ErrorKind, Vec<&Path>>) {
-    let message = "Zed failed to launch";
-    let error_details = errors
-        .into_iter()
-        .flat_map(|(kind, paths)| {
-            #[allow(unused_mut)] // for non-unix platforms
-            let mut error_kind_details = match paths.len() {
-                0 => return None,
-                1 => format!(
-                    "{kind} when creating directory {:?}",
-                    paths.first().expect("match arm checks for a single entry")
-                ),
-                _many => format!("{kind} when creating directories {paths:?}"),
-            };
-
-            #[cfg(unix)]
-            {
-                if kind == io::ErrorKind::PermissionDenied {
-                    error_kind_details.push_str("\n\nConsider using chown and chmod tools for altering the directories permissions if your user has corresponding rights.\
-                        \nFor example, `sudo chown $(whoami):staff ~/.config` and `chmod +uwrx ~/.config`");
-                }
-            }
-
-            Some(error_kind_details)
-        })
-        .collect::<Vec<_>>().join("\n\n");
-
-    eprintln!("{message}: {error_details}");
-    Application::new()
-        .with_quit_mode(QuitMode::Explicit)
-        .run(move |cx| {
-            if let Ok(window) = cx.open_window(gpui::WindowOptions::default(), |_, cx| {
-                cx.new(|_| gpui::Empty)
-            }) {
-                window
-                    .update(cx, |_, window, cx| {
-                        let response = window.prompt(
-                            gpui::PromptLevel::Critical,
-                            message,
-                            Some(&error_details),
-                            &["Exit"],
-                            cx,
-                        );
-
-                        cx.spawn_in(window, async move |_, cx| {
-                            response.await?;
-                            cx.update(|_, cx| cx.quit())
-                        })
-                        .detach_and_log_err(cx);
-                    })
-                    .log_err();
-            } else {
-                fail_to_open_window(anyhow::anyhow!("{message}: {error_details}"), cx)
-            }
-        })
-}
-
-fn fail_to_open_window_async(e: anyhow::Error, cx: &mut AsyncApp) {
-    cx.update(|cx| fail_to_open_window(e, cx)).log_err();
-}
-
-fn fail_to_open_window(e: anyhow::Error, _cx: &mut App) {
-    eprintln!(
-        "Zed failed to open a window: {e:?}. See https://zed.dev/docs/linux for troubleshooting steps."
-    );
-    #[cfg(not(any(target_os = "linux", target_os = "freebsd")))]
-    {
-        process::exit(1);
-    }
-
-    // Maybe unify this with gpui::platform::linux::platform::ResultExt::notify_err(..)?
-    #[cfg(any(target_os = "linux", target_os = "freebsd"))]
-    {
-        use ashpd::desktop::notification::{Notification, NotificationProxy, Priority};
-        _cx.spawn(async move |_cx| {
-            let Ok(proxy) = NotificationProxy::new().await else {
-                process::exit(1);
-            };
-
-            let notification_id = "dev.zed.Oops";
-            proxy
-                .add_notification(
-                    notification_id,
-                    Notification::new("Zed failed to launch")
-                        .body(Some(
-                            format!(
-                                "{e:?}. See https://zed.dev/docs/linux for troubleshooting steps."
-                            )
-                            .as_str(),
-                        ))
-                        .priority(Priority::High)
-                        .icon(ashpd::desktop::Icon::with_names(&[
-                            "dialog-question-symbolic",
-                        ])),
-                )
-                .await
-                .ok();
-
-            process::exit(1);
-        })
-        .detach();
-    }
-}
-pub static STARTUP_TIME: OnceLock<Instant> = OnceLock::new();
-
-pub fn main() {
-    STARTUP_TIME.get_or_init(|| Instant::now());
-
-    #[cfg(unix)]
-    util::prevent_root_execution();
-
-    let args = Args::parse();
-
-    // `zed --askpass` Makes zed operate in nc/netcat mode for use with askpass
-    #[cfg(not(target_os = "windows"))]
-    if let Some(socket) = &args.askpass {
-        askpass::main(socket);
-        return;
-    }
-
-    // `zed --crash-handler` Makes zed operate in minidump crash handler mode
-    if let Some(socket) = &args.crash_handler {
-        crashes::crash_server(socket.as_path());
-        return;
-    }
-
-    // `zed --nc` Makes zed operate in nc/netcat mode for use with MCP
-    if let Some(socket) = &args.nc {
-        match nc::main(socket) {
-            Ok(()) => return,
-            Err(err) => {
-                eprintln!("Error: {}", err);
-                process::exit(1);
-            }
-        }
-    }
-
-    #[cfg(all(not(debug_assertions), target_os = "windows"))]
-    unsafe {
-        use windows::Win32::System::Console::{ATTACH_PARENT_PROCESS, AttachConsole};
-
-        if args.foreground {
-            let _ = AttachConsole(ATTACH_PARENT_PROCESS);
-        }
-    }
-
-    // `zed --printenv` Outputs environment variables as JSON to stdout
-    if args.printenv {
-        util::shell_env::print_env();
-        return;
-    }
-
-    if args.dump_all_actions {
-        dump_all_gpui_actions();
-        return;
-    }
-
-    // Set custom data directory.
-    if let Some(dir) = &args.user_data_dir {
-        paths::set_custom_data_dir(dir);
-    }
-
-    #[cfg(target_os = "windows")]
-    match util::get_zed_cli_path() {
-        Ok(path) => askpass::set_askpass_program(path),
-        Err(err) => {
-            eprintln!("Error: {}", err);
-            if std::option_env!("ZED_BUNDLE").is_some() {
-                process::exit(1);
-            }
-        }
-    }
-
-    let file_errors = init_paths();
-    if !file_errors.is_empty() {
-        files_not_created_on_launch(file_errors);
-        return;
-    }
-
-    zlog::init();
-
-    if stdout_is_a_pty() {
-        zlog::init_output_stdout();
-    } else {
-        let result = zlog::init_output_file(paths::log_file(), Some(paths::old_log_file()));
-        if let Err(err) = result {
-            eprintln!("Could not open log file: {}... Defaulting to stdout", err);
-            zlog::init_output_stdout();
-        };
-    }
-    ztracing::init();
-
-    let version = option_env!("ZED_BUILD_ID");
-    let app_commit_sha =
-        option_env!("ZED_COMMIT_SHA").map(|commit_sha| AppCommitSha::new(commit_sha.to_string()));
-    let app_version = AppVersion::load(env!("CARGO_PKG_VERSION"), version, app_commit_sha.clone());
-
-    if args.system_specs {
-        let system_specs = system_specs::SystemSpecs::new_stateless(
-            app_version,
-            app_commit_sha,
-            *release_channel::RELEASE_CHANNEL,
-        );
-        println!("Zed System Specs (from CLI):\n{}", system_specs);
-        return;
-    }
-
-    rayon::ThreadPoolBuilder::new()
-        .num_threads(std::thread::available_parallelism().map_or(1, |n| n.get().div_ceil(2)))
-        .stack_size(10 * 1024 * 1024)
-        .thread_name(|ix| format!("RayonWorker{}", ix))
-        .build_global()
-        .unwrap();
-
-    log::info!(
-        "========== starting zed version {}, sha {} ==========",
-        app_version,
-        app_commit_sha
-            .as_ref()
-            .map(|sha| sha.short())
-            .as_deref()
-            .unwrap_or("unknown"),
-    );
-
-    #[cfg(windows)]
-    check_for_conpty_dll();
-
-    let app = Application::new().with_assets(Assets);
-
-    let system_id = app.background_executor().spawn(system_id());
-    let installation_id = app.background_executor().spawn(installation_id());
-    let session_id = Uuid::new_v4().to_string();
-    let session = app
-        .background_executor()
-        .spawn(Session::new(session_id.clone()));
-
-    app.background_executor()
-        .spawn(crashes::init(InitCrashHandler {
-            session_id,
-            zed_version: app_version.to_string(),
-            binary: "zed".to_string(),
-            release_channel: release_channel::RELEASE_CHANNEL_NAME.clone(),
-            commit_sha: app_commit_sha
-                .as_ref()
-                .map(|sha| sha.full())
-                .unwrap_or_else(|| "no sha".to_owned()),
-        }))
-        .detach();
-
-    let (open_listener, mut open_rx) = OpenListener::new();
-
-    let failed_single_instance_check = if *zed_env_vars::ZED_STATELESS
-        || *release_channel::RELEASE_CHANNEL == ReleaseChannel::Dev
-    {
-        false
-    } else {
-        #[cfg(any(target_os = "linux", target_os = "freebsd"))]
-        {
-            crate::zed::listen_for_cli_connections(open_listener.clone()).is_err()
-        }
-
-        #[cfg(target_os = "windows")]
-        {
-            !crate::zed::windows_only_instance::handle_single_instance(open_listener.clone(), &args)
-        }
-
-        #[cfg(target_os = "macos")]
-        {
-            use zed::mac_only_instance::*;
-            ensure_only_instance() != IsOnlyInstance::Yes
-        }
-    };
-    if failed_single_instance_check {
-        println!("zed is already running");
-        return;
-    }
-
-    let git_hosting_provider_registry = Arc::new(GitHostingProviderRegistry::new());
-    let git_binary_path =
-        if cfg!(target_os = "macos") && option_env!("ZED_BUNDLE").as_deref() == Some("true") {
-            app.path_for_auxiliary_executable("git")
-                .context("could not find git binary path")
-                .log_err()
-        } else {
-            None
-        };
-    if let Some(git_binary_path) = &git_binary_path {
-        log::info!("Using git binary path: {:?}", git_binary_path);
-    }
-
-    let fs = Arc::new(RealFs::new(git_binary_path, app.background_executor()));
-    let user_settings_file_rx = watch_config_file(
-        &app.background_executor(),
-        fs.clone(),
-        paths::settings_file().clone(),
-    );
-    let global_settings_file_rx = watch_config_file(
-        &app.background_executor(),
-        fs.clone(),
-        paths::global_settings_file().clone(),
-    );
-    let user_keymap_file_rx = watch_config_file(
-        &app.background_executor(),
-        fs.clone(),
-        paths::keymap_file().clone(),
-    );
-
-    let (shell_env_loaded_tx, shell_env_loaded_rx) = oneshot::channel();
-    if !stdout_is_a_pty() {
-        app.background_executor()
-            .spawn(async {
-                #[cfg(unix)]
-                util::load_login_shell_environment().await.log_err();
-                shell_env_loaded_tx.send(()).ok();
-            })
-            .detach()
-    } else {
-        drop(shell_env_loaded_tx)
-    }
-
-    app.on_open_urls({
-        let open_listener = open_listener.clone();
-        move |urls| {
-            open_listener.open(RawOpenRequest {
-                urls,
-                diff_paths: Vec::new(),
-                ..Default::default()
-            })
-        }
-    });
-    app.on_reopen(move |cx| {
-        if let Some(app_state) = AppState::try_global(cx).and_then(|app_state| app_state.upgrade())
-        {
-            cx.spawn({
-                let app_state = app_state;
-                async move |cx| {
-                    if let Err(e) = restore_or_create_workspace(app_state, cx).await {
-                        fail_to_open_window_async(e, cx)
-                    }
-                }
-            })
-            .detach();
-        }
-    });
-
-    app.run(move |cx| {
-        menu::init();
-        zed_actions::init();
-
-        release_channel::init(app_version, cx);
-        gpui_tokio::init(cx);
-        if let Some(app_commit_sha) = app_commit_sha {
-            AppCommitSha::set_global(app_commit_sha, cx);
-        }
-        settings::init(cx);
-        zlog_settings::init(cx);
-        handle_settings_file_changes(user_settings_file_rx, global_settings_file_rx, cx);
-        handle_keymap_file_changes(user_keymap_file_rx, cx);
-
-        let user_agent = format!(
-            "Zed/{} ({}; {})",
-            AppVersion::global(cx),
-            std::env::consts::OS,
-            std::env::consts::ARCH
-        );
-        let proxy_url = ProxySettings::get_global(cx).proxy_url();
-        let http = {
-            let _guard = Tokio::handle(cx).enter();
-
-            ReqwestClient::proxy_and_user_agent(proxy_url, &user_agent)
-                .expect("could not start HTTP client")
-        };
-        cx.set_http_client(Arc::new(http));
-
-        <dyn Fs>::set_global(fs.clone(), cx);
-
-        GitHostingProviderRegistry::set_global(git_hosting_provider_registry, cx);
-        git_hosting_providers::init(cx);
-
-        OpenListener::set_global(cx, open_listener.clone());
-
-        extension::init(cx);
-        let extension_host_proxy = ExtensionHostProxy::global(cx);
-
-        let client = Client::production(cx);
-        cx.set_http_client(client.http_client());
-        let mut languages = LanguageRegistry::new(cx.background_executor().clone());
-        languages.set_language_server_download_dir(paths::languages_dir().clone());
-        let languages = Arc::new(languages);
-        let (mut tx, rx) = watch::channel(None);
-        cx.observe_global::<SettingsStore>(move |cx| {
-            let settings = &ProjectSettings::get_global(cx).node;
-            let options = NodeBinaryOptions {
-                allow_path_lookup: !settings.ignore_system_version,
-                // TODO: Expose this setting
-                allow_binary_download: true,
-                use_paths: settings.path.as_ref().map(|node_path| {
-                    let node_path = PathBuf::from(shellexpand::tilde(node_path).as_ref());
-                    let npm_path = settings
-                        .npm_path
-                        .as_ref()
-                        .map(|path| PathBuf::from(shellexpand::tilde(&path).as_ref()));
-                    (
-                        node_path.clone(),
-                        npm_path.unwrap_or_else(|| {
-                            let base_path = PathBuf::new();
-                            node_path.parent().unwrap_or(&base_path).join("npm")
-                        }),
-                    )
-                }),
-            };
-            tx.send(Some(options)).log_err();
-        })
-        .detach();
-        let node_runtime = NodeRuntime::new(client.http_client(), Some(shell_env_loaded_rx), rx);
-
-        debug_adapter_extension::init(extension_host_proxy.clone(), cx);
-        languages::init(languages.clone(), fs.clone(), node_runtime.clone(), cx);
-        let user_store = cx.new(|cx| UserStore::new(client.clone(), cx));
-        let workspace_store = cx.new(|cx| WorkspaceStore::new(client.clone(), cx));
-
-        language_extension::init(
-            language_extension::LspAccess::ViaWorkspaces({
-                let workspace_store = workspace_store.clone();
-                Arc::new(move |cx: &mut App| {
-                    workspace_store.update(cx, |workspace_store, cx| {
-                        workspace_store
-                            .workspaces()
-                            .iter()
-                            .map(|workspace| {
-                                workspace.update(cx, |workspace, _, cx| {
-                                    workspace.project().read(cx).lsp_store()
-                                })
-                            })
-                            .collect()
-                    })
-                })
-            }),
-            extension_host_proxy.clone(),
-            languages.clone(),
-        );
-
-        Client::set_global(client.clone(), cx);
-
-        zed::init(cx);
-        project::Project::init(&client, cx);
-        debugger_ui::init(cx);
-        debugger_tools::init(cx);
-        client::init(&client, cx);
-
-        let system_id = cx.background_executor().block(system_id).ok();
-        let installation_id = cx.background_executor().block(installation_id).ok();
-        let session = cx.background_executor().block(session);
-
-        let telemetry = client.telemetry();
-        telemetry.start(
-            system_id.as_ref().map(|id| id.to_string()),
-            installation_id.as_ref().map(|id| id.to_string()),
-            session.id().to_owned(),
-            cx,
-        );
-
-        // We should rename these in the future to `first app open`, `first app open for release channel`, and `app open`
-        if let (Some(system_id), Some(installation_id)) = (&system_id, &installation_id) {
-            match (&system_id, &installation_id) {
-                (IdType::New(_), IdType::New(_)) => {
-                    telemetry::event!("App First Opened");
-                    telemetry::event!("App First Opened For Release Channel");
-                }
-                (IdType::Existing(_), IdType::New(_)) => {
-                    telemetry::event!("App First Opened For Release Channel");
-                }
-                (_, IdType::Existing(_)) => {
-                    telemetry::event!("App Opened");
-                }
-            }
-        }
-        let app_session = cx.new(|cx| AppSession::new(session, cx));
-
-        let app_state = Arc::new(AppState {
-            languages,
-            client: client.clone(),
-            user_store,
-            fs: fs.clone(),
-            build_window_options,
-            workspace_store,
-            node_runtime,
-            session: app_session,
-        });
-        AppState::set_global(Arc::downgrade(&app_state), cx);
-
-        auto_update::init(client.clone(), cx);
-        dap_adapters::init(cx);
-        auto_update_ui::init(cx);
-        reliability::init(client.clone(), cx);
-        extension_host::init(
-            extension_host_proxy.clone(),
-            app_state.fs.clone(),
-            app_state.client.clone(),
-            app_state.node_runtime.clone(),
-            cx,
-        );
-
-        theme::init(theme::LoadThemes::All(Box::new(Assets)), cx);
-        eager_load_active_theme_and_icon_theme(fs.clone(), cx);
-        theme_extension::init(
-            extension_host_proxy,
-            ThemeRegistry::global(cx),
-            cx.background_executor().clone(),
-        );
-        command_palette::init(cx);
-        let copilot_language_server_id = app_state.languages.next_language_server_id();
-        copilot::init(
-            copilot_language_server_id,
-            app_state.fs.clone(),
-            app_state.client.http_client(),
-            app_state.node_runtime.clone(),
-            cx,
-        );
-        supermaven::init(app_state.client.clone(), cx);
-        language_model::init(app_state.client.clone(), cx);
-        language_models::init(app_state.user_store.clone(), app_state.client.clone(), cx);
-        acp_tools::init(cx);
-        edit_prediction_ui::init(cx);
-        web_search::init(cx);
-        web_search_providers::init(app_state.client.clone(), cx);
-        snippet_provider::init(cx);
-        edit_prediction_registry::init(app_state.client.clone(), app_state.user_store.clone(), cx);
-        let prompt_builder = PromptBuilder::load(app_state.fs.clone(), stdout_is_a_pty(), cx);
-        agent_ui::init(
-            app_state.fs.clone(),
-            app_state.client.clone(),
-            prompt_builder.clone(),
-            app_state.languages.clone(),
-            false,
-            cx,
-        );
-        repl::init(app_state.fs.clone(), cx);
-        recent_projects::init(cx);
-
-        load_embedded_fonts(cx);
-
-        editor::init(cx);
-        image_viewer::init(cx);
-        repl::notebook::init(cx);
-        diagnostics::init(cx);
-
-        audio::init(cx);
-        workspace::init(app_state.clone(), cx);
-        ui_prompt::init(cx);
-
-        go_to_line::init(cx);
-        file_finder::init(cx);
-        tab_switcher::init(cx);
-        outline::init(cx);
-        project_symbols::init(cx);
-        project_panel::init(cx);
-        outline_panel::init(cx);
-        tasks_ui::init(cx);
-        snippets_ui::init(cx);
-        channel::init(&app_state.client.clone(), app_state.user_store.clone(), cx);
-        search::init(cx);
-        vim::init(cx);
-        terminal_view::init(cx);
-        journal::init(app_state.clone(), cx);
-        language_selector::init(cx);
-        line_ending_selector::init(cx);
-        toolchain_selector::init(cx);
-        theme_selector::init(cx);
-        settings_profile_selector::init(cx);
-        language_tools::init(cx);
-        call::init(app_state.client.clone(), app_state.user_store.clone(), cx);
-        notifications::init(app_state.client.clone(), app_state.user_store.clone(), cx);
-        collab_ui::init(&app_state, cx);
-        git_ui::init(cx);
-        feedback::init(cx);
-        markdown_preview::init(cx);
-        svg_preview::init(cx);
-        onboarding::init(cx);
-        settings_ui::init(cx);
-        keymap_editor::init(cx);
-        extensions_ui::init(cx);
-        edit_prediction::init(cx);
-        inspector_ui::init(app_state.clone(), cx);
-        json_schema_store::init(cx);
-        miniprofiler_ui::init(*STARTUP_TIME.get().unwrap(), cx);
-
-        cx.observe_global::<SettingsStore>({
-            let http = app_state.client.http_client();
-            let client = app_state.client.clone();
-            move |cx| {
-                for &mut window in cx.windows().iter_mut() {
-                    let background_appearance = cx.theme().window_background_appearance();
-                    window
-                        .update(cx, |_, window, _| {
-                            window.set_background_appearance(background_appearance)
-                        })
-                        .ok();
-                }
-
-                let new_host = &client::ClientSettings::get_global(cx).server_url;
-                if &http.base_url() != new_host {
-                    http.set_base_url(new_host);
-                    if client.status().borrow().is_connected() {
-                        client.reconnect(&cx.to_async());
-                    }
-                }
-            }
-        })
-        .detach();
-        app_state.languages.set_theme(cx.theme().clone());
-        cx.observe_global::<GlobalTheme>({
-            let languages = app_state.languages.clone();
-            move |cx| {
-                languages.set_theme(cx.theme().clone());
-            }
-        })
-        .detach();
-        telemetry::event!(
-            "Settings Changed",
-            setting = "theme",
-            value = cx.theme().name.to_string()
-        );
-        telemetry::event!(
-            "Settings Changed",
-            setting = "keymap",
-            value = BaseKeymap::get_global(cx).to_string()
-        );
-        telemetry.flush_events().detach();
-
-        let fs = app_state.fs.clone();
-        load_user_themes_in_background(fs.clone(), cx);
-        watch_themes(fs.clone(), cx);
-        watch_languages(fs.clone(), app_state.languages.clone(), cx);
-
-        let menus = app_menus(cx);
-        cx.set_menus(menus);
-        initialize_workspace(app_state.clone(), prompt_builder, cx);
-
-        cx.activate(true);
-
-        cx.spawn({
-            let client = app_state.client.clone();
-            async move |cx| authenticate(client, cx).await
-        })
-        .detach_and_log_err(cx);
-
-        let urls: Vec<_> = args
-            .paths_or_urls
-            .iter()
-            .map(|arg| parse_url_arg(arg, cx))
-            .collect();
-
-        let diff_paths: Vec<[String; 2]> = args
-            .diff
-            .chunks(2)
-            .map(|chunk| [chunk[0].clone(), chunk[1].clone()])
-            .collect();
-
-        #[cfg(target_os = "windows")]
-        let wsl = args.wsl;
-        #[cfg(not(target_os = "windows"))]
-        let wsl = None;
-
-        if !urls.is_empty() || !diff_paths.is_empty() {
-            open_listener.open(RawOpenRequest {
-                urls,
-                diff_paths,
-                wsl,
-            })
-        }
-
-        match open_rx
-            .try_next()
-            .ok()
-            .flatten()
-            .and_then(|request| OpenRequest::parse(request, cx).log_err())
-        {
-            Some(request) => {
-                handle_open_request(request, app_state.clone(), cx);
-            }
-            None => {
-                cx.spawn({
-                    let app_state = app_state.clone();
-                    async move |cx| {
-                        if let Err(e) = restore_or_create_workspace(app_state, cx).await {
-                            fail_to_open_window_async(e, cx)
-                        }
-                    }
-                })
-                .detach();
-            }
-        }
-
-        let app_state = app_state.clone();
-
-        crate::zed::component_preview::init(app_state.clone(), cx);
-
-        cx.spawn(async move |cx| {
-            while let Some(urls) = open_rx.next().await {
-                cx.update(|cx| {
-                    if let Some(request) = OpenRequest::parse(urls, cx).log_err() {
-                        handle_open_request(request, app_state.clone(), cx);
-                    }
-                })
-                .ok();
-            }
-        })
-        .detach();
-    });
-}
-
-fn handle_open_request(request: OpenRequest, app_state: Arc<AppState>, cx: &mut App) {
-    if let Some(kind) = request.kind {
-        match kind {
-            OpenRequestKind::CliConnection(connection) => {
-                cx.spawn(async move |cx| handle_cli_connection(connection, app_state, cx).await)
-                    .detach();
-            }
-            OpenRequestKind::Extension { extension_id } => {
-                cx.spawn(async move |cx| {
-                    let workspace =
-                        workspace::get_any_active_workspace(app_state, cx.clone()).await?;
-                    workspace.update(cx, |_, window, cx| {
-                        window.dispatch_action(
-                            Box::new(zed_actions::Extensions {
-                                category_filter: None,
-                                id: Some(extension_id),
-                            }),
-                            cx,
-                        );
-                    })
-                })
-                .detach_and_log_err(cx);
-            }
-            OpenRequestKind::AgentPanel => {
-                cx.spawn(async move |cx| {
-                    let workspace =
-                        workspace::get_any_active_workspace(app_state, cx.clone()).await?;
-                    workspace.update(cx, |workspace, window, cx| {
-                        if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
-                            panel.focus_handle(cx).focus(window);
-                        }
-                    })
-                })
-                .detach_and_log_err(cx);
-            }
-            OpenRequestKind::DockMenuAction { index } => {
-                cx.perform_dock_menu_action(index);
-            }
-            OpenRequestKind::BuiltinJsonSchema { schema_path } => {
-                workspace::with_active_or_new_workspace(cx, |_workspace, window, cx| {
-                    cx.spawn_in(window, async move |workspace, cx| {
-                        let res = async move {
-                            let json = app_state.languages.language_for_name("JSONC").await.ok();
-                            let json_schema_content =
-                                json_schema_store::resolve_schema_request_inner(
-                                    &app_state.languages,
-                                    &schema_path,
-                                    cx,
-                                )?;
-                            let json_schema_content =
-                                serde_json::to_string_pretty(&json_schema_content)
-                                    .context("Failed to serialize JSON Schema as JSON")?;
-                            let buffer_task = workspace.update(cx, |workspace, cx| {
-                                workspace
-                                    .project()
-                                    .update(cx, |project, cx| project.create_buffer(false, cx))
-                            })?;
-
-                            let buffer = buffer_task.await?;
-
-                            workspace.update_in(cx, |workspace, window, cx| {
-                                buffer.update(cx, |buffer, cx| {
-                                    buffer.set_language(json, cx);
-                                    buffer.edit([(0..0, json_schema_content)], None, cx);
-                                    buffer.edit(
-                                        [(0..0, format!("// {} JSON Schema\n", schema_path))],
-                                        None,
-                                        cx,
-                                    );
-                                });
-
-                                workspace.add_item_to_active_pane(
-                                    Box::new(cx.new(|cx| {
-                                        let mut editor =
-                                            editor::Editor::for_buffer(buffer, None, window, cx);
-                                        editor.set_read_only(true);
-                                        editor
-                                    })),
-                                    None,
-                                    true,
-                                    window,
-                                    cx,
-                                );
-                            })
-                        }
-                        .await;
-                        res.context("Failed to open builtin JSON Schema").log_err();
-                    })
-                    .detach();
-                });
-            }
-            OpenRequestKind::Setting { setting_path } => {
-                // zed://settings/languages/$(language)/tab_size  - DONT SUPPORT
-                // zed://settings/languages/Rust/tab_size  - SUPPORT
-                // languages.$(language).tab_size
-                // [ languages $(language) tab_size]
-                cx.spawn(async move |cx| {
-                    let workspace =
-                        workspace::get_any_active_workspace(app_state, cx.clone()).await?;
-
-                    workspace.update(cx, |_, window, cx| match setting_path {
-                        None => window.dispatch_action(Box::new(zed_actions::OpenSettings), cx),
-                        Some(setting_path) => window.dispatch_action(
-                            Box::new(zed_actions::OpenSettingsAt { path: setting_path }),
-                            cx,
-                        ),
-                    })
-                })
-                .detach_and_log_err(cx);
-            }
-        }
-
-        return;
-    }
-
-    if let Some(connection_options) = request.remote_connection {
-        cx.spawn(async move |cx| {
-            let paths: Vec<PathBuf> = request.open_paths.into_iter().map(PathBuf::from).collect();
-            open_remote_project(
-                connection_options,
-                paths,
-                app_state,
-                workspace::OpenOptions::default(),
-                cx,
-            )
-            .await
-        })
-        .detach_and_log_err(cx);
-        return;
-    }
-
-    let mut task = None;
-    if !request.open_paths.is_empty() || !request.diff_paths.is_empty() {
-        let app_state = app_state.clone();
-        task = Some(cx.spawn(async move |cx| {
-            let paths_with_position =
-                derive_paths_with_position(app_state.fs.as_ref(), request.open_paths).await;
-            let (_window, results) = open_paths_with_positions(
-                &paths_with_position,
-                &request.diff_paths,
-                app_state,
-                workspace::OpenOptions::default(),
-                cx,
-            )
-            .await?;
-            for result in results.into_iter().flatten() {
-                if let Err(err) = result {
-                    log::error!("Error opening path: {err}",);
-                }
-            }
-            anyhow::Ok(())
-        }));
-    }
-
-    if !request.open_channel_notes.is_empty() || request.join_channel.is_some() {
-        cx.spawn(async move |cx| {
-            let result = maybe!(async {
-                if let Some(task) = task {
-                    task.await?;
-                }
-                let client = app_state.client.clone();
-                // we continue even if authentication fails as join_channel/ open channel notes will
-                // show a visible error message.
-                authenticate(client, cx).await.log_err();
-
-                if let Some(channel_id) = request.join_channel {
-                    cx.update(|cx| {
-                        workspace::join_channel(
-                            client::ChannelId(channel_id),
-                            app_state.clone(),
-                            None,
-                            cx,
-                        )
-                    })?
-                    .await?;
-                }
-
-                let workspace_window =
-                    workspace::get_any_active_workspace(app_state, cx.clone()).await?;
-                let workspace = workspace_window.entity(cx)?;
-
-                let mut promises = Vec::new();
-                for (channel_id, heading) in request.open_channel_notes {
-                    promises.push(cx.update_window(workspace_window.into(), |_, window, cx| {
-                        ChannelView::open(
-                            client::ChannelId(channel_id),
-                            heading,
-                            workspace.clone(),
-                            window,
-                            cx,
-                        )
-                        .log_err()
-                    })?)
-                }
-                future::join_all(promises).await;
-                anyhow::Ok(())
-            })
-            .await;
-            if let Err(err) = result {
-                fail_to_open_window_async(err, cx);
-            }
-        })
-        .detach()
-    } else if let Some(task) = task {
-        cx.spawn(async move |cx| {
-            if let Err(err) = task.await {
-                fail_to_open_window_async(err, cx);
-            }
-        })
-        .detach();
-    }
-}
-
-async fn authenticate(client: Arc<Client>, cx: &AsyncApp) -> Result<()> {
-    if stdout_is_a_pty() {
-        if client::IMPERSONATE_LOGIN.is_some() {
-            client.sign_in_with_optional_connect(false, cx).await?;
-        } else if client.has_credentials(cx).await {
-            client.sign_in_with_optional_connect(true, cx).await?;
-        }
-    } else if client.has_credentials(cx).await {
-        client.sign_in_with_optional_connect(true, cx).await?;
-    }
-
-    Ok(())
-}
-
-async fn system_id() -> Result<IdType> {
-    let key_name = "system_id".to_string();
-
-    if let Ok(Some(system_id)) = GLOBAL_KEY_VALUE_STORE.read_kvp(&key_name) {
-        return Ok(IdType::Existing(system_id));
-    }
-
-    let system_id = Uuid::new_v4().to_string();
-
-    GLOBAL_KEY_VALUE_STORE
-        .write_kvp(key_name, system_id.clone())
-        .await?;
-
-    Ok(IdType::New(system_id))
-}
-
-async fn installation_id() -> Result<IdType> {
-    let legacy_key_name = "device_id".to_string();
-    let key_name = "installation_id".to_string();
-
-    // Migrate legacy key to new key
-    if let Ok(Some(installation_id)) = KEY_VALUE_STORE.read_kvp(&legacy_key_name) {
-        KEY_VALUE_STORE
-            .write_kvp(key_name, installation_id.clone())
-            .await?;
-        KEY_VALUE_STORE.delete_kvp(legacy_key_name).await?;
-        return Ok(IdType::Existing(installation_id));
-    }
-
-    if let Ok(Some(installation_id)) = KEY_VALUE_STORE.read_kvp(&key_name) {
-        return Ok(IdType::Existing(installation_id));
-    }
-
-    let installation_id = Uuid::new_v4().to_string();
-
-    KEY_VALUE_STORE
-        .write_kvp(key_name, installation_id.clone())
-        .await?;
-
-    Ok(IdType::New(installation_id))
-}
-
-async fn restore_or_create_workspace(app_state: Arc<AppState>, cx: &mut AsyncApp) -> Result<()> {
-    if let Some(locations) = restorable_workspace_locations(cx, &app_state).await {
-        let use_system_window_tabs = cx
-            .update(|cx| WorkspaceSettings::get_global(cx).use_system_window_tabs)
-            .unwrap_or(false);
-        let mut results: Vec<Result<(), Error>> = Vec::new();
-        let mut tasks = Vec::new();
-
-        for (index, (location, paths)) in locations.into_iter().enumerate() {
-            match location {
-                SerializedWorkspaceLocation::Local => {
-                    let app_state = app_state.clone();
-                    let task = cx.spawn(async move |cx| {
-                        let open_task = cx.update(|cx| {
-                            workspace::open_paths(
-                                &paths.paths(),
-                                app_state,
-                                workspace::OpenOptions::default(),
-                                cx,
-                            )
-                        })?;
-                        open_task.await.map(|_| ())
-                    });
-
-                    // If we're using system window tabs and this is the first workspace,
-                    // wait for it to finish so that the other windows can be added as tabs.
-                    if use_system_window_tabs && index == 0 {
-                        results.push(task.await);
-                    } else {
-                        tasks.push(task);
-                    }
-                }
-                SerializedWorkspaceLocation::Remote(mut connection_options) => {
-                    let app_state = app_state.clone();
-                    if let RemoteConnectionOptions::Ssh(options) = &mut connection_options {
-                        cx.update(|cx| {
-                            SshSettings::get_global(cx)
-                                .fill_connection_options_from_settings(options)
-                        })?;
-                    }
-                    let task = cx.spawn(async move |cx| {
-                        recent_projects::open_remote_project(
-                            connection_options,
-                            paths.paths().into_iter().map(PathBuf::from).collect(),
-                            app_state,
-                            workspace::OpenOptions::default(),
-                            cx,
-                        )
-                        .await
-                        .map_err(|e| anyhow::anyhow!(e))
-                    });
-                    tasks.push(task);
-                }
-            }
-        }
-
-        // Wait for all workspaces to open concurrently
-        results.extend(future::join_all(tasks).await);
-
-        // Show notifications for any errors that occurred
-        let mut error_count = 0;
-        for result in results {
-            if let Err(e) = result {
-                log::error!("Failed to restore workspace: {}", e);
-                error_count += 1;
-            }
-        }
-
-        if error_count > 0 {
-            let message = if error_count == 1 {
-                "Failed to restore 1 workspace. Check logs for details.".to_string()
-            } else {
-                format!(
-                    "Failed to restore {} workspaces. Check logs for details.",
-                    error_count
-                )
-            };
-
-            // Try to find an active workspace to show the toast
-            let toast_shown = cx
-                .update(|cx| {
-                    if let Some(window) = cx.active_window()
-                        && let Some(workspace) = window.downcast::<Workspace>()
-                    {
-                        workspace
-                            .update(cx, |workspace, _, cx| {
-                                workspace.show_toast(
-                                    Toast::new(NotificationId::unique::<()>(), message),
-                                    cx,
-                                )
-                            })
-                            .ok();
-                        return true;
-                    }
-                    false
-                })
-                .unwrap_or(false);
-
-            // If we couldn't show a toast (no windows opened successfully),
-            // we've already logged the errors above, so the user can check logs
-            if !toast_shown {
-                log::error!(
-                    "Failed to show notification for window restoration errors, because no workspace windows were available."
-                );
-            }
-        }
-    } else if matches!(KEY_VALUE_STORE.read_kvp(FIRST_OPEN), Ok(None)) {
-        cx.update(|cx| show_onboarding_view(app_state, cx))?.await?;
-    } else {
-        cx.update(|cx| {
-            workspace::open_new(
-                Default::default(),
-                app_state,
-                cx,
-                |workspace, window, cx| {
-                    Editor::new_file(workspace, &Default::default(), window, cx)
-                },
-            )
-        })?
-        .await?;
-    }
-
-    Ok(())
-}
-
-pub(crate) async fn restorable_workspace_locations(
-    cx: &mut AsyncApp,
-    app_state: &Arc<AppState>,
-) -> Option<Vec<(SerializedWorkspaceLocation, PathList)>> {
-    let mut restore_behavior = cx
-        .update(|cx| WorkspaceSettings::get(None, cx).restore_on_startup)
-        .ok()?;
-
-    let session_handle = app_state.session.clone();
-    let (last_session_id, last_session_window_stack) = cx
-        .update(|cx| {
-            let session = session_handle.read(cx);
-
-            (
-                session.last_session_id().map(|id| id.to_string()),
-                session.last_session_window_stack(),
-            )
-        })
-        .ok()?;
-
-    if last_session_id.is_none()
-        && matches!(
-            restore_behavior,
-            workspace::RestoreOnStartupBehavior::LastSession
-        )
-    {
-        restore_behavior = workspace::RestoreOnStartupBehavior::LastWorkspace;
-    }
-
-    match restore_behavior {
-        workspace::RestoreOnStartupBehavior::LastWorkspace => {
-            workspace::last_opened_workspace_location()
-                .await
-                .map(|location| vec![location])
-        }
-        workspace::RestoreOnStartupBehavior::LastSession => {
-            if let Some(last_session_id) = last_session_id {
-                let ordered = last_session_window_stack.is_some();
-
-                let mut locations = workspace::last_session_workspace_locations(
-                    &last_session_id,
-                    last_session_window_stack,
-                )
-                .filter(|locations| !locations.is_empty());
-
-                // Since last_session_window_order returns the windows ordered front-to-back
-                // we need to open the window that was frontmost last.
-                if ordered && let Some(locations) = locations.as_mut() {
-                    locations.reverse();
-                }
-
-                locations
-            } else {
-                None
-            }
-        }
-        _ => None,
-    }
-}
-
-fn init_paths() -> HashMap<io::ErrorKind, Vec<&'static Path>> {
-    [
-        paths::config_dir(),
-        paths::extensions_dir(),
-        paths::languages_dir(),
-        paths::debug_adapters_dir(),
-        paths::database_dir(),
-        paths::logs_dir(),
-        paths::temp_dir(),
-        paths::hang_traces_dir(),
-    ]
-    .into_iter()
-    .fold(HashMap::default(), |mut errors, path| {
-        if let Err(e) = std::fs::create_dir_all(path) {
-            errors.entry(e.kind()).or_insert_with(Vec::new).push(path);
-        }
-        errors
-    })
-}
-
-pub fn stdout_is_a_pty() -> bool {
-    std::env::var(FORCE_CLI_MODE_ENV_VAR_NAME).ok().is_none() && io::stdout().is_terminal()
-}
-
-#[derive(Parser, Debug)]
-#[command(name = "zed", disable_version_flag = true, max_term_width = 100)]
-struct Args {
-    /// A sequence of space-separated paths or urls that you want to open.
-    ///
-    /// Use `path:line:row` syntax to open a file at a specific location.
-    /// Non-existing paths and directories will ignore `:line:row` suffix.
-    ///
-    /// URLs can either be `file://` or `zed://` scheme, or relative to <https://zed.dev>.
-    paths_or_urls: Vec<String>,
-
-    /// Pairs of file paths to diff. Can be specified multiple times.
-    #[arg(long, action = clap::ArgAction::Append, num_args = 2, value_names = ["OLD_PATH", "NEW_PATH"])]
-    diff: Vec<String>,
-
-    /// Sets a custom directory for all user data (e.g., database, extensions, logs).
-    ///
-    /// This overrides the default platform-specific data directory location.
-    /// On macOS, the default is `~/Library/Application Support/Zed`.
-    /// On Linux/FreeBSD, the default is `$XDG_DATA_HOME/zed`.
-    /// On Windows, the default is `%LOCALAPPDATA%\Zed`.
-    #[arg(long, value_name = "DIR", verbatim_doc_comment)]
-    user_data_dir: Option<String>,
-
-    /// The username and WSL distribution to use when opening paths. If not specified,
-    /// Zed will attempt to open the paths directly.
-    ///
-    /// The username is optional, and if not specified, the default user for the distribution
-    /// will be used.
-    ///
-    /// Example: `me@Ubuntu` or `Ubuntu`.
-    ///
-    /// WARN: You should not fill in this field by hand.
-    #[cfg(target_os = "windows")]
-    #[arg(long, value_name = "USER@DISTRO")]
-    wsl: Option<String>,
-
-    /// Instructs zed to run as a dev server on this machine. (not implemented)
-    #[arg(long)]
-    dev_server_token: Option<String>,
-
-    /// Prints system specs.
-    ///
-    /// Useful for submitting issues on GitHub when encountering a bug that
-    /// prevents Zed from starting, so you can't run `zed: copy system specs to
-    /// clipboard`
-    #[arg(long)]
-    system_specs: bool,
-
-    /// Used for the MCP Server, to remove the need for netcat as a dependency,
-    /// by having Zed act like netcat communicating over a Unix socket.
-    #[arg(long, hide = true)]
-    nc: Option<String>,
-
-    /// Used for recording minidumps on crashes by having Zed run a separate
-    /// process communicating over a socket.
-    #[arg(long, hide = true)]
-    crash_handler: Option<PathBuf>,
-
-    /// Run zed in the foreground, only used on Windows, to match the behavior on macOS.
-    #[arg(long)]
-    #[cfg(target_os = "windows")]
-    #[arg(hide = true)]
-    foreground: bool,
-
-    /// The dock action to perform. This is used on Windows only.
-    #[arg(long)]
-    #[cfg(target_os = "windows")]
-    #[arg(hide = true)]
-    dock_action: Option<usize>,
-
-    /// Used for SSH/Git password authentication, to remove the need for netcat as a dependency,
-    /// by having Zed act like netcat communicating over a Unix socket.
-    #[arg(long)]
-    #[cfg(not(target_os = "windows"))]
-    #[arg(hide = true)]
-    askpass: Option<String>,
-
-    #[arg(long, hide = true)]
-    dump_all_actions: bool,
-
-    /// Output current environment variables as JSON to stdout
-    #[arg(long, hide = true)]
-    printenv: bool,
-}
-
-#[derive(Clone, Debug)]
-enum IdType {
-    New(String),
-    Existing(String),
-}
-
-impl ToString for IdType {
-    fn to_string(&self) -> String {
-        match self {
-            IdType::New(id) | IdType::Existing(id) => id.clone(),
-        }
-    }
-}
-
-fn parse_url_arg(arg: &str, cx: &App) -> String {
-    match std::fs::canonicalize(Path::new(&arg)) {
-        Ok(path) => format!("file://{}", path.display()),
-        Err(_) => {
-            if arg.starts_with("file://")
-                || arg.starts_with("zed-cli://")
-                || arg.starts_with("ssh://")
-                || parse_zed_link(arg, cx).is_some()
-            {
-                arg.into()
-            } else {
-                format!("file://{arg}")
-            }
-        }
-    }
-}
-
-fn load_embedded_fonts(cx: &App) {
-    let asset_source = cx.asset_source();
-    let font_paths = asset_source.list("fonts").unwrap();
-    let embedded_fonts = Mutex::new(Vec::new());
-    let executor = cx.background_executor();
-
-    executor.block(executor.scoped(|scope| {
-        for font_path in &font_paths {
-            if !font_path.ends_with(".ttf") {
-                continue;
-            }
-
-            scope.spawn(async {
-                let font_bytes = asset_source.load(font_path).unwrap().unwrap();
-                embedded_fonts.lock().push(font_bytes);
-            });
-        }
-    }));
-
-    cx.text_system()
-        .add_fonts(embedded_fonts.into_inner())
-        .unwrap();
-}
-
-/// Spawns a background task to load the user themes from the themes directory.
-fn load_user_themes_in_background(fs: Arc<dyn fs::Fs>, cx: &mut App) {
-    cx.spawn({
-        let fs = fs.clone();
-        async move |cx| {
-            if let Some(theme_registry) = cx.update(|cx| ThemeRegistry::global(cx)).log_err() {
-                let themes_dir = paths::themes_dir().as_ref();
-                match fs
-                    .metadata(themes_dir)
-                    .await
-                    .ok()
-                    .flatten()
-                    .map(|m| m.is_dir)
-                {
-                    Some(is_dir) => {
-                        anyhow::ensure!(is_dir, "Themes dir path {themes_dir:?} is not a directory")
-                    }
-                    None => {
-                        fs.create_dir(themes_dir).await.with_context(|| {
-                            format!("Failed to create themes dir at path {themes_dir:?}")
-                        })?;
-                    }
-                }
-                theme_registry.load_user_themes(themes_dir, fs).await?;
-                cx.update(GlobalTheme::reload_theme)?;
-            }
-            anyhow::Ok(())
-        }
-    })
-    .detach_and_log_err(cx);
-}
-
-/// Spawns a background task to watch the themes directory for changes.
-fn watch_themes(fs: Arc<dyn fs::Fs>, cx: &mut App) {
-    use std::time::Duration;
-    cx.spawn(async move |cx| {
-        let (mut events, _) = fs
-            .watch(paths::themes_dir(), Duration::from_millis(100))
-            .await;
-
-        while let Some(paths) = events.next().await {
-            for event in paths {
-                if fs.metadata(&event.path).await.ok().flatten().is_some()
-                    && let Some(theme_registry) =
-                        cx.update(|cx| ThemeRegistry::global(cx)).log_err()
-                    && let Some(()) = theme_registry
-                        .load_user_theme(&event.path, fs.clone())
-                        .await
-                        .log_err()
-                {
-                    cx.update(GlobalTheme::reload_theme).log_err();
-                }
-            }
-        }
-    })
-    .detach()
-}
-
-#[cfg(debug_assertions)]
-fn watch_languages(fs: Arc<dyn fs::Fs>, languages: Arc<LanguageRegistry>, cx: &mut App) {
-    use std::time::Duration;
-
-    cx.background_spawn(async move {
-        let languages_src = Path::new("crates/languages/src");
-        let Some(languages_src) = fs.canonicalize(languages_src).await.log_err() else {
-            return;
-        };
-
-        let (mut events, watcher) = fs.watch(&languages_src, Duration::from_millis(100)).await;
-
-        // add subdirectories since fs.watch is not recursive on Linux
-        if let Some(mut paths) = fs.read_dir(&languages_src).await.log_err() {
-            while let Some(path) = paths.next().await {
-                if let Some(path) = path.log_err()
-                    && fs.is_dir(&path).await
-                {
-                    watcher.add(&path).log_err();
-                }
-            }
-        }
-
-        while let Some(event) = events.next().await {
-            let has_language_file = event
-                .iter()
-                .any(|event| event.path.extension().is_some_and(|ext| ext == "scm"));
-            if has_language_file {
-                languages.reload();
-            }
-        }
-    })
-    .detach();
-}
-
-#[cfg(not(debug_assertions))]
-fn watch_languages(_fs: Arc<dyn fs::Fs>, _languages: Arc<LanguageRegistry>, _cx: &mut App) {}
-
-fn dump_all_gpui_actions() {
-    #[derive(Debug, serde::Serialize)]
-    struct ActionDef {
-        name: &'static str,
-        human_name: String,
-        aliases: &'static [&'static str],
-        documentation: Option<&'static str>,
-    }
-    let mut actions = gpui::generate_list_of_all_registered_actions()
-        .map(|action| ActionDef {
-            name: action.name,
-            human_name: command_palette::humanize_action_name(action.name),
-            aliases: action.deprecated_aliases,
-            documentation: action.documentation,
-        })
-        .collect::<Vec<ActionDef>>();
-
-    actions.sort_by_key(|a| a.name);
-
-    io::Write::write(
-        &mut std::io::stdout(),
-        serde_json::to_string_pretty(&actions).unwrap().as_bytes(),
-    )
-    .unwrap();
-}
-
-#[cfg(target_os = "windows")]
-fn check_for_conpty_dll() {
-    use windows::{
-        Win32::{Foundation::FreeLibrary, System::LibraryLoader::LoadLibraryW},
-        core::w,
-    };
-
-    if let Ok(hmodule) = unsafe { LoadLibraryW(w!("conpty.dll")) } {
-        unsafe {
-            FreeLibrary(hmodule)
-                .context("Failed to free conpty.dll")
-                .log_err();
-        }
-    } else {
-        log::warn!("Failed to load conpty.dll. Terminal will work with reduced functionality.");
-    }
-}
diff --git a/crates/zed/src/reliability.rs b/crates/zed/src/reliability.rs
deleted file mode 100644
index da8dffa85d..0000000000
--- a/crates/zed/src/reliability.rs
+++ /dev/null
@@ -1,337 +0,0 @@
-use anyhow::{Context as _, Result};
-use client::{Client, telemetry::MINIDUMP_ENDPOINT};
-use futures::{AsyncReadExt, TryStreamExt};
-use gpui::{App, AppContext as _, SerializedThreadTaskTimings};
-use http_client::{self, AsyncBody, HttpClient, Request};
-use log::info;
-use project::Project;
-use proto::{CrashReport, GetCrashFilesResponse};
-use reqwest::multipart::{Form, Part};
-use smol::stream::StreamExt;
-use std::{ffi::OsStr, fs, sync::Arc, thread::ThreadId, time::Duration};
-use util::ResultExt;
-
-use crate::STARTUP_TIME;
-
-pub fn init(client: Arc<Client>, cx: &mut App) {
-    monitor_hangs(cx);
-
-    if client.telemetry().diagnostics_enabled() {
-        let client = client.clone();
-        cx.background_spawn(async move {
-            upload_previous_minidumps(client).await.warn_on_err();
-        })
-        .detach()
-    }
-
-    cx.observe_new(move |project: &mut Project, _, cx| {
-        let client = client.clone();
-
-        let Some(remote_client) = project.remote_client() else {
-            return;
-        };
-        remote_client.update(cx, |remote_client, cx| {
-            if !client.telemetry().diagnostics_enabled() {
-                return;
-            }
-            let request = remote_client
-                .proto_client()
-                .request(proto::GetCrashFiles {});
-            cx.background_spawn(async move {
-                let GetCrashFilesResponse { crashes } = request.await?;
-
-                let Some(endpoint) = MINIDUMP_ENDPOINT.as_ref() else {
-                    return Ok(());
-                };
-                for CrashReport {
-                    metadata,
-                    minidump_contents,
-                } in crashes
-                {
-                    if let Some(metadata) = serde_json::from_str(&metadata).log_err() {
-                        upload_minidump(client.clone(), endpoint, minidump_contents, &metadata)
-                            .await
-                            .log_err();
-                    }
-                }
-
-                anyhow::Ok(())
-            })
-            .detach_and_log_err(cx);
-        })
-    })
-    .detach();
-}
-
-fn monitor_hangs(cx: &App) {
-    let main_thread_id = std::thread::current().id();
-
-    let foreground_executor = cx.foreground_executor();
-    let background_executor = cx.background_executor();
-
-    // 3 seconds hang
-    let (mut tx, mut rx) = futures::channel::mpsc::channel(3);
-    foreground_executor
-        .spawn(async move { while (rx.next().await).is_some() {} })
-        .detach();
-
-    background_executor
-        .spawn({
-            let background_executor = background_executor.clone();
-            async move {
-                let mut hang_time = None;
-
-                let mut hanging = false;
-                loop {
-                    background_executor.timer(Duration::from_secs(1)).await;
-                    match tx.try_send(()) {
-                        Ok(_) => {
-                            hang_time = None;
-                            hanging = false;
-                            continue;
-                        }
-                        Err(e) => {
-                            let is_full = e.into_send_error().is_full();
-                            if is_full && !hanging {
-                                hanging = true;
-                                hang_time = Some(chrono::Local::now());
-                            }
-
-                            if is_full {
-                                save_hang_trace(
-                                    main_thread_id,
-                                    &background_executor,
-                                    hang_time.unwrap(),
-                                );
-                            }
-                        }
-                    }
-                }
-            }
-        })
-        .detach();
-}
-
-fn save_hang_trace(
-    main_thread_id: ThreadId,
-    background_executor: &gpui::BackgroundExecutor,
-    hang_time: chrono::DateTime<chrono::Local>,
-) {
-    let thread_timings = background_executor.dispatcher.get_all_timings();
-    let thread_timings = thread_timings
-        .into_iter()
-        .map(|mut timings| {
-            if timings.thread_id == main_thread_id {
-                timings.thread_name = Some("main".to_string());
-            }
-
-            SerializedThreadTaskTimings::convert(*STARTUP_TIME.get().unwrap(), timings)
-        })
-        .collect::<Vec<_>>();
-
-    let trace_path = paths::hang_traces_dir().join(&format!(
-        "hang-{}.miniprof",
-        hang_time.format("%Y-%m-%d_%H-%M-%S")
-    ));
-
-    let Some(timings) = serde_json::to_string(&thread_timings)
-        .context("hang timings serialization")
-        .log_err()
-    else {
-        return;
-    };
-
-    std::fs::write(&trace_path, timings)
-        .context("hang trace file writing")
-        .log_err();
-
-    info!(
-        "hang detected, trace file saved at: {}",
-        trace_path.display()
-    );
-}
-
-pub async fn upload_previous_minidumps(client: Arc<Client>) -> anyhow::Result<()> {
-    let Some(minidump_endpoint) = MINIDUMP_ENDPOINT.as_ref() else {
-        log::warn!("Minidump endpoint not set");
-        return Ok(());
-    };
-
-    let mut children = smol::fs::read_dir(paths::logs_dir()).await?;
-    while let Some(child) = children.next().await {
-        let child = child?;
-        let child_path = child.path();
-        if child_path.extension() != Some(OsStr::new("dmp")) {
-            continue;
-        }
-        let mut json_path = child_path.clone();
-        json_path.set_extension("json");
-        if let Ok(metadata) = serde_json::from_slice(&smol::fs::read(&json_path).await?)
-            && upload_minidump(
-                client.clone(),
-                minidump_endpoint,
-                smol::fs::read(&child_path)
-                    .await
-                    .context("Failed to read minidump")?,
-                &metadata,
-            )
-            .await
-            .log_err()
-            .is_some()
-        {
-            fs::remove_file(child_path).ok();
-            fs::remove_file(json_path).ok();
-        }
-    }
-    Ok(())
-}
-
-async fn upload_minidump(
-    client: Arc<Client>,
-    endpoint: &str,
-    minidump: Vec<u8>,
-    metadata: &crashes::CrashInfo,
-) -> Result<()> {
-    let mut form = Form::new()
-        .part(
-            "upload_file_minidump",
-            Part::bytes(minidump)
-                .file_name("minidump.dmp")
-                .mime_str("application/octet-stream")?,
-        )
-        .text(
-            "sentry[tags][channel]",
-            metadata.init.release_channel.clone(),
-        )
-        .text("sentry[tags][version]", metadata.init.zed_version.clone())
-        .text("sentry[tags][binary]", metadata.init.binary.clone())
-        .text("sentry[release]", metadata.init.commit_sha.clone())
-        .text("platform", "rust");
-    let mut panic_message = "".to_owned();
-    if let Some(panic_info) = metadata.panic.as_ref() {
-        panic_message = panic_info.message.clone();
-        form = form
-            .text("sentry[logentry][formatted]", panic_info.message.clone())
-            .text("span", panic_info.span.clone());
-    }
-    if let Some(minidump_error) = metadata.minidump_error.clone() {
-        form = form.text("minidump_error", minidump_error);
-    }
-
-    if let Some(id) = client.telemetry().metrics_id() {
-        form = form.text("sentry[user][id]", id.to_string());
-        form = form.text(
-            "sentry[user][is_staff]",
-            if client.telemetry().is_staff().unwrap_or_default() {
-                "true"
-            } else {
-                "false"
-            },
-        );
-    } else if let Some(id) = client.telemetry().installation_id() {
-        form = form.text("sentry[user][id]", format!("installation-{}", id))
-    }
-
-    ::telemetry::event!(
-        "Minidump Uploaded",
-        panic_message = panic_message,
-        crashed_version = metadata.init.zed_version.clone(),
-        commit_sha = metadata.init.commit_sha.clone(),
-    );
-
-    let gpu_count = metadata.gpus.len();
-    for (index, gpu) in metadata.gpus.iter().cloned().enumerate() {
-        let system_specs::GpuInfo {
-            device_name,
-            device_pci_id,
-            vendor_name,
-            vendor_pci_id,
-            driver_version,
-            driver_name,
-        } = gpu;
-        let num = if gpu_count == 1 && metadata.active_gpu.is_none() {
-            String::new()
-        } else {
-            index.to_string()
-        };
-        let name = format!("gpu{num}");
-        let root = format!("sentry[contexts][{name}]");
-        form = form
-            .text(
-                format!("{root}[Description]"),
-                "A GPU found on the users system. May or may not be the GPU Zed is running on",
-            )
-            .text(format!("{root}[type]"), "gpu")
-            .text(format!("{root}[name]"), device_name.unwrap_or(name))
-            .text(format!("{root}[id]"), format!("{:#06x}", device_pci_id))
-            .text(
-                format!("{root}[vendor_id]"),
-                format!("{:#06x}", vendor_pci_id),
-            )
-            .text_if_some(format!("{root}[vendor_name]"), vendor_name)
-            .text_if_some(format!("{root}[driver_version]"), driver_version)
-            .text_if_some(format!("{root}[driver_name]"), driver_name);
-    }
-    if let Some(active_gpu) = metadata.active_gpu.clone() {
-        form = form
-            .text(
-                "sentry[contexts][Active_GPU][Description]",
-                "The GPU Zed is running on",
-            )
-            .text("sentry[contexts][Active_GPU][type]", "gpu")
-            .text("sentry[contexts][Active_GPU][name]", active_gpu.device_name)
-            .text(
-                "sentry[contexts][Active_GPU][driver_version]",
-                active_gpu.driver_info,
-            )
-            .text(
-                "sentry[contexts][Active_GPU][driver_name]",
-                active_gpu.driver_name,
-            )
-            .text(
-                "sentry[contexts][Active_GPU][is_software_emulated]",
-                active_gpu.is_software_emulated.to_string(),
-            );
-    }
-
-    // TODO: feature-flag-context, and more of device-context like screen resolution, available ram, device model, etc
-
-    let stream = form
-        .into_stream()
-        .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))
-        .into_async_read();
-    let body = AsyncBody::from_reader(stream);
-    let req = Request::builder().uri(endpoint).body(body)?;
-    let mut response_text = String::new();
-    let mut response = client.http_client().send(req).await?;
-    response
-        .body_mut()
-        .read_to_string(&mut response_text)
-        .await?;
-    if !response.status().is_success() {
-        anyhow::bail!("failed to upload minidump: {response_text}");
-    }
-    log::info!("Uploaded minidump. event id: {response_text}");
-    Ok(())
-}
-
-trait FormExt {
-    fn text_if_some(
-        self,
-        label: impl Into<std::borrow::Cow<'static, str>>,
-        value: Option<impl Into<std::borrow::Cow<'static, str>>>,
-    ) -> Self;
-}
-
-impl FormExt for Form {
-    fn text_if_some(
-        self,
-        label: impl Into<std::borrow::Cow<'static, str>>,
-        value: Option<impl Into<std::borrow::Cow<'static, str>>>,
-    ) -> Self {
-        match value {
-            Some(value) => self.text(label.into(), value.into()),
-            None => self,
-        }
-    }
-}
diff --git a/crates/zed/src/zed-main.rs b/crates/zed/src/zed-main.rs
deleted file mode 100644
index 6c49c197dd..0000000000
--- a/crates/zed/src/zed-main.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-// Disable command line from opening on release mode
-#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
-
-pub fn main() {
-    // separated out so that the file containing the main function can be imported by other crates,
-    // while having all gpui resources that are registered in main (primarily actions) initialized
-    zed::main();
-}
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
deleted file mode 100644
index 71653124b1..0000000000
--- a/crates/zed/src/zed.rs
+++ /dev/null
@@ -1,5163 +0,0 @@
-mod app_menus;
-pub mod component_preview;
-pub mod edit_prediction_registry;
-#[cfg(target_os = "macos")]
-pub(crate) mod mac_only_instance;
-mod migrate;
-mod open_listener;
-mod quick_action_bar;
-#[cfg(target_os = "windows")]
-pub(crate) mod windows_only_instance;
-
-use agent_ui::{AgentDiffToolbar, AgentPanelDelegate};
-use anyhow::Context as _;
-pub use app_menus::*;
-use assets::Assets;
-use audio::{AudioSettings, REPLAY_DURATION};
-use breadcrumbs::Breadcrumbs;
-use client::zed_urls;
-use collections::VecDeque;
-use debugger_ui::debugger_panel::DebugPanel;
-use editor::{Editor, MultiBuffer};
-use extension_host::ExtensionStore;
-use feature_flags::{FeatureFlagAppExt, PanicFeatureFlag};
-use fs::Fs;
-use futures::FutureExt as _;
-use futures::future::Either;
-use futures::{StreamExt, channel::mpsc, select_biased};
-use git_ui::commit_view::CommitViewToolbar;
-use git_ui::git_panel::GitPanel;
-use git_ui::project_diff::ProjectDiffToolbar;
-use gpui::{
-    Action, App, AppContext as _, AsyncWindowContext, Context, DismissEvent, Element, Entity,
-    Focusable, KeyBinding, ParentElement, PathPromptOptions, PromptLevel, ReadGlobal, SharedString,
-    Styled, Task, TitlebarOptions, UpdateGlobal, WeakEntity, Window, WindowKind, WindowOptions,
-    actions, image_cache, point, px, retain_all,
-};
-use image_viewer::ImageInfo;
-use language::Capability;
-use language_onboarding::BasedPyrightBanner;
-use language_tools::lsp_button::{self, LspButton};
-use language_tools::lsp_log_view::LspLogToolbarItemView;
-use migrate::{MigrationBanner, MigrationEvent, MigrationNotification, MigrationType};
-use migrator::migrate_keymap;
-use onboarding::DOCS_URL;
-use onboarding::multibuffer_hint::MultibufferHint;
-pub use open_listener::*;
-use outline_panel::OutlinePanel;
-use paths::{
-    local_debug_file_relative_path, local_settings_file_relative_path,
-    local_tasks_file_relative_path,
-};
-use project::{DirectoryLister, DisableAiSettings, ProjectItem};
-use project_panel::ProjectPanel;
-use prompt_store::PromptBuilder;
-use quick_action_bar::QuickActionBar;
-use recent_projects::open_remote_project;
-use release_channel::{AppCommitSha, AppVersion, ReleaseChannel};
-use rope::Rope;
-use search::project_search::ProjectSearchBar;
-use settings::{
-    BaseKeymap, DEFAULT_KEYMAP_PATH, InvalidSettingsError, KeybindSource, KeymapFile,
-    KeymapFileLoadResult, MigrationStatus, Settings, SettingsStore, VIM_KEYMAP_PATH,
-    initial_local_debug_tasks_content, initial_project_settings_content, initial_tasks_content,
-    update_settings_file,
-};
-use std::time::Duration;
-use std::{
-    borrow::Cow,
-    path::{Path, PathBuf},
-    sync::Arc,
-    sync::atomic::{self, AtomicBool},
-};
-use terminal_view::terminal_panel::{self, TerminalPanel};
-use theme::{ActiveTheme, GlobalTheme, SystemAppearance, ThemeRegistry, ThemeSettings};
-use ui::{PopoverMenuHandle, prelude::*};
-use util::markdown::MarkdownString;
-use util::rel_path::RelPath;
-use util::{ResultExt, asset_str};
-use uuid::Uuid;
-use vim_mode_setting::VimModeSetting;
-use workspace::notifications::{
-    NotificationId, SuppressEvent, dismiss_app_notification, show_app_notification,
-};
-use workspace::{
-    AppState, NewFile, NewWindow, OpenLog, Toast, Workspace, WorkspaceSettings,
-    create_and_open_local_file, notifications::simple_message_notification::MessageNotification,
-    open_new,
-};
-use workspace::{
-    CloseIntent, CloseWindow, NotificationFrame, RestoreBanner, with_active_or_new_workspace,
-};
-use workspace::{Pane, notifications::DetachAndPromptErr};
-use zed_actions::{
-    OpenAccountSettings, OpenBrowser, OpenDocs, OpenServerSettings, OpenSettingsFile, OpenZedUrl,
-    Quit,
-};
-
-actions!(
-    zed,
-    [
-        /// Opens the element inspector for debugging UI.
-        DebugElements,
-        /// Hides the application window.
-        Hide,
-        /// Hides all other application windows.
-        HideOthers,
-        /// Minimizes the current window.
-        Minimize,
-        /// Opens the default settings file.
-        OpenDefaultSettings,
-        /// Opens project-specific settings file.
-        OpenProjectSettingsFile,
-        /// Opens the project tasks configuration.
-        OpenProjectTasks,
-        /// Opens the tasks panel.
-        OpenTasks,
-        /// Opens debug tasks configuration.
-        OpenDebugTasks,
-        /// Resets the application database.
-        ResetDatabase,
-        /// Shows all hidden windows.
-        ShowAll,
-        /// Toggles fullscreen mode.
-        ToggleFullScreen,
-        /// Zooms the window.
-        Zoom,
-        /// Triggers a test panic for debugging.
-        TestPanic,
-        /// Triggers a hard crash for debugging.
-        TestCrash,
-    ]
-);
-
-actions!(
-    dev,
-    [
-        /// Stores last 30s of audio from zed staff using the experimental rodio
-        /// audio system (including yourself) on the current call in a tar file
-        /// in the current working directory.
-        CaptureRecentAudio,
-    ]
-);
-
-pub fn init(cx: &mut App) {
-    #[cfg(target_os = "macos")]
-    cx.on_action(|_: &Hide, cx| cx.hide());
-    #[cfg(target_os = "macos")]
-    cx.on_action(|_: &HideOthers, cx| cx.hide_other_apps());
-    #[cfg(target_os = "macos")]
-    cx.on_action(|_: &ShowAll, cx| cx.unhide_other_apps());
-    cx.on_action(quit);
-
-    cx.on_action(|_: &RestoreBanner, cx| title_bar::restore_banner(cx));
-    let flag = cx.wait_for_flag::<PanicFeatureFlag>();
-    cx.spawn(async |cx| {
-        if cx
-            .update(|cx| ReleaseChannel::global(cx) == ReleaseChannel::Dev)
-            .unwrap_or_default()
-            || flag.await
-        {
-            cx.update(|cx| {
-                cx.on_action(|_: &TestPanic, _| panic!("Ran the TestPanic action"));
-                cx.on_action(|_: &TestCrash, _| {
-                    unsafe extern "C" {
-                        fn puts(s: *const i8);
-                    }
-                    unsafe {
-                        puts(0xabad1d3a as *const i8);
-                    }
-                });
-            })
-            .ok();
-        };
-    })
-    .detach();
-    cx.on_action(|_: &OpenLog, cx| {
-        with_active_or_new_workspace(cx, |workspace, window, cx| {
-            open_log_file(workspace, window, cx);
-        });
-    });
-    cx.on_action(|_: &workspace::RevealLogInFileManager, cx| {
-        cx.reveal_path(paths::log_file().as_path());
-    });
-    cx.on_action(|_: &zed_actions::OpenLicenses, cx| {
-        with_active_or_new_workspace(cx, |workspace, window, cx| {
-            open_bundled_file(
-                workspace,
-                asset_str::<Assets>("licenses.md"),
-                "Open Source License Attribution",
-                "Markdown",
-                window,
-                cx,
-            );
-        });
-    });
-    cx.on_action(|_: &zed_actions::OpenTelemetryLog, cx| {
-        with_active_or_new_workspace(cx, |workspace, window, cx| {
-            open_telemetry_log_file(workspace, window, cx);
-        });
-    });
-    cx.on_action(|&zed_actions::OpenKeymapFile, cx| {
-        with_active_or_new_workspace(cx, |_, window, cx| {
-            open_settings_file(
-                paths::keymap_file(),
-                || settings::initial_keymap_content().as_ref().into(),
-                window,
-                cx,
-            );
-        });
-    });
-    cx.on_action(|_: &OpenSettingsFile, cx| {
-        with_active_or_new_workspace(cx, |_, window, cx| {
-            open_settings_file(
-                paths::settings_file(),
-                || settings::initial_user_settings_content().as_ref().into(),
-                window,
-                cx,
-            );
-        });
-    });
-    cx.on_action(|_: &OpenAccountSettings, cx| {
-        with_active_or_new_workspace(cx, |_, _, cx| {
-            cx.open_url(&zed_urls::account_url(cx));
-        });
-    });
-    cx.on_action(|_: &OpenTasks, cx| {
-        with_active_or_new_workspace(cx, |_, window, cx| {
-            open_settings_file(
-                paths::tasks_file(),
-                || settings::initial_tasks_content().as_ref().into(),
-                window,
-                cx,
-            );
-        });
-    });
-    cx.on_action(|_: &OpenDebugTasks, cx| {
-        with_active_or_new_workspace(cx, |_, window, cx| {
-            open_settings_file(
-                paths::debug_scenarios_file(),
-                || settings::initial_debug_tasks_content().as_ref().into(),
-                window,
-                cx,
-            );
-        });
-    });
-    cx.on_action(|_: &OpenDefaultSettings, cx| {
-        with_active_or_new_workspace(cx, |workspace, window, cx| {
-            open_bundled_file(
-                workspace,
-                settings::default_settings(),
-                "Default Settings",
-                "JSON",
-                window,
-                cx,
-            );
-        });
-    });
-    cx.on_action(|_: &zed_actions::OpenDefaultKeymap, cx| {
-        with_active_or_new_workspace(cx, |workspace, window, cx| {
-            open_bundled_file(
-                workspace,
-                settings::default_keymap(),
-                "Default Key Bindings",
-                "JSON",
-                window,
-                cx,
-            );
-        });
-    });
-    cx.on_action(|_: &zed_actions::About, cx| {
-        with_active_or_new_workspace(cx, |workspace, window, cx| {
-            about(workspace, window, cx);
-        });
-    });
-}
-
-fn bind_on_window_closed(cx: &mut App) -> Option<gpui::Subscription> {
-    #[cfg(target_os = "macos")]
-    {
-        WorkspaceSettings::get_global(cx)
-            .on_last_window_closed
-            .is_quit_app()
-            .then(|| {
-                cx.on_window_closed(|cx| {
-                    if cx.windows().is_empty() {
-                        cx.quit();
-                    }
-                })
-            })
-    }
-    #[cfg(not(target_os = "macos"))]
-    {
-        Some(cx.on_window_closed(|cx| {
-            if cx.windows().is_empty() {
-                cx.quit();
-            }
-        }))
-    }
-}
-
-pub fn build_window_options(display_uuid: Option<Uuid>, cx: &mut App) -> WindowOptions {
-    let display = display_uuid.and_then(|uuid| {
-        cx.displays()
-            .into_iter()
-            .find(|display| display.uuid().ok() == Some(uuid))
-    });
-    let app_id = ReleaseChannel::global(cx).app_id();
-    let window_decorations = match std::env::var("ZED_WINDOW_DECORATIONS") {
-        Ok(val) if val == "server" => gpui::WindowDecorations::Server,
-        Ok(val) if val == "client" => gpui::WindowDecorations::Client,
-        _ => match WorkspaceSettings::get_global(cx).window_decorations {
-            settings::WindowDecorations::Server => gpui::WindowDecorations::Server,
-            settings::WindowDecorations::Client => gpui::WindowDecorations::Client,
-        },
-    };
-
-    let use_system_window_tabs = WorkspaceSettings::get_global(cx).use_system_window_tabs;
-
-    WindowOptions {
-        titlebar: Some(TitlebarOptions {
-            title: None,
-            appears_transparent: true,
-            traffic_light_position: Some(point(px(9.0), px(9.0))),
-        }),
-        window_bounds: None,
-        focus: false,
-        show: false,
-        kind: WindowKind::Normal,
-        is_movable: true,
-        display_id: display.map(|display| display.id()),
-        window_background: cx.theme().window_background_appearance(),
-        app_id: Some(app_id.to_owned()),
-        window_decorations: Some(window_decorations),
-        window_min_size: Some(gpui::Size {
-            width: px(360.0),
-            height: px(240.0),
-        }),
-        tabbing_identifier: if use_system_window_tabs {
-            Some(String::from("zed"))
-        } else {
-            None
-        },
-        ..Default::default()
-    }
-}
-
-pub fn initialize_workspace(
-    app_state: Arc<AppState>,
-    prompt_builder: Arc<PromptBuilder>,
-    cx: &mut App,
-) {
-    let mut _on_close_subscription = bind_on_window_closed(cx);
-    cx.observe_global::<SettingsStore>(move |cx| {
-        _on_close_subscription = bind_on_window_closed(cx);
-    })
-    .detach();
-
-    cx.observe_new(move |workspace: &mut Workspace, window, cx| {
-        let Some(window) = window else {
-            return;
-        };
-
-        let workspace_handle = cx.entity();
-        let center_pane = workspace.active_pane().clone();
-        initialize_pane(workspace, &center_pane, window, cx);
-
-        cx.subscribe_in(&workspace_handle, window, {
-            move |workspace, _, event, window, cx| match event {
-                workspace::Event::PaneAdded(pane) => {
-                    initialize_pane(workspace, pane, window, cx);
-                }
-                workspace::Event::OpenBundledFile {
-                    text,
-                    title,
-                    language,
-                } => open_bundled_file(workspace, text.clone(), title, language, window, cx),
-                _ => {}
-            }
-        })
-        .detach();
-
-        #[cfg(not(target_os = "macos"))]
-        initialize_file_watcher(window, cx);
-
-        if let Some(specs) = window.gpu_specs() {
-            log::info!("Using GPU: {:?}", specs);
-            show_software_emulation_warning_if_needed(specs.clone(), window, cx);
-            if let Some((crash_server, message)) = crashes::CRASH_HANDLER
-                .get()
-                .zip(bincode::serialize(&specs).ok())
-                && let Err(err) = crash_server.send_message(3, message)
-            {
-                log::warn!(
-                    "Failed to store active gpu info for crash reporting: {}",
-                    err
-                );
-            }
-        }
-
-        #[cfg(target_os = "windows")]
-        unstable_version_notification(cx);
-
-        let edit_prediction_menu_handle = PopoverMenuHandle::default();
-        let edit_prediction_ui = cx.new(|cx| {
-            edit_prediction_ui::EditPredictionButton::new(
-                app_state.fs.clone(),
-                app_state.user_store.clone(),
-                edit_prediction_menu_handle.clone(),
-                app_state.client.clone(),
-                cx,
-            )
-        });
-        workspace.register_action({
-            move |_, _: &edit_prediction_ui::ToggleMenu, window, cx| {
-                edit_prediction_menu_handle.toggle(window, cx);
-            }
-        });
-
-        let search_button = cx.new(|_| search::search_status_button::SearchButton::new());
-        let diagnostic_summary =
-            cx.new(|cx| diagnostics::items::DiagnosticIndicator::new(workspace, cx));
-        let activity_indicator = activity_indicator::ActivityIndicator::new(
-            workspace,
-            workspace.project().read(cx).languages().clone(),
-            window,
-            cx,
-        );
-        let active_buffer_language =
-            cx.new(|_| language_selector::ActiveBufferLanguage::new(workspace));
-        let active_toolchain_language =
-            cx.new(|cx| toolchain_selector::ActiveToolchain::new(workspace, window, cx));
-        let vim_mode_indicator = cx.new(|cx| vim::ModeIndicator::new(window, cx));
-        let image_info = cx.new(|_cx| ImageInfo::new(workspace));
-
-        let lsp_button_menu_handle = PopoverMenuHandle::default();
-        let lsp_button =
-            cx.new(|cx| LspButton::new(workspace, lsp_button_menu_handle.clone(), window, cx));
-        workspace.register_action({
-            move |_, _: &lsp_button::ToggleMenu, window, cx| {
-                lsp_button_menu_handle.toggle(window, cx);
-            }
-        });
-
-        let cursor_position =
-            cx.new(|_| go_to_line::cursor_position::CursorPosition::new(workspace));
-        let line_ending_indicator =
-            cx.new(|_| line_ending_selector::LineEndingIndicator::default());
-        workspace.status_bar().update(cx, |status_bar, cx| {
-            status_bar.add_left_item(search_button, window, cx);
-            status_bar.add_left_item(lsp_button, window, cx);
-            status_bar.add_left_item(diagnostic_summary, window, cx);
-            status_bar.add_left_item(activity_indicator, window, cx);
-            status_bar.add_right_item(edit_prediction_ui, window, cx);
-            status_bar.add_right_item(active_buffer_language, window, cx);
-            status_bar.add_right_item(active_toolchain_language, window, cx);
-            status_bar.add_right_item(line_ending_indicator, window, cx);
-            status_bar.add_right_item(vim_mode_indicator, window, cx);
-            status_bar.add_right_item(cursor_position, window, cx);
-            status_bar.add_right_item(image_info, window, cx);
-        });
-
-        let handle = cx.entity().downgrade();
-        window.on_window_should_close(cx, move |window, cx| {
-            handle
-                .update(cx, |workspace, cx| {
-                    // We'll handle closing asynchronously
-                    workspace.close_window(&CloseWindow, window, cx);
-                    false
-                })
-                .unwrap_or(true)
-        });
-
-        initialize_panels(prompt_builder.clone(), window, cx);
-        register_actions(app_state.clone(), workspace, window, cx);
-
-        workspace.focus_handle(cx).focus(window);
-    })
-    .detach();
-}
-
-#[cfg(target_os = "windows")]
-fn unstable_version_notification(cx: &mut App) {
-    if !matches!(
-        ReleaseChannel::try_global(cx),
-        Some(ReleaseChannel::Nightly)
-    ) {
-        return;
-    }
-    let db_key = "zed_windows_nightly_notif_shown_at".to_owned();
-    let time = chrono::Utc::now();
-    if let Some(last_shown) = db::kvp::KEY_VALUE_STORE
-        .read_kvp(&db_key)
-        .log_err()
-        .flatten()
-        .and_then(|timestamp| chrono::DateTime::parse_from_rfc3339(&timestamp).ok())
-    {
-        if time.fixed_offset() - last_shown < chrono::Duration::days(7) {
-            return;
-        }
-    }
-    cx.spawn(async move |_| {
-        db::kvp::KEY_VALUE_STORE
-            .write_kvp(db_key, time.to_rfc3339())
-            .await
-    })
-    .detach_and_log_err(cx);
-    struct WindowsNightly;
-    show_app_notification(NotificationId::unique::<WindowsNightly>(), cx, |cx| {
-        cx.new(|cx| {
-            MessageNotification::new("You're using an unstable version of Zed (Nightly)", cx)
-                .primary_message("Download Stable")
-                .primary_icon_color(Color::Accent)
-                .primary_icon(IconName::Download)
-                .primary_on_click(|window, cx| {
-                    window.dispatch_action(
-                        zed_actions::OpenBrowser {
-                            url: "https://zed.dev/download".to_string(),
-                        }
-                        .boxed_clone(),
-                        cx,
-                    );
-                    cx.emit(DismissEvent);
-                })
-        })
-    });
-}
-
-#[cfg(any(target_os = "linux", target_os = "freebsd"))]
-fn initialize_file_watcher(window: &mut Window, cx: &mut Context<Workspace>) {
-    if let Err(e) = fs::fs_watcher::global(|_| {}) {
-        let message = format!(
-            db::indoc! {r#"
-            inotify_init returned {}
-
-            This may be due to system-wide limits on inotify instances. For troubleshooting see: https://zed.dev/docs/linux
-            "#},
-            e
-        );
-        let prompt = window.prompt(
-            PromptLevel::Critical,
-            "Could not start inotify",
-            Some(&message),
-            &["Troubleshoot and Quit"],
-            cx,
-        );
-        cx.spawn(async move |_, cx| {
-            if prompt.await == Ok(0) {
-                cx.update(|cx| {
-                    cx.open_url("https://zed.dev/docs/linux#could-not-start-inotify");
-                    cx.quit();
-                })
-                .ok();
-            }
-        })
-        .detach()
-    }
-}
-
-#[cfg(target_os = "windows")]
-fn initialize_file_watcher(window: &mut Window, cx: &mut Context<Workspace>) {
-    if let Err(e) = fs::fs_watcher::global(|_| {}) {
-        let message = format!(
-            db::indoc! {r#"
-            ReadDirectoryChangesW initialization failed: {}
-
-            This may occur on network filesystems and WSL paths. For troubleshooting see: https://zed.dev/docs/windows
-            "#},
-            e
-        );
-        let prompt = window.prompt(
-            PromptLevel::Critical,
-            "Could not start ReadDirectoryChangesW",
-            Some(&message),
-            &["Troubleshoot and Quit"],
-            cx,
-        );
-        cx.spawn(async move |_, cx| {
-            if prompt.await == Ok(0) {
-                cx.update(|cx| {
-                    cx.open_url("https://zed.dev/docs/windows");
-                    cx.quit()
-                })
-                .ok();
-            }
-        })
-        .detach()
-    }
-}
-
-fn show_software_emulation_warning_if_needed(
-    specs: gpui::GpuSpecs,
-    window: &mut Window,
-    cx: &mut Context<Workspace>,
-) {
-    if specs.is_software_emulated && std::env::var("ZED_ALLOW_EMULATED_GPU").is_err() {
-        let (graphics_api, docs_url, open_url) = if cfg!(target_os = "windows") {
-            (
-                "DirectX",
-                "https://zed.dev/docs/windows",
-                "https://zed.dev/docs/windows",
-            )
-        } else {
-            (
-                "Vulkan",
-                "https://zed.dev/docs/linux",
-                "https://zed.dev/docs/linux#zed-fails-to-open-windows",
-            )
-        };
-        let message = format!(
-            db::indoc! {r#"
-            Zed uses {} for rendering and requires a compatible GPU.
-
-            Currently you are using a software emulated GPU ({}) which
-            will result in awful performance.
-
-            For troubleshooting see: {}
-            Set ZED_ALLOW_EMULATED_GPU=1 env var to permanently override.
-            "#},
-            graphics_api, specs.device_name, docs_url
-        );
-        let prompt = window.prompt(
-            PromptLevel::Critical,
-            "Unsupported GPU",
-            Some(&message),
-            &["Skip", "Troubleshoot and Quit"],
-            cx,
-        );
-        cx.spawn(async move |_, cx| {
-            if prompt.await == Ok(1) {
-                cx.update(|cx| {
-                    cx.open_url(open_url);
-                    cx.quit();
-                })
-                .ok();
-            }
-        })
-        .detach()
-    }
-}
-
-fn initialize_panels(
-    prompt_builder: Arc<PromptBuilder>,
-    window: &mut Window,
-    cx: &mut Context<Workspace>,
-) {
-    cx.spawn_in(window, async move |workspace_handle, cx| {
-        let project_panel = ProjectPanel::load(workspace_handle.clone(), cx.clone());
-        let outline_panel = OutlinePanel::load(workspace_handle.clone(), cx.clone());
-        let terminal_panel = TerminalPanel::load(workspace_handle.clone(), cx.clone());
-        let git_panel = GitPanel::load(workspace_handle.clone(), cx.clone());
-        let channels_panel =
-            collab_ui::collab_panel::CollabPanel::load(workspace_handle.clone(), cx.clone());
-        let notification_panel = collab_ui::notification_panel::NotificationPanel::load(
-            workspace_handle.clone(),
-            cx.clone(),
-        );
-        let debug_panel = DebugPanel::load(workspace_handle.clone(), cx);
-
-        async fn add_panel_when_ready(
-            panel_task: impl Future<Output = anyhow::Result<Entity<impl workspace::Panel>>> + 'static,
-            workspace_handle: WeakEntity<Workspace>,
-            mut cx: gpui::AsyncWindowContext,
-        ) {
-            if let Some(panel) = panel_task.await.context("failed to load panel").log_err()
-            {
-                workspace_handle
-                    .update_in(&mut cx, |workspace, window, cx| {
-                        workspace.add_panel(panel, window, cx);
-                    })
-                    .log_err();
-            }
-        }
-
-        futures::join!(
-            add_panel_when_ready(project_panel, workspace_handle.clone(), cx.clone()),
-            add_panel_when_ready(outline_panel, workspace_handle.clone(), cx.clone()),
-            add_panel_when_ready(terminal_panel, workspace_handle.clone(), cx.clone()),
-            add_panel_when_ready(git_panel, workspace_handle.clone(), cx.clone()),
-            add_panel_when_ready(channels_panel, workspace_handle.clone(), cx.clone()),
-            add_panel_when_ready(notification_panel, workspace_handle.clone(), cx.clone()),
-            add_panel_when_ready(debug_panel, workspace_handle.clone(), cx.clone()),
-            initialize_agent_panel(workspace_handle, prompt_builder, cx.clone()).map(|r| r.log_err())
-        );
-
-        anyhow::Ok(())
-    })
-    .detach();
-}
-
-async fn initialize_agent_panel(
-    workspace_handle: WeakEntity<Workspace>,
-    prompt_builder: Arc<PromptBuilder>,
-    mut cx: AsyncWindowContext,
-) -> anyhow::Result<()> {
-    fn setup_or_teardown_agent_panel(
-        workspace: &mut Workspace,
-        prompt_builder: Arc<PromptBuilder>,
-        window: &mut Window,
-        cx: &mut Context<Workspace>,
-    ) -> Task<anyhow::Result<()>> {
-        let disable_ai = SettingsStore::global(cx)
-            .get::<DisableAiSettings>(None)
-            .disable_ai
-            || cfg!(test);
-        let existing_panel = workspace.panel::<agent_ui::AgentPanel>(cx);
-        match (disable_ai, existing_panel) {
-            (false, None) => cx.spawn_in(window, async move |workspace, cx| {
-                let panel =
-                    agent_ui::AgentPanel::load(workspace.clone(), prompt_builder, cx.clone())
-                        .await?;
-                workspace.update_in(cx, |workspace, window, cx| {
-                    let disable_ai = SettingsStore::global(cx)
-                        .get::<DisableAiSettings>(None)
-                        .disable_ai;
-                    let have_panel = workspace.panel::<agent_ui::AgentPanel>(cx).is_some();
-                    if !disable_ai && !have_panel {
-                        workspace.add_panel(panel, window, cx);
-                    }
-                })
-            }),
-            (true, Some(existing_panel)) => {
-                workspace.remove_panel::<agent_ui::AgentPanel>(&existing_panel, window, cx);
-                Task::ready(Ok(()))
-            }
-            _ => Task::ready(Ok(())),
-        }
-    }
-
-    workspace_handle
-        .update_in(&mut cx, |workspace, window, cx| {
-            setup_or_teardown_agent_panel(workspace, prompt_builder.clone(), window, cx)
-        })?
-        .await?;
-
-    workspace_handle.update_in(&mut cx, |workspace, window, cx| {
-        cx.observe_global_in::<SettingsStore>(window, {
-            let prompt_builder = prompt_builder.clone();
-            move |workspace, window, cx| {
-                setup_or_teardown_agent_panel(workspace, prompt_builder.clone(), window, cx)
-                    .detach_and_log_err(cx);
-            }
-        })
-        .detach();
-
-        // Register the actions that are shared between `assistant` and `assistant2`.
-        //
-        // We need to do this here instead of within the individual `init`
-        // functions so that we only register the actions once.
-        //
-        // Once we ship `assistant2` we can push this back down into `agent::agent_panel::init`.
-        if !cfg!(test) {
-            <dyn AgentPanelDelegate>::set_global(
-                Arc::new(agent_ui::ConcreteAssistantPanelDelegate),
-                cx,
-            );
-
-            workspace
-                .register_action(agent_ui::AgentPanel::toggle_focus)
-                .register_action(agent_ui::InlineAssistant::inline_assist);
-        }
-    })?;
-
-    anyhow::Ok(())
-}
-
-fn register_actions(
-    app_state: Arc<AppState>,
-    workspace: &mut Workspace,
-    _: &mut Window,
-    cx: &mut Context<Workspace>,
-) {
-    workspace
-        .register_action(|_, _: &OpenDocs, _, cx| cx.open_url(DOCS_URL))
-        .register_action(|_, _: &Minimize, window, _| {
-            window.minimize_window();
-        })
-        .register_action(|_, _: &Zoom, window, _| {
-            window.zoom_window();
-        })
-        .register_action(|_, _: &ToggleFullScreen, window, _| {
-            window.toggle_fullscreen();
-        })
-        .register_action(|_, action: &OpenZedUrl, _, cx| {
-            OpenListener::global(cx).open(RawOpenRequest {
-                urls: vec![action.url.clone()],
-                ..Default::default()
-            })
-        })
-        .register_action(|workspace, action: &OpenBrowser, _window, cx| {
-            // Parse and validate the URL to ensure it's properly formatted
-            match url::Url::parse(&action.url) {
-                Ok(parsed_url) => {
-                    // Use the parsed URL's string representation which is properly escaped
-                    cx.open_url(parsed_url.as_str());
-                }
-                Err(e) => {
-                    workspace.show_error(
-                        &anyhow::anyhow!(
-                            "Opening this URL in a browser failed because the URL is invalid: {}\n\nError was: {e}",
-                            action.url
-                        ),
-                        cx,
-                    );
-                }
-            }
-        })
-        .register_action(|workspace, _: &workspace::Open, window, cx| {
-            telemetry::event!("Project Opened");
-            let paths = workspace.prompt_for_open_path(
-                PathPromptOptions {
-                    files: true,
-                    directories: true,
-                    multiple: true,
-                    prompt: None,
-                },
-                DirectoryLister::Local(
-                    workspace.project().clone(),
-                    workspace.app_state().fs.clone(),
-                ),
-                window,
-                cx,
-            );
-
-            cx.spawn_in(window, async move |this, cx| {
-                let Some(paths) = paths.await.log_err().flatten() else {
-                    return;
-                };
-
-                if let Some(task) = this
-                    .update_in(cx, |this, window, cx| {
-                        this.open_workspace_for_paths(false, paths, window, cx)
-                    })
-                    .log_err()
-                {
-                    task.await.log_err();
-                }
-            })
-            .detach()
-        })
-        .register_action(|workspace, action: &zed_actions::OpenRemote, window, cx| {
-            if !action.from_existing_connection {
-                cx.propagate();
-                return;
-            }
-            // You need existing remote connection to open it this way
-            if workspace.project().read(cx).is_local() {
-                return;
-            }
-            telemetry::event!("Project Opened");
-            let paths = workspace.prompt_for_open_path(
-                PathPromptOptions {
-                    files: true,
-                    directories: true,
-                    multiple: true,
-                    prompt: None,
-                },
-                DirectoryLister::Project(workspace.project().clone()),
-                window,
-                cx,
-            );
-            cx.spawn_in(window, async move |this, cx| {
-                let Some(paths) = paths.await.log_err().flatten() else {
-                    return;
-                };
-                if let Some(task) = this
-                    .update_in(cx, |this, window, cx| {
-                        open_new_ssh_project_from_project(this, paths, window, cx)
-                    })
-                    .log_err()
-                {
-                    task.await.log_err();
-                }
-            })
-            .detach()
-        })
-        .register_action({
-            let fs = app_state.fs.clone();
-            move |_, action: &zed_actions::IncreaseUiFontSize, _window, cx| {
-                if action.persist {
-                    update_settings_file(fs.clone(), cx, move |settings, cx| {
-                        let ui_font_size = ThemeSettings::get_global(cx).ui_font_size(cx) + px(1.0);
-                        let _ = settings
-                            .theme
-                            .ui_font_size
-                            .insert(theme::clamp_font_size(ui_font_size).into());
-                    });
-                } else {
-                    theme::adjust_ui_font_size(cx, |size| size + px(1.0));
-                }
-            }
-        })
-        .register_action({
-            let fs = app_state.fs.clone();
-            move |_, action: &zed_actions::DecreaseUiFontSize, _window, cx| {
-                if action.persist {
-                    update_settings_file(fs.clone(), cx, move |settings, cx| {
-                        let ui_font_size = ThemeSettings::get_global(cx).ui_font_size(cx) - px(1.0);
-                        let _ = settings
-                            .theme
-                            .ui_font_size
-                            .insert(theme::clamp_font_size(ui_font_size).into());
-                    });
-                } else {
-                    theme::adjust_ui_font_size(cx, |size| size - px(1.0));
-                }
-            }
-        })
-        .register_action({
-            let fs = app_state.fs.clone();
-            move |_, action: &zed_actions::ResetUiFontSize, _window, cx| {
-                if action.persist {
-                    update_settings_file(fs.clone(), cx, move |settings, _| {
-                        settings.theme.ui_font_size = None;
-                    });
-                } else {
-                    theme::reset_ui_font_size(cx);
-                }
-            }
-        })
-        .register_action({
-            let fs = app_state.fs.clone();
-            move |_, action: &zed_actions::IncreaseBufferFontSize, _window, cx| {
-                if action.persist {
-                    update_settings_file(fs.clone(), cx, move |settings, cx| {
-                        let buffer_font_size =
-                            ThemeSettings::get_global(cx).buffer_font_size(cx) + px(1.0);
-                        let _ = settings
-                            .theme
-                            .buffer_font_size
-                            .insert(theme::clamp_font_size(buffer_font_size).into());
-                    });
-                } else {
-                    theme::adjust_buffer_font_size(cx, |size| size + px(1.0));
-                }
-            }
-        })
-        .register_action({
-            let fs = app_state.fs.clone();
-            move |_, action: &zed_actions::DecreaseBufferFontSize, _window, cx| {
-                if action.persist {
-                    update_settings_file(fs.clone(), cx, move |settings, cx| {
-                        let buffer_font_size =
-                            ThemeSettings::get_global(cx).buffer_font_size(cx) - px(1.0);
-                        let _ = settings
-                            .theme
-                            .buffer_font_size
-                            .insert(theme::clamp_font_size(buffer_font_size).into());
-                    });
-                } else {
-                    theme::adjust_buffer_font_size(cx, |size| size - px(1.0));
-                }
-            }
-        })
-        .register_action({
-            let fs = app_state.fs.clone();
-            move |_, action: &zed_actions::ResetBufferFontSize, _window, cx| {
-                if action.persist {
-                    update_settings_file(fs.clone(), cx, move |settings, _| {
-                        settings.theme.buffer_font_size = None;
-                    });
-                } else {
-                    theme::reset_buffer_font_size(cx);
-                }
-            }
-        })
-        .register_action({
-            let fs = app_state.fs.clone();
-            move |_, action: &zed_actions::ResetAllZoom, _window, cx| {
-                if action.persist {
-                    update_settings_file(fs.clone(), cx, move |settings, _| {
-                        settings.theme.ui_font_size = None;
-                        settings.theme.buffer_font_size = None;
-                        settings.theme.agent_ui_font_size = None;
-                        settings.theme.agent_buffer_font_size = None;
-                    });
-                } else {
-                    theme::reset_ui_font_size(cx);
-                    theme::reset_buffer_font_size(cx);
-                    theme::reset_agent_ui_font_size(cx);
-                    theme::reset_agent_buffer_font_size(cx);
-                }
-            }
-        })
-        .register_action(|_, _: &install_cli::RegisterZedScheme, window, cx| {
-            cx.spawn_in(window, async move |workspace, cx| {
-                install_cli::register_zed_scheme(cx).await?;
-                workspace.update_in(cx, |workspace, _, cx| {
-                    struct RegisterZedScheme;
-
-                    workspace.show_toast(
-                        Toast::new(
-                            NotificationId::unique::<RegisterZedScheme>(),
-                            format!(
-                                "zed:// links will now open in {}.",
-                                ReleaseChannel::global(cx).display_name()
-                            ),
-                        ),
-                        cx,
-                    )
-                })?;
-                Ok(())
-            })
-            .detach_and_prompt_err(
-                "Error registering zed:// scheme",
-                window,
-                cx,
-                |_, _, _| None,
-            );
-        })
-        .register_action(open_project_settings_file)
-        .register_action(open_project_tasks_file)
-        .register_action(open_project_debug_tasks_file)
-        .register_action(
-            |workspace: &mut Workspace,
-             _: &zed_actions::project_panel::ToggleFocus,
-             window: &mut Window,
-             cx: &mut Context<Workspace>| {
-                workspace.toggle_panel_focus::<ProjectPanel>(window, cx);
-            },
-        )
-        .register_action(
-            |workspace: &mut Workspace,
-             _: &outline_panel::ToggleFocus,
-             window: &mut Window,
-             cx: &mut Context<Workspace>| {
-                workspace.toggle_panel_focus::<OutlinePanel>(window, cx);
-            },
-        )
-        .register_action(
-            |workspace: &mut Workspace,
-             _: &collab_ui::collab_panel::ToggleFocus,
-             window: &mut Window,
-             cx: &mut Context<Workspace>| {
-                workspace.toggle_panel_focus::<collab_ui::collab_panel::CollabPanel>(window, cx);
-            },
-        )
-        .register_action(
-            |workspace: &mut Workspace,
-             _: &collab_ui::notification_panel::ToggleFocus,
-             window: &mut Window,
-             cx: &mut Context<Workspace>| {
-                workspace.toggle_panel_focus::<collab_ui::notification_panel::NotificationPanel>(
-                    window, cx,
-                );
-            },
-        )
-        .register_action(
-            |workspace: &mut Workspace,
-             _: &terminal_panel::ToggleFocus,
-             window: &mut Window,
-             cx: &mut Context<Workspace>| {
-                workspace.toggle_panel_focus::<TerminalPanel>(window, cx);
-            },
-        )
-        .register_action({
-            let app_state = Arc::downgrade(&app_state);
-            move |_, _: &NewWindow, _, cx| {
-                if let Some(app_state) = app_state.upgrade() {
-                    open_new(
-                        Default::default(),
-                        app_state,
-                        cx,
-                        |workspace, window, cx| {
-                            cx.activate(true);
-                            Editor::new_file(workspace, &Default::default(), window, cx)
-                        },
-                    )
-                    .detach();
-                }
-            }
-        })
-        .register_action({
-            let app_state = Arc::downgrade(&app_state);
-            move |_, _: &NewFile, _, cx| {
-                if let Some(app_state) = app_state.upgrade() {
-                    open_new(
-                        Default::default(),
-                        app_state,
-                        cx,
-                        |workspace, window, cx| {
-                            Editor::new_file(workspace, &Default::default(), window, cx)
-                        },
-                    )
-                    .detach();
-                }
-            }
-        })
-        .register_action(|workspace, _: &CaptureRecentAudio, window, cx| {
-            capture_recent_audio(workspace, window, cx);
-        });
-
-    #[cfg(not(target_os = "windows"))]
-    workspace.register_action(install_cli);
-
-    if workspace.project().read(cx).is_via_remote_server() {
-        workspace.register_action({
-            move |workspace, _: &OpenServerSettings, window, cx| {
-                let open_server_settings = workspace
-                    .project()
-                    .update(cx, |project, cx| project.open_server_settings(cx));
-
-                cx.spawn_in(window, async move |workspace, cx| {
-                    let buffer = open_server_settings.await?;
-
-                    workspace
-                        .update_in(cx, |workspace, window, cx| {
-                            workspace.open_path(
-                                buffer
-                                    .read(cx)
-                                    .project_path(cx)
-                                    .expect("Settings file must have a location"),
-                                None,
-                                true,
-                                window,
-                                cx,
-                            )
-                        })?
-                        .await?;
-
-                    anyhow::Ok(())
-                })
-                .detach_and_log_err(cx);
-            }
-        });
-    }
-}
-
-fn initialize_pane(
-    workspace: &Workspace,
-    pane: &Entity<Pane>,
-    window: &mut Window,
-    cx: &mut Context<Workspace>,
-) {
-    pane.update(cx, |pane, cx| {
-        pane.toolbar().update(cx, |toolbar, cx| {
-            let multibuffer_hint = cx.new(|_| MultibufferHint::new());
-            toolbar.add_item(multibuffer_hint, window, cx);
-            let breadcrumbs = cx.new(|_| Breadcrumbs::new());
-            toolbar.add_item(breadcrumbs, window, cx);
-            let buffer_search_bar = cx.new(|cx| {
-                search::BufferSearchBar::new(
-                    Some(workspace.project().read(cx).languages().clone()),
-                    window,
-                    cx,
-                )
-            });
-            toolbar.add_item(buffer_search_bar.clone(), window, cx);
-            let quick_action_bar =
-                cx.new(|cx| QuickActionBar::new(buffer_search_bar, workspace, cx));
-            toolbar.add_item(quick_action_bar, window, cx);
-            let diagnostic_editor_controls = cx.new(|_| diagnostics::ToolbarControls::new());
-            toolbar.add_item(diagnostic_editor_controls, window, cx);
-            let project_search_bar = cx.new(|_| ProjectSearchBar::new());
-            toolbar.add_item(project_search_bar, window, cx);
-            let lsp_log_item = cx.new(|_| LspLogToolbarItemView::new());
-            toolbar.add_item(lsp_log_item, window, cx);
-            let dap_log_item = cx.new(|_| debugger_tools::DapLogToolbarItemView::new());
-            toolbar.add_item(dap_log_item, window, cx);
-            let acp_tools_item = cx.new(|_| acp_tools::AcpToolsToolbarItemView::new());
-            toolbar.add_item(acp_tools_item, window, cx);
-            let syntax_tree_item = cx.new(|_| language_tools::SyntaxTreeToolbarItemView::new());
-            toolbar.add_item(syntax_tree_item, window, cx);
-            let migration_banner = cx.new(|cx| MigrationBanner::new(workspace, cx));
-            toolbar.add_item(migration_banner, window, cx);
-            let project_diff_toolbar = cx.new(|cx| ProjectDiffToolbar::new(workspace, cx));
-            toolbar.add_item(project_diff_toolbar, window, cx);
-            let commit_view_toolbar = cx.new(|_| CommitViewToolbar::new());
-            toolbar.add_item(commit_view_toolbar, window, cx);
-            let agent_diff_toolbar = cx.new(AgentDiffToolbar::new);
-            toolbar.add_item(agent_diff_toolbar, window, cx);
-            let basedpyright_banner = cx.new(|cx| BasedPyrightBanner::new(workspace, cx));
-            toolbar.add_item(basedpyright_banner, window, cx);
-        })
-    });
-}
-
-fn about(_: &mut Workspace, window: &mut Window, cx: &mut Context<Workspace>) {
-    use std::fmt::Write;
-    let release_channel = ReleaseChannel::global(cx).display_name();
-    let full_version = AppVersion::global(cx);
-    let version = env!("CARGO_PKG_VERSION");
-    let debug = if cfg!(debug_assertions) {
-        "(debug)"
-    } else {
-        ""
-    };
-    let message = format!("{release_channel} {version} {debug}");
-
-    let mut detail = AppCommitSha::try_global(cx)
-        .map(|sha| sha.full())
-        .unwrap_or_default();
-    if !detail.is_empty() {
-        detail.push('\n');
-    }
-    _ = write!(&mut detail, "\n{full_version}");
-
-    let detail = Some(detail);
-
-    let prompt = window.prompt(
-        PromptLevel::Info,
-        &message,
-        detail.as_deref(),
-        &["Copy", "OK"],
-        cx,
-    );
-    cx.spawn(async move |_, cx| {
-        if let Ok(0) = prompt.await {
-            let content = format!("{}\n{}", message, detail.as_deref().unwrap_or(""));
-            cx.update(|cx| {
-                cx.write_to_clipboard(gpui::ClipboardItem::new_string(content));
-            })
-            .ok();
-        }
-    })
-    .detach();
-}
-
-#[cfg(not(target_os = "windows"))]
-fn install_cli(
-    _: &mut Workspace,
-    _: &install_cli::InstallCliBinary,
-    window: &mut Window,
-    cx: &mut Context<Workspace>,
-) {
-    install_cli::install_cli_binary(window, cx)
-}
-
-static WAITING_QUIT_CONFIRMATION: AtomicBool = AtomicBool::new(false);
-fn quit(_: &Quit, cx: &mut App) {
-    if WAITING_QUIT_CONFIRMATION.load(atomic::Ordering::Acquire) {
-        return;
-    }
-
-    let should_confirm = WorkspaceSettings::get_global(cx).confirm_quit;
-    cx.spawn(async move |cx| {
-        let mut workspace_windows = cx.update(|cx| {
-            cx.windows()
-                .into_iter()
-                .filter_map(|window| window.downcast::<Workspace>())
-                .collect::<Vec<_>>()
-        })?;
-
-        // If multiple windows have unsaved changes, and need a save prompt,
-        // prompt in the active window before switching to a different window.
-        cx.update(|cx| {
-            workspace_windows.sort_by_key(|window| window.is_active(cx) == Some(false));
-        })
-        .log_err();
-
-        if should_confirm && let Some(workspace) = workspace_windows.first() {
-            let answer = workspace
-                .update(cx, |_, window, cx| {
-                    window.prompt(
-                        PromptLevel::Info,
-                        "Are you sure you want to quit?",
-                        None,
-                        &["Quit", "Cancel"],
-                        cx,
-                    )
-                })
-                .log_err();
-
-            if let Some(answer) = answer {
-                WAITING_QUIT_CONFIRMATION.store(true, atomic::Ordering::Release);
-                let answer = answer.await.ok();
-                WAITING_QUIT_CONFIRMATION.store(false, atomic::Ordering::Release);
-                if answer != Some(0) {
-                    return Ok(());
-                }
-            }
-        }
-
-        // If the user cancels any save prompt, then keep the app open.
-        for window in workspace_windows {
-            if let Some(should_close) = window
-                .update(cx, |workspace, window, cx| {
-                    workspace.prepare_to_close(CloseIntent::Quit, window, cx)
-                })
-                .log_err()
-                && !should_close.await?
-            {
-                return Ok(());
-            }
-        }
-        cx.update(|cx| cx.quit())?;
-        anyhow::Ok(())
-    })
-    .detach_and_log_err(cx);
-}
-
-fn open_log_file(workspace: &mut Workspace, window: &mut Window, cx: &mut Context<Workspace>) {
-    const MAX_LINES: usize = 1000;
-    workspace
-        .with_local_workspace(window, cx, move |workspace, window, cx| {
-            let app_state = workspace.app_state();
-            let languages = app_state.languages.clone();
-            let fs = app_state.fs.clone();
-            cx.spawn_in(window, async move |workspace, cx| {
-                let (old_log, new_log, log_language) = futures::join!(
-                    fs.load(paths::old_log_file()),
-                    fs.load(paths::log_file()),
-                    languages.language_for_name("log")
-                );
-                let log = match (old_log, new_log) {
-                    (Err(_), Err(_)) => None,
-                    (old_log, new_log) => {
-                        let mut lines = VecDeque::with_capacity(MAX_LINES);
-                        for line in old_log
-                            .iter()
-                            .flat_map(|log| log.lines())
-                            .chain(new_log.iter().flat_map(|log| log.lines()))
-                        {
-                            if lines.len() == MAX_LINES {
-                                lines.pop_front();
-                            }
-                            lines.push_back(line);
-                        }
-                        Some(
-                            lines
-                                .into_iter()
-                                .flat_map(|line| [line, "\n"])
-                                .collect::<String>(),
-                        )
-                    }
-                };
-                let log_language = log_language.ok();
-
-                workspace
-                    .update_in(cx, |workspace, window, cx| {
-                        let Some(log) = log else {
-                            struct OpenLogError;
-
-                            workspace.show_notification(
-                                NotificationId::unique::<OpenLogError>(),
-                                cx,
-                                |cx| {
-                                    cx.new(|cx| {
-                                        MessageNotification::new(
-                                            format!(
-                                                "Unable to access/open log file at path {:?}",
-                                                paths::log_file().as_path()
-                                            ),
-                                            cx,
-                                        )
-                                    })
-                                },
-                            );
-                            return;
-                        };
-                        let project = workspace.project().clone();
-                        let buffer = project.update(cx, |project, cx| {
-                            project.create_local_buffer(&log, log_language, false, cx)
-                        });
-
-                        let buffer = cx
-                            .new(|cx| MultiBuffer::singleton(buffer, cx).with_title("Log".into()));
-                        let editor = cx.new(|cx| {
-                            let mut editor =
-                                Editor::for_multibuffer(buffer, Some(project), window, cx);
-                            editor.set_read_only(true);
-                            editor.set_breadcrumb_header(format!(
-                                "Last {} lines in {}",
-                                MAX_LINES,
-                                paths::log_file().display()
-                            ));
-                            editor
-                        });
-
-                        editor.update(cx, |editor, cx| {
-                            let last_multi_buffer_offset = editor.buffer().read(cx).len(cx);
-                            editor.change_selections(Default::default(), window, cx, |s| {
-                                s.select_ranges(Some(
-                                    last_multi_buffer_offset..last_multi_buffer_offset,
-                                ));
-                            })
-                        });
-
-                        workspace.add_item_to_active_pane(Box::new(editor), None, true, window, cx);
-                    })
-                    .log_err();
-            })
-            .detach();
-        })
-        .detach();
-}
-
-fn notify_settings_errors(result: settings::SettingsParseResult, is_user: bool, cx: &mut App) {
-    if let settings::ParseStatus::Failed { error: err } = &result.parse_status {
-        let settings_type = if is_user { "user" } else { "global" };
-        log::error!("Failed to load {} settings: {err}", settings_type);
-    }
-
-    let error = match result.parse_status {
-        settings::ParseStatus::Failed { error } => Some(anyhow::format_err!(error)),
-        settings::ParseStatus::Success => None,
-    };
-    let id = NotificationId::Named(format!("failed-to-parse-settings-{is_user}").into());
-
-    let showed_parse_error = match error {
-        Some(error) => {
-            if let Some(InvalidSettingsError::LocalSettings { .. }) =
-                error.downcast_ref::<InvalidSettingsError>()
-            {
-                false
-                // Local settings errors are displayed by the projects
-            } else {
-                show_app_notification(id, cx, move |cx| {
-                    cx.new(|cx| {
-                        MessageNotification::new(format!("Invalid user settings file\n{error}"), cx)
-                            .primary_message("Open Settings File")
-                            .primary_icon(IconName::Settings)
-                            .primary_on_click(|window, cx| {
-                                window.dispatch_action(
-                                    zed_actions::OpenSettingsFile.boxed_clone(),
-                                    cx,
-                                );
-                                cx.emit(DismissEvent);
-                            })
-                    })
-                });
-                true
-            }
-        }
-        None => {
-            dismiss_app_notification(&id, cx);
-            false
-        }
-    };
-    let id = NotificationId::Named(format!("failed-to-migrate-settings-{is_user}").into());
-
-    match result.migration_status {
-        settings::MigrationStatus::Succeeded | settings::MigrationStatus::NotNeeded => {
-            dismiss_app_notification(&id, cx);
-        }
-        settings::MigrationStatus::Failed { error: err } => {
-            if !showed_parse_error {
-                show_app_notification(id, cx, move |cx| {
-                    cx.new(|cx| {
-                        MessageNotification::new(
-                            format!(
-                                "Failed to migrate settings\n\
-                                {err}"
-                            ),
-                            cx,
-                        )
-                        .primary_message("Open Settings File")
-                        .primary_icon(IconName::Settings)
-                        .primary_on_click(|window, cx| {
-                            window.dispatch_action(zed_actions::OpenSettingsFile.boxed_clone(), cx);
-                            cx.emit(DismissEvent);
-                        })
-                    })
-                });
-            }
-        }
-    };
-}
-
-pub fn handle_settings_file_changes(
-    mut user_settings_file_rx: mpsc::UnboundedReceiver<String>,
-    mut global_settings_file_rx: mpsc::UnboundedReceiver<String>,
-    cx: &mut App,
-) {
-    MigrationNotification::set_global(cx.new(|_| MigrationNotification), cx);
-
-    // Initial load of both settings files
-    let global_content = cx
-        .background_executor()
-        .block(global_settings_file_rx.next())
-        .unwrap();
-    let user_content = cx
-        .background_executor()
-        .block(user_settings_file_rx.next())
-        .unwrap();
-
-    SettingsStore::update_global(cx, |store, cx| {
-        notify_settings_errors(store.set_user_settings(&user_content, cx), true, cx);
-        notify_settings_errors(store.set_global_settings(&global_content, cx), false, cx);
-    });
-
-    // Watch for changes in both files
-    cx.spawn(async move |cx| {
-        let mut settings_streams = futures::stream::select(
-            global_settings_file_rx.map(Either::Left),
-            user_settings_file_rx.map(Either::Right),
-        );
-
-        while let Some(content) = settings_streams.next().await {
-            let (content, is_user) = match content {
-                Either::Left(content) => (content, false),
-                Either::Right(content) => (content, true),
-            };
-
-            let result = cx.update_global(|store: &mut SettingsStore, cx| {
-                let result = if is_user {
-                    store.set_user_settings(&content, cx)
-                } else {
-                    store.set_global_settings(&content, cx)
-                };
-                let migrating_in_memory =
-                    matches!(&result.migration_status, MigrationStatus::Succeeded);
-                notify_settings_errors(result, is_user, cx);
-                if let Some(notifier) = MigrationNotification::try_global(cx) {
-                    notifier.update(cx, |_, cx| {
-                        cx.emit(MigrationEvent::ContentChanged {
-                            migration_type: MigrationType::Settings,
-                            migrating_in_memory,
-                        });
-                    });
-                }
-                cx.refresh_windows();
-            });
-
-            if result.is_err() {
-                break; // App dropped
-            }
-        }
-    })
-    .detach();
-}
-
-pub fn handle_keymap_file_changes(
-    mut user_keymap_file_rx: mpsc::UnboundedReceiver<String>,
-    cx: &mut App,
-) {
-    let (base_keymap_tx, mut base_keymap_rx) = mpsc::unbounded();
-    let (keyboard_layout_tx, mut keyboard_layout_rx) = mpsc::unbounded();
-    let mut old_base_keymap = *BaseKeymap::get_global(cx);
-    let mut old_vim_enabled = VimModeSetting::get_global(cx).0;
-    let mut old_helix_enabled = vim_mode_setting::HelixModeSetting::get_global(cx).0;
-
-    cx.observe_global::<SettingsStore>(move |cx| {
-        let new_base_keymap = *BaseKeymap::get_global(cx);
-        let new_vim_enabled = VimModeSetting::get_global(cx).0;
-        let new_helix_enabled = vim_mode_setting::HelixModeSetting::get_global(cx).0;
-
-        if new_base_keymap != old_base_keymap
-            || new_vim_enabled != old_vim_enabled
-            || new_helix_enabled != old_helix_enabled
-        {
-            old_base_keymap = new_base_keymap;
-            old_vim_enabled = new_vim_enabled;
-            old_helix_enabled = new_helix_enabled;
-
-            base_keymap_tx.unbounded_send(()).unwrap();
-        }
-    })
-    .detach();
-
-    #[cfg(target_os = "windows")]
-    {
-        let mut current_layout_id = cx.keyboard_layout().id().to_string();
-        cx.on_keyboard_layout_change(move |cx| {
-            let next_layout_id = cx.keyboard_layout().id();
-            if next_layout_id != current_layout_id {
-                current_layout_id = next_layout_id.to_string();
-                keyboard_layout_tx.unbounded_send(()).ok();
-            }
-        })
-        .detach();
-    }
-
-    #[cfg(not(target_os = "windows"))]
-    {
-        let mut current_mapping = cx.keyboard_mapper().get_key_equivalents().cloned();
-        cx.on_keyboard_layout_change(move |cx| {
-            let next_mapping = cx.keyboard_mapper().get_key_equivalents();
-            if current_mapping.as_ref() != next_mapping {
-                current_mapping = next_mapping.cloned();
-                keyboard_layout_tx.unbounded_send(()).ok();
-            }
-        })
-        .detach();
-    }
-
-    load_default_keymap(cx);
-
-    struct KeymapParseErrorNotification;
-    let notification_id = NotificationId::unique::<KeymapParseErrorNotification>();
-
-    cx.spawn(async move |cx| {
-        let mut user_keymap_content = String::new();
-        let mut migrating_in_memory = false;
-        loop {
-            select_biased! {
-                _ = base_keymap_rx.next() => {},
-                _ = keyboard_layout_rx.next() => {},
-                content = user_keymap_file_rx.next() => {
-                    if let Some(content) = content {
-                        if let Ok(Some(migrated_content)) = migrate_keymap(&content) {
-                            user_keymap_content = migrated_content;
-                            migrating_in_memory = true;
-                        } else {
-                            user_keymap_content = content;
-                            migrating_in_memory = false;
-                        }
-                    }
-                }
-            };
-            cx.update(|cx| {
-                if let Some(notifier) = MigrationNotification::try_global(cx) {
-                    notifier.update(cx, |_, cx| {
-                        cx.emit(MigrationEvent::ContentChanged {
-                            migration_type: MigrationType::Keymap,
-                            migrating_in_memory,
-                        });
-                    });
-                }
-                let load_result = KeymapFile::load(&user_keymap_content, cx);
-                match load_result {
-                    KeymapFileLoadResult::Success { key_bindings } => {
-                        reload_keymaps(cx, key_bindings);
-                        dismiss_app_notification(&notification_id.clone(), cx);
-                    }
-                    KeymapFileLoadResult::SomeFailedToLoad {
-                        key_bindings,
-                        error_message,
-                    } => {
-                        if !key_bindings.is_empty() {
-                            reload_keymaps(cx, key_bindings);
-                        }
-                        show_keymap_file_load_error(notification_id.clone(), error_message, cx);
-                    }
-                    KeymapFileLoadResult::JsonParseFailure { error } => {
-                        show_keymap_file_json_error(notification_id.clone(), &error, cx)
-                    }
-                }
-            })
-            .ok();
-        }
-    })
-    .detach();
-}
-
-fn show_keymap_file_json_error(
-    notification_id: NotificationId,
-    error: &anyhow::Error,
-    cx: &mut App,
-) {
-    let message: SharedString =
-        format!("JSON parse error in keymap file. Bindings not reloaded.\n\n{error}").into();
-    show_app_notification(notification_id, cx, move |cx| {
-        cx.new(|cx| {
-            MessageNotification::new(message.clone(), cx)
-                .primary_message("Open Keymap File")
-                .primary_on_click(|window, cx| {
-                    window.dispatch_action(zed_actions::OpenKeymapFile.boxed_clone(), cx);
-                    cx.emit(DismissEvent);
-                })
-        })
-    });
-}
-
-fn show_keymap_file_load_error(
-    notification_id: NotificationId,
-    error_message: MarkdownString,
-    cx: &mut App,
-) {
-    show_markdown_app_notification(
-        notification_id,
-        error_message,
-        "Open Keymap File".into(),
-        |window, cx| {
-            window.dispatch_action(zed_actions::OpenKeymapFile.boxed_clone(), cx);
-            cx.emit(DismissEvent);
-        },
-        cx,
-    )
-}
-
-fn show_markdown_app_notification<F>(
-    notification_id: NotificationId,
-    message: MarkdownString,
-    primary_button_message: SharedString,
-    primary_button_on_click: F,
-    cx: &mut App,
-) where
-    F: 'static + Send + Sync + Fn(&mut Window, &mut Context<MessageNotification>),
-{
-    let parsed_markdown = cx.background_spawn(async move {
-        let file_location_directory = None;
-        let language_registry = None;
-        markdown_preview::markdown_parser::parse_markdown(
-            &message.0,
-            file_location_directory,
-            language_registry,
-        )
-        .await
-    });
-
-    cx.spawn(async move |cx| {
-        let parsed_markdown = Arc::new(parsed_markdown.await);
-        let primary_button_message = primary_button_message.clone();
-        let primary_button_on_click = Arc::new(primary_button_on_click);
-        cx.update(|cx| {
-            show_app_notification(notification_id, cx, move |cx| {
-                let workspace_handle = cx.entity().downgrade();
-                let parsed_markdown = parsed_markdown.clone();
-                let primary_button_message = primary_button_message.clone();
-                let primary_button_on_click = primary_button_on_click.clone();
-                cx.new(move |cx| {
-                    MessageNotification::new_from_builder(cx, move |window, cx| {
-                        image_cache(retain_all("notification-cache"))
-                            .text_xs()
-                            .child(markdown_preview::markdown_renderer::render_parsed_markdown(
-                                &parsed_markdown.clone(),
-                                Some(workspace_handle.clone()),
-                                window,
-                                cx,
-                            ))
-                            .into_any()
-                    })
-                    .primary_message(primary_button_message)
-                    .primary_on_click_arc(primary_button_on_click)
-                })
-            })
-        })
-        .ok();
-    })
-    .detach();
-}
-
-fn reload_keymaps(cx: &mut App, mut user_key_bindings: Vec<KeyBinding>) {
-    cx.clear_key_bindings();
-    load_default_keymap(cx);
-
-    for key_binding in &mut user_key_bindings {
-        key_binding.set_meta(KeybindSource::User.meta());
-    }
-    cx.bind_keys(user_key_bindings);
-
-    let menus = app_menus(cx);
-    cx.set_menus(menus);
-    // On Windows, this is set in the `update_jump_list` method of the `HistoryManager`.
-    #[cfg(not(target_os = "windows"))]
-    cx.set_dock_menu(vec![gpui::MenuItem::action(
-        "New Window",
-        workspace::NewWindow,
-    )]);
-    // todo: nicer api here?
-    keymap_editor::KeymapEventChannel::trigger_keymap_changed(cx);
-}
-
-pub fn load_default_keymap(cx: &mut App) {
-    let base_keymap = *BaseKeymap::get_global(cx);
-    if base_keymap == BaseKeymap::None {
-        return;
-    }
-
-    cx.bind_keys(
-        KeymapFile::load_asset(DEFAULT_KEYMAP_PATH, Some(KeybindSource::Default), cx).unwrap(),
-    );
-
-    if let Some(asset_path) = base_keymap.asset_path() {
-        cx.bind_keys(KeymapFile::load_asset(asset_path, Some(KeybindSource::Base), cx).unwrap());
-    }
-
-    if VimModeSetting::get_global(cx).0 || vim_mode_setting::HelixModeSetting::get_global(cx).0 {
-        cx.bind_keys(
-            KeymapFile::load_asset(VIM_KEYMAP_PATH, Some(KeybindSource::Vim), cx).unwrap(),
-        );
-    }
-}
-
-pub fn open_new_ssh_project_from_project(
-    workspace: &mut Workspace,
-    paths: Vec<PathBuf>,
-    window: &mut Window,
-    cx: &mut Context<Workspace>,
-) -> Task<anyhow::Result<()>> {
-    let app_state = workspace.app_state().clone();
-    let Some(ssh_client) = workspace.project().read(cx).remote_client() else {
-        return Task::ready(Err(anyhow::anyhow!("Not an ssh project")));
-    };
-    let connection_options = ssh_client.read(cx).connection_options();
-    cx.spawn_in(window, async move |_, cx| {
-        open_remote_project(
-            connection_options,
-            paths,
-            app_state,
-            workspace::OpenOptions {
-                open_new_workspace: Some(true),
-                ..Default::default()
-            },
-            cx,
-        )
-        .await
-    })
-}
-
-fn open_project_settings_file(
-    workspace: &mut Workspace,
-    _: &OpenProjectSettingsFile,
-    window: &mut Window,
-    cx: &mut Context<Workspace>,
-) {
-    open_local_file(
-        workspace,
-        local_settings_file_relative_path(),
-        initial_project_settings_content(),
-        window,
-        cx,
-    )
-}
-
-fn open_project_tasks_file(
-    workspace: &mut Workspace,
-    _: &OpenProjectTasks,
-    window: &mut Window,
-    cx: &mut Context<Workspace>,
-) {
-    open_local_file(
-        workspace,
-        local_tasks_file_relative_path(),
-        initial_tasks_content(),
-        window,
-        cx,
-    )
-}
-
-fn open_project_debug_tasks_file(
-    workspace: &mut Workspace,
-    _: &zed_actions::OpenProjectDebugTasks,
-    window: &mut Window,
-    cx: &mut Context<Workspace>,
-) {
-    open_local_file(
-        workspace,
-        local_debug_file_relative_path(),
-        initial_local_debug_tasks_content(),
-        window,
-        cx,
-    )
-}
-
-fn open_local_file(
-    workspace: &mut Workspace,
-    settings_relative_path: &'static RelPath,
-    initial_contents: Cow<'static, str>,
-    window: &mut Window,
-    cx: &mut Context<Workspace>,
-) {
-    let project = workspace.project().clone();
-    let worktree = project
-        .read(cx)
-        .visible_worktrees(cx)
-        .find_map(|tree| tree.read(cx).root_entry()?.is_dir().then_some(tree));
-    if let Some(worktree) = worktree {
-        let tree_id = worktree.read(cx).id();
-        cx.spawn_in(window, async move |workspace, cx| {
-            // Check if the file actually exists on disk (even if it's excluded from worktree)
-            let file_exists = {
-                let full_path = worktree.read_with(cx, |tree, _| {
-                    tree.abs_path().join(settings_relative_path.as_std_path())
-                })?;
-
-                let fs = project.read_with(cx, |project, _| project.fs().clone())?;
-
-                fs.metadata(&full_path)
-                    .await
-                    .ok()
-                    .flatten()
-                    .is_some_and(|metadata| !metadata.is_dir && !metadata.is_fifo)
-            };
-
-            if !file_exists {
-                if let Some(dir_path) = settings_relative_path.parent()
-                    && worktree.read_with(cx, |tree, _| tree.entry_for_path(dir_path).is_none())?
-                {
-                    project
-                        .update(cx, |project, cx| {
-                            project.create_entry((tree_id, dir_path), true, cx)
-                        })?
-                        .await
-                        .context("worktree was removed")?;
-                }
-
-                if worktree.read_with(cx, |tree, _| {
-                    tree.entry_for_path(settings_relative_path).is_none()
-                })? {
-                    project
-                        .update(cx, |project, cx| {
-                            project.create_entry((tree_id, settings_relative_path), false, cx)
-                        })?
-                        .await
-                        .context("worktree was removed")?;
-                }
-            }
-
-            let editor = workspace
-                .update_in(cx, |workspace, window, cx| {
-                    workspace.open_path((tree_id, settings_relative_path), None, true, window, cx)
-                })?
-                .await?
-                .downcast::<Editor>()
-                .context("unexpected item type: expected editor item")?;
-
-            editor
-                .downgrade()
-                .update(cx, |editor, cx| {
-                    if let Some(buffer) = editor.buffer().read(cx).as_singleton()
-                        && buffer.read(cx).is_empty()
-                    {
-                        buffer.update(cx, |buffer, cx| {
-                            buffer.edit([(0..0, initial_contents)], None, cx)
-                        });
-                    }
-                })
-                .ok();
-
-            anyhow::Ok(())
-        })
-        .detach();
-    } else {
-        struct NoOpenFolders;
-
-        workspace.show_notification(NotificationId::unique::<NoOpenFolders>(), cx, |cx| {
-            cx.new(|cx| MessageNotification::new("This project has no folders open.", cx))
-        })
-    }
-}
-
-fn open_telemetry_log_file(
-    workspace: &mut Workspace,
-    window: &mut Window,
-    cx: &mut Context<Workspace>,
-) {
-    const HEADER: &str = concat!(
-        "// Zed collects anonymous usage data to help us understand how people are using the app.\n",
-        "// Telemetry can be disabled via the `settings.json` file.\n",
-        "// Here is the data that has been reported for the current session:\n",
-    );
-    workspace
-        .with_local_workspace(window, cx, move |workspace, window, cx| {
-            let app_state = workspace.app_state().clone();
-            cx.spawn_in(window, async move |workspace, cx| {
-                async fn fetch_log_string(app_state: &Arc<AppState>) -> Option<String> {
-                    let path = client::telemetry::Telemetry::log_file_path();
-                    app_state.fs.load(&path).await.log_err()
-                }
-
-                let log = fetch_log_string(&app_state)
-                    .await
-                    .unwrap_or_else(|| "// No data has been collected yet".to_string());
-
-                const MAX_TELEMETRY_LOG_LEN: usize = 5 * 1024 * 1024;
-                let mut start_offset = log.len().saturating_sub(MAX_TELEMETRY_LOG_LEN);
-                if let Some(newline_offset) = log[start_offset..].find('\n') {
-                    start_offset += newline_offset + 1;
-                }
-                let log_suffix = &log[start_offset..];
-                let content = format!("{}\n{}", HEADER, log_suffix);
-                let json = app_state
-                    .languages
-                    .language_for_name("JSON")
-                    .await
-                    .log_err();
-
-                workspace
-                    .update_in(cx, |workspace, window, cx| {
-                        let project = workspace.project().clone();
-                        let buffer = project.update(cx, |project, cx| {
-                            project.create_local_buffer(&content, json, false, cx)
-                        });
-                        let buffer = cx.new(|cx| {
-                            MultiBuffer::singleton(buffer, cx).with_title("Telemetry Log".into())
-                        });
-                        workspace.add_item_to_active_pane(
-                            Box::new(cx.new(|cx| {
-                                let mut editor =
-                                    Editor::for_multibuffer(buffer, Some(project), window, cx);
-                                editor.set_read_only(true);
-                                editor.set_breadcrumb_header("Telemetry Log".into());
-                                editor
-                            })),
-                            None,
-                            true,
-                            window,
-                            cx,
-                        );
-                    })
-                    .log_err()?;
-
-                Some(())
-            })
-            .detach();
-        })
-        .detach();
-}
-
-fn open_bundled_file(
-    workspace: &Workspace,
-    text: Cow<'static, str>,
-    title: &'static str,
-    language: &'static str,
-    window: &mut Window,
-    cx: &mut Context<Workspace>,
-) {
-    let language = workspace.app_state().languages.language_for_name(language);
-    cx.spawn_in(window, async move |workspace, cx| {
-        let language = language.await.log_err();
-        workspace
-            .update_in(cx, |workspace, window, cx| {
-                workspace.with_local_workspace(window, cx, |workspace, window, cx| {
-                    let project = workspace.project();
-                    let buffer = project.update(cx, move |project, cx| {
-                        let buffer =
-                            project.create_local_buffer(text.as_ref(), language, false, cx);
-                        buffer.update(cx, |buffer, cx| {
-                            buffer.set_capability(Capability::ReadOnly, cx);
-                        });
-                        buffer
-                    });
-                    let buffer =
-                        cx.new(|cx| MultiBuffer::singleton(buffer, cx).with_title(title.into()));
-                    workspace.add_item_to_active_pane(
-                        Box::new(cx.new(|cx| {
-                            let mut editor =
-                                Editor::for_multibuffer(buffer, Some(project.clone()), window, cx);
-                            editor.set_read_only(true);
-                            editor.set_should_serialize(false, cx);
-                            editor.set_breadcrumb_header(title.into());
-                            editor
-                        })),
-                        None,
-                        true,
-                        window,
-                        cx,
-                    );
-                })
-            })?
-            .await
-    })
-    .detach_and_log_err(cx);
-}
-
-fn open_settings_file(
-    abs_path: &'static Path,
-    default_content: impl FnOnce() -> Rope + Send + 'static,
-    window: &mut Window,
-    cx: &mut Context<Workspace>,
-) {
-    cx.spawn_in(window, async move |workspace, cx| {
-        let (worktree_creation_task, settings_open_task) = workspace
-            .update_in(cx, |workspace, window, cx| {
-                workspace.with_local_workspace(window, cx, move |workspace, window, cx| {
-                    let worktree_creation_task = workspace.project().update(cx, |project, cx| {
-                        // Set up a dedicated worktree for settings, since
-                        // otherwise we're dropping and re-starting LSP servers
-                        // for each file inside on every settings file
-                        // close/open
-
-                        // TODO: Do note that all other external files (e.g.
-                        // drag and drop from OS) still have their worktrees
-                        // released on file close, causing LSP servers'
-                        // restarts.
-                        project.find_or_create_worktree(paths::config_dir().as_path(), false, cx)
-                    });
-                    let settings_open_task =
-                        create_and_open_local_file(abs_path, window, cx, default_content);
-                    (worktree_creation_task, settings_open_task)
-                })
-            })?
-            .await?;
-        let _ = worktree_creation_task.await?;
-        let _ = settings_open_task.await?;
-        anyhow::Ok(())
-    })
-    .detach_and_log_err(cx);
-}
-
-fn capture_recent_audio(workspace: &mut Workspace, _: &mut Window, cx: &mut Context<Workspace>) {
-    struct CaptureRecentAudioNotification {
-        focus_handle: gpui::FocusHandle,
-        save_result: Option<Result<(PathBuf, Duration), anyhow::Error>>,
-        _save_task: Task<anyhow::Result<()>>,
-    }
-
-    impl gpui::EventEmitter<DismissEvent> for CaptureRecentAudioNotification {}
-    impl gpui::EventEmitter<SuppressEvent> for CaptureRecentAudioNotification {}
-    impl gpui::Focusable for CaptureRecentAudioNotification {
-        fn focus_handle(&self, _cx: &App) -> gpui::FocusHandle {
-            self.focus_handle.clone()
-        }
-    }
-    impl workspace::notifications::Notification for CaptureRecentAudioNotification {}
-
-    impl Render for CaptureRecentAudioNotification {
-        fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-            let message = match &self.save_result {
-                None => format!(
-                    "Saving up to {} seconds of recent audio",
-                    REPLAY_DURATION.as_secs(),
-                ),
-                Some(Ok((path, duration))) => format!(
-                    "Saved {} seconds of all audio to {}",
-                    duration.as_secs(),
-                    path.display(),
-                ),
-                Some(Err(e)) => format!("Error saving audio replays: {e:?}"),
-            };
-
-            NotificationFrame::new()
-                .with_title(Some("Saved Audio"))
-                .show_suppress_button(false)
-                .on_close(cx.listener(|_, _, _, cx| {
-                    cx.emit(DismissEvent);
-                }))
-                .with_content(message)
-        }
-    }
-
-    impl CaptureRecentAudioNotification {
-        fn new(cx: &mut Context<Self>) -> Self {
-            if AudioSettings::get_global(cx).rodio_audio {
-                let executor = cx.background_executor().clone();
-                let save_task = cx.default_global::<audio::Audio>().save_replays(executor);
-                let _save_task = cx.spawn(async move |this, cx| {
-                    let res = save_task.await;
-                    this.update(cx, |this, cx| {
-                        this.save_result = Some(res);
-                        cx.notify();
-                    })
-                });
-
-                Self {
-                    focus_handle: cx.focus_handle(),
-                    _save_task,
-                    save_result: None,
-                }
-            } else {
-                Self {
-                    focus_handle: cx.focus_handle(),
-                    _save_task: Task::ready(Ok(())),
-                    save_result: Some(Err(anyhow::anyhow!(
-                        "Capturing recent audio is only supported on the experimental rodio audio pipeline"
-                    ))),
-                }
-            }
-        }
-    }
-
-    workspace.show_notification(
-        NotificationId::unique::<CaptureRecentAudioNotification>(),
-        cx,
-        |cx| cx.new(CaptureRecentAudioNotification::new),
-    );
-}
-
-/// Eagerly loads the active theme and icon theme based on the selections in the
-/// theme settings.
-///
-/// This fast path exists to load these themes as soon as possible so the user
-/// doesn't see the default themes while waiting on extensions to load.
-pub(crate) fn eager_load_active_theme_and_icon_theme(fs: Arc<dyn Fs>, cx: &mut App) {
-    let extension_store = ExtensionStore::global(cx);
-    let theme_registry = ThemeRegistry::global(cx);
-    let theme_settings = ThemeSettings::get_global(cx);
-    let appearance = SystemAppearance::global(cx).0;
-
-    enum LoadTarget {
-        Theme(PathBuf),
-        IconTheme((PathBuf, PathBuf)),
-    }
-
-    let theme_name = theme_settings.theme.name(appearance);
-    let icon_theme_name = theme_settings.icon_theme.name(appearance);
-    let themes_to_load = [
-        theme_registry
-            .get(&theme_name.0)
-            .is_err()
-            .then(|| {
-                extension_store
-                    .read(cx)
-                    .path_to_extension_theme(&theme_name.0)
-            })
-            .flatten()
-            .map(LoadTarget::Theme),
-        theme_registry
-            .get_icon_theme(&icon_theme_name.0)
-            .is_err()
-            .then(|| {
-                extension_store
-                    .read(cx)
-                    .path_to_extension_icon_theme(&icon_theme_name.0)
-            })
-            .flatten()
-            .map(LoadTarget::IconTheme),
-    ];
-
-    enum ReloadTarget {
-        Theme,
-        IconTheme,
-    }
-
-    let executor = cx.background_executor();
-    let reload_tasks = parking_lot::Mutex::new(Vec::with_capacity(themes_to_load.len()));
-
-    let mut themes_to_load = themes_to_load.into_iter().flatten().peekable();
-
-    if themes_to_load.peek().is_none() {
-        return;
-    }
-
-    executor.block(executor.scoped(|scope| {
-        for load_target in themes_to_load {
-            let theme_registry = &theme_registry;
-            let reload_tasks = &reload_tasks;
-            let fs = fs.clone();
-
-            scope.spawn(async {
-                match load_target {
-                    LoadTarget::Theme(theme_path) => {
-                        if theme_registry
-                            .load_user_theme(&theme_path, fs)
-                            .await
-                            .log_err()
-                            .is_some()
-                        {
-                            reload_tasks.lock().push(ReloadTarget::Theme);
-                        }
-                    }
-                    LoadTarget::IconTheme((icon_theme_path, icons_root_path)) => {
-                        if theme_registry
-                            .load_icon_theme(&icon_theme_path, &icons_root_path, fs)
-                            .await
-                            .log_err()
-                            .is_some()
-                        {
-                            reload_tasks.lock().push(ReloadTarget::IconTheme);
-                        }
-                    }
-                }
-            });
-        }
-    }));
-
-    for reload_target in reload_tasks.into_inner() {
-        match reload_target {
-            ReloadTarget::Theme => GlobalTheme::reload_theme(cx),
-            ReloadTarget::IconTheme => GlobalTheme::reload_icon_theme(cx),
-        };
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use assets::Assets;
-    use collections::HashSet;
-    use editor::{
-        DisplayPoint, Editor, MultiBufferOffset, SelectionEffects, display_map::DisplayRow,
-    };
-    use gpui::{
-        Action, AnyWindowHandle, App, AssetSource, BorrowAppContext, TestAppContext, UpdateGlobal,
-        VisualTestContext, WindowHandle, actions,
-    };
-    use language::LanguageRegistry;
-    use languages::{markdown_lang, rust_lang};
-    use pretty_assertions::{assert_eq, assert_ne};
-    use project::{Project, ProjectPath};
-    use semver::Version;
-    use serde_json::json;
-    use settings::{SettingsStore, watch_config_file};
-    use std::{
-        path::{Path, PathBuf},
-        time::Duration,
-    };
-    use theme::ThemeRegistry;
-    use util::{
-        path,
-        rel_path::{RelPath, rel_path},
-    };
-    use workspace::{
-        NewFile, OpenOptions, OpenVisible, SERIALIZATION_THROTTLE_TIME, SaveIntent, SplitDirection,
-        WorkspaceHandle,
-        item::SaveOptions,
-        item::{Item, ItemHandle},
-        open_new, open_paths, pane,
-    };
-
-    #[gpui::test]
-    async fn test_open_non_existing_file(cx: &mut TestAppContext) {
-        let app_state = init_test(cx);
-        app_state
-            .fs
-            .as_fake()
-            .insert_tree(
-                path!("/root"),
-                json!({
-                    "a": {
-                    },
-                }),
-            )
-            .await;
-
-        cx.update(|cx| {
-            open_paths(
-                &[PathBuf::from(path!("/root/a/new"))],
-                app_state.clone(),
-                workspace::OpenOptions::default(),
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-        assert_eq!(cx.read(|cx| cx.windows().len()), 1);
-
-        let workspace = cx.windows()[0].downcast::<Workspace>().unwrap();
-        workspace
-            .update(cx, |workspace, _, cx| {
-                assert!(workspace.active_item_as::<Editor>(cx).is_some())
-            })
-            .unwrap();
-    }
-
-    #[gpui::test]
-    async fn test_open_paths_action(cx: &mut TestAppContext) {
-        let app_state = init_test(cx);
-        app_state
-            .fs
-            .as_fake()
-            .insert_tree(
-                "/root",
-                json!({
-                    "a": {
-                        "aa": null,
-                        "ab": null,
-                    },
-                    "b": {
-                        "ba": null,
-                        "bb": null,
-                    },
-                    "c": {
-                        "ca": null,
-                        "cb": null,
-                    },
-                    "d": {
-                        "da": null,
-                        "db": null,
-                    },
-                    "e": {
-                        "ea": null,
-                        "eb": null,
-                    }
-                }),
-            )
-            .await;
-
-        cx.update(|cx| {
-            open_paths(
-                &[PathBuf::from("/root/a"), PathBuf::from("/root/b")],
-                app_state.clone(),
-                workspace::OpenOptions::default(),
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-        assert_eq!(cx.read(|cx| cx.windows().len()), 1);
-
-        cx.update(|cx| {
-            open_paths(
-                &[PathBuf::from("/root/a")],
-                app_state.clone(),
-                workspace::OpenOptions::default(),
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-        assert_eq!(cx.read(|cx| cx.windows().len()), 1);
-        let workspace_1 = cx
-            .read(|cx| cx.windows()[0].downcast::<Workspace>())
-            .unwrap();
-        cx.run_until_parked();
-        workspace_1
-            .update(cx, |workspace, window, cx| {
-                assert_eq!(workspace.worktrees(cx).count(), 2);
-                assert!(workspace.left_dock().read(cx).is_open());
-                assert!(
-                    workspace
-                        .active_pane()
-                        .read(cx)
-                        .focus_handle(cx)
-                        .is_focused(window)
-                );
-            })
-            .unwrap();
-
-        cx.update(|cx| {
-            open_paths(
-                &[PathBuf::from("/root/c"), PathBuf::from("/root/d")],
-                app_state.clone(),
-                workspace::OpenOptions::default(),
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-        assert_eq!(cx.read(|cx| cx.windows().len()), 2);
-
-        // Replace existing windows
-        let window = cx
-            .update(|cx| cx.windows()[0].downcast::<Workspace>())
-            .unwrap();
-        cx.update(|cx| {
-            open_paths(
-                &[PathBuf::from("/root/e")],
-                app_state,
-                workspace::OpenOptions {
-                    replace_window: Some(window),
-                    ..Default::default()
-                },
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-        cx.background_executor.run_until_parked();
-        assert_eq!(cx.read(|cx| cx.windows().len()), 2);
-        let workspace_1 = cx
-            .update(|cx| cx.windows()[0].downcast::<Workspace>())
-            .unwrap();
-        workspace_1
-            .update(cx, |workspace, window, cx| {
-                assert_eq!(
-                    workspace
-                        .worktrees(cx)
-                        .map(|w| w.read(cx).abs_path())
-                        .collect::<Vec<_>>(),
-                    &[Path::new("/root/e").into()]
-                );
-                assert!(workspace.left_dock().read(cx).is_open());
-                assert!(workspace.active_pane().focus_handle(cx).is_focused(window));
-            })
-            .unwrap();
-    }
-
-    #[gpui::test]
-    async fn test_open_add_new(cx: &mut TestAppContext) {
-        let app_state = init_test(cx);
-        app_state
-            .fs
-            .as_fake()
-            .insert_tree(
-                path!("/root"),
-                json!({"a": "hey", "b": "", "dir": {"c": "f"}}),
-            )
-            .await;
-
-        cx.update(|cx| {
-            open_paths(
-                &[PathBuf::from(path!("/root/dir"))],
-                app_state.clone(),
-                workspace::OpenOptions::default(),
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-        assert_eq!(cx.update(|cx| cx.windows().len()), 1);
-
-        cx.update(|cx| {
-            open_paths(
-                &[PathBuf::from(path!("/root/a"))],
-                app_state.clone(),
-                workspace::OpenOptions {
-                    open_new_workspace: Some(false),
-                    ..Default::default()
-                },
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-        assert_eq!(cx.update(|cx| cx.windows().len()), 1);
-
-        cx.update(|cx| {
-            open_paths(
-                &[PathBuf::from(path!("/root/dir/c"))],
-                app_state.clone(),
-                workspace::OpenOptions {
-                    open_new_workspace: Some(true),
-                    ..Default::default()
-                },
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-        assert_eq!(cx.update(|cx| cx.windows().len()), 2);
-    }
-
-    #[gpui::test]
-    async fn test_open_file_in_many_spaces(cx: &mut TestAppContext) {
-        let app_state = init_test(cx);
-        app_state
-            .fs
-            .as_fake()
-            .insert_tree(
-                path!("/root"),
-                json!({"dir1": {"a": "b"}, "dir2": {"c": "d"}}),
-            )
-            .await;
-
-        cx.update(|cx| {
-            open_paths(
-                &[PathBuf::from(path!("/root/dir1/a"))],
-                app_state.clone(),
-                workspace::OpenOptions::default(),
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-        assert_eq!(cx.update(|cx| cx.windows().len()), 1);
-        let window1 = cx.update(|cx| cx.active_window().unwrap());
-
-        cx.update(|cx| {
-            open_paths(
-                &[PathBuf::from(path!("/root/dir2/c"))],
-                app_state.clone(),
-                workspace::OpenOptions::default(),
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-        assert_eq!(cx.update(|cx| cx.windows().len()), 1);
-
-        cx.update(|cx| {
-            open_paths(
-                &[PathBuf::from(path!("/root/dir2"))],
-                app_state.clone(),
-                workspace::OpenOptions::default(),
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-        assert_eq!(cx.update(|cx| cx.windows().len()), 2);
-        let window2 = cx.update(|cx| cx.active_window().unwrap());
-        assert!(window1 != window2);
-        cx.update_window(window1, |_, window, _| window.activate_window())
-            .unwrap();
-
-        cx.update(|cx| {
-            open_paths(
-                &[PathBuf::from(path!("/root/dir2/c"))],
-                app_state.clone(),
-                workspace::OpenOptions::default(),
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-        assert_eq!(cx.update(|cx| cx.windows().len()), 2);
-        // should have opened in window2 because that has dir2 visibly open (window1 has it open, but not in the project panel)
-        assert!(cx.update(|cx| cx.active_window().unwrap()) == window2);
-    }
-
-    #[gpui::test]
-    async fn test_window_edit_state_restoring_disabled(cx: &mut TestAppContext) {
-        let executor = cx.executor();
-        let app_state = init_test(cx);
-
-        cx.update(|cx| {
-            SettingsStore::update_global(cx, |store, cx| {
-                store.update_user_settings(cx, |settings| {
-                    settings
-                        .session
-                        .get_or_insert_default()
-                        .restore_unsaved_buffers = Some(false)
-                });
-            });
-        });
-
-        app_state
-            .fs
-            .as_fake()
-            .insert_tree(path!("/root"), json!({"a": "hey"}))
-            .await;
-
-        cx.update(|cx| {
-            open_paths(
-                &[PathBuf::from(path!("/root/a"))],
-                app_state.clone(),
-                workspace::OpenOptions::default(),
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-        assert_eq!(cx.update(|cx| cx.windows().len()), 1);
-
-        // When opening the workspace, the window is not in a edited state.
-        let window = cx.update(|cx| cx.windows()[0].downcast::<Workspace>().unwrap());
-
-        let window_is_edited = |window: WindowHandle<Workspace>, cx: &mut TestAppContext| {
-            cx.update(|cx| window.read(cx).unwrap().is_edited())
-        };
-        let pane = window
-            .read_with(cx, |workspace, _| workspace.active_pane().clone())
-            .unwrap();
-        let editor = window
-            .read_with(cx, |workspace, cx| {
-                workspace
-                    .active_item(cx)
-                    .unwrap()
-                    .downcast::<Editor>()
-                    .unwrap()
-            })
-            .unwrap();
-
-        assert!(!window_is_edited(window, cx));
-
-        // Editing a buffer marks the window as edited.
-        window
-            .update(cx, |_, window, cx| {
-                editor.update(cx, |editor, cx| editor.insert("EDIT", window, cx));
-            })
-            .unwrap();
-
-        assert!(window_is_edited(window, cx));
-
-        // Undoing the edit restores the window's edited state.
-        window
-            .update(cx, |_, window, cx| {
-                editor.update(cx, |editor, cx| {
-                    editor.undo(&Default::default(), window, cx)
-                });
-            })
-            .unwrap();
-        assert!(!window_is_edited(window, cx));
-
-        // Redoing the edit marks the window as edited again.
-        window
-            .update(cx, |_, window, cx| {
-                editor.update(cx, |editor, cx| {
-                    editor.redo(&Default::default(), window, cx)
-                });
-            })
-            .unwrap();
-        assert!(window_is_edited(window, cx));
-        let weak = editor.downgrade();
-
-        // Closing the item restores the window's edited state.
-        let close = window
-            .update(cx, |_, window, cx| {
-                pane.update(cx, |pane, cx| {
-                    drop(editor);
-                    pane.close_active_item(&Default::default(), window, cx)
-                })
-            })
-            .unwrap();
-        executor.run_until_parked();
-
-        cx.simulate_prompt_answer("Don't Save");
-        close.await.unwrap();
-
-        // Advance the clock to ensure that the item has been serialized and dropped from the queue
-        cx.executor().advance_clock(Duration::from_secs(1));
-
-        weak.assert_released();
-        assert!(!window_is_edited(window, cx));
-        // Opening the buffer again doesn't impact the window's edited state.
-        cx.update(|cx| {
-            open_paths(
-                &[PathBuf::from(path!("/root/a"))],
-                app_state,
-                workspace::OpenOptions::default(),
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-        executor.run_until_parked();
-
-        window
-            .update(cx, |workspace, _, cx| {
-                let editor = workspace
-                    .active_item(cx)
-                    .unwrap()
-                    .downcast::<Editor>()
-                    .unwrap();
-
-                editor.update(cx, |editor, cx| {
-                    assert_eq!(editor.text(cx), "hey");
-                });
-            })
-            .unwrap();
-
-        let editor = window
-            .read_with(cx, |workspace, cx| {
-                workspace
-                    .active_item(cx)
-                    .unwrap()
-                    .downcast::<Editor>()
-                    .unwrap()
-            })
-            .unwrap();
-        assert!(!window_is_edited(window, cx));
-
-        // Editing the buffer marks the window as edited.
-        window
-            .update(cx, |_, window, cx| {
-                editor.update(cx, |editor, cx| editor.insert("EDIT", window, cx));
-            })
-            .unwrap();
-        executor.run_until_parked();
-        assert!(window_is_edited(window, cx));
-
-        // Ensure closing the window via the mouse gets preempted due to the
-        // buffer having unsaved changes.
-        assert!(!VisualTestContext::from_window(window.into(), cx).simulate_close());
-        executor.run_until_parked();
-        assert_eq!(cx.update(|cx| cx.windows().len()), 1);
-
-        // The window is successfully closed after the user dismisses the prompt.
-        cx.simulate_prompt_answer("Don't Save");
-        executor.run_until_parked();
-        assert_eq!(cx.update(|cx| cx.windows().len()), 0);
-    }
-
-    #[gpui::test]
-    async fn test_window_edit_state_restoring_enabled(cx: &mut TestAppContext) {
-        let app_state = init_test(cx);
-        app_state
-            .fs
-            .as_fake()
-            .insert_tree(path!("/root"), json!({"a": "hey"}))
-            .await;
-
-        cx.update(|cx| {
-            open_paths(
-                &[PathBuf::from(path!("/root/a"))],
-                app_state.clone(),
-                workspace::OpenOptions::default(),
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-
-        assert_eq!(cx.update(|cx| cx.windows().len()), 1);
-
-        // When opening the workspace, the window is not in a edited state.
-        let window = cx.update(|cx| cx.windows()[0].downcast::<Workspace>().unwrap());
-
-        let window_is_edited = |window: WindowHandle<Workspace>, cx: &mut TestAppContext| {
-            cx.update(|cx| window.read(cx).unwrap().is_edited())
-        };
-
-        let editor = window
-            .read_with(cx, |workspace, cx| {
-                workspace
-                    .active_item(cx)
-                    .unwrap()
-                    .downcast::<Editor>()
-                    .unwrap()
-            })
-            .unwrap();
-
-        assert!(!window_is_edited(window, cx));
-
-        // Editing a buffer marks the window as edited.
-        window
-            .update(cx, |_, window, cx| {
-                editor.update(cx, |editor, cx| editor.insert("EDIT", window, cx));
-            })
-            .unwrap();
-
-        assert!(window_is_edited(window, cx));
-        cx.run_until_parked();
-
-        // Advance the clock to make sure the workspace is serialized
-        cx.executor().advance_clock(Duration::from_secs(1));
-
-        // When closing the window, no prompt shows up and the window is closed.
-        // buffer having unsaved changes.
-        assert!(!VisualTestContext::from_window(window.into(), cx).simulate_close());
-        cx.run_until_parked();
-        assert_eq!(cx.update(|cx| cx.windows().len()), 0);
-
-        // When we now reopen the window, the edited state and the edited buffer are back
-        cx.update(|cx| {
-            open_paths(
-                &[PathBuf::from(path!("/root/a"))],
-                app_state.clone(),
-                workspace::OpenOptions::default(),
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-
-        assert_eq!(cx.update(|cx| cx.windows().len()), 1);
-        assert!(cx.update(|cx| cx.active_window().is_some()));
-
-        cx.run_until_parked();
-
-        // When opening the workspace, the window is not in a edited state.
-        let window = cx.update(|cx| cx.active_window().unwrap().downcast::<Workspace>().unwrap());
-        assert!(window_is_edited(window, cx));
-
-        window
-            .update(cx, |workspace, _, cx| {
-                let editor = workspace
-                    .active_item(cx)
-                    .unwrap()
-                    .downcast::<editor::Editor>()
-                    .unwrap();
-                editor.update(cx, |editor, cx| {
-                    assert_eq!(editor.text(cx), "EDIThey");
-                    assert!(editor.is_dirty(cx));
-                });
-
-                editor
-            })
-            .unwrap();
-    }
-
-    #[gpui::test]
-    async fn test_new_empty_workspace(cx: &mut TestAppContext) {
-        let app_state = init_test(cx);
-        cx.update(|cx| {
-            open_new(
-                Default::default(),
-                app_state.clone(),
-                cx,
-                |workspace, window, cx| {
-                    Editor::new_file(workspace, &Default::default(), window, cx)
-                },
-            )
-        })
-        .await
-        .unwrap();
-        cx.run_until_parked();
-
-        let workspace = cx
-            .update(|cx| cx.windows().first().unwrap().downcast::<Workspace>())
-            .unwrap();
-
-        let editor = workspace
-            .update(cx, |workspace, _, cx| {
-                let editor = workspace
-                    .active_item(cx)
-                    .unwrap()
-                    .downcast::<editor::Editor>()
-                    .unwrap();
-                editor.update(cx, |editor, cx| {
-                    assert!(editor.text(cx).is_empty());
-                    assert!(!editor.is_dirty(cx));
-                });
-
-                editor
-            })
-            .unwrap();
-
-        let save_task = workspace
-            .update(cx, |workspace, window, cx| {
-                workspace.save_active_item(SaveIntent::Save, window, cx)
-            })
-            .unwrap();
-        app_state.fs.create_dir(Path::new("/root")).await.unwrap();
-        cx.background_executor.run_until_parked();
-        cx.simulate_new_path_selection(|_| Some(PathBuf::from("/root/the-new-name")));
-        save_task.await.unwrap();
-        workspace
-            .update(cx, |_, _, cx| {
-                editor.update(cx, |editor, cx| {
-                    assert!(!editor.is_dirty(cx));
-                    assert_eq!(editor.title(cx), "the-new-name");
-                });
-            })
-            .unwrap();
-    }
-
-    #[gpui::test]
-    async fn test_open_entry(cx: &mut TestAppContext) {
-        let app_state = init_test(cx);
-        app_state
-            .fs
-            .as_fake()
-            .insert_tree(
-                path!("/root"),
-                json!({
-                    "a": {
-                        "file1": "contents 1",
-                        "file2": "contents 2",
-                        "file3": "contents 3",
-                    },
-                }),
-            )
-            .await;
-
-        let project = Project::test(app_state.fs.clone(), [path!("/root").as_ref()], cx).await;
-        project.update(cx, |project, _cx| project.languages().add(markdown_lang()));
-        let window = cx.add_window(|window, cx| Workspace::test_new(project, window, cx));
-        let workspace = window.root(cx).unwrap();
-
-        let entries = cx.read(|cx| workspace.file_project_paths(cx));
-        let file1 = entries[0].clone();
-        let file2 = entries[1].clone();
-        let file3 = entries[2].clone();
-
-        // Open the first entry
-        let entry_1 = window
-            .update(cx, |w, window, cx| {
-                w.open_path(file1.clone(), None, true, window, cx)
-            })
-            .unwrap()
-            .await
-            .unwrap();
-        cx.read(|cx| {
-            let pane = workspace.read(cx).active_pane().read(cx);
-            assert_eq!(
-                pane.active_item().unwrap().project_path(cx),
-                Some(file1.clone())
-            );
-            assert_eq!(pane.items_len(), 1);
-        });
-
-        // Open the second entry
-        window
-            .update(cx, |w, window, cx| {
-                w.open_path(file2.clone(), None, true, window, cx)
-            })
-            .unwrap()
-            .await
-            .unwrap();
-        cx.read(|cx| {
-            let pane = workspace.read(cx).active_pane().read(cx);
-            assert_eq!(
-                pane.active_item().unwrap().project_path(cx),
-                Some(file2.clone())
-            );
-            assert_eq!(pane.items_len(), 2);
-        });
-
-        // Open the first entry again. The existing pane item is activated.
-        let entry_1b = window
-            .update(cx, |w, window, cx| {
-                w.open_path(file1.clone(), None, true, window, cx)
-            })
-            .unwrap()
-            .await
-            .unwrap();
-        assert_eq!(entry_1.item_id(), entry_1b.item_id());
-
-        cx.read(|cx| {
-            let pane = workspace.read(cx).active_pane().read(cx);
-            assert_eq!(
-                pane.active_item().unwrap().project_path(cx),
-                Some(file1.clone())
-            );
-            assert_eq!(pane.items_len(), 2);
-        });
-
-        // Split the pane with the first entry, then open the second entry again.
-        window
-            .update(cx, |w, window, cx| {
-                w.split_and_clone(w.active_pane().clone(), SplitDirection::Right, window, cx)
-            })
-            .unwrap()
-            .await
-            .unwrap();
-        window
-            .update(cx, |w, window, cx| {
-                w.open_path(file2.clone(), None, true, window, cx)
-            })
-            .unwrap()
-            .await
-            .unwrap();
-
-        window
-            .read_with(cx, |w, cx| {
-                assert_eq!(
-                    w.active_pane()
-                        .read(cx)
-                        .active_item()
-                        .unwrap()
-                        .project_path(cx),
-                    Some(file2.clone())
-                );
-            })
-            .unwrap();
-
-        // Open the third entry twice concurrently. Only one pane item is added.
-        let (t1, t2) = window
-            .update(cx, |w, window, cx| {
-                (
-                    w.open_path(file3.clone(), None, true, window, cx),
-                    w.open_path(file3.clone(), None, true, window, cx),
-                )
-            })
-            .unwrap();
-        t1.await.unwrap();
-        t2.await.unwrap();
-        cx.read(|cx| {
-            let pane = workspace.read(cx).active_pane().read(cx);
-            assert_eq!(
-                pane.active_item().unwrap().project_path(cx),
-                Some(file3.clone())
-            );
-            let pane_entries = pane
-                .items()
-                .map(|i| i.project_path(cx).unwrap())
-                .collect::<Vec<_>>();
-            assert_eq!(pane_entries, &[file1, file2, file3]);
-        });
-    }
-
-    #[gpui::test]
-    async fn test_open_paths(cx: &mut TestAppContext) {
-        let app_state = init_test(cx);
-
-        app_state
-            .fs
-            .as_fake()
-            .insert_tree(
-                path!("/"),
-                json!({
-                    "dir1": {
-                        "a.txt": ""
-                    },
-                    "dir2": {
-                        "b.txt": ""
-                    },
-                    "dir3": {
-                        "c.txt": ""
-                    },
-                    "d.txt": ""
-                }),
-            )
-            .await;
-
-        cx.update(|cx| {
-            open_paths(
-                &[PathBuf::from(path!("/dir1/"))],
-                app_state,
-                workspace::OpenOptions::default(),
-                cx,
-            )
-        })
-        .await
-        .unwrap();
-        cx.run_until_parked();
-        assert_eq!(cx.update(|cx| cx.windows().len()), 1);
-        let window = cx.update(|cx| cx.windows()[0].downcast::<Workspace>().unwrap());
-        let workspace = window.root(cx).unwrap();
-
-        #[track_caller]
-        fn assert_project_panel_selection(
-            workspace: &Workspace,
-            expected_worktree_path: &Path,
-            expected_entry_path: &RelPath,
-            cx: &App,
-        ) {
-            let project_panel = [
-                workspace.left_dock().read(cx).panel::<ProjectPanel>(),
-                workspace.right_dock().read(cx).panel::<ProjectPanel>(),
-                workspace.bottom_dock().read(cx).panel::<ProjectPanel>(),
-            ]
-            .into_iter()
-            .find_map(std::convert::identity)
-            .expect("found no project panels")
-            .read(cx);
-            let (selected_worktree, selected_entry) = project_panel
-                .selected_entry(cx)
-                .expect("project panel should have a selected entry");
-            assert_eq!(
-                selected_worktree.abs_path().as_ref(),
-                expected_worktree_path,
-                "Unexpected project panel selected worktree path"
-            );
-            assert_eq!(
-                selected_entry.path.as_ref(),
-                expected_entry_path,
-                "Unexpected project panel selected entry path"
-            );
-        }
-
-        // Open a file within an existing worktree.
-        window
-            .update(cx, |workspace, window, cx| {
-                workspace.open_paths(
-                    vec![path!("/dir1/a.txt").into()],
-                    OpenOptions {
-                        visible: Some(OpenVisible::All),
-                        ..Default::default()
-                    },
-                    None,
-                    window,
-                    cx,
-                )
-            })
-            .unwrap()
-            .await;
-        cx.run_until_parked();
-        cx.read(|cx| {
-            let workspace = workspace.read(cx);
-            assert_project_panel_selection(
-                workspace,
-                Path::new(path!("/dir1")),
-                rel_path("a.txt"),
-                cx,
-            );
-            assert_eq!(
-                workspace
-                    .active_pane()
-                    .read(cx)
-                    .active_item()
-                    .unwrap()
-                    .act_as::<Editor>(cx)
-                    .unwrap()
-                    .read(cx)
-                    .title(cx),
-                "a.txt"
-            );
-        });
-
-        // Open a file outside of any existing worktree.
-        window
-            .update(cx, |workspace, window, cx| {
-                workspace.open_paths(
-                    vec![path!("/dir2/b.txt").into()],
-                    OpenOptions {
-                        visible: Some(OpenVisible::All),
-                        ..Default::default()
-                    },
-                    None,
-                    window,
-                    cx,
-                )
-            })
-            .unwrap()
-            .await;
-        cx.run_until_parked();
-        cx.read(|cx| {
-            let workspace = workspace.read(cx);
-            assert_project_panel_selection(
-                workspace,
-                Path::new(path!("/dir2/b.txt")),
-                rel_path(""),
-                cx,
-            );
-            let worktree_roots = workspace
-                .worktrees(cx)
-                .map(|w| w.read(cx).as_local().unwrap().abs_path().as_ref())
-                .collect::<HashSet<_>>();
-            assert_eq!(
-                worktree_roots,
-                vec![path!("/dir1"), path!("/dir2/b.txt")]
-                    .into_iter()
-                    .map(Path::new)
-                    .collect(),
-            );
-            assert_eq!(
-                workspace
-                    .active_pane()
-                    .read(cx)
-                    .active_item()
-                    .unwrap()
-                    .act_as::<Editor>(cx)
-                    .unwrap()
-                    .read(cx)
-                    .title(cx),
-                "b.txt"
-            );
-        });
-
-        // Ensure opening a directory and one of its children only adds one worktree.
-        window
-            .update(cx, |workspace, window, cx| {
-                workspace.open_paths(
-                    vec![path!("/dir3").into(), path!("/dir3/c.txt").into()],
-                    OpenOptions {
-                        visible: Some(OpenVisible::All),
-                        ..Default::default()
-                    },
-                    None,
-                    window,
-                    cx,
-                )
-            })
-            .unwrap()
-            .await;
-        cx.run_until_parked();
-        cx.read(|cx| {
-            let workspace = workspace.read(cx);
-            assert_project_panel_selection(
-                workspace,
-                Path::new(path!("/dir3")),
-                rel_path("c.txt"),
-                cx,
-            );
-            let worktree_roots = workspace
-                .worktrees(cx)
-                .map(|w| w.read(cx).as_local().unwrap().abs_path().as_ref())
-                .collect::<HashSet<_>>();
-            assert_eq!(
-                worktree_roots,
-                vec![path!("/dir1"), path!("/dir2/b.txt"), path!("/dir3")]
-                    .into_iter()
-                    .map(Path::new)
-                    .collect(),
-            );
-            assert_eq!(
-                workspace
-                    .active_pane()
-                    .read(cx)
-                    .active_item()
-                    .unwrap()
-                    .act_as::<Editor>(cx)
-                    .unwrap()
-                    .read(cx)
-                    .title(cx),
-                "c.txt"
-            );
-        });
-
-        // Ensure opening invisibly a file outside an existing worktree adds a new, invisible worktree.
-        window
-            .update(cx, |workspace, window, cx| {
-                workspace.open_paths(
-                    vec![path!("/d.txt").into()],
-                    OpenOptions {
-                        visible: Some(OpenVisible::None),
-                        ..Default::default()
-                    },
-                    None,
-                    window,
-                    cx,
-                )
-            })
-            .unwrap()
-            .await;
-        cx.run_until_parked();
-        cx.read(|cx| {
-            let workspace = workspace.read(cx);
-            assert_project_panel_selection(workspace, Path::new(path!("/d.txt")), rel_path(""), cx);
-            let worktree_roots = workspace
-                .worktrees(cx)
-                .map(|w| w.read(cx).as_local().unwrap().abs_path().as_ref())
-                .collect::<HashSet<_>>();
-            assert_eq!(
-                worktree_roots,
-                vec![
-                    path!("/dir1"),
-                    path!("/dir2/b.txt"),
-                    path!("/dir3"),
-                    path!("/d.txt")
-                ]
-                .into_iter()
-                .map(Path::new)
-                .collect(),
-            );
-
-            let visible_worktree_roots = workspace
-                .visible_worktrees(cx)
-                .map(|w| w.read(cx).as_local().unwrap().abs_path().as_ref())
-                .collect::<HashSet<_>>();
-            assert_eq!(
-                visible_worktree_roots,
-                vec![path!("/dir1"), path!("/dir2/b.txt"), path!("/dir3")]
-                    .into_iter()
-                    .map(Path::new)
-                    .collect(),
-            );
-
-            assert_eq!(
-                workspace
-                    .active_pane()
-                    .read(cx)
-                    .active_item()
-                    .unwrap()
-                    .act_as::<Editor>(cx)
-                    .unwrap()
-                    .read(cx)
-                    .title(cx),
-                "d.txt"
-            );
-        });
-    }
-
-    #[gpui::test]
-    async fn test_opening_excluded_paths(cx: &mut TestAppContext) {
-        let app_state = init_test(cx);
-        cx.update(|cx| {
-            cx.update_global::<SettingsStore, _>(|store, cx| {
-                store.update_user_settings(cx, |project_settings| {
-                    project_settings.project.worktree.file_scan_exclusions =
-                        Some(vec!["excluded_dir".to_string(), "**/.git".to_string()]);
-                });
-            });
-        });
-        app_state
-            .fs
-            .as_fake()
-            .insert_tree(
-                path!("/root"),
-                json!({
-                    ".gitignore": "ignored_dir\n",
-                    ".git": {
-                        "HEAD": "ref: refs/heads/main",
-                    },
-                    "regular_dir": {
-                        "file": "regular file contents",
-                    },
-                    "ignored_dir": {
-                        "ignored_subdir": {
-                            "file": "ignored subfile contents",
-                        },
-                        "file": "ignored file contents",
-                    },
-                    "excluded_dir": {
-                        "file": "excluded file contents",
-                        "ignored_subdir": {
-                            "file": "ignored subfile contents",
-                        },
-                    },
-                }),
-            )
-            .await;
-
-        let project = Project::test(app_state.fs.clone(), [path!("/root").as_ref()], cx).await;
-        project.update(cx, |project, _cx| project.languages().add(markdown_lang()));
-        let window = cx.add_window(|window, cx| Workspace::test_new(project, window, cx));
-        let workspace = window.root(cx).unwrap();
-
-        let initial_entries = cx.read(|cx| workspace.file_project_paths(cx));
-        let paths_to_open = [
-            PathBuf::from(path!("/root/excluded_dir/file")),
-            PathBuf::from(path!("/root/.git/HEAD")),
-            PathBuf::from(path!("/root/excluded_dir/ignored_subdir")),
-        ];
-        let (opened_workspace, new_items) = cx
-            .update(|cx| {
-                workspace::open_paths(
-                    &paths_to_open,
-                    app_state,
-                    workspace::OpenOptions::default(),
-                    cx,
-                )
-            })
-            .await
-            .unwrap();
-
-        assert_eq!(
-            opened_workspace.root(cx).unwrap().entity_id(),
-            workspace.entity_id(),
-            "Excluded files in subfolders of a workspace root should be opened in the workspace"
-        );
-        let mut opened_paths = cx.read(|cx| {
-            assert_eq!(
-                new_items.len(),
-                paths_to_open.len(),
-                "Expect to get the same number of opened items as submitted paths to open"
-            );
-            new_items
-                .iter()
-                .zip(paths_to_open.iter())
-                .map(|(i, path)| {
-                    match i {
-                        Some(Ok(i)) => Some(i.project_path(cx).map(|p| p.path)),
-                        Some(Err(e)) => panic!("Excluded file {path:?} failed to open: {e:?}"),
-                        None => None,
-                    }
-                    .flatten()
-                })
-                .collect::<Vec<_>>()
-        });
-        opened_paths.sort();
-        assert_eq!(
-            opened_paths,
-            vec![
-                None,
-                Some(rel_path(".git/HEAD").into()),
-                Some(rel_path("excluded_dir/file").into()),
-            ],
-            "Excluded files should get opened, excluded dir should not get opened"
-        );
-
-        let entries = cx.read(|cx| workspace.file_project_paths(cx));
-        assert_eq!(
-            initial_entries, entries,
-            "Workspace entries should not change after opening excluded files and directories paths"
-        );
-
-        cx.read(|cx| {
-                let pane = workspace.read(cx).active_pane().read(cx);
-                let mut opened_buffer_paths = pane
-                    .items()
-                    .map(|i| {
-                        i.project_path(cx)
-                            .expect("all excluded files that got open should have a path")
-                            .path
-                    })
-                    .collect::<Vec<_>>();
-                opened_buffer_paths.sort();
-                assert_eq!(
-                    opened_buffer_paths,
-                    vec![rel_path(".git/HEAD").into(), rel_path("excluded_dir/file").into()],
-                    "Despite not being present in the worktrees, buffers for excluded files are opened and added to the pane"
-                );
-            });
-    }
-
-    #[gpui::test]
-    async fn test_save_conflicting_item(cx: &mut TestAppContext) {
-        let app_state = init_test(cx);
-        app_state
-            .fs
-            .as_fake()
-            .insert_tree(path!("/root"), json!({ "a.txt": "" }))
-            .await;
-
-        let project = Project::test(app_state.fs.clone(), [path!("/root").as_ref()], cx).await;
-        project.update(cx, |project, _cx| project.languages().add(markdown_lang()));
-        let window = cx.add_window(|window, cx| Workspace::test_new(project, window, cx));
-        let workspace = window.root(cx).unwrap();
-
-        // Open a file within an existing worktree.
-        window
-            .update(cx, |workspace, window, cx| {
-                workspace.open_paths(
-                    vec![PathBuf::from(path!("/root/a.txt"))],
-                    OpenOptions {
-                        visible: Some(OpenVisible::All),
-                        ..Default::default()
-                    },
-                    None,
-                    window,
-                    cx,
-                )
-            })
-            .unwrap()
-            .await;
-        let editor = cx.read(|cx| {
-            let pane = workspace.read(cx).active_pane().read(cx);
-            let item = pane.active_item().unwrap();
-            item.downcast::<Editor>().unwrap()
-        });
-
-        window
-            .update(cx, |_, window, cx| {
-                editor.update(cx, |editor, cx| editor.handle_input("x", window, cx));
-            })
-            .unwrap();
-
-        app_state
-            .fs
-            .as_fake()
-            .insert_file(path!("/root/a.txt"), b"changed".to_vec())
-            .await;
-
-        cx.run_until_parked();
-        cx.read(|cx| assert!(editor.is_dirty(cx)));
-        cx.read(|cx| assert!(editor.has_conflict(cx)));
-
-        let save_task = window
-            .update(cx, |workspace, window, cx| {
-                workspace.save_active_item(SaveIntent::Save, window, cx)
-            })
-            .unwrap();
-        cx.background_executor.run_until_parked();
-        cx.simulate_prompt_answer("Overwrite");
-        save_task.await.unwrap();
-        window
-            .update(cx, |_, _, cx| {
-                editor.update(cx, |editor, cx| {
-                    assert!(!editor.is_dirty(cx));
-                    assert!(!editor.has_conflict(cx));
-                });
-            })
-            .unwrap();
-    }
-
-    #[gpui::test]
-    async fn test_open_and_save_new_file(cx: &mut TestAppContext) {
-        let app_state = init_test(cx);
-        app_state
-            .fs
-            .create_dir(Path::new(path!("/root")))
-            .await
-            .unwrap();
-
-        let project = Project::test(app_state.fs.clone(), [path!("/root").as_ref()], cx).await;
-        project.update(cx, |project, _| {
-            project.languages().add(markdown_lang());
-            project.languages().add(rust_lang());
-        });
-        let window = cx.add_window(|window, cx| Workspace::test_new(project, window, cx));
-        let worktree = cx.update(|cx| window.read(cx).unwrap().worktrees(cx).next().unwrap());
-
-        // Create a new untitled buffer
-        cx.dispatch_action(window.into(), NewFile);
-        let editor = window
-            .read_with(cx, |workspace, cx| {
-                workspace
-                    .active_item(cx)
-                    .unwrap()
-                    .downcast::<Editor>()
-                    .unwrap()
-            })
-            .unwrap();
-
-        window
-            .update(cx, |_, window, cx| {
-                editor.update(cx, |editor, cx| {
-                    assert!(!editor.is_dirty(cx));
-                    assert_eq!(editor.title(cx), "untitled");
-                    assert!(Arc::ptr_eq(
-                        &editor
-                            .buffer()
-                            .read(cx)
-                            .language_at(MultiBufferOffset(0), cx)
-                            .unwrap(),
-                        &languages::PLAIN_TEXT
-                    ));
-                    editor.handle_input("hi", window, cx);
-                    assert!(editor.is_dirty(cx));
-                });
-            })
-            .unwrap();
-
-        // Save the buffer. This prompts for a filename.
-        let save_task = window
-            .update(cx, |workspace, window, cx| {
-                workspace.save_active_item(SaveIntent::Save, window, cx)
-            })
-            .unwrap();
-        cx.background_executor.run_until_parked();
-        cx.simulate_new_path_selection(|parent_dir| {
-            assert_eq!(parent_dir, Path::new(path!("/root")));
-            Some(parent_dir.join("the-new-name.rs"))
-        });
-        cx.read(|cx| {
-            assert!(editor.is_dirty(cx));
-            assert_eq!(editor.read(cx).title(cx), "hi");
-        });
-
-        // When the save completes, the buffer's title is updated and the language is assigned based
-        // on the path.
-        save_task.await.unwrap();
-        window
-            .update(cx, |_, _, cx| {
-                editor.update(cx, |editor, cx| {
-                    assert!(!editor.is_dirty(cx));
-                    assert_eq!(editor.title(cx), "the-new-name.rs");
-                    assert_eq!(
-                        editor
-                            .buffer()
-                            .read(cx)
-                            .language_at(MultiBufferOffset(0), cx)
-                            .unwrap()
-                            .name(),
-                        "Rust".into()
-                    );
-                });
-            })
-            .unwrap();
-
-        // Edit the file and save it again. This time, there is no filename prompt.
-        window
-            .update(cx, |_, window, cx| {
-                editor.update(cx, |editor, cx| {
-                    editor.handle_input(" there", window, cx);
-                    assert!(editor.is_dirty(cx));
-                });
-            })
-            .unwrap();
-
-        let save_task = window
-            .update(cx, |workspace, window, cx| {
-                workspace.save_active_item(SaveIntent::Save, window, cx)
-            })
-            .unwrap();
-        save_task.await.unwrap();
-
-        assert!(!cx.did_prompt_for_new_path());
-        window
-            .update(cx, |_, _, cx| {
-                editor.update(cx, |editor, cx| {
-                    assert!(!editor.is_dirty(cx));
-                    assert_eq!(editor.title(cx), "the-new-name.rs")
-                });
-            })
-            .unwrap();
-
-        // Open the same newly-created file in another pane item. The new editor should reuse
-        // the same buffer.
-        cx.dispatch_action(window.into(), NewFile);
-        window
-            .update(cx, |workspace, window, cx| {
-                workspace.split_and_clone(
-                    workspace.active_pane().clone(),
-                    SplitDirection::Right,
-                    window,
-                    cx,
-                )
-            })
-            .unwrap()
-            .await
-            .unwrap();
-        window
-            .update(cx, |workspace, window, cx| {
-                workspace.open_path(
-                    (worktree.read(cx).id(), rel_path("the-new-name.rs")),
-                    None,
-                    true,
-                    window,
-                    cx,
-                )
-            })
-            .unwrap()
-            .await
-            .unwrap();
-        let editor2 = window
-            .update(cx, |workspace, _, cx| {
-                workspace
-                    .active_item(cx)
-                    .unwrap()
-                    .downcast::<Editor>()
-                    .unwrap()
-            })
-            .unwrap();
-        cx.read(|cx| {
-            assert_eq!(
-                editor2.read(cx).buffer().read(cx).as_singleton().unwrap(),
-                editor.read(cx).buffer().read(cx).as_singleton().unwrap()
-            );
-        })
-    }
-
-    #[gpui::test]
-    async fn test_setting_language_when_saving_as_single_file_worktree(cx: &mut TestAppContext) {
-        let app_state = init_test(cx);
-        app_state.fs.create_dir(Path::new("/root")).await.unwrap();
-
-        let project = Project::test(app_state.fs.clone(), [], cx).await;
-        project.update(cx, |project, _| {
-            project.languages().add(language::rust_lang());
-            project.languages().add(language::markdown_lang());
-        });
-        let window = cx.add_window(|window, cx| Workspace::test_new(project, window, cx));
-
-        // Create a new untitled buffer
-        cx.dispatch_action(window.into(), NewFile);
-        let editor = window
-            .read_with(cx, |workspace, cx| {
-                workspace
-                    .active_item(cx)
-                    .unwrap()
-                    .downcast::<Editor>()
-                    .unwrap()
-            })
-            .unwrap();
-        window
-            .update(cx, |_, window, cx| {
-                editor.update(cx, |editor, cx| {
-                    assert!(Arc::ptr_eq(
-                        &editor
-                            .buffer()
-                            .read(cx)
-                            .language_at(MultiBufferOffset(0), cx)
-                            .unwrap(),
-                        &languages::PLAIN_TEXT
-                    ));
-                    editor.handle_input("hi", window, cx);
-                    assert!(editor.is_dirty(cx));
-                });
-            })
-            .unwrap();
-
-        // Save the buffer. This prompts for a filename.
-        let save_task = window
-            .update(cx, |workspace, window, cx| {
-                workspace.save_active_item(SaveIntent::Save, window, cx)
-            })
-            .unwrap();
-        cx.background_executor.run_until_parked();
-        cx.simulate_new_path_selection(|_| Some(PathBuf::from("/root/the-new-name.rs")));
-        save_task.await.unwrap();
-        // The buffer is not dirty anymore and the language is assigned based on the path.
-        window
-            .update(cx, |_, _, cx| {
-                editor.update(cx, |editor, cx| {
-                    assert!(!editor.is_dirty(cx));
-                    assert_eq!(
-                        editor
-                            .buffer()
-                            .read(cx)
-                            .language_at(MultiBufferOffset(0), cx)
-                            .unwrap()
-                            .name(),
-                        "Rust".into()
-                    )
-                });
-            })
-            .unwrap();
-    }
-
-    #[gpui::test]
-    async fn test_pane_actions(cx: &mut TestAppContext) {
-        let app_state = init_test(cx);
-        app_state
-            .fs
-            .as_fake()
-            .insert_tree(
-                path!("/root"),
-                json!({
-                    "a": {
-                        "file1": "contents 1",
-                        "file2": "contents 2",
-                        "file3": "contents 3",
-                    },
-                }),
-            )
-            .await;
-
-        let project = Project::test(app_state.fs.clone(), [path!("/root").as_ref()], cx).await;
-        project.update(cx, |project, _cx| project.languages().add(markdown_lang()));
-        let window = cx.add_window(|window, cx| Workspace::test_new(project, window, cx));
-        let workspace = window.root(cx).unwrap();
-
-        let entries = cx.read(|cx| workspace.file_project_paths(cx));
-        let file1 = entries[0].clone();
-
-        let pane_1 = cx.read(|cx| workspace.read(cx).active_pane().clone());
-
-        window
-            .update(cx, |w, window, cx| {
-                w.open_path(file1.clone(), None, true, window, cx)
-            })
-            .unwrap()
-            .await
-            .unwrap();
-
-        let (editor_1, buffer) = window
-            .update(cx, |_, window, cx| {
-                pane_1.update(cx, |pane_1, cx| {
-                    let editor = pane_1.active_item().unwrap().downcast::<Editor>().unwrap();
-                    assert_eq!(editor.project_path(cx), Some(file1.clone()));
-                    let buffer = editor.update(cx, |editor, cx| {
-                        editor.insert("dirt", window, cx);
-                        editor.buffer().downgrade()
-                    });
-                    (editor.downgrade(), buffer)
-                })
-            })
-            .unwrap();
-
-        cx.dispatch_action(window.into(), pane::SplitRight);
-        let editor_2 = cx.update(|cx| {
-            let pane_2 = workspace.read(cx).active_pane().clone();
-            assert_ne!(pane_1, pane_2);
-
-            let pane2_item = pane_2.read(cx).active_item().unwrap();
-            assert_eq!(pane2_item.project_path(cx), Some(file1.clone()));
-
-            pane2_item.downcast::<Editor>().unwrap().downgrade()
-        });
-        cx.dispatch_action(
-            window.into(),
-            workspace::CloseActiveItem {
-                save_intent: None,
-                close_pinned: false,
-            },
-        );
-
-        cx.background_executor.run_until_parked();
-        window
-            .read_with(cx, |workspace, _| {
-                assert_eq!(workspace.panes().len(), 1);
-                assert_eq!(workspace.active_pane(), &pane_1);
-            })
-            .unwrap();
-
-        cx.dispatch_action(
-            window.into(),
-            workspace::CloseActiveItem {
-                save_intent: None,
-                close_pinned: false,
-            },
-        );
-        cx.background_executor.run_until_parked();
-        cx.simulate_prompt_answer("Don't Save");
-        cx.background_executor.run_until_parked();
-
-        window
-            .update(cx, |workspace, _, cx| {
-                assert_eq!(workspace.panes().len(), 1);
-                assert!(workspace.active_item(cx).is_none());
-            })
-            .unwrap();
-
-        cx.background_executor
-            .advance_clock(SERIALIZATION_THROTTLE_TIME);
-        cx.update(|_| {});
-        editor_1.assert_released();
-        editor_2.assert_released();
-        buffer.assert_released();
-    }
-
-    #[gpui::test]
-    async fn test_navigation(cx: &mut TestAppContext) {
-        let app_state = init_test(cx);
-        app_state
-            .fs
-            .as_fake()
-            .insert_tree(
-                path!("/root"),
-                json!({
-                    "a": {
-                        "file1": "contents 1\n".repeat(20),
-                        "file2": "contents 2\n".repeat(20),
-                        "file3": "contents 3\n".repeat(20),
-                    },
-                }),
-            )
-            .await;
-
-        let project = Project::test(app_state.fs.clone(), [path!("/root").as_ref()], cx).await;
-        project.update(cx, |project, _cx| project.languages().add(markdown_lang()));
-        let workspace =
-            cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let pane = workspace
-            .read_with(cx, |workspace, _| workspace.active_pane().clone())
-            .unwrap();
-
-        let entries = cx.update(|cx| workspace.root(cx).unwrap().file_project_paths(cx));
-        let file1 = entries[0].clone();
-        let file2 = entries[1].clone();
-        let file3 = entries[2].clone();
-
-        let editor1 = workspace
-            .update(cx, |w, window, cx| {
-                w.open_path(file1.clone(), None, true, window, cx)
-            })
-            .unwrap()
-            .await
-            .unwrap()
-            .downcast::<Editor>()
-            .unwrap();
-        workspace
-            .update(cx, |_, window, cx| {
-                editor1.update(cx, |editor, cx| {
-                    editor.change_selections(Default::default(), window, cx, |s| {
-                        s.select_display_ranges([DisplayPoint::new(DisplayRow(10), 0)
-                            ..DisplayPoint::new(DisplayRow(10), 0)])
-                    });
-                });
-            })
-            .unwrap();
-
-        let editor2 = workspace
-            .update(cx, |w, window, cx| {
-                w.open_path(file2.clone(), None, true, window, cx)
-            })
-            .unwrap()
-            .await
-            .unwrap()
-            .downcast::<Editor>()
-            .unwrap();
-        let editor3 = workspace
-            .update(cx, |w, window, cx| {
-                w.open_path(file3.clone(), None, true, window, cx)
-            })
-            .unwrap()
-            .await
-            .unwrap()
-            .downcast::<Editor>()
-            .unwrap();
-
-        workspace
-            .update(cx, |_, window, cx| {
-                editor3.update(cx, |editor, cx| {
-                    editor.change_selections(Default::default(), window, cx, |s| {
-                        s.select_display_ranges([DisplayPoint::new(DisplayRow(12), 0)
-                            ..DisplayPoint::new(DisplayRow(12), 0)])
-                    });
-                    editor.newline(&Default::default(), window, cx);
-                    editor.newline(&Default::default(), window, cx);
-                    editor.move_down(&Default::default(), window, cx);
-                    editor.move_down(&Default::default(), window, cx);
-                    editor.save(
-                        SaveOptions {
-                            format: true,
-                            autosave: false,
-                        },
-                        project.clone(),
-                        window,
-                        cx,
-                    )
-                })
-            })
-            .unwrap()
-            .await
-            .unwrap();
-        workspace
-            .update(cx, |_, window, cx| {
-                editor3.update(cx, |editor, cx| {
-                    editor.set_scroll_position(point(0., 12.5), window, cx)
-                });
-            })
-            .unwrap();
-        assert_eq!(
-            active_location(&workspace, cx),
-            (file3.clone(), DisplayPoint::new(DisplayRow(16), 0), 12.5)
-        );
-
-        workspace
-            .update(cx, |w, window, cx| {
-                w.go_back(w.active_pane().downgrade(), window, cx)
-            })
-            .unwrap()
-            .await
-            .unwrap();
-        assert_eq!(
-            active_location(&workspace, cx),
-            (file3.clone(), DisplayPoint::new(DisplayRow(0), 0), 0.)
-        );
-
-        workspace
-            .update(cx, |w, window, cx| {
-                w.go_back(w.active_pane().downgrade(), window, cx)
-            })
-            .unwrap()
-            .await
-            .unwrap();
-        assert_eq!(
-            active_location(&workspace, cx),
-            (file2.clone(), DisplayPoint::new(DisplayRow(0), 0), 0.)
-        );
-
-        workspace
-            .update(cx, |w, window, cx| {
-                w.go_back(w.active_pane().downgrade(), window, cx)
-            })
-            .unwrap()
-            .await
-            .unwrap();
-        assert_eq!(
-            active_location(&workspace, cx),
-            (file1.clone(), DisplayPoint::new(DisplayRow(10), 0), 0.)
-        );
-
-        workspace
-            .update(cx, |w, window, cx| {
-                w.go_back(w.active_pane().downgrade(), window, cx)
-            })
-            .unwrap()
-            .await
-            .unwrap();
-        assert_eq!(
-            active_location(&workspace, cx),
-            (file1.clone(), DisplayPoint::new(DisplayRow(0), 0), 0.)
-        );
-
-        // Go back one more time and ensure we don't navigate past the first item in the history.
-        workspace
-            .update(cx, |w, window, cx| {
-                w.go_back(w.active_pane().downgrade(), window, cx)
-            })
-            .unwrap()
-            .await
-            .unwrap();
-        assert_eq!(
-            active_location(&workspace, cx),
-            (file1.clone(), DisplayPoint::new(DisplayRow(0), 0), 0.)
-        );
-
-        workspace
-            .update(cx, |w, window, cx| {
-                w.go_forward(w.active_pane().downgrade(), window, cx)
-            })
-            .unwrap()
-            .await
-            .unwrap();
-        assert_eq!(
-            active_location(&workspace, cx),
-            (file1.clone(), DisplayPoint::new(DisplayRow(10), 0), 0.)
-        );
-
-        workspace
-            .update(cx, |w, window, cx| {
-                w.go_forward(w.active_pane().downgrade(), window, cx)
-            })
-            .unwrap()
-            .await
-            .unwrap();
-        assert_eq!(
-            active_location(&workspace, cx),
-            (file2.clone(), DisplayPoint::new(DisplayRow(0), 0), 0.)
-        );
-
-        // Go forward to an item that has been closed, ensuring it gets re-opened at the same
-        // location.
-        workspace
-            .update(cx, |_, window, cx| {
-                pane.update(cx, |pane, cx| {
-                    let editor3_id = editor3.entity_id();
-                    drop(editor3);
-                    pane.close_item_by_id(editor3_id, SaveIntent::Close, window, cx)
-                })
-            })
-            .unwrap()
-            .await
-            .unwrap();
-        workspace
-            .update(cx, |w, window, cx| {
-                w.go_forward(w.active_pane().downgrade(), window, cx)
-            })
-            .unwrap()
-            .await
-            .unwrap();
-        assert_eq!(
-            active_location(&workspace, cx),
-            (file3.clone(), DisplayPoint::new(DisplayRow(0), 0), 0.)
-        );
-
-        workspace
-            .update(cx, |w, window, cx| {
-                w.go_forward(w.active_pane().downgrade(), window, cx)
-            })
-            .unwrap()
-            .await
-            .unwrap();
-        assert_eq!(
-            active_location(&workspace, cx),
-            (file3.clone(), DisplayPoint::new(DisplayRow(16), 0), 12.5)
-        );
-
-        workspace
-            .update(cx, |w, window, cx| {
-                w.go_back(w.active_pane().downgrade(), window, cx)
-            })
-            .unwrap()
-            .await
-            .unwrap();
-        assert_eq!(
-            active_location(&workspace, cx),
-            (file3.clone(), DisplayPoint::new(DisplayRow(0), 0), 0.)
-        );
-
-        // Go back to an item that has been closed and removed from disk
-        workspace
-            .update(cx, |_, window, cx| {
-                pane.update(cx, |pane, cx| {
-                    let editor2_id = editor2.entity_id();
-                    drop(editor2);
-                    pane.close_item_by_id(editor2_id, SaveIntent::Close, window, cx)
-                })
-            })
-            .unwrap()
-            .await
-            .unwrap();
-        app_state
-            .fs
-            .remove_file(Path::new(path!("/root/a/file2")), Default::default())
-            .await
-            .unwrap();
-        cx.background_executor.run_until_parked();
-
-        workspace
-            .update(cx, |w, window, cx| {
-                w.go_back(w.active_pane().downgrade(), window, cx)
-            })
-            .unwrap()
-            .await
-            .unwrap();
-        assert_eq!(
-            active_location(&workspace, cx),
-            (file2.clone(), DisplayPoint::new(DisplayRow(0), 0), 0.)
-        );
-        workspace
-            .update(cx, |w, window, cx| {
-                w.go_forward(w.active_pane().downgrade(), window, cx)
-            })
-            .unwrap()
-            .await
-            .unwrap();
-        assert_eq!(
-            active_location(&workspace, cx),
-            (file3.clone(), DisplayPoint::new(DisplayRow(0), 0), 0.)
-        );
-
-        // Modify file to collapse multiple nav history entries into the same location.
-        // Ensure we don't visit the same location twice when navigating.
-        workspace
-            .update(cx, |_, window, cx| {
-                editor1.update(cx, |editor, cx| {
-                    editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                        s.select_display_ranges([DisplayPoint::new(DisplayRow(15), 0)
-                            ..DisplayPoint::new(DisplayRow(15), 0)])
-                    })
-                });
-            })
-            .unwrap();
-        for _ in 0..5 {
-            workspace
-                .update(cx, |_, window, cx| {
-                    editor1.update(cx, |editor, cx| {
-                        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                            s.select_display_ranges([DisplayPoint::new(DisplayRow(3), 0)
-                                ..DisplayPoint::new(DisplayRow(3), 0)])
-                        });
-                    });
-                })
-                .unwrap();
-
-            workspace
-                .update(cx, |_, window, cx| {
-                    editor1.update(cx, |editor, cx| {
-                        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                            s.select_display_ranges([DisplayPoint::new(DisplayRow(13), 0)
-                                ..DisplayPoint::new(DisplayRow(13), 0)])
-                        })
-                    });
-                })
-                .unwrap();
-        }
-        workspace
-            .update(cx, |_, window, cx| {
-                editor1.update(cx, |editor, cx| {
-                    editor.transact(window, cx, |editor, window, cx| {
-                        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                            s.select_display_ranges([DisplayPoint::new(DisplayRow(2), 0)
-                                ..DisplayPoint::new(DisplayRow(14), 0)])
-                        });
-                        editor.insert("", window, cx);
-                    })
-                });
-            })
-            .unwrap();
-
-        workspace
-            .update(cx, |_, window, cx| {
-                editor1.update(cx, |editor, cx| {
-                    editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                        s.select_display_ranges([DisplayPoint::new(DisplayRow(1), 0)
-                            ..DisplayPoint::new(DisplayRow(1), 0)])
-                    })
-                });
-            })
-            .unwrap();
-        workspace
-            .update(cx, |w, window, cx| {
-                w.go_back(w.active_pane().downgrade(), window, cx)
-            })
-            .unwrap()
-            .await
-            .unwrap();
-        assert_eq!(
-            active_location(&workspace, cx),
-            (file1.clone(), DisplayPoint::new(DisplayRow(2), 0), 0.)
-        );
-        workspace
-            .update(cx, |w, window, cx| {
-                w.go_back(w.active_pane().downgrade(), window, cx)
-            })
-            .unwrap()
-            .await
-            .unwrap();
-        assert_eq!(
-            active_location(&workspace, cx),
-            (file1.clone(), DisplayPoint::new(DisplayRow(3), 0), 0.)
-        );
-
-        fn active_location(
-            workspace: &WindowHandle<Workspace>,
-            cx: &mut TestAppContext,
-        ) -> (ProjectPath, DisplayPoint, f64) {
-            workspace
-                .update(cx, |workspace, _, cx| {
-                    let item = workspace.active_item(cx).unwrap();
-                    let editor = item.downcast::<Editor>().unwrap();
-                    let (selections, scroll_position) = editor.update(cx, |editor, cx| {
-                        (
-                            editor
-                                .selections
-                                .display_ranges(&editor.display_snapshot(cx)),
-                            editor.scroll_position(cx),
-                        )
-                    });
-                    (
-                        item.project_path(cx).unwrap(),
-                        selections[0].start,
-                        scroll_position.y,
-                    )
-                })
-                .unwrap()
-        }
-    }
-
-    #[gpui::test]
-    async fn test_reopening_closed_items(cx: &mut TestAppContext) {
-        let app_state = init_test(cx);
-        app_state
-            .fs
-            .as_fake()
-            .insert_tree(
-                path!("/root"),
-                json!({
-                    "a": {
-                        "file1": "",
-                        "file2": "",
-                        "file3": "",
-                        "file4": "",
-                    },
-                }),
-            )
-            .await;
-
-        let project = Project::test(app_state.fs.clone(), [path!("/root").as_ref()], cx).await;
-        project.update(cx, |project, _cx| project.languages().add(markdown_lang()));
-        let workspace = cx.add_window(|window, cx| Workspace::test_new(project, window, cx));
-        let pane = workspace
-            .read_with(cx, |workspace, _| workspace.active_pane().clone())
-            .unwrap();
-
-        let entries = cx.update(|cx| workspace.root(cx).unwrap().file_project_paths(cx));
-        let file1 = entries[0].clone();
-        let file2 = entries[1].clone();
-        let file3 = entries[2].clone();
-        let file4 = entries[3].clone();
-
-        let file1_item_id = workspace
-            .update(cx, |w, window, cx| {
-                w.open_path(file1.clone(), None, true, window, cx)
-            })
-            .unwrap()
-            .await
-            .unwrap()
-            .item_id();
-        let file2_item_id = workspace
-            .update(cx, |w, window, cx| {
-                w.open_path(file2.clone(), None, true, window, cx)
-            })
-            .unwrap()
-            .await
-            .unwrap()
-            .item_id();
-        let file3_item_id = workspace
-            .update(cx, |w, window, cx| {
-                w.open_path(file3.clone(), None, true, window, cx)
-            })
-            .unwrap()
-            .await
-            .unwrap()
-            .item_id();
-        let file4_item_id = workspace
-            .update(cx, |w, window, cx| {
-                w.open_path(file4.clone(), None, true, window, cx)
-            })
-            .unwrap()
-            .await
-            .unwrap()
-            .item_id();
-        assert_eq!(active_path(&workspace, cx), Some(file4.clone()));
-
-        // Close all the pane items in some arbitrary order.
-        workspace
-            .update(cx, |_, window, cx| {
-                pane.update(cx, |pane, cx| {
-                    pane.close_item_by_id(file1_item_id, SaveIntent::Close, window, cx)
-                })
-            })
-            .unwrap()
-            .await
-            .unwrap();
-        assert_eq!(active_path(&workspace, cx), Some(file4.clone()));
-
-        workspace
-            .update(cx, |_, window, cx| {
-                pane.update(cx, |pane, cx| {
-                    pane.close_item_by_id(file4_item_id, SaveIntent::Close, window, cx)
-                })
-            })
-            .unwrap()
-            .await
-            .unwrap();
-        assert_eq!(active_path(&workspace, cx), Some(file3.clone()));
-
-        workspace
-            .update(cx, |_, window, cx| {
-                pane.update(cx, |pane, cx| {
-                    pane.close_item_by_id(file2_item_id, SaveIntent::Close, window, cx)
-                })
-            })
-            .unwrap()
-            .await
-            .unwrap();
-        assert_eq!(active_path(&workspace, cx), Some(file3.clone()));
-        workspace
-            .update(cx, |_, window, cx| {
-                pane.update(cx, |pane, cx| {
-                    pane.close_item_by_id(file3_item_id, SaveIntent::Close, window, cx)
-                })
-            })
-            .unwrap()
-            .await
-            .unwrap();
-
-        assert_eq!(active_path(&workspace, cx), None);
-
-        // Reopen all the closed items, ensuring they are reopened in the same order
-        // in which they were closed.
-        workspace
-            .update(cx, Workspace::reopen_closed_item)
-            .unwrap()
-            .await
-            .unwrap();
-        assert_eq!(active_path(&workspace, cx), Some(file3.clone()));
-
-        workspace
-            .update(cx, Workspace::reopen_closed_item)
-            .unwrap()
-            .await
-            .unwrap();
-        assert_eq!(active_path(&workspace, cx), Some(file2.clone()));
-
-        workspace
-            .update(cx, Workspace::reopen_closed_item)
-            .unwrap()
-            .await
-            .unwrap();
-        assert_eq!(active_path(&workspace, cx), Some(file4.clone()));
-
-        workspace
-            .update(cx, Workspace::reopen_closed_item)
-            .unwrap()
-            .await
-            .unwrap();
-        assert_eq!(active_path(&workspace, cx), Some(file1.clone()));
-
-        // Reopening past the last closed item is a no-op.
-        workspace
-            .update(cx, Workspace::reopen_closed_item)
-            .unwrap()
-            .await
-            .unwrap();
-        assert_eq!(active_path(&workspace, cx), Some(file1.clone()));
-
-        // Reopening closed items doesn't interfere with navigation history.
-        workspace
-            .update(cx, |workspace, window, cx| {
-                workspace.go_back(workspace.active_pane().downgrade(), window, cx)
-            })
-            .unwrap()
-            .await
-            .unwrap();
-        assert_eq!(active_path(&workspace, cx), Some(file4.clone()));
-
-        workspace
-            .update(cx, |workspace, window, cx| {
-                workspace.go_back(workspace.active_pane().downgrade(), window, cx)
-            })
-            .unwrap()
-            .await
-            .unwrap();
-        assert_eq!(active_path(&workspace, cx), Some(file2.clone()));
-
-        workspace
-            .update(cx, |workspace, window, cx| {
-                workspace.go_back(workspace.active_pane().downgrade(), window, cx)
-            })
-            .unwrap()
-            .await
-            .unwrap();
-        assert_eq!(active_path(&workspace, cx), Some(file3.clone()));
-
-        workspace
-            .update(cx, |workspace, window, cx| {
-                workspace.go_back(workspace.active_pane().downgrade(), window, cx)
-            })
-            .unwrap()
-            .await
-            .unwrap();
-        assert_eq!(active_path(&workspace, cx), Some(file4.clone()));
-
-        workspace
-            .update(cx, |workspace, window, cx| {
-                workspace.go_back(workspace.active_pane().downgrade(), window, cx)
-            })
-            .unwrap()
-            .await
-            .unwrap();
-        assert_eq!(active_path(&workspace, cx), Some(file3.clone()));
-
-        workspace
-            .update(cx, |workspace, window, cx| {
-                workspace.go_back(workspace.active_pane().downgrade(), window, cx)
-            })
-            .unwrap()
-            .await
-            .unwrap();
-        assert_eq!(active_path(&workspace, cx), Some(file2.clone()));
-
-        workspace
-            .update(cx, |workspace, window, cx| {
-                workspace.go_back(workspace.active_pane().downgrade(), window, cx)
-            })
-            .unwrap()
-            .await
-            .unwrap();
-        assert_eq!(active_path(&workspace, cx), Some(file1.clone()));
-
-        workspace
-            .update(cx, |workspace, window, cx| {
-                workspace.go_back(workspace.active_pane().downgrade(), window, cx)
-            })
-            .unwrap()
-            .await
-            .unwrap();
-        assert_eq!(active_path(&workspace, cx), Some(file1.clone()));
-
-        fn active_path(
-            workspace: &WindowHandle<Workspace>,
-            cx: &TestAppContext,
-        ) -> Option<ProjectPath> {
-            workspace
-                .read_with(cx, |workspace, cx| {
-                    let item = workspace.active_item(cx)?;
-                    item.project_path(cx)
-                })
-                .unwrap()
-        }
-    }
-
-    fn init_keymap_test(cx: &mut TestAppContext) -> Arc<AppState> {
-        cx.update(|cx| {
-            let app_state = AppState::test(cx);
-
-            theme::init(theme::LoadThemes::JustBase, cx);
-            client::init(&app_state.client, cx);
-            workspace::init(app_state.clone(), cx);
-            onboarding::init(cx);
-            app_state
-        })
-    }
-
-    actions!(test_only, [ActionA, ActionB]);
-
-    #[gpui::test]
-    async fn test_base_keymap(cx: &mut gpui::TestAppContext) {
-        let executor = cx.executor();
-        let app_state = init_keymap_test(cx);
-        let project = Project::test(app_state.fs.clone(), [], cx).await;
-        let workspace =
-            cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-        // From the Atom keymap
-        use workspace::ActivatePreviousPane;
-        // From the JetBrains keymap
-        use workspace::ActivatePreviousItem;
-
-        app_state
-            .fs
-            .save(
-                "/settings.json".as_ref(),
-                &r#"{"base_keymap": "Atom"}"#.into(),
-                Default::default(),
-            )
-            .await
-            .unwrap();
-
-        app_state
-            .fs
-            .save(
-                "/keymap.json".as_ref(),
-                &r#"[{"bindings": {"backspace": "test_only::ActionA"}}]"#.into(),
-                Default::default(),
-            )
-            .await
-            .unwrap();
-        executor.run_until_parked();
-        cx.update(|cx| {
-            let settings_rx = watch_config_file(
-                &executor,
-                app_state.fs.clone(),
-                PathBuf::from("/settings.json"),
-            );
-            let keymap_rx = watch_config_file(
-                &executor,
-                app_state.fs.clone(),
-                PathBuf::from("/keymap.json"),
-            );
-            let global_settings_rx = watch_config_file(
-                &executor,
-                app_state.fs.clone(),
-                PathBuf::from("/global_settings.json"),
-            );
-            handle_settings_file_changes(settings_rx, global_settings_rx, cx);
-            handle_keymap_file_changes(keymap_rx, cx);
-        });
-        workspace
-            .update(cx, |workspace, _, cx| {
-                workspace.register_action(|_, _: &ActionA, _window, _cx| {});
-                workspace.register_action(|_, _: &ActionB, _window, _cx| {});
-                workspace.register_action(|_, _: &ActivatePreviousPane, _window, _cx| {});
-                workspace.register_action(|_, _: &ActivatePreviousItem, _window, _cx| {});
-                cx.notify();
-            })
-            .unwrap();
-        executor.run_until_parked();
-        // Test loading the keymap base at all
-        assert_key_bindings_for(
-            workspace.into(),
-            cx,
-            vec![("backspace", &ActionA), ("k", &ActivatePreviousPane)],
-            line!(),
-        );
-
-        // Test modifying the users keymap, while retaining the base keymap
-        app_state
-            .fs
-            .save(
-                "/keymap.json".as_ref(),
-                &r#"[{"bindings": {"backspace": "test_only::ActionB"}}]"#.into(),
-                Default::default(),
-            )
-            .await
-            .unwrap();
-
-        executor.run_until_parked();
-
-        assert_key_bindings_for(
-            workspace.into(),
-            cx,
-            vec![("backspace", &ActionB), ("k", &ActivatePreviousPane)],
-            line!(),
-        );
-
-        // Test modifying the base, while retaining the users keymap
-        app_state
-            .fs
-            .save(
-                "/settings.json".as_ref(),
-                &r#"{"base_keymap": "JetBrains"}"#.into(),
-                Default::default(),
-            )
-            .await
-            .unwrap();
-
-        executor.run_until_parked();
-
-        assert_key_bindings_for(
-            workspace.into(),
-            cx,
-            vec![("backspace", &ActionB), ("{", &ActivatePreviousItem)],
-            line!(),
-        );
-    }
-
-    #[gpui::test]
-    async fn test_disabled_keymap_binding(cx: &mut gpui::TestAppContext) {
-        let executor = cx.executor();
-        let app_state = init_keymap_test(cx);
-        let project = Project::test(app_state.fs.clone(), [], cx).await;
-        let workspace =
-            cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-
-        // From the Atom keymap
-        use workspace::ActivatePreviousPane;
-        // From the JetBrains keymap
-        use diagnostics::Deploy;
-
-        workspace
-            .update(cx, |workspace, _, _| {
-                workspace.register_action(|_, _: &ActionA, _window, _cx| {});
-                workspace.register_action(|_, _: &ActionB, _window, _cx| {});
-                workspace.register_action(|_, _: &Deploy, _window, _cx| {});
-            })
-            .unwrap();
-        app_state
-            .fs
-            .save(
-                "/settings.json".as_ref(),
-                &r#"{"base_keymap": "Atom"}"#.into(),
-                Default::default(),
-            )
-            .await
-            .unwrap();
-        app_state
-            .fs
-            .save(
-                "/keymap.json".as_ref(),
-                &r#"[{"bindings": {"backspace": "test_only::ActionA"}}]"#.into(),
-                Default::default(),
-            )
-            .await
-            .unwrap();
-
-        cx.update(|cx| {
-            let settings_rx = watch_config_file(
-                &executor,
-                app_state.fs.clone(),
-                PathBuf::from("/settings.json"),
-            );
-            let keymap_rx = watch_config_file(
-                &executor,
-                app_state.fs.clone(),
-                PathBuf::from("/keymap.json"),
-            );
-
-            let global_settings_rx = watch_config_file(
-                &executor,
-                app_state.fs.clone(),
-                PathBuf::from("/global_settings.json"),
-            );
-            handle_settings_file_changes(settings_rx, global_settings_rx, cx);
-            handle_keymap_file_changes(keymap_rx, cx);
-        });
-
-        cx.background_executor.run_until_parked();
-
-        cx.background_executor.run_until_parked();
-        // Test loading the keymap base at all
-        assert_key_bindings_for(
-            workspace.into(),
-            cx,
-            vec![("backspace", &ActionA), ("k", &ActivatePreviousPane)],
-            line!(),
-        );
-
-        // Test disabling the key binding for the base keymap
-        app_state
-            .fs
-            .save(
-                "/keymap.json".as_ref(),
-                &r#"[{"bindings": {"backspace": null}}]"#.into(),
-                Default::default(),
-            )
-            .await
-            .unwrap();
-
-        cx.background_executor.run_until_parked();
-
-        assert_key_bindings_for(
-            workspace.into(),
-            cx,
-            vec![("k", &ActivatePreviousPane)],
-            line!(),
-        );
-
-        // Test modifying the base, while retaining the users keymap
-        app_state
-            .fs
-            .save(
-                "/settings.json".as_ref(),
-                &r#"{"base_keymap": "JetBrains"}"#.into(),
-                Default::default(),
-            )
-            .await
-            .unwrap();
-
-        cx.background_executor.run_until_parked();
-
-        assert_key_bindings_for(workspace.into(), cx, vec![("6", &Deploy)], line!());
-    }
-
-    #[gpui::test]
-    async fn test_generate_keymap_json_schema_for_registered_actions(
-        cx: &mut gpui::TestAppContext,
-    ) {
-        init_keymap_test(cx);
-        cx.update(|cx| {
-            // Make sure it doesn't panic.
-            KeymapFile::generate_json_schema_for_registered_actions(cx);
-        });
-    }
-
-    /// Checks that action namespaces are the expected set. The purpose of this is to prevent typos
-    /// and let you know when introducing a new namespace.
-    #[gpui::test]
-    async fn test_action_namespaces(cx: &mut gpui::TestAppContext) {
-        use itertools::Itertools;
-
-        init_keymap_test(cx);
-        cx.update(|cx| {
-            let all_actions = cx.all_action_names();
-
-            let mut actions_without_namespace = Vec::new();
-            let all_namespaces = all_actions
-                .iter()
-                .filter_map(|action_name| {
-                    let namespace = action_name
-                        .split("::")
-                        .collect::<Vec<_>>()
-                        .into_iter()
-                        .rev()
-                        .skip(1)
-                        .rev()
-                        .join("::");
-                    if namespace.is_empty() {
-                        actions_without_namespace.push(*action_name);
-                    }
-                    if &namespace == "test_only" || &namespace == "stories" {
-                        None
-                    } else {
-                        Some(namespace)
-                    }
-                })
-                .sorted()
-                .dedup()
-                .collect::<Vec<_>>();
-            assert_eq!(actions_without_namespace, Vec::<&str>::new());
-
-            let expected_namespaces = vec![
-                "action",
-                "activity_indicator",
-                "agent",
-                #[cfg(not(target_os = "macos"))]
-                "app_menu",
-                "assistant",
-                "assistant2",
-                "auto_update",
-                "branch_picker",
-                "bedrock",
-                "branches",
-                "buffer_search",
-                "channel_modal",
-                "cli",
-                "client",
-                "collab",
-                "collab_panel",
-                "command_palette",
-                "console",
-                "context_server",
-                "copilot",
-                "debug_panel",
-                "debugger",
-                "dev",
-                "diagnostics",
-                "edit_prediction",
-                "editor",
-                "feedback",
-                "file_finder",
-                "git",
-                "git_onboarding",
-                "git_panel",
-                "go_to_line",
-                "icon_theme_selector",
-                "inline_assistant",
-                "journal",
-                "keymap_editor",
-                "keystroke_input",
-                "language_selector",
-                "line_ending_selector",
-                "lsp_tool",
-                "markdown",
-                "menu",
-                "notebook",
-                "notification_panel",
-                "onboarding",
-                "outline",
-                "outline_panel",
-                "pane",
-                "panel",
-                "picker",
-                "project_panel",
-                "project_search",
-                "project_symbols",
-                "projects",
-                "repl",
-                "rules_library",
-                "search",
-                "settings_editor",
-                "settings_profile_selector",
-                "snippets",
-                "stash_picker",
-                "supermaven",
-                "svg",
-                "syntax_tree_view",
-                "tab_switcher",
-                "task",
-                "terminal",
-                "terminal_panel",
-                "theme_selector",
-                "toast",
-                "toolchain",
-                "variable_list",
-                "vim",
-                "window",
-                "workspace",
-                "zed",
-                "zed_actions",
-                "zed_predict_onboarding",
-                "zeta",
-            ];
-            assert_eq!(
-                all_namespaces,
-                expected_namespaces
-                    .into_iter()
-                    .map(|namespace| namespace.to_string())
-                    .sorted()
-                    .collect::<Vec<_>>()
-            );
-        });
-    }
-
-    #[gpui::test]
-    fn test_bundled_settings_and_themes(cx: &mut App) {
-        cx.text_system()
-            .add_fonts(vec![
-                Assets
-                    .load("fonts/lilex/Lilex-Regular.ttf")
-                    .unwrap()
-                    .unwrap(),
-                Assets
-                    .load("fonts/ibm-plex-sans/IBMPlexSans-Regular.ttf")
-                    .unwrap()
-                    .unwrap(),
-            ])
-            .unwrap();
-        let themes = ThemeRegistry::default();
-        settings::init(cx);
-        theme::init(theme::LoadThemes::JustBase, cx);
-
-        let mut has_default_theme = false;
-        for theme_name in themes.list().into_iter().map(|meta| meta.name) {
-            let theme = themes.get(&theme_name).unwrap();
-            assert_eq!(theme.name, theme_name);
-            if theme.name.as_ref() == "One Dark" {
-                has_default_theme = true;
-            }
-        }
-        assert!(has_default_theme);
-    }
-
-    #[gpui::test]
-    async fn test_bundled_files_editor(cx: &mut TestAppContext) {
-        let app_state = init_test(cx);
-        cx.update(init);
-
-        let project = Project::test(app_state.fs.clone(), [], cx).await;
-        let _window = cx.add_window(|window, cx| Workspace::test_new(project, window, cx));
-
-        cx.update(|cx| {
-            cx.dispatch_action(&OpenDefaultSettings);
-        });
-        cx.run_until_parked();
-
-        assert_eq!(cx.read(|cx| cx.windows().len()), 1);
-
-        let workspace = cx.windows()[0].downcast::<Workspace>().unwrap();
-        let active_editor = workspace
-            .update(cx, |workspace, _, cx| {
-                workspace.active_item_as::<Editor>(cx)
-            })
-            .unwrap();
-        assert!(
-            active_editor.is_some(),
-            "Settings action should have opened an editor with the default file contents"
-        );
-
-        let active_editor = active_editor.unwrap();
-        assert!(
-            active_editor.read_with(cx, |editor, cx| editor.read_only(cx)),
-            "Default settings should be readonly"
-        );
-        assert!(
-            active_editor.read_with(cx, |editor, cx| editor.buffer().read(cx).read_only()),
-            "The underlying buffer should also be readonly for the shipped default settings"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_bundled_languages(cx: &mut TestAppContext) {
-        let fs = fs::FakeFs::new(cx.background_executor.clone());
-        env_logger::builder().is_test(true).try_init().ok();
-        let settings = cx.update(SettingsStore::test);
-        cx.set_global(settings);
-        let languages = LanguageRegistry::test(cx.executor());
-        let languages = Arc::new(languages);
-        let node_runtime = node_runtime::NodeRuntime::unavailable();
-        cx.update(|cx| {
-            languages::init(languages.clone(), fs, node_runtime, cx);
-        });
-        for name in languages.language_names() {
-            languages
-                .language_for_name(name.as_ref())
-                .await
-                .with_context(|| format!("language name {name}"))
-                .unwrap();
-        }
-        cx.run_until_parked();
-    }
-
-    pub(crate) fn init_test(cx: &mut TestAppContext) -> Arc<AppState> {
-        init_test_with_state(cx, cx.update(AppState::test))
-    }
-
-    fn init_test_with_state(
-        cx: &mut TestAppContext,
-        mut app_state: Arc<AppState>,
-    ) -> Arc<AppState> {
-        cx.update(move |cx| {
-            env_logger::builder().is_test(true).try_init().ok();
-
-            let state = Arc::get_mut(&mut app_state).unwrap();
-            state.build_window_options = build_window_options;
-            app_state.languages.add(markdown_lang());
-
-            gpui_tokio::init(cx);
-            theme::init(theme::LoadThemes::JustBase, cx);
-            audio::init(cx);
-            channel::init(&app_state.client, app_state.user_store.clone(), cx);
-            call::init(app_state.client.clone(), app_state.user_store.clone(), cx);
-            notifications::init(app_state.client.clone(), app_state.user_store.clone(), cx);
-            workspace::init(app_state.clone(), cx);
-            release_channel::init(Version::new(0, 0, 0), cx);
-            command_palette::init(cx);
-            editor::init(cx);
-            collab_ui::init(&app_state, cx);
-            git_ui::init(cx);
-            project_panel::init(cx);
-            outline_panel::init(cx);
-            terminal_view::init(cx);
-            copilot::copilot_chat::init(
-                app_state.fs.clone(),
-                app_state.client.http_client(),
-                copilot::copilot_chat::CopilotChatConfiguration::default(),
-                cx,
-            );
-            image_viewer::init(cx);
-            language_model::init(app_state.client.clone(), cx);
-            language_models::init(app_state.user_store.clone(), app_state.client.clone(), cx);
-            web_search::init(cx);
-            web_search_providers::init(app_state.client.clone(), cx);
-            let prompt_builder = PromptBuilder::load(app_state.fs.clone(), false, cx);
-            agent_ui::init(
-                app_state.fs.clone(),
-                app_state.client.clone(),
-                prompt_builder.clone(),
-                app_state.languages.clone(),
-                false,
-                cx,
-            );
-            repl::init(app_state.fs.clone(), cx);
-            repl::notebook::init(cx);
-            tasks_ui::init(cx);
-            project::debugger::breakpoint_store::BreakpointStore::init(
-                &app_state.client.clone().into(),
-            );
-            project::debugger::dap_store::DapStore::init(&app_state.client.clone().into(), cx);
-            debugger_ui::init(cx);
-            initialize_workspace(app_state.clone(), prompt_builder, cx);
-            search::init(cx);
-            app_state
-        })
-    }
-
-    #[track_caller]
-    fn assert_key_bindings_for(
-        window: AnyWindowHandle,
-        cx: &TestAppContext,
-        actions: Vec<(&'static str, &dyn Action)>,
-        line: u32,
-    ) {
-        let available_actions = cx
-            .update(|cx| window.update(cx, |_, window, cx| window.available_actions(cx)))
-            .unwrap();
-        for (key, action) in actions {
-            let bindings = cx
-                .update(|cx| window.update(cx, |_, window, _| window.bindings_for_action(action)))
-                .unwrap();
-            // assert that...
-            assert!(
-                available_actions.iter().any(|bound_action| {
-                    // actions match...
-                    bound_action.partial_eq(action)
-                }),
-                "On {} Failed to find {}",
-                line,
-                action.name(),
-            );
-            assert!(
-                // and key strokes contain the given key
-                bindings
-                    .into_iter()
-                    .any(|binding| binding.keystrokes().iter().any(|k| k.key() == key)),
-                "On {} Failed to find {} with key binding {}",
-                line,
-                action.name(),
-                key
-            );
-        }
-    }
-
-    #[gpui::test]
-    async fn test_opening_project_settings_when_excluded(cx: &mut gpui::TestAppContext) {
-        // Use the proper initialization for runtime state
-        let app_state = init_keymap_test(cx);
-
-        eprintln!("Running test_opening_project_settings_when_excluded");
-
-        // 1. Set up a project with some project settings
-        let settings_init =
-            r#"{ "UNIQUEVALUE": true, "git": { "inline_blame": { "enabled": false } } }"#;
-        app_state
-            .fs
-            .as_fake()
-            .insert_tree(
-                Path::new("/root"),
-                json!({
-                    ".zed": {
-                        "settings.json": settings_init
-                    }
-                }),
-            )
-            .await;
-
-        eprintln!("Created project with .zed/settings.json containing UNIQUEVALUE");
-
-        // 2. Create a project with the file system and load it
-        let project = Project::test(app_state.fs.clone(), [Path::new("/root")], cx).await;
-
-        // Save original settings content for comparison
-        let original_settings = app_state
-            .fs
-            .load(Path::new("/root/.zed/settings.json"))
-            .await
-            .unwrap();
-
-        let original_settings_str = original_settings.clone();
-
-        // Verify settings exist on disk and have expected content
-        eprintln!("Original settings content: {}", original_settings_str);
-        assert!(
-            original_settings_str.contains("UNIQUEVALUE"),
-            "Test setup failed - settings file doesn't contain our marker"
-        );
-
-        // 3. Add .zed to file scan exclusions in user settings
-        cx.update_global::<SettingsStore, _>(|store, cx| {
-            store.update_user_settings(cx, |worktree_settings| {
-                worktree_settings.project.worktree.file_scan_exclusions =
-                    Some(vec![".zed".to_string()]);
-            });
-        });
-
-        eprintln!("Added .zed to file_scan_exclusions in settings");
-
-        // 4. Run tasks to apply settings
-        cx.background_executor.run_until_parked();
-
-        // 5. Critical: Verify .zed is actually excluded from worktree
-        let worktree = cx.update(|cx| project.read(cx).worktrees(cx).next().unwrap());
-
-        let has_zed_entry =
-            cx.update(|cx| worktree.read(cx).entry_for_path(rel_path(".zed")).is_some());
-
-        eprintln!(
-            "Is .zed directory visible in worktree after exclusion: {}",
-            has_zed_entry
-        );
-
-        // This assertion verifies the test is set up correctly to show the bug
-        // If .zed is not excluded, the test will fail here
-        assert!(
-            !has_zed_entry,
-            "Test precondition failed: .zed directory should be excluded but was found in worktree"
-        );
-
-        // 6. Create workspace and trigger the actual function that causes the bug
-        let window = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        window
-            .update(cx, |workspace, window, cx| {
-                // Call the exact function that contains the bug
-                eprintln!("About to call open_project_settings_file");
-                open_project_settings_file(workspace, &OpenProjectSettingsFile, window, cx);
-            })
-            .unwrap();
-
-        // 7. Run background tasks until completion
-        cx.background_executor.run_until_parked();
-
-        // 8. Verify file contents after calling function
-        let new_content = app_state
-            .fs
-            .load(Path::new("/root/.zed/settings.json"))
-            .await
-            .unwrap();
-
-        let new_content_str = new_content;
-        eprintln!("New settings content: {}", new_content_str);
-
-        // The bug causes the settings to be overwritten with empty settings
-        // So if the unique value is no longer present, the bug has been reproduced
-        let bug_exists = !new_content_str.contains("UNIQUEVALUE");
-        eprintln!("Bug reproduced: {}", bug_exists);
-
-        // This assertion should fail if the bug exists - showing the bug is real
-        assert!(
-            new_content_str.contains("UNIQUEVALUE"),
-            "BUG FOUND: Project settings were overwritten when opening via command - original custom content was lost"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_prefer_focused_window(cx: &mut gpui::TestAppContext) {
-        let app_state = init_test(cx);
-        let paths = [PathBuf::from(path!("/dir/document.txt"))];
-
-        app_state
-            .fs
-            .as_fake()
-            .insert_tree(
-                path!("/dir"),
-                json!({
-                    "document.txt": "Some of the documentation's content."
-                }),
-            )
-            .await;
-
-        let project_a = Project::test(app_state.fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let window_a =
-            cx.add_window(|window, cx| Workspace::test_new(project_a.clone(), window, cx));
-
-        let project_b = Project::test(app_state.fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let window_b =
-            cx.add_window(|window, cx| Workspace::test_new(project_b.clone(), window, cx));
-
-        let project_c = Project::test(app_state.fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let window_c =
-            cx.add_window(|window, cx| Workspace::test_new(project_c.clone(), window, cx));
-
-        for window in [window_a, window_b, window_c] {
-            let _ = cx.update_window(*window, |_, window, _| {
-                window.activate_window();
-            });
-
-            cx.update(|cx| {
-                let open_options = OpenOptions {
-                    prefer_focused_window: true,
-                    ..Default::default()
-                };
-
-                workspace::open_paths(&paths, app_state.clone(), open_options, cx)
-            })
-            .await
-            .unwrap();
-
-            cx.update_window(*window, |_, window, _| assert!(window.is_window_active()))
-                .unwrap();
-
-            let _ = window.read_with(cx, |workspace, cx| {
-                let pane = workspace.active_pane().read(cx);
-                let project_path = pane.active_item().unwrap().project_path(cx).unwrap();
-
-                assert_eq!(
-                    project_path.path.as_ref().as_std_path().to_str().unwrap(),
-                    path!("document.txt")
-                )
-            });
-        }
-    }
-}
diff --git a/crates/zed/src/zed/app_menus.rs b/crates/zed/src/zed/app_menus.rs
deleted file mode 100644
index a7961ac6d4..0000000000
--- a/crates/zed/src/zed/app_menus.rs
+++ /dev/null
@@ -1,331 +0,0 @@
-use collab_ui::collab_panel;
-use gpui::{App, Menu, MenuItem, OsAction};
-use release_channel::ReleaseChannel;
-use terminal_view::terminal_panel;
-use zed_actions::{ToggleFocus as ToggleDebugPanel, dev};
-
-pub fn app_menus(cx: &mut App) -> Vec<Menu> {
-    use zed_actions::Quit;
-
-    let mut view_items = vec![
-        MenuItem::action(
-            "Zoom In",
-            zed_actions::IncreaseBufferFontSize { persist: false },
-        ),
-        MenuItem::action(
-            "Zoom Out",
-            zed_actions::DecreaseBufferFontSize { persist: false },
-        ),
-        MenuItem::action(
-            "Reset Zoom",
-            zed_actions::ResetBufferFontSize { persist: false },
-        ),
-        MenuItem::action(
-            "Reset All Zoom",
-            zed_actions::ResetAllZoom { persist: false },
-        ),
-        MenuItem::separator(),
-        MenuItem::action("Toggle Left Dock", workspace::ToggleLeftDock),
-        MenuItem::action("Toggle Right Dock", workspace::ToggleRightDock),
-        MenuItem::action("Toggle Bottom Dock", workspace::ToggleBottomDock),
-        MenuItem::action("Toggle All Docks", workspace::ToggleAllDocks),
-        MenuItem::submenu(Menu {
-            name: "Editor Layout".into(),
-            items: vec![
-                MenuItem::action("Split Up", workspace::SplitUp),
-                MenuItem::action("Split Down", workspace::SplitDown),
-                MenuItem::action("Split Left", workspace::SplitLeft),
-                MenuItem::action("Split Right", workspace::SplitRight),
-            ],
-        }),
-        MenuItem::separator(),
-        MenuItem::action("Project Panel", zed_actions::project_panel::ToggleFocus),
-        MenuItem::action("Outline Panel", outline_panel::ToggleFocus),
-        MenuItem::action("Collab Panel", collab_panel::ToggleFocus),
-        MenuItem::action("Terminal Panel", terminal_panel::ToggleFocus),
-        MenuItem::action("Debugger Panel", ToggleDebugPanel),
-        MenuItem::separator(),
-        MenuItem::action("Diagnostics", diagnostics::Deploy),
-        MenuItem::separator(),
-    ];
-
-    if ReleaseChannel::try_global(cx) == Some(ReleaseChannel::Dev) {
-        view_items.push(MenuItem::action(
-            "Toggle GPUI Inspector",
-            dev::ToggleInspector,
-        ));
-        view_items.push(MenuItem::separator());
-    }
-
-    vec![
-        Menu {
-            name: "Zed".into(),
-            items: vec![
-                MenuItem::action("About Zed", zed_actions::About),
-                MenuItem::action("Check for Updates", auto_update::Check),
-                MenuItem::separator(),
-                MenuItem::submenu(Menu {
-                    name: "Settings".into(),
-                    items: vec![
-                        MenuItem::action("Open Settings", zed_actions::OpenSettings),
-                        MenuItem::action("Open Settings File", super::OpenSettingsFile),
-                        MenuItem::action("Open Project Settings", zed_actions::OpenProjectSettings),
-                        MenuItem::action(
-                            "Open Project Settings File",
-                            super::OpenProjectSettingsFile,
-                        ),
-                        MenuItem::action("Open Default Settings", super::OpenDefaultSettings),
-                        MenuItem::separator(),
-                        MenuItem::action("Open Keymap", zed_actions::OpenKeymap),
-                        MenuItem::action("Open Keymap File", zed_actions::OpenKeymapFile),
-                        MenuItem::action(
-                            "Open Default Key Bindings",
-                            zed_actions::OpenDefaultKeymap,
-                        ),
-                        MenuItem::separator(),
-                        MenuItem::action(
-                            "Select Theme...",
-                            zed_actions::theme_selector::Toggle::default(),
-                        ),
-                        MenuItem::action(
-                            "Select Icon Theme...",
-                            zed_actions::icon_theme_selector::Toggle::default(),
-                        ),
-                    ],
-                }),
-                MenuItem::separator(),
-                #[cfg(target_os = "macos")]
-                MenuItem::os_submenu("Services", gpui::SystemMenuType::Services),
-                MenuItem::separator(),
-                MenuItem::action("Extensions", zed_actions::Extensions::default()),
-                #[cfg(not(target_os = "windows"))]
-                MenuItem::action("Install CLI", install_cli::InstallCliBinary),
-                MenuItem::separator(),
-                #[cfg(target_os = "macos")]
-                MenuItem::action("Hide Zed", super::Hide),
-                #[cfg(target_os = "macos")]
-                MenuItem::action("Hide Others", super::HideOthers),
-                #[cfg(target_os = "macos")]
-                MenuItem::action("Show All", super::ShowAll),
-                MenuItem::separator(),
-                MenuItem::action("Quit Zed", Quit),
-            ],
-        },
-        Menu {
-            name: "File".into(),
-            items: vec![
-                MenuItem::action("New", workspace::NewFile),
-                MenuItem::action("New Window", workspace::NewWindow),
-                MenuItem::separator(),
-                #[cfg(not(target_os = "macos"))]
-                MenuItem::action("Open File...", workspace::OpenFiles),
-                MenuItem::action(
-                    if cfg!(not(target_os = "macos")) {
-                        "Open Folder..."
-                    } else {
-                        "Open…"
-                    },
-                    workspace::Open,
-                ),
-                MenuItem::action(
-                    "Open Recent...",
-                    zed_actions::OpenRecent {
-                        create_new_window: false,
-                    },
-                ),
-                MenuItem::action(
-                    "Open Remote...",
-                    zed_actions::OpenRemote {
-                        create_new_window: false,
-                        from_existing_connection: false,
-                    },
-                ),
-                MenuItem::separator(),
-                MenuItem::action("Add Folder to Project…", workspace::AddFolderToProject),
-                MenuItem::separator(),
-                MenuItem::action("Save", workspace::Save { save_intent: None }),
-                MenuItem::action("Save As…", workspace::SaveAs),
-                MenuItem::action("Save All", workspace::SaveAll { save_intent: None }),
-                MenuItem::separator(),
-                MenuItem::action(
-                    "Close Editor",
-                    workspace::CloseActiveItem {
-                        save_intent: None,
-                        close_pinned: true,
-                    },
-                ),
-                MenuItem::action("Close Window", workspace::CloseWindow),
-            ],
-        },
-        Menu {
-            name: "Edit".into(),
-            items: vec![
-                MenuItem::os_action("Undo", editor::actions::Undo, OsAction::Undo),
-                MenuItem::os_action("Redo", editor::actions::Redo, OsAction::Redo),
-                MenuItem::separator(),
-                MenuItem::os_action("Cut", editor::actions::Cut, OsAction::Cut),
-                MenuItem::os_action("Copy", editor::actions::Copy, OsAction::Copy),
-                MenuItem::action("Copy and Trim", editor::actions::CopyAndTrim),
-                MenuItem::os_action("Paste", editor::actions::Paste, OsAction::Paste),
-                MenuItem::separator(),
-                MenuItem::action("Find", search::buffer_search::Deploy::find()),
-                MenuItem::action("Find in Project", workspace::DeploySearch::find()),
-                MenuItem::separator(),
-                MenuItem::action(
-                    "Toggle Line Comment",
-                    editor::actions::ToggleComments::default(),
-                ),
-            ],
-        },
-        Menu {
-            name: "Selection".into(),
-            items: vec![
-                MenuItem::os_action(
-                    "Select All",
-                    editor::actions::SelectAll,
-                    OsAction::SelectAll,
-                ),
-                MenuItem::action("Expand Selection", editor::actions::SelectLargerSyntaxNode),
-                MenuItem::action("Shrink Selection", editor::actions::SelectSmallerSyntaxNode),
-                MenuItem::action("Select Next Sibling", editor::actions::SelectNextSyntaxNode),
-                MenuItem::action(
-                    "Select Previous Sibling",
-                    editor::actions::SelectPreviousSyntaxNode,
-                ),
-                MenuItem::separator(),
-                MenuItem::action(
-                    "Add Cursor Above",
-                    editor::actions::AddSelectionAbove {
-                        skip_soft_wrap: true,
-                    },
-                ),
-                MenuItem::action(
-                    "Add Cursor Below",
-                    editor::actions::AddSelectionBelow {
-                        skip_soft_wrap: true,
-                    },
-                ),
-                MenuItem::action(
-                    "Select Next Occurrence",
-                    editor::actions::SelectNext {
-                        replace_newest: false,
-                    },
-                ),
-                MenuItem::action(
-                    "Select Previous Occurrence",
-                    editor::actions::SelectPrevious {
-                        replace_newest: false,
-                    },
-                ),
-                MenuItem::action("Select All Occurrences", editor::actions::SelectAllMatches),
-                MenuItem::separator(),
-                MenuItem::action("Move Line Up", editor::actions::MoveLineUp),
-                MenuItem::action("Move Line Down", editor::actions::MoveLineDown),
-                MenuItem::action("Duplicate Selection", editor::actions::DuplicateLineDown),
-            ],
-        },
-        Menu {
-            name: "View".into(),
-            items: view_items,
-        },
-        Menu {
-            name: "Go".into(),
-            items: vec![
-                MenuItem::action("Back", workspace::GoBack),
-                MenuItem::action("Forward", workspace::GoForward),
-                MenuItem::separator(),
-                MenuItem::action("Command Palette...", zed_actions::command_palette::Toggle),
-                MenuItem::separator(),
-                MenuItem::action("Go to File...", workspace::ToggleFileFinder::default()),
-                // MenuItem::action("Go to Symbol in Project", project_symbols::Toggle),
-                MenuItem::action(
-                    "Go to Symbol in Editor...",
-                    zed_actions::outline::ToggleOutline,
-                ),
-                MenuItem::action("Go to Line/Column...", editor::actions::ToggleGoToLine),
-                MenuItem::separator(),
-                MenuItem::action("Go to Definition", editor::actions::GoToDefinition),
-                MenuItem::action("Go to Declaration", editor::actions::GoToDeclaration),
-                MenuItem::action("Go to Type Definition", editor::actions::GoToTypeDefinition),
-                MenuItem::action(
-                    "Find All References",
-                    editor::actions::FindAllReferences::default(),
-                ),
-                MenuItem::separator(),
-                MenuItem::action("Next Problem", editor::actions::GoToDiagnostic::default()),
-                MenuItem::action(
-                    "Previous Problem",
-                    editor::actions::GoToPreviousDiagnostic::default(),
-                ),
-            ],
-        },
-        Menu {
-            name: "Run".into(),
-            items: vec![
-                MenuItem::action(
-                    "Spawn Task",
-                    zed_actions::Spawn::ViaModal {
-                        reveal_target: None,
-                    },
-                ),
-                MenuItem::action("Start Debugger", debugger_ui::Start),
-                MenuItem::separator(),
-                MenuItem::action("Edit tasks.json...", crate::zed::OpenProjectTasks),
-                MenuItem::action("Edit debug.json...", zed_actions::OpenProjectDebugTasks),
-                MenuItem::separator(),
-                MenuItem::action("Continue", debugger_ui::Continue),
-                MenuItem::action("Step Over", debugger_ui::StepOver),
-                MenuItem::action("Step Into", debugger_ui::StepInto),
-                MenuItem::action("Step Out", debugger_ui::StepOut),
-                MenuItem::separator(),
-                MenuItem::action("Toggle Breakpoint", editor::actions::ToggleBreakpoint),
-                MenuItem::action("Edit Breakpoint", editor::actions::EditLogBreakpoint),
-                MenuItem::action("Clear All Breakpoints", debugger_ui::ClearAllBreakpoints),
-            ],
-        },
-        Menu {
-            name: "Window".into(),
-            items: vec![
-                MenuItem::action("Minimize", super::Minimize),
-                MenuItem::action("Zoom", super::Zoom),
-                MenuItem::separator(),
-            ],
-        },
-        Menu {
-            name: "Help".into(),
-            items: vec![
-                MenuItem::action(
-                    "View Release Notes Locally",
-                    auto_update_ui::ViewReleaseNotesLocally,
-                ),
-                MenuItem::action("View Telemetry", zed_actions::OpenTelemetryLog),
-                MenuItem::action("View Dependency Licenses", zed_actions::OpenLicenses),
-                MenuItem::action("Show Welcome", onboarding::ShowWelcome),
-                MenuItem::separator(),
-                MenuItem::action("File Bug Report...", zed_actions::feedback::FileBugReport),
-                MenuItem::action("Request Feature...", zed_actions::feedback::RequestFeature),
-                MenuItem::action("Email Us...", zed_actions::feedback::EmailZed),
-                MenuItem::separator(),
-                MenuItem::action(
-                    "Documentation",
-                    super::OpenBrowser {
-                        url: "https://zed.dev/docs".into(),
-                    },
-                ),
-                MenuItem::action("Zed Repository", feedback::OpenZedRepo),
-                MenuItem::action(
-                    "Zed Twitter",
-                    super::OpenBrowser {
-                        url: "https://twitter.com/zeddotdev".into(),
-                    },
-                ),
-                MenuItem::action(
-                    "Join the Team",
-                    super::OpenBrowser {
-                        url: "https://zed.dev/jobs".into(),
-                    },
-                ),
-            ],
-        },
-    ]
-}
diff --git a/crates/zed/src/zed/component_preview.rs b/crates/zed/src/zed/component_preview.rs
deleted file mode 100644
index 14a46d8882..0000000000
--- a/crates/zed/src/zed/component_preview.rs
+++ /dev/null
@@ -1,1001 +0,0 @@
-//! # Component Preview
-//!
-//! A view for exploring Zed components.
-
-mod persistence;
-
-use client::UserStore;
-use collections::HashMap;
-use component::{ComponentId, ComponentMetadata, ComponentStatus, components};
-use gpui::{
-    App, Entity, EventEmitter, FocusHandle, Focusable, Task, WeakEntity, Window, list, prelude::*,
-};
-use gpui::{ListState, ScrollHandle, ScrollStrategy, UniformListScrollHandle};
-use languages::LanguageRegistry;
-use notifications::status_toast::{StatusToast, ToastIcon};
-use persistence::COMPONENT_PREVIEW_DB;
-use project::Project;
-use std::{iter::Iterator, ops::Range, sync::Arc};
-use ui::{ButtonLike, Divider, HighlightedLabel, ListItem, ListSubHeader, Tooltip, prelude::*};
-use ui_input::InputField;
-use workspace::{
-    AppState, Item, ItemId, SerializableItem, Workspace, WorkspaceId, delete_unloaded_items,
-    item::ItemEvent,
-};
-
-pub fn init(app_state: Arc<AppState>, cx: &mut App) {
-    workspace::register_serializable_item::<ComponentPreview>(cx);
-
-    cx.observe_new(move |workspace: &mut Workspace, _window, cx| {
-        let app_state = app_state.clone();
-        let project = workspace.project().clone();
-        let weak_workspace = cx.entity().downgrade();
-
-        workspace.register_action(
-            move |workspace, _: &workspace::OpenComponentPreview, window, cx| {
-                let app_state = app_state.clone();
-
-                let language_registry = app_state.languages.clone();
-                let user_store = app_state.user_store.clone();
-
-                let component_preview = cx.new(|cx| {
-                    ComponentPreview::new(
-                        weak_workspace.clone(),
-                        project.clone(),
-                        language_registry,
-                        user_store,
-                        None,
-                        None,
-                        window,
-                        cx,
-                    )
-                    .expect("Failed to create component preview")
-                });
-
-                workspace.add_item_to_active_pane(
-                    Box::new(component_preview),
-                    None,
-                    true,
-                    window,
-                    cx,
-                )
-            },
-        );
-    })
-    .detach();
-}
-
-enum PreviewEntry {
-    AllComponents,
-    Separator,
-    Component(ComponentMetadata, Option<Vec<usize>>),
-    SectionHeader(SharedString),
-}
-
-impl From<ComponentMetadata> for PreviewEntry {
-    fn from(component: ComponentMetadata) -> Self {
-        PreviewEntry::Component(component, None)
-    }
-}
-
-impl From<SharedString> for PreviewEntry {
-    fn from(section_header: SharedString) -> Self {
-        PreviewEntry::SectionHeader(section_header)
-    }
-}
-
-#[derive(Default, Debug, Clone, PartialEq, Eq)]
-enum PreviewPage {
-    #[default]
-    AllComponents,
-    Component(ComponentId),
-}
-
-struct ComponentPreview {
-    active_page: PreviewPage,
-    reset_key: usize,
-    component_list: ListState,
-    entries: Vec<PreviewEntry>,
-    component_map: HashMap<ComponentId, ComponentMetadata>,
-    components: Vec<ComponentMetadata>,
-    cursor_index: usize,
-    filter_editor: Entity<InputField>,
-    filter_text: String,
-    focus_handle: FocusHandle,
-    language_registry: Arc<LanguageRegistry>,
-    nav_scroll_handle: UniformListScrollHandle,
-    project: Entity<Project>,
-    user_store: Entity<UserStore>,
-    workspace: WeakEntity<Workspace>,
-    workspace_id: Option<WorkspaceId>,
-    _view_scroll_handle: ScrollHandle,
-}
-
-impl ComponentPreview {
-    pub fn new(
-        workspace: WeakEntity<Workspace>,
-        project: Entity<Project>,
-        language_registry: Arc<LanguageRegistry>,
-        user_store: Entity<UserStore>,
-        selected_index: impl Into<Option<usize>>,
-        active_page: Option<PreviewPage>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> anyhow::Result<Self> {
-        let component_registry = Arc::new(components());
-        let sorted_components = component_registry.sorted_components();
-        let selected_index = selected_index.into().unwrap_or(0);
-        let active_page = active_page.unwrap_or(PreviewPage::AllComponents);
-        let filter_editor = cx.new(|cx| InputField::new(window, cx, "Find components or usages…"));
-
-        let component_list = ListState::new(
-            sorted_components.len(),
-            gpui::ListAlignment::Top,
-            px(1500.0),
-        );
-
-        let mut component_preview = Self {
-            active_page,
-            reset_key: 0,
-            component_list,
-            entries: Vec::new(),
-            component_map: component_registry.component_map(),
-            components: sorted_components,
-            cursor_index: selected_index,
-            filter_editor,
-            filter_text: String::new(),
-            focus_handle: cx.focus_handle(),
-            language_registry,
-            nav_scroll_handle: UniformListScrollHandle::new(),
-            project,
-            user_store,
-            workspace,
-            workspace_id: None,
-            _view_scroll_handle: ScrollHandle::new(),
-        };
-
-        if component_preview.cursor_index > 0 {
-            component_preview.scroll_to_preview(component_preview.cursor_index, cx);
-        }
-
-        component_preview.update_component_list(cx);
-
-        let focus_handle = component_preview.filter_editor.read(cx).focus_handle(cx);
-        window.focus(&focus_handle);
-
-        Ok(component_preview)
-    }
-
-    pub fn active_page_id(&self, _cx: &App) -> ActivePageId {
-        match &self.active_page {
-            PreviewPage::AllComponents => ActivePageId::default(),
-            PreviewPage::Component(component_id) => ActivePageId(component_id.0.to_string()),
-        }
-    }
-
-    fn scroll_to_preview(&mut self, ix: usize, cx: &mut Context<Self>) {
-        self.component_list.scroll_to_reveal_item(ix);
-        self.cursor_index = ix;
-        cx.notify();
-    }
-
-    fn set_active_page(&mut self, page: PreviewPage, cx: &mut Context<Self>) {
-        if self.active_page == page {
-            // Force the current preview page to render again
-            self.reset_key = self.reset_key.wrapping_add(1);
-        } else {
-            self.active_page = page;
-            cx.emit(ItemEvent::UpdateTab);
-        }
-        cx.notify();
-    }
-
-    fn filtered_components(&self) -> Vec<ComponentMetadata> {
-        if self.filter_text.is_empty() {
-            return self.components.clone();
-        }
-
-        let filter = self.filter_text.to_lowercase();
-        self.components
-            .iter()
-            .filter(|component| {
-                let component_name = component.name().to_lowercase();
-                let scope_name = component.scope().to_string().to_lowercase();
-                let description = component
-                    .description()
-                    .map(|d| d.to_lowercase())
-                    .unwrap_or_default();
-
-                component_name.contains(&filter)
-                    || scope_name.contains(&filter)
-                    || description.contains(&filter)
-            })
-            .cloned()
-            .collect()
-    }
-
-    fn scope_ordered_entries(&self) -> Vec<PreviewEntry> {
-        use collections::HashMap;
-
-        let mut scope_groups: HashMap<
-            ComponentScope,
-            Vec<(ComponentMetadata, Option<Vec<usize>>)>,
-        > = HashMap::default();
-        let lowercase_filter = self.filter_text.to_lowercase();
-
-        for component in &self.components {
-            if self.filter_text.is_empty() {
-                scope_groups
-                    .entry(component.scope())
-                    .or_insert_with(Vec::new)
-                    .push((component.clone(), None));
-                continue;
-            }
-
-            // let full_component_name = component.name();
-            let scopeless_name = component.scopeless_name();
-            let scope_name = component.scope().to_string();
-            let description = component.description().unwrap_or_default();
-
-            let lowercase_scopeless = scopeless_name.to_lowercase();
-            let lowercase_scope = scope_name.to_lowercase();
-            let lowercase_desc = description.to_lowercase();
-
-            if lowercase_scopeless.contains(&lowercase_filter)
-                && let Some(index) = lowercase_scopeless.find(&lowercase_filter)
-            {
-                let end = index + lowercase_filter.len();
-
-                if end <= scopeless_name.len() {
-                    let mut positions = Vec::new();
-                    for i in index..end {
-                        if scopeless_name.is_char_boundary(i) {
-                            positions.push(i);
-                        }
-                    }
-
-                    if !positions.is_empty() {
-                        scope_groups
-                            .entry(component.scope())
-                            .or_insert_with(Vec::new)
-                            .push((component.clone(), Some(positions)));
-                        continue;
-                    }
-                }
-            }
-
-            if lowercase_scopeless.contains(&lowercase_filter)
-                || lowercase_scope.contains(&lowercase_filter)
-                || lowercase_desc.contains(&lowercase_filter)
-            {
-                scope_groups
-                    .entry(component.scope())
-                    .or_insert_with(Vec::new)
-                    .push((component.clone(), None));
-            }
-        }
-
-        // Sort the components in each group
-        for components in scope_groups.values_mut() {
-            components.sort_by_key(|(c, _)| c.sort_name());
-        }
-
-        let mut entries = Vec::new();
-
-        // Always show all components first
-        entries.push(PreviewEntry::AllComponents);
-
-        let mut scopes: Vec<_> = scope_groups
-            .keys()
-            .filter(|scope| !matches!(**scope, ComponentScope::None))
-            .cloned()
-            .collect();
-
-        scopes.sort_by_key(|s| s.to_string());
-
-        for scope in scopes {
-            if let Some(components) = scope_groups.remove(&scope)
-                && !components.is_empty()
-            {
-                entries.push(PreviewEntry::Separator);
-                entries.push(PreviewEntry::SectionHeader(scope.to_string().into()));
-
-                let mut sorted_components = components;
-                sorted_components.sort_by_key(|(component, _)| component.sort_name());
-
-                for (component, positions) in sorted_components {
-                    entries.push(PreviewEntry::Component(component, positions));
-                }
-            }
-        }
-
-        // Add uncategorized components last
-        if let Some(components) = scope_groups.get(&ComponentScope::None)
-            && !components.is_empty()
-        {
-            entries.push(PreviewEntry::Separator);
-            entries.push(PreviewEntry::SectionHeader("Uncategorized".into()));
-            let mut sorted_components = components.clone();
-            sorted_components.sort_by_key(|(c, _)| c.sort_name());
-
-            for (component, positions) in sorted_components {
-                entries.push(PreviewEntry::Component(component, positions));
-            }
-        }
-
-        entries
-    }
-
-    fn update_component_list(&mut self, cx: &mut Context<Self>) {
-        let entries = self.scope_ordered_entries();
-        let new_len = entries.len();
-
-        if new_len > 0 {
-            self.nav_scroll_handle
-                .scroll_to_item(0, ScrollStrategy::Top);
-        }
-
-        let filtered_components = self.filtered_components();
-
-        if !self.filter_text.is_empty()
-            && !matches!(self.active_page, PreviewPage::AllComponents)
-            && let PreviewPage::Component(ref component_id) = self.active_page
-        {
-            let component_still_visible = filtered_components
-                .iter()
-                .any(|component| component.id() == *component_id);
-
-            if !component_still_visible {
-                if !filtered_components.is_empty() {
-                    let first_component = &filtered_components[0];
-                    self.set_active_page(PreviewPage::Component(first_component.id()), cx);
-                } else {
-                    self.set_active_page(PreviewPage::AllComponents, cx);
-                }
-            }
-        }
-
-        self.component_list = ListState::new(new_len, gpui::ListAlignment::Top, px(1500.0));
-        self.entries = entries;
-
-        cx.emit(ItemEvent::UpdateTab);
-    }
-
-    fn render_sidebar_entry(
-        &self,
-        ix: usize,
-        entry: &PreviewEntry,
-        cx: &Context<Self>,
-    ) -> impl IntoElement + use<> {
-        match entry {
-            PreviewEntry::Component(component_metadata, highlight_positions) => {
-                let id = component_metadata.id();
-                let selected = self.active_page == PreviewPage::Component(id.clone());
-                let name = component_metadata.scopeless_name();
-
-                ListItem::new(ix)
-                    .child(if let Some(_positions) = highlight_positions {
-                        let name_lower = name.to_lowercase();
-                        let filter_lower = self.filter_text.to_lowercase();
-                        let valid_positions = if let Some(start) = name_lower.find(&filter_lower) {
-                            let end = start + filter_lower.len();
-                            (start..end).collect()
-                        } else {
-                            Vec::new()
-                        };
-                        if valid_positions.is_empty() {
-                            Label::new(name).into_any_element()
-                        } else {
-                            HighlightedLabel::new(name, valid_positions).into_any_element()
-                        }
-                    } else {
-                        Label::new(name).into_any_element()
-                    })
-                    .selectable(true)
-                    .toggle_state(selected)
-                    .inset(true)
-                    .on_click(cx.listener(move |this, _, _, cx| {
-                        let id = id.clone();
-                        this.set_active_page(PreviewPage::Component(id), cx);
-                    }))
-                    .into_any_element()
-            }
-            PreviewEntry::SectionHeader(shared_string) => ListSubHeader::new(shared_string)
-                .inset(true)
-                .into_any_element(),
-            PreviewEntry::AllComponents => {
-                let selected = self.active_page == PreviewPage::AllComponents;
-
-                ListItem::new(ix)
-                    .child(Label::new("All Components"))
-                    .selectable(true)
-                    .toggle_state(selected)
-                    .inset(true)
-                    .on_click(cx.listener(move |this, _, _, cx| {
-                        this.set_active_page(PreviewPage::AllComponents, cx);
-                    }))
-                    .into_any_element()
-            }
-            PreviewEntry::Separator => ListItem::new(ix)
-                .disabled(true)
-                .child(div().w_full().py_2().child(Divider::horizontal()))
-                .into_any_element(),
-        }
-    }
-
-    fn render_scope_header(
-        &self,
-        _ix: usize,
-        title: SharedString,
-        _window: &Window,
-        _cx: &App,
-    ) -> impl IntoElement {
-        h_flex()
-            .w_full()
-            .h_10()
-            .child(Headline::new(title).size(HeadlineSize::XSmall))
-            .child(Divider::horizontal())
-    }
-
-    fn render_preview(
-        &self,
-        component: &ComponentMetadata,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> impl IntoElement {
-        let name = component.scopeless_name();
-        let scope = component.scope();
-
-        let description = component.description();
-
-        // Build the content container
-        let mut preview_container = v_flex().py_2().child(
-            v_flex()
-                .border_1()
-                .border_color(cx.theme().colors().border)
-                .rounded_sm()
-                .w_full()
-                .gap_4()
-                .py_4()
-                .px_6()
-                .flex_none()
-                .child(
-                    v_flex()
-                        .gap_1()
-                        .child(
-                            h_flex()
-                                .gap_1()
-                                .text_xl()
-                                .child(div().child(name))
-                                .when(!matches!(scope, ComponentScope::None), |this| {
-                                    this.child(div().opacity(0.5).child(format!("({})", scope)))
-                                }),
-                        )
-                        .when_some(description, |this, description| {
-                            this.child(
-                                div()
-                                    .text_ui_sm(cx)
-                                    .text_color(cx.theme().colors().text_muted)
-                                    .max_w(px(600.0))
-                                    .child(description),
-                            )
-                        }),
-                ),
-        );
-
-        if let Some(preview) = component.preview() {
-            preview_container = preview_container.children(preview(window, cx));
-        }
-
-        preview_container.into_any_element()
-    }
-
-    fn render_all_components(&self, cx: &Context<Self>) -> impl IntoElement {
-        v_flex()
-            .id("component-list")
-            .px_8()
-            .pt_4()
-            .size_full()
-            .child(
-                if self.filtered_components().is_empty() && !self.filter_text.is_empty() {
-                    div()
-                        .size_full()
-                        .items_center()
-                        .justify_center()
-                        .text_color(cx.theme().colors().text_muted)
-                        .child(format!("No components matching '{}'.", self.filter_text))
-                        .into_any_element()
-                } else {
-                    list(
-                        self.component_list.clone(),
-                        cx.processor(|this, ix, window, cx| {
-                            if ix >= this.entries.len() {
-                                return div().w_full().h_0().into_any_element();
-                            }
-
-                            let entry = &this.entries[ix];
-
-                            match entry {
-                                PreviewEntry::Component(component, _) => this
-                                    .render_preview(component, window, cx)
-                                    .into_any_element(),
-                                PreviewEntry::SectionHeader(shared_string) => this
-                                    .render_scope_header(ix, shared_string.clone(), window, cx)
-                                    .into_any_element(),
-                                PreviewEntry::AllComponents => {
-                                    div().w_full().h_0().into_any_element()
-                                }
-                                PreviewEntry::Separator => div().w_full().h_0().into_any_element(),
-                            }
-                        }),
-                    )
-                    .flex_grow()
-                    .with_sizing_behavior(gpui::ListSizingBehavior::Auto)
-                    .into_any_element()
-                },
-            )
-    }
-
-    fn render_component_page(
-        &mut self,
-        component_id: &ComponentId,
-        _window: &mut Window,
-        _cx: &mut Context<Self>,
-    ) -> impl IntoElement {
-        let component = self.component_map.get(component_id);
-
-        if let Some(component) = component {
-            v_flex()
-                .id("render-component-page")
-                .flex_1()
-                .child(ComponentPreviewPage::new(component.clone(), self.reset_key))
-                .into_any_element()
-        } else {
-            v_flex()
-                .size_full()
-                .items_center()
-                .justify_center()
-                .child("Component not found")
-                .into_any_element()
-        }
-    }
-
-    fn test_status_toast(&self, cx: &mut Context<Self>) {
-        if let Some(workspace) = self.workspace.upgrade() {
-            workspace.update(cx, |workspace, cx| {
-                let status_toast =
-                    StatusToast::new("`zed/new-notification-system` created!", cx, |this, _cx| {
-                        this.icon(ToastIcon::new(IconName::GitBranchAlt).color(Color::Muted))
-                            .action("Open Pull Request", |_, cx| {
-                                cx.open_url("https://github.com/")
-                            })
-                    });
-                workspace.toggle_status_toast(status_toast, cx)
-            });
-        }
-    }
-}
-
-impl Render for ComponentPreview {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        // TODO: move this into the struct
-        let current_filter = self.filter_editor.update(cx, |input, cx| {
-            if input.is_empty(cx) {
-                String::new()
-            } else {
-                input.editor().read(cx).text(cx)
-            }
-        });
-
-        if current_filter != self.filter_text {
-            self.filter_text = current_filter;
-            self.update_component_list(cx);
-        }
-        let sidebar_entries = self.scope_ordered_entries();
-        let active_page = self.active_page.clone();
-
-        h_flex()
-            .id("component-preview")
-            .key_context("ComponentPreview")
-            .items_start()
-            .overflow_hidden()
-            .size_full()
-            .track_focus(&self.focus_handle)
-            .bg(cx.theme().colors().editor_background)
-            .child(
-                v_flex()
-                    .h_full()
-                    .border_r_1()
-                    .border_color(cx.theme().colors().border)
-                    .child(
-                        gpui::uniform_list(
-                            "component-nav",
-                            sidebar_entries.len(),
-                            cx.processor(move |this, range: Range<usize>, _window, cx| {
-                                range
-                                    .filter_map(|ix| {
-                                        if ix < sidebar_entries.len() {
-                                            Some(this.render_sidebar_entry(
-                                                ix,
-                                                &sidebar_entries[ix],
-                                                cx,
-                                            ))
-                                        } else {
-                                            None
-                                        }
-                                    })
-                                    .collect()
-                            }),
-                        )
-                        .track_scroll(&self.nav_scroll_handle)
-                        .p_2p5()
-                        .w(px(231.)) // Matches perfectly with the size of the "Component Preview" tab, if that's the first one in the pane
-                        .h_full()
-                        .flex_1(),
-                    )
-                    .child(
-                        div()
-                            .w_full()
-                            .p_2p5()
-                            .border_t_1()
-                            .border_color(cx.theme().colors().border)
-                            .child(
-                                Button::new("toast-test", "Launch Toast")
-                                    .full_width()
-                                    .on_click(cx.listener({
-                                        move |this, _, _window, cx| {
-                                            this.test_status_toast(cx);
-                                            cx.notify();
-                                        }
-                                    })),
-                            ),
-                    ),
-            )
-            .child(
-                v_flex()
-                    .flex_1()
-                    .size_full()
-                    .child(
-                        div()
-                            .p_2()
-                            .w_full()
-                            .border_b_1()
-                            .border_color(cx.theme().colors().border)
-                            .child(self.filter_editor.clone()),
-                    )
-                    .child(
-                        div().id("content-area").flex_1().overflow_y_scroll().child(
-                            match active_page {
-                                PreviewPage::AllComponents => {
-                                    self.render_all_components(cx).into_any_element()
-                                }
-                                PreviewPage::Component(id) => self
-                                    .render_component_page(&id, window, cx)
-                                    .into_any_element(),
-                            },
-                        ),
-                    ),
-            )
-    }
-}
-
-impl EventEmitter<ItemEvent> for ComponentPreview {}
-
-impl Focusable for ComponentPreview {
-    fn focus_handle(&self, _: &App) -> gpui::FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ActivePageId(pub String);
-
-impl Default for ActivePageId {
-    fn default() -> Self {
-        ActivePageId("AllComponents".to_string())
-    }
-}
-
-impl From<ComponentId> for ActivePageId {
-    fn from(id: ComponentId) -> Self {
-        Self(id.0.to_string())
-    }
-}
-
-impl Item for ComponentPreview {
-    type Event = ItemEvent;
-
-    fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString {
-        "Component Preview".into()
-    }
-
-    fn telemetry_event_text(&self) -> Option<&'static str> {
-        None
-    }
-
-    fn show_toolbar(&self) -> bool {
-        false
-    }
-
-    fn can_split(&self) -> bool {
-        true
-    }
-
-    fn clone_on_split(
-        &self,
-        _workspace_id: Option<WorkspaceId>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Task<Option<gpui::Entity<Self>>>
-    where
-        Self: Sized,
-    {
-        let language_registry = self.language_registry.clone();
-        let user_store = self.user_store.clone();
-        let weak_workspace = self.workspace.clone();
-        let project = self.project.clone();
-        let selected_index = self.cursor_index;
-        let active_page = self.active_page.clone();
-
-        let self_result = Self::new(
-            weak_workspace,
-            project,
-            language_registry,
-            user_store,
-            selected_index,
-            Some(active_page),
-            window,
-            cx,
-        );
-
-        Task::ready(match self_result {
-            Ok(preview) => Some(cx.new(|_cx| preview)),
-            Err(e) => {
-                log::error!("Failed to clone component preview: {}", e);
-                None
-            }
-        })
-    }
-
-    fn to_item_events(event: &Self::Event, mut f: impl FnMut(workspace::item::ItemEvent)) {
-        f(*event)
-    }
-
-    fn added_to_workspace(
-        &mut self,
-        workspace: &mut Workspace,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.workspace_id = workspace.database_id();
-
-        let focus_handle = self.filter_editor.read(cx).focus_handle(cx);
-        window.focus(&focus_handle);
-    }
-}
-
-impl SerializableItem for ComponentPreview {
-    fn serialized_item_kind() -> &'static str {
-        "ComponentPreview"
-    }
-
-    fn deserialize(
-        project: Entity<Project>,
-        workspace: WeakEntity<Workspace>,
-        workspace_id: WorkspaceId,
-        item_id: ItemId,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<anyhow::Result<Entity<Self>>> {
-        let deserialized_active_page =
-            match COMPONENT_PREVIEW_DB.get_active_page(item_id, workspace_id) {
-                Ok(page) => {
-                    if let Some(page) = page {
-                        ActivePageId(page)
-                    } else {
-                        ActivePageId::default()
-                    }
-                }
-                Err(_) => ActivePageId::default(),
-            };
-
-        let user_store = project.read(cx).user_store();
-        let language_registry = project.read(cx).languages().clone();
-        let preview_page = if deserialized_active_page.0 == ActivePageId::default().0 {
-            Some(PreviewPage::default())
-        } else {
-            let component_str = deserialized_active_page.0;
-            let component_registry = components();
-            let all_components = component_registry.components();
-            let found_component = all_components.iter().find(|c| c.id().0 == component_str);
-
-            if let Some(component) = found_component {
-                Some(PreviewPage::Component(component.id()))
-            } else {
-                Some(PreviewPage::default())
-            }
-        };
-
-        window.spawn(cx, async move |cx| {
-            let user_store = user_store.clone();
-            let language_registry = language_registry.clone();
-            let weak_workspace = workspace.clone();
-            let project = project.clone();
-            cx.update(move |window, cx| {
-                Ok(cx.new(|cx| {
-                    ComponentPreview::new(
-                        weak_workspace,
-                        project,
-                        language_registry,
-                        user_store,
-                        None,
-                        preview_page,
-                        window,
-                        cx,
-                    )
-                    .expect("Failed to create component preview")
-                }))
-            })?
-        })
-    }
-
-    fn cleanup(
-        workspace_id: WorkspaceId,
-        alive_items: Vec<ItemId>,
-        _window: &mut Window,
-        cx: &mut App,
-    ) -> Task<anyhow::Result<()>> {
-        delete_unloaded_items(
-            alive_items,
-            workspace_id,
-            "component_previews",
-            &COMPONENT_PREVIEW_DB,
-            cx,
-        )
-    }
-
-    fn serialize(
-        &mut self,
-        _workspace: &mut Workspace,
-        item_id: ItemId,
-        _closing: bool,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Task<anyhow::Result<()>>> {
-        let active_page = self.active_page_id(cx);
-        let workspace_id = self.workspace_id?;
-        Some(cx.background_spawn(async move {
-            COMPONENT_PREVIEW_DB
-                .save_active_page(item_id, workspace_id, active_page.0)
-                .await
-        }))
-    }
-
-    fn should_serialize(&self, event: &Self::Event) -> bool {
-        matches!(event, ItemEvent::UpdateTab)
-    }
-}
-
-// TODO: use language registry to allow rendering markdown
-#[derive(IntoElement)]
-pub struct ComponentPreviewPage {
-    // languages: Arc<LanguageRegistry>,
-    component: ComponentMetadata,
-    reset_key: usize,
-}
-
-impl ComponentPreviewPage {
-    pub fn new(
-        component: ComponentMetadata,
-        reset_key: usize,
-        // languages: Arc<LanguageRegistry>
-    ) -> Self {
-        Self {
-            // languages,
-            component,
-            reset_key,
-        }
-    }
-
-    /// Renders the component status when it would be useful
-    ///
-    /// Doesn't render if the component is `ComponentStatus::Live`
-    /// as that is the default state
-    fn render_component_status(&self, cx: &App) -> Option<impl IntoElement> {
-        let status = self.component.status();
-        let status_description = status.description().to_string();
-
-        let color = match status {
-            ComponentStatus::Deprecated => Color::Error,
-            ComponentStatus::EngineeringReady => Color::Info,
-            ComponentStatus::Live => Color::Success,
-            ComponentStatus::WorkInProgress => Color::Warning,
-        };
-
-        if status != ComponentStatus::Live {
-            Some(
-                ButtonLike::new("component_status")
-                    .child(
-                        div()
-                            .px_1p5()
-                            .rounded_sm()
-                            .bg(color.color(cx).alpha(0.12))
-                            .child(
-                                Label::new(status.to_string())
-                                    .size(LabelSize::Small)
-                                    .color(color),
-                            ),
-                    )
-                    .tooltip(Tooltip::text(status_description))
-                    .disabled(true),
-            )
-        } else {
-            None
-        }
-    }
-
-    fn render_header(&self, _: &Window, cx: &App) -> impl IntoElement {
-        v_flex()
-            .min_w_0()
-            .w_full()
-            .p_12()
-            .gap_6()
-            .bg(cx.theme().colors().surface_background)
-            .border_b_1()
-            .border_color(cx.theme().colors().border)
-            .child(
-                v_flex()
-                    .gap_1()
-                    .child(
-                        Label::new(self.component.scope().to_string())
-                            .size(LabelSize::Small)
-                            .color(Color::Muted),
-                    )
-                    .child(
-                        h_flex()
-                            .gap_2()
-                            .child(
-                                Headline::new(self.component.scopeless_name())
-                                    .size(HeadlineSize::XLarge),
-                            )
-                            .children(self.render_component_status(cx)),
-                    ),
-            )
-            .when_some(self.component.description(), |this, description| {
-                this.child(Label::new(description).size(LabelSize::Small))
-            })
-    }
-
-    fn render_preview(&self, window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let content = if let Some(preview) = self.component.preview() {
-            // Fall back to component preview
-            preview(window, cx).unwrap_or_else(|| {
-                div()
-                    .child("Failed to load preview. This path should be unreachable")
-                    .into_any_element()
-            })
-        } else {
-            div().child("No preview available").into_any_element()
-        };
-
-        v_flex()
-            .id(("component-preview", self.reset_key))
-            .size_full()
-            .flex_1()
-            .px_12()
-            .py_6()
-            .bg(cx.theme().colors().editor_background)
-            .child(content)
-    }
-}
-
-impl RenderOnce for ComponentPreviewPage {
-    fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement {
-        v_flex()
-            .size_full()
-            .flex_1()
-            .overflow_x_hidden()
-            .child(self.render_header(window, cx))
-            .child(self.render_preview(window, cx))
-    }
-}
diff --git a/crates/zed/src/zed/component_preview/persistence.rs b/crates/zed/src/zed/component_preview/persistence.rs
deleted file mode 100644
index c37a4cc389..0000000000
--- a/crates/zed/src/zed/component_preview/persistence.rs
+++ /dev/null
@@ -1,59 +0,0 @@
-use anyhow::Result;
-use db::{
-    query,
-    sqlez::{domain::Domain, statement::Statement, thread_safe_connection::ThreadSafeConnection},
-    sqlez_macros::sql,
-};
-use workspace::{ItemId, WorkspaceDb, WorkspaceId};
-
-pub struct ComponentPreviewDb(ThreadSafeConnection);
-
-impl Domain for ComponentPreviewDb {
-    const NAME: &str = stringify!(ComponentPreviewDb);
-
-    const MIGRATIONS: &[&str] = &[sql!(
-            CREATE TABLE component_previews (
-                workspace_id INTEGER,
-                item_id INTEGER UNIQUE,
-                active_page_id TEXT,
-                PRIMARY KEY(workspace_id, item_id),
-                FOREIGN KEY(workspace_id) REFERENCES workspaces(workspace_id)
-                ON DELETE CASCADE
-            ) STRICT;
-    )];
-}
-
-db::static_connection!(COMPONENT_PREVIEW_DB, ComponentPreviewDb, [WorkspaceDb]);
-
-impl ComponentPreviewDb {
-    pub async fn save_active_page(
-        &self,
-        item_id: ItemId,
-        workspace_id: WorkspaceId,
-        active_page_id: String,
-    ) -> Result<()> {
-        log::debug!(
-            "Saving active page: item_id={item_id:?}, workspace_id={workspace_id:?}, active_page_id={active_page_id}"
-        );
-        let query = "INSERT INTO component_previews(item_id, workspace_id, active_page_id)
-            VALUES (?1, ?2, ?3)
-            ON CONFLICT DO UPDATE SET
-                active_page_id = ?3";
-        self.write(move |conn| {
-            let mut statement = Statement::prepare(conn, query)?;
-            let mut next_index = statement.bind(&item_id, 1)?;
-            next_index = statement.bind(&workspace_id, next_index)?;
-            statement.bind(&active_page_id, next_index)?;
-            statement.exec()
-        })
-        .await
-    }
-
-    query! {
-        pub fn get_active_page(item_id: ItemId, workspace_id: WorkspaceId) -> Result<Option<String>> {
-            SELECT active_page_id
-            FROM component_previews
-            WHERE item_id = ? AND workspace_id = ?
-        }
-    }
-}
diff --git a/crates/zed/src/zed/edit_prediction_registry.rs b/crates/zed/src/zed/edit_prediction_registry.rs
deleted file mode 100644
index 77a1f71596..0000000000
--- a/crates/zed/src/zed/edit_prediction_registry.rs
+++ /dev/null
@@ -1,256 +0,0 @@
-use client::{Client, UserStore};
-use codestral::CodestralEditPredictionDelegate;
-use collections::HashMap;
-use copilot::{Copilot, CopilotEditPredictionDelegate};
-use edit_prediction::{SweepFeatureFlag, ZedEditPredictionDelegate, Zeta2FeatureFlag};
-use editor::Editor;
-use feature_flags::FeatureFlagAppExt;
-use gpui::{AnyWindowHandle, App, AppContext as _, Context, Entity, WeakEntity};
-use language::language_settings::{EditPredictionProvider, all_language_settings};
-use language_models::MistralLanguageModelProvider;
-use settings::{
-    EXPERIMENTAL_MERCURY_EDIT_PREDICTION_PROVIDER_NAME,
-    EXPERIMENTAL_SWEEP_EDIT_PREDICTION_PROVIDER_NAME,
-    EXPERIMENTAL_ZETA2_EDIT_PREDICTION_PROVIDER_NAME, SettingsStore,
-};
-use std::{cell::RefCell, rc::Rc, sync::Arc};
-use supermaven::{Supermaven, SupermavenEditPredictionDelegate};
-use ui::Window;
-
-pub fn init(client: Arc<Client>, user_store: Entity<UserStore>, cx: &mut App) {
-    let editors: Rc<RefCell<HashMap<WeakEntity<Editor>, AnyWindowHandle>>> = Rc::default();
-    cx.observe_new({
-        let editors = editors.clone();
-        let client = client.clone();
-        let user_store = user_store.clone();
-        move |editor: &mut Editor, window, cx: &mut Context<Editor>| {
-            if !editor.mode().is_full() {
-                return;
-            }
-
-            register_backward_compatible_actions(editor, cx);
-
-            let Some(window) = window else {
-                return;
-            };
-
-            let editor_handle = cx.entity().downgrade();
-            cx.on_release({
-                let editor_handle = editor_handle.clone();
-                let editors = editors.clone();
-                move |_, _| {
-                    editors.borrow_mut().remove(&editor_handle);
-                }
-            })
-            .detach();
-
-            editors
-                .borrow_mut()
-                .insert(editor_handle, window.window_handle());
-            let provider = all_language_settings(None, cx).edit_predictions.provider;
-            assign_edit_prediction_provider(
-                editor,
-                provider,
-                &client,
-                user_store.clone(),
-                window,
-                cx,
-            );
-        }
-    })
-    .detach();
-
-    cx.on_action(clear_edit_prediction_store_edit_history);
-
-    let mut provider = all_language_settings(None, cx).edit_predictions.provider;
-    cx.subscribe(&user_store, {
-        let editors = editors.clone();
-        let client = client.clone();
-
-        move |user_store, event, cx| {
-            if let client::user::Event::PrivateUserInfoUpdated = event {
-                assign_edit_prediction_providers(&editors, provider, &client, user_store, cx);
-            }
-        }
-    })
-    .detach();
-
-    cx.observe_global::<SettingsStore>({
-        let user_store = user_store.clone();
-        move |cx| {
-            let new_provider = all_language_settings(None, cx).edit_predictions.provider;
-
-            if new_provider != provider {
-                telemetry::event!(
-                    "Edit Prediction Provider Changed",
-                    from = provider,
-                    to = new_provider,
-                );
-
-                provider = new_provider;
-                assign_edit_prediction_providers(
-                    &editors,
-                    provider,
-                    &client,
-                    user_store.clone(),
-                    cx,
-                );
-            }
-        }
-    })
-    .detach();
-}
-
-fn clear_edit_prediction_store_edit_history(_: &edit_prediction::ClearHistory, cx: &mut App) {
-    if let Some(ep_store) = edit_prediction::EditPredictionStore::try_global(cx) {
-        ep_store.update(cx, |ep_store, _| ep_store.clear_history());
-    }
-}
-
-fn assign_edit_prediction_providers(
-    editors: &Rc<RefCell<HashMap<WeakEntity<Editor>, AnyWindowHandle>>>,
-    provider: EditPredictionProvider,
-    client: &Arc<Client>,
-    user_store: Entity<UserStore>,
-    cx: &mut App,
-) {
-    if provider == EditPredictionProvider::Codestral {
-        let mistral = MistralLanguageModelProvider::global(client.http_client(), cx);
-        mistral.load_codestral_api_key(cx).detach();
-    }
-    for (editor, window) in editors.borrow().iter() {
-        _ = window.update(cx, |_window, window, cx| {
-            _ = editor.update(cx, |editor, cx| {
-                assign_edit_prediction_provider(
-                    editor,
-                    provider,
-                    client,
-                    user_store.clone(),
-                    window,
-                    cx,
-                );
-            })
-        });
-    }
-}
-
-fn register_backward_compatible_actions(editor: &mut Editor, cx: &mut Context<Editor>) {
-    // We renamed some of these actions to not be copilot-specific, but that
-    // would have not been backwards-compatible. So here we are re-registering
-    // the actions with the old names to not break people's keymaps.
-    editor
-        .register_action(cx.listener(
-            |editor, _: &copilot::Suggest, window: &mut Window, cx: &mut Context<Editor>| {
-                editor.show_edit_prediction(&Default::default(), window, cx);
-            },
-        ))
-        .detach();
-    editor
-        .register_action(cx.listener(
-            |editor, _: &copilot::NextSuggestion, window: &mut Window, cx: &mut Context<Editor>| {
-                editor.next_edit_prediction(&Default::default(), window, cx);
-            },
-        ))
-        .detach();
-    editor
-        .register_action(cx.listener(
-            |editor,
-             _: &copilot::PreviousSuggestion,
-             window: &mut Window,
-             cx: &mut Context<Editor>| {
-                editor.previous_edit_prediction(&Default::default(), window, cx);
-            },
-        ))
-        .detach();
-}
-
-fn assign_edit_prediction_provider(
-    editor: &mut Editor,
-    provider: EditPredictionProvider,
-    client: &Arc<Client>,
-    user_store: Entity<UserStore>,
-    window: &mut Window,
-    cx: &mut Context<Editor>,
-) {
-    // TODO: Do we really want to collect data only for singleton buffers?
-    let singleton_buffer = editor.buffer().read(cx).as_singleton();
-
-    match provider {
-        EditPredictionProvider::None => {
-            editor.set_edit_prediction_provider::<ZedEditPredictionDelegate>(None, window, cx);
-        }
-        EditPredictionProvider::Copilot => {
-            if let Some(copilot) = Copilot::global(cx) {
-                if let Some(buffer) = singleton_buffer
-                    && buffer.read(cx).file().is_some()
-                {
-                    copilot.update(cx, |copilot, cx| {
-                        copilot.register_buffer(&buffer, cx);
-                    });
-                }
-                let provider = cx.new(|_| CopilotEditPredictionDelegate::new(copilot));
-                editor.set_edit_prediction_provider(Some(provider), window, cx);
-            }
-        }
-        EditPredictionProvider::Supermaven => {
-            if let Some(supermaven) = Supermaven::global(cx) {
-                let provider = cx.new(|_| SupermavenEditPredictionDelegate::new(supermaven));
-                editor.set_edit_prediction_provider(Some(provider), window, cx);
-            }
-        }
-        EditPredictionProvider::Codestral => {
-            let http_client = client.http_client();
-            let provider = cx.new(|_| CodestralEditPredictionDelegate::new(http_client));
-            editor.set_edit_prediction_provider(Some(provider), window, cx);
-        }
-        value @ (EditPredictionProvider::Experimental(_) | EditPredictionProvider::Zed) => {
-            let ep_store = edit_prediction::EditPredictionStore::global(client, &user_store, cx);
-
-            if let Some(project) = editor.project()
-                && let Some(buffer) = &singleton_buffer
-                && buffer.read(cx).file().is_some()
-            {
-                let has_model = ep_store.update(cx, |ep_store, cx| {
-                    let model = if let EditPredictionProvider::Experimental(name) = value {
-                        if name == EXPERIMENTAL_SWEEP_EDIT_PREDICTION_PROVIDER_NAME
-                            && cx.has_flag::<SweepFeatureFlag>()
-                        {
-                            edit_prediction::EditPredictionModel::Sweep
-                        } else if name == EXPERIMENTAL_ZETA2_EDIT_PREDICTION_PROVIDER_NAME
-                            && cx.has_flag::<Zeta2FeatureFlag>()
-                        {
-                            edit_prediction::EditPredictionModel::Zeta2
-                        } else if name == EXPERIMENTAL_MERCURY_EDIT_PREDICTION_PROVIDER_NAME
-                            && cx.has_flag::<Zeta2FeatureFlag>()
-                        {
-                            edit_prediction::EditPredictionModel::Mercury
-                        } else {
-                            return false;
-                        }
-                    } else if user_store.read(cx).current_user().is_some() {
-                        edit_prediction::EditPredictionModel::Zeta1
-                    } else {
-                        return false;
-                    };
-
-                    ep_store.set_edit_prediction_model(model);
-                    ep_store.register_buffer(buffer, project, cx);
-                    true
-                });
-
-                if has_model {
-                    let provider = cx.new(|cx| {
-                        ZedEditPredictionDelegate::new(
-                            project.clone(),
-                            singleton_buffer,
-                            &client,
-                            &user_store,
-                            cx,
-                        )
-                    });
-                    editor.set_edit_prediction_provider(Some(provider), window, cx);
-                }
-            }
-        }
-    }
-}
diff --git a/crates/zed/src/zed/mac_only_instance.rs b/crates/zed/src/zed/mac_only_instance.rs
deleted file mode 100644
index b7898fae17..0000000000
--- a/crates/zed/src/zed/mac_only_instance.rs
+++ /dev/null
@@ -1,151 +0,0 @@
-use std::{
-    io::{Read, Write},
-    net::{Ipv4Addr, SocketAddr, SocketAddrV4, TcpListener, TcpStream},
-    thread,
-    time::Duration,
-};
-
-use sysinfo::System;
-
-use release_channel::ReleaseChannel;
-
-const LOCALHOST: Ipv4Addr = Ipv4Addr::new(127, 0, 0, 1);
-const CONNECT_TIMEOUT: Duration = Duration::from_millis(10);
-const RECEIVE_TIMEOUT: Duration = Duration::from_millis(35);
-const SEND_TIMEOUT: Duration = Duration::from_millis(20);
-const USER_BLOCK: u16 = 100;
-
-fn address() -> SocketAddr {
-    // These port numbers are offset by the user ID to avoid conflicts between
-    // different users on the same machine. In addition to that the ports for each
-    // release channel are spaced out by 100 to avoid conflicts between different
-    // users running different release channels on the same machine. This ends up
-    // interleaving the ports between different users and different release channels.
-    //
-    // On macOS user IDs start at 501 and on Linux they start at 1000. The first user
-    // on a Mac with ID 501 running a dev channel build will use port 44238, and the
-    // second user with ID 502 will use port 44239, and so on. User 501 will use ports
-    // 44338, 44438, and 44538 for the preview, stable, and nightly channels,
-    // respectively. User 502 will use ports 44339, 44439, and 44539 for the preview,
-    // stable, and nightly channels, respectively.
-    let port = match *release_channel::RELEASE_CHANNEL {
-        ReleaseChannel::Dev => 43737,
-        ReleaseChannel::Preview => 43737 + USER_BLOCK,
-        ReleaseChannel::Stable => 43737 + (2 * USER_BLOCK),
-        ReleaseChannel::Nightly => 43737 + (3 * USER_BLOCK),
-    };
-    let mut user_port = port;
-    let mut sys = System::new_all();
-    sys.refresh_all();
-    if let Ok(current_pid) = sysinfo::get_current_pid()
-        && let Some(uid) = sys
-            .process(current_pid)
-            .and_then(|process| process.user_id())
-    {
-        let uid_u32 = get_uid_as_u32(uid);
-        // Ensure that the user ID is not too large to avoid overflow when
-        // calculating the port number. This seems unlikely but it doesn't
-        // hurt to be safe.
-        let max_port = 65535;
-        let max_uid: u32 = max_port - port as u32;
-        let wrapped_uid: u16 = (uid_u32 % max_uid) as u16;
-        user_port += wrapped_uid;
-    }
-
-    SocketAddr::V4(SocketAddrV4::new(LOCALHOST, user_port))
-}
-
-#[cfg(unix)]
-fn get_uid_as_u32(uid: &sysinfo::Uid) -> u32 {
-    *uid.clone()
-}
-
-#[cfg(windows)]
-fn get_uid_as_u32(uid: &sysinfo::Uid) -> u32 {
-    // Extract the RID which is an integer
-    uid.to_string()
-        .rsplit('-')
-        .next()
-        .and_then(|rid| rid.parse::<u32>().ok())
-        .unwrap_or(0)
-}
-
-fn instance_handshake() -> &'static str {
-    match *release_channel::RELEASE_CHANNEL {
-        ReleaseChannel::Dev => "Zed Editor Dev Instance Running",
-        ReleaseChannel::Nightly => "Zed Editor Nightly Instance Running",
-        ReleaseChannel::Preview => "Zed Editor Preview Instance Running",
-        ReleaseChannel::Stable => "Zed Editor Stable Instance Running",
-    }
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum IsOnlyInstance {
-    Yes,
-    No,
-}
-
-pub fn ensure_only_instance() -> IsOnlyInstance {
-    if check_got_handshake() {
-        return IsOnlyInstance::No;
-    }
-
-    let listener = match TcpListener::bind(address()) {
-        Ok(listener) => listener,
-
-        Err(err) => {
-            log::warn!("Error binding to single instance port: {err}");
-            if check_got_handshake() {
-                return IsOnlyInstance::No;
-            }
-
-            // Avoid failing to start when some other application by chance already has
-            // a claim on the port. This is sub-par as any other instance that gets launched
-            // will be unable to communicate with this instance and will duplicate
-            log::warn!("Backup handshake request failed, continuing without handshake");
-            return IsOnlyInstance::Yes;
-        }
-    };
-
-    thread::Builder::new()
-        .name("EnsureSingleton".to_string())
-        .spawn(move || {
-            for stream in listener.incoming() {
-                let mut stream = match stream {
-                    Ok(stream) => stream,
-                    Err(_) => return,
-                };
-
-                _ = stream.set_nodelay(true);
-                _ = stream.set_read_timeout(Some(SEND_TIMEOUT));
-                _ = stream.write_all(instance_handshake().as_bytes());
-            }
-        })
-        .unwrap();
-
-    IsOnlyInstance::Yes
-}
-
-fn check_got_handshake() -> bool {
-    match TcpStream::connect_timeout(&address(), CONNECT_TIMEOUT) {
-        Ok(mut stream) => {
-            let mut buf = vec![0u8; instance_handshake().len()];
-
-            stream.set_read_timeout(Some(RECEIVE_TIMEOUT)).unwrap();
-            if let Err(err) = stream.read_exact(&mut buf) {
-                log::warn!("Connected to single instance port but failed to read: {err}");
-                return false;
-            }
-
-            if buf == instance_handshake().as_bytes() {
-                log::info!("Got instance handshake");
-                return true;
-            }
-
-            log::warn!("Got wrong instance handshake value");
-            false
-        }
-
-        Err(_) => false,
-    }
-}
diff --git a/crates/zed/src/zed/migrate.rs b/crates/zed/src/zed/migrate.rs
deleted file mode 100644
index 2452f17d04..0000000000
--- a/crates/zed/src/zed/migrate.rs
+++ /dev/null
@@ -1,323 +0,0 @@
-use anyhow::{Context as _, Result};
-use editor::Editor;
-use fs::Fs;
-use migrator::{migrate_keymap, migrate_settings};
-use settings::{KeymapFile, Settings, SettingsStore};
-use util::ResultExt;
-use workspace::notifications::NotifyTaskExt;
-
-use std::sync::Arc;
-
-use gpui::{Entity, EventEmitter, Global, Task, TextStyle, TextStyleRefinement};
-use markdown::{Markdown, MarkdownElement, MarkdownStyle};
-use theme::ThemeSettings;
-use ui::prelude::*;
-use workspace::item::ItemHandle;
-use workspace::{ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView, Workspace};
-
-#[derive(Debug, Copy, Clone, PartialEq)]
-pub enum MigrationType {
-    Keymap,
-    Settings,
-}
-
-pub struct MigrationBanner {
-    migration_type: Option<MigrationType>,
-    should_migrate_task: Option<Task<()>>,
-    markdown: Option<Entity<Markdown>>,
-}
-
-pub enum MigrationEvent {
-    ContentChanged {
-        migration_type: MigrationType,
-        migrating_in_memory: bool,
-    },
-}
-
-pub struct MigrationNotification;
-
-impl EventEmitter<MigrationEvent> for MigrationNotification {}
-
-impl MigrationNotification {
-    pub fn try_global(cx: &App) -> Option<Entity<Self>> {
-        cx.try_global::<GlobalMigrationNotification>()
-            .map(|notifier| notifier.0.clone())
-    }
-
-    pub fn set_global(notifier: Entity<Self>, cx: &mut App) {
-        cx.set_global(GlobalMigrationNotification(notifier));
-    }
-}
-
-struct GlobalMigrationNotification(Entity<MigrationNotification>);
-
-impl Global for GlobalMigrationNotification {}
-
-impl MigrationBanner {
-    pub fn new(_: &Workspace, cx: &mut Context<Self>) -> Self {
-        if let Some(notifier) = MigrationNotification::try_global(cx) {
-            cx.subscribe(
-                &notifier,
-                move |migrator_banner, _, event: &MigrationEvent, cx| {
-                    migrator_banner.handle_notification(event, cx);
-                },
-            )
-            .detach();
-        }
-        Self {
-            migration_type: None,
-            should_migrate_task: None,
-            markdown: None,
-        }
-    }
-
-    fn handle_notification(&mut self, event: &MigrationEvent, cx: &mut Context<Self>) {
-        match event {
-            MigrationEvent::ContentChanged {
-                migration_type,
-                migrating_in_memory,
-            } => {
-                if *migrating_in_memory {
-                    self.migration_type = Some(*migration_type);
-                    self.show(cx);
-                } else {
-                    cx.emit(ToolbarItemEvent::ChangeLocation(
-                        ToolbarItemLocation::Hidden,
-                    ));
-                    self.reset(cx);
-                };
-            }
-        }
-    }
-
-    fn show(&mut self, cx: &mut Context<Self>) {
-        let (file_type, backup_file_name) = match self.migration_type {
-            Some(MigrationType::Keymap) => (
-                "keymap",
-                paths::keymap_backup_file()
-                    .file_name()
-                    .unwrap_or_default()
-                    .to_string_lossy()
-                    .into_owned(),
-            ),
-            Some(MigrationType::Settings) => (
-                "settings",
-                paths::settings_backup_file()
-                    .file_name()
-                    .unwrap_or_default()
-                    .to_string_lossy()
-                    .into_owned(),
-            ),
-            None => return,
-        };
-
-        let migration_text = format!(
-            "Your {} file uses deprecated settings which can be \
-            automatically updated. A backup will be saved to `{}`",
-            file_type, backup_file_name
-        );
-
-        self.markdown = Some(cx.new(|cx| Markdown::new(migration_text.into(), None, None, cx)));
-
-        cx.emit(ToolbarItemEvent::ChangeLocation(
-            ToolbarItemLocation::Secondary,
-        ));
-        cx.notify();
-    }
-
-    fn reset(&mut self, cx: &mut Context<Self>) {
-        self.should_migrate_task.take();
-        self.migration_type.take();
-        self.markdown.take();
-        cx.notify();
-    }
-}
-
-impl EventEmitter<ToolbarItemEvent> for MigrationBanner {}
-
-impl ToolbarItemView for MigrationBanner {
-    fn set_active_pane_item(
-        &mut self,
-        active_pane_item: Option<&dyn ItemHandle>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> ToolbarItemLocation {
-        self.reset(cx);
-
-        let Some(target) = active_pane_item
-            .and_then(|item| item.act_as::<Editor>(cx))
-            .and_then(|editor| editor.update(cx, |editor, cx| editor.target_file_abs_path(cx)))
-        else {
-            return ToolbarItemLocation::Hidden;
-        };
-
-        if &target == paths::keymap_file() {
-            self.migration_type = Some(MigrationType::Keymap);
-            let fs = <dyn Fs>::global(cx);
-            let should_migrate = cx.background_spawn(should_migrate_keymap(fs));
-            self.should_migrate_task = Some(cx.spawn_in(window, async move |this, cx| {
-                if let Ok(true) = should_migrate.await {
-                    this.update(cx, |this, cx| {
-                        this.show(cx);
-                    })
-                    .log_err();
-                }
-            }));
-        } else if &target == paths::settings_file() {
-            self.migration_type = Some(MigrationType::Settings);
-            let fs = <dyn Fs>::global(cx);
-            let should_migrate = cx.background_spawn(should_migrate_settings(fs));
-            self.should_migrate_task = Some(cx.spawn_in(window, async move |this, cx| {
-                if let Ok(true) = should_migrate.await {
-                    this.update(cx, |this, cx| {
-                        this.show(cx);
-                    })
-                    .log_err();
-                }
-            }));
-        }
-
-        ToolbarItemLocation::Hidden
-    }
-}
-
-impl Render for MigrationBanner {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let migration_type = self.migration_type;
-        let settings = ThemeSettings::get_global(cx);
-        let ui_font_family = settings.ui_font.family.clone();
-        let line_height = settings.ui_font_size(cx) * 1.3;
-        h_flex()
-            .py_1()
-            .pl_2()
-            .pr_1()
-            .justify_between()
-            .bg(cx.theme().status().info_background.opacity(0.6))
-            .border_1()
-            .border_color(cx.theme().colors().border_variant)
-            .rounded_sm()
-            .child(
-                h_flex()
-                    .gap_2()
-                    .overflow_hidden()
-                    .child(
-                        Icon::new(IconName::Warning)
-                            .size(IconSize::XSmall)
-                            .color(Color::Warning),
-                    )
-                    .child(
-                        div()
-                            .overflow_hidden()
-                            .text_size(TextSize::Default.rems(cx))
-                            .max_h(2 * line_height)
-                            .when_some(self.markdown.as_ref(), |this, markdown| {
-                                this.child(
-                                    MarkdownElement::new(
-                                        markdown.clone(),
-                                        MarkdownStyle {
-                                            base_text_style: TextStyle {
-                                                color: cx.theme().colors().text,
-                                                font_family: ui_font_family,
-                                                ..Default::default()
-                                            },
-                                            inline_code: TextStyleRefinement {
-                                                background_color: Some(
-                                                    cx.theme().colors().background,
-                                                ),
-                                                ..Default::default()
-                                            },
-                                            ..Default::default()
-                                        },
-                                    )
-                                    .into_any_element(),
-                                )
-                            }),
-                    ),
-            )
-            .child(
-                Button::new("backup-and-migrate", "Backup and Update").on_click(
-                    move |_, window, cx| {
-                        let fs = <dyn Fs>::global(cx);
-                        match migration_type {
-                            Some(MigrationType::Keymap) => {
-                                cx.background_spawn(write_keymap_migration(fs.clone()))
-                                    .detach_and_notify_err(window, cx);
-                            }
-                            Some(MigrationType::Settings) => {
-                                cx.background_spawn(write_settings_migration(fs.clone()))
-                                    .detach_and_notify_err(window, cx);
-                            }
-                            None => unreachable!(),
-                        }
-                    },
-                ),
-            )
-            .into_any_element()
-    }
-}
-
-async fn should_migrate_keymap(fs: Arc<dyn Fs>) -> Result<bool> {
-    let old_text = KeymapFile::load_keymap_file(&fs).await?;
-    if let Ok(Some(_)) = migrate_keymap(&old_text) {
-        return Ok(true);
-    };
-    Ok(false)
-}
-
-async fn should_migrate_settings(fs: Arc<dyn Fs>) -> Result<bool> {
-    let old_text = SettingsStore::load_settings(&fs).await?;
-    if let Ok(Some(_)) = migrate_settings(&old_text) {
-        return Ok(true);
-    };
-    Ok(false)
-}
-
-async fn write_keymap_migration(fs: Arc<dyn Fs>) -> Result<()> {
-    let old_text = KeymapFile::load_keymap_file(&fs).await?;
-    let Ok(Some(new_text)) = migrate_keymap(&old_text) else {
-        return Ok(());
-    };
-    let keymap_path = paths::keymap_file().as_path();
-    if fs.is_file(keymap_path).await {
-        fs.atomic_write(paths::keymap_backup_file().to_path_buf(), old_text)
-            .await
-            .with_context(|| "Failed to create settings backup in home directory".to_string())?;
-        let resolved_path = fs
-            .canonicalize(keymap_path)
-            .await
-            .with_context(|| format!("Failed to canonicalize keymap path {:?}", keymap_path))?;
-        fs.atomic_write(resolved_path.clone(), new_text)
-            .await
-            .with_context(|| format!("Failed to write keymap to file {:?}", resolved_path))?;
-    } else {
-        fs.atomic_write(keymap_path.to_path_buf(), new_text)
-            .await
-            .with_context(|| format!("Failed to write keymap to file {:?}", keymap_path))?;
-    }
-    Ok(())
-}
-
-async fn write_settings_migration(fs: Arc<dyn Fs>) -> Result<()> {
-    let old_text = SettingsStore::load_settings(&fs).await?;
-    let Ok(Some(new_text)) = migrate_settings(&old_text) else {
-        return Ok(());
-    };
-    let settings_path = paths::settings_file().as_path();
-    if fs.is_file(settings_path).await {
-        fs.atomic_write(paths::settings_backup_file().to_path_buf(), old_text)
-            .await
-            .with_context(|| "Failed to create settings backup in home directory".to_string())?;
-        let resolved_path = fs
-            .canonicalize(settings_path)
-            .await
-            .with_context(|| format!("Failed to canonicalize settings path {:?}", settings_path))?;
-        fs.atomic_write(resolved_path.clone(), new_text)
-            .await
-            .with_context(|| format!("Failed to write settings to file {:?}", resolved_path))?;
-    } else {
-        fs.atomic_write(settings_path.to_path_buf(), new_text)
-            .await
-            .with_context(|| format!("Failed to write settings to file {:?}", settings_path))?;
-    }
-    Ok(())
-}
diff --git a/crates/zed/src/zed/open_listener.rs b/crates/zed/src/zed/open_listener.rs
deleted file mode 100644
index 5e855aa5a9..0000000000
--- a/crates/zed/src/zed/open_listener.rs
+++ /dev/null
@@ -1,932 +0,0 @@
-use crate::handle_open_request;
-use crate::restorable_workspace_locations;
-use anyhow::{Context as _, Result, anyhow};
-use cli::{CliRequest, CliResponse, ipc::IpcSender};
-use cli::{IpcHandshake, ipc};
-use client::parse_zed_link;
-use collections::HashMap;
-use db::kvp::KEY_VALUE_STORE;
-use editor::Editor;
-use fs::Fs;
-use futures::channel::mpsc::{UnboundedReceiver, UnboundedSender};
-use futures::channel::{mpsc, oneshot};
-use futures::future::join_all;
-use futures::{FutureExt, SinkExt, StreamExt};
-use git_ui::file_diff_view::FileDiffView;
-use gpui::{App, AsyncApp, Global, WindowHandle};
-use language::Point;
-use onboarding::FIRST_OPEN;
-use onboarding::show_onboarding_view;
-use recent_projects::{SshSettings, open_remote_project};
-use remote::{RemoteConnectionOptions, WslConnectionOptions};
-use settings::Settings;
-use std::path::{Path, PathBuf};
-use std::sync::Arc;
-use std::thread;
-use std::time::Duration;
-use util::ResultExt;
-use util::paths::PathWithPosition;
-use workspace::PathList;
-use workspace::item::ItemHandle;
-use workspace::{AppState, OpenOptions, SerializedWorkspaceLocation, Workspace};
-
-#[derive(Default, Debug)]
-pub struct OpenRequest {
-    pub kind: Option<OpenRequestKind>,
-    pub open_paths: Vec<String>,
-    pub diff_paths: Vec<[String; 2]>,
-    pub open_channel_notes: Vec<(u64, Option<String>)>,
-    pub join_channel: Option<u64>,
-    pub remote_connection: Option<RemoteConnectionOptions>,
-}
-
-#[derive(Debug)]
-pub enum OpenRequestKind {
-    CliConnection((mpsc::Receiver<CliRequest>, IpcSender<CliResponse>)),
-    Extension {
-        extension_id: String,
-    },
-    AgentPanel,
-    DockMenuAction {
-        index: usize,
-    },
-    BuiltinJsonSchema {
-        schema_path: String,
-    },
-    Setting {
-        /// `None` opens settings without navigating to a specific path.
-        setting_path: Option<String>,
-    },
-}
-
-impl OpenRequest {
-    pub fn parse(request: RawOpenRequest, cx: &App) -> Result<Self> {
-        let mut this = Self::default();
-
-        this.diff_paths = request.diff_paths;
-        if let Some(wsl) = request.wsl {
-            let (user, distro_name) = if let Some((user, distro)) = wsl.split_once('@') {
-                if user.is_empty() {
-                    anyhow::bail!("user is empty in wsl argument");
-                }
-                (Some(user.to_string()), distro.to_string())
-            } else {
-                (None, wsl)
-            };
-            this.remote_connection = Some(RemoteConnectionOptions::Wsl(WslConnectionOptions {
-                distro_name,
-                user,
-            }));
-        }
-
-        for url in request.urls {
-            if let Some(server_name) = url.strip_prefix("zed-cli://") {
-                this.kind = Some(OpenRequestKind::CliConnection(connect_to_cli(server_name)?));
-            } else if let Some(action_index) = url.strip_prefix("zed-dock-action://") {
-                this.kind = Some(OpenRequestKind::DockMenuAction {
-                    index: action_index.parse()?,
-                });
-            } else if let Some(file) = url.strip_prefix("file://") {
-                this.parse_file_path(file)
-            } else if let Some(file) = url.strip_prefix("zed://file") {
-                this.parse_file_path(file)
-            } else if let Some(file) = url.strip_prefix("zed://ssh") {
-                let ssh_url = "ssh:/".to_string() + file;
-                this.parse_ssh_file_path(&ssh_url, cx)?
-            } else if let Some(extension_id) = url.strip_prefix("zed://extension/") {
-                this.kind = Some(OpenRequestKind::Extension {
-                    extension_id: extension_id.to_string(),
-                });
-            } else if url == "zed://agent" {
-                this.kind = Some(OpenRequestKind::AgentPanel);
-            } else if let Some(schema_path) = url.strip_prefix("zed://schemas/") {
-                this.kind = Some(OpenRequestKind::BuiltinJsonSchema {
-                    schema_path: schema_path.to_string(),
-                });
-            } else if url == "zed://settings" || url == "zed://settings/" {
-                this.kind = Some(OpenRequestKind::Setting { setting_path: None });
-            } else if let Some(setting_path) = url.strip_prefix("zed://settings/") {
-                this.kind = Some(OpenRequestKind::Setting {
-                    setting_path: Some(setting_path.to_string()),
-                });
-            } else if url.starts_with("ssh://") {
-                this.parse_ssh_file_path(&url, cx)?
-            } else if let Some(request_path) = parse_zed_link(&url, cx) {
-                this.parse_request_path(request_path).log_err();
-            } else {
-                log::error!("unhandled url: {}", url);
-            }
-        }
-
-        Ok(this)
-    }
-
-    fn parse_file_path(&mut self, file: &str) {
-        if let Some(decoded) = urlencoding::decode(file).log_err() {
-            self.open_paths.push(decoded.into_owned())
-        }
-    }
-
-    fn parse_ssh_file_path(&mut self, file: &str, cx: &App) -> Result<()> {
-        let url = url::Url::parse(file)?;
-        let host = url
-            .host()
-            .with_context(|| format!("missing host in ssh url: {file}"))?
-            .to_string();
-        let username = Some(url.username().to_string()).filter(|s| !s.is_empty());
-        let port = url.port();
-        anyhow::ensure!(
-            self.open_paths.is_empty(),
-            "cannot open both local and ssh paths"
-        );
-        let mut connection_options =
-            SshSettings::get_global(cx).connection_options_for(host, port, username);
-        if let Some(password) = url.password() {
-            connection_options.password = Some(password.to_string());
-        }
-
-        let connection_options = RemoteConnectionOptions::Ssh(connection_options);
-        if let Some(ssh_connection) = &self.remote_connection {
-            anyhow::ensure!(
-                *ssh_connection == connection_options,
-                "cannot open multiple different remote connections"
-            );
-        }
-        self.remote_connection = Some(connection_options);
-        self.parse_file_path(url.path());
-        Ok(())
-    }
-
-    fn parse_request_path(&mut self, request_path: &str) -> Result<()> {
-        let mut parts = request_path.split('/');
-        if parts.next() == Some("channel")
-            && let Some(slug) = parts.next()
-            && let Some(id_str) = slug.split('-').next_back()
-            && let Ok(channel_id) = id_str.parse::<u64>()
-        {
-            let Some(next) = parts.next() else {
-                self.join_channel = Some(channel_id);
-                return Ok(());
-            };
-
-            if let Some(heading) = next.strip_prefix("notes#") {
-                self.open_channel_notes
-                    .push((channel_id, Some(heading.to_string())));
-                return Ok(());
-            }
-            if next == "notes" {
-                self.open_channel_notes.push((channel_id, None));
-                return Ok(());
-            }
-        }
-        anyhow::bail!("invalid zed url: {request_path}")
-    }
-}
-
-#[derive(Clone)]
-pub struct OpenListener(UnboundedSender<RawOpenRequest>);
-
-#[derive(Default)]
-pub struct RawOpenRequest {
-    pub urls: Vec<String>,
-    pub diff_paths: Vec<[String; 2]>,
-    pub wsl: Option<String>,
-}
-
-impl Global for OpenListener {}
-
-impl OpenListener {
-    pub fn new() -> (Self, UnboundedReceiver<RawOpenRequest>) {
-        let (tx, rx) = mpsc::unbounded();
-        (OpenListener(tx), rx)
-    }
-
-    pub fn open(&self, request: RawOpenRequest) {
-        self.0
-            .unbounded_send(request)
-            .context("no listener for open requests")
-            .log_err();
-    }
-}
-
-#[cfg(any(target_os = "linux", target_os = "freebsd"))]
-pub fn listen_for_cli_connections(opener: OpenListener) -> Result<()> {
-    use release_channel::RELEASE_CHANNEL_NAME;
-    use std::os::unix::net::UnixDatagram;
-
-    let sock_path = paths::data_dir().join(format!("zed-{}.sock", *RELEASE_CHANNEL_NAME));
-    // remove the socket if the process listening on it has died
-    if let Err(e) = UnixDatagram::unbound()?.connect(&sock_path)
-        && e.kind() == std::io::ErrorKind::ConnectionRefused
-    {
-        std::fs::remove_file(&sock_path)?;
-    }
-    let listener = UnixDatagram::bind(&sock_path)?;
-    thread::spawn(move || {
-        let mut buf = [0u8; 1024];
-        while let Ok(len) = listener.recv(&mut buf) {
-            opener.open(RawOpenRequest {
-                urls: vec![String::from_utf8_lossy(&buf[..len]).to_string()],
-                ..Default::default()
-            });
-        }
-    });
-    Ok(())
-}
-
-fn connect_to_cli(
-    server_name: &str,
-) -> Result<(mpsc::Receiver<CliRequest>, IpcSender<CliResponse>)> {
-    let handshake_tx = cli::ipc::IpcSender::<IpcHandshake>::connect(server_name.to_string())
-        .context("error connecting to cli")?;
-    let (request_tx, request_rx) = ipc::channel::<CliRequest>()?;
-    let (response_tx, response_rx) = ipc::channel::<CliResponse>()?;
-
-    handshake_tx
-        .send(IpcHandshake {
-            requests: request_tx,
-            responses: response_rx,
-        })
-        .context("error sending ipc handshake")?;
-
-    let (mut async_request_tx, async_request_rx) =
-        futures::channel::mpsc::channel::<CliRequest>(16);
-    thread::spawn(move || {
-        while let Ok(cli_request) = request_rx.recv() {
-            if smol::block_on(async_request_tx.send(cli_request)).is_err() {
-                break;
-            }
-        }
-        anyhow::Ok(())
-    });
-
-    Ok((async_request_rx, response_tx))
-}
-
-pub async fn open_paths_with_positions(
-    path_positions: &[PathWithPosition],
-    diff_paths: &[[String; 2]],
-    app_state: Arc<AppState>,
-    open_options: workspace::OpenOptions,
-    cx: &mut AsyncApp,
-) -> Result<(
-    WindowHandle<Workspace>,
-    Vec<Option<Result<Box<dyn ItemHandle>>>>,
-)> {
-    let mut caret_positions = HashMap::default();
-
-    let paths = path_positions
-        .iter()
-        .map(|path_with_position| {
-            let path = path_with_position.path.clone();
-            if let Some(row) = path_with_position.row
-                && path.is_file()
-            {
-                let row = row.saturating_sub(1);
-                let col = path_with_position.column.unwrap_or(0).saturating_sub(1);
-                caret_positions.insert(path.clone(), Point::new(row, col));
-            }
-            path
-        })
-        .collect::<Vec<_>>();
-
-    let (workspace, mut items) = cx
-        .update(|cx| workspace::open_paths(&paths, app_state, open_options, cx))?
-        .await?;
-
-    for diff_pair in diff_paths {
-        let old_path = Path::new(&diff_pair[0]).canonicalize()?;
-        let new_path = Path::new(&diff_pair[1]).canonicalize()?;
-        if let Ok(diff_view) = workspace.update(cx, |workspace, window, cx| {
-            FileDiffView::open(old_path, new_path, workspace, window, cx)
-        }) && let Some(diff_view) = diff_view.await.log_err()
-        {
-            items.push(Some(Ok(Box::new(diff_view))))
-        }
-    }
-
-    for (item, path) in items.iter_mut().zip(&paths) {
-        if let Some(Err(error)) = item {
-            *error = anyhow!("error opening {path:?}: {error}");
-            continue;
-        }
-        let Some(Ok(item)) = item else {
-            continue;
-        };
-        let Some(point) = caret_positions.remove(path) else {
-            continue;
-        };
-        if let Some(active_editor) = item.downcast::<Editor>() {
-            workspace
-                .update(cx, |_, window, cx| {
-                    active_editor.update(cx, |editor, cx| {
-                        editor.go_to_singleton_buffer_point(point, window, cx);
-                    });
-                })
-                .log_err();
-        }
-    }
-
-    Ok((workspace, items))
-}
-
-pub async fn handle_cli_connection(
-    (mut requests, responses): (mpsc::Receiver<CliRequest>, IpcSender<CliResponse>),
-    app_state: Arc<AppState>,
-    cx: &mut AsyncApp,
-) {
-    if let Some(request) = requests.next().await {
-        match request {
-            CliRequest::Open {
-                urls,
-                paths,
-                diff_paths,
-                wait,
-                wsl,
-                open_new_workspace,
-                reuse,
-                env,
-                user_data_dir: _,
-            } => {
-                if !urls.is_empty() {
-                    cx.update(|cx| {
-                        match OpenRequest::parse(
-                            RawOpenRequest {
-                                urls,
-                                diff_paths,
-                                wsl,
-                            },
-                            cx,
-                        ) {
-                            Ok(open_request) => {
-                                handle_open_request(open_request, app_state.clone(), cx);
-                                responses.send(CliResponse::Exit { status: 0 }).log_err();
-                            }
-                            Err(e) => {
-                                responses
-                                    .send(CliResponse::Stderr {
-                                        message: format!("{e}"),
-                                    })
-                                    .log_err();
-                                responses.send(CliResponse::Exit { status: 1 }).log_err();
-                            }
-                        };
-                    })
-                    .log_err();
-                    return;
-                }
-
-                let open_workspace_result = open_workspaces(
-                    paths,
-                    diff_paths,
-                    open_new_workspace,
-                    reuse,
-                    &responses,
-                    wait,
-                    app_state.clone(),
-                    env,
-                    cx,
-                )
-                .await;
-
-                let status = if open_workspace_result.is_err() { 1 } else { 0 };
-                responses.send(CliResponse::Exit { status }).log_err();
-            }
-        }
-    }
-}
-
-async fn open_workspaces(
-    paths: Vec<String>,
-    diff_paths: Vec<[String; 2]>,
-    open_new_workspace: Option<bool>,
-    reuse: bool,
-    responses: &IpcSender<CliResponse>,
-    wait: bool,
-    app_state: Arc<AppState>,
-    env: Option<collections::HashMap<String, String>>,
-    cx: &mut AsyncApp,
-) -> Result<()> {
-    let grouped_locations = if paths.is_empty() && diff_paths.is_empty() {
-        // If no paths are provided, restore from previous workspaces unless a new workspace is requested with -n
-        if open_new_workspace == Some(true) {
-            Vec::new()
-        } else {
-            restorable_workspace_locations(cx, &app_state)
-                .await
-                .unwrap_or_default()
-        }
-    } else {
-        vec![(
-            SerializedWorkspaceLocation::Local,
-            PathList::new(&paths.into_iter().map(PathBuf::from).collect::<Vec<_>>()),
-        )]
-    };
-
-    if grouped_locations.is_empty() {
-        // If we have no paths to open, show the welcome screen if this is the first launch
-        if matches!(KEY_VALUE_STORE.read_kvp(FIRST_OPEN), Ok(None)) {
-            cx.update(|cx| show_onboarding_view(app_state, cx).detach())
-                .log_err();
-        }
-        // If not the first launch, show an empty window with empty editor
-        else {
-            cx.update(|cx| {
-                let open_options = OpenOptions {
-                    env,
-                    ..Default::default()
-                };
-                workspace::open_new(open_options, app_state, cx, |workspace, window, cx| {
-                    Editor::new_file(workspace, &Default::default(), window, cx)
-                })
-                .detach();
-            })
-            .log_err();
-        }
-    } else {
-        // If there are paths to open, open a workspace for each grouping of paths
-        let mut errored = false;
-
-        for (location, workspace_paths) in grouped_locations {
-            match location {
-                SerializedWorkspaceLocation::Local => {
-                    let workspace_paths = workspace_paths
-                        .paths()
-                        .iter()
-                        .map(|path| path.to_string_lossy().into_owned())
-                        .collect();
-
-                    let workspace_failed_to_open = open_local_workspace(
-                        workspace_paths,
-                        diff_paths.clone(),
-                        open_new_workspace,
-                        reuse,
-                        wait,
-                        responses,
-                        env.as_ref(),
-                        &app_state,
-                        cx,
-                    )
-                    .await;
-
-                    if workspace_failed_to_open {
-                        errored = true
-                    }
-                }
-                SerializedWorkspaceLocation::Remote(mut connection) => {
-                    let app_state = app_state.clone();
-                    if let RemoteConnectionOptions::Ssh(options) = &mut connection {
-                        cx.update(|cx| {
-                            SshSettings::get_global(cx)
-                                .fill_connection_options_from_settings(options)
-                        })?;
-                    }
-                    cx.spawn(async move |cx| {
-                        open_remote_project(
-                            connection,
-                            workspace_paths.paths().to_vec(),
-                            app_state,
-                            OpenOptions::default(),
-                            cx,
-                        )
-                        .await
-                        .log_err();
-                    })
-                    .detach();
-                }
-            }
-        }
-
-        anyhow::ensure!(!errored, "failed to open a workspace");
-    }
-
-    Ok(())
-}
-
-async fn open_local_workspace(
-    workspace_paths: Vec<String>,
-    diff_paths: Vec<[String; 2]>,
-    open_new_workspace: Option<bool>,
-    reuse: bool,
-    wait: bool,
-    responses: &IpcSender<CliResponse>,
-    env: Option<&HashMap<String, String>>,
-    app_state: &Arc<AppState>,
-    cx: &mut AsyncApp,
-) -> bool {
-    let mut errored = false;
-
-    let paths_with_position =
-        derive_paths_with_position(app_state.fs.as_ref(), workspace_paths).await;
-
-    // Handle reuse flag by finding existing window to replace
-    let replace_window = if reuse {
-        cx.update(|cx| workspace::local_workspace_windows(cx).into_iter().next())
-            .ok()
-            .flatten()
-    } else {
-        None
-    };
-
-    // For reuse, force new workspace creation but with replace_window set
-    let effective_open_new_workspace = if reuse {
-        Some(true)
-    } else {
-        open_new_workspace
-    };
-
-    match open_paths_with_positions(
-        &paths_with_position,
-        &diff_paths,
-        app_state.clone(),
-        workspace::OpenOptions {
-            open_new_workspace: effective_open_new_workspace,
-            replace_window,
-            prefer_focused_window: wait,
-            env: env.cloned(),
-            ..Default::default()
-        },
-        cx,
-    )
-    .await
-    {
-        Ok((workspace, items)) => {
-            let mut item_release_futures = Vec::new();
-
-            for item in items {
-                match item {
-                    Some(Ok(item)) => {
-                        cx.update(|cx| {
-                            let released = oneshot::channel();
-                            item.on_release(
-                                cx,
-                                Box::new(move |_| {
-                                    let _ = released.0.send(());
-                                }),
-                            )
-                            .detach();
-                            item_release_futures.push(released.1);
-                        })
-                        .log_err();
-                    }
-                    Some(Err(err)) => {
-                        responses
-                            .send(CliResponse::Stderr {
-                                message: err.to_string(),
-                            })
-                            .log_err();
-                        errored = true;
-                    }
-                    None => {}
-                }
-            }
-
-            if wait {
-                let background = cx.background_executor().clone();
-                let wait = async move {
-                    if paths_with_position.is_empty() && diff_paths.is_empty() {
-                        let (done_tx, done_rx) = oneshot::channel();
-                        let _subscription = workspace.update(cx, |_, _, cx| {
-                            cx.on_release(move |_, _| {
-                                let _ = done_tx.send(());
-                            })
-                        });
-                        let _ = done_rx.await;
-                    } else {
-                        let _ = futures::future::try_join_all(item_release_futures).await;
-                    };
-                }
-                .fuse();
-
-                futures::pin_mut!(wait);
-
-                loop {
-                    // Repeatedly check if CLI is still open to avoid wasting resources
-                    // waiting for files or workspaces to close.
-                    let mut timer = background.timer(Duration::from_secs(1)).fuse();
-                    futures::select_biased! {
-                        _ = wait => break,
-                        _ = timer => {
-                            if responses.send(CliResponse::Ping).is_err() {
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        Err(error) => {
-            errored = true;
-            responses
-                .send(CliResponse::Stderr {
-                    message: format!("error opening {paths_with_position:?}: {error}"),
-                })
-                .log_err();
-        }
-    }
-    errored
-}
-
-pub async fn derive_paths_with_position(
-    fs: &dyn Fs,
-    path_strings: impl IntoIterator<Item = impl AsRef<str>>,
-) -> Vec<PathWithPosition> {
-    join_all(path_strings.into_iter().map(|path_str| async move {
-        let canonicalized = fs.canonicalize(Path::new(path_str.as_ref())).await;
-        (path_str, canonicalized)
-    }))
-    .await
-    .into_iter()
-    .map(|(original, canonicalized)| match canonicalized {
-        Ok(canonicalized) => PathWithPosition::from_path(canonicalized),
-        Err(_) => PathWithPosition::parse_str(original.as_ref()),
-    })
-    .collect()
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::zed::{open_listener::open_local_workspace, tests::init_test};
-    use cli::{
-        CliResponse,
-        ipc::{self},
-    };
-    use editor::Editor;
-    use gpui::TestAppContext;
-    use language::LineEnding;
-    use remote::SshConnectionOptions;
-    use rope::Rope;
-    use serde_json::json;
-    use std::sync::Arc;
-    use util::path;
-    use workspace::{AppState, Workspace};
-
-    #[gpui::test]
-    fn test_parse_ssh_url(cx: &mut TestAppContext) {
-        let _app_state = init_test(cx);
-        let request = cx.update(|cx| {
-            OpenRequest::parse(
-                RawOpenRequest {
-                    urls: vec!["ssh://me@localhost:/".into()],
-                    ..Default::default()
-                },
-                cx,
-            )
-            .unwrap()
-        });
-        assert_eq!(
-            request.remote_connection.unwrap(),
-            RemoteConnectionOptions::Ssh(SshConnectionOptions {
-                host: "localhost".into(),
-                username: Some("me".into()),
-                port: None,
-                password: None,
-                args: None,
-                port_forwards: None,
-                nickname: None,
-                upload_binary_over_ssh: false,
-            })
-        );
-        assert_eq!(request.open_paths, vec!["/"]);
-    }
-
-    #[gpui::test]
-    async fn test_open_workspace_with_directory(cx: &mut TestAppContext) {
-        let app_state = init_test(cx);
-
-        app_state
-            .fs
-            .as_fake()
-            .insert_tree(
-                path!("/root"),
-                json!({
-                    "dir1": {
-                        "file1.txt": "content1",
-                        "file2.txt": "content2",
-                    },
-                }),
-            )
-            .await;
-
-        assert_eq!(cx.windows().len(), 0);
-
-        // First open the workspace directory
-        open_workspace_file(path!("/root/dir1"), None, app_state.clone(), cx).await;
-
-        assert_eq!(cx.windows().len(), 1);
-        let workspace = cx.windows()[0].downcast::<Workspace>().unwrap();
-        workspace
-            .update(cx, |workspace, _, cx| {
-                assert!(workspace.active_item_as::<Editor>(cx).is_none())
-            })
-            .unwrap();
-
-        // Now open a file inside that workspace
-        open_workspace_file(path!("/root/dir1/file1.txt"), None, app_state.clone(), cx).await;
-
-        assert_eq!(cx.windows().len(), 1);
-        workspace
-            .update(cx, |workspace, _, cx| {
-                assert!(workspace.active_item_as::<Editor>(cx).is_some());
-            })
-            .unwrap();
-
-        // Now open a file inside that workspace, but tell Zed to open a new window
-        open_workspace_file(
-            path!("/root/dir1/file1.txt"),
-            Some(true),
-            app_state.clone(),
-            cx,
-        )
-        .await;
-
-        assert_eq!(cx.windows().len(), 2);
-
-        let workspace_2 = cx.windows()[1].downcast::<Workspace>().unwrap();
-        workspace_2
-            .update(cx, |workspace, _, cx| {
-                assert!(workspace.active_item_as::<Editor>(cx).is_some());
-                let items = workspace.items(cx).collect::<Vec<_>>();
-                assert_eq!(items.len(), 1, "Workspace should have two items");
-            })
-            .unwrap();
-    }
-
-    #[gpui::test]
-    async fn test_open_workspace_with_nonexistent_files(cx: &mut TestAppContext) {
-        let app_state = init_test(cx);
-
-        app_state
-            .fs
-            .as_fake()
-            .insert_tree(path!("/root"), json!({}))
-            .await;
-
-        assert_eq!(cx.windows().len(), 0);
-
-        // Test case 1: Open a single file that does not exist yet
-        open_workspace_file(path!("/root/file5.txt"), None, app_state.clone(), cx).await;
-
-        assert_eq!(cx.windows().len(), 1);
-        let workspace_1 = cx.windows()[0].downcast::<Workspace>().unwrap();
-        workspace_1
-            .update(cx, |workspace, _, cx| {
-                assert!(workspace.active_item_as::<Editor>(cx).is_some())
-            })
-            .unwrap();
-
-        // Test case 2: Open a single file that does not exist yet,
-        // but tell Zed to add it to the current workspace
-        open_workspace_file(path!("/root/file6.txt"), Some(false), app_state.clone(), cx).await;
-
-        assert_eq!(cx.windows().len(), 1);
-        workspace_1
-            .update(cx, |workspace, _, cx| {
-                let items = workspace.items(cx).collect::<Vec<_>>();
-                assert_eq!(items.len(), 2, "Workspace should have two items");
-            })
-            .unwrap();
-
-        // Test case 3: Open a single file that does not exist yet,
-        // but tell Zed to NOT add it to the current workspace
-        open_workspace_file(path!("/root/file7.txt"), Some(true), app_state.clone(), cx).await;
-
-        assert_eq!(cx.windows().len(), 2);
-        let workspace_2 = cx.windows()[1].downcast::<Workspace>().unwrap();
-        workspace_2
-            .update(cx, |workspace, _, cx| {
-                let items = workspace.items(cx).collect::<Vec<_>>();
-                assert_eq!(items.len(), 1, "Workspace should have two items");
-            })
-            .unwrap();
-    }
-
-    async fn open_workspace_file(
-        path: &str,
-        open_new_workspace: Option<bool>,
-        app_state: Arc<AppState>,
-        cx: &TestAppContext,
-    ) {
-        let (response_tx, _) = ipc::channel::<CliResponse>().unwrap();
-
-        let workspace_paths = vec![path.to_owned()];
-
-        let errored = cx
-            .spawn(|mut cx| async move {
-                open_local_workspace(
-                    workspace_paths,
-                    vec![],
-                    open_new_workspace,
-                    false,
-                    false,
-                    &response_tx,
-                    None,
-                    &app_state,
-                    &mut cx,
-                )
-                .await
-            })
-            .await;
-
-        assert!(!errored);
-    }
-
-    #[gpui::test]
-    async fn test_reuse_flag_functionality(cx: &mut TestAppContext) {
-        let app_state = init_test(cx);
-
-        let root_dir = if cfg!(windows) { "C:\\root" } else { "/root" };
-        let file1_path = if cfg!(windows) {
-            "C:\\root\\file1.txt"
-        } else {
-            "/root/file1.txt"
-        };
-        let file2_path = if cfg!(windows) {
-            "C:\\root\\file2.txt"
-        } else {
-            "/root/file2.txt"
-        };
-
-        app_state.fs.create_dir(Path::new(root_dir)).await.unwrap();
-        app_state
-            .fs
-            .create_file(Path::new(file1_path), Default::default())
-            .await
-            .unwrap();
-        app_state
-            .fs
-            .save(
-                Path::new(file1_path),
-                &Rope::from("content1"),
-                LineEnding::Unix,
-            )
-            .await
-            .unwrap();
-        app_state
-            .fs
-            .create_file(Path::new(file2_path), Default::default())
-            .await
-            .unwrap();
-        app_state
-            .fs
-            .save(
-                Path::new(file2_path),
-                &Rope::from("content2"),
-                LineEnding::Unix,
-            )
-            .await
-            .unwrap();
-
-        // First, open a workspace normally
-        let (response_tx, _response_rx) = ipc::channel::<CliResponse>().unwrap();
-        let workspace_paths = vec![file1_path.to_string()];
-
-        let _errored = cx
-            .spawn({
-                let app_state = app_state.clone();
-                let response_tx = response_tx.clone();
-                |mut cx| async move {
-                    open_local_workspace(
-                        workspace_paths,
-                        vec![],
-                        None,
-                        false,
-                        false,
-                        &response_tx,
-                        None,
-                        &app_state,
-                        &mut cx,
-                    )
-                    .await
-                }
-            })
-            .await;
-
-        // Now test the reuse functionality - should replace the existing workspace
-        let workspace_paths_reuse = vec![file1_path.to_string()];
-
-        let errored_reuse = cx
-            .spawn({
-                let app_state = app_state.clone();
-                let response_tx = response_tx.clone();
-                |mut cx| async move {
-                    open_local_workspace(
-                        workspace_paths_reuse,
-                        vec![],
-                        None, // open_new_workspace will be overridden by reuse logic
-                        true, // reuse = true
-                        false,
-                        &response_tx,
-                        None,
-                        &app_state,
-                        &mut cx,
-                    )
-                    .await
-                }
-            })
-            .await;
-
-        assert!(!errored_reuse);
-    }
-}
diff --git a/crates/zed/src/zed/quick_action_bar.rs b/crates/zed/src/zed/quick_action_bar.rs
deleted file mode 100644
index 2a52cc6972..0000000000
--- a/crates/zed/src/zed/quick_action_bar.rs
+++ /dev/null
@@ -1,730 +0,0 @@
-mod preview;
-mod repl_menu;
-
-use agent_settings::AgentSettings;
-use editor::actions::{
-    AddSelectionAbove, AddSelectionBelow, CodeActionSource, DuplicateLineDown, GoToDiagnostic,
-    GoToHunk, GoToPreviousDiagnostic, GoToPreviousHunk, MoveLineDown, MoveLineUp, SelectAll,
-    SelectLargerSyntaxNode, SelectNext, SelectSmallerSyntaxNode, ToggleCodeActions,
-    ToggleDiagnostics, ToggleGoToLine, ToggleInlineDiagnostics,
-};
-use editor::code_context_menus::{CodeContextMenu, ContextMenuOrigin};
-use editor::{Editor, EditorSettings};
-use gpui::{
-    Action, AnchoredPositionMode, ClickEvent, Context, Corner, ElementId, Entity, EventEmitter,
-    FocusHandle, Focusable, InteractiveElement, ParentElement, Render, Styled, Subscription,
-    WeakEntity, Window, anchored, deferred, point,
-};
-use project::{DisableAiSettings, project_settings::DiagnosticSeverity};
-use search::{BufferSearchBar, buffer_search};
-use settings::{Settings, SettingsStore};
-use ui::{
-    ButtonStyle, ContextMenu, ContextMenuEntry, DocumentationEdge, DocumentationSide, IconButton,
-    IconName, IconSize, PopoverMenu, PopoverMenuHandle, Tooltip, prelude::*,
-};
-use vim_mode_setting::{HelixModeSetting, VimModeSetting};
-use workspace::item::ItemBufferKind;
-use workspace::{
-    ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView, Workspace, item::ItemHandle,
-};
-use zed_actions::{agent::AddSelectionToThread, assistant::InlineAssist, outline::ToggleOutline};
-
-const MAX_CODE_ACTION_MENU_LINES: u32 = 16;
-
-pub struct QuickActionBar {
-    _inlay_hints_enabled_subscription: Option<Subscription>,
-    _ai_settings_subscription: Subscription,
-    active_item: Option<Box<dyn ItemHandle>>,
-    buffer_search_bar: Entity<BufferSearchBar>,
-    show: bool,
-    toggle_selections_handle: PopoverMenuHandle<ContextMenu>,
-    toggle_settings_handle: PopoverMenuHandle<ContextMenu>,
-    workspace: WeakEntity<Workspace>,
-}
-
-impl QuickActionBar {
-    pub fn new(
-        buffer_search_bar: Entity<BufferSearchBar>,
-        workspace: &Workspace,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let mut was_agent_enabled = AgentSettings::get_global(cx).enabled(cx);
-        let mut was_agent_button = AgentSettings::get_global(cx).button;
-
-        let ai_settings_subscription = cx.observe_global::<SettingsStore>(move |_, cx| {
-            let agent_settings = AgentSettings::get_global(cx);
-            let is_agent_enabled = agent_settings.enabled(cx);
-
-            if was_agent_enabled != is_agent_enabled || was_agent_button != agent_settings.button {
-                was_agent_enabled = is_agent_enabled;
-                was_agent_button = agent_settings.button;
-                cx.notify();
-            }
-        });
-
-        let mut this = Self {
-            _inlay_hints_enabled_subscription: None,
-            _ai_settings_subscription: ai_settings_subscription,
-            active_item: None,
-            buffer_search_bar,
-            show: true,
-            toggle_selections_handle: Default::default(),
-            toggle_settings_handle: Default::default(),
-            workspace: workspace.weak_handle(),
-        };
-        this.apply_settings(cx);
-        cx.observe_global::<SettingsStore>(|this, cx| this.apply_settings(cx))
-            .detach();
-        this
-    }
-
-    fn active_editor(&self) -> Option<Entity<Editor>> {
-        self.active_item
-            .as_ref()
-            .and_then(|item| item.downcast::<Editor>())
-    }
-
-    fn apply_settings(&mut self, cx: &mut Context<Self>) {
-        let new_show = EditorSettings::get_global(cx).toolbar.quick_actions;
-        if new_show != self.show {
-            self.show = new_show;
-            cx.emit(ToolbarItemEvent::ChangeLocation(
-                self.get_toolbar_item_location(),
-            ));
-        }
-    }
-
-    fn get_toolbar_item_location(&self) -> ToolbarItemLocation {
-        if self.show && self.active_editor().is_some() {
-            ToolbarItemLocation::PrimaryRight
-        } else {
-            ToolbarItemLocation::Hidden
-        }
-    }
-}
-
-impl Render for QuickActionBar {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let Some(editor) = self.active_editor() else {
-            return div().id("empty quick action bar");
-        };
-
-        let supports_inlay_hints = editor.update(cx, |editor, cx| editor.supports_inlay_hints(cx));
-        let editor_value = editor.read(cx);
-        let selection_menu_enabled = editor_value.selection_menu_enabled(cx);
-        let inlay_hints_enabled = editor_value.inlay_hints_enabled();
-        let inline_values_enabled = editor_value.inline_values_enabled();
-        let supports_diagnostics = editor_value.mode().is_full();
-        let diagnostics_enabled = editor_value.diagnostics_max_severity != DiagnosticSeverity::Off;
-        let supports_inline_diagnostics = editor_value.inline_diagnostics_enabled();
-        let inline_diagnostics_enabled = editor_value.show_inline_diagnostics();
-        let git_blame_inline_enabled = editor_value.git_blame_inline_enabled();
-        let show_git_blame_gutter = editor_value.show_git_blame_gutter();
-        let auto_signature_help_enabled = editor_value.auto_signature_help_enabled(cx);
-        let show_line_numbers = editor_value.line_numbers_enabled(cx);
-        let has_edit_prediction_provider = editor_value.edit_prediction_provider().is_some();
-        let show_edit_predictions = editor_value.edit_predictions_enabled();
-        let edit_predictions_enabled_at_cursor =
-            editor_value.edit_predictions_enabled_at_cursor(cx);
-        let supports_minimap = editor_value.supports_minimap(cx);
-        let minimap_enabled = supports_minimap && editor_value.minimap().is_some();
-        let has_available_code_actions = editor_value.has_available_code_actions();
-        let code_action_enabled = editor_value.code_actions_enabled_for_toolbar(cx);
-        let focus_handle = editor_value.focus_handle(cx);
-
-        let search_button = (editor.buffer_kind(cx) == ItemBufferKind::Singleton).then(|| {
-            QuickActionBarButton::new(
-                "toggle buffer search",
-                search::SEARCH_ICON,
-                !self.buffer_search_bar.read(cx).is_dismissed(),
-                Box::new(buffer_search::Deploy::find()),
-                focus_handle.clone(),
-                "Buffer Search",
-                {
-                    let buffer_search_bar = self.buffer_search_bar.clone();
-                    move |_, window, cx| {
-                        buffer_search_bar.update(cx, |search_bar, cx| {
-                            search_bar.toggle(&buffer_search::Deploy::find(), window, cx)
-                        });
-                    }
-                },
-            )
-        });
-
-        let assistant_button = QuickActionBarButton::new(
-            "toggle inline assistant",
-            IconName::ZedAssistant,
-            false,
-            Box::new(InlineAssist::default()),
-            focus_handle,
-            "Inline Assist",
-            move |_, window, cx| {
-                window.dispatch_action(Box::new(InlineAssist::default()), cx);
-            },
-        );
-
-        let code_actions_dropdown = code_action_enabled.then(|| {
-            let focus = editor.focus_handle(cx);
-            let is_deployed = {
-                let menu_ref = editor.read(cx).context_menu().borrow();
-                let code_action_menu = menu_ref
-                    .as_ref()
-                    .filter(|menu| matches!(menu, CodeContextMenu::CodeActions(..)));
-                code_action_menu
-                    .as_ref()
-                    .is_some_and(|menu| matches!(menu.origin(), ContextMenuOrigin::QuickActionBar))
-            };
-            let code_action_element = is_deployed
-                .then(|| {
-                    editor.update(cx, |editor, cx| {
-                        editor.render_context_menu(MAX_CODE_ACTION_MENU_LINES, window, cx)
-                    })
-                })
-                .flatten();
-            v_flex()
-                .child(
-                    IconButton::new("toggle_code_actions_icon", IconName::BoltOutlined)
-                        .icon_size(IconSize::Small)
-                        .style(ButtonStyle::Subtle)
-                        .disabled(!has_available_code_actions)
-                        .toggle_state(is_deployed)
-                        .when(!is_deployed, |this| {
-                            this.when(has_available_code_actions, |this| {
-                                this.tooltip(Tooltip::for_action_title(
-                                    "Code Actions",
-                                    &ToggleCodeActions::default(),
-                                ))
-                            })
-                            .when(
-                                !has_available_code_actions,
-                                |this| {
-                                    this.tooltip(Tooltip::for_action_title(
-                                        "No Code Actions Available",
-                                        &ToggleCodeActions::default(),
-                                    ))
-                                },
-                            )
-                        })
-                        .on_click({
-                            let focus = focus;
-                            move |_, window, cx| {
-                                focus.dispatch_action(
-                                    &ToggleCodeActions {
-                                        deployed_from: Some(CodeActionSource::QuickActionBar),
-                                        quick_launch: false,
-                                    },
-                                    window,
-                                    cx,
-                                );
-                            }
-                        }),
-                )
-                .children(code_action_element.map(|menu| {
-                    deferred(
-                        anchored()
-                            .position_mode(AnchoredPositionMode::Local)
-                            .position(point(px(20.), px(20.)))
-                            .anchor(Corner::TopRight)
-                            .child(menu),
-                    )
-                }))
-        });
-
-        let editor_selections_dropdown = selection_menu_enabled.then(|| {
-            let has_diff_hunks = editor
-                .read(cx)
-                .buffer()
-                .read(cx)
-                .snapshot(cx)
-                .has_diff_hunks();
-            let has_selection = editor.update(cx, |editor, cx| {
-                editor.has_non_empty_selection(&editor.display_snapshot(cx))
-            });
-
-            let focus = editor.focus_handle(cx);
-
-            let disable_ai = DisableAiSettings::get_global(cx).disable_ai;
-
-            PopoverMenu::new("editor-selections-dropdown")
-                .trigger_with_tooltip(
-                    IconButton::new("toggle_editor_selections_icon", IconName::CursorIBeam)
-                        .icon_size(IconSize::Small)
-                        .style(ButtonStyle::Subtle)
-                        .toggle_state(self.toggle_selections_handle.is_deployed()),
-                    Tooltip::text("Selection Controls"),
-                )
-                .with_handle(self.toggle_selections_handle.clone())
-                .anchor(Corner::TopRight)
-                .menu(move |window, cx| {
-                    let focus = focus.clone();
-                    let menu = ContextMenu::build(window, cx, move |menu, _, _| {
-                        menu.context(focus.clone())
-                            .action("Select All", Box::new(SelectAll))
-                            .action(
-                                "Select Next Occurrence",
-                                Box::new(SelectNext {
-                                    replace_newest: false,
-                                }),
-                            )
-                            .action("Expand Selection", Box::new(SelectLargerSyntaxNode))
-                            .action("Shrink Selection", Box::new(SelectSmallerSyntaxNode))
-                            .action(
-                                "Add Cursor Above",
-                                Box::new(AddSelectionAbove {
-                                    skip_soft_wrap: true,
-                                }),
-                            )
-                            .action(
-                                "Add Cursor Below",
-                                Box::new(AddSelectionBelow {
-                                    skip_soft_wrap: true,
-                                }),
-                            )
-                            .when(!disable_ai, |this| {
-                                this.separator().action_disabled_when(
-                                    !has_selection,
-                                    "Add to Agent Thread",
-                                    Box::new(AddSelectionToThread),
-                                )
-                            })
-                            .separator()
-                            .action("Go to Symbol", Box::new(ToggleOutline))
-                            .action("Go to Line/Column", Box::new(ToggleGoToLine))
-                            .separator()
-                            .action("Next Problem", Box::new(GoToDiagnostic::default()))
-                            .action(
-                                "Previous Problem",
-                                Box::new(GoToPreviousDiagnostic::default()),
-                            )
-                            .separator()
-                            .action_disabled_when(!has_diff_hunks, "Next Hunk", Box::new(GoToHunk))
-                            .action_disabled_when(
-                                !has_diff_hunks,
-                                "Previous Hunk",
-                                Box::new(GoToPreviousHunk),
-                            )
-                            .separator()
-                            .action("Move Line Up", Box::new(MoveLineUp))
-                            .action("Move Line Down", Box::new(MoveLineDown))
-                            .action("Duplicate Selection", Box::new(DuplicateLineDown))
-                    });
-                    Some(menu)
-                })
-        });
-
-        let editor_focus_handle = editor.focus_handle(cx);
-        let editor = editor.downgrade();
-        let editor_settings_dropdown = {
-            let vim_mode_enabled = VimModeSetting::get_global(cx).0;
-            let helix_mode_enabled = HelixModeSetting::get_global(cx).0;
-
-            PopoverMenu::new("editor-settings")
-                .trigger_with_tooltip(
-                    IconButton::new("toggle_editor_settings_icon", IconName::Sliders)
-                        .icon_size(IconSize::Small)
-                        .style(ButtonStyle::Subtle)
-                        .toggle_state(self.toggle_settings_handle.is_deployed()),
-                    Tooltip::text("Editor Controls"),
-                )
-                .anchor(Corner::TopRight)
-                .with_handle(self.toggle_settings_handle.clone())
-                .menu(move |window, cx| {
-                    let menu = ContextMenu::build(window, cx, {
-                        let focus_handle = editor_focus_handle.clone();
-                        |mut menu, _, _| {
-                            menu = menu.context(focus_handle);
-
-                            if supports_inlay_hints {
-                                menu = menu.toggleable_entry(
-                                    "Inlay Hints",
-                                    inlay_hints_enabled,
-                                    IconPosition::Start,
-                                    Some(editor::actions::ToggleInlayHints.boxed_clone()),
-                                    {
-                                        let editor = editor.clone();
-                                        move |window, cx| {
-                                            editor
-                                                .update(cx, |editor, cx| {
-                                                    editor.toggle_inlay_hints(
-                                                        &editor::actions::ToggleInlayHints,
-                                                        window,
-                                                        cx,
-                                                    );
-                                                })
-                                                .ok();
-                                        }
-                                    },
-                                );
-
-                                menu = menu.toggleable_entry(
-                                    "Inline Values",
-                                    inline_values_enabled,
-                                    IconPosition::Start,
-                                    Some(editor::actions::ToggleInlineValues.boxed_clone()),
-                                    {
-                                        let editor = editor.clone();
-                                        move |window, cx| {
-                                            editor
-                                                .update(cx, |editor, cx| {
-                                                    editor.toggle_inline_values(
-                                                        &editor::actions::ToggleInlineValues,
-                                                        window,
-                                                        cx,
-                                                    );
-                                                })
-                                                .ok();
-                                        }
-                                    }
-                                );
-                            }
-
-                            if supports_minimap {
-                                menu = menu.toggleable_entry("Minimap", minimap_enabled, IconPosition::Start, Some(editor::actions::ToggleMinimap.boxed_clone()), {
-                                    let editor = editor.clone();
-                                    move |window, cx| {
-                                        editor
-                                            .update(cx, |editor, cx| {
-                                                editor.toggle_minimap(
-                                                    &editor::actions::ToggleMinimap,
-                                                    window,
-                                                    cx,
-                                                );
-                                            })
-                                            .ok();
-                                    }
-                                },)
-                            }
-
-                            if has_edit_prediction_provider {
-                                let mut edit_prediction_entry = ContextMenuEntry::new("Edit Predictions")
-                                    .toggleable(IconPosition::Start, edit_predictions_enabled_at_cursor && show_edit_predictions)
-                                    .disabled(!edit_predictions_enabled_at_cursor)
-                                    .action(
-                                        editor::actions::ToggleEditPrediction.boxed_clone(),
-                                    ).handler({
-                                        let editor = editor.clone();
-                                        move |window, cx| {
-                                            editor
-                                                .update(cx, |editor, cx| {
-                                                    editor.toggle_edit_predictions(
-                                                        &editor::actions::ToggleEditPrediction,
-                                                        window,
-                                                        cx,
-                                                    );
-                                                })
-                                                .ok();
-                                        }
-                                    });
-                                if !edit_predictions_enabled_at_cursor {
-                                    edit_prediction_entry = edit_prediction_entry.documentation_aside(DocumentationSide::Left, DocumentationEdge::Top, |_| {
-                                        Label::new("You can't toggle edit predictions for this file as it is within the excluded files list.").into_any_element()
-                                    });
-                                }
-
-                                menu = menu.item(edit_prediction_entry);
-                            }
-
-                            menu = menu.separator();
-
-                            if supports_diagnostics {
-                                menu = menu.toggleable_entry(
-                                    "Diagnostics",
-                                    diagnostics_enabled,
-                                    IconPosition::Start,
-                                    Some(ToggleDiagnostics.boxed_clone()),
-                                    {
-                                        let editor = editor.clone();
-                                        move |window, cx| {
-                                            editor
-                                                .update(cx, |editor, cx| {
-                                                    editor.toggle_diagnostics(
-                                                        &ToggleDiagnostics,
-                                                        window,
-                                                        cx,
-                                                    );
-                                                })
-                                                .ok();
-                                        }
-                                    },
-                                );
-
-                                if supports_inline_diagnostics {
-                                    let mut inline_diagnostics_item = ContextMenuEntry::new("Inline Diagnostics")
-                                        .toggleable(IconPosition::Start, diagnostics_enabled && inline_diagnostics_enabled)
-                                        .action(ToggleInlineDiagnostics.boxed_clone())
-                                        .handler({
-                                            let editor = editor.clone();
-                                            move |window, cx| {
-                                                editor
-                                                    .update(cx, |editor, cx| {
-                                                        editor.toggle_inline_diagnostics(
-                                                            &ToggleInlineDiagnostics,
-                                                            window,
-                                                            cx,
-                                                        );
-                                                    })
-                                                    .ok();
-                                            }
-                                        });
-                                    if !diagnostics_enabled {
-                                        inline_diagnostics_item = inline_diagnostics_item.disabled(true).documentation_aside(DocumentationSide::Left, DocumentationEdge::Top, |_|  Label::new("Inline diagnostics are not available until regular diagnostics are enabled.").into_any_element());
-                                    }
-                                    menu = menu.item(inline_diagnostics_item)
-                                }
-
-                                menu = menu.separator();
-                            }
-
-                            menu = menu.toggleable_entry(
-                                "Line Numbers",
-                                show_line_numbers,
-                                IconPosition::Start,
-                                Some(editor::actions::ToggleLineNumbers.boxed_clone()),
-                                {
-                                    let editor = editor.clone();
-                                    move |window, cx| {
-                                        editor
-                                            .update(cx, |editor, cx| {
-                                                editor.toggle_line_numbers(
-                                                    &editor::actions::ToggleLineNumbers,
-                                                    window,
-                                                    cx,
-                                                );
-                                            })
-                                            .ok();
-                                    }
-                                },
-                            );
-
-                            menu = menu.toggleable_entry(
-                                "Selection Menu",
-                                selection_menu_enabled,
-                                IconPosition::Start,
-                                Some(editor::actions::ToggleSelectionMenu.boxed_clone()),
-                                {
-                                    let editor = editor.clone();
-                                    move |window, cx| {
-                                        editor
-                                            .update(cx, |editor, cx| {
-                                                editor.toggle_selection_menu(
-                                                    &editor::actions::ToggleSelectionMenu,
-                                                    window,
-                                                    cx,
-                                                )
-                                            })
-                                            .ok();
-                                    }
-                                },
-                            );
-
-                            menu = menu.toggleable_entry(
-                                "Auto Signature Help",
-                                auto_signature_help_enabled,
-                                IconPosition::Start,
-                                Some(editor::actions::ToggleAutoSignatureHelp.boxed_clone()),
-                                {
-                                    let editor = editor.clone();
-                                    move |window, cx| {
-                                        editor
-                                            .update(cx, |editor, cx| {
-                                                editor.toggle_auto_signature_help_menu(
-                                                    &editor::actions::ToggleAutoSignatureHelp,
-                                                    window,
-                                                    cx,
-                                                );
-                                            })
-                                            .ok();
-                                    }
-                                },
-                            );
-
-                            menu = menu.separator();
-
-                            menu = menu.toggleable_entry(
-                                "Inline Git Blame",
-                                git_blame_inline_enabled,
-                                IconPosition::Start,
-                                Some(editor::actions::ToggleGitBlameInline.boxed_clone()),
-                                {
-                                    let editor = editor.clone();
-                                    move |window, cx| {
-                                        editor
-                                            .update(cx, |editor, cx| {
-                                                editor.toggle_git_blame_inline(
-                                                    &editor::actions::ToggleGitBlameInline,
-                                                    window,
-                                                    cx,
-                                                )
-                                            })
-                                            .ok();
-                                    }
-                                },
-                            );
-
-                            menu = menu.toggleable_entry(
-                                "Column Git Blame",
-                                show_git_blame_gutter,
-                                IconPosition::Start,
-                                Some(git::Blame.boxed_clone()),
-                                {
-                                    let editor = editor.clone();
-                                    move |window, cx| {
-                                        editor
-                                            .update(cx, |editor, cx| {
-                                                editor.toggle_git_blame(
-                                                    &git::Blame,
-                                                    window,
-                                                    cx,
-                                                )
-                                            })
-                                            .ok();
-                                    }
-                                },
-                            );
-
-                            menu = menu.separator();
-
-                            menu = menu.toggleable_entry(
-                                "Vim Mode",
-                                vim_mode_enabled,
-                                IconPosition::Start,
-                                None,
-                                {
-                                    move |window, cx| {
-                                        let new_value = !vim_mode_enabled;
-                                        VimModeSetting::override_global(VimModeSetting(new_value), cx);
-                                        HelixModeSetting::override_global(HelixModeSetting(false), cx);
-                                        window.refresh();
-                                    }
-                                },
-                            );
-                            menu = menu.toggleable_entry(
-                                "Helix Mode",
-                                helix_mode_enabled,
-                                IconPosition::Start,
-                                None,
-                                {
-                                    move |window, cx| {
-                                        let new_value = !helix_mode_enabled;
-                                        HelixModeSetting::override_global(HelixModeSetting(new_value), cx);
-                                        VimModeSetting::override_global(VimModeSetting(false), cx);
-                                        window.refresh();
-                                    }
-                                }
-                            );
-
-                            menu
-                        }
-                    });
-                    Some(menu)
-                })
-        };
-
-        h_flex()
-            .id("quick action bar")
-            .gap(DynamicSpacing::Base01.rems(cx))
-            .children(self.render_repl_menu(cx))
-            .children(self.render_preview_button(self.workspace.clone(), cx))
-            .children(search_button)
-            .when(
-                AgentSettings::get_global(cx).enabled(cx) && AgentSettings::get_global(cx).button,
-                |bar| bar.child(assistant_button),
-            )
-            .children(code_actions_dropdown)
-            .children(editor_selections_dropdown)
-            .child(editor_settings_dropdown)
-    }
-}
-
-impl EventEmitter<ToolbarItemEvent> for QuickActionBar {}
-
-#[derive(IntoElement)]
-struct QuickActionBarButton {
-    id: ElementId,
-    icon: IconName,
-    toggled: bool,
-    action: Box<dyn Action>,
-    focus_handle: FocusHandle,
-    tooltip: SharedString,
-    on_click: Box<dyn Fn(&ClickEvent, &mut Window, &mut App)>,
-}
-
-impl QuickActionBarButton {
-    fn new(
-        id: impl Into<ElementId>,
-        icon: IconName,
-        toggled: bool,
-        action: Box<dyn Action>,
-        focus_handle: FocusHandle,
-        tooltip: impl Into<SharedString>,
-        on_click: impl Fn(&ClickEvent, &mut Window, &mut App) + 'static,
-    ) -> Self {
-        Self {
-            id: id.into(),
-            icon,
-            toggled,
-            action,
-            focus_handle,
-            tooltip: tooltip.into(),
-            on_click: Box::new(on_click),
-        }
-    }
-}
-
-impl RenderOnce for QuickActionBarButton {
-    fn render(self, _window: &mut Window, _: &mut App) -> impl IntoElement {
-        let tooltip = self.tooltip.clone();
-        let action = self.action.boxed_clone();
-
-        IconButton::new(self.id.clone(), self.icon)
-            .icon_size(IconSize::Small)
-            .style(ButtonStyle::Subtle)
-            .toggle_state(self.toggled)
-            .tooltip(move |_window, cx| {
-                Tooltip::for_action_in(tooltip.clone(), &*action, &self.focus_handle, cx)
-            })
-            .on_click(move |event, window, cx| (self.on_click)(event, window, cx))
-    }
-}
-
-impl ToolbarItemView for QuickActionBar {
-    fn set_active_pane_item(
-        &mut self,
-        active_pane_item: Option<&dyn ItemHandle>,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> ToolbarItemLocation {
-        self.active_item = active_pane_item.map(ItemHandle::boxed_clone);
-        if let Some(active_item) = active_pane_item {
-            self._inlay_hints_enabled_subscription.take();
-
-            if let Some(editor) = active_item.downcast::<Editor>() {
-                let (mut inlay_hints_enabled, mut supports_inlay_hints) =
-                    editor.update(cx, |editor, cx| {
-                        (
-                            editor.inlay_hints_enabled(),
-                            editor.supports_inlay_hints(cx),
-                        )
-                    });
-                self._inlay_hints_enabled_subscription =
-                    Some(cx.observe(&editor, move |_, editor, cx| {
-                        let (new_inlay_hints_enabled, new_supports_inlay_hints) =
-                            editor.update(cx, |editor, cx| {
-                                (
-                                    editor.inlay_hints_enabled(),
-                                    editor.supports_inlay_hints(cx),
-                                )
-                            });
-                        let should_notify = inlay_hints_enabled != new_inlay_hints_enabled
-                            || supports_inlay_hints != new_supports_inlay_hints;
-                        inlay_hints_enabled = new_inlay_hints_enabled;
-                        supports_inlay_hints = new_supports_inlay_hints;
-                        if should_notify {
-                            cx.notify()
-                        }
-                    }));
-            }
-        }
-        self.get_toolbar_item_location()
-    }
-}
diff --git a/crates/zed/src/zed/quick_action_bar/preview.rs b/crates/zed/src/zed/quick_action_bar/preview.rs
deleted file mode 100644
index 5d43e79542..0000000000
--- a/crates/zed/src/zed/quick_action_bar/preview.rs
+++ /dev/null
@@ -1,96 +0,0 @@
-use gpui::{AnyElement, Modifiers, WeakEntity};
-use markdown_preview::{
-    OpenPreview as MarkdownOpenPreview, OpenPreviewToTheSide as MarkdownOpenPreviewToTheSide,
-    markdown_preview_view::MarkdownPreviewView,
-};
-use svg_preview::{
-    OpenPreview as SvgOpenPreview, OpenPreviewToTheSide as SvgOpenPreviewToTheSide,
-    svg_preview_view::SvgPreviewView,
-};
-use ui::{Tooltip, prelude::*, text_for_keystroke};
-use workspace::Workspace;
-
-use super::QuickActionBar;
-
-#[derive(Clone, Copy)]
-enum PreviewType {
-    Markdown,
-    Svg,
-}
-
-impl QuickActionBar {
-    pub fn render_preview_button(
-        &self,
-        workspace_handle: WeakEntity<Workspace>,
-        cx: &mut Context<Self>,
-    ) -> Option<AnyElement> {
-        let mut preview_type = None;
-
-        if let Some(workspace) = self.workspace.upgrade() {
-            workspace.update(cx, |workspace, cx| {
-                if MarkdownPreviewView::resolve_active_item_as_markdown_editor(workspace, cx)
-                    .is_some()
-                {
-                    preview_type = Some(PreviewType::Markdown);
-                } else if SvgPreviewView::resolve_active_item_as_svg_buffer(workspace, cx).is_some()
-                {
-                    preview_type = Some(PreviewType::Svg);
-                }
-            });
-        }
-
-        let preview_type = preview_type?;
-
-        let (button_id, tooltip_text, open_action, open_to_side_action, open_action_for_tooltip) =
-            match preview_type {
-                PreviewType::Markdown => (
-                    "toggle-markdown-preview",
-                    "Preview Markdown",
-                    Box::new(MarkdownOpenPreview) as Box<dyn gpui::Action>,
-                    Box::new(MarkdownOpenPreviewToTheSide) as Box<dyn gpui::Action>,
-                    &markdown_preview::OpenPreview as &dyn gpui::Action,
-                ),
-                PreviewType::Svg => (
-                    "toggle-svg-preview",
-                    "Preview SVG",
-                    Box::new(SvgOpenPreview) as Box<dyn gpui::Action>,
-                    Box::new(SvgOpenPreviewToTheSide) as Box<dyn gpui::Action>,
-                    &svg_preview::OpenPreview as &dyn gpui::Action,
-                ),
-            };
-
-        let alt_click = gpui::Keystroke {
-            key: "click".into(),
-            modifiers: Modifiers::alt(),
-            ..Default::default()
-        };
-
-        let button = IconButton::new(button_id, IconName::Eye)
-            .icon_size(IconSize::Small)
-            .style(ButtonStyle::Subtle)
-            .tooltip(move |_window, cx| {
-                Tooltip::with_meta(
-                    tooltip_text,
-                    Some(open_action_for_tooltip),
-                    format!(
-                        "{} to open in a split",
-                        text_for_keystroke(&alt_click.modifiers, &alt_click.key, cx)
-                    ),
-                    cx,
-                )
-            })
-            .on_click(move |_, window, cx| {
-                if let Some(workspace) = workspace_handle.upgrade() {
-                    workspace.update(cx, |_, cx| {
-                        if window.modifiers().alt {
-                            window.dispatch_action(open_to_side_action.boxed_clone(), cx);
-                        } else {
-                            window.dispatch_action(open_action.boxed_clone(), cx);
-                        }
-                    });
-                }
-            });
-
-        Some(button.into_any_element())
-    }
-}
diff --git a/crates/zed/src/zed/quick_action_bar/repl_menu.rs b/crates/zed/src/zed/quick_action_bar/repl_menu.rs
deleted file mode 100644
index 1ebdf35bb9..0000000000
--- a/crates/zed/src/zed/quick_action_bar/repl_menu.rs
+++ /dev/null
@@ -1,474 +0,0 @@
-use gpui::ElementId;
-use gpui::{AnyElement, Entity};
-use picker::Picker;
-use repl::{
-    ExecutionState, JupyterSettings, Kernel, KernelSpecification, KernelStatus, Session,
-    SessionSupport,
-    components::{KernelPickerDelegate, KernelSelector},
-    worktree_id_for_editor,
-};
-use ui::{
-    ButtonLike, CommonAnimationExt, ContextMenu, IconWithIndicator, Indicator, IntoElement,
-    PopoverMenu, PopoverMenuHandle, Tooltip, prelude::*,
-};
-use util::ResultExt;
-
-use super::QuickActionBar;
-
-const ZED_REPL_DOCUMENTATION: &str = "https://zed.dev/docs/repl";
-
-struct ReplMenuState {
-    tooltip: SharedString,
-    icon: IconName,
-    icon_color: Color,
-    icon_is_animating: bool,
-    popover_disabled: bool,
-    indicator: Option<Indicator>,
-
-    status: KernelStatus,
-    kernel_name: SharedString,
-    kernel_language: SharedString,
-}
-
-impl QuickActionBar {
-    pub fn render_repl_menu(&self, cx: &mut Context<Self>) -> Option<AnyElement> {
-        if !JupyterSettings::enabled(cx) {
-            return None;
-        }
-
-        let editor = self.active_editor()?;
-
-        let is_local_project = editor
-            .read(cx)
-            .workspace()
-            .map(|workspace| workspace.read(cx).project().read(cx).is_local())
-            .unwrap_or(false);
-
-        if !is_local_project {
-            return None;
-        }
-
-        let has_nonempty_selection = {
-            editor.update(cx, |this, cx| {
-                this.selections
-                    .count()
-                    .ne(&0)
-                    .then(|| {
-                        let snapshot = this.display_snapshot(cx);
-                        let latest = this.selections.newest_display(&snapshot);
-                        !latest.is_empty()
-                    })
-                    .unwrap_or_default()
-            })
-        };
-
-        let session = repl::session(editor.downgrade(), cx);
-        let session = match session {
-            SessionSupport::ActiveSession(session) => session,
-            SessionSupport::Inactive(spec) => {
-                return self.render_repl_launch_menu(spec, cx);
-            }
-            SessionSupport::RequiresSetup(language) => {
-                return self.render_repl_setup(language.as_ref(), cx);
-            }
-            SessionSupport::Unsupported => return None,
-        };
-
-        let menu_state = session_state(session.clone(), cx);
-
-        let id = "repl-menu";
-
-        let element_id = |suffix| ElementId::Name(format!("{}-{}", id, suffix).into());
-
-        let editor = editor.downgrade();
-        let dropdown_menu = PopoverMenu::new(element_id("menu"))
-            .menu(move |window, cx| {
-                let editor = editor.clone();
-                let session = session.clone();
-                ContextMenu::build(window, cx, move |menu, _, cx| {
-                    let menu_state = session_state(session, cx);
-                    let status = menu_state.status;
-                    let editor = editor.clone();
-
-                    menu.map(|menu| {
-                        if status.is_connected() {
-                            let status = status.clone();
-                            menu.custom_row(move |_window, _cx| {
-                                h_flex()
-                                    .child(
-                                        Label::new(format!(
-                                            "kernel: {} ({})",
-                                            menu_state.kernel_name, menu_state.kernel_language
-                                        ))
-                                        .size(LabelSize::Small)
-                                        .color(Color::Muted),
-                                    )
-                                    .into_any_element()
-                            })
-                            .custom_row(move |_window, _cx| {
-                                h_flex()
-                                    .child(
-                                        Label::new(status.clone().to_string())
-                                            .size(LabelSize::Small)
-                                            .color(Color::Muted),
-                                    )
-                                    .into_any_element()
-                            })
-                        } else {
-                            let status = status.clone();
-                            menu.custom_row(move |_window, _cx| {
-                                h_flex()
-                                    .child(
-                                        Label::new(format!("{}...", status.to_string()))
-                                            .size(LabelSize::Small)
-                                            .color(Color::Muted),
-                                    )
-                                    .into_any_element()
-                            })
-                        }
-                    })
-                    .separator()
-                    .custom_entry(
-                        move |_window, _cx| {
-                            Label::new(if has_nonempty_selection {
-                                "Run Selection"
-                            } else {
-                                "Run Line"
-                            })
-                            .into_any_element()
-                        },
-                        {
-                            let editor = editor.clone();
-                            move |window, cx| {
-                                repl::run(editor.clone(), true, window, cx).log_err();
-                            }
-                        },
-                    )
-                    .custom_entry(
-                        move |_window, _cx| {
-                            Label::new("Interrupt")
-                                .size(LabelSize::Small)
-                                .color(Color::Error)
-                                .into_any_element()
-                        },
-                        {
-                            let editor = editor.clone();
-                            move |_, cx| {
-                                repl::interrupt(editor.clone(), cx);
-                            }
-                        },
-                    )
-                    .custom_entry(
-                        move |_window, _cx| {
-                            Label::new("Clear Outputs")
-                                .size(LabelSize::Small)
-                                .color(Color::Muted)
-                                .into_any_element()
-                        },
-                        {
-                            let editor = editor.clone();
-                            move |_, cx| {
-                                repl::clear_outputs(editor.clone(), cx);
-                            }
-                        },
-                    )
-                    .separator()
-                    .custom_entry(
-                        move |_window, _cx| {
-                            Label::new("Shut Down Kernel")
-                                .size(LabelSize::Small)
-                                .color(Color::Error)
-                                .into_any_element()
-                        },
-                        {
-                            let editor = editor.clone();
-                            move |window, cx| {
-                                repl::shutdown(editor.clone(), window, cx);
-                            }
-                        },
-                    )
-                    .custom_entry(
-                        move |_window, _cx| {
-                            Label::new("Restart Kernel")
-                                .size(LabelSize::Small)
-                                .color(Color::Error)
-                                .into_any_element()
-                        },
-                        {
-                            move |window, cx| {
-                                repl::restart(editor.clone(), window, cx);
-                            }
-                        },
-                    )
-                    .separator()
-                    .action("View Sessions", Box::new(repl::Sessions))
-                    // TODO: Add shut down all kernels action
-                    // .action("Shut Down all Kernels", Box::new(gpui::NoAction))
-                })
-                .into()
-            })
-            .trigger_with_tooltip(
-                ButtonLike::new_rounded_right(element_id("dropdown"))
-                    .child(
-                        Icon::new(IconName::ChevronDown)
-                            .size(IconSize::XSmall)
-                            .color(Color::Muted),
-                    )
-                    .width(rems(1.))
-                    .disabled(menu_state.popover_disabled),
-                Tooltip::text("REPL Menu"),
-            );
-
-        let button = ButtonLike::new_rounded_left("toggle_repl_icon")
-            .child(if menu_state.icon_is_animating {
-                Icon::new(menu_state.icon)
-                    .color(menu_state.icon_color)
-                    .with_rotate_animation(5)
-                    .into_any_element()
-            } else {
-                IconWithIndicator::new(
-                    Icon::new(IconName::ReplNeutral).color(menu_state.icon_color),
-                    menu_state.indicator,
-                )
-                .indicator_border_color(Some(cx.theme().colors().toolbar_background))
-                .into_any_element()
-            })
-            .size(ButtonSize::Compact)
-            .style(ButtonStyle::Subtle)
-            .tooltip(Tooltip::text(menu_state.tooltip))
-            .on_click(|_, window, cx| window.dispatch_action(Box::new(repl::Run {}), cx))
-            .into_any_element();
-
-        Some(
-            h_flex()
-                .child(self.render_kernel_selector(cx))
-                .child(button)
-                .child(dropdown_menu)
-                .into_any_element(),
-        )
-    }
-    pub fn render_repl_launch_menu(
-        &self,
-        kernel_specification: KernelSpecification,
-        cx: &mut Context<Self>,
-    ) -> Option<AnyElement> {
-        let tooltip: SharedString =
-            SharedString::from(format!("Start REPL for {}", kernel_specification.name()));
-
-        Some(
-            h_flex()
-                .child(self.render_kernel_selector(cx))
-                .child(
-                    IconButton::new("toggle_repl_icon", IconName::ReplNeutral)
-                        .size(ButtonSize::Compact)
-                        .icon_color(Color::Muted)
-                        .style(ButtonStyle::Subtle)
-                        .tooltip(Tooltip::text(tooltip))
-                        .on_click(|_, window, cx| {
-                            window.dispatch_action(Box::new(repl::Run {}), cx)
-                        }),
-                )
-                .into_any_element(),
-        )
-    }
-
-    pub fn render_kernel_selector(&self, cx: &mut Context<Self>) -> impl IntoElement {
-        let editor = if let Some(editor) = self.active_editor() {
-            editor
-        } else {
-            return div().into_any_element();
-        };
-
-        let Some(worktree_id) = worktree_id_for_editor(editor.downgrade(), cx) else {
-            return div().into_any_element();
-        };
-
-        let session = repl::session(editor.downgrade(), cx);
-
-        let current_kernelspec = match session {
-            SessionSupport::ActiveSession(session) => {
-                Some(session.read(cx).kernel_specification.clone())
-            }
-            SessionSupport::Inactive(kernel_specification) => Some(kernel_specification),
-            SessionSupport::RequiresSetup(_language_name) => None,
-            SessionSupport::Unsupported => None,
-        };
-
-        let current_kernel_name = current_kernelspec.as_ref().map(|spec| spec.name());
-
-        let menu_handle: PopoverMenuHandle<Picker<KernelPickerDelegate>> =
-            PopoverMenuHandle::default();
-        KernelSelector::new(
-            {
-                Box::new(move |kernelspec, window, cx| {
-                    repl::assign_kernelspec(kernelspec, editor.downgrade(), window, cx).ok();
-                })
-            },
-            worktree_id,
-            ButtonLike::new("kernel-selector")
-                .style(ButtonStyle::Subtle)
-                .size(ButtonSize::Compact)
-                .child(
-                    h_flex()
-                        .w_full()
-                        .gap_0p5()
-                        .child(
-                            div()
-                                .overflow_x_hidden()
-                                .flex_grow()
-                                .whitespace_nowrap()
-                                .child(
-                                    Label::new(if let Some(name) = current_kernel_name {
-                                        name
-                                    } else {
-                                        SharedString::from("Select Kernel")
-                                    })
-                                    .size(LabelSize::Small)
-                                    .color(if current_kernelspec.is_some() {
-                                        Color::Default
-                                    } else {
-                                        Color::Placeholder
-                                    })
-                                    .into_any_element(),
-                                ),
-                        )
-                        .child(
-                            Icon::new(IconName::ChevronDown)
-                                .color(Color::Muted)
-                                .size(IconSize::XSmall),
-                        ),
-                ),
-            Tooltip::text("Select Kernel"),
-        )
-        .with_handle(menu_handle)
-        .into_any_element()
-    }
-
-    pub fn render_repl_setup(&self, language: &str, cx: &mut Context<Self>) -> Option<AnyElement> {
-        let tooltip: SharedString = SharedString::from(format!("Setup Zed REPL for {}", language));
-        Some(
-            h_flex()
-                .gap(DynamicSpacing::Base06.rems(cx))
-                .child(self.render_kernel_selector(cx))
-                .child(
-                    IconButton::new("toggle_repl_icon", IconName::ReplNeutral)
-                        .style(ButtonStyle::Subtle)
-                        .shape(ui::IconButtonShape::Square)
-                        .icon_size(ui::IconSize::Small)
-                        .icon_color(Color::Muted)
-                        .tooltip(Tooltip::text(tooltip))
-                        .on_click(|_, _window, cx| {
-                            cx.open_url(&format!("{}#installation", ZED_REPL_DOCUMENTATION))
-                        }),
-                )
-                .into_any_element(),
-        )
-    }
-}
-
-fn session_state(session: Entity<Session>, cx: &mut App) -> ReplMenuState {
-    let session = session.read(cx);
-
-    let kernel_name = session.kernel_specification.name();
-    let kernel_language: SharedString = session.kernel_specification.language();
-
-    let fill_fields = || {
-        ReplMenuState {
-            tooltip: "Nothing running".into(),
-            icon: IconName::ReplNeutral,
-            icon_color: Color::Default,
-            icon_is_animating: false,
-            popover_disabled: false,
-            indicator: None,
-            kernel_name: kernel_name.clone(),
-            kernel_language: kernel_language.clone(),
-            // TODO: Technically not shutdown, but indeterminate
-            status: KernelStatus::Shutdown,
-            // current_delta: Duration::default(),
-        }
-    };
-
-    let transitional =
-        |tooltip: SharedString, animating: bool, popover_disabled: bool| ReplMenuState {
-            tooltip,
-            icon_is_animating: animating,
-            popover_disabled,
-            icon_color: Color::Muted,
-            indicator: Some(Indicator::dot().color(Color::Muted)),
-            status: session.kernel.status(),
-            ..fill_fields()
-        };
-
-    let starting = || transitional(format!("{} is starting", kernel_name).into(), true, true);
-    let restarting = || transitional(format!("Restarting {}", kernel_name).into(), true, true);
-    let shutting_down = || {
-        transitional(
-            format!("{} is shutting down", kernel_name).into(),
-            false,
-            true,
-        )
-    };
-    let auto_restarting = || {
-        transitional(
-            format!("Auto-restarting {}", kernel_name).into(),
-            true,
-            true,
-        )
-    };
-    let unknown = || transitional(format!("{} state unknown", kernel_name).into(), false, true);
-    let other = |state: &str| {
-        transitional(
-            format!("{} state: {}", kernel_name, state).into(),
-            false,
-            true,
-        )
-    };
-
-    let shutdown = || ReplMenuState {
-        tooltip: "Nothing running".into(),
-        icon: IconName::ReplNeutral,
-        icon_color: Color::Default,
-        icon_is_animating: false,
-        popover_disabled: false,
-        indicator: None,
-        status: KernelStatus::Shutdown,
-        ..fill_fields()
-    };
-
-    match &session.kernel {
-        Kernel::Restarting => restarting(),
-        Kernel::RunningKernel(kernel) => match &kernel.execution_state() {
-            ExecutionState::Idle => ReplMenuState {
-                tooltip: format!("Run code on {} ({})", kernel_name, kernel_language).into(),
-                indicator: Some(Indicator::dot().color(Color::Success)),
-                status: session.kernel.status(),
-                ..fill_fields()
-            },
-            ExecutionState::Busy => ReplMenuState {
-                tooltip: format!("Interrupt {} ({})", kernel_name, kernel_language).into(),
-                icon_is_animating: true,
-                popover_disabled: false,
-                indicator: None,
-                status: session.kernel.status(),
-                ..fill_fields()
-            },
-            ExecutionState::Unknown => unknown(),
-            ExecutionState::Starting => starting(),
-            ExecutionState::Restarting => restarting(),
-            ExecutionState::Terminating => shutting_down(),
-            ExecutionState::AutoRestarting => auto_restarting(),
-            ExecutionState::Dead => shutdown(),
-            ExecutionState::Other(state) => other(state),
-        },
-        Kernel::StartingKernel(_) => starting(),
-        Kernel::ErroredLaunch(e) => ReplMenuState {
-            tooltip: format!("Error with kernel {}: {}", kernel_name, e).into(),
-            popover_disabled: false,
-            indicator: Some(Indicator::dot().color(Color::Error)),
-            status: session.kernel.status(),
-            ..fill_fields()
-        },
-        Kernel::ShuttingDown => shutting_down(),
-        Kernel::Shutdown => shutdown(),
-    }
-}
diff --git a/crates/zed/src/zed/windows_only_instance.rs b/crates/zed/src/zed/windows_only_instance.rs
deleted file mode 100644
index f3eab15441..0000000000
--- a/crates/zed/src/zed/windows_only_instance.rs
+++ /dev/null
@@ -1,217 +0,0 @@
-use std::{sync::Arc, thread::JoinHandle};
-
-use anyhow::Context;
-use cli::{CliRequest, CliResponse, IpcHandshake, ipc::IpcOneShotServer};
-use parking_lot::Mutex;
-use release_channel::app_identifier;
-use util::ResultExt;
-use windows::{
-    Win32::{
-        Foundation::{CloseHandle, ERROR_ALREADY_EXISTS, GENERIC_WRITE, GetLastError, HANDLE},
-        Storage::FileSystem::{
-            CreateFileW, FILE_FLAGS_AND_ATTRIBUTES, FILE_SHARE_MODE, OPEN_EXISTING,
-            PIPE_ACCESS_INBOUND, ReadFile, WriteFile,
-        },
-        System::{
-            Pipes::{
-                ConnectNamedPipe, CreateNamedPipeW, DisconnectNamedPipe, PIPE_READMODE_MESSAGE,
-                PIPE_TYPE_MESSAGE, PIPE_WAIT,
-            },
-            Threading::CreateMutexW,
-        },
-    },
-    core::HSTRING,
-};
-
-use crate::{Args, OpenListener, RawOpenRequest};
-
-#[inline]
-fn is_first_instance() -> bool {
-    unsafe {
-        CreateMutexW(
-            None,
-            false,
-            &HSTRING::from(format!("{}-Instance-Mutex", app_identifier())),
-        )
-        .expect("Unable to create instance mutex.")
-    };
-    unsafe { GetLastError() != ERROR_ALREADY_EXISTS }
-}
-
-pub fn handle_single_instance(opener: OpenListener, args: &Args) -> bool {
-    let is_first_instance = is_first_instance();
-    if is_first_instance {
-        // We are the first instance, listen for messages sent from other instances
-        std::thread::Builder::new()
-            .name("EnsureSingleton".to_owned())
-            .spawn(move || {
-                with_pipe(|url| {
-                    opener.open(RawOpenRequest {
-                        urls: vec![url],
-                        ..Default::default()
-                    })
-                })
-            })
-            .unwrap();
-    } else if !args.foreground {
-        // We are not the first instance, send args to the first instance
-        send_args_to_instance(args).log_err();
-    }
-
-    is_first_instance
-}
-
-fn with_pipe(f: impl Fn(String)) {
-    let pipe = unsafe {
-        CreateNamedPipeW(
-            &HSTRING::from(format!("\\\\.\\pipe\\{}-Named-Pipe", app_identifier())),
-            PIPE_ACCESS_INBOUND,
-            PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT,
-            1,
-            128,
-            128,
-            0,
-            None,
-        )
-    };
-    if pipe.is_invalid() {
-        log::error!("Failed to create named pipe: {:?}", unsafe {
-            GetLastError()
-        });
-        return;
-    }
-
-    loop {
-        if let Some(message) = retrieve_message_from_pipe(pipe)
-            .context("Failed to read from named pipe")
-            .log_err()
-        {
-            f(message);
-        }
-    }
-}
-
-fn retrieve_message_from_pipe(pipe: HANDLE) -> anyhow::Result<String> {
-    unsafe { ConnectNamedPipe(pipe, None)? };
-    let message = retrieve_message_from_pipe_inner(pipe);
-    unsafe { DisconnectNamedPipe(pipe).log_err() };
-    message
-}
-
-fn retrieve_message_from_pipe_inner(pipe: HANDLE) -> anyhow::Result<String> {
-    let mut buffer = [0u8; 128];
-    unsafe {
-        ReadFile(pipe, Some(&mut buffer), None, None)?;
-    }
-    let message = std::ffi::CStr::from_bytes_until_nul(&buffer)?;
-    Ok(message.to_string_lossy().into_owned())
-}
-
-// This part of code is mostly from crates/cli/src/main.rs
-fn send_args_to_instance(args: &Args) -> anyhow::Result<()> {
-    if let Some(dock_menu_action_idx) = args.dock_action {
-        let url = format!("zed-dock-action://{}", dock_menu_action_idx);
-        return write_message_to_instance_pipe(url.as_bytes());
-    }
-
-    let (server, server_name) =
-        IpcOneShotServer::<IpcHandshake>::new().context("Handshake before Zed spawn")?;
-    let url = format!("zed-cli://{server_name}");
-
-    let request = {
-        let mut paths = vec![];
-        let mut urls = vec![];
-        let mut diff_paths = vec![];
-        for path in args.paths_or_urls.iter() {
-            match std::fs::canonicalize(&path) {
-                Ok(path) => paths.push(path.to_string_lossy().into_owned()),
-                Err(error) => {
-                    if path.starts_with("zed://")
-                        || path.starts_with("http://")
-                        || path.starts_with("https://")
-                        || path.starts_with("file://")
-                        || path.starts_with("ssh://")
-                    {
-                        urls.push(path.clone());
-                    } else {
-                        log::error!("error parsing path argument: {}", error);
-                    }
-                }
-            }
-        }
-
-        for path in args.diff.chunks(2) {
-            let old = std::fs::canonicalize(&path[0]).log_err();
-            let new = std::fs::canonicalize(&path[1]).log_err();
-            if let Some((old, new)) = old.zip(new) {
-                diff_paths.push([
-                    old.to_string_lossy().into_owned(),
-                    new.to_string_lossy().into_owned(),
-                ]);
-            }
-        }
-
-        CliRequest::Open {
-            paths,
-            urls,
-            diff_paths,
-            wait: false,
-            wsl: args.wsl.clone(),
-            open_new_workspace: None,
-            reuse: false,
-            env: None,
-            user_data_dir: args.user_data_dir.clone(),
-        }
-    };
-
-    let exit_status = Arc::new(Mutex::new(None));
-    let sender: JoinHandle<anyhow::Result<()>> = std::thread::Builder::new()
-        .name("CliReceiver".to_owned())
-        .spawn({
-            let exit_status = exit_status.clone();
-            move || {
-                let (_, handshake) = server.accept().context("Handshake after Zed spawn")?;
-                let (tx, rx) = (handshake.requests, handshake.responses);
-
-                tx.send(request)?;
-
-                while let Ok(response) = rx.recv() {
-                    match response {
-                        CliResponse::Ping => {}
-                        CliResponse::Stdout { message } => log::info!("{message}"),
-                        CliResponse::Stderr { message } => log::error!("{message}"),
-                        CliResponse::Exit { status } => {
-                            exit_status.lock().replace(status);
-                            return Ok(());
-                        }
-                    }
-                }
-                Ok(())
-            }
-        })
-        .unwrap();
-
-    write_message_to_instance_pipe(url.as_bytes())?;
-    sender.join().unwrap()?;
-    if let Some(exit_status) = exit_status.lock().take() {
-        std::process::exit(exit_status);
-    }
-    Ok(())
-}
-
-fn write_message_to_instance_pipe(message: &[u8]) -> anyhow::Result<()> {
-    unsafe {
-        let pipe = CreateFileW(
-            &HSTRING::from(format!("\\\\.\\pipe\\{}-Named-Pipe", app_identifier())),
-            GENERIC_WRITE.0,
-            FILE_SHARE_MODE::default(),
-            None,
-            OPEN_EXISTING,
-            FILE_FLAGS_AND_ATTRIBUTES::default(),
-            None,
-        )?;
-        WriteFile(pipe, Some(message), None, None)?;
-        CloseHandle(pipe)?;
-    }
-    Ok(())
-}
diff --git a/crates/zed_actions/Cargo.toml b/crates/zed_actions/Cargo.toml
deleted file mode 100644
index 1a140c483f..0000000000
--- a/crates/zed_actions/Cargo.toml
+++ /dev/null
@@ -1,15 +0,0 @@
-[package]
-name = "zed_actions"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[dependencies]
-gpui.workspace = true
-schemars.workspace = true
-serde.workspace = true
-uuid.workspace = true
diff --git a/crates/zed_actions/LICENSE-GPL b/crates/zed_actions/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/zed_actions/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/zed_actions/src/lib.rs b/crates/zed_actions/src/lib.rs
deleted file mode 100644
index a89e943e02..0000000000
--- a/crates/zed_actions/src/lib.rs
+++ /dev/null
@@ -1,597 +0,0 @@
-use gpui::{Action, actions};
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-
-// If the zed binary doesn't use anything in this crate, it will be optimized away
-// and the actions won't initialize. So we just provide an empty initialization function
-// to be called from main.
-//
-// These may provide relevant context:
-// https://github.com/rust-lang/rust/issues/47384
-// https://github.com/mmastrac/rust-ctor/issues/280
-pub fn init() {}
-
-/// Opens a URL in the system's default web browser.
-#[derive(Clone, PartialEq, Deserialize, JsonSchema, Action)]
-#[action(namespace = zed)]
-#[serde(deny_unknown_fields)]
-pub struct OpenBrowser {
-    pub url: String,
-}
-
-/// Opens a zed:// URL within the application.
-#[derive(Clone, PartialEq, Deserialize, JsonSchema, Action)]
-#[action(namespace = zed)]
-#[serde(deny_unknown_fields)]
-pub struct OpenZedUrl {
-    pub url: String,
-}
-
-/// Opens the keymap to either add a keybinding or change an existing one
-#[derive(PartialEq, Clone, Default, Action, JsonSchema, Serialize, Deserialize)]
-#[action(namespace = zed, no_json, no_register)]
-pub struct ChangeKeybinding {
-    pub action: String,
-}
-
-actions!(
-    zed,
-    [
-        /// Opens the settings editor.
-        #[action(deprecated_aliases = ["zed_actions::OpenSettingsEditor"])]
-        OpenSettings,
-        /// Opens the settings JSON file.
-        #[action(deprecated_aliases = ["zed_actions::OpenSettings"])]
-        OpenSettingsFile,
-        /// Opens project-specific settings.
-        #[action(deprecated_aliases = ["zed_actions::OpenProjectSettings"])]
-        OpenProjectSettings,
-        /// Opens the default keymap file.
-        OpenDefaultKeymap,
-        /// Opens the user keymap file.
-        #[action(deprecated_aliases = ["zed_actions::OpenKeymap"])]
-        OpenKeymapFile,
-        /// Opens the keymap editor.
-        #[action(deprecated_aliases = ["zed_actions::OpenKeymapEditor"])]
-        OpenKeymap,
-        /// Opens account settings.
-        OpenAccountSettings,
-        /// Opens server settings.
-        OpenServerSettings,
-        /// Quits the application.
-        Quit,
-        /// Shows information about Zed.
-        About,
-        /// Opens the documentation website.
-        OpenDocs,
-        /// Views open source licenses.
-        OpenLicenses,
-        /// Opens the telemetry log.
-        OpenTelemetryLog,
-        /// Opens the performance profiler.
-        OpenPerformanceProfiler,
-    ]
-);
-
-#[derive(PartialEq, Clone, Copy, Debug, Deserialize, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum ExtensionCategoryFilter {
-    Themes,
-    IconThemes,
-    Languages,
-    Grammars,
-    LanguageServers,
-    ContextServers,
-    AgentServers,
-    SlashCommands,
-    IndexedDocsProviders,
-    Snippets,
-    DebugAdapters,
-}
-
-/// Opens the extensions management interface.
-#[derive(PartialEq, Clone, Default, Debug, Deserialize, JsonSchema, Action)]
-#[action(namespace = zed)]
-#[serde(deny_unknown_fields)]
-pub struct Extensions {
-    /// Filters the extensions page down to extensions that are in the specified category.
-    #[serde(default)]
-    pub category_filter: Option<ExtensionCategoryFilter>,
-    /// Focuses just the extension with the specified ID.
-    #[serde(default)]
-    pub id: Option<String>,
-}
-
-/// Decreases the font size in the editor buffer.
-#[derive(PartialEq, Clone, Default, Debug, Deserialize, JsonSchema, Action)]
-#[action(namespace = zed)]
-#[serde(deny_unknown_fields)]
-pub struct DecreaseBufferFontSize {
-    #[serde(default)]
-    pub persist: bool,
-}
-
-/// Increases the font size in the editor buffer.
-#[derive(PartialEq, Clone, Default, Debug, Deserialize, JsonSchema, Action)]
-#[action(namespace = zed)]
-#[serde(deny_unknown_fields)]
-pub struct IncreaseBufferFontSize {
-    #[serde(default)]
-    pub persist: bool,
-}
-
-/// Increases the font size in the editor buffer.
-#[derive(PartialEq, Clone, Debug, Deserialize, JsonSchema, Action)]
-#[action(namespace = zed)]
-#[serde(deny_unknown_fields)]
-pub struct OpenSettingsAt {
-    /// A path to a specific setting (e.g. `theme.mode`)
-    pub path: String,
-}
-
-/// Resets the buffer font size to the default value.
-#[derive(PartialEq, Clone, Default, Debug, Deserialize, JsonSchema, Action)]
-#[action(namespace = zed)]
-#[serde(deny_unknown_fields)]
-pub struct ResetBufferFontSize {
-    #[serde(default)]
-    pub persist: bool,
-}
-
-/// Decreases the font size of the user interface.
-#[derive(PartialEq, Clone, Default, Debug, Deserialize, JsonSchema, Action)]
-#[action(namespace = zed)]
-#[serde(deny_unknown_fields)]
-pub struct DecreaseUiFontSize {
-    #[serde(default)]
-    pub persist: bool,
-}
-
-/// Increases the font size of the user interface.
-#[derive(PartialEq, Clone, Default, Debug, Deserialize, JsonSchema, Action)]
-#[action(namespace = zed)]
-#[serde(deny_unknown_fields)]
-pub struct IncreaseUiFontSize {
-    #[serde(default)]
-    pub persist: bool,
-}
-
-/// Resets the UI font size to the default value.
-#[derive(PartialEq, Clone, Default, Debug, Deserialize, JsonSchema, Action)]
-#[action(namespace = zed)]
-#[serde(deny_unknown_fields)]
-pub struct ResetUiFontSize {
-    #[serde(default)]
-    pub persist: bool,
-}
-
-/// Resets all zoom levels (UI and buffer font sizes, including in the agent panel) to their default values.
-#[derive(PartialEq, Clone, Default, Debug, Deserialize, JsonSchema, Action)]
-#[action(namespace = zed)]
-#[serde(deny_unknown_fields)]
-pub struct ResetAllZoom {
-    #[serde(default)]
-    pub persist: bool,
-}
-
-pub mod dev {
-    use gpui::actions;
-
-    actions!(
-        dev,
-        [
-            /// Toggles the developer inspector for debugging UI elements.
-            ToggleInspector
-        ]
-    );
-}
-
-pub mod workspace {
-    use gpui::actions;
-
-    actions!(
-        workspace,
-        [
-            #[action(deprecated_aliases = ["editor::CopyPath", "outline_panel::CopyPath", "project_panel::CopyPath"])]
-            CopyPath,
-            #[action(deprecated_aliases = ["editor::CopyRelativePath", "outline_panel::CopyRelativePath", "project_panel::CopyRelativePath"])]
-            CopyRelativePath,
-            /// Opens the selected file with the system's default application.
-            #[action(deprecated_aliases = ["project_panel::OpenWithSystem"])]
-            OpenWithSystem,
-        ]
-    );
-}
-
-pub mod git {
-    use gpui::actions;
-
-    actions!(
-        git,
-        [
-            /// Checks out a different git branch.
-            CheckoutBranch,
-            /// Switches to a different git branch.
-            Switch,
-            /// Selects a different repository.
-            SelectRepo,
-            /// Filter remotes.
-            FilterRemotes,
-            /// Create a git remote.
-            CreateRemote,
-            /// Opens the git branch selector.
-            #[action(deprecated_aliases = ["branches::OpenRecent"])]
-            Branch,
-            /// Opens the git stash selector.
-            ViewStash,
-            /// Opens the git worktree selector.
-            Worktree
-        ]
-    );
-}
-
-pub mod toast {
-    use gpui::actions;
-
-    actions!(
-        toast,
-        [
-            /// Runs the action associated with a toast notification.
-            RunAction
-        ]
-    );
-}
-
-pub mod command_palette {
-    use gpui::actions;
-
-    actions!(
-        command_palette,
-        [
-            /// Toggles the command palette.
-            Toggle,
-        ]
-    );
-}
-
-pub mod project_panel {
-    use gpui::actions;
-
-    actions!(
-        project_panel,
-        [
-            /// Toggles focus on the project panel.
-            ToggleFocus
-        ]
-    );
-}
-pub mod feedback {
-    use gpui::actions;
-
-    actions!(
-        feedback,
-        [
-            /// Opens email client to send feedback to Zed support.
-            EmailZed,
-            /// Opens the bug report form.
-            FileBugReport,
-            /// Opens the feature request form.
-            RequestFeature
-        ]
-    );
-}
-
-pub mod theme_selector {
-    use gpui::Action;
-    use schemars::JsonSchema;
-    use serde::Deserialize;
-
-    /// Toggles the theme selector interface.
-    #[derive(PartialEq, Clone, Default, Debug, Deserialize, JsonSchema, Action)]
-    #[action(namespace = theme_selector)]
-    #[serde(deny_unknown_fields)]
-    pub struct Toggle {
-        /// A list of theme names to filter the theme selector down to.
-        pub themes_filter: Option<Vec<String>>,
-    }
-}
-
-pub mod icon_theme_selector {
-    use gpui::Action;
-    use schemars::JsonSchema;
-    use serde::Deserialize;
-
-    /// Toggles the icon theme selector interface.
-    #[derive(PartialEq, Clone, Default, Debug, Deserialize, JsonSchema, Action)]
-    #[action(namespace = icon_theme_selector)]
-    #[serde(deny_unknown_fields)]
-    pub struct Toggle {
-        /// A list of icon theme names to filter the theme selector down to.
-        pub themes_filter: Option<Vec<String>>,
-    }
-}
-
-pub mod settings_profile_selector {
-    use gpui::Action;
-    use schemars::JsonSchema;
-    use serde::Deserialize;
-
-    #[derive(PartialEq, Clone, Default, Debug, Deserialize, JsonSchema, Action)]
-    #[action(namespace = settings_profile_selector)]
-    pub struct Toggle;
-}
-
-pub mod agent {
-    use gpui::actions;
-
-    actions!(
-        agent,
-        [
-            /// Opens the agent settings panel.
-            #[action(deprecated_aliases = ["agent::OpenConfiguration"])]
-            OpenSettings,
-            /// Opens the agent onboarding modal.
-            OpenOnboardingModal,
-            /// Opens the ACP onboarding modal.
-            OpenAcpOnboardingModal,
-            /// Opens the Claude Code onboarding modal.
-            OpenClaudeCodeOnboardingModal,
-            /// Resets the agent onboarding state.
-            ResetOnboarding,
-            /// Starts a chat conversation with the agent.
-            Chat,
-            /// Toggles the language model selector dropdown.
-            #[action(deprecated_aliases = ["assistant::ToggleModelSelector", "assistant2::ToggleModelSelector"])]
-            ToggleModelSelector,
-            /// Triggers re-authentication on Gemini
-            ReauthenticateAgent,
-            /// Add the current selection as context for threads in the agent panel.
-            #[action(deprecated_aliases = ["assistant::QuoteSelection", "agent::QuoteSelection"])]
-            AddSelectionToThread,
-            /// Resets the agent panel zoom levels (agent UI and buffer font sizes).
-            ResetAgentZoom,
-        ]
-    );
-}
-
-pub mod assistant {
-    use gpui::{Action, actions};
-    use schemars::JsonSchema;
-    use serde::Deserialize;
-    use uuid::Uuid;
-
-    actions!(
-        agent,
-        [
-            #[action(deprecated_aliases = ["assistant::ToggleFocus"])]
-            ToggleFocus
-        ]
-    );
-
-    actions!(
-        assistant,
-        [
-            /// Shows the assistant configuration panel.
-            ShowConfiguration
-        ]
-    );
-
-    /// Opens the rules library for managing agent rules and prompts.
-    #[derive(PartialEq, Clone, Default, Debug, Deserialize, JsonSchema, Action)]
-    #[action(namespace = agent, deprecated_aliases = ["assistant::OpenRulesLibrary", "assistant::DeployPromptLibrary"])]
-    #[serde(deny_unknown_fields)]
-    pub struct OpenRulesLibrary {
-        #[serde(skip)]
-        pub prompt_to_select: Option<Uuid>,
-    }
-
-    /// Deploys the assistant interface with the specified configuration.
-    #[derive(Clone, Default, Deserialize, PartialEq, JsonSchema, Action)]
-    #[action(namespace = assistant)]
-    #[serde(deny_unknown_fields)]
-    pub struct InlineAssist {
-        pub prompt: Option<String>,
-    }
-}
-
-pub mod debugger {
-    use gpui::actions;
-
-    actions!(
-        debugger,
-        [
-            /// Opens the debugger onboarding modal.
-            OpenOnboardingModal,
-            /// Resets the debugger onboarding state.
-            ResetOnboarding
-        ]
-    );
-}
-
-/// Opens the recent projects interface.
-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema, Action)]
-#[action(namespace = projects)]
-#[serde(deny_unknown_fields)]
-pub struct OpenRecent {
-    #[serde(default)]
-    pub create_new_window: bool,
-}
-
-/// Creates a project from a selected template.
-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema, Action)]
-#[action(namespace = projects)]
-#[serde(deny_unknown_fields)]
-pub struct OpenRemote {
-    #[serde(default)]
-    pub from_existing_connection: bool,
-    #[serde(default)]
-    pub create_new_window: bool,
-}
-
-/// Opens the dev container connection modal.
-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema, Action)]
-#[action(namespace = projects)]
-#[serde(deny_unknown_fields)]
-pub struct OpenDevContainer;
-
-/// Where to spawn the task in the UI.
-#[derive(Default, Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum RevealTarget {
-    /// In the central pane group, "main" editor area.
-    Center,
-    /// In the terminal dock, "regular" terminal items' place.
-    #[default]
-    Dock,
-}
-
-/// Spawns a task with name or opens tasks modal.
-#[derive(Debug, PartialEq, Clone, Deserialize, JsonSchema, Action)]
-#[action(namespace = task)]
-#[serde(untagged)]
-pub enum Spawn {
-    /// Spawns a task by the name given.
-    ByName {
-        task_name: String,
-        #[serde(default)]
-        reveal_target: Option<RevealTarget>,
-    },
-    /// Spawns a task by the name given.
-    ByTag {
-        task_tag: String,
-        #[serde(default)]
-        reveal_target: Option<RevealTarget>,
-    },
-    /// Spawns a task via modal's selection.
-    ViaModal {
-        /// Selected task's `reveal_target` property override.
-        #[serde(default)]
-        reveal_target: Option<RevealTarget>,
-    },
-}
-
-impl Spawn {
-    pub fn modal() -> Self {
-        Self::ViaModal {
-            reveal_target: None,
-        }
-    }
-}
-
-/// Reruns the last task.
-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema, Action)]
-#[action(namespace = task)]
-#[serde(deny_unknown_fields)]
-pub struct Rerun {
-    /// Controls whether the task context is reevaluated prior to execution of a task.
-    /// If it is not, environment variables such as ZED_COLUMN, ZED_FILE are gonna be the same as in the last execution of a task
-    /// If it is, these variables will be updated to reflect current state of editor at the time task::Rerun is executed.
-    /// default: false
-    #[serde(default)]
-    pub reevaluate_context: bool,
-    /// Overrides `allow_concurrent_runs` property of the task being reran.
-    /// Default: null
-    #[serde(default)]
-    pub allow_concurrent_runs: Option<bool>,
-    /// Overrides `use_new_terminal` property of the task being reran.
-    /// Default: null
-    #[serde(default)]
-    pub use_new_terminal: Option<bool>,
-
-    /// If present, rerun the task with this ID, otherwise rerun the last task.
-    #[serde(skip)]
-    pub task_id: Option<String>,
-}
-
-pub mod outline {
-    use std::sync::OnceLock;
-
-    use gpui::{AnyView, App, Window, actions};
-
-    actions!(
-        outline,
-        [
-            #[action(name = "Toggle")]
-            ToggleOutline
-        ]
-    );
-    /// A pointer to outline::toggle function, exposed here to sewer the breadcrumbs <-> outline dependency.
-    pub static TOGGLE_OUTLINE: OnceLock<fn(AnyView, &mut Window, &mut App)> = OnceLock::new();
-}
-
-actions!(
-    zed_predict_onboarding,
-    [
-        /// Opens the Zed Predict onboarding modal.
-        OpenZedPredictOnboarding
-    ]
-);
-actions!(
-    git_onboarding,
-    [
-        /// Opens the git integration onboarding modal.
-        OpenGitIntegrationOnboarding
-    ]
-);
-
-actions!(
-    debug_panel,
-    [
-        /// Toggles focus on the debug panel.
-        ToggleFocus
-    ]
-);
-actions!(
-    debugger,
-    [
-        /// Toggles the enabled state of a breakpoint.
-        ToggleEnableBreakpoint,
-        /// Removes a breakpoint.
-        UnsetBreakpoint,
-        /// Opens the project debug tasks configuration.
-        OpenProjectDebugTasks,
-    ]
-);
-
-pub mod vim {
-    use gpui::actions;
-
-    actions!(
-        vim,
-        [
-            /// Opens the default keymap file.
-            OpenDefaultKeymap
-        ]
-    );
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct WslConnectionOptions {
-    pub distro_name: String,
-    pub user: Option<String>,
-}
-
-#[cfg(target_os = "windows")]
-pub mod wsl_actions {
-    use gpui::Action;
-    use schemars::JsonSchema;
-    use serde::Deserialize;
-
-    /// Opens a folder inside Wsl.
-    #[derive(PartialEq, Clone, Deserialize, Default, JsonSchema, Action)]
-    #[action(namespace = projects)]
-    #[serde(deny_unknown_fields)]
-    pub struct OpenFolderInWsl {
-        #[serde(default)]
-        pub create_new_window: bool,
-    }
-
-    /// Open a wsl distro.
-    #[derive(PartialEq, Clone, Deserialize, Default, JsonSchema, Action)]
-    #[action(namespace = projects)]
-    #[serde(deny_unknown_fields)]
-    pub struct OpenWsl {
-        #[serde(default)]
-        pub create_new_window: bool,
-    }
-}
diff --git a/crates/zed_env_vars/Cargo.toml b/crates/zed_env_vars/Cargo.toml
deleted file mode 100644
index 1cf32174c3..0000000000
--- a/crates/zed_env_vars/Cargo.toml
+++ /dev/null
@@ -1,18 +0,0 @@
-[package]
-name = "zed_env_vars"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/zed_env_vars.rs"
-
-[features]
-default = []
-
-[dependencies]
-gpui.workspace = true
diff --git a/crates/zed_env_vars/LICENSE-GPL b/crates/zed_env_vars/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/zed_env_vars/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/zed_env_vars/src/zed_env_vars.rs b/crates/zed_env_vars/src/zed_env_vars.rs
deleted file mode 100644
index 53b9c22bb2..0000000000
--- a/crates/zed_env_vars/src/zed_env_vars.rs
+++ /dev/null
@@ -1,44 +0,0 @@
-use gpui::SharedString;
-use std::sync::LazyLock;
-
-/// Whether Zed is running in stateless mode.
-/// When true, Zed will use in-memory databases instead of persistent storage.
-pub static ZED_STATELESS: LazyLock<bool> = bool_env_var!("ZED_STATELESS");
-
-pub struct EnvVar {
-    pub name: SharedString,
-    /// Value of the environment variable. Also `None` when set to an empty string.
-    pub value: Option<String>,
-}
-
-impl EnvVar {
-    pub fn new(name: SharedString) -> Self {
-        let value = std::env::var(name.as_str()).ok();
-        if value.as_ref().is_some_and(|v| v.is_empty()) {
-            Self { name, value: None }
-        } else {
-            Self { name, value }
-        }
-    }
-
-    pub fn or(self, other: EnvVar) -> EnvVar {
-        if self.value.is_some() { self } else { other }
-    }
-}
-
-/// Creates a `LazyLock<EnvVar>` expression for use in a `static` declaration.
-#[macro_export]
-macro_rules! env_var {
-    ($name:expr) => {
-        LazyLock::new(|| $crate::EnvVar::new(($name).into()))
-    };
-}
-
-/// Generates a `LazyLock<bool>` expression for use in a `static` declaration. Checks if the
-/// environment variable exists and is non-empty.
-#[macro_export]
-macro_rules! bool_env_var {
-    ($name:expr) => {
-        LazyLock::new(|| $crate::EnvVar::new(($name).into()).value.is_some())
-    };
-}
diff --git a/crates/zeta_prompt/Cargo.toml b/crates/zeta_prompt/Cargo.toml
deleted file mode 100644
index c9b1e2d784..0000000000
--- a/crates/zeta_prompt/Cargo.toml
+++ /dev/null
@@ -1,15 +0,0 @@
-[package]
-name = "zeta_prompt"
-version = "0.1.0"
-publish.workspace = true
-edition.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/zeta_prompt.rs"
-
-[dependencies]
-serde.workspace = true
\ No newline at end of file
diff --git a/crates/zeta_prompt/LICENSE-GPL b/crates/zeta_prompt/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/zeta_prompt/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/zeta_prompt/src/zeta_prompt.rs b/crates/zeta_prompt/src/zeta_prompt.rs
deleted file mode 100644
index 21fbca1ae1..0000000000
--- a/crates/zeta_prompt/src/zeta_prompt.rs
+++ /dev/null
@@ -1,165 +0,0 @@
-use serde::{Deserialize, Serialize};
-use std::fmt::Write;
-use std::ops::Range;
-use std::path::Path;
-use std::sync::Arc;
-
-pub const CURSOR_MARKER: &str = "<|user_cursor|>";
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct ZetaPromptInput {
-    pub cursor_path: Arc<Path>,
-    pub cursor_excerpt: Arc<str>,
-    pub editable_range_in_excerpt: Range<usize>,
-    pub cursor_offset_in_excerpt: usize,
-    pub events: Vec<Arc<Event>>,
-    pub related_files: Arc<[RelatedFile]>,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-#[serde(tag = "event")]
-pub enum Event {
-    BufferChange {
-        path: Arc<Path>,
-        old_path: Arc<Path>,
-        diff: String,
-        predicted: bool,
-        in_open_source_repo: bool,
-    },
-}
-
-pub fn write_event(prompt: &mut String, event: &Event) {
-    fn write_path_as_unix_str(prompt: &mut String, path: &Path) {
-        for component in path.components() {
-            prompt.push('/');
-            write!(prompt, "{}", component.as_os_str().display()).ok();
-        }
-    }
-    match event {
-        Event::BufferChange {
-            path,
-            old_path,
-            diff,
-            predicted,
-            in_open_source_repo: _,
-        } => {
-            if *predicted {
-                prompt.push_str("// User accepted prediction:\n");
-            }
-            prompt.push_str("--- a");
-            write_path_as_unix_str(prompt, old_path.as_ref());
-            prompt.push_str("\n+++ b");
-            write_path_as_unix_str(prompt, path.as_ref());
-            prompt.push('\n');
-            prompt.push_str(diff);
-        }
-    }
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct RelatedFile {
-    pub path: Arc<Path>,
-    pub max_row: u32,
-    pub excerpts: Vec<RelatedExcerpt>,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct RelatedExcerpt {
-    pub row_range: Range<u32>,
-    pub text: String,
-}
-
-pub fn format_zeta_prompt(input: &ZetaPromptInput) -> String {
-    let mut prompt = String::new();
-    write_related_files(&mut prompt, &input.related_files);
-    write_edit_history_section(&mut prompt, input);
-    write_cursor_excerpt_section(&mut prompt, input);
-    prompt
-}
-
-pub fn write_related_files(prompt: &mut String, related_files: &[RelatedFile]) {
-    push_delimited(prompt, "related_files", &[], |prompt| {
-        for file in related_files {
-            let path_str = file.path.to_string_lossy();
-            push_delimited(prompt, "related_file", &[("path", &path_str)], |prompt| {
-                for excerpt in &file.excerpts {
-                    push_delimited(
-                        prompt,
-                        "related_excerpt",
-                        &[(
-                            "lines",
-                            &format!(
-                                "{}-{}",
-                                excerpt.row_range.start + 1,
-                                excerpt.row_range.end + 1
-                            ),
-                        )],
-                        |prompt| {
-                            prompt.push_str(&excerpt.text);
-                            prompt.push('\n');
-                        },
-                    );
-                }
-            });
-        }
-    });
-}
-
-fn write_edit_history_section(prompt: &mut String, input: &ZetaPromptInput) {
-    push_delimited(prompt, "edit_history", &[], |prompt| {
-        if input.events.is_empty() {
-            prompt.push_str("(No edit history)");
-        } else {
-            for event in &input.events {
-                write_event(prompt, event);
-            }
-        }
-    });
-}
-
-fn write_cursor_excerpt_section(prompt: &mut String, input: &ZetaPromptInput) {
-    push_delimited(prompt, "cursor_excerpt", &[], |prompt| {
-        let path_str = input.cursor_path.to_string_lossy();
-        push_delimited(prompt, "file", &[("path", &path_str)], |prompt| {
-            prompt.push_str(&input.cursor_excerpt[..input.editable_range_in_excerpt.start]);
-            push_delimited(prompt, "editable_region", &[], |prompt| {
-                prompt.push_str(
-                    &input.cursor_excerpt
-                        [input.editable_range_in_excerpt.start..input.cursor_offset_in_excerpt],
-                );
-                prompt.push_str(CURSOR_MARKER);
-                prompt.push_str(
-                    &input.cursor_excerpt
-                        [input.cursor_offset_in_excerpt..input.editable_range_in_excerpt.end],
-                );
-            });
-            prompt.push_str(&input.cursor_excerpt[input.editable_range_in_excerpt.end..]);
-        });
-    });
-}
-
-fn push_delimited(
-    prompt: &mut String,
-    tag: &'static str,
-    arguments: &[(&str, &str)],
-    cb: impl FnOnce(&mut String),
-) {
-    if !prompt.ends_with("\n") {
-        prompt.push('\n');
-    }
-    prompt.push('<');
-    prompt.push_str(tag);
-    for (arg_name, arg_value) in arguments {
-        write!(prompt, " {}=\"{}\"", arg_name, arg_value).ok();
-    }
-    prompt.push_str(">\n");
-
-    cb(prompt);
-
-    if !prompt.ends_with('\n') {
-        prompt.push('\n');
-    }
-    prompt.push_str("</");
-    prompt.push_str(tag);
-    prompt.push_str(">\n");
-}
diff --git a/crates/zlog/Cargo.toml b/crates/zlog/Cargo.toml
deleted file mode 100644
index 2799592c8e..0000000000
--- a/crates/zlog/Cargo.toml
+++ /dev/null
@@ -1,24 +0,0 @@
-[package]
-name = "zlog"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/zlog.rs"
-
-[features]
-default = []
-
-[dependencies]
-collections.workspace = true
-chrono.workspace = true
-log.workspace = true
-anyhow.workspace = true
-
-[dev-dependencies]
-tempfile.workspace = true
diff --git a/crates/zlog/LICENSE-GPL b/crates/zlog/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/zlog/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/zlog/README.md b/crates/zlog/README.md
deleted file mode 100644
index 6d0fef147c..0000000000
--- a/crates/zlog/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Zlog
-
-Use the `ZED_LOG` environment variable to control logging output for Zed
-applications and libraries. The variable accepts a comma-separated list of
-directives that specify logging levels for different modules (crates). The
-general format is for instance:
-
-```
-ZED_LOG=info,project=debug,agent=off
-```
-
-- Levels can be one of: `off`/`none`, `error`, `warn`, `info`, `debug`, or
-  `trace`.
-- You don't need to specify the global level, default is `trace` in the crate
-  and `info` set by `RUST_LOG` in Zed.
diff --git a/crates/zlog/src/env_config.rs b/crates/zlog/src/env_config.rs
deleted file mode 100644
index 38d3adc179..0000000000
--- a/crates/zlog/src/env_config.rs
+++ /dev/null
@@ -1,122 +0,0 @@
-use anyhow::Result;
-
-pub struct EnvFilter {
-    pub level_global: Option<log::LevelFilter>,
-    pub directive_names: Vec<String>,
-    pub directive_levels: Vec<log::LevelFilter>,
-}
-
-pub fn parse(filter: &str) -> Result<EnvFilter> {
-    let mut max_level = None;
-    let mut directive_names = Vec::new();
-    let mut directive_levels = Vec::new();
-
-    for directive in filter.split(',') {
-        match directive.split_once('=') {
-            Some((name, level)) => {
-                anyhow::ensure!(!level.contains('='), "Invalid directive: {directive}");
-                let level = parse_level(level.trim())?;
-                directive_names.push(name.trim().trim_end_matches(".rs").to_string());
-                directive_levels.push(level);
-            }
-            None => {
-                let Ok(level) = parse_level(directive.trim()) else {
-                    directive_names.push(directive.trim().trim_end_matches(".rs").to_string());
-                    directive_levels.push(log::LevelFilter::max() /* Enable all levels */);
-                    continue;
-                };
-                anyhow::ensure!(max_level.is_none(), "Cannot set multiple max levels");
-                max_level.replace(level);
-            }
-        };
-    }
-
-    Ok(EnvFilter {
-        level_global: max_level,
-        directive_names,
-        directive_levels,
-    })
-}
-
-fn parse_level(level: &str) -> Result<log::LevelFilter> {
-    if level.eq_ignore_ascii_case("TRACE") {
-        return Ok(log::LevelFilter::Trace);
-    }
-    if level.eq_ignore_ascii_case("DEBUG") {
-        return Ok(log::LevelFilter::Debug);
-    }
-    if level.eq_ignore_ascii_case("INFO") {
-        return Ok(log::LevelFilter::Info);
-    }
-    if level.eq_ignore_ascii_case("WARN") {
-        return Ok(log::LevelFilter::Warn);
-    }
-    if level.eq_ignore_ascii_case("ERROR") {
-        return Ok(log::LevelFilter::Error);
-    }
-    if level.eq_ignore_ascii_case("OFF") || level.eq_ignore_ascii_case("NONE") {
-        return Ok(log::LevelFilter::Off);
-    }
-    anyhow::bail!("Invalid level: {level}")
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn global_level() {
-        let input = "info";
-        let filter = parse(input).unwrap();
-
-        assert_eq!(filter.level_global.unwrap(), log::LevelFilter::Info);
-        assert!(filter.directive_names.is_empty());
-        assert!(filter.directive_levels.is_empty());
-    }
-
-    #[test]
-    fn directive_level() {
-        let input = "my_module=debug";
-        let filter = parse(input).unwrap();
-
-        assert_eq!(filter.level_global, None);
-        assert_eq!(filter.directive_names, vec!["my_module".to_string()]);
-        assert_eq!(filter.directive_levels, vec![log::LevelFilter::Debug]);
-    }
-
-    #[test]
-    fn global_level_and_directive_level() {
-        let input = "info,my_module=debug";
-        let filter = parse(input).unwrap();
-
-        assert_eq!(filter.level_global.unwrap(), log::LevelFilter::Info);
-        assert_eq!(filter.directive_names, vec!["my_module".to_string()]);
-        assert_eq!(filter.directive_levels, vec![log::LevelFilter::Debug]);
-    }
-
-    #[test]
-    fn global_level_and_bare_module() {
-        let input = "info,my_module";
-        let filter = parse(input).unwrap();
-
-        assert_eq!(filter.level_global.unwrap(), log::LevelFilter::Info);
-        assert_eq!(filter.directive_names, vec!["my_module".to_string()]);
-        assert_eq!(filter.directive_levels, vec![log::LevelFilter::max()]);
-    }
-
-    #[test]
-    fn err_when_multiple_max_levels() {
-        let input = "info,warn";
-        let result = parse(input);
-
-        assert!(result.is_err());
-    }
-
-    #[test]
-    fn err_when_invalid_level() {
-        let input = "my_module=foobar";
-        let result = parse(input);
-
-        assert!(result.is_err());
-    }
-}
diff --git a/crates/zlog/src/filter.rs b/crates/zlog/src/filter.rs
deleted file mode 100644
index 0be6f4ead5..0000000000
--- a/crates/zlog/src/filter.rs
+++ /dev/null
@@ -1,843 +0,0 @@
-use collections::HashMap;
-use std::collections::VecDeque;
-use std::sync::{
-    OnceLock, RwLock,
-    atomic::{AtomicU8, Ordering},
-};
-
-use crate::{SCOPE_DEPTH_MAX, SCOPE_STRING_SEP_STR, ScopeAlloc, ScopeRef, env_config, private};
-
-use log;
-
-static ENV_FILTER: OnceLock<env_config::EnvFilter> = OnceLock::new();
-static SCOPE_MAP: RwLock<ScopeMap> = RwLock::new(ScopeMap::empty());
-
-pub const LEVEL_ENABLED_MAX_DEFAULT: log::LevelFilter = log::LevelFilter::Info;
-/// The maximum log level of verbosity that is enabled by default.
-/// All messages more verbose than this level will be discarded
-/// by default unless specially configured.
-///
-/// This is used instead of the `log::max_level` as we need to tell the `log`
-/// crate that the max level is everything, so that we can dynamically enable
-/// logs that are more verbose than this level without the `log` crate throwing
-/// them away before we see them
-static LEVEL_ENABLED_MAX_STATIC: AtomicU8 = AtomicU8::new(LEVEL_ENABLED_MAX_DEFAULT as u8);
-
-/// A cache of the true maximum log level that _could_ be printed. This is based
-/// on the maximally verbose level that is configured by the user, and is used
-/// to filter out logs more verbose than any configured level.
-///
-/// E.g. if `LEVEL_ENABLED_MAX_STATIC `is 'info' but a user has configured some
-/// scope to print at a `debug` level, then this will be `debug`, and all
-/// `trace` logs will be discarded.
-/// Therefore, it should always be `>= LEVEL_ENABLED_MAX_STATIC`
-// PERF: this doesn't need to be an atomic, we don't actually care about race conditions here
-pub static LEVEL_ENABLED_MAX_CONFIG: AtomicU8 = AtomicU8::new(LEVEL_ENABLED_MAX_DEFAULT as u8);
-
-const DEFAULT_FILTERS: &[(&str, log::LevelFilter)] = &[
-    #[cfg(any(target_os = "linux", target_os = "freebsd"))]
-    ("zbus", log::LevelFilter::Warn),
-    #[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "windows"))]
-    ("blade_graphics", log::LevelFilter::Warn),
-    #[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "windows"))]
-    ("naga::back::spv::writer", log::LevelFilter::Warn),
-    // usvg prints a lot of warnings on rendering an SVG with partial errors, which
-    // can happen a lot with the SVG preview
-    ("usvg::parser::style", log::LevelFilter::Error),
-];
-
-pub fn init_env_filter(filter: env_config::EnvFilter) {
-    if let Some(level_max) = filter.level_global {
-        LEVEL_ENABLED_MAX_STATIC.store(level_max as u8, Ordering::Release)
-    }
-    if ENV_FILTER.set(filter).is_err() {
-        panic!("Environment filter cannot be initialized twice");
-    }
-}
-
-pub fn is_possibly_enabled_level(level: log::Level) -> bool {
-    level as u8 <= LEVEL_ENABLED_MAX_CONFIG.load(Ordering::Acquire)
-}
-
-pub fn is_scope_enabled(
-    scope: &ScopeRef<'_>,
-    module_path: Option<&str>,
-    level: log::Level,
-) -> bool {
-    // TODO: is_always_allowed_level that checks against LEVEL_ENABLED_MIN_CONFIG
-    if !is_possibly_enabled_level(level) {
-        // [FAST PATH]
-        // if the message is above the maximum enabled log level
-        // (where error < warn < info etc) then disable without checking
-        // scope map
-        return false;
-    }
-    let is_enabled_by_default = level as u8 <= LEVEL_ENABLED_MAX_STATIC.load(Ordering::Acquire);
-    let global_scope_map = SCOPE_MAP.read().unwrap_or_else(|err| {
-        SCOPE_MAP.clear_poison();
-        err.into_inner()
-    });
-
-    if global_scope_map.is_empty() {
-        // if no scopes are enabled, return false because it's not <= LEVEL_ENABLED_MAX_STATIC
-        return is_enabled_by_default;
-    }
-    let enabled_status = global_scope_map.is_enabled(scope, module_path, level);
-    match enabled_status {
-        EnabledStatus::NotConfigured => is_enabled_by_default,
-        EnabledStatus::Enabled => true,
-        EnabledStatus::Disabled => false,
-    }
-}
-
-pub fn refresh_from_settings(settings: &HashMap<String, String>) {
-    let env_config = ENV_FILTER.get();
-    let map_new = ScopeMap::new_from_settings_and_env(settings, env_config, DEFAULT_FILTERS);
-    let mut level_enabled_max = LEVEL_ENABLED_MAX_STATIC.load(Ordering::Acquire);
-    for entry in &map_new.entries {
-        if let Some(level) = entry.enabled {
-            level_enabled_max = level_enabled_max.max(level as u8);
-        }
-    }
-    LEVEL_ENABLED_MAX_CONFIG.store(level_enabled_max, Ordering::Release);
-
-    {
-        let mut global_map = SCOPE_MAP.write().unwrap_or_else(|err| {
-            SCOPE_MAP.clear_poison();
-            err.into_inner()
-        });
-        *global_map = map_new;
-    }
-    log::trace!("Log configuration updated");
-}
-
-fn level_filter_from_str(level_str: &str) -> Option<log::LevelFilter> {
-    use log::LevelFilter::*;
-    let level = match level_str.to_ascii_lowercase().as_str() {
-        "" => Trace,
-        "trace" => Trace,
-        "debug" => Debug,
-        "info" => Info,
-        "warn" => Warn,
-        "error" => Error,
-        "off" => Off,
-        "disable" | "no" | "none" | "disabled" => {
-            crate::warn!(
-                "Invalid log level \"{level_str}\", to disable logging set to \"off\". Defaulting to \"off\"."
-            );
-            Off
-        }
-        _ => {
-            crate::warn!("Invalid log level \"{level_str}\", ignoring");
-            return None;
-        }
-    };
-    Some(level)
-}
-
-fn scope_alloc_from_scope_str(scope_str: &str) -> Option<ScopeAlloc> {
-    let mut scope_buf = [""; SCOPE_DEPTH_MAX];
-    let mut index = 0;
-    let mut scope_iter = scope_str.split(SCOPE_STRING_SEP_STR);
-    while index < SCOPE_DEPTH_MAX {
-        let Some(scope) = scope_iter.next() else {
-            break;
-        };
-        if scope.is_empty() {
-            continue;
-        }
-        scope_buf[index] = scope;
-        index += 1;
-    }
-    if index == 0 {
-        return None;
-    }
-    if scope_iter.next().is_some() {
-        crate::warn!(
-            "Invalid scope key, too many nested scopes: '{scope_str}'. Max depth is {SCOPE_DEPTH_MAX}",
-        );
-        return None;
-    }
-    let scope = scope_buf.map(|s| s.to_string());
-    Some(scope)
-}
-
-#[derive(Debug, PartialEq, Eq)]
-pub struct ScopeMap {
-    entries: Vec<ScopeMapEntry>,
-    modules: Vec<(String, log::LevelFilter)>,
-    root_count: usize,
-}
-
-#[derive(Debug, PartialEq, Eq)]
-pub struct ScopeMapEntry {
-    scope: String,
-    enabled: Option<log::LevelFilter>,
-    descendants: std::ops::Range<usize>,
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum EnabledStatus {
-    Enabled,
-    Disabled,
-    NotConfigured,
-}
-
-impl ScopeMap {
-    pub fn new_from_settings_and_env(
-        items_input_map: &HashMap<String, String>,
-        env_config: Option<&env_config::EnvFilter>,
-        default_filters: &[(&str, log::LevelFilter)],
-    ) -> Self {
-        let mut items = Vec::<(ScopeAlloc, log::LevelFilter)>::with_capacity(
-            items_input_map.len()
-                + env_config.map_or(0, |c| c.directive_names.len())
-                + default_filters.len(),
-        );
-        let mut modules = Vec::with_capacity(4);
-
-        let env_filters = env_config.iter().flat_map(|env_filter| {
-            env_filter
-                .directive_names
-                .iter()
-                .zip(env_filter.directive_levels.iter())
-                .map(|(scope_str, level_filter)| (scope_str.as_str(), *level_filter))
-        });
-
-        let new_filters = items_input_map.iter().filter_map(|(scope_str, level_str)| {
-            let level_filter = level_filter_from_str(level_str)?;
-            Some((scope_str.as_str(), level_filter))
-        });
-
-        let all_filters = default_filters
-            .iter()
-            .cloned()
-            .chain(env_filters)
-            .chain(new_filters);
-
-        for (scope_str, level_filter) in all_filters {
-            if scope_str.contains("::") {
-                if let Some(idx) = modules.iter().position(|(module, _)| module == scope_str) {
-                    modules[idx].1 = level_filter;
-                } else {
-                    modules.push((scope_str.to_string(), level_filter));
-                }
-                continue;
-            }
-            let Some(scope) = scope_alloc_from_scope_str(scope_str) else {
-                continue;
-            };
-            if let Some(idx) = items
-                .iter()
-                .position(|(scope_existing, _)| scope_existing == &scope)
-            {
-                items[idx].1 = level_filter;
-            } else {
-                items.push((scope, level_filter));
-            }
-        }
-
-        items.sort_by(|a, b| a.0.cmp(&b.0));
-        modules.sort_by(|(a_name, _), (b_name, _)| a_name.cmp(b_name));
-
-        let mut this = Self {
-            entries: Vec::with_capacity(items.len() * SCOPE_DEPTH_MAX),
-            modules,
-            root_count: 0,
-        };
-
-        let items_count = items.len();
-
-        struct ProcessQueueEntry {
-            parent_index: usize,
-            depth: usize,
-            items_range: std::ops::Range<usize>,
-        }
-        let mut process_queue = VecDeque::new();
-        process_queue.push_back(ProcessQueueEntry {
-            parent_index: usize::MAX,
-            depth: 0,
-            items_range: 0..items_count,
-        });
-
-        let empty_range = 0..0;
-
-        while let Some(process_entry) = process_queue.pop_front() {
-            let ProcessQueueEntry {
-                items_range,
-                depth,
-                parent_index,
-            } = process_entry;
-            let mut cursor = items_range.start;
-            let res_entries_start = this.entries.len();
-            while cursor < items_range.end {
-                let sub_items_start = cursor;
-                cursor += 1;
-                let scope_name = &items[sub_items_start].0[depth];
-                while cursor < items_range.end && &items[cursor].0[depth] == scope_name {
-                    cursor += 1;
-                }
-                let sub_items_end = cursor;
-                if scope_name.is_empty() {
-                    assert_eq!(sub_items_start + 1, sub_items_end);
-                    assert_ne!(depth, 0);
-                    assert_ne!(parent_index, usize::MAX);
-                    assert!(this.entries[parent_index].enabled.is_none());
-                    this.entries[parent_index].enabled = Some(items[sub_items_start].1);
-                    continue;
-                }
-                let is_valid_scope = !scope_name.is_empty();
-                let is_last = depth + 1 == SCOPE_DEPTH_MAX || !is_valid_scope;
-                let mut enabled = None;
-                if is_last {
-                    assert_eq!(
-                        sub_items_start + 1,
-                        sub_items_end,
-                        "Expected one item: got: {:?}",
-                        &items[items_range]
-                    );
-                    enabled = Some(items[sub_items_start].1);
-                } else {
-                    let entry_index = this.entries.len();
-                    process_queue.push_back(ProcessQueueEntry {
-                        items_range: sub_items_start..sub_items_end,
-                        parent_index: entry_index,
-                        depth: depth + 1,
-                    });
-                }
-                this.entries.push(ScopeMapEntry {
-                    scope: scope_name.to_owned(),
-                    enabled,
-                    descendants: empty_range.clone(),
-                });
-            }
-            let res_entries_end = this.entries.len();
-            if parent_index != usize::MAX {
-                this.entries[parent_index].descendants = res_entries_start..res_entries_end;
-            } else {
-                this.root_count = res_entries_end;
-            }
-        }
-
-        this
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.entries.is_empty() && self.modules.is_empty()
-    }
-
-    pub fn is_enabled<S>(
-        &self,
-        scope: &[S; SCOPE_DEPTH_MAX],
-        module_path: Option<&str>,
-        level: log::Level,
-    ) -> EnabledStatus
-    where
-        S: AsRef<str>,
-    {
-        fn search<S>(map: &ScopeMap, scope: &[S; SCOPE_DEPTH_MAX]) -> Option<log::LevelFilter>
-        where
-            S: AsRef<str>,
-        {
-            let mut enabled = None;
-            let mut cur_range = &map.entries[0..map.root_count];
-            let mut depth = 0;
-            'search: while !cur_range.is_empty()
-                && depth < SCOPE_DEPTH_MAX
-                && scope[depth].as_ref() != ""
-            {
-                for entry in cur_range {
-                    if entry.scope == scope[depth].as_ref() {
-                        enabled = entry.enabled.or(enabled);
-                        cur_range = &map.entries[entry.descendants.clone()];
-                        depth += 1;
-                        continue 'search;
-                    }
-                }
-                break 'search;
-            }
-            enabled
-        }
-
-        let mut enabled = search(self, scope);
-
-        if let Some(module_path) = module_path {
-            let scope_is_empty = scope[0].as_ref().is_empty();
-
-            if enabled.is_none() && scope_is_empty {
-                let crate_name = private::extract_crate_name_from_module_path(module_path);
-                let mut crate_name_scope = [""; SCOPE_DEPTH_MAX];
-                crate_name_scope[0] = crate_name;
-                enabled = search(self, &crate_name_scope);
-            }
-
-            if !self.modules.is_empty() {
-                let crate_name = private::extract_crate_name_from_module_path(module_path);
-                let is_scope_just_crate_name =
-                    scope[0].as_ref() == crate_name && scope[1].as_ref() == "";
-                if enabled.is_none() || is_scope_just_crate_name {
-                    for (module, filter) in &self.modules {
-                        if module == module_path {
-                            enabled.replace(*filter);
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-
-        if let Some(enabled_filter) = enabled {
-            if level <= enabled_filter {
-                return EnabledStatus::Enabled;
-            }
-            return EnabledStatus::Disabled;
-        }
-        EnabledStatus::NotConfigured
-    }
-
-    const fn empty() -> ScopeMap {
-        ScopeMap {
-            entries: vec![],
-            modules: vec![],
-            root_count: 0,
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use log::LevelFilter;
-
-    use crate::Scope;
-    use crate::private::scope_new;
-
-    use super::*;
-
-    fn scope_map_from_keys(kv: &[(&str, &str)]) -> ScopeMap {
-        let hash_map: HashMap<String, String> = kv
-            .iter()
-            .map(|(k, v)| (k.to_string(), v.to_string()))
-            .collect();
-        ScopeMap::new_from_settings_and_env(&hash_map, None, &[])
-    }
-
-    #[test]
-    fn test_initialization() {
-        let map = scope_map_from_keys(&[("a.b.c.d", "trace")]);
-        assert_eq!(map.root_count, 1);
-        assert_eq!(map.entries.len(), 4);
-
-        let map = scope_map_from_keys(&[]);
-        assert_eq!(map.root_count, 0);
-        assert_eq!(map.entries.len(), 0);
-
-        let map = scope_map_from_keys(&[("", "trace")]);
-        assert_eq!(map.root_count, 0);
-        assert_eq!(map.entries.len(), 0);
-
-        let map = scope_map_from_keys(&[("foo..bar", "trace")]);
-        assert_eq!(map.root_count, 1);
-        assert_eq!(map.entries.len(), 2);
-
-        let map = scope_map_from_keys(&[
-            ("a.b.c.d", "trace"),
-            ("e.f.g.h", "debug"),
-            ("i.j.k.l", "info"),
-            ("m.n.o.p", "warn"),
-            ("q.r.s.t", "error"),
-        ]);
-        assert_eq!(map.root_count, 5);
-        assert_eq!(map.entries.len(), 20);
-        assert_eq!(map.entries[0].scope, "a");
-        assert_eq!(map.entries[1].scope, "e");
-        assert_eq!(map.entries[2].scope, "i");
-        assert_eq!(map.entries[3].scope, "m");
-        assert_eq!(map.entries[4].scope, "q");
-    }
-
-    fn scope_from_scope_str(scope_str: &'static str) -> Scope {
-        let mut scope_buf = [""; SCOPE_DEPTH_MAX];
-        let mut index = 0;
-        let mut scope_iter = scope_str.split(SCOPE_STRING_SEP_STR);
-        while index < SCOPE_DEPTH_MAX {
-            let Some(scope) = scope_iter.next() else {
-                break;
-            };
-            if scope.is_empty() {
-                continue;
-            }
-            scope_buf[index] = scope;
-            index += 1;
-        }
-        assert_ne!(index, 0);
-        assert!(scope_iter.next().is_none());
-        scope_buf
-    }
-
-    #[test]
-    fn test_is_enabled() {
-        let map = scope_map_from_keys(&[
-            ("a.b.c.d", "trace"),
-            ("e.f.g.h", "debug"),
-            ("i.j.k.l", "info"),
-            ("m.n.o.p", "warn"),
-            ("q.r.s.t", "error"),
-        ]);
-        use log::Level;
-        assert_eq!(
-            map.is_enabled(&scope_from_scope_str("a.b.c.d"), None, Level::Trace),
-            EnabledStatus::Enabled
-        );
-        assert_eq!(
-            map.is_enabled(&scope_from_scope_str("a.b.c.d"), None, Level::Debug),
-            EnabledStatus::Enabled
-        );
-
-        assert_eq!(
-            map.is_enabled(&scope_from_scope_str("e.f.g.h"), None, Level::Debug),
-            EnabledStatus::Enabled
-        );
-        assert_eq!(
-            map.is_enabled(&scope_from_scope_str("e.f.g.h"), None, Level::Info),
-            EnabledStatus::Enabled
-        );
-        assert_eq!(
-            map.is_enabled(&scope_from_scope_str("e.f.g.h"), None, Level::Trace),
-            EnabledStatus::Disabled
-        );
-
-        assert_eq!(
-            map.is_enabled(&scope_from_scope_str("i.j.k.l"), None, Level::Info),
-            EnabledStatus::Enabled
-        );
-        assert_eq!(
-            map.is_enabled(&scope_from_scope_str("i.j.k.l"), None, Level::Warn),
-            EnabledStatus::Enabled
-        );
-        assert_eq!(
-            map.is_enabled(&scope_from_scope_str("i.j.k.l"), None, Level::Debug),
-            EnabledStatus::Disabled
-        );
-
-        assert_eq!(
-            map.is_enabled(&scope_from_scope_str("m.n.o.p"), None, Level::Warn),
-            EnabledStatus::Enabled
-        );
-        assert_eq!(
-            map.is_enabled(&scope_from_scope_str("m.n.o.p"), None, Level::Error),
-            EnabledStatus::Enabled
-        );
-        assert_eq!(
-            map.is_enabled(&scope_from_scope_str("m.n.o.p"), None, Level::Info),
-            EnabledStatus::Disabled
-        );
-
-        assert_eq!(
-            map.is_enabled(&scope_from_scope_str("q.r.s.t"), None, Level::Error),
-            EnabledStatus::Enabled
-        );
-        assert_eq!(
-            map.is_enabled(&scope_from_scope_str("q.r.s.t"), None, Level::Warn),
-            EnabledStatus::Disabled
-        );
-    }
-
-    #[test]
-    fn test_is_enabled_module() {
-        let mut map = scope_map_from_keys(&[("a", "trace")]);
-        map.modules = [("a::b::c", "trace"), ("a::b::d", "debug")]
-            .map(|(k, v)| (k.to_string(), v.parse().unwrap()))
-            .to_vec();
-        use log::Level;
-        assert_eq!(
-            map.is_enabled(
-                &scope_from_scope_str("__unused__"),
-                Some("a::b::c"),
-                Level::Trace
-            ),
-            EnabledStatus::Enabled
-        );
-        assert_eq!(
-            map.is_enabled(
-                &scope_from_scope_str("__unused__"),
-                Some("a::b::d"),
-                Level::Debug
-            ),
-            EnabledStatus::Enabled
-        );
-        assert_eq!(
-            map.is_enabled(
-                &scope_from_scope_str("__unused__"),
-                Some("a::b::d"),
-                Level::Trace,
-            ),
-            EnabledStatus::Disabled
-        );
-        assert_eq!(
-            map.is_enabled(
-                &scope_from_scope_str("__unused__"),
-                Some("a::e"),
-                Level::Info
-            ),
-            EnabledStatus::NotConfigured
-        );
-        // when scope is just crate name, more specific module path overrides it
-        assert_eq!(
-            map.is_enabled(&scope_from_scope_str("a"), Some("a::b::d"), Level::Trace),
-            EnabledStatus::Disabled,
-        );
-        // but when it is scoped, the scope overrides the module path
-        assert_eq!(
-            map.is_enabled(
-                &scope_from_scope_str("a.scope"),
-                Some("a::b::d"),
-                Level::Trace
-            ),
-            EnabledStatus::Enabled,
-        );
-    }
-
-    fn scope_map_from_keys_and_env(kv: &[(&str, &str)], env: &env_config::EnvFilter) -> ScopeMap {
-        let hash_map: HashMap<String, String> = kv
-            .iter()
-            .map(|(k, v)| (k.to_string(), v.to_string()))
-            .collect();
-        ScopeMap::new_from_settings_and_env(&hash_map, Some(env), &[])
-    }
-
-    #[test]
-    fn test_initialization_with_env() {
-        let env_filter = env_config::parse("a.b=debug,u=error").unwrap();
-        let map = scope_map_from_keys_and_env(&[], &env_filter);
-        assert_eq!(map.root_count, 2);
-        assert_eq!(map.entries.len(), 3);
-        assert_eq!(
-            map.is_enabled(&scope_new(&["a"]), None, log::Level::Debug),
-            EnabledStatus::NotConfigured
-        );
-        assert_eq!(
-            map.is_enabled(&scope_new(&["a", "b"]), None, log::Level::Debug),
-            EnabledStatus::Enabled
-        );
-        assert_eq!(
-            map.is_enabled(&scope_new(&["a", "b", "c"]), None, log::Level::Trace),
-            EnabledStatus::Disabled
-        );
-
-        let env_filter = env_config::parse("a.b=debug,e.f.g.h=trace,u=error").unwrap();
-        let map = scope_map_from_keys_and_env(
-            &[
-                ("a.b.c.d", "trace"),
-                ("e.f.g.h", "debug"),
-                ("i.j.k.l", "info"),
-                ("m.n.o.p", "warn"),
-                ("q.r.s.t", "error"),
-            ],
-            &env_filter,
-        );
-        assert_eq!(map.root_count, 6);
-        assert_eq!(map.entries.len(), 21);
-        assert_eq!(map.entries[0].scope, "a");
-        assert_eq!(map.entries[1].scope, "e");
-        assert_eq!(map.entries[2].scope, "i");
-        assert_eq!(map.entries[3].scope, "m");
-        assert_eq!(map.entries[4].scope, "q");
-        assert_eq!(map.entries[5].scope, "u");
-        assert_eq!(
-            map.is_enabled(&scope_new(&["a", "b", "c", "d"]), None, log::Level::Trace),
-            EnabledStatus::Enabled
-        );
-        assert_eq!(
-            map.is_enabled(&scope_new(&["a", "b", "c"]), None, log::Level::Trace),
-            EnabledStatus::Disabled
-        );
-        assert_eq!(
-            map.is_enabled(&scope_new(&["u", "v"]), None, log::Level::Warn),
-            EnabledStatus::Disabled
-        );
-        // settings override env
-        assert_eq!(
-            map.is_enabled(&scope_new(&["e", "f", "g", "h"]), None, log::Level::Trace),
-            EnabledStatus::Disabled,
-        );
-    }
-
-    fn scope_map_from_all(
-        kv: &[(&str, &str)],
-        env: &env_config::EnvFilter,
-        default_filters: &[(&str, log::LevelFilter)],
-    ) -> ScopeMap {
-        let hash_map: HashMap<String, String> = kv
-            .iter()
-            .map(|(k, v)| (k.to_string(), v.to_string()))
-            .collect();
-        ScopeMap::new_from_settings_and_env(&hash_map, Some(env), default_filters)
-    }
-
-    #[test]
-    fn precedence() {
-        // Test precedence: kv > env > default
-
-        // Default filters - these should be overridden by env and kv when they overlap
-        let default_filters = &[
-            ("a.b.c", log::LevelFilter::Debug), // Should be overridden by env
-            ("p.q.r", log::LevelFilter::Info),  // Should be overridden by kv
-            ("x.y.z", log::LevelFilter::Warn),  // Not overridden
-            ("crate::module::default", log::LevelFilter::Error), // Module in default
-            ("crate::module::user", log::LevelFilter::Off), // Module disabled in default
-        ];
-
-        // Environment filters - these should override default but be overridden by kv
-        let env_filter =
-            env_config::parse("a.b.c=trace,p.q=debug,m.n.o=error,crate::module::env=debug")
-                .unwrap();
-
-        // Key-value filters (highest precedence) - these should override everything
-        let kv_filters = &[
-            ("p.q.r", "trace"),              // Overrides default
-            ("m.n.o", "warn"),               // Overrides env
-            ("j.k.l", "info"),               // New filter
-            ("crate::module::env", "trace"), // Overrides env for module
-            ("crate::module::kv", "trace"),  // New module filter
-        ];
-
-        let map = scope_map_from_all(kv_filters, &env_filter, default_filters);
-
-        // Test scope precedence
-        use log::Level;
-
-        // KV overrides all for scopes
-        assert_eq!(
-            map.is_enabled(&scope_from_scope_str("p.q.r"), None, Level::Trace),
-            EnabledStatus::Enabled,
-            "KV should override default filters for scopes"
-        );
-        assert_eq!(
-            map.is_enabled(&scope_from_scope_str("m.n.o"), None, Level::Warn),
-            EnabledStatus::Enabled,
-            "KV should override env filters for scopes"
-        );
-        assert_eq!(
-            map.is_enabled(&scope_from_scope_str("m.n.o"), None, Level::Debug),
-            EnabledStatus::Disabled,
-            "KV correctly limits log level"
-        );
-
-        // ENV overrides default but not KV for scopes
-        assert_eq!(
-            map.is_enabled(&scope_from_scope_str("a.b.c"), None, Level::Trace),
-            EnabledStatus::Enabled,
-            "ENV should override default filters for scopes"
-        );
-
-        // Default is used when no override exists for scopes
-        assert_eq!(
-            map.is_enabled(&scope_from_scope_str("x.y.z"), None, Level::Warn),
-            EnabledStatus::Enabled,
-            "Default filters should work when not overridden"
-        );
-        assert_eq!(
-            map.is_enabled(&scope_from_scope_str("x.y.z"), None, Level::Info),
-            EnabledStatus::Disabled,
-            "Default filters correctly limit log level"
-        );
-
-        // KV overrides all for modules
-        assert_eq!(
-            map.is_enabled(&scope_new(&[""]), Some("crate::module::env"), Level::Trace),
-            EnabledStatus::Enabled,
-            "KV should override env filters for modules"
-        );
-        assert_eq!(
-            map.is_enabled(&scope_new(&[""]), Some("crate::module::kv"), Level::Trace),
-            EnabledStatus::Enabled,
-            "KV module filters should work"
-        );
-
-        // ENV overrides default for modules
-        assert_eq!(
-            map.is_enabled(&scope_new(&[""]), Some("crate::module::env"), Level::Debug),
-            EnabledStatus::Enabled,
-            "ENV should override default for modules"
-        );
-
-        // Default is used when no override exists for modules
-        assert_eq!(
-            map.is_enabled(
-                &scope_new(&[""]),
-                Some("crate::module::default"),
-                Level::Error
-            ),
-            EnabledStatus::Enabled,
-            "Default filters should work for modules"
-        );
-        assert_eq!(
-            map.is_enabled(
-                &scope_new(&[""]),
-                Some("crate::module::default"),
-                Level::Warn
-            ),
-            EnabledStatus::Disabled,
-            "Default filters correctly limit log level for modules"
-        );
-
-        assert_eq!(
-            map.is_enabled(&scope_new(&[""]), Some("crate::module::user"), Level::Error),
-            EnabledStatus::Disabled,
-            "Module turned off in default filters is not enabled"
-        );
-
-        assert_eq!(
-            map.is_enabled(
-                &scope_new(&["crate"]),
-                Some("crate::module::user"),
-                Level::Error
-            ),
-            EnabledStatus::Disabled,
-            "Module turned off in default filters is not enabled, even with crate name as scope"
-        );
-
-        // Test non-conflicting but similar paths
-
-        // Test that "a.b" and "a.b.c" don't conflict (different depth)
-        assert_eq!(
-            map.is_enabled(&scope_from_scope_str("a.b.c.d"), None, Level::Trace),
-            EnabledStatus::Enabled,
-            "Scope a.b.c should inherit from a.b env filter"
-        );
-        assert_eq!(
-            map.is_enabled(&scope_from_scope_str("a.b.c"), None, Level::Trace),
-            EnabledStatus::Enabled,
-            "Scope a.b.c.d should use env filter level (trace)"
-        );
-
-        // Test that similar module paths don't conflict
-        assert_eq!(
-            map.is_enabled(&scope_new(&[""]), Some("crate::module"), Level::Error),
-            EnabledStatus::NotConfigured,
-            "Module crate::module should not be affected by crate::module::default filter"
-        );
-        assert_eq!(
-            map.is_enabled(
-                &scope_new(&[""]),
-                Some("crate::module::default::sub"),
-                Level::Error
-            ),
-            EnabledStatus::NotConfigured,
-            "Module crate::module::default::sub should not be affected by crate::module::default filter"
-        );
-    }
-
-    #[test]
-    fn default_filter_crate() {
-        let default_filters = &[("crate", LevelFilter::Off)];
-        let map = scope_map_from_all(&[], &env_config::parse("").unwrap(), default_filters);
-
-        use log::Level;
-        assert_eq!(
-            map.is_enabled(&scope_new(&[""]), Some("crate::submodule"), Level::Error),
-            EnabledStatus::Disabled,
-            "crate::submodule should be disabled by disabling `crate` filter"
-        );
-    }
-}
diff --git a/crates/zlog/src/sink.rs b/crates/zlog/src/sink.rs
deleted file mode 100644
index 07e87be1b0..0000000000
--- a/crates/zlog/src/sink.rs
+++ /dev/null
@@ -1,324 +0,0 @@
-use std::{
-    fs,
-    io::{self, Write},
-    path::PathBuf,
-    sync::{
-        Mutex, OnceLock,
-        atomic::{AtomicBool, AtomicU64, Ordering},
-    },
-};
-
-use crate::{SCOPE_STRING_SEP_CHAR, ScopeRef};
-
-// ANSI color escape codes for log levels
-const ANSI_RESET: &str = "\x1b[0m";
-const ANSI_BOLD: &str = "\x1b[1m";
-const ANSI_RED: &str = "\x1b[31m";
-const ANSI_YELLOW: &str = "\x1b[33m";
-const ANSI_GREEN: &str = "\x1b[32m";
-const ANSI_BLUE: &str = "\x1b[34m";
-const ANSI_MAGENTA: &str = "\x1b[35m";
-
-/// Is Some(file) if file output is enabled.
-static ENABLED_SINKS_FILE: Mutex<Option<std::fs::File>> = Mutex::new(None);
-static SINK_FILE_PATH: OnceLock<&'static PathBuf> = OnceLock::new();
-static SINK_FILE_PATH_ROTATE: OnceLock<&'static PathBuf> = OnceLock::new();
-
-// NB: Since this can be accessed in tests, we probably should stick to atomics here.
-/// Whether stdout output is enabled.
-static ENABLED_SINKS_STDOUT: AtomicBool = AtomicBool::new(false);
-/// Whether stderr output is enabled.
-static ENABLED_SINKS_STDERR: AtomicBool = AtomicBool::new(false);
-/// Atomic counter for the size of the log file in bytes.
-static SINK_FILE_SIZE_BYTES: AtomicU64 = AtomicU64::new(0);
-/// Maximum size of the log file before it will be rotated, in bytes.
-const SINK_FILE_SIZE_BYTES_MAX: u64 = 1024 * 1024; // 1 MB
-
-pub struct Record<'a> {
-    pub scope: ScopeRef<'a>,
-    pub level: log::Level,
-    pub message: &'a std::fmt::Arguments<'a>,
-    pub module_path: Option<&'a str>,
-    pub line: Option<u32>,
-}
-
-pub fn init_output_stdout() {
-    // Use atomics here instead of just a `static mut`, since in the context
-    // of tests these accesses can be multi-threaded.
-    ENABLED_SINKS_STDOUT.store(true, Ordering::Release);
-}
-
-pub fn init_output_stderr() {
-    ENABLED_SINKS_STDERR.store(true, Ordering::Release);
-}
-
-pub fn init_output_file(
-    path: &'static PathBuf,
-    path_rotate: Option<&'static PathBuf>,
-) -> io::Result<()> {
-    let mut file = std::fs::OpenOptions::new()
-        .create(true)
-        .append(true)
-        .open(path)?;
-
-    SINK_FILE_PATH
-        .set(path)
-        .expect("Init file output should only be called once");
-    if let Some(path_rotate) = path_rotate {
-        SINK_FILE_PATH_ROTATE
-            .set(path_rotate)
-            .expect("Init file output should only be called once");
-    }
-
-    let mut enabled_sinks_file = ENABLED_SINKS_FILE
-        .try_lock()
-        .expect("Log file lock is available during init");
-
-    let size_bytes = file.metadata().map_or(0, |metadata| metadata.len());
-    if size_bytes >= SINK_FILE_SIZE_BYTES_MAX {
-        rotate_log_file(&mut file, Some(path), path_rotate, &SINK_FILE_SIZE_BYTES);
-    } else {
-        SINK_FILE_SIZE_BYTES.store(size_bytes, Ordering::Release);
-    }
-
-    *enabled_sinks_file = Some(file);
-
-    Ok(())
-}
-
-const LEVEL_OUTPUT_STRINGS: [&str; 6] = [
-    "     ", // nop: ERROR = 1
-    "ERROR", //
-    "WARN ", //
-    "INFO ", //
-    "DEBUG", //
-    "TRACE", //
-];
-
-// Colors for different log levels
-static LEVEL_ANSI_COLORS: [&str; 6] = [
-    "",           // nop
-    ANSI_RED,     // Error: Red
-    ANSI_YELLOW,  // Warn: Yellow
-    ANSI_GREEN,   // Info: Green
-    ANSI_BLUE,    // Debug: Blue
-    ANSI_MAGENTA, // Trace: Magenta
-];
-
-// PERF: batching
-pub fn submit(mut record: Record) {
-    if record.module_path.is_none_or(|p| !p.ends_with(".rs")) {
-        // Only render line numbers for actual rust files emitted by `log_err` and friends
-        record.line.take();
-    }
-    if ENABLED_SINKS_STDOUT.load(Ordering::Acquire) {
-        let mut stdout = std::io::stdout().lock();
-        _ = writeln!(
-            &mut stdout,
-            "{} {ANSI_BOLD}{}{}{ANSI_RESET} {} {}",
-            chrono::Local::now().format("%Y-%m-%dT%H:%M:%S%:z"),
-            LEVEL_ANSI_COLORS[record.level as usize],
-            LEVEL_OUTPUT_STRINGS[record.level as usize],
-            SourceFmt {
-                scope: record.scope,
-                module_path: record.module_path,
-                line: record.line,
-                ansi: true,
-            },
-            record.message
-        );
-    } else if ENABLED_SINKS_STDERR.load(Ordering::Acquire) {
-        let mut stdout = std::io::stderr().lock();
-        _ = writeln!(
-            &mut stdout,
-            "{} {ANSI_BOLD}{}{}{ANSI_RESET} {} {}",
-            chrono::Local::now().format("%Y-%m-%dT%H:%M:%S%:z"),
-            LEVEL_ANSI_COLORS[record.level as usize],
-            LEVEL_OUTPUT_STRINGS[record.level as usize],
-            SourceFmt {
-                scope: record.scope,
-                module_path: record.module_path,
-                line: record.line,
-                ansi: true,
-            },
-            record.message
-        );
-    }
-    let mut file = ENABLED_SINKS_FILE.lock().unwrap_or_else(|handle| {
-        ENABLED_SINKS_FILE.clear_poison();
-        handle.into_inner()
-    });
-    if let Some(file) = file.as_mut() {
-        struct SizedWriter<'a> {
-            file: &'a mut std::fs::File,
-            written: u64,
-        }
-        impl io::Write for SizedWriter<'_> {
-            fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-                self.file.write(buf)?;
-                self.written += buf.len() as u64;
-                Ok(buf.len())
-            }
-
-            fn flush(&mut self) -> io::Result<()> {
-                self.file.flush()
-            }
-        }
-        let file_size_bytes = {
-            let mut writer = SizedWriter { file, written: 0 };
-            _ = writeln!(
-                &mut writer,
-                "{} {} {} {}",
-                chrono::Local::now().format("%Y-%m-%dT%H:%M:%S%:z"),
-                LEVEL_OUTPUT_STRINGS[record.level as usize],
-                SourceFmt {
-                    scope: record.scope,
-                    module_path: record.module_path,
-                    line: record.line,
-                    ansi: false,
-                },
-                record.message
-            );
-            SINK_FILE_SIZE_BYTES.fetch_add(writer.written, Ordering::AcqRel) + writer.written
-        };
-        if file_size_bytes > SINK_FILE_SIZE_BYTES_MAX {
-            rotate_log_file(
-                file,
-                SINK_FILE_PATH.get(),
-                SINK_FILE_PATH_ROTATE.get(),
-                &SINK_FILE_SIZE_BYTES,
-            );
-        }
-    }
-}
-
-pub fn flush() {
-    if ENABLED_SINKS_STDOUT.load(Ordering::Acquire) {
-        _ = std::io::stdout().lock().flush();
-    }
-    let mut file = ENABLED_SINKS_FILE.lock().unwrap_or_else(|handle| {
-        ENABLED_SINKS_FILE.clear_poison();
-        handle.into_inner()
-    });
-    if let Some(file) = file.as_mut()
-        && let Err(err) = file.flush()
-    {
-        eprintln!("Failed to flush log file: {}", err);
-    }
-}
-
-struct SourceFmt<'a> {
-    scope: ScopeRef<'a>,
-    module_path: Option<&'a str>,
-    line: Option<u32>,
-    ansi: bool,
-}
-
-impl std::fmt::Display for SourceFmt<'_> {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        use std::fmt::Write;
-        f.write_char('[')?;
-        if self.ansi {
-            f.write_str(ANSI_BOLD)?;
-        }
-        // NOTE: if no longer prefixing scopes with their crate name, check if scope[0] is empty
-        if (self.scope[1].is_empty() && self.module_path.is_some()) || self.scope[0].is_empty() {
-            f.write_str(self.module_path.unwrap_or("?"))?;
-        } else {
-            f.write_str(self.scope[0])?;
-            for subscope in &self.scope[1..] {
-                if subscope.is_empty() {
-                    break;
-                }
-                f.write_char(SCOPE_STRING_SEP_CHAR)?;
-                f.write_str(subscope)?;
-            }
-        }
-        if let Some(line) = self.line {
-            f.write_char(':')?;
-            line.fmt(f)?;
-        }
-        if self.ansi {
-            f.write_str(ANSI_RESET)?;
-        }
-        f.write_char(']')?;
-        Ok(())
-    }
-}
-
-fn rotate_log_file<PathRef>(
-    file: &mut fs::File,
-    path: Option<PathRef>,
-    path_rotate: Option<PathRef>,
-    atomic_size: &AtomicU64,
-) where
-    PathRef: AsRef<std::path::Path>,
-{
-    if let Err(err) = file.flush() {
-        eprintln!(
-            "Failed to flush log file before rotating, some logs may be lost: {}",
-            err
-        );
-    }
-    let rotation_error = match (path, path_rotate) {
-        (Some(_), None) => Some(anyhow::anyhow!("No rotation log file path configured")),
-        (None, _) => Some(anyhow::anyhow!("No log file path configured")),
-        (Some(path), Some(path_rotate)) => fs::copy(path, path_rotate)
-            .err()
-            .map(|err| anyhow::anyhow!(err)),
-    };
-    if let Some(err) = rotation_error {
-        eprintln!("Log file rotation failed. Truncating log file anyways: {err}",);
-    }
-    _ = file.set_len(0);
-
-    // SAFETY: It is safe to set size to 0 even if set_len fails as
-    // according to the documentation, it only fails if:
-    // - the file is not writeable: should never happen,
-    // - the size would cause an overflow (implementation specific): 0 should never cause an overflow
-    atomic_size.store(0, Ordering::Release);
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_rotate_log_file() {
-        let temp_dir = tempfile::tempdir().unwrap();
-        let log_file_path = temp_dir.path().join("log.txt");
-        let rotation_log_file_path = temp_dir.path().join("log_rotated.txt");
-
-        let mut file = fs::File::create(&log_file_path).unwrap();
-        let contents = String::from("Hello, world!");
-        file.write_all(contents.as_bytes()).unwrap();
-
-        let size = AtomicU64::new(contents.len() as u64);
-
-        rotate_log_file(
-            &mut file,
-            Some(&log_file_path),
-            Some(&rotation_log_file_path),
-            &size,
-        );
-
-        assert!(log_file_path.exists());
-        assert_eq!(log_file_path.metadata().unwrap().len(), 0);
-        assert!(rotation_log_file_path.exists());
-        assert_eq!(
-            std::fs::read_to_string(&rotation_log_file_path).unwrap(),
-            contents,
-        );
-        assert_eq!(size.load(Ordering::Acquire), 0);
-    }
-
-    /// Regression test, ensuring that if log level values change we are made aware
-    #[test]
-    fn test_log_level_names() {
-        assert_eq!(LEVEL_OUTPUT_STRINGS[log::Level::Error as usize], "ERROR");
-        assert_eq!(LEVEL_OUTPUT_STRINGS[log::Level::Warn as usize], "WARN ");
-        assert_eq!(LEVEL_OUTPUT_STRINGS[log::Level::Info as usize], "INFO ");
-        assert_eq!(LEVEL_OUTPUT_STRINGS[log::Level::Debug as usize], "DEBUG");
-        assert_eq!(LEVEL_OUTPUT_STRINGS[log::Level::Trace as usize], "TRACE");
-    }
-}
diff --git a/crates/zlog/src/zlog.rs b/crates/zlog/src/zlog.rs
deleted file mode 100644
index 3c154f7908..0000000000
--- a/crates/zlog/src/zlog.rs
+++ /dev/null
@@ -1,409 +0,0 @@
-//! # logger
-pub use log as log_impl;
-
-mod env_config;
-pub mod filter;
-pub mod sink;
-
-pub use sink::{flush, init_output_file, init_output_stderr, init_output_stdout};
-
-pub const SCOPE_DEPTH_MAX: usize = 4;
-
-pub fn init() {
-    if let Err(err) = try_init(None) {
-        log::error!("{err}");
-        eprintln!("{err}");
-    }
-}
-
-pub fn try_init(filter: Option<String>) -> anyhow::Result<()> {
-    log::set_logger(&ZLOG)?;
-    log::set_max_level(log::LevelFilter::max());
-    process_env(filter);
-    filter::refresh_from_settings(&std::collections::HashMap::default());
-    Ok(())
-}
-
-pub fn init_test() {
-    if get_env_config().is_some() && try_init(None).is_ok() {
-        init_output_stdout();
-    }
-}
-
-fn get_env_config() -> Option<String> {
-    std::env::var("ZED_LOG")
-        .or_else(|_| std::env::var("RUST_LOG"))
-        .ok()
-        .or_else(|| {
-            if std::env::var("CI").is_ok() {
-                Some("info".to_owned())
-            } else {
-                None
-            }
-        })
-}
-
-pub fn process_env(filter: Option<String>) {
-    let Some(env_config) = get_env_config().or(filter) else {
-        return;
-    };
-    match env_config::parse(&env_config) {
-        Ok(filter) => {
-            filter::init_env_filter(filter);
-        }
-        Err(err) => {
-            eprintln!("Failed to parse log filter: {}", err);
-        }
-    }
-}
-
-static ZLOG: Zlog = Zlog {};
-
-pub struct Zlog {}
-
-impl log::Log for Zlog {
-    fn enabled(&self, metadata: &log::Metadata) -> bool {
-        filter::is_possibly_enabled_level(metadata.level())
-    }
-
-    fn log(&self, record: &log::Record) {
-        if !self.enabled(record.metadata()) {
-            return;
-        }
-        let module_path = record.module_path().or(record.file());
-        let (crate_name_scope, module_scope) = match module_path {
-            Some(module_path) => {
-                let crate_name = private::extract_crate_name_from_module_path(module_path);
-                let crate_name_scope = private::scope_ref_new(&[crate_name]);
-                let module_scope = private::scope_ref_new(&[module_path]);
-                (crate_name_scope, module_scope)
-            }
-            None => {
-                // TODO: when do we hit this
-                (private::scope_new(&[]), private::scope_new(&["*unknown*"]))
-            }
-        };
-        let level = record.metadata().level();
-        if !filter::is_scope_enabled(&crate_name_scope, Some(record.target()), level) {
-            return;
-        }
-        sink::submit(sink::Record {
-            scope: module_scope,
-            level,
-            message: record.args(),
-            // PERF(batching): store non-static paths in a cache + leak them and pass static str here
-            module_path,
-            line: record.line(),
-        });
-    }
-
-    fn flush(&self) {
-        sink::flush();
-    }
-}
-
-#[macro_export]
-macro_rules! log {
-    ($logger:expr, $level:expr, $($arg:tt)+) => {
-        let level = $level;
-        let logger = $logger;
-        let enabled = $crate::filter::is_scope_enabled(&logger.scope, Some(module_path!()), level);
-        if enabled {
-            $crate::sink::submit($crate::sink::Record {
-                scope: logger.scope,
-                level,
-                message: &format_args!($($arg)+),
-                module_path: Some(module_path!()),
-                line: Some(line!()),
-            });
-        }
-    }
-}
-
-#[macro_export]
-macro_rules! trace {
-    ($logger:expr => $($arg:tt)+) => {
-        $crate::log!($logger, $crate::log_impl::Level::Trace, $($arg)+);
-    };
-    ($($arg:tt)+) => {
-        $crate::log!($crate::default_logger!(), $crate::log_impl::Level::Trace, $($arg)+);
-    };
-}
-
-#[macro_export]
-macro_rules! debug {
-    ($logger:expr => $($arg:tt)+) => {
-        $crate::log!($logger, $crate::log_impl::Level::Debug, $($arg)+);
-    };
-    ($($arg:tt)+) => {
-        $crate::log!($crate::default_logger!(), $crate::log_impl::Level::Debug, $($arg)+);
-    };
-}
-
-#[macro_export]
-macro_rules! info {
-    ($logger:expr => $($arg:tt)+) => {
-        $crate::log!($logger, $crate::log_impl::Level::Info, $($arg)+);
-    };
-    ($($arg:tt)+) => {
-        $crate::log!($crate::default_logger!(), $crate::log_impl::Level::Info, $($arg)+);
-    };
-}
-
-#[macro_export]
-macro_rules! warn {
-    ($logger:expr => $($arg:tt)+) => {
-        $crate::log!($logger, $crate::log_impl::Level::Warn, $($arg)+);
-    };
-    ($($arg:tt)+) => {
-        $crate::log!($crate::default_logger!(), $crate::log_impl::Level::Warn, $($arg)+);
-    };
-}
-
-#[macro_export]
-macro_rules! error {
-    ($logger:expr => $($arg:tt)+) => {
-        $crate::log!($logger, $crate::log_impl::Level::Error, $($arg)+);
-    };
-    ($($arg:tt)+) => {
-        $crate::log!($crate::default_logger!(), $crate::log_impl::Level::Error, $($arg)+);
-    };
-}
-
-/// Creates a timer that logs the duration it was active for either when
-/// it is dropped, or when explicitly stopped using the `end` method.
-/// Logs at the `trace` level.
-/// Note that it will include time spent across await points
-/// (i.e. should not be used to measure the performance of async code)
-/// However, this is a feature not a bug, as it allows for a more accurate
-/// understanding of how long the action actually took to complete, including
-/// interruptions, which can help explain why something may have timed out,
-/// why it took longer to complete than it would have had the await points resolved
-/// immediately, etc.
-#[macro_export]
-macro_rules! time {
-    ($logger:expr => $name:expr) => {
-        $crate::Timer::new($logger, $name)
-    };
-    ($name:expr) => {
-        $crate::time!($crate::default_logger!() => $name)
-    };
-}
-
-#[macro_export]
-macro_rules! scoped {
-    ($parent:expr => $name:expr) => {{
-        $crate::scoped_logger($parent, $name)
-    }};
-    ($name:expr) => {
-        $crate::scoped!($crate::default_logger!() => $name)
-    };
-}
-
-pub const fn scoped_logger(parent: Logger, name: &'static str) -> Logger {
-    let mut scope = parent.scope;
-    let mut index = 1; // always have crate/module name
-    while index < scope.len() && !scope[index].is_empty() {
-        index += 1;
-    }
-    if index >= scope.len() {
-        #[cfg(debug_assertions)]
-        {
-            panic!("Scope overflow trying to add scope... ignoring scope");
-        }
-    }
-    scope[index] = name;
-    Logger { scope }
-}
-
-#[macro_export]
-macro_rules! default_logger {
-    () => {
-        $crate::Logger {
-            scope: $crate::private::scope_new(&[$crate::crate_name!()]),
-        }
-    };
-}
-
-#[macro_export]
-macro_rules! crate_name {
-    () => {
-        $crate::private::extract_crate_name_from_module_path(module_path!())
-    };
-}
-
-/// functions that are used in macros, and therefore must be public,
-/// but should not be used directly
-pub mod private {
-    use super::*;
-
-    pub const fn extract_crate_name_from_module_path(module_path: &str) -> &str {
-        let mut i = 0;
-        let mod_path_bytes = module_path.as_bytes();
-        let mut index = mod_path_bytes.len();
-        while i + 1 < mod_path_bytes.len() {
-            if mod_path_bytes[i] == b':' && mod_path_bytes[i + 1] == b':' {
-                index = i;
-                break;
-            }
-            i += 1;
-        }
-        let Some((crate_name, _)) = module_path.split_at_checked(index) else {
-            return module_path;
-        };
-        crate_name
-    }
-
-    pub const fn scope_new(scopes: &[&'static str]) -> Scope {
-        scope_ref_new(scopes)
-    }
-
-    pub const fn scope_ref_new<'a>(scopes: &[&'a str]) -> ScopeRef<'a> {
-        assert!(scopes.len() <= SCOPE_DEPTH_MAX);
-        let mut scope = [""; SCOPE_DEPTH_MAX];
-        let mut i = 0;
-        while i < scopes.len() {
-            scope[i] = scopes[i];
-            i += 1;
-        }
-        scope
-    }
-
-    pub fn scope_alloc_new(scopes: &[&str]) -> ScopeAlloc {
-        assert!(scopes.len() <= SCOPE_DEPTH_MAX);
-        let mut scope = [""; SCOPE_DEPTH_MAX];
-        scope[0..scopes.len()].copy_from_slice(scopes);
-        scope.map(|s| s.to_string())
-    }
-
-    pub fn scope_to_alloc(scope: &Scope) -> ScopeAlloc {
-        scope.map(|s| s.to_string())
-    }
-}
-
-pub type Scope = [&'static str; SCOPE_DEPTH_MAX];
-pub type ScopeRef<'a> = [&'a str; SCOPE_DEPTH_MAX];
-pub type ScopeAlloc = [String; SCOPE_DEPTH_MAX];
-const SCOPE_STRING_SEP_STR: &str = ".";
-const SCOPE_STRING_SEP_CHAR: char = '.';
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct Logger {
-    pub scope: Scope,
-}
-
-impl log::Log for Logger {
-    fn enabled(&self, metadata: &log::Metadata) -> bool {
-        filter::is_possibly_enabled_level(metadata.level())
-    }
-
-    fn log(&self, record: &log::Record) {
-        if !self.enabled(record.metadata()) {
-            return;
-        }
-        let level = record.metadata().level();
-        if !filter::is_scope_enabled(&self.scope, Some(record.target()), level) {
-            return;
-        }
-        sink::submit(sink::Record {
-            scope: self.scope,
-            level,
-            message: record.args(),
-            module_path: record.module_path(),
-            line: record.line(),
-        });
-    }
-
-    fn flush(&self) {
-        sink::flush();
-    }
-}
-
-pub struct Timer {
-    pub logger: Logger,
-    pub start_time: std::time::Instant,
-    pub name: &'static str,
-    pub warn_if_longer_than: Option<std::time::Duration>,
-    pub done: bool,
-}
-
-impl Drop for Timer {
-    fn drop(&mut self) {
-        self.finish();
-    }
-}
-
-impl Timer {
-    #[must_use = "Timer will stop when dropped, the result of this function should be saved in a variable prefixed with `_` if it should stop when dropped"]
-    pub fn new(logger: Logger, name: &'static str) -> Self {
-        Self {
-            logger,
-            name,
-            start_time: std::time::Instant::now(),
-            warn_if_longer_than: None,
-            done: false,
-        }
-    }
-
-    pub fn warn_if_gt(mut self, warn_limit: std::time::Duration) -> Self {
-        self.warn_if_longer_than = Some(warn_limit);
-        self
-    }
-
-    pub fn end(mut self) {
-        self.finish();
-    }
-
-    fn finish(&mut self) {
-        if self.done {
-            return;
-        }
-        let elapsed = self.start_time.elapsed();
-        if let Some(warn_limit) = self.warn_if_longer_than
-            && elapsed > warn_limit
-        {
-            crate::warn!(
-                self.logger =>
-                "Timer '{}' took {:?}. Which was longer than the expected limit of {:?}",
-                self.name,
-                elapsed,
-                warn_limit
-            );
-            self.done = true;
-            return;
-        }
-        crate::trace!(
-            self.logger =>
-            "Timer '{}' finished in {:?}",
-            self.name,
-            elapsed
-        );
-        self.done = true;
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_crate_name() {
-        assert_eq!(crate_name!(), "zlog");
-        assert_eq!(
-            private::extract_crate_name_from_module_path("my_speedy_⚡️_crate::some_module"),
-            "my_speedy_⚡️_crate"
-        );
-        assert_eq!(
-            private::extract_crate_name_from_module_path("my_speedy_crate_⚡️::some_module"),
-            "my_speedy_crate_⚡️"
-        );
-        assert_eq!(
-            private::extract_crate_name_from_module_path("my_speedy_crate_:⚡️:some_module"),
-            "my_speedy_crate_:⚡️:some_module"
-        );
-        assert_eq!(
-            private::extract_crate_name_from_module_path("my_speedy_crate_::⚡️some_module"),
-            "my_speedy_crate_"
-        );
-    }
-}
diff --git a/crates/zlog_settings/Cargo.toml b/crates/zlog_settings/Cargo.toml
deleted file mode 100644
index 39c3b6a193..0000000000
--- a/crates/zlog_settings/Cargo.toml
+++ /dev/null
@@ -1,21 +0,0 @@
-[package]
-name = "zlog_settings"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/zlog_settings.rs"
-
-[features]
-default = []
-
-[dependencies]
-gpui.workspace = true
-collections.workspace = true
-settings.workspace = true
-zlog.workspace = true
diff --git a/crates/zlog_settings/LICENSE-GPL b/crates/zlog_settings/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/zlog_settings/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/zlog_settings/src/zlog_settings.rs b/crates/zlog_settings/src/zlog_settings.rs
deleted file mode 100644
index cb09375b9a..0000000000
--- a/crates/zlog_settings/src/zlog_settings.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-//! # zlog_settings
-use collections::HashMap;
-
-use gpui::App;
-use settings::{RegisterSetting, Settings, SettingsStore};
-
-pub fn init(cx: &mut App) {
-    cx.observe_global::<SettingsStore>(|cx| {
-        let zlog_settings = ZlogSettings::get_global(cx);
-        zlog::filter::refresh_from_settings(&zlog_settings.scopes);
-    })
-    .detach();
-}
-
-#[derive(Clone, Debug, RegisterSetting)]
-pub struct ZlogSettings {
-    /// A map of log scopes to the desired log level.
-    /// Useful for filtering out noisy logs or enabling more verbose logging.
-    ///
-    /// Example: {"log": {"client": "warn"}}
-    pub scopes: HashMap<String, String>,
-}
-
-impl Settings for ZlogSettings {
-    fn from_settings(content: &settings::SettingsContent) -> Self {
-        ZlogSettings {
-            scopes: content.log.clone().unwrap(),
-        }
-    }
-}
diff --git a/crates/ztracing/Cargo.toml b/crates/ztracing/Cargo.toml
deleted file mode 100644
index 0d9f15b9af..0000000000
--- a/crates/ztracing/Cargo.toml
+++ /dev/null
@@ -1,21 +0,0 @@
-[package]
-name = "ztracing"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[features]
-tracy = ["tracing-tracy"]
-
-[dependencies]
-zlog.workspace = true
-tracing.workspace = true
-
-tracing-subscriber = "0.3.22"
-tracing-tracy = { version = "0.11.4", optional = true, features = ["enable", "ondemand"] }
-
-ztracing_macro.workspace = true
diff --git a/crates/ztracing/LICENSE-AGPL b/crates/ztracing/LICENSE-AGPL
deleted file mode 120000
index 5f5cf25dc4..0000000000
--- a/crates/ztracing/LICENSE-AGPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-AGPL
\ No newline at end of file
diff --git a/crates/ztracing/LICENSE-APACHE b/crates/ztracing/LICENSE-APACHE
deleted file mode 120000
index 1cd601d0a3..0000000000
--- a/crates/ztracing/LICENSE-APACHE
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-APACHE
\ No newline at end of file
diff --git a/crates/ztracing/LICENSE-GPL b/crates/ztracing/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/ztracing/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/ztracing/build.rs b/crates/ztracing/build.rs
deleted file mode 100644
index dc0d0ad704..0000000000
--- a/crates/ztracing/build.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-use std::env;
-
-fn main() {
-    if env::var_os("ZTRACING").is_some() {
-        println!(r"cargo::rustc-cfg=ztracing");
-    }
-    println!("cargo::rerun-if-changed=build.rs");
-    println!("cargo::rerun-if-env-changed=ZTRACING");
-}
diff --git a/crates/ztracing/src/lib.rs b/crates/ztracing/src/lib.rs
deleted file mode 100644
index b9b318cc35..0000000000
--- a/crates/ztracing/src/lib.rs
+++ /dev/null
@@ -1,52 +0,0 @@
-pub use tracing::Level;
-
-#[cfg(ztracing)]
-pub use tracing::{
-    debug_span, error_span, event, info_span, instrument, span, trace_span, warn_span,
-};
-#[cfg(not(ztracing))]
-pub use ztracing_macro::instrument;
-
-#[cfg(not(ztracing))]
-pub use __consume_all_tokens as trace_span;
-#[cfg(not(ztracing))]
-pub use __consume_all_tokens as info_span;
-#[cfg(not(ztracing))]
-pub use __consume_all_tokens as debug_span;
-#[cfg(not(ztracing))]
-pub use __consume_all_tokens as warn_span;
-#[cfg(not(ztracing))]
-pub use __consume_all_tokens as error_span;
-#[cfg(not(ztracing))]
-pub use __consume_all_tokens as event;
-#[cfg(not(ztracing))]
-pub use __consume_all_tokens as span;
-
-#[cfg(not(ztracing))]
-#[macro_export]
-macro_rules! __consume_all_tokens {
-    ($($t:tt)*) => {
-        $crate::FakeSpan
-    };
-}
-
-pub struct FakeSpan;
-impl FakeSpan {
-    pub fn enter(&self) {}
-}
-
-// #[cfg(not(ztracing))]
-// pub use span;
-
-#[cfg(ztracing)]
-pub fn init() {
-    zlog::info!("Starting tracy subscriber, you can now connect the profiler");
-    use tracing_subscriber::prelude::*;
-    tracing::subscriber::set_global_default(
-        tracing_subscriber::registry().with(tracing_tracy::TracyLayer::default()),
-    )
-    .expect("setup tracy layer");
-}
-
-#[cfg(not(ztracing))]
-pub fn init() {}
diff --git a/crates/ztracing_macro/Cargo.toml b/crates/ztracing_macro/Cargo.toml
deleted file mode 100644
index dbd7adce5f..0000000000
--- a/crates/ztracing_macro/Cargo.toml
+++ /dev/null
@@ -1,11 +0,0 @@
-[package]
-name = "ztracing_macro"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lib]
-proc-macro = true
-
-[dependencies]
diff --git a/crates/ztracing_macro/LICENSE-AGPL b/crates/ztracing_macro/LICENSE-AGPL
deleted file mode 120000
index 5f5cf25dc4..0000000000
--- a/crates/ztracing_macro/LICENSE-AGPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-AGPL
\ No newline at end of file
diff --git a/crates/ztracing_macro/LICENSE-APACHE b/crates/ztracing_macro/LICENSE-APACHE
deleted file mode 120000
index 1cd601d0a3..0000000000
--- a/crates/ztracing_macro/LICENSE-APACHE
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-APACHE
\ No newline at end of file
diff --git a/crates/ztracing_macro/LICENSE-GPL b/crates/ztracing_macro/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/crates/ztracing_macro/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/ztracing_macro/src/lib.rs b/crates/ztracing_macro/src/lib.rs
deleted file mode 100644
index d9b073ed13..0000000000
--- a/crates/ztracing_macro/src/lib.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-#[proc_macro_attribute]
-pub fn instrument(
-    _attr: proc_macro::TokenStream,
-    item: proc_macro::TokenStream,
-) -> proc_macro::TokenStream {
-    item
-}
diff --git a/debug.plist b/debug.plist
deleted file mode 100644
index e09573c9d1..0000000000
--- a/debug.plist
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "https://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-    <dict>
-        <key>com.apple.security.get-task-allow</key>
-        <true/>
-    </dict>
-</plist>
diff --git a/default.nix b/default.nix
deleted file mode 100644
index 1d976a3576..0000000000
--- a/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-(import (
-  let
-    lock = builtins.fromJSON (builtins.readFile ./flake.lock);
-  in
-  fetchTarball {
-    url =
-      lock.nodes.flake-compat.locked.url
-        or "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
-    sha256 = lock.nodes.flake-compat.locked.narHash;
-  }
-) { src = ./.; }).defaultNix
diff --git a/docker-compose.sql b/docker-compose.sql
deleted file mode 100644
index 7de55a1f98..0000000000
--- a/docker-compose.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-create database zed;
-create database zed_llm;
diff --git a/docs/.gitignore b/docs/.gitignore
deleted file mode 100644
index 3006b271da..0000000000
--- a/docs/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-book/
diff --git a/docs/.prettierignore b/docs/.prettierignore
deleted file mode 100644
index a52439689a..0000000000
--- a/docs/.prettierignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# Handlebars partials are not supported by Prettier.
-*.hbs
diff --git a/docs/.prettierrc b/docs/.prettierrc
deleted file mode 100644
index 1c5e966021..0000000000
--- a/docs/.prettierrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "printWidth": 80
-}
diff --git a/docs/README.md b/docs/README.md
deleted file mode 100644
index e1649f4bc9..0000000000
--- a/docs/README.md
+++ /dev/null
@@ -1,132 +0,0 @@
-# Zed Docs
-
-Welcome to Zed's documentation.
-
-This is built on push to `main` and published automatically to [https://zed.dev/docs](https://zed.dev/docs).
-
-To preview the docs locally you will need to install [mdBook](https://rust-lang.github.io/mdBook/) (`cargo install mdbook@0.4.40`) and then run:
-
-```sh
-mdbook serve docs
-```
-
-It's important to note the version number above. For an unknown reason, as of 2025-04-23, running 0.4.48 will cause odd URL behavior that breaks things.
-
-Before committing, verify that the docs are formatted in the way Prettier expects with:
-
-```
-cd docs && pnpm dlx prettier@3.5.0 . --write && cd ..
-```
-
-## Preprocessor
-
-We have a custom mdBook preprocessor for interfacing with our crates (`crates/docs_preprocessor`).
-
-If for some reason you need to bypass the docs preprocessor, you can comment out `[preprocessor.zed_docs_preprocessor]` from the `book.toml`.
-
-## Images and videos
-
-To add images or videos to the docs, upload them to another location (e.g., zed.dev, GitHub's asset storage) and then link out to them from the docs.
-
-Putting binary assets such as images in the Git repository will bloat the repository size over time.
-
-## Internal notes:
-
-- We have a Cloudflare router called `docs-proxy` that intercepts requests to `zed.dev/docs` and forwards them to the "docs" Cloudflare Pages project.
-- The CI uploads a new version to the Cloudflare Pages project from `.github/workflows/deploy_docs.yml` on every push to `main`.
-
-### Table of Contents
-
-The table of contents files (`theme/page-toc.js` and `theme/page-doc.css`) were initially generated by [`mdbook-pagetoc`](https://crates.io/crates/mdbook-pagetoc).
-
-Since all this preprocessor does is generate the static assets, we don't need to keep it around once they have been generated.
-
-## Referencing Keybindings and Actions
-
-When referencing keybindings or actions, use the following formats:
-
-### Keybindings
-
-`{#kb scope::Action}` - e.g., `{#kb zed::OpenSettings}`.
-
-This will output a code element like: `<code>Cmd + , | Ctrl + ,</code>`. We then use a client-side plugin to show the actual keybinding based on the user's platform.
-
-By using the action name, we can ensure that the keybinding is always up-to-date rather than hardcoding the keybinding.
-
-### Actions
-
-`{#action scope::Action}` - e.g., `{#action zed::OpenSettings}`.
-
-This will render a human-readable version of the action name, e.g., "zed: open settings", and will allow us to implement things like additional context on hover, etc.
-
-### Creating New Templates
-
-Templates are functions that modify the source of the docs pages (usually with a regex match and replace).
-You can see how the actions and keybindings are templated in `crates/docs_preprocessor/src/main.rs` for reference on how to create new templates.
-
-### References
-
-- Template Trait: `crates/docs_preprocessor/src/templates.rs`
-- Example template: `crates/docs_preprocessor/src/templates/keybinding.rs`
-- Client-side plugins: `docs/theme/plugins.js`
-
-## Postprocessor
-
-A postprocessor is implemented as a sub-command of `docs_preprocessor` that wraps the built-in HTML renderer and applies post-processing to the HTML files, to add support for page-specific title and `meta` tag description values.
-
-An example of the syntax can be found in `git.md`, as well as below:
-
-```md
----
-title: Some more detailed title for this page
-description: A page-specific description
----
-
-# Editor
-```
-
-The above code will be transformed into (with non-relevant tags removed):
-
-```html
-<head>
-  <title>Editor | Some more detailed title for this page</title>
-  <meta name="description" contents="A page-specific description" />
-</head>
-<body>
-  <h1>Editor</h1>
-</body>
-```
-
-If no front matter is provided, or if one or both keys aren't provided, the `title` and `description` will be set based on the `default-title` and `default-description` keys in `book.toml` respectively.
-
-### Implementation details
-
-Unfortunately, mdBook does not support post-processing like it does pre-processing, and only supports defining one description to put in the `meta` tag per book rather than per file.
-So in order to apply post-processing (necessary to modify the HTML `head` tags) the global book description is set to a marker value `#description#` and the HTML renderer is replaced with a sub-command of `docs_preprocessor` that wraps the built-in HTML renderer and applies post-processing to the HTML files, replacing the marker value and the `<title>(.*)</title>` with the contents of the front matter if there is one.
-
-### Known limitations
-
-The front matter parsing is extremely simple, which avoids needing to take on an additional dependency, or implement full YAML parsing.
-
-- Double quotes and multi-line values are not supported, i.e. Keys and values must be entirely on the same line, with no double quotes around the value.
-
-The following will not work:
-
-```md
----
-title: Some
-  Multi-line
-  Title
----
-```
-
-neither this:
-
-```md
----
-title: "Some title"
----
-```
-
-- The front matter must be at the top of the file, with only white-space preceding it.
-- The contents of the `title` and `description` will not be HTML escaped. They should be simple ASCII text with no unicode or emoji characters.
diff --git a/docs/book.toml b/docs/book.toml
deleted file mode 100644
index 2bb57c5c08..0000000000
--- a/docs/book.toml
+++ /dev/null
@@ -1,102 +0,0 @@
-[book]
-authors = ["The Zed Team"]
-language = "en"
-multilingual = false
-src = "src"
-title = "Zed"
-site-url = "/docs/"
-
-[build]
-extra-watch-dirs = ["../crates/docs_preprocessor"]
-
-# zed-html is a "custom" renderer that just wraps the
-# builtin mdbook html renderer, and applies post-processing
-# as post-processing is not possible with mdbook in the same way
-# pre-processing is
-# The config is passed directly to the html renderer, so all config
-# options that apply to html apply to zed-html
-[output.zed-html]
-command = "cargo run -p docs_preprocessor -- postprocess"
-# Set here instead of above as we only use it replace the `#description#` we set in the template
-# when no front-matter is provided value
-default-description = "Learn how to use and customize Zed, the fast, collaborative code editor. Official docs on features, configuration, AI tools, and workflows."
-default-title = "Zed Code Editor Documentation"
-no-section-label = true
-preferred-dark-theme = "dark"
-additional-css = ["theme/page-toc.css", "theme/plugins.css", "theme/highlight.css"]
-additional-js  = ["theme/page-toc.js", "theme/plugins.js"]
-
-[output.zed-html.print]
-enable = false
-
-# Redirects for `/docs` pages.
-#
-# All of the source URLs are interpreted relative to mdBook, so they must:
-# 1. Not start with `/docs`
-# 2. End in `.html`
-#
-# The destination URLs are interpreted relative to `https://zed.dev`.
-# - Redirects to other docs pages should end in `.html`
-# - You can link to pages on the Zed site by omitting the `/docs` in front of it.
-[output.zed-html.redirect]
-# AI
-"/ai.html" = "/docs/ai/overview.html"
-"/assistant-panel.html" = "/docs/ai/agent-panel.html"
-"/assistant.html" = "/docs/assistant/assistant.html"
-"/assistant/assistant-panel.html" = "/docs/ai/agent-panel.html"
-"/assistant/assistant.html" = "/docs/ai/overview.html"
-"/assistant/commands.html" = "/docs/ai/text-threads.html"
-"/assistant/configuration.html" = "/docs/ai/configuration.html"
-"/assistant/context-servers.html" = "/docs/ai/mcp.html"
-"/assistant/contexts.html" = "/docs/ai/text-threads.html"
-"/assistant/inline-assistant.html" = "/docs/ai/inline-assistant.html"
-"/assistant/model-context-protocol.html" = "/docs/ai/mcp.html"
-"/assistant/prompting.html" = "/docs/ai/rules.html"
-"/language-model-integration.html" = "/docs/assistant/assistant.html"
-"/model-improvement.html" = "/docs/ai/ai-improvement.html"
-"/ai/temperature.html" = "/docs/ai/agent-settings.html#model-temperature"
-
-# Collaboration
-"/channels.html" = "/docs/collaboration/channels.html"
-"/collaboration.html" = "/docs/collaboration/overview.html"
-
-# Community
-"/community/feedback.html" = "/community-links"
-"/conversations.html" = "/community-links"
-
-# Debugger
-"/debuggers.html" = "/docs/debugger.html"
-
-# MCP
-"/assistant/model-context-protocolCitedby.html" = "/docs/ai/mcp.html"
-"/context-servers.html" = "/docs/ai/mcp.html"
-"/extensions/context-servers.html" = "/docs/extensions/mcp-extensions.html"
-
-# Languages
-"/adding-new-languages.html" = "/docs/extensions/languages.html"
-"/elixir.html" = "/docs/languages/elixir.html"
-"/javascript.html" = "/docs/languages/javascript.html"
-"/languages/languages/html.html" = "/docs/languages/html.html"
-"/languages/languages/javascript.html" = "/docs/languages/javascript.html"
-"/languages/languages/makefile.html" = "/docs/languages/makefile.html"
-"/languages/languages/nim.html" = "/docs/languages/nim.html"
-"/languages/languages/ruby.html" = "/docs/languages/ruby.html"
-"/languages/languages/scala.html" = "/docs/languages/scala.html"
-"/python.html" = "/docs/languages/python.html"
-"/ruby.html" = "/docs/languages/ruby.html"
-
-# Zed development
-"/contribute-to-zed.html" = "/docs/development.html#contributor-links"
-"/contributing.html" = "/docs/development.html#contributor-links"
-"/developing-zed.html" = "/docs/development.html"
-"/development/development/linux.html" = "/docs/development/linux.html"
-"/development/development/macos.html" = "/docs/development/macos.html"
-"/development/development/windows.html" = "/docs/development/windows.html"
-
-# Our custom preprocessor for expanding commands like `{#kb action::ActionName}`,
-# and other docs-related functions.
-#
-# Comment the below section out if you need to bypass the preprocessor for some reason.
-[preprocessor.zed_docs_preprocessor]
-command = "cargo run -p docs_preprocessor --"
-renderer = ["html"]
diff --git a/docs/src/SUMMARY.md b/docs/src/SUMMARY.md
deleted file mode 100644
index 9d1f6f61d4..0000000000
--- a/docs/src/SUMMARY.md
+++ /dev/null
@@ -1,179 +0,0 @@
-# Summary
-
-# Welcome
-
-- [Getting Started](./getting-started.md)
-- [Installation](./installation.md)
-  - [Update](./update.md)
-  - [Uninstall](./uninstall.md)
-- [Authenticate](./authentication.md)
-- [Telemetry](./telemetry.md)
-- [Troubleshooting](./troubleshooting.md)
-
-# Configuration
-
-- [Configuring Zed](./configuring-zed.md)
-- [Configuring Languages](./configuring-languages.md)
-  - [Toolchains](./toolchains.md)
-- [Key bindings](./key-bindings.md)
-  - [All Actions](./all-actions.md)
-- [Snippets](./snippets.md)
-- [Themes](./themes.md)
-- [Icon Themes](./icon-themes.md)
-- [Visual Customization](./visual-customization.md)
-- [Vim Mode](./vim.md)
-- [Helix Mode](./helix.md)
-
-<!-- - [Globs](./globs.md) -->
-<!-- - [Fonts](./fonts.md) -->
-
-# Using Zed
-
-- [Multibuffers](./multibuffers.md)
-- [Command Palette](./command-palette.md)
-- [Command-line Interface](./command-line-interface.md)
-- [Outline Panel](./outline-panel.md)
-- [Code Completions](./completions.md)
-- [Collaboration](./collaboration/overview.md)
-  - [Channels](./collaboration/channels.md)
-  - [Contacts and Private Calls](./collaboration/contacts-and-private-calls.md)
-- [Git](./git.md)
-- [Debugger](./debugger.md)
-- [Diagnostics](./diagnostics.md)
-- [Tasks](./tasks.md)
-- [Tab Switcher](./tab-switcher.md)
-- [Remote Development](./remote-development.md)
-- [Environment Variables](./environment.md)
-- [REPL](./repl.md)
-
-# Platform Support
-
-- [Windows](./windows.md)
-- [Linux](./linux.md)
-
-# AI
-
-- [Overview](./ai/overview.md)
-- [Agent Panel](./ai/agent-panel.md)
-  - [Tools](./ai/tools.md)
-  - [External Agents](./ai/external-agents.md)
-- [Inline Assistant](./ai/inline-assistant.md)
-- [Edit Prediction](./ai/edit-prediction.md)
-- [Text Threads](./ai/text-threads.md)
-- [Rules](./ai/rules.md)
-- [Model Context Protocol](./ai/mcp.md)
-- [Configuration](./ai/configuration.md)
-  - [LLM Providers](./ai/llm-providers.md)
-  - [Agent Settings](./ai/agent-settings.md)
-- [Subscription](./ai/subscription.md)
-  - [Models](./ai/models.md)
-  - [Plans and Usage](./ai/plans-and-usage.md)
-  - [Billing](./ai/billing.md)
-- [Privacy and Security](./ai/privacy-and-security.md)
-  - [AI Improvement](./ai/ai-improvement.md)
-
-# Extensions
-
-- [Overview](./extensions.md)
-- [Installing Extensions](./extensions/installing-extensions.md)
-- [Developing Extensions](./extensions/developing-extensions.md)
-- [Extension Capabilities](./extensions/capabilities.md)
-- [Language Extensions](./extensions/languages.md)
-- [Debugger Extensions](./extensions/debugger-extensions.md)
-- [Theme Extensions](./extensions/themes.md)
-- [Icon Theme Extensions](./extensions/icon-themes.md)
-- [Slash Command Extensions](./extensions/slash-commands.md)
-- [Agent Server Extensions](./extensions/agent-servers.md)
-- [MCP Server Extensions](./extensions/mcp-extensions.md)
-
-# Migrate
-
-- [VS Code](./migrate/vs-code.md)
-
-# Language Support
-
-- [All Languages](./languages.md)
-- [Ansible](./languages/ansible.md)
-- [AsciiDoc](./languages/asciidoc.md)
-- [Astro](./languages/astro.md)
-- [Bash](./languages/bash.md)
-- [Biome](./languages/biome.md)
-- [C](./languages/c.md)
-- [C++](./languages/cpp.md)
-- [C#](./languages/csharp.md)
-- [Clojure](./languages/clojure.md)
-- [CSS](./languages/css.md)
-- [Dart](./languages/dart.md)
-- [Deno](./languages/deno.md)
-- [Diff](./languages/diff.md)
-- [Docker](./languages/docker.md)
-- [Elixir](./languages/elixir.md)
-- [Elm](./languages/elm.md)
-- [Emmet](./languages/emmet.md)
-- [Erlang](./languages/erlang.md)
-- [Fish](./languages/fish.md)
-- [GDScript](./languages/gdscript.md)
-- [Gleam](./languages/gleam.md)
-- [GLSL](./languages/glsl.md)
-- [Go](./languages/go.md)
-- [Groovy](./languages/groovy.md)
-- [Haskell](./languages/haskell.md)
-- [Helm](./languages/helm.md)
-- [HTML](./languages/html.md)
-- [Java](./languages/java.md)
-- [JavaScript](./languages/javascript.md)
-- [Julia](./languages/julia.md)
-- [JSON](./languages/json.md)
-- [Jsonnet](./languages/jsonnet.md)
-- [Kotlin](./languages/kotlin.md)
-- [Lua](./languages/lua.md)
-- [Luau](./languages/luau.md)
-- [Makefile](./languages/makefile.md)
-- [Markdown](./languages/markdown.md)
-- [Nim](./languages/nim.md)
-- [OCaml](./languages/ocaml.md)
-- [OpenTofu](./languages/opentofu.md)
-- [PHP](./languages/php.md)
-- [PowerShell](./languages/powershell.md)
-- [Prisma](./languages/prisma.md)
-- [Proto](./languages/proto.md)
-- [PureScript](./languages/purescript.md)
-- [Python](./languages/python.md)
-- [R](./languages/r.md)
-- [Rego](./languages/rego.md)
-- [ReStructuredText](./languages/rst.md)
-- [Racket](./languages/racket.md)
-- [Roc](./languages/roc.md)
-- [Ruby](./languages/ruby.md)
-- [Rust](./languages/rust.md)
-- [Scala](./languages/scala.md)
-- [Scheme](./languages/scheme.md)
-- [Shell Script](./languages/sh.md)
-- [SQL](./languages/sql.md)
-- [Svelte](./languages/svelte.md)
-- [Swift](./languages/swift.md)
-- [Tailwind CSS](./languages/tailwindcss.md)
-- [Terraform](./languages/terraform.md)
-- [TOML](./languages/toml.md)
-- [TypeScript](./languages/typescript.md)
-- [Uiua](./languages/uiua.md)
-- [Vue](./languages/vue.md)
-- [XML](./languages/xml.md)
-- [YAML](./languages/yaml.md)
-- [Yara](./languages/yara.md)
-- [Yarn](./languages/yarn.md)
-- [Zig](./languages/zig.md)
-
-# Developing Zed
-
-- [Developing Zed](./development.md)
-  - [macOS](./development/macos.md)
-  - [Linux](./development/linux.md)
-  - [Windows](./development/windows.md)
-  - [FreeBSD](./development/freebsd.md)
-  - [Local Collaboration](./development/local-collaboration.md)
-  - [Using Debuggers](./development/debuggers.md)
-  - [Performance](./performance.md)
-  - [Glossary](./development/glossary.md)
-- [Release Notes](./development/release-notes.md)
-- [Debugging Crashes](./development/debugging-crashes.md)
diff --git a/docs/src/ai/agent-panel.md b/docs/src/ai/agent-panel.md
deleted file mode 100644
index c383862ed6..0000000000
--- a/docs/src/ai/agent-panel.md
+++ /dev/null
@@ -1,184 +0,0 @@
-# Agent Panel
-
-The Agent Panel allows you to interact with many LLMs and coding agents that can help with various types of tasks, such as generating code, codebase understanding, and other general inquiries like writing emails, documentation, and more.
-
-To open it, use the `agent: new thread` action in [the Command Palette](../getting-started.md#command-palette) or click the ✨ (sparkles) icon in the status bar.
-
-## Getting Started {#getting-started}
-
-If you're using the Agent Panel for the first time, you need to have at least one LLM provider or external agent configured.
-You can do that by:
-
-1. [subscribing to our Pro plan](https://zed.dev/pricing), so you have access to our hosted models
-2. [using your own API keys](./llm-providers.md#use-your-own-keys), either from model providers like Anthropic or model gateways like OpenRouter.
-3. using an [external agent](./external-agents.md) like [Gemini CLI](./external-agents.md#gemini-cli) or [Claude Code](./external-agents.md#claude-code)
-
-## Overview {#overview}
-
-With an LLM provider or an external agent configured, type at the message editor and hit `enter` to submit your prompt.
-If you need extra room to type, you can expand the message editor with {#kb agent::ExpandMessageEditor}.
-
-You should start to see the responses stream in with indications of [which tools](./tools.md) the model is using to fulfill your prompt.
-From this point on, you can interact with the many supported features outlined below.
-
-> Note that for external agents, like [Gemini CLI](./external-agents.md#gemini-cli) or [Claude Code](./external-agents.md#claude-code), some of the features outlined below may _not_ be supported—for example, _restoring threads from history_, _checkpoints_, _token usage display_, and others. Their availability varies depending on the agent.
-
-### Creating New Threads {#new-thread}
-
-By default, the Agent Panel uses Zed's first-party agent.
-
-To change that, go to the plus button in the top-right of the Agent Panel and choose another option.
-You can choose to create a new [Text Thread](./text-threads.md) or, if you have [external agents](./external-agents.md) connected, you can create new threads with them.
-
-### Editing Messages {#editing-messages}
-
-Any message that you send to the AI is editable.
-You can click on the card that contains your message and re-submit it with an adjusted prompt and/or new pieces of context.
-
-### Checkpoints {#checkpoints}
-
-Every time the AI performs an edit, you should see a "Restore Checkpoint" button at the top of your message, allowing you to return your code base to the state it was in prior to that message.
-
-The checkpoint button appears even if you interrupt the thread midway through an edit attempt, as this is likely a moment when you've identified that the agent is not heading in the right direction and you want to revert back.
-
-### Navigating History {#navigating-history}
-
-To quickly navigate through recently opened threads, use the {#kb agent::ToggleNavigationMenu} binding, when focused on the panel's editor, or click the menu icon button at the top right of the panel to open the dropdown that shows you the six most recent threads.
-
-The items in this menu function similarly to tabs, and closing them doesn’t delete the thread; instead, it simply removes them from the recent list.
-
-To view all historical conversations, reach for the `View All` option from within the same menu or via the {#kb agent::OpenHistory} binding.
-
-### Following the Agent {#following-the-agent}
-
-Zed is built with collaboration natively integrated, and this design pattern extends to collaboration with AI. To follow the agent as it reads and edits in your codebase, click on the "crosshair" icon button at the bottom left of the panel.
-
-You can also do that with the keyboard by pressing the `cmd`/`ctrl` modifier with `enter` when submitting a message.
-
-### Get Notified {#get-notified}
-
-If you send a prompt to the Agent and then move elsewhere, putting Zed in the background, you can be notified when its response is finished via:
-
-- a visual notification that appears in the top right of your screen
-- a sound notification
-
-These notifications can be used together or individually, according to your preference.
-
-You can customize their behavior, including turning them off entirely, by using the `agent.notify_when_agent_waiting` and `agent.play_sound_when_agent_done` settings keys.
-
-### Reviewing Changes {#reviewing-changes}
-
-Once the agent has made changes to your project, the panel will surface which files, and how many of them, have been edited.
-
-To see which files specifically have been edited, expand the accordion bar that shows up right above the message editor or click the `Review Changes` button ({#kb agent::OpenAgentDiff}), which opens a multi-buffer tab with all changes.
-
-You're able to reject or accept each individual change hunk, or the whole set of changes made by the agent.
-
-Edit diffs also appear in individual buffers. If your active tab had edits made by the AI, you'll see diffs with the same accept/reject controls as in the multi-buffer.
-
-## Adding Context {#adding-context}
-
-Although Zed's agent is very efficient at reading through your code base to autonomously pick up relevant context, manually adding whatever would be useful to fulfill your prompt is still very encouraged as a way to not only improve the AI's response quality but also to speed up its response time.
-
-In Zed's Agent Panel, all pieces of context are added as mentions in the panel's message editor.
-You can type `@` to mention files, directories, symbols, previous threads, and rules files.
-
-Copying images and pasting them in the panel's message editor is also supported.
-
-### Selection as Context
-
-Additionally, you can also select text in a buffer and add it as context by using the {#kb agent::AddSelectionToThread} keybinding, running the {#action agent::AddSelectionToThread} action, or choosing the "Selection" item in the `@` menu.
-
-## Token Usage {#token-usage}
-
-Zed surfaces how many tokens you are consuming for your currently active thread near the profile selector in the panel's message editor. Depending on how many pieces of context you add, your token consumption can grow rapidly.
-
-Once you approach the model's context window, a banner appears below the message editor suggesting to start a new thread with the current one summarized and added as context.
-You can also do this at any time with an ongoing thread via the "Agent Options" menu on the top right.
-
-## Changing Models {#changing-models}
-
-After you've configured your LLM providers—either via [a custom API key](./llm-providers.md) or through [Zed's hosted models](./models.md)—you can switch between them by clicking on the model selector on the message editor or by using the {#kb agent::ToggleModelSelector} keybinding.
-
-> The same model can be offered via multiple providers - for example, Claude Sonnet 4 is available via Zed Pro, OpenRouter, Anthropic directly, and more.
-> Make sure you've selected the correct model **_provider_** for the model you'd like to use, delineated by the logo to the left of the model in the model selector.
-
-## Using Tools {#using-tools}
-
-The new Agent Panel supports tool calling, which enables agentic editing.
-Zed comes with [several built-in tools](./tools.md) that allow models to perform tasks such as searching through your codebase, editing files, running commands, and others.
-
-You can also extend the set of available tools via [MCP Servers](./mcp.md).
-
-### Profiles {#profiles}
-
-Profiles act as a way to group tools.
-Zed offers three built-in profiles and you can create as many custom ones as you want.
-
-#### Built-in Profiles {#built-in-profiles}
-
-- `Write`: A profile with tools to allow the LLM to write to your files and run terminal commands. This one essentially has all built-in tools turned on.
-- `Ask`: A profile with read-only tools. Best for asking questions about your code base without the concern of the agent making changes.
-- `Minimal`: A profile with no tools. Best for general conversations with the LLM where no knowledge of your code base is necessary.
-
-You can explore the exact tools enabled in each profile by clicking on the profile selector button > `Configure` button > the one you want to check out.
-
-Alternatively, you can also use either the command palette, by running {#action agent::ManageProfiles}, or the keybinding directly, {#kb agent::ManageProfiles}, to have access to the profile management modal.
-
-#### Custom Profiles {#custom-profiles}
-
-You can also create a custom profile through the Agent Profile modal.
-From there, you can choose to `Add New Profile` or fork an existing one with a custom name and your preferred set of tools.
-
-It's also possible to override built-in profiles.
-In the Agent Profile modal, select a built-in profile, navigate to `Configure Tools`, and rearrange the tools you'd like to keep or remove.
-
-Zed will store this profile in your settings using the same profile name as the default you overrode.
-
-All custom profiles can be edited via the UI or by hand under the `agent.profiles` key in your `settings.json` file.
-
-### Tool Approval
-
-Zed's Agent Panel surfaces the `agent.always_allow_tool_actions` setting that, if turned to `false`, will require you to give permission to any editing attempt as well as tool calls coming from MCP servers.
-
-You can change that by setting this key to `true` in either your `settings.json` or via the Agent Panel's settings view.
-
-### Model Support {#model-support}
-
-Tool calling needs to be individually supported by each model and model provider.
-Therefore, despite the presence of tools, some models may not have the ability to pick them up yet in Zed.
-You should see a "No tools" label if you select a model that falls into this case.
-
-All [Zed's hosted models](./models.md) support tool calling out-of-the-box.
-
-### MCP Servers {#mcp-servers}
-
-Similarly to the built-in tools, some models may not support all tools included in a given MCP Server.
-Zed's UI will inform you about this via a warning icon that appears close to the model selector.
-
-## Text Threads {#text-threads}
-
-["Text Threads"](./text-threads.md) present your conversation with the LLM in a different format—as raw text.
-With text threads, you have full control over the conversation data.
-You can remove and edit responses from the LLM, swap roles, and include more context earlier in the conversation.
-
-For users who have been with us for some time, you'll notice that text threads are our original assistant panel—users love it for the control it offers.
-We do not plan to deprecate text threads, but it should be noted that if you want the AI to write to your code base autonomously, that's only available in the newer, and now default, "Threads".
-
-## Errors and Debugging {#errors-and-debugging}
-
-In case of any error or strange LLM response behavior, the best way to help the Zed team debug is by reaching for the `agent: open thread as markdown` action and attaching that data as part of your issue on GitHub.
-
-You can also open threads as Markdown by clicking on the file icon button, to the right of the thumbs down button, when focused on the panel's editor.
-
-## Feedback {#feedback}
-
-Zed supports rating responses from the agent for feedback and improvement.
-
-> Note that rating responses will send your data related to that response to Zed's servers.
-> See [AI Improvement](./ai-improvement.md) and [Privacy and Security](./privacy-and-security.md) for more information about Zed's approach to AI improvement, privacy, and security.
-> **_If you don't want data persisted on Zed's servers, don't rate_**. We will not collect data for improving our Agentic offering without you explicitly rating responses.
-
-The best way you can help influence the next change to Zed's system prompt and tools is by rating the LLM's response via the thumbs up/down buttons at the end of every response. In case of a thumbs down, a new text area will show up where you can add more specifics about what happened.
-
-You can provide feedback on the thread at any point after the agent responds, and multiple times within the same thread.
diff --git a/docs/src/ai/agent-settings.md b/docs/src/ai/agent-settings.md
deleted file mode 100644
index 21607649ad..0000000000
--- a/docs/src/ai/agent-settings.md
+++ /dev/null
@@ -1,266 +0,0 @@
-# Agent Settings
-
-Learn about all the settings you can customize in Zed's Agent Panel.
-
-## Model Settings {#model-settings}
-
-### Default Model {#default-model}
-
-If you're using [Zed's hosted LLM service](./subscription.md), it sets `claude-sonnet-4` as the default model for agentic work (agent panel, inline assistant) and `gpt-5-nano` as the default "fast" model (thread summarization, git commit messages). If you're not subscribed or want to change these defaults, you can manually edit the `default_model` object in your settings:
-
-```json [settings]
-{
-  "agent": {
-    "default_model": {
-      "provider": "openai",
-      "model": "gpt-4o"
-    }
-  }
-}
-```
-
-### Feature-specific Models {#feature-specific-models}
-
-You can assign distinct and specific models for the following AI-powered features:
-
-- Thread summary model: Used for generating thread summaries
-- Inline assistant model: Used for the inline assistant feature
-- Commit message model: Used for generating Git commit messages
-
-```json [settings]
-{
-  "agent": {
-    "default_model": {
-      "provider": "zed.dev",
-      "model": "claude-sonnet-4"
-    },
-    "inline_assistant_model": {
-      "provider": "anthropic",
-      "model": "claude-3-5-sonnet"
-    },
-    "commit_message_model": {
-      "provider": "openai",
-      "model": "gpt-4o-mini"
-    },
-    "thread_summary_model": {
-      "provider": "google",
-      "model": "gemini-2.0-flash"
-    }
-  }
-}
-```
-
-> If a custom model isn't set for one of these features, they automatically fall back to using the default model.
-
-### Alternative Models for Inline Assists {#alternative-assists}
-
-With the Inline Assistant in particular, you can send the same prompt to multiple models at once.
-
-Here's how you can customize your `settings.json` to add this functionality:
-
-```json [settings]
-{
-  "agent": {
-    "default_model": {
-      "provider": "zed.dev",
-      "model": "claude-sonnet-4"
-    },
-    "inline_alternatives": [
-      {
-        "provider": "zed.dev",
-        "model": "gpt-4-mini"
-      }
-    ]
-  }
-}
-```
-
-When multiple models are configured, you'll see in the Inline Assistant UI buttons that allow you to cycle between outputs generated by each model.
-
-The models you specify here are always used in _addition_ to your [default model](#default-model).
-
-For example, the following configuration will generate three outputs for every assist.
-One with Claude Sonnet 4 (the default model), another with GPT-5-mini, and another one with Gemini 2.5 Flash.
-
-```json [settings]
-{
-  "agent": {
-    "default_model": {
-      "provider": "zed.dev",
-      "model": "claude-sonnet-4"
-    },
-    "inline_alternatives": [
-      {
-        "provider": "zed.dev",
-        "model": "gpt-4-mini"
-      },
-      {
-        "provider": "zed.dev",
-        "model": "gemini-2.5-flash"
-      }
-    ]
-  }
-}
-```
-
-### Model Temperature
-
-Specify a custom temperature for a provider and/or model:
-
-```json [settings]
-"model_parameters": [
-  // To set parameters for all requests to OpenAI models:
-  {
-    "provider": "openai",
-    "temperature": 0.5
-  },
-  // To set parameters for all requests in general:
-  {
-    "temperature": 0
-  },
-  // To set parameters for a specific provider and model:
-  {
-    "provider": "zed.dev",
-    "model": "claude-sonnet-4",
-    "temperature": 1.0
-  }
-],
-```
-
-## Agent Panel Settings {#agent-panel-settings}
-
-Note that some of these settings are also surfaced in the Agent Panel's settings UI, which you can access either via the `agent: open settings` action or by the dropdown menu on the top-right corner of the panel.
-
-### Default View
-
-Use the `default_view` setting to change the default view of the Agent Panel.
-You can choose between `thread` (the default) and `text_thread`:
-
-```json [settings]
-{
-  "agent": {
-    "default_view": "text_thread"
-  }
-}
-```
-
-### Font Size
-
-Use the `agent_font_size` setting to change the font size of rendered agent responses in the panel.
-
-```json [settings]
-{
-  "agent": {
-    "agent_font_size": 18
-  }
-}
-```
-
-> Editors in the Agent Panel—whether that is the main message textarea or previous messages—use monospace fonts and therefore, are controlled by the `buffer_font_size` setting, which is defined globally in your `settings.json`.
-
-### Auto-run Commands
-
-Control whether to allow the agent to run commands without asking you for permission.
-The default value is `false`.
-
-```json [settings]
-{
-  "agent": {
-    "always_allow_tool_actions": true
-  }
-}
-```
-
-### Single-file Review
-
-Control whether to display review actions (accept & reject) in single buffers after the agent is done performing edits.
-The default value is `false`.
-
-```json [settings]
-{
-  "agent": {
-    "single_file_review": true
-  }
-}
-```
-
-When set to false, these controls are only available in the multibuffer review tab.
-
-### Sound Notification
-
-Control whether to hear a notification sound when the agent is done generating changes or needs your input.
-The default value is `false`.
-
-```json [settings]
-{
-  "agent": {
-    "play_sound_when_agent_done": true
-  }
-}
-```
-
-### Message Editor Size
-
-Use the `message_editor_min_lines` setting to control the minimum number of lines of height the agent message editor should have.
-It is set to `4` by default, and the max number of lines is always double of the minimum.
-
-```json [settings]
-{
-  "agent": {
-    "message_editor_min_lines": 4
-  }
-}
-```
-
-### Modifier to Send
-
-Make a modifier (`cmd` on macOS, `ctrl` on Linux) required to send messages.
-This is encouraged for more thoughtful prompt crafting.
-The default value is `false`.
-
-```json [settings]
-{
-  "agent": {
-    "use_modifier_to_send": true
-  }
-}
-```
-
-### Edit Card
-
-Use the `expand_edit_card` setting to control whether edit cards show the full diff in the Agent Panel.
-It is set to `true` by default, but if set to false, the card's height is capped to a certain number of lines, requiring a click to be expanded.
-
-```json [settings]
-{
-  "agent": {
-    "expand_edit_card": false
-  }
-}
-```
-
-### Terminal Card
-
-Use the `expand_terminal_card` setting to control whether terminal cards show the command output in the Agent Panel.
-It is set to `true` by default, but if set to false, the card will be fully collapsed even while the command is running, requiring a click to be expanded.
-
-```json [settings]
-{
-  "agent": {
-    "expand_terminal_card": false
-  }
-}
-```
-
-### Feedback Controls
-
-Control whether to display the thumbs up/down buttons at the bottom of each agent response, allowing you to give Zed feedback about the agent's performance.
-The default value is `true`.
-
-```json [settings]
-{
-  "agent": {
-    "enable_feedback": false
-  }
-}
-```
diff --git a/docs/src/ai/ai-improvement.md b/docs/src/ai/ai-improvement.md
deleted file mode 100644
index 857ca2c0ef..0000000000
--- a/docs/src/ai/ai-improvement.md
+++ /dev/null
@@ -1,112 +0,0 @@
-# Zed AI Improvement
-
-## Agent Panel
-
-### Opt-In
-
-When you use the Agent Panel through any of these means:
-
-- [Zed's hosted models](./subscription.md)
-- [connecting a non-Zed AI service via API key](./llm-providers.md)
-- using an [external agent](./external-agents.md)
-
-Zed does not persistently store user content or use user content to evaluate and/or improve our AI features, unless it is explicitly shared with Zed. Each share is opt-in, and sharing once will not cause future content or data to be shared again.
-
-> Note that rating responses will send your data related to that response to Zed's servers.
-> **_If you don't want data persisted on Zed's servers, don't rate_**. We will not collect data for improving our Agentic offering without you explicitly rating responses.
-
-When using upstream services through Zed's hosted models, we require assurances from our service providers that your user content won't be used for training models.
-
-| Provider  | No Training Guarantee                                   | Zero-Data Retention (ZDR)                                                                                                                     |
-| --------- | ------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- |
-| Anthropic | [Yes](https://www.anthropic.com/legal/commercial-terms) | [Yes](https://privacy.anthropic.com/en/articles/8956058-i-have-a-zero-data-retention-agreement-with-anthropic-what-products-does-it-apply-to) |
-| Google    | [Yes](https://cloud.google.com/terms/service-terms)     | [Yes](https://cloud.google.com/terms/service-terms), see Service Terms sections 17 and 19h                                                    |
-| OpenAI    | [Yes](https://openai.com/enterprise-privacy/)           | [Yes](https://platform.openai.com/docs/guides/your-data)                                                                                      |
-
-When you use your own API keys or external agents, **Zed does not have control over how your data is used by that service provider.**
-You should reference your agreement with each service provider to understand what terms and conditions apply.
-
-### Data we collect
-
-For prompts you have explicitly shared with us, Zed may store copies of those prompts and other data about the specific use of the Agent Panel.
-
-This data includes:
-
-- The prompt given to the Agent
-- Any commentary you include
-- Product telemetry about the agentic thread
-- Metadata about your Zed installation
-
-### Data Handling
-
-Collected data is stored in Snowflake, a private database where we track other metrics. We periodically review this data to improve our overall agentic approach and refine the product via our system prompt, tool use, etc. We ensure any included data is anonymized and contains no sensitive information (access tokens, user IDs, email addresses, etc).
-
-## Edit Predictions
-
-By default, when using Zed Edit Predictions, Zed does not persistently store user content or use user content for training of its models.
-
-### Opt-in
-
-Users who are working on open source licensed projects may optionally opt-in to providing model improvement feedback. This opt-in occurs on a per-project basis. If you work on multiple open source projects and wish to provide model improvement feedback you will have to opt-in for each individual project.
-
-When working on other projects where you haven't opted-in, Zed will not persistently store user content or use user content for training of its models.
-
-You can see exactly how Zed detects open source licenses in: [license_detection.rs](https://github.com/zed-industries/zed/blob/main/crates/zeta/src/license_detection.rs).
-
-### Exclusions
-
-Zed will intentionally exclude certain files from Predictive Edits entirely, even when you have opted-in to model improvement feedback.
-
-You can inspect this exclusion list by opening `zed: open default settings` from the command palette:
-
-```json [settings]
-{
-  "edit_predictions": {
-    // A list of globs representing files that edit predictions should be disabled for.
-    // There's a sensible default list of globs already included.
-    // Any addition to this list will be merged with the default list.
-    "disabled_globs": [
-      "**/.env*",
-      "**/*.pem",
-      "**/*.key",
-      "**/*.cert",
-      "**/*.crt",
-      "**/secrets.yml"
-    ]
-  }
-}
-```
-
-Users may explicitly exclude additional paths and/or file extensions by adding them to [`edit_predictions.disabled_globs`](https://zed.dev/docs/configuring-zed#edit-predictions) in their Zed settings.json:
-
-```json [settings]
-{
-  "edit_predictions": {
-    "disabled_globs": ["secret_dir/*", "**/*.log"]
-  }
-}
-```
-
-### Data we collect
-
-For open source projects where you have opted-in, Zed may store copies of requests and responses to the Zed AI Prediction service.
-
-This data includes:
-
-- the edit prediction
-- a portion of the buffer content around the cursor
-- a few recent edits
-- the current buffer outline
-- diagnostics (errors, warnings, etc) from language servers
-
-### Data Handling
-
-Collected data is stored in Snowflake, a private database where we track other metrics. We periodically review this data to select training samples for inclusion in our model training dataset. We ensure any included data is anonymized and contains no sensitive information (access tokens, user IDs, email addresses, etc). This training dataset is publicly available at [huggingface.co/datasets/zed-industries/zeta](https://huggingface.co/datasets/zed-industries/zeta).
-
-### Model Output
-
-We then use this training dataset to fine-tune [Qwen2.5-Coder-7B](https://huggingface.co/Qwen/Qwen2.5-Coder-7B) and make the resulting model available at [huggingface.co/zed-industries/zeta](https://huggingface.co/zed-industries/zeta).
-
-## Applicable terms
-
-Please see the [Zed Terms of Service](https://zed.dev/terms-of-service) for more.
diff --git a/docs/src/ai/billing.md b/docs/src/ai/billing.md
deleted file mode 100644
index 64ff871ce1..0000000000
--- a/docs/src/ai/billing.md
+++ /dev/null
@@ -1,50 +0,0 @@
-# Billing
-
-We use Stripe as our payments provider, and Orb for invoicing and metering. All Pro plans require payment via credit card or other supported payment method.
-For invoice-based billing, a Business plan is required. Contact [sales@zed.dev](mailto:sales@zed.dev) for more information.
-
-## Billing Information {#settings}
-
-You can access billing information and settings at [zed.dev/account](https://zed.dev/account).
-Most of the page embeds information from our invoicing/metering partner, Orb (we're planning on a more native experience soon!).
-
-## Billing Cycles {#billing-cycles}
-
-Zed is billed on a monthly basis based on the date you initially subscribe. You'll receive _at least_ one invoice from Zed each month you're subscribed to Zed Pro, and more than one if you use more than $10 in incremental token spend within the month.
-
-## Threshold Billing {#threshold-billing}
-
-Zed utilizes threshold billing to ensure timely collection of owed monies and prevent abuse. Every time your usage of Zed's hosted models crosses a $10 spend threshold, a new invoice is generated, and the threshold resets to $0.
-
-For example,
-
-- You subscribe on February 1. Your first invoice is $10.
-- You use $12 of incremental tokens in the month of February, with the first $10 spent on February 15. You'll receive an invoice for $10 on February 15
-- On March 1, you receive an invoice for $12: $10 (March Pro subscription) and $2 in leftover token spend, since your usage didn't cross the $10 threshold.
-
-## Payment Failures {#payment-failures}
-
-If payment of an invoice fails, Zed will block usage of our hosted models until the payment is complete. Email [billing-support@zed.dev](mailto:billing-support@zed.dev) for assistance.
-
-## Invoice History {#invoice-history}
-
-You can access your invoice history by navigating to [zed.dev/account](https://zed.dev/account) and clicking `Invoice history` within the embedded Orb portal.
-
-If you require historical Stripe invoices, email [billing-support@zed.dev](mailto:billing-support@zed.dev)
-
-## Updating Billing Information {#updating-billing-info}
-
-Email [billing-support@zed.dev](mailto:billing-support@zed.dev) for help updating payment methods, names, addresses, and tax information.
-
-> We'll be updating our account page shortly to allow for self-service updates. Stay tuned!
-
-Please note that changes to billing information will **only** affect future invoices — **we cannot modify historical invoices**.
-
-## Sales Tax {#sales-tax}
-
-Zed partners with [Sphere](https://www.getsphere.com/) to calculate indirect tax rate for invoices, based on customer location and the product being sold. Tax is listed as a separate line item on invoices, based preferentially on your billing address, followed by the card issue country known to Stripe.
-
-If you have a VAT/GST ID, you can add it at during checkout. Check the box that denotes you as a business.
-
-Please note that changes to VAT/GST IDs and address will **only** affect future invoices — **we cannot modify historical invoices**.
-Questions or issues can be directed to [billing-support@zed.dev](mailto:billing-support@zed.dev).
diff --git a/docs/src/ai/configuration.md b/docs/src/ai/configuration.md
deleted file mode 100644
index 8877689e46..0000000000
--- a/docs/src/ai/configuration.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# Configuration
-
-When using AI in Zed, you can configure multiple dimensions:
-
-1. Which LLM providers you can use
-   - Zed's hosted models, which require [authentication](../authentication.md) and [subscription](./subscription.md)
-   - [Using your own API keys](./llm-providers.md), which do not
-   - Using [external agents like Claude Code](./external-agents.md), which do not
-2. [Model parameters and usage](./agent-settings.md#model-settings)
-3. [Interactions with the Agent Panel](./agent-settings.md#agent-panel-settings)
-
-## Turning AI Off Entirely
-
-We want to respect users who want to use Zed without interacting with AI whatsoever.
-To do that, add the following key to your `settings.json`:
-
-```json [settings]
-{
-  "disable_ai": true
-}
-```
-
-Read [the following blog post](https://zed.dev/blog/disable-ai-features) to learn more about our motivation to promote this, as much as we also encourage users to explore AI-assisted programming.
diff --git a/docs/src/ai/edit-prediction.md b/docs/src/ai/edit-prediction.md
deleted file mode 100644
index feef6d36d2..0000000000
--- a/docs/src/ai/edit-prediction.md
+++ /dev/null
@@ -1,365 +0,0 @@
-# Edit Prediction
-
-Edit Prediction is Zed's LLM mechanism for predicting the code you want to write.
-Each keystroke sends a new request to the edit prediction provider, which returns individual or multi-line suggestions that can be quickly accepted by pressing `tab`.
-
-The default provider is [Zeta, a proprietary open source and open dataset model](https://huggingface.co/zed-industries/zeta), but you can also use [other providers](#other-providers) like GitHub Copilot, Supermaven, and Codestral.
-
-## Configuring Zeta
-
-To use Zeta, the only thing you need to do is [to sign in](../authentication.md#what-features-require-signing-in).
-After doing that, you should already see predictions as you type on your files.
-
-You can confirm that Zeta is properly configured either by verifying whether you have the following code in your `settings.json`:
-
-```json [settings]
-"features": {
-  "edit_prediction_provider": "zed"
-},
-```
-
-Or you can also look for a little Z icon in the right of your status bar at the bottom.
-
-### Pricing and Plans
-
-From just signing in, while in Zed's free plan, you get 2,000 Zeta-powered edit predictions per month.
-But you can get _**unlimited edit predictions**_ by upgrading to [the Pro plan](../ai/plans-and-usage.md).
-More information can be found in [Zed's pricing page](https://zed.dev/pricing).
-
-### Switching Modes {#switching-modes}
-
-Zed's Edit Prediction comes with two different display modes:
-
-1. `eager` (default): predictions are displayed inline as long as it doesn't conflict with language server completions
-2. `subtle`: predictions only appear inline when holding a modifier key (`alt` by default)
-
-Toggle between them via the `mode` key:
-
-```json [settings]
-"edit_predictions": {
-  "mode": "eager" // or "subtle"
-},
-```
-
-Or directly via the UI through the status bar menu:
-
-![Edit Prediction status bar menu, with the modes toggle.](https://zed.dev/img/edit-prediction/status-bar-menu.webp)
-
-> Note that edit prediction modes work with any prediction provider.
-
-### Conflict With Other `tab` Actions {#edit-predictions-conflict}
-
-By default, when `tab` would normally perform a different action, Zed requires a modifier key to accept predictions:
-
-1. When the language server completions menu is visible.
-2. When your cursor isn't at the right indentation level.
-
-In these cases, `alt-tab` is used instead to accept the prediction. When the language server completions menu is open, holding `alt` first will cause it to temporarily disappear in order to preview the prediction within the buffer.
-
-On Linux, `alt-tab` is often used by the window manager for switching windows, so `alt-l` is provided as the default binding for accepting predictions. `tab` and `alt-tab` also work, but aren't displayed by default.
-
-{#action editor::AcceptPartialEditPrediction} ({#kb editor::AcceptPartialEditPrediction}) can be used to accept the current edit prediction up to the next word boundary.
-
-## Configuring Edit Prediction Keybindings {#edit-predictions-keybinding}
-
-By default, `tab` is used to accept edit predictions. You can use another keybinding by inserting this in your keymap:
-
-```json [settings]
-{
-  "context": "Editor && edit_prediction",
-  "bindings": {
-    // Here we also allow `alt-enter` to accept the prediction
-    "alt-enter": "editor::AcceptEditPrediction"
-  }
-}
-```
-
-When there's a [conflict with the `tab` key](#edit-predictions-conflict), Zed uses a different key context to accept keybindings (`edit_prediction_conflict`).
-If you want to use a different one, you can insert this in your keymap:
-
-```json [settings]
-{
-  "context": "Editor && edit_prediction_conflict",
-  "bindings": {
-    "ctrl-enter": "editor::AcceptEditPrediction" // Example of a modified keybinding
-  }
-}
-```
-
-If your keybinding contains a modifier (`ctrl` in the example above), it will also be used to preview the edit prediction and temporarily hide the language server completion menu.
-
-You can also bind this action to keybind without a modifier.
-In that case, Zed will use the default modifier (`alt`) to preview the edit prediction.
-
-```json [settings]
-{
-  "context": "Editor && edit_prediction_conflict",
-  "bindings": {
-    // Here we bind tab to accept even when there's a language server completion
-    // or the cursor isn't at the correct indentation level
-    "tab": "editor::AcceptEditPrediction"
-  }
-}
-```
-
-To maintain the use of the modifier key for accepting predictions when there is a language server completions menu, but allow `tab` to accept predictions regardless of cursor position, you can specify the context further with `showing_completions`:
-
-```json [settings]
-{
-  "context": "Editor && edit_prediction_conflict && !showing_completions",
-  "bindings": {
-    // Here we don't require a modifier unless there's a language server completion
-    "tab": "editor::AcceptEditPrediction"
-  }
-}
-```
-
-### Keybinding Example: Always Use Tab
-
-If you want to use `tab` to always accept edit predictions, you can use the following keybinding:
-
-```json [keymap]
-{
-  "context": "Editor && edit_prediction_conflict && showing_completions",
-  "bindings": {
-    "tab": "editor::AcceptEditPrediction"
-  }
-}
-```
-
-This will make `tab` work to accept edit predictions _even when_ you're also seeing language server completions.
-That means that you need to rely on `enter` for accepting the latter.
-
-### Keybinding Example: Always Use Alt-Tab
-
-The keybinding example below causes `alt-tab` to always be used instead of sometimes using `tab`.
-You might want this in order to have just one (alternative) keybinding to use for accepting edit predictions, since the behavior of `tab` varies based on context.
-
-```json [keymap]
-  {
-    "context": "Editor && edit_prediction",
-    "bindings": {
-      "alt-tab": "editor::AcceptEditPrediction"
-    }
-  },
-  // Bind `tab` back to its original behavior.
-  {
-    "context": "Editor",
-    "bindings": {
-      "tab": "editor::Tab"
-    }
-  },
-  {
-    "context": "Editor && showing_completions",
-    "bindings": {
-      "tab": "editor::ComposeCompletion"
-    }
-  },
-```
-
-If you are using [Vim mode](../vim.md), then additional bindings are needed after the above to return `tab` to its original behavior:
-
-```json [keymap]
-  {
-    "context": "(VimControl && !menu) || vim_mode == replace || vim_mode == waiting",
-    "bindings": {
-      "tab": "vim::Tab"
-    }
-  },
-  {
-    "context": "vim_mode == literal",
-    "bindings": {
-      "tab": ["vim::Literal", ["tab", "\u0009"]]
-    }
-  },
-```
-
-### Keybinding Example: Displaying Tab and Alt-Tab on Linux
-
-While `tab` and `alt-tab` are supported on Linux, `alt-l` is displayed instead.
-If your window manager does not reserve `alt-tab`, and you would prefer to use `tab` and `alt-tab`, include these bindings in `keymap.json`:
-
-```json [keymap]
-  {
-    "context": "Editor && edit_prediction",
-    "bindings": {
-      "tab": "editor::AcceptEditPrediction",
-      // Optional: This makes the default `alt-l` binding do nothing.
-      "alt-l": null
-    }
-  },
-  {
-    "context": "Editor && edit_prediction_conflict",
-    "bindings": {
-      "alt-tab": "editor::AcceptEditPrediction",
-      // Optional: This makes the default `alt-l` binding do nothing.
-      "alt-l": null
-    }
-  },
-```
-
-### Missing keybind {#edit-predictions-missing-keybinding}
-
-Zed requires at least one keybinding for the {#action editor::AcceptEditPrediction} action in both the `Editor && edit_prediction` and `Editor && edit_prediction_conflict` contexts ([learn more above](#edit-predictions-keybinding)).
-
-If you have previously bound the default keybindings to different actions in the global context, you will not be able to preview or accept edit predictions. For example:
-
-```json [keymap]
-[
-  // Your keymap
-  {
-    "bindings": {
-      // Binds `alt-tab` to a different action globally
-      "alt-tab": "menu::SelectNext"
-    }
-  }
-]
-```
-
-To fix this, you can specify your own keybinding for accepting edit predictions:
-
-```json [keymap]
-[
-  // ...
-  {
-    "context": "Editor && edit_prediction_conflict",
-    "bindings": {
-      "alt-l": "editor::AcceptEditPrediction"
-    }
-  }
-]
-```
-
-If you would like to use the default keybinding, you can free it up by either moving yours to a more specific context or changing it to something else.
-
-## Disabling Automatic Edit Prediction
-
-There are different levels in which you can disable edit predictions to be displayed, including not having it turned on at all.
-
-Alternatively, if you have Zed set as your provider, consider [using Subtle Mode](#switching-modes).
-
-### On Buffers
-
-To not have predictions appear automatically as you type, set this within `settings.json`:
-
-```json [settings]
-{
-  "show_edit_predictions": false
-}
-```
-
-This hides every indication that there is a prediction available, regardless of [the display mode](#switching-modes) you're in (valid only if you have Zed as your provider).
-Still, you can trigger edit predictions manually by executing {#action editor::ShowEditPrediction} or hitting {#kb editor::ShowEditPrediction}.
-
-### For Specific Languages
-
-To not have predictions appear automatically as you type when working with a specific language, set this within `settings.json`:
-
-```json [settings]
-{
-  "language": {
-    "python": {
-      "show_edit_predictions": false
-    }
-  }
-}
-```
-
-### In Specific Directories
-
-To disable edit predictions for specific directories or files, set this within `settings.json`:
-
-```json [settings]
-{
-  "edit_predictions": {
-    "disabled_globs": ["~/.config/zed/settings.json"]
-  }
-}
-```
-
-### Turning Off Completely
-
-To completely turn off edit prediction across all providers, explicitly set the settings to `none`, like so:
-
-```json [settings]
-"features": {
-  "edit_prediction_provider": "none"
-},
-```
-
-## Configuring Other Providers {#other-providers}
-
-Zed's Edit Prediction also work with other completion model providers aside from Zeta.
-Learn about the available ones below.
-
-### GitHub Copilot {#github-copilot}
-
-To use GitHub Copilot as your provider, set this within `settings.json`:
-
-```json [settings]
-{
-  "features": {
-    "edit_prediction_provider": "copilot"
-  }
-}
-```
-
-You should be able to sign-in to GitHub Copilot by clicking on the Copilot icon in the status bar and following the setup instructions.
-
-#### Using GitHub Copilot Enterprise
-
-If your organization uses GitHub Copilot Enterprise, you can configure Zed to use your enterprise instance by specifying the enterprise URI in your `settings.json`:
-
-```json [settings]
-{
-  "edit_predictions": {
-    "copilot": {
-      "enterprise_uri": "https://your.enterprise.domain"
-    }
-  }
-}
-```
-
-Replace `"https://your.enterprise.domain"` with the URL provided by your GitHub Enterprise administrator (e.g., `https://foo.ghe.com`).
-
-Once set, Zed will route Copilot requests through your enterprise endpoint.
-When you sign in by clicking the Copilot icon in the status bar, you will be redirected to your configured enterprise URL to complete authentication.
-All other Copilot features and usage remain the same.
-
-Copilot can provide multiple completion alternatives, and these can be navigated with the following actions:
-
-- {#action editor::NextEditPrediction} ({#kb editor::NextEditPrediction}): To cycle to the next edit prediction
-- {#action editor::PreviousEditPrediction} ({#kb editor::PreviousEditPrediction}): To cycle to the previous edit prediction
-
-### Supermaven {#supermaven}
-
-To use Supermaven as your provider, set this within `settings.json`:
-
-```json [settings]
-{
-  "features": {
-    "edit_prediction_provider": "supermaven"
-  }
-}
-```
-
-You should be able to sign-in to Supermaven by clicking on the Supermaven icon in the status bar and following the setup instructions.
-
-### Codestral {#codestral}
-
-To use Mistral's Codestral as your provider, start by going to the Agent Panel settings view by running the {#action agent::OpenSettings} action.
-Look for the Mistral item and add a Codestral API key in the corresponding text input.
-
-After that, you should be able to switch your provider to it in your `settings.json` file:
-
-```json [settings]
-{
-  "features": {
-    "edit_prediction_provider": "codestral"
-  }
-}
-```
-
-## See also
-
-To learn about other ways to interact with AI in Zed, you may also want to see more about the [Agent Panel](./agent-panel.md) or the [Inline Assistant](./inline-assistant.md) feature.
diff --git a/docs/src/ai/external-agents.md b/docs/src/ai/external-agents.md
deleted file mode 100644
index 0467913b07..0000000000
--- a/docs/src/ai/external-agents.md
+++ /dev/null
@@ -1,248 +0,0 @@
-# External Agents
-
-Zed supports terminal-based agents through the [Agent Client Protocol (ACP)](https://agentclientprotocol.com).
-
-Currently, [Gemini CLI](https://github.com/google-gemini/gemini-cli) serves as the reference implementation.
-[Claude Code](https://www.anthropic.com/claude-code) and [Codex](https://developers.openai.com/codex) are also included by default, and you can [add custom ACP-compatible agents](#add-more-agents) as well.
-
-> Note that Zed's affordance for external agents is strictly UI-based; the billing and legal/terms arrangement is directly between you and the agent provider.
-> Zed does not charge for use of external agents, and our [zero-data retention agreements/privacy guarantees](./ai-improvement.md) are **_only_** applicable for Zed's hosted models.
-
-## Gemini CLI {#gemini-cli}
-
-Zed provides the ability to run [Gemini CLI](https://github.com/google-gemini/gemini-cli) directly in the [agent panel](./agent-panel.md).
-
-Under the hood we run Gemini CLI in the background, and talk to it over ACP.
-This means that you're running the real Gemini CLI, with all of the advantages of that, but you can see and interact with files in your editor.
-
-### Getting Started
-
-As of [Zed Stable v0.201.5](https://zed.dev/releases/stable/0.201.5) you should be able to use Gemini CLI directly from Zed. First open the agent panel with {#kb agent::ToggleFocus}, and then use the `+` button in the top right to start a new Gemini CLI thread.
-
-If you'd like to bind this to a keyboard shortcut, you can do so by editing your `keymap.json` file via the `zed: open keymap` command to include:
-
-```json [keymap]
-[
-  {
-    "bindings": {
-      "cmd-alt-g": ["agent::NewExternalAgentThread", { "agent": "gemini" }]
-    }
-  }
-]
-```
-
-#### Installation
-
-The first time you create a Gemini CLI thread, Zed will install [@google/gemini-cli](https://github.com/google-gemini/gemini-cli). This installation is only available to Zed and is kept up to date as you use the agent.
-
-By default, Zed will use this managed version of Gemini CLI even if you have it installed globally. However, you can configure it to use a version in your `PATH` by adding this to your settings:
-
-```json [settings]
-{
-  "agent_servers": {
-    "gemini": {
-      "ignore_system_version": false
-    }
-  }
-}
-```
-
-#### Authentication
-
-After you have Gemini CLI running, you'll be prompted to choose your authentication method.
-
-Most users should click the "Log in with Google". This will cause a browser window to pop-up and auth directly with Gemini CLI. Zed does not see your OAuth or access tokens in this case.
-
-You can also use the "Gemini API Key". If you select this, and have the `GEMINI_API_KEY` set, then we will use that. Otherwise Zed will prompt you for an API key which will be stored securely in your keychain, and used to start Gemini CLI from within Zed.
-
-The "Vertex AI" option is for those who are using [Vertex AI](https://cloud.google.com/vertex-ai), and have already configured their environment correctly.
-
-For more information, see the [Gemini CLI docs](https://github.com/google-gemini/gemini-cli/blob/main/docs/index.md).
-
-### Usage
-
-Similar to Zed's first-party agent, you can use Gemini CLI to do anything that you need.
-And to give it context, you can @-mention files, recent threads, symbols, or fetch the web.
-
-> Note that some first-party agent features don't yet work with Gemini CLI: editing past messages, resuming threads from history, and checkpointing.
-> We hope to add these features in the near future.
-
-## Claude Code
-
-Similar to Gemini CLI, you can also run [Claude Code](https://www.anthropic.com/claude-code) directly via Zed's [agent panel](./agent-panel.md).
-Under the hood, Zed runs Claude Code and communicate to it over ACP, through [a dedicated adapter](https://github.com/zed-industries/claude-code-acp).
-
-### Getting Started
-
-Open the agent panel with {#kb agent::ToggleFocus}, and then use the `+` button in the top right to start a new Claude Code thread.
-
-If you'd like to bind this to a keyboard shortcut, you can do so by editing your `keymap.json` file via the `zed: open keymap` command to include:
-
-```json [keymap]
-[
-  {
-    "bindings": {
-      "cmd-alt-c": ["agent::NewExternalAgentThread", { "agent": "claude_code" }]
-    }
-  }
-]
-```
-
-### Authentication
-
-As of version `0.202.7` (stable) and `0.203.2` (preview), authentication to Zed's Claude Code installation is decoupled entirely from Zed's agent. That is to say, an Anthropic API key added via the [Zed Agent's settings](./llm-providers.md#anthropic) will _not_ be utilized by Claude Code for authentication and billing.
-
-To ensure you're using your billing method of choice, [open a new Claude Code thread](./agent-panel.md#new-thread). Then, run `/login`, and authenticate either via API key, or via `Log in with Claude Code` to use a Claude Pro/Max subscription.
-
-#### Installation
-
-The first time you create a Claude Code thread, Zed will install [@zed-industries/claude-code-acp](https://github.com/zed-industries/claude-code-acp). This installation is only available to Zed and is kept up to date as you use the agent.
-
-Zed will always use this managed version of the Claude Code adapter, which includes a vendored version of the Claude Code CLI, even if you have it installed globally.
-
-If you want to override the executable used by the adapter, you can set the `CLAUDE_CODE_EXECUTABLE` environment variable in your settings to the path of your preferred executable.
-
-```json
-{
-  "agent_servers": {
-    "claude": {
-      "env": {
-        "CLAUDE_CODE_EXECUTABLE": "/path/to/alternate-claude-code-executable"
-      }
-    }
-  }
-}
-```
-
-### Usage
-
-Similar to Zed's first-party agent, you can use Claude Code to do anything that you need.
-And to give it context, you can @-mention files, recent threads, symbols, or fetch the web.
-
-In complement to talking to it [over ACP](https://agentclientprotocol.com), Zed relies on the [Claude Code SDK](https://docs.anthropic.com/en/docs/claude-code/sdk/sdk-overview) to support some of its specific features.
-However, the SDK doesn't yet expose everything needed to fully support all of them:
-
-- Slash Commands: A subset of [built-in commands](https://docs.anthropic.com/en/docs/claude-code/slash-commands#built-in-slash-commands) are supported, while [custom slash commands](https://docs.anthropic.com/en/docs/claude-code/slash-commands#custom-slash-commands) are fully supported.
-- [Subagents](https://docs.anthropic.com/en/docs/claude-code/sub-agents) are supported.
-- [Hooks](https://docs.anthropic.com/en/docs/claude-code/hooks-guide) are currently _not_ supported.
-
-> Also note that some [first-party agent](./agent-panel.md) features don't yet work with Claude Code: editing past messages, resuming threads from history, and checkpointing.
-> We hope to add these features in the near future.
-
-#### CLAUDE.md
-
-Claude Code in Zed will automatically use any `CLAUDE.md` file found in your project root, project subdirectories, or root `.claude` directory.
-
-If you don't have a `CLAUDE.md` file, you can ask Claude Code to create one for you through the `init` slash command.
-
-## Codex CLI
-
-You can also run [Codex CLI](https://github.com/openai/codex) directly via Zed's [agent panel](./agent-panel.md).
-Under the hood, Zed runs Codex CLI and communicates to it over ACP, through [a dedicated adapter](https://github.com/zed-industries/codex-acp).
-
-### Getting Started
-
-As of Zed Stable v0.208 you should be able to use Codex directly from Zed. Open the agent panel with {#kb agent::ToggleFocus}, and then use the `+` button in the top right to start a new Codex thread.
-
-If you'd like to bind this to a keyboard shortcut, you can do so by editing your `keymap.json` file via the `zed: open keymap` command to include:
-
-```json
-[
-  {
-    "bindings": {
-      "cmd-alt-c": ["agent::NewExternalAgentThread", { "agent": "codex" }]
-    }
-  }
-]
-```
-
-### Authentication
-
-Authentication to Zed's Codex installation is decoupled entirely from Zed's agent. That is to say, an OpenAI API key added via the [Zed Agent's settings](./llm-providers.md#openai) will _not_ be utilized by Codex for authentication and billing.
-
-To ensure you're using your billing method of choice, [open a new Codex thread](./agent-panel.md#new-thread). The first time you will be prompted to authenticate with one of three methods:
-
-1. Login with ChatGPT - allows you to use your existing, paid ChatGPT subscription. _Note: This method isn't currently supported in remote projects_
-2. `CODEX_API_KEY` - uses an API key you have set in your environment under the variable `CODEX_API_KEY`.
-3. `OPENAI_API_KEY` - uses an API key you have set in your environment under the variable `OPENAI_API_KEY`.
-
-If you are already logged in and want to change your authentication method, type `/logout` in the thread and authenticate again.
-
-If you want to use a third-party provider with Codex, you can configure that with your [Codex config.toml](https://github.com/openai/codex/blob/main/docs/config.md#model-selection) or pass extra [args/env variables](https://github.com/openai/codex/blob/main/docs/config.md#model-selection) to your Codex agent servers settings.
-
-#### Installation
-
-The first time you create a Codex thread, Zed will install [codex-acp](https://github.com/zed-industries/codex-acp). This installation is only available to Zed and is kept up to date as you use the agent.
-
-Zed will always use this managed version of Codex even if you have it installed globally.
-
-### Usage
-
-Similar to Zed's first-party agent, you can use Codex to do anything that you need.
-And to give it context, you can @-mention files, symbols, or fetch the web.
-
-> Note that some first-party agent features don't yet work with Codex: editing past messages, resuming threads from history, and checkpointing.
-> We hope to add these features in the near future.
-
-## Add More Agents {#add-more-agents}
-
-Add more external agents to Zed by installing [Agent Server extensions](../extensions/agent-servers.md).
-
-See what agents are available by filtering for "Agent Servers" in the extensions page, which you can access via the command palette with `zed: extensions`, or the [Zed website](https://zed.dev/extensions?filter=agent-servers).
-
-You can also add agents through your `settings.json`, by specifying certain fields under `agent_servers`, like so:
-
-```json [settings]
-{
-  "agent_servers": {
-    "My Custom Agent": {
-      "type": "custom",
-      "command": "node",
-      "args": ["~/projects/agent/index.js", "--acp"],
-      "env": {}
-    }
-  }
-}
-```
-
-This can be useful if you're in the middle of developing a new agent that speaks the protocol and you want to debug it.
-
-It's also possible to specify a custom path, arguments, or environment for the builtin integrations by using the `claude` and `gemini` names.
-
-### Custom Keybinding For Extension-Based Agents
-
-To assign a custom keybinding to start a new thread for agents that were added by installing agent server extensions, add the following snippet to your `keymap.json` file:
-
-```json [keymap]
-{
-  "bindings": {
-    "cmd-alt-n": [ // Your custom keybinding
-      "agent::NewExternalAgentThread",
-      {
-        "agent": {
-          "custom": {
-            "name": "My Agent", // The agent name as it appears in the UI (e.g., "OpenCode", "Auggie CLI", etc.)
-            "command": {
-              "command": "my-agent", // The agent name in lowercase with no spaces
-              "args": ["acp"]
-            }
-          }
-        }
-      }
-    ]
-  }
-},
-```
-
-## Debugging Agents
-
-When using external agents in Zed, you can access the debug view via with `dev: open acp logs` from the Command Palette. This lets you see the messages being sent and received between Zed and the agent.
-
-![The debug view for ACP logs.](https://zed.dev/img/acp/acp-logs.webp)
-
-## MCP Servers
-
-Note that for external agents, access to MCP servers [installed from Zed](./mcp.md) may vary depending on the ACP agent implementation.
-
-Regarding the built-in ones, Claude Code and Codex both support it, and Gemini CLI does not yet.
-In the meantime, learn how to add MCP server support to Gemini CLI through [their documentation](https://github.com/google-gemini/gemini-cli?tab=readme-ov-file#using-mcp-servers).
diff --git a/docs/src/ai/inline-assistant.md b/docs/src/ai/inline-assistant.md
deleted file mode 100644
index af232a837e..0000000000
--- a/docs/src/ai/inline-assistant.md
+++ /dev/null
@@ -1,120 +0,0 @@
-# Inline Assistant
-
-## Usage Overview
-
-Use {#kb assistant::InlineAssist} to open the Inline Assistant nearly anywhere you can enter text: editors, text threads, the rules library, channel notes, and even within the terminal panel.
-
-The Inline Assistant allows you to send the current selection (or the current line) to a language model and modify the selection with the language model's response.
-
-## Getting Started
-
-If you're using the Inline Assistant for the first time, you need to have at least one LLM provider or external agent configured.
-You can do that by:
-
-1. [subscribing to our Pro plan](https://zed.dev/pricing), so you have access to our hosted models
-2. [using your own API keys](./llm-providers.md#use-your-own-keys), either from model providers like Anthropic or model gateways like OpenRouter.
-
-If you have already set up an LLM provider to interact with [the Agent Panel](./agent-panel.md#getting-started), then that will also work for the Inline Assistant.
-
-> Unlike the Agent Panel, though, the only exception at the moment is [external agents](./external-agents.md).
-> They currently can't be used for generating changes with the Inline Assistant.
-
-## Adding Context
-
-You can add context in the Inline Assistant the same way you can in [the Agent Panel](./agent-panel.md#adding-context):
-
-- @-mention files, directories, past threads, rules, and symbols
-- paste images that are copied on your clipboard
-
-Additionally, a useful pattern is to create a thread in the Agent Panel, and then mention it with `@thread` in the Inline Assistant to include it as context.
-That often serves as a way to more quickly iterate over a specific part of a change that happened in the context of a larger thread.
-
-## Parallel Generations
-
-There are two ways in which you can generate multiple changes at once with the Inline Assistant:
-
-### Multiple Cursors
-
-If you have a multiple cursor selection and hit {#kb assistant::InlineAssist}, you can shoot the same prompt for all cursor positions and get a change in all of them.
-
-This is particularly useful when working on excerpts in [a multibuffer context](../multibuffers.md).
-
-### Multiple Models
-
-You can use the Inline Assistant to send the same prompt to multiple models at once.
-
-Here's how you can customize your `settings.json` to add this functionality:
-
-```json [settings]
-{
-  "agent": {
-    "default_model": {
-      "provider": "zed.dev",
-      "model": "claude-sonnet-4"
-    },
-    "inline_alternatives": [
-      {
-        "provider": "zed.dev",
-        "model": "gpt-4-mini"
-      }
-    ]
-  }
-}
-```
-
-When multiple models are configured, you'll see in the Inline Assistant UI buttons that allow you to cycle between outputs generated by each model.
-
-The models you specify here are always used in _addition_ to your [default model](#default-model).
-
-For example, the following configuration will generate three outputs for every assist.
-One with Claude Sonnet 4 (the default model), another with GPT-5-mini, and another one with Gemini 2.5 Flash.
-
-```json [settings]
-{
-  "agent": {
-    "default_model": {
-      "provider": "zed.dev",
-      "model": "claude-sonnet-4"
-    },
-    "inline_alternatives": [
-      {
-        "provider": "zed.dev",
-        "model": "gpt-4-mini"
-      },
-      {
-        "provider": "zed.dev",
-        "model": "gemini-2.5-flash"
-      }
-    ]
-  }
-}
-```
-
-## Inline Assistant vs. Edit Prediction
-
-Users often ask what's the difference between these two AI-powered features in Zed, particularly because both of them involve getting inline LLM code completions.
-
-Here's how they are different:
-
-- The Inline Assistant is more similar to the Agent Panel as in you're still writing a prompt yourself and crafting context. It works from within the buffer and is mostly centered around your selections.
-- [Edit Predictions](./edit-prediction.md) is an AI-powered completion mechanism that intelligently suggests what you likely want to add next, based on context automatically gathered from your previous edits, recently visited files, and more.
-
-In summary, the key difference is that in the Inline Assistant, you're still manually prompting, whereas Edit Prediction will _automatically suggest_ edits to you.
-
-## Prefilling Prompts
-
-To create a custom keybinding that prefills a prompt, you can add the following format in your keymap:
-
-```json [keymap]
-[
-  {
-    "context": "Editor && mode == full",
-    "bindings": {
-      "ctrl-shift-enter": [
-        "assistant::InlineAssist",
-        { "prompt": "Build a snake game" }
-      ]
-    }
-  }
-]
-```
diff --git a/docs/src/ai/llm-providers.md b/docs/src/ai/llm-providers.md
deleted file mode 100644
index f13ece5d3e..0000000000
--- a/docs/src/ai/llm-providers.md
+++ /dev/null
@@ -1,678 +0,0 @@
-# LLM Providers
-
-To use AI in Zed, you need to have at least one large language model provider set up.
-
-You can do that by either subscribing to [one of Zed's plans](./plans-and-usage.md), or by using API keys you already have for the supported providers.
-
-## Use Your Own Keys {#use-your-own-keys}
-
-If you already have an API key for an existing LLM provider, like Anthropic or OpenAI, you can add them to Zed and use the full power of the Agent Panel **_for free_**.
-
-To add an existing API key to a given provider, go to the Agent Panel settings (`agent: open settings`), look for the desired provider, paste the key into the input, and hit enter.
-
-> Note: API keys are _not_ stored as plain text in your `settings.json`, but rather in your OS's secure credential storage.
-
-## Supported Providers
-
-Zed offers an extensive list of "use your own key" LLM providers
-
-- [Amazon Bedrock](#amazon-bedrock)
-- [Anthropic](#anthropic)
-- [DeepSeek](#deepseek)
-- [GitHub Copilot Chat](#github-copilot-chat)
-- [Google AI](#google-ai)
-- [LM Studio](#lmstudio)
-- [Mistral](#mistral)
-- [Ollama](#ollama)
-- [OpenAI](#openai)
-- [OpenAI API Compatible](#openai-api-compatible)
-- [OpenRouter](#openrouter)
-- [Vercel](#vercel-v0)
-- [xAI](#xai)
-
-### Amazon Bedrock {#amazon-bedrock}
-
-> Supports tool use with models that support streaming tool use.
-> More details can be found in the [Amazon Bedrock's Tool Use documentation](https://docs.aws.amazon.com/bedrock/latest/userguide/conversation-inference-supported-models-features.html).
-
-To use Amazon Bedrock's models, an AWS authentication is required.
-Ensure your credentials have the following permissions set up:
-
-- `bedrock:InvokeModelWithResponseStream`
-- `bedrock:InvokeModel`
-
-Your IAM policy should look similar to:
-
-```json [settings]
-{
-  "Version": "2012-10-17",
-  "Statement": [
-    {
-      "Effect": "Allow",
-      "Action": [
-        "bedrock:InvokeModel",
-        "bedrock:InvokeModelWithResponseStream"
-      ],
-      "Resource": "*"
-    }
-  ]
-}
-```
-
-With that done, choose one of the two authentication methods:
-
-#### Authentication via Named Profile (Recommended)
-
-1. Ensure you have the AWS CLI installed and configured with a named profile
-2. Open your `settings.json` (`zed: open settings file`) and include the `bedrock` key under `language_models` with the following settings:
-   ```json [settings]
-   {
-     "language_models": {
-       "bedrock": {
-         "authentication_method": "named_profile",
-         "region": "your-aws-region",
-         "profile": "your-profile-name"
-       }
-     }
-   }
-   ```
-
-#### Authentication via Static Credentials
-
-While it's possible to configure through the Agent Panel settings UI by entering your AWS access key and secret directly, we recommend using named profiles instead for better security practices.
-To do this:
-
-1. Create an IAM User that you can assume in the [IAM Console](https://us-east-1.console.aws.amazon.com/iam/home?region=us-east-1#/users).
-2. Create security credentials for that User, save them and keep them secure.
-3. Open the Agent Configuration with (`agent: open settings`) and go to the Amazon Bedrock section
-4. Copy the credentials from Step 2 into the respective **Access Key ID**, **Secret Access Key**, and **Region** fields.
-
-#### Cross-Region Inference
-
-The Zed implementation of Amazon Bedrock uses [Cross-Region inference](https://docs.aws.amazon.com/bedrock/latest/userguide/cross-region-inference.html) to improve availability and throughput.
-With Cross-Region inference, you can distribute traffic across multiple AWS Regions, enabling higher throughput.
-
-##### Regional vs Global Inference Profiles
-
-Bedrock supports two types of cross-region inference profiles:
-
-- **Regional profiles** (default): Route requests within a specific geography (US, EU, APAC). For example, `us-east-1` uses the `us.*` profile which routes across `us-east-1`, `us-east-2`, and `us-west-2`.
-- **Global profiles**: Route requests across all commercial AWS Regions for maximum availability and performance.
-
-By default, Zed uses **regional profiles** which keep your data within the same geography. You can opt into global profiles by adding `"allow_global": true` to your Bedrock configuration:
-
-```json [settings]
-{
-  "language_models": {
-    "bedrock": {
-      "authentication_method": "named_profile",
-      "region": "your-aws-region",
-      "profile": "your-profile-name",
-      "allow_global": true
-    }
-  }
-}
-```
-
-**Note:** Only select newer models support global inference profiles. See the [AWS Bedrock supported models documentation](https://docs.aws.amazon.com/bedrock/latest/userguide/inference-profiles-support.html#inference-profiles-support-system) for the current list of models that support global inference. If you encounter availability issues with a model in your region, enabling `allow_global` may resolve them.
-
-Although the data remains stored only in the source Region, your input prompts and output results might move outside of your source Region during cross-Region inference.
-All data will be transmitted encrypted across Amazon's secure network.
-
-We will support Cross-Region inference for each of the models on a best-effort basis, please refer to the [Cross-Region Inference method Code](https://github.com/zed-industries/zed/blob/main/crates/bedrock/src/models.rs#L297).
-
-For the most up-to-date supported regions and models, refer to the [Supported Models and Regions for Cross Region inference](https://docs.aws.amazon.com/bedrock/latest/userguide/inference-profiles-support.html).
-
-### Anthropic {#anthropic}
-
-You can use Anthropic models by choosing them via the model dropdown in the Agent Panel.
-
-1. Sign up for Anthropic and [create an API key](https://console.anthropic.com/settings/keys)
-2. Make sure that your Anthropic account has credits
-3. Open the settings view (`agent: open settings`) and go to the Anthropic section
-4. Enter your Anthropic API key
-
-Even if you pay for Claude Pro, you will still have to [pay for additional credits](https://console.anthropic.com/settings/plans) to use it via the API.
-
-Zed will also use the `ANTHROPIC_API_KEY` environment variable if it's defined.
-
-#### Custom Models {#anthropic-custom-models}
-
-You can add custom models to the Anthropic provider by adding the following to your Zed `settings.json`:
-
-```json [settings]
-{
-  "language_models": {
-    "anthropic": {
-      "available_models": [
-        {
-          "name": "claude-3-5-sonnet-20240620",
-          "display_name": "Sonnet 2024-June",
-          "max_tokens": 128000,
-          "max_output_tokens": 2560,
-          "cache_configuration": {
-            "max_cache_anchors": 10,
-            "min_total_token": 10000,
-            "should_speculate": false
-          },
-          "tool_override": "some-model-that-supports-toolcalling"
-        }
-      ]
-    }
-  }
-}
-```
-
-Custom models will be listed in the model dropdown in the Agent Panel.
-
-You can configure a model to use [extended thinking](https://docs.anthropic.com/en/docs/about-claude/models/extended-thinking-models) (if it supports it) by changing the mode in your model's configuration to `thinking`, for example:
-
-```json [settings]
-{
-  "name": "claude-sonnet-4-latest",
-  "display_name": "claude-sonnet-4-thinking",
-  "max_tokens": 200000,
-  "mode": {
-    "type": "thinking",
-    "budget_tokens": 4096
-  }
-}
-```
-
-### DeepSeek {#deepseek}
-
-1. Visit the DeepSeek platform and [create an API key](https://platform.deepseek.com/api_keys)
-2. Open the settings view (`agent: open settings`) and go to the DeepSeek section
-3. Enter your DeepSeek API key
-
-The DeepSeek API key will be saved in your keychain.
-
-Zed will also use the `DEEPSEEK_API_KEY` environment variable if it's defined.
-
-#### Custom Models {#deepseek-custom-models}
-
-The Zed agent comes pre-configured to use the latest version for common models (DeepSeek Chat, DeepSeek Reasoner).
-If you wish to use alternate models or customize the API endpoint, you can do so by adding the following to your Zed `settings.json`:
-
-```json [settings]
-{
-  "language_models": {
-    "deepseek": {
-      "api_url": "https://api.deepseek.com",
-      "available_models": [
-        {
-          "name": "deepseek-chat",
-          "display_name": "DeepSeek Chat",
-          "max_tokens": 64000
-        },
-        {
-          "name": "deepseek-reasoner",
-          "display_name": "DeepSeek Reasoner",
-          "max_tokens": 64000,
-          "max_output_tokens": 4096
-        }
-      ]
-    }
-  }
-}
-```
-
-Custom models will be listed in the model dropdown in the Agent Panel.
-You can also modify the `api_url` to use a custom endpoint if needed.
-
-### GitHub Copilot Chat {#github-copilot-chat}
-
-You can use GitHub Copilot Chat with the Zed agent by choosing it via the model dropdown in the Agent Panel.
-
-1. Open the settings view (`agent: open settings`) and go to the GitHub Copilot Chat section
-2. Click on `Sign in to use GitHub Copilot`, follow the steps shown in the modal.
-
-Alternatively, you can provide an OAuth token via the `GH_COPILOT_TOKEN` environment variable.
-
-> **Note**: If you don't see specific models in the dropdown, you may need to enable them in your [GitHub Copilot settings](https://github.com/settings/copilot/features).
-
-To use Copilot Enterprise with Zed (for both agent and completions), you must configure your enterprise endpoint as described in [Configuring GitHub Copilot Enterprise](./edit-prediction.md#github-copilot-enterprise).
-
-### Google AI {#google-ai}
-
-You can use Gemini models with the Zed agent by choosing it via the model dropdown in the Agent Panel.
-
-1. Go to the Google AI Studio site and [create an API key](https://aistudio.google.com/app/apikey).
-2. Open the settings view (`agent: open settings`) and go to the Google AI section
-3. Enter your Google AI API key and press enter.
-
-The Google AI API key will be saved in your keychain.
-
-Zed will also use the `GEMINI_API_KEY` environment variable if it's defined. See [Using Gemini API keys](https://ai.google.dev/gemini-api/docs/api-key) in the Gemini docs for more.
-
-#### Custom Models {#google-ai-custom-models}
-
-By default, Zed will use `stable` versions of models, but you can use specific versions of models, including [experimental models](https://ai.google.dev/gemini-api/docs/models/experimental-models). You can configure a model to use [thinking mode](https://ai.google.dev/gemini-api/docs/thinking) (if it supports it) by adding a `mode` configuration to your model. This is useful for controlling reasoning token usage and response speed. If not specified, Gemini will automatically choose the thinking budget.
-
-Here is an example of a custom Google AI model you could add to your Zed `settings.json`:
-
-```json [settings]
-{
-  "language_models": {
-    "google": {
-      "available_models": [
-        {
-          "name": "gemini-2.5-flash-preview-05-20",
-          "display_name": "Gemini 2.5 Flash (Thinking)",
-          "max_tokens": 1000000,
-          "mode": {
-            "type": "thinking",
-            "budget_tokens": 24000
-          }
-        }
-      ]
-    }
-  }
-}
-```
-
-Custom models will be listed in the model dropdown in the Agent Panel.
-
-### LM Studio {#lmstudio}
-
-1. Download and install [the latest version of LM Studio](https://lmstudio.ai/download)
-2. In the app press `cmd/ctrl-shift-m` and download at least one model (e.g., qwen2.5-coder-7b). Alternatively, you can get models via the LM Studio CLI:
-
-   ```sh
-   lms get qwen2.5-coder-7b
-   ```
-
-3. Make sure the LM Studio API server is running by executing:
-
-   ```sh
-   lms server start
-   ```
-
-Tip: Set [LM Studio as a login item](https://lmstudio.ai/docs/advanced/headless#run-the-llm-service-on-machine-login) to automate running the LM Studio server.
-
-### Mistral {#mistral}
-
-1. Visit the Mistral platform and [create an API key](https://console.mistral.ai/api-keys/)
-2. Open the configuration view (`agent: open settings`) and navigate to the Mistral section
-3. Enter your Mistral API key
-
-The Mistral API key will be saved in your keychain.
-
-Zed will also use the `MISTRAL_API_KEY` environment variable if it's defined.
-
-#### Custom Models {#mistral-custom-models}
-
-The Zed agent comes pre-configured with several Mistral models (codestral-latest, mistral-large-latest, mistral-medium-latest, mistral-small-latest, open-mistral-nemo, and open-codestral-mamba).
-All the default models support tool use.
-If you wish to use alternate models or customize their parameters, you can do so by adding the following to your Zed `settings.json`:
-
-```json [settings]
-{
-  "language_models": {
-    "mistral": {
-      "api_url": "https://api.mistral.ai/v1",
-      "available_models": [
-        {
-          "name": "mistral-tiny-latest",
-          "display_name": "Mistral Tiny",
-          "max_tokens": 32000,
-          "max_output_tokens": 4096,
-          "max_completion_tokens": 1024,
-          "supports_tools": true,
-          "supports_images": false
-        }
-      ]
-    }
-  }
-}
-```
-
-Custom models will be listed in the model dropdown in the Agent Panel.
-
-### Ollama {#ollama}
-
-Download and install Ollama from [ollama.com/download](https://ollama.com/download) (Linux or macOS) and ensure it's running with `ollama --version`.
-
-1. Download one of the [available models](https://ollama.com/models), for example, for `mistral`:
-
-   ```sh
-   ollama pull mistral
-   ```
-
-2. Make sure that the Ollama server is running. You can start it either via running Ollama.app (macOS) or launching:
-
-   ```sh
-   ollama serve
-   ```
-
-3. In the Agent Panel, select one of the Ollama models using the model dropdown.
-
-#### Ollama Context Length {#ollama-context}
-
-Zed has pre-configured maximum context lengths (`max_tokens`) to match the capabilities of common models.
-Zed API requests to Ollama include this as the `num_ctx` parameter, but the default values do not exceed `16384` so users with ~16GB of RAM are able to use most models out of the box.
-
-See [get_max_tokens in ollama.rs](https://github.com/zed-industries/zed/blob/main/crates/ollama/src/ollama.rs) for a complete set of defaults.
-
-> **Note**: Token counts displayed in the Agent Panel are only estimates and will differ from the model's native tokenizer.
-
-Depending on your hardware or use-case you may wish to limit or increase the context length for a specific model via settings.json:
-
-```json [settings]
-{
-  "language_models": {
-    "ollama": {
-      "api_url": "http://localhost:11434",
-      "available_models": [
-        {
-          "name": "qwen2.5-coder",
-          "display_name": "qwen 2.5 coder 32K",
-          "max_tokens": 32768,
-          "supports_tools": true,
-          "supports_thinking": true,
-          "supports_images": true
-        }
-      ]
-    }
-  }
-}
-```
-
-If you specify a context length that is too large for your hardware, Ollama will log an error.
-You can watch these logs by running: `tail -f ~/.ollama/logs/ollama.log` (macOS) or `journalctl -u ollama -f` (Linux).
-Depending on the memory available on your machine, you may need to adjust the context length to a smaller value.
-
-You may also optionally specify a value for `keep_alive` for each available model.
-This can be an integer (seconds) or alternatively a string duration like "5m", "10m", "1h", "1d", etc.
-For example, `"keep_alive": "120s"` will allow the remote server to unload the model (freeing up GPU VRAM) after 120 seconds.
-
-The `supports_tools` option controls whether the model will use additional tools.
-If the model is tagged with `tools` in the Ollama catalog, this option should be supplied, and the built-in profiles `Ask` and `Write` can be used.
-If the model is not tagged with `tools` in the Ollama catalog, this option can still be supplied with the value `true`; however, be aware that only the `Minimal` built-in profile will work.
-
-The `supports_thinking` option controls whether the model will perform an explicit "thinking" (reasoning) pass before producing its final answer.
-If the model is tagged with `thinking` in the Ollama catalog, set this option and you can use it in Zed.
-
-The `supports_images` option enables the model's vision capabilities, allowing it to process images included in the conversation context.
-If the model is tagged with `vision` in the Ollama catalog, set this option and you can use it in Zed.
-
-#### Ollama Authentication
-
-In addition to running Ollama on your own hardware, which generally does not require authentication, Zed also supports connecting to remote Ollama instances. API keys are required for authentication.
-
-One such service is [Ollama Turbo])(https://ollama.com/turbo). To configure Zed to use Ollama turbo:
-
-1. Sign in to your Ollama account and subscribe to Ollama Turbo
-2. Visit [ollama.com/settings/keys](https://ollama.com/settings/keys) and create an API key
-3. Open the settings view (`agent: open settings`) and go to the Ollama section
-4. Paste your API key and press enter.
-5. For the API URL enter `https://ollama.com`
-
-Zed will also use the `OLLAMA_API_KEY` environment variables if defined.
-
-### OpenAI {#openai}
-
-1. Visit the OpenAI platform and [create an API key](https://platform.openai.com/account/api-keys)
-2. Make sure that your OpenAI account has credits
-3. Open the settings view (`agent: open settings`) and go to the OpenAI section
-4. Enter your OpenAI API key
-
-The OpenAI API key will be saved in your keychain.
-
-Zed will also use the `OPENAI_API_KEY` environment variable if it's defined.
-
-#### Custom Models {#openai-custom-models}
-
-The Zed agent comes pre-configured to use the latest version for common models (GPT-5, GPT-5 mini, o4-mini, GPT-4.1, and others).
-To use alternate models, perhaps a preview release, or if you wish to control the request parameters, you can do so by adding the following to your Zed `settings.json`:
-
-```json [settings]
-{
-  "language_models": {
-    "openai": {
-      "available_models": [
-        {
-          "name": "gpt-5",
-          "display_name": "gpt-5 high",
-          "reasoning_effort": "high",
-          "max_tokens": 272000,
-          "max_completion_tokens": 20000
-        },
-        {
-          "name": "gpt-4o-2024-08-06",
-          "display_name": "GPT 4o Summer 2024",
-          "max_tokens": 128000
-        }
-      ]
-    }
-  }
-}
-```
-
-You must provide the model's context window in the `max_tokens` parameter; this can be found in the [OpenAI model documentation](https://platform.openai.com/docs/models).
-
-OpenAI `o1` models should set `max_completion_tokens` as well to avoid incurring high reasoning token costs.
-Custom models will be listed in the model dropdown in the Agent Panel.
-
-### OpenAI API Compatible {#openai-api-compatible}
-
-Zed supports using [OpenAI compatible APIs](https://platform.openai.com/docs/api-reference/chat) by specifying a custom `api_url` and `available_models` for the OpenAI provider.
-This is useful for connecting to other hosted services (like Together AI, Anyscale, etc.) or local models.
-
-You can add a custom, OpenAI-compatible model either via the UI or by editing your `settings.json`.
-
-To do it via the UI, go to the Agent Panel settings (`agent: open settings`) and look for the "Add Provider" button to the right of the "LLM Providers" section title.
-Then, fill up the input fields available in the modal.
-
-To do it via your `settings.json`, add the following snippet under `language_models`:
-
-```json [settings]
-{
-  "language_models": {
-    "openai_compatible": {
-      // Using Together AI as an example
-      "Together AI": {
-        "api_url": "https://api.together.xyz/v1",
-        "available_models": [
-          {
-            "name": "mistralai/Mixtral-8x7B-Instruct-v0.1",
-            "display_name": "Together Mixtral 8x7B",
-            "max_tokens": 32768,
-            "capabilities": {
-              "tools": true,
-              "images": false,
-              "parallel_tool_calls": false,
-              "prompt_cache_key": false
-            }
-          }
-        ]
-      }
-    }
-  }
-}
-```
-
-By default, OpenAI-compatible models inherit the following capabilities:
-
-- `tools`: true (supports tool/function calling)
-- `images`: false (does not support image inputs)
-- `parallel_tool_calls`: false (does not support `parallel_tool_calls` parameter)
-- `prompt_cache_key`: false (does not support `prompt_cache_key` parameter)
-
-Note that LLM API keys aren't stored in your settings file.
-So, ensure you have it set in your environment variables (`<PROVIDER_NAME>_API_KEY=<your api key>`) so your settings can pick it up. In the example above, it would be `TOGETHER_AI_API_KEY=<your api key>`.
-
-### OpenRouter {#openrouter}
-
-OpenRouter provides access to multiple AI models through a single API. It supports tool use for compatible models.
-
-1. Visit [OpenRouter](https://openrouter.ai) and create an account
-2. Generate an API key from your [OpenRouter keys page](https://openrouter.ai/keys)
-3. Open the settings view (`agent: open settings`) and go to the OpenRouter section
-4. Enter your OpenRouter API key
-
-The OpenRouter API key will be saved in your keychain.
-
-Zed will also use the `OPENROUTER_API_KEY` environment variable if it's defined.
-
-#### Custom Models {#openrouter-custom-models}
-
-You can add custom models to the OpenRouter provider by adding the following to your Zed `settings.json`:
-
-```json [settings]
-{
-  "language_models": {
-    "open_router": {
-      "api_url": "https://openrouter.ai/api/v1",
-      "available_models": [
-        {
-          "name": "google/gemini-2.0-flash-thinking-exp",
-          "display_name": "Gemini 2.0 Flash (Thinking)",
-          "max_tokens": 200000,
-          "max_output_tokens": 8192,
-          "supports_tools": true,
-          "supports_images": true,
-          "mode": {
-            "type": "thinking",
-            "budget_tokens": 8000
-          }
-        }
-      ]
-    }
-  }
-}
-```
-
-The available configuration options for each model are:
-
-- `name` (required): The model identifier used by OpenRouter
-- `display_name` (optional): A human-readable name shown in the UI
-- `max_tokens` (required): The model's context window size
-- `max_output_tokens` (optional): Maximum tokens the model can generate
-- `max_completion_tokens` (optional): Maximum completion tokens
-- `supports_tools` (optional): Whether the model supports tool/function calling
-- `supports_images` (optional): Whether the model supports image inputs
-- `mode` (optional): Special mode configuration for thinking models
-
-You can find available models and their specifications on the [OpenRouter models page](https://openrouter.ai/models).
-
-Custom models will be listed in the model dropdown in the Agent Panel.
-
-#### Provider Routing
-
-You can optionally control how OpenRouter routes a given custom model request among underlying upstream providers via the `provider` object on each model entry.
-
-Supported fields (all optional):
-
-- `order`: Array of provider slugs to try first, in order (e.g. `["anthropic", "openai"]`)
-- `allow_fallbacks` (default: `true`): Whether fallback providers may be used if preferred ones are unavailable
-- `require_parameters` (default: `false`): Only use providers that support every parameter you supplied
-- `data_collection` (default: `allow`): `"allow"` or `"disallow"` (controls use of providers that may store data)
-- `only`: Whitelist of provider slugs allowed for this request
-- `ignore`: Provider slugs to skip
-- `quantizations`: Restrict to specific quantization variants (e.g. `["int4","int8"]`)
-- `sort`: Sort strategy for candidate providers (e.g. `"price"` or `"throughput"`)
-
-Example adding routing preferences to a model:
-
-```json [settings]
-{
-  "language_models": {
-    "open_router": {
-      "api_url": "https://openrouter.ai/api/v1",
-      "available_models": [
-        {
-          "name": "openrouter/auto",
-          "display_name": "Auto Router (Tools Preferred)",
-          "max_tokens": 2000000,
-          "supports_tools": true,
-          "provider": {
-            "order": ["anthropic", "openai"],
-            "allow_fallbacks": true,
-            "require_parameters": true,
-            "only": ["anthropic", "openai", "google"],
-            "ignore": ["cohere"],
-            "quantizations": ["int8"],
-            "sort": "price",
-            "data_collection": "allow"
-          }
-        }
-      ]
-    }
-  }
-}
-```
-
-These routing controls let you fine‑tune cost, capability, and reliability trade‑offs without changing the model name you select in the UI.
-
-### Vercel v0 {#vercel-v0}
-
-[Vercel v0](https://v0.app/docs/api/model) is an expert model for generating full-stack apps, with framework-aware completions optimized for modern stacks like Next.js and Vercel.
-It supports text and image inputs and provides fast streaming responses.
-
-The v0 models are [OpenAI-compatible models](/#openai-api-compatible), but Vercel is listed as first-class provider in the panel's settings view.
-
-To start using it with Zed, ensure you have first created a [v0 API key](https://v0.dev/chat/settings/keys).
-Once you have it, paste it directly into the Vercel provider section in the panel's settings view.
-
-You should then find it as `v0-1.5-md` in the model dropdown in the Agent Panel.
-
-### xAI {#xai}
-
-Zed has first-class support for [xAI](https://x.ai/) models. You can use your own API key to access Grok models.
-
-1. [Create an API key in the xAI Console](https://console.x.ai/team/default/api-keys)
-2. Open the settings view (`agent: open settings`) and go to the **xAI** section
-3. Enter your xAI API key
-
-The xAI API key will be saved in your keychain. Zed will also use the `XAI_API_KEY` environment variable if it's defined.
-
-> **Note:** While the xAI API is OpenAI-compatible, Zed has first-class support for it as a dedicated provider. For the best experience, we recommend using the dedicated `x_ai` provider configuration instead of the [OpenAI API Compatible](#openai-api-compatible) method.
-
-#### Custom Models {#xai-custom-models}
-
-The Zed agent comes pre-configured with common Grok models. If you wish to use alternate models or customize their parameters, you can do so by adding the following to your Zed `settings.json`:
-
-```json [settings]
-{
-  "language_models": {
-    "x_ai": {
-      "api_url": "https://api.x.ai/v1",
-      "available_models": [
-        {
-          "name": "grok-1.5",
-          "display_name": "Grok 1.5",
-          "max_tokens": 131072,
-          "max_output_tokens": 8192
-        },
-        {
-          "name": "grok-1.5v",
-          "display_name": "Grok 1.5V (Vision)",
-          "max_tokens": 131072,
-          "max_output_tokens": 8192,
-          "supports_images": true
-        }
-      ]
-    }
-  }
-}
-```
-
-## Custom Provider Endpoints {#custom-provider-endpoint}
-
-You can use a custom API endpoint for different providers, as long as it's compatible with the provider's API structure.
-To do so, add the following to your `settings.json`:
-
-```json [settings]
-{
-  "language_models": {
-    "some-provider": {
-      "api_url": "http://localhost:11434"
-    }
-  }
-}
-```
-
-Currently, `some-provider` can be any of the following values: `anthropic`, `google`, `ollama`, `openai`.
-
-This is the same infrastructure that powers models that are, for example, [OpenAI-compatible](#openai-api-compatible).
diff --git a/docs/src/ai/mcp.md b/docs/src/ai/mcp.md
deleted file mode 100644
index 956477a1c2..0000000000
--- a/docs/src/ai/mcp.md
+++ /dev/null
@@ -1,139 +0,0 @@
-# Model Context Protocol
-
-Zed uses the [Model Context Protocol](https://modelcontextprotocol.io/) to interact with context servers.
-
-> The Model Context Protocol (MCP) is an open protocol that enables seamless integration between LLM applications and external data sources and tools. Whether you're building an AI-powered IDE, enhancing a chat interface, or creating custom AI workflows, MCP provides a standardized way to connect LLMs with the context they need.
-
-Check out the [Anthropic news post](https://www.anthropic.com/news/model-context-protocol) and the [Zed blog post](https://zed.dev/blog/mcp) for a general intro to MCP.
-
-## Installing MCP Servers
-
-### As Extensions
-
-One of the ways you can use MCP servers in Zed is by exposing them as an extension.
-Check out the [MCP Server Extensions](../extensions/mcp-extensions.md) page to learn how to create your own.
-
-Thanks to our awesome community, many MCP servers have already been added as extensions.
-You can check which ones are available via any of these routes:
-
-1. [the Zed website](https://zed.dev/extensions?filter=context-servers)
-2. in the app, open the Command Palette and run the `zed: extensions` action
-3. in the app, go to the Agent Panel's top-right menu and look for the "View Server Extensions" menu item
-
-In any case, here are some popular available servers:
-
-- [Context7](https://zed.dev/extensions/context7-mcp-server)
-- [GitHub](https://zed.dev/extensions/github-mcp-server)
-- [Puppeteer](https://zed.dev/extensions/puppeteer-mcp-server)
-- [Gem](https://zed.dev/extensions/gem)
-- [Brave Search](https://zed.dev/extensions/brave-search-mcp-server)
-- [Prisma](https://github.com/aqrln/prisma-mcp-zed)
-- [Framelink Figma](https://zed.dev/extensions/framelink-figma-mcp-server)
-- [Linear](https://zed.dev/extensions/linear-mcp-server)
-- [Resend](https://zed.dev/extensions/resend-mcp-server)
-
-### As Custom Servers
-
-Creating an extension is not the only way to use MCP servers in Zed.
-You can connect them by adding their commands directly to your `settings.json`, like so:
-
-```json [settings]
-{
-  "context_servers": {
-    "local-mcp-server": {
-      "command": "some-command",
-      "args": ["arg-1", "arg-2"],
-      "env": {}
-    },
-    "remote-mcp-server": {
-      "url": "custom",
-      "headers": { "Authorization": "Bearer <token>" }
-    }
-  }
-}
-```
-
-Alternatively, you can also add a custom server by accessing the Agent Panel's Settings view (also accessible via the `agent: open settings` action).
-From there, you can add it through the modal that appears when you click the "Add Custom Server" button.
-
-## Using MCP Servers
-
-### Configuration Check
-
-Regardless of how you've installed MCP servers, whether as an extension or adding them directly, most servers out there still require some sort of configuration as part of the setup process.
-
-In the case of extensions, after installing it, Zed will pop up a modal displaying what is required for you to properly set it up.
-For example, the GitHub MCP extension requires you to add a [Personal Access Token](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens).
-
-In the case of custom servers, make sure you check the provider documentation to determine what type of command, arguments, and environment variables need to be added to the JSON.
-
-To check if your MCP server is properly configured, go to the Agent Panel's settings view and watch the indicator dot next to its name.
-If they're running correctly, the indicator will be green and its tooltip will say "Server is active".
-If not, other colors and tooltip messages will indicate what is happening.
-
-### Agent Panel Usage
-
-Once installation is complete, you can return to the Agent Panel and start prompting.
-
-Some models are better than others when it comes to picking up tools from MCP servers.
-Mentioning your server by name always helps the model to pick it up.
-
-However, if you want to _ensure_ a given MCP server will be used, you can create [a custom profile](./agent-panel.md#custom-profiles) where all built-in tools (or the ones that could cause conflicts with the server's tools) are turned off and only the tools coming from the MCP server are turned on.
-
-As an example, [the Dagger team suggests](https://container-use.com/agent-integrations#zed) doing that with their [Container Use MCP server](https://zed.dev/extensions/mcp-server-container-use):
-
-```json [settings]
-"agent": {
-  "profiles": {
-    "container-use": {
-      "name": "Container Use",
-      "tools": {
-        "fetch": true,
-        "thinking": true,
-        "copy_path": false,
-        "find_path": false,
-        "delete_path": false,
-        "create_directory": false,
-        "list_directory": false,
-        "diagnostics": false,
-        "read_file": false,
-        "open": false,
-        "move_path": false,
-        "grep": false,
-        "edit_file": false,
-        "terminal": false
-      },
-      "enable_all_context_servers": false,
-      "context_servers": {
-        "container-use": {
-          "tools": {
-            "environment_create": true,
-            "environment_add_service": true,
-            "environment_update": true,
-            "environment_run_cmd": true,
-            "environment_open": true,
-            "environment_file_write": true,
-            "environment_file_read": true,
-            "environment_file_list": true,
-            "environment_file_delete": true,
-            "environment_checkpoint": true
-          }
-        }
-      }
-    }
-  }
-}
-```
-
-### Tool Approval
-
-Zed's Agent Panel includes the `agent.always_allow_tool_actions` setting that, if set to `false`, will require you to give permission for any editing attempt as well as tool calls coming from MCP servers.
-
-You can change this by setting this key to `true` in either your `settings.json` or through the Agent Panel's settings view.
-
-### External Agents
-
-Note that for [external agents](./external-agents.md) connected through the [Agent Client Protocol](https://agentclientprotocol.com/), access to MCP servers installed from Zed may vary depending on the ACP agent implementation.
-
-Regarding the built-in ones, Claude Code and Codex both support it, and Gemini CLI does not yet.
-In the meantime, learn how to add MCP server support to Gemini CLI through [their documentation](https://github.com/google-gemini/gemini-cli?tab=readme-ov-file#using-mcp-servers).
diff --git a/docs/src/ai/models.md b/docs/src/ai/models.md
deleted file mode 100644
index 6033bf23fa..0000000000
--- a/docs/src/ai/models.md
+++ /dev/null
@@ -1,93 +0,0 @@
-# Models
-
-Zed’s plans offer hosted versions of major LLMs, generally with higher rate limits than using your API keys.
-We’re working hard to expand the models supported by Zed’s subscription offerings, so please check back often.
-
-| Model                  | Provider  | Token Type          | Provider Price per 1M tokens | Zed Price per 1M tokens |
-| ---------------------- | --------- | ------------------- | ---------------------------- | ----------------------- |
-| Claude Opus 4.5        | Anthropic | Input               | $5.00                        | $5.50                   |
-|                        | Anthropic | Output              | $25.00                       | $27.50                  |
-|                        | Anthropic | Input - Cache Write | $6.25                        | $6.875                  |
-|                        | Anthropic | Input - Cache Read  | $0.50                        | $0.55                   |
-| Claude Opus 4.1        | Anthropic | Input               | $15.00                       | $16.50                  |
-|                        | Anthropic | Output              | $75.00                       | $82.50                  |
-|                        | Anthropic | Input - Cache Write | $18.75                       | $20.625                 |
-|                        | Anthropic | Input - Cache Read  | $1.50                        | $1.65                   |
-| Claude Sonnet 4.5      | Anthropic | Input               | $3.00                        | $3.30                   |
-|                        | Anthropic | Output              | $15.00                       | $16.50                  |
-|                        | Anthropic | Input - Cache Write | $3.75                        | $4.125                  |
-|                        | Anthropic | Input - Cache Read  | $0.30                        | $0.33                   |
-| Claude Sonnet 4        | Anthropic | Input               | $3.00                        | $3.30                   |
-|                        | Anthropic | Output              | $15.00                       | $16.50                  |
-|                        | Anthropic | Input - Cache Write | $3.75                        | $4.125                  |
-|                        | Anthropic | Input - Cache Read  | $0.30                        | $0.33                   |
-| Claude Sonnet 3.7      | Anthropic | Input               | $3.00                        | $3.30                   |
-|                        | Anthropic | Output              | $15.00                       | $16.50                  |
-|                        | Anthropic | Input - Cache Write | $3.75                        | $4.125                  |
-|                        | Anthropic | Input - Cache Read  | $0.30                        | $0.33                   |
-| Claude Haiku 4.5       | Anthropic | Input               | $1.00                        | $1.10                   |
-|                        | Anthropic | Output              | $5.00                        | $5.50                   |
-|                        | Anthropic | Input - Cache Write | $1.25                        | $1.375                  |
-|                        | Anthropic | Input - Cache Read  | $0.10                        | $0.11                   |
-| GPT-5                  | OpenAI    | Input               | $1.25                        | $1.375                  |
-|                        | OpenAI    | Output              | $10.00                       | $11.00                  |
-|                        | OpenAI    | Cached Input        | $0.125                       | $0.1375                 |
-| GPT-5 mini             | OpenAI    | Input               | $0.25                        | $0.275                  |
-|                        | OpenAI    | Output              | $2.00                        | $2.20                   |
-|                        | OpenAI    | Cached Input        | $0.025                       | $0.0275                 |
-| GPT-5 nano             | OpenAI    | Input               | $0.05                        | $0.055                  |
-|                        | OpenAI    | Output              | $0.40                        | $0.44                   |
-|                        | OpenAI    | Cached Input        | $0.005                       | $0.0055                 |
-| Gemini 3.0 Pro         | Google    | Input               | $2.00                        | $2.20                   |
-|                        | Google    | Output              | $12.00                       | $13.20                  |
-| Gemini 2.5 Pro         | Google    | Input               | $1.25                        | $1.375                  |
-|                        | Google    | Output              | $10.00                       | $11.00                  |
-| Gemini 2.5 Flash       | Google    | Input               | $0.30                        | $0.33                   |
-|                        | Google    | Output              | $2.50                        | $2.75                   |
-| Grok 4                 | X.ai      | Input               | $3.00                        | $3.30                   |
-|                        | X.ai      | Output              | $15.00                       | $16.5                   |
-|                        | X.ai      | Cached Input        | $0.75                        | $0.825                  |
-| Grok 4 Fast            | X.ai      | Input               | $0.20                        | $0.22                   |
-|                        | X.ai      | Output              | $0.50                        | $0.55                   |
-|                        | X.ai      | Cached Input        | $0.05                        | $0.055                  |
-| Grok 4 (Non-Reasoning) | X.ai      | Input               | $0.20                        | $0.22                   |
-|                        | X.ai      | Output              | $0.50                        | $0.55                   |
-|                        | X.ai      | Cached Input        | $0.05                        | $0.055                  |
-| Grok Code Fast 1       | X.ai      | Input               | $0.20                        | $0.22                   |
-|                        | X.ai      | Output              | $1.50                        | $1.65                   |
-|                        | X.ai      | Cached Input        | $0.02                        | $0.022                  |
-
-## Usage {#usage}
-
-Any usage of a Zed-hosted model will be billed at the Zed Price (rightmost column above). See [Plans and Usage](./plans-and-usage.md) for details on Zed's plans and limits for use of hosted models.
-
-> We encourage you to think through what model is best for your needs before leaving the Agent Panel to work. All LLMs can "spiral" and occasionally enter unending loops that require user intervention.
-
-## Context Windows {#context-windows}
-
-A context window is the maximum span of text and code an LLM can consider at once, including both the input prompt and output generated by the model.
-
-| Model             | Provider  | Zed-Hosted Context Window |
-| ----------------- | --------- | ------------------------- |
-| Claude Opus 4.5   | Anthropic | 200k                      |
-| Claude Opus 4.1   | Anthropic | 200k                      |
-| Claude Sonnet 4   | Anthropic | 200k                      |
-| Claude Sonnet 3.7 | Anthropic | 200k                      |
-| Claude Haiku 4.5  | Anthropic | 200k                      |
-| GPT-5             | OpenAI    | 400k                      |
-| GPT-5 mini        | OpenAI    | 400k                      |
-| GPT-5 nano        | OpenAI    | 400k                      |
-| Gemini 2.5 Pro    | Google    | 200k                      |
-| Gemini 2.5 Flash  | Google    | 200k                      |
-| Gemini 3.0 Pro    | Google    | 200k                      |
-
-> We're planning on expanding supported context windows for hosted Sonnet 4 and Gemini 2.5 Pro/Flash in the near future. Stay tuned!
-
-Each Agent thread and text thread in Zed maintains its own context window.
-The more prompts, attached files, and responses included in a session, the larger the context window grows.
-
-For best results, it’s recommended you take a purpose-based approach to Agent thread management, starting a new thread for each unique task.
-
-## Tool Calls {#tool-calls}
-
-Models can use [tools](./tools.md) to interface with your code, search the web, and perform other useful functions.
diff --git a/docs/src/ai/overview.md b/docs/src/ai/overview.md
deleted file mode 100644
index e1a9cb77a9..0000000000
--- a/docs/src/ai/overview.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# AI
-
-Learn how to get started using AI with Zed and all its capabilities.
-
-## Setting up AI in Zed
-
-- [Configuration](./configuration.md): Learn how to set up different language model providers like Anthropic, OpenAI, Ollama, Google AI, and more.
-
-- [External Agents](./external-agents.md): Learn how to plug in your favorite agent into Zed.
-
-- [Subscription](./subscription.md): Learn about Zed's hosted models and other billing-related information.
-
-- [Privacy and Security](./privacy-and-security.md): Understand how Zed handles privacy and security with AI features.
-
-## Agentic Editing
-
-- [Agent Panel](./agent-panel.md): Create and manage interactions with LLM agents.
-
-- [Rules](./rules.md): How to define rules for AI interactions.
-
-- [Tools](./tools.md): Explore the tools that power Zed's built-in agent.
-
-- [Model Context Protocol](./mcp.md): Learn about how to configure and use MCP servers.
-
-- [Inline Assistant](./inline-assistant.md): Discover how to use AI to generate inline transformations directly within a file or terminal.
-
-## Edit Prediction
-
-- [Edit Prediction](./edit-prediction.md): Learn about Zed's AI prediction feature that helps autocomplete your code.
-
-## Text Threads
-
-- [Text Threads](./text-threads.md): Learn about an editor-based interface for interacting with language models.
diff --git a/docs/src/ai/plans-and-usage.md b/docs/src/ai/plans-and-usage.md
deleted file mode 100644
index fc59a894aa..0000000000
--- a/docs/src/ai/plans-and-usage.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# Plans and Usage
-
-## Available Plans {#plans}
-
-For costs and more information on pricing, visit [Zed’s pricing page](https://zed.dev/pricing).
-
-Please note that if you’re interested in just using Zed as the world’s fastest editor, with no AI or subscription features, you can always do so for free, without [authentication](../authentication.md).
-
-## Usage {#usage}
-
-Usage of Zed's hosted models is measured on a token basis, converted to dollars at the rates lists on [the Models page](./models.md) (list price from the provider, +10%).
-
-Zed Pro comes with $5 of monthly dollar credit. A trial of Zed Pro includes $20 of credit, usable for 14 days. Monthly included credit resets on your monthly billing date.
-
-To view your current usage, you can visit your account at [zed.dev/account](https://zed.dev/account). Information from our metering and billing provider, Orb, is embedded on that page.
-
-## Spend Limits {#usage-spend-limits}
-
-At the top of [the Account page](https://zed.dev/account), you'll find an input for `Maximum Token Spend`. The dollar amount here specifies your _monthly_ limit for spend on tokens, _not counting_ the $5/month included with your Pro subscription.
-
-The default value for all Pro users is $10, for a total monthly spend with Zed of $20 ($10 for your Pro subscription, $10 in incremental token spend). This can be set to $0 to limit your spend with Zed to exactly $10/month. If you adjust this limit _higher_ than $10 and consume more than $10 of incremental token spend, you'll be billed via [threshold billing](./billing.md#threshold-billing).
-
-Once the spend limit is hit, we’ll stop any further usage until your token spend limit resets.
-
-## Business Usage {#business-usage}
-
-Email [sales@zed.dev](mailto:sales@zed.dev) with any questions on business plans.
-
-## Trials {#trials}
-
-Note that trials will automatically convert to Zed Free plans on termination, and no cancellation is needed to prevent conversion to Zed Pro.
diff --git a/docs/src/ai/privacy-and-security.md b/docs/src/ai/privacy-and-security.md
deleted file mode 100644
index 6921567b91..0000000000
--- a/docs/src/ai/privacy-and-security.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# Privacy and Security
-
-## Philosophy
-
-Zed aims to collect on the minimum data necessary to serve and improve our product.
-
-We believe in opt-in data sharing as the default in building AI products, rather than opt-out, like most of our competitors. Privacy Mode is not a setting to be toggled, it's a default stance.
-
-As an open-source product, we believe in maximal transparency, and invite you to examine our codebase. If you find issues, we encourage you to share them with us.
-
-It is entirely possible to use Zed, including Zed's AI capabilities, without sharing any data with us and without authenticating into the product. We're happy to always support this desired use pattern.
-
-## Documentation
-
-- [Telemetry](../telemetry.md): How Zed collects general telemetry data.
-
-- [AI Improvement](./ai-improvement.md): Zed's opt-in-only approach to data collection for AI improvement, whether our Agentic offering or Edit Predictions.
-
-- [Accounts](../authentication.md): When and why you'd need to authenticate into Zed, how to do so, and what scope we need from you.
-
-- [Collab](https://zed.dev/faq#data-and-privacy): How Zed's live collaboration works, and how data flows to provide the experience (we don't store your code!).
-
-## Legal Links
-
-- [Terms of Service](https://zed.dev/terms-of-service)
-- [Terms of Use](https://zed.dev/terms)
-- [Privacy Policy](https://zed.dev/privacy-policy)
-- [Zed's Contributor License and Feedback Agreement](https://zed.dev/cla)
-- [Subprocessors](https://zed.dev/subprocessors)
diff --git a/docs/src/ai/rules.md b/docs/src/ai/rules.md
deleted file mode 100644
index 4169920425..0000000000
--- a/docs/src/ai/rules.md
+++ /dev/null
@@ -1,75 +0,0 @@
-# Using Rules {#using-rules}
-
-A rule is essentially a prompt that is inserted at the beginning of each interaction with the Agent.
-Currently, Zed supports adding rules through files inserted directly in the worktree or through the Rules Library, which allows you to store multiple rules for constant or on-demand usage.
-
-## `.rules` files
-
-Zed supports including `.rules` files at the top level of worktrees, and they act as project-level instructions that are included in all of your interactions with the Agent Panel.
-Other names for this file are also supported for compatibility with other agents, but note that the first file which matches in this list will be used:
-
-- `.rules`
-- `.cursorrules`
-- `.windsurfrules`
-- `.clinerules`
-- `.github/copilot-instructions.md`
-- `AGENT.md`
-- `AGENTS.md`
-- `CLAUDE.md`
-- `GEMINI.md`
-
-## Rules Library {#rules-library}
-
-The Rules Library is an interface for writing and managing rules. Like other text-driven UIs in Zed, it is a full editor with syntax highlighting, keyboard shortcuts, etc.
-
-You can use the inline assistant right in the rules editor, allowing you to automate and rewrite rules.
-
-### Opening the Rules Library
-
-1. Open the Agent Panel.
-2. Click on the Agent menu (`...`) in the top right corner.
-3. Select `Rules...` from the dropdown.
-
-You can also reach it by running {#action agent::OpenRulesLibrary} in the command palette or through the {#kb agent::OpenRulesLibrary} keybinding.
-
-### Managing Rules
-
-Once a rules file is selected, you can edit it directly in the built-in editor. Its title can be changed from the editor title bar as well.
-
-Rules can be duplicated, deleted, or added to the default rules using the buttons in the rules editor.
-
-### Creating Rules {#creating-rules}
-
-To create a rule file, simply open the `Rules Library` and click the `+` button. Rules files are stored locally and can be accessed from the library at any time.
-
-Having a series of rules files specifically tailored to prompt engineering can also help you write consistent and effective rules.
-
-Here are a couple of helpful resources for writing better rules:
-
-- [Anthropic: Prompt Engineering](https://docs.anthropic.com/en/docs/build-with-claude/prompt-engineering/overview)
-- [OpenAI: Prompt Engineering](https://platform.openai.com/docs/guides/prompt-engineering)
-
-### Editing the Default Rules {#default-rules}
-
-Zed allows you to customize the default rules used when interacting with LLMs.
-Or to be more precise, it uses a series of rules that are combined to form the default rules.
-
-Default rules are included in the context of every new thread automatically.
-You can also manually add other rules (that are not flagged as default) as context using the `@rule` command.
-
-## Migrating from Prompt Library
-
-Previously, the Rules Library was called the "Prompt Library".
-The new rules system replaces the Prompt Library except in a few specific cases, which are outlined below.
-
-### Slash Commands in Rules
-
-Previously, it was possible to use slash commands (now @-mentions) in custom prompts (now rules).
-There is currently no support for using @-mentions in rules files, however, slash commands are supported in rules files when used with text threads.
-See the documentation for using [slash commands in rules](./text-threads.md#slash-commands-in-rules) for more information.
-
-### Prompt templates
-
-Zed maintains backwards compatibility with its original template system, which allows you to customize prompts used throughout the application, including the inline assistant.
-While the Rules Library is now the primary way to manage prompts, you can still use these legacy templates to override default prompts.
-For more details, see the [Rules Templates](./text-threads.md#rule-templates) section under [Text Threads](./text-threads.md).
diff --git a/docs/src/ai/subscription.md b/docs/src/ai/subscription.md
deleted file mode 100644
index 704fdc0ce3..0000000000
--- a/docs/src/ai/subscription.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Subscription
-
-Zed's hosted models are offered via subscription to Zed Pro or Zed Business.
-
-> Using [your own API keys](./llm-providers.md), and [external agents](./external-agents.md), is _free_ — you do not need to subscribe to a Zed plan to use AI features.
-
-See the following pages for specific aspects of our subscription offering:
-
-- [Models](./models.md): Overview of the models offered by Zed's subscriptions.
-
-- [Plans and Usage](./plans-and-usage.md): Outlines Zed's plans and how usage is measured.
-
-- [Billing](./billing.md): Billing policies and procedures, and how to update or view various billing settings.
diff --git a/docs/src/ai/text-threads.md b/docs/src/ai/text-threads.md
deleted file mode 100644
index c82cda7265..0000000000
--- a/docs/src/ai/text-threads.md
+++ /dev/null
@@ -1,291 +0,0 @@
-# Text Threads
-
-## Overview {#overview}
-
-Text threads in the [Agent Panel](./agent-panel.md) function similarly to any other editor.
-You can use custom key bindings and work with multiple cursors, allowing for seamless transitions between coding and engaging in discussions with the language models.
-
-However, the text threads differ in the inclusion of message blocks.
-These blocks serve as containers for text that correspond to different roles within the context.
-These roles include:
-
-- `You`
-- `Assistant`
-- `System`
-
-To begin, type a message in a `You` block.
-
-![Asking a question](https://zed.dev/img/assistant/ask-a-question.png)
-
-As you type, the remaining tokens count for the selected model is updated.
-
-Inserting text from an editor is as simple as highlighting the text and running `agent: add selection to thread` ({#kb agent::AddSelectionToThread}); Zed will wrap it in a fenced code block if it is code.
-
-![Quoting a selection](https://zed.dev/img/assistant/quoting-a-selection.png)
-
-To submit a message, use {#kb assistant::Assist}(`assistant: assist`).
-Unlike normal threads, where pressing <kbd>enter</kbd> would submit the message, in text threads, our goal is to make it feel as close to a regular editor as possible.
-So, pressing {#kb editor::Newline} simply inserts a new line.
-
-After submitting a message, the response will be streamed below, in an `Assistant` message block.
-
-![Receiving an answer](https://zed.dev/img/assistant/receiving-an-answer.png)
-
-The stream can be canceled at any point with <kbd>escape</kbd>.
-This is useful if you realize early on that the response is not what you were looking for.
-
-If you want to start a new conversation at any time, you can hit <kbd>cmd-n|ctrl-n</kbd> or use the `New Chat` menu option in the hamburger menu at the top left of the panel.
-
-Simple back-and-forth conversations work well with the text threads.
-However, there may come a time when you want to modify the previous text in the conversation and steer it in a different direction.
-
-## Editing a Text Thread {#edit-text-thread}
-
-Text threads give you the flexibility to have control over the context.
-You can freely edit any previous text, including the responses from the LLM.
-If you want to remove a message block entirely, simply place your cursor at the beginning of the block and use the `delete` key.
-A typical workflow might involve making edits and adjustments throughout the context to refine your inquiry or provide additional information.
-Here's an example:
-
-1. Write text in a `You` block.
-2. Submit the message with {#kb assistant::Assist}.
-3. Receive an `Assistant` response that doesn't meet your expectations.
-4. Cancel the response with <kbd>escape</kbd>.
-5. Erase the content of the `Assistant` message block and remove the block entirely.
-6. Add additional context to your original message.
-7. Submit the message with {#kb assistant::Assist}.
-
-Being able to edit previous messages gives you control over how tokens are used.
-You don't need to start up a new chat to correct a mistake or to add additional information, and you don't have to waste tokens by submitting follow-up corrections.
-
-> **Note**: The act of editing past messages is often referred to as "Rewriting History" in the context of the language models.
-
-Some additional points to keep in mind:
-
-- You can cycle the role of a message block by clicking on the role, which is useful when you receive a response in an `Assistant` block that you want to edit and send back up as a `You` block.
-
-## Commands Overview {#commands}
-
-Slash commands enhance the assistant's capabilities.
-Begin by typing a `/` at the beginning of the line to see a list of available commands:
-
-- `/default`: Inserts the default rule
-- `/diagnostics`: Injects errors reported by the project's language server
-- `/fetch`: Fetches the content of a webpage and inserts it
-- `/file`: Inserts a single file or a directory of files
-- `/now`: Inserts the current date and time
-- `/prompt`: Adds a custom-configured prompt to the context ([see Rules Library](./rules.md#rules-library))
-- `/symbols`: Inserts the current tab's active symbols
-- `/tab`: Inserts the content of the active tab or all open tabs
-- `/terminal`: Inserts a select number of lines of output from the terminal
-- `/selection`: Inserts the selected text
-
-> **Note:** Remember, commands are only evaluated when the text thread is created or when the command is inserted, so a command like `/now` won't continuously update, or `/file` commands won't keep their contents up to date.
-
-### `/default`
-
-Read more about `/default` in the [Rules: Editing the Default Rules](./rules.md#default-rules) section.
-
-Usage: `/default`
-
-### `/diagnostics`
-
-The `/diagnostics` command injects errors reported by the project's language server into the context.
-This is useful for getting an overview of current issues in your project.
-
-Usage: `/diagnostics [--include-warnings] [path]`
-
-- `--include-warnings`: Optional flag to include warnings in addition to errors.
-- `path`: Optional path to limit diagnostics to a specific file or directory.
-
-### `/file`
-
-The `/file` command inserts the content of a single file or a directory of files into the context.
-This allows you to reference specific parts of your project in your conversation with the assistant.
-
-Usage: `/file <path>`
-
-You can use glob patterns to match multiple files or directories.
-
-Examples:
-
-- `/file src/index.js` - Inserts the content of `src/index.js` into the context.
-- `/file src/*.js` - Inserts the content of all `.js` files in the `src` directory.
-- `/file src` - Inserts the content of all files in the `src` directory.
-
-### `/now`
-
-The `/now` command inserts the current date and time into the context.
-This can be useful for letting the language model know the current time (and by extension, how old their current knowledge base is).
-
-Usage: `/now`
-
-### `/prompt`
-
-The `/prompt` command inserts a prompt from the prompt library into the context.
-It can also be used to nest prompts within prompts.
-
-Usage: `/prompt <prompt_name>`
-
-Related: `/default`
-
-### `/symbols`
-
-The `/symbols` command inserts the active symbols (functions, classes, etc.) from the current tab into the context.
-This is useful for getting an overview of the structure of the current file.
-
-Usage: `/symbols`
-
-### `/tab`
-
-The `/tab` command inserts the content of the active tab or all open tabs into the context.
-This allows you to reference the content you're currently working on.
-
-Usage: `/tab [tab_name|all]`
-
-- `tab_name`: Optional name of a specific tab to insert.
-- `all`: Insert content from all open tabs.
-
-Examples:
-
-- `/tab` - Inserts the content of the active tab.
-- `/tab "index.js"` - Inserts the content of the tab named "index.js".
-- `/tab all` - Inserts the content of all open tabs.
-
-### `/terminal`
-
-The `/terminal` command inserts a select number of lines of output from the terminal into the context.
-This is useful for referencing recent command outputs or logs.
-
-Usage: `/terminal [<number>]`
-
-- `<number>`: Optional parameter to specify the number of lines to insert (default is 50).
-
-### `/selection`
-
-The `/selection` command inserts the selected text in the editor into the context.
-This is useful for referencing specific parts of your code.
-
-This is equivalent to the `agent: add selection to thread` command ({#kb agent::AddSelectionToThread}).
-
-Usage: `/selection`
-
-## Commands in the Rules Library {#slash-commands-in-rules}
-
-[Commands](#commands) can be used in rules, in the Rules Library (previously known as Prompt Library), to insert dynamic content or perform actions.
-For example, if you want to create a rule where it is important for the model to know the date, you can use the `/now` command to insert the current date.
-
-> **Warn:** Slash commands in rules **only** work when they are used in text threads. Using them in non-text threads is not supported.
-
-> **Note:** Slash commands in rules **must** be on their own line.
-
-See the [list of commands](#commands) above for more information on commands, and what slash commands are available.
-
-### Example
-
-```plaintext
-You are an expert Rust engineer. The user has asked you to review their project and answer some questions.
-
-Here is some information about their project:
-
-/file Cargo.toml
-```
-
-In the above example, the `/file` command is used to insert the contents of the `Cargo.toml` file (or all `Cargo.toml` files present in the project) into the rule.
-
-## Nesting Rules
-
-Similar to adding rules to the default rules, you can nest rules within other rules with the `/prompt` command (only supported in Text Threads currently).
-
-You might want to nest rules to:
-
-- Create templates on the fly
-- Break collections like docs or references into smaller, mix-and-matchable parts
-- Create variants of a similar rule (e.g., `Async Rust - Tokio` vs. `Async Rust - Async-std`)
-
-### Example
-
-```plaintext
-Title: Zed-Flavored Rust
-
-## About Zed
-
-/prompt Zed: Zed (a rule about what Zed is)
-
-## Rust - Zed Style
-
-/prompt Rust: Async - Async-std (zed doesn't use tokio)
-/prompt Rust: Zed-style Crates (we have some unique conventions)
-/prompt Rust - Workspace deps (bias towards reusing deps from the workspace)
-```
-
-_The text in parentheses above are comments and are not part of the rule._
-
-> **Note:** While you technically _can_ nest a rule within itself, we wouldn't recommend it (in the strongest of terms.) Use at your own risk!
-
-By using nested rules, you can create modular and reusable rule components that can be combined in various ways to suit different scenarios.
-
-> **Note:** When using slash commands to bring in additional context, the injected content can be edited directly inline in the text thread—edits here will not propagate to the saved rules.
-
-## Extensibility
-
-Additional slash commands can be provided by extensions.
-
-See [Extension: Slash Commands](../extensions/slash-commands.md) to learn how to create your own.
-
-## Text Threads vs. Threads
-
-For some time, text threads were the only way to interact with AI in Zed.
-In May 2025, we introduced a new version of the agent panel, which, as opposed to being editor-based, is optimized for readability.
-Visit [the Agent Panel page](./agent-panel.md) to learn more about it.
-
-More importantly, aside from the many UI differences, the major aspect that sets one apart from the other is that tool calls don't work in Text Threads.
-Due to that, it's accurate to say that Text Threads aren't conceptually agentic, as they can't perform any action on your behalf (or any action at all).
-
-Think of it more like a regular/"traditional" AI chat, where the only thing you can get from the model is simply just text.
-Consequently, [MCP servers](./mcp.md) and [external agents](./external-agents.md) are also not available in Text Threads.
-
-## Advanced Concepts
-
-### Rule Templates {#rule-templates}
-
-Zed uses rule templates to power internal assistant features, like the terminal assistant, or the content rules used in the inline assistant.
-
-Zed has the following internal rule templates:
-
-- `content_prompt.hbs`: Used for generating content in the editor.
-- `terminal_assistant_prompt.hbs`: Used for the terminal assistant feature.
-
-At this point it is unknown if we will expand templates further to be user-creatable.
-
-### Overriding Templates
-
-> **Note:** It is not recommended to override templates unless you know what you are doing. Editing templates will break your assistant if done incorrectly.
-
-Zed allows you to override the default rules used for various assistant features by placing custom Handlebars (.hbs) templates in your `~/.config/zed/prompt_overrides` directory.
-
-The following templates can be overridden:
-
-1. [`content_prompt.hbs`](https://github.com/zed-industries/zed/tree/main/assets/prompts/content_prompt.hbs): Used for generating content in the editor.
-
-2. [`terminal_assistant_prompt.hbs`](https://github.com/zed-industries/zed/tree/main/assets/prompts/terminal_assistant_prompt.hbs): Used for the terminal assistant feature.
-
-> **Note:** Be sure you want to override these, as you'll miss out on iteration on our built-in features.
-> This should be primarily used when developing Zed.
-
-You can customize these templates to better suit your needs while maintaining the core structure and variables used by Zed.
-Zed will automatically reload your prompt overrides when they change on disk.
-
-Consult Zed's [assets/prompts](https://github.com/zed-industries/zed/tree/main/assets/prompts) directory for current versions you can play with.
-
-### History {#history}
-
-After you submit your first message in a text thread, a name for your context is generated by the language model, and the context is automatically saved to your file system in
-
-- `~/.config/zed/conversations` (macOS)
-- `~/.local/share/zed/conversations` (Linux)
-- `%LocalAppData%\Zed\conversations` (Windows)
-
-You can access and load previous contexts by clicking on the history button in the top-left corner of the agent panel.
-
-![Viewing assistant history](https://zed.dev/img/assistant/assistant-history.png)
diff --git a/docs/src/ai/tools.md b/docs/src/ai/tools.md
deleted file mode 100644
index e40cfcec84..0000000000
--- a/docs/src/ai/tools.md
+++ /dev/null
@@ -1,73 +0,0 @@
-# Tools
-
-Zed's built-in agent has access to a variety of tools that allow it to interact with your codebase and perform tasks.
-
-## Read & Search Tools
-
-### `diagnostics`
-
-Gets errors and warnings for either a specific file or the entire project, useful after making edits to determine if further changes are needed.
-When a path is provided, shows all diagnostics for that specific file.
-When no path is provided, shows a summary of error and warning counts for all files in the project.
-
-### `fetch`
-
-Fetches a URL and returns the content as Markdown. Useful for providing docs as context.
-
-### `find_path`
-
-Quickly finds files by matching glob patterns (like "\*_/_.js"), returning matching file paths alphabetically.
-
-### `grep`
-
-Searches file contents across the project using regular expressions, preferred for finding symbols in code without knowing exact file paths.
-
-### `list_directory`
-
-Lists files and directories in a given path, providing an overview of filesystem contents.
-
-### `now`
-
-Returns the current date and time.
-
-### `open`
-
-Opens a file or URL with the default application associated with it on the user's operating system.
-
-### `read_file`
-
-Reads the content of a specified file in the project, allowing access to file contents.
-
-### `thinking`
-
-Allows the Agent to work through problems, brainstorm ideas, or plan without executing actions, useful for complex problem-solving.
-
-### `web_search`
-
-Searches the web for information, providing results with snippets and links from relevant web pages, useful for accessing real-time information.
-
-## Edit Tools
-
-### `copy_path`
-
-Copies a file or directory recursively in the project, more efficient than manually reading and writing files when duplicating content.
-
-### `create_directory`
-
-Creates a new directory at the specified path within the project, creating all necessary parent directories (similar to `mkdir -p`).
-
-### `delete_path`
-
-Deletes a file or directory (including contents recursively) at the specified path and confirms the deletion.
-
-### `edit_file`
-
-Edits files by replacing specific text with new content.
-
-### `move_path`
-
-Moves or renames a file or directory in the project, performing a rename if only the filename differs.
-
-### `terminal`
-
-Executes shell commands and returns the combined output, creating a new shell process for each invocation.
diff --git a/docs/src/all-actions.md b/docs/src/all-actions.md
deleted file mode 100644
index e5a45a8fd8..0000000000
--- a/docs/src/all-actions.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# All Actions
-
-{#ACTIONS_TABLE#}
diff --git a/docs/src/authentication.md b/docs/src/authentication.md
deleted file mode 100644
index 0ea97040a0..0000000000
--- a/docs/src/authentication.md
+++ /dev/null
@@ -1,37 +0,0 @@
-# Authenticate with Zed
-
-Signing in to Zed is not required. You can use most features you'd expect in a code editor without ever doing so. We'll outline the few features that do require signing in, and how to do so, here.
-
-## What Features Require Signing In?
-
-1. All real-time [collaboration features](./collaboration/overview.md).
-2. [LLM-powered features](./ai/overview.md), if you are using Zed as the provider of your LLM models. To use AI without signing in, you can [bring and configure your own API keys](./ai/llm-providers.md#use-your-own-keys).
-
-## Signing In
-
-Zed uses GitHub's OAuth flow to authenticate users, requiring only the `read:user` GitHub scope, which grants read-only access to your GitHub profile information.
-
-1. Open Zed and click the `Sign In` button in the top-right corner of the window, or run the `client: sign in` command from the command palette (`cmd-shift-p` on macOS or `ctrl-shift-p` on Windows/Linux).
-2. Your default web browser will open to the Zed sign-in page.
-3. Authenticate with your GitHub account when prompted.
-4. After successful authentication, your browser will display a confirmation, and you'll be automatically signed in to Zed.
-
-**Note**: If you're behind a corporate firewall, ensure that connections to `zed.dev` and `collab.zed.dev` are allowed.
-
-## Signing Out
-
-To sign out of Zed, you can use either of these methods:
-
-- Click on the profile icon in the upper right corner and select `Sign Out` from the dropdown menu.
-- Open the command palette and run the `client: sign out` command.
-
-## Email Addresses {#email}
-
-Your Zed account's email address is the address provided by GitHub OAuth. If you have a public email address then it will be used, otherwise your primary GitHub email address will be used. Changes to your email address on GitHub can be synced to your Zed account by [signing in to zed.dev](https://zed.dev/sign_in).
-
-Stripe is used for billing, and will use your Zed account's email address when starting a subscription. Changes to your Zed account email address do not currently update the email address used in Stripe. See [Updating Billing Information](./ai/billing.md#updating-billing-info) for how to change this email address.
-
-## Hiding Sign In button from the interface
-
-In case the Sign In feature is not used, it's possible to hide that from the interface by using `show_sign_in` settings property.
-Refer to [Visual Customization page](./visual-customization.md) for more details.
diff --git a/docs/src/collaboration/channels.md b/docs/src/collaboration/channels.md
deleted file mode 100644
index ebc2760275..0000000000
--- a/docs/src/collaboration/channels.md
+++ /dev/null
@@ -1,122 +0,0 @@
-# Channels
-
-Channels provide a way to streamline collaborating for software engineers in many ways, but particularly:
-
-- Pairing – when working on something together, you both have your own screen, mouse, and keyboard.
-- Mentoring – it's easy to jump in to someone else's context, and help them get unstuck, without the friction of pushing code up.
-- Refactoring – you can have multiple people join in on large refactoring without fear of conflict.
-- Ambient awareness – you can see what everyone else is working on with no need for status emails or meetings.
-
-Each channel corresponds to an ongoing project or work-stream.
-You can see who's in a channel as their avatars will show up in the sidebar.
-This makes it easy to see what everyone is doing and where to find them if needed.
-
-Create a channel by clicking the `+` icon next to the `Channels` text in the collab panel.
-Create a subchannel by right clicking an existing channel and selecting `New Subchannel`.
-
-You can mix channels for your day job, as well as side-projects in your collab panel.
-
-Joining a channel adds you to a shared room where you can work on projects together.
-
-_Join [our channel tree](https://zed.dev/channel/zed-283) to get an idea of how you can organize yours._
-
-## Inviting People
-
-By default, channels you create can only be accessed by you.
-You can invite collaborators by right clicking and selecting `Manage members`.
-
-When you have subchannels nested under others, permissions are inherited.
-For instance, adding people to the top-level channel in your channel tree will automatically give them access to its subchannels.
-
-Once you have added someone, they can either join your channel by clicking on it in their Zed sidebar, or you can share the link to the channel so that they can join directly.
-
-## Voice Chat
-
-You can mute/unmute your microphone via the microphone icon in the upper right-hand side of the window.
-
-> Note: When joining a channel, Zed will automatically share your microphone with other users in the call, if your OS allows it.
-> If you'd prefer your microphone to be off when joining a channel, you can do so via the [`mute_on_join`](../configuring-zed.md#calls) setting.
-
-## Sharing Projects
-
-After joining a channel, you can share a project over the channel via the `Share` button in the upper right-hand side of the window.
-This will allow channel members to edit the code hosted on your machine as though they had it checked out locally.
-
-When you are editing someone else's project, you still have the full power of the editor at your fingertips; you can jump to definitions, use the AI assistant, and see any diagnostic errors.
-This is extremely powerful for pairing, as one of you can be implementing the current method while the other is reading and researching the correct solution to the next problem.
-And, because you have your own config running, it feels like you're using your own machine.
-
-We aim to eliminate the distinction between local and remote projects as much as possible.
-Collaborators can open, edit, and save files, perform searches, interact with the language server, etc.
-Guests have a read-only view of the project, including access to language server info.
-
-### Unsharing a Project
-
-You can remove a project from a channel by clicking on the `Unshare` button in the title bar.
-
-Collaborators that are currently in that project will be disconnected from the project and will not be able to rejoin it unless you share it again.
-
-## Channel Notes
-
-Each channel has a Markdown notes file associated with it to keep track of current status, new ideas, or to collaborate on building out the design for the feature that you're working on before diving into code.
-
-This is similar to a Google Doc, except powered by Zed's collaborative software and persisted to our servers.
-
-Open the channel notes by clicking on the document icon to the right of the channel name in the collaboration panel.
-
-> Note: You can view a channel's notes without joining the channel, if you'd just like to read up on what has been written.
-
-## Following Collaborators
-
-To follow a collaborator, click on their avatar in the top left of the title bar.
-You can also cycle through collaborators using {#kb workspace::FollowNextCollaborator} or `workspace: follow next collaborator` in the command palette.
-
-When you join a project, you'll immediately start following the collaborator that invited you.
-
-When you are in a pane that is following a collaborator, you will:
-
-- follow their cursor and scroll position
-- follow them to other files in the same project
-- instantly swap to viewing their screenshare in that pane, if they are sharing their screen and leave the project
-
-To stop following, simply move your mouse or make an edit via your keyboard.
-
-### How Following Works
-
-Following is confined to a particular pane.
-When a pane is following a collaborator, it is outlined in their cursor color.
-
-Avatars of collaborators in the same project as you are in color, and have a cursor color.
-Collaborators in other projects are shown in gray.
-
-This pane-specific behavior allows you to follow someone in one pane while navigating independently in another and can be an effective layout for some collaboration styles.
-
-### Following a Terminal
-
-Following is not currently supported in the terminal in the way it is supported in the editor.
-As a workaround, collaborators can share their screen and you can follow that instead.
-
-## Screen Sharing
-
-Share your screen with collaborators in the current channel by clicking on the `Share screen` (monitor icon) button in the top right of the title bar.
-If you have multiple displays, you can choose which one to share via the chevron to the right of the monitor icon.
-
-After you've shared your screen, others can click on the `Screen` entry under your name in the collaboration panel to open a tab that always keeps it visible.
-If they are following you, Zed will automatically switch between following your cursor in their Zed instance and your screen share, depending on whether you are focused on Zed or another application, like a web browser.
-
-> Note: Collaborators can see your entire screen when you are screen sharing, so be careful not to share anything you don't want to share.
-> Remember to stop screen sharing when you are finished.
-
-## Livestreaming & Guests
-
-A Channel can also be made Public.
-This allows anyone to join the channel by clicking on the link.
-
-Guest users in channels can hear and see everything that is happening, and have read only access to projects and channel notes.
-
-If you'd like to invite a guest to participate in a channel for the duration of a call you can do so by right clicking on them in the Collaboration Panel.
-"Allowing Write Access" will allow them to edit any projects shared into the call, and to use their microphone and share their screen if they wish.
-
-## Leaving a Call
-
-You can leave a channel by clicking on the `Leave call` button in the upper right-hand side of the window.
diff --git a/docs/src/collaboration/contacts-and-private-calls.md b/docs/src/collaboration/contacts-and-private-calls.md
deleted file mode 100644
index f011fa2c67..0000000000
--- a/docs/src/collaboration/contacts-and-private-calls.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# Contacts and Private Calls
-
-Zed allows you to have private calls / collaboration sessions with those in your contacts.
-These calls can be one-on-ones or contain any number of users from your contacts.
-
-## Adding a Contact
-
-1. In the collaboration panel, click the `+` button next to the `Contacts` section
-1. Search for the contact using their GitHub handle.\
-   _Note: Your contact must be an existing Zed user who has completed the GitHub authentication sign-in flow._
-1. Your contact will receive a notification.
-   Once they accept, you'll both appear in each other's contact list.
-
-## Private Calls
-
-To start up a private call...
-
-1. Click the `...` menu next to an online contact's name in the collaboration panel.
-1. Click `Call <username>`
-
-Once you've begun a private call, you can add other online contacts by clicking on their name in the collaboration panel.
-
----
-
-_Aside from a few additional features (channel notes, etc.), collaboration in private calls is largely the same as it is in [channels](./channels.md)._
diff --git a/docs/src/collaboration/overview.md b/docs/src/collaboration/overview.md
deleted file mode 100644
index 719aa56ee3..0000000000
--- a/docs/src/collaboration/overview.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# Collaboration
-
-At Zed, we believe that great things are built by great people working together.
-We have designed Zed to help individuals work faster and help teams of people work together more effectively.
-
-In Zed, all collaboration happens in the collaboration panel, which can be opened via {#kb collab_panel::ToggleFocus} or `collab panel: toggle focus` from the command palette.
-
-You will need to [sign in](../authentication.md#signing-in) in order to access features within the collaboration panel.
-
-## Collaboration panel
-
-The collaboration panel is broken down into two sections:
-
-1. [Channels](./channels.md): Ongoing project rooms where team members can share projects, collaborate on code, and maintain ambient awareness of what everyone is working on.
-1. [Contacts and Private Calls](./contacts-and-private-calls.md): Your contacts list for ad-hoc private collaboration.
-
----
-
-> Note: Only collaborate with people that you trust.
-> Since sharing a project gives them access to your local file system, you should not share projects with people you do not trust; they could potentially do some nasty things.
->
-> In the future, we will do more to prevent this type of access beyond the shared project and add more control over what collaborators can do, but for now, only collaborate with people you trust.
-
-See our [Data and Privacy FAQs](https://zed.dev/faq#data-and-privacy) for collaboration.
diff --git a/docs/src/command-line-interface.md b/docs/src/command-line-interface.md
deleted file mode 100644
index 1a7831811d..0000000000
--- a/docs/src/command-line-interface.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# Command-line Interface
-
-Zed has a CLI, on Linux this should come with the distribution's Zed package (binary name can vary from distribution to distribution, `zed` will be used later for brevity).
-For macOS, the CLI comes in the same package with the editor binary, and could be installed into the system with the `cli: install` Zed command which will create a symlink to the `/usr/local/bin/zed`.
-It can also be built from source out of the `cli` crate in this repository.
-
-Use `zed --help` to see the full list of capabilities.
-General highlights:
-
-- Opening another empty Zed window: `zed`
-
-- Opening a file or directory in Zed: `zed /path/to/entry` (use `-n` to open in the new window)
-
-- Reading from stdin: `ps axf | zed -`
-
-- Starting Zed with logs in the terminal: `zed --foreground`
-
-- Uninstalling Zed and all its related files: `zed --uninstall`
diff --git a/docs/src/command-palette.md b/docs/src/command-palette.md
deleted file mode 100644
index b573fc6a5f..0000000000
--- a/docs/src/command-palette.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Command Palette
-
-The Command Palette is the main way to access pretty much any functionality that's available in Zed. Its keybinding is the first one you should make yourself familiar with. To open it, hit: {#kb command_palette::Toggle}.
-
-![The opened Command Palette](https://zed.dev/img/features/command-palette.jpg)
-
-Try it! Open the Command Palette and type in `new file`. You should see the list of commands being filtered down to `workspace: new file`. Hit return and you end up with a new buffer.
-
-Any time you see instructions that include commands of the form `zed: ...` or `editor: ...` and so on that means you need to execute them in the Command Palette.
diff --git a/docs/src/completions.md b/docs/src/completions.md
deleted file mode 100644
index ff96ede750..0000000000
--- a/docs/src/completions.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# Completions
-
-Zed supports two sources for completions:
-
-1. "Code Completions" provided by Language Servers (LSPs) automatically installed by Zed or via [Zed Language Extensions](languages.md).
-2. "Edit Predictions" provided by Zed's own Zeta model or by external providers like [GitHub Copilot](#github-copilot) or [Supermaven](#supermaven).
-
-## Language Server Code Completions {#code-completions}
-
-When there is an appropriate language server available, Zed will provide completions of variable names, functions, and other symbols in the current file. You can disable these by adding the following to your Zed `settings.json` file:
-
-```json [settings]
-"show_completions_on_input": false
-```
-
-You can manually trigger completions with `ctrl-space` or by triggering the `editor::ShowCompletions` action from the command palette.
-
-For more information, see:
-
-- [Configuring Supported Languages](./configuring-languages.md)
-- [List of Zed Supported Languages](./languages.md)
-
-## Edit Predictions {#edit-predictions}
-
-Zed has built-in support for predicting multiple edits at a time [via Zeta](https://huggingface.co/zed-industries/zeta), Zed's open-source and open-data model.
-Edit predictions appear as you type, and most of the time, you can accept them by pressing `tab`.
-
-See the [edit predictions documentation](./ai/edit-prediction.md) for more information on how to setup and configure Zed's edit predictions.
diff --git a/docs/src/configuring-languages.md b/docs/src/configuring-languages.md
deleted file mode 100644
index 9185b67906..0000000000
--- a/docs/src/configuring-languages.md
+++ /dev/null
@@ -1,465 +0,0 @@
-# Configuring Supported Languages
-
-Zed offers powerful customization options for each programming language it supports. This guide will walk you through the various ways you can tailor your coding experience to your preferences and project requirements.
-
-Zed's language support is built on two main technologies:
-
-1. Tree-sitter: This handles syntax highlighting and structure-based features like the outline panel.
-2. Language Server Protocol (LSP): This provides semantic features such as code completion and diagnostics.
-
-These components work together to provide Zed's language capabilities.
-
-In this guide, we'll cover:
-
-- Language-specific settings
-- File associations
-- Working with language servers
-- Formatting and linting configuration
-- Customizing syntax highlighting and themes
-- Advanced language features
-
-By the end of this guide, you should know how to configure and customize supported languages in Zed.
-
-For a comprehensive list of languages supported by Zed and their specific configurations, see our [Supported Languages](./languages.md) page. To go further, you could explore developing your own extensions to add support for additional languages or enhance existing functionality. For more information on creating language extensions, see our [Language Extensions](./extensions/languages.md) guide.
-
-## Language-specific Settings
-
-Zed allows you to override global settings for individual languages. These custom configurations are defined in your `settings.json` file under the `languages` key.
-
-Here's an example of language-specific settings:
-
-```json [settings]
-"languages": {
-  "Python": {
-    "tab_size": 4,
-    "formatter": "language_server",
-    "format_on_save": "on"
-  },
-  "JavaScript": {
-    "tab_size": 2,
-    "formatter": {
-      "external": {
-        "command": "prettier",
-        "arguments": ["--stdin-filepath", "{buffer_path}"]
-      }
-    }
-  }
-}
-```
-
-You can customize a wide range of settings for each language, including:
-
-- [`tab_size`](./configuring-zed.md#tab-size): The number of spaces for each indentation level
-- [`formatter`](./configuring-zed.md#formatter): The tool used for code formatting
-- [`format_on_save`](./configuring-zed.md#format-on-save): Whether to automatically format code when saving
-- [`enable_language_server`](./configuring-zed.md#enable-language-server): Toggle language server support
-- [`hard_tabs`](./configuring-zed.md#hard-tabs): Use tabs instead of spaces for indentation
-- [`preferred_line_length`](./configuring-zed.md#preferred-line-length): The recommended maximum line length
-- [`soft_wrap`](./configuring-zed.md#soft-wrap): How to wrap long lines of code
-- [`show_completions_on_input`](./configuring-zed.md#show-completions-on-input): Whether or not to show completions as you type
-- [`show_completion_documentation`](./configuring-zed.md#show-completion-documentation): Whether to display inline and alongside documentation for items in the completions menu
-- [`colorize_brackets`](./configuring-zed.md#colorize-brackets): Whether to use tree-sitter bracket queries to detect and colorize the brackets in the editor (also known as "rainbow brackets")
-
-These settings allow you to maintain specific coding styles across different languages and projects.
-
-## File Associations
-
-Zed automatically detects file types based on their extensions, but you can customize these associations to fit your workflow.
-
-To set up custom file associations, use the [`file_types`](./configuring-zed.md#file-types) setting in your `settings.json`:
-
-```json [settings]
-"file_types": {
-  "C++": ["c"],
-  "TOML": ["MyLockFile"],
-  "Dockerfile": ["Dockerfile*"]
-}
-```
-
-This configuration tells Zed to:
-
-- Treat `.c` files as C++ instead of C
-- Recognize files named "MyLockFile" as TOML
-- Apply Dockerfile syntax to any file starting with "Dockerfile"
-
-You can use glob patterns for more flexible matching, allowing you to handle complex naming conventions in your projects.
-
-## Working with Language Servers
-
-Language servers are a crucial part of Zed's intelligent coding features, providing capabilities like auto-completion, go-to-definition, and real-time error checking.
-
-### What are Language Servers?
-
-Language servers implement the Language Server Protocol (LSP), which standardizes communication between the editor and language-specific tools. This allows Zed to support advanced features for multiple programming languages without implementing each feature separately.
-
-Some key features provided by language servers include:
-
-- Code completion
-- Error checking and diagnostics
-- Code navigation (go to definition, find references)
-- Code actions (Rename, extract method)
-- Hover information
-- Workspace symbol search
-
-### Managing Language Servers
-
-Zed simplifies language server management for users:
-
-1. Automatic Download: When you open a file with a matching file type, Zed automatically downloads the appropriate language server. Zed may prompt you to install an extension for known file types.
-
-2. Storage Location:
-
-   - macOS: `~/Library/Application Support/Zed/languages`
-   - Linux: `$XDG_DATA_HOME/zed/languages`, `$FLATPAK_XDG_DATA_HOME/zed/languages`, or `$HOME/.local/share/zed/languages`
-
-3. Automatic Updates: Zed keeps your language servers up-to-date, ensuring you always have the latest features and improvements.
-
-### Choosing Language Servers
-
-Some languages in Zed offer multiple language server options. You might have multiple extensions installed that bundle language servers targeting the same language, potentially leading to overlapping capabilities. To ensure you get the functionality you prefer, Zed allows you to prioritize which language servers are used and in what order.
-
-You can specify your preference using the `language_servers` setting:
-
-```json [settings]
-  "languages": {
-    "PHP": {
-      "language_servers": ["intelephense", "!phpactor", "!phptools", "..."]
-    }
-  }
-```
-
-In this example:
-
-- `intelephense` is set as the primary language server
-- `phpactor` is disabled (note the `!` prefix)
-- `...` expands to the rest of the language servers that are registered for PHP
-
-This configuration allows you to tailor the language server setup to your specific needs, ensuring that you get the most suitable functionality for your development workflow.
-
-### Toolchains
-
-Some language servers need to be configured with a current "toolchain", which is an installation of a specific version of a programming language compiler or/and interpreter, which can possibly include a full set of dependencies of a project.
-An example of what Zed considers a toolchain is a virtual environment in Python.
-Not all languages in Zed support toolchain discovery and selection, but for those that do, you can specify the toolchain from a toolchain picker (via {#action toolchain::Select}). To learn more about toolchains in Zed, see [`toolchains`](./toolchains.md).
-
-### Configuring Language Servers
-
-Many language servers accept custom configuration options. You can set these in the `lsp` section of your `settings.json`:
-
-```json [settings]
-  "lsp": {
-    "rust-analyzer": {
-      "initialization_options": {
-        "check": {
-          "command": "clippy"
-        }
-      }
-    }
-  }
-```
-
-This example configures the Rust Analyzer to use Clippy for additional linting when saving files.
-
-#### Nested objects
-
-When configuring language server options in Zed, it's important to use nested objects rather than dot-delimited strings. This is particularly relevant when working with more complex configurations. Let's look at a real-world example using the TypeScript language server:
-
-Suppose you want to configure the following settings for TypeScript:
-
-- Enable strict null checks
-- Set the target ECMAScript version to ES2020
-
-Here's how you would structure these settings in Zed's `settings.json`:
-
-```json [settings]
-"lsp": {
-  "typescript-language-server": {
-    "initialization_options": {
-      // These are not supported (VSCode dotted style):
-      // "preferences.strictNullChecks": true,
-      // "preferences.target": "ES2020"
-      //
-      // These is correct (nested notation):
-      "preferences": {
-        "strictNullChecks": true,
-        "target": "ES2020"
-      },
-    }
-  }
-}
-```
-
-#### Possible configuration options
-
-Depending on how a particular language server is implemented, they may depend on different configuration options, both specified in the LSP.
-
-- [initializationOptions](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#version_3_17_0)
-
-Sent once during language server startup, requires server's restart to reapply changes.
-
-For example, rust-analyzer and clangd rely on this way of configuring only.
-
-```json [settings]
-  "lsp": {
-    "rust-analyzer": {
-      "initialization_options": {
-        "checkOnSave": false
-      }
-    }
-  }
-```
-
-- [Configuration Request](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#workspace_configuration)
-
-May be queried by the server multiple times.
-Most of the servers would rely on this way of configuring only.
-
-```json [settings]
-"lsp": {
-  "tailwindcss-language-server": {
-    "settings": {
-      "tailwindCSS": {
-        "emmetCompletions": true,
-      },
-    }
-  }
-}
-```
-
-Apart of the LSP-related server configuration options, certain servers in Zed allow configuring the way binary is launched by Zed.
-
-Language servers are automatically downloaded or launched if found in your path, if you wish to specify an explicit alternate binary you can specify that in settings:
-
-```json [settings]
-  "lsp": {
-    "rust-analyzer": {
-      "binary": {
-        // Whether to fetch the binary from the internet, or attempt to find locally.
-        "ignore_system_version": false,
-        "path": "/path/to/langserver/bin",
-        "arguments": ["--option", "value"],
-        "env": {
-          "FOO": "BAR"
-        }
-      }
-    }
-  }
-```
-
-### Enabling or Disabling Language Servers
-
-You can toggle language server support globally or per-language:
-
-```json [settings]
-  "languages": {
-    "Markdown": {
-      "enable_language_server": false
-    }
-  }
-```
-
-This disables the language server for Markdown files, which can be useful for performance in large documentation projects. You can configure this globally in your `~/.config/zed/settings.json` or inside a `.zed/settings.json` in your project directory.
-
-## Formatting and Linting
-
-Zed provides support for code formatting and linting to maintain consistent code style and catch potential issues early.
-
-### Configuring Formatters
-
-Zed supports both built-in and external formatters. See [`formatter`](./configuring-zed.md#formatter) docs for more. You can configure formatters globally or per-language in your `settings.json`:
-
-```json [settings]
-"languages": {
-  "JavaScript": {
-    "formatter": {
-      "external": {
-        "command": "prettier",
-        "arguments": ["--stdin-filepath", "{buffer_path}"]
-      }
-    },
-    "format_on_save": "on"
-  },
-  "Rust": {
-    "formatter": "language_server",
-    "format_on_save": "on"
-  }
-}
-```
-
-This example uses Prettier for JavaScript and the language server's formatter for Rust, both set to format on save.
-
-To disable formatting for a specific language:
-
-```json [settings]
-"languages": {
-  "Markdown": {
-    "format_on_save": "off"
-  }
-}
-```
-
-### Setting Up Linters
-
-Linting in Zed is typically handled by language servers. Many language servers allow you to configure linting rules:
-
-```json [settings]
-"lsp": {
-  "eslint": {
-    "settings": {
-      "codeActionOnSave": {
-        "rules": ["import/order"]
-      }
-    }
-  }
-}
-```
-
-This configuration sets up ESLint to organize imports on save for JavaScript files.
-
-To run linter fixes automatically on save:
-
-```json [settings]
-"languages": {
-  "JavaScript": {
-    "formatter": {
-      "code_action": "source.fixAll.eslint"
-    }
-  }
-}
-```
-
-### Integrating Formatting and Linting
-
-Zed allows you to run both formatting and linting on save. Here's an example that uses Prettier for formatting and ESLint for linting JavaScript files:
-
-```json [settings]
-"languages": {
-  "JavaScript": {
-    "formatter": [
-      {
-        "code_action": "source.fixAll.eslint"
-      },
-      {
-        "external": {
-          "command": "prettier",
-          "arguments": ["--stdin-filepath", "{buffer_path}"]
-        }
-      }
-    ],
-    "format_on_save": "on"
-  }
-}
-```
-
-### Troubleshooting
-
-If you encounter issues with formatting or linting:
-
-1. Check Zed's log file for error messages (Use the command palette: `zed: open log`)
-2. Ensure external tools (formatters, linters) are correctly installed and in your PATH
-3. Verify configurations in both Zed settings and language-specific config files (e.g., `.eslintrc`, `.prettierrc`)
-
-## Syntax Highlighting and Themes
-
-Zed offers customization options for syntax highlighting and themes, allowing you to tailor the visual appearance of your code.
-
-### Customizing Syntax Highlighting
-
-Zed uses Tree-sitter grammars for syntax highlighting. Override the default highlighting using the `theme_overrides` setting.
-
-This example makes comments italic and changes the color of strings:
-
-```json [settings]
-"theme_overrides": {
-  "One Dark": {
-    "syntax": {
-      "comment": {
-        "font_style": "italic"
-      },
-      "string": {
-        "color": "#00AA00"
-      }
-    }
-  }
-}
-```
-
-### Selecting and Customizing Themes
-
-Change your theme:
-
-1. Use the theme selector ({#kb theme_selector::Toggle})
-2. Or set it in your `settings.json`:
-
-```json [settings]
-"theme": {
-  "mode": "dark",
-  "dark": "One Dark",
-  "light": "GitHub Light"
-}
-```
-
-Create custom themes by creating a JSON file in `~/.config/zed/themes/`. Zed will automatically detect and make available any themes in this directory.
-
-### Using Theme Extensions
-
-Zed supports theme extensions. Browse and install theme extensions from the Extensions panel ({#kb zed::Extensions}).
-
-To create your own theme extension, refer to the [Developing Theme Extensions](./extensions/themes.md) guide.
-
-## Using Language Server Features
-
-### Inlay Hints
-
-Inlay hints provide additional information inline in your code, such as parameter names or inferred types. Configure inlay hints in your `settings.json`:
-
-```json [settings]
-"inlay_hints": {
-  "enabled": true,
-  "show_type_hints": true,
-  "show_parameter_hints": true,
-  "show_other_hints": true
-}
-```
-
-For language-specific inlay hint settings, refer to the documentation for each language.
-
-### Code Actions
-
-Code actions provide quick fixes and refactoring options. Access code actions using the `editor: Toggle Code Actions` command or by clicking the lightbulb icon that appears next to your cursor when actions are available.
-
-### Go To Definition and References
-
-Use these commands to navigate your codebase:
-
-- `editor: Go to Definition` (<kbd>f12|f12</kbd>)
-- `editor: Go to Type Definition` (<kbd>cmd-f12|ctrl-f12</kbd>)
-- `editor: Find All References` (<kbd>shift-f12|shift-f12</kbd>)
-
-### Rename Symbol
-
-To rename a symbol across your project:
-
-1. Place your cursor on the symbol
-2. Use the `editor: Rename Symbol` command (<kbd>f2|f2</kbd>)
-3. Enter the new name and press Enter
-
-These features depend on the capabilities of the language server for each language.
-
-When renaming a symbol that spans multiple files, Zed will open a preview in a multibuffer. This allows you to review all the changes across your project before applying them. To confirm the rename, simply save the multibuffer. If you decide not to proceed with the rename, you can undo the changes or close the multibuffer without saving.
-
-### Hover Information
-
-Use the `editor: Hover` command to display information about the symbol under the cursor. This often includes type information, documentation, and links to relevant resources.
-
-### Workspace Symbol Search
-
-The `workspace: Open Symbol` command allows you to search for symbols (functions, classes, variables) across your entire project. This is useful for quickly navigating large codebases.
-
-### Code Completion
-
-Zed provides intelligent code completion suggestions as you type. You can manually trigger completion with the `editor: Show Completions` command. Use <kbd>tab|tab</kbd> or <kbd>enter|enter</kbd> to accept suggestions.
-
-### Diagnostics
-
-Language servers provide real-time diagnostics (errors, warnings, hints) as you code. View all diagnostics for your project using the `diagnostics: Toggle` command.
diff --git a/docs/src/configuring-zed.md b/docs/src/configuring-zed.md
deleted file mode 100644
index 477885a453..0000000000
--- a/docs/src/configuring-zed.md
+++ /dev/null
@@ -1,4996 +0,0 @@
-# Configuring Zed
-
-Zed is designed to be configured: we want to fit your workflow and preferences exactly. We provide default settings that are designed to be a comfortable starting point for as many people as possible, but we hope you will enjoy tweaking it to make it feel incredible.
-
-In addition to the settings described here, you may also want to change your [theme](./themes.md), configure your [key bindings](./key-bindings.md), set up [tasks](./tasks.md) or install [extensions](https://github.com/zed-industries/extensions).
-
-## Settings Editor
-
-You can browse through many of the supported settings via the Settings Editor, which can be opened with the {#kb zed::OpenSettings} keybinding, or through the `zed: open settings` action in the command palette. Through it, you can customize your local, user settings as well as project settings.
-
-> Note that not all settings that Zed supports are available through the Settings Editor yet.
-> Some more intricate ones, such as language formatters, can only be changed through the JSON settings file {#kb zed::OpenSettingsFile}.
-
-## User Settings File
-
-<!--
-TBD: Settings files. Rewrite with "remote settings" in mind (e.g. `local settings` on the remote host).
-Consider renaming `zed: Open Local Settings` to `zed: Open Project Settings`.
-
-TBD: Add settings documentation about how settings are merged as overlays. E.g. project>local>default. Note how settings that are maps are merged, but settings that are arrays are replaced and must include the defaults.
--->
-
-Your settings JSON file can be opened with {#kb zed::OpenSettingsFile}.
-By default it is located at `~/.config/zed/settings.json`, though if you have `XDG_CONFIG_HOME` in your environment on Linux it will be at `$XDG_CONFIG_HOME/zed/settings.json` instead.
-
-Whatever you have added to your user settings file gets merged with any local configuration inside your projects.
-
-### Default Settings
-
-In the Settings Editor, the values you see set are the default ones.
-You can also verify them in JSON by running {#action zed::OpenDefaultSettings} from the command palette.
-
-Extensions that provide language servers may also provide default settings for those language servers.
-
-## Project Settings File
-
-Similarly to user files, you can open your project settings file by running {#action zed::OpenProjectSettings} from the command palette.
-This will create a `.zed` directory containing`.zed/settings.json`.
-
-Although most projects will only need one settings file at the root, you can add more local settings files for subdirectories as needed.
-Not all settings can be set in local files, just those that impact the behavior of the editor and language tooling.
-For example you can set `tab_size`, `formatter` etc. but not `theme`, `vim_mode` and similar.
-
-The syntax for configuration files is a super-set of JSON that allows `//` comments.
-
-## Per-release Channel Overrides
-
-Zed reads the same `settings.json` across all release channels (Stable, Preview or Nightly).
-However, you can scope overrides to a specific channel by adding top-level `stable`, `preview`, `nightly` or `dev` objects.
-They are merged into the base configuration with settings from these keys taking precedence upon launching the specified build. For example:
-
-```json [settings]
-{
-  "theme": "sunset",
-  "vim_mode": false,
-  "nightly": {
-    "theme": "cave-light",
-    "vim_mode": true
-  },
-  "preview": {
-    "theme": "zed-dark"
-  }
-}
-```
-
-With this configuration, Stable keeps all base preferences, Preview switches to `zed-dark`, and Nightly enables Vim mode with a different theme.
-
-Changing settings in the Settings Editorwill always apply the change across all channels.
-
-# Settings
-
-Find below an extensive run-through of many supported settings by Zed.
-
-## Active Pane Modifiers
-
-- Description: Styling settings applied to the active pane.
-- Setting: `active_pane_modifiers`
-- Default:
-
-```json [settings]
-{
-  "active_pane_modifiers": {
-    "border_size": 0.0,
-    "inactive_opacity": 1.0
-  }
-}
-```
-
-### Border size
-
-- Description: Size of the border surrounding the active pane. When set to 0, the active pane doesn't have any border. The border is drawn inset.
-- Setting: `border_size`
-- Default: `0.0`
-
-**Options**
-
-Non-negative `float` values
-
-### Inactive Opacity
-
-- Description: Opacity of inactive panels. When set to 1.0, the inactive panes have the same opacity as the active one. If set to 0, the inactive panes content will not be visible at all. Values are clamped to the [0.0, 1.0] range.
-- Setting: `inactive_opacity`
-- Default: `1.0`
-
-**Options**
-
-`float` values
-
-## Bottom Dock Layout
-
-- Description: Control the layout of the bottom dock, relative to the left and right docks.
-- Setting: `bottom_dock_layout`
-- Default: `"contained"`
-
-**Options**
-
-1. Contain the bottom dock, giving the full height of the window to the left and right docks.
-
-```json [settings]
-{
-  "bottom_dock_layout": "contained"
-}
-```
-
-2. Give the bottom dock the full width of the window, truncating the left and right docks.
-
-```json [settings]
-{
-  "bottom_dock_layout": "full"
-}
-```
-
-3. Left align the bottom dock, truncating the left dock and giving the right dock the full height of the window.
-
-```json [settings]
-{
-  "bottom_dock_layout": "left_aligned"
-}
-```
-
-4. Right align the bottom dock, giving the left dock the full height of the window and truncating the right dock.
-
-```json [settings]
-{
-  "bottom_dock_layout": "right_aligned"
-}
-```
-
-## Agent Font Size
-
-- Description: The font size for text in the agent panel. Inherits the UI font size if unset.
-- Setting: `agent_font_size`
-- Default: `null`
-
-**Options**
-
-`integer` values from `6` to `100` pixels (inclusive)
-
-## Allow Rewrap
-
-- Description: Controls where the {#action editor::Rewrap} action is allowed in the current language scope
-- Setting: `allow_rewrap`
-- Default: `"in_comments"`
-
-**Options**
-
-1. Allow rewrap in comments only:
-
-```json [settings]
-{
-  "allow_rewrap": "in_comments"
-}
-```
-
-2. Allow rewrap in selections only:
-
-```json [settings]
-{
-  "allow_rewrap": "in_selections"
-}
-```
-
-3. Allow rewrap anywhere:
-
-```json [settings]
-{
-  "allow_rewrap": "anywhere"
-}
-```
-
-Note: This setting has no effect in Vim mode, as rewrap is already allowed everywhere.
-
-## Auto Indent
-
-- Description: Whether indentation should be adjusted based on the context whilst typing. This can be specified on a per-language basis.
-- Setting: `auto_indent`
-- Default: `true`
-
-**Options**
-
-`boolean` values
-
-## Auto Indent On Paste
-
-- Description: Whether indentation of pasted content should be adjusted based on the context
-- Setting: `auto_indent_on_paste`
-- Default: `true`
-
-**Options**
-
-`boolean` values
-
-## Auto Install extensions
-
-- Description: Define extensions to be autoinstalled or never be installed.
-- Setting: `auto_install_extensions`
-- Default: `{ "html": true }`
-
-**Options**
-
-You can find the names of your currently installed extensions by listing the subfolders under the [extension installation location](./extensions/installing-extensions.md#installation-location):
-
-On macOS:
-
-```sh
-ls ~/Library/Application\ Support/Zed/extensions/installed/
-```
-
-On Linux:
-
-```sh
-ls ~/.local/share/zed/extensions/installed
-```
-
-Define extensions which should be installed (`true`) or never installed (`false`).
-
-```json [settings]
-{
-  "auto_install_extensions": {
-    "html": true,
-    "dockerfile": true,
-    "docker-compose": false
-  }
-}
-```
-
-## Autosave
-
-- Description: When to automatically save edited buffers.
-- Setting: `autosave`
-- Default: `off`
-
-**Options**
-
-1. To disable autosave, set it to `off`:
-
-```json [settings]
-{
-  "autosave": "off"
-}
-```
-
-2. To autosave when focus changes, use `on_focus_change`:
-
-```json [settings]
-{
-  "autosave": "on_focus_change"
-}
-```
-
-3. To autosave when the active window changes, use `on_window_change`:
-
-```json [settings]
-{
-  "autosave": "on_window_change"
-}
-```
-
-4. To autosave after an inactivity period, use `after_delay`:
-
-```json [settings]
-{
-  "autosave": {
-    "after_delay": {
-      "milliseconds": 1000
-    }
-  }
-}
-```
-
-Note that a save will be triggered when an unsaved tab is closed, even if this is earlier than the configured inactivity period.
-
-## Autoscroll on Clicks
-
-- Description: Whether to scroll when clicking near the edge of the visible text area.
-- Setting: `autoscroll_on_clicks`
-- Default: `false`
-
-**Options**
-
-`boolean` values
-
-## Auto Signature Help
-
-- Description: Show method signatures in the editor, when inside parentheses
-- Setting: `auto_signature_help`
-- Default: `false`
-
-**Options**
-
-`boolean` values
-
-### Show Signature Help After Edits
-
-- Description: Whether to show the signature help after completion or a bracket pair inserted. If `auto_signature_help` is enabled, this setting will be treated as enabled also.
-- Setting: `show_signature_help_after_edits`
-- Default: `false`
-
-**Options**
-
-`boolean` values
-
-## Auto Update
-
-- Description: Whether or not to automatically check for updates.
-- Setting: `auto_update`
-- Default: `true`
-
-**Options**
-
-`boolean` values
-
-## Base Keymap
-
-- Description: Base key bindings scheme. Base keymaps can be overridden with user keymaps.
-- Setting: `base_keymap`
-- Default: `VSCode`
-
-**Options**
-
-1. VS Code
-
-```json [settings]
-{
-  "base_keymap": "VSCode"
-}
-```
-
-2. Atom
-
-```json [settings]
-{
-  "base_keymap": "Atom"
-}
-```
-
-3. JetBrains
-
-```json [settings]
-{
-  "base_keymap": "JetBrains"
-}
-```
-
-4. None
-
-```json [settings]
-{
-  "base_keymap": "None"
-}
-```
-
-5. Sublime Text
-
-```json [settings]
-{
-  "base_keymap": "SublimeText"
-}
-```
-
-6. TextMate
-
-```json [settings]
-{
-  "base_keymap": "TextMate"
-}
-```
-
-## Buffer Font Family
-
-- Description: The name of a font to use for rendering text in the editor.
-- Setting: `buffer_font_family`
-- Default: `.ZedMono`. This currently aliases to [Lilex](https://lilex.myrt.co).
-
-**Options**
-
-The name of any font family installed on the user's system, or `".ZedMono"`.
-
-## Buffer Font Features
-
-- Description: The OpenType features to enable for text in the editor.
-- Setting: `buffer_font_features`
-- Default: `null`
-- Platform: macOS and Windows.
-
-**Options**
-
-Zed supports all OpenType features that can be enabled or disabled for a given buffer or terminal font, as well as setting values for font features.
-
-For example, to disable font ligatures, add the following to your settings:
-
-```json [settings]
-{
-  "buffer_font_features": {
-    "calt": false
-  }
-}
-```
-
-You can also set other OpenType features, like setting `cv01` to `7`:
-
-```json [settings]
-{
-  "buffer_font_features": {
-    "cv01": 7
-  }
-}
-```
-
-## Buffer Font Fallbacks
-
-- Description: Set the buffer text's font fallbacks, this will be merged with the platform's default fallbacks.
-- Setting: `buffer_font_fallbacks`
-- Default: `null`
-- Platform: macOS and Windows.
-
-**Options**
-
-For example, to use `Nerd Font` as a fallback, add the following to your settings:
-
-```json [settings]
-{
-  "buffer_font_fallbacks": ["Nerd Font"]
-}
-```
-
-## Buffer Font Size
-
-- Description: The default font size for text in the editor.
-- Setting: `buffer_font_size`
-- Default: `15`
-
-**Options**
-
-A font size from `6` to `100` pixels (inclusive)
-
-## Buffer Font Weight
-
-- Description: The default font weight for text in the editor.
-- Setting: `buffer_font_weight`
-- Default: `400`
-
-**Options**
-
-`integer` values between `100` and `900`
-
-## Buffer Line Height
-
-- Description: The default line height for text in the editor.
-- Setting: `buffer_line_height`
-- Default: `"comfortable"`
-
-**Options**
-
-`"standard"`, `"comfortable"` or `{ "custom": float }` (`1` is compact, `2` is loose)
-
-## Centered Layout
-
-- Description: Configuration for the centered layout mode.
-- Setting: `centered_layout`
-- Default:
-
-```json [settings]
-"centered_layout": {
-  "left_padding": 0.2,
-  "right_padding": 0.2,
-}
-```
-
-**Options**
-
-The `left_padding` and `right_padding` options define the relative width of the
-left and right padding of the central pane from the workspace when the centered layout mode is activated. Valid values range is from `0` to `0.4`.
-
-## Close on File Delete
-
-- Description: Whether to automatically close editor tabs when their corresponding files are deleted from disk.
-- Setting: `close_on_file_delete`
-- Default: `false`
-
-**Options**
-
-`boolean` values
-
-When enabled, this setting will automatically close tabs for files that have been deleted from the file system. This is particularly useful for workflows involving temporary or scratch files that are frequently created and deleted. When disabled (default), deleted files remain open with a strikethrough through their tab title.
-
-Note: Dirty files (files with unsaved changes) will not be automatically closed even when this setting is enabled, ensuring you don't lose unsaved work.
-
-## Confirm Quit
-
-- Description: Whether or not to prompt the user to confirm before closing the application.
-- Setting: `confirm_quit`
-- Default: `false`
-
-**Options**
-
-`boolean` values
-
-## Diagnostics Max Severity
-
-- Description: Which level to use to filter out diagnostics displayed in the editor
-- Setting: `diagnostics_max_severity`
-- Default: `null`
-
-**Options**
-
-1. Allow all diagnostics (default):
-
-```json [settings]
-{
-  "diagnostics_max_severity": "all"
-}
-```
-
-2. Show only errors:
-
-```json [settings]
-{
-  "diagnostics_max_severity": "error"
-}
-```
-
-3. Show errors and warnings:
-
-```json [settings]
-{
-  "diagnostics_max_severity": "warning"
-}
-```
-
-4. Show errors, warnings, and information:
-
-```json [settings]
-{
-  "diagnostics_max_severity": "info"
-}
-```
-
-5. Show all including hints:
-
-```json [settings]
-{
-  "diagnostics_max_severity": "hint"
-}
-```
-
-## Disable AI
-
-- Description: Whether to disable all AI features in Zed
-- Setting: `disable_ai`
-- Default: `false`
-
-**Options**
-
-`boolean` values
-
-## Direnv Integration
-
-- Description: Settings for [direnv](https://direnv.net/) integration. Requires `direnv` to be installed.
-  `direnv` integration make it possible to use the environment variables set by a `direnv` configuration to detect some language servers in `$PATH` instead of installing them.
-  It also allows for those environment variables to be used in tasks.
-- Setting: `load_direnv`
-- Default: `"direct"`
-
-**Options**
-
-There are three options to choose from:
-
-1. `shell_hook`: Use the shell hook to load direnv. This relies on direnv to activate upon entering the directory. Supports POSIX shells and fish.
-2. `direct`: Use `direnv export json` to load direnv. This will load direnv directly without relying on the shell hook and might cause some inconsistencies. This allows direnv to work with any shell.
-3. `disabled`: No shell environment will be loaded automatically; direnv must be invoked manually (e.g. with `direnv exec`) to be used.
-
-## Double Click In Multibuffer
-
-- Description: What to do when multibuffer is double clicked in some of its excerpts (parts of singleton buffers)
-- Setting: `double_click_in_multibuffer`
-- Default: `"select"`
-
-**Options**
-
-1. Behave as a regular buffer and select the whole word (default):
-
-```json [settings]
-{
-  "double_click_in_multibuffer": "select"
-}
-```
-
-2. Open the excerpt clicked as a new buffer in the new tab:
-
-```json [settings]
-{
-  "double_click_in_multibuffer": "open"
-}
-```
-
-For the case of "open", regular selection behavior can be achieved by holding `alt` when double clicking.
-
-## Drop Target Size
-
-- Description: Relative size of the drop target in the editor that will open dropped file as a split pane (0-0.5). For example, 0.25 means if you drop onto the top/bottom quarter of the pane a new vertical split will be used, if you drop onto the left/right quarter of the pane a new horizontal split will be used.
-- Setting: `drop_target_size`
-- Default: `0.2`
-
-**Options**
-
-`float` values between `0` and `0.5`
-
-## Edit Predictions
-
-- Description: Settings for edit predictions.
-- Setting: `edit_predictions`
-- Default:
-
-```json [settings]
-  "edit_predictions": {
-    "disabled_globs": [
-      "**/.env*",
-      "**/*.pem",
-      "**/*.key",
-      "**/*.cert",
-      "**/*.crt",
-      "**/.dev.vars",
-      "**/secrets.yml"
-    ]
-  }
-```
-
-**Options**
-
-### Disabled Globs
-
-- Description: A list of globs for which edit predictions should be disabled for. This list adds to a pre-existing, sensible default set of globs. Any additional ones you add are combined with them.
-- Setting: `disabled_globs`
-- Default: `["**/.env*", "**/*.pem", "**/*.key", "**/*.cert", "**/*.crt", "**/.dev.vars", "**/secrets.yml"]`
-
-**Options**
-
-List of `string` values.
-
-## Edit Predictions Disabled in
-
-- Description: A list of language scopes in which edit predictions should be disabled.
-- Setting: `edit_predictions_disabled_in`
-- Default: `[]`
-
-**Options**
-
-List of `string` values
-
-1. Don't show edit predictions in comments:
-
-```json [settings]
-"disabled_in": ["comment"]
-```
-
-2. Don't show edit predictions in strings and comments:
-
-```json [settings]
-"disabled_in": ["comment", "string"]
-```
-
-3. Only in Go, don't show edit predictions in strings and comments:
-
-```json [settings]
-{
-  "languages": {
-    "Go": {
-      "edit_predictions_disabled_in": ["comment", "string"]
-    }
-  }
-}
-```
-
-## Current Line Highlight
-
-- Description: How to highlight the current line in the editor.
-- Setting: `current_line_highlight`
-- Default: `all`
-
-**Options**
-
-1. Don't highlight the current line:
-
-```json [settings]
-"current_line_highlight": "none"
-```
-
-2. Highlight the gutter area:
-
-```json [settings]
-"current_line_highlight": "gutter"
-```
-
-3. Highlight the editor area:
-
-```json [settings]
-"current_line_highlight": "line"
-```
-
-4. Highlight the full line:
-
-```json [settings]
-"current_line_highlight": "all"
-```
-
-## Selection Highlight
-
-- Description: Whether to highlight all occurrences of the selected text in an editor.
-- Setting: `selection_highlight`
-- Default: `true`
-
-## Rounded Selection
-
-- Description: Whether the text selection should have rounded corners.
-- Setting: `rounded_selection`
-- Default: `true`
-
-## Cursor Blink
-
-- Description: Whether or not the cursor blinks.
-- Setting: `cursor_blink`
-- Default: `true`
-
-**Options**
-
-`boolean` values
-
-## Cursor Shape
-
-- Description: Cursor shape for the default editor.
-- Setting: `cursor_shape`
-- Default: `bar`
-
-**Options**
-
-1. A vertical bar:
-
-```json [settings]
-"cursor_shape": "bar"
-```
-
-2. A block that surrounds the following character:
-
-```json [settings]
-"cursor_shape": "block"
-```
-
-3. An underline / underscore that runs along the following character:
-
-```json [settings]
-"cursor_shape": "underline"
-```
-
-4. An box drawn around the following character:
-
-```json [settings]
-"cursor_shape": "hollow"
-```
-
-## Gutter
-
-- Description: Settings for the editor gutter
-- Setting: `gutter`
-- Default:
-
-```json [settings]
-{
-  "gutter": {
-    "line_numbers": true,
-    "runnables": true,
-    "breakpoints": true,
-    "folds": true,
-    "min_line_number_digits": 4
-  }
-}
-```
-
-**Options**
-
-- `line_numbers`: Whether to show line numbers in the gutter
-- `runnables`: Whether to show runnable buttons in the gutter
-- `breakpoints`: Whether to show breakpoints in the gutter
-- `folds`: Whether to show fold buttons in the gutter
-- `min_line_number_digits`: Minimum number of characters to reserve space for in the gutter
-
-## Hide Mouse
-
-- Description: Determines when the mouse cursor should be hidden in an editor or input box.
-- Setting: `hide_mouse`
-- Default: `on_typing_and_movement`
-
-**Options**
-
-1. Never hide the mouse cursor:
-
-```json [settings]
-"hide_mouse": "never"
-```
-
-2. Hide only when typing:
-
-```json [settings]
-"hide_mouse": "on_typing"
-```
-
-3. Hide on both typing and cursor movement:
-
-```json [settings]
-"hide_mouse": "on_typing_and_movement"
-```
-
-## Snippet Sort Order
-
-- Description: Determines how snippets are sorted relative to other completion items.
-- Setting: `snippet_sort_order`
-- Default: `inline`
-
-**Options**
-
-1. Place snippets at the top of the completion list:
-
-```json [settings]
-"snippet_sort_order": "top"
-```
-
-2. Place snippets normally without any preference:
-
-```json [settings]
-"snippet_sort_order": "inline"
-```
-
-3. Place snippets at the bottom of the completion list:
-
-```json [settings]
-"snippet_sort_order": "bottom"
-```
-
-4. Do not show snippets in the completion list at all:
-
-```json [settings]
-"snippet_sort_order": "none"
-```
-
-## Editor Scrollbar
-
-- Description: Whether or not to show the editor scrollbar and various elements in it.
-- Setting: `scrollbar`
-- Default:
-
-```json [settings]
-"scrollbar": {
-  "show": "auto",
-  "cursors": true,
-  "git_diff": true,
-  "search_results": true,
-  "selected_text": true,
-  "selected_symbol": true,
-  "diagnostics": "all",
-  "axes": {
-    "horizontal": true,
-    "vertical": true,
-  },
-},
-```
-
-### Show Mode
-
-- Description: When to show the editor scrollbar.
-- Setting: `show`
-- Default: `auto`
-
-**Options**
-
-1. Show the scrollbar if there's important information or follow the system's configured behavior:
-
-```json [settings]
-"scrollbar": {
-  "show": "auto"
-}
-```
-
-2. Match the system's configured behavior:
-
-```json [settings]
-"scrollbar": {
-  "show": "system"
-}
-```
-
-3. Always show the scrollbar:
-
-```json [settings]
-"scrollbar": {
-  "show": "always"
-}
-```
-
-4. Never show the scrollbar:
-
-```json [settings]
-"scrollbar": {
-  "show": "never"
-}
-```
-
-### Cursor Indicators
-
-- Description: Whether to show cursor positions in the scrollbar.
-- Setting: `cursors`
-- Default: `true`
-
-Cursor indicators appear as small marks on the scrollbar showing where other collaborators' cursors are positioned in the file.
-
-**Options**
-
-`boolean` values
-
-### Git Diff Indicators
-
-- Description: Whether to show git diff indicators in the scrollbar.
-- Setting: `git_diff`
-- Default: `true`
-
-Git diff indicators appear as colored marks showing lines that have been added, modified, or deleted compared to the git HEAD.
-
-**Options**
-
-`boolean` values
-
-### Search Results Indicators
-
-- Description: Whether to show buffer search results in the scrollbar.
-- Setting: `search_results`
-- Default: `true`
-
-Search result indicators appear as marks showing all locations in the file where your current search query matches.
-
-**Options**
-
-`boolean` values
-
-### Selected Text Indicators
-
-- Description: Whether to show selected text occurrences in the scrollbar.
-- Setting: `selected_text`
-- Default: `true`
-
-Selected text indicators appear as marks showing all occurrences of the currently selected text throughout the file.
-
-**Options**
-
-`boolean` values
-
-### Selected Symbols Indicators
-
-- Description: Whether to show selected symbol occurrences in the scrollbar.
-- Setting: `selected_symbol`
-- Default: `true`
-
-Selected symbol indicators appear as marks showing all occurrences of the currently selected symbol (like a function or variable name) throughout the file.
-
-**Options**
-
-`boolean` values
-
-### Diagnostics
-
-- Description: Which diagnostic indicators to show in the scrollbar.
-- Setting: `diagnostics`
-- Default: `all`
-
-Diagnostic indicators appear as colored marks showing errors, warnings, and other language server diagnostics at their corresponding line positions in the file.
-
-**Options**
-
-1. Show all diagnostics:
-
-```json [settings]
-{
-  "show_diagnostics": "all"
-}
-```
-
-2. Do not show any diagnostics:
-
-```json [settings]
-{
-  "show_diagnostics": "off"
-}
-```
-
-3. Show only errors:
-
-```json [settings]
-{
-  "show_diagnostics": "error"
-}
-```
-
-4. Show only errors and warnings:
-
-```json [settings]
-{
-  "show_diagnostics": "warning"
-}
-```
-
-5. Show only errors, warnings, and information:
-
-```json [settings]
-{
-  "show_diagnostics": "info"
-}
-```
-
-### Axes
-
-- Description: Forcefully enable or disable the scrollbar for each axis
-- Setting: `axes`
-- Default:
-
-```json [settings]
-"scrollbar": {
-  "axes": {
-    "horizontal": true,
-    "vertical": true,
-  },
-}
-```
-
-#### Horizontal
-
-- Description: When false, forcefully disables the horizontal scrollbar. Otherwise, obey other settings.
-- Setting: `horizontal`
-- Default: `true`
-
-**Options**
-
-`boolean` values
-
-#### Vertical
-
-- Description: When false, forcefully disables the vertical scrollbar. Otherwise, obey other settings.
-- Setting: `vertical`
-- Default: `true`
-
-**Options**
-
-`boolean` values
-
-## Minimap
-
-- Description: Settings related to the editor's minimap, which provides an overview of your document.
-- Setting: `minimap`
-- Default:
-
-```json [settings]
-{
-  "minimap": {
-    "show": "never",
-    "thumb": "always",
-    "thumb_border": "left_open",
-    "current_line_highlight": null
-  }
-}
-```
-
-### Show Mode
-
-- Description: When to show the minimap in the editor.
-- Setting: `show`
-- Default: `never`
-
-**Options**
-
-1. Always show the minimap:
-
-```json [settings]
-{
-  "show": "always"
-}
-```
-
-2. Show the minimap if the editor's scrollbars are visible:
-
-```json [settings]
-{
-  "show": "auto"
-}
-```
-
-3. Never show the minimap:
-
-```json [settings]
-{
-  "show": "never"
-}
-```
-
-### Thumb Display
-
-- Description: When to show the minimap thumb (the visible editor area) in the minimap.
-- Setting: `thumb`
-- Default: `always`
-
-**Options**
-
-1. Show the minimap thumb when hovering over the minimap:
-
-```json [settings]
-{
-  "thumb": "hover"
-}
-```
-
-2. Always show the minimap thumb:
-
-```json [settings]
-{
-  "thumb": "always"
-}
-```
-
-### Thumb Border
-
-- Description: How the minimap thumb border should look.
-- Setting: `thumb_border`
-- Default: `left_open`
-
-**Options**
-
-1. Display a border on all sides of the thumb:
-
-```json [settings]
-{
-  "thumb_border": "full"
-}
-```
-
-2. Display a border on all sides except the left side:
-
-```json [settings]
-{
-  "thumb_border": "left_open"
-}
-```
-
-3. Display a border on all sides except the right side:
-
-```json [settings]
-{
-  "thumb_border": "right_open"
-}
-```
-
-4. Display a border only on the left side:
-
-```json [settings]
-{
-  "thumb_border": "left_only"
-}
-```
-
-5. Display the thumb without any border:
-
-```json [settings]
-{
-  "thumb_border": "none"
-}
-```
-
-### Current Line Highlight
-
-- Description: How to highlight the current line in the minimap.
-- Setting: `current_line_highlight`
-- Default: `null`
-
-**Options**
-
-1. Inherit the editor's current line highlight setting:
-
-```json [settings]
-{
-  "minimap": {
-    "current_line_highlight": null
-  }
-}
-```
-
-2. Highlight the current line in the minimap:
-
-```json [settings]
-{
-  "minimap": {
-    "current_line_highlight": "line"
-  }
-}
-```
-
-or
-
-```json [settings]
-{
-  "minimap": {
-    "current_line_highlight": "all"
-  }
-}
-```
-
-3. Do not highlight the current line in the minimap:
-
-```json [settings]
-{
-  "minimap": {
-    "current_line_highlight": "gutter"
-  }
-}
-```
-
-or
-
-```json [settings]
-{
-  "minimap": {
-    "current_line_highlight": "none"
-  }
-}
-```
-
-## Editor Tab Bar
-
-- Description: Settings related to the editor's tab bar.
-- Settings: `tab_bar`
-- Default:
-
-```json [settings]
-"tab_bar": {
-  "show": true,
-  "show_nav_history_buttons": true,
-  "show_tab_bar_buttons": true
-}
-```
-
-### Show
-
-- Description: Whether or not to show the tab bar in the editor.
-- Setting: `show`
-- Default: `true`
-
-**Options**
-
-`boolean` values
-
-### Navigation History Buttons
-
-- Description: Whether or not to show the navigation history buttons.
-- Setting: `show_nav_history_buttons`
-- Default: `true`
-
-**Options**
-
-`boolean` values
-
-### Tab Bar Buttons
-
-- Description: Whether or not to show the tab bar buttons.
-- Setting: `show_tab_bar_buttons`
-- Default: `true`
-
-**Options**
-
-`boolean` values
-
-## Editor Tabs
-
-- Description: Configuration for the editor tabs.
-- Setting: `tabs`
-- Default:
-
-```json [settings]
-"tabs": {
-  "close_position": "right",
-  "file_icons": false,
-  "git_status": false,
-  "activate_on_close": "history",
-  "show_close_button": "hover",
-  "show_diagnostics": "off"
-},
-```
-
-### Close Position
-
-- Description: Where to display close button within a tab.
-- Setting: `close_position`
-- Default: `right`
-
-**Options**
-
-1. Display the close button on the right:
-
-```json [settings]
-{
-  "close_position": "right"
-}
-```
-
-2. Display the close button on the left:
-
-```json [settings]
-{
-  "close_position": "left"
-}
-```
-
-### File Icons
-
-- Description: Whether to show the file icon for a tab.
-- Setting: `file_icons`
-- Default: `false`
-
-### Git Status
-
-- Description: Whether or not to show Git file status in tab.
-- Setting: `git_status`
-- Default: `false`
-
-### Activate on close
-
-- Description: What to do after closing the current tab.
-- Setting: `activate_on_close`
-- Default: `history`
-
-**Options**
-
-1.  Activate the tab that was open previously:
-
-```json [settings]
-{
-  "activate_on_close": "history"
-}
-```
-
-2. Activate the right neighbour tab if present:
-
-```json [settings]
-{
-  "activate_on_close": "neighbour"
-}
-```
-
-3. Activate the left neighbour tab if present:
-
-```json [settings]
-{
-  "activate_on_close": "left_neighbour"
-}
-```
-
-### Show close button
-
-- Description: Controls the appearance behavior of the tab's close button.
-- Setting: `show_close_button`
-- Default: `hover`
-
-**Options**
-
-1.  Show it just upon hovering the tab:
-
-```json [settings]
-{
-  "show_close_button": "hover"
-}
-```
-
-2. Show it persistently:
-
-```json [settings]
-{
-  "show_close_button": "always"
-}
-```
-
-3. Never show it, even if hovering it:
-
-```json [settings]
-{
-  "show_close_button": "hidden"
-}
-```
-
-### Show Diagnostics
-
-- Description: Whether to show diagnostics indicators in tabs. This setting only works when file icons are active and controls which files with diagnostic issues to mark.
-- Setting: `show_diagnostics`
-- Default: `off`
-
-**Options**
-
-1. Do not mark any files:
-
-```json [settings]
-{
-  "show_diagnostics": "off"
-}
-```
-
-2. Only mark files with errors:
-
-```json [settings]
-{
-  "show_diagnostics": "errors"
-}
-```
-
-3. Mark files with errors and warnings:
-
-```json [settings]
-{
-  "show_diagnostics": "all"
-}
-```
-
-### Show Inline Code Actions
-
-- Description: Whether to show code action button at start of buffer line.
-- Setting: `inline_code_actions`
-- Default: `true`
-
-**Options**
-
-`boolean` values
-
-### Drag And Drop Selection
-
-- Description: Whether to allow drag and drop text selection in buffer. `delay` is the milliseconds that must elapse before drag and drop is allowed. Otherwise, a new text selection is created.
-- Setting: `drag_and_drop_selection`
-- Default:
-
-```json [settings]
-"drag_and_drop_selection": {
-  "enabled": true,
-  "delay": 300
-}
-```
-
-## Editor Toolbar
-
-- Description: Whether or not to show various elements in the editor toolbar.
-- Setting: `toolbar`
-- Default:
-
-```json [settings]
-"toolbar": {
-  "breadcrumbs": true,
-  "quick_actions": true,
-  "selections_menu": true,
-  "agent_review": true,
-  "code_actions": false
-},
-```
-
-**Options**
-
-Each option controls displaying of a particular toolbar element. If all elements are hidden, the editor toolbar is not displayed.
-
-## Use System Tabs
-
-- Description: Whether to allow windows to tab together based on the user’s tabbing preference (macOS only).
-- Setting: `use_system_window_tabs`
-- Default: `false`
-
-**Options**
-
-This setting enables integration with macOS’s native window tabbing feature. When set to `true`, Zed windows can be grouped together as tabs in a single macOS window, following the system-wide tabbing preferences set by the user (such as "Always", "In Full Screen", or "Never"). This setting is only available on macOS.
-
-## Enable Language Server
-
-- Description: Whether or not to use language servers to provide code intelligence.
-- Setting: `enable_language_server`
-- Default: `true`
-
-**Options**
-
-`boolean` values
-
-## Ensure Final Newline On Save
-
-- Description: Removes any lines containing only whitespace at the end of the file and ensures just one newline at the end.
-- Setting: `ensure_final_newline_on_save`
-- Default: `true`
-
-**Options**
-
-`boolean` values
-
-## Expand Excerpt Lines
-
-- Description: The default number of lines to expand excerpts in the multibuffer by
-- Setting: `expand_excerpt_lines`
-- Default: `5`
-
-**Options**
-
-Positive `integer` values
-
-## Excerpt Context Lines
-
-- Description: The number of lines of context to provide when showing excerpts in the multibuffer.
-- Setting: `excerpt_context_lines`
-- Default: `2`
-
-**Options**
-
-Positive `integer` value between 1 and 32. Values outside of this range will be clamped to this range.
-
-## Extend Comment On Newline
-
-- Description: Whether to start a new line with a comment when a previous line is a comment as well.
-- Setting: `extend_comment_on_newline`
-- Default: `true`
-
-**Options**
-
-`boolean` values
-
-## Status Bar
-
-- Description: Control various elements in the status bar. Note that some items in the status bar have their own settings set elsewhere.
-- Setting: `status_bar`
-- Default:
-
-```json [settings]
-"status_bar": {
-  "active_language_button": true,
-  "cursor_position_button": true,
-  "line_endings_button": false
-},
-```
-
-There is an experimental setting that completely hides the status bar. This causes major usability problems (you will be unable to use many of Zed's features), but is provided for those who value screen real-estate above all else.
-
-```json
-"status_bar": {
-  "experimental.show": false
-}
-```
-
-## LSP
-
-- Description: Configuration for language servers.
-- Setting: `lsp`
-- Default: `null`
-
-**Options**
-
-The following settings can be overridden for specific language servers:
-
-- `initialization_options`
-- `settings`
-
-To override configuration for a language server, add an entry for that language server's name to the `lsp` value.
-
-Some options are passed via `initialization_options` to the language server. These are for options which must be specified at language server startup and when changed will require restarting the language server.
-
-For example to pass the `check` option to `rust-analyzer`, use the following configuration:
-
-```json [settings]
-"lsp": {
-  "rust-analyzer": {
-    "initialization_options": {
-      "check": {
-        "command": "clippy" // rust-analyzer.check.command (default: "check")
-      }
-    }
-  }
-}
-```
-
-While other options may be changed at a runtime and should be placed under `settings`:
-
-```json [settings]
-"lsp": {
-  "yaml-language-server": {
-    "settings": {
-      "yaml": {
-        "keyOrdering": true // Enforces alphabetical ordering of keys in maps
-      }
-    }
-  }
-}
-```
-
-## Global LSP Settings
-
-- Description: Configuration for global LSP settings that apply to all language servers
-- Setting: `global_lsp_settings`
-- Default:
-
-```json [settings]
-{
-  "global_lsp_settings": {
-    "button": true
-  }
-}
-```
-
-**Options**
-
-- `button`: Whether to show the LSP status button in the status bar
-
-## LSP Highlight Debounce
-
-- Description: The debounce delay in milliseconds before querying highlights from the language server based on the current cursor location.
-- Setting: `lsp_highlight_debounce`
-- Default: `75`
-
-**Options**
-
-`integer` values representing milliseconds
-
-## Features
-
-- Description: Features that can be globally enabled or disabled
-- Setting: `features`
-- Default:
-
-```json [settings]
-{
-  "features": {
-    "edit_prediction_provider": "zed"
-  }
-}
-```
-
-### Edit Prediction Provider
-
-- Description: Which edit prediction provider to use
-- Setting: `edit_prediction_provider`
-- Default: `"zed"`
-
-**Options**
-
-1. Use Zeta as the edit prediction provider:
-
-```json [settings]
-{
-  "features": {
-    "edit_prediction_provider": "zed"
-  }
-}
-```
-
-2. Use Copilot as the edit prediction provider:
-
-```json [settings]
-{
-  "features": {
-    "edit_prediction_provider": "copilot"
-  }
-}
-```
-
-3. Use Supermaven as the edit prediction provider:
-
-```json [settings]
-{
-  "features": {
-    "edit_prediction_provider": "supermaven"
-  }
-}
-```
-
-4. Turn off edit predictions across all providers
-
-```json [settings]
-{
-  "features": {
-    "edit_prediction_provider": "none"
-  }
-}
-```
-
-## Format On Save
-
-- Description: Whether or not to perform a buffer format before saving.
-- Setting: `format_on_save`
-- Default: `on`
-
-**Options**
-
-1. `on`, enables format on save obeying `formatter` setting:
-
-```json [settings]
-{
-  "format_on_save": "on"
-}
-```
-
-2. `off`, disables format on save:
-
-```json [settings]
-{
-  "format_on_save": "off"
-}
-```
-
-## Formatter
-
-- Description: How to perform a buffer format.
-- Setting: `formatter`
-- Default: `auto`
-
-**Options**
-
-1. To use the current language server, use `"language_server"`:
-
-```json [settings]
-{
-  "formatter": "language_server"
-}
-```
-
-2. Or to use an external command, use `"external"`. Specify the name of the formatting program to run, and an array of arguments to pass to the program. The buffer's text will be passed to the program on stdin, and the formatted output should be written to stdout. For example, the following command would strip trailing spaces using [`sed(1)`](https://linux.die.net/man/1/sed):
-
-```json [settings]
-{
-  "formatter": {
-    "external": {
-      "command": "sed",
-      "arguments": ["-e", "s/ *$//"]
-    }
-  }
-}
-```
-
-3. External formatters may optionally include a `{buffer_path}` placeholder which at runtime will include the path of the buffer being formatted. Formatters operate by receiving file content via standard input, reformatting it and then outputting it to standard output and so normally don't know the filename of what they are formatting. Tools like Prettier support receiving the file path via a command line argument which can then used to impact formatting decisions.
-
-WARNING: `{buffer_path}` should not be used to direct your formatter to read from a filename. Your formatter should only read from standard input and should not read or write files directly.
-
-```json [settings]
-  "formatter": {
-    "external": {
-      "command": "prettier",
-      "arguments": ["--stdin-filepath", "{buffer_path}"]
-    }
-  }
-```
-
-4. Or to use code actions provided by the connected language servers, use `"code_actions"`:
-
-```json [settings]
-{
-  "formatter": [
-    // Use ESLint's --fix:
-    { "code_action": "source.fixAll.eslint" },
-    // Organize imports on save:
-    { "code_action": "source.organizeImports" }
-  ]
-}
-```
-
-5. Or to use multiple formatters consecutively, use an array of formatters:
-
-```json [settings]
-{
-  "formatter": [
-    { "language_server": { "name": "rust-analyzer" } },
-    {
-      "external": {
-        "command": "sed",
-        "arguments": ["-e", "s/ *$//"]
-      }
-    }
-  ]
-}
-```
-
-Here `rust-analyzer` will be used first to format the code, followed by a call of sed.
-If any of the formatters fails, the subsequent ones will still be executed.
-
-## Auto close
-
-- Description: Whether to automatically add matching closing characters when typing opening parenthesis, bracket, brace, single or double quote characters.
-- Setting: `use_autoclose`
-- Default: `true`
-
-**Options**
-
-`boolean` values
-
-## Always Treat Brackets As Autoclosed
-
-- Description: Controls how the editor handles the autoclosed characters.
-- Setting: `always_treat_brackets_as_autoclosed`
-- Default: `false`
-
-**Options**
-
-`boolean` values
-
-**Example**
-
-If the setting is set to `true`:
-
-1. Enter in the editor: `)))`
-2. Move the cursor to the start: `^)))`
-3. Enter again: `)))`
-
-The result is still `)))` and not `))))))`, which is what it would be by default.
-
-## File Scan Exclusions
-
-- Setting: `file_scan_exclusions`
-- Description: Files or globs of files that will be excluded by Zed entirely. They will be skipped during file scans, file searches, and not be displayed in the project file tree. Overrides `file_scan_inclusions`.
-- Default:
-
-```json [settings]
-"file_scan_exclusions": [
-  "**/.git",
-  "**/.svn",
-  "**/.hg",
-  "**/.jj",
-  "**/CVS",
-  "**/.DS_Store",
-  "**/Thumbs.db",
-  "**/.classpath",
-  "**/.settings"
-],
-```
-
-Note, specifying `file_scan_exclusions` in settings.json will override the defaults (shown above). If you are looking to exclude additional items you will need to include all the default values in your settings.
-
-## File Scan Inclusions
-
-- Setting: `file_scan_inclusions`
-- Description: Files or globs of files that will be included by Zed, even when ignored by git. This is useful for files that are not tracked by git, but are still important to your project. Note that globs that are overly broad can slow down Zed's file scanning. `file_scan_exclusions` takes precedence over these inclusions.
-- Default:
-
-```json [settings]
-"file_scan_inclusions": [".env*"],
-```
-
-## File Types
-
-- Setting: `file_types`
-- Description: Configure how Zed selects a language for a file based on its filename or extension. Supports glob entries.
-- Default:
-
-```json [settings]
-"file_types": {
-  "JSONC": ["**/.zed/**/*.json", "**/zed/**/*.json", "**/Zed/**/*.json", "**/.vscode/**/*.json"],
-  "Shell Script": [".env.*"]
-}
-```
-
-**Examples**
-
-To interpret all `.c` files as C++, files called `MyLockFile` as TOML and files starting with `Dockerfile` as Dockerfile:
-
-```json [settings]
-{
-  "file_types": {
-    "C++": ["c"],
-    "TOML": ["MyLockFile"],
-    "Dockerfile": ["Dockerfile*"]
-  }
-}
-```
-
-## Diagnostics
-
-- Description: Configuration for diagnostics-related features.
-- Setting: `diagnostics`
-- Default:
-
-```json [settings]
-{
-  "diagnostics": {
-    "include_warnings": true,
-    "inline": {
-      "enabled": false
-    },
-    "update_with_cursor": false,
-    "primary_only": false,
-    "use_rendered": false
-  }
-}
-```
-
-### Inline Diagnostics
-
-- Description: Whether or not to show diagnostics information inline.
-- Setting: `inline`
-- Default:
-
-```json [settings]
-{
-  "diagnostics": {
-    "inline": {
-      "enabled": false,
-      "update_debounce_ms": 150,
-      "padding": 4,
-      "min_column": 0,
-      "max_severity": null
-    }
-  }
-}
-```
-
-**Options**
-
-1. Enable inline diagnostics.
-
-```json [settings]
-{
-  "diagnostics": {
-    "inline": {
-      "enabled": true
-    }
-  }
-}
-```
-
-2. Delay diagnostic updates until some time after the last diagnostic update.
-
-```json [settings]
-{
-  "diagnostics": {
-    "inline": {
-      "enabled": true,
-      "update_debounce_ms": 150
-    }
-  }
-}
-```
-
-3. Set padding between the end of the source line and the start of the diagnostic.
-
-```json [settings]
-{
-  "diagnostics": {
-    "inline": {
-      "enabled": true,
-      "padding": 4
-    }
-  }
-}
-```
-
-4. Horizontally align inline diagnostics at the given column.
-
-```json [settings]
-{
-  "diagnostics": {
-    "inline": {
-      "enabled": true,
-      "min_column": 80
-    }
-  }
-}
-```
-
-5. Show only warning and error diagnostics.
-
-```json [settings]
-{
-  "diagnostics": {
-    "inline": {
-      "enabled": true,
-      "max_severity": "warning"
-    }
-  }
-}
-```
-
-## Git
-
-- Description: Configuration for git-related features.
-- Setting: `git`
-- Default:
-
-```json [settings]
-{
-  "git": {
-    "git_gutter": "tracked_files",
-    "inline_blame": {
-      "enabled": true
-    },
-    "branch_picker": {
-      "show_author_name": true
-    },
-    "hunk_style": "staged_hollow"
-  }
-}
-```
-
-### Git Gutter
-
-- Description: Whether or not to show the git gutter.
-- Setting: `git_gutter`
-- Default: `tracked_files`
-
-**Options**
-
-1. Show git gutter in tracked files
-
-```json [settings]
-{
-  "git": {
-    "git_gutter": "tracked_files"
-  }
-}
-```
-
-2. Hide git gutter
-
-```json [settings]
-{
-  "git": {
-    "git_gutter": "hide"
-  }
-}
-```
-
-### Gutter Debounce
-
-- Description: Sets the debounce threshold (in milliseconds) after which changes are reflected in the git gutter.
-- Setting: `gutter_debounce`
-- Default: `null`
-
-**Options**
-
-`integer` values representing milliseconds
-
-Example:
-
-```json [settings]
-{
-  "git": {
-    "gutter_debounce": 100
-  }
-}
-```
-
-### Inline Git Blame
-
-- Description: Whether or not to show git blame information inline, on the currently focused line.
-- Setting: `inline_blame`
-- Default:
-
-```json [settings]
-{
-  "git": {
-    "inline_blame": {
-      "enabled": true
-    }
-  }
-}
-```
-
-**Options**
-
-1. Disable inline git blame:
-
-```json [settings]
-{
-  "git": {
-    "inline_blame": {
-      "enabled": false
-    }
-  }
-}
-```
-
-2. Only show inline git blame after a delay (that starts after cursor stops moving):
-
-```json [settings]
-{
-  "git": {
-    "inline_blame": {
-      "delay_ms": 500
-    }
-  }
-}
-```
-
-3. Show a commit summary next to the commit date and author:
-
-```json [settings]
-{
-  "git": {
-    "inline_blame": {
-      "show_commit_summary": true
-    }
-  }
-}
-```
-
-4. Use this as the minimum column at which to display inline blame information:
-
-```json [settings]
-{
-  "git": {
-    "inline_blame": {
-      "min_column": 80
-    }
-  }
-}
-```
-
-5. Set the padding between the end of the line and the inline blame hint, in ems:
-
-```json [settings]
-{
-  "git": {
-    "inline_blame": {
-      "padding": 10
-    }
-  }
-}
-```
-
-### Branch Picker
-
-- Description: Configuration related to the branch picker.
-- Setting: `branch_picker`
-- Default:
-
-```json [settings]
-{
-  "git": {
-    "branch_picker": {
-      "show_author_name": false
-    }
-  }
-}
-```
-
-**Options**
-
-1. Show the author name in the branch picker:
-
-```json [settings]
-{
-  "git": {
-    "branch_picker": {
-      "show_author_name": true
-    }
-  }
-}
-```
-
-### Hunk Style
-
-- Description: What styling we should use for the diff hunks.
-- Setting: `hunk_style`
-- Default:
-
-```json [settings]
-{
-  "git": {
-    "hunk_style": "staged_hollow"
-  }
-}
-```
-
-**Options**
-
-1. Show the staged hunks faded out and with a border:
-
-```json [settings]
-{
-  "git": {
-    "hunk_style": "staged_hollow"
-  }
-}
-```
-
-2. Show unstaged hunks faded out and with a border:
-
-```json [settings]
-{
-  "git": {
-    "hunk_style": "unstaged_hollow"
-  }
-}
-```
-
-## Go to Definition Fallback
-
-- Description: What to do when the {#action editor::GoToDefinition} action fails to find a definition
-- Setting: `go_to_definition_fallback`
-- Default: `"find_all_references"`
-
-**Options**
-
-1. Do nothing:
-
-```json [settings]
-{
-  "go_to_definition_fallback": "none"
-}
-```
-
-2. Find references for the same symbol (default):
-
-```json [settings]
-{
-  "go_to_definition_fallback": "find_all_references"
-}
-```
-
-## Hard Tabs
-
-- Description: Whether to indent lines using tab characters or multiple spaces.
-- Setting: `hard_tabs`
-- Default: `false`
-
-**Options**
-
-`boolean` values
-
-## Helix Mode
-
-- Description: Whether or not to enable Helix mode. Enabling `helix_mode` also enables `vim_mode`. See the [Helix documentation](./helix.md) for more details.
-- Setting: `helix_mode`
-- Default: `false`
-
-**Options**
-
-`boolean` values
-
-## Indent Guides
-
-- Description: Configuration related to indent guides. Indent guides can be configured separately for each language.
-- Setting: `indent_guides`
-- Default:
-
-```json [settings]
-{
-  "indent_guides": {
-    "enabled": true,
-    "line_width": 1,
-    "active_line_width": 1,
-    "coloring": "fixed",
-    "background_coloring": "disabled"
-  }
-}
-```
-
-**Options**
-
-1. Disable indent guides
-
-```json [settings]
-{
-  "indent_guides": {
-    "enabled": false
-  }
-}
-```
-
-2. Enable indent guides for a specific language.
-
-```json [settings]
-{
-  "languages": {
-    "Python": {
-      "indent_guides": {
-        "enabled": true
-      }
-    }
-  }
-}
-```
-
-3. Enable indent aware coloring ("rainbow indentation").
-   The colors that are used for different indentation levels are defined in the theme (theme key: `accents`). They can be customized by using theme overrides.
-
-```json [settings]
-{
-  "indent_guides": {
-    "enabled": true,
-    "coloring": "indent_aware"
-  }
-}
-```
-
-4. Enable indent aware background coloring ("rainbow indentation").
-   The colors that are used for different indentation levels are defined in the theme (theme key: `accents`). They can be customized by using theme overrides.
-
-```json [settings]
-{
-  "indent_guides": {
-    "enabled": true,
-    "coloring": "indent_aware",
-    "background_coloring": "indent_aware"
-  }
-}
-```
-
-## Hover Popover Enabled
-
-- Description: Whether or not to show the informational hover box when moving the mouse over symbols in the editor.
-- Setting: `hover_popover_enabled`
-- Default: `true`
-
-**Options**
-
-`boolean` values
-
-## Hover Popover Delay
-
-- Description: Time to wait in milliseconds before showing the informational hover box.
-- Setting: `hover_popover_delay`
-- Default: `300`
-
-**Options**
-
-`integer` values representing milliseconds
-
-## Icon Theme
-
-- Description: The icon theme setting can be specified in two forms - either as the name of an icon theme or as an object containing the `mode`, `dark`, and `light` icon themes for files/folders inside Zed.
-- Setting: `icon_theme`
-- Default: `Zed (Default)`
-
-### Icon Theme Object
-
-- Description: Specify the icon theme using an object that includes the `mode`, `dark`, and `light`.
-- Setting: `icon_theme`
-- Default:
-
-```json [settings]
-"icon_theme": {
-  "mode": "system",
-  "dark": "Zed (Default)",
-  "light": "Zed (Default)"
-},
-```
-
-### Mode
-
-- Description: Specify the icon theme mode.
-- Setting: `mode`
-- Default: `system`
-
-**Options**
-
-1. Set the icon theme to dark mode
-
-```json [settings]
-{
-  "mode": "dark"
-}
-```
-
-2. Set the icon theme to light mode
-
-```json [settings]
-{
-  "mode": "light"
-}
-```
-
-3. Set the icon theme to system mode
-
-```json [settings]
-{
-  "mode": "system"
-}
-```
-
-### Dark
-
-- Description: The name of the dark icon theme.
-- Setting: `dark`
-- Default: `Zed (Default)`
-
-**Options**
-
-Run the {#action icon_theme_selector::Toggle} action in the command palette to see a current list of valid icon themes names.
-
-### Light
-
-- Description: The name of the light icon theme.
-- Setting: `light`
-- Default: `Zed (Default)`
-
-**Options**
-
-Run the {#action icon_theme_selector::Toggle} action in the command palette to see a current list of valid icon themes names.
-
-## Image Viewer
-
-- Description: Settings for image viewer functionality
-- Setting: `image_viewer`
-- Default:
-
-```json [settings]
-{
-  "image_viewer": {
-    "unit": "binary"
-  }
-}
-```
-
-**Options**
-
-### Unit
-
-- Description: The unit for image file sizes
-- Setting: `unit`
-- Default: `"binary"`
-
-**Options**
-
-1. Use binary units (KiB, MiB):
-
-```json [settings]
-{
-  "image_viewer": {
-    "unit": "binary"
-  }
-}
-```
-
-2. Use decimal units (KB, MB):
-
-```json [settings]
-{
-  "image_viewer": {
-    "unit": "decimal"
-  }
-}
-```
-
-## Inlay hints
-
-- Description: Configuration for displaying extra text with hints in the editor.
-- Setting: `inlay_hints`
-- Default:
-
-```json [settings]
-"inlay_hints": {
-  "enabled": false,
-  "show_type_hints": true,
-  "show_parameter_hints": true,
-  "show_other_hints": true,
-  "show_background": false,
-  "edit_debounce_ms": 700,
-  "scroll_debounce_ms": 50,
-  "toggle_on_modifiers_press": null
-}
-```
-
-**Options**
-
-Inlay hints querying consists of two parts: editor (client) and LSP server.
-With the inlay settings above are changed to enable the hints, editor will start to query certain types of hints and react on LSP hint refresh request from the server.
-At this point, the server may or may not return hints depending on its implementation, further configuration might be needed, refer to the corresponding LSP server documentation.
-
-The following languages have inlay hints preconfigured by Zed:
-
-- [Go](https://docs.zed.dev/languages/go)
-- [Rust](https://docs.zed.dev/languages/rust)
-- [Svelte](https://docs.zed.dev/languages/svelte)
-- [TypeScript](https://docs.zed.dev/languages/typescript)
-
-Use the `lsp` section for the server configuration. Examples are provided in the corresponding language documentation.
-
-Hints are not instantly queried in Zed, two kinds of debounces are used, either may be set to 0 to be disabled.
-Settings-related hint updates are not debounced.
-
-All possible config values for `toggle_on_modifiers_press` are:
-
-```json [settings]
-"inlay_hints": {
-  "toggle_on_modifiers_press": {
-    "control": true,
-    "shift": true,
-    "alt": true,
-    "platform": true,
-    "function": true
-  }
-}
-```
-
-Unspecified values have a `false` value, hints won't be toggled if all the modifiers are `false` or not all the modifiers are pressed.
-
-## Journal
-
-- Description: Configuration for the journal.
-- Setting: `journal`
-- Default:
-
-```json [settings]
-"journal": {
-  "path": "~",
-  "hour_format": "hour12"
-}
-
-```
-
-### Path
-
-- Description: The path of the directory where journal entries are stored. If an invalid path is specified, the journal will fall back to using `~` (the home directory).
-- Setting: `path`
-- Default: `~`
-
-**Options**
-
-`string` values
-
-### Hour Format
-
-- Description: The format to use for displaying hours in the journal.
-- Setting: `hour_format`
-- Default: `hour12`
-
-**Options**
-
-1. 12-hour format:
-
-```json [settings]
-{
-  "hour_format": "hour12"
-}
-```
-
-2. 24-hour format:
-
-```json [settings]
-{
-  "hour_format": "hour24"
-}
-```
-
-## JSX Tag Auto Close
-
-- Description: Whether to automatically close JSX tags
-- Setting: `jsx_tag_auto_close`
-- Default:
-
-```json [settings]
-{
-  "jsx_tag_auto_close": {
-    "enabled": true
-  }
-}
-```
-
-**Options**
-
-- `enabled`: Whether to enable automatic JSX tag closing
-
-## Languages
-
-- Description: Configuration for specific languages.
-- Setting: `languages`
-- Default: `null`
-
-**Options**
-
-To override settings for a language, add an entry for that languages name to the `languages` value. Example:
-
-```json [settings]
-"languages": {
-  "C": {
-    "format_on_save": "off",
-    "preferred_line_length": 64,
-    "soft_wrap": "preferred_line_length"
-  },
-  "JSON": {
-    "tab_size": 4
-  }
-}
-```
-
-The following settings can be overridden for each specific language:
-
-- [`enable_language_server`](#enable-language-server)
-- [`ensure_final_newline_on_save`](#ensure-final-newline-on-save)
-- [`format_on_save`](#format-on-save)
-- [`formatter`](#formatter)
-- [`hard_tabs`](#hard-tabs)
-- [`preferred_line_length`](#preferred-line-length)
-- [`remove_trailing_whitespace_on_save`](#remove-trailing-whitespace-on-save)
-- [`show_edit_predictions`](#show-edit-predictions)
-- [`show_whitespaces`](#show-whitespaces)
-- [`whitespace_map`](#whitespace-map)
-- [`soft_wrap`](#soft-wrap)
-- [`tab_size`](#tab-size)
-- [`use_autoclose`](#use-autoclose)
-- [`always_treat_brackets_as_autoclosed`](#always-treat-brackets-as-autoclosed)
-
-These values take in the same options as the root-level settings with the same name.
-
-## Language Models
-
-- Description: Configuration for language model providers
-- Setting: `language_models`
-- Default:
-
-```json [settings]
-{
-  "language_models": {
-    "anthropic": {
-      "api_url": "https://api.anthropic.com"
-    },
-    "google": {
-      "api_url": "https://generativelanguage.googleapis.com"
-    },
-    "ollama": {
-      "api_url": "http://localhost:11434"
-    },
-    "openai": {
-      "api_url": "https://api.openai.com/v1"
-    }
-  }
-}
-```
-
-**Options**
-
-Configuration for various AI model providers including API URLs and authentication settings.
-
-## Line Indicator Format
-
-- Description: Format for line indicator in the status bar
-- Setting: `line_indicator_format`
-- Default: `"short"`
-
-**Options**
-
-1. Short format:
-
-```json [settings]
-{
-  "line_indicator_format": "short"
-}
-```
-
-2. Long format:
-
-```json [settings]
-{
-  "line_indicator_format": "long"
-}
-```
-
-## Linked Edits
-
-- Description: Whether to perform linked edits of associated ranges, if the language server supports it. For example, when editing opening `<html>` tag, the contents of the closing `</html>` tag will be edited as well.
-- Setting: `linked_edits`
-- Default: `true`
-
-**Options**
-
-`boolean` values
-
-## LSP Document Colors
-
-- Description: Whether to show document color information from the language server
-- Setting: `lsp_document_colors`
-- Default: `true`
-
-**Options**
-
-`boolean` values
-
-## Max Tabs
-
-- Description: Maximum number of tabs to show in the tab bar
-- Setting: `max_tabs`
-- Default: `null`
-
-**Options**
-
-Positive `integer` values or `null` for unlimited tabs
-
-## Middle Click Paste (Linux only)
-
-- Description: Enable middle-click paste on Linux
-- Setting: `middle_click_paste`
-- Default: `true`
-
-**Options**
-
-`boolean` values
-
-## Multi Cursor Modifier
-
-- Description: Determines the modifier to be used to add multiple cursors with the mouse. The open hover link mouse gestures will adapt such that it do not conflict with the multicursor modifier.
-- Setting: `multi_cursor_modifier`
-- Default: `alt`
-
-**Options**
-
-1. Maps to `Alt` on Linux and Windows and to `Option` on macOS:
-
-```json [settings]
-{
-  "multi_cursor_modifier": "alt"
-}
-```
-
-2. Maps `Control` on Linux and Windows and to `Command` on macOS:
-
-```json [settings]
-{
-  "multi_cursor_modifier": "cmd_or_ctrl" // alias: "cmd", "ctrl"
-}
-```
-
-## Node
-
-- Description: Configuration for Node.js integration
-- Setting: `node`
-- Default:
-
-```json [settings]
-{
-  "node": {
-    "ignore_system_version": false,
-    "path": null,
-    "npm_path": null
-  }
-}
-```
-
-**Options**
-
-- `ignore_system_version`: Whether to ignore the system Node.js version
-- `path`: Custom path to Node.js binary
-- `npm_path`: Custom path to npm binary
-
-## Network Proxy
-
-- Description: Configure a network proxy for Zed.
-- Setting: `proxy`
-- Default: `null`
-
-**Options**
-
-The proxy setting must contain a URL to the proxy.
-
-The following URI schemes are supported:
-
-- `http`
-- `https`
-- `socks4` - SOCKS4 proxy with local DNS
-- `socks4a` - SOCKS4 proxy with remote DNS
-- `socks5` - SOCKS5 proxy with local DNS
-- `socks5h` - SOCKS5 proxy with remote DNS
-
-`http` will be used when no scheme is specified.
-
-By default no proxy will be used, or Zed will attempt to retrieve proxy settings from environment variables, such as `http_proxy`, `HTTP_PROXY`, `https_proxy`, `HTTPS_PROXY`, `all_proxy`, `ALL_PROXY`, `no_proxy` and `NO_PROXY`.
-
-For example, to set an `http` proxy, add the following to your settings:
-
-```json [settings]
-{
-  "proxy": "http://127.0.0.1:10809"
-}
-```
-
-Or to set a `socks5` proxy:
-
-```json [settings]
-{
-  "proxy": "socks5h://localhost:10808"
-}
-```
-
-If you wish to exclude certain hosts from using the proxy, set the `NO_PROXY` environment variable. This accepts a comma-separated list of hostnames, host suffixes, IPv4/IPv6 addresses or blocks that should not use the proxy. For example if your environment included `NO_PROXY="google.com, 192.168.1.0/24"` all hosts in `192.168.1.*`, `google.com` and `*.google.com` would bypass the proxy. See [reqwest NoProxy docs](https://docs.rs/reqwest/latest/reqwest/struct.NoProxy.html#method.from_string) for more.
-
-## On Last Window Closed
-
-- Description: What to do when the last window is closed
-- Setting: `on_last_window_closed`
-- Default: `"platform_default"`
-
-**Options**
-
-1. Use platform default behavior:
-
-```json [settings]
-{
-  "on_last_window_closed": "platform_default"
-}
-```
-
-2. Always quit the application:
-
-```json [settings]
-{
-  "on_last_window_closed": "quit_app"
-}
-```
-
-## Profiles
-
-- Description: Configuration profiles that can be applied on top of existing settings
-- Setting: `profiles`
-- Default: `{}`
-
-**Options**
-
-Configuration object for defining settings profiles. Example:
-
-```json [settings]
-{
-  "profiles": {
-    "presentation": {
-      "buffer_font_size": 20,
-      "ui_font_size": 18,
-      "theme": "One Light"
-    }
-  }
-}
-```
-
-## Preview tabs
-
-- Description:
-  Preview tabs allow you to open files in preview mode, where they close automatically when you switch to another file unless you explicitly pin them. This is useful for quickly viewing files without cluttering your workspace. Preview tabs display their file names in italics. \
-   There are several ways to convert a preview tab into a regular tab:
-
-  - Double-clicking on the file
-  - Double-clicking on the tab header
-  - Using the {#action project_panel::OpenPermanent} action
-  - Editing the file
-  - Dragging the file to a different pane
-
-- Setting: `preview_tabs`
-- Default:
-
-```json [settings]
-"preview_tabs": {
-  "enabled": true,
-  "enable_preview_from_project_panel": true,
-  "enable_preview_from_file_finder": false,
-  "enable_preview_from_multibuffer": true,
-  "enable_preview_multibuffer_from_code_navigation": false,
-  "enable_preview_file_from_code_navigation": true,
-  "enable_keep_preview_on_code_navigation": false,
-}
-```
-
-### Enable preview from project panel
-
-- Description: Determines whether to open files in preview mode when opened from the project panel with a single click.
-- Setting: `enable_preview_from_project_panel`
-- Default: `true`
-
-**Options**
-
-`boolean` values
-
-### Enable preview from file finder
-
-- Description: Determines whether to open files in preview mode when selected from the file finder.
-- Setting: `enable_preview_from_file_finder`
-- Default: `false`
-
-**Options**
-
-`boolean` values
-
-### Enable preview from multibuffer
-
-- Description: Determines whether to open files in preview mode when opened from a multibuffer.
-- Setting: `enable_preview_from_multibuffer`
-- Default: `true`
-
-**Options**
-
-`boolean` values
-
-### Enable preview multibuffer from code navigation
-
-- Description: Determines whether to open tabs in preview mode when code navigation is used to open a multibuffer.
-- Setting: `enable_preview_multibuffer_from_code_navigation`
-- Default: `false`
-
-**Options**
-
-`boolean` values
-
-### Enable preview file from code navigation
-
-- Description: Determines whether to open tabs in preview mode when code navigation is used to open a single file.
-- Setting: `enable_preview_file_from_code_navigation`
-- Default: `true`
-
-**Options**
-
-`boolean` values
-
-### Enable keep preview on code navigation
-
-- Description: Determines whether to keep tabs in preview mode when code navigation is used to navigate away from them. If `enable_preview_file_from_code_navigation` or `enable_preview_multibuffer_from_code_navigation` is also true, the new tab may replace the existing one.
-- Setting: `enable_keep_preview_on_code_navigation`
-- Default: `false`
-
-**Options**
-
-`boolean` values
-
-## File Finder
-
-### File Icons
-
-- Description: Whether to show file icons in the file finder.
-- Setting: `file_icons`
-- Default: `true`
-
-### Modal Max Width
-
-- Description: Max-width of the file finder modal. It can take one of these values: `small`, `medium`, `large`, `xlarge`, and `full`.
-- Setting: `modal_max_width`
-- Default: `small`
-
-### Skip Focus For Active In Search
-
-- Description: Determines whether the file finder should skip focus for the active file in search results.
-- Setting: `skip_focus_for_active_in_search`
-- Default: `true`
-
-## Pane Split Direction Horizontal
-
-- Description: The direction that you want to split panes horizontally
-- Setting: `pane_split_direction_horizontal`
-- Default: `"up"`
-
-**Options**
-
-1. Split upward:
-
-```json [settings]
-{
-  "pane_split_direction_horizontal": "up"
-}
-```
-
-2. Split downward:
-
-```json [settings]
-{
-  "pane_split_direction_horizontal": "down"
-}
-```
-
-## Pane Split Direction Vertical
-
-- Description: The direction that you want to split panes vertically
-- Setting: `pane_split_direction_vertical`
-- Default: `"left"`
-
-**Options**
-
-1. Split to the left:
-
-```json [settings]
-{
-  "pane_split_direction_vertical": "left"
-}
-```
-
-2. Split to the right:
-
-```json [settings]
-{
-  "pane_split_direction_vertical": "right"
-}
-```
-
-## Preferred Line Length
-
-- Description: The column at which to soft-wrap lines, for buffers where soft-wrap is enabled.
-- Setting: `preferred_line_length`
-- Default: `80`
-
-**Options**
-
-`integer` values
-
-## Private Files
-
-- Description: Globs to match against file paths to determine if a file is private
-- Setting: `private_files`
-- Default: `["**/.env*", "**/*.pem", "**/*.key", "**/*.cert", "**/*.crt", "**/secrets.yml"]`
-
-**Options**
-
-List of `string` glob patterns
-
-## Projects Online By Default
-
-- Description: Whether or not to show the online projects view by default.
-- Setting: `projects_online_by_default`
-- Default: `true`
-
-**Options**
-
-`boolean` values
-
-## Read SSH Config
-
-- Description: Whether to read SSH configuration files
-- Setting: `read_ssh_config`
-- Default: `true`
-
-**Options**
-
-`boolean` values
-
-## Redact Private Values
-
-- Description: Hide the values of variables from visual display in private files
-- Setting: `redact_private_values`
-- Default: `false`
-
-**Options**
-
-`boolean` values
-
-## Relative Line Numbers
-
-- Description: Whether to show relative line numbers in the gutter
-- Setting: `relative_line_numbers`
-- Default: `"disabled"`
-
-**Options**
-
-1. Show relative line numbers in the gutter whilst counting wrapped lines as one line:
-
-```json [settings]
-{
-  "relative_line_numbers": "enabled"
-}
-```
-
-2. Show relative line numbers in the gutter, including wrapped lines in the counting:
-
-```json [settings]
-{
-  "relative_line_numbers": "wrapped"
-}
-```
-
-2. Do not use relative line numbers:
-
-```json [settings]
-{
-  "relative_line_numbers": "disabled"
-}
-```
-
-## Remove Trailing Whitespace On Save
-
-- Description: Whether or not to remove any trailing whitespace from lines of a buffer before saving it.
-- Setting: `remove_trailing_whitespace_on_save`
-- Default: `true`
-
-**Options**
-
-`boolean` values
-
-## Resize All Panels In Dock
-
-- Description: Whether to resize all the panels in a dock when resizing the dock. Can be a combination of "left", "right" and "bottom".
-- Setting: `resize_all_panels_in_dock`
-- Default: `["left"]`
-
-**Options**
-
-List of strings containing any combination of:
-
-- `"left"`: Resize left dock panels together
-- `"right"`: Resize right dock panels together
-- `"bottom"`: Resize bottom dock panels together
-
-## Restore on File Reopen
-
-- Description: Whether to attempt to restore previous file's state when opening it again. The state is stored per pane.
-- Setting: `restore_on_file_reopen`
-- Default: `true`
-
-**Options**
-
-`boolean` values
-
-## Restore on Startup
-
-- Description: Controls session restoration on startup.
-- Setting: `restore_on_startup`
-- Default: `last_session`
-
-**Options**
-
-1. Restore all workspaces that were open when quitting Zed:
-
-```json [settings]
-{
-  "restore_on_startup": "last_session"
-}
-```
-
-2. Restore the workspace that was closed last:
-
-```json [settings]
-{
-  "restore_on_startup": "last_workspace"
-}
-```
-
-3. Always start with an empty editor:
-
-```json [settings]
-{
-  "restore_on_startup": "none"
-}
-```
-
-## Scroll Beyond Last Line
-
-- Description: Whether the editor will scroll beyond the last line
-- Setting: `scroll_beyond_last_line`
-- Default: `"one_page"`
-
-**Options**
-
-1. Scroll one page beyond the last line by one page:
-
-```json [settings]
-{
-  "scroll_beyond_last_line": "one_page"
-}
-```
-
-2. The editor will scroll beyond the last line by the same amount of lines as `vertical_scroll_margin`:
-
-```json [settings]
-{
-  "scroll_beyond_last_line": "vertical_scroll_margin"
-}
-```
-
-3. The editor will not scroll beyond the last line:
-
-```json [settings]
-{
-  "scroll_beyond_last_line": "off"
-}
-```
-
-**Options**
-
-`boolean` values
-
-## Scroll Sensitivity
-
-- Description: Scroll sensitivity multiplier. This multiplier is applied to both the horizontal and vertical delta values while scrolling.
-- Setting: `scroll_sensitivity`
-- Default: `1.0`
-
-**Options**
-
-Positive `float` values
-
-### Fast Scroll Sensitivity
-
-- Description: Scroll sensitivity multiplier for fast scrolling. This multiplier is applied to both the horizontal and vertical delta values while scrolling. Fast scrolling happens when a user holds the alt or option key while scrolling.
-- Setting: `fast_scroll_sensitivity`
-- Default: `4.0`
-
-**Options**
-
-Positive `float` values
-
-### Horizontal Scroll Margin
-
-- Description: The number of characters to keep on either side when scrolling with the mouse
-- Setting: `horizontal_scroll_margin`
-- Default: `5`
-
-**Options**
-
-Non-negative `integer` values
-
-### Vertical Scroll Margin
-
-- Description: The number of lines to keep above/below the cursor when scrolling with the keyboard
-- Setting: `vertical_scroll_margin`
-- Default: `3`
-
-**Options**
-
-Non-negative `integer` values
-
-## Search
-
-- Description: Search options to enable by default when opening new project and buffer searches.
-- Setting: `search`
-- Default:
-
-```json [settings]
-"search": {
-  "button": true,
-  "whole_word": false,
-  "case_sensitive": false,
-  "include_ignored": false,
-  "regex": false,
-  "center_on_match": false
-},
-```
-
-### Button
-
-- Description: Whether to show the project search button in the status bar.
-- Setting: `button`
-- Default: `true`
-
-### Whole Word
-
-- Description: Whether to only match on whole words.
-- Setting: `whole_word`
-- Default: `false`
-
-### Case Sensitive
-
-- Description: Whether to match case sensitively. This setting affects both
-  searches and editor actions like "Select Next Occurrence", "Select Previous
-  Occurrence", and "Select All Occurrences".
-- Setting: `case_sensitive`
-- Default: `false`
-
-### Include Ignore
-
-- Description: Whether to include gitignored files in search results.
-- Setting: `include_ignored`
-- Default: `false`
-
-### Regex
-
-- Description: Whether to interpret the search query as a regular expression.
-- Setting: `regex`
-- Default: `false`
-
-### Center On Match
-
-- Description: Whether to center the cursor on each search match when navigating.
-- Setting: `center_on_match`
-- Default: `false`
-
-## Search Wrap
-
-- Description: If `search_wrap` is disabled, search result do not wrap around the end of the file
-- Setting: `search_wrap`
-- Default: `true`
-
-## Center on Match
-
-- Description: If `center_on_match` is enabled, the editor will center the cursor on the current match when searching.
-- Setting: `center_on_match`
-- Default: `false`
-
-## Seed Search Query From Cursor
-
-- Description: When to populate a new search's query based on the text under the cursor.
-- Setting: `seed_search_query_from_cursor`
-- Default: `always`
-
-**Options**
-
-1. `always` always populate the search query with the word under the cursor
-2. `selection` only populate the search query when there is text selected
-3. `never` never populate the search query
-
-## Use Smartcase Search
-
-- Description: When enabled, automatically adjusts search case sensitivity based on your query. If your search query contains any uppercase letters, the search becomes case-sensitive; if it contains only lowercase letters, the search becomes case-insensitive. \
-  This applies to both in-file searches and project-wide searches.
-- Setting: `use_smartcase_search`
-- Default: `false`
-
-**Options**
-
-`boolean` values
-
-Examples:
-
-- Searching for "function" would match "function", "Function", "FUNCTION", etc.
-- Searching for "Function" would only match "Function", not "function" or "FUNCTION"
-
-## Show Call Status Icon
-
-- Description: Whether or not to show the call status icon in the status bar.
-- Setting: `show_call_status_icon`
-- Default: `true`
-
-**Options**
-
-`boolean` values
-
-## Completions
-
-- Description: Controls how completions are processed for this language.
-- Setting: `completions`
-- Default:
-
-```json [settings]
-{
-  "completions": {
-    "words": "fallback",
-    "words_min_length": 3,
-    "lsp": true,
-    "lsp_fetch_timeout_ms": 0,
-    "lsp_insert_mode": "replace_suffix"
-  }
-}
-```
-
-### Words
-
-- Description: Controls how words are completed. For large documents, not all words may be fetched for completion.
-- Setting: `words`
-- Default: `fallback`
-
-**Options**
-
-1. `enabled` - Always fetch document's words for completions along with LSP completions
-2. `fallback` - Only if LSP response errors or times out, use document's words to show completions
-3. `disabled` - Never fetch or complete document's words for completions (word-based completions can still be queried via a separate action)
-
-### Min Words Query Length
-
-- Description: Minimum number of characters required to automatically trigger word-based completions.
-  Before that value, it's still possible to trigger the words-based completion manually with the corresponding editor command.
-- Setting: `words_min_length`
-- Default: `3`
-
-**Options**
-
-Positive integer values
-
-### LSP
-
-- Description: Whether to fetch LSP completions or not.
-- Setting: `lsp`
-- Default: `true`
-
-**Options**
-
-`boolean` values
-
-### LSP Fetch Timeout (ms)
-
-- Description: When fetching LSP completions, determines how long to wait for a response of a particular server. When set to 0, waits indefinitely.
-- Setting: `lsp_fetch_timeout_ms`
-- Default: `0`
-
-**Options**
-
-`integer` values representing milliseconds
-
-### LSP Insert Mode
-
-- Description: Controls what range to replace when accepting LSP completions.
-- Setting: `lsp_insert_mode`
-- Default: `replace_suffix`
-
-**Options**
-
-1. `insert` - Replaces text before the cursor, using the `insert` range described in the LSP specification
-2. `replace` - Replaces text before and after the cursor, using the `replace` range described in the LSP specification
-3. `replace_subsequence` - Behaves like `"replace"` if the text that would be replaced is a subsequence of the completion text, and like `"insert"` otherwise
-4. `replace_suffix` - Behaves like `"replace"` if the text after the cursor is a suffix of the completion, and like `"insert"` otherwise
-
-## Show Completions On Input
-
-- Description: Whether or not to show completions as you type.
-- Setting: `show_completions_on_input`
-- Default: `true`
-
-**Options**
-
-`boolean` values
-
-## Show Completion Documentation
-
-- Description: Whether to display inline and alongside documentation for items in the completions menu.
-- Setting: `show_completion_documentation`
-- Default: `true`
-
-**Options**
-
-`boolean` values
-
-## Show Edit Predictions
-
-- Description: Whether to show edit predictions as you type or manually by triggering `editor::ShowEditPrediction`.
-- Setting: `show_edit_predictions`
-- Default: `true`
-
-**Options**
-
-`boolean` values
-
-## Show Whitespaces
-
-- Description: Whether or not to render whitespace characters in the editor.
-- Setting: `show_whitespaces`
-- Default: `selection`
-
-**Options**
-
-1. `all`
-2. `selection`
-3. `none`
-4. `boundary`
-
-## Whitespace Map
-
-- Description: Specify the characters used to render whitespace when show_whitespaces is enabled.
-- Setting: `whitespace_map`
-- Default:
-
-```json [settings]
-{
-  "whitespace_map": {
-    "space": "•",
-    "tab": "→"
-  }
-}
-```
-
-## Soft Wrap
-
-- Description: Whether or not to automatically wrap lines of text to fit editor / preferred width.
-- Setting: `soft_wrap`
-- Default: `none`
-
-**Options**
-
-1. `none` to avoid wrapping generally, unless the line is too long
-2. `prefer_line` (deprecated, same as `none`)
-3. `editor_width` to wrap lines that overflow the editor width
-4. `preferred_line_length` to wrap lines that overflow `preferred_line_length` config value
-5. `bounded` to wrap lines at the minimum of `editor_width` and `preferred_line_length`
-
-## Show Wrap Guides
-
-- Description: Whether to show wrap guides (vertical rulers) in the editor. Setting this to true will show a guide at the 'preferred_line_length' value if 'soft_wrap' is set to 'preferred_line_length', and will show any additional guides as specified by the 'wrap_guides' setting.
-- Setting: `show_wrap_guides`
-- Default: `true`
-
-**Options**
-
-`boolean` values
-
-## Use On Type Format
-
-- Description: Whether to use additional LSP queries to format (and amend) the code after every "trigger" symbol input, defined by LSP server capabilities
-- Setting: `use_on_type_format`
-- Default: `true`
-
-**Options**
-
-`boolean` values
-
-## Use Auto Surround
-
-- Description: Whether to automatically surround selected text when typing opening parenthesis, bracket, brace, single or double quote characters. For example, when you select text and type '(', Zed will surround the text with ().
-- Setting: `use_auto_surround`
-- Default: `true`
-
-**Options**
-
-`boolean` values
-
-## Use System Path Prompts
-
-- Description: Whether to use the system provided dialogs for Open and Save As. When set to false, Zed will use the built-in keyboard-first pickers.
-- Setting: `use_system_path_prompts`
-- Default: `true`
-
-**Options**
-
-`boolean` values
-
-## Use System Prompts
-
-- Description: Whether to use the system provided dialogs for prompts, such as confirmation prompts. When set to false, Zed will use its built-in prompts. Note that on Linux, this option is ignored and Zed will always use the built-in prompts.
-- Setting: `use_system_prompts`
-- Default: `true`
-
-**Options**
-
-`boolean` values
-
-## Wrap Guides (Vertical Rulers)
-
-- Description: Where to display vertical rulers as wrap-guides. Disable by setting `show_wrap_guides` to `false`.
-- Setting: `wrap_guides`
-- Default: []
-
-**Options**
-
-List of `integer` column numbers
-
-## Tab Size
-
-- Description: The number of spaces to use for each tab character.
-- Setting: `tab_size`
-- Default: `4`
-
-**Options**
-
-`integer` values
-
-## Tasks
-
-- Description: Configuration for tasks that can be run within Zed
-- Setting: `tasks`
-- Default:
-
-```json [settings]
-{
-  "tasks": {
-    "variables": {},
-    "enabled": true,
-    "prefer_lsp": false
-  }
-}
-```
-
-**Options**
-
-- `variables`: Custom variables for task configuration
-- `enabled`: Whether tasks are enabled
-- `prefer_lsp`: Whether to prefer LSP-provided tasks over Zed language extension ones
-
-## Telemetry
-
-- Description: Control what info is collected by Zed.
-- Setting: `telemetry`
-- Default:
-
-```json [settings]
-"telemetry": {
-  "diagnostics": true,
-  "metrics": true
-},
-```
-
-**Options**
-
-### Diagnostics
-
-- Description: Setting for sending debug-related data, such as crash reports.
-- Setting: `diagnostics`
-- Default: `true`
-
-**Options**
-
-`boolean` values
-
-### Metrics
-
-- Description: Setting for sending anonymized usage data, such what languages you're using Zed with.
-- Setting: `metrics`
-- Default: `true`
-
-**Options**
-
-`boolean` values
-
-## Terminal
-
-- Description: Configuration for the terminal.
-- Setting: `terminal`
-- Default:
-
-```json [settings]
-{
-  "terminal": {
-    "alternate_scroll": "off",
-    "blinking": "terminal_controlled",
-    "copy_on_select": false,
-    "keep_selection_on_copy": true,
-    "dock": "bottom",
-    "default_width": 640,
-    "default_height": 320,
-    "detect_venv": {
-      "on": {
-        "directories": [".env", "env", ".venv", "venv"],
-        "activate_script": "default"
-      }
-    },
-    "env": {},
-    "font_family": null,
-    "font_features": null,
-    "font_size": null,
-    "line_height": "comfortable",
-    "minimum_contrast": 45,
-    "option_as_meta": false,
-    "button": true,
-    "shell": "system",
-    "scroll_multiplier": 3.0,
-    "toolbar": {
-      "breadcrumbs": false
-    },
-    "working_directory": "current_project_directory",
-    "scrollbar": {
-      "show": null
-    }
-  }
-}
-```
-
-### Terminal: Dock
-
-- Description: Control the position of the dock
-- Setting: `dock`
-- Default: `bottom`
-
-**Options**
-
-`"bottom"`, `"left"` or `"right"`
-
-### Terminal: Alternate Scroll
-
-- Description: Set whether Alternate Scroll mode (DECSET code: `?1007`) is active by default. Alternate Scroll mode converts mouse scroll events into up / down key presses when in the alternate screen (e.g. when running applications like vim or less). The terminal can still set and unset this mode with ANSI escape codes.
-- Setting: `alternate_scroll`
-- Default: `off`
-
-**Options**
-
-1. Default alternate scroll mode to off
-
-```json [settings]
-{
-  "terminal": {
-    "alternate_scroll": "off"
-  }
-}
-```
-
-2. Default alternate scroll mode to on
-
-```json [settings]
-{
-  "terminal": {
-    "alternate_scroll": "on"
-  }
-}
-```
-
-### Terminal: Blinking
-
-- Description: Set the cursor blinking behavior in the terminal
-- Setting: `blinking`
-- Default: `terminal_controlled`
-
-**Options**
-
-1. Never blink the cursor, ignore the terminal mode
-
-```json [settings]
-{
-  "terminal": {
-    "blinking": "off"
-  }
-}
-```
-
-2. Default the cursor blink to off, but allow the terminal to turn blinking on
-
-```json [settings]
-{
-  "terminal": {
-    "blinking": "terminal_controlled"
-  }
-}
-```
-
-3. Always blink the cursor, ignore the terminal mode
-
-```json [settings]
-{
-  "terminal": {
-    "blinking": "on"
-  }
-}
-```
-
-### Terminal: Copy On Select
-
-- Description: Whether or not selecting text in the terminal will automatically copy to the system clipboard.
-- Setting: `copy_on_select`
-- Default: `false`
-
-**Options**
-
-`boolean` values
-
-**Example**
-
-```json [settings]
-{
-  "terminal": {
-    "copy_on_select": true
-  }
-}
-```
-
-### Terminal: Cursor Shape
-
-- Description: Controls the visual shape of the cursor in the terminal. When not explicitly set, it defaults to a block shape.
-- Setting: `cursor_shape`
-- Default: `null` (defaults to block)
-
-**Options**
-
-1. A block that surrounds the following character
-
-```json [settings]
-{
-  "terminal": {
-    "cursor_shape": "block"
-  }
-}
-```
-
-2. A vertical bar
-
-```json [settings]
-{
-  "terminal": {
-    "cursor_shape": "bar"
-  }
-}
-```
-
-3. An underline / underscore that runs along the following character
-
-```json [settings]
-{
-  "terminal": {
-    "cursor_shape": "underline"
-  }
-}
-```
-
-4. A box drawn around the following character
-
-```json [settings]
-{
-  "terminal": {
-    "cursor_shape": "hollow"
-  }
-}
-```
-
-### Terminal: Keep Selection On Copy
-
-- Description: Whether or not to keep the selection in the terminal after copying text.
-- Setting: `keep_selection_on_copy`
-- Default: `true`
-
-**Options**
-
-`boolean` values
-
-**Example**
-
-```json [settings]
-{
-  "terminal": {
-    "keep_selection_on_copy": false
-  }
-}
-```
-
-### Terminal: Env
-
-- Description: Any key-value pairs added to this object will be added to the terminal's environment. Keys must be unique, use `:` to separate multiple values in a single variable
-- Setting: `env`
-- Default: `{}`
-
-**Example**
-
-```json [settings]
-{
-  "terminal": {
-    "env": {
-      "ZED": "1",
-      "KEY": "value1:value2"
-    }
-  }
-}
-```
-
-### Terminal: Font Size
-
-- Description: What font size to use for the terminal. When not set defaults to matching the editor's font size
-- Setting: `font_size`
-- Default: `null`
-
-**Options**
-
-`integer` values
-
-```json [settings]
-{
-  "terminal": {
-    "font_size": 15
-  }
-}
-```
-
-### Terminal: Font Family
-
-- Description: What font to use for the terminal. When not set, defaults to matching the editor's font.
-- Setting: `font_family`
-- Default: `null`
-
-**Options**
-
-The name of any font family installed on the user's system
-
-```json [settings]
-{
-  "terminal": {
-    "font_family": "Berkeley Mono"
-  }
-}
-```
-
-### Terminal: Font Features
-
-- Description: What font features to use for the terminal. When not set, defaults to matching the editor's font features.
-- Setting: `font_features`
-- Default: `null`
-- Platform: macOS and Windows.
-
-**Options**
-
-See Buffer Font Features
-
-```json [settings]
-{
-  "terminal": {
-    "font_features": {
-      "calt": false
-      // See Buffer Font Features for more features
-    }
-  }
-}
-```
-
-### Terminal: Line Height
-
-- Description: Set the terminal's line height.
-- Setting: `line_height`
-- Default: `standard`
-
-**Options**
-
-1. Use a line height that's `comfortable` for reading, 1.618.
-
-```json [settings]
-{
-  "terminal": {
-    "line_height": "comfortable"
-  }
-}
-```
-
-2. Use a `standard` line height, 1.3. This option is useful for TUIs, particularly if they use box characters. (default)
-
-```json [settings]
-{
-  "terminal": {
-    "line_height": "standard"
-  }
-}
-```
-
-3.  Use a custom line height.
-
-```json [settings]
-{
-  "terminal": {
-    "line_height": {
-      "custom": 2
-    }
-  }
-}
-```
-
-### Terminal: Minimum Contrast
-
-- Description: Controls the minimum contrast between foreground and background colors in the terminal. Uses the APCA (Accessible Perceptual Contrast Algorithm) for color adjustments. Set this to 0 to disable this feature.
-- Setting: `minimum_contrast`
-- Default: `45`
-
-**Options**
-
-`integer` values from 0 to 106. Common recommended values:
-
-- `0`: No contrast adjustment
-- `45`: Minimum for large fluent text (default)
-- `60`: Minimum for other content text
-- `75`: Minimum for body text
-- `90`: Preferred for body text
-
-```json [settings]
-{
-  "terminal": {
-    "minimum_contrast": 45
-  }
-}
-```
-
-### Terminal: Option As Meta
-
-- Description: Re-interprets the option keys to act like a 'meta' key, like in Emacs.
-- Setting: `option_as_meta`
-- Default: `false`
-
-**Options**
-
-`boolean` values
-
-```json [settings]
-{
-  "terminal": {
-    "option_as_meta": true
-  }
-}
-```
-
-### Terminal: Shell
-
-- Description: What shell to use when launching the terminal.
-- Setting: `shell`
-- Default: `system`
-
-**Options**
-
-1. Use the system's default terminal configuration (usually the `/etc/passwd` file).
-
-```json [settings]
-{
-  "terminal": {
-    "shell": "system"
-  }
-}
-```
-
-2. A program to launch:
-
-```json [settings]
-{
-  "terminal": {
-    "shell": {
-      "program": "sh"
-    }
-  }
-}
-```
-
-3. A program with arguments:
-
-```json [settings]
-{
-  "terminal": {
-    "shell": {
-      "with_arguments": {
-        "program": "/bin/bash",
-        "args": ["--login"]
-      }
-    }
-  }
-}
-```
-
-## Terminal: Detect Virtual Environments {#terminal-detect_venv}
-
-- Description: Activate the [Python Virtual Environment](https://docs.python.org/3/library/venv.html), if one is found, in the terminal's working directory (as resolved by the working_directory and automatically activating the virtual environment.
-- Setting: `detect_venv`
-- Default:
-
-```json [settings]
-{
-  "terminal": {
-    "detect_venv": {
-      "on": {
-        // Default directories to search for virtual environments, relative
-        // to the current working directory. We recommend overriding this
-        // in your project's settings, rather than globally.
-        "directories": [".env", "env", ".venv", "venv"],
-        // Can also be `csh`, `fish`, and `nushell`
-        "activate_script": "default"
-      }
-    }
-  }
-}
-```
-
-Disable with:
-
-```json [settings]
-{
-  "terminal": {
-    "detect_venv": "off"
-  }
-}
-```
-
-### Terminal: Scroll Multiplier
-
-- Description: The multiplier for scrolling speed in the terminal when using mouse wheel or trackpad.
-- Setting: `scroll_multiplier`
-- Default: `1.0`
-
-**Options**
-
-Positive floating point values. Values less than or equal to 0 will be clamped to a minimum of 0.01.
-
-**Example**
-
-```json
-{
-  "terminal": {
-    "scroll_multiplier": 5.0
-  }
-}
-```
-
-## Terminal: Toolbar
-
-- Description: Whether or not to show various elements in the terminal toolbar.
-- Setting: `toolbar`
-- Default:
-
-```json [settings]
-{
-  "terminal": {
-    "toolbar": {
-      "breadcrumbs": false
-    }
-  }
-}
-```
-
-**Options**
-
-At the moment, only the `breadcrumbs` option is available, it controls displaying of the terminal title that can be changed via `PROMPT_COMMAND`.
-
-If the terminal title is empty, the breadcrumbs won't be shown.
-
-The shell running in the terminal needs to be configured to emit the title.
-
-Example command to set the title: `echo -e "\e]2;New Title\007";`
-
-### Terminal: Button
-
-- Description: Control to show or hide the terminal button in the status bar
-- Setting: `button`
-- Default: `true`
-
-**Options**
-
-`boolean` values
-
-```json [settings]
-{
-  "terminal": {
-    "button": false
-  }
-}
-```
-
-### Terminal: Working Directory
-
-- Description: What working directory to use when launching the terminal.
-- Setting: `working_directory`
-- Default: `"current_project_directory"`
-
-**Options**
-
-1. Use the current file's project directory. Fallback to the first project directory strategy if unsuccessful.
-
-```json [settings]
-{
-  "terminal": {
-    "working_directory": "current_project_directory"
-  }
-}
-```
-
-2. Use the first project in this workspace's directory. Fallback to using this platform's home directory.
-
-```json [settings]
-{
-  "terminal": {
-    "working_directory": "first_project_directory"
-  }
-}
-```
-
-3. Always use this platform's home directory if it can be found.
-
-```json [settings]
-{
-  "terminal": {
-    "working_directory": "always_home"
-  }
-}
-```
-
-4. Always use a specific directory. This value will be shell expanded. If this path is not a valid directory the terminal will default to this platform's home directory.
-
-```json [settings]
-{
-  "terminal": {
-    "working_directory": {
-      "always": {
-        "directory": "~/zed/projects/"
-      }
-    }
-  }
-}
-```
-
-### Terminal: Path Hyperlink Regexes
-
-- Description: Regexes used to identify path hyperlinks. The regexes can be specified in two forms - a single regex string, or an array of strings (which will be collected into a single multi-line regex string).
-- Setting: `path_hyperlink_regexes`
-- Default:
-
-```json [settings]
-{
-  "terminal": {
-    "path_hyperlink_regexes": [
-      // Python-style diagnostics
-      "File \"(?<path>[^\"]+)\", line (?<line>[0-9]+)",
-      // Common path syntax with optional line, column, description, trailing punctuation, or
-      // surrounding symbols or quotes
-      [
-        "(?x)",
-        "# optionally starts with 0-2 opening prefix symbols",
-        "[({\\[<]{0,2}",
-        "# which may be followed by an opening quote",
-        "(?<quote>[\"'`])?",
-        "# `path` is the shortest sequence of any non-space character",
-        "(?<link>(?<path>[^ ]+?",
-        "    # which may end with a line and optionally a column,",
-        "    (?<line_column>:+[0-9]+(:[0-9]+)?|:?\\([0-9]+([,:][0-9]+)?\\))?",
-        "))",
-        "# which must be followed by a matching quote",
-        "(?(<quote>)\\k<quote>)",
-        "# and optionally a single closing symbol",
-        "[)}\\]>]?",
-        "# if line/column matched, may be followed by a description",
-        "(?(<line_column>):[^ 0-9][^ ]*)?",
-        "# which may be followed by trailing punctuation",
-        "[.,:)}\\]>]*",
-        "# and always includes trailing whitespace or end of line",
-        "([ ]+|$)"
-      ]
-    ]
-  }
-}
-```
-
-### Terminal: Path Hyperlink Timeout (ms)
-
-- Description: Maximum time to search for a path hyperlink. When set to 0, path hyperlinks are disabled.
-- Setting: `path_hyperlink_timeout_ms`
-- Default: `1`
-
-## REPL
-
-- Description: Repl settings.
-- Setting: `repl`
-- Default:
-
-```json [settings]
-"repl": {
-  // Maximum number of columns to keep in REPL's scrollback buffer.
-  // Clamped with [20, 512] range.
-  "max_columns": 128,
-  // Maximum number of lines to keep in REPL's scrollback buffer.
-  // Clamped with [4, 256] range.
-  "max_lines": 32
-},
-```
-
-## Theme
-
-- Description: The theme setting can be specified in two forms - either as the name of a theme or as an object containing the `mode`, `dark`, and `light` themes for the Zed UI.
-- Setting: `theme`
-- Default: `One Dark`
-
-### Theme Object
-
-- Description: Specify the theme using an object that includes the `mode`, `dark`, and `light` themes.
-- Setting: `theme`
-- Default:
-
-```json [settings]
-"theme": {
-  "mode": "system",
-  "dark": "One Dark",
-  "light": "One Light"
-},
-```
-
-### Mode
-
-- Description: Specify theme mode.
-- Setting: `mode`
-- Default: `system`
-
-**Options**
-
-1. Set the theme to dark mode
-
-```json [settings]
-{
-  "mode": "dark"
-}
-```
-
-2. Set the theme to light mode
-
-```json [settings]
-{
-  "mode": "light"
-}
-```
-
-3. Set the theme to system mode
-
-```json [settings]
-{
-  "mode": "system"
-}
-```
-
-### Dark
-
-- Description: The name of the dark Zed theme to use for the UI.
-- Setting: `dark`
-- Default: `One Dark`
-
-**Options**
-
-Run the {#action theme_selector::Toggle} action in the command palette to see a current list of valid themes names.
-
-### Light
-
-- Description: The name of the light Zed theme to use for the UI.
-- Setting: `light`
-- Default: `One Light`
-
-**Options**
-
-Run the {#action theme_selector::Toggle} action in the command palette to see a current list of valid themes names.
-
-## Title Bar
-
-- Description: Whether or not to show various elements in the title bar
-- Setting: `title_bar`
-- Default:
-
-```json [settings]
-"title_bar": {
-  "show_branch_icon": false,
-  "show_branch_name": true,
-  "show_project_items": true,
-  "show_onboarding_banner": true,
-  "show_user_picture": true,
-  "show_sign_in": true,
-  "show_menus": false
-}
-```
-
-**Options**
-
-- `show_branch_icon`: Whether to show the branch icon beside branch switcher in the titlebar
-- `show_branch_name`: Whether to show the branch name button in the titlebar
-- `show_project_items`: Whether to show the project host and name in the titlebar
-- `show_onboarding_banner`: Whether to show onboarding banners in the titlebar
-- `show_user_picture`: Whether to show user picture in the titlebar
-- `show_sign_in`: Whether to show the sign in button in the titlebar
-- `show_menus`: Whether to show the menus in the titlebar
-
-## Vim
-
-- Description: Whether or not to enable vim mode.
-- Setting: `vim_mode`
-- Default: `false`
-
-## When Closing With No Tabs
-
-- Description: Whether the window should be closed when using 'close active item' on a window with no tabs
-- Setting: `when_closing_with_no_tabs`
-- Default: `"platform_default"`
-
-**Options**
-
-1. Use platform default behavior:
-
-```json [settings]
-{
-  "when_closing_with_no_tabs": "platform_default"
-}
-```
-
-2. Always close the window:
-
-```json [settings]
-{
-  "when_closing_with_no_tabs": "close_window"
-}
-```
-
-3. Never close the window:
-
-```json [settings]
-{
-  "when_closing_with_no_tabs": "keep_window_open"
-}
-```
-
-## Project Panel
-
-- Description: Customize project panel
-- Setting: `project_panel`
-- Default:
-
-```json [settings]
-{
-  "project_panel": {
-    "button": true,
-    "default_width": 240,
-    "dock": "left",
-    "entry_spacing": "comfortable",
-    "file_icons": true,
-    "folder_icons": true,
-    "git_status": true,
-    "indent_size": 20,
-    "auto_reveal_entries": true,
-    "auto_fold_dirs": true,
-    "drag_and_drop": true,
-    "scrollbar": {
-      "show": null
-    },
-    "sticky_scroll": true,
-    "show_diagnostics": "all",
-    "indent_guides": {
-      "show": "always"
-    },
-    "sort_mode": "directories_first",
-    "hide_root": false,
-    "hide_hidden": false,
-    "starts_open": true,
-    "auto_open": {
-      "on_create": true,
-      "on_paste": true,
-      "on_drop": true
-    }
-  }
-}
-```
-
-### Dock
-
-- Description: Control the position of the dock
-- Setting: `dock`
-- Default: `left`
-
-**Options**
-
-1. Default dock position to left
-
-```json [settings]
-{
-  "dock": "left"
-}
-```
-
-2. Default dock position to right
-
-```json [settings]
-{
-  "dock": "right"
-}
-```
-
-### Entry Spacing
-
-- Description: Spacing between worktree entries
-- Setting: `entry_spacing`
-- Default: `comfortable`
-
-**Options**
-
-1. Comfortable entry spacing
-
-```json [settings]
-{
-  "entry_spacing": "comfortable"
-}
-```
-
-2. Standard entry spacing
-
-```json [settings]
-{
-  "entry_spacing": "standard"
-}
-```
-
-### Git Status
-
-- Description: Indicates newly created and updated files
-- Setting: `git_status`
-- Default: `true`
-
-**Options**
-
-1. Default enable git status
-
-```json [settings]
-{
-  "git_status": true
-}
-```
-
-2. Default disable git status
-
-```json [settings]
-{
-  "git_status": false
-}
-```
-
-### Default Width
-
-- Description: Customize default width taken by project panel
-- Setting: `default_width`
-- Default: `240`
-
-**Options**
-
-`float` values
-
-### Auto Reveal Entries
-
-- Description: Whether to reveal it in the project panel automatically, when a corresponding project entry becomes active. Gitignored entries are never auto revealed.
-- Setting: `auto_reveal_entries`
-- Default: `true`
-
-**Options**
-
-1. Enable auto reveal entries
-
-```json [settings]
-{
-  "auto_reveal_entries": true
-}
-```
-
-2. Disable auto reveal entries
-
-```json [settings]
-{
-  "auto_reveal_entries": false
-}
-```
-
-### Auto Fold Dirs
-
-- Description: Whether to fold directories automatically when directory has only one directory inside.
-- Setting: `auto_fold_dirs`
-- Default: `true`
-
-**Options**
-
-1. Enable auto fold dirs
-
-```json [settings]
-{
-  "auto_fold_dirs": true
-}
-```
-
-2. Disable auto fold dirs
-
-```json [settings]
-{
-  "auto_fold_dirs": false
-}
-```
-
-### Indent Size
-
-- Description: Amount of indentation (in pixels) for nested items.
-- Setting: `indent_size`
-- Default: `20`
-
-### Indent Guides: Show
-
-- Description: Whether to show indent guides in the project panel.
-- Setting: `indent_guides`
-- Default:
-
-```json [settings]
-"indent_guides": {
-  "show": "always"
-}
-```
-
-**Options**
-
-1. Show indent guides in the project panel
-
-```json [settings]
-{
-  "indent_guides": {
-    "show": "always"
-  }
-}
-```
-
-2. Hide indent guides in the project panel
-
-```json [settings]
-{
-  "indent_guides": {
-    "show": "never"
-  }
-}
-```
-
-### Scrollbar: Show
-
-- Description: Whether to show a scrollbar in the project panel. Possible values: null, "auto", "system", "always", "never". Inherits editor settings when absent, see its description for more details.
-- Setting: `scrollbar`
-- Default:
-
-```json [settings]
-"scrollbar": {
-  "show": null
-}
-```
-
-**Options**
-
-1. Show scrollbar in the project panel
-
-```json [settings]
-{
-  "scrollbar": {
-    "show": "always"
-  }
-}
-```
-
-2. Hide scrollbar in the project panel
-
-```json [settings]
-{
-  "scrollbar": {
-    "show": "never"
-  }
-}
-```
-
-### Sort Mode
-
-- Description: Sort order for entries in the project panel
-- Setting: `sort_mode`
-- Default: `directories_first`
-
-**Options**
-
-1. Show directories first, then files
-
-```json [settings]
-{
-  "sort_mode": "directories_first"
-}
-```
-
-2. Mix directories and files together
-
-```json [settings]
-{
-  "sort_mode": "mixed"
-}
-```
-
-3. Show files first, then directories
-
-```json [settings]
-{
-  "sort_mode": "files_first"
-}
-```
-
-### Auto Open
-
-- Description: Control whether files are opened automatically after different creation flows in the project panel.
-- Setting: `auto_open`
-- Default:
-
-```json [settings]
-"auto_open": {
-  "on_create": true,
-  "on_paste": true,
-  "on_drop": true
-}
-```
-
-**Options**
-
-- `on_create`: Whether to automatically open newly created files in the editor.
-- `on_paste`: Whether to automatically open files after pasting or duplicating them.
-- `on_drop`: Whether to automatically open files dropped from external sources.
-
-## Agent
-
-Visit [the Configuration page](./ai/configuration.md) under the AI section to learn more about all the agent-related settings.
-
-## Collaboration Panel
-
-- Description: Customizations for the collaboration panel.
-- Setting: `collaboration_panel`
-- Default:
-
-```json [settings]
-{
-  "collaboration_panel": {
-    "button": true,
-    "dock": "left",
-    "default_width": 240
-  }
-}
-```
-
-**Options**
-
-- `button`: Whether to show the collaboration panel button in the status bar
-- `dock`: Where to dock the collaboration panel. Can be `left` or `right`
-- `default_width`: Default width of the collaboration panel
-
-## Debugger
-
-- Description: Configuration for debugger panel and settings
-- Setting: `debugger`
-- Default:
-
-```json [settings]
-{
-  "debugger": {
-    "stepping_granularity": "line",
-    "save_breakpoints": true,
-    "dock": "bottom",
-    "button": true
-  }
-}
-```
-
-See the [debugger page](./debugger.md) for more information about debugging support within Zed.
-
-## Git Panel
-
-- Description: Setting to customize the behavior of the git panel.
-- Setting: `git_panel`
-- Default:
-
-```json [settings]
-{
-  "git_panel": {
-    "button": true,
-    "dock": "left",
-    "default_width": 360,
-    "status_style": "icon",
-    "fallback_branch_name": "main",
-    "sort_by_path": false,
-    "collapse_untracked_diff": false,
-    "scrollbar": {
-      "show": null
-    }
-  }
-}
-```
-
-**Options**
-
-- `button`: Whether to show the git panel button in the status bar
-- `dock`: Where to dock the git panel. Can be `left` or `right`
-- `default_width`: Default width of the git panel
-- `status_style`: How to display git status. Can be `label_color` or `icon`
-- `fallback_branch_name`: What branch name to use if `init.defaultBranch` is not set
-- `sort_by_path`: Whether to sort entries in the panel by path or by status (the default)
-- `collapse_untracked_diff`: Whether to collapse untracked files in the diff panel
-- `scrollbar`: When to show the scrollbar in the git panel
-
-## Git Hosting Providers
-
-- Description: Register self-hosted GitHub, GitLab, or Bitbucket instances so commit hashes, issue references, and permalinks resolve to the right host.
-- Setting: `git_hosting_providers`
-- Default: `[]`
-
-**Options**
-
-Each entry accepts:
-
-- `provider`: One of `github`, `gitlab`, or `bitbucket`
-- `name`: Display name for the instance
-- `base_url`: Base URL, e.g. `https://git.example.corp`
-
-You can define these in user or project settings; project settings are merged on top of user settings.
-
-```json [settings]
-{
-  "git_hosting_providers": [
-    {
-      "provider": "github",
-      "name": "BigCorp GitHub",
-      "base_url": "https://git.example.corp"
-    }
-  ]
-}
-```
-
-## Outline Panel
-
-- Description: Customize outline Panel
-- Setting: `outline_panel`
-- Default:
-
-```json [settings]
-"outline_panel": {
-  "button": true,
-  "default_width": 300,
-  "dock": "left",
-  "file_icons": true,
-  "folder_icons": true,
-  "git_status": true,
-  "indent_size": 20,
-  "auto_reveal_entries": true,
-  "auto_fold_dirs": true,
-  "indent_guides": {
-    "show": "always"
-  },
-  "scrollbar": {
-    "show": null
-  }
-}
-```
-
-## Calls
-
-- Description: Customize behavior when participating in a call
-- Setting: `calls`
-- Default:
-
-```json [settings]
-"calls": {
-  // Join calls with the microphone live by default
-  "mute_on_join": false,
-  // Share your project when you are the first to join a channel
-  "share_on_join": false
-},
-```
-
-## Colorize Brackets
-
-- Description: Whether to use tree-sitter bracket queries to detect and colorize the brackets in the editor (also known as "rainbow brackets").
-- Setting: `colorize_brackets`
-- Default: `false`
-
-**Options**
-
-`boolean` values
-
-The colors that are used for different indentation levels are defined in the theme (theme key: `accents`). They can be customized by using theme overrides.
-
-## Unnecessary Code Fade
-
-- Description: How much to fade out unused code.
-- Setting: `unnecessary_code_fade`
-- Default: `0.3`
-
-**Options**
-
-Float values between `0.0` and `0.9`, where:
-
-- `0.0` means no fading (unused code looks the same as used code)
-- `0.9` means maximum fading (unused code is very faint but still visible)
-
-**Example**
-
-```json [settings]
-{
-  "unnecessary_code_fade": 0.5
-}
-```
-
-## UI Font Family
-
-- Description: The name of the font to use for text in the UI.
-- Setting: `ui_font_family`
-- Default: `.ZedSans`. This currently aliases to [IBM Plex](https://www.ibm.com/plex/).
-
-**Options**
-
-The name of any font family installed on the system, `".ZedSans"` to use the Zed-provided default, or `".SystemUIFont"` to use the system's default UI font (on macOS and Windows).
-
-## UI Font Features
-
-- Description: The OpenType features to enable for text in the UI.
-- Setting: `ui_font_features`
-- Default:
-
-```json [settings]
-"ui_font_features": {
-  "calt": false
-}
-```
-
-- Platform: macOS and Windows.
-
-**Options**
-
-Zed supports all OpenType features that can be enabled or disabled for a given UI font, as well as setting values for font features.
-
-For example, to disable font ligatures, add the following to your settings:
-
-```json [settings]
-{
-  "ui_font_features": {
-    "calt": false
-  }
-}
-```
-
-You can also set other OpenType features, like setting `cv01` to `7`:
-
-```json [settings]
-{
-  "ui_font_features": {
-    "cv01": 7
-  }
-}
-```
-
-## UI Font Fallbacks
-
-- Description: The font fallbacks to use for text in the UI.
-- Setting: `ui_font_fallbacks`
-- Default: `null`
-- Platform: macOS and Windows.
-
-**Options**
-
-For example, to use `Nerd Font` as a fallback, add the following to your settings:
-
-```json [settings]
-{
-  "ui_font_fallbacks": ["Nerd Font"]
-}
-```
-
-## UI Font Size
-
-- Description: The default font size for text in the UI.
-- Setting: `ui_font_size`
-- Default: `16`
-
-**Options**
-
-`integer` values from `6` to `100` pixels (inclusive)
-
-## UI Font Weight
-
-- Description: The default font weight for text in the UI.
-- Setting: `ui_font_weight`
-- Default: `400`
-
-**Options**
-
-`integer` values between `100` and `900`
-
-## Settings Profiles
-
-- Description: Configure any number of settings profiles that are temporarily applied on top of your existing user settings when selected from `settings profile selector: toggle`.
-- Setting: `profiles`
-- Default: `{}`
-
-In your `settings.json` file, add the `profiles` object.
-Each key within this object is the name of a settings profile, and each value is an object that can include any of Zed's settings.
-
-Example:
-
-```json [settings]
-"profiles": {
-  "Presenting (Dark)": {
-    "agent_buffer_font_size": 18.0,
-    "buffer_font_size": 18.0,
-    "theme": "One Dark",
-    "ui_font_size": 18.0
-  },
-  "Presenting (Light)": {
-    "agent_buffer_font_size": 18.0,
-    "buffer_font_size": 18.0,
-    "theme": "One Light",
-    "ui_font_size": 18.0
-  },
-  "Writing": {
-    "agent_buffer_font_size": 15.0,
-    "buffer_font_size": 15.0,
-    "theme": "Catppuccin Frappé - No Italics",
-    "ui_font_size": 15.0,
-    "tab_bar": { "show": false },
-    "toolbar": { "breadcrumbs": false }
-  }
-}
-```
-
-To preview and enable a settings profile, open the command palette via {#kb command_palette::Toggle} and search for `settings profile selector: toggle`.
-
-## An example configuration:
-
-```json [settings]
-// ~/.config/zed/settings.json
-{
-  "theme": "cave-light",
-  "tab_size": 2,
-  "preferred_line_length": 80,
-  "soft_wrap": "none",
-
-  "buffer_font_size": 18,
-  "buffer_font_family": ".ZedMono",
-
-  "autosave": "on_focus_change",
-  "format_on_save": "off",
-  "vim_mode": false,
-  "projects_online_by_default": true,
-  "terminal": {
-    "font_family": "FiraCode Nerd Font Mono",
-    "blinking": "off"
-  },
-  "languages": {
-    "C": {
-      "format_on_save": "on",
-      "formatter": "language_server",
-      "preferred_line_length": 64,
-      "soft_wrap": "preferred_line_length"
-    }
-  }
-}
-```
diff --git a/docs/src/debugger.md b/docs/src/debugger.md
deleted file mode 100644
index 15094be360..0000000000
--- a/docs/src/debugger.md
+++ /dev/null
@@ -1,370 +0,0 @@
-# Debugger
-
-Zed uses the [Debug Adapter Protocol (DAP)](https://microsoft.github.io/debug-adapter-protocol/) to provide debugging functionality across multiple programming languages.
-DAP is a standardized protocol that defines how debuggers, editors, and IDEs communicate with each other.
-It allows Zed to support various debuggers without needing to implement language-specific debugging logic.
-Zed implements the client side of the protocol, and various _debug adapters_ implement the server side.
-
-This protocol enables features like setting breakpoints, stepping through code, inspecting variables,
-and more, in a consistent manner across different programming languages and runtime environments.
-
-## Supported Languages
-
-To debug code written in a specific language, Zed needs to find a debug adapter for that language. Some debug adapters are provided by Zed without additional setup, and some are provided by [language extensions](./extensions/debugger-extensions.md). The following languages currently have debug adapters available:
-
-<!-- keep this sorted -->
-
-- [C](./languages/c.md#debugging) (built-in)
-- [C++](./languages/cpp.md#debugging) (built-in)
-- [Go](./languages/go.md#debugging) (built-in)
-- [Java](./languages/java.md#debugging) (provided by extension)
-- [JavaScript](./languages/javascript.md#debugging) (built-in)
-- [PHP](./languages/php.md#debugging) (built-in)
-- [Python](./languages/python.md#debugging) (built-in)
-- [Ruby](./languages/ruby.md#debugging) (provided by extension)
-- [Rust](./languages/rust.md#debugging) (built-in)
-- [Swift](./languages/swift.md#debugging) (provided by extension)
-- [TypeScript](./languages/typescript.md#debugging) (built-in)
-
-> If your language isn't listed, you can contribute by adding a debug adapter for it. Check out our [debugger extensions](./extensions/debugger-extensions.md) documentation for more information.
-
-Follow those links for language- and adapter-specific information and examples, or read on for more about Zed's general debugging features that apply to all adapters.
-
-## Getting Started
-
-For most languages, the fastest way to get started is to run {#action debugger::Start} ({#kb debugger::Start}). This opens the _new process modal_, which shows you a contextual list of preconfigured debug tasks for the current project. Debug tasks are created from tests, entry points (like a `main` function), and from other sources — consult the documentation for your language for full information about what's supported.
-
-You can open the same modal by clicking the "plus" button at the top right of the debug panel.
-
-For languages that don't provide preconfigured debug tasks (this includes C, C++, and some extension-supported languages), you can define debug configurations in the `.zed/debug.json` file in your project root. This file should be an array of configuration objects:
-
-```json [debug]
-[
-  {
-    "adapter": "CodeLLDB",
-    "label": "First configuration"
-    // ...
-  },
-  {
-    "adapter": "Debugpy",
-    "label": "Second configuration"
-    // ...
-  }
-]
-```
-
-Check the documentation for your language for example configurations covering typical use-cases. Once you've added configurations to `.zed/debug.json`, they'll appear in the list in the new process modal.
-
-Zed will also load debug configurations from `.vscode/launch.json`, and show them in the new process modal if no configurations are found in `.zed/debug.json`.
-
-#### Global debug configurations
-
-If you run the same launch profiles across multiple projects, you can store them once in your user configuration. Invoke {#action zed::OpenDebugTasks} from the command palette to open the global `debug.json` file; Zed creates it next to your user `settings.json` and keeps it in sync with the debugger UI. The file lives at:
-
-- **macOS:** `~/Library/Application Support/Zed/debug.json`
-- **Linux/BSD:** `$XDG_CONFIG_HOME/zed/debug.json` (falls back to `~/.config/zed/debug.json`)
-- **Windows:** `%APPDATA%\Zed\debug.json`
-
-Populate this file with the same array of objects you would place in `.zed/debug.json`. Any scenarios defined there are merged into every workspace, so your favorite launch presets appear automatically in the "New Debug Session" dialog.
-
-### Launching & Attaching
-
-Zed debugger offers two ways to debug your program; you can either _launch_ a new instance of your program or _attach_ to an existing process.
-Which one you choose depends on what you are trying to achieve.
-
-When launching a new instance, Zed (and the underlying debug adapter) can often do a better job at picking up the debug information compared to attaching to an existing process, since it controls the lifetime of a whole program.
-Running unit tests or a debug build of your application is a good use case for launching.
-
-Compared to launching, attaching to an existing process might seem inferior, but that's far from truth; there are cases where you cannot afford to restart your program, because for example, the bug is not reproducible outside of a production environment or some other circumstances.
-
-## Configuration
-
-Zed requires the `adapter` and `label` fields for all debug tasks. In addition, Zed will use the `build` field to run any necessary setup steps before the debugger starts [(see below)](#build-tasks), and can accept a `tcp_connection` field to connect to an existing process.
-
-All other fields are provided by the debug adapter and can contain [task variables](./tasks.md#variables). Most adapters support `request`, `program`, and `cwd`:
-
-```json [debug]
-[
-  {
-    // The label for the debug configuration and used to identify the debug session inside the debug panel & new process modal
-    "label": "Example Start debugger config",
-    // The debug adapter that Zed should use to debug the program
-    "adapter": "Example adapter name",
-    // Request:
-    //  - launch: Zed will launch the program if specified, or show a debug terminal with the right configuration
-    //  - attach: Zed will attach to a running program to debug it, or when the process_id is not specified, will show a process picker (only supported for node currently)
-    "request": "launch",
-    // The program to debug. This field supports path resolution with ~ or . symbols.
-    "program": "path_to_program",
-    // cwd: defaults to the current working directory of your project ($ZED_WORKTREE_ROOT)
-    "cwd": "$ZED_WORKTREE_ROOT"
-  }
-]
-```
-
-Check your debug adapter's documentation for more information on the fields it supports.
-
-### Build tasks
-
-Zed allows embedding a Zed task in the `build` field that is run before the debugger starts. This is useful for setting up the environment or running any necessary setup steps before the debugger starts.
-
-```json [debug]
-[
-  {
-    "label": "Build Binary",
-    "adapter": "CodeLLDB",
-    "program": "path_to_program",
-    "request": "launch",
-    "build": {
-      "command": "make",
-      "args": ["build", "-j8"]
-    }
-  }
-]
-```
-
-Build tasks can also refer to the existing tasks by unsubstituted label:
-
-```json [debug]
-[
-  {
-    "label": "Build Binary",
-    "adapter": "CodeLLDB",
-    "program": "path_to_program",
-    "request": "launch",
-    "build": "my build task" // Or "my build task for $ZED_FILE"
-  }
-]
-```
-
-### Automatic scenario creation
-
-Given a Zed task, Zed can automatically create a scenario for you. Automatic scenario creation also powers our scenario creation from gutter.
-Automatic scenario creation is currently supported for Rust, Go, Python, JavaScript, and TypeScript.
-
-## Breakpoints
-
-To set a breakpoint, simply click next to the line number in the editor gutter.
-Breakpoints can be tweaked depending on your needs; to access additional options of a given breakpoint, right-click on the breakpoint icon in the gutter and select the desired option.
-At present, you can:
-
-- Add a log to a breakpoint, which will output a log message whenever that breakpoint is hit.
-- Make the breakpoint conditional, which will only stop at the breakpoint when the condition is met. The syntax for conditions is adapter-specific.
-- Add a hit count to a breakpoint, which will only stop at the breakpoint after it's hit a certain number of times.
-- Disable a breakpoint, which will prevent it from being hit while leaving it visible in the gutter.
-
-Some debug adapters (e.g. CodeLLDB and JavaScript) will also _verify_ whether your breakpoints can be hit; breakpoints that cannot be hit are surfaced more prominently in the UI.
-
-All breakpoints enabled for a given project are also listed in "Breakpoints" item in your debugging session UI. From "Breakpoints" item in your UI you can also manage exception breakpoints.
-The debug adapter will then stop whenever an exception of a given kind occurs. Which exception types are supported depends on the debug adapter.
-
-## Settings
-
-The settings for the debugger are grouped under the `debugger` key in `settings.json`:
-
-- `dock`: Determines the position of the debug panel in the UI.
-- `stepping_granularity`: Determines the stepping granularity.
-- `save_breakpoints`: Whether the breakpoints should be reused across Zed sessions.
-- `button`: Whether to show the debug button in the status bar.
-- `timeout`: Time in milliseconds until timeout error when connecting to a TCP debug adapter.
-- `log_dap_communications`: Whether to log messages between active debug adapters and Zed.
-- `format_dap_log_messages`: Whether to format DAP messages when adding them to the debug adapter logger.
-
-### Dock
-
-- Description: The position of the debug panel in the UI.
-- Default: `bottom`
-- Setting: debugger.dock
-
-**Options**
-
-1. `left` - The debug panel will be docked to the left side of the UI.
-2. `right` - The debug panel will be docked to the right side of the UI.
-3. `bottom` - The debug panel will be docked to the bottom of the UI.
-
-```json [settings]
-"debugger": {
-  "dock": "bottom"
-},
-```
-
-### Stepping granularity
-
-- Description: The Step granularity that the debugger will use
-- Default: `line`
-- Setting: `debugger.stepping_granularity`
-
-**Options**
-
-1. Statement - The step should allow the program to run until the current statement has finished executing.
-   The meaning of a statement is determined by the adapter and it may be considered equivalent to a line.
-   For example 'for(int i = 0; i < 10; i++)' could be considered to have 3 statements 'int i = 0', 'i < 10', and 'i++'.
-
-```json [settings]
-{
-  "debugger": {
-    "stepping_granularity": "statement"
-  }
-}
-```
-
-2. Line - The step should allow the program to run until the current source line has executed.
-
-```json [settings]
-{
-  "debugger": {
-    "stepping_granularity": "line"
-  }
-}
-```
-
-3. Instruction - The step should allow one instruction to execute (e.g. one x86 instruction).
-
-```json [settings]
-{
-  "debugger": {
-    "stepping_granularity": "instruction"
-  }
-}
-```
-
-### Save Breakpoints
-
-- Description: Whether the breakpoints should be saved across Zed sessions.
-- Default: `true`
-- Setting: `debugger.save_breakpoints`
-
-**Options**
-
-`boolean` values
-
-```json [settings]
-{
-  "debugger": {
-    "save_breakpoints": true
-  }
-}
-```
-
-### Button
-
-- Description: Whether the button should be displayed in the debugger toolbar.
-- Default: `true`
-- Setting: `debugger.show_button`
-
-**Options**
-
-`boolean` values
-
-```json [settings]
-{
-  "debugger": {
-    "show_button": true
-  }
-}
-```
-
-### Timeout
-
-- Description: Time in milliseconds until timeout error when connecting to a TCP debug adapter.
-- Default: `2000`
-- Setting: `debugger.timeout`
-
-**Options**
-
-`integer` values
-
-```json [settings]
-{
-  "debugger": {
-    "timeout": 3000
-  }
-}
-```
-
-### Inline Values
-
-- Description: Whether to enable editor inlay hints showing the values of variables in your code during debugging sessions.
-- Default: `true`
-- Setting: `inlay_hints.show_value_hints`
-
-**Options**
-
-```json [settings]
-{
-  "inlay_hints": {
-    "show_value_hints": false
-  }
-}
-```
-
-Inline value hints can also be toggled from the Editor Controls menu in the editor toolbar.
-
-### Log Dap Communications
-
-- Description: Whether to log messages between active debug adapters and Zed. (Used for DAP development)
-- Default: false
-- Setting: debugger.log_dap_communications
-
-**Options**
-
-`boolean` values
-
-```json [settings]
-{
-  "debugger": {
-    "log_dap_communications": true
-  }
-}
-```
-
-### Format Dap Log Messages
-
-- Description: Whether to format DAP messages when adding them to the debug adapter logger. (Used for DAP development)
-- Default: false
-- Setting: debugger.format_dap_log_messages
-
-**Options**
-
-`boolean` values
-
-```json [settings]
-{
-  "debugger": {
-    "format_dap_log_messages": true
-  }
-}
-```
-
-### Customizing Debug Adapters
-
-- Description: Custom program path and arguments to override how Zed launches a specific debug adapter.
-- Default: Adapter-specific
-- Setting: `dap.$ADAPTER.binary` and `dap.$ADAPTER.args`
-
-You can pass `binary`, `args`, or both. `binary` should be a path to a _debug adapter_ (like `lldb-dap`) not a _debugger_ (like `lldb` itself). The `args` setting overrides any arguments that Zed would otherwise pass to the adapter.
-
-```json [settings]
-{
-  "dap": {
-    "CodeLLDB": {
-      "binary": "/Users/name/bin/lldb-dap",
-      "args": ["--wait-for-debugger"]
-    }
-  }
-}
-```
-
-## Theme
-
-The Debugger supports the following theme options:
-
-- `debugger.accent`: Color used to accent breakpoint & breakpoint-related symbols
-- `editor.debugger_active_line.background`: Background color of active debug line
-
-## Troubleshooting
-
-If you're running into problems with the debugger, please [open a GitHub issue](https://github.com/zed-industries/zed/issues/new?template=04_bug_debugger.yml), providing as much context as possible. There are also some features you can use to gather more information about the problem:
-
-- When you have a session running in the debug panel, you can run the {#action dev::CopyDebugAdapterArguments} action to copy a JSON blob to the clipboard that describes how Zed initialized the session. This is especially useful when the session failed to start, and is great context to add if you open a GitHub issue.
-- You can also use the {#action dev::OpenDebugAdapterLogs} action to see a trace of all of Zed's communications with debug adapters during the most recent debug sessions.
diff --git a/docs/src/development.md b/docs/src/development.md
deleted file mode 100644
index 31bb245ac4..0000000000
--- a/docs/src/development.md
+++ /dev/null
@@ -1,93 +0,0 @@
-# Developing Zed
-
-See the platform-specific instructions for building Zed from source:
-
-- [macOS](./development/macos.md)
-- [Linux](./development/linux.md)
-- [Windows](./development/windows.md)
-
-If you'd like to develop collaboration features, additionally see:
-
-- [Local Collaboration](./development/local-collaboration.md)
-
-## Keychain access
-
-Zed stores secrets in the system keychain.
-
-However, when running a development build of Zed on macOS (and perhaps other
-platforms) trying to access the keychain results in a lot of keychain prompts
-that require entering your password over and over.
-
-On macOS this is caused by the development build not having a stable identity.
-Even if you choose the "Always Allow" option, the OS will still prompt you for
-your password again the next time something changes in the binary.
-
-This quickly becomes annoying and impedes development speed.
-
-That is why, by default, when running a development build of Zed an alternative
-credential provider is used in order to bypass the system keychain.
-
-> Note: This is **only** the case for development builds. For all non-development
-> release channels the system keychain is always used.
-
-If you need to test something out using the real system keychain in a
-development build, run Zed with the following environment variable set:
-
-```
-ZED_DEVELOPMENT_USE_KEYCHAIN=1
-```
-
-## Performance Measurements
-
-Zed includes a frame time measurement system that can be used to profile how long it takes to render each frame. This is particularly useful when comparing rendering performance between different versions or when optimizing frame rendering code.
-
-### Using ZED_MEASUREMENTS
-
-To enable performance measurements, set the `ZED_MEASUREMENTS` environment variable:
-
-```sh
-export ZED_MEASUREMENTS=1
-```
-
-When enabled, Zed will print frame rendering timing information to stderr, showing how long each frame takes to render.
-
-### Performance Comparison Workflow
-
-Here's a typical workflow for comparing frame rendering performance between different versions:
-
-1. **Enable measurements:**
-
-   ```sh
-   export ZED_MEASUREMENTS=1
-   ```
-
-2. **Test the first version:**
-
-   - Checkout the commit you want to measure
-   - Run Zed in release mode and use it for 5-10 seconds: `cargo run --release &> version-a`
-
-3. **Test the second version:**
-
-   - Checkout another commit you want to compare
-   - Run Zed in release mode and use it for 5-10 seconds: `cargo run --release &> version-b`
-
-4. **Generate comparison:**
-
-   ```sh
-   script/histogram version-a version-b
-   ```
-
-The `script/histogram` tool can accept as many measurement files as you like and will generate a histogram visualization comparing the frame rendering performance data between the provided versions.
-
-### Using `util_macros::perf`
-
-For benchmarking unit tests, annotate them with the `#[perf]` attribute from the `util_macros` crate. Then run `cargo
-perf-test -p $CRATE` to benchmark them. See the rustdoc documentation on `crates/util_macros` and `tooling/perf` for
-in-depth examples and explanations.
-
-## Contributor links
-
-- [CONTRIBUTING.md](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md)
-- [Debugging Crashes](./development/debugging-crashes.md)
-- [Code of Conduct](https://zed.dev/code-of-conduct)
-- [Zed Contributor License](https://zed.dev/cla)
diff --git a/docs/src/development/debuggers.md b/docs/src/development/debuggers.md
deleted file mode 100644
index 11f49390d4..0000000000
--- a/docs/src/development/debuggers.md
+++ /dev/null
@@ -1,113 +0,0 @@
-# Using a debugger
-
-> **DISCLAIMER**: This is not documentation for [configuring Zed's debugger](../debugger.md).
-> Rather, it is intended to provide information on how to use a debugger while developing Zed itself to both Zed employees and external contributors.
-
-## Using Zed's built-in debugger
-
-While the Zed project is open you can open the `New Process Modal` and select the `Debug` tab. There you can see two debug configurations to debug Zed with, one for GDB and one for LLDB. Select the configuration you want and Zed will build and launch the binary.
-
-Please note, GDB isn't supported on arm Macbooks
-
-## Release build profile considerations
-
-By default, builds using the release profile (release is the profile used for production builds, i.e. nightly, preview, and stable) include limited debug info.
-
-This is done by setting the `profile.(release).debug` field in the root `Cargo.toml` field to `"limited"`.
-
-The official documentation for the `debug` field can be found [here](https://doc.rust-lang.org/cargo/reference/profiles.html#debug).
-But the TLDR is that `"limited"` strips type and variable level debug info.
-
-In release builds, this is done to reduce the binary size, as type and variable level debug info is not required, and does not impact the usability of generated stack traces.
-
-However, while the type and variable level debug info is not required for good stack traces, it is very important for a good experience using debuggers,
-as without the type and variable level debug info, the debugger has no way to resolve local variables, inspect them, format them using pretty-printers, etc.
-
-Therefore, in order to use a debugger to it's fullest extent when debugging a release build, you must compile a new Zed binary, with full debug info.
-
-The simplest way to do this, is to use the `--config` flag to override the `debug` field in the root `Cargo.toml` file when running `cargo run` or `cargo build` like so:
-
-```sh
-cargo run --config 'profile.release.debug="full"'
-cargo build --config 'profile.release.debug="full"'
-```
-
-> If you wish to avoid passing the `--config` flag on every invocation of `cargo`. You may also change the section in the [root `Cargo.toml`](https://github.com/zed-industries/zed/blob/main/Cargo.toml)
->
-> from
->
-> ```toml
-> [profile.release]
-> debug = "limited"
-> ```
->
-> to
->
-> ```toml
-> [profile.release]
-> debug = "full"
-> ```
->
-> This will ensure all invocations of `cargo run --release` or `cargo build --release` will compile with full debug info.
->
-> **WARNING:** Make sure to avoid committing these changes!
-
-## Running Zed with a shell debugger GDB/LLDB
-
-### Background
-
-When installing rust through rustup, (the recommended way to do so when developing Zed, see the documentation for getting started on your platform [here](../development.md))
-a few additional scripts are installed and put on your path to assist with debugging binaries compiled with rust.
-
-These are `rust-gdb` and `rust-lldb` respectively.
-
-You can read more information about these scripts and why they are useful [here](https://michaelwoerister.github.io/2015/03/27/rust-xxdb.html) if you are interested.
-
-However, the summary is that they are simple shell scripts that wrap the standard `gdb` and `lldb` commands, injecting the relevant commands and flags to enable additional
-rust-specific features such as pretty-printers and type information.
-
-Therefore, in order to use `rust-gdb` or `rust-lldb`, you must have `gdb` or `lldb` installed on your system. If you don't have them installed, you will need to install them in a manner appropriate for your platform.
-
-According to the [previously linked article](https://michaelwoerister.github.io/2015/03/27/rust-xxdb.html), "The minimum supported debugger versions are GDB 7.7 and LLDB 310. However, the general rule is: the newer the better." Therefore, it is recommended to install the latest version of `gdb` or `lldb` if possible.
-
-> **Note**: `rust-gdb` is not installed by default on Windows, as `gdb` support for windows is not very stable. It is recommended to use `lldb` with `rust-lldb` instead on Windows.
-
-If you are unfamiliar with `gdb` or `lldb`, you can learn more about them [here](https://www.gnu.org/software/gdb/) and [here](https://lldb.llvm.org/) respectively.
-
-### Usage with Zed
-
-After following the steps above for including full debug info when compiling Zed,
-You can either run `rust-gdb` or `rust-lldb` on the compiled Zed binary after building it with `cargo build`, by running one of the following commands:
-
-```
-rust-gdb target/debug/zed
-rust-lldb target/debug/zed
-```
-
-Alternatively, you can attach to a running instance of Zed (such as an instance of Zed started using `cargo run`) by running one of the following commands:
-
-```
-rust-gdb -p <pid>
-rust-lldb -p <pid>
-```
-
-Where `<pid>` is the process ID of the Zed instance you want to attach to.
-
-To get the process ID of a running Zed instance, you can use your systems process management tools such as `Task Manager` on windows or `Activity Monitor` on macOS.
-
-Alternatively, you can run the `ps aux | grep zed` command on macOS and Linux or `Get-Process | Select-Object Id, ProcessName` in an instance of PowerShell on Windows.
-
-#### Debugging Panics and Crashes
-
-Debuggers can be an excellent tool for debugging the cause of panics and crashes in all programs, including Zed.
-
-By default, when a process that `gdb` or `lldb` is attached to hits an exception such as a panic, the debugger will automatically stop at the point of the panic and allow you to inspect the state of the program.
-
-Most likely, the point at which the debugger stops will be deep in the rust standard library panic or exception handling code, so you will need to navigate up the stack trace to find the actual cause of the panic.
-
-This can be accomplished using the `backtrace` command in combination with the `frame select` command in `lldb`, with similar commands available in `gdb`.
-
-Once the program is stopped, you will not be able to continue execution as you can before an exception is hit. However, you can jump around to different stack frames, and inspect the values of variables and expressions
-within each frame, which can be very useful in identifying the root cause of the crash.
-
-You can find additional information on debugging Zed crashes [here](./debugging-crashes.md).
diff --git a/docs/src/development/debugging-crashes.md b/docs/src/development/debugging-crashes.md
deleted file mode 100644
index 9da3f88066..0000000000
--- a/docs/src/development/debugging-crashes.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# Debugging Crashes
-
-When Zed panics or otherwise crashes, Zed sends a message to a sidecar process which inspects the memory of the crashing editor to create a [minidump](https://chromium.googlesource.com/breakpad/breakpad/+/master/docs/getting_started_with_breakpad.md#the-minidump-file-format) file in `~/Library/Logs/Zed` or `$XDG_DATA_HOME/zed/logs`. This minidump can be used to generate backtraces for the stacks of all threads.
-
-If you have enabled Zed's telemetry these will be uploaded to us when you restart the app. They end up in a [Slack channel](https://zed-industries.slack.com/archives/C0977J9MA1Y) and in [Sentry](https://zed-dev.sentry.io/issues) (both of which are Zed-staff-only).
-
-These crash reports contain rich information; but they are hard to read because they don't contain spans or symbol information. You can still work with them locally by downloading sources and an unstripped binary (or separate symbols file) for your Zed release and running:
-
-```sh
-zstd -d ~/.local/share/zed/<uuid>.dmp -o minidump.dmp
-minidump-stackwalk minidump.dmp
-```
-
-Alongside the minidump file in your logs dir, there should be a `<uuid>.json` which contains additional metadata like the panic message, span, and system specs.
-
-## Using a Debugger
-
-If you can reproduce the crash consistently, a debugger can be used to inspect the state of the program at the time of the crash, often providing useful insights into the cause of the crash.
-
-You can read more about setting up and using a debugger with Zed, and specifically for debugging crashes [here](./debuggers.md#debugging-panics-and-crashes)
diff --git a/docs/src/development/freebsd.md b/docs/src/development/freebsd.md
deleted file mode 100644
index 199e653a65..0000000000
--- a/docs/src/development/freebsd.md
+++ /dev/null
@@ -1,51 +0,0 @@
-# Building Zed for FreeBSD
-
-Note, FreeBSD is not currently a supported platform, and so this is a work-in-progress.
-
-## Repository
-
-Clone the [Zed repository](https://github.com/zed-industries/zed).
-
-## Dependencies
-
-- Install the necessary system packages and rustup:
-
-  ```sh
-  script/freebsd
-  ```
-
-  If preferred, you can inspect [`script/freebsd`](https://github.com/zed-industries/zed/blob/main/script/freebsd) and perform the steps manually.
-
-## Building from source
-
-Once the dependencies are installed, you can build Zed using [Cargo](https://doc.rust-lang.org/cargo/).
-
-For a debug build of the editor:
-
-```sh
-cargo run
-```
-
-And to run the tests:
-
-```sh
-cargo test --workspace
-```
-
-In release mode, the primary user interface is the `cli` crate. You can run it in development with:
-
-```sh
-cargo run -p cli
-```
-
-### WebRTC Notice
-
-Currently, building `webrtc-sys` on FreeBSD fails due to missing upstream support and unavailable prebuilt binaries. As a result, some collaboration features (audio calls and screensharing) that depend on WebRTC are temporarily disabled.
-
-See [Issue #15309: FreeBSD Support] and [Discussion #29550: Unofficial FreeBSD port for Zed] for more.
-
-## Troubleshooting
-
-### Cargo errors claiming that a dependency is using unstable features
-
-Try `cargo clean` and `cargo build`.
diff --git a/docs/src/development/glossary.md b/docs/src/development/glossary.md
deleted file mode 100644
index 34172ec9a5..0000000000
--- a/docs/src/development/glossary.md
+++ /dev/null
@@ -1,118 +0,0 @@
-# Zed Development: Glossary
-
-These are some terms and structures frequently used throughout the zed codebase.
-
-This is a best effort list and a work in progress.
-
-<!--
-TBD: Glossary Improvement
-
-Questions:
-
-- Can we generate this list from doc comments throughout zed?
-- We should have a section that shows the various UI parts and their names. (Can't do that in the channel.)
--->
-
-## Naming conventions
-
-These are generally true for the whole codebase. Note that Name can be anything
-here. An example would be `AnyElement` and `LspStore`.
-
-- `AnyName`: A type erased version of _name_. Think `Box<dyn NameTrait>`.
-- `NameStore`: A wrapper type which abstracts over whether operations are running locally or on a remote.
-
-## GPUI
-
-### State management
-
-- `App`: A singleton which holds the full application state including all the entities. Crucially: `App` is not `Send`, which means that `App` only exists on the thread that created it (which is the main/UI thread, usually). Thus, if you see a `&mut App`, know that you're on UI thread.
-- `Context`: A wrapper around the `App` struct with specialized behavior for a specific `Entity`. Think of it as `(&mut App, Entity<V>)`. The specialized behavior is surfaced in the API surface of `Context`. E.g., `App::spawn` takes an `AsyncFnOnce(AsyncApp) -> Ret`, whereas `Context::spawn` takes an `AsyncFnOnce(WeakEntity<V>, AsyncApp) -> Ret`.
-- `AsyncApp`: An owned version of `App` for use in async contexts. This type is _still_ not `Send` (so `AsyncApp` = you're on the main thread) and any use of it may be fallible (to account for the fact that the `App` might've been terminated by the time this closure runs).
-  The convenience of `AsyncApp` lies in the fact that you usually interface with `App` via `&mut App`, which would be inconvenient to use with async closures; `AsyncApp` is owned, so you can use it in async closures with no sweat.
-- `AppContext` A trait which abstracts over `App`, `AsyncApp` & `Context` and their Test versions.
-- `Task`: A future running or scheduled to run on the background or foreground
-  executor. In contradiction to regular Futures Tasks do not need `.await` to start running. You do need to await them to get the result of the task.
-- `Executor`: Used to spawn tasks that run either on the foreground or background thread. Try to run the tasks on the background thread.
-  - `BackgroundExecutor`: A threadpool running `Task`s.
-  - `ForegroundExecutor`: The main thread running `Task`s.
-- `Entity`: A strong, well-typed reference to a struct which is managed by gpui. Effectively a pointer/map key into the `App::EntityMap`.
-- `WeakEntity`: A runtime checked reference to an `Entity` which may no longer exist. Similar to [`std::rc::Weak`](https://doc.rust-lang.org/std/rc/struct.Weak.html).
-- `Global`: A singleton type which has only one value, that is stored in the `App`.
-- `Event`: A datatype which can be send by an `Entity` to subscribers
-- `Action`: An event that represents a user's keyboard input that can be handled by listeners
-  Example: `file finder: toggle`
-- `Observing`: reacting entities notifying they've changed
-- `Subscription`: An event handler that is used to react to the changes of state in the application.
-  1. Emitted event handling
-  2. Observing `{new,release,on notify}` of an entity
-
-### UI
-
-- `View`: An `Entity` which can produce an `Element` through its implementation of `Render`.
-- `Element`: A type that can be laid out and painted to the screen.
-- `element expression`: An expression that builds an element tree, example:
-
-```rust
-h_flex()
-    .id(text[i])
-    .relative()
-    .when(selected, |this| {
-        this.child(
-            div()
-                .h_4()
-                .absolute()
-                etc etc
-```
-
-- `Component`: A builder which can be rendered turning it into an `Element`.
-- `Dispatch tree`: TODO
-- `Focus`: The place where keystrokes are handled first
-- `Focus tree`: Path from the place that has the current focus to the UI Root. Example <img> TODO
-
-## Zed UI
-
-- `Window`: A struct in zed representing a zed window in your desktop environment (see image below). There can be multiple if you have multiple zed instances open. Mostly passed around for rendering.
-- `Modal`: A UI element that floats on top of the rest of the UI
-- `Picker`: A struct representing a list of items in floating on top of the UI (Modal). You can select an item and confirm. What happens on select or confirm is determined by the picker's delegate. (The 'Model' in the image below is a picker.)
-- `PickerDelegate`: A trait used to specialize behavior for a `Picker`. The `Picker` stores the `PickerDelegate` in the field delegate.
-- `Center`: The middle of the zed window, the center is split into multiple `Pane`s. In the codebase this is a field on the `Workspace` struct. (see image below).
-- `Pane`: An area in the `Center` where we can place items, such as an editor, multi-buffer or terminal (see image below).
-- `Panel`: An `Entity` implementing the `Panel` trait. These can be placed in a `Dock`. In the image below we see the: `ProjectPanel` in the left dock, the `DebugPanel` in the bottom dock, and `AgentPanel` in the right dock. Note `Editor` does not implement `Panel` and hence is not a `Panel`.
-- `Dock`: A UI element similar to a `Pane` which can be opened and hidden. There can be up to 3 docks open at a time, left right and below the center. A dock contains one or more `Panel`s not `Pane`s. (see image).
-
-<img width="1921" height="1080" alt="Screenshot for the Pane and Dock features" src="https://github.com/user-attachments/assets/2cb1170e-2850-450d-89bb-73622b5d07b2" />
-
-- `Project`: One or more `Worktree`s
-- `Worktree`: Represents either local or remote files.
-
-<img width="552" height="1118" alt="Screenshot for the Worktree feature" src="https://github.com/user-attachments/assets/da5c58e4-b02e-4038-9736-27e3509fdbfa" />
-
-- [Multibuffer](https://zed.dev/docs/multibuffers): A list of Editors, a multi-buffer allows editing multiple files simultaneously. A multi-buffer opens when an operation in Zed returns multiple locations, examples: _search_ or _go to definition_. See project search in the image below.
-
-<img width="800" height="886" alt="Screenshot for the MultiBuffer feature" src="https://github.com/user-attachments/assets/d59dcecd-8ab6-4172-8fb6-b1fc3c3eaf9d" />
-
-## Editor
-
-- `Editor`: _The_ text editor, nearly everything in zed is an `Editor`, even single line inputs. Each pane in the image above contains one or more `Editor` instances.
-- `Workspace`: The root of the window
-- `Entry`: A file, dir, pending dir or unloaded dir.
-- `Buffer`: The in-memory representation of a 'file' together with relevant data such as syntax trees, git status and diagnostics.
-- `pending selection`: You have mouse down and you're dragging but you have not yet released.
-
-## Collab
-
-- `Collab session`: Multiple users working in a shared `Project`
-- `Upstream client`: The zed client which has shared their workspace
-- `Downstream client`: The zed client joining a shared workspace
-
-## Debugger
-
-- `DapStore`: Is an entity that manages debugger sessions
-- `debugger::Session`: Is an entity that manages the lifecycle of a debug session and communication with DAPS
-- `BreakpointStore`: Is an entity that manages breakpoints states in local and remote instances of Zed
-- `DebugSession`: Manages a debug session's UI and running state
-- `RunningState`: Directly manages all the views of a debug session
-- `VariableList`: The variable and watch list view of a debug session
-- `Console`: TODO
-- `Terminal`: TODO
-- `BreakpointList`: TODO
diff --git a/docs/src/development/linux.md b/docs/src/development/linux.md
deleted file mode 100644
index df3b840fa1..0000000000
--- a/docs/src/development/linux.md
+++ /dev/null
@@ -1,224 +0,0 @@
-# Building Zed for Linux
-
-## Repository
-
-Clone down the [Zed repository](https://github.com/zed-industries/zed).
-
-## Dependencies
-
-- Install [rustup](https://www.rust-lang.org/tools/install)
-
-- Install the necessary system libraries:
-
-  ```sh
-  script/linux
-  ```
-
-  If you prefer to install the system libraries manually, you can find the list of required packages in the `script/linux` file.
-
-### Backend Dependencies (optional) {#backend-dependencies}
-
-If you are looking to develop Zed collaboration features using a local collaboration server, please see: [Local Collaboration](./local-collaboration.md) docs.
-
-### Linkers {#linker}
-
-On Linux, Rust's default linker is [LLVM's `lld`](https://blog.rust-lang.org/2025/09/18/Rust-1.90.0/). Alternative linkers, especially [Wild](https://github.com/davidlattimore/wild) and [Mold](https://github.com/rui314/mold) can significantly improve clean and incremental build time.
-
-At present Zed uses Mold in CI because it's more mature. For local development Wild is recommended because it's 5-20% faster than Mold.
-
-These linkers can be installed with `script/install-mold` and `script/install-wild`.
-
-To use Wild as your default, add these lines to your `~/.cargo/config.toml`:
-
-```toml
-[target.x86_64-unknown-linux-gnu]
-linker = "clang"
-rustflags = ["-C", "link-arg=--ld-path=wild"]
-
-[target.aarch64-unknown-linux-gnu]
-linker = "clang"
-rustflags = ["-C", "link-arg=--ld-path=wild"]
-```
-
-To use Mold as your default:
-
-```toml
-[target.'cfg(target_os = "linux")']
-rustflags = ["-C", "link-arg=-fuse-ld=mold"]
-```
-
-## Building from source
-
-Once the dependencies are installed, you can build Zed using [Cargo](https://doc.rust-lang.org/cargo/).
-
-For a debug build of the editor:
-
-```sh
-cargo run
-```
-
-And to run the tests:
-
-```sh
-cargo test --workspace
-```
-
-In release mode, the primary user interface is the `cli` crate. You can run it in development with:
-
-```sh
-cargo run -p cli
-```
-
-## Installing a development build
-
-You can install a local build on your machine with:
-
-```sh
-./script/install-linux
-```
-
-This will build zed and the cli in release mode and make them available at `~/.local/bin/zed`, installing .desktop files to `~/.local/share`.
-
-> **_Note_**: If you encounter linker errors similar to the following:
->
-> ```bash
-> error: linking with `cc` failed: exit status: 1 ...
-> = note: /usr/bin/ld: /tmp/rustcISMaod/libaws_lc_sys-79f08eb6d32e546e.rlib(f8e4fd781484bd36-bcm.o): in function `aws_lc_0_25_0_handle_cpu_env':
->           /aws-lc/crypto/fipsmodule/cpucap/cpu_intel.c:(.text.aws_lc_0_25_0_handle_cpu_env+0x63): undefined reference to `__isoc23_sscanf'
->           /usr/bin/ld: /tmp/rustcISMaod/libaws_lc_sys-79f08eb6d32e546e.rlib(f8e4fd781484bd36-bcm.o): in function `pkey_rsa_ctrl_str':
->           /aws-lc/crypto/fipsmodule/evp/p_rsa.c:741:(.text.pkey_rsa_ctrl_str+0x20d): undefined reference to `__isoc23_strtol'
->           /usr/bin/ld: /aws-lc/crypto/fipsmodule/evp/p_rsa.c:752:(.text.pkey_rsa_ctrl_str+0x258): undefined reference to `__isoc23_strtol'
->           collect2: error: ld returned 1 exit status
->   = note: some `extern` functions couldn't be found; some native libraries may need to be installed or have their path specified
->   = note: use the `-l` flag to specify native libraries to link
->   = note: use the `cargo:rustc-link-lib` directive to specify the native libraries to link with Cargo (see https://doc.rust-lang.org/cargo/reference/build-scripts.html#rustc-link-lib)
-> error: could not compile `remote_server` (bin "remote_server") due to 1 previous error
-> ```
->
-> **Cause**:
-> this is caused by known bugs in aws-lc-rs(doesn't support GCC >= 14): [FIPS fails to build with GCC >= 14](https://github.com/aws/aws-lc-rs/issues/569)
-> & [GCC-14 - build failure for FIPS module](https://github.com/aws/aws-lc/issues/2010)
->
-> You can refer to [linux: Linker error for remote_server when using script/install-linux](https://github.com/zed-industries/zed/issues/24880) for more information.
->
-> **Workarounds**:
-> Set the remote server target to `x86_64-unknown-linux-gnu` like so `export REMOTE_SERVER_TARGET=x86_64-unknown-linux-gnu; script/install-linux`
-
-## Wayland & X11
-
-Zed supports both X11 and Wayland. By default, we pick whichever we can find at runtime. If you're on Wayland and want to run in X11 mode, use the environment variable `WAYLAND_DISPLAY=''`.
-
-## Notes for packaging Zed
-
-Thank you for taking on the task of packaging Zed!
-
-### Technical requirements
-
-Zed has two main binaries:
-
-- You will need to build `crates/cli` and make its binary available in `$PATH` with the name `zed`.
-- You will need to build `crates/zed` and put it at `$PATH/to/cli/../../libexec/zed-editor`. For example, if you are going to put the cli at `~/.local/bin/zed` put zed at `~/.local/libexec/zed-editor`. As some linux distributions (notably Arch) discourage the use of `libexec`, you can also put this binary at `$PATH/to/cli/../../lib/zed/zed-editor` (e.g. `~/.local/lib/zed/zed-editor`) instead.
-- If you are going to provide a `.desktop` file you can find a template in `crates/zed/resources/zed.desktop.in`, and use `envsubst` to populate it with the values required. This file should also be renamed to `$APP_ID.desktop` so that the file [follows the FreeDesktop standards](https://github.com/zed-industries/zed/issues/12707#issuecomment-2168742761). You should also make this desktop file executable (`chmod 755`).
-- You will need to ensure that the necessary libraries are installed. You can get the current list by [inspecting the built binary](https://github.com/zed-industries/zed/blob/935cf542aebf55122ce6ed1c91d0fe8711970c82/script/bundle-linux#L65-L67) on your system.
-- For an example of a complete build script, see [script/bundle-linux](https://github.com/zed-industries/zed/blob/935cf542aebf55122ce6ed1c91d0fe8711970c82/script/bundle-linux).
-- You can disable Zed's auto updates and provide instructions for users who try to update Zed manually by building (or running) Zed with the environment variable `ZED_UPDATE_EXPLANATION`. For example: `ZED_UPDATE_EXPLANATION="Please use flatpak to update zed."`.
-- Make sure to update the contents of the `crates/zed/RELEASE_CHANNEL` file to 'nightly', 'preview', or 'stable', with no newline. This will cause Zed to use the credentials manager to remember a user's login.
-
-### Other things to note
-
-At Zed, our priority has been to move fast and bring the latest technology to our users. We've long been frustrated at having software that is slow, out of date, or hard to configure, and so we've built our editor to those tastes.
-
-However, we realize that many distros have other priorities. We want to work with everyone to bring Zed to their favorite platforms. But there is a long way to go:
-
-- Zed is a fast-moving early-phase project. We typically release 2-3 builds per week to fix user-reported issues and release major features.
-- There are a couple of other `zed` binaries that may be present on Linux systems ([1](https://openzfs.github.io/openzfs-docs/man/v2.2/8/zed.8.html), [2](https://zed.brimdata.io/docs/commands/zed)). If you want to rename our CLI binary because of these issues, we suggest `zedit`, `zeditor`, or `zed-cli`.
-- Zed automatically installs the correct version of common developer tools in the same way as rustup/rbenv/pyenv, etc. We understand this is contentious, [see here](https://github.com/zed-industries/zed/issues/12589).
-- We allow users to install extensions locally and from [zed-industries/extensions](https://github.com/zed-industries/extensions). These extensions may install further tooling as needed, such as language servers. In the long run, we would like to make this safer, [see here](https://github.com/zed-industries/zed/issues/12358).
-- Zed connects to several online services by default (AI, telemetry, collaboration). AI and our telemetry can be disabled by your users with their zed settings or by patching our [default settings file](https://github.com/zed-industries/zed/blob/main/assets/settings/default.json).
-- As a result of the above issues, zed currently does not play nice with sandboxes, [see here](https://github.com/zed-industries/zed/pull/12006#issuecomment-2130421220)
-
-## Flatpak
-
-> Zed's current Flatpak integration exits the sandbox on startup. Workflows that rely on Flatpak's sandboxing may not work as expected.
-
-To build & install the Flatpak package locally follow the steps below:
-
-1. Install Flatpak for your distribution as outlined [here](https://flathub.org/setup).
-2. Run the `script/flatpak/deps` script to install the required dependencies.
-3. Run `script/flatpak/bundle-flatpak`.
-4. Now the package has been installed and has a bundle available at `target/release/{app-id}.flatpak`.
-
-## Memory profiling
-
-[`heaptrack`](https://github.com/KDE/heaptrack) is quite useful for diagnosing memory leaks. To install it:
-
-```sh
-$ sudo apt install heaptrack heaptrack-gui
-$ cargo install cargo-heaptrack
-```
-
-Then, to build and run Zed with the profiler attached:
-
-```sh
-$ cargo heaptrack -b zed
-```
-
-When this zed instance is exited, terminal output will include a command to run `heaptrack_interpret` to convert the `*.raw.zst` profile to a `*.zst` file which can be passed to `heaptrack_gui` for viewing.
-
-## Perf recording
-
-How to get a flamegraph with resolved symbols from a running zed instance. Use
-when zed is using a lot of CPU. Not useful for hangs.
-
-### During the incident
-
-- Find the PID (process ID) using:
-  `ps -eo size,pid,comm | grep zed | sort | head -n 1 | cut -d ' ' -f 2`
-  Or find the pid of the command zed-editor with the most ram usage in something
-  like htop/btop/top.
-
-- Install perf:
-  On Ubuntu (derivatives) run `sudo apt install linux-tools`.
-
-- Perf Record:
-  run `sudo perf record -p <pid you just found>`, wait a few seconds to gather data then press Ctrl+C. You should now have a perf.data file
-
-- Make the output file user owned:
-  run `sudo chown $USER:$USER perf.data`
-
-- Get build info:
-  Run zed again and type `zed: about` in the command pallet to get the exact commit.
-
-The `data.perf` file can be send to zed together with the exact commit.
-
-### Later
-
-This can be done by Zed staff.
-
-- Build Zed with symbols:
-  Check out the commit found previously and modify `Cargo.toml`.
-  Apply the following diff then make a release build.
-
-```diff
-[profile.release]
--debug = "limited"
-+debug = "full"
-```
-
-- Add the symbols to perf database:
-  `pref buildid-cache -v -a <path to release zed binary>`
-
-- Resolve the symbols from the db:
-  `perf inject -i perf.data -o perf_with_symbols.data`
-
-- Install flamegraph:
-  `cargo install cargo-flamegraph`
-
-- Render the flamegraph:
-  `flamegraph --perfdata perf_with_symbols.data`
-
-## Troubleshooting
-
-### Cargo errors claiming that a dependency is using unstable features
-
-Try `cargo clean` and `cargo build`.
diff --git a/docs/src/development/local-collaboration.md b/docs/src/development/local-collaboration.md
deleted file mode 100644
index 393c6f0bbf..0000000000
--- a/docs/src/development/local-collaboration.md
+++ /dev/null
@@ -1,207 +0,0 @@
-# Local Collaboration
-
-1. Ensure you have access to our cloud infrastructure. If you don't have access, you can't collaborate locally at this time.
-
-2. Make sure you've installed Zed's dependencies for your platform:
-
-- [macOS](#macos)
-- [Linux](#linux)
-- [Windows](#backend-windows)
-
-Note that `collab` can be compiled only with MSVC toolchain on Windows
-
-3. Clone down our cloud repository and follow the instructions in the cloud README
-
-4. Setup the local database for your platform:
-
-- [macOS & Linux](#database-unix)
-- [Windows](#database-windows)
-
-5. Run collab:
-
-- [macOS & Linux](#run-collab-unix)
-- [Windows](#run-collab-windows)
-
-## Backend Dependencies
-
-If you are developing collaborative features of Zed, you'll need to install the dependencies of zed's `collab` server:
-
-- PostgreSQL
-- LiveKit
-- Foreman
-
-You can install these dependencies natively or run them under Docker.
-
-### macOS
-
-1. Install [Postgres.app](https://postgresapp.com) or [postgresql via homebrew](https://formulae.brew.sh/formula/postgresql@15):
-
-   ```sh
-   brew install postgresql@15
-   ```
-
-2. Install [Livekit](https://formulae.brew.sh/formula/livekit) and [Foreman](https://formulae.brew.sh/formula/foreman)
-
-   ```sh
-   brew install livekit foreman
-   ```
-
-- Follow the steps in the [collab README](https://github.com/zed-industries/zed/blob/main/crates/collab/README.md) to configure the Postgres database for integration tests
-
-Alternatively, if you have [Docker](https://www.docker.com/) installed you can bring up all the `collab` dependencies using Docker Compose.
-
-### Linux
-
-1. Install [Postgres](https://www.postgresql.org/download/linux/)
-
-   ```sh
-   sudo apt-get install postgresql                    # Ubuntu/Debian
-   sudo pacman -S postgresql                          # Arch Linux
-   sudo dnf install postgresql postgresql-server      # RHEL/Fedora
-   sudo zypper install postgresql postgresql-server   # OpenSUSE
-   ```
-
-2. Install [Livekit](https://github.com/livekit/livekit-cli)
-
-   ```sh
-   curl -sSL https://get.livekit.io/cli | bash
-   ```
-
-3. Install [Foreman](https://theforeman.org/manuals/3.15/quickstart_guide.html)
-
-### Windows {#backend-windows}
-
-> This section is still in development. The instructions are not yet complete.
-
-- Install [Postgres](https://www.postgresql.org/download/windows/)
-- Install [Livekit](https://github.com/livekit/livekit), optionally you can add the `livekit-server` binary to your `PATH`.
-
-Alternatively, if you have [Docker](https://www.docker.com/) installed you can bring up all the `collab` dependencies using Docker Compose.
-
-### Docker {#Docker}
-
-If you have docker or podman available, you can run the backend dependencies inside containers with Docker Compose:
-
-```sh
-docker compose up -d
-```
-
-## Database setup
-
-Before you can run the `collab` server locally, you'll need to set up a `zed` Postgres database.
-
-### On macOS and Linux {#database-unix}
-
-```sh
-script/bootstrap
-```
-
-This script will set up the `zed` Postgres database, and populate it with some users. It requires internet access, because it fetches some users from the GitHub API.
-
-The script will seed the database with various content defined by:
-
-```sh
-cat crates/collab/seed.default.json
-```
-
-To use a different set of admin users, you can create your own version of that json file and export the `SEED_PATH` environment variable. Note that the usernames listed in the admins list currently must correspond to valid GitHub users.
-
-```json [settings]
-{
-  "admins": ["admin1", "admin2"],
-  "channels": ["zed"]
-}
-```
-
-### On Windows {#database-windows}
-
-```powershell
-.\script\bootstrap.ps1
-```
-
-## Testing collaborative features locally
-
-### On macOS and Linux {#run-collab-unix}
-
-Ensure that Postgres is configured and running, then run Zed's collaboration server and the `livekit` dev server:
-
-```sh
-foreman start
-# OR
-docker compose up
-```
-
-Alternatively, if you're not testing voice and screenshare, you can just run `collab` and `cloud`, and not the `livekit` dev server:
-
-```sh
-cargo run -p collab -- serve all
-```
-
-```sh
-cd ../cloud; cargo make dev
-```
-
-In a new terminal, run two or more instances of Zed.
-
-```sh
-script/zed-local -3
-```
-
-This script starts one to four instances of Zed, depending on the `-2`, `-3` or `-4` flags. Each instance will be connected to the local `collab` server, signed in as a different user from `.admins.json` or `.admins.default.json`.
-
-### On Windows {#run-collab-windows}
-
-Since `foreman` is not available on Windows, you can run the following commands in separate terminals:
-
-```powershell
-cargo run --package=collab -- serve all
-```
-
-If you have added the `livekit-server` binary to your `PATH`, you can run:
-
-```powershell
-livekit-server --dev
-```
-
-Otherwise,
-
-```powershell
-.\path\to\livekit-serve.exe --dev
-```
-
-You'll also need to start the cloud server:
-
-```powershell
-cd ..\cloud; cargo make dev
-```
-
-In a new terminal, run two or more instances of Zed.
-
-```powershell
-node .\script\zed-local -2
-```
-
-Note that this requires `node.exe` to be in your `PATH`.
-
-## Running a local collab server
-
-> [!NOTE]
-> Because of recent changes to our authentication system, Zed will not be able to authenticate itself with, and therefore use, a local collab server.
-
-If you want to run your own version of the zed collaboration service, you can, but note that this is still under development, and there is no support for authentication nor extensions.
-
-Configuration is done through environment variables. By default it will read the configuration from [`.env.toml`](https://github.com/zed-industries/zed/blob/main/crates/collab/.env.toml) and you should use that as a guide for setting this up.
-
-By default Zed assumes that the DATABASE_URL is a Postgres database, but you can make it use Sqlite by compiling with `--features sqlite` and using a sqlite DATABASE_URL with `?mode=rwc`.
-
-To authenticate you must first configure the server by creating a seed.json file that contains at a minimum your github handle. This will be used to create the user on demand.
-
-```json [settings]
-{
-  "admins": ["nathansobo"]
-}
-```
-
-By default the collab server will seed the database when first creating it, but if you want to add more users you can explicitly reseed them with `SEED_PATH=./seed.json cargo run -p collab seed`
-
-Then when running the zed client you must specify two environment variables, `ZED_ADMIN_API_TOKEN` (which should match the value of `API_TOKEN` in .env.toml) and `ZED_IMPERSONATE` (which should match one of the users in your seed.json)
diff --git a/docs/src/development/macos.md b/docs/src/development/macos.md
deleted file mode 100644
index 9c99e5f8da..0000000000
--- a/docs/src/development/macos.md
+++ /dev/null
@@ -1,150 +0,0 @@
-# Building Zed for macOS
-
-## Repository
-
-Clone down the [Zed repository](https://github.com/zed-industries/zed).
-
-## Dependencies
-
-- Install [rustup](https://www.rust-lang.org/tools/install)
-
-- Install [Xcode](https://apps.apple.com/us/app/xcode/id497799835?mt=12) from the macOS App Store, or from the [Apple Developer](https://developer.apple.com/download/all/) website. Note this requires a developer account.
-
-> Ensure you launch Xcode after installing, and install the macOS components, which is the default option.
-
-- Install [Xcode command line tools](https://developer.apple.com/xcode/resources/)
-
-  ```sh
-  xcode-select --install
-  ```
-
-- Ensure that the Xcode command line tools are using your newly installed copy of Xcode:
-
-  ```sh
-  sudo xcode-select --switch /Applications/Xcode.app/Contents/Developer
-  sudo xcodebuild -license accept
-  ```
-
-- Install `cmake` (required by [a dependency](https://docs.rs/wasmtime-c-api-impl/latest/wasmtime_c_api/))
-
-  ```sh
-  brew install cmake
-  ```
-
-### Backend Dependencies (optional) {#backend-dependencies}
-
-If you are looking to develop Zed collaboration features using a local collaboration server, please see: [Local Collaboration](./local-collaboration.md) docs.
-
-## Building Zed from Source
-
-Once you have the dependencies installed, you can build Zed using [Cargo](https://doc.rust-lang.org/cargo/).
-
-For a debug build:
-
-```sh
-cargo run
-```
-
-For a release build:
-
-```sh
-cargo run --release
-```
-
-And to run the tests:
-
-```sh
-cargo test --workspace
-```
-
-## Troubleshooting
-
-### Error compiling metal shaders
-
-```sh
-error: failed to run custom build command for gpui v0.1.0 (/Users/path/to/zed)`**
-
-xcrun: error: unable to find utility "metal", not a developer tool or in PATH
-```
-
-Try `sudo xcode-select --switch /Applications/Xcode.app/Contents/Developer`
-
-If you're on macOS 26, try `xcodebuild -downloadComponent MetalToolchain`
-
-### Cargo errors claiming that a dependency is using unstable features
-
-Try `cargo clean` and `cargo build`.
-
-### Error: 'dispatch/dispatch.h' file not found
-
-If you encounter an error similar to:
-
-```sh
-src/platform/mac/dispatch.h:1:10: fatal error: 'dispatch/dispatch.h' file not found
-
-Caused by:
-  process didn't exit successfully
-
-  --- stdout
-  cargo:rustc-link-lib=framework=System
-  cargo:rerun-if-changed=src/platform/mac/dispatch.h
-  cargo:rerun-if-env-changed=TARGET
-  cargo:rerun-if-env-changed=BINDGEN_EXTRA_CLANG_ARGS_aarch64-apple-darwin
-  cargo:rerun-if-env-changed=BINDGEN_EXTRA_CLANG_ARGS_aarch64_apple_darwin
-  cargo:rerun-if-env-changed=BINDGEN_EXTRA_CLANG_ARGS
-```
-
-This file is part of Xcode. Ensure you have installed the Xcode command line tools and set the correct path:
-
-```sh
-xcode-select --install
-sudo xcode-select --switch /Applications/Xcode.app/Contents/Developer
-```
-
-Additionally, set the `BINDGEN_EXTRA_CLANG_ARGS` environment variable:
-
-```sh
-export BINDGEN_EXTRA_CLANG_ARGS="--sysroot=$(xcrun --show-sdk-path)"
-```
-
-Then clean and rebuild the project:
-
-```sh
-cargo clean
-cargo run
-```
-
-### Tests failing due to `Too many open files (os error 24)`
-
-This error seems to be caused by OS resource constraints. Installing and running tests with `cargo-nextest` should resolve the issue.
-
-- `cargo install cargo-nextest --locked`
-- `cargo nextest run --workspace --no-fail-fast`
-
-## Tips & Tricks
-
-### Avoiding continual rebuilds
-
-If you are finding that Zed is continually rebuilding root crates, it may be because
-you are pointing your development Zed at the codebase itself.
-
-This causes problems because `cargo run` exports a bunch of environment
-variables which are picked up by the `rust-analyzer` that runs in the development
-build of Zed. These environment variables are in turn passed to `cargo check`, which
-invalidates the build cache of some of the crates we depend on.
-
-You can easily avoid running the built binary on the checked-out Zed codebase using `cargo run
-~/path/to/other/project` to ensure that you don't hit this.
-
-### Speeding up verification
-
-If you are building Zed a lot, you may find that macOS continually verifies new
-builds which can add a few seconds to your iteration cycles.
-
-To fix this, you can:
-
-- Run `sudo spctl developer-mode enable-terminal` to enable the Developer Tools panel in System Settings.
-- In System Settings, search for "Developer Tools" and add your terminal (e.g. iTerm or Ghostty) to the list under "Allow applications to use developer tools"
-- Restart your terminal.
-
-Thanks to the nextest developers for publishing [this](https://nexte.st/docs/installation/macos/#gatekeeper).
diff --git a/docs/src/development/release-notes.md b/docs/src/development/release-notes.md
deleted file mode 100644
index 90e1ad21b1..0000000000
--- a/docs/src/development/release-notes.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# Release Notes
-
-Whenever you open a pull request, the body is automatically populated based on this [pull request template](https://github.com/zed-industries/zed/blob/main/.github/pull_request_template.md).
-
-```md
-...
-
-Release Notes:
-
-- N/A _or_ Added/Fixed/Improved ...
-```
-
-On Wednesdays, we run a [`get-preview-channel-changes`](https://github.com/zed-industries/zed/blob/main/script/get-preview-channel-changes) script that scrapes `Release Notes` lines from pull requests landing in preview, as documented in our [Release](https://zed.dev/docs/development/release-notes) docs.
-
-The script outputs everything below the `Release Notes` line, including additional data such as the pull request author (if not a Zed team member) and a link to the pull request.
-If you use `N/A`, the script skips your pull request entirely.
-
-## Guidelines for crafting your `Release Notes` line(s)
-
-- A `Release Notes` line should only be written if the user can see or feel the difference in Zed.
-- A `Release Notes` line should be written such that a Zed user can understand what the change is.
-  Don't assume a user knows technical editor developer lingo; phrase your change in language they understand as a user of a text editor.
-- If you want to include technical details about your pull request for other team members to see, do so above the `Release Notes` line.
-- Changes to docs should be labeled as `N/A`.
-- If your pull request adds/changes a setting or a keybinding, always mention that setting or keybinding.
-  Don't make the user dig into docs or the pull request to find this information (although it should be included in docs as well).
-- For pull requests that are reverts:
-  - If the item being reverted **has already been shipped**, include a `Release Notes` line explaining why we reverted, as this is a breaking change.
-  - If the item being reverted **hasn't been shipped**, edit the original PR's `Release Notes` line to be `N/A`; otherwise, it will be included and the compiler of the release notes may not know to skip it, leading to a potentially-awkward situation where we are stating we shipped something we actually didn't.
diff --git a/docs/src/development/windows.md b/docs/src/development/windows.md
deleted file mode 100644
index 17382e0bee..0000000000
--- a/docs/src/development/windows.md
+++ /dev/null
@@ -1,259 +0,0 @@
-# Building Zed for Windows
-
-> The following commands may be executed in any shell.
-
-## Repository
-
-Clone down the [Zed repository](https://github.com/zed-industries/zed).
-
-## Dependencies
-
-- Install [rustup](https://www.rust-lang.org/tools/install)
-
-- Install either [Visual Studio](https://visualstudio.microsoft.com/downloads/) with the optional components `MSVC v*** - VS YYYY C++ x64/x86 build tools` and `MSVC v*** - VS YYYY C++ x64/x86 Spectre-mitigated libs (latest)` (`v***` is your VS version and `YYYY` is year when your VS was released. Pay attention to the architecture and change it to yours if needed.)
-- Or, if you prefer to have a slimmer installer of only the MSVC compiler tools, you can install the [build tools](https://visualstudio.microsoft.com/visual-cpp-build-tools/) (+libs as above) and the "Desktop development with C++" workload.
-  But beware this installation is not automatically picked up by rustup. You must initialize your environment variables by first launching the "developer" shell (cmd/powershell) this installation places in the start menu or in Windows Terminal and then compile.
-- Install Windows 11 or 10 SDK depending on your system, but ensure that at least `Windows 10 SDK version 2104 (10.0.20348.0)` is installed on your machine. You can download it from the [Windows SDK Archive](https://developer.microsoft.com/windows/downloads/windows-sdk/)
-- Install [CMake](https://cmake.org/download) (required by [a dependency](https://docs.rs/wasmtime-c-api-impl/latest/wasmtime_c_api/)). Or you can install it through Visual Studio Installer, then manually add the `bin` directory to your `PATH`, for example: `C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin`.
-
-If you can't compile Zed, make sure that you have at least the following components installed in case of a Visual Studio installation:
-
-```json [settings]
-{
-  "version": "1.0",
-  "components": [
-    "Microsoft.VisualStudio.Component.CoreEditor",
-    "Microsoft.VisualStudio.Workload.CoreEditor",
-    "Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
-    "Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake",
-    "Microsoft.VisualStudio.Component.VC.CMake.Project",
-    "Microsoft.VisualStudio.Component.Windows11SDK.26100",
-    "Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre"
-  ],
-  "extensions": []
-}
-```
-
-Or if in case of just Build Tools, the following components:
-
-```json [settings]
-{
-  "version": "1.0",
-  "components": [
-    "Microsoft.VisualStudio.Component.Roslyn.Compiler",
-    "Microsoft.Component.MSBuild",
-    "Microsoft.VisualStudio.Component.CoreBuildTools",
-    "Microsoft.VisualStudio.Workload.MSBuildTools",
-    "Microsoft.VisualStudio.Component.Windows10SDK",
-    "Microsoft.VisualStudio.Component.VC.CoreBuildTools",
-    "Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
-    "Microsoft.VisualStudio.Component.VC.Redist.14.Latest",
-    "Microsoft.VisualStudio.Component.Windows11SDK.26100",
-    "Microsoft.VisualStudio.Component.VC.CMake.Project",
-    "Microsoft.VisualStudio.Component.TextTemplating",
-    "Microsoft.VisualStudio.Component.VC.CoreIde",
-    "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core",
-    "Microsoft.VisualStudio.Workload.VCTools",
-    "Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre"
-  ],
-  "extensions": []
-}
-```
-
-The list can be obtained as follows:
-
-- Open the Visual Studio Installer
-- Click on `More` in the `Installed` tab
-- Click on `Export configuration`
-
-### Backend Dependencies (optional) {#backend-dependencies}
-
-If you are looking to develop Zed collaboration features using a local collaboration server, please see: [Local Collaboration](./local-collaboration.md) docs.
-
-### Notes
-
-You should modify the `pg_hba.conf` file in the `data` directory to use `trust` instead of `scram-sha-256` for the `host` method. Otherwise, the connection will fail with the error `password authentication failed`. The `pg_hba.conf` file typically locates at `C:\Program Files\PostgreSQL\17\data\pg_hba.conf`. After the modification, the file should look like this:
-
-```conf
-# IPv4 local connections:
-host    all             all             127.0.0.1/32            trust
-# IPv6 local connections:
-host    all             all             ::1/128                 trust
-```
-
-Also, if you are using a non-latin Windows version, you must modify the`lc_messages` parameter in the `postgresql.conf` file in the `data` directory to `English_United States.1252` (or whatever UTF8-compatible encoding you have). Otherwise, the database will panic. The `postgresql.conf` file should look like this:
-
-```conf
-# lc_messages = 'Chinese (Simplified)_China.936' # locale for system error message strings
-lc_messages = 'English_United States.1252'
-```
-
-After this, you should restart the `postgresql` service. Press the `win` key + `R` to launch the `Run` window. Type the `services.msc` and hit the `OK` button to open the Services Manager. Then, find the `postgresql-x64-XX` service, right-click on it, and select `Restart`.
-
-## Building from source
-
-Once you have the dependencies installed, you can build Zed using [Cargo](https://doc.rust-lang.org/cargo/).
-
-For a debug build:
-
-```sh
-cargo run
-```
-
-For a release build:
-
-```sh
-cargo run --release
-```
-
-And to run the tests:
-
-```sh
-cargo test --workspace
-```
-
-## Installing from msys2
-
-Zed does not support unofficial MSYS2 Zed packages built for Mingw-w64. Please report any issues you may have with [mingw-w64-zed](https://packages.msys2.org/base/mingw-w64-zed) to [msys2/MINGW-packages/issues](https://github.com/msys2/MINGW-packages/issues?q=is%3Aissue+is%3Aopen+zed).
-
-Please refer to [MSYS2 documentation](https://www.msys2.org/docs/ides-editors/#zed) first.
-
-## Troubleshooting
-
-### Setting `RUSTFLAGS` env var breaks builds
-
-If you set the `RUSTFLAGS` env var, it will override the `rustflags` settings in `.cargo/config.toml` which is required to properly build Zed.
-
-Since these settings can vary from time to time, the build errors you receive may vary from linker errors, to other stranger errors.
-
-If you'd like to add extra rust flags, you may do 1 of the following in `.cargo/config.toml`:
-
-Add your flags in the build section
-
-```toml
-[build]
-rustflags = ["-C", "symbol-mangling-version=v0", "--cfg", "tokio_unstable"]
-```
-
-Add your flags in the windows target section
-
-```toml
-[target.'cfg(target_os = "windows")']
-rustflags = [
-    "--cfg",
-    "windows_slim_errors",
-    "-C",
-    "target-feature=+crt-static",
-]
-```
-
-Or, you can create a new `.cargo/config.toml` in the same folder as the Zed repo (see below). This is particularly useful if you are doing CI builds since you don't have to edit the original `.cargo/config.toml`.
-
-```
-upper_dir
-├── .cargo          // <-- Make this folder
-│   └── config.toml // <-- Make this file
-└── zed
-    ├── .cargo
-    │   └── config.toml
-    └── crates
-        ├── assistant
-        └── ...
-```
-
-In the new (above) `.cargo/config.toml`, if we wanted to add `--cfg gles` to our rustflags, it would look like this
-
-```toml
-[target.'cfg(all())']
-rustflags = ["--cfg", "gles"]
-```
-
-### Cargo errors claiming that a dependency is using unstable features
-
-Try `cargo clean` and `cargo build`.
-
-### `STATUS_ACCESS_VIOLATION`
-
-This error can happen if you are using the "rust-lld.exe" linker. Consider trying a different linker.
-
-If you are using a global config, consider moving the Zed repository to a nested directory and add a `.cargo/config.toml` with a custom linker config in the parent directory.
-
-See this issue for more information [#12041](https://github.com/zed-industries/zed/issues/12041)
-
-### Invalid RC path selected
-
-Sometimes, depending on the security rules applied to your laptop, you may get the following error while compiling Zed:
-
-```
-error: failed to run custom build command for `zed(C:\Users\USER\src\zed\crates\zed)`
-
-Caused by:
-  process didn't exit successfully: `C:\Users\USER\src\zed\target\debug\build\zed-b24f1e9300107efc\build-script-build` (exit code: 1)
-  --- stdout
-  cargo:rerun-if-changed=../../.git/logs/HEAD
-  cargo:rustc-env=ZED_COMMIT_SHA=25e2e9c6727ba9b77415588cfa11fd969612adb7
-  cargo:rustc-link-arg=/stack:8388608
-  cargo:rerun-if-changed=resources/windows/app-icon.ico
-  package.metadata.winresource does not exist
-  Selected RC path: 'bin\x64\rc.exe'
-
-  --- stderr
-  The system cannot find the path specified. (os error 3)
-warning: build failed, waiting for other jobs to finish...
-```
-
-In order to fix this issue, you can manually set the `ZED_RC_TOOLKIT_PATH` environment variable to the RC toolkit path. Usually, you can set it to:
-`C:\Program Files (x86)\Windows Kits\10\bin\<SDK_version>\x64`.
-
-See this [issue](https://github.com/zed-industries/zed/issues/18393) for more information.
-
-### Build fails: Path too long
-
-You may receive an error like the following when building
-
-```
-error: failed to get `pet` as a dependency of package `languages v0.1.0 (D:\a\zed-windows-builds\zed-windows-builds\crates\languages)`
-
-Caused by:
-  failed to load source for dependency `pet`
-
-Caused by:
-  Unable to update https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f2
-
-Caused by:
-  path too long: 'C:/Users/runneradmin/.cargo/git/checkouts/python-environment-tools-903993894b37a7d2/ffcbf3f/crates/pet-conda/tests/unix/conda_env_without_manager_but_found_in_history/some_other_location/conda_install/conda-meta/python-fastjsonschema-2.16.2-py310hca03da5_0.json'; class=Filesystem (30)
-```
-
-In order to solve this, you can enable longpath support for git and Windows.
-
-For git: `git config --system core.longpaths true`
-
-And for Windows with this PS command:
-
-```powershell
-New-ItemProperty -Path "HKLM:\SYSTEM\CurrentControlSet\Control\FileSystem" -Name "LongPathsEnabled" -Value 1 -PropertyType DWORD -Force
-```
-
-For more information on this, please see [win32 docs](https://learn.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation?tabs=powershell)
-
-(note that you will need to restart your system after enabling longpath support)
-
-### Graphics issues
-
-#### Zed fails to launch
-
-Currently, Zed uses Vulkan as its graphics API on Windows. However, Vulkan isn't always the most reliable on Windows, so if Zed fails to launch, it's likely a Vulkan-related issue.
-
-You can check the Zed log at:
-`C:\Users\YOU\AppData\Local\Zed\logs\Zed.log`
-
-If you see messages like:
-
-- `Zed failed to open a window: NoSupportedDeviceFound`
-- `ERROR_INITIALIZATION_FAILED`
-- `GPU Crashed`
-- `ERROR_SURFACE_LOST_KHR`
-
-Then Vulkan might not be working properly on your system. In most cases, updating your GPU drivers may help resolve this.
-
-If there's nothing Vulkan-related in the logs and you happen to have Bandicam installed, try uninstalling it. Zed is currently not compatible with Bandicam.
diff --git a/docs/src/diagnostics.md b/docs/src/diagnostics.md
deleted file mode 100644
index 47cc586008..0000000000
--- a/docs/src/diagnostics.md
+++ /dev/null
@@ -1,70 +0,0 @@
-# Diagnostics
-
-Zed gets its diagnostics from the language servers and supports both push and pull variants of the LSP which makes it compatible with all existing language servers.
-
-# Regular diagnostics
-
-By default, Zed displays all diagnostics as underlined text in the editor and the scrollbar.
-
-Editor diagnostics could be filtered with the
-
-```json [settings]
-"diagnostics_max_severity": null
-```
-
-editor setting (possible values: `"off"`, `"error"`, `"warning"`, `"info"`, `"hint"`, `null` (default, all diagnostics)).
-
-The scrollbar ones are configured with the
-
-```json [settings]
-"scrollbar": {
-  "diagnostics": "all",
-}
-```
-
-configuration (possible values: `"none"`, `"error"`, `"warning"`, `"information"`, `"all"` (default))
-
-The diagnostics could be hovered to display a tooltip with full, rendered diagnostic message.
-Or, `editor::GoToDiagnostic` and `editor::GoToPreviousDiagnostic` could be used to navigate between diagnostics in the editor, showing a popover for the currently active diagnostic.
-
-# Inline diagnostics (Error lens)
-
-Zed supports showing diagnostic as lens to the right of the code.
-This is disabled by default, but can either be temporarily turned on (or off) using the editor menu, or permanently, using the
-
-```json [settings]
-"diagnostics": {
-  "inline": {
-    "enabled": true,
-    "max_severity": null, // same values as the `diagnostics_max_severity` from the editor settings
-  }
-}
-```
-
-# Other UI places
-
-## Project Panel
-
-Project panel can have its entries coloured based on the severity of the diagnostics in the file.
-
-To configure, use
-
-```json [settings]
-"project_panel": {
-  "show_diagnostics": "all",
-}
-```
-
-configuration (possible values: `"off"`, `"errors"`, `"all"` (default))
-
-## Editor tabs
-
-Similar to the project panel, editor tabs can be colorized with the
-
-```json [settings]
-"tabs": {
-  "show_diagnostics": "off",
-}
-```
-
-configuration (possible values: `"off"` (default), `"errors"`, `"all"`)
diff --git a/docs/src/environment.md b/docs/src/environment.md
deleted file mode 100644
index 41980b2d96..0000000000
--- a/docs/src/environment.md
+++ /dev/null
@@ -1,92 +0,0 @@
-# Environment Variables
-
-_**Note**: The following only applies to Zed 0.152.0 and later._
-
-Multiple features in Zed are affected by environment variables:
-
-- Tasks
-- Built-in terminal
-- Look-up of language servers
-- Language servers
-
-In order to make the best use of these features, it's helpful to understand where Zed gets its environment variables from and how they're used.
-
-## Where does Zed get its environment variables from?
-
-How Zed was started — whether it's icon was clicked in the macOS Dock or in a Linux window manager, or whether it was started via the CLI `zed` that comes with Zed — influences which environment variables Zed can use.
-
-### Launched from the CLI
-
-If Zed is opened via the CLI (`zed`), it will inherit the environment variables from the surrounding shell session.
-
-That means if you do
-
-```
-$ export MY_ENV_VAR=hello
-$ zed .
-```
-
-the environment variable `MY_ENV_VAR` is now available inside Zed. For example, in the built-in terminal.
-
-Starting with Zed 0.152.0, the CLI `zed` will _always_ pass along its environment to Zed, regardless of whether a Zed instance was previously running or not. Prior to Zed 0.152.0 this was not the case and only the first Zed instance would inherit the environment variables.
-
-### Launched via window manager, Dock, or launcher
-
-When Zed has been launched via the macOS Dock, or a GNOME or KDE icon on Linux, or an application launcher like Alfred or Raycast, it has no surrounding shell environment from which to inherit its environment variables.
-
-In order to still have a useful environment, Zed spawns a login shell in the user's home directory and gets its environment. This environment is then set on the Zed _process_. That means all Zed windows and projects will inherit that home directory environment.
-
-Since that can lead to problems for users that require different environment variables for a project (because they use `direnv`, or `asdf`, or `mise`, ... in that project), when opening project, Zed spawns another login shell. This time in the project's directory. The environment from that login shell is _not_ set on the process (because that would mean opening a new project changes the environment for all Zed windows). Instead, the environment is stored and passed along when running tasks, opening terminals, or spawning language servers.
-
-## Where and how are environment variables used?
-
-There are two sets of environment variables:
-
-1. Environment variables of the Zed process
-2. Environment variables stored per project
-
-The variables from (1) are always used, since they are stored on the process itself and every spawned process (tasks, terminals, language servers, ...) will inherit them by default.
-
-The variables from (2) are used explicitly, depending on the feature.
-
-### Tasks
-
-Tasks are spawned with an combined environment. In order of precedence (low to high, with the last overwriting the first):
-
-- the Zed process environment
-- if the project was opened from the CLI: the CLI environment
-- if the project was not opened from the CLI: the project environment variables obtained by running a login shell in the project's root folder
-- optional, explicitly configured environment in settings
-
-### Built-in terminal
-
-Built-in terminals, like tasks, are spawned with an combined environment. In order of precedence (low to high):
-
-- the Zed process environment
-- if the project was opened from the CLI: the CLI environment
-- if the project was not opened from the CLI: the project environment variables obtained by running a login shell in the project's root folder
-- optional, explicitly configured environment in settings
-
-### Look-up of language servers
-
-For some languages the language server adapters lookup the binary in the user's `$PATH`. Examples:
-
-- Go
-- Zig
-- Rust (if [configured to do so](./languages/rust.md#binary))
-- C
-- TypeScript
-
-For this look-up, Zed uses the following the environment:
-
-- if the project was opened from the CLI: the CLI environment
-- if the project was not opened from the CLI: the project environment variables obtained by running a login shell in the project's root folder
-
-### Language servers
-
-After looking up a language server, Zed starts them.
-
-These language server processes always inherit Zed's process environment. But, depending on the language server look-up, additional environment variables might be set or overwrite the process environment.
-
-- If the language server was found in the project environment's `$PATH`, then the project environment's is passed along to the language server process. Where the project environment comes from depends on how the project was opened, via CLI or not. See previous point on look-up of language servers.
-- If the language servers was not found in the project environment, Zed tries to install it globally and start it globally. In that case, the process will inherit Zed's process environment, and — if the project was opened via ClI — from the CLI.
diff --git a/docs/src/extensions.md b/docs/src/extensions.md
deleted file mode 100644
index 627fe8f4c0..0000000000
--- a/docs/src/extensions.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Extensions
-
-Zed lets you add new functionality using user-defined extensions.
-
-- [Installing Extensions](./extensions/installing-extensions.md)
-- [Extension Capabilities](./extensions/capabilities.md)
-- [Developing Extensions](./extensions/developing-extensions.md)
-  - [Developing Language Extensions](./extensions/languages.md)
-  - [Developing Debugger Extensions](./extensions/debugger-extensions.md)
-  - [Developing Themes](./extensions/themes.md)
-  - [Developing Icon Themes](./extensions/icon-themes.md)
-  - [Developing Slash Commands](./extensions/slash-commands.md)
-  - [Developing Agent Servers](./extensions/agent-servers.md)
-  - [Developing MCP Servers](./extensions/mcp-extensions.md)
diff --git a/docs/src/extensions/agent-servers.md b/docs/src/extensions/agent-servers.md
deleted file mode 100644
index c8367a8418..0000000000
--- a/docs/src/extensions/agent-servers.md
+++ /dev/null
@@ -1,173 +0,0 @@
-# Agent Server Extensions
-
-Agent Servers are programs that provide AI agent implementations through the [Agent Client Protocol (ACP)](https://agentclientprotocol.com).
-Agent Server Extensions let you package up an Agent Server so that users can install the extension and have your agent easily available to use in Zed.
-
-You can see the current Agent Server extensions either by opening the Extensions tab in Zed (execute the `zed: extensions` command) and changing the filter from `All` to `Agent Servers`, or by visiting [the Zed website](https://zed.dev/extensions?filter=agent-servers).
-
-## Defining Agent Server Extensions
-
-An extension can register one or more agent servers in the `extension.toml` like so:
-
-```toml
-[agent_servers.my-agent]
-name = "My Agent"
-
-[agent_servers.my-agent.targets.darwin-aarch64]
-archive = "https://github.com/owner/repo/releases/download/v1.0.0/agent-darwin-arm64.tar.gz"
-cmd = "./agent"
-args = ["--serve"]
-
-[agent_servers.my-agent.targets.linux-x86_64]
-archive = "https://github.com/owner/repo/releases/download/v1.0.0/agent-linux-x64.tar.gz"
-cmd = "./agent"
-args = ["--serve"]
-
-[agent_servers.my-agent.targets.windows-x86_64]
-archive = "https://github.com/owner/repo/releases/download/v1.0.0/agent-windows-x64.zip"
-cmd = "./agent.exe"
-args = ["--serve"]
-```
-
-### Required Fields
-
-- `name`: A human-readable display name for the agent server (shown in menus)
-- `targets`: Platform-specific configurations for downloading and running the agent
-
-### Target Configuration
-
-Each target key uses the format `{os}-{arch}` where:
-
-- **os**: `darwin` (macOS), `linux`, or `windows`
-- **arch**: `aarch64` (ARM64) or `x86_64`
-
-Each target must specify:
-
-- `archive`: URL to download the archive from (supports `.tar.gz`, `.zip`, etc.)
-- `cmd`: Command to run the agent server (relative to the extracted archive)
-- `args`: Command-line arguments to pass to the agent server (optional)
-- `sha256`: SHA-256 hash string of the archive's bytes (optional, but recommended for security)
-- `env`: Environment variables specific to this target (optional, overrides agent-level env vars with the same name)
-
-### Optional Fields
-
-You can also optionally specify at the agent server level:
-
-- `env`: Environment variables to set in the agent's spawned process. These apply to all targets by default.
-- `icon`: Path to an SVG icon (relative to extension root) for display in menus.
-
-### Environment Variables
-
-Environment variables can be configured at two levels:
-
-1. **Agent-level** (`[agent_servers.my-agent.env]`): Variables that apply to all platforms
-2. **Target-level** (`[agent_servers.my-agent.targets.{platform}.env]`): Variables specific to a platform
-
-When both are specified, target-level environment variables override agent-level variables with the same name. Variables defined only at the agent level are inherited by all targets.
-
-### Complete Example
-
-Here's a more complete example with all optional fields:
-
-```toml
-[agent_servers.example-agent]
-name = "Example Agent"
-icon = "icon/agent.svg"
-
-[agent_servers.example-agent.env]
-AGENT_LOG_LEVEL = "info"
-AGENT_MODE = "production"
-
-[agent_servers.example-agent.targets.darwin-aarch64]
-archive = "https://github.com/example/agent/releases/download/v2.0.0/agent-darwin-arm64.tar.gz"
-cmd = "./bin/agent"
-args = ["serve", "--port", "8080"]
-sha256 = "abc123def456..."
-
-[agent_servers.example-agent.targets.linux-x86_64]
-archive = "https://github.com/example/agent/releases/download/v2.0.0/agent-linux-x64.tar.gz"
-cmd = "./bin/agent"
-args = ["serve", "--port", "8080"]
-sha256 = "def456abc123..."
-
-[agent_servers.example-agent.targets.linux-x86_64.env]
-AGENT_MEMORY_LIMIT = "2GB"  # Linux-specific override
-```
-
-## Installation Process
-
-When a user installs your extension and selects the agent server:
-
-1. Zed downloads the appropriate archive for the user's platform
-2. The archive is extracted to a cache directory
-3. Zed launches the agent using the specified command and arguments
-4. Environment variables are set as configured
-5. The agent server runs in the background, ready to assist the user
-
-Archives are cached locally, so subsequent launches are fast.
-
-## Distribution Best Practices
-
-### Use GitHub Releases
-
-GitHub Releases are a reliable way to distribute agent server binaries:
-
-1. Build your agent for each platform (macOS ARM64, macOS x86_64, Linux x86_64, Windows x86_64)
-2. Package each build as a compressed archive (`.tar.gz` or `.zip`)
-3. Create a GitHub release and upload the archives
-4. Use the release URLs in your `extension.toml`
-
-## SHA-256 Hashes
-
-It's good for security to include SHA-256 hashes of your archives in `extension.toml`. Here's how to generate it:
-
-### macOS and Linux
-
-```bash
-shasum -a 256 agent-darwin-arm64.tar.gz
-```
-
-### Windows
-
-```bash
-certutil -hashfile agent-windows-x64.zip SHA256
-```
-
-Then add that string to your target configuration:
-
-```toml
-[agent_servers.my-agent.targets.darwin-aarch64]
-archive = "https://github.com/owner/repo/releases/download/v1.0.0/agent-darwin-arm64.tar.gz"
-cmd = "./agent"
-sha256 = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
-```
-
-## Testing
-
-To test your Agent Server Extension:
-
-1. [Install it as a dev extension](./developing-extensions.md#developing-an-extension-locally)
-2. Open the [Agent Panel](../ai/agent-panel.md)
-3. Select your Agent Server from the list
-4. Verify that it downloads, installs, and launches correctly
-5. Test its functionality by conversing with it and watching the [ACP logs](../ai/external-agents.md#debugging-agents)
-
-## Icon Guideline
-
-In case your agent server has a logo, we highly recommend adding it as an SVG icon.
-For optimal display, follow these guidelines:
-
-- Make sure you resize your SVG to fit a 16x16 bounding box, with a padding of around one or two pixels
-- Ensure you have a clean SVG code by processing it through [SVGOMG](https://jakearchibald.github.io/svgomg/)
-- Avoid including icons with gradients as they will often make the SVG more complicated and possibly not render perfectly
-
-Note that we'll automatically convert your icon to monochrome to preserve Zed's design consistency.
-(You can still use opacity in different paths of your SVG to add visual layering.)
-
----
-
-This is all you need to distribute an agent server through Zed's extension system!
-
-## Publishing
-
-Once your extension is ready, see [Publishing your extension](./developing-extensions.md#publishing-your-extension) to learn how to submit it to the Zed extension registry.
diff --git a/docs/src/extensions/capabilities.md b/docs/src/extensions/capabilities.md
deleted file mode 100644
index 4d935a0725..0000000000
--- a/docs/src/extensions/capabilities.md
+++ /dev/null
@@ -1,96 +0,0 @@
-# Extension Capabilities
-
-The operations that Zed extensions are able to perform are governed by a capability system.
-
-## Restricting capabilities
-
-As a user, you have the option of restricting the capabilities that are granted to extensions.
-
-This is controlled via the `granted_extension_capabilities` setting.
-
-Restricting or removing a capability will cause an error to be returned when an extension attempts to call the corresponding extension API without sufficient capabilities.
-
-For instance, if you wanted to restrict downloads to just files from GitHub, you could modify `host` for the `download_file` capability:
-
-```diff
-{
-  "granted_extension_capabilities": [
-    { "kind": "process:exec", "command": "*", "args": ["**"] },
--   { "kind": "download_file", "host": "*", "path": ["**"] },
-+   { "kind": "download_file", "host": "github.com", "path": ["**"] },
-    { "kind": "npm:install", "package": "*" }
-  ]
-}
-```
-
-If you don't want extensions to be able to perform _any_ capabilities, you can remove all granted capabilities:
-
-```json
-{
-  "granted_extension_capabilities": []
-}
-```
-
-> Note that this will likely make many extensions non-functional, at least in their default configuration.
-
-## Capabilities
-
-### `process:exec`
-
-The `process:exec` capability grants extensions the ability to invoke commands using [`zed_extension_api::process::Command`](https://docs.rs/zed_extension_api/latest/zed_extension_api/process/struct.Command.html).
-
-#### Examples
-
-To allow any command to be executed with any arguments:
-
-```toml
-{ kind = "process:exec", command = "*", args = ["**"] }
-```
-
-To allow a specific command (e.g., `gem`) to be executed with any arguments:
-
-```toml
-{ kind = "process:exec", command = "gem", args = ["**"] }
-```
-
-### `download_file`
-
-The `download_file` capability grants extensions the ability to download files using [`zed_extension_api::download_file`](https://docs.rs/zed_extension_api/latest/zed_extension_api/fn.download_file.html).
-
-#### Examples
-
-To allow any file to be downloaded:
-
-```toml
-{ kind = "download_file", host = "github.com", path = ["**"] }
-```
-
-To allow any file to be downloaded from `github.com`:
-
-```toml
-{ kind = "download_file", host = "github.com", path = ["**"] }
-```
-
-To allow any file to be downloaded from a specific GitHub repository:
-
-```toml
-{ kind = "download_file", host = "github.com", path = ["zed-industries", "zed", "**"] }
-```
-
-### `npm:install`
-
-The `npm:install` capability grants extensions the ability to install npm packages using [`zed_extension_api::npm_install_package`](https://docs.rs/zed_extension_api/latest/zed_extension_api/fn.npm_install_package.html).
-
-#### Examples
-
-To allow any npm package to be installed:
-
-```toml
-{ kind = "npm:install", package = "*" }
-```
-
-To allow a specific npm package (e.g., `typescript`) to be installed:
-
-```toml
-{ kind = "npm:install", package = "typescript" }
-```
diff --git a/docs/src/extensions/debugger-extensions.md b/docs/src/extensions/debugger-extensions.md
deleted file mode 100644
index fa33c25732..0000000000
--- a/docs/src/extensions/debugger-extensions.md
+++ /dev/null
@@ -1,117 +0,0 @@
-# Debugger Extensions
-
-[Debug Adapter Protocol](https://microsoft.github.io/debug-adapter-protocol) Servers can be exposed as extensions for use in the [debugger](../debugger.md).
-
-## Defining Debugger Extensions
-
-A given extension may provide one or more DAP servers.
-Each DAP server must be registered in the `extension.toml`:
-
-```toml
-[debug_adapters.my-debug-adapter]
-# Optional relative path to the JSON schema for the debug adapter configuration schema. Defaults to `debug_adapter_schemas/$DEBUG_ADAPTER_NAME_ID.json`.
-# Note that while this field is optional, a schema is mandatory.
-schema_path = "relative/path/to/schema.json"
-```
-
-Then, in the Rust code for your extension, implement the `get_dap_binary` method on your extension:
-
-```rust
-impl zed::Extension for MyExtension {
-    fn get_dap_binary(
-        &mut self,
-        adapter_name: String,
-        config: DebugTaskDefinition,
-        user_provided_debug_adapter_path: Option<String>,
-        worktree: &Worktree,
-    ) -> Result<DebugAdapterBinary, String>;
-}
-```
-
-This method should return the command to start up a debug adapter protocol server, along with any arguments or environment variables necessary for it to function.
-
-If you need to download the DAP server from an external source—like GitHub Releases or npm—you can also do that in this function. Make sure to check for updates only periodically, as this function is called whenever a user spawns a new debug session with your debug adapter.
-
-You must also implement `dap_request_kind`. This function is used to determine whether a given debug scenario will _launch_ a new debuggee or _attach_ to an existing one.
-We also use it to determine that a given debug scenario requires running a _locator_.
-
-```rust
-impl zed::Extension for MyExtension {
-    fn dap_request_kind(
-        &mut self,
-        _adapter_name: String,
-        _config: Value,
-    ) -> Result<StartDebuggingRequestArgumentsRequest, String>;
-}
-```
-
-These two functions are sufficient to expose your debug adapter in `debug.json`-based user workflows, but you should strongly consider implementing `dap_config_to_scenario` as well.
-
-```rust
-impl zed::Extension for MyExtension {
-    fn dap_config_to_scenario(
-        &mut self,
-        _adapter_name: DebugConfig,
-    ) -> Result<DebugScenario, String>;
-}
-```
-
-`dap_config_to_scenario` is used when the user spawns a session via new process modal UI. At a high level, it takes a generic debug configuration (that isn't specific to any
-debug adapter) and tries to turn it into a concrete debug scenario for your adapter.
-Put another way, it is supposed to answer the question: "Given a program, a list of arguments, current working directory and environment variables, what would the configuration for spawning this debug adapter look like?".
-
-## Defining Debug Locators
-
-Zed offers an automatic way to create debug scenarios with _debug locators_.
-A locator locates the debug target and figures out how to spawn a debug session for it. Thanks to locators, we can automatically convert existing user tasks (e.g. `cargo run`) and convert them into debug scenarios (e.g. `cargo build` followed by spawning a debugger with `target/debug/my_program` as the program to debug).
-
-> Your extension can define its own debug locators even if it does not expose a debug adapter. We strongly recommend doing so when your extension already exposes language tasks, as it allows users to spawn a debug session without having to manually configure the debug adapter.
-
-Locators can (but don't have to) be agnostic to the debug adapter they are used with. They are simply responsible for locating the debug target and figuring out how to spawn a debug session for it. This allows for a more flexible and extensible debugging experience.
-
-Your extension can define one or more debug locators. Each debug locator must be registered in the `extension.toml`:
-
-```toml
-[debug_locators.my-debug-locator]
-```
-
-Locators have two components.
-First, each locator is ran on each available task to figure out if any of the available locators can provide a debug scenario for a given task. This is done by calling `dap_locator_create_scenario`.
-
-```rust
-impl zed::Extension for MyExtension {
-    fn dap_locator_create_scenario(
-        &mut self,
-        _locator_name: String,
-        _build_task: TaskTemplate,
-        _resolved_label: String,
-        _debug_adapter_name: String,
-    ) -> Option<DebugScenario>;
-}
-```
-
-This function should return `Some` debug scenario when that scenario defines a debugging counterpart to a given user task.
-Note that a `DebugScenario` can include a [build task](../debugger.md#build-tasks). If there is one, we will execute `run_dap_locator` after a build task is finished successfully.
-
-```rust
-impl zed::Extension for MyExtension {
-    fn run_dap_locator(
-        &mut self,
-        _locator_name: String,
-        _build_task: TaskTemplate,
-    ) -> Result<DebugRequest, String>;
-}
-```
-
-`run_dap_locator` is useful in case you cannot determine a build target deterministically. Some build systems may produce artifacts whose names are not known up-front.
-Note however that you do _not_ need to go through a 2-phase resolution; if you can determine the full debug configuration with just `dap_locator_create_scenario`, you can omit `build` property on a returned `DebugScenario`. Please also note that your locator **will be** called with tasks it's unlikely to accept; thus you should take some effort to return `None` early before performing any expensive operations.
-
-## Available Extensions
-
-Check out all the DAP servers that have already been exposed as extensions [on Zed's site](https://zed.dev/extensions?filter=debug-adapters).
-
-We recommend taking a look at their repositories as a way to understand how they are generally created and structured.
-
-## Testing
-
-To test your new Debug Adapter Protocol server extension, you can [install it as a dev extension](./developing-extensions.md#developing-an-extension-locally).
diff --git a/docs/src/extensions/developing-extensions.md b/docs/src/extensions/developing-extensions.md
deleted file mode 100644
index dc8a693291..0000000000
--- a/docs/src/extensions/developing-extensions.md
+++ /dev/null
@@ -1,182 +0,0 @@
-# Developing Extensions
-
-## Extension Features
-
-Extensions are able to provide the following features to Zed:
-
-- [Languages](./languages.md)
-- [Debuggers](./debugger-extensions.md)
-- [Themes](./themes.md)
-- [Icon Themes](./icon-themes.md)
-- [Slash Commands](./slash-commands.md)
-- [MCP Servers](./mcp-extensions.md)
-
-## Developing an Extension Locally
-
-Before starting to develop an extension for Zed, be sure to [install Rust via rustup](https://www.rust-lang.org/tools/install).
-
-> Rust must be installed via rustup. If you have Rust installed via homebrew or otherwise, installing dev extensions will not work.
-
-When developing an extension, you can use it in Zed without needing to publish it by installing it as a _dev extension_.
-
-From the extensions page, click the `Install Dev Extension` button (or the {#action zed::InstallDevExtension} action) and select the directory containing your extension.
-
-If you need to troubleshoot, you can check the Zed.log ({#action zed::OpenLog}) for additional output. For debug output, close and relaunch zed with the `zed --foreground` from the command line which show more verbose INFO level logging.
-
-If you already have the published version of the extension installed, the published version will be uninstalled prior to the installation of the dev extension. After successful installation, the `Extensions` page will indicate that the upstream extension is "Overridden by dev extension".
-
-## Directory Structure of a Zed Extension
-
-A Zed extension is a Git repository that contains an `extension.toml`. This file must contain some
-basic information about the extension:
-
-```toml
-id = "my-extension"
-name = "My extension"
-version = "0.0.1"
-schema_version = 1
-authors = ["Your Name <you@example.com>"]
-description = "My cool extension"
-repository = "https://github.com/your-name/my-zed-extension"
-```
-
-In addition to this, there are several other optional files and directories that can be used to add functionality to a Zed extension. An example directory structure of an extension that provides all capabilities is as follows:
-
-```
-my-extension/
-  extension.toml
-  Cargo.toml
-  src/
-    lib.rs
-  languages/
-    my-language/
-      config.toml
-      highlights.scm
-  themes/
-    my-theme.json
-```
-
-## WebAssembly
-
-Procedural parts of extensions are written in Rust and compiled to WebAssembly. To develop an extension that includes custom code, include a `Cargo.toml` like this:
-
-```toml
-[package]
-name = "my-extension"
-version = "0.0.1"
-edition = "2021"
-
-[lib]
-crate-type = ["cdylib"]
-
-[dependencies]
-zed_extension_api = "0.1.0"
-```
-
-Use the latest version of the [`zed_extension_api`](https://crates.io/crates/zed_extension_api) available on crates.io. Make sure it's still [compatible with Zed versions](https://github.com/zed-industries/zed/blob/main/crates/extension_api#compatible-zed-versions) you want to support.
-
-In the `src/lib.rs` file in your Rust crate you will need to define a struct for your extension and implement the `Extension` trait, as well as use the `register_extension!` macro to register your extension:
-
-```rs
-use zed_extension_api as zed;
-
-struct MyExtension {
-    // ... state
-}
-
-impl zed::Extension for MyExtension {
-    // ...
-}
-
-zed::register_extension!(MyExtension);
-```
-
-> `stdout`/`stderr` is forwarded directly to the Zed process. In order to see `println!`/`dbg!` output from your extension, you can start Zed in your terminal with a `--foreground` flag.
-
-## Forking and cloning the repo
-
-1. Fork the repo
-
-> Note: It is very helpful if you fork the `zed-industries/extensions` repo to a personal GitHub account instead of a GitHub organization, as this allows Zed staff to push any needed changes to your PR to expedite the publishing process.
-
-2. Clone the repo to your local machine
-
-```sh
-# Substitute the url of your fork here:
-# git clone https://github.com/zed-industries/extensions
-cd extensions
-git submodule init
-git submodule update
-```
-
-## Extension License Requirements
-
-As of October 1st, 2025, extension repositories must include a license.
-The following licenses are accepted:
-
-- [Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0)
-- [BSD 3-Clause](https://opensource.org/license/bsd-3-clause)
-- [GNU GPLv3](https://www.gnu.org/licenses/gpl-3.0.en.html)
-- [MIT](https://opensource.org/license/mit)
-
-This allows us to distribute the resulting binary produced from your extension code to our users.
-Without a valid license, the pull request to add or update your extension in the following steps will fail CI.
-
-Your license file should be at the root of your extension repository. Any filename that has `LICENCE` or `LICENSE` as a prefix (case insensitive) will be inspected to ensure it matches one of the accepted licenses. See the [license validation source code](https://github.com/zed-industries/extensions/blob/main/src/lib/license.js).
-
-> This license requirement applies only to your extension code itself (the code that gets compiled into the extension binary).
-> It does not apply to any tools your extension may download or interact with, such as language servers or other external dependencies.
-> If your repository contains both extension code and other projects (like a language server), you are not required to relicense those other projects—only the extension code needs to be one of the aforementioned accepted licenses.
-
-## Publishing your extension
-
-To publish an extension, open a PR to [the `zed-industries/extensions` repo](https://github.com/zed-industries/extensions).
-
-In your PR, do the following:
-
-1. Add your extension as a Git submodule within the `extensions/` directory
-
-```sh
-git submodule add https://github.com/your-username/foobar-zed.git extensions/foobar
-git add extensions/foobar
-```
-
-> All extension submodules must use HTTPS URLs and not SSH URLS (`git@github.com`).
-
-2. Add a new entry to the top-level `extensions.toml` file containing your extension:
-
-```toml
-[my-extension]
-submodule = "extensions/my-extension"
-version = "0.0.1"
-```
-
-> If your extension is in a subdirectory within the submodule you can use the `path` field to point to where the extension resides.
-
-3. Run `pnpm sort-extensions` to ensure `extensions.toml` and `.gitmodules` are sorted
-
-Once your PR is merged, the extension will be packaged and published to the Zed extension registry.
-
-> Extension IDs and names should not contain `zed` or `Zed`, since they are all Zed extensions.
-
-## Updating an extension
-
-To update an extension, open a PR to [the `zed-industries/extensions` repo](https://github.com/zed-industries/extensions).
-
-In your PR do the following:
-
-1. Update the extension's submodule to the commit of the new version. For this, you can run
-
-```sh
-# From the root of the repository:
-git submodule update --remote extensions/your-extension-name
-```
-
-to update your extension to the latest commit available in your remote repository.
-
-2. Update the `version` field for the extension in `extensions.toml`
-   - Make sure the `version` matches the one set in `extension.toml` at the particular commit.
-
-If you'd like to automate this process, there is a [community GitHub Action](https://github.com/huacnlee/zed-extension-action) you can use.
-
-> **Note:** If your extension repository has a different license, you'll need to update it to be one of the [accepted extension licenses](#extension-license-requirements) before publishing your update.
diff --git a/docs/src/extensions/icon-themes.md b/docs/src/extensions/icon-themes.md
deleted file mode 100644
index 676cae59cd..0000000000
--- a/docs/src/extensions/icon-themes.md
+++ /dev/null
@@ -1,78 +0,0 @@
-# Icon Themes
-
-Extensions may provide icon themes in order to change the icons Zed uses for folders and files.
-
-## Example extension
-
-The [Material Icon Theme](https://github.com/zed-extensions/material-icon-theme) serves as an example for the structure of an extension containing an icon theme.
-
-## Directory structure
-
-There are two important directories for an icon theme extension:
-
-- `icon_themes`: This directory will contain one or more JSON files containing the icon theme definitions.
-- `icons`: This directory contains the icon assets that will be distributed with the extension. You can created subdirectories in this directory, if so desired.
-
-Each icon theme file should adhere to the JSON schema specified at [`https://zed.dev/schema/icon_themes/v0.3.0.json`](https://zed.dev/schema/icon_themes/v0.3.0.json).
-
-Here is an example of the structure of an icon theme:
-
-```json [icon-theme]
-{
-  "$schema": "https://zed.dev/schema/icon_themes/v0.3.0.json",
-  "name": "My Icon Theme",
-  "author": "Your Name",
-  "themes": [
-    {
-      "name": "My Icon Theme",
-      "appearance": "dark",
-      "directory_icons": {
-        "collapsed": "./icons/folder.svg",
-        "expanded": "./icons/folder-open.svg"
-      },
-      "named_directory_icons": {
-        "stylesheets": {
-          "collapsed": "./icons/folder-stylesheets.svg",
-          "expanded": "./icons/folder-stylesheets-open.svg"
-        }
-      },
-      "chevron_icons": {
-        "collapsed": "./icons/chevron-right.svg",
-        "expanded": "./icons/chevron-down.svg"
-      },
-      "file_stems": {
-        "Makefile": "make"
-      },
-      "file_suffixes": {
-        "mp3": "audio",
-        "rs": "rust"
-      },
-      "file_icons": {
-        "audio": { "path": "./icons/audio.svg" },
-        "default": { "path": "./icons/file.svg" },
-        "make": { "path": "./icons/make.svg" },
-        "rust": { "path": "./icons/rust.svg" }
-        // ...
-      }
-    }
-  ]
-}
-```
-
-Each icon path is resolved relative to the root of the extension directory.
-
-In this example, the extension would have a structure like so:
-
-```
-extension.toml
-icon_themes/
-  my-icon-theme.json
-icons/
-  audio.svg
-  chevron-down.svg
-  chevron-right.svg
-  file.svg
-  folder-open.svg
-  folder.svg
-  rust.svg
-```
diff --git a/docs/src/extensions/installing-extensions.md b/docs/src/extensions/installing-extensions.md
deleted file mode 100644
index d9573556f0..0000000000
--- a/docs/src/extensions/installing-extensions.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# Installing Extensions
-
-You can search for extensions by launching the Zed Extension Gallery by pressing {#kb zed::Extensions} , opening the command palette and selecting {#action zed::Extensions} or by selecting "Zed > Extensions" from the menu bar.
-
-Here you can view the extensions that you currently have installed or search and install new ones.
-
-## Installation Location
-
-- On macOS, extensions are installed in `~/Library/Application Support/Zed/extensions`.
-- On Linux, they are installed in either `$XDG_DATA_HOME/zed/extensions` or `~/.local/share/zed/extensions`.
-- On Windows, the directory is `%LOCALAPPDATA%\Zed\extensions`.
-
-This directory contains two subdirectories:
-
-- `installed`, which contains the source code for each extension.
-- `work` which contains files created by the extension itself, such as downloaded language servers.
-
-## Auto installing
-
-To automate extension installation/uninstallation see the docs for [auto_install_extensions](../configuring-zed.md#auto-install-extensions).
diff --git a/docs/src/extensions/languages.md b/docs/src/extensions/languages.md
deleted file mode 100644
index f3ffcd71ba..0000000000
--- a/docs/src/extensions/languages.md
+++ /dev/null
@@ -1,420 +0,0 @@
-# Language Extensions
-
-Language support in Zed has several components:
-
-- Language metadata and configuration
-- Grammar
-- Queries
-- Language servers
-
-## Language Metadata
-
-Each language supported by Zed must be defined in a subdirectory inside the `languages` directory of your extension.
-
-This subdirectory must contain a file called `config.toml` file with the following structure:
-
-```toml
-name = "My Language"
-grammar = "my-language"
-path_suffixes = ["myl"]
-line_comments = ["# "]
-```
-
-- `name` (required) is the human readable name that will show up in the Select Language dropdown.
-- `grammar` (required) is the name of a grammar. Grammars are registered separately, described below.
-- `path_suffixes` is an array of file suffixes that should be associated with this language. Unlike `file_types` in settings, this does not support glob patterns.
-- `line_comments` is an array of strings that are used to identify line comments in the language. This is used for the `editor::ToggleComments` keybind: {#kb editor::ToggleComments} for toggling lines of code.
-- `tab_size` defines the indentation/tab size used for this language (default is `4`).
-- `hard_tabs` whether to indent with tabs (`true`) or spaces (`false`, the default).
-- `first_line_pattern` is a regular expression, that in addition to `path_suffixes` (above) or `file_types` in settings can be used to match files which should use this language. For example Zed uses this to identify Shell Scripts by matching the [shebangs lines](https://github.com/zed-industries/zed/blob/main/crates/languages/src/bash/config.toml) in the first line of a script.
-- `debuggers` is an array of strings that are used to identify debuggers in the language. When launching a debugger's `New Process Modal`, Zed will order available debuggers by the order of entries in this array.
-
-<!--
-TBD: Document `language_name/config.toml` keys
-
-- autoclose_before
-- brackets (start, end, close, newline, not_in: ["comment", "string"])
-- word_characters
-- prettier_parser_name
-- opt_into_language_servers
-- code_fence_block_name
-- scope_opt_in_language_servers
-- increase_indent_pattern, decrease_indent_pattern
-- collapsed_placeholder
-- auto_indent_on_paste, auto_indent_using_last_non_empty_line
-- overrides: `[overrides.element]`, `[overrides.string]`
--->
-
-## Grammar
-
-Zed uses the [Tree-sitter](https://tree-sitter.github.io) parsing library to provide built-in language-specific features. There are grammars available for many languages, and you can also [develop your own grammar](https://tree-sitter.github.io/tree-sitter/creating-parsers#writing-the-grammar). A growing list of Zed features are built using pattern matching over syntax trees with Tree-sitter queries. As mentioned above, every language that is defined in an extension must specify the name of a Tree-sitter grammar that is used for parsing. These grammars are then registered separately in extensions' `extension.toml` file, like this:
-
-```toml
-[grammars.gleam]
-repository = "https://github.com/gleam-lang/tree-sitter-gleam"
-rev = "58b7cac8fc14c92b0677c542610d8738c373fa81"
-```
-
-The `repository` field must specify a repository where the Tree-sitter grammar should be loaded from, and the `rev` field must contain a Git revision to use, such as the SHA of a Git commit. If you're developing an extension locally and want to load a grammar from the local filesystem, you can use a `file://` URL for `repository`. An extension can provide multiple grammars by referencing multiple tree-sitter repositories.
-
-## Tree-sitter Queries
-
-Zed uses the syntax tree produced by the [Tree-sitter](https://tree-sitter.github.io) query language to implement
-several features:
-
-- Syntax highlighting
-- Bracket matching
-- Code outline/structure
-- Auto-indentation
-- Code injections
-- Syntax overrides
-- Text redactions
-- Runnable code detection
-- Selecting classes, functions, etc.
-
-The following sections elaborate on how [Tree-sitter queries](https://tree-sitter.github.io/tree-sitter/using-parsers#query-syntax) enable these
-features in Zed, using [JSON syntax](https://www.json.org/json-en.html) as a guiding example.
-
-### Syntax highlighting
-
-In Tree-sitter, the `highlights.scm` file defines syntax highlighting rules for a particular syntax.
-
-Here's an example from a `highlights.scm` for JSON:
-
-```scheme
-(string) @string
-
-(pair
-  key: (string) @property.json_key)
-
-(number) @number
-```
-
-This query marks strings, object keys, and numbers for highlighting. The following is a comprehensive list of captures supported by themes:
-
-| Capture                  | Description                            |
-| ------------------------ | -------------------------------------- |
-| @attribute               | Captures attributes                    |
-| @boolean                 | Captures boolean values                |
-| @comment                 | Captures comments                      |
-| @comment.doc             | Captures documentation comments        |
-| @constant                | Captures constants                     |
-| @constructor             | Captures constructors                  |
-| @embedded                | Captures embedded content              |
-| @emphasis                | Captures emphasized text               |
-| @emphasis.strong         | Captures strongly emphasized text      |
-| @enum                    | Captures enumerations                  |
-| @function                | Captures functions                     |
-| @hint                    | Captures hints                         |
-| @keyword                 | Captures keywords                      |
-| @label                   | Captures labels                        |
-| @link_text               | Captures link text                     |
-| @link_uri                | Captures link URIs                     |
-| @number                  | Captures numeric values                |
-| @operator                | Captures operators                     |
-| @predictive              | Captures predictive text               |
-| @preproc                 | Captures preprocessor directives       |
-| @primary                 | Captures primary elements              |
-| @property                | Captures properties                    |
-| @punctuation             | Captures punctuation                   |
-| @punctuation.bracket     | Captures brackets                      |
-| @punctuation.delimiter   | Captures delimiters                    |
-| @punctuation.list_marker | Captures list markers                  |
-| @punctuation.special     | Captures special punctuation           |
-| @string                  | Captures string literals               |
-| @string.escape           | Captures escaped characters in strings |
-| @string.regex            | Captures regular expressions           |
-| @string.special          | Captures special strings               |
-| @string.special.symbol   | Captures special symbols               |
-| @tag                     | Captures tags                          |
-| @tag.doctype             | Captures doctypes (e.g., in HTML)      |
-| @text.literal            | Captures literal text                  |
-| @title                   | Captures titles                        |
-| @type                    | Captures types                         |
-| @variable                | Captures variables                     |
-| @variable.special        | Captures special variables             |
-| @variant                 | Captures variants                      |
-
-### Bracket matching
-
-The `brackets.scm` file defines matching brackets.
-
-Here's an example from a `brackets.scm` file for JSON:
-
-```scheme
-("[" @open "]" @close)
-("{" @open "}" @close)
-("\"" @open "\"" @close)
-```
-
-This query identifies opening and closing brackets, braces, and quotation marks.
-
-| Capture | Description                                   |
-| ------- | --------------------------------------------- |
-| @open   | Captures opening brackets, braces, and quotes |
-| @close  | Captures closing brackets, braces, and quotes |
-
-Zed uses these to highlight matching brackets: painting each bracket pair with a different color ("rainbow brackets") and highlighting the brackets if the cursor is inside the bracket pair.
-
-To opt out of rainbow brackets colorization, add the following to the corresponding `brackets.scm` entry:
-
-```scheme
-(("\"" @open "\"" @close) (#set! rainbow.exclude))
-```
-
-### Code outline/structure
-
-The `outline.scm` file defines the structure for the code outline.
-
-Here's an example from an `outline.scm` file for JSON:
-
-```scheme
-(pair
-  key: (string (string_content) @name)) @item
-```
-
-This query captures object keys for the outline structure.
-
-| Capture        | Description                                                                          |
-| -------------- | ------------------------------------------------------------------------------------ |
-| @name          | Captures the content of object keys                                                  |
-| @item          | Captures the entire key-value pair                                                   |
-| @context       | Captures elements that provide context for the outline item                          |
-| @context.extra | Captures additional contextual information for the outline item                      |
-| @annotation    | Captures nodes that annotate outline item (doc comments, attributes, decorators)[^1] |
-
-[^1]: These annotations are used by Assistant when generating code modification steps.
-
-### Auto-indentation
-
-The `indents.scm` file defines indentation rules.
-
-Here's an example from an `indents.scm` file for JSON:
-
-```scheme
-(array "]" @end) @indent
-(object "}" @end) @indent
-```
-
-This query marks the end of arrays and objects for indentation purposes.
-
-| Capture | Description                                        |
-| ------- | -------------------------------------------------- |
-| @end    | Captures closing brackets and braces               |
-| @indent | Captures entire arrays and objects for indentation |
-
-### Code injections
-
-The `injections.scm` file defines rules for embedding one language within another, such as code blocks in Markdown or SQL queries in Python strings.
-
-Here's an example from an `injections.scm` file for Markdown:
-
-```scheme
-(fenced_code_block
-  (info_string
-    (language) @injection.language)
-  (code_fence_content) @injection.content)
-
-((inline) @content
- (#set! injection.language "markdown-inline"))
-```
-
-This query identifies fenced code blocks, capturing the language specified in the info string and the content within the block. It also captures inline content and sets its language to "markdown-inline".
-
-| Capture             | Description                                                |
-| ------------------- | ---------------------------------------------------------- |
-| @injection.language | Captures the language identifier for a code block          |
-| @injection.content  | Captures the content to be treated as a different language |
-
-Note that we couldn't use JSON as an example here because it doesn't support language injections.
-
-### Syntax overrides
-
-The `overrides.scm` file defines syntactic _scopes_ that can be used to override certain editor settings within specific language constructs.
-
-For example, there is a language-specific setting called `word_characters` that controls which non-alphabetic characters are considered part of a word, for example when you double click to select a variable. In JavaScript, "$" and "#" are considered word characters.
-
-There is also a language-specific setting called `completion_query_characters` that controls which characters trigger autocomplete suggestions. In JavaScript, when your cursor is within a _string_, "-" is should be considered a completion query character. To achieve this, the JavaScript `overrides.scm` file contains the following pattern:
-
-```scheme
-[
-  (string)
-  (template_string)
-] @string
-```
-
-And the JavaScript `config.toml` contains this setting:
-
-```toml
-word_characters = ["#", "$"]
-
-[overrides.string]
-completion_query_characters = ["-"]
-```
-
-You can also disable certain auto-closing brackets in a specific scope. For example, to prevent auto-closing `'` within strings, you could put the following in the JavaScript `config.toml`:
-
-```toml
-brackets = [
-  { start = "'", end = "'", close = true, newline = false, not_in = ["string"] },
-  # other pairs...
-]
-```
-
-#### Range inclusivity
-
-By default, the ranges defined in `overrides.scm` are _exclusive_. So in the case above, if you cursor was _outside_ the quotation marks delimiting the string, the `string` scope would not take effect. Sometimes, you may want to make the range _inclusive_. You can do this by adding the `.inclusive` suffix to the capture name in the query.
-
-For example, in JavaScript, we also disable auto-closing of single quotes within comments. And the comment scope must extend all the way to the newline after a line comment. To achieve this, the JavaScript `overrides.scm` contains the following pattern:
-
-```scheme
-(comment) @comment.inclusive
-```
-
-### Text objects
-
-The `textobjects.scm` file defines rules for navigating by text objects. This was added in Zed v0.165 and is currently used only in Vim mode.
-
-Vim provides two levels of granularity for navigating around files. Section-by-section with `[]` etc., and method-by-method with `]m` etc. Even languages that don't support functions and classes can work well by defining similar concepts. For example CSS defines a rule-set as a method, and a media-query as a class.
-
-For languages with closures, these typically should not count as functions in Zed. This is best-effort however, as languages like JavaScript do not syntactically differentiate syntactically between closures and top-level function declarations.
-
-For languages with declarations like C, provide queries that match `@class.around` or `@function.around`. The `if` and `ic` text objects will default to these if there is no inside.
-
-If you are not sure what to put in textobjects.scm, both [nvim-treesitter-textobjects](https://github.com/nvim-treesitter/nvim-treesitter-textobjects), and the [Helix editor](https://github.com/helix-editor/helix) have queries for many languages. You can refer to the Zed [built-in languages](https://github.com/zed-industries/zed/tree/main/crates/languages/src) to see how to adapt these.
-
-| Capture          | Description                                                             | Vim mode                                         |
-| ---------------- | ----------------------------------------------------------------------- | ------------------------------------------------ |
-| @function.around | An entire function definition or equivalent small section of a file.    | `[m`, `]m`, `[M`,`]M` motions. `af` text object  |
-| @function.inside | The function body (the stuff within the braces).                        | `if` text object                                 |
-| @class.around    | An entire class definition or equivalent large section of a file.       | `[[`, `]]`, `[]`, `][` motions. `ac` text object |
-| @class.inside    | The contents of a class definition.                                     | `ic` text object                                 |
-| @comment.around  | An entire comment (e.g. all adjacent line comments, or a block comment) | `gc` text object                                 |
-| @comment.inside  | The contents of a comment                                               | `igc` text object (rarely supported)             |
-
-For example:
-
-```scheme
-; include only the content of the method in the function
-(method_definition
-    body: (_
-        "{"
-        (_)* @function.inside
-        "}")) @function.around
-
-; match function.around for declarations with no body
-(function_signature_item) @function.around
-
-; join all adjacent comments into one
-(comment)+ @comment.around
-```
-
-### Text redactions
-
-The `redactions.scm` file defines text redaction rules. When collaborating and sharing your screen, it makes sure that certain syntax nodes are rendered in a redacted mode to avoid them from leaking.
-
-Here's an example from a `redactions.scm` file for JSON:
-
-```scheme
-(pair value: (number) @redact)
-(pair value: (string) @redact)
-(array (number) @redact)
-(array (string) @redact)
-```
-
-This query marks number and string values in key-value pairs and arrays for redaction.
-
-| Capture | Description                    |
-| ------- | ------------------------------ |
-| @redact | Captures values to be redacted |
-
-### Runnable code detection
-
-The `runnables.scm` file defines rules for detecting runnable code.
-
-Here's an example from a `runnables.scm` file for JSON:
-
-```scheme
-(
-    (document
-        (object
-            (pair
-                key: (string
-                    (string_content) @_name
-                    (#eq? @_name "scripts")
-                )
-                value: (object
-                    (pair
-                        key: (string (string_content) @run @script)
-                    )
-                )
-            )
-        )
-    )
-    (#set! tag package-script)
-    (#set! tag composer-script)
-)
-```
-
-This query detects runnable scripts in package.json and composer.json files.
-
-The `@run` capture specifies where the run button should appear in the editor. Other captures, except those prefixed with an underscore, are exposed as environment variables with a prefix of `ZED_CUSTOM_$(capture_name)` when running the code.
-
-| Capture | Description                                            |
-| ------- | ------------------------------------------------------ |
-| @\_name | Captures the "scripts" key                             |
-| @run    | Captures the script name                               |
-| @script | Also captures the script name (for different purposes) |
-
-<!--
-TBD: `#set! tag`
--->
-
-## Language Servers
-
-Zed uses the [Language Server Protocol](https://microsoft.github.io/language-server-protocol/) to provide advanced language support.
-
-An extension may provide any number of language servers. To provide a language server from your extension, add an entry to your `extension.toml` with the name of your language server and the language(s) it applies to. The entry in the list of `languages` has to match the `name` field from the `config.toml` file for that language:
-
-```toml
-[language_servers.my-language-server]
-name = "My Language LSP"
-languages = ["My Language"]
-```
-
-Then, in the Rust code for your extension, implement the `language_server_command` method on your extension:
-
-```rust
-impl zed::Extension for MyExtension {
-    fn language_server_command(
-        &mut self,
-        language_server_id: &LanguageServerId,
-        worktree: &zed::Worktree,
-    ) -> Result<zed::Command> {
-        Ok(zed::Command {
-            command: get_path_to_language_server_executable()?,
-            args: get_args_for_language_server()?,
-            env: get_env_for_language_server()?,
-        })
-    }
-}
-```
-
-You can customize the handling of the language server using several optional methods in the `Extension` trait. For example, you can control how completions are styled using the `label_for_completion` method. For a complete list of methods, see the [API docs for the Zed extension API](https://docs.rs/zed_extension_api).
-
-### Multi-Language Support
-
-If your language server supports additional languages, you can use `language_ids` to map Zed `languages` to the desired [LSP-specific `languageId`](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocumentItem) identifiers:
-
-```toml
-
-[language-servers.my-language-server]
-name = "Whatever LSP"
-languages = ["JavaScript", "HTML", "CSS"]
-
-[language-servers.my-language-server.language_ids]
-"JavaScript" = "javascript"
-"TSX" = "typescriptreact"
-"HTML" = "html"
-"CSS" = "css"
-```
diff --git a/docs/src/extensions/mcp-extensions.md b/docs/src/extensions/mcp-extensions.md
deleted file mode 100644
index cf9c5a611b..0000000000
--- a/docs/src/extensions/mcp-extensions.md
+++ /dev/null
@@ -1,44 +0,0 @@
-# MCP Server Extensions
-
-[Model Context Protocol servers](../ai/mcp.md) can be exposed as extensions for use in the Agent Panel.
-
-## Defining MCP Extensions
-
-A given extension may provide one or more MCP servers.
-Each MCP server must be registered in the `extension.toml`:
-
-```toml
-[context_servers.my-context-server]
-```
-
-Then, in the Rust code for your extension, implement the `context_server_command` method on your extension:
-
-```rust
-impl zed::Extension for MyExtension {
-    fn context_server_command(
-        &mut self,
-        context_server_id: &ContextServerId,
-        project: &zed::Project,
-    ) -> Result<zed::Command> {
-        Ok(zed::Command {
-            command: get_path_to_context_server_executable()?,
-            args: get_args_for_context_server()?,
-            env: get_env_for_context_server()?,
-        })
-    }
-}
-```
-
-This method should return the command to start up an MCP server, along with any arguments or environment variables necessary for it to function.
-
-If you need to download the MCP server from an external source—like GitHub Releases or npm—you can also do that in this function.
-
-## Available Extensions
-
-Check out all the MCP servers that have already been exposed as extensions [on Zed's site](https://zed.dev/extensions?filter=context-servers).
-
-We recommend taking a look at their repositories as a way to understand how they are generally created and structured.
-
-## Testing
-
-To test your new MCP server extension, you can [install it as a dev extension](./developing-extensions.md#developing-an-extension-locally).
diff --git a/docs/src/extensions/slash-commands.md b/docs/src/extensions/slash-commands.md
deleted file mode 100644
index 898649b327..0000000000
--- a/docs/src/extensions/slash-commands.md
+++ /dev/null
@@ -1,138 +0,0 @@
-# Slash Commands
-
-Extensions may provide slash commands for use in the Assistant.
-
-## Example extension
-
-To see a working example of an extension that provides slash commands, check out the [`slash-commands-example` extension](https://github.com/zed-industries/zed/tree/main/extensions/slash-commands-example).
-
-This extension can be [installed as a dev extension](./developing-extensions.md#developing-an-extension-locally) if you want to try it out for yourself.
-
-## Defining slash commands
-
-A given extension may provide one or more slash commands. Each slash command must be registered in the `extension.toml`.
-
-For example, here is an extension that provides two slash commands: `/echo` and `/pick-one`:
-
-```toml
-[slash_commands.echo]
-description = "echoes the provided input"
-requires_argument = true
-
-[slash_commands.pick-one]
-description = "pick one of three options"
-requires_argument = true
-```
-
-Each slash command may define the following properties:
-
-- `description`: A description of the slash command that will be shown when completing available commands.
-- `requires_argument`: Indicates whether a slash command requires at least one argument to run.
-
-## Implementing slash command behavior
-
-To implement behavior for your slash commands, implement `run_slash_command` for your extension.
-
-This method accepts the slash command that will be run, the list of arguments passed to it, and an optional `Worktree`.
-
-This method returns `SlashCommandOutput`, which contains the textual output of the command in the `text` field. The output may also define `SlashCommandOutputSection`s that contain ranges into the output. These sections are then rendered as creases in the Assistant's context editor.
-
-Your extension should `match` on the command name (without the leading `/`) and then execute behavior accordingly:
-
-```rs
-impl zed::Extension for MyExtension {
-    fn run_slash_command(
-        &self,
-        command: SlashCommand,
-        args: Vec<String>,
-        _worktree: Option<&Worktree>,
-    ) -> Result<SlashCommandOutput, String> {
-        match command.name.as_str() {
-            "echo" => {
-                if args.is_empty() {
-                    return Err("nothing to echo".to_string());
-                }
-
-                let text = args.join(" ");
-
-                Ok(SlashCommandOutput {
-                    sections: vec![SlashCommandOutputSection {
-                        range: (0..text.len()).into(),
-                        label: "Echo".to_string(),
-                    }],
-                    text,
-                })
-            }
-            "pick-one" => {
-                let Some(selection) = args.first() else {
-                    return Err("no option selected".to_string());
-                };
-
-                match selection.as_str() {
-                    "option-1" | "option-2" | "option-3" => {}
-                    invalid_option => {
-                        return Err(format!("{invalid_option} is not a valid option"));
-                    }
-                }
-
-                let text = format!("You chose {selection}.");
-
-                Ok(SlashCommandOutput {
-                    sections: vec![SlashCommandOutputSection {
-                        range: (0..text.len()).into(),
-                        label: format!("Pick One: {selection}"),
-                    }],
-                    text,
-                })
-            }
-            command => Err(format!("unknown slash command: \"{command}\"")),
-        }
-    }
-}
-```
-
-## Auto-completing slash command arguments
-
-For slash commands that have arguments, you may also choose to implement `complete_slash_command_argument` to provide completions for your slash commands.
-
-This method accepts the slash command that will be run and the list of arguments passed to it. It returns a list of `SlashCommandArgumentCompletion`s that will be shown in the completion menu.
-
-A `SlashCommandArgumentCompletion` consists of the following properties:
-
-- `label`: The label that will be shown in the completion menu.
-- `new_text`: The text that will be inserted when the completion is accepted.
-- `run_command`: Whether the slash command will be run when the completion is accepted.
-
-Once again, your extension should `match` on the command name (without the leading `/`) and return the desired argument completions:
-
-```rs
-impl zed::Extension for MyExtension {
-    fn complete_slash_command_argument(
-        &self,
-        command: SlashCommand,
-        _args: Vec<String>,
-    ) -> Result<Vec<SlashCommandArgumentCompletion>, String> {
-        match command.name.as_str() {
-            "echo" => Ok(vec![]),
-            "pick-one" => Ok(vec![
-                SlashCommandArgumentCompletion {
-                    label: "Option One".to_string(),
-                    new_text: "option-1".to_string(),
-                    run_command: true,
-                },
-                SlashCommandArgumentCompletion {
-                    label: "Option Two".to_string(),
-                    new_text: "option-2".to_string(),
-                    run_command: true,
-                },
-                SlashCommandArgumentCompletion {
-                    label: "Option Three".to_string(),
-                    new_text: "option-3".to_string(),
-                    run_command: true,
-                },
-            ]),
-            command => Err(format!("unknown slash command: \"{command}\"")),
-        }
-    }
-}
-```
diff --git a/docs/src/extensions/themes.md b/docs/src/extensions/themes.md
deleted file mode 100644
index ecdbdace59..0000000000
--- a/docs/src/extensions/themes.md
+++ /dev/null
@@ -1,53 +0,0 @@
-# Themes
-
-The `themes` directory in an extension should contain one or more theme files.
-
-Each theme file should adhere to the JSON schema specified at [`https://zed.dev/schema/themes/v0.2.0.json`](https://zed.dev/schema/themes/v0.2.0.json).
-
-See [this blog post](https://zed.dev/blog/user-themes-now-in-preview) for more details about creating themes.
-
-## Theme JSON Structure
-
-The structure of a Zed theme is defined in the [Zed Theme JSON Schema](https://zed.dev/schema/themes/v0.2.0.json).
-
-A Zed theme consists of a Theme Family object including:
-
-- `name`: The name for the theme family
-- `author`: The name of the author of the theme family
-- `themes`: An array of Themes belonging to the theme family
-
-The core components a Theme object include:
-
-1. Theme Metadata:
-
-   - `name`: The name of the theme
-   - `appearance`: Either "light" or "dark"
-
-2. Style Properties under the `style`, such as:
-
-   - `background`: The main background color
-   - `foreground`: The main text color
-   - `accent`: The accent color used for highlighting and emphasis
-
-3. Syntax Highlighting:
-
-   - `syntax`: An object containing color definitions for various syntax elements (e.g., keywords, strings, comments)
-
-4. UI Elements:
-
-   - Colors for various UI components such as:
-     - `element.background`: Background color for UI elements
-     - `border`: Border colors for different states (normal, focused, selected)
-     - `text`: Text colors for different states (normal, muted, accent)
-
-5. Editor-specific Colors:
-
-   - Colors for editor-related elements such as:
-     - `editor.background`: Editor background color
-     - `editor.gutter`: Gutter colors
-     - `editor.line_number`: Line number colors
-
-6. Terminal Colors:
-   - ANSI color definitions for the integrated terminal
-
-We recommend looking at our [existing themes](https://github.com/zed-industries/zed/tree/main/assets/themes) to get a more comprehensive idea of what can be styled.
diff --git a/docs/src/getting-started.md b/docs/src/getting-started.md
deleted file mode 100644
index 77bf9cef30..0000000000
--- a/docs/src/getting-started.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# Getting Started
-
-Welcome to Zed! We are excited to have you. Zed is a powerful multiplayer code editor designed to stay out of your way and help you build what's next.
-
-## Key Features
-
-- [Smooth Editing](./configuring-zed.md): Built in Rust, Zed is responsive and intuitive, with a minimalistic aesthetic and pixel-level editing controls.
-- [Agentic Editing](./ai/overview.md): Use Zed's hosted models to collaborate with agents directly in an IDE. You can also plug into a third-party agent or bring your own keys.
-- [Debugger](./debugger.md): Debug your code in seconds, not hours, with minimal setup required.
-- [Remote Development](./remote-development.md): Offload the heavy lifting to the cloud, so you can focus on writing code.
-- [Extensions](./extensions.md): Leverage Zed's extensions to customize how you work.
-
-## Join the Zed Community
-
-Zed is proudly open source, and we get better with every contribution. Join us on GitHub or in Discord to contribute code, report bugs, or suggest features.
-
-- [Join Discord](https://discord.com/invite/zedindustries)
-- [GitHub Discussions](https://github.com/zed-industries/zed/discussions)
-- [Zed Reddit](https://www.reddit.com/r/ZedEditor)
diff --git a/docs/src/git.md b/docs/src/git.md
deleted file mode 100644
index d562eb4d0a..0000000000
--- a/docs/src/git.md
+++ /dev/null
@@ -1,250 +0,0 @@
----
-description: Zed is a text editor that supports lots of Git features
-title: Zed Editor Git integration documentation
----
-
-# Git
-
-Zed currently offers a set of fundamental Git features, with support coming in the future for more advanced ones, like conflict resolution tools, line by line staging, and more.
-
-Here's an overview of all currently supported features:
-
-- Committing
-- Staging, pushing, pulling, and fetching
-- Project Diff: A multibuffer view of all changes
-- Diff indicators in buffers and editor scrollbars
-- Inline diff toggle and reverts in the editor for unstaged changes
-- Git status in the Project Panel
-- Branch creating and switching
-- Git blame viewing
-- Git stash pop, apply, drop and view
-
-## Git Panel
-
-The Git Panel gives you a birds-eye view of the state of your working tree and of Git's staging area.
-
-You can open the Git Panel using {#action git_panel::ToggleFocus}, or by clicking the Git icon in the status bar.
-
-In the panel you can see the state of your project at a glance—which repository and branch are active, what files have changed and the current staging state of each file.
-
-Zed monitors your repository so that changes you make on the command line are instantly reflected.
-
-### Configuration
-
-You can configure how Zed hard wraps commit messages with the `preferred-line-length` setting of the "Git Commit" language. The default is `72`, but it can be set to any number of characters `0` or more.
-
-The Git Panel also allows configuring the `soft_wrap` setting to adjust how commit messages display while you are typing them in the Git Panel. The default setting is `editor_width`, however, `none`, `preferred_line_length`, and `bounded` are also options.
-
-#### Example
-
-```json
-"languages": {
-  "Git Commit": {
-    "soft_wrap": "editor_width",
-    "preferred_line_length": 72
-  },
-}
-```
-
-## Project Diff
-
-You can see all of the changes captured by Git in Zed by opening the Project Diff ({#kb git::Diff}), accessible via the {#action git::Diff} action in the Command Palette or the Git Panel.
-
-All of the changes displayed in the Project Diff behave exactly the same as any other multibuffer: they are all editable excerpts of files.
-
-You can stage or unstage each hunk as well as a whole file by hitting the buttons on the tab bar or their corresponding keybindings.
-
-<!-- Add media -->
-
-## Fetch, push, and pull
-
-Fetch, push, or pull from your Git repository in Zed via the buttons available on the Git Panel or via the Command Palette by looking at the respective actions: {#action git::Fetch}, {#action git::Push}, and {#action git::Pull}.
-
-## Staging Workflow
-
-Zed has two primary staging workflows, using either the Project Diff or the panel directly.
-
-### Using the Project Diff
-
-In the Project Diff view, you can focus on each hunk and stage them individually by clicking on the tab bar buttons or via the keybindings {#action git::StageAndNext} ({#kb git::StageAndNext}).
-
-Similarly, stage all hunks at the same time with the {#action git::StageAll} ({#kb git::StageAll}) keybinding and then immediately commit with {#action git::Commit} ({#kb git::Commit}).
-
-### Using the Git Panel
-
-From the panel, you can simply type a commit message and hit the commit button, or {#action git::Commit}. This will automatically stage all tracked files (indicated by a `[·]` in the entry's checkbox) and commit them.
-
-<!-- Show a set of changes with default staged -->
-
-Entries can be staged using each individual entry's checkbox. All changes can be staged using the button at the top of the panel, or {#action git::StageAll}.
-
-<!-- Add media -->
-
-## Committing
-
-Zed offers two commit textareas:
-
-1. The first one is available right at the bottom of the Git Panel. Hitting {#kb git::Commit} immediately commits all of your staged changes.
-2. The second is available via the action {#action git::ExpandCommitEditor} or via hitting the {#kb git::ExpandCommitEditor} while focused in the Git Panel commit textarea.
-
-### Undoing a Commit
-
-As soon as you commit in Zed, in the Git Panel, you'll see a bar right under the commit textarea, which will show the recently submitted commit.
-In there, you can use the "Uncommit" button, which performs the `git reset HEADˆ--soft` command.
-
-### Configuring Commit Line Length
-
-By default, Zed sets the commit line length to `72` but it can be configured in your local `settings.json` file.
-
-Find more information about setting the `preferred-line-length` in the [Configuration](#configuration) section.
-
-## Stashing
-
-Git stash allows you to temporarily save your uncommitted changes and revert your working directory to a clean state. This is particularly useful when you need to quickly switch branches or pull updates without committing incomplete work.
-
-### Creating Stashes
-
-To stash all your current changes, use the {#action git::StashAll} action. This will save both staged and unstaged changes to a new stash entry and clean your working directory.
-
-### Managing Stashes
-
-Zed provides a comprehensive stash picker accessible via {#action git::ViewStash}. From the stash picker, you can:
-
-- **View stash list**: Browse all your saved stashes with their descriptions and timestamps
-- **Open diffs**: See exactly what changes are stored in each stash
-- **Apply stashes**: Apply stash changes to your working directory while keeping the stash entry
-- **Pop stashes**: Apply stash changes and remove the stash entry from the list
-- **Drop stashes**: Delete unwanted stash entries without applying them
-
-### Quick Stash Operations
-
-For faster workflows, Zed provides direct actions to work with the most recent stash:
-
-- **Apply latest stash**: Use {#action git::StashApply} to apply the most recent stash without removing it
-- **Pop latest stash**: Use {#action git::StashPop} to apply and remove the most recent stash
-
-### Stash Diff View
-
-When viewing a specific stash in the diff view, you have additional options available through the interface:
-
-- Apply the current stash to your working directory
-- Pop the current stash (apply and remove)
-- Remove the stash without applying changes
-
-To open the stash diff view, select a stash from the stash picker and use the {#action stash_picker::ShowStashItem} ({#kb stash_picker::ShowStashItem}) keybinding.
-
-## AI Support in Git
-
-Zed currently supports LLM-powered commit message generation.
-You can ask AI to generate a commit message by focusing on the message editor within the Git Panel and either clicking on the pencil icon in the bottom left, or reaching for the {#action git::GenerateCommitMessage} ({#kb git::GenerateCommitMessage}) keybinding.
-
-> Note that you need to have an LLM provider configured for billing purposes, either via your own API keys or trialing/paying for Zed's hosted AI models. Visit [the AI configuration page](./ai/configuration.md) to learn how to do so.
-
-You can specify your preferred model to use by providing a `commit_message_model` agent setting. See [Feature-specific models](./ai/agent-settings.md#feature-specific-models) for more information.
-
-```json [settings]
-{
-  "agent": {
-    "version": "2",
-    "commit_message_model": {
-      "provider": "anthropic",
-      "model": "claude-3-5-haiku"
-    }
-  }
-}
-```
-
-<!-- Add media -->
-
-More advanced AI integration with Git features may come in the future.
-
-## Git Integrations
-
-Zed integrates with popular Git hosting services to ensure that Git commit hashes and references to Issues, Pull Requests, and Merge Requests become clickable links.
-
-Zed currently supports links to the hosted versions of
-[GitHub](https://github.com),
-[GitLab](https://gitlab.com),
-[Bitbucket](https://bitbucket.org),
-[SourceHut](https://sr.ht) and
-[Codeberg](https://codeberg.org).
-
-For self-hosted GitHub, GitLab, or Bitbucket instances, add them to the `git_hosting_providers` setting so commit hashes and permalinks resolve to your domain:
-
-```json [settings]
-{
-  "git_hosting_providers": [
-    {
-      "provider": "gitlab",
-      "name": "Corp GitLab",
-      "base_url": "https://git.example.corp"
-    }
-  ]
-}
-```
-
-Zed also has a Copy Permalink feature to create a permanent link to a code snippet on your Git hosting service.
-These links are useful for sharing a specific line or range of lines in a file at a specific commit.
-Trigger this action via the [Command Palette](./getting-started.md#command-palette) (search for `permalink`),
-by creating a [custom key bindings](key-bindings.md#custom-key-bindings) to the
-`editor::CopyPermalinkToLine` or `editor::OpenPermalinkToLine` actions
-or by simply right clicking and selecting `Copy Permalink` with line(s) selected in your editor.
-
-## Diff Hunk Keyboard Shortcuts
-
-When viewing files with changes, Zed displays diff hunks that can be expanded or collapsed for detailed review:
-
-- **Expand all diff hunks**: {#action editor::ExpandAllDiffHunks} ({#kb editor::ExpandAllDiffHunks})
-- **Collapse all diff hunks**: Press `Escape` (bound to {#action editor::Cancel})
-- **Toggle selected diff hunks**: {#action editor::ToggleSelectedDiffHunks} ({#kb editor::ToggleSelectedDiffHunks})
-- **Navigate between hunks**: {#action editor::GoToHunk} and {#action editor::GoToPreviousHunk}
-
-> **Tip:** The `Escape` key is the quickest way to collapse all expanded diff hunks and return to an overview of your changes.
-
-## Action Reference
-
-| Action                                    | Keybinding                            |
-| ----------------------------------------- | ------------------------------------- |
-| {#action git::Add}                        | {#kb git::Add}                        |
-| {#action git::StageAll}                   | {#kb git::StageAll}                   |
-| {#action git::UnstageAll}                 | {#kb git::UnstageAll}                 |
-| {#action git::ToggleStaged}               | {#kb git::ToggleStaged}               |
-| {#action git::StageAndNext}               | {#kb git::StageAndNext}               |
-| {#action git::UnstageAndNext}             | {#kb git::UnstageAndNext}             |
-| {#action git::Commit}                     | {#kb git::Commit}                     |
-| {#action git::ExpandCommitEditor}         | {#kb git::ExpandCommitEditor}         |
-| {#action git::Push}                       | {#kb git::Push}                       |
-| {#action git::ForcePush}                  | {#kb git::ForcePush}                  |
-| {#action git::Pull}                       | {#kb git::Pull}                       |
-| {#action git::PullRebase}                 | {#kb git::PullRebase}                 |
-| {#action git::Fetch}                      | {#kb git::Fetch}                      |
-| {#action git::Diff}                       | {#kb git::Diff}                       |
-| {#action git::Restore}                    | {#kb git::Restore}                    |
-| {#action git::RestoreFile}                | {#kb git::RestoreFile}                |
-| {#action git::Branch}                     | {#kb git::Branch}                     |
-| {#action git::Switch}                     | {#kb git::Switch}                     |
-| {#action git::CheckoutBranch}             | {#kb git::CheckoutBranch}             |
-| {#action git::Blame}                      | {#kb git::Blame}                      |
-| {#action git::StashAll}                   | {#kb git::StashAll}                   |
-| {#action git::StashPop}                   | {#kb git::StashPop}                   |
-| {#action git::StashApply}                 | {#kb git::StashApply}                 |
-| {#action git::ViewStash}                  | {#kb git::ViewStash}                  |
-| {#action editor::ToggleGitBlameInline}    | {#kb editor::ToggleGitBlameInline}    |
-| {#action editor::ExpandAllDiffHunks}      | {#kb editor::ExpandAllDiffHunks}      |
-| {#action editor::ToggleSelectedDiffHunks} | {#kb editor::ToggleSelectedDiffHunks} |
-
-> Not all actions have default keybindings, but can be bound by [customizing your keymap](./key-bindings.md#user-keymaps).
-
-## Git CLI Configuration
-
-If you would like to also use Zed for your [git commit message editor](https://git-scm.com/book/en/v2/Customizing-Git-Git-Configuration#_core_editor) when committing from the command line you can use `zed --wait`:
-
-```sh
-git config --global core.editor "zed --wait"
-```
-
-Or add the following to your shell environment (in `~/.zshrc`, `~/.bashrc`, etc):
-
-```sh
-export GIT_EDITOR="zed --wait"
-```
diff --git a/docs/src/globs.md b/docs/src/globs.md
deleted file mode 100644
index 2f86fb9158..0000000000
--- a/docs/src/globs.md
+++ /dev/null
@@ -1,80 +0,0 @@
-# Globs
-
-Zed supports the use of [glob](<https://en.wikipedia.org/wiki/Glob_(programming)>) patterns that are the formal name for Unix shell-style path matching wildcards like `*.md` or `docs/src/**/*.md` supported by sh, bash, zsh, etc. A glob is similar but distinct from a [regex (regular expression)](https://en.wikipedia.org/wiki/Regular_expression). You may be In Zed these are commonly used when matching filenames.
-
-## Glob Flavor
-
-Zed uses two different rust crates for matching glob patterns:
-
-- [ignore crate](https://docs.rs/ignore/latest/ignore/) for matching glob patterns stored in `.gitignore` files
-- [glob crate](https://docs.rs/glob/latest/glob/) for matching file paths in Zed
-
-While simple expressions are portable across environments (e.g. running `ls *.py` or `*.tmp` in a gitignore) there is significant divergence in the support for and syntax of more advanced features varies (character classes, exclusions, `**`, etc) across implementations. For the rest of this document we will be describing globs as supported in Zed via the `glob` crate implementation. Please see [References](#references) below for documentation links for glob pattern syntax for `.gitignore`, shells and other programming languages.
-
-The `glob` crate is implemented entirely in rust and does not rely on the `glob` / `fnmatch` interfaces provided by your platforms libc. This means that globs in Zed should behave similarly with across platforms.
-
-## Introduction
-
-A glob "pattern" is used to match a file name or complete file path. For example, when using "Search all files" {#kb project_search::ToggleFocus} you can click the funnel shaped Toggle Filters" button or {#kb project_search::ToggleFilters} and it will show additional search fields for "Include" and "Exclude" which support specifying glob patterns for matching file paths and file names.
-
-When creating a glob pattern you can use one or multiple special characters:
-
-| Special Character | Meaning                                                           |
-| ----------------- | ----------------------------------------------------------------- |
-| `?`               | Matches any single character                                      |
-| `*`               | Matches any (possibly empty) sequence of characters               |
-| `**`              | Matches the current directory and arbitrary subdirectories        |
-| `[abc]`           | Matches any one character in the brackets                         |
-| `[a-z]`           | Matches any of a range of characters (ordered by Unicode)         |
-| `[!...]`          | The negation of `[...]` (matches a character not in the brackets) |
-
-Notes:
-
-1. Shell-style brace-expansions like `{a,b,c}` are not supported.
-2. To match a literal `-` character inside brackets it must come first `[-abc]` or last `[abc-]`.
-3. To match the literal `[` character use `[[]` or put it as the first character in the group `[[abc]`.
-4. To match the literal `]` character use `[]]` or put it as the last character in the group `[abc]]`.
-
-## Examples
-
-### Matching file extensions
-
-If you wanted to only search Markdown files add `*.md` to the "Include" search field.
-
-### Case insensitive matching
-
-Globs in Zed are case-sensitive, so `*.c` will not match `main.C` (even on case-insensitive filesystems like HFS+/APFS on macOS). Instead use brackets to match characters. So instead of `*.c` use `*.[cC]`.
-
-### Matching directories
-
-If you wanted to search the [zed repository](https://github.com/zed-industries/zed) for examples of [Configuring Language Servers](https://zed.dev/docs/configuring-languages#configuring-language-servers) (under `"lsp"` in Zed settings.json) you could search for `"lsp"` and in the "Include" filter specify `docs/**/*.md`. This would only match files whose path was under the `docs` directory or any nested subdirectories `**/` of that folder with a filename that ends in `.md`.
-
-If instead you wanted to restrict yourself only to [Zed Language-Specific Documentation](https://zed.dev/docs/languages) pages you could define a narrower pattern of: `docs/src/languages/*.md` this would match [`docs/src/languages/rust.md`](https://github.com/zed-industries/zed/blob/main/docs/src/languages/rust.md) and [`docs/src/languages/cpp.md`](https://github.com/zed-industries/zed/blob/main/docs/src/languages/cpp.md) but not [`docs/src/configuring-languages.md`](https://github.com/zed-industries/zed/blob/main/docs/src/configuring-languages.md).
-
-### Implicit Wildcards
-
-When using the "Include" / "Exclude" filters on a Project Search each glob is wrapped in implicit wildcards. For example to exclude any files with license in the path or filename from your search just type `license` in the exclude box. Behind the scenes Zed transforms `license` to `**license**`. This means that files named `license.*`, `*.license` or inside a `license` subdirectory will all be filtered out. This enables users to easily filter for `*.ts` without having to remember to type `**/*.ts` every time.
-
-Alternatively, if in your Zed settings you wanted a [`file_types`](./configuring-zed.md#file-types) override which only applied to a certain directory you must explicitly include the wildcard globs. For example, if you had a directory of template files with the `html` extension that you wanted to recognize as Jinja2 template you could use the following:
-
-```json [settings]
-{
-  "file_types": {
-    "C++": ["[cC]"],
-    "Jinja2": ["**/templates/*.html"]
-  }
-}
-```
-
-## References
-
-While globs in Zed are implemented as described above, when writing code using globs in other languages, please reference your platform's glob documentation:
-
-- [macOS fnmatch](https://developer.apple.com/library/archive/documentation/System/Conceptual/ManPages_iPhoneOS/man3/fnmatch.3.html) (BSD C Standard Library)
-- [Linux fnmatch](https://www.gnu.org/software/libc/manual/html_node/Wildcard-Matching.html) (GNU C Standard Library)
-- [POSIX fnmatch](https://pubs.opengroup.org/onlinepubs/9699919799/functions/fnmatch.html) (POSIX Specification)
-- [node-glob](https://github.com/isaacs/node-glob) (Node.js `glob` package)
-- [Python glob](https://docs.python.org/3/library/glob.html) (Python Standard Library)
-- [Golang glob](https://pkg.go.dev/path/filepath#Match) (Go Standard Library)
-- [gitignore patterns](https://git-scm.com/docs/gitignore) (Gitignore Pattern Format)
-- [PowerShell: About Wildcards](https://learn.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_wildcards) (Wildcards in PowerShell)
diff --git a/docs/src/helix.md b/docs/src/helix.md
deleted file mode 100644
index 467a2fac7c..0000000000
--- a/docs/src/helix.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Helix Mode
-
-_Work in progress! Not all Helix keybindings are implemented yet._
-
-Zed's Helix mode is an emulation layer that brings Helix-style keybindings and modal editing to Zed. It builds upon Zed's [Vim mode](./vim.md), so much of the core functionality is shared. Enabling `helix_mode` will also enable `vim_mode`.
-
-For a guide on Vim-related features that are also available in Helix mode, please refer to our [Vim mode documentation](./vim.md).
-
-To check the current status of Helix mode, or to request a missing Helix feature, checkout out the ["Are we Helix yet?" discussion](https://github.com/zed-industries/zed/discussions/33580).
-
-For a detailed list of Helix's default keybindings, please visit the [official Helix documentation](https://docs.helix-editor.com/keymap.html).
-
-## Core differences
-
-Any text object that works with `m i` or `m a` also works with `]` and `[`, so for example `] (` selects the next pair of parentheses after the cursor.
diff --git a/docs/src/icon-themes.md b/docs/src/icon-themes.md
deleted file mode 100644
index 72fc51b834..0000000000
--- a/docs/src/icon-themes.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# Icon Themes
-
-Zed comes with a built-in icon theme, with more icon themes available as extensions.
-
-## Selecting an Icon Theme
-
-See what icon themes are installed and preview them via the Icon Theme Selector, which you can open from the command palette with `icon theme selector: toggle`.
-
-Navigating through the icon theme list by moving up and down will change the icon theme in real time and hitting enter will save it to your settings file.
-
-## Installing more Icon Themes
-
-More icon themes are available from the Extensions page, which you can access via the command palette with `zed: extensions` or the [Zed website](https://zed.dev/extensions?filter=icon-themes).
-
-## Configuring Icon Themes
-
-Your selected icon theme is stored in your settings file.
-You can open your settings file from the command palette with {#action zed::OpenSettingsFile} (bound to {#kb zed::OpenSettingsFile}).
-
-Just like with themes, Zed allows for configuring different icon themes for light and dark mode.
-You can set the mode to `"light"` or `"dark"` to ignore the current system mode.
-
-```json [settings]
-{
-  "icon_theme": {
-    "mode": "system",
-    "light": "Light Icon Theme",
-    "dark": "Dark Icon Theme"
-  }
-}
-```
-
-## Icon Theme Development
-
-See: [Developing Zed Icon Themes](./extensions/icon-themes.md)
diff --git a/docs/src/installation.md b/docs/src/installation.md
deleted file mode 100644
index 7802ef7776..0000000000
--- a/docs/src/installation.md
+++ /dev/null
@@ -1,109 +0,0 @@
-# Installing Zed
-
-## Download Zed
-
-### macOS
-
-Get the latest stable builds via [the download page](https://zed.dev/download). If you want to download our preview build, you can find it on its [releases page](https://zed.dev/releases/preview). After the first manual installation, Zed will periodically check for install updates.
-
-You can also install Zed stable via Homebrew:
-
-```sh
-brew install --cask zed
-```
-
-As well as Zed preview:
-
-```sh
-brew install --cask zed@preview
-```
-
-### Windows
-
-Get the latest stable builds via [the download page](https://zed.dev/download). If you want to download our preview build, you can find it on its [releases page](https://zed.dev/releases/preview). After the first manual installation, Zed will periodically check for install updates.
-
-### Linux
-
-For most Linux users, the easiest way to install Zed is through our installation script:
-
-```sh
-curl -f https://zed.dev/install.sh | sh
-```
-
-If you'd like to help us test our new features, you can also install our preview build:
-
-```sh
-curl -f https://zed.dev/install.sh | ZED_CHANNEL=preview sh
-```
-
-This script supports `x86_64` and `AArch64`, as well as common Linux distributions: Ubuntu, Arch, Debian, RedHat, CentOS, Fedora, and more.
-
-If Zed is installed using this installation script, it can be uninstalled at any time by running the shell command `zed --uninstall`. The shell will then prompt you whether you'd like to keep your preferences or delete them. After making a choice, you should see a message that Zed was successfully uninstalled.
-
-If this script is insufficient for your use case, you run into problems running Zed, or there are errors in uninstalling Zed, please see our [Linux-specific documentation](./linux.md).
-
-## System Requirements
-
-### macOS
-
-Zed supports the follow macOS releases:
-
-| Version       | Codename | Apple Status   | Zed Status          |
-| ------------- | -------- | -------------- | ------------------- |
-| macOS 26.x    | Tahoe    | Supported      | Supported           |
-| macOS 15.x    | Sequoia  | Supported      | Supported           |
-| macOS 14.x    | Sonoma   | Supported      | Supported           |
-| macOS 13.x    | Ventura  | Supported      | Supported           |
-| macOS 12.x    | Monterey | EOL 2024-09-16 | Supported           |
-| macOS 11.x    | Big Sur  | EOL 2023-09-26 | Partially Supported |
-| macOS 10.15.x | Catalina | EOL 2022-09-12 | Partially Supported |
-
-The macOS releases labelled "Partially Supported" (Big Sur and Catalina) do not support screen sharing via Zed Collaboration. These features use the [LiveKit SDK](https://livekit.io) which relies upon [ScreenCaptureKit.framework](https://developer.apple.com/documentation/screencapturekit/) only available on macOS 12 (Monterey) and newer.
-
-#### Mac Hardware
-
-Zed supports machines with Intel (x86_64) or Apple (aarch64) processors that meet the above macOS requirements:
-
-- MacBook Pro (Early 2015 and newer)
-- MacBook Air (Early 2015 and newer)
-- MacBook (Early 2016 and newer)
-- Mac Mini (Late 2014 and newer)
-- Mac Pro (Late 2013 or newer)
-- iMac (Late 2015 and newer)
-- iMac Pro (all models)
-- Mac Studio (all models)
-
-### Linux
-
-Zed supports 64-bit Intel/AMD (x86_64) and 64-bit Arm (aarch64) processors.
-
-Zed requires a Vulkan 1.3 driver and the following desktop portals:
-
-- `org.freedesktop.portal.FileChooser`
-- `org.freedesktop.portal.OpenURI`
-- `org.freedesktop.portal.Secret` or `org.freedesktop.Secrets`
-
-### Windows
-
-Zed supports the following Windows releases:
-| Version | Zed Status |
-| ------------------------- | ------------------- |
-| Windows 11, version 22H2 and later | Supported |
-| Windows 10, version 1903 and later | Supported |
-
-A 64-bit operating system is required to run Zed.
-
-#### Windows Hardware
-
-Zed supports machines with x64 (Intel, AMD) or Arm64 (Qualcomm) processors that meet the following requirements:
-
-- Graphics: A GPU that supports DirectX 11 (most PCs from 2012+).
-- Driver: Current NVIDIA/AMD/Intel/Qualcomm driver (not the Microsoft Basic Display Adapter).
-
-### FreeBSD
-
-Not yet available as an official download. Can be built [from source](./development/freebsd.md).
-
-### Web
-
-Not supported at this time. See our [Platform Support issue](https://github.com/zed-industries/zed/issues/5391).
diff --git a/docs/src/key-bindings.md b/docs/src/key-bindings.md
deleted file mode 100644
index f0f1e472c7..0000000000
--- a/docs/src/key-bindings.md
+++ /dev/null
@@ -1,299 +0,0 @@
-# Key bindings
-
-Zed has a very customizable key binding system—you can tweak everything to work exactly how your fingers expect!
-
-## Predefined Keymaps
-
-If you're used to a specific editor's defaults, you can change your `base_keymap` through the settings window ({#kb zed::OpenSettings}) or directly through your `settings.json` file ({#kb zed::OpenSettingsFile}).
-We currently support:
-
-- VS Code (default)
-- Atom
-- Emacs (Beta)
-- JetBrains
-- Sublime Text
-- TextMate
-- Cursor
-- None (disables _all_ key bindings)
-
-This setting can also be changed via the command palette through the `zed: toggle base keymap selector` action.
-
-You can also enable `vim_mode` or `helix_mode`, which add modal bindings.
-For more information, see the documentation for [Vim mode](./vim.md) and [Helix mode](./helix.md).
-
-## Keymap Editor
-
-You can access the keymap editor through the {#kb zed::OpenKeymap} action or by running {#action zed::OpenKeymap} action from the command palette. You can easily add or change a keybind for an action with the `Change Keybinding` or `Add Keybinding` button on the command pallets left bottom corner.
-
-In there, you can see all of the existing actions in Zed as well as the associated keybindings set to them by default.
-
-You can also customize them right from there, either by clicking on the pencil icon that appears when you hover over a particular action, by double-clicking on the action row, or by pressing the `enter` key.
-
-Anything that you end up doing on the keymap editor also gets reflected on the `keymap.json` file.
-
-## User Keymaps
-
-The keymap file is stored in the following locations for each platform:
-
-- macOS/Linux: `~/.config/zed/keymap.json`
-- Windows: `~\AppData\Roaming\Zed/keymap.json`
-
-You can open the keymap with the {#action zed::OpenKeymapFile} action from the command palette.
-
-This file contains a JSON array of objects with `"bindings"`.
-If no `"context"` is set, the bindings are always active.
-If it is set, the binding is only active when the [context matches](#contexts).
-
-Within each binding section, a [key sequence](#keybinding-syntax) is mapped to [an action](#actions).
-If conflicts are detected, they are resolved as [described below](#precedence).
-
-If you are using a non-QWERTY, Latin-character keyboard, you may want to set `use_key_equivalents` to `true`. See [Non-QWERTY keyboards](#non-qwerty-keyboards) for more information.
-
-For example:
-
-```json [keymap]
-[
-  {
-    "bindings": {
-      "ctrl-right": "editor::SelectLargerSyntaxNode",
-      "ctrl-left": "editor::SelectSmallerSyntaxNode"
-    }
-  },
-  {
-    "context": "ProjectPanel && not_editing",
-    "bindings": {
-      "o": "project_panel::Open"
-    }
-  }
-]
-```
-
-You can see all of Zed's default bindings for each platform in the default keymaps files:
-
-- [macOS](https://github.com/zed-industries/zed/blob/main/assets/keymaps/default-macos.json)
-- [Windows](https://github.com/zed-industries/zed/blob/main/assets/keymaps/default-windows.json)
-- [Linux](https://github.com/zed-industries/zed/blob/main/assets/keymaps/default-linux.json).
-
-If you want to debug problems with custom keymaps, you can use `dev: Open Key Context View` from the command palette.
-Please file [an issue](https://github.com/zed-industries/zed) if you run into something you think should work but isn't.
-
-### Keybinding Syntax
-
-Zed has the ability to match against not just a single keypress, but a sequence of keys typed in order. Each key in the `"bindings"` map is a sequence of keypresses separated with a space.
-
-Each keypress is a sequence of modifiers followed by a key. The modifiers are:
-
-- `ctrl-` The control key
-- `cmd-`, `win-` or `super-` for the platform modifier (Command on macOS, Windows key on Windows, and the Super key on Linux).
-- `alt-` for alt (option on macOS)
-- `shift-` The shift key
-- `fn-` The function key
-- `secondary-` Equivalent to `cmd` when Zed is running on macOS and `ctrl` when on Windows and Linux
-
-The keys can be any single Unicode codepoint that your keyboard generates (for example `a`, `0`, `£` or `ç`), or any named key (`tab`, `f1`, `shift`, or `cmd`). If you are using a non-Latin layout (e.g. Cyrillic), you can bind either to the Cyrillic character or the Latin character that key generates with `cmd` pressed.
-
-A few examples:
-
-```json [settings]
- "bindings": {
-   "cmd-k cmd-s": "zed::OpenKeymap", // matches ⌘-k then ⌘-s
-   "space e": "editor::Complete", // type space then e
-   "ç": "editor::Complete", // matches ⌥-c
-   "shift shift": "file_finder::Toggle", // matches pressing and releasing shift twice
- }
-```
-
-The `shift-` modifier can only be used in combination with a letter to indicate the uppercase version. For example, `shift-g` matches typing `G`. Although on many keyboards shift is used to type punctuation characters like `(`, the keypress is not considered to be modified, and so `shift-(` does not match.
-
-The `alt-` modifier can be used on many layouts to generate a different key. For example, on a macOS US keyboard, the combination `alt-c` types `ç`. You can match against either in your keymap file, though by convention, Zed spells this combination as `alt-c`.
-
-It is possible to match against typing a modifier key on its own. For example, `shift shift` can be used to implement JetBrains' 'Search Everywhere' shortcut. In this case, the binding happens on key release instead of on keypress.
-
-### Contexts
-
-If a binding group has a `"context"` key, it will be matched against the currently active contexts in Zed.
-
-Zed's contexts make up a tree, with the root being `Workspace`. Workspaces contain Panes and Panels, and Panes contain Editors, etc. The easiest way to see what contexts are active at a given moment is the key context view, which you can get to with the `dev: open key context view` command in the command palette.
-
-For example:
-
-```
-# in an editor, it might look like this:
-Workspace os=macos keyboard_layout=com.apple.keylayout.QWERTY
-  Pane
-    Editor mode=full extension=md vim_mode=insert
-
-# in the project panel
-Workspace os=macos
-  Dock
-    ProjectPanel not_editing
-```
-
-Context expressions can contain the following syntax:
-
-- `X && Y`, `X || Y` to and/or two conditions
-- `!X` to check that a condition is false
-- `(X)` for grouping
-- `X > Y` to match if an ancestor in the tree matches X and this layer matches Y.
-
-For example:
-
-- `"context": "Editor"` - matches any editor (including inline inputs)
-- `"context": "Editor && mode == full"` - matches the main editors used for editing code
-- `"context": "!Editor && !Terminal"` - matches anywhere except where an Editor or Terminal is focused
-- `"context": "os == macos > Editor"` - matches any editor on macOS.
-
-It's worth noting that attributes are only available on the node they are defined on. This means that if you want to (for example) only enable a keybinding when the debugger is stopped in vim normal mode, you need to do `debugger_stopped > vim_mode == normal`.
-
-> Note: Before Zed v0.197.x, the `!` operator only looked at one node at a time, and `>` meant "parent" not "ancestor". This meant that `!Editor` would match the context `Workspace > Pane > Editor`, because (confusingly) the Pane matches `!Editor`, and that `os == macos > Editor` did not match the context `Workspace > Pane > Editor` because of the intermediate `Pane` node.
-
-If you're using Vim mode, we have information on how [vim modes influence the context](./vim.md#contexts). Helix mode is built on top of Vim mode and uses the same contexts.
-
-### Actions
-
-Almost all of Zed's functionality is exposed as actions.
-Although there is no explicitly documented list, you can find most of them by searching in the command palette, by looking in the default keymaps for [macOS](https://github.com/zed-industries/zed/blob/main/assets/keymaps/default-macos.json), [Windows](https://github.com/zed-industries/zed/blob/main/assets/keymaps/default-windows.json) or [Linux](https://github.com/zed-industries/zed/blob/main/assets/keymaps/default-linux.json), or by using Zed's autocomplete in your keymap file.
-
-Most actions do not require any arguments, and so you can bind them as strings: `"ctrl-a": "language_selector::Toggle"`. Some require a single argument and must be bound as an array: `"cmd-1": ["workspace::ActivatePane", 0]`. Some actions require multiple arguments and are bound as an array of a string and an object: `"ctrl-a": ["pane::DeploySearch", { "replace_enabled": true }]`.
-
-### Precedence
-
-When multiple keybindings have the same keystroke and are active at the same time, precedence is resolved in two ways:
-
-- Bindings that match on lower nodes in the context tree win. This means that if you have a binding with a context of `Editor`, it will take precedence over a binding with a context of `Workspace`. Bindings with no context match at the lowest level in the tree.
-- If there are multiple bindings that match at the same level in the tree, then the binding defined later takes precedence. As user keybindings are loaded after system keybindings, this allows user bindings to take precedence over built-in keybindings.
-
-The other kind of conflict that arises is when you have two bindings, one of which is a prefix of the other. For example, if you have `"ctrl-w":"editor::DeleteToNextWordEnd"` and `"ctrl-w left":"editor::DeleteToEndOfLine"`.
-
-When this happens, and both bindings are active in the current context, Zed will wait for 1 second after you type `ctrl-w` to see if you're about to type `left`. If you don't type anything, or if you type a different key, then `DeleteToNextWordEnd` will be triggered. If you do, then `DeleteToEndOfLine` will be triggered.
-
-### Non-QWERTY keyboards
-
-Zed's support for non-QWERTY keyboards is still a work in progress.
-
-If your keyboard can type the full ASCII range (DVORAK, COLEMAK, etc.), then shortcuts should work as you expect.
-
-Otherwise, read on...
-
-#### macOS
-
-On Cyrillic, Hebrew, Armenian, and other keyboards that are mostly non-ASCII, macOS automatically maps keys to the ASCII range when `cmd` is held. Zed takes this a step further, and it can always match key-presses against either the ASCII layout or the real layout, regardless of modifiers and the `use_key_equivalents` setting. For example, in Thai, pressing `ctrl-ๆ` will match bindings associated with `ctrl-q` or `ctrl-ๆ`.
-
-On keyboards that support extended Latin alphabets (French AZERTY, German QWERTZ, etc.), it is often not possible to type the entire ASCII range without `option`. This introduces an ambiguity: `option-2` produces `@`. To ensure that all the built-in keyboard shortcuts can still be typed on these keyboards, we move key bindings around. For example, shortcuts bound to `@` on QWERTY are moved to `"` on a Spanish layout. This mapping is based on the macOS system defaults and can be seen by running `dev: open key context view` from the command palette.
-
-If you are defining shortcuts in your personal keymap, you can opt into the key equivalent mapping by setting `use_key_equivalents` to `true` in your keymap:
-
-```json [keymap]
-[
-  {
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl->": "editor::Indent" // parsed as ctrl-: when a German QWERTZ keyboard is active
-    }
-  }
-]
-```
-
-### Linux
-
-Since v0.196.0, on Linux, if the key that you type doesn't produce an ASCII character, then we use the QWERTY-layout equivalent key for keyboard shortcuts. This means that many shortcuts can be typed on many layouts.
-
-We do not yet move shortcuts around to ensure that all the built-in shortcuts can be typed on every layout, so if there are some ASCII characters that cannot be typed, and your keyboard layout has different ASCII characters on the same keys as would be needed to type them, you may need to add custom key bindings to make this work. We do intend to fix this at some point, and help is very much appreciated!
-
-## Tips and tricks
-
-### Disabling a binding
-
-If you'd like a given binding to do nothing in a given context, you can use
-`null` as the action. This is useful if you hit the key binding by accident and
-want to disable it, or if you want to type the character that would be typed by
-the sequence, or if you want to disable multikey bindings starting with that key.
-
-```json [keymap]
-[
-  {
-    "context": "Workspace",
-    "bindings": {
-      "cmd-r": null // cmd-r will do nothing when the Workspace context is active
-    }
-  }
-]
-```
-
-A `null` binding follows the same precedence rules as normal actions, so it disables all bindings that would match further up in the tree too. If you'd like a binding that matches further up in the tree to take precedence over a lower binding, you need to rebind it to the action you want in the context you want.
-
-This is useful for preventing Zed from falling back to a default key binding when the action you specified is conditional and propagates. For example, `buffer_search::DeployReplace` only triggers when the search bar is not in view. If the search bar is in view, it would propagate and trigger the default action set for that key binding, such as opening the right dock. To prevent this from happening:
-
-```json [keymap]
-[
-  {
-    "context": "Workspace",
-    "bindings": {
-      "cmd-r": null // cmd-r will do nothing when the search bar is in view
-    }
-  },
-  {
-    "context": "Workspace",
-    "bindings": {
-      "cmd-r": "buffer_search::DeployReplace" // cmd-r will deploy replace when the search bar is not in view
-    }
-  }
-]
-```
-
-### Remapping keys
-
-A common request is to be able to map from a single keystroke to a sequence. You can do this with the `workspace::SendKeystrokes` action.
-
-```json [keymap]
-[
-  {
-    "bindings": {
-      // Move down four times
-      "alt-down": ["workspace::SendKeystrokes", "down down down down"],
-      // Expand the selection (editor::SelectLargerSyntaxNode);
-      // copy to the clipboard; and then undo the selection expansion.
-      "cmd-alt-c": [
-        "workspace::SendKeystrokes",
-        "ctrl-shift-right ctrl-shift-right ctrl-shift-right cmd-c ctrl-shift-left ctrl-shift-left ctrl-shift-left"
-      ]
-    }
-  },
-  {
-    "context": "Editor && vim_mode == insert",
-    "bindings": {
-      "j k": ["workspace::SendKeystrokes", "escape"]
-    }
-  }
-]
-```
-
-There are some limitations to this, notably:
-
-- Any asynchronous operation will not happen until after all your key bindings have been dispatched. For example, this means that while you can use a binding to open a file (as in the `cmd-alt-r` example), you cannot send further keystrokes and hope to have them interpreted by the new view.
-- Other examples of asynchronous things are: opening the command palette, communicating with a language server, changing the language of a buffer, anything that hits the network.
-- There is a limit of 100 simulated keys at a time.
-
-The argument to `SendKeystrokes` is a space-separated list of keystrokes (using the same syntax as above). Due to the way that keystrokes are parsed, any segment that is not recognized as a keypress will be sent verbatim to the currently focused input field.
-
-If the argument to `SendKeystrokes` contains the binding used to trigger it, it will use the next-highest-precedence definition of that binding. This allows you to extend the default behavior of a key binding.
-
-### Forward keys to terminal
-
-If you're on Linux or Windows, you might find yourself wanting to forward key combinations to the built-in terminal instead of them being handled by Zed.
-
-For example, `ctrl-n` creates a new tab in Zed on Linux. If you want to send `ctrl-n` to the built-in terminal when it's focused, add the following to your keymap:
-
-```json [settings]
-{
-  "context": "Terminal",
-  "bindings": {
-    "ctrl-n": ["terminal::SendKeystroke", "ctrl-n"]
-  }
-}
-```
-
-### Task Key bindings
-
-You can also bind keys to launch Zed Tasks defined in your `tasks.json`.
-See the [tasks documentation](tasks.md#custom-keybindings-for-tasks) for more.
diff --git a/docs/src/languages.md b/docs/src/languages.md
deleted file mode 100644
index faee42176c..0000000000
--- a/docs/src/languages.md
+++ /dev/null
@@ -1,168 +0,0 @@
-# Language Support in Zed
-
-Zed supports hundreds of programming languages and text formats.
-Some work out-of-the box and others rely on 3rd party extensions.
-
-> The ones included out-of-the-box, natively built into Zed, are marked with \*.
-
-## Languages with Documentation
-
-- [Ansible](./languages/ansible.md)
-- [AsciiDoc](./languages/asciidoc.md)
-- [Astro](./languages/astro.md)
-- [Bash](./languages/bash.md)
-- [Biome](./languages/biome.md)
-- [C](./languages/c.md) \*
-- [C++](./languages/cpp.md) \*
-- [C#](./languages/csharp.md)
-- [Clojure](./languages/clojure.md)
-- [CSS](./languages/css.md) \*
-- [Dart](./languages/dart.md)
-- [Deno](./languages/deno.md)
-- [Diff](./languages/diff.md) \*
-- [Docker](./languages/docker.md)
-- [Elixir](./languages/elixir.md)
-- [Elm](./languages/elm.md)
-- [Emmet](./languages/emmet.md)
-- [Erlang](./languages/erlang.md)
-- [Fish](./languages/fish.md)
-- [GDScript](./languages/gdscript.md)
-- [Gleam](./languages/gleam.md)
-- [GLSL](./languages/glsl.md)
-- [Go](./languages/go.md) \*
-- [Groovy](./languages/groovy.md)
-- [Haskell](./languages/haskell.md)
-- [Helm](./languages/helm.md)
-- [HTML](./languages/html.md)
-- [Java](./languages/java.md)
-- [JavaScript](./languages/javascript.md) \*
-- [Julia](./languages/julia.md)
-- [JSON](./languages/json.md) \*
-- [Jsonnet](./languages/jsonnet.md)
-- [Kotlin](./languages/kotlin.md)
-- [Lua](./languages/lua.md)
-- [Luau](./languages/luau.md)
-- [Makefile](./languages/makefile.md)
-- [Markdown](./languages/markdown.md) \*
-- [Nim](./languages/nim.md)
-- [OCaml](./languages/ocaml.md)
-- [PHP](./languages/php.md)
-- [Prisma](./languages/prisma.md)
-- [Proto](./languages/proto.md)
-- [PureScript](./languages/purescript.md)
-- [Python](./languages/python.md) \*
-- [R](./languages/r.md)
-- [Rego](./languages/rego.md)
-- [ReStructuredText](./languages/rst.md)
-- [Racket](./languages/racket.md)
-- [Roc](./languages/roc.md)
-- [Ruby](./languages/ruby.md)
-- [Rust](./languages/rust.md) \* (Zed's written in Rust)
-- [Scala](./languages/scala.md)
-- [Scheme](./languages/scheme.md)
-- [Shell Script](./languages/sh.md)
-- [Svelte](./languages/svelte.md)
-- [Swift](./languages/swift.md)
-- [Tailwind CSS](./languages/tailwindcss.md) \*
-- [Terraform](./languages/terraform.md)
-- [TOML](./languages/toml.md)
-- [TypeScript](./languages/typescript.md) \*
-- [Uiua](./languages/uiua.md)
-- [Vue](./languages/vue.md)
-- [XML](./languages/xml.md)
-- [YAML](./languages/yaml.md) \*
-- [Yara](./languages/yarn.md)
-- [Yarn](./languages/yarn.md)
-- [Zig](./languages/zig.md)
-
-## Additional Community Language Extensions
-
-- [Ada](https://github.com/wisn/zed-ada-language)
-- [Aiken](https://github.com/aiken-lang/zed-aiken)
-- [Amber](https://github.com/amber-lang/zed-amber-extension)
-- [Assembly](https://github.com/DevBlocky/zed-asm)
-- [AWK](https://github.com/dangh/zed-awk)
-- [Beancount](https://github.com/zed-extensions/beancount)
-- [Bend](https://github.com/mrpedrobraga/zed-bend)
-- [Blade](https://github.com/bajrangCoder/zed-laravel-blade)
-- [Blueprint](https://github.com/tfuxu/zed-blueprint)
-- [BQN](https://github.com/DavidZwitser/zed-bqn)
-- [Brainfuck](https://github.com/JosephTLyons/zed-brainfuck)
-- [Cadence](https://github.com/janezpodhostnik/cadence.zed)
-- [Cairo](https://github.com/trbutler4/zed-cairo)
-- [Cap'n Proto](https://github.com/cmackenzie1/zed-capnp)
-- [Cedar](https://github.com/chrnorm/zed-cedar)
-- [CFEngine policy language](https://github.com/olehermanse/zed-cfengine)
-- [CSV](https://github.com/huacnlee/zed-csv)
-- [Cucumber/Gherkin](https://github.com/thlcodes/zed-extension-cucumber)
-- [CUE](https://github.com/jkasky/zed-cue)
-- [Curry](https://github.com/fwcd/zed-curry)
-- [D](https://github.com/staysail/zed-d)
-- [Database Markup Language (DBML)](https://github.com/shuklaayush/zed-dbml)
-- [Earthfile](https://github.com/glehmann/earthfile.zed)
-- [EJS template](https://github.com/dangh/zed-ejs)
-- [Elisp](https://github.com/JosephTLyons/zed-elisp)
-- [Ember](https://github.com/jylamont/zed-ember)
-- [Env](https://github.com/zarifpour/zed-env)
-- [Exograph](https://github.com/exograph/zed-extension)
-- [Fortran](https://github.com/Xavier-Maruff/zed-fortran)
-- [F#](https://github.com/nathanjcollins/zed-fsharp)
-- [Gemini gemtext](https://github.com/clseibold/gemini-zed)
-- [Git Firefly](https://github.com/d1y/git_firefly)
-- [GraphQL](https://github.com/11bit/zed-extension-graphql)
-- [Groq](https://github.com/juice49/zed-groq)
-- [INI](https://github.com/bajrangCoder/zed-ini)
-- [Java](https://github.com/zed-extensions/java)
-- [Justfiles](https://github.com/jackTabsCode/zed-just)
-- [LaTeX](https://github.com/rzukic/zed-latex)
-- [Ledger](https://github.com/mrkstwrt/zed-ledger)
-- [Less](https://github.com/jimliang/zed-less)
-- [LilyPond](https://github.com/nwhetsell/lilypond-zed-extension)
-- [Liquid](https://github.com/TheBeyondGroup/zed-shopify-liquid)
-- [Log](https://github.com/evrensen467/zed-log)
-- [Lox](https://github.com/arian81/zed-lox)
-- [Markdown Oxide](https://github.com/Feel-ix-343/markdown-oxide-zed)
-- [Marksman](https://github.com/vitallium/zed-marksman)
-- [Matlab](https://github.com/rzukic/zed-matlab)
-- [Meson](https://github.com/hqnna/zed-meson)
-- [Navi](https://github.com/navi-language/zed-navi)
-- [NeoCMake](https://github.com/k0tran/zed_neocmake)
-- [Nginx](https://github.com/d1y/nginx-zed)
-- [Nim](https://github.com/foxoman/zed-nim)
-- [Nix](https://github.com/zed-extensions/nix)
-- [Noir](https://github.com/shuklaayush/zed-noir)
-- [Nu](https://github.com/zed-extensions/nu)
-- [Odin](https://github.com/rxptr/zed-odin)
-- [Pact](https://github.com/kadena-community/pact-zed)
-- [Pest](https://github.com/pest-parser/zed-pest)
-- [PICA200 assembly](https://github.com/Squareheron942/zed-pica200)
-- [Pkl](https://github.com/Moshyfawn/pkl-zed)
-- [PlaydateSDK](https://github.com/notpeter/playdate-zed-extension)
-- [QML](https://github.com/lkroll/zed-qml)
-- [Rainbow CSV](https://github.com/weartist/zed-rainbow-csv)
-- [Rego](https://github.com/StyraInc/zed-rego)
-- [Rescript](https://github.com/humaans/rescript-zed)
-- [Roclang](https://github.com/h2000/zed-roc)
-- [Ron](https://github.com/onbjerg/zed-ron)
-- [Metals](https://github.com/scalameta/metals-zed)
-- [SCSS](https://github.com/bajrangCoder/zed-scss)
-- [Slim](https://github.com/calmyournerves/zed-slim)
-- [Slint](https://gitlab.com/flukejones/zed-slint)
-- [Smithy](https://github.com/joshrutkowski/zed-smithy)
-- [Solidity](https://github.com/zarifpour/zed-solidity)
-- [SQL](https://github.com/evrensen467/zed-sql)
-- [Strace](https://github.com/sigmaSd/zed-strace)
-- [Swift](https://github.com/zed-extensions/swift)
-- [Templ](https://github.com/makifdb/zed-templ)
-- [Tmux](https://github.com/dangh/zed-tmux)
-- [Twig](https://github.com/YussufSassi/zed-twig)
-- [Typst](https://github.com/WeetHet/typst.zed)
-- [Unison](https://github.com/zetashift/unison-zed)
-- [UnoCSS](https://github.com/bajrangCoder/zed-unocss)
-- [Vlang](https://github.com/lv37/zed-v)
-- [Vala](https://github.com/FyraLabs/zed-vala)
-- [Vale](https://github.com/koozz/zed-vale)
-- [Verilog](https://github.com/someone13574/zed-verilog-extension)
-- [VHS](https://github.com/eth0net/zed-vhs)
-- [Wgsl](https://github.com/luan/zed-wgsl)
-- [WIT](https://github.com/valentinegb/zed-wit)
diff --git a/docs/src/languages/ansible.md b/docs/src/languages/ansible.md
deleted file mode 100644
index bce25ddc6c..0000000000
--- a/docs/src/languages/ansible.md
+++ /dev/null
@@ -1,130 +0,0 @@
-# Ansible
-
-Support for Ansible in Zed is provided via a community-maintained [Ansible extension](https://github.com/kartikvashistha/zed-ansible).
-
-- Tree-sitter: [zed-industries/tree-sitter-yaml](https://github.com/zed-industries/tree-sitter-yaml)
-- Language Server: [ansible/vscode-ansible](https://github.com/ansible/vscode-ansible/tree/main/packages/ansible-language-server)
-
-## Setup
-
-### File detection
-
-To avoid mishandling non-Ansible YAML files, the Ansible Language is not associated with any file extensions by default. To change this behavior you can add a `"file_types"` section to Zed settings inside your project (`.zed/settings.json`) or your Zed user settings (`~/.config/zed/settings.json`) to match your folder/naming conventions. For example:
-
-```json [settings]
-"file_types": {
-    "Ansible": [
-      "**.ansible.yml",
-      "**.ansible.yaml",
-      "**/defaults/*.yml",
-      "**/defaults/*.yaml",
-      "**/meta/*.yml",
-      "**/meta/*.yaml",
-      "**/tasks/*.yml",
-      "**/tasks/*.yaml",
-      "**/handlers/*.yml",
-      "**/handlers/*.yaml",
-      "**/group_vars/*.yml",
-      "**/group_vars/*.yaml",
-      "**/host_vars/*.yml",
-      "**/host_vars/*.yaml",
-      "**/playbooks/*.yml",
-      "**/playbooks/*.yaml",
-      "**playbook*.yml",
-      "**playbook*.yaml"
-    ]
-  }
-```
-
-Feel free to modify this list as per your needs.
-
-#### Inventory
-
-If your inventory file is in the YAML format, you can either:
-
-- Append the `ansible-lint` inventory json schema to it via the following comment at the top of your inventory file:
-
-```yml
-# yaml-language-server: $schema=https://raw.githubusercontent.com/ansible/ansible-lint/main/src/ansiblelint/schemas/inventory.json
-```
-
-- Or configure the yaml language server settings to set this schema for all your inventory files, that match your inventory pattern, under your Zed settings ([ref](https://zed.dev/docs/languages/yaml)):
-
-```json [settings]
-"lsp": {
-    "yaml-language-server": {
-      "settings": {
-        "yaml": {
-          "schemas": {
-            "https://raw.githubusercontent.com/ansible/ansible-lint/main/src/ansiblelint/schemas/inventory.json": [
-              "./inventory/*.yaml",
-              "hosts.yml",
-            ]
-          }
-        }
-      }
-    }
-},
-```
-
-### LSP Configuration
-
-By default, the following default config is passed to the Ansible language server. It conveniently mirrors the defaults set by [nvim-lspconfig](https://github.com/neovim/nvim-lspconfig/blob/03bc581e05e81d33808b42b2d7e76d70adb3b595/lua/lspconfig/configs/ansiblels.lua) for the Ansible language server:
-
-```json [settings]
-{
-  "ansible": {
-    "ansible": {
-      "path": "ansible"
-    },
-    "executionEnvironment": {
-      "enabled": false
-    },
-    "python": {
-      "interpreterPath": "python3"
-    },
-    "validation": {
-      "enabled": true,
-      "lint": {
-        "enabled": true,
-        "path": "ansible-lint"
-      }
-    }
-  }
-}
-```
-
-> [!NOTE]
-> In order for linting to work, ensure that `ansible-lint` is installed and discoverable on your PATH
-
-When desired, any of the above default settings can be overridden under the `"lsp"` section of your Zed settings file. For example:
-
-```json [settings]
-"lsp": {
-  // Note, the Zed Ansible extension prefixes all settings with `ansible`
-  // so instead of using `ansible.ansible.path` use `ansible.path`.
-  "ansible-language-server": {
-    "settings": {
-      "ansible": {
-        "path": "ansible"
-      },
-      "executionEnvironment": {
-        "enabled": false
-      },
-      "python": {
-        "interpreterPath": "python3"
-      },
-      "validation": {
-        "enabled": false, // disable validation
-        "lint": {
-          "enabled": false, // disable ansible-lint
-          "path": "ansible-lint"
-        }
-      }
-    }
-  }
-}
-```
-
-A full list of options/settings, that can be passed to the server, can be found at the project's page [here](https://github.com/ansible/vscode-ansible/blob/5a89836d66d470fb9d20e7ea8aa2af96f12f61fb/docs/als/settings.md).
-Feel free to modify option values as needed.
diff --git a/docs/src/languages/asciidoc.md b/docs/src/languages/asciidoc.md
deleted file mode 100644
index 7f5ead7e07..0000000000
--- a/docs/src/languages/asciidoc.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# AsciiDoc
-
-AsciiDoc language support in Zed is provided by the community-maintained [AsciiDoc extension](https://github.com/andreicek/zed-asciidoc).
-Report issues to: [https://github.com/andreicek/zed-asciidoc/issues](https://github.com/andreicek/zed-asciidoc/issues)
-
-- Tree-sitter: [cathaysia/tree-sitter-asciidoc](https://github.com/cathaysia/tree-sitter-asciidoc)
diff --git a/docs/src/languages/astro.md b/docs/src/languages/astro.md
deleted file mode 100644
index cbfe8de74e..0000000000
--- a/docs/src/languages/astro.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Astro
-
-Astro support is available through the [Astro extension](https://github.com/zed-extensions/astro).
-
-- Tree-sitter: [virchau13/tree-sitter-astro](https://github.com/virchau13/tree-sitter-astro)
-- Language Server: [withastro/language-tools](https://github.com/withastro/astro/tree/main/packages/language-tools/language-server)
-
-<!--
-TBD: Documentation Astro usage / configuration
--->
diff --git a/docs/src/languages/bash.md b/docs/src/languages/bash.md
deleted file mode 100644
index 882a816216..0000000000
--- a/docs/src/languages/bash.md
+++ /dev/null
@@ -1,36 +0,0 @@
-# Bash
-
-Bash language support in Zed is provided by the community-maintained [Basher extension](https://github.com/d1y/bash.zed).
-Report issues to: [https://github.com/d1y/bash.zed/issues](https://github.com/d1y/bash.zed/issues)
-
-- Tree-sitter: [tree-sitter/tree-sitter-bash](https://github.com/tree-sitter/tree-sitter-bash)
-- Language Server: [bash-lsp/bash-language-server](https://github.com/bash-lsp/bash-language-server)
-
-## Configuration
-
-When `shellcheck` is available `bash-language-server` will use it internally to provide diagnostics.
-
-### Install `shellcheck`:
-
-```sh
-brew install shellcheck             # macOS (HomeBrew)
-apt-get install shellcheck          # Ubuntu/Debian
-pacman -S shellcheck                # ArchLinux
-dnf install shellcheck              # Fedora
-yum install shellcheck              # CentOS/RHEL
-zypper install shellcheck           # openSUSE
-choco install shellcheck            # Windows (Chocolatey)
-```
-
-And verify it is available from your path:
-
-```sh
-which shellcheck
-shellcheck --version
-```
-
-If you wish to customize the warnings/errors reported you just need to create a `.shellcheckrc` file. You can do this in the root of your project or in your home directory (`~/.shellcheckrc`). See: [shellcheck documentation](https://github.com/koalaman/shellcheck/wiki/Ignore#ignoring-one-or-more-types-of-errors-forever) for more.
-
-### See also:
-
-- [Zed Docs: Language Support: Shell Scripts](./sh.md)
diff --git a/docs/src/languages/biome.md b/docs/src/languages/biome.md
deleted file mode 100644
index f0756fe5ba..0000000000
--- a/docs/src/languages/biome.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# Biome
-
-[Biome](https://biomejs.dev/) support in Zed is provided by the community-maintained [Biome extension](https://github.com/biomejs/biome-zed).
-Report issues to: [https://github.com/biomejs/biome-zed/issues](https://github.com/biomejs/biome-zed/issues)
-
-- Language Server: [biomejs/biome](https://github.com/biomejs/biome)
-
-## Biome Language Support
-
-The Biome extension includes support for the following languages:
-
-- JavaScript
-- TypeScript
-- JSX
-- TSX
-- JSON
-- JSONC
-- Vue.js
-- Astro
-- Svelte
-- CSS
-
-## Configuration
-
-By default, the `biome.json` file is required to be in the root of the workspace.
-
-```json [settings]
-{
-  "$schema": "https://biomejs.dev/schemas/1.8.3/schema.json"
-}
-```
-
-For a full list of `biome.json` options see [Biome Configuration](https://biomejs.dev/reference/configuration/) documentation.
-
-See the [Biome Zed Extension README](https://github.com/biomejs/biome-zed) for a complete list of features and configuration options.
diff --git a/docs/src/languages/c.md b/docs/src/languages/c.md
deleted file mode 100644
index 2259ad21a4..0000000000
--- a/docs/src/languages/c.md
+++ /dev/null
@@ -1,91 +0,0 @@
-# C
-
-C support is available natively in Zed.
-
-- Tree-sitter: [tree-sitter/tree-sitter-c](https://github.com/tree-sitter/tree-sitter-c)
-- Language Server: [clangd/clangd](https://github.com/clangd/clangd)
-- Debug Adapter: [CodeLLDB](https://github.com/vadimcn) (primary), [GDB](https://sourceware.org/gdb/) (secondary, not available on Apple silicon)
-
-## Clangd: Force detect as C
-
-Clangd out of the box assumes mixed C++/C projects. If you have a C-only project you may wish to instruct clangd to treat all files as C using the `-xc` flag. To do this, create a `.clangd` file in the root of your project with the following:
-
-```yaml
-# yaml-language-server: $schema=https://json.schemastore.org/clangd.json
-CompileFlags:
-  Add: [-xc]
-```
-
-By default clang and gcc will recognize `*.C` and `*.H` (uppercase extensions) as C++ and not C and so Zed too follows this convention. If you are working with a C-only project (perhaps one with legacy uppercase pathing like `FILENAME.C`) you can override this behavior by adding this to your settings:
-
-```json [settings]
-{
-  "file_types": {
-    "C": ["C", "H"]
-  }
-}
-```
-
-## Formatting
-
-By default Zed will use the `clangd` language server for formatting C code like the `clang-format` CLI tool. To configure this you can add a `.clang-format` file. For example:
-
-```yaml
-# yaml-language-server: $schema=https://json.schemastore.org/clang-format-21.x.json
----
-BasedOnStyle: GNU
-IndentWidth: 2
----
-```
-
-See [Clang-Format Style Options](https://clang.llvm.org/docs/ClangFormatStyleOptions.html) for a complete list of options.
-
-You can trigger formatting via {#kb editor::Format} or the `editor: format` action from the command palette or by adding `format_on_save` to your Zed settings:
-
-```json [settings]
-  "languages": {
-    "C": {
-      "format_on_save": "on",
-      "tab_size": 2
-    }
-  }
-```
-
-## Compile Commands
-
-For some projects Clangd requires a `compile_commands.json` file to properly analyze your project. This file contains the compilation database that tells clangd how your project should be built.
-
-### CMake Compile Commands
-
-With CMake, you can generate `compile_commands.json` automatically by adding the following line to your `CMakeLists.txt`:
-
-```cmake
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-```
-
-After building your project, CMake will generate the `compile_commands.json` file in the build directory and clangd will automatically pick it up.
-
-## Debugging
-
-You can use CodeLLDB or GDB to debug native binaries. (Make sure that your build process passes `-g` to the C compiler, so that debug information is included in the resulting binary.) See below for examples of debug configurations that you can add to `.zed/debug.json`.
-
-- [CodeLLDB configuration documentation](https://github.com/vadimcn/codelldb/blob/master/MANUAL.md#starting-a-new-debug-session)
-- [GDB configuration documentation](https://sourceware.org/gdb/current/onlinedocs/gdb.html/Debugger-Adapter-Protocol.html)
-
-### Build and Debug Binary
-
-```json [debug]
-[
-  {
-    "label": "Debug native binary",
-    "build": {
-      "command": "make",
-      "args": ["-j8"],
-      "cwd": "$ZED_WORKTREE_ROOT"
-    },
-    "program": "$ZED_WORKTREE_ROOT/build/prog",
-    "request": "launch",
-    "adapter": "CodeLLDB"
-  }
-]
-```
diff --git a/docs/src/languages/clojure.md b/docs/src/languages/clojure.md
deleted file mode 100644
index a590cb6b55..0000000000
--- a/docs/src/languages/clojure.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Clojure
-
-Clojure support is available through the [Clojure extension](https://github.com/zed-extensions/clojure).
-
-- Tree-sitter: [prcastro/tree-sitter-clojure](https://github.com/prcastro/tree-sitter-clojure)
-- Language Server: [clojure-lsp/clojure-lsp](https://github.com/clojure-lsp/clojure-lsp)
-
-<!--
-TBD: Add some Clojure Docs
--->
diff --git a/docs/src/languages/cpp.md b/docs/src/languages/cpp.md
deleted file mode 100644
index c20dd58335..0000000000
--- a/docs/src/languages/cpp.md
+++ /dev/null
@@ -1,160 +0,0 @@
-# C++
-
-C++ support is available natively in Zed.
-
-- Tree-sitter: [tree-sitter/tree-sitter-cpp](https://github.com/tree-sitter/tree-sitter-cpp)
-- Language Server: [clangd/clangd](https://github.com/clangd/clangd)
-
-## Binary
-
-You can configure which `clangd` binary Zed should use.
-
-By default, Zed will try to find a `clangd` in your `$PATH` and try to use that. If that binary successfully executes, it's used. Otherwise, Zed will fall back to installing its own `clangd` version and use that.
-
-If you want to install a pre-release `clangd` version instead you can instruct Zed to do so by setting `pre_release` to `true` in your `settings.json`:
-
-```json [settings]
-{
-  "lsp": {
-    "clangd": {
-      "fetch": {
-        "pre_release": true
-      }
-    }
-  }
-}
-```
-
-If you want to disable Zed looking for a `clangd` binary, you can set `ignore_system_version` to `true` in your `settings.json`:
-
-```json [settings]
-{
-  "lsp": {
-    "clangd": {
-      "binary": {
-        "ignore_system_version": true
-      }
-    }
-  }
-}
-```
-
-If you want to use a binary in a custom location, you can specify a `path` and optional `arguments`:
-
-```json [settings]
-{
-  "lsp": {
-    "clangd": {
-      "binary": {
-        "path": "/path/to/clangd",
-        "arguments": []
-      }
-    }
-  }
-}
-```
-
-This `"path"` has to be an absolute path.
-
-## Arguments
-
-You can pass any number of arguments to clangd. To see a full set of available options, run `clangd --help` from the command line. For example with `--function-arg-placeholders=0` completions contain only parentheses for function calls, while the default (`--function-arg-placeholders=1`) completions also contain placeholders for method parameters.
-
-```json [settings]
-{
-  "lsp": {
-    "clangd": {
-      "binary": {
-        "path": "/path/to/clangd",
-        "arguments": ["--function-arg-placeholders=0"]
-      }
-    }
-  }
-}
-```
-
-## Formatting
-
-By default Zed will use the `clangd` language server for formatting C++ code. The Clangd is the same as the `clang-format` CLI tool. To configure this you can add a `.clang-format` file. For example:
-
-```yaml
-# yaml-language-server: $schema=https://json.schemastore.org/clang-format-21.x.json
----
-BasedOnStyle: LLVM
-IndentWidth: 4
----
-Language: Cpp
-# Force pointers to the type for C++.
-DerivePointerAlignment: false
-PointerAlignment: Left
----
-```
-
-See [Clang-Format Style Options](https://clang.llvm.org/docs/ClangFormatStyleOptions.html) for a complete list of options.
-
-You can trigger formatting via {#kb editor::Format} or the `editor: format` action from the command palette or by adding `format_on_save` to your Zed settings:
-
-```json [settings]
-  "languages": {
-    "C++": {
-      "format_on_save": "on",
-      "tab_size": 2
-    }
-  }
-```
-
-## More server configuration
-
-In the root of your project, it is generally common to create a `.clangd` file to set extra configuration.
-
-```yaml
-# yaml-language-server: $schema=https://json.schemastore.org/clangd.json
-CompileFlags:
-  Add:
-    - "--include-directory=/path/to/include"
-Diagnostics:
-  MissingIncludes: Strict
-  UnusedIncludes: Strict
-```
-
-For more advanced usage of clangd configuration file, take a look into their [official page](https://clangd.llvm.org/config.html).
-
-## Compile Commands
-
-For some projects Clangd requires a `compile_commands.json` file to properly analyze your project. This file contains the compilation database that tells clangd how your project should be built.
-
-### CMake Compile Commands
-
-With CMake, you can generate `compile_commands.json` automatically by adding the following line to your `CMakeLists.txt`:
-
-```cmake
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-```
-
-After building your project, CMake will generate the `compile_commands.json` file in the build directory and clangd will automatically pick it up.
-
-## Debugging
-
-You can use CodeLLDB or GDB to debug native binaries. (Make sure that your build process passes `-g` to the C++ compiler, so that debug information is included in the resulting binary.) See below for examples of debug configurations that you can add to `.zed/debug.json`.
-
-- [CodeLLDB configuration documentation](https://github.com/vadimcn/codelldb/blob/master/MANUAL.md#starting-a-new-debug-session)
-- [GDB configuration documentation](https://sourceware.org/gdb/current/onlinedocs/gdb.html/Debugger-Adapter-Protocol.html)
-  - GDB needs to be at least v14.1
-
-### Build and Debug Binary
-
-```json [debug]
-[
-  {
-    "label": "Debug native binary",
-    "build": {
-      "command": "make",
-      "args": ["-j8"],
-      "cwd": "$ZED_WORKTREE_ROOT"
-    },
-    "program": "$ZED_WORKTREE_ROOT/build/prog",
-    "request": "launch",
-    "adapter": "CodeLLDB"
-  }
-]
-```
diff --git a/docs/src/languages/csharp.md b/docs/src/languages/csharp.md
deleted file mode 100644
index e7a702c190..0000000000
--- a/docs/src/languages/csharp.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# C#
-
-Note language name is "CSharp" for settings not "C#'
-
-C# support is available through the [C# extension](https://github.com/zed-extensions/csharp).
-
-- Tree-sitter: [tree-sitter/tree-sitter-c-sharp](https://github.com/tree-sitter/tree-sitter-c-sharp)
-- Language Server: [OmniSharp/omnisharp-roslyn](https://github.com/OmniSharp/omnisharp-roslyn)
-
-## Configuration
-
-The `OmniSharp` binary can be configured in a Zed settings file with:
-
-```json [settings]
-{
-  "lsp": {
-    "omnisharp": {
-      "binary": {
-        "path": "/path/to/OmniSharp",
-        "arguments": ["optional", "additional", "args", "-lsp"]
-      }
-    }
-  }
-}
-```
diff --git a/docs/src/languages/css.md b/docs/src/languages/css.md
deleted file mode 100644
index 59fd578aee..0000000000
--- a/docs/src/languages/css.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# CSS
-
-Zed has built-in support for CSS.
-
-- Tree-sitter: [tree-sitter/tree-sitter-css](https://github.com/tree-sitter/tree-sitter-css)
-- Language Servers:
-  - [microsoft/vscode-css-languageservice](https://github.com/microsoft/vscode-css-languageservice)
-  - [tailwindcss-language-server](https://github.com/tailwindlabs/tailwindcss-intellisense)
-
-## Tailwind CSS
-
-Zed also supports [Tailwind CSS](./tailwindcss.md) out-of-the-box for languages and frameworks like JavaScript, Astro, Svelte, and more.
-
-<!-- TBD: Document CS -->
-
-## Recommended Reading
-
-- [HTML](./html.md)
-- [TypeScript](./typescript.md)
-- [JavaScript](./javascript.md)
diff --git a/docs/src/languages/dart.md b/docs/src/languages/dart.md
deleted file mode 100644
index 20f8a1d230..0000000000
--- a/docs/src/languages/dart.md
+++ /dev/null
@@ -1,54 +0,0 @@
-# Dart
-
-Dart support is available through the [Dart extension](https://github.com/zed-extensions/dart).
-
-- Tree-sitter: [UserNobody14/tree-sitter-dart](https://github.com/UserNobody14/tree-sitter-dart)
-- Language Server: [dart language-server](https://github.com/dart-lang/sdk)
-
-## Pre-requisites
-
-You will need to install the Dart SDK.
-
-You can install dart from [dart.dev/get-dart](https://dart.dev/get-dart) or via the [Flutter Version Management CLI (fvm)](https://fvm.app/documentation/getting-started/installation)
-
-## Configuration
-
-The dart extension requires no configuration if you have `dart` in your path:
-
-```sh
-which dart
-dart --version
-```
-
-If you would like to use a specific dart binary or use dart via FVM you can specify the `dart` binary in your Zed settings.jsons file:
-
-```json [settings]
-{
-  "lsp": {
-    "dart": {
-      "binary": {
-        "path": "/opt/homebrew/bin/fvm",
-        "arguments": ["dart", "language-server", "--protocol=lsp"]
-      }
-    }
-  }
-}
-```
-
-### Formatting
-
-Dart by-default uses a very conservative maximum line length (80). If you would like the dart LSP to permit a longer line length when auto-formatting, add the following to your Zed settings.json:
-
-```json [settings]
-{
-  "lsp": {
-    "dart": {
-      "settings": {
-        "lineLength": 140
-      }
-    }
-  }
-}
-```
-
-Please see the Dart documentation for more information on [dart language-server capabilities](https://github.com/dart-lang/sdk/blob/main/pkg/analysis_server/tool/lsp_spec/README.md).
diff --git a/docs/src/languages/deno.md b/docs/src/languages/deno.md
deleted file mode 100644
index 0fa645291e..0000000000
--- a/docs/src/languages/deno.md
+++ /dev/null
@@ -1,127 +0,0 @@
-# Deno
-
-Deno support is available through the [Deno extension](https://github.com/zed-extensions/deno).
-
-- Language server: [Deno Language Server](https://docs.deno.com/runtime/manual/advanced/language_server/overview/)
-
-## Deno Configuration
-
-To use the Deno Language Server with TypeScript and TSX files, you will likely wish to disable the default language servers and enable deno by adding the following to your `settings.json`:
-
-```json [settings]
-{
-  "lsp": {
-    "deno": {
-      "settings": {
-        "deno": {
-          "enable": true
-        }
-      }
-    }
-  },
-  "languages": {
-    "JavaScript": {
-      "language_servers": [
-        "deno",
-        "!typescript-language-server",
-        "!vtsls",
-        "!eslint"
-      ],
-      "formatter": "language_server"
-    },
-    "TypeScript": {
-      "language_servers": [
-        "deno",
-        "!typescript-language-server",
-        "!vtsls",
-        "!eslint"
-      ],
-      "formatter": "language_server"
-    },
-    "TSX": {
-      "language_servers": [
-        "deno",
-        "!typescript-language-server",
-        "!vtsls",
-        "!eslint"
-      ],
-      "formatter": "language_server"
-    }
-  }
-}
-```
-
-See [Configuring supported languages](../configuring-languages.md) in the Zed documentation for more information.
-
-<!--
-TBD: Deno TypeScript REPL instructions [docs/repl#typescript-deno](../repl.md#typescript-deno)
--->
-
-## Configuration completion
-
-To get completions for `deno.json` or `package.json` you can add the following to your `settings.json`: (More info here https://zed.dev/docs/languages/json)
-
-```json [settings]
-"lsp": {
-    "json-language-server": {
-      "settings": {
-        "json": {
-          "schemas": [
-            {
-              "fileMatch": [
-                "deno.json",
-                "deno.jsonc"
-              ],
-              "url": "https://raw.githubusercontent.com/denoland/deno/refs/heads/main/cli/schemas/config-file.v1.json"
-            },
-            {
-              "fileMatch": [
-                "package.json"
-              ],
-              "url": "https://www.schemastore.org/package"
-            }
-          ]
-        }
-      }
-    }
-  }
-```
-
-## DAP support
-
-To debug deno programs, add this to `.zed/debug.json`
-
-```json [debug]
-[
-  {
-    "adapter": "JavaScript",
-    "label": "Deno",
-    "request": "launch",
-    "type": "pwa-node",
-    "cwd": "$ZED_WORKTREE_ROOT",
-    "program": "$ZED_FILE",
-    "runtimeExecutable": "deno",
-    "runtimeArgs": ["run", "--allow-all", "--inspect-wait"],
-    "attachSimplePort": 9229
-  }
-]
-```
-
-## Runnable support
-
-To run deno tasks like tests from the ui, add this to `.zed/tasks.json`
-
-```json [tasks]
-[
-  {
-    "label": "deno test",
-    "command": "deno test -A --filter '/^$ZED_CUSTOM_DENO_TEST_NAME$/' '$ZED_FILE'",
-    "tags": ["js-test"]
-  }
-]
-```
-
-## See also:
-
-- [TypeScript](./typescript.md)
-- [JavaScript](./javascript.md)
diff --git a/docs/src/languages/diff.md b/docs/src/languages/diff.md
deleted file mode 100644
index a089b975e7..0000000000
--- a/docs/src/languages/diff.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Diff
-
-Diff support is available natively in Zed.
-
-- Tree-sitter: [zed-industries/the-mikedavis/tree-sitter-diff](https://github.com/the-mikedavis/tree-sitter-diff)
-
-## Configuration
-
-Zed will not attempt to format diff files and has [`remove_trailing_whitespace_on_save`](https://zed.dev/docs/configuring-zed#remove-trailing-whitespace-on-save) and [`ensure-final-newline-on-save`](https://zed.dev/docs/configuring-zed#ensure-final-newline-on-save) set to false.
-
-Zed will automatically recognize files with `patch` and `diff` extensions as Diff files. To recognize other extensions, add them to `file_types` in your Zed settings.json:
-
-```json [settings]
-  "file_types": {
-    "Diff": ["dif"]
-  },
-```
diff --git a/docs/src/languages/docker.md b/docs/src/languages/docker.md
deleted file mode 100644
index f003a575d2..0000000000
--- a/docs/src/languages/docker.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Docker
-
-Support for `Dockerfile` and `docker-compose.yaml` in Zed is provided by community-maintained extensions.
-
-## Docker Compose
-
-Docker `compose.yaml` language support in Zed is provided by the [Docker Compose extension](https://github.com/eth0net/zed-docker-compose). Please report issues to: [https://github.com/eth0net/zed-docker-compose/issues](https://github.com/eth0net/zed-docker-compose/issues).
-
-- Language Server: [microsoft/compose-language-service](https://github.com/microsoft/compose-language-service)
-
-## Dockerfile
-
-`Dockerfile` language support in Zed is provided by the [Dockerfile extension](https://github.com/d1y/dockerfile.zed). Please report issues to: [https://github.com/d1y/dockerfile.zed/issues](https://github.com/d1y/dockerfile.zed/issues).
-
-- Tree-sitter: [camdencheek/tree-sitter-dockerfile](https://github.com/camdencheek/tree-sitter-dockerfile)
-- Language Server: [rcjsuen/dockerfile-language-server](https://github.com/rcjsuen/dockerfile-language-server)
diff --git a/docs/src/languages/elixir.md b/docs/src/languages/elixir.md
deleted file mode 100644
index 3df116492a..0000000000
--- a/docs/src/languages/elixir.md
+++ /dev/null
@@ -1,125 +0,0 @@
-# Elixir
-
-Elixir support is available through the [Elixir extension](https://github.com/zed-extensions/elixir).
-
-- Tree-sitter:
-  - [elixir-lang/tree-sitter-elixir](https://github.com/elixir-lang/tree-sitter-elixir)
-  - [phoenixframework/tree-sitter-heex](https://github.com/phoenixframework/tree-sitter-heex)
-- Language servers:
-  - [elixir-lang/expert](https://github.com/elixir-lang/expert)
-  - [elixir-lsp/elixir-ls](https://github.com/elixir-lsp/elixir-ls)
-  - [elixir-tools/next-ls](https://github.com/elixir-tools/next-ls)
-  - [lexical-lsp/lexical](https://github.com/lexical-lsp/lexical)
-
-## Choosing a language server
-
-The Elixir extension offers language server support for `expert`, `elixir-ls`, `next-ls`, and `lexical`.
-
-`elixir-ls` is enabled by default.
-
-### Expert
-
-To switch to `expert`, add the following to your `settings.json`:
-
-```json [settings]
-  "languages": {
-    "Elixir": {
-      "language_servers": ["expert", "!elixir-ls", "!next-ls", "!lexical", "..."]
-    },
-    "HEEX": {
-      "language_servers": ["expert", "!elixir-ls", "!next-ls", "!lexical", "..."]
-    }
-  }
-```
-
-### Next LS
-
-To switch to `next-ls`, add the following to your `settings.json`:
-
-```json [settings]
-  "languages": {
-    "Elixir": {
-      "language_servers": ["next-ls", "!expert", "!elixir-ls", "!lexical", "..."]
-    },
-    "HEEX": {
-      "language_servers": ["next-ls", "!expert", "!elixir-ls", "!lexical", "..."]
-    }
-  }
-```
-
-### Lexical
-
-To switch to `lexical`, add the following to your `settings.json`:
-
-```json [settings]
-  "languages": {
-    "Elixir": {
-      "language_servers": ["lexical", "!expert", "!elixir-ls", "!next-ls", "..."]
-    },
-    "HEEX": {
-      "language_servers": ["lexical", "!expert", "!elixir-ls", "!next-ls", "..."]
-    }
-  }
-```
-
-## Setting up `elixir-ls`
-
-1. Install `elixir`:
-
-```sh
-brew install elixir
-```
-
-2. Install `elixir-ls`:
-
-```sh
-brew install elixir-ls
-```
-
-3. Restart Zed
-
-> If `elixir-ls` is not running in an elixir project, check the error log via the command palette action `zed: open log`. If you find an error message mentioning: `invalid LSP message header "Shall I install Hex? (if running non-interactively, use \"mix local.hex --force\") [Yn]`, you might need to install [`Hex`](https://hex.pm). You run `elixir-ls` from the command line and accept the prompt to install `Hex`.
-
-### Formatting with Mix
-
-If you prefer to format your code with [Mix](https://hexdocs.pm/mix/Mix.html), use the following snippet in your `settings.json` file to configure it as an external formatter. Formatting will occur on file save.
-
-```json [settings]
-{
-  "languages": {
-    "Elixir": {
-      "format_on_save": "on",
-      "formatter": {
-        "external": {
-          "command": "mix",
-          "arguments": ["format", "--stdin-filename", "{buffer_path}", "-"]
-        }
-      }
-    }
-  }
-}
-```
-
-### Additional workspace configuration options
-
-You can pass additional elixir-ls workspace configuration options via lsp settings in `settings.json`.
-
-The following example disables dialyzer:
-
-```json [settings]
-  "lsp": {
-    "elixir-ls": {
-      "settings": {
-        "dialyzerEnabled": false
-      }
-    }
-  }
-```
-
-See [ElixirLS configuration settings](https://github.com/elixir-lsp/elixir-ls#elixirls-configuration-settings) for more options.
-
-### HEEx
-
-Zed also supports HEEx templates. HEEx is a mix of [EEx](https://hexdocs.pm/eex/1.12.3/EEx.html) (Embedded Elixir) and HTML, and is used in Phoenix LiveView applications.
-
-- Tree-sitter: [phoenixframework/tree-sitter-heex](https://github.com/phoenixframework/tree-sitter-heex)
diff --git a/docs/src/languages/elm.md b/docs/src/languages/elm.md
deleted file mode 100644
index 3a18af05bb..0000000000
--- a/docs/src/languages/elm.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# Elm
-
-Elm support is available through the [Elm extension](https://github.com/zed-extensions/elm).
-
-- Tree-sitter: [elm-tooling/tree-sitter-elm](https://github.com/elm-tooling/tree-sitter-elm)
-- Language Server: [elm-tooling/elm-language-server](https://github.com/elm-tooling/elm-language-server)
-
-## Setup
-
-Zed support for Elm requires installation of `elm`, `elm-format`, and `elm-review`.
-
-1. [Install Elm](https://guide.elm-lang.org/install/elm.html) (or run `brew install elm` on macOS).
-2. Install `elm-review` to support code linting:
-   ```sh
-   npm install elm-review --save-dev
-   ```
-3. Install `elm-format` to support automatic formatting
-   ```sh
-   npm install -g elm-format
-   ```
-
-## Configuring `elm-language-server`
-
-Elm language server can be configured in your `settings.json`, e.g.:
-
-```json [settings]
-{
-  "lsp": {
-    "elm-language-server": {
-      "initialization_options": {
-        "disableElmLSDiagnostics": true,
-        "onlyUpdateDiagnosticsOnSave": false,
-        "elmReviewDiagnostics": "warning"
-      }
-    }
-  }
-}
-```
-
-`elm-format`, `elm-review` and `elm` need to be installed and made available in the environment or configured in the settings. See the [full list of server settings here](https://github.com/elm-tooling/elm-language-server?tab=readme-ov-file#server-settings).
diff --git a/docs/src/languages/emmet.md b/docs/src/languages/emmet.md
deleted file mode 100644
index 73e34c209f..0000000000
--- a/docs/src/languages/emmet.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Emmet
-
-Emmet support is available through the [Emmet extension](https://github.com/zed-extensions/emmet).
-
-[Emmet](https://emmet.io/) is a web-developer’s toolkit that can greatly improve your HTML & CSS workflow.
-
-- Language Server: [olrtg/emmet-language-server](https://github.com/olrtg/emmet-language-server)
-
-<!--
-TBD: Document Emmet usage in zed with: HTML, PHP, ERB, Javascript, TSX, CSS
--->
diff --git a/docs/src/languages/erlang.md b/docs/src/languages/erlang.md
deleted file mode 100644
index b3850fc55e..0000000000
--- a/docs/src/languages/erlang.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# Erlang
-
-Erlang support is available through the [Erlang extension](https://github.com/zed-extensions/erlang).
-
-- Tree-sitter: [WhatsApp/tree-sitter-erlang](https://github.com/WhatsApp/tree-sitter-erlang)
-- Language Servers:
-  - [erlang-ls/erlang_ls](https://github.com/erlang-ls/erlang_ls)
-  - [WhatsApp/erlang-language-platform](https://github.com/WhatsApp/erlang-language-platform)
-
-## Choosing a language server
-
-The Erlang extension offers language server support for `erlang_ls` and `erlang-language-platform`.
-
-`erlang_ls` is enabled by default.
-
-To switch to `erlang-language-platform`, add the following to your `settings.json`:
-
-```json [settings]
-{
-  "languages": {
-    "Erlang": {
-      "language_servers": ["elp", "!erlang-ls", "..."]
-    }
-  }
-}
-```
-
-## See also:
-
-- [Elixir](./elixir.md)
-- [Gleam](./gleam.md)
diff --git a/docs/src/languages/fish.md b/docs/src/languages/fish.md
deleted file mode 100644
index 6c07d444b8..0000000000
--- a/docs/src/languages/fish.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# Fish
-
-Fish language support in Zed is provided by the community-maintained [Fish extension](https://github.com/hasit/zed-fish).
-Report issues to: [https://github.com/hasit/zed-fish/issues](https://github.com/hasit/zed-fish/issues)
-
-- Tree-sitter: [ram02z/tree-sitter-fish](https://github.com/ram02z/tree-sitter-fish)
-
-### Formatting
-
-Zed supports auto-formatting fish code using external tools like [`fish_indent`](https://fishshell.com/docs/current/cmds/fish_indent.html), which is included with fish.
-
-1. Ensure `fish_indent` is available in your path and check the version:
-
-```sh
-which fish_indent
-fish_indent --version
-```
-
-2. Configure Zed to automatically format fish code with `fish_indent`:
-
-```json [settings]
-  "languages": {
-    "Fish": {
-      "formatter": {
-        "external": {
-          "command": "fish_indent"
-        }
-      }
-    }
-  },
-```
diff --git a/docs/src/languages/gdscript.md b/docs/src/languages/gdscript.md
deleted file mode 100644
index 53a3dc305d..0000000000
--- a/docs/src/languages/gdscript.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# GDScript
-
-Godot [GDScript](https://gdscript.com/) language support in Zed is provided by the community-maintained [GDScript extension](https://github.com/GDQuest/zed-gdscript).
-Report issues to: [https://github.com/GDQuest/zed-gdscript/issues](https://github.com/GDQuest/zed-gdscript/issues)
-
-- Tree-sitter: [PrestonKnopp/tree-sitter-gdscript](https://github.com/PrestonKnopp/tree-sitter-gdscript) and [PrestonKnopp/tree-sitter-godot-resource](https://github.com/PrestonKnopp/tree-sitter-godot-resource)
-- Language Server: [gdscript-language-server](https://github.com/godotengine/godot)
-
-## Pre-requisites
-
-You will need:
-
-- [Godot](https://godotengine.org/download/).
-- netcat (`nc` or `ncat`) on your system PATH.
-
-## Setup
-
-1. Inside your Godot editor, open Editor Settings, look for `Text Editor -> External` and set the following options:
-   - Exec Path: `/path/to/zed`
-   - Exec Flags: `{project} {file}:{line}:{col}`
-   - Use External Editor: "✅ On"
-2. Open any \*.gd file through Godot and Zed will launch.
-
-## Usage
-
-When Godot is running, the GDScript extension will connect to the language server provided by the Godot runtime and will provide `jump to definition`, hover states when you hold Ctrl/cmd and other language server features.
diff --git a/docs/src/languages/gleam.md b/docs/src/languages/gleam.md
deleted file mode 100644
index bc7eb010b9..0000000000
--- a/docs/src/languages/gleam.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Gleam
-
-Gleam support is available through the [Gleam extension](https://github.com/gleam-lang/zed-gleam). To learn about Gleam, see the [docs](https://gleam.run/documentation/) or check out the [`stdlib` reference](https://hexdocs.pm/gleam_stdlib/). The Gleam language server has a variety of features, including go-to definition, automatic imports, and [more](https://gleam.run/language-server/).
-
-- Tree-sitter: [gleam-lang/tree-sitter-gleam](https://github.com/gleam-lang/tree-sitter-gleam)
-- Language Server: [gleam lsp](https://github.com/gleam-lang/gleam/tree/main/compiler-core/src/language_server)
-
-See also:
-
-- [Elixir](./elixir.md)
-- [Erlang](./erlang.md)
diff --git a/docs/src/languages/glsl.md b/docs/src/languages/glsl.md
deleted file mode 100644
index b257468752..0000000000
--- a/docs/src/languages/glsl.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# GLSL
-
-GLSL (OpenGL Shading Language) support is available through the [GLSL Extension](https://github.com/zed-industries/zed/tree/main/extensions/glsl/)
-
-- Tree-sitter: [theHamsta/tree-sitter-glsl](https://github.com/theHamsta/tree-sitter-glsl)
-- Language Server: [nolanderc/glsl_analyzer](https://github.com/nolanderc/glsl_analyzer)
diff --git a/docs/src/languages/go.md b/docs/src/languages/go.md
deleted file mode 100644
index 3c4e505f8f..0000000000
--- a/docs/src/languages/go.md
+++ /dev/null
@@ -1,198 +0,0 @@
-# Go
-
-Go support is available natively in Zed.
-
-- Tree-sitter: [tree-sitter/tree-sitter-go](https://github.com/tree-sitter/tree-sitter-go)
-- Language Server: [golang/tools/tree/master/gopls](https://github.com/golang/tools/tree/master/gopls)
-- Debug Adapter: [delve](https://github.com/go-delve/delve)
-
-## Setup
-
-We recommend installing gopls via go's package manager and not via Homebrew or your Linux distribution's package manager.
-
-1. Make sure you have uninstalled any version of gopls you have installed via your package manager:
-
-```sh
-# MacOS homebrew
-brew remove gopls
-# Ubuntu
-sudo apt-get remove gopls
-sudo snap remove gopls
-# Arch
-sudo pacman -R gopls
-```
-
-2. Install/Update `gopls` to the latest version using the go module tool:
-
-```sh
-go install golang.org/x/tools/gopls@latest
-```
-
-3. Ensure that `gopls` is in your path:
-
-```sh
-which gopls
-gopls version
-```
-
-If `gopls` is not found you will likely need to add `export PATH="$PATH:$HOME/go/bin"` to your `.zshrc` / `.bash_profile`
-
-## Inlay Hints
-
-Zed sets the following initialization options for inlay hints:
-
-```json [settings]
-"hints": {
-    "assignVariableTypes": true,
-    "compositeLiteralFields": true,
-    "compositeLiteralTypes": true,
-    "constantValues": true,
-    "functionTypeParameters": true,
-    "parameterNames": true,
-    "rangeVariableTypes": true
-}
-```
-
-to make the language server send back inlay hints when Zed has them enabled in the settings.
-
-Use
-
-```json [settings]
-"lsp": {
-    "gopls": {
-        "initialization_options": {
-            "hints": {
-                // ....
-            }
-        }
-    }
-}
-```
-
-to override these settings.
-
-See [gopls inlayHints documentation](https://github.com/golang/tools/blob/master/gopls/doc/inlayHints.md) for more information.
-
-## Debugging
-
-Zed supports zero-configuration debugging of Go tests and entry points (`func main`) using Delve. Run {#action debugger::Start} ({#kb debugger::Start}) to see a contextual list of these preconfigured debug tasks.
-
-For more control, you can add debug configurations to `.zed/debug.json`. See below for examples.
-
-- [Delve configuration documentation](https://github.com/go-delve/delve/blob/master/Documentation/api/dap/README.md#launch-and-attach-configurations)
-
-### Debug Go Packages
-
-To debug a specific package, you can do so by setting the Delve mode to "debug". In this case "program" should be set to the package name.
-
-```json [debug]
-[
-  {
-    "label": "Go (Delve)",
-    "adapter": "Delve",
-    "program": "$ZED_FILE",
-    "request": "launch",
-    "mode": "debug"
-  },
-  {
-    "label": "Run server",
-    "adapter": "Delve",
-    "request": "launch",
-    "mode": "debug",
-    // For Delve, the program can be a package name
-    "program": "./cmd/server"
-    // "args": [],
-    // "buildFlags": [],
-  }
-]
-```
-
-### Debug Go Tests
-
-To debug the tests for a package, set the Delve mode to "test".
-The "program" is still the package name, and you can use the "buildFlags" to do things like set tags, and the "args" to set args on the test binary. (See `go help testflags` for more information on doing that).
-
-```json [debug]
-[
-  {
-    "label": "Run integration tests",
-    "adapter": "Delve",
-    "request": "launch",
-    "mode": "test",
-    "program": ".",
-    "buildFlags": ["-tags", "integration"]
-    // To filter down to just the test your cursor is in:
-    // "args": ["-test.run", "$ZED_SYMBOL"]
-  }
-]
-```
-
-### Build and debug separately
-
-If you need to build your application with a specific command, you can use the "exec" mode of Delve. In this case "program" should point to an executable,
-and the "build" command should build that.
-
-```json [debug]
-[
-  {
-    "label": "Debug Prebuilt Unit Tests",
-    "adapter": "Delve",
-    "request": "launch",
-    "mode": "exec",
-    "program": "${ZED_WORKTREE_ROOT}/__debug_unit",
-    "args": ["-test.v", "-test.run=${ZED_SYMBOL}"],
-    "build": {
-      "command": "go",
-      "args": [
-        "test",
-        "-c",
-        "-tags",
-        "unit",
-        "-gcflags\"all=-N -l\"",
-        "-o",
-        "__debug_unit",
-        "./pkg/..."
-      ]
-    }
-  }
-]
-```
-
-### Attaching to an existing instance of Delve
-
-You might find yourself needing to connect to an existing instance of Delve that's not necessarily running on your machine; in such case, you can use `tcp_arguments` to instrument Zed's connection to Delve.
-
-```json [debug]
-[
-  {
-    "adapter": "Delve",
-    "label": "Connect to a running Delve instance",
-    "program": "/Users/zed/Projects/language_repositories/golang/hello/hello",
-    "cwd": "/Users/zed/Projects/language_repositories/golang/hello",
-    "args": [],
-    "env": {},
-    "request": "launch",
-    "mode": "exec",
-    "stopOnEntry": false,
-    "tcp_connection": { "host": "127.0.0.1", "port": 53412 }
-  }
-]
-```
-
-In such case Zed won't spawn a new instance of Delve, as it opts to use an existing one. The consequence of this is that _there will be no terminal_ in Zed; you have to interact with the Delve instance directly, as it handles stdin/stdout of the debuggee.
-
-## Go Mod
-
-- Tree-sitter: [camdencheek/tree-sitter-go-mod](https://github.com/camdencheek/tree-sitter-go-mod)
-- Language Server: N/A
-
-## Go Sum
-
-- Tree-sitter: [amaanq/tree-sitter-go-sum](https://github.com/amaanq/tree-sitter-go-sum)
-- Language Server: N/A
-
-## Go Work
-
-- Tree-sitter:
-  [tree-sitter-go-work](https://github.com/d1y/tree-sitter-go-work)
-- Language Server: N/A
diff --git a/docs/src/languages/groovy.md b/docs/src/languages/groovy.md
deleted file mode 100644
index cbf54a5455..0000000000
--- a/docs/src/languages/groovy.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Groovy
-
-Groovy language support in Zed is provided by the community-maintained [Groovy extension](https://github.com/valentinegb/zed-groovy).
-Report issues to: [https://github.com/valentinegb/zed-groovy/issues](https://github.com/valentinegb/zed-groovy/issues)
-
-- Tree-sitter: [murtaza64/tree-sitter-groovy](https://github.com/murtaza64/tree-sitter-groovy)
-- Language Server: [GroovyLanguageServer/groovy-language-server](https://github.com/GroovyLanguageServer/groovy-language-server)
diff --git a/docs/src/languages/haskell.md b/docs/src/languages/haskell.md
deleted file mode 100644
index 901bd9ded1..0000000000
--- a/docs/src/languages/haskell.md
+++ /dev/null
@@ -1,51 +0,0 @@
-# Haskell
-
-Haskell support is available through the [Haskell extension](https://github.com/zed-extensions/haskell).
-
-- Tree-sitter: [tree-sitter-haskell](https://github.com/tree-sitter/tree-sitter-haskell)
-- Language Server: [haskell-language-server](https://github.com/haskell/haskell-language-server)
-
-## Installing HLS
-
-Recommended method to [install haskell-language-server](https://haskell-language-server.readthedocs.io/en/latest/installation.html) (HLS) is via [ghcup](https://www.haskell.org/ghcup/install/) (`curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh
-`):
-
-```sh
-ghcup install hls
-which haskell-language-server-wrapper
-```
-
-## Configuring HLS
-
-If you need to configure haskell-language-server (hls) you can add configuration options to your Zed settings.json:
-
-```json [settings]
-{
-  "lsp": {
-    "hls": {
-      "initialization_options": {
-        "haskell": {
-          "formattingProvider": "fourmolu"
-        }
-      }
-    }
-  }
-}
-```
-
-See the official [configuring haskell-language-server](https://haskell-language-server.readthedocs.io/en/latest/configuration.html) docs for more options.
-
-If you would like to use a specific hls binary, or perhaps use [static-ls](https://github.com/josephsumabat/static-ls) as a drop-in replacement instead, you can specify the binary path and arguments:
-
-```json [settings]
-{
-  "lsp": {
-    "hls": {
-      "binary": {
-        "path": "static-ls",
-        "arguments": ["--experimentalFeatures"]
-      }
-    }
-  }
-}
-```
diff --git a/docs/src/languages/helm.md b/docs/src/languages/helm.md
deleted file mode 100644
index f8a6f5c5fa..0000000000
--- a/docs/src/languages/helm.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# Helm
-
-Support for Helm in Zed is provided by the community-maintained [Helm extension](https://github.com/cabrinha/helm.zed).
-
-- Tree-sitter: [tree-sitter-go-template](https://github.com/ngalaiko/tree-sitter-go-template/tree/master)
-- Language Server: [mrjosh/helm-ls](https://github.com/mrjosh/helm-ls)
-
-## Setup
-
-Enable Helm language for Helm files by editing your `.zed/settings.json` and adding:
-
-```json [settings]
-  "file_types": {
-    "Helm": [
-      "**/templates/**/*.tpl",
-      "**/templates/**/*.yaml",
-      "**/templates/**/*.yml",
-      "**/helmfile.d/**/*.yaml",
-      "**/helmfile.d/**/*.yml",
-      "**/values*.yaml"
-    ]
-  }
-```
-
-This will also mark values.yaml files as the type helm, since helm-ls supports this.
diff --git a/docs/src/languages/html.md b/docs/src/languages/html.md
deleted file mode 100644
index 274083adee..0000000000
--- a/docs/src/languages/html.md
+++ /dev/null
@@ -1,71 +0,0 @@
-# HTML
-
-HTML support is available through the [HTML extension](https://github.com/zed-industries/zed/tree/main/extensions/html).
-
-- Tree-sitter: [tree-sitter/tree-sitter-html](https://github.com/tree-sitter/tree-sitter-html)
-- Language Server: [microsoft/vscode-html-languageservice](https://github.com/microsoft/vscode-html-languageservice)
-
-This extension is automatically installed, but if you do not want to use it, you can add the following to your settings:
-
-```json [settings]
-{
-  "auto_install_extensions": {
-    "html": false
-  }
-}
-```
-
-## Formatting
-
-By default Zed uses [Prettier](https://prettier.io/) for formatting HTML.
-
-You can disable `format_on_save` by adding the following to your Zed `settings.json`:
-
-```json [settings]
-  "languages": {
-    "HTML": {
-      "format_on_save": "off",
-    }
-  }
-```
-
-You can still trigger formatting manually with {#kb editor::Format} or by opening [the Command Palette](..//getting-started.md#command-palette) ({#kb command_palette::Toggle}) and selecting "Format Document".
-
-### LSP Formatting
-
-To use the `vscode-html-language-server` language server auto-formatting instead of Prettier, add the following to your Zed settings:
-
-```json [settings]
-  "languages": {
-    "HTML": {
-      "formatter": "language_server",
-    }
-  }
-```
-
-You can customize various [formatting options](https://code.visualstudio.com/docs/languages/html#_formatting) for `vscode-html-language-server` via your Zed `settings.json`:
-
-```json [settings]
-  "lsp": {
-    "vscode-html-language-server": {
-      "settings": {
-        "html": {
-          "format": {
-            // Indent under <html> and <head> (default: false)
-            "indentInnerHtml": true,
-            // Disable formatting inside <svg> or <script>
-            "contentUnformatted": "svg,script",
-            // Add an extra newline before <div> and <p>
-            "extraLiners": "div,p"
-          }
-        }
-      }
-    }
-  }
-```
-
-## See also
-
-- [CSS](./css.md)
-- [JavaScript](./javascript.md)
-- [TypeScript](./typescript.md)
diff --git a/docs/src/languages/java.md b/docs/src/languages/java.md
deleted file mode 100644
index 482429aef3..0000000000
--- a/docs/src/languages/java.md
+++ /dev/null
@@ -1,167 +0,0 @@
-# Java
-
-Java language support in Zed is provided by:
-
-- Zed Java: [zed-extensions/java](https://github.com/zed-extensions/java)
-- Tree-sitter: [tree-sitter/tree-sitter-java](https://github.com/tree-sitter/tree-sitter-java)
-- Language Server: [eclipse-jdtls/eclipse.jdt.ls](https://github.com/eclipse-jdtls/eclipse.jdt.ls)
-
-## Install OpenJDK
-
-You will need to install a Java runtime (OpenJDK).
-
-- macOS: `brew install openjdk`
-- Ubuntu: `sudo add-apt-repository ppa:openjdk-23 && sudo apt-get install openjdk-23`
-- Windows: `choco install openjdk`
-- Arch Linux: `sudo pacman -S jre-openjdk-headless`
-
-Or manually download and install [OpenJDK 23](https://jdk.java.net/23/).
-
-## Extension Install
-
-You can install by opening {#action zed::Extensions}({#kb zed::Extensions}) and searching for `java`.
-
-## Quick start and configuration
-
-For the majority of users, Java support should work out of the box.
-
-- It is generally recommended to open projects with the Zed-project root at the Java project root folder (where you would commonly have your `pom.xml` or `build.gradle` file).
-
-- By default the extension will download and run the latest official version of JDTLS for you, but this requires Java version 21 to be available on your system via either the `$JAVA_HOME` environment variable or as a `java(.exe)` executable on your `$PATH`. If your project requires a lower Java version in the environment, you can specify a different JDK to use for running JDTLS via the `java_home` configuration option.
-
-- You can provide a **custom launch script for JDTLS**, by adding an executable named `jdtls` (or `jdtls.bat` on Windows) to your `$PATH` environment variable. If this is present, the extension will skip downloading and launching a managed instance and use the one from the environment.
-
-- To support [Lombok](https://projectlombok.org/), the lombok-jar must be downloaded and registered as a Java-Agent when launching JDTLS. By default the extension automatically takes care of that, but in case you don't want that you can set the `lombok_support` configuration-option to `false`.
-
-Here is a common `settings.json` including the above mentioned configurations:
-
-```jsonc
-{
-  "lsp": {
-    "jdtls": {
-      "settings": {
-        "java_home": "/path/to/your/JDK21+",
-        "lombok_support": true,
-      },
-    },
-  },
-}
-```
-
-## Debugging
-
-Debug support is enabled via our [Fork of Java Debug](https://github.com/zed-industries/java-debug), which the extension will automatically download and start for you. Please refer to the [Debugger Documentation](https://zed.dev/docs/debugger#getting-started) for general information about how debugging works in Zed.
-
-To get started with Java, click the `edit debug.json` button in the Debug menu, and replace the contents of the file with the following:
-
-```jsonc
-[
-  {
-    "adapter": "Java",
-    "request": "launch",
-    "label": "Launch Debugger",
-    // if your project has multiple entry points, specify the one to use:
-    // "mainClass": "com.myorganization.myproject.MyMainClass",
-    //
-    // this effectively sets a breakpoint at your program entry:
-    "stopOnEntry": true,
-    // the working directory for the debug process
-    "cwd": "$ZED_WORKTREE_ROOT",
-  },
-]
-```
-
-You should then be able to start a new Debug Session with the "Launch Debugger" scenario from the debug menu.
-
-## Launch Scripts (aka Tasks) in Windows
-
-This extension provides tasks for running your application and tests from within Zed via little play buttons next to tests/entry points. However, due to current limitations of Zed's extension interface, we can not provide scripts that will work across Maven and Gradle on both Windows and Unix-compatible systems, so out of the box the launch scripts only work on Mac and Linux.
-
-There is a fairly straightforward fix that you can apply to make it work on Windows by supplying your own task scripts. Please see [this Issue](https://github.com/zed-extensions/java/issues/94) for information on how to do that and read the [Tasks section in Zeds documentation](https://zed.dev/docs/tasks) for more information.
-
-## Advanced Configuration/JDTLS initialization Options
-
-JDTLS provides many configuration options that can be passed via the `initialize` LSP-request. The extension will pass the JSON-object from `lsp.jdtls.settings.initialization_options` in your settings on to JDTLS. Please refer to the [JDTLS Configuration Wiki Page](https://github.com/eclipse-jdtls/eclipse.jdt.ls/wiki/Running-the-JAVA-LS-server-from-the-command-line#initialize-request) for the available options and values. Below is an example `settings.json` that would pass on the example configuration from the above wiki page to JDTLS:
-
-```jsonc
-{
-  "lsp": {
-    "jdtls": {
-      "settings": {
-        // this will be sent to JDTLS as initializationOptions:
-        "initialization_options": {
-          "bundles": [],
-          // use this if your zed project root folder is not the same as the java project root:
-          "workspaceFolders": ["file:///home/snjeza/Project"],
-          "settings": {
-            "java": {
-              "home": "/usr/local/jdk-9.0.1",
-              "errors": {
-                "incompleteClasspath": {
-                  "severity": "warning",
-                },
-              },
-              "configuration": {
-                "updateBuildConfiguration": "interactive",
-                "maven": {
-                  "userSettings": null,
-                },
-              },
-              "import": {
-                "gradle": {
-                  "enabled": true,
-                },
-                "maven": {
-                  "enabled": true,
-                },
-                "exclusions": [
-                  "**/node_modules/**",
-                  "**/.metadata/**",
-                  "**/archetype-resources/**",
-                  "**/META-INF/maven/**",
-                  "/**/test/**",
-                ],
-              },
-              "referencesCodeLens": {
-                "enabled": false,
-              },
-              "signatureHelp": {
-                "enabled": false,
-              },
-              "implementationCodeLens": "all",
-              "format": {
-                "enabled": true,
-              },
-              "saveActions": {
-                "organizeImports": false,
-              },
-              "contentProvider": {
-                "preferred": null,
-              },
-              "autobuild": {
-                "enabled": false,
-              },
-              "completion": {
-                "favoriteStaticMembers": [
-                  "org.junit.Assert.*",
-                  "org.junit.Assume.*",
-                  "org.junit.jupiter.api.Assertions.*",
-                  "org.junit.jupiter.api.Assumptions.*",
-                  "org.junit.jupiter.api.DynamicContainer.*",
-                  "org.junit.jupiter.api.DynamicTest.*",
-                ],
-                "importOrder": ["java", "javax", "com", "org"],
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-}
-```
-
-## See also
-
-[Zed Java Repo](https://github.com/zed-extensions/java)
-[Eclipse JDTLS Repo](https://github.com/eclipse-jdtls/eclipse.jdt.ls)
diff --git a/docs/src/languages/javascript.md b/docs/src/languages/javascript.md
deleted file mode 100644
index 1b87dac555..0000000000
--- a/docs/src/languages/javascript.md
+++ /dev/null
@@ -1,237 +0,0 @@
-# JavaScript
-
-JavaScript support is available natively in Zed.
-
-- Tree-sitter: [tree-sitter/tree-sitter-javascript](https://github.com/tree-sitter/tree-sitter-javascript)
-- Language Server: [yioneko/vtsls](https://github.com/yioneko/vtsls)
-- Alternate Language Server: [typescript-language-server/typescript-language-server](https://github.com/typescript-language-server/typescript-language-server)
-- Debug Adapter: [vscode-js-debug](https://github.com/microsoft/vscode-js-debug)
-
-## Code formatting
-
-Formatting on save is enabled by default for JavaScript, using TypeScript's built-in code formatting.
-But many JavaScript projects use other command-line code-formatting tools, such as [Prettier](https://prettier.io/).
-You can use one of these tools by specifying an _external_ code formatter for JavaScript in your settings.
-See [the configuration docs](../configuring-zed.md) for more information.
-
-For example, if you have Prettier installed and on your `PATH`, you can use it to format JavaScript files by adding the following to your `settings.json`:
-
-```json [settings]
-{
-  "languages": {
-    "JavaScript": {
-      "formatter": {
-        "external": {
-          "command": "prettier",
-          "arguments": ["--stdin-filepath", "{buffer_path}"]
-        }
-      }
-    }
-  }
-}
-```
-
-## JSX
-
-Zed supports JSX syntax highlighting out of the box.
-
-In JSX strings, the [`tailwindcss-language-server`](./tailwindcss.md) is used to provide autocompletion for Tailwind CSS classes.
-
-## JSDoc
-
-Zed supports JSDoc syntax in JavaScript and TypeScript comments that match the JSDoc syntax.
-Zed uses [tree-sitter/tree-sitter-jsdoc](https://github.com/tree-sitter/tree-sitter-jsdoc) for parsing and highlighting JSDoc.
-
-## ESLint
-
-You can configure Zed to format code using `eslint --fix` by running the ESLint code action when formatting:
-
-```json [settings]
-{
-  "languages": {
-    "JavaScript": {
-      "code_actions_on_format": {
-        "source.fixAll.eslint": true
-      }
-    }
-  }
-}
-```
-
-You can also only execute a single ESLint rule when using `fixAll`:
-
-```json [settings]
-{
-  "languages": {
-    "JavaScript": {
-      "code_actions_on_format": {
-        "source.fixAll.eslint": true
-      }
-    }
-  },
-  "lsp": {
-    "eslint": {
-      "settings": {
-        "codeActionOnSave": {
-          "rules": ["import/order"]
-        }
-      }
-    }
-  }
-}
-```
-
-> **Note:** the other formatter you have configured will still run, after ESLint.
-> So if your language server or Prettier configuration don't format according to
-> ESLint's rules, then they will overwrite what ESLint fixed and you end up with
-> errors.
-
-If you **only** want to run ESLint on save, you can configure code actions as
-the formatter:
-
-```json [settings]
-{
-  "languages": {
-    "JavaScript": {
-      "formatter": [],
-      "code_actions_on_format": {
-        "source.fixAll.eslint": true
-      }
-    }
-  }
-}
-```
-
-### Configure ESLint's `nodePath`:
-
-You can configure ESLint's `nodePath` setting:
-
-```json [settings]
-{
-  "lsp": {
-    "eslint": {
-      "settings": {
-        "nodePath": ".yarn/sdks"
-      }
-    }
-  }
-}
-```
-
-### Configure ESLint's `problems`:
-
-You can configure ESLint's `problems` setting.
-
-For example, here's how to set `problems.shortenToSingleLine`:
-
-```json [settings]
-{
-  "lsp": {
-    "eslint": {
-      "settings": {
-        "problems": {
-          "shortenToSingleLine": true
-        }
-      }
-    }
-  }
-}
-```
-
-### Configure ESLint's `rulesCustomizations`:
-
-You can configure ESLint's `rulesCustomizations` setting:
-
-```json [settings]
-{
-  "lsp": {
-    "eslint": {
-      "settings": {
-        "rulesCustomizations": [
-          // set all eslint errors/warnings to show as warnings
-          { "rule": "*", "severity": "warn" }
-        ]
-      }
-    }
-  }
-}
-```
-
-### Configure ESLint's `workingDirectory`:
-
-You can configure ESLint's `workingDirectory` setting:
-
-```json [settings]
-{
-  "lsp": {
-    "eslint": {
-      "settings": {
-        "workingDirectory": {
-          "mode": "auto"
-        }
-      }
-    }
-  }
-}
-```
-
-## Debugging
-
-Zed supports debugging JavaScript code out of the box with `vscode-js-debug`.
-The following can be debugged without writing additional configuration:
-
-- Tasks from `package.json`
-- Tests written using several popular frameworks (Jest, Mocha, Vitest, Jasmine, Bun, Node)
-
-Run {#action debugger::Start} ({#kb debugger::Start}) to see a contextual list of these predefined debug tasks.
-
-> **Note:** Bun test is automatically detected when `@types/bun` is present in `package.json`.
->
-> **Note:** Node test is automatically detected when `@types/node` is present in `package.json` (requires Node.js 20+).
-
-As for all languages, configurations from `.vscode/launch.json` are also available for debugging in Zed.
-
-If your use-case isn't covered by any of these, you can take full control by adding debug configurations to `.zed/debug.json`. See below for example configurations.
-
-### Configuring JavaScript debug tasks
-
-JavaScript debugging is more complicated than other languages because there are two different environments: Node.js and the browser. `vscode-js-debug` exposes a `type` field, that you can use to specify the environment, either `node` or `chrome`.
-
-- [vscode-js-debug configuration documentation](https://github.com/microsoft/vscode-js-debug/blob/main/OPTIONS.md)
-
-### Debug the current file with Node
-
-```json [debug]
-[
-  {
-    "adapter": "JavaScript",
-    "label": "Debug JS file",
-    "type": "node",
-    "request": "launch",
-    "program": "$ZED_FILE",
-    "skipFiles": ["<node_internals>/**"]
-  }
-]
-```
-
-### Launch a web app in Chrome
-
-```json [debug]
-[
-  {
-    "adapter": "JavaScript",
-    "label": "Debug app in Chrome",
-    "type": "chrome",
-    "request": "launch",
-    "file": "$ZED_WORKTREE_ROOT/index.html",
-    "webRoot": "$ZED_WORKTREE_ROOT",
-    "console": "integratedTerminal",
-    "skipFiles": ["<node_internals>/**"]
-  }
-]
-```
-
-## See also
-
-- [Yarn documentation](./yarn.md) for a walkthrough of configuring your project to use Yarn.
-- [TypeScript documentation](./typescript.md)
diff --git a/docs/src/languages/json.md b/docs/src/languages/json.md
deleted file mode 100644
index 33acdb172e..0000000000
--- a/docs/src/languages/json.md
+++ /dev/null
@@ -1,77 +0,0 @@
-# JSON
-
-JSON support is available natively in Zed.
-
-- Tree-sitter: [tree-sitter/tree-sitter-json](https://github.com/tree-sitter/tree-sitter-json)
-- Language Server: [zed-industries/json-language-server](https://github.com/zed-industries/json-language-server)
-
-## JSONC
-
-Zed also supports a super-set of JSON called JSONC, which allows single line comments (`//`) in JSON files.
-While editing these files you can use `cmd-/` (macOS) or `ctrl-/` (Linux) to toggle comments on the current line or selection.
-
-## JSONC Prettier Formatting
-
-If you use files with the `*.jsonc` extension when using `Format Document` or have `format_on_save` enabled, Zed invokes Prettier as the formatter. Prettier has an [outstanding issue](https://github.com/prettier/prettier/issues/15956) where it will add trailing commas to files with a `jsonc` extension. JSONC files which have a `.json` extension are unaffected.
-
-To workaround this behavior you can add the following to your `.prettierrc` configuration file:
-
-```json [settings]
-{
-  "overrides": [
-    {
-      "files": ["*.jsonc"],
-      "options": {
-        "parser": "json",
-        "trailingComma": "none"
-      }
-    }
-  ]
-}
-```
-
-## JSON Language Server
-
-Zed automatically out of the box supports JSON Schema validation of `package.json` and `tsconfig.json` files, but `json-language-server` can use JSON Schema definitions in project files, from the [JSON Schema Store](https://www.schemastore.org) or other publicly available URLs for JSON validation.
-
-### Inline Schema Specification
-
-To specify a schema inline with your JSON files, add a `$schema` top level key linking to your json schema file.
-
-For example to for a `.luarc.json` for use with [lua-language-server](https://github.com/LuaLS/lua-language-server/):
-
-```json [settings]
-{
-  "$schema": "https://raw.githubusercontent.com/sumneko/vscode-lua/master/setting/schema.json",
-  "runtime.version": "Lua 5.4"
-}
-```
-
-### Schema Specification via Settings
-
-You can alternatively associate JSON Schemas with file paths by via Zed LSP settings.
-
-To
-
-```json [settings]
-"lsp": {
-  "json-language-server": {
-    "settings": {
-      "json": {
-        "schemas": [
-          {
-            "fileMatch": ["*/*.luarc.json"],
-            "url": "https://raw.githubusercontent.com/sumneko/vscode-lua/master/setting/schema.json"
-          }
-        ]
-      }
-    }
-  }
-}
-```
-
-You can also pass any of the [supported settings](https://github.com/Microsoft/vscode/blob/main/extensions/json-language-features/server/README.md#settings) to json-language-server by specifying them in your Zed settings.json:
-
-<!--
-TBD: Add formatter (prettier) settings (autoformat, tab_size, etc)
--->
diff --git a/docs/src/languages/jsonnet.md b/docs/src/languages/jsonnet.md
deleted file mode 100644
index 405087766b..0000000000
--- a/docs/src/languages/jsonnet.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# Jsonnet
-
-Jsonnet language support in Zed is provided by the community-maintained [Jsonnet extension](https://github.com/narqo/zed-jsonnet).
-
-- Tree-sitter: [sourcegraph/tree-sitter-jsonnet](https://github.com/sourcegraph/tree-sitter-jsonnet)
-- Language Server: [grafana/jsonnet-language-server](https://github.com/grafana/jsonnet-language-server)
-
-## Configuration
-
-Workspace configuration options can be passed to the language server via the `lsp` settings of the `settings.json`.
-
-The following example enables support for resolving [tanka](https://tanka.dev) import paths in `jsonnet-language-server`:
-
-```json [settings]
-{
-  "lsp": {
-    "jsonnet-language-server": {
-      "settings": {
-        "resolve_paths_with_tanka": true
-      }
-    }
-  }
-}
-```
diff --git a/docs/src/languages/julia.md b/docs/src/languages/julia.md
deleted file mode 100644
index 171f8c816f..0000000000
--- a/docs/src/languages/julia.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Julia
-
-Julia language support in Zed is provided by the community-maintained [Julia extension](https://github.com/JuliaEditorSupport/zed-julia).
-Report issues to: [https://github.com/JuliaEditorSupport/zed-julia/issues](https://github.com/JuliaEditorSupport/zed-julia/issues)
-
-- Tree-sitter: [tree-sitter/tree-sitter-julia](https://github.com/tree-sitter/tree-sitter-julia)
-- Language Server: [julia-vscode/LanguageServer.jl](https://github.com/julia-vscode/LanguageServer.jl)
-
-<!--
-TBD: Document Julia Installation
-TBD: Julia REPL Setup instructions
--->
diff --git a/docs/src/languages/kotlin.md b/docs/src/languages/kotlin.md
deleted file mode 100644
index a81643ab7d..0000000000
--- a/docs/src/languages/kotlin.md
+++ /dev/null
@@ -1,55 +0,0 @@
-# Kotlin
-
-Kotlin language support in Zed is provided by the community-maintained [Kotlin extension](https://github.com/zed-extensions/kotlin).
-Report issues to: [https://github.com/zed-extensions/kotlin/issues](https://github.com/zed-extensions/kotlin/issues)
-
-- Tree-sitter: [fwcd/tree-sitter-kotlin](https://github.com/fwcd/tree-sitter-kotlin)
-- Language Server: [fwcd/kotlin-language-server](https://github.com/fwcd/kotlin-language-server)
-
-## Configuration
-
-Workspace configuration options can be passed to the language server via lsp
-settings in `settings.json`.
-
-The full list of lsp `settings` can be found
-[here](https://github.com/fwcd/kotlin-language-server/blob/main/server/src/main/kotlin/org/javacs/kt/Configuration.kt)
-under `class Configuration` and initialization_options under `class InitializationOptions`.
-
-### JVM Target
-
-The following example changes the JVM target from `default` (which is 1.8) to
-`17`:
-
-```json [settings]
-{
-  "lsp": {
-    "kotlin-language-server": {
-      "settings": {
-        "compiler": {
-          "jvm": {
-            "target": "17"
-          }
-        }
-      }
-    }
-  }
-}
-```
-
-### JAVA_HOME
-
-To use a specific java installation, just specify the `JAVA_HOME` environment variable with:
-
-```json [settings]
-{
-  "lsp": {
-    "kotlin-language-server": {
-      "binary": {
-        "env": {
-          "JAVA_HOME": "/Users/whatever/Applications/Work/Android Studio.app/Contents/jbr/Contents/Home"
-        }
-      }
-    }
-  }
-}
-```
diff --git a/docs/src/languages/lua.md b/docs/src/languages/lua.md
deleted file mode 100644
index 65b709b391..0000000000
--- a/docs/src/languages/lua.md
+++ /dev/null
@@ -1,181 +0,0 @@
-# Lua
-
-Lua support is available through the [Lua extension](https://github.com/zed-extensions/lua).
-
-- Tree-sitter: [tree-sitter-grammars/tree-sitter-lua](https://github.com/tree-sitter-grammars/tree-sitter-lua)
-- Language server: [LuaLS/lua-language-server](https://github.com/LuaLS/lua-language-server)
-
-## luarc.json
-
-To configure LuaLS you can create a `.luarc.json` file in the root of your workspace.
-
-```json [settings]
-{
-  "$schema": "https://raw.githubusercontent.com/LuaLS/vscode-lua/master/setting/schema.json",
-  "runtime.version": "Lua 5.4",
-  "format.enable": true,
-  "workspace.library": ["../somedir/library"]
-}
-```
-
-See [LuaLS Settings Documentation](https://luals.github.io/wiki/settings/) for all available configuration options, or when editing this file in Zed available settings options will autocomplete, (e.g `runtime.version` will show `"Lua 5.1"`, `"Lua 5.2"`, `"Lua 5.3"`, `"Lua 5.4"` and `"LuaJIT"` as allowed values). Note when importing settings options from VS Code, remove the `Lua.` prefix. (e.g. `runtime.version` instead of `Lua.runtime.version`).
-
-### LuaCATS Definitions
-
-LuaLS can provide enhanced LSP autocompletion suggestions and type validation with the help of LuaCATS (Lua Comment and Type System) definitions. These definitions are available for many common Lua libraries, and local paths containing them can be specified via `workspace.library` in `luarc.json`. You can do this via relative paths if you checkout your definitions into the same partent directory of your project (`../playdate-luacats`, `../love2d`, etc). Alternatively you can create submodule(s) inside your project for each LuaCATS definition repo.
-
-### LÖVE (Love2D) {#love2d}
-
-To use [LÖVE (Love2D)](https://love2d.org/) in Zed, checkout [LuaCATS/love2d](https://github.com/LuaCATS/love2d) into a folder called `love2d-luacats` into the parent folder of your project:
-
-```sh
-cd .. && git clone https://github.com/LuaCATS/love2d love2d-luacats
-```
-
-Then in your `.luarc.json`:
-
-```
-{
-  "$schema": "https://raw.githubusercontent.com/LuaLS/vscode-lua/master/setting/schema.json",
-  "runtime.version": "Lua 5.4",
-  "workspace.library": ["../love2d-luacats"],
-  "runtime.special": {
-    "love.filesystem.load": "loadfile"
-  }
-}
-```
-
-### PlaydateSDK
-
-To use [Playdate Lua SDK](https://play.date/dev/) in Zed, checkout [playdate-luacats](https://github.com/notpeter/playdate-luacats) into the parent folder of your project:
-
-```sh
-cd .. && git clone https://github.com/notpeter/playdate-luacats
-```
-
-Then in your `.luarc.json`:
-
-```json [settings]
-{
-  "$schema": "https://raw.githubusercontent.com/LuaLS/vscode-lua/master/setting/schema.json",
-  "runtime.version": "Lua 5.4",
-  "runtime.nonstandardSymbol": [
-    "+=",
-    "-=",
-    "*=",
-    "/=",
-    "//=",
-    "%=",
-    "<<=",
-    ">>=",
-    "&=",
-    "|=",
-    "^="
-  ],
-  "diagnostics.severity": { "duplicate-set-field": "Hint" },
-  "diagnostics.globals": ["import"],
-  "workspace.library": ["../playdate-luacats"],
-  "format.defaultConfig": {
-    "indent_style": "space",
-    "indent_size": "4"
-  },
-  "format.enable": true,
-  "runtime.builtin": { "io": "disable", "os": "disable", "package": "disable" }
-}
-```
-
-### Inlay Hints
-
-To enable [Inlay Hints](../configuring-languages.md#inlay-hints) for LuaLS in Zed
-
-1. Add the following to your Zed settings.json:
-
-```json [settings]
-  "languages": {
-    "Lua": {
-      "inlay_hints": {
-        "enabled": true,
-        "show_type_hints": true,
-        "show_parameter_hints": true,
-        "show_other_hints": true
-      }
-    }
-  }
-```
-
-2. Add `"hint.enable": true` to your `.luarc.json`.
-
-## Formatting
-
-### LuaLS Formatting
-
-To enable auto-formatting with your LuaLS (provided by [CppCXY/EmmyLuaCodeStyle](https://github.com/CppCXY/EmmyLuaCodeStyle)) make sure you have `"format.enable": true,` in your .luarc.json:
-
-```json [settings]
-{
-  "$schema": "https://raw.githubusercontent.com/sumneko/vscode-lua/master/setting/schema.json",
-  "format.enable": true
-}
-```
-
-Then add the following to your Zed `settings.json`:
-
-```json [settings]
-{
-  "languages": {
-    "Lua": {
-      "format_on_save": "on",
-      "formatter": "language_server"
-    }
-  }
-}
-```
-
-You can customize various EmmyLuaCodeStyle style options via `.editorconfig`, see [lua.template.editorconfig](https://github.com/CppCXY/EmmyLuaCodeStyle/blob/master/lua.template.editorconfig) for all available options.
-
-### StyLua Formatting
-
-Alternatively to use [StyLua](https://github.com/JohnnyMorganz/StyLua) for auto-formatting:
-
-1. Install [StyLua](https://github.com/JohnnyMorganz/StyLua): `brew install stylua` or `cargo install stylua --features lua52,lua53,lua54,luau,luajit` (feel free to remove any Lua versions you don't need).
-2. Add the following to your `settings.json`:
-
-```json [settings]
-{
-  "languages": {
-    "Lua": {
-      "format_on_save": "on",
-      "formatter": {
-        "external": {
-          "command": "stylua",
-          "arguments": [
-            "--syntax=Lua54",
-            "--respect-ignores",
-            "--stdin-filepath",
-            "{buffer_path}",
-            "-"
-          ]
-        }
-      }
-    }
-  }
-}
-```
-
-You can specify various options to StyLua either on the command line above (like `--syntax=Lua54`) or in a `stylua.toml` in your workspace:
-
-```toml
-syntax = "Lua54"
-column_width = 100
-line_endings = "Unix"
-indent_type = "Spaces"
-indent_width = 4
-quote_style = "AutoPreferDouble"
-call_parentheses = "Always"
-collapse_simple_statement = "All"
-
-[sort_requires]
-enabled = true
-```
-
-For a complete list of available options, see: [StyLua Options](https://github.com/JohnnyMorganz/StyLua?tab=readme-ov-file#options).
diff --git a/docs/src/languages/luau.md b/docs/src/languages/luau.md
deleted file mode 100644
index b99cfc86ac..0000000000
--- a/docs/src/languages/luau.md
+++ /dev/null
@@ -1,41 +0,0 @@
-# Luau
-
-[Luau](https://luau.org/) is a fast, small, safe, gradually typed, embeddable scripting language derived from Lua. Luau was developed by Roblox and is available under the MIT license.
-
-Luau language support in Zed is provided by the community-maintained [Luau extension](https://github.com/4teapo/zed-luau).
-Report issues to: [https://github.com/4teapo/zed-luau/issues](https://github.com/4teapo/zed-luau/issues)
-
-- Tree-sitter: [4teapo/tree-sitter-luau](https://github.com/4teapo/tree-sitter-luau)
-- Language Server: [JohnnyMorganz/luau-lsp](https://github.com/JohnnyMorganz/luau-lsp)
-
-## Configuration
-
-Configuration instructions are available in the [Luau Zed Extension README](https://github.com/4teapo/zed-luau).
-
-## Formatting
-
-To support automatically formatting your code, you can use [JohnnyMorganz/StyLua](https://github.com/JohnnyMorganz/StyLua), a Lua code formatter.
-
-Install with:
-
-```sh
-# macOS via Homebrew
-brew install stylua
-# Or via Cargo
-cargo install stylua --features lua52,lua53,lua54,luau
-```
-
-Then add the following to your Zed `settings.json`:
-
-```json [settings]
-  "languages": {
-    "Luau": {
-      "formatter": {
-        "external": {
-          "command": "stylua",
-          "arguments": ["-"]
-        }
-      }
-    }
-  }
-```
diff --git a/docs/src/languages/makefile.md b/docs/src/languages/makefile.md
deleted file mode 100644
index 1d42299145..0000000000
--- a/docs/src/languages/makefile.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Makefile
-
-Makefile language support in Zed is provided by the community-maintained [Make extension](https://github.com/caius/zed-make).
-Report issues to: [https://github.com/caius/zed-make/issues](https://github.com/caius/zed-make/issues).
-
-- Tree-sitter: [caius/tree-sitter-make](https://github.com/caius/tree-sitter-make)
diff --git a/docs/src/languages/markdown.md b/docs/src/languages/markdown.md
deleted file mode 100644
index 36ce734f7c..0000000000
--- a/docs/src/languages/markdown.md
+++ /dev/null
@@ -1,46 +0,0 @@
-# Markdown
-
-Markdown support is available natively in Zed.
-
-- Tree-sitter: [tree-sitter-markdown](https://github.com/tree-sitter-grammars/tree-sitter-markdown)
-- Language Server: N/A
-
-## Syntax Highlighting Code Blocks
-
-Zed supports language-specific syntax highlighting of markdown code blocks by leveraging [tree-sitter language grammars](../extensions/languages.md#grammar). All [Zed supported languages](../languages.md), including those provided by official or community extensions, are available for use in markdown code blocks. All you need to do is provide a language name after the opening <kbd>```</kbd> code fence like so:
-
-````python
-```python
-import functools as ft
-
-@ft.lru_cache(maxsize=500)
-def fib(n):
-    return n if n < 2 else fib(n - 1) + fib(n - 2)
-```
-````
-
-## Configuration
-
-### Format
-
-Zed supports using Prettier to automatically re-format Markdown documents. You can trigger this manually via the {#action editor::Format} action or via the {#kb editor::Format} keyboard shortcut. Alternately, you can automatically format by enabling [`format_on_save`](../configuring-zed.md#format-on-save) in your settings.json:
-
-```json [settings]
-  "languages": {
-    "Markdown": {
-      "format_on_save": "on"
-    }
-  },
-```
-
-### Trailing Whitespace
-
-By default Zed will remove trailing whitespace on save. If you rely on invisible trailing whitespace being converted to `<br />` in Markdown files you can disable this behavior with:
-
-```json [settings]
-  "languages": {
-    "Markdown": {
-      "remove_trailing_whitespace_on_save": false
-    }
-  },
-```
diff --git a/docs/src/languages/nim.md b/docs/src/languages/nim.md
deleted file mode 100644
index 03c2bc0609..0000000000
--- a/docs/src/languages/nim.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# Nim
-
-Nim language support in Zed is provided by the community-maintained [Nim extension](https://github.com/foxoman/zed-nim).
-Report issues to: [https://github.com/foxoman/zed-nim/issues](https://github.com/foxoman/zed-nim/issues)
-
-- Tree-sitter: [alaviss/tree-sitter-nim](https://github.com/alaviss/tree-sitter-nim)
-- Language Server: [nim-lang/langserver](https://github.com/nim-lang/langserver)
-
-## Formatting
-
-To use [arnetheduck/nph](https://github.com/arnetheduck/nph) as a formatter, follow the [nph installation instructions](https://github.com/arnetheduck/nph?tab=readme-ov-file#installation) and add this to your Zed `settings.json`:
-
-```json [settings]
-  "languages": {
-    "Nim": {
-      "formatter": {
-        "external": {
-          "command": "nph",
-          "arguments": ["-"]
-        }
-      }
-    }
-  }
-```
diff --git a/docs/src/languages/ocaml.md b/docs/src/languages/ocaml.md
deleted file mode 100644
index 10c3c1ac09..0000000000
--- a/docs/src/languages/ocaml.md
+++ /dev/null
@@ -1,36 +0,0 @@
-# OCaml
-
-OCaml support is available through the [OCaml extension](https://github.com/zed-extensions/ocaml).
-
-- Tree-sitter: [tree-sitter/tree-sitter-ocaml](https://github.com/tree-sitter/tree-sitter-ocaml)
-- Language Server: [ocaml/ocaml-lsp](https://github.com/ocaml/ocaml-lsp)
-
-## Setup Instructions
-
-If you have the development environment already setup, you can skip to [Launching Zed](#launching-zed)
-
-### Using Opam
-
-Opam is the official package manager for OCaml and is highly recommended for getting started with OCaml. To get started using Opam, please follow the instructions provided [here](https://ocaml.org/install).
-
-Once you install opam and setup a switch with your development environment as per the instructions, you can proceed.
-
-### Launching Zed
-
-By now you should have `ocamllsp` installed, you can verify so by running
-
-```sh
-ocamllsp --help
-```
-
-in your terminal. If you get a help message, you're good to go. If not, please revisit the installation instructions for `ocamllsp` and ensure it's properly installed.
-
-With that aside, we can now launch Zed. Given how the OCaml package manager works, we require you to run Zed from the terminal, so please make sure you install the [Zed cli](https://zed.dev/features#cli) if you haven't already.
-
-Once you have the cli, simply from a terminal, navigate to your project and run
-
-```sh
-zed .
-```
-
-Voilà! You should have Zed running with OCaml support, no additional setup required.
diff --git a/docs/src/languages/opentofu.md b/docs/src/languages/opentofu.md
deleted file mode 100644
index dfe8fa7b81..0000000000
--- a/docs/src/languages/opentofu.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# OpenTofu
-
-OpenTofu support is available through the [OpenTofu extension](https://github.com/ashpool37/zed-extension-opentofu).
-
-- Tree-sitter: [MichaHoffmann/tree-sitter-hcl](https://github.com/MichaHoffmann/tree-sitter-hcl)
-- Language Server: [opentofu/tofu-ls](https://github.com/opentofu/tofu-ls)
-
-## Configuration
-
-In order to automatically use the OpenTofu extension and language server when editing .tf and .tfvars files,
-either uninstall the Terraform extension or add this to your settings.json:
-
-```json
-"file_types": {
-  "OpenTofu": ["tf"],
-  "OpenTofu Vars": ["tfvars"]
-},
-```
-
-See the [full list of server settings here](https://github.com/opentofu/tofu-ls/blob/main/docs/SETTINGS.md).
diff --git a/docs/src/languages/php.md b/docs/src/languages/php.md
deleted file mode 100644
index 1a9f1cdade..0000000000
--- a/docs/src/languages/php.md
+++ /dev/null
@@ -1,156 +0,0 @@
-# PHP
-
-PHP support is available through the [PHP extension](https://github.com/zed-extensions/php).
-
-- Tree-sitter: [tree-sitter/tree-sitter-php](https://github.com/tree-sitter/tree-sitter-php)
-- Language Server: [phpactor/phpactor](https://github.com/phpactor/phpactor)
-- Alternate Language Server: [bmewburn/vscode-intelephense](https://github.com/bmewburn/vscode-intelephense/)
-
-## Install PHP
-
-The PHP extension requires PHP to be installed and available in your `PATH`:
-
-```sh
-# macOS via Homebrew
-brew install php
-
-# Debian/Ubuntu
-sudo apt-get install php-cli
-
-# CentOS 8+/RHEL
-sudo dnf install php-cli
-
-# Arch Linux
-sudo pacman -S php
-
-# check PHP path
-## macOS and Linux
-which php
-
-## Windows
-where php
-```
-
-## Choosing a language server
-
-The PHP extension uses [LSP language servers](https://microsoft.github.io/language-server-protocol) with Phpactor as the default. If you want to use other language servers that support Zed (e.g. Intelephense or PHP Tools), make sure to follow the documentation on how to implement it.
-
-### Intelephense
-
-[Intelephense](https://intelephense.com/) is a [proprietary](https://github.com/bmewburn/vscode-intelephense/blob/master/LICENSE.txt#L29) language server for PHP operating under a freemium model. Certain features require purchase of a [premium license](https://intelephense.com/buy).
-
-To use Intelephense, add the following to your `settings.json`:
-
-```json [settings]
-{
-  "languages": {
-    "PHP": {
-      "language_servers": ["intelephense", "!phpactor", "!phptools", "..."]
-    }
-  }
-}
-```
-
-To use the premium features, you can place your license file inside your home directory at `~/intelephense/licence.txt` for macOS and Linux, or `%USERPROFILE%/intelephense/licence.txt` on Windows.
-
-Alternatively, you can pass the licence key or a path to a file containing the licence key as an initialization option. To do this, add the following to your `settings.json`:
-
-```json [settings]
-{
-  "lsp": {
-    "intelephense": {
-      "initialization_options": {
-        "licenceKey": "/path/to/licence.txt"
-      }
-    }
-  }
-}
-```
-
-### PHP Tools
-
-[PHP Tools](https://www.devsense.com/) is a proprietary language server that offers free and premium features. You need to [purchase a license](https://www.devsense.com/en/purchase) to activate the premium features.
-
-To use PHP Tools, add the following to your `settings.json`:
-
-```json [settings]
-{
-  "languages": {
-    "PHP": {
-      "language_servers": ["phptools", "!intelephense", "!phpactor", "..."]
-    }
-  }
-}
-```
-
-To use the premium features, you can add your license in `initialization_options` in your `settings.json`:
-
-```json [settings]
-{
-  "lsp": {
-    "phptools": {
-      "initialization_options": {
-        "0": "your_license_key"
-      }
-    }
-  }
-}
-```
-
-or, set environment variable `DEVSENSE_PHP_LS_LICENSE` on `.env` file in your project.
-
-```env
-DEVSENSE_PHP_LS_LICENSE="your_license_key"
-```
-
-Check out the documentation of [PHP Tools for Zed](https://docs.devsense.com/other/zed/) for more details.
-
-### Phpactor
-
-To use Phpactor instead of Intelephense or any other tools, add the following to your `settings.json`:
-
-```json [settings]
-{
-  "languages": {
-    "PHP": {
-      "language_servers": ["phpactor", "!intelephense", "!phptools", "..."]
-    }
-  }
-}
-```
-
-## PHPDoc
-
-Zed supports syntax highlighting for PHPDoc comments.
-
-- Tree-sitter: [claytonrcarter/tree-sitter-phpdoc](https://github.com/claytonrcarter/tree-sitter-phpdoc)
-
-## Debugging
-
-The PHP extension provides a debug adapter for PHP via Xdebug. There are several ways to use it:
-
-```json
-[
-  {
-    "label": "PHP: Listen to Xdebug",
-    "adapter": "Xdebug",
-    "request": "launch",
-    "port": 9003
-  },
-  {
-    "label": "PHP: Debug this test",
-    "adapter": "Xdebug",
-    "request": "launch",
-    "program": "vendor/bin/phpunit",
-    "args": ["--filter", "$ZED_SYMBOL"]
-  }
-]
-```
-
-These are common troubleshooting tips, in case you run into issues:
-
-- Ensure that you have Xdebug installed for the version of PHP you’re running.
-- Ensure that Xdebug is configured to run in `debug` mode.
-- Ensure that Xdebug is actually starting a debugging session.
-- Ensure that the host and port matches between Xdebug and Zed.
-- Look at the diagnostics log by using the `xdebug_info()` function in the page you’re trying to debug.
diff --git a/docs/src/languages/powershell.md b/docs/src/languages/powershell.md
deleted file mode 100644
index 195ce4ad36..0000000000
--- a/docs/src/languages/powershell.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# PowerShell
-
-PowerShell language support in Zed is provided by the community-maintained [Zed PowerShell extension](https://github.com/wingyplus/zed-powershell). Please report issues to: [github.com/wingyplus/zed-powershell/issues](https://github.com/wingyplus/zed-powershell/issues)
-
-- Tree-sitter: [airbus-cert/tree-sitter-powershell](https://github.com/airbus-cert/tree-sitter-powershell)
-- Language Server: [PowerShell/PowerShellEditorServices](https://github.com/PowerShell/PowerShellEditorServices)
-
-## Setup
-
-### Install PowerShell 7+ {#powershell-install}
-
-- macOS: `brew install powershell/tap/powershell`
-- Alpine: [Installing PowerShell on Alpine Linux](https://learn.microsoft.com/en-us/powershell/scripting/install/install-alpine)
-- Debian: [Install PowerShell on Debian Linux](https://learn.microsoft.com/en-us/powershell/scripting/install/install-debian)
-- RedHat: [Install PowerShell on RHEL](https://learn.microsoft.com/en-us/powershell/scripting/install/install-rhel)
-- Ubuntu: [Install PowerShell on RHEL](https://learn.microsoft.com/en-us/powershell/scripting/install/install-ubuntu)
-- Windows: [Install PowerShell on Windows](https://learn.microsoft.com/en-us/powershell/scripting/install/installing-powershell-on-windows)
-
-The Zed PowerShell extension will default to the `pwsh` executable found in your path.
-
-### Install PowerShell Editor Services (Optional) {#powershell-editor-services}
-
-The Zed PowerShell extensions will attempt to download [PowerShell Editor Services](https://github.com/PowerShell/PowerShellEditorServices) automatically.
-
-If want to use a specific binary, you can specify in your that in your Zed settings.json:
-
-```json [settings]
-  "lsp": {
-    "powershell-es": {
-      "binary": {
-        "path": "/path/to/PowerShellEditorServices"
-      }
-    }
-  }
-```
diff --git a/docs/src/languages/prisma.md b/docs/src/languages/prisma.md
deleted file mode 100644
index 92924a6043..0000000000
--- a/docs/src/languages/prisma.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Prisma
-
-Prisma support is available through the [Prisma extension](https://github.com/zed-extensions/prisma).
-
-- Tree-sitter: [victorhqc/tree-sitter-prisma](https://github.com/victorhqc/tree-sitter-prisma)
-- Language-Server: [prisma/language-tools](https://github.com/prisma/language-tools)
-
-<!--
-TBD: Prisma usage and configuration documentation
--->
diff --git a/docs/src/languages/proto.md b/docs/src/languages/proto.md
deleted file mode 100644
index 8d9b8350fa..0000000000
--- a/docs/src/languages/proto.md
+++ /dev/null
@@ -1,79 +0,0 @@
-# Proto
-
-Proto/proto3 (Protocol Buffers definition language) support is available through the [Proto extension](https://github.com/zed-industries/zed/tree/main/extensions/proto).
-
-- Tree-sitter: [coder3101/tree-sitter-proto](https://github.com/coder3101/tree-sitter-proto)
-- Language Servers: [protobuf-language-server](https://github.com/lasorda/protobuf-language-server)
-
-<!--
-TBD: Clarify which language server(s) to use / Feature support.
-
-## Setup
-
-### Install protobuf-language-server
-
-Install protobuf-language-server and make sure it's in your PATH:
-
-```
-go install github.com/lasorda/protobuf-language-server@latest
-which protobuf-language-server
-```
-
-### Install ProtoLS
-
-Install protols and make sure it's in your PATH:
-
-```
-cargo install protols
-which protols
-```
-
-## Configuration
-
-```json [settings]
-"lsp": {
-  "protobuf-language-server": {
-    "binary": {
-      "path": "protols"
-    }
-  }
-}
-```
-
-## Formatting
-
-ProtoLS supports formatting if you have `clang-format` installed.
-
-```sh
-# MacOS:
-brew install clang-format
-# Ubuntu
-sudo apt-get install clang-format
-# Fedora
-sudo dnf install clang-tools-extra
-```
-
-To customize your formatting preferences, create a `.clang-format` file, e.g.:
-
-```clang-format
-IndentWidth: 4
-ColumnLimit: 120
-```
-
-Or you can have zed directly invoke `clang-format` by specifying it as a [formatter](https://zed.dev/docs/configuring-zed#formatter) in your settings:
-
-```json [settings]
-  "languages": {
-    "Proto": {
-      "format_on_save": "on",
-      "tab_size": 4,
-      "formatter": {
-        "external": {
-          "command": "clang-format",
-          "arguments": ["-style={IndentWidth: 4, ColumnLimit: 0}"]
-        }
-      }
-    },
-  }
-```
--->
diff --git a/docs/src/languages/purescript.md b/docs/src/languages/purescript.md
deleted file mode 100644
index a3e3de3cd3..0000000000
--- a/docs/src/languages/purescript.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# PureScript
-
-PureScript support is available through the [PureScript extension](https://github.com/zed-extensions/purescript).
-
-- Tree-sitter: [postsolar/tree-sitter-purescript](https://github.com/postsolar/tree-sitter-purescript)
-- Language-Server: [nwolverson/purescript-language-server](https://github.com/nwolverson/purescript-language-server)
diff --git a/docs/src/languages/python.md b/docs/src/languages/python.md
deleted file mode 100644
index 5051a72209..0000000000
--- a/docs/src/languages/python.md
+++ /dev/null
@@ -1,359 +0,0 @@
-# How to Set Up Python in Zed
-
-Python support is available natively in Zed.
-
-- Tree-sitter: [tree-sitter-python](https://github.com/zed-industries/tree-sitter-python)
-- Language Servers:
-  - [DetachHead/basedpyright](https://github.com/DetachHead/basedpyright)
-  - [astral-sh/ruff](https://github.com/astral-sh/ruff)
-  - [astral-sh/ty](https://github.com/astral-sh/ty)
-  - [microsoft/pyright](https://github.com/microsoft/pyright)
-  - [python-lsp/python-lsp-server](https://github.com/python-lsp/python-lsp-server) (PyLSP)
-- Debug Adapter: [debugpy](https://github.com/microsoft/debugpy)
-
-## Install Python
-
-You'll need both Zed and Python installed before you can begin.
-
-### Step 1: Install Python
-
-Zed does not bundle a Python runtime, so you’ll need to install one yourself.
-Choose one of the following options:
-
-- uv (recommended)
-
-```bash
-curl -LsSf https://astral.sh/uv/install.sh | sh
-```
-
-To learn more, visit [Astral’s installation guide](https://docs.astral.sh/uv/getting-started/installation/).
-
-- Homebrew:
-
-```bash
-brew install python
-```
-
-- Python.org installer: Download the latest version from [python.org/downloads](https://python.org/downloads).
-
-### Step 2: Verify Python Installation
-
-Confirm Python is installed and available in your shell:
-
-```bash
-python3 --version
-```
-
-You should see an output like `Python 3.x.x`.
-
-## Open Your First Python Project in Zed
-
-Once Zed and Python are installed, open a folder containing Python code to start working.
-
-### Step 1: Launch Zed with a Python Project
-
-Open Zed.
-From the menu bar, choose File > Open Folder, or launch from the terminal:
-
-```bash
-zed path/to/your/project
-```
-
-Zed will recognize `.py` files automatically using its native tree-sitter-python parser, with no plugins or manual setup required.
-
-### Step 2: Use the Integrated Terminal (Optional)
-
-Zed includes an integrated terminal, accessible from the bottom panel. If Zed detects that your project is using a [virtual environment](#virtual-environments), it will be activated automatically in newly-created terminals. You can configure this behavior with the [`detect_venv`](../configuring-zed.md#terminal-detect_venv) setting.
-
-## Configure Python Language Servers in Zed
-
-Zed provides several Python language servers out of the box. By default, [basedpyright](https://github.com/DetachHead/basedpyright) is the primary language server, and [Ruff](https://github.com/astral-sh/ruff) is used for formatting and linting.
-
-Other built-in language servers are:
-
-- [Ty](https://docs.astral.sh/ty/)&mdash;Up-and-coming language server from Astral, built for speed.
-- [Pyright](https://github.com/microsoft/pyright)&mdash;The basis for basedpyright.
-- [PyLSP](https://github.com/python-lsp/python-lsp-server)&mdash;A plugin-based language server that integrates with tools like `pycodestyle`, `autopep8`, and `yapf`.
-
-These are disabled by default, but can be enabled in your settings. For example:
-
-```json [settings]
-{
-  "languages": {
-    "Python": {
-      "language_servers": [
-        // Disable basedpyright and enable Ty, and otherwise
-        // use the default configuration.
-        "ty",
-        "!basedpyright",
-        "..."
-      ]
-    }
-  }
-}
-```
-
-See: [Working with Language Servers](https://zed.dev/docs/configuring-languages#working-with-language-servers) for more information about how to enable and disable language servers.
-
-### Basedpyright
-
-[basedpyright](https://docs.basedpyright.com/latest/) is the primary Python language server in Zed beginning with Zed v0.204.0. It provides core language server functionality like navigation (go to definition/find all references) and type checking. Compared to Pyright, it adds support for additional language server features (like inlay hints) and checking rules.
-
-Note that while basedpyright in isolation defaults to the `recommended` [type-checking mode](https://docs.basedpyright.com/latest/benefits-over-pyright/better-defaults/#typecheckingmode), Zed configures it to use the less-strict `standard` mode by default, which matches the behavior of Pyright. You can set the type-checking mode for your project using the `typeCheckingMode` setting in `pyrightconfig.json` or `pyproject.toml`, which will override Zed's default. Read on more for more details about how to configure basedpyright.
-
-#### Basedpyright Configuration
-
-basedpyright reads configuration options from two different kinds of sources:
-
-- Language server settings ("workspace configuration"), which must be configured per-editor (using `settings.json` in Zed's case) but apply to all projects opened in that editor
-- Configuration files (`pyrightconfig.json`, `pyproject.toml`), which are editor-independent but specific to the project where they are placed
-
-As a rule of thumb, options that are only relevant when using basedpyright from an editor must be set in language server settings, and options that are relevant even if you're running it [as a command-line tool](https://docs.basedpyright.com/latest/configuration/command-line/) must be set in configuration files. Settings related to inlay hints are examples of the first category, and the [diagnostic category](https://docs.basedpyright.com/latest/configuration/config-files/#diagnostic-categories) settings are examples of the second category.
-
-Examples of both kinds of configuration are provided below. Refer to the basedpyright documentation on [language server settings](https://docs.basedpyright.com/latest/configuration/language-server-settings/) and [configuration files](https://docs.basedpyright.com/latest/configuration/config-files/) for comprehensive lists of available options.
-
-##### Language server settings
-
-Language server settings for basedpyright in Zed can be set in the `lsp` section of your `settings.json`.
-
-For example, in order to:
-
-- diagnose all files in the workspace instead of the only open files default
-- disable inlay hints on function arguments
-
-You can use the following configuration:
-
-```json [settings]
-{
-  "lsp": {
-    "basedpyright": {
-      "settings": {
-        "basedpyright.analysis": {
-          "diagnosticMode": "workspace",
-          "inlayHints": {
-            "callArgumentNames": false
-          }
-        }
-      }
-    }
-  }
-}
-```
-
-##### Configuration files
-
-basedpyright reads project-specific configuration from the `pyrightconfig.json` configuration file and from the `[tool.basedpyright]` and `[tool.pyright]` sections of `pyproject.toml` manifests. `pyrightconfig.json` overrides `pyproject.toml` if configuration is present in both places.
-
-Here's an example `pyrightconfig.json` file that configures basedpyright to use the `strict` type-checking mode and not to issue diagnostics for any files in `__pycache__` directories:
-
-```json [settings]
-{
-  "typeCheckingMode": "strict",
-  "ignore": ["**/__pycache__"]
-}
-```
-
-### PyLSP
-
-[python-lsp-server](https://github.com/python-lsp/python-lsp-server/), more commonly known as PyLSP, by default integrates with a number of external tools (autopep8, mccabe, pycodestyle, yapf) while others are optional and must be explicitly enabled and configured (flake8, pylint).
-
-See [Python Language Server Configuration](https://github.com/python-lsp/python-lsp-server/blob/develop/CONFIGURATION.md) for more.
-
-## Virtual Environments
-
-[Virtual environments](https://docs.python.org/3/library/venv.html) are a useful tool for fixing a Python version and set of dependencies for a specific project, in a way that's isolated from other projects on the same machine. Zed has built-in support for discovering, configuring, and activating virtual environments, based on the language-agnostic concept of a [toolchain](../toolchains.md).
-
-Note that if you have a global Python installation, it is also counted as a toolchain for Zed's purposes.
-
-### Create a Virtual Environment
-
-If your project doesn't have a virtual environment set up already, you can create one as follows:
-
-```bash
-python3 -m venv .venv
-```
-
-Alternatively, if you're using `uv`, running `uv sync` will create a virtual environment the first time you run it.
-
-### How Zed Uses Python Toolchains
-
-Zed uses the selected Python toolchain for your project in the following ways:
-
-- Built-in language servers will be automatically configured with the path to the toolchain's Python interpreter and, if applicable, virtual environment. This is important so that they can resolve dependencies. (Note that language servers provided by extensions can't be automatically configured like this currently.)
-- Python tasks (such as pytest tests) will be run using the toolchain's Python interpreter.
-- If the toolchain is a virtual environment, the environment's activation script will be run automatically when you launch a new shell in Zed's integrated terminal, giving you convenient access to the selected Python interpreter and dependency set.
-- If a built-in language server is installed in the active virtual environment, that binary will be used instead of Zed's private automatically-installed binary. This also applies to debugpy.
-
-### Selecting a Toolchain
-
-For most projects, Zed will automatically select the right Python toolchain. In complex projects with multiple virtual environments, it might be necessary to override this selection. You can use the [toolchain selector](../toolchains.md#selecting-toolchains) to pick a toolchain from the list discovered by Zed, or [specify the path to a toolchain manually](../toolchains.md#adding-toolchains-manually) if it's not on the list.
-
-## Code Formatting & Linting
-
-Zed provides the [Ruff](https://docs.astral.sh/ruff/) formatter and linter for Python code. (Specifically, Zed runs Ruff as an LSP server using the `ruff server` subcommand.) Both formatting and linting are enabled by default, including format-on-save.
-
-### Configuring formatting
-
-You can disable format-on-save for Python files in your `settings.json`:
-
-```json [settings]
-{
-  "languages": {
-    "Python": {
-      "format_on_save": "off"
-    }
-  }
-}
-```
-
-Alternatively, you can use the `black` command-line tool for Python formatting, while keeping Ruff enabled for linting:
-
-```json [settings]
-{
-  "languages": {
-    "Python": {
-      "formatter": {
-        "external": {
-          "command": "black",
-          "arguments": ["--stdin-filename", "{buffer_path}", "-"]
-        }
-      }
-      // Or use `"formatter": null` to disable formatting entirely.
-    }
-  }
-}
-```
-
-### Configuring Ruff
-
-Like basedpyright, Ruff reads options from both Zed's language server settings and configuration files (`ruff.toml`) when used in Zed. Unlike basedpyright, _all_ options can be configured in either of these locations, so the choice of where to put your Ruff configuration comes down to whether you want it to be shared between projects but specific to Zed (in which case you should use language server settings), or specific to one project but common to all Ruff invocations (in which case you should use `ruff.toml`).
-
-Here's an example of using language server settings in Zed's `settings.json` to disable all Ruff lints in Zed (while still using Ruff as a formatter):
-
-```json [settings]
-{
-  "lsp": {
-    "ruff": {
-      "initialization_options": {
-        "settings": {
-          "exclude": ["*"]
-        }
-      }
-    }
-  }
-}
-```
-
-And here's an example `ruff.toml` with linting and formatting options, adapted from the Ruff documentation:
-
-```toml
-[lint]
-# Avoid enforcing line-length violations (`E501`)
-ignore = ["E501"]
-
-[format]
-# Use single quotes when formatting.
-quote-style = "single"
-```
-
-For more details, refer to the Ruff documentation about [configuration files](https://docs.astral.sh/ruff/configuration/) and [language server settings](https://docs.astral.sh/ruff/editors/settings/), and the [list of options](https://docs.astral.sh/ruff/settings/).
-
-## Debugging
-
-Zed supports Python debugging through the `debugpy` adapter. You can start with no configuration or define custom launch profiles in `.zed/debug.json`.
-
-### Start Debugging with No Setup
-
-Zed can automatically detect debuggable Python entry points. Press F4 (or run debugger: start from the Command Palette) to see available options for your current project.
-This works for:
-
-- Python scripts
-- Modules
-- pytest tests
-
-Zed uses `debugpy` under the hood, but no manual adapter configuration is required.
-
-### Define Custom Debug Configurations
-
-For reusable setups, create a `.zed/debug.json` file in your project root. This gives you more control over how Zed runs and debugs your code.
-
-- [debugpy configuration documentation](https://github.com/microsoft/debugpy/wiki/Debug-configuration-settings#launchattach-settings)
-
-#### Debug Active File
-
-```json [debug]
-[
-  {
-    "label": "Python Active File",
-    "adapter": "Debugpy",
-    "program": "$ZED_FILE",
-    "request": "launch"
-  }
-]
-```
-
-This runs the file currently open in the editor.
-
-#### Debug a Flask App
-
-For projects using Flask, you can define a full launch configuration:
-
-```
-.venv/
-app/
-  init.py
-  main.py
-  routes.py
-templates/
-  index.html
-static/
-  style.css
-requirements.txt
-```
-
-…the following configuration can be used:
-
-```json [debug]
-[
-  {
-    "label": "Python: Flask",
-    "adapter": "Debugpy",
-    "request": "launch",
-    "module": "app",
-    "cwd": "$ZED_WORKTREE_ROOT",
-    "env": {
-      "FLASK_APP": "app",
-      "FLASK_DEBUG": "1"
-    },
-    "args": [
-      "run",
-      "--reload", // Enables Flask reloader that watches for file changes
-      "--debugger" // Enables Flask debugger
-    ],
-    "autoReload": {
-      "enable": true
-    },
-    "jinja": true,
-    "justMyCode": true
-  }
-]
-```
-
-These can be combined to tailor the experience for web servers, test runners, or custom scripts.
-
-## Troubleshoot and Maintain a Productive Python Setup
-
-Zed is designed to minimize configuration overhead, but occasional issues can still arise—especially around environments, language servers, or tooling. Here's how to keep your Python setup working smoothly.
-
-### Resolve Language Server Startup Issues
-
-If a language server isn't responding or features like diagnostics or autocomplete aren't available:
-
-- Check your Zed log (using the {#action zed::OpenLog} action) for errors related to the language server you're trying to use. This is where you're likely to find useful information if the language server failed to start up at all.
-- Use the language server logs view to understand the lifecycle of the affected language server. You can access this view using the {#action dev::OpenLanguageServerLogs} action, or by clicking the lightning bolt icon in the status bar and selecting your language server. The most useful pieces of data in this view are:
-  - "Server Logs", which shows any errors printed by the language server
-  - "Server Info", which shows details about how the language server was started
-- Verify your `settings.json` or `pyrightconfig.json` is syntactically correct.
-- Restart Zed to reinitialize language server connections, or try restarting the language server using the {#action editor::RestartLanguageServer}
-
-If the language server is failing to resolve imports, and you're using a virtual environment, make sure that the right environment is chosen in the selector. You can use "Server Info" view to confirm which virtual environment Zed is sending to the language server&mdash;look for the `* Configuration` section at the end.
diff --git a/docs/src/languages/r.md b/docs/src/languages/r.md
deleted file mode 100644
index a21afb9976..0000000000
--- a/docs/src/languages/r.md
+++ /dev/null
@@ -1,165 +0,0 @@
-# R
-
-R support is available via multiple R Zed extensions:
-
-- [ocsmit/zed-r](https://github.com/ocsmit/zed-r)
-
-  - Tree-sitter: [r-lib/tree-sitter-r](https://github.com/r-lib/tree-sitter-r)
-  - Language-Server: [REditorSupport/languageserver](https://github.com/REditorSupport/languageserver)
-
-- [posit-dev/air](https://github.com/posit-dev/air/tree/main/editors/zed)
-  - Formatter: [posit-dev/air](https://posit-dev.github.io/air/)
-
-## Installation
-
-1. [Download and Install R](https://cloud.r-project.org/).
-2. Install the R packages `languageserver` and `lintr`:
-
-```R
-install.packages("languageserver")
-install.packages("lintr")
-```
-
-3. Install the [R](https://github.com/ocsmit/zed-r) extension through Zed's extensions manager for basic R language support (syntax highlighting, tree-sitter support) and for [REditorSupport/languageserver](https://github.com/REditorSupport/languageserver) support.
-
-4. Install the [Air](https://posit-dev.github.io/air/) extension through Zed's extensions manager for R code formatting via Air.
-
-## Linting
-
-`REditorSupport/languageserver` bundles support for [r-lib/lintr](https://github.com/r-lib/lintr) as a linter. This can be configured via the use of a `.lintr` inside your project (or in your home directory for global defaults).
-
-```r
-linters: linters_with_defaults(
-    line_length_linter(120),
-    commented_code_linter = NULL
-  )
-exclusions: list(
-    "inst/doc/creating_linters.R" = 1,
-    "inst/example/bad.R",
-    "tests/testthat/exclusions-test"
-  )
-```
-
-Or exclude it from linting anything,
-
-```r
-exclusions: list(".")
-```
-
-See [Using lintr](https://lintr.r-lib.org/articles/lintr.html) for a complete list of options,
-
-## Formatting
-
-### Air
-
-[Air](https://posit-dev.github.io/air/) provides code formatting for R, including support for format-on-save. The [Air documentation for Zed](https://posit-dev.github.io/air/editor-zed.html) contains the most up-to-date advice for running Air in Zed.
-
-Ensure that you have installed both the [ocsmit/zed-r](https://github.com/ocsmit/zed-r) extension (for general R language awareness in Zed) and the [Air](https://posit-dev.github.io/air/) extension.
-
-Enable Air in your `settings.json`:
-
-```json [settings]
-{
-  "languages": {
-    "R": {
-      "language_servers": ["air"]
-    }
-  }
-}
-```
-
-If you use the `"r_language_server"` from `REditorSupport/languageserver`, but would still like to use Air for formatting, use the following configuration:
-
-```json [settings]
-{
-  "languages": {
-    "R": {
-      "language_servers": ["air", "r_language_server"],
-      "use_on_type_format": false
-    }
-  }
-}
-```
-
-Note that `"air"` must come first in this list, otherwise [r-lib/styler](https://github.com/r-lib/styler) will be invoked via `"r_language_server"`.
-
-`"r_language_server"` provides on-type-formatting that differs from Air's formatting rules. To avoid this entirely and let Air be fully in charge of formatting your R files, also set `"use_on_type_format": false` as shown above.
-
-#### Configuring Air
-
-Air is minimally configurable via an `air.toml` file placed in the root directory of your project:
-
-```toml
-[format]
-line-width = 80
-indent-width = 2
-```
-
-For more details, refer to the Air documentation about [configuration](https://posit-dev.github.io/air/configuration.html).
-
-### Styler
-
-`REditorSupport/languageserver` bundles support for [r-lib/styler](https://github.com/r-lib/styler) as a formatter. See [Customizing Styler](https://cran.r-project.org/web/packages/styler/vignettes/customizing_styler.html) for more information on how to customize its behavior.
-
-<!--
-TBD: Get this working
-
-### REditorSupport/languageserver Configuration
-
-You can configure the [R languageserver settings](https://github.com/REditorSupport/languageserver#settings) via Zed Project Settings `.zed/settings.json` or Zed User Settings `~/.config/zed/settings.json`:
-
-For example to disable Lintr linting and suppress code snippet suggestions (both enabled by default):
-
-```json [settings]
-{
-  "lsp": {
-    "r_language_server": {
-      "settings": {
-        "r": {
-          "lsp": {
-            "diagnostics": false,
-            "snippet_support": false
-          }
-        }
-      }
-    }
-  }
-}
-```
-
--->
-
-<!--
-TBD: R REPL Docs
-
-## REPL
-
-### Ark Installation
-
-To use the Zed REPL with R you need to install [Ark](https://github.com/posit-dev/ark), an R Kernel for Jupyter applications.
-You can down the latest version from the [Ark GitHub Releases](https://github.com/posit-dev/ark/releases) and then extract the `ark` binary to a directory in your `PATH`.
-
-For example to install the latest non-debug build:
-
-```sh
-# macOS
-cd /tmp
-curl -L -o ark-latest-darwin.zip \
-    $(curl -s "https://api.github.com/repos/posit-dev/ark/releases/latest" | \
-    jq -r '.assets[] | select(.name | contains("darwin-universal") and (contains("debug") | not)) | .browser_download_url')
-unzip ark-latest-darwin.zip ark
-sudo mv /tmp/ark /usr/local/bin/
-```
-
-```sh
-# Linux X86_64
-cd /tmp
-curl -L -o ark-latest-linux.zip \
-    $(curl -s "https://api.github.com/repos/posit-dev/ark/releases/latest" \
-        | jq -r '.assets[] | select(.name | contains("linux-x64") and (contains("debug") | not)) | .browser_download_url'
-    )
-unzip ark-latest-linux.zip ark
-sudo mv /tmp/ark /usr/local/bin/
-```
-
--->
diff --git a/docs/src/languages/racket.md b/docs/src/languages/racket.md
deleted file mode 100644
index 48312a7c82..0000000000
--- a/docs/src/languages/racket.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Racket
-
-Racket support is available through the [Racket extension](https://github.com/zed-extensions/racket).
-
-- Tree-sitter: [zed-industries/tree-sitter-racket](https://github.com/zed-industries/tree-sitter-racket)
-
-The [racket-language-server](https://docs.racket-lang.org/racket-language-server/index.html) is not yet supported in Zed, please see [Issue #15789](https://github.com/zed-industries/zed/issues/15789) for more information.
diff --git a/docs/src/languages/rego.md b/docs/src/languages/rego.md
deleted file mode 100644
index c52cccea54..0000000000
--- a/docs/src/languages/rego.md
+++ /dev/null
@@ -1,38 +0,0 @@
-# Rego
-
-Rego language support in Zed is provided by the community-maintained [Rego extension](https://github.com/StyraInc/zed-rego).
-
-- Tree-sitter: [FallenAngel97/tree-sitter-rego](https://github.com/FallenAngel97/tree-sitter-rego)
-- Language Server: [open-policy-agent/regal](https://github.com/open-policy-agent/regal)
-
-## Installation
-
-The extension is largely based on the [Regal](https://docs.styra.com/regal/language-server) language server which should be installed to make use of the extension. Read the [getting started](https://docs.styra.com/regal#getting-started) instructions for more information.
-
-## Configuration
-
-The extension's behavior is configured in the `.regal/config.yaml` file. The following is an example configuration which disables the `todo-comment` rule, customizes the `line-length` rule, and ignores test files for the `opa-fmt` rule:
-
-```yaml
-rules:
-  style:
-    todo-comment:
-      # don't report on todo comments
-      level: ignore
-    line-length:
-      # custom rule configuration
-      max-line-length: 100
-      # warn on too long lines, but don't fail
-      level: warning
-    opa-fmt:
-      # not needed as error is the default, but
-      # being explicit won't hurt
-      level: error
-      # files can be ignored for any individual rule
-      # in this example, test files are ignored
-      ignore:
-        files:
-          - "*_test.rego"
-```
-
-Read Regal's [configuration documentation](https://docs.styra.com/regal#configuration) for more information.
diff --git a/docs/src/languages/roc.md b/docs/src/languages/roc.md
deleted file mode 100644
index 44f0576274..0000000000
--- a/docs/src/languages/roc.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Roc
-
-[Roc](https://www.roc-lang.org/) is a fast, friendly, functional language.
-
-Roc language support in Zed is provided by the community-maintained [Roc extension](https://github.com/h2000/zed-roc).
-Report issues to: [https://github.com/h2000/zed-roc/issues](https://github.com/h2000/zed-roc/issues)
-
-- Tree-sitter: [faldor20/tree-sitter-roc](https://github.com/faldor20/tree-sitter-roc)
-- Language Server: [roc-lang/roc/tree/main/crates/language_server](https://github.com/roc-lang/roc/tree/main/crates/language_server)
-
-## Setup
-
-1. Follow instructions to [Install Roc](https://www.roc-lang.org/install) from the Roc-Lang website.
-2. Ensure `roc` and `roc_language_server` are in your PATH.
diff --git a/docs/src/languages/rst.md b/docs/src/languages/rst.md
deleted file mode 100644
index 44830ae60e..0000000000
--- a/docs/src/languages/rst.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# ReStructuredText (rst)
-
-ReStructuredText language support in Zed is provided by the community-maintained [reST extension](https://github.com/elmarco/zed-rst).
-Report issues to: [https://github.com/elmarco/zed-rst/issues](https://github.com/elmarco/zed-rst/issues)
-
-- Tree-sitter: [stsewd/tree-sitter-rst.git](https://github.com/stsewd/tree-sitter-rst.git)
-- Language Server: [swyddfa/esbonio](https://github.com/swyddfa/esbonio)
diff --git a/docs/src/languages/ruby.md b/docs/src/languages/ruby.md
deleted file mode 100644
index 7e072ac5d3..0000000000
--- a/docs/src/languages/ruby.md
+++ /dev/null
@@ -1,416 +0,0 @@
-# Ruby
-
-Ruby support is available through the [Ruby extension](https://github.com/zed-extensions/ruby).
-
-- Tree-sitters:
-  - [tree-sitter-ruby](https://github.com/tree-sitter/tree-sitter-ruby)
-  - [tree-sitter-embedded-template](https://github.com/tree-sitter/tree-sitter-embedded-template)
-- Language Servers:
-  - [ruby-lsp](https://github.com/Shopify/ruby-lsp)
-  - [solargraph](https://github.com/castwide/solargraph)
-  - [rubocop](https://github.com/rubocop/rubocop)
-  - [Herb](https://herb-tools.dev)
-- Debug Adapter: [`rdbg`](https://github.com/ruby/debug)
-
-The Ruby extension also provides support for ERB files.
-
-## Language Servers
-
-There are multiple language servers available for Ruby. Zed supports the two following:
-
-- [solargraph](https://github.com/castwide/solargraph)
-- [ruby-lsp](https://github.com/Shopify/ruby-lsp)
-
-They both have an overlapping feature set of autocomplete, diagnostics, code actions, etc. and it's up to you to decide which one you want to use. Note that you can't use both at the same time.
-
-In addition to these two language servers, Zed also supports:
-
-- [rubocop](https://github.com/rubocop/rubocop) which is a static code analyzer and linter for Ruby. Under the hood, it's also used by Zed as a language server, but its functionality is complimentary to that of solargraph and ruby-lsp.
-- [sorbet](https://sorbet.org/) which is a static type checker for Ruby with a custom gradual type system.
-- [steep](https://github.com/soutaro/steep) which is a static type checker for Ruby that leverages Ruby Signature (RBS).
-- [Herb](https://herb-tools.dev) which is a language server for ERB files.
-
-When configuring a language server, it helps to open the LSP Logs window using the 'dev: Open Language Server Logs' command. You can then choose the corresponding language instance to see any logged information.
-
-## Configuring a language server
-
-The [Ruby extension](https://github.com/zed-extensions/ruby) offers both `solargraph` and `ruby-lsp` language server support.
-
-### Language Server Activation
-
-For all supported Ruby language servers (`solargraph`, `ruby-lsp`, `rubocop`, `sorbet`, and `steep`), the Ruby extension follows this activation sequence:
-
-1. If the language server is found in your project's `Gemfile`, it will be used through `bundle exec`.
-2. If not found in the `Gemfile`, the Ruby extension will look for the executable in your system `PATH`.
-3. If the language server is not found in either location, the Ruby extension will automatically install it as a global gem (note: this will not install to your current Ruby gemset).
-
-You can skip step 1 and force using the system executable by setting `use_bundler` to `false` in your settings:
-
-```json [settings]
-{
-  "lsp": {
-    "<SERVER_NAME>": {
-      "settings": {
-        "use_bundler": false
-      }
-    }
-  }
-}
-```
-
-### Using `solargraph`
-
-`solargraph` is enabled by default in the Ruby extension.
-
-### Using `ruby-lsp`
-
-To switch to `ruby-lsp`, add the following to your `settings.json`:
-
-```json [settings]
-{
-  "languages": {
-    "Ruby": {
-      "language_servers": ["ruby-lsp", "!solargraph", "!rubocop", "..."]
-    },
-    // Enable herb and ruby-lsp for *.html.erb files
-    "HTML+ERB": {
-      "language_servers": ["herb", "ruby-lsp", "..."]
-    },
-    // Enable ruby-lsp for *.js.erb files
-    "JS+ERB": {
-      "language_servers": ["ruby-lsp", "..."]
-    },
-    // Enable ruby-lsp for *.yaml.erb files
-    "YAML+ERB": {
-      "language_servers": ["ruby-lsp", "..."]
-    }
-  }
-}
-```
-
-That disables `solargraph` and `rubocop` and enables `ruby-lsp`.
-
-### Using `rubocop`
-
-The Ruby extension also provides support for `rubocop` language server for offense detection and autocorrection.
-
-To enable it, add the following to your `settings.json`:
-
-```json [settings]
-{
-  "languages": {
-    "Ruby": {
-      "language_servers": ["ruby-lsp", "rubocop", "!solargraph", "..."]
-    }
-  }
-}
-```
-
-Or, conversely, you can disable `ruby-lsp` and enable `solargraph` and `rubocop` by adding the following to your `settings.json`:
-
-```json [settings]
-{
-  "languages": {
-    "Ruby": {
-      "language_servers": ["solargraph", "rubocop", "!ruby-lsp", "..."]
-    }
-  }
-}
-```
-
-## Setting up `solargraph`
-
-Solargraph has formatting and diagnostics disabled by default. We can tell Zed to enable them by adding the following to your `settings.json`:
-
-```json [settings]
-{
-  "lsp": {
-    "solargraph": {
-      "initialization_options": {
-        "diagnostics": true,
-        "formatting": true
-      }
-    }
-  }
-}
-```
-
-### Configuration
-
-Solargraph reads its configuration from a file called `.solargraph.yml` in the root of your project. For more information about this file, see the [Solargraph configuration documentation](https://solargraph.org/guides/configuration).
-
-## Setting up `ruby-lsp`
-
-You can pass Ruby LSP configuration to `initialization_options`, e.g.
-
-```json [settings]
-{
-  "languages": {
-    "Ruby": {
-      "language_servers": ["ruby-lsp", "!solargraph", "..."]
-    }
-  },
-  "lsp": {
-    "ruby-lsp": {
-      "initialization_options": {
-        "enabledFeatures": {
-          // "someFeature": false
-        }
-      }
-    }
-  }
-}
-```
-
-LSP `settings` and `initialization_options` can also be project-specific. For example to use [standardrb/standard](https://github.com/standardrb/standard) as a formatter and linter for a particular project, add this to a `.zed/settings.json` inside your project repo:
-
-```json [settings]
-{
-  "lsp": {
-    "ruby-lsp": {
-      "initialization_options": {
-        "formatter": "standard",
-        "linters": ["standard"]
-      }
-    }
-  }
-}
-```
-
-## Setting up `rubocop` LSP
-
-Rubocop has unsafe autocorrection disabled by default. We can tell Zed to enable it by adding the following to your `settings.json`:
-
-```json [settings]
-{
-  "languages": {
-    "Ruby": {
-      // Use ruby-lsp as the primary language server and rubocop as the secondary.
-      "language_servers": ["ruby-lsp", "rubocop", "!solargraph", "..."]
-    }
-  },
-  "lsp": {
-    "rubocop": {
-      "initialization_options": {
-        "safeAutocorrect": false
-      }
-    },
-    "ruby-lsp": {
-      "initialization_options": {
-        "enabledFeatures": {
-          "diagnostics": false
-        }
-      }
-    }
-  }
-}
-```
-
-## Setting up Sorbet
-
-[Sorbet](https://sorbet.org/) is a popular static type checker for Ruby that includes a language server.
-
-To enable Sorbet, add `\"sorbet\"` to the `language_servers` list for Ruby in your `settings.json`. You may want to disable other language servers if Sorbet is intended to be your primary LSP, or if you plan to use it alongside another LSP for specific features like type checking.
-
-```json [settings]
-{
-  "languages": {
-    "Ruby": {
-      "language_servers": [
-        "ruby-lsp",
-        "sorbet",
-        "!rubocop",
-        "!solargraph",
-        "..."
-      ]
-    }
-  }
-}
-```
-
-For all aspects of installing Sorbet, setting it up in your project, and configuring its behavior, please refer to the [official Sorbet documentation](https://sorbet.org/docs/overview).
-
-## Setting up Steep
-
-[Steep](https://github.com/soutaro/steep) is a static type checker for Ruby that uses RBS files to define types.
-
-To enable Steep, add `\"steep\"` to the `language_servers` list for Ruby in your `settings.json`. You may need to adjust the order or disable other LSPs depending on your desired setup.
-
-```json [settings]
-{
-  "languages": {
-    "Ruby": {
-      "language_servers": [
-        "ruby-lsp",
-        "steep",
-        "!solargraph",
-        "!rubocop",
-        "..."
-      ]
-    }
-  }
-}
-```
-
-## Setting up Herb
-
-`Herb` is enabled by default for the `HTML+ERB` language.
-
-## Using the Tailwind CSS Language Server with Ruby
-
-It's possible to use the [Tailwind CSS Language Server](https://github.com/tailwindlabs/tailwindcss-intellisense/tree/HEAD/packages/tailwindcss-language-server#readme) in Ruby and ERB files.
-
-In order to do that, you need to configure the language server so that it knows about where to look for CSS classes in Ruby/ERB files by adding the following to your `settings.json`:
-
-```json [settings]
-{
-  "languages": {
-    "Ruby": {
-      "language_servers": ["tailwindcss-language-server", "..."]
-    }
-  },
-  "lsp": {
-    "tailwindcss-language-server": {
-      "settings": {
-        "experimental": {
-          "classRegex": ["\\bclass:\\s*['\"]([^'\"]*)['\"]"]
-        }
-      }
-    }
-  }
-}
-```
-
-With these settings you will get completions for Tailwind CSS classes in HTML attributes inside ERB files and inside Ruby/ERB strings that are coming after a `class:` key. Examples:
-
-```rb
-# Ruby file:
-def method
-  div(class: "pl-2 <completion here>") do
-    p(class: "mt-2 <completion here>") { "Hello World" }
-  end
-end
-
-# ERB file:
-<%= link_to "Hello", "/hello", class: "pl-2 <completion here>" %>
-<a href="/hello" class="pl-2 <completion here>">Hello</a>
-```
-
-## Running tests
-
-To run tests in your Ruby project, you can set up custom tasks in your local `.zed/tasks.json` configuration file. These tasks can be defined to work with different test frameworks like Minitest, RSpec, quickdraw, and tldr. Below are some examples of how to set up these tasks to run your tests from within your editor.
-
-### Minitest with Rails
-
-```json [tasks]
-[
-  {
-    "label": "test $ZED_RELATIVE_FILE -n /$ZED_CUSTOM_RUBY_TEST_NAME/",
-    "command": "bin/rails",
-    "args": [
-      "test",
-      "$ZED_RELATIVE_FILE",
-      "-n",
-      "\"$ZED_CUSTOM_RUBY_TEST_NAME\""
-    ],
-    "cwd": "$ZED_WORKTREE_ROOT",
-    "tags": ["ruby-test"]
-  }
-]
-```
-
-### Minitest
-
-Plain minitest does not support running tests by line number, only by name, so we need to use `$ZED_CUSTOM_RUBY_TEST_NAME` instead:
-
-```json [tasks]
-[
-  {
-    "label": "-Itest $ZED_RELATIVE_FILE -n /$ZED_CUSTOM_RUBY_TEST_NAME/",
-    "command": "bundle",
-    "args": [
-      "exec",
-      "ruby",
-      "-Itest",
-      "$ZED_RELATIVE_FILE",
-      "-n",
-      "\"$ZED_CUSTOM_RUBY_TEST_NAME\""
-    ],
-    "cwd": "$ZED_WORKTREE_ROOT",
-    "tags": ["ruby-test"]
-  }
-]
-```
-
-### RSpec
-
-```json [tasks]
-[
-  {
-    "label": "test $ZED_RELATIVE_FILE:$ZED_ROW",
-    "command": "bundle",
-    "args": ["exec", "rspec", "\"$ZED_RELATIVE_FILE:$ZED_ROW\""],
-    "cwd": "$ZED_WORKTREE_ROOT",
-    "tags": ["ruby-test"]
-  }
-]
-```
-
-Similar task syntax can be used for other test frameworks such as `quickdraw` or `tldr`.
-
-## Debugging
-
-The Ruby extension provides a debug adapter for debugging Ruby code. Zed's name for the adapter (in the UI and `debug.json`) is `rdbg`, and under the hood, it uses the [`debug`](https://github.com/ruby/debug) gem. The extension uses the [same activation logic](#language-server-activation) as the language servers.
-
-### Examples
-
-#### Debug a Ruby script
-
-```json [debug]
-[
-  {
-    "label": "Debug current file",
-    "adapter": "rdbg",
-    "request": "launch",
-    "script": "$ZED_FILE",
-    "cwd": "$ZED_WORKTREE_ROOT"
-  }
-]
-```
-
-#### Debug Rails server
-
-```json [debug]
-[
-  {
-    "label": "Debug Rails server",
-    "adapter": "rdbg",
-    "request": "launch",
-    "command": "./bin/rails",
-    "args": ["server"],
-    "cwd": "$ZED_WORKTREE_ROOT",
-    "env": {
-      "RUBY_DEBUG_OPEN": "true"
-    }
-  }
-]
-```
-
-## Formatters
-
-### `erb-formatter`
-
-To format ERB templates, you can use the `erb-formatter` formatter. This formatter uses the [`erb-formatter`](https://rubygems.org/gems/erb-formatter) gem to format ERB templates.
-
-```json [settings]
-{
-  "HTML+ERB": {
-    "formatter": {
-      "external": {
-        "command": "erb-formatter",
-        "arguments": ["--stdin-filename", "{buffer_path}"]
-      }
-    }
-  }
-}
-```
diff --git a/docs/src/languages/rust.md b/docs/src/languages/rust.md
deleted file mode 100644
index d696cfe411..0000000000
--- a/docs/src/languages/rust.md
+++ /dev/null
@@ -1,340 +0,0 @@
-# Rust
-
-Rust support is available natively in Zed.
-
-- Tree-sitter: [tree-sitter/tree-sitter-rust](https://github.com/tree-sitter/tree-sitter-rust)
-- Language Server: [rust-lang/rust-analyzer](https://github.com/rust-lang/rust-analyzer)
-- Debug Adapter: [CodeLLDB](https://github.com/vadimcn/codelldb) (primary), [GDB](https://sourceware.org/gdb/) (secondary, not available on Apple silicon)
-
-<!--
-TBD: Polish Rust Docs. Zed is a good rust editor, good Rust docs make it look like we care about Rust (we do!)
-TBD: Users may not know what inlayHints, don't start there.
-TBD: Provide explicit examples not just `....`
--->
-
-## Inlay Hints
-
-The following configuration can be used to change the inlay hint settings for `rust-analyzer` in Rust:
-
-```json [settings]
-{
-  "lsp": {
-    "rust-analyzer": {
-      "initialization_options": {
-        "inlayHints": {
-          "maxLength": null,
-          "lifetimeElisionHints": {
-            "enable": "skip_trivial",
-            "useParameterNames": true
-          },
-          "closureReturnTypeHints": {
-            "enable": "always"
-          }
-        }
-      }
-    }
-  }
-}
-```
-
-See [Inlay Hints](https://rust-analyzer.github.io/book/features.html#inlay-hints) in the Rust Analyzer Manual for more information.
-
-## Target directory
-
-The `rust-analyzer` target directory can be set in `initialization_options`:
-
-```json [settings]
-{
-  "lsp": {
-    "rust-analyzer": {
-      "initialization_options": {
-        "rust": {
-          "analyzerTargetDir": true
-        }
-      }
-    }
-  }
-}
-```
-
-A `true` setting will set the target directory to `target/rust-analyzer`. You can set a custom directory with a string like `"target/analyzer"` instead of `true`.
-
-## Binary
-
-You can configure which `rust-analyzer` binary Zed should use.
-
-By default, Zed will try to find a `rust-analyzer` in your `$PATH` and try to use that. If that binary successfully executes `rust-analyzer --help`, it's used. Otherwise, Zed will fall back to installing its own stable `rust-analyzer` version and use that.
-
-If you want to install pre-release `rust-analyzer` version instead you can instruct Zed to do so by setting `pre_release` to `true` in your `settings.json`:
-
-```json [settings]
-{
-  "lsp": {
-    "rust-analyzer": {
-      "fetch": {
-        "pre_release": true
-      }
-    }
-  }
-}
-```
-
-If you want to disable Zed looking for a `rust-analyzer` binary, you can set `ignore_system_version` to `true` in your `settings.json`:
-
-```json [settings]
-{
-  "lsp": {
-    "rust-analyzer": {
-      "binary": {
-        "ignore_system_version": true
-      }
-    }
-  }
-}
-```
-
-If you want to use a binary in a custom location, you can specify a `path` and optional `arguments`:
-
-```json [settings]
-{
-  "lsp": {
-    "rust-analyzer": {
-      "binary": {
-        "path": "/Users/example/bin/rust-analyzer",
-        "arguments": []
-      }
-    }
-  }
-}
-```
-
-This `"path"` has to be an absolute path.
-
-## Alternate Targets
-
-If you want rust-analyzer to provide diagnostics for a target other than your current platform (e.g. for windows when running on macOS) you can use the following Zed lsp settings:
-
-```json [settings]
-{
-  "lsp": {
-    "rust-analyzer": {
-      "initialization_options": {
-        "cargo": {
-          "target": "x86_64-pc-windows-msvc"
-        }
-      }
-    }
-  }
-}
-```
-
-If you are using `rustup`, you can find a list of available target triples (`aarch64-apple-darwin`, `x86_64-unknown-linux-gnu`, etc) by running:
-
-```sh
-rustup target list --installed
-```
-
-## LSP tasks
-
-Zed provides tasks using tree-sitter, but rust-analyzer has an LSP extension method for querying file-related tasks via LSP.
-This is enabled by default and can be configured as
-
-```json [settings]
-"lsp": {
-  "rust-analyzer": {
-    "enable_lsp_tasks": true,
-  }
-}
-```
-
-## Manual Cargo Diagnostics fetch
-
-By default, rust-analyzer has `checkOnSave: true` enabled, which causes every buffer save to trigger a `cargo check --workspace --all-targets` command.
-If disabled with `checkOnSave: false` (see the example of the server configuration json above), it's still possible to fetch the diagnostics manually, with the `editor: run/clear/cancel flycheck` commands in Rust files to refresh cargo diagnostics; the project diagnostics editor will also refresh cargo diagnostics with `editor: run flycheck` command when the setting is enabled.
-
-## More server configuration
-
-<!--
-TBD: Is it possible to specify RUSTFLAGS? https://github.com/zed-industries/zed/issues/14334
--->
-
-Rust-analyzer [manual](https://rust-analyzer.github.io/book/) describes various features and configuration options for rust-analyzer language server.
-Rust-analyzer in Zed runs with the default parameters.
-
-### Large projects and performance
-
-One of the main caveats that might cause extensive resource usage on large projects, is the combination of the following features:
-
-```
-rust-analyzer.checkOnSave (default: true)
-    Run the check command for diagnostics on save.
-```
-
-```
-rust-analyzer.check.workspace (default: true)
-    Whether --workspace should be passed to cargo check. If false, -p <package> will be passed instead.
-```
-
-```
-rust-analyzer.cargo.allTargets (default: true)
-    Pass --all-targets to cargo invocation
-```
-
-Which would mean that every time Zed saves, a `cargo check --workspace --all-targets` command is run, checking the entire project (workspace), lib, doc, test, bin, bench and [other targets](https://doc.rust-lang.org/cargo/reference/cargo-targets.html).
-
-While that works fine on small projects, it does not scale well.
-
-The alternatives would be to use [tasks](../tasks.md), as Zed already provides a `cargo check --workspace --all-targets` task and the ability to cmd/ctrl-click on the terminal output to navigate to the error, and limit or turn off the check on save feature entirely.
-
-Check on save feature is responsible for returning part of the diagnostics based on cargo check output, so turning it off will limit rust-analyzer with its own [diagnostics](https://rust-analyzer.github.io/book/diagnostics.html).
-
-Consider more `rust-analyzer.cargo.` and `rust-analyzer.check.` and `rust-analyzer.diagnostics.` settings from the manual for more fine-grained configuration.
-Here's a snippet for Zed settings.json (the language server will restart automatically after the `lsp.rust-analyzer` section is edited and saved):
-
-```json [settings]
-{
-  "lsp": {
-    "rust-analyzer": {
-      "initialization_options": {
-        // get more cargo-less diagnostics from rust-analyzer,
-        // which might include false-positives (those can be turned off by their names)
-        "diagnostics": {
-          "experimental": {
-            "enable": true
-          }
-        },
-        // To disable the checking entirely
-        // (ignores all cargo and check settings below)
-        "checkOnSave": false,
-        // To check the `lib` target only.
-        "cargo": {
-          "allTargets": false
-        },
-        // Use `-p` instead of `--workspace` for cargo check
-        "check": {
-          "workspace": false
-        }
-      }
-    }
-  }
-}
-```
-
-### Multi-project workspaces
-
-If you want rust-analyzer to analyze multiple Rust projects in the same folder that are not listed in `[members]` in the Cargo workspace,
-you can list them in `linkedProjects` in the local project settings:
-
-```json [settings]
-{
-  "lsp": {
-    "rust-analyzer": {
-      "initialization_options": {
-        "linkedProjects": ["./path/to/a/Cargo.toml", "./path/to/b/Cargo.toml"]
-      }
-    }
-  }
-}
-```
-
-### Snippets
-
-There's a way to get custom completion items from rust-analyzer, that will transform the code according to the snippet body:
-
-```json [settings]
-{
-  "lsp": {
-    "rust-analyzer": {
-      "initialization_options": {
-        "completion": {
-          "snippets": {
-            "custom": {
-              "Arc::new": {
-                "postfix": "arc",
-                "body": ["Arc::new(${receiver})"],
-                "requires": "std::sync::Arc",
-                "scope": "expr"
-              },
-              "Some": {
-                "postfix": "some",
-                "body": ["Some(${receiver})"],
-                "scope": "expr"
-              },
-              "Ok": {
-                "postfix": "ok",
-                "body": ["Ok(${receiver})"],
-                "scope": "expr"
-              },
-              "Rc::new": {
-                "postfix": "rc",
-                "body": ["Rc::new(${receiver})"],
-                "requires": "std::rc::Rc",
-                "scope": "expr"
-              },
-              "Box::pin": {
-                "postfix": "boxpin",
-                "body": ["Box::pin(${receiver})"],
-                "requires": "std::boxed::Box",
-                "scope": "expr"
-              },
-              "vec!": {
-                "postfix": "vec",
-                "body": ["vec![${receiver}]"],
-                "description": "vec![]",
-                "scope": "expr"
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-```
-
-## Debugging
-
-Zed supports debugging Rust binaries and tests out of the box with `CodeLLDB` and `GDB`. Run {#action debugger::Start} ({#kb debugger::Start}) to launch one of these preconfigured debug tasks.
-
-For more control, you can add debug configurations to `.zed/debug.json`. See the examples below.
-
-- [CodeLLDB configuration documentation](https://github.com/vadimcn/codelldb/blob/master/MANUAL.md#starting-a-new-debug-session)
-- [GDB configuration documentation](https://sourceware.org/gdb/current/onlinedocs/gdb.html/Debugger-Adapter-Protocol.html)
-
-### Build binary then debug
-
-```json [debug]
-[
-  {
-    "label": "Build & Debug native binary",
-    "build": {
-      "command": "cargo",
-      "args": ["build"]
-    },
-    "program": "$ZED_WORKTREE_ROOT/target/debug/binary",
-    // sourceLanguages is required for CodeLLDB (not GDB) when using Rust
-    "sourceLanguages": ["rust"],
-    "request": "launch",
-    "adapter": "CodeLLDB"
-  }
-]
-```
-
-### Automatically locate a debug target based on build command
-
-When you use `cargo build` or `cargo test` as the build command, Zed can infer the path to the output binary.
-
-```json [debug]
-[
-  {
-    "label": "Build & Debug native binary",
-    "adapter": "CodeLLDB",
-    "build": {
-      "command": "cargo",
-      "args": ["build"]
-    },
-    // sourceLanguages is required for CodeLLDB (not GDB) when using Rust
-    "sourceLanguages": ["rust"]
-  }
-]
-```
diff --git a/docs/src/languages/scala.md b/docs/src/languages/scala.md
deleted file mode 100644
index fc169bf229..0000000000
--- a/docs/src/languages/scala.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# Scala
-
-Scala language support in Zed is provided by the community-maintained [Scala extension](https://github.com/scalameta/metals-zed).
-Report issues to: [https://github.com/scalameta/metals-zed/issues](https://github.com/scalameta/metals-zed/issues)
-
-- Tree-sitter: [tree-sitter/tree-sitter-scala](https://github.com/tree-sitter/tree-sitter-scala)
-- Language Server: [scalameta/metals](https://github.com/scalameta/metals)
-
-## Setup
-
-- Install Scala with `cs setup` (Coursier): https://www.scala-lang.org/download/
-  - `brew install coursier/formulas/coursier && cs setup`
-- REPL (Almond) Setup Instructions https://almond.sh/docs/quick-start-install
-  - `brew install --cask temurin` (Eclipse foundation official OpenJDK binaries)
-  - `brew install coursier/formulas/coursier && cs setup`
-  - `coursier launch --use-bootstrap almond -- --install`
-
-## Configuration
-
-Behavior of the Metals language server can be controlled with:
-
-- `.scalafix.conf` file - See [Scalafix Configuration](https://scalacenter.github.io/scalafix/docs/users/configuration.html)
-- `.scalafmt.conf` file - See [Scalafmt Configuration](https://scalameta.org/scalafmt/docs/configuration.html)
-
-You can place these files in the root of your project or specifying their location in the Metals configuration. See [Metals User Configuration](https://scalameta.org/metals/docs/editors/user-configuration) for more.
-
-<!--
-TBD: Provide LSP configuration example for metals in Zed settings.json. metals.{javaHome,excludedPackages,customProjectRoot} etc.
--->
diff --git a/docs/src/languages/scheme.md b/docs/src/languages/scheme.md
deleted file mode 100644
index 59e7ae1ddf..0000000000
--- a/docs/src/languages/scheme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Scheme
-
-Scheme support is available through the [Scheme extension](https://github.com/zed-extensions/scheme).
-
-- Tree-sitter: [6cdh/tree-sitter-scheme](https://github.com/6cdh/tree-sitter-scheme)
diff --git a/docs/src/languages/sh.md b/docs/src/languages/sh.md
deleted file mode 100644
index cf88c89bfa..0000000000
--- a/docs/src/languages/sh.md
+++ /dev/null
@@ -1,62 +0,0 @@
-# Shell Scripts
-
-Shell Scripts (bash, zsh, dash, sh) are supported natively by Zed.
-
-- Tree-sitter: [tree-sitter/tree-sitter-bash](https://github.com/tree-sitter/tree-sitter-bash)
-
-## Settings
-
-You can configure various settings for Shell Scripts in your Zed User Settings (`~/.config/zed/settings.json`) or Zed Project Settings (`.zed/settings.json`):
-
-```json [settings]
-  "languages": {
-    "Shell Script": {
-      "tab_size": 2,
-      "hard_tabs": false
-    }
-  }
-```
-
-### Formatting
-
-Zed supports auto-formatting Shell Scripts using external tools like [`shfmt`](https://github.com/mvdan/sh).
-
-1. Install `shfmt`:
-
-```sh
-brew install shfmt            # macos (homebrew)
-sudo apt-get install shfmt    # debian/ubuntu
-dnf install shfmt             # fedora
-yum install shfmt             # redhat
-pacman -Sy shfmt              # archlinux
-choco install shfmt           # windows (chocolatey)
-```
-
-2. Ensure `shfmt` is available in your path and check the version:
-
-```sh
-which shfmt
-shfmt --version
-```
-
-3. Configure Zed to automatically format Shell Scripts with `shfmt` on save:
-
-```json [settings]
-  "languages": {
-    "Shell Script": {
-      "format_on_save": "on",
-      "formatter": {
-        "external": {
-          "command": "shfmt",
-          // Change `--indent 2` to match your preferred tab_size
-          "arguments": ["--filename", "{buffer_path}", "--indent", "2"]
-        }
-      }
-    }
-  }
-```
-
-## See also:
-
-- [Zed Docs: Language Support: Bash](./bash.md)
-- [Zed Docs: Language Support: Fish](./fish.md)
diff --git a/docs/src/languages/sql.md b/docs/src/languages/sql.md
deleted file mode 100644
index fd257c9ab0..0000000000
--- a/docs/src/languages/sql.md
+++ /dev/null
@@ -1,68 +0,0 @@
-# SQL
-
-SQL files are handled by the [SQL Extension](https://github.com/zed-extensions/sql).
-
-- Tree-sitter: [nervenes/tree-sitter-sql](https://github.com/nervenes/tree-sitter-sql)
-
-### Formatting
-
-Zed supports auto-formatting SQL using external tools like [`sql-formatter`](https://github.com/sql-formatter-org/sql-formatter).
-
-1. Install `sql-formatter`:
-
-```sh
-npm install -g sql-formatter
-```
-
-2. Ensure `sql-formatter` is available in your path and check the version:
-
-```sh
-which sql-formatter
-sql-formatter --version
-```
-
-3. Configure Zed to automatically format SQL with `sql-formatter`:
-
-```json [settings]
-  "languages": {
-    "SQL": {
-      "formatter": {
-        "external": {
-          "command": "sql-formatter",
-          "arguments": ["--language", "mysql"]
-        }
-      }
-    }
-  },
-```
-
-Substitute your preferred [SQL Dialect] for `mysql` above (`duckdb`, `hive`, `mariadb`, `postgresql`, `redshift`, `snowflake`, `sqlite`, `spark`, etc).
-
-You can add this to Zed project settings (`.zed/settings.json`) or via your Zed user settings (`~/.config/zed/settings.json`).
-
-### Advanced Formatting
-
-Sql-formatter also allows more precise control by providing [sql-formatter configuration options](https://github.com/sql-formatter-org/sql-formatter#configuration-options). To provide these, create a `.sql-formatter.json` file in your project:
-
-```json [settings]
-{
-  "language": "postgresql",
-  "tabWidth": 2,
-  "keywordCase": "upper",
-  "linesBetweenQueries": 2
-}
-```
-
-When using a `.sql-formatter.json` file you can use a more simplified set of Zed settings since the language need not be specified inline:
-
-```json [settings]
-  "languages": {
-    "SQL": {
-      "formatter": {
-        "external": {
-          "command": "sql-formatter"
-        }
-      }
-    }
-  },
-```
diff --git a/docs/src/languages/svelte.md b/docs/src/languages/svelte.md
deleted file mode 100644
index 139195987b..0000000000
--- a/docs/src/languages/svelte.md
+++ /dev/null
@@ -1,73 +0,0 @@
-# Svelte
-
-Svelte support is available through the [Svelte extension](https://github.com/zed-extensions/svelte).
-
-- Tree-sitter: [tree-sitter-grammars/tree-sitter-svelte](https://github.com/tree-sitter-grammars/tree-sitter-svelte)
-- Language Server: [sveltejs/language-tools](https://github.com/sveltejs/language-tools)
-
-## Extra theme styling configuration
-
-You can modify how certain styles, such as directives and modifiers, appear in attributes:
-
-```json [settings]
-"syntax": {
-  // Styling for directives (e.g., `class:foo` or `on:click`) (the `on` or `class` part of the attribute).
-  "attribute.function": {
-    "color": "#ff0000"
-  },
-  // Styling for modifiers at the end of attributes, e.g. `on:<click|preventDefault|stopPropagation>`
-  "attribute.special": {
-    "color": "#00ff00"
-  }
-}
-```
-
-## Inlay Hints
-
-When inlay hints is enabled in Zed, to make the language server send them back, Zed sets the following initialization options:
-
-```json [settings]
-"inlayHints": {
-  "parameterNames": {
-    "enabled": "all",
-    "suppressWhenArgumentMatchesName": false
-  },
-  "parameterTypes": {
-    "enabled": true
-  },
-  "variableTypes": {
-    "enabled": true,
-    "suppressWhenTypeMatchesName": false
-  },
-  "propertyDeclarationTypes": {
-    "enabled": true
-  },
-  "functionLikeReturnTypes": {
-    "enabled": true
-  },
-  "enumMemberValues": {
-    "enabled": true
-  }
-}
-```
-
-To override these settings, use the following:
-
-```json [settings]
-"lsp": {
-  "svelte-language-server": {
-    "initialization_options": {
-      "configuration": {
-        "typescript": {
-          // ......
-        },
-        "javascript": {
-          // ......
-        }
-      }
-    }
-  }
-}
-```
-
-See [the TypeScript language server `package.json`](https://github.com/microsoft/vscode/blob/main/extensions/typescript-language-features/package.json) for more information.
diff --git a/docs/src/languages/swift.md b/docs/src/languages/swift.md
deleted file mode 100644
index 1492942fe8..0000000000
--- a/docs/src/languages/swift.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# Swift
-
-Swift language support in Zed is provided by the community-maintained [Swift extension](https://github.com/zed-extensions/swift).
-Report issues to: [https://github.com/zed-extensions/swift/issues](https://github.com/zed-extensions/swift/issues)
-
-- Tree-sitter: [alex-pinkus/tree-sitter-swift](https://github.com/alex-pinkus/tree-sitter-swift)
-- Language Server: [swiftlang/sourcekit-lsp](https://github.com/swiftlang/sourcekit-lsp)
-- Debug Adapter: [`lldb-dap`](https://github.com/swiftlang/llvm-project/blob/next/lldb/tools/lldb-dap/README.md)
-
-## Language Server Configuration
-
-You can modify the behavior of SourceKit LSP by creating a `.sourcekit-lsp/config.json` under your home directory or in your project root. See [SourceKit-LSP configuration file](https://github.com/swiftlang/sourcekit-lsp/blob/main/Documentation/Configuration%20File.md) for complete documentation.
-
-## Debugging
-
-The Swift extension provides a debug adapter for debugging Swift code.
-Zed's name for the adapter (in the UI and `debug.json`) is `Swift`, and under the hood it uses [`lldb-dap`](https://github.com/swiftlang/llvm-project/blob/next/lldb/tools/lldb-dap/README.md), as provided by the Swift toolchain.
-The extension tries to find an `lldb-dap` binary using `swiftly`, using `xcrun`, and by searching `$PATH`, in that order of preference.
-The extension doesn't attempt to download `lldb-dap` if it's not found.
-
-- [lldb-dap configuration documentation](https://github.com/llvm/llvm-project/blob/main/lldb/tools/lldb-dap/README.md#configuration-settings-reference)
-
-### Examples
-
-#### Build and debug a Swift binary
-
-```json [debug]
-[
-  {
-    "label": "Debug Swift",
-    "build": {
-      "command": "swift",
-      "args": ["build"]
-    },
-    "program": "$ZED_WORKTREE_ROOT/swift-app/.build/arm64-apple-macosx/debug/swift-app",
-    "request": "launch",
-    "adapter": "Swift"
-  }
-]
-```
diff --git a/docs/src/languages/tailwindcss.md b/docs/src/languages/tailwindcss.md
deleted file mode 100644
index be9c9437d1..0000000000
--- a/docs/src/languages/tailwindcss.md
+++ /dev/null
@@ -1,49 +0,0 @@
-# Tailwind CSS
-
-Zed has built-in support for Tailwind CSS autocomplete, linting, and hover previews.
-
-- Language Server: [tailwindlabs/tailwindcss-intellisense](https://github.com/tailwindlabs/tailwindcss-intellisense)
-
-## Configuration
-
-To configure the Tailwind CSS language server, refer [to the extension settings](https://github.com/tailwindlabs/tailwindcss-intellisense?tab=readme-ov-file#extension-settings) and add them to the `lsp` section of your `settings.json`:
-
-```json [settings]
-{
-  "lsp": {
-    "tailwindcss-language-server": {
-      "settings": {
-        "classFunctions": ["cva", "cx"],
-        "experimental": {
-          "classRegex": ["[cls|className]\\s\\:\\=\\s\"([^\"]*)"]
-        }
-      }
-    }
-  }
-}
-```
-
-Languages which can be used with Tailwind CSS in Zed:
-
-- [Astro](./astro.md)
-- [CSS](./css.md)
-- [ERB](./ruby.md)
-- [Gleam](./gleam.md)
-- [HEEx](./elixir.md#heex)
-- [HTML](./html.md)
-- [TypeScript](./typescript.md)
-- [JavaScript](./javascript.md)
-- [PHP](./php.md)
-- [Svelte](./svelte.md)
-- [Vue](./vue.md)
-
-### Prettier Plugin
-
-Zed supports Prettier out of the box, which means that if you have the [Tailwind CSS Prettier plugin](https://github.com/tailwindlabs/prettier-plugin-tailwindcss) installed, adding it to your Prettier configuration will make it work automatically:
-
-```json [settings]
-// .prettierrc
-{
-  "plugins": ["prettier-plugin-tailwindcss"]
-}
-```
diff --git a/docs/src/languages/terraform.md b/docs/src/languages/terraform.md
deleted file mode 100644
index c1ff03a83a..0000000000
--- a/docs/src/languages/terraform.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# Terraform
-
-Terraform support is available through the [Terraform extension](https://github.com/zed-extensions/terraform).
-
-- Tree-sitter: [MichaHoffmann/tree-sitter-hcl](https://github.com/MichaHoffmann/tree-sitter-hcl)
-- Language Server: [hashicorp/terraform-ls](https://github.com/hashicorp/terraform-ls)
-
-## Configuration
-
-<!--
-TBD: Add example using `rootModulePaths` to match upstream example https://github.com/hashicorp/terraform-ls/blob/main/docs/SETTINGS.md#vs-code
--->
-
-The Terraform language server can be configured in your `settings.json`, e.g.:
-
-```json [settings]
-{
-  "lsp": {
-    "terraform-ls": {
-      "initialization_options": {
-        "experimentalFeatures": {
-          "prefillRequiredFields": true
-        }
-      }
-    }
-  }
-}
-```
-
-See the [full list of server settings here](https://github.com/hashicorp/terraform-ls/blob/main/docs/SETTINGS.md).
diff --git a/docs/src/languages/toml.md b/docs/src/languages/toml.md
deleted file mode 100644
index 46b93b67eb..0000000000
--- a/docs/src/languages/toml.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# TOML
-
-TOML support is available through the [TOML extension](https://zed.dev/extensions/toml).
-
-- Tree-sitter: [tree-sitter/tree-sitter-toml](https://github.com/tree-sitter/tree-sitter-toml)
-
-A TOML language server is available in the [Tombi extension](https://zed.dev/extensions/tombi).
diff --git a/docs/src/languages/typescript.md b/docs/src/languages/typescript.md
deleted file mode 100644
index a6ec5b71ec..0000000000
--- a/docs/src/languages/typescript.md
+++ /dev/null
@@ -1,209 +0,0 @@
-# TypeScript
-
-TypeScript and TSX support are available natively in Zed.
-
-- Tree-sitter: [tree-sitter/tree-sitter-typescript](https://github.com/tree-sitter/tree-sitter-typescript)
-- Language Server: [yioneko/vtsls](https://github.com/yioneko/vtsls)
-- Alternate Language Server: [typescript-language-server/typescript-language-server](https://github.com/typescript-language-server/typescript-language-server)
-- Debug Adapter: [vscode-js-debug](https://github.com/microsoft/vscode-js-debug)
-
-<!--
-TBD: Document the difference between Language servers
--->
-
-## Language servers
-
-By default Zed uses [vtsls](https://github.com/yioneko/vtsls) for TypeScript, TSX, and JavaScript files.
-You can configure the use of [typescript-language-server](https://github.com/typescript-language-server/typescript-language-server) per language in your settings file:
-
-```json [settings]
-{
-  "languages": {
-    "TypeScript": {
-      "language_servers": ["typescript-language-server", "!vtsls", "..."]
-    },
-    "TSX": {
-      "language_servers": ["typescript-language-server", "!vtsls", "..."]
-    },
-    "JavaScript": {
-      "language_servers": ["typescript-language-server", "!vtsls", "..."]
-    }
-  }
-}
-```
-
-Prettier will also be used for TypeScript files by default. To disable this:
-
-```json [settings]
-{
-  "languages": {
-    "TypeScript": {
-      "prettier": { "allowed": false }
-    }
-    //...
-  }
-}
-```
-
-## Large projects
-
-`vtsls` may run out of memory on very large projects. We default the limit to 8092 (8 GiB) vs. the default of 3072 but this may not be sufficient for you:
-
-```json [settings]
-{
-  "lsp": {
-    "vtsls": {
-      "settings": {
-        // For TypeScript:
-        "typescript": { "tsserver": { "maxTsServerMemory": 16184 } },
-        // For JavaScript:
-        "javascript": { "tsserver": { "maxTsServerMemory": 16184 } }
-      }
-    }
-  }
-}
-```
-
-## Inlay Hints
-
-Zed sets the following initialization options to make the language server send back inlay hints (that is, when Zed has inlay hints enabled in the settings).
-
-You can override these settings in your Zed `settings.json` when using `typescript-language-server`:
-
-```json [settings]
-{
-  "lsp": {
-    "typescript-language-server": {
-      "initialization_options": {
-        "preferences": {
-          "includeInlayParameterNameHints": "all",
-          "includeInlayParameterNameHintsWhenArgumentMatchesName": true,
-          "includeInlayFunctionParameterTypeHints": true,
-          "includeInlayVariableTypeHints": true,
-          "includeInlayVariableTypeHintsWhenTypeMatchesName": true,
-          "includeInlayPropertyDeclarationTypeHints": true,
-          "includeInlayFunctionLikeReturnTypeHints": true,
-          "includeInlayEnumMemberValueHints": true
-        }
-      }
-    }
-  }
-}
-```
-
-See [typescript-language-server inlayhints documentation](https://github.com/typescript-language-server/typescript-language-server?tab=readme-ov-file#inlay-hints-textdocumentinlayhint) for more information.
-
-When using `vtsls`:
-
-```json [settings]
-{
-  "lsp": {
-    "vtsls": {
-      "settings": {
-        // For JavaScript:
-        "javascript": {
-          "inlayHints": {
-            "parameterNames": {
-              "enabled": "all",
-              "suppressWhenArgumentMatchesName": false
-            },
-            "parameterTypes": {
-              "enabled": true
-            },
-            "variableTypes": {
-              "enabled": true,
-              "suppressWhenTypeMatchesName": true
-            },
-            "propertyDeclarationTypes": {
-              "enabled": true
-            },
-            "functionLikeReturnTypes": {
-              "enabled": true
-            },
-            "enumMemberValues": {
-              "enabled": true
-            }
-          }
-        },
-        // For TypeScript:
-        "typescript": {
-          "inlayHints": {
-            "parameterNames": {
-              "enabled": "all",
-              "suppressWhenArgumentMatchesName": false
-            },
-            "parameterTypes": {
-              "enabled": true
-            },
-            "variableTypes": {
-              "enabled": true,
-              "suppressWhenTypeMatchesName": true
-            },
-            "propertyDeclarationTypes": {
-              "enabled": true
-            },
-            "functionLikeReturnTypes": {
-              "enabled": true
-            },
-            "enumMemberValues": {
-              "enabled": true
-            }
-          }
-        }
-      }
-    }
-  }
-}
-```
-
-## Debugging
-
-Zed supports debugging TypeScript code out of the box with `vscode-js-debug`.
-The following can be debugged without writing additional configuration:
-
-- Tasks from `package.json`
-- Tests written using several popular frameworks (Jest, Mocha, Vitest, Jasmine, Bun, Node)
-
-Run {#action debugger::Start} ({#kb debugger::Start}) to see a contextual list of these predefined debug tasks.
-
-> **Note:** Bun test is automatically detected when `@types/bun` is present in `package.json`.
->
-> **Note:** Node test is automatically detected when `@types/node` is present in `package.json` (requires Node.js 20+).
-
-As for all languages, configurations from `.vscode/launch.json` are also available for debugging in Zed.
-
-If your use-case isn't covered by any of these, you can take full control by adding debug configurations to `.zed/debug.json`. See below for example configurations.
-
-### Configuring JavaScript debug tasks
-
-JavaScript debugging is more complicated than other languages because there are two different environments: Node.js and the browser. `vscode-js-debug` exposes a `type` field, that you can use to specify the environment, either `node` or `chrome`.
-
-- [vscode-js-debug configuration documentation](https://github.com/microsoft/vscode-js-debug/blob/main/OPTIONS.md)
-
-### Attach debugger to a server running in web browser (`npx serve`)
-
-Given an externally-ran web server (e.g., with `npx serve` or `npx live-server`) one can attach to it and open it with a browser.
-
-```json [debug]
-[
-  {
-    "label": "Launch Chrome (TypeScript)",
-    "adapter": "JavaScript",
-    "type": "chrome",
-    "request": "launch",
-    "url": "http://localhost:5500",
-    "program": "$ZED_FILE",
-    "webRoot": "${ZED_WORKTREE_ROOT}",
-    "build": {
-      "command": "npx",
-      "args": ["tsc"]
-    },
-    "skipFiles": ["<node_internals>/**"]
-  }
-]
-```
-
-## See also
-
-- [Zed Yarn documentation](./yarn.md) for a walkthrough of configuring your project to use Yarn.
-- [Zed Deno documentation](./deno.md)
diff --git a/docs/src/languages/uiua.md b/docs/src/languages/uiua.md
deleted file mode 100644
index 622e04fc3d..0000000000
--- a/docs/src/languages/uiua.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Uiua
-
-[Uiua](https://www.uiua.org/) is a general purpose, stack-based, array-oriented programming language with a focus on simplicity, beauty, and tacit code.
-
-Uiua support is available through the [Uiua extension](https://github.com/zed-extensions/uiua).
-
-- Tree-sitter: [shnarazk/tree-sitter-uiua](https://github.com/shnarazk/tree-sitter-uiua)
-- Language Server: [uiua-lang/uiua](https://github.com/uiua-lang/uiua/)
diff --git a/docs/src/languages/vue.md b/docs/src/languages/vue.md
deleted file mode 100644
index b8997d2237..0000000000
--- a/docs/src/languages/vue.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Vue
-
-Vue support is available through the [Vue extension](https://github.com/zed-extensions/vue).
-
-- Tree-sitter: [tree-sitter-grammars/tree-sitter-vue](https://github.com/tree-sitter-grammars/tree-sitter-vue)
-- Language Server: [vuejs/language-tools/](https://github.com/vuejs/language-tools/)
diff --git a/docs/src/languages/xml.md b/docs/src/languages/xml.md
deleted file mode 100644
index df3d845d6d..0000000000
--- a/docs/src/languages/xml.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# XML
-
-XML support is available through the [XML extension](https://github.com/sweetppro/zed-xml/).
-
-- Tree-sitter: [tree-sitter-grammars/tree-sitter-xml](https://github.com/tree-sitter-grammars/tree-sitter-xml)
-
-## Configuration
-
-If you have additional file extensions that are not being automatically recognized as XML just add them to [file_types](../configuring-zed.md#file-types) in your Zed settings:
-
-```json [settings]
-  "file_types": {
-    "XML": ["rdf", "gpx", "kml"]
-  }
-```
diff --git a/docs/src/languages/yaml.md b/docs/src/languages/yaml.md
deleted file mode 100644
index 33b92df94e..0000000000
--- a/docs/src/languages/yaml.md
+++ /dev/null
@@ -1,164 +0,0 @@
-# YAML
-
-YAML support is available natively in Zed.
-
-- Tree-sitter: [zed-industries/tree-sitter-yaml](https://github.com/zed-industries/tree-sitter-yaml)
-- Language Server: [redhat-developer/yaml-language-server](https://github.com/redhat-developer/yaml-language-server)
-
-## Configuration
-
-You can configure various [yaml-language-server settings](https://github.com/redhat-developer/yaml-language-server?tab=readme-ov-file#language-server-settings) by adding them to your Zed settings.json in a `yaml-language-server` block under the `lsp` key. For example:
-
-```json [settings]
-  "lsp": {
-    "yaml-language-server": {
-      "settings": {
-        "yaml": {
-          "keyOrdering": true,
-          "format": {
-            "singleQuote": true
-          },
-          "schemas": {
-              "https://getcomposer.org/schema.json": ["/*"],
-              "../relative/path/schema.json": ["/config*.yaml"]
-          }
-        }
-      }
-    }
-  }
-```
-
-Note, settings keys must be nested, so `yaml.keyOrdering` becomes `{"yaml": { "keyOrdering": true }}`.
-
-## Formatting
-
-By default, Zed uses Prettier for formatting YAML files.
-
-### Prettier Formatting
-
-You can customize the formatting behavior of Prettier. For example to use single-quotes in yaml files add the following to your `.prettierrc` configuration file:
-
-```json [settings]
-{
-  "overrides": [
-    {
-      "files": ["*.yaml", "*.yml"],
-      "options": {
-        "singleQuote": false
-      }
-    }
-  ]
-}
-```
-
-### yaml-language-server Formatting
-
-To use `yaml-language-server` instead of Prettier for YAML formatting, add the following to your Zed `settings.json`:
-
-```json [settings]
-  "languages": {
-    "YAML": {
-      "formatter": "language_server"
-    }
-  }
-```
-
-## Schemas
-
-By default yaml-language-server will attempt to determine the correct schema for a given yaml file and retrieve the appropriate JSON Schema from [Json Schema Store](https://schemastore.org/).
-
-You can override any auto-detected schema via the `schemas` settings key (demonstrated above) or by providing an [inlined schema](https://github.com/redhat-developer/yaml-language-server#using-inlined-schema) reference via a modeline comment at the top of your yaml file:
-
-```yaml
-# yaml-language-server: $schema=https://www.schemastore.org/github-action.json
-name: Issue Assignment
-on:
-  issues:
-    types: [opened]
-```
-
-You can disable the automatic detection and retrieval of schemas from the JSON Schema if desired:
-
-```json [settings]
-  "lsp": {
-    "yaml-language-server": {
-      "settings": {
-        "yaml": {
-          "schemaStore": {
-            "enable": false
-          }
-        }
-      }
-    }
-  }
-```
-
-## Custom Tags
-
-Yaml-language-server supports [custom tags](https://github.com/redhat-developer/yaml-language-server#adding-custom-tags) which can be used to inject custom application functionality at runtime into your yaml files.
-
-For example Amazon CloudFormation YAML uses a number of custom tags, to support these you can add the following to your settings.json:
-
-```json [settings]
-  "lsp": {
-    "yaml-language-server": {
-      "settings": {
-        "yaml": {
-          "customTags": [
-            "!And scalar",
-            "!And mapping",
-            "!And sequence",
-            "!If scalar",
-            "!If mapping",
-            "!If sequence",
-            "!Not scalar",
-            "!Not mapping",
-            "!Not sequence",
-            "!Equals scalar",
-            "!Equals mapping",
-            "!Equals sequence",
-            "!Or scalar",
-            "!Or mapping",
-            "!Or sequence",
-            "!FindInMap scalar",
-            "!FindInMap mapping",
-            "!FindInMap sequence",
-            "!Base64 scalar",
-            "!Base64 mapping",
-            "!Base64 sequence",
-            "!Cidr scalar",
-            "!Cidr mapping",
-            "!Cidr sequence",
-            "!Ref scalar",
-            "!Ref mapping",
-            "!Ref sequence",
-            "!Sub scalar",
-            "!Sub mapping",
-            "!Sub sequence",
-            "!GetAtt scalar",
-            "!GetAtt mapping",
-            "!GetAtt sequence",
-            "!GetAZs scalar",
-            "!GetAZs mapping",
-            "!GetAZs sequence",
-            "!ImportValue scalar",
-            "!ImportValue mapping",
-            "!ImportValue sequence",
-            "!Select scalar",
-            "!Select mapping",
-            "!Select sequence",
-            "!Split scalar",
-            "!Split mapping",
-            "!Split sequence",
-            "!Join scalar",
-            "!Join mapping",
-            "!Join sequence",
-            "!Condition scalar",
-            "!Condition mapping",
-            "!Condition sequence"
-          ]
-        }
-      }
-    }
-  }
-```
diff --git a/docs/src/languages/yara.md b/docs/src/languages/yara.md
deleted file mode 100644
index ba31a97ded..0000000000
--- a/docs/src/languages/yara.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Yara
-
-`Yara` language support in Zed is provided by the [Yara language extension](https://github.com/egibs/yara.zed). Please report issues to [https://github.com/egibs/yara.zed/issues](https://github.com/egibs/yara.zed/issues).
-
-- Tree-sitter: [egibs/tree-sitter-yara](https://github.com/egibs/tree-sitter-yara)
-- Language Server: [avast/yls](https://github.com/avast/yls)
diff --git a/docs/src/languages/yarn.md b/docs/src/languages/yarn.md
deleted file mode 100644
index 3bb7bd6ae9..0000000000
--- a/docs/src/languages/yarn.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Yarn
-
-[Yarn](https://yarnpkg.com/) is a versatile package manager that improves dependency management and workflow efficiency for JavaScript and other languages. It ensures a deterministic dependency tree, offers offline support, and enhances security for reliable builds.
-
-## Setup
-
-1. Run `yarn dlx @yarnpkg/sdks base` to generate a `.yarn/sdks` directory.
-2. Set your language server (e.g. VTSLS) to use TypeScript SDK from `.yarn/sdks/typescript/lib` directory in [LSP initialization options](../configuring-zed.md#lsp). The actual setting for that depends on language server; for example, for VTSLS you should set [`typescript.tsdk`](https://github.com/yioneko/vtsls/blob/6adfb5d3889ad4b82c5e238446b27ae3ee1e3767/packages/service/configuration.schema.json#L5).
-3. Voilla! Language server functionalities such as Go to Definition, Code Completions and On Hover documentation should work.
diff --git a/docs/src/languages/zig.md b/docs/src/languages/zig.md
deleted file mode 100644
index 4a48405d0c..0000000000
--- a/docs/src/languages/zig.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Zig
-
-Zig support is available through the [Zig extension](https://github.com/zed-extensions/zig).
-
-- Tree-sitter: [tree-sitter-zig](https://github.com/tree-sitter-grammars/tree-sitter-zig)
-- Language Server: [zls](https://github.com/zigtools/zls)
diff --git a/docs/src/linux.md b/docs/src/linux.md
deleted file mode 100644
index b535a5e78a..0000000000
--- a/docs/src/linux.md
+++ /dev/null
@@ -1,395 +0,0 @@
-# Zed on Linux
-
-## Standard Installation
-
-For most people we recommend using the script on the [download](https://zed.dev/download) page to install Zed:
-
-```sh
-curl -f https://zed.dev/install.sh | sh
-```
-
-We also offer a preview build of Zed which receives updates about a week ahead of stable. You can install it with:
-
-```sh
-curl -f https://zed.dev/install.sh | ZED_CHANNEL=preview sh
-```
-
-The Zed installed by the script works best on systems that:
-
-- have a Vulkan compatible GPU available (for example Linux on an M-series macBook)
-- have a system-wide glibc (NixOS and Alpine do not by default)
-  - x86_64 (Intel/AMD): glibc version >= 2.31 (Ubuntu 20 and newer)
-  - aarch64 (ARM): glibc version >= 2.35 (Ubuntu 22 and newer)
-
-Both Nix and Alpine have third-party Zed packages available (though they are currently a few weeks out of date). If you'd like to use our builds they do work if you install a glibc compatibility layer. On NixOS you can try [nix-ld](https://github.com/Mic92/nix-ld), and on Alpine [gcompat](https://wiki.alpinelinux.org/wiki/Running_glibc_programs).
-
-You will need to build from source for:
-
-- architectures other than 64-bit Intel or 64-bit ARM (for example a 32-bit or RISC-V machine)
-- Redhat Enterprise Linux 8.x, Rocky Linux 8, AlmaLinux 8, Amazon Linux 2 on all architectures
-- Redhat Enterprise Linux 9.x, Rocky Linux 9.3, AlmaLinux 8, Amazon Linux 2023 on aarch64 (x86_x64 OK)
-
-## Other ways to install Zed on Linux
-
-Zed is open source, and [you can install from source](./development/linux.md).
-
-### Installing via a package manager
-
-There are several third-party Zed packages for various Linux distributions and package managers, sometimes under `zed-editor`. You may be able to install Zed using these packages:
-
-- Flathub: [`dev.zed.Zed`](https://flathub.org/apps/dev.zed.Zed)
-- Arch: [`zed`](https://archlinux.org/packages/extra/x86_64/zed/)
-- Arch (AUR): [`zed-git`](https://aur.archlinux.org/packages/zed-git), [`zed-preview`](https://aur.archlinux.org/packages/zed-preview), [`zed-preview-bin`](https://aur.archlinux.org/packages/zed-preview-bin)
-- Alpine: `zed` ([aarch64](https://pkgs.alpinelinux.org/package/edge/testing/aarch64/zed)) ([x86_64](https://pkgs.alpinelinux.org/package/edge/testing/x86_64/zed))
-- Conda: [`zed`](https://anaconda.org/conda-forge/zed)
-- Nix: `zed-editor` ([unstable](https://search.nixos.org/packages?channel=unstable&show=zed-editor))
-- Fedora/Ultramarine (Terra): [`zed`](https://github.com/terrapkg/packages/tree/frawhide/anda/devs/zed/stable), [`zed-preview`](https://github.com/terrapkg/packages/tree/frawhide/anda/devs/zed/preview), [`zed-nightly`](https://github.com/terrapkg/packages/tree/frawhide/anda/devs/zed/nightly)
-- Solus: [`zed`](https://github.com/getsolus/packages/tree/main/packages/z/zed)
-- Parabola: [`zed`](https://www.parabola.nu/packages/extra/x86_64/zed/)
-- Manjaro: [`zed`](https://packages.manjaro.org/?query=zed)
-- ALT Linux (Sisyphus): [`zed`](https://packages.altlinux.org/en/sisyphus/srpms/zed/)
-- AOSC OS: [`zed`](https://packages.aosc.io/packages/zed)
-
-See [Repology](https://repology.org/project/zed-editor/versions) for a list of Zed packages in various repositories.
-
-### Community
-
-When installing a third-party package please be aware that it may not be completely up to date and may be slightly different from the Zed we package (a common change is to rename the binary to `zedit` or `zeditor` to avoid conflicting with other packages).
-
-We'd love your help making Zed available for everyone. If Zed is not yet available for your package manager, and you would like to fix that, we have some notes on [how to do it](./development/linux.md#notes-for-packaging-zed).
-
-The packages in this section provide binary installs for Zed but are not official packages within the associated distributions. These packages are maintained by community members and as such a higher level of caution should be taken when installing them.
-
-#### Debian
-
-Zed is available in [this community-maintained repository](https://debian.griffo.io/).
-
-Instructions for each version are available in the README of the repository where packages are built.
-Build, packaging and instructions for each version are available in the README of the [repository](https://github.com/dariogriffo/zed-debian)
-
-### Downloading manually
-
-If you'd prefer, you can install Zed by downloading our pre-built .tar.gz. This is the same artifact that our install script uses, but you can customize the location of your installation by modifying the instructions below:
-
-Download the `.tar.gz` file:
-
-- [zed-linux-x86_64.tar.gz](https://cloud.zed.dev/releases/stable/latest/download?asset=zed&arch=x86_64&os=linux&source=docs)
-  ([preview](https://cloud.zed.dev/releases/preview/latest/download?asset=zed&arch=x86_64&os=linux&source=docs))
-- [zed-linux-aarch64.tar.gz](https://cloud.zed.dev/releases/stable/latest/download?asset=zed&arch=aarch64&os=linux&source=docs)
-  ([preview](https://cloud.zed.dev/releases/preview/latest/download?asset=zed&arch=aarch64&os=linux&source=docs))
-
-Then ensure that the `zed` binary in the tarball is on your path. The easiest way is to unpack the tarball and create a symlink:
-
-```sh
-mkdir -p ~/.local
-# extract zed to ~/.local/zed.app/
-tar -xvf <path/to/download>.tar.gz -C ~/.local
-# link the zed binary to ~/.local/bin (or another directory in your $PATH)
-ln -sf ~/.local/zed.app/bin/zed ~/.local/bin/zed
-```
-
-If you'd like integration with an XDG-compatible desktop environment, you will also need to install the `.desktop` file:
-
-```sh
-cp ~/.local/zed.app/share/applications/zed.desktop ~/.local/share/applications/dev.zed.Zed.desktop
-sed -i "s|Icon=zed|Icon=$HOME/.local/zed.app/share/icons/hicolor/512x512/apps/zed.png|g" ~/.local/share/applications/dev.zed.Zed.desktop
-sed -i "s|Exec=zed|Exec=$HOME/.local/zed.app/libexec/zed-editor|g" ~/.local/share/applications/dev.zed.Zed.desktop
-```
-
-## Uninstalling Zed
-
-### Standard Uninstall
-
-If Zed was installed using the default installation script, it can be uninstalled by supplying the `--uninstall` flag to the `zed` shell command
-
-```sh
-zed --uninstall
-```
-
-If there are no errors, the shell will then prompt you whether you'd like to keep your preferences or delete them. After making a choice, you should see a message that Zed was successfully uninstalled.
-
-In the case that the `zed` shell command was not found in your PATH, you can try one of the following commands
-
-```sh
-$HOME/.local/bin/zed --uninstall
-```
-
-or
-
-```sh
-$HOME/.local/zed.app/bin.zed --uninstall
-```
-
-The first case might fail if a symlink was not properly established between `$HOME/.local/bin/zed` and `$HOME/.local/zed.app/bin.zed`. But the second case should work as long as Zed was installed to its default location.
-
-If Zed was installed to a different location, you must invoke the `zed` binary stored in that installation directory and pass the `--uninstall` flag to it in the same format as the previous commands.
-
-### Package Manager
-
-If Zed was installed using a package manager, please consult the documentation for that package manager on how to uninstall a package.
-
-## Troubleshooting
-
-Linux works on a large variety of systems configured in many different ways. We primarily test Zed on a vanilla Ubuntu setup, as it is the most common distribution our users use, that said we do expect it to work on a wide variety of machines.
-
-### Zed fails to start
-
-If you see an error like "/lib64/libc.so.6: version 'GLIBC_2.29' not found" it means that your distribution's version of glibc is too old. You can either upgrade your system, or [install Zed from source](./development/linux.md).
-
-### Graphics issues
-
-#### Zed fails to open windows
-
-Zed requires a GPU to run effectively. Under the hood, we use [Vulkan](https://www.vulkan.org/) to communicate with your GPU. If you are seeing problems with performance, or Zed fails to load, it is possible that Vulkan is the culprit.
-
-If you see a notification saying `Zed failed to open a window: NoSupportedDeviceFound` this means that Vulkan cannot find a compatible GPU. you can try running [vkcube](https://github.com/krh/vkcube) (usually available as part of the `vulkaninfo` or `vulkan-tools` package on various distributions) to try to troubleshoot where the issue is coming from like so:
-
-```
-vkcube
-```
-
-> **_Note_**: Try running in both X11 and wayland modes by running `vkcube -m [x11|wayland]`. Some versions of `vkcube` use `vkcube` to run in X11 and `vkcube-wayland` to run in wayland.
-
-This should output a line describing your current graphics setup and show a rotating cube. If this does not work, you should be able to fix it by installing Vulkan compatible GPU drivers, however in some cases there is no Vulkan support yet.
-
-You can find out which graphics card Zed is using by looking in the Zed log (`~/.local/share/zed/logs/Zed.log`) for `Using GPU: ...`.
-
-If you see errors like `ERROR_INITIALIZATION_FAILED` or `GPU Crashed` or `ERROR_SURFACE_LOST_KHR` then you may be able to work around this by installing different drivers for your GPU, or by selecting a different GPU to run on. (See [#14225](https://github.com/zed-industries/zed/issues/14225))
-
-On some systems the file `/etc/prime-discrete` can be used to enforce the use of a discrete GPU using [PRIME](https://wiki.archlinux.org/title/PRIME). Depending on the details of your setup, you may need to change the contents of this file to "on" (to force discrete graphics) or "off" (to force integrated graphics).
-
-On others, you may be able to the environment variable `DRI_PRIME=1` when running Zed to force the use of the discrete GPU.
-
-If you're using an AMD GPU and Zed crashes when selecting long lines, try setting the `ZED_PATH_SAMPLE_COUNT=0` environment variable. (See [#26143](https://github.com/zed-industries/zed/issues/26143))
-
-If you're using an AMD GPU, you might get a 'Broken Pipe' error. Try using the RADV or Mesa drivers. (See [#13880](https://github.com/zed-industries/zed/issues/13880))
-
-If you are using `amdvlk`, the default open-source AMD graphics driver, you may find that Zed consistently fails to launch. This is a known issue for some users, for example on Omarchy (see issue [#28851](https://github.com/zed-industries/zed/issues/28851)). To fix this, you will need to use a different driver. We recommend removing the `amdvlk` and `lib32-amdvlk` packages and installing `vulkan-radeon` instead (see issue [#14141](https://github.com/zed-industries/zed/issues/14141)).
-
-For more information, the [Arch guide to Vulkan](https://wiki.archlinux.org/title/Vulkan) has some good steps that translate well to most distributions.
-
-#### Forcing Zed to use a specific GPU
-
-There are a few different ways to force Zed to use a specific GPU:
-
-##### Option A
-
-You can use the `ZED_DEVICE_ID={device_id}` environment variable to specify the device ID of the GPU you wish to have Zed use.
-
-You can obtain the device ID of your GPU by running `lspci -nn | grep VGA` which will output each GPU on one line like:
-
-```
-08:00.0 VGA compatible controller [0300]: NVIDIA Corporation GA104 [GeForce RTX 3070] [10de:2484] (rev a1)
-```
-
-where the device ID here is `2484`. This value is in hexadecimal, so to force Zed to use this specific GPU you would set the environment variable like so:
-
-```
-ZED_DEVICE_ID=0x2484 zed
-```
-
-Make sure to export the variable if you choose to define it globally in a `.bashrc` or similar.
-
-##### Option B
-
-If you are using Mesa, you can run `MESA_VK_DEVICE_SELECT=list zed --foreground` to get a list of available GPUs and then export `MESA_VK_DEVICE_SELECT=xxxx:yyyy` to choose a specific device. Furthermore, you can fallback to xwayland with an additional export of `WAYLAND_DISPLAY=""`.
-
-##### Option C
-
-Using [vkdevicechooser](https://github.com/jiriks74/vkdevicechooser).
-
-#### Reporting graphics issues
-
-If Vulkan is configured correctly, and Zed is still not working for you, please [file an issue](https://github.com/zed-industries/zed) with as much information as possible.
-
-When reporting issues where Zed fails to start due to graphics initialization errors on GitHub, it can be impossible to run the `zed: copy system specs into clipboard` command like we instruct you to in our issue template. We provide an alternative way to collect the system specs specifically for this situation.
-
-Passing the `--system-specs` flag to Zed like
-
-```sh
-zed --system-specs
-```
-
-will print the system specs to the terminal like so. It is strongly recommended to copy the output verbatim into the issue on GitHub, as it uses markdown formatting to ensure the output is readable.
-
-Additionally, it is extremely beneficial to provide the contents of your Zed log when reporting such issues. The log is usually located at `~/.local/share/zed/logs/Zed.log`. The recommended process for producing a helpful log file is as follows:
-
-```sh
-truncate -s 0 ~/.local/share/zed/logs/Zed.log # Clear the log file
-ZED_LOG=blade_graphics=info zed .
-cat ~/.local/share/zed/logs/Zed.log
-# copy the output
-```
-
-Or, if you have the Zed cli setup, you can do
-
-```sh
-ZED_LOG=blade_graphics=info /path/to/zed/cli --foreground .
-# copy the output
-```
-
-It is also highly recommended when pasting the log into a github issue, to do so with the following template:
-
-> **_Note_**: The whitespace in the template is important, and will cause incorrect formatting if not preserved.
-
-````
-<details><summary>Zed Log</summary>
-
-```
-{zed log contents}
-```
-
-</details>
-````
-
-This will cause the logs to be collapsed by default, making it easier to read the issue.
-
-### I can't open any files
-
-### Clicking links isn't working
-
-These features are provided by XDG desktop portals, specifically:
-
-- `org.freedesktop.portal.FileChooser`
-- `org.freedesktop.portal.OpenURI`
-
-Some window managers, such as `Hyprland`, don't provide a file picker by default. See [this list](https://wiki.archlinux.org/title/XDG_Desktop_Portal#List_of_backends_and_interfaces) as a starting point for alternatives.
-
-### Zed isn't remembering my API keys
-
-### Zed isn't remembering my login
-
-These feature also requires XDG desktop portals, specifically:
-
-- `org.freedesktop.portal.Secret` or
-- `org.freedesktop.Secrets`
-
-Zed needs a place to securely store secrets such as your Zed login cookie or your OpenAI API Keys and we use a system provided keychain to do this. Examples of packages that provide this are `gnome-keyring`, `KWallet` and `keepassxc` among others.
-
-### Could not start inotify
-
-Zed relies on inotify to watch your filesystem for changes. If you cannot start inotify then Zed will not work reliably.
-
-If you are seeing "too many open files" then first try `sysctl fs.inotify`.
-
-- You should see that max_user_instances is 128 or higher (you can change the limit with `sudo sysctl fs.inotify.max_user_instances=1024`). Zed needs only 1 inotify instance.
-- You should see that `max_user_watches` is 8000 or higher (you can change the limit with `sudo sysctl fs.inotify.max_user_watches=64000`). Zed needs one watch per directory in all your open projects + one per git repository + a handful more for settings, themes, keymaps, extensions.
-
-It is also possible that you are running out of file descriptors. You can check the limits with `ulimit` and update them by editing `/etc/security/limits.conf`.
-
-### No sound or wrong output device
-
-If you're not hearing any sound in Zed or the audio is routed to the wrong device, it could be due to a mismatch between audio systems. Zed relies on ALSA, while your system may be using PipeWire or PulseAudio. To resolve this, you need to configure ALSA to route audio through PipeWire/PulseAudio.
-
-If your system uses PipeWire:
-
-1. **Install the PipeWire ALSA plugin**
-
-   On Debian-based systems, run:
-
-   ```bash
-   sudo apt install pipewire-alsa
-   ```
-
-2. **Configure ALSA to use PipeWire**
-
-   Add the following configuration to your ALSA settings file. You can use either `~/.asoundrc` (user-level) or `/etc/asound.conf` (system-wide):
-
-   ```bash
-   pcm.!default {
-       type pipewire
-   }
-
-   ctl.!default {
-       type pipewire
-   }
-   ```
-
-3. **Restart your system**
-
-### Forcing X11 scale factor
-
-On X11 systems, Zed automatically detects the appropriate scale factor for high-DPI displays. The scale factor is determined using the following priority order:
-
-1. `GPUI_X11_SCALE_FACTOR` environment variable (if set)
-2. `Xft.dpi` from X resources database (xrdb)
-3. Automatic detection via RandR based on monitor resolution and physical size
-
-If you want to customize the scale factor beyond what Zed detects automatically, you have several options:
-
-#### Check your current scale factor
-
-You can verify if you have `Xft.dpi` set:
-
-```sh
-xrdb -query | grep Xft.dpi
-```
-
-If this command returns no output, Zed is using RandR (X11's monitor management extension) to automatically calculate the scale factor based on your monitor's reported resolution and physical dimensions.
-
-#### Option 1: Set Xft.dpi (X Resources Database)
-
-`Xft.dpi` is a standard X11 setting that many applications use for consistent font and UI scaling. Setting this ensures Zed scales the same way as other X11 applications that respect this setting.
-
-Edit or create the `~/.Xresources` file:
-
-```sh
-vim ~/.Xresources
-```
-
-Add this line with your desired DPI:
-
-```sh
-Xft.dpi: 96
-```
-
-Common DPI values:
-
-- `96` for standard 1x scaling
-- `144` for 1.5x scaling
-- `192` for 2x scaling
-- `288` for 3x scaling
-
-Load the configuration:
-
-```sh
-xrdb -merge ~/.Xresources
-```
-
-Restart Zed for the changes to take effect.
-
-#### Option 2: Use the GPUI_X11_SCALE_FACTOR environment variable
-
-This Zed-specific environment variable directly sets the scale factor, bypassing all automatic detection.
-
-```sh
-GPUI_X11_SCALE_FACTOR=1.5 zed
-```
-
-You can use decimal values (e.g., `1.25`, `1.5`, `2.0`) or set `GPUI_X11_SCALE_FACTOR=randr` to force RandR-based detection even when `Xft.dpi` is set.
-
-To make this permanent, add it to your shell profile or desktop entry.
-
-#### Option 3: Adjust system-wide RandR DPI
-
-This changes the reported DPI for your entire X11 session, affecting how RandR calculates scaling for all applications that use it.
-
-Add this to your `.xprofile` or `.xinitrc`:
-
-```sh
-xrandr --dpi 192
-```
-
-Replace `192` with your desired DPI value. This affects the system globally and will be used by Zed's automatic RandR detection when `Xft.dpi` is not set.
-
-### Font rendering parameters
-
-When using Blade rendering (Linux platforms and self-compiled builds with the Blade renderer enabled), Zed reads `ZED_FONTS_GAMMA` and `ZED_FONTS_GRAYSCALE_ENHANCED_CONTRAST` environment variables for the values to use for font rendering.
-
-`ZED_FONTS_GAMMA` corresponds to [getgamma](https://learn.microsoft.com/en-us/windows/win32/api/dwrite/nf-dwrite-idwriterenderingparams-getgamma) values.
-Allowed range [1.0, 2.2], other values are clipped.
-Default: 1.8
-
-`ZED_FONTS_GRAYSCALE_ENHANCED_CONTRAST` corresponds to [getgrayscaleenhancedcontrast](https://learn.microsoft.com/en-us/windows/win32/api/dwrite_1/nf-dwrite_1-idwriterenderingparams1-getgrayscaleenhancedcontrast) values.
-Allowed range: [0.0, ..), other values are clipped.
-Default: 1.0
diff --git a/docs/src/migrate/vs-code.md b/docs/src/migrate/vs-code.md
deleted file mode 100644
index dd7419e3ff..0000000000
--- a/docs/src/migrate/vs-code.md
+++ /dev/null
@@ -1,373 +0,0 @@
-# How to Migrate from VS Code to Zed
-
-This guide is for developers who spent serious time in VS Code and want to try Zed without starting from scratch.
-
-If you’re here, you might be looking for a faster editor. Or something less cluttered. Or you’re curious about built-in collaboration. Whatever brought you here, this guide helps you move over your habits, shortcuts, and settings.
-
-We’ll cover what to bring, what to change, and what’s different. You can ease in gradually or switch all at once. Either way, you’ll stay productive.
-
-## Install Zed
-
-Zed is available on macOS, Windows, and Linux.
-
-For macOS, you can download it from zed.dev/download, or install via Homebrew:
-`brew install zed-editor/zed/zed`
-
-For most Linux users, the easiest way to install Zed is through our installation script:
-`curl -f https://zed.dev/install.sh | sh`
-
-After installation, you can launch Zed from your Applications folder (macOS) or directly from the terminal (Linux) using:
-`zed .`
-This opens the current directory in Zed.
-
-## Import Settings from VS Code
-
-During setup, you have the option to import key settings from VS Code. Zed imports the following settings:
-
-### Settings Imported from VS Code
-
-The following VS Code settings are automatically imported when you use **Import Settings from VS Code**:
-
-**Editor**
-
-| VS Code Setting                             | Zed Setting                                    |
-| ------------------------------------------- | ---------------------------------------------- |
-| `editor.fontFamily`                         | `buffer_font_family`                           |
-| `editor.fontSize`                           | `buffer_font_size`                             |
-| `editor.fontWeight`                         | `buffer_font_weight`                           |
-| `editor.tabSize`                            | `tab_size`                                     |
-| `editor.insertSpaces`                       | `hard_tabs` (inverted)                         |
-| `editor.wordWrap`                           | `soft_wrap`                                    |
-| `editor.wordWrapColumn`                     | `preferred_line_length`                        |
-| `editor.cursorStyle`                        | `cursor_shape`                                 |
-| `editor.cursorBlinking`                     | `cursor_blink`                                 |
-| `editor.renderLineHighlight`                | `current_line_highlight`                       |
-| `editor.lineNumbers`                        | `gutter.line_numbers`, `relative_line_numbers` |
-| `editor.showFoldingControls`                | `gutter.folds`                                 |
-| `editor.minimap.enabled`                    | `minimap.show`                                 |
-| `editor.minimap.autohide`                   | `minimap.show`                                 |
-| `editor.minimap.showSlider`                 | `minimap.thumb`                                |
-| `editor.minimap.maxColumn`                  | `minimap.max_width_columns`                    |
-| `editor.stickyScroll.enabled`               | `sticky_scroll.enabled`                        |
-| `editor.scrollbar.horizontal`               | `scrollbar.axes.horizontal`                    |
-| `editor.scrollbar.vertical`                 | `scrollbar.axes.vertical`                      |
-| `editor.mouseWheelScrollSensitivity`        | `scroll_sensitivity`                           |
-| `editor.fastScrollSensitivity`              | `fast_scroll_sensitivity`                      |
-| `editor.cursorSurroundingLines`             | `vertical_scroll_margin`                       |
-| `editor.hover.enabled`                      | `hover_popover_enabled`                        |
-| `editor.hover.delay`                        | `hover_popover_delay`                          |
-| `editor.parameterHints.enabled`             | `auto_signature_help`                          |
-| `editor.multiCursorModifier`                | `multi_cursor_modifier`                        |
-| `editor.selectionHighlight`                 | `selection_highlight`                          |
-| `editor.roundedSelection`                   | `rounded_selection`                            |
-| `editor.find.seedSearchStringFromSelection` | `seed_search_query_from_cursor`                |
-| `editor.rulers`                             | `wrap_guides`                                  |
-| `editor.renderWhitespace`                   | `show_whitespaces`                             |
-| `editor.guides.indentation`                 | `indent_guides.enabled`                        |
-| `editor.linkedEditing`                      | `linked_edits`                                 |
-| `editor.autoSurround`                       | `use_auto_surround`                            |
-| `editor.formatOnSave`                       | `format_on_save`                               |
-| `editor.formatOnPaste`                      | `auto_indent_on_paste`                         |
-| `editor.formatOnType`                       | `use_on_type_format`                           |
-| `editor.trimAutoWhitespace`                 | `remove_trailing_whitespace_on_save`           |
-| `editor.suggestOnTriggerCharacters`         | `show_completions_on_input`                    |
-| `editor.suggest.showWords`                  | `completions.words`                            |
-| `editor.inlineSuggest.enabled`              | `show_edit_predictions`                        |
-
-**Files & Workspace**
-
-| VS Code Setting             | Zed Setting                    |
-| --------------------------- | ------------------------------ |
-| `files.autoSave`            | `autosave`                     |
-| `files.autoSaveDelay`       | `autosave.milliseconds`        |
-| `files.insertFinalNewline`  | `ensure_final_newline_on_save` |
-| `files.associations`        | `file_types`                   |
-| `files.watcherExclude`      | `file_scan_exclusions`         |
-| `files.watcherInclude`      | `file_scan_inclusions`         |
-| `files.simpleDialog.enable` | `use_system_path_prompts`      |
-| `search.smartCase`          | `use_smartcase_search`         |
-| `search.useIgnoreFiles`     | `search.include_ignored`       |
-
-**Terminal**
-
-| VS Code Setting                       | Zed Setting                         |
-| ------------------------------------- | ----------------------------------- |
-| `terminal.integrated.fontFamily`      | `terminal.font_family`              |
-| `terminal.integrated.fontSize`        | `terminal.font_size`                |
-| `terminal.integrated.lineHeight`      | `terminal.line_height`              |
-| `terminal.integrated.cursorStyle`     | `terminal.cursor_shape`             |
-| `terminal.integrated.cursorBlinking`  | `terminal.blinking`                 |
-| `terminal.integrated.copyOnSelection` | `terminal.copy_on_select`           |
-| `terminal.integrated.scrollback`      | `terminal.max_scroll_history_lines` |
-| `terminal.integrated.macOptionIsMeta` | `terminal.option_as_meta`           |
-| `terminal.integrated.{platform}Exec`  | `terminal.shell`                    |
-| `terminal.integrated.env.{platform}`  | `terminal.env`                      |
-
-**Tabs & Panels**
-
-| VS Code Setting                                    | Zed Setting                                        |
-| -------------------------------------------------- | -------------------------------------------------- |
-| `workbench.editor.showTabs`                        | `tab_bar.show`                                     |
-| `workbench.editor.showIcons`                       | `tabs.file_icons`                                  |
-| `workbench.editor.tabActionLocation`               | `tabs.close_position`                              |
-| `workbench.editor.tabActionCloseVisibility`        | `tabs.show_close_button`                           |
-| `workbench.editor.focusRecentEditorAfterClose`     | `tabs.activate_on_close`                           |
-| `workbench.editor.enablePreview`                   | `preview_tabs.enabled`                             |
-| `workbench.editor.enablePreviewFromQuickOpen`      | `preview_tabs.enable_preview_from_file_finder`     |
-| `workbench.editor.enablePreviewFromCodeNavigation` | `preview_tabs.enable_preview_from_code_navigation` |
-| `workbench.editor.editorActionsLocation`           | `tab_bar.show_tab_bar_buttons`                     |
-| `workbench.editor.limit.enabled` / `value`         | `max_tabs`                                         |
-| `workbench.editor.restoreViewState`                | `restore_on_file_reopen`                           |
-| `workbench.statusBar.visible`                      | `status_bar.show`                                  |
-
-**Project Panel (File Explorer)**
-
-| VS Code Setting                | Zed Setting                         |
-| ------------------------------ | ----------------------------------- |
-| `explorer.compactFolders`      | `project_panel.auto_fold_dirs`      |
-| `explorer.autoReveal`          | `project_panel.auto_reveal_entries` |
-| `explorer.excludeGitIgnore`    | `project_panel.hide_gitignore`      |
-| `problems.decorations.enabled` | `project_panel.show_diagnostics`    |
-| `explorer.decorations.badges`  | `project_panel.git_status`          |
-
-**Git**
-
-| VS Code Setting                      | Zed Setting                                    |
-| ------------------------------------ | ---------------------------------------------- |
-| `git.enabled`                        | `git_panel.button`                             |
-| `git.defaultBranchName`              | `git_panel.fallback_branch_name`               |
-| `git.decorations.enabled`            | `git.inline_blame`, `project_panel.git_status` |
-| `git.blame.editorDecoration.enabled` | `git.inline_blame.enabled`                     |
-
-**Window & Behavior**
-
-| VS Code Setting                                  | Zed Setting                              |
-| ------------------------------------------------ | ---------------------------------------- |
-| `window.confirmBeforeClose`                      | `confirm_quit`                           |
-| `window.nativeTabs`                              | `use_system_window_tabs`                 |
-| `window.closeWhenEmpty`                          | `when_closing_with_no_tabs`              |
-| `accessibility.dimUnfocused.enabled` / `opacity` | `active_pane_modifiers.inactive_opacity` |
-
-**Other**
-
-| VS Code Setting            | Zed Setting                                              |
-| -------------------------- | -------------------------------------------------------- |
-| `http.proxy`               | `proxy`                                                  |
-| `npm.packageManager`       | `node.npm_path`                                          |
-| `telemetry.telemetryLevel` | `telemetry.metrics`, `telemetry.diagnostics`             |
-| `outline.icons`            | `outline_panel.file_icons`, `outline_panel.folder_icons` |
-| `chat.agent.enabled`       | `agent.enabled`                                          |
-| `mcp`                      | `context_servers`                                        |
-
-Zed doesn’t import extensions or keybindings, but this is the fastest way to get a familiar feel while trying something new. If you skip that step during setup, you can still import settings manually later via the command palette:
-
-`Cmd+Shift+P → Zed: Import VS Code Settings`
-
-## Set Up Editor Preferences
-
-You can also configure settings manually in the Settings Editor.
-
-To edit your settings:
-
-1. `Cmd+,` to open the Settings Editor.
-2. Run `zed: open settings` in the Command Palette.
-
-Here’s how common VS Code settings translate:
-| VS Code | Zed | Notes |
-| --- | --- | --- |
-| editor.fontFamily | buffer_font_family | Zed uses Zed Mono by default |
-| editor.fontSize | buffer_font_size | Set in pixels |
-| editor.tabSize | tab_size | Can override per language |
-| editor.insertSpaces | insert_spaces | Boolean |
-| editor.formatOnSave | format_on_save | Works with formatter enabled |
-| editor.wordWrap | soft_wrap | Supports optional wrap column |
-
-Zed also supports per-project settings. You can find these in the Settings Editor as well.
-
-## Open or Create a Project
-
-After setup, press `Cmd+O` (`Ctrl+O` on Linux) to open a folder. This becomes your workspace in Zed. There's no support for multi-root workspaces or `.code-workspace` files like in VS Code. Zed keeps it simple: one folder, one workspace.
-
-To start a new project, create a directory using your terminal or file manager, then open it in Zed. The editor will treat that folder as the root of your project.
-
-You can also launch Zed from the terminal inside any folder with:
-`zed .`
-
-Once inside a project, use `Cmd+P` to jump between files quickly. `Cmd+Shift+P` (`Ctrl+Shift+P` on Linux) opens the command palette for running actions / tasks, toggling settings, or starting a collaboration session.
-
-Open buffers appear as tabs across the top. The sidebar shows your file tree and Git status. Collapse it with `Cmd+B` for a distraction-free view.
-
-## Differences in Keybindings
-
-If you chose the VS Code keymap during onboarding, you're likely good to go, and most of your shortcuts should already feel familiar.
-Here’s a quick reference guide for how our keybindings compare to what you’re used to coming from VS Code.
-
-### Common Shared Keybindings (Zed <> VS Code)
-
-| Action                      | Shortcut               |
-| --------------------------- | ---------------------- |
-| Find files                  | `Cmd + P`              |
-| Run a command               | `Cmd + Shift + P`      |
-| Search text (project-wide)  | `Cmd + Shift + F`      |
-| Find symbols (project-wide) | `Cmd + T`              |
-| Find symbols (file-wide)    | `Cmd + Shift + O`      |
-| Toggle left dock            | `Cmd + B`              |
-| Toggle bottom dock          | `Cmd + J`              |
-| Open terminal               | `Ctrl + ~`             |
-| Open file tree explorer     | `Cmd + Shift + E`      |
-| Close current buffer        | `Cmd + W`              |
-| Close whole project         | `Cmd + Shift + W`      |
-| Refactor: rename symbol     | `F2`                   |
-| Change theme                | `Cmd + K, Cmd + T`     |
-| Wrap text                   | `Opt + Z`              |
-| Navigate open tabs          | `Cmd + Opt + Arrow`    |
-| Syntactic fold / unfold     | `Cmd + Opt + {` or `}` |
-
-### Different Keybindings (Zed <> VS Code)
-
-| Action              | VS Code               | Zed                    |
-| ------------------- | --------------------- | ---------------------- |
-| Open recent project | `Ctrl + R`            | `Cmd + Opt + O`        |
-| Move lines up/down  | `Opt + Up/Down`       | `Cmd + Ctrl + Up/Down` |
-| Split panes         | `Cmd + \`             | `Cmd + K, Arrow Keys`  |
-| Expand Selection    | `Shift + Alt + Right` | `Opt + Up`             |
-
-### Unique to Zed
-
-| Action              | Shortcut                     | Notes                                            |
-| ------------------- | ---------------------------- | ------------------------------------------------ |
-| Toggle right dock   | `Cmd + R` or `Cmd + Alt + B` |                                                  |
-| Syntactic selection | `Opt + Up/Down`              | Selects code by structure (e.g., inside braces). |
-
-### How to Customize Keybindings
-
-To edit your keybindings:
-
-- Open the command palette (`Cmd+Shift+P`)
-- Run `Zed: Open Keymap Editor`
-
-This opens a list of all available bindings. You can override individual shortcuts, remove conflicts, or build a layout that works better for your setup.
-
-Zed also supports chords (multi-key sequences) like `Cmd+K Cmd+C`, like VS Code does.
-
-## Differences in User Interfaces
-
-### No Workspace
-
-VS Code uses a dedicated Workspace concept, with multi-root folders, `.code-workspace` files, and a clear distinction between “a window” and “a workspace.”
-Zed simplifies this model.
-
-In Zed:
-
-- There is no workspace file format. Opening a folder is your project context.
-
-- Zed does not support multi-root workspaces. You can only open one folder at a time in a window.
-
-- Most project-level behavior is scoped to the folder you open. Search, Git integration, tasks, and environment detection all treat the opened directory as the project root.
-
-- Per-project settings are optional. You can add a `.zed/settings.json` file inside a project to override global settings, but Zed does not use `.code-workspace` files and won’t import them.
-
-- You can start from a single file or an empty window. Zed doesn’t require you to open a folder to begin editing.
-
-The result is a simpler model:
-Open a folder → work inside that folder → no additional workspace layer.
-
-### Navigating in a Project
-
-In VS Code, the standard entry point is opening a folder. From there, the left-hand sidebar is central to your navigation.
-Zed takes a different approach:
-
-- You can still open folders, but you don’t need to. Opening a single file or even starting with an empty workspace is valid.
-- The Command Palette (`Cmd+Shift+P`) and File Finder (`Cmd+P`) are your primary navigation tools. The File Finder searches across the entire workspace instantly; files, symbols, commands, even teammates if you're collaborating.
-- Instead of a persistent sidebar, Zed encourages you to:
-  - Fuzzy-find files by name (`Cmd+P`)
-  - Jump directly to symbols (`Cmd+Shift+O`)
-  - Use split panes and tabs for context, rather than keeping a large file tree open (though you can do this with the Project Panel if you prefer).
-
-The UI is intentionally minimal. Panels slide in only when needed, then get out of your way. The focus is on flowing between code instead of managing panes.
-
-### Extensions vs. Marketplace
-
-Zed does not offer as many extensions as VS Code. The available extensions are focused on language support, themes, syntax highlighting, and other core editing enhancements.
-
-However there are several features that typically require extensions in VS Code which we built directly into Zed:
-
-- Real-time collaboration with voice and cursor sharing (no Live Share required)
-- AI coding assistance (no Copilot extension needed)
-- Built-in terminal panel
-- Project-wide fuzzy search
-- Task runner with JSON config
-- Inline diagnostics and code actions via LSP
-
-You won’t find one-to-one replacements for every VS Code extension, especially if you rely on tools for DevOps, containers, or test runners. Zed's extension ecosystem is still growing, and the catalog is smaller by design.
-
-### Collaboration in Zed vs. VS Code
-
-Unlike VS Code, Zed doesn’t require an extension to collaborate. It’s built into the core experience.
-
-- Open the Collab Panel in the left dock.
-- Create a channel and [invite your collaborators](https://zed.dev/docs/collaboration#inviting-a-collaborator) to join.
-- [Share your screen or your codebase](https://zed.dev/docs/collaboration#share-a-project) directly.
-
-Once connected, you’ll see each other's cursors, selections, and edits in real time. Voice chat is included, so you can talk as you work. There’s no need for separate tools or third-party logins. Zed’s collaboration is designed for everything from quick pair programming to longer team sessions.
-
-Learn how [Zed uses Zed](https://zed.dev/blog/zed-is-our-office) to plan work and collaborate.
-
-### Using AI in Zed
-
-If you’re used to GitHub Copilot in VS Code, you can do the same in Zed. You can also explore other agents through Zed Pro, or bring your own keys and connect without authentication. Zed is designed to enable many options for using AI, including disabling it entirely.
-
-#### Configuring GitHub Copilot
-
-You should be able to sign-in to GitHub Copilot by clicking on the Zeta icon in the status bar and following the setup instructions.
-You can also add this to your settings:
-
-```json
-{
-  "features": {
-    "edit_prediction_provider": "copilot"
-  }
-}
-```
-
-To invoke completions, just start typing. Zed will offer suggestions inline for you to accept.
-
-#### Additional AI Options
-
-To use other AI models in Zed, you have several options:
-
-- Use Zed’s hosted models, with higher rate limits. Requires [authentication](https://zed.dev/docs/accounts.html) and subscription to [Zed Pro](https://zed.dev/docs/ai/subscription.html).
-- Bring your own [API keys](https://zed.dev/docs/ai/llm-providers.html), no authentication needed
-- Use [external agents like Claude Code](https://zed.dev/docs/ai/external-agents.html).
-
-### Advanced Config and Productivity Tweaks
-
-Zed exposes advanced settings for power users who want to fine-tune their environment.
-
-Here are a few useful tweaks:
-
-**Format on Save:**
-
-```json
-"format_on_save": "on"
-```
-
-**Enable direnv support:**
-
-```json
-"load_direnv": "shell_hook"
-```
-
-**Custom Tasks**: Define build or run commands in your `tasks.json` (accessed via command palette: `zed: open tasks`):
-
-```json
-[
-  {
-    "label": "build",
-    "command": "cargo build"
-  }
-]
-```
-
-**Bring over custom snippets**
-Copy your VS Code snippet JSON directly into Zed's snippets folder (`zed: configure snippets`).
diff --git a/docs/src/multibuffers.md b/docs/src/multibuffers.md
deleted file mode 100644
index 7d9f4cafc4..0000000000
--- a/docs/src/multibuffers.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# Multibuffers
-
-One of the superpowers Zed gives you is the ability to edit multiple files simultaneously. When combined with multiple cursors, this makes wide-ranging refactors significantly faster.
-
-## Editing in a multibuffer
-
-<div class="video" style="position: relative; padding-top: 71.71314741035857%;">
-  <iframe
-    src="https://customer-snccc0j9v3kfzkif.cloudflarestream.com/bda0a6584c19f4b39e58a263c0ae4358/iframe?muted=true&preload=true&loop=true&autoplay=true&poster=https%3A%2F%2Fcustomer-snccc0j9v3kfzkif.cloudflarestream.com%2Fbda0a6584c19f4b39e58a263c0ae4358%2Fthumbnails%2Fthumbnail.jpg%3Ftime%3D%26height%3D600&controls=false"
-    style="border: none; position: absolute; top: 0; left: 0; height: 100%; width: 100%;"
-    allow="accelerometer; gyroscope; autoplay; encrypted-media; picture-in-picture;"
-    allowfullscreen="true"
-  ></iframe>
-</div>
-
-Editing a multibuffer is the same as editing a normal file. Changes you make will be reflected in the open copies of that file in the rest of the editor, and you can save all files with `editor: Save` (bound to `cmd-s` on macOS, `ctrl-s` on Windows/Linux, or `:w` in Vim mode).
-
-When in a multibuffer, it is often useful to use multiple cursors to edit every file simultaneously. If you want to edit a few instances, you can select them with the mouse (`option-click` on macOS, `alt-click` on Window/Linux) or the keyboard. `cmd-d` on macOS, `ctrl-d` on Windows/Linux, or `gl` in Vim mode will select the next match of the word under the cursor.
-
-When you want to edit all matches you can select them by running the `editor: Select All Matches` command (`cmd-shift-l` on macOS, `ctrl-shift-l` on Windows/Linux, or `g a` in Vim mode).
-
-## Navigating to the Source File
-
-While you can easily edit files in a multibuffer, navigating directly to the source file is often beneficial. You can accomplish this by clicking on any of the divider lines between excerpts or by placing your cursor in an excerpt and executing the `editor: open excerpts` command. It’s key to note that if multiple cursors are being used, the command will open the source file positioned under each cursor within the multibuffer.
-
-Additionally, if you prefer to use the mouse and would like to double-click on an excerpt to open it, you can enable this functionality with the setting: `"double_click_in_multibuffer": "open"`.
-
-## Project search
-
-To start a search run the `pane: Toggle Search` command (`cmd-shift-f` on macOS, `ctrl-shift-f` on Windows/Linux, or `g/` in Vim mode). After the search has completed, the results will be shown in a new multibuffer. There will be one excerpt for each matching line across the whole project.
-
-## Diagnostics
-
-If you have a language server installed, the diagnostics pane can show you all errors across your project. You can open it by clicking on the icon in the status bar, or running the `diagnostics: Deploy` command` ('cmd-shift-m` on macOS, `ctrl-shift-m` on Windows/Linux, or `:clist` in Vim mode).
-
-## Find References
-
-If you have a language server installed, you can find all references to the symbol under the cursor with the `editor: Find References` command (`cmd-click` on macOS, `ctrl-click` on Windows/Linux, or `g A` in Vim mode.
-
-Depending on your language server, commands like `editor: Go To Definition` and `editor: Go To Type Definition` will also open a multibuffer if there are multiple possible definitions.
diff --git a/docs/src/outline-panel.md b/docs/src/outline-panel.md
deleted file mode 100644
index bc743596d6..0000000000
--- a/docs/src/outline-panel.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# Outline Panel
-
-In addition to the modal outline (`cmd-shift-o`), Zed offers an outline panel. The outline panel can be deployed via `cmd-shift-b` (`outline panel: toggle focus` via the command palette), or by clicking the `Outline Panel` button in the status bar.
-
-When viewing a "singleton" buffer (i.e., a single file on a tab), the outline panel works similarly to that of the outline modal－it displays the outline of the current buffer's symbols, as reported by tree-sitter. Clicking on an entry allows you to jump to the associated section in the file. The outline view will also automatically scroll to the section associated with the current cursor position within the file.
-
-![Using the outline panel in a singleton buffer](https://zed.dev/img/outline-panel/singleton.png)
-
-## Usage with multibuffers
-
-The outline panel truly excels when used with multi-buffers. Here are some examples of its versatility:
-
-### Project Search Results
-
-Get an overview of search results across your project.
-
-![Using the outline panel in a project search multi-buffer](https://zed.dev/img/outline-panel/project-search.png)
-
-### Project Diagnostics
-
-View a summary of all errors and warnings reported by the language server.
-
-![Using the outline panel while viewing project diagnostics multi-buffer](https://zed.dev/img/outline-panel/project-diagnostics.png)
-
-### Find All References
-
-Quickly navigate through all references when using the `editor: find all references` action.
-
-![Using the outline panel while viewing `find all references` multi-buffer](https://zed.dev/img/outline-panel/find-all-references.png)
-
-The outline view provides a great way to quickly navigate to specific parts of your code and helps you maintain context when working with large result sets in multi-buffers.
diff --git a/docs/src/performance.md b/docs/src/performance.md
deleted file mode 100644
index 544e39e94b..0000000000
--- a/docs/src/performance.md
+++ /dev/null
@@ -1,93 +0,0 @@
-How to use our internal tools to profile and keep Zed fast.
-
-# Rough quick CPU profiling (Flamechart)
-
-See what the CPU spends the most time on. Strongly recommend you use
-[samply](https://github.com/mstange/samply). It opens an interactive profile in
-the browser (specifically a local instance of [firefox_profiler](https://profiler.firefox.com/)).
-
-See [samply](https://github.com/mstange/samply)'s README on how to install and run.
-
-The profile.json does not contain any symbols. Firefox profiler can add the local symbols to the profile for for. To do that hit the upload local profile button in the top right corner.
-
-<img width="851" height="613" alt="image" src="https://github.com/user-attachments/assets/cbef2b51-0442-4ee9-bc5c-95f6ccf9be2c" />
-
-# In depth CPU profiling (Tracing)
-
-See how long each annotated function call took and its arguments (if
-configured).
-
-Annotate any function you need appear in the profile with instrument. For more
-details see
-[tracing-instrument](https://docs.rs/tracing/latest/tracing/attr.instrument.html):
-
-```rust
-#[instrument(skip_all)]
-fn should_appear_in_profile(kitty: Cat) {
-    sleep(QUITE_LONG)
-}
-```
-
-Then either compile Zed with `ZTRACING=1 cargo r --features tracy --release`. The release build is optional but highly recommended as like every program Zeds performance characteristics change dramatically with optimizations. You do not want to chase slowdowns that do not exist in release.
-
-## One time Setup/Building the profiler:
-
-Download the profiler:
-[linux x86_64](https://zed-tracy-import-miniprofiler.nyc3.digitaloceanspaces.com/tracy-profiler-linux-x86_64)
-[macos aarch64](https://zed-tracy-import-miniprofiler.nyc3.digitaloceanspaces.com/tracy-profiler-0.13.0-macos-aarch64)
-
-### Alternative: Building it yourself
-
-- Clone the repo at git@github.com:wolfpld/tracy.git
-- `cd profiler && mkdir build && cd build`
-- Run cmake to generate build files: `cmake -G Ninja -DCMAKE_BUILD_TYPE=Release ..`
-- Build the profiler: `ninja`
-- [Optional] move the profiler somewhere nice like ~/.local/bin on linux
-
-## Usage
-
-Open the profiler (tracy-profiler), you should see zed in the list of `Discovered clients` click it.
-<img width="392" height="287" alt="image" src="https://github.com/user-attachments/assets/b6f06fc3-6b25-41c7-ade9-558cc93d6033" />
-
-To find functions that take a long time follow this image:
-<img width="888" height="1159" alt="image" src="https://github.com/user-attachments/assets/77087617-f53a-4331-863d-e59f8a5b6f0b" />
-
-# Task/Async profiling
-
-Get a profile of the zed foreground executor and background executors. Check if
-anything is blocking the foreground too long or taking too much (clock) time in
-the background.
-
-The profiler always runs in the background. You can save a trace from its UI or
-look at the results live.
-
-## Setup/Building the importer:
-
-Download the importer
-[linux x86_64](https://zed-tracy-import-miniprofiler.nyc3.digitaloceanspaces.com/tracy-import-miniprofiler-linux-x86_64)
-[mac aarch64](https://zed-tracy-import-miniprofiler.nyc3.digitaloceanspaces.com/tracy-import-miniprofiler-macos-aarch64)
-
-### Alternative: Building it yourself
-
-- Clone the repo at git@github.com:zed-industries/tracy.git on v0.12.2 branch
-- `cd import && mkdir build && cd build`
-- Run cmake to generate build files: `cmake -G Ninja -DCMAKE_BUILD_TYPE=Release ..`
-- Build the importer: `ninja`
-- Run the importer on the trace file: `./tracy-import-miniprofiler /path/to/trace.miniprof /path/to/output.tracy`
-- Open the trace in tracy:
-  - If you're on windows download the v0.12.2 version from the releases on the upstream repo
-  - If you're on other platforms open it on the website: https://tracy.nereid.pl/ (the version might mismatch so your luck might vary, we need to host our own ideally..)
-
-## To Save a Trace:
-
-- Run the action: `zed open performance profiler`
-- Hit the save button. This opens a save dialog or if that fails to open the trace gets saved in your working directory.
-- Convert the profile so it can be imported in tracy using the importer: `./tracy-import-miniprofiler <path to performance_profile.miniprof> output.tracy`
-- Go to <https://tracy.nereid.pl/> hit the 'power button' in the top left and then open saved trace.
-- Now zoom in to see the tasks and how long they took
-
-# Warn if function is slow
-
-```rust
-let _timer = zlog::time!("my_function_name").warn_if_gt(std::time::Duration::from_millis(100));
-```
diff --git a/docs/src/quick-start.md b/docs/src/quick-start.md
deleted file mode 100644
index 05cf8c1fd0..0000000000
--- a/docs/src/quick-start.md
+++ /dev/null
@@ -1 +0,0 @@
-# Quick Start
diff --git a/docs/src/remote-development.md b/docs/src/remote-development.md
deleted file mode 100644
index c25d160a17..0000000000
--- a/docs/src/remote-development.md
+++ /dev/null
@@ -1,255 +0,0 @@
-# Remote Development
-
-Remote Development allows you to code at the speed of thought, even when your codebase is not on your local machine. You use Zed locally so the UI is immediately responsive, but offload heavy computation to the development server so that you can work effectively.
-
-## Overview
-
-Remote development requires two computers, your local machine that runs the Zed UI and the remote server which runs a Zed headless server. The two communicate over SSH, so you will need to be able to SSH from your local machine into the remote server to use this feature.
-
-![Architectural overview of Zed Remote Development](https://zed.dev/img/remote-development/diagram.png)
-
-On your local machine, Zed runs its UI, talks to language models, uses Tree-sitter to parse and syntax-highlight code, and store unsaved changes and recent projects. The source code, language servers, tasks, and the terminal all run on the remote server.
-
-> **Note:** The original version of remote development sent traffic via Zed's servers. As of Zed v0.157 you can no-longer use that mode.
-
-## Setup
-
-1. Download and install the latest [Zed](https://zed.dev/releases). You need at least Zed v0.159.
-1. Use {#kb projects::OpenRemote} to open the "Remote Projects" dialog.
-1. Click "Connect New Server" and enter the command you use to SSH into the server. See [Supported SSH options](#supported-ssh-options) for options you can pass.
-1. Your local machine will attempt to connect to the remote server using the `ssh` binary on your path. Assuming the connection is successful, Zed will download the server on the remote host and start it.
-1. Once the Zed server is running, you will be prompted to choose a path to open on the remote server.
-   > **Note:** Zed does not currently handle opening very large directories (for example, `/` or `~` that may have >100,000 files) very well. We are working on improving this, but suggest in the meantime opening only specific projects, or subfolders of very large mono-repos.
-
-For simple cases where you don't need any SSH arguments, you can run `zed ssh://[<user>@]<host>[:<port>]/<path>` to open a remote folder/file directly. If you'd like to hotlink into an SSH project, use a link of the format: `zed://ssh/[<user>@]<host>[:<port>]/<path>`.
-
-## Supported platforms
-
-The remote machine must be able to run Zed's server. The following platforms should work, though note that we have not exhaustively tested every Linux distribution:
-
-- macOS Catalina or later (Intel or Apple Silicon)
-- Linux (x86_64 or arm64, we do not yet support 32-bit platforms)
-- Windows is not yet supported as a remote server, but Windows can be used as a local machine to connect to remote servers.
-
-## Configuration
-
-The list of remote servers is stored in your settings file {#kb zed::OpenSettings}. You can edit this list using the Remote Projects dialog {#kb projects::OpenRemote}, which provides some robustness - for example it checks that the connection can be established before writing it to the settings file.
-
-```json [settings]
-{
-  "ssh_connections": [
-    {
-      "host": "192.168.1.10",
-      "projects": [{ "paths": ["~/code/zed/zed"] }]
-    }
-  ]
-}
-```
-
-Zed shells out to the `ssh` on your path, and so it will inherit any configuration you have in `~/.ssh/config` for the given host. That said, if you need to override anything you can configure the following additional options on each connection:
-
-```json [settings]
-{
-  "ssh_connections": [
-    {
-      "host": "192.168.1.10",
-      "projects": [{ "paths": ["~/code/zed/zed"] }],
-      // any argument to pass to the ssh master process
-      "args": ["-i", "~/.ssh/work_id_file"],
-      "port": 22, // defaults to 22
-      // defaults to your username on your local machine
-      "username": "me"
-    }
-  ]
-}
-```
-
-There are two additional Zed-specific options per connection, `upload_binary_over_ssh` and `nickname`:
-
-```json [settings]
-{
-  "ssh_connections": [
-    {
-      "host": "192.168.1.10",
-      "projects": [{ "paths": ["~/code/zed/zed"] }],
-      // by default Zed will download the server binary from the internet on the remote.
-      // When this is true, it'll be downloaded to your laptop and uploaded over SSH.
-      // This is useful when your remote server has restricted internet access.
-      "upload_binary_over_ssh": true,
-      // Shown in the Zed UI to help distinguish multiple hosts.
-      "nickname": "lil-linux"
-    }
-  ]
-}
-```
-
-If you use the command line to open a connection to a host by doing `zed ssh://192.168.1.10/~/.vimrc`, then extra options are read from your settings file by finding the first connection that matches the host/username/port of the URL on the command line.
-
-Additionally it's worth noting that while you can pass a password on the command line `zed ssh://user:password@host/~`, we do not support writing a password to your settings file. If you're connecting repeatedly to the same host, you should configure key-based authentication.
-
-## Remote Development on Windows (SSH)
-
-Zed on Windows supports SSH remoting and will prompt for credentials when needed.
-
-If you encounter authentication issues, confirm that your SSH key agent is running (e.g., ssh-agent or your Git client's agent) and that ssh.exe is on PATH.
-
-### Troubleshooting SSH on Windows
-
-When prompted for credentials, use the graphical askpass dialog. If it doesn't appear, check for credential manager conflicts and that GUI prompts aren't blocked by your terminal.
-
-## WSL Support
-
-Zed supports opening folders inside of WSL natively on Windows.
-
-### Opening a local folder in WSL
-
-To open a local folder inside a WSL container, use the `projects: open in wsl` action and select the folder you want to open. You will be presented with a list of available WSL distributions to open the folder in.
-
-### Opening a folder already in WSL
-
-To open a folder that's already located inside of a WSL container, use the `projects: open wsl` action and select the WSL distribution. The distribution will be added to the `Remote Projects` window where you will be able to open the folder.
-
-## Port forwarding
-
-If you'd like to be able to connect to ports on your remote server from your local machine, you can configure port forwarding in your settings file. This is particularly useful for developing websites so you can load the site in your browser while working.
-
-```json [settings]
-{
-  "ssh_connections": [
-    {
-      "host": "192.168.1.10",
-      "port_forwards": [{ "local_port": 8080, "remote_port": 80 }]
-    }
-  ]
-}
-```
-
-This will cause requests from your local machine to `localhost:8080` to be forwarded to the remote machine's port 80. Under the hood this uses the `-L` argument to ssh.
-
-By default these ports are bound to localhost, so other computers in the same network as your development machine cannot access them. You can set the local_host to bind to a different interface, for example, 0.0.0.0 will bind to all local interfaces.
-
-```json [settings]
-{
-  "ssh_connections": [
-    {
-      "host": "192.168.1.10",
-      "port_forwards": [
-        {
-          "local_port": 8080,
-          "remote_port": 80,
-          "local_host": "0.0.0.0"
-        }
-      ]
-    }
-  ]
-}
-```
-
-These ports also default to the `localhost` interface on the remote host. If you need to change this, you can also set the remote host:
-
-```json [settings]
-{
-  "ssh_connections": [
-    {
-      "host": "192.168.1.10",
-      "port_forwards": [
-        {
-          "local_port": 8080,
-          "remote_port": 80,
-          "remote_host": "docker-host"
-        }
-      ]
-    }
-  ]
-}
-```
-
-## Zed settings
-
-When opening a remote project there are three relevant settings locations:
-
-- The local Zed settings (in `~/.zed/settings.json` on macOS or `~/.config/zed/settings.json` on Linux) on your local machine.
-- The server Zed settings (in the same place) on the remote server.
-- The project settings (in `.zed/settings.json` or `.editorconfig` of your project)
-
-Both the local Zed and the server Zed read the project settings, but they are not aware of the other's main `settings.json`.
-
-Which settings file you should use depends on the kind of setting you want to make:
-
-- Project settings should be used for things that affect the project: indentation settings, which formatter / language server to use, etc.
-- Server settings should be used for things that affect the server: paths to language servers, proxy settings, etc.
-- Local settings should be used for things that affect the UI: font size, etc.
-
-In addition any extensions you have installed locally will be propagated to the remote server. This means that language servers, etc. will run correctly.
-
-## Proxy Configuration
-
-The remote server will not use your local machine's proxy configuration because they may be under different network policies. If your remote server requires a proxy to access the internet, you must configure it on the remote server itself.
-
-In most cases, your remote server will already have proxy environment variables configured. Zed will automatically use them when downloading language servers, communicating with LLM models, etc.
-
-If needed, you can set these environment variables in the server's shell configuration (e.g., `~/.bashrc`):
-
-```bash
-export http_proxy="http://proxy.example.com:8080"
-export https_proxy="http://proxy.example.com:8080"
-export no_proxy="localhost,127.0.0.1"
-```
-
-Alternatively, you can configure the proxy in the remote machine's `~/.config/zed/settings.json` (Linux) or `~/.zed/settings.json` (macOS):
-
-```json
-{
-  "proxy": "http://proxy.example.com:8080"
-}
-```
-
-See the [proxy documentation](./configuring-zed.md#network-proxy) for supported proxy types and additional configuration options.
-
-## Initializing the remote server
-
-Once you provide the SSH options, Zed shells out to `ssh` on your local machine to create a ControlMaster connection with the options you provide.
-
-Any prompts that SSH needs will be shown in the UI, so you can verify host keys, type key passwords, etc.
-
-Once the master connection is established, Zed will check to see if the remote server binary is present in `~/.zed_server` on the remote, and that its version matches the current version of Zed that you're using.
-
-If it is not there or the version mismatches, Zed will try to download the latest version. By default, it will download from `https://zed.dev` directly, but if you set: `{"upload_binary_over_ssh":true}` in your settings for that server, it will download the binary to your local machine and then upload it to the remote server.
-
-If you'd like to maintain the server binary yourself you can. You can either download our prebuilt versions from [GitHub](https://github.com/zed-industries/zed/releases), or [build your own](https://zed.dev/docs/development) with `cargo build -p remote_server --release`. If you do this, you must upload it to `~/.zed_server/zed-remote-server-{RELEASE_CHANNEL}-{VERSION}` on the server, for example `~/.zed_server/zed-remote-server-stable-0.181.6`. The version must exactly match the version of Zed itself you are using.
-
-## Maintaining the SSH connection
-
-Once the server is initialized. Zed will create new SSH connections (reusing the existing ControlMaster) to run the remote development server.
-
-Each connection tries to run the development server in proxy mode. This mode will start the daemon if it is not running, and reconnect to it if it is. This way when your connection drops and is restarted, you can continue to work without interruption.
-
-In the case that reconnecting fails, the daemon will not be re-used. That said, unsaved changes are by default persisted locally, so that you do not lose work. You can always reconnect to the project at a later date and Zed will restore unsaved changes.
-
-If you are struggling with connection issues, you should be able to see more information in the Zed log `cmd-shift-p Open Log`. If you are seeing things that are unexpected, please file a [GitHub issue](https://github.com/zed-industries/zed/issues/new) or reach out in the #remoting-feedback channel in the [Zed Discord](https://zed.dev/community-links).
-
-## Supported SSH Options
-
-Under the hood, Zed shells out to the `ssh` binary to connect to the remote server. We create one SSH control master per project, and then use that to multiplex SSH connections for the Zed protocol itself, any terminals you open and tasks you run. We read settings from your SSH config file, but if you want to specify additional options to the SSH control master you can configure Zed to set them.
-
-When typing in the "Connect New Server" dialog, you can use bash-style quoting to pass options containing a space. Once you have created a server it will be added to the `"ssh_connections": []` array in your settings file. You can edit the settings file directly to make changes to SSH connections.
-
-Supported options:
-
-- `-p` / `-l` - these are equivalent to passing the port and the username in the host string.
-- `-L` / `-R` for port forwarding
-- `-i` - to use a specific key file
-- `-o` - to set custom options
-- `-J` / `-w` - to proxy the SSH connection
-- `-F` for specifying an `ssh_config`
-- And also... `-4`, `-6`, `-A`, `-B`, `-C`, `-D`, `-I`, `-K`, `-P`, `-X`, `-Y`, `-a`, `-b`, `-c`, `-i`, `-k`, `-l`, `-m`, `-o`, `-p`, `-w`, `-x`, `-y`
-
-Note that we deliberately disallow some options (for example `-t` or `-T`) that Zed will set for you.
-
-## Known Limitations
-
-- You can't open files from the remote Terminal by typing the `zed` command.
-
-## Feedback
-
-Please join the #remoting-feedback channel in the [Zed Discord](https://zed.dev/community-links).
diff --git a/docs/src/repl.md b/docs/src/repl.md
deleted file mode 100644
index 692093007c..0000000000
--- a/docs/src/repl.md
+++ /dev/null
@@ -1,183 +0,0 @@
-# REPL
-
-## Getting started
-
-Bring the power of [Jupyter kernels](https://docs.jupyter.org/en/latest/projects/kernels.html) to your editor! The built-in REPL for Zed allows you to run code interactively in your editor similarly to a notebook with your own text files.
-
-<figure style="width: 100%; margin: 0; overflow: hidden; border-top-left-radius: 2px; border-top-right-radius: 2px;">
-    <video loop controls playsinline>
-        <source
-            src="https://customer-snccc0j9v3kfzkif.cloudflarestream.com/aec66e79f23d6d1a0bee5e388a3f17cc/downloads/default.mp4"
-            type='video/webm; codecs="vp8.0, vorbis"'
-        />
-        <source
-            src="https://customer-snccc0j9v3kfzkif.cloudflarestream.com/aec66e79f23d6d1a0bee5e388a3f17cc/downloads/default.mp4"
-            type='video/mp4; codecs="avc1.4D401E, mp4a.40.2"'
-        />
-        <source
-          src="https://zed.dev/img/post/repl/typescript-deno-kernel-markdown.png"
-          type="image/png"
-        />
-    </video>
-</figure>
-
-## Installation
-
-Zed supports running code in multiple languages. To get started, you need to install a kernel for the language you want to use.
-
-**Currently supported languages:**
-
-- [Python (ipykernel)](#python)
-- [TypeScript (Deno)](#typescript-deno)
-- [R (Ark)](#r-ark)
-- [R (Xeus)](#r-xeus)
-- [Julia](#julia)
-- [Scala (Almond)](#scala)
-
-Once installed, you can start using the REPL in the respective language files, or other places those languages are supported, such as Markdown. If you recently added the kernels, run the `repl: refresh kernelspecs` command to make them available in the editor.
-
-## Using the REPL
-
-To start the REPL, open a file with the language you want to use and use the `repl: run` command (defaults to `ctrl-shift-enter` on macOS) to run a block, selection, or line. You can also click on the REPL icon in the toolbar.
-
-The `repl: run` command will be executed on your selection(s), and the result will be displayed below the selection.
-
-Outputs can be cleared with the `repl: clear outputs` command, or from the REPL menu in the toolbar.
-
-### Cell mode
-
-Zed supports [notebooks as scripts](https://jupytext.readthedocs.io/en/latest/formats-scripts.html) using the `# %%` cell separator in Python and `// %%` in TypeScript. This allows you to write code in a single file and run it as if it were a notebook, cell by cell.
-
-The `repl: run` command will run each block of code between the `# %%` markers as a separate cell.
-
-```python
-# %% Cell 1
-import time
-import numpy as np
-
-# %% Cell 2
-import matplotlib.pyplot as plt
-import matplotlib.pyplot as plt
-from matplotlib import style
-style.use('ggplot')
-```
-
-## Language specific instructions
-
-### Python {#python}
-
-#### Global environment
-
-<div class="warning">
-
-On macOS, your system Python will _not_ work. Either set up [pyenv](https://github.com/pyenv/pyenv?tab=readme-ov-file#installation) or use a virtual environment.
-
-</div>
-
-To setup your current Python to have an available kernel, run:
-
-```sh
-pip install ipykernel
-python -m ipykernel install --user
-```
-
-#### Conda Environment
-
-```sh
-source activate myenv
-conda install ipykernel
-python -m ipykernel install --user --name myenv --display-name "Python (myenv)"
-```
-
-#### Virtualenv with pip
-
-```sh
-source activate myenv
-pip install ipykernel
-python -m ipykernel install --user --name myenv --display-name "Python (myenv)"
-```
-
-### R (Ark Kernel) {#r-ark}
-
-Install [Ark](https://github.com/posit-dev/ark/releases) by downloading the release for your operating system. For example, for macOS just unpack `ark` binary and put it into `/usr/local/bin`. Then run:
-
-```sh
-ark --install
-```
-
-### R (Xeus Kernel) {#r-xeus}
-
-- Install [Xeus-R](https://github.com/jupyter-xeus/xeus-r)
-- Install the R Extension for Zed (search for `R` in Zed Extensions)
-
-<!--
-TBD: Improve R REPL (Ark Kernel) instructions
--->
-
-### TypeScript: Deno {#typescript-deno}
-
-- [Install Deno](https://docs.deno.com/runtime/manual/getting_started/installation/) and then install the Deno jupyter kernel:
-
-```sh
-deno jupyter --install
-```
-
-<!--
-TBD: Improve R REPL (Ark Kernel) instructions
--->
-
-### Julia
-
-- Download and install Julia from the [official website](https://julialang.org/downloads/).
-- Install the Julia Extension for Zed (search for `Julia` in Zed Extensions)
-
-<!--
-TBD: Improve Julia REPL instructions
--->
-
-### Scala
-
-- [Install Scala](https://www.scala-lang.org/download/) with `cs setup` (Coursier):
-  - `brew install coursier/formulas/coursier && cs setup`
-- REPL (Almond) [setup instructions](https://almond.sh/docs/quick-start-install):
-  - `brew install --cask temurin` (Eclipse foundation official OpenJDK binaries)
-  - `brew install coursier/formulas/coursier && cs setup`
-  - `coursier launch --use-bootstrap almond -- --install`
-
-## Changing which kernel is used per language {#changing-kernels}
-
-Zed automatically detects the available kernels on your system. If you need to configure a different default kernel for a
-language, you can assign a kernel for any supported language in your `settings.json`.
-
-```json [settings]
-{
-  "jupyter": {
-    "kernel_selections": {
-      "python": "conda-env",
-      "typescript": "deno",
-      "javascript": "deno",
-      "r": "ark"
-    }
-  }
-}
-```
-
-## Debugging Kernelspecs
-
-Available kernels are shown via the `repl: sessions` command. To refresh the kernels you can run, use the `repl: refresh kernelspecs` command.
-
-If you have `jupyter` installed, you can run `jupyter kernelspec list` to see the available kernels.
-
-```sh
-$ jupyter kernelspec list
-Available kernels:
-  ark                   /Users/z/Library/Jupyter/kernels/ark
-  conda-base            /Users/z/Library/Jupyter/kernels/conda-base
-  deno                  /Users/z/Library/Jupyter/kernels/deno
-  python-chatlab-dev    /Users/z/Library/Jupyter/kernels/python-chatlab-dev
-  python3               /Users/z/Library/Jupyter/kernels/python3
-  ruby                  /Users/z/Library/Jupyter/kernels/ruby
-  rust                  /Users/z/Library/Jupyter/kernels/rust
-```
-
-> Note: Zed makes best effort usage of `sys.prefix` and `CONDA_PREFIX` to find kernels in Python environments. If you want explicitly control run `python -m ipykernel install --user --name myenv --display-name "Python (myenv)"` to install the kernel directly while in the environment.
diff --git a/docs/src/snippets.md b/docs/src/snippets.md
deleted file mode 100644
index e84210d0fa..0000000000
--- a/docs/src/snippets.md
+++ /dev/null
@@ -1,59 +0,0 @@
-# Snippets
-
-Use the {#action snippets::ConfigureSnippets} action to create a new snippets file or edit an existing snippets file for a specified [scope](#scopes).
-
-The snippets are located in `~/.config/zed/snippets` directory to which you can navigate to with the {#action snippets::OpenFolder} action.
-
-## Example configuration
-
-```json [settings]
-{
-  // Each snippet must have a name and body, but the prefix and description are optional.
-  // The prefix is used to trigger the snippet, but when omitted then the name is used.
-  // Use placeholders like $1, $2 or ${1:defaultValue} to define tab stops.
-  // The $0 determines the final cursor position.
-  // Placeholders with the same value are linked.
-  "Log to console": {
-    "prefix": "log",
-    "body": ["console.info(\"Hello, ${1:World}!\")", "$0"],
-    "description": "Logs to console"
-  }
-}
-```
-
-## Scopes
-
-The scope is determined by the language name in lowercase e.g. `python.json` for Python, `shell script.json` for Shell Script, but there are some exceptions to this rule:
-
-| Scope      | Filename        |
-| ---------- | --------------- |
-| Global     | snippets.json   |
-| JSX        | javascript.json |
-| Plain Text | plaintext.json  |
-
-To create JSX snippets you have to use `javascript.json` snippets file, instead of `jsx.json`, but this does not apply to TSX and TypeScript which follow the above rule.
-
-## Known Limitations
-
-- Only the first prefix is used when a list of prefixes is passed in.
-- Currently only the `json` snippet file format is supported, even though the `simple-completion-language-server` supports both `json` and `toml` file formats.
-
-## See also
-
-The `feature_paths` option in `simple-completion-language-server` is disabled by default.
-
-If you want to enable it you can add the following to your `settings.json`:
-
-```json [settings]
-{
-  "lsp": {
-    "snippet-completion-server": {
-      "settings": {
-        "feature_paths": true
-      }
-    }
-  }
-}
-```
-
-For more configuration information, see the [`simple-completion-language-server` instructions](https://github.com/zed-industries/simple-completion-language-server/tree/main).
diff --git a/docs/src/tab-switcher.md b/docs/src/tab-switcher.md
deleted file mode 100644
index 5cc72be449..0000000000
--- a/docs/src/tab-switcher.md
+++ /dev/null
@@ -1,46 +0,0 @@
-# Tab Switcher
-
-The Tab Switcher provides a quick way to navigate between open tabs in Zed. It
-displays a list of your open tabs sorted by recent usage, making it easy to jump
-back to whatever you were just working on.
-
-![Tab Switcher with multiple panes](https://zed.dev/img/features/tab-switcher.png)
-
-## Quick Switching
-
-When the Tab Switcher is opened using {#kb tab_switcher::Toggle}, instead of
-running the {#action tab_switcher::Toggle} from the command palette, it'll stay
-active as long as the <kbd class="keybinding">ctrl</kbd> key is held down.
-
-While holding down <kbd class="keybinding">ctrl</kbd>, each subsequent <kbd
-class="keybinding">tab</kbd> press cycles to the next item (<kbd
-class="keybinding">shift</kbd> to cycle backwards) and, when <kbd
-class="keybinding">ctrl</kbd> is released, the selected item is confirmed and
-the switcher is closed.
-
-## Opening the Tab Switcher
-
-The Tab Switcher can also be opened with either {#action tab_switcher::Toggle}
-or {#action tab_switcher::ToggleAll}. Using {#kb tab_switcher::Toggle} will show
-only the tabs for the current pane, while {#kb tab_switcher::ToggleAll} shows
-all tabs for all panes.
-
-While the Tab Switcher is open, you can:
-
-- Press {#kb menu::SelectNext} to move to the next tab in the list
-- Press {#kb menu::SelectPrevious} to move to the previous tab
-- Press <kbd class="keybinding">enter</kbd> to confirm the selected tab and close the switcher
-- Press <kbd class="keybinding">escape</kbd> to close the switcher and return to the original tab from which
-  the switcher was opened
-- Press {#kb tab_switcher::CloseSelectedItem} to close the currently selected tab
-
-As you navigate through the list, Zed will update the pane's active item to
-match the selected tab.
-
-## Action Reference
-
-| Action                                    | Description                                       |
-| ----------------------------------------- | ------------------------------------------------- |
-| {#action tab_switcher::Toggle}            | Open the Tab Switcher for the current pane        |
-| {#action tab_switcher::ToggleAll}         | Open the Tab Switcher showing tabs from all panes |
-| {#action tab_switcher::CloseSelectedItem} | Close the selected tab in the Tab Switcher        |
diff --git a/docs/src/tasks.md b/docs/src/tasks.md
deleted file mode 100644
index a11988d9a0..0000000000
--- a/docs/src/tasks.md
+++ /dev/null
@@ -1,243 +0,0 @@
-# Tasks
-
-Zed supports ways to spawn (and rerun) commands using its integrated terminal to output the results. These commands can read a limited subset of Zed state (such as a path to the file currently being edited or selected text).
-
-```json [tasks]
-[
-  {
-    "label": "Example task",
-    "command": "for i in {1..5}; do echo \"Hello $i/5\"; sleep 1; done",
-    //"args": [],
-    // Env overrides for the command, will be appended to the terminal's environment from the settings.
-    "env": { "foo": "bar" },
-    // Current working directory to spawn the command into, defaults to current project root.
-    //"cwd": "/path/to/working/directory",
-    // Whether to use a new terminal tab or reuse the existing one to spawn the process, defaults to `false`.
-    "use_new_terminal": false,
-    // Whether to allow multiple instances of the same task to be run, or rather wait for the existing ones to finish, defaults to `false`.
-    "allow_concurrent_runs": false,
-    // What to do with the terminal pane and tab, after the command was started:
-    // * `always` — always show the task's pane, and focus the corresponding tab in it (default)
-    // * `no_focus` — always show the task's pane, add the task's tab in it, but don't focus it
-    // * `never` — do not alter focus, but still add/reuse the task's tab in its pane
-    "reveal": "always",
-    // What to do with the terminal pane and tab, after the command has finished:
-    // * `never` — Do nothing when the command finishes (default)
-    // * `always` — always hide the terminal tab, hide the pane also if it was the last tab in it
-    // * `on_success` — hide the terminal tab on task success only, otherwise behaves similar to `always`
-    "hide": "never",
-    // Which shell to use when running a task inside the terminal.
-    // May take 3 values:
-    // 1. (default) Use the system's default terminal configuration in /etc/passwd
-    //      "shell": "system"
-    // 2. A program:
-    //      "shell": {
-    //        "program": "sh"
-    //      }
-    // 3. A program with arguments:
-    //     "shell": {
-    //         "with_arguments": {
-    //           "program": "/bin/bash",
-    //           "args": ["--login"]
-    //         }
-    //     }
-    "shell": "system",
-    // Whether to show the task line in the output of the spawned task, defaults to `true`.
-    "show_summary": true,
-    // Whether to show the command line in the output of the spawned task, defaults to `true`.
-    "show_command": true
-    // Represents the tags for inline runnable indicators, or spawning multiple tasks at once.
-    // "tags": []
-  }
-]
-```
-
-There are two actions that drive the workflow of using tasks: `task: spawn` and `task: rerun`.
-`task: spawn` opens a modal with all available tasks in the current file.
-`task: rerun` reruns the most recently spawned task. You can also rerun tasks from the task modal.
-
-By default, rerunning tasks reuses the same terminal (due to the `"use_new_terminal": false` default) but waits for the previous task to finish before starting (due to the `"allow_concurrent_runs": false` default).
-
-Keep `"use_new_terminal": false` and set `"allow_concurrent_runs": true` to allow cancelling previous tasks on rerun.
-
-## Task templates
-
-Tasks can be defined:
-
-- in the global `tasks.json` file; such tasks are available in all Zed projects you work on. This file is usually located in `~/.config/zed/tasks.json`. You can edit them by using the `zed: open tasks` action.
-- in the worktree-specific (local) `.zed/tasks.json` file; such tasks are available only when working on a project with that worktree included. You can edit worktree-specific tasks by using the `zed: open project tasks` action.
-- on the fly with [oneshot tasks](#oneshot-tasks). These tasks are project-specific and do not persist across sessions.
-- by language extension.
-
-## Variables
-
-Zed tasks act just like your shell; that also means that you can reference environmental variables via sh-esque `$VAR_NAME` syntax. A couple of additional environmental variables are set for your convenience.
-These variables allow you to pull information from the current editor and use it in your tasks. The following variables are available:
-
-- `ZED_COLUMN`: current line column
-- `ZED_ROW`: current line row
-- `ZED_FILE`: absolute path of the currently opened file (e.g. `/Users/my-user/path/to/project/src/main.rs`)
-- `ZED_FILENAME`: filename of the currently opened file (e.g. `main.rs`)
-- `ZED_DIRNAME`: absolute path of the currently opened file with file name stripped (e.g. `/Users/my-user/path/to/project/src`)
-- `ZED_RELATIVE_FILE`: path of the currently opened file, relative to `ZED_WORKTREE_ROOT` (e.g. `src/main.rs`)
-- `ZED_RELATIVE_DIR`: path of the currently opened file's directory, relative to `ZED_WORKTREE_ROOT` (e.g. `src`)
-- `ZED_STEM`: stem (filename without extension) of the currently opened file (e.g. `main`)
-- `ZED_SYMBOL`: currently selected symbol; should match the last symbol shown in a symbol breadcrumb (e.g. `mod tests > fn test_task_contexts`)
-- `ZED_SELECTED_TEXT`: currently selected text
-- `ZED_WORKTREE_ROOT`: absolute path to the root of the current worktree. (e.g. `/Users/my-user/path/to/project`)
-- `ZED_CUSTOM_RUST_PACKAGE`: (Rust-specific) name of the parent package of $ZED_FILE source file.
-
-To use a variable in a task, prefix it with a dollar sign (`$`):
-
-```json [settings]
-{
-  "label": "echo current file's path",
-  "command": "echo $ZED_FILE"
-}
-```
-
-You can also use verbose syntax that allows specifying a default if a given variable is not available: `${ZED_FILE:default_value}`
-
-These environmental variables can also be used in tasks' `cwd`, `args`, and `label` fields.
-
-### Variable Quoting
-
-When working with paths containing spaces or other special characters, please ensure variables are properly escaped.
-
-For example, instead of this (which will fail if the path has a space):
-
-```json [settings]
-{
-  "label": "stat current file",
-  "command": "stat $ZED_FILE"
-}
-```
-
-Provide the following:
-
-```json [settings]
-{
-  "label": "stat current file",
-  "command": "stat",
-  "args": ["$ZED_FILE"]
-}
-```
-
-Or explicitly include escaped quotes like so:
-
-```json [settings]
-{
-  "label": "stat current file",
-  "command": "stat \"$ZED_FILE\""
-}
-```
-
-### Task filtering based on variables
-
-Task definitions with variables which are not present at the moment the task list is determined are filtered out.
-For example, the following task will appear in the spawn modal only if there is a text selection:
-
-```json [settings]
-{
-  "label": "selected text",
-  "command": "echo \"$ZED_SELECTED_TEXT\""
-}
-```
-
-Set default values to such variables to have such tasks always displayed:
-
-```json [settings]
-{
-  "label": "selected text with default",
-  "command": "echo \"${ZED_SELECTED_TEXT:no text selected}\""
-}
-```
-
-## Oneshot tasks
-
-The same task modal opened via `task: spawn` supports arbitrary bash-like command execution: type a command inside the modal text field, and use `opt-enter` to spawn it.
-
-The task modal persists these ad-hoc commands for the duration of the session, `task: rerun` will also rerun such tasks if they were the last ones spawned.
-
-You can also adjust the currently selected task in a modal (`tab` is the default key binding). Doing so will put its command into a prompt that can then be edited & spawned as a oneshot task.
-
-### Ephemeral tasks
-
-You can use the `cmd` modifier when spawning a task via a modal; tasks spawned this way will not have their usage count increased (thus, they will not be respawned with `task: rerun` and they won't have a high rank in the task modal).
-The intended use of ephemeral tasks is to stay in the flow with continuous `task: rerun` usage.
-
-### More task rerun control
-
-By default, tasks capture their variables into a context once, and this "resolved task" is being rerun always.
-
-This can be controlled with the `"reevaluate_context"` argument to the task: setting it to `true` will force the task to be reevaluated before each run.
-
-```json [keymap]
-{
-  "context": "Workspace",
-  "bindings": {
-    "alt-t": ["task::Rerun", { "reevaluate_context": true }]
-  }
-}
-```
-
-## Custom keybindings for tasks
-
-You can define your own keybindings for your tasks via an additional argument to `task::Spawn`. If you wanted to bind the aforementioned `echo current file's path` task to `alt-g`, you would add the following snippet in your [`keymap.json`](./key-bindings.md) file:
-
-```json [keymap]
-{
-  "context": "Workspace",
-  "bindings": {
-    "alt-g": ["task::Spawn", { "task_name": "echo current file's path" }]
-  }
-}
-```
-
-Note that these tasks can also have a 'target' specified to control where the spawned task should show up.
-This could be useful for launching a terminal application that you want to use in the center area:
-
-```json [tasks]
-// In tasks.json
-{
-  "label": "start lazygit",
-  "command": "lazygit -p $ZED_WORKTREE_ROOT"
-}
-```
-
-```json [keymap]
-// In keymap.json
-{
-  "context": "Workspace",
-  "bindings": {
-    "alt-g": [
-      "task::Spawn",
-      { "task_name": "start lazygit", "reveal_target": "center" }
-    ]
-  }
-}
-```
-
-## Binding runnable tags to task templates
-
-Zed supports overriding the default action for inline runnable indicators via workspace-local and global `tasks.json` file with the following precedence hierarchy:
-
-1. Workspace `tasks.json`
-2. Global `tasks.json`
-3. Language-provided tag bindings (default).
-
-To tag a task, add the runnable tag name to the `tags` field on the task template:
-
-```json [settings]
-{
-  "label": "echo current file's path",
-  "command": "echo $ZED_FILE",
-  "tags": ["rust-test"]
-}
-```
-
-In doing so, you can change which task is shown in the runnables indicator.
-
-## Keybindings to run tasks bound to runnables
-
-When you have a task definition that is bound to the runnable, you can quickly run it using [Code Actions](https://zed.dev/docs/configuring-languages?#code-actions) that you can trigger either via `editor: Toggle Code Actions` command or by the `cmd-.`/`ctrl-.` shortcut. Your task will be the first in the dropdown. The task will run immediately if there are no additional Code Actions for this line.
diff --git a/docs/src/telemetry.md b/docs/src/telemetry.md
deleted file mode 100644
index 8dca8c1ee6..0000000000
--- a/docs/src/telemetry.md
+++ /dev/null
@@ -1,61 +0,0 @@
-# Telemetry in Zed
-
-Zed collects anonymous telemetry data to help the team understand how people are using the application and to see what sort of issues they are experiencing.
-
-## Configuring Telemetry Settings
-
-You have full control over what data is sent out by Zed.
-To enable or disable some or all telemetry types, open your `settings.json` file via {#action zed::OpenSettings}({#kb zed::OpenSettings}) from the command palette.
-
-Insert and tweak the following:
-
-```json [settings]
-"telemetry": {
-    "diagnostics": false,
-    "metrics": false
-},
-```
-
-## Dataflow
-
-Telemetry is sent from the application to our servers. Data is proxied through our servers to enable us to easily switch analytics services. We currently use:
-
-- [Sentry](https://sentry.io): Crash-monitoring service - stores diagnostic events
-- [Snowflake](https://snowflake.com): Data warehouse - stores both diagnostic and metric events
-- [Hex](https://www.hex.tech): Dashboards and data exploration - accesses data stored in Snowflake
-- [Amplitude](https://www.amplitude.com): Dashboards and data exploration - accesses data stored in Snowflake
-
-## Types of Telemetry
-
-### Diagnostics
-
-Crash reports consist of a [minidump](https://learn.microsoft.com/en-us/windows/win32/debug/minidump-files) and some extra debug information. Reports are sent on the first application launch after the crash occurred. We've built dashboards that allow us to visualize the frequency and severity of issues experienced by users. Having these reports sent automatically allows us to begin implementing fixes without the user needing to file a report in our issue tracker. The plots in the dashboards also give us an informal measurement of the stability of Zed.
-
-You can see what extra data is sent alongside the minidump in the `Panic` struct in [crates/telemetry_events/src/telemetry_events.rs](https://github.com/zed-industries/zed/blob/main/crates/telemetry_events/src/telemetry_events.rs) in the Zed repo. You can find additional information in the [Debugging Crashes](./development/debugging-crashes.md) documentation.
-
-### Client-Side Usage Data {#client-metrics}
-
-To improve Zed and understand how it is being used in the wild, Zed optionally collects usage data like the following:
-
-- (a) file extensions of opened files;
-- (b) features and tools You use within the Editor;
-- (c) project statistics (e.g., number of files); and
-- (d) frameworks detected in Your projects
-
-Usage Data does not include any of Your software code or sensitive project details. Metric events are reported over HTTPS, and requests are rate-limited to avoid using significant network bandwidth.
-
-Usage Data is associated with a secure random telemetry ID which may be linked to Your email address. This linkage currently serves two purposes: (1) it allows Zed to analyze usage patterns over time while maintaining Your privacy; and (2) it enables Zed to reach out to specific user groups for feedback and improvement suggestions.
-
-You can audit the metrics data that Zed has reported by running the command {#action zed::OpenTelemetryLog} from the command palette, or clicking `Help > View Telemetry Log` in the application menu.
-
-You can see the full list of the event types and exactly the data sent for each by inspecting the `Event` enum and the associated structs in [crates/telemetry_events/src/telemetry_events.rs](https://github.com/zed-industries/zed/blob/main/crates/telemetry_events/src/telemetry_events.rs) in the Zed repository.
-
-### Server-Side Usage Data {#metrics}
-
-When using Zed's hosted services, we may collect, generate, and Process data to allow us to support users and improve our hosted offering. Examples include metadata around rate limiting and billing metrics/token usage. Zed does not persistently store user content or use user content to evaluate and/or improve our AI features, unless it is explicitly shared with Zed, and we have a zero-data retention agreement with Anthropic.
-
-You can see more about our stance on data collection (and that any prompt data shared with Zed is explicitly opt-in) at [AI Improvement](./ai/ai-improvement.md).
-
-## Concerns and Questions
-
-If you have concerns about telemetry, please feel free to [open an issue](https://github.com/zed-industries/zed/issues/new/choose).
diff --git a/docs/src/themes.md b/docs/src/themes.md
deleted file mode 100644
index 615cd2c7b3..0000000000
--- a/docs/src/themes.md
+++ /dev/null
@@ -1,82 +0,0 @@
-# Themes
-
-Zed comes with a number of built-in themes, with more themes available as extensions.
-
-## Selecting a Theme
-
-See what themes are installed and preview them via the Theme Selector, which you can open from the command palette with `theme selector: toggle` (bound to {#kb theme_selector::Toggle}).
-
-Navigating through the theme list by moving up and down will change the theme in real time and hitting enter will save it to your settings file.
-
-## Installing more Themes
-
-More themes are available from the Extensions page, which you can access via the command palette with `zed: extensions` or the [Zed website](https://zed.dev/extensions?filter=themes).
-
-Many popular themes have been ported to Zed, and if you're struggling to choose one, visit [zed-themes.com](https://zed-themes.com), a third-party gallery with visible previews for many of them.
-
-## Configuring a Theme
-
-Your selected theme is stored in your settings file.
-You can open your settings file from the command palette with {#action zed::OpenSettingsFile} (bound to {#kb zed::OpenSettingsFile}).
-
-By default, Zed maintains two themes: one for light mode and one for dark mode.
-You can set the mode to `"dark"` or `"light"` to ignore the current system mode.
-
-```json [settings]
-{
-  "theme": {
-    "mode": "system",
-    "light": "One Light",
-    "dark": "One Dark"
-  }
-}
-```
-
-## Theme Overrides
-
-To override specific attributes of a theme, use the `theme_overrides` setting.
-This setting can be used to configure theme-specific overrides.
-
-For example, add the following to your `settings.json` if you wish to override the background color of the editor and display comments and doc comments as italics:
-
-```json [settings]
-{
-  "theme_overrides": {
-    "One Dark": {
-      "editor.background": "#333",
-      "syntax": {
-        "comment": {
-          "font_style": "italic"
-        },
-        "comment.doc": {
-          "font_style": "italic"
-        }
-      },
-      "accents": [
-        "#ff0000",
-        "#ff7f00",
-        "#ffff00",
-        "#00ff00",
-        "#0000ff",
-        "#8b00ff"
-      ]
-    }
-  }
-}
-```
-
-To see a comprehensive list of list of captures (like `comment` and `comment.doc`) see [Language Extensions: Syntax highlighting](./extensions/languages.md#syntax-highlighting).
-
-To see a list of available theme attributes look at the JSON file for your theme.
-For example, [assets/themes/one/one.json](https://github.com/zed-industries/zed/blob/main/assets/themes/one/one.json) for the default One Dark and One Light themes.
-
-## Local Themes
-
-Store new themes locally by placing them in the `~/.config/zed/themes` directory (macOS and Linux) or `%USERPROFILE%\AppData\Roaming\Zed\themes\` (Windows).
-
-For example, to create a new theme called `my-cool-theme`, create a file called `my-cool-theme.json` in that directory.
-It will be available in the theme selector the next time Zed loads.
-
-## Theme Development
-
-See: [Developing Zed Themes](./extensions/themes.md)
diff --git a/docs/src/toolchains.md b/docs/src/toolchains.md
deleted file mode 100644
index f9f5f3fe0e..0000000000
--- a/docs/src/toolchains.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# Toolchains
-
-Zed projects offer a dedicated UI for toolchain selection, which lets you pick a set of tools for working with a given language in a current project.
-
-Imagine you're working with Python project, which has virtual environments that encapsulate a set of dependencies of your project along with a suitable interpreter to run it with. The language server has to know which virtual environment you're working with, as it uses it to understand your project's code.
-With toolchain selector, you don't need to spend time configuring your language server to point it at the right virtual environment directory—you can just select the right virtual environment (toolchain) from a dropdown.
-
-You can even select different toolchains for different subprojects within your Zed project. A definition of a subproject is language-specific.
-In collaborative scenarios, only the project owner can see and modify an active toolchain.
-
-In [remote projects](./remote-development.md), you can use the toolchain selector to control the active toolchain on the SSH host. When [sharing your project](./collaboration/overview.md), the toolchain selector is not available to guests.
-
-## Why do we need toolchains?
-
-The active toolchain is relevant for launching language servers, which may need it to function properly—it may not be able to resolve dependencies, which in turn may make functionalities like "Go to definition" or "Code completions" unavailable.
-
-The active toolchain is also relevant when launching a shell in the terminal panel: some toolchains provide "activation scripts" for shells, which make those toolchains available in the shell environment for your convenience. Zed will run these activation scripts automatically when you create a new terminal.
-
-This also applies to [tasks](./tasks.md)—Zed tasks behave "as if" you opened a new terminal tab and ran a given task invocation yourself, which in turn means that Zed task execution is affected by the active toolchain and its activation script.
-
-## Selecting toolchains
-
-The active toolchain (if there is one) is displayed in the status bar (on the right hand side). Click on it to access the toolchain selector—you can also use an action from a command palette ({#action toolchain::Select}).
-
-Zed will automatically infer a set of toolchains to choose from based on the project you're working with. A default will also be selected on your behalf on a best-effort basis when you open a project for the first time.
-
-The toolchain selection applies to a current subproject, which—depending on the structure of your Zed project—might be your whole project or just a subset of it. For example, if you have a monorepo with multiple subprojects, you might want to select a different toolchain for each subproject.
-
-## Adding toolchains manually
-
-If automatic detection does not suffice for you, you can add toolchains manually. To do that, click on the "Add toolchain" button in the toolchain selector. From there you can provide a path to a toolchain and set a name of your liking for it.
diff --git a/docs/src/troubleshooting.md b/docs/src/troubleshooting.md
deleted file mode 100644
index 4aeeda6e3d..0000000000
--- a/docs/src/troubleshooting.md
+++ /dev/null
@@ -1,80 +0,0 @@
-# Troubleshooting
-
-This guide covers common troubleshooting techniques for Zed.
-Sometimes you'll be able to identify and resolve issues on your own using this information.
-Other times, troubleshooting means gathering the right information—logs, profiles, or reproduction steps—to help us diagnose and fix the problem.
-
-> **Note**: To open the command palette, use `cmd-shift-p` on macOS or `ctrl-shift-p` on Windows / Linux.
-
-## Retrieve Zed and System Information
-
-When reporting issues or seeking help, it's useful to know your Zed version and system specifications. You can retrieve this information using the following actions from the command palette:
-
-- {#action zed::About}: Find your Zed version number
-- {#action zed::CopySystemSpecsIntoClipboard}: Populate your clipboard with Zed version number, operating system version, and hardware specs
-
-## Zed Log
-
-Often, a good first place to look when troubleshooting any issue in Zed is the Zed log, which might contain clues about what's going wrong.
-You can review the most recent 1000 lines of the log by running the {#action zed::OpenLog} action from the command palette.
-If you want to view the full file, you can reveal it in your operating system's native file manager via {#action zed::RevealLogInFileManager} from the command palette.
-
-You'll find the Zed log in the respective location on each operating system:
-
-- macOS: `~/Library/Logs/Zed/Zed.log`
-- Windows: `C:\Users\YOU\AppData\Local\Zed\logs\Zed.log`
-- Linux: `~/.local/share/zed/logs/Zed.log` or `$XDG_DATA_HOME`
-
-> Note: In some cases, it might be useful to monitor the log live, such as when [developing a Zed extension](https://zed.dev/docs/extensions/developing-extensions).
-> Example: `tail -f ~/Library/Logs/Zed/Zed.log`
-
-The log may contain enough context to help you debug the issue yourself, or you may find specific errors that are useful when filing a [GitHub issue](https://github.com/zed-industries/zed/issues/new/choose) or when talking to Zed staff in our [Discord server](https://zed.dev/community-links#forums-and-discussions).
-
-## Performance Issues (Profiling)
-
-If you're running into performance issues in Zed—such as hitches, hangs, or general unresponsiveness—having a performance profile attached to your issue will help us zero in on what is getting stuck, so we can fix it.
-
-### macOS
-
-Xcode Instruments (which comes bundled with your [Xcode](https://apps.apple.com/us/app/xcode/id497799835) download) is the standard tool for profiling on macOS.
-
-1. With Zed running, open Instruments
-1. Select `Time Profiler` as the profiling template
-1. In the `Time Profiler` configuration, set the target to the running Zed process
-1. Start recording
-1. If the performance issue occurs when performing a specific action in Zed, perform that action now
-1. Stop recording
-1. Save the trace file
-1. Compress the trace file into a zip archive
-1. File a [GitHub issue](https://github.com/zed-industries/zed/issues/new/choose) with the trace zip attached
-
-<!--### Windows-->
-
-<!--### Linux-->
-
-## Startup and Workspace Issues
-
-Zed creates local SQLite databases to persist data relating to its workspace and your projects. These databases store, for instance, the tabs and panes you have open in a project, the scroll position of each open file, the list of all projects you've opened (for the recent projects modal picker), etc. You can find and explore these databases in the following locations:
-
-- macOS: `~/Library/Application Support/Zed/db`
-- Linux and FreeBSD: `~/.local/share/zed/db` (or within `XDG_DATA_HOME` or `FLATPAK_XDG_DATA_HOME`)
-- Windows: `%LOCALAPPDATA%\Zed\db`
-
-The naming convention of these databases takes on the form of `0-<zed_channel>`:
-
-- Stable: `0-stable`
-- Preview: `0-preview`
-- Nightly: `0-nightly`
-- Dev: `0-dev`
-
-While rare, we've seen a few cases where workspace databases became corrupted, which prevented Zed from starting.
-If you're experiencing startup issues, you can test whether it's workspace-related by temporarily moving the database from its location, then trying to start Zed again.
-
-> **Note**: Moving the workspace database will cause Zed to create a fresh one.
-> Your recent projects, open tabs, etc. will be reset to "factory".
-
-If your issue persists after regenerating the database, please [file an issue](https://github.com/zed-industries/zed/issues/new/choose).
-
-## Language Server Issues
-
-If you're experiencing language-server related issues, such as stale diagnostics or issues jumping to definitions, restarting the language server via {#action editor::RestartLanguageServer} from the command palette will often resolve the issue.
diff --git a/docs/src/uninstall.md b/docs/src/uninstall.md
deleted file mode 100644
index c1f71a6609..0000000000
--- a/docs/src/uninstall.md
+++ /dev/null
@@ -1,113 +0,0 @@
-# Uninstall
-
-This guide covers how to uninstall Zed on different operating systems.
-
-## macOS
-
-### Standard Installation
-
-If you installed Zed by downloading it from the website:
-
-1. Quit Zed if it's running
-2. Open Finder and go to your Applications folder
-3. Drag Zed to the Trash (or right-click and select "Move to Trash")
-4. Empty the Trash
-
-### Homebrew Installation
-
-If you installed Zed using Homebrew, use the following command:
-
-```sh
-brew uninstall --cask zed
-```
-
-Or for the preview version:
-
-```sh
-brew uninstall --cask zed@preview
-```
-
-### Removing User Data (Optional)
-
-To completely remove all Zed configuration files and data:
-
-1. Open Finder
-2. Press `Cmd + Shift + G` to open "Go to Folder"
-3. Delete the following directories if they exist:
-   - `~/Library/Application Support/Zed`
-   - `~/Library/Saved Application State/dev.zed.Zed.savedState`
-   - `~/Library/Logs/Zed`
-   - `~/Library/Caches/dev.zed.Zed`
-
-## Linux
-
-### Standard Uninstall
-
-If Zed was installed using the default installation script, run:
-
-```sh
-zed --uninstall
-```
-
-You'll be prompted whether to keep or delete your preferences. After making a choice, you should see a message that Zed was successfully uninstalled.
-
-If the `zed` command is not found in your PATH, try:
-
-```sh
-$HOME/.local/bin/zed --uninstall
-```
-
-or:
-
-```sh
-$HOME/.local/zed.app/bin/zed --uninstall
-```
-
-### Package Manager
-
-If you installed Zed using a package manager (such as Flatpak, Snap, or a distribution-specific package manager), consult that package manager's documentation for uninstallation instructions.
-
-### Manual Removal
-
-If the uninstall command fails or Zed was installed to a custom location, you can manually remove:
-
-- Installation directory: `~/.local/zed.app` (or your custom installation path)
-- Binary symlink: `~/.local/bin/zed`
-- Configuration and data: `~/.config/zed`
-
-## Windows
-
-### Standard Installation
-
-1. Quit Zed if it's running
-2. Open Settings (Windows key + I)
-3. Go to "Apps" > "Installed apps" (or "Apps & features" on Windows 10)
-4. Search for "Zed"
-5. Click the three dots menu next to Zed and select "Uninstall"
-6. Follow the prompts to complete the uninstallation
-
-Alternatively, you can:
-
-1. Open the Start menu
-2. Right-click on Zed
-3. Select "Uninstall"
-
-### Removing User Data (Optional)
-
-To completely remove all Zed configuration files and data:
-
-1. Press `Windows key + R` to open Run
-2. Type `%APPDATA%` and press Enter
-3. Delete the `Zed` folder if it exists
-4. Press `Windows key + R` again, type `%LOCALAPPDATA%` and press Enter
-5. Delete the `Zed` folder if it exists
-
-## Troubleshooting
-
-If you encounter issues during uninstallation:
-
-- **macOS/Windows**: Ensure Zed is completely quit before attempting to uninstall. Check Activity Manager (macOS) or Task Manager (Windows) for any running Zed processes.
-- **Linux**: If the uninstall script fails, check the error message and consider manual removal of the directories listed above.
-- **All platforms**: If you want to start fresh while keeping Zed installed, you can delete the configuration directories instead of uninstalling the application entirely.
-
-For additional help, see our [Linux-specific documentation](./linux.md) or visit the [Zed community](https://zed.dev/community-links).
diff --git a/docs/src/update.md b/docs/src/update.md
deleted file mode 100644
index d828e5edf0..0000000000
--- a/docs/src/update.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# Update Zed
-
-Zed is designed to keep itself up to date automatically. You can always update this behavior in your settings.
-
-## Auto-updates
-
-By default, Zed checks for updates and installs them automatically the next time you restart the app. You’ll always be running the latest version with no extra steps.
-
-If an update is available, Zed will download it in the background and apply it on restart.
-
-## How to check your current version
-
-To check which version of Zed you're using:
-
-Open the Command Palette (Cmd+Shift+P on macOS, Ctrl+Shift+P on Linux/Windows).
-
-Type and select `zed: about`. A modal will appear with your version information.
-
-## How to control update behavior
-
-If you want to turn off auto-updates, open the Settings Editor (Cmd ,) and find `Auto Update` under General Settings.
diff --git a/docs/src/vim.md b/docs/src/vim.md
deleted file mode 100644
index c9a0cd09f2..0000000000
--- a/docs/src/vim.md
+++ /dev/null
@@ -1,655 +0,0 @@
-# Vim Mode
-
-Zed includes a Vim emulation layer known as "vim mode". On this page, you will learn how to turn Zed's vim mode on or off, what tools and commands Zed provides to help you navigate and edit your code, and generally how to make the most of vim mode in Zed.
-
-You'll learn how to:
-
-- Understand the core differences between Zed's vim mode and traditional Vim
-- Enable or disable vim mode
-- Make the most of Zed-specific features within vim mode
-- Customize vim mode key bindings
-- Configure vim mode settings
-
-Whether you're new to vim mode or an experienced Vim user looking to optimize your Zed experience, this guide will help you harness the full power of modal editing in Zed.
-
-## Zed's vim mode design
-
-Vim mode tries to offer a familiar experience to Vim users: it replicates the behavior of motions and commands precisely when it makes sense and uses Zed-specific functionality to provide an editing experience that "just works" without requiring configuration on your part.
-
-This includes support for semantic navigation, multiple cursors, or other features usually provided by plugins like surrounding text.
-
-So, Zed's vim mode does not replicate Vim one-to-one, but it meshes Vim's modal design with Zed's modern features to provide a more fluid experience. It's also configurable, so you can add your own key bindings or override the defaults.
-
-### Core differences
-
-There are four types of features in vim mode that use Zed's core functionality, leading to some differences in behavior:
-
-1. **Motions**: vim mode uses Zed's semantic parsing to tune the behavior of motions per language. For example, in Rust, jumping to matching bracket with `%` works with the pipe character `|`. In JavaScript, `w` considers `$` to be a word character.
-2. **Visual block selections**: vim mode uses Zed's multiple cursor to emulate visual block selections, making block selections a lot more flexible. For example, anything you insert after a block selection updates on every line in real-time, and you can add or remove cursors anytime.
-3. **Macros**: vim mode uses Zed's recording system for vim macros. So, you can capture and replay more complex actions, like autocompletion.
-4. **Search and replace**: vim mode uses Zed's search system, so, the syntax for regular expressions is slightly different compared to Vim. [Head to the Regex differences section](#regex-differences) for details.
-
-> **Note:** The foundations of Zed's vim mode should already cover many use cases, and we're always looking to improve it. If you find missing features that you rely on in your workflow, please [file an issue on GitHub](https://github.com/zed-industries/zed/issues).
-
-## Enabling and disabling vim mode
-
-When you first open Zed, you'll see a checkbox on the welcome screen that allows you to enable vim mode.
-
-If you missed this, you can toggle vim mode on or off anytime by opening the command palette and using the workspace command `toggle vim mode`.
-
-> **Note**: This command toggles the following property in your user settings:
->
-> ```json [settings]
-> {
->   "vim_mode": true
-> }
-> ```
-
-## Zed-specific features
-
-Zed is built on a modern foundation that (among other things) uses Tree-sitter and language servers to understand the content of the file you're editing and supports multiple cursors out of the box.
-
-Vim mode has several "core Zed" key bindings that will help you make the most of Zed's specific feature set.
-
-### Language server
-
-The following commands use the language server to help you navigate and refactor your code.
-
-| Command                                  | Default Shortcut |
-| ---------------------------------------- | ---------------- |
-| Go to definition                         | `g d`            |
-| Go to declaration                        | `g D`            |
-| Go to type definition                    | `g y`            |
-| Go to implementation                     | `g I`            |
-| Rename (change definition)               | `c d`            |
-| Go to All references to the current word | `g A`            |
-| Find symbol in current file              | `g s`            |
-| Find symbol in entire project            | `g S`            |
-| Go to next diagnostic                    | `g ]` or `] d`   |
-| Go to previous diagnostic                | `g [` or `[ d`   |
-| Show inline error (hover)                | `g h`            |
-| Open the code actions menu               | `g .`            |
-
-### Git
-
-| Command                         | Default Shortcut |
-| ------------------------------- | ---------------- |
-| Go to next git change           | `] c`            |
-| Go to previous git change       | `[ c`            |
-| Expand diff hunk                | `d o`            |
-| Toggle staged                   | `d O`            |
-| Stage and next (in diff view)   | `d u`            |
-| Unstage and next (in diff view) | `d U`            |
-| Restore change                  | `d p`            |
-
-### Tree-sitter
-
-Tree-sitter is a powerful tool that Zed uses to understand the structure of your code. Zed provides motions that change the current cursor position, and text objects that can be used as the target of actions.
-
-| Command                         | Default Shortcut            |
-| ------------------------------- | --------------------------- |
-| Go to next/previous method      | `] m` / `[ m`               |
-| Go to next/previous method end  | `] M` / `[ M`               |
-| Go to next/previous section     | `] ]` / `[ [`               |
-| Go to next/previous section end | `] [` / `[ ]`               |
-| Go to next/previous comment     | `] /`, `] *` / `[ /`, `[ *` |
-| Select a larger syntax node     | `[ x`                       |
-| Select a smaller syntax node    | `] x`                       |
-
-| Text Objects                                               | Default Shortcut |
-| ---------------------------------------------------------- | ---------------- |
-| Around a class, definition, etc.                           | `a c`            |
-| Inside a class, definition, etc.                           | `i c`            |
-| Around a function, method etc.                             | `a f`            |
-| Inside a function, method, etc.                            | `i f`            |
-| A comment                                                  | `g c`            |
-| An argument, or list item, etc.                            | `i a`            |
-| An argument, or list item, etc. (including trailing comma) | `a a`            |
-| Around an HTML-like tag                                    | `a t`            |
-| Inside an HTML-like tag                                    | `i t`            |
-| The current indent level, and one line before and after    | `a I`            |
-| The current indent level, and one line before              | `a i`            |
-| The current indent level                                   | `i i`            |
-
-Note that the definitions for the targets of the `[m` family of motions are the same as the
-boundaries defined by `af`. The targets of the `[[` are the same as those defined by `ac`, though
-if there are no classes, then functions are also used. Similarly `gc` is used to find `[ /`. `g c`
-
-The definition of functions, classes and comments is language dependent, and support can be added
-to extensions by adding a [`textobjects.scm`]. The definition of arguments and tags operates at
-the Tree-sitter level, but looks for certain patterns in the parse tree and is not currently configurable
-per language.
-
-### Multi cursor
-
-These commands help you manage multiple cursors in Zed.
-
-| Command                                                      | Default Shortcut |
-| ------------------------------------------------------------ | ---------------- |
-| Add a cursor selecting the next copy of the current word     | `g l`            |
-| Add a cursor selecting the previous copy of the current word | `g L`            |
-| Skip latest word selection, and add next                     | `g >`            |
-| Skip latest word selection, and add previous                 | `g <`            |
-| Add a visual selection for every copy of the current word    | `g a`            |
-
-### Pane management
-
-These commands open new panes or jump to specific panes.
-
-| Command                                    | Default Shortcut   |
-| ------------------------------------------ | ------------------ |
-| Open a project-wide search                 | `g /`              |
-| Open the current search excerpt            | `g <space>`        |
-| Open the current search excerpt in a split | `<ctrl-w> <space>` |
-| Go to definition in a split                | `<ctrl-w> g d`     |
-| Go to type definition in a split           | `<ctrl-w> g D`     |
-
-### In insert mode
-
-The following commands help you bring up Zed's completion menu, request a suggestion from GitHub Copilot, or open the inline AI assistant without leaving insert mode.
-
-| Command                                                                      | Default Shortcut |
-| ---------------------------------------------------------------------------- | ---------------- |
-| Open the completion menu                                                     | `ctrl-x ctrl-o`  |
-| Request GitHub Copilot suggestion (requires GitHub Copilot to be configured) | `ctrl-x ctrl-c`  |
-| Open the inline AI assistant (requires a configured assistant)               | `ctrl-x ctrl-a`  |
-| Open the code actions menu                                                   | `ctrl-x ctrl-l`  |
-| Hides all suggestions                                                        | `ctrl-x ctrl-z`  |
-
-### Supported plugins
-
-Zed's vim mode includes some features that are usually provided by very popular plugins in the Vim ecosystem:
-
-- You can surround text objects with `ys` (yank surround), change surrounding with `cs`, and delete surrounding with `ds`.
-- You can comment and uncomment selections with `gc` in visual mode and `gcc` in normal mode.
-- The project panel supports many shortcuts modeled after the Vim plugin `netrw`: navigation with `hjkl`, open file with `o`, open file in a new tab with `t`, etc.
-- You can add key bindings to your keymap to navigate "camelCase" names. [Head down to the Optional key bindings](#optional-key-bindings) section to learn how.
-- You can use `gR` to do [ReplaceWithRegister](https://github.com/vim-scripts/ReplaceWithRegister).
-- You can use `cx` for [vim-exchange](https://github.com/tommcdo/vim-exchange) functionality. Note that it does not have a default binding in visual mode, but you can add one to your keymap (refer to the [optional key bindings](#optional-key-bindings) section).
-- You can navigate to indent depths relative to your cursor with the [indent wise](https://github.com/jeetsukumaran/vim-indentwise) plugin `[-`, `]-`, `[+`, `]+`, `[=`, `]=`.
-- You can select quoted text with AnyQuotes and bracketed text with AnyBrackets text objects. Zed also provides MiniQuotes and MiniBrackets which offer alternative selection behavior based on the [mini.ai](https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-ai.md) Neovim plugin. See the [Quote and Bracket text objects](#quote-and-bracket-text-objects) section below for details.
-- You can configure AnyQuotes, AnyBrackets, MiniQuotes, and MiniBrackets text objects for selecting quoted and bracketed text using different selection strategies. See the [Any Bracket Functionality](#any-bracket-functionality) section below for details.
-
-### Any Bracket Functionality
-
-Zed offers two different strategies for selecting text surrounded by any quote, or any bracket. These text objects are **not enabled by default** and must be configured in your keymap to be used.
-
-#### Included Characters
-
-Each text object type works with specific characters:
-
-| Text Object              | Characters                                                                             |
-| ------------------------ | -------------------------------------------------------------------------------------- |
-| AnyQuotes/MiniQuotes     | Single quote (`'`), Double quote (`"`), Backtick (`` ` ``)                             |
-| AnyBrackets/MiniBrackets | Parentheses (`()`), Square brackets (`[]`), Curly braces (`{}`), Angle brackets (`<>`) |
-
-Both "Any" and "Mini" variants work with the same character sets, but differ in their selection strategy.
-
-#### AnyQuotes and AnyBrackets (Traditional Vim behavior)
-
-These text objects implement traditional Vim behavior:
-
-- **Selection priority**: Finds the innermost (closest) quotes or brackets first
-- **Fallback mechanism**: If none are found, falls back to the current line
-- **Character-based matching**: Focuses solely on open and close characters without considering syntax
-- **Vanilla Vim similarity**: AnyBrackets matches the behavior of commands like `ci<`, `ci(`, etc., in vanilla Vim, including potential edge cases (like considering `>` in `=>` as a closing delimiter)
-
-#### MiniQuotes and MiniBrackets (mini.ai behavior)
-
-These text objects implement the behavior of the [mini.ai](https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-ai.md) Neovim plugin:
-
-- **Selection priority**: Searches the current line first before expanding outward
-- **Tree-sitter integration**: Uses Tree-sitter queries for more context-aware selections
-- **Syntax-aware matching**: Can distinguish between actual brackets and similar characters in other contexts (like `>` in `=>`)
-
-#### Choosing Between Approaches
-
-- Use **AnyQuotes/AnyBrackets** if you:
-
-  - Prefer traditional Vim behavior
-  - Want consistent character-based selection prioritizing innermost delimiters
-  - Need behavior that closely matches vanilla Vim's text objects
-
-- Use **MiniQuotes/MiniBrackets** if you:
-  - Prefer the mini.ai plugin behavior
-  - Want more context-aware selections using Tree-sitter
-  - Prefer current-line priority when searching
-
-#### Example Configuration
-
-To use these text objects, you need to add bindings to your keymap. Here's an example configuration that makes them available when using text object operators (`i` and `a`) or change-surrounds (`cs`):
-
-```json [settings]
-{
-  "context": "vim_operator == a || vim_operator == i || vim_operator == cs",
-  "bindings": {
-    // Traditional Vim behavior
-    "q": "vim::AnyQuotes",
-    "b": "vim::AnyBrackets",
-
-    // mini.ai plugin behavior
-    "Q": "vim::MiniQuotes",
-    "B": "vim::MiniBrackets"
-  }
-}
-```
-
-With this configuration, you can use commands like:
-
-- `cib` - Change inside brackets using AnyBrackets behavior
-- `ciB` - Change inside brackets using MiniBrackets behavior
-- `ciq` - Change inside quotes using AnyQuotes behavior
-- `ciQ` - Change inside quotes using MiniQuotes behavior
-
-## Command palette
-
-Vim mode allows you to open Zed's command palette with `:`. You can then type to access any usual Zed command. Additionally, vim mode adds aliases for popular Vim commands to ensure your muscle memory transfers to Zed. For example, you can write `:w` or `:write` to save the file.
-
-Below, you'll find tables listing the commands you can use in the command palette. We put optional characters in square brackets to indicate that you can omit them.
-
-> **Note**: We don't emulate the full power of Vim's command line yet. In particular, commands currently do not support arguments. Please [file issues on GitHub](https://github.com/zed-industries/zed) as you find things that are missing from the command palette.
-
-### File and window management
-
-This table shows commands for managing windows, tabs, and panes. As commands don't support arguments currently, you cannot specify a filename when saving or creating a new file.
-
-| Command        | Description                                          |
-| -------------- | ---------------------------------------------------- |
-| `:w[rite][!]`  | Save the current file                                |
-| `:wq[!]`       | Save the file and close the buffer                   |
-| `:q[uit][!]`   | Close the buffer                                     |
-| `:wa[ll][!]`   | Save all open files                                  |
-| `:wqa[ll][!]`  | Save all open files and close all buffers            |
-| `:qa[ll][!]`   | Close all buffers                                    |
-| `:[e]x[it][!]` | Close the buffer                                     |
-| `:up[date]`    | Save the current file                                |
-| `:cq`          | Quit completely (close all running instances of Zed) |
-| `:vs[plit]`    | Split the pane vertically                            |
-| `:sp[lit]`     | Split the pane horizontally                          |
-| `:new`         | Create a new file in a horizontal split              |
-| `:vne[w]`      | Create a new file in a vertical split                |
-| `:tabedit`     | Create a new file in a new tab                       |
-| `:tabnew`      | Create a new file in a new tab                       |
-| `:tabn[ext]`   | Go to the next tab                                   |
-| `:tabp[rev]`   | Go to previous tab                                   |
-| `:tabc[lose]`  | Close the current tab                                |
-| `:ls`          | Show all buffers                                     |
-
-> **Note:** The `!` character is used to force the command to execute without saving changes or prompting before overwriting a file.
-
-### Ex commands
-
-These ex commands open Zed's various panels and windows.
-
-| Command                      | Default Shortcut |
-| ---------------------------- | ---------------- |
-| Open the project panel       | `:E[xplore]`     |
-| Open the collaboration panel | `:C[ollab]`      |
-| Open the chat panel          | `:Ch[at]`        |
-| Open the AI panel            | `:A[I]`          |
-| Open the git panel           | `:G[it]`         |
-| Open the debug panel         | `:D[ebug]`       |
-| Open the notifications panel | `:No[tif]`       |
-| Open the feedback window     | `:fe[edback]`    |
-| Open the diagnostics window  | `:cl[ist]`       |
-| Open the terminal            | `:te[rm]`        |
-| Open the extensions window   | `:Ext[ensions]`  |
-
-### Navigating diagnostics
-
-These commands navigate diagnostics.
-
-| Command                  | Description                    |
-| ------------------------ | ------------------------------ |
-| `:cn[ext]` or `:ln[ext]` | Go to the next diagnostic      |
-| `:cp[rev]` or `:lp[rev]` | Go to the previous diagnostics |
-| `:cc` or `:ll`           | Open the errors page           |
-
-### Git
-
-These commands interact with the version control system git.
-
-| Command         | Description                                             |
-| --------------- | ------------------------------------------------------- |
-| `:dif[fupdate]` | View the diff under the cursor (`d o` in normal mode)   |
-| `:rev[ert]`     | Revert the diff under the cursor (`d p` in normal mode) |
-
-### Jump
-
-These commands jump to specific positions in the file.
-
-| Command             | Description                         |
-| ------------------- | ----------------------------------- |
-| `:<number>`         | Jump to a line number               |
-| `:$`                | Jump to the end of the file         |
-| `:/foo` and `:?foo` | Jump to next/prev line matching foo |
-
-### Replacement
-
-This command replaces text. It emulates the substitute command in vim. The substitute command uses regular expressions, and Zed uses a slightly different syntax than vim. You can learn more about Zed's syntax below, [in the regex differences section](#regex-differences). Zed will replace only the first occurrence of the search pattern in the current line. To replace all matches append the `g` flag.
-
-| Command                 | Description                       |
-| ----------------------- | --------------------------------- |
-| `:[range]s/foo/bar/[g]` | Replace instances of foo with bar |
-
-### Editing
-
-These commands help you edit text.
-
-| Command           | Description                                             |
-| ----------------- | ------------------------------------------------------- |
-| `:j[oin]`         | Join the current line                                   |
-| `:d[elete][l][p]` | Delete the current line                                 |
-| `:s[ort] [i]`     | Sort the current selection (with i, case-insensitively) |
-| `:y[ank]`         | Yank (copy) the current selection or line               |
-
-### Set
-
-These commands modify editor options locally for the current buffer.
-
-| Command                         | Description                                                                                   |
-| ------------------------------- | --------------------------------------------------------------------------------------------- |
-| `:se[t] [no]wrap`               | Lines longer than the width of the window will wrap and displaying continues on the next line |
-| `:se[t] [no]nu[mber]`           | Print the line number in front of each line                                                   |
-| `:se[t] [no]r[elative]nu[mber]` | Changes the displayed number to be relative to the cursor                                     |
-| `:se[t] [no]i[gnore]c[ase]`     | Controls whether the buffer and project search use case-sensitive matching                    |
-
-### Command mnemonics
-
-As any Zed command is available, you may find that it's helpful to remember mnemonics that run the correct command. For example:
-
-- `:diffs` for "toggle all hunk diffs"
-- `:cpp` for "copy path to file"
-- `:crp` for "copy relative path"
-- `:reveal` for "reveal in finder"
-- `:zlog` for "open zed log"
-- `:clank` for "cancel language server work"
-
-## Customizing key bindings
-
-In this section, we'll learn how to customize the key bindings of Zed's vim mode. You'll learn:
-
-- How to select the correct context for your new key bindings.
-- Useful contexts for vim mode key bindings.
-- Common key bindings to customize for extra productivity.
-
-### Selecting the correct context
-
-Zed's key bindings are evaluated only when the `"context"` property matches your location in the editor. For example, if you add key bindings to the `"Editor"` context, they will only work when you're editing a file. If you add key bindings to the `"Workspace"` context, they will work everywhere in Zed. Here's an example of a key binding that saves when you're editing a file:
-
-```json [settings]
-{
-  "context": "Editor",
-  "bindings": {
-    "ctrl-s": "file::Save"
-  }
-}
-```
-
-Contexts are nested, so when you're editing a file, the context is the `"Editor"` context, which is inside the `"Pane"` context, which is inside the `"Workspace"` context. That's why any key bindings you add to the `"Workspace"` context will work when you're editing a file. Here's an example:
-
-```json [keymap]
-// This key binding will work when you're editing a file. It comes built into Zed by default as the workspace: save command.
-{
-  "context": "Workspace",
-  "bindings": {
-    "ctrl-s": "workspace::Save"
-  }
-}
-```
-
-Contexts are expressions. They support boolean operators like `&&` (and) and `||` (or). For example, you can use the context `"Editor && vim_mode == normal"` to create key bindings that only work when you're editing a file _and_ you're in vim's normal mode.
-
-Vim mode adds several contexts to the `"Editor"` context:
-
-| Operator             | Description                                                                                                                                                                        |
-| -------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| VimControl           | Indicates that vim keybindings should work. Currently an alias for `vim_mode == normal \|\| vim_mode == visual \|\| vim_mode == operator`, but the definition may change over time |
-| vim_mode == normal   | Normal mode                                                                                                                                                                        |
-| vim_mode == visual   | Visual mode                                                                                                                                                                        |
-| vim_mode == insert   | Insert mode                                                                                                                                                                        |
-| vim_mode == replace  | Replace mode                                                                                                                                                                       |
-| vim_mode == waiting  | Waiting for an arbitrary key (e.g., after typing `f` or `t`)                                                                                                                       |
-| vim_mode == operator | Waiting for another binding to trigger (e.g., after typing `c` or `d`)                                                                                                             |
-| vim_operator         | Set to `none` unless `vim_mode == operator`, in which case it is set to the current operator's default keybinding (e.g., after typing `d`, `vim_operator == d`)                    |
-
-> **Note**: Contexts are matched only on one level at a time. So it is possible to use the expression `"Editor && vim_mode == normal"`, but `"Workspace && vim_mode == normal"` will never match because we set the vim context at the `"Editor"` level.
-
-### Useful contexts for vim mode key bindings
-
-Here's a template with useful vim mode contexts to help you customize your vim mode key bindings. You can copy it and integrate it into your user keymap.
-
-```json [keymap]
-[
-  {
-    "context": "VimControl && !menu",
-    "bindings": {
-      // Put key bindings here if you want them to work in normal & visual mode.
-    }
-  },
-  {
-    "context": "vim_mode == normal && !menu",
-    "bindings": {
-      // "shift-y": ["workspace::SendKeystrokes", "y $"] // Use neovim's yank behavior: yank to end of line.
-    }
-  },
-  {
-    "context": "vim_mode == insert",
-    "bindings": {
-      // "j k": "vim::NormalBefore" // In insert mode, make jk escape to normal mode.
-    }
-  },
-  {
-    "context": "EmptyPane || SharedScreen",
-    "bindings": {
-      // Put key bindings here (in addition to the context above) if you want them to
-      // work when no editor exists.
-      // "space f": "file_finder::Toggle"
-    }
-  }
-]
-```
-
-> **Note**: If you would like to emulate Vim's `map` commands (`nmap`, etc.), you can use the action `workspace::SendKeystrokes` in the correct context.
-
-### Optional key bindings
-
-By default, you can navigate between the different files open in the editor with shortcuts like `ctrl+w` followed by one of `hjkl` to move to the left, down, up, or right, respectively.
-
-But you cannot use the same shortcuts to move between all the editor docks (the terminal, project panel, assistant panel, ...). If you want to use the same shortcuts to navigate to the docks, you can add the following key bindings to your user keymap.
-
-```json [settings]
-{
-  "context": "Dock",
-  "bindings": {
-    "ctrl-w h": "workspace::ActivatePaneLeft",
-    "ctrl-w l": "workspace::ActivatePaneRight",
-    "ctrl-w k": "workspace::ActivatePaneUp",
-    "ctrl-w j": "workspace::ActivatePaneDown"
-    // ... or other keybindings
-  }
-}
-```
-
-Subword motion, which allows you to navigate and select individual words in camelCase or snake_case, is not enabled by default. To enable it, add these bindings to your keymap.
-
-```json [settings]
-{
-  "context": "VimControl && !menu && vim_mode != operator",
-  "bindings": {
-    "w": "vim::NextSubwordStart",
-    "b": "vim::PreviousSubwordStart",
-    "e": "vim::NextSubwordEnd",
-    "g e": "vim::PreviousSubwordEnd"
-  }
-}
-```
-
-Vim mode comes with shortcuts to surround the selection in normal mode (`ys`), but it doesn't have a shortcut to add surrounds in visual mode. By default, `shift-s` substitutes the selection (erases the text and enters insert mode). To use `shift-s` to add surrounds in visual mode, you can add the following object to your keymap.
-
-```json [settings]
-{
-  "context": "vim_mode == visual",
-  "bindings": {
-    "shift-s": "vim::PushAddSurrounds"
-  }
-}
-```
-
-In non-modal text editors, cursor navigation typically wraps when moving past line ends. Zed, however, handles this behavior exactly like Vim by default: the cursor stops at line boundaries. If you prefer your cursor to wrap between lines, override these keybindings:
-
-```json [settings]
-// In VimScript, this would look like this:
-// set whichwrap+=<,>,[,],h,l
-{
-  "context": "VimControl && !menu",
-  "bindings": {
-    "left": "vim::WrappingLeft",
-    "right": "vim::WrappingRight",
-    "h": "vim::WrappingLeft",
-    "l": "vim::WrappingRight"
-  }
-}
-```
-
-The [Sneak motion](https://github.com/justinmk/vim-sneak) feature allows for quick navigation to any two-character sequence in your text. You can enable it by adding the following keybindings to your keymap. By default, the `s` key is mapped to `vim::Substitute`. Adding these bindings will override that behavior, so ensure this change aligns with your workflow preferences.
-
-```json [settings]
-{
-  "context": "vim_mode == normal || vim_mode == visual",
-  "bindings": {
-    "s": "vim::PushSneak",
-    "shift-s": "vim::PushSneakBackward"
-  }
-}
-```
-
-The [vim-exchange](https://github.com/tommcdo/vim-exchange) feature does not have a default binding for visual mode, as the `shift-x` binding conflicts with the default `shift-x` binding for visual mode (`vim::VisualDeleteLine`). To assign the default vim-exchange binding, add the following keybinding to your keymap:
-
-```json [settings]
-{
-  "context": "vim_mode == visual",
-  "bindings": {
-    "shift-x": "vim::Exchange"
-  }
-}
-```
-
-### Restoring common text editing and Zed keybindings
-
-If you're using vim mode on Linux or Windows, you may find it overrides keybindings you can't live without: `ctrl+v` to paste, `ctrl+f` to search, etc. You can restore them by copying this data into your keymap:
-
-```json [keymap]
-{
-  "context": "Editor && !menu",
-  "bindings": {
-    "ctrl-c": "editor::Copy",               // vim default: return to normal mode
-    "ctrl-x": "editor::Cut",                // vim default: decrement
-    "ctrl-v": "editor::Paste",              // vim default: visual block mode
-    "ctrl-y": "editor::Undo",               // vim default: line up
-    "ctrl-f": "buffer_search::Deploy",      // vim default: page down
-    "ctrl-o": "workspace::Open",            // vim default: go back
-    "ctrl-s": "workspace::Save",            // vim default: show signature
-    "ctrl-a": "editor::SelectAll",          // vim default: increment
-    "ctrl-b": "workspace::ToggleLeftDock"   // vim default: down
-  }
-},
-```
-
-## Changing vim mode settings
-
-You can change the following settings to modify vim mode's behavior:
-
-| Property                     | Description                                                                                                                                                                                   | Default Value |
-| ---------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------- |
-| default_mode                 | The default mode to start in. One of "normal", "insert", "replace", "visual", "visual_line", "visual_block", "helix_normal".                                                                  | "normal"      |
-| use_system_clipboard         | Determines how system clipboard is used:<br><ul><li>"always": use for all operations</li><li>"never": only use when explicitly specified</li><li>"on_yank": use for yank operations</li></ul> | "always"      |
-| use_multiline_find           | deprecated                                                                                                                                                                                    |
-| use_smartcase_find           | If `true`, `f` and `t` motions are case-insensitive when the target letter is lowercase.                                                                                                      | false         |
-| toggle_relative_line_numbers | If `true`, line numbers are relative in normal mode and absolute in insert mode, giving you the best of both options.                                                                         | false         |
-| custom_digraphs              | An object that allows you to add custom digraphs. Read below for an example.                                                                                                                  | {}            |
-| highlight_on_yank_duration   | The duration of the highlight animation(in ms). Set to `0` to disable                                                                                                                         | 200           |
-
-Here's an example of adding a digraph for the zombie emoji. This allows you to type `ctrl-k f z` to insert a zombie emoji. You can add as many digraphs as you like.
-
-```json [settings]
-{
-  "vim": {
-    "custom_digraphs": {
-      "fz": "🧟‍♀️"
-    }
-  }
-}
-```
-
-Here's an example of these settings changed:
-
-```json [settings]
-{
-  "vim": {
-    "default_mode": "insert",
-    "use_system_clipboard": "never",
-    "use_smartcase_find": true,
-    "toggle_relative_line_numbers": true,
-    "highlight_on_yank_duration": 50,
-    "custom_digraphs": {
-      "fz": "🧟‍♀️"
-    }
-  }
-}
-```
-
-## Useful core Zed settings for vim mode
-
-Here are a few general Zed settings that can help you fine-tune your Vim experience:
-
-| Property                | Description                                                                                                                                                   | Default Value        |
-| ----------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------- |
-| cursor_blink            | If `true`, the cursor blinks.                                                                                                                                 | `true`               |
-| relative_line_numbers   | If `"enabled"`, line numbers in the left gutter are relative to the cursor. If `"wrapped"`, they also display for wrapped lines.                              | `"disabled"`         |
-| scrollbar               | Object that controls the scrollbar display. Set to `{ "show": "never" }` to hide the scroll bar.                                                              | `{ "show": "auto" }` |
-| scroll_beyond_last_line | If set to `"one_page"`, allows scrolling up to one page beyond the last line. Set to `"off"` to prevent this behavior.                                        | `"one_page"`         |
-| vertical_scroll_margin  | The number of lines to keep above or below the cursor when scrolling. Set to `0` to allow the cursor to go up to the edges of the screen vertically.          | `3`                  |
-| gutter.line_numbers     | Controls the display of line numbers in the gutter. Set the `"line_numbers"` property to `false` to hide line numbers.                                        | `true`               |
-| command_aliases         | Object that defines aliases for commands in the command palette. You can use it to define shortcut names for commands you use often. Read below for examples. | `{}`                 |
-
-Here's an example of these settings changed:
-
-```json [settings]
-{
-  // Disable cursor blink
-  "cursor_blink": false,
-  // Use relative line numbers
-  "relative_line_numbers": "enabled",
-  // Hide the scroll bar
-  "scrollbar": { "show": "never" },
-  // Prevent the buffer from scrolling beyond the last line
-  "scroll_beyond_last_line": "off",
-  // Allow the cursor to reach the edges of the screen
-  "vertical_scroll_margin": 0,
-  "gutter": {
-    // Disable line numbers completely
-    "line_numbers": false
-  },
-  "command_aliases": {
-    "W": "w",
-    "Wq": "wq",
-    "Q": "q"
-  }
-}
-```
-
-The `command_aliases` property is a single object that maps keys or key sequences to vim mode commands. The example above defines multiple aliases: `W` for `w`, `Wq` for `wq`, and `Q` for `q`.
-
-## Regex differences
-
-Zed uses a different regular expression engine from Vim. This means that you will have to use a different syntax in some cases. Here are the most common differences:
-
-- **Capture groups**: Vim uses `\(` and `\)` to represent capture groups, in Zed these are `(` and `)`. On the flip side, in Vim, `(` and `)` represent literal parentheses, but in Zed these must be escaped to `\(` and `\)`.
-- **Matches**: When replacing, Vim uses the backslash character followed by a number to represent a matched capture group. For example, `\1`. Zed uses the dollar sign instead. So, when in Vim you use `\0` to represent the entire match, in Zed the syntax is `$0` instead. Same for numbered capture groups: `\1` in Vim is `$1` in Zed.
-- **Global option**: By default, in Vim, regex searches only match the first occurrence on a line, and you append `/g` at the end of your query to find all matches. In Zed, regex searches are global by default.
-- **Case sensitivity**: Vim uses `/i` to indicate a case-insensitive search. In Zed you can either write `(?i)` at the start of the pattern or toggle case-sensitivity with the shortcut {#kb search::ToggleCaseSensitive}.
-
-> **Note**: To help with the transition, the command palette will fix parentheses and replace groups for you when you write a Vim-style substitute command, `:%s//`. So, Zed will convert `%s:/\(a\)(b)/\1/` into a search for "(a)\(b\)" and a replacement of "$1".
-
-For the full syntax supported by Zed's regex engine [see the regex crate documentation](https://docs.rs/regex/latest/regex/#syntax).
diff --git a/docs/src/visual-customization.md b/docs/src/visual-customization.md
deleted file mode 100644
index e518571927..0000000000
--- a/docs/src/visual-customization.md
+++ /dev/null
@@ -1,592 +0,0 @@
-# Visual Customization
-
-Various aspects of Zed's visual layout can be configured via either the settings window or the `settings.json` file, which you can access via {#action zed::OpenSettings} ({#kb zed::OpenSettings}) and {#action zed::OpenSettingsFile} ({#kb zed::OpenSettingsFile}) respectively.
-
-See [Configuring Zed](./configuring-zed.md) for additional information and other non-visual settings.
-
-## Themes
-
-You can install many [themes](./themes.md) and [icon themes](./icon-themes.md) in form of extensions by running {#action zed::Extensions} from the command palette.
-
-You can preview/choose amongst your installed themes and icon themes with {#action theme_selector::Toggle} ({#kb theme_selector::Toggle}) and {#action icon_theme_selector::Toggle} which will modify the following settings:
-
-```json [settings]
-{
-  "theme": "One Dark",
-  "icon_theme": "Zed (Default)"
-}
-```
-
-If you would like to use distinct themes for light mode/dark mode that can be set with:
-
-```json [settings]
-{
-  "theme": {
-    "dark": "One Dark",
-    "light": "One Light",
-    // Mode to use (dark, light) or "system" to follow the OS's light/dark mode (default)
-    "mode": "system"
-  },
-  "icon_theme": {
-    "dark": "Zed (Default)",
-    "light": "Zed (Default)",
-    // Mode to use (dark, light) or "system" to follow the OS's light/dark mode (default)
-    "mode": "system"
-  }
-}
-```
-
-## Fonts
-
-```json [settings]
-  // UI Font. Use ".SystemUIFont" to use the default system font (SF Pro on macOS),
-  // or ".ZedSans" for the bundled default (currently IBM Plex)
-  "ui_font_family": ".SystemUIFont",
-  "ui_font_weight": 400, // Font weight in standard CSS units from 100 to 900.
-  "ui_font_size": 16,
-
-  // Buffer Font - Used by editor buffers
-  // use ".ZedMono" for the bundled default monospace (currently Lilex)
-  "buffer_font_family": "Berkeley Mono", // Font name for editor buffers
-  "buffer_font_size": 15,                 // Font size for editor buffers
-  "buffer_font_weight": 400,              // Font weight in CSS units [100-900]
-  // Line height "comfortable" (1.618), "standard" (1.3) or custom: `{ "custom": 2 }`
-  "buffer_line_height": "comfortable",
-
-  // Terminal Font Settings
-  "terminal": {
-    "font_family": "",
-    "font_size": 15,
-    // Terminal line height: comfortable (1.618), standard(1.3) or `{ "custom": 2 }`
-    "line_height": "standard",
-  },
-
-  // Controls the font size for agent responses in the agent panel.
-  // If not specified, it falls back to the UI font size.
-  "agent_ui_font_size": 15,
-  // Controls the font size for the agent panel's message editor, user message,
-  // and any other snippet of code.
-  "agent_buffer_font_size": 12
-```
-
-### Font ligatures
-
-By default Zed enable font ligatures which will visually combines certain adjacent characters.
-
-For example `=>` will be displayed as `→` and `!=` will be `≠`.
-This is purely cosmetic and the individual characters remain unchanged.
-
-To disable this behavior use:
-
-```json [settings]
-{
-  "buffer_font_features": {
-    "calt": false // Disable ligatures
-  }
-}
-```
-
-### Status Bar
-
-```json [settings]
-{
-  // Whether to show full labels in line indicator or short ones
-  //   - `short`: "2 s, 15 l, 32 c"
-  //   - `long`: "2 selections, 15 lines, 32 characters"
-  "line_indicator_format": "long"
-
-  // Individual status bar icons can be hidden:
-  // "project_panel": {"button": false },
-  // "outline_panel": {"button": false },
-  // "collaboration_panel": {"button": false },
-  // "git_panel": {"button": false },
-  // "notification_panel": {"button": false },
-  // "agent": {"button": false },
-  // "debugger": {"button": false },
-  // "diagnostics": {"button": false },
-  // "search": {"button": false },
-}
-```
-
-### Titlebar
-
-```json [settings]
-  // Control which items are shown/hidden in the title bar
-  "title_bar": {
-    "show_branch_icon": false,      // Show/hide branch icon beside branch switcher
-    "show_branch_name": true,       // Show/hide branch name
-    "show_project_items": true,     // Show/hide project host and name
-    "show_onboarding_banner": true, // Show/hide onboarding banners
-    "show_user_picture": true,      // Show/hide user avatar
-    "show_sign_in": true,           // Show/hide sign-in button
-    "show_menus": false             // Show/hide menus
-  },
-```
-
-## Workspace
-
-```json [settings]
-{
-  // Force usage of Zed build in path prompts (file and directory pickers)
-  // instead of OS native pickers (false).
-  "use_system_path_prompts": true,
-  // Force usage of Zed built in confirmation prompts ("Do you want to save?")
-  // instead of OS native prompts (false). On linux this is ignored (always false).
-  "use_system_prompts": true,
-
-  // Active pane styling settings.
-  "active_pane_modifiers": {
-    // Inset border size of the active pane, in pixels.
-    "border_size": 0.0,
-    // Opacity of the inactive panes. 0 means transparent, 1 means opaque.
-    "inactive_opacity": 1.0
-  },
-
-  // Layout mode of the bottom dock: contained, full, left_aligned, right_aligned
-  "bottom_dock_layout": "contained",
-
-  // Whether to resize all the panels in a dock when resizing the dock.
-  // Can be a combination of "left", "right" and "bottom".
-  "resize_all_panels_in_dock": ["left"]
-}
-```
-
-<!--
-TBD: Centered layout related settings
-```json [settings]
-    "centered_layout": {
-    // The relative width of the left padding of the central pane from the
-    // workspace when the centered layout is used.
-    "left_padding": 0.2,
-    // The relative width of the right padding of the central pane from the
-    // workspace when the centered layout is used.
-    "right_padding": 0.2
-    },
-```
--->
-
-## Editor
-
-```json [settings]
-  // Whether the cursor blinks in the editor.
-  "cursor_blink": true,
-
-  // Cursor shape for the default editor: bar, block, underline, hollow
-  "cursor_shape": null,
-
-  // Highlight the current line in the editor: none, gutter, line, all
-  "current_line_highlight": "all",
-
-  // When does the mouse cursor hide: never, on_typing, on_typing_and_movement
-  "hide_mouse": "on_typing_and_movement",
-
-  // Whether to highlight all occurrences of the selected text in an editor.
-  "selection_highlight": true,
-
-  // Visually show tabs and spaces  (none, all, selection, boundary, trailing)
-  "show_whitespaces": "selection",
-  "whitespace_map": { // Which characters to show when `show_whitespaces` enabled
-    "space": "•",
-    "tab": "⟶"       // use "→", for a shorter arrow
-  },
-
-  "unnecessary_code_fade": 0.3, // How much to fade out unused code.
-
-  // Hide the values of in variables from visual display in private files
-  "redact_private_values": false,
-
-  // Soft-wrap and rulers
-  "soft_wrap": "none",          // none, editor_width, preferred_line_length, bounded
-  "preferred_line_length": 80,  // Column to soft-wrap
-  "show_wrap_guides": true,     // Show/hide wrap guides (vertical rulers)
-  "wrap_guides": [],            // Where to position wrap_guides (character counts)
-
-  // Gutter Settings
-  "gutter": {
-    "line_numbers": true,         // Show/hide line numbers in the gutter.
-    "runnables": true,            // Show/hide runnables buttons in the gutter.
-    "breakpoints": true,          // Show/hide show breakpoints in the gutter.
-    "folds": true,                // Show/hide show fold buttons in the gutter.
-    "min_line_number_digits": 4   // Reserve space for N digit line numbers
-  },
-  "relative_line_numbers": "enabled", // Show relative line numbers in gutter
-
-  // Indent guides
-  "indent_guides": {
-    "enabled": true,
-    "line_width": 1,                  // Width of guides in pixels [1-10]
-    "active_line_width": 1,           // Width of active guide in pixels [1-10]
-    "coloring": "fixed",              // disabled, fixed, indent_aware
-    "background_coloring": "disabled" // disabled, indent_aware
-  },
-
-  "sticky_scroll": {
-    "enabled": false // Whether to stick scopes to the top of the editor. Disabled by default.
-  }
-```
-
-### Git Blame {#editor-blame}
-
-```json [settings]
-  "git": {
-    "inline_blame": {
-      "enabled": true,             // Show/hide inline blame
-      "delay_ms": 0,                  // Show after delay (ms)
-      "min_column": 0,             // Minimum column to inline display blame
-      "padding": 7,                // Padding between code and inline blame (em)
-      "show_commit_summary": false // Show/hide commit summary
-    },
-    "hunk_style": "staged_hollow"  // staged_hollow, unstaged_hollow
-  }
-```
-
-### Editor Toolbar
-
-```json [settings]
-  // Editor toolbar related settings
-  "toolbar": {
-    "breadcrumbs": true, // Whether to show breadcrumbs.
-    "quick_actions": true, // Whether to show quick action buttons.
-    "selections_menu": true, // Whether to show the Selections menu
-    "agent_review": true, // Whether to show agent review buttons
-    "code_actions": false // Whether to show code action buttons
-  }
-```
-
-### Editor Scrollbar and Minimap {#editor-scrollbar}
-
-```json [settings]
-  // Scrollbar related settings
-  "scrollbar": {
-    // When to show the scrollbar in the editor (auto, system, always, never)
-    "show": "auto",
-    "cursors": true,          // Show cursor positions in the scrollbar.
-    "git_diff": true,         // Show git diff indicators in the scrollbar.
-    "search_results": true,   // Show buffer search results in the scrollbar.
-    "selected_text": true,    // Show selected text occurrences in the scrollbar.
-    "selected_symbol": true,  // Show selected symbol occurrences in the scrollbar.
-    "diagnostics": "all",     // Show diagnostics (none, error, warning, information, all)
-    "axes": {
-      "horizontal": true,     // Show/hide the horizontal scrollbar
-      "vertical": true        // Show/hide the vertical scrollbar
-    }
-  },
-
-  // Minimap related settings
-  "minimap": {
-    "show": "never",                // When to show (auto, always, never)
-    "display_in": "active_editor",  // Where to show (active_editor, all_editor)
-    "thumb": "always",              // When to show thumb (always, hover)
-    "thumb_border": "left_open",    // Thumb border (left_open, right_open, full, none)
-    "max_width_columns": 80,        // Maximum width of minimap
-    "current_line_highlight": null  // Highlight current line (null, line, gutter)
-  },
-
-  // Control Editor scroll beyond the last line: off, one_page, vertical_scroll_margin
-  "scroll_beyond_last_line": "one_page",
-  // Lines to keep above/below the cursor when scrolling with the keyboard
-  "vertical_scroll_margin": 3,
-  // The number of characters to keep on either side when scrolling with the mouse
-  "horizontal_scroll_margin": 5,
-  // Scroll sensitivity multiplier
-  "scroll_sensitivity": 1.0,
-  // Scroll sensitivity multiplier for fast scrolling (hold alt while scrolling)
-  "fast_scroll_sensitivity": 4.0,
-```
-
-### Editor Tabs
-
-```json [settings]
-  // Maximum number of tabs per pane. Unset for unlimited.
-  "max_tabs": null,
-
-  // Customize the tab bar appearance
-  "tab_bar": {
-    "show": true,                     // Show/hide the tab bar
-    "show_nav_history_buttons": true, // Show/hide history buttons on tab bar
-    "show_tab_bar_buttons": true      // Show hide buttons (new, split, zoom)
-  },
-  "tabs": {
-    "git_status": false,              // Color to show git status
-    "close_position": "right",        // Close button position (left, right, hidden)
-    "show_close_button": "hover",     // Close button shown (hover, always, hidden)
-    "file_icons": false,              // Icon showing file type
-    // Show diagnostics in file icon (off, errors, all). Requires file_icons=true
-    "show_diagnostics": "off"
-  }
-```
-
-### Status Bar
-
-```json [settings]
-  "status_bar": {
-    // Show/hide a button that displays the active buffer's language.
-    // Clicking the button brings up the language selector.
-    // Defaults to true.
-    "active_language_button": true,
-    // Show/hide a button that displays the cursor's position.
-    // Clicking the button brings up an input for jumping to a line and column.
-    // Defaults to true.
-    "cursor_position_button": true,
-    // Show/hide a button that displays the buffer's line-ending mode.
-    // Clicking the button brings up the line-ending selector.
-    // Defaults to false.
-    "line_endings_button": false
-  },
-  "global_lsp_settings": {
-    // Show/hide the LSP button in the status bar.
-    // Activity from the LSP is still shown.
-    // Button is not shown if "enable_language_server" if false.
-    "button": true
-  },
-```
-
-### Multibuffer
-
-```json [settings]
-{
-  // The default number of lines to expand excerpts in the multibuffer by.
-  "expand_excerpt_lines": 5,
-  // The default number of lines of context provided for excerpts in the multibuffer by.
-  "excerpt_context_lines": 2
-}
-```
-
-### Editor Completions, Snippets, Actions, Diagnostics {#editor-lsp}
-
-```json [settings]
-  "snippet_sort_order": "inline",        // Snippets completions: top, inline, bottom, none
-  "show_completions_on_input": true,     // Show completions while typing
-  "show_completion_documentation": true, // Show documentation in completions
-  "auto_signature_help": false,          // Show method signatures inside parentheses
-
-  // Whether to show the signature help after completion or a bracket pair inserted.
-  // If `auto_signature_help` is enabled, this setting will be treated as enabled also.
-  "show_signature_help_after_edits": false,
-
-  // Whether to show code action button at start of buffer line.
-  "inline_code_actions": true,
-
-  // Which level to use to filter out diagnostics displayed in the editor:
-  "diagnostics_max_severity": null,      // off, error, warning, info, hint, null (all)
-
-  // How to render LSP `textDocument/documentColor` colors in the editor.
-  "lsp_document_colors": "inlay",        // none, inlay, border, background
-  // When to show the scrollbar in the completion menu.
-  "completion_menu_scrollbar": "never", // auto, system, always, never
-  // Turn on colorization of brackets in editors (configurable per language)
-  "colorize_brackets": true,
-```
-
-### Edit Predictions {#editor-ai}
-
-```json [settings]
-  "edit_predictions": {
-    "mode": "eager",                // Automatically show (eager) or hold-alt (subtle)
-    "enabled_in_text_threads": true // Show/hide predictions in agent text threads
-  },
-  "show_edit_predictions": true     // Show/hide predictions in editor
-```
-
-### Editor Inlay Hints
-
-```json [settings]
-{
-  "inlay_hints": {
-    "enabled": false,
-    // Toggle certain types of hints on and off, all switched on by default.
-    "show_type_hints": true,
-    "show_parameter_hints": true,
-    "show_other_hints": true,
-
-    // Whether to show a background for inlay hints (theme `hint.background`)
-    "show_background": false, //
-
-    // Time to wait after editing before requesting hints (0 to disable debounce)
-    "edit_debounce_ms": 700,
-    // Time to wait after scrolling before requesting hints (0 to disable debounce)
-    "scroll_debounce_ms": 50,
-
-    // A set of modifiers which, when pressed, will toggle the visibility of inlay hints.
-    "toggle_on_modifiers_press": {
-      "control": false,
-      "shift": false,
-      "alt": false,
-      "platform": false,
-      "function": false
-    }
-  }
-}
-```
-
-## File Finder
-
-```json [settings]
-  // File Finder Settings
-  "file_finder": {
-    "file_icons": true,         // Show/hide file icons
-    "modal_max_width": "small", // Horizontal size: small, medium, large, xlarge, full
-    "git_status": true,         // Show the git status for each entry
-    "include_ignored": null     // gitignored files in results: true, false, null
-  },
-```
-
-## Project Panel
-
-Project panel can be shown/hidden with {#action project_panel::ToggleFocus} ({#kb project_panel::ToggleFocus}) or with {#action pane::RevealInProjectPanel} ({#kb pane::RevealInProjectPanel}).
-
-```json [settings]
-  // Project Panel Settings
-  "project_panel": {
-    "button": true,                 // Show/hide button in the status bar
-    "default_width": 240,           // Default panel width
-    "dock": "left",                 // Position of the dock (left, right)
-    "entry_spacing": "comfortable", // Vertical spacing (comfortable, standard)
-    "file_icons": true,             // Show/hide file icons
-    "folder_icons": true,           // Show/hide folder icons
-    "git_status": true,             // Indicate new/updated files
-    "indent_size": 20,              // Pixels for each successive indent
-    "auto_reveal_entries": true,    // Show file in panel when activating its buffer
-    "auto_fold_dirs": true,         // Fold dirs with single subdir
-    "sticky_scroll": true,          // Stick parent directories at top of the project panel.
-    "drag_and_drop": true,          // Whether drag and drop is enabled
-    "scrollbar": {                  // Project panel scrollbar settings
-      "show": null                  // Show/hide: (auto, system, always, never)
-    },
-    "show_diagnostics": "all",      //
-    // Settings related to indent guides in the project panel.
-    "indent_guides": {
-      // When to show indent guides in the project panel. (always, never)
-      "show": "always"
-    },
-    // Sort order for entries (directories_first, mixed, files_first)
-    "sort_mode": "directories_first",
-    // Whether to hide the root entry when only one folder is open in the window.
-    "hide_root": false,
-    // Whether to hide the hidden entries in the project panel.
-    "hide_hidden": false
-  }
-```
-
-## Agent Panel
-
-```json [settings]
-  "agent": {
-    "version": "2",
-    "enabled": true,        // Enable/disable the agent
-    "button": true,         // Show/hide the icon in the status bar
-    "dock": "right",        // Where to dock: left, right, bottom
-    "default_width": 640,   // Default width (left/right docked)
-    "default_height": 320,  // Default height (bottom docked)
-  },
-  // Controls the font size for agent responses in the agent panel.
-  // If not specified, it falls back to the UI font size.
-  "agent_ui_font_size": 15,
-  // Controls the font size for the agent panel's message editor, user message,
-  // and any other snippet of code.
-  "agent_buffer_font_size": 12
-```
-
-See [Zed AI Documentation](./ai/overview.md) for additional non-visual AI settings.
-
-## Terminal Panel
-
-```json [settings]
-  // Terminal Panel Settings
-  "terminal": {
-    "dock": "bottom",                   // Where to dock: left, right, bottom
-    "button": true,                     // Show/hide status bar icon
-    "default_width": 640,               // Default width (left/right docked)
-    "default_height": 320,              // Default height (bottom docked)
-
-    // Set the cursor blinking behavior in the terminal (on, off, terminal_controlled)
-    "blinking": "terminal_controlled",
-    // Default cursor shape for the terminal cursor (block, bar, underline, hollow)
-    "cursor_shape": "block",
-
-    // Environment variables to add to terminal's process environment
-    "env": {
-      // "KEY": "value"
-    },
-
-    // Terminal scrollbar
-    "scrollbar": {
-      "show": null                       // Show/hide: (auto, system, always, never)
-    },
-    // Terminal Font Settings
-    "font_family": "Fira Code",
-    "font_size": 15,
-    "font_weight": 400,
-    // Terminal line height: comfortable (1.618), standard(1.3) or `{ "custom": 2 }`
-    "line_height": "comfortable",
-
-    "max_scroll_history_lines": 10000,   // Scrollback history (0=disable, max=100000)
-  }
-```
-
-See [Terminal settings](./configuring-zed.md#terminal) for additional non-visual customization options.
-
-### Other Panels
-
-```json [settings]
-  // Git Panel
-  "git_panel": {
-    "button": true,               // Show/hide status bar icon
-    "dock": "left",               // Where to dock: left, right
-    "default_width": 360,         // Default width of the git panel.
-    "status_style": "icon",       // label_color, icon
-    "sort_by_path": false,        // Sort by path (false) or status (true)
-    "scrollbar": {
-      "show": null                // Show/hide: (auto, system, always, never)
-    }
-  },
-
-  // Debugger Panel
-  "debugger": {
-    "dock": "bottom",             // Where to dock: left, right, bottom
-    "button": true                // Show/hide status bar icon
-  },
-
-  // Outline Panel
-  "outline_panel": {
-    "button": true,               // Show/hide status bar icon
-    "default_width": 300,         // Default width of the git panel
-    "dock": "left",               // Where to dock: left, right
-    "file_icons": true,           // Show/hide file_icons
-    "folder_icons": true,         // Show file_icons (true), chevrons (false) for dirs
-    "git_status": true,           // Show git status
-    "indent_size": 20,            // Indentation for nested items (pixels)
-    "indent_guides": {
-      "show": "always"            // Show indent guides (always, never)
-    },
-    "auto_reveal_entries": true,  // Show file in panel when activating its buffer
-    "auto_fold_dirs": true,       // Fold dirs with single subdir
-    "scrollbar": {                // Project panel scrollbar settings
-      "show": null                // Show/hide: (auto, system, always, never)
-    }
-  }
-```
-
-## Collaboration Panels
-
-```json [settings]
-{
-  // Collaboration Panel
-  "collaboration_panel": {
-    "button": true, // Show/hide status bar icon
-    "dock": "left", // Where to dock: left, right
-    "default_width": 240 // Default width of the collaboration panel.
-  },
-  "show_call_status_icon": true, // Shown call status in the OS status bar.
-
-  // Notification Panel
-  "notification_panel": {
-    // Whether to show the notification panel button in the status bar.
-    "button": true,
-    // Where to dock the notification panel. Can be 'left' or 'right'.
-    "dock": "right",
-    // Default width of the notification panel.
-    "default_width": 380
-  }
-}
-```
diff --git a/docs/src/windows.md b/docs/src/windows.md
deleted file mode 100644
index 34a553dd5b..0000000000
--- a/docs/src/windows.md
+++ /dev/null
@@ -1,53 +0,0 @@
-# Zed on Windows
-
-## Installing Zed
-
-Get the latest stable builds via [the download page](https://zed.dev/download). If you want to download our preview build, you can find it on its [releases page](https://zed.dev/releases/preview). After the first manual installation, Zed will periodically check for install updates.
-
-You can also build zed from source, see [these docs](https://zed.dev/docs/development/windows) for instructions.
-
-## Uninstall
-
-- Installed via installer: Use `Settings` → `Apps` → `Installed apps`, search for Zed, and click Uninstall.
-- Built from source: Remove the build output directory you created (e.g., your target/install folder).
-
-Your settings and extensions live in your user profile. When uninstalling, you can choose to keep or remove them.
-
-## Remote Development (SSH)
-
-Zed supports remote development on Windows through both SSH and WSL. You can connect to remote servers via SSH or work with files inside WSL distributions directly from Zed.
-
-For detailed instructions on setting up and using remote development features, including SSH configuration, WSL setup, and troubleshooting, see the [Remote Development documentation](./remote-development.md).
-
-## Troubleshooting
-
-### Zed fails to start or shows a blank window
-
-- Check that your hardware and operating system version are compatible with Zed. See our [installation guide](./installation.md) for more information.
-- Update your GPU drivers from your GPU vendor (Intel/AMD/NVIDIA/Qualcomm).
-- Ensure hardware acceleration is enabled in Windows and not blocked by third‑party software.
-- Try launching Zed with no extensions or custom settings to isolate conflicts.
-
-### Terminal issues
-
-If activation scripts don’t run, update to the latest version and verify your shell profile files are not exiting early. For Git operations, confirm Git Bash or PowerShell is available and on PATH.
-
-### SSH remoting problems
-
-When prompted for credentials, use the graphical askpass dialog. If it doesn’t appear, check for credential manager conflicts and that GUI prompts aren’t blocked by your terminal.
-
-### Graphics issues
-
-#### Zed fails to open / degraded performance
-
-Zed requires a DirectX 11 compatible GPU to run. If Zed fails to open, your GPU may not meet the minimum requirements.
-
-To check if your GPU supports DirectX 11, run the following command:
-
-```
-dxdiag
-```
-
-This will open the DirectX Diagnostic Tool, which shows the DirectX version your GPU supports under `System` → `System Information` → `DirectX Version`.
-
-If you're running Zed inside a virtual machine, it will use the emulated adapter provided by your VM. While Zed will work in this environment, performance may be degraded.
diff --git a/docs/theme/css/chrome.css b/docs/theme/css/chrome.css
deleted file mode 100644
index ff0ba71120..0000000000
--- a/docs/theme/css/chrome.css
+++ /dev/null
@@ -1,811 +0,0 @@
-/* CSS for UI elements (a.k.a. chrome) */
-
-@import "variables.css";
-
-html {
-  background-color: var(--bg);
-  scrollbar-color: var(--scrollbar) var(--bg);
-}
-#searchresults a,
-.content a:link,
-a:visited,
-a > .hljs {
-  color: var(--links);
-}
-
-.icon-logo-img {
-  display: block;
-}
-
-.icon-button {
-  position: relative;
-  height: 28px;
-  width: 28px;
-  z-index: 10;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  cursor: pointer;
-  transition: color 0.5s;
-  border: 0;
-  background-color: transparent;
-  border-radius: 4px;
-  color: var(--icons);
-}
-
-.icon-button:hover {
-  color: var(--icons-hover);
-  background-color: var(--icon-btn-bg-hover);
-}
-
-.ib-hidden-desktop {
-  display: none;
-}
-
-.header-bar {
-  position: sticky;
-  top: 0;
-  z-index: 100;
-  padding: 12px 24px;
-  background-color: var(--sidebar-bg);
-  border-bottom: 1px solid var(--divider);
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  flex-shrink: 0;
-}
-
-.header-bar .left-container {
-  width: 160px;
-  display: flex;
-  align-items: center;
-  gap: 8px;
-}
-
-.header-bar .right-container {
-  width: 160px;
-  display: flex;
-  align-items: center;
-  gap: 4px;
-}
-
-.logo-nav {
-  display: block;
-  filter: var(--logo-brightness);
-}
-
-.nav-chapters {
-  font-size: 2.5em;
-  text-align: center;
-  text-decoration: none;
-
-  position: fixed;
-  top: 0;
-  bottom: 0;
-  margin: 0;
-  max-width: 150px;
-  min-width: 90px;
-
-  display: flex;
-  justify-content: center;
-  align-content: center;
-  flex-direction: column;
-
-  transition:
-    color 0.5s,
-    background-color 0.5s;
-}
-
-.nav-chapters:hover {
-  text-decoration: none;
-  background-color: var(--theme-hover);
-  transition:
-    background-color 0.15s,
-    color 0.15s;
-}
-
-.nav-wrapper {
-  margin-block-start: 50px;
-  display: none;
-}
-
-.footer-buttons {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  gap: 1rem;
-  padding: 24px 0;
-}
-
-.footer-button {
-  width: 100%;
-  padding: 12px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  gap: 0.5rem;
-  background-color: var(--footer-btn-bg);
-  border: 1px solid var(--footer-btn-border);
-  border-radius: 0.5rem;
-  font-size: 0.9em;
-}
-
-.footer-button:hover {
-  background-color: var(--footer-btn-bg-hover);
-  border-color: var(--footer-btn-border-hover);
-}
-
-.footer-button i {
-  text-decoration: underline !important;
-  text-decoration-color: transparent !important;
-}
-
-.mobile-nav-chapters {
-  font-size: 2.5em;
-  text-align: center;
-  text-decoration: none;
-  width: 90px;
-  border-radius: 5px;
-  background-color: var(--sidebar-bg);
-}
-
-/* Only Firefox supports flow-relative values */
-.previous {
-  float: left;
-}
-[dir="rtl"] .previous {
-  float: right;
-}
-
-/* Only Firefox supports flow-relative values */
-.next {
-  float: right;
-  right: var(--page-padding);
-}
-[dir="rtl"] .next {
-  float: left;
-  right: unset;
-  left: var(--page-padding);
-}
-
-/* Use the correct buttons for RTL layouts*/
-[dir="rtl"] .previous i.fa-angle-left:before {
-  content: "\f105";
-}
-[dir="rtl"] .next i.fa-angle-right:before {
-  content: "\f104";
-}
-
-@media only screen and (max-width: 1080px) {
-  .nav-wide-wrapper {
-    display: none;
-  }
-  .nav-wrapper {
-    display: block;
-  }
-}
-
-/* sidebar-visible */
-@media only screen and (max-width: 1380px) {
-  #sidebar-toggle-anchor:checked ~ .page-wrapper .nav-wide-wrapper {
-    display: none;
-  }
-  #sidebar-toggle-anchor:checked ~ .page-wrapper .nav-wrapper {
-    display: block;
-  }
-}
-
-/* Inline code */
-
-:not(pre) > .hljs {
-  display: inline;
-  padding: 0.1em 0.3em;
-  border-radius: 3px;
-}
-
-:not(pre):not(a) > .hljs {
-  color: var(--inline-code-color);
-  overflow-x: initial;
-}
-
-a:hover > .hljs {
-  text-decoration: underline;
-}
-
-pre {
-  background-color: var(--pre-bg);
-  border: 1px solid;
-  border-color: var(--pre-border);
-  box-shadow: var(--pre-shadow) 4px 4px 0px 0px;
-  position: relative;
-}
-pre > .hljs {
-  background-color: initial;
-}
-pre > .buttons {
-  position: absolute;
-  z-index: 100;
-  right: 0px;
-  top: 2px;
-  margin: 0px;
-  padding: 2px 0px;
-
-  color: var(--sidebar-fg);
-  cursor: pointer;
-  visibility: hidden;
-  opacity: 0;
-  transition:
-    visibility 0.1s linear,
-    opacity 0.1s linear;
-}
-pre:hover > .buttons {
-  visibility: visible;
-  opacity: 1;
-}
-pre > .buttons :hover {
-  color: var(--sidebar-active);
-  border-color: var(--border-hover);
-  background-color: var(--theme-hover);
-}
-pre > .buttons i {
-  margin-inline-start: 8px;
-}
-pre > .buttons button {
-  cursor: inherit;
-  margin: 0 4px;
-  height: 26px;
-  width: 26px;
-  font-size: 14px;
-  border-style: solid;
-  border-width: 1px;
-  border-radius: 4px;
-  border-color: var(--border);
-  background-color: var(--popover-bg);
-  transition: 100ms;
-  transition-property: color, border-color, background-color;
-  color: var(--icons);
-}
-
-pre > .playground {
-  border: none;
-  margin: 0;
-  box-shadow: none;
-  /* HACK: This serves to visually hide nested <pre> elements in "playground" code snippets.
-  A more robust solution would involve modifying the rendered HTML. */
-}
-
-@media (pointer: coarse) {
-  pre > .buttons button {
-    /* On mobile, make it easier to tap buttons. */
-    padding: 0.3rem 1rem;
-  }
-
-  .sidebar-resize-indicator {
-    /* Hide resize indicator on devices with limited accuracy */
-    display: none;
-  }
-}
-pre > code {
-  display: block;
-  padding: 1rem;
-}
-
-/* TODO: ACE editors overlap their buttons because ACE does absolute
-   positioning within the code block which breaks padding. The only solution I
-   can think of is to move the padding to the outer pre tag (or insert a div
-   wrapper), but that would require fixing a whole bunch of CSS rules.
-*/
-.hljs.ace_editor {
-  padding: 0rem 0rem;
-}
-
-pre > .result {
-  margin-block-start: 10px;
-}
-
-/* Search */
-
-#searchresults a {
-  text-decoration: none;
-}
-
-mark {
-  border-radius: 2px;
-  padding-block-start: 0;
-  padding-block-end: 1px;
-  padding-inline-start: 3px;
-  padding-inline-end: 3px;
-  margin-block-start: 0;
-  margin-block-end: -1px;
-  margin-inline-start: -3px;
-  margin-inline-end: -3px;
-  background-color: var(--search-mark-bg);
-  transition: background-color 300ms linear;
-  cursor: pointer;
-}
-
-mark.fade-out {
-  background-color: rgba(0, 0, 0, 0) !important;
-  cursor: auto;
-}
-
-.searchbar-outer {
-  margin-inline-start: auto;
-  margin-inline-end: auto;
-  max-width: var(--content-max-width);
-}
-
-#searchbar {
-  width: 100%;
-  margin-block-start: 5px;
-  margin-block-end: 0;
-  margin-inline-start: auto;
-  margin-inline-end: auto;
-  padding: 10px 16px;
-  transition: box-shadow 300ms ease-in-out;
-  border: 1px solid var(--searchbar-border-color);
-  border-radius: 3px;
-  background-color: var(--searchbar-bg);
-  color: var(--searchbar-fg);
-}
-#searchbar:focus,
-#searchbar.active {
-  box-shadow: 0 0 3px var(--searchbar-shadow-color);
-  outline: none;
-  border-color: var(--search-mark-bg);
-}
-
-.searchresults-header {
-  font-weight: bold;
-  font-size: 1em;
-  padding-block-start: 18px;
-  padding-block-end: 0;
-  padding-inline-start: 5px;
-  padding-inline-end: 0;
-  color: var(--searchresults-header-fg);
-}
-
-ul#searchresults {
-  list-style: none;
-  padding-inline-start: 0;
-}
-ul#searchresults li {
-  margin: 10px 0px;
-  padding: 2px;
-  border-radius: 2px;
-}
-ul#searchresults li.focus {
-  background-color: var(--searchresults-li-bg);
-}
-ul#searchresults span.teaser {
-  display: block;
-  font-size: 0.8em;
-  margin-block-start: 5px;
-  margin-inline-start: 4px;
-  padding-inline-start: 2ch;
-  border-left: 1px solid var(--divider);
-}
-ul#searchresults span.teaser em {
-  font-weight: bold;
-  color: var(--full-contrast);
-  background: var(--code-bg);
-}
-
-/* Sidebar */
-
-.sidebar {
-  position: relative;
-  width: var(--sidebar-width);
-  flex-shrink: 0;
-  display: flex;
-  flex-direction: column;
-  font-size: 0.875em;
-  box-sizing: border-box;
-  -webkit-overflow-scrolling: touch;
-  overscroll-behavior-y: none;
-  overflow: hidden;
-  background-color: var(--sidebar-bg);
-  color: var(--sidebar-fg);
-  border-right: 1px solid var(--divider);
-}
-
-[dir="rtl"] .sidebar {
-  left: unset;
-  right: 0;
-}
-.sidebar-resizing {
-  -moz-user-select: none;
-  -webkit-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-.no-js .sidebar,
-.js:not(.sidebar-resizing) .sidebar {
-  transition: transform 0.3s; /* Animation: slide away */
-}
-.sidebar code {
-  line-height: 2em;
-}
-.sidebar .sidebar-scrollbox {
-  flex: 1;
-  overflow-y: auto;
-  min-height: 0;
-}
-
-.sidebar .sidebar-resize-handle {
-  position: absolute;
-  cursor: col-resize;
-  width: 0;
-  right: calc(var(--sidebar-resize-indicator-width) * -1);
-  top: 0;
-  bottom: 0;
-  display: flex;
-  align-items: center;
-}
-
-.sidebar-resize-handle .sidebar-resize-indicator {
-  width: 100%;
-  height: 12px;
-  background-color: var(--icons);
-  margin-inline-start: var(--sidebar-resize-indicator-space);
-}
-
-[dir="rtl"] .sidebar .sidebar-resize-handle {
-  left: calc(var(--sidebar-resize-indicator-width) * -1);
-  right: unset;
-}
-.js .sidebar .sidebar-resize-handle {
-  cursor: col-resize;
-  width: calc(
-    var(--sidebar-resize-indicator-width) -
-      var(--sidebar-resize-indicator-space)
-  );
-}
-.sidebar::-webkit-scrollbar {
-  background: var(--sidebar-bg);
-}
-.sidebar::-webkit-scrollbar-thumb {
-  background: var(--scrollbar);
-}
-
-@media only screen and (max-width: 780px) {
-  .sidebar {
-    position: fixed;
-    top: 0;
-    left: 0;
-    height: 100vh;
-    padding-top: 57px; /* Account for header height */
-    transform: translateX(-100%);
-    z-index: 99;
-    transition: transform 0.1s ease;
-  }
-
-  [dir="rtl"] .sidebar {
-    left: unset;
-    right: 0;
-    transform: translateX(100%);
-  }
-
-  body.sidebar-open .sidebar {
-    box-shadow: var(--sidebar-mobile-shadow);
-    transform: translateX(0);
-  }
-}
-
-.chapter {
-  list-style: none outside none;
-  padding: 8px 20px 20px 20px;
-  line-height: 2.2em;
-  margin: 0;
-}
-
-.chapter ol {
-  width: 100%;
-}
-
-.chapter li {
-  display: flex;
-  color: var(--sidebar-non-existant);
-}
-
-.chapter li a {
-  display: block;
-  padding: 0 4px;
-  text-decoration: none;
-  color: var(--sidebar-fg);
-}
-
-.chapter li a:hover {
-  color: var(--sidebar-active);
-}
-
-.chapter li a.active {
-  color: var(--sidebar-active);
-  background-color: var(--sidebar-active-bg);
-}
-
-.chapter li > a.toggle {
-  cursor: pointer;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-inline-start: auto;
-  user-select: none;
-  opacity: 0.5;
-  border-radius: 4px;
-  transition:
-    opacity 0.15s ease,
-    background-color 0.15s ease;
-}
-
-.chapter li > a.toggle:hover {
-  opacity: 1;
-  background-color: var(--theme-hover);
-}
-
-.chapter li.chapter-item {
-  display: flex;
-  flex-wrap: wrap;
-  align-items: center;
-  line-height: 1.5em;
-  margin-block-start: 0.6em;
-}
-
-.chapter li.chapter-item > a:first-child {
-  flex: 1;
-  min-width: 0;
-}
-
-.chapter li.expanded > a.toggle div {
-  transform: rotate(90deg);
-}
-
-.chapter li.part-title {
-  font-size: 1.4rem;
-  padding: 0 8px 0 4px;
-  color: var(--title-color);
-  cursor: pointer;
-  user-select: none;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  line-height: auto;
-  border-radius: 2px;
-}
-
-.chapter li.part-title.collapsible:hover {
-  background-color: var(--hover-section-title);
-}
-
-.chapter li.part-title.collapsible::after {
-  content: "❯";
-  display: inline-block;
-  font-size: 1.2rem;
-  opacity: 0.6;
-  transition: transform 0.2s ease;
-  flex-shrink: 0;
-}
-
-.chapter li.part-title.collapsible.expanded::after {
-  transform: rotate(90deg);
-}
-
-.chapter li.section-spacer {
-  height: 2rem;
-  list-style: none;
-}
-
-.chapter li.section-hidden {
-  display: none !important;
-}
-
-.section {
-  list-style: none outside none;
-  padding-inline-start: 3ch;
-  line-height: 1.9em;
-}
-
-.theme-popup {
-  position: absolute;
-  right: 155px;
-  top: calc(var(--menu-bar-height) - 18px);
-  z-index: 1000;
-  border-radius: 4px;
-  font-size: 1.4rem;
-  color: var(--fg);
-  background: var(--popover-bg);
-  border: 1px solid var(--popover-border);
-  margin: 0;
-  padding: 0;
-  list-style: none;
-  display: none;
-  overflow: hidden;
-}
-
-[dir="rtl"] .theme-popup {
-  left: unset;
-  right: 10px;
-}
-.theme-popup .default {
-  color: var(--icons);
-}
-.theme-popup .theme {
-  width: 100%;
-  border: 0;
-  margin: 0;
-  padding: 2px 24px;
-  line-height: 25px;
-  white-space: nowrap;
-  text-align: start;
-  cursor: pointer;
-  color: inherit;
-  background: inherit;
-  font-size: inherit;
-  font-family: inherit;
-}
-.theme-popup .theme:hover {
-  background-color: var(--theme-hover);
-}
-
-.theme-selected::before {
-  font-family: Arial, Helvetica, sans-serif;
-  text-align: center;
-  display: inline-block;
-  content: "✓";
-  margin-inline-start: -20px;
-  width: 20px;
-}
-
-.download-button {
-  max-height: 28px;
-  margin-left: 8px;
-  background: var(--download-btn-bg);
-  color: var(--download-btn-color);
-  padding: 4px 8px;
-  border: 1px solid;
-  border-color: var(--download-btn-border);
-  font-size: 1.4rem;
-  border-radius: 4px;
-  box-shadow: var(--download-btn-shadow) 0px -2px 0px 0px inset;
-  text-decoration: none;
-  transition: 100ms;
-  transition-property: box-shadow, border-color, background-color;
-}
-
-.download-button:hover {
-  background: var(--download-btn-bg);
-  border-color: var(--download-btn-border-hover);
-  box-shadow: none;
-}
-
-.search-button {
-  min-width: 100px;
-  max-width: 300px;
-  height: 28px;
-  width: 100%;
-  padding: 4px 4px 4px 8px;
-  display: flex;
-  gap: 8px;
-  background: var(--search-btn-bg);
-  border: 1px solid;
-  border-color: var(--search-btn-border);
-  font-size: 1.4rem;
-  font-family: var(--font);
-  color: var(--icons);
-  border-radius: 4px;
-  transition: 100ms;
-  transition-property: box-shadow, border-color, background-color;
-}
-
-.search-button:hover {
-  background: var(--search-btn-bg-hover);
-}
-
-.search-button .icon {
-  width: 12px;
-  height: 12px;
-  transform: translateY(10%);
-  scale: 0.9;
-}
-
-.search-content-desktop {
-  width: 100%;
-  display: flex;
-  justify-content: space-between;
-}
-
-.search-content-mobile {
-  display: none;
-}
-
-.search-container {
-  box-sizing: border-box;
-  position: fixed;
-  inset: 0;
-  z-index: 1000;
-  padding: 24px;
-  padding-top: 72px;
-  background-color: rgba(0, 0, 0, 0.5);
-  display: none;
-  justify-content: center;
-}
-
-.search-container:has(#search-wrapper:not(.hidden)) {
-  display: flex;
-}
-
-.search-modal {
-  box-sizing: border-box;
-
-  max-width: 600px;
-  min-width: 600px;
-  height: fit-content;
-  max-height: 600px;
-  display: flex;
-  flex-direction: column;
-  padding: 16px;
-  overflow-y: auto;
-
-  border-radius: 8px;
-  background: var(--popover-bg);
-  border: 1px solid var(--popover-border);
-  box-shadow: var(--popover-shadow);
-}
-
-.searchbar-outer {
-  width: 100%;
-}
-
-#searchbar {
-  margin: 0;
-}
-
-@media only screen and (max-width: 780px) {
-  .header-bar {
-    padding: 16px;
-    justify-content: start;
-  }
-
-  .download-button {
-    display: none;
-  }
-
-  .ib-hidden-mobile {
-    display: none;
-  }
-
-  .header-bar .left-container {
-    width: fit-content;
-  }
-
-  .header-bar .right-container {
-    width: fit-content;
-  }
-
-  .search-button {
-    width: 100px;
-    margin-left: auto;
-    margin-right: 8px;
-  }
-
-  .ib-hidden-desktop {
-    display: block;
-  }
-
-  .search-modal {
-    width: 90vw;
-    min-width: auto;
-  }
-
-  .search-content-desktop {
-    display: none;
-  }
-
-  .search-content-mobile {
-    display: flex;
-  }
-
-  .theme-popup {
-    right: 15px;
-  }
-}
diff --git a/docs/theme/css/general.css b/docs/theme/css/general.css
deleted file mode 100644
index 9d4791ea40..0000000000
--- a/docs/theme/css/general.css
+++ /dev/null
@@ -1,452 +0,0 @@
-/* Base styles and content styles */
-
-@import "variables.css";
-
-:root {
-  /* Browser default font-size is 16px, this way 1 rem = 10px */
-  font-size: 62.5%;
-  color-scheme: var(--color-scheme);
-}
-
-html {
-  font-family: var(--font);
-  color: var(--fg);
-  background-color: var(--bg);
-  text-size-adjust: none;
-  -webkit-text-size-adjust: none;
-
-  text-rendering: geometricPrecision !important;
-  -webkit-font-smoothing: antialiased !important;
-  text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.005);
-}
-
-body {
-  margin: 0;
-  font-size: 1.6rem;
-  overflow: hidden;
-  height: 100vh;
-  overscroll-behavior-y: none;
-}
-
-#body-container {
-  display: flex;
-  flex-direction: column;
-  height: 100vh;
-  overflow: hidden;
-}
-
-code {
-  font-family: var(--mono-font) !important;
-  font-size: var(--code-font-size);
-  direction: ltr !important;
-}
-
-/* make long words/inline code not x overflow */
-main {
-  overflow-wrap: break-word;
-}
-
-.noise-pattern {
-  pointer-events: none;
-  user-select: none;
-  z-index: 105;
-  position: absolute;
-  inset: 0;
-  background-size: 180px;
-  background-repeat: repeat;
-  opacity: var(--noise-opacity);
-}
-
-/* make wide tables scroll if they overflow */
-.table-wrapper {
-  overflow-x: auto;
-}
-
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  position: relative;
-  font-family: var(--title-font);
-  font-weight: 480;
-  color: var(--title-color);
-}
-
-/* Don't change font size in headers. */
-h1 code,
-h2 code,
-h3 code,
-h4 code,
-h5 code,
-h6 code {
-  font-size: unset;
-}
-
-.left {
-  float: left;
-}
-.right {
-  float: right;
-}
-.boring {
-  opacity: 0.6;
-}
-.hide-boring .boring {
-  display: none;
-}
-.hidden {
-  display: none !important;
-}
-
-h1 {
-  font-size: 3.4rem;
-}
-
-h2 {
-  padding-bottom: 1rem;
-  border-bottom: 1px solid;
-  border-color: var(--border-light);
-}
-
-h3 {
-  font-size: 2rem;
-  padding-bottom: 0.8rem;
-  border-bottom: 1px dashed;
-  border-color: var(--border-light);
-}
-
-h4 {
-  font-size: 1.8rem;
-}
-
-h5 {
-  font-size: 1.6rem;
-}
-
-h2,
-h3,
-h4,
-h5 {
-  margin-block-start: 1.5em;
-  margin-block-end: 0;
-}
-
-code:focus-visible,
-pre:focus-visible,
-li:focus-visible,
-button:focus-visible,
-a:focus-visible {
-  outline: 3px solid #094ece80;
-}
-
-.header + .header h3,
-.header + .header h4,
-.header + .header h5 {
-  margin-block-start: 1em;
-}
-
-h1:target::before,
-h2:target::before,
-h3:target::before,
-h4:target::before,
-h5:target::before,
-h6:target::before {
-  content: "»";
-  position: absolute;
-  left: -1.5ch;
-}
-
-hr {
-  border: 0px solid;
-  color: transparent;
-  width: 100%;
-  height: 1px;
-  background-color: var(--border-light);
-}
-
-/* This is broken on Safari as of version 14, but is fixed
-   in Safari Technology Preview 117 which I think will be Safari 14.2.
-   https://bugs.webkit.org/show_bug.cgi?id=218076
-*/
-:target {
-  /* Safari does not support logical properties */
-  scroll-margin-top: calc(var(--menu-bar-height) + 2rem);
-}
-
-.page-wrapper {
-  box-sizing: border-box;
-  background-color: var(--bg);
-  display: flex;
-  flex: 1;
-  overflow: hidden;
-  min-height: 0;
-}
-
-.page {
-  outline: 0;
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  overflow-x: hidden;
-  overflow-y: auto;
-  overscroll-behavior-y: none;
-  min-width: 0;
-  position: relative;
-}
-
-.no-js .page-wrapper,
-.js:not(.sidebar-resizing) .page-wrapper {
-  transition:
-    margin-left 0.3s ease,
-    transform 0.3s ease; /* Animation: slide away */
-}
-[dir="rtl"] .js:not(.sidebar-resizing) .page-wrapper {
-  transition:
-    margin-right 0.3s ease,
-    transform 0.3s ease; /* Animation: slide away */
-}
-
-.content {
-  padding: 48px 32px 0 32px;
-  display: flex;
-  justify-content: space-between;
-  gap: 36px;
-}
-
-.content main {
-  margin-inline-start: auto;
-  margin-inline-end: auto;
-  max-width: var(--content-max-width);
-}
-
-.content p {
-  line-height: 1.625em;
-}
-.content div.video {
-  z-index: 150;
-  margin-top: 1rem;
-  border: 1px solid;
-  border-color: var(--border);
-  border-radius: 8px;
-  overflow: clip;
-}
-.content div.video iframe {
-  margin: 0;
-}
-.content ol {
-  marker: none;
-  line-height: 1.8;
-  padding-left: 2em;
-  ::marker {
-    font-size: 1.4rem;
-  }
-  li {
-    padding-left: 0;
-  }
-}
-.content ul {
-  line-height: 1.8;
-  padding-left: 1.8em;
-}
-.content a {
-  text-decoration: underline;
-  text-decoration-color: var(--link-line-decoration);
-}
-.content a:hover {
-  text-decoration-color: var(--link-line-decoration-hover);
-}
-.content img,
-.content video {
-  position: relative;
-  z-index: 150;
-  max-width: 100%;
-  background-color: var(--media-bg);
-  border: 1px solid;
-  border-color: var(--border);
-  border-radius: 8px;
-  overflow: clip;
-}
-.content .header:link,
-.content .header:visited {
-  color: var(--title-color);
-}
-.content .header:link,
-.content .header:visited:hover {
-  text-decoration: none;
-}
-
-iframe {
-  margin-top: 1rem;
-  margin-bottom: 10rem;
-}
-
-table {
-  margin-top: 1.4rem;
-  width: 100%;
-  border-collapse: collapse;
-  font-size: 1.4rem;
-}
-table td {
-  padding: 4px 12px;
-  border: 1px var(--table-border-color) solid;
-}
-table thead {
-  background: var(--table-header-bg);
-}
-table thead td {
-  font-weight: 700;
-  border: none;
-}
-table thead th {
-  padding: 6px 12px;
-  color: var(--full-contrast);
-  text-align: left;
-  border: 1px var(--table-border-color) solid;
-}
-table thead tr {
-  border: 1px var(--table-border-color) solid;
-}
-/* Alternate background colors for rows */
-table tbody tr:nth-child(2n) {
-  background: var(--table-alternate-bg);
-}
-
-blockquote {
-  margin: auto;
-  margin-top: 1rem;
-  padding: 1rem 1.25rem;
-  color: var(--full-contrast);
-  background-color: var(--quote-bg);
-  border: 1px solid var(--quote-border);
-}
-
-blockquote > p {
-  margin: 0;
-  padding-left: 2.6rem;
-  font-size: 1.4rem;
-}
-
-blockquote:before {
-  --size: 1.4rem;
-  position: absolute;
-  content: "ⓘ";
-  margin: 0.3rem 0;
-  width: var(--size);
-  height: var(--size);
-  font-size: var(--size);
-  font-weight: bold;
-  color: var(--icons);
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  line-height: 1.625em;
-}
-
-blockquote .warning:before {
-  background-color: var(--quote-bg);
-}
-
-.warning {
-  margin: auto;
-  padding: 1rem 1.25rem;
-  color: var(--full-contrast);
-  background-color: var(--warning-bg);
-  border: 1px solid var(--warning-border);
-}
-
-.warning > p {
-  margin: 0;
-  padding-left: 2.6rem;
-  font-size: 1.4rem;
-}
-
-.warning:before {
-  --size: 1.4rem;
-  position: absolute;
-  content: "ⓘ";
-  margin: 0.3rem 0;
-  width: var(--size);
-  height: var(--size);
-  font-size: var(--size);
-  font-weight: bold;
-  color: var(--warning-icon);
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  line-height: 1.625em;
-}
-
-kbd {
-  background-color: rgba(8, 76, 207, 0.1);
-  border-radius: 4px;
-  border: solid 1px var(--popover-border);
-  box-shadow: inset 0 -1px 0 var(--theme-hover);
-  display: inline-block;
-  font-size: var(--code-font-size);
-  font-family: var(--mono-font);
-  line-height: 10px;
-  padding: 4px 5px;
-  vertical-align: middle;
-}
-
-:not(.footnote-definition) + .footnote-definition,
-.footnote-definition + :not(.footnote-definition) {
-  margin-block-start: 2em;
-}
-.footnote-definition {
-  font-size: 1.4rem;
-  margin: 0.5em 0;
-  border-bottom: 1px solid;
-  border-color: var(--divider);
-}
-.footnote-definition p {
-  display: inline;
-}
-
-.tooltiptext {
-  position: absolute;
-  visibility: hidden;
-  color: #fff;
-  background-color: #333;
-  transform: translateX(
-    -50%
-  ); /* Center by moving tooltip 50% of its width left */
-  left: -8px; /* Half of the width of the icon */
-  top: -35px;
-  font-size: 0.8em;
-  text-align: center;
-  border-radius: 6px;
-  padding: 5px 8px;
-  margin: 5px;
-  z-index: 1000;
-}
-.tooltipped .tooltiptext {
-  visibility: visible;
-}
-
-.result-no-output {
-  font-style: italic;
-}
-
-code:not(pre code).hljs {
-  color: var(--code-text) !important;
-  background-color: var(--code-bg) !important;
-}
-
-@media only screen and (max-width: 1020px) {
-  .content {
-    padding: 16px 32px 0 32px;
-  }
-
-  .content main {
-    width: 100%;
-  }
-}
-
-@media only screen and (max-width: 400px) {
-  .content {
-    padding: 16px 16px 0 16px;
-  }
-}
diff --git a/docs/theme/css/variables.css b/docs/theme/css/variables.css
deleted file mode 100644
index 285540c6dc..0000000000
--- a/docs/theme/css/variables.css
+++ /dev/null
@@ -1,208 +0,0 @@
-/* Globals */
-
-:root {
-  --color-scheme: light;
-
-  --logo-brightness: brightness(1);
-
-  --sidebar-width: 280px;
-  --sidebar-resize-indicator-width: 0px;
-  --sidebar-resize-indicator-space: 2px;
-  --page-padding: 15px;
-  --content-max-width: 690px;
-  --menu-bar-height: 64px;
-  --font: "IA Writer Quattro S", sans-serif;
-  --title-font: "Lora", "Helvetica Neue", Helvetica, Arial, sans-serif;
-  --mono-font:
-    ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, Liberation Mono,
-    Courier New, monospace;
-  --code-font-size: 0.875em
-    /* please adjust the ace font size accordingly in editor.js */;
-
-  --noise-opacity: 0.024;
-  --bg: hsla(50, 25%, 96%);
-  --fg: hsl(220, 13%, 34%);
-  --title-color: hsl(220, 92%, 42%);
-
-  --border: hsl(220, 13%, 80%);
-  --border-light: hsl(220, 13%, 90%);
-  --border-hover: hsl(220, 13%, 70%);
-
-  --media-bg: hsl(50, 25%, 92%);
-
-  --sidebar-bg: hsla(50, 25%, 94%);
-  --sidebar-fg: hsl(0, 0%, 0%);
-  --sidebar-non-existant: #aaaaaa;
-  --sidebar-active: hsl(220, 93%, 42%);
-  --sidebar-active-bg: hsl(220, 93%, 42%, 0.1);
-  --sidebar-mobile-shadow: 0px 16px 16px hsl(0, 0%, 0%, 0.1);
-
-  --divider: hsl(220, 50%, 45%, 0.1);
-  --scrollbar: #8f8f8f;
-
-  --icons: #747474;
-  --icons-hover: #000000;
-  --icon-btn-bg-hover: hsl(220, 93%, 42%, 0.15);
-
-  --links: hsl(220, 92%, 42%);
-  --link-line-decoration: hsl(220, 93%, 42%, 0.2);
-  --link-line-decoration-hover: hsl(220, 93%, 42%, 0.5);
-
-  --full-contrast: #000;
-
-  --inline-code-color: #301900;
-  --code-text: hsl(220, 13%, 10%);
-  --code-bg: hsl(220, 93%, 42%, 0.1);
-  --keybinding-bg: hsl(0, 0%, 94%);
-
-  --pre-bg: #fff;
-  --pre-border: hsla(220, 93%, 42%, 0.3);
-  --pre-shadow: hsla(220, 93%, 42%, 0.07);
-
-  --popover-bg: #fafafa;
-  --popover-border: #cccccc;
-  --popover-shadow:
-    0 10px 15px -3px hsl(0, 0%, 0%, 0.1), 0 4px 6px -4px hsl(0, 0%, 0%, 0.1);
-
-  --theme-hover: #e6e6e6;
-  --hover-section-title: hsl(50, 25%, 88%);
-
-  --quote-bg: hsl(197, 37%, 96%);
-  --quote-border: hsl(197, 37%, 84%);
-
-  --warning-border: hsl(25, 100%, 85%);
-  --warning-bg: hsl(42, 100%, 60%, 0.1);
-  --warning-icon: hsl(42, 100%, 30%);
-
-  --table-header-bg: hsl(220, 50%, 90%, 0.4);
-  --table-border-color: hsl(220, 93%, 42%, 0.15);
-  --table-alternate-bg: hsl(220, 10%, 90%, 0.4);
-
-  --toc-link-underline: hsl(0, 0%, 0%, 0.1);
-  --toc-link-underline-hover: hsl(0, 0%, 0%, 0.5);
-
-  --searchbar-border-color: #aaa;
-  --searchbar-bg: #fafafa;
-  --searchbar-fg: #000;
-  --searchbar-shadow-color: #aaa;
-  --searchresults-header-fg: #666;
-  --searchresults-li-bg: #e4f2fe;
-  --search-mark-bg: #a2cff5;
-
-  --download-btn-bg: hsl(220, 60%, 95%);
-  --download-btn-bg-hover: hsl(220, 60%, 93%);
-  --download-btn-color: hsl(220, 60%, 30%);
-  --download-btn-border: hsla(220, 60%, 40%, 0.2);
-  --download-btn-border-hover: hsla(220, 60%, 50%, 0.2);
-  --download-btn-shadow: hsla(220, 40%, 60%, 0.1);
-
-  --search-btn-bg: hsl(220, 100%, 100%);
-  --search-btn-bg-hover: hsla(50, 25%, 97%);
-  --search-btn-border: hsl(220, 50%, 45%, 0.2);
-
-  --toast-bg: hsla(220, 93%, 98%);
-  --toast-border: hsla(220, 93%, 42%, 0.3);
-  --toast-border-success: hsla(120, 73%, 42%, 0.3);
-  --toast-border-error: hsla(0, 90%, 50%, 0.3);
-
-  --footer-btn-bg: hsl(220, 60%, 98%, 0.4);
-  --footer-btn-bg-hover: hsl(220, 60%, 93%, 0.5);
-  --footer-btn-border: hsla(220, 60%, 40%, 0.15);
-  --footer-btn-border-hover: hsla(220, 60%, 50%, 0.2);
-}
-
-.dark {
-  --color-scheme: dark;
-
-  --logo-brightness: brightness(2);
-
-  --noise-opacity: 0.012;
-  --bg: hsl(220, 13%, 7.5%);
-  --fg: hsl(220, 14%, 70%);
-  --title-color: hsl(220, 92%, 80%);
-
-  --border: hsl(220, 13%, 20%);
-  --border-light: hsl(220, 13%, 15%);
-  --border-hover: hsl(220, 13%, 40%);
-
-  --media-bg: hsl(220, 13%, 8%);
-
-  --sidebar-bg: hsl(220, 13%, 6.5%);
-  --sidebar-fg: hsl(220, 14%, 71%);
-  --sidebar-non-existant: #505254;
-  --sidebar-active: hsl(220, 92%, 75%);
-  --sidebar-active-bg: hsl(220, 93%, 42%, 0.25);
-  --sidebar-mobile-shadow: 0px 16px 16px hsl(0, 0%, 0%, 0.6);
-
-  --divider: hsl(220, 13%, 12%);
-  --scrollbar: hsl(220, 13%, 30%);
-
-  --icons: hsl(220, 14%, 71%);
-  --icons-hover: hsl(220, 14%, 90%);
-  --icon-btn-bg-hover: hsl(220, 93%, 42%, 0.4);
-
-  --links: hsl(220, 93%, 75%);
-  --link-line-decoration: hsl(220, 92%, 80%, 0.4);
-  --link-line-decoration-hover: hsl(220, 92%, 80%, 0.8);
-  --full-contrast: #fff;
-
-  --inline-code-color: hsl(40, 100%, 80%);
-  --code-text: hsl(220, 13%, 95%);
-  --code-bg: hsl(220, 93%, 50%, 0.2);
-  --keybinding-bg: hsl(0, 0%, 12%);
-
-  --pre-bg: hsl(220, 13%, 5%);
-  --pre-border: hsla(220, 93%, 70%, 0.3);
-  --pre-shadow: hsla(220, 93%, 70%, 0.1);
-
-  --popover-bg: hsl(220, 13%, 8%);
-  --popover-border: hsl(220, 13%, 20%);
-  --popover-shadow:
-    0 10px 15px -3px hsl(0, 0%, 0%, 0.1), 0 4px 6px -4px hsl(0, 0%, 0%, 0.1);
-
-  --theme-hover: hsl(220, 13%, 25%);
-  --hover-section-title: hsl(220, 13%, 11%);
-
-  --quote-bg: hsl(220, 13%, 25%, 0.4);
-  --quote-border: hsl(220, 13%, 32%, 0.5);
-
-  --table-border-color: hsl(220, 13%, 30%, 0.5);
-  --table-header-bg: hsl(220, 13%, 25%, 0.5);
-  --table-alternate-bg: hsl(220, 13%, 20%, 0.4);
-
-  --toc-link-underline: hsl(255, 100%, 100%, 0.1);
-  --toc-link-underline-hover: hsl(255, 100%, 100%, 0.4);
-
-  --warning-border: hsl(25, 100%, 85%, 0.2);
-  --warning-bg: hsl(42, 100%, 40%, 0.1);
-  --warning-icon: hsl(42, 100%, 80%);
-
-  --searchbar-border-color: hsl(220, 13%, 30%);
-  --searchbar-bg: hsl(220, 13%, 22%, 0.5);
-  --searchbar-fg: hsl(220, 14%, 71%);
-  --searchbar-shadow-color: hsl(220, 13%, 15%);
-  --searchresults-header-fg: hsl(220, 14%, 60%);
-  --searchresults-li-bg: hsl(220, 13%, 25%);
-  --search-mark-bg: hsl(220, 93%, 60%);
-
-  --download-btn-bg: hsl(220, 90%, 90%, 0.1);
-  --download-btn-bg-hover: hsl(220, 90%, 50%, 0.2);
-  --download-btn-color: hsl(220, 90%, 95%);
-  --download-btn-border: hsla(220, 90%, 80%, 0.2);
-  --download-btn-border-hover: hsla(220, 90%, 80%, 0.4);
-  --download-btn-shadow: hsla(220, 50%, 60%, 0.15);
-
-  --search-btn-bg: hsl(220, 90%, 90%, 0.05);
-  --search-btn-bg-hover: hsl(220, 90%, 90%, 0.1);
-  --search-btn-border: hsla(220, 90%, 80%, 0.1);
-
-  --toast-bg: hsla(220, 20%, 98%, 0.05);
-  --toast-border: hsla(220, 93%, 70%, 0.2);
-  --toast-border-success: hsla(120, 90%, 60%, 0.3);
-  --toast-border-error: hsla(0, 90%, 80%, 0.3);
-
-  --footer-btn-bg: hsl(220, 90%, 95%, 0.01);
-  --footer-btn-bg-hover: hsl(220, 90%, 50%, 0.05);
-  --footer-btn-border: hsla(220, 90%, 90%, 0.05);
-  --footer-btn-border-hover: hsla(220, 90%, 80%, 0.2);
-}
diff --git a/docs/theme/favicon.png b/docs/theme/favicon.png
deleted file mode 100644
index 4621223567..0000000000
Binary files a/docs/theme/favicon.png and /dev/null differ
diff --git a/docs/theme/fonts/Lora.var.woff2 b/docs/theme/fonts/Lora.var.woff2
deleted file mode 100644
index e2d8990a7e..0000000000
Binary files a/docs/theme/fonts/Lora.var.woff2 and /dev/null differ
diff --git a/docs/theme/fonts/fonts.css b/docs/theme/fonts/fonts.css
deleted file mode 100644
index f55cb6ee89..0000000000
--- a/docs/theme/fonts/fonts.css
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Open Sans is licensed under the Apache License, Version 2.0. See http://www.apache.org/licenses/LICENSE-2.0 */
-/* Source Code Pro is under the Open Font License. See https://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL */
-/* open-sans-300 - latin_vietnamese_latin-ext_greek-ext_greek_cyrillic-ext_cyrillic */
-
-@font-face {
-  font-family: "IA Writer Quattro S";
-  font-style: normal;
-  font-weight: 400;
-  src: url("iAWriterQuattroS-Regular.woff2") format("woff2");
-}
-
-@font-face {
-  font-family: "Lora";
-  src: url("Lora.var.woff2") format("woff2-variations");
-  font-weight: 100 900;
-  font-style: normal;
-}
diff --git a/docs/theme/fonts/iAWriterQuattroS-Regular.woff2 b/docs/theme/fonts/iAWriterQuattroS-Regular.woff2
deleted file mode 100644
index a25cdbcdd3..0000000000
Binary files a/docs/theme/fonts/iAWriterQuattroS-Regular.woff2 and /dev/null differ
diff --git a/docs/theme/highlight.css b/docs/theme/highlight.css
deleted file mode 100644
index 9bd80f3516..0000000000
--- a/docs/theme/highlight.css
+++ /dev/null
@@ -1,252 +0,0 @@
-/*!
-  Theme: GitHub
-  Description: Light theme as seen on github.com
-  Author: github.com
-  Maintainer: @Hirse
-  Updated: 2021-05-15
-
-  Outdated base version: https://github.com/primer/github-syntax-light
-  Current colors taken from GitHub's CSS
-*/
-
-.hljs {
-  color: #24292e;
-  background: #ffffff;
-  overflow-x: auto;
-}
-
-.hljs-doctag,
-.hljs-keyword,
-.hljs-meta .hljs-keyword,
-.hljs-template-tag,
-.hljs-template-variable,
-.hljs-type,
-.hljs-variable.language_ {
-  /* prettylights-syntax-keyword */
-  color: #d73a49;
-}
-
-.hljs-title,
-.hljs-title.class_,
-.hljs-title.class_.inherited__,
-.hljs-title.function_ {
-  /* prettylights-syntax-entity */
-  color: #6f42c1;
-}
-
-.hljs-attr,
-.hljs-attribute,
-.hljs-literal,
-.hljs-meta,
-.hljs-number,
-.hljs-operator,
-.hljs-variable,
-.hljs-selector-attr,
-.hljs-selector-class,
-.hljs-selector-id {
-  /* prettylights-syntax-constant */
-  color: #005cc5;
-}
-
-.hljs-regexp,
-.hljs-string,
-.hljs-meta .hljs-string {
-  /* prettylights-syntax-string */
-  color: #032f62;
-}
-
-.hljs-built_in,
-.hljs-symbol {
-  /* prettylights-syntax-variable */
-  color: #e36209;
-}
-
-.hljs-comment,
-.hljs-code,
-.hljs-formula {
-  /* prettylights-syntax-comment */
-  color: #6a737d;
-}
-
-.hljs-name,
-.hljs-quote,
-.hljs-selector-tag,
-.hljs-selector-pseudo {
-  /* prettylights-syntax-entity-tag */
-  color: #22863a;
-}
-
-.hljs-subst {
-  /* prettylights-syntax-storage-modifier-import */
-  color: #24292e;
-}
-
-.hljs-section {
-  /* prettylights-syntax-markup-heading */
-  color: #005cc5;
-  font-weight: bold;
-}
-
-.hljs-bullet {
-  /* prettylights-syntax-markup-list */
-  color: #735c0f;
-}
-
-.hljs-emphasis {
-  /* prettylights-syntax-markup-italic */
-  color: #24292e;
-  font-style: italic;
-}
-
-.hljs-strong {
-  /* prettylights-syntax-markup-bold */
-  color: #24292e;
-  font-weight: bold;
-}
-
-.hljs-addition {
-  /* prettylights-syntax-markup-inserted */
-  color: #22863a;
-  background-color: #f0fff4;
-}
-
-.hljs-deletion {
-  /* prettylights-syntax-markup-deleted */
-  color: #b31d28;
-  background-color: #ffeef0;
-}
-
-.hljs-char.escape_,
-.hljs-link,
-.hljs-params,
-.hljs-property,
-.hljs-punctuation,
-.hljs-tag {
-  /* purposely ignored */
-}
-
-/*!
-  Theme: GitHub Dark
-  Description: Dark theme as seen on github.com
-  Author: github.com
-  Maintainer: @Hirse
-  Updated: 2021-05-15
-
-  Outdated base version: https://github.com/primer/github-syntax-dark
-  Current colors taken from GitHub's CSS
-*/
-
-.dark .hljs {
-  color: #c9d1d9;
-  background: #0d1117;
-}
-
-.dark .hljs-doctag,
-.dark .hljs-keyword,
-.dark .hljs-meta .hljs-keyword,
-.dark .hljs-template-tag,
-.dark .hljs-template-variable,
-.dark .hljs-type,
-.dark .hljs-variable.language_ {
-  /* prettylights-syntax-keyword */
-  color: #ff7b72;
-}
-
-.dark .hljs-title,
-.dark .hljs-title.class_,
-.dark .hljs-title.class_.inherited__,
-.dark .hljs-title.function_ {
-  /* prettylights-syntax-entity */
-  color: #d2a8ff;
-}
-
-.dark .hljs-attr,
-.dark .hljs-attribute,
-.dark .hljs-literal,
-.dark .hljs-meta,
-.dark .hljs-number,
-.dark .hljs-operator,
-.dark .hljs-variable,
-.dark .hljs-selector-attr,
-.dark .hljs-selector-class,
-.dark .hljs-selector-id {
-  /* prettylights-syntax-constant */
-  color: #79c0ff;
-}
-
-.dark .hljs-regexp,
-.dark .hljs-string,
-.dark .hljs-meta .hljs-string {
-  /* prettylights-syntax-string */
-  color: #a5d6ff;
-}
-
-.dark .hljs-built_in,
-.dark .hljs-symbol {
-  /* prettylights-syntax-variable */
-  color: #ffa657;
-}
-
-.dark .hljs-comment,
-.dark .hljs-code,
-.dark .hljs-formula {
-  /* prettylights-syntax-comment */
-  color: #8b949e;
-}
-
-.dark .hljs-name,
-.dark .hljs-quote,
-.dark .hljs-selector-tag,
-.dark .hljs-selector-pseudo {
-  /* prettylights-syntax-entity-tag */
-  color: #7ee787;
-}
-
-.dark .hljs-subst {
-  /* prettylights-syntax-storage-modifier-import */
-  color: #c9d1d9;
-}
-
-.dark .hljs-section {
-  /* prettylights-syntax-markup-heading */
-  color: #1f6feb;
-  font-weight: bold;
-}
-
-.dark .hljs-bullet {
-  /* prettylights-syntax-markup-list */
-  color: #f2cc60;
-}
-
-.dark .hljs-emphasis {
-  /* prettylights-syntax-markup-italic */
-  color: #c9d1d9;
-  font-style: italic;
-}
-
-.dark .hljs-strong {
-  /* prettylights-syntax-markup-bold */
-  color: #c9d1d9;
-  font-weight: bold;
-}
-
-.dark .hljs-addition {
-  /* prettylights-syntax-markup-inserted */
-  color: #aff5b4;
-  background-color: #033a16;
-}
-
-.dark .hljs-deletion {
-  /* prettylights-syntax-markup-deleted */
-  color: #ffdcd7;
-  background-color: #67060c;
-}
-
-.dark .hljs-char.escape_,
-.dark .hljs-link,
-.dark .hljs-params,
-.dark .hljs-property,
-.dark .hljs-punctuation,
-.dark .hljs-tag {
-  /* purposely ignored */
-}
diff --git a/docs/theme/index.hbs b/docs/theme/index.hbs
deleted file mode 100644
index 98f64d41c3..0000000000
--- a/docs/theme/index.hbs
+++ /dev/null
@@ -1,429 +0,0 @@
-<!DOCTYPE HTML>
-<html lang="{{ language }}" dir="{{ text_direction }}">
-    <head>
-        <!-- Book generated using mdBook -->
-        <meta charset="UTF-8">
-        <style>
-            @view-transition {
-                navigation: auto;
-            }
-            ::view-transition-old(root),
-            ::view-transition-new(root) {
-                animation-duration: 0.05s;
-            }
-        </style>
-        <!-- Theme initialization - must run before any CSS loads to prevent flicker -->
-        <script>
-            (function() {
-                var theme;
-                try { theme = localStorage.getItem('mdbook-theme'); } catch(e) { }
-                if (theme === null || theme === undefined) {
-                    theme = window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "light";
-                }
-                var html = document.documentElement;
-                html.setAttribute('data-theme', theme);
-                html.setAttribute('data-color-scheme', theme);
-                html.className = theme;
-            })();
-        </script>
-        <title>{{ title }}</title>
-        {{#if is_print }}
-        <meta name="robots" content="noindex">
-        {{/if}}
-        {{#if base_url}}
-        <base href="{{ base_url }}">
-        {{/if}}
-
-
-        <!-- Custom HTML head -->
-        {{> head}}
-
-        <meta name="description" content="#description#">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <meta name="theme-color" content="#ffffff">
-
-        <link rel="shortcut icon" href="{{ path_to_root }}favicon.png">
-        <link rel="stylesheet" href="{{ path_to_root }}css/variables.css">
-        <link rel="stylesheet" href="{{ path_to_root }}css/general.css">
-        <link rel="stylesheet" href="{{ path_to_root }}css/chrome.css">
-        {{#if print_enable}}
-        <link rel="stylesheet" href="{{ path_to_root }}css/print.css" media="print">
-        {{/if}}
-
-        <!-- Fonts -->
-        <link rel="stylesheet" href="{{ path_to_root }}FontAwesome/css/font-awesome.css">
-        {{#if copy_fonts}}
-        <link rel="stylesheet" href="{{ path_to_root }}fonts/fonts.css">
-        {{/if}}
-
-        <!-- Highlight.js Stylesheets -->
-        <link rel="stylesheet" href="{{ path_to_root }}highlight.css">
-        <link rel="stylesheet" href="{{ path_to_root }}tomorrow-night.css">
-        <link rel="stylesheet" href="{{ path_to_root }}ayu-highlight.css">
-
-        <!-- Custom theme stylesheets -->
-        {{#each additional_css}}
-        <link rel="stylesheet" href="{{ ../path_to_root }}{{ this }}">
-        {{/each}}
-
-        {{#if mathjax_support}}
-        <!-- MathJax -->
-        <script async src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
-        {{/if}}
-    </head>
-    <body class="no-js">
-    <div id="body-container">
-        <div class="noise-pattern" style="background-image: url('https://cdn.zed.dev/images/noise.png');"></div>
-
-        <!-- Provide site root to javascript -->
-        <script>
-            var path_to_root = "{{ path_to_root }}";
-            var default_theme = window.matchMedia("(prefers-color-scheme: dark)").matches ? "{{ preferred_dark_theme }}" : "{{ default_theme }}";
-            // Mark as JS-enabled
-            document.body.classList.remove('no-js');
-            document.body.classList.add('js');
-        </script>
-
-        <header class="header-bar">
-            <div class="left-container">
-                <a href="/" class="logo-nav">
-                    <img src="https://zed.dev/logo_icon.webp" class="icon-logo-img" alt="Zed Industries" style="height: 26px;">
-                </a>
-                <button id="sidebar-toggle" class="icon-button ib-hidden-desktop" type="button" title="Toggle Table of Contents" aria-label="Toggle Table of Contents" aria-controls="sidebar" aria-expanded="false">
-                    <i class="fa fa-bars"></i>
-                </button>
-            </div>
-            {{#if search_enabled}}
-            <button id="search-toggle" class="search-button" type="button" aria-expanded="false" aria-keyshortcuts="S" aria-controls="searchbar">
-                <i class="icon fa fa-search"></i>
-                <span class="search-content-desktop">
-                    <span class="placeholder">Search docs…</span>
-                    <kbd>S</kbd>
-                </span>
-                <span class="search-content-mobile">
-                    <span class="placeholder">Search…</span>
-                </span>
-            </button>
-            {{/if}}
-            <div class="right-container">
-                <button id="theme-toggle" class="icon-button" type="button" title="Change Theme" aria-label="Change Theme" aria-haspopup="true" aria-expanded="false" aria-controls="theme-list">
-                    <i class="fa fa-paint-brush"></i>
-                </button>
-
-                <ul id="theme-list" class="theme-popup" aria-label="Themes" role="menu">
-                    <li role="none"><button role="menuitem" class="theme" id="light">Light</button></li>
-                    <li role="none"><button role="menuitem" class="theme" id="dark">Dark</button></li>
-                </ul>
-
-                <button id="copy-markdown-toggle" class="icon-button ib-hidden-mobile" type="button" title="Copy Page as Markdown" aria-label="Copy page as markdown">
-                    <i class="fa fa-copy"></i>
-                </button>
-
-                <a class="download-button" href="https://zed.dev/download" title="Download Zed" aria-label="Download Zed">
-                    Download
-                </a>
-                {{#if git_repository_url}}
-                <a href="{{git_repository_url}}" title="Git repository" aria-label="Git repository">
-                    <i id="git-repository-button" class="fa {{git_repository_icon}}"></i>
-                </a>
-                {{/if}}
-                {{#if git_repository_edit_url}}
-                <a href="{{git_repository_edit_url}}" title="Suggest an edit" aria-label="Suggest an edit">
-                    <i id="git-edit-button" class="fa fa-edit"></i>
-                </a>
-                {{/if}}
-            </div>
-        </header>
-
-        <div id="page-wrapper" class="page-wrapper">
-
-            {{#if search_enabled}}
-            <div class="search-container">
-                <div id="search-wrapper" class="search-modal hidden">
-                    <form id="searchbar-outer" class="searchbar-outer">
-                        <input type="search" id="searchbar" name="searchbar" placeholder="Search…" aria-controls="searchresults-outer" aria-describedby="searchresults-header">
-                    </form>
-                    <div id="searchresults-outer" class="searchresults-outer">
-                        <div id="searchresults-header" class="searchresults-header"></div>
-                        <ul id="searchresults">
-                        </ul>
-                    </div>
-                </div>
-            </div>
-            {{/if}}
-
-            <nav id="sidebar" class="sidebar" aria-label="Table of contents">
-                <div class="sidebar-scrollbox">
-                    {{#toc}}{{/toc}}
-                </div>
-                <div style="display: none;" id="sidebar-resize-handle" class="sidebar-resize-handle">
-                    <div class="sidebar-resize-indicator"></div>
-                </div>
-            </nav>
-
-            <!-- Mobile sidebar toggle -->
-            <script>
-                (function() {
-                    var sidebarToggle = document.getElementById('sidebar-toggle');
-                    var sidebar = document.getElementById('sidebar');
-
-                    sidebarToggle.addEventListener('click', function() {
-                        var isOpen = document.body.classList.toggle('sidebar-open');
-                        sidebarToggle.setAttribute('aria-expanded', isOpen);
-                        sidebar.setAttribute('aria-hidden', !isOpen);
-                    });
-
-                    // Close sidebar when clicking a link inside it (on mobile)
-                    sidebar.addEventListener('click', function(e) {
-                        if (e.target.tagName === 'A' && window.innerWidth < 620) {
-                            document.body.classList.remove('sidebar-open');
-                            sidebarToggle.setAttribute('aria-expanded', 'false');
-                            sidebar.setAttribute('aria-hidden', 'true');
-                        }
-                    });
-                })();
-            </script>
-
-            <!-- Search backdrop handlers -->
-            <script>
-                (function() {
-                    var searchWrapper = document.getElementById('search-wrapper');
-                    var searchContainer = document.querySelector('.search-container');
-                    var searchResults = document.getElementById('searchresults');
-
-                    if (!searchWrapper || !searchContainer) return;
-
-                    searchContainer.addEventListener('click', function(e) {
-                        if (e.target === searchContainer) {
-                            searchWrapper.classList.add('hidden');
-                        }
-                    });
-
-                    if (searchResults) {
-                        searchResults.addEventListener('click', function(e) {
-                            if (e.target.tagName === 'A' || e.target.closest('a')) {
-                                searchWrapper.classList.add('hidden');
-                            }
-                        });
-                    }
-                })();
-            </script>
-
-            <!-- Insert section spacers and apply collapsed state before scroll restoration to prevent layout shift/flicker -->
-            <script>
-                (function() {
-                    var chapterList = document.querySelector('#sidebar ol.chapter');
-                    if (!chapterList) return;
-
-                    var collapsedSections = [];
-                    try {
-                        var stored = sessionStorage.getItem('sidebar-collapsed-sections');
-                        if (stored) {
-                            collapsedSections = JSON.parse(stored);
-                        }
-                    } catch (e) {}
-
-                    var partTitles = chapterList.querySelectorAll('li.part-title');
-                    var previousPartTitle = null;
-
-                    partTitles.forEach(function(partTitle, index) {
-                        partTitle._sectionName = partTitle.textContent.trim();
-
-                        // Insert a spacer before this part-title (except for the first one)
-                        if (index > 0) {
-                            var spacer = document.createElement('li');
-                            spacer.className = 'section-spacer';
-                            partTitle.parentNode.insertBefore(spacer, partTitle);
-
-                            if (previousPartTitle) {
-                                previousPartTitle._spacerAfter = spacer;
-                            }
-                        }
-
-                        var isCollapsed = collapsedSections.includes(partTitle._sectionName);
-                        if (isCollapsed) {
-                            // Hide all siblings until next part-title
-                            var sibling = partTitle.nextElementSibling;
-                            while (sibling && !sibling.classList.contains('part-title')) {
-                                sibling.classList.add('section-hidden');
-                                sibling = sibling.nextElementSibling;
-                            }
-                            // Hide the spacer after this section (will be set on next iteration)
-                            partTitle._isCollapsed = true;
-                        }
-
-                        // If previous section was collapsed, hide its spacer
-                        if (previousPartTitle && previousPartTitle._isCollapsed && previousPartTitle._spacerAfter) {
-                            previousPartTitle._spacerAfter.classList.add('section-hidden');
-                        }
-
-                        previousPartTitle = partTitle;
-                    });
-
-                    // Handle the last section's spacer if it was collapsed
-                    if (previousPartTitle && previousPartTitle._isCollapsed && previousPartTitle._spacerAfter) {
-                        previousPartTitle._spacerAfter.classList.add('section-hidden');
-                    }
-                })();
-            </script>
-
-            <!-- Track and set sidebar scroll position -->
-            <script>
-                var sidebarScrollbox = document.querySelector('#sidebar .sidebar-scrollbox');
-                sidebarScrollbox.addEventListener('click', function(e) {
-                    if (e.target.tagName === 'A') {
-                        sessionStorage.setItem('sidebar-scroll', sidebarScrollbox.scrollTop);
-                    }
-                }, { passive: true });
-                var sidebarScrollTop = sessionStorage.getItem('sidebar-scroll');
-                sessionStorage.removeItem('sidebar-scroll');
-                if (sidebarScrollTop) {
-                    // preserve sidebar scroll position when navigating via links within sidebar
-                    sidebarScrollbox.scrollTop = sidebarScrollTop;
-                } else {
-                    // scroll sidebar to current active section when navigating via "next/previous chapter" buttons
-                    var activeSection = document.querySelector('#sidebar .active');
-                    if (activeSection) {
-                        activeSection.scrollIntoView({ block: 'center' });
-                    }
-                }
-            </script>
-
-            <div class="page">
-                <div id="content" class="content">
-                    <main>
-                      {{{ content }}}
-                        <div class="footer-buttons">
-                            {{#previous}}
-                            <a rel="prev" href="{{ path_to_root }}{{link}}" class="footer-button" title="{{title}}">
-                                <i class="fa fa-angle-left"></i>
-                                {{title}}
-                            </a>
-                            {{/previous}}
-                            {{#next}}
-                            <a rel="next" href="{{ path_to_root }}{{link}}" class="footer-button" title="{{title}}">
-                                {{title}}
-                                <i class="fa fa-angle-right"></i>
-                            </a>
-                            {{/next}}
-                        </div>
-                    </main>
-                    <div class="toc-container">
-                        <nav class="pagetoc"></nav>
-                    </div>
-                    <!-- Immediately detect if page has headins that are not h1 to prevent flicker -->
-                    <script>
-                        (function() {
-                            var tocContainer = document.querySelector('.toc-container');
-                            var headers = document.querySelectorAll('.header');
-                            var hasNonH1Headers = false;
-                            for (var i = 0; i < headers.length; i++) {
-                                var parent = headers[i].parentElement;
-                                if (parent && !parent.tagName.toLowerCase().startsWith('h1')) {
-                                    hasNonH1Headers = true;
-                                    break;
-                                }
-                            }
-                            if (hasNonH1Headers) {
-                                tocContainer.classList.add('has-toc');
-                            } else {
-                                tocContainer.classList.add('no-toc');
-                            }
-                        })();
-                    </script>
-                </div>
-            </div>
-        </div>
-
-        {{#if live_reload_endpoint}}
-        <!-- Livereload script (if served using the cli tool) -->
-        <script>
-            const wsProtocol = location.protocol === 'https:' ? 'wss:' : 'ws:';
-            const wsAddress = wsProtocol + "//" + location.host + "/" + "{{{live_reload_endpoint}}}";
-            const socket = new WebSocket(wsAddress);
-            socket.onmessage = function (event) {
-                if (event.data === "reload") {
-                    socket.close();
-                    location.reload();
-                }
-            };
-
-            window.onbeforeunload = function() {
-                socket.close();
-            }
-        </script>
-        {{/if}}
-
-        {{#if playground_line_numbers}}
-        <script>
-            window.playground_line_numbers = true;
-        </script>
-        {{/if}}
-
-        {{#if playground_copyable}}
-        <script>
-            window.playground_copyable = true;
-        </script>
-        {{/if}}
-
-        {{#if playground_js}}
-        <script src="{{ path_to_root }}ace.js"></script>
-        <script src="{{ path_to_root }}editor.js"></script>
-        <script src="{{ path_to_root }}mode-rust.js"></script>
-        <script src="{{ path_to_root }}theme-dawn.js"></script>
-        <script src="{{ path_to_root }}theme-tomorrow_night.js"></script>
-        {{/if}}
-
-        {{#if search_js}}
-        <script src="{{ path_to_root }}elasticlunr.min.js"></script>
-        <script src="{{ path_to_root }}mark.min.js"></script>
-        <script src="{{ path_to_root }}searcher.js"></script>
-        {{/if}}
-
-        <script src="{{ path_to_root }}clipboard.min.js"></script>
-        <script src="{{ path_to_root }}highlight.js"></script>
-        <script src="{{ path_to_root }}book.js"></script>
-
-        <!-- Custom JS scripts -->
-        {{#each additional_js}}
-        <script src="{{ ../path_to_root }}{{this}}"></script>
-        {{/each}}
-
-        {{#if is_print}}
-        {{#if mathjax_support}}
-        <script>
-        window.addEventListener('load', function() {
-            MathJax.Hub.Register.StartupHook('End', function() {
-                window.setTimeout(window.print, 100);
-            });
-        });
-        </script>
-        {{else}}
-        <script>
-        window.addEventListener('load', function() {
-            window.setTimeout(window.print, 100);
-        });
-        </script>
-        {{/if}}
-        {{/if}}
-
-        <!-- Amplitude Analytics -->
-        <script>
-          (function() {
-            var amplitudeKey = '#amplitude_key#';
-            if (amplitudeKey && amplitudeKey.indexOf('#') === -1) {
-              var script = document.createElement('script');
-              script.src = 'https://cdn.amplitude.com/script/' + amplitudeKey + '.js';
-              script.onload = function() {
-                window.amplitude.init(amplitudeKey, {
-                  fetchRemoteConfig: true,
-                  autocapture: true
-                });
-              };
-              document.head.appendChild(script);
-            }
-          })();
-        </script>
-    </div>
-    </body>
-</html>
diff --git a/docs/theme/page-toc.css b/docs/theme/page-toc.css
deleted file mode 100644
index 6a16265976..0000000000
--- a/docs/theme/page-toc.css
+++ /dev/null
@@ -1,79 +0,0 @@
-.pagetoc {
-  box-sizing: border-box;
-  position: sticky;
-  top: 50px;
-  display: flex;
-  flex-direction: column;
-  gap: 4px;
-  padding: 28px 0 120px 0;
-  width: 200px;
-  max-height: calc(100svh - 50px);
-  overflow-x: hidden;
-}
-.pagetoc > :last-child {
-  margin-bottom: 16px;
-}
-.pagetoc a {
-  width: fit-content;
-  font-size: 1.4rem;
-  color: var(--fg) !important;
-  display: inline-block;
-  padding: 2px 0;
-  text-align: left;
-  text-decoration: underline;
-  text-decoration-color: var(--toc-link-underline);
-}
-.pagetoc a:hover {
-  text-decoration-color: var(--toc-link-underline-hover);
-}
-.pagetoc a.active {
-  background-color: var(--sidebar-active-bg);
-  color: var(--sidebar-active) !important;
-  text-decoration-color: hsl(219, 93%, 42%, 0.1);
-}
-.pagetoc a.active:hover {
-  text-decoration-color: hsl(219, 93%, 42%, 0.8);
-}
-.pagetoc .active {
-  background: var(--sidebar-bg);
-  color: var(--sidebar-fg);
-}
-.pagetoc .pagetoc-H1 {
-  display: none;
-}
-.pagetoc .pagetoc-H3 {
-  margin-left: 2ch;
-}
-.pagetoc .pagetoc-H4 {
-  margin-left: 4ch;
-}
-.pagetoc .pagetoc-H5 {
-  display: none;
-}
-.pagetoc .pagetoc-H6 {
-  display: none;
-}
-.toc-title {
-  margin: 0;
-  margin-bottom: 6px;
-  font-size: 1.4rem;
-  color: var(--full-contrast);
-}
-
-.toc-container {
-  visibility: hidden;
-}
-
-.toc-container.has-toc {
-  visibility: visible;
-}
-
-.toc-container.no-toc {
-  display: none;
-}
-
-@media only screen and (max-width: 1200px) {
-  .toc-container {
-    display: none;
-  }
-}
diff --git a/docs/theme/page-toc.js b/docs/theme/page-toc.js
deleted file mode 100644
index 627416fddf..0000000000
--- a/docs/theme/page-toc.js
+++ /dev/null
@@ -1,112 +0,0 @@
-let scrollTimeout;
-
-const listenActive = () => {
-  const elems = document.querySelector(".pagetoc").children;
-  [...elems].forEach((el) => {
-    el.addEventListener("click", (_) => {
-      clearTimeout(scrollTimeout);
-      [...elems].forEach((el) => el.classList.remove("active"));
-      el.classList.add("active");
-
-      scrollTimeout = setTimeout(() => {
-        scrollTimeout = null;
-      }, 100);
-    });
-  });
-};
-
-const autoCreatePagetoc = () => {
-  const main = document.querySelector("#content > main");
-  const content = Object.assign(document.createElement("div"), {
-    className: "content-wrap",
-  });
-  content.append(...main.childNodes);
-  main.prepend(content);
-  main.insertAdjacentHTML(
-    "afterbegin",
-    '<div class="toc-container"><nav class="pagetoc"></nav></div>',
-  );
-  return document.querySelector(".pagetoc");
-};
-
-const getPagetoc = () =>
-  document.querySelector(".pagetoc") || autoCreatePagetoc();
-
-const updateFunction = () => {
-  if (scrollTimeout) return;
-
-  const headers = [...document.getElementsByClassName("header")];
-  if (headers.length === 0) return;
-
-  const threshold = 100;
-  let activeHeader = null;
-
-  for (const header of headers) {
-    const rect = header.getBoundingClientRect();
-
-    if (rect.top <= threshold) {
-      activeHeader = header;
-    }
-  }
-
-  if (!activeHeader && headers.length > 0) {
-    activeHeader = headers[0];
-  }
-
-  const pagetocLinks = [...document.querySelector(".pagetoc").children];
-  pagetocLinks.forEach((link) => link.classList.remove("active"));
-
-  if (activeHeader) {
-    const activeLink = pagetocLinks.find(
-      (link) => activeHeader.href === link.href,
-    );
-    if (activeLink) activeLink.classList.add("active");
-  }
-};
-
-document.addEventListener("DOMContentLoaded", () => {
-  const pagetoc = getPagetoc();
-  const headers = [...document.getElementsByClassName("header")];
-
-  const nonH1Headers = headers.filter(
-    (header) => !header.parentElement.tagName.toLowerCase().startsWith("h1"),
-  );
-  const tocContainer = document.querySelector(".toc-container");
-
-  if (nonH1Headers.length === 0) {
-    if (tocContainer) {
-      tocContainer.classList.add("no-toc");
-    }
-    return;
-  }
-
-  if (tocContainer) {
-    tocContainer.classList.add("has-toc");
-  }
-
-  const tocTitle = Object.assign(document.createElement("p"), {
-    className: "toc-title",
-    textContent: "On This Page",
-  });
-
-  pagetoc.appendChild(tocTitle);
-
-  headers.forEach((header) => {
-    const link = Object.assign(document.createElement("a"), {
-      textContent: header.text,
-      href: header.href,
-      className: `pagetoc-${header.parentElement.tagName}`,
-    });
-    pagetoc.appendChild(link);
-  });
-
-  updateFunction();
-  listenActive();
-
-  const pageElement = document.querySelector(".page");
-  if (pageElement) {
-    pageElement.addEventListener("scroll", updateFunction);
-  } else {
-    window.addEventListener("scroll", updateFunction);
-  }
-});
diff --git a/docs/theme/plugins.css b/docs/theme/plugins.css
deleted file mode 100644
index 8c9f0c438e..0000000000
--- a/docs/theme/plugins.css
+++ /dev/null
@@ -1,45 +0,0 @@
-kbd.keybinding {
-  background-color: var(--keybinding-bg);
-  padding: 2px 4px;
-  border-radius: 3px;
-  font-family: monospace;
-  display: inline-block;
-  margin: 0 2px;
-}
-
-#copy-markdown-toggle i {
-  font-weight: 500 !important;
-  -webkit-text-stroke: 0.5px currentColor;
-}
-
-.copy-toast {
-  position: fixed;
-  top: 72px;
-  right: 16px;
-  padding: 12px 16px;
-  border-radius: 4px;
-  font-size: 14px;
-  font-weight: 500;
-  color: var(--fg);
-  background: var(--toast-bg);
-  border: 1px solid var(--toast-border);
-  z-index: 1000;
-  opacity: 0;
-  transform: translateY(-10px);
-  transition: all 0.1s ease-in-out;
-  box-shadow: 0 4px 6px rgba(0, 0, 0, 0.05);
-  max-width: 280px;
-}
-
-.copy-toast.success {
-  border-color: var(--toast-border-success);
-}
-
-.copy-toast.error {
-  border-color: var(--toast-border-error);
-}
-
-.copy-toast.show {
-  opacity: 1;
-  transform: translateY(0);
-}
diff --git a/docs/theme/plugins.js b/docs/theme/plugins.js
deleted file mode 100644
index 1e20fe65c1..0000000000
--- a/docs/theme/plugins.js
+++ /dev/null
@@ -1,321 +0,0 @@
-function detectOS() {
-  var userAgent = navigator.userAgent;
-
-  var platform = navigator.platform;
-  var macosPlatforms = ["Macintosh", "MacIntel", "MacPPC", "Mac68K"];
-  var windowsPlatforms = ["Win32", "Win64", "Windows", "WinCE"];
-  var iosPlatforms = ["iPhone", "iPad", "iPod"];
-
-  if (macosPlatforms.indexOf(platform) !== -1) {
-    return "Mac";
-  } else if (iosPlatforms.indexOf(platform) !== -1) {
-    return "iOS";
-  } else if (windowsPlatforms.indexOf(platform) !== -1) {
-    return "Windows";
-  } else if (/Android/.test(userAgent)) {
-    return "Android";
-  } else if (/Linux/.test(platform)) {
-    return "Linux";
-  }
-
-  return "Unknown";
-}
-
-var os = detectOS();
-console.log("Operating System:", os);
-
-// Defer keybinding processing to avoid blocking initial render
-function updateKeybindings() {
-  const os = detectOS();
-  const isMac = os === "Mac" || os === "iOS";
-
-  function processKeybinding(element) {
-    const [macKeybinding, linuxKeybinding] = element.textContent.split("|");
-    element.textContent = isMac ? macKeybinding : linuxKeybinding;
-    element.classList.add("keybinding");
-  }
-
-  // Process all kbd elements at once (more efficient than walking entire DOM)
-  const kbdElements = document.querySelectorAll("kbd");
-  kbdElements.forEach(processKeybinding);
-}
-
-// Use requestIdleCallback if available, otherwise requestAnimationFrame
-if (typeof requestIdleCallback === "function") {
-  requestIdleCallback(updateKeybindings);
-} else {
-  requestAnimationFrame(updateKeybindings);
-}
-
-function darkModeToggle() {
-  var html = document.documentElement;
-
-  function setTheme(theme) {
-    html.setAttribute("data-theme", theme);
-    html.setAttribute("data-color-scheme", theme);
-    html.className = theme;
-    localStorage.setItem("mdbook-theme", theme);
-  }
-
-  // Set initial theme
-  var currentTheme = localStorage.getItem("mdbook-theme");
-  if (currentTheme) {
-    setTheme(currentTheme);
-  } else {
-    // If no theme is set, use the system's preference
-    var systemPreference = window.matchMedia("(prefers-color-scheme: dark)")
-      .matches
-      ? "dark"
-      : "light";
-    setTheme(systemPreference);
-  }
-
-  // Listen for system's preference changes
-  const darkModeMediaQuery = window.matchMedia("(prefers-color-scheme: dark)");
-  darkModeMediaQuery.addEventListener("change", function (e) {
-    if (!localStorage.getItem("mdbook-theme")) {
-      setTheme(e.matches ? "dark" : "light");
-    }
-  });
-}
-
-const copyMarkdown = () => {
-  const copyButton = document.getElementById("copy-markdown-toggle");
-  if (!copyButton) return;
-
-  // Store the original icon class, loading state, and timeout reference
-  const originalIconClass = "fa fa-copy";
-  let isLoading = false;
-  let iconTimeoutId = null;
-
-  const getCurrentPagePath = () => {
-    const pathname = window.location.pathname;
-
-    // Handle root docs path
-    if (pathname === "/docs/" || pathname === "/docs") {
-      return "getting-started.md";
-    }
-
-    // Remove /docs/ prefix and .html suffix, then add .md
-    const cleanPath = pathname
-      .replace(/^\/docs\//, "")
-      .replace(/\.html$/, "")
-      .replace(/\/$/, "");
-
-    return cleanPath ? cleanPath + ".md" : "getting-started.md";
-  };
-
-  const showToast = (message, isSuccess = true) => {
-    // Remove existing toast if any
-    const existingToast = document.getElementById("copy-toast");
-    existingToast?.remove();
-
-    const toast = document.createElement("div");
-    toast.id = "copy-toast";
-    toast.className = `copy-toast ${isSuccess ? "success" : "error"}`;
-    toast.textContent = message;
-
-    document.body.appendChild(toast);
-
-    // Show toast with animation
-    setTimeout(() => {
-      toast.classList.add("show");
-    }, 10);
-
-    // Hide and remove toast after 2 seconds
-    setTimeout(() => {
-      toast.classList.remove("show");
-      setTimeout(() => {
-        toast.parentNode?.removeChild(toast);
-      }, 300);
-    }, 2000);
-  };
-
-  const changeButtonIcon = (iconClass, duration = 1000) => {
-    const icon = copyButton.querySelector("i");
-    if (!icon) return;
-
-    // Clear any existing timeout
-    if (iconTimeoutId) {
-      clearTimeout(iconTimeoutId);
-      iconTimeoutId = null;
-    }
-
-    icon.className = iconClass;
-
-    if (duration > 0) {
-      iconTimeoutId = setTimeout(() => {
-        icon.className = originalIconClass;
-        iconTimeoutId = null;
-      }, duration);
-    }
-  };
-
-  const fetchAndCopyMarkdown = async () => {
-    // Prevent multiple simultaneous requests
-    if (isLoading) return;
-
-    try {
-      isLoading = true;
-      changeButtonIcon("fa fa-spinner fa-spin", 0); // Don't auto-restore spinner
-
-      const pagePath = getCurrentPagePath();
-      const rawUrl = `https://raw.githubusercontent.com/zed-industries/zed/main/docs/src/${pagePath}`;
-
-      const response = await fetch(rawUrl);
-      if (!response.ok) {
-        throw new Error(
-          `Failed to fetch markdown: ${response.status} ${response.statusText}`,
-        );
-      }
-
-      const markdownContent = await response.text();
-
-      // Copy to clipboard using modern API
-      if (navigator.clipboard?.writeText) {
-        await navigator.clipboard.writeText(markdownContent);
-      } else {
-        // Fallback: throw error if clipboard API isn't available
-        throw new Error("Clipboard API not supported in this browser");
-      }
-
-      changeButtonIcon("fa fa-check", 1000);
-      showToast("Page content copied to clipboard!");
-    } catch (error) {
-      console.error("Error copying markdown:", error);
-      changeButtonIcon("fa fa-exclamation-triangle", 2000);
-      showToast("Failed to copy markdown. Please try again.", false);
-    } finally {
-      isLoading = false;
-    }
-  };
-
-  copyButton.addEventListener("click", fetchAndCopyMarkdown);
-};
-
-// Initialize functionality when DOM is loaded
-document.addEventListener("DOMContentLoaded", () => {
-  darkModeToggle();
-  copyMarkdown();
-});
-
-// Collapsible sidebar navigation for entire sections
-// Note: Initial collapsed state is applied in index.hbs to prevent flicker
-function initCollapsibleSidebar() {
-  var sidebar = document.getElementById("sidebar");
-  if (!sidebar) return;
-
-  var chapterList = sidebar.querySelector("ol.chapter");
-  if (!chapterList) return;
-
-  var partTitles = Array.from(chapterList.querySelectorAll("li.part-title"));
-
-  partTitles.forEach(function (partTitle) {
-    // Get all sibling elements that belong to this section
-    var sectionItems = getSectionItems(partTitle);
-
-    if (sectionItems.length > 0) {
-      setupCollapsibleSection(partTitle, sectionItems);
-    }
-  });
-}
-
-// Saves the list of collapsed section names to sessionStorage
-// This gets reset when the tab is closed and opened again
-function saveCollapsedSections() {
-  var collapsedSections = [];
-  var partTitles = document.querySelectorAll(
-    "#sidebar li.part-title.collapsible",
-  );
-
-  partTitles.forEach(function (partTitle) {
-    if (!partTitle.classList.contains("expanded")) {
-      collapsedSections.push(partTitle._sectionName);
-    }
-  });
-
-  try {
-    sessionStorage.setItem(
-      "sidebar-collapsed-sections",
-      JSON.stringify(collapsedSections),
-    );
-  } catch (e) {
-    // sessionStorage might not be available
-  }
-}
-
-function getSectionItems(partTitle) {
-  var items = [];
-  var sibling = partTitle.nextElementSibling;
-
-  while (sibling) {
-    // Stop when we hit another part-title
-    if (sibling.classList.contains("part-title")) {
-      break;
-    }
-    items.push(sibling);
-    sibling = sibling.nextElementSibling;
-  }
-
-  return items;
-}
-
-function setupCollapsibleSection(partTitle, sectionItems) {
-  partTitle.classList.add("collapsible");
-  partTitle.setAttribute("role", "button");
-  partTitle.setAttribute("tabindex", "0");
-  partTitle._sectionItems = sectionItems;
-
-  var isCurrentlyCollapsed = partTitle._isCollapsed;
-  if (isCurrentlyCollapsed) {
-    partTitle.setAttribute("aria-expanded", "false");
-  } else {
-    partTitle.classList.add("expanded");
-    partTitle.setAttribute("aria-expanded", "true");
-  }
-
-  partTitle.addEventListener("click", function (e) {
-    e.preventDefault();
-    toggleSection(partTitle);
-  });
-
-  // a11y: Add keyboard support (Enter and Space)
-  partTitle.addEventListener("keydown", function (e) {
-    if (e.key === "Enter" || e.key === " ") {
-      e.preventDefault();
-      toggleSection(partTitle);
-    }
-  });
-}
-
-function toggleSection(partTitle) {
-  var isExpanded = partTitle.classList.contains("expanded");
-  var sectionItems = partTitle._sectionItems;
-  var spacerAfter = partTitle._spacerAfter;
-
-  if (isExpanded) {
-    partTitle.classList.remove("expanded");
-    partTitle.setAttribute("aria-expanded", "false");
-    sectionItems.forEach(function (item) {
-      item.classList.add("section-hidden");
-    });
-    if (spacerAfter) {
-      spacerAfter.classList.add("section-hidden");
-    }
-  } else {
-    partTitle.classList.add("expanded");
-    partTitle.setAttribute("aria-expanded", "true");
-    sectionItems.forEach(function (item) {
-      item.classList.remove("section-hidden");
-    });
-    if (spacerAfter) {
-      spacerAfter.classList.remove("section-hidden");
-    }
-  }
-
-  saveCollapsedSections();
-}
-
-document.addEventListener("DOMContentLoaded", function () {
-  initCollapsibleSidebar();
-});
diff --git a/extensions/.gitignore b/extensions/.gitignore
deleted file mode 100644
index 84cbee6b39..0000000000
--- a/extensions/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-grammars
diff --git a/extensions/EXTRACTION.md b/extensions/EXTRACTION.md
deleted file mode 100644
index 2bcc8e35d5..0000000000
--- a/extensions/EXTRACTION.md
+++ /dev/null
@@ -1,181 +0,0 @@
-# Extracting an extension to dedicated repo
-
-These are some notes of how to extract an extension from the main zed repository and generate a new repository which preserves the history as best as possible. In the this example we will be extracting the `ruby` extension, substitute as appropriate.
-
-## Pre-requisites
-
-Install [git-filter-repo](https://github.com/newren/git-filter-repo/blob/main/INSTALL.md):
-
-```
-brew install git-filter-repo
-```
-
-## Process
-
-We are going to use a `$LANGNAME` variable for all these steps. Make sure it is set correctly.
-
-> **Note**
-> If you get `zsh: command not found: #` errors, run:
-> `setopt interactive_comments && echo "setopt interactive_comments" >> ~/.zshrc`
-
-1. Create a clean clone the zed repository, delete tags and delete branches.
-
-```sh
-LANGNAME=your_language_name_here
-
-rm -rf $LANGNAME
-git clone --single-branch --no-tags git@github.com:zed-industries/zed.git $LANGNAME
-cd $LANGNAME
-```
-
-2. Create an expressions.txt file somewhere (e.g. `~/projects/$LANGNAME.txt`)
-
-This file takes the form of `patern==>replacement`, where the replacement is optional.
-Note whitespace matters so `ruby: ==>` is removing the `ruby:` prefix from a commit messages and adding a space after `==> ` means the replacement begins with a space. Regex capture groups are numbered `\1`, `\2`, etc.
-
-See: [Git Filter Repo Docs](https://htmlpreview.github.io/?https://github.com/newren/git-filter-repo/blob/docs/html/git-filter-repo.html) for more.
-
-```sh
-# Create regex mapping for rewriting commit messages (edit as appropriate)
-mkdir -p ~/projects
-echo "${LANGNAME}: ==>
-extension: ==>
-chore: ==>
-zed_extension_api: ==>
-"'regex:(?<![\[a-zA-Z0-9])(#[0-9]{3,5})==>zed-industries/zed\1' \
-  > ~/projects/${LANGNAME}.txt
-
-# This removes the LICENSE symlink
-git filter-repo --invert-paths --path extensions/$LANGNAME/LICENSE-APACHE
-
-# This does the work
-git filter-repo \
-    --use-mailmap \
-    --subdirectory-filter extensions/$LANGNAME/ \
-    --path LICENSE-APACHE \
-    --replace-message ~/projects/${LANGNAME}.txt
-```
-
-3. Review the commits.
-
-This is your last chance to make any modifications.
-If you don't fix it now, it'll be wrong forever.
-
-For example, a previous commit message was `php/ruby: bump version to 0.0.5`
-which was replaced with `php/bump version to 0.0.5`
-so I added a new line to expressions.txt with `php/==>`
-and next run it became `bump version to 0.0.5`.
-
-4. [Optional] Generate tags
-
-You can always add tags later, but it's a nice touch.
-
-Show you all commits that mention a version number:
-
-```sh
-git log --grep="(\d+\.\d+\.\d+)" --perl-regexp --oneline --reverse
-```
-
-Then just:
-
-```
-git tag v0.0.2 abcd1234
-git tag v0.0.3 deadbeef
-```
-
-Usually the initial extraction didn't mention a version number so you can just do that one manually.
-
-4. [Optional] Add a README.md and commit.
-
-5. Push to the new repo
-
-Create a new empty repo on github under the [zed-extensions](https://github.com/organizations/zed-extensions/repositories/new) organization.
-
-```
-git remote add origin git@github.com:zed-extensions/$LANGNAME
-git push origin main --tags
-git branch --set-upstream-to=origin/main main
-```
-
-6. Setup the new repository:
-
-- Go to the repository settings:
-  - Disable Wikis
-  - Uncheck "Allow Merge Commits"
-  - Check "Allow Squash Merging"
-    - Default commit message: "Pull request title and description"
-
-7. Publish a new version of the extension.
-
-```sh
-OLD_VERSION=$(grep '^version = ' extension.toml | cut -d'"' -f2)
-NEW_VERSION=$(echo "$OLD_VERSION" | awk -F. '{$NF = $NF + 1;} 1' OFS=.)
-echo $OLD_VERSION $NEW_VERSION
-perl -i -pe "s/$OLD_VERSION/$NEW_VERSION/" extension.toml
-perl -i -pe "s#https://github.com/zed-industries/zed#https://github.com/zed-extensions/${LANGNAME}#g" extension.toml
-
-# if there's rust code, update this too.
-test -f Cargo.toml && perl -i -pe "s/$OLD_VERSION/$NEW_VERSION/" Cargo.toml
-# remove workspace Cargo.toml lines
-test -f Cargo.toml && perl -ni -e 'print unless /^.*(workspace\s*=\s*true|\[lints\])\s*$/' Cargo.toml
-test -f Cargo.toml && cargo check
-
-# add a .gitignore
-echo "target/
-grammars/
-*.wasm" > .gitignore
-
-# commit and push
-git add -u
-git checkout -b "bump_${NEW_VERSION}"
-git commit -m "Bump to v${NEW_VERSION}"
-git push
-gh pr create --title "Bump to v${NEW_VERSION}" --web
-
-# merge PR in web interface
-git checkout main
-git pull
-git tag v${NEW_VERSION}
-git push origin v${NEW_VERSION}
-```
-
-7. In zed repository, remove the old extension and push a PR.
-
-```sh
-rm -rf extensions/$LANGNAME
-sed -i '' "/extensions\/$LANGNAME/d" Cargo.toml
-cargo check
-git checkout -b remove_$LANGNAME
-git add extensions/$LANGNAME
-git add Cargo.toml Cargo.lock extensions/$LANGNAME
-git commit -m "Migrate to $LANGNAME extension to zed-extensions/$LANGNAME"
-git push
-gh pr create --web
-```
-
-8. Update extensions repository:
-
-```sh
-cd ../extensions
-git checkout main
-git pull
-git submodule init
-git submodule update
-git status
-
-git checkout -b ${LANGNAME}_v${NEW_VERSION}
-git submodule add https://github.com/zed-extensions/${LANGNAME}.git extensions/${LANGNAME}
-pnpm sort-extensions
-
-# edit extensions.toml:
-# - bump version
-# - change `submodule` from `extensions/zed` to new path
-# - remove `path` line all together
-
-git add extensions.toml .gitmodules extensions/${LANGNAME}
-git diff --cached
-git commit -m "Bump ${LANGNAME} to v${NEW_VERSION}"
-git push
-```
-
-Create PR and reference the Zed PR with removal from tree.
diff --git a/extensions/README.md b/extensions/README.md
deleted file mode 100644
index c677e0b909..0000000000
--- a/extensions/README.md
+++ /dev/null
@@ -1,63 +0,0 @@
-# Zed Extensions
-
-This directory contains extensions for Zed that are largely maintained by the Zed team. They currently live in the Zed repository for ease of maintenance.
-
-If you are looking for the Zed extension registry, see the [`zed-industries/extensions`](https://github.com/zed-industries/extensions) repo.
-
-## Structure
-
-Currently, Zed includes support for a number of languages without requiring installing an extension. Those languages can be found under [`crates/languages/src`](https://github.com/zed-industries/zed/tree/main/crates/languages/src).
-
-Support for all other languages is done via extensions. This directory ([extensions/](https://github.com/zed-industries/zed/tree/main/extensions/)) contains a number of officially maintained extensions. These extensions use the same [zed_extension_api](https://docs.rs/zed_extension_api/latest/zed_extension_api/) available to all [Zed Extensions](https://zed.dev/extensions) for providing [language servers](https://zed.dev/docs/extensions/languages#language-servers), [tree-sitter grammars](https://zed.dev/docs/extensions/languages#grammar) and [tree-sitter queries](https://zed.dev/docs/extensions/languages#tree-sitter-queries).
-
-## Dev Extensions
-
-See the docs for [Developing an Extension Locally](https://zed.dev/docs/extensions/developing-extensions#developing-an-extension-locally) for how to work with one of these extensions.
-
-## Updating
-
-> [!NOTE]
-> This update process is usually handled by Zed staff.
-> Community contributors should just submit a PR (step 1) and we'll take it from there.
-
-The process for updating an extension in this directory has three parts.
-
-1. Create a PR with your changes. (Merge it)
-2. Bump the extension version in:
-
-   - extensions/{language_name}/extension.toml
-   - extensions/{language_name}/Cargo.toml
-   - Cargo.lock
-
-   You can do this manually, or with a script:
-
-   ```sh
-   # Output the current version for a given language
-   ./script/language-extension-version <langname>
-
-   # Update the version in `extension.toml` and `Cargo.toml` and trigger a `cargo check`
-   ./script/language-extension-version <langname> <new_version>
-   ```
-
-   Commit your changes to a branch, push a PR and merge it.
-
-3. Open a PR to [`zed-industries/extensions`](https://github.com/zed-industries/extensions) repo that updates the extension in question
-
-Edit [`extensions.toml`](https://github.com/zed-industries/extensions/blob/main/extensions.toml) in the extensions repo to reflect the new version you set above and update the submodule latest Zed commit.
-
-```sh
-# Go into your clone of the extensions repo
-cd ../extensions
-
-# Update
-git checkout main
-git pull
-just init-submodule extensions/zed
-
-# Update the Zed submodule
-cd extensions/zed
-git checkout main
-git pull
-cd -
-git add extensions.toml extensions/zed
-```
diff --git a/extensions/glsl/Cargo.toml b/extensions/glsl/Cargo.toml
deleted file mode 100644
index 6dddeea358..0000000000
--- a/extensions/glsl/Cargo.toml
+++ /dev/null
@@ -1,16 +0,0 @@
-[package]
-name = "zed_glsl"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "Apache-2.0"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/glsl.rs"
-crate-type = ["cdylib"]
-
-[dependencies]
-zed_extension_api = "0.1.0"
diff --git a/extensions/glsl/LICENSE-APACHE b/extensions/glsl/LICENSE-APACHE
deleted file mode 120000
index 1cd601d0a3..0000000000
--- a/extensions/glsl/LICENSE-APACHE
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-APACHE
\ No newline at end of file
diff --git a/extensions/glsl/extension.toml b/extensions/glsl/extension.toml
deleted file mode 100644
index 7cf9e218c8..0000000000
--- a/extensions/glsl/extension.toml
+++ /dev/null
@@ -1,15 +0,0 @@
-id = "glsl"
-name = "GLSL"
-description = "GLSL support."
-version = "0.1.0"
-schema_version = 1
-authors = ["Mikayla Maki <mikayla@zed.dev>"]
-repository = "https://github.com/zed-industries/zed"
-
-[language_servers.glsl_analyzer]
-name = "GLSL Analyzer LSP"
-language = "GLSL"
-
-[grammars.glsl]
-repository = "https://github.com/theHamsta/tree-sitter-glsl"
-commit = "31064ce53385150f894a6c72d61b94076adf640a"
diff --git a/extensions/glsl/languages/glsl/config.toml b/extensions/glsl/languages/glsl/config.toml
deleted file mode 100644
index 0c71419c91..0000000000
--- a/extensions/glsl/languages/glsl/config.toml
+++ /dev/null
@@ -1,20 +0,0 @@
-name = "GLSL"
-grammar = "glsl"
-path_suffixes = [
-    # Traditional rasterization pipeline shaders
-    "vert", "frag", "tesc", "tese", "geom",
-    # Compute shaders
-    "comp",
-    # Ray tracing pipeline shaders
-    "rgen", "rint", "rahit", "rchit", "rmiss", "rcall",
-    # Other
-    "glsl"
-    ]
-first_line_pattern = '^#version \d+'
-line_comments = ["// "]
-block_comment = { start = "/* ", prefix = "* ", end = "*/", tab_size = 1 }
-brackets = [
-    { start = "{", end = "}", close = true, newline = true },
-    { start = "[", end = "]", close = true, newline = true },
-    { start = "(", end = ")", close = true, newline = true },
-]
diff --git a/extensions/glsl/languages/glsl/highlights.scm b/extensions/glsl/languages/glsl/highlights.scm
deleted file mode 100644
index 09f94d4fb5..0000000000
--- a/extensions/glsl/languages/glsl/highlights.scm
+++ /dev/null
@@ -1,117 +0,0 @@
-"break" @keyword
-"case" @keyword
-"const" @keyword
-"continue" @keyword
-"default" @keyword
-"do" @keyword
-"else" @keyword
-"enum" @keyword
-"extern" @keyword
-"for" @keyword
-"if" @keyword
-"inline" @keyword
-"return" @keyword
-"sizeof" @keyword
-"static" @keyword
-"struct" @keyword
-"switch" @keyword
-"typedef" @keyword
-"union" @keyword
-"volatile" @keyword
-"while" @keyword
-
-"#define" @keyword
-"#elif" @keyword
-"#else" @keyword
-"#endif" @keyword
-"#if" @keyword
-"#ifdef" @keyword
-"#ifndef" @keyword
-"#include" @keyword
-(preproc_directive) @keyword
-
-"--" @operator
-"-" @operator
-"-=" @operator
-"->" @operator
-"=" @operator
-"!=" @operator
-"*" @operator
-"&" @operator
-"&&" @operator
-"+" @operator
-"++" @operator
-"+=" @operator
-"<" @operator
-"==" @operator
-">" @operator
-"||" @operator
-
-"." @delimiter
-";" @delimiter
-
-(string_literal) @string
-(system_lib_string) @string
-
-(null) @constant
-(number_literal) @number
-(char_literal) @number
-
-(identifier) @variable
-
-(field_identifier) @property
-(statement_identifier) @label
-(type_identifier) @type
-(primitive_type) @type
-(sized_type_specifier) @type
-
-(call_expression
-  function: (identifier) @function)
-(call_expression
-  function: (field_expression
-    field: (field_identifier) @function))
-(function_declarator
-  declarator: (identifier) @function)
-(preproc_function_def
-  name: (identifier) @function.special)
-
-((identifier) @constant
- (#match? @constant "^[A-Z][A-Z\\d_]*$"))
-
-(comment) @comment
-
-[
-  "in"
-  "out"
-  "inout"
-  "uniform"
-  "shared"
-  "layout"
-  "attribute"
-  "varying"
-  "buffer"
-  "coherent"
-  "readonly"
-  "writeonly"
-  "precision"
-  "highp"
-  "mediump"
-  "lowp"
-  "centroid"
-  "sample"
-  "patch"
-  "smooth"
-  "flat"
-  "noperspective"
-  "invariant"
-  "precise"
-] @type.qualifier
-
-"subroutine" @keyword.function
-
-(extension_storage_class) @storageclass
-
-(
-  (identifier) @variable.builtin
-  (#match? @variable.builtin "^gl_")
-)
diff --git a/extensions/glsl/src/glsl.rs b/extensions/glsl/src/glsl.rs
deleted file mode 100644
index 77865564cc..0000000000
--- a/extensions/glsl/src/glsl.rs
+++ /dev/null
@@ -1,131 +0,0 @@
-use std::fs;
-use zed::settings::LspSettings;
-use zed_extension_api::{self as zed, LanguageServerId, Result, serde_json};
-
-struct GlslExtension {
-    cached_binary_path: Option<String>,
-}
-
-impl GlslExtension {
-    fn language_server_binary_path(
-        &mut self,
-        language_server_id: &LanguageServerId,
-        worktree: &zed::Worktree,
-    ) -> Result<String> {
-        if let Some(path) = worktree.which("glsl_analyzer") {
-            return Ok(path);
-        }
-
-        if let Some(path) = &self.cached_binary_path
-            && fs::metadata(path).is_ok_and(|stat| stat.is_file())
-        {
-            return Ok(path.clone());
-        }
-
-        zed::set_language_server_installation_status(
-            language_server_id,
-            &zed::LanguageServerInstallationStatus::CheckingForUpdate,
-        );
-        let release = zed::latest_github_release(
-            "nolanderc/glsl_analyzer",
-            zed::GithubReleaseOptions {
-                require_assets: true,
-                pre_release: false,
-            },
-        )?;
-
-        let (platform, arch) = zed::current_platform();
-        let asset_name = format!(
-            "{arch}-{os}.zip",
-            arch = match arch {
-                zed::Architecture::Aarch64 => "aarch64",
-                zed::Architecture::X86 => "x86",
-                zed::Architecture::X8664 => "x86_64",
-            },
-            os = match platform {
-                zed::Os::Mac => "macos",
-                zed::Os::Linux => "linux-musl",
-                zed::Os::Windows => "windows",
-            }
-        );
-
-        let asset = release
-            .assets
-            .iter()
-            .find(|asset| asset.name == asset_name)
-            .ok_or_else(|| format!("no asset found matching {:?}", asset_name))?;
-
-        let version_dir = format!("glsl_analyzer-{}", release.version);
-        fs::create_dir_all(&version_dir)
-            .map_err(|err| format!("failed to create directory '{version_dir}': {err}"))?;
-        let binary_path = format!("{version_dir}/bin/glsl_analyzer");
-
-        if !fs::metadata(&binary_path).is_ok_and(|stat| stat.is_file()) {
-            zed::set_language_server_installation_status(
-                language_server_id,
-                &zed::LanguageServerInstallationStatus::Downloading,
-            );
-
-            zed::download_file(
-                &asset.download_url,
-                &version_dir,
-                match platform {
-                    zed::Os::Mac | zed::Os::Linux => zed::DownloadedFileType::Zip,
-                    zed::Os::Windows => zed::DownloadedFileType::Zip,
-                },
-            )
-            .map_err(|e| format!("failed to download file: {e}"))?;
-
-            zed::make_file_executable(&binary_path)?;
-
-            let entries =
-                fs::read_dir(".").map_err(|e| format!("failed to list working directory {e}"))?;
-            for entry in entries {
-                let entry = entry.map_err(|e| format!("failed to load directory entry {e}"))?;
-                if entry.file_name().to_str() != Some(&version_dir) {
-                    fs::remove_dir_all(entry.path()).ok();
-                }
-            }
-        }
-
-        self.cached_binary_path = Some(binary_path.clone());
-        Ok(binary_path)
-    }
-}
-
-impl zed::Extension for GlslExtension {
-    fn new() -> Self {
-        Self {
-            cached_binary_path: None,
-        }
-    }
-
-    fn language_server_command(
-        &mut self,
-        language_server_id: &zed::LanguageServerId,
-        worktree: &zed::Worktree,
-    ) -> Result<zed::Command> {
-        Ok(zed::Command {
-            command: self.language_server_binary_path(language_server_id, worktree)?,
-            args: vec![],
-            env: Default::default(),
-        })
-    }
-
-    fn language_server_workspace_configuration(
-        &mut self,
-        _language_server_id: &zed::LanguageServerId,
-        worktree: &zed::Worktree,
-    ) -> Result<Option<serde_json::Value>> {
-        let settings = LspSettings::for_worktree("glsl_analyzer", worktree)
-            .ok()
-            .and_then(|lsp_settings| lsp_settings.settings)
-            .unwrap_or_default();
-
-        Ok(Some(serde_json::json!({
-            "glsl_analyzer": settings
-        })))
-    }
-}
-
-zed::register_extension!(GlslExtension);
diff --git a/extensions/html/Cargo.toml b/extensions/html/Cargo.toml
deleted file mode 100644
index 22cdb401a7..0000000000
--- a/extensions/html/Cargo.toml
+++ /dev/null
@@ -1,16 +0,0 @@
-[package]
-name = "zed_html"
-version = "0.2.3"
-edition.workspace = true
-publish.workspace = true
-license = "Apache-2.0"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/html.rs"
-crate-type = ["cdylib"]
-
-[dependencies]
-zed_extension_api = "0.7.0"
diff --git a/extensions/html/LICENSE-APACHE b/extensions/html/LICENSE-APACHE
deleted file mode 120000
index 1cd601d0a3..0000000000
--- a/extensions/html/LICENSE-APACHE
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-APACHE
\ No newline at end of file
diff --git a/extensions/html/extension.toml b/extensions/html/extension.toml
deleted file mode 100644
index 1ded7af641..0000000000
--- a/extensions/html/extension.toml
+++ /dev/null
@@ -1,19 +0,0 @@
-id = "html"
-name = "HTML"
-description = "HTML support."
-version = "0.2.3"
-schema_version = 1
-authors = ["Isaac Clayton <slightknack@gmail.com>"]
-repository = "https://github.com/zed-industries/zed"
-
-[language_servers.vscode-html-language-server]
-name = "vscode-html-language-server"
-language = "HTML"
-
-[language_servers.vscode-html-language-server.language_ids]
-"HTML" = "html"
-"CSS" = "css"
-
-[grammars.html]
-repository = "https://github.com/tree-sitter/tree-sitter-html"
-commit = "bfa075d83c6b97cd48440b3829ab8d24a2319809"
diff --git a/extensions/html/languages/html/brackets.scm b/extensions/html/languages/html/brackets.scm
deleted file mode 100644
index 53d6a6bb23..0000000000
--- a/extensions/html/languages/html/brackets.scm
+++ /dev/null
@@ -1,5 +0,0 @@
-("<" @open "/>" @close)
-("</" @open ">" @close)
-("<" @open ">" @close)
-(("\"" @open "\"" @close) (#set! rainbow.exclude))
-((element (start_tag) @open (end_tag) @close) (#set! newline.only) (#set! rainbow.exclude))
diff --git a/extensions/html/languages/html/config.toml b/extensions/html/languages/html/config.toml
deleted file mode 100644
index fc7d557198..0000000000
--- a/extensions/html/languages/html/config.toml
+++ /dev/null
@@ -1,19 +0,0 @@
-name = "HTML"
-grammar = "html"
-path_suffixes = ["html", "htm", "shtml"]
-autoclose_before = ">})"
-block_comment = { start = "<!--", prefix = "", end = "-->", tab_size = 0 }
-wrap_characters = { start_prefix = "<", start_suffix = ">", end_prefix = "</", end_suffix = ">" }
-brackets = [
-    { start = "{", end = "}", close = true, newline = true },
-    { start = "[", end = "]", close = true, newline = true },
-    { start = "(", end = ")", close = true, newline = true },
-    { start = "\"", end = "\"", close = true, newline = false, not_in = ["comment", "string"] },
-    { start = "<", end = ">", close = false, newline = true, not_in = ["comment", "string"] },
-    { start = "!--", end = " --", close = true, newline = false, not_in = ["comment", "string"] },
-]
-completion_query_characters = ["-"]
-prettier_parser_name = "html"
-
-[overrides.default]
-linked_edit_characters = ["-"]
diff --git a/extensions/html/languages/html/highlights.scm b/extensions/html/languages/html/highlights.scm
deleted file mode 100644
index 1cc0601b76..0000000000
--- a/extensions/html/languages/html/highlights.scm
+++ /dev/null
@@ -1,19 +0,0 @@
-(tag_name) @tag
-(doctype) @tag.doctype
-(attribute_name) @attribute
-[
-  "\""
-  "'"
-  (attribute_value)
-] @string
-(comment) @comment
-
-"=" @punctuation.delimiter.html
-
-[
-  "<"
-  ">"
-  "<!"
-  "</"
-  "/>"
-] @punctuation.bracket.html
diff --git a/extensions/html/languages/html/indents.scm b/extensions/html/languages/html/indents.scm
deleted file mode 100644
index 436663dba3..0000000000
--- a/extensions/html/languages/html/indents.scm
+++ /dev/null
@@ -1,6 +0,0 @@
-(start_tag ">" @end) @indent
-(self_closing_tag "/>" @end) @indent
-
-(element
-  (start_tag) @start
-  (end_tag)? @end) @indent
diff --git a/extensions/html/languages/html/injections.scm b/extensions/html/languages/html/injections.scm
deleted file mode 100644
index 525b3efe29..0000000000
--- a/extensions/html/languages/html/injections.scm
+++ /dev/null
@@ -1,21 +0,0 @@
-((comment) @injection.content
- (#set! injection.language "comment")
-)
-
-(script_element
-  (raw_text) @injection.content
-  (#set! injection.language "javascript"))
-
-(style_element
-  (raw_text) @injection.content
-  (#set! injection.language "css"))
-
-(attribute
-    (attribute_name) @_attribute_name (#match? @_attribute_name "^style$")
-    (quoted_attribute_value (attribute_value) @injection.content)
-    (#set! injection.language "css"))
-
-(attribute
-    (attribute_name) @_attribute_name (#match? @_attribute_name "^on[a-z]+$")
-    (quoted_attribute_value (attribute_value) @injection.content)
-    (#set! injection.language "javascript"))
diff --git a/extensions/html/languages/html/outline.scm b/extensions/html/languages/html/outline.scm
deleted file mode 100644
index e7f9dc4fab..0000000000
--- a/extensions/html/languages/html/outline.scm
+++ /dev/null
@@ -1,5 +0,0 @@
-(comment) @annotation
-
-(element
-  (start_tag
-    (tag_name) @name)) @item
diff --git a/extensions/html/languages/html/overrides.scm b/extensions/html/languages/html/overrides.scm
deleted file mode 100644
index 434f610e70..0000000000
--- a/extensions/html/languages/html/overrides.scm
+++ /dev/null
@@ -1,7 +0,0 @@
-(comment) @comment
-(quoted_attribute_value) @string
-
-[
-  (start_tag)
-  (end_tag)
-] @default
diff --git a/extensions/html/src/html.rs b/extensions/html/src/html.rs
deleted file mode 100644
index 337689ebdd..0000000000
--- a/extensions/html/src/html.rs
+++ /dev/null
@@ -1,115 +0,0 @@
-use std::{env, fs};
-use zed::settings::LspSettings;
-use zed_extension_api::{self as zed, LanguageServerId, Result, serde_json::json};
-
-const BINARY_NAME: &str = "vscode-html-language-server";
-const SERVER_PATH: &str =
-    "node_modules/@zed-industries/vscode-langservers-extracted/bin/vscode-html-language-server";
-const PACKAGE_NAME: &str = "@zed-industries/vscode-langservers-extracted";
-
-struct HtmlExtension {
-    cached_binary_path: Option<String>,
-}
-
-impl HtmlExtension {
-    fn server_exists(&self) -> bool {
-        fs::metadata(SERVER_PATH).is_ok_and(|stat| stat.is_file())
-    }
-
-    fn server_script_path(&mut self, language_server_id: &LanguageServerId) -> Result<String> {
-        let server_exists = self.server_exists();
-        if self.cached_binary_path.is_some() && server_exists {
-            return Ok(SERVER_PATH.to_string());
-        }
-
-        zed::set_language_server_installation_status(
-            language_server_id,
-            &zed::LanguageServerInstallationStatus::CheckingForUpdate,
-        );
-        let version = zed::npm_package_latest_version(PACKAGE_NAME)?;
-
-        if !server_exists
-            || zed::npm_package_installed_version(PACKAGE_NAME)?.as_ref() != Some(&version)
-        {
-            zed::set_language_server_installation_status(
-                language_server_id,
-                &zed::LanguageServerInstallationStatus::Downloading,
-            );
-            let result = zed::npm_install_package(PACKAGE_NAME, &version);
-            match result {
-                Ok(()) => {
-                    if !self.server_exists() {
-                        Err(format!(
-                            "installed package '{PACKAGE_NAME}' did not contain expected path '{SERVER_PATH}'",
-                        ))?;
-                    }
-                }
-                Err(error) => {
-                    if !self.server_exists() {
-                        Err(error)?;
-                    }
-                }
-            }
-        }
-        Ok(SERVER_PATH.to_string())
-    }
-}
-
-impl zed::Extension for HtmlExtension {
-    fn new() -> Self {
-        Self {
-            cached_binary_path: None,
-        }
-    }
-
-    fn language_server_command(
-        &mut self,
-        language_server_id: &LanguageServerId,
-        worktree: &zed::Worktree,
-    ) -> Result<zed::Command> {
-        let server_path = if let Some(path) = worktree.which(BINARY_NAME) {
-            return Ok(zed::Command {
-                command: path,
-                args: vec!["--stdio".to_string()],
-                env: Default::default(),
-            });
-        } else {
-            let server_path = self.server_script_path(language_server_id)?;
-            env::current_dir()
-                .unwrap()
-                .join(&server_path)
-                .to_string_lossy()
-                .to_string()
-        };
-        self.cached_binary_path = Some(server_path.clone());
-
-        Ok(zed::Command {
-            command: zed::node_binary_path()?,
-            args: vec![server_path, "--stdio".to_string()],
-            env: Default::default(),
-        })
-    }
-
-    fn language_server_workspace_configuration(
-        &mut self,
-        server_id: &LanguageServerId,
-        worktree: &zed::Worktree,
-    ) -> Result<Option<zed::serde_json::Value>> {
-        let settings = LspSettings::for_worktree(server_id.as_ref(), worktree)
-            .ok()
-            .and_then(|lsp_settings| lsp_settings.settings)
-            .unwrap_or_default();
-        Ok(Some(settings))
-    }
-
-    fn language_server_initialization_options(
-        &mut self,
-        _server_id: &LanguageServerId,
-        _worktree: &zed_extension_api::Worktree,
-    ) -> Result<Option<zed_extension_api::serde_json::Value>> {
-        let initialization_options = json!({"provideFormatter": true });
-        Ok(Some(initialization_options))
-    }
-}
-
-zed::register_extension!(HtmlExtension);
diff --git a/extensions/proto/Cargo.toml b/extensions/proto/Cargo.toml
deleted file mode 100644
index 1013d62cfa..0000000000
--- a/extensions/proto/Cargo.toml
+++ /dev/null
@@ -1,16 +0,0 @@
-[package]
-name = "zed_proto"
-version = "0.2.3"
-edition.workspace = true
-publish.workspace = true
-license = "Apache-2.0"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/proto.rs"
-crate-type = ["cdylib"]
-
-[dependencies]
-zed_extension_api = "0.1.0"
diff --git a/extensions/proto/LICENSE-APACHE b/extensions/proto/LICENSE-APACHE
deleted file mode 120000
index 1cd601d0a3..0000000000
--- a/extensions/proto/LICENSE-APACHE
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-APACHE
\ No newline at end of file
diff --git a/extensions/proto/extension.toml b/extensions/proto/extension.toml
deleted file mode 100644
index 9bb8625065..0000000000
--- a/extensions/proto/extension.toml
+++ /dev/null
@@ -1,15 +0,0 @@
-id = "proto"
-name = "Proto"
-description = "Protocol Buffers support."
-version = "0.2.3"
-schema_version = 1
-authors = ["Zed Industries <support@zed.dev>"]
-repository = "https://github.com/zed-industries/zed"
-
-[grammars.proto]
-repository = "https://github.com/zed-industries/tree-sitter-proto"
-commit = "0848bd30a64be48772e15fbb9d5ba8c0cc5772ad"
-
-[language_servers.protobuf-language-server]
-name = "Protobuf Language Server"
-languages = ["Proto"]
diff --git a/extensions/proto/languages/proto/config.toml b/extensions/proto/languages/proto/config.toml
deleted file mode 100644
index 6d25c23da5..0000000000
--- a/extensions/proto/languages/proto/config.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-name = "Proto"
-grammar = "proto"
-path_suffixes = ["proto"]
-line_comments = ["// "]
-autoclose_before = ";:.,=}])>"
-brackets = [
-    { start = "{", end = "}", close = true, newline = true },
-    { start = "[", end = "]", close = true, newline = true },
-    { start = "(", end = ")", close = true, newline = true },
-    { start = "\"", end = "\"", close = true, newline = false, not_in = ["comment", "string"] },
-    { start = "'", end = "'", close = true, newline = false, not_in = ["comment", "string"] },
-    { start = "/*", end = " */", close = true, newline = false, not_in = ["comment", "string"] },
-]
diff --git a/extensions/proto/languages/proto/highlights.scm b/extensions/proto/languages/proto/highlights.scm
deleted file mode 100644
index 5d0a513bee..0000000000
--- a/extensions/proto/languages/proto/highlights.scm
+++ /dev/null
@@ -1,61 +0,0 @@
-[
-  "syntax"
-  "package"
-  "option"
-  "optional"
-  "import"
-  "service"
-  "rpc"
-  "returns"
-  "message"
-  "enum"
-  "oneof"
-  "repeated"
-  "reserved"
-  "to"
-] @keyword
-
-[
-  (key_type)
-  (type)
-  (message_name)
-  (enum_name)
-  (service_name)
-  (rpc_name)
-  (message_or_enum_type)
-] @type
-
-(enum_field
-  (identifier) @constant)
-
-[
-  (string)
-  "\"proto3\""
-] @string
-
-(int_lit) @number
-
-[
-  (true)
-  (false)
-] @boolean
-
-(comment) @comment
-
-[
-  "("
-  ")"
-  "["
-  "]"
-  "{"
-  "}"
-  "<"
-  ">"
-]  @punctuation.bracket
-
-[
- ";"
- ","
-] @punctuation.delimiter
-
-"=" @operator
diff --git a/extensions/proto/languages/proto/indents.scm b/extensions/proto/languages/proto/indents.scm
deleted file mode 100644
index acb44a5e1e..0000000000
--- a/extensions/proto/languages/proto/indents.scm
+++ /dev/null
@@ -1,3 +0,0 @@
-(_ "{" "}" @end) @indent
-(_ "[" "]" @end) @indent
-(_ "(" ")" @end) @indent
diff --git a/extensions/proto/languages/proto/outline.scm b/extensions/proto/languages/proto/outline.scm
deleted file mode 100644
index f90b1bae33..0000000000
--- a/extensions/proto/languages/proto/outline.scm
+++ /dev/null
@@ -1,19 +0,0 @@
-(message
-    "message" @context
-    (message_name
-        (identifier) @name)) @item
-
-(service
-    "service" @context
-    (service_name
-        (identifier) @name)) @item
-
-(rpc
-    "rpc" @context
-    (rpc_name
-        (identifier) @name)) @item
-
-(enum
-    "enum" @context
-    (enum_name
-        (identifier) @name)) @item
diff --git a/extensions/proto/languages/proto/textobjects.scm b/extensions/proto/languages/proto/textobjects.scm
deleted file mode 100644
index 90ea84282d..0000000000
--- a/extensions/proto/languages/proto/textobjects.scm
+++ /dev/null
@@ -1,18 +0,0 @@
-(message (message_body
-    "{"
-    (_)* @class.inside
-    "}")) @class.around
-(enum (enum_body
-    "{"
-    (_)* @class.inside
-    "}")) @class.around
-(service
-    "service"
-    (_)
-    "{"
-    (_)* @class.inside
-    "}") @class.around
-
-(rpc) @function.around
-
-(comment)+ @comment.around
diff --git a/extensions/proto/src/proto.rs b/extensions/proto/src/proto.rs
deleted file mode 100644
index 36ba0faf5f..0000000000
--- a/extensions/proto/src/proto.rs
+++ /dev/null
@@ -1,86 +0,0 @@
-use zed_extension_api::{self as zed, Result, settings::LspSettings};
-
-const PROTOBUF_LANGUAGE_SERVER_NAME: &str = "protobuf-language-server";
-
-struct ProtobufLanguageServerBinary {
-    path: String,
-    args: Option<Vec<String>>,
-}
-
-struct ProtobufExtension;
-
-impl ProtobufExtension {
-    fn language_server_binary(
-        &self,
-        _language_server_id: &zed::LanguageServerId,
-        worktree: &zed::Worktree,
-    ) -> Result<ProtobufLanguageServerBinary> {
-        let binary_settings = LspSettings::for_worktree("protobuf-language-server", worktree)
-            .ok()
-            .and_then(|lsp_settings| lsp_settings.binary);
-        let binary_args = binary_settings
-            .as_ref()
-            .and_then(|binary_settings| binary_settings.arguments.clone());
-
-        if let Some(path) = binary_settings.and_then(|binary_settings| binary_settings.path) {
-            return Ok(ProtobufLanguageServerBinary {
-                path,
-                args: binary_args,
-            });
-        }
-
-        if let Some(path) = worktree.which(PROTOBUF_LANGUAGE_SERVER_NAME) {
-            return Ok(ProtobufLanguageServerBinary {
-                path,
-                args: binary_args,
-            });
-        }
-
-        Err(format!("{PROTOBUF_LANGUAGE_SERVER_NAME} not found in PATH",))
-    }
-}
-
-impl zed::Extension for ProtobufExtension {
-    fn new() -> Self {
-        Self
-    }
-
-    fn language_server_command(
-        &mut self,
-        language_server_id: &zed_extension_api::LanguageServerId,
-        worktree: &zed_extension_api::Worktree,
-    ) -> zed_extension_api::Result<zed_extension_api::Command> {
-        let binary = self.language_server_binary(language_server_id, worktree)?;
-        Ok(zed::Command {
-            command: binary.path,
-            args: binary
-                .args
-                .unwrap_or_else(|| vec!["-logs".into(), "".into()]),
-            env: Default::default(),
-        })
-    }
-
-    fn language_server_workspace_configuration(
-        &mut self,
-        server_id: &zed::LanguageServerId,
-        worktree: &zed::Worktree,
-    ) -> Result<Option<zed::serde_json::Value>> {
-        let settings = LspSettings::for_worktree(server_id.as_ref(), worktree)
-            .ok()
-            .and_then(|lsp_settings| lsp_settings.settings);
-        Ok(settings)
-    }
-
-    fn language_server_initialization_options(
-        &mut self,
-        server_id: &zed::LanguageServerId,
-        worktree: &zed::Worktree,
-    ) -> Result<Option<zed_extension_api::serde_json::Value>> {
-        let initialization_options = LspSettings::for_worktree(server_id.as_ref(), worktree)
-            .ok()
-            .and_then(|lsp_settings| lsp_settings.initialization_options);
-        Ok(initialization_options)
-    }
-}
-
-zed::register_extension!(ProtobufExtension);
diff --git a/extensions/slash-commands-example/Cargo.toml b/extensions/slash-commands-example/Cargo.toml
deleted file mode 100644
index 03b22af254..0000000000
--- a/extensions/slash-commands-example/Cargo.toml
+++ /dev/null
@@ -1,16 +0,0 @@
-[package]
-name = "slash_commands_example"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "Apache-2.0"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/slash_commands_example.rs"
-crate-type = ["cdylib"]
-
-[dependencies]
-zed_extension_api = "0.1.0"
diff --git a/extensions/slash-commands-example/LICENSE-APACHE b/extensions/slash-commands-example/LICENSE-APACHE
deleted file mode 120000
index 1cd601d0a3..0000000000
--- a/extensions/slash-commands-example/LICENSE-APACHE
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-APACHE
\ No newline at end of file
diff --git a/extensions/slash-commands-example/README.md b/extensions/slash-commands-example/README.md
deleted file mode 100644
index 8c16a4e168..0000000000
--- a/extensions/slash-commands-example/README.md
+++ /dev/null
@@ -1,84 +0,0 @@
-# Slash Commands Example Extension
-
-This is an example extension showcasing how to write slash commands.
-
-See: [Extensions: Slash Commands](https://zed.dev/docs/extensions/slash-commands) in the Zed Docs.
-
-## Pre-requisites
-
-[Install Rust Toolchain](https://www.rust-lang.org/tools/install):
-
-```sh
-curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
-```
-
-## Setup
-
-```sh
-git clone https://github.com/zed-industries/zed.git
-cp -RL zed/extensions/slash-commands-example .
-
-cd slash-commands-example/
-
-# Update Cargo.toml to make it standalone
-cat > Cargo.toml << EOF
-[package]
-name = "slash_commands_example"
-version = "0.1.0"
-edition = "2021"
-license = "Apache-2.0"
-
-[lib]
-path = "src/slash_commands_example.rs"
-crate-type = ["cdylib"]
-
-[dependencies]
-zed_extension_api = "0.1.0"
-EOF
-
-curl -O https://raw.githubusercontent.com/rust-lang/rust/master/LICENSE-APACHE
-echo "# Zed Slash Commands Example Extension" > README.md
-echo "Cargo.lock" > .gitignore
-echo "target/" >> .gitignore
-echo "*.wasm" >> .gitignore
-
-git init
-git add .
-git commit -m "Initial commit"
-
-cd ..
-mv slash-commands-example MY-SUPER-COOL-ZED-EXTENSION
-zed $_
-```
-
-## Installation
-
-1. Open the command palette (`cmd-shift-p` or `ctrl-shift-p`).
-2. Launch `zed: install dev extension`
-3. Select the extension folder created above
-
-## Test
-
-Open the assistant and type `/echo` and `/pick-one` at the beginning of a line.
-
-## Customization
-
-Open the `extensions.toml` file and set the `id`, `name`, `description`, `authors` and `repository` fields.
-
-Rename `slash-commands-example.rs` you'll also have to update `Cargo.toml`
-
-## Rebuild
-
-Rebuild to see these changes reflected:
-
-1. Open Zed Extensions (`cmd-shift-x` or `ctrl-shift-x`).
-2. Click `Rebuild` next to your Dev Extension (formerly "Slash Command Example")
-
-## Troubleshooting / Logs
-
-- [zed.dev docs: Troubleshooting](https://zed.dev/docs/troubleshooting)
-
-## Documentation
-
-- [zed.dev docs: Extensions: Developing Extensions](https://zed.dev/docs/extensions/developing-extensions)
-- [zed.dev docs: Extensions: Slash Commands](https://zed.dev/docs/extensions/slash-commands)
diff --git a/extensions/slash-commands-example/extension.toml b/extensions/slash-commands-example/extension.toml
deleted file mode 100644
index 888c776d01..0000000000
--- a/extensions/slash-commands-example/extension.toml
+++ /dev/null
@@ -1,15 +0,0 @@
-id = "slash-commands-example"
-name = "Slash Commands Example"
-description = "An example extension showcasing slash commands."
-version = "0.1.0"
-schema_version = 1
-authors = ["Zed Industries <hi@zed.dev>"]
-repository = "https://github.com/zed-industries/zed"
-
-[slash_commands.echo]
-description = "echoes the provided input"
-requires_argument = true
-
-[slash_commands.pick-one]
-description = "pick one of three options"
-requires_argument = true
diff --git a/extensions/slash-commands-example/src/slash_commands_example.rs b/extensions/slash-commands-example/src/slash_commands_example.rs
deleted file mode 100644
index 5b170d63ee..0000000000
--- a/extensions/slash-commands-example/src/slash_commands_example.rs
+++ /dev/null
@@ -1,90 +0,0 @@
-use zed_extension_api::{
-    self as zed, SlashCommand, SlashCommandArgumentCompletion, SlashCommandOutput,
-    SlashCommandOutputSection, Worktree,
-};
-
-struct SlashCommandsExampleExtension;
-
-impl zed::Extension for SlashCommandsExampleExtension {
-    fn new() -> Self {
-        SlashCommandsExampleExtension
-    }
-
-    fn complete_slash_command_argument(
-        &self,
-        command: SlashCommand,
-        _args: Vec<String>,
-    ) -> Result<Vec<zed_extension_api::SlashCommandArgumentCompletion>, String> {
-        match command.name.as_str() {
-            "echo" => Ok(vec![]),
-            "pick-one" => Ok(vec![
-                SlashCommandArgumentCompletion {
-                    label: "Option One".to_string(),
-                    new_text: "option-1".to_string(),
-                    run_command: true,
-                },
-                SlashCommandArgumentCompletion {
-                    label: "Option Two".to_string(),
-                    new_text: "option-2".to_string(),
-                    run_command: true,
-                },
-                SlashCommandArgumentCompletion {
-                    label: "Option Three".to_string(),
-                    new_text: "option-3".to_string(),
-                    run_command: true,
-                },
-            ]),
-            command => Err(format!("unknown slash command: \"{command}\"")),
-        }
-    }
-
-    fn run_slash_command(
-        &self,
-        command: SlashCommand,
-        args: Vec<String>,
-        _worktree: Option<&Worktree>,
-    ) -> Result<SlashCommandOutput, String> {
-        match command.name.as_str() {
-            "echo" => {
-                if args.is_empty() {
-                    return Err("nothing to echo".to_string());
-                }
-
-                let text = args.join(" ");
-
-                Ok(SlashCommandOutput {
-                    sections: vec![SlashCommandOutputSection {
-                        range: (0..text.len()).into(),
-                        label: "Echo".to_string(),
-                    }],
-                    text,
-                })
-            }
-            "pick-one" => {
-                let Some(selection) = args.first() else {
-                    return Err("no option selected".to_string());
-                };
-
-                match selection.as_str() {
-                    "option-1" | "option-2" | "option-3" => {}
-                    invalid_option => {
-                        return Err(format!("{invalid_option} is not a valid option"));
-                    }
-                }
-
-                let text = format!("You chose {selection}.");
-
-                Ok(SlashCommandOutput {
-                    sections: vec![SlashCommandOutputSection {
-                        range: (0..text.len()).into(),
-                        label: format!("Pick One: {selection}"),
-                    }],
-                    text,
-                })
-            }
-            command => Err(format!("unknown slash command: \"{command}\"")),
-        }
-    }
-}
-
-zed::register_extension!(SlashCommandsExampleExtension);
diff --git a/extensions/test-extension/Cargo.toml b/extensions/test-extension/Cargo.toml
deleted file mode 100644
index 7d2412b98f..0000000000
--- a/extensions/test-extension/Cargo.toml
+++ /dev/null
@@ -1,16 +0,0 @@
-[package]
-name = "zed_test_extension"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "Apache-2.0"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/test_extension.rs"
-crate-type = ["cdylib"]
-
-[dependencies]
-zed_extension_api = { path = "../../crates/extension_api" }
diff --git a/extensions/test-extension/LICENSE-APACHE b/extensions/test-extension/LICENSE-APACHE
deleted file mode 120000
index 1cd601d0a3..0000000000
--- a/extensions/test-extension/LICENSE-APACHE
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-APACHE
\ No newline at end of file
diff --git a/extensions/test-extension/README.md b/extensions/test-extension/README.md
deleted file mode 100644
index 5941f23ec4..0000000000
--- a/extensions/test-extension/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Test Extension
-
-This is a test extension that we use in the tests for the `extension` crate.
-
-Originally based off the Gleam extension.
diff --git a/extensions/test-extension/extension.toml b/extensions/test-extension/extension.toml
deleted file mode 100644
index 0cb5afac7f..0000000000
--- a/extensions/test-extension/extension.toml
+++ /dev/null
@@ -1,25 +0,0 @@
-id = "test-extension"
-name = "Test Extension"
-description = "An extension for use in tests."
-version = "0.1.0"
-schema_version = 1
-authors = ["Marshall Bowers <elliott.codes@gmail.com>"]
-repository = "https://github.com/zed-industries/zed"
-
-[language_servers.gleam]
-name = "Gleam LSP"
-language = "Gleam"
-
-[grammars.gleam]
-repository = "https://github.com/gleam-lang/tree-sitter-gleam"
-commit = "8432ffe32ccd360534837256747beb5b1c82fca1"
-
-[[capabilities]]
-kind = "process:exec"
-command = "echo"
-args = ["hello from a child process!"]
-
-[[capabilities]]
-kind = "process:exec"
-command = "cmd"
-args = ["/C", "echo", "hello from a child process!"]
diff --git a/extensions/test-extension/languages/gleam/config.toml b/extensions/test-extension/languages/gleam/config.toml
deleted file mode 100644
index 51874945e2..0000000000
--- a/extensions/test-extension/languages/gleam/config.toml
+++ /dev/null
@@ -1,12 +0,0 @@
-name = "Gleam"
-grammar = "gleam"
-path_suffixes = ["gleam"]
-line_comments = ["// ", "/// "]
-autoclose_before = ";:.,=}])>"
-brackets = [
-    { start = "{", end = "}", close = true, newline = true },
-    { start = "[", end = "]", close = true, newline = true },
-    { start = "(", end = ")", close = true, newline = true },
-    { start = "\"", end = "\"", close = true, newline = false, not_in = ["string", "comment"] },
-]
-tab_size = 2
diff --git a/extensions/test-extension/languages/gleam/highlights.scm b/extensions/test-extension/languages/gleam/highlights.scm
deleted file mode 100644
index 4b85b88d01..0000000000
--- a/extensions/test-extension/languages/gleam/highlights.scm
+++ /dev/null
@@ -1,130 +0,0 @@
-; Comments
-(module_comment) @comment
-(statement_comment) @comment
-(comment) @comment
-
-; Constants
-(constant
-  name: (identifier) @constant)
-
-; Variables
-(identifier) @variable
-(discard) @comment.unused
-
-; Modules
-(module) @module
-(import alias: (identifier) @module)
-(remote_type_identifier
-  module: (identifier) @module)
-(remote_constructor_name
-  module: (identifier) @module)
-((field_access
-  record: (identifier) @module
-  field: (label) @function)
- (#is-not? local))
-
-; Functions
-(unqualified_import (identifier) @function)
-(unqualified_import "type" (type_identifier) @type)
-(unqualified_import (type_identifier) @constructor)
-(function
-  name: (identifier) @function)
-(external_function
-  name: (identifier) @function)
-(function_parameter
-  name: (identifier) @variable.parameter)
-((function_call
-   function: (identifier) @function)
- (#is-not? local))
-((binary_expression
-   operator: "|>"
-   right: (identifier) @function)
- (#is-not? local))
-
-; "Properties"
-; Assumed to be intended to refer to a name for a field; something that comes
-; before ":" or after "."
-; e.g. record field names, tuple indices, names for named arguments, etc
-(label) @property
-(tuple_access
-  index: (integer) @property)
-
-; Attributes
-(attribute
-  "@" @attribute
-  name: (identifier) @attribute)
-
-(attribute_value (identifier) @constant)
-
-; Type names
-(remote_type_identifier) @type
-(type_identifier) @type
-
-; Data constructors
-(constructor_name) @constructor
-
-; Literals
-(string) @string
-((escape_sequence) @warning
- ; Deprecated in v0.33.0-rc2:
- (#eq? @warning "\\e"))
-(escape_sequence) @string.escape
-(bit_string_segment_option) @function.builtin
-(integer) @number
-(float) @number
-
-; Reserved identifiers
-; TODO: when tree-sitter supports `#any-of?` in the Rust bindings,
-; refactor this to use `#any-of?` rather than `#match?`
-((identifier) @warning
- (#match? @warning "^(auto|delegate|derive|else|implement|macro|test|echo)$"))
-
-; Keywords
-[
-  (visibility_modifier) ; "pub"
-  (opacity_modifier) ; "opaque"
-  "as"
-  "assert"
-  "case"
-  "const"
-  ; DEPRECATED: 'external' was removed in v0.30.
-  "external"
-  "fn"
-  "if"
-  "import"
-  "let"
-  "panic"
-  "todo"
-  "type"
-  "use"
-] @keyword
-
-; Operators
-(binary_expression
-  operator: _ @operator)
-(boolean_negation "!" @operator)
-(integer_negation "-" @operator)
-
-; Punctuation
-[
-  "("
-  ")"
-  "["
-  "]"
-  "{"
-  "}"
-  "<<"
-  ">>"
-] @punctuation.bracket
-[
-  "."
-  ","
-  ;; Controversial -- maybe some are operators?
-  ":"
-  "#"
-  "="
-  "->"
-  ".."
-  "-"
-  "<-"
-] @punctuation.delimiter
diff --git a/extensions/test-extension/languages/gleam/indents.scm b/extensions/test-extension/languages/gleam/indents.scm
deleted file mode 100644
index 112b414aa4..0000000000
--- a/extensions/test-extension/languages/gleam/indents.scm
+++ /dev/null
@@ -1,3 +0,0 @@
-(_ "[" "]" @end) @indent
-(_ "{" "}" @end) @indent
-(_ "(" ")" @end) @indent
diff --git a/extensions/test-extension/languages/gleam/outline.scm b/extensions/test-extension/languages/gleam/outline.scm
deleted file mode 100644
index 5df7a6af80..0000000000
--- a/extensions/test-extension/languages/gleam/outline.scm
+++ /dev/null
@@ -1,31 +0,0 @@
-(external_type
-    (visibility_modifier)? @context
-    "type" @context
-    (type_name) @name) @item
-
-(type_definition
-    (visibility_modifier)? @context
-    (opacity_modifier)? @context
-    "type" @context
-    (type_name) @name) @item
-
-(data_constructor
-    (constructor_name) @name) @item
-
-(data_constructor_argument
-    (label) @name) @item
-
-(type_alias
-    (visibility_modifier)? @context
-    "type" @context
-    (type_name) @name) @item
-
-(function
-    (visibility_modifier)? @context
-    "fn" @context
-    name: (_) @name) @item
-
-(constant
-    (visibility_modifier)? @context
-    "const" @context
-    name: (_) @name) @item
diff --git a/extensions/test-extension/src/test_extension.rs b/extensions/test-extension/src/test_extension.rs
deleted file mode 100644
index 0b96f47038..0000000000
--- a/extensions/test-extension/src/test_extension.rs
+++ /dev/null
@@ -1,209 +0,0 @@
-use std::fs;
-use zed::lsp::CompletionKind;
-use zed::{CodeLabel, CodeLabelSpan, LanguageServerId};
-use zed_extension_api::process::Command;
-use zed_extension_api::{self as zed, Result};
-
-struct TestExtension {
-    cached_binary_path: Option<String>,
-}
-
-impl TestExtension {
-    fn language_server_binary_path(
-        &mut self,
-        language_server_id: &LanguageServerId,
-        _worktree: &zed::Worktree,
-    ) -> Result<String> {
-        let (platform, arch) = zed::current_platform();
-
-        let current_dir = std::env::current_dir().unwrap();
-        println!("current_dir: {}", current_dir.display());
-        assert_eq!(
-            current_dir.file_name().unwrap().to_str().unwrap(),
-            "test-extension"
-        );
-
-        fs::create_dir_all(current_dir.join("dir-created-with-abs-path")).unwrap();
-        fs::create_dir_all("./dir-created-with-rel-path").unwrap();
-        fs::write("file-created-with-rel-path", b"contents 1").unwrap();
-        fs::write(
-            current_dir.join("file-created-with-abs-path"),
-            b"contents 2",
-        )
-        .unwrap();
-        assert_eq!(
-            fs::read("file-created-with-rel-path").unwrap(),
-            b"contents 1"
-        );
-        assert_eq!(
-            fs::read("file-created-with-abs-path").unwrap(),
-            b"contents 2"
-        );
-
-        let command = match platform {
-            zed::Os::Linux | zed::Os::Mac => Command::new("echo"),
-            zed::Os::Windows => Command::new("cmd").args(["/C", "echo"]),
-        };
-        let output = command.arg("hello from a child process!").output()?;
-        println!(
-            "command output: {}",
-            String::from_utf8_lossy(&output.stdout).trim()
-        );
-
-        if let Some(path) = &self.cached_binary_path
-            && fs::metadata(path).is_ok_and(|stat| stat.is_file())
-        {
-            return Ok(path.clone());
-        }
-
-        zed::set_language_server_installation_status(
-            language_server_id,
-            &zed::LanguageServerInstallationStatus::CheckingForUpdate,
-        );
-        let release = zed::latest_github_release(
-            "gleam-lang/gleam",
-            zed::GithubReleaseOptions {
-                require_assets: true,
-                pre_release: false,
-            },
-        )?;
-
-        let ext = "tar.gz";
-        let download_type = zed::DownloadedFileType::GzipTar;
-
-        // Do this if you want to actually run this extension -
-        // the actual asset is a .zip. But the integration test is simpler
-        // if every platform uses .tar.gz.
-        //
-        // ext = "zip";
-        // download_type = zed::DownloadedFileType::Zip;
-
-        let asset_name = format!(
-            "gleam-{version}-{arch}-{os}.{ext}",
-            version = release.version,
-            arch = match arch {
-                zed::Architecture::Aarch64 => "aarch64",
-                zed::Architecture::X86 => "x86",
-                zed::Architecture::X8664 => "x86_64",
-            },
-            os = match platform {
-                zed::Os::Mac => "apple-darwin",
-                zed::Os::Linux => "unknown-linux-musl",
-                zed::Os::Windows => "pc-windows-msvc",
-            },
-        );
-
-        let asset = release
-            .assets
-            .iter()
-            .find(|asset| asset.name == asset_name)
-            .ok_or_else(|| format!("no asset found matching {:?}", asset_name))?;
-
-        let version_dir = format!("gleam-{}", release.version);
-        let binary_path = format!("{version_dir}/gleam");
-
-        if !fs::metadata(&binary_path).is_ok_and(|stat| stat.is_file()) {
-            zed::set_language_server_installation_status(
-                language_server_id,
-                &zed::LanguageServerInstallationStatus::Downloading,
-            );
-
-            zed::download_file(&asset.download_url, &version_dir, download_type)
-                .map_err(|e| format!("failed to download file: {e}"))?;
-
-            zed::set_language_server_installation_status(
-                language_server_id,
-                &zed::LanguageServerInstallationStatus::None,
-            );
-
-            let entries =
-                fs::read_dir(".").map_err(|e| format!("failed to list working directory {e}"))?;
-            for entry in entries {
-                let entry = entry.map_err(|e| format!("failed to load directory entry {e}"))?;
-                let filename = entry.file_name();
-                let filename = filename.to_str().unwrap();
-                if filename.starts_with("gleam-") && filename != version_dir {
-                    fs::remove_dir_all(entry.path()).ok();
-                }
-            }
-        }
-
-        self.cached_binary_path = Some(binary_path.clone());
-        Ok(binary_path)
-    }
-}
-
-impl zed::Extension for TestExtension {
-    fn new() -> Self {
-        Self {
-            cached_binary_path: None,
-        }
-    }
-
-    fn language_server_command(
-        &mut self,
-        language_server_id: &LanguageServerId,
-        worktree: &zed::Worktree,
-    ) -> Result<zed::Command> {
-        Ok(zed::Command {
-            command: self.language_server_binary_path(language_server_id, worktree)?,
-            args: vec!["lsp".to_string()],
-            env: Default::default(),
-        })
-    }
-
-    fn label_for_completion(
-        &self,
-        _language_server_id: &LanguageServerId,
-        completion: zed::lsp::Completion,
-    ) -> Option<zed::CodeLabel> {
-        let name = &completion.label;
-        let ty = strip_newlines_from_detail(&completion.detail?);
-        let let_binding = "let a";
-        let colon = ": ";
-        let assignment = " = ";
-        let call = match completion.kind? {
-            CompletionKind::Function | CompletionKind::Constructor => "()",
-            _ => "",
-        };
-        let code = format!("{let_binding}{colon}{ty}{assignment}{name}{call}");
-
-        Some(CodeLabel {
-            spans: vec![
-                CodeLabelSpan::code_range({
-                    let start = let_binding.len() + colon.len() + ty.len() + assignment.len();
-                    start..start + name.len()
-                }),
-                CodeLabelSpan::code_range({
-                    let start = let_binding.len();
-                    start..start + colon.len()
-                }),
-                CodeLabelSpan::code_range({
-                    let start = let_binding.len() + colon.len();
-                    start..start + ty.len()
-                }),
-            ],
-            filter_range: (0..name.len()).into(),
-            code,
-        })
-    }
-}
-
-zed::register_extension!(TestExtension);
-
-/// Removes newlines from the completion detail.
-///
-/// The Gleam LSP can return types containing newlines, which causes formatting
-/// issues within the Zed completions menu.
-fn strip_newlines_from_detail(detail: &str) -> String {
-    let without_newlines = detail
-        .replace("->\n  ", "-> ")
-        .replace("\n  ", "")
-        .replace(",\n", "");
-
-    let comma_delimited_parts = without_newlines.split(',');
-    comma_delimited_parts
-        .map(|part| part.trim())
-        .collect::<Vec<_>>()
-        .join(", ")
-}
diff --git a/extensions/workflows/bump_version.yml b/extensions/workflows/bump_version.yml
deleted file mode 100644
index 7f4318dcf5..0000000000
--- a/extensions/workflows/bump_version.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-# Generated from xtask::workflows::extensions::bump_version within the Zed repository.
-# Rebuild with `cargo xtask workflows`.
-name: extensions::bump_version
-on:
-  pull_request:
-    types:
-    - labeled
-  push:
-    branches:
-    - main
-    paths-ignore:
-    - .github/**
-  workflow_dispatch: {}
-jobs:
-  determine_bump_type:
-    runs-on: namespace-profile-16x32-ubuntu-2204
-    steps:
-    - id: get-bump-type
-      name: extensions::bump_version::get_bump_type
-      run: |
-        if [ "$HAS_MAJOR_LABEL" = "true" ]; then
-            bump_type="major"
-        elif [ "$HAS_MINOR_LABEL" = "true" ]; then
-            bump_type="minor"
-        else
-            bump_type="patch"
-        fi
-        echo "bump_type=$bump_type" >> $GITHUB_OUTPUT
-      shell: bash -euxo pipefail {0}
-      env:
-        HAS_MAJOR_LABEL: |-
-          ${{ (github.event.action == 'labeled' && github.event.label.name == 'major') ||
-          (github.event.action == 'synchronize' && contains(github.event.pull_request.labels.*.name, 'major')) }}
-        HAS_MINOR_LABEL: |-
-          ${{ (github.event.action == 'labeled' && github.event.label.name == 'minor') ||
-          (github.event.action == 'synchronize' && contains(github.event.pull_request.labels.*.name, 'minor')) }}
-    outputs:
-      bump_type: ${{ steps.get-bump-type.outputs.bump_type }}
-  call_bump_version:
-    needs:
-    - determine_bump_type
-    if: github.event.action != 'labeled' || needs.determine_bump_type.outputs.bump_type != 'patch'
-    uses: zed-industries/zed/.github/workflows/extension_bump.yml@main
-    secrets:
-      app-id: ${{ secrets.ZED_ZIPPY_APP_ID }}
-      app-secret: ${{ secrets.ZED_ZIPPY_APP_PRIVATE_KEY }}
-    with:
-      bump-type: ${{ needs.determine_bump_type.outputs.bump_type }}
-      force-bump: true
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.ref_name == 'main' && github.sha || 'anysha' }}labels
-  cancel-in-progress: true
diff --git a/extensions/workflows/release_version.yml b/extensions/workflows/release_version.yml
deleted file mode 100644
index f752931917..0000000000
--- a/extensions/workflows/release_version.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-# Generated from xtask::workflows::extensions::release_version within the Zed repository.
-# Rebuild with `cargo xtask workflows`.
-name: extensions::release_version
-on:
-  push:
-    tags:
-    - v**
-jobs:
-  call_release_version:
-    uses: zed-industries/zed/.github/workflows/extension_release.yml@main
-    secrets:
-      app-id: ${{ secrets.ZED_ZIPPY_APP_ID }}
-      app-secret: ${{ secrets.ZED_ZIPPY_APP_PRIVATE_KEY }}
diff --git a/extensions/workflows/run_tests.yml b/extensions/workflows/run_tests.yml
deleted file mode 100644
index 81ba76c483..0000000000
--- a/extensions/workflows/run_tests.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-# Generated from xtask::workflows::extensions::run_tests within the Zed repository.
-# Rebuild with `cargo xtask workflows`.
-name: extensions::run_tests
-on:
-  pull_request:
-    branches:
-    - '**'
-  push:
-    branches:
-    - main
-jobs:
-  call_extension_tests:
-    uses: zed-industries/zed/.github/workflows/extension_tests.yml@main
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.ref_name == 'main' && github.sha || 'anysha' }}pr
-  cancel-in-progress: true
diff --git a/flake.lock b/flake.lock
deleted file mode 100644
index 3074b947ef..0000000000
--- a/flake.lock
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "nodes": {
-    "crane": {
-      "locked": {
-        "lastModified": 1762538466,
-        "narHash": "sha256-8zrIPl6J+wLm9MH5ksHcW7BUHo7jSNOu0/hA0ohOOaM=",
-        "owner": "ipetkov",
-        "repo": "crane",
-        "rev": "0cea393fffb39575c46b7a0318386467272182fe",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ipetkov",
-        "repo": "crane",
-        "type": "github"
-      }
-    },
-    "flake-compat": {
-      "locked": {
-        "lastModified": 1761588595,
-        "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 315532800,
-        "narHash": "sha256-5CwQ80ucRHiqVbMEEbTFnjz70/axSJ0aliyzSaFSkmY=",
-        "rev": "f6b44b2401525650256b977063dbcf830f762369",
-        "type": "tarball",
-        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre891648.f6b44b240152/nixexprs.tar.xz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"
-      }
-    },
-    "root": {
-      "inputs": {
-        "crane": "crane",
-        "flake-compat": "flake-compat",
-        "nixpkgs": "nixpkgs",
-        "rust-overlay": "rust-overlay"
-      }
-    },
-    "rust-overlay": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1762915112,
-        "narHash": "sha256-d9j1g8nKmYDHy+/bIOPQTh9IwjRliqaTM0QLHMV92Ic=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "aa1e85921cfa04de7b6914982a94621fbec5cc02",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
diff --git a/flake.nix b/flake.nix
deleted file mode 100644
index fe7a09701b..0000000000
--- a/flake.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  description = "High-performance, multiplayer code editor from the creators of Atom and Tree-sitter";
-
-  inputs = {
-    nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz";
-    rust-overlay = {
-      url = "github:oxalica/rust-overlay";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    crane.url = "github:ipetkov/crane";
-    flake-compat.url = "github:edolstra/flake-compat";
-  };
-
-  outputs =
-    {
-      nixpkgs,
-      rust-overlay,
-      crane,
-      ...
-    }:
-    let
-      systems = [
-        "x86_64-linux"
-        "x86_64-darwin"
-        "aarch64-linux"
-        "aarch64-darwin"
-      ];
-
-      forAllSystems = f: nixpkgs.lib.genAttrs systems (system: f nixpkgs.legacyPackages.${system});
-      mkZed =
-        pkgs:
-        let
-          rustBin = rust-overlay.lib.mkRustBin { } pkgs;
-        in
-        pkgs.callPackage ./nix/build.nix {
-          crane = crane.mkLib pkgs;
-          rustToolchain = rustBin.fromRustupToolchainFile ./rust-toolchain.toml;
-        };
-    in
-    rec {
-      packages = forAllSystems (pkgs: rec {
-        default = mkZed pkgs;
-        debug = default.override { profile = "dev"; };
-      });
-      devShells = forAllSystems (pkgs: {
-        default = pkgs.callPackage ./nix/shell.nix {
-          zed-editor = packages.${pkgs.hostPlatform.system}.default;
-        };
-      });
-      formatter = forAllSystems (pkgs: pkgs.nixfmt-rfc-style);
-      overlays.default = final: _: {
-        zed-editor = mkZed final;
-      };
-    };
-
-  nixConfig = {
-    extra-substituters = [
-      "https://zed.cachix.org"
-      "https://cache.garnix.io"
-    ];
-    extra-trusted-public-keys = [
-      "zed.cachix.org-1:/pHQ6dpMsAZk2DiP4WCL0p9YDNKWj2Q5FL20bNmw1cU="
-      "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
-    ];
-  };
-}
diff --git a/legal/privacy-policy.md b/legal/privacy-policy.md
deleted file mode 100644
index eaf8ece781..0000000000
--- a/legal/privacy-policy.md
+++ /dev/null
@@ -1,268 +0,0 @@
----
-title: Privacy Policy
-slug: privacy-policy
----
-
-At Zed Industries, Inc. ("Zed", "Company" or "we"), we take privacy and the security of data seriously. This Privacy Policy is established to help advise you about how we treat your personal data. By using or accessing our website located at zed.dev, or the Solution or services available pursuant the Zed End User Terms located at [https://zed.dev/terms](https://zed.dev/terms) (collectively, the "Services"), you acknowledge awareness of the practices and policies outlined below, and hereby consent that we will collect, use, and share your personal data as described in this Privacy Policy.
-
-As we grow and expand our Services, we may modify this Privacy Policy from time to time. When material modifications are made, we will alert you to any such changes by placing a notice on the Company website, by sending you an email and/or by some other means. Please note that if you've opted not to receive legal notice emails from us (or haven't provided us with a valid email address), those legal notices will still govern your use of the Services. If you use the Services after any changes to the Privacy Policy have been published on our website, you consent and agree to all of the changes.
-
-## What this Privacy Policy Covers
-
-Our Privacy Policy covers how we treat Personal Data that we gather when you access or use our Services. "Personal Data" means information that identifies or relates to a particular individual and includes information referred to as "personally identifiable information" or "personal information" under applicable data privacy laws, rules or regulations. Our Privacy Policy does not cover the practices of companies we don't own or control or people we don't manage.
-
-## Personal Data
-
-### Categories of Personal Data We Collect
-
-This chart details the categories of Personal Data that we collect and have collected over the past 12 months:
-
-| Category of personal data     | Examples of data we collect                                   | Categories of third parties with whom we share this data |
-| ----------------------------- | ------------------------------------------------------------- | -------------------------------------------------------- |
-| Profile or contact data       | First and last name<br/>Email address<br/>GitHub username     | Cloud infrastructure providers <br/>Analytics providers  |
-| IP data                       | IP address & derived geolocation data                         | Cloud infrastructure providers <br/>Analytics providers  |
-| Web analytics                 | Interactions<br/>Referrer<br/>Request IDs<br/>Statistics      | Cloud infrastructure providers <br/>Analytics providers  |
-| Photos, videos and recordings | Screenshots<br/>Videos and video recordings you share with us | Cloud infrastructure providers                           |
-| Audio, screenshare data       | Audio and screen sharing during collaboration calls           | Cloud infrastructure providers                           |
-
-Note that "collection" does not necessarily imply long-term storage.
-
-### Categories of Sources of Personal Data
-
-We collect Personal Data about you from the following categories of sources:
-
-#### You
-
-- When you provide such information directly to us. Examples include:
-  - When you create an account
-  - When you voluntarily provide information through our Services or through responses to surveys or questionnaires.
-  - When you send us an email or otherwise contact us.
-  - When you sign up to our mailing list.
-- When you use our hosted Services and such information is collected automatically. Examples include:
-  - Cookies (defined in the "Tracking Tools and Opt-Out" section below).
-- When you use the client software we provide on your machine. Examples include:
-  - Authentication information when you sign in.
-  - Version and system metadata when the software checks for updates.
-  - Usage data, unless you opt out.
-  - Crash reports, unless you opt out.
-  - When you make requests to language models we host for you.
-    - Zed does not store or train on your requests without consent.
-  - Other relevant data necessary to provide you with our Services.
-
-#### Third Parties
-
-- When you login to the service using a third-party service like GitHub.
-- Information collected by content delivery networks or similar service providers
-- We may use analytics providers to analyze how you interact and engage with the Services, or third parties may help us provide you with customer support.
-
-## Our Business Purposes for Collecting or Disclosing Personal Data
-
-- Providing, Customizing and Improving the Services
-  - Creating and managing your account or other user profiles.
-  - Processing orders or other fee-based transactions; billing.
-  - Providing you with the products, services or information you request.
-  - Meeting or fulfilling the reason you provided the information to us.
-  - Providing support and assistance for the Services.
-  - Improving the Services, including testing, research, internal analytics and product development.
-  - Doing fraud protection, security and debugging.
-  - Carrying out other business purposes stated when collecting your Personal Data or as otherwise set forth in applicable data privacy laws.
-- Marketing the Services
-  - Marketing and selling the Services.
-- Corresponding with You
-  - Responding to correspondence that we receive from you, contacting you when necessary or requested, and sending you information about Zed or our Services.
-  - Sending emails and other communications according to your preferences or that display content that we think will interest you.
-- Meeting Legal Requirements and Enforcing Legal Terms
-  - Fulfilling our legal obligations under applicable law, regulation, court order or other legal process, such as preventing, detecting and investigating security incidents and potentially illegal or prohibited activities.
-  - Protecting the rights, property or safety of you, Zed or another party.
-  - Enforcing any agreements with you.
-  - Responding to claims that any posting or other content violates third-party rights.
-  - Resolving disputes.
-
-We will not collect additional categories of Personal Data or use the Personal Data we collected for materially different, unrelated or incompatible purposes without providing you notice as is described above.
-
-## How We Disclose Your Personal Data
-
-We disclose your Personal Data to categories of service providers and other parties listed in this section. Some of these disclosures may constitute a "sale" of your Personal Data as defined under applicable laws. For more information, please refer to the state-specific sections below.
-
-- Service Providers. These parties help us provide the Services or perform business functions on our behalf. They include:
-  - Hosting, technology and communication providers.
-  - Providers of artificial intelligence or machine learning models
-  - Payment processors.
-    - If you are using our Services on a fee-basis, our payment processing partner Stripe, Inc. ("Stripe") collects your voluntarily-provided payment card information necessary to process your payment.
-    - Please see Stripe Terms of Service and Stripe Privacy Policy for information on its use and storage of your Personal Data.
-- Analytics Partners. These parties provide analytics on web traffic or usage of the Services. They include:
-  - Companies that track how users found or were referred to the Services.
-  - Companies that track how users interact with the Services.
-- Authorized authentication providers (e.g. GitHub OAuth)
-
-### Fulfilling Legal Obligations
-
-We may share any Personal Data that we collect with third parties in relation to the activities set forth under "Meeting Legal Requirements and Enforcing Legal Terms" in the "Our Business Purposes for Collecting Personal Data" section above.
-
-### Business Transfers
-
-Personal Data collected may be transferred to a third party if we undergo a merger, acquisition, bankruptcy or other transaction in which such third party assumes control of our business (in whole or in part). In such an event, we will make reasonable efforts to notify you before your information becomes subject to different privacy and security policies and practices as authorized or mandated by applicable law.
-
-## Data that is Not Personal Data
-
-We may create aggregated, de-identified or anonymized data from the Personal Data we collect, including by removing information that makes the data personally identifiable to a particular user. We may use such aggregated, de-identified or anonymized data and share it with third parties for our lawful business purposes, including to analyze, build and improve the Services and promote our business, provided that we will not share such data in a manner that could identify you.
-
-## Tracking Tools and Opt-Out
-
-The Services use cookies and similar technologies such as pixel tags, web beacons, clear GIFs and JavaScript (collectively, "Cookies") to enable our servers to recognize your web browser, tell us how and when you visit and use our Services, analyze trends, learn about our user base and operate and improve our Services. Cookies are small pieces of data– usually text files – placed on your computer, tablet, phone or similar device when you use that device to access our Services. We may also supplement the information we collect from you with information received from third parties, including third parties that have placed their own Cookies on your device(s).
-
-### We use the following types of Cookies:
-
-- Essential Cookies. Essential Cookies are required for providing you with features or services that you have requested. For example, certain Cookies enable you to log into secure areas of our Services. Disabling these Cookies may make certain features and services unavailable.
-- Functional Cookies. Functional Cookies are used to record your choices and settings regarding our Services, maintain your preferences over time and recognize you when you return to our Services. These Cookies help us to personalize our content for you, greet you by name and remember your preferences (for example, your choice of language or region).
-- Performance/Analytical Cookies. Performance/Analytical Cookies allow us to understand how visitors use our Services. They do this by collecting information about the number of visitors to the Services, what pages visitors view on our Services and how long visitors are viewing pages on the Services. Performance/Analytical Cookies also help us measure the performance of our advertising campaigns to help us improve our campaigns and Services' content for those who engage with our advertising.
-
-You can decide whether or not to accept Cookies through your internet browser's settings. Most browsers have an option for turning off the Cookie feature, which will prevent your browser from accepting new Cookies, as well as (depending on the sophistication of your browser software) allow you to decide on acceptance of each new Cookie in a variety of ways. You can also delete all Cookies that are already on your device. If you do this, however, you may have to manually adjust some preferences every time you visit our website and some of the Services and functionalities may not work.
-
-To find out more information about Cookies generally, including information about how to manage and delete Cookies, please visit [https://allaboutcookies.org/](https://allaboutcookies.org/) or [https://ico.org.uk/for-the-public/online/cookies/](https://ico.org.uk/for-the-public/online/cookies/) if you are located in the European Union.
-
-## Data Security
-
-We endeavor to protect your Personal Data from unauthorized access, use and disclosure using appropriate physical, technical, organizational and administrative security measures based on our Services,the type of Personal Data being collected and how we are processing that data. You should also help protect your data by selecting and protecting your password and/or other sign-on mechanism(s) with care; limiting access to your computer or device and browser; and signing off after you have finished accessing your account. Although we work to protect the security of your account and other data that we hold in our records, be aware that no method of transmitting data over the internet or storing data is completely secure.
-
-## Data Retention
-
-We retain Personal Data about you for as long as reasonably necessary to provide you with our Services or otherwise in support of our business or commercial purposes for utilization of your Personal Data, as expressed. When establishing a retention period for particular categories of data, we consider who we collected the data from, our need for the Personal Data, why we collected the Personal Data, and the sensitivity of the Personal Data. In some cases we retain Personal Data for a longer period, if doing so is necessary to comply with our legal obligations, resolve disputes or collect fees owed, or as is otherwise permitted or required by applicable law, rule or regulation. We may further retain information in an anonymous or aggregated form where such information would not identify you personally.
-
-For example:
-
-- We retain your profile information and credentials for as long as you have an account with us.
-- We retain your payment data for as long as we need to process your purchase or subscription.
-- We retain your device/IP data for as long as we need it to ensure that our systems are working appropriately, effectively and efficiently.
-
-It's worth noting that we avoid retaining data unless necessary to provide our Service. For example:
-
-- We do not currently store source code that we proxy during collaboration sessions.
-- We do not currently store audio or video recordings of Collaboration calls handled by LiveKit.
-
-## Personal Data of Children
-
-We do not knowingly collect or solicit Personal Data from children under 13 years of age; if you are a child under the age of 13, please do not attempt to register for or otherwise use the Services or send us any Personal Data. If we learn we have collected Personal Data from a child under 13 years of age, we will delete that information as quickly as possible. If you believe that a child under 13 years of age may have provided Personal Data to us, please contact us at hi@zed.dev.
-
-## California Resident Rights
-
-If you are a California resident, you have the rights set forth in this section. Please see the "Exercising Your Rights" section below for instructions regarding how to exercise these rights. Please note that we may process Personal Data of our customers' end users or employees in connection with our provision of certain services to our customers. If we are processing your Personal Data as a service provider, you may contact the entity that collected your Personal Data in the first instance to address your rights with respect to such data as desired.
-
-If there are any conflicts between this section and any other provision of this Privacy Policy and you are a California resident, the portion that is more protective of Personal Data shall control to the extent of such conflict. If you have any questions about this section or whether any of the following rights apply to you, please contact us at hi@zed.dev.
-
-### Access
-
-You have the right to request certain information about our collection and use of your Personal Data over the past 12 months. In response, we will provide you with the following information:
-
-- The categories of Personal Data that we have collected about you.
-- The categories of sources from which that Personal Data was collected.
-- The business or commercial purpose for collecting or selling your Personal Data.
-- The categories of third parties with whom we have shared your Personal Data.
-- The specific pieces of Personal Data that we have collected about you.
-- If we have disclosed your Personal Data to any third parties for a business purpose over the past 12 months, we will identify the categories of Personal Data shared with each category of third party recipient. If we have sold your Personal Data over the past 12 months, we will identify the categories of Personal Data sold to each category of third party recipient.
-
-### Deletion
-
-You have the right to request that we delete the Personal Data that we have collected about you. Under the CCPA, this right is subject to certain exceptions: for e.g., we may need to retain your Personal Data to provide you with the Services or complete a transaction or other action you may have requested, or if deletion of your Personal Data involves disproportionate effort to achieve. If your deletion request is subject to one of these exceptions, we may deny your deletion request to such data.
-
-### Correction
-
-You have the right to request that we correct any inaccurate Personal Data we have collected about you. Under the CCPA, this right is subject to certain exceptions: for example, if we reasonably decide, based on the totality of circumstances related to your Personal Data, that such data is correct. If your correction request is subject to one of these CCPA exceptions, we may deny your request to correct such data.
-
-### Processing of Sensitive Personal Information Opt-Out
-
-Consumers have certain rights over the processing of their sensitive information. However, we do not intentionally collect sensitive categories of personal information, but it is possible to share sensitive information with us through your use of the Services. It is your responsibility not to share any such sensitive information when you use the Services.
-
-### Personal Data Sales Opt-Out and Opt-In
-
-We will not sell your Personal Data, and have not done so over the last 12 months. To our knowledge, we do not sell the Personal Data of minors under 16 years of age. Under the CCPA, California residents have certain rights when a business "shares" Personal Data with third parties for purposes of cross-contextual behavioral advertising. We have shared the foregoing categories of Personal Data for the purposes of cross-contextual behavioral advertising, as applicable.
-
-Under California Civil Code Sections 1798.83-1798.84, California residents are entitled to contact us to prevent disclosure of Personal Data to third parties for such third parties' direct marketing purposes; in order to submit such a request, please contact us at hi@zed.dev.
-
-Your browser may offer you a "Do Not Track" option, which allows you to signal to operators of websites and web applications and services that you do not wish such operators to track certain of your online activities over time and across different websites. Our Services do not support Do Not Track requests at this time. To find out more about "Do Not Track," you can visit [www.allaboutdnt.com](https://www.allaboutdnt.com).
-
-### Exercising Your Rights under CCPA
-
-To exercise the rights described in this Privacy Policy, you or, if you are a California resident, your Authorized Agent (as defined below) can send us a request that (1) provides sufficient information to allow us to adequately verify that you are the person about whom we have collected Personal Data, and (2) describes your request in sufficient detail to allow us to understand, evaluate and respond ( a "Valid Request"). We are not obligated to respond to requests that do not meet these criteria. We will only use Personal Data provided in a Valid Request to verify your identity and complete your request.
-
-We are committed to respond to Valid Requests within the time frame required by applicable law. We will not charge you a fee for making a Valid Request unless your Valid Request(s) is excessive, repetitive or manifestly unfounded. If we determine that your Valid Request warrants a fee, we will notify you of the fee and explain that decision before completing your request.
-
-You may submit a Valid Request using the following methods:
-
-- Email us at: hi@zed.dev
-
-If you are a California resident, you may also authorize an agent (an "Authorized Agent") to exercise your rights on your behalf.
-
-### We Will Not Discriminate Against You for Exercising Your Rights
-
-We will not discriminate against you for exercising your rights under applicable data protection laws. We will not deny you our goods or services, charge you different prices or rates, or provide you a lower quality of goods and services if you exercise your rights under applicable law. However, we may offer different tiers of our Services, as allowed by applicable law, with varying prices, rates or levels of quality of the goods or services you receive related to the value of Personal Data that we receive from you.
-
-# European Union and United Kingdom Data Subject Rights
-
-## EU and UK Residents
-
-If you are a resident of the European Union ("EU"), United Kingdom ("UK"), Lichtenstein, Norway or Iceland, you may have additional rights under the EU or UK General Data Protection Regulation (the "GDPR") with respect to your Personal Data, as outlined below.
-We use the terms "Personal Data" and "processing" as they are defined in the GDPR in this section, but "Personal Data" generally means information that can be used to individually identify a person, and "processing" generally covers actions that can be performed in connection with data such as collection, use, storage and disclosure. Company will be the controller of your Personal Data processed in connection with the Services.
-If there are any conflicts between this section and any other provision of this Privacy Policy, the policy or portion that is more protective of Personal Data shall control to the extent of such conflict. If you have any questions about this section or whether any of the following applies to you, please contact us at hi@zed.dev. Note that we may also process Personal Data of our customers' end users or employees in connection with our provision of certain services to you, in which case we are the processor of Personal Data. If we are the processor of your Personal Data, please contact the controller party in the first instance to address your rights with respect to such data.
-
-## Personal Data We Collect
-
-The "Categories of Personal Data We Collect" section above details the Personal Data that we collect from you.
-
-## Personal Data Use and Processing Grounds
-
-The "Our Commercial or Business Purposes for Collecting Personal Data" section above explains how we use your Personal Data.
-
-We will only process your Personal Data if we have a lawful basis for doing so. Lawful bases for processing include consent, contractual necessity and our "legitimate interests" or the legitimate interest of others, as further described below.
-
-- Contractual Necessity: We process the following categories of Personal Data as a matter of "contractual necessity", meaning that we need to process the data to perform under our End User Terms with you, which enables us to provide you with the Services. When we process data due to contractual necessity, failure to provide such Personal Data will result in your inability to use some or all portions of the Services that require such data.
-  - Profile or Contact Data
-  - Payment Data
-- Legitimate Interest: We process the following categories of Personal Data when we believe it furthers the legitimate interest of us or third parties:
-  - Device/IP Data
-  - Web Analytics
-  - We may also de-identify or anonymize Personal Data to further our legitimate interests.
-- Examples of these legitimate interests include (as described in more detail above):
-  - Providing, customizing and improving the Services.
-  - Marketing the Services.
-  - Corresponding with you.
-  - Meeting legal requirements and enforcing legal terms.
-  - Completing corporate transactions.
-- Consent: In some cases, we process Personal Data based on the consent you expressly grant to us at the time we collect such data.
-  - Other Processing Grounds: From time to time we may also need to process Personal Data to comply with a legal obligation, if it is necessary to protect the interests of you or other data subjects, or if it is necessary in the public interest.
-
-## Sharing Personal Data
-
-The "How We Share Your Personal Data" section above details how we share your Personal Data with third parties.
-
-## EU Data Subject Rights
-
-For more information about these EU or UK personal data terms and your rights related thereto, or to submit a request for information, please email us at hi@zed.dev. Please note that in some circumstances, we may not be able to fully comply with your request, such as if it is frivolous or impractical, if it jeopardizes the rights of others, or if it is not required by law, but, in those circumstances, we are committed to respond to notify you of such a decision regardless. In some cases, we may also need you to provide us with additional information, which may include Personal Data, if necessary to verify your identity and the nature of your request.
-
-- Access: You can request more information about the Personal Data we hold about you and request a copy of such Personal Data. You can also access certain of your Personal Data by logging on to your account.
-- Rectification: If you believe that any Personal Data we are holding about you is incorrect or incomplete, you can request that we correct or supplement such data. You can also correct some of this information directly by logging on to your account.
-- Erasure: You can request that we erase some or all of your Personal Data from our systems.
-- Withdrawal of Consent: If we are processing your Personal Data based on your consent, you have the right to withdraw your consent at any time. Please note, however, that if you exercise this right, you may have to then provide express consent on a case-by-case basis for the use or disclosure of certain of your Personal Data, if such use or disclosure is necessary to enable you to utilize some or all of our Services.
-- Portability: You can ask for a copy of your Personal Data in a machine-readable format. You can also request that we transmit the data to another controller where technically feasible.
-- Objection: You can contact us to let us know that you object to the further use or disclosure of your Personal Data for certain purposes, such as for direct marketing purposes.
-- Restriction of Processing: You can ask us to restrict further processing of your Personal Data.
-- Right to File Complaint: You have the right to lodge a complaint about Company's practices with respect to your Personal Data with the supervisory authority of your country or EU Member State. A list of Supervisory Authorities is available here: [https://edpb.europa.eu/about-edpb/board/members_en](https://edpb.europa.eu/about-edpb/board/members_en)
-
-## Transfers of Personal Data
-
-The Services are hosted and operated in the United States ("U.S.") through Company and its service providers. By using the Services, you acknowledge that any Personal Data about you is being provided to Company in the U.S. and will be hosted on U.S. servers, and you authorize Company to transfer, store and process your information to and in the U.S., and possibly other countries. In some circumstances, your Personal Data may be transferred to the U.S. pursuant to a data processing agreement incorporating legally required data protection clauses.
-
-# Contact Information:
-
-If you have additional questions about this Privacy Policy, the methods in which we collect and use your Personal Data or your choices and rights regarding such collection and use, please do not hesitate to contact us at:
-
-- Website: zed.dev
-- Email Address: hi@zed.dev
-- Corporate Address:
-  Zed Industries, Inc.
-  2590 Welton St
-  Suite 200
-  PO Box 1916
-  Denver CO 80205
-
-**DATE: May 6, 2025**
diff --git a/legal/subprocessors.md b/legal/subprocessors.md
deleted file mode 100644
index df3a5f7c9f..0000000000
--- a/legal/subprocessors.md
+++ /dev/null
@@ -1,26 +0,0 @@
----
-title: Subprocessor List
-slug: subprocessors
----
-
-This page provides information about the Subprocessors Zed has engaged to provide processing activities on Customer Data as defined in the [Zed End User Terms](https://zed.dev/terms).
-
-| Subprocessor        | Purpose                  | Location      |
-| ------------------- | ------------------------ | ------------- |
-| Cloudflare          | Cloud Infrastructure     | Worldwide     |
-| Amazon Web Services | Cloud Infrastructure     | United States |
-| DigitalOcean        | Cloud Infrastructure     | United States |
-| Vercel              | Cloud Infrastructure     | United States |
-| ConvertKit          | Email Marketing          | United States |
-| Axiom               | Analytics                | United States |
-| Hex Technologies    | Analytics                | United States |
-| Snowflake           | Analytics                | United States |
-| LiveKit             | Audio/Video Conferencing | United States |
-| GitHub              | Authentication           | United States |
-| Anthropic           | AI Services              | United States |
-| BaseTen             | AI Services              | United States |
-| Exa Labs            | AI Services              | United States |
-| Google              | AI Services              | United States |
-| OpenAI              | AI Services              | United States |
-
-**DATE: May 6th, 2025**
diff --git a/legal/terms.md b/legal/terms.md
deleted file mode 100644
index 88afa36aa9..0000000000
--- a/legal/terms.md
+++ /dev/null
@@ -1,197 +0,0 @@
----
-title: Zed End User Terms
-slug: terms
----
-
-PLEASE READ THESE TERMS AND CONDITIONS CAREFULLY BEFORE USING THE SERVICE OR SOFTWARE OFFERED BY ZED INDUSTRIES, INC. ("ZED", OR "WE"). BY ACCESSING OR USING THE SOLUTION (AS DEFINED BELOW) IN ANY MANNER, YOU ("YOU" OR "CUSTOMER") AGREE TO BE BOUND BY THESE TERMS (THE "AGREEMENT") TO THE EXCLUSION OF ALL OTHER TERMS. YOU REPRESENT AND WARRANT THAT YOU HAVE THE AUTHORITY TO ENTER INTO THIS AGREEMENT; IF YOU ARE ENTERING INTO THIS AGREEMENT ON BEHALF OF AN ORGANIZATION OR ENTITY, REFERENCES TO "CUSTOMER" AND "YOU" IN THIS AGREEMENT, REFER TO THAT ORGANIZATION OR ENTITY. IF YOU DO NOT AGREE TO ALL OF THE FOLLOWING, YOU MAY NOT USE OR ACCESS THE SOLUTION IN ANY MANNER. IF THE TERMS OF THIS AGREEMENT ARE CONSIDERED AN OFFER, ACCEPTANCE IS EXPRESSLY LIMITED TO SUCH TERMS.
-
-## 1. ACCESS TO AND USE OF THE SOLUTION
-
-Subject to the terms and conditions of this Agreement, Zed hereby grants to You, and You hereby accept from Zed, a term-limited, non-exclusive, non-transferable, non-assignable and non-sublicensable license to make use of the Editor for Your internal use only, and subject to the use limitations in Section 2.2.
-
-## 2. TERMS APPLICABLE TO THE EDITOR
-
-### 2.1. License Grant
-
-Subject to the terms and conditions of this Agreement, Zed hereby grants to You, and You hereby accept from Zed, a term-limited, non-exclusive, non-transferable, non-assignable and non-sublicensable license to make use of the Editor for Your internal use only, and subject to the use limitations in Section 2.2.
-
-### 2.2. License Limitations
-
-You agree that You shall not: (a) exceed the scope of the licenses granted in Section 2.1; (b) make copies of the Editor; (c) distribute, sublicense, assign, delegate, rent, lease, sell, time-share or otherwise transfer the benefits of, use under, or rights to, the license granted in Section 2.1; (d) reverse engineer, decompile, disassemble or otherwise attempt to learn the source code, structure or algorithms underlying the Editor, except to the extent required to be permitted under applicable law; (e) modify, translate or create derivative works of the Editor; or (f) remove any copyright, trademark, patent or other proprietary notice that appears on the Editor or copies thereof.
-
-### 2.3. Open Source Software
-
-Zed makes certain versions of the Editor and related software available at the Zed GitHub Repository: [https://github.com/zed-industries/zed](https://github.com/zed-industries/zed) (the "Repo"). Your use of such software is subject to the open source software licenses declared in the Repo.
-
-## 3. TERMS APPLICABLE TO THE ZED SERVICE
-
-### 3.1. Access to and Scope of Zed Service
-
-If you have elected to use the Zed Service by enabling or activating the Zed Service, Zed will use commercially reasonable efforts to make the Zed Service available to You as set forth in this Agreement. Once you elected to use the Zed Service, You may access and use the Zed Service during the Term, subject to Your compliance with the terms and conditions of the Agreement.
-
-### 3.2. Restrictions
-
-You will use the Zed Service only in accordance with all applicable laws, including, but not limited to, laws related to data (whether applicable within the United States, the European Union, or otherwise). You agree not to (and will not allow any third party to): (i) remove or otherwise alter any proprietary notices or labels from the Zed Service or any portion thereof; (ii) reverse engineer, decompile, disassemble, or otherwise attempt to discover the underlying structure, ideas, or algorithms of the Zed Service or any software used to provide or make the Zed Service available; or (iii) rent, resell or otherwise allow any third party access to or use of the Zed Service. Zed may suspend Your access to or use of the Zed Service as follows: (a) immediately if Zed reasonably believes Your use of the Zed Service may pose a security risk to or may adversely impact the Zed Service; or (b) if You are in breach of this Agreement.
-
-### 3.3. Customer Data
-
-You are solely responsible for Customer Data including, but not limited to: (a) compliance with all applicable laws and this Agreement; (b) any claims relating to Customer Data; and (c) any claims that Customer Data infringes, misappropriates, or otherwise violates the rights of any third party. You agree and acknowledge that Customer Data may be irretrievably deleted if Your account is terminated. For purposes of this Agreement, "Customer Data" shall mean any data, information or other material provided, uploaded, or submitted by You to the Zed Service in the course of using the Zed Service. Notwithstanding anything to the contrary, You represent and warrant that You will not transfer or make available to Zed any personally identifiable information or related information subject to applicable data privacy laws or regulations, unless otherwise agreed to in writing by Zed.
-
-#### 3.3.1. Customer Data Made Available to Zed
-
-To the extent You elect to make Customer Data available to Zed, the same may only be used by Zed according to the Customer Data type and the use rights regarding the same as described herein:
-
-#### 3.3.2. Usage Data
-
-To improve the Editor and understand how You use it, Zed optionally collects the following usage data:
-
-- (a) file extensions of opened files;
-- (b) features and tools You use within the Editor;
-- (c) project statistics (e.g., number of files); and
-- (d) frameworks detected in Your projects
-
-(a-d collectively, "Usage Data"). Usage Data does not include any of Your software code or sensitive project details. You may change Your preferences disabling the collection of Usage Data and You can audit Usage Data collected by the Editor at any time. See [https://zed.dev/docs/telemetry](https://zed.dev/docs/telemetry) for more.
-
-Usage Data is associated with a secure random telemetry ID which may be linked to Your email address. This linkage currently serves two purposes: (1) it allows Zed to analyze usage patterns over time while maintaining Your privacy; and (2) it enables Zed to reach out to specific user groups for feedback and improvement suggestions. Zed may contact You based on Your usage patterns to better understand your needs and improve the Solution. If You delete Your account, the link between Your telemetry ID and Your email address will be permanently removed. By continuing to use Editor or Solution with this feature enabled You agree to this Usage Data collection.
-
-#### 3.3.3. Crash Reports
-
-Customer Data consisting of data related to the behavior of the Solution prior to a crash or failure, such as stack traces are collected and classified as "Crash Reports". Zed will use commercially reasonable efforts to exclude any personally identifiable information from Crash Reports, but due to the nature of a crash, Zed does not ensure that information such as paths will be excluded from Crash Reports. Crash Reports will be used solely for Zed's internal purposes in connection with diagnosing defects in the Solution that led to the crash. You may grant us permission to capture Crash Reports when installing or activating the Solution, and You may change Your preferences at any time in the settings feature of the Solution. Once You grant us this permission, Zed will retain the Crash Reports indefinitely.
-
-#### 3.3.4. User Content
-
-• You may access, modify or create certain data or information in connection with your access or use of the Zed Editor or the Solution. Such data and information may include, but is not limited to any of the following:
-
-- (a) file contents and associated metadata (e.g., filename, paths, size, timestamps);
-- (b) source control history, comments and metadata (e.g., git history, commit messages);
-- (c) configuration data (e.g., settings, keymaps);
-- (d) anything typed, pasted and/or displayed on screen while using the Editor;
-- (e) derivative works of the above generated by the Editor (e.g., format conversions, summaries, indexes, caches);
-- (f) metadata, code and other derivative works of the above returned by language servers and other local tooling; and
-- (g) metadata, code and other derivative works of the above returned by services integrated with the Zed Editor
-
-(a-g collectively, "User Content").
-
-#### 3.3.5. Handling of User Content
-
-Zed will make use of or transfer User Content only as specified in this Agreement, or as necessary to comply with applicable law.
-
-#### 3.3.5.1. Zed Collaboration Services
-
-When using Zed Collaboration Services, User Content is transmitted from Your environment only if You collaborate with other Zed users by electing to share a project in the Editor. Once You share a project, Zed may transmit User Content consisting of file paths, file contents, and metadata regarding the code returned by language servers. Currently, Zed does not persist any User Content beyond the Your collaboration session. If You unshare a project or disconnect from the Solution, all information associated with such project will be deleted from Zed servers. In the future, Zed may save User Content regarding projects beyond the scope of a single collaboration session. We may share such User Content with those users You elected to grant access to. Zed's access to such User Content is limited to debugging and making improvements to the Solution.
-
-#### 3.3.5.2. Other Services
-
-The Zed Editor supports integration with API-based services maintained and not operated by Zed (the "Other Services"). By way of example, Other Services includes those made available by GitHub, Anthropic, OpenAI, and similar providers, or those You host or manage directly. You may configure the Zed Editor to interoperate, communicate with, and exchange data (including User Content) directly with the Other Services. Zed is not responsible or otherwise liable with respect to Your use of any Other Service, including but not limited to the exchange of data between the Other Service and the Zed Editor. The terms and conditions, including the applicable privacy policy, with respect to the Other Service are those made available by the applicable Other Service, not these Terms.
-
-#### 3.3.5.3. Zed AI Services
-
-The Zed Editor supports integration with API-based services maintained and operated by Zed (the "Zed AI Services"). You may elect to use Zed AI Services as the provider for various Zed Editor features (e.g., Agent Panel, Inline Assistant, Edit Predictions, and similar features). In connection with Your use of these features, the Zed Editor and Zed AI Services may make use of User Content to generate contextually relevant responses (the “Output”). Other than as specified in Section 3.3.5.4 of these Terms, Zed will not use User Content for training of its models, or disclose User Content.
-
-Output is provided "as is" without any warranties or guarantees of functionality, security, or fitness for a particular purpose. While efforts are made to ensure the accuracy and reliability, Output may include errors, vulnerabilities, and defects. You are responsible for reviewing, testing, and validating Output before use in any production or critical environment. Zed assumes no liability for any damages, losses, or liability arising from the use, modification, reliance on, or deployment of Output. Any such use is at Your own risk.
-
-#### 3.3.5.4. Improvement Feedback
-
-When using Zed AI Services to provide Edit Predictions in connection with certain open source software projects, You may elect to share requests, responses and feedback comments (collectively "Model Improvement Feedback") with Zed, and Zed may use the same to improve Zed Edit Predictions models. You may opt-out of sharing Model Improvement Feedback at any time.
-
-For more information on Zed Edit Predictions please see: [https://zed.dev/docs/ai/ai-improvement](https://zed.dev/docs/ai/ai-improvement)
-
-When using Zed AI Services in connection with the Agent Panel, You may elect to share with Zed requests, responses and feedback regarding the Agent Panel and related Output (the “Agent Improvement Feedback”) with Zed, and Zed may use the same to improve the Agent Panel and related Output. Zed will only collect Agent Improvement Feedback when You elect to share the same.
-
-For more information regarding the Agent Panel please see: [https://zed.dev/docs/ai/ai-improvement](https://zed.dev/docs/ai/ai-improvement)
-
-#### 3.4. Privacy Policy
-
-You and Zed are bound by the terms and conditions contained in the Zed Privacy Policy which is incorporated by reference hereto. The Zed Privacy Policy is available at the following URL: [https://zed.dev/privacy-policy](https://zed.dev/privacy-policy).
-
-## 4. FEE BASED SERVICES, FEES AND PAYMENT TERMS
-
-### 4.1. Fee Based Services
-
-The Zed AI Services is made available with additional usage benefits (the “Enhanced Use ”) as described in the table published at [zed.dev/pricing](https://zed.dev/pricing) (the “Pricing Table”), subject to the requirements and limitations set forth in the Pricing Table and these Terms. In order to make use of the Enhanced Use, Customer must access the Zed AI Services through a Zed registered account.
-
-### 4.2. Fees
-
-Customer shall pay to Zed the applicable fees set forth in Pricing Table, together with any applicable taxes and shipping and handling (collectively, the “Fees”). Customer shall have no right of return, and all Fees shall be non-refundable.
-
-### 4.3. Payment Terms
-
-All amounts payable to Zed under this Agreement shall be paid in United States dollars and paid Zed according to the method of payment, frequency and calculated as set forth in the Pricing Table.
-
-### 4.4. Taxes; Set-offs
-
-Any and all payments made by Customer in accordance with this Agreement are exclusive of any taxes that might be assessed by any jurisdiction. Customer shall pay or reimburse Zed for all sales, use, property and similar taxes; all customs duties, import fees, stamp duties, license fees and similar charges; and all other mandatory payments to government agencies of whatever kind, except taxes imposed on the net or gross income of Zed. All amounts payable to Zed under this Agreement shall be without set-off and without deduction of any taxes, levies, imposts, charges, withholdings and/or duties of any nature which may be levied or imposed, including without limitation, value added tax, customs duty and withholding tax.
-
-## 5. TERM AND TERMINATION
-
-### 5.1. Term
-
-The term of this Agreement shall commence on the date You first download the Editor or use the Zed Service (the "Effective Date"), and unless terminated earlier according to this Section 3, will end pursuant to this Section 5 (the "Term").
-
-### 5.2. Termination
-
-This Agreement may be terminated: (a) by either party if the other has materially breached this Agreement; or (b) by Zed at any time and for any reason upon notice to Customer. You acknowledge that Zed is under no obligation to continue to operate the Zed Service or make the Editor available, and We may end any programs in connection with the same at any time.
-
-### 5.3. Effect of Termination and Survival
-
-Upon any expiration or termination of this Agreement, Customer shall (i) immediately cease use of the Zed Service, and (ii) return all Zed Confidential Information and other materials provided by Zed. The following provisions will survive termination of this Agreement: Sections 3.3 (Customer Data), Section 3.4 (Privacy Policy), Section 5.3 (Effect of Termination and Survival), Section 6 (Ownership), Section 7 (Indemnification), Section 9 (Limitation of Liability), Section 10 (Third Party Services), and Section 11 (Miscellaneous).
-
-## 6. OWNERSHIP
-
-Zed retains all right, title, and interest in and to the Zed Service, Editor, and any software, products, works or other intellectual property created, used, provided, or made available by Zed under or in connection with the Zed Service or Editor. Customer may from time to time provide suggestions, comments, or other feedback to Zed with respect to the Zed Service or Editor ("Feedback"). Customer shall, and hereby does, grant to Zed a nonexclusive, worldwide, perpetual, irrevocable, transferable, sublicensable, royalty-free, fully paid-up license to use and exploit the Feedback for any purpose. You retain all right, title and interest in and to the Customer Data, including all intellectual property rights therein. No intellectual property rights with respect to any software code you develop or modify with the Editor or Zed Service (collectively, the “Output”) are transferred or assigned to Zed hereunder.
-
-## 7. INDEMNIFICATION
-
-Customer will defend, indemnify, and hold Zed, its affiliates, suppliers and licensors harmless and each of their respective officers, directors, employees and representatives from and against any claims, damages, losses, liabilities, costs, and expenses (including reasonable attorneys' fees) arising out of or relating to any third party claim with respect to: (a) Customer Data; (b) breach of this Agreement or violation of applicable law by Customer; or (c) alleged infringement or misappropriation of third-party's intellectual property rights resulting from Customer Data.
-
-## 8. WARRANTY
-
-Zed does not represent or warrant that the operation of the Zed Service or Editor (or any portion thereof) will be uninterrupted or error free, or that the Zed Service or Editor (or any portion thereof) will operate in combination with other hardware, software, systems or data not provided by Zed. CUSTOMER ACKNOWLEDGES THAT, ZED MAKES NO EXPRESS OR IMPLIED REPRESENTATIONS OR WARRANTIES OF ANY KIND WITH RESPECT TO THE SERVICE OR SOFTWARE, OR THEIR CONDITION. ZED HEREBY EXPRESSLY EXCLUDES, ANY AND ALL OTHER EXPRESS OR IMPLIED REPRESENTATIONS OR WARRANTIES, WHETHER UNDER COMMON LAW, STATUTE OR OTHERWISE, INCLUDING WITHOUT LIMITATION ANY AND ALL WARRANTIES AS TO MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, SATISFACTORY QUALITY OR NON-INFRINGEMENT OF THIRD-PARTY RIGHTS.
-
-## 9. LIMITATIONS OF LIABILITY
-
-IN NO EVENT SHALL ZED BE LIABLE FOR ANY LOST DATA, LOST PROFITS, BUSINESS INTERRUPTION, REPLACEMENT SERVICE OR OTHER SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR INDIRECT DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THEORY OF LIABILITY. ZED'S LIABILITY FOR ALL CLAIMS ARISING UNDER THIS AGREEMENT, WHETHER IN CONTRACT, TORT OR OTHERWISE, SHALL NOT EXCEED THE GREATER OF: THE FEES PAID TO ZED BY CUSTOMER DURING THE TWELVE (12) MONTH PERIOD PRECEDING THE DATE OF THE CLAIM, OR ONE THOUSAND US DOLLARS ($1,000).
-
-## 10. Third Party Services
-
-Zed may make certain third party services available to You within the Editor or the Zed Service (each a "Third Party Service"). You acknowledge and agree that (a) use of each Third Party Service is subject to the corresponding terms and conditions available at the following URL: [https://zed.dev/third-party-terms](https://zed.dev/third-party-terms) and/or presented in connection with Your use of such Third Party Service; (b) the terms and conditions of this Agreement do not apply with respect to Your use of any Third Party Service; and (c) Zed is not liable in any way regarding Your use of any Third Party Service.
-
-## 11. MISCELLANEOUS
-
-### 11.1. Export Control
-
-You hereby certify that You will comply with all current US Export Control laws. You agree to defend, indemnify and hold Zed harmless from any liability for Your violation of U.S. Export Control laws.
-
-### 11.2. Compliance with Laws
-
-You shall comply with all applicable laws and regulations in its use of the Solution, including without limitation the unlawful gathering or collecting, or assisting in the gathering or collecting of information in violation of any privacy laws or regulations. You shall, at its own expense, defend, indemnify and hold harmless Zed from and against any and all claims, losses, liabilities, damages, judgments, government or federal sanctions, costs and expenses (including attorneys' fees) incurred by Zed arising from any claim or assertion by any third party of violation of privacy laws or regulations by You or any of its agents, officers, directors or employees.
-
-### 11.3. Assignment
-
-Neither party may transfer and assign its rights and obligations under this Agreement without the prior written consent of the other party. Notwithstanding the foregoing, Zed may transfer and assign its rights under this Agreement without consent from the other party in connection with a change in control, acquisition or sale of all or substantially all of its assets.
-
-### 11.4. Force Majeure
-
-Neither party shall be responsible for failure or delay in performance by events out of their reasonable control, including but not limited to, acts of God, Internet outage, terrorism, war, fires, earthquakes and other disasters (each a "Force Majeure"). Notwithstanding the foregoing: if a Force Majeure continues for more than thirty (30) days, either party may to terminate this agreement by written notice to the other party.
-
-### 11.5. Notice
-
-All notices between the parties shall be in writing and shall be deemed to have been given if personally delivered or sent by registered or certified mail (return receipt), or by recognized courier service.
-
-### 11.6. No Agency
-
-Both parties agree that no agency, partnership, joint venture, or employment is created as a result of this Agreement. You do not have any authority of any kind to bind Zed.
-
-### 11.7. Governing Law
-
-This Agreement shall be governed exclusively by, and construed exclusively in accordance with, the laws of the United States and the State of California, without regard to its conflict of laws provisions. The federal courts of the United States in the Northern District of California and the state courts of the State of California shall have exclusive jurisdiction to adjudicate any dispute arising out of or relating to this Agreement. Each party hereby consents to the jurisdiction of such courts and waives any right it may otherwise have to challenge the appropriateness of such forums, whether on the basis of the doctrine of forum non conveniens or otherwise. The United Nations Convention on Contracts for the International Sale of Goods shall not apply to this Agreement or any Purchase Order issued under this Agreement.
-
-### 11.8. Updated Agreement
-
-Zed reserves the right to update this Agreement at any time. The terms and conditions of the updated version of the Agreement shall apply to the Zed Service and Editor downloaded, or accessed following the date of publication of the updated version. If You do not agree with any terms of the updated Agreement, You may not use or access the Zed Service or Editor in any manner. Zed may from time-to-time provide release notes applicable to the Editor or Zed Service, and such release notes may contain additional use restrictions or terms applicable to Customer Data. Your use of the Editor or Zed Service after the applicable release notes are made available shall be subject to the additional use restrictions or terms applicable to Customer Data.
-
-### 11.9. Entire Agreement
-
-This Agreement is the complete and exclusive statement of the mutual understanding of the parties and supersedes and cancels all previous written and oral agreements, communications, and other understandings relating to the subject matter of this Agreement, and all waivers and modifications must be in a writing signed by both parties, except as otherwise provided herein. Any term or provision of this Agreement held to be illegal or unenforceable shall be, to the fullest extent possible, interpreted so as to be construed as valid, but in any event the validity or enforceability of the remainder hereof shall not be affected.
-
-**DATE: May 6, 2025**
diff --git a/legal/third-party-terms.md b/legal/third-party-terms.md
deleted file mode 100644
index 4c4a0f6cce..0000000000
--- a/legal/third-party-terms.md
+++ /dev/null
@@ -1,53 +0,0 @@
----
-title: 3rd Party Terms
-slug: third-party-terms
----
-
-In addition to the [Zed End User Terms](/terms) and [Zed Privacy Policy](/privacy-policy) usage of certain Zed features may also subject you to additional 3rd party terms and conditions. These terms and conditions may include, but are not limited to, the following:
-
-## Anthropic
-
-- [Anthropic Usage Policy](https://www.anthropic.com/legal/aup)
-- [Anthropic Privacy Policy](https://www.anthropic.com/legal/privacy)
-- [Anthropic Commercial Terms of Service](https://www.anthropic.com/legal/commercial-terms)
-
-## Baseten
-
-- [BaseTen Terms and Conditions](https://www.baseten.co/terms-and-conditions/)
-
-### Exa.ai
-
-- [Exa Labs Terms and Conditions](https://exa.ai/assets/Exa_Labs_Terms_of_Service.pdf)
-- [Exa Labs Privacy Policy](https://exa.ai/privacy-policy)
-
-## GitHub
-
-- [GitHub Terms of Service](https://docs.github.com/en/site-policy/github-terms/github-terms-of-service)
-- [GitHub Privacy Statement](https://docs.github.com/en/site-policy/privacy-policies/github-general-privacy-statement)
-- [GitHub Acceptable Use Policies](https://docs.github.com/en/site-policy/acceptable-use-policies/github-acceptable-use-policies)
-- [GitHub Copilot Product Specific Terms](https://github.com/customer-terms/github-copilot-product-specific-terms)
-
-## Google
-
-- [Google APIs Terms of Service](https://developers.google.com/terms)
-- [Google Gemini API Additional Terms of Service](https://ai.google.dev/gemini-api/terms)
-- [Google Generative AI Prohibited Use Policy](https://policies.google.com/terms/generative-ai/use-policy)
-
-## LiveKit
-
-- [LiveKit Terms of Service](https://livekit.io/legal/terms-of-service)
-- [LiveKit Privacy Policy](https://livekit.io/legal/privacy-policy)
-
-## OpenAI
-
-- [OpenAI Terms of Use](https://openai.com/policies/terms-of-use/)
-- [OpenAI Privacy Policy](https://openai.com/policies/privacy-policy/)
-- [OpenAI Business terms](https://openai.com/policies/business-terms/)
-- [OpenAI Service terms](https://openai.com/policies/service-terms/)
-
-## SuperMaven
-
-- [SuperMaven Terms of Service](https://supermaven.com/terms-of-service)
-- [SuperMaven Privacy Policy](https://supermaven.com/privacy-policy)
-
-**DATE: May 6, 2025**
diff --git a/livekit.yaml b/livekit.yaml
deleted file mode 100644
index f2d1946721..0000000000
--- a/livekit.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-development: true
-port: 7880
-rtc:
-  udp_port: 7882
-  tcp_port: 7881
-  use_external_ip: false
-keys:
-  devkey: secret
-logging:
-  level: debug
diff --git a/lychee.toml b/lychee.toml
deleted file mode 100644
index a769ae3b20..0000000000
--- a/lychee.toml
+++ /dev/null
@@ -1,29 +0,0 @@
-retry_wait_time = 5
-
-accept = ["200..=204", "429"]
-
-max_retries = 5
-
-timeout = 45
-
-exclude = [
-    # Don't fail CI check if collab is down
-    'https://staging-collab.zed.dev/',
-    "https://collab.zed.dev",
-
-    # Slow and unreliable server.
-    'https://repology.org',
-
-    # The following websites are rate limited or use bot detection and aren't nice enough to respond with 429:
-    'https://openai.com',
-    'https://claude.ai/download',
-    'https://www.perplexity.ai',
-    'https://platform.deepseek.com',
-    'https://console.anthropic.com',
-    'https://platform.openai.com',
-    'https://linux.die.net/man/1/sed',
-    'https://allaboutcookies.org',
-    'https://www.gnu.org',
-    'https://auth.mistral.ai',
-    'https://console.mistral.ai',
-]
diff --git a/nix/build.nix b/nix/build.nix
deleted file mode 100644
index 484049a421..0000000000
--- a/nix/build.nix
+++ /dev/null
@@ -1,321 +0,0 @@
-{
-  lib,
-  stdenv,
-
-  apple-sdk_15,
-  darwin,
-  darwinMinVersionHook,
-
-  cargo-about,
-  cargo-bundle,
-  crane,
-  rustPlatform,
-  rustToolchain,
-
-  copyDesktopItems,
-  envsubst,
-  fetchFromGitHub,
-  makeFontsConf,
-  makeWrapper,
-
-  alsa-lib,
-  cmake,
-  curl,
-  fontconfig,
-  freetype,
-  git,
-  libgit2,
-  libglvnd,
-  libxkbcommon,
-  livekit-libwebrtc,
-  nodejs_22,
-  openssl,
-  perl,
-  pkg-config,
-  protobuf,
-  sqlite,
-  vulkan-loader,
-  wayland,
-  xorg,
-  zlib,
-  zstd,
-
-  withGLES ? false,
-  profile ? "release",
-}:
-assert withGLES -> stdenv.hostPlatform.isLinux;
-let
-  mkIncludeFilter =
-    root': path: type:
-    let
-      # note: under lazy-trees this introduces an extra copy
-      root = toString root' + "/";
-      relPath = lib.removePrefix root path;
-      topLevelIncludes = [
-        "crates"
-        "assets"
-        "extensions"
-        "script"
-        "tooling"
-        "Cargo.toml"
-        ".config" # nextest?
-        ".cargo"
-      ];
-      firstComp = builtins.head (lib.path.subpath.components relPath);
-    in
-    builtins.elem firstComp topLevelIncludes;
-
-  craneLib = crane.overrideToolchain rustToolchain;
-  gpu-lib = if withGLES then libglvnd else vulkan-loader;
-  commonArgs =
-    let
-      zedCargoLock = builtins.fromTOML (builtins.readFile ../crates/zed/Cargo.toml);
-      stdenv' = stdenv;
-    in
-    rec {
-      pname = "zed-editor";
-      version = zedCargoLock.package.version + "-nightly";
-      src = builtins.path {
-        path = ../.;
-        filter = mkIncludeFilter ../.;
-        name = "source";
-      };
-
-      cargoLock = ../Cargo.lock;
-
-      nativeBuildInputs =
-        [
-          cmake
-          copyDesktopItems
-          curl
-          perl
-          pkg-config
-          protobuf
-          cargo-about
-          rustPlatform.bindgenHook
-        ]
-        ++ lib.optionals stdenv'.hostPlatform.isLinux [ makeWrapper ]
-        ++ lib.optionals stdenv'.hostPlatform.isDarwin [
-          (cargo-bundle.overrideAttrs (
-            new: old: {
-              version = "0.6.1-zed";
-              src = fetchFromGitHub {
-                owner = "zed-industries";
-                repo = "cargo-bundle";
-                rev = "2be2669972dff3ddd4daf89a2cb29d2d06cad7c7";
-                hash = "sha256-cSvW0ND148AGdIGWg/ku0yIacVgW+9f1Nsi+kAQxVrI=";
-              };
-              cargoHash = "sha256-urn+A3yuw2uAO4HGmvQnKvWtHqvG9KHxNCCWTiytE4k=";
-
-              # NOTE: can drop once upstream uses `finalAttrs` here:
-              # https://github.com/NixOS/nixpkgs/blob/10214747f5e6e7cb5b9bdf9e018a3c7b3032f5af/pkgs/build-support/rust/build-rust-package/default.nix#L104
-              #
-              # See (for context): https://github.com/NixOS/nixpkgs/pull/382550
-              cargoDeps = rustPlatform.fetchCargoVendor {
-                inherit (new) src;
-                hash = new.cargoHash;
-                patches = new.cargoPatches or [];
-                name = new.cargoDepsName or new.finalPackage.name;
-              };
-            }
-          ))
-        ];
-
-      buildInputs =
-        [
-          curl
-          fontconfig
-          freetype
-          # TODO: need staticlib of this for linking the musl remote server.
-          # should make it a separate derivation/flake output
-          # see https://crane.dev/examples/cross-musl.html
-          libgit2
-          openssl
-          sqlite
-          zlib
-          zstd
-        ]
-        ++ lib.optionals stdenv'.hostPlatform.isLinux [
-          alsa-lib
-          libxkbcommon
-          wayland
-          gpu-lib
-          xorg.libX11
-          xorg.libxcb
-        ]
-        ++ lib.optionals stdenv'.hostPlatform.isDarwin [
-          apple-sdk_15
-          (darwinMinVersionHook "10.15")
-        ];
-
-      cargoExtraArgs = "-p zed -p cli --locked --features=gpui/runtime_shaders";
-
-      stdenv =
-        pkgs:
-        let
-          base = pkgs.llvmPackages.stdenv;
-          addBinTools = old: {
-            cc = old.cc.override {
-              inherit (pkgs.llvmPackages) bintools;
-            };
-          };
-          custom = lib.pipe base [
-            (stdenv: stdenv.override addBinTools)
-            pkgs.stdenvAdapters.useMoldLinker
-          ];
-        in
-        if stdenv'.hostPlatform.isLinux then custom else base;
-
-      env = {
-        ZSTD_SYS_USE_PKG_CONFIG = true;
-        FONTCONFIG_FILE = makeFontsConf {
-          fontDirectories = [
-            ../assets/fonts/lilex
-            ../assets/fonts/ibm-plex-sans
-          ];
-        };
-        ZED_UPDATE_EXPLANATION = "Zed has been installed using Nix. Auto-updates have thus been disabled.";
-        RELEASE_VERSION = version;
-        LK_CUSTOM_WEBRTC = livekit-libwebrtc;
-        PROTOC="${protobuf}/bin/protoc";
-
-        CARGO_PROFILE = profile;
-        # need to handle some profiles specially https://github.com/rust-lang/cargo/issues/11053
-        TARGET_DIR = "target/" + (if profile == "dev" then "debug" else profile);
-
-        # for some reason these deps being in buildInputs isn't enough, the only thing
-        # about them that's special is that they're manually dlopened at runtime
-        NIX_LDFLAGS = lib.optionalString stdenv'.hostPlatform.isLinux "-rpath ${
-          lib.makeLibraryPath [
-            gpu-lib
-            wayland
-          ]
-        }";
-
-        NIX_OUTPATH_USED_AS_RANDOM_SEED = "norebuilds";
-      };
-
-      # prevent nix from removing the "unused" wayland/gpu-lib rpaths
-      dontPatchELF = stdenv'.hostPlatform.isLinux;
-
-      # TODO: try craneLib.cargoNextest separate output
-      # for now we're not worried about running our test suite (or tests for deps) in the nix sandbox
-      doCheck = false;
-
-      cargoVendorDir = craneLib.vendorCargoDeps {
-        inherit src cargoLock;
-        overrideVendorGitCheckout =
-          let
-            hasWebRtcSys = builtins.any (crate: crate.name == "webrtc-sys");
-            # we can't set $RUSTFLAGS because that clobbers the cargo config
-            # see https://github.com/rust-lang/cargo/issues/5376#issuecomment-2163350032
-            glesConfig = builtins.toFile "config.toml" ''
-              [target.'cfg(all())']
-              rustflags = ["--cfg", "gles"]
-            '';
-
-            # `webrtc-sys` expects a staticlib; nixpkgs' `livekit-webrtc` has been patched to
-            # produce a `dylib`... patching `webrtc-sys`'s build script is the easier option
-            # TODO: send livekit sdk a PR to make this configurable
-            postPatch =
-              ''
-                substituteInPlace webrtc-sys/build.rs --replace-fail \
-                  "cargo:rustc-link-lib=static=webrtc" "cargo:rustc-link-lib=dylib=webrtc"
-              ''
-              + lib.optionalString withGLES ''
-                cat ${glesConfig} >> .cargo/config/config.toml
-              '';
-          in
-          crates: drv:
-          if hasWebRtcSys crates then
-            drv.overrideAttrs (o: {
-              postPatch = (o.postPatch or "") + postPatch;
-            })
-          else
-            drv;
-      };
-    };
-  cargoArtifacts = craneLib.buildDepsOnly commonArgs;
-in
-craneLib.buildPackage (
-  lib.recursiveUpdate commonArgs {
-    inherit cargoArtifacts;
-
-    dontUseCmakeConfigure = true;
-
-    # without the env var generate-licenses fails due to crane's fetchCargoVendor, see:
-    # https://github.com/zed-industries/zed/issues/19971#issuecomment-2688455390
-    # TODO: put this in a separate derivation that depends on src to avoid running it on every build
-    preBuild = ''
-      ALLOW_MISSING_LICENSES=yes bash script/generate-licenses
-      echo nightly > crates/zed/RELEASE_CHANNEL
-    '';
-
-    installPhase =
-      if stdenv.hostPlatform.isDarwin then
-        ''
-          runHook preInstall
-
-          pushd crates/zed
-          sed -i "s/package.metadata.bundle-nightly/package.metadata.bundle/" Cargo.toml
-          export CARGO_BUNDLE_SKIP_BUILD=true
-          app_path="$(cargo bundle --profile $CARGO_PROFILE | xargs)"
-          popd
-
-          mkdir -p $out/Applications $out/bin
-          # Zed expects git next to its own binary
-          ln -s ${git}/bin/git "$app_path/Contents/MacOS/git"
-          mv $TARGET_DIR/cli "$app_path/Contents/MacOS/cli"
-          mv "$app_path" $out/Applications/
-
-          # Physical location of the CLI must be inside the app bundle as this is used
-          # to determine which app to start
-          ln -s "$out/Applications/Zed Nightly.app/Contents/MacOS/cli" $out/bin/zed
-
-          runHook postInstall
-        ''
-      else
-        ''
-          runHook preInstall
-
-          mkdir -p $out/bin $out/libexec
-          cp $TARGET_DIR/zed $out/libexec/zed-editor
-          cp $TARGET_DIR/cli  $out/bin/zed
-          ln -s $out/bin/zed $out/bin/zeditor  # home-manager expects the CLI binary to be here
-
-
-          install -D "crates/zed/resources/app-icon-nightly@2x.png" \
-            "$out/share/icons/hicolor/1024x1024@2x/apps/zed.png"
-          install -D crates/zed/resources/app-icon-nightly.png \
-            $out/share/icons/hicolor/512x512/apps/zed.png
-
-          # TODO: icons should probably be named "zed-nightly"
-          (
-            export DO_STARTUP_NOTIFY="true"
-            export APP_CLI="zed"
-            export APP_ICON="zed"
-            export APP_NAME="Zed Nightly"
-            export APP_ARGS="%U"
-            mkdir -p "$out/share/applications"
-            ${lib.getExe envsubst} < "crates/zed/resources/zed.desktop.in" > "$out/share/applications/dev.zed.Zed-Nightly.desktop"
-            chmod +x "$out/share/applications/dev.zed.Zed-Nightly.desktop"
-          )
-
-          runHook postInstall
-        '';
-
-    # TODO: why isn't this also done on macOS?
-    postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
-      wrapProgram $out/libexec/zed-editor --suffix PATH : ${lib.makeBinPath [ nodejs_22 ]}
-    '';
-
-    meta = {
-      description = "High-performance, multiplayer code editor from the creators of Atom and Tree-sitter";
-      homepage = "https://zed.dev";
-      changelog = "https://zed.dev/releases/preview";
-      license = lib.licenses.gpl3Only;
-      mainProgram = "zed";
-      platforms = lib.platforms.linux ++ lib.platforms.darwin;
-    };
-  }
-)
diff --git a/nix/shell.nix b/nix/shell.nix
deleted file mode 100644
index 6956de8e8a..0000000000
--- a/nix/shell.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  mkShell,
-  makeFontsConf,
-  pkgsCross,
-
-  zed-editor,
-
-  rust-analyzer,
-  rustup,
-  cargo-nextest,
-  cargo-hakari,
-  cargo-machete,
-  cargo-zigbuild,
-  nixfmt-rfc-style,
-  protobuf,
-  nodejs_22,
-  zig,
-}:
-(mkShell.override { inherit (zed-editor) stdenv; }) {
-  inputsFrom = [ zed-editor ];
-  packages = [
-    rust-analyzer
-    rustup
-    cargo-nextest
-    cargo-hakari
-    cargo-machete
-    cargo-zigbuild
-    nixfmt-rfc-style
-    # TODO: package protobuf-language-server for editing zed.proto
-    # TODO: add other tools used in our scripts
-
-    # `build.nix` adds this to the `zed-editor` wrapper (see `postFixup`)
-    # we'll just put it on `$PATH`:
-    nodejs_22
-    zig
-  ];
-
-  env =
-    let
-      baseEnvs =
-        (zed-editor.overrideAttrs (attrs: {
-          passthru = { inherit (attrs) env; };
-        })).env; # exfil `env`; it's not in drvAttrs
-    in
-    (removeAttrs baseEnvs [
-      "LK_CUSTOM_WEBRTC" # download the staticlib during the build as usual
-      "ZED_UPDATE_EXPLANATION" # allow auto-updates
-      "CARGO_PROFILE" # let you specify the profile
-      "TARGET_DIR"
-    ])
-    // {
-      # note: different than `$FONTCONFIG_FILE` in `build.nix` – this refers to relative paths
-      # outside the nix store instead of to `$src`
-      FONTCONFIG_FILE = makeFontsConf {
-        fontDirectories = [
-          "./assets/fonts/lilex"
-          "./assets/fonts/ibm-plex-sans"
-        ];
-      };
-      PROTOC = "${protobuf}/bin/protoc";
-      ZED_ZSTD_MUSL_LIB = "${pkgsCross.musl64.pkgsStatic.zstd.out}/lib";
-    };
-}
diff --git a/renovate.json b/renovate.json
deleted file mode 100644
index 01ca7a46a1..0000000000
--- a/renovate.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:recommended",
-    ":semanticCommitsDisabled",
-    ":separateMultipleMajorReleases",
-    ":dependencyDashboardApproval",
-    "helpers:pinGitHubActionDigests",
-    "group:serdeMonorepo"
-  ],
-  "dependencyDashboard": true,
-  "timezone": "America/New_York",
-  "schedule": ["after 3pm on Wednesday"],
-  "prFooter": "Release Notes:\n\n- N/A",
-  "ignorePaths": ["**/node_modules/**"],
-  "packageRules": [
-    {
-      "description": "Group wasmtime crates together.",
-      "groupName": "wasmtime",
-      "matchPackageNames": ["wasmtime{/,}**"]
-    }
-  ]
-}
diff --git a/script/analyze_highlights.py b/script/analyze_highlights.py
deleted file mode 100644
index aaf7386be6..0000000000
--- a/script/analyze_highlights.py
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/usr/bin/env python3
-"""
-This script analyzes all the highlights.scm files in our embedded languages and extensions.
-It counts the number of unique instances of @{name} and the languages in which they are used.
-
-This is useful to help avoid accidentally introducing new tags when appropriate ones already exist when adding new languages.
-
-Flags:
--v, --verbose: Include a detailed list of languages for each tag found in the highlights.scm files.
-"""
-
-import argparse
-import re
-from collections import defaultdict
-from pathlib import Path
-from typing import Any
-
-pattern = re.compile(r'@(?!_)[a-zA-Z_.]+')
-
-def parse_arguments():
-    parser = argparse.ArgumentParser(description='Analyze highlights.scm files for unique instances and their languages.')
-    parser.add_argument('-v', '--verbose', action='store_true', help='Include a list of languages for each tag.')
-    return parser.parse_args()
-
-def find_highlight_files(root_dir):
-    for path in Path(root_dir).rglob('highlights.scm'):
-        yield path
-
-def count_instances(files):
-    instances: defaultdict[list[Any], dict[str, Any]] = defaultdict(lambda: {'count': 0, 'languages': set()})
-    for file_path in files:
-        language = file_path.parent.name
-        with open(file_path, "r") as file:
-            text = file.read()
-            matches = pattern.findall(text)
-            for match in matches:
-                instances[match]['count'] += 1
-                instances[match]['languages'].add(language)
-    return instances
-
-def print_instances(instances, verbose=False):
-    for item, details in sorted(instances.items(), key=lambda x: x[0]):
-        languages = ', '.join(sorted(details['languages']))
-        if verbose:
-            print(f"{item} ({details['count']}) - [{languages}]")
-        else:
-            print(f"{item} ({details['count']})")
-
-def main():
-    args = parse_arguments()
-
-    base_dir = Path(__file__).parent.parent
-    core_path = base_dir / 'crates/languages/src'
-    extension_path = base_dir / 'extensions/'
-
-    core_instances = count_instances(find_highlight_files(core_path))
-    extension_instances = count_instances(find_highlight_files(extension_path))
-
-    unique_extension_instances = {k: v for k, v in extension_instances.items() if k not in core_instances}
-
-    print('Shared:\n')
-    print_instances(core_instances, args.verbose)
-
-    if unique_extension_instances:
-        print('\nExtension-only:\n')
-        print_instances(unique_extension_instances, args.verbose)
-
-if __name__ == '__main__':
-    main()
diff --git a/script/bootstrap b/script/bootstrap
deleted file mode 100755
index 68888e04c1..0000000000
--- a/script/bootstrap
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-# if root or if sudo/unavailable, define an empty variable
-if [ "$(id -u)" -eq 0 ]
-then maysudo=''
-else maysudo="$(command -v sudo || command -v doas || true)"
-fi
-
-if [[ "$OSTYPE" == "linux-gnu"* ]]; then
-  echo "Linux dependencies..."
-  script/linux
-else
-  echo "installing foreman..."
-  which foreman > /dev/null || brew install foreman
-fi
-
-# Install minio if needed
-if ! which minio > /dev/null; then
-    if command -v brew > /dev/null; then
-        echo "minio not found. Installing via brew"
-        brew install minio/stable/minio
-    elif command -v apt > /dev/null; then
-        echo "minio not found. Installing via apt from https://dl.min.io/server/minio/release/linux-amd64/minio.deb"
-        wget -q https://dl.min.io/server/minio/release/linux-amd64/minio.deb -O /tmp/minio.deb
-        $maysudo apt install /tmp/minio.deb
-        rm -f /tmp/minio.deb
-    elif command -v dnf > /dev/null; then
-        echo "minio not found. Installing via dnf from https://dl.min.io/server/minio/release/linux-amd64/minio.rpm"
-        wget -q https://dl.min.io/server/minio/release/linux-amd64/minio.rpm -O /tmp/minio.rpm
-        $maysudo dnf install /tmp/minio.rpm
-        rm -f /tmp/minio.rpm
-    else
-        echo "No supported package manager found (brew, apt, or dnf)"
-        exit 1
-    fi
-fi
-
-# Install sqlx-cli if needed
-if ! [[ "$(command -v sqlx)" && "$(sqlx --version)" == "sqlx-cli 0.7.2" ]]; then
-    echo "sqlx-cli not found or not the required version, installing version 0.7.2..."
-    cargo install sqlx-cli --version 0.7.2
-fi
-
-cd crates/collab
-
-# Export contents of .env.toml
-eval "$(cargo run --bin dotenv)"
-
-echo "creating databases..."
-sqlx database create --database-url "$DATABASE_URL"
-sqlx database create --database-url "$LLM_DATABASE_URL"
diff --git a/script/bootstrap.ps1 b/script/bootstrap.ps1
deleted file mode 100644
index 55d306d48a..0000000000
--- a/script/bootstrap.ps1
+++ /dev/null
@@ -1,21 +0,0 @@
-$ErrorActionPreference = 'Stop'
-$PSNativeCommandUseErrorActionPreference = $true
-
-$env:POWERSHELL = $true
-
-if (!(Get-Command sqlx -ErrorAction SilentlyContinue) -or (sqlx --version) -notlike "sqlx-cli 0.7.2") {
-    Write-Output "sqlx-cli not found or not the required version, installing version 0.7.2..."
-    cargo install sqlx-cli --version 0.7.2
-}
-
-Set-Location .\crates\collab
-
-# Export contents of .env.toml
-$env = (cargo run --bin dotenv) -join "`n";
-Invoke-Expression $env
-
-Set-Location ../..
-
-Write-Output "creating databases..."
-sqlx database create --database-url "$env:DATABASE_URL"
-sqlx database create --database-url "$env:LLM_DATABASE_URL"
diff --git a/script/build-docker b/script/build-docker
deleted file mode 100755
index c5ea294c73..0000000000
--- a/script/build-docker
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# Use a docker BASE_IMAGE to test building Zed.
-# e.g: ./script/bundle-docker ubuntu:20.04
-#
-# Increasing resources available to podman may speed this up:
-# podman machine stop
-# podman machine set --memory 16384 --cpus 8 --disk-size 200
-# podman machine start
-
-set -euo pipefail
-
-BASE_IMAGE=${BASE_IMAGE:-${1:-}}
-if [ -z "$BASE_IMAGE" ]; then
-    echo "Usage: $0 BASE_IMAGE" >&2
-    exit 1
-fi
-
-export DOCKER_BUILDKIT=1
-cd "$(dirname "$0")/.."
-
-podman build . \
-    -f Dockerfile-distros \
-    -t many \
-    --build-arg BASE_IMAGE="$BASE_IMAGE"
diff --git a/script/bump-extension-cli b/script/bump-extension-cli
deleted file mode 100755
index ee7ea6f8c4..0000000000
--- a/script/bump-extension-cli
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-git pull --ff-only origin main
-git tag -f extension-cli
-git push -f origin extension-cli
diff --git a/script/bump-gpui-version b/script/bump-gpui-version
deleted file mode 100755
index 5112bde450..0000000000
--- a/script/bump-gpui-version
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/env bash
-
-# Parse arguments
-bump_type=${1:-minor}
-
-if [[ "$bump_type" != "minor" && "$bump_type" != "patch" ]]; then
-  echo "Usage: $0 [minor|patch]"
-  echo "  minor (default): bumps the minor version (e.g., 0.1.0 -> 0.2.0)"
-  echo "  patch: bumps the patch version (e.g., 0.1.0 -> 0.1.1)"
-  exit 1
-fi
-
-# Ensure we're in a clean state on an up-to-date `main` branch.
-if [[ -n $(git status --short --untracked-files=no) ]]; then
-  echo "can't bump versions with uncommitted changes"
-  exit 1
-fi
-if [[ $(git rev-parse --abbrev-ref HEAD) != "main" ]]; then
-  echo "this command must be run on main"
-  exit 1
-fi
-git pull -q --ff-only origin main
-
-
-# Parse the current version
-version=$(script/get-crate-version gpui)
-major=$(echo $version | cut -d. -f1)
-minor=$(echo $version | cut -d. -f2)
-patch=$(echo $version | cut -d. -f3)
-
-if [[ "$bump_type" == "minor" ]]; then
-  next_minor=$(expr $minor + 1)
-  next_version="${major}.${next_minor}.0"
-else
-  next_patch=$(expr $patch + 1)
-  next_version="${major}.${minor}.${next_patch}"
-fi
-
-branch_name="bump-gpui-to-v${next_version}"
-
-git checkout -b ${branch_name}
-
-script/lib/bump-version.sh gpui gpui-v "" $bump_type true
-
-git checkout -q main
diff --git a/script/bump-nightly b/script/bump-nightly
deleted file mode 100755
index 2419962387..0000000000
--- a/script/bump-nightly
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-git fetch origin main:tags/nightly -f
-git log --oneline -1 nightly
-git push -f origin nightly
diff --git a/script/bump-zed-minor-versions b/script/bump-zed-minor-versions
deleted file mode 100755
index 536dbb6244..0000000000
--- a/script/bump-zed-minor-versions
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/usr/bin/env bash
-
-set -eu
-
-# Ensure cargo-edit is installed
-which cargo-set-version > /dev/null || cargo install cargo-edit
-
-# Ensure we're in a clean state on an up-to-date `main` branch.
-if [[ -n $(git status --short --untracked-files=no) ]]; then
-  echo "can't bump versions with uncommitted changes"
-  exit 1
-fi
-if [[ $(git rev-parse --abbrev-ref HEAD) != "main" ]]; then
-  echo "this command must be run on main"
-  exit 1
-fi
-git pull -q --ff-only origin main
-
-# Parse the current version
-version=$(script/get-crate-version zed)
-major=$(echo $version | cut -d. -f1)
-minor=$(echo $version | cut -d. -f2)
-patch=$(echo $version | cut -d. -f3)
-prev_minor=$(expr $minor - 1)
-next_minor=$(expr $minor + 1)
-
-minor_branch_name="v${major}.${minor}.x"
-prev_minor_branch_name="v${major}.${prev_minor}.x"
-next_minor_branch_name="v${major}.${next_minor}.x"
-preview_tag_name="v${major}.${minor}.${patch}-pre"
-bump_main_branch_name="set-minor-version-to-${major}.${next_minor}"
-
-git fetch origin ${prev_minor_branch_name}:${prev_minor_branch_name}
-git fetch origin --tags
-cargo check -q
-
-function cleanup {
-  git checkout -q main
-}
-trap cleanup EXIT
-
-echo "Checking invariants before taking any actions..."
-if [[ $(cat crates/zed/RELEASE_CHANNEL) != dev && $(cat crates/zed/RELEASE_CHANNEL) != nightly ]]; then
-  echo "release channel on main should be dev or nightly"
-  exit 1
-fi
-if git show-ref --quiet refs/tags/${preview_tag_name}; then
-  echo "tag ${preview_tag_name} already exists"
-  exit 1
-fi
-if git show-ref --quiet refs/heads/${minor_branch_name}; then
-  echo "branch ${minor_branch_name} already exists"
-  exit 1
-fi
-if ! git show-ref --quiet refs/heads/${prev_minor_branch_name}; then
-  echo "previous branch ${minor_branch_name} doesn't exist"
-  exit 1
-fi
-if [[ $(git show ${prev_minor_branch_name}:crates/zed/RELEASE_CHANNEL) != preview ]]; then
-  echo "release channel on branch ${prev_minor_branch_name} should be preview"
-  exit 1
-fi
-
-echo "Promoting existing branch ${prev_minor_branch_name} to stable..."
-git checkout -q ${prev_minor_branch_name}
-git clean -q -dff
-stable_tag_name="v$(script/get-crate-version zed)"
-if git show-ref --quiet refs/tags/${stable_tag_name}; then
-  echo "tag ${stable_tag_name} already exists"
-  exit 1
-fi
-old_prev_minor_sha=$(git rev-parse HEAD)
-echo -n stable > crates/zed/RELEASE_CHANNEL
-git commit -q --all --message "${prev_minor_branch_name} stable"
-git tag ${stable_tag_name}
-
-echo "Creating new preview branch ${minor_branch_name}..."
-git checkout -q main
-git checkout -q -b ${minor_branch_name}
-echo -n preview > crates/zed/RELEASE_CHANNEL
-git commit -q --all --message "${minor_branch_name} preview"
-git tag ${preview_tag_name}
-
-echo "Preparing main for version ${next_minor_branch_name}..."
-git checkout -q main
-git clean -q -dff
-git checkout -q -b ${bump_main_branch_name}
-cargo set-version --package zed --bump minor
-cargo check -q
-
-git commit -q --all --message "${next_minor_branch_name} dev"
-
-git checkout -q main
-
-cat <<MESSAGE
-Prepared new Zed versions locally. You will need to push the branches and open a PR for the change to main.
-
-# To push and open a PR to update main:
-
-    git push -u origin \\
-      ${preview_tag_name} \\
-      ${stable_tag_name} \\
-      ${minor_branch_name} \\
-      ${prev_minor_branch_name} \\
-      ${bump_main_branch_name}
-
-    echo -e "Release Notes:\n\n- N/A" | gh pr create \\
-      --title "Bump Zed to v${major}.${next_minor}" \\
-      --body-file "-" \\
-      --base main \\
-      --head ${bump_main_branch_name} \\
-      --web
-
-# To undo this push:
-
-    git push -f . \\
-      :${preview_tag_name} \\
-      :${stable_tag_name} \\
-      :${minor_branch_name} \\
-      :${bump_main_branch_name} \\
-      ${old_prev_minor_sha}:${prev_minor_branch_name}
-
-MESSAGE
diff --git a/script/bump-zed-patch-version b/script/bump-zed-patch-version
deleted file mode 100755
index 8a44ae6edd..0000000000
--- a/script/bump-zed-patch-version
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-
-channel=$(cat crates/zed/RELEASE_CHANNEL)
-
-tag_suffix=""
-case $channel in
-  stable)
-    ;;
-  preview)
-    tag_suffix="-pre"
-    ;;
-  *)
-    echo "this must be run on either of stable|preview release branches" >&2
-    exit 1
-    ;;
-esac
-
-exec script/lib/bump-version.sh zed v "$tag_suffix" patch
diff --git a/script/bundle-freebsd b/script/bundle-freebsd
deleted file mode 100755
index 87c9459ffb..0000000000
--- a/script/bundle-freebsd
+++ /dev/null
@@ -1,161 +0,0 @@
-#!/usr/bin/env bash
-
-set -euxo pipefail
-source script/lib/blob-store.sh
-
-# Function for displaying help info
-help_info() {
-    echo "
-Usage: ${0##*/} [options]
-Build a release .tar.gz for FreeBSD.
-
-Options:
-  -h    Display this help and exit.
-  "
-}
-
-while getopts 'h' flag; do
-    case "${flag}" in
-    h)
-        help_info
-        exit 0
-        ;;
-    esac
-done
-
-export ZED_BUNDLE=true
-
-channel=$(<crates/zed/RELEASE_CHANNEL)
-target_dir="${CARGO_TARGET_DIR:-target}"
-
-version="$(script/get-crate-version zed)"
-# Set RELEASE_VERSION so it's compiled into GPUI and it knows about the version.
-export RELEASE_VERSION="${version}"
-
-commit=$(git rev-parse HEAD | cut -c 1-7)
-
-version_info=$(rustc --version --verbose)
-host_line=$(echo "$version_info" | grep host)
-target_triple=${host_line#*: }
-remote_server_triple=${REMOTE_SERVER_TARGET:-"${target_triple}"}
-
-# musl_triple=${target_triple%-gnu}-musl
-# rustup_installed=false
-# if command -v rustup >/dev/null 2>&1; then
-#     rustup_installed=true
-# fi
-# Generate the licenses first, so they can be baked into the binaries
-# script/generate-licenses
-# if "$rustup_installed"; then
-#     rustup target add "$remote_server_triple"
-# fi
-
-# export CC=$(which clang)
-
-# Build binary in release mode
-export RUSTFLAGS="${RUSTFLAGS:-} -C link-args=-Wl,--disable-new-dtags,-rpath,\$ORIGIN/../lib"
-# cargo build --release --target "${target_triple}" --package zed --package cli
-
-# Build remote_server in separate invocation to prevent feature unification from other crates
-# from influencing dynamic libraries required by it.
-# if [[ "$remote_server_triple" == "$musl_triple" ]]; then
-#     export RUSTFLAGS="${RUSTFLAGS:-} -C target-feature=+crt-static"
-# fi
-cargo build --release --target "${remote_server_triple}" --package remote_server
-
-# Strip debug symbols and save them for upload to DigitalOcean
-# objcopy --only-keep-debug "${target_dir}/${target_triple}/release/zed" "${target_dir}/${target_triple}/release/zed.dbg"
-# objcopy --only-keep-debug "${target_dir}/${remote_server_triple}/release/remote_server" "${target_dir}/${remote_server_triple}/release/remote_server.dbg"
-# objcopy --strip-debug "${target_dir}/${target_triple}/release/zed"
-# objcopy --strip-debug "${target_dir}/${target_triple}/release/cli"
-# objcopy --strip-debug "${target_dir}/${remote_server_triple}/release/remote_server"
-
-# gzip -f "${target_dir}/${target_triple}/release/zed.dbg"
-# gzip -f "${target_dir}/${remote_server_triple}/release/remote_server.dbg"
-
-# if [[ -n "${DIGITALOCEAN_SPACES_SECRET_KEY:-}" && -n "${DIGITALOCEAN_SPACES_ACCESS_KEY:-}" ]]; then
-#     upload_to_blob_store_public \
-#         "zed-debug-symbols" \
-#         "${target_dir}/${target_triple}/release/zed.dbg.gz" \
-#         "$channel/zed-$version-${target_triple}.dbg.gz"
-#     upload_to_blob_store_public \
-#         "zed-debug-symbols" \
-#         "${target_dir}/${remote_server_triple}/release/remote_server.dbg.gz" \
-#         "$channel/remote_server-$version-${remote_server_triple}.dbg.gz"
-# fi
-
-# Ensure that remote_server does not depend on libssl nor libcrypto, as we got rid of these deps.
-if ldd "${target_dir}/${remote_server_triple}/release/remote_server" | grep -q 'libcrypto\|libssl'; then
-    echo "Error: remote_server still depends on libssl or libcrypto" && exit 1
-fi
-
-suffix=""
-if [ "$channel" != "stable" ]; then
-    suffix="-$channel"
-fi
-
-# Move everything that should end up in the final package
-# into a temp directory.
-# temp_dir=$(mktemp -d)
-# zed_dir="${temp_dir}/zed$suffix.app"
-
-# Binary
-# mkdir -p "${zed_dir}/bin" "${zed_dir}/libexec"
-# cp "${target_dir}/${target_triple}/release/zed" "${zed_dir}/libexec/zed-editor"
-# cp "${target_dir}/${target_triple}/release/cli" "${zed_dir}/bin/zed"
-
-# Libs
-# find_libs() {
-#     ldd ${target_dir}/${target_triple}/release/zed |
-#         cut -d' ' -f3 |
-#         grep -v '\<\(libstdc++.so\|libc.so\|libgcc_s.so\|libm.so\|libpthread.so\|libdl.so\|libasound.so\)'
-# }
-
-# mkdir -p "${zed_dir}/lib"
-# rm -rf "${zed_dir}/lib/*"
-# cp $(find_libs) "${zed_dir}/lib"
-
-# Icons
-# mkdir -p "${zed_dir}/share/icons/hicolor/512x512/apps"
-# cp "crates/zed/resources/app-icon$suffix.png" "${zed_dir}/share/icons/hicolor/512x512/apps/zed.png"
-# mkdir -p "${zed_dir}/share/icons/hicolor/1024x1024/apps"
-# cp "crates/zed/resources/app-icon$suffix@2x.png" "${zed_dir}/share/icons/hicolor/1024x1024/apps/zed.png"
-
-# .desktop
-# export DO_STARTUP_NOTIFY="true"
-# export APP_CLI="zed"
-# export APP_ICON="zed"
-# export APP_ARGS="%U"
-# if [[ "$channel" == "preview" ]]; then
-#     export APP_NAME="Zed Preview"
-# elif [[ "$channel" == "nightly" ]]; then
-#     export APP_NAME="Zed Nightly"
-# elif [[ "$channel" == "dev" ]]; then
-#     export APP_NAME="Zed Devel"
-# else
-#     export APP_NAME="Zed"
-# fi
-
-# mkdir -p "${zed_dir}/share/applications"
-# envsubst <"crates/zed/resources/zed.desktop.in" >"${zed_dir}/share/applications/zed$suffix.desktop"
-# chmod +x "${zed_dir}/share/applications/zed$suffix.desktop"
-
-# Copy generated licenses so they'll end up in archive too
-# cp "assets/licenses.md" "${zed_dir}/licenses.md"
-
-# Create archive out of everything that's in the temp directory
-arch=$(uname -m)
-# target="freebsd-${arch}"
-# if [[ "$channel" == "dev" ]]; then
-#     archive="zed-${commit}-${target}.tar.gz"
-# else
-#     archive="zed-${target}.tar.gz"
-# fi
-
-# rm -rf "${archive}"
-# remove_match="zed(-[a-zA-Z0-9]+)?-linux-$(uname -m)\.tar\.gz"
-# ls "${target_dir}/release" | grep -E ${remove_match} | xargs -d "\n" -I {} rm -f "${target_dir}/release/{}" || true
-# tar -czvf "${target_dir}/release/$archive" -C ${temp_dir} "zed$suffix.app"
-
-gzip -f --stdout --best "${target_dir}/${remote_server_triple}/release/remote_server" \
-    > "${target_dir}/zed-remote-server-freebsd-x86_64.gz"
diff --git a/script/bundle-linux b/script/bundle-linux
deleted file mode 100755
index 4f5c9f6e7e..0000000000
--- a/script/bundle-linux
+++ /dev/null
@@ -1,191 +0,0 @@
-#!/usr/bin/env bash
-
-set -euxo pipefail
-source script/lib/blob-store.sh
-
-# Function for displaying help info
-help_info() {
-  echo "
-Usage: ${0##*/} [options]
-Build a release .tar.gz for Linux.
-
-Options:
-  -h, --help     Display this help and exit.
-  --flatpak      Set ZED_BUNDLE_TYPE=flatpak so that this can be included in system info
-  "
-}
-
-# Parse all arguments manually
-while [[ $# -gt 0 ]]; do
-    case $1 in
-        -h|--help)
-            help_info
-            exit 0
-            ;;
-        --flatpak)
-            export ZED_BUNDLE_TYPE=flatpak
-            shift
-            ;;
-        --)
-            shift
-            break
-            ;;
-        -*)
-            echo "Unknown option: $1" >&2
-            help_info
-            exit 1
-            ;;
-        *)
-            echo "Error: Unexpected argument: $1" >&2
-            help_info
-            exit 1
-            ;;
-    esac
-done
-
-export ZED_BUNDLE=true
-
-channel=$(<crates/zed/RELEASE_CHANNEL)
-target_dir="${CARGO_TARGET_DIR:-target}"
-
-version="$(script/get-crate-version zed)"
-# Set RELEASE_VERSION so it's compiled into GPUI and it knows about the version.
-export RELEASE_VERSION="${version}"
-
-commit=$(git rev-parse HEAD | cut -c 1-7)
-
-version_info=$(rustc --version --verbose)
-host_line=$(echo "$version_info" | grep host)
-target_triple=${host_line#*: }
-musl_triple=${target_triple%-gnu}-musl
-remote_server_triple=${REMOTE_SERVER_TARGET:-"${musl_triple}"}
-rustup_installed=false
-if command -v rustup >/dev/null 2>&1; then
-    rustup_installed=true
-fi
-
-# Generate the licenses first, so they can be baked into the binaries
-script/generate-licenses
-
-if "$rustup_installed"; then
-    rustup target add "$remote_server_triple"
-fi
-
-export CC=$(which clang)
-
-# Build binary in release mode
-export RUSTFLAGS="${RUSTFLAGS:-} -C link-args=-Wl,--disable-new-dtags,-rpath,\$ORIGIN/../lib"
-cargo build --release --target "${target_triple}" --package zed --package cli
-# Build remote_server in separate invocation to prevent feature unification from other crates
-# from influencing dynamic libraries required by it.
-if [[ "$remote_server_triple" == "$musl_triple" ]]; then
-    export RUSTFLAGS="${RUSTFLAGS:-} -C target-feature=+crt-static"
-fi
-cargo build --release --target "${remote_server_triple}" --package remote_server
-
-# Upload debug info to sentry.io
-if ! command -v sentry-cli >/dev/null 2>&1; then
-    echo "sentry-cli not found. skipping sentry upload."
-    echo "install with: 'curl -sL https://sentry.io/get-cli | bash'"
-else
-    if [[ -n "${SENTRY_AUTH_TOKEN:-}" ]]; then
-        echo "Uploading zed debug symbols to sentry..."
-        # note: this uploads the unstripped binary which is needed because it contains
-        # .eh_frame data for stack unwinding. see https://github.com/getsentry/symbolic/issues/783
-        for attempt in 1 2 3; do
-            echo "Attempting sentry upload (attempt $attempt/3)..."
-            if sentry-cli debug-files upload --include-sources --wait -p zed -o zed-dev \
-                "${target_dir}/${target_triple}"/release/zed \
-                "${target_dir}/${remote_server_triple}"/release/remote_server; then
-                echo "Sentry upload successful on attempt $attempt"
-                break
-            else
-                echo "Sentry upload failed on attempt $attempt"
-                if [ $attempt -eq 3 ]; then
-                    echo "All sentry upload attempts failed"
-                fi
-            fi
-        done
-    else
-        echo "missing SENTRY_AUTH_TOKEN. skipping sentry upload."
-    fi
-fi
-
-# Strip debug symbols and save them for upload to DigitalOcean
-objcopy --strip-debug "${target_dir}/${target_triple}/release/zed"
-objcopy --strip-debug "${target_dir}/${target_triple}/release/cli"
-objcopy --strip-debug "${target_dir}/${remote_server_triple}/release/remote_server"
-
-# Ensure that remote_server does not depend on libssl nor libcrypto, as we got rid of these deps.
-if ldd "${target_dir}/${remote_server_triple}/release/remote_server" | grep -q 'libcrypto\|libssl'; then
-    if [[ "$remote_server_triple" == *-musl ]]; then
-        echo "Error: remote_server still depends on libssl or libcrypto" && exit 1
-    else
-        echo "Info: Using non-musl remote-server build."
-    fi
-fi
-
-suffix=""
-if [ "$channel" != "stable" ]; then
-  suffix="-$channel"
-fi
-
-# Move everything that should end up in the final package
-# into a temp directory.
-temp_dir=$(mktemp -d)
-zed_dir="${temp_dir}/zed$suffix.app"
-
-# Binary
-mkdir -p "${zed_dir}/bin" "${zed_dir}/libexec"
-cp "${target_dir}/${target_triple}/release/zed" "${zed_dir}/libexec/zed-editor"
-cp "${target_dir}/${target_triple}/release/cli" "${zed_dir}/bin/zed"
-
-# Libs
-find_libs() {
-    ldd ${target_dir}/${target_triple}/release/zed |\
-        cut -d' ' -f3 |\
-        grep -v '\<\(libstdc++.so\|libc.so\|libgcc_s.so\|libm.so\|libpthread.so\|libdl.so\|libasound.so\)'
-}
-
-mkdir -p "${zed_dir}/lib"
-rm -rf "${zed_dir}/lib/*"
-cp $(find_libs) "${zed_dir}/lib"
-
-# Icons
-mkdir -p "${zed_dir}/share/icons/hicolor/512x512/apps"
-cp "crates/zed/resources/app-icon$suffix.png" "${zed_dir}/share/icons/hicolor/512x512/apps/zed.png"
-mkdir -p "${zed_dir}/share/icons/hicolor/1024x1024/apps"
-cp "crates/zed/resources/app-icon$suffix@2x.png" "${zed_dir}/share/icons/hicolor/1024x1024/apps/zed.png"
-
-# .desktop
-export DO_STARTUP_NOTIFY="true"
-export APP_CLI="zed"
-export APP_ICON="zed"
-export APP_ARGS="%U"
-if [[ "$channel" == "preview" ]]; then
-  export APP_NAME="Zed Preview"
-elif [[ "$channel" == "nightly" ]]; then
-  export APP_NAME="Zed Nightly"
-elif [[ "$channel" == "dev" ]]; then
-  export APP_NAME="Zed Devel"
-else
-  export APP_NAME="Zed"
-fi
-
-mkdir -p "${zed_dir}/share/applications"
-envsubst < "crates/zed/resources/zed.desktop.in" > "${zed_dir}/share/applications/zed$suffix.desktop"
-chmod +x "${zed_dir}/share/applications/zed$suffix.desktop"
-
-# Copy generated licenses so they'll end up in archive too
-cp "assets/licenses.md" "${zed_dir}/licenses.md"
-
-# Create archive out of everything that's in the temp directory
-arch=$(uname -m)
-archive="zed-linux-${arch}.tar.gz"
-
-rm -rf "${archive}"
-remove_match="zed(-[a-zA-Z0-9]+)?-linux-$(uname -m)\.tar\.gz"
-ls "${target_dir}/release" | grep -E ${remove_match} | xargs -d "\n" -I {} rm -f "${target_dir}/release/{}" || true
-tar -czvf "${target_dir}/release/$archive" -C ${temp_dir} "zed$suffix.app"
-
-gzip -f --stdout --best "${target_dir}/${remote_server_triple}/release/remote_server" > "${target_dir}/zed-remote-server-linux-${arch}.gz"
diff --git a/script/bundle-mac b/script/bundle-mac
deleted file mode 100755
index c6c925f073..0000000000
--- a/script/bundle-mac
+++ /dev/null
@@ -1,330 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-source script/lib/blob-store.sh
-
-build_flag="--release"
-target_dir="release"
-open_result=false
-local_install=false
-can_code_sign=false
-
-# This must match the team in the provisioning profile.
-IDENTITY="Zed Industries, Inc."
-APPLE_NOTARIZATION_TEAM="MQ55VZLNZQ"
-
-# Function for displaying help info
-help_info() {
-  echo "
-Usage: ${0##*/} [options] [architecture=host]
-Build the application bundle for macOS.
-
-Options:
-  -d    Compile in debug mode
-  -o    Open dir with the resulting DMG or launch the app itself in local mode.
-  -i    Install the resulting DMG into /Applications.
-  -h    Display this help and exit.
-  "
-}
-
-while getopts 'dloih' flag
-do
-    case "${flag}" in
-        o) open_result=true;;
-        d)
-            export CARGO_INCREMENTAL=true
-            export CARGO_BUNDLE_SKIP_BUILD=true
-            build_flag="";
-            target_dir="debug"
-            ;;
-        i) local_install=true;;
-        h)
-           help_info
-           exit 0
-           ;;
-    esac
-done
-
-shift $((OPTIND-1))
-
-
-# Get release channel
-pushd crates/zed
-channel=$(<RELEASE_CHANNEL)
-export ZED_RELEASE_CHANNEL="${channel}"
-popd
-
-export ZED_BUNDLE=true
-
-cargo_bundle_version=$(cargo -q bundle --help 2>&1 | head -n 1 || echo "")
-if [ "$cargo_bundle_version" != "cargo-bundle v0.6.1-zed" ]; then
-    cargo install cargo-bundle --git https://github.com/zed-industries/cargo-bundle.git --branch zed-deploy
-fi
-
-# Deal with versions of macOS that don't include libstdc++ headers
-export CXXFLAGS="-stdlib=libc++"
-
-version_info=$(rustc --version --verbose)
-host_line=$(echo "$version_info" | grep host)
-target_triple=${host_line#*: }
-if [[ $# -gt 0 && -n "$1" ]]; then
-    target_triple="$1"
-fi
-arch_suffix=""
-
-if [[ "$target_triple" = "x86_64-apple-darwin" ]]; then
-    arch_suffix="x86_64"
-elif [[ "$target_triple" = "aarch64-apple-darwin" ]]; then
-    arch_suffix="aarch64"
-else
-    echo "Unsupported architecture $target_triple"
-    exit 1
-fi
-
-# Generate the licenses first, so they can be baked into the binaries
-script/generate-licenses
-
-rustup target add $target_triple
-
-echo "Compiling zed binaries"
-cargo build ${build_flag} --package zed --package cli --target $target_triple
-# Build remote_server in separate invocation to prevent feature unification from other crates
-# from influencing dynamic libraries required by it.
-cargo build ${build_flag} --package remote_server --target $target_triple
-
-echo "Creating application bundle"
-pushd crates/zed
-cp Cargo.toml Cargo.toml.backup
-sed \
-    -i.backup \
-    "s/package.metadata.bundle-${channel}/package.metadata.bundle/" \
-    Cargo.toml
-
-app_path=$(cargo bundle ${build_flag} --target $target_triple --select-workspace-root | xargs)
-
-mv Cargo.toml.backup Cargo.toml
-popd
-echo "Bundled ${app_path}"
-
-if [[ -n "${MACOS_CERTIFICATE:-}" && -n "${MACOS_CERTIFICATE_PASSWORD:-}" && -n "${APPLE_NOTARIZATION_KEY:-}" && -n "${APPLE_NOTARIZATION_KEY_ID:-}" && -n "${APPLE_NOTARIZATION_ISSUER_ID:-}" ]]; then
-    can_code_sign=true
-
-    echo "Setting up keychain for code signing..."
-    security create-keychain -p "$MACOS_CERTIFICATE_PASSWORD" zed.keychain || echo ""
-    security default-keychain -s zed.keychain
-    security unlock-keychain -p "$MACOS_CERTIFICATE_PASSWORD" zed.keychain
-    # Calling set-keychain-settings without `-t` disables the auto-lock timeout
-    security set-keychain-settings zed.keychain
-    echo "$MACOS_CERTIFICATE" | base64 --decode > /tmp/zed-certificate.p12
-    security import /tmp/zed-certificate.p12 -k zed.keychain -P "$MACOS_CERTIFICATE_PASSWORD" -T /usr/bin/codesign
-    rm /tmp/zed-certificate.p12
-    security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$MACOS_CERTIFICATE_PASSWORD" zed.keychain
-
-    function cleanup() {
-        echo "Cleaning up keychain"
-        security default-keychain -s login.keychain
-        security delete-keychain zed.keychain
-    }
-
-    trap cleanup EXIT
-fi
-
-GIT_VERSION="v2.43.3"
-GIT_VERSION_SHA="fa29823"
-
-function download_and_unpack() {
-    local url=$1
-    local path_to_unpack=$2
-    local target_path=$3
-
-    temp_dir=$(mktemp -d)
-
-    if ! command -v curl &> /dev/null; then
-        echo "curl is not installed. Please install curl to continue."
-        exit 1
-    fi
-
-    curl --silent --fail --location "$url" | tar -xvz -C "$temp_dir" -f - $path_to_unpack
-
-    mv "$temp_dir/$path_to_unpack" "$target_path"
-
-    rm -rf "$temp_dir"
-}
-
-function download_git() {
-    local architecture=$1
-    local target_binary=$2
-
-    tmp_dir=$(mktemp -d)
-    pushd "$tmp_dir"
-
-    case "$architecture" in
-        aarch64-apple-darwin)
-            download_and_unpack "https://github.com/desktop/dugite-native/releases/download/${GIT_VERSION}/dugite-native-${GIT_VERSION}-${GIT_VERSION_SHA}-macOS-arm64.tar.gz" bin/git ./git
-            ;;
-        x86_64-apple-darwin)
-            download_and_unpack "https://github.com/desktop/dugite-native/releases/download/${GIT_VERSION}/dugite-native-${GIT_VERSION}-${GIT_VERSION_SHA}-macOS-x64.tar.gz" bin/git ./git
-            ;;
-        *)
-            echo "Unsupported architecture: $architecture"
-            exit 1
-            ;;
-    esac
-
-    popd
-
-    mv "${tmp_dir}/git" "${target_binary}"
-    rm -rf "$tmp_dir"
-}
-
-function sign_app_binaries() {
-    rm -rf "${app_path}/Contents/Frameworks"
-    mkdir -p "${app_path}/Contents/Frameworks"
-
-    echo "Downloading git binary"
-    download_git "${target_triple}" "${app_path}/Contents/MacOS/git"
-
-    # Note: The app identifier for our development builds is the same as the app identifier for nightly.
-    cp crates/zed/contents/$channel/embedded.provisionprofile "${app_path}/Contents/"
-
-    if [[ $can_code_sign = true ]]; then
-        echo "Code signing binaries"
-        # sequence of codesign commands modeled after this example: https://developer.apple.com/forums/thread/701514
-        /usr/bin/codesign --deep --force --timestamp --options runtime --sign "$IDENTITY" "${app_path}/Contents/MacOS/cli" -v
-        /usr/bin/codesign --deep --force --timestamp --options runtime --sign "$IDENTITY" "${app_path}/Contents/MacOS/git" -v
-        /usr/bin/codesign --deep --force --timestamp --options runtime --entitlements crates/zed/resources/zed.entitlements --sign "$IDENTITY" "${app_path}/Contents/MacOS/zed" -v
-        /usr/bin/codesign --force --timestamp --options runtime --entitlements crates/zed/resources/zed.entitlements --sign "$IDENTITY" "${app_path}" -v
-    else
-        echo "One or more of the following variables are missing: MACOS_CERTIFICATE, MACOS_CERTIFICATE_PASSWORD, APPLE_NOTARIZATION_KEY, APPLE_NOTARIZATION_KEY_ID, APPLE_NOTARIZATION_ISSUER_ID"
-
-        echo "====== WARNING ======"
-        echo "This bundle is being signed without all entitlements, some features (e.g. universal links) will not work"
-        echo "====== WARNING ======"
-
-        # NOTE: if you need to test universal links you have a few paths forward:
-        # - create a PR and tag it with the `run-bundling` label, and download the .dmg file from there.
-        # - get a signing key for the MQ55VZLNZQ team from Nathan.
-        # - create your own signing key, and update references to MQ55VZLNZQ to your own team ID
-        # then comment out this line.
-        cat crates/zed/resources/zed.entitlements | sed '/com.apple.developer.associated-domains/,+1d' > "${app_path}/Contents/Resources/zed.entitlements"
-
-        codesign --force --deep --entitlements "${app_path}/Contents/Resources/zed.entitlements" --sign ${MACOS_SIGNING_KEY:- -} "${app_path}" -v
-    fi
-
-    bundle_name=$(basename "$app_path")
-
-    if [ "$local_install" = true ]; then
-        rm -rf "/Applications/$bundle_name"
-        mv "$app_path" "/Applications/$bundle_name"
-        echo "Installed application bundle: /Applications/$bundle_name"
-        if [ "$open_result" = true ]; then
-            echo "Opening /Applications/$bundle_name"
-            open "/Applications/$bundle_name"
-        fi
-    elif [ "$open_result" = true ]; then
-        open "$app_path"
-    fi
-
-    if [[ "$target_dir" = "debug" ]]; then
-        echo "Debug build detected - skipping DMG creation and signing"
-        if [ "$local_install" = false ]; then
-            echo "Created application bundle:"
-            echo "$app_path"
-        fi
-    else
-        dmg_target_directory="target/${target_triple}/${target_dir}"
-        dmg_source_directory="${dmg_target_directory}/dmg"
-        dmg_file_path="${dmg_target_directory}/Zed-${arch_suffix}.dmg"
-        xcode_bin_dir_path="$(xcode-select -p)/usr/bin"
-
-        rm -rf ${dmg_source_directory}
-        mkdir -p ${dmg_source_directory}
-        mv "${app_path}" "${dmg_source_directory}"
-        notarization_key_file=$(mktemp)
-
-        echo "Adding symlink to /Applications to ${dmg_source_directory}"
-        ln -s /Applications ${dmg_source_directory}
-
-        echo "Creating final DMG at ${dmg_file_path} using ${dmg_source_directory}"
-        hdiutil create -volname Zed -srcfolder "${dmg_source_directory}" -ov -format UDZO "${dmg_file_path}"
-
-        # If someone runs this bundle script locally, a symlink will be placed in `dmg_source_directory`.
-        # This symlink causes CPU issues with Zed if the Zed codebase is the project being worked on, so we simply remove it for now.
-        echo "Removing symlink to /Applications from ${dmg_source_directory}"
-        rm ${dmg_source_directory}/Applications
-
-        echo "Adding license agreement to DMG"
-        npm install --global dmg-license minimist
-        dmg-license script/terms/terms.json "${dmg_file_path}"
-
-        if [[ $can_code_sign = true ]]; then
-            echo "Notarizing DMG with Apple"
-            /usr/bin/codesign --deep --force --timestamp --options runtime --sign "$IDENTITY" "$(pwd)/${dmg_file_path}" -v
-            echo "$APPLE_NOTARIZATION_KEY" > "$notarization_key_file"
-            "${xcode_bin_dir_path}/notarytool" submit --wait --key "$notarization_key_file" --key-id "$APPLE_NOTARIZATION_KEY_ID" --issuer "$APPLE_NOTARIZATION_ISSUER_ID" "${dmg_file_path}"
-            rm "$notarization_key_file"
-            "${xcode_bin_dir_path}/stapler" staple "${dmg_file_path}"
-        fi
-
-        if [ "$open_result" = true ]; then
-            open $dmg_target_directory
-        fi
-    fi
-}
-
-function sign_binary() {
-    local binary_path=$1
-
-    if [[ $can_code_sign = true ]]; then
-        echo "Code signing executable $binary_path"
-        /usr/bin/codesign --deep --force --timestamp --options runtime --entitlements crates/zed/resources/zed.entitlements --sign "$IDENTITY" "${binary_path}" -v
-    fi
-}
-
-function upload_debug_symbols() {
-    if [ "$local_install" = true ]; then
-        echo "local install; skipping sentry upload."
-    elif [[ -n "${SENTRY_AUTH_TOKEN:-}" ]]; then
-        echo "Uploading zed debug symbols to sentry..."
-        exe_path="target/${target_triple}/release/Zed"
-        if ! dsymutil --flat "target/${target_triple}/${target_dir}/zed" 2> target/dsymutil.log; then
-            echo "dsymutil failed"
-            cat target/dsymutil.log
-            exit 1
-        fi
-        if ! dsymutil --flat "target/${target_triple}/${target_dir}/remote_server" 2> target/dsymutil.log; then
-            echo "dsymutil failed"
-            cat target/dsymutil.log
-            exit 1
-        fi
-        # note: this uploads the unstripped binary which is needed because it contains
-        # .eh_frame data for stack unwinding. see https://github.com/getsentry/symbolic/issues/783
-        sentry-cli debug-files upload --include-sources --wait -p zed -o zed-dev \
-        # Try uploading up to 3 times
-        for attempt in 1 2 3; do
-            echo "Sentry upload attempt $attempt..."
-            if sentry-cli debug-files upload --include-sources --wait -p zed -o zed-dev \
-                "target/${target_triple}/${target_dir}/zed.dwarf" \
-                "target/${target_triple}/${target_dir}/remote_server.dwarf"; then
-                break
-            else
-                echo "Sentry upload failed on attempt $attempt"
-                if [ $attempt -eq 3 ]; then
-                    echo "All sentry upload attempts failed"
-                    exit 1
-                fi
-            fi
-        done
-    else
-        echo "missing SENTRY_AUTH_TOKEN. skipping sentry upload."
-    fi
-}
-
-upload_debug_symbols
-
-cp target/${target_triple}/${target_dir}/zed "${app_path}/Contents/MacOS/zed"
-cp target/${target_triple}/${target_dir}/cli "${app_path}/Contents/MacOS/cli"
-sign_app_binaries
-
-sign_binary "target/$target_triple/release/remote_server"
-gzip -f --stdout --best target/$target_triple/release/remote_server > target/zed-remote-server-macos-$arch_suffix.gz
diff --git a/script/bundle-windows.ps1 b/script/bundle-windows.ps1
deleted file mode 100644
index 48114a970f..0000000000
--- a/script/bundle-windows.ps1
+++ /dev/null
@@ -1,378 +0,0 @@
-[CmdletBinding()]
-Param(
-    [Parameter()][Alias('i')][switch]$Install,
-    [Parameter()][Alias('h')][switch]$Help,
-    [Parameter()][Alias('a')][string]$Architecture,
-    [Parameter()][string]$Name
-)
-
-. "$PSScriptRoot/lib/workspace.ps1"
-
-# https://stackoverflow.com/questions/57949031/powershell-script-stops-if-program-fails-like-bash-set-o-errexit
-$ErrorActionPreference = 'Stop'
-$PSNativeCommandUseErrorActionPreference = $true
-
-$buildSuccess = $false
-
-$OSArchitecture = switch ([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture) {
-    "X64" { "x86_64" }
-    "Arm64" { "aarch64" }
-    default { throw "Unsupported architecture" }
-}
-
-$Architecture = if ($Architecture) {
-    $Architecture
-} else {
-    $OSArchitecture
-}
-
-$CargoOutDir = "./target/$Architecture-pc-windows-msvc/release"
-
-function Get-VSArch {
-    param(
-        [string]$Arch
-    )
-
-    switch ($Arch) {
-        "x86_64" { "amd64" }
-        "aarch64" { "arm64" }
-    }
-}
-
-Push-Location
-& "C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\Launch-VsDevShell.ps1" -Arch (Get-VSArch -Arch $Architecture) -HostArch (Get-VSArch -Arch $OSArchitecture)
-Pop-Location
-
-$target = "$Architecture-pc-windows-msvc"
-
-if ($Help) {
-    Write-Output "Usage: test.ps1 [-Install] [-Help]"
-    Write-Output "Build the installer for Windows.\n"
-    Write-Output "Options:"
-    Write-Output "  -Architecture, -a Which architecture to build (x86_64 or aarch64)"
-    Write-Output "  -Install, -i      Run the installer after building."
-    Write-Output "  -Help, -h         Show this help message."
-    exit 0
-}
-
-Push-Location -Path crates/zed
-$channel = Get-Content "RELEASE_CHANNEL"
-$env:ZED_RELEASE_CHANNEL = $channel
-$env:RELEASE_CHANNEL = $channel
-Pop-Location
-
-function CheckEnvironmentVariables {
-    if(-not $env:CI) {
-        return
-    }
-
-    $requiredVars = @(
-        'ZED_WORKSPACE', 'RELEASE_VERSION', 'ZED_RELEASE_CHANNEL',
-        'AZURE_TENANT_ID', 'AZURE_CLIENT_ID', 'AZURE_CLIENT_SECRET',
-        'ACCOUNT_NAME', 'CERT_PROFILE_NAME', 'ENDPOINT',
-        'FILE_DIGEST', 'TIMESTAMP_DIGEST', 'TIMESTAMP_SERVER'
-    )
-
-    foreach ($var in $requiredVars) {
-        if (-not (Test-Path "env:$var")) {
-            Write-Error "$var is not set"
-            exit 1
-        }
-    }
-}
-
-function PrepareForBundle {
-    if (Test-Path "$innoDir") {
-        Remove-Item -Path "$innoDir" -Recurse -Force
-    }
-    New-Item -Path "$innoDir" -ItemType Directory -Force
-    Copy-Item -Path "$env:ZED_WORKSPACE\crates\zed\resources\windows\*" -Destination "$innoDir" -Recurse -Force
-    New-Item -Path "$innoDir\make_appx" -ItemType Directory -Force
-    New-Item -Path "$innoDir\appx" -ItemType Directory -Force
-    New-Item -Path "$innoDir\bin" -ItemType Directory -Force
-    New-Item -Path "$innoDir\tools" -ItemType Directory -Force
-
-    rustup target add $target
-}
-
-function GenerateLicenses {
-    $oldErrorActionPreference = $ErrorActionPreference
-    $ErrorActionPreference = 'Continue'
-    . $PSScriptRoot/generate-licenses.ps1
-    $ErrorActionPreference = $oldErrorActionPreference
-}
-
-function BuildZedAndItsFriends {
-    Write-Output "Building Zed and its friends, for channel: $channel"
-    # Build zed.exe, cli.exe and auto_update_helper.exe
-    cargo build --release --package zed --package cli --package auto_update_helper --target $target
-    Copy-Item -Path ".\$CargoOutDir\zed.exe" -Destination "$innoDir\Zed.exe" -Force
-    Copy-Item -Path ".\$CargoOutDir\cli.exe" -Destination "$innoDir\cli.exe" -Force
-    Copy-Item -Path ".\$CargoOutDir\auto_update_helper.exe" -Destination "$innoDir\auto_update_helper.exe" -Force
-    # Build explorer_command_injector.dll
-    switch ($channel) {
-        "stable" {
-            cargo build --release --features stable --no-default-features --package explorer_command_injector --target $target
-        }
-        "preview" {
-            cargo build --release --features preview --no-default-features --package explorer_command_injector --target $target
-        }
-        default {
-            cargo build --release --package explorer_command_injector --target $target
-        }
-    }
-    Copy-Item -Path ".\$CargoOutDir\explorer_command_injector.dll" -Destination "$innoDir\zed_explorer_command_injector.dll" -Force
-}
-
-function ZipZedAndItsFriendsDebug {
-    $items = @(
-        ".\$CargoOutDir\zed.pdb",
-        ".\$CargoOutDir\cli.pdb",
-        ".\$CargoOutDir\auto_update_helper.pdb",
-        ".\$CargoOutDir\explorer_command_injector.pdb"
-    )
-
-    Compress-Archive -Path $items -DestinationPath ".\$CargoOutDir\zed-$env:RELEASE_VERSION-$env:ZED_RELEASE_CHANNEL.dbg.zip" -Force
-}
-
-
-function UploadToSentry {
-    if (-not (Get-Command "sentry-cli" -ErrorAction SilentlyContinue)) {
-        Write-Output "sentry-cli not found. skipping sentry upload."
-        Write-Output "install with: 'winget install -e --id=Sentry.sentry-cli'"
-        return
-    }
-    if (-not (Test-Path "env:SENTRY_AUTH_TOKEN")) {
-        Write-Output "missing SENTRY_AUTH_TOKEN. skipping sentry upload."
-        return
-    }
-    Write-Output "Uploading zed debug symbols to sentry..."
-    for ($i = 1; $i -le 3; $i++) {
-        try {
-            sentry-cli debug-files upload --include-sources --wait -p zed -o zed-dev $CargoOutDir
-            break
-        }
-        catch {
-            Write-Output "Sentry upload attempt $i failed: $_"
-            if ($i -eq 3) {
-                Write-Output "All sentry upload attempts failed"
-                throw
-            }
-            Start-Sleep -Seconds 2
-        }
-    }
-}
-
-function MakeAppx {
-    switch ($channel) {
-        "stable" {
-            $manifestFile = "$env:ZED_WORKSPACE\crates\explorer_command_injector\AppxManifest.xml"
-        }
-        "preview" {
-            $manifestFile = "$env:ZED_WORKSPACE\crates\explorer_command_injector\AppxManifest-Preview.xml"
-        }
-        default {
-            $manifestFile = "$env:ZED_WORKSPACE\crates\explorer_command_injector\AppxManifest-Nightly.xml"
-        }
-    }
-    Copy-Item -Path "$manifestFile" -Destination "$innoDir\make_appx\AppxManifest.xml"
-    # Add makeAppx.exe to Path
-    $sdk = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x64"
-    $env:Path += ';' + $sdk
-    makeAppx.exe pack /d "$innoDir\make_appx" /p "$innoDir\zed_explorer_command_injector.appx" /nv
-}
-
-function SignZedAndItsFriends {
-    if (-not $env:CI) {
-        return
-    }
-
-    $files = "$innoDir\Zed.exe,$innoDir\cli.exe,$innoDir\auto_update_helper.exe,$innoDir\zed_explorer_command_injector.dll,$innoDir\zed_explorer_command_injector.appx"
-    & "$innoDir\sign.ps1" $files
-}
-
-function DownloadAMDGpuServices {
-    # If you update the AGS SDK version, please also update the version in `crates/gpui/src/platform/windows/directx_renderer.rs`
-    $url = "https://codeload.github.com/GPUOpen-LibrariesAndSDKs/AGS_SDK/zip/refs/tags/v6.3.0"
-    $zipPath = ".\AGS_SDK_v6.3.0.zip"
-    # Download the AGS SDK zip file
-    Invoke-WebRequest -Uri $url -OutFile $zipPath
-    # Extract the AGS SDK zip file
-    Expand-Archive -Path $zipPath -DestinationPath "." -Force
-}
-
-function DownloadConpty {
-    $url = "https://github.com/microsoft/terminal/releases/download/v1.23.12811.0/Microsoft.Windows.Console.ConPTY.1.23.251008001.nupkg"
-    $zipPath = ".\Microsoft.Windows.Console.ConPTY.1.23.251008001.nupkg"
-    Invoke-WebRequest -Uri $url -OutFile $zipPath
-    Expand-Archive -Path $zipPath -DestinationPath ".\conpty" -Force
-}
-
-function CollectFiles {
-    Move-Item -Path "$innoDir\zed_explorer_command_injector.appx" -Destination "$innoDir\appx\zed_explorer_command_injector.appx" -Force
-    Move-Item -Path "$innoDir\zed_explorer_command_injector.dll" -Destination "$innoDir\appx\zed_explorer_command_injector.dll" -Force
-    Move-Item -Path "$innoDir\cli.exe" -Destination "$innoDir\bin\zed.exe" -Force
-    Move-Item -Path "$innoDir\zed.sh" -Destination "$innoDir\bin\zed" -Force
-    Move-Item -Path "$innoDir\auto_update_helper.exe" -Destination "$innoDir\tools\auto_update_helper.exe" -Force
-    if($Architecture -eq "aarch64") {
-        New-Item -Type Directory -Path "$innoDir\arm64" -Force
-        Move-Item -Path ".\conpty\build\native\runtimes\arm64\OpenConsole.exe" -Destination "$innoDir\arm64\OpenConsole.exe" -Force
-        Move-Item -Path ".\conpty\runtimes\win-arm64\native\conpty.dll" -Destination "$innoDir\conpty.dll" -Force
-    }
-    else {
-        New-Item -Type Directory -Path "$innoDir\x64" -Force
-        New-Item -Type Directory -Path "$innoDir\arm64" -Force
-        Move-Item -Path ".\AGS_SDK-6.3.0\ags_lib\lib\amd_ags_x64.dll" -Destination "$innoDir\amd_ags_x64.dll" -Force
-        Move-Item -Path ".\conpty\build\native\runtimes\x64\OpenConsole.exe" -Destination "$innoDir\x64\OpenConsole.exe" -Force
-        Move-Item -Path ".\conpty\build\native\runtimes\arm64\OpenConsole.exe" -Destination "$innoDir\arm64\OpenConsole.exe" -Force
-        Move-Item -Path ".\conpty\runtimes\win-x64\native\conpty.dll" -Destination "$innoDir\conpty.dll" -Force
-    }
-}
-
-function BuildInstaller {
-    $issFilePath = "$innoDir\zed.iss"
-    switch ($channel) {
-        "stable" {
-            $appId = "{{2DB0DA96-CA55-49BB-AF4F-64AF36A86712}"
-            $appIconName = "app-icon"
-            $appName = "Zed"
-            $appDisplayName = "Zed"
-            $appSetupName = "Zed-$Architecture"
-            # The mutex name here should match the mutex name in crates\zed\src\zed\windows_only_instance.rs
-            $appMutex = "Zed-Stable-Instance-Mutex"
-            $appExeName = "Zed"
-            $regValueName = "Zed"
-            $appUserId = "ZedIndustries.Zed"
-            $appShellNameShort = "Z&ed"
-            $appAppxFullName = "ZedIndustries.Zed_1.0.0.0_neutral__japxn1gcva8rg"
-        }
-        "preview" {
-            $appId = "{{F70E4811-D0E2-4D88-AC99-D63752799F95}"
-            $appIconName = "app-icon-preview"
-            $appName = "Zed Preview"
-            $appDisplayName = "Zed Preview"
-            $appSetupName = "Zed-$Architecture"
-            # The mutex name here should match the mutex name in crates\zed\src\zed\windows_only_instance.rs
-            $appMutex = "Zed-Preview-Instance-Mutex"
-            $appExeName = "Zed"
-            $regValueName = "ZedPreview"
-            $appUserId = "ZedIndustries.Zed.Preview"
-            $appShellNameShort = "Z&ed Preview"
-            $appAppxFullName = "ZedIndustries.Zed.Preview_1.0.0.0_neutral__japxn1gcva8rg"
-        }
-        "nightly" {
-            $appId = "{{1BDB21D3-14E7-433C-843C-9C97382B2FE0}"
-            $appIconName = "app-icon-nightly"
-            $appName = "Zed Nightly"
-            $appDisplayName = "Zed Nightly"
-            $appSetupName = "Zed-$Architecture"
-            # The mutex name here should match the mutex name in crates\zed\src\zed\windows_only_instance.rs
-            $appMutex = "Zed-Nightly-Instance-Mutex"
-            $appExeName = "Zed"
-            $regValueName = "ZedNightly"
-            $appUserId = "ZedIndustries.Zed.Nightly"
-            $appShellNameShort = "Z&ed Editor Nightly"
-            $appAppxFullName = "ZedIndustries.Zed.Nightly_1.0.0.0_neutral__japxn1gcva8rg"
-        }
-        "dev" {
-            $appId = "{{8357632E-24A4-4F32-BA97-E575B4D1FE5D}"
-            $appIconName = "app-icon-dev"
-            $appName = "Zed Dev"
-            $appDisplayName = "Zed Dev"
-            $appSetupName = "Zed-$Architecture"
-            # The mutex name here should match the mutex name in crates\zed\src\zed\windows_only_instance.rs
-            $appMutex = "Zed-Dev-Instance-Mutex"
-            $appExeName = "Zed"
-            $regValueName = "ZedDev"
-            $appUserId = "ZedIndustries.Zed.Dev"
-            $appShellNameShort = "Z&ed Dev"
-            $appAppxFullName = "ZedIndustries.Zed.Dev_1.0.0.0_neutral__japxn1gcva8rg"
-        }
-        default {
-            Write-Error "can't bundle installer for $channel."
-            exit 1
-        }
-    }
-
-    # Windows runner 2022 default has iscc in PATH, https://github.com/actions/runner-images/blob/main/images/windows/Windows2022-Readme.md
-    # Currently, we are using Windows 2022 runner.
-    # Windows runner 2025 doesn't have iscc in PATH for now, https://github.com/actions/runner-images/issues/11228
-    $innoSetupPath = "C:\Program Files (x86)\Inno Setup 6\ISCC.exe"
-
-    $definitions = @{
-        "AppId"          = $appId
-        "AppIconName"    = $appIconName
-        "OutputDir"      = "$env:ZED_WORKSPACE\target"
-        "AppSetupName"   = $appSetupName
-        "AppName"        = $appName
-        "AppDisplayName" = $appDisplayName
-        "RegValueName"   = $regValueName
-        "AppMutex"       = $appMutex
-        "AppExeName"     = $appExeName
-        "ResourcesDir"   = "$innoDir"
-        "ShellNameShort" = $appShellNameShort
-        "AppUserId"      = $appUserId
-        "Version"        = "$env:RELEASE_VERSION"
-        "SourceDir"      = "$env:ZED_WORKSPACE"
-        "AppxFullName"   = $appAppxFullName
-    }
-
-    $defs = @()
-    foreach ($key in $definitions.Keys) {
-        $defs += "/d$key=`"$($definitions[$key])`""
-    }
-
-    $innoArgs = @($issFilePath) + $defs
-    if($env:CI) {
-        $signTool = "powershell.exe -ExecutionPolicy Bypass -File $innoDir\sign.ps1 `$f"
-        $innoArgs += "/sDefaultsign=`"$signTool`""
-    }
-
-    # Execute Inno Setup
-    Write-Host "🚀 Running Inno Setup: $innoSetupPath $innoArgs"
-    $process = Start-Process -FilePath $innoSetupPath -ArgumentList $innoArgs -NoNewWindow -Wait -PassThru
-
-    if ($process.ExitCode -eq 0) {
-        Write-Host "✅ Inno Setup successfully compiled the installer"
-        Write-Output "SETUP_PATH=target/$appSetupName.exe" >> $env:GITHUB_ENV
-        $script:buildSuccess = $true
-    }
-    else {
-        Write-Host "❌ Inno Setup failed: $($process.ExitCode)"
-        $script:buildSuccess = $false
-    }
-}
-
-ParseZedWorkspace
-$innoDir = "$env:ZED_WORKSPACE\inno\$Architecture"
-$debugArchive = "$CargoOutDir\zed-$env:RELEASE_VERSION-$env:ZED_RELEASE_CHANNEL.dbg.zip"
-$debugStoreKey = "$env:ZED_RELEASE_CHANNEL/zed-$env:RELEASE_VERSION-$env:ZED_RELEASE_CHANNEL.dbg.zip"
-
-CheckEnvironmentVariables
-PrepareForBundle
-GenerateLicenses
-BuildZedAndItsFriends
-MakeAppx
-SignZedAndItsFriends
-ZipZedAndItsFriendsDebug
-DownloadAMDGpuServices
-DownloadConpty
-CollectFiles
-BuildInstaller
-
-if($env:CI) {
-    UploadToSentry
-}
-
-if ($buildSuccess) {
-    Write-Output "Build successful"
-    if ($Install) {
-        Write-Output "Installing Zed..."
-        Start-Process -FilePath "$env:ZED_WORKSPACE/target/ZedEditorUserSetup-x64-$env:RELEASE_VERSION.exe"
-    }
-    exit 0
-}
-else {
-    Write-Output "Build failed"
-    exit 1
-}
diff --git a/script/check-keymaps b/script/check-keymaps
deleted file mode 100755
index 44745fa8b8..0000000000
--- a/script/check-keymaps
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-pattern='cmd-'
-result=$(git grep --no-color --line-number --fixed-strings -e "$pattern" -- \
-  'assets/keymaps/' \
-  ':(exclude)assets/keymaps/storybook.json' \
-  ':(exclude)assets/keymaps/default-macos.json' \
-  ':(exclude)assets/keymaps/macos/*.json' || true)
-
-if [[ -n "${result}" ]]; then
-  echo "${result}"
-  echo "Error: Found 'cmd-' in non-macOS keymap files."
-  exit 1
-fi
-
-pattern='super-|win-|fn-'
-result=$(git grep --no-color --line-number --fixed-strings -e "$pattern" -- \
-  'assets/keymaps/' || true)
-
-if [[ -n "${result}" ]]; then
-  echo "${result}"
-  echo "Error: Found 'super-', 'win-', or 'fn-' in keymap files. Currently these aren't used."
-  exit 1
-fi
diff --git a/script/check-licenses b/script/check-licenses
deleted file mode 100755
index 0363f31970..0000000000
--- a/script/check-licenses
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-AGPL_CRATES=("collab")
-RELEASE_CRATES=("cli" "remote_server" "zed")
-
-check_license () {
-    local dir="$1"
-    local allowed_licenses=()
-
-    local is_agpl=false
-    for agpl_crate in "${AGPL_CRATES[@]}"; do
-        if [[ "$dir" == "crates/$agpl_crate" ]]; then
-            is_agpl=true
-            break
-        fi
-    done
-
-    if [[ "$is_agpl" == true ]]; then
-        allowed_licenses=("LICENSE-AGPL")
-    else
-        allowed_licenses=("LICENSE-GPL" "LICENSE-APACHE")
-    fi
-
-    for license in "${allowed_licenses[@]}"; do
-        if [[ -L "$dir/$license" ]]; then
-            return 0
-        elif [[ -e "$dir/$license" ]]; then
-            echo "Error: $dir/$license exists but is not a symlink."
-            exit 1
-        fi
-    done
-
-    if [[ "$is_agpl" == true ]]; then
-        echo "Error: $dir does not contain a LICENSE-AGPL symlink"
-    else
-        echo "Error: $dir does not contain a LICENSE-GPL or LICENSE-APACHE symlink"
-    fi
-    exit 1
-}
-
-git ls-files "**/*/Cargo.toml" | while read -r cargo_toml; do
-   check_license "$(dirname "$cargo_toml")"
-done
-
-
-# Make sure the AGPL server crates are included in the release tarball.
-for release_crate in "${RELEASE_CRATES[@]}"; do
-    tree_output=$(cargo tree --package "$release_crate")
-    for agpl_crate in "${AGPL_CRATES[@]}"; do
-        # Look for lines that contain the crate name followed by " v" (version)
-        # This matches patterns like "├── collab v0.44.0"
-        if echo "$tree_output" | grep -E "(^|[^a-zA-Z_])${agpl_crate} v" > /dev/null; then
-            echo "Error: crate '${agpl_crate}' is AGPL and is a dependency of crate '${release_crate}'." >&2
-            echo "AGPL licensed code should not be used in the release distribution, only in servers." >&2
-            exit 1
-        fi
-    done
-done
-
-echo "check-licenses succeeded"
diff --git a/script/check-links b/script/check-links
deleted file mode 100755
index 259ce1d1b9..0000000000
--- a/script/check-links
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-usage() {
-    echo "Usage: $0 [local|all] [--help]"
-    echo "  local  Only check local links (default)"
-    echo "  all    Check all links including remote ones"
-    exit 1
-}
-
-check_mode="local"
-if [ $# -eq 1 ]; then
-    case "$1" in
-    "local") check_mode="local" ;;
-    "all") check_mode="all" ;;
-    "--help") usage ;;
-    *) echo "Invalid argument: $1" && usage ;;
-    esac
-else
-    usage
-fi
-
-cargo install lychee
-cd "$(dirname "$0")/.."
-
-if [ "$check_mode" = "all" ]; then
-    lychee --no-progress './docs/src/**/*'
-else
-    lychee --exclude '^http' './docs/src/**/*'
-fi
-#
diff --git a/script/check-todos b/script/check-todos
deleted file mode 100755
index 4bdf328329..0000000000
--- a/script/check-todos
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-# Brackets are used around characters so these don't show up in normal search.
-pattern='tod[o]!|FIXM[E]'
-result=$(git grep --no-color --ignore-case --line-number --extended-regexp -e $pattern -- \
-  ':(exclude).github/workflows/ci.yml' \
-  ':(exclude)*criteria.md' \
-  ':(exclude)*prompt.md' || true)
-if [[ -n "${result}" ]]; then
-  echo "${result}"
-  exit 1
-fi
diff --git a/script/cherry-pick b/script/cherry-pick
deleted file mode 100755
index 37106943f4..0000000000
--- a/script/cherry-pick
+++ /dev/null
@@ -1,33 +0,0 @@
-# #!/bin/bash
-set -euxo pipefail
-
-if [ "$#" -ne 3 ]; then
-    echo "Usage: $0 <branch-name> <commit-sha> <channel>"
-    exit 1
-fi
-
-BRANCH_NAME="$1"
-COMMIT_SHA="$2"
-CHANNEL="$3"
-
-SHORT_SHA="${COMMIT_SHA:0:8}"
-NEW_BRANCH="cherry-pick-${BRANCH_NAME}-${SHORT_SHA}"
-git fetch --depth 2 origin +${COMMIT_SHA} ${BRANCH_NAME}
-git checkout --force "origin/$BRANCH_NAME" -B "$NEW_BRANCH"
-
-git cherry-pick "$COMMIT_SHA"
-
-git push origin -f "$NEW_BRANCH"
-COMMIT_TITLE=$(git log -1 --pretty=format:"%s" "$COMMIT_SHA")
-COMMIT_BODY=$(git log -1 --pretty=format:"%b" "$COMMIT_SHA")
-
-# Check if commit title ends with (#number)
-if [[ "$COMMIT_TITLE" =~ \(#([0-9]+)\)$ ]]; then
-    PR_NUMBER="${BASH_REMATCH[1]}"
-    PR_BODY="Cherry-pick of #${PR_NUMBER} to ${CHANNEL}"$'\n'$'\n'"----"$'\n'"${COMMIT_BODY}"
-else
-    PR_BODY="Cherry-pick of ${COMMIT_SHA} to ${CHANNEL}"$'\n'$'\n'"----"$'\n'"${COMMIT_BODY}"
-fi
-
-# Create a pull request
-gh pr create --base "$BRANCH_NAME" --head "$NEW_BRANCH" --title "$COMMIT_TITLE (cherry-pick to $CHANNEL)" --body "$PR_BODY"
diff --git a/script/clear-target-dir-if-larger-than b/script/clear-target-dir-if-larger-than
deleted file mode 100755
index 46256159a8..0000000000
--- a/script/clear-target-dir-if-larger-than
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-
-set -euxo pipefail
-
-if [[ $# -ne 1 ]]; then
-    echo "usage: $0 <MAX_SIZE_IN_GB>"
-    exit 1
-fi
-
-if ! [[ -d target ]]; then
-    echo "target directory does not exist yet"
-    exit 0
-fi
-
-max_size_gb=$1
-
-current_size=$(du -s target | cut -f1)
-current_size_gb=$(expr ${current_size} / 1024 / 1024)
-
-echo "target directory size: ${current_size_gb}gb. max size: ${max_size_gb}gb"
-
-if [[ ${current_size_gb} -gt ${max_size_gb} ]]; then
-    echo "clearing target directory"
-    shopt -s dotglob
-    rm -rf target/*
-fi
diff --git a/script/clear-target-dir-if-larger-than.ps1 b/script/clear-target-dir-if-larger-than.ps1
deleted file mode 100644
index c18c308624..0000000000
--- a/script/clear-target-dir-if-larger-than.ps1
+++ /dev/null
@@ -1,22 +0,0 @@
-param (
-    [Parameter(Mandatory = $true)]
-    [int]$MAX_SIZE_IN_GB
-)
-
-$ErrorActionPreference = "Stop"
-$PSNativeCommandUseErrorActionPreference = $true
-$ProgressPreference = "SilentlyContinue"
-
-if (-Not (Test-Path -Path "target")) {
-    Write-Host "target directory does not exist yet"
-    exit 0
-}
-
-$current_size_gb = (Get-ChildItem -Recurse -Force -File -Path "target" | Measure-Object -Property Length -Sum).Sum / 1GB
-
-Write-Host "target directory size: ${current_size_gb}GB. max size: ${MAX_SIZE_IN_GB}GB"
-
-if ($current_size_gb -gt $MAX_SIZE_IN_GB) {
-    Write-Host "clearing target directory"
-    Remove-Item -Recurse -Force -Path "target\*" -ErrorAction SilentlyContinue
-}
diff --git a/script/collab-flamegraph b/script/collab-flamegraph
deleted file mode 100755
index 058c3a9f44..0000000000
--- a/script/collab-flamegraph
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-# Notes for fixing this script if it's broken:
-# - if you see an error about "can't find perf_6.1" you need to install `linux-perf` from the
-#   version of Debian that matches the host (e.g. apt-get -t bookworm-backports install linux-perf)
-# - if you see an error about `addr2line` you may need to install binutils
-
-set -euo pipefail
-
-source script/lib/deploy-helpers.sh
-
-if [[ $# != 1 ]]; then
-  echo "Usage: $0 <production|staging>"
-  exit 1
-fi
-environment=$1
-
-target_zed_kube_cluster
-
-# 5s in production is ~200Mb..., in staging you probably want to bump this up.
-echo "Running perf on collab, collecting 5s of data..."
-
-kubectl -n $environment exec -it deployments/collab -- perf record -p 1 -g -m 64 --call-graph dwarf -- sleep 5
-
-run="collab-$environment-$(date -Iseconds)"
-echo "Processing data and downloading to '$run.perf'..."
-
-kubectl -n $environment exec -it deployments/collab -- perf --no-pager script > "$run.perf"
-
-which inferno-flamegraph 2>/dev/null || (echo "installing inferno..."; cargo install inferno)
-
-inferno-collapse-perf "$run.perf" | inferno-flamegraph > "$run.svg"
-open "./$run.svg"
diff --git a/script/crate-dep-graph b/script/crate-dep-graph
deleted file mode 100755
index 54170a9986..0000000000
--- a/script/crate-dep-graph
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-if [[ -x cargo-depgraph ]]; then
-    cargo install cargo-depgraph
-fi
-
-graph_file=target/crate-graph.html
-
-cargo depgraph \
-    --workspace-only \
-    --offline \
-    --root=zed,cli,collab \
-    --dedup-transitive-deps \
-    | dot -Tsvg > $graph_file
-
-echo "open $graph_file"
-open $graph_file
diff --git a/script/create-draft-release b/script/create-draft-release
deleted file mode 100755
index d50ebf2e5a..0000000000
--- a/script/create-draft-release
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-preview=""
-if [[ "$GITHUB_REF_NAME" == *"-pre" ]]; then
-    preview="-p"
-fi
-
-gh release view "$GITHUB_REF_NAME" ||\
-    gh release create -t "$GITHUB_REF_NAME" -d "$GITHUB_REF_NAME" -F "$1" $preview
diff --git a/script/danger/.gitignore b/script/danger/.gitignore
deleted file mode 100644
index c2658d7d1b..0000000000
--- a/script/danger/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-node_modules/
diff --git a/script/danger/dangerfile.ts b/script/danger/dangerfile.ts
deleted file mode 100644
index 88dc5c5e71..0000000000
--- a/script/danger/dangerfile.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-import { danger, message, warn, fail } from "danger";
-const { prHygiene } = require("danger-plugin-pr-hygiene");
-
-prHygiene({
-  prefixPattern: /^([a-z\d\(\)_\s]+):(.*)/g,
-  rules: {
-    // Don't enable this rule just yet, as it can have false positives.
-    useImperativeMood: "off",
-  },
-});
-
-const RELEASE_NOTES_PATTERN = /Release Notes:\r?\n\s+-/gm;
-const body = danger.github.pr.body;
-
-const hasReleaseNotes = RELEASE_NOTES_PATTERN.test(body);
-
-if (!hasReleaseNotes) {
-  warn(
-    [
-      "This PR is missing release notes.",
-      "",
-      'Please add a "Release Notes" section that describes the change:',
-      "",
-      "```",
-      "Release Notes:",
-      "",
-      "- Added/Fixed/Improved ...",
-      "```",
-      "",
-      'If your change is not user-facing, you can use "N/A" for the entry:',
-      "```",
-      "Release Notes:",
-      "",
-      "- N/A",
-      "```",
-    ].join("\n"),
-  );
-}
-
-const ISSUE_LINK_PATTERN =
-  /(?:- )?(?<!(?:Close[sd]?|Fixe[sd]|Resolve[sd]|Implement[sed]|Follow-up of|Part of):?\s+)https:\/\/github\.com\/[\w-]+\/[\w-]+\/issues\/\d+/gi;
-
-const bodyWithoutReleaseNotes = hasReleaseNotes ? body.split(/Release Notes:/)[0] : body;
-const includesIssueUrl = ISSUE_LINK_PATTERN.test(bodyWithoutReleaseNotes);
-
-if (includesIssueUrl) {
-  const matches = bodyWithoutReleaseNotes.match(ISSUE_LINK_PATTERN) ?? [];
-  const issues = matches
-    .map((match) => match.replace(/^#/, "").replace(/https:\/\/github\.com\/zed-industries\/zed\/issues\//, ""))
-    .filter((issue, index, self) => self.indexOf(issue) === index);
-
-  const issuesToReport = issues.map((issue) => `#${issue}`).join(", ");
-  message(
-    [
-      `This PR includes links to the following GitHub Issues: ${issuesToReport}`,
-      "If this PR aims to close an issue, please include a `Closes #ISSUE` line at the top of the PR body.",
-    ].join("\n"),
-  );
-}
-
-const PROMPT_PATHS = [
-  "assets/prompts/content_prompt.hbs",
-  "assets/prompts/terminal_assistant_prompt.hbs",
-  "crates/agent_settings/src/prompts/summarize_thread_detailed_prompt.txt",
-  "crates/agent_settings/src/prompts/summarize_thread_prompt.txt",
-  "crates/agent/src/templates/create_file_prompt.hbs",
-  "crates/agent/src/templates/edit_file_prompt_xml.hbs",
-  "crates/agent/src/templates/edit_file_prompt_diff_fenced.hbs",
-  "crates/git_ui/src/commit_message_prompt.txt",
-];
-
-const PROMPT_CHANGE_ATTESTATION = "I have ensured the LLM Worker works with these prompt changes.";
-
-const modifiedPrompts = danger.git.modified_files.filter((file) =>
-  PROMPT_PATHS.some((promptPath) => file.includes(promptPath)),
-);
-
-for (const promptPath of modifiedPrompts) {
-  if (body.includes(PROMPT_CHANGE_ATTESTATION)) {
-    message(
-      [
-        `This PR contains changes to "${promptPath}".`,
-        "The author has attested the LLM Worker works with the changes to this prompt.",
-      ].join("\n"),
-    );
-  } else {
-    fail(
-      [
-        `Modifying the "${promptPath}" prompt may require corresponding changes in the LLM Worker.`,
-        "If you are ensure what this entails, talk to @maxdeviant or another AI team member.",
-        `Once you have made the changes—or determined that none are necessary—add "${PROMPT_CHANGE_ATTESTATION}" to the PR description.`,
-      ].join("\n"),
-    );
-  }
-}
-
-const FIXTURE_CHANGE_ATTESTATION = "Changes to test fixtures are intentional and necessary.";
-
-const FIXTURES_PATHS = ["crates/assistant_tools/src/edit_agent/evals/fixtures"];
-
-const modifiedFixtures = danger.git.modified_files.filter((file) =>
-  FIXTURES_PATHS.some((fixturePath) => file.includes(fixturePath)),
-);
-
-if (modifiedFixtures.length > 0) {
-  if (!body.includes(FIXTURE_CHANGE_ATTESTATION)) {
-    const modifiedFixturesStr = modifiedFixtures.map((path) => "`" + path + "`").join(", ");
-    fail(
-      [
-        `This PR modifies eval or test fixtures (${modifiedFixturesStr}), which are typically expected to remain unchanged.`,
-        "If these changes are intentional and required, please add the following attestation to your PR description: ",
-        `"${FIXTURE_CHANGE_ATTESTATION}"`,
-      ].join("\n\n"),
-    );
-  }
-}
diff --git a/script/danger/package.json b/script/danger/package.json
deleted file mode 100644
index eaa1035e89..0000000000
--- a/script/danger/package.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "name": "danger",
-  "version": "1.0.0",
-  "private": true,
-  "main": "index.js",
-  "scripts": {
-    "danger": "danger"
-  },
-  "devDependencies": {
-    "danger": "13.0.4",
-    "danger-plugin-pr-hygiene": "0.6.1"
-  }
-}
diff --git a/script/danger/pnpm-lock.yaml b/script/danger/pnpm-lock.yaml
deleted file mode 100644
index fd6b3f66ac..0000000000
--- a/script/danger/pnpm-lock.yaml
+++ /dev/null
@@ -1,884 +0,0 @@
-lockfileVersion: '9.0'
-
-settings:
-  autoInstallPeers: true
-  excludeLinksFromLockfile: false
-
-importers:
-
-  .:
-    devDependencies:
-      danger:
-        specifier: 13.0.4
-        version: 13.0.4
-      danger-plugin-pr-hygiene:
-        specifier: 0.6.1
-        version: 0.6.1
-
-packages:
-
-  '@gitbeaker/core@38.12.1':
-    resolution: {integrity: sha512-8XMVcBIdVAAoxn7JtqmZ2Ee8f+AZLcCPmqEmPFOXY2jPS84y/DERISg/+sbhhb18iRy+ZsZhpWgQ/r3CkYNJOQ==}
-    engines: {node: '>=18.0.0'}
-
-  '@gitbeaker/requester-utils@38.12.1':
-    resolution: {integrity: sha512-Rc/DgngS0YPN+AY1s9UnexKSy4Lh0bkQVAq9p7PRbRpXb33SlTeCg8eg/8+A/mrMcHgYmP0XhH8lkizyA5tBUQ==}
-    engines: {node: '>=18.0.0'}
-
-  '@gitbeaker/rest@38.12.1':
-    resolution: {integrity: sha512-9KMSDtJ/sIov+5pcH+CAfiJXSiuYgN0KLKQFg0HHWR2DwcjGYkcbmhoZcWsaOWOqq4kihN1l7wX91UoRxxKKTQ==}
-    engines: {node: '>=18.0.0'}
-
-  '@octokit/auth-token@4.0.0':
-    resolution: {integrity: sha512-tY/msAuJo6ARbK6SPIxZrPBms3xPbfwBrulZe0Wtr/DIY9lje2HeV1uoebShn6mx7SjCHif6EjMvoREj+gZ+SA==}
-    engines: {node: '>= 18'}
-
-  '@octokit/core@5.2.2':
-    resolution: {integrity: sha512-/g2d4sW9nUDJOMz3mabVQvOGhVa4e/BN/Um7yca9Bb2XTzPPnfTWHWQg+IsEYO7M3Vx+EXvaM/I2pJWIMun1bg==}
-    engines: {node: '>= 18'}
-
-  '@octokit/endpoint@9.0.6':
-    resolution: {integrity: sha512-H1fNTMA57HbkFESSt3Y9+FBICv+0jFceJFPWDePYlR/iMGrwM5ph+Dd4XRQs+8X+PUFURLQgX9ChPfhJ/1uNQw==}
-    engines: {node: '>= 18'}
-
-  '@octokit/graphql@7.1.1':
-    resolution: {integrity: sha512-3mkDltSfcDUoa176nlGoA32RGjeWjl3K7F/BwHwRMJUW/IteSa4bnSV8p2ThNkcIcZU2umkZWxwETSSCJf2Q7g==}
-    engines: {node: '>= 18'}
-
-  '@octokit/openapi-types@24.2.0':
-    resolution: {integrity: sha512-9sIH3nSUttelJSXUrmGzl7QUBFul0/mB8HRYl3fOlgHbIWG+WnYDXU3v/2zMtAvuzZ/ed00Ei6on975FhBfzrg==}
-
-  '@octokit/plugin-paginate-rest@11.4.4-cjs.2':
-    resolution: {integrity: sha512-2dK6z8fhs8lla5PaOTgqfCGBxgAv/le+EhPs27KklPhm1bKObpu6lXzwfUEQ16ajXzqNrKMujsFyo9K2eaoISw==}
-    engines: {node: '>= 18'}
-    peerDependencies:
-      '@octokit/core': '5'
-
-  '@octokit/plugin-request-log@4.0.1':
-    resolution: {integrity: sha512-GihNqNpGHorUrO7Qa9JbAl0dbLnqJVrV8OXe2Zm5/Y4wFkZQDfTreBzVmiRfJVfE4mClXdihHnbpyyO9FSX4HA==}
-    engines: {node: '>= 18'}
-    peerDependencies:
-      '@octokit/core': '5'
-
-  '@octokit/plugin-rest-endpoint-methods@13.3.2-cjs.1':
-    resolution: {integrity: sha512-VUjIjOOvF2oELQmiFpWA1aOPdawpyaCUqcEBc/UOUnj3Xp6DJGrJ1+bjUIIDzdHjnFNO6q57ODMfdEZnoBkCwQ==}
-    engines: {node: '>= 18'}
-    peerDependencies:
-      '@octokit/core': ^5
-
-  '@octokit/request-error@5.1.1':
-    resolution: {integrity: sha512-v9iyEQJH6ZntoENr9/yXxjuezh4My67CBSu9r6Ve/05Iu5gNgnisNWOsoJHTP6k0Rr0+HQIpnH+kyammu90q/g==}
-    engines: {node: '>= 18'}
-
-  '@octokit/request@8.4.1':
-    resolution: {integrity: sha512-qnB2+SY3hkCmBxZsR/MPCybNmbJe4KAlfWErXq+rBKkQJlbjdJeS85VI9r8UqeLYLvnAenU8Q1okM/0MBsAGXw==}
-    engines: {node: '>= 18'}
-
-  '@octokit/rest@20.1.2':
-    resolution: {integrity: sha512-GmYiltypkHHtihFwPRxlaorG5R9VAHuk/vbszVoRTGXnAsY60wYLkh/E2XiFmdZmqrisw+9FaazS1i5SbdWYgA==}
-    engines: {node: '>= 18'}
-
-  '@octokit/types@13.10.0':
-    resolution: {integrity: sha512-ifLaO34EbbPj0Xgro4G5lP5asESjwHracYJvVaPIyXMuiuXLlhic3S47cBdTb+jfODkTE5YtGCLt3Ay3+J97sA==}
-
-  '@tootallnate/once@2.0.0':
-    resolution: {integrity: sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==}
-    engines: {node: '>= 10'}
-
-  agent-base@6.0.2:
-    resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==}
-    engines: {node: '>= 6.0.0'}
-
-  ansi-styles@3.2.1:
-    resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==}
-    engines: {node: '>=4'}
-
-  async-retry@1.2.3:
-    resolution: {integrity: sha512-tfDb02Th6CE6pJUF2gjW5ZVjsgwlucVXOEQMvEX9JgSJMs9gAX+Nz3xRuJBKuUYjTSYORqvDBORdAQ3LU59g7Q==}
-
-  before-after-hook@2.2.3:
-    resolution: {integrity: sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==}
-
-  braces@3.0.3:
-    resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
-    engines: {node: '>=8'}
-
-  buffer-equal-constant-time@1.0.1:
-    resolution: {integrity: sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==}
-
-  call-bind-apply-helpers@1.0.2:
-    resolution: {integrity: sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==}
-    engines: {node: '>= 0.4'}
-
-  call-bound@1.0.4:
-    resolution: {integrity: sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==}
-    engines: {node: '>= 0.4'}
-
-  chalk@2.4.2:
-    resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==}
-    engines: {node: '>=4'}
-
-  color-convert@1.9.3:
-    resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==}
-
-  color-name@1.1.3:
-    resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==}
-
-  colors@1.4.0:
-    resolution: {integrity: sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==}
-    engines: {node: '>=0.1.90'}
-
-  commander@2.20.3:
-    resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==}
-
-  core-js@3.45.1:
-    resolution: {integrity: sha512-L4NPsJlCfZsPeXukyzHFlg/i7IIVwHSItR0wg0FLNqYClJ4MQYTYLbC7EkjKYRLZF2iof2MUgN0EGy7MdQFChg==}
-
-  danger-plugin-pr-hygiene@0.6.1:
-    resolution: {integrity: sha512-nb+iUQvirE3BlKXI1WoOND6sujyGzHar590mJm5tt4RLi65HXFaU5hqONxgDoWFujJNHYnXse9yaZdxnxEi4QA==}
-
-  danger@13.0.4:
-    resolution: {integrity: sha512-IAdQ5nSJyIs4zKj6AN35ixt2B0Ce3WZUm3IFe/CMnL/Op7wV7IGg4D348U0EKNaNPP58QgXbdSk9pM+IXP1QXg==}
-    engines: {node: '>=18'}
-    hasBin: true
-
-  debug@4.4.1:
-    resolution: {integrity: sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==}
-    engines: {node: '>=6.0'}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
-
-  deprecation@2.3.1:
-    resolution: {integrity: sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==}
-
-  dunder-proto@1.0.1:
-    resolution: {integrity: sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==}
-    engines: {node: '>= 0.4'}
-
-  ecdsa-sig-formatter@1.0.11:
-    resolution: {integrity: sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==}
-
-  es-define-property@1.0.1:
-    resolution: {integrity: sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==}
-    engines: {node: '>= 0.4'}
-
-  es-errors@1.3.0:
-    resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==}
-    engines: {node: '>= 0.4'}
-
-  es-object-atoms@1.1.1:
-    resolution: {integrity: sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==}
-    engines: {node: '>= 0.4'}
-
-  escape-string-regexp@1.0.5:
-    resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==}
-    engines: {node: '>=0.8.0'}
-
-  fast-json-patch@3.1.1:
-    resolution: {integrity: sha512-vf6IHUX2SBcA+5/+4883dsIjpBTqmfBjmYiWK1savxQmFk4JfBMLa7ynTYOs1Rolp/T1betJxHiGD3g1Mn8lUQ==}
-
-  fill-range@7.1.1:
-    resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==}
-    engines: {node: '>=8'}
-
-  function-bind@1.1.2:
-    resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==}
-
-  get-intrinsic@1.3.0:
-    resolution: {integrity: sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==}
-    engines: {node: '>= 0.4'}
-
-  get-proto@1.0.1:
-    resolution: {integrity: sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==}
-    engines: {node: '>= 0.4'}
-
-  get-stdin@6.0.0:
-    resolution: {integrity: sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==}
-    engines: {node: '>=4'}
-
-  gopd@1.2.0:
-    resolution: {integrity: sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==}
-    engines: {node: '>= 0.4'}
-
-  has-flag@2.0.0:
-    resolution: {integrity: sha512-P+1n3MnwjR/Epg9BBo1KT8qbye2g2Ou4sFumihwt6I4tsUX7jnLcX4BTOSKg/B1ZrIYMN9FcEnG4x5a7NB8Eng==}
-    engines: {node: '>=0.10.0'}
-
-  has-flag@3.0.0:
-    resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==}
-    engines: {node: '>=4'}
-
-  has-symbols@1.1.0:
-    resolution: {integrity: sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==}
-    engines: {node: '>= 0.4'}
-
-  hasown@2.0.2:
-    resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==}
-    engines: {node: '>= 0.4'}
-
-  http-proxy-agent@5.0.0:
-    resolution: {integrity: sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==}
-    engines: {node: '>= 6'}
-
-  https-proxy-agent@5.0.1:
-    resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==}
-    engines: {node: '>= 6'}
-
-  hyperlinker@1.0.0:
-    resolution: {integrity: sha512-Ty8UblRWFEcfSuIaajM34LdPXIhbs1ajEX/BBPv24J+enSVaEVY63xQ6lTO9VRYS5LAoghIG0IDJ+p+IPzKUQQ==}
-    engines: {node: '>=4'}
-
-  ini@5.0.0:
-    resolution: {integrity: sha512-+N0ngpO3e7cRUWOJAS7qw0IZIVc6XPrW4MlFBdD066F2L4k1L6ker3hLqSq7iXxU5tgS4WGkIUElWn5vogAEnw==}
-    engines: {node: ^18.17.0 || >=20.5.0}
-
-  is-number@7.0.0:
-    resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
-    engines: {node: '>=0.12.0'}
-
-  json5@2.2.3:
-    resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==}
-    engines: {node: '>=6'}
-    hasBin: true
-
-  jsonpointer@5.0.1:
-    resolution: {integrity: sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==}
-    engines: {node: '>=0.10.0'}
-
-  jsonwebtoken@9.0.2:
-    resolution: {integrity: sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==}
-    engines: {node: '>=12', npm: '>=6'}
-
-  jwa@1.4.2:
-    resolution: {integrity: sha512-eeH5JO+21J78qMvTIDdBXidBd6nG2kZjg5Ohz/1fpa28Z4CcsWUzJ1ZZyFq/3z3N17aZy+ZuBoHljASbL1WfOw==}
-
-  jws@3.2.2:
-    resolution: {integrity: sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==}
-
-  lodash.find@4.6.0:
-    resolution: {integrity: sha512-yaRZoAV3Xq28F1iafWN1+a0rflOej93l1DQUejs3SZ41h2O9UJBoS9aueGjPDgAl4B6tPC0NuuchLKaDQQ3Isg==}
-
-  lodash.includes@4.3.0:
-    resolution: {integrity: sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==}
-
-  lodash.isboolean@3.0.3:
-    resolution: {integrity: sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==}
-
-  lodash.isinteger@4.0.4:
-    resolution: {integrity: sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==}
-
-  lodash.isnumber@3.0.3:
-    resolution: {integrity: sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==}
-
-  lodash.isobject@3.0.2:
-    resolution: {integrity: sha512-3/Qptq2vr7WeJbB4KHUSKlq8Pl7ASXi3UG6CMbBm8WRtXi8+GHm7mKaU3urfpSEzWe2wCIChs6/sdocUsTKJiA==}
-
-  lodash.isplainobject@4.0.6:
-    resolution: {integrity: sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==}
-
-  lodash.isstring@4.0.1:
-    resolution: {integrity: sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==}
-
-  lodash.keys@4.2.0:
-    resolution: {integrity: sha512-J79MkJcp7Df5mizHiVNpjoHXLi4HLjh9VLS/M7lQSGoQ+0oQ+lWEigREkqKyizPB1IawvQLLKY8mzEcm1tkyxQ==}
-
-  lodash.mapvalues@4.6.0:
-    resolution: {integrity: sha512-JPFqXFeZQ7BfS00H58kClY7SPVeHertPE0lNuCyZ26/XlN8TvakYD7b9bGyNmXbT/D3BbtPAAmq90gPWqLkxlQ==}
-
-  lodash.memoize@4.1.2:
-    resolution: {integrity: sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==}
-
-  lodash.once@4.1.1:
-    resolution: {integrity: sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==}
-
-  math-intrinsics@1.1.0:
-    resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==}
-    engines: {node: '>= 0.4'}
-
-  memfs-or-file-map-to-github-branch@1.3.0:
-    resolution: {integrity: sha512-AzgIEodmt51dgwB3TmihTf1Fh2SmszdZskC6trFHy4v71R5shLmdjJSYI7ocVfFa7C/TE6ncb0OZ9eBg2rmkBQ==}
-
-  micromatch@4.0.8:
-    resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==}
-    engines: {node: '>=8.6'}
-
-  minimist@1.2.8:
-    resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
-
-  ms@2.1.3:
-    resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
-
-  node-cleanup@2.1.2:
-    resolution: {integrity: sha512-qN8v/s2PAJwGUtr1/hYTpNKlD6Y9rc4p8KSmJXyGdYGZsDGKXrGThikLFP9OCHFeLeEpQzPwiAtdIvBLqm//Hw==}
-
-  node-fetch@2.7.0:
-    resolution: {integrity: sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==}
-    engines: {node: 4.x || >=6.0.0}
-    peerDependencies:
-      encoding: ^0.1.0
-    peerDependenciesMeta:
-      encoding:
-        optional: true
-
-  object-inspect@1.13.4:
-    resolution: {integrity: sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==}
-    engines: {node: '>= 0.4'}
-
-  once@1.4.0:
-    resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
-
-  override-require@1.1.1:
-    resolution: {integrity: sha512-eoJ9YWxFcXbrn2U8FKT6RV+/Kj7fiGAB1VvHzbYKt8xM5ZuKZgCGvnHzDxmreEjcBH28ejg5MiOH4iyY1mQnkg==}
-
-  p-limit@2.3.0:
-    resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==}
-    engines: {node: '>=6'}
-
-  p-try@2.2.0:
-    resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}
-    engines: {node: '>=6'}
-
-  parse-diff@0.7.1:
-    resolution: {integrity: sha512-1j3l8IKcy4yRK2W4o9EYvJLSzpAVwz4DXqCewYyx2vEwk2gcf3DBPqc8Fj4XV3K33OYJ08A8fWwyu/ykD/HUSg==}
-
-  parse-github-url@1.0.3:
-    resolution: {integrity: sha512-tfalY5/4SqGaV/GIGzWyHnFjlpTPTNpENR9Ea2lLldSJ8EWXMsvacWucqY3m3I4YPtas15IxTLQVQ5NSYXPrww==}
-    engines: {node: '>= 0.10'}
-    hasBin: true
-
-  parse-link-header@2.0.0:
-    resolution: {integrity: sha512-xjU87V0VyHZybn2RrCX5TIFGxTVZE6zqqZWMPlIKiSKuWh/X5WZdt+w1Ki1nXB+8L/KtL+nZ4iq+sfI6MrhhMw==}
-
-  picomatch@2.3.1:
-    resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
-    engines: {node: '>=8.6'}
-
-  pinpoint@1.1.0:
-    resolution: {integrity: sha512-+04FTD9x7Cls2rihLlo57QDCcHoLBGn5Dk51SwtFBWkUWLxZaBXyNVpCw1S+atvE7GmnFjeaRZ0WLq3UYuqAdg==}
-
-  prettyjson@1.2.5:
-    resolution: {integrity: sha512-rksPWtoZb2ZpT5OVgtmy0KHVM+Dca3iVwWY9ifwhcexfjebtgjg3wmrUt9PvJ59XIYBcknQeYHD8IAnVlh9lAw==}
-    hasBin: true
-
-  qs@6.14.0:
-    resolution: {integrity: sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==}
-    engines: {node: '>=0.6'}
-
-  readline-sync@1.4.10:
-    resolution: {integrity: sha512-gNva8/6UAe8QYepIQH/jQ2qn91Qj0B9sYjMBBs3QOB8F2CXcKgLxQaJRP76sWVRQt+QU+8fAkCbCvjjMFu7Ycw==}
-    engines: {node: '>= 0.8.0'}
-
-  regenerator-runtime@0.13.11:
-    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
-
-  require-from-string@2.0.2:
-    resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
-    engines: {node: '>=0.10.0'}
-
-  retry@0.12.0:
-    resolution: {integrity: sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==}
-    engines: {node: '>= 4'}
-
-  safe-buffer@5.2.1:
-    resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
-
-  semver@7.7.2:
-    resolution: {integrity: sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==}
-    engines: {node: '>=10'}
-    hasBin: true
-
-  side-channel-list@1.0.0:
-    resolution: {integrity: sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==}
-    engines: {node: '>= 0.4'}
-
-  side-channel-map@1.0.1:
-    resolution: {integrity: sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==}
-    engines: {node: '>= 0.4'}
-
-  side-channel-weakmap@1.0.2:
-    resolution: {integrity: sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==}
-    engines: {node: '>= 0.4'}
-
-  side-channel@1.1.0:
-    resolution: {integrity: sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==}
-    engines: {node: '>= 0.4'}
-
-  supports-color@5.5.0:
-    resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==}
-    engines: {node: '>=4'}
-
-  supports-hyperlinks@1.0.1:
-    resolution: {integrity: sha512-HHi5kVSefKaJkGYXbDuKbUGRVxqnWGn3J2e39CYcNJEfWciGq2zYtOhXLTlvrOZW1QU7VX67w7fMmWafHX9Pfw==}
-    engines: {node: '>=4'}
-
-  to-regex-range@5.0.1:
-    resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
-    engines: {node: '>=8.0'}
-
-  tr46@0.0.3:
-    resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
-
-  universal-user-agent@6.0.1:
-    resolution: {integrity: sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ==}
-
-  webidl-conversions@3.0.1:
-    resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
-
-  whatwg-url@5.0.0:
-    resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==}
-
-  wrappy@1.0.2:
-    resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
-
-  xcase@2.0.1:
-    resolution: {integrity: sha512-UmFXIPU+9Eg3E9m/728Bii0lAIuoc+6nbrNUKaRPJOFp91ih44qqGlWtxMB6kXFrRD6po+86ksHM5XHCfk6iPw==}
-
-  xtend@4.0.2:
-    resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==}
-    engines: {node: '>=0.4'}
-
-snapshots:
-
-  '@gitbeaker/core@38.12.1':
-    dependencies:
-      '@gitbeaker/requester-utils': 38.12.1
-      qs: 6.14.0
-      xcase: 2.0.1
-
-  '@gitbeaker/requester-utils@38.12.1':
-    dependencies:
-      qs: 6.14.0
-      xcase: 2.0.1
-
-  '@gitbeaker/rest@38.12.1':
-    dependencies:
-      '@gitbeaker/core': 38.12.1
-      '@gitbeaker/requester-utils': 38.12.1
-
-  '@octokit/auth-token@4.0.0': {}
-
-  '@octokit/core@5.2.2':
-    dependencies:
-      '@octokit/auth-token': 4.0.0
-      '@octokit/graphql': 7.1.1
-      '@octokit/request': 8.4.1
-      '@octokit/request-error': 5.1.1
-      '@octokit/types': 13.10.0
-      before-after-hook: 2.2.3
-      universal-user-agent: 6.0.1
-
-  '@octokit/endpoint@9.0.6':
-    dependencies:
-      '@octokit/types': 13.10.0
-      universal-user-agent: 6.0.1
-
-  '@octokit/graphql@7.1.1':
-    dependencies:
-      '@octokit/request': 8.4.1
-      '@octokit/types': 13.10.0
-      universal-user-agent: 6.0.1
-
-  '@octokit/openapi-types@24.2.0': {}
-
-  '@octokit/plugin-paginate-rest@11.4.4-cjs.2(@octokit/core@5.2.2)':
-    dependencies:
-      '@octokit/core': 5.2.2
-      '@octokit/types': 13.10.0
-
-  '@octokit/plugin-request-log@4.0.1(@octokit/core@5.2.2)':
-    dependencies:
-      '@octokit/core': 5.2.2
-
-  '@octokit/plugin-rest-endpoint-methods@13.3.2-cjs.1(@octokit/core@5.2.2)':
-    dependencies:
-      '@octokit/core': 5.2.2
-      '@octokit/types': 13.10.0
-
-  '@octokit/request-error@5.1.1':
-    dependencies:
-      '@octokit/types': 13.10.0
-      deprecation: 2.3.1
-      once: 1.4.0
-
-  '@octokit/request@8.4.1':
-    dependencies:
-      '@octokit/endpoint': 9.0.6
-      '@octokit/request-error': 5.1.1
-      '@octokit/types': 13.10.0
-      universal-user-agent: 6.0.1
-
-  '@octokit/rest@20.1.2':
-    dependencies:
-      '@octokit/core': 5.2.2
-      '@octokit/plugin-paginate-rest': 11.4.4-cjs.2(@octokit/core@5.2.2)
-      '@octokit/plugin-request-log': 4.0.1(@octokit/core@5.2.2)
-      '@octokit/plugin-rest-endpoint-methods': 13.3.2-cjs.1(@octokit/core@5.2.2)
-
-  '@octokit/types@13.10.0':
-    dependencies:
-      '@octokit/openapi-types': 24.2.0
-
-  '@tootallnate/once@2.0.0': {}
-
-  agent-base@6.0.2:
-    dependencies:
-      debug: 4.4.1
-    transitivePeerDependencies:
-      - supports-color
-
-  ansi-styles@3.2.1:
-    dependencies:
-      color-convert: 1.9.3
-
-  async-retry@1.2.3:
-    dependencies:
-      retry: 0.12.0
-
-  before-after-hook@2.2.3: {}
-
-  braces@3.0.3:
-    dependencies:
-      fill-range: 7.1.1
-
-  buffer-equal-constant-time@1.0.1: {}
-
-  call-bind-apply-helpers@1.0.2:
-    dependencies:
-      es-errors: 1.3.0
-      function-bind: 1.1.2
-
-  call-bound@1.0.4:
-    dependencies:
-      call-bind-apply-helpers: 1.0.2
-      get-intrinsic: 1.3.0
-
-  chalk@2.4.2:
-    dependencies:
-      ansi-styles: 3.2.1
-      escape-string-regexp: 1.0.5
-      supports-color: 5.5.0
-
-  color-convert@1.9.3:
-    dependencies:
-      color-name: 1.1.3
-
-  color-name@1.1.3: {}
-
-  colors@1.4.0: {}
-
-  commander@2.20.3: {}
-
-  core-js@3.45.1: {}
-
-  danger-plugin-pr-hygiene@0.6.1: {}
-
-  danger@13.0.4:
-    dependencies:
-      '@gitbeaker/rest': 38.12.1
-      '@octokit/rest': 20.1.2
-      async-retry: 1.2.3
-      chalk: 2.4.2
-      commander: 2.20.3
-      core-js: 3.45.1
-      debug: 4.4.1
-      fast-json-patch: 3.1.1
-      get-stdin: 6.0.0
-      http-proxy-agent: 5.0.0
-      https-proxy-agent: 5.0.1
-      hyperlinker: 1.0.0
-      ini: 5.0.0
-      json5: 2.2.3
-      jsonpointer: 5.0.1
-      jsonwebtoken: 9.0.2
-      lodash.find: 4.6.0
-      lodash.includes: 4.3.0
-      lodash.isobject: 3.0.2
-      lodash.keys: 4.2.0
-      lodash.mapvalues: 4.6.0
-      lodash.memoize: 4.1.2
-      memfs-or-file-map-to-github-branch: 1.3.0
-      micromatch: 4.0.8
-      node-cleanup: 2.1.2
-      node-fetch: 2.7.0
-      override-require: 1.1.1
-      p-limit: 2.3.0
-      parse-diff: 0.7.1
-      parse-github-url: 1.0.3
-      parse-link-header: 2.0.0
-      pinpoint: 1.1.0
-      prettyjson: 1.2.5
-      readline-sync: 1.4.10
-      regenerator-runtime: 0.13.11
-      require-from-string: 2.0.2
-      supports-hyperlinks: 1.0.1
-    transitivePeerDependencies:
-      - encoding
-      - supports-color
-
-  debug@4.4.1:
-    dependencies:
-      ms: 2.1.3
-
-  deprecation@2.3.1: {}
-
-  dunder-proto@1.0.1:
-    dependencies:
-      call-bind-apply-helpers: 1.0.2
-      es-errors: 1.3.0
-      gopd: 1.2.0
-
-  ecdsa-sig-formatter@1.0.11:
-    dependencies:
-      safe-buffer: 5.2.1
-
-  es-define-property@1.0.1: {}
-
-  es-errors@1.3.0: {}
-
-  es-object-atoms@1.1.1:
-    dependencies:
-      es-errors: 1.3.0
-
-  escape-string-regexp@1.0.5: {}
-
-  fast-json-patch@3.1.1: {}
-
-  fill-range@7.1.1:
-    dependencies:
-      to-regex-range: 5.0.1
-
-  function-bind@1.1.2: {}
-
-  get-intrinsic@1.3.0:
-    dependencies:
-      call-bind-apply-helpers: 1.0.2
-      es-define-property: 1.0.1
-      es-errors: 1.3.0
-      es-object-atoms: 1.1.1
-      function-bind: 1.1.2
-      get-proto: 1.0.1
-      gopd: 1.2.0
-      has-symbols: 1.1.0
-      hasown: 2.0.2
-      math-intrinsics: 1.1.0
-
-  get-proto@1.0.1:
-    dependencies:
-      dunder-proto: 1.0.1
-      es-object-atoms: 1.1.1
-
-  get-stdin@6.0.0: {}
-
-  gopd@1.2.0: {}
-
-  has-flag@2.0.0: {}
-
-  has-flag@3.0.0: {}
-
-  has-symbols@1.1.0: {}
-
-  hasown@2.0.2:
-    dependencies:
-      function-bind: 1.1.2
-
-  http-proxy-agent@5.0.0:
-    dependencies:
-      '@tootallnate/once': 2.0.0
-      agent-base: 6.0.2
-      debug: 4.4.1
-    transitivePeerDependencies:
-      - supports-color
-
-  https-proxy-agent@5.0.1:
-    dependencies:
-      agent-base: 6.0.2
-      debug: 4.4.1
-    transitivePeerDependencies:
-      - supports-color
-
-  hyperlinker@1.0.0: {}
-
-  ini@5.0.0: {}
-
-  is-number@7.0.0: {}
-
-  json5@2.2.3: {}
-
-  jsonpointer@5.0.1: {}
-
-  jsonwebtoken@9.0.2:
-    dependencies:
-      jws: 3.2.2
-      lodash.includes: 4.3.0
-      lodash.isboolean: 3.0.3
-      lodash.isinteger: 4.0.4
-      lodash.isnumber: 3.0.3
-      lodash.isplainobject: 4.0.6
-      lodash.isstring: 4.0.1
-      lodash.once: 4.1.1
-      ms: 2.1.3
-      semver: 7.7.2
-
-  jwa@1.4.2:
-    dependencies:
-      buffer-equal-constant-time: 1.0.1
-      ecdsa-sig-formatter: 1.0.11
-      safe-buffer: 5.2.1
-
-  jws@3.2.2:
-    dependencies:
-      jwa: 1.4.2
-      safe-buffer: 5.2.1
-
-  lodash.find@4.6.0: {}
-
-  lodash.includes@4.3.0: {}
-
-  lodash.isboolean@3.0.3: {}
-
-  lodash.isinteger@4.0.4: {}
-
-  lodash.isnumber@3.0.3: {}
-
-  lodash.isobject@3.0.2: {}
-
-  lodash.isplainobject@4.0.6: {}
-
-  lodash.isstring@4.0.1: {}
-
-  lodash.keys@4.2.0: {}
-
-  lodash.mapvalues@4.6.0: {}
-
-  lodash.memoize@4.1.2: {}
-
-  lodash.once@4.1.1: {}
-
-  math-intrinsics@1.1.0: {}
-
-  memfs-or-file-map-to-github-branch@1.3.0:
-    dependencies:
-      '@octokit/rest': 20.1.2
-
-  micromatch@4.0.8:
-    dependencies:
-      braces: 3.0.3
-      picomatch: 2.3.1
-
-  minimist@1.2.8: {}
-
-  ms@2.1.3: {}
-
-  node-cleanup@2.1.2: {}
-
-  node-fetch@2.7.0:
-    dependencies:
-      whatwg-url: 5.0.0
-
-  object-inspect@1.13.4: {}
-
-  once@1.4.0:
-    dependencies:
-      wrappy: 1.0.2
-
-  override-require@1.1.1: {}
-
-  p-limit@2.3.0:
-    dependencies:
-      p-try: 2.2.0
-
-  p-try@2.2.0: {}
-
-  parse-diff@0.7.1: {}
-
-  parse-github-url@1.0.3: {}
-
-  parse-link-header@2.0.0:
-    dependencies:
-      xtend: 4.0.2
-
-  picomatch@2.3.1: {}
-
-  pinpoint@1.1.0: {}
-
-  prettyjson@1.2.5:
-    dependencies:
-      colors: 1.4.0
-      minimist: 1.2.8
-
-  qs@6.14.0:
-    dependencies:
-      side-channel: 1.1.0
-
-  readline-sync@1.4.10: {}
-
-  regenerator-runtime@0.13.11: {}
-
-  require-from-string@2.0.2: {}
-
-  retry@0.12.0: {}
-
-  safe-buffer@5.2.1: {}
-
-  semver@7.7.2: {}
-
-  side-channel-list@1.0.0:
-    dependencies:
-      es-errors: 1.3.0
-      object-inspect: 1.13.4
-
-  side-channel-map@1.0.1:
-    dependencies:
-      call-bound: 1.0.4
-      es-errors: 1.3.0
-      get-intrinsic: 1.3.0
-      object-inspect: 1.13.4
-
-  side-channel-weakmap@1.0.2:
-    dependencies:
-      call-bound: 1.0.4
-      es-errors: 1.3.0
-      get-intrinsic: 1.3.0
-      object-inspect: 1.13.4
-      side-channel-map: 1.0.1
-
-  side-channel@1.1.0:
-    dependencies:
-      es-errors: 1.3.0
-      object-inspect: 1.13.4
-      side-channel-list: 1.0.0
-      side-channel-map: 1.0.1
-      side-channel-weakmap: 1.0.2
-
-  supports-color@5.5.0:
-    dependencies:
-      has-flag: 3.0.0
-
-  supports-hyperlinks@1.0.1:
-    dependencies:
-      has-flag: 2.0.0
-      supports-color: 5.5.0
-
-  to-regex-range@5.0.1:
-    dependencies:
-      is-number: 7.0.0
-
-  tr46@0.0.3: {}
-
-  universal-user-agent@6.0.1: {}
-
-  webidl-conversions@3.0.1: {}
-
-  whatwg-url@5.0.0:
-    dependencies:
-      tr46: 0.0.3
-      webidl-conversions: 3.0.1
-
-  wrappy@1.0.2: {}
-
-  xcase@2.0.1: {}
-
-  xtend@4.0.2: {}
diff --git a/script/debug-cli b/script/debug-cli
deleted file mode 100755
index 65017cd456..0000000000
--- a/script/debug-cli
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-cargo build -p zed && cargo run -p cli -- --foreground --zed=${CARGO_TARGET_DIR:-target}/debug/zed "$@"
diff --git a/script/deploy-collab b/script/deploy-collab
deleted file mode 100755
index f9006fd700..0000000000
--- a/script/deploy-collab
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-
-set -eu
-source script/lib/deploy-helpers.sh
-
-if [[ $# != 1 ]]; then
-  echo "Usage: $0 <production|staging>"
-  exit 1
-fi
-environment=$1
-tag="$(tag_for_environment $environment)"
-
-branch=$(git rev-parse --abbrev-ref HEAD)
-if [ "$branch" != "main" ]; then
-  echo "You must be on main to run this script"
-  exit 1
-fi
-
-git pull --ff-only origin main
-git tag -f $tag
-git push -f origin $tag
diff --git a/script/determine-release-channel b/script/determine-release-channel
deleted file mode 100755
index 5545cdd909..0000000000
--- a/script/determine-release-channel
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-if [ -z "${GITHUB_ACTIONS-}" ]; then
-    echo "Error: This script must be run in a GitHub Actions environment"
-    exit 1
-elif [ -z "${GITHUB_REF-}" ]; then
-    # This should be the release tag 'v0.x.x'
-    echo "Error: GITHUB_REF is not set"
-    exit 1
-fi
-
-version=$(script/get-crate-version zed)
-channel=$(cat crates/zed/RELEASE_CHANNEL)
-echo "Publishing version: ${version} on release channel ${channel}"
-echo "RELEASE_CHANNEL=${channel}" >> $GITHUB_ENV
-echo "RELEASE_VERSION=${version}" >> $GITHUB_ENV
-
-expected_tag_name=""
-case ${channel} in
-stable)
-    expected_tag_name="v${version}";;
-preview)
-    expected_tag_name="v${version}-pre";;
-*)
-    echo "can't publish a release on channel ${channel}"
-    exit 1;;
-esac
-if [[ $GITHUB_REF_NAME != $expected_tag_name ]]; then
-    echo "invalid release tag ${GITHUB_REF_NAME}. expected ${expected_tag_name}"
-    exit 1
-fi
diff --git a/script/determine-release-channel.ps1 b/script/determine-release-channel.ps1
deleted file mode 100644
index eb3ad9c005..0000000000
--- a/script/determine-release-channel.ps1
+++ /dev/null
@@ -1,37 +0,0 @@
-$ErrorActionPreference = "Stop"
-
-if (-not $env:GITHUB_ACTIONS) {
-    Write-Error "Error: This script must be run in a GitHub Actions environment"
-    exit 1
-}
-
-if (-not $env:GITHUB_REF) {
-    Write-Error "Error: GITHUB_REF is not set"
-    exit 1
-}
-
-$version = & "script/get-crate-version.ps1" "zed"
-$channel = Get-Content "crates/zed/RELEASE_CHANNEL"
-
-Write-Host "Publishing version: $version on release channel $channel"
-Write-Output "RELEASE_CHANNEL=$channel" >> $env:GITHUB_ENV
-Write-Output "RELEASE_VERSION=$version" >> $env:GITHUB_ENV
-
-$expectedTagName = ""
-switch ($channel) {
-    "stable" {
-        $expectedTagName = "v$version"
-    }
-    "preview" {
-        $expectedTagName = "v$version-pre"
-    }
-    default {
-        Write-Error "can't publish a release on channel $channel"
-        exit 1
-    }
-}
-
-if ($env:GITHUB_REF_NAME -ne $expectedTagName) {
-    Write-Error "invalid release tag $($env:GITHUB_REF_NAME). expected $expectedTagName"
-    exit 1
-}
diff --git a/script/digital-ocean-db.sh b/script/digital-ocean-db.sh
deleted file mode 100755
index fd441e593e..0000000000
--- a/script/digital-ocean-db.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-set -e
-
-# Check if database name is provided
-if [ $# -eq 0 ]; then
-    echo "Usage: $0 <database-name>"
-    doctl databases list
-    exit 1
-fi
-
-DATABASE_NAME="$1"
-DATABASE_ID=$(doctl databases list --format ID,Name --no-header | grep "$DATABASE_NAME" | awk '{print $1}')
-
-if [ -z "$DATABASE_ID" ]; then
-    echo "Error: Database '$DATABASE_NAME' not found"
-    exit 1
-fi
-CURRENT_IP=$(curl -s https://api.ipify.org)
-if [ -z "$CURRENT_IP" ]; then
-    echo "Error: Failed to get current IP address"
-    exit 1
-fi
-
-EXISTING_RULE=$(doctl databases firewalls list "$DATABASE_ID" | grep "ip_addr" | grep "$CURRENT_IP")
-
-if [ -z "$EXISTING_RULE" ]; then
-    echo "IP not found in whitelist. Adding $CURRENT_IP to database firewall..."
-    doctl databases firewalls append "$DATABASE_ID" --rule ip_addr:"$CURRENT_IP"
-fi
-
-CONNECTION_URL=$(doctl databases connection "$DATABASE_ID" --format URI --no-header)
-
-if [ -z "$CONNECTION_URL" ]; then
-    echo "Error: Failed to get database connection details"
-    exit 1
-fi
-
-psql "$CONNECTION_URL"
diff --git a/script/download-wasi-sdk b/script/download-wasi-sdk
deleted file mode 100755
index 8cf36ffda1..0000000000
--- a/script/download-wasi-sdk
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/bash
-
-# Check if ./target/wasi-sdk exists
-if [ ! -d "./target/wasi-sdk" ]; then
-    echo "WASI SDK not found, downloading v25..."
-
-    # Determine OS and architecture
-    OS=$(uname -s | tr '[:upper:]' '[:lower:]')
-    ARCH=$(uname -m)
-
-    # Map architecture names to WASI SDK format
-    case $ARCH in
-        x86_64)
-            ARCH="x86_64"
-            ;;
-        arm64|aarch64)
-            ARCH="arm64"
-            ;;
-        *)
-            echo "Unsupported architecture: $ARCH"
-            exit 1
-            ;;
-    esac
-
-    # Map OS names to WASI SDK format
-    case $OS in
-        darwin)
-            OS="macos"
-            ;;
-        linux)
-            OS="linux"
-            ;;
-        mingw*|msys*|cygwin*)
-            OS="mingw"
-            ;;
-        *)
-            echo "Unsupported OS: $OS"
-            exit 1
-            ;;
-    esac
-
-    # Construct download URL
-    WASI_SDK_VERSION="25"
-    WASI_SDK_URL="https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_VERSION}/wasi-sdk-${WASI_SDK_VERSION}.0-${ARCH}-${OS}.tar.gz"
-
-    echo "Downloading from: $WASI_SDK_URL"
-
-    # Create target directory if it doesn't exist
-    mkdir -p ./target
-
-    # Download and extract
-    curl -L "$WASI_SDK_URL" | tar -xz -C ./target
-
-    # Rename the extracted directory to wasi-sdk
-    mv "./target/wasi-sdk-${WASI_SDK_VERSION}.0-${ARCH}-${OS}" "./target/wasi-sdk"
-
-    echo "WASI SDK v25 installed successfully"
-else
-    echo "WASI SDK already exists at ./target/wasi-sdk"
-fi
diff --git a/script/draft-release-notes b/script/draft-release-notes
deleted file mode 100755
index 2436aa6617..0000000000
--- a/script/draft-release-notes
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/usr/bin/env node --redirect-warnings=/dev/null
-
-const { execFileSync } = require("child_process");
-
-main();
-
-async function main() {
-  let version = process.argv[2];
-  let channel = process.argv[3];
-  let parts = version.split(".");
-
-  if (
-    process.argv.length != 4 ||
-    parts.length != 3 ||
-    parts.find((part) => isNaN(part)) != null ||
-    (channel != "stable" && channel != "preview")
-  ) {
-    console.log("Usage: draft-release-notes <version> {stable|preview}");
-    process.exit(1);
-  }
-
-  // currently we can only draft notes for patch releases.
-  if (parts[2] === 0) {
-    process.exit(0);
-  }
-
-  let priorVersion = [parts[0], parts[1], parts[2] - 1].join(".");
-  let suffix = channel == "preview" ? "-pre" : "";
-  let [tag, priorTag] = [`v${version}${suffix}`, `v${priorVersion}${suffix}`];
-
-  try {
-    execFileSync("rm", ["-rf", "target/shallow_clone"]);
-    execFileSync("git", [
-      "clone",
-      "https://github.com/zed-industries/zed",
-      "target/shallow_clone",
-      "--filter=tree:0",
-      "--no-checkout",
-      "--branch",
-      tag,
-      "--depth",
-      100,
-    ]);
-    execFileSync("git", ["-C", "target/shallow_clone", "rev-parse", "--verify", tag]);
-    try {
-      execFileSync("git", ["-C", "target/shallow_clone", "rev-parse", "--verify", priorTag]);
-    } catch (e) {
-      console.error(`Prior tag ${priorTag} not found`);
-      process.exit(0);
-    }
-  } catch (e) {
-    console.error(e.stderr.toString());
-    process.exit(1);
-  }
-
-  const newCommits = getCommits(priorTag, tag);
-
-  let releaseNotes = [];
-  let missing = [];
-  let skipped = [];
-
-  for (const commit of newCommits) {
-    let link = "https://github.com/zed-industries/zed/pull/" + commit.pr;
-    let notes = commit.releaseNotes;
-    if (commit.pr == "") {
-      link = "https://github.com/zed-industries/zed/commits/" + commit.hash;
-    } else if (!notes.includes("zed-industries/zed/issues")) {
-      notes = notes + " ([#" + commit.pr + "](" + link + "))";
-    }
-
-    if (commit.releaseNotes == "") {
-      missing.push("- MISSING " + commit.firstLine + " " + link);
-    } else if (commit.releaseNotes.startsWith("- N/A")) {
-      skipped.push("- N/A " + commit.firstLine + " " + link);
-    } else {
-      releaseNotes.push(notes);
-    }
-  }
-
-  console.log(releaseNotes.join("\n") + "\n");
-}
-
-function getCommits(oldTag, newTag) {
-  const pullRequestNumbers = execFileSync(
-    "git",
-    ["-C", "target/shallow_clone", "log", `${oldTag}..${newTag}`, "--format=DIVIDER\n%H|||%B"],
-    { encoding: "utf8" },
-  )
-    .replace(/\r\n/g, "\n")
-    .split("DIVIDER\n")
-    .filter((commit) => commit.length > 0)
-    .map((commit) => {
-      let [hash, firstLine] = commit.split("\n")[0].split("|||");
-      let cherryPick = firstLine.match(/\(cherry-pick #([0-9]+)\)/)?.[1] || "";
-      let pr = firstLine.match(/\(#(\d+)\)$/)?.[1] || "";
-      let releaseNotes = (commit.split(/Release notes:.*\n/i)[1] || "")
-        .split("\n\n")[0]
-        .trim()
-        .replace(/\n(?![\n-])/g, " ");
-
-      if (releaseNotes.includes("<public_issue_number_if_exists>")) {
-        releaseNotes = "";
-      }
-
-      return {
-        hash,
-        pr,
-        cherryPick,
-        releaseNotes,
-        firstLine,
-      };
-    });
-
-  return pullRequestNumbers;
-}
diff --git a/script/drop-test-dbs b/script/drop-test-dbs
deleted file mode 100755
index d96f1bd1f0..0000000000
--- a/script/drop-test-dbs
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-databases=$(psql --tuples-only --command "
-  SELECT
-    datname
-  FROM
-    pg_database
-  WHERE
-    datistemplate = false
-    AND datname like 'zed-test-%'
-")
-
-for database in $databases; do
-  echo $database
-  dropdb $database
-done
\ No newline at end of file
diff --git a/script/exit-ci-if-dev-drive-is-full.ps1 b/script/exit-ci-if-dev-drive-is-full.ps1
deleted file mode 100644
index 98684d58ee..0000000000
--- a/script/exit-ci-if-dev-drive-is-full.ps1
+++ /dev/null
@@ -1,22 +0,0 @@
-param (
-    [Parameter(Mandatory = $true)]
-    [int]$MAX_SIZE_IN_GB
-)
-
-$ErrorActionPreference = "Stop"
-$PSNativeCommandUseErrorActionPreference = $true
-$ProgressPreference = "SilentlyContinue"
-
-if (-Not (Test-Path -Path "target")) {
-    Write-Host "target directory does not exist yet"
-    exit 0
-}
-
-$current_size_gb = (Get-ChildItem -Recurse -Force -File -Path "target" | Measure-Object -Property Length -Sum).Sum / 1GB
-
-Write-Host "target directory size: ${current_size_gb}GB. max size: ${MAX_SIZE_IN_GB}GB"
-
-if ($current_size_gb -gt $MAX_SIZE_IN_GB) {
-    Write-Host "Dev drive is almost full, increase the size first!"
-    exit 1
-}
diff --git a/script/flatpak/bundle-flatpak b/script/flatpak/bundle-flatpak
deleted file mode 100755
index c9196ed4b8..0000000000
--- a/script/flatpak/bundle-flatpak
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-cd "$(dirname "$0")/../.."
-shopt -s extglob
-
-script/bundle-linux --flatpak
-archive_match="zed(-[a-zA-Z0-9]+)?-linux-$(uname -m)\.tar\.gz"
-archive=$(ls "target/release" | grep -E ${archive_match})
-channel=$(<crates/zed/RELEASE_CHANNEL)
-
-export CHANNEL="$channel"
-export ARCHIVE="$archive"
-if [[ "$channel" == "dev" ]]; then
-    export APP_ID="dev.zed.ZedDev"
-    export APP_NAME="Zed Devel"
-    export BRANDING_LIGHT="#99c1f1"
-    export BRANDING_DARK="#1a5fb4"
-    export ICON_FILE="app-icon-dev"
-elif [[ "$channel" == "nightly" ]]; then
-    export APP_ID="dev.zed.ZedNightly"
-    export APP_NAME="Zed Nightly"
-    export BRANDING_LIGHT="#e9aa6a"
-    export BRANDING_DARK="#1a5fb4"
-    export ICON_FILE="app-icon-nightly"
-elif [[ "$channel" == "preview" ]]; then
-    export APP_ID="dev.zed.ZedPreview"
-    export APP_NAME="Zed Preview"
-    export BRANDING_LIGHT="#99c1f1"
-    export BRANDING_DARK="#1a5fb4"
-    export ICON_FILE="app-icon-preview"
-elif [[ "$channel" == "stable" ]]; then
-    export APP_ID="dev.zed.Zed"
-    export APP_NAME="Zed"
-    export BRANDING_LIGHT="#99c1f1"
-    export BRANDING_DARK="#1a5fb4"
-    export ICON_FILE="app-icon"
-else
-    echo "Invalid channel: '$channel'"
-    exit
-fi
-
-envsubst < "crates/zed/resources/flatpak/manifest-template.json" > "$APP_ID.json"
-flatpak-builder --user --install --force-clean build "$APP_ID.json"
-flatpak build-bundle ~/.local/share/flatpak/repo "target/release/$APP_ID.flatpak" "$APP_ID"
-echo "Created 'target/release/$APP_ID.flatpak'"
diff --git a/script/flatpak/convert-release-notes.py b/script/flatpak/convert-release-notes.py
deleted file mode 100644
index 2c29cbacbf..0000000000
--- a/script/flatpak/convert-release-notes.py
+++ /dev/null
@@ -1,93 +0,0 @@
-import os
-import re
-import requests
-import sys
-import textwrap
-
-from html import escape
-
-def clean_line(line: str, in_code_fence: bool) -> str:
-    line = re.sub(r"\(\[(#\d+)\]\([\w|\d\:|\/|\.|\-|_]*\)\)", lambda match: f"[{match.group(1)}]", line)
-    line = re.sub(r"\[(#\d+)\]\([\w|\d\:|\/|\.|\-|_]*\)", lambda match: f"[{match.group(1)}]", line)
-    if not in_code_fence:
-        line = line.strip()
-
-    return escape(line)
-
-
-def convert_body(body: str) -> str:
-    formatted = ""
-
-    in_code_fence = False
-    in_list = False
-    for line in body.splitlines():
-        line = clean_line(line, in_code_fence)
-        if not line:
-            continue
-        if re.search(r'\[[\w|\d|:|\/|\.|\-|_]*\]\([\w|\d|:|\/|\.|\-|_]*\)', line):
-            continue
-        line = re.sub(r"(?<!\`)`([^`\n]+)`(?!`)", lambda match: f"<code>{match.group(1)}</code>", line)
-
-        contains_code_fence = bool(re.search(r"```", line))
-        is_list = bool(re.search(r"^-\s*", line))
-
-        if in_list and not is_list:
-            formatted += "</ul>\n"
-        if (not in_code_fence and contains_code_fence) or (not in_list and is_list):
-            formatted += "<ul>\n"
-        in_list = is_list
-        in_code_fence = contains_code_fence != in_code_fence
-
-        if is_list:
-            line = re.sub(r"^-\s*", "", line)
-            line = f"    <li>{line}</li>"
-        elif in_code_fence or contains_code_fence:
-            line = f"    <li><code>    {line}</code></li>"
-        else:
-            line = f"<p>{line}</p>"
-        formatted += f"{line}\n"
-
-        if (not in_code_fence and contains_code_fence):
-            formatted += "</ul>\n"
-    if in_code_fence or in_list:
-        formatted += "</ul>\n"
-    return formatted
-
-def get_release_info(tag: str):
-    url = f"https://api.github.com/repos/zed-industries/zed/releases/tags/{tag}"
-    response = requests.get(url)
-    if response.status_code == 200:
-        return response.json()
-    else:
-        print(f"Failed to fetch release info for tag '{tag}'. Status code: {response.status_code}")
-        quit()
-
-
-if __name__ == "__main__":
-    os.chdir(sys.path[0])
-
-    if len(sys.argv) != 3:
-        print("Usage: python convert-release-notes.py <tag> <channel>")
-        sys.exit(1)
-
-    tag = sys.argv[1]
-    channel = sys.argv[2]
-
-    release_info = get_release_info(tag)
-    body = convert_body(release_info["body"])
-    version = tag.removeprefix("v").removesuffix("-pre")
-    date = release_info["published_at"]
-
-    release_info_str = f"<release version=\"{version}\" date=\"{date}\">\n"
-    release_info_str += f"    <description>\n"
-    release_info_str += textwrap.indent(body, " " * 8)
-    release_info_str += f"    </description>\n"
-    release_info_str += f"    <url>https://github.com/zed-industries/zed/releases/tag/{tag}</url>\n"
-    release_info_str += "</release>\n"
-
-    channel_releases_file = f"../../crates/zed/resources/flatpak/release-info/{channel}"
-    with open(channel_releases_file) as f:
-        old_release_info = f.read()
-    with open(channel_releases_file, "w") as f:
-        f.write(textwrap.indent(release_info_str, " " * 8) + old_release_info)
-    print(f"Added release notes from {tag} to '{channel_releases_file}'")
diff --git a/script/flatpak/deps b/script/flatpak/deps
deleted file mode 100755
index dec24dfc87..0000000000
--- a/script/flatpak/deps
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-flatpak remote-add --if-not-exists --user flathub https://dl.flathub.org/repo/flathub.flatpakrepo
-
-arch=$(arch)
-fd_version=23.08
-flatpak install -y --user org.freedesktop.Platform/${arch}/${fd_version}
-flatpak install -y --user org.freedesktop.Sdk/${arch}/${fd_version}
-flatpak install -y --user org.freedesktop.Sdk.Extension.rust-stable/${arch}/${fd_version}
diff --git a/script/freebsd b/script/freebsd
deleted file mode 100755
index 58579d8ac9..0000000000
--- a/script/freebsd
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env bash
-
-set -xeuo pipefail
-
-# if root or if sudo/unavailable, define an empty variable
-if [ "$(id -u)" -eq 0 ]; then
-    maysudo=''
-else
-    maysudo="$(command -v sudo || command -v doas || true)"
-fi
-
-function finalize {
-    # after packages install (curl, etc), get the rust toolchain
-    which rustup >/dev/null 2>&1 || curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-    echo "Finished installing FreeBSD dependencies with script/freebsd"
-}
-
-# FreeBSD
-# https://www.freebsd.org/ports/
-pkg=$(command -v pkg || true)
-if [[ -n $pkg ]]; then
-    deps=(
-        cmake
-        gcc
-        git
-        llvm
-        protobuf
-        rustup-init
-        libx11
-        alsa-lib
-    )
-    $maysudo "$pkg" install "${deps[@]}"
-    finalize
-    exit 0
-fi
diff --git a/script/generate-licenses b/script/generate-licenses
deleted file mode 100755
index 6a833acd20..0000000000
--- a/script/generate-licenses
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-CARGO_ABOUT_VERSION="0.8.2"
-OUTPUT_FILE="${1:-$(pwd)/assets/licenses.md}"
-TEMPLATE_FILE="script/licenses/template.md.hbs"
-
-fail_on_stderr() {
-    local tmpfile=$(mktemp)
-    "$@" 2> >(tee "$tmpfile" >&2)
-    local rc=$?
-    [ -s "$tmpfile" ] && rc=1
-    rm "$tmpfile"
-    return $rc
-}
-
-echo -n "" >"$OUTPUT_FILE"
-
-{
-    echo -e "# ###### THEME LICENSES ######\n"
-    cat assets/themes/LICENSES
-
-    echo -e "\n# ###### ICON LICENSES ######\n"
-    cat assets/icons/LICENSES
-
-    echo -e "\n# ###### CODE LICENSES ######\n"
-} >>"$OUTPUT_FILE"
-
-if ! cargo about --version | grep "cargo-about $CARGO_ABOUT_VERSION" &>/dev/null; then
-    echo "Installing cargo-about@$CARGO_ABOUT_VERSION..."
-    cargo install "cargo-about@$CARGO_ABOUT_VERSION"
-else
-    echo "cargo-about@$CARGO_ABOUT_VERSION is already installed."
-fi
-
-echo "Generating cargo licenses"
-if [ -z "${ALLOW_MISSING_LICENSES-}" ]; then FAIL_FLAG=--fail; else FAIL_FLAG=""; fi
-if [ -z "${ALLOW_MISSING_LICENSES-}" ]; then WRAPPER=fail_on_stderr; else WRAPPER=""; fi
-set -x
-$WRAPPER cargo about generate \
-    $FAIL_FLAG \
-    -c script/licenses/zed-licenses.toml \
-    "$TEMPLATE_FILE" >>"$OUTPUT_FILE"
-set +x
-
-sed -i.bak 's/&quot;/"/g' "$OUTPUT_FILE"
-sed -i.bak 's/&#x27;/'\''/g' "$OUTPUT_FILE" # The ` '\'' ` thing ends the string, appends a single quote, and re-opens the string
-sed -i.bak 's/&#x3D;/=/g' "$OUTPUT_FILE"
-sed -i.bak 's/&#x60;/`/g' "$OUTPUT_FILE"
-sed -i.bak 's/&lt;/</g' "$OUTPUT_FILE"
-sed -i.bak 's/&gt;/>/g' "$OUTPUT_FILE"
-
-rm -rf "${OUTPUT_FILE}.bak"
-
-echo "generate-licenses completed. See $OUTPUT_FILE"
diff --git a/script/generate-licenses-csv b/script/generate-licenses-csv
deleted file mode 100755
index dd86f872d0..0000000000
--- a/script/generate-licenses-csv
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-CARGO_ABOUT_VERSION="0.8.2"
-OUTPUT_FILE="${1:-$(pwd)/assets/licenses.csv}"
-TEMPLATE_FILE="script/licenses/template.csv.hbs"
-
-if ! cargo about --version | grep "cargo-about $CARGO_ABOUT_VERSION" 2>&1 > /dev/null; then
-  echo "Installing cargo-about@$CARGO_ABOUT_VERSION..."
-  cargo install "cargo-about@$CARGO_ABOUT_VERSION"
-else
-  echo "cargo-about@$CARGO_ABOUT_VERSION is already installed."
-fi
-
-echo "Generating cargo licenses"
-set -x
-cargo about generate \
-    --fail \
-    -c script/licenses/zed-licenses.toml \
-    $TEMPLATE_FILE \
-    | awk 'NR==1{print;next} NF{print | "sort"}' \
-    > "$OUTPUT_FILE"
-set +x
-
-echo "generate-licenses-csv completed. See $OUTPUT_FILE"
diff --git a/script/generate-licenses.ps1 b/script/generate-licenses.ps1
deleted file mode 100644
index 80cd249a46..0000000000
--- a/script/generate-licenses.ps1
+++ /dev/null
@@ -1,44 +0,0 @@
-$CARGO_ABOUT_VERSION="0.8.2"
-$outputFile=$args[0] ? $args[0] : "$(Get-Location)/assets/licenses.md"
-$templateFile="script/licenses/template.md.hbs"
-
-New-Item -Path "$outputFile" -ItemType File -Value "" -Force
-
-@(
-    "# ###### THEME LICENSES ######\n"
-    Get-Content assets/themes/LICENSES
-    "\n# ###### ICON LICENSES ######\n"
-    Get-Content assets/icons/LICENSES
-    "\n# ###### CODE LICENSES ######\n"
-) | Add-Content -Path $outputFile
-
-$versionOutput = cargo about --version
-if (-not ($versionOutput -match "cargo-about $CARGO_ABOUT_VERSION")) {
-    Write-Host "Installing cargo-about@$CARGO_ABOUT_VERSION..."
-    cargo install "cargo-about@$CARGO_ABOUT_VERSION"
-} else {
-    Write-Host "cargo-about@$CARGO_ABOUT_VERSION" is already installed
-}
-
-Write-Host "Generating cargo licenses"
-
-$failFlag = $env:ALLOW_MISSING_LICENSES ? "--fail" : ""
-$args = @('about', 'generate', $failFlag, '-c', 'script/licenses/zed-licenses.toml', $templateFile, '-o', $outputFile) | Where-Object { $_ }
-cargo @args
-
-Write-Host "Applying replacements"
-$replacements = @{
-    '&quot;' = '"'
-    '&#x27;' = "'"
-    '&#x3D;' = '='
-    '&#x60;' = '`'
-    '&lt;'   = '<'
-    '&gt;'   = '>'
-}
-$content = Get-Content $outputFile
-foreach ($find in $replacements.keys) {
-    $content = $content -replace $find, $replacements[$find]
-}
-$content | Set-Content $outputFile
-
-Write-Host "generate-licenses completed. See $outputFile"
diff --git a/script/generate-terms-rtf b/script/generate-terms-rtf
deleted file mode 100755
index 654972931f..0000000000
--- a/script/generate-terms-rtf
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-if ! command -v pandoc &> /dev/null
-then
-    brew install pandoc   # Install pandoc using Homebrew
-fi
-
-pandoc ./legal/terms.md -f markdown-smart -t rtf -o ./script/terms/terms.rtf --standalone
diff --git a/script/get-crate-version b/script/get-crate-version
deleted file mode 100755
index d642eb0867..0000000000
--- a/script/get-crate-version
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-
-set -eu
-
-if [[ $# -ne 1 ]]; then
-  echo "Usage: $0 <crate_name>" >&2
-  exit 1
-fi
-
-CRATE_NAME=$1
-
-cargo metadata \
-    --no-deps \
-    --format-version=1 \
-    | jq \
-        --raw-output \
-        ".packages[] | select(.name == \"${CRATE_NAME}\") | .version"
diff --git a/script/get-crate-version.ps1 b/script/get-crate-version.ps1
deleted file mode 100644
index d86c971e32..0000000000
--- a/script/get-crate-version.ps1
+++ /dev/null
@@ -1,16 +0,0 @@
-if ($args.Length -ne 1) {
-    Write-Error "Usage: $($MyInvocation.MyCommand.Name) <crate_name>"
-    exit 1
-}
-
-$crateName = $args[0]
-
-$metadata = cargo metadata --no-deps --format-version=1 | ConvertFrom-Json
-
-$package = $metadata.packages | Where-Object { $_.name -eq $crateName }
-if ($package) {
-    $package.version
-}
-else {
-    Write-Error "Crate '$crateName' not found."
-}
diff --git a/script/get-pull-requests-since b/script/get-pull-requests-since
deleted file mode 100755
index c8509480a6..0000000000
--- a/script/get-pull-requests-since
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/usr/bin/env node --redirect-warnings=/dev/null
-
-const { execFileSync } = require("child_process");
-let { GITHUB_ACCESS_TOKEN } = process.env;
-const PR_REGEX = /#\d+/; // Ex: matches on #4241
-const FIXES_REGEX = /(fixes|closes|completes) (.+[/#]\d+.*)$/im;
-
-main();
-
-async function main() {
-  if (!GITHUB_ACCESS_TOKEN) {
-    try {
-      GITHUB_ACCESS_TOKEN = execFileSync("gh", ["auth", "token"]).toString();
-    } catch (error) {
-      console.log(error);
-      console.log("No GITHUB_ACCESS_TOKEN, and no `gh auth token`");
-      process.exit(1);
-    }
-  }
-
-  // Use form of: YYYY-MM-DD - 2023-01-09
-  const startDate = new Date(process.argv[2]);
-  const today = new Date();
-
-  console.log(`Pull requests from ${startDate} to ${today}\n`);
-
-  let pullRequestNumbers = getPullRequestNumbers(startDate, today);
-
-  // Fetch the pull requests from the GitHub API.
-  console.log("Merged pull requests:");
-  for (const pullRequestNumber of pullRequestNumbers) {
-    const webURL = `https://github.com/zed-industries/zed/pull/${pullRequestNumber}`;
-    const apiURL = `https://api.github.com/repos/zed-industries/zed/pulls/${pullRequestNumber}`;
-
-    const response = await fetch(apiURL, {
-      headers: {
-        Authorization: `token ${GITHUB_ACCESS_TOKEN}`,
-      },
-    });
-
-    const pullRequest = await response.json();
-    console.log("*", pullRequest.title);
-    console.log("  PR URL:    ", webURL);
-    console.log("  Merged:    ", pullRequest.merged_at);
-    console.log();
-  }
-}
-
-function getPullRequestNumbers(startDate, endDate) {
-  const sinceDate = startDate.toISOString();
-  const untilDate = endDate.toISOString();
-
-  const pullRequestNumbers = execFileSync(
-    "git",
-    ["log", `--since=${sinceDate}`, `--until=${untilDate}`, "--oneline"],
-    { encoding: "utf8" },
-  )
-    .split("\n")
-    .filter((line) => line.length > 0)
-    .map((line) => {
-      const match = line.match(/#(\d+)/);
-      return match ? match[1] : null;
-    })
-    .filter((line) => line);
-
-  return pullRequestNumbers;
-}
diff --git a/script/get-release-notes-since b/script/get-release-notes-since
deleted file mode 100755
index 20a6fc18de..0000000000
--- a/script/get-release-notes-since
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/usr/bin/env node --redirect-warnings=/dev/null
-
-const { execFileSync } = require("child_process");
-const { GITHUB_ACCESS_TOKEN } = process.env;
-
-main();
-
-async function main() {
-  const startDate = new Date(process.argv[2]);
-  const today = new Date();
-
-  console.log(`Release notes from ${startDate} to ${today}\n`);
-
-  const releases = await getReleases(startDate, today);
-  const previewReleases = releases.filter((release) =>
-    release.tagName.includes("-pre"),
-  );
-
-  const stableReleases = releases.filter(
-    (release) => !release.tagName.includes("-pre"),
-  );
-
-  // Filter out all preview release, as all of those changes have made it to the stable release, except for the latest preview release
-  const aggregatedReleases = stableReleases
-    .concat(previewReleases[0])
-    .reverse();
-
-  const aggregatedReleaseTitles = aggregatedReleases
-    .map((release) => release.name)
-    .join(", ");
-
-  console.log();
-  console.log(`Release titles: ${aggregatedReleaseTitles}`);
-
-  console.log("Release notes:");
-  console.log();
-
-  for (const release of aggregatedReleases) {
-    const publishedDate = release.publishedAt.split("T")[0];
-    console.log(`${release.name}: ${publishedDate}`);
-    console.log();
-    console.log(release.description);
-    console.log();
-  }
-}
-
-async function getReleases(startDate, endDate) {
-  const query = `
-    query ($owner: String!, $repo: String!, $cursor: String) {
-      repository(owner: $owner, name: $repo) {
-        releases(first: 100, orderBy: {field: CREATED_AT, direction: DESC}, after: $cursor) {
-          nodes {
-            tagName
-            name
-            createdAt
-            publishedAt
-            description
-            url
-            author {
-              login
-            }
-          }
-          pageInfo {
-            hasNextPage
-            endCursor
-          }
-        }
-      }
-    }
-  `;
-
-  let allReleases = [];
-  let hasNextPage = true;
-  let cursor = null;
-
-  while (hasNextPage) {
-    const response = await fetch("https://api.github.com/graphql", {
-      method: "POST",
-      headers: {
-        Authorization: `Bearer ${GITHUB_ACCESS_TOKEN}`,
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({
-        query,
-        variables: { owner: "zed-industries", repo: "zed", cursor },
-      }),
-    });
-
-    if (!response.ok) {
-      throw new Error(`HTTP error! status: ${response.status}`);
-    }
-
-    const data = await response.json();
-
-    if (data.errors) {
-      throw new Error(`GraphQL error: ${JSON.stringify(data.errors)}`);
-    }
-
-    if (!data.data || !data.data.repository || !data.data.repository.releases) {
-      throw new Error(`Unexpected response structure: ${JSON.stringify(data)}`);
-    }
-
-    const releases = data.data.repository.releases.nodes;
-    allReleases = allReleases.concat(releases);
-
-    hasNextPage = data.data.repository.releases.pageInfo.hasNextPage;
-    cursor = data.data.repository.releases.pageInfo.endCursor;
-
-    lastReleaseOnPage = releases[releases.length - 1];
-
-    if (
-      releases.length > 0 &&
-      new Date(lastReleaseOnPage.createdAt) < startDate
-    ) {
-      break;
-    }
-  }
-
-  const filteredReleases = allReleases.filter((release) => {
-    const releaseDate = new Date(release.createdAt);
-    return releaseDate >= startDate && releaseDate <= endDate;
-  });
-
-  return filteredReleases;
-}
diff --git a/script/get-released-version b/script/get-released-version
deleted file mode 100755
index 0fbb2e1757..0000000000
--- a/script/get-released-version
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-
-channel="$1"
-
-query=""
-case $channel in
-  stable)
-    ;;
-  preview)
-    query="&preview=1"
-    ;;
-  nightly)
-    query="&nightly=1"
-    ;;
-  *)
-    echo "this must be run on either of stable|preview|nightly release branches" >&2
-    exit 1
-    ;;
-esac
-
-curl -s "https://cloud.zed.dev/releases/$channel/latest/asset?asset=zed&os=macos&arch=aarch64" | jq -r .version
diff --git a/script/github-clean-issue-types.py b/script/github-clean-issue-types.py
deleted file mode 100755
index dfd573628b..0000000000
--- a/script/github-clean-issue-types.py
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/usr/bin/env python3
-"""Replace 'bug/feature/crash' labels with 'Bug/Feature/Crash' types on open
-GitHub issues.
-
-Requires `requests` library and a GitHub access token with "Issues (write)"
-permission passed as an environment variable.
-Was used as a quick-and-dirty one-off-bulk-operation script to clean up issue
-types in the `zed` repository. Leaving it here for reference only; there's no
-error handling, you've been warned.
-"""
-
-
-import logging
-import os
-
-import requests
-
-logging.basicConfig(level=logging.INFO)
-log = logging.getLogger(__name__)
-
-GITHUB_API_BASE_URL = "https://api.github.com"
-REPO_OWNER = "zed-industries"
-REPO_NAME = "zed"
-GITHUB_TOKEN = os.getenv("GITHUB_TOKEN")
-HEADERS = {
-    "Authorization": f"token {GITHUB_TOKEN}",
-    "Accept": "application/vnd.github+json"
-}
-LABELS_TO_TYPES = {
-    'bug': 'Bug',
-    'feature': 'Feature',
-    'crash': 'Crash',
- }
-
-
-def get_open_issues_without_type(repo):
-    """Get open issues without type via GitHub's REST API."""
-    issues = []
-    issues_url = f"{GITHUB_API_BASE_URL}/repos/{REPO_OWNER}/{repo}/issues"
-
-    log.info("Start fetching issues from the GitHub API.")
-    params = {
-        "state": "open",
-        "type": "none",
-        "page": 1,
-        "per_page": 100, # worked fine despite the docs saying 30
-    }
-    while True:
-        response = requests.get(issues_url, headers=HEADERS, params=params)
-        response.raise_for_status()
-        issues.extend(response.json())
-        log.info(f"Fetched the next page, total issues so far: {len(issues)}.")
-
-        # is there a next page?
-        link_header = response.headers.get('Link', '')
-        if 'rel="next"' not in link_header:
-            break
-        params['page'] += 1
-
-    log.info("Done fetching issues.")
-    return issues
-
-
-def replace_labels_with_types(issues, labels_to_types):
-    """Replace labels with types, a new attribute of issues.
-
-    Only changes the issues with one type-sounding label, leaving those with
-    two labels (e.g. `bug` *and* `crash`) alone, logging a warning.
-    """
-    for issue in issues:
-        log.debug(f"Processing issue {issue['number']}.")
-        # for GitHub, all PRs are issues but not all issues are PRs; skip PRs
-        if 'pull_request' in issue:
-            continue
-        issue_labels = (label['name'] for label in issue['labels'])
-        matching_labels = labels_to_types.keys() & set(issue_labels)
-        if len(matching_labels) != 1:
-            log.warning(
-                f"Issue {issue['url']} has either no or multiple type-sounding "
-                "labels, won't be processed.")
-            continue
-        label_to_replace = matching_labels.pop()
-        issue_type = labels_to_types[label_to_replace]
-        log.debug(
-            f"Replacing label {label_to_replace} with type {issue_type} "
-            f"for issue {issue['title']}.")
-
-        # add the type
-        api_url_issue = f"{GITHUB_API_BASE_URL}/repos/{REPO_OWNER}/{REPO_NAME}/issues/{issue['number']}"
-        add_type_response = requests.patch(
-            api_url_issue, headers=HEADERS, json={"type": issue_type})
-        add_type_response.raise_for_status()
-        log.debug(f"Added type {issue_type} to issue {issue['title']}.")
-
-        # delete the label
-        api_url_delete_label = f"{GITHUB_API_BASE_URL}/repos/{REPO_OWNER}/{REPO_NAME}/issues/{issue['number']}/labels/{label_to_replace}"
-        delete_response = requests.delete(api_url_delete_label, headers=HEADERS)
-        delete_response.raise_for_status()
-        log.info(
-            f"Deleted label {label_to_replace} from issue {issue['title']}.")
-
-
-if __name__ == "__main__":
-    open_issues_without_type = get_open_issues_without_type(REPO_NAME)
-    replace_labels_with_types(open_issues_without_type, LABELS_TO_TYPES)
diff --git a/script/github-label-issues-to-triage.py b/script/github-label-issues-to-triage.py
deleted file mode 100755
index 9a7274a4aa..0000000000
--- a/script/github-label-issues-to-triage.py
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/usr/bin/env python3
-"""Add `state:needs triage` label to open GitHub issues of types Bug and Crash
-if they're missing area, priority, or frequency labels. Don't touch issues
-with an assignee or another `state:` label.
-
-Requires `requests` library and a GitHub access token with "Issues (write)"
-permission passed as an environment variable. Was used as a quick-and-dirty
-one-off-bulk-operation script to surface older untriaged issues in the `zed`
-repository. Leaving it here for reference only; there's no error handling or
-guardrails, you've been warned.
-"""
-
-import itertools
-import logging
-import os
-
-import requests
-
-
-logging.basicConfig(level=logging.INFO)
-log = logging.getLogger(__name__)
-
-GITHUB_API_BASE_URL = "https://api.github.com"
-REPO_OWNER = "zed-industries"
-REPO_NAME = "zed"
-GITHUB_TOKEN = os.getenv("GITHUB_TOKEN")
-HEADERS = {
-    "Authorization": f"token {GITHUB_TOKEN}",
-    "Accept": "application/vnd.github+json"
-}
-REQUIRED_LABELS_PREFIXES = ["area:", "priority:", "frequency:"]
-NEEDS_TRIAGE_LABEL = "state:needs triage"
-
-
-def get_open_issues(repo, issue_type):
-    """Get open issues of certain type(s) via GitHub's REST API."""
-    issues = []
-    issues_url = f"{GITHUB_API_BASE_URL}/repos/{REPO_OWNER}/{repo}/issues"
-
-    log.info("Start fetching open issues from the GitHub API.")
-    params = {
-        "state": "open",
-        "type": issue_type,
-        "page": 1,
-        "per_page": 100, # worked fine despite the docs saying 30
-    }
-    while True:
-        response = requests.get(issues_url, headers=HEADERS, params=params)
-        response.raise_for_status()
-        issues.extend(response.json())
-        log.info(f"Fetched the next page, total issues so far: {len(issues)}.")
-
-        # is there a next page?
-        link_header = response.headers.get('Link', '')
-        if 'rel="next"' not in link_header:
-            break
-        params['page'] += 1
-
-    log.info("Done fetching issues.")
-    return issues
-
-
-def is_untriaged(issue):
-    issue_labels = [label['name'] for label in issue['labels']]
-    # don't want to overwrite existing state labels
-    no_state_label = not any(label.startswith('state:') for label in issue_labels)
-    # we want at least one label for each of the required prefixes
-    has_all_required_labels = all(
-        any(label.startswith(prefix) for label in issue_labels)
-        for prefix in REQUIRED_LABELS_PREFIXES
-    )
-    # let's also assume if we managed to assign an issue it's triaged enough
-    no_assignee = not issue['assignee']
-    return no_state_label and no_assignee and not has_all_required_labels
-
-
-def label_issues(issues, label):
-    for issue in issues:
-        log.debug(f"Processing issue {issue['number']}.")
-        api_url_add_label = f"{GITHUB_API_BASE_URL}/repos/{REPO_OWNER}/{REPO_NAME}/issues/{issue['number']}/labels"
-        add_response = requests.post(
-            api_url_add_label, headers=HEADERS, json={"labels": [label]}
-        )
-        add_response.raise_for_status()
-        log.info(f"Added label '{label}' to issue {issue['title']}.")
-
-
-if __name__ == "__main__":
-    open_bugs = get_open_issues(REPO_NAME, "Bug")
-    open_crashes = get_open_issues(REPO_NAME, "Crash")
-    untriaged_issues = filter(
-        is_untriaged, itertools.chain(open_bugs, open_crashes))
-    label_issues(untriaged_issues, label=NEEDS_TRIAGE_LABEL)
diff --git a/script/github-pr-status b/script/github-pr-status
deleted file mode 100755
index b3b0463165..0000000000
--- a/script/github-pr-status
+++ /dev/null
@@ -1,210 +0,0 @@
-#!/usr/bin/env python3
-"""
-GitHub PR Analyzer for zed-industries/zed repository
-Downloads all PRs and groups them by first assignee with status, open date, and last updated date.
-"""
-
-import urllib.request
-import urllib.parse
-import urllib.error
-import json
-from datetime import datetime
-from collections import defaultdict
-import sys
-import os
-
-# GitHub API configuration
-GITHUB_API_BASE = "https://api.github.com"
-REPO_OWNER = "zed-industries"
-REPO_NAME = "zed"
-GITHUB_TOKEN = os.getenv("GITHUB_TOKEN")
-
-def make_github_request(url, params=None):
-    """Make a request to GitHub API with proper headers and pagination support."""
-    if params:
-        url_parts = list(urllib.parse.urlparse(url))
-        query = dict(urllib.parse.parse_qsl(url_parts[4]))
-        query.update(params)
-        url_parts[4] = urllib.parse.urlencode(query)
-        url = urllib.parse.urlunparse(url_parts)
-
-    req = urllib.request.Request(url)
-    req.add_header("Accept", "application/vnd.github.v3+json")
-    req.add_header("User-Agent", "GitHub-PR-Analyzer")
-
-    if GITHUB_TOKEN:
-        req.add_header("Authorization", f"token {GITHUB_TOKEN}")
-
-    try:
-        response = urllib.request.urlopen(req)
-        return response
-    except urllib.error.URLError as e:
-        print(f"Error making request to {url}: {e}")
-        return None
-    except urllib.error.HTTPError as e:
-        print(f"HTTP error {e.code} for {url}: {e.reason}")
-        return None
-
-def fetch_all_prs():
-    """Fetch all PRs from the repository using pagination."""
-    prs = []
-    page = 1
-    per_page = 100
-
-    print("Fetching PRs from GitHub API...")
-
-    while True:
-        url = f"{GITHUB_API_BASE}/repos/{REPO_OWNER}/{REPO_NAME}/pulls"
-        params = {
-            "state": "open",
-            "sort": "updated",
-            "direction": "desc",
-            "per_page": per_page,
-            "page": page
-        }
-
-        response = make_github_request(url, params)
-        if not response:
-            break
-
-        try:
-            data = response.read().decode('utf-8')
-            page_prs = json.loads(data)
-        except (json.JSONDecodeError, UnicodeDecodeError) as e:
-            print(f"Error parsing response: {e}")
-            break
-
-        if not page_prs:
-            break
-
-        prs.extend(page_prs)
-        print(f"Fetched page {page}: {len(page_prs)} PRs (Total: {len(prs)})")
-
-        # Check if we have more pages
-        link_header = response.getheader('Link', '')
-        if 'rel="next"' not in link_header:
-            break
-
-        page += 1
-
-    print(f"Total PRs fetched: {len(prs)}")
-    return prs
-
-def format_date_as_days_ago(date_string):
-    """Format ISO date string as 'X days ago'."""
-    if not date_string:
-        return "N/A days ago"
-
-    try:
-        dt = datetime.fromisoformat(date_string.replace('Z', '+00:00'))
-        now = datetime.now(dt.tzinfo)
-        days_diff = (now - dt).days
-
-        if days_diff == 0:
-            return "today"
-        elif days_diff == 1:
-            return "1 day ago"
-        else:
-            return f"{days_diff} days ago"
-    except:
-        return "N/A days ago"
-
-def get_first_assignee(pr):
-    """Get the first assignee from a PR, or return 'Unassigned' if none."""
-    assignees = pr.get('assignees', [])
-    if assignees:
-        return assignees[0].get('login', 'Unknown')
-    return 'Unassigned'
-
-def get_pr_status(pr):
-    """Determine if PR is draft or ready for review."""
-    if pr.get('draft', False):
-        return "Draft"
-    return "Ready"
-
-def analyze_prs(prs):
-    """Group PRs by first assignee and organize the data."""
-    grouped_prs = defaultdict(list)
-
-    for pr in prs:
-        assignee = get_first_assignee(pr)
-
-        pr_info = {
-            'number': pr['number'],
-            'title': pr['title'],
-            'status': get_pr_status(pr),
-            'state': pr['state'],
-            'created_at': format_date_as_days_ago(pr['created_at']),
-            'updated_at': format_date_as_days_ago(pr['updated_at']),
-            'updated_at_raw': pr['updated_at'],
-            'url': pr['html_url'],
-            'author': pr['user']['login']
-        }
-
-        grouped_prs[assignee].append(pr_info)
-
-    # Sort PRs within each group by update date (newest first)
-    for assignee in grouped_prs:
-        grouped_prs[assignee].sort(key=lambda x: x['updated_at_raw'], reverse=True)
-
-    return dict(grouped_prs)
-
-def print_pr_report(grouped_prs):
-    """Print formatted report of PRs grouped by assignee."""
-    print(f"OPEN PR REPORT FOR {REPO_OWNER}/{REPO_NAME}")
-    print()
-
-    # Sort assignees alphabetically, but put 'Unassigned' last
-    assignees = sorted(grouped_prs.keys())
-    if 'Unassigned' in assignees:
-        assignees.remove('Unassigned')
-        assignees.append('Unassigned')
-
-    total_prs = sum(len(prs) for prs in grouped_prs.values())
-    print(f"Total Open PRs: {total_prs}")
-    print()
-
-    for assignee in assignees:
-        prs = grouped_prs[assignee]
-        assignee_display = f"@{assignee}" if assignee != 'Unassigned' else assignee
-        print(f"assigned to {assignee_display} ({len(prs)} PRs):")
-
-        for pr in prs:
-            print(f"- {pr['author']}: [{pr['title']}]({pr['url']}) opened:{pr['created_at']} updated:{pr['updated_at']}")
-
-        print()
-
-def save_json_report(grouped_prs, filename="pr_report.json"):
-    """Save the PR data to a JSON file."""
-    try:
-        with open(filename, 'w') as f:
-            json.dump(grouped_prs, f, indent=2)
-        print(f"📄 Report saved to {filename}")
-    except Exception as e:
-        print(f"Error saving JSON report: {e}")
-
-def main():
-    """Main function to orchestrate the PR analysis."""
-    print("GitHub PR Analyzer")
-    print("==================")
-
-    if not GITHUB_TOKEN:
-        print("⚠️  Warning: GITHUB_TOKEN not set. You may hit rate limits.")
-        print("   Set GITHUB_TOKEN environment variable for authenticated requests.")
-        print()
-
-    # Fetch all PRs
-    prs = fetch_all_prs()
-
-    if not prs:
-        print("❌ Failed to fetch PRs. Please check your connection and try again.")
-        sys.exit(1)
-
-    # Analyze and group PRs
-    grouped_prs = analyze_prs(prs)
-
-    # Print report
-    print_pr_report(grouped_prs)
-
-if __name__ == "__main__":
-    main()
diff --git a/script/histogram b/script/histogram
deleted file mode 100755
index 32db95134e..0000000000
--- a/script/histogram
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/usr/bin/env python3
-
-# Required dependencies for this script:
-#
-# pandas: For data manipulation and analysis.
-# matplotlib: For creating static, interactive, and animated visualizations in Python.
-# seaborn: For making statistical graphics in Python, based on matplotlib.
-
-# To install these dependencies, use the following pip command:
-# pip install pandas matplotlib seaborn
-
-# This script is designed to parse log files for performance measurements and create histograms of these measurements.
-# It expects log files to contain lines with measurements in the format "measurement: timeunit" where timeunit can be in milliseconds (ms) or microseconds (µs).
-# Lines that do not contain a colon ':' are skipped.
-# The script takes one or more file paths as command-line arguments, parses each log file, and then combines the data into a single DataFrame.
-# It then converts all time measurements into milliseconds, discards the original time and unit columns, and creates histograms for each unique measurement type.
-# The histograms display the distribution of times for each measurement, separated by log file, and normalized to show density rather than count.
-# To use this script, run it from the command line with the log file paths as arguments, like so:
-# python this_script.py log1.txt log2.txt ...
-# The script will then parse the provided log files and display the histograms for each type of measurement found.
-
-import pandas as pd
-import matplotlib.pyplot as plt
-import seaborn as sns
-import sys
-
-def parse_log_file(file_path):
-    data = {'measurement': [], 'time': [], 'unit': [], 'log_file': []}
-    with open(file_path, 'r') as file:
-        for line in file:
-            if ':' not in line:
-                continue
-
-            parts = line.strip().split(': ')
-            if len(parts) != 2:
-                continue
-
-            measurement, time_with_unit = parts[0], parts[1]
-            if 'ms' in time_with_unit:
-                time, unit = time_with_unit[:-2], 'ms'
-            elif 'µs' in time_with_unit:
-                time, unit = time_with_unit[:-2], 'µs'
-            else:
-                # Print an error message if we can't parse the line and then continue with rest.
-                print(f'Error: Invalid time unit in line "{line.strip()}". Skipping.', file=sys.stderr)
-                continue
-
-            data['measurement'].append(measurement)
-            data['time'].append(float(time))
-            data['unit'].append(unit)
-            data['log_file'].append(file_path.split('/')[-1])
-    return pd.DataFrame(data)
-
-def create_histograms(df, measurement):
-    filtered_df = df[df['measurement'] == measurement]
-    plt.figure(figsize=(12, 6))
-    sns.histplot(data=filtered_df, x='time_ms', hue='log_file', element='step', stat='density', common_norm=False, palette='bright')
-    plt.title(f'Histogram of {measurement}')
-    plt.xlabel('Time (ms)')
-    plt.ylabel('Density')
-    plt.grid(True)
-    plt.xlim(filtered_df['time_ms'].quantile(0.01), filtered_df['time_ms'].quantile(0.99))
-    plt.show()
-
-
-file_paths = sys.argv[1:]
-dfs = [parse_log_file(path) for path in file_paths]
-combined_df = pd.concat(dfs, ignore_index=True)
-combined_df['time_ms'] = combined_df.apply(lambda row: row['time'] if row['unit'] == 'ms' else row['time'] / 1000, axis=1)
-combined_df.drop(['time', 'unit'], axis=1, inplace=True)
-
-measurement_types = combined_df['measurement'].unique()
-for measurement in measurement_types:
-    create_histograms(combined_df, measurement)
diff --git a/script/import-themes b/script/import-themes
deleted file mode 100755
index 14b844abc8..0000000000
--- a/script/import-themes
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-cargo run -p theme_importer -- "$@"
diff --git a/script/install-cmake b/script/install-cmake
deleted file mode 100755
index 3a28aae1b8..0000000000
--- a/script/install-cmake
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/usr/bin/env bash
-#
-# This script installs an up-to-date version of CMake.
-#
-# For MacOS use Homebrew to install the latest version.
-#
-# For Ubuntu use the official KitWare Apt repository with backports.
-# See: https://apt.kitware.com/
-#
-# For other systems (RHEL 8.x, 9.x, AmazonLinux, SUSE, Fedora, Arch, etc)
-# use the official CMake installer script from KitWare.
-#
-# Note this is similar to how GitHub Actions runners install cmake:
-# https://github.com/actions/runner-images/blob/main/images/ubuntu/scripts/build/install-cmake.sh
-#
-# Upstream:  3.30.4 (2024-09-27)
-
-set -euo pipefail
-
-
-if [[ "$(uname -s)" == "darwin" ]]; then
-  brew --version >/dev/null \
-    || echo "Error: Homebrew is required to install cmake on MacOS." && exit 1
-  echo "Installing cmake via Homebrew (can't pin to old versions)."
-  brew install cmake
-  exit 0
-elif [ "$(uname -s)" != "Linux" ]; then
-  echo "Error: This script is intended for MacOS/Linux systems only."
-  exit 1
-elif [ -z "${1:-}" ]; then
-  echo "Usage: $0 [3.30.4]"
-  exit 1
-fi
-CMAKE_VERSION="${CMAKE_VERSION:-${1:-3.30.4}}"
-
-if [ "$(whoami)" = root ]; then SUDO=; else SUDO="$(command -v sudo || command -v doas || true)"; fi
-
-if cmake --version 2>/dev/null | grep -q "$CMAKE_VERSION"; then
-  echo "CMake $CMAKE_VERSION is already installed."
-  exit 0
-elif [ -e /usr/local/bin/cmake ]; then
-  echo "Warning: existing cmake found at /usr/local/bin/cmake. Skipping installation."
-  exit 0
-elif [ -e /etc/apt/sources.list.d/kitware.list ]; then
-  echo "Warning: existing KitWare repository found. Skipping installation."
-  exit 0
-elif [ -e /etc/lsb-release ] && grep -qP 'DISTRIB_ID=Ubuntu' /etc/lsb-release; then
-  curl -fsSL https://apt.kitware.com/keys/kitware-archive-latest.asc \
-    | $SUDO gpg --dearmor - \
-    | $SUDO tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null
-  echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ $(lsb_release -cs) main" \
-    | $SUDO tee /etc/apt/sources.list.d/kitware.list >/dev/null
-  $SUDO apt-get update
-  $SUDO apt-get install -y kitware-archive-keyring cmake
-else
-  arch="$(uname -m)"
-  if [ "$arch" != "x86_64" ] && [ "$arch" != "aarch64" ]; then
-    echo "Error. Only x86_64 and aarch64 are supported."
-    exit 1
-  fi
-  tempdir=$(mktemp -d)
-  pushd "$tempdir"
-    CMAKE_REPO="https://github.com/Kitware/CMake"
-    CMAKE_INSTALLER="cmake-$CMAKE_VERSION-linux-$arch.sh"
-    curl -fsSL --output cmake-$CMAKE_VERSION-SHA-256.txt \
-      "$CMAKE_REPO/releases/download/v$CMAKE_VERSION/cmake-$CMAKE_VERSION-SHA-256.txt"
-    curl -fsSL --output $CMAKE_INSTALLER \
-      "$CMAKE_REPO/releases/download/v$CMAKE_VERSION/cmake-$CMAKE_VERSION-linux-$arch.sh"
-    # workaround for old versions of sha256sum not having --ignore-missing
-    grep -F "cmake-$CMAKE_VERSION-linux-$arch.sh" "cmake-$CMAKE_VERSION-SHA-256.txt" \
-      | sha256sum -c \
-      | grep -qP "^${CMAKE_INSTALLER}: OK"
-    chmod +x cmake-$CMAKE_VERSION-linux-$arch.sh
-    $SUDO ./cmake-$CMAKE_VERSION-linux-$arch.sh --prefix=/usr/local --skip-license
-  popd
-  rm -rf "$tempdir"
-fi
diff --git a/script/install-linux b/script/install-linux
deleted file mode 100755
index a642ed2e0e..0000000000
--- a/script/install-linux
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-
-set -euxo pipefail
-
-if [[ $# -gt 0 ]]; then
-  echo "
-  Usage: ${0##*/}
-  Builds and installs zed onto your system into ~/.local, making it available as ~/.local/bin/zed.
-
-  Before running this you should ensure you have all the build dependencies installed with `./script/linux`.
-  "
-  exit 1
-fi
-export ZED_CHANNEL=$(<crates/zed/RELEASE_CHANNEL)
-export ZED_UPDATE_EXPLANATION="You need to fetch and rebuild zed in $(pwd)"
-script/bundle-linux
-
-arch="$(uname -m)"
-commit=$(git rev-parse HEAD | cut -c 1-7)
-archive="zed-linux-${arch}.tar.gz"
-export ZED_BUNDLE_PATH="${CARGO_TARGET_DIR:-target}/release/${archive}"
-script/install.sh
diff --git a/script/install-mold b/script/install-mold
deleted file mode 100755
index b0bf851770..0000000000
--- a/script/install-mold
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/env bash
-
-# Install `mold` official binaries from GitHub Releases.
-#
-# Adapted from the official rui314/setup-mold@v1 action to:
-# * use environment variables instead of action inputs
-# * remove make-default support
-# * use curl instead of wget
-# * support doas for sudo
-# * support redhat systems
-# See: https://github.com/rui314/setup-mold/blob/main/action.yml
-
-set -euo pipefail
-
-MOLD_VERSION="2.34.0"
-
-if [ "$(uname -s)" != "Linux" ]; then
-    echo "Error: This script is intended for Linux systems only."
-    exit 1
-elif [ -e /usr/local/bin/mold ]; then
-    echo "Warning: existing mold found at /usr/local/bin/mold. Skipping installation."
-    exit 0
-fi
-
-if [ "$(whoami)" = root ]; then SUDO=; else SUDO="$(command -v sudo || command -v doas || true)"; fi
-
-MOLD_REPO="${MOLD_REPO:-https://github.com/rui314/mold}"
-MOLD_URL="${MOLD_URL:-$MOLD_REPO}/releases/download/v$MOLD_VERSION/mold-$MOLD_VERSION-$(uname -m)-linux.tar.gz"
-
-echo "Downloading from $MOLD_URL"
-curl -fsSL --output - "$MOLD_URL" \
-    | $SUDO tar -C /usr/local --strip-components=1 --no-overwrite-dir -xzf -
-
-# Note this binary depends on the system libatomic.so.1 which is usually
-# provided as a dependency of gcc so it should be available on most systems.
-
-cat <<EOF
-Mold is installed to /usr/local/bin/mold
-
-To make it your default, add or merge these lines into your ~/.cargo/config.toml:
-
-[target.'cfg(target_os = "linux")']
-linker = "clang"
-rustflags = ["-C", "link-arg=-fuse-ld=mold"]
-EOF
diff --git a/script/install-rustup.ps1 b/script/install-rustup.ps1
deleted file mode 100644
index 70ee410239..0000000000
--- a/script/install-rustup.ps1
+++ /dev/null
@@ -1,39 +0,0 @@
-# Checks if cargo is in the user's path or in default install path
-# If not, download with rustup-installer (which respects CARGO_HOME / RUSTUP_HOME)
-
-# Like 'set -e' in bash
-$ErrorActionPreference = "Stop"
-
-$cargoHome = if ($env:CARGO_HOME) { $env:CARGO_HOME } else { "$env:USERPROFILE\.cargo" }
-$rustupPath = "$cargoHome\bin\rustup.exe"
-$cargoPath = "$cargoHome\bin\cargo.exe"
-
-# Check if cargo is already available in path
-if (Get-Command cargo -ErrorAction SilentlyContinue)
-{
-    cargo --version
-    exit
-}
-# Check if rustup and cargo are available in CARGO_HOME
-elseif (-not ((Test-Path $rustupPath) -and (Test-Path $cargoPath))) {
-    Write-Output "Rustup or Cargo not found in $cargoHome, installing..."
-
-    $tempDir = [System.IO.Path]::GetTempPath()
-
-    # Download and install rustup
-    $RustupInitPath = "$tempDir\rustup-init.exe"
-    Write-Output "Downloading rustup installer..."
-    Invoke-WebRequest `
-        -OutFile $RustupInitPath `
-        -Uri https://static.rust-lang.org/rustup/dist/i686-pc-windows-gnu/rustup-init.exe
-
-    Write-Output "Installing rustup..."
-    & $RustupInitPath -y --default-toolchain none
-    Remove-Item -Force $RustupInitPath
-
-    Write-Output "Rust installation complete."
-    # This is necessary
-}
-
-& $rustupPath --version
-& $cargoPath --version
diff --git a/script/install-wild b/script/install-wild
deleted file mode 100755
index 4c2d034896..0000000000
--- a/script/install-wild
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/env bash
-
-# Install wild-linker official binaries from GitHub Releases.
-
-set -euo pipefail
-
-WILD_VERSION="${WILD_VERSION:-${1:-0.6.0}}"
-if [ "$(uname -s)" != "Linux" ]; then
-    echo "Error: This script is intended for Linux systems only."
-    exit 1
-elif [ -z "$WILD_VERSION" ]; then
-    echo "Usage: $0 [version]"
-    exit 1
-elif command -v wild >/dev/null 2>&1 && wild --version | grep -Fq "$WILD_VERSION" ; then
-    echo "Warning: existing wild $WILD_VERSION found at $(command -v wild). Skipping installation."
-    exit 0
-fi
-
-if [ "$(whoami)" = root ]; then SUDO=; else SUDO="$(command -v sudo || command -v doas || true)"; fi
-
-ARCH="$(uname -m)"
-WILD_REPO="${WILD_REPO:-https://github.com/davidlattimore/wild}"
-WILD_PACKAGE="wild-linker-${WILD_VERSION}-${ARCH}-unknown-linux-gnu"
-WILD_URL="${WILD_URL:-$WILD_REPO}/releases/download/$WILD_VERSION/${WILD_PACKAGE}.tar.gz"
-DEST_DIR=/usr/local/bin
-
-echo "Downloading from $WILD_URL"
-curl -fsSL --output - "$WILD_URL" \
-    | $SUDO tar -C ${DEST_DIR} --strip-components=1 --no-overwrite-dir -xzf - \
-    "${WILD_PACKAGE}/wild"
-
-cat <<EOF
-Wild is installed to ${DEST_DIR}/wild
-
-To make it your default, add or merge these lines into your ~/.cargo/config.toml:
-
-[target.x86_64-unknown-linux-gnu]
-linker = "clang"
-rustflags = ["-C", "link-arg=--ld-path=wild"]
-
-[target.aarch64-unknown-linux-gnu]
-linker = "clang"
-rustflags = ["-C", "link-arg=--ld-path=wild"]
-EOF
diff --git a/script/install.sh b/script/install.sh
deleted file mode 100755
index 0c2cfa1b74..0000000000
--- a/script/install.sh
+++ /dev/null
@@ -1,154 +0,0 @@
-#!/usr/bin/env sh
-set -eu
-
-# Downloads the latest tarball from https://zed.dev/releases and unpacks it
-# into ~/.local/. If you'd prefer to do this manually, instructions are at
-# https://zed.dev/docs/linux.
-
-main() {
-    platform="$(uname -s)"
-    arch="$(uname -m)"
-    channel="${ZED_CHANNEL:-stable}"
-    # Use TMPDIR if available (for environments with non-standard temp directories)
-    if [ -n "${TMPDIR:-}" ] && [ -d "${TMPDIR}" ]; then
-        temp="$(mktemp -d "$TMPDIR/zed-XXXXXX")"
-    else
-        temp="$(mktemp -d "/tmp/zed-XXXXXX")"
-    fi
-
-    if [ "$platform" = "Darwin" ]; then
-        platform="macos"
-    elif [ "$platform" = "Linux" ]; then
-        platform="linux"
-    else
-        echo "Unsupported platform $platform"
-        exit 1
-    fi
-
-    case "$platform-$arch" in
-        macos-arm64* | linux-arm64* | linux-armhf | linux-aarch64)
-            arch="aarch64"
-            ;;
-        macos-x86* | linux-x86* | linux-i686*)
-            arch="x86_64"
-            ;;
-        *)
-            echo "Unsupported platform or architecture"
-            exit 1
-            ;;
-    esac
-
-    if command -v curl >/dev/null 2>&1; then
-        curl () {
-            command curl -fL "$@"
-        }
-    elif command -v wget >/dev/null 2>&1; then
-        curl () {
-            wget -O- "$@"
-        }
-    else
-        echo "Could not find 'curl' or 'wget' in your path"
-        exit 1
-    fi
-
-    "$platform" "$@"
-
-    if [ "$(command -v zed)" = "$HOME/.local/bin/zed" ]; then
-        echo "Zed has been installed. Run with 'zed'"
-    else
-        echo "To run Zed from your terminal, you must add ~/.local/bin to your PATH"
-        echo "Run:"
-
-        case "$SHELL" in
-            *zsh)
-                echo "   echo 'export PATH=\$HOME/.local/bin:\$PATH' >> ~/.zshrc"
-                echo "   source ~/.zshrc"
-                ;;
-            *fish)
-                echo "   fish_add_path -U $HOME/.local/bin"
-                ;;
-            *)
-                echo "   echo 'export PATH=\$HOME/.local/bin:\$PATH' >> ~/.bashrc"
-                echo "   source ~/.bashrc"
-                ;;
-        esac
-
-        echo "To run Zed now, '~/.local/bin/zed'"
-    fi
-}
-
-linux() {
-    if [ -n "${ZED_BUNDLE_PATH:-}" ]; then
-        cp "$ZED_BUNDLE_PATH" "$temp/zed-linux-$arch.tar.gz"
-    else
-        echo "Downloading Zed"
-        curl "https://cloud.zed.dev/releases/$channel/latest/download?asset=zed&arch=$arch&os=linux&source=install.sh" > "$temp/zed-linux-$arch.tar.gz"
-    fi
-
-    suffix=""
-    if [ "$channel" != "stable" ]; then
-        suffix="-$channel"
-    fi
-
-    appid=""
-    case "$channel" in
-      stable)
-        appid="dev.zed.Zed"
-        ;;
-      nightly)
-        appid="dev.zed.Zed-Nightly"
-        ;;
-      preview)
-        appid="dev.zed.Zed-Preview"
-        ;;
-      dev)
-        appid="dev.zed.Zed-Dev"
-        ;;
-      *)
-        echo "Unknown release channel: ${channel}. Using stable app ID."
-        appid="dev.zed.Zed"
-        ;;
-    esac
-
-    # Unpack
-    rm -rf "$HOME/.local/zed$suffix.app"
-    mkdir -p "$HOME/.local/zed$suffix.app"
-    tar -xzf "$temp/zed-linux-$arch.tar.gz" -C "$HOME/.local/"
-
-    # Setup ~/.local directories
-    mkdir -p "$HOME/.local/bin" "$HOME/.local/share/applications"
-
-    # Link the binary
-    if [ -f "$HOME/.local/zed$suffix.app/bin/zed" ]; then
-        ln -sf "$HOME/.local/zed$suffix.app/bin/zed" "$HOME/.local/bin/zed"
-    else
-        # support for versions before 0.139.x.
-        ln -sf "$HOME/.local/zed$suffix.app/bin/cli" "$HOME/.local/bin/zed"
-    fi
-
-    # Copy .desktop file
-    desktop_file_path="$HOME/.local/share/applications/${appid}.desktop"
-    cp "$HOME/.local/zed$suffix.app/share/applications/zed$suffix.desktop" "${desktop_file_path}"
-    sed -i "s|Icon=zed|Icon=$HOME/.local/zed$suffix.app/share/icons/hicolor/512x512/apps/zed.png|g" "${desktop_file_path}"
-    sed -i "s|Exec=zed|Exec=$HOME/.local/zed$suffix.app/bin/zed|g" "${desktop_file_path}"
-}
-
-macos() {
-    echo "Downloading Zed"
-    curl "https://cloud.zed.dev/releases/$channel/latest/download?asset=zed&os=macos&arch=$arch&source=install.sh" > "$temp/Zed-$arch.dmg"
-    hdiutil attach -quiet "$temp/Zed-$arch.dmg" -mountpoint "$temp/mount"
-    app="$(cd "$temp/mount/"; echo *.app)"
-    echo "Installing $app"
-    if [ -d "/Applications/$app" ]; then
-        echo "Removing existing $app"
-        rm -rf "/Applications/$app"
-    fi
-    ditto "$temp/mount/$app" "/Applications/$app"
-    hdiutil detach -quiet "$temp/mount"
-
-    mkdir -p "$HOME/.local/bin"
-    # Link the binary
-    ln -sf "/Applications/$app/Contents/MacOS/cli" "$HOME/.local/bin/zed"
-}
-
-main "$@"
diff --git a/script/kube-shell b/script/kube-shell
deleted file mode 100755
index 67f9fc2a6b..0000000000
--- a/script/kube-shell
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-if [[ $# -ne 1 ]]; then
-  echo "Usage: $0 [production|staging|...]"
-  exit 1
-fi
-
-export ZED_KUBE_NAMESPACE=$1
-
-pod=$(kubectl --namespace=${ZED_KUBE_NAMESPACE} get pods --selector=app=zed --output=jsonpath='{.items[*].metadata.name}')
-exec kubectl --namespace $ZED_KUBE_NAMESPACE exec --tty --stdin $pod -- /bin/bash
diff --git a/script/language-extension-version b/script/language-extension-version
deleted file mode 100755
index 119021e566..0000000000
--- a/script/language-extension-version
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-
-set -euox pipefail
-
-if [ "$#" -lt 1 ]; then
-  echo "Usage: $0 <language> [version]"
-  exit 1
-fi
-
-LANGUAGE=$1
-VERSION=${2:-}
-
-EXTENSION_DIR="extensions/$LANGUAGE"
-EXTENSION_TOML="$EXTENSION_DIR/extension.toml"
-CARGO_TOML="$EXTENSION_DIR/Cargo.toml"
-
-if [ ! -d "$EXTENSION_DIR" ]; then
-  echo "Directory $EXTENSION_DIR does not exist."
-  exit 1
-fi
-
-if [ -z "$VERSION" ]; then
-  grep -m 1 'version =' "$EXTENSION_TOML" | awk -F\" '{print $2}'
-  exit 0
-fi
-
-sed -i '' -e "s/^version = \".*\"/version = \"$VERSION\"/" "$EXTENSION_TOML"
-sed -i '' -e "s/^version = \".*\"/version = \"$VERSION\"/" "$CARGO_TOML"
-cargo update --workspace
diff --git a/script/lib/blob-store.ps1 b/script/lib/blob-store.ps1
deleted file mode 100644
index 38bf1682d2..0000000000
--- a/script/lib/blob-store.ps1
+++ /dev/null
@@ -1,68 +0,0 @@
-function UploadToBlobStoreWithACL {
-    param (
-        [string]$BucketName,
-        [string]$FileToUpload,
-        [string]$BlobStoreKey,
-        [string]$ACL
-    )
-
-    # Format date to match AWS requirements
-    $Date = (Get-Date).ToUniversalTime().ToString("r")
-    # Note: Original script had a bug where it overrode the ACL parameter
-    # I'm keeping the same behavior for compatibility
-    $ACL = "public-read"
-    $ContentType = "application/octet-stream"
-    $StorageClass = "STANDARD"
-
-    # Create string to sign (AWS S3 compatible format)
-    $StringToSign = "PUT`n`n${ContentType}`n${Date}`nx-amz-acl:${ACL}`nx-amz-storage-class:${StorageClass}`n/${BucketName}/${BlobStoreKey}"
-
-    # Generate HMAC-SHA1 signature
-    $HMACSHA1 = New-Object System.Security.Cryptography.HMACSHA1
-    $HMACSHA1.Key = [System.Text.Encoding]::UTF8.GetBytes($env:DIGITALOCEAN_SPACES_SECRET_KEY)
-    $Signature = [System.Convert]::ToBase64String($HMACSHA1.ComputeHash([System.Text.Encoding]::UTF8.GetBytes($StringToSign)))
-
-    # Upload file using Invoke-WebRequest (equivalent to curl)
-    $Headers = @{
-        "Host" = "${BucketName}.nyc3.digitaloceanspaces.com"
-        "Date" = $Date
-        "Content-Type" = $ContentType
-        "x-amz-storage-class" = $StorageClass
-        "x-amz-acl" = $ACL
-        "Authorization" = "AWS ${env:DIGITALOCEAN_SPACES_ACCESS_KEY}:$Signature"
-    }
-
-    $Uri = "https://${BucketName}.nyc3.digitaloceanspaces.com/${BlobStoreKey}"
-
-    # Read file content
-    $FileContent = Get-Content $FileToUpload -Raw -AsByteStream
-
-    try {
-        Invoke-WebRequest -Uri $Uri -Method PUT -Headers $Headers -Body $FileContent -ContentType $ContentType -Verbose
-        Write-Host "Successfully uploaded $FileToUpload to $Uri" -ForegroundColor Green
-    }
-    catch {
-        Write-Error "Failed to upload file: $_"
-        throw $_
-    }
-}
-
-function UploadToBlobStorePublic {
-    param (
-        [string]$BucketName,
-        [string]$FileToUpload,
-        [string]$BlobStoreKey
-    )
-
-    UploadToBlobStoreWithACL -BucketName $BucketName -FileToUpload $FileToUpload -BlobStoreKey $BlobStoreKey -ACL "public-read"
-}
-
-function UploadToBlobStore {
-    param (
-        [string]$BucketName,
-        [string]$FileToUpload,
-        [string]$BlobStoreKey
-    )
-
-    UploadToBlobStoreWithACL -BucketName $BucketName -FileToUpload $FileToUpload -BlobStoreKey $BlobStoreKey -ACL "private"
-}
diff --git a/script/lib/blob-store.sh b/script/lib/blob-store.sh
deleted file mode 100644
index 8a119bc826..0000000000
--- a/script/lib/blob-store.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-function upload_to_blob_store_with_acl
-{
-    bucket_name="$1"
-    file_to_upload="$2"
-    blob_store_key="$3"
-    acl="$4"
-
-    date=$(date +"%a, %d %b %Y %T %z")
-    content_type="application/octet-stream"
-    storage_type="x-amz-storage-class:STANDARD"
-    string="PUT\n\n${content_type}\n${date}\n${acl}\n${storage_type}\n/${bucket_name}/${blob_store_key}"
-    signature=$(echo -en "${string}" | openssl sha1 -hmac "${DIGITALOCEAN_SPACES_SECRET_KEY}" -binary | base64)
-
-    curl --fail -vv -s -X PUT -T "$file_to_upload" \
-        -H "Host: ${bucket_name}.nyc3.digitaloceanspaces.com" \
-        -H "Date: $date" \
-        -H "Content-Type: $content_type" \
-        -H "$storage_type" \
-        -H "$acl" \
-        -H "Authorization: AWS ${DIGITALOCEAN_SPACES_ACCESS_KEY}:$signature" \
-        "https://${bucket_name}.nyc3.digitaloceanspaces.com/${blob_store_key}"
-}
-
-function upload_to_blob_store_public
-{
-    upload_to_blob_store_with_acl "$1" "$2" "$3" "x-amz-acl:public-read"
-}
-
-function upload_to_blob_store
-{
-    upload_to_blob_store_with_acl "$1" "$2" "$3" "x-amz-acl:private"
-}
diff --git a/script/lib/bump-version.sh b/script/lib/bump-version.sh
deleted file mode 100755
index bfe3e29202..0000000000
--- a/script/lib/bump-version.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/env bash
-
-set -eu
-
-package=$1
-tag_prefix=$2
-tag_suffix=$3
-version_increment=$4
-gpui_release=${5:-false}
-
-if [[ -n $(git status --short --untracked-files=no) ]]; then
-  echo "can't bump version with uncommitted changes"
-  exit 1
-fi
-
-which cargo-set-version > /dev/null || cargo install cargo-edit
-which jq > /dev/null || brew install jq
-cargo set-version --package $package --bump $version_increment
-cargo check --quiet
-
-new_version=$(script/get-crate-version $package)
-branch_name=$(git rev-parse --abbrev-ref HEAD)
-old_sha=$(git rev-parse HEAD)
-tag_name=${tag_prefix}${new_version}${tag_suffix}
-
-git commit --quiet --all --message "${package} ${new_version}"
-git tag ${tag_name}
-
-if [[ "$gpui_release" == "true" ]]; then
-cat <<MESSAGE
-Locally committed and tagged ${package} version ${new_version}
-
-To push this:
-
-    git push origin ${tag_name} ${branch_name}; gh pr create -H ${branch_name}
-
-To undo this:
-
-    git branch -D ${branch_name} && git tag -d ${tag_name}
-
-MESSAGE
-else
-cat <<MESSAGE
-Locally committed and tagged ${package} version ${new_version}
-
-To push this:
-
-    git push origin ${tag_name} ${branch_name}
-
-To undo this:
-
-    git reset --hard ${old_sha} && git tag -d ${tag_name}
-
-MESSAGE
-fi
diff --git a/script/lib/deploy-helpers.sh b/script/lib/deploy-helpers.sh
deleted file mode 100644
index bd7b3c4d6f..0000000000
--- a/script/lib/deploy-helpers.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-function export_vars_for_environment {
-  local environment=$1
-  local env_file="crates/collab/k8s/environments/${environment}.sh"
-  if [[ ! -f $env_file ]]; then
-    echo "Invalid environment name '${environment}'" >&2
-    exit 1
-  fi
-  export $(grep -v '^#' $env_file | grep -v '^[[:space:]]*$')
-}
-
-function target_zed_kube_cluster {
-  if [[ $(kubectl config current-context 2> /dev/null) != do-nyc1-zed-1 ]]; then
-    doctl kubernetes cluster kubeconfig save zed-1
-  fi
-}
-
-function tag_for_environment {
-  if [[ "$1" == "production" ]]; then
-    echo "collab-production"
-  elif [[ "$1" == "staging" ]]; then
-    echo "collab-staging"
-  else
-    echo "Invalid environment name '${environment}'" >&2
-    exit 1
-  fi
-}
-
-function url_for_environment {
-  if [[ "$1" == "production" ]]; then
-    echo "https://collab.zed.dev"
-  elif [[ "$1" == "staging" ]]; then
-    echo "https://collab-staging.zed.dev"
-  else
-    echo "Invalid environment name '${environment}'" >&2
-    exit 1
-  fi
-}
diff --git a/script/lib/squawk.toml b/script/lib/squawk.toml
deleted file mode 100644
index 83a238c4ff..0000000000
--- a/script/lib/squawk.toml
+++ /dev/null
@@ -1,11 +0,0 @@
-excluded_rules = [
-    # We use `serial` already, no point changing now.
-    "prefer-identity",
-
-    # We store timestamps in UTC, so we don't care about the timezone.
-    "prefer-timestamptz",
-
-    "prefer-big-int",
-    "prefer-bigint-over-int",
-]
-pg_version = "15.0"
diff --git a/script/lib/workspace.ps1 b/script/lib/workspace.ps1
deleted file mode 100644
index c6fdc274c1..0000000000
--- a/script/lib/workspace.ps1
+++ /dev/null
@@ -1,6 +0,0 @@
-
-function ParseZedWorkspace {
-    $metadata = cargo metadata --no-deps --offline | ConvertFrom-Json
-    $env:ZED_WORKSPACE = $metadata.workspace_root
-    $env:RELEASE_VERSION = $metadata.packages | Where-Object { $_.name -eq "zed" } | Select-Object -ExpandProperty version
-}
diff --git a/script/licenses/template.csv.hbs b/script/licenses/template.csv.hbs
deleted file mode 100644
index 1459aa648d..0000000000
--- a/script/licenses/template.csv.hbs
+++ /dev/null
@@ -1,6 +0,0 @@
-Crate Name,Crate Version,License,Url
-{{#each licenses}}
-{{#each used_by}}
-{{crate.name}},{{crate.version}},{{../name}},{{#if crate.repository}}{{crate.repository}}{{else}}https://crates.io/crates/{{crate.name}}{{/if}}
-{{/each}}
-{{/each}}
diff --git a/script/licenses/template.md.hbs b/script/licenses/template.md.hbs
deleted file mode 100644
index f37761f2c5..0000000000
--- a/script/licenses/template.md.hbs
+++ /dev/null
@@ -1,51 +0,0 @@
-## Overview of licenses:
-
-{{#each overview}}
-* {{name}} ({{count}})
-{{/each}}
-
-### All license texts:
-{{#each licenses}}
-
-#### {{name}}
-
-##### Used by:
-
-{{#each used_by}}
-* [{{crate.name}} {{crate.version}}]({{#if crate.repository}} {{crate.repository}} {{else}} https://crates.io/crates/{{crate.name}} {{/if}})
-{{/each}}
-
-{{text}}
-
---------------------------------------------------------------------------------
-{{/each}}
-
-#### MIT License
-
-##### Used by:
-
-* [Windows Terminal]( https://github.com/microsoft/terminal )
-
-Copyright (c) Microsoft Corporation. All rights reserved.
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
---------------------------------------------------------------------------------
diff --git a/script/licenses/zed-licenses.toml b/script/licenses/zed-licenses.toml
deleted file mode 100644
index 572dd5c14a..0000000000
--- a/script/licenses/zed-licenses.toml
+++ /dev/null
@@ -1,47 +0,0 @@
-no-clearly-defined = true
-private = { ignore = true }
-# Licenses allowed in Zed's dependencies. AGPL should not be added to
-# this list as use of AGPL software is sometimes disallowed. When
-# adding to this list, please check the following open source license
-# policies:
-#
-# * https://opensource.google/documentation/reference/thirdparty/licenses
-#
-# The Zed project does have AGPL crates, but these are only involved
-# in servers and are not built into the binaries in the release
-# tarball. `script/check-licenses` checks that AGPL crates are not
-# involved in release binaries.
-accepted = [
-    "Apache-2.0",
-    "MIT",
-    "MIT-0",
-    "Apache-2.0 WITH LLVM-exception",
-    "MPL-2.0",
-    "BSD-3-Clause",
-    "BSD-2-Clause",
-    "ISC",
-    "CC0-1.0",
-    "NCSA",
-    "Unicode-3.0",
-    "OpenSSL",
-    "Zlib",
-    "BSL-1.0",
-]
-
-[procinfo.clarify]
-license = "MIT"
-[[procinfo.clarify.files]]
-path = 'LICENSE.md'
-checksum = '37db33bbbd7348969eda397b89a16f252d56c1ca7481b6ccaf56ccdcbab5dcca'
-
-[webpki.clarify]
-license = "ISC" # It actually says 'ISC-style' but I don't know the SPDX expression for that.
-[[webpki.clarify.files]]
-path = 'LICENSE'
-checksum = '5b698ca13897be3afdb7174256fa1574f8c6892b8bea1a66dd6469d3fe27885a'
-
-[fuchsia-cprng.clarify]
-license = "BSD-3-Clause"
-[[fuchsia-cprng.clarify.files]]
-path = 'LICENSE'
-checksum = '03b114f53e6587a398931762ee11e2395bfdba252a329940e2c8c9e81813845b'
diff --git a/script/mitm-proxy.sh b/script/mitm-proxy.sh
deleted file mode 100755
index 86b151125d..0000000000
--- a/script/mitm-proxy.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-if command -v docker >/dev/null 2>&1; then
-    ENGINE="docker"
-elif command -v podman >/dev/null 2>&1; then
-    ENGINE="podman"
-else
-    echo "Neither Docker nor Podman found. Please install one of them."
-    exit 1
-fi
-if [ ! -d ~/.mitmproxy ]; then
-    mkdir -p ~/.mitmproxy
-fi
-
-CONTAINER_ID="$(${ENGINE} run -d --rm -it -v ~/.mitmproxy:/home/mitmproxy/.mitmproxy -p 9876:8080 mitmproxy/mitmproxy mitmdump)"
-
-trap "${ENGINE} stop \"$CONTAINER_ID\" 1> /dev/null || true; exit 1" SIGINT
-
-echo "Add the root certificate created in ~/.mitmproxy to your certificate chain for HTTP"
-echo "on macOS:"
-echo "sudo security add-trusted-cert -d -p ssl -p basic -k /Library/Keychains/System.keychain ~/.mitmproxy/mitmproxy-ca-cert.pem"
-echo "Press enter to continue"
-read
-
-http_proxy=http://localhost:9876 cargo run
-
-# Clean up detached proxy after running
-${ENGINE} stop "${CONTAINER_ID}" 2>/dev/null || true
diff --git a/script/new-crate b/script/new-crate
deleted file mode 100755
index 52ee900b30..0000000000
--- a/script/new-crate
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/usr/bin/env bash
-
-# Try to make sure we are in the zed repo root
-if [ ! -d "crates" ] || [ ! -d "script" ]; then
-    echo "Error: Run from the \`zed\` repo root"
-    exit 1
-fi
-
-if [ ! -f "Cargo.toml" ]; then
-    echo "Error: Run from the \`zed\` repo root"
-    exit 1
-fi
-
-if [ $# -eq 0 ]; then
-    echo "Usage: $0 <crate_name> [optional_license_flag]"
-    exit 1
-fi
-
-CRATE_NAME="$1"
-
-LICENSE_FLAG=$(echo "${2}" | tr '[:upper:]' '[:lower:]')
-if [[ "$LICENSE_FLAG" == *"apache"* ]]; then
-    LICENSE_MODE="Apache-2.0"
-    LICENSE_FILE="LICENSE-APACHE"
-elif [[ "$LICENSE_FLAG" == *"agpl"* ]]; then
-    LICENSE_MODE="AGPL-3.0-or-later"
-    LICENSE_FILE="LICENSE-AGPL"
-else
-    LICENSE_MODE="GPL-3.0-or-later"
-    LICENSE_FILE="LICENSE-GPL"
-fi
-
-if [[ ! "$CRATE_NAME" =~ ^[a-z0-9_]+$ ]]; then
-    echo "Error: Crate name must be lowercase and contain only alphanumeric characters and underscores"
-    exit 1
-fi
-
-CRATE_PATH="crates/$CRATE_NAME"
-mkdir -p "$CRATE_PATH/src"
-
-# Symlink the license
-ln -sf "../../$LICENSE_FILE" "$CRATE_PATH/$LICENSE_FILE"
-
-CARGO_TOML_TEMPLATE=$(cat << 'EOF'
-[package]
-name = "$CRATE_NAME"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "$LICENSE_MODE"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/$CRATE_NAME.rs"
-
-[features]
-default = []
-
-[dependencies]
-anyhow.workspace = true
-gpui.workspace = true
-ui.workspace = true
-util.workspace = true
-
-# Uncomment other workspace dependencies as needed
-# assistant.workspace = true
-# client.workspace = true
-# project.workspace = true
-# settings.workspace = true
-EOF
-)
-
-# Populate template
-CARGO_TOML_CONTENT=$(echo "$CARGO_TOML_TEMPLATE" | sed \
-    -e "s/\$CRATE_NAME/$CRATE_NAME/g" \
-    -e "s/\$LICENSE_MODE/$LICENSE_MODE/g")
-
-echo "$CARGO_TOML_CONTENT" > "$CRATE_PATH/Cargo.toml"
-
-echo "//! # $CRATE_NAME" > "$CRATE_PATH/src/$CRATE_NAME.rs"
-
-echo "Created new crate: $CRATE_NAME in $CRATE_PATH"
-echo "License: $LICENSE_MODE (symlinked from $LICENSE_FILE)"
-echo "Don't forget to add the new crate to the workspace!"
diff --git a/script/prettier b/script/prettier
deleted file mode 100755
index 5ad5d15cf0..0000000000
--- a/script/prettier
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-set -euxo pipefail
-
-PRETTIER_VERSION=3.5.0
-
-pnpm dlx "prettier@${PRETTIER_VERSION}" assets/settings/default.json --parser=jsonc --check || {
-    echo "To fix, run from the root of the Zed repo:"
-    echo "  pnpm dlx prettier@${PRETTIER_VERSION} assets/settings/default.json --parser=jsonc --write"
-    false
-}
-
-cd docs
-pnpm dlx "prettier@${PRETTIER_VERSION}" . --check || {
-    echo "To fix, run from the root of the Zed repo:"
-    echo "  cd docs && pnpm dlx prettier@${PRETTIER_VERSION} . --write && cd .."
-    false
-}
diff --git a/script/prompts b/script/prompts
deleted file mode 100755
index 5486600c1e..0000000000
--- a/script/prompts
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/env bash
-
-# This script manages prompt overrides for the Zed editor.
-#
-# It provides functionality to:
-# 1. Link the current repository's prompt templates to Zed's configuration.
-# 2. Create and link a separate Git worktree for prompt management.
-# 3. Unlink previously linked prompt overrides.
-#
-# Usage:
-#   ./script_name.sh link             # Link current repo's prompts
-#   ./script_name.sh link --worktree  # Create and link a separate worktree
-#   ./script_name.sh unlink           # Remove existing prompt override link
-#
-# The script ensures proper Git branch and worktree setup when using the
-# --worktree option. It also provides informative output and error handling.
-
-if [ "$1" = "link" ]; then
-    # Remove existing link (or directory)
-    rm -rf ~/.config/zed/prompt_overrides
-    if [ "$2" = "--worktree" ]; then
-        # Check if 'prompts' branch exists, create if not
-        if ! git show-ref --quiet refs/heads/prompts; then
-            git branch prompts
-        fi
-        # Check if 'prompts' worktree exists
-        if git worktree list | grep -q "../zed_prompts"; then
-            echo "Worktree already exists at ../zed_prompts."
-        else
-            # Create worktree if it doesn't exist
-            git worktree add ../zed_prompts prompts || git worktree add ../zed_prompts -b prompts
-        fi
-        ln -sf "$(realpath "$(pwd)/../zed_prompts/assets/prompts")" ~/.config/zed/prompt_overrides
-        echo "Linked $(realpath "$(pwd)/../zed_prompts/assets/prompts") to ~/.config/zed/prompt_overrides"
-        echo -e "\033[0;33mDon't forget you have it linked, or your prompts will go stale\033[0m"
-    else
-        ln -sf "$(pwd)/assets/prompts" ~/.config/zed/prompt_overrides
-        echo "Linked $(pwd)/assets/prompts to ~/.config/zed/prompt_overrides"
-    fi
-elif [ "$1" = "unlink" ]; then
-    if [ -e ~/.config/zed/prompt_overrides ]; then
-        # Remove symbolic link
-        rm -rf ~/.config/zed/prompt_overrides
-        echo "Unlinked ~/.config/zed/prompt_overrides"
-    else
-        echo -e "\033[33mWarning: No file exists at ~/.config/zed/prompt_overrides\033[0m"
-    fi
-else
-    echo "This script helps you manage prompt overrides for Zed."
-    echo "You can link this directory to have Zed use the contents of your current repo templates as your active prompts,"
-    echo "or store your modifications in a separate Git worktree."
-    echo
-    echo "Usage: $0 [link [--worktree]|unlink]"
-    echo
-    echo "Options:"
-    echo "  link               Create a symbolic link from ./assets/prompts to ~/.config/zed/prompt_overrides"
-    echo "  link --worktree    Create a 'prompts' Git worktree in ../prompts, then link ../prompts/assets/prompts"
-    echo "                     to ~/.config/zed/prompt_overrides"
-    echo "  unlink             Remove the symbolic link at ~/.config/zed/prompt_overrides"
-    exit 1
-fi
diff --git a/script/randomized-test-ci b/script/randomized-test-ci
deleted file mode 100755
index 36eab40a7a..0000000000
--- a/script/randomized-test-ci
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/usr/bin/env node --redirect-warnings=/dev/null
-
-const fs = require("fs");
-const { randomBytes } = require("crypto");
-const { execFileSync } = require("child_process");
-const {
-  minimizeTestPlan,
-  buildTests,
-  runTests,
-} = require("./randomized-test-minimize");
-
-const { ZED_SERVER_URL } = process.env;
-if (!ZED_SERVER_URL) throw new Error("Missing env var `ZED_SERVER_URL`");
-
-main();
-
-async function main() {
-  buildTests();
-
-  const seed = randomU64();
-  const commit = execFileSync("git", ["rev-parse", "HEAD"], {
-    encoding: "utf8",
-  }).trim();
-
-  console.log("commit:", commit);
-  console.log("starting seed:", seed);
-
-  const planPath = "target/test-plan.json";
-  const minPlanPath = "target/test-plan.min.json";
-  const failingSeed = runTests({
-    SEED: seed,
-    SAVE_PLAN: planPath,
-    ITERATIONS: 50000,
-    OPERATIONS: 200,
-  });
-
-  if (!failingSeed) {
-    console.log("tests passed");
-    return;
-  }
-
-  console.log("found failure at seed", failingSeed);
-  const minimizedSeed = minimizeTestPlan(planPath, minPlanPath);
-  const minimizedPlan = fs.readFileSync(minPlanPath, "utf8");
-
-  console.log("minimized plan:\n", minimizedPlan);
-
-  const url = `${ZED_SERVER_URL}/api/randomized_test_failure`;
-  const body = {
-    seed: minimizedSeed,
-    plan: JSON.parse(minimizedPlan),
-    commit: commit,
-  };
-  await fetch(url, {
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify(body),
-  });
-
-  process.exit(1);
-}
-
-function randomU64() {
-  const bytes = randomBytes(8);
-  const hexString = bytes.reduce(
-    (string, byte) => string + byte.toString(16),
-    "",
-  );
-  return BigInt("0x" + hexString).toString(10);
-}
diff --git a/script/randomized-test-minimize b/script/randomized-test-minimize
deleted file mode 100755
index efed3ee501..0000000000
--- a/script/randomized-test-minimize
+++ /dev/null
@@ -1,135 +0,0 @@
-#!/usr/bin/env node --redirect-warnings=/dev/null
-
-const fs = require("fs");
-const path = require("path");
-const { spawnSync } = require("child_process");
-
-const FAILING_SEED_REGEX = /failing seed: (\d+)/gi;
-const CARGO_TEST_ARGS = ["--release", "--lib", "--package", "collab"];
-
-if (require.main === module) {
-  if (process.argv.length < 4) {
-    process.stderr.write(
-      "usage: script/randomized-test-minimize <input-plan> <output-plan> [start-index]\n",
-    );
-    process.exit(1);
-  }
-
-  minimizeTestPlan(
-    process.argv[2],
-    process.argv[3],
-    parseInt(process.argv[4]) || 0,
-  );
-}
-
-function minimizeTestPlan(inputPlanPath, outputPlanPath, startIndex = 0) {
-  const tempPlanPath = inputPlanPath + ".try";
-
-  fs.copyFileSync(inputPlanPath, outputPlanPath);
-  let testPlan = JSON.parse(fs.readFileSync(outputPlanPath, "utf8"));
-
-  process.stderr.write("minimizing failing test plan...\n");
-  for (let ix = startIndex; ix < testPlan.length; ix++) {
-    // Skip 'MutateClients' entries, since they themselves are not single operations.
-    if (testPlan[ix].MutateClients) {
-      continue;
-    }
-
-    // Remove a row from the test plan
-    const newTestPlan = testPlan.slice();
-    newTestPlan.splice(ix, 1);
-    fs.writeFileSync(tempPlanPath, serializeTestPlan(newTestPlan), "utf8");
-
-    process.stderr.write(
-      `${ix}/${testPlan.length}: ${JSON.stringify(testPlan[ix])}`,
-    );
-    const failingSeed = runTests({
-      SEED: "0",
-      LOAD_PLAN: tempPlanPath,
-      SAVE_PLAN: tempPlanPath,
-      ITERATIONS: "500",
-    });
-
-    // If the test failed, keep the test plan with the removed row. Reload the test
-    // plan from the JSON file, since the test itself will remove any operations
-    // which are no longer valid before saving the test plan.
-    if (failingSeed != null) {
-      process.stderr.write(` - remove. failing seed: ${failingSeed}.\n`);
-      fs.copyFileSync(tempPlanPath, outputPlanPath);
-      testPlan = JSON.parse(fs.readFileSync(outputPlanPath, "utf8"));
-      ix--;
-    } else {
-      process.stderr.write(` - keep.\n`);
-    }
-  }
-
-  fs.unlinkSync(tempPlanPath);
-
-  // Re-run the final minimized plan to get the correct failing seed.
-  // This is a workaround for the fact that the execution order can
-  // slightly change when replaying a test plan after it has been
-  // saved and loaded.
-  const failingSeed = runTests({
-    SEED: "0",
-    ITERATIONS: "5000",
-    LOAD_PLAN: outputPlanPath,
-  });
-
-  process.stderr.write(`final test plan: ${outputPlanPath}\n`);
-  process.stderr.write(`final seed: ${failingSeed}\n`);
-  return failingSeed;
-}
-
-function buildTests() {
-  const { status } = spawnSync(
-    "cargo",
-    ["test", "--no-run", ...CARGO_TEST_ARGS],
-    {
-      stdio: "inherit",
-      encoding: "utf8",
-      env: {
-        ...process.env,
-      },
-    },
-  );
-  if (status !== 0) {
-    throw new Error("build failed");
-  }
-}
-
-function runTests(env) {
-  const { status, stdout } = spawnSync(
-    "cargo",
-    ["test", ...CARGO_TEST_ARGS, "random_project_collaboration"],
-    {
-      stdio: "pipe",
-      encoding: "utf8",
-      env: {
-        ...process.env,
-        ...env,
-      },
-    },
-  );
-
-  if (status !== 0) {
-    FAILING_SEED_REGEX.lastIndex = 0;
-    const match = FAILING_SEED_REGEX.exec(stdout);
-    if (!match) {
-      process.stderr.write("test failed, but no failing seed found:\n");
-      process.stderr.write(stdout);
-      process.stderr.write("\n");
-      process.exit(1);
-    }
-    return match[1];
-  } else {
-    return null;
-  }
-}
-
-function serializeTestPlan(plan) {
-  return "[\n" + plan.map((row) => JSON.stringify(row)).join(",\n") + "\n]\n";
-}
-
-exports.buildTests = buildTests;
-exports.runTests = runTests;
-exports.minimizeTestPlan = minimizeTestPlan;
diff --git a/script/remote-server b/script/remote-server
deleted file mode 100755
index 1ab2d943e1..0000000000
--- a/script/remote-server
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-
-set -xeuo pipefail
-
-# if root or if sudo/unavailable, define an empty variable
-if [ "$(id -u)" -eq 0 ]
-then maysudo=''
-else maysudo="$(command -v sudo || command -v doas || true)"
-fi
-
-deps=(
-  clang
-)
-
-$maysudo apt-get update
-$maysudo apt-get install -y "${deps[@]}"
-exit 0
diff --git a/script/reset_db b/script/reset_db
deleted file mode 100755
index 8b04cd6cd2..0000000000
--- a/script/reset_db
+++ /dev/null
@@ -1,3 +0,0 @@
-psql postgres -c "DROP DATABASE zed WITH (FORCE);"
-psql postgres -c "DROP DATABASE zed_llm WITH (FORCE);"
-script/bootstrap
diff --git a/script/run-local-minio b/script/run-local-minio
deleted file mode 100755
index 61266abb21..0000000000
--- a/script/run-local-minio
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-if ! which minio > /dev/null; then
-    echo "minio not found - run script/bootstrap to install it and do other setup"
-    exit 1
-fi
-
-mkdir -p .blob_store/the-extensions-bucket
-mkdir -p .blob_store/zed-crash-reports
-
-export MINIO_ROOT_USER=the-blob-store-access-key
-export MINIO_ROOT_PASSWORD=the-blob-store-secret-key
-exec minio server --quiet .blob_store
diff --git a/script/run-unit-evals b/script/run-unit-evals
deleted file mode 100755
index adbf965536..0000000000
--- a/script/run-unit-evals
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-set -euxo pipefail
-
-if [ -n "${UNIT_EVAL_COMMIT:-}" ]; then
-  git fetch origin "$UNIT_EVAL_COMMIT" && git checkout "$UNIT_EVAL_COMMIT"
-fi
-
-GPUI_TEST_TIMEOUT=1500 cargo nextest run --workspace --no-fail-fast --features unit-eval --no-capture -E 'test(::eval_)'
diff --git a/script/seed-db b/script/seed-db
deleted file mode 100755
index 4ae8977d14..0000000000
--- a/script/seed-db
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-cargo run -p collab migrate
diff --git a/script/setup-dev-driver.ps1 b/script/setup-dev-driver.ps1
deleted file mode 100644
index c5d39c5929..0000000000
--- a/script/setup-dev-driver.ps1
+++ /dev/null
@@ -1,39 +0,0 @@
-# Configures a drive for testing in CI.
-
-# Currently, total CI requires almost 45GB of space, here we are creating a 100GB drive.
-$Volume = New-VHD -Path C:/zed_dev_drive.vhdx -SizeBytes 100GB |
-                    Mount-VHD -Passthru |
-                    Initialize-Disk -Passthru |
-                    New-Partition -AssignDriveLetter -UseMaximumSize |
-                    Format-Volume -DevDrive -Confirm:$false -Force
-
-$Drive = "$($Volume.DriveLetter):"
-
-# Designate the Dev Drive as trusted
-# See https://learn.microsoft.com/en-us/windows/dev-drive/#how-do-i-designate-a-dev-drive-as-trusted
-fsutil devdrv trust $Drive
-
-# There is no virus on the Dev Drive!
-# Windows Defender is the wolf in antivirus wool, slowing your PC like a digital fool!
-# See https://learn.microsoft.com/en-us/windows/dev-drive/#how-do-i-configure-additional-filters-on-dev-drive
-fsutil devdrv enable /disallowAv
-
-# Remount so the changes take effect
-Dismount-VHD -Path C:/zed_dev_drive.vhdx
-Mount-VHD -Path C:/zed_dev_drive.vhdx
-
-# Show some debug information
-Write-Output $Volume
-Write-Output "Using Dev Drive at $Drive"
-
-# Move Cargo to the dev drive
-New-Item -Path "$($Drive)/.cargo/bin" -ItemType Directory -Force
-Copy-Item -Path "C:/Users/runneradmin/.cargo/*" -Destination "$($Drive)/.cargo/" -Recurse -Force
-
-Write-Output `
-	"DEV_DRIVE=$($Drive)" `
-	"RUSTUP_HOME=$($Drive)/.rustup" `
-	"CARGO_HOME=$($Drive)/.cargo" `
-	"ZED_WORKSPACE=$($Drive)/zed" `
-	"PATH=$($Drive)/.cargo/bin;$env:PATH" `
-	>> $env:GITHUB_ENV
diff --git a/script/shellcheck-scripts b/script/shellcheck-scripts
deleted file mode 100755
index d42b31d02f..0000000000
--- a/script/shellcheck-scripts
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-mode=${1:-error}
-[[ "$mode" =~ ^(error|warning)$ ]] || { echo "Usage: $0 [error|warning]"; exit 1; }
-
-cd "$(dirname "$0")/.." || exit 1
-
-find script -maxdepth 1 -type f -print0 |
-  xargs -0 grep -l -E '^#!(/bin/|/usr/bin/env )(sh|bash|dash)' |
-  xargs -r shellcheck -x -S "$mode" -C
diff --git a/script/snap-build b/script/snap-build
deleted file mode 100755
index 62eae6f9de..0000000000
--- a/script/snap-build
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-
-set -euxo pipefail
-
-if [ "$#" -ne 1 ]; then
-  echo "Usage: $0 <release_version>"
-  exit 1
-fi
-
-mkdir -p snap/gui
-
-export DO_STARTUP_NOTIFY="true"
-export APP_NAME="Zed"
-export APP_CLI="zed"
-export APP_ICON="\${SNAP}/meta/gui/zed.png"
-export APP_ARGS="%U"
-envsubst < "crates/zed/resources/zed.desktop.in" > "snap/gui/zed.desktop"
-cp "crates/zed/resources/app-icon.png" "snap/gui/zed.png"
-
-RELEASE_VERSION="$1" envsubst < crates/zed/resources/snap/snapcraft.yaml.in > snap/snapcraft.yaml
-
-# Clean seems to be needed to actually check that the snapcraft.yaml
-# works.  For example, when a `stage-package` is removed, it will
-# still remain on rebuild.
-snapcraft clean
-
-snapcraft
diff --git a/script/snap-try b/script/snap-try
deleted file mode 100755
index a262c0139a..0000000000
--- a/script/snap-try
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# This script is intended to be run after `snap-build`.
-#
-# It expects a version to be passed as the first argument, and expects
-# the built `.snap` for that version to be in the current directory.
-#
-# This will uninstall the current `zed` snap, replacing it with a snap
-# that directly uses the `snap/unpacked` directory.
-
-set -euxo pipefail
-
-if [ "$#" -ne 1 ]; then
-  echo "Usage: $0 <release_version>"
-  exit 1
-fi
-
-# Rerun as root
-[ "$UID" -eq 0 ] || exec sudo bash -e "$0" "$@"
-
-snap remove zed || true
-mkdir -p snap
-rm -rf snap/unpacked
-unsquashfs -dest snap/unpacked "zed_$1_amd64.snap"
-snap try --classic snap/unpacked
diff --git a/script/squawk b/script/squawk
deleted file mode 100755
index 497fcff089..0000000000
--- a/script/squawk
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env bash
-
-# Squawk is a linter for database migrations. It helps identify dangerous patterns, and suggests alternatives.
-# Squawk flagging an error does not mean that you need to take a different approach, but it does indicate you need to think about what you're doing.
-# See also: https://squawkhq.com
-
-set -e
-
-if [ -z "$GITHUB_BASE_REF" ]; then
-  echo 'Not a pull request, skipping squawk modified migrations linting'
-  exit
-fi
-
-SQUAWK_VERSION=0.26.0
-SQUAWK_BIN="./target/squawk-$SQUAWK_VERSION"
-SQUAWK_ARGS="--assume-in-transaction --config script/lib/squawk.toml"
-
-pkgutil --pkg-info com.apple.pkg.RosettaUpdateAuto || /usr/sbin/softwareupdate --install-rosetta --agree-to-license
-# When bootstrapping a brand new CI machine, the `target` directory may not exist yet.
-mkdir -p "./target"
-curl -L -o "$SQUAWK_BIN" "https://github.com/sbdchd/squawk/releases/download/v$SQUAWK_VERSION/squawk-darwin-x86_64"
-chmod +x "$SQUAWK_BIN"
-
-if [ -n "$SQUAWK_GITHUB_TOKEN" ]; then
-    export SQUAWK_GITHUB_REPO_OWNER=$(echo $GITHUB_REPOSITORY | awk -F/ '{print $1}')
-    export SQUAWK_GITHUB_REPO_NAME=$(echo $GITHUB_REPOSITORY | awk -F/ '{print $2}')
-    export SQUAWK_GITHUB_PR_NUMBER=$(echo $GITHUB_REF | awk 'BEGIN { FS = "/" } ; { print $3 }')
-
-    $SQUAWK_BIN $SQUAWK_ARGS upload-to-github $(git diff --name-only origin/$GITHUB_BASE_REF...origin/$GITHUB_HEAD_REF 'crates/collab/migrations/*.sql' 'crates/collab/migrations_llm/*.sql')
-else
-    $SQUAWK_BIN $SQUAWK_ARGS $(git ls-files --others crates/collab/migrations/*.sql crates/collab/migrations_llm/*.sql) $(git diff --name-only main crates/collab/migrations/*.sql crates/collab/migrations_llm/*.sql)
-fi
diff --git a/script/storybook b/script/storybook
deleted file mode 100755
index 20a81008d1..0000000000
--- a/script/storybook
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-if [ -z "$1" ]; then
-    cargo run -p storybook
-else
-    cargo run -p storybook -- "components/$1"
-fi
diff --git a/script/terms/terms.json b/script/terms/terms.json
deleted file mode 100644
index 9be983ba82..0000000000
--- a/script/terms/terms.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "body": [
-        {
-            "lang": "en-US",
-            "type": "rtf",
-            "file": "terms.rtf"
-        }
-    ]
-}
diff --git a/script/terms/terms.rtf b/script/terms/terms.rtf
deleted file mode 100644
index f5fab23f45..0000000000
--- a/script/terms/terms.rtf
+++ /dev/null
@@ -1,129 +0,0 @@
-{\rtf1\ansi\deff0{\fonttbl{\f0 \fswiss Helvetica;}{\f1 \fmodern Courier;}}
-{\colortbl;\red255\green0\blue0;\red0\green0\blue255;}
-\widowctrl\hyphauto
-
-{\pard \qc \f0 \sa180 \li0 \fi0 \b \fs36 Zed End User Terms\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \par}
-{\pard \ql \f0 \sa180 \li0 \fi0 PLEASE READ THESE TERMS AND CONDITIONS CAREFULLY BEFORE USING THE SERVICE OR SOFTWARE OFFERED BY ZED INDUSTRIES, INC. ("ZED", OR "WE"). BY ACCESSING OR USING THE SOLUTION (AS DEFINED BELOW) IN ANY MANNER, YOU ("YOU" OR "CUSTOMER") AGREE TO BE BOUND BY THESE TERMS (THE "AGREEMENT") TO THE EXCLUSION OF ALL OTHER TERMS. YOU REPRESENT AND WARRANT THAT YOU HAVE THE AUTHORITY TO ENTER INTO THIS AGREEMENT; IF YOU ARE ENTERING INTO THIS AGREEMENT ON BEHALF OF AN ORGANIZATION OR ENTITY, REFERENCES TO "CUSTOMER" AND "YOU" IN THIS AGREEMENT, REFER TO THAT ORGANIZATION OR ENTITY. IF YOU DO NOT AGREE TO ALL OF THE FOLLOWING, YOU MAY NOT USE OR ACCESS THE SOLUTION IN ANY MANNER. IF THE TERMS OF THIS AGREEMENT ARE CONSIDERED AN OFFER, ACCEPTANCE IS EXPRESSLY LIMITED TO SUCH TERMS.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel1 \b \fs32 1. ACCESS TO AND USE OF THE SOLUTION\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 Subject to the terms and conditions of this Agreement, Zed hereby grants to You, and You hereby accept from Zed, a term-limited, non-exclusive, non-transferable, non-assignable and non-sublicensable license to make use of the Editor for Your internal use only, and subject to the use limitations in Section 2.2.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel1 \b \fs32 2. TERMS APPLICABLE TO THE EDITOR\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel2 \b \fs28 2.1. License Grant\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 Subject to the terms and conditions of this Agreement, Zed hereby grants to You, and You hereby accept from Zed, a term-limited, non-exclusive, non-transferable, non-assignable and non-sublicensable license to make use of the Editor for Your internal use only, and subject to the use limitations in Section 2.2.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel2 \b \fs28 2.2. License Limitations\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 You agree that You shall not: (a) exceed the scope of the licenses granted in Section 2.1; (b) make copies of the Editor; (c) distribute, sublicense, assign, delegate, rent, lease, sell, time-share or otherwise transfer the benefits of, use under, or rights to, the license granted in Section 2.1; (d) reverse engineer, decompile, disassemble or otherwise attempt to learn the source code, structure or algorithms underlying the Editor, except to the extent required to be permitted under applicable law; (e) modify, translate or create derivative works of the Editor; or (f) remove any copyright, trademark, patent or other proprietary notice that appears on the Editor or copies thereof.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel2 \b \fs28 2.3. Open Source Software\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 Zed makes certain versions of the Editor and related software available at the Zed GitHub Repository: {\field{\*\fldinst{HYPERLINK "https://github.com/zed-industries/zed"}}{\fldrslt{\ul
-https://github.com/zed-industries/zed
-}}}
- (the "Repo"). Your use of such software is subject to the open source software licenses declared in the Repo.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel1 \b \fs32 3. TERMS APPLICABLE TO THE ZED SERVICE\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel2 \b \fs28 3.1. Access to and Scope of Zed Service\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 If you have elected to use the Zed Service by enabling or activating the Zed Service, Zed will use commercially reasonable efforts to make the Zed Service available to You as set forth in this Agreement. Once you elected to use the Zed Service, You may access and use the Zed Service during the Term, subject to Your compliance with the terms and conditions of the Agreement.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel2 \b \fs28 3.2. Restrictions\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 You will use the Zed Service only in accordance with all applicable laws, including, but not limited to, laws related to data (whether applicable within the United States, the European Union, or otherwise). You agree not to (and will not allow any third party to): (i) remove or otherwise alter any proprietary notices or labels from the Zed Service or any portion thereof; (ii) reverse engineer, decompile, disassemble, or otherwise attempt to discover the underlying structure, ideas, or algorithms of the Zed Service or any software used to provide or make the Zed Service available; or (iii) rent, resell or otherwise allow any third party access to or use of the Zed Service. Zed may suspend Your access to or use of the Zed Service as follows: (a) immediately if Zed reasonably believes Your use of the Zed Service may pose a security risk to or may adversely impact the Zed Service; or (b) if You are in breach of this Agreement.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel2 \b \fs28 3.3. Customer Data\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 You are solely responsible for Customer Data including, but not limited to: (a) compliance with all applicable laws and this Agreement; (b) any claims relating to Customer Data; and (c) any claims that Customer Data infringes, misappropriates, or otherwise violates the rights of any third party. You agree and acknowledge that Customer Data may be irretrievably deleted if Your account is terminated. For purposes of this Agreement, "Customer Data" shall mean any data, information or other material provided, uploaded, or submitted by You to the Zed Service in the course of using the Zed Service. Notwithstanding anything to the contrary, You represent and warrant that You will not transfer or make available to Zed any personally identifiable information or related information subject to applicable data privacy laws or regulations, unless otherwise agreed to in writing by Zed.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel3 \b \fs24 3.3.1. Customer Data Made Available to Zed\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 To the extent You elect to make Customer Data available to Zed, the same may only be used by Zed according to the Customer Data type and the use rights regarding the same as described herein:\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel3 \b \fs24 3.3.2. Usage Data\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 To improve the Editor and understand how You use it, Zed optionally collects the following usage data:\par}
-{\pard \ql \f0 \sa0 \li720 \fi-360 \bullet \tx360\tab (a)\tx360\tab file extensions of opened files;\sa180\par}
-{\pard \ql \f0 \sa0 \li720 \fi-360 \bullet \tx360\tab (b)\tx360\tab features and tools You use within the Editor;\sa180\par}
-{\pard \ql \f0 \sa0 \li720 \fi-360 \bullet \tx360\tab (c)\tx360\tab project statistics (e.g., number of files); and\sa180\par}
-{\pard \ql \f0 \sa0 \li720 \fi-360 \bullet \tx360\tab (d)\tx360\tab frameworks detected in Your projects\sa180\sa180\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 (a-d collectively, "Usage Data"). Usage Data does not include any of Your software code or sensitive project details. You may change Your preferences disabling the collection of Usage Data and You can audit Usage Data collected by the Editor at any time. See {\field{\*\fldinst{HYPERLINK "https://zed.dev/docs/telemetry"}}{\fldrslt{\ul
-https://zed.dev/docs/telemetry
-}}}
- for more.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 Usage Data is associated with a secure random telemetry ID which may be linked to Your email address. This linkage currently serves two purposes: (1) it allows Zed to analyze usage patterns over time while maintaining Your privacy; and (2) it enables Zed to reach out to specific user groups for feedback and improvement suggestions. Zed may contact You based on Your usage patterns to better understand your needs and improve the Solution. If You delete Your account, the link between Your telemetry ID and Your email address will be permanently removed. By continuing to use Editor or Solution with this feature enabled You agree to this Usage Data collection.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel3 \b \fs24 3.3.3. Crash Reports\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 Customer Data consisting of data related to the behavior of the Solution prior to a crash or failure, such as stack traces are collected and classified as "Crash Reports". Zed will use commercially reasonable efforts to exclude any personally identifiable information from Crash Reports, but due to the nature of a crash, Zed does not ensure that information such as paths will be excluded from Crash Reports. Crash Reports will be used solely for Zed's internal purposes in connection with diagnosing defects in the Solution that led to the crash. You may grant us permission to capture Crash Reports when installing or activating the Solution, and You may change Your preferences at any time in the settings feature of the Solution. Once You grant us this permission, Zed will retain the Crash Reports indefinitely.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel3 \b \fs24 3.3.4. User Content\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \u8226 ? You may access, modify or create certain data or information in connection with your access or use of the Zed Editor or the Solution. Such data and information may include, but is not limited to any of the following:\par}
-{\pard \ql \f0 \sa0 \li720 \fi-360 \bullet \tx360\tab (a)\tx360\tab file contents and associated metadata (e.g., filename, paths, size, timestamps);\sa180\par}
-{\pard \ql \f0 \sa0 \li720 \fi-360 \bullet \tx360\tab (b)\tx360\tab source control history, comments and metadata (e.g., git history, commit messages);\sa180\par}
-{\pard \ql \f0 \sa0 \li720 \fi-360 \bullet \tx360\tab (c)\tx360\tab configuration data (e.g., settings, keymaps);\sa180\par}
-{\pard \ql \f0 \sa0 \li720 \fi-360 \bullet \tx360\tab (d)\tx360\tab anything typed, pasted and/or displayed on screen while using the Editor;\sa180\par}
-{\pard \ql \f0 \sa0 \li720 \fi-360 \bullet \tx360\tab (e)\tx360\tab derivative works of the above generated by the Editor (e.g., format conversions, summaries, indexes, caches);\sa180\par}
-{\pard \ql \f0 \sa0 \li720 \fi-360 \bullet \tx360\tab (f)\tx360\tab metadata, code and other derivative works of the above returned by language servers and other local tooling; and\sa180\par}
-{\pard \ql \f0 \sa0 \li720 \fi-360 \bullet \tx360\tab (g)\tx360\tab metadata, code and other derivative works of the above returned by services integrated with the Zed Editor\sa180\sa180\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 (a-g collectively, "User Content").\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel3 \b \fs24 3.3.5. Handling of User Content\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 Zed will make use of or transfer User Content only as specified in this Agreement, or as necessary to comply with applicable law.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel3 \b \fs24 3.3.5.1. Zed Collaboration Services\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 When using Zed Collaboration Services, User Content is transmitted from Your environment only if You collaborate with other Zed users by electing to share a project in the Editor. Once You share a project, Zed may transmit User Content consisting of file paths, file contents, and metadata regarding the code returned by language servers. Currently, Zed does not persist any User Content beyond the Your collaboration session. If You unshare a project or disconnect from the Solution, all information associated with such project will be deleted from Zed servers. In the future, Zed may save User Content regarding projects beyond the scope of a single collaboration session. We may share such User Content with those users You elected to grant access to. Zed's access to such User Content is limited to debugging and making improvements to the Solution.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel3 \b \fs24 3.3.5.2. Other Services\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 The Zed Editor supports integration with API-based services maintained and not operated by Zed (the "Other Services"). By way of example, Other Services includes those made available by GitHub, Anthropic, OpenAI, and similar providers, or those You host or manage directly. You may configure the Zed Editor to interoperate, communicate with, and exchange data (including User Content) directly with the Other Services. Zed is not responsible or otherwise liable with respect to Your use of any Other Service, including but not limited to the exchange of data between the Other Service and the Zed Editor. The terms and conditions, including the applicable privacy policy, with respect to the Other Service are those made available by the applicable Other Service, not these Terms.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel3 \b \fs24 3.3.5.3. Zed AI Services\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 The Zed Editor supports integration with API-based services maintained and operated by Zed (the "Zed AI Services"). You may elect to use Zed AI Services as the provider for various Zed Editor features (e.g., Agent Panel, Inline Assistant, Edit Predictions, and similar features). In connection with Your use of these features, the Zed Editor and Zed AI Services may make use of User Content to generate contextually relevant responses (the \u8220"Output\u8221"). Other than as specified in Section 3.3.5.4 of these Terms, Zed will not use User Content for training of its models, or disclose User Content.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 Output is provided "as is" without any warranties or guarantees of functionality, security, or fitness for a particular purpose. While efforts are made to ensure the accuracy and reliability, Output may include errors, vulnerabilities, and defects. You are responsible for reviewing, testing, and validating Output before use in any production or critical environment. Zed assumes no liability for any damages, losses, or liability arising from the use, modification, reliance on, or deployment of Output. Any such use is at Your own risk.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel3 \b \fs24 3.3.5.4. Improvement Feedback\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 When using Zed AI Services to provide Edit Predictions in connection with certain open source software projects, You may elect to share requests, responses and feedback comments (collectively "Model Improvement Feedback") with Zed, and Zed may use the same to improve Zed Edit Predictions models. You may opt-out of sharing Model Improvement Feedback at any time.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 For more information on Zed Edit Predictions please see: {\field{\*\fldinst{HYPERLINK "https://zed.dev/docs/ai/ai-improvement"}}{\fldrslt{\ul
-https://zed.dev/docs/ai/ai-improvement
-}}}
-\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 When using Zed AI Services in connection with the Agent Panel, You may elect to share with Zed requests, responses and feedback regarding the Agent Panel and related Output (the \u8220"Agent Improvement Feedback\u8221") with Zed, and Zed may use the same to improve the Agent Panel and related Output. Zed will only collect Agent Improvement Feedback when You elect to share the same.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 For more information regarding the Agent Panel please see: {\field{\*\fldinst{HYPERLINK "https://zed.dev/docs/ai/ai-improvement"}}{\fldrslt{\ul
-https://zed.dev/docs/ai/ai-improvement
-}}}
-\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel3 \b \fs24 3.4. Privacy Policy\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 You and Zed are bound by the terms and conditions contained in the Zed Privacy Policy which is incorporated by reference hereto. The Zed Privacy Policy is available at the following URL: {\field{\*\fldinst{HYPERLINK "https://zed.dev/privacy-policy"}}{\fldrslt{\ul
-https://zed.dev/privacy-policy
-}}}
-.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel1 \b \fs32 4. FEE BASED SERVICES, FEES AND PAYMENT TERMS\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel2 \b \fs28 4.1. Fee Based Services\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 The Zed AI Services is made available with additional usage benefits (the \u8220"Enhanced Use \u8221") as described in the table published at {\field{\*\fldinst{HYPERLINK "https://zed.dev/pricing"}}{\fldrslt{\ul
-zed.dev/pricing
-}}}
- (the \u8220"Pricing Table\u8221"), subject to the requirements and limitations set forth in the Pricing Table and these Terms. In order to make use of the Enhanced Use, Customer must access the Zed AI Services through a Zed registered account.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel2 \b \fs28 4.2. Fees\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 Customer shall pay to Zed the applicable fees set forth in Pricing Table, together with any applicable taxes and shipping and handling (collectively, the \u8220"Fees\u8221"). Customer shall have no right of return, and all Fees shall be non-refundable.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel2 \b \fs28 4.3. Payment Terms\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 All amounts payable to Zed under this Agreement shall be paid in United States dollars and paid Zed according to the method of payment, frequency and calculated as set forth in the Pricing Table.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel2 \b \fs28 4.4. Taxes; Set-offs\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 Any and all payments made by Customer in accordance with this Agreement are exclusive of any taxes that might be assessed by any jurisdiction. Customer shall pay or reimburse Zed for all sales, use, property and similar taxes; all customs duties, import fees, stamp duties, license fees and similar charges; and all other mandatory payments to government agencies of whatever kind, except taxes imposed on the net or gross income of Zed. All amounts payable to Zed under this Agreement shall be without set-off and without deduction of any taxes, levies, imposts, charges, withholdings and/or duties of any nature which may be levied or imposed, including without limitation, value added tax, customs duty and withholding tax.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel1 \b \fs32 5. TERM AND TERMINATION\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel2 \b \fs28 5.1. Term\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 The term of this Agreement shall commence on the date You first download the Editor or use the Zed Service (the "Effective Date"), and unless terminated earlier according to this Section 3, will end pursuant to this Section 5 (the "Term").\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel2 \b \fs28 5.2. Termination\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 This Agreement may be terminated: (a) by either party if the other has materially breached this Agreement; or (b) by Zed at any time and for any reason upon notice to Customer. You acknowledge that Zed is under no obligation to continue to operate the Zed Service or make the Editor available, and We may end any programs in connection with the same at any time.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel2 \b \fs28 5.3. Effect of Termination and Survival\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 Upon any expiration or termination of this Agreement, Customer shall (i) immediately cease use of the Zed Service, and (ii) return all Zed Confidential Information and other materials provided by Zed. The following provisions will survive termination of this Agreement: Sections 3.3 (Customer Data), Section 3.4 (Privacy Policy), Section 5.3 (Effect of Termination and Survival), Section 6 (Ownership), Section 7 (Indemnification), Section 9 (Limitation of Liability), Section 10 (Third Party Services), and Section 11 (Miscellaneous).\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel1 \b \fs32 6. OWNERSHIP\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 Zed retains all right, title, and interest in and to the Zed Service, Editor, and any software, products, works or other intellectual property created, used, provided, or made available by Zed under or in connection with the Zed Service or Editor. Customer may from time to time provide suggestions, comments, or other feedback to Zed with respect to the Zed Service or Editor ("Feedback"). Customer shall, and hereby does, grant to Zed a nonexclusive, worldwide, perpetual, irrevocable, transferable, sublicensable, royalty-free, fully paid-up license to use and exploit the Feedback for any purpose. You retain all right, title and interest in and to the Customer Data, including all intellectual property rights therein. No intellectual property rights with respect to any software code you develop or modify with the Editor or Zed Service (collectively, the \u8220"Output\u8221") are transferred or assigned to Zed hereunder.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel1 \b \fs32 7. INDEMNIFICATION\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 Customer will defend, indemnify, and hold Zed, its affiliates, suppliers and licensors harmless and each of their respective officers, directors, employees and representatives from and against any claims, damages, losses, liabilities, costs, and expenses (including reasonable attorneys' fees) arising out of or relating to any third party claim with respect to: (a) Customer Data; (b) breach of this Agreement or violation of applicable law by Customer; or (c) alleged infringement or misappropriation of third-party's intellectual property rights resulting from Customer Data.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel1 \b \fs32 8. WARRANTY\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 Zed does not represent or warrant that the operation of the Zed Service or Editor (or any portion thereof) will be uninterrupted or error free, or that the Zed Service or Editor (or any portion thereof) will operate in combination with other hardware, software, systems or data not provided by Zed. CUSTOMER ACKNOWLEDGES THAT, ZED MAKES NO EXPRESS OR IMPLIED REPRESENTATIONS OR WARRANTIES OF ANY KIND WITH RESPECT TO THE SERVICE OR SOFTWARE, OR THEIR CONDITION. ZED HEREBY EXPRESSLY EXCLUDES, ANY AND ALL OTHER EXPRESS OR IMPLIED REPRESENTATIONS OR WARRANTIES, WHETHER UNDER COMMON LAW, STATUTE OR OTHERWISE, INCLUDING WITHOUT LIMITATION ANY AND ALL WARRANTIES AS TO MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, SATISFACTORY QUALITY OR NON-INFRINGEMENT OF THIRD-PARTY RIGHTS.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel1 \b \fs32 9. LIMITATIONS OF LIABILITY\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 IN NO EVENT SHALL ZED BE LIABLE FOR ANY LOST DATA, LOST PROFITS, BUSINESS INTERRUPTION, REPLACEMENT SERVICE OR OTHER SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR INDIRECT DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THEORY OF LIABILITY. ZED'S LIABILITY FOR ALL CLAIMS ARISING UNDER THIS AGREEMENT, WHETHER IN CONTRACT, TORT OR OTHERWISE, SHALL NOT EXCEED THE GREATER OF: THE FEES PAID TO ZED BY CUSTOMER DURING THE TWELVE (12) MONTH PERIOD PRECEDING THE DATE OF THE CLAIM, OR ONE THOUSAND US DOLLARS ($1,000).\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel1 \b \fs32 10. Third Party Services\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 Zed may make certain third party services available to You within the Editor or the Zed Service (each a "Third Party Service"). You acknowledge and agree that (a) use of each Third Party Service is subject to the corresponding terms and conditions available at the following URL: {\field{\*\fldinst{HYPERLINK "https://zed.dev/third-party-terms"}}{\fldrslt{\ul
-https://zed.dev/third-party-terms
-}}}
- and/or presented in connection with Your use of such Third Party Service; (b) the terms and conditions of this Agreement do not apply with respect to Your use of any Third Party Service; and (c) Zed is not liable in any way regarding Your use of any Third Party Service.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel1 \b \fs32 11. MISCELLANEOUS\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel2 \b \fs28 11.1. Export Control\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 You hereby certify that You will comply with all current US Export Control laws. You agree to defend, indemnify and hold Zed harmless from any liability for Your violation of U.S. Export Control laws.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel2 \b \fs28 11.2. Compliance with Laws\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 You shall comply with all applicable laws and regulations in its use of the Solution, including without limitation the unlawful gathering or collecting, or assisting in the gathering or collecting of information in violation of any privacy laws or regulations. You shall, at its own expense, defend, indemnify and hold harmless Zed from and against any and all claims, losses, liabilities, damages, judgments, government or federal sanctions, costs and expenses (including attorneys' fees) incurred by Zed arising from any claim or assertion by any third party of violation of privacy laws or regulations by You or any of its agents, officers, directors or employees.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel2 \b \fs28 11.3. Assignment\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 Neither party may transfer and assign its rights and obligations under this Agreement without the prior written consent of the other party. Notwithstanding the foregoing, Zed may transfer and assign its rights under this Agreement without consent from the other party in connection with a change in control, acquisition or sale of all or substantially all of its assets.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel2 \b \fs28 11.4. Force Majeure\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 Neither party shall be responsible for failure or delay in performance by events out of their reasonable control, including but not limited to, acts of God, Internet outage, terrorism, war, fires, earthquakes and other disasters (each a "Force Majeure"). Notwithstanding the foregoing: if a Force Majeure continues for more than thirty (30) days, either party may to terminate this agreement by written notice to the other party.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel2 \b \fs28 11.5. Notice\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 All notices between the parties shall be in writing and shall be deemed to have been given if personally delivered or sent by registered or certified mail (return receipt), or by recognized courier service.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel2 \b \fs28 11.6. No Agency\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 Both parties agree that no agency, partnership, joint venture, or employment is created as a result of this Agreement. You do not have any authority of any kind to bind Zed.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel2 \b \fs28 11.7. Governing Law\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 This Agreement shall be governed exclusively by, and construed exclusively in accordance with, the laws of the United States and the State of California, without regard to its conflict of laws provisions. The federal courts of the United States in the Northern District of California and the state courts of the State of California shall have exclusive jurisdiction to adjudicate any dispute arising out of or relating to this Agreement. Each party hereby consents to the jurisdiction of such courts and waives any right it may otherwise have to challenge the appropriateness of such forums, whether on the basis of the doctrine of forum non conveniens or otherwise. The United Nations Convention on Contracts for the International Sale of Goods shall not apply to this Agreement or any Purchase Order issued under this Agreement.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel2 \b \fs28 11.8. Updated Agreement\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 Zed reserves the right to update this Agreement at any time. The terms and conditions of the updated version of the Agreement shall apply to the Zed Service and Editor downloaded, or accessed following the date of publication of the updated version. If You do not agree with any terms of the updated Agreement, You may not use or access the Zed Service or Editor in any manner. Zed may from time-to-time provide release notes applicable to the Editor or Zed Service, and such release notes may contain additional use restrictions or terms applicable to Customer Data. Your use of the Editor or Zed Service after the applicable release notes are made available shall be subject to the additional use restrictions or terms applicable to Customer Data.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel2 \b \fs28 11.9. Entire Agreement\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 This Agreement is the complete and exclusive statement of the mutual understanding of the parties and supersedes and cancels all previous written and oral agreements, communications, and other understandings relating to the subject matter of this Agreement, and all waivers and modifications must be in a writing signed by both parties, except as otherwise provided herein. Any term or provision of this Agreement held to be illegal or unenforceable shall be, to the fullest extent possible, interpreted so as to be construed as valid, but in any event the validity or enforceability of the remainder hereof shall not be affected.\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 {\b DATE: May 6, 2025}\par}
-}
diff --git a/script/trigger-release b/script/trigger-release
deleted file mode 100755
index 457a1f29f7..0000000000
--- a/script/trigger-release
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-which gh >/dev/null || brew install gh
-
-if [ "$1" == "nightly" ]; then
-  ./script/bump-nightly
-  exit
-fi
-
-version=$(./script/get-released-version "$1" | sed 's/\.[^\.]*$/.x/')
-echo "Bumping $1 (v$version)"
-
-gh workflow run "bump_patch_version.yml" -f branch="v$version"
-echo "Follow along at: https://github.com/zed-industries/zed/actions"
diff --git a/script/uninstall.sh b/script/uninstall.sh
deleted file mode 100644
index 3e460b8186..0000000000
--- a/script/uninstall.sh
+++ /dev/null
@@ -1,158 +0,0 @@
-#!/usr/bin/env sh
-set -eu
-
-# Uninstalls Zed that was installed using the install.sh script
-
-check_remaining_installations() {
-    platform="$(uname -s)"
-    if [ "$platform" = "Darwin" ]; then
-        # Check for any Zed variants in /Applications
-        remaining=$(ls -d /Applications/Zed*.app 2>/dev/null | wc -l)
-        [ "$remaining" -eq 0 ]
-    else
-        # Check for any Zed variants in ~/.local
-        remaining=$(ls -d "$HOME/.local/zed"*.app 2>/dev/null | wc -l)
-        [ "$remaining" -eq 0 ]
-    fi
-}
-
-prompt_remove_preferences() {
-    printf "Do you want to keep your Zed preferences? [Y/n] "
-    read -r response
-    case "$response" in
-        [nN]|[nN][oO])
-            rm -rf "$HOME/.config/zed"
-            echo "Preferences removed."
-            ;;
-        *)
-            echo "Preferences kept."
-            ;;
-    esac
-}
-
-main() {
-    platform="$(uname -s)"
-    channel="${ZED_CHANNEL:-stable}"
-
-    if [ "$platform" = "Darwin" ]; then
-        platform="macos"
-    elif [ "$platform" = "Linux" ]; then
-        platform="linux"
-    else
-        echo "Unsupported platform $platform"
-        exit 1
-    fi
-
-    "$platform"
-
-    echo "Zed has been uninstalled"
-}
-
-linux() {
-    suffix=""
-    if [ "$channel" != "stable" ]; then
-        suffix="-$channel"
-    fi
-
-    appid=""
-    db_suffix="stable"
-    case "$channel" in
-      stable)
-        appid="dev.zed.Zed"
-        db_suffix="stable"
-        ;;
-      nightly)
-        appid="dev.zed.Zed-Nightly"
-        db_suffix="nightly"
-        ;;
-      preview)
-        appid="dev.zed.Zed-Preview"
-        db_suffix="preview"
-        ;;
-      dev)
-        appid="dev.zed.Zed-Dev"
-        db_suffix="dev"
-        ;;
-      *)
-        echo "Unknown release channel: ${channel}. Using stable app ID."
-        appid="dev.zed.Zed"
-        db_suffix="stable"
-        ;;
-    esac
-
-    # Remove the app directory
-    rm -rf "$HOME/.local/zed$suffix.app"
-
-    # Remove the binary symlink
-    rm -f "$HOME/.local/bin/zed"
-
-    # Remove the .desktop file
-    rm -f "$HOME/.local/share/applications/${appid}.desktop"
-
-    # Remove the database directory for this channel
-    rm -rf "$HOME/.local/share/zed/db/0-$db_suffix"
-
-    # Remove socket file
-    rm -f "$HOME/.local/share/zed/zed-$db_suffix.sock"
-
-    # Remove the entire Zed directory if no installations remain
-    if check_remaining_installations; then
-        rm -rf "$HOME/.local/share/zed"
-        prompt_remove_preferences
-    fi
-
-    rm -rf $HOME/.zed_server
-}
-
-macos() {
-    app="Zed.app"
-    db_suffix="stable"
-    app_id="dev.zed.Zed"
-    case "$channel" in
-      nightly)
-        app="Zed Nightly.app"
-        db_suffix="nightly"
-        app_id="dev.zed.Zed-Nightly"
-        ;;
-      preview)
-        app="Zed Preview.app"
-        db_suffix="preview"
-        app_id="dev.zed.Zed-Preview"
-        ;;
-      dev)
-        app="Zed Dev.app"
-        db_suffix="dev"
-        app_id="dev.zed.Zed-Dev"
-        ;;
-    esac
-
-    # Remove the app bundle
-    if [ -d "/Applications/$app" ]; then
-        rm -rf "/Applications/$app"
-    fi
-
-    # Remove the binary symlink
-    rm -f "$HOME/.local/bin/zed"
-
-    # Remove the database directory for this channel
-    rm -rf "$HOME/Library/Application Support/Zed/db/0-$db_suffix"
-
-    # Remove app-specific files and directories
-    rm -rf "$HOME/Library/Application Support/com.apple.sharedfilelist/com.apple.LSSharedFileList.ApplicationRecentDocuments/$app_id.sfl"*
-    rm -rf "$HOME/Library/Caches/$app_id"
-    rm -rf "$HOME/Library/HTTPStorages/$app_id"
-    rm -rf "$HOME/Library/Preferences/$app_id.plist"
-    rm -rf "$HOME/Library/Saved Application State/$app_id.savedState"
-
-    # Remove the entire Zed directory if no installations remain
-    if check_remaining_installations; then
-        rm -rf "$HOME/Library/Application Support/Zed"
-        rm -rf "$HOME/Library/Logs/Zed"
-
-        prompt_remove_preferences
-    fi
-
-    rm -rf $HOME/.zed_server
-}
-
-main "$@"
diff --git a/script/update-json-schemas b/script/update-json-schemas
deleted file mode 100755
index 182e0ff03b..0000000000
--- a/script/update-json-schemas
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-cd "$(dirname "$0")/.." || exit 1
-cd crates/languages/src/json/schemas
-files=(
-    "tsconfig.json"
-    "package.json"
-)
-for file in "${files[@]}"; do
-    curl -sL -o "$file" "https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/$file"
-done
-
-HASH="$(curl -s 'https://api.github.com/repos/SchemaStore/schemastore/commits/HEAD' | jq -r '.sha')"
-SHORT_HASH="${HASH:0:7}"
-DATE="$(curl -s 'https://api.github.com/repos/SchemaStore/schemastore/commits/HEAD' |jq -r .commit.author.date | cut -c1-10)"
-echo
-echo "Updated JSON schemas to [SchemaStore/schemastore@$SHORT_HASH](https://github.com/SchemaStore/schemastore/tree/$HASH) ($DATE)"
-echo
-for file in "${files[@]}"; do
-    echo "- [$file](https://github.com/SchemaStore/schemastore/commits/master/src/schemas/json/$file)" \
-        "@ [$SHORT_HASH](https://raw.githubusercontent.com/SchemaStore/schemastore/$HASH/src/schemas/json/$file)"
-done
-echo
diff --git a/script/update_top_ranking_issues/.python-version b/script/update_top_ranking_issues/.python-version
deleted file mode 100644
index 24ee5b1be9..0000000000
--- a/script/update_top_ranking_issues/.python-version
+++ /dev/null
@@ -1 +0,0 @@
-3.13
diff --git a/script/update_top_ranking_issues/main.py b/script/update_top_ranking_issues/main.py
deleted file mode 100644
index 336c00497a..0000000000
--- a/script/update_top_ranking_issues/main.py
+++ /dev/null
@@ -1,161 +0,0 @@
-import os
-from datetime import date, datetime, timedelta
-from typing import Any, Optional
-
-import requests
-import typer
-from pytz import timezone
-from typer import Typer
-
-app: Typer = typer.Typer()
-
-AMERICA_NEW_YORK_TIMEZONE = "America/New_York"
-DATETIME_FORMAT: str = "%B %d, %Y %I:%M %p"
-ISSUES_PER_SECTION: int = 50
-ISSUES_TO_FETCH: int = 100
-
-REPO_OWNER = "zed-industries"
-REPO_NAME = "zed"
-GITHUB_API_BASE_URL = "https://api.github.com"
-
-EXCLUDE_LABEL = "ignore top-ranking issues"
-
-
-@app.command()
-def main(
-    github_token: Optional[str] = None,
-    issue_reference_number: Optional[int] = None,
-    query_day_interval: Optional[int] = None,
-) -> None:
-    script_start_time: datetime = datetime.now()
-    start_date: date | None = None
-
-    if query_day_interval:
-        tz = timezone(AMERICA_NEW_YORK_TIMEZONE)
-        today = datetime.now(tz).date()
-        start_date = today - timedelta(days=query_day_interval)
-
-    # GitHub Workflow will pass in the token as an argument,
-    # but we can place it in our env when running the script locally, for convenience
-    token = github_token or os.getenv("GITHUB_ACCESS_TOKEN")
-    if not token:
-        raise typer.BadParameter(
-            "GitHub token is required. Pass --github-token or set GITHUB_ACCESS_TOKEN env var."
-        )
-
-    headers = {
-        "Authorization": f"token {token}",
-        "Accept": "application/vnd.github+json",
-    }
-
-    section_to_issues = get_section_to_issues(headers, start_date)
-    issue_text: str = create_issue_text(section_to_issues)
-
-    if issue_reference_number:
-        update_reference_issue(headers, issue_reference_number, issue_text)
-    else:
-        print(issue_text)
-
-    run_duration: timedelta = datetime.now() - script_start_time
-    print(f"Ran for {run_duration}")
-
-
-def get_section_to_issues(
-    headers: dict[str, str], start_date: date | None = None
-) -> dict[str, list[dict[str, Any]]]:
-    """Fetch top-ranked issues for each section from GitHub."""
-
-    section_filters = {
-        "Bugs": "type:Bug",
-        "Crashes": "type:Crash",
-        "Features": "type:Feature",
-        "Tracking issues": "type:Tracking",
-        "Meta issues": "type:Meta",
-        "Windows": 'label:"platform:windows"',
-    }
-
-    section_to_issues: dict[str, list[dict[str, Any]]] = {}
-    for section, search_qualifier in section_filters.items():
-        query_parts = [
-            f"repo:{REPO_OWNER}/{REPO_NAME}",
-            "is:issue",
-            "is:open",
-            f'-label:"{EXCLUDE_LABEL}"',
-            search_qualifier,
-        ]
-
-        if start_date:
-            query_parts.append(f"created:>={start_date.strftime('%Y-%m-%d')}")
-
-        query = " ".join(query_parts)
-        url = f"{GITHUB_API_BASE_URL}/search/issues"
-        params = {
-            "q": query,
-            "sort": "reactions-+1",
-            "order": "desc",
-            "per_page": ISSUES_TO_FETCH, # this will work as long as it's ≤ 100
-        }
-
-        # we are only fetching one page on purpose
-        response = requests.get(url, headers=headers, params=params)
-        response.raise_for_status()
-        items = response.json()["items"]
-
-        issues: list[dict[str, Any]] = []
-        for item in items:
-            reactions = item["reactions"]
-            score = reactions["+1"] - reactions["-1"]
-            if score > 0:
-                issues.append({
-                    "url": item["html_url"],
-                    "score": score,
-                    "created_at": item["created_at"],
-                })
-
-        if not issues:
-            continue
-
-        issues.sort(key=lambda x: (-x["score"], x["created_at"]))
-        section_to_issues[section] = issues[:ISSUES_PER_SECTION]
-
-    # Sort sections by total score (highest total first)
-    section_to_issues = dict(
-        sorted(
-            section_to_issues.items(),
-            key=lambda item: sum(issue["score"] for issue in item[1]),
-            reverse=True,
-        )
-    )
-    return section_to_issues
-
-
-def update_reference_issue(
-    headers: dict[str, str], issue_number: int, body: str
-) -> None:
-    url = f"{GITHUB_API_BASE_URL}/repos/{REPO_OWNER}/{REPO_NAME}/issues/{issue_number}"
-    response = requests.patch(url, headers=headers, json={"body": body})
-    response.raise_for_status()
-
-
-def create_issue_text(section_to_issues: dict[str, list[dict[str, Any]]]) -> str:
-    tz = timezone(AMERICA_NEW_YORK_TIMEZONE)
-    current_datetime: str = datetime.now(tz).strftime(f"{DATETIME_FORMAT} (%Z)")
-
-    lines: list[str] = [f"*Updated on {current_datetime}*"]
-
-    for section, issues in section_to_issues.items():
-        lines.append(f"\n## {section}\n")
-        for i, issue in enumerate(issues):
-            lines.append(f"{i + 1}. {issue['url']} ({issue['score']} :thumbsup:)")
-
-    lines.append("\n---\n")
-    lines.append(
-        "*For details on how this issue is generated, "
-        "[see the script](https://github.com/zed-industries/zed/blob/main/script/update_top_ranking_issues/main.py)*"
-    )
-
-    return "\n".join(lines)
-
-
-if __name__ == "__main__":
-    app()
diff --git a/script/update_top_ranking_issues/pyproject.toml b/script/update_top_ranking_issues/pyproject.toml
deleted file mode 100644
index aa3f8cc7ff..0000000000
--- a/script/update_top_ranking_issues/pyproject.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-[project]
-name = "update-top-ranking-issues"
-version = "0.1.0"
-readme = "README.md"
-requires-python = ">=3.13"
-dependencies = [
-    "mypy>=1.15.0",
-    "pytz>=2025.1",
-    "requests>=2.32.0",
-    "ruff>=0.9.7",
-    "typer>=0.15.1",
-    "types-pytz>=2025.1.0.20250204",
-    "types-requests>=2.32.0",
-]
diff --git a/script/update_top_ranking_issues/pyrightconfig.json b/script/update_top_ranking_issues/pyrightconfig.json
deleted file mode 100644
index 8fd86437bc..0000000000
--- a/script/update_top_ranking_issues/pyrightconfig.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "venvPath": ".",
-  "venv": ".venv"
-}
diff --git a/script/update_top_ranking_issues/uv.lock b/script/update_top_ranking_issues/uv.lock
deleted file mode 100644
index 174f4e677f..0000000000
--- a/script/update_top_ranking_issues/uv.lock
+++ /dev/null
@@ -1,274 +0,0 @@
-version = 1
-revision = 3
-requires-python = ">=3.13"
-
-[[package]]
-name = "certifi"
-version = "2024.8.30"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/b0/ee/9b19140fe824b367c04c5e1b369942dd754c4c5462d5674002f75c4dedc1/certifi-2024.8.30.tar.gz", hash = "sha256:bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9", size = 168507, upload-time = "2024-08-30T01:55:04.365Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/12/90/3c9ff0512038035f59d279fddeb79f5f1eccd8859f06d6163c58798b9487/certifi-2024.8.30-py3-none-any.whl", hash = "sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8", size = 167321, upload-time = "2024-08-30T01:55:02.591Z" },
-]
-
-[[package]]
-name = "charset-normalizer"
-version = "3.4.0"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/f2/4f/e1808dc01273379acc506d18f1504eb2d299bd4131743b9fc54d7be4df1e/charset_normalizer-3.4.0.tar.gz", hash = "sha256:223217c3d4f82c3ac5e29032b3f1c2eb0fb591b72161f86d93f5719079dae93e", size = 106620, upload-time = "2024-10-09T07:40:20.413Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/f3/89/68a4c86f1a0002810a27f12e9a7b22feb198c59b2f05231349fbce5c06f4/charset_normalizer-3.4.0-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:dd4eda173a9fcccb5f2e2bd2a9f423d180194b1bf17cf59e3269899235b2a114", size = 194617, upload-time = "2024-10-09T07:39:07.317Z" },
-    { url = "https://files.pythonhosted.org/packages/4f/cd/8947fe425e2ab0aa57aceb7807af13a0e4162cd21eee42ef5b053447edf5/charset_normalizer-3.4.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:e9e3c4c9e1ed40ea53acf11e2a386383c3304212c965773704e4603d589343ed", size = 125310, upload-time = "2024-10-09T07:39:08.353Z" },
-    { url = "https://files.pythonhosted.org/packages/5b/f0/b5263e8668a4ee9becc2b451ed909e9c27058337fda5b8c49588183c267a/charset_normalizer-3.4.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:92a7e36b000bf022ef3dbb9c46bfe2d52c047d5e3f3343f43204263c5addc250", size = 119126, upload-time = "2024-10-09T07:39:09.327Z" },
-    { url = "https://files.pythonhosted.org/packages/ff/6e/e445afe4f7fda27a533f3234b627b3e515a1b9429bc981c9a5e2aa5d97b6/charset_normalizer-3.4.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:54b6a92d009cbe2fb11054ba694bc9e284dad30a26757b1e372a1fdddaf21920", size = 139342, upload-time = "2024-10-09T07:39:10.322Z" },
-    { url = "https://files.pythonhosted.org/packages/a1/b2/4af9993b532d93270538ad4926c8e37dc29f2111c36f9c629840c57cd9b3/charset_normalizer-3.4.0-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1ffd9493de4c922f2a38c2bf62b831dcec90ac673ed1ca182fe11b4d8e9f2a64", size = 149383, upload-time = "2024-10-09T07:39:12.042Z" },
-    { url = "https://files.pythonhosted.org/packages/fb/6f/4e78c3b97686b871db9be6f31d64e9264e889f8c9d7ab33c771f847f79b7/charset_normalizer-3.4.0-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:35c404d74c2926d0287fbd63ed5d27eb911eb9e4a3bb2c6d294f3cfd4a9e0c23", size = 142214, upload-time = "2024-10-09T07:39:13.059Z" },
-    { url = "https://files.pythonhosted.org/packages/2b/c9/1c8fe3ce05d30c87eff498592c89015b19fade13df42850aafae09e94f35/charset_normalizer-3.4.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4796efc4faf6b53a18e3d46343535caed491776a22af773f366534056c4e1fbc", size = 144104, upload-time = "2024-10-09T07:39:14.815Z" },
-    { url = "https://files.pythonhosted.org/packages/ee/68/efad5dcb306bf37db7db338338e7bb8ebd8cf38ee5bbd5ceaaaa46f257e6/charset_normalizer-3.4.0-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e7fdd52961feb4c96507aa649550ec2a0d527c086d284749b2f582f2d40a2e0d", size = 146255, upload-time = "2024-10-09T07:39:15.868Z" },
-    { url = "https://files.pythonhosted.org/packages/0c/75/1ed813c3ffd200b1f3e71121c95da3f79e6d2a96120163443b3ad1057505/charset_normalizer-3.4.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:92db3c28b5b2a273346bebb24857fda45601aef6ae1c011c0a997106581e8a88", size = 140251, upload-time = "2024-10-09T07:39:16.995Z" },
-    { url = "https://files.pythonhosted.org/packages/7d/0d/6f32255c1979653b448d3c709583557a4d24ff97ac4f3a5be156b2e6a210/charset_normalizer-3.4.0-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:ab973df98fc99ab39080bfb0eb3a925181454d7c3ac8a1e695fddfae696d9e90", size = 148474, upload-time = "2024-10-09T07:39:18.021Z" },
-    { url = "https://files.pythonhosted.org/packages/ac/a0/c1b5298de4670d997101fef95b97ac440e8c8d8b4efa5a4d1ef44af82f0d/charset_normalizer-3.4.0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:4b67fdab07fdd3c10bb21edab3cbfe8cf5696f453afce75d815d9d7223fbe88b", size = 151849, upload-time = "2024-10-09T07:39:19.243Z" },
-    { url = "https://files.pythonhosted.org/packages/04/4f/b3961ba0c664989ba63e30595a3ed0875d6790ff26671e2aae2fdc28a399/charset_normalizer-3.4.0-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:aa41e526a5d4a9dfcfbab0716c7e8a1b215abd3f3df5a45cf18a12721d31cb5d", size = 149781, upload-time = "2024-10-09T07:39:20.397Z" },
-    { url = "https://files.pythonhosted.org/packages/d8/90/6af4cd042066a4adad58ae25648a12c09c879efa4849c705719ba1b23d8c/charset_normalizer-3.4.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:ffc519621dce0c767e96b9c53f09c5d215578e10b02c285809f76509a3931482", size = 144970, upload-time = "2024-10-09T07:39:21.452Z" },
-    { url = "https://files.pythonhosted.org/packages/cc/67/e5e7e0cbfefc4ca79025238b43cdf8a2037854195b37d6417f3d0895c4c2/charset_normalizer-3.4.0-cp313-cp313-win32.whl", hash = "sha256:f19c1585933c82098c2a520f8ec1227f20e339e33aca8fa6f956f6691b784e67", size = 94973, upload-time = "2024-10-09T07:39:22.509Z" },
-    { url = "https://files.pythonhosted.org/packages/65/97/fc9bbc54ee13d33dc54a7fcf17b26368b18505500fc01e228c27b5222d80/charset_normalizer-3.4.0-cp313-cp313-win_amd64.whl", hash = "sha256:707b82d19e65c9bd28b81dde95249b07bf9f5b90ebe1ef17d9b57473f8a64b7b", size = 102308, upload-time = "2024-10-09T07:39:23.524Z" },
-    { url = "https://files.pythonhosted.org/packages/bf/9b/08c0432272d77b04803958a4598a51e2a4b51c06640af8b8f0f908c18bf2/charset_normalizer-3.4.0-py3-none-any.whl", hash = "sha256:fe9f97feb71aa9896b81973a7bbada8c49501dc73e58a10fcef6663af95e5079", size = 49446, upload-time = "2024-10-09T07:40:19.383Z" },
-]
-
-[[package]]
-name = "click"
-version = "8.1.7"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "colorama", marker = "sys_platform == 'win32'" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/96/d3/f04c7bfcf5c1862a2a5b845c6b2b360488cf47af55dfa79c98f6a6bf98b5/click-8.1.7.tar.gz", hash = "sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de", size = 336121, upload-time = "2023-08-17T17:29:11.868Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/00/2e/d53fa4befbf2cfa713304affc7ca780ce4fc1fd8710527771b58311a3229/click-8.1.7-py3-none-any.whl", hash = "sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28", size = 97941, upload-time = "2023-08-17T17:29:10.08Z" },
-]
-
-[[package]]
-name = "colorama"
-version = "0.4.6"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/d8/53/6f443c9a4a8358a93a6792e2acffb9d9d5cb0a5cfd8802644b7b1c9a02e4/colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44", size = 27697, upload-time = "2022-10-25T02:36:22.414Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6", size = 25335, upload-time = "2022-10-25T02:36:20.889Z" },
-]
-
-[[package]]
-name = "idna"
-version = "3.10"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/f1/70/7703c29685631f5a7590aa73f1f1d3fa9a380e654b86af429e0934a32f7d/idna-3.10.tar.gz", hash = "sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9", size = 190490, upload-time = "2024-09-15T18:07:39.745Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/76/c6/c88e154df9c4e1a2a66ccf0005a88dfb2650c1dffb6f5ce603dfbd452ce3/idna-3.10-py3-none-any.whl", hash = "sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3", size = 70442, upload-time = "2024-09-15T18:07:37.964Z" },
-]
-
-[[package]]
-name = "markdown-it-py"
-version = "3.0.0"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "mdurl" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/38/71/3b932df36c1a044d397a1f92d1cf91ee0a503d91e470cbd670aa66b07ed0/markdown-it-py-3.0.0.tar.gz", hash = "sha256:e3f60a94fa066dc52ec76661e37c851cb232d92f9886b15cb560aaada2df8feb", size = 74596, upload-time = "2023-06-03T06:41:14.443Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/42/d7/1ec15b46af6af88f19b8e5ffea08fa375d433c998b8a7639e76935c14f1f/markdown_it_py-3.0.0-py3-none-any.whl", hash = "sha256:355216845c60bd96232cd8d8c40e8f9765cc86f46880e43a8fd22dc1a1a8cab1", size = 87528, upload-time = "2023-06-03T06:41:11.019Z" },
-]
-
-[[package]]
-name = "mdurl"
-version = "0.1.2"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/d6/54/cfe61301667036ec958cb99bd3efefba235e65cdeb9c84d24a8293ba1d90/mdurl-0.1.2.tar.gz", hash = "sha256:bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba", size = 8729, upload-time = "2022-08-14T12:40:10.846Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/b3/38/89ba8ad64ae25be8de66a6d463314cf1eb366222074cfda9ee839c56a4b4/mdurl-0.1.2-py3-none-any.whl", hash = "sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8", size = 9979, upload-time = "2022-08-14T12:40:09.779Z" },
-]
-
-[[package]]
-name = "mypy"
-version = "1.15.0"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "mypy-extensions" },
-    { name = "typing-extensions" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/ce/43/d5e49a86afa64bd3839ea0d5b9c7103487007d728e1293f52525d6d5486a/mypy-1.15.0.tar.gz", hash = "sha256:404534629d51d3efea5c800ee7c42b72a6554d6c400e6a79eafe15d11341fd43", size = 3239717, upload-time = "2025-02-05T03:50:34.655Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/6a/9b/fd2e05d6ffff24d912f150b87db9e364fa8282045c875654ce7e32fffa66/mypy-1.15.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:93faf3fdb04768d44bf28693293f3904bbb555d076b781ad2530214ee53e3445", size = 10788592, upload-time = "2025-02-05T03:48:55.789Z" },
-    { url = "https://files.pythonhosted.org/packages/74/37/b246d711c28a03ead1fd906bbc7106659aed7c089d55fe40dd58db812628/mypy-1.15.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:811aeccadfb730024c5d3e326b2fbe9249bb7413553f15499a4050f7c30e801d", size = 9753611, upload-time = "2025-02-05T03:48:44.581Z" },
-    { url = "https://files.pythonhosted.org/packages/a6/ac/395808a92e10cfdac8003c3de9a2ab6dc7cde6c0d2a4df3df1b815ffd067/mypy-1.15.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:98b7b9b9aedb65fe628c62a6dc57f6d5088ef2dfca37903a7d9ee374d03acca5", size = 11438443, upload-time = "2025-02-05T03:49:25.514Z" },
-    { url = "https://files.pythonhosted.org/packages/d2/8b/801aa06445d2de3895f59e476f38f3f8d610ef5d6908245f07d002676cbf/mypy-1.15.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c43a7682e24b4f576d93072216bf56eeff70d9140241f9edec0c104d0c515036", size = 12402541, upload-time = "2025-02-05T03:49:57.623Z" },
-    { url = "https://files.pythonhosted.org/packages/c7/67/5a4268782eb77344cc613a4cf23540928e41f018a9a1ec4c6882baf20ab8/mypy-1.15.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:baefc32840a9f00babd83251560e0ae1573e2f9d1b067719479bfb0e987c6357", size = 12494348, upload-time = "2025-02-05T03:48:52.361Z" },
-    { url = "https://files.pythonhosted.org/packages/83/3e/57bb447f7bbbfaabf1712d96f9df142624a386d98fb026a761532526057e/mypy-1.15.0-cp313-cp313-win_amd64.whl", hash = "sha256:b9378e2c00146c44793c98b8d5a61039a048e31f429fb0eb546d93f4b000bedf", size = 9373648, upload-time = "2025-02-05T03:49:11.395Z" },
-    { url = "https://files.pythonhosted.org/packages/09/4e/a7d65c7322c510de2c409ff3828b03354a7c43f5a8ed458a7a131b41c7b9/mypy-1.15.0-py3-none-any.whl", hash = "sha256:5469affef548bd1895d86d3bf10ce2b44e33d86923c29e4d675b3e323437ea3e", size = 2221777, upload-time = "2025-02-05T03:50:08.348Z" },
-]
-
-[[package]]
-name = "mypy-extensions"
-version = "1.0.0"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/98/a4/1ab47638b92648243faf97a5aeb6ea83059cc3624972ab6b8d2316078d3f/mypy_extensions-1.0.0.tar.gz", hash = "sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782", size = 4433, upload-time = "2023-02-04T12:11:27.157Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/2a/e2/5d3f6ada4297caebe1a2add3b126fe800c96f56dbe5d1988a2cbe0b267aa/mypy_extensions-1.0.0-py3-none-any.whl", hash = "sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d", size = 4695, upload-time = "2023-02-04T12:11:25.002Z" },
-]
-
-[[package]]
-name = "pygments"
-version = "2.18.0"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/8e/62/8336eff65bcbc8e4cb5d05b55faf041285951b6e80f33e2bff2024788f31/pygments-2.18.0.tar.gz", hash = "sha256:786ff802f32e91311bff3889f6e9a86e81505fe99f2735bb6d60ae0c5004f199", size = 4891905, upload-time = "2024-05-04T13:42:02.013Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/f7/3f/01c8b82017c199075f8f788d0d906b9ffbbc5a47dc9918a945e13d5a2bda/pygments-2.18.0-py3-none-any.whl", hash = "sha256:b8e6aca0523f3ab76fee51799c488e38782ac06eafcf95e7ba832985c8e7b13a", size = 1205513, upload-time = "2024-05-04T13:41:57.345Z" },
-]
-
-[[package]]
-name = "pytz"
-version = "2025.1"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/5f/57/df1c9157c8d5a05117e455d66fd7cf6dbc46974f832b1058ed4856785d8a/pytz-2025.1.tar.gz", hash = "sha256:c2db42be2a2518b28e65f9207c4d05e6ff547d1efa4086469ef855e4ab70178e", size = 319617, upload-time = "2025-01-31T01:54:48.615Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/eb/38/ac33370d784287baa1c3d538978b5e2ea064d4c1b93ffbd12826c190dd10/pytz-2025.1-py2.py3-none-any.whl", hash = "sha256:89dd22dca55b46eac6eda23b2d72721bf1bdfef212645d81513ef5d03038de57", size = 507930, upload-time = "2025-01-31T01:54:45.634Z" },
-]
-
-[[package]]
-name = "requests"
-version = "2.32.3"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "certifi" },
-    { name = "charset-normalizer" },
-    { name = "idna" },
-    { name = "urllib3" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/63/70/2bf7780ad2d390a8d301ad0b550f1581eadbd9a20f896afe06353c2a2913/requests-2.32.3.tar.gz", hash = "sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760", size = 131218, upload-time = "2024-05-29T15:37:49.536Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/f9/9b/335f9764261e915ed497fcdeb11df5dfd6f7bf257d4a6a2a686d80da4d54/requests-2.32.3-py3-none-any.whl", hash = "sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6", size = 64928, upload-time = "2024-05-29T15:37:47.027Z" },
-]
-
-[[package]]
-name = "rich"
-version = "13.9.2"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "markdown-it-py" },
-    { name = "pygments" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/aa/9e/1784d15b057b0075e5136445aaea92d23955aad2c93eaede673718a40d95/rich-13.9.2.tar.gz", hash = "sha256:51a2c62057461aaf7152b4d611168f93a9fc73068f8ded2790f29fe2b5366d0c", size = 222843, upload-time = "2024-10-04T11:50:31.453Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/67/91/5474b84e505a6ccc295b2d322d90ff6aa0746745717839ee0c5fb4fdcceb/rich-13.9.2-py3-none-any.whl", hash = "sha256:8c82a3d3f8dcfe9e734771313e606b39d8247bb6b826e196f4914b333b743cf1", size = 242117, upload-time = "2024-10-04T11:50:29.123Z" },
-]
-
-[[package]]
-name = "ruff"
-version = "0.9.7"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/39/8b/a86c300359861b186f18359adf4437ac8e4c52e42daa9eedc731ef9d5b53/ruff-0.9.7.tar.gz", hash = "sha256:643757633417907510157b206e490c3aa11cab0c087c912f60e07fbafa87a4c6", size = 3669813, upload-time = "2025-02-20T13:26:52.111Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/b1/f3/3a1d22973291226df4b4e2ff70196b926b6f910c488479adb0eeb42a0d7f/ruff-0.9.7-py3-none-linux_armv6l.whl", hash = "sha256:99d50def47305fe6f233eb8dabfd60047578ca87c9dcb235c9723ab1175180f4", size = 11774588, upload-time = "2025-02-20T13:25:52.253Z" },
-    { url = "https://files.pythonhosted.org/packages/8e/c9/b881f4157b9b884f2994fd08ee92ae3663fb24e34b0372ac3af999aa7fc6/ruff-0.9.7-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:d59105ae9c44152c3d40a9c40d6331a7acd1cdf5ef404fbe31178a77b174ea66", size = 11746848, upload-time = "2025-02-20T13:25:57.279Z" },
-    { url = "https://files.pythonhosted.org/packages/14/89/2f546c133f73886ed50a3d449e6bf4af27d92d2f960a43a93d89353f0945/ruff-0.9.7-py3-none-macosx_11_0_arm64.whl", hash = "sha256:f313b5800483770bd540cddac7c90fc46f895f427b7820f18fe1822697f1fec9", size = 11177525, upload-time = "2025-02-20T13:26:00.007Z" },
-    { url = "https://files.pythonhosted.org/packages/d7/93/6b98f2c12bf28ab9def59c50c9c49508519c5b5cfecca6de871cf01237f6/ruff-0.9.7-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:042ae32b41343888f59c0a4148f103208bf6b21c90118d51dc93a68366f4e903", size = 11996580, upload-time = "2025-02-20T13:26:03.274Z" },
-    { url = "https://files.pythonhosted.org/packages/8e/3f/b3fcaf4f6d875e679ac2b71a72f6691a8128ea3cb7be07cbb249f477c061/ruff-0.9.7-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:87862589373b33cc484b10831004e5e5ec47dc10d2b41ba770e837d4f429d721", size = 11525674, upload-time = "2025-02-20T13:26:06.073Z" },
-    { url = "https://files.pythonhosted.org/packages/f0/48/33fbf18defb74d624535d5d22adcb09a64c9bbabfa755bc666189a6b2210/ruff-0.9.7-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a17e1e01bee0926d351a1ee9bc15c445beae888f90069a6192a07a84af544b6b", size = 12739151, upload-time = "2025-02-20T13:26:08.964Z" },
-    { url = "https://files.pythonhosted.org/packages/63/b5/7e161080c5e19fa69495cbab7c00975ef8a90f3679caa6164921d7f52f4a/ruff-0.9.7-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:7c1f880ac5b2cbebd58b8ebde57069a374865c73f3bf41f05fe7a179c1c8ef22", size = 13416128, upload-time = "2025-02-20T13:26:12.54Z" },
-    { url = "https://files.pythonhosted.org/packages/4e/c8/b5e7d61fb1c1b26f271ac301ff6d9de5e4d9a9a63f67d732fa8f200f0c88/ruff-0.9.7-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e63fc20143c291cab2841dbb8260e96bafbe1ba13fd3d60d28be2c71e312da49", size = 12870858, upload-time = "2025-02-20T13:26:16.794Z" },
-    { url = "https://files.pythonhosted.org/packages/da/cb/2a1a8e4e291a54d28259f8fc6a674cd5b8833e93852c7ef5de436d6ed729/ruff-0.9.7-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:91ff963baed3e9a6a4eba2a02f4ca8eaa6eba1cc0521aec0987da8d62f53cbef", size = 14786046, upload-time = "2025-02-20T13:26:19.85Z" },
-    { url = "https://files.pythonhosted.org/packages/ca/6c/c8f8a313be1943f333f376d79724260da5701426c0905762e3ddb389e3f4/ruff-0.9.7-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:88362e3227c82f63eaebf0b2eff5b88990280fb1ecf7105523883ba8c3aaf6fb", size = 12550834, upload-time = "2025-02-20T13:26:23.082Z" },
-    { url = "https://files.pythonhosted.org/packages/9d/ad/f70cf5e8e7c52a25e166bdc84c082163c9c6f82a073f654c321b4dff9660/ruff-0.9.7-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:0372c5a90349f00212270421fe91874b866fd3626eb3b397ede06cd385f6f7e0", size = 11961307, upload-time = "2025-02-20T13:26:26.738Z" },
-    { url = "https://files.pythonhosted.org/packages/52/d5/4f303ea94a5f4f454daf4d02671b1fbfe2a318b5fcd009f957466f936c50/ruff-0.9.7-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:d76b8ab60e99e6424cd9d3d923274a1324aefce04f8ea537136b8398bbae0a62", size = 11612039, upload-time = "2025-02-20T13:26:30.26Z" },
-    { url = "https://files.pythonhosted.org/packages/eb/c8/bd12a23a75603c704ce86723be0648ba3d4ecc2af07eecd2e9fa112f7e19/ruff-0.9.7-py3-none-musllinux_1_2_i686.whl", hash = "sha256:0c439bdfc8983e1336577f00e09a4e7a78944fe01e4ea7fe616d00c3ec69a3d0", size = 12168177, upload-time = "2025-02-20T13:26:33.452Z" },
-    { url = "https://files.pythonhosted.org/packages/cc/57/d648d4f73400fef047d62d464d1a14591f2e6b3d4a15e93e23a53c20705d/ruff-0.9.7-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:115d1f15e8fdd445a7b4dc9a30abae22de3f6bcabeb503964904471691ef7606", size = 12610122, upload-time = "2025-02-20T13:26:37.365Z" },
-    { url = "https://files.pythonhosted.org/packages/49/79/acbc1edd03ac0e2a04ae2593555dbc9990b34090a9729a0c4c0cf20fb595/ruff-0.9.7-py3-none-win32.whl", hash = "sha256:e9ece95b7de5923cbf38893f066ed2872be2f2f477ba94f826c8defdd6ec6b7d", size = 9988751, upload-time = "2025-02-20T13:26:40.366Z" },
-    { url = "https://files.pythonhosted.org/packages/6d/95/67153a838c6b6ba7a2401241fd8a00cd8c627a8e4a0491b8d853dedeffe0/ruff-0.9.7-py3-none-win_amd64.whl", hash = "sha256:3770fe52b9d691a15f0b87ada29c45324b2ace8f01200fb0c14845e499eb0c2c", size = 11002987, upload-time = "2025-02-20T13:26:43.762Z" },
-    { url = "https://files.pythonhosted.org/packages/63/6a/aca01554949f3a401991dc32fe22837baeaccb8a0d868256cbb26a029778/ruff-0.9.7-py3-none-win_arm64.whl", hash = "sha256:b075a700b2533feb7a01130ff656a4ec0d5f340bb540ad98759b8401c32c2037", size = 10177763, upload-time = "2025-02-20T13:26:48.92Z" },
-]
-
-[[package]]
-name = "shellingham"
-version = "1.5.4"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/58/15/8b3609fd3830ef7b27b655beb4b4e9c62313a4e8da8c676e142cc210d58e/shellingham-1.5.4.tar.gz", hash = "sha256:8dbca0739d487e5bd35ab3ca4b36e11c4078f3a234bfce294b0a0291363404de", size = 10310, upload-time = "2023-10-24T04:13:40.426Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/e0/f9/0595336914c5619e5f28a1fb793285925a8cd4b432c9da0a987836c7f822/shellingham-1.5.4-py2.py3-none-any.whl", hash = "sha256:7ecfff8f2fd72616f7481040475a65b2bf8af90a56c89140852d1120324e8686", size = 9755, upload-time = "2023-10-24T04:13:38.866Z" },
-]
-
-[[package]]
-name = "typer"
-version = "0.15.1"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "click" },
-    { name = "rich" },
-    { name = "shellingham" },
-    { name = "typing-extensions" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/cb/ce/dca7b219718afd37a0068f4f2530a727c2b74a8b6e8e0c0080a4c0de4fcd/typer-0.15.1.tar.gz", hash = "sha256:a0588c0a7fa68a1978a069818657778f86abe6ff5ea6abf472f940a08bfe4f0a", size = 99789, upload-time = "2024-12-04T17:44:58.956Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/d0/cc/0a838ba5ca64dc832aa43f727bd586309846b0ffb2ce52422543e6075e8a/typer-0.15.1-py3-none-any.whl", hash = "sha256:7994fb7b8155b64d3402518560648446072864beefd44aa2dc36972a5972e847", size = 44908, upload-time = "2024-12-04T17:44:57.291Z" },
-]
-
-[[package]]
-name = "types-pytz"
-version = "2025.1.0.20250204"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/b3/d2/2190c54d53c04491ad72a1df019c5dfa692e6ab6c2dba1be7b6c9d530e30/types_pytz-2025.1.0.20250204.tar.gz", hash = "sha256:00f750132769f1c65a4f7240bc84f13985b4da774bd17dfbe5d9cd442746bd49", size = 10352, upload-time = "2025-02-04T02:39:05.553Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/be/50/65ffad73746f1d8b15992c030e0fd22965fd5ae2c0206dc28873343b3230/types_pytz-2025.1.0.20250204-py3-none-any.whl", hash = "sha256:32ca4a35430e8b94f6603b35beb7f56c32260ddddd4f4bb305fdf8f92358b87e", size = 10059, upload-time = "2025-02-04T02:39:03.899Z" },
-]
-
-[[package]]
-name = "types-requests"
-version = "2.32.4.20250913"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "urllib3" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/36/27/489922f4505975b11de2b5ad07b4fe1dca0bca9be81a703f26c5f3acfce5/types_requests-2.32.4.20250913.tar.gz", hash = "sha256:abd6d4f9ce3a9383f269775a9835a4c24e5cd6b9f647d64f88aa4613c33def5d", size = 23113, upload-time = "2025-09-13T02:40:02.309Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/2a/20/9a227ea57c1285986c4cf78400d0a91615d25b24e257fd9e2969606bdfae/types_requests-2.32.4.20250913-py3-none-any.whl", hash = "sha256:78c9c1fffebbe0fa487a418e0fa5252017e9c60d1a2da394077f1780f655d7e1", size = 20658, upload-time = "2025-09-13T02:40:01.115Z" },
-]
-
-[[package]]
-name = "typing-extensions"
-version = "4.12.2"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/df/db/f35a00659bc03fec321ba8bce9420de607a1d37f8342eee1863174c69557/typing_extensions-4.12.2.tar.gz", hash = "sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8", size = 85321, upload-time = "2024-06-07T18:52:15.995Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/26/9f/ad63fc0248c5379346306f8668cda6e2e2e9c95e01216d2b8ffd9ff037d0/typing_extensions-4.12.2-py3-none-any.whl", hash = "sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d", size = 37438, upload-time = "2024-06-07T18:52:13.582Z" },
-]
-
-[[package]]
-name = "update-top-ranking-issues"
-version = "0.1.0"
-source = { virtual = "." }
-dependencies = [
-    { name = "mypy" },
-    { name = "pytz" },
-    { name = "requests" },
-    { name = "ruff" },
-    { name = "typer" },
-    { name = "types-pytz" },
-    { name = "types-requests" },
-]
-
-[package.metadata]
-requires-dist = [
-    { name = "mypy", specifier = ">=1.15.0" },
-    { name = "pytz", specifier = ">=2025.1" },
-    { name = "requests", specifier = ">=2.32.0" },
-    { name = "ruff", specifier = ">=0.9.7" },
-    { name = "typer", specifier = ">=0.15.1" },
-    { name = "types-pytz", specifier = ">=2025.1.0.20250204" },
-    { name = "types-requests", specifier = ">=2.32.0" },
-]
-
-[[package]]
-name = "urllib3"
-version = "2.2.3"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/ed/63/22ba4ebfe7430b76388e7cd448d5478814d3032121827c12a2cc287e2260/urllib3-2.2.3.tar.gz", hash = "sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9", size = 300677, upload-time = "2024-09-12T10:52:18.401Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/ce/d9/5f4c13cecde62396b0d3fe530a50ccea91e7dfc1ccf0e09c228841bb5ba8/urllib3-2.2.3-py3-none-any.whl", hash = "sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac", size = 126338, upload-time = "2024-09-12T10:52:16.589Z" },
-]
diff --git a/script/upload-extension-cli b/script/upload-extension-cli
deleted file mode 100755
index 3af9c3251f..0000000000
--- a/script/upload-extension-cli
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-
-bash -euo pipefail
-source script/lib/blob-store.sh
-
-commit=$1
-if [ "$#" -ne 1 ] || ! [[ $commit =~ ^[0-9a-f]{40}$ ]]; then
-    echo "Usage: $0 <git-sha>"
-    exit 1
-fi
-
-bucket_name="zed-extension-cli"
-target_triple=$(rustc -vV | sed -n 's|host: ||p')
-
-upload_to_blob_store_public $bucket_name "target/release/zed-extension" "${commit}/${target_triple}/zed-extension"
diff --git a/script/upload-nightly b/script/upload-nightly
deleted file mode 100755
index 12e7c16ef7..0000000000
--- a/script/upload-nightly
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-
-bash -euo pipefail
-source script/lib/blob-store.sh
-
-bucket_name="zed-nightly-host"
-version=$(./script/get-crate-version zed)+nightly."${GITHUB_RUN_NUMBER}.${GITHUB_SHA}"
-
-for file_to_upload in ./release-artifacts/*; do
-    [ -f "$file_to_upload" ] || continue
-    upload_to_blob_store_public $bucket_name "$file_to_upload" "nightly/$(basename "$file_to_upload")"
-    upload_to_blob_store_public $bucket_name "$file_to_upload" "${version}/$(basename "$file_to_upload")"
-    rm -f "$file_to_upload"
-done
-
-echo -n ${version} > ./release-artifacts/latest-sha
-upload_to_blob_store_public $bucket_name "release-artifacts/latest-sha" "nightly/latest-sha"
diff --git a/script/upload-nightly.ps1 b/script/upload-nightly.ps1
deleted file mode 100644
index 4400c4291b..0000000000
--- a/script/upload-nightly.ps1
+++ /dev/null
@@ -1,33 +0,0 @@
-[CmdletBinding()]
-Param(
-    [Parameter()][string]$Architecture
-)
-
-# Based on the template in: https://docs.digitalocean.com/reference/api/spaces-api/
-$ErrorActionPreference = "Stop"
-. "$PSScriptRoot\lib\blob-store.ps1"
-. "$PSScriptRoot\lib\workspace.ps1"
-
-ParseZedWorkspace
-Write-Host "Uploading nightly for target: $target"
-
-$bucketName = "zed-nightly-host"
-$releaseVersion = & "$PSScriptRoot\get-crate-version.ps1" zed
-$version = "$releaseVersion+nightly.$env:GITHUB_RUN_NUMBER.$env:GITHUB_SHA"
-
-# TODO:
-# Upload remote server files
-# $remoteServerFiles = Get-ChildItem -Path "target" -Filter "zed-remote-server-*.gz" -Recurse -File
-# foreach ($file in $remoteServerFiles) {
-#     Upload-ToBlobStore -BucketName $bucketName -FileToUpload $file.FullName -BlobStoreKey "nightly/$($file.Name)"
-#     Remove-Item -Path $file.FullName
-# }
-
-UploadToBlobStore -BucketName $bucketName -FileToUpload "target/Zed-$Architecture.exe" -BlobStoreKey "nightly/Zed-$Architecture.exe"
-UploadToBlobStore -BucketName $bucketName -FileToUpload "target/Zed-$Architecture.exe" -BlobStoreKey "$version/Zed-$Architecture.exe"
-
-Remove-Item -Path "target/Zed-$Architecture.exe" -ErrorAction SilentlyContinue
-
-$version | Out-File -FilePath "target/latest-sha" -NoNewline
-UploadToBlobStore -BucketName $bucketName -FileToUpload "target/latest-sha" -BlobStoreKey "nightly/latest-sha-windows"
-Remove-Item -Path "target/latest-sha" -ErrorAction SilentlyContinue
diff --git a/script/what-is-deployed b/script/what-is-deployed
deleted file mode 100755
index c7c4b3ad63..0000000000
--- a/script/what-is-deployed
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-
-set -eu
-source script/lib/deploy-helpers.sh
-
-if [[ $# != 1 ]]; then
-  echo "Usage: $0 <production|staging>"
-  exit 1
-fi
-
-environment=$1
-url="$(url_for_environment $environment)"
-tag="$(tag_for_environment $environment)"
-
-target_zed_kube_cluster
-
-deployed_image_id=$(
-  kubectl \
-    --namespace=${environment} \
-    get deployment collab \
-    -o 'jsonpath={.spec.template.spec.containers[0].image}' \
-    | cut -d: -f2
-)
-
-echo "Deployed image version: $deployed_image_id"
-
-git fetch >/dev/null
-if [[ "$(git rev-parse tags/$tag)" != $deployed_image_id ]]; then
-    echo "NOTE: tags/$tag $(git rev-parse tags/$tag) is not yet deployed"
-fi;
diff --git a/script/zed-local b/script/zed-local
deleted file mode 100755
index d07eb21cba..0000000000
--- a/script/zed-local
+++ /dev/null
@@ -1,217 +0,0 @@
-#!/usr/bin/env node
-
-const HELP = `
-USAGE
-  zed-local  [options]  [zed args]
-
-SUMMARY
-  Runs 1-6 instances of Zed using a locally-running collaboration server.
-  Each instance of Zed will be signed in as a different user specified in
-  either \`.admins.json\` or \`.admins.default.json\`.
-
-  All arguments after the initial options will be passed through to the first
-  instance of Zed. This can be used to test SSH remoting along with collab, like
-  so:
-
-  $ script/zed-local -2 ssh://your-ssh-uri-here
-
-OPTIONS
-  --help            Print this help message
-  --release         Build Zed in release mode
-  -2, -3, -4, ...   Spawn multiple Zed instances, with their windows tiled.
-  --top             Arrange the Zed windows so they take up the top half of the screen.
-  --stable          Use stable Zed release installed on local machine for all instances (except for the first one).
-  --preview         Like --stable, but uses the locally-installed preview release instead.
-`.trim();
-
-const { spawn, execSync, execFileSync } = require("child_process");
-const assert = require("assert");
-
-let users;
-if (process.env.SEED_PATH) {
-  users = require(process.env.SEED_PATH).admins;
-} else {
-  users = require("../crates/collab/seed.default.json").admins;
-  try {
-    const defaultUsers = users;
-    const customUsers = require("../crates/collab/seed.json").admins;
-    assert(customUsers.length > 0);
-    users = customUsers.concat(
-      defaultUsers.filter((user) => !customUsers.includes(user)),
-    );
-  } catch (_) {}
-}
-
-const RESOLUTION_REGEX = /(\d+) x (\d+)/;
-const DIGIT_FLAG_REGEX = /^--?(\d+)$/;
-
-let instanceCount = 1;
-let isReleaseMode = false;
-let isTop = false;
-let othersOnStable = false;
-let othersOnPreview = false;
-let isStateful = false;
-
-const args = process.argv.slice(2);
-while (args.length > 0) {
-  const arg = args[0];
-
-  const digitMatch = arg.match(DIGIT_FLAG_REGEX);
-  if (digitMatch) {
-    instanceCount = parseInt(digitMatch[1]);
-  } else if (arg === "--release") {
-    isReleaseMode = true;
-  } else if (arg == "--stateful") {
-    isStateful = true;
-  } else if (arg === "--top") {
-    isTop = true;
-  } else if (arg === "--help") {
-    console.log(HELP);
-    process.exit(0);
-  } else if (arg === "--stable") {
-    othersOnStable = true;
-  } else if (arg === "--preview") {
-    othersOnPreview = true;
-  } else {
-    break;
-  }
-
-  args.shift();
-}
-const os = require("os");
-const platform = os.platform();
-
-let screenWidth, screenHeight;
-const titleBarHeight = 24;
-
-if (platform === "darwin") {
-  // macOS
-  const displayInfo = JSON.parse(
-    execFileSync("system_profiler", ["SPDisplaysDataType", "-json"], {
-      encoding: "utf8",
-    }),
-  );
-  const mainDisplayResolution = displayInfo?.SPDisplaysDataType?.flatMap(
-    (display) => display?.spdisplays_ndrvs,
-  )
-    ?.find((entry) => entry?.spdisplays_main === "spdisplays_yes")
-    ?._spdisplays_resolution?.match(RESOLUTION_REGEX);
-  if (!mainDisplayResolution) {
-    throw new Error("Could not parse screen resolution");
-  }
-  screenWidth = parseInt(mainDisplayResolution[1]);
-  screenHeight = parseInt(mainDisplayResolution[2]) - titleBarHeight;
-} else if (platform === "linux") {
-  // Linux
-  try {
-    const xrandrOutput = execSync('xrandr | grep "\\*" | cut -d" " -f4', {
-      encoding: "utf8",
-    }).trim();
-    [screenWidth, screenHeight] = xrandrOutput.split("x").map(Number);
-  } catch (err) {
-    console.log(err);
-    throw new Error("Could not get screen resolution");
-  }
-} else if (platform === "win32") {
-  // windows
-  try {
-    const resolutionOutput = execSync(
-      `powershell -Command "& {Add-Type -AssemblyName System.Windows.Forms; [System.Windows.Forms.Screen]::PrimaryScreen.WorkingArea.Size}"`,
-      { encoding: "utf8" },
-    ).trim();
-    [screenWidth, screenHeight] = resolutionOutput.match(/\d+/g).map(Number);
-  } catch (err) {
-    console.log(err);
-    throw new Error("Could not get screen resolution on Windows");
-  }
-}
-
-if (platform !== "win32") {
-  screenHeight -= titleBarHeight;
-}
-
-if (isTop) {
-  screenHeight = Math.floor(screenHeight / 2);
-}
-
-// Determine the window size for each instance
-let rows;
-let columns;
-switch (instanceCount) {
-  case 1:
-    [rows, columns] = [1, 1];
-    break;
-  case 2:
-    [rows, columns] = [1, 2];
-    break;
-  case 3:
-  case 4:
-    [rows, columns] = [2, 2];
-    break;
-  case 5:
-  case 6:
-    [rows, columns] = [2, 3];
-    break;
-}
-
-const instanceWidth = Math.floor(screenWidth / columns);
-const instanceHeight = Math.floor(screenHeight / rows);
-
-// If a user is specified, make sure it's first in the list
-const user = process.env.ZED_IMPERSONATE;
-if (user) {
-  users = [user].concat(users.filter((u) => u !== user));
-}
-
-let buildArgs = ["build"];
-let zedBinary = "target/debug/zed";
-if (isReleaseMode) {
-  buildArgs.push("--release");
-  zedBinary = "target/release/zed";
-}
-
-try {
-  execFileSync("cargo", buildArgs, {
-    stdio: "inherit",
-  });
-} catch (e) {
-  process.exit(0);
-}
-
-setTimeout(() => {
-  for (let i = 0; i < instanceCount; i++) {
-    const row = Math.floor(i / columns);
-    const column = i % columns;
-    let position;
-    if (platform == "win32") {
-      position = [column * instanceWidth, row * instanceHeight].join(",");
-    } else {
-      position = [
-        column * instanceWidth,
-        row * instanceHeight + titleBarHeight,
-      ].join(",");
-    }
-    const size = [instanceWidth, instanceHeight].join(",");
-    let binaryPath = zedBinary;
-    if (i != 0 && othersOnStable) {
-      binaryPath = "/Applications/Zed.app/Contents/MacOS/zed";
-    } else if (i != 0 && othersOnPreview) {
-      binaryPath = "/Applications/Zed Preview.app/Contents/MacOS/zed";
-    }
-    spawn(binaryPath, i == 0 ? args : [], {
-      stdio: "inherit",
-      env: Object.assign({}, process.env, {
-        ZED_IMPERSONATE: users[i],
-        ZED_WINDOW_POSITION: position,
-        ZED_STATELESS: isStateful && i == 0 ? "" : "1",
-        ZED_ALWAYS_ACTIVE: "1",
-        ZED_SERVER_URL: "http://localhost:3000",
-        ZED_RPC_URL: "http://localhost:8080/rpc",
-        ZED_ADMIN_API_TOKEN: "internal-api-key-secret",
-        ZED_WINDOW_SIZE: size,
-        ZED_CLIENT_CHECKSUM_SEED: "development-checksum-seed",
-        RUST_LOG: process.env.RUST_LOG || "info",
-      }),
-    });
-  }
-}, 0.1);
diff --git a/shell.nix b/shell.nix
deleted file mode 100644
index d1783071f9..0000000000
--- a/shell.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-(import (
-  let
-    lock = builtins.fromJSON (builtins.readFile ./flake.lock);
-  in
-  fetchTarball {
-    url =
-      lock.nodes.flake-compat.locked.url
-        or "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
-    sha256 = lock.nodes.flake-compat.locked.narHash;
-  }
-) { src = ./.; }).shellNix
diff --git a/tooling/perf/Cargo.toml b/tooling/perf/Cargo.toml
index d4acad1fdb..c9018de010 100644
--- a/tooling/perf/Cargo.toml
+++ b/tooling/perf/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 publish = false
 edition.workspace = true
 license = "Apache-2.0"
-description = "A tool for measuring Zed test performance, with too many Clippy lints"
+description = "A tool for measuring GPUI test performance"
 
 [lib]
 
diff --git a/tooling/xtask/Cargo.toml b/tooling/xtask/Cargo.toml
deleted file mode 100644
index 13179b2eb6..0000000000
--- a/tooling/xtask/Cargo.toml
+++ /dev/null
@@ -1,23 +0,0 @@
-[package]
-name = "xtask"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[dependencies]
-anyhow.workspace = true
-backtrace.workspace = true
-cargo_metadata.workspace = true
-cargo_toml.workspace = true
-clap = { workspace = true, features = ["derive"] }
-toml.workspace = true
-indoc.workspace = true
-indexmap.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-toml_edit.workspace = true
-gh-workflow.workspace = true
diff --git a/tooling/xtask/LICENSE-GPL b/tooling/xtask/LICENSE-GPL
deleted file mode 120000
index 89e542f750..0000000000
--- a/tooling/xtask/LICENSE-GPL
+++ /dev/null
@@ -1 +0,0 @@
-../../LICENSE-GPL
\ No newline at end of file
diff --git a/tooling/xtask/src/main.rs b/tooling/xtask/src/main.rs
deleted file mode 100644
index 6f83927d67..0000000000
--- a/tooling/xtask/src/main.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-mod tasks;
-mod workspace;
-
-use anyhow::Result;
-use clap::{Parser, Subcommand};
-
-#[derive(Parser)]
-#[command(name = "cargo xtask")]
-struct Args {
-    #[command(subcommand)]
-    command: CliCommand,
-}
-
-#[derive(Subcommand)]
-enum CliCommand {
-    /// Runs `cargo clippy`.
-    Clippy(tasks::clippy::ClippyArgs),
-    Licenses(tasks::licenses::LicensesArgs),
-    /// Checks that packages conform to a set of standards.
-    PackageConformity(tasks::package_conformity::PackageConformityArgs),
-    /// Publishes GPUI and its dependencies to crates.io.
-    PublishGpui(tasks::publish_gpui::PublishGpuiArgs),
-    Workflows(tasks::workflows::GenerateWorkflowArgs),
-}
-
-fn main() -> Result<()> {
-    let args = Args::parse();
-
-    match args.command {
-        CliCommand::Clippy(args) => tasks::clippy::run_clippy(args),
-        CliCommand::Licenses(args) => tasks::licenses::run_licenses(args),
-        CliCommand::PackageConformity(args) => {
-            tasks::package_conformity::run_package_conformity(args)
-        }
-        CliCommand::PublishGpui(args) => tasks::publish_gpui::run_publish_gpui(args),
-        CliCommand::Workflows(args) => tasks::workflows::run_workflows(args),
-    }
-}
diff --git a/tooling/xtask/src/tasks.rs b/tooling/xtask/src/tasks.rs
deleted file mode 100644
index 01b3907f04..0000000000
--- a/tooling/xtask/src/tasks.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-pub mod clippy;
-pub mod licenses;
-pub mod package_conformity;
-pub mod publish_gpui;
-pub mod workflows;
diff --git a/tooling/xtask/src/tasks/clippy.rs b/tooling/xtask/src/tasks/clippy.rs
deleted file mode 100644
index 517223ceb8..0000000000
--- a/tooling/xtask/src/tasks/clippy.rs
+++ /dev/null
@@ -1,64 +0,0 @@
-#![allow(clippy::disallowed_methods, reason = "tooling is exempt")]
-use std::process::Command;
-
-use anyhow::{Context as _, Result, bail};
-use clap::Parser;
-
-#[derive(Parser)]
-pub struct ClippyArgs {
-    /// Automatically apply lint suggestions (`clippy --fix`).
-    #[arg(long)]
-    fix: bool,
-
-    /// The package to run Clippy against (`cargo -p <PACKAGE> clippy`).
-    #[arg(long, short)]
-    package: Option<String>,
-}
-
-pub fn run_clippy(args: ClippyArgs) -> Result<()> {
-    let cargo = std::env::var("CARGO").unwrap_or_else(|_| "cargo".to_string());
-
-    let mut clippy_command = Command::new(&cargo);
-    clippy_command.arg("clippy");
-
-    if let Some(package) = args.package.as_ref() {
-        clippy_command.args(["--package", package]);
-    } else {
-        clippy_command.arg("--workspace");
-    }
-
-    clippy_command
-        .arg("--release")
-        .arg("--all-targets")
-        .arg("--all-features");
-
-    if args.fix {
-        clippy_command.arg("--fix");
-    }
-
-    clippy_command.arg("--");
-
-    // Deny all warnings.
-    clippy_command.args(["--deny", "warnings"]);
-
-    eprintln!(
-        "running: {cargo} {}",
-        clippy_command
-            .get_args()
-            .map(|arg| arg.to_str().unwrap())
-            .collect::<Vec<_>>()
-            .join(" ")
-    );
-
-    let exit_status = clippy_command
-        .spawn()
-        .context("failed to spawn child process")?
-        .wait()
-        .context("failed to wait for child process")?;
-
-    if !exit_status.success() {
-        bail!("clippy failed: {}", exit_status);
-    }
-
-    Ok(())
-}
diff --git a/tooling/xtask/src/tasks/licenses.rs b/tooling/xtask/src/tasks/licenses.rs
deleted file mode 100644
index 449c774d45..0000000000
--- a/tooling/xtask/src/tasks/licenses.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-use std::path::{Path, PathBuf};
-
-use anyhow::{Context as _, Result};
-use clap::Parser;
-
-use crate::workspace::load_workspace;
-
-#[derive(Parser)]
-pub struct LicensesArgs {}
-
-pub fn run_licenses(_args: LicensesArgs) -> Result<()> {
-    const LICENSE_FILES: &[&str] = &["LICENSE-APACHE", "LICENSE-GPL", "LICENSE-AGPL"];
-
-    let workspace = load_workspace()?;
-
-    for package in workspace.workspace_packages() {
-        let crate_dir = package
-            .manifest_path
-            .parent()
-            .with_context(|| format!("no crate directory for {}", package.name))?;
-
-        if let Some(license_file) = first_license_file(crate_dir, LICENSE_FILES) {
-            if !license_file.is_symlink() {
-                println!("{} is not a symlink", license_file.display());
-            }
-
-            continue;
-        }
-
-        println!("Missing license: {}", package.name);
-    }
-
-    Ok(())
-}
-
-fn first_license_file(path: impl AsRef<Path>, license_files: &[&str]) -> Option<PathBuf> {
-    for license_file in license_files {
-        let path_to_license = path.as_ref().join(license_file);
-        if path_to_license.exists() {
-            return Some(path_to_license);
-        }
-    }
-
-    None
-}
diff --git a/tooling/xtask/src/tasks/package_conformity.rs b/tooling/xtask/src/tasks/package_conformity.rs
deleted file mode 100644
index e1fd15112f..0000000000
--- a/tooling/xtask/src/tasks/package_conformity.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-use std::collections::BTreeMap;
-use std::fs;
-use std::path::Path;
-
-use anyhow::{Context as _, Result};
-use cargo_toml::{Dependency, Manifest};
-use clap::Parser;
-
-use crate::workspace::load_workspace;
-
-#[derive(Parser)]
-pub struct PackageConformityArgs {}
-
-pub fn run_package_conformity(_args: PackageConformityArgs) -> Result<()> {
-    let workspace = load_workspace()?;
-
-    let mut non_workspace_dependencies = BTreeMap::new();
-
-    for package in workspace.workspace_packages() {
-        let is_extension = package
-            .manifest_path
-            .parent()
-            .and_then(|parent| parent.parent())
-            .is_some_and(|grandparent_dir| grandparent_dir.ends_with("extensions"));
-
-        let cargo_toml = read_cargo_toml(&package.manifest_path)?;
-
-        let is_using_workspace_lints = cargo_toml.lints.is_some_and(|lints| lints.workspace);
-        if !is_using_workspace_lints {
-            eprintln!(
-                "{package:?} is not using workspace lints",
-                package = package.name
-            );
-        }
-
-        // Extensions should not use workspace dependencies.
-        if is_extension || package.name == "zed_extension_api" {
-            continue;
-        }
-
-        for dependencies in [
-            &cargo_toml.dependencies,
-            &cargo_toml.dev_dependencies,
-            &cargo_toml.build_dependencies,
-        ] {
-            for (name, dependency) in dependencies {
-                if let Dependency::Inherited(_) = dependency {
-                    continue;
-                }
-
-                non_workspace_dependencies
-                    .entry(name.to_owned())
-                    .or_insert_with(Vec::new)
-                    .push(package.name.clone());
-            }
-        }
-    }
-
-    for (dependency, packages) in non_workspace_dependencies {
-        eprintln!(
-            "{dependency} is being used as a non-workspace dependency: {}",
-            packages.join(", ")
-        );
-    }
-
-    Ok(())
-}
-
-/// Returns the contents of the `Cargo.toml` file at the given path.
-fn read_cargo_toml(path: impl AsRef<Path>) -> Result<Manifest> {
-    let path = path.as_ref();
-    let cargo_toml_bytes = fs::read(path)?;
-    Manifest::from_slice(&cargo_toml_bytes)
-        .with_context(|| format!("reading Cargo.toml at {path:?}"))
-}
diff --git a/tooling/xtask/src/tasks/publish_gpui.rs b/tooling/xtask/src/tasks/publish_gpui.rs
deleted file mode 100644
index 2740f75a48..0000000000
--- a/tooling/xtask/src/tasks/publish_gpui.rs
+++ /dev/null
@@ -1,442 +0,0 @@
-#![allow(clippy::disallowed_methods, reason = "tooling is exempt")]
-use std::io::{self, Write};
-use std::process::{Command, Output, Stdio};
-
-use anyhow::{Context as _, Result, bail};
-use clap::Parser;
-
-#[derive(Parser)]
-pub struct PublishGpuiArgs {
-    /// Perform a dry-run and wait for user confirmation before each publish
-    #[arg(long)]
-    dry_run: bool,
-
-    /// Skip to a specific package (by package name or crate name) and start from there
-    #[arg(long)]
-    skip_to: Option<String>,
-}
-
-pub fn run_publish_gpui(args: PublishGpuiArgs) -> Result<()> {
-    println!(
-        "Starting GPUI publish process{}...",
-        if args.dry_run { " (with dry-run)" } else { "" }
-    );
-
-    let start_time = std::time::Instant::now();
-    check_workspace_root()?;
-
-    if args.skip_to.is_none() {
-        check_git_clean()?;
-    } else {
-        println!("Skipping git clean check due to --skip-to flag");
-    }
-
-    let version = read_gpui_version()?;
-    println!("Updating GPUI to version: {}", version);
-    publish_dependencies(&version, args.dry_run, args.skip_to.as_deref())?;
-    publish_gpui(&version, args.dry_run)?;
-    println!("GPUI published in {}s", start_time.elapsed().as_secs_f32());
-    Ok(())
-}
-
-fn read_gpui_version() -> Result<String> {
-    let gpui_cargo_toml_path = "crates/gpui/Cargo.toml";
-    let contents = std::fs::read_to_string(gpui_cargo_toml_path)
-        .context("Failed to read crates/gpui/Cargo.toml")?;
-
-    let cargo_toml: toml::Value =
-        toml::from_str(&contents).context("Failed to parse crates/gpui/Cargo.toml")?;
-
-    let version = cargo_toml
-        .get("package")
-        .and_then(|p| p.get("version"))
-        .and_then(|v| v.as_str())
-        .context("Failed to find version in crates/gpui/Cargo.toml")?;
-
-    Ok(version.to_string())
-}
-
-fn publish_dependencies(new_version: &str, dry_run: bool, skip_to: Option<&str>) -> Result<()> {
-    let gpui_dependencies = vec![
-        ("collections", "gpui_collections", "crates"),
-        ("perf", "gpui_perf", "tooling"),
-        ("util_macros", "gpui_util_macros", "crates"),
-        ("util", "gpui_util", "crates"),
-        ("gpui_macros", "gpui-macros", "crates"),
-        ("http_client", "gpui_http_client", "crates"),
-        (
-            "derive_refineable",
-            "gpui_derive_refineable",
-            "crates/refineable",
-        ),
-        ("refineable", "gpui_refineable", "crates"),
-        ("semantic_version", "gpui_semantic_version", "crates"),
-        ("sum_tree", "gpui_sum_tree", "crates"),
-        ("media", "gpui_media", "crates"),
-    ];
-
-    let mut should_skip = skip_to.is_some();
-    let skip_target = skip_to.unwrap_or("");
-
-    for (package_name, crate_name, package_dir) in gpui_dependencies {
-        if should_skip {
-            if package_name == skip_target || crate_name == skip_target {
-                println!("Found skip target: {} ({})", crate_name, package_name);
-                should_skip = false;
-            } else {
-                println!("Skipping: {} ({})", crate_name, package_name);
-                continue;
-            }
-        }
-
-        println!(
-            "Publishing dependency: {} (package: {})",
-            crate_name, package_name
-        );
-
-        update_crate_cargo_toml(package_name, crate_name, package_dir, new_version)?;
-        update_workspace_dependency_version(package_name, crate_name, new_version)?;
-        publish_crate(crate_name, dry_run)?;
-    }
-
-    if should_skip {
-        bail!(
-            "Could not find package or crate named '{}' to skip to",
-            skip_target
-        );
-    }
-
-    Ok(())
-}
-
-fn publish_gpui(new_version: &str, dry_run: bool) -> Result<()> {
-    update_crate_cargo_toml("gpui", "gpui", "crates", new_version)?;
-
-    publish_crate("gpui", dry_run)?;
-
-    Ok(())
-}
-
-fn update_crate_cargo_toml(
-    package_name: &str,
-    crate_name: &str,
-    package_dir: &str,
-    new_version: &str,
-) -> Result<()> {
-    let cargo_toml_path = format!("{}/{}/Cargo.toml", package_dir, package_name);
-    let contents = std::fs::read_to_string(&cargo_toml_path)
-        .context(format!("Failed to read {}", cargo_toml_path))?;
-
-    let updated = update_crate_package_fields(&contents, crate_name, new_version)?;
-
-    std::fs::write(&cargo_toml_path, updated)
-        .context(format!("Failed to write {}", cargo_toml_path))?;
-
-    Ok(())
-}
-
-fn update_crate_package_fields(
-    toml_contents: &str,
-    crate_name: &str,
-    new_version: &str,
-) -> Result<String> {
-    let mut doc = toml_contents
-        .parse::<toml_edit::DocumentMut>()
-        .context("Failed to parse TOML")?;
-
-    let package = doc
-        .get_mut("package")
-        .and_then(|p| p.as_table_like_mut())
-        .context("Failed to find [package] section")?;
-
-    package.insert("name", toml_edit::value(crate_name));
-    package.insert("version", toml_edit::value(new_version));
-    package.insert("publish", toml_edit::value(true));
-
-    Ok(doc.to_string())
-}
-
-fn publish_crate(crate_name: &str, dry_run: bool) -> Result<()> {
-    let publish_crate_impl = |crate_name, dry_run| {
-        let cargo = std::env::var("CARGO").unwrap_or_else(|_| "cargo".to_string());
-
-        let mut command = Command::new(&cargo);
-        command
-            .arg("publish")
-            .arg("--allow-dirty")
-            .args(["-p", crate_name]);
-
-        if dry_run {
-            command.arg("--dry-run");
-        }
-
-        run_command(&mut command)?;
-
-        anyhow::Ok(())
-    };
-
-    if dry_run {
-        publish_crate_impl(crate_name, true)?;
-
-        print!("Press Enter to publish for real (or ctrl-c to abort)...");
-        io::stdout().flush()?;
-
-        let mut input = String::new();
-        io::stdin().read_line(&mut input)?;
-    }
-
-    publish_crate_impl(crate_name, false)?;
-
-    Ok(())
-}
-
-fn update_workspace_dependency_version(
-    package_name: &str,
-    crate_name: &str,
-    new_version: &str,
-) -> Result<()> {
-    let workspace_cargo_toml_path = "Cargo.toml";
-    let contents = std::fs::read_to_string(workspace_cargo_toml_path)
-        .context("Failed to read workspace Cargo.toml")?;
-
-    let mut doc = contents
-        .parse::<toml_edit::DocumentMut>()
-        .context("Failed to parse TOML")?;
-
-    update_dependency_version_in_doc(&mut doc, package_name, crate_name, new_version)?;
-    update_profile_override_in_doc(&mut doc, package_name, crate_name)?;
-
-    std::fs::write(workspace_cargo_toml_path, doc.to_string())
-        .context("Failed to write workspace Cargo.toml")?;
-
-    Ok(())
-}
-
-fn update_dependency_version_in_doc(
-    doc: &mut toml_edit::DocumentMut,
-    package_name: &str,
-    crate_name: &str,
-    new_version: &str,
-) -> Result<()> {
-    let dependency = doc
-        .get_mut("workspace")
-        .and_then(|w| w.get_mut("dependencies"))
-        .and_then(|d| d.get_mut(package_name))
-        .context(format!(
-            "Failed to find {} in workspace dependencies",
-            package_name
-        ))?;
-
-    if let Some(dep_table) = dependency.as_table_like_mut() {
-        dep_table.insert("version", toml_edit::value(new_version));
-        dep_table.insert("package", toml_edit::value(crate_name));
-    } else {
-        bail!("{} is not a table in workspace dependencies", package_name);
-    }
-
-    Ok(())
-}
-
-fn update_profile_override_in_doc(
-    doc: &mut toml_edit::DocumentMut,
-    package_name: &str,
-    crate_name: &str,
-) -> Result<()> {
-    if let Some(profile_dev_package) = doc
-        .get_mut("profile")
-        .and_then(|p| p.get_mut("dev"))
-        .and_then(|d| d.get_mut("package"))
-        .and_then(|p| p.as_table_like_mut())
-    {
-        if let Some(old_entry) = profile_dev_package.get(package_name) {
-            let old_entry_clone = old_entry.clone();
-            profile_dev_package.remove(package_name);
-            profile_dev_package.insert(crate_name, old_entry_clone);
-        }
-    }
-
-    Ok(())
-}
-
-fn check_workspace_root() -> Result<()> {
-    let cwd = std::env::current_dir().context("Failed to get current directory")?;
-
-    // Check if Cargo.toml exists in the current directory
-    let cargo_toml_path = cwd.join("Cargo.toml");
-    if !cargo_toml_path.exists() {
-        bail!(
-            "Cargo.toml not found in current directory. Please run this command from the workspace root."
-        );
-    }
-
-    // Check if it's a workspace by looking for [workspace] section
-    let contents =
-        std::fs::read_to_string(&cargo_toml_path).context("Failed to read Cargo.toml")?;
-
-    if !contents.contains("[workspace]") {
-        bail!(
-            "Current directory does not appear to be a workspace root. Please run this command from the workspace root."
-        );
-    }
-
-    Ok(())
-}
-
-fn check_git_clean() -> Result<()> {
-    let output = run_command(
-        Command::new("git")
-            .args(["status", "--porcelain"])
-            .stdout(Stdio::piped())
-            .stderr(Stdio::piped()),
-    )?;
-
-    if !output.status.success() {
-        bail!("git status command failed");
-    }
-
-    let stdout = String::from_utf8_lossy(&output.stdout);
-    if !stdout.trim().is_empty() {
-        bail!(
-            "Working directory is not clean. Please commit or stash your changes before publishing."
-        );
-    }
-
-    Ok(())
-}
-
-fn run_command(command: &mut Command) -> Result<Output> {
-    let command_str = {
-        let program = command.get_program().to_string_lossy();
-        let args = command
-            .get_args()
-            .map(|arg| arg.to_string_lossy())
-            .collect::<Vec<_>>()
-            .join(" ");
-
-        if args.is_empty() {
-            program.to_string()
-        } else {
-            format!("{} {}", program, args)
-        }
-    };
-    eprintln!("+ {}", command_str);
-
-    let output = command
-        .spawn()
-        .context("failed to spawn child process")?
-        .wait_with_output()
-        .context("failed to wait for child process")?;
-
-    if !output.status.success() {
-        bail!("Command failed with status {}", output.status);
-    }
-
-    Ok(output)
-}
-
-#[cfg(test)]
-mod tests {
-    use indoc::indoc;
-
-    use super::*;
-
-    #[test]
-    fn test_update_dependency_version_in_toml() {
-        let input = indoc! {r#"
-            [workspace]
-            resolver = "2"
-
-            [workspace.dependencies]
-            # here's a comment
-            collections = { path = "crates/collections" }
-
-            util = { path = "crates/util", package = "zed-util", version = "0.1.0" }
-        "#};
-
-        let mut doc = input.parse::<toml_edit::DocumentMut>().unwrap();
-
-        update_dependency_version_in_doc(&mut doc, "collections", "gpui_collections", "0.2.0")
-            .unwrap();
-
-        let result = doc.to_string();
-
-        let output = indoc! {r#"
-            [workspace]
-            resolver = "2"
-
-            [workspace.dependencies]
-            # here's a comment
-            collections = { path = "crates/collections" , version = "0.2.0", package = "gpui_collections" }
-
-            util = { path = "crates/util", package = "zed-util", version = "0.1.0" }
-        "#};
-
-        assert_eq!(result, output);
-    }
-
-    #[test]
-    fn test_update_crate_package_fields() {
-        let input = indoc! {r#"
-            [package]
-            name = "collections"
-            version = "0.1.0"
-            edition = "2021"
-            publish = false
-            # some comment about the license
-            license = "GPL-3.0-or-later"
-
-            [dependencies]
-            serde = "1.0"
-        "#};
-
-        let result = update_crate_package_fields(input, "gpui_collections", "0.2.0").unwrap();
-
-        let output = indoc! {r#"
-            [package]
-            name = "gpui_collections"
-            version = "0.2.0"
-            edition = "2021"
-            publish = true
-            # some comment about the license
-            license = "GPL-3.0-or-later"
-
-            [dependencies]
-            serde = "1.0"
-        "#};
-
-        assert_eq!(result, output);
-    }
-
-    #[test]
-    fn test_update_profile_override_in_toml() {
-        let input = indoc! {r#"
-            [profile.dev]
-            split-debuginfo = "unpacked"
-
-            [profile.dev.package]
-            taffy = { opt-level = 3 }
-            collections = { codegen-units = 256 }
-            refineable = { codegen-units = 256 }
-            util = { codegen-units = 256 }
-        "#};
-
-        let mut doc = input.parse::<toml_edit::DocumentMut>().unwrap();
-
-        update_profile_override_in_doc(&mut doc, "collections", "gpui_collections").unwrap();
-
-        let result = doc.to_string();
-
-        let output = indoc! {r#"
-            [profile.dev]
-            split-debuginfo = "unpacked"
-
-            [profile.dev.package]
-            taffy = { opt-level = 3 }
-            refineable = { codegen-units = 256 }
-            util = { codegen-units = 256 }
-            gpui_collections = { codegen-units = 256 }
-        "#};
-
-        assert_eq!(result, output);
-    }
-}
diff --git a/tooling/xtask/src/tasks/workflows.rs b/tooling/xtask/src/tasks/workflows.rs
deleted file mode 100644
index 717517402d..0000000000
--- a/tooling/xtask/src/tasks/workflows.rs
+++ /dev/null
@@ -1,138 +0,0 @@
-use anyhow::{Context, Result};
-use clap::Parser;
-use gh_workflow::Workflow;
-use std::fs;
-use std::path::{Path, PathBuf};
-
-mod after_release;
-mod cherry_pick;
-mod compare_perf;
-mod danger;
-mod extension_bump;
-mod extension_release;
-mod extension_tests;
-mod extensions;
-mod nix_build;
-mod release_nightly;
-mod run_bundling;
-
-mod release;
-mod run_agent_evals;
-mod run_tests;
-mod runners;
-mod steps;
-mod vars;
-
-#[derive(Parser)]
-pub struct GenerateWorkflowArgs {}
-
-struct WorkflowFile {
-    source: fn() -> Workflow,
-    r#type: WorkflowType,
-}
-
-impl WorkflowFile {
-    fn zed(f: fn() -> Workflow) -> WorkflowFile {
-        WorkflowFile {
-            source: f,
-            r#type: WorkflowType::Zed,
-        }
-    }
-    fn extension(f: fn() -> Workflow) -> WorkflowFile {
-        WorkflowFile {
-            source: f,
-            r#type: WorkflowType::Extensions,
-        }
-    }
-
-    fn generate_file(&self) -> Result<()> {
-        let workflow = (self.source)();
-        let workflow_folder = self.r#type.folder_path();
-        let workflow_name = workflow
-            .name
-            .as_ref()
-            .expect("Workflow must have a name at this point");
-        let filename = format!(
-            "{}.yml",
-            workflow_name.rsplit("::").next().unwrap_or(workflow_name)
-        );
-
-        let workflow_path = workflow_folder.join(filename);
-
-        let content = workflow
-            .to_string()
-            .map_err(|e| anyhow::anyhow!("{:?}: {:?}", workflow_path, e))?;
-
-        let disclaimer = self.r#type.disclaimer(workflow_name);
-
-        let content = [disclaimer, content].join("\n");
-        fs::write(&workflow_path, content).map_err(Into::into)
-    }
-}
-
-enum WorkflowType {
-    Zed,
-    Extensions,
-}
-
-impl WorkflowType {
-    fn disclaimer(&self, workflow_name: &str) -> String {
-        format!(
-            concat!(
-                "# Generated from xtask::workflows::{}{}\n",
-                "# Rebuild with `cargo xtask workflows`.",
-            ),
-            workflow_name,
-            matches!(self, WorkflowType::Extensions)
-                .then_some(" within the Zed repository.")
-                .unwrap_or_default(),
-        )
-    }
-
-    fn folder_path(&self) -> PathBuf {
-        match self {
-            WorkflowType::Zed => PathBuf::from(".github/workflows"),
-            WorkflowType::Extensions => PathBuf::from("extensions/workflows"),
-        }
-    }
-}
-
-pub fn run_workflows(_: GenerateWorkflowArgs) -> Result<()> {
-    if !Path::new("crates/zed/").is_dir() {
-        anyhow::bail!("xtask workflows must be ran from the project root");
-    }
-    let workflow_dir = Path::new(".github/workflows");
-    let extension_workflow_dir = Path::new("extensions/workflows");
-
-    let workflows = [
-        WorkflowFile::zed(danger::danger),
-        WorkflowFile::zed(run_bundling::run_bundling),
-        WorkflowFile::zed(release_nightly::release_nightly),
-        WorkflowFile::zed(run_tests::run_tests),
-        WorkflowFile::zed(release::release),
-        WorkflowFile::zed(cherry_pick::cherry_pick),
-        WorkflowFile::zed(compare_perf::compare_perf),
-        WorkflowFile::zed(run_agent_evals::run_unit_evals),
-        WorkflowFile::zed(run_agent_evals::run_cron_unit_evals),
-        WorkflowFile::zed(run_agent_evals::run_agent_evals),
-        WorkflowFile::zed(after_release::after_release),
-        WorkflowFile::zed(extension_tests::extension_tests),
-        WorkflowFile::zed(extension_bump::extension_bump),
-        WorkflowFile::zed(extension_release::extension_release),
-        /* workflows used for CI/CD in extension repositories */
-        WorkflowFile::extension(extensions::run_tests::run_tests),
-        WorkflowFile::extension(extensions::bump_version::bump_version),
-        WorkflowFile::extension(extensions::release_version::release_version),
-    ];
-
-    for directory in [&workflow_dir, &extension_workflow_dir] {
-        fs::create_dir_all(directory)
-            .with_context(|| format!("Failed to create directory: {}", directory.display()))?;
-    }
-
-    for workflow_file in workflows {
-        workflow_file.generate_file()?;
-    }
-
-    Ok(())
-}
diff --git a/tooling/xtask/src/tasks/workflows/after_release.rs b/tooling/xtask/src/tasks/workflows/after_release.rs
deleted file mode 100644
index c475617197..0000000000
--- a/tooling/xtask/src/tasks/workflows/after_release.rs
+++ /dev/null
@@ -1,164 +0,0 @@
-use gh_workflow::*;
-
-use crate::tasks::workflows::{
-    release::{self, notify_on_failure},
-    runners,
-    steps::{CommonJobConditions, NamedJob, checkout_repo, dependant_job, named},
-    vars::{self, StepOutput, WorkflowInput},
-};
-
-const TAG_NAME: &str = "${{ github.event.release.tag_name || inputs.tag_name }}";
-const IS_PRERELEASE: &str = "${{ github.event.release.prerelease || inputs.prerelease }}";
-const RELEASE_BODY: &str = "${{ github.event.release.body || inputs.body }}";
-
-pub fn after_release() -> Workflow {
-    let tag_name = WorkflowInput::string("tag_name", None);
-    let prerelease = WorkflowInput::bool("prerelease", None);
-    let body = WorkflowInput::string("body", Some(String::new()));
-
-    let refresh_zed_dev = rebuild_releases_page();
-    let post_to_discord = post_to_discord(&[&refresh_zed_dev]);
-    let publish_winget = publish_winget();
-    let create_sentry_release = create_sentry_release();
-    let notify_on_failure = notify_on_failure(&[
-        &refresh_zed_dev,
-        &post_to_discord,
-        &publish_winget,
-        &create_sentry_release,
-    ]);
-
-    named::workflow()
-        .on(Event::default()
-            .release(Release::default().types(vec![ReleaseType::Published]))
-            .workflow_dispatch(
-                WorkflowDispatch::default()
-                    .add_input(tag_name.name, tag_name.input())
-                    .add_input(prerelease.name, prerelease.input())
-                    .add_input(body.name, body.input()),
-            ))
-        .add_job(refresh_zed_dev.name, refresh_zed_dev.job)
-        .add_job(post_to_discord.name, post_to_discord.job)
-        .add_job(publish_winget.name, publish_winget.job)
-        .add_job(create_sentry_release.name, create_sentry_release.job)
-        .add_job(notify_on_failure.name, notify_on_failure.job)
-}
-
-fn rebuild_releases_page() -> NamedJob {
-    fn refresh_cloud_releases() -> Step<Run> {
-        named::bash(format!(
-            "curl -fX POST https://cloud.zed.dev/releases/refresh?expect_tag={TAG_NAME}"
-        ))
-    }
-
-    fn redeploy_zed_dev() -> Step<Run> {
-        named::bash("npm exec --yes -- vercel@37 --token=\"$VERCEL_TOKEN\" --scope zed-industries redeploy https://zed.dev")
-            .add_env(("VERCEL_TOKEN", vars::VERCEL_TOKEN))
-    }
-
-    named::job(
-        Job::default()
-            .runs_on(runners::LINUX_SMALL)
-            .with_repository_owner_guard()
-            .add_step(refresh_cloud_releases())
-            .add_step(redeploy_zed_dev()),
-    )
-}
-
-fn post_to_discord(deps: &[&NamedJob]) -> NamedJob {
-    fn get_release_url() -> Step<Run> {
-        named::bash(format!(
-            r#"if [ "{IS_PRERELEASE}" == "true" ]; then
-    URL="https://zed.dev/releases/preview"
-else
-    URL="https://zed.dev/releases/stable"
-fi
-
-echo "URL=$URL" >> "$GITHUB_OUTPUT"
-"#
-        ))
-        .id("get-release-url")
-    }
-
-    fn get_content() -> Step<Use> {
-        named::uses(
-            "2428392",
-            "gh-truncate-string-action",
-            "b3ff790d21cf42af3ca7579146eedb93c8fb0757", // v1.4.1
-        )
-        .id("get-content")
-        .add_with((
-            "stringToTruncate",
-            format!(
-                "📣 Zed [{TAG_NAME}](<${{{{ steps.get-release-url.outputs.URL }}}}>)  was just released!\n\n{RELEASE_BODY}\n"
-            ),
-        ))
-        .add_with(("maxLength", 2000))
-        .add_with(("truncationSymbol", "..."))
-    }
-
-    fn discord_webhook_action() -> Step<Use> {
-        named::uses(
-            "tsickert",
-            "discord-webhook",
-            "c840d45a03a323fbc3f7507ac7769dbd91bfb164", // v5.3.0
-        )
-        .add_with(("webhook-url", vars::DISCORD_WEBHOOK_RELEASE_NOTES))
-        .add_with(("content", "${{ steps.get-content.outputs.string }}"))
-    }
-    let job = dependant_job(deps)
-        .runs_on(runners::LINUX_SMALL)
-        .with_repository_owner_guard()
-        .add_step(get_release_url())
-        .add_step(get_content())
-        .add_step(discord_webhook_action());
-    named::job(job)
-}
-
-fn publish_winget() -> NamedJob {
-    fn set_package_name() -> (Step<Run>, StepOutput) {
-        let script = format!(
-            r#"if ("{IS_PRERELEASE}" -eq "true") {{
-    $PACKAGE_NAME = "ZedIndustries.Zed.Preview"
-}} else {{
-    $PACKAGE_NAME = "ZedIndustries.Zed"
-}}
-
-echo "PACKAGE_NAME=$PACKAGE_NAME" >> $env:GITHUB_OUTPUT
-"#
-        );
-        let step = named::pwsh(&script).id("set-package-name");
-
-        let output = StepOutput::new(&step, "PACKAGE_NAME");
-        (step, output)
-    }
-
-    fn winget_releaser(package_name: &StepOutput) -> Step<Use> {
-        named::uses(
-            "vedantmgoyal9",
-            "winget-releaser",
-            "19e706d4c9121098010096f9c495a70a7518b30f", // v2
-        )
-        .add_with(("identifier", package_name.to_string()))
-        .add_with(("release-tag", TAG_NAME))
-        .add_with(("max-versions-to-keep", 5))
-        .add_with(("token", vars::WINGET_TOKEN))
-    }
-
-    let (set_package_name, package_name) = set_package_name();
-
-    named::job(
-        Job::default()
-            .runs_on(runners::WINDOWS_DEFAULT)
-            .add_step(set_package_name)
-            .add_step(winget_releaser(&package_name)),
-    )
-}
-
-fn create_sentry_release() -> NamedJob {
-    let job = Job::default()
-        .runs_on(runners::LINUX_SMALL)
-        .with_repository_owner_guard()
-        .add_step(checkout_repo())
-        .add_step(release::create_sentry_release());
-    named::job(job)
-}
diff --git a/tooling/xtask/src/tasks/workflows/cherry_pick.rs b/tooling/xtask/src/tasks/workflows/cherry_pick.rs
deleted file mode 100644
index 105bf74c41..0000000000
--- a/tooling/xtask/src/tasks/workflows/cherry_pick.rs
+++ /dev/null
@@ -1,66 +0,0 @@
-use gh_workflow::*;
-
-use crate::tasks::workflows::{
-    runners,
-    steps::{self, NamedJob, named},
-    vars::{self, StepOutput, WorkflowInput},
-};
-
-pub fn cherry_pick() -> Workflow {
-    let branch = WorkflowInput::string("branch", None);
-    let commit = WorkflowInput::string("commit", None);
-    let channel = WorkflowInput::string("channel", None);
-    let pr_number = WorkflowInput::string("pr_number", None);
-    let cherry_pick = run_cherry_pick(&branch, &commit, &channel);
-    named::workflow()
-        .run_name(format!("cherry_pick to {channel} #{pr_number}"))
-        .on(Event::default().workflow_dispatch(
-            WorkflowDispatch::default()
-                .add_input(commit.name, commit.input())
-                .add_input(branch.name, branch.input())
-                .add_input(channel.name, channel.input())
-                .add_input(pr_number.name, pr_number.input()),
-        ))
-        .add_job(cherry_pick.name, cherry_pick.job)
-}
-
-fn run_cherry_pick(
-    branch: &WorkflowInput,
-    commit: &WorkflowInput,
-    channel: &WorkflowInput,
-) -> NamedJob {
-    fn authenticate_as_zippy() -> (Step<Use>, StepOutput) {
-        let step = named::uses(
-            "actions",
-            "create-github-app-token",
-            "bef1eaf1c0ac2b148ee2a0a74c65fbe6db0631f1",
-        ) // v2
-        .add_with(("app-id", vars::ZED_ZIPPY_APP_ID))
-        .add_with(("private-key", vars::ZED_ZIPPY_APP_PRIVATE_KEY))
-        .id("get-app-token");
-        let output = StepOutput::new(&step, "token");
-        (step, output)
-    }
-
-    fn cherry_pick(
-        branch: &WorkflowInput,
-        commit: &WorkflowInput,
-        channel: &WorkflowInput,
-        token: &StepOutput,
-    ) -> Step<Run> {
-        named::bash(&format!("./script/cherry-pick {branch} {commit} {channel}"))
-            .add_env(("GIT_COMMITTER_NAME", "Zed Zippy"))
-            .add_env(("GIT_COMMITTER_EMAIL", "hi@zed.dev"))
-            .add_env(("GITHUB_TOKEN", token))
-    }
-
-    let (authenticate, token) = authenticate_as_zippy();
-
-    named::job(
-        Job::default()
-            .runs_on(runners::LINUX_SMALL)
-            .add_step(steps::checkout_repo())
-            .add_step(authenticate)
-            .add_step(cherry_pick(branch, commit, channel, &token)),
-    )
-}
diff --git a/tooling/xtask/src/tasks/workflows/compare_perf.rs b/tooling/xtask/src/tasks/workflows/compare_perf.rs
deleted file mode 100644
index 1d111acc4f..0000000000
--- a/tooling/xtask/src/tasks/workflows/compare_perf.rs
+++ /dev/null
@@ -1,67 +0,0 @@
-use gh_workflow::*;
-
-use crate::tasks::workflows::run_bundling::upload_artifact;
-use crate::tasks::workflows::steps::FluentBuilder;
-use crate::tasks::workflows::{
-    runners,
-    steps::{self, NamedJob, named},
-    vars::WorkflowInput,
-};
-
-pub fn compare_perf() -> Workflow {
-    let head = WorkflowInput::string("head", None);
-    let base = WorkflowInput::string("base", None);
-    let crate_name = WorkflowInput::string("crate_name", Some("".to_owned()));
-    let run_perf = run_perf(&base, &head, &crate_name);
-    named::workflow()
-        .on(Event::default().workflow_dispatch(
-            WorkflowDispatch::default()
-                .add_input(head.name, head.input())
-                .add_input(base.name, base.input())
-                .add_input(crate_name.name, crate_name.input()),
-        ))
-        .add_job(run_perf.name, run_perf.job)
-}
-
-pub fn run_perf(
-    base: &WorkflowInput,
-    head: &WorkflowInput,
-    crate_name: &WorkflowInput,
-) -> NamedJob {
-    fn cargo_perf_test(ref_name: &WorkflowInput, crate_name: &WorkflowInput) -> Step<Run> {
-        named::bash(&format!(
-            "
-            if [ -n \"{crate_name}\" ]; then
-                cargo perf-test -p {crate_name} -- --json={ref_name};
-            else
-                cargo perf-test -p vim -- --json={ref_name};
-            fi"
-        ))
-    }
-
-    fn install_hyperfine() -> Step<Use> {
-        named::uses("taiki-e", "install-action", "hyperfine")
-    }
-
-    fn compare_runs(head: &WorkflowInput, base: &WorkflowInput) -> Step<Run> {
-        named::bash(&format!(
-            "cargo perf-compare --save=results.md {base} {head}"
-        ))
-    }
-
-    named::job(
-        Job::default()
-            .runs_on(runners::LINUX_DEFAULT)
-            .add_step(steps::checkout_repo())
-            .add_step(steps::setup_cargo_config(runners::Platform::Linux))
-            .map(steps::install_linux_dependencies)
-            .add_step(install_hyperfine())
-            .add_step(steps::git_checkout(base))
-            .add_step(cargo_perf_test(base, crate_name))
-            .add_step(steps::git_checkout(head))
-            .add_step(cargo_perf_test(head, crate_name))
-            .add_step(compare_runs(head, base))
-            .add_step(upload_artifact("results.md"))
-            .add_step(steps::cleanup_cargo_config(runners::Platform::Linux)),
-    )
-}
diff --git a/tooling/xtask/src/tasks/workflows/danger.rs b/tooling/xtask/src/tasks/workflows/danger.rs
deleted file mode 100644
index 8b3bf0ac3a..0000000000
--- a/tooling/xtask/src/tasks/workflows/danger.rs
+++ /dev/null
@@ -1,57 +0,0 @@
-use gh_workflow::*;
-
-use crate::tasks::workflows::steps::{CommonJobConditions, NamedJob, named};
-
-use super::{runners, steps};
-
-/// Generates the danger.yml workflow
-pub fn danger() -> Workflow {
-    let danger = danger_job();
-
-    named::workflow()
-        .on(
-            Event::default().pull_request(PullRequest::default().add_branch("main").types([
-                PullRequestType::Opened,
-                PullRequestType::Synchronize,
-                PullRequestType::Reopened,
-                PullRequestType::Edited,
-            ])),
-        )
-        .add_job(danger.name, danger.job)
-}
-
-fn danger_job() -> NamedJob {
-    pub fn install_deps() -> Step<Run> {
-        named::bash("pnpm install --dir script/danger")
-    }
-
-    pub fn run() -> Step<Run> {
-        named::bash("pnpm run --dir script/danger danger ci")
-            // This GitHub token is not used, but the value needs to be here to prevent
-            // Danger from throwing an error.
-            .add_env(("GITHUB_TOKEN", "not_a_real_token"))
-            // All requests are instead proxied through an instance of
-            // https://github.com/maxdeviant/danger-proxy that allows Danger to securely
-            // authenticate with GitHub while still being able to run on PRs from forks.
-            .add_env((
-                "DANGER_GITHUB_API_BASE_URL",
-                "https://danger-proxy.fly.dev/github",
-            ))
-    }
-
-    NamedJob {
-        name: "danger".to_string(),
-        job: Job::default()
-            .with_repository_owner_guard()
-            .runs_on(runners::LINUX_SMALL)
-            .add_step(steps::checkout_repo())
-            .add_step(steps::setup_pnpm())
-            .add_step(
-                steps::setup_node()
-                    .add_with(("cache", "pnpm"))
-                    .add_with(("cache-dependency-path", "script/danger/pnpm-lock.yaml")),
-            )
-            .add_step(install_deps())
-            .add_step(run()),
-    }
-}
diff --git a/tooling/xtask/src/tasks/workflows/extension_bump.rs b/tooling/xtask/src/tasks/workflows/extension_bump.rs
deleted file mode 100644
index 34fcf80990..0000000000
--- a/tooling/xtask/src/tasks/workflows/extension_bump.rs
+++ /dev/null
@@ -1,306 +0,0 @@
-use gh_workflow::*;
-use indoc::indoc;
-
-use crate::tasks::workflows::{
-    extension_release::extension_workflow_secrets,
-    extension_tests::{self},
-    runners,
-    steps::{
-        self, CommonJobConditions, DEFAULT_REPOSITORY_OWNER_GUARD, FluentBuilder, NamedJob, named,
-    },
-    vars::{
-        JobOutput, StepOutput, WorkflowInput, WorkflowSecret, one_workflow_per_non_main_branch,
-    },
-};
-
-const VERSION_CHECK: &str = r#"sed -n 's/version = \"\(.*\)\"/\1/p' < extension.toml"#;
-
-// This is used by various extensions repos in the zed-extensions org to bump extension versions.
-pub(crate) fn extension_bump() -> Workflow {
-    let bump_type = WorkflowInput::string("bump-type", Some("patch".to_owned()));
-    // TODO: Ideally, this would have a default of `false`, but this is currently not
-    // supported in gh-workflows
-    let force_bump = WorkflowInput::bool("force-bump", None);
-
-    let (app_id, app_secret) = extension_workflow_secrets();
-    let (check_bump_needed, needs_bump, current_version) = check_bump_needed();
-
-    let needs_bump = needs_bump.as_job_output(&check_bump_needed);
-    let current_version = current_version.as_job_output(&check_bump_needed);
-
-    let dependencies = [&check_bump_needed];
-    let bump_version = bump_extension_version(
-        &dependencies,
-        &current_version,
-        &bump_type,
-        &needs_bump,
-        &force_bump,
-        &app_id,
-        &app_secret,
-    );
-    let create_label = create_version_label(
-        &dependencies,
-        &needs_bump,
-        &current_version,
-        &app_id,
-        &app_secret,
-    );
-
-    named::workflow()
-        .add_event(
-            Event::default().workflow_call(
-                WorkflowCall::default()
-                    .add_input(bump_type.name, bump_type.call_input())
-                    .add_input(force_bump.name, force_bump.call_input())
-                    .secrets([
-                        (app_id.name.to_owned(), app_id.secret_configuration()),
-                        (
-                            app_secret.name.to_owned(),
-                            app_secret.secret_configuration(),
-                        ),
-                    ]),
-            ),
-        )
-        .concurrency(one_workflow_per_non_main_branch())
-        .add_env(("CARGO_TERM_COLOR", "always"))
-        .add_env(("RUST_BACKTRACE", 1))
-        .add_env(("CARGO_INCREMENTAL", 0))
-        .add_env((
-            "ZED_EXTENSION_CLI_SHA",
-            extension_tests::ZED_EXTENSION_CLI_SHA,
-        ))
-        .add_job(check_bump_needed.name, check_bump_needed.job)
-        .add_job(bump_version.name, bump_version.job)
-        .add_job(create_label.name, create_label.job)
-}
-
-fn check_bump_needed() -> (NamedJob, StepOutput, StepOutput) {
-    let (compare_versions, version_changed, current_version) = compare_versions();
-
-    let job = Job::default()
-        .with_repository_owner_guard()
-        .outputs([
-            (version_changed.name.to_owned(), version_changed.to_string()),
-            (
-                current_version.name.to_string(),
-                current_version.to_string(),
-            ),
-        ])
-        .runs_on(runners::LINUX_SMALL)
-        .timeout_minutes(1u32)
-        .add_step(steps::checkout_repo().add_with(("fetch-depth", 0)))
-        .add_step(compare_versions);
-
-    (named::job(job), version_changed, current_version)
-}
-
-fn create_version_label(
-    dependencies: &[&NamedJob],
-    needs_bump: &JobOutput,
-    current_version: &JobOutput,
-    app_id: &WorkflowSecret,
-    app_secret: &WorkflowSecret,
-) -> NamedJob {
-    let (generate_token, generated_token) = generate_token(app_id, app_secret, None);
-    let job = steps::dependant_job(dependencies)
-        .cond(Expression::new(format!(
-            "{DEFAULT_REPOSITORY_OWNER_GUARD} && github.event_name == 'push' && github.ref == 'refs/heads/main' && {} == 'false'",
-            needs_bump.expr(),
-        )))
-        .runs_on(runners::LINUX_LARGE)
-        .timeout_minutes(1u32)
-        .add_step(generate_token)
-        .add_step(steps::checkout_repo())
-        .add_step(create_version_tag(current_version, generated_token));
-
-    named::job(job)
-}
-
-fn create_version_tag(current_version: &JobOutput, generated_token: StepOutput) -> Step<Use> {
-    named::uses("actions", "github-script", "v7").with(
-        Input::default()
-            .add(
-                "script",
-                format!(
-                    indoc! {r#"
-                        github.rest.git.createRef({{
-                            owner: context.repo.owner,
-                            repo: context.repo.repo,
-                            ref: 'refs/tags/v{}',
-                            sha: context.sha
-                        }})"#
-                    },
-                    current_version
-                ),
-            )
-            .add("github-token", generated_token.to_string()),
-    )
-}
-
-/// Compares the current and previous commit and checks whether versions changed inbetween.
-fn compare_versions() -> (Step<Run>, StepOutput, StepOutput) {
-    let check_needs_bump = named::bash(format!(
-        indoc! {
-        r#"
-        CURRENT_VERSION="$({})"
-        PR_PARENT_SHA="${{{{ github.event.pull_request.head.sha }}}}"
-
-        if [[ -n "$PR_PARENT_SHA" ]]; then
-            git checkout "$PR_PARENT_SHA"
-        elif BRANCH_PARENT_SHA="$(git merge-base origin/main origin/zed-zippy-autobump)"; then
-            git checkout "$BRANCH_PARENT_SHA"
-        else
-            git checkout "$(git log -1 --format=%H)"~1
-        fi
-
-        PARENT_COMMIT_VERSION="$({})"
-
-        [[ "$CURRENT_VERSION" == "$PARENT_COMMIT_VERSION" ]] && \
-          echo "needs_bump=true" >> "$GITHUB_OUTPUT" || \
-          echo "needs_bump=false" >> "$GITHUB_OUTPUT"
-
-        echo "current_version=${{CURRENT_VERSION}}" >> "$GITHUB_OUTPUT"
-        "#
-        },
-        VERSION_CHECK, VERSION_CHECK
-    ))
-    .id("compare-versions-check");
-
-    let needs_bump = StepOutput::new(&check_needs_bump, "needs_bump");
-    let current_version = StepOutput::new(&check_needs_bump, "current_version");
-
-    (check_needs_bump, needs_bump, current_version)
-}
-
-fn bump_extension_version(
-    dependencies: &[&NamedJob],
-    current_version: &JobOutput,
-    bump_type: &WorkflowInput,
-    needs_bump: &JobOutput,
-    force_bump: &WorkflowInput,
-    app_id: &WorkflowSecret,
-    app_secret: &WorkflowSecret,
-) -> NamedJob {
-    let (generate_token, generated_token) = generate_token(app_id, app_secret, None);
-    let (bump_version, new_version) = bump_version(current_version, bump_type);
-
-    let job = steps::dependant_job(dependencies)
-        .cond(Expression::new(format!(
-            "{DEFAULT_REPOSITORY_OWNER_GUARD} &&\n({} == 'true' || {} == 'true')",
-            force_bump.expr(),
-            needs_bump.expr(),
-        )))
-        .runs_on(runners::LINUX_LARGE)
-        .timeout_minutes(1u32)
-        .add_step(generate_token)
-        .add_step(steps::checkout_repo())
-        .add_step(install_bump_2_version())
-        .add_step(bump_version)
-        .add_step(create_pull_request(new_version, generated_token));
-
-    named::job(job)
-}
-
-pub(crate) fn generate_token(
-    app_id: &WorkflowSecret,
-    app_secret: &WorkflowSecret,
-    repository_target: Option<RepositoryTarget>,
-) -> (Step<Use>, StepOutput) {
-    let step = named::uses("actions", "create-github-app-token", "v2")
-        .id("generate-token")
-        .add_with(
-            Input::default()
-                .add("app-id", app_id.to_string())
-                .add("private-key", app_secret.to_string())
-                .when_some(
-                    repository_target,
-                    |input,
-                     RepositoryTarget {
-                         owner,
-                         repositories,
-                     }| {
-                        input.add("owner", owner).add("repositories", repositories)
-                    },
-                ),
-        );
-
-    let generated_token = StepOutput::new(&step, "token");
-
-    (step, generated_token)
-}
-
-fn install_bump_2_version() -> Step<Run> {
-    named::run(runners::Platform::Linux, "pip install bump2version")
-}
-
-fn bump_version(current_version: &JobOutput, bump_type: &WorkflowInput) -> (Step<Run>, StepOutput) {
-    let step = named::bash(format!(
-        indoc! {r#"
-            OLD_VERSION="{}"
-
-            BUMP_FILES=("extension.toml")
-            if [[ -f "Cargo.toml" ]]; then
-                BUMP_FILES+=("Cargo.toml")
-            fi
-
-            bump2version --verbose --current-version "$OLD_VERSION" --no-configured-files {} "${{BUMP_FILES[@]}}"
-
-            if [[ -f "Cargo.toml" ]]; then
-                cargo update --workspace
-            fi
-
-            NEW_VERSION="$({})"
-
-            echo "new_version=${{NEW_VERSION}}" >> "$GITHUB_OUTPUT"
-            "#
-        },
-        current_version, bump_type, VERSION_CHECK
-    ))
-    .id("bump-version");
-
-    let new_version = StepOutput::new(&step, "new_version");
-    (step, new_version)
-}
-
-fn create_pull_request(new_version: StepOutput, generated_token: StepOutput) -> Step<Use> {
-    let formatted_version = format!("v{}", new_version);
-
-    named::uses("peter-evans", "create-pull-request", "v7").with(
-        Input::default()
-            .add("title", format!("Bump version to {}", new_version))
-            .add(
-                "body",
-                format!(
-                    "This PR bumps the version of this extension to {}",
-                    formatted_version
-                ),
-            )
-            .add(
-                "commit-message",
-                format!("Bump version to {}", formatted_version),
-            )
-            .add("branch", "zed-zippy-autobump")
-            .add(
-                "committer",
-                "zed-zippy[bot] <234243425+zed-zippy[bot]@users.noreply.github.com>",
-            )
-            .add("base", "main")
-            .add("delete-branch", true)
-            .add("token", generated_token.to_string())
-            .add("sign-commits", true),
-    )
-}
-
-pub(crate) struct RepositoryTarget {
-    owner: String,
-    repositories: String,
-}
-
-impl RepositoryTarget {
-    pub fn new<T: ToString>(owner: T, repositories: &[&str]) -> Self {
-        Self {
-            owner: owner.to_string(),
-            repositories: repositories.join("\n"),
-        }
-    }
-}
diff --git a/tooling/xtask/src/tasks/workflows/extension_release.rs b/tooling/xtask/src/tasks/workflows/extension_release.rs
deleted file mode 100644
index c55fed0cb8..0000000000
--- a/tooling/xtask/src/tasks/workflows/extension_release.rs
+++ /dev/null
@@ -1,72 +0,0 @@
-use gh_workflow::{Event, Job, Run, Step, Use, Workflow, WorkflowCall};
-use indoc::indoc;
-
-use crate::tasks::workflows::{
-    extension_bump::{RepositoryTarget, generate_token},
-    runners,
-    steps::{CommonJobConditions, NamedJob, checkout_repo, named},
-    vars::{StepOutput, WorkflowSecret},
-};
-
-pub(crate) fn extension_release() -> Workflow {
-    let (app_id, app_secret) = extension_workflow_secrets();
-
-    let create_release = create_release(&app_id, &app_secret);
-    named::workflow()
-        .on(
-            Event::default().workflow_call(WorkflowCall::default().secrets([
-                (app_id.name.to_owned(), app_id.secret_configuration()),
-                (
-                    app_secret.name.to_owned(),
-                    app_secret.secret_configuration(),
-                ),
-            ])),
-        )
-        .add_job(create_release.name, create_release.job)
-}
-
-fn create_release(app_id: &WorkflowSecret, app_secret: &WorkflowSecret) -> NamedJob {
-    let extension_registry = RepositoryTarget::new("zed-industries", &["extensions"]);
-    let (generate_token, generated_token) =
-        generate_token(&app_id, &app_secret, Some(extension_registry));
-    let (get_extension_id, extension_id) = get_extension_id();
-
-    let job = Job::default()
-        .with_repository_owner_guard()
-        .runs_on(runners::LINUX_LARGE)
-        .add_step(generate_token)
-        .add_step(checkout_repo())
-        .add_step(get_extension_id)
-        .add_step(release_action(extension_id, generated_token));
-
-    named::job(job)
-}
-
-fn get_extension_id() -> (Step<Run>, StepOutput) {
-    let step = named::bash(indoc! {
-    r#"
-        EXTENSION_ID="$(sed -n 's/id = \"\(.*\)\"/\1/p' < extension.toml)"
-
-        echo "extension_id=${EXTENSION_ID}" >> "$GITHUB_OUTPUT"
-    "#})
-    .id("get-extension-id");
-
-    let extension_id = StepOutput::new(&step, "extension_id");
-
-    (step, extension_id)
-}
-
-fn release_action(extension_id: StepOutput, generated_token: StepOutput) -> Step<Use> {
-    named::uses("huacnlee", "zed-extension-action", "v2")
-        .add_with(("extension-name", extension_id.to_string()))
-        .add_with(("push-to", "zed-industries/extensions"))
-        .add_env(("COMMITTER_TOKEN", generated_token.to_string()))
-}
-
-pub(crate) fn extension_workflow_secrets() -> (WorkflowSecret, WorkflowSecret) {
-    let app_id = WorkflowSecret::new("app-id", "The app ID used to create the PR");
-    let app_secret =
-        WorkflowSecret::new("app-secret", "The app secret for the corresponding app ID");
-
-    (app_id, app_secret)
-}
diff --git a/tooling/xtask/src/tasks/workflows/extension_tests.rs b/tooling/xtask/src/tasks/workflows/extension_tests.rs
deleted file mode 100644
index 4805591214..0000000000
--- a/tooling/xtask/src/tasks/workflows/extension_tests.rs
+++ /dev/null
@@ -1,114 +0,0 @@
-use gh_workflow::*;
-use indoc::indoc;
-
-use crate::tasks::workflows::{
-    run_tests::{orchestrate, tests_pass},
-    runners,
-    steps::{self, CommonJobConditions, FluentBuilder, NamedJob, named},
-    vars::{PathCondition, StepOutput, one_workflow_per_non_main_branch},
-};
-
-pub(crate) const ZED_EXTENSION_CLI_SHA: &str = "7cfce605704d41ca247e3f84804bf323f6c6caaf";
-
-// This is used by various extensions repos in the zed-extensions org to run automated tests.
-pub(crate) fn extension_tests() -> Workflow {
-    let should_check_rust = PathCondition::new("check_rust", r"^(Cargo.lock|Cargo.toml|.*\.rs)$");
-    let should_check_extension = PathCondition::new("check_extension", r"^.*\.scm$");
-
-    let orchestrate = orchestrate(&[&should_check_rust, &should_check_extension]);
-
-    let jobs = [
-        orchestrate,
-        should_check_rust.guard(check_rust()),
-        should_check_extension.guard(check_extension()),
-    ];
-
-    let tests_pass = tests_pass(&jobs);
-
-    named::workflow()
-        .add_event(Event::default().workflow_call(WorkflowCall::default()))
-        .concurrency(one_workflow_per_non_main_branch())
-        .add_env(("CARGO_TERM_COLOR", "always"))
-        .add_env(("RUST_BACKTRACE", 1))
-        .add_env(("CARGO_INCREMENTAL", 0))
-        .add_env(("ZED_EXTENSION_CLI_SHA", ZED_EXTENSION_CLI_SHA))
-        .map(|workflow| {
-            jobs.into_iter()
-                .chain([tests_pass])
-                .fold(workflow, |workflow, job| {
-                    workflow.add_job(job.name, job.job)
-                })
-        })
-}
-
-fn run_clippy() -> Step<Run> {
-    named::bash("cargo clippy --release --all-targets --all-features -- --deny warnings")
-}
-
-fn check_rust() -> NamedJob {
-    let job = Job::default()
-        .with_repository_owner_guard()
-        .runs_on(runners::LINUX_DEFAULT)
-        .timeout_minutes(3u32)
-        .add_step(steps::checkout_repo())
-        .add_step(steps::cache_rust_dependencies_namespace())
-        .add_step(steps::cargo_fmt())
-        .add_step(run_clippy())
-        .add_step(steps::cargo_install_nextest())
-        .add_step(
-            steps::cargo_nextest(runners::Platform::Linux).add_env(("NEXTEST_NO_TESTS", "warn")),
-        );
-
-    named::job(job)
-}
-
-pub(crate) fn check_extension() -> NamedJob {
-    let (cache_download, cache_hit) = cache_zed_extension_cli();
-    let job = Job::default()
-        .with_repository_owner_guard()
-        .runs_on(runners::LINUX_SMALL)
-        .timeout_minutes(2u32)
-        .add_step(steps::checkout_repo())
-        .add_step(cache_download)
-        .add_step(download_zed_extension_cli(cache_hit))
-        .add_step(check());
-
-    named::job(job)
-}
-
-pub fn cache_zed_extension_cli() -> (Step<Use>, StepOutput) {
-    let step = named::uses(
-        "actions",
-        "cache",
-        "0057852bfaa89a56745cba8c7296529d2fc39830",
-    )
-    .id("cache-zed-extension-cli")
-    .with(
-        Input::default()
-            .add("path", "zed-extension")
-            .add("key", "zed-extension-${{ env.ZED_EXTENSION_CLI_SHA }}"),
-    );
-    let output = StepOutput::new(&step, "cache-hit");
-    (step, output)
-}
-
-pub fn download_zed_extension_cli(cache_hit: StepOutput) -> Step<Run> {
-    named::bash(
-    indoc! {
-        r#"
-        wget --quiet "https://zed-extension-cli.nyc3.digitaloceanspaces.com/$ZED_EXTENSION_CLI_SHA/x86_64-unknown-linux-gnu/zed-extension"
-        chmod +x zed-extension
-        "#,
-    }
-    ).if_condition(Expression::new(format!("{} != 'true'", cache_hit.expr())))
-}
-
-pub fn check() -> Step<Run> {
-    named::bash(indoc! {
-        r#"
-        mkdir -p /tmp/ext-scratch
-        mkdir -p /tmp/ext-output
-        ./zed-extension --source-dir . --scratch-dir /tmp/ext-scratch --output-dir /tmp/ext-output
-        "#
-    })
-}
diff --git a/tooling/xtask/src/tasks/workflows/extensions/bump_version.rs b/tooling/xtask/src/tasks/workflows/extensions/bump_version.rs
deleted file mode 100644
index 1564fef448..0000000000
--- a/tooling/xtask/src/tasks/workflows/extensions/bump_version.rs
+++ /dev/null
@@ -1,103 +0,0 @@
-use gh_workflow::{
-    Event, Expression, Input, Job, PullRequest, PullRequestType, Push, Run, Step, UsesJob,
-    Workflow, WorkflowDispatch,
-};
-use indexmap::IndexMap;
-use indoc::indoc;
-
-use crate::tasks::workflows::{
-    runners,
-    steps::{NamedJob, named},
-    vars::{self, JobOutput, StepOutput, one_workflow_per_non_main_branch_and_token},
-};
-
-pub(crate) fn bump_version() -> Workflow {
-    let (determine_bump_type, bump_type) = determine_bump_type();
-    let bump_type = bump_type.as_job_output(&determine_bump_type);
-
-    let call_bump_version = call_bump_version(&determine_bump_type, bump_type);
-
-    named::workflow()
-        .on(Event::default()
-            .push(
-                Push::default()
-                    .add_branch("main")
-                    .add_ignored_path(".github/**"),
-            )
-            .pull_request(PullRequest::default().add_type(PullRequestType::Labeled))
-            .workflow_dispatch(WorkflowDispatch::default()))
-        .concurrency(one_workflow_per_non_main_branch_and_token("labels"))
-        .add_job(determine_bump_type.name, determine_bump_type.job)
-        .add_job(call_bump_version.name, call_bump_version.job)
-}
-
-pub(crate) fn call_bump_version(
-    depending_job: &NamedJob,
-    bump_type: JobOutput,
-) -> NamedJob<UsesJob> {
-    let job = Job::default()
-        .cond(Expression::new(format!(
-            "github.event.action != 'labeled' || {} != 'patch'",
-            bump_type.expr()
-        )))
-        .uses(
-            "zed-industries",
-            "zed",
-            ".github/workflows/extension_bump.yml",
-            "main",
-        )
-        .add_need(depending_job.name.clone())
-        .with(
-            Input::default()
-                .add("bump-type", bump_type.to_string())
-                .add("force-bump", true),
-        )
-        .secrets(IndexMap::from([
-            ("app-id".to_owned(), vars::ZED_ZIPPY_APP_ID.to_owned()),
-            (
-                "app-secret".to_owned(),
-                vars::ZED_ZIPPY_APP_PRIVATE_KEY.to_owned(),
-            ),
-        ]));
-
-    named::job(job)
-}
-
-fn determine_bump_type() -> (NamedJob, StepOutput) {
-    let (get_bump_type, output) = get_bump_type();
-    let job = Job::default()
-        .runs_on(runners::LINUX_DEFAULT)
-        .add_step(get_bump_type)
-        .outputs([(output.name.to_owned(), output.to_string())]);
-    (named::job(job), output)
-}
-
-fn get_bump_type() -> (Step<Run>, StepOutput) {
-    let step = named::bash(
-        indoc! {r#"
-            if [ "$HAS_MAJOR_LABEL" = "true" ]; then
-                bump_type="major"
-            elif [ "$HAS_MINOR_LABEL" = "true" ]; then
-                bump_type="minor"
-            else
-                bump_type="patch"
-            fi
-            echo "bump_type=$bump_type" >> $GITHUB_OUTPUT
-        "#},
-    )
-    .add_env(("HAS_MAJOR_LABEL",
-        indoc!{
-            "${{ (github.event.action == 'labeled' && github.event.label.name == 'major') ||
-            (github.event.action == 'synchronize' && contains(github.event.pull_request.labels.*.name, 'major')) }}"
-        }))
-    .add_env(("HAS_MINOR_LABEL",
-        indoc!{
-            "${{ (github.event.action == 'labeled' && github.event.label.name == 'minor') ||
-            (github.event.action == 'synchronize' && contains(github.event.pull_request.labels.*.name, 'minor')) }}"
-        }))
-    .id("get-bump-type");
-
-    let step_output = StepOutput::new(&step, "bump_type");
-
-    (step, step_output)
-}
diff --git a/tooling/xtask/src/tasks/workflows/extensions/mod.rs b/tooling/xtask/src/tasks/workflows/extensions/mod.rs
deleted file mode 100644
index d26100f09d..0000000000
--- a/tooling/xtask/src/tasks/workflows/extensions/mod.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-use gh_workflow::{Job, UsesJob};
-use indexmap::IndexMap;
-
-use crate::tasks::workflows::vars;
-
-pub(crate) mod bump_version;
-pub(crate) mod release_version;
-pub(crate) mod run_tests;
-
-pub(crate) trait WithAppSecrets: Sized {
-    fn with_app_secrets(self) -> Self;
-}
-
-impl WithAppSecrets for Job<UsesJob> {
-    fn with_app_secrets(self) -> Self {
-        self.secrets(IndexMap::from([
-            ("app-id".to_owned(), vars::ZED_ZIPPY_APP_ID.to_owned()),
-            (
-                "app-secret".to_owned(),
-                vars::ZED_ZIPPY_APP_PRIVATE_KEY.to_owned(),
-            ),
-        ]))
-    }
-}
diff --git a/tooling/xtask/src/tasks/workflows/extensions/release_version.rs b/tooling/xtask/src/tasks/workflows/extensions/release_version.rs
deleted file mode 100644
index ebeb6959a9..0000000000
--- a/tooling/xtask/src/tasks/workflows/extensions/release_version.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-use gh_workflow::{Event, Job, Push, UsesJob, Workflow};
-
-use crate::tasks::workflows::{
-    extensions::WithAppSecrets,
-    steps::{NamedJob, named},
-};
-
-pub(crate) fn release_version() -> Workflow {
-    let create_release = call_release_version();
-    named::workflow()
-        .on(Event::default().push(Push::default().add_tag("v**")))
-        .add_job(create_release.name, create_release.job)
-}
-
-pub(crate) fn call_release_version() -> NamedJob<UsesJob> {
-    let job = Job::default()
-        .uses(
-            "zed-industries",
-            "zed",
-            ".github/workflows/extension_release.yml",
-            "main",
-        )
-        .with_app_secrets();
-
-    named::job(job)
-}
diff --git a/tooling/xtask/src/tasks/workflows/extensions/run_tests.rs b/tooling/xtask/src/tasks/workflows/extensions/run_tests.rs
deleted file mode 100644
index 885a8fd09f..0000000000
--- a/tooling/xtask/src/tasks/workflows/extensions/run_tests.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-use gh_workflow::{Event, Job, PullRequest, Push, UsesJob, Workflow};
-
-use crate::tasks::workflows::{
-    steps::{NamedJob, named},
-    vars::one_workflow_per_non_main_branch_and_token,
-};
-
-pub(crate) fn run_tests() -> Workflow {
-    let call_extension_tests = call_extension_tests();
-    named::workflow()
-        .on(Event::default()
-            .pull_request(PullRequest::default().add_branch("**"))
-            .push(Push::default().add_branch("main")))
-        .concurrency(one_workflow_per_non_main_branch_and_token("pr"))
-        .add_job(call_extension_tests.name, call_extension_tests.job)
-}
-
-pub(crate) fn call_extension_tests() -> NamedJob<UsesJob> {
-    let job = Job::default().uses(
-        "zed-industries",
-        "zed",
-        ".github/workflows/extension_tests.yml",
-        "main",
-    );
-
-    named::job(job)
-}
diff --git a/tooling/xtask/src/tasks/workflows/nix_build.rs b/tooling/xtask/src/tasks/workflows/nix_build.rs
deleted file mode 100644
index ff98852d19..0000000000
--- a/tooling/xtask/src/tasks/workflows/nix_build.rs
+++ /dev/null
@@ -1,104 +0,0 @@
-use crate::tasks::workflows::{
-    runners::{Arch, Platform},
-    steps::{CommonJobConditions, NamedJob},
-};
-
-use super::{runners, steps, steps::named, vars};
-use gh_workflow::*;
-use indoc::indoc;
-
-pub(crate) fn build_nix(
-    platform: Platform,
-    arch: Arch,
-    flake_output: &str,
-    cachix_filter: Option<&str>,
-    deps: &[&NamedJob],
-) -> NamedJob {
-    // on our macs we manually install nix. for some reason the cachix action is running
-    // under a non-login /bin/bash shell which doesn't source the proper script to add the
-    // nix profile to PATH, so we manually add them here
-    pub fn set_path() -> Step<Run> {
-        named::bash(indoc! {r#"
-                echo "/nix/var/nix/profiles/default/bin" >> "$GITHUB_PATH"
-                echo "/Users/administrator/.nix-profile/bin" >> "$GITHUB_PATH"
-            "#})
-    }
-
-    pub fn install_nix() -> Step<Use> {
-        named::uses(
-            "cachix",
-            "install-nix-action",
-            "02a151ada4993995686f9ed4f1be7cfbb229e56f", // v31
-        )
-        .add_with(("github_access_token", vars::GITHUB_TOKEN))
-    }
-
-    pub fn cachix_action(cachix_filter: Option<&str>) -> Step<Use> {
-        let mut step = named::uses(
-            "cachix",
-            "cachix-action",
-            "0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad", // v16
-        )
-        .add_with(("name", "zed"))
-        .add_with(("authToken", vars::CACHIX_AUTH_TOKEN))
-        .add_with(("cachixArgs", "-v"));
-        if let Some(cachix_filter) = cachix_filter {
-            step = step.add_with(("pushFilter", cachix_filter));
-        }
-        step
-    }
-
-    pub fn build(flake_output: &str) -> Step<Run> {
-        named::bash(&format!(
-            "nix build .#{} -L --accept-flake-config",
-            flake_output
-        ))
-    }
-
-    pub fn limit_store() -> Step<Run> {
-        named::bash(indoc! {r#"
-                if [ "$(du -sm /nix/store | cut -f1)" -gt 50000 ]; then
-                    nix-collect-garbage -d || true
-                fi"#
-        })
-    }
-
-    let runner = match platform {
-        Platform::Windows => unimplemented!(),
-        Platform::Linux => runners::LINUX_X86_BUNDLER,
-        Platform::Mac => runners::MAC_DEFAULT,
-    };
-    let mut job = Job::default()
-        .timeout_minutes(60u32)
-        .continue_on_error(true)
-        .with_repository_owner_guard()
-        .runs_on(runner)
-        .add_env(("ZED_CLIENT_CHECKSUM_SEED", vars::ZED_CLIENT_CHECKSUM_SEED))
-        .add_env(("ZED_MINIDUMP_ENDPOINT", vars::ZED_SENTRY_MINIDUMP_ENDPOINT))
-        .add_env((
-            "ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON",
-            vars::ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON,
-        ))
-        .add_env(("GIT_LFS_SKIP_SMUDGE", "1")) // breaks the livekit rust sdk examples which we don't actually depend on
-        .add_step(steps::checkout_repo());
-
-    if deps.len() > 0 {
-        job = job.needs(deps.iter().map(|d| d.name.clone()).collect::<Vec<String>>());
-    }
-
-    job = if platform == Platform::Linux {
-        job.add_step(install_nix())
-            .add_step(cachix_action(cachix_filter))
-            .add_step(build(&flake_output))
-    } else {
-        job.add_step(set_path())
-            .add_step(cachix_action(cachix_filter))
-            .add_step(build(&flake_output))
-            .add_step(limit_store())
-    };
-
-    NamedJob {
-        name: format!("build_nix_{platform}_{arch}"),
-        job,
-    }
-}
diff --git a/tooling/xtask/src/tasks/workflows/release.rs b/tooling/xtask/src/tasks/workflows/release.rs
deleted file mode 100644
index e06a713401..0000000000
--- a/tooling/xtask/src/tasks/workflows/release.rs
+++ /dev/null
@@ -1,195 +0,0 @@
-use gh_workflow::{Event, Expression, Push, Run, Step, Use, Workflow};
-
-use crate::tasks::workflows::{
-    run_bundling::{bundle_linux, bundle_mac, bundle_windows},
-    run_tests,
-    runners::{self, Arch},
-    steps::{self, FluentBuilder, NamedJob, dependant_job, named, release_job},
-    vars::{self, assets},
-};
-
-pub(crate) fn release() -> Workflow {
-    let macos_tests = run_tests::run_platform_tests(runners::Platform::Mac);
-    let linux_tests = run_tests::run_platform_tests(runners::Platform::Linux);
-    let windows_tests = run_tests::run_platform_tests(runners::Platform::Windows);
-    let check_scripts = run_tests::check_scripts();
-
-    let create_draft_release = create_draft_release();
-
-    let bundle = ReleaseBundleJobs {
-        linux_aarch64: bundle_linux(Arch::AARCH64, None, &[&linux_tests, &check_scripts]),
-        linux_x86_64: bundle_linux(Arch::X86_64, None, &[&linux_tests, &check_scripts]),
-        mac_aarch64: bundle_mac(Arch::AARCH64, None, &[&macos_tests, &check_scripts]),
-        mac_x86_64: bundle_mac(Arch::X86_64, None, &[&macos_tests, &check_scripts]),
-        windows_aarch64: bundle_windows(Arch::AARCH64, None, &[&windows_tests, &check_scripts]),
-        windows_x86_64: bundle_windows(Arch::X86_64, None, &[&windows_tests, &check_scripts]),
-    };
-
-    let upload_release_assets = upload_release_assets(&[&create_draft_release], &bundle);
-
-    let auto_release_preview = auto_release_preview(&[&upload_release_assets]);
-    let notify_on_failure = notify_on_failure(&[&upload_release_assets, &auto_release_preview]);
-
-    named::workflow()
-        .on(Event::default().push(Push::default().tags(vec!["v*".to_string()])))
-        .concurrency(vars::one_workflow_per_non_main_branch())
-        .add_env(("CARGO_TERM_COLOR", "always"))
-        .add_env(("RUST_BACKTRACE", "1"))
-        .add_job(macos_tests.name, macos_tests.job)
-        .add_job(linux_tests.name, linux_tests.job)
-        .add_job(windows_tests.name, windows_tests.job)
-        .add_job(check_scripts.name, check_scripts.job)
-        .add_job(create_draft_release.name, create_draft_release.job)
-        .map(|mut workflow| {
-            for job in bundle.into_jobs() {
-                workflow = workflow.add_job(job.name, job.job);
-            }
-            workflow
-        })
-        .add_job(upload_release_assets.name, upload_release_assets.job)
-        .add_job(auto_release_preview.name, auto_release_preview.job)
-        .add_job(notify_on_failure.name, notify_on_failure.job)
-}
-
-pub(crate) struct ReleaseBundleJobs {
-    pub linux_aarch64: NamedJob,
-    pub linux_x86_64: NamedJob,
-    pub mac_aarch64: NamedJob,
-    pub mac_x86_64: NamedJob,
-    pub windows_aarch64: NamedJob,
-    pub windows_x86_64: NamedJob,
-}
-
-impl ReleaseBundleJobs {
-    pub fn jobs(&self) -> Vec<&NamedJob> {
-        vec![
-            &self.linux_aarch64,
-            &self.linux_x86_64,
-            &self.mac_aarch64,
-            &self.mac_x86_64,
-            &self.windows_aarch64,
-            &self.windows_x86_64,
-        ]
-    }
-
-    pub fn into_jobs(self) -> Vec<NamedJob> {
-        vec![
-            self.linux_aarch64,
-            self.linux_x86_64,
-            self.mac_aarch64,
-            self.mac_x86_64,
-            self.windows_aarch64,
-            self.windows_x86_64,
-        ]
-    }
-}
-
-pub(crate) fn create_sentry_release() -> Step<Use> {
-    named::uses(
-        "getsentry",
-        "action-release",
-        "526942b68292201ac6bbb99b9a0747d4abee354c", // v3
-    )
-    .add_env(("SENTRY_ORG", "zed-dev"))
-    .add_env(("SENTRY_PROJECT", "zed"))
-    .add_env(("SENTRY_AUTH_TOKEN", vars::SENTRY_AUTH_TOKEN))
-    .add_with(("environment", "production"))
-}
-
-fn auto_release_preview(deps: &[&NamedJob; 1]) -> NamedJob {
-    named::job(
-        dependant_job(deps)
-            .runs_on(runners::LINUX_SMALL)
-            .cond(Expression::new(indoc::indoc!(
-                r#"startsWith(github.ref, 'refs/tags/v') && endsWith(github.ref, '-pre') && !endsWith(github.ref, '.0-pre')"#
-            )))
-            .add_step(
-                steps::script(
-                    r#"gh release edit "$GITHUB_REF_NAME" --repo=zed-industries/zed --draft=false"#,
-                )
-                .add_env(("GITHUB_TOKEN", vars::GITHUB_TOKEN)),
-            )
-    )
-}
-
-pub(crate) fn download_workflow_artifacts() -> Step<Use> {
-    named::uses(
-        "actions",
-        "download-artifact",
-        "018cc2cf5baa6db3ef3c5f8a56943fffe632ef53", // v6.0.0
-    )
-    .add_with(("path", "./artifacts/"))
-}
-
-pub(crate) fn prep_release_artifacts() -> Step<Run> {
-    let mut script_lines = vec!["mkdir -p release-artifacts/\n".to_string()];
-    for asset in assets::all() {
-        let mv_command = format!("mv ./artifacts/{asset}/{asset} release-artifacts/{asset}");
-        script_lines.push(mv_command)
-    }
-
-    named::bash(&script_lines.join("\n"))
-}
-
-fn upload_release_assets(deps: &[&NamedJob], bundle: &ReleaseBundleJobs) -> NamedJob {
-    let mut deps = deps.to_vec();
-    deps.extend(bundle.jobs());
-
-    named::job(
-        dependant_job(&deps)
-            .runs_on(runners::LINUX_MEDIUM)
-            .add_step(download_workflow_artifacts())
-            .add_step(steps::script("ls -lR ./artifacts"))
-            .add_step(prep_release_artifacts())
-            .add_step(
-                steps::script("gh release upload \"$GITHUB_REF_NAME\" --repo=zed-industries/zed release-artifacts/*")
-                    .add_env(("GITHUB_TOKEN", vars::GITHUB_TOKEN)),
-            ),
-    )
-}
-
-fn create_draft_release() -> NamedJob {
-    fn generate_release_notes() -> Step<Run> {
-        named::bash(
-            r#"node --redirect-warnings=/dev/null ./script/draft-release-notes "$RELEASE_VERSION" "$RELEASE_CHANNEL" > target/release-notes.md"#,
-        )
-    }
-
-    fn create_release() -> Step<Run> {
-        named::bash("script/create-draft-release target/release-notes.md")
-            .add_env(("GITHUB_TOKEN", vars::GITHUB_TOKEN))
-    }
-
-    named::job(
-        release_job(&[])
-            .runs_on(runners::LINUX_SMALL)
-            // We need to fetch more than one commit so that `script/draft-release-notes`
-            // is able to diff between the current and previous tag.
-            //
-            // 25 was chosen arbitrarily.
-            .add_step(
-                steps::checkout_repo()
-                    .add_with(("fetch-depth", 25))
-                    .add_with(("clean", false))
-                    .add_with(("ref", "${{ github.ref }}")),
-            )
-            .add_step(steps::script("script/determine-release-channel"))
-            .add_step(steps::script("mkdir -p target/"))
-            .add_step(generate_release_notes())
-            .add_step(create_release()),
-    )
-}
-
-pub(crate) fn notify_on_failure(deps: &[&NamedJob]) -> NamedJob {
-    fn notify_slack() -> Step<Run> {
-        named::bash(
-            "curl -X POST -H 'Content-type: application/json'\\\n --data '{\"text\":\"${{ github.workflow }} failed:  ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}\"}' \"$SLACK_WEBHOOK\""
-        ).add_env(("SLACK_WEBHOOK", vars::SLACK_WEBHOOK_WORKFLOW_FAILURES))
-    }
-
-    let job = dependant_job(deps)
-        .runs_on(runners::LINUX_SMALL)
-        .cond(Expression::new("failure()"))
-        .add_step(notify_slack());
-    named::job(job)
-}
diff --git a/tooling/xtask/src/tasks/workflows/release_nightly.rs b/tooling/xtask/src/tasks/workflows/release_nightly.rs
deleted file mode 100644
index 73cdbe3f3e..0000000000
--- a/tooling/xtask/src/tasks/workflows/release_nightly.rs
+++ /dev/null
@@ -1,131 +0,0 @@
-use crate::tasks::workflows::{
-    nix_build::build_nix,
-    release::{
-        ReleaseBundleJobs, create_sentry_release, download_workflow_artifacts, notify_on_failure,
-        prep_release_artifacts,
-    },
-    run_bundling::{bundle_linux, bundle_mac, bundle_windows},
-    run_tests::run_platform_tests,
-    runners::{Arch, Platform, ReleaseChannel},
-    steps::{CommonJobConditions, FluentBuilder, NamedJob},
-};
-
-use super::{runners, steps, steps::named, vars};
-use gh_workflow::*;
-
-/// Generates the release_nightly.yml workflow
-pub fn release_nightly() -> Workflow {
-    let style = check_style();
-    // run only on windows as that's our fastest platform right now.
-    let tests = run_platform_tests(Platform::Windows);
-    let nightly = Some(ReleaseChannel::Nightly);
-
-    let bundle = ReleaseBundleJobs {
-        linux_aarch64: bundle_linux(Arch::AARCH64, nightly, &[&style, &tests]),
-        linux_x86_64: bundle_linux(Arch::X86_64, nightly, &[&style, &tests]),
-        mac_aarch64: bundle_mac(Arch::AARCH64, nightly, &[&style, &tests]),
-        mac_x86_64: bundle_mac(Arch::X86_64, nightly, &[&style, &tests]),
-        windows_aarch64: bundle_windows(Arch::AARCH64, nightly, &[&style, &tests]),
-        windows_x86_64: bundle_windows(Arch::X86_64, nightly, &[&style, &tests]),
-    };
-
-    let nix_linux_x86 = build_nix(
-        Platform::Linux,
-        Arch::X86_64,
-        "default",
-        None,
-        &[&style, &tests],
-    );
-    let nix_mac_arm = build_nix(
-        Platform::Mac,
-        Arch::AARCH64,
-        "default",
-        None,
-        &[&style, &tests],
-    );
-    let update_nightly_tag = update_nightly_tag_job(&bundle);
-    let notify_on_failure = notify_on_failure(&bundle.jobs());
-
-    named::workflow()
-        .on(Event::default()
-            // Fire every day at 7:00am UTC (Roughly before EU workday and after US workday)
-            .schedule([Schedule::new("0 7 * * *")])
-            .push(Push::default().add_tag("nightly")))
-        .add_env(("CARGO_TERM_COLOR", "always"))
-        .add_env(("RUST_BACKTRACE", "1"))
-        .add_job(style.name, style.job)
-        .add_job(tests.name, tests.job)
-        .map(|mut workflow| {
-            for job in bundle.into_jobs() {
-                workflow = workflow.add_job(job.name, job.job);
-            }
-            workflow
-        })
-        .add_job(nix_linux_x86.name, nix_linux_x86.job)
-        .add_job(nix_mac_arm.name, nix_mac_arm.job)
-        .add_job(update_nightly_tag.name, update_nightly_tag.job)
-        .add_job(notify_on_failure.name, notify_on_failure.job)
-}
-
-fn check_style() -> NamedJob {
-    let job = release_job(&[])
-        .runs_on(runners::MAC_DEFAULT)
-        .add_step(
-            steps::checkout_repo()
-                .add_with(("clean", false))
-                .add_with(("fetch-depth", 0)),
-        )
-        .add_step(steps::cargo_fmt())
-        .add_step(steps::script("./script/clippy"));
-
-    named::job(job)
-}
-
-fn release_job(deps: &[&NamedJob]) -> Job {
-    let job = Job::default()
-        .with_repository_owner_guard()
-        .timeout_minutes(60u32);
-    if deps.len() > 0 {
-        job.needs(deps.iter().map(|j| j.name.clone()).collect::<Vec<_>>())
-    } else {
-        job
-    }
-}
-
-fn update_nightly_tag_job(bundle: &ReleaseBundleJobs) -> NamedJob {
-    fn update_nightly_tag() -> Step<Run> {
-        named::bash(indoc::indoc! {r#"
-            if [ "$(git rev-parse nightly)" = "$(git rev-parse HEAD)" ]; then
-              echo "Nightly tag already points to current commit. Skipping tagging."
-              exit 0
-            fi
-            git config user.name github-actions
-            git config user.email github-actions@github.com
-            git tag -f nightly
-            git push origin nightly --force
-        "#})
-    }
-
-    NamedJob {
-        name: "update_nightly_tag".to_owned(),
-        job: steps::release_job(&bundle.jobs())
-            .runs_on(runners::LINUX_MEDIUM)
-            .add_step(steps::checkout_repo().add_with(("fetch-depth", 0)))
-            .add_step(download_workflow_artifacts())
-            .add_step(steps::script("ls -lR ./artifacts"))
-            .add_step(prep_release_artifacts())
-            .add_step(
-                steps::script("./script/upload-nightly")
-                    .add_env((
-                        "DIGITALOCEAN_SPACES_ACCESS_KEY",
-                        vars::DIGITALOCEAN_SPACES_ACCESS_KEY,
-                    ))
-                    .add_env((
-                        "DIGITALOCEAN_SPACES_SECRET_KEY",
-                        vars::DIGITALOCEAN_SPACES_SECRET_KEY,
-                    )),
-            )
-            .add_step(update_nightly_tag())
-            .add_step(create_sentry_release()),
-    }
-}
diff --git a/tooling/xtask/src/tasks/workflows/run_agent_evals.rs b/tooling/xtask/src/tasks/workflows/run_agent_evals.rs
deleted file mode 100644
index 667ea6a90b..0000000000
--- a/tooling/xtask/src/tasks/workflows/run_agent_evals.rs
+++ /dev/null
@@ -1,165 +0,0 @@
-use gh_workflow::{
-    Event, Expression, Job, Run, Schedule, Step, Strategy, Use, Workflow, WorkflowDispatch,
-};
-use serde_json::json;
-
-use crate::tasks::workflows::{
-    runners::{self, Platform},
-    steps::{self, FluentBuilder as _, NamedJob, named, setup_cargo_config},
-    vars::{self, WorkflowInput},
-};
-
-pub(crate) fn run_agent_evals() -> Workflow {
-    let agent_evals = agent_evals();
-    let model_name = WorkflowInput::string("model_name", None);
-
-    named::workflow()
-        .on(Event::default().workflow_dispatch(
-            WorkflowDispatch::default().add_input(model_name.name, model_name.input()),
-        ))
-        .concurrency(vars::one_workflow_per_non_main_branch())
-        .add_env(("CARGO_TERM_COLOR", "always"))
-        .add_env(("CARGO_INCREMENTAL", 0))
-        .add_env(("RUST_BACKTRACE", 1))
-        .add_env(("ANTHROPIC_API_KEY", vars::ANTHROPIC_API_KEY))
-        .add_env(("OPENAI_API_KEY", vars::OPENAI_API_KEY))
-        .add_env(("GOOGLE_AI_API_KEY", vars::GOOGLE_AI_API_KEY))
-        .add_env(("GOOGLE_CLOUD_PROJECT", vars::GOOGLE_CLOUD_PROJECT))
-        .add_env(("ZED_CLIENT_CHECKSUM_SEED", vars::ZED_CLIENT_CHECKSUM_SEED))
-        .add_env(("ZED_EVAL_TELEMETRY", 1))
-        .add_env(("MODEL_NAME", model_name.to_string()))
-        .add_job(agent_evals.name, agent_evals.job)
-}
-
-pub(crate) fn run_unit_evals() -> Workflow {
-    let model_name = WorkflowInput::string("model_name", None);
-    let commit_sha = WorkflowInput::string("commit_sha", None);
-
-    let unit_evals = named::job(unit_evals(Some(&commit_sha)));
-
-    named::workflow()
-        .name("run_unit_evals")
-        .on(Event::default().workflow_dispatch(
-            WorkflowDispatch::default()
-                .add_input(model_name.name, model_name.input())
-                .add_input(commit_sha.name, commit_sha.input()),
-        ))
-        .concurrency(vars::allow_concurrent_runs())
-        .add_env(("CARGO_TERM_COLOR", "always"))
-        .add_env(("CARGO_INCREMENTAL", 0))
-        .add_env(("RUST_BACKTRACE", 1))
-        .add_env(("ZED_CLIENT_CHECKSUM_SEED", vars::ZED_CLIENT_CHECKSUM_SEED))
-        .add_env(("ZED_EVAL_TELEMETRY", 1))
-        .add_env(("MODEL_NAME", model_name.to_string()))
-        .add_job(unit_evals.name, unit_evals.job)
-}
-
-fn add_api_keys(step: Step<Run>) -> Step<Run> {
-    step.add_env(("ANTHROPIC_API_KEY", vars::ANTHROPIC_API_KEY))
-        .add_env(("OPENAI_API_KEY", vars::OPENAI_API_KEY))
-        .add_env(("GOOGLE_AI_API_KEY", vars::GOOGLE_AI_API_KEY))
-        .add_env(("GOOGLE_CLOUD_PROJECT", vars::GOOGLE_CLOUD_PROJECT))
-}
-
-fn agent_evals() -> NamedJob {
-    fn run_eval() -> Step<Run> {
-        named::bash(
-            "cargo run --package=eval -- --repetitions=8 --concurrency=1 --model \"${MODEL_NAME}\"",
-        )
-    }
-
-    named::job(
-        Job::default()
-            .runs_on(runners::LINUX_DEFAULT)
-            .timeout_minutes(60_u32 * 10)
-            .add_step(steps::checkout_repo())
-            .add_step(steps::cache_rust_dependencies_namespace())
-            .map(steps::install_linux_dependencies)
-            .add_step(setup_cargo_config(Platform::Linux))
-            .add_step(steps::script("cargo build --package=eval"))
-            .add_step(add_api_keys(run_eval()))
-            .add_step(steps::cleanup_cargo_config(Platform::Linux)),
-    )
-}
-
-pub(crate) fn run_cron_unit_evals() -> Workflow {
-    let unit_evals = cron_unit_evals();
-
-    named::workflow()
-        .name("run_cron_unit_evals")
-        .on(Event::default()
-            .schedule([
-                // GitHub might drop jobs at busy times, so we choose a random time in the middle of the night.
-                Schedule::default().cron("47 1 * * 2"),
-            ])
-            .workflow_dispatch(WorkflowDispatch::default()))
-        .concurrency(vars::one_workflow_per_non_main_branch())
-        .add_env(("CARGO_TERM_COLOR", "always"))
-        .add_env(("CARGO_INCREMENTAL", 0))
-        .add_env(("RUST_BACKTRACE", 1))
-        .add_env(("ZED_CLIENT_CHECKSUM_SEED", vars::ZED_CLIENT_CHECKSUM_SEED))
-        .add_job(unit_evals.name, unit_evals.job)
-}
-
-fn cron_unit_evals() -> NamedJob {
-    fn send_failure_to_slack() -> Step<Use> {
-        named::uses(
-            "slackapi",
-            "slack-github-action",
-            "b0fa283ad8fea605de13dc3f449259339835fc52",
-        )
-        .if_condition(Expression::new("${{ failure() }}"))
-        .add_with(("method", "chat.postMessage"))
-        .add_with(("token", vars::SLACK_APP_ZED_UNIT_EVALS_BOT_TOKEN))
-        .add_with(("payload", indoc::indoc!{r#"
-            channel: C04UDRNNJFQ
-            text: "Unit Evals Failed: https://github.com/zed-industries/zed/actions/runs/${{ github.run_id }}"
-        "#}))
-    }
-
-    named::job(cron_unit_evals_job().add_step(send_failure_to_slack()))
-}
-
-const UNIT_EVAL_MODELS: &[&str] = &[
-    "anthropic/claude-sonnet-4-5-latest",
-    "anthropic/claude-opus-4-5-latest",
-    "google/gemini-3-pro",
-    "openai/gpt-5",
-];
-
-fn cron_unit_evals_job() -> Job {
-    let script_step = add_api_keys(steps::script("./script/run-unit-evals"))
-        .add_env(("ZED_AGENT_MODEL", "${{ matrix.model }}"));
-
-    Job::default()
-        .runs_on(runners::LINUX_DEFAULT)
-        .strategy(Strategy::default().fail_fast(false).matrix(json!({
-            "model": UNIT_EVAL_MODELS
-        })))
-        .add_step(steps::checkout_repo())
-        .add_step(steps::setup_cargo_config(Platform::Linux))
-        .add_step(steps::cache_rust_dependencies_namespace())
-        .map(steps::install_linux_dependencies)
-        .add_step(steps::cargo_install_nextest())
-        .add_step(steps::clear_target_dir_if_large(Platform::Linux))
-        .add_step(script_step)
-        .add_step(steps::cleanup_cargo_config(Platform::Linux))
-}
-
-fn unit_evals(commit: Option<&WorkflowInput>) -> Job {
-    let script_step = add_api_keys(steps::script("./script/run-unit-evals"));
-
-    Job::default()
-        .runs_on(runners::LINUX_DEFAULT)
-        .add_step(steps::checkout_repo())
-        .add_step(steps::setup_cargo_config(Platform::Linux))
-        .add_step(steps::cache_rust_dependencies_namespace())
-        .map(steps::install_linux_dependencies)
-        .add_step(steps::cargo_install_nextest())
-        .add_step(steps::clear_target_dir_if_large(Platform::Linux))
-        .add_step(match commit {
-            Some(commit) => script_step.add_env(("UNIT_EVAL_COMMIT", commit)),
-            None => script_step,
-        })
-        .add_step(steps::cleanup_cargo_config(Platform::Linux))
-}
diff --git a/tooling/xtask/src/tasks/workflows/run_bundling.rs b/tooling/xtask/src/tasks/workflows/run_bundling.rs
deleted file mode 100644
index a0793ffb68..0000000000
--- a/tooling/xtask/src/tasks/workflows/run_bundling.rs
+++ /dev/null
@@ -1,195 +0,0 @@
-use std::path::Path;
-
-use crate::tasks::workflows::{
-    release::ReleaseBundleJobs,
-    runners::{Arch, Platform, ReleaseChannel},
-    steps::{FluentBuilder, NamedJob, dependant_job, named},
-    vars::{assets, bundle_envs},
-};
-
-use super::{runners, steps};
-use gh_workflow::*;
-use indoc::indoc;
-
-pub fn run_bundling() -> Workflow {
-    let bundle = ReleaseBundleJobs {
-        linux_aarch64: bundle_linux(Arch::AARCH64, None, &[]),
-        linux_x86_64: bundle_linux(Arch::X86_64, None, &[]),
-        mac_aarch64: bundle_mac(Arch::AARCH64, None, &[]),
-        mac_x86_64: bundle_mac(Arch::X86_64, None, &[]),
-        windows_aarch64: bundle_windows(Arch::AARCH64, None, &[]),
-        windows_x86_64: bundle_windows(Arch::X86_64, None, &[]),
-    };
-    named::workflow()
-        .on(Event::default().pull_request(
-            PullRequest::default().types([PullRequestType::Labeled, PullRequestType::Synchronize]),
-        ))
-        .concurrency(
-            Concurrency::new(Expression::new(
-                "${{ github.workflow }}-${{ github.head_ref || github.ref }}",
-            ))
-            .cancel_in_progress(true),
-        )
-        .add_env(("CARGO_TERM_COLOR", "always"))
-        .add_env(("RUST_BACKTRACE", "1"))
-        .map(|mut workflow| {
-            for job in bundle.into_jobs() {
-                workflow = workflow.add_job(job.name, job.job);
-            }
-            workflow
-        })
-}
-
-fn bundle_job(deps: &[&NamedJob]) -> Job {
-    dependant_job(deps)
-        .when(deps.len() == 0, |job|
-            job.cond(Expression::new(
-                indoc! {
-                    r#"(github.event.action == 'labeled' && github.event.label.name == 'run-bundling') ||
-                    (github.event.action == 'synchronize' && contains(github.event.pull_request.labels.*.name, 'run-bundling'))"#,
-                })))
-        .timeout_minutes(60u32)
-}
-
-pub(crate) fn bundle_mac(
-    arch: Arch,
-    release_channel: Option<ReleaseChannel>,
-    deps: &[&NamedJob],
-) -> NamedJob {
-    pub fn bundle_mac(arch: Arch) -> Step<Run> {
-        named::bash(&format!("./script/bundle-mac {arch}-apple-darwin"))
-    }
-    let platform = Platform::Mac;
-    let artifact_name = match arch {
-        Arch::X86_64 => assets::MAC_X86_64,
-        Arch::AARCH64 => assets::MAC_AARCH64,
-    };
-    let remote_server_artifact_name = match arch {
-        Arch::X86_64 => assets::REMOTE_SERVER_MAC_X86_64,
-        Arch::AARCH64 => assets::REMOTE_SERVER_MAC_AARCH64,
-    };
-    NamedJob {
-        name: format!("bundle_mac_{arch}"),
-        job: bundle_job(deps)
-            .runs_on(runners::MAC_DEFAULT)
-            .envs(bundle_envs(platform))
-            .add_step(steps::checkout_repo())
-            .when_some(release_channel, |job, release_channel| {
-                job.add_step(set_release_channel(platform, release_channel))
-            })
-            .add_step(steps::setup_node())
-            .add_step(steps::setup_sentry())
-            .add_step(steps::clear_target_dir_if_large(runners::Platform::Mac))
-            .add_step(bundle_mac(arch))
-            .add_step(upload_artifact(&format!(
-                "target/{arch}-apple-darwin/release/{artifact_name}"
-            )))
-            .add_step(upload_artifact(&format!(
-                "target/{remote_server_artifact_name}"
-            ))),
-    }
-}
-
-pub fn upload_artifact(path: &str) -> Step<Use> {
-    let name = Path::new(path).file_name().unwrap().to_str().unwrap();
-    Step::new(format!("@actions/upload-artifact {}", name))
-        .uses(
-            "actions",
-            "upload-artifact",
-            "330a01c490aca151604b8cf639adc76d48f6c5d4", // v5
-        )
-        // N.B. "name" is the name for the asset. The uploaded
-        // file retains its filename.
-        .add_with(("name", name))
-        .add_with(("path", path))
-        .add_with(("if-no-files-found", "error"))
-}
-
-pub(crate) fn bundle_linux(
-    arch: Arch,
-    release_channel: Option<ReleaseChannel>,
-    deps: &[&NamedJob],
-) -> NamedJob {
-    let platform = Platform::Linux;
-    let artifact_name = match arch {
-        Arch::X86_64 => assets::LINUX_X86_64,
-        Arch::AARCH64 => assets::LINUX_AARCH64,
-    };
-    let remote_server_artifact_name = match arch {
-        Arch::X86_64 => assets::REMOTE_SERVER_LINUX_X86_64,
-        Arch::AARCH64 => assets::REMOTE_SERVER_LINUX_AARCH64,
-    };
-    NamedJob {
-        name: format!("bundle_linux_{arch}"),
-        job: bundle_job(deps)
-            .runs_on(arch.linux_bundler())
-            .envs(bundle_envs(platform))
-            .add_step(steps::checkout_repo())
-            .when_some(release_channel, |job, release_channel| {
-                job.add_step(set_release_channel(platform, release_channel))
-            })
-            .add_step(steps::setup_sentry())
-            .map(steps::install_linux_dependencies)
-            .add_step(steps::script("./script/bundle-linux"))
-            .add_step(upload_artifact(&format!("target/release/{artifact_name}")))
-            .add_step(upload_artifact(&format!(
-                "target/{remote_server_artifact_name}"
-            ))),
-    }
-}
-
-pub(crate) fn bundle_windows(
-    arch: Arch,
-    release_channel: Option<ReleaseChannel>,
-    deps: &[&NamedJob],
-) -> NamedJob {
-    let platform = Platform::Windows;
-    pub fn bundle_windows(arch: Arch) -> Step<Run> {
-        let step = match arch {
-            Arch::X86_64 => named::pwsh("script/bundle-windows.ps1 -Architecture x86_64"),
-            Arch::AARCH64 => named::pwsh("script/bundle-windows.ps1 -Architecture aarch64"),
-        };
-        step.working_directory("${{ env.ZED_WORKSPACE }}")
-    }
-    let artifact_name = match arch {
-        Arch::X86_64 => assets::WINDOWS_X86_64,
-        Arch::AARCH64 => assets::WINDOWS_AARCH64,
-    };
-    NamedJob {
-        name: format!("bundle_windows_{arch}"),
-        job: bundle_job(deps)
-            .runs_on(runners::WINDOWS_DEFAULT)
-            .envs(bundle_envs(platform))
-            .add_step(steps::checkout_repo())
-            .when_some(release_channel, |job, release_channel| {
-                job.add_step(set_release_channel(platform, release_channel))
-            })
-            .add_step(steps::setup_sentry())
-            .add_step(bundle_windows(arch))
-            .add_step(upload_artifact(&format!("target/{artifact_name}"))),
-    }
-}
-
-fn set_release_channel(platform: Platform, release_channel: ReleaseChannel) -> Step<Run> {
-    match release_channel {
-        ReleaseChannel::Nightly => set_release_channel_to_nightly(platform),
-    }
-}
-
-fn set_release_channel_to_nightly(platform: Platform) -> Step<Run> {
-    match platform {
-        Platform::Linux | Platform::Mac => named::bash(indoc::indoc! {r#"
-            set -eu
-            version=$(git rev-parse --short HEAD)
-            echo "Publishing version: ${version} on release channel nightly"
-            echo "nightly" > crates/zed/RELEASE_CHANNEL
-        "#}),
-        Platform::Windows => named::pwsh(indoc::indoc! {r#"
-            $ErrorActionPreference = "Stop"
-            $version = git rev-parse --short HEAD
-            Write-Host "Publishing version: $version on release channel nightly"
-            "nightly" | Set-Content -Path "crates/zed/RELEASE_CHANNEL"
-        "#})
-        .working_directory("${{ env.ZED_WORKSPACE }}"),
-    }
-}
diff --git a/tooling/xtask/src/tasks/workflows/run_tests.rs b/tooling/xtask/src/tasks/workflows/run_tests.rs
deleted file mode 100644
index 0bb3e152fb..0000000000
--- a/tooling/xtask/src/tasks/workflows/run_tests.rs
+++ /dev/null
@@ -1,496 +0,0 @@
-use gh_workflow::{
-    Concurrency, Event, Expression, Job, PullRequest, Push, Run, Step, Use, Workflow,
-};
-use indexmap::IndexMap;
-
-use crate::tasks::workflows::{
-    nix_build::build_nix,
-    runners::Arch,
-    steps::{BASH_SHELL, CommonJobConditions, repository_owner_guard_expression},
-    vars::{self, PathCondition},
-};
-
-use super::{
-    runners::{self, Platform},
-    steps::{self, FluentBuilder, NamedJob, named, release_job},
-};
-
-pub(crate) fn run_tests() -> Workflow {
-    // Specify anything which should potentially skip full test suite in this regex:
-    // - docs/
-    // - script/update_top_ranking_issues/
-    // - .github/ISSUE_TEMPLATE/
-    // - .github/workflows/  (except .github/workflows/ci.yml)
-    let should_run_tests = PathCondition::inverted(
-        "run_tests",
-        r"^(docs/|script/update_top_ranking_issues/|\.github/(ISSUE_TEMPLATE|workflows/(?!run_tests)))",
-    );
-    let should_check_docs = PathCondition::new("run_docs", r"^(docs/|crates/.*\.rs)");
-    let should_check_scripts = PathCondition::new(
-        "run_action_checks",
-        r"^\.github/(workflows/|actions/|actionlint.yml)|tooling/xtask|script/",
-    );
-    let should_check_licences =
-        PathCondition::new("run_licenses", r"^(Cargo.lock|script/.*licenses)");
-    let should_build_nix = PathCondition::new(
-        "run_nix",
-        r"^(nix/|flake\.|Cargo\.|rust-toolchain.toml|\.cargo/config.toml)",
-    );
-
-    let orchestrate = orchestrate(&[
-        &should_check_scripts,
-        &should_check_docs,
-        &should_check_licences,
-        &should_build_nix,
-        &should_run_tests,
-    ]);
-
-    let mut jobs = vec![
-        orchestrate,
-        check_style(),
-        should_run_tests.guard(run_platform_tests(Platform::Windows)),
-        should_run_tests.guard(run_platform_tests(Platform::Linux)),
-        should_run_tests.guard(run_platform_tests(Platform::Mac)),
-        should_run_tests.guard(doctests()),
-        should_run_tests.guard(check_workspace_binaries()),
-        should_run_tests.guard(check_dependencies()), // could be more specific here?
-        should_check_docs.guard(check_docs()),
-        should_check_licences.guard(check_licenses()),
-        should_check_scripts.guard(check_scripts()),
-        should_build_nix.guard(build_nix(
-            Platform::Linux,
-            Arch::X86_64,
-            "debug",
-            // *don't* cache the built output
-            Some("-zed-editor-[0-9.]*-nightly"),
-            &[],
-        )),
-        should_build_nix.guard(build_nix(
-            Platform::Mac,
-            Arch::AARCH64,
-            "debug",
-            // *don't* cache the built output
-            Some("-zed-editor-[0-9.]*-nightly"),
-            &[],
-        )),
-    ];
-    let tests_pass = tests_pass(&jobs);
-
-    jobs.push(should_run_tests.guard(check_postgres_and_protobuf_migrations())); // could be more specific here?
-
-    named::workflow()
-        .add_event(
-            Event::default()
-                .push(
-                    Push::default()
-                        .add_branch("main")
-                        .add_branch("v[0-9]+.[0-9]+.x"),
-                )
-                .pull_request(PullRequest::default().add_branch("**")),
-        )
-        .concurrency(
-            Concurrency::default()
-                .group(concat!(
-                    "${{ github.workflow }}-${{ github.ref_name }}-",
-                    "${{ github.ref_name == 'main' && github.sha || 'anysha' }}"
-                ))
-                .cancel_in_progress(true),
-        )
-        .add_env(("CARGO_TERM_COLOR", "always"))
-        .add_env(("RUST_BACKTRACE", 1))
-        .add_env(("CARGO_INCREMENTAL", 0))
-        .map(|mut workflow| {
-            for job in jobs {
-                workflow = workflow.add_job(job.name, job.job)
-            }
-            workflow
-        })
-        .add_job(tests_pass.name, tests_pass.job)
-}
-
-// Generates a bash script that checks changed files against regex patterns
-// and sets GitHub output variables accordingly
-pub fn orchestrate(rules: &[&PathCondition]) -> NamedJob {
-    let name = "orchestrate".to_owned();
-    let step_name = "filter".to_owned();
-    let mut script = String::new();
-
-    script.push_str(indoc::indoc! {r#"
-        if [ -z "$GITHUB_BASE_REF" ]; then
-          echo "Not in a PR context (i.e., push to main/stable/preview)"
-          COMPARE_REV="$(git rev-parse HEAD~1)"
-        else
-          echo "In a PR context comparing to pull_request.base.ref"
-          git fetch origin "$GITHUB_BASE_REF" --depth=350
-          COMPARE_REV="$(git merge-base "origin/${GITHUB_BASE_REF}" HEAD)"
-        fi
-        CHANGED_FILES="$(git diff --name-only "$COMPARE_REV" ${{ github.sha }})"
-
-        check_pattern() {
-          local output_name="$1"
-          local pattern="$2"
-          local grep_arg="$3"
-
-          echo "$CHANGED_FILES" | grep "$grep_arg" "$pattern" && \
-            echo "${output_name}=true" >> "$GITHUB_OUTPUT" || \
-            echo "${output_name}=false" >> "$GITHUB_OUTPUT"
-        }
-
-    "#});
-
-    let mut outputs = IndexMap::new();
-
-    for rule in rules {
-        assert!(
-            rule.set_by_step
-                .borrow_mut()
-                .replace(name.clone())
-                .is_none()
-        );
-        assert!(
-            outputs
-                .insert(
-                    rule.name.to_owned(),
-                    format!("${{{{ steps.{}.outputs.{} }}}}", step_name, rule.name)
-                )
-                .is_none()
-        );
-
-        let grep_arg = if rule.invert { "-qvP" } else { "-qP" };
-        script.push_str(&format!(
-            "check_pattern \"{}\" '{}' {}\n",
-            rule.name, rule.pattern, grep_arg
-        ));
-    }
-
-    let job = Job::default()
-        .runs_on(runners::LINUX_SMALL)
-        .with_repository_owner_guard()
-        .outputs(outputs)
-        .add_step(steps::checkout_repo().add_with((
-            "fetch-depth",
-            "${{ github.ref == 'refs/heads/main' && 2 || 350 }}",
-        )))
-        .add_step(
-            Step::new(step_name.clone())
-                .run(script)
-                .id(step_name)
-                .shell(BASH_SHELL),
-        );
-
-    NamedJob { name, job }
-}
-
-pub fn tests_pass(jobs: &[NamedJob]) -> NamedJob {
-    let mut script = String::from(indoc::indoc! {r#"
-        set +x
-        EXIT_CODE=0
-
-        check_result() {
-          echo "* $1: $2"
-          if [[ "$2" != "skipped" && "$2" != "success" ]]; then EXIT_CODE=1; fi
-        }
-
-    "#});
-
-    script.push_str(
-        &jobs
-            .iter()
-            .map(|job| {
-                format!(
-                    "check_result \"{}\" \"${{{{ needs.{}.result }}}}\"",
-                    job.name, job.name
-                )
-            })
-            .collect::<Vec<_>>()
-            .join("\n"),
-    );
-
-    script.push_str("\n\nexit $EXIT_CODE\n");
-
-    let job = Job::default()
-        .runs_on(runners::LINUX_SMALL)
-        .needs(
-            jobs.iter()
-                .map(|j| j.name.to_string())
-                .collect::<Vec<String>>(),
-        )
-        .cond(repository_owner_guard_expression(true))
-        .add_step(named::bash(&script));
-
-    named::job(job)
-}
-
-fn check_style() -> NamedJob {
-    fn check_for_typos() -> Step<Use> {
-        named::uses(
-            "crate-ci",
-            "typos",
-            "2d0ce569feab1f8752f1dde43cc2f2aa53236e06",
-        ) // v1.40.0
-        .with(("config", "./typos.toml"))
-    }
-    named::job(
-        release_job(&[])
-            .runs_on(runners::LINUX_MEDIUM)
-            .add_step(steps::checkout_repo())
-            .add_step(steps::cache_rust_dependencies_namespace())
-            .add_step(steps::setup_pnpm())
-            .add_step(steps::script("./script/prettier"))
-            .add_step(steps::script("./script/check-todos"))
-            .add_step(steps::script("./script/check-keymaps"))
-            .add_step(check_for_typos())
-            .add_step(steps::cargo_fmt()),
-    )
-}
-
-fn check_dependencies() -> NamedJob {
-    fn install_cargo_machete() -> Step<Use> {
-        named::uses(
-            "clechasseur",
-            "rs-cargo",
-            "8435b10f6e71c2e3d4d3b7573003a8ce4bfc6386", // v2
-        )
-        .add_with(("command", "install"))
-        .add_with(("args", "cargo-machete@0.7.0"))
-    }
-
-    fn run_cargo_machete() -> Step<Use> {
-        named::uses(
-            "clechasseur",
-            "rs-cargo",
-            "8435b10f6e71c2e3d4d3b7573003a8ce4bfc6386", // v2
-        )
-        .add_with(("command", "machete"))
-    }
-
-    fn check_cargo_lock() -> Step<Run> {
-        named::bash("cargo update --locked --workspace")
-    }
-
-    fn check_vulnerable_dependencies() -> Step<Use> {
-        named::uses(
-            "actions",
-            "dependency-review-action",
-            "67d4f4bd7a9b17a0db54d2a7519187c65e339de8", // v4
-        )
-        .if_condition(Expression::new("github.event_name == 'pull_request'"))
-        .with(("license-check", false))
-    }
-
-    named::job(
-        release_job(&[])
-            .runs_on(runners::LINUX_SMALL)
-            .add_step(steps::checkout_repo())
-            .add_step(steps::cache_rust_dependencies_namespace())
-            .add_step(install_cargo_machete())
-            .add_step(run_cargo_machete())
-            .add_step(check_cargo_lock())
-            .add_step(check_vulnerable_dependencies()),
-    )
-}
-
-fn check_workspace_binaries() -> NamedJob {
-    named::job(
-        release_job(&[])
-            .runs_on(runners::LINUX_LARGE)
-            .add_step(steps::checkout_repo())
-            .add_step(steps::setup_cargo_config(Platform::Linux))
-            .add_step(steps::cache_rust_dependencies_namespace())
-            .map(steps::install_linux_dependencies)
-            .add_step(steps::script("cargo build -p collab"))
-            .add_step(steps::script("cargo build --workspace --bins --examples"))
-            .add_step(steps::cleanup_cargo_config(Platform::Linux)),
-    )
-}
-
-pub(crate) fn run_platform_tests(platform: Platform) -> NamedJob {
-    let runner = match platform {
-        Platform::Windows => runners::WINDOWS_DEFAULT,
-        Platform::Linux => runners::LINUX_DEFAULT,
-        Platform::Mac => runners::MAC_DEFAULT,
-    };
-    NamedJob {
-        name: format!("run_tests_{platform}"),
-        job: release_job(&[])
-            .runs_on(runner)
-            .add_step(steps::checkout_repo())
-            .add_step(steps::setup_cargo_config(platform))
-            .when(platform == Platform::Linux, |this| {
-                this.add_step(steps::cache_rust_dependencies_namespace())
-            })
-            .when(
-                platform == Platform::Linux,
-                steps::install_linux_dependencies,
-            )
-            .add_step(steps::setup_node())
-            .add_step(steps::clippy(platform))
-            .when(platform == Platform::Linux, |job| {
-                job.add_step(steps::cargo_install_nextest())
-            })
-            .add_step(steps::clear_target_dir_if_large(platform))
-            .add_step(steps::cargo_nextest(platform))
-            .add_step(steps::cleanup_cargo_config(platform)),
-    }
-}
-
-pub(crate) fn check_postgres_and_protobuf_migrations() -> NamedJob {
-    fn remove_untracked_files() -> Step<Run> {
-        named::bash("git clean -df")
-    }
-
-    fn ensure_fresh_merge() -> Step<Run> {
-        named::bash(indoc::indoc! {r#"
-            if [ -z "$GITHUB_BASE_REF" ];
-            then
-              echo "BUF_BASE_BRANCH=$(git merge-base origin/main HEAD)" >> "$GITHUB_ENV"
-            else
-              git checkout -B temp
-              git merge -q "origin/$GITHUB_BASE_REF" -m "merge main into temp"
-              echo "BUF_BASE_BRANCH=$GITHUB_BASE_REF" >> "$GITHUB_ENV"
-            fi
-        "#})
-    }
-
-    fn bufbuild_setup_action() -> Step<Use> {
-        named::uses("bufbuild", "buf-setup-action", "v1")
-            .add_with(("version", "v1.29.0"))
-            .add_with(("github_token", vars::GITHUB_TOKEN))
-    }
-
-    fn bufbuild_breaking_action() -> Step<Use> {
-        named::uses("bufbuild", "buf-breaking-action", "v1").add_with(("input", "crates/proto/proto/"))
-            .add_with(("against", "https://github.com/${GITHUB_REPOSITORY}.git#branch=${BUF_BASE_BRANCH},subdir=crates/proto/proto/"))
-    }
-
-    named::job(
-        release_job(&[])
-            .runs_on(runners::LINUX_DEFAULT)
-            .add_env(("GIT_AUTHOR_NAME", "Protobuf Action"))
-            .add_env(("GIT_AUTHOR_EMAIL", "ci@zed.dev"))
-            .add_env(("GIT_COMMITTER_NAME", "Protobuf Action"))
-            .add_env(("GIT_COMMITTER_EMAIL", "ci@zed.dev"))
-            .add_step(steps::checkout_repo().with(("fetch-depth", 0))) // fetch full history
-            .add_step(remove_untracked_files())
-            .add_step(ensure_fresh_merge())
-            .add_step(bufbuild_setup_action())
-            .add_step(bufbuild_breaking_action()),
-    )
-}
-
-fn doctests() -> NamedJob {
-    fn run_doctests() -> Step<Run> {
-        named::bash(indoc::indoc! {r#"
-            cargo test --workspace --doc --no-fail-fast
-        "#})
-        .id("run_doctests")
-    }
-
-    named::job(
-        release_job(&[])
-            .runs_on(runners::LINUX_DEFAULT)
-            .add_step(steps::checkout_repo())
-            .add_step(steps::cache_rust_dependencies_namespace())
-            .map(steps::install_linux_dependencies)
-            .add_step(steps::setup_cargo_config(Platform::Linux))
-            .add_step(run_doctests())
-            .add_step(steps::cleanup_cargo_config(Platform::Linux)),
-    )
-}
-
-fn check_licenses() -> NamedJob {
-    named::job(
-        Job::default()
-            .runs_on(runners::LINUX_SMALL)
-            .add_step(steps::checkout_repo())
-            .add_step(steps::cache_rust_dependencies_namespace())
-            .add_step(steps::script("./script/check-licenses"))
-            .add_step(steps::script("./script/generate-licenses")),
-    )
-}
-
-fn check_docs() -> NamedJob {
-    fn lychee_link_check(dir: &str) -> Step<Use> {
-        named::uses(
-            "lycheeverse",
-            "lychee-action",
-            "82202e5e9c2f4ef1a55a3d02563e1cb6041e5332",
-        ) // v2.4.1
-        .add_with(("args", format!("--no-progress --exclude '^http' '{dir}'")))
-        .add_with(("fail", true))
-        .add_with(("jobSummary", false))
-    }
-
-    fn install_mdbook() -> Step<Use> {
-        named::uses(
-            "peaceiris",
-            "actions-mdbook",
-            "ee69d230fe19748b7abf22df32acaa93833fad08", // v2
-        )
-        .with(("mdbook-version", "0.4.37"))
-    }
-
-    fn build_docs() -> Step<Run> {
-        named::bash(indoc::indoc! {r#"
-            mkdir -p target/deploy
-            mdbook build ./docs --dest-dir=../target/deploy/docs/
-        "#})
-    }
-
-    named::job(
-        release_job(&[])
-            .runs_on(runners::LINUX_LARGE)
-            .add_step(steps::checkout_repo())
-            .add_step(steps::setup_cargo_config(Platform::Linux))
-            // todo(ci): un-inline build_docs/action.yml here
-            .add_step(steps::cache_rust_dependencies_namespace())
-            .add_step(
-                lychee_link_check("./docs/src/**/*"), // check markdown links
-            )
-            .map(steps::install_linux_dependencies)
-            .add_step(install_mdbook())
-            .add_step(build_docs())
-            .add_step(
-                lychee_link_check("target/deploy/docs"), // check links in generated html
-            ),
-    )
-}
-
-pub(crate) fn check_scripts() -> NamedJob {
-    fn download_actionlint() -> Step<Run> {
-        named::bash(
-            "bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash)",
-        )
-    }
-
-    fn run_actionlint() -> Step<Run> {
-        named::bash(indoc::indoc! {r#"
-            ${{ steps.get_actionlint.outputs.executable }} -color
-        "#})
-    }
-
-    fn run_shellcheck() -> Step<Run> {
-        named::bash("./script/shellcheck-scripts error")
-    }
-
-    fn check_xtask_workflows() -> Step<Run> {
-        named::bash(indoc::indoc! {r#"
-            cargo xtask workflows
-            if ! git diff --exit-code .github; then
-              echo "Error: .github directory has uncommitted changes after running 'cargo xtask workflows'"
-              echo "Please run 'cargo xtask workflows' locally and commit the changes"
-              exit 1
-            fi
-        "#})
-    }
-
-    named::job(
-        release_job(&[])
-            .runs_on(runners::LINUX_SMALL)
-            .add_step(steps::checkout_repo())
-            .add_step(run_shellcheck())
-            .add_step(download_actionlint().id("get_actionlint"))
-            .add_step(run_actionlint())
-            .add_step(check_xtask_workflows()),
-    )
-}
diff --git a/tooling/xtask/src/tasks/workflows/runners.rs b/tooling/xtask/src/tasks/workflows/runners.rs
deleted file mode 100644
index df98826f8a..0000000000
--- a/tooling/xtask/src/tasks/workflows/runners.rs
+++ /dev/null
@@ -1,66 +0,0 @@
-pub const LINUX_SMALL: Runner = Runner("namespace-profile-2x4-ubuntu-2404");
-pub const LINUX_DEFAULT: Runner = LINUX_XL;
-pub const LINUX_XL: Runner = Runner("namespace-profile-16x32-ubuntu-2204");
-pub const LINUX_LARGE: Runner = Runner("namespace-profile-8x16-ubuntu-2204");
-pub const LINUX_MEDIUM: Runner = Runner("namespace-profile-4x8-ubuntu-2204");
-
-// Using Ubuntu 20.04 for minimal glibc version
-pub const LINUX_X86_BUNDLER: Runner = Runner("namespace-profile-32x64-ubuntu-2004");
-pub const LINUX_ARM_BUNDLER: Runner = Runner("namespace-profile-8x32-ubuntu-2004-arm-m4");
-
-pub const MAC_DEFAULT: Runner = Runner("self-mini-macos");
-pub const WINDOWS_DEFAULT: Runner = Runner("self-32vcpu-windows-2022");
-
-pub struct Runner(&'static str);
-
-impl Into<gh_workflow::RunsOn> for Runner {
-    fn into(self) -> gh_workflow::RunsOn {
-        self.0.into()
-    }
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub enum Arch {
-    X86_64,
-    AARCH64,
-}
-
-impl std::fmt::Display for Arch {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Arch::X86_64 => write!(f, "x86_64"),
-            Arch::AARCH64 => write!(f, "aarch64"),
-        }
-    }
-}
-
-impl Arch {
-    pub fn linux_bundler(&self) -> Runner {
-        match self {
-            Arch::X86_64 => LINUX_X86_BUNDLER,
-            Arch::AARCH64 => LINUX_ARM_BUNDLER,
-        }
-    }
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub enum Platform {
-    Windows,
-    Linux,
-    Mac,
-}
-
-impl std::fmt::Display for Platform {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Platform::Windows => write!(f, "windows"),
-            Platform::Linux => write!(f, "linux"),
-            Platform::Mac => write!(f, "mac"),
-        }
-    }
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub enum ReleaseChannel {
-    Nightly,
-}
diff --git a/tooling/xtask/src/tasks/workflows/steps.rs b/tooling/xtask/src/tasks/workflows/steps.rs
deleted file mode 100644
index 722a5f0704..0000000000
--- a/tooling/xtask/src/tasks/workflows/steps.rs
+++ /dev/null
@@ -1,336 +0,0 @@
-use gh_workflow::*;
-
-use crate::tasks::workflows::{runners::Platform, vars};
-
-pub const BASH_SHELL: &str = "bash -euxo pipefail {0}";
-// https://docs.github.com/en/actions/reference/workflows-and-actions/workflow-syntax#jobsjob_idstepsshell
-pub const PWSH_SHELL: &str = "pwsh";
-
-pub fn checkout_repo() -> Step<Use> {
-    named::uses(
-        "actions",
-        "checkout",
-        "11bd71901bbe5b1630ceea73d27597364c9af683", // v4
-    )
-    // prevent checkout action from running `git clean -ffdx` which
-    // would delete the target directory
-    .add_with(("clean", false))
-}
-
-pub fn setup_pnpm() -> Step<Use> {
-    named::uses(
-        "pnpm",
-        "action-setup",
-        "fe02b34f77f8bc703788d5817da081398fad5dd2", // v4.0.0
-    )
-    .add_with(("version", "9"))
-}
-
-pub fn setup_node() -> Step<Use> {
-    named::uses(
-        "actions",
-        "setup-node",
-        "49933ea5288caeca8642d1e84afbd3f7d6820020", // v4
-    )
-    .add_with(("node-version", "20"))
-}
-
-pub fn setup_sentry() -> Step<Use> {
-    named::uses(
-        "matbour",
-        "setup-sentry-cli",
-        "3e938c54b3018bdd019973689ef984e033b0454b",
-    )
-    .add_with(("token", vars::SENTRY_AUTH_TOKEN))
-}
-
-pub fn cargo_fmt() -> Step<Run> {
-    named::bash("cargo fmt --all -- --check")
-}
-
-pub fn cargo_install_nextest() -> Step<Use> {
-    named::uses("taiki-e", "install-action", "nextest")
-}
-
-pub fn cargo_nextest(platform: Platform) -> Step<Run> {
-    named::run(platform, "cargo nextest run --workspace --no-fail-fast")
-}
-
-pub fn setup_cargo_config(platform: Platform) -> Step<Run> {
-    match platform {
-        Platform::Windows => named::pwsh(indoc::indoc! {r#"
-            New-Item -ItemType Directory -Path "./../.cargo" -Force
-            Copy-Item -Path "./.cargo/ci-config.toml" -Destination "./../.cargo/config.toml"
-        "#}),
-
-        Platform::Linux | Platform::Mac => named::bash(indoc::indoc! {r#"
-            mkdir -p ./../.cargo
-            cp ./.cargo/ci-config.toml ./../.cargo/config.toml
-        "#}),
-    }
-}
-
-pub fn cleanup_cargo_config(platform: Platform) -> Step<Run> {
-    let step = match platform {
-        Platform::Windows => named::pwsh(indoc::indoc! {r#"
-            Remove-Item -Recurse -Path "./../.cargo" -Force -ErrorAction SilentlyContinue
-        "#}),
-        Platform::Linux | Platform::Mac => named::bash(indoc::indoc! {r#"
-            rm -rf ./../.cargo
-        "#}),
-    };
-
-    step.if_condition(Expression::new("always()"))
-}
-
-pub fn clear_target_dir_if_large(platform: Platform) -> Step<Run> {
-    match platform {
-        Platform::Windows => named::pwsh("./script/clear-target-dir-if-larger-than.ps1 250"),
-        Platform::Linux => named::bash("./script/clear-target-dir-if-larger-than 250"),
-        Platform::Mac => named::bash("./script/clear-target-dir-if-larger-than 300"),
-    }
-}
-
-pub fn clippy(platform: Platform) -> Step<Run> {
-    match platform {
-        Platform::Windows => named::pwsh("./script/clippy.ps1"),
-        _ => named::bash("./script/clippy"),
-    }
-}
-
-pub fn cache_rust_dependencies_namespace() -> Step<Use> {
-    named::uses("namespacelabs", "nscloud-cache-action", "v1").add_with(("cache", "rust"))
-}
-
-pub fn setup_linux() -> Step<Run> {
-    named::bash("./script/linux")
-}
-
-fn install_mold() -> Step<Run> {
-    named::bash("./script/install-mold")
-}
-
-fn download_wasi_sdk() -> Step<Run> {
-    named::bash("./script/download-wasi-sdk")
-}
-
-pub(crate) fn install_linux_dependencies(job: Job) -> Job {
-    job.add_step(setup_linux())
-        .add_step(install_mold())
-        .add_step(download_wasi_sdk())
-}
-
-pub fn script(name: &str) -> Step<Run> {
-    if name.ends_with(".ps1") {
-        Step::new(name).run(name).shell(PWSH_SHELL)
-    } else {
-        Step::new(name).run(name).shell(BASH_SHELL)
-    }
-}
-
-pub struct NamedJob<J: JobType = RunJob> {
-    pub name: String,
-    pub job: Job<J>,
-}
-
-// impl NamedJob {
-//     pub fn map(self, f: impl FnOnce(Job) -> Job) -> Self {
-//         NamedJob {
-//             name: self.name,
-//             job: f(self.job),
-//         }
-//     }
-// }
-
-pub(crate) const DEFAULT_REPOSITORY_OWNER_GUARD: &str =
-    "(github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')";
-
-pub fn repository_owner_guard_expression(trigger_always: bool) -> Expression {
-    Expression::new(format!(
-        "{}{}",
-        DEFAULT_REPOSITORY_OWNER_GUARD,
-        trigger_always.then_some(" && always()").unwrap_or_default()
-    ))
-}
-
-pub trait CommonJobConditions: Sized {
-    fn with_repository_owner_guard(self) -> Self;
-}
-
-impl CommonJobConditions for Job {
-    fn with_repository_owner_guard(self) -> Self {
-        self.cond(repository_owner_guard_expression(false))
-    }
-}
-
-pub(crate) fn release_job(deps: &[&NamedJob]) -> Job {
-    dependant_job(deps)
-        .with_repository_owner_guard()
-        .timeout_minutes(60u32)
-}
-
-pub(crate) fn dependant_job(deps: &[&NamedJob]) -> Job {
-    let job = Job::default();
-    if deps.len() > 0 {
-        job.needs(deps.iter().map(|j| j.name.clone()).collect::<Vec<_>>())
-    } else {
-        job
-    }
-}
-
-impl FluentBuilder for Job {}
-impl FluentBuilder for Workflow {}
-impl FluentBuilder for Input {}
-
-/// A helper trait for building complex objects with imperative conditionals in a fluent style.
-/// Copied from GPUI to avoid adding GPUI as dependency
-/// todo(ci) just put this in gh-workflow
-#[allow(unused)]
-pub trait FluentBuilder {
-    /// Imperatively modify self with the given closure.
-    fn map<U>(self, f: impl FnOnce(Self) -> U) -> U
-    where
-        Self: Sized,
-    {
-        f(self)
-    }
-
-    /// Conditionally modify self with the given closure.
-    fn when(self, condition: bool, then: impl FnOnce(Self) -> Self) -> Self
-    where
-        Self: Sized,
-    {
-        self.map(|this| if condition { then(this) } else { this })
-    }
-
-    /// Conditionally modify self with the given closure.
-    fn when_else(
-        self,
-        condition: bool,
-        then: impl FnOnce(Self) -> Self,
-        else_fn: impl FnOnce(Self) -> Self,
-    ) -> Self
-    where
-        Self: Sized,
-    {
-        self.map(|this| if condition { then(this) } else { else_fn(this) })
-    }
-
-    /// Conditionally unwrap and modify self with the given closure, if the given option is Some.
-    fn when_some<T>(self, option: Option<T>, then: impl FnOnce(Self, T) -> Self) -> Self
-    where
-        Self: Sized,
-    {
-        self.map(|this| {
-            if let Some(value) = option {
-                then(this, value)
-            } else {
-                this
-            }
-        })
-    }
-    /// Conditionally unwrap and modify self with the given closure, if the given option is None.
-    fn when_none<T>(self, option: &Option<T>, then: impl FnOnce(Self) -> Self) -> Self
-    where
-        Self: Sized,
-    {
-        self.map(|this| if option.is_some() { this } else { then(this) })
-    }
-}
-
-// (janky) helper to generate steps with a name that corresponds
-// to the name of the calling function.
-pub mod named {
-    use super::*;
-
-    /// Returns a uses step with the same name as the enclosing function.
-    /// (You shouldn't inline this function into the workflow definition, you must
-    /// wrap it in a new function.)
-    pub fn uses(owner: &str, repo: &str, ref_: &str) -> Step<Use> {
-        Step::new(function_name(1)).uses(owner, repo, ref_)
-    }
-
-    /// Returns a bash-script step with the same name as the enclosing function.
-    /// (You shouldn't inline this function into the workflow definition, you must
-    /// wrap it in a new function.)
-    pub fn bash(script: impl AsRef<str>) -> Step<Run> {
-        Step::new(function_name(1))
-            .run(script.as_ref())
-            .shell(BASH_SHELL)
-    }
-
-    /// Returns a pwsh-script step with the same name as the enclosing function.
-    /// (You shouldn't inline this function into the workflow definition, you must
-    /// wrap it in a new function.)
-    pub fn pwsh(script: &str) -> Step<Run> {
-        Step::new(function_name(1)).run(script).shell(PWSH_SHELL)
-    }
-
-    /// Runs the command in either powershell or bash, depending on platform.
-    /// (You shouldn't inline this function into the workflow definition, you must
-    /// wrap it in a new function.)
-    pub fn run(platform: Platform, script: &str) -> Step<Run> {
-        match platform {
-            Platform::Windows => Step::new(function_name(1)).run(script).shell(PWSH_SHELL),
-            Platform::Linux | Platform::Mac => {
-                Step::new(function_name(1)).run(script).shell(BASH_SHELL)
-            }
-        }
-    }
-
-    /// Returns a Workflow with the same name as the enclosing module.
-    pub fn workflow() -> Workflow {
-        Workflow::default().name(
-            named::function_name(1)
-                .split("::")
-                .collect::<Vec<_>>()
-                .into_iter()
-                .rev()
-                .skip(1)
-                .rev()
-                .collect::<Vec<_>>()
-                .join("::"),
-        )
-    }
-
-    /// Returns a Job with the same name as the enclosing function.
-    /// (note job names may not contain `::`)
-    pub fn job<J: JobType>(job: Job<J>) -> NamedJob<J> {
-        NamedJob {
-            name: function_name(1).split("::").last().unwrap().to_owned(),
-            job,
-        }
-    }
-
-    /// Returns the function name N callers above in the stack
-    /// (typically 1).
-    /// This only works because xtask always runs debug builds.
-    pub fn function_name(i: usize) -> String {
-        let mut name = "<unknown>".to_string();
-        let mut count = 0;
-        backtrace::trace(|frame| {
-            if count < i + 3 {
-                count += 1;
-                return true;
-            }
-            backtrace::resolve_frame(frame, |cb| {
-                if let Some(s) = cb.name() {
-                    name = s.to_string()
-                }
-            });
-            false
-        });
-
-        name.split("::")
-            .skip_while(|s| s != &"workflows")
-            .skip(1)
-            .collect::<Vec<_>>()
-            .join("::")
-    }
-}
-
-pub fn git_checkout(ref_name: &dyn std::fmt::Display) -> Step<Run> {
-    named::bash(&format!(
-        "git fetch origin {ref_name} && git checkout {ref_name}"
-    ))
-}
diff --git a/tooling/xtask/src/tasks/workflows/vars.rs b/tooling/xtask/src/tasks/workflows/vars.rs
deleted file mode 100644
index adcd252465..0000000000
--- a/tooling/xtask/src/tasks/workflows/vars.rs
+++ /dev/null
@@ -1,344 +0,0 @@
-use std::cell::RefCell;
-
-use gh_workflow::{
-    Concurrency, Env, Expression, Step, WorkflowCallInput, WorkflowCallSecret,
-    WorkflowDispatchInput,
-};
-
-use crate::tasks::workflows::{runners::Platform, steps::NamedJob};
-
-macro_rules! secret {
-    ($secret_name:ident) => {
-        pub const $secret_name: &str = concat!("${{ secrets.", stringify!($secret_name), " }}");
-    };
-}
-
-macro_rules! var {
-    ($var_name:ident) => {
-        pub const $var_name: &str = concat!("${{ vars.", stringify!($var_name), " }}");
-    };
-}
-
-secret!(ANTHROPIC_API_KEY);
-secret!(OPENAI_API_KEY);
-secret!(GOOGLE_AI_API_KEY);
-secret!(GOOGLE_CLOUD_PROJECT);
-secret!(APPLE_NOTARIZATION_ISSUER_ID);
-secret!(APPLE_NOTARIZATION_KEY);
-secret!(APPLE_NOTARIZATION_KEY_ID);
-secret!(AZURE_SIGNING_CLIENT_ID);
-secret!(AZURE_SIGNING_CLIENT_SECRET);
-secret!(AZURE_SIGNING_TENANT_ID);
-secret!(CACHIX_AUTH_TOKEN);
-secret!(DIGITALOCEAN_SPACES_ACCESS_KEY);
-secret!(DIGITALOCEAN_SPACES_SECRET_KEY);
-secret!(GITHUB_TOKEN);
-secret!(MACOS_CERTIFICATE);
-secret!(MACOS_CERTIFICATE_PASSWORD);
-secret!(SENTRY_AUTH_TOKEN);
-secret!(ZED_CLIENT_CHECKSUM_SEED);
-secret!(ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON);
-secret!(ZED_SENTRY_MINIDUMP_ENDPOINT);
-secret!(SLACK_APP_ZED_UNIT_EVALS_BOT_TOKEN);
-secret!(ZED_ZIPPY_APP_ID);
-secret!(ZED_ZIPPY_APP_PRIVATE_KEY);
-secret!(DISCORD_WEBHOOK_RELEASE_NOTES);
-secret!(WINGET_TOKEN);
-secret!(VERCEL_TOKEN);
-secret!(SLACK_WEBHOOK_WORKFLOW_FAILURES);
-
-// todo(ci) make these secrets too...
-var!(AZURE_SIGNING_ACCOUNT_NAME);
-var!(AZURE_SIGNING_CERT_PROFILE_NAME);
-var!(AZURE_SIGNING_ENDPOINT);
-
-pub fn bundle_envs(platform: Platform) -> Env {
-    let env = Env::default()
-        .add("CARGO_INCREMENTAL", 0)
-        .add("ZED_CLIENT_CHECKSUM_SEED", ZED_CLIENT_CHECKSUM_SEED)
-        .add("ZED_MINIDUMP_ENDPOINT", ZED_SENTRY_MINIDUMP_ENDPOINT);
-
-    match platform {
-        Platform::Linux => env,
-        Platform::Mac => env
-            .add("MACOS_CERTIFICATE", MACOS_CERTIFICATE)
-            .add("MACOS_CERTIFICATE_PASSWORD", MACOS_CERTIFICATE_PASSWORD)
-            .add("APPLE_NOTARIZATION_KEY", APPLE_NOTARIZATION_KEY)
-            .add("APPLE_NOTARIZATION_KEY_ID", APPLE_NOTARIZATION_KEY_ID)
-            .add("APPLE_NOTARIZATION_ISSUER_ID", APPLE_NOTARIZATION_ISSUER_ID),
-        Platform::Windows => env
-            .add("AZURE_TENANT_ID", AZURE_SIGNING_TENANT_ID)
-            .add("AZURE_CLIENT_ID", AZURE_SIGNING_CLIENT_ID)
-            .add("AZURE_CLIENT_SECRET", AZURE_SIGNING_CLIENT_SECRET)
-            .add("ACCOUNT_NAME", AZURE_SIGNING_ACCOUNT_NAME)
-            .add("CERT_PROFILE_NAME", AZURE_SIGNING_CERT_PROFILE_NAME)
-            .add("ENDPOINT", AZURE_SIGNING_ENDPOINT)
-            .add("FILE_DIGEST", "SHA256")
-            .add("TIMESTAMP_DIGEST", "SHA256")
-            .add("TIMESTAMP_SERVER", "http://timestamp.acs.microsoft.com"),
-    }
-}
-
-pub fn one_workflow_per_non_main_branch() -> Concurrency {
-    one_workflow_per_non_main_branch_and_token("")
-}
-
-pub fn one_workflow_per_non_main_branch_and_token<T: AsRef<str>>(token: T) -> Concurrency {
-    Concurrency::default()
-        .group(format!(
-            concat!(
-                "${{{{ github.workflow }}}}-${{{{ github.ref_name }}}}-",
-                "${{{{ github.ref_name == 'main' && github.sha || 'anysha' }}}}{}"
-            ),
-            token.as_ref()
-        ))
-        .cancel_in_progress(true)
-}
-
-pub(crate) fn allow_concurrent_runs() -> Concurrency {
-    Concurrency::default()
-        .group("${{ github.workflow }}-${{ github.ref_name }}-${{ github.run_id }}")
-        .cancel_in_progress(true)
-}
-
-// Represents a pattern to check for changed files and corresponding output variable
-pub struct PathCondition {
-    pub name: &'static str,
-    pub pattern: &'static str,
-    pub invert: bool,
-    pub set_by_step: RefCell<Option<String>>,
-}
-impl PathCondition {
-    pub fn new(name: &'static str, pattern: &'static str) -> Self {
-        Self {
-            name,
-            pattern,
-            invert: false,
-            set_by_step: Default::default(),
-        }
-    }
-    pub fn inverted(name: &'static str, pattern: &'static str) -> Self {
-        Self {
-            name,
-            pattern,
-            invert: true,
-            set_by_step: Default::default(),
-        }
-    }
-    pub fn guard(&self, job: NamedJob) -> NamedJob {
-        let set_by_step = self
-            .set_by_step
-            .borrow()
-            .clone()
-            .unwrap_or_else(|| panic!("condition {},is never set", self.name));
-        NamedJob {
-            name: job.name,
-            job: job
-                .job
-                .add_need(set_by_step.clone())
-                .cond(Expression::new(format!(
-                    "needs.{}.outputs.{} == 'true'",
-                    &set_by_step, self.name
-                ))),
-        }
-    }
-}
-
-pub(crate) struct StepOutput {
-    pub name: &'static str,
-    step_id: String,
-}
-
-impl StepOutput {
-    pub fn new<T>(step: &Step<T>, name: &'static str) -> Self {
-        Self {
-            name,
-            step_id: step
-                .value
-                .id
-                .clone()
-                .expect("Steps that produce outputs must have an ID"),
-        }
-    }
-
-    pub fn expr(&self) -> String {
-        format!("steps.{}.outputs.{}", self.step_id, self.name)
-    }
-
-    pub fn as_job_output(self, job: &NamedJob) -> JobOutput {
-        JobOutput {
-            job_name: job.name.clone(),
-            name: self.name,
-        }
-    }
-}
-
-impl serde::Serialize for StepOutput {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        serializer.serialize_str(&self.to_string())
-    }
-}
-
-impl std::fmt::Display for StepOutput {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "${{{{ {} }}}}", self.expr())
-    }
-}
-
-pub(crate) struct JobOutput {
-    job_name: String,
-    name: &'static str,
-}
-
-impl JobOutput {
-    pub fn expr(&self) -> String {
-        format!("needs.{}.outputs.{}", self.job_name, self.name)
-    }
-}
-
-impl serde::Serialize for JobOutput {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        serializer.serialize_str(&self.to_string())
-    }
-}
-
-impl std::fmt::Display for JobOutput {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "${{{{ {} }}}}", self.expr())
-    }
-}
-
-pub struct WorkflowInput {
-    pub input_type: &'static str,
-    pub name: &'static str,
-    pub default: Option<String>,
-}
-
-impl WorkflowInput {
-    pub fn string(name: &'static str, default: Option<String>) -> Self {
-        Self {
-            input_type: "string",
-            name,
-            default,
-        }
-    }
-
-    pub fn bool(name: &'static str, default: Option<bool>) -> Self {
-        Self {
-            input_type: "boolean",
-            name,
-            default: default.as_ref().map(ToString::to_string),
-        }
-    }
-
-    pub fn input(&self) -> WorkflowDispatchInput {
-        WorkflowDispatchInput {
-            description: self.name.to_owned(),
-            required: self.default.is_none(),
-            input_type: self.input_type.to_owned(),
-            default: self.default.clone(),
-        }
-    }
-
-    pub fn call_input(&self) -> WorkflowCallInput {
-        WorkflowCallInput {
-            description: self.name.to_owned(),
-            required: self.default.is_none(),
-            input_type: self.input_type.to_owned(),
-            default: self.default.clone(),
-        }
-    }
-
-    pub(crate) fn expr(&self) -> String {
-        format!("inputs.{}", self.name)
-    }
-}
-
-impl std::fmt::Display for WorkflowInput {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "${{{{ {} }}}}", self.expr())
-    }
-}
-
-impl serde::Serialize for WorkflowInput {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        serializer.serialize_str(&self.to_string())
-    }
-}
-
-pub(crate) struct WorkflowSecret {
-    pub name: &'static str,
-    description: String,
-    required: bool,
-}
-
-impl WorkflowSecret {
-    pub fn new(name: &'static str, description: impl ToString) -> Self {
-        Self {
-            name,
-            description: description.to_string(),
-            required: true,
-        }
-    }
-
-    pub fn secret_configuration(&self) -> WorkflowCallSecret {
-        WorkflowCallSecret {
-            description: self.description.clone(),
-            required: self.required,
-        }
-    }
-}
-
-impl std::fmt::Display for WorkflowSecret {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "${{{{ secrets.{} }}}}", self.name)
-    }
-}
-
-impl serde::Serialize for WorkflowSecret {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        serializer.serialize_str(&self.to_string())
-    }
-}
-
-pub mod assets {
-    // NOTE: these asset names also exist in the zed.dev codebase.
-    pub const MAC_AARCH64: &str = "Zed-aarch64.dmg";
-    pub const MAC_X86_64: &str = "Zed-x86_64.dmg";
-    pub const LINUX_AARCH64: &str = "zed-linux-aarch64.tar.gz";
-    pub const LINUX_X86_64: &str = "zed-linux-x86_64.tar.gz";
-    pub const WINDOWS_X86_64: &str = "Zed-x86_64.exe";
-    pub const WINDOWS_AARCH64: &str = "Zed-aarch64.exe";
-
-    pub const REMOTE_SERVER_MAC_AARCH64: &str = "zed-remote-server-macos-aarch64.gz";
-    pub const REMOTE_SERVER_MAC_X86_64: &str = "zed-remote-server-macos-x86_64.gz";
-    pub const REMOTE_SERVER_LINUX_AARCH64: &str = "zed-remote-server-linux-aarch64.gz";
-    pub const REMOTE_SERVER_LINUX_X86_64: &str = "zed-remote-server-linux-x86_64.gz";
-
-    pub fn all() -> Vec<&'static str> {
-        vec![
-            MAC_AARCH64,
-            MAC_X86_64,
-            LINUX_AARCH64,
-            LINUX_X86_64,
-            WINDOWS_X86_64,
-            WINDOWS_AARCH64,
-            REMOTE_SERVER_MAC_AARCH64,
-            REMOTE_SERVER_MAC_X86_64,
-            REMOTE_SERVER_LINUX_AARCH64,
-            REMOTE_SERVER_LINUX_X86_64,
-        ]
-    }
-}
diff --git a/tooling/xtask/src/workspace.rs b/tooling/xtask/src/workspace.rs
deleted file mode 100644
index fd71aa6bbd..0000000000
--- a/tooling/xtask/src/workspace.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-use anyhow::{Context as _, Result};
-use cargo_metadata::{Metadata, MetadataCommand};
-
-/// Returns the Cargo workspace.
-pub fn load_workspace() -> Result<Metadata> {
-    MetadataCommand::new()
-        .exec()
-        .context("failed to load cargo metadata")
-}
diff --git a/typos.toml b/typos.toml
index 20a7b511a8..a367402ae6 100644
--- a/typos.toml
+++ b/typos.toml
@@ -4,77 +4,21 @@ ignore-hidden = false
 extend-exclude = [
     ".git/",
 
-    # Contributor names aren't typos.
-    ".mailmap",
-
-    # File suffixes aren't typos.
-    "crates/theme/src/icon_theme.rs",
-    "crates/extensions_ui/src/extension_suggest.rs",
-
-    # Some mock data is flagged as typos.
-    "crates/assistant_tools/src/web_search_tool.rs",
-
-    # Suppress false positives in database schema.
-    "crates/collab/migrations/20251208000000_test_schema.sql",
-
-    # Not our typos.
-    "crates/livekit_api/",
-    # Vim makes heavy use of partial typing tables.
-    "crates/vim/",
-    # Editor and file finder rely on partial typing and custom in-string syntax.
-    "crates/file_finder/src/file_finder_tests.rs",
-    "crates/editor/src/editor_tests.rs",
-    # There are some names in the test data that are incorrectly flagged as typos.
-    "crates/git/test_data/blame_incremental_complex",
-    "crates/git/test_data/golden/blame_incremental_complex.json",
-    # We have some base64-encoded data that is incorrectly being flagged.
-    "crates/rpc/src/auth.rs",
-    # glsl isn't recognized by this tool.
-    "extensions/glsl/languages/glsl/",
     # Windows likes its abbreviations.
     "crates/gpui/src/platform/windows/directx_renderer.rs",
     "crates/gpui/src/platform/windows/events.rs",
     "crates/gpui/src/platform/windows/direct_write.rs",
     "crates/gpui/src/platform/windows/window.rs",
-    # Some typos in the base mdBook CSS.
-    "docs/theme/css/",
-    # Spellcheck triggers on `|Fixe[sd]|` regex part.
-    "script/danger/dangerfile.ts",
-    # Eval examples for prompts and criteria
-    "crates/eval/src/examples/",
-    # File type extensions are not typos
-    "crates/zed/resources/windows/zed.iss",
-    # typos-cli doesn't understand our `vˇariable` markup
-    "crates/editor/src/hover_links.rs",
-    # typos-cli doesn't understand `setis` is intentional test case
-    "crates/editor/src/code_completion_tests.rs",
-    # Linux repository structure is not a valid text, hence we should not check it for typos
-    "crates/project_panel/benches/linux_repo_snapshot.txt",
-    # Some multibuffer test cases have word fragments that register as typos
-    "crates/multi_buffer/src/multi_buffer_tests.rs",
-    # Macos apis
+
+    # macOS APIs
     "crates/gpui/src/platform/mac/dispatcher.rs",
 ]
 
 [default]
 extend-ignore-re = [
-    'cl\[ist]',
-    '\[lan\]guage',
-    '"ba"',
-    "doas",
-    # ProtoLS crate with tree-sitter Protobuf grammar.
-    "protols",
-    # x11rb SelectionNotifyEvent struct field
-    "requestor",
     # macOS version
     "Big Sur",
-    # Not an actual typo but an intentionally invalid color, in `color_extractor`
-    "#fof",
     # Stripped version of reserved keyword `type`
     "typ",
-    # AMD GPU Services
-    "ags",
-    # AMD GPU Services
-    "AGS"
 ]
-check-filename = true
+check-filename = true
\ No newline at end of file